From a96b36398fcfb4953e8190127da8bf074c7552f1 Mon Sep 17 00:00:00 2001
From: robert <robert@openbsd.org>
Date: Sat, 11 Nov 2023 18:14:26 +0000
Subject: [PATCH] merge llvm-16.0.6

---
 gnu/llvm/llvm/bindings/go/README.txt          |    61 -
 gnu/llvm/llvm/bindings/go/build.sh            |    28 -
 gnu/llvm/llvm/bindings/go/conftest.go         |    16 -
 gnu/llvm/llvm/bindings/go/llvm/IRBindings.cpp |    75 -
 gnu/llvm/llvm/bindings/go/llvm/IRBindings.h   |    57 -
 .../go/llvm/InstrumentationBindings.cpp       |    48 -
 .../go/llvm/InstrumentationBindings.h         |    37 -
 .../llvm/bindings/go/llvm/SupportBindings.cpp |    25 -
 .../llvm/bindings/go/llvm/SupportBindings.h   |    29 -
 gnu/llvm/llvm/bindings/go/llvm/analysis.go    |    68 -
 gnu/llvm/llvm/bindings/go/llvm/bitreader.go   |    50 -
 gnu/llvm/llvm/bindings/go/llvm/bitwriter.go   |    38 -
 gnu/llvm/llvm/bindings/go/llvm/dibuilder.go   |   711 --
 .../llvm/bindings/go/llvm/executionengine.go  |   177 -
 .../bindings/go/llvm/executionengine_test.go  |    95 -
 gnu/llvm/llvm/bindings/go/llvm/ir.go          |  2016 ---
 gnu/llvm/llvm/bindings/go/llvm/ir_test.go     |   164 -
 gnu/llvm/llvm/bindings/go/llvm/linker.go      |    30 -
 .../llvm/bindings/go/llvm/llvm_config.go.in   |    12 -
 gnu/llvm/llvm/bindings/go/llvm/llvm_dep.go    |    18 -
 gnu/llvm/llvm/bindings/go/llvm/string.go      |   106 -
 gnu/llvm/llvm/bindings/go/llvm/string_test.go |    27 -
 gnu/llvm/llvm/bindings/go/llvm/support.go     |    53 -
 gnu/llvm/llvm/bindings/go/llvm/target.go      |   296 -
 .../bindings/go/llvm/transforms_coroutines.go |    23 -
 .../go/llvm/transforms_instrumentation.go     |    45 -
 .../llvm/bindings/go/llvm/transforms_ipo.go   |    40 -
 .../bindings/go/llvm/transforms_pmbuilder.go  |    72 -
 .../bindings/go/llvm/transforms_scalar.go     |    44 -
 gnu/llvm/llvm/bindings/go/llvm/version.go     |    20 -
 .../cmake/modules/AddLLVMDefinitions.cmake    |    17 -
 gnu/llvm/llvm/cmake/modules/FindGRPC.cmake    |   146 -
 .../llvm/cmake/modules/GetLibraryName.cmake   |     2 +-
 gnu/llvm/llvm/docs/AMDGPU/gfx1011_src32_0.rst |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx1011_src32_1.rst |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx1011_src32_2.rst |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx1011_src32_3.rst |    17 -
 .../llvm/docs/AMDGPU/gfx1011_type_dev.rst     |    13 -
 .../llvm/docs/AMDGPU/gfx1011_vdst32_0.rst     |    17 -
 .../llvm/docs/AMDGPU/gfx1011_vsrc32_0.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_addr_buf.rst  |    22 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_addr_ds.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_addr_flat.rst |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_addr_mimg.rst |    23 -
 .../llvm/docs/AMDGPU/gfx10_base_smem_addr.rst |    17 -
 .../llvm/docs/AMDGPU/gfx10_base_smem_buf.rst  |    17 -
 .../docs/AMDGPU/gfx10_base_smem_scratch.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_bimm16.rst    |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_bimm32.rst    |    13 -
 .../docs/AMDGPU/gfx10_data_buf_atomic128.rst  |    21 -
 .../docs/AMDGPU/gfx10_data_buf_atomic32.rst   |    21 -
 .../docs/AMDGPU/gfx10_data_buf_atomic64.rst   |    21 -
 .../AMDGPU/gfx10_data_mimg_atomic_cmp.rst     |    27 -
 .../AMDGPU/gfx10_data_mimg_atomic_reg.rst     |    26 -
 .../docs/AMDGPU/gfx10_data_mimg_store.rst     |    18 -
 .../docs/AMDGPU/gfx10_data_mimg_store_d16.rst |    21 -
 .../docs/AMDGPU/gfx10_data_smem_atomic128.rst |    21 -
 .../docs/AMDGPU/gfx10_data_smem_atomic32.rst  |    21 -
 .../docs/AMDGPU/gfx10_data_smem_atomic64.rst  |    21 -
 .../llvm/docs/AMDGPU/gfx10_dst_buf_128.rst    |    17 -
 .../llvm/docs/AMDGPU/gfx10_dst_buf_32.rst     |    17 -
 .../llvm/docs/AMDGPU/gfx10_dst_buf_64.rst     |    17 -
 .../llvm/docs/AMDGPU/gfx10_dst_buf_96.rst     |    17 -
 .../llvm/docs/AMDGPU/gfx10_dst_buf_lds.rst    |    21 -
 .../docs/AMDGPU/gfx10_dst_flat_atomic32.rst   |    19 -
 .../docs/AMDGPU/gfx10_dst_flat_atomic64.rst   |    19 -
 .../docs/AMDGPU/gfx10_dst_mimg_gather4.rst    |    22 -
 .../docs/AMDGPU/gfx10_dst_mimg_regular.rst    |    20 -
 .../AMDGPU/gfx10_dst_mimg_regular_d16.rst     |    22 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_fimm16.rst    |    14 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_fimm32.rst    |    14 -
 .../llvm/docs/AMDGPU/gfx10_mad_type_dev.rst   |    16 -
 .../AMDGPU/gfx10_mod_dpp_sdwa_abs_neg.rst     |    13 -
 .../llvm/docs/AMDGPU/gfx10_mod_sdwa_sext.rst  |    13 -
 .../docs/AMDGPU/gfx10_mod_vop3_abs_neg.rst    |    13 -
 .../llvm/docs/AMDGPU/gfx10_offset_buf.rst     |    17 -
 .../docs/AMDGPU/gfx10_offset_smem_buf.rst     |    17 -
 .../docs/AMDGPU/gfx10_offset_smem_plain.rst   |    20 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_opt.rst       |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_perm_smem.rst |    24 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_ret.rst       |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_rsrc_buf.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_rsrc_mimg.rst |    17 -
 .../docs/AMDGPU/gfx10_saddr_flat_global.rst   |    19 -
 .../docs/AMDGPU/gfx10_saddr_flat_scratch.rst  |    19 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_samp_mimg.rst |    17 -
 .../llvm/docs/AMDGPU/gfx10_sdata128_0.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_sdata32_0.rst |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_sdata64_0.rst |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst128_0.rst |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst256_0.rst |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst32_0.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst32_1.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst32_2.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst512_0.rst |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst64_0.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst64_1.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_simm16.rst    |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_src32_0.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_src32_1.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_src32_2.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_src32_3.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_src32_4.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_src32_5.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_src32_6.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_src64_0.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_src_exp.rst   |    28 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc32_0.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc32_1.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc32_2.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc32_3.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc32_4.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc32_5.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc64_0.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc64_1.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_type_dev.rst  |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_uimm16.rst    |    13 -
 .../docs/AMDGPU/gfx10_vaddr_flat_global.rst   |    20 -
 .../docs/AMDGPU/gfx10_vaddr_flat_scratch.rst  |    19 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_vcc_32.rst    |    16 -
 .../llvm/docs/AMDGPU/gfx10_vdata128_0.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_vdata32_0.rst |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_vdata64_0.rst |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_vdata96_0.rst |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_vdst128_0.rst |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_vdst32_0.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_vdst64_0.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_vdst96_0.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_vsrc128_0.rst |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_vsrc32_0.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_vsrc32_1.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_vsrc64_0.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_wsdst.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx10_wssrc.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_addr_buf.rst   |    24 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_addr_ds.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_addr_flat.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_addr_mimg.rst  |    21 -
 .../llvm/docs/AMDGPU/gfx7_base_smem_addr.rst  |    17 -
 .../llvm/docs/AMDGPU/gfx7_base_smem_buf.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_bimm16.rst     |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_bimm32.rst     |    13 -
 .../docs/AMDGPU/gfx7_data_buf_atomic128.rst   |    21 -
 .../docs/AMDGPU/gfx7_data_buf_atomic32.rst    |    21 -
 .../docs/AMDGPU/gfx7_data_buf_atomic64.rst    |    21 -
 .../docs/AMDGPU/gfx7_data_mimg_atomic_cmp.rst |    27 -
 .../docs/AMDGPU/gfx7_data_mimg_atomic_reg.rst |    26 -
 .../llvm/docs/AMDGPU/gfx7_data_mimg_store.rst |    18 -
 .../llvm/docs/AMDGPU/gfx7_dst_buf_128.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_buf_32.rst |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_buf_64.rst |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_buf_96.rst |    17 -
 .../llvm/docs/AMDGPU/gfx7_dst_buf_lds.rst     |    21 -
 .../docs/AMDGPU/gfx7_dst_flat_atomic32.rst    |    19 -
 .../docs/AMDGPU/gfx7_dst_flat_atomic64.rst    |    19 -
 .../docs/AMDGPU/gfx7_dst_mimg_gather4.rst     |    17 -
 .../docs/AMDGPU/gfx7_dst_mimg_regular.rst     |    20 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_fimm32.rst     |    14 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_mod.rst        |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_offset_buf.rst |    17 -
 .../llvm/docs/AMDGPU/gfx7_offset_smem.rst     |    21 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_opt.rst        |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_ret.rst        |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_rsrc_buf.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_rsrc_mimg.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_samp_mimg.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst128_0.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst256_0.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst32_0.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst32_1.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst32_2.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst512_0.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst64_0.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst64_1.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_simm16.rst     |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_src32_0.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_src32_1.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_src32_2.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_src32_3.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_src32_4.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_src32_5.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_src32_6.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_src64_0.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_src64_1.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_src64_2.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_src_exp.rst    |    28 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc32_0.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc32_1.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc32_2.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc32_3.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc32_4.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc32_5.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc32_6.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc64_0.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc64_1.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc64_2.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc64_3.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_type_dev.rst   |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_uimm16.rst     |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_vcc_64.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_vdata128_0.rst |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_vdata32_0.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_vdata64_0.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_vdata96_0.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_vdst128_0.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_vdst32_0.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_vdst64_0.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_vdst96_0.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_vsrc128_0.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_vsrc32_0.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_vsrc32_1.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx7_vsrc64_0.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_addr_buf.rst   |    22 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_addr_ds.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_addr_flat.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_addr_mimg.rst  |    21 -
 .../llvm/docs/AMDGPU/gfx8_base_smem_addr.rst  |    17 -
 .../llvm/docs/AMDGPU/gfx8_base_smem_buf.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_bimm16.rst     |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_bimm32.rst     |    13 -
 .../docs/AMDGPU/gfx8_data_buf_atomic128.rst   |    21 -
 .../docs/AMDGPU/gfx8_data_buf_atomic32.rst    |    21 -
 .../docs/AMDGPU/gfx8_data_buf_atomic64.rst    |    21 -
 .../docs/AMDGPU/gfx8_data_buf_d16_128.rst     |    20 -
 .../llvm/docs/AMDGPU/gfx8_data_buf_d16_32.rst |    17 -
 .../llvm/docs/AMDGPU/gfx8_data_buf_d16_64.rst |    20 -
 .../llvm/docs/AMDGPU/gfx8_data_buf_d16_96.rst |    20 -
 .../docs/AMDGPU/gfx8_data_mimg_atomic_cmp.rst |    27 -
 .../docs/AMDGPU/gfx8_data_mimg_atomic_reg.rst |    26 -
 .../llvm/docs/AMDGPU/gfx8_data_mimg_store.rst |    18 -
 .../docs/AMDGPU/gfx8_data_mimg_store_d16.rst  |    24 -
 .../llvm/docs/AMDGPU/gfx8_dst_buf_128.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_32.rst |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_64.rst |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_96.rst |    17 -
 .../llvm/docs/AMDGPU/gfx8_dst_buf_d16_128.rst |    21 -
 .../llvm/docs/AMDGPU/gfx8_dst_buf_d16_32.rst  |    17 -
 .../llvm/docs/AMDGPU/gfx8_dst_buf_d16_64.rst  |    21 -
 .../llvm/docs/AMDGPU/gfx8_dst_buf_d16_96.rst  |    21 -
 .../llvm/docs/AMDGPU/gfx8_dst_buf_lds.rst     |    21 -
 .../docs/AMDGPU/gfx8_dst_flat_atomic32.rst    |    19 -
 .../docs/AMDGPU/gfx8_dst_flat_atomic64.rst    |    19 -
 .../docs/AMDGPU/gfx8_dst_mimg_gather4.rst     |    26 -
 .../docs/AMDGPU/gfx8_dst_mimg_regular.rst     |    20 -
 .../docs/AMDGPU/gfx8_dst_mimg_regular_d16.rst |    26 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_fimm16.rst     |    14 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_fimm32.rst     |    14 -
 .../docs/AMDGPU/gfx8_mod_dpp_sdwa_abs_neg.rst |    13 -
 .../llvm/docs/AMDGPU/gfx8_mod_sdwa_sext.rst   |    13 -
 .../docs/AMDGPU/gfx8_mod_vop3_abs_neg.rst     |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_offset_buf.rst |    17 -
 .../docs/AMDGPU/gfx8_offset_smem_load.rst     |    17 -
 .../docs/AMDGPU/gfx8_offset_smem_store.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_opt.rst        |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_perm_smem.rst  |    24 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_ret.rst        |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_rsrc_buf.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_rsrc_mimg.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_samp_mimg.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_sdata128_0.rst |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_sdata32_0.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_sdata64_0.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst128_0.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst256_0.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst32_0.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst32_1.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst32_2.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst512_0.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst64_0.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst64_1.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_simm16.rst     |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_0.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_1.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_2.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_3.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_4.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_5.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_6.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_7.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_src64_0.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_src64_1.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_src_exp.rst    |    28 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc32_0.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc32_1.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc32_2.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc32_3.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc32_4.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc64_0.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc64_1.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc64_2.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc64_3.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_type_dev.rst   |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_uimm16.rst     |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_vcc_64.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_vdata128_0.rst |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_vdata32_0.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_vdata64_0.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_vdata96_0.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_vdst128_0.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_vdst32_0.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_vdst64_0.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_vdst96_0.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_vsrc128_0.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_vsrc32_0.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_vsrc32_1.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx8_vsrc64_0.rst   |    17 -
 .../llvm/docs/AMDGPU/gfx900_mad_type_dev.rst  |    16 -
 .../docs/AMDGPU/gfx900_mod_vop3_abs_neg.rst   |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx900_src32_0.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx900_src32_1.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx900_vdst32_0.rst |    17 -
 .../llvm/docs/AMDGPU/gfx904_mad_type_dev.rst  |    16 -
 .../docs/AMDGPU/gfx904_mod_vop3_abs_neg.rst   |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx904_src32_0.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx904_src32_1.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx904_vdst32_0.rst |    17 -
 .../llvm/docs/AMDGPU/gfx906_mad_type_dev.rst  |    16 -
 .../AMDGPU/gfx906_mod_dpp_sdwa_abs_neg.rst    |    13 -
 .../llvm/docs/AMDGPU/gfx906_mod_sdwa_sext.rst |    13 -
 .../docs/AMDGPU/gfx906_mod_vop3_abs_neg.rst   |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx906_src32_0.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx906_src32_1.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx906_src32_2.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx906_src32_3.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx906_src32_4.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx906_type_dev.rst |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx906_vdst32_0.rst |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx906_vsrc32_0.rst |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx908_addr_buf.rst |    22 -
 .../llvm/docs/AMDGPU/gfx908_adst1024_0.rst    |    17 -
 .../llvm/docs/AMDGPU/gfx908_adst128_0.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx908_adst32_0.rst |    17 -
 .../llvm/docs/AMDGPU/gfx908_adst512_0.rst     |    17 -
 .../llvm/docs/AMDGPU/gfx908_asrc1024_0.rst    |    17 -
 .../llvm/docs/AMDGPU/gfx908_asrc128_0.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx908_asrc32_0.rst |    17 -
 .../llvm/docs/AMDGPU/gfx908_asrc512_0.rst     |    17 -
 .../docs/AMDGPU/gfx908_data_buf_atomic32.rst  |    21 -
 .../docs/AMDGPU/gfx908_dst_flat_atomic32.rst  |    19 -
 .../llvm/docs/AMDGPU/gfx908_mad_type_dev.rst  |    16 -
 .../AMDGPU/gfx908_mod_dpp_sdwa_abs_neg.rst    |    13 -
 .../llvm/docs/AMDGPU/gfx908_mod_sdwa_sext.rst |    13 -
 .../docs/AMDGPU/gfx908_mod_vop3_abs_neg.rst   |    13 -
 .../llvm/docs/AMDGPU/gfx908_offset_buf.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx908_opt.rst      |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx908_ret.rst      |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx908_rsrc_buf.rst |    17 -
 .../docs/AMDGPU/gfx908_saddr_flat_global.rst  |    19 -
 gnu/llvm/llvm/docs/AMDGPU/gfx908_src32_0.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx908_src32_1.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx908_src32_2.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx908_src32_3.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx908_src32_4.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx908_src32_5.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx908_type_dev.rst |    13 -
 .../docs/AMDGPU/gfx908_vaddr_flat_global.rst  |    20 -
 .../llvm/docs/AMDGPU/gfx908_vasrc32_0.rst     |    17 -
 .../llvm/docs/AMDGPU/gfx908_vasrc64_0.rst     |    17 -
 .../llvm/docs/AMDGPU/gfx908_vdata32_0.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx908_vdst32_0.rst |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx908_vsrc32_0.rst |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_imm16.rst    |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_imm16_1.rst  |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_imm16_2.rst  |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_m.rst        |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_m_1.rst      |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_opt.rst      |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_saddr.rst    |    19 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_saddr_1.rst  |    19 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_sbase.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_sbase_1.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_sbase_2.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdata.rst    |    21 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdata_1.rst  |    21 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdata_2.rst  |    21 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdata_3.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdata_4.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdata_5.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst_1.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst_2.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst_3.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst_4.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst_5.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst_6.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst_7.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_simm32.rst   |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_simm32_1.rst |    14 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_simm32_2.rst |    14 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_soffset.rst  |    17 -
 .../llvm/docs/AMDGPU/gfx90a_soffset_1.rst     |    20 -
 .../llvm/docs/AMDGPU/gfx90a_soffset_2.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_src.rst      |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_1.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_10.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_11.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_2.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_3.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_4.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_5.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_6.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_7.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_8.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_9.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_srsrc.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_srsrc_1.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_1.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_2.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_3.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_4.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_5.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_6.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_7.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_8.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vaddr.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vaddr_1.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vaddr_2.rst  |    20 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vaddr_3.rst  |    19 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vaddr_4.rst  |    21 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vaddr_5.rst  |    22 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata0.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata0_1.rst |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata1.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata1_1.rst |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_1.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_10.rst |    21 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_2.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_3.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_4.rst  |    26 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_5.rst  |    26 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_6.rst  |    20 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_7.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_8.rst  |    21 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_9.rst  |    21 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_1.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_10.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_11.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_12.rst  |    21 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_13.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_14.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_15.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_16.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_17.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_18.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_19.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_2.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_3.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_4.rst   |    19 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_5.rst   |    19 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_6.rst   |    20 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_7.rst   |    21 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_8.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_9.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vsrc.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vsrc_1.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vsrc_2.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vsrc_3.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vsrc_4.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vsrc_5.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_imm16.rst      |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_imm16_1.rst    |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_imm16_2.rst    |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_m.rst          |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_m_1.rst        |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_opt.rst        |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_saddr.rst      |    19 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_saddr_1.rst    |    19 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_sbase.rst      |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_sbase_1.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_sbase_2.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_sdata.rst      |    21 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_sdata_1.rst    |    21 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_sdata_2.rst    |    21 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_sdata_3.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_sdata_4.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_sdata_5.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst.rst       |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst_1.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst_2.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst_3.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst_4.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst_5.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst_6.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst_7.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_simm32.rst     |    13 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_simm32_1.rst   |    14 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_simm32_2.rst   |    14 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_soffset.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_soffset_1.rst  |    20 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_soffset_2.rst  |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_src.rst        |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_src_1.rst      |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_src_10.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_src_2.rst      |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_src_3.rst      |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_src_4.rst      |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_src_5.rst      |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_src_6.rst      |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_src_7.rst      |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_src_8.rst      |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_src_9.rst      |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_srsrc.rst      |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_srsrc_1.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc.rst       |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_1.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_2.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_3.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_4.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_5.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_6.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_7.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_8.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vaddr.rst      |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vaddr_1.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vaddr_2.rst    |    20 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vaddr_3.rst    |    19 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vaddr_4.rst    |    21 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vaddr_5.rst    |    22 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata.rst      |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata0.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata0_1.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata1.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata1_1.rst   |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_1.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_10.rst   |    21 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_2.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_3.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_4.rst    |    26 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_5.rst    |    26 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_6.rst    |    20 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_7.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_8.rst    |    21 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_9.rst    |    21 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst.rst       |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_1.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_10.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_11.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_12.rst    |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_13.rst    |    21 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_2.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_3.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_4.rst     |    19 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_5.rst     |    19 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_6.rst     |    22 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_7.rst     |    20 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_8.rst     |    21 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_9.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vsrc.rst       |    28 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vsrc_1.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vsrc_2.rst     |    17 -
 gnu/llvm/llvm/docs/AMDGPU/gfx9_vsrc_3.rst     |    17 -
 gnu/llvm/llvm/docs/Makefile.sphinx            |   155 -
 gnu/llvm/llvm/docs/Proposals/LLVMLibC.rst     |   125 -
 .../IRTransforms/InitializePasses.cpp         |    21 -
 .../examples/IRTransforms/InitializePasses.h  |    22 -
 .../llvm/examples/IRTransforms/SimplifyCFG.h  |    24 -
 .../CMakeLists.txt                            |    12 -
 .../LLJITWithTargetProcessControl.cpp         |   197 -
 .../llvm-c/Transforms/AggressiveInstCombine.h |    40 -
 .../include/llvm-c/Transforms/Coroutines.h    |    56 -
 gnu/llvm/llvm/include/llvm/ADT/Waymarking.h   |   322 -
 .../llvm/Analysis/CFLAliasAnalysisUtils.h     |    57 -
 .../llvm/Analysis/CFLAndersAliasAnalysis.h    |   127 -
 .../llvm/Analysis/CFLSteensAliasAnalysis.h    |   144 -
 .../llvm/include/llvm/BinaryFormat/Dwarf.def  |    30 +-
 gnu/llvm/llvm/include/llvm/BinaryFormat/ELF.h |   182 +-
 .../llvm/include/llvm/CodeGen/AsmPrinter.h    |   101 +-
 .../llvm/CodeGen/GlobalISel/RegisterBank.h    |    98 -
 .../CodeGen/GlobalISel/RegisterBankInfo.h     |   775 --
 .../include/llvm/CodeGen/MachineFrameInfo.h   |    59 +-
 gnu/llvm/llvm/include/llvm/CodeGen/Passes.h   |    66 +-
 .../llvm/CodeGen/TargetFrameLowering.h        |    30 +-
 .../llvm/include/llvm/DebugInfo/GSYM/Range.h  |   130 -
 .../ExecutionEngine/Orc/LLVMSPSSerializers.h  |    69 -
 .../Orc/OrcRPCExecutorProcessControl.h        |   436 -
 .../Orc/OrcRemoteTargetClient.h               |   925 --
 .../Orc/OrcRemoteTargetRPCAPI.h               |   386 -
 .../Orc/OrcRemoteTargetServer.h               |   464 -
 .../Orc/Shared/FDRawByteChannel.h             |    79 -
 .../ExecutionEngine/Orc/Shared/RPCUtils.h     |  1659 ---
 .../Orc/Shared/RawByteChannel.h               |   183 -
 .../Orc/Shared/Serialization.h                |   769 --
 .../Orc/TargetProcess/OrcRPCTPCServer.h       |   660 -
 .../ExecutionEngine/OrcMCJITReplacement.h     |    37 -
 .../llvm/ExecutionEngine/OrcV1Deprecation.h   |    22 -
 .../include/llvm/IR/GlobalIndirectSymbol.h    |    93 -
 gnu/llvm/llvm/include/llvm/InitializePasses.h |   113 +-
 gnu/llvm/llvm/include/llvm/LTO/Caching.h      |    38 -
 .../include/llvm/MC/MCFixedLenDisassembler.h  |    33 -
 .../llvm/Support/AArch64TargetParser.def      |   239 -
 .../include/llvm/Support/ARMTargetParser.def  |   322 -
 .../llvm/Support/RISCVTargetParser.def        |    27 -
 .../include/llvm/Support/TargetRegistry.h     |  1297 --
 .../llvm/include/llvm/Support/ThreadLocal.h   |    62 -
 .../llvm/Testing/Support/Annotations.h        |    92 -
 .../llvm/include/llvm/Transforms/Coroutines.h |    37 -
 .../InstCombine/InstCombineWorklist.h         |   128 -
 .../llvm/Transforms/Scalar/LowerAtomic.h      |    35 -
 .../include/llvm/Transforms/Utils/MisExpect.h |    82 +
 .../lib/Analysis/CFLAndersAliasAnalysis.cpp   |   931 --
 gnu/llvm/llvm/lib/Analysis/CFLGraph.h         |   667 -
 .../lib/Analysis/CFLSteensAliasAnalysis.cpp   |   364 -
 .../lib/Analysis/ReleaseModeModelRunner.cpp   |    90 -
 gnu/llvm/llvm/lib/Analysis/TFUtils.cpp        |   542 -
 .../Analysis/models/generate_mock_model.py    |    69 -
 .../lib/Analysis/models/inlining/config.py    |    87 -
 .../lib/CodeGen/AsmPrinter/AsmPrinter.cpp     |  1120 +-
 gnu/llvm/llvm/lib/CodeGen/CMakeLists.txt      |    57 +-
 .../lib/CodeGen/GlobalISel/RegisterBank.cpp   |   110 -
 .../CodeGen/GlobalISel/RegisterBankInfo.cpp   |   805 --
 .../llvm/lib/CodeGen/PrologEpilogInserter.cpp |   526 +-
 .../lib/CodeGen/SelectionDAG/DAGCombiner.cpp  |  7003 +++++++---
 .../llvm/lib/CodeGen/TargetPassConfig.cpp     |   254 +-
 gnu/llvm/llvm/lib/DebugInfo/GSYM/Range.cpp    |   124 -
 .../Symbolize/SymbolizableObjectFile.h        |   103 -
 .../ExecutionEngine/Orc/Shared/RPCError.cpp   |    58 -
 gnu/llvm/llvm/lib/IR/ConstantFold.h           |    56 -
 gnu/llvm/llvm/lib/LTO/Caching.cpp             |   151 -
 gnu/llvm/llvm/lib/MC/MCELFStreamer.cpp        |    79 +-
 gnu/llvm/llvm/lib/MC/MCParser/AsmParser.cpp   |   276 +-
 .../llvm/lib/Support/AArch64TargetParser.cpp  |   281 -
 gnu/llvm/llvm/lib/Support/ARMTargetParser.cpp |   624 -
 gnu/llvm/llvm/lib/Support/Host.cpp            |  1738 ---
 gnu/llvm/llvm/lib/Support/TargetParser.cpp    |   335 -
 gnu/llvm/llvm/lib/Support/TargetRegistry.cpp  |   134 -
 gnu/llvm/llvm/lib/Support/ThreadLocal.cpp     |    47 -
 gnu/llvm/llvm/lib/Support/Triple.cpp          |  1781 ---
 gnu/llvm/llvm/lib/Support/Unix/Host.inc       |    84 -
 gnu/llvm/llvm/lib/Support/Unix/Process.inc    |   107 +-
 .../llvm/lib/Support/Unix/ThreadLocal.inc     |    70 -
 gnu/llvm/llvm/lib/Support/Windows/Host.inc    |    33 -
 .../llvm/lib/Support/Windows/ThreadLocal.inc  |    51 -
 gnu/llvm/llvm/lib/Support/X86TargetParser.cpp |   662 -
 .../lib/Target/AArch64/AArch64AsmPrinter.cpp  |   278 +-
 .../Target/AArch64/AArch64FrameLowering.cpp   |  1325 +-
 .../lib/Target/AArch64/AArch64FrameLowering.h |    25 +-
 .../Target/AArch64/AArch64ISelLowering.cpp    |  9572 ++++++++++----
 .../lib/Target/AArch64/AArch64InstrInfo.cpp   |  1572 ++-
 .../lib/Target/AArch64/AArch64InstrInfo.td    |  1757 ++-
 .../lib/Target/AArch64/AArch64Subtarget.h     |   445 +-
 .../Target/AArch64/AArch64TargetMachine.cpp   |   188 +-
 .../llvm/lib/Target/AArch64/CMakeLists.txt    |     5 +
 .../lib/Target/AArch64/GISel/select-saddo.mir |   158 -
 .../lib/Target/AArch64/GISel/select-ssubo.mir |   158 -
 .../AMDGPU/AMDGPUFixFunctionBitcasts.cpp      |    64 -
 .../Target/AMDGPU/AMDILCFGStructurizer.cpp    |  1656 ---
 .../Target/AMDGPU/Utils/AMDGPULDSUtils.cpp    |   355 -
 .../lib/Target/AMDGPU/Utils/AMDGPULDSUtils.h  |    70 -
 .../lib/Target/AVR/AVRRelaxMemOperations.cpp  |   148 -
 .../llvm/lib/Target/Hexagon/HexagonArch.h     |    37 -
 .../Target/M68k/GlSel/M68kCallLowering.cpp    |   152 -
 .../lib/Target/M68k/GlSel/M68kCallLowering.h  |    72 -
 .../M68k/GlSel/M68kInstructionSelector.cpp    |    90 -
 .../Target/M68k/GlSel/M68kLegalizerInfo.cpp   |    33 -
 .../lib/Target/M68k/GlSel/M68kLegalizerInfo.h |    29 -
 .../M68k/GlSel/M68kRegisterBankInfo.cpp       |    27 -
 .../Target/M68k/GlSel/M68kRegisterBankInfo.h  |    39 -
 .../Target/M68k/GlSel/M68kRegisterBanks.td    |    15 -
 .../Target/Mips/AsmParser/MipsAsmParser.cpp   |   111 +-
 gnu/llvm/llvm/lib/Target/Mips/CMakeLists.txt  |     6 +
 .../Target/Mips/MCTargetDesc/MipsABIInfo.cpp  |    10 +-
 gnu/llvm/llvm/lib/Target/Mips/Mips.h          |    69 +-
 .../llvm/lib/Target/Mips/MipsAsmPrinter.cpp   |    65 +-
 .../llvm/lib/Target/Mips/MipsFrameLowering.h  |     5 +-
 .../llvm/lib/Target/Mips/MipsISelLowering.cpp |   147 +-
 .../llvm/lib/Target/Mips/MipsInstrInfo.td     |     4 +
 .../lib/Target/Mips/MipsTargetMachine.cpp     |    57 +-
 .../llvm/lib/Target/NVPTX/ManagedStringPool.h |    48 -
 .../llvm/lib/Target/PowerPC/CMakeLists.txt    |     3 +
 .../llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp |   265 +-
 .../lib/Target/PowerPC/PPCFrameLowering.cpp   |   187 +-
 .../lib/Target/PowerPC/PPCFrameLowering.h     |    22 +-
 .../lib/Target/PowerPC/PPCISelLowering.cpp    |  1951 ++-
 .../llvm/lib/Target/PowerPC/PPCInstrInfo.td   |   833 +-
 .../llvm/lib/Target/PowerPC/PPCInstrPrefix.td |  2838 -----
 .../llvm/lib/Target/PowerPC/PPCSubtarget.h    |   169 +-
 .../lib/Target/PowerPC/PPCTargetMachine.cpp   |    68 +-
 .../lib/Target/RISCV/RISCVCallLowering.cpp    |    51 -
 .../llvm/lib/Target/RISCV/RISCVCallLowering.h |    44 -
 .../lib/Target/RISCV/RISCVISelLowering.cpp    | 10272 +++++++++++----
 .../llvm/lib/Target/RISCV/RISCVInstrInfoB.td  |  1121 --
 .../Target/RISCV/RISCVInstructionSelector.cpp |   104 -
 .../lib/Target/RISCV/RISCVLegalizerInfo.cpp   |    23 -
 .../lib/Target/RISCV/RISCVLegalizerInfo.h     |    28 -
 .../Target/RISCV/RISCVRegisterBankInfo.cpp    |    26 -
 .../lib/Target/RISCV/RISCVRegisterBankInfo.h  |    37 -
 .../lib/Target/RISCV/RISCVRegisterBanks.td    |    13 -
 .../llvm/lib/Target/RISCV/RISCVScheduleB.td   |    89 -
 .../lib/Target/Sparc/SparcISelLowering.cpp    |   414 +-
 .../llvm/lib/Target/Sparc/SparcInstr64Bit.td  |   126 +-
 .../llvm/lib/Target/Sparc/SparcInstrInfo.td   |   480 +-
 .../WebAssemblyLowerGlobalDtors.cpp           |   208 -
 .../WebAssemblyPrepareForLiveIntervals.cpp    |   127 -
 gnu/llvm/llvm/lib/Target/X86/CMakeLists.txt   |    14 +-
 .../Target/X86/MCTargetDesc/X86AsmBackend.cpp |   154 +-
 gnu/llvm/llvm/lib/Target/X86/X86.h            |    33 +-
 gnu/llvm/llvm/lib/Target/X86/X86.td           |  1081 +-
 gnu/llvm/llvm/lib/Target/X86/X86AsmPrinter.h  |    22 +-
 .../llvm/lib/Target/X86/X86FixupGadgets.cpp   |    24 +-
 .../llvm/lib/Target/X86/X86FrameLowering.cpp  |   544 +-
 .../llvm/lib/Target/X86/X86FrameLowering.h    |    28 +-
 .../llvm/lib/Target/X86/X86IndirectThunks.cpp |    24 +-
 .../llvm/lib/Target/X86/X86InstrCompiler.td   |   228 +-
 gnu/llvm/llvm/lib/Target/X86/X86InstrMPX.td   |    77 -
 .../llvm/lib/Target/X86/X86MCInstLower.cpp    |   232 +-
 .../lib/Target/X86/X86MachineFunctionInfo.h   |    31 +-
 .../llvm/lib/Target/X86/X86RegisterInfo.td    |    61 +-
 .../Target/X86/X86ReturnProtectorLowering.cpp |    24 +-
 gnu/llvm/llvm/lib/Target/X86/X86Subtarget.h   |   651 +-
 .../llvm/lib/Target/X86/X86TargetMachine.cpp  |   114 +-
 .../lib/Target/X86/X86WinAllocaExpander.cpp   |   302 -
 .../llvm/lib/Testing/Support/Annotations.cpp  |   100 -
 gnu/llvm/llvm/lib/Transforms/IPO/PruneEH.cpp  |   264 -
 .../Instrumentation/MaximumSpanningTree.h     |   109 -
 .../Transforms/Scalar/LoopIdiomRecognize.cpp  |   485 +-
 .../lib/Transforms/Scalar/LoopUnswitch.cpp    |  1780 ---
 .../lib/Transforms/Scalar/LowerAtomic.cpp     |   177 -
 gnu/llvm/llvm/lib/Transforms/Scalar/SCCP.cpp  |   532 +-
 .../llvm/lib/Transforms/Utils/MisExpect.cpp   |   214 +
 .../lib/Transforms/Vectorize/VPlanLoopInfo.h  |    44 -
 .../Transforms/Vectorize/VPlanPredicator.cpp  |   248 -
 .../Transforms/Vectorize/VPlanPredicator.h    |    74 -
 gnu/llvm/llvm/tools/lli/RemoteJITUtils.h      |   125 -
 gnu/llvm/llvm/tools/llvm-ar/llvm-ar.cpp       |   405 +-
 .../llvm/tools/llvm-config/llvm-config.cpp    |    88 +-
 .../llvm/tools/llvm-diff/DiffConsumer.cpp     |   212 -
 gnu/llvm/llvm/tools/llvm-diff/DiffConsumer.h  |    90 -
 gnu/llvm/llvm/tools/llvm-diff/DiffLog.cpp     |    54 -
 gnu/llvm/llvm/tools/llvm-diff/DiffLog.h       |    83 -
 .../llvm/tools/llvm-diff/DifferenceEngine.cpp |   854 --
 .../llvm/tools/llvm-diff/DifferenceEngine.h   |    90 -
 gnu/llvm/llvm/tools/llvm-go/CMakeLists.txt    |     9 -
 gnu/llvm/llvm/tools/llvm-go/llvm-go.go        |   311 -
 gnu/llvm/llvm/tools/llvm-mca/Views/View.cpp   |    24 -
 gnu/llvm/llvm/tools/llvm-mca/Views/View.h     |    41 -
 .../lib/AMDGPU/AMDGPUCustomBehaviour.cpp      |    33 -
 .../lib/AMDGPU/AMDGPUCustomBehaviour.h        |    57 -
 .../tools/llvm-mca/lib/AMDGPU/CMakeLists.txt  |    18 -
 .../llvm/tools/llvm-mca/lib/CMakeLists.txt    |    11 -
 .../llvm/tools/llvm-objcopy/COFF/COFFConfig.h |    21 -
 .../tools/llvm-objcopy/COFF/COFFObjcopy.cpp   |   273 -
 .../tools/llvm-objcopy/COFF/COFFObjcopy.h     |    33 -
 .../llvm/tools/llvm-objcopy/COFF/Object.cpp   |   132 -
 .../llvm/tools/llvm-objcopy/COFF/Object.h     |   211 -
 .../llvm/tools/llvm-objcopy/COFF/Reader.cpp   |   226 -
 .../llvm/tools/llvm-objcopy/COFF/Reader.h     |    41 -
 .../llvm/tools/llvm-objcopy/COFF/Writer.cpp   |   459 -
 .../llvm/tools/llvm-objcopy/COFF/Writer.h     |    63 -
 .../llvm/tools/llvm-objcopy/CommonConfig.h    |   280 -
 .../llvm/tools/llvm-objcopy/ConfigManager.cpp |  1382 --
 .../llvm/tools/llvm-objcopy/ConfigManager.h   |    80 -
 .../llvm/tools/llvm-objcopy/ELF/ELFConfig.h   |    28 -
 .../tools/llvm-objcopy/ELF/ELFObjcopy.cpp     |   776 --
 .../llvm/tools/llvm-objcopy/ELF/ELFObjcopy.h  |    40 -
 .../llvm/tools/llvm-objcopy/ELF/Object.cpp    |  2730 ----
 gnu/llvm/llvm/tools/llvm-objcopy/ELF/Object.h |  1104 --
 .../tools/llvm-objcopy/MachO/MachOConfig.h    |    21 -
 .../llvm-objcopy/MachO/MachOLayoutBuilder.cpp |   403 -
 .../llvm-objcopy/MachO/MachOLayoutBuilder.h   |    54 -
 .../tools/llvm-objcopy/MachO/MachOObjcopy.cpp |   481 -
 .../tools/llvm-objcopy/MachO/MachOObjcopy.h   |    38 -
 .../tools/llvm-objcopy/MachO/MachOReader.cpp  |   346 -
 .../tools/llvm-objcopy/MachO/MachOReader.h    |    55 -
 .../tools/llvm-objcopy/MachO/MachOWriter.cpp  |   555 -
 .../tools/llvm-objcopy/MachO/MachOWriter.h    |    68 -
 .../llvm/tools/llvm-objcopy/MachO/Object.cpp  |   194 -
 .../llvm/tools/llvm-objcopy/MachO/Object.h    |   366 -
 .../tools/llvm-objcopy/MultiFormatConfig.h    |    37 -
 .../llvm/tools/llvm-objcopy/llvm-objcopy.h    |    34 -
 .../llvm/tools/llvm-objcopy/wasm/Object.cpp   |    34 -
 .../llvm/tools/llvm-objcopy/wasm/Object.h     |    47 -
 .../llvm/tools/llvm-objcopy/wasm/Reader.cpp   |    33 -
 .../llvm/tools/llvm-objcopy/wasm/Reader.h     |    31 -
 .../llvm/tools/llvm-objcopy/wasm/WasmConfig.h |    21 -
 .../tools/llvm-objcopy/wasm/WasmObjcopy.cpp   |   162 -
 .../tools/llvm-objcopy/wasm/WasmObjcopy.h     |    32 -
 .../llvm/tools/llvm-objcopy/wasm/Writer.cpp   |    79 -
 .../llvm/tools/llvm-objcopy/wasm/Writer.h     |    49 -
 gnu/llvm/llvm/tools/llvm-objdump/ELFDump.cpp  |    49 +-
 .../llvm/tools/llvm-pdbutil/FormatUtil.cpp    |   258 -
 gnu/llvm/llvm/tools/llvm-pdbutil/FormatUtil.h |   141 -
 .../llvm/tools/llvm-pdbutil/InputFile.cpp     |   510 -
 gnu/llvm/llvm/tools/llvm-pdbutil/InputFile.h  |   155 -
 .../llvm/tools/llvm-pdbutil/LinePrinter.cpp   |   333 -
 .../llvm/tools/llvm-pdbutil/LinePrinter.h     |   168 -
 .../llvm/tools/llvm-profgen/PseudoProbe.cpp   |   341 -
 .../llvm/tools/llvm-profgen/PseudoProbe.h     |   227 -
 .../llvm/tools/llvm-readobj/ELFDumper.cpp     |   843 +-
 .../deltas/ReduceModuleInlineAsm.cpp          |    32 -
 .../deltas/ReduceModuleInlineAsm.h            |    18 -
 gnu/llvm/llvm/tools/llvm-shlib/CMakeLists.txt |     2 +-
 gnu/llvm/llvm/tools/msbuild/.gitignore        |     6 -
 .../llvm/tools/msbuild/LLVM.Cpp.Common.props  |    79 -
 .../tools/msbuild/LLVM.Cpp.Common.targets     |   132 -
 .../tools/msbuild/Platformx64/Toolset.props   |    11 -
 .../tools/msbuild/Platformx64/Toolset.targets |     3 -
 .../tools/msbuild/Platformx86/Toolset.props   |    11 -
 .../tools/msbuild/Platformx86/Toolset.targets |     3 -
 gnu/llvm/llvm/tools/msbuild/install.bat       |    57 -
 gnu/llvm/llvm/tools/msbuild/license.txt       |   261 -
 gnu/llvm/llvm/tools/msbuild/llvm-general.xml  |    76 -
 gnu/llvm/llvm/tools/msbuild/llvm.csproj       |    97 -
 gnu/llvm/llvm/tools/msbuild/llvm.sln          |    25 -
 .../msbuild/source.extension.vsixmanifest     |    22 -
 gnu/llvm/llvm/tools/msbuild/uninstall.bat     |    33 -
 gnu/llvm/llvm/tools/opt/GraphPrinters.cpp     |    45 -
 gnu/llvm/llvm/tools/opt/PassPrinters.cpp      |   212 -
 gnu/llvm/llvm/tools/opt/PassPrinters.h        |    40 -
 gnu/llvm/llvm/tools/opt/PrintSCC.cpp          |   111 -
 gnu/llvm/llvm/tools/split-file/.clang-tidy    |     8 -
 gnu/llvm/llvm/tools/split-file/CMakeLists.txt |     7 -
 gnu/llvm/llvm/tools/split-file/split-file.cpp |   174 -
 .../llvm/unittests/ADT/APFixedPointTest.cpp   |   924 --
 gnu/llvm/llvm/unittests/ADT/APFloatTest.cpp   |  4969 --------
 gnu/llvm/llvm/unittests/ADT/APIntTest.cpp     |  2931 -----
 gnu/llvm/llvm/unittests/ADT/APSIntTest.cpp    |   271 -
 gnu/llvm/llvm/unittests/ADT/AnyTest.cpp       |   174 -
 gnu/llvm/llvm/unittests/ADT/ArrayRefTest.cpp  |   268 -
 gnu/llvm/llvm/unittests/ADT/BitFieldsTest.cpp |   256 -
 gnu/llvm/llvm/unittests/ADT/BitVectorTest.cpp |  1301 --
 .../llvm/unittests/ADT/BitmaskEnumTest.cpp    |   133 -
 .../ADT/BreadthFirstIteratorTest.cpp          |    73 -
 .../llvm/unittests/ADT/BumpPtrListTest.cpp    |   242 -
 gnu/llvm/llvm/unittests/ADT/CMakeLists.txt    |    86 -
 .../unittests/ADT/CoalescingBitVectorTest.cpp |   561 -
 .../unittests/ADT/DAGDeltaAlgorithmTest.cpp   |   104 -
 .../llvm/unittests/ADT/DeltaAlgorithmTest.cpp |    99 -
 gnu/llvm/llvm/unittests/ADT/DenseMapTest.cpp  |   658 -
 gnu/llvm/llvm/unittests/ADT/DenseSetTest.cpp  |   233 -
 .../unittests/ADT/DepthFirstIteratorTest.cpp  |    53 -
 .../llvm/unittests/ADT/DirectedGraphTest.cpp  |   295 -
 .../unittests/ADT/EnumeratedArrayTest.cpp     |    51 -
 .../unittests/ADT/EquivalenceClassesTest.cpp  |    84 -
 .../unittests/ADT/FallibleIteratorTest.cpp    |   291 -
 .../llvm/unittests/ADT/FloatingPointMode.cpp  |   134 -
 gnu/llvm/llvm/unittests/ADT/FoldingSet.cpp    |   192 -
 .../llvm/unittests/ADT/FunctionExtrasTest.cpp |   294 -
 .../llvm/unittests/ADT/FunctionRefTest.cpp    |    62 -
 gnu/llvm/llvm/unittests/ADT/HashingTest.cpp   |   405 -
 gnu/llvm/llvm/unittests/ADT/IListBaseTest.cpp |   165 -
 .../llvm/unittests/ADT/IListIteratorTest.cpp  |   173 -
 .../llvm/unittests/ADT/IListNodeBaseTest.cpp  |    99 -
 gnu/llvm/llvm/unittests/ADT/IListNodeTest.cpp |    69 -
 .../llvm/unittests/ADT/IListSentinelTest.cpp  |    62 -
 gnu/llvm/llvm/unittests/ADT/IListTest.cpp     |   305 -
 .../llvm/unittests/ADT/ImmutableListTest.cpp  |   272 -
 .../llvm/unittests/ADT/ImmutableMapTest.cpp   |    90 -
 .../llvm/unittests/ADT/ImmutableSetTest.cpp   |   202 -
 .../llvm/unittests/ADT/IntEqClassesTest.cpp   |   106 -
 .../llvm/unittests/ADT/IntervalMapTest.cpp    |   816 --
 .../unittests/ADT/IntrusiveRefCntPtrTest.cpp  |   145 -
 gnu/llvm/llvm/unittests/ADT/IteratorTest.cpp  |   452 -
 gnu/llvm/llvm/unittests/ADT/MapVectorTest.cpp |   423 -
 .../llvm/unittests/ADT/MappedIteratorTest.cpp |    50 -
 gnu/llvm/llvm/unittests/ADT/OptionalTest.cpp  |   808 --
 .../llvm/unittests/ADT/PackedVectorTest.cpp   |   102 -
 .../unittests/ADT/PointerEmbeddedIntTest.cpp  |    79 -
 .../llvm/unittests/ADT/PointerIntPairTest.cpp |   109 -
 .../llvm/unittests/ADT/PointerSumTypeTest.cpp |   112 -
 .../llvm/unittests/ADT/PointerUnionTest.cpp   |   159 -
 .../unittests/ADT/PostOrderIteratorTest.cpp   |    74 -
 .../unittests/ADT/PriorityWorklistTest.cpp    |   152 -
 .../llvm/unittests/ADT/RangeAdapterTest.cpp   |   171 -
 .../llvm/unittests/ADT/SCCIteratorTest.cpp    |   120 -
 gnu/llvm/llvm/unittests/ADT/STLExtrasTest.cpp |   879 --
 .../unittests/ADT/STLForwardCompatTest.cpp    |    78 -
 gnu/llvm/llvm/unittests/ADT/ScopeExitTest.cpp |    48 -
 gnu/llvm/llvm/unittests/ADT/SequenceTest.cpp  |   218 -
 gnu/llvm/llvm/unittests/ADT/SetVectorTest.cpp |    50 -
 .../llvm/unittests/ADT/SimpleIListTest.cpp    |   653 -
 .../llvm/unittests/ADT/SmallPtrSetTest.cpp    |   410 -
 gnu/llvm/llvm/unittests/ADT/SmallSetTest.cpp  |   194 -
 .../llvm/unittests/ADT/SmallStringTest.cpp    |   247 -
 .../llvm/unittests/ADT/SmallVectorTest.cpp    |  1413 ---
 .../unittests/ADT/SparseBitVectorTest.cpp     |   189 -
 .../llvm/unittests/ADT/SparseMultiSetTest.cpp |   234 -
 gnu/llvm/llvm/unittests/ADT/SparseSetTest.cpp |   207 -
 gnu/llvm/llvm/unittests/ADT/StatisticTest.cpp |   171 -
 .../llvm/unittests/ADT/StringExtrasTest.cpp   |   276 -
 gnu/llvm/llvm/unittests/ADT/StringMapTest.cpp |   616 -
 gnu/llvm/llvm/unittests/ADT/StringRefTest.cpp |  1111 --
 gnu/llvm/llvm/unittests/ADT/StringSetTest.cpp |    75 -
 .../llvm/unittests/ADT/StringSwitchTest.cpp   |   207 -
 gnu/llvm/llvm/unittests/ADT/TestGraph.h       |   250 -
 .../llvm/unittests/ADT/TinyPtrVectorTest.cpp  |   469 -
 gnu/llvm/llvm/unittests/ADT/TripleTest.cpp    |  1609 ---
 gnu/llvm/llvm/unittests/ADT/TwineTest.cpp     |   130 -
 .../llvm/unittests/ADT/TypeSwitchTest.cpp     |    88 -
 .../llvm/unittests/ADT/TypeTraitsTest.cpp     |    79 -
 .../llvm/unittests/ADT/WaymarkingTest.cpp     |   142 -
 .../unittests/Analysis/AliasAnalysisTest.cpp  |   381 -
 .../Analysis/AliasSetTrackerTest.cpp          |    90 -
 .../Analysis/AssumeBundleQueriesTest.cpp      |   602 -
 .../Analysis/BasicAliasAnalysisTest.cpp       |   133 -
 .../Analysis/BlockFrequencyInfoTest.cpp       |    98 -
 .../Analysis/BranchProbabilityInfoTest.cpp    |    87 -
 gnu/llvm/llvm/unittests/Analysis/CFGTest.cpp  |   507 -
 .../Analysis/CGSCCPassManagerTest.cpp         |  1970 ---
 .../llvm/unittests/Analysis/CMakeLists.txt    |    55 -
 .../llvm/unittests/Analysis/CallGraphTest.cpp |    60 -
 .../Analysis/CaptureTrackingTest.cpp          |   134 -
 .../Analysis/ConstraintSystemTest.cpp         |   153 -
 gnu/llvm/llvm/unittests/Analysis/DDGTest.cpp  |   284 -
 .../Analysis/DivergenceAnalysisTest.cpp       |   430 -
 .../unittests/Analysis/DomTreeUpdaterTest.cpp |   794 --
 .../FunctionPropertiesAnalysisTest.cpp        |    93 -
 .../unittests/Analysis/GlobalsModRefTest.cpp  |    58 -
 .../Analysis/IRSimilarityIdentifierTest.cpp   |  2275 ----
 .../unittests/Analysis/IVDescriptorsTest.cpp  |   164 -
 .../unittests/Analysis/InlineCostTest.cpp     |    77 -
 .../ir2native_x86_64_model/saved_model.pbtxt  | 10596 ----------------
 .../variables/variables.data-00000-of-00001   |   Bin 88424 -> 0 bytes
 .../variables/variables.index                 |   Bin 398 -> 0 bytes
 .../unittests/Analysis/LazyCallGraphTest.cpp  |  2855 -----
 .../llvm/unittests/Analysis/LoadsTest.cpp     |   100 -
 .../llvm/unittests/Analysis/LoopInfoTest.cpp  |  1549 ---
 .../llvm/unittests/Analysis/LoopNestTest.cpp  |   195 -
 .../unittests/Analysis/MemoryBuiltinsTest.cpp |    49 -
 .../llvm/unittests/Analysis/MemorySSATest.cpp |  1728 ---
 .../llvm/unittests/Analysis/PhiValuesTest.cpp |   209 -
 .../Analysis/ProfileSummaryInfoTest.cpp       |   433 -
 .../Analysis/ScalarEvolutionTest.cpp          |  1541 ---
 .../unittests/Analysis/SparsePropagation.cpp  |   541 -
 gnu/llvm/llvm/unittests/Analysis/TBAATest.cpp |    90 -
 .../llvm/unittests/Analysis/TFUtilsTest.cpp   |   285 -
 .../Analysis/TargetLibraryInfoTest.cpp        |   602 -
 .../unittests/Analysis/UnrollAnalyzerTest.cpp |   331 -
 .../unittests/Analysis/ValueLatticeTest.cpp   |   197 -
 .../unittests/Analysis/ValueTrackingTest.cpp  |  2250 ----
 .../Analysis/VectorFunctionABITest.cpp        |   633 -
 .../unittests/Analysis/VectorUtilsTest.cpp    |   712 --
 .../unittests/AsmParser/AsmParserTest.cpp     |   417 -
 .../llvm/unittests/AsmParser/CMakeLists.txt   |     9 -
 .../unittests/BinaryFormat/CMakeLists.txt     |    13 -
 .../llvm/unittests/BinaryFormat/DwarfTest.cpp |   207 -
 .../llvm/unittests/BinaryFormat/MachOTest.cpp |   118 -
 .../BinaryFormat/MsgPackDocumentTest.cpp      |   314 -
 .../BinaryFormat/MsgPackReaderTest.cpp        |   890 --
 .../BinaryFormat/MsgPackWriterTest.cpp        |   522 -
 .../unittests/BinaryFormat/TestFileMagic.cpp  |   142 -
 .../llvm/unittests/Bitcode/BitReaderTest.cpp  |   258 -
 .../llvm/unittests/Bitcode/CMakeLists.txt     |    12 -
 .../Bitcode/DataLayoutUpgradeTest.cpp         |    74 -
 .../Bitstream/BitstreamReaderTest.cpp         |   167 -
 .../Bitstream/BitstreamWriterTest.cpp         |    58 -
 .../llvm/unittests/Bitstream/CMakeLists.txt   |     8 -
 gnu/llvm/llvm/unittests/CMakeLists.txt        |    49 -
 .../CodeGen/AArch64SelectionDAGTest.cpp       |   594 -
 .../unittests/CodeGen/AllocationOrderTest.cpp |   118 -
 .../unittests/CodeGen/AsmPrinterDwarfTest.cpp |   430 -
 .../llvm/unittests/CodeGen/CMakeLists.txt     |    38 -
 .../llvm/unittests/CodeGen/DIEHashTest.cpp    |   718 --
 gnu/llvm/llvm/unittests/CodeGen/DIETest.cpp   |   174 -
 .../CodeGen/GlobalISel/CMakeLists.txt         |    25 -
 .../unittests/CodeGen/GlobalISel/CSETest.cpp  |   166 -
 .../GlobalISel/ConstantFoldingTest.cpp        |   239 -
 .../CodeGen/GlobalISel/GISelMITest.cpp        |   106 -
 .../CodeGen/GlobalISel/GISelMITest.h          |   200 -
 .../CodeGen/GlobalISel/GISelUtilsTest.cpp     |   248 -
 .../CodeGen/GlobalISel/KnownBitsTest.cpp      |  1861 ---
 .../GlobalISel/KnownBitsVectorTest.cpp        |  1528 ---
 .../GlobalISel/LegalizerHelperTest.cpp        |  4057 ------
 .../CodeGen/GlobalISel/LegalizerInfoTest.cpp  |   443 -
 .../CodeGen/GlobalISel/LegalizerTest.cpp      |   228 -
 .../GlobalISel/MachineIRBuilderTest.cpp       |   422 -
 .../CodeGen/GlobalISel/PatternMatchTest.cpp   |   628 -
 .../unittests/CodeGen/LexicalScopesTest.cpp   |   460 -
 .../unittests/CodeGen/LowLevelTypeTest.cpp    |   322 -
 gnu/llvm/llvm/unittests/CodeGen/MFCommon.inc  |   135 -
 .../MachineInstrBundleIteratorTest.cpp        |   196 -
 .../unittests/CodeGen/MachineInstrTest.cpp    |   392 -
 .../unittests/CodeGen/MachineOperandTest.cpp  |   412 -
 .../unittests/CodeGen/PassManagerTest.cpp     |   309 -
 .../CodeGen/ScalableVectorMVTsTest.cpp        |   187 -
 .../SelectionDAGAddressAnalysisTest.cpp       |   321 -
 .../unittests/CodeGen/TargetOptionsTest.cpp   |    77 -
 .../llvm/unittests/CodeGen/TestAsmPrinter.cpp |    90 -
 .../llvm/unittests/CodeGen/TestAsmPrinter.h   |    84 -
 .../llvm/unittests/CodeGen/TypeTraitsTest.cpp |    29 -
 .../llvm/unittests/DebugInfo/CMakeLists.txt   |     5 -
 .../DebugInfo/CodeView/CMakeLists.txt         |    12 -
 .../DebugInfo/CodeView/GUIDFormatTest.cpp     |   143 -
 .../CodeView/RandomAccessVisitorTest.cpp      |   399 -
 .../DebugInfo/CodeView/TypeHashingTest.cpp    |   156 -
 .../CodeView/TypeIndexDiscoveryTest.cpp       |   609 -
 .../unittests/DebugInfo/DWARF/CMakeLists.txt  |    29 -
 .../DWARF/DWARFAcceleratorTableTest.cpp       |    49 -
 .../DWARF/DWARFDataExtractorTest.cpp          |   227 -
 .../DWARF/DWARFDebugArangeSetTest.cpp         |   271 -
 .../DebugInfo/DWARF/DWARFDebugFrameTest.cpp   |  1650 ---
 .../DebugInfo/DWARF/DWARFDebugInfoTest.cpp    |  3154 -----
 .../DebugInfo/DWARF/DWARFDebugLineTest.cpp    |  1762 ---
 .../DWARF/DWARFDieManualExtractTest.cpp       |    81 -
 .../DebugInfo/DWARF/DWARFDieTest.cpp          |   103 -
 .../DWARFExpressionCompactPrinterTest.cpp     |   115 -
 .../DebugInfo/DWARF/DWARFFormValueTest.cpp    |   396 -
 .../DebugInfo/DWARF/DWARFListTableTest.cpp    |   102 -
 .../DWARF/DWARFLocationExpressionTest.cpp     |    30 -
 .../DebugInfo/DWARF/DwarfGenerator.cpp        |   580 -
 .../DebugInfo/DWARF/DwarfGenerator.h          |   326 -
 .../unittests/DebugInfo/DWARF/DwarfUtils.cpp  |    61 -
 .../unittests/DebugInfo/DWARF/DwarfUtils.h    |    30 -
 .../unittests/DebugInfo/GSYM/CMakeLists.txt   |    13 -
 .../unittests/DebugInfo/GSYM/GSYMTest.cpp     |  2544 ----
 .../unittests/DebugInfo/MSF/CMakeLists.txt    |    11 -
 .../DebugInfo/MSF/MSFBuilderTest.cpp          |   395 -
 .../unittests/DebugInfo/MSF/MSFCommonTest.cpp |   138 -
 .../DebugInfo/MSF/MappedBlockStreamTest.cpp   |   547 -
 .../unittests/DebugInfo/PDB/CMakeLists.txt    |    15 -
 .../unittests/DebugInfo/PDB/HashTableTest.cpp |   270 -
 .../DebugInfo/PDB/Inputs/SimpleTest.cpp       |     4 -
 .../DebugInfo/PDB/Inputs/SimpleTest.pdb       |   Bin 94208 -> 0 bytes
 .../unittests/DebugInfo/PDB/Inputs/empty.pdb  |   Bin 102400 -> 0 bytes
 .../DebugInfo/PDB/NativeSessionTest.cpp       |    99 -
 .../DebugInfo/PDB/NativeSymbolReuseTest.cpp   |   129 -
 .../unittests/DebugInfo/PDB/PDBApiTest.cpp    |   509 -
 .../DebugInfo/PDB/StringTableBuilderTest.cpp  |    94 -
 .../llvm/unittests/Demangle/CMakeLists.txt    |    12 -
 .../llvm/unittests/Demangle/DemangleTest.cpp  |    30 -
 .../Demangle/ItaniumDemangleTest.cpp          |    53 -
 .../Demangle/PartialDemangleTest.cpp          |   193 -
 .../unittests/Demangle/RustDemangleTest.cpp   |    90 -
 .../unittests/Demangle/StringViewTest.cpp     |    48 -
 .../unittests/ExecutionEngine/CMakeLists.txt  |    23 -
 .../ExecutionEngine/ExecutionEngineTest.cpp   |   151 -
 .../ExecutionEngine/JITLink/CMakeLists.txt    |    15 -
 .../JITLink/LinkGraphTests.cpp                |   529 -
 .../ExecutionEngine/MCJIT/CMakeLists.txt      |    34 -
 .../ExecutionEngine/MCJIT/MCJITCAPITest.cpp   |   512 -
 .../MCJIT/MCJITMemoryManagerTest.cpp          |   169 -
 .../MCJIT/MCJITMultipleModuleTest.cpp         |   425 -
 .../MCJIT/MCJITObjectCacheTest.cpp            |   228 -
 .../ExecutionEngine/MCJIT/MCJITTest.cpp       |   294 -
 .../MCJIT/MCJITTestAPICommon.h                |   106 -
 .../ExecutionEngine/MCJIT/MCJITTestBase.h     |   333 -
 .../ExecutionEngine/MCJIT/MCJITTests.def      |     1 -
 .../ExecutionEngine/Orc/CMakeLists.txt        |    38 -
 .../ExecutionEngine/Orc/CoreAPIsTest.cpp      |  1499 ---
 ...ecutionSessionWrapperFunctionCallsTest.cpp |   101 -
 .../Orc/IndirectionUtilsTest.cpp              |    49 -
 .../Orc/JITTargetMachineBuilderTest.cpp       |    51 -
 .../Orc/LazyCallThroughAndReexportsTest.cpp   |    74 -
 .../Orc/ObjectLinkingLayerTest.cpp            |    59 -
 .../ExecutionEngine/Orc/OrcCAPITest.cpp       |   518 -
 .../ExecutionEngine/Orc/OrcTestCommon.cpp     |    29 -
 .../ExecutionEngine/Orc/OrcTestCommon.h       |   164 -
 .../ExecutionEngine/Orc/QueueChannel.cpp      |    13 -
 .../ExecutionEngine/Orc/QueueChannel.h        |   178 -
 .../ExecutionEngine/Orc/RPCUtilsTest.cpp      |   890 --
 .../Orc/RTDyldObjectLinkingLayerTest.cpp      |   244 -
 .../Orc/ResourceTrackerTest.cpp               |   447 -
 .../Orc/SimplePackedSerializationTest.cpp     |   167 -
 .../Orc/SymbolStringPoolTest.cpp              |    53 -
 .../Orc/ThreadSafeModuleTest.cpp              |    94 -
 .../Orc/WrapperFunctionUtilsTest.cpp          |   121 -
 .../llvm/unittests/FileCheck/CMakeLists.txt   |    10 -
 .../unittests/FileCheck/FileCheckTest.cpp     |  1780 ---
 .../llvm/unittests/Frontend/CMakeLists.txt    |    22 -
 .../llvm/unittests/Frontend/OpenACCTest.cpp   |   332 -
 .../unittests/Frontend/OpenMPContextTest.cpp  |   315 -
 .../Frontend/OpenMPIRBuilderTest.cpp          |  2812 ----
 .../unittests/Frontend/OpenMPParsingTest.cpp  |    84 -
 .../llvm/unittests/FuzzMutate/CMakeLists.txt  |    13 -
 .../unittests/FuzzMutate/OperationsTest.cpp   |   404 -
 .../FuzzMutate/RandomIRBuilderTest.cpp        |   298 -
 .../FuzzMutate/ReservoirSamplerTest.cpp       |    68 -
 .../unittests/FuzzMutate/StrategiesTest.cpp   |   243 -
 .../unittests/IR/AbstractCallSiteTest.cpp     |    55 -
 gnu/llvm/llvm/unittests/IR/AsmWriterTest.cpp  |    65 -
 gnu/llvm/llvm/unittests/IR/AttributesTest.cpp |   299 -
 gnu/llvm/llvm/unittests/IR/BasicBlockTest.cpp |   281 -
 gnu/llvm/llvm/unittests/IR/CFGBuilder.cpp     |   277 -
 gnu/llvm/llvm/unittests/IR/CFGBuilder.h       |    93 -
 gnu/llvm/llvm/unittests/IR/CMakeLists.txt     |    49 -
 .../llvm/unittests/IR/ConstantRangeTest.cpp   |  2491 ----
 gnu/llvm/llvm/unittests/IR/ConstantsTest.cpp  |   762 --
 gnu/llvm/llvm/unittests/IR/DataLayoutTest.cpp |    92 -
 gnu/llvm/llvm/unittests/IR/DebugInfoTest.cpp  |   247 -
 .../unittests/IR/DebugTypeODRUniquingTest.cpp |   170 -
 .../llvm/unittests/IR/DemandedBitsTest.cpp    |    66 -
 .../IR/DominatorTreeBatchUpdatesTest.cpp      |   351 -
 .../llvm/unittests/IR/DominatorTreeTest.cpp   |  1102 --
 gnu/llvm/llvm/unittests/IR/FunctionTest.cpp   |   165 -
 gnu/llvm/llvm/unittests/IR/IRBuilderTest.cpp  |  1032 --
 .../llvm/unittests/IR/InstructionsTest.cpp    |  1485 ---
 gnu/llvm/llvm/unittests/IR/IntrinsicsTest.cpp |    39 -
 .../unittests/IR/LegacyPassManagerTest.cpp    |   793 --
 gnu/llvm/llvm/unittests/IR/MDBuilderTest.cpp  |   107 -
 gnu/llvm/llvm/unittests/IR/ManglerTest.cpp    |   159 -
 gnu/llvm/llvm/unittests/IR/MetadataTest.cpp   |  3430 -----
 gnu/llvm/llvm/unittests/IR/ModuleTest.cpp     |   162 -
 .../unittests/IR/PassBuilderCallbacksTest.cpp |  1310 --
 .../llvm/unittests/IR/PassManagerTest.cpp     |   953 --
 gnu/llvm/llvm/unittests/IR/PatternMatch.cpp   |  1686 ---
 gnu/llvm/llvm/unittests/IR/TimePassesTest.cpp |   169 -
 gnu/llvm/llvm/unittests/IR/TypesTest.cpp      |    60 -
 gnu/llvm/llvm/unittests/IR/UseTest.cpp        |   110 -
 gnu/llvm/llvm/unittests/IR/UserTest.cpp       |   176 -
 .../llvm/unittests/IR/VPIntrinsicTest.cpp     |   289 -
 .../llvm/unittests/IR/ValueHandleTest.cpp     |   578 -
 gnu/llvm/llvm/unittests/IR/ValueMapTest.cpp   |   294 -
 gnu/llvm/llvm/unittests/IR/ValueTest.cpp      |   315 -
 .../llvm/unittests/IR/VectorTypesTest.cpp     |   381 -
 gnu/llvm/llvm/unittests/IR/VerifierTest.cpp   |   274 -
 .../unittests/InterfaceStub/CMakeLists.txt    |     9 -
 .../unittests/InterfaceStub/ELFYAMLTest.cpp   |   255 -
 .../llvm/unittests/LineEditor/CMakeLists.txt  |     8 -
 .../llvm/unittests/LineEditor/LineEditor.cpp  |    82 -
 gnu/llvm/llvm/unittests/Linker/CMakeLists.txt |     9 -
 .../llvm/unittests/Linker/LinkModulesTest.cpp |   362 -
 .../llvm/unittests/MC/AMDGPU/CMakeLists.txt   |    11 -
 .../unittests/MC/AMDGPU/DwarfRegMappings.cpp  |    77 -
 gnu/llvm/llvm/unittests/MC/CMakeLists.txt     |    22 -
 gnu/llvm/llvm/unittests/MC/Disassembler.cpp   |   110 -
 .../llvm/unittests/MC/DwarfLineTables.cpp     |   183 -
 .../llvm/unittests/MC/MCDisassemblerTest.cpp  |    49 -
 gnu/llvm/llvm/unittests/MC/MCInstPrinter.cpp  |    70 -
 .../unittests/MC/StringTableBuilderTest.cpp   |   239 -
 .../llvm/unittests/MC/SystemZ/CMakeLists.txt  |    14 -
 .../MC/SystemZ/SystemZAsmLexerTest.cpp        |   786 --
 gnu/llvm/llvm/unittests/MC/TargetRegistry.cpp |    45 -
 gnu/llvm/llvm/unittests/MI/CMakeLists.txt     |    13 -
 .../llvm/unittests/MI/LiveIntervalTest.cpp    |   656 -
 gnu/llvm/llvm/unittests/MIR/CMakeLists.txt    |    16 -
 .../llvm/unittests/MIR/MachineMetadata.cpp    |   481 -
 .../llvm/unittests/Object/ArchiveTest.cpp     |    93 -
 gnu/llvm/llvm/unittests/Object/CMakeLists.txt |    19 -
 .../unittests/Object/ELFObjectFileTest.cpp    |   657 -
 gnu/llvm/llvm/unittests/Object/ELFTest.cpp    |    89 -
 .../llvm/unittests/Object/ELFTypesTest.cpp    |    63 -
 .../llvm/unittests/Object/MinidumpTest.cpp    |   770 --
 .../llvm/unittests/Object/ObjectFileTest.cpp  |    20 -
 .../llvm/unittests/Object/SymbolSizeTest.cpp  |    32 -
 .../unittests/Object/SymbolicFileTest.cpp     |    41 -
 .../unittests/Object/XCOFFObjectFileTest.cpp  |   558 -
 .../llvm/unittests/ObjectYAML/CMakeLists.txt  |    14 -
 .../unittests/ObjectYAML/DWARFYAMLTest.cpp    |   197 -
 .../llvm/unittests/ObjectYAML/ELFYAMLTest.cpp |   134 -
 .../unittests/ObjectYAML/MinidumpYAMLTest.cpp |   338 -
 .../unittests/ObjectYAML/YAML2ObjTest.cpp     |    81 -
 .../llvm/unittests/ObjectYAML/YAMLTest.cpp    |    55 -
 gnu/llvm/llvm/unittests/Option/CMakeLists.txt |    14 -
 .../Option/OptionMarshallingTest.cpp          |    55 -
 .../unittests/Option/OptionParsingTest.cpp    |   378 -
 gnu/llvm/llvm/unittests/Option/Opts.td        |    60 -
 gnu/llvm/llvm/unittests/Passes/CMakeLists.txt |    44 -
 .../llvm/unittests/Passes/DoublerPlugin.cpp   |    44 -
 .../Passes/PassBuilderBindingsTest.cpp        |    69 -
 .../llvm/unittests/Passes/PluginsTest.cpp     |   139 -
 gnu/llvm/llvm/unittests/Passes/TestPlugin.cpp |    38 -
 gnu/llvm/llvm/unittests/Passes/TestPlugin.h   |     2 -
 .../llvm/unittests/ProfileData/CMakeLists.txt |    15 -
 .../ProfileData/CoverageMappingTest.cpp       |   974 --
 .../ProfileData/InstrProfDataTest.cpp         |    68 -
 .../unittests/ProfileData/InstrProfTest.cpp   |  1068 --
 .../unittests/ProfileData/SampleProfTest.cpp  |   534 -
 .../Remarks/BitstreamRemarksFormatTest.cpp    |    48 -
 .../Remarks/BitstreamRemarksParsingTest.cpp   |   401 -
 .../BitstreamRemarksSerializerTest.cpp        |   341 -
 .../llvm/unittests/Remarks/CMakeLists.txt     |    16 -
 .../llvm/unittests/Remarks/RemarksAPITest.cpp |   123 -
 .../unittests/Remarks/RemarksLinkingTest.cpp  |   219 -
 .../Remarks/RemarksStrTabParsingTest.cpp      |    39 -
 .../Remarks/YAMLRemarksParsingTest.cpp        |   734 --
 .../Remarks/YAMLRemarksSerializerTest.cpp     |   329 -
 .../unittests/Support/ARMAttributeParser.cpp  |   422 -
 .../llvm/unittests/Support/AlignOfTest.cpp    |   244 -
 .../llvm/unittests/Support/AlignmentTest.cpp  |   366 -
 .../llvm/unittests/Support/AllocatorTest.cpp  |   235 -
 .../unittests/Support/AnnotationsTest.cpp     |   112 -
 .../unittests/Support/ArrayRecyclerTest.cpp   |   108 -
 .../llvm/unittests/Support/Base64Test.cpp     |    52 -
 .../unittests/Support/BinaryStreamTest.cpp    |   907 --
 .../unittests/Support/BlockFrequencyTest.cpp  |   127 -
 .../Support/BranchProbabilityTest.cpp         |   405 -
 .../llvm/unittests/Support/CMakeLists.txt     |   129 -
 gnu/llvm/llvm/unittests/Support/CRCTest.cpp   |    64 -
 .../unittests/Support/CachePruningTest.cpp    |    96 -
 gnu/llvm/llvm/unittests/Support/Casting.cpp   |   410 -
 .../Support/CheckedArithmeticTest.cpp         |    84 -
 gnu/llvm/llvm/unittests/Support/Chrono.cpp    |   111 -
 .../unittests/Support/CommandLineTest.cpp     |  1897 ---
 .../unittests/Support/CompressionTest.cpp     |    76 -
 .../llvm/unittests/Support/ConvertUTFTest.cpp |  1711 ---
 .../unittests/Support/CrashRecoveryTest.cpp   |   187 -
 gnu/llvm/llvm/unittests/Support/DJBTest.cpp   |    95 -
 .../unittests/Support/DataExtractorTest.cpp   |   384 -
 .../unittests/Support/DebugCounterTest.cpp    |    40 -
 gnu/llvm/llvm/unittests/Support/DebugTest.cpp |    33 -
 .../Support/DynamicLibrary/CMakeLists.txt     |    62 -
 .../DynamicLibrary/DynamicLibraryTest.cpp     |   176 -
 .../Support/DynamicLibrary/ExportedFuncs.cpp  |    15 -
 .../Support/DynamicLibrary/PipSqueak.cpp      |    48 -
 .../Support/DynamicLibrary/PipSqueak.h        |    33 -
 .../Support/ELFAttributeParserTest.cpp        |    63 -
 .../unittests/Support/EndianStreamTest.cpp    |   207 -
 .../llvm/unittests/Support/EndianTest.cpp     |   212 -
 gnu/llvm/llvm/unittests/Support/ErrnoTest.cpp |    38 -
 .../llvm/unittests/Support/ErrorOrTest.cpp    |   139 -
 gnu/llvm/llvm/unittests/Support/ErrorTest.cpp |  1034 --
 .../unittests/Support/ExtensibleRTTITest.cpp  |    86 -
 .../llvm/unittests/Support/FSUniqueIDTest.cpp |    38 -
 .../unittests/Support/FileCollectorTest.cpp   |   277 -
 .../Support/FileOutputBufferTest.cpp          |   161 -
 .../unittests/Support/FileUtilitiesTest.cpp   |    54 -
 .../unittests/Support/FormatVariadicTest.cpp  |   700 -
 .../unittests/Support/GlobPatternTest.cpp     |   149 -
 gnu/llvm/llvm/unittests/Support/Host.cpp      |   519 -
 .../unittests/Support/IndexedAccessorTest.cpp |    49 -
 .../unittests/Support/InstructionCostTest.cpp |    95 -
 .../ItaniumManglingCanonicalizerTest.cpp      |   389 -
 gnu/llvm/llvm/unittests/Support/JSONTest.cpp  |   549 -
 .../llvm/unittests/Support/KnownBitsTest.cpp  |   482 -
 .../llvm/unittests/Support/KnownBitsTest.h    |    52 -
 .../llvm/unittests/Support/LEB128Test.cpp     |   435 -
 .../unittests/Support/LineIteratorTest.cpp    |   216 -
 .../unittests/Support/LinearPolyBaseTest.cpp  |   179 -
 .../unittests/Support/LockFileManagerTest.cpp |   107 -
 gnu/llvm/llvm/unittests/Support/MD5Test.cpp   |    71 -
 .../llvm/unittests/Support/ManagedStatic.cpp  |   101 -
 .../llvm/unittests/Support/MatchersTest.cpp   |    25 -
 .../llvm/unittests/Support/MathExtrasTest.cpp |   607 -
 .../unittests/Support/MemoryBufferRefTest.cpp |    51 -
 .../unittests/Support/MemoryBufferTest.cpp    |   411 -
 .../llvm/unittests/Support/MemoryTest.cpp     |   434 -
 .../unittests/Support/NativeFormatTests.cpp   |   175 -
 .../Support/OptimizedStructLayoutTest.cpp     |   149 -
 .../llvm/unittests/Support/ParallelTest.cpp   |    95 -
 gnu/llvm/llvm/unittests/Support/Path.cpp      |  2304 ----
 .../llvm/unittests/Support/ProcessTest.cpp    |   112 -
 .../llvm/unittests/Support/ProgramTest.cpp    |   420 -
 .../Support/RISCVAttributeParserTest.cpp      |    70 -
 gnu/llvm/llvm/unittests/Support/RegexTest.cpp |   181 -
 .../unittests/Support/ReplaceFileTest.cpp     |   174 -
 .../Support/ReverseIterationTest.cpp          |   109 -
 gnu/llvm/llvm/unittests/Support/SHA256.cpp    |    80 -
 .../unittests/Support/ScaledNumberTest.cpp    |   568 -
 .../llvm/unittests/Support/SourceMgrTest.cpp  |   498 -
 .../unittests/Support/SpecialCaseListTest.cpp |   248 -
 .../llvm/unittests/Support/SuffixTreeTest.cpp |   143 -
 .../unittests/Support/SwapByteOrderTest.cpp   |   210 -
 .../Support/SymbolRemappingReaderTest.cpp     |    95 -
 .../llvm/unittests/Support/TarWriterTest.cpp  |   174 -
 .../unittests/Support/TargetParserTest.cpp    |  1458 ---
 .../llvm/unittests/Support/TaskQueueTest.cpp  |   107 -
 .../unittests/Support/ThreadLocalTest.cpp     |    56 -
 .../llvm/unittests/Support/ThreadPool.cpp     |   274 -
 gnu/llvm/llvm/unittests/Support/Threading.cpp |    94 -
 gnu/llvm/llvm/unittests/Support/TimerTest.cpp |    64 -
 .../unittests/Support/ToolOutputFileTest.cpp  |    22 -
 .../unittests/Support/TrailingObjectsTest.cpp |   258 -
 .../unittests/Support/TrigramIndexTest.cpp    |   131 -
 .../llvm/unittests/Support/TypeNameTest.cpp   |    48 -
 .../llvm/unittests/Support/TypeTraitsTest.cpp |   126 -
 .../llvm/unittests/Support/UnicodeTest.cpp    |   107 -
 .../unittests/Support/VersionTupleTest.cpp    |    49 -
 .../Support/VirtualFileSystemTest.cpp         |  2647 ----
 .../llvm/unittests/Support/WithColorTest.cpp  |    43 -
 .../llvm/unittests/Support/YAMLIOTest.cpp     |  3216 -----
 .../llvm/unittests/Support/YAMLParserTest.cpp |   385 -
 .../Support/formatted_raw_ostream_test.cpp    |   171 -
 .../unittests/Support/raw_fd_stream_test.cpp  |    67 -
 .../unittests/Support/raw_ostream_test.cpp    |   546 -
 .../Support/raw_pwrite_stream_test.cpp        |    94 -
 .../Support/raw_sha1_ostream_test.cpp         |    93 -
 .../llvm/unittests/Support/xxhashTest.cpp     |    19 -
 gnu/llvm/llvm/unittests/TableGen/Automata.td  |   186 -
 .../llvm/unittests/TableGen/AutomataTest.cpp  |   153 -
 .../llvm/unittests/TableGen/CMakeLists.txt    |    17 -
 .../unittests/TableGen/CodeExpanderTest.cpp   |   183 -
 .../unittests/Target/AArch64/CMakeLists.txt   |    24 -
 .../AArch64/DecomposeStackOffsetTest.cpp      |    53 -
 .../unittests/Target/AArch64/InstSizes.cpp    |   156 -
 .../Target/AArch64/MatrixRegisterAliasing.cpp |   135 -
 .../unittests/Target/AMDGPU/CMakeLists.txt    |    19 -
 .../Target/AMDGPU/DwarfRegMappings.cpp        |    89 -
 .../AMDGPU/ExecMayBeModifiedBeforeAnyUse.cpp  |    73 -
 .../llvm/unittests/Target/ARM/CMakeLists.txt  |    20 -
 .../unittests/Target/ARM/MachineInstrTest.cpp |  1210 --
 gnu/llvm/llvm/unittests/Target/CMakeLists.txt |     5 -
 .../Target/PowerPC/AIXRelocModelTest.cpp      |    39 -
 .../unittests/Target/PowerPC/CMakeLists.txt   |    17 -
 .../Target/WebAssembly/CMakeLists.txt         |    18 -
 .../WebAssemblyExceptionInfoTest.cpp          |   417 -
 .../llvm/unittests/Target/X86/CMakeLists.txt  |    21 -
 .../Target/X86/MachineSizeOptsTest.cpp        |   235 -
 .../llvm/unittests/TextAPI/CMakeLists.txt     |    12 -
 .../llvm/unittests/TextAPI/TextStubHelpers.h  |    63 -
 .../unittests/TextAPI/TextStubV1Tests.cpp     |   459 -
 .../unittests/TextAPI/TextStubV2Tests.cpp     |   494 -
 .../unittests/TextAPI/TextStubV3Tests.cpp     |   949 --
 .../unittests/TextAPI/TextStubV4Tests.cpp     |  1175 --
 .../llvm/unittests/Transforms/CMakeLists.txt  |     4 -
 .../Transforms/IPO/AttributorTest.cpp         |   151 -
 .../Transforms/IPO/AttributorTestBase.h       |    48 -
 .../unittests/Transforms/IPO/CMakeLists.txt   |    14 -
 .../Transforms/IPO/LowerTypeTests.cpp         |   155 -
 .../Transforms/IPO/WholeProgramDevirt.cpp     |   164 -
 .../Transforms/Scalar/CMakeLists.txt          |    21 -
 .../unittests/Transforms/Scalar/LICMTest.cpp  |    93 -
 .../Transforms/Scalar/LoopPassManagerTest.cpp |  1668 ---
 .../Utils/ASanStackFrameLayoutTest.cpp        |   134 -
 .../Transforms/Utils/BasicBlockUtilsTest.cpp  |   594 -
 .../unittests/Transforms/Utils/CMakeLists.txt |    30 -
 .../Utils/CallPromotionUtilsTest.cpp          |   370 -
 .../Transforms/Utils/CloningTest.cpp          |  1028 --
 .../Transforms/Utils/CodeExtractorTest.cpp    |   334 -
 .../Transforms/Utils/CodeMoverUtilsTest.cpp   |   857 --
 .../Transforms/Utils/DebugifyTest.cpp         |   264 -
 .../Utils/FunctionComparatorTest.cpp          |   129 -
 .../Transforms/Utils/IntegerDivisionTest.cpp  |   263 -
 .../unittests/Transforms/Utils/LocalTest.cpp  |  1073 --
 .../Utils/LoopRotationUtilsTest.cpp           |   166 -
 .../Transforms/Utils/LoopUtilsTest.cpp        |    95 -
 .../Transforms/Utils/ModuleUtilsTest.cpp      |    69 -
 .../Transforms/Utils/SSAUpdaterBulkTest.cpp   |   194 -
 .../Utils/ScalarEvolutionExpanderTest.cpp     |   967 --
 .../Transforms/Utils/SizeOptsTest.cpp         |   129 -
 .../Transforms/Utils/UnrollLoopTest.cpp       |    77 -
 .../unittests/Transforms/Utils/VFABIUtils.cpp |    53 -
 .../Transforms/Utils/ValueMapperTest.cpp      |   349 -
 .../Transforms/Vectorize/CMakeLists.txt       |    15 -
 .../Vectorize/VPlanDominatorTreeTest.cpp      |   195 -
 .../Transforms/Vectorize/VPlanHCFGTest.cpp    |   194 -
 .../Vectorize/VPlanLoopInfoTest.cpp           |    86 -
 .../Vectorize/VPlanPredicatorTest.cpp         |   236 -
 .../Transforms/Vectorize/VPlanSlpTest.cpp     |   921 --
 .../Transforms/Vectorize/VPlanTest.cpp        |  1215 --
 .../Transforms/Vectorize/VPlanTestBase.h      |    87 -
 gnu/llvm/llvm/unittests/XRay/CMakeLists.txt   |    18 -
 .../unittests/XRay/FDRBlockIndexerTest.cpp    |    82 -
 .../unittests/XRay/FDRBlockVerifierTest.cpp   |   138 -
 .../XRay/FDRProducerConsumerTest.cpp          |   222 -
 .../unittests/XRay/FDRRecordPrinterTest.cpp   |   169 -
 .../llvm/unittests/XRay/FDRRecordsTest.cpp    |   167 -
 .../unittests/XRay/FDRTraceWriterTest.cpp     |   182 -
 gnu/llvm/llvm/unittests/XRay/GraphTest.cpp    |   260 -
 gnu/llvm/llvm/unittests/XRay/ProfileTest.cpp  |   266 -
 gnu/llvm/llvm/unittests/tools/CMakeLists.txt  |    10 -
 .../tools/llvm-cfi-verify/CMakeLists.txt      |    17 -
 .../tools/llvm-cfi-verify/FileAnalysis.cpp    |  1101 --
 .../tools/llvm-cfi-verify/GraphBuilder.cpp    |   598 -
 .../llvm-exegesis/AArch64/CMakeLists.txt      |    20 -
 .../llvm-exegesis/AArch64/TargetTest.cpp      |    77 -
 .../tools/llvm-exegesis/ARM/AssemblerTest.cpp |    48 -
 .../tools/llvm-exegesis/ARM/CMakeLists.txt    |    19 -
 .../llvm-exegesis/BenchmarkRunnerTest.cpp     |    32 -
 .../tools/llvm-exegesis/CMakeLists.txt        |    65 -
 .../tools/llvm-exegesis/ClusteringTest.cpp    |   146 -
 .../llvm-exegesis/Common/AssemblerUtils.h     |    95 -
 .../Mips/BenchmarkResultTest.cpp              |   130 -
 .../tools/llvm-exegesis/Mips/CMakeLists.txt   |    23 -
 .../Mips/RegisterAliasingTest.cpp             |    74 -
 .../Mips/SnippetGeneratorTest.cpp             |   126 -
 .../tools/llvm-exegesis/Mips/TargetTest.cpp   |   131 -
 .../tools/llvm-exegesis/Mips/TestBase.h       |    42 -
 .../tools/llvm-exegesis/PerfHelperTest.cpp    |    42 -
 .../llvm-exegesis/PowerPC/AnalysisTest.cpp    |    91 -
 .../llvm-exegesis/PowerPC/CMakeLists.txt      |    22 -
 .../PowerPC/SnippetGeneratorTest.cpp          |   134 -
 .../llvm-exegesis/PowerPC/TargetTest.cpp      |    69 -
 .../tools/llvm-exegesis/PowerPC/TestBase.h    |    42 -
 .../tools/llvm-exegesis/RegisterValueTest.cpp |    72 -
 .../llvm-exegesis/SnippetGeneratorTest.cpp    |   175 -
 .../tools/llvm-exegesis/X86/AssemblerTest.cpp |    65 -
 .../llvm-exegesis/X86/BenchmarkResultTest.cpp |   135 -
 .../tools/llvm-exegesis/X86/CMakeLists.txt    |    31 -
 .../X86/RegisterAliasingTest.cpp              |    73 -
 .../X86/SchedClassResolutionTest.cpp          |    98 -
 .../llvm-exegesis/X86/SnippetFileTest.cpp     |   129 -
 .../X86/SnippetGeneratorTest.cpp              |   461 -
 .../X86/SnippetRepetitorTest.cpp              |    98 -
 .../tools/llvm-exegesis/X86/TargetTest.cpp    |   396 -
 .../tools/llvm-exegesis/X86/TestBase.h        |    44 -
 .../tools/llvm-profgen/CMakeLists.txt         |    11 -
 .../llvm-profgen/ContextCompressionTest.cpp   |    36 -
 gnu/llvm/llvm/unittests/unittest.cfg.in       |     1 -
 gnu/llvm/llvm/utils/TableGen/CodeBeadsGen.cpp |   137 -
 .../utils/TableGen/FixedLenDecoderEmitter.cpp |  2560 ----
 .../TableGen/RISCVCompressInstEmitter.cpp     |   893 --
 gnu/llvm/llvm/utils/benchmark/AUTHORS         |    47 -
 gnu/llvm/llvm/utils/benchmark/CMakeLists.txt  |   266 -
 gnu/llvm/llvm/utils/benchmark/CONTRIBUTING.md |    58 -
 gnu/llvm/llvm/utils/benchmark/CONTRIBUTORS    |    67 -
 gnu/llvm/llvm/utils/benchmark/LICENSE         |   202 -
 gnu/llvm/llvm/utils/benchmark/README.LLVM     |    39 -
 gnu/llvm/llvm/utils/benchmark/README.md       |   950 --
 gnu/llvm/llvm/utils/benchmark/WORKSPACE       |     7 -
 gnu/llvm/llvm/utils/benchmark/appveyor.yml    |    56 -
 .../benchmark/cmake/AddCXXCompilerFlag.cmake  |    74 -
 .../benchmark/cmake/CXXFeatureCheck.cmake     |    64 -
 .../utils/benchmark/cmake/Config.cmake.in     |     1 -
 .../utils/benchmark/cmake/GetGitVersion.cmake |    54 -
 .../utils/benchmark/cmake/HandleGTest.cmake   |   113 -
 .../benchmark/cmake/Modules/FindLLVMAr.cmake  |    16 -
 .../benchmark/cmake/Modules/FindLLVMNm.cmake  |    16 -
 .../cmake/Modules/FindLLVMRanLib.cmake        |    15 -
 .../utils/benchmark/cmake/benchmark.pc.in     |    11 -
 .../utils/benchmark/cmake/gnu_posix_regex.cpp |    11 -
 .../benchmark/cmake/llvm-toolchain.cmake      |     8 -
 .../utils/benchmark/cmake/posix_regex.cpp     |    13 -
 .../utils/benchmark/cmake/split_list.cmake    |     3 -
 .../llvm/utils/benchmark/cmake/std_regex.cpp  |     9 -
 .../utils/benchmark/cmake/steady_clock.cpp    |     7 -
 .../cmake/thread_safety_attributes.cpp        |     4 -
 .../utils/benchmark/docs/AssemblyTests.md     |   146 -
 gnu/llvm/llvm/utils/benchmark/docs/tools.md   |   242 -
 .../benchmark/include/benchmark/benchmark.h   |  1467 ---
 gnu/llvm/llvm/utils/benchmark/mingw.py        |   320 -
 gnu/llvm/llvm/utils/benchmark/releasing.md    |    16 -
 .../llvm/utils/benchmark/src/CMakeLists.txt   |   110 -
 gnu/llvm/llvm/utils/benchmark/src/arraysize.h |    33 -
 .../llvm/utils/benchmark/src/benchmark.cc     |   630 -
 .../benchmark/src/benchmark_api_internal.h    |    47 -
 .../utils/benchmark/src/benchmark_main.cc     |    17 -
 .../utils/benchmark/src/benchmark_register.cc |   461 -
 .../utils/benchmark/src/benchmark_register.h  |    34 -
 gnu/llvm/llvm/utils/benchmark/src/check.h     |    79 -
 .../llvm/utils/benchmark/src/colorprint.cc    |   188 -
 .../llvm/utils/benchmark/src/colorprint.h     |    33 -
 .../utils/benchmark/src/commandlineflags.cc   |   218 -
 .../utils/benchmark/src/commandlineflags.h    |    79 -
 .../llvm/utils/benchmark/src/complexity.cc    |   218 -
 .../llvm/utils/benchmark/src/complexity.h     |    55 -
 .../utils/benchmark/src/console_reporter.cc   |   182 -
 gnu/llvm/llvm/utils/benchmark/src/counter.cc  |    68 -
 gnu/llvm/llvm/utils/benchmark/src/counter.h   |    26 -
 .../llvm/utils/benchmark/src/csv_reporter.cc  |   149 -
 .../llvm/utils/benchmark/src/cycleclock.h     |   206 -
 .../utils/benchmark/src/internal_macros.h     |    81 -
 .../llvm/utils/benchmark/src/json_reporter.cc |   205 -
 gnu/llvm/llvm/utils/benchmark/src/log.h       |    73 -
 gnu/llvm/llvm/utils/benchmark/src/mutex.h     |   155 -
 gnu/llvm/llvm/utils/benchmark/src/re.h        |   152 -
 gnu/llvm/llvm/utils/benchmark/src/reporter.cc |    87 -
 gnu/llvm/llvm/utils/benchmark/src/sleep.cc    |    51 -
 gnu/llvm/llvm/utils/benchmark/src/sleep.h     |    15 -
 .../llvm/utils/benchmark/src/statistics.cc    |   178 -
 .../llvm/utils/benchmark/src/statistics.h     |    37 -
 .../llvm/utils/benchmark/src/string_util.cc   |   172 -
 .../llvm/utils/benchmark/src/string_util.h    |    40 -
 gnu/llvm/llvm/utils/benchmark/src/sysinfo.cc  |   585 -
 .../llvm/utils/benchmark/src/thread_manager.h |    66 -
 .../llvm/utils/benchmark/src/thread_timer.h   |    69 -
 gnu/llvm/llvm/utils/benchmark/src/timers.cc   |   217 -
 gnu/llvm/llvm/utils/benchmark/src/timers.h    |    48 -
 .../utils/benchmark/test/AssemblyTests.cmake  |    45 -
 .../llvm/utils/benchmark/test/CMakeLists.txt  |   247 -
 .../llvm/utils/benchmark/test/basic_test.cc   |   136 -
 .../utils/benchmark/test/benchmark_gtest.cc   |    33 -
 .../utils/benchmark/test/benchmark_test.cc    |   245 -
 .../test/clobber_memory_assembly_test.cc      |    64 -
 .../utils/benchmark/test/complexity_test.cc   |   167 -
 .../llvm/utils/benchmark/test/cxx03_test.cc   |    63 -
 .../utils/benchmark/test/diagnostics_test.cc  |    80 -
 .../test/donotoptimize_assembly_test.cc       |   163 -
 .../benchmark/test/donotoptimize_test.cc      |    52 -
 .../llvm/utils/benchmark/test/filter_test.cc  |   104 -
 .../llvm/utils/benchmark/test/fixture_test.cc |    49 -
 .../utils/benchmark/test/link_main_test.cc    |     8 -
 .../llvm/utils/benchmark/test/map_test.cc     |    57 -
 .../benchmark/test/multiple_ranges_test.cc    |    97 -
 .../llvm/utils/benchmark/test/options_test.cc |    65 -
 .../llvm/utils/benchmark/test/output_test.h   |   201 -
 .../benchmark/test/output_test_helper.cc      |   423 -
 .../benchmark/test/register_benchmark_test.cc |   182 -
 .../benchmark/test/reporter_output_test.cc    |   382 -
 .../benchmark/test/skip_with_error_test.cc    |   192 -
 .../benchmark/test/state_assembly_test.cc     |    66 -
 .../utils/benchmark/test/statistics_gtest.cc  |    61 -
 .../benchmark/test/templated_fixture_test.cc  |    28 -
 .../test/user_counters_tabular_test.cc        |   250 -
 .../benchmark/test/user_counters_test.cc      |   217 -
 .../llvm/utils/benchmark/tools/compare.py     |   316 -
 .../tools/gbench/Inputs/test1_run1.json       |   102 -
 .../tools/gbench/Inputs/test1_run2.json       |   102 -
 .../tools/gbench/Inputs/test2_run.json        |    81 -
 .../utils/benchmark/tools/gbench/__init__.py  |     8 -
 .../utils/benchmark/tools/gbench/report.py    |   208 -
 .../llvm/utils/benchmark/tools/gbench/util.py |   159 -
 .../llvm/utils/benchmark/tools/strip_asm.py   |   151 -
 gnu/llvm/llvm/utils/countloc.sh               |    39 -
 gnu/llvm/llvm/utils/docker/debian8/Dockerfile |    60 -
 gnu/llvm/llvm/utils/getsrcs.sh                |    33 -
 gnu/llvm/llvm/utils/gn/build/run_tablegen.py  |     8 -
 .../tools/clang-offload-wrapper/BUILD.gn      |    11 -
 .../secondary/compiler-rt/lib/tsan/BUILD.gn   |   180 -
 .../utils/gn/secondary/lld/lib/Core/BUILD.gn  |    20 -
 .../gn/secondary/lld/lib/Driver/BUILD.gn      |    22 -
 .../secondary/lld/lib/ReaderWriter/BUILD.gn   |    15 -
 .../lld/lib/ReaderWriter/MachO/BUILD.gn       |    33 -
 .../lld/lib/ReaderWriter/YAML/BUILD.gn        |     9 -
 .../utils/gn/secondary/lld/unittests/BUILD.gn |     7 -
 .../lld/unittests/DriverTests/BUILD.gn        |    10 -
 .../lld/unittests/MachOTests/BUILD.gn         |    16 -
 .../llvm/tools/llvm-mca/lib/AMDGPU/BUILD.gn   |    15 -
 .../secondary/llvm/tools/split-file/BUILD.gn  |     4 -
 .../secondary/llvm/utils/benchmark/BUILD.gn   |    25 -
 .../gn/secondary/llvm/utils/unittest/BUILD.gn |    35 -
 .../llvm/utils/unittest/UnitTestMain/BUILD.gn |    17 -
 .../llvm/utils/unittest/unittest.gni          |    58 -
 gnu/llvm/llvm/utils/lit/README.txt            |    41 -
 .../DummySubDir/OneTest.py                    |    49 -
 .../Inputs/googletest-upstream-format/lit.cfg |     3 -
 .../tests/Inputs/reorder/.lit_test_times.txt  |     4 -
 .../lit/tests/googletest-upstream-format.py   |    38 -
 gnu/llvm/llvm/utils/llvmdo                    |   183 -
 gnu/llvm/llvm/utils/llvmgrep                  |    38 -
 .../llvm/utils/release/build_llvm_package.bat |   149 -
 .../llvm/utils/sanitizers/ubsan_blacklist.txt |    16 -
 gnu/llvm/llvm/utils/unittest/CMakeLists.txt   |    93 -
 .../unittest/UnitTestMain/CMakeLists.txt      |    12 -
 .../utils/unittest/UnitTestMain/TestMain.cpp  |    51 -
 .../utils/unittest/googlemock/LICENSE.txt     |    28 -
 .../utils/unittest/googlemock/README.LLVM     |    22 -
 .../googlemock/include/gmock/gmock-actions.h  |  1157 --
 .../include/gmock/gmock-cardinalities.h       |   159 -
 .../include/gmock/gmock-function-mocker.h     |   253 -
 .../include/gmock/gmock-generated-actions.h   |  1888 ---
 .../gmock/gmock-generated-function-mockers.h  |   754 --
 .../include/gmock/gmock-generated-matchers.h  |  1099 --
 .../googlemock/include/gmock/gmock-matchers.h |  4599 -------
 .../include/gmock/gmock-more-actions.h        |   164 -
 .../include/gmock/gmock-more-matchers.h       |    94 -
 .../include/gmock/gmock-nice-strict.h         |   215 -
 .../include/gmock/gmock-spec-builders.h       |  1985 ---
 .../unittest/googlemock/include/gmock/gmock.h |   114 -
 .../internal/custom/gmock-generated-actions.h |    10 -
 .../gmock/internal/custom/gmock-matchers.h    |    36 -
 .../gmock/internal/custom/gmock-port.h        |    39 -
 .../gmock/internal/gmock-internal-utils.h     |   515 -
 .../include/gmock/internal/gmock-port.h       |    89 -
 .../include/gmock/internal/gmock-pp.h         |   317 -
 .../unittest/googlemock/src/gmock-all.cc      |    46 -
 .../googlemock/src/gmock-cardinalities.cc     |   155 -
 .../googlemock/src/gmock-internal-utils.cc    |   200 -
 .../unittest/googlemock/src/gmock-matchers.cc |   462 -
 .../googlemock/src/gmock-spec-builders.cc     |   888 --
 .../utils/unittest/googlemock/src/gmock.cc    |   213 -
 .../utils/unittest/googletest/LICENSE.TXT     |    28 -
 .../utils/unittest/googletest/README.LLVM     |    21 -
 .../include/gtest/gtest-death-test.h          |   343 -
 .../googletest/include/gtest/gtest-matchers.h |   750 --
 .../googletest/include/gtest/gtest-message.h  |   219 -
 .../include/gtest/gtest-param-test.h          |   503 -
 .../googletest/include/gtest/gtest-printers.h |   929 --
 .../googletest/include/gtest/gtest-spi.h      |   238 -
 .../include/gtest/gtest-test-part.h           |   184 -
 .../include/gtest/gtest-typed-test.h          |   330 -
 .../unittest/googletest/include/gtest/gtest.h |  2478 ----
 .../include/gtest/gtest_pred_impl.h           |   359 -
 .../googletest/include/gtest/gtest_prod.h     |    61 -
 .../gtest/internal/custom/gtest-port.h        |    37 -
 .../gtest/internal/custom/gtest-printers.h    |    69 -
 .../include/gtest/internal/custom/gtest.h     |    37 -
 .../gtest/internal/custom/raw-ostream.h       |    85 -
 .../internal/gtest-death-test-internal.h      |   302 -
 .../include/gtest/internal/gtest-filepath.h   |   211 -
 .../include/gtest/internal/gtest-internal.h   |  1380 --
 .../include/gtest/internal/gtest-param-util.h |   883 --
 .../include/gtest/internal/gtest-port-arch.h  |   107 -
 .../include/gtest/internal/gtest-port.h       |  2231 ----
 .../include/gtest/internal/gtest-string.h     |   171 -
 .../include/gtest/internal/gtest-type-util.h  |  3335 -----
 .../unittest/googletest/src/gtest-all.cc      |    48 -
 .../googletest/src/gtest-death-test.cc        |  1653 ---
 .../unittest/googletest/src/gtest-filepath.cc |   379 -
 .../googletest/src/gtest-internal-inl.h       |  1211 --
 .../unittest/googletest/src/gtest-matchers.cc |    97 -
 .../unittest/googletest/src/gtest-port.cc     |  1399 --
 .../unittest/googletest/src/gtest-printers.cc |   442 -
 .../googletest/src/gtest-test-part.cc         |   104 -
 .../googletest/src/gtest-typed-test.cc        |   118 -
 .../utils/unittest/googletest/src/gtest.cc    |  6177 ---------
 1577 files changed, 32144 insertions(+), 339699 deletions(-)
 delete mode 100644 gnu/llvm/llvm/bindings/go/README.txt
 delete mode 100755 gnu/llvm/llvm/bindings/go/build.sh
 delete mode 100644 gnu/llvm/llvm/bindings/go/conftest.go
 delete mode 100644 gnu/llvm/llvm/bindings/go/llvm/IRBindings.cpp
 delete mode 100644 gnu/llvm/llvm/bindings/go/llvm/IRBindings.h
 delete mode 100644 gnu/llvm/llvm/bindings/go/llvm/InstrumentationBindings.cpp
 delete mode 100644 gnu/llvm/llvm/bindings/go/llvm/InstrumentationBindings.h
 delete mode 100644 gnu/llvm/llvm/bindings/go/llvm/SupportBindings.cpp
 delete mode 100644 gnu/llvm/llvm/bindings/go/llvm/SupportBindings.h
 delete mode 100644 gnu/llvm/llvm/bindings/go/llvm/analysis.go
 delete mode 100644 gnu/llvm/llvm/bindings/go/llvm/bitreader.go
 delete mode 100644 gnu/llvm/llvm/bindings/go/llvm/bitwriter.go
 delete mode 100644 gnu/llvm/llvm/bindings/go/llvm/dibuilder.go
 delete mode 100644 gnu/llvm/llvm/bindings/go/llvm/executionengine.go
 delete mode 100644 gnu/llvm/llvm/bindings/go/llvm/executionengine_test.go
 delete mode 100644 gnu/llvm/llvm/bindings/go/llvm/ir.go
 delete mode 100644 gnu/llvm/llvm/bindings/go/llvm/ir_test.go
 delete mode 100644 gnu/llvm/llvm/bindings/go/llvm/linker.go
 delete mode 100644 gnu/llvm/llvm/bindings/go/llvm/llvm_config.go.in
 delete mode 100644 gnu/llvm/llvm/bindings/go/llvm/llvm_dep.go
 delete mode 100644 gnu/llvm/llvm/bindings/go/llvm/string.go
 delete mode 100644 gnu/llvm/llvm/bindings/go/llvm/string_test.go
 delete mode 100644 gnu/llvm/llvm/bindings/go/llvm/support.go
 delete mode 100644 gnu/llvm/llvm/bindings/go/llvm/target.go
 delete mode 100644 gnu/llvm/llvm/bindings/go/llvm/transforms_coroutines.go
 delete mode 100644 gnu/llvm/llvm/bindings/go/llvm/transforms_instrumentation.go
 delete mode 100644 gnu/llvm/llvm/bindings/go/llvm/transforms_ipo.go
 delete mode 100644 gnu/llvm/llvm/bindings/go/llvm/transforms_pmbuilder.go
 delete mode 100644 gnu/llvm/llvm/bindings/go/llvm/transforms_scalar.go
 delete mode 100644 gnu/llvm/llvm/bindings/go/llvm/version.go
 delete mode 100644 gnu/llvm/llvm/cmake/modules/AddLLVMDefinitions.cmake
 delete mode 100644 gnu/llvm/llvm/cmake/modules/FindGRPC.cmake
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx1011_src32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx1011_src32_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx1011_src32_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx1011_src32_3.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx1011_type_dev.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx1011_vdst32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx1011_vsrc32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_addr_buf.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_addr_ds.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_addr_flat.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_addr_mimg.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_base_smem_addr.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_base_smem_buf.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_base_smem_scratch.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_bimm16.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_bimm32.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_data_buf_atomic128.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_data_buf_atomic32.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_data_buf_atomic64.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_data_mimg_atomic_cmp.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_data_mimg_atomic_reg.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_data_mimg_store.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_data_mimg_store_d16.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_data_smem_atomic128.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_data_smem_atomic32.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_data_smem_atomic64.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_buf_128.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_buf_32.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_buf_64.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_buf_96.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_buf_lds.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_flat_atomic32.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_flat_atomic64.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_mimg_gather4.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_mimg_regular.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_mimg_regular_d16.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_fimm16.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_fimm32.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_mad_type_dev.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_mod_dpp_sdwa_abs_neg.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_mod_sdwa_sext.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_mod_vop3_abs_neg.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_offset_buf.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_offset_smem_buf.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_offset_smem_plain.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_opt.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_perm_smem.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_ret.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_rsrc_buf.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_rsrc_mimg.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_saddr_flat_global.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_saddr_flat_scratch.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_samp_mimg.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_sdata128_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_sdata32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_sdata64_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst128_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst256_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst32_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst32_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst512_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst64_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst64_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_simm16.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_src32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_src32_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_src32_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_src32_3.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_src32_4.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_src32_5.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_src32_6.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_src64_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_src_exp.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc32_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc32_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc32_3.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc32_4.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc32_5.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc64_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc64_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_type_dev.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_uimm16.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_vaddr_flat_global.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_vaddr_flat_scratch.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_vcc_32.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_vdata128_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_vdata32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_vdata64_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_vdata96_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_vdst128_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_vdst32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_vdst64_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_vdst96_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_vsrc128_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_vsrc32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_vsrc32_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_vsrc64_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_wsdst.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx10_wssrc.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_addr_buf.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_addr_ds.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_addr_flat.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_addr_mimg.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_base_smem_addr.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_base_smem_buf.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_bimm16.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_bimm32.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_data_buf_atomic128.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_data_buf_atomic32.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_data_buf_atomic64.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_data_mimg_atomic_cmp.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_data_mimg_atomic_reg.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_data_mimg_store.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_buf_128.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_buf_32.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_buf_64.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_buf_96.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_buf_lds.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_flat_atomic32.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_flat_atomic64.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_mimg_gather4.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_mimg_regular.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_fimm32.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_mod.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_offset_buf.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_offset_smem.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_opt.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_ret.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_rsrc_buf.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_rsrc_mimg.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_samp_mimg.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst128_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst256_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst32_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst32_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst512_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst64_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst64_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_simm16.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_src32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_src32_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_src32_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_src32_3.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_src32_4.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_src32_5.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_src32_6.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_src64_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_src64_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_src64_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_src_exp.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc32_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc32_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc32_3.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc32_4.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc32_5.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc32_6.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc64_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc64_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc64_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc64_3.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_type_dev.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_uimm16.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_vcc_64.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_vdata128_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_vdata32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_vdata64_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_vdata96_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_vdst128_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_vdst32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_vdst64_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_vdst96_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_vsrc128_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_vsrc32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_vsrc32_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx7_vsrc64_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_addr_buf.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_addr_ds.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_addr_flat.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_addr_mimg.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_base_smem_addr.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_base_smem_buf.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_bimm16.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_bimm32.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_data_buf_atomic128.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_data_buf_atomic32.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_data_buf_atomic64.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_data_buf_d16_128.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_data_buf_d16_32.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_data_buf_d16_64.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_data_buf_d16_96.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_data_mimg_atomic_cmp.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_data_mimg_atomic_reg.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_data_mimg_store.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_data_mimg_store_d16.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_128.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_32.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_64.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_96.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_d16_128.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_d16_32.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_d16_64.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_d16_96.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_lds.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_flat_atomic32.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_flat_atomic64.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_mimg_gather4.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_mimg_regular.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_mimg_regular_d16.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_fimm16.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_fimm32.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_mod_dpp_sdwa_abs_neg.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_mod_sdwa_sext.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_mod_vop3_abs_neg.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_offset_buf.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_offset_smem_load.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_offset_smem_store.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_opt.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_perm_smem.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_ret.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_rsrc_buf.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_rsrc_mimg.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_samp_mimg.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_sdata128_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_sdata32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_sdata64_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst128_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst256_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst32_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst32_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst512_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst64_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst64_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_simm16.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_3.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_4.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_5.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_6.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_7.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_src64_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_src64_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_src_exp.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc32_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc32_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc32_3.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc32_4.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc64_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc64_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc64_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc64_3.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_type_dev.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_uimm16.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_vcc_64.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_vdata128_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_vdata32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_vdata64_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_vdata96_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_vdst128_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_vdst32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_vdst64_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_vdst96_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_vsrc128_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_vsrc32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_vsrc32_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx8_vsrc64_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx900_mad_type_dev.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx900_mod_vop3_abs_neg.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx900_src32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx900_src32_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx900_vdst32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx904_mad_type_dev.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx904_mod_vop3_abs_neg.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx904_src32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx904_src32_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx904_vdst32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx906_mad_type_dev.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx906_mod_dpp_sdwa_abs_neg.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx906_mod_sdwa_sext.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx906_mod_vop3_abs_neg.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx906_src32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx906_src32_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx906_src32_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx906_src32_3.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx906_src32_4.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx906_type_dev.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx906_vdst32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx906_vsrc32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx908_addr_buf.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx908_adst1024_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx908_adst128_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx908_adst32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx908_adst512_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx908_asrc1024_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx908_asrc128_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx908_asrc32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx908_asrc512_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx908_data_buf_atomic32.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx908_dst_flat_atomic32.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx908_mad_type_dev.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx908_mod_dpp_sdwa_abs_neg.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx908_mod_sdwa_sext.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx908_mod_vop3_abs_neg.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx908_offset_buf.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx908_opt.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx908_ret.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx908_rsrc_buf.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx908_saddr_flat_global.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx908_src32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx908_src32_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx908_src32_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx908_src32_3.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx908_src32_4.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx908_src32_5.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx908_type_dev.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx908_vaddr_flat_global.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx908_vasrc32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx908_vasrc64_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx908_vdata32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx908_vdst32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx908_vsrc32_0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_imm16.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_imm16_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_imm16_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_m.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_m_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_opt.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_saddr.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_saddr_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_sbase.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_sbase_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_sbase_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdata.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdata_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdata_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdata_3.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdata_4.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdata_5.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst_3.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst_4.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst_5.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst_6.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst_7.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_simm32.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_simm32_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_simm32_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_soffset.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_soffset_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_soffset_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_src.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_10.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_11.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_3.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_4.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_5.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_6.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_7.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_8.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_9.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_srsrc.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_srsrc_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_3.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_4.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_5.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_6.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_7.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_8.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vaddr.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vaddr_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vaddr_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vaddr_3.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vaddr_4.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vaddr_5.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata0_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata1_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_10.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_3.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_4.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_5.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_6.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_7.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_8.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_9.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_10.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_11.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_12.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_13.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_14.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_15.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_16.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_17.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_18.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_19.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_3.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_4.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_5.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_6.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_7.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_8.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_9.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vsrc.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vsrc_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vsrc_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vsrc_3.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vsrc_4.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx90a_vsrc_5.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_imm16.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_imm16_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_imm16_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_m.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_m_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_opt.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_saddr.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_saddr_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_sbase.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_sbase_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_sbase_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_sdata.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_sdata_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_sdata_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_sdata_3.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_sdata_4.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_sdata_5.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst_3.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst_4.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst_5.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst_6.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst_7.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_simm32.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_simm32_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_simm32_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_soffset.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_soffset_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_soffset_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_src.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_src_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_src_10.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_src_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_src_3.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_src_4.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_src_5.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_src_6.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_src_7.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_src_8.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_src_9.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_srsrc.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_srsrc_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_3.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_4.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_5.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_6.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_7.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_8.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vaddr.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vaddr_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vaddr_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vaddr_3.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vaddr_4.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vaddr_5.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata0.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata0_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata1_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_10.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_3.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_4.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_5.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_6.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_7.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_8.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_9.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_10.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_11.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_12.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_13.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_3.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_4.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_5.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_6.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_7.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_8.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_9.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vsrc.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vsrc_1.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vsrc_2.rst
 delete mode 100644 gnu/llvm/llvm/docs/AMDGPU/gfx9_vsrc_3.rst
 delete mode 100644 gnu/llvm/llvm/docs/Makefile.sphinx
 delete mode 100644 gnu/llvm/llvm/docs/Proposals/LLVMLibC.rst
 delete mode 100644 gnu/llvm/llvm/examples/IRTransforms/InitializePasses.cpp
 delete mode 100644 gnu/llvm/llvm/examples/IRTransforms/InitializePasses.h
 delete mode 100644 gnu/llvm/llvm/examples/IRTransforms/SimplifyCFG.h
 delete mode 100644 gnu/llvm/llvm/examples/OrcV2Examples/LLJITWithTargetProcessControl/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/examples/OrcV2Examples/LLJITWithTargetProcessControl/LLJITWithTargetProcessControl.cpp
 delete mode 100644 gnu/llvm/llvm/include/llvm-c/Transforms/AggressiveInstCombine.h
 delete mode 100644 gnu/llvm/llvm/include/llvm-c/Transforms/Coroutines.h
 delete mode 100644 gnu/llvm/llvm/include/llvm/ADT/Waymarking.h
 delete mode 100644 gnu/llvm/llvm/include/llvm/Analysis/CFLAliasAnalysisUtils.h
 delete mode 100644 gnu/llvm/llvm/include/llvm/Analysis/CFLAndersAliasAnalysis.h
 delete mode 100644 gnu/llvm/llvm/include/llvm/Analysis/CFLSteensAliasAnalysis.h
 delete mode 100644 gnu/llvm/llvm/include/llvm/CodeGen/GlobalISel/RegisterBank.h
 delete mode 100644 gnu/llvm/llvm/include/llvm/CodeGen/GlobalISel/RegisterBankInfo.h
 delete mode 100644 gnu/llvm/llvm/include/llvm/DebugInfo/GSYM/Range.h
 delete mode 100644 gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/LLVMSPSSerializers.h
 delete mode 100644 gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/OrcRPCExecutorProcessControl.h
 delete mode 100644 gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h
 delete mode 100644 gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetRPCAPI.h
 delete mode 100644 gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetServer.h
 delete mode 100644 gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/Shared/FDRawByteChannel.h
 delete mode 100644 gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/Shared/RPCUtils.h
 delete mode 100644 gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/Shared/RawByteChannel.h
 delete mode 100644 gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/Shared/Serialization.h
 delete mode 100644 gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/OrcRPCTPCServer.h
 delete mode 100644 gnu/llvm/llvm/include/llvm/ExecutionEngine/OrcMCJITReplacement.h
 delete mode 100644 gnu/llvm/llvm/include/llvm/ExecutionEngine/OrcV1Deprecation.h
 delete mode 100644 gnu/llvm/llvm/include/llvm/IR/GlobalIndirectSymbol.h
 delete mode 100644 gnu/llvm/llvm/include/llvm/LTO/Caching.h
 delete mode 100644 gnu/llvm/llvm/include/llvm/MC/MCFixedLenDisassembler.h
 delete mode 100644 gnu/llvm/llvm/include/llvm/Support/AArch64TargetParser.def
 delete mode 100644 gnu/llvm/llvm/include/llvm/Support/ARMTargetParser.def
 delete mode 100644 gnu/llvm/llvm/include/llvm/Support/RISCVTargetParser.def
 delete mode 100644 gnu/llvm/llvm/include/llvm/Support/TargetRegistry.h
 delete mode 100644 gnu/llvm/llvm/include/llvm/Support/ThreadLocal.h
 delete mode 100644 gnu/llvm/llvm/include/llvm/Testing/Support/Annotations.h
 delete mode 100644 gnu/llvm/llvm/include/llvm/Transforms/Coroutines.h
 delete mode 100644 gnu/llvm/llvm/include/llvm/Transforms/InstCombine/InstCombineWorklist.h
 delete mode 100644 gnu/llvm/llvm/include/llvm/Transforms/Scalar/LowerAtomic.h
 create mode 100644 gnu/llvm/llvm/include/llvm/Transforms/Utils/MisExpect.h
 delete mode 100644 gnu/llvm/llvm/lib/Analysis/CFLAndersAliasAnalysis.cpp
 delete mode 100644 gnu/llvm/llvm/lib/Analysis/CFLGraph.h
 delete mode 100644 gnu/llvm/llvm/lib/Analysis/CFLSteensAliasAnalysis.cpp
 delete mode 100644 gnu/llvm/llvm/lib/Analysis/ReleaseModeModelRunner.cpp
 delete mode 100644 gnu/llvm/llvm/lib/Analysis/TFUtils.cpp
 delete mode 100644 gnu/llvm/llvm/lib/Analysis/models/generate_mock_model.py
 delete mode 100644 gnu/llvm/llvm/lib/Analysis/models/inlining/config.py
 delete mode 100644 gnu/llvm/llvm/lib/CodeGen/GlobalISel/RegisterBank.cpp
 delete mode 100644 gnu/llvm/llvm/lib/CodeGen/GlobalISel/RegisterBankInfo.cpp
 delete mode 100644 gnu/llvm/llvm/lib/DebugInfo/GSYM/Range.cpp
 delete mode 100644 gnu/llvm/llvm/lib/DebugInfo/Symbolize/SymbolizableObjectFile.h
 delete mode 100644 gnu/llvm/llvm/lib/ExecutionEngine/Orc/Shared/RPCError.cpp
 delete mode 100644 gnu/llvm/llvm/lib/IR/ConstantFold.h
 delete mode 100644 gnu/llvm/llvm/lib/LTO/Caching.cpp
 delete mode 100644 gnu/llvm/llvm/lib/Support/AArch64TargetParser.cpp
 delete mode 100644 gnu/llvm/llvm/lib/Support/ARMTargetParser.cpp
 delete mode 100644 gnu/llvm/llvm/lib/Support/Host.cpp
 delete mode 100644 gnu/llvm/llvm/lib/Support/TargetParser.cpp
 delete mode 100644 gnu/llvm/llvm/lib/Support/TargetRegistry.cpp
 delete mode 100644 gnu/llvm/llvm/lib/Support/ThreadLocal.cpp
 delete mode 100644 gnu/llvm/llvm/lib/Support/Triple.cpp
 delete mode 100644 gnu/llvm/llvm/lib/Support/Unix/Host.inc
 delete mode 100644 gnu/llvm/llvm/lib/Support/Unix/ThreadLocal.inc
 delete mode 100644 gnu/llvm/llvm/lib/Support/Windows/Host.inc
 delete mode 100644 gnu/llvm/llvm/lib/Support/Windows/ThreadLocal.inc
 delete mode 100644 gnu/llvm/llvm/lib/Support/X86TargetParser.cpp
 delete mode 100644 gnu/llvm/llvm/lib/Target/AArch64/GISel/select-saddo.mir
 delete mode 100644 gnu/llvm/llvm/lib/Target/AArch64/GISel/select-ssubo.mir
 delete mode 100644 gnu/llvm/llvm/lib/Target/AMDGPU/AMDGPUFixFunctionBitcasts.cpp
 delete mode 100644 gnu/llvm/llvm/lib/Target/AMDGPU/AMDILCFGStructurizer.cpp
 delete mode 100644 gnu/llvm/llvm/lib/Target/AMDGPU/Utils/AMDGPULDSUtils.cpp
 delete mode 100644 gnu/llvm/llvm/lib/Target/AMDGPU/Utils/AMDGPULDSUtils.h
 delete mode 100644 gnu/llvm/llvm/lib/Target/AVR/AVRRelaxMemOperations.cpp
 delete mode 100644 gnu/llvm/llvm/lib/Target/Hexagon/HexagonArch.h
 delete mode 100644 gnu/llvm/llvm/lib/Target/M68k/GlSel/M68kCallLowering.cpp
 delete mode 100644 gnu/llvm/llvm/lib/Target/M68k/GlSel/M68kCallLowering.h
 delete mode 100644 gnu/llvm/llvm/lib/Target/M68k/GlSel/M68kInstructionSelector.cpp
 delete mode 100644 gnu/llvm/llvm/lib/Target/M68k/GlSel/M68kLegalizerInfo.cpp
 delete mode 100644 gnu/llvm/llvm/lib/Target/M68k/GlSel/M68kLegalizerInfo.h
 delete mode 100644 gnu/llvm/llvm/lib/Target/M68k/GlSel/M68kRegisterBankInfo.cpp
 delete mode 100644 gnu/llvm/llvm/lib/Target/M68k/GlSel/M68kRegisterBankInfo.h
 delete mode 100644 gnu/llvm/llvm/lib/Target/M68k/GlSel/M68kRegisterBanks.td
 delete mode 100644 gnu/llvm/llvm/lib/Target/NVPTX/ManagedStringPool.h
 delete mode 100644 gnu/llvm/llvm/lib/Target/PowerPC/PPCInstrPrefix.td
 delete mode 100644 gnu/llvm/llvm/lib/Target/RISCV/RISCVCallLowering.cpp
 delete mode 100644 gnu/llvm/llvm/lib/Target/RISCV/RISCVCallLowering.h
 delete mode 100644 gnu/llvm/llvm/lib/Target/RISCV/RISCVInstrInfoB.td
 delete mode 100644 gnu/llvm/llvm/lib/Target/RISCV/RISCVInstructionSelector.cpp
 delete mode 100644 gnu/llvm/llvm/lib/Target/RISCV/RISCVLegalizerInfo.cpp
 delete mode 100644 gnu/llvm/llvm/lib/Target/RISCV/RISCVLegalizerInfo.h
 delete mode 100644 gnu/llvm/llvm/lib/Target/RISCV/RISCVRegisterBankInfo.cpp
 delete mode 100644 gnu/llvm/llvm/lib/Target/RISCV/RISCVRegisterBankInfo.h
 delete mode 100644 gnu/llvm/llvm/lib/Target/RISCV/RISCVRegisterBanks.td
 delete mode 100644 gnu/llvm/llvm/lib/Target/RISCV/RISCVScheduleB.td
 delete mode 100644 gnu/llvm/llvm/lib/Target/WebAssembly/WebAssemblyLowerGlobalDtors.cpp
 delete mode 100644 gnu/llvm/llvm/lib/Target/WebAssembly/WebAssemblyPrepareForLiveIntervals.cpp
 delete mode 100644 gnu/llvm/llvm/lib/Target/X86/X86InstrMPX.td
 delete mode 100644 gnu/llvm/llvm/lib/Target/X86/X86WinAllocaExpander.cpp
 delete mode 100644 gnu/llvm/llvm/lib/Testing/Support/Annotations.cpp
 delete mode 100644 gnu/llvm/llvm/lib/Transforms/IPO/PruneEH.cpp
 delete mode 100644 gnu/llvm/llvm/lib/Transforms/Instrumentation/MaximumSpanningTree.h
 delete mode 100644 gnu/llvm/llvm/lib/Transforms/Scalar/LoopUnswitch.cpp
 delete mode 100644 gnu/llvm/llvm/lib/Transforms/Scalar/LowerAtomic.cpp
 create mode 100644 gnu/llvm/llvm/lib/Transforms/Utils/MisExpect.cpp
 delete mode 100644 gnu/llvm/llvm/lib/Transforms/Vectorize/VPlanLoopInfo.h
 delete mode 100644 gnu/llvm/llvm/lib/Transforms/Vectorize/VPlanPredicator.cpp
 delete mode 100644 gnu/llvm/llvm/lib/Transforms/Vectorize/VPlanPredicator.h
 delete mode 100644 gnu/llvm/llvm/tools/lli/RemoteJITUtils.h
 delete mode 100644 gnu/llvm/llvm/tools/llvm-diff/DiffConsumer.cpp
 delete mode 100644 gnu/llvm/llvm/tools/llvm-diff/DiffConsumer.h
 delete mode 100644 gnu/llvm/llvm/tools/llvm-diff/DiffLog.cpp
 delete mode 100644 gnu/llvm/llvm/tools/llvm-diff/DiffLog.h
 delete mode 100644 gnu/llvm/llvm/tools/llvm-diff/DifferenceEngine.cpp
 delete mode 100644 gnu/llvm/llvm/tools/llvm-diff/DifferenceEngine.h
 delete mode 100644 gnu/llvm/llvm/tools/llvm-go/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/tools/llvm-go/llvm-go.go
 delete mode 100644 gnu/llvm/llvm/tools/llvm-mca/Views/View.cpp
 delete mode 100644 gnu/llvm/llvm/tools/llvm-mca/Views/View.h
 delete mode 100644 gnu/llvm/llvm/tools/llvm-mca/lib/AMDGPU/AMDGPUCustomBehaviour.cpp
 delete mode 100644 gnu/llvm/llvm/tools/llvm-mca/lib/AMDGPU/AMDGPUCustomBehaviour.h
 delete mode 100644 gnu/llvm/llvm/tools/llvm-mca/lib/AMDGPU/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/tools/llvm-mca/lib/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/COFF/COFFConfig.h
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.h
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/COFF/Object.cpp
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/COFF/Object.h
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/COFF/Reader.cpp
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/COFF/Reader.h
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/COFF/Writer.cpp
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/COFF/Writer.h
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/CommonConfig.h
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/ConfigManager.cpp
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/ConfigManager.h
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/ELF/ELFConfig.h
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/ELF/ELFObjcopy.cpp
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/ELF/ELFObjcopy.h
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/ELF/Object.cpp
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/ELF/Object.h
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOConfig.h
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOLayoutBuilder.cpp
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOLayoutBuilder.h
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOObjcopy.cpp
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOObjcopy.h
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOReader.cpp
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOReader.h
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOWriter.cpp
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOWriter.h
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/MachO/Object.cpp
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/MachO/Object.h
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/MultiFormatConfig.h
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/llvm-objcopy.h
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/wasm/Object.cpp
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/wasm/Object.h
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/wasm/Reader.cpp
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/wasm/Reader.h
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/wasm/WasmConfig.h
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/wasm/WasmObjcopy.cpp
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/wasm/WasmObjcopy.h
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/wasm/Writer.cpp
 delete mode 100644 gnu/llvm/llvm/tools/llvm-objcopy/wasm/Writer.h
 delete mode 100644 gnu/llvm/llvm/tools/llvm-pdbutil/FormatUtil.cpp
 delete mode 100644 gnu/llvm/llvm/tools/llvm-pdbutil/FormatUtil.h
 delete mode 100644 gnu/llvm/llvm/tools/llvm-pdbutil/InputFile.cpp
 delete mode 100644 gnu/llvm/llvm/tools/llvm-pdbutil/InputFile.h
 delete mode 100644 gnu/llvm/llvm/tools/llvm-pdbutil/LinePrinter.cpp
 delete mode 100644 gnu/llvm/llvm/tools/llvm-pdbutil/LinePrinter.h
 delete mode 100644 gnu/llvm/llvm/tools/llvm-profgen/PseudoProbe.cpp
 delete mode 100644 gnu/llvm/llvm/tools/llvm-profgen/PseudoProbe.h
 delete mode 100644 gnu/llvm/llvm/tools/llvm-reduce/deltas/ReduceModuleInlineAsm.cpp
 delete mode 100644 gnu/llvm/llvm/tools/llvm-reduce/deltas/ReduceModuleInlineAsm.h
 delete mode 100644 gnu/llvm/llvm/tools/msbuild/.gitignore
 delete mode 100644 gnu/llvm/llvm/tools/msbuild/LLVM.Cpp.Common.props
 delete mode 100644 gnu/llvm/llvm/tools/msbuild/LLVM.Cpp.Common.targets
 delete mode 100644 gnu/llvm/llvm/tools/msbuild/Platformx64/Toolset.props
 delete mode 100644 gnu/llvm/llvm/tools/msbuild/Platformx64/Toolset.targets
 delete mode 100644 gnu/llvm/llvm/tools/msbuild/Platformx86/Toolset.props
 delete mode 100644 gnu/llvm/llvm/tools/msbuild/Platformx86/Toolset.targets
 delete mode 100644 gnu/llvm/llvm/tools/msbuild/install.bat
 delete mode 100644 gnu/llvm/llvm/tools/msbuild/license.txt
 delete mode 100644 gnu/llvm/llvm/tools/msbuild/llvm-general.xml
 delete mode 100644 gnu/llvm/llvm/tools/msbuild/llvm.csproj
 delete mode 100644 gnu/llvm/llvm/tools/msbuild/llvm.sln
 delete mode 100644 gnu/llvm/llvm/tools/msbuild/source.extension.vsixmanifest
 delete mode 100644 gnu/llvm/llvm/tools/msbuild/uninstall.bat
 delete mode 100644 gnu/llvm/llvm/tools/opt/GraphPrinters.cpp
 delete mode 100644 gnu/llvm/llvm/tools/opt/PassPrinters.cpp
 delete mode 100644 gnu/llvm/llvm/tools/opt/PassPrinters.h
 delete mode 100644 gnu/llvm/llvm/tools/opt/PrintSCC.cpp
 delete mode 100644 gnu/llvm/llvm/tools/split-file/.clang-tidy
 delete mode 100644 gnu/llvm/llvm/tools/split-file/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/tools/split-file/split-file.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/APFixedPointTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/APFloatTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/APIntTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/APSIntTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/AnyTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/ArrayRefTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/BitFieldsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/BitVectorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/BitmaskEnumTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/BreadthFirstIteratorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/BumpPtrListTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/CoalescingBitVectorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/DAGDeltaAlgorithmTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/DeltaAlgorithmTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/DenseMapTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/DenseSetTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/DepthFirstIteratorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/DirectedGraphTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/EnumeratedArrayTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/EquivalenceClassesTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/FallibleIteratorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/FloatingPointMode.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/FoldingSet.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/FunctionExtrasTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/FunctionRefTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/HashingTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/IListBaseTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/IListIteratorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/IListNodeBaseTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/IListNodeTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/IListSentinelTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/IListTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/ImmutableListTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/ImmutableMapTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/ImmutableSetTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/IntEqClassesTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/IntervalMapTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/IntrusiveRefCntPtrTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/IteratorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/MapVectorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/MappedIteratorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/OptionalTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/PackedVectorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/PointerEmbeddedIntTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/PointerIntPairTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/PointerSumTypeTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/PointerUnionTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/PostOrderIteratorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/PriorityWorklistTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/RangeAdapterTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/SCCIteratorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/STLExtrasTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/STLForwardCompatTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/ScopeExitTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/SequenceTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/SetVectorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/SimpleIListTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/SmallPtrSetTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/SmallSetTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/SmallStringTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/SmallVectorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/SparseBitVectorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/SparseMultiSetTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/SparseSetTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/StatisticTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/StringExtrasTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/StringMapTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/StringRefTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/StringSetTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/StringSwitchTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/TestGraph.h
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/TinyPtrVectorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/TripleTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/TwineTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/TypeSwitchTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/TypeTraitsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ADT/WaymarkingTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/AliasAnalysisTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/AliasSetTrackerTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/AssumeBundleQueriesTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/BasicAliasAnalysisTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/BlockFrequencyInfoTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/BranchProbabilityInfoTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/CFGTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/CGSCCPassManagerTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/CallGraphTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/CaptureTrackingTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/ConstraintSystemTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/DDGTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/DivergenceAnalysisTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/DomTreeUpdaterTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/FunctionPropertiesAnalysisTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/GlobalsModRefTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/IRSimilarityIdentifierTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/IVDescriptorsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/InlineCostTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/Inputs/ir2native_x86_64_model/saved_model.pbtxt
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/Inputs/ir2native_x86_64_model/variables/variables.data-00000-of-00001
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/Inputs/ir2native_x86_64_model/variables/variables.index
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/LazyCallGraphTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/LoadsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/LoopInfoTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/LoopNestTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/MemoryBuiltinsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/MemorySSATest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/PhiValuesTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/ProfileSummaryInfoTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/ScalarEvolutionTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/SparsePropagation.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/TBAATest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/TFUtilsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/TargetLibraryInfoTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/UnrollAnalyzerTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/ValueLatticeTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/ValueTrackingTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/VectorFunctionABITest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Analysis/VectorUtilsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/AsmParser/AsmParserTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/AsmParser/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/BinaryFormat/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/BinaryFormat/DwarfTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/BinaryFormat/MachOTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/BinaryFormat/MsgPackDocumentTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/BinaryFormat/MsgPackReaderTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/BinaryFormat/MsgPackWriterTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/BinaryFormat/TestFileMagic.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Bitcode/BitReaderTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Bitcode/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/Bitcode/DataLayoutUpgradeTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Bitstream/BitstreamReaderTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Bitstream/BitstreamWriterTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Bitstream/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/CodeGen/AArch64SelectionDAGTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/CodeGen/AllocationOrderTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/CodeGen/AsmPrinterDwarfTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/CodeGen/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/CodeGen/DIEHashTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/CodeGen/DIETest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/CodeGen/GlobalISel/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/CodeGen/GlobalISel/CSETest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/CodeGen/GlobalISel/ConstantFoldingTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/CodeGen/GlobalISel/GISelMITest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/CodeGen/GlobalISel/GISelMITest.h
 delete mode 100644 gnu/llvm/llvm/unittests/CodeGen/GlobalISel/GISelUtilsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/CodeGen/GlobalISel/KnownBitsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/CodeGen/GlobalISel/KnownBitsVectorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/CodeGen/GlobalISel/LegalizerHelperTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/CodeGen/GlobalISel/LegalizerInfoTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/CodeGen/GlobalISel/LegalizerTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/CodeGen/GlobalISel/MachineIRBuilderTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/CodeGen/GlobalISel/PatternMatchTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/CodeGen/LexicalScopesTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/CodeGen/LowLevelTypeTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/CodeGen/MFCommon.inc
 delete mode 100644 gnu/llvm/llvm/unittests/CodeGen/MachineInstrBundleIteratorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/CodeGen/MachineInstrTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/CodeGen/MachineOperandTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/CodeGen/PassManagerTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/CodeGen/ScalableVectorMVTsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/CodeGen/SelectionDAGAddressAnalysisTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/CodeGen/TargetOptionsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/CodeGen/TestAsmPrinter.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/CodeGen/TestAsmPrinter.h
 delete mode 100644 gnu/llvm/llvm/unittests/CodeGen/TypeTraitsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/CodeView/CMakeLists.txt
 delete mode 100755 gnu/llvm/llvm/unittests/DebugInfo/CodeView/GUIDFormatTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/CodeView/RandomAccessVisitorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/CodeView/TypeHashingTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/CodeView/TypeIndexDiscoveryTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/DWARF/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFAcceleratorTableTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFDataExtractorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFDebugArangeSetTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFDebugFrameTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFDebugLineTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFDieManualExtractTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFDieTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFExpressionCompactPrinterTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFFormValueTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFListTableTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFLocationExpressionTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/DWARF/DwarfGenerator.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/DWARF/DwarfGenerator.h
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/DWARF/DwarfUtils.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/DWARF/DwarfUtils.h
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/GSYM/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/GSYM/GSYMTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/MSF/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/MSF/MSFBuilderTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/MSF/MSFCommonTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/MSF/MappedBlockStreamTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/PDB/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/PDB/HashTableTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/PDB/Inputs/SimpleTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/PDB/Inputs/SimpleTest.pdb
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/PDB/Inputs/empty.pdb
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/PDB/NativeSessionTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/PDB/NativeSymbolReuseTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/PDB/PDBApiTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/DebugInfo/PDB/StringTableBuilderTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Demangle/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/Demangle/DemangleTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Demangle/ItaniumDemangleTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Demangle/PartialDemangleTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Demangle/RustDemangleTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Demangle/StringViewTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ExecutionEngine/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/ExecutionEngine/ExecutionEngineTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ExecutionEngine/JITLink/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/ExecutionEngine/JITLink/LinkGraphTests.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/MCJITCAPITest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/MCJITMemoryManagerTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/MCJITMultipleModuleTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/MCJITObjectCacheTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/MCJITTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/MCJITTestAPICommon.h
 delete mode 100644 gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/MCJITTestBase.h
 delete mode 100644 gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/MCJITTests.def
 delete mode 100644 gnu/llvm/llvm/unittests/ExecutionEngine/Orc/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/ExecutionEngine/Orc/CoreAPIsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ExecutionEngine/Orc/ExecutionSessionWrapperFunctionCallsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ExecutionEngine/Orc/IndirectionUtilsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ExecutionEngine/Orc/JITTargetMachineBuilderTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ExecutionEngine/Orc/LazyCallThroughAndReexportsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ExecutionEngine/Orc/ObjectLinkingLayerTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ExecutionEngine/Orc/OrcCAPITest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ExecutionEngine/Orc/OrcTestCommon.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ExecutionEngine/Orc/OrcTestCommon.h
 delete mode 100644 gnu/llvm/llvm/unittests/ExecutionEngine/Orc/QueueChannel.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ExecutionEngine/Orc/QueueChannel.h
 delete mode 100644 gnu/llvm/llvm/unittests/ExecutionEngine/Orc/RPCUtilsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ExecutionEngine/Orc/RTDyldObjectLinkingLayerTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ExecutionEngine/Orc/ResourceTrackerTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ExecutionEngine/Orc/SimplePackedSerializationTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ExecutionEngine/Orc/SymbolStringPoolTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ExecutionEngine/Orc/ThreadSafeModuleTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ExecutionEngine/Orc/WrapperFunctionUtilsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/FileCheck/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/FileCheck/FileCheckTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Frontend/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/Frontend/OpenACCTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Frontend/OpenMPContextTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Frontend/OpenMPIRBuilderTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Frontend/OpenMPParsingTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/FuzzMutate/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/FuzzMutate/OperationsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/FuzzMutate/RandomIRBuilderTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/FuzzMutate/ReservoirSamplerTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/FuzzMutate/StrategiesTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/IR/AbstractCallSiteTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/IR/AsmWriterTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/IR/AttributesTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/IR/BasicBlockTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/IR/CFGBuilder.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/IR/CFGBuilder.h
 delete mode 100644 gnu/llvm/llvm/unittests/IR/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/IR/ConstantRangeTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/IR/ConstantsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/IR/DataLayoutTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/IR/DebugInfoTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/IR/DebugTypeODRUniquingTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/IR/DemandedBitsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/IR/DominatorTreeBatchUpdatesTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/IR/DominatorTreeTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/IR/FunctionTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/IR/IRBuilderTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/IR/InstructionsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/IR/IntrinsicsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/IR/LegacyPassManagerTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/IR/MDBuilderTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/IR/ManglerTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/IR/MetadataTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/IR/ModuleTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/IR/PassBuilderCallbacksTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/IR/PassManagerTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/IR/PatternMatch.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/IR/TimePassesTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/IR/TypesTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/IR/UseTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/IR/UserTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/IR/VPIntrinsicTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/IR/ValueHandleTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/IR/ValueMapTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/IR/ValueTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/IR/VectorTypesTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/IR/VerifierTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/InterfaceStub/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/InterfaceStub/ELFYAMLTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/LineEditor/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/LineEditor/LineEditor.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Linker/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/Linker/LinkModulesTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/MC/AMDGPU/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/MC/AMDGPU/DwarfRegMappings.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/MC/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/MC/Disassembler.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/MC/DwarfLineTables.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/MC/MCDisassemblerTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/MC/MCInstPrinter.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/MC/StringTableBuilderTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/MC/SystemZ/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/MC/SystemZ/SystemZAsmLexerTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/MC/TargetRegistry.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/MI/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/MI/LiveIntervalTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/MIR/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/MIR/MachineMetadata.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Object/ArchiveTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Object/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/Object/ELFObjectFileTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Object/ELFTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Object/ELFTypesTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Object/MinidumpTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Object/ObjectFileTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Object/SymbolSizeTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Object/SymbolicFileTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Object/XCOFFObjectFileTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ObjectYAML/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/ObjectYAML/DWARFYAMLTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ObjectYAML/ELFYAMLTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ObjectYAML/MinidumpYAMLTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ObjectYAML/YAML2ObjTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ObjectYAML/YAMLTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Option/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/Option/OptionMarshallingTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Option/OptionParsingTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Option/Opts.td
 delete mode 100644 gnu/llvm/llvm/unittests/Passes/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/Passes/DoublerPlugin.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Passes/PassBuilderBindingsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Passes/PluginsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Passes/TestPlugin.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Passes/TestPlugin.h
 delete mode 100644 gnu/llvm/llvm/unittests/ProfileData/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/ProfileData/CoverageMappingTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ProfileData/InstrProfDataTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ProfileData/InstrProfTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/ProfileData/SampleProfTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Remarks/BitstreamRemarksFormatTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Remarks/BitstreamRemarksParsingTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Remarks/BitstreamRemarksSerializerTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Remarks/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/Remarks/RemarksAPITest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Remarks/RemarksLinkingTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Remarks/RemarksStrTabParsingTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Remarks/YAMLRemarksParsingTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Remarks/YAMLRemarksSerializerTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/ARMAttributeParser.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/AlignOfTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/AlignmentTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/AllocatorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/AnnotationsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/ArrayRecyclerTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/Base64Test.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/BinaryStreamTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/BlockFrequencyTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/BranchProbabilityTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/Support/CRCTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/CachePruningTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/Casting.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/CheckedArithmeticTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/Chrono.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/CommandLineTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/CompressionTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/ConvertUTFTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/CrashRecoveryTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/DJBTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/DataExtractorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/DebugCounterTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/DebugTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/DynamicLibrary/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/DynamicLibrary/ExportedFuncs.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/DynamicLibrary/PipSqueak.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/DynamicLibrary/PipSqueak.h
 delete mode 100644 gnu/llvm/llvm/unittests/Support/ELFAttributeParserTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/EndianStreamTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/EndianTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/ErrnoTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/ErrorOrTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/ErrorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/ExtensibleRTTITest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/FSUniqueIDTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/FileCollectorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/FileOutputBufferTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/FileUtilitiesTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/FormatVariadicTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/GlobPatternTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/Host.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/IndexedAccessorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/InstructionCostTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/ItaniumManglingCanonicalizerTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/JSONTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/KnownBitsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/KnownBitsTest.h
 delete mode 100644 gnu/llvm/llvm/unittests/Support/LEB128Test.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/LineIteratorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/LinearPolyBaseTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/LockFileManagerTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/MD5Test.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/ManagedStatic.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/MatchersTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/MathExtrasTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/MemoryBufferRefTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/MemoryBufferTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/MemoryTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/NativeFormatTests.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/OptimizedStructLayoutTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/ParallelTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/Path.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/ProcessTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/ProgramTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/RISCVAttributeParserTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/RegexTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/ReplaceFileTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/ReverseIterationTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/SHA256.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/ScaledNumberTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/SourceMgrTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/SpecialCaseListTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/SuffixTreeTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/SwapByteOrderTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/SymbolRemappingReaderTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/TarWriterTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/TargetParserTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/TaskQueueTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/ThreadLocalTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/ThreadPool.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/Threading.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/TimerTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/ToolOutputFileTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/TrailingObjectsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/TrigramIndexTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/TypeNameTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/TypeTraitsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/UnicodeTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/VersionTupleTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/VirtualFileSystemTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/WithColorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/YAMLIOTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/YAMLParserTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/formatted_raw_ostream_test.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/raw_fd_stream_test.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/raw_ostream_test.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/raw_pwrite_stream_test.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/raw_sha1_ostream_test.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Support/xxhashTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/TableGen/Automata.td
 delete mode 100644 gnu/llvm/llvm/unittests/TableGen/AutomataTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/TableGen/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/TableGen/CodeExpanderTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Target/AArch64/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/Target/AArch64/DecomposeStackOffsetTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Target/AArch64/InstSizes.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Target/AArch64/MatrixRegisterAliasing.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Target/AMDGPU/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/Target/AMDGPU/DwarfRegMappings.cpp
 delete mode 100755 gnu/llvm/llvm/unittests/Target/AMDGPU/ExecMayBeModifiedBeforeAnyUse.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Target/ARM/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/Target/ARM/MachineInstrTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Target/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/Target/PowerPC/AIXRelocModelTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Target/PowerPC/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/Target/WebAssembly/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/Target/WebAssembly/WebAssemblyExceptionInfoTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Target/X86/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/Target/X86/MachineSizeOptsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/TextAPI/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/TextAPI/TextStubHelpers.h
 delete mode 100644 gnu/llvm/llvm/unittests/TextAPI/TextStubV1Tests.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/TextAPI/TextStubV2Tests.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/TextAPI/TextStubV3Tests.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/TextAPI/TextStubV4Tests.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/IPO/AttributorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/IPO/AttributorTestBase.h
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/IPO/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/IPO/LowerTypeTests.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/IPO/WholeProgramDevirt.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/Scalar/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/Scalar/LICMTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/Scalar/LoopPassManagerTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/Utils/ASanStackFrameLayoutTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/Utils/BasicBlockUtilsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/Utils/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/Utils/CallPromotionUtilsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/Utils/CloningTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/Utils/CodeExtractorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/Utils/CodeMoverUtilsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/Utils/DebugifyTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/Utils/FunctionComparatorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/Utils/IntegerDivisionTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/Utils/LocalTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/Utils/LoopRotationUtilsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/Utils/LoopUtilsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/Utils/ModuleUtilsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/Utils/SSAUpdaterBulkTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/Utils/ScalarEvolutionExpanderTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/Utils/SizeOptsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/Utils/UnrollLoopTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/Utils/VFABIUtils.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/Utils/ValueMapperTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/Vectorize/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/Vectorize/VPlanDominatorTreeTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/Vectorize/VPlanHCFGTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/Vectorize/VPlanLoopInfoTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/Vectorize/VPlanPredicatorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/Vectorize/VPlanSlpTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/Vectorize/VPlanTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/Transforms/Vectorize/VPlanTestBase.h
 delete mode 100644 gnu/llvm/llvm/unittests/XRay/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/XRay/FDRBlockIndexerTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/XRay/FDRBlockVerifierTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/XRay/FDRProducerConsumerTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/XRay/FDRRecordPrinterTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/XRay/FDRRecordsTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/XRay/FDRTraceWriterTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/XRay/GraphTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/XRay/ProfileTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/tools/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-cfi-verify/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-cfi-verify/FileAnalysis.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-cfi-verify/GraphBuilder.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-exegesis/AArch64/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-exegesis/AArch64/TargetTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-exegesis/ARM/AssemblerTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-exegesis/ARM/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-exegesis/BenchmarkRunnerTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-exegesis/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-exegesis/ClusteringTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-exegesis/Common/AssemblerUtils.h
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-exegesis/Mips/BenchmarkResultTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-exegesis/Mips/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-exegesis/Mips/RegisterAliasingTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-exegesis/Mips/SnippetGeneratorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-exegesis/Mips/TargetTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-exegesis/Mips/TestBase.h
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-exegesis/PerfHelperTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-exegesis/PowerPC/AnalysisTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-exegesis/PowerPC/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-exegesis/PowerPC/SnippetGeneratorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-exegesis/PowerPC/TargetTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-exegesis/PowerPC/TestBase.h
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-exegesis/RegisterValueTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-exegesis/SnippetGeneratorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/AssemblerTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/BenchmarkResultTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/RegisterAliasingTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/SchedClassResolutionTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/SnippetFileTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/SnippetGeneratorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/SnippetRepetitorTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/TargetTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/TestBase.h
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-profgen/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/unittests/tools/llvm-profgen/ContextCompressionTest.cpp
 delete mode 100644 gnu/llvm/llvm/unittests/unittest.cfg.in
 delete mode 100644 gnu/llvm/llvm/utils/TableGen/CodeBeadsGen.cpp
 delete mode 100644 gnu/llvm/llvm/utils/TableGen/FixedLenDecoderEmitter.cpp
 delete mode 100644 gnu/llvm/llvm/utils/TableGen/RISCVCompressInstEmitter.cpp
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/AUTHORS
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/CONTRIBUTING.md
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/CONTRIBUTORS
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/LICENSE
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/README.LLVM
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/README.md
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/WORKSPACE
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/appveyor.yml
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/cmake/AddCXXCompilerFlag.cmake
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/cmake/CXXFeatureCheck.cmake
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/cmake/Config.cmake.in
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/cmake/GetGitVersion.cmake
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/cmake/HandleGTest.cmake
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/cmake/Modules/FindLLVMAr.cmake
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/cmake/Modules/FindLLVMNm.cmake
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/cmake/Modules/FindLLVMRanLib.cmake
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/cmake/benchmark.pc.in
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/cmake/gnu_posix_regex.cpp
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/cmake/llvm-toolchain.cmake
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/cmake/posix_regex.cpp
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/cmake/split_list.cmake
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/cmake/std_regex.cpp
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/cmake/steady_clock.cpp
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/cmake/thread_safety_attributes.cpp
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/docs/AssemblyTests.md
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/docs/tools.md
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/include/benchmark/benchmark.h
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/mingw.py
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/releasing.md
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/arraysize.h
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/benchmark.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/benchmark_api_internal.h
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/benchmark_main.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/benchmark_register.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/benchmark_register.h
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/check.h
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/colorprint.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/colorprint.h
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/commandlineflags.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/commandlineflags.h
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/complexity.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/complexity.h
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/console_reporter.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/counter.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/counter.h
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/csv_reporter.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/cycleclock.h
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/internal_macros.h
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/json_reporter.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/log.h
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/mutex.h
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/re.h
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/reporter.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/sleep.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/sleep.h
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/statistics.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/statistics.h
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/string_util.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/string_util.h
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/sysinfo.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/thread_manager.h
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/thread_timer.h
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/timers.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/src/timers.h
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/test/AssemblyTests.cmake
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/test/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/test/basic_test.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/test/benchmark_gtest.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/test/benchmark_test.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/test/clobber_memory_assembly_test.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/test/complexity_test.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/test/cxx03_test.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/test/diagnostics_test.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/test/donotoptimize_assembly_test.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/test/donotoptimize_test.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/test/filter_test.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/test/fixture_test.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/test/link_main_test.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/test/map_test.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/test/multiple_ranges_test.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/test/options_test.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/test/output_test.h
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/test/output_test_helper.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/test/register_benchmark_test.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/test/reporter_output_test.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/test/skip_with_error_test.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/test/state_assembly_test.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/test/statistics_gtest.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/test/templated_fixture_test.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/test/user_counters_tabular_test.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/test/user_counters_test.cc
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/tools/compare.py
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/tools/gbench/Inputs/test1_run1.json
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/tools/gbench/Inputs/test1_run2.json
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/tools/gbench/Inputs/test2_run.json
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/tools/gbench/__init__.py
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/tools/gbench/report.py
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/tools/gbench/util.py
 delete mode 100644 gnu/llvm/llvm/utils/benchmark/tools/strip_asm.py
 delete mode 100755 gnu/llvm/llvm/utils/countloc.sh
 delete mode 100644 gnu/llvm/llvm/utils/docker/debian8/Dockerfile
 delete mode 100755 gnu/llvm/llvm/utils/getsrcs.sh
 delete mode 100755 gnu/llvm/llvm/utils/gn/build/run_tablegen.py
 delete mode 100644 gnu/llvm/llvm/utils/gn/secondary/clang/tools/clang-offload-wrapper/BUILD.gn
 delete mode 100644 gnu/llvm/llvm/utils/gn/secondary/compiler-rt/lib/tsan/BUILD.gn
 delete mode 100644 gnu/llvm/llvm/utils/gn/secondary/lld/lib/Core/BUILD.gn
 delete mode 100644 gnu/llvm/llvm/utils/gn/secondary/lld/lib/Driver/BUILD.gn
 delete mode 100644 gnu/llvm/llvm/utils/gn/secondary/lld/lib/ReaderWriter/BUILD.gn
 delete mode 100644 gnu/llvm/llvm/utils/gn/secondary/lld/lib/ReaderWriter/MachO/BUILD.gn
 delete mode 100644 gnu/llvm/llvm/utils/gn/secondary/lld/lib/ReaderWriter/YAML/BUILD.gn
 delete mode 100644 gnu/llvm/llvm/utils/gn/secondary/lld/unittests/BUILD.gn
 delete mode 100644 gnu/llvm/llvm/utils/gn/secondary/lld/unittests/DriverTests/BUILD.gn
 delete mode 100644 gnu/llvm/llvm/utils/gn/secondary/lld/unittests/MachOTests/BUILD.gn
 delete mode 100644 gnu/llvm/llvm/utils/gn/secondary/llvm/tools/llvm-mca/lib/AMDGPU/BUILD.gn
 delete mode 100644 gnu/llvm/llvm/utils/gn/secondary/llvm/tools/split-file/BUILD.gn
 delete mode 100644 gnu/llvm/llvm/utils/gn/secondary/llvm/utils/benchmark/BUILD.gn
 delete mode 100644 gnu/llvm/llvm/utils/gn/secondary/llvm/utils/unittest/BUILD.gn
 delete mode 100644 gnu/llvm/llvm/utils/gn/secondary/llvm/utils/unittest/UnitTestMain/BUILD.gn
 delete mode 100644 gnu/llvm/llvm/utils/gn/secondary/llvm/utils/unittest/unittest.gni
 delete mode 100644 gnu/llvm/llvm/utils/lit/README.txt
 delete mode 100644 gnu/llvm/llvm/utils/lit/tests/Inputs/googletest-upstream-format/DummySubDir/OneTest.py
 delete mode 100644 gnu/llvm/llvm/utils/lit/tests/Inputs/googletest-upstream-format/lit.cfg
 delete mode 100644 gnu/llvm/llvm/utils/lit/tests/Inputs/reorder/.lit_test_times.txt
 delete mode 100644 gnu/llvm/llvm/utils/lit/tests/googletest-upstream-format.py
 delete mode 100755 gnu/llvm/llvm/utils/llvmdo
 delete mode 100755 gnu/llvm/llvm/utils/llvmgrep
 delete mode 100755 gnu/llvm/llvm/utils/release/build_llvm_package.bat
 delete mode 100644 gnu/llvm/llvm/utils/sanitizers/ubsan_blacklist.txt
 delete mode 100644 gnu/llvm/llvm/utils/unittest/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/utils/unittest/UnitTestMain/CMakeLists.txt
 delete mode 100644 gnu/llvm/llvm/utils/unittest/UnitTestMain/TestMain.cpp
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googlemock/LICENSE.txt
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googlemock/README.LLVM
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-actions.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-cardinalities.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-function-mocker.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-generated-actions.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-generated-function-mockers.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-generated-matchers.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-matchers.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-more-actions.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-more-matchers.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-nice-strict.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-spec-builders.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/internal/custom/gmock-matchers.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/internal/custom/gmock-port.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/internal/gmock-internal-utils.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/internal/gmock-port.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/internal/gmock-pp.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googlemock/src/gmock-all.cc
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googlemock/src/gmock-cardinalities.cc
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googlemock/src/gmock-internal-utils.cc
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googlemock/src/gmock-matchers.cc
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googlemock/src/gmock-spec-builders.cc
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googlemock/src/gmock.cc
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googletest/LICENSE.TXT
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googletest/README.LLVM
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-death-test.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-matchers.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-message.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-param-test.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-printers.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-spi.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-test-part.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-typed-test.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest_pred_impl.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest_prod.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/custom/gtest-port.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/custom/gtest-printers.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/custom/gtest.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/custom/raw-ostream.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-death-test-internal.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-filepath.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-internal.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-param-util.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port-arch.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-string.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-type-util.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googletest/src/gtest-all.cc
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googletest/src/gtest-death-test.cc
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googletest/src/gtest-filepath.cc
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googletest/src/gtest-internal-inl.h
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googletest/src/gtest-matchers.cc
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googletest/src/gtest-port.cc
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googletest/src/gtest-printers.cc
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googletest/src/gtest-test-part.cc
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googletest/src/gtest-typed-test.cc
 delete mode 100644 gnu/llvm/llvm/utils/unittest/googletest/src/gtest.cc

diff --git a/gnu/llvm/llvm/bindings/go/README.txt b/gnu/llvm/llvm/bindings/go/README.txt
deleted file mode 100644
index 75cca5a82b4..00000000000
--- a/gnu/llvm/llvm/bindings/go/README.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-This directory contains LLVM bindings for the Go programming language
-(http://golang.org).
-
-Prerequisites
--------------
-
-* Go 1.2+.
-* CMake (to build LLVM).
-
-Using the bindings
-------------------
-
-The package path "llvm.org/llvm/bindings/go/llvm" can be used to
-import the latest development version of LLVM from SVN. Paths such as
-"llvm.org/llvm.v36/bindings/go/llvm" refer to released versions of LLVM.
-
-It is recommended to use the "-d" flag with "go get" to download the
-package or a dependency, as an additional step is required to build LLVM
-(see "Building LLVM" below).
-
-Building LLVM
--------------
-
-The script "build.sh" in this directory can be used to build LLVM and prepare
-it to be used by the bindings. If you receive an error message from "go build"
-like this:
-
-    ./analysis.go:4:84: fatal error: llvm-c/Analysis.h: No such file or directory
-     #include <llvm-c/Analysis.h> // If you are getting an error here read bindings/go/README.txt
-
-or like this:
-
-    ./llvm_dep.go:5: undefined: run_build_sh
-
-it means that LLVM needs to be built or updated by running the script.
-
-    $ $GOPATH/src/llvm.org/llvm/bindings/go/build.sh
-
-Any command line arguments supplied to the script are passed to LLVM's CMake
-build system. A good set of arguments to use during development are:
-
-    $ $GOPATH/src/llvm.org/llvm/bindings/go/build.sh -DCMAKE_BUILD_TYPE=Debug -DLLVM_TARGETS_TO_BUILD=host -DBUILD_SHARED_LIBS=ON
-
-Note that CMake keeps a cache of build settings so once you have built
-LLVM there is no need to pass these arguments again after updating.
-
-Alternatively, you can build LLVM yourself, but you must then set the
-CGO_CPPFLAGS, CGO_CXXFLAGS and CGO_LDFLAGS environment variables:
-
-    $ export CGO_CPPFLAGS="`/path/to/llvm-build/bin/llvm-config --cppflags`"
-    $ export CGO_CXXFLAGS=-std=c++14
-    $ export CGO_LDFLAGS="`/path/to/llvm-build/bin/llvm-config --ldflags --libs --system-libs all`"
-    $ go build -tags byollvm
-
-If you see a compilation error while compiling your code with Go 1.9.4 or later as follows,
-
-    go build llvm.org/llvm/bindings/go/llvm: invalid flag in #cgo LDFLAGS: -Wl,-headerpad_max_install_names
-
-you need to setup $CGO_LDFLAGS_ALLOW to allow a compiler to specify some linker options:
-
-    $ export CGO_LDFLAGS_ALLOW='-Wl,(-search_paths_first|-headerpad_max_install_names)'
diff --git a/gnu/llvm/llvm/bindings/go/build.sh b/gnu/llvm/llvm/bindings/go/build.sh
deleted file mode 100755
index 3177852aeba..00000000000
--- a/gnu/llvm/llvm/bindings/go/build.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh -xe
-
-gollvmdir=$(dirname "$0")/llvm
-
-workdir=$gollvmdir/workdir
-llvmdir=$gollvmdir/../../..
-llvm_builddir=$workdir/llvm_build
-
-mkdir -p $llvm_builddir
-
-cmake_flags="../../../../.. $@"
-llvm_config="$llvm_builddir/bin/llvm-config"
-llvm_go="$llvm_builddir/bin/llvm-go"
-
-if test -n "`which ninja`" ; then
-  # If Ninja is available, we can speed up the build by building only the
-  # required subset of LLVM.
-  (cd $llvm_builddir && cmake -G Ninja $cmake_flags)
-  ninja -C $llvm_builddir llvm-config llvm-go
-  llvm_components="$($llvm_go print-components)"
-  llvm_buildtargets="$($llvm_config --libs $llvm_components | sed -e 's/-l//g')"
-  ninja -C $llvm_builddir $llvm_buildtargets FileCheck
-else
-  (cd $llvm_builddir && cmake $cmake_flags)
-  make -C $llvm_builddir -j4
-fi
-
-$llvm_go print-config > $gollvmdir/llvm_config.go
diff --git a/gnu/llvm/llvm/bindings/go/conftest.go b/gnu/llvm/llvm/bindings/go/conftest.go
deleted file mode 100644
index d97fb89f7c2..00000000000
--- a/gnu/llvm/llvm/bindings/go/conftest.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package main
-
-import (
-	"go/build"
-	"os"
-)
-
-// Tests that the Go compiler is at least version 1.2.
-func main() {
-	for _, tag := range build.Default.ReleaseTags {
-		if tag == "go1.2" {
-			os.Exit(0)
-		}
-	}
-	os.Exit(1)
-}
diff --git a/gnu/llvm/llvm/bindings/go/llvm/IRBindings.cpp b/gnu/llvm/llvm/bindings/go/llvm/IRBindings.cpp
deleted file mode 100644
index 1831d33540c..00000000000
--- a/gnu/llvm/llvm/bindings/go/llvm/IRBindings.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-//===- IRBindings.cpp - Additional bindings for ir ------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines additional C bindings for the ir component.
-//
-//===----------------------------------------------------------------------===//
-
-#include "IRBindings.h"
-#include "llvm/IR/Attributes.h"
-#include "llvm/IR/DebugLoc.h"
-#include "llvm/IR/DebugInfoMetadata.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-
-using namespace llvm;
-
-LLVMMetadataRef LLVMConstantAsMetadata(LLVMValueRef C) {
-  return wrap(ConstantAsMetadata::get(unwrap<Constant>(C)));
-}
-
-LLVMMetadataRef LLVMMDString2(LLVMContextRef C, const char *Str, unsigned SLen) {
-  return wrap(MDString::get(*unwrap(C), StringRef(Str, SLen)));
-}
-
-LLVMMetadataRef LLVMMDNode2(LLVMContextRef C, LLVMMetadataRef *MDs,
-                            unsigned Count) {
-  return wrap(
-      MDNode::get(*unwrap(C), ArrayRef<Metadata *>(unwrap(MDs), Count)));
-}
-
-void LLVMAddNamedMetadataOperand2(LLVMModuleRef M, const char *name,
-                                  LLVMMetadataRef Val) {
-  NamedMDNode *N = unwrap(M)->getOrInsertNamedMetadata(name);
-  if (!N)
-    return;
-  if (!Val)
-    return;
-  N->addOperand(unwrap<MDNode>(Val));
-}
-
-void LLVMSetMetadata2(LLVMValueRef Inst, unsigned KindID, LLVMMetadataRef MD) {
-  MDNode *N = MD ? unwrap<MDNode>(MD) : nullptr;
-  unwrap<Instruction>(Inst)->setMetadata(KindID, N);
-}
-
-void LLVMGoSetCurrentDebugLocation(LLVMBuilderRef Bref, unsigned Line,
-                                  unsigned Col, LLVMMetadataRef Scope,
-                                  LLVMMetadataRef InlinedAt) {
-  if (!Scope)
-    unwrap(Bref)->SetCurrentDebugLocation(DebugLoc());
-  else
-    unwrap(Bref)->SetCurrentDebugLocation(DILocation::get(
-        unwrap<MDNode>(Scope)->getContext(), Line, Col, unwrap<MDNode>(Scope),
-        InlinedAt ? unwrap<MDNode>(InlinedAt) : nullptr));
-}
-
-LLVMDebugLocMetadata LLVMGoGetCurrentDebugLocation(LLVMBuilderRef Bref) {
-  const auto& Loc = unwrap(Bref)->getCurrentDebugLocation();
-  const auto* InlinedAt = Loc.getInlinedAt();
-  const LLVMDebugLocMetadata md{
-    Loc.getLine(),
-    Loc.getCol(),
-    wrap(Loc.getScope()),
-    InlinedAt == nullptr ? nullptr : wrap(InlinedAt->getRawInlinedAt()),
-  };
-  return md;
-}
-
diff --git a/gnu/llvm/llvm/bindings/go/llvm/IRBindings.h b/gnu/llvm/llvm/bindings/go/llvm/IRBindings.h
deleted file mode 100644
index 778b0d21bb2..00000000000
--- a/gnu/llvm/llvm/bindings/go/llvm/IRBindings.h
+++ /dev/null
@@ -1,57 +0,0 @@
-//===- IRBindings.h - Additional bindings for IR ----------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines additional C bindings for the IR component.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_BINDINGS_GO_LLVM_IRBINDINGS_H
-#define LLVM_BINDINGS_GO_LLVM_IRBINDINGS_H
-
-#include "llvm-c/Core.h"
-#include "llvm-c/DebugInfo.h"
-#ifdef __cplusplus
-#include "llvm/IR/Metadata.h"
-#include "llvm/Support/CBindingWrapping.h"
-#endif
-
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct LLVMDebugLocMetadata{
-    unsigned Line;
-    unsigned Col;
-    LLVMMetadataRef Scope;
-    LLVMMetadataRef InlinedAt;
-};
-
-LLVMMetadataRef LLVMConstantAsMetadata(LLVMValueRef Val);
-
-LLVMMetadataRef LLVMMDString2(LLVMContextRef C, const char *Str, unsigned SLen);
-LLVMMetadataRef LLVMMDNode2(LLVMContextRef C, LLVMMetadataRef *MDs,
-                            unsigned Count);
-
-void LLVMAddNamedMetadataOperand2(LLVMModuleRef M, const char *name,
-                                  LLVMMetadataRef Val);
-void LLVMSetMetadata2(LLVMValueRef Inst, unsigned KindID, LLVMMetadataRef MD);
-
-void LLVMGoSetCurrentDebugLocation(LLVMBuilderRef Bref, unsigned Line,
-                                  unsigned Col, LLVMMetadataRef Scope,
-                                  LLVMMetadataRef InlinedAt);
-
-struct LLVMDebugLocMetadata LLVMGoGetCurrentDebugLocation(LLVMBuilderRef Bref);
-
-#ifdef __cplusplus
-}
-
-#endif
-
-#endif
diff --git a/gnu/llvm/llvm/bindings/go/llvm/InstrumentationBindings.cpp b/gnu/llvm/llvm/bindings/go/llvm/InstrumentationBindings.cpp
deleted file mode 100644
index 71d43de254a..00000000000
--- a/gnu/llvm/llvm/bindings/go/llvm/InstrumentationBindings.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-//===- InstrumentationBindings.cpp - instrumentation bindings -------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines C bindings for the instrumentation component.
-//
-//===----------------------------------------------------------------------===//
-
-#include "InstrumentationBindings.h"
-#include "llvm-c/Core.h"
-#include "llvm/IR/LegacyPassManager.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Transforms/Instrumentation.h"
-#include "llvm/Transforms/Instrumentation/AddressSanitizer.h"
-#include "llvm/Transforms/Instrumentation/MemorySanitizer.h"
-#include "llvm/Transforms/Instrumentation/ThreadSanitizer.h"
-
-using namespace llvm;
-
-void LLVMAddAddressSanitizerFunctionPass(LLVMPassManagerRef PM) {
-  unwrap(PM)->add(createAddressSanitizerFunctionPass());
-}
-
-void LLVMAddAddressSanitizerModulePass(LLVMPassManagerRef PM) {
-  unwrap(PM)->add(createModuleAddressSanitizerLegacyPassPass());
-}
-
-void LLVMAddThreadSanitizerPass(LLVMPassManagerRef PM) {
-  unwrap(PM)->add(createThreadSanitizerLegacyPassPass());
-}
-
-void LLVMAddMemorySanitizerLegacyPassPass(LLVMPassManagerRef PM) {
-  unwrap(PM)->add(createMemorySanitizerLegacyPassPass());
-}
-
-void LLVMAddDataFlowSanitizerPass(LLVMPassManagerRef PM,
-                                  int ABIListFilesNum,
-                                  const char **ABIListFiles) {
-  std::vector<std::string> ABIListFilesVec;
-  for (int i = 0; i != ABIListFilesNum; ++i) {
-    ABIListFilesVec.push_back(ABIListFiles[i]);
-  }
-  unwrap(PM)->add(createDataFlowSanitizerLegacyPassPass(ABIListFilesVec));
-}
diff --git a/gnu/llvm/llvm/bindings/go/llvm/InstrumentationBindings.h b/gnu/llvm/llvm/bindings/go/llvm/InstrumentationBindings.h
deleted file mode 100644
index 143086c0627..00000000000
--- a/gnu/llvm/llvm/bindings/go/llvm/InstrumentationBindings.h
+++ /dev/null
@@ -1,37 +0,0 @@
-//===- InstrumentationBindings.h - instrumentation bindings -----*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines C bindings for the Transforms/Instrumentation component.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_BINDINGS_GO_LLVM_INSTRUMENTATIONBINDINGS_H
-#define LLVM_BINDINGS_GO_LLVM_INSTRUMENTATIONBINDINGS_H
-
-#include "llvm-c/Core.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// FIXME: These bindings shouldn't be Go-specific and should eventually move to
-// a (somewhat) less stable collection of C APIs for use in creating bindings of
-// LLVM in other languages.
-
-void LLVMAddAddressSanitizerFunctionPass(LLVMPassManagerRef PM);
-void LLVMAddAddressSanitizerModulePass(LLVMPassManagerRef PM);
-void LLVMAddThreadSanitizerPass(LLVMPassManagerRef PM);
-void LLVMAddMemorySanitizerLegacyPassPass(LLVMPassManagerRef PM);
-void LLVMAddDataFlowSanitizerPass(LLVMPassManagerRef PM, int ABIListFilesNum,
-                                  const char **ABIListFiles);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/gnu/llvm/llvm/bindings/go/llvm/SupportBindings.cpp b/gnu/llvm/llvm/bindings/go/llvm/SupportBindings.cpp
deleted file mode 100644
index aac69a7c788..00000000000
--- a/gnu/llvm/llvm/bindings/go/llvm/SupportBindings.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-//===- SupportBindings.cpp - Additional bindings for support --------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines additional C bindings for the support component.
-//
-//===----------------------------------------------------------------------===//
-
-#include "SupportBindings.h"
-#include "llvm/Support/DynamicLibrary.h"
-#include <stdlib.h>
-#include <string.h>
-
-void LLVMLoadLibraryPermanently2(const char *Filename, char **ErrMsg) {
-  std::string ErrMsgStr;
-  if (llvm::sys::DynamicLibrary::LoadLibraryPermanently(Filename, &ErrMsgStr)) {
-    *ErrMsg = static_cast<char *>(malloc(ErrMsgStr.size() + 1));
-    memcpy(static_cast<void *>(*ErrMsg),
-           static_cast<const void *>(ErrMsgStr.c_str()), ErrMsgStr.size() + 1);
-  }
-}
diff --git a/gnu/llvm/llvm/bindings/go/llvm/SupportBindings.h b/gnu/llvm/llvm/bindings/go/llvm/SupportBindings.h
deleted file mode 100644
index db83e91ee5a..00000000000
--- a/gnu/llvm/llvm/bindings/go/llvm/SupportBindings.h
+++ /dev/null
@@ -1,29 +0,0 @@
-//===- SupportBindings.h - Additional bindings for Support ------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines additional C bindings for the Support component.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_BINDINGS_GO_LLVM_SUPPORTBINDINGS_H
-#define LLVM_BINDINGS_GO_LLVM_SUPPORTBINDINGS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// This function duplicates the LLVMLoadLibraryPermanently function in the
-// stable C API and adds an extra ErrMsg parameter to retrieve the error
-// message.
-void LLVMLoadLibraryPermanently2(const char *Filename, char **ErrMsg);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/gnu/llvm/llvm/bindings/go/llvm/analysis.go b/gnu/llvm/llvm/bindings/go/llvm/analysis.go
deleted file mode 100644
index 3a1c9d34b4d..00000000000
--- a/gnu/llvm/llvm/bindings/go/llvm/analysis.go
+++ /dev/null
@@ -1,68 +0,0 @@
-//===- analysis.go - Bindings for analysis --------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines bindings for the analysis component.
-//
-//===----------------------------------------------------------------------===//
-
-package llvm
-
-/*
-#include "llvm-c/Analysis.h" // If you are getting an error here read bindings/go/README.txt
-#include "llvm-c/Core.h"
-#include <stdlib.h>
-*/
-import "C"
-import "errors"
-
-type VerifierFailureAction C.LLVMVerifierFailureAction
-
-const (
-	// verifier will print to stderr and abort()
-	AbortProcessAction VerifierFailureAction = C.LLVMAbortProcessAction
-	// verifier will print to stderr and return 1
-	PrintMessageAction VerifierFailureAction = C.LLVMPrintMessageAction
-	// verifier will just return 1
-	ReturnStatusAction VerifierFailureAction = C.LLVMReturnStatusAction
-)
-
-// Verifies that a module is valid, taking the specified action if not.
-// Optionally returns a human-readable description of any invalid constructs.
-func VerifyModule(m Module, a VerifierFailureAction) error {
-	var cmsg *C.char
-	broken := C.LLVMVerifyModule(m.C, C.LLVMVerifierFailureAction(a), &cmsg)
-
-	// C++'s verifyModule means isModuleBroken, so it returns false if
-	// there are no errors
-	if broken != 0 {
-		err := errors.New(C.GoString(cmsg))
-		C.LLVMDisposeMessage(cmsg)
-		return err
-	}
-	return nil
-}
-
-var verifyFunctionError = errors.New("Function is broken")
-
-// Verifies that a single function is valid, taking the specified action.
-// Useful for debugging.
-func VerifyFunction(f Value, a VerifierFailureAction) error {
-	broken := C.LLVMVerifyFunction(f.C, C.LLVMVerifierFailureAction(a))
-
-	// C++'s verifyFunction means isFunctionBroken, so it returns false if
-	// there are no errors
-	if broken != 0 {
-		return verifyFunctionError
-	}
-	return nil
-}
-
-// Open up a ghostview window that displays the CFG of the current function.
-// Useful for debugging.
-func ViewFunctionCFG(f Value)     { C.LLVMViewFunctionCFG(f.C) }
-func ViewFunctionCFGOnly(f Value) { C.LLVMViewFunctionCFGOnly(f.C) }
diff --git a/gnu/llvm/llvm/bindings/go/llvm/bitreader.go b/gnu/llvm/llvm/bindings/go/llvm/bitreader.go
deleted file mode 100644
index 1954916e717..00000000000
--- a/gnu/llvm/llvm/bindings/go/llvm/bitreader.go
+++ /dev/null
@@ -1,50 +0,0 @@
-//===- bitreader.go - Bindings for bitreader ------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines bindings for the bitreader component.
-//
-//===----------------------------------------------------------------------===//
-
-package llvm
-
-/*
-#include "llvm-c/BitReader.h"
-#include "llvm-c/Core.h"
-#include <stdlib.h>
-*/
-import "C"
-
-import (
-	"errors"
-	"unsafe"
-)
-
-// ParseBitcodeFile parses the LLVM IR (bitcode) in the file with the
-// specified name, and returns a new LLVM module.
-func ParseBitcodeFile(name string) (Module, error) {
-	var buf C.LLVMMemoryBufferRef
-	var errmsg *C.char
-	var cfilename *C.char = C.CString(name)
-	defer C.free(unsafe.Pointer(cfilename))
-	result := C.LLVMCreateMemoryBufferWithContentsOfFile(cfilename, &buf, &errmsg)
-	if result != 0 {
-		err := errors.New(C.GoString(errmsg))
-		C.free(unsafe.Pointer(errmsg))
-		return Module{}, err
-	}
-	defer C.LLVMDisposeMemoryBuffer(buf)
-
-	var m Module
-	if C.LLVMParseBitcode2(buf, &m.C) == 0 {
-		return m, nil
-	}
-
-	err := errors.New(C.GoString(errmsg))
-	C.free(unsafe.Pointer(errmsg))
-	return Module{}, err
-}
diff --git a/gnu/llvm/llvm/bindings/go/llvm/bitwriter.go b/gnu/llvm/llvm/bindings/go/llvm/bitwriter.go
deleted file mode 100644
index 83780fc6971..00000000000
--- a/gnu/llvm/llvm/bindings/go/llvm/bitwriter.go
+++ /dev/null
@@ -1,38 +0,0 @@
-//===- bitwriter.go - Bindings for bitwriter ------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines bindings for the bitwriter component.
-//
-//===----------------------------------------------------------------------===//
-
-package llvm
-
-/*
-#include "llvm-c/BitWriter.h"
-#include <stdlib.h>
-*/
-import "C"
-import "os"
-import "errors"
-
-var writeBitcodeToFileErr = errors.New("Failed to write bitcode to file")
-
-func WriteBitcodeToFile(m Module, file *os.File) error {
-	fail := C.LLVMWriteBitcodeToFD(m.C, C.int(file.Fd()), C.int(0), C.int(0))
-	if fail != 0 {
-		return writeBitcodeToFileErr
-	}
-	return nil
-}
-
-func WriteBitcodeToMemoryBuffer(m Module) MemoryBuffer {
-	mb := C.LLVMWriteBitcodeToMemoryBuffer(m.C)
-	return MemoryBuffer{mb}
-}
-
-// TODO(nsf): Figure out way how to make it work with io.Writer
diff --git a/gnu/llvm/llvm/bindings/go/llvm/dibuilder.go b/gnu/llvm/llvm/bindings/go/llvm/dibuilder.go
deleted file mode 100644
index aeaf49e539b..00000000000
--- a/gnu/llvm/llvm/bindings/go/llvm/dibuilder.go
+++ /dev/null
@@ -1,711 +0,0 @@
-//===- dibuilder.go - Bindings for DIBuilder ------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines bindings for the DIBuilder class.
-//
-//===----------------------------------------------------------------------===//
-
-package llvm
-
-/*
-#include "IRBindings.h"
-#include <stdlib.h>
-*/
-import "C"
-
-import (
-	"debug/dwarf"
-	"unsafe"
-)
-
-type DwarfTag uint32
-
-const (
-	DW_TAG_lexical_block   DwarfTag = 0x0b
-	DW_TAG_compile_unit    DwarfTag = 0x11
-	DW_TAG_variable        DwarfTag = 0x34
-	DW_TAG_base_type       DwarfTag = 0x24
-	DW_TAG_pointer_type    DwarfTag = 0x0F
-	DW_TAG_structure_type  DwarfTag = 0x13
-	DW_TAG_subroutine_type DwarfTag = 0x15
-	DW_TAG_file_type       DwarfTag = 0x29
-	DW_TAG_subprogram      DwarfTag = 0x2E
-	DW_TAG_auto_variable   DwarfTag = 0x100
-	DW_TAG_arg_variable    DwarfTag = 0x101
-)
-
-const (
-	FlagPrivate = 1 << iota
-	FlagProtected
-	FlagFwdDecl
-	FlagAppleBlock
-	FlagReserved
-	FlagVirtual
-	FlagArtificial
-	FlagExplicit
-	FlagPrototyped
-	FlagObjcClassComplete
-	FlagObjectPointer
-	FlagVector
-	FlagStaticMember
-	FlagIndirectVariable
-)
-
-type DwarfLang uint32
-
-const (
-	// http://dwarfstd.org/ShowIssue.php?issue=101014.1&type=open
-	DW_LANG_Go DwarfLang = 0x0016
-)
-
-type DwarfTypeEncoding uint32
-
-const (
-	DW_ATE_address         DwarfTypeEncoding = 0x01
-	DW_ATE_boolean         DwarfTypeEncoding = 0x02
-	DW_ATE_complex_float   DwarfTypeEncoding = 0x03
-	DW_ATE_float           DwarfTypeEncoding = 0x04
-	DW_ATE_signed          DwarfTypeEncoding = 0x05
-	DW_ATE_signed_char     DwarfTypeEncoding = 0x06
-	DW_ATE_unsigned        DwarfTypeEncoding = 0x07
-	DW_ATE_unsigned_char   DwarfTypeEncoding = 0x08
-	DW_ATE_imaginary_float DwarfTypeEncoding = 0x09
-	DW_ATE_packed_decimal  DwarfTypeEncoding = 0x0a
-	DW_ATE_numeric_string  DwarfTypeEncoding = 0x0b
-	DW_ATE_edited          DwarfTypeEncoding = 0x0c
-	DW_ATE_signed_fixed    DwarfTypeEncoding = 0x0d
-	DW_ATE_unsigned_fixed  DwarfTypeEncoding = 0x0e
-	DW_ATE_decimal_float   DwarfTypeEncoding = 0x0f
-	DW_ATE_UTF             DwarfTypeEncoding = 0x10
-	DW_ATE_lo_user         DwarfTypeEncoding = 0x80
-	DW_ATE_hi_user         DwarfTypeEncoding = 0xff
-)
-
-// DIBuilder is a wrapper for the LLVM DIBuilder class.
-type DIBuilder struct {
-	ref C.LLVMDIBuilderRef
-	m   Module
-}
-
-// NewDIBuilder creates a new DIBuilder, associated with the given module.
-func NewDIBuilder(m Module) *DIBuilder {
-	d := C.LLVMCreateDIBuilder(m.C)
-	return &DIBuilder{ref: d, m: m}
-}
-
-// Destroy destroys the DIBuilder.
-func (d *DIBuilder) Destroy() {
-	C.LLVMDisposeDIBuilder(d.ref)
-}
-
-// FInalize finalizes the debug information generated by the DIBuilder.
-func (d *DIBuilder) Finalize() {
-	C.LLVMDIBuilderFinalize(d.ref)
-}
-
-// DICompileUnit holds the values for creating compile unit debug metadata.
-type DICompileUnit struct {
-	Language       DwarfLang
-	File           string
-	Dir            string
-	Producer       string
-	Optimized      bool
-	Flags          string
-	RuntimeVersion int
-	SysRoot        string
-	SDK            string
-}
-
-// CreateCompileUnit creates compile unit debug metadata.
-func (d *DIBuilder) CreateCompileUnit(cu DICompileUnit) Metadata {
-	file := C.CString(cu.File)
-	defer C.free(unsafe.Pointer(file))
-	dir := C.CString(cu.Dir)
-	defer C.free(unsafe.Pointer(dir))
-	producer := C.CString(cu.Producer)
-	defer C.free(unsafe.Pointer(producer))
-	flags := C.CString(cu.Flags)
-	defer C.free(unsafe.Pointer(flags))
-	sysroot := C.CString(cu.SysRoot)
-	defer C.free(unsafe.Pointer(sysroot))
-	sdk := C.CString(cu.SDK)
-	defer C.free(unsafe.Pointer(sdk))
-	result := C.LLVMDIBuilderCreateCompileUnit(
-		d.ref,
-		C.LLVMDWARFSourceLanguage(cu.Language),
-		C.LLVMDIBuilderCreateFile(d.ref, file, C.size_t(len(cu.File)), dir, C.size_t(len(cu.Dir))),
-		producer, C.size_t(len(cu.Producer)),
-		C.LLVMBool(boolToCInt(cu.Optimized)),
-		flags, C.size_t(len(cu.Flags)),
-		C.unsigned(cu.RuntimeVersion),
-		/*SplitName=*/ nil, 0,
-		C.LLVMDWARFEmissionFull,
-		/*DWOId=*/ 0,
-		/*SplitDebugInlining*/ C.LLVMBool(boolToCInt(true)),
-		/*DebugInfoForProfiling*/ C.LLVMBool(boolToCInt(false)),
-		sysroot, C.size_t(len(cu.SysRoot)),
-                sdk, C.size_t(len(cu.SDK)),
-	)
-	return Metadata{C: result}
-}
-
-// CreateFile creates file debug metadata.
-func (d *DIBuilder) CreateFile(filename, dir string) Metadata {
-	cfilename := C.CString(filename)
-	defer C.free(unsafe.Pointer(cfilename))
-	cdir := C.CString(dir)
-	defer C.free(unsafe.Pointer(cdir))
-	result := C.LLVMDIBuilderCreateFile(d.ref,
-		cfilename, C.size_t(len(filename)),
-		cdir, C.size_t(len(dir)))
-	return Metadata{C: result}
-}
-
-// DILexicalBlock holds the values for creating lexical block debug metadata.
-type DILexicalBlock struct {
-	File   Metadata
-	Line   int
-	Column int
-}
-
-// CreateLexicalBlock creates lexical block debug metadata.
-func (d *DIBuilder) CreateLexicalBlock(diScope Metadata, b DILexicalBlock) Metadata {
-	result := C.LLVMDIBuilderCreateLexicalBlock(
-		d.ref,
-		diScope.C,
-		b.File.C,
-		C.unsigned(b.Line),
-		C.unsigned(b.Column),
-	)
-	return Metadata{C: result}
-}
-
-func (d *DIBuilder) CreateLexicalBlockFile(diScope Metadata, diFile Metadata, discriminator int) Metadata {
-	result := C.LLVMDIBuilderCreateLexicalBlockFile(d.ref, diScope.C, diFile.C,
-		C.unsigned(discriminator))
-	return Metadata{C: result}
-}
-
-// DIFunction holds the values for creating function debug metadata.
-type DIFunction struct {
-	Name         string
-	LinkageName  string
-	File         Metadata
-	Line         int
-	Type         Metadata
-	LocalToUnit  bool
-	IsDefinition bool
-	ScopeLine    int
-	Flags        int
-	Optimized    bool
-}
-
-// CreateFunction creates function debug metadata.
-func (d *DIBuilder) CreateFunction(diScope Metadata, f DIFunction) Metadata {
-	name := C.CString(f.Name)
-	defer C.free(unsafe.Pointer(name))
-	linkageName := C.CString(f.LinkageName)
-	defer C.free(unsafe.Pointer(linkageName))
-	result := C.LLVMDIBuilderCreateFunction(
-		d.ref,
-		diScope.C,
-		name, C.size_t(len(f.Name)),
-		linkageName, C.size_t(len(f.LinkageName)),
-		f.File.C,
-		C.unsigned(f.Line),
-		f.Type.C,
-		C.LLVMBool(boolToCInt(f.LocalToUnit)),
-		C.LLVMBool(boolToCInt(f.IsDefinition)),
-		C.unsigned(f.ScopeLine),
-		C.LLVMDIFlags(f.Flags),
-		C.LLVMBool(boolToCInt(f.Optimized)),
-	)
-	return Metadata{C: result}
-}
-
-// DIAutoVariable holds the values for creating auto variable debug metadata.
-type DIAutoVariable struct {
-	Name           string
-	File           Metadata
-	Line           int
-	Type           Metadata
-	AlwaysPreserve bool
-	Flags          int
-	AlignInBits    uint32
-}
-
-// CreateAutoVariable creates local variable debug metadata.
-func (d *DIBuilder) CreateAutoVariable(scope Metadata, v DIAutoVariable) Metadata {
-	name := C.CString(v.Name)
-	defer C.free(unsafe.Pointer(name))
-	result := C.LLVMDIBuilderCreateAutoVariable(
-		d.ref,
-		scope.C,
-		name, C.size_t(len(v.Name)),
-		v.File.C,
-		C.unsigned(v.Line),
-		v.Type.C,
-		C.LLVMBool(boolToCInt(v.AlwaysPreserve)),
-		C.LLVMDIFlags(v.Flags),
-		C.uint32_t(v.AlignInBits),
-	)
-	return Metadata{C: result}
-}
-
-// DIParameterVariable holds the values for creating parameter variable debug metadata.
-type DIParameterVariable struct {
-	Name           string
-	File           Metadata
-	Line           int
-	Type           Metadata
-	AlwaysPreserve bool
-	Flags          int
-
-	// ArgNo is the 1-based index of the argument in the function's
-	// parameter list.
-	ArgNo int
-}
-
-// CreateParameterVariable creates parameter variable debug metadata.
-func (d *DIBuilder) CreateParameterVariable(scope Metadata, v DIParameterVariable) Metadata {
-	name := C.CString(v.Name)
-	defer C.free(unsafe.Pointer(name))
-	result := C.LLVMDIBuilderCreateParameterVariable(
-		d.ref,
-		scope.C,
-		name, C.size_t(len(v.Name)),
-		C.unsigned(v.ArgNo),
-		v.File.C,
-		C.unsigned(v.Line),
-		v.Type.C,
-		C.LLVMBool(boolToCInt(v.AlwaysPreserve)),
-		C.LLVMDIFlags(v.Flags),
-	)
-	return Metadata{C: result}
-}
-
-// DIBasicType holds the values for creating basic type debug metadata.
-type DIBasicType struct {
-	Name       string
-	SizeInBits uint64
-	Encoding   DwarfTypeEncoding
-}
-
-// CreateBasicType creates basic type debug metadata.
-func (d *DIBuilder) CreateBasicType(t DIBasicType) Metadata {
-	name := C.CString(t.Name)
-	defer C.free(unsafe.Pointer(name))
-	result := C.LLVMDIBuilderCreateBasicType(
-		d.ref,
-		name,
-		C.size_t(len(t.Name)),
-		C.uint64_t(t.SizeInBits),
-		C.LLVMDWARFTypeEncoding(t.Encoding),
-		C.LLVMDIFlags(0),
-	)
-	return Metadata{C: result}
-}
-
-// DIPointerType holds the values for creating pointer type debug metadata.
-type DIPointerType struct {
-	Pointee      Metadata
-	SizeInBits   uint64
-	AlignInBits  uint32 // optional
-	AddressSpace uint32
-	Name         string // optional
-}
-
-// CreatePointerType creates a type that represents a pointer to another type.
-func (d *DIBuilder) CreatePointerType(t DIPointerType) Metadata {
-	name := C.CString(t.Name)
-	defer C.free(unsafe.Pointer(name))
-	result := C.LLVMDIBuilderCreatePointerType(
-		d.ref,
-		t.Pointee.C,
-		C.uint64_t(t.SizeInBits),
-		C.uint32_t(t.AlignInBits),
-		C.unsigned(t.AddressSpace),
-		name,
-		C.size_t(len(t.Name)),
-	)
-	return Metadata{C: result}
-}
-
-// DISubroutineType holds the values for creating subroutine type debug metadata.
-type DISubroutineType struct {
-	// File is the file in which the subroutine type is defined.
-	File Metadata
-
-	// Parameters contains the subroutine parameter types,
-	// including the return type at the 0th index.
-	Parameters []Metadata
-
-	Flags int
-}
-
-// CreateSubroutineType creates subroutine type debug metadata.
-func (d *DIBuilder) CreateSubroutineType(t DISubroutineType) Metadata {
-	params, length := llvmMetadataRefs(t.Parameters)
-	result := C.LLVMDIBuilderCreateSubroutineType(
-		d.ref,
-		t.File.C,
-		params,
-		length,
-		C.LLVMDIFlags(t.Flags),
-	)
-	return Metadata{C: result}
-}
-
-// DIStructType holds the values for creating struct type debug metadata.
-type DIStructType struct {
-	Name         string
-	File         Metadata
-	Line         int
-	SizeInBits   uint64
-	AlignInBits  uint32
-	Flags        int
-	DerivedFrom  Metadata
-	Elements     []Metadata
-	VTableHolder Metadata // optional
-	UniqueID     string
-}
-
-// CreateStructType creates struct type debug metadata.
-func (d *DIBuilder) CreateStructType(scope Metadata, t DIStructType) Metadata {
-	elements, length := llvmMetadataRefs(t.Elements)
-	name := C.CString(t.Name)
-	uniqueID := C.CString(t.UniqueID)
-	defer C.free(unsafe.Pointer(name))
-	defer C.free(unsafe.Pointer(uniqueID))
-	result := C.LLVMDIBuilderCreateStructType(
-		d.ref,
-		scope.C,
-		name,
-		C.size_t(len(t.Name)),
-		t.File.C,
-		C.unsigned(t.Line),
-		C.uint64_t(t.SizeInBits),
-		C.uint32_t(t.AlignInBits),
-		C.LLVMDIFlags(t.Flags),
-		t.DerivedFrom.C,
-		elements,
-		length,
-		C.unsigned(0), // Optional Objective-C runtime version.
-		t.VTableHolder.C,
-		uniqueID,
-		C.size_t(len(t.UniqueID)),
-	)
-	return Metadata{C: result}
-}
-
-// DIReplaceableCompositeType holds the values for creating replaceable
-// composite type debug metadata.
-type DIReplaceableCompositeType struct {
-	Tag         dwarf.Tag
-	Name        string
-	File        Metadata
-	Line        int
-	RuntimeLang int
-	SizeInBits  uint64
-	AlignInBits uint32
-	Flags       int
-	UniqueID    string
-}
-
-// CreateReplaceableCompositeType creates replaceable composite type debug metadata.
-func (d *DIBuilder) CreateReplaceableCompositeType(scope Metadata, t DIReplaceableCompositeType) Metadata {
-	name := C.CString(t.Name)
-	uniqueID := C.CString(t.UniqueID)
-	defer C.free(unsafe.Pointer(name))
-	defer C.free(unsafe.Pointer(uniqueID))
-	result := C.LLVMDIBuilderCreateReplaceableCompositeType(
-		d.ref,
-		C.unsigned(t.Tag),
-		name,
-		C.size_t(len(t.Name)),
-		scope.C,
-		t.File.C,
-		C.unsigned(t.Line),
-		C.unsigned(t.RuntimeLang),
-		C.uint64_t(t.SizeInBits),
-		C.uint32_t(t.AlignInBits),
-		C.LLVMDIFlags(t.Flags),
-		uniqueID,
-		C.size_t(len(t.UniqueID)),
-	)
-	return Metadata{C: result}
-}
-
-// DIMemberType holds the values for creating member type debug metadata.
-type DIMemberType struct {
-	Name         string
-	File         Metadata
-	Line         int
-	SizeInBits   uint64
-	AlignInBits  uint32
-	OffsetInBits uint64
-	Flags        int
-	Type         Metadata
-}
-
-// CreateMemberType creates struct type debug metadata.
-func (d *DIBuilder) CreateMemberType(scope Metadata, t DIMemberType) Metadata {
-	name := C.CString(t.Name)
-	defer C.free(unsafe.Pointer(name))
-	result := C.LLVMDIBuilderCreateMemberType(
-		d.ref,
-		scope.C,
-		name,
-		C.size_t(len(t.Name)),
-		t.File.C,
-		C.unsigned(t.Line),
-		C.uint64_t(t.SizeInBits),
-		C.uint32_t(t.AlignInBits),
-		C.uint64_t(t.OffsetInBits),
-		C.LLVMDIFlags(t.Flags),
-		t.Type.C,
-	)
-	return Metadata{C: result}
-}
-
-// DISubrange describes an integer value range.
-type DISubrange struct {
-	Lo    int64
-	Count int64
-}
-
-// DIArrayType holds the values for creating array type debug metadata.
-type DIArrayType struct {
-	SizeInBits  uint64
-	AlignInBits uint32
-	ElementType Metadata
-	Subscripts  []DISubrange
-}
-
-// CreateArrayType creates struct type debug metadata.
-func (d *DIBuilder) CreateArrayType(t DIArrayType) Metadata {
-	subscriptsSlice := make([]Metadata, len(t.Subscripts))
-	for i, s := range t.Subscripts {
-		subscriptsSlice[i] = d.getOrCreateSubrange(s.Lo, s.Count)
-	}
-	subscripts, length := llvmMetadataRefs(subscriptsSlice)
-	result := C.LLVMDIBuilderCreateArrayType(
-		d.ref,
-		C.uint64_t(t.SizeInBits),
-		C.uint32_t(t.AlignInBits),
-		t.ElementType.C,
-		subscripts,
-		length,
-	)
-	return Metadata{C: result}
-}
-
-// DITypedef holds the values for creating typedef type debug metadata.
-type DITypedef struct {
-	Type    Metadata
-	Name    string
-	File    Metadata
-	Line    int
-	Context Metadata
-  AlignInBits uint32
-}
-
-// CreateTypedef creates typedef type debug metadata.
-func (d *DIBuilder) CreateTypedef(t DITypedef) Metadata {
-	name := C.CString(t.Name)
-	defer C.free(unsafe.Pointer(name))
-	result := C.LLVMDIBuilderCreateTypedef(
-		d.ref,
-		t.Type.C,
-		name,
-		C.size_t(len(t.Name)),
-		t.File.C,
-		C.unsigned(t.Line),
-		t.Context.C,
-    C.uint32_t(t.AlignInBits),
-	)
-	return Metadata{C: result}
-}
-
-// getOrCreateSubrange gets a metadata node for the specified subrange,
-// creating if required.
-func (d *DIBuilder) getOrCreateSubrange(lo, count int64) Metadata {
-	result := C.LLVMDIBuilderGetOrCreateSubrange(d.ref, C.int64_t(lo), C.int64_t(count))
-	return Metadata{C: result}
-}
-
-// getOrCreateArray gets a metadata node containing the specified values,
-// creating if required.
-func (d *DIBuilder) getOrCreateArray(values []Metadata) Metadata {
-	if len(values) == 0 {
-		return Metadata{}
-	}
-	data, length := llvmMetadataRefs(values)
-	result := C.LLVMDIBuilderGetOrCreateArray(d.ref, data, C.size_t(length))
-	return Metadata{C: result}
-}
-
-// getOrCreateTypeArray gets a metadata node for a type array containing the
-// specified values, creating if required.
-func (d *DIBuilder) getOrCreateTypeArray(values []Metadata) Metadata {
-	if len(values) == 0 {
-		return Metadata{}
-	}
-	data, length := llvmMetadataRefs(values)
-	result := C.LLVMDIBuilderGetOrCreateTypeArray(d.ref, data, C.size_t(length))
-	return Metadata{C: result}
-}
-
-// CreateExpression creates a new descriptor for the specified
-// variable which has a complex address expression for its address.
-func (d *DIBuilder) CreateExpression(addr []int64) Metadata {
-	var data *C.int64_t
-	if len(addr) > 0 {
-		data = (*C.int64_t)(unsafe.Pointer(&addr[0]))
-	}
-	result := C.LLVMDIBuilderCreateExpression(d.ref, data, C.size_t(len(addr)))
-	return Metadata{C: result}
-}
-
-// InsertDeclareAtEnd inserts a call to llvm.dbg.declare at the end of the
-// specified basic block for the given value and associated debug metadata.
-func (d *DIBuilder) InsertDeclareAtEnd(v Value, diVarInfo, expr Metadata, l DebugLoc, bb BasicBlock) Value {
-	loc := C.LLVMDIBuilderCreateDebugLocation(
-		d.m.Context().C, C.uint(l.Line), C.uint(l.Col), l.Scope.C, l.InlinedAt.C)
-	result := C.LLVMDIBuilderInsertDeclareAtEnd(d.ref, v.C, diVarInfo.C, expr.C, loc, bb.C)
-	return Value{C: result}
-}
-
-// InsertValueAtEnd inserts a call to llvm.dbg.value at the end of the
-// specified basic block for the given value and associated debug metadata.
-func (d *DIBuilder) InsertValueAtEnd(v Value, diVarInfo, expr Metadata, l DebugLoc, bb BasicBlock) Value {
-	loc := C.LLVMDIBuilderCreateDebugLocation(
-		d.m.Context().C, C.uint(l.Line), C.uint(l.Col), l.Scope.C, l.InlinedAt.C)
-	result := C.LLVMDIBuilderInsertDbgValueAtEnd(d.ref, v.C, diVarInfo.C, expr.C, loc, bb.C)
-	return Value{C: result}
-}
-
-func (v Value) SetSubprogram(sp Metadata) {
-	C.LLVMSetSubprogram(v.C, sp.C)
-}
-
-func (v Value) Subprogram() (md Metadata) {
-	md.C = C.LLVMGetSubprogram(v.C)
-	return
-}
-
-func boolToCInt(v bool) C.int {
-	if v {
-		return 1
-	}
-	return 0
-}
-
-//-------------------------------------------------------------------------
-// llvm.Metadata
-//-------------------------------------------------------------------------
-
-func (c Context) TemporaryMDNode(mds []Metadata) (md Metadata) {
-	ptr, nvals := llvmMetadataRefs(mds)
-	md.C = C.LLVMTemporaryMDNode(c.C, ptr, C.size_t(nvals))
-	return
-}
-
-func (md Metadata) ReplaceAllUsesWith(new Metadata) {
-	C.LLVMMetadataReplaceAllUsesWith(md.C, new.C)
-}
-
-type MetadataKind C.LLVMMetadataKind
-
-const (
-	MDStringMetadataKind                     = C.LLVMMDStringMetadataKind
-	ConstantAsMetadataMetadataKind           = C.LLVMConstantAsMetadataMetadataKind
-	LocalAsMetadataMetadataKind              = C.LLVMLocalAsMetadataMetadataKind
-	DistinctMDOperandPlaceholderMetadataKind = C.LLVMDistinctMDOperandPlaceholderMetadataKind
-	MDTupleMetadataKind                      = C.LLVMMDTupleMetadataKind
-	DILocationMetadataKind                   = C.LLVMDILocationMetadataKind
-	DIExpressionMetadataKind                 = C.LLVMDIExpressionMetadataKind
-	DIGlobalVariableExpressionMetadataKind   = C.LLVMDIGlobalVariableExpressionMetadataKind
-	GenericDINodeMetadataKind                = C.LLVMGenericDINodeMetadataKind
-	DISubrangeMetadataKind                   = C.LLVMDISubrangeMetadataKind
-	DIEnumeratorMetadataKind                 = C.LLVMDIEnumeratorMetadataKind
-	DIBasicTypeMetadataKind                  = C.LLVMDIBasicTypeMetadataKind
-	DIDerivedTypeMetadataKind                = C.LLVMDIDerivedTypeMetadataKind
-	DICompositeTypeMetadataKind              = C.LLVMDICompositeTypeMetadataKind
-	DISubroutineTypeMetadataKind             = C.LLVMDISubroutineTypeMetadataKind
-	DIFileMetadataKind                       = C.LLVMDIFileMetadataKind
-	DICompileUnitMetadataKind                = C.LLVMDICompileUnitMetadataKind
-	DISubprogramMetadataKind                 = C.LLVMDISubprogramMetadataKind
-	DILexicalBlockMetadataKind               = C.LLVMDILexicalBlockMetadataKind
-	DILexicalBlockFileMetadataKind           = C.LLVMDILexicalBlockFileMetadataKind
-	DINamespaceMetadataKind                  = C.LLVMDINamespaceMetadataKind
-	DIModuleMetadataKind                     = C.LLVMDIModuleMetadataKind
-	DITemplateTypeParameterMetadataKind      = C.LLVMDITemplateTypeParameterMetadataKind
-	DITemplateValueParameterMetadataKind     = C.LLVMDITemplateValueParameterMetadataKind
-	DIGlobalVariableMetadataKind             = C.LLVMDIGlobalVariableMetadataKind
-	DILocalVariableMetadataKind              = C.LLVMDILocalVariableMetadataKind
-	DILabelMetadataKind                      = C.LLVMDILabelMetadataKind
-	DIObjCPropertyMetadataKind               = C.LLVMDIObjCPropertyMetadataKind
-	DIImportedEntityMetadataKind             = C.LLVMDIImportedEntityMetadataKind
-	DIMacroMetadataKind                      = C.LLVMDIMacroMetadataKind
-	DIMacroFileMetadataKind                  = C.LLVMDIMacroFileMetadataKind
-	DICommonBlockMetadataKind                = C.LLVMDICommonBlockMetadataKind
-)
-
-// Kind returns the metadata kind.
-func (md Metadata) Kind() MetadataKind {
-	return MetadataKind(C.LLVMGetMetadataKind(md.C))
-}
-
-// FileDirectory returns the directory of a DIFile metadata node.
-func (md Metadata) FileDirectory() string {
-	var length C.unsigned
-	ptr := C.LLVMDIFileGetDirectory(md.C, &length)
-	return string(((*[1 << 20]byte)(unsafe.Pointer(ptr)))[:length:length])
-}
-
-// FileFilename returns the filename of a DIFile metadata node.
-func (md Metadata) FileFilename() string {
-	var length C.unsigned
-	ptr := C.LLVMDIFileGetFilename(md.C, &length)
-	return string(((*[1 << 20]byte)(unsafe.Pointer(ptr)))[:length:length])
-}
-
-// FileSource returns the source of a DIFile metadata node.
-func (md Metadata) FileSource() string {
-	var length C.unsigned
-	ptr := C.LLVMDIFileGetSource(md.C, &length)
-	return string(((*[1 << 20]byte)(unsafe.Pointer(ptr)))[:length:length])
-}
-
-// LocationLine returns the line number of a DILocation.
-func (md Metadata) LocationLine() uint {
-	return uint(C.LLVMDILocationGetLine(md.C))
-}
-
-// LocationColumn returns the column (offset from the start of the line) of a
-// DILocation.
-func (md Metadata) LocationColumn() uint {
-	return uint(C.LLVMDILocationGetColumn(md.C))
-}
-
-// LocationScope returns the local scope associated with this debug location.
-func (md Metadata) LocationScope() Metadata {
-	return Metadata{C.LLVMDILocationGetScope(md.C)}
-}
-
-// LocationInlinedAt return the "inline at" location associated with this debug
-// location.
-func (md Metadata) LocationInlinedAt() Metadata {
-	return Metadata{C.LLVMDILocationGetInlinedAt(md.C)}
-}
-
-// ScopeFile returns the file (DIFile) of a given scope.
-func (md Metadata) ScopeFile() Metadata {
-	return Metadata{C.LLVMDIScopeGetFile(md.C)}
-}
diff --git a/gnu/llvm/llvm/bindings/go/llvm/executionengine.go b/gnu/llvm/llvm/bindings/go/llvm/executionengine.go
deleted file mode 100644
index 5fa82047c17..00000000000
--- a/gnu/llvm/llvm/bindings/go/llvm/executionengine.go
+++ /dev/null
@@ -1,177 +0,0 @@
-//===- executionengine.go - Bindings for executionengine ------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines bindings for the executionengine component.
-//
-//===----------------------------------------------------------------------===//
-
-package llvm
-
-/*
-#include "llvm-c/Core.h"
-#include "llvm-c/ExecutionEngine.h"
-#include <stdlib.h>
-*/
-import "C"
-import "unsafe"
-import "errors"
-
-func LinkInMCJIT()       { C.LLVMLinkInMCJIT() }
-func LinkInInterpreter() { C.LLVMLinkInInterpreter() }
-
-type GenericValue struct {
-	C C.LLVMGenericValueRef
-}
-type ExecutionEngine struct {
-	C C.LLVMExecutionEngineRef
-}
-
-type MCJITCompilerOptions struct {
-	C C.struct_LLVMMCJITCompilerOptions
-}
-
-func (options *MCJITCompilerOptions) SetMCJITOptimizationLevel(level uint) {
-	options.C.OptLevel = C.uint(level)
-}
-
-func (options *MCJITCompilerOptions) SetMCJITNoFramePointerElim(nfp bool) {
-	options.C.NoFramePointerElim = boolToLLVMBool(nfp)
-}
-
-func (options *MCJITCompilerOptions) SetMCJITEnableFastISel(fastisel bool) {
-	options.C.EnableFastISel = boolToLLVMBool(fastisel)
-}
-
-func (options *MCJITCompilerOptions) SetMCJITCodeModel(CodeModel CodeModel) {
-	options.C.CodeModel = C.LLVMCodeModel(CodeModel)
-}
-
-// helpers
-func llvmGenericValueRefPtr(t *GenericValue) *C.LLVMGenericValueRef {
-	return (*C.LLVMGenericValueRef)(unsafe.Pointer(t))
-}
-
-//-------------------------------------------------------------------------
-// llvm.GenericValue
-//-------------------------------------------------------------------------
-
-func NewGenericValueFromInt(t Type, n uint64, signed bool) (g GenericValue) {
-	g.C = C.LLVMCreateGenericValueOfInt(t.C, C.ulonglong(n), boolToLLVMBool(signed))
-	return
-}
-func NewGenericValueFromPointer(p unsafe.Pointer) (g GenericValue) {
-	g.C = C.LLVMCreateGenericValueOfPointer(p)
-	return
-}
-func NewGenericValueFromFloat(t Type, n float64) (g GenericValue) {
-	g.C = C.LLVMCreateGenericValueOfFloat(t.C, C.double(n))
-	return
-}
-func (g GenericValue) IntWidth() int { return int(C.LLVMGenericValueIntWidth(g.C)) }
-func (g GenericValue) Int(signed bool) uint64 {
-	return uint64(C.LLVMGenericValueToInt(g.C, boolToLLVMBool(signed)))
-}
-func (g GenericValue) Float(t Type) float64 {
-	return float64(C.LLVMGenericValueToFloat(t.C, g.C))
-}
-func (g GenericValue) Pointer() unsafe.Pointer {
-	return C.LLVMGenericValueToPointer(g.C)
-}
-func (g GenericValue) Dispose() { C.LLVMDisposeGenericValue(g.C) }
-
-//-------------------------------------------------------------------------
-// llvm.ExecutionEngine
-//-------------------------------------------------------------------------
-
-func NewExecutionEngine(m Module) (ee ExecutionEngine, err error) {
-	var cmsg *C.char
-	fail := C.LLVMCreateExecutionEngineForModule(&ee.C, m.C, &cmsg)
-	if fail != 0 {
-		ee.C = nil
-		err = errors.New(C.GoString(cmsg))
-		C.LLVMDisposeMessage(cmsg)
-	}
-	return
-}
-
-func NewInterpreter(m Module) (ee ExecutionEngine, err error) {
-	var cmsg *C.char
-	fail := C.LLVMCreateInterpreterForModule(&ee.C, m.C, &cmsg)
-	if fail != 0 {
-		ee.C = nil
-		err = errors.New(C.GoString(cmsg))
-		C.LLVMDisposeMessage(cmsg)
-	}
-	return
-}
-
-func NewMCJITCompilerOptions() MCJITCompilerOptions {
-	var options C.struct_LLVMMCJITCompilerOptions
-	C.LLVMInitializeMCJITCompilerOptions(&options, C.size_t(unsafe.Sizeof(C.struct_LLVMMCJITCompilerOptions{})))
-	return MCJITCompilerOptions{options}
-}
-
-func NewMCJITCompiler(m Module, options MCJITCompilerOptions) (ee ExecutionEngine, err error) {
-	var cmsg *C.char
-	fail := C.LLVMCreateMCJITCompilerForModule(&ee.C, m.C, &options.C, C.size_t(unsafe.Sizeof(C.struct_LLVMMCJITCompilerOptions{})), &cmsg)
-	if fail != 0 {
-		ee.C = nil
-		err = errors.New(C.GoString(cmsg))
-		C.LLVMDisposeMessage(cmsg)
-	}
-	return
-}
-
-func (ee ExecutionEngine) Dispose()               { C.LLVMDisposeExecutionEngine(ee.C) }
-func (ee ExecutionEngine) RunStaticConstructors() { C.LLVMRunStaticConstructors(ee.C) }
-func (ee ExecutionEngine) RunStaticDestructors()  { C.LLVMRunStaticDestructors(ee.C) }
-
-func (ee ExecutionEngine) RunFunction(f Value, args []GenericValue) (g GenericValue) {
-	nargs := len(args)
-	var argptr *GenericValue
-	if nargs > 0 {
-		argptr = &args[0]
-	}
-	g.C = C.LLVMRunFunction(ee.C, f.C,
-		C.unsigned(nargs), llvmGenericValueRefPtr(argptr))
-	return
-}
-
-func (ee ExecutionEngine) FreeMachineCodeForFunction(f Value) {
-	C.LLVMFreeMachineCodeForFunction(ee.C, f.C)
-}
-func (ee ExecutionEngine) AddModule(m Module) { C.LLVMAddModule(ee.C, m.C) }
-
-func (ee ExecutionEngine) RemoveModule(m Module) {
-	var modtmp C.LLVMModuleRef
-	C.LLVMRemoveModule(ee.C, m.C, &modtmp, nil)
-}
-
-func (ee ExecutionEngine) FindFunction(name string) (f Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	C.LLVMFindFunction(ee.C, cname, &f.C)
-	return
-}
-
-func (ee ExecutionEngine) RecompileAndRelinkFunction(f Value) unsafe.Pointer {
-	return C.LLVMRecompileAndRelinkFunction(ee.C, f.C)
-}
-
-func (ee ExecutionEngine) TargetData() (td TargetData) {
-	td.C = C.LLVMGetExecutionEngineTargetData(ee.C)
-	return
-}
-
-func (ee ExecutionEngine) AddGlobalMapping(global Value, addr unsafe.Pointer) {
-	C.LLVMAddGlobalMapping(ee.C, global.C, addr)
-}
-
-func (ee ExecutionEngine) PointerToGlobal(global Value) unsafe.Pointer {
-	return C.LLVMGetPointerToGlobal(ee.C, global.C)
-}
diff --git a/gnu/llvm/llvm/bindings/go/llvm/executionengine_test.go b/gnu/llvm/llvm/bindings/go/llvm/executionengine_test.go
deleted file mode 100644
index 2369826db91..00000000000
--- a/gnu/llvm/llvm/bindings/go/llvm/executionengine_test.go
+++ /dev/null
@@ -1,95 +0,0 @@
-//===- executionengine_test.go - Tests for executionengine ----------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file tests bindings for the executionengine component.
-//
-//===----------------------------------------------------------------------===//
-
-package llvm
-
-import (
-	"testing"
-)
-
-func TestFactorial(t *testing.T) {
-	LinkInMCJIT()
-	InitializeNativeTarget()
-	InitializeNativeAsmPrinter()
-
-	mod := NewModule("fac_module")
-
-	fac_args := []Type{Int32Type()}
-	fac_type := FunctionType(Int32Type(), fac_args, false)
-	fac := AddFunction(mod, "fac", fac_type)
-	fac.SetFunctionCallConv(CCallConv)
-	n := fac.Param(0)
-
-	entry := AddBasicBlock(fac, "entry")
-	iftrue := AddBasicBlock(fac, "iftrue")
-	iffalse := AddBasicBlock(fac, "iffalse")
-	end := AddBasicBlock(fac, "end")
-
-	builder := NewBuilder()
-	defer builder.Dispose()
-
-	builder.SetInsertPointAtEnd(entry)
-	If := builder.CreateICmp(IntEQ, n, ConstInt(Int32Type(), 0, false), "cmptmp")
-	builder.CreateCondBr(If, iftrue, iffalse)
-
-	builder.SetInsertPointAtEnd(iftrue)
-	res_iftrue := ConstInt(Int32Type(), 1, false)
-	builder.CreateBr(end)
-
-	builder.SetInsertPointAtEnd(iffalse)
-	n_minus := builder.CreateSub(n, ConstInt(Int32Type(), 1, false), "subtmp")
-	call_fac_args := []Value{n_minus}
-	call_fac := builder.CreateCall(fac, call_fac_args, "calltmp")
-	res_iffalse := builder.CreateMul(n, call_fac, "multmp")
-	builder.CreateBr(end)
-
-	builder.SetInsertPointAtEnd(end)
-	res := builder.CreatePHI(Int32Type(), "result")
-	phi_vals := []Value{res_iftrue, res_iffalse}
-	phi_blocks := []BasicBlock{iftrue, iffalse}
-	res.AddIncoming(phi_vals, phi_blocks)
-	builder.CreateRet(res)
-
-	err := VerifyModule(mod, ReturnStatusAction)
-	if err != nil {
-		t.Errorf("Error verifying module: %s", err)
-		return
-	}
-
-	options := NewMCJITCompilerOptions()
-	options.SetMCJITOptimizationLevel(2)
-	options.SetMCJITEnableFastISel(true)
-	options.SetMCJITNoFramePointerElim(true)
-	options.SetMCJITCodeModel(CodeModelJITDefault)
-	engine, err := NewMCJITCompiler(mod, options)
-	if err != nil {
-		t.Errorf("Error creating JIT: %s", err)
-		return
-	}
-	defer engine.Dispose()
-
-	pass := NewPassManager()
-	defer pass.Dispose()
-
-	pass.AddInstructionCombiningPass()
-	pass.AddPromoteMemoryToRegisterPass()
-	pass.AddGVNPass()
-	pass.AddCFGSimplificationPass()
-	pass.Run(mod)
-
-	exec_args := []GenericValue{NewGenericValueFromInt(Int32Type(), 10, false)}
-	exec_res := engine.RunFunction(fac, exec_args)
-	var fac10 uint64 = 10 * 9 * 8 * 7 * 6 * 5 * 4 * 3 * 2 * 1
-	if exec_res.Int(false) != fac10 {
-		t.Errorf("Expected %d, got %d", fac10, exec_res.Int(false))
-	}
-}
diff --git a/gnu/llvm/llvm/bindings/go/llvm/ir.go b/gnu/llvm/llvm/bindings/go/llvm/ir.go
deleted file mode 100644
index c5060811dd4..00000000000
--- a/gnu/llvm/llvm/bindings/go/llvm/ir.go
+++ /dev/null
@@ -1,2016 +0,0 @@
-//===- ir.go - Bindings for ir --------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines bindings for the ir component.
-//
-//===----------------------------------------------------------------------===//
-
-package llvm
-
-/*
-#include "llvm-c/Core.h"
-#include "llvm-c/Comdat.h"
-#include "IRBindings.h"
-#include <stdlib.h>
-*/
-import "C"
-import "unsafe"
-import "errors"
-
-type (
-	// We use these weird structs here because *Ref types are pointers and
-	// Go's spec says that a pointer cannot be used as a receiver base type.
-	Context struct {
-		C C.LLVMContextRef
-	}
-	Module struct {
-		C C.LLVMModuleRef
-	}
-	Type struct {
-		C C.LLVMTypeRef
-	}
-	Value struct {
-		C C.LLVMValueRef
-	}
-	Comdat struct {
-		C C.LLVMComdatRef
-	}
-	BasicBlock struct {
-		C C.LLVMBasicBlockRef
-	}
-	Builder struct {
-		C C.LLVMBuilderRef
-	}
-	ModuleProvider struct {
-		C C.LLVMModuleProviderRef
-	}
-	MemoryBuffer struct {
-		C C.LLVMMemoryBufferRef
-	}
-	PassManager struct {
-		C C.LLVMPassManagerRef
-	}
-	Use struct {
-		C C.LLVMUseRef
-	}
-	Metadata struct {
-		C C.LLVMMetadataRef
-	}
-	Attribute struct {
-		C C.LLVMAttributeRef
-	}
-	Opcode              C.LLVMOpcode
-	AtomicRMWBinOp      C.LLVMAtomicRMWBinOp
-	AtomicOrdering      C.LLVMAtomicOrdering
-	TypeKind            C.LLVMTypeKind
-	Linkage             C.LLVMLinkage
-	Visibility          C.LLVMVisibility
-	CallConv            C.LLVMCallConv
-	ComdatSelectionKind C.LLVMComdatSelectionKind
-	IntPredicate        C.LLVMIntPredicate
-	FloatPredicate      C.LLVMRealPredicate
-	LandingPadClause    C.LLVMLandingPadClauseTy
-	InlineAsmDialect    C.LLVMInlineAsmDialect
-)
-
-func (c Context) IsNil() bool        { return c.C == nil }
-func (c Module) IsNil() bool         { return c.C == nil }
-func (c Type) IsNil() bool           { return c.C == nil }
-func (c Value) IsNil() bool          { return c.C == nil }
-func (c BasicBlock) IsNil() bool     { return c.C == nil }
-func (c Builder) IsNil() bool        { return c.C == nil }
-func (c ModuleProvider) IsNil() bool { return c.C == nil }
-func (c MemoryBuffer) IsNil() bool   { return c.C == nil }
-func (c PassManager) IsNil() bool    { return c.C == nil }
-func (c Use) IsNil() bool            { return c.C == nil }
-func (c Attribute) IsNil() bool      { return c.C == nil }
-func (c Metadata) IsNil() bool       { return c.C == nil }
-
-// helpers
-func llvmTypeRefPtr(t *Type) *C.LLVMTypeRef    { return (*C.LLVMTypeRef)(unsafe.Pointer(t)) }
-func llvmValueRefPtr(t *Value) *C.LLVMValueRef { return (*C.LLVMValueRef)(unsafe.Pointer(t)) }
-func llvmMetadataRefPtr(t *Metadata) *C.LLVMMetadataRef {
-	return (*C.LLVMMetadataRef)(unsafe.Pointer(t))
-}
-func llvmBasicBlockRefPtr(t *BasicBlock) *C.LLVMBasicBlockRef {
-	return (*C.LLVMBasicBlockRef)(unsafe.Pointer(t))
-}
-func boolToLLVMBool(b bool) C.LLVMBool {
-	if b {
-		return C.LLVMBool(1)
-	}
-	return C.LLVMBool(0)
-}
-
-func llvmValueRefs(values []Value) (*C.LLVMValueRef, C.unsigned) {
-	var pt *C.LLVMValueRef
-	ptlen := C.unsigned(len(values))
-	if ptlen > 0 {
-		pt = llvmValueRefPtr(&values[0])
-	}
-	return pt, ptlen
-}
-
-func llvmMetadataRefs(mds []Metadata) (*C.LLVMMetadataRef, C.unsigned) {
-	var pt *C.LLVMMetadataRef
-	ptlen := C.unsigned(len(mds))
-	if ptlen > 0 {
-		pt = llvmMetadataRefPtr(&mds[0])
-	}
-	return pt, ptlen
-}
-
-//-------------------------------------------------------------------------
-// llvm.Opcode
-//-------------------------------------------------------------------------
-
-const (
-	Ret         Opcode = C.LLVMRet
-	Br          Opcode = C.LLVMBr
-	Switch      Opcode = C.LLVMSwitch
-	IndirectBr  Opcode = C.LLVMIndirectBr
-	Invoke      Opcode = C.LLVMInvoke
-	Unreachable Opcode = C.LLVMUnreachable
-
-	// Standard Binary Operators
-	Add  Opcode = C.LLVMAdd
-	FAdd Opcode = C.LLVMFAdd
-	Sub  Opcode = C.LLVMSub
-	FSub Opcode = C.LLVMFSub
-	Mul  Opcode = C.LLVMMul
-	FMul Opcode = C.LLVMFMul
-	UDiv Opcode = C.LLVMUDiv
-	SDiv Opcode = C.LLVMSDiv
-	FDiv Opcode = C.LLVMFDiv
-	URem Opcode = C.LLVMURem
-	SRem Opcode = C.LLVMSRem
-	FRem Opcode = C.LLVMFRem
-
-	// Logical Operators
-	Shl  Opcode = C.LLVMShl
-	LShr Opcode = C.LLVMLShr
-	AShr Opcode = C.LLVMAShr
-	And  Opcode = C.LLVMAnd
-	Or   Opcode = C.LLVMOr
-	Xor  Opcode = C.LLVMXor
-
-	// Memory Operators
-	Alloca        Opcode = C.LLVMAlloca
-	Load          Opcode = C.LLVMLoad
-	Store         Opcode = C.LLVMStore
-	GetElementPtr Opcode = C.LLVMGetElementPtr
-
-	// Cast Operators
-	Trunc    Opcode = C.LLVMTrunc
-	ZExt     Opcode = C.LLVMZExt
-	SExt     Opcode = C.LLVMSExt
-	FPToUI   Opcode = C.LLVMFPToUI
-	FPToSI   Opcode = C.LLVMFPToSI
-	UIToFP   Opcode = C.LLVMUIToFP
-	SIToFP   Opcode = C.LLVMSIToFP
-	FPTrunc  Opcode = C.LLVMFPTrunc
-	FPExt    Opcode = C.LLVMFPExt
-	PtrToInt Opcode = C.LLVMPtrToInt
-	IntToPtr Opcode = C.LLVMIntToPtr
-	BitCast  Opcode = C.LLVMBitCast
-
-	// Other Operators
-	ICmp   Opcode = C.LLVMICmp
-	FCmp   Opcode = C.LLVMFCmp
-	PHI    Opcode = C.LLVMPHI
-	Call   Opcode = C.LLVMCall
-	Select Opcode = C.LLVMSelect
-	// UserOp1
-	// UserOp2
-	VAArg          Opcode = C.LLVMVAArg
-	ExtractElement Opcode = C.LLVMExtractElement
-	InsertElement  Opcode = C.LLVMInsertElement
-	ShuffleVector  Opcode = C.LLVMShuffleVector
-	ExtractValue   Opcode = C.LLVMExtractValue
-	InsertValue    Opcode = C.LLVMInsertValue
-)
-
-const (
-	AtomicRMWBinOpXchg AtomicRMWBinOp = C.LLVMAtomicRMWBinOpXchg
-	AtomicRMWBinOpAdd  AtomicRMWBinOp = C.LLVMAtomicRMWBinOpAdd
-	AtomicRMWBinOpSub  AtomicRMWBinOp = C.LLVMAtomicRMWBinOpSub
-	AtomicRMWBinOpAnd  AtomicRMWBinOp = C.LLVMAtomicRMWBinOpAnd
-	AtomicRMWBinOpNand AtomicRMWBinOp = C.LLVMAtomicRMWBinOpNand
-	AtomicRMWBinOpOr   AtomicRMWBinOp = C.LLVMAtomicRMWBinOpOr
-	AtomicRMWBinOpXor  AtomicRMWBinOp = C.LLVMAtomicRMWBinOpXor
-	AtomicRMWBinOpMax  AtomicRMWBinOp = C.LLVMAtomicRMWBinOpMax
-	AtomicRMWBinOpMin  AtomicRMWBinOp = C.LLVMAtomicRMWBinOpMin
-	AtomicRMWBinOpUMax AtomicRMWBinOp = C.LLVMAtomicRMWBinOpUMax
-	AtomicRMWBinOpUMin AtomicRMWBinOp = C.LLVMAtomicRMWBinOpUMin
-)
-
-const (
-	AtomicOrderingNotAtomic              AtomicOrdering = C.LLVMAtomicOrderingNotAtomic
-	AtomicOrderingUnordered              AtomicOrdering = C.LLVMAtomicOrderingUnordered
-	AtomicOrderingMonotonic              AtomicOrdering = C.LLVMAtomicOrderingMonotonic
-	AtomicOrderingAcquire                AtomicOrdering = C.LLVMAtomicOrderingAcquire
-	AtomicOrderingRelease                AtomicOrdering = C.LLVMAtomicOrderingRelease
-	AtomicOrderingAcquireRelease         AtomicOrdering = C.LLVMAtomicOrderingAcquireRelease
-	AtomicOrderingSequentiallyConsistent AtomicOrdering = C.LLVMAtomicOrderingSequentiallyConsistent
-)
-
-//-------------------------------------------------------------------------
-// llvm.TypeKind
-//-------------------------------------------------------------------------
-
-const (
-	VoidTypeKind           TypeKind = C.LLVMVoidTypeKind
-	FloatTypeKind          TypeKind = C.LLVMFloatTypeKind
-	DoubleTypeKind         TypeKind = C.LLVMDoubleTypeKind
-	X86_FP80TypeKind       TypeKind = C.LLVMX86_FP80TypeKind
-	FP128TypeKind          TypeKind = C.LLVMFP128TypeKind
-	PPC_FP128TypeKind      TypeKind = C.LLVMPPC_FP128TypeKind
-	LabelTypeKind          TypeKind = C.LLVMLabelTypeKind
-	IntegerTypeKind        TypeKind = C.LLVMIntegerTypeKind
-	FunctionTypeKind       TypeKind = C.LLVMFunctionTypeKind
-	StructTypeKind         TypeKind = C.LLVMStructTypeKind
-	ArrayTypeKind          TypeKind = C.LLVMArrayTypeKind
-	PointerTypeKind        TypeKind = C.LLVMPointerTypeKind
-	MetadataTypeKind       TypeKind = C.LLVMMetadataTypeKind
-	TokenTypeKind          TypeKind = C.LLVMTokenTypeKind
-	VectorTypeKind    	   TypeKind = C.LLVMVectorTypeKind
-	ScalableVectorTypeKind TypeKind = C.LLVMScalableVectorTypeKind
-)
-
-//-------------------------------------------------------------------------
-// llvm.Linkage
-//-------------------------------------------------------------------------
-
-const (
-	ExternalLinkage            Linkage = C.LLVMExternalLinkage
-	AvailableExternallyLinkage Linkage = C.LLVMAvailableExternallyLinkage
-	LinkOnceAnyLinkage         Linkage = C.LLVMLinkOnceAnyLinkage
-	LinkOnceODRLinkage         Linkage = C.LLVMLinkOnceODRLinkage
-	WeakAnyLinkage             Linkage = C.LLVMWeakAnyLinkage
-	WeakODRLinkage             Linkage = C.LLVMWeakODRLinkage
-	AppendingLinkage           Linkage = C.LLVMAppendingLinkage
-	InternalLinkage            Linkage = C.LLVMInternalLinkage
-	PrivateLinkage             Linkage = C.LLVMPrivateLinkage
-	ExternalWeakLinkage        Linkage = C.LLVMExternalWeakLinkage
-	CommonLinkage              Linkage = C.LLVMCommonLinkage
-)
-
-//-------------------------------------------------------------------------
-// llvm.Visibility
-//-------------------------------------------------------------------------
-
-const (
-	DefaultVisibility   Visibility = C.LLVMDefaultVisibility
-	HiddenVisibility    Visibility = C.LLVMHiddenVisibility
-	ProtectedVisibility Visibility = C.LLVMProtectedVisibility
-)
-
-//-------------------------------------------------------------------------
-// llvm.CallConv
-//-------------------------------------------------------------------------
-
-const (
-	CCallConv           CallConv = C.LLVMCCallConv
-	FastCallConv        CallConv = C.LLVMFastCallConv
-	ColdCallConv        CallConv = C.LLVMColdCallConv
-	X86StdcallCallConv  CallConv = C.LLVMX86StdcallCallConv
-	X86FastcallCallConv CallConv = C.LLVMX86FastcallCallConv
-)
-
-//-------------------------------------------------------------------------
-// llvm.ComdatSelectionKind
-//-------------------------------------------------------------------------
-
-const (
-	AnyComdatSelectionKind          ComdatSelectionKind = C.LLVMAnyComdatSelectionKind
-	ExactMatchComdatSelectionKind   ComdatSelectionKind = C.LLVMExactMatchComdatSelectionKind
-	LargestComdatSelectionKind      ComdatSelectionKind = C.LLVMLargestComdatSelectionKind
-	NoDeduplicateComdatSelectionKind ComdatSelectionKind = C.LLVMNoDeduplicateComdatSelectionKind
-	SameSizeComdatSelectionKind     ComdatSelectionKind = C.LLVMSameSizeComdatSelectionKind
-)
-
-//-------------------------------------------------------------------------
-// llvm.IntPredicate
-//-------------------------------------------------------------------------
-
-const (
-	IntEQ  IntPredicate = C.LLVMIntEQ
-	IntNE  IntPredicate = C.LLVMIntNE
-	IntUGT IntPredicate = C.LLVMIntUGT
-	IntUGE IntPredicate = C.LLVMIntUGE
-	IntULT IntPredicate = C.LLVMIntULT
-	IntULE IntPredicate = C.LLVMIntULE
-	IntSGT IntPredicate = C.LLVMIntSGT
-	IntSGE IntPredicate = C.LLVMIntSGE
-	IntSLT IntPredicate = C.LLVMIntSLT
-	IntSLE IntPredicate = C.LLVMIntSLE
-)
-
-//-------------------------------------------------------------------------
-// llvm.FloatPredicate
-//-------------------------------------------------------------------------
-
-const (
-	FloatPredicateFalse FloatPredicate = C.LLVMRealPredicateFalse
-	FloatOEQ            FloatPredicate = C.LLVMRealOEQ
-	FloatOGT            FloatPredicate = C.LLVMRealOGT
-	FloatOGE            FloatPredicate = C.LLVMRealOGE
-	FloatOLT            FloatPredicate = C.LLVMRealOLT
-	FloatOLE            FloatPredicate = C.LLVMRealOLE
-	FloatONE            FloatPredicate = C.LLVMRealONE
-	FloatORD            FloatPredicate = C.LLVMRealORD
-	FloatUNO            FloatPredicate = C.LLVMRealUNO
-	FloatUEQ            FloatPredicate = C.LLVMRealUEQ
-	FloatUGT            FloatPredicate = C.LLVMRealUGT
-	FloatUGE            FloatPredicate = C.LLVMRealUGE
-	FloatULT            FloatPredicate = C.LLVMRealULT
-	FloatULE            FloatPredicate = C.LLVMRealULE
-	FloatUNE            FloatPredicate = C.LLVMRealUNE
-	FloatPredicateTrue  FloatPredicate = C.LLVMRealPredicateTrue
-)
-
-//-------------------------------------------------------------------------
-// llvm.LandingPadClause
-//-------------------------------------------------------------------------
-
-const (
-	LandingPadCatch  LandingPadClause = C.LLVMLandingPadCatch
-	LandingPadFilter LandingPadClause = C.LLVMLandingPadFilter
-)
-
-//-------------------------------------------------------------------------
-// llvm.InlineAsmDialect
-//-------------------------------------------------------------------------
-
-const (
-	InlineAsmDialectATT   InlineAsmDialect = C.LLVMInlineAsmDialectATT
-	InlineAsmDialectIntel InlineAsmDialect = C.LLVMInlineAsmDialectIntel
-)
-
-//-------------------------------------------------------------------------
-// llvm.Context
-//-------------------------------------------------------------------------
-
-func NewContext() Context    { return Context{C.LLVMContextCreate()} }
-func GlobalContext() Context { return Context{C.LLVMGetGlobalContext()} }
-func (c Context) Dispose()   { C.LLVMContextDispose(c.C) }
-
-func (c Context) MDKindID(name string) (id int) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	id = int(C.LLVMGetMDKindIDInContext(c.C, cname, C.unsigned(len(name))))
-	return
-}
-
-func MDKindID(name string) (id int) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	id = int(C.LLVMGetMDKindID(cname, C.unsigned(len(name))))
-	return
-}
-
-//-------------------------------------------------------------------------
-// llvm.Attribute
-//-------------------------------------------------------------------------
-
-func AttributeKindID(name string) (id uint) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	id = uint(C.LLVMGetEnumAttributeKindForName(cname, C.size_t(len(name))))
-	return
-}
-
-func (c Context) CreateEnumAttribute(kind uint, val uint64) (a Attribute) {
-	a.C = C.LLVMCreateEnumAttribute(c.C, C.unsigned(kind), C.uint64_t(val))
-	return
-}
-
-func (a Attribute) GetEnumKind() (id int) {
-	id = int(C.LLVMGetEnumAttributeKind(a.C))
-	return
-}
-
-func (a Attribute) GetEnumValue() (val uint64) {
-	val = uint64(C.LLVMGetEnumAttributeValue(a.C))
-	return
-}
-
-func (c Context) CreateStringAttribute(kind string, val string) (a Attribute) {
-	ckind := C.CString(kind)
-	defer C.free(unsafe.Pointer(ckind))
-	cval := C.CString(val)
-	defer C.free(unsafe.Pointer(cval))
-	a.C = C.LLVMCreateStringAttribute(c.C,
-		ckind, C.unsigned(len(kind)),
-		cval, C.unsigned(len(val)))
-	return
-}
-
-func (a Attribute) GetStringKind() string {
-	length := C.unsigned(0)
-	ckind := C.LLVMGetStringAttributeKind(a.C, &length)
-	return C.GoStringN(ckind, C.int(length))
-}
-
-func (a Attribute) GetStringValue() string {
-	length := C.unsigned(0)
-	ckind := C.LLVMGetStringAttributeValue(a.C, &length)
-	return C.GoStringN(ckind, C.int(length))
-}
-
-func (a Attribute) IsEnum() bool {
-	return C.LLVMIsEnumAttribute(a.C) != 0
-}
-
-func (a Attribute) IsString() bool {
-	return C.LLVMIsStringAttribute(a.C) != 0
-}
-
-//-------------------------------------------------------------------------
-// llvm.Module
-//-------------------------------------------------------------------------
-
-// Create and destroy modules.
-// See llvm::Module::Module.
-func NewModule(name string) (m Module) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	m.C = C.LLVMModuleCreateWithName(cname)
-	return
-}
-
-func (c Context) NewModule(name string) (m Module) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	m.C = C.LLVMModuleCreateWithNameInContext(cname, c.C)
-	return
-}
-
-// See llvm::Module::~Module
-func (m Module) Dispose() { C.LLVMDisposeModule(m.C) }
-
-// Data layout. See Module::getDataLayout.
-func (m Module) DataLayout() string {
-	clayout := C.LLVMGetDataLayout(m.C)
-	return C.GoString(clayout)
-}
-
-func (m Module) SetDataLayout(layout string) {
-	clayout := C.CString(layout)
-	defer C.free(unsafe.Pointer(clayout))
-	C.LLVMSetDataLayout(m.C, clayout)
-}
-
-// Target triple. See Module::getTargetTriple.
-func (m Module) Target() string {
-	ctarget := C.LLVMGetTarget(m.C)
-	return C.GoString(ctarget)
-}
-func (m Module) SetTarget(target string) {
-	ctarget := C.CString(target)
-	defer C.free(unsafe.Pointer(ctarget))
-	C.LLVMSetTarget(m.C, ctarget)
-}
-
-func (m Module) GetTypeByName(name string) (t Type) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	t.C = C.LLVMGetTypeByName(m.C, cname)
-	return
-}
-
-// See Module::dump.
-func (m Module) Dump() {
-	C.LLVMDumpModule(m.C)
-}
-
-func (m Module) String() string {
-	cir := C.LLVMPrintModuleToString(m.C)
-	defer C.free(unsafe.Pointer(cir))
-	ir := C.GoString(cir)
-	return ir
-}
-
-// See Module::setModuleInlineAsm.
-func (m Module) SetInlineAsm(asm string) {
-	casm := C.CString(asm)
-	defer C.free(unsafe.Pointer(casm))
-	C.LLVMSetModuleInlineAsm(m.C, casm)
-}
-
-func (m Module) AddNamedMetadataOperand(name string, operand Metadata) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	C.LLVMAddNamedMetadataOperand2(m.C, cname, operand.C)
-}
-
-func (m Module) Context() (c Context) {
-	c.C = C.LLVMGetModuleContext(m.C)
-	return
-}
-
-//-------------------------------------------------------------------------
-// llvm.Type
-//-------------------------------------------------------------------------
-
-// LLVM types conform to the following hierarchy:
-//
-//   types:
-//     integer type
-//     real type
-//     function type
-//     sequence types:
-//       array type
-//       pointer type
-//       vector type
-//     void type
-//     label type
-//     opaque type
-
-// See llvm::LLVMTypeKind::getTypeID.
-func (t Type) TypeKind() TypeKind { return TypeKind(C.LLVMGetTypeKind(t.C)) }
-
-// See llvm::LLVMType::getContext.
-func (t Type) Context() (c Context) {
-	c.C = C.LLVMGetTypeContext(t.C)
-	return
-}
-
-// Operations on integer types
-func (c Context) Int1Type() (t Type)  { t.C = C.LLVMInt1TypeInContext(c.C); return }
-func (c Context) Int8Type() (t Type)  { t.C = C.LLVMInt8TypeInContext(c.C); return }
-func (c Context) Int16Type() (t Type) { t.C = C.LLVMInt16TypeInContext(c.C); return }
-func (c Context) Int32Type() (t Type) { t.C = C.LLVMInt32TypeInContext(c.C); return }
-func (c Context) Int64Type() (t Type) { t.C = C.LLVMInt64TypeInContext(c.C); return }
-func (c Context) IntType(numbits int) (t Type) {
-	t.C = C.LLVMIntTypeInContext(c.C, C.unsigned(numbits))
-	return
-}
-
-func Int1Type() (t Type)  { t.C = C.LLVMInt1Type(); return }
-func Int8Type() (t Type)  { t.C = C.LLVMInt8Type(); return }
-func Int16Type() (t Type) { t.C = C.LLVMInt16Type(); return }
-func Int32Type() (t Type) { t.C = C.LLVMInt32Type(); return }
-func Int64Type() (t Type) { t.C = C.LLVMInt64Type(); return }
-
-func IntType(numbits int) (t Type) {
-	t.C = C.LLVMIntType(C.unsigned(numbits))
-	return
-}
-
-func (t Type) IntTypeWidth() int {
-	return int(C.LLVMGetIntTypeWidth(t.C))
-}
-
-// Operations on real types
-func (c Context) FloatType() (t Type)    { t.C = C.LLVMFloatTypeInContext(c.C); return }
-func (c Context) DoubleType() (t Type)   { t.C = C.LLVMDoubleTypeInContext(c.C); return }
-func (c Context) X86FP80Type() (t Type)  { t.C = C.LLVMX86FP80TypeInContext(c.C); return }
-func (c Context) FP128Type() (t Type)    { t.C = C.LLVMFP128TypeInContext(c.C); return }
-func (c Context) PPCFP128Type() (t Type) { t.C = C.LLVMPPCFP128TypeInContext(c.C); return }
-
-func FloatType() (t Type)    { t.C = C.LLVMFloatType(); return }
-func DoubleType() (t Type)   { t.C = C.LLVMDoubleType(); return }
-func X86FP80Type() (t Type)  { t.C = C.LLVMX86FP80Type(); return }
-func FP128Type() (t Type)    { t.C = C.LLVMFP128Type(); return }
-func PPCFP128Type() (t Type) { t.C = C.LLVMPPCFP128Type(); return }
-
-// Operations on function types
-func FunctionType(returnType Type, paramTypes []Type, isVarArg bool) (t Type) {
-	var pt *C.LLVMTypeRef
-	var ptlen C.unsigned
-	if len(paramTypes) > 0 {
-		pt = llvmTypeRefPtr(&paramTypes[0])
-		ptlen = C.unsigned(len(paramTypes))
-	}
-	t.C = C.LLVMFunctionType(returnType.C,
-		pt,
-		ptlen,
-		boolToLLVMBool(isVarArg))
-	return
-}
-
-func (t Type) IsFunctionVarArg() bool { return C.LLVMIsFunctionVarArg(t.C) != 0 }
-func (t Type) ReturnType() (rt Type)  { rt.C = C.LLVMGetReturnType(t.C); return }
-func (t Type) ParamTypesCount() int   { return int(C.LLVMCountParamTypes(t.C)) }
-func (t Type) ParamTypes() []Type {
-	count := t.ParamTypesCount()
-	if count > 0 {
-		out := make([]Type, count)
-		C.LLVMGetParamTypes(t.C, llvmTypeRefPtr(&out[0]))
-		return out
-	}
-	return nil
-}
-
-// Operations on struct types
-func (c Context) StructType(elementTypes []Type, packed bool) (t Type) {
-	var pt *C.LLVMTypeRef
-	var ptlen C.unsigned
-	if len(elementTypes) > 0 {
-		pt = llvmTypeRefPtr(&elementTypes[0])
-		ptlen = C.unsigned(len(elementTypes))
-	}
-	t.C = C.LLVMStructTypeInContext(c.C,
-		pt,
-		ptlen,
-		boolToLLVMBool(packed))
-	return
-}
-
-func StructType(elementTypes []Type, packed bool) (t Type) {
-	var pt *C.LLVMTypeRef
-	var ptlen C.unsigned
-	if len(elementTypes) > 0 {
-		pt = llvmTypeRefPtr(&elementTypes[0])
-		ptlen = C.unsigned(len(elementTypes))
-	}
-	t.C = C.LLVMStructType(pt, ptlen, boolToLLVMBool(packed))
-	return
-}
-
-func (c Context) StructCreateNamed(name string) (t Type) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	t.C = C.LLVMStructCreateNamed(c.C, cname)
-	return
-}
-
-func (t Type) StructName() string {
-	return C.GoString(C.LLVMGetStructName(t.C))
-}
-
-func (t Type) StructSetBody(elementTypes []Type, packed bool) {
-	var pt *C.LLVMTypeRef
-	var ptlen C.unsigned
-	if len(elementTypes) > 0 {
-		pt = llvmTypeRefPtr(&elementTypes[0])
-		ptlen = C.unsigned(len(elementTypes))
-	}
-	C.LLVMStructSetBody(t.C, pt, ptlen, boolToLLVMBool(packed))
-}
-
-func (t Type) IsStructPacked() bool         { return C.LLVMIsPackedStruct(t.C) != 0 }
-func (t Type) StructElementTypesCount() int { return int(C.LLVMCountStructElementTypes(t.C)) }
-func (t Type) StructElementTypes() []Type {
-	out := make([]Type, t.StructElementTypesCount())
-	if len(out) > 0 {
-		C.LLVMGetStructElementTypes(t.C, llvmTypeRefPtr(&out[0]))
-	}
-	return out
-}
-
-// Operations on array, pointer, and vector types (sequence types)
-func (t Type) Subtypes() (ret []Type) {
-	ret = make([]Type, C.LLVMGetNumContainedTypes(t.C))
-	C.LLVMGetSubtypes(t.C, llvmTypeRefPtr(&ret[0]))
-	return
-}
-
-func ArrayType(elementType Type, elementCount int) (t Type) {
-	t.C = C.LLVMArrayType(elementType.C, C.unsigned(elementCount))
-	return
-}
-func PointerType(elementType Type, addressSpace int) (t Type) {
-	t.C = C.LLVMPointerType(elementType.C, C.unsigned(addressSpace))
-	return
-}
-func VectorType(elementType Type, elementCount int) (t Type) {
-	t.C = C.LLVMVectorType(elementType.C, C.unsigned(elementCount))
-	return
-}
-
-func (t Type) ElementType() (rt Type)   { rt.C = C.LLVMGetElementType(t.C); return }
-func (t Type) ArrayLength() int         { return int(C.LLVMGetArrayLength(t.C)) }
-func (t Type) PointerAddressSpace() int { return int(C.LLVMGetPointerAddressSpace(t.C)) }
-func (t Type) VectorSize() int          { return int(C.LLVMGetVectorSize(t.C)) }
-
-// Operations on other types
-func (c Context) VoidType() (t Type)  { t.C = C.LLVMVoidTypeInContext(c.C); return }
-func (c Context) LabelType() (t Type) { t.C = C.LLVMLabelTypeInContext(c.C); return }
-func (c Context) TokenType() (t Type) { t.C = C.LLVMTokenTypeInContext(c.C); return }
-
-func VoidType() (t Type)  { t.C = C.LLVMVoidType(); return }
-func LabelType() (t Type) { t.C = C.LLVMLabelType(); return }
-
-//-------------------------------------------------------------------------
-// llvm.Value
-//-------------------------------------------------------------------------
-
-// Operations on all values
-func (v Value) Type() (t Type) { t.C = C.LLVMTypeOf(v.C); return }
-func (v Value) Name() string   { return C.GoString(C.LLVMGetValueName(v.C)) }
-func (v Value) SetName(name string) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	C.LLVMSetValueName(v.C, cname)
-}
-func (v Value) Dump()                       { C.LLVMDumpValue(v.C) }
-func (v Value) ReplaceAllUsesWith(nv Value) { C.LLVMReplaceAllUsesWith(v.C, nv.C) }
-func (v Value) HasMetadata() bool           { return C.LLVMHasMetadata(v.C) != 0 }
-func (v Value) Metadata(kind int) (rv Value) {
-	rv.C = C.LLVMGetMetadata(v.C, C.unsigned(kind))
-	return
-}
-func (v Value) SetMetadata(kind int, node Metadata) {
-	C.LLVMSetMetadata2(v.C, C.unsigned(kind), node.C)
-}
-
-// Conversion functions.
-// Return the input value if it is an instance of the specified class, otherwise NULL.
-// See llvm::dyn_cast_or_null<>.
-func (v Value) IsAArgument() (rv Value)   { rv.C = C.LLVMIsAArgument(v.C); return }
-func (v Value) IsABasicBlock() (rv Value) { rv.C = C.LLVMIsABasicBlock(v.C); return }
-func (v Value) IsAInlineAsm() (rv Value)  { rv.C = C.LLVMIsAInlineAsm(v.C); return }
-func (v Value) IsAUser() (rv Value)       { rv.C = C.LLVMIsAUser(v.C); return }
-func (v Value) IsAConstant() (rv Value)   { rv.C = C.LLVMIsAConstant(v.C); return }
-func (v Value) IsAConstantAggregateZero() (rv Value) {
-	rv.C = C.LLVMIsAConstantAggregateZero(v.C)
-	return
-}
-func (v Value) IsAConstantArray() (rv Value)       { rv.C = C.LLVMIsAConstantArray(v.C); return }
-func (v Value) IsAConstantExpr() (rv Value)        { rv.C = C.LLVMIsAConstantExpr(v.C); return }
-func (v Value) IsAConstantFP() (rv Value)          { rv.C = C.LLVMIsAConstantFP(v.C); return }
-func (v Value) IsAConstantInt() (rv Value)         { rv.C = C.LLVMIsAConstantInt(v.C); return }
-func (v Value) IsAConstantPointerNull() (rv Value) { rv.C = C.LLVMIsAConstantPointerNull(v.C); return }
-func (v Value) IsAConstantStruct() (rv Value)      { rv.C = C.LLVMIsAConstantStruct(v.C); return }
-func (v Value) IsAConstantVector() (rv Value)      { rv.C = C.LLVMIsAConstantVector(v.C); return }
-func (v Value) IsAGlobalValue() (rv Value)         { rv.C = C.LLVMIsAGlobalValue(v.C); return }
-func (v Value) IsAFunction() (rv Value)            { rv.C = C.LLVMIsAFunction(v.C); return }
-func (v Value) IsAGlobalAlias() (rv Value)         { rv.C = C.LLVMIsAGlobalAlias(v.C); return }
-func (v Value) IsAGlobalVariable() (rv Value)      { rv.C = C.LLVMIsAGlobalVariable(v.C); return }
-func (v Value) IsAUndefValue() (rv Value)          { rv.C = C.LLVMIsAUndefValue(v.C); return }
-func (v Value) IsAInstruction() (rv Value)         { rv.C = C.LLVMIsAInstruction(v.C); return }
-func (v Value) IsABinaryOperator() (rv Value)      { rv.C = C.LLVMIsABinaryOperator(v.C); return }
-func (v Value) IsACallInst() (rv Value)            { rv.C = C.LLVMIsACallInst(v.C); return }
-func (v Value) IsAIntrinsicInst() (rv Value)       { rv.C = C.LLVMIsAIntrinsicInst(v.C); return }
-func (v Value) IsADbgInfoIntrinsic() (rv Value)    { rv.C = C.LLVMIsADbgInfoIntrinsic(v.C); return }
-func (v Value) IsADbgDeclareInst() (rv Value)      { rv.C = C.LLVMIsADbgDeclareInst(v.C); return }
-func (v Value) IsAMemIntrinsic() (rv Value)        { rv.C = C.LLVMIsAMemIntrinsic(v.C); return }
-func (v Value) IsAMemCpyInst() (rv Value)          { rv.C = C.LLVMIsAMemCpyInst(v.C); return }
-func (v Value) IsAMemMoveInst() (rv Value)         { rv.C = C.LLVMIsAMemMoveInst(v.C); return }
-func (v Value) IsAMemSetInst() (rv Value)          { rv.C = C.LLVMIsAMemSetInst(v.C); return }
-func (v Value) IsACmpInst() (rv Value)             { rv.C = C.LLVMIsACmpInst(v.C); return }
-func (v Value) IsAFCmpInst() (rv Value)            { rv.C = C.LLVMIsAFCmpInst(v.C); return }
-func (v Value) IsAICmpInst() (rv Value)            { rv.C = C.LLVMIsAICmpInst(v.C); return }
-func (v Value) IsAExtractElementInst() (rv Value)  { rv.C = C.LLVMIsAExtractElementInst(v.C); return }
-func (v Value) IsAGetElementPtrInst() (rv Value)   { rv.C = C.LLVMIsAGetElementPtrInst(v.C); return }
-func (v Value) IsAInsertElementInst() (rv Value)   { rv.C = C.LLVMIsAInsertElementInst(v.C); return }
-func (v Value) IsAInsertValueInst() (rv Value)     { rv.C = C.LLVMIsAInsertValueInst(v.C); return }
-func (v Value) IsAPHINode() (rv Value)             { rv.C = C.LLVMIsAPHINode(v.C); return }
-func (v Value) IsASelectInst() (rv Value)          { rv.C = C.LLVMIsASelectInst(v.C); return }
-func (v Value) IsAShuffleVectorInst() (rv Value)   { rv.C = C.LLVMIsAShuffleVectorInst(v.C); return }
-func (v Value) IsAStoreInst() (rv Value)           { rv.C = C.LLVMIsAStoreInst(v.C); return }
-func (v Value) IsABranchInst() (rv Value)          { rv.C = C.LLVMIsABranchInst(v.C); return }
-func (v Value) IsAInvokeInst() (rv Value)          { rv.C = C.LLVMIsAInvokeInst(v.C); return }
-func (v Value) IsAReturnInst() (rv Value)          { rv.C = C.LLVMIsAReturnInst(v.C); return }
-func (v Value) IsASwitchInst() (rv Value)          { rv.C = C.LLVMIsASwitchInst(v.C); return }
-func (v Value) IsAUnreachableInst() (rv Value)     { rv.C = C.LLVMIsAUnreachableInst(v.C); return }
-func (v Value) IsAUnaryInstruction() (rv Value)    { rv.C = C.LLVMIsAUnaryInstruction(v.C); return }
-func (v Value) IsAAllocaInst() (rv Value)          { rv.C = C.LLVMIsAAllocaInst(v.C); return }
-func (v Value) IsACastInst() (rv Value)            { rv.C = C.LLVMIsACastInst(v.C); return }
-func (v Value) IsABitCastInst() (rv Value)         { rv.C = C.LLVMIsABitCastInst(v.C); return }
-func (v Value) IsAFPExtInst() (rv Value)           { rv.C = C.LLVMIsAFPExtInst(v.C); return }
-func (v Value) IsAFPToSIInst() (rv Value)          { rv.C = C.LLVMIsAFPToSIInst(v.C); return }
-func (v Value) IsAFPToUIInst() (rv Value)          { rv.C = C.LLVMIsAFPToUIInst(v.C); return }
-func (v Value) IsAFPTruncInst() (rv Value)         { rv.C = C.LLVMIsAFPTruncInst(v.C); return }
-func (v Value) IsAIntToPtrInst() (rv Value)        { rv.C = C.LLVMIsAIntToPtrInst(v.C); return }
-func (v Value) IsAPtrToIntInst() (rv Value)        { rv.C = C.LLVMIsAPtrToIntInst(v.C); return }
-func (v Value) IsASExtInst() (rv Value)            { rv.C = C.LLVMIsASExtInst(v.C); return }
-func (v Value) IsASIToFPInst() (rv Value)          { rv.C = C.LLVMIsASIToFPInst(v.C); return }
-func (v Value) IsATruncInst() (rv Value)           { rv.C = C.LLVMIsATruncInst(v.C); return }
-func (v Value) IsAUIToFPInst() (rv Value)          { rv.C = C.LLVMIsAUIToFPInst(v.C); return }
-func (v Value) IsAZExtInst() (rv Value)            { rv.C = C.LLVMIsAZExtInst(v.C); return }
-func (v Value) IsAExtractValueInst() (rv Value)    { rv.C = C.LLVMIsAExtractValueInst(v.C); return }
-func (v Value) IsALoadInst() (rv Value)            { rv.C = C.LLVMIsALoadInst(v.C); return }
-func (v Value) IsAVAArgInst() (rv Value)           { rv.C = C.LLVMIsAVAArgInst(v.C); return }
-
-// Operations on Uses
-func (v Value) FirstUse() (u Use)  { u.C = C.LLVMGetFirstUse(v.C); return }
-func (u Use) NextUse() (ru Use)    { ru.C = C.LLVMGetNextUse(u.C); return }
-func (u Use) User() (v Value)      { v.C = C.LLVMGetUser(u.C); return }
-func (u Use) UsedValue() (v Value) { v.C = C.LLVMGetUsedValue(u.C); return }
-
-// Operations on Users
-func (v Value) Operand(i int) (rv Value)   { rv.C = C.LLVMGetOperand(v.C, C.unsigned(i)); return }
-func (v Value) SetOperand(i int, op Value) { C.LLVMSetOperand(v.C, C.unsigned(i), op.C) }
-func (v Value) OperandsCount() int         { return int(C.LLVMGetNumOperands(v.C)) }
-
-// Operations on constants of any type
-func ConstNull(t Type) (v Value)        { v.C = C.LLVMConstNull(t.C); return }
-func ConstAllOnes(t Type) (v Value)     { v.C = C.LLVMConstAllOnes(t.C); return }
-func Undef(t Type) (v Value)            { v.C = C.LLVMGetUndef(t.C); return }
-func (v Value) IsConstant() bool        { return C.LLVMIsConstant(v.C) != 0 }
-func (v Value) IsNull() bool            { return C.LLVMIsNull(v.C) != 0 }
-func (v Value) IsUndef() bool           { return C.LLVMIsUndef(v.C) != 0 }
-func ConstPointerNull(t Type) (v Value) { v.C = C.LLVMConstPointerNull(t.C); return }
-
-// Operations on metadata
-func (c Context) MDString(str string) (md Metadata) {
-	cstr := C.CString(str)
-	defer C.free(unsafe.Pointer(cstr))
-	md.C = C.LLVMMDString2(c.C, cstr, C.unsigned(len(str)))
-	return
-}
-func (c Context) MDNode(mds []Metadata) (md Metadata) {
-	ptr, nvals := llvmMetadataRefs(mds)
-	md.C = C.LLVMMDNode2(c.C, ptr, nvals)
-	return
-}
-func (v Value) ConstantAsMetadata() (md Metadata) {
-	md.C = C.LLVMConstantAsMetadata(v.C)
-	return
-}
-
-// Operations on scalar constants
-func ConstInt(t Type, n uint64, signExtend bool) (v Value) {
-	v.C = C.LLVMConstInt(t.C,
-		C.ulonglong(n),
-		boolToLLVMBool(signExtend))
-	return
-}
-func ConstIntFromString(t Type, str string, radix int) (v Value) {
-	cstr := C.CString(str)
-	defer C.free(unsafe.Pointer(cstr))
-	v.C = C.LLVMConstIntOfString(t.C, cstr, C.uint8_t(radix))
-	return
-}
-func ConstFloat(t Type, n float64) (v Value) {
-	v.C = C.LLVMConstReal(t.C, C.double(n))
-	return
-}
-func ConstFloatFromString(t Type, str string) (v Value) {
-	cstr := C.CString(str)
-	defer C.free(unsafe.Pointer(cstr))
-	v.C = C.LLVMConstRealOfString(t.C, cstr)
-	return
-}
-
-func (v Value) ZExtValue() uint64 { return uint64(C.LLVMConstIntGetZExtValue(v.C)) }
-func (v Value) SExtValue() int64  { return int64(C.LLVMConstIntGetSExtValue(v.C)) }
-
-// Operations on composite constants
-func (c Context) ConstString(str string, addnull bool) (v Value) {
-	cstr := C.CString(str)
-	defer C.free(unsafe.Pointer(cstr))
-	v.C = C.LLVMConstStringInContext(c.C, cstr,
-		C.unsigned(len(str)), boolToLLVMBool(!addnull))
-	return
-}
-func (c Context) ConstStruct(constVals []Value, packed bool) (v Value) {
-	ptr, nvals := llvmValueRefs(constVals)
-	v.C = C.LLVMConstStructInContext(c.C, ptr, nvals,
-		boolToLLVMBool(packed))
-	return
-}
-func ConstNamedStruct(t Type, constVals []Value) (v Value) {
-	ptr, nvals := llvmValueRefs(constVals)
-	v.C = C.LLVMConstNamedStruct(t.C, ptr, nvals)
-	return
-}
-func ConstString(str string, addnull bool) (v Value) {
-	cstr := C.CString(str)
-	defer C.free(unsafe.Pointer(cstr))
-	v.C = C.LLVMConstString(cstr,
-		C.unsigned(len(str)), boolToLLVMBool(!addnull))
-	return
-}
-func ConstArray(t Type, constVals []Value) (v Value) {
-	ptr, nvals := llvmValueRefs(constVals)
-	v.C = C.LLVMConstArray(t.C, ptr, nvals)
-	return
-}
-func ConstStruct(constVals []Value, packed bool) (v Value) {
-	ptr, nvals := llvmValueRefs(constVals)
-	v.C = C.LLVMConstStruct(ptr, nvals, boolToLLVMBool(packed))
-	return
-}
-func ConstVector(scalarConstVals []Value, packed bool) (v Value) {
-	ptr, nvals := llvmValueRefs(scalarConstVals)
-	v.C = C.LLVMConstVector(ptr, nvals)
-	return
-}
-
-// Constant expressions
-func (v Value) Opcode() Opcode                { return Opcode(C.LLVMGetConstOpcode(v.C)) }
-func (v Value) InstructionOpcode() Opcode     { return Opcode(C.LLVMGetInstructionOpcode(v.C)) }
-func AlignOf(t Type) (v Value)                { v.C = C.LLVMAlignOf(t.C); return }
-func SizeOf(t Type) (v Value)                 { v.C = C.LLVMSizeOf(t.C); return }
-func ConstNeg(v Value) (rv Value)             { rv.C = C.LLVMConstNeg(v.C); return }
-func ConstNSWNeg(v Value) (rv Value)          { rv.C = C.LLVMConstNSWNeg(v.C); return }
-func ConstNUWNeg(v Value) (rv Value)          { rv.C = C.LLVMConstNUWNeg(v.C); return }
-func ConstFNeg(v Value) (rv Value)            { rv.C = C.LLVMConstFNeg(v.C); return }
-func ConstNot(v Value) (rv Value)             { rv.C = C.LLVMConstNot(v.C); return }
-func ConstAdd(lhs, rhs Value) (v Value)       { v.C = C.LLVMConstAdd(lhs.C, rhs.C); return }
-func ConstNSWAdd(lhs, rhs Value) (v Value)    { v.C = C.LLVMConstNSWAdd(lhs.C, rhs.C); return }
-func ConstNUWAdd(lhs, rhs Value) (v Value)    { v.C = C.LLVMConstNUWAdd(lhs.C, rhs.C); return }
-func ConstFAdd(lhs, rhs Value) (v Value)      { v.C = C.LLVMConstFAdd(lhs.C, rhs.C); return }
-func ConstSub(lhs, rhs Value) (v Value)       { v.C = C.LLVMConstSub(lhs.C, rhs.C); return }
-func ConstNSWSub(lhs, rhs Value) (v Value)    { v.C = C.LLVMConstNSWSub(lhs.C, rhs.C); return }
-func ConstNUWSub(lhs, rhs Value) (v Value)    { v.C = C.LLVMConstNUWSub(lhs.C, rhs.C); return }
-func ConstFSub(lhs, rhs Value) (v Value)      { v.C = C.LLVMConstFSub(lhs.C, rhs.C); return }
-func ConstMul(lhs, rhs Value) (v Value)       { v.C = C.LLVMConstMul(lhs.C, rhs.C); return }
-func ConstNSWMul(lhs, rhs Value) (v Value)    { v.C = C.LLVMConstNSWMul(lhs.C, rhs.C); return }
-func ConstNUWMul(lhs, rhs Value) (v Value)    { v.C = C.LLVMConstNUWMul(lhs.C, rhs.C); return }
-func ConstFMul(lhs, rhs Value) (v Value)      { v.C = C.LLVMConstFMul(lhs.C, rhs.C); return }
-func ConstUDiv(lhs, rhs Value) (v Value)      { v.C = C.LLVMConstUDiv(lhs.C, rhs.C); return }
-func ConstSDiv(lhs, rhs Value) (v Value)      { v.C = C.LLVMConstSDiv(lhs.C, rhs.C); return }
-func ConstExactSDiv(lhs, rhs Value) (v Value) { v.C = C.LLVMConstExactSDiv(lhs.C, rhs.C); return }
-func ConstFDiv(lhs, rhs Value) (v Value)      { v.C = C.LLVMConstFDiv(lhs.C, rhs.C); return }
-func ConstURem(lhs, rhs Value) (v Value)      { v.C = C.LLVMConstURem(lhs.C, rhs.C); return }
-func ConstSRem(lhs, rhs Value) (v Value)      { v.C = C.LLVMConstSRem(lhs.C, rhs.C); return }
-func ConstFRem(lhs, rhs Value) (v Value)      { v.C = C.LLVMConstFRem(lhs.C, rhs.C); return }
-func ConstAnd(lhs, rhs Value) (v Value)       { v.C = C.LLVMConstAnd(lhs.C, rhs.C); return }
-func ConstOr(lhs, rhs Value) (v Value)        { v.C = C.LLVMConstOr(lhs.C, rhs.C); return }
-func ConstXor(lhs, rhs Value) (v Value)       { v.C = C.LLVMConstXor(lhs.C, rhs.C); return }
-
-func ConstICmp(pred IntPredicate, lhs, rhs Value) (v Value) {
-	v.C = C.LLVMConstICmp(C.LLVMIntPredicate(pred), lhs.C, rhs.C)
-	return
-}
-func ConstFCmp(pred FloatPredicate, lhs, rhs Value) (v Value) {
-	v.C = C.LLVMConstFCmp(C.LLVMRealPredicate(pred), lhs.C, rhs.C)
-	return
-}
-
-func ConstShl(lhs, rhs Value) (v Value)  { v.C = C.LLVMConstShl(lhs.C, rhs.C); return }
-func ConstLShr(lhs, rhs Value) (v Value) { v.C = C.LLVMConstLShr(lhs.C, rhs.C); return }
-func ConstAShr(lhs, rhs Value) (v Value) { v.C = C.LLVMConstAShr(lhs.C, rhs.C); return }
-
-func ConstGEP(v Value, indices []Value) (rv Value) {
-	ptr, nvals := llvmValueRefs(indices)
-	rv.C = C.LLVMConstGEP(v.C, ptr, nvals)
-	return
-}
-func ConstInBoundsGEP(v Value, indices []Value) (rv Value) {
-	ptr, nvals := llvmValueRefs(indices)
-	rv.C = C.LLVMConstInBoundsGEP(v.C, ptr, nvals)
-	return
-}
-func ConstTrunc(v Value, t Type) (rv Value)         { rv.C = C.LLVMConstTrunc(v.C, t.C); return }
-func ConstSExt(v Value, t Type) (rv Value)          { rv.C = C.LLVMConstSExt(v.C, t.C); return }
-func ConstZExt(v Value, t Type) (rv Value)          { rv.C = C.LLVMConstZExt(v.C, t.C); return }
-func ConstFPTrunc(v Value, t Type) (rv Value)       { rv.C = C.LLVMConstFPTrunc(v.C, t.C); return }
-func ConstFPExt(v Value, t Type) (rv Value)         { rv.C = C.LLVMConstFPExt(v.C, t.C); return }
-func ConstUIToFP(v Value, t Type) (rv Value)        { rv.C = C.LLVMConstUIToFP(v.C, t.C); return }
-func ConstSIToFP(v Value, t Type) (rv Value)        { rv.C = C.LLVMConstSIToFP(v.C, t.C); return }
-func ConstFPToUI(v Value, t Type) (rv Value)        { rv.C = C.LLVMConstFPToUI(v.C, t.C); return }
-func ConstFPToSI(v Value, t Type) (rv Value)        { rv.C = C.LLVMConstFPToSI(v.C, t.C); return }
-func ConstPtrToInt(v Value, t Type) (rv Value)      { rv.C = C.LLVMConstPtrToInt(v.C, t.C); return }
-func ConstIntToPtr(v Value, t Type) (rv Value)      { rv.C = C.LLVMConstIntToPtr(v.C, t.C); return }
-func ConstBitCast(v Value, t Type) (rv Value)       { rv.C = C.LLVMConstBitCast(v.C, t.C); return }
-func ConstZExtOrBitCast(v Value, t Type) (rv Value) { rv.C = C.LLVMConstZExtOrBitCast(v.C, t.C); return }
-func ConstSExtOrBitCast(v Value, t Type) (rv Value) { rv.C = C.LLVMConstSExtOrBitCast(v.C, t.C); return }
-func ConstTruncOrBitCast(v Value, t Type) (rv Value) {
-	rv.C = C.LLVMConstTruncOrBitCast(v.C, t.C)
-	return
-}
-func ConstPointerCast(v Value, t Type) (rv Value) { rv.C = C.LLVMConstPointerCast(v.C, t.C); return }
-func ConstIntCast(v Value, t Type, signed bool) (rv Value) {
-	rv.C = C.LLVMConstIntCast(v.C, t.C, boolToLLVMBool(signed))
-	return
-}
-func ConstFPCast(v Value, t Type) (rv Value) { rv.C = C.LLVMConstFPCast(v.C, t.C); return }
-func ConstSelect(cond, iftrue, iffalse Value) (rv Value) {
-	rv.C = C.LLVMConstSelect(cond.C, iftrue.C, iffalse.C)
-	return
-}
-func ConstExtractElement(vec, i Value) (rv Value) {
-	rv.C = C.LLVMConstExtractElement(vec.C, i.C)
-	return
-}
-func ConstInsertElement(vec, elem, i Value) (rv Value) {
-	rv.C = C.LLVMConstInsertElement(vec.C, elem.C, i.C)
-	return
-}
-func ConstShuffleVector(veca, vecb, mask Value) (rv Value) {
-	rv.C = C.LLVMConstShuffleVector(veca.C, vecb.C, mask.C)
-	return
-}
-
-//TODO
-//LLVMValueRef LLVMConstExtractValue(LLVMValueRef AggConstant, unsigned *IdxList,
-//                                   unsigned NumIdx);
-
-func ConstExtractValue(agg Value, indices []uint32) (rv Value) {
-	n := len(indices)
-	if n == 0 {
-		panic("one or more indices are required")
-	}
-	ptr := (*C.unsigned)(&indices[0])
-	rv.C = C.LLVMConstExtractValue(agg.C, ptr, C.unsigned(n))
-	return
-}
-
-func ConstInsertValue(agg, val Value, indices []uint32) (rv Value) {
-	n := len(indices)
-	if n == 0 {
-		panic("one or more indices are required")
-	}
-	ptr := (*C.unsigned)(&indices[0])
-	rv.C = C.LLVMConstInsertValue(agg.C, val.C, ptr, C.unsigned(n))
-	return
-}
-
-func BlockAddress(f Value, bb BasicBlock) (v Value) {
-	v.C = C.LLVMBlockAddress(f.C, bb.C)
-	return
-}
-
-// Operations on global variables, functions, and aliases (globals)
-func (v Value) GlobalParent() (m Module) { m.C = C.LLVMGetGlobalParent(v.C); return }
-func (v Value) IsDeclaration() bool      { return C.LLVMIsDeclaration(v.C) != 0 }
-func (v Value) Linkage() Linkage         { return Linkage(C.LLVMGetLinkage(v.C)) }
-func (v Value) SetLinkage(l Linkage)     { C.LLVMSetLinkage(v.C, C.LLVMLinkage(l)) }
-func (v Value) Section() string          { return C.GoString(C.LLVMGetSection(v.C)) }
-func (v Value) SetSection(str string) {
-	cstr := C.CString(str)
-	defer C.free(unsafe.Pointer(cstr))
-	C.LLVMSetSection(v.C, cstr)
-}
-func (v Value) Visibility() Visibility      { return Visibility(C.LLVMGetVisibility(v.C)) }
-func (v Value) SetVisibility(vi Visibility) { C.LLVMSetVisibility(v.C, C.LLVMVisibility(vi)) }
-func (v Value) Alignment() int              { return int(C.LLVMGetAlignment(v.C)) }
-func (v Value) SetAlignment(a int)          { C.LLVMSetAlignment(v.C, C.unsigned(a)) }
-func (v Value) SetUnnamedAddr(ua bool)      { C.LLVMSetUnnamedAddr(v.C, boolToLLVMBool(ua)) }
-
-// Operations on global variables
-func AddGlobal(m Module, t Type, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMAddGlobal(m.C, t.C, cname)
-	return
-}
-func AddGlobalInAddressSpace(m Module, t Type, name string, addressSpace int) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMAddGlobalInAddressSpace(m.C, t.C, cname, C.unsigned(addressSpace))
-	return
-}
-func (m Module) NamedGlobal(name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMGetNamedGlobal(m.C, cname)
-	return
-}
-
-func (m Module) FirstGlobal() (v Value)   { v.C = C.LLVMGetFirstGlobal(m.C); return }
-func (m Module) LastGlobal() (v Value)    { v.C = C.LLVMGetLastGlobal(m.C); return }
-func NextGlobal(v Value) (rv Value)       { rv.C = C.LLVMGetNextGlobal(v.C); return }
-func PrevGlobal(v Value) (rv Value)       { rv.C = C.LLVMGetPreviousGlobal(v.C); return }
-func (v Value) EraseFromParentAsGlobal()  { C.LLVMDeleteGlobal(v.C) }
-func (v Value) Initializer() (rv Value)   { rv.C = C.LLVMGetInitializer(v.C); return }
-func (v Value) SetInitializer(cv Value)   { C.LLVMSetInitializer(v.C, cv.C) }
-func (v Value) IsThreadLocal() bool       { return C.LLVMIsThreadLocal(v.C) != 0 }
-func (v Value) SetThreadLocal(tl bool)    { C.LLVMSetThreadLocal(v.C, boolToLLVMBool(tl)) }
-func (v Value) IsGlobalConstant() bool    { return C.LLVMIsGlobalConstant(v.C) != 0 }
-func (v Value) SetGlobalConstant(gc bool) { C.LLVMSetGlobalConstant(v.C, boolToLLVMBool(gc)) }
-func (v Value) IsVolatile() bool          { return C.LLVMGetVolatile(v.C) != 0 }
-func (v Value) SetVolatile(volatile bool) { C.LLVMSetVolatile(v.C, boolToLLVMBool(volatile)) }
-func (v Value) Ordering() AtomicOrdering  { return AtomicOrdering(C.LLVMGetOrdering(v.C)) }
-func (v Value) SetOrdering(ordering AtomicOrdering) {
-	C.LLVMSetOrdering(v.C, C.LLVMAtomicOrdering(ordering))
-}
-func (v Value) IsAtomicSingleThread() bool { return C.LLVMIsAtomicSingleThread(v.C) != 0 }
-func (v Value) SetAtomicSingleThread(singleThread bool) {
-	C.LLVMSetAtomicSingleThread(v.C, boolToLLVMBool(singleThread))
-}
-func (v Value) CmpXchgSuccessOrdering() AtomicOrdering {
-	return AtomicOrdering(C.LLVMGetCmpXchgSuccessOrdering(v.C))
-}
-func (v Value) SetCmpXchgSuccessOrdering(ordering AtomicOrdering) {
-	C.LLVMSetCmpXchgSuccessOrdering(v.C, C.LLVMAtomicOrdering(ordering))
-}
-func (v Value) CmpXchgFailureOrdering() AtomicOrdering {
-	return AtomicOrdering(C.LLVMGetCmpXchgFailureOrdering(v.C))
-}
-func (v Value) SetCmpXchgFailureOrdering(ordering AtomicOrdering) {
-	C.LLVMSetCmpXchgFailureOrdering(v.C, C.LLVMAtomicOrdering(ordering))
-}
-
-// Operations on aliases
-func AddAlias(m Module, t Type, aliasee Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMAddAlias(m.C, t.C, aliasee.C, cname)
-	return
-}
-
-// Operations on comdat
-func (m Module) Comdat(name string) (c Comdat) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	c.C = C.LLVMGetOrInsertComdat(m.C, cname)
-	return
-}
-
-func (v Value) Comdat() (c Comdat) { c.C = C.LLVMGetComdat(v.C); return }
-func (v Value) SetComdat(c Comdat) { C.LLVMSetComdat(v.C, c.C) }
-
-func (c Comdat) SelectionKind() ComdatSelectionKind {
-	return ComdatSelectionKind(C.LLVMGetComdatSelectionKind(c.C))
-}
-
-func (c Comdat) SetSelectionKind(k ComdatSelectionKind) {
-	C.LLVMSetComdatSelectionKind(c.C, (C.LLVMComdatSelectionKind)(k))
-}
-
-// Operations on functions
-func AddFunction(m Module, name string, ft Type) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMAddFunction(m.C, cname, ft.C)
-	return
-}
-
-func (m Module) NamedFunction(name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMGetNamedFunction(m.C, cname)
-	return
-}
-
-func (m Module) FirstFunction() (v Value)  { v.C = C.LLVMGetFirstFunction(m.C); return }
-func (m Module) LastFunction() (v Value)   { v.C = C.LLVMGetLastFunction(m.C); return }
-func NextFunction(v Value) (rv Value)      { rv.C = C.LLVMGetNextFunction(v.C); return }
-func PrevFunction(v Value) (rv Value)      { rv.C = C.LLVMGetPreviousFunction(v.C); return }
-func (v Value) EraseFromParentAsFunction() { C.LLVMDeleteFunction(v.C) }
-func (v Value) IntrinsicID() int           { return int(C.LLVMGetIntrinsicID(v.C)) }
-func (v Value) FunctionCallConv() CallConv {
-	return CallConv(C.LLVMCallConv(C.LLVMGetFunctionCallConv(v.C)))
-}
-func (v Value) SetFunctionCallConv(cc CallConv) { C.LLVMSetFunctionCallConv(v.C, C.unsigned(cc)) }
-func (v Value) GC() string                      { return C.GoString(C.LLVMGetGC(v.C)) }
-func (v Value) SetGC(name string) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	C.LLVMSetGC(v.C, cname)
-}
-func (v Value) AddAttributeAtIndex(i int, a Attribute) {
-	C.LLVMAddAttributeAtIndex(v.C, C.LLVMAttributeIndex(i), a.C)
-}
-func (v Value) AddFunctionAttr(a Attribute) {
-	v.AddAttributeAtIndex(C.LLVMAttributeFunctionIndex, a)
-}
-func (v Value) GetEnumAttributeAtIndex(i int, kind uint) (a Attribute) {
-	a.C = C.LLVMGetEnumAttributeAtIndex(v.C, C.LLVMAttributeIndex(i), C.unsigned(kind))
-	return
-}
-func (v Value) GetEnumFunctionAttribute(kind uint) Attribute {
-	return v.GetEnumAttributeAtIndex(C.LLVMAttributeFunctionIndex, kind)
-}
-func (v Value) GetStringAttributeAtIndex(i int, kind string) (a Attribute) {
-	ckind := C.CString(kind)
-	defer C.free(unsafe.Pointer(ckind))
-	a.C = C.LLVMGetStringAttributeAtIndex(v.C, C.LLVMAttributeIndex(i),
-		ckind, C.unsigned(len(kind)))
-	return
-}
-func (v Value) RemoveEnumAttributeAtIndex(i int, kind uint) {
-	C.LLVMRemoveEnumAttributeAtIndex(v.C, C.LLVMAttributeIndex(i), C.unsigned(kind))
-}
-func (v Value) RemoveEnumFunctionAttribute(kind uint) {
-	v.RemoveEnumAttributeAtIndex(C.LLVMAttributeFunctionIndex, kind)
-}
-func (v Value) RemoveStringAttributeAtIndex(i int, kind string) {
-	ckind := C.CString(kind)
-	defer C.free(unsafe.Pointer(ckind))
-	C.LLVMRemoveStringAttributeAtIndex(v.C, C.LLVMAttributeIndex(i),
-		ckind, C.unsigned(len(kind)))
-}
-func (v Value) AddTargetDependentFunctionAttr(attr, value string) {
-	cattr := C.CString(attr)
-	defer C.free(unsafe.Pointer(cattr))
-	cvalue := C.CString(value)
-	defer C.free(unsafe.Pointer(cvalue))
-	C.LLVMAddTargetDependentFunctionAttr(v.C, cattr, cvalue)
-}
-func (v Value) SetPersonality(p Value) {
-	C.LLVMSetPersonalityFn(v.C, p.C)
-}
-
-// Operations on parameters
-func (v Value) ParamsCount() int { return int(C.LLVMCountParams(v.C)) }
-func (v Value) Params() []Value {
-	out := make([]Value, v.ParamsCount())
-	if len(out) > 0 {
-		C.LLVMGetParams(v.C, llvmValueRefPtr(&out[0]))
-	}
-	return out
-}
-func (v Value) Param(i int) (rv Value)      { rv.C = C.LLVMGetParam(v.C, C.unsigned(i)); return }
-func (v Value) ParamParent() (rv Value)     { rv.C = C.LLVMGetParamParent(v.C); return }
-func (v Value) FirstParam() (rv Value)      { rv.C = C.LLVMGetFirstParam(v.C); return }
-func (v Value) LastParam() (rv Value)       { rv.C = C.LLVMGetLastParam(v.C); return }
-func NextParam(v Value) (rv Value)          { rv.C = C.LLVMGetNextParam(v.C); return }
-func PrevParam(v Value) (rv Value)          { rv.C = C.LLVMGetPreviousParam(v.C); return }
-func (v Value) SetParamAlignment(align int) { C.LLVMSetParamAlignment(v.C, C.unsigned(align)) }
-
-// Operations on basic blocks
-func (bb BasicBlock) AsValue() (v Value)      { v.C = C.LLVMBasicBlockAsValue(bb.C); return }
-func (v Value) IsBasicBlock() bool            { return C.LLVMValueIsBasicBlock(v.C) != 0 }
-func (v Value) AsBasicBlock() (bb BasicBlock) { bb.C = C.LLVMValueAsBasicBlock(v.C); return }
-func (bb BasicBlock) Parent() (v Value)       { v.C = C.LLVMGetBasicBlockParent(bb.C); return }
-func (v Value) BasicBlocksCount() int         { return int(C.LLVMCountBasicBlocks(v.C)) }
-func (v Value) BasicBlocks() []BasicBlock {
-	out := make([]BasicBlock, v.BasicBlocksCount())
-	C.LLVMGetBasicBlocks(v.C, llvmBasicBlockRefPtr(&out[0]))
-	return out
-}
-func (v Value) FirstBasicBlock() (bb BasicBlock)    { bb.C = C.LLVMGetFirstBasicBlock(v.C); return }
-func (v Value) LastBasicBlock() (bb BasicBlock)     { bb.C = C.LLVMGetLastBasicBlock(v.C); return }
-func NextBasicBlock(bb BasicBlock) (rbb BasicBlock) { rbb.C = C.LLVMGetNextBasicBlock(bb.C); return }
-func PrevBasicBlock(bb BasicBlock) (rbb BasicBlock) { rbb.C = C.LLVMGetPreviousBasicBlock(bb.C); return }
-func (v Value) EntryBasicBlock() (bb BasicBlock)    { bb.C = C.LLVMGetEntryBasicBlock(v.C); return }
-func (c Context) AddBasicBlock(f Value, name string) (bb BasicBlock) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	bb.C = C.LLVMAppendBasicBlockInContext(c.C, f.C, cname)
-	return
-}
-func (c Context) InsertBasicBlock(ref BasicBlock, name string) (bb BasicBlock) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	bb.C = C.LLVMInsertBasicBlockInContext(c.C, ref.C, cname)
-	return
-}
-func AddBasicBlock(f Value, name string) (bb BasicBlock) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	bb.C = C.LLVMAppendBasicBlock(f.C, cname)
-	return
-}
-func InsertBasicBlock(ref BasicBlock, name string) (bb BasicBlock) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	bb.C = C.LLVMInsertBasicBlock(ref.C, cname)
-	return
-}
-func (bb BasicBlock) EraseFromParent()          { C.LLVMDeleteBasicBlock(bb.C) }
-func (bb BasicBlock) MoveBefore(pos BasicBlock) { C.LLVMMoveBasicBlockBefore(bb.C, pos.C) }
-func (bb BasicBlock) MoveAfter(pos BasicBlock)  { C.LLVMMoveBasicBlockAfter(bb.C, pos.C) }
-
-// Operations on instructions
-func (v Value) EraseFromParentAsInstruction()      { C.LLVMInstructionEraseFromParent(v.C) }
-func (v Value) RemoveFromParentAsInstruction()     { C.LLVMInstructionRemoveFromParent(v.C) }
-func (v Value) InstructionParent() (bb BasicBlock) { bb.C = C.LLVMGetInstructionParent(v.C); return }
-func (v Value) InstructionDebugLoc() (md Metadata) { md.C = C.LLVMInstructionGetDebugLoc(v.C); return }
-func (v Value) InstructionSetDebugLoc(md Metadata) { C.LLVMInstructionSetDebugLoc(v.C, md.C) }
-func (bb BasicBlock) FirstInstruction() (v Value)  { v.C = C.LLVMGetFirstInstruction(bb.C); return }
-func (bb BasicBlock) LastInstruction() (v Value)   { v.C = C.LLVMGetLastInstruction(bb.C); return }
-func NextInstruction(v Value) (rv Value)           { rv.C = C.LLVMGetNextInstruction(v.C); return }
-func PrevInstruction(v Value) (rv Value)           { rv.C = C.LLVMGetPreviousInstruction(v.C); return }
-
-// Operations on call sites
-func (v Value) SetInstructionCallConv(cc CallConv) {
-	C.LLVMSetInstructionCallConv(v.C, C.unsigned(cc))
-}
-func (v Value) InstructionCallConv() CallConv {
-	return CallConv(C.LLVMCallConv(C.LLVMGetInstructionCallConv(v.C)))
-}
-func (v Value) AddCallSiteAttribute(i int, a Attribute) {
-	C.LLVMAddCallSiteAttribute(v.C, C.LLVMAttributeIndex(i), a.C)
-}
-func (v Value) SetInstrParamAlignment(i int, align int) {
-	C.LLVMSetInstrParamAlignment(v.C, C.unsigned(i), C.unsigned(align))
-}
-func (v Value) CalledValue() (rv Value) {
-	rv.C = C.LLVMGetCalledValue(v.C)
-	return
-}
-
-// Operations on call instructions (only)
-func (v Value) IsTailCall() bool    { return C.LLVMIsTailCall(v.C) != 0 }
-func (v Value) SetTailCall(is bool) { C.LLVMSetTailCall(v.C, boolToLLVMBool(is)) }
-
-// Operations on phi nodes
-func (v Value) AddIncoming(vals []Value, blocks []BasicBlock) {
-	ptr, nvals := llvmValueRefs(vals)
-	C.LLVMAddIncoming(v.C, ptr, llvmBasicBlockRefPtr(&blocks[0]), nvals)
-}
-func (v Value) IncomingCount() int { return int(C.LLVMCountIncoming(v.C)) }
-func (v Value) IncomingValue(i int) (rv Value) {
-	rv.C = C.LLVMGetIncomingValue(v.C, C.unsigned(i))
-	return
-}
-func (v Value) IncomingBlock(i int) (bb BasicBlock) {
-	bb.C = C.LLVMGetIncomingBlock(v.C, C.unsigned(i))
-	return
-}
-
-// Operations on inline assembly
-func InlineAsm(t Type, asmString, constraints string, hasSideEffects, isAlignStack bool, dialect InlineAsmDialect, canThrow bool) (rv Value) {
-	casm := C.CString(asmString)
-	defer C.free(unsafe.Pointer(casm))
-	cconstraints := C.CString(constraints)
-	defer C.free(unsafe.Pointer(cconstraints))
-	rv.C = C.LLVMGetInlineAsm(t.C, casm, C.size_t(len(asmString)), cconstraints, C.size_t(len(constraints)), boolToLLVMBool(hasSideEffects), boolToLLVMBool(isAlignStack), C.LLVMInlineAsmDialect(dialect), boolToLLVMBool(canThrow))
-	return
-}
-
-// Operations on aggregates
-func (v Value) Indices() []uint32 {
-	num := C.LLVMGetNumIndices(v.C)
-	indicesPtr := C.LLVMGetIndices(v.C)
-	// https://github.com/golang/go/wiki/cgo#turning-c-arrays-into-go-slices
-	rawIndices := (*[1 << 20]C.uint)(unsafe.Pointer(indicesPtr))[:num:num]
-	indices := make([]uint32, num)
-	for i := range indices {
-		indices[i] = uint32(rawIndices[i])
-	}
-	return indices
-}
-
-// Operations on comparisons
-func (v Value) IntPredicate() IntPredicate     { return IntPredicate(C.LLVMGetICmpPredicate(v.C)) }
-func (v Value) FloatPredicate() FloatPredicate { return FloatPredicate(C.LLVMGetFCmpPredicate(v.C)) }
-
-//-------------------------------------------------------------------------
-// llvm.Builder
-//-------------------------------------------------------------------------
-
-// An instruction builder represents a point within a basic block, and is the
-// exclusive means of building instructions using the C interface.
-
-func (c Context) NewBuilder() (b Builder) { b.C = C.LLVMCreateBuilderInContext(c.C); return }
-func NewBuilder() (b Builder)             { b.C = C.LLVMCreateBuilder(); return }
-func (b Builder) SetInsertPoint(block BasicBlock, instr Value) {
-	C.LLVMPositionBuilder(b.C, block.C, instr.C)
-}
-func (b Builder) SetInsertPointBefore(instr Value)     { C.LLVMPositionBuilderBefore(b.C, instr.C) }
-func (b Builder) SetInsertPointAtEnd(block BasicBlock) { C.LLVMPositionBuilderAtEnd(b.C, block.C) }
-func (b Builder) GetInsertBlock() (bb BasicBlock)      { bb.C = C.LLVMGetInsertBlock(b.C); return }
-func (b Builder) ClearInsertionPoint()                 { C.LLVMClearInsertionPosition(b.C) }
-func (b Builder) Insert(instr Value)                   { C.LLVMInsertIntoBuilder(b.C, instr.C) }
-func (b Builder) InsertWithName(instr Value, name string) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	C.LLVMInsertIntoBuilderWithName(b.C, instr.C, cname)
-}
-func (b Builder) Dispose() { C.LLVMDisposeBuilder(b.C) }
-
-// Metadata
-type DebugLoc struct {
-	Line, Col uint
-	Scope     Metadata
-	InlinedAt Metadata
-}
-
-func (b Builder) SetCurrentDebugLocation(line, col uint, scope, inlinedAt Metadata) {
-	C.LLVMGoSetCurrentDebugLocation(b.C, C.unsigned(line), C.unsigned(col), scope.C, inlinedAt.C)
-}
-
-// Get current debug location. Please do not call this function until setting debug location with SetCurrentDebugLocation()
-func (b Builder) GetCurrentDebugLocation() (loc DebugLoc) {
-	md := C.LLVMGoGetCurrentDebugLocation(b.C)
-	loc.Line = uint(md.Line)
-	loc.Col = uint(md.Col)
-	loc.Scope = Metadata{C: md.Scope}
-	loc.InlinedAt = Metadata{C: md.InlinedAt}
-	return
-}
-func (b Builder) SetInstDebugLocation(v Value) { C.LLVMSetInstDebugLocation(b.C, v.C) }
-func (b Builder) InsertDeclare(module Module, storage Value, md Value) Value {
-	f := module.NamedFunction("llvm.dbg.declare")
-	if f.IsNil() {
-		ftyp := FunctionType(VoidType(), []Type{storage.Type(), md.Type()}, false)
-		f = AddFunction(module, "llvm.dbg.declare", ftyp)
-	}
-	return b.CreateCall(f, []Value{storage, md}, "")
-}
-
-// Terminators
-func (b Builder) CreateRetVoid() (rv Value)    { rv.C = C.LLVMBuildRetVoid(b.C); return }
-func (b Builder) CreateRet(v Value) (rv Value) { rv.C = C.LLVMBuildRet(b.C, v.C); return }
-func (b Builder) CreateAggregateRet(vs []Value) (rv Value) {
-	ptr, nvals := llvmValueRefs(vs)
-	rv.C = C.LLVMBuildAggregateRet(b.C, ptr, nvals)
-	return
-}
-func (b Builder) CreateBr(bb BasicBlock) (rv Value) { rv.C = C.LLVMBuildBr(b.C, bb.C); return }
-func (b Builder) CreateCondBr(ifv Value, thenb, elseb BasicBlock) (rv Value) {
-	rv.C = C.LLVMBuildCondBr(b.C, ifv.C, thenb.C, elseb.C)
-	return
-}
-func (b Builder) CreateSwitch(v Value, elseb BasicBlock, numCases int) (rv Value) {
-	rv.C = C.LLVMBuildSwitch(b.C, v.C, elseb.C, C.unsigned(numCases))
-	return
-}
-func (b Builder) CreateIndirectBr(addr Value, numDests int) (rv Value) {
-	rv.C = C.LLVMBuildIndirectBr(b.C, addr.C, C.unsigned(numDests))
-	return
-}
-func (b Builder) CreateInvoke(fn Value, args []Value, then, catch BasicBlock, name string) (rv Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	ptr, nvals := llvmValueRefs(args)
-	rv.C = C.LLVMBuildInvoke(b.C, fn.C, ptr, nvals, then.C, catch.C, cname)
-	return
-}
-func (b Builder) CreateUnreachable() (rv Value) { rv.C = C.LLVMBuildUnreachable(b.C); return }
-
-// Add a case to the switch instruction
-func (v Value) AddCase(on Value, dest BasicBlock) { C.LLVMAddCase(v.C, on.C, dest.C) }
-
-// Add a destination to the indirectbr instruction
-func (v Value) AddDest(dest BasicBlock) { C.LLVMAddDestination(v.C, dest.C) }
-
-// Arithmetic
-func (b Builder) CreateAdd(lhs, rhs Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildAdd(b.C, lhs.C, rhs.C, cname)
-	return
-}
-func (b Builder) CreateNSWAdd(lhs, rhs Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildNSWAdd(b.C, lhs.C, rhs.C, cname)
-	return
-}
-func (b Builder) CreateNUWAdd(lhs, rhs Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildNUWAdd(b.C, lhs.C, rhs.C, cname)
-	return
-}
-func (b Builder) CreateFAdd(lhs, rhs Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildFAdd(b.C, lhs.C, rhs.C, cname)
-	return
-}
-func (b Builder) CreateSub(lhs, rhs Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildSub(b.C, lhs.C, rhs.C, cname)
-	return
-}
-func (b Builder) CreateNSWSub(lhs, rhs Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildNSWSub(b.C, lhs.C, rhs.C, cname)
-	return
-}
-func (b Builder) CreateNUWSub(lhs, rhs Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildNUWSub(b.C, lhs.C, rhs.C, cname)
-	return
-}
-func (b Builder) CreateFSub(lhs, rhs Value, name string) (v Value) {
-	cname := C.CString(name)
-	v.C = C.LLVMBuildFSub(b.C, lhs.C, rhs.C, cname)
-	C.free(unsafe.Pointer(cname))
-	return
-}
-func (b Builder) CreateMul(lhs, rhs Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildMul(b.C, lhs.C, rhs.C, cname)
-	return
-}
-func (b Builder) CreateNSWMul(lhs, rhs Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildNSWMul(b.C, lhs.C, rhs.C, cname)
-	return
-}
-func (b Builder) CreateNUWMul(lhs, rhs Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildNUWMul(b.C, lhs.C, rhs.C, cname)
-	return
-}
-func (b Builder) CreateFMul(lhs, rhs Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildFMul(b.C, lhs.C, rhs.C, cname)
-	return
-}
-func (b Builder) CreateUDiv(lhs, rhs Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildUDiv(b.C, lhs.C, rhs.C, cname)
-	return
-}
-func (b Builder) CreateSDiv(lhs, rhs Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildSDiv(b.C, lhs.C, rhs.C, cname)
-	return
-}
-func (b Builder) CreateExactSDiv(lhs, rhs Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildExactSDiv(b.C, lhs.C, rhs.C, cname)
-	return
-}
-func (b Builder) CreateFDiv(lhs, rhs Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildFDiv(b.C, lhs.C, rhs.C, cname)
-	return
-}
-func (b Builder) CreateURem(lhs, rhs Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildURem(b.C, lhs.C, rhs.C, cname)
-	return
-}
-func (b Builder) CreateSRem(lhs, rhs Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildSRem(b.C, lhs.C, rhs.C, cname)
-	return
-}
-func (b Builder) CreateFRem(lhs, rhs Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildFRem(b.C, lhs.C, rhs.C, cname)
-	return
-}
-func (b Builder) CreateShl(lhs, rhs Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildShl(b.C, lhs.C, rhs.C, cname)
-	return
-}
-func (b Builder) CreateLShr(lhs, rhs Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildLShr(b.C, lhs.C, rhs.C, cname)
-	return
-}
-func (b Builder) CreateAShr(lhs, rhs Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildAShr(b.C, lhs.C, rhs.C, cname)
-	return
-}
-func (b Builder) CreateAnd(lhs, rhs Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildAnd(b.C, lhs.C, rhs.C, cname)
-	return
-}
-func (b Builder) CreateOr(lhs, rhs Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildOr(b.C, lhs.C, rhs.C, cname)
-	return
-}
-func (b Builder) CreateXor(lhs, rhs Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildXor(b.C, lhs.C, rhs.C, cname)
-	return
-}
-func (b Builder) CreateBinOp(op Opcode, lhs, rhs Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildBinOp(b.C, C.LLVMOpcode(op), lhs.C, rhs.C, cname)
-	return
-}
-func (b Builder) CreateNeg(v Value, name string) (rv Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	rv.C = C.LLVMBuildNeg(b.C, v.C, cname)
-	return
-}
-func (b Builder) CreateNSWNeg(v Value, name string) (rv Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	rv.C = C.LLVMBuildNSWNeg(b.C, v.C, cname)
-	return
-}
-func (b Builder) CreateNUWNeg(v Value, name string) (rv Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	rv.C = C.LLVMBuildNUWNeg(b.C, v.C, cname)
-	return
-}
-func (b Builder) CreateFNeg(v Value, name string) (rv Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	rv.C = C.LLVMBuildFNeg(b.C, v.C, cname)
-	return
-}
-func (b Builder) CreateNot(v Value, name string) (rv Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	rv.C = C.LLVMBuildNot(b.C, v.C, cname)
-	return
-}
-
-// Memory
-
-func (b Builder) CreateMalloc(t Type, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildMalloc(b.C, t.C, cname)
-	return
-}
-func (b Builder) CreateArrayMalloc(t Type, val Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildArrayMalloc(b.C, t.C, val.C, cname)
-	return
-}
-func (b Builder) CreateAlloca(t Type, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildAlloca(b.C, t.C, cname)
-	return
-}
-func (b Builder) CreateArrayAlloca(t Type, val Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildArrayAlloca(b.C, t.C, val.C, cname)
-	return
-}
-func (b Builder) CreateFree(p Value) (v Value) {
-	v.C = C.LLVMBuildFree(b.C, p.C)
-	return
-}
-func (b Builder) CreateLoad(p Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildLoad(b.C, p.C, cname)
-	return
-}
-func (b Builder) CreateStore(val Value, p Value) (v Value) {
-	v.C = C.LLVMBuildStore(b.C, val.C, p.C)
-	return
-}
-func (b Builder) CreateGEP(p Value, indices []Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	ptr, nvals := llvmValueRefs(indices)
-	v.C = C.LLVMBuildGEP(b.C, p.C, ptr, nvals, cname)
-	return
-}
-func (b Builder) CreateInBoundsGEP(p Value, indices []Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	ptr, nvals := llvmValueRefs(indices)
-	v.C = C.LLVMBuildInBoundsGEP(b.C, p.C, ptr, nvals, cname)
-	return
-}
-func (b Builder) CreateStructGEP(p Value, i int, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildStructGEP(b.C, p.C, C.unsigned(i), cname)
-	return
-}
-func (b Builder) CreateGlobalString(str, name string) (v Value) {
-	cstr := C.CString(str)
-	defer C.free(unsafe.Pointer(cstr))
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildGlobalString(b.C, cstr, cname)
-	return
-}
-func (b Builder) CreateGlobalStringPtr(str, name string) (v Value) {
-	cstr := C.CString(str)
-	defer C.free(unsafe.Pointer(cstr))
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildGlobalStringPtr(b.C, cstr, cname)
-	return
-}
-func (b Builder) CreateAtomicRMW(op AtomicRMWBinOp, ptr, val Value, ordering AtomicOrdering, singleThread bool) (v Value) {
-	v.C = C.LLVMBuildAtomicRMW(b.C, C.LLVMAtomicRMWBinOp(op), ptr.C, val.C, C.LLVMAtomicOrdering(ordering), boolToLLVMBool(singleThread))
-	return
-}
-func (b Builder) CreateAtomicCmpXchg(ptr, cmp, newVal Value, successOrdering, failureOrdering AtomicOrdering, singleThread bool) (v Value) {
-	v.C = C.LLVMBuildAtomicCmpXchg(b.C, ptr.C, cmp.C, newVal.C, C.LLVMAtomicOrdering(successOrdering), C.LLVMAtomicOrdering(failureOrdering), boolToLLVMBool(singleThread))
-	return
-}
-
-// Casts
-func (b Builder) CreateTrunc(val Value, t Type, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildTrunc(b.C, val.C, t.C, cname)
-	return
-}
-func (b Builder) CreateZExt(val Value, t Type, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildZExt(b.C, val.C, t.C, cname)
-	return
-}
-func (b Builder) CreateSExt(val Value, t Type, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildSExt(b.C, val.C, t.C, cname)
-	return
-}
-func (b Builder) CreateFPToUI(val Value, t Type, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildFPToUI(b.C, val.C, t.C, cname)
-	return
-}
-func (b Builder) CreateFPToSI(val Value, t Type, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildFPToSI(b.C, val.C, t.C, cname)
-	return
-}
-func (b Builder) CreateUIToFP(val Value, t Type, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildUIToFP(b.C, val.C, t.C, cname)
-	return
-}
-func (b Builder) CreateSIToFP(val Value, t Type, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildSIToFP(b.C, val.C, t.C, cname)
-	return
-}
-func (b Builder) CreateFPTrunc(val Value, t Type, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildFPTrunc(b.C, val.C, t.C, cname)
-	return
-}
-func (b Builder) CreateFPExt(val Value, t Type, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildFPExt(b.C, val.C, t.C, cname)
-	return
-}
-func (b Builder) CreatePtrToInt(val Value, t Type, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildPtrToInt(b.C, val.C, t.C, cname)
-	return
-}
-func (b Builder) CreateIntToPtr(val Value, t Type, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildIntToPtr(b.C, val.C, t.C, cname)
-	return
-}
-func (b Builder) CreateBitCast(val Value, t Type, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildBitCast(b.C, val.C, t.C, cname)
-	return
-}
-func (b Builder) CreateZExtOrBitCast(val Value, t Type, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildZExtOrBitCast(b.C, val.C, t.C, cname)
-	return
-}
-func (b Builder) CreateSExtOrBitCast(val Value, t Type, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildSExtOrBitCast(b.C, val.C, t.C, cname)
-	return
-}
-func (b Builder) CreateTruncOrBitCast(val Value, t Type, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildTruncOrBitCast(b.C, val.C, t.C, cname)
-	return
-}
-func (b Builder) CreateCast(val Value, op Opcode, t Type, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildCast(b.C, C.LLVMOpcode(op), val.C, t.C, cname)
-	return
-} //
-func (b Builder) CreatePointerCast(val Value, t Type, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildPointerCast(b.C, val.C, t.C, cname)
-	return
-}
-func (b Builder) CreateIntCast(val Value, t Type, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildIntCast(b.C, val.C, t.C, cname)
-	return
-}
-func (b Builder) CreateFPCast(val Value, t Type, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildFPCast(b.C, val.C, t.C, cname)
-	return
-}
-
-// Comparisons
-func (b Builder) CreateICmp(pred IntPredicate, lhs, rhs Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildICmp(b.C, C.LLVMIntPredicate(pred), lhs.C, rhs.C, cname)
-	return
-}
-func (b Builder) CreateFCmp(pred FloatPredicate, lhs, rhs Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildFCmp(b.C, C.LLVMRealPredicate(pred), lhs.C, rhs.C, cname)
-	return
-}
-
-// Miscellaneous instructions
-func (b Builder) CreatePHI(t Type, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildPhi(b.C, t.C, cname)
-	return
-}
-func (b Builder) CreateCall(fn Value, args []Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	ptr, nvals := llvmValueRefs(args)
-	v.C = C.LLVMBuildCall(b.C, fn.C, ptr, nvals, cname)
-	return
-}
-
-func (b Builder) CreateSelect(ifv, thenv, elsev Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildSelect(b.C, ifv.C, thenv.C, elsev.C, cname)
-	return
-}
-
-func (b Builder) CreateVAArg(list Value, t Type, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildVAArg(b.C, list.C, t.C, cname)
-	return
-}
-func (b Builder) CreateExtractElement(vec, i Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildExtractElement(b.C, vec.C, i.C, cname)
-	return
-}
-func (b Builder) CreateInsertElement(vec, elt, i Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildInsertElement(b.C, vec.C, elt.C, i.C, cname)
-	return
-}
-func (b Builder) CreateShuffleVector(v1, v2, mask Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildShuffleVector(b.C, v1.C, v2.C, mask.C, cname)
-	return
-}
-func (b Builder) CreateExtractValue(agg Value, i int, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildExtractValue(b.C, agg.C, C.unsigned(i), cname)
-	return
-}
-func (b Builder) CreateInsertValue(agg, elt Value, i int, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildInsertValue(b.C, agg.C, elt.C, C.unsigned(i), cname)
-	return
-}
-
-func (b Builder) CreateIsNull(val Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildIsNull(b.C, val.C, cname)
-	return
-}
-func (b Builder) CreateIsNotNull(val Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildIsNotNull(b.C, val.C, cname)
-	return
-}
-func (b Builder) CreatePtrDiff(lhs, rhs Value, name string) (v Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	v.C = C.LLVMBuildPtrDiff(b.C, lhs.C, rhs.C, cname)
-	return
-}
-
-func (b Builder) CreateLandingPad(t Type, nclauses int, name string) (l Value) {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	l.C = C.LLVMBuildLandingPad(b.C, t.C, nil, C.unsigned(nclauses), cname)
-	return l
-}
-
-func (l Value) AddClause(v Value) {
-	C.LLVMAddClause(l.C, v.C)
-}
-
-func (l Value) SetCleanup(cleanup bool) {
-	C.LLVMSetCleanup(l.C, boolToLLVMBool(cleanup))
-}
-
-func (b Builder) CreateResume(ex Value) (v Value) {
-	v.C = C.LLVMBuildResume(b.C, ex.C)
-	return
-}
-
-//-------------------------------------------------------------------------
-// llvm.ModuleProvider
-//-------------------------------------------------------------------------
-
-// Changes the type of M so it can be passed to FunctionPassManagers and the
-// JIT. They take ModuleProviders for historical reasons.
-func NewModuleProviderForModule(m Module) (mp ModuleProvider) {
-	mp.C = C.LLVMCreateModuleProviderForExistingModule(m.C)
-	return
-}
-
-// Destroys the module M.
-func (mp ModuleProvider) Dispose() { C.LLVMDisposeModuleProvider(mp.C) }
-
-//-------------------------------------------------------------------------
-// llvm.MemoryBuffer
-//-------------------------------------------------------------------------
-
-func NewMemoryBufferFromFile(path string) (b MemoryBuffer, err error) {
-	var cmsg *C.char
-	cpath := C.CString(path)
-	defer C.free(unsafe.Pointer(cpath))
-	fail := C.LLVMCreateMemoryBufferWithContentsOfFile(cpath, &b.C, &cmsg)
-	if fail != 0 {
-		b.C = nil
-		err = errors.New(C.GoString(cmsg))
-		C.LLVMDisposeMessage(cmsg)
-	}
-	return
-}
-
-func NewMemoryBufferFromStdin() (b MemoryBuffer, err error) {
-	var cmsg *C.char
-	fail := C.LLVMCreateMemoryBufferWithSTDIN(&b.C, &cmsg)
-	if fail != 0 {
-		b.C = nil
-		err = errors.New(C.GoString(cmsg))
-		C.LLVMDisposeMessage(cmsg)
-	}
-	return
-}
-
-func (b MemoryBuffer) Bytes() []byte {
-	cstart := C.LLVMGetBufferStart(b.C)
-	csize := C.LLVMGetBufferSize(b.C)
-	return C.GoBytes(unsafe.Pointer(cstart), C.int(csize))
-}
-
-func (b MemoryBuffer) Dispose() { C.LLVMDisposeMemoryBuffer(b.C) }
-
-//-------------------------------------------------------------------------
-// llvm.PassManager
-//-------------------------------------------------------------------------
-
-// Constructs a new whole-module pass pipeline. This type of pipeline is
-// suitable for link-time optimization and whole-module transformations.
-// See llvm::PassManager::PassManager.
-func NewPassManager() (pm PassManager) { pm.C = C.LLVMCreatePassManager(); return }
-
-// Constructs a new function-by-function pass pipeline over the module
-// provider. It does not take ownership of the module provider. This type of
-// pipeline is suitable for code generation and JIT compilation tasks.
-// See llvm::FunctionPassManager::FunctionPassManager.
-func NewFunctionPassManagerForModule(m Module) (pm PassManager) {
-	pm.C = C.LLVMCreateFunctionPassManagerForModule(m.C)
-	return
-}
-
-// Initializes, executes on the provided module, and finalizes all of the
-// passes scheduled in the pass manager. Returns 1 if any of the passes
-// modified the module, 0 otherwise. See llvm::PassManager::run(Module&).
-func (pm PassManager) Run(m Module) bool { return C.LLVMRunPassManager(pm.C, m.C) != 0 }
-
-// Initializes all of the function passes scheduled in the function pass
-// manager. Returns 1 if any of the passes modified the module, 0 otherwise.
-// See llvm::FunctionPassManager::doInitialization.
-func (pm PassManager) InitializeFunc() bool { return C.LLVMInitializeFunctionPassManager(pm.C) != 0 }
-
-// Executes all of the function passes scheduled in the function pass manager
-// on the provided function. Returns 1 if any of the passes modified the
-// function, false otherwise.
-// See llvm::FunctionPassManager::run(Function&).
-func (pm PassManager) RunFunc(f Value) bool { return C.LLVMRunFunctionPassManager(pm.C, f.C) != 0 }
-
-// Finalizes all of the function passes scheduled in the function pass
-// manager. Returns 1 if any of the passes modified the module, 0 otherwise.
-// See llvm::FunctionPassManager::doFinalization.
-func (pm PassManager) FinalizeFunc() bool { return C.LLVMFinalizeFunctionPassManager(pm.C) != 0 }
-
-// Frees the memory of a pass pipeline. For function pipelines, does not free
-// the module provider.
-// See llvm::PassManagerBase::~PassManagerBase.
-func (pm PassManager) Dispose() { C.LLVMDisposePassManager(pm.C) }
diff --git a/gnu/llvm/llvm/bindings/go/llvm/ir_test.go b/gnu/llvm/llvm/bindings/go/llvm/ir_test.go
deleted file mode 100644
index 71c47d94a0e..00000000000
--- a/gnu/llvm/llvm/bindings/go/llvm/ir_test.go
+++ /dev/null
@@ -1,164 +0,0 @@
-//===- ir_test.go - Tests for ir ------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file tests bindings for the ir component.
-//
-//===----------------------------------------------------------------------===//
-
-package llvm
-
-import (
-	"strings"
-	"testing"
-)
-
-func testAttribute(t *testing.T, name string) {
-	mod := NewModule("")
-	defer mod.Dispose()
-
-	ftyp := FunctionType(VoidType(), nil, false)
-	fn := AddFunction(mod, "foo", ftyp)
-
-	kind := AttributeKindID(name)
-	attr := mod.Context().CreateEnumAttribute(kind, 0)
-
-	fn.AddFunctionAttr(attr)
-	newattr := fn.GetEnumFunctionAttribute(kind)
-	if attr != newattr {
-		t.Errorf("got attribute %p, want %p", newattr.C, attr.C)
-	}
-
-	text := mod.String()
-	if !strings.Contains(text, " "+name+" ") {
-		t.Errorf("expected attribute '%s', got:\n%s", name, text)
-	}
-
-	fn.RemoveEnumFunctionAttribute(kind)
-	newattr = fn.GetEnumFunctionAttribute(kind)
-	if !newattr.IsNil() {
-		t.Errorf("got attribute %p, want 0", newattr.C)
-	}
-}
-
-func TestAttributes(t *testing.T) {
-	// Tests that our attribute constants haven't drifted from LLVM's.
-	attrTests := []string{
-		"sanitize_address",
-		"alwaysinline",
-		"builtin",
-		"convergent",
-		"inlinehint",
-		"inreg",
-		"jumptable",
-		"minsize",
-		"naked",
-		"nest",
-		"noalias",
-		"nobuiltin",
-		"nocapture",
-		"noduplicate",
-		"noimplicitfloat",
-		"noinline",
-		"nonlazybind",
-		"nonnull",
-		"noredzone",
-		"noreturn",
-		"nounwind",
-		"nosanitize_coverage",
-		"optnone",
-		"optsize",
-		"readnone",
-		"readonly",
-		"returned",
-		"returns_twice",
-		"signext",
-		"safestack",
-		"ssp",
-		"sspreq",
-		"sspstrong",
-		"sanitize_thread",
-		"sanitize_memory",
-		"uwtable",
-		"zeroext",
-		"cold",
-		"nocf_check",
-	}
-
-	for _, name := range attrTests {
-		testAttribute(t, name)
-	}
-}
-
-func TestDebugLoc(t *testing.T) {
-	mod := NewModule("")
-	defer mod.Dispose()
-
-	ctx := mod.Context()
-
-	b := ctx.NewBuilder()
-	defer b.Dispose()
-
-	d := NewDIBuilder(mod)
-	defer func() {
-		d.Destroy()
-	}()
-	file := d.CreateFile("dummy_file", "dummy_dir")
-	voidInfo := d.CreateBasicType(DIBasicType{Name: "void"})
-	typeInfo := d.CreateSubroutineType(DISubroutineType{
-		File:       file,
-		Parameters: []Metadata{voidInfo},
-		Flags:      0,
-	})
-	scope := d.CreateFunction(file, DIFunction{
-		Name:         "foo",
-		LinkageName:  "foo",
-		Line:         10,
-		ScopeLine:    10,
-		Type:         typeInfo,
-		File:         file,
-		IsDefinition: true,
-	})
-
-	b.SetCurrentDebugLocation(10, 20, scope, Metadata{})
-	loc := b.GetCurrentDebugLocation()
-	if loc.Line != 10 {
-		t.Errorf("Got line %d, though wanted 10", loc.Line)
-	}
-	if loc.Col != 20 {
-		t.Errorf("Got column %d, though wanted 20", loc.Col)
-	}
-	if loc.Scope.C != scope.C {
-		t.Errorf("Got metadata %v as scope, though wanted %v", loc.Scope.C, scope.C)
-	}
-}
-
-func TestSubtypes(t *testing.T) {
-	cont := NewContext()
-	defer cont.Dispose()
-
-	int_pointer := PointerType(cont.Int32Type(), 0)
-	int_inner := int_pointer.Subtypes()
-	if len(int_inner) != 1 {
-		t.Errorf("Got size %d, though wanted 1", len(int_inner))
-	}
-	if int_inner[0] != cont.Int32Type() {
-		t.Errorf("Expected int32 type")
-	}
-
-	st_pointer := cont.StructType([]Type{cont.Int32Type(), cont.Int8Type()}, false)
-	st_inner := st_pointer.Subtypes()
-	if len(st_inner) != 2 {
-		t.Errorf("Got size %d, though wanted 2", len(int_inner))
-	}
-	if st_inner[0] != cont.Int32Type() {
-		t.Errorf("Expected first struct field to be int32")
-	}
-	if st_inner[1] != cont.Int8Type() {
-		t.Errorf("Expected second struct field to be int8")
-	}
-}
diff --git a/gnu/llvm/llvm/bindings/go/llvm/linker.go b/gnu/llvm/llvm/bindings/go/llvm/linker.go
deleted file mode 100644
index 8e2e953fd46..00000000000
--- a/gnu/llvm/llvm/bindings/go/llvm/linker.go
+++ /dev/null
@@ -1,30 +0,0 @@
-//===- linker.go - Bindings for linker ------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines bindings for the linker component.
-//
-//===----------------------------------------------------------------------===//
-
-package llvm
-
-/*
-#include "llvm-c/Core.h"
-#include "llvm-c/Linker.h"
-#include <stdlib.h>
-*/
-import "C"
-import "errors"
-
-func LinkModules(Dest, Src Module) error {
-	failed := C.LLVMLinkModules2(Dest.C, Src.C)
-	if failed != 0 {
-		err := errors.New("Linking failed")
-		return err
-	}
-	return nil
-}
diff --git a/gnu/llvm/llvm/bindings/go/llvm/llvm_config.go.in b/gnu/llvm/llvm/bindings/go/llvm/llvm_config.go.in
deleted file mode 100644
index 4c63ed10cfb..00000000000
--- a/gnu/llvm/llvm/bindings/go/llvm/llvm_config.go.in
+++ /dev/null
@@ -1,12 +0,0 @@
-// +build !byollvm
-
-package llvm
-
-/*
-#cgo CXXFLAGS: -std=c++14
-#cgo CPPFLAGS: @LLVM_CFLAGS@
-#cgo LDFLAGS: @LLVM_LDFLAGS@
-*/
-import "C"
-
-type (run_build_sh int)
diff --git a/gnu/llvm/llvm/bindings/go/llvm/llvm_dep.go b/gnu/llvm/llvm/bindings/go/llvm/llvm_dep.go
deleted file mode 100644
index 9484e6ddf87..00000000000
--- a/gnu/llvm/llvm/bindings/go/llvm/llvm_dep.go
+++ /dev/null
@@ -1,18 +0,0 @@
-//===- llvm_dep.go - creates LLVM dependency ------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file ensures that the LLVM libraries are built before using the
-// bindings.
-//
-//===----------------------------------------------------------------------===//
-
-// +build !byollvm
-
-package llvm
-
-var _ run_build_sh
diff --git a/gnu/llvm/llvm/bindings/go/llvm/string.go b/gnu/llvm/llvm/bindings/go/llvm/string.go
deleted file mode 100644
index 7c8bf8da5b3..00000000000
--- a/gnu/llvm/llvm/bindings/go/llvm/string.go
+++ /dev/null
@@ -1,106 +0,0 @@
-//===- string.go - Stringer implementation for Type -----------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements the Stringer interface for the Type type.
-//
-//===----------------------------------------------------------------------===//
-
-package llvm
-
-import "fmt"
-
-func (t TypeKind) String() string {
-	switch t {
-	case VoidTypeKind:
-		return "VoidTypeKind"
-	case FloatTypeKind:
-		return "FloatTypeKind"
-	case DoubleTypeKind:
-		return "DoubleTypeKind"
-	case X86_FP80TypeKind:
-		return "X86_FP80TypeKind"
-	case FP128TypeKind:
-		return "FP128TypeKind"
-	case PPC_FP128TypeKind:
-		return "PPC_FP128TypeKind"
-	case LabelTypeKind:
-		return "LabelTypeKind"
-	case IntegerTypeKind:
-		return "IntegerTypeKind"
-	case FunctionTypeKind:
-		return "FunctionTypeKind"
-	case StructTypeKind:
-		return "StructTypeKind"
-	case ArrayTypeKind:
-		return "ArrayTypeKind"
-	case PointerTypeKind:
-		return "PointerTypeKind"
-	case MetadataTypeKind:
-		return "MetadataTypeKind"
-	case VectorTypeKind:
-		return "VectorTypeKind"
-	case ScalableVectorTypeKind:
-		return "ScalableVectorTypeKind"
-	}
-	panic("unreachable")
-}
-
-func (t Type) String() string {
-	ts := typeStringer{s: make(map[Type]string)}
-	return ts.typeString(t)
-}
-
-type typeStringer struct {
-	s map[Type]string
-}
-
-func (ts *typeStringer) typeString(t Type) string {
-	if s, ok := ts.s[t]; ok {
-		return s
-	}
-
-	k := t.TypeKind()
-	s := k.String()
-	s = s[:len(s)-len("Kind")]
-
-	switch k {
-	case ArrayTypeKind:
-		s += fmt.Sprintf("(%v[%v])", ts.typeString(t.ElementType()), t.ArrayLength())
-	case PointerTypeKind:
-		s += fmt.Sprintf("(%v)", ts.typeString(t.ElementType()))
-	case FunctionTypeKind:
-		params := t.ParamTypes()
-		s += "("
-		if len(params) > 0 {
-			s += fmt.Sprintf("%v", ts.typeString(params[0]))
-			for i := 1; i < len(params); i++ {
-				s += fmt.Sprintf(", %v", ts.typeString(params[i]))
-			}
-		}
-		s += fmt.Sprintf("):%v", ts.typeString(t.ReturnType()))
-	case StructTypeKind:
-		if name := t.StructName(); name != "" {
-			ts.s[t] = "%" + name
-			s = fmt.Sprintf("%%%s: %s", name, s)
-		}
-		etypes := t.StructElementTypes()
-		s += "("
-		if n := len(etypes); n > 0 {
-			s += ts.typeString(etypes[0])
-			for i := 1; i < n; i++ {
-				s += fmt.Sprintf(", %v", ts.typeString(etypes[i]))
-			}
-		}
-		s += ")"
-	case IntegerTypeKind:
-		s += fmt.Sprintf("(%d bits)", t.IntTypeWidth())
-	}
-
-	ts.s[t] = s
-	return s
-}
diff --git a/gnu/llvm/llvm/bindings/go/llvm/string_test.go b/gnu/llvm/llvm/bindings/go/llvm/string_test.go
deleted file mode 100644
index 56cbc9f3e7f..00000000000
--- a/gnu/llvm/llvm/bindings/go/llvm/string_test.go
+++ /dev/null
@@ -1,27 +0,0 @@
-//===- string_test.go - test Stringer implementation for Type -------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file tests the Stringer interface for the Type type.
-//
-//===----------------------------------------------------------------------===//
-
-package llvm
-
-import (
-	"testing"
-)
-
-func TestStringRecursiveType(t *testing.T) {
-	ctx := NewContext()
-	defer ctx.Dispose()
-	s := ctx.StructCreateNamed("recursive")
-	s.StructSetBody([]Type{s, s}, false)
-	if str := s.String(); str != "%recursive: StructType(%recursive, %recursive)" {
-		t.Errorf("incorrect string result %q", str)
-	}
-}
diff --git a/gnu/llvm/llvm/bindings/go/llvm/support.go b/gnu/llvm/llvm/bindings/go/llvm/support.go
deleted file mode 100644
index 8a663fee502..00000000000
--- a/gnu/llvm/llvm/bindings/go/llvm/support.go
+++ /dev/null
@@ -1,53 +0,0 @@
-//===- support.go - Bindings for support ----------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines bindings for the support component.
-//
-//===----------------------------------------------------------------------===//
-
-package llvm
-
-/*
-#include "llvm-c/Support.h"
-#include "SupportBindings.h"
-#include <stdlib.h>
-*/
-import "C"
-
-import (
-	"errors"
-	"unsafe"
-)
-
-// Loads a dynamic library such that it may be used as an LLVM plugin.
-// See llvm::sys::DynamicLibrary::LoadLibraryPermanently.
-func LoadLibraryPermanently(lib string) error {
-	var errstr *C.char
-	libstr := C.CString(lib)
-	defer C.free(unsafe.Pointer(libstr))
-	C.LLVMLoadLibraryPermanently2(libstr, &errstr)
-	if errstr != nil {
-		err := errors.New(C.GoString(errstr))
-		C.free(unsafe.Pointer(errstr))
-		return err
-	}
-	return nil
-}
-
-// Parse the given arguments using the LLVM command line parser.
-// See llvm::cl::ParseCommandLineOptions.
-func ParseCommandLineOptions(args []string, overview string) {
-	argstrs := make([]*C.char, len(args))
-	for i, arg := range args {
-		argstrs[i] = C.CString(arg)
-		defer C.free(unsafe.Pointer(argstrs[i]))
-	}
-	overviewstr := C.CString(overview)
-	defer C.free(unsafe.Pointer(overviewstr))
-	C.LLVMParseCommandLineOptions(C.int(len(args)), &argstrs[0], overviewstr)
-}
diff --git a/gnu/llvm/llvm/bindings/go/llvm/target.go b/gnu/llvm/llvm/bindings/go/llvm/target.go
deleted file mode 100644
index cdd0fa30c3f..00000000000
--- a/gnu/llvm/llvm/bindings/go/llvm/target.go
+++ /dev/null
@@ -1,296 +0,0 @@
-//===- target.go - Bindings for target ------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines bindings for the target component.
-//
-//===----------------------------------------------------------------------===//
-
-package llvm
-
-/*
-#include "llvm-c/Core.h"
-#include "llvm-c/Target.h"
-#include "llvm-c/TargetMachine.h"
-#include <stdlib.h>
-*/
-import "C"
-import "unsafe"
-import "errors"
-
-type (
-	TargetData struct {
-		C C.LLVMTargetDataRef
-	}
-	Target struct {
-		C C.LLVMTargetRef
-	}
-	TargetMachine struct {
-		C C.LLVMTargetMachineRef
-	}
-	ByteOrdering    C.enum_LLVMByteOrdering
-	RelocMode       C.LLVMRelocMode
-	CodeGenOptLevel C.LLVMCodeGenOptLevel
-	CodeGenFileType C.LLVMCodeGenFileType
-	CodeModel       C.LLVMCodeModel
-)
-
-const (
-	BigEndian    ByteOrdering = C.LLVMBigEndian
-	LittleEndian ByteOrdering = C.LLVMLittleEndian
-)
-
-const (
-	RelocDefault      RelocMode = C.LLVMRelocDefault
-	RelocStatic       RelocMode = C.LLVMRelocStatic
-	RelocPIC          RelocMode = C.LLVMRelocPIC
-	RelocDynamicNoPic RelocMode = C.LLVMRelocDynamicNoPic
-)
-
-const (
-	CodeGenLevelNone       CodeGenOptLevel = C.LLVMCodeGenLevelNone
-	CodeGenLevelLess       CodeGenOptLevel = C.LLVMCodeGenLevelLess
-	CodeGenLevelDefault    CodeGenOptLevel = C.LLVMCodeGenLevelDefault
-	CodeGenLevelAggressive CodeGenOptLevel = C.LLVMCodeGenLevelAggressive
-)
-
-const (
-	CodeModelDefault    CodeModel = C.LLVMCodeModelDefault
-	CodeModelJITDefault CodeModel = C.LLVMCodeModelJITDefault
-	CodeModelTiny       CodeModel = C.LLVMCodeModelTiny
-	CodeModelSmall      CodeModel = C.LLVMCodeModelSmall
-	CodeModelKernel     CodeModel = C.LLVMCodeModelKernel
-	CodeModelMedium     CodeModel = C.LLVMCodeModelMedium
-	CodeModelLarge      CodeModel = C.LLVMCodeModelLarge
-)
-
-const (
-	AssemblyFile CodeGenFileType = C.LLVMAssemblyFile
-	ObjectFile   CodeGenFileType = C.LLVMObjectFile
-)
-
-// InitializeAllTargetInfos - The main program should call this function if it
-// wants access to all available targets that LLVM is configured to support.
-func InitializeAllTargetInfos() { C.LLVMInitializeAllTargetInfos() }
-
-// InitializeAllTargets - The main program should call this function if it wants
-// to link in all available targets that LLVM is configured to support.
-func InitializeAllTargets() { C.LLVMInitializeAllTargets() }
-
-func InitializeAllTargetMCs() { C.LLVMInitializeAllTargetMCs() }
-
-func InitializeAllAsmParsers() { C.LLVMInitializeAllAsmParsers() }
-
-func InitializeAllAsmPrinters() { C.LLVMInitializeAllAsmPrinters() }
-
-var initializeNativeTargetError = errors.New("Failed to initialize native target")
-
-// InitializeNativeTarget - The main program should call this function to
-// initialize the native target corresponding to the host. This is useful
-// for JIT applications to ensure that the target gets linked in correctly.
-func InitializeNativeTarget() error {
-	fail := C.LLVMInitializeNativeTarget()
-	if fail != 0 {
-		return initializeNativeTargetError
-	}
-	return nil
-}
-
-func InitializeNativeAsmPrinter() error {
-	fail := C.LLVMInitializeNativeAsmPrinter()
-	if fail != 0 {
-		return initializeNativeTargetError
-	}
-	return nil
-}
-
-//-------------------------------------------------------------------------
-// llvm.TargetData
-//-------------------------------------------------------------------------
-
-// Creates target data from a target layout string.
-// See the constructor llvm::TargetData::TargetData.
-func NewTargetData(rep string) (td TargetData) {
-	crep := C.CString(rep)
-	defer C.free(unsafe.Pointer(crep))
-	td.C = C.LLVMCreateTargetData(crep)
-	return
-}
-
-// Converts target data to a target layout string. The string must be disposed
-// with LLVMDisposeMessage.
-// See the constructor llvm::TargetData::TargetData.
-func (td TargetData) String() (s string) {
-	cmsg := C.LLVMCopyStringRepOfTargetData(td.C)
-	s = C.GoString(cmsg)
-	C.LLVMDisposeMessage(cmsg)
-	return
-}
-
-// Returns the byte order of a target, either BigEndian or LittleEndian.
-// See the method llvm::TargetData::isLittleEndian.
-func (td TargetData) ByteOrder() ByteOrdering { return ByteOrdering(C.LLVMByteOrder(td.C)) }
-
-// Returns the pointer size in bytes for a target.
-// See the method llvm::TargetData::getPointerSize.
-func (td TargetData) PointerSize() int { return int(C.LLVMPointerSize(td.C)) }
-
-// Returns the integer type that is the same size as a pointer on a target.
-// See the method llvm::TargetData::getIntPtrType.
-func (td TargetData) IntPtrType() (t Type) { t.C = C.LLVMIntPtrType(td.C); return }
-
-// Computes the size of a type in bytes for a target.
-// See the method llvm::TargetData::getTypeSizeInBits.
-func (td TargetData) TypeSizeInBits(t Type) uint64 {
-	return uint64(C.LLVMSizeOfTypeInBits(td.C, t.C))
-}
-
-// Computes the storage size of a type in bytes for a target.
-// See the method llvm::TargetData::getTypeStoreSize.
-func (td TargetData) TypeStoreSize(t Type) uint64 {
-	return uint64(C.LLVMStoreSizeOfType(td.C, t.C))
-}
-
-// Computes the ABI size of a type in bytes for a target.
-// See the method llvm::TargetData::getTypeAllocSize.
-func (td TargetData) TypeAllocSize(t Type) uint64 {
-	return uint64(C.LLVMABISizeOfType(td.C, t.C))
-}
-
-// Computes the ABI alignment of a type in bytes for a target.
-// See the method llvm::TargetData::getABITypeAlignment.
-func (td TargetData) ABITypeAlignment(t Type) int {
-	return int(C.LLVMABIAlignmentOfType(td.C, t.C))
-}
-
-// Computes the call frame alignment of a type in bytes for a target.
-// See the method llvm::TargetData::getCallFrameTypeAlignment.
-func (td TargetData) CallFrameTypeAlignment(t Type) int {
-	return int(C.LLVMCallFrameAlignmentOfType(td.C, t.C))
-}
-
-// Computes the preferred alignment of a type in bytes for a target.
-// See the method llvm::TargetData::getPrefTypeAlignment.
-func (td TargetData) PrefTypeAlignment(t Type) int {
-	return int(C.LLVMPreferredAlignmentOfType(td.C, t.C))
-}
-
-// Computes the preferred alignment of a global variable in bytes for a target.
-// See the method llvm::TargetData::getPreferredAlignment.
-func (td TargetData) PreferredAlignment(g Value) int {
-	return int(C.LLVMPreferredAlignmentOfGlobal(td.C, g.C))
-}
-
-// Computes the structure element that contains the byte offset for a target.
-// See the method llvm::StructLayout::getElementContainingOffset.
-func (td TargetData) ElementContainingOffset(t Type, offset uint64) int {
-	return int(C.LLVMElementAtOffset(td.C, t.C, C.ulonglong(offset)))
-}
-
-// Computes the byte offset of the indexed struct element for a target.
-// See the method llvm::StructLayout::getElementOffset.
-func (td TargetData) ElementOffset(t Type, element int) uint64 {
-	return uint64(C.LLVMOffsetOfElement(td.C, t.C, C.unsigned(element)))
-}
-
-// Deallocates a TargetData.
-// See the destructor llvm::TargetData::~TargetData.
-func (td TargetData) Dispose() { C.LLVMDisposeTargetData(td.C) }
-
-//-------------------------------------------------------------------------
-// llvm.Target
-//-------------------------------------------------------------------------
-
-func FirstTarget() Target {
-	return Target{C.LLVMGetFirstTarget()}
-}
-
-func (t Target) NextTarget() Target {
-	return Target{C.LLVMGetNextTarget(t.C)}
-}
-
-func GetTargetFromTriple(triple string) (t Target, err error) {
-	var errstr *C.char
-	ctriple := C.CString(triple)
-	defer C.free(unsafe.Pointer(ctriple))
-	fail := C.LLVMGetTargetFromTriple(ctriple, &t.C, &errstr)
-	if fail != 0 {
-		err = errors.New(C.GoString(errstr))
-		C.free(unsafe.Pointer(errstr))
-	}
-	return
-}
-
-func (t Target) Name() string {
-	return C.GoString(C.LLVMGetTargetName(t.C))
-}
-
-func (t Target) Description() string {
-	return C.GoString(C.LLVMGetTargetDescription(t.C))
-}
-
-//-------------------------------------------------------------------------
-// llvm.TargetMachine
-//-------------------------------------------------------------------------
-
-// CreateTargetMachine creates a new TargetMachine.
-func (t Target) CreateTargetMachine(Triple string, CPU string, Features string,
-	Level CodeGenOptLevel, Reloc RelocMode,
-	CodeModel CodeModel) (tm TargetMachine) {
-	cTriple := C.CString(Triple)
-	defer C.free(unsafe.Pointer(cTriple))
-	cCPU := C.CString(CPU)
-	defer C.free(unsafe.Pointer(cCPU))
-	cFeatures := C.CString(Features)
-	defer C.free(unsafe.Pointer(cFeatures))
-	tm.C = C.LLVMCreateTargetMachine(t.C, cTriple, cCPU, cFeatures,
-		C.LLVMCodeGenOptLevel(Level),
-		C.LLVMRelocMode(Reloc),
-		C.LLVMCodeModel(CodeModel))
-	return
-}
-
-// CreateTargetData returns a new TargetData describing the TargetMachine's
-// data layout. The returned TargetData is owned by the caller, who is
-// responsible for disposing of it by calling the TargetData.Dispose method.
-func (tm TargetMachine) CreateTargetData() TargetData {
-	return TargetData{C.LLVMCreateTargetDataLayout(tm.C)}
-}
-
-// Triple returns the triple describing the machine (arch-vendor-os).
-func (tm TargetMachine) Triple() string {
-	cstr := C.LLVMGetTargetMachineTriple(tm.C)
-	return C.GoString(cstr)
-}
-
-func (tm TargetMachine) EmitToMemoryBuffer(m Module, ft CodeGenFileType) (MemoryBuffer, error) {
-	var errstr *C.char
-	var mb MemoryBuffer
-	fail := C.LLVMTargetMachineEmitToMemoryBuffer(tm.C, m.C, C.LLVMCodeGenFileType(ft), &errstr, &mb.C)
-	if fail != 0 {
-		err := errors.New(C.GoString(errstr))
-		C.free(unsafe.Pointer(errstr))
-		return MemoryBuffer{}, err
-	}
-	return mb, nil
-}
-
-func (tm TargetMachine) AddAnalysisPasses(pm PassManager) {
-	C.LLVMAddAnalysisPasses(tm.C, pm.C)
-}
-
-// Dispose releases resources related to the TargetMachine.
-func (tm TargetMachine) Dispose() {
-	C.LLVMDisposeTargetMachine(tm.C)
-}
-
-func DefaultTargetTriple() (triple string) {
-	cTriple := C.LLVMGetDefaultTargetTriple()
-	defer C.free(unsafe.Pointer(cTriple))
-	triple = C.GoString(cTriple)
-	return
-}
diff --git a/gnu/llvm/llvm/bindings/go/llvm/transforms_coroutines.go b/gnu/llvm/llvm/bindings/go/llvm/transforms_coroutines.go
deleted file mode 100644
index c18c3fe936c..00000000000
--- a/gnu/llvm/llvm/bindings/go/llvm/transforms_coroutines.go
+++ /dev/null
@@ -1,23 +0,0 @@
-//===- transforms_coroutines.go - Bindings for coroutines -----------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines bindings for the coroutines component.
-//
-//===----------------------------------------------------------------------===//
-
-package llvm
-
-/*
-#include "llvm-c/Transforms/Coroutines.h"
-*/
-import "C"
-
-func (pm PassManager) AddCoroEarlyPass()   { C.LLVMAddCoroEarlyPass(pm.C) }
-func (pm PassManager) AddCoroSplitPass()   { C.LLVMAddCoroSplitPass(pm.C) }
-func (pm PassManager) AddCoroElidePass()   { C.LLVMAddCoroElidePass(pm.C) }
-func (pm PassManager) AddCoroCleanupPass() { C.LLVMAddCoroCleanupPass(pm.C) }
diff --git a/gnu/llvm/llvm/bindings/go/llvm/transforms_instrumentation.go b/gnu/llvm/llvm/bindings/go/llvm/transforms_instrumentation.go
deleted file mode 100644
index 68e0ed69679..00000000000
--- a/gnu/llvm/llvm/bindings/go/llvm/transforms_instrumentation.go
+++ /dev/null
@@ -1,45 +0,0 @@
-//===- transforms_instrumentation.go - Bindings for instrumentation -------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines bindings for the instrumentation component.
-//
-//===----------------------------------------------------------------------===//
-
-package llvm
-
-/*
-#include "InstrumentationBindings.h"
-#include <stdlib.h>
-*/
-import "C"
-import "unsafe"
-
-func (pm PassManager) AddAddressSanitizerFunctionPass() {
-	C.LLVMAddAddressSanitizerFunctionPass(pm.C)
-}
-
-func (pm PassManager) AddAddressSanitizerModulePass() {
-	C.LLVMAddAddressSanitizerModulePass(pm.C)
-}
-
-func (pm PassManager) AddThreadSanitizerPass() {
-	C.LLVMAddThreadSanitizerPass(pm.C)
-}
-
-func (pm PassManager) AddMemorySanitizerLegacyPassPass() {
-	C.LLVMAddMemorySanitizerLegacyPassPass(pm.C)
-}
-
-func (pm PassManager) AddDataFlowSanitizerPass(abilist []string) {
-	abiliststrs := make([]*C.char, len(abilist))
-	for i, arg := range abilist {
-		abiliststrs[i] = C.CString(arg)
-		defer C.free(unsafe.Pointer(abiliststrs[i]))
-	}
-	C.LLVMAddDataFlowSanitizerPass(pm.C, C.int(len(abilist)), &abiliststrs[0])
-}
diff --git a/gnu/llvm/llvm/bindings/go/llvm/transforms_ipo.go b/gnu/llvm/llvm/bindings/go/llvm/transforms_ipo.go
deleted file mode 100644
index 8a158f208be..00000000000
--- a/gnu/llvm/llvm/bindings/go/llvm/transforms_ipo.go
+++ /dev/null
@@ -1,40 +0,0 @@
-//===- transforms_ipo.go - Bindings for ipo -------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines bindings for the ipo component.
-//
-//===----------------------------------------------------------------------===//
-
-package llvm
-
-/*
-#include "llvm-c/Transforms/IPO.h"
-*/
-import "C"
-
-// helpers
-func boolToUnsigned(b bool) C.unsigned {
-	if b {
-		return 1
-	}
-	return 0
-}
-
-func (pm PassManager) AddArgumentPromotionPass()     { C.LLVMAddArgumentPromotionPass(pm.C) }
-func (pm PassManager) AddConstantMergePass()         { C.LLVMAddConstantMergePass(pm.C) }
-func (pm PassManager) AddDeadArgEliminationPass()    { C.LLVMAddDeadArgEliminationPass(pm.C) }
-func (pm PassManager) AddFunctionAttrsPass()         { C.LLVMAddFunctionAttrsPass(pm.C) }
-func (pm PassManager) AddFunctionInliningPass()      { C.LLVMAddFunctionInliningPass(pm.C) }
-func (pm PassManager) AddGlobalDCEPass()             { C.LLVMAddGlobalDCEPass(pm.C) }
-func (pm PassManager) AddGlobalOptimizerPass()       { C.LLVMAddGlobalOptimizerPass(pm.C) }
-func (pm PassManager) AddPruneEHPass()               { C.LLVMAddPruneEHPass(pm.C) }
-func (pm PassManager) AddIPSCCPPass()                { C.LLVMAddIPSCCPPass(pm.C) }
-func (pm PassManager) AddInternalizePass(allButMain bool) {
-	C.LLVMAddInternalizePass(pm.C, boolToUnsigned(allButMain))
-}
-func (pm PassManager) AddStripDeadPrototypesPass() { C.LLVMAddStripDeadPrototypesPass(pm.C) }
diff --git a/gnu/llvm/llvm/bindings/go/llvm/transforms_pmbuilder.go b/gnu/llvm/llvm/bindings/go/llvm/transforms_pmbuilder.go
deleted file mode 100644
index badd148c195..00000000000
--- a/gnu/llvm/llvm/bindings/go/llvm/transforms_pmbuilder.go
+++ /dev/null
@@ -1,72 +0,0 @@
-//===- transforms_pmbuilder.go - Bindings for PassManagerBuilder ----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines bindings for the PassManagerBuilder class.
-//
-//===----------------------------------------------------------------------===//
-
-package llvm
-
-/*
-#include "llvm-c/Transforms/PassManagerBuilder.h"
-#include "llvm-c/Transforms/Coroutines.h"
-*/
-import "C"
-
-type PassManagerBuilder struct {
-	C C.LLVMPassManagerBuilderRef
-}
-
-func NewPassManagerBuilder() (pmb PassManagerBuilder) {
-	pmb.C = C.LLVMPassManagerBuilderCreate()
-	return
-}
-
-func (pmb PassManagerBuilder) SetOptLevel(level int) {
-	C.LLVMPassManagerBuilderSetOptLevel(pmb.C, C.uint(level))
-}
-
-func (pmb PassManagerBuilder) SetSizeLevel(level int) {
-	C.LLVMPassManagerBuilderSetSizeLevel(pmb.C, C.uint(level))
-}
-
-func (pmb PassManagerBuilder) Populate(pm PassManager) {
-	C.LLVMPassManagerBuilderPopulateModulePassManager(pmb.C, pm.C)
-}
-
-func (pmb PassManagerBuilder) PopulateFunc(pm PassManager) {
-	C.LLVMPassManagerBuilderPopulateFunctionPassManager(pmb.C, pm.C)
-}
-
-func (pmb PassManagerBuilder) PopulateLTOPassManager(pm PassManager, internalize bool, runInliner bool) {
-	C.LLVMPassManagerBuilderPopulateLTOPassManager(pmb.C, pm.C, boolToLLVMBool(internalize), boolToLLVMBool(runInliner))
-}
-
-func (pmb PassManagerBuilder) Dispose() {
-	C.LLVMPassManagerBuilderDispose(pmb.C)
-}
-
-func (pmb PassManagerBuilder) SetDisableUnitAtATime(val bool) {
-	C.LLVMPassManagerBuilderSetDisableUnitAtATime(pmb.C, boolToLLVMBool(val))
-}
-
-func (pmb PassManagerBuilder) SetDisableUnrollLoops(val bool) {
-	C.LLVMPassManagerBuilderSetDisableUnrollLoops(pmb.C, boolToLLVMBool(val))
-}
-
-func (pmb PassManagerBuilder) SetDisableSimplifyLibCalls(val bool) {
-	C.LLVMPassManagerBuilderSetDisableSimplifyLibCalls(pmb.C, boolToLLVMBool(val))
-}
-
-func (pmb PassManagerBuilder) UseInlinerWithThreshold(threshold uint) {
-	C.LLVMPassManagerBuilderUseInlinerWithThreshold(pmb.C, C.uint(threshold))
-}
-
-func (pmb PassManagerBuilder) AddCoroutinePassesToExtensionPoints() {
-	C.LLVMPassManagerBuilderAddCoroutinePassesToExtensionPoints(pmb.C);
-}
diff --git a/gnu/llvm/llvm/bindings/go/llvm/transforms_scalar.go b/gnu/llvm/llvm/bindings/go/llvm/transforms_scalar.go
deleted file mode 100644
index d1b54bd2a19..00000000000
--- a/gnu/llvm/llvm/bindings/go/llvm/transforms_scalar.go
+++ /dev/null
@@ -1,44 +0,0 @@
-//===- transforms_scalar.go - Bindings for scalaropts ---------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines bindings for the scalaropts component.
-//
-//===----------------------------------------------------------------------===//
-
-package llvm
-
-/*
-#include "llvm-c/Transforms/Scalar.h"
-#include "llvm-c/Transforms/Utils.h"
-*/
-import "C"
-
-func (pm PassManager) AddAggressiveDCEPass()           { C.LLVMAddAggressiveDCEPass(pm.C) }
-func (pm PassManager) AddCFGSimplificationPass()       { C.LLVMAddCFGSimplificationPass(pm.C) }
-func (pm PassManager) AddDeadStoreEliminationPass()    { C.LLVMAddDeadStoreEliminationPass(pm.C) }
-func (pm PassManager) AddGVNPass()                     { C.LLVMAddGVNPass(pm.C) }
-func (pm PassManager) AddIndVarSimplifyPass()          { C.LLVMAddIndVarSimplifyPass(pm.C) }
-func (pm PassManager) AddInstructionCombiningPass()    { C.LLVMAddInstructionCombiningPass(pm.C) }
-func (pm PassManager) AddJumpThreadingPass()           { C.LLVMAddJumpThreadingPass(pm.C) }
-func (pm PassManager) AddLICMPass()                    { C.LLVMAddLICMPass(pm.C) }
-func (pm PassManager) AddLoopDeletionPass()            { C.LLVMAddLoopDeletionPass(pm.C) }
-func (pm PassManager) AddLoopRotatePass()              { C.LLVMAddLoopRotatePass(pm.C) }
-func (pm PassManager) AddLoopUnrollPass()              { C.LLVMAddLoopUnrollPass(pm.C) }
-func (pm PassManager) AddLoopUnswitchPass()            { C.LLVMAddLoopUnswitchPass(pm.C) }
-func (pm PassManager) AddMemCpyOptPass()               { C.LLVMAddMemCpyOptPass(pm.C) }
-func (pm PassManager) AddPromoteMemoryToRegisterPass() { C.LLVMAddPromoteMemoryToRegisterPass(pm.C) }
-func (pm PassManager) AddReassociatePass()             { C.LLVMAddReassociatePass(pm.C) }
-func (pm PassManager) AddSCCPPass()                    { C.LLVMAddSCCPPass(pm.C) }
-func (pm PassManager) AddScalarReplAggregatesPass()    { C.LLVMAddScalarReplAggregatesPass(pm.C) }
-func (pm PassManager) AddScalarReplAggregatesPassWithThreshold(threshold int) {
-	C.LLVMAddScalarReplAggregatesPassWithThreshold(pm.C, C.int(threshold))
-}
-func (pm PassManager) AddSimplifyLibCallsPass()       { C.LLVMAddSimplifyLibCallsPass(pm.C) }
-func (pm PassManager) AddTailCallEliminationPass()    { C.LLVMAddTailCallEliminationPass(pm.C) }
-func (pm PassManager) AddDemoteMemoryToRegisterPass() { C.LLVMAddDemoteMemoryToRegisterPass(pm.C) }
-func (pm PassManager) AddVerifierPass()               { C.LLVMAddVerifierPass(pm.C) }
diff --git a/gnu/llvm/llvm/bindings/go/llvm/version.go b/gnu/llvm/llvm/bindings/go/llvm/version.go
deleted file mode 100644
index 1183fe431b9..00000000000
--- a/gnu/llvm/llvm/bindings/go/llvm/version.go
+++ /dev/null
@@ -1,20 +0,0 @@
-//===- version.go - LLVM version info -------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines LLVM version information.
-//
-//===----------------------------------------------------------------------===//
-
-package llvm
-
-/*
-#include "llvm/Config/llvm-config.h"
-*/
-import "C"
-
-const Version = C.LLVM_VERSION_STRING
diff --git a/gnu/llvm/llvm/cmake/modules/AddLLVMDefinitions.cmake b/gnu/llvm/llvm/cmake/modules/AddLLVMDefinitions.cmake
deleted file mode 100644
index dab16236d3e..00000000000
--- a/gnu/llvm/llvm/cmake/modules/AddLLVMDefinitions.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-# There is no clear way of keeping track of compiler command-line
-# options chosen via `add_definitions', so we need our own method for
-# using it on tools/llvm-config/CMakeLists.txt.
-
-# Beware that there is no implementation of remove_llvm_definitions.
-
-macro(add_llvm_definitions)
-  # We don't want no semicolons on LLVM_DEFINITIONS:
-  foreach(arg ${ARGN})
-    if(DEFINED LLVM_DEFINITIONS)
-      set(LLVM_DEFINITIONS "${LLVM_DEFINITIONS} ${arg}")
-    else()
-      set(LLVM_DEFINITIONS ${arg})
-    endif()
-  endforeach(arg)
-  add_definitions( ${ARGN} )
-endmacro(add_llvm_definitions)
diff --git a/gnu/llvm/llvm/cmake/modules/FindGRPC.cmake b/gnu/llvm/llvm/cmake/modules/FindGRPC.cmake
deleted file mode 100644
index e058f544cb2..00000000000
--- a/gnu/llvm/llvm/cmake/modules/FindGRPC.cmake
+++ /dev/null
@@ -1,146 +0,0 @@
-option(ENABLE_GRPC_REFLECTION "Link clangd-index-server to gRPC Reflection library" OFF)
-
-# FIXME(kirillbobyrev): Check if gRPC and Protobuf headers can be included at
-# configure time.
-find_package(Threads REQUIRED)
-if (GRPC_INSTALL_PATH)
-  # This setup requires gRPC to be built from sources using CMake and installed
-  # to ${GRPC_INSTALL_PATH} via -DCMAKE_INSTALL_PREFIX=${GRPC_INSTALL_PATH}.
-  # Libraries will be linked according to gRPC build policy which generates
-  # static libraries when BUILD_SHARED_LIBS is Off and dynamic libraries when
-  # it's On (NOTE: This is a variable passed to gRPC CMake build invocation,
-  # LLVM's BUILD_SHARED_LIBS has no effect).
-  set(protobuf_MODULE_COMPATIBLE TRUE)
-  find_package(Protobuf CONFIG REQUIRED HINTS ${GRPC_INSTALL_PATH})
-  message(STATUS "Using protobuf ${Protobuf_VERSION}")
-  find_package(gRPC CONFIG REQUIRED HINTS ${GRPC_INSTALL_PATH})
-  message(STATUS "Using gRPC ${gRPC_VERSION}")
-
-  include_directories(${Protobuf_INCLUDE_DIRS})
-
-  # gRPC CMake CONFIG gives the libraries slightly odd names, make them match
-  # the conventional system-installed names.
-  set_target_properties(protobuf::libprotobuf PROPERTIES IMPORTED_GLOBAL TRUE)
-  add_library(protobuf ALIAS protobuf::libprotobuf)
-  set_target_properties(gRPC::grpc++ PROPERTIES IMPORTED_GLOBAL TRUE)
-  add_library(grpc++ ALIAS gRPC::grpc++)
-  if (ENABLE_GRPC_REFLECTION)
-    set_target_properties(gRPC::grpc++_reflection PROPERTIES IMPORTED_GLOBAL TRUE)
-    add_library(grpc++_reflection ALIAS gRPC::grpc++_reflection)
-  endif()
-
-  set(GRPC_CPP_PLUGIN $<TARGET_FILE:gRPC::grpc_cpp_plugin>)
-  set(PROTOC ${Protobuf_PROTOC_EXECUTABLE})
-else()
-  # This setup requires system-installed gRPC and Protobuf.
-  # We always link dynamically in this mode. While the static libraries are
-  # usually installed, the CMake files telling us *which* static libraries to
-  # link are not.
-  if (NOT BUILD_SHARED_LIBS)
-    message(NOTICE "gRPC and Protobuf will be linked dynamically. If you want static linking, build gRPC from sources with -DBUILD_SHARED_LIBS=Off.")
-  endif()
-  find_program(GRPC_CPP_PLUGIN grpc_cpp_plugin)
-  find_program(PROTOC protoc)
-  if (NOT GRPC_CPP_PLUGIN OR NOT PROTOC)
-    message(FATAL_ERROR "gRPC C++ Plugin and Protoc must be on $PATH for Clangd remote index build.")
-  endif()
-  # On macOS the libraries are typically installed via Homebrew and are not on
-  # the system path.
-  set(GRPC_OPTS "")
-  set(PROTOBUF_OPTS "")
-  if (${APPLE})
-    find_program(HOMEBREW brew)
-    # If Homebrew is not found, the user might have installed libraries
-    # manually. Fall back to the system path.
-    if (HOMEBREW)
-      execute_process(COMMAND ${HOMEBREW} --prefix grpc
-        OUTPUT_VARIABLE GRPC_HOMEBREW_PATH
-        RESULT_VARIABLE GRPC_HOMEBREW_RETURN_CODE
-        OUTPUT_STRIP_TRAILING_WHITESPACE)
-      execute_process(COMMAND ${HOMEBREW} --prefix protobuf
-        OUTPUT_VARIABLE PROTOBUF_HOMEBREW_PATH
-        RESULT_VARIABLE PROTOBUF_HOMEBREW_RETURN_CODE
-        OUTPUT_STRIP_TRAILING_WHITESPACE)
-      # If either library is not installed via Homebrew, fall back to the
-      # system path.
-      if (GRPC_HOMEBREW_RETURN_CODE EQUAL "0")
-        include_directories(${GRPC_HOMEBREW_PATH}/include)
-        list(APPEND GRPC_OPTS PATHS ${GRPC_HOMEBREW_PATH}/lib NO_DEFAULT_PATH)
-      endif()
-      if (PROTOBUF_HOMEBREW_RETURN_CODE EQUAL "0")
-        include_directories(${PROTOBUF_HOMEBREW_PATH}/include)
-        list(APPEND PROTOBUF_OPTS PATHS ${PROTOBUF_HOMEBREW_PATH}/lib NO_DEFAULT_PATH)
-      endif()
-    endif()
-  endif()
-  find_library(GRPC_LIBRARY grpc++ $GRPC_OPTS REQUIRED)
-  add_library(grpc++ UNKNOWN IMPORTED GLOBAL)
-  message(STATUS "Using grpc++: " ${GRPC_LIBRARY})
-  set_target_properties(grpc++ PROPERTIES IMPORTED_LOCATION ${GRPC_LIBRARY})
-  if (ENABLE_GRPC_REFLECTION)
-    find_library(GRPC_REFLECTION_LIBRARY grpc++_reflection $GRPC_OPTS REQUIRED)
-    add_library(grpc++_reflection UNKNOWN IMPORTED GLOBAL)
-    set_target_properties(grpc++_reflection PROPERTIES IMPORTED_LOCATION ${GRPC_REFLECTION_LIBRARY})
-  endif()
-  find_library(PROTOBUF_LIBRARY protobuf $PROTOBUF_OPTS REQUIRED)
-  message(STATUS "Using protobuf: " ${PROTOBUF_LIBRARY})
-  add_library(protobuf UNKNOWN IMPORTED GLOBAL)
-  set_target_properties(protobuf PROPERTIES IMPORTED_LOCATION ${PROTOBUF_LIBRARY})
-endif()
-
-if (ENABLE_GRPC_REFLECTION)
-  set(REFLECTION_LIBRARY grpc++_reflection)
-endif()
-
-# Proto headers are generated in ${CMAKE_CURRENT_BINARY_DIR}.
-# Libraries that use these headers should adjust the include path.
-# If the "GRPC" argument is given, services are also generated.
-# The DEPENDS list should name *.proto source files that are imported.
-# They may be relative to the source dir or absolute (for generated protos).
-function(generate_protos LibraryName ProtoFile)
-  cmake_parse_arguments(PARSE_ARGV 2 PROTO "GRPC" "" "DEPENDS")
-  get_filename_component(ProtoSourceAbsolutePath "${CMAKE_CURRENT_SOURCE_DIR}/${ProtoFile}" ABSOLUTE)
-  get_filename_component(ProtoSourcePath ${ProtoSourceAbsolutePath} PATH)
-  get_filename_component(Basename ${ProtoSourceAbsolutePath} NAME_WLE)
-
-  set(GeneratedProtoSource "${CMAKE_CURRENT_BINARY_DIR}/${Basename}.pb.cc")
-  set(GeneratedProtoHeader "${CMAKE_CURRENT_BINARY_DIR}/${Basename}.pb.h")
-  set(Flags
-    --cpp_out="${CMAKE_CURRENT_BINARY_DIR}"
-    --proto_path="${ProtoSourcePath}")
-  if (PROTO_GRPC)
-    list(APPEND Flags
-      --grpc_out="${CMAKE_CURRENT_BINARY_DIR}"
-      --plugin=protoc-gen-grpc="${GRPC_CPP_PLUGIN}")
-    list(APPEND GeneratedProtoSource "${CMAKE_CURRENT_BINARY_DIR}/${Basename}.grpc.pb.cc")
-    list(APPEND GeneratedProtoHeader "${CMAKE_CURRENT_BINARY_DIR}/${Basename}.grpc.pb.h")
-  endif()
-  add_custom_command(
-        OUTPUT ${GeneratedProtoSource} ${GeneratedProtoHeader}
-        COMMAND ${PROTOC}
-        ARGS ${Flags} "${ProtoSourceAbsolutePath}"
-        DEPENDS "${ProtoSourceAbsolutePath}")
-
-  add_clang_library(${LibraryName} ${GeneratedProtoSource}
-    PARTIAL_SOURCES_INTENDED
-    LINK_LIBS PUBLIC grpc++ protobuf)
-
-  # Ensure dependency headers are generated before dependent protos are built.
-  # DEPENDS arg is a list of "Foo.proto". While they're logically relative to
-  # the source dir, the generated headers we need are in the binary dir.
-  foreach(ImportedProto IN LISTS PROTO_DEPENDS)
-    # Foo.proto -> Foo.pb.h
-    STRING(REGEX REPLACE "\\.proto$" ".pb.h" ImportedHeader "${ImportedProto}")
-    # Foo.pb.h -> ${CMAKE_CURRENT_BINARY_DIR}/Foo.pb.h
-    get_filename_component(ImportedHeader "${ImportedHeader}"
-      ABSOLUTE
-      BASE_DIR "${CMAKE_CURRENT_BINARY_DIR}")
-    # Compilation of each generated source depends on ${BINARY}/Foo.pb.h.
-    foreach(Generated IN LISTS GeneratedProtoSource)
-      # FIXME: CMake docs suggest OBJECT_DEPENDS isn't needed, but I can't get
-      #        the recommended add_dependencies() approach to work.
-      set_source_files_properties("${Generated}"
-        PROPERTIES OBJECT_DEPENDS "${ImportedHeader}")
-    endforeach(Generated)
-  endforeach(ImportedProto)
-endfunction()
diff --git a/gnu/llvm/llvm/cmake/modules/GetLibraryName.cmake b/gnu/llvm/llvm/cmake/modules/GetLibraryName.cmake
index 13c0080671a..c226b57dc8a 100644
--- a/gnu/llvm/llvm/cmake/modules/GetLibraryName.cmake
+++ b/gnu/llvm/llvm/cmake/modules/GetLibraryName.cmake
@@ -2,7 +2,7 @@
 function(get_library_name path name)
   get_filename_component(path ${path} NAME)
   set(prefixes ${CMAKE_FIND_LIBRARY_PREFIXES})
-  set(suffixes ${CMAKE_FIND_LIBRARY_SUFFIXES})
+  set(suffixes ${CMAKE_FIND_LIBRARY_SUFFIXES} ".so.[0-9]+.[0-9]+")
   list(FILTER prefixes EXCLUDE REGEX "^\\s*$")
   list(FILTER suffixes EXCLUDE REGEX "^\\s*$")
   if(prefixes)
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx1011_src32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx1011_src32_0.rst
deleted file mode 100644
index 8d82f4171f6..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx1011_src32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid1011_src32_0:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`lds_direct<amdgpu_synid_lds_direct>`, :ref:`constant<amdgpu_synid_constant>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx1011_src32_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx1011_src32_1.rst
deleted file mode 100644
index b923912d041..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx1011_src32_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid1011_src32_1:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx1011_src32_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx1011_src32_2.rst
deleted file mode 100644
index 6c62701709a..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx1011_src32_2.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid1011_src32_2:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`lds_direct<amdgpu_synid_lds_direct>`, :ref:`iconst<amdgpu_synid_iconst>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx1011_src32_3.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx1011_src32_3.rst
deleted file mode 100644
index 00ffe231756..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx1011_src32_3.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid1011_src32_3:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`iconst<amdgpu_synid_iconst>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx1011_type_dev.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx1011_type_dev.rst
deleted file mode 100644
index c7ddb82757e..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx1011_type_dev.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid1011_type_dev:
-
-Type deviation
-===========================
-
-*Type* of this operand differs from *type* :ref:`implied by the opcode<amdgpu_syn_instruction_type>`. This tag specifies actual operand *type*.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx1011_vdst32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx1011_vdst32_0.rst
deleted file mode 100644
index 115b8527fb6..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx1011_vdst32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid1011_vdst32_0:
-
-vdst
-===========================
-
-Instruction output.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx1011_vsrc32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx1011_vsrc32_0.rst
deleted file mode 100644
index be63c654949..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx1011_vsrc32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid1011_vsrc32_0:
-
-vsrc
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_addr_buf.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_addr_buf.rst
deleted file mode 100644
index bd57e9e2fcd..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_addr_buf.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_addr_buf:
-
-vaddr
-===========================
-
-This is an optional operand which may specify offset and/or index.
-
-*Size:* 0, 1 or 2 dwords. Size is controlled by modifiers :ref:`offen<amdgpu_synid_offen>` and :ref:`idxen<amdgpu_synid_idxen>`:
-
-* If only :ref:`idxen<amdgpu_synid_idxen>` is specified, this operand supplies an index. Size is 1 dword.
-* If only :ref:`offen<amdgpu_synid_offen>` is specified, this operand supplies an offset. Size is 1 dword.
-* If both modifiers are specified, index is in the first register and offset is in the second. Size is 2 dwords.
-* If none of these modifiers are specified, this operand must be set to :ref:`off<amdgpu_synid_off>`.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`off<amdgpu_synid_off>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_addr_ds.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_addr_ds.rst
deleted file mode 100644
index b31862f2ec7..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_addr_ds.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_addr_ds:
-
-vaddr
-===========================
-
-An offset from the start of GDS/LDS memory.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_addr_flat.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_addr_flat.rst
deleted file mode 100644
index cd780ca0cbe..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_addr_flat.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_addr_flat:
-
-vaddr
-===========================
-
-A 64-bit flat address.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_addr_mimg.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_addr_mimg.rst
deleted file mode 100644
index 7555e2836ee..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_addr_mimg.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_addr_mimg:
-
-vaddr
-===========================
-
-Image address which includes from one to four dimensional coordinates and other data used to locate a position in the image.
-
-This operand may be specified using either :ref:`standard VGPR syntax<amdgpu_synid_v>` or special :ref:`NSA VGPR syntax<amdgpu_synid_nsa>`.
-
-*Size:* 1-13 dwords. Actual size depends on syntax, opcode, :ref:`dim<amdgpu_synid_dim>` and :ref:`a16<amdgpu_synid_a16>`.
-
-* If specified using :ref:`NSA VGPR syntax<amdgpu_synid_nsa>`, the size is 1-13 dwords.
-* If specified using :ref:`standard VGPR syntax<amdgpu_synid_v>`, the size is 1, 2, 3, 4, 8 or 16 dwords. Note that assembler currently supports a limited range of register sequences.
-
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_base_smem_addr.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_base_smem_addr.rst
deleted file mode 100644
index 9d5211432f9..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_base_smem_addr.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_base_smem_addr:
-
-sbase
-===========================
-
-A 64-bit base address for scalar memory operations.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_base_smem_buf.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_base_smem_buf.rst
deleted file mode 100644
index 00e987d7bb4..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_base_smem_buf.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_base_smem_buf:
-
-sbase
-===========================
-
-A 128-bit buffer resource constant for scalar memory operations which provides a base address, a size and a stride.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_base_smem_scratch.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_base_smem_scratch.rst
deleted file mode 100644
index 2b7e8b4cd4b..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_base_smem_scratch.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_base_smem_scratch:
-
-sbase
-===========================
-
-This operand is ignored by H/W and :ref:`flat_scratch<amdgpu_synid_flat_scratch>` is supplied instead.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_bimm16.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_bimm16.rst
deleted file mode 100644
index b871ef27f96..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_bimm16.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_bimm16:
-
-imm16
-===========================
-
-A 16-bit :ref:`integer_number<amdgpu_synid_integer_number>` or an :ref:`absolute_expression<amdgpu_synid_absolute_expression>`. The value must be in the range -32768..65535.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_bimm32.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_bimm32.rst
deleted file mode 100644
index ebcc691ee25..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_bimm32.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_bimm32:
-
-imm32
-===========================
-
-An :ref:`integer_number<amdgpu_synid_integer_number>` or an :ref:`absolute_expression<amdgpu_synid_absolute_expression>`. The value is truncated to 32 bits.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_data_buf_atomic128.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_data_buf_atomic128.rst
deleted file mode 100644
index 3ca9fb9c3ea..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_data_buf_atomic128.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_data_buf_atomic128:
-
-vdata
-===========================
-
-Input data for an atomic instruction.
-
-Optionally may serve as an output data:
-
-* If :ref:`glc<amdgpu_synid_glc>` is specified, gets the memory value before the operation.
-
-*Size:* 4 dwords by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_data_buf_atomic32.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_data_buf_atomic32.rst
deleted file mode 100644
index a8e6d9fd61d..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_data_buf_atomic32.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_data_buf_atomic32:
-
-vdata
-===========================
-
-Input data for an atomic instruction.
-
-Optionally may serve as an output data:
-
-* If :ref:`glc<amdgpu_synid_glc>` is specified, gets the memory value before the operation.
-
-*Size:* 1 dword by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_data_buf_atomic64.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_data_buf_atomic64.rst
deleted file mode 100644
index 3840cd5d92e..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_data_buf_atomic64.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_data_buf_atomic64:
-
-vdata
-===========================
-
-Input data for an atomic instruction.
-
-Optionally may serve as an output data:
-
-* If :ref:`glc<amdgpu_synid_glc>` is specified, gets the memory value before the operation.
-
-*Size:* 2 dwords by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_data_mimg_atomic_cmp.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_data_mimg_atomic_cmp.rst
deleted file mode 100644
index 6b5cd681435..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_data_mimg_atomic_cmp.rst
+++ /dev/null
@@ -1,27 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_data_mimg_atomic_cmp:
-
-vdata
-===========================
-
-Input data for an atomic instruction.
-
-Optionally may serve as an output data:
-
-* If :ref:`glc<amdgpu_synid_glc>` is specified, gets the memory value before the operation.
-
-*Size:* depends on :ref:`dmask<amdgpu_synid_dmask>` and :ref:`tfe<amdgpu_synid_tfe>`:
-
-* :ref:`dmask<amdgpu_synid_dmask>` may specify 2 data elements for 32-bit-per-pixel surfaces or 4 data elements for 64-bit-per-pixel surfaces. Each data element occupies 1 dword.
-* :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-  Note: the surface data format is indicated in the image resource constant but not in the instruction.
-
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_data_mimg_atomic_reg.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_data_mimg_atomic_reg.rst
deleted file mode 100644
index 7b74290a565..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_data_mimg_atomic_reg.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_data_mimg_atomic_reg:
-
-vdata
-===========================
-
-Input data for an atomic instruction.
-
-Optionally may serve as an output data:
-
-* If :ref:`glc<amdgpu_synid_glc>` is specified, gets the memory value before the operation.
-
-*Size:* depends on :ref:`dmask<amdgpu_synid_dmask>` and :ref:`tfe<amdgpu_synid_tfe>`:
-
-* :ref:`dmask<amdgpu_synid_dmask>` may specify 1 data element for 32-bit-per-pixel surfaces or 2 data elements for 64-bit-per-pixel surfaces. Each data element occupies 1 dword.
-* :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-  Note: the surface data format is indicated in the image resource constant but not in the instruction.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_data_mimg_store.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_data_mimg_store.rst
deleted file mode 100644
index 156c1b0180e..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_data_mimg_store.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_data_mimg_store:
-
-vdata
-===========================
-
-Image data to store by an *image_store* instruction.
-
-*Size:* depends on :ref:`dmask<amdgpu_synid_dmask>` which may specify from 1 to 4 data elements. Each data element occupies 1 dword.
-
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_data_mimg_store_d16.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_data_mimg_store_d16.rst
deleted file mode 100644
index 142b3060422..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_data_mimg_store_d16.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_data_mimg_store_d16:
-
-vdata
-===========================
-
-Image data to store by an *image_store* instruction.
-
-*Size:* depends on :ref:`dmask<amdgpu_synid_dmask>` and :ref:`d16<amdgpu_synid_d16>`:
-
-* :ref:`dmask<amdgpu_synid_dmask>` may specify from 1 to 4 data elements. Each data element occupies either 32 bits or 16 bits depending on :ref:`d16<amdgpu_synid_d16>`.
-* :ref:`d16<amdgpu_synid_d16>` specifies that data in registers are packed; each value occupies 16 bits.
-
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_data_smem_atomic128.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_data_smem_atomic128.rst
deleted file mode 100644
index c59c4888fab..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_data_smem_atomic128.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_data_smem_atomic128:
-
-sdata
-===========================
-
-Input data for an atomic instruction.
-
-Optionally may serve as an output data:
-
-* If :ref:`glc<amdgpu_synid_glc>` is specified, gets the memory value before the operation.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_data_smem_atomic32.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_data_smem_atomic32.rst
deleted file mode 100644
index 5e8f7ca3020..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_data_smem_atomic32.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_data_smem_atomic32:
-
-sdata
-===========================
-
-Input data for an atomic instruction.
-
-Optionally may serve as an output data:
-
-* If :ref:`glc<amdgpu_synid_glc>` is specified, gets the memory value before the operation.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`null<amdgpu_synid_null>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_data_smem_atomic64.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_data_smem_atomic64.rst
deleted file mode 100644
index 4cd5a05b41a..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_data_smem_atomic64.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_data_smem_atomic64:
-
-sdata
-===========================
-
-Input data for an atomic instruction.
-
-Optionally may serve as an output data:
-
-* If :ref:`glc<amdgpu_synid_glc>` is specified, gets the memory value before the operation.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`null<amdgpu_synid_null>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_buf_128.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_buf_128.rst
deleted file mode 100644
index 56cfc2f1018..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_buf_128.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_dst_buf_128:
-
-vdst
-===========================
-
-Instruction output: data read from a memory buffer.
-
-*Size:* 4 dwords by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_buf_32.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_buf_32.rst
deleted file mode 100644
index a1f1dc99ffb..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_buf_32.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_dst_buf_32:
-
-vdst
-===========================
-
-Instruction output: data read from a memory buffer.
-
-*Size:* 1 dword by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_buf_64.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_buf_64.rst
deleted file mode 100644
index ebd3c7e3f17..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_buf_64.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_dst_buf_64:
-
-vdst
-===========================
-
-Instruction output: data read from a memory buffer.
-
-*Size:* 2 dwords by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_buf_96.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_buf_96.rst
deleted file mode 100644
index 13a7e2bfc96..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_buf_96.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_dst_buf_96:
-
-vdst
-===========================
-
-Instruction output: data read from a memory buffer.
-
-*Size:* 3 dwords by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_buf_lds.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_buf_lds.rst
deleted file mode 100644
index ec83bf56931..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_buf_lds.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_dst_buf_lds:
-
-vdst
-===========================
-
-Instruction output: data read from a memory buffer.
-
-If :ref:`lds<amdgpu_synid_lds>` is specified, this operand is ignored by H/W and data are stored directly into LDS.
-
-*Size:* 1 dword by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-    Note that :ref:`tfe<amdgpu_synid_tfe>` and :ref:`lds<amdgpu_synid_lds>` cannot be used together.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_flat_atomic32.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_flat_atomic32.rst
deleted file mode 100644
index e8d94b85595..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_flat_atomic32.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_dst_flat_atomic32:
-
-vdst
-===========================
-
-Data returned by a 32-bit atomic flat instruction.
-
-This is an optional operand. It must be used if and only if :ref:`glc<amdgpu_synid_glc>` is specified.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_flat_atomic64.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_flat_atomic64.rst
deleted file mode 100644
index 19d9b11ba8c..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_flat_atomic64.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_dst_flat_atomic64:
-
-vdst
-===========================
-
-Data returned by a 64-bit atomic flat instruction.
-
-This is an optional operand. It must be used if and only if :ref:`glc<amdgpu_synid_glc>` is specified.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_mimg_gather4.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_mimg_gather4.rst
deleted file mode 100644
index 90b85935388..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_mimg_gather4.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_dst_mimg_gather4:
-
-vdst
-===========================
-
-Image data to load by an *image_gather4* instruction.
-
-*Size:* 4 data elements by default. Each data element occupies either 32 bits or 16 bits depending on :ref:`d16<amdgpu_synid_d16>`.
-
-:ref:`d16<amdgpu_synid_d16>` and :ref:`tfe<amdgpu_synid_tfe>` affect operand size as follows:
-
-* :ref:`d16<amdgpu_synid_d16>` specifies that data elements in registers are packed; each value occupies 16 bits.
-* :ref:`tfe<amdgpu_synid_tfe>` adds one dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_mimg_regular.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_mimg_regular.rst
deleted file mode 100644
index d3379356ee7..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_mimg_regular.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_dst_mimg_regular:
-
-vdst
-===========================
-
-Image data to load by an image instruction.
-
-*Size:* depends on :ref:`dmask<amdgpu_synid_dmask>` and :ref:`tfe<amdgpu_synid_tfe>`:
-
-* :ref:`dmask<amdgpu_synid_dmask>` may specify from 1 to 4 data elements. Each data element occupies 1 dword.
-* :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_mimg_regular_d16.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_mimg_regular_d16.rst
deleted file mode 100644
index 9217574c9c4..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_dst_mimg_regular_d16.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_dst_mimg_regular_d16:
-
-vdst
-===========================
-
-Image data to load by an image instruction.
-
-*Size:* depends on :ref:`dmask<amdgpu_synid_dmask>`, :ref:`tfe<amdgpu_synid_tfe>` and :ref:`d16<amdgpu_synid_d16>`:
-
-* :ref:`dmask<amdgpu_synid_dmask>` may specify from 1 to 4 data elements. Each data element occupies either 32 bits or 16 bits depending on :ref:`d16<amdgpu_synid_d16>`.
-* :ref:`d16<amdgpu_synid_d16>` specifies that data elements in registers are packed; each value occupies 16 bits.
-* :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_fimm16.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_fimm16.rst
deleted file mode 100644
index 9ac39c61790..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_fimm16.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_fimm16:
-
-imm32
-===========================
-
-A :ref:`floating-point_number<amdgpu_synid_floating-point_number>`, an :ref:`integer_number<amdgpu_synid_integer_number>`, or an :ref:`absolute_expression<amdgpu_synid_absolute_expression>`.
-The value is converted to *f16* as described :ref:`here<amdgpu_synid_fp_conv>`.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_fimm32.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_fimm32.rst
deleted file mode 100644
index 7b181912e38..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_fimm32.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_fimm32:
-
-imm32
-===========================
-
-A :ref:`floating-point_number<amdgpu_synid_floating-point_number>`, an :ref:`integer_number<amdgpu_synid_integer_number>`, or an :ref:`absolute_expression<amdgpu_synid_absolute_expression>`.
-The value is converted to *f32* as described :ref:`here<amdgpu_synid_fp_conv>`.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_mad_type_dev.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_mad_type_dev.rst
deleted file mode 100644
index 6bffb83d647..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_mad_type_dev.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_mad_type_dev:
-
-fx
-===========================
-
-This is an *f32* or *f16* operand depending on instruction modifiers:
-
-* Operand size is controlled by :ref:`m_op_sel_hi<amdgpu_synid_mad_mix_op_sel_hi>`.
-* Location of 16-bit operand is controlled by :ref:`m_op_sel<amdgpu_synid_mad_mix_op_sel>`.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_mod_dpp_sdwa_abs_neg.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_mod_dpp_sdwa_abs_neg.rst
deleted file mode 100644
index 05bcc033084..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_mod_dpp_sdwa_abs_neg.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_mod_dpp_sdwa_abs_neg:
-
-m
-===========================
-
-This operand may be used with floating point operand modifiers :ref:`abs<amdgpu_synid_abs>` and :ref:`neg<amdgpu_synid_neg>`.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_mod_sdwa_sext.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_mod_sdwa_sext.rst
deleted file mode 100644
index 15671007c10..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_mod_sdwa_sext.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_mod_sdwa_sext:
-
-m
-===========================
-
-This operand may be used with integer operand modifier :ref:`sext<amdgpu_synid_sext>`.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_mod_vop3_abs_neg.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_mod_vop3_abs_neg.rst
deleted file mode 100644
index 50c29b66594..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_mod_vop3_abs_neg.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_mod_vop3_abs_neg:
-
-m
-===========================
-
-This operand may be used with floating point operand modifiers :ref:`abs<amdgpu_synid_abs>` and :ref:`neg<amdgpu_synid_neg>`.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_offset_buf.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_offset_buf.rst
deleted file mode 100644
index 99598fdd151..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_offset_buf.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_offset_buf:
-
-soffset
-===========================
-
-An unsigned byte offset.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`null<amdgpu_synid_null>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_offset_smem_buf.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_offset_smem_buf.rst
deleted file mode 100644
index b7acd418e89..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_offset_smem_buf.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_offset_smem_buf:
-
-soffset
-===========================
-
-An unsigned 20-bit offset added to the base address to get memory address.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`null<amdgpu_synid_null>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`uimm20<amdgpu_synid_uimm20>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_offset_smem_plain.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_offset_smem_plain.rst
deleted file mode 100644
index 30763e7f9bb..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_offset_smem_plain.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_offset_smem_plain:
-
-soffset
-===========================
-
-An offset added to the base address to get memory address.
-
-* If offset is specified as a register, it supplies an unsigned byte offset.
-* If offset is specified as a 21-bit immediate, it supplies a signed byte offset.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`null<amdgpu_synid_null>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`simm21<amdgpu_synid_simm21>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_opt.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_opt.rst
deleted file mode 100644
index 16acc93a041..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_opt.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_opt:
-
-opt
-===========================
-
-This is an optional operand. It must be used if and only if :ref:`glc<amdgpu_synid_glc>` is specified.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_perm_smem.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_perm_smem.rst
deleted file mode 100644
index d6b3d07024d..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_perm_smem.rst
+++ /dev/null
@@ -1,24 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_perm_smem:
-
-imm3
-===========================
-
-A bit mask which indicates request permissions.
-
-This operand must be specified as an :ref:`integer_number<amdgpu_synid_integer_number>` or an :ref:`absolute_expression<amdgpu_synid_absolute_expression>`.
-The value is truncated to 7 bits, but only 3 low bits are significant.
-
-    ============ ==============================
-    Bit Number   Description
-    ============ ==============================
-    0            Request *read* permission.
-    1            Request *write* permission.
-    2            Request *execute* permission.
-    ============ ==============================
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_ret.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_ret.rst
deleted file mode 100644
index 0809f6ca913..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_ret.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_ret:
-
-dst
-===========================
-
-This is an input operand. It may optionally serve as a destination if :ref:`glc<amdgpu_synid_glc>` is specified.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_rsrc_buf.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_rsrc_buf.rst
deleted file mode 100644
index a3f454b4019..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_rsrc_buf.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_rsrc_buf:
-
-srsrc
-===========================
-
-Buffer resource constant which defines the address and characteristics of the buffer in memory.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_rsrc_mimg.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_rsrc_mimg.rst
deleted file mode 100644
index af830b0a2c8..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_rsrc_mimg.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_rsrc_mimg:
-
-srsrc
-===========================
-
-Image resource constant which defines the location of the image buffer in memory, its dimensions, tiling, and data format.
-
-*Size:* 8 dwords by default, 4 dwords if :ref:`r128<amdgpu_synid_r128>` is specified.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_saddr_flat_global.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_saddr_flat_global.rst
deleted file mode 100644
index 2362d0c020e..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_saddr_flat_global.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_saddr_flat_global:
-
-saddr
-===========================
-
-An optional 64-bit flat global address. Must be specified as :ref:`off<amdgpu_synid_off>` if not used.
-
-See :ref:`vaddr<amdgpu_synid10_vaddr_flat_global>` for description of available addressing modes.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`null<amdgpu_synid_null>`, :ref:`off<amdgpu_synid_off>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_saddr_flat_scratch.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_saddr_flat_scratch.rst
deleted file mode 100644
index 8fea5d30428..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_saddr_flat_scratch.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_saddr_flat_scratch:
-
-saddr
-===========================
-
-An optional 32-bit flat scratch offset. Must be specified as :ref:`off<amdgpu_synid_off>` if not used.
-
-Either this operand or :ref:`vaddr<amdgpu_synid10_vaddr_flat_scratch>` must be set to :ref:`off<amdgpu_synid_off>`.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`null<amdgpu_synid_null>`, :ref:`off<amdgpu_synid_off>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_samp_mimg.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_samp_mimg.rst
deleted file mode 100644
index 5f2aed088f1..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_samp_mimg.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_samp_mimg:
-
-ssamp
-===========================
-
-Sampler constant used to specify filtering options applied to the image data after it is read.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_sdata128_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_sdata128_0.rst
deleted file mode 100644
index 19d6e5bc2ee..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_sdata128_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_sdata128_0:
-
-sdata
-===========================
-
-Instruction input.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_sdata32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_sdata32_0.rst
deleted file mode 100644
index 10e10caf626..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_sdata32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_sdata32_0:
-
-sdata
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`null<amdgpu_synid_null>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_sdata64_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_sdata64_0.rst
deleted file mode 100644
index f03938a3c8a..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_sdata64_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_sdata64_0:
-
-sdata
-===========================
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`null<amdgpu_synid_null>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst128_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst128_0.rst
deleted file mode 100644
index e1bfc693c0e..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst128_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_sdst128_0:
-
-sdst
-===========================
-
-Instruction output.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst256_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst256_0.rst
deleted file mode 100644
index c352bffeebb..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst256_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_sdst256_0:
-
-sdst
-===========================
-
-Instruction output.
-
-*Size:* 8 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst32_0.rst
deleted file mode 100644
index 1000d83ffc2..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_sdst32_0:
-
-sdst
-===========================
-
-Instruction output.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`null<amdgpu_synid_null>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst32_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst32_1.rst
deleted file mode 100644
index ddfb348c3de..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst32_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_sdst32_1:
-
-sdst
-===========================
-
-Instruction output.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`null<amdgpu_synid_null>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst32_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst32_2.rst
deleted file mode 100644
index 41a078ba423..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst32_2.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_sdst32_2:
-
-sdst
-===========================
-
-Instruction output.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst512_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst512_0.rst
deleted file mode 100644
index f72a2d5e028..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst512_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_sdst512_0:
-
-sdst
-===========================
-
-Instruction output.
-
-*Size:* 16 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst64_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst64_0.rst
deleted file mode 100644
index 75797f2a433..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst64_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_sdst64_0:
-
-sdst
-===========================
-
-Instruction output.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`null<amdgpu_synid_null>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst64_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst64_1.rst
deleted file mode 100644
index be8b6a06cec..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_sdst64_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_sdst64_1:
-
-sdst
-===========================
-
-Instruction output.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`null<amdgpu_synid_null>`, :ref:`exec<amdgpu_synid_exec>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_simm16.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_simm16.rst
deleted file mode 100644
index e88003ffaf0..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_simm16.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_simm16:
-
-imm16
-===========================
-
-An :ref:`integer_number<amdgpu_synid_integer_number>` or an :ref:`absolute_expression<amdgpu_synid_absolute_expression>`. The value must be in the range -32768..65535.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_src32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_src32_0.rst
deleted file mode 100644
index f4ae944c960..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_src32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_src32_0:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_src32_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_src32_1.rst
deleted file mode 100644
index f786f406695..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_src32_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_src32_1:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`iconst<amdgpu_synid_iconst>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_src32_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_src32_2.rst
deleted file mode 100644
index bb976167ef5..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_src32_2.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_src32_2:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`lds_direct<amdgpu_synid_lds_direct>`, :ref:`constant<amdgpu_synid_constant>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_src32_3.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_src32_3.rst
deleted file mode 100644
index 43bb76b5ac8..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_src32_3.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_src32_3:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`lds_direct<amdgpu_synid_lds_direct>`, :ref:`iconst<amdgpu_synid_iconst>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_src32_4.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_src32_4.rst
deleted file mode 100644
index 127990f08be..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_src32_4.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_src32_4:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_src32_5.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_src32_5.rst
deleted file mode 100644
index b856aa975fa..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_src32_5.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_src32_5:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`iconst<amdgpu_synid_iconst>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_src32_6.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_src32_6.rst
deleted file mode 100644
index 3db381aa1f4..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_src32_6.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_src32_6:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`lds_direct<amdgpu_synid_lds_direct>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_src64_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_src64_0.rst
deleted file mode 100644
index f88ccf2a68c..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_src64_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_src64_0:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_src_exp.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_src_exp.rst
deleted file mode 100644
index 4dd387a3aed..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_src_exp.rst
+++ /dev/null
@@ -1,28 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_src_exp:
-
-vsrc
-===========================
-
-Data to copy to export buffers. This is an optional operand. Must be specified as :ref:`off<amdgpu_synid_off>` if not used.
-
-:ref:`compr<amdgpu_synid_compr>` modifier indicates use of compressed (16-bit) data. This limits number of source operands from 4 to 2:
-
-* src0 and src1 must specify the first register (or :ref:`off<amdgpu_synid_off>`).
-* src2 and src3 must specify the second register (or :ref:`off<amdgpu_synid_off>`).
-
-An example:
-
-.. parsed-literal::
-
-  exp mrtz v3, v3, off, off compr
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`off<amdgpu_synid_off>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc32_0.rst
deleted file mode 100644
index e444898cdc1..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_ssrc32_0:
-
-ssrc
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`null<amdgpu_synid_null>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc32_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc32_1.rst
deleted file mode 100644
index 4fdbe1c099e..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc32_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_ssrc32_1:
-
-ssrc
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`null<amdgpu_synid_null>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc32_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc32_2.rst
deleted file mode 100644
index 1b46e77a43c..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc32_2.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_ssrc32_2:
-
-ssrc
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`null<amdgpu_synid_null>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc32_3.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc32_3.rst
deleted file mode 100644
index ec6b1152dfa..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc32_3.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_ssrc32_3:
-
-ssrc
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc32_4.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc32_4.rst
deleted file mode 100644
index bba8d5aeaa1..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc32_4.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_ssrc32_4:
-
-ssrc
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`iconst<amdgpu_synid_iconst>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc32_5.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc32_5.rst
deleted file mode 100644
index a0b1bbf0463..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc32_5.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_ssrc32_5:
-
-ssrc
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`lds_direct<amdgpu_synid_lds_direct>`, :ref:`constant<amdgpu_synid_constant>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc64_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc64_0.rst
deleted file mode 100644
index 7e351f44a4c..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc64_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_ssrc64_0:
-
-ssrc
-===========================
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`null<amdgpu_synid_null>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc64_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc64_1.rst
deleted file mode 100644
index 45116b00c18..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_ssrc64_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_ssrc64_1:
-
-ssrc
-===========================
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`null<amdgpu_synid_null>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_type_dev.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_type_dev.rst
deleted file mode 100644
index dd3d14faaaf..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_type_dev.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_type_dev:
-
-Type deviation
-===========================
-
-*Type* of this operand differs from *type* :ref:`implied by the opcode<amdgpu_syn_instruction_type>`. This tag specifies actual operand *type*.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_uimm16.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_uimm16.rst
deleted file mode 100644
index 2814a4b836d..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_uimm16.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_uimm16:
-
-imm16
-===========================
-
-An :ref:`integer_number<amdgpu_synid_integer_number>` or an :ref:`absolute_expression<amdgpu_synid_absolute_expression>`. The value must be in the range 0..65535.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_vaddr_flat_global.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_vaddr_flat_global.rst
deleted file mode 100644
index 06713f93196..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_vaddr_flat_global.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_vaddr_flat_global:
-
-vaddr
-===========================
-
-A 64-bit flat global address or a 32-bit offset depending on addressing mode:
-
-* Address = :ref:`vaddr<amdgpu_synid10_vaddr_flat_global>` + :ref:`offset12s<amdgpu_synid_flat_offset12s>`. :ref:`vaddr<amdgpu_synid10_vaddr_flat_global>` is a 64-bit address. This mode is indicated by :ref:`saddr<amdgpu_synid10_saddr_flat_global>` set to :ref:`off<amdgpu_synid_off>`.
-* Address = :ref:`saddr<amdgpu_synid10_saddr_flat_global>` + :ref:`vaddr<amdgpu_synid10_vaddr_flat_global>` + :ref:`offset12s<amdgpu_synid_flat_offset12s>`. :ref:`vaddr<amdgpu_synid10_vaddr_flat_global>` is a 32-bit offset. This mode is used when :ref:`saddr<amdgpu_synid10_saddr_flat_global>` is not :ref:`off<amdgpu_synid_off>`.
-
-*Size:* 1 or 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_vaddr_flat_scratch.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_vaddr_flat_scratch.rst
deleted file mode 100644
index cc6d1af64ee..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_vaddr_flat_scratch.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_vaddr_flat_scratch:
-
-vaddr
-===========================
-
-An optional 32-bit flat scratch offset. Must be specified as :ref:`off<amdgpu_synid_off>` if not used.
-
-Either this operand or :ref:`saddr<amdgpu_synid10_saddr_flat_scratch>` must be set to :ref:`off<amdgpu_synid_off>`.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`off<amdgpu_synid_off>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_vcc_32.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_vcc_32.rst
deleted file mode 100644
index 1525dab0fd5..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_vcc_32.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_vcc_32:
-
-vcc
-===========================
-
-Vector condition code. This operand depends on wavefront size:
-
-* Should be :ref:`vcc_lo<amdgpu_synid_vcc_lo>` if wavefront size is 32.
-* Should be :ref:`vcc<amdgpu_synid_vcc>` if wavefront size is 64.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_vdata128_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_vdata128_0.rst
deleted file mode 100644
index 0e25049065e..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_vdata128_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_vdata128_0:
-
-vdata
-===========================
-
-Instruction input.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_vdata32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_vdata32_0.rst
deleted file mode 100644
index e2ddcee736b..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_vdata32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_vdata32_0:
-
-vdata
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_vdata64_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_vdata64_0.rst
deleted file mode 100644
index 4552a3998fe..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_vdata64_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_vdata64_0:
-
-vdata
-===========================
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_vdata96_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_vdata96_0.rst
deleted file mode 100644
index 084825a6331..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_vdata96_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_vdata96_0:
-
-vdata
-===========================
-
-Instruction input.
-
-*Size:* 3 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_vdst128_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_vdst128_0.rst
deleted file mode 100644
index a0a786c3b69..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_vdst128_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_vdst128_0:
-
-vdst
-===========================
-
-Instruction output.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_vdst32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_vdst32_0.rst
deleted file mode 100644
index d04548ec1ea..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_vdst32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_vdst32_0:
-
-vdst
-===========================
-
-Instruction output.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_vdst64_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_vdst64_0.rst
deleted file mode 100644
index 6e44c28a07b..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_vdst64_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_vdst64_0:
-
-vdst
-===========================
-
-Instruction output.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_vdst96_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_vdst96_0.rst
deleted file mode 100644
index a30e2ee8ae7..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_vdst96_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_vdst96_0:
-
-vdst
-===========================
-
-Instruction output.
-
-*Size:* 3 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_vsrc128_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_vsrc128_0.rst
deleted file mode 100644
index 1808061d510..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_vsrc128_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_vsrc128_0:
-
-vsrc
-===========================
-
-Instruction input.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_vsrc32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_vsrc32_0.rst
deleted file mode 100644
index 95cecb42825..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_vsrc32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_vsrc32_0:
-
-vsrc
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_vsrc32_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_vsrc32_1.rst
deleted file mode 100644
index fd8c6bd28bd..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_vsrc32_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_vsrc32_1:
-
-vsrc
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`lds_direct<amdgpu_synid_lds_direct>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_vsrc64_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_vsrc64_0.rst
deleted file mode 100644
index 56c8fff09eb..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_vsrc64_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_vsrc64_0:
-
-vsrc
-===========================
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_wsdst.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_wsdst.rst
deleted file mode 100644
index 1e39990f890..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_wsdst.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_wsdst:
-
-sdst
-===========================
-
-Instruction output.
-
-*Size:* 1 dword if wavefront size is 32, otherwise 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx10_wssrc.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx10_wssrc.rst
deleted file mode 100644
index 35fdb02a0ea..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx10_wssrc.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid10_wssrc:
-
-ssrc
-===========================
-
-Instruction input.
-
-*Size:* 1 dword if wavefront size is 32, otherwise 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_addr_buf.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_addr_buf.rst
deleted file mode 100644
index 22dc7d35338..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_addr_buf.rst
+++ /dev/null
@@ -1,24 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_addr_buf:
-
-vaddr
-===========================
-
-This is an optional operand which may specify a 64-bit address, offset and/or index.
-
-*Size:* 0, 1 or 2 dwords. Size is controlled by modifiers :ref:`addr64<amdgpu_synid_addr64>`, :ref:`offen<amdgpu_synid_offen>` and :ref:`idxen<amdgpu_synid_idxen>`:
-
-* If only :ref:`addr64<amdgpu_synid_addr64>` is specified, this operand supplies a 64-bit address. Size is 2 dwords.
-* If only :ref:`idxen<amdgpu_synid_idxen>` is specified, this operand supplies an index. Size is 1 dword.
-* If only :ref:`offen<amdgpu_synid_offen>` is specified, this operand supplies an offset. Size is 1 dword.
-* If both :ref:`idxen<amdgpu_synid_idxen>` and :ref:`offen<amdgpu_synid_offen>` are specified, index is in the first register and offset is in the second. Size is 2 dwords.
-* If none of these modifiers are specified, this operand must be set to :ref:`off<amdgpu_synid_off>`.
-* All other combinations of these modifiers are illegal.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`off<amdgpu_synid_off>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_addr_ds.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_addr_ds.rst
deleted file mode 100644
index c9cab7d45ec..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_addr_ds.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_addr_ds:
-
-vaddr
-===========================
-
-An offset from the start of GDS/LDS memory.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_addr_flat.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_addr_flat.rst
deleted file mode 100644
index 93deea6d7a2..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_addr_flat.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_addr_flat:
-
-vaddr
-===========================
-
-A 64-bit flat address.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_addr_mimg.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_addr_mimg.rst
deleted file mode 100644
index 76eb4846f1a..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_addr_mimg.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_addr_mimg:
-
-vaddr
-===========================
-
-Image address which includes from one to four dimensional coordinates and other data used to locate a position in the image.
-
-*Size:* 1, 2, 3, 4, 8 or 16 dwords. Actual size depends on opcode and specific image being handled.
-
-    Note 1. Image format and dimensions are encoded in the image resource constant but not in the instruction.
-
-    Note 2. Actually image address size may vary from 1 to 13 dwords, but assembler currently supports a limited range of register sequences.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_base_smem_addr.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_base_smem_addr.rst
deleted file mode 100644
index 9cc3cc71fdf..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_base_smem_addr.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_base_smem_addr:
-
-sbase
-===========================
-
-A 64-bit base address for scalar memory operations.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_base_smem_buf.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_base_smem_buf.rst
deleted file mode 100644
index 416cac715c7..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_base_smem_buf.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_base_smem_buf:
-
-sbase
-===========================
-
-A 128-bit buffer resource constant for scalar memory operations which provides a base address, a size and a stride.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_bimm16.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_bimm16.rst
deleted file mode 100644
index 9b0fb57db37..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_bimm16.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_bimm16:
-
-imm16
-===========================
-
-A 16-bit :ref:`integer_number<amdgpu_synid_integer_number>` or an :ref:`absolute_expression<amdgpu_synid_absolute_expression>`. The value must be in the range -32768..65535.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_bimm32.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_bimm32.rst
deleted file mode 100644
index c4ffef8bcde..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_bimm32.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_bimm32:
-
-imm32
-===========================
-
-An :ref:`integer_number<amdgpu_synid_integer_number>` or an :ref:`absolute_expression<amdgpu_synid_absolute_expression>`. The value is truncated to 32 bits.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_data_buf_atomic128.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_data_buf_atomic128.rst
deleted file mode 100644
index 33ff26c6c59..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_data_buf_atomic128.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_data_buf_atomic128:
-
-vdata
-===========================
-
-Input data for an atomic instruction.
-
-Optionally may serve as an output data:
-
-* If :ref:`glc<amdgpu_synid_glc>` is specified, gets the memory value before the operation.
-
-*Size:* 4 dwords by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_data_buf_atomic32.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_data_buf_atomic32.rst
deleted file mode 100644
index df4a6e42ad4..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_data_buf_atomic32.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_data_buf_atomic32:
-
-vdata
-===========================
-
-Input data for an atomic instruction.
-
-Optionally may serve as an output data:
-
-* If :ref:`glc<amdgpu_synid_glc>` is specified, gets the memory value before the operation.
-
-*Size:* 1 dword by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_data_buf_atomic64.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_data_buf_atomic64.rst
deleted file mode 100644
index 4892e41631f..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_data_buf_atomic64.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_data_buf_atomic64:
-
-vdata
-===========================
-
-Input data for an atomic instruction.
-
-Optionally may serve as an output data:
-
-* If :ref:`glc<amdgpu_synid_glc>` is specified, gets the memory value before the operation.
-
-*Size:* 2 dwords by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_data_mimg_atomic_cmp.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_data_mimg_atomic_cmp.rst
deleted file mode 100644
index 0328519d17b..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_data_mimg_atomic_cmp.rst
+++ /dev/null
@@ -1,27 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_data_mimg_atomic_cmp:
-
-vdata
-===========================
-
-Input data for an atomic instruction.
-
-Optionally may serve as an output data:
-
-* If :ref:`glc<amdgpu_synid_glc>` is specified, gets the memory value before the operation.
-
-*Size:* depends on :ref:`dmask<amdgpu_synid_dmask>` and :ref:`tfe<amdgpu_synid_tfe>`:
-
-* :ref:`dmask<amdgpu_synid_dmask>` may specify 2 data elements for 32-bit-per-pixel surfaces or 4 data elements for 64-bit-per-pixel surfaces. Each data element occupies 1 dword.
-* :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-  Note: the surface data format is indicated in the image resource constant but not in the instruction.
-
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_data_mimg_atomic_reg.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_data_mimg_atomic_reg.rst
deleted file mode 100644
index 30785e47ff9..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_data_mimg_atomic_reg.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_data_mimg_atomic_reg:
-
-vdata
-===========================
-
-Input data for an atomic instruction.
-
-Optionally may serve as an output data:
-
-* If :ref:`glc<amdgpu_synid_glc>` is specified, gets the memory value before the operation.
-
-*Size:* depends on :ref:`dmask<amdgpu_synid_dmask>` and :ref:`tfe<amdgpu_synid_tfe>`:
-
-* :ref:`dmask<amdgpu_synid_dmask>` may specify 1 data element for 32-bit-per-pixel surfaces or 2 data elements for 64-bit-per-pixel surfaces. Each data element occupies 1 dword.
-* :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-  Note: the surface data format is indicated in the image resource constant but not in the instruction.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_data_mimg_store.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_data_mimg_store.rst
deleted file mode 100644
index 1858547a7c0..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_data_mimg_store.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_data_mimg_store:
-
-vdata
-===========================
-
-Image data to store by an *image_store* instruction.
-
-*Size:* depends on :ref:`dmask<amdgpu_synid_dmask>` which may specify from 1 to 4 data elements. Each data element occupies 1 dword.
-
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_buf_128.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_buf_128.rst
deleted file mode 100644
index 701616ed320..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_buf_128.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_dst_buf_128:
-
-vdst
-===========================
-
-Instruction output: data read from a memory buffer.
-
-*Size:* 4 dwords by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_buf_32.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_buf_32.rst
deleted file mode 100644
index 101941195d5..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_buf_32.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_dst_buf_32:
-
-vdst
-===========================
-
-Instruction output: data read from a memory buffer.
-
-*Size:* 1 dword by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_buf_64.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_buf_64.rst
deleted file mode 100644
index de62a568bf5..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_buf_64.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_dst_buf_64:
-
-vdst
-===========================
-
-Instruction output: data read from a memory buffer.
-
-*Size:* 2 dwords by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_buf_96.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_buf_96.rst
deleted file mode 100644
index 1abfcc07aec..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_buf_96.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_dst_buf_96:
-
-vdst
-===========================
-
-Instruction output: data read from a memory buffer.
-
-*Size:* 3 dwords by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_buf_lds.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_buf_lds.rst
deleted file mode 100644
index 435f6bb874b..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_buf_lds.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_dst_buf_lds:
-
-vdst
-===========================
-
-Instruction output: data read from a memory buffer.
-
-If :ref:`lds<amdgpu_synid_lds>` is specified, this operand is ignored by H/W and data are stored directly into LDS.
-
-*Size:* 1 dword by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-    Note that :ref:`tfe<amdgpu_synid_tfe>` and :ref:`lds<amdgpu_synid_lds>` cannot be used together.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_flat_atomic32.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_flat_atomic32.rst
deleted file mode 100644
index 4a85656ca86..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_flat_atomic32.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_dst_flat_atomic32:
-
-vdst
-===========================
-
-Data returned by a 32-bit atomic flat instruction.
-
-This is an optional operand. It must be used if and only if :ref:`glc<amdgpu_synid_glc>` is specified.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_flat_atomic64.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_flat_atomic64.rst
deleted file mode 100644
index cb1fddd9318..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_flat_atomic64.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_dst_flat_atomic64:
-
-vdst
-===========================
-
-Data returned by a 64-bit atomic flat instruction.
-
-This is an optional operand. It must be used if and only if :ref:`glc<amdgpu_synid_glc>` is specified.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_mimg_gather4.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_mimg_gather4.rst
deleted file mode 100644
index 17fcff5246a..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_mimg_gather4.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_dst_mimg_gather4:
-
-vdst
-===========================
-
-Image data to load by an *image_gather4* instruction.
-
-*Size:* 4 data elements by default. Each data element occupies 1 dword. :ref:`tfe<amdgpu_synid_tfe>` adds one more dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_mimg_regular.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_mimg_regular.rst
deleted file mode 100644
index aa165b81e62..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_dst_mimg_regular.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_dst_mimg_regular:
-
-vdst
-===========================
-
-Image data to load by an image instruction.
-
-*Size:* depends on :ref:`dmask<amdgpu_synid_dmask>` and :ref:`tfe<amdgpu_synid_tfe>`:
-
-* :ref:`dmask<amdgpu_synid_dmask>` may specify from 1 to 4 data elements. Each data element occupies 1 dword.
-* :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_fimm32.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_fimm32.rst
deleted file mode 100644
index b086074604c..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_fimm32.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_fimm32:
-
-imm32
-===========================
-
-A :ref:`floating-point_number<amdgpu_synid_floating-point_number>`, an :ref:`integer_number<amdgpu_synid_integer_number>`, or an :ref:`absolute_expression<amdgpu_synid_absolute_expression>`.
-The value is converted to *f32* as described :ref:`here<amdgpu_synid_fp_conv>`.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_mod.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_mod.rst
deleted file mode 100644
index 0b03299b254..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_mod.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_mod:
-
-m
-===========================
-
-This operand may be used with floating point operand modifiers :ref:`abs<amdgpu_synid_abs>` and :ref:`neg<amdgpu_synid_neg>`.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_offset_buf.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_offset_buf.rst
deleted file mode 100644
index b78affa6db6..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_offset_buf.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_offset_buf:
-
-soffset
-===========================
-
-An unsigned byte offset.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_offset_smem.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_offset_smem.rst
deleted file mode 100644
index 85ed5f18673..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_offset_smem.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_offset_smem:
-
-soffset
-===========================
-
-An unsigned offset added to the base address to get memory address.
-
-* If offset is specified as a register, it supplies an unsigned byte offset but 2 lsb's are ignored.
-* If offset is specified as an :ref:`uimm32<amdgpu_synid_uimm32>`, it supplies a 32-bit unsigned byte offset but 2 lsb's are ignored.
-* If offset is specified as an :ref:`uimm8<amdgpu_synid_uimm8>`, it supplies an 8-bit unsigned dword offset.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`uimm8<amdgpu_synid_uimm8>`, :ref:`uimm32<amdgpu_synid_uimm32>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_opt.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_opt.rst
deleted file mode 100644
index d7e59463464..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_opt.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_opt:
-
-opt
-===========================
-
-This is an optional operand. It must be used if and only if :ref:`glc<amdgpu_synid_glc>` is specified.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_ret.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_ret.rst
deleted file mode 100644
index 899a200c38f..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_ret.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_ret:
-
-dst
-===========================
-
-This is an input operand. It may optionally serve as a destination if :ref:`glc<amdgpu_synid_glc>` is specified.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_rsrc_buf.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_rsrc_buf.rst
deleted file mode 100644
index 7ebcebc68ef..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_rsrc_buf.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_rsrc_buf:
-
-srsrc
-===========================
-
-Buffer resource constant which defines the address and characteristics of the buffer in memory.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_rsrc_mimg.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_rsrc_mimg.rst
deleted file mode 100644
index b0e40fe09cc..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_rsrc_mimg.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_rsrc_mimg:
-
-srsrc
-===========================
-
-Image resource constant which defines the location of the image buffer in memory, its dimensions, tiling, and data format.
-
-*Size:* 8 dwords by default, 4 dwords if :ref:`r128<amdgpu_synid_r128>` is specified.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_samp_mimg.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_samp_mimg.rst
deleted file mode 100644
index 738cad415fe..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_samp_mimg.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_samp_mimg:
-
-ssamp
-===========================
-
-Sampler constant used to specify filtering options applied to the image data after it is read.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst128_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst128_0.rst
deleted file mode 100644
index 735a30cefd6..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst128_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_sdst128_0:
-
-sdst
-===========================
-
-Instruction output.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst256_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst256_0.rst
deleted file mode 100644
index c4e6f9fcf66..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst256_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_sdst256_0:
-
-sdst
-===========================
-
-Instruction output.
-
-*Size:* 8 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst32_0.rst
deleted file mode 100644
index 183d89f9e90..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_sdst32_0:
-
-sdst
-===========================
-
-Instruction output.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst32_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst32_1.rst
deleted file mode 100644
index 2e49e20f9d5..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst32_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_sdst32_1:
-
-sdst
-===========================
-
-Instruction output.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst32_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst32_2.rst
deleted file mode 100644
index 8212e5d7a61..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst32_2.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_sdst32_2:
-
-sdst
-===========================
-
-Instruction output.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`trap<amdgpu_synid_trap>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst512_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst512_0.rst
deleted file mode 100644
index d8c64b1e395..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst512_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_sdst512_0:
-
-sdst
-===========================
-
-Instruction output.
-
-*Size:* 16 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst64_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst64_0.rst
deleted file mode 100644
index af608801b39..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst64_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_sdst64_0:
-
-sdst
-===========================
-
-Instruction output.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst64_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst64_1.rst
deleted file mode 100644
index 207df73932c..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_sdst64_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_sdst64_1:
-
-sdst
-===========================
-
-Instruction output.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`exec<amdgpu_synid_exec>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_simm16.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_simm16.rst
deleted file mode 100644
index d6890d429c1..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_simm16.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_simm16:
-
-imm16
-===========================
-
-An :ref:`integer_number<amdgpu_synid_integer_number>` or an :ref:`absolute_expression<amdgpu_synid_absolute_expression>`. The value must be in the range -32768..65535.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_src32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_src32_0.rst
deleted file mode 100644
index 6a9c977a3a1..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_src32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_src32_0:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`lds_direct<amdgpu_synid_lds_direct>`, :ref:`constant<amdgpu_synid_constant>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_src32_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_src32_1.rst
deleted file mode 100644
index 990d22973c0..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_src32_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_src32_1:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`lds_direct<amdgpu_synid_lds_direct>`, :ref:`iconst<amdgpu_synid_iconst>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_src32_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_src32_2.rst
deleted file mode 100644
index 2fdb6462cc4..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_src32_2.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_src32_2:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_src32_3.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_src32_3.rst
deleted file mode 100644
index 19bbde9c785..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_src32_3.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_src32_3:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`lds_direct<amdgpu_synid_lds_direct>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_src32_4.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_src32_4.rst
deleted file mode 100644
index 7b0c3a89c1a..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_src32_4.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_src32_4:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_src32_5.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_src32_5.rst
deleted file mode 100644
index bcfbaeb013d..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_src32_5.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_src32_5:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`lds_direct<amdgpu_synid_lds_direct>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_src32_6.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_src32_6.rst
deleted file mode 100644
index 8c49d5954d0..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_src32_6.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_src32_6:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`iconst<amdgpu_synid_iconst>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_src64_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_src64_0.rst
deleted file mode 100644
index 9088418da5b..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_src64_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_src64_0:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_src64_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_src64_1.rst
deleted file mode 100644
index feb657c1f5d..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_src64_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_src64_1:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_src64_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_src64_2.rst
deleted file mode 100644
index 4a50df7046d..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_src64_2.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_src64_2:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`iconst<amdgpu_synid_iconst>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_src_exp.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_src_exp.rst
deleted file mode 100644
index 32f71a88b64..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_src_exp.rst
+++ /dev/null
@@ -1,28 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_src_exp:
-
-vsrc
-===========================
-
-Data to copy to export buffers. This is an optional operand. Must be specified as :ref:`off<amdgpu_synid_off>` if not used.
-
-:ref:`compr<amdgpu_synid_compr>` modifier indicates use of compressed (16-bit) data. This limits number of source operands from 4 to 2:
-
-* src0 and src1 must specify the first register (or :ref:`off<amdgpu_synid_off>`).
-* src2 and src3 must specify the second register (or :ref:`off<amdgpu_synid_off>`).
-
-An example:
-
-.. parsed-literal::
-
-  exp mrtz v3, v3, off, off compr
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`off<amdgpu_synid_off>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc32_0.rst
deleted file mode 100644
index 589d9ccd978..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_ssrc32_0:
-
-ssrc
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc32_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc32_1.rst
deleted file mode 100644
index 4f04b0bc225..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc32_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_ssrc32_1:
-
-ssrc
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc32_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc32_2.rst
deleted file mode 100644
index c7ff032f880..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc32_2.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_ssrc32_2:
-
-ssrc
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc32_3.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc32_3.rst
deleted file mode 100644
index 2ec4af2f6d5..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc32_3.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_ssrc32_3:
-
-ssrc
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`iconst<amdgpu_synid_iconst>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc32_4.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc32_4.rst
deleted file mode 100644
index e07ffe5a9ec..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc32_4.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_ssrc32_4:
-
-ssrc
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc32_5.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc32_5.rst
deleted file mode 100644
index 71402a7d000..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc32_5.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_ssrc32_5:
-
-ssrc
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`iconst<amdgpu_synid_iconst>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc32_6.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc32_6.rst
deleted file mode 100644
index 32bc3058590..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc32_6.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_ssrc32_6:
-
-ssrc
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`lds_direct<amdgpu_synid_lds_direct>`, :ref:`constant<amdgpu_synid_constant>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc64_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc64_0.rst
deleted file mode 100644
index 49add61fc94..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc64_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_ssrc64_0:
-
-ssrc
-===========================
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc64_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc64_1.rst
deleted file mode 100644
index 42dc8c56906..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc64_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_ssrc64_1:
-
-ssrc
-===========================
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc64_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc64_2.rst
deleted file mode 100644
index 52559305546..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc64_2.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_ssrc64_2:
-
-ssrc
-===========================
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc64_3.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc64_3.rst
deleted file mode 100644
index 173f550d4ec..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_ssrc64_3.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_ssrc64_3:
-
-ssrc
-===========================
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`exec<amdgpu_synid_exec>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_type_dev.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_type_dev.rst
deleted file mode 100644
index faef5f4ee3a..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_type_dev.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_type_dev:
-
-Type deviation
-===========================
-
-*Type* of this operand differs from *type* :ref:`implied by the opcode<amdgpu_syn_instruction_type>`. This tag specifies actual operand *type*.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_uimm16.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_uimm16.rst
deleted file mode 100644
index a49ddeb554c..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_uimm16.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_uimm16:
-
-imm16
-===========================
-
-An :ref:`integer_number<amdgpu_synid_integer_number>` or an :ref:`absolute_expression<amdgpu_synid_absolute_expression>`. The value must be in the range 0..65535.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_vcc_64.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_vcc_64.rst
deleted file mode 100644
index b1285e0e8b8..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_vcc_64.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_vcc_64:
-
-vcc
-===========================
-
-Vector condition code.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`vcc<amdgpu_synid_vcc>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_vdata128_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_vdata128_0.rst
deleted file mode 100644
index 5ed2b823bf7..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_vdata128_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_vdata128_0:
-
-vdata
-===========================
-
-Instruction input.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_vdata32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_vdata32_0.rst
deleted file mode 100644
index 1615abb4f6c..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_vdata32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_vdata32_0:
-
-vdata
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_vdata64_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_vdata64_0.rst
deleted file mode 100644
index fceea9fd4b1..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_vdata64_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_vdata64_0:
-
-vdata
-===========================
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_vdata96_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_vdata96_0.rst
deleted file mode 100644
index b9fe5996e53..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_vdata96_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_vdata96_0:
-
-vdata
-===========================
-
-Instruction input.
-
-*Size:* 3 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_vdst128_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_vdst128_0.rst
deleted file mode 100644
index c18652e8841..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_vdst128_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_vdst128_0:
-
-vdst
-===========================
-
-Instruction output.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_vdst32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_vdst32_0.rst
deleted file mode 100644
index e93620355e6..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_vdst32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_vdst32_0:
-
-vdst
-===========================
-
-Instruction output.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_vdst64_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_vdst64_0.rst
deleted file mode 100644
index 4cacaa0d63f..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_vdst64_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_vdst64_0:
-
-vdst
-===========================
-
-Instruction output.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_vdst96_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_vdst96_0.rst
deleted file mode 100644
index 3c5bf880ce9..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_vdst96_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_vdst96_0:
-
-vdst
-===========================
-
-Instruction output.
-
-*Size:* 3 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_vsrc128_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_vsrc128_0.rst
deleted file mode 100644
index 975237916bb..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_vsrc128_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_vsrc128_0:
-
-vsrc
-===========================
-
-Instruction input.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_vsrc32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_vsrc32_0.rst
deleted file mode 100644
index 93b12b00a1c..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_vsrc32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_vsrc32_0:
-
-vsrc
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_vsrc32_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_vsrc32_1.rst
deleted file mode 100644
index 063216a5e04..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_vsrc32_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_vsrc32_1:
-
-vsrc
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`lds_direct<amdgpu_synid_lds_direct>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx7_vsrc64_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx7_vsrc64_0.rst
deleted file mode 100644
index d8c9d45ddb5..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx7_vsrc64_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid7_vsrc64_0:
-
-vsrc
-===========================
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_addr_buf.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_addr_buf.rst
deleted file mode 100644
index 74aa275c199..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_addr_buf.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_addr_buf:
-
-vaddr
-===========================
-
-This is an optional operand which may specify offset and/or index.
-
-*Size:* 0, 1 or 2 dwords. Size is controlled by modifiers :ref:`offen<amdgpu_synid_offen>` and :ref:`idxen<amdgpu_synid_idxen>`:
-
-* If only :ref:`idxen<amdgpu_synid_idxen>` is specified, this operand supplies an index. Size is 1 dword.
-* If only :ref:`offen<amdgpu_synid_offen>` is specified, this operand supplies an offset. Size is 1 dword.
-* If both modifiers are specified, index is in the first register and offset is in the second. Size is 2 dwords.
-* If none of these modifiers are specified, this operand must be set to :ref:`off<amdgpu_synid_off>`.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`off<amdgpu_synid_off>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_addr_ds.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_addr_ds.rst
deleted file mode 100644
index 7115ff0cf04..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_addr_ds.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_addr_ds:
-
-vaddr
-===========================
-
-An offset from the start of GDS/LDS memory.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_addr_flat.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_addr_flat.rst
deleted file mode 100644
index 53dfcc3e895..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_addr_flat.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_addr_flat:
-
-vaddr
-===========================
-
-A 64-bit flat address.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_addr_mimg.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_addr_mimg.rst
deleted file mode 100644
index f1052badacd..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_addr_mimg.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_addr_mimg:
-
-vaddr
-===========================
-
-Image address which includes from one to four dimensional coordinates and other data used to locate a position in the image.
-
-*Size:* 1, 2, 3, 4, 8 or 16 dwords. Actual size depends on opcode and specific image being handled.
-
-    Note 1. Image format and dimensions are encoded in the image resource constant but not in the instruction.
-
-    Note 2. Actually image address size may vary from 1 to 13 dwords, but assembler currently supports a limited range of register sequences.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_base_smem_addr.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_base_smem_addr.rst
deleted file mode 100644
index 81ef25586d6..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_base_smem_addr.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_base_smem_addr:
-
-sbase
-===========================
-
-A 64-bit base address for scalar memory operations.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_base_smem_buf.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_base_smem_buf.rst
deleted file mode 100644
index fb243d0f262..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_base_smem_buf.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_base_smem_buf:
-
-sbase
-===========================
-
-A 128-bit buffer resource constant for scalar memory operations which provides a base address, a size and a stride.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_bimm16.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_bimm16.rst
deleted file mode 100644
index 83cac003e48..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_bimm16.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_bimm16:
-
-imm16
-===========================
-
-A 16-bit :ref:`integer_number<amdgpu_synid_integer_number>` or an :ref:`absolute_expression<amdgpu_synid_absolute_expression>`. The value must be in the range -32768..65535.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_bimm32.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_bimm32.rst
deleted file mode 100644
index ab5c53a6540..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_bimm32.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_bimm32:
-
-imm32
-===========================
-
-An :ref:`integer_number<amdgpu_synid_integer_number>` or an :ref:`absolute_expression<amdgpu_synid_absolute_expression>`. The value is truncated to 32 bits.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_data_buf_atomic128.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_data_buf_atomic128.rst
deleted file mode 100644
index 40b6d3a236e..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_data_buf_atomic128.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_data_buf_atomic128:
-
-vdata
-===========================
-
-Input data for an atomic instruction.
-
-Optionally may serve as an output data:
-
-* If :ref:`glc<amdgpu_synid_glc>` is specified, gets the memory value before the operation.
-
-*Size:* 4 dwords by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_data_buf_atomic32.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_data_buf_atomic32.rst
deleted file mode 100644
index 51121820d74..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_data_buf_atomic32.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_data_buf_atomic32:
-
-vdata
-===========================
-
-Input data for an atomic instruction.
-
-Optionally may serve as an output data:
-
-* If :ref:`glc<amdgpu_synid_glc>` is specified, gets the memory value before the operation.
-
-*Size:* 1 dword by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_data_buf_atomic64.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_data_buf_atomic64.rst
deleted file mode 100644
index 107998e37d9..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_data_buf_atomic64.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_data_buf_atomic64:
-
-vdata
-===========================
-
-Input data for an atomic instruction.
-
-Optionally may serve as an output data:
-
-* If :ref:`glc<amdgpu_synid_glc>` is specified, gets the memory value before the operation.
-
-*Size:* 2 dwords by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_data_buf_d16_128.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_data_buf_d16_128.rst
deleted file mode 100644
index 3c98a360252..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_data_buf_d16_128.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_data_buf_d16_128:
-
-vdata
-===========================
-
-16-bit data to store by a buffer instruction.
-
-*Size:* depends on GFX8 GPU revision:
-
-* 4 dwords for GFX8.0. This H/W supports no packing.
-* 2 dwords for GFX8.1+. This H/W supports data packing.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_data_buf_d16_32.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_data_buf_d16_32.rst
deleted file mode 100644
index 64328756f84..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_data_buf_d16_32.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_data_buf_d16_32:
-
-vdata
-===========================
-
-16-bit data to store by a buffer instruction.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_data_buf_d16_64.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_data_buf_d16_64.rst
deleted file mode 100644
index 932ce6920fc..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_data_buf_d16_64.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_data_buf_d16_64:
-
-vdata
-===========================
-
-16-bit data to store by a buffer instruction.
-
-*Size:* depends on GFX8 GPU revision:
-
-* 2 dwords for GFX8.0. This H/W supports no packing.
-* 1 dword for GFX8.1+. This H/W supports data packing.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_data_buf_d16_96.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_data_buf_d16_96.rst
deleted file mode 100644
index b9e6915229f..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_data_buf_d16_96.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_data_buf_d16_96:
-
-vdata
-===========================
-
-16-bit data to store by a buffer instruction.
-
-*Size:* depends on GFX8 GPU revision:
-
-* 3 dwords for GFX8.0. This H/W supports no packing.
-* 2 dwords for GFX8.1+. This H/W supports data packing.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_data_mimg_atomic_cmp.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_data_mimg_atomic_cmp.rst
deleted file mode 100644
index 237b91cadfe..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_data_mimg_atomic_cmp.rst
+++ /dev/null
@@ -1,27 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_data_mimg_atomic_cmp:
-
-vdata
-===========================
-
-Input data for an atomic instruction.
-
-Optionally may serve as an output data:
-
-* If :ref:`glc<amdgpu_synid_glc>` is specified, gets the memory value before the operation.
-
-*Size:* depends on :ref:`dmask<amdgpu_synid_dmask>` and :ref:`tfe<amdgpu_synid_tfe>`:
-
-* :ref:`dmask<amdgpu_synid_dmask>` may specify 2 data elements for 32-bit-per-pixel surfaces or 4 data elements for 64-bit-per-pixel surfaces. Each data element occupies 1 dword.
-* :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-  Note: the surface data format is indicated in the image resource constant but not in the instruction.
-
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_data_mimg_atomic_reg.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_data_mimg_atomic_reg.rst
deleted file mode 100644
index 35bcdc379a1..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_data_mimg_atomic_reg.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_data_mimg_atomic_reg:
-
-vdata
-===========================
-
-Input data for an atomic instruction.
-
-Optionally may serve as an output data:
-
-* If :ref:`glc<amdgpu_synid_glc>` is specified, gets the memory value before the operation.
-
-*Size:* depends on :ref:`dmask<amdgpu_synid_dmask>` and :ref:`tfe<amdgpu_synid_tfe>`:
-
-* :ref:`dmask<amdgpu_synid_dmask>` may specify 1 data element for 32-bit-per-pixel surfaces or 2 data elements for 64-bit-per-pixel surfaces. Each data element occupies 1 dword.
-* :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-  Note: the surface data format is indicated in the image resource constant but not in the instruction.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_data_mimg_store.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_data_mimg_store.rst
deleted file mode 100644
index 65a1a49f67e..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_data_mimg_store.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_data_mimg_store:
-
-vdata
-===========================
-
-Image data to store by an *image_store* instruction.
-
-*Size:* depends on :ref:`dmask<amdgpu_synid_dmask>` which may specify from 1 to 4 data elements. Each data element occupies 1 dword.
-
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_data_mimg_store_d16.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_data_mimg_store_d16.rst
deleted file mode 100644
index 7524c884e76..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_data_mimg_store_d16.rst
+++ /dev/null
@@ -1,24 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_data_mimg_store_d16:
-
-vdata
-===========================
-
-Image data to store by an *image_store* instruction.
-
-*Size:* depends on :ref:`dmask<amdgpu_synid_dmask>` and :ref:`d16<amdgpu_synid_d16>`:
-
-* :ref:`dmask<amdgpu_synid_dmask>` may specify from 1 to 4 data elements. Each data element occupies either 32 bits or 16 bits depending on :ref:`d16<amdgpu_synid_d16>`.
-* :ref:`d16<amdgpu_synid_d16>` has different meaning for GFX8.0 and GFX8.1:
-
-  * For GFX8.0 this modifier does not affect size of data elements in registers. Data in registers are stored in low 16 bits, high 16 bits are unused. There is no packing.
-  * Starting from GFX8.1 this modifier specifies that data elements in registers are packed; each value occupies 16 bits.
-
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_128.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_128.rst
deleted file mode 100644
index d076c7025f6..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_128.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_dst_buf_128:
-
-vdst
-===========================
-
-Instruction output: data read from a memory buffer.
-
-*Size:* 4 dwords by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_32.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_32.rst
deleted file mode 100644
index e747530d995..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_32.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_dst_buf_32:
-
-vdst
-===========================
-
-Instruction output: data read from a memory buffer.
-
-*Size:* 1 dword by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_64.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_64.rst
deleted file mode 100644
index f5da65bf573..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_64.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_dst_buf_64:
-
-vdst
-===========================
-
-Instruction output: data read from a memory buffer.
-
-*Size:* 2 dwords by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_96.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_96.rst
deleted file mode 100644
index 0012c1a88d3..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_96.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_dst_buf_96:
-
-vdst
-===========================
-
-Instruction output: data read from a memory buffer.
-
-*Size:* 3 dwords by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_d16_128.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_d16_128.rst
deleted file mode 100644
index 0f5318d8d8c..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_d16_128.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_dst_buf_d16_128:
-
-vdst
-===========================
-
-Instruction output: data read from a memory buffer and converted to a 16-bit format.
-
-*Size:* depends on GFX8 GPU revision and :ref:`tfe<amdgpu_synid_tfe>`:
-
-* 4 dwords for GFX8.0. This H/W supports no packing.
-* 2 dwords for GFX8.1+. This H/W supports data packing.
-* :ref:`tfe<amdgpu_synid_tfe>` adds one dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_d16_32.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_d16_32.rst
deleted file mode 100644
index 6288c2def70..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_d16_32.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_dst_buf_d16_32:
-
-vdst
-===========================
-
-Instruction output: data read from a memory buffer and converted to a 16-bit format.
-
-*Size:* 1 dword by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_d16_64.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_d16_64.rst
deleted file mode 100644
index b46310fd524..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_d16_64.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_dst_buf_d16_64:
-
-vdst
-===========================
-
-Instruction output: data read from a memory buffer and converted to a 16-bit format.
-
-*Size:* depends on GFX8 GPU revision and :ref:`tfe<amdgpu_synid_tfe>`:
-
-* 2 dwords for GFX8.0. This H/W supports no packing.
-* 1 dword for GFX8.1+. This H/W supports data packing.
-* :ref:`tfe<amdgpu_synid_tfe>` adds one dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_d16_96.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_d16_96.rst
deleted file mode 100644
index 15e7e890197..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_d16_96.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_dst_buf_d16_96:
-
-vdst
-===========================
-
-Instruction output: data read from a memory buffer and converted to a 16-bit format.
-
-*Size:* depends on GFX8 GPU revision and :ref:`tfe<amdgpu_synid_tfe>`:
-
-* 3 dwords for GFX8.0. This H/W supports no packing.
-* 2 dwords for GFX8.1+. This H/W supports data packing.
-* :ref:`tfe<amdgpu_synid_tfe>` adds one dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_lds.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_lds.rst
deleted file mode 100644
index b1cb1458dfa..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_buf_lds.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_dst_buf_lds:
-
-vdst
-===========================
-
-Instruction output: data read from a memory buffer.
-
-If :ref:`lds<amdgpu_synid_lds>` is specified, this operand is ignored by H/W and data are stored directly into LDS.
-
-*Size:* 1 dword by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-    Note that :ref:`tfe<amdgpu_synid_tfe>` and :ref:`lds<amdgpu_synid_lds>` cannot be used together.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_flat_atomic32.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_flat_atomic32.rst
deleted file mode 100644
index a8ae4646ae9..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_flat_atomic32.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_dst_flat_atomic32:
-
-vdst
-===========================
-
-Data returned by a 32-bit atomic flat instruction.
-
-This is an optional operand. It must be used if and only if :ref:`glc<amdgpu_synid_glc>` is specified.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_flat_atomic64.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_flat_atomic64.rst
deleted file mode 100644
index 5b46e88f561..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_flat_atomic64.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_dst_flat_atomic64:
-
-vdst
-===========================
-
-Data returned by a 64-bit atomic flat instruction.
-
-This is an optional operand. It must be used if and only if :ref:`glc<amdgpu_synid_glc>` is specified.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_mimg_gather4.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_mimg_gather4.rst
deleted file mode 100644
index 6fc01926ed1..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_mimg_gather4.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_dst_mimg_gather4:
-
-vdst
-===========================
-
-Image data to load by an *image_gather4* instruction.
-
-*Size:* 4 data elements by default. Each data element occupies either 32 bits or 16 bits depending on :ref:`d16<amdgpu_synid_d16>`.
-
-:ref:`d16<amdgpu_synid_d16>` and :ref:`tfe<amdgpu_synid_tfe>` affect operand size as follows:
-
-* :ref:`d16<amdgpu_synid_d16>` has different meaning for GFX8.0 and GFX8.1:
-
-  * For GFX8.0 this modifier does not affect size of data elements in registers. Data in registers are stored in low 16 bits, high 16 bits are unused. There is no packing.
-  * Starting from GFX8.1 this modifier specifies that data elements in registers are packed; each value occupies 16 bits.
-
-* :ref:`tfe<amdgpu_synid_tfe>` adds one dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_mimg_regular.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_mimg_regular.rst
deleted file mode 100644
index be1037a5ce5..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_mimg_regular.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_dst_mimg_regular:
-
-vdst
-===========================
-
-Image data to load by an image instruction.
-
-*Size:* depends on :ref:`dmask<amdgpu_synid_dmask>` and :ref:`tfe<amdgpu_synid_tfe>`:
-
-* :ref:`dmask<amdgpu_synid_dmask>` may specify from 1 to 4 data elements. Each data element occupies 1 dword.
-* :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_mimg_regular_d16.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_mimg_regular_d16.rst
deleted file mode 100644
index 4eb7037386f..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_dst_mimg_regular_d16.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_dst_mimg_regular_d16:
-
-vdst
-===========================
-
-Image data to load by an image instruction.
-
-*Size:* depends on :ref:`dmask<amdgpu_synid_dmask>`, :ref:`tfe<amdgpu_synid_tfe>` and :ref:`d16<amdgpu_synid_d16>`:
-
-* :ref:`dmask<amdgpu_synid_dmask>` may specify from 1 to 4 data elements. Each data element occupies either 32 bits or 16 bits depending on :ref:`d16<amdgpu_synid_d16>`.
-* :ref:`d16<amdgpu_synid_d16>` has different meaning for GFX8.0 and GFX8.1:
-
-  * For GFX8.0 this modifier does not affect size of data elements in registers. Data in registers are stored in low 16 bits, high 16 bits are unused. There is no packing.
-  * Starting from GFX8.1 this modifier specifies that data elements in registers are packed; each value occupies 16 bits.
-
-* :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_fimm16.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_fimm16.rst
deleted file mode 100644
index 2050af2e287..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_fimm16.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_fimm16:
-
-imm32
-===========================
-
-A :ref:`floating-point_number<amdgpu_synid_floating-point_number>`, an :ref:`integer_number<amdgpu_synid_integer_number>`, or an :ref:`absolute_expression<amdgpu_synid_absolute_expression>`.
-The value is converted to *f16* as described :ref:`here<amdgpu_synid_fp_conv>`.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_fimm32.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_fimm32.rst
deleted file mode 100644
index 49796b47ed0..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_fimm32.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_fimm32:
-
-imm32
-===========================
-
-A :ref:`floating-point_number<amdgpu_synid_floating-point_number>`, an :ref:`integer_number<amdgpu_synid_integer_number>`, or an :ref:`absolute_expression<amdgpu_synid_absolute_expression>`.
-The value is converted to *f32* as described :ref:`here<amdgpu_synid_fp_conv>`.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_mod_dpp_sdwa_abs_neg.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_mod_dpp_sdwa_abs_neg.rst
deleted file mode 100644
index 09790e48bc1..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_mod_dpp_sdwa_abs_neg.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_mod_dpp_sdwa_abs_neg:
-
-m
-===========================
-
-This operand may be used with floating point operand modifiers :ref:`abs<amdgpu_synid_abs>` and :ref:`neg<amdgpu_synid_neg>`.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_mod_sdwa_sext.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_mod_sdwa_sext.rst
deleted file mode 100644
index 64141c5104f..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_mod_sdwa_sext.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_mod_sdwa_sext:
-
-m
-===========================
-
-This operand may be used with integer operand modifier :ref:`sext<amdgpu_synid_sext>`.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_mod_vop3_abs_neg.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_mod_vop3_abs_neg.rst
deleted file mode 100644
index a3a4c604383..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_mod_vop3_abs_neg.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_mod_vop3_abs_neg:
-
-m
-===========================
-
-This operand may be used with floating point operand modifiers :ref:`abs<amdgpu_synid_abs>` and :ref:`neg<amdgpu_synid_neg>`.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_offset_buf.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_offset_buf.rst
deleted file mode 100644
index 7b72bb64a3e..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_offset_buf.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_offset_buf:
-
-soffset
-===========================
-
-An unsigned byte offset.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_offset_smem_load.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_offset_smem_load.rst
deleted file mode 100644
index 5c30a87f569..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_offset_smem_load.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_offset_smem_load:
-
-soffset
-===========================
-
-An unsigned byte offset added to the base address to get memory address.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`uimm20<amdgpu_synid_uimm20>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_offset_smem_store.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_offset_smem_store.rst
deleted file mode 100644
index 9ff90f98b35..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_offset_smem_store.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_offset_smem_store:
-
-soffset
-===========================
-
-An unsigned byte offset added to the base address to get memory address.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`m0<amdgpu_synid_m0>`, :ref:`uimm20<amdgpu_synid_uimm20>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_opt.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_opt.rst
deleted file mode 100644
index f9352288d07..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_opt.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_opt:
-
-opt
-===========================
-
-This is an optional operand. It must be used if and only if :ref:`glc<amdgpu_synid_glc>` is specified.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_perm_smem.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_perm_smem.rst
deleted file mode 100644
index b18920bd114..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_perm_smem.rst
+++ /dev/null
@@ -1,24 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_perm_smem:
-
-imm3
-===========================
-
-A bit mask which indicates request permissions.
-
-This operand must be specified as an :ref:`integer_number<amdgpu_synid_integer_number>` or an :ref:`absolute_expression<amdgpu_synid_absolute_expression>`.
-The value is truncated to 7 bits, but only 3 low bits are significant.
-
-    ============ ==============================
-    Bit Number   Description
-    ============ ==============================
-    0            Request *read* permission.
-    1            Request *write* permission.
-    2            Request *execute* permission.
-    ============ ==============================
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_ret.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_ret.rst
deleted file mode 100644
index b4b89d8e647..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_ret.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_ret:
-
-dst
-===========================
-
-This is an input operand. It may optionally serve as a destination if :ref:`glc<amdgpu_synid_glc>` is specified.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_rsrc_buf.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_rsrc_buf.rst
deleted file mode 100644
index ecdb0a0d9dc..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_rsrc_buf.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_rsrc_buf:
-
-srsrc
-===========================
-
-Buffer resource constant which defines the address and characteristics of the buffer in memory.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_rsrc_mimg.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_rsrc_mimg.rst
deleted file mode 100644
index 3ca25592898..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_rsrc_mimg.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_rsrc_mimg:
-
-srsrc
-===========================
-
-Image resource constant which defines the location of the image buffer in memory, its dimensions, tiling, and data format.
-
-*Size:* 8 dwords by default, 4 dwords if :ref:`r128<amdgpu_synid_r128>` is specified.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_samp_mimg.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_samp_mimg.rst
deleted file mode 100644
index c4b27125768..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_samp_mimg.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_samp_mimg:
-
-ssamp
-===========================
-
-Sampler constant used to specify filtering options applied to the image data after it is read.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_sdata128_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_sdata128_0.rst
deleted file mode 100644
index a52703c3545..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_sdata128_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_sdata128_0:
-
-sdata
-===========================
-
-Instruction input.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_sdata32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_sdata32_0.rst
deleted file mode 100644
index 9ccd7bd8c71..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_sdata32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_sdata32_0:
-
-sdata
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_sdata64_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_sdata64_0.rst
deleted file mode 100644
index 8718449228c..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_sdata64_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_sdata64_0:
-
-sdata
-===========================
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst128_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst128_0.rst
deleted file mode 100644
index 277e3db02c4..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst128_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_sdst128_0:
-
-sdst
-===========================
-
-Instruction output.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst256_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst256_0.rst
deleted file mode 100644
index 2e54b9b1462..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst256_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_sdst256_0:
-
-sdst
-===========================
-
-Instruction output.
-
-*Size:* 8 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst32_0.rst
deleted file mode 100644
index 44e6cdc8f7f..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_sdst32_0:
-
-sdst
-===========================
-
-Instruction output.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst32_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst32_1.rst
deleted file mode 100644
index 7156225fa3c..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst32_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_sdst32_1:
-
-sdst
-===========================
-
-Instruction output.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst32_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst32_2.rst
deleted file mode 100644
index af446d3e54c..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst32_2.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_sdst32_2:
-
-sdst
-===========================
-
-Instruction output.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`trap<amdgpu_synid_trap>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst512_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst512_0.rst
deleted file mode 100644
index 95b82a7d024..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst512_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_sdst512_0:
-
-sdst
-===========================
-
-Instruction output.
-
-*Size:* 16 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst64_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst64_0.rst
deleted file mode 100644
index 9195778a5e8..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst64_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_sdst64_0:
-
-sdst
-===========================
-
-Instruction output.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst64_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst64_1.rst
deleted file mode 100644
index 165e0c0175f..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_sdst64_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_sdst64_1:
-
-sdst
-===========================
-
-Instruction output.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`exec<amdgpu_synid_exec>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_simm16.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_simm16.rst
deleted file mode 100644
index 4155272ebfe..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_simm16.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_simm16:
-
-imm16
-===========================
-
-An :ref:`integer_number<amdgpu_synid_integer_number>` or an :ref:`absolute_expression<amdgpu_synid_absolute_expression>`. The value must be in the range -32768..65535.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_0.rst
deleted file mode 100644
index 2e4d42b35f2..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_src32_0:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`lds_direct<amdgpu_synid_lds_direct>`, :ref:`constant<amdgpu_synid_constant>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_1.rst
deleted file mode 100644
index bd06181f7d3..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_src32_1:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`lds_direct<amdgpu_synid_lds_direct>`, :ref:`iconst<amdgpu_synid_iconst>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_2.rst
deleted file mode 100644
index 3d8c63b19e3..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_2.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_src32_2:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`iconst<amdgpu_synid_iconst>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_3.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_3.rst
deleted file mode 100644
index 19071fa8fde..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_3.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_src32_3:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_4.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_4.rst
deleted file mode 100644
index 0b71eec0f2c..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_4.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_src32_4:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`lds_direct<amdgpu_synid_lds_direct>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_5.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_5.rst
deleted file mode 100644
index f37bd89321d..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_5.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_src32_5:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_6.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_6.rst
deleted file mode 100644
index 2fe88a33a46..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_6.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_src32_6:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`lds_direct<amdgpu_synid_lds_direct>`, :ref:`iconst<amdgpu_synid_iconst>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_7.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_7.rst
deleted file mode 100644
index c6b2cacd0b2..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_src32_7.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_src32_7:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`iconst<amdgpu_synid_iconst>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_src64_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_src64_0.rst
deleted file mode 100644
index d62c37e3b60..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_src64_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_src64_0:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_src64_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_src64_1.rst
deleted file mode 100644
index cd5ab8b1b75..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_src64_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_src64_1:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_src_exp.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_src_exp.rst
deleted file mode 100644
index 10449b4e36e..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_src_exp.rst
+++ /dev/null
@@ -1,28 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_src_exp:
-
-vsrc
-===========================
-
-Data to copy to export buffers. This is an optional operand. Must be specified as :ref:`off<amdgpu_synid_off>` if not used.
-
-:ref:`compr<amdgpu_synid_compr>` modifier indicates use of compressed (16-bit) data. This limits number of source operands from 4 to 2:
-
-* src0 and src1 must specify the first register (or :ref:`off<amdgpu_synid_off>`).
-* src2 and src3 must specify the second register (or :ref:`off<amdgpu_synid_off>`).
-
-An example:
-
-.. parsed-literal::
-
-  exp mrtz v3, v3, off, off compr
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`off<amdgpu_synid_off>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc32_0.rst
deleted file mode 100644
index 1f7d9fbdb23..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_ssrc32_0:
-
-ssrc
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc32_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc32_1.rst
deleted file mode 100644
index 203d9c5397f..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc32_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_ssrc32_1:
-
-ssrc
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc32_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc32_2.rst
deleted file mode 100644
index 9b893e962a0..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc32_2.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_ssrc32_2:
-
-ssrc
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc32_3.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc32_3.rst
deleted file mode 100644
index 131765fee50..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc32_3.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_ssrc32_3:
-
-ssrc
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`iconst<amdgpu_synid_iconst>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc32_4.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc32_4.rst
deleted file mode 100644
index eb5e2247fe0..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc32_4.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_ssrc32_4:
-
-ssrc
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc64_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc64_0.rst
deleted file mode 100644
index 6c7efe5d530..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc64_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_ssrc64_0:
-
-ssrc
-===========================
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc64_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc64_1.rst
deleted file mode 100644
index c4fddf4ace2..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc64_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_ssrc64_1:
-
-ssrc
-===========================
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc64_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc64_2.rst
deleted file mode 100644
index 3252202ce98..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc64_2.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_ssrc64_2:
-
-ssrc
-===========================
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc64_3.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc64_3.rst
deleted file mode 100644
index 9ab5436572d..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_ssrc64_3.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_ssrc64_3:
-
-ssrc
-===========================
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`trap<amdgpu_synid_trap>`, :ref:`exec<amdgpu_synid_exec>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_type_dev.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_type_dev.rst
deleted file mode 100644
index cf8f7f7f00e..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_type_dev.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_type_dev:
-
-Type deviation
-===========================
-
-*Type* of this operand differs from *type* :ref:`implied by the opcode<amdgpu_syn_instruction_type>`. This tag specifies actual operand *type*.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_uimm16.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_uimm16.rst
deleted file mode 100644
index 591d0150312..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_uimm16.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_uimm16:
-
-imm16
-===========================
-
-An :ref:`integer_number<amdgpu_synid_integer_number>` or an :ref:`absolute_expression<amdgpu_synid_absolute_expression>`. The value must be in the range 0..65535.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_vcc_64.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_vcc_64.rst
deleted file mode 100644
index e31df0e51c2..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_vcc_64.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_vcc_64:
-
-vcc
-===========================
-
-Vector condition code.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`vcc<amdgpu_synid_vcc>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_vdata128_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_vdata128_0.rst
deleted file mode 100644
index bf7e3db732b..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_vdata128_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_vdata128_0:
-
-vdata
-===========================
-
-Instruction input.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_vdata32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_vdata32_0.rst
deleted file mode 100644
index b89d65b1c79..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_vdata32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_vdata32_0:
-
-vdata
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_vdata64_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_vdata64_0.rst
deleted file mode 100644
index 43805445606..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_vdata64_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_vdata64_0:
-
-vdata
-===========================
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_vdata96_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_vdata96_0.rst
deleted file mode 100644
index b8ad22d1f24..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_vdata96_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_vdata96_0:
-
-vdata
-===========================
-
-Instruction input.
-
-*Size:* 3 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_vdst128_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_vdst128_0.rst
deleted file mode 100644
index 1eccc952309..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_vdst128_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_vdst128_0:
-
-vdst
-===========================
-
-Instruction output.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_vdst32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_vdst32_0.rst
deleted file mode 100644
index 781fcb6ec35..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_vdst32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_vdst32_0:
-
-vdst
-===========================
-
-Instruction output.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_vdst64_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_vdst64_0.rst
deleted file mode 100644
index af2dfe9bf38..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_vdst64_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_vdst64_0:
-
-vdst
-===========================
-
-Instruction output.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_vdst96_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_vdst96_0.rst
deleted file mode 100644
index 4895b657900..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_vdst96_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_vdst96_0:
-
-vdst
-===========================
-
-Instruction output.
-
-*Size:* 3 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_vsrc128_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_vsrc128_0.rst
deleted file mode 100644
index 25b1794d85f..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_vsrc128_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_vsrc128_0:
-
-vsrc
-===========================
-
-Instruction input.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_vsrc32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_vsrc32_0.rst
deleted file mode 100644
index 524f36a0a89..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_vsrc32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_vsrc32_0:
-
-vsrc
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_vsrc32_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_vsrc32_1.rst
deleted file mode 100644
index 5ed15a15226..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_vsrc32_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_vsrc32_1:
-
-vsrc
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`lds_direct<amdgpu_synid_lds_direct>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx8_vsrc64_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx8_vsrc64_0.rst
deleted file mode 100644
index 7c2c39ff753..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx8_vsrc64_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid8_vsrc64_0:
-
-vsrc
-===========================
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx900_mad_type_dev.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx900_mad_type_dev.rst
deleted file mode 100644
index 45f5dab2159..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx900_mad_type_dev.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid900_mad_type_dev:
-
-fx
-===========================
-
-This is an *f32* or *f16* operand depending on instruction modifiers:
-
-* Operand size is controlled by :ref:`m_op_sel_hi<amdgpu_synid_mad_mix_op_sel_hi>`.
-* Location of 16-bit operand is controlled by :ref:`m_op_sel<amdgpu_synid_mad_mix_op_sel>`.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx900_mod_vop3_abs_neg.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx900_mod_vop3_abs_neg.rst
deleted file mode 100644
index b5ccdfbd8a6..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx900_mod_vop3_abs_neg.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid900_mod_vop3_abs_neg:
-
-m
-===========================
-
-This operand may be used with floating point operand modifiers :ref:`abs<amdgpu_synid_abs>` and :ref:`neg<amdgpu_synid_neg>`.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx900_src32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx900_src32_0.rst
deleted file mode 100644
index 9d7c573e78e..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx900_src32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid900_src32_0:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`lds_direct<amdgpu_synid_lds_direct>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx900_src32_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx900_src32_1.rst
deleted file mode 100644
index a5c23c635c4..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx900_src32_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid900_src32_1:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx900_vdst32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx900_vdst32_0.rst
deleted file mode 100644
index 0ae76da5315..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx900_vdst32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid900_vdst32_0:
-
-vdst
-===========================
-
-Instruction output.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx904_mad_type_dev.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx904_mad_type_dev.rst
deleted file mode 100644
index 13cd62a2947..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx904_mad_type_dev.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid904_mad_type_dev:
-
-fx
-===========================
-
-This is an *f32* or *f16* operand depending on instruction modifiers:
-
-* Operand size is controlled by :ref:`m_op_sel_hi<amdgpu_synid_mad_mix_op_sel_hi>`.
-* Location of 16-bit operand is controlled by :ref:`m_op_sel<amdgpu_synid_mad_mix_op_sel>`.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx904_mod_vop3_abs_neg.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx904_mod_vop3_abs_neg.rst
deleted file mode 100644
index f9542496042..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx904_mod_vop3_abs_neg.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid904_mod_vop3_abs_neg:
-
-m
-===========================
-
-This operand may be used with floating point operand modifiers :ref:`abs<amdgpu_synid_abs>` and :ref:`neg<amdgpu_synid_neg>`.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx904_src32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx904_src32_0.rst
deleted file mode 100644
index dbc5ee38739..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx904_src32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid904_src32_0:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`lds_direct<amdgpu_synid_lds_direct>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx904_src32_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx904_src32_1.rst
deleted file mode 100644
index 38dcc4fc126..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx904_src32_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid904_src32_1:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx904_vdst32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx904_vdst32_0.rst
deleted file mode 100644
index 6eb8bdf5b50..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx904_vdst32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid904_vdst32_0:
-
-vdst
-===========================
-
-Instruction output.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx906_mad_type_dev.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx906_mad_type_dev.rst
deleted file mode 100644
index 5b5d4b7c282..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx906_mad_type_dev.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid906_mad_type_dev:
-
-fx
-===========================
-
-This is an *f32* or *f16* operand depending on instruction modifiers:
-
-* Operand size is controlled by :ref:`m_op_sel_hi<amdgpu_synid_mad_mix_op_sel_hi>`.
-* Location of 16-bit operand is controlled by :ref:`m_op_sel<amdgpu_synid_mad_mix_op_sel>`.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx906_mod_dpp_sdwa_abs_neg.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx906_mod_dpp_sdwa_abs_neg.rst
deleted file mode 100644
index 3ddc6fda098..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx906_mod_dpp_sdwa_abs_neg.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid906_mod_dpp_sdwa_abs_neg:
-
-m
-===========================
-
-This operand may be used with floating point operand modifiers :ref:`abs<amdgpu_synid_abs>` and :ref:`neg<amdgpu_synid_neg>`.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx906_mod_sdwa_sext.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx906_mod_sdwa_sext.rst
deleted file mode 100644
index dbb95496c10..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx906_mod_sdwa_sext.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid906_mod_sdwa_sext:
-
-m
-===========================
-
-This operand may be used with integer operand modifier :ref:`sext<amdgpu_synid_sext>`.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx906_mod_vop3_abs_neg.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx906_mod_vop3_abs_neg.rst
deleted file mode 100644
index 1c1e498eb80..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx906_mod_vop3_abs_neg.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid906_mod_vop3_abs_neg:
-
-m
-===========================
-
-This operand may be used with floating point operand modifiers :ref:`abs<amdgpu_synid_abs>` and :ref:`neg<amdgpu_synid_neg>`.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx906_src32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx906_src32_0.rst
deleted file mode 100644
index d755bd98e1a..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx906_src32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid906_src32_0:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`lds_direct<amdgpu_synid_lds_direct>`, :ref:`constant<amdgpu_synid_constant>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx906_src32_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx906_src32_1.rst
deleted file mode 100644
index 8176522793e..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx906_src32_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid906_src32_1:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`lds_direct<amdgpu_synid_lds_direct>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx906_src32_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx906_src32_2.rst
deleted file mode 100644
index 92e91c5b541..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx906_src32_2.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid906_src32_2:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx906_src32_3.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx906_src32_3.rst
deleted file mode 100644
index 98fa3dc575b..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx906_src32_3.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid906_src32_3:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`lds_direct<amdgpu_synid_lds_direct>`, :ref:`iconst<amdgpu_synid_iconst>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx906_src32_4.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx906_src32_4.rst
deleted file mode 100644
index 624f9dff211..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx906_src32_4.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid906_src32_4:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`iconst<amdgpu_synid_iconst>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx906_type_dev.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx906_type_dev.rst
deleted file mode 100644
index 624d96c8bee..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx906_type_dev.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid906_type_dev:
-
-Type deviation
-===========================
-
-*Type* of this operand differs from *type* :ref:`implied by the opcode<amdgpu_syn_instruction_type>`. This tag specifies actual operand *type*.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx906_vdst32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx906_vdst32_0.rst
deleted file mode 100644
index faf0a2d2f9d..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx906_vdst32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid906_vdst32_0:
-
-vdst
-===========================
-
-Instruction output.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx906_vsrc32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx906_vsrc32_0.rst
deleted file mode 100644
index ed350d997eb..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx906_vsrc32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid906_vsrc32_0:
-
-vsrc
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx908_addr_buf.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx908_addr_buf.rst
deleted file mode 100644
index 9dc593be69e..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx908_addr_buf.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid908_addr_buf:
-
-vaddr
-===========================
-
-This is an optional operand which may specify offset and/or index.
-
-*Size:* 0, 1 or 2 dwords. Size is controlled by modifiers :ref:`offen<amdgpu_synid_offen>` and :ref:`idxen<amdgpu_synid_idxen>`:
-
-* If only :ref:`idxen<amdgpu_synid_idxen>` is specified, this operand supplies an index. Size is 1 dword.
-* If only :ref:`offen<amdgpu_synid_offen>` is specified, this operand supplies an offset. Size is 1 dword.
-* If both modifiers are specified, index is in the first register and offset is in the second. Size is 2 dwords.
-* If none of these modifiers are specified, this operand must be set to :ref:`off<amdgpu_synid_off>`.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`off<amdgpu_synid_off>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx908_adst1024_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx908_adst1024_0.rst
deleted file mode 100644
index 3dfe45ede46..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx908_adst1024_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid908_adst1024_0:
-
-adst
-===========================
-
-Instruction output.
-
-*Size:* 32 dwords.
-
-*Operands:* :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx908_adst128_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx908_adst128_0.rst
deleted file mode 100644
index 23c7f9db057..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx908_adst128_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid908_adst128_0:
-
-adst
-===========================
-
-Instruction output.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx908_adst32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx908_adst32_0.rst
deleted file mode 100644
index 80546fa1c83..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx908_adst32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid908_adst32_0:
-
-adst
-===========================
-
-Instruction output.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx908_adst512_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx908_adst512_0.rst
deleted file mode 100644
index 446eb02bf03..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx908_adst512_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid908_adst512_0:
-
-adst
-===========================
-
-Instruction output.
-
-*Size:* 16 dwords.
-
-*Operands:* :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx908_asrc1024_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx908_asrc1024_0.rst
deleted file mode 100644
index 00e1fc7f0f6..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx908_asrc1024_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid908_asrc1024_0:
-
-asrc
-===========================
-
-Instruction input.
-
-*Size:* 32 dwords.
-
-*Operands:* :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx908_asrc128_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx908_asrc128_0.rst
deleted file mode 100644
index 91af6b7357b..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx908_asrc128_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid908_asrc128_0:
-
-asrc
-===========================
-
-Instruction input.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx908_asrc32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx908_asrc32_0.rst
deleted file mode 100644
index 8e46317254d..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx908_asrc32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid908_asrc32_0:
-
-asrc
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx908_asrc512_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx908_asrc512_0.rst
deleted file mode 100644
index 59e22040c22..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx908_asrc512_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid908_asrc512_0:
-
-asrc
-===========================
-
-Instruction input.
-
-*Size:* 16 dwords.
-
-*Operands:* :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx908_data_buf_atomic32.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx908_data_buf_atomic32.rst
deleted file mode 100644
index 03163f55fe5..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx908_data_buf_atomic32.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid908_data_buf_atomic32:
-
-vdata
-===========================
-
-Input data for an atomic instruction.
-
-Optionally may serve as an output data:
-
-* If :ref:`glc<amdgpu_synid_glc>` is specified, gets the memory value before the operation.
-
-*Size:* 1 dword by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx908_dst_flat_atomic32.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx908_dst_flat_atomic32.rst
deleted file mode 100644
index 045058314cb..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx908_dst_flat_atomic32.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid908_dst_flat_atomic32:
-
-vdst
-===========================
-
-Data returned by a 32-bit atomic flat instruction.
-
-This is an optional operand. It must be used if and only if :ref:`glc<amdgpu_synid_glc>` is specified.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx908_mad_type_dev.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx908_mad_type_dev.rst
deleted file mode 100644
index e86e6d058cb..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx908_mad_type_dev.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid908_mad_type_dev:
-
-fx
-===========================
-
-This is an *f32* or *f16* operand depending on instruction modifiers:
-
-* Operand size is controlled by :ref:`m_op_sel_hi<amdgpu_synid_mad_mix_op_sel_hi>`.
-* Location of 16-bit operand is controlled by :ref:`m_op_sel<amdgpu_synid_mad_mix_op_sel>`.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx908_mod_dpp_sdwa_abs_neg.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx908_mod_dpp_sdwa_abs_neg.rst
deleted file mode 100644
index d89f9832eee..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx908_mod_dpp_sdwa_abs_neg.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid908_mod_dpp_sdwa_abs_neg:
-
-m
-===========================
-
-This operand may be used with floating point operand modifiers :ref:`abs<amdgpu_synid_abs>` and :ref:`neg<amdgpu_synid_neg>`.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx908_mod_sdwa_sext.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx908_mod_sdwa_sext.rst
deleted file mode 100644
index 844c7433ac1..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx908_mod_sdwa_sext.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid908_mod_sdwa_sext:
-
-m
-===========================
-
-This operand may be used with integer operand modifier :ref:`sext<amdgpu_synid_sext>`.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx908_mod_vop3_abs_neg.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx908_mod_vop3_abs_neg.rst
deleted file mode 100644
index 6bdd76bb6c3..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx908_mod_vop3_abs_neg.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid908_mod_vop3_abs_neg:
-
-m
-===========================
-
-This operand may be used with floating point operand modifiers :ref:`abs<amdgpu_synid_abs>` and :ref:`neg<amdgpu_synid_neg>`.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx908_offset_buf.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx908_offset_buf.rst
deleted file mode 100644
index 7e39ac3bbb9..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx908_offset_buf.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid908_offset_buf:
-
-soffset
-===========================
-
-An unsigned byte offset.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx908_opt.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx908_opt.rst
deleted file mode 100644
index 950d8c3ab31..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx908_opt.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid908_opt:
-
-opt
-===========================
-
-This is an optional operand. It must be used if and only if :ref:`glc<amdgpu_synid_glc>` is specified.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx908_ret.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx908_ret.rst
deleted file mode 100644
index 20907addb36..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx908_ret.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid908_ret:
-
-dst
-===========================
-
-This is an input operand. It may optionally serve as a destination if :ref:`glc<amdgpu_synid_glc>` is specified.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx908_rsrc_buf.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx908_rsrc_buf.rst
deleted file mode 100644
index 832adfe0763..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx908_rsrc_buf.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid908_rsrc_buf:
-
-srsrc
-===========================
-
-Buffer resource constant which defines the address and characteristics of the buffer in memory.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx908_saddr_flat_global.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx908_saddr_flat_global.rst
deleted file mode 100644
index 050d60f249e..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx908_saddr_flat_global.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid908_saddr_flat_global:
-
-saddr
-===========================
-
-An optional 64-bit flat global address. Must be specified as :ref:`off<amdgpu_synid_off>` if not used.
-
-See :ref:`vaddr<amdgpu_synid908_vaddr_flat_global>` for description of available addressing modes.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`off<amdgpu_synid_off>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx908_src32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx908_src32_0.rst
deleted file mode 100644
index 9491a6490ca..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx908_src32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid908_src32_0:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`lds_direct<amdgpu_synid_lds_direct>`, :ref:`constant<amdgpu_synid_constant>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx908_src32_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx908_src32_1.rst
deleted file mode 100644
index db717a93ac1..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx908_src32_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid908_src32_1:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`lds_direct<amdgpu_synid_lds_direct>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx908_src32_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx908_src32_2.rst
deleted file mode 100644
index f375c555a4d..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx908_src32_2.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid908_src32_2:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx908_src32_3.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx908_src32_3.rst
deleted file mode 100644
index ca445e87ef1..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx908_src32_3.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid908_src32_3:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx908_src32_4.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx908_src32_4.rst
deleted file mode 100644
index aab1b9978ac..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx908_src32_4.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid908_src32_4:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`lds_direct<amdgpu_synid_lds_direct>`, :ref:`iconst<amdgpu_synid_iconst>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx908_src32_5.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx908_src32_5.rst
deleted file mode 100644
index 220dc443e89..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx908_src32_5.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid908_src32_5:
-
-src
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack<amdgpu_synid_xnack>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`iconst<amdgpu_synid_iconst>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx908_type_dev.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx908_type_dev.rst
deleted file mode 100644
index 1321aae8e26..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx908_type_dev.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid908_type_dev:
-
-Type deviation
-===========================
-
-*Type* of this operand differs from *type* :ref:`implied by the opcode<amdgpu_syn_instruction_type>`. This tag specifies actual operand *type*.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx908_vaddr_flat_global.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx908_vaddr_flat_global.rst
deleted file mode 100644
index d7da4774a94..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx908_vaddr_flat_global.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid908_vaddr_flat_global:
-
-vaddr
-===========================
-
-A 64-bit flat global address or a 32-bit offset depending on addressing mode:
-
-* Address = :ref:`vaddr<amdgpu_synid908_vaddr_flat_global>` + :ref:`offset13s<amdgpu_synid_flat_offset13s>`. :ref:`vaddr<amdgpu_synid908_vaddr_flat_global>` is a 64-bit address. This mode is indicated by :ref:`saddr<amdgpu_synid908_saddr_flat_global>` set to :ref:`off<amdgpu_synid_off>`.
-* Address = :ref:`saddr<amdgpu_synid908_saddr_flat_global>` + :ref:`vaddr<amdgpu_synid908_vaddr_flat_global>` + :ref:`offset13s<amdgpu_synid_flat_offset13s>`. :ref:`vaddr<amdgpu_synid908_vaddr_flat_global>` is a 32-bit offset. This mode is used when :ref:`saddr<amdgpu_synid908_saddr_flat_global>` is not :ref:`off<amdgpu_synid_off>`.
-
-*Size:* 1 or 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx908_vasrc32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx908_vasrc32_0.rst
deleted file mode 100644
index 52aaaadc580..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx908_vasrc32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid908_vasrc32_0:
-
-vasrc
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx908_vasrc64_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx908_vasrc64_0.rst
deleted file mode 100644
index bef80d9637a..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx908_vasrc64_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid908_vasrc64_0:
-
-vasrc
-===========================
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx908_vdata32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx908_vdata32_0.rst
deleted file mode 100644
index 7571818881d..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx908_vdata32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid908_vdata32_0:
-
-vdata
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx908_vdst32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx908_vdst32_0.rst
deleted file mode 100644
index ed2214a8fbe..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx908_vdst32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid908_vdst32_0:
-
-vdst
-===========================
-
-Instruction output.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx908_vsrc32_0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx908_vsrc32_0.rst
deleted file mode 100644
index c990b504515..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx908_vsrc32_0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid908_vsrc32_0:
-
-vsrc
-===========================
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_imm16.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_imm16.rst
deleted file mode 100644
index 8d43cf4af06..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_imm16.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_imm16:
-
-imm16
-=====
-
-An :ref:`integer_number<amdgpu_synid_integer_number>` or an :ref:`absolute_expression<amdgpu_synid_absolute_expression>`. The value must be in the range -32768..65535.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_imm16_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_imm16_1.rst
deleted file mode 100644
index f270aa43385..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_imm16_1.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_imm16_1:
-
-imm16
-=====
-
-An :ref:`integer_number<amdgpu_synid_integer_number>` or an :ref:`absolute_expression<amdgpu_synid_absolute_expression>`. The value must be in the range 0..65535.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_imm16_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_imm16_2.rst
deleted file mode 100644
index 17fce930d9c..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_imm16_2.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_imm16_2:
-
-imm16
-=====
-
-A 16-bit :ref:`integer_number<amdgpu_synid_integer_number>` or an :ref:`absolute_expression<amdgpu_synid_absolute_expression>`. The value must be in the range -32768..65535.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_m.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_m.rst
deleted file mode 100644
index 501379d0153..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_m.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_m:
-
-m
-=
-
-This operand may be used with integer operand modifier :ref:`sext<amdgpu_synid_sext>`.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_m_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_m_1.rst
deleted file mode 100644
index 0d1dd6fefc7..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_m_1.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_m_1:
-
-m
-=
-
-This operand may be used with floating point operand modifiers :ref:`abs<amdgpu_synid_abs>` and :ref:`neg<amdgpu_synid_neg>`.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_opt.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_opt.rst
deleted file mode 100644
index dd035b8149e..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_opt.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_opt:
-
-opt
-===
-
-This is an optional operand. It must be used if and only if :ref:`glc<amdgpu_synid_glc>` is specified.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_saddr.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_saddr.rst
deleted file mode 100644
index 4e4c84784e9..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_saddr.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_saddr:
-
-saddr
-=====
-
-An optional 64-bit flat global address. Must be specified as :ref:`off<amdgpu_synid_off>` if not used.
-
-See :ref:`vaddr<amdgpu_synid_gfx90a_vaddr_2>` for description of available addressing modes.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`off<amdgpu_synid_off>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_saddr_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_saddr_1.rst
deleted file mode 100644
index 34d8ad7f66c..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_saddr_1.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_saddr_1:
-
-saddr
-=====
-
-An optional 32-bit flat scratch offset. Must be specified as :ref:`off<amdgpu_synid_off>` if not used.
-
-Either this operand or :ref:`vaddr<amdgpu_synid_gfx90a_vaddr_3>` must be set to :ref:`off<amdgpu_synid_off>`.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`off<amdgpu_synid_off>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sbase.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sbase.rst
deleted file mode 100644
index 669b8f2b8fc..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sbase.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_sbase:
-
-sbase
-=====
-
-A 64-bit base address for scalar memory operations.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sbase_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sbase_1.rst
deleted file mode 100644
index 94f45c157b8..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sbase_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_sbase_1:
-
-sbase
-=====
-
-A 128-bit buffer resource constant for scalar memory operations which provides a base address, a size and a stride.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sbase_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sbase_2.rst
deleted file mode 100644
index 75f00f38e10..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sbase_2.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_sbase_2:
-
-sbase
-=====
-
-This operand is ignored by H/W and :ref:`flat_scratch<amdgpu_synid_flat_scratch>` is supplied instead.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdata.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdata.rst
deleted file mode 100644
index 80d59338c96..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdata.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_sdata:
-
-sdata
-=====
-
-Input data for an atomic instruction.
-
-Optionally may serve as an output data:
-
-* If :ref:`glc<amdgpu_synid_glc>` is specified, gets the memory value before the operation.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdata_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdata_1.rst
deleted file mode 100644
index 34df71ebfda..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdata_1.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_sdata_1:
-
-sdata
-=====
-
-Input data for an atomic instruction.
-
-Optionally may serve as an output data:
-
-* If :ref:`glc<amdgpu_synid_glc>` is specified, gets the memory value before the operation.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdata_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdata_2.rst
deleted file mode 100644
index b0bad7c2651..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdata_2.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_sdata_2:
-
-sdata
-=====
-
-Input data for an atomic instruction.
-
-Optionally may serve as an output data:
-
-* If :ref:`glc<amdgpu_synid_glc>` is specified, gets the memory value before the operation.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdata_3.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdata_3.rst
deleted file mode 100644
index 9d838f5605c..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdata_3.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_sdata_3:
-
-sdata
-=====
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdata_4.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdata_4.rst
deleted file mode 100644
index fd7f62b7c4c..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdata_4.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_sdata_4:
-
-sdata
-=====
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdata_5.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdata_5.rst
deleted file mode 100644
index 7554d386093..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdata_5.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_sdata_5:
-
-sdata
-=====
-
-Instruction input.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst.rst
deleted file mode 100644
index c1980515a1a..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_sdst:
-
-sdst
-====
-
-Instruction output.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst_1.rst
deleted file mode 100644
index cfaedb8befa..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_sdst_1:
-
-sdst
-====
-
-Instruction output.
-
-*Size:* 16 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst_2.rst
deleted file mode 100644
index 58d3d7e598e..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst_2.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_sdst_2:
-
-sdst
-====
-
-Instruction output.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst_3.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst_3.rst
deleted file mode 100644
index 180f4bb68e1..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst_3.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_sdst_3:
-
-sdst
-====
-
-Instruction output.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst_4.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst_4.rst
deleted file mode 100644
index d183c0b2f12..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst_4.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_sdst_4:
-
-sdst
-====
-
-Instruction output.
-
-*Size:* 8 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst_5.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst_5.rst
deleted file mode 100644
index a2ae6920e71..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst_5.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_sdst_5:
-
-sdst
-====
-
-Instruction output.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst_6.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst_6.rst
deleted file mode 100644
index 8a8fddc9bee..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst_6.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_sdst_6:
-
-sdst
-====
-
-Instruction output.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`exec<amdgpu_synid_exec>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst_7.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst_7.rst
deleted file mode 100644
index 079d3bea33c..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_sdst_7.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_sdst_7:
-
-sdst
-====
-
-Instruction output.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_simm32.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_simm32.rst
deleted file mode 100644
index cb0710fdeab..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_simm32.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_simm32:
-
-simm32
-======
-
-An :ref:`integer_number<amdgpu_synid_integer_number>` or an :ref:`absolute_expression<amdgpu_synid_absolute_expression>`. The value is truncated to 32 bits.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_simm32_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_simm32_1.rst
deleted file mode 100644
index dbf68535032..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_simm32_1.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_simm32_1:
-
-simm32
-======
-
-A :ref:`floating-point_number<amdgpu_synid_floating-point_number>`, an :ref:`integer_number<amdgpu_synid_integer_number>`, or an :ref:`absolute_expression<amdgpu_synid_absolute_expression>`.
-The value is converted to *f16* as described :ref:`here<amdgpu_synid_fp_conv>`.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_simm32_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_simm32_2.rst
deleted file mode 100644
index 63b8ad3d110..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_simm32_2.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_simm32_2:
-
-simm32
-======
-
-A :ref:`floating-point_number<amdgpu_synid_floating-point_number>`, an :ref:`integer_number<amdgpu_synid_integer_number>`, or an :ref:`absolute_expression<amdgpu_synid_absolute_expression>`.
-The value is converted to *f32* as described :ref:`here<amdgpu_synid_fp_conv>`.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_soffset.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_soffset.rst
deleted file mode 100644
index 1a4623404c2..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_soffset.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_soffset:
-
-soffset
-=======
-
-An unsigned byte offset.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_soffset_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_soffset_1.rst
deleted file mode 100644
index 13728978887..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_soffset_1.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_soffset_1:
-
-soffset
-=======
-
-An offset added to the base address to get memory address.
-
-* If offset is specified as a register, it supplies an unsigned byte offset.
-* If offset is specified as a 21-bit immediate, it supplies a signed byte offset.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`simm21<amdgpu_synid_simm21>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_soffset_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_soffset_2.rst
deleted file mode 100644
index e94fda005b2..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_soffset_2.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_soffset_2:
-
-soffset
-=======
-
-An unsigned 20-bit offset added to the base address to get memory address.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`uimm20<amdgpu_synid_uimm20>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src.rst
deleted file mode 100644
index 56a69b4b831..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_src:
-
-src
-===
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_1.rst
deleted file mode 100644
index a939cecc679..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_src_1:
-
-src
-===
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_10.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_10.rst
deleted file mode 100644
index d53a92673af..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_10.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_src_10:
-
-src
-===
-
-Instruction input.
-
-*Size:* 8 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_11.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_11.rst
deleted file mode 100644
index bfcf55f08aa..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_11.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_src_11:
-
-src
-===
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_2.rst
deleted file mode 100644
index f4750b299e1..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_2.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_src_2:
-
-src
-===
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_3.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_3.rst
deleted file mode 100644
index 7646f4baa9d..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_3.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_src_3:
-
-src
-===
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`iconst<amdgpu_synid_iconst>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_4.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_4.rst
deleted file mode 100644
index 691af89ef8a..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_4.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_src_4:
-
-src
-===
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`iconst<amdgpu_synid_iconst>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_5.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_5.rst
deleted file mode 100644
index ece72dfc7d7..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_5.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_src_5:
-
-src
-===
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_6.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_6.rst
deleted file mode 100644
index 6c257991281..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_6.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_src_6:
-
-src
-===
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_7.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_7.rst
deleted file mode 100644
index 968984b379e..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_7.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_src_7:
-
-src
-===
-
-Instruction input.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_8.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_8.rst
deleted file mode 100644
index dfcd66e98d0..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_8.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_src_8:
-
-src
-===
-
-Instruction input.
-
-*Size:* 16 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_9.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_9.rst
deleted file mode 100644
index fbf03083e0d..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_src_9.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_src_9:
-
-src
-===
-
-Instruction input.
-
-*Size:* 32 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_srsrc.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_srsrc.rst
deleted file mode 100644
index 4330c4f5165..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_srsrc.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_srsrc:
-
-srsrc
-=====
-
-Image resource constant which defines the location of the image buffer in memory, its dimensions, tiling, and data format.
-
-*Size:* 8 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_srsrc_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_srsrc_1.rst
deleted file mode 100644
index 77a94170df2..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_srsrc_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_srsrc_1:
-
-srsrc
-=====
-
-Buffer resource constant which defines the address and characteristics of the buffer in memory.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc.rst
deleted file mode 100644
index c152bb25940..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_ssrc:
-
-ssrc
-====
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_1.rst
deleted file mode 100644
index 809f04b8a1a..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_ssrc_1:
-
-ssrc
-====
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_2.rst
deleted file mode 100644
index b47ed39496e..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_2.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_ssrc_2:
-
-ssrc
-====
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_3.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_3.rst
deleted file mode 100644
index 759634338e9..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_3.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_ssrc_3:
-
-ssrc
-====
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_4.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_4.rst
deleted file mode 100644
index 709278b864e..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_4.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_ssrc_4:
-
-ssrc
-====
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_5.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_5.rst
deleted file mode 100644
index cf95369da31..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_5.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_ssrc_5:
-
-ssrc
-====
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`exec<amdgpu_synid_exec>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_6.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_6.rst
deleted file mode 100644
index bacb7be2aed..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_6.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_ssrc_6:
-
-ssrc
-====
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_7.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_7.rst
deleted file mode 100644
index c4c5c60554b..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_7.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_ssrc_7:
-
-ssrc
-====
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`iconst<amdgpu_synid_iconst>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_8.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_8.rst
deleted file mode 100644
index cd435b19a71..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_ssrc_8.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_ssrc_8:
-
-ssrc
-====
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vaddr.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vaddr.rst
deleted file mode 100644
index 511d90fa8d8..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vaddr.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vaddr:
-
-vaddr
-=====
-
-An offset from the start of GDS/LDS memory.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vaddr_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vaddr_1.rst
deleted file mode 100644
index 163642c0c13..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vaddr_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vaddr_1:
-
-vaddr
-=====
-
-A 64-bit flat address.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vaddr_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vaddr_2.rst
deleted file mode 100644
index ce380368eb8..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vaddr_2.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vaddr_2:
-
-vaddr
-=====
-
-A 64-bit flat global address or a 32-bit offset depending on addressing mode:
-
-* Address = :ref:`vaddr<amdgpu_synid_gfx90a_vaddr_2>` + :ref:`offset13s<amdgpu_synid_flat_offset13s>`. :ref:`vaddr<amdgpu_synid_gfx90a_vaddr_2>` is a 64-bit address. This mode is indicated by :ref:`saddr<amdgpu_synid_gfx90a_saddr>` set to :ref:`off<amdgpu_synid_off>`.
-* Address = :ref:`saddr<amdgpu_synid_gfx90a_saddr>` + :ref:`vaddr<amdgpu_synid_gfx90a_vaddr_2>` + :ref:`offset13s<amdgpu_synid_flat_offset13s>`. :ref:`vaddr<amdgpu_synid_gfx90a_vaddr_2>` is a 32-bit offset. This mode is used when :ref:`saddr<amdgpu_synid_gfx90a_saddr>` is not :ref:`off<amdgpu_synid_off>`.
-
-*Size:* 1 or 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vaddr_3.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vaddr_3.rst
deleted file mode 100644
index 3ad704705b4..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vaddr_3.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vaddr_3:
-
-vaddr
-=====
-
-An optional 32-bit flat scratch offset. Must be specified as :ref:`off<amdgpu_synid_off>` if not used.
-
-Either this operand or :ref:`saddr<amdgpu_synid_gfx90a_saddr_1>` must be set to :ref:`off<amdgpu_synid_off>`.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`off<amdgpu_synid_off>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vaddr_4.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vaddr_4.rst
deleted file mode 100644
index 5647d4ab33f..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vaddr_4.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vaddr_4:
-
-vaddr
-=====
-
-Image address which includes from one to four dimensional coordinates and other data used to locate a position in the image.
-
-*Size:* 1, 2, 3, 4, 8 or 16 dwords. Actual size depends on opcode, specific image being handled and :ref:`a16<amdgpu_synid_a16>`.
-
-  Note 1. Image format and dimensions are encoded in the image resource constant but not in the instruction.
-
-  Note 2. Actually image address size may vary from 1 to 13 dwords, but assembler currently supports a limited range of register sequences.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vaddr_5.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vaddr_5.rst
deleted file mode 100644
index 19209225c78..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vaddr_5.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vaddr_5:
-
-vaddr
-=====
-
-This is an optional operand which may specify offset and/or index.
-
-*Size:* 0, 1 or 2 dwords. Size is controlled by modifiers :ref:`offen<amdgpu_synid_offen>` and :ref:`idxen<amdgpu_synid_idxen>`:
-
-* If only :ref:`idxen<amdgpu_synid_idxen>` is specified, this operand supplies an index. Size is 1 dword.
-* If only :ref:`offen<amdgpu_synid_offen>` is specified, this operand supplies an offset. Size is 1 dword.
-* If both modifiers are specified, index is in the first register and offset is in the second. Size is 2 dwords.
-* If none of these modifiers are specified, this operand must be set to :ref:`off<amdgpu_synid_off>`.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`off<amdgpu_synid_off>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata.rst
deleted file mode 100644
index 8f3d77feb62..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vdata:
-
-vdata
-=====
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata0.rst
deleted file mode 100644
index f93566d11f4..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vdata0:
-
-vdata0
-======
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata0_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata0_1.rst
deleted file mode 100644
index bb40b08ab5e..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata0_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vdata0_1:
-
-vdata0
-======
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata1.rst
deleted file mode 100644
index d30c31aff93..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vdata1:
-
-vdata1
-======
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata1_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata1_1.rst
deleted file mode 100644
index 6c39bb78179..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata1_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vdata1_1:
-
-vdata1
-======
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_1.rst
deleted file mode 100644
index 9dbeaed2381..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vdata_1:
-
-vdata
-=====
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_10.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_10.rst
deleted file mode 100644
index 0fa492ed287..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_10.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vdata_10:
-
-vdata
-=====
-
-Input data for an atomic instruction.
-
-Optionally may serve as an output data:
-
-* If :ref:`glc<amdgpu_synid_glc>` is specified, gets the memory value before the operation.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_2.rst
deleted file mode 100644
index 11452b2e399..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_2.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vdata_2:
-
-vdata
-=====
-
-Instruction input.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_3.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_3.rst
deleted file mode 100644
index 46ba3338d8c..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_3.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vdata_3:
-
-vdata
-=====
-
-Instruction input.
-
-*Size:* 3 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_4.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_4.rst
deleted file mode 100644
index 1a8450038be..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_4.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vdata_4:
-
-vdata
-=====
-
-Input data for an atomic instruction.
-
-Optionally may serve as an output data:
-
-* If :ref:`glc<amdgpu_synid_glc>` is specified, gets the memory value before the operation.
-
-*Size:* depends on :ref:`dmask<amdgpu_synid_dmask>` and :ref:`tfe<amdgpu_synid_tfe>`:
-
-* :ref:`dmask<amdgpu_synid_dmask>` may specify 1 data element for 32-bit-per-pixel surfaces or 2 data elements for 64-bit-per-pixel surfaces. Each data element occupies 1 dword.
-* :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-  Note: the surface data format is indicated in the image resource constant but not in the instruction.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_5.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_5.rst
deleted file mode 100644
index 6abc50efe97..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_5.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vdata_5:
-
-vdata
-=====
-
-Input data for an atomic instruction.
-
-Optionally may serve as an output data:
-
-* If :ref:`glc<amdgpu_synid_glc>` is specified, gets the memory value before the operation.
-
-*Size:* depends on :ref:`dmask<amdgpu_synid_dmask>` and :ref:`tfe<amdgpu_synid_tfe>`:
-
-* :ref:`dmask<amdgpu_synid_dmask>` may specify 2 data elements for 32-bit-per-pixel surfaces or 4 data elements for 64-bit-per-pixel surfaces. Each data element occupies 1 dword.
-* :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-  Note: the surface data format is indicated in the image resource constant but not in the instruction.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_6.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_6.rst
deleted file mode 100644
index 8deeb8de8db..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_6.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vdata_6:
-
-vdata
-=====
-
-Image data to store by an *image_store* instruction.
-
-*Size:* depends on :ref:`dmask<amdgpu_synid_dmask>` and :ref:`d16<amdgpu_synid_d16>`:
-
-* :ref:`dmask<amdgpu_synid_dmask>` may specify from 1 to 4 data elements. Each data element occupies either 32 bits or 16 bits depending on :ref:`d16<amdgpu_synid_d16>`.
-* :ref:`d16<amdgpu_synid_d16>` specifies that data in registers are packed; each value occupies 16 bits.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_7.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_7.rst
deleted file mode 100644
index 58860a450da..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_7.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vdata_7:
-
-vdata
-=====
-
-Image data to store by an *image_store* instruction.
-
-*Size:* depends on :ref:`dmask<amdgpu_synid_dmask>` which may specify from 1 to 4 data elements. Each data element occupies 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_8.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_8.rst
deleted file mode 100644
index 0753155bb0e..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_8.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vdata_8:
-
-vdata
-=====
-
-Input data for an atomic instruction.
-
-Optionally may serve as an output data:
-
-* If :ref:`glc<amdgpu_synid_glc>` is specified, gets the memory value before the operation.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_9.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_9.rst
deleted file mode 100644
index 158f7a5de4e..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdata_9.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vdata_9:
-
-vdata
-=====
-
-Input data for an atomic instruction.
-
-Optionally may serve as an output data:
-
-* If :ref:`glc<amdgpu_synid_glc>` is specified, gets the memory value before the operation.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst.rst
deleted file mode 100644
index 635809c2eb1..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vdst:
-
-vdst
-====
-
-Instruction output.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_1.rst
deleted file mode 100644
index 95502774380..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vdst_1:
-
-vdst
-====
-
-Instruction output.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_10.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_10.rst
deleted file mode 100644
index b824f2087c8..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_10.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vdst_10:
-
-vdst
-====
-
-Instruction output: data read from a memory buffer.
-
-*Size:* 3 dwords by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_11.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_11.rst
deleted file mode 100644
index 36477152c56..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_11.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vdst_11:
-
-vdst
-====
-
-Instruction output: data read from a memory buffer.
-
-*Size:* 4 dwords by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_12.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_12.rst
deleted file mode 100644
index 01d2df9b093..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_12.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vdst_12:
-
-vdst
-====
-
-Instruction output: data read from a memory buffer.
-
-If :ref:`lds<amdgpu_synid_lds>` is specified, this operand is ignored by H/W and data are stored directly into LDS.
-
-*Size:* 1 dword by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-    Note that :ref:`tfe<amdgpu_synid_tfe>` and :ref:`lds<amdgpu_synid_lds>` cannot be used together.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_13.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_13.rst
deleted file mode 100644
index 60ea58ec1f6..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_13.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vdst_13:
-
-vdst
-====
-
-Instruction output.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_14.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_14.rst
deleted file mode 100644
index d63a6ce179a..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_14.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vdst_14:
-
-vdst
-====
-
-Instruction output.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_15.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_15.rst
deleted file mode 100644
index 75f97e627f9..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_15.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vdst_15:
-
-vdst
-====
-
-Instruction output.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_16.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_16.rst
deleted file mode 100644
index b2028a9ed2f..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_16.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vdst_16:
-
-vdst
-====
-
-Instruction output.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_17.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_17.rst
deleted file mode 100644
index df6d067592f..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_17.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vdst_17:
-
-vdst
-====
-
-Instruction output.
-
-*Size:* 16 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_18.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_18.rst
deleted file mode 100644
index d9aecae4b93..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_18.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vdst_18:
-
-vdst
-====
-
-Instruction output.
-
-*Size:* 32 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_19.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_19.rst
deleted file mode 100644
index 426b2c25fa1..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_19.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vdst_19:
-
-vdst
-====
-
-Instruction output.
-
-*Size:* 8 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_2.rst
deleted file mode 100644
index 876a2350fcf..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_2.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vdst_2:
-
-vdst
-====
-
-Instruction output.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_3.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_3.rst
deleted file mode 100644
index 53869b1a9eb..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_3.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vdst_3:
-
-vdst
-====
-
-Instruction output.
-
-*Size:* 3 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_4.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_4.rst
deleted file mode 100644
index dbab63177b9..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_4.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vdst_4:
-
-vdst
-====
-
-Data returned by a 32-bit atomic flat instruction.
-
-This is an optional operand. It must be used if and only if :ref:`glc<amdgpu_synid_glc>` is specified.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_5.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_5.rst
deleted file mode 100644
index fba2e0a2589..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_5.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vdst_5:
-
-vdst
-====
-
-Data returned by a 64-bit atomic flat instruction.
-
-This is an optional operand. It must be used if and only if :ref:`glc<amdgpu_synid_glc>` is specified.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_6.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_6.rst
deleted file mode 100644
index f3bc6ae3758..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_6.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vdst_6:
-
-vdst
-====
-
-Image data to load by an image instruction.
-
-*Size:* depends on :ref:`dmask<amdgpu_synid_dmask>` and :ref:`tfe<amdgpu_synid_tfe>`:
-
-* :ref:`dmask<amdgpu_synid_dmask>` may specify from 1 to 4 data elements. Each data element occupies 1 dword.
-* :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_7.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_7.rst
deleted file mode 100644
index c4a50804eac..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_7.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vdst_7:
-
-vdst
-====
-
-Image data to load by an image instruction.
-
-*Size:* depends on :ref:`dmask<amdgpu_synid_dmask>`, :ref:`tfe<amdgpu_synid_tfe>` and :ref:`d16<amdgpu_synid_d16>`:
-
-* :ref:`dmask<amdgpu_synid_dmask>` may specify from 1 to 4 data elements. Each data element occupies either 32 bits or 16 bits depending on :ref:`d16<amdgpu_synid_d16>`.
-* :ref:`d16<amdgpu_synid_d16>` specifies that data elements in registers are packed; each value occupies 16 bits.
-* :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_8.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_8.rst
deleted file mode 100644
index 01b73aee146..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_8.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vdst_8:
-
-vdst
-====
-
-Instruction output: data read from a memory buffer.
-
-*Size:* 1 dword by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_9.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_9.rst
deleted file mode 100644
index 9d2a42dcff3..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vdst_9.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vdst_9:
-
-vdst
-====
-
-Instruction output: data read from a memory buffer.
-
-*Size:* 2 dwords by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vsrc.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vsrc.rst
deleted file mode 100644
index 5b5934e19d2..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vsrc.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vsrc:
-
-vsrc
-====
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vsrc_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vsrc_1.rst
deleted file mode 100644
index b9e7b0ed98f..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vsrc_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vsrc_1:
-
-vsrc
-====
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vsrc_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vsrc_2.rst
deleted file mode 100644
index 1793c49e8b5..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vsrc_2.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vsrc_2:
-
-vsrc
-====
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vsrc_3.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vsrc_3.rst
deleted file mode 100644
index 13bffbad38e..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vsrc_3.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vsrc_3:
-
-vsrc
-====
-
-Instruction input.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vsrc_4.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vsrc_4.rst
deleted file mode 100644
index 29f30b42186..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vsrc_4.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vsrc_4:
-
-vsrc
-====
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vsrc_5.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vsrc_5.rst
deleted file mode 100644
index fbfb8795691..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx90a_vsrc_5.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx90a_vsrc_5:
-
-vsrc
-====
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`a<amdgpu_synid_a>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_imm16.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_imm16.rst
deleted file mode 100644
index 713a63b1af5..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_imm16.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_imm16:
-
-imm16
-=====
-
-An :ref:`integer_number<amdgpu_synid_integer_number>` or an :ref:`absolute_expression<amdgpu_synid_absolute_expression>`. The value must be in the range -32768..65535.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_imm16_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_imm16_1.rst
deleted file mode 100644
index 2ce77ef48d6..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_imm16_1.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_imm16_1:
-
-imm16
-=====
-
-An :ref:`integer_number<amdgpu_synid_integer_number>` or an :ref:`absolute_expression<amdgpu_synid_absolute_expression>`. The value must be in the range 0..65535.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_imm16_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_imm16_2.rst
deleted file mode 100644
index f71887425af..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_imm16_2.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_imm16_2:
-
-imm16
-=====
-
-A 16-bit :ref:`integer_number<amdgpu_synid_integer_number>` or an :ref:`absolute_expression<amdgpu_synid_absolute_expression>`. The value must be in the range -32768..65535.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_m.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_m.rst
deleted file mode 100644
index e7759aa1352..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_m.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_m:
-
-m
-=
-
-This operand may be used with integer operand modifier :ref:`sext<amdgpu_synid_sext>`.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_m_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_m_1.rst
deleted file mode 100644
index f4dec5955e7..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_m_1.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_m_1:
-
-m
-=
-
-This operand may be used with floating point operand modifiers :ref:`abs<amdgpu_synid_abs>` and :ref:`neg<amdgpu_synid_neg>`.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_opt.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_opt.rst
deleted file mode 100644
index 913bb51b039..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_opt.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_opt:
-
-opt
-===
-
-This is an optional operand. It must be used if and only if :ref:`glc<amdgpu_synid_glc>` is specified.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_saddr.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_saddr.rst
deleted file mode 100644
index 442f523d734..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_saddr.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_saddr:
-
-saddr
-=====
-
-An optional 64-bit flat global address. Must be specified as :ref:`off<amdgpu_synid_off>` if not used.
-
-See :ref:`vaddr<amdgpu_synid_gfx9_vaddr_2>` for description of available addressing modes.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`off<amdgpu_synid_off>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_saddr_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_saddr_1.rst
deleted file mode 100644
index b2a9277514a..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_saddr_1.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_saddr_1:
-
-saddr
-=====
-
-An optional 32-bit flat scratch offset. Must be specified as :ref:`off<amdgpu_synid_off>` if not used.
-
-Either this operand or :ref:`vaddr<amdgpu_synid_gfx9_vaddr_3>` must be set to :ref:`off<amdgpu_synid_off>`.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`off<amdgpu_synid_off>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_sbase.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_sbase.rst
deleted file mode 100644
index 9ab35cfdb85..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_sbase.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_sbase:
-
-sbase
-=====
-
-A 64-bit base address for scalar memory operations.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_sbase_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_sbase_1.rst
deleted file mode 100644
index 7ddb7347f36..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_sbase_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_sbase_1:
-
-sbase
-=====
-
-A 128-bit buffer resource constant for scalar memory operations which provides a base address, a size and a stride.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_sbase_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_sbase_2.rst
deleted file mode 100644
index 69a9c77e63a..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_sbase_2.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_sbase_2:
-
-sbase
-=====
-
-This operand is ignored by H/W and :ref:`flat_scratch<amdgpu_synid_flat_scratch>` is supplied instead.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdata.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdata.rst
deleted file mode 100644
index b76aea265e8..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdata.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_sdata:
-
-sdata
-=====
-
-Input data for an atomic instruction.
-
-Optionally may serve as an output data:
-
-* If :ref:`glc<amdgpu_synid_glc>` is specified, gets the memory value before the operation.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdata_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdata_1.rst
deleted file mode 100644
index eff06aecf6d..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdata_1.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_sdata_1:
-
-sdata
-=====
-
-Input data for an atomic instruction.
-
-Optionally may serve as an output data:
-
-* If :ref:`glc<amdgpu_synid_glc>` is specified, gets the memory value before the operation.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdata_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdata_2.rst
deleted file mode 100644
index af0f92ee207..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdata_2.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_sdata_2:
-
-sdata
-=====
-
-Input data for an atomic instruction.
-
-Optionally may serve as an output data:
-
-* If :ref:`glc<amdgpu_synid_glc>` is specified, gets the memory value before the operation.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdata_3.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdata_3.rst
deleted file mode 100644
index 7f4bd43ac1a..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdata_3.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_sdata_3:
-
-sdata
-=====
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdata_4.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdata_4.rst
deleted file mode 100644
index e63b71b71e5..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdata_4.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_sdata_4:
-
-sdata
-=====
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdata_5.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdata_5.rst
deleted file mode 100644
index 57b13d24e28..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdata_5.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_sdata_5:
-
-sdata
-=====
-
-Instruction input.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst.rst
deleted file mode 100644
index c6d93c746fe..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_sdst:
-
-sdst
-====
-
-Instruction output.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst_1.rst
deleted file mode 100644
index 3687964c95a..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_sdst_1:
-
-sdst
-====
-
-Instruction output.
-
-*Size:* 16 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst_2.rst
deleted file mode 100644
index 3f2e0270d22..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst_2.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_sdst_2:
-
-sdst
-====
-
-Instruction output.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst_3.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst_3.rst
deleted file mode 100644
index fc53889b86f..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst_3.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_sdst_3:
-
-sdst
-====
-
-Instruction output.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst_4.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst_4.rst
deleted file mode 100644
index 9f5c4eee379..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst_4.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_sdst_4:
-
-sdst
-====
-
-Instruction output.
-
-*Size:* 8 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst_5.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst_5.rst
deleted file mode 100644
index 7987c7fb053..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst_5.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_sdst_5:
-
-sdst
-====
-
-Instruction output.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst_6.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst_6.rst
deleted file mode 100644
index 80bbd65fb6f..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst_6.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_sdst_6:
-
-sdst
-====
-
-Instruction output.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`exec<amdgpu_synid_exec>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst_7.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst_7.rst
deleted file mode 100644
index 425a331e20b..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_sdst_7.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_sdst_7:
-
-sdst
-====
-
-Instruction output.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_simm32.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_simm32.rst
deleted file mode 100644
index 7e8521351c8..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_simm32.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_simm32:
-
-simm32
-======
-
-An :ref:`integer_number<amdgpu_synid_integer_number>` or an :ref:`absolute_expression<amdgpu_synid_absolute_expression>`. The value is truncated to 32 bits.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_simm32_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_simm32_1.rst
deleted file mode 100644
index 00d0de18847..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_simm32_1.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_simm32_1:
-
-simm32
-======
-
-A :ref:`floating-point_number<amdgpu_synid_floating-point_number>`, an :ref:`integer_number<amdgpu_synid_integer_number>`, or an :ref:`absolute_expression<amdgpu_synid_absolute_expression>`.
-The value is converted to *f16* as described :ref:`here<amdgpu_synid_fp_conv>`.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_simm32_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_simm32_2.rst
deleted file mode 100644
index 8698c8a7225..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_simm32_2.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_simm32_2:
-
-simm32
-======
-
-A :ref:`floating-point_number<amdgpu_synid_floating-point_number>`, an :ref:`integer_number<amdgpu_synid_integer_number>`, or an :ref:`absolute_expression<amdgpu_synid_absolute_expression>`.
-The value is converted to *f32* as described :ref:`here<amdgpu_synid_fp_conv>`.
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_soffset.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_soffset.rst
deleted file mode 100644
index 9b55558bb6e..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_soffset.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_soffset:
-
-soffset
-=======
-
-An unsigned byte offset.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_soffset_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_soffset_1.rst
deleted file mode 100644
index ecac0608d1c..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_soffset_1.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_soffset_1:
-
-soffset
-=======
-
-An offset added to the base address to get memory address.
-
-* If offset is specified as a register, it supplies an unsigned byte offset.
-* If offset is specified as a 21-bit immediate, it supplies a signed byte offset.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`simm21<amdgpu_synid_simm21>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_soffset_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_soffset_2.rst
deleted file mode 100644
index 8faf02db065..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_soffset_2.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_soffset_2:
-
-soffset
-=======
-
-An unsigned 20-bit offset added to the base address to get memory address.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`uimm20<amdgpu_synid_uimm20>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_src.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_src.rst
deleted file mode 100644
index f0fe23228f6..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_src.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_src:
-
-src
-===
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`lds_direct<amdgpu_synid_lds_direct>`, :ref:`constant<amdgpu_synid_constant>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_src_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_src_1.rst
deleted file mode 100644
index ac4dea9107a..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_src_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_src_1:
-
-src
-===
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_src_10.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_src_10.rst
deleted file mode 100644
index 9c46c019d5c..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_src_10.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_src_10:
-
-src
-===
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`lds_direct<amdgpu_synid_lds_direct>`, :ref:`iconst<amdgpu_synid_iconst>`, :ref:`ival<amdgpu_synid_ival>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_src_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_src_2.rst
deleted file mode 100644
index a2a0b35f3ee..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_src_2.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_src_2:
-
-src
-===
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_src_3.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_src_3.rst
deleted file mode 100644
index 7f2de41e458..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_src_3.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_src_3:
-
-src
-===
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`lds_direct<amdgpu_synid_lds_direct>`, :ref:`iconst<amdgpu_synid_iconst>`, :ref:`ival<amdgpu_synid_ival>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_src_4.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_src_4.rst
deleted file mode 100644
index d9c94428114..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_src_4.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_src_4:
-
-src
-===
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`iconst<amdgpu_synid_iconst>`, :ref:`ival<amdgpu_synid_ival>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_src_5.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_src_5.rst
deleted file mode 100644
index acbac62e7bd..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_src_5.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_src_5:
-
-src
-===
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`lds_direct<amdgpu_synid_lds_direct>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_src_6.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_src_6.rst
deleted file mode 100644
index ebae6c08834..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_src_6.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_src_6:
-
-src
-===
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`iconst<amdgpu_synid_iconst>`, :ref:`ival<amdgpu_synid_ival>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_src_7.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_src_7.rst
deleted file mode 100644
index 2b736f8e86e..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_src_7.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_src_7:
-
-src
-===
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_src_8.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_src_8.rst
deleted file mode 100644
index f610fc23125..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_src_8.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_src_8:
-
-src
-===
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`lds_direct<amdgpu_synid_lds_direct>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_src_9.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_src_9.rst
deleted file mode 100644
index 83cb0b4c3e1..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_src_9.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_src_9:
-
-src
-===
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_srsrc.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_srsrc.rst
deleted file mode 100644
index 5916602cb10..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_srsrc.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_srsrc:
-
-srsrc
-=====
-
-Image resource constant which defines the location of the image buffer in memory, its dimensions, tiling, and data format.
-
-*Size:* 8 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_srsrc_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_srsrc_1.rst
deleted file mode 100644
index 4cbcb1fb829..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_srsrc_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_srsrc_1:
-
-srsrc
-=====
-
-Buffer resource constant which defines the address and characteristics of the buffer in memory.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc.rst
deleted file mode 100644
index 59f44c6a934..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_ssrc:
-
-ssrc
-====
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_1.rst
deleted file mode 100644
index 6fd4eafb60a..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_ssrc_1:
-
-ssrc
-====
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`, :ref:`literal<amdgpu_synid_literal>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_2.rst
deleted file mode 100644
index 60a15bbab08..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_2.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_ssrc_2:
-
-ssrc
-====
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_3.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_3.rst
deleted file mode 100644
index 98b002065aa..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_3.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_ssrc_3:
-
-ssrc
-====
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_4.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_4.rst
deleted file mode 100644
index a5a60d3c409..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_4.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_ssrc_4:
-
-ssrc
-====
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_5.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_5.rst
deleted file mode 100644
index bd0dcfd1687..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_5.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_ssrc_5:
-
-ssrc
-====
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`exec<amdgpu_synid_exec>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_6.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_6.rst
deleted file mode 100644
index 02faee4dc6f..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_6.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_ssrc_6:
-
-ssrc
-====
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_7.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_7.rst
deleted file mode 100644
index ed05b75f75d..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_7.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_ssrc_7:
-
-ssrc
-====
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`iconst<amdgpu_synid_iconst>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_8.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_8.rst
deleted file mode 100644
index 8457952c025..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_ssrc_8.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_ssrc_8:
-
-ssrc
-====
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`s<amdgpu_synid_s>`, :ref:`flat_scratch<amdgpu_synid_flat_scratch>`, :ref:`xnack_mask<amdgpu_synid_xnack_mask>`, :ref:`vcc<amdgpu_synid_vcc>`, :ref:`ttmp<amdgpu_synid_ttmp>`, :ref:`m0<amdgpu_synid_m0>`, :ref:`exec<amdgpu_synid_exec>`, :ref:`vccz<amdgpu_synid_vccz>`, :ref:`execz<amdgpu_synid_execz>`, :ref:`scc<amdgpu_synid_scc>`, :ref:`constant<amdgpu_synid_constant>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vaddr.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vaddr.rst
deleted file mode 100644
index 194b2688f93..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vaddr.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vaddr:
-
-vaddr
-=====
-
-An offset from the start of GDS/LDS memory.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vaddr_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vaddr_1.rst
deleted file mode 100644
index aabf5655f05..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vaddr_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vaddr_1:
-
-vaddr
-=====
-
-A 64-bit flat address.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vaddr_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vaddr_2.rst
deleted file mode 100644
index 0ee1edd2d9d..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vaddr_2.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vaddr_2:
-
-vaddr
-=====
-
-A 64-bit flat global address or a 32-bit offset depending on addressing mode:
-
-* Address = :ref:`vaddr<amdgpu_synid_gfx9_vaddr_2>` + :ref:`offset13s<amdgpu_synid_flat_offset13s>`. :ref:`vaddr<amdgpu_synid_gfx9_vaddr_2>` is a 64-bit address. This mode is indicated by :ref:`saddr<amdgpu_synid_gfx9_saddr>` set to :ref:`off<amdgpu_synid_off>`.
-* Address = :ref:`saddr<amdgpu_synid_gfx9_saddr>` + :ref:`vaddr<amdgpu_synid_gfx9_vaddr_2>` + :ref:`offset13s<amdgpu_synid_flat_offset13s>`. :ref:`vaddr<amdgpu_synid_gfx9_vaddr_2>` is a 32-bit offset. This mode is used when :ref:`saddr<amdgpu_synid_gfx9_saddr>` is not :ref:`off<amdgpu_synid_off>`.
-
-*Size:* 1 or 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vaddr_3.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vaddr_3.rst
deleted file mode 100644
index f332cb6151c..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vaddr_3.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vaddr_3:
-
-vaddr
-=====
-
-An optional 32-bit flat scratch offset. Must be specified as :ref:`off<amdgpu_synid_off>` if not used.
-
-Either this operand or :ref:`saddr<amdgpu_synid_gfx9_saddr_1>` must be set to :ref:`off<amdgpu_synid_off>`.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`off<amdgpu_synid_off>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vaddr_4.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vaddr_4.rst
deleted file mode 100644
index ccee5f4c493..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vaddr_4.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vaddr_4:
-
-vaddr
-=====
-
-Image address which includes from one to four dimensional coordinates and other data used to locate a position in the image.
-
-*Size:* 1, 2, 3, 4, 8 or 16 dwords. Actual size depends on opcode, specific image being handled and :ref:`a16<amdgpu_synid_a16>`.
-
-  Note 1. Image format and dimensions are encoded in the image resource constant but not in the instruction.
-
-  Note 2. Actually image address size may vary from 1 to 13 dwords, but assembler currently supports a limited range of register sequences.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vaddr_5.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vaddr_5.rst
deleted file mode 100644
index 0c2b159f826..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vaddr_5.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vaddr_5:
-
-vaddr
-=====
-
-This is an optional operand which may specify offset and/or index.
-
-*Size:* 0, 1 or 2 dwords. Size is controlled by modifiers :ref:`offen<amdgpu_synid_offen>` and :ref:`idxen<amdgpu_synid_idxen>`:
-
-* If only :ref:`idxen<amdgpu_synid_idxen>` is specified, this operand supplies an index. Size is 1 dword.
-* If only :ref:`offen<amdgpu_synid_offen>` is specified, this operand supplies an offset. Size is 1 dword.
-* If both modifiers are specified, index is in the first register and offset is in the second. Size is 2 dwords.
-* If none of these modifiers are specified, this operand must be set to :ref:`off<amdgpu_synid_off>`.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`off<amdgpu_synid_off>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata.rst
deleted file mode 100644
index fa754016904..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vdata:
-
-vdata
-=====
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata0.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata0.rst
deleted file mode 100644
index 4df069ff9ff..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata0.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vdata0:
-
-vdata0
-======
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata0_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata0_1.rst
deleted file mode 100644
index 00595e258f0..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata0_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vdata0_1:
-
-vdata0
-======
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata1.rst
deleted file mode 100644
index 07e21e3ddcf..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vdata1:
-
-vdata1
-======
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata1_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata1_1.rst
deleted file mode 100644
index a5083fb8829..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata1_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vdata1_1:
-
-vdata1
-======
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_1.rst
deleted file mode 100644
index 585f816e3e3..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vdata_1:
-
-vdata
-=====
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_10.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_10.rst
deleted file mode 100644
index 2d420877eed..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_10.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vdata_10:
-
-vdata
-=====
-
-Input data for an atomic instruction.
-
-Optionally may serve as an output data:
-
-* If :ref:`glc<amdgpu_synid_glc>` is specified, gets the memory value before the operation.
-
-*Size:* 4 dwords by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_2.rst
deleted file mode 100644
index 5cd172bfc7d..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_2.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vdata_2:
-
-vdata
-=====
-
-Instruction input.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_3.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_3.rst
deleted file mode 100644
index a705537d155..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_3.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vdata_3:
-
-vdata
-=====
-
-Instruction input.
-
-*Size:* 3 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_4.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_4.rst
deleted file mode 100644
index 1d8eb16be77..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_4.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vdata_4:
-
-vdata
-=====
-
-Input data for an atomic instruction.
-
-Optionally may serve as an output data:
-
-* If :ref:`glc<amdgpu_synid_glc>` is specified, gets the memory value before the operation.
-
-*Size:* depends on :ref:`dmask<amdgpu_synid_dmask>` and :ref:`tfe<amdgpu_synid_tfe>`:
-
-* :ref:`dmask<amdgpu_synid_dmask>` may specify 1 data element for 32-bit-per-pixel surfaces or 2 data elements for 64-bit-per-pixel surfaces. Each data element occupies 1 dword.
-* :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-  Note: the surface data format is indicated in the image resource constant but not in the instruction.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_5.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_5.rst
deleted file mode 100644
index 1a9ee65b0d1..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_5.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vdata_5:
-
-vdata
-=====
-
-Input data for an atomic instruction.
-
-Optionally may serve as an output data:
-
-* If :ref:`glc<amdgpu_synid_glc>` is specified, gets the memory value before the operation.
-
-*Size:* depends on :ref:`dmask<amdgpu_synid_dmask>` and :ref:`tfe<amdgpu_synid_tfe>`:
-
-* :ref:`dmask<amdgpu_synid_dmask>` may specify 2 data elements for 32-bit-per-pixel surfaces or 4 data elements for 64-bit-per-pixel surfaces. Each data element occupies 1 dword.
-* :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-  Note: the surface data format is indicated in the image resource constant but not in the instruction.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_6.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_6.rst
deleted file mode 100644
index fab039c6757..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_6.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vdata_6:
-
-vdata
-=====
-
-Image data to store by an *image_store* instruction.
-
-*Size:* depends on :ref:`dmask<amdgpu_synid_dmask>` and :ref:`d16<amdgpu_synid_d16>`:
-
-* :ref:`dmask<amdgpu_synid_dmask>` may specify from 1 to 4 data elements. Each data element occupies either 32 bits or 16 bits depending on :ref:`d16<amdgpu_synid_d16>`.
-* :ref:`d16<amdgpu_synid_d16>` specifies that data in registers are packed; each value occupies 16 bits.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_7.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_7.rst
deleted file mode 100644
index df1dca53ba0..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_7.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vdata_7:
-
-vdata
-=====
-
-Image data to store by an *image_store* instruction.
-
-*Size:* depends on :ref:`dmask<amdgpu_synid_dmask>` which may specify from 1 to 4 data elements. Each data element occupies 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_8.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_8.rst
deleted file mode 100644
index df9d32e69c4..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_8.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vdata_8:
-
-vdata
-=====
-
-Input data for an atomic instruction.
-
-Optionally may serve as an output data:
-
-* If :ref:`glc<amdgpu_synid_glc>` is specified, gets the memory value before the operation.
-
-*Size:* 1 dword by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_9.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_9.rst
deleted file mode 100644
index caafea5bead..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdata_9.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vdata_9:
-
-vdata
-=====
-
-Input data for an atomic instruction.
-
-Optionally may serve as an output data:
-
-* If :ref:`glc<amdgpu_synid_glc>` is specified, gets the memory value before the operation.
-
-*Size:* 2 dwords by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst.rst
deleted file mode 100644
index 1c003ac22fb..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vdst:
-
-vdst
-====
-
-Instruction output.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_1.rst
deleted file mode 100644
index 7e2f6317ef3..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vdst_1:
-
-vdst
-====
-
-Instruction output.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_10.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_10.rst
deleted file mode 100644
index 8e7b9908aa5..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_10.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vdst_10:
-
-vdst
-====
-
-Instruction output: data read from a memory buffer.
-
-*Size:* 2 dwords by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_11.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_11.rst
deleted file mode 100644
index f3512d3aa21..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_11.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vdst_11:
-
-vdst
-====
-
-Instruction output: data read from a memory buffer.
-
-*Size:* 3 dwords by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_12.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_12.rst
deleted file mode 100644
index 09d4d7a1bb5..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_12.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vdst_12:
-
-vdst
-====
-
-Instruction output: data read from a memory buffer.
-
-*Size:* 4 dwords by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_13.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_13.rst
deleted file mode 100644
index ff27ff0d0d1..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_13.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vdst_13:
-
-vdst
-====
-
-Instruction output: data read from a memory buffer.
-
-If :ref:`lds<amdgpu_synid_lds>` is specified, this operand is ignored by H/W and data are stored directly into LDS.
-
-*Size:* 1 dword by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-    Note that :ref:`tfe<amdgpu_synid_tfe>` and :ref:`lds<amdgpu_synid_lds>` cannot be used together.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_2.rst
deleted file mode 100644
index 11c1fdbbecd..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_2.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vdst_2:
-
-vdst
-====
-
-Instruction output.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_3.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_3.rst
deleted file mode 100644
index cfc129198c0..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_3.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vdst_3:
-
-vdst
-====
-
-Instruction output.
-
-*Size:* 3 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_4.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_4.rst
deleted file mode 100644
index b7d5ebef61a..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_4.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vdst_4:
-
-vdst
-====
-
-Data returned by a 32-bit atomic flat instruction.
-
-This is an optional operand. It must be used if and only if :ref:`glc<amdgpu_synid_glc>` is specified.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_5.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_5.rst
deleted file mode 100644
index faf7f8d86d5..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_5.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vdst_5:
-
-vdst
-====
-
-Data returned by a 64-bit atomic flat instruction.
-
-This is an optional operand. It must be used if and only if :ref:`glc<amdgpu_synid_glc>` is specified.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_6.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_6.rst
deleted file mode 100644
index d82c8989c5c..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_6.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vdst_6:
-
-vdst
-====
-
-Image data to load by an *image_gather4* instruction.
-
-*Size:* 4 data elements by default. Each data element occupies either 32 bits or 16 bits depending on :ref:`d16<amdgpu_synid_d16>`.
-
-:ref:`d16<amdgpu_synid_d16>` and :ref:`tfe<amdgpu_synid_tfe>` affect operand size as follows:
-
-* :ref:`d16<amdgpu_synid_d16>` specifies that data elements in registers are packed; each value occupies 16 bits.
-* :ref:`tfe<amdgpu_synid_tfe>` adds one dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_7.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_7.rst
deleted file mode 100644
index 6c4860c9bf8..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_7.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vdst_7:
-
-vdst
-====
-
-Image data to load by an image instruction.
-
-*Size:* depends on :ref:`dmask<amdgpu_synid_dmask>` and :ref:`tfe<amdgpu_synid_tfe>`:
-
-* :ref:`dmask<amdgpu_synid_dmask>` may specify from 1 to 4 data elements. Each data element occupies 1 dword.
-* :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_8.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_8.rst
deleted file mode 100644
index 4a507b19372..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_8.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vdst_8:
-
-vdst
-====
-
-Image data to load by an image instruction.
-
-*Size:* depends on :ref:`dmask<amdgpu_synid_dmask>`, :ref:`tfe<amdgpu_synid_tfe>` and :ref:`d16<amdgpu_synid_d16>`:
-
-* :ref:`dmask<amdgpu_synid_dmask>` may specify from 1 to 4 data elements. Each data element occupies either 32 bits or 16 bits depending on :ref:`d16<amdgpu_synid_d16>`.
-* :ref:`d16<amdgpu_synid_d16>` specifies that data elements in registers are packed; each value occupies 16 bits.
-* :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_9.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_9.rst
deleted file mode 100644
index dabefd27c16..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vdst_9.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vdst_9:
-
-vdst
-====
-
-Instruction output: data read from a memory buffer.
-
-*Size:* 1 dword by default. :ref:`tfe<amdgpu_synid_tfe>` adds 1 dword if specified.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vsrc.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vsrc.rst
deleted file mode 100644
index efe436c9485..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vsrc.rst
+++ /dev/null
@@ -1,28 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vsrc:
-
-vsrc
-====
-
-Data to copy to export buffers. This is an optional operand. Must be specified as :ref:`off<amdgpu_synid_off>` if not used.
-
-:ref:`compr<amdgpu_synid_compr>` modifier indicates use of compressed (16-bit) data. This limits number of source operands from 4 to 2:
-
-* src0 and src1 must specify the first register (or :ref:`off<amdgpu_synid_off>`).
-* src2 and src3 must specify the second register (or :ref:`off<amdgpu_synid_off>`).
-
-An example:
-
-.. parsed-literal::
-
-  exp mrtz v3, v3, off, off compr
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`, :ref:`off<amdgpu_synid_off>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vsrc_1.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vsrc_1.rst
deleted file mode 100644
index 15035b4d3e5..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vsrc_1.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vsrc_1:
-
-vsrc
-====
-
-Instruction input.
-
-*Size:* 1 dword.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vsrc_2.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vsrc_2.rst
deleted file mode 100644
index 3eb9e5fb5b3..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vsrc_2.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vsrc_2:
-
-vsrc
-====
-
-Instruction input.
-
-*Size:* 4 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vsrc_3.rst b/gnu/llvm/llvm/docs/AMDGPU/gfx9_vsrc_3.rst
deleted file mode 100644
index 886257f20c8..00000000000
--- a/gnu/llvm/llvm/docs/AMDGPU/gfx9_vsrc_3.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-..
-    **************************************************
-    *                                                *
-    *   Automatically generated file, do not edit!   *
-    *                                                *
-    **************************************************
-
-.. _amdgpu_synid_gfx9_vsrc_3:
-
-vsrc
-====
-
-Instruction input.
-
-*Size:* 2 dwords.
-
-*Operands:* :ref:`v<amdgpu_synid_v>`
diff --git a/gnu/llvm/llvm/docs/Makefile.sphinx b/gnu/llvm/llvm/docs/Makefile.sphinx
deleted file mode 100644
index 21f66488b2b..00000000000
--- a/gnu/llvm/llvm/docs/Makefile.sphinx
+++ /dev/null
@@ -1,155 +0,0 @@
-# Makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
-PAPER         =
-BUILDDIR      = _build
-
-# Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-# the i18n builder cannot share the environment and doctrees with the others
-I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
-
-all:	html
-
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html       to make standalone HTML files"
-	@echo "  dirhtml    to make HTML files named index.html in directories"
-	@echo "  singlehtml to make a single large HTML file"
-	@echo "  pickle     to make pickle files"
-	@echo "  json       to make JSON files"
-	@echo "  htmlhelp   to make HTML files and a HTML help project"
-	@echo "  qthelp     to make HTML files and a qthelp project"
-	@echo "  devhelp    to make HTML files and a Devhelp project"
-	@echo "  epub       to make an epub"
-	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
-	@echo "  text       to make text files"
-	@echo "  man        to make manual pages"
-	@echo "  texinfo    to make Texinfo files"
-	@echo "  info       to make Texinfo files and run them through makeinfo"
-	@echo "  gettext    to make PO message catalogs"
-	@echo "  changes    to make an overview of all changed/added/deprecated items"
-	@echo "  linkcheck  to check all external links for integrity"
-	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
-
-clean:
-	-rm -rf $(BUILDDIR)/*
-
-html:
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
-
-dirhtml:
-	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-
-singlehtml:
-	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
-	@echo
-	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
-
-pickle:
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-json:
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
-htmlhelp:
-	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in $(BUILDDIR)/htmlhelp."
-
-qthelp:
-	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
-	@echo
-	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/llvm.qhcp"
-	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/llvm.qhc"
-
-devhelp:
-	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
-	@echo
-	@echo "Build finished."
-	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/llvm"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/llvm"
-	@echo "# devhelp"
-
-epub:
-	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
-	@echo
-	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
-
-latex:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo
-	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
-	@echo "Run \`make' in that directory to run these through (pdf)latex" \
-	      "(use \`make latexpdf' here to do that automatically)."
-
-latexpdf:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through pdflatex..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-text:
-	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
-	@echo
-	@echo "Build finished. The text files are in $(BUILDDIR)/text."
-
-man:
-	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
-	@echo
-	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
-
-texinfo:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo
-	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
-	@echo "Run \`make' in that directory to run these through makeinfo" \
-	      "(use \`make info' here to do that automatically)."
-
-info:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo "Running Texinfo files through makeinfo..."
-	make -C $(BUILDDIR)/texinfo info
-	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
-
-gettext:
-	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
-	@echo
-	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
-
-changes:
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
-	@echo
-	@echo "The overview file is in $(BUILDDIR)/changes."
-
-linkcheck:
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in $(BUILDDIR)/linkcheck/output.txt."
-
-doctest:
-	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
-	@echo "Testing of doctests in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/doctest/output.txt."
diff --git a/gnu/llvm/llvm/docs/Proposals/LLVMLibC.rst b/gnu/llvm/llvm/docs/Proposals/LLVMLibC.rst
deleted file mode 100644
index e113e7b057f..00000000000
--- a/gnu/llvm/llvm/docs/Proposals/LLVMLibC.rst
+++ /dev/null
@@ -1,125 +0,0 @@
-==============================
-"llvm-libc" C Standard Library
-==============================
-
-.. contents:: Table of Contents
-  :depth: 4
-  :local:
-
-Introduction
-============
-
-This is a proposal to start *llvm-libc*, an implementation of the
-C standard library targeting C17 and above, as part of the LLVM project.
-llvm-libc will also provide platform specific extensions as relevant.
-For example, on Linux it also provides pthreads, librt and other POSIX
-extension libraries.
-
-Features
-========
-
-llvm-libc will be developed to have a certain minimum set of features:
-
-- C17 and upwards conformant.
-- A modular libc with individual pieces implemented in the "as a
-  library" philosophy of the LLVM project.
-- Ability to layer this libc over the system libc if possible and desired
-  for a platform.
-- Provide C symbols as specified by the standards, but take advantage
-  and use C++ language facilities for the core implementation.
-- Provides POSIX extensions on POSIX compliant platforms.
-- Provides system-specific extensions as appropriate. For example,
-  provides the Linux API on Linux.
-- Vendor extensions if and only if necessary.
-- Designed and developed from the start to work with LLVM tooling and
-  testing like fuzz testing and sanitizer-supported testing.
-- ABI independent implementation as far as possible.
-- Use source based implementations as far possible rather than
-  assembly. Will try to *fix* the compiler rather than use assembly
-  language workarounds.
-- Extensive unit testing and standards conformance testing. If relevant
-  and possible, differential testing: We want to be able
-  to test llvm-libc against another battle-tested libc. This is
-  essentially to understand how we differ from other libcs. Also if
-  relevant and possible, test against the testsuite of an another
-  battle-tested libc implementation.
-
-Why a new C Standard Library?
-=============================
-
-Implementing a libc is no small task and is not be taken lightly. A
-natural question to ask is, "why a new implementation of the C
-standard library?" There is no single answer to this question, but
-some of the major reasons are as follows:
-
-- Most libc implementations are monolithic. It is a non-trivial
-  porting task to pick and choose only the pieces relevant to one's
-  platform. The llvm-libc will be developed with sufficient modularity to
-  make picking and choosing a straightforward task.
-- Most libc implementations break when built with sanitizer specific
-  compiler options. The llvm-libc will be developed from the start to
-  work with those specialized compiler options.
-- The llvm-libc will be developed to support and employ fuzz testing
-  from the start.
-- Most libc implementations use a good amount of assembly language,
-  and assume specific ABIs (may be platform dependent). With the llvm-libc
-  implementation, we want to use normal source code as much as possible so
-  that compiler-based changes to the ABI are easy. Moreover, as part of the
-  LLVM project, we want to use this opportunity to fix performance related
-  compiler bugs rather than using assembly workarounds.
-- A large hole in the LLVM toolchain will be plugged with llvm-libc.
-  With the broad platform expertise in the LLVM community, and the
-  strong license and project structure, we think that llvm-libc will
-  be more tunable and robust, without sacrificing the simplicity and
-  accessibility typical of the LLVM project.
-
-Platform Support
-================
-
-We envision that llvm-libc will support a variety of platforms in the coming
-years. Interested parties are encouraged to participate in the design and
-implementation, and add support for their favorite platforms.
-
-ABI Compatibility
-=================
-
-As llvm-libc is new, it will not offer ABI stability in the initial stages.
-However, as we've heard from other LLVM contributors that they are interested
-in having ABI stability, llvm-libc code will be written in a manner which is
-amenable to ABI stability. We are looking for contributors interested in
-driving the design in this space to help us define what exactly does ABI
-stability mean for llvm-libc.
-
-Layering Over Another libc
-==========================
-
-When meaningful and practically possible on a platform, llvm-libc will be
-developed in a fashion that it will be possible to layer it over the system
-libc. This does not mean that one can mix llvm-libc with the system-libc. Also,
-it does not mean that layering is the only way to use llvm-libc. What it
-means is that, llvm-libc can optionally be packaged in a way that it can
-delegate parts of the functionality to the system-libc. The delegation happens
-internal to llvm-libc and is invisible to the users. From the user's point of
-view, they only call into llvm-libc.
-
-There are a few problems one needs to be mindful of when implementing such a
-delegation scheme in llvm-libc. Examples of such problems are:
-
-1. One cannot mix data structures from llvm-libc with those from the
-system-libc. A translation from one set of data structures to the other should
-happen internal to llvm-libc.
-2. The delegation mechanism has to be implemented over a related set of
-functions. For example, one cannot delegate just the `fopen` function to the
-system-libc. One will have to delegate all `FILE` related functions to the
-system-libc.
-
-Current Status
-==============
-
-llvm-libc development is still in the planning phase.
-
-Build Bots
-==========
-
-Once the development starts, there will be llvm-libc focused builders added to
-the LLVM BuildBot.
diff --git a/gnu/llvm/llvm/examples/IRTransforms/InitializePasses.cpp b/gnu/llvm/llvm/examples/IRTransforms/InitializePasses.cpp
deleted file mode 100644
index 125180715cd..00000000000
--- a/gnu/llvm/llvm/examples/IRTransforms/InitializePasses.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-//===-- InitializePasses.cpp ----------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements implements the initialization hook for the example
-// transforms.
-//
-//===----------------------------------------------------------------------===//
-
-#include "InitializePasses.h"
-#include "llvm/PassRegistry.h"
-
-using namespace llvm;
-
-void initializeExampleIRTransforms(PassRegistry &Registry) {
-  initializeSimplifyCFGLegacyPassPass(Registry);
-}
diff --git a/gnu/llvm/llvm/examples/IRTransforms/InitializePasses.h b/gnu/llvm/llvm/examples/IRTransforms/InitializePasses.h
deleted file mode 100644
index 8b6673d518e..00000000000
--- a/gnu/llvm/llvm/examples/IRTransforms/InitializePasses.h
+++ /dev/null
@@ -1,22 +0,0 @@
-//===- InitializePasses.h - -------------------------------------*- C++ -*-===//
-//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_EXAMPLES_IRTRANSFORMS_INITIALIZEPASSES__H
-#define LLVM_EXAMPLES_IRTRANSFORMS_INITIALIZEPASSES__H
-
-#include "llvm/IR/PassManager.h"
-
-namespace llvm {
-
-void initializeExampleIRTransforms(PassRegistry &Registry);
-void initializeSimplifyCFGLegacyPassPass(PassRegistry &Registry);
-
-} // end namespace llvm
-
-#endif
diff --git a/gnu/llvm/llvm/examples/IRTransforms/SimplifyCFG.h b/gnu/llvm/llvm/examples/IRTransforms/SimplifyCFG.h
deleted file mode 100644
index 09328afb01d..00000000000
--- a/gnu/llvm/llvm/examples/IRTransforms/SimplifyCFG.h
+++ /dev/null
@@ -1,24 +0,0 @@
-//===- SimplifyCFG.h - Tutorial SimplifyCFG ---------------------*- C++ -*-===//
-//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_EXAMPLES_IRTRANSFORMS_SIMPLIFYCFG__H
-#define LLVM_EXAMPLES_IRTRANSFORMS_SIMPLIFYCFG__H
-
-#include "llvm/Pass.h"
-#include "llvm/PassRegistry.h"
-
-namespace llvm {
-
-FunctionPass *createSimplifyCFGPass();
-
-void initializeSimplifyCFGLegacyPassPass(PassRegistry &);
-
-} // end namespace llvm
-
-#endif // LLVM_EXAMPLES_IRTRANSFORMS_SIMPLIFYCFG__H
diff --git a/gnu/llvm/llvm/examples/OrcV2Examples/LLJITWithTargetProcessControl/CMakeLists.txt b/gnu/llvm/llvm/examples/OrcV2Examples/LLJITWithTargetProcessControl/CMakeLists.txt
deleted file mode 100644
index 10e0de8d64b..00000000000
--- a/gnu/llvm/llvm/examples/OrcV2Examples/LLJITWithTargetProcessControl/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  Core
-  ExecutionEngine
-  IRReader
-  OrcJIT
-  Support
-  nativecodegen
-  )
-
-add_llvm_example(LLJITWithTargetProcessControl
-  LLJITWithTargetProcessControl.cpp
-  )
diff --git a/gnu/llvm/llvm/examples/OrcV2Examples/LLJITWithTargetProcessControl/LLJITWithTargetProcessControl.cpp b/gnu/llvm/llvm/examples/OrcV2Examples/LLJITWithTargetProcessControl/LLJITWithTargetProcessControl.cpp
deleted file mode 100644
index ac5ea5643b0..00000000000
--- a/gnu/llvm/llvm/examples/OrcV2Examples/LLJITWithTargetProcessControl/LLJITWithTargetProcessControl.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-//===- LLJITWithExecutorProcessControl.cpp - LLJIT example with EPC utils -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// In this example we will use the lazy re-exports utility to lazily compile
-// IR modules. We will do this in seven steps:
-//
-// 1. Create an LLJIT instance.
-// 2. Install a transform so that we can see what is being compiled.
-// 3. Create an indirect stubs manager and lazy call-through manager.
-// 4. Add two modules that will be conditionally compiled, plus a main module.
-// 5. Add lazy-rexports of the symbols in the conditionally compiled modules.
-// 6. Dump the ExecutionSession state to see the symbol table prior to
-//    executing any code.
-// 7. Verify that only modules containing executed code are compiled.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/StringMap.h"
-#include "llvm/ExecutionEngine/JITLink/JITLinkMemoryManager.h"
-#include "llvm/ExecutionEngine/Orc/EPCDynamicLibrarySearchGenerator.h"
-#include "llvm/ExecutionEngine/Orc/EPCIndirectionUtils.h"
-#include "llvm/ExecutionEngine/Orc/ExecutorProcessControl.h"
-#include "llvm/ExecutionEngine/Orc/LLJIT.h"
-#include "llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h"
-#include "llvm/ExecutionEngine/Orc/OrcABISupport.h"
-#include "llvm/Support/InitLLVM.h"
-#include "llvm/Support/TargetSelect.h"
-#include "llvm/Support/raw_ostream.h"
-
-#include "../ExampleModules.h"
-
-#include <future>
-
-using namespace llvm;
-using namespace llvm::orc;
-
-ExitOnError ExitOnErr;
-
-// Example IR modules.
-//
-// Note that in the conditionally compiled modules, FooMod and BarMod, functions
-// have been given an _body suffix. This is to ensure that their names do not
-// clash with their lazy-reexports.
-// For clients who do not wish to rename function bodies (e.g. because they want
-// to re-use cached objects between static and JIT compiles) techniques exist to
-// avoid renaming. See the lazy-reexports section of the ORCv2 design doc.
-
-const llvm::StringRef FooMod =
-    R"(
-  declare i32 @return1()
-
-  define i32 @foo_body() {
-  entry:
-    %0 = call i32 @return1()
-    ret i32 %0
-  }
-)";
-
-const llvm::StringRef BarMod =
-    R"(
-  declare i32 @return2()
-
-  define i32 @bar_body() {
-  entry:
-    %0 = call i32 @return2()
-    ret i32 %0
-  }
-)";
-
-const llvm::StringRef MainMod =
-    R"(
-
-  define i32 @entry(i32 %argc) {
-  entry:
-    %and = and i32 %argc, 1
-    %tobool = icmp eq i32 %and, 0
-    br i1 %tobool, label %if.end, label %if.then
-
-  if.then:                                          ; preds = %entry
-    %call = tail call i32 @foo() #2
-    br label %return
-
-  if.end:                                           ; preds = %entry
-    %call1 = tail call i32 @bar() #2
-    br label %return
-
-  return:                                           ; preds = %if.end, %if.then
-    %retval.0 = phi i32 [ %call, %if.then ], [ %call1, %if.end ]
-    ret i32 %retval.0
-  }
-
-  declare i32 @foo()
-  declare i32 @bar()
-)";
-
-extern "C" int32_t return1() { return 1; }
-extern "C" int32_t return2() { return 2; }
-
-static void *reenter(void *Ctx, void *TrampolineAddr) {
-  std::promise<void *> LandingAddressP;
-  auto LandingAddressF = LandingAddressP.get_future();
-
-  auto *EPCIU = static_cast<EPCIndirectionUtils *>(Ctx);
-  EPCIU->getLazyCallThroughManager().resolveTrampolineLandingAddress(
-      pointerToJITTargetAddress(TrampolineAddr),
-      [&](JITTargetAddress LandingAddress) {
-        LandingAddressP.set_value(
-            jitTargetAddressToPointer<void *>(LandingAddress));
-      });
-  return LandingAddressF.get();
-}
-
-static void reportErrorAndExit() {
-  errs() << "Unable to lazily compile function. Exiting.\n";
-  exit(1);
-}
-
-cl::list<std::string> InputArgv(cl::Positional,
-                                cl::desc("<program arguments>..."));
-
-int main(int argc, char *argv[]) {
-  // Initialize LLVM.
-  InitLLVM X(argc, argv);
-
-  InitializeNativeTarget();
-  InitializeNativeTargetAsmPrinter();
-
-  cl::ParseCommandLineOptions(argc, argv, "LLJITWithLazyReexports");
-  ExitOnErr.setBanner(std::string(argv[0]) + ": ");
-
-  // (1) Create LLJIT instance.
-  auto EPC = ExitOnErr(SelfExecutorProcessControl::Create());
-  auto J = ExitOnErr(
-      LLJITBuilder().setExecutorProcessControl(std::move(EPC)).create());
-
-  // (2) Install transform to print modules as they are compiled:
-  J->getIRTransformLayer().setTransform(
-      [](ThreadSafeModule TSM,
-         const MaterializationResponsibility &R) -> Expected<ThreadSafeModule> {
-        TSM.withModuleDo([](Module &M) { dbgs() << "---Compiling---\n" << M; });
-        return std::move(TSM); // Not a redundant move: fix build on gcc-7.5
-      });
-
-  // (3) Create stubs and call-through managers:
-  auto EPCIU = ExitOnErr(EPCIndirectionUtils::Create(*EPC));
-  ExitOnErr(EPCIU->writeResolverBlock(pointerToJITTargetAddress(&reenter),
-                                      pointerToJITTargetAddress(EPCIU.get())));
-  EPCIU->createLazyCallThroughManager(
-      J->getExecutionSession(), pointerToJITTargetAddress(&reportErrorAndExit));
-  auto ISM = EPCIU->createIndirectStubsManager();
-  J->getMainJITDylib().addGenerator(
-      ExitOnErr(EPCDynamicLibrarySearchGenerator::GetForTargetProcess(
-          J->getExecutionSession())));
-
-  // (4) Add modules.
-  ExitOnErr(J->addIRModule(ExitOnErr(parseExampleModule(FooMod, "foo-mod"))));
-  ExitOnErr(J->addIRModule(ExitOnErr(parseExampleModule(BarMod, "bar-mod"))));
-  ExitOnErr(J->addIRModule(ExitOnErr(parseExampleModule(MainMod, "main-mod"))));
-
-  // (5) Add lazy reexports.
-  MangleAndInterner Mangle(J->getExecutionSession(), J->getDataLayout());
-  SymbolAliasMap ReExports(
-      {{Mangle("foo"),
-        {Mangle("foo_body"),
-         JITSymbolFlags::Exported | JITSymbolFlags::Callable}},
-       {Mangle("bar"),
-        {Mangle("bar_body"),
-         JITSymbolFlags::Exported | JITSymbolFlags::Callable}}});
-  ExitOnErr(J->getMainJITDylib().define(
-      lazyReexports(EPCIU->getLazyCallThroughManager(), *ISM,
-                    J->getMainJITDylib(), std::move(ReExports))));
-
-  // (6) Dump the ExecutionSession state.
-  dbgs() << "---Session state---\n";
-  J->getExecutionSession().dump(dbgs());
-  dbgs() << "\n";
-
-  // (7) Execute the JIT'd main function and pass the example's command line
-  // arguments unmodified. This should cause either ExampleMod1 or ExampleMod2
-  // to be compiled, and either "1" or "2" returned depending on the number of
-  // arguments passed.
-
-  // Look up the JIT'd function, cast it to a function pointer, then call it.
-  auto EntrySym = ExitOnErr(J->lookup("entry"));
-  auto *Entry = (int (*)(int))EntrySym.getAddress();
-
-  int Result = Entry(argc);
-  outs() << "---Result---\n"
-         << "entry(" << argc << ") = " << Result << "\n";
-
-  return 0;
-}
diff --git a/gnu/llvm/llvm/include/llvm-c/Transforms/AggressiveInstCombine.h b/gnu/llvm/llvm/include/llvm-c/Transforms/AggressiveInstCombine.h
deleted file mode 100644
index db061a7ad1f..00000000000
--- a/gnu/llvm/llvm/include/llvm-c/Transforms/AggressiveInstCombine.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*===-- AggressiveInstCombine.h ---------------------------------*- C++ -*-===*\
-|*                                                                            *|
-|* Part of the LLVM Project, under the Apache License v2.0 with LLVM          *|
-|* Exceptions.                                                                *|
-|* See https://llvm.org/LICENSE.txt for license information.                  *|
-|* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception                    *|
-|*                                                                            *|
-|*===----------------------------------------------------------------------===*|
-|*                                                                            *|
-|* This header declares the C interface to libLLVMAggressiveInstCombine.a,    *|
-|* which combines instructions to form fewer, simple IR instructions.         *|
-|*                                                                            *|
-\*===----------------------------------------------------------------------===*/
-
-#ifndef LLVM_C_TRANSFORMS_AGGRESSIVEINSTCOMBINE_H
-#define LLVM_C_TRANSFORMS_AGGRESSIVEINSTCOMBINE_H
-
-#include "llvm-c/ExternC.h"
-#include "llvm-c/Types.h"
-
-LLVM_C_EXTERN_C_BEGIN
-
-/**
- * @defgroup LLVMCTransformsAggressiveInstCombine Aggressive Instruction Combining transformations
- * @ingroup LLVMCTransforms
- *
- * @{
- */
-
-/** See llvm::createAggressiveInstCombinerPass function. */
-void LLVMAddAggressiveInstCombinerPass(LLVMPassManagerRef PM);
-
-/**
- * @}
- */
-
-LLVM_C_EXTERN_C_END
-
-#endif
-
diff --git a/gnu/llvm/llvm/include/llvm-c/Transforms/Coroutines.h b/gnu/llvm/llvm/include/llvm-c/Transforms/Coroutines.h
deleted file mode 100644
index 03b6822033c..00000000000
--- a/gnu/llvm/llvm/include/llvm-c/Transforms/Coroutines.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*===-- Coroutines.h - Coroutines Library C Interface -----------*- C++ -*-===*\
-|*                                                                            *|
-|* Part of the LLVM Project, under the Apache License v2.0 with LLVM          *|
-|* Exceptions.                                                                *|
-|* See https://llvm.org/LICENSE.txt for license information.                  *|
-|* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception                    *|
-|*                                                                            *|
-|*===----------------------------------------------------------------------===*|
-|*                                                                            *|
-|* This header declares the C interface to libLLVMCoroutines.a, which         *|
-|* implements various scalar transformations of the LLVM IR.                  *|
-|*                                                                            *|
-|* Many exotic languages can interoperate with C code but have a harder time  *|
-|* with C++ due to name mangling. So in addition to C, this interface enables *|
-|* tools written in such languages.                                           *|
-|*                                                                            *|
-\*===----------------------------------------------------------------------===*/
-
-#ifndef LLVM_C_TRANSFORMS_COROUTINES_H
-#define LLVM_C_TRANSFORMS_COROUTINES_H
-
-#include "llvm-c/ExternC.h"
-#include "llvm-c/Types.h"
-#include "llvm-c/Transforms/PassManagerBuilder.h"
-
-LLVM_C_EXTERN_C_BEGIN
-
-/**
- * @defgroup LLVMCTransformsCoroutines Coroutine transformations
- * @ingroup LLVMCTransforms
- *
- * @{
- */
-
-/** See llvm::createCoroEarlyLegacyPass function. */
-void LLVMAddCoroEarlyPass(LLVMPassManagerRef PM);
-
-/** See llvm::createCoroSplitLegacyPass function. */
-void LLVMAddCoroSplitPass(LLVMPassManagerRef PM);
-
-/** See llvm::createCoroElideLegacyPass function. */
-void LLVMAddCoroElidePass(LLVMPassManagerRef PM);
-
-/** See llvm::createCoroCleanupLegacyPass function. */
-void LLVMAddCoroCleanupPass(LLVMPassManagerRef PM);
-
-/** See llvm::addCoroutinePassesToExtensionPoints. */
-void LLVMPassManagerBuilderAddCoroutinePassesToExtensionPoints(LLVMPassManagerBuilderRef PMB);
-
-/**
- * @}
- */
-
-LLVM_C_EXTERN_C_END
-
-#endif
diff --git a/gnu/llvm/llvm/include/llvm/ADT/Waymarking.h b/gnu/llvm/llvm/include/llvm/ADT/Waymarking.h
deleted file mode 100644
index 2efbc6f0549..00000000000
--- a/gnu/llvm/llvm/include/llvm/ADT/Waymarking.h
+++ /dev/null
@@ -1,322 +0,0 @@
-//===- Waymarking.h - Array waymarking algorithm ----------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Utility to backtrace an array's head, from a pointer into it. For the
-// backtrace to work, we use "Waymarks", which are special tags embedded into
-// the array's elements.
-//
-// A Tag of n-bits (in size) is composed as follows:
-//
-// bits: |   n-1   |             n-2 ... 0              |
-//       .---------.------------------------------------.
-//       |Stop Mask|(2^(n-1))-ary numeric system - digit|
-//       '---------'------------------------------------'
-//
-// Backtracing is done as follows:
-// Walk back (starting from a given pointer to an element into the array), until
-// a tag with a "Stop Mask" is reached. Then start calculating the "Offset" from
-// the array's head, by picking up digits along the way, until another stop is
-// reached. The "Offset" is then subtracted from the current pointer, and the
-// result is the array's head.
-// A special case - if we first encounter a Tag with a Stop and a zero digit,
-// then this is already the head.
-//
-// For example:
-// In case of 2 bits:
-//
-// Tags:
-// x0 - binary digit 0
-// x1 - binary digit 1
-// 1x - stop and calculate (s)
-//
-// Array:
-//         .---.---.---.---.---.---.---.---.---.---.---.---.---.---.---.---.
-// head -> |s0 |s1 | 0 |s1 | 0 | 0 |s1 | 1 | 1 |s1 | 0 | 1 | 0 |s1 | 0 | 1 |
-//         '---'---'---'---'---'---'---'---'---'---'---'---'---'---'---'---'
-//             |-1 |-2     |-4         |-7         |-10            |-14
-//          <_ |   |       |           |           |               |
-//          <_____ |       |           |           |               |
-//          <_____________ |           |           |               |
-//          <_________________________ |           |               |
-//          <_____________________________________ |               |
-//          <_____________________________________________________ |
-//
-//
-// In case of 3 bits:
-//
-// Tags:
-// x00 - quaternary digit 0
-// x01 - quaternary digit 1
-// x10 - quaternary digit 2
-// x11 - quaternary digit 3
-// 1xy - stop and calculate (s)
-//
-// Array:
-//         .---.---.---.---.---.---.---.---.---.---.---.---.---.---.---.---.
-// head -> |s0 |s1 |s2 |s3 | 0 |s1 | 2 |s1 | 0 |s2 | 2 |s2 | 0 |s3 | 2 |s3 |
-//         '---'---'---'---'---'---'---'---'---'---'---'---'---'---'---'---'
-//             |-1 |-2 |-3 |-4     |-6     |-8     |-10    |-12    |-14    |-16
-//          <_ |   |   |   |       |       |       |       |       |       |
-//          <_____ |   |   |       |       |       |       |       |       |
-//          <_________ |   |       |       |       |       |       |       |
-//          <_____________ |       |       |       |       |       |       |
-//          <_____________________ |       |       |       |       |       |
-//          <_____________________________ |       |       |       |       |
-//          <_____________________________________ |       |       |       |
-//          <_____________________________________________ |       |       |
-//          <_____________________________________________________ |       |
-//          <_____________________________________________________________ |
-//
-//
-// The API introduce 2 functions:
-// 1. fillWaymarks
-// 2. followWaymarks
-//
-// Example:
-//   int N = 10;
-//   int M = 5;
-//   int **A = new int *[N + M];   // Define the array.
-//   for (int I = 0; I < N + M; ++I)
-//     A[I] = new int(I);
-//
-//   fillWaymarks(A, A + N);       // Set the waymarks for the first N elements
-//                                 // of the array.
-//                                 // Note that it must be done AFTER we fill
-//                                 // the array's elements.
-//
-//   ...                           // Elements which are not in the range
-//                                 // [A, A+N) will not be marked, and we won't
-//                                 // be able to call followWaymarks on them.
-//
-//   ...                           // Elements which will be changed after the
-//                                 // call to fillWaymarks, will have to be
-//                                 // retagged.
-//
-//   fillWaymarks(A + N, A + N + M, N); // Set the waymarks of the remaining M
-//                                      // elements.
-//   ...
-//   int **It = A + N + 1;
-//   int **B = followWaymarks(It); // Find the head of the array containing It.
-//   assert(B == A);
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_ADT_WAYMARKING_H
-#define LLVM_ADT_WAYMARKING_H
-
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/Support/PointerLikeTypeTraits.h"
-
-namespace llvm {
-
-namespace detail {
-
-template <unsigned NumBits> struct WaymarkingTraits {
-  enum : unsigned {
-    // The number of bits of a Waymarking Tag.
-    NUM_BITS = NumBits,
-
-    // A Tag is composed from a Mark and a Stop mask.
-    MARK_SIZE = NUM_BITS - 1,
-    STOP_MASK = (1 << MARK_SIZE),
-    MARK_MASK = (STOP_MASK - 1),
-    TAG_MASK = (MARK_MASK | STOP_MASK),
-
-    // The number of pre-computed tags (for fast fill).
-    NUM_STATIC_TAGS = 32
-  };
-
-private:
-  // Add a new tag, calculated from Count and Stop, to the Vals pack, while
-  // continuing recursively to decrease Len down to 0.
-  template <unsigned Len, bool Stop, unsigned Count, uint8_t... Vals>
-  struct AddTag;
-
-  // Delegate to the specialized AddTag according to the need of a Stop mask.
-  template <unsigned Len, unsigned Count, uint8_t... Vals> struct GenTag {
-    typedef
-        typename AddTag<Len, (Count <= MARK_MASK), Count, Vals...>::Xdata Xdata;
-  };
-
-  // Start adding tags while calculating the next Count, which is actually the
-  // number of already calculated tags (equivalent to the position in the
-  // array).
-  template <unsigned Len, uint8_t... Vals> struct GenOffset {
-    typedef typename GenTag<Len, sizeof...(Vals), Vals...>::Xdata Xdata;
-  };
-
-  // Add the tag and remove it from Count.
-  template <unsigned Len, unsigned Count, uint8_t... Vals>
-  struct AddTag<Len, false, Count, Vals...> {
-    typedef typename GenTag<Len - 1, (Count >> MARK_SIZE), Vals...,
-                            Count & MARK_MASK>::Xdata Xdata;
-  };
-
-  // We have reached the end of this Count, so start with a new Count.
-  template <unsigned Len, unsigned Count, uint8_t... Vals>
-  struct AddTag<Len, true, Count, Vals...> {
-    typedef typename GenOffset<Len - 1, Vals...,
-                               (Count & MARK_MASK) | STOP_MASK>::Xdata Xdata;
-  };
-
-  template <unsigned Count, uint8_t... Vals> struct TagsData {
-    // The remaining number for calculating the next tag, following the last one
-    // in Values.
-    static const unsigned Remain = Count;
-
-    // The array of ordered pre-computed Tags.
-    static const uint8_t Values[sizeof...(Vals)];
-  };
-
-  // Specialize the case when Len equals 0, as the recursion stop condition.
-  template <unsigned Count, uint8_t... Vals>
-  struct AddTag<0, false, Count, Vals...> {
-    typedef TagsData<Count, Vals...> Xdata;
-  };
-
-  template <unsigned Count, uint8_t... Vals>
-  struct AddTag<0, true, Count, Vals...> {
-    typedef TagsData<Count, Vals...> Xdata;
-  };
-
-public:
-  typedef typename GenOffset<NUM_STATIC_TAGS>::Xdata Tags;
-};
-
-template <unsigned NumBits>
-template <unsigned Count, uint8_t... Vals>
-const uint8_t WaymarkingTraits<NumBits>::TagsData<
-    Count, Vals...>::Values[sizeof...(Vals)] = {Vals...};
-
-} // end namespace detail
-
-/// This class is responsible for tagging (and retrieving the tag of) a given
-/// element of type T.
-template <class T, class WTraits = detail::WaymarkingTraits<
-                       PointerLikeTypeTraits<T>::NumLowBitsAvailable>>
-struct Waymarker {
-  using Traits = WTraits;
-  static void setWaymark(T &N, unsigned Tag) { N.setWaymark(Tag); }
-  static unsigned getWaymark(const T &N) { return N.getWaymark(); }
-};
-
-template <class T, class WTraits> struct Waymarker<T *, WTraits> {
-  using Traits = WTraits;
-  static void setWaymark(T *&N, unsigned Tag) {
-    reinterpret_cast<uintptr_t &>(N) |= static_cast<uintptr_t>(Tag);
-  }
-  static unsigned getWaymark(const T *N) {
-    return static_cast<unsigned>(reinterpret_cast<uintptr_t>(N)) &
-           Traits::TAG_MASK;
-  }
-};
-
-/// Sets up the waymarking algorithm's tags for a given range [Begin, End).
-///
-/// \param Begin The beginning of the range to mark with tags (inclusive).
-/// \param End The ending of the range to mark with tags (exclusive).
-/// \param Offset The position in the supposed tags array from which to start
-/// marking the given range.
-template <class TIter, class Marker = Waymarker<
-                           typename std::iterator_traits<TIter>::value_type>>
-void fillWaymarks(TIter Begin, TIter End, size_t Offset = 0) {
-  if (Begin == End)
-    return;
-
-  size_t Count = Marker::Traits::Tags::Remain;
-  if (Offset <= Marker::Traits::NUM_STATIC_TAGS) {
-    // Start by filling the pre-calculated tags, starting from the given offset.
-    while (Offset != Marker::Traits::NUM_STATIC_TAGS) {
-      Marker::setWaymark(*Begin, Marker::Traits::Tags::Values[Offset]);
-
-      ++Offset;
-      ++Begin;
-
-      if (Begin == End)
-        return;
-    }
-  } else {
-    // The given offset is larger than the number of pre-computed tags, so we
-    // must do it the hard way.
-    // Calculate the next remaining Count, as if we have filled the tags up to
-    // the given offset.
-    size_t Off = Marker::Traits::NUM_STATIC_TAGS;
-    do {
-      ++Off;
-
-      // If the count can fit into the tag, then the counting must stop.
-      if (Count <= Marker::Traits::MARK_MASK) {
-        Count = Off;
-      } else
-        Count >>= Marker::Traits::MARK_SIZE;
-    } while (Off != Offset);
-  }
-
-  // By now, we have the matching remaining Count for the current offset.
-  do {
-    ++Offset;
-
-    unsigned Tag = Count & Marker::Traits::MARK_MASK;
-
-    // If the count can fit into the tag, then the counting must stop.
-    if (Count <= Marker::Traits::MARK_MASK) {
-      Tag |= Marker::Traits::STOP_MASK;
-      Count = Offset;
-    } else
-      Count >>= Marker::Traits::MARK_SIZE;
-
-    Marker::setWaymark(*Begin, Tag);
-    ++Begin;
-  } while (Begin != End);
-}
-
-/// Sets up the waymarking algorithm's tags for a given range.
-///
-/// \param Range The range to mark with tags.
-/// \param Offset The position in the supposed tags array from which to start
-/// marking the given range.
-template <typename R, class Marker = Waymarker<typename std::remove_reference<
-                          decltype(*std::begin(std::declval<R &>()))>::type>>
-void fillWaymarks(R &&Range, size_t Offset = 0) {
-  return fillWaymarks<decltype(std::begin(std::declval<R &>())), Marker>(
-      adl_begin(Range), adl_end(Range), Offset);
-}
-
-/// Retrieves the element marked with tag of only STOP_MASK, by following the
-/// waymarks. This is the first element in a range passed to a previous call to
-/// \c fillWaymarks with \c Offset 0.
-///
-/// For the trivial usage of calling \c fillWaymarks(Array), and \I is an
-/// iterator inside \c Array, this function retrieves the head of \c Array, by
-/// following the waymarks.
-///
-/// \param I The iterator into an array which was marked by the waymarking tags
-/// (by a previous call to \c fillWaymarks).
-template <class TIter, class Marker = Waymarker<
-                           typename std::iterator_traits<TIter>::value_type>>
-TIter followWaymarks(TIter I) {
-  unsigned Tag;
-  do
-    Tag = Marker::getWaymark(*I--);
-  while (!(Tag & Marker::Traits::STOP_MASK));
-
-  // Special case for the first Use.
-  if (Tag != Marker::Traits::STOP_MASK) {
-    ptrdiff_t Offset = Tag & Marker::Traits::MARK_MASK;
-    while (!((Tag = Marker::getWaymark(*I)) & Marker::Traits::STOP_MASK)) {
-      Offset = (Offset << Marker::Traits::MARK_SIZE) + Tag;
-      --I;
-    }
-    I -= Offset;
-  }
-  return ++I;
-}
-
-} // end namespace llvm
-
-#endif // LLVM_ADT_WAYMARKING_H
diff --git a/gnu/llvm/llvm/include/llvm/Analysis/CFLAliasAnalysisUtils.h b/gnu/llvm/llvm/include/llvm/Analysis/CFLAliasAnalysisUtils.h
deleted file mode 100644
index 02f999a5b91..00000000000
--- a/gnu/llvm/llvm/include/llvm/Analysis/CFLAliasAnalysisUtils.h
+++ /dev/null
@@ -1,57 +0,0 @@
-//=- CFLAliasAnalysisUtils.h - Utilities for CFL Alias Analysis ----*- C++-*-=//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-// \file
-// These are the utilities/helpers used by the CFL Alias Analyses available in
-// tree, i.e. Steensgaard's and Andersens'.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_ANALYSIS_CFLALIASANALYSISUTILS_H
-#define LLVM_ANALYSIS_CFLALIASANALYSISUTILS_H
-
-#include "llvm/IR/Function.h"
-#include "llvm/IR/ValueHandle.h"
-
-namespace llvm {
-namespace cflaa {
-
-template <typename AAResult> struct FunctionHandle final : public CallbackVH {
-  FunctionHandle(Function *Fn, AAResult *Result)
-      : CallbackVH(Fn), Result(Result) {
-    assert(Fn != nullptr);
-    assert(Result != nullptr);
-  }
-
-  void deleted() override { removeSelfFromCache(); }
-  void allUsesReplacedWith(Value *) override { removeSelfFromCache(); }
-
-private:
-  AAResult *Result;
-
-  void removeSelfFromCache() {
-    assert(Result != nullptr);
-    auto *Val = getValPtr();
-    Result->evict(cast<Function>(Val));
-    setValPtr(nullptr);
-  }
-};
-
-static inline const Function *parentFunctionOfValue(const Value *Val) {
-  if (auto *Inst = dyn_cast<Instruction>(Val)) {
-    auto *Bb = Inst->getParent();
-    return Bb->getParent();
-  }
-
-  if (auto *Arg = dyn_cast<Argument>(Val))
-    return Arg->getParent();
-  return nullptr;
-} // namespace cflaa
-} // namespace llvm
-}
-
-#endif // LLVM_ANALYSIS_CFLALIASANALYSISUTILS_H
diff --git a/gnu/llvm/llvm/include/llvm/Analysis/CFLAndersAliasAnalysis.h b/gnu/llvm/llvm/include/llvm/Analysis/CFLAndersAliasAnalysis.h
deleted file mode 100644
index 5f5e52af3d8..00000000000
--- a/gnu/llvm/llvm/include/llvm/Analysis/CFLAndersAliasAnalysis.h
+++ /dev/null
@@ -1,127 +0,0 @@
-//==- CFLAndersAliasAnalysis.h - Unification-based Alias Analysis -*- C++-*-==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-/// \file
-/// This is the interface for LLVM's inclusion-based alias analysis
-/// implemented with CFL graph reachability.
-///
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_ANALYSIS_CFLANDERSALIASANALYSIS_H
-#define LLVM_ANALYSIS_CFLANDERSALIASANALYSIS_H
-
-#include "llvm/ADT/DenseMap.h"
-#include "llvm/ADT/Optional.h"
-#include "llvm/Analysis/AliasAnalysis.h"
-#include "llvm/Analysis/CFLAliasAnalysisUtils.h"
-#include "llvm/IR/PassManager.h"
-#include "llvm/Pass.h"
-#include <forward_list>
-#include <memory>
-
-namespace llvm {
-
-class Function;
-class MemoryLocation;
-class TargetLibraryInfo;
-
-namespace cflaa {
-
-struct AliasSummary;
-
-} // end namespace cflaa
-
-class CFLAndersAAResult : public AAResultBase<CFLAndersAAResult> {
-  friend AAResultBase<CFLAndersAAResult>;
-
-  class FunctionInfo;
-
-public:
-  explicit CFLAndersAAResult(
-      std::function<const TargetLibraryInfo &(Function &F)> GetTLI);
-  CFLAndersAAResult(CFLAndersAAResult &&RHS);
-  ~CFLAndersAAResult();
-
-  /// Handle invalidation events from the new pass manager.
-  /// By definition, this result is stateless and so remains valid.
-  bool invalidate(Function &, const PreservedAnalyses &,
-                  FunctionAnalysisManager::Invalidator &) {
-    return false;
-  }
-
-  /// Evict the given function from cache
-  void evict(const Function *Fn);
-
-  /// Get the alias summary for the given function
-  /// Return nullptr if the summary is not found or not available
-  const cflaa::AliasSummary *getAliasSummary(const Function &);
-
-  AliasResult query(const MemoryLocation &, const MemoryLocation &);
-  AliasResult alias(const MemoryLocation &, const MemoryLocation &,
-                    AAQueryInfo &);
-
-private:
-  /// Ensures that the given function is available in the cache.
-  /// Returns the appropriate entry from the cache.
-  const Optional<FunctionInfo> &ensureCached(const Function &);
-
-  /// Inserts the given Function into the cache.
-  void scan(const Function &);
-
-  /// Build summary for a given function
-  FunctionInfo buildInfoFrom(const Function &);
-
-  std::function<const TargetLibraryInfo &(Function &F)> GetTLI;
-
-  /// Cached mapping of Functions to their StratifiedSets.
-  /// If a function's sets are currently being built, it is marked
-  /// in the cache as an Optional without a value. This way, if we
-  /// have any kind of recursion, it is discernable from a function
-  /// that simply has empty sets.
-  DenseMap<const Function *, Optional<FunctionInfo>> Cache;
-
-  std::forward_list<cflaa::FunctionHandle<CFLAndersAAResult>> Handles;
-};
-
-/// Analysis pass providing a never-invalidated alias analysis result.
-///
-/// FIXME: We really should refactor CFL to use the analysis more heavily, and
-/// in particular to leverage invalidation to trigger re-computation.
-class CFLAndersAA : public AnalysisInfoMixin<CFLAndersAA> {
-  friend AnalysisInfoMixin<CFLAndersAA>;
-
-  static AnalysisKey Key;
-
-public:
-  using Result = CFLAndersAAResult;
-
-  CFLAndersAAResult run(Function &F, FunctionAnalysisManager &AM);
-};
-
-/// Legacy wrapper pass to provide the CFLAndersAAResult object.
-class CFLAndersAAWrapperPass : public ImmutablePass {
-  std::unique_ptr<CFLAndersAAResult> Result;
-
-public:
-  static char ID;
-
-  CFLAndersAAWrapperPass();
-
-  CFLAndersAAResult &getResult() { return *Result; }
-  const CFLAndersAAResult &getResult() const { return *Result; }
-
-  void initializePass() override;
-  void getAnalysisUsage(AnalysisUsage &AU) const override;
-};
-
-// createCFLAndersAAWrapperPass - This pass implements a set-based approach to
-// alias analysis.
-ImmutablePass *createCFLAndersAAWrapperPass();
-
-} // end namespace llvm
-
-#endif // LLVM_ANALYSIS_CFLANDERSALIASANALYSIS_H
diff --git a/gnu/llvm/llvm/include/llvm/Analysis/CFLSteensAliasAnalysis.h b/gnu/llvm/llvm/include/llvm/Analysis/CFLSteensAliasAnalysis.h
deleted file mode 100644
index ec05b3706ca..00000000000
--- a/gnu/llvm/llvm/include/llvm/Analysis/CFLSteensAliasAnalysis.h
+++ /dev/null
@@ -1,144 +0,0 @@
-//==- CFLSteensAliasAnalysis.h - Unification-based Alias Analysis -*- C++-*-==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-/// \file
-/// This is the interface for LLVM's unification-based alias analysis
-/// implemented with CFL graph reachability.
-///
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_ANALYSIS_CFLSTEENSALIASANALYSIS_H
-#define LLVM_ANALYSIS_CFLSTEENSALIASANALYSIS_H
-
-#include "llvm/ADT/DenseMap.h"
-#include "llvm/ADT/Optional.h"
-#include "llvm/Analysis/AliasAnalysis.h"
-#include "llvm/Analysis/CFLAliasAnalysisUtils.h"
-#include "llvm/Analysis/MemoryLocation.h"
-#include "llvm/IR/PassManager.h"
-#include "llvm/Pass.h"
-#include "llvm/Support/Casting.h"
-#include <forward_list>
-#include <memory>
-
-namespace llvm {
-
-class Function;
-class TargetLibraryInfo;
-
-namespace cflaa {
-
-struct AliasSummary;
-
-} // end namespace cflaa
-
-class CFLSteensAAResult : public AAResultBase<CFLSteensAAResult> {
-  friend AAResultBase<CFLSteensAAResult>;
-
-  class FunctionInfo;
-
-public:
-  explicit CFLSteensAAResult(
-      std::function<const TargetLibraryInfo &(Function &)> GetTLI);
-  CFLSteensAAResult(CFLSteensAAResult &&Arg);
-  ~CFLSteensAAResult();
-
-  /// Handle invalidation events from the new pass manager.
-  ///
-  /// By definition, this result is stateless and so remains valid.
-  bool invalidate(Function &, const PreservedAnalyses &,
-                  FunctionAnalysisManager::Invalidator &) {
-    return false;
-  }
-
-  /// Inserts the given Function into the cache.
-  void scan(Function *Fn);
-
-  void evict(Function *Fn);
-
-  /// Ensures that the given function is available in the cache.
-  /// Returns the appropriate entry from the cache.
-  const Optional<FunctionInfo> &ensureCached(Function *Fn);
-
-  /// Get the alias summary for the given function
-  /// Return nullptr if the summary is not found or not available
-  const cflaa::AliasSummary *getAliasSummary(Function &Fn);
-
-  AliasResult query(const MemoryLocation &LocA, const MemoryLocation &LocB);
-
-  AliasResult alias(const MemoryLocation &LocA, const MemoryLocation &LocB,
-                    AAQueryInfo &AAQI) {
-    if (LocA.Ptr == LocB.Ptr)
-      return AliasResult::MustAlias;
-
-    // Comparisons between global variables and other constants should be
-    // handled by BasicAA.
-    // CFLSteensAA may report NoAlias when comparing a GlobalValue and
-    // ConstantExpr, but every query needs to have at least one Value tied to a
-    // Function, and neither GlobalValues nor ConstantExprs are.
-    if (isa<Constant>(LocA.Ptr) && isa<Constant>(LocB.Ptr))
-      return AAResultBase::alias(LocA, LocB, AAQI);
-
-    AliasResult QueryResult = query(LocA, LocB);
-    if (QueryResult == AliasResult::MayAlias)
-      return AAResultBase::alias(LocA, LocB, AAQI);
-
-    return QueryResult;
-  }
-
-private:
-  std::function<const TargetLibraryInfo &(Function &)> GetTLI;
-
-  /// Cached mapping of Functions to their StratifiedSets.
-  /// If a function's sets are currently being built, it is marked
-  /// in the cache as an Optional without a value. This way, if we
-  /// have any kind of recursion, it is discernable from a function
-  /// that simply has empty sets.
-  DenseMap<Function *, Optional<FunctionInfo>> Cache;
-  std::forward_list<cflaa::FunctionHandle<CFLSteensAAResult>> Handles;
-
-  FunctionInfo buildSetsFrom(Function *F);
-};
-
-/// Analysis pass providing a never-invalidated alias analysis result.
-///
-/// FIXME: We really should refactor CFL to use the analysis more heavily, and
-/// in particular to leverage invalidation to trigger re-computation of sets.
-class CFLSteensAA : public AnalysisInfoMixin<CFLSteensAA> {
-  friend AnalysisInfoMixin<CFLSteensAA>;
-
-  static AnalysisKey Key;
-
-public:
-  using Result = CFLSteensAAResult;
-
-  CFLSteensAAResult run(Function &F, FunctionAnalysisManager &AM);
-};
-
-/// Legacy wrapper pass to provide the CFLSteensAAResult object.
-class CFLSteensAAWrapperPass : public ImmutablePass {
-  std::unique_ptr<CFLSteensAAResult> Result;
-
-public:
-  static char ID;
-
-  CFLSteensAAWrapperPass();
-
-  CFLSteensAAResult &getResult() { return *Result; }
-  const CFLSteensAAResult &getResult() const { return *Result; }
-
-  void initializePass() override;
-  void getAnalysisUsage(AnalysisUsage &AU) const override;
-};
-
-// createCFLSteensAAWrapperPass - This pass implements a set-based approach to
-// alias analysis.
-ImmutablePass *createCFLSteensAAWrapperPass();
-
-} // end namespace llvm
-
-#endif // LLVM_ANALYSIS_CFLSTEENSALIASANALYSIS_H
diff --git a/gnu/llvm/llvm/include/llvm/BinaryFormat/Dwarf.def b/gnu/llvm/llvm/include/llvm/BinaryFormat/Dwarf.def
index 34f124b5779..1409568b866 100644
--- a/gnu/llvm/llvm/include/llvm/BinaryFormat/Dwarf.def
+++ b/gnu/llvm/llvm/include/llvm/BinaryFormat/Dwarf.def
@@ -241,6 +241,9 @@ HANDLE_DW_TAG(0x420c, SUN_f90_interface, 0, SUN, DW_KIND_NONE)
 HANDLE_DW_TAG(0x420d, SUN_fortran_vax_structure, 0, SUN, DW_KIND_NONE)
 HANDLE_DW_TAG(0x42ff, SUN_hi, 0, SUN, DW_KIND_NONE)
 
+// LLVM
+HANDLE_DW_TAG(0x4300, LLVM_ptrauth_type, 0, LLVM, DW_KIND_TYPE)
+
 // DSP-C/Starcore __circ, _rev
 HANDLE_DW_TAG(0x5101, ALTIUM_circ_type, 0, ALTIUM, DW_KIND_NONE)
 HANDLE_DW_TAG(0x5102, ALTIUM_mwa_circ_type, 0, ALTIUM, DW_KIND_NONE)
@@ -248,6 +251,9 @@ HANDLE_DW_TAG(0x5103, ALTIUM_rev_carry_type, 0, ALTIUM, DW_KIND_NONE)
 // M16 __rom qualifier
 HANDLE_DW_TAG(0x5111, ALTIUM_rom, 0, ALTIUM, DW_KIND_NONE)
 
+// LLVM
+HANDLE_DW_TAG(0x6000, LLVM_annotation, 0, LLVM, DW_KIND_NONE)
+
 // Green Hills.
 HANDLE_DW_TAG(0x8004, GHS_namespace, 0, GHS, DW_KIND_NONE)
 HANDLE_DW_TAG(0x8005, GHS_using_namespace, 0, GHS, DW_KIND_NONE)
@@ -492,7 +498,8 @@ HANDLE_DW_AT(0x2133, GNU_addr_base, 0, GNU)
 HANDLE_DW_AT(0x2134, GNU_pubnames, 0, GNU)
 HANDLE_DW_AT(0x2135, GNU_pubtypes, 0, GNU)
 HANDLE_DW_AT(0x2136, GNU_discriminator, 0, GNU)
-HANDLE_DW_AT(0x2137, GNU_entry_view, 0, GNU)
+HANDLE_DW_AT(0x2137, GNU_locviews, 0, GNU)
+HANDLE_DW_AT(0x2138, GNU_entry_view, 0, GNU)
 
 HANDLE_DW_AT(0x2201, SUN_template, 0, SUN)
 // Conflicting:
@@ -593,8 +600,12 @@ HANDLE_DW_AT(0x3e00, LLVM_include_path, 0, LLVM)
 HANDLE_DW_AT(0x3e01, LLVM_config_macros, 0, LLVM)
 HANDLE_DW_AT(0x3e02, LLVM_sysroot, 0, LLVM)
 HANDLE_DW_AT(0x3e03, LLVM_tag_offset, 0, LLVM)
-// The missing numbers here are reserved for ptrauth support.
+HANDLE_DW_AT(0x3e04, LLVM_ptrauth_key, 0, LLVM)
+HANDLE_DW_AT(0x3e05, LLVM_ptrauth_address_discriminated, 0, LLVM)
+HANDLE_DW_AT(0x3e06, LLVM_ptrauth_extra_discriminator, 0, LLVM)
 HANDLE_DW_AT(0x3e07, LLVM_apinotes, 0, APPLE)
+HANDLE_DW_AT(0x3e08, LLVM_ptrauth_isa_pointer, 0, LLVM)
+HANDLE_DW_AT(0x3e09, LLVM_ptrauth_authenticates_null_values, 0, LLVM)
 
 // Apple extensions.
 
@@ -904,11 +915,22 @@ HANDLE_DW_LANG(0x0022, Fortran03, 1, 5, DWARF)
 HANDLE_DW_LANG(0x0023, Fortran08, 1, 5, DWARF)
 HANDLE_DW_LANG(0x0024, RenderScript, 0, 5, DWARF)
 HANDLE_DW_LANG(0x0025, BLISS, 0, 5, DWARF)
+// New since DWARF v5:
+HANDLE_DW_LANG(0x0026, Kotlin, 0, 0, DWARF)
+HANDLE_DW_LANG(0x0027, Zig, 0, 0, DWARF)
+HANDLE_DW_LANG(0x0028, Crystal, 0, 0, DWARF)
+HANDLE_DW_LANG(0x002a, C_plus_plus_17, 0, 0, DWARF)
+HANDLE_DW_LANG(0x002b, C_plus_plus_20, 0, 0, DWARF)
+HANDLE_DW_LANG(0x002c, C17, 0, 0, DWARF)
+HANDLE_DW_LANG(0x002d, Fortran18, 0, 0, DWARF)
+HANDLE_DW_LANG(0x002e, Ada2005, 0, 0, DWARF)
+HANDLE_DW_LANG(0x002f, Ada2012, 0, 0, DWARF)
 // Vendor extensions:
-HANDLE_DW_LANG(0x8001, Mips_Assembler, None, 0, MIPS)
+HANDLE_DW_LANG(0x8001, Mips_Assembler, std::nullopt, 0, MIPS)
 HANDLE_DW_LANG(0x8e57, GOOGLE_RenderScript, 0, 0, GOOGLE)
 HANDLE_DW_LANG(0xb000, BORLAND_Delphi, 0, 0, BORLAND)
 
+
 // DWARF attribute type encodings.
 HANDLE_DW_ATE(0x01, address, 2, DWARF)
 HANDLE_DW_ATE(0x02, boolean, 2, DWARF)
@@ -1196,6 +1218,8 @@ HANDLE_DW_IDX(0x02, type_unit)
 HANDLE_DW_IDX(0x03, die_offset)
 HANDLE_DW_IDX(0x04, parent)
 HANDLE_DW_IDX(0x05, type_hash)
+HANDLE_DW_IDX(0x2000, GNU_internal)
+HANDLE_DW_IDX(0x2001, GNU_external)
 
 // DWARF package file section identifiers.
 // DWARFv5, section 7.3.5.3, table 7.1.
diff --git a/gnu/llvm/llvm/include/llvm/BinaryFormat/ELF.h b/gnu/llvm/llvm/include/llvm/BinaryFormat/ELF.h
index 71cf3a61448..fe04d898ae5 100644
--- a/gnu/llvm/llvm/include/llvm/BinaryFormat/ELF.h
+++ b/gnu/llvm/llvm/include/llvm/BinaryFormat/ELF.h
@@ -22,7 +22,6 @@
 #include "llvm/ADT/StringRef.h"
 #include <cstdint>
 #include <cstring>
-#include <string>
 
 namespace llvm {
 namespace ELF {
@@ -320,6 +319,7 @@ enum {
   EM_BPF = 247,           // Linux kernel bpf virtual machine
   EM_VE = 251,            // NEC SX-Aurora VE
   EM_CSKY = 252,          // C-SKY 32-bit processor
+  EM_LOONGARCH = 258,     // LoongArch
 };
 
 // Object file classes.
@@ -373,7 +373,8 @@ enum {
   // was never defined for V1.
   ELFABIVERSION_AMDGPU_HSA_V2 = 0,
   ELFABIVERSION_AMDGPU_HSA_V3 = 1,
-  ELFABIVERSION_AMDGPU_HSA_V4 = 2
+  ELFABIVERSION_AMDGPU_HSA_V4 = 2,
+  ELFABIVERSION_AMDGPU_HSA_V5 = 3
 };
 
 #define ELF_RELOC(name, value) name = value,
@@ -434,6 +435,7 @@ enum : unsigned {
   EF_ARM_ABI_FLOAT_SOFT = 0x00000200U, // EABI_VER5
   EF_ARM_VFP_FLOAT = 0x00000400U,      // Legacy pre EABI_VER5
   EF_ARM_ABI_FLOAT_HARD = 0x00000400U, // EABI_VER5
+  EF_ARM_BE8 = 0x00800000U,
   EF_ARM_EABI_UNKNOWN = 0x00000000U,
   EF_ARM_EABI_VER1 = 0x01000000U,
   EF_ARM_EABI_VER2 = 0x02000000U,
@@ -563,6 +565,15 @@ enum : unsigned {
   EF_MIPS_ARCH = 0xf0000000       // Mask for applying EF_MIPS_ARCH_ variant
 };
 
+// MIPS-specific section indexes
+enum {
+  SHN_MIPS_ACOMMON = 0xff00,   // Common symbols which are defined and allocated
+  SHN_MIPS_TEXT = 0xff01,      // Not ABI compliant
+  SHN_MIPS_DATA = 0xff02,      // Not ABI compliant
+  SHN_MIPS_SCOMMON = 0xff03,   // Common symbols for global data area
+  SHN_MIPS_SUNDEFINED = 0xff04 // Undefined symbols for global data area
+};
+
 // ELF Relocation types for Mips
 enum {
 #include "ELFRelocs/Mips.def"
@@ -608,6 +619,11 @@ enum {
   EF_HEXAGON_MACH_V67 = 0x00000067,  // Hexagon V67
   EF_HEXAGON_MACH_V67T = 0x00008067, // Hexagon V67T
   EF_HEXAGON_MACH_V68 = 0x00000068,  // Hexagon V68
+  EF_HEXAGON_MACH_V69 = 0x00000069,  // Hexagon V69
+  EF_HEXAGON_MACH_V71 = 0x00000071,  // Hexagon V71
+  EF_HEXAGON_MACH_V71T = 0x00008071, // Hexagon V71T
+  EF_HEXAGON_MACH_V73 = 0x00000073,  // Hexagon V73
+  EF_HEXAGON_MACH = 0x000003ff,      // Hexagon V..
 
   // Highest ISA version flags
   EF_HEXAGON_ISA_MACH = 0x00000000, // Same as specified in bits[11:0]
@@ -623,6 +639,11 @@ enum {
   EF_HEXAGON_ISA_V66 = 0x00000066,  // Hexagon V66 ISA
   EF_HEXAGON_ISA_V67 = 0x00000067,  // Hexagon V67 ISA
   EF_HEXAGON_ISA_V68 = 0x00000068,  // Hexagon V68 ISA
+  EF_HEXAGON_ISA_V69 = 0x00000069,  // Hexagon V69 ISA
+  EF_HEXAGON_ISA_V71 = 0x00000071,  // Hexagon V71 ISA
+  EF_HEXAGON_ISA_V73 = 0x00000073,  // Hexagon V73 ISA
+  EF_HEXAGON_ISA_V75 = 0x00000075,  // Hexagon V75 ISA
+  EF_HEXAGON_ISA = 0x000003ff,      // Hexagon V.. ISA
 };
 
 // Hexagon-specific section indexes for common small data
@@ -652,7 +673,8 @@ enum : unsigned {
   EF_RISCV_FLOAT_ABI_SINGLE = 0x0002,
   EF_RISCV_FLOAT_ABI_DOUBLE = 0x0004,
   EF_RISCV_FLOAT_ABI_QUAD = 0x0006,
-  EF_RISCV_RVE = 0x0008
+  EF_RISCV_RVE = 0x0008,
+  EF_RISCV_TSO = 0x0010,
 };
 
 // ELF Relocation types for RISC-V
@@ -660,6 +682,12 @@ enum {
 #include "ELFRelocs/RISCV.def"
 };
 
+enum {
+  // Symbol may follow different calling convention than the standard calling
+  // convention.
+  STO_RISCV_VARIANT_CC = 0x80
+};
+
 // ELF Relocation types for S390/zSeries
 enum {
 #include "ELFRelocs/SystemZ.def"
@@ -742,16 +770,18 @@ enum : unsigned {
   EF_AMDGPU_MACH_AMDGCN_GFX1035       = 0x03d,
   EF_AMDGPU_MACH_AMDGCN_GFX1034       = 0x03e,
   EF_AMDGPU_MACH_AMDGCN_GFX90A        = 0x03f,
-  EF_AMDGPU_MACH_AMDGCN_RESERVED_0X40 = 0x040,
-  EF_AMDGPU_MACH_AMDGCN_RESERVED_0X41 = 0x041,
+  EF_AMDGPU_MACH_AMDGCN_GFX940        = 0x040,
+  EF_AMDGPU_MACH_AMDGCN_GFX1100       = 0x041,
   EF_AMDGPU_MACH_AMDGCN_GFX1013       = 0x042,
   EF_AMDGPU_MACH_AMDGCN_RESERVED_0X43 = 0x043,
-  EF_AMDGPU_MACH_AMDGCN_RESERVED_0X44 = 0x044,
-  EF_AMDGPU_MACH_AMDGCN_RESERVED_0X45 = 0x045,
+  EF_AMDGPU_MACH_AMDGCN_GFX1103       = 0x044,
+  EF_AMDGPU_MACH_AMDGCN_GFX1036       = 0x045,
+  EF_AMDGPU_MACH_AMDGCN_GFX1101       = 0x046,
+  EF_AMDGPU_MACH_AMDGCN_GFX1102       = 0x047,
 
   // First/last AMDGCN-based processors.
   EF_AMDGPU_MACH_AMDGCN_FIRST = EF_AMDGPU_MACH_AMDGCN_GFX600,
-  EF_AMDGPU_MACH_AMDGCN_LAST = EF_AMDGPU_MACH_AMDGCN_RESERVED_0X45,
+  EF_AMDGPU_MACH_AMDGCN_LAST = EF_AMDGPU_MACH_AMDGCN_GFX1102,
 
   // Indicates if the "xnack" target feature is enabled for all code contained
   // in the object.
@@ -854,12 +884,67 @@ enum {
 #include "ELFRelocs/VE.def"
 };
 
+// CSKY Specific e_flags
+enum : unsigned {
+  EF_CSKY_801 = 0xa,
+  EF_CSKY_802 = 0x10,
+  EF_CSKY_803 = 0x9,
+  EF_CSKY_805 = 0x11,
+  EF_CSKY_807 = 0x6,
+  EF_CSKY_810 = 0x8,
+  EF_CSKY_860 = 0xb,
+  EF_CSKY_800 = 0x1f,
+  EF_CSKY_FLOAT = 0x2000,
+  EF_CSKY_DSP = 0x4000,
+  EF_CSKY_ABIV2 = 0x20000000,
+  EF_CSKY_EFV1 = 0x1000000,
+  EF_CSKY_EFV2 = 0x2000000,
+  EF_CSKY_EFV3 = 0x3000000
+};
 
 // ELF Relocation types for CSKY
 enum {
 #include "ELFRelocs/CSKY.def"
 };
 
+// LoongArch Specific e_flags
+enum : unsigned {
+  // Definitions from LoongArch ELF psABI v2.01.
+  // Reference: https://github.com/loongson/LoongArch-Documentation
+  // (commit hash 296de4def055c871809068e0816325a4ac04eb12)
+
+  // Base ABI Modifiers
+  EF_LOONGARCH_ABI_SOFT_FLOAT    = 0x1,
+  EF_LOONGARCH_ABI_SINGLE_FLOAT  = 0x2,
+  EF_LOONGARCH_ABI_DOUBLE_FLOAT  = 0x3,
+  EF_LOONGARCH_ABI_MODIFIER_MASK = 0x7,
+
+  // Object file ABI versions
+  EF_LOONGARCH_OBJABI_V0   = 0x0,
+  EF_LOONGARCH_OBJABI_V1   = 0x40,
+  EF_LOONGARCH_OBJABI_MASK = 0xC0,
+};
+
+// ELF Relocation types for LoongArch
+enum {
+#include "ELFRelocs/LoongArch.def"
+};
+
+// Xtensa specific e_flags
+enum : unsigned {
+  // Four-bit Xtensa machine type mask.
+  EF_XTENSA_MACH = 0x0000000f,
+  // Various CPU types.
+  EF_XTENSA_MACH_NONE = 0x00000000, // A base Xtensa implementation
+  EF_XTENSA_XT_INSN = 0x00000100,
+  EF_XTENSA_XT_LIT = 0x00000200,
+};
+
+// ELF Relocation types for Xtensa
+enum {
+#include "ELFRelocs/Xtensa.def"
+};
+
 #undef ELF_RELOC
 
 // Section header.
@@ -936,12 +1021,16 @@ enum : unsigned {
   SHT_LLVM_ADDRSIG = 0x6fff4c03,        // List of address-significant symbols
                                         // for safe ICF.
   SHT_LLVM_DEPENDENT_LIBRARIES =
-      0x6fff4c04,                    // LLVM Dependent Library Specifiers.
-  SHT_LLVM_SYMPART = 0x6fff4c05,     // Symbol partition specification.
-  SHT_LLVM_PART_EHDR = 0x6fff4c06,   // ELF header for loadable partition.
-  SHT_LLVM_PART_PHDR = 0x6fff4c07,   // Phdrs for loadable partition.
-  SHT_LLVM_BB_ADDR_MAP = 0x6fff4c08, // LLVM Basic Block Address Map.
+      0x6fff4c04,                  // LLVM Dependent Library Specifiers.
+  SHT_LLVM_SYMPART = 0x6fff4c05,   // Symbol partition specification.
+  SHT_LLVM_PART_EHDR = 0x6fff4c06, // ELF header for loadable partition.
+  SHT_LLVM_PART_PHDR = 0x6fff4c07, // Phdrs for loadable partition.
+  SHT_LLVM_BB_ADDR_MAP_V0 =
+      0x6fff4c08, // LLVM Basic Block Address Map (old version kept for
+                  // backward-compatibility).
   SHT_LLVM_CALL_GRAPH_PROFILE = 0x6fff4c09, // LLVM Call Graph Profile.
+  SHT_LLVM_BB_ADDR_MAP = 0x6fff4c0a,        // LLVM Basic Block Address Map.
+  SHT_LLVM_OFFLOADING = 0x6fff4c0b,         // LLVM device offloading data.
   // Android's experimental support for SHT_RELR sections.
   // https://android.googlesource.com/platform/bionic/+/b7feec74547f84559a1467aca02708ff61346d2a/libc/include/elf.h#512
   SHT_ANDROID_RELR = 0x6fffff00,   // Relocation entries; only offsets.
@@ -961,6 +1050,10 @@ enum : unsigned {
   SHT_ARM_ATTRIBUTES = 0x70000003U,
   SHT_ARM_DEBUGOVERLAY = 0x70000004U,
   SHT_ARM_OVERLAYSECTION = 0x70000005U,
+  // Special aarch64-specific sections for MTE support, as described in:
+  // https://github.com/ARM-software/abi-aa/blob/main/memtagabielf64/memtagabielf64.rst#7section-types
+  SHT_AARCH64_MEMTAG_GLOBALS_STATIC = 0x70000007U,
+  SHT_AARCH64_MEMTAG_GLOBALS_DYNAMIC = 0x70000008U,
   SHT_HEX_ORDERED = 0x70000000,   // Link editor is to sort the entries in
                                   // this section based on their sizes
   SHT_X86_64_UNWIND = 0x70000001, // Unwind information
@@ -974,6 +1067,8 @@ enum : unsigned {
 
   SHT_RISCV_ATTRIBUTES = 0x70000003U,
 
+  SHT_CSKY_ATTRIBUTES = 0x70000001U,
+
   SHT_HIPROC = 0x7fffffff, // Highest processor arch-specific type.
   SHT_LOUSER = 0x80000000, // Lowest type reserved for applications.
   SHT_HIUSER = 0xffffffff  // Highest type reserved for applications.
@@ -1025,6 +1120,9 @@ enum : unsigned {
 
   SHF_MASKOS = 0x0ff00000,
 
+  // Solaris equivalent of SHF_GNU_RETAIN.
+  SHF_SUNW_NODISCARD = 0x00100000,
+
   // Bits indicating processor-specific flags.
   SHF_MASKPROC = 0xf0000000,
 
@@ -1303,7 +1401,7 @@ enum {
   PT_GNU_RELRO = 0x6474e552,    // Read-only after relocation.
   PT_GNU_PROPERTY = 0x6474e553, // .note.gnu.property notes sections.
 
-  PT_OPENBSD_MUTABLE = 0x65a3dbe5, // Like bss, but not immutable.
+  PT_OPENBSD_MUTABLE = 0x65a3dbe5,   // Like bss, but not immutable.
   PT_OPENBSD_RANDOMIZE = 0x65a3dbe6, // Fill with random data.
   PT_OPENBSD_WXNEEDED = 0x65a3dbe7,  // Program does W^X violations.
   PT_OPENBSD_NOBTCFI = 0x65a3dbe8,   // Do not enforce branch target CFI
@@ -1314,12 +1412,17 @@ enum {
   // These all contain stack unwind tables.
   PT_ARM_EXIDX = 0x70000001,
   PT_ARM_UNWIND = 0x70000001,
+  // MTE memory tag segment type
+  PT_AARCH64_MEMTAG_MTE = 0x70000002,
 
   // MIPS program header types.
   PT_MIPS_REGINFO = 0x70000000,  // Register usage information.
   PT_MIPS_RTPROC = 0x70000001,   // Runtime procedure table.
   PT_MIPS_OPTIONS = 0x70000002,  // Options segment.
   PT_MIPS_ABIFLAGS = 0x70000003, // Abiflags segment.
+
+  // RISCV program header types.
+  PT_RISCV_ATTRIBUTES = 0x70000003,
 };
 
 // Segment flag bits.
@@ -1520,6 +1623,32 @@ enum {
   NT_GNU_BUILD_ID = 3,
   NT_GNU_GOLD_VERSION = 4,
   NT_GNU_PROPERTY_TYPE_0 = 5,
+  FDO_PACKAGING_METADATA = 0xcafe1a7e,
+};
+
+// Android note types.
+enum {
+  NT_ANDROID_TYPE_IDENT = 1,
+  NT_ANDROID_TYPE_KUSER = 3,
+  NT_ANDROID_TYPE_MEMTAG = 4,
+};
+
+// Memory tagging values used in NT_ANDROID_TYPE_MEMTAG notes.
+enum {
+  // Enumeration to determine the tagging mode. In Android-land, 'SYNC' means
+  // running all threads in MTE Synchronous mode, and 'ASYNC' means to use the
+  // kernels auto-upgrade feature to allow for either MTE Asynchronous,
+  // Asymmetric, or Synchronous mode. This allows silicon vendors to specify, on
+  // a per-cpu basis what 'ASYNC' should mean. Generally, the expectation is
+  // "pick the most precise mode that's very fast".
+  NT_MEMTAG_LEVEL_NONE = 0,
+  NT_MEMTAG_LEVEL_ASYNC = 1,
+  NT_MEMTAG_LEVEL_SYNC = 2,
+  NT_MEMTAG_LEVEL_MASK = 3,
+  // Bits indicating whether the loader should prepare for MTE to be enabled on
+  // the heap and/or stack.
+  NT_MEMTAG_HEAP = 4,
+  NT_MEMTAG_STACK = 8,
 };
 
 // Property types used in GNU_PROPERTY_TYPE_0 notes.
@@ -1598,6 +1727,23 @@ enum {
   NT_FREEBSD_PROCSTAT_AUXV = 16,
 };
 
+// NetBSD core note types.
+enum {
+  NT_NETBSDCORE_PROCINFO = 1,
+  NT_NETBSDCORE_AUXV = 2,
+  NT_NETBSDCORE_LWPSTATUS = 24,
+};
+
+// OpenBSD core note types.
+enum {
+  NT_OPENBSD_PROCINFO = 10,
+  NT_OPENBSD_AUXV = 11,
+  NT_OPENBSD_REGS = 20,
+  NT_OPENBSD_FPREGS = 21,
+  NT_OPENBSD_XFPREGS = 22,
+  NT_OPENBSD_WCOOKIE = 23,
+};
+
 // AMDGPU-specific section indices.
 enum {
   SHN_AMDGPU_LDS = 0xff00, // Variable in LDS; symbol encoded like SHN_COMMON
@@ -1620,6 +1766,13 @@ enum {
   NT_AMDGPU_METADATA = 32
 };
 
+// LLVMOMPOFFLOAD specific notes.
+enum : unsigned {
+  NT_LLVM_OPENMP_OFFLOAD_VERSION = 1,
+  NT_LLVM_OPENMP_OFFLOAD_PRODUCER = 2,
+  NT_LLVM_OPENMP_OFFLOAD_PRODUCER_VERSION = 3
+};
+
 enum {
   GNU_ABI_TAG_LINUX = 0,
   GNU_ABI_TAG_HURD = 1,
@@ -1672,6 +1825,7 @@ struct Elf64_Nhdr {
 // Legal values for ch_type field of compressed section header.
 enum {
   ELFCOMPRESS_ZLIB = 1,            // ZLIB/DEFLATE algorithm.
+  ELFCOMPRESS_ZSTD = 2,            // Zstandard algorithm
   ELFCOMPRESS_LOOS = 0x60000000,   // Start of OS-specific.
   ELFCOMPRESS_HIOS = 0x6fffffff,   // End of OS-specific.
   ELFCOMPRESS_LOPROC = 0x70000000, // Start of processor-specific.
diff --git a/gnu/llvm/llvm/include/llvm/CodeGen/AsmPrinter.h b/gnu/llvm/llvm/include/llvm/CodeGen/AsmPrinter.h
index c62ae2b7996..22329bbfae6 100644
--- a/gnu/llvm/llvm/include/llvm/CodeGen/AsmPrinter.h
+++ b/gnu/llvm/llvm/include/llvm/CodeGen/AsmPrinter.h
@@ -15,15 +15,17 @@
 #ifndef LLVM_CODEGEN_ASMPRINTER_H
 #define LLVM_CODEGEN_ASMPRINTER_H
 
+#include "llvm/ADT/DenseMap.h"
+#include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/MapVector.h"
 #include "llvm/ADT/SmallVector.h"
+#include "llvm/BinaryFormat/Dwarf.h"
 #include "llvm/CodeGen/AsmPrinterHandler.h"
 #include "llvm/CodeGen/DwarfStringPoolEntry.h"
 #include "llvm/CodeGen/MachineFunctionPass.h"
+#include "llvm/CodeGen/StackMaps.h"
 #include "llvm/IR/InlineAsm.h"
-#include "llvm/IR/LLVMContext.h"
 #include "llvm/Support/ErrorHandling.h"
-#include "llvm/Support/SourceMgr.h"
 #include <cstdint>
 #include <memory>
 #include <utility>
@@ -31,6 +33,7 @@
 
 namespace llvm {
 
+class AddrLabelMap;
 class BasicBlock;
 class BlockAddress;
 class Constant;
@@ -41,7 +44,7 @@ class DIEAbbrev;
 class DwarfDebug;
 class GCMetadataPrinter;
 class GCStrategy;
-class GlobalIndirectSymbol;
+class GlobalAlias;
 class GlobalObject;
 class GlobalValue;
 class GlobalVariable;
@@ -68,7 +71,6 @@ class MDNode;
 class Module;
 class PseudoProbeHandler;
 class raw_ostream;
-class StackMaps;
 class StringRef;
 class TargetLoweringObjectFile;
 class TargetMachine;
@@ -176,8 +178,12 @@ private:
   // function. This is used to calculate the size of the BB section.
   MCSymbol *CurrentSectionBeginSym = nullptr;
 
-  // The garbage collection metadata printer table.
-  void *GCMetadataPrinters = nullptr; // Really a DenseMap.
+  /// This map keeps track of which symbol is being used for the specified basic
+  /// block's address of label.
+  std::unique_ptr<AddrLabelMap> AddrLabelSymbols;
+
+  /// The garbage collection metadata printer table.
+  DenseMap<GCStrategy *, std::unique_ptr<GCMetadataPrinter>> GCMetadataPrinters;
 
   /// Emit comments in assembly output if this is true.
   bool VerboseAsm;
@@ -185,16 +191,24 @@ private:
   /// Output stream for the stack usage file (i.e., .su file).
   std::unique_ptr<raw_fd_ostream> StackUsageStream;
 
+  /// List of symbols to be inserted into PC sections.
+  DenseMap<const MDNode *, SmallVector<const MCSymbol *>> PCSectionsSymbols;
+
   static char ID;
 
 protected:
   MCSymbol *CurrentFnBegin = nullptr;
 
+  /// For dso_local functions, the current $local alias for the function.
+  MCSymbol *CurrentFnBeginLocal = nullptr;
+
   /// A vector of all debug/EH info emitters we should use. This vector
   /// maintains ownership of the emitters.
   std::vector<HandlerInfo> Handlers;
   size_t NumUserHandlers = 0;
 
+  StackMaps SM;
+
 private:
   /// If generated on the fly this own the instance.
   std::unique_ptr<MachineDominatorTree> OwnedMDT;
@@ -212,6 +226,16 @@ private:
   /// CFISection type the module needs i.e. either .eh_frame or .debug_frame.
   CFISection ModuleCFISection = CFISection::None;
 
+  /// True if the module contains split-stack functions. This is used to
+  /// emit .note.GNU-split-stack section as required by the linker for
+  /// special handling split-stack function calling no-split-stack function.
+  bool HasSplitStack = false;
+
+  /// True if the module contains no-split-stack functions. This is used to emit
+  /// .note.GNU-no-split-stack section when it also contains functions without a
+  /// split stack prologue.
+  bool HasNoSplitStack = false;
+
 protected:
   explicit AsmPrinter(TargetMachine &TM, std::unique_ptr<MCStreamer> Streamer);
 
@@ -232,6 +256,9 @@ public:
   /// Returns 4 for DWARF32 and 12 for DWARF64.
   unsigned int getUnitLengthFieldByteSize() const;
 
+  /// Returns information about the byte size of DW_FORM values.
+  dwarf::FormParams getDwarfFormParams() const;
+
   bool isPositionIndependent() const;
 
   /// Return true if assembly output should contain comments.
@@ -251,6 +278,25 @@ public:
   // given basic block.
   MCSymbol *getMBBExceptionSym(const MachineBasicBlock &MBB);
 
+  /// Return the symbol to be used for the specified basic block when its
+  /// address is taken.  This cannot be its normal LBB label because the block
+  /// may be accessed outside its containing function.
+  MCSymbol *getAddrLabelSymbol(const BasicBlock *BB) {
+    return getAddrLabelSymbolToEmit(BB).front();
+  }
+
+  /// Return the symbol to be used for the specified basic block when its
+  /// address is taken.  If other blocks were RAUW'd to this one, we may have
+  /// to emit them as well, return the whole set.
+  ArrayRef<MCSymbol *> getAddrLabelSymbolToEmit(const BasicBlock *BB);
+
+  /// If the specified function has had any references to address-taken blocks
+  /// generated, but the block got deleted, return the symbol now so we can
+  /// emit it.  This prevents emitting a reference to a symbol that has no
+  /// definition.
+  void takeDeletedSymbolsForFunction(const Function *F,
+                                     std::vector<MCSymbol *> &Result);
+
   /// Return information about object file lowering.
   const TargetLoweringObjectFile &getObjFileLowering() const;
 
@@ -281,6 +327,14 @@ public:
   /// definition in the same module.
   MCSymbol *getSymbolPreferLocal(const GlobalValue &GV) const;
 
+  bool doesDwarfUseRelocationsAcrossSections() const {
+    return DwarfUsesRelocationsAcrossSections;
+  }
+
+  void setDwarfUsesRelocationsAcrossSections(bool Enable) {
+    DwarfUsesRelocationsAcrossSections = Enable;
+  }
+
   //===------------------------------------------------------------------===//
   // XRay instrumentation implementation.
   //===------------------------------------------------------------------===//
@@ -365,10 +419,19 @@ public:
 
   void emitBBAddrMapSection(const MachineFunction &MF);
 
+  void emitKCFITrapEntry(const MachineFunction &MF, const MCSymbol *Symbol);
+  virtual void emitKCFITypeId(const MachineFunction &MF);
+
   void emitPseudoProbe(const MachineInstr &MI);
 
   void emitRemarksSection(remarks::RemarkStreamer &RS);
 
+  /// Emits a label as reference for PC sections.
+  void emitPCSectionsLabel(const MachineFunction &MF, const MDNode &MD);
+
+  /// Emits the PC sections collected from instructions.
+  void emitPCSections(const MachineFunction &MF);
+
   /// Get the CFISection type for a function.
   CFISection getFunctionCFISectionType(const Function &F) const;
 
@@ -432,7 +495,8 @@ public:
   /// global value is specified, and if that global has an explicit alignment
   /// requested, it will override the alignment request if required for
   /// correctness.
-  void emitAlignment(Align Alignment, const GlobalObject *GV = nullptr) const;
+  void emitAlignment(Align Alignment, const GlobalObject *GV = nullptr,
+                     unsigned MaxBytesToEmit = 0) const;
 
   /// Emit an alignment directive to the specified power of two boundary,
   /// like emitAlignment, but call emitTrapToAlignment to fill with
@@ -443,7 +507,11 @@ public:
   virtual const MCExpr *lowerConstant(const Constant *CV);
 
   /// Print a general LLVM constant to the .s file.
-  void emitGlobalConstant(const DataLayout &DL, const Constant *CV);
+  /// On AIX, when an alias refers to a sub-element of a global variable, the
+  /// label of that alias needs to be emitted before the corresponding element.
+  using AliasMapTy = DenseMap<uint64_t, SmallVector<const GlobalAlias *, 1>>;
+  void emitGlobalConstant(const DataLayout &DL, const Constant *CV,
+                          AliasMapTy *AliasList = nullptr);
 
   /// Unnamed constant global variables solely contaning a pointer to
   /// another globals variable act like a global variable "proxy", or GOT
@@ -461,7 +529,7 @@ public:
   void emitGlobalGOTEquivs();
 
   /// Emit the stack maps.
-  void emitStackMaps(StackMaps &SM);
+  void emitStackMaps();
 
   //===------------------------------------------------------------------===//
   // Overridable Hooks
@@ -718,7 +786,7 @@ public:
   /// ${:comment}.  Targets can override this to add support for their own
   /// strange codes.
   virtual void PrintSpecial(const MachineInstr *MI, raw_ostream &OS,
-                            const char *Code) const;
+                            StringRef Code) const;
 
   /// Print the MachineOperand as a symbol. Targets with complex handling of
   /// symbol references should override the base implementation.
@@ -770,6 +838,8 @@ private:
   mutable unsigned LastFn = 0;
   mutable unsigned Counter = ~0U;
 
+  bool DwarfUsesRelocationsAcrossSections = false;
+
   /// This method emits the header for the current function.
   virtual void emitFunctionHeader();
 
@@ -804,12 +874,17 @@ private:
   /// Emit bytes for llvm.commandline metadata.
   void emitModuleCommandLines(Module &M);
 
-  GCMetadataPrinter *GetOrCreateGCPrinter(GCStrategy &S);
-  /// Emit GlobalAlias or GlobalIFunc.
-  void emitGlobalIndirectSymbol(Module &M, const GlobalIndirectSymbol &GIS);
+  GCMetadataPrinter *getOrCreateGCPrinter(GCStrategy &S);
+  void emitGlobalAlias(Module &M, const GlobalAlias &GA);
+  void emitGlobalIFunc(Module &M, const GlobalIFunc &GI);
 
   /// This method decides whether the specified basic block requires a label.
   bool shouldEmitLabelForBasicBlock(const MachineBasicBlock &MBB) const;
+
+protected:
+  virtual bool shouldEmitWeakSwiftAsyncExtendedFramePointerFlags() const {
+    return false;
+  }
 };
 
 } // end namespace llvm
diff --git a/gnu/llvm/llvm/include/llvm/CodeGen/GlobalISel/RegisterBank.h b/gnu/llvm/llvm/include/llvm/CodeGen/GlobalISel/RegisterBank.h
deleted file mode 100644
index 5440d97728b..00000000000
--- a/gnu/llvm/llvm/include/llvm/CodeGen/GlobalISel/RegisterBank.h
+++ /dev/null
@@ -1,98 +0,0 @@
-//==-- llvm/CodeGen/GlobalISel/RegisterBank.h - Register Bank ----*- C++ -*-==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-/// \file This file declares the API of register banks.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CODEGEN_GLOBALISEL_REGISTERBANK_H
-#define LLVM_CODEGEN_GLOBALISEL_REGISTERBANK_H
-
-#include "llvm/ADT/BitVector.h"
-
-namespace llvm {
-// Forward declarations.
-class RegisterBankInfo;
-class raw_ostream;
-class TargetRegisterClass;
-class TargetRegisterInfo;
-
-/// This class implements the register bank concept.
-/// Two instances of RegisterBank must have different ID.
-/// This property is enforced by the RegisterBankInfo class.
-class RegisterBank {
-private:
-  unsigned ID;
-  const char *Name;
-  unsigned Size;
-  BitVector ContainedRegClasses;
-
-  /// Sentinel value used to recognize register bank not properly
-  /// initialized yet.
-  static const unsigned InvalidID;
-
-  /// Only the RegisterBankInfo can initialize RegisterBank properly.
-  friend RegisterBankInfo;
-
-public:
-  RegisterBank(unsigned ID, const char *Name, unsigned Size,
-               const uint32_t *CoveredClasses, unsigned NumRegClasses);
-
-  /// Get the identifier of this register bank.
-  unsigned getID() const { return ID; }
-
-  /// Get a user friendly name of this register bank.
-  /// Should be used only for debugging purposes.
-  const char *getName() const { return Name; }
-
-  /// Get the maximal size in bits that fits in this register bank.
-  unsigned getSize() const { return Size; }
-
-  /// Check whether this instance is ready to be used.
-  bool isValid() const;
-
-  /// Check if this register bank is valid. In other words,
-  /// if it has been properly constructed.
-  ///
-  /// \note This method does not check anything when assertions are disabled.
-  ///
-  /// \return True is the check was successful.
-  bool verify(const TargetRegisterInfo &TRI) const;
-
-  /// Check whether this register bank covers \p RC.
-  /// In other words, check if this register bank fully covers
-  /// the registers that \p RC contains.
-  /// \pre isValid()
-  bool covers(const TargetRegisterClass &RC) const;
-
-  /// Check whether \p OtherRB is the same as this.
-  bool operator==(const RegisterBank &OtherRB) const;
-  bool operator!=(const RegisterBank &OtherRB) const {
-    return !this->operator==(OtherRB);
-  }
-
-  /// Dump the register mask on dbgs() stream.
-  /// The dump is verbose.
-  void dump(const TargetRegisterInfo *TRI = nullptr) const;
-
-  /// Print the register mask on OS.
-  /// If IsForDebug is false, then only the name of the register bank
-  /// is printed. Otherwise, all the fields are printing.
-  /// TRI is then used to print the name of the register classes that
-  /// this register bank covers.
-  void print(raw_ostream &OS, bool IsForDebug = false,
-             const TargetRegisterInfo *TRI = nullptr) const;
-};
-
-inline raw_ostream &operator<<(raw_ostream &OS, const RegisterBank &RegBank) {
-  RegBank.print(OS);
-  return OS;
-}
-} // End namespace llvm.
-
-#endif
diff --git a/gnu/llvm/llvm/include/llvm/CodeGen/GlobalISel/RegisterBankInfo.h b/gnu/llvm/llvm/include/llvm/CodeGen/GlobalISel/RegisterBankInfo.h
deleted file mode 100644
index da785406bc3..00000000000
--- a/gnu/llvm/llvm/include/llvm/CodeGen/GlobalISel/RegisterBankInfo.h
+++ /dev/null
@@ -1,775 +0,0 @@
-//===- llvm/CodeGen/GlobalISel/RegisterBankInfo.h ---------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-/// \file This file declares the API for the register bank info.
-/// This API is responsible for handling the register banks.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CODEGEN_GLOBALISEL_REGISTERBANKINFO_H
-#define LLVM_CODEGEN_GLOBALISEL_REGISTERBANKINFO_H
-
-#include "llvm/ADT/DenseMap.h"
-#include "llvm/ADT/Hashing.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/iterator_range.h"
-#include "llvm/CodeGen/Register.h"
-#include "llvm/Support/ErrorHandling.h"
-#include "llvm/Support/LowLevelTypeImpl.h"
-#include <cassert>
-#include <initializer_list>
-#include <memory>
-
-namespace llvm {
-
-class MachineInstr;
-class MachineRegisterInfo;
-class raw_ostream;
-class RegisterBank;
-class TargetInstrInfo;
-class TargetRegisterClass;
-class TargetRegisterInfo;
-
-/// Holds all the information related to register banks.
-class RegisterBankInfo {
-public:
-  /// Helper struct that represents how a value is partially mapped
-  /// into a register.
-  /// The StartIdx and Length represent what region of the orginal
-  /// value this partial mapping covers.
-  /// This can be represented as a Mask of contiguous bit starting
-  /// at StartIdx bit and spanning Length bits.
-  /// StartIdx is the number of bits from the less significant bits.
-  struct PartialMapping {
-    /// Number of bits at which this partial mapping starts in the
-    /// original value.  The bits are counted from less significant
-    /// bits to most significant bits.
-    unsigned StartIdx;
-
-    /// Length of this mapping in bits. This is how many bits this
-    /// partial mapping covers in the original value:
-    /// from StartIdx to StartIdx + Length -1.
-    unsigned Length;
-
-    /// Register bank where the partial value lives.
-    const RegisterBank *RegBank;
-
-    PartialMapping() = default;
-
-    /// Provide a shortcut for quickly building PartialMapping.
-    PartialMapping(unsigned StartIdx, unsigned Length,
-                   const RegisterBank &RegBank)
-        : StartIdx(StartIdx), Length(Length), RegBank(&RegBank) {}
-
-    /// \return the index of in the original value of the most
-    /// significant bit that this partial mapping covers.
-    unsigned getHighBitIdx() const { return StartIdx + Length - 1; }
-
-    /// Print this partial mapping on dbgs() stream.
-    void dump() const;
-
-    /// Print this partial mapping on \p OS;
-    void print(raw_ostream &OS) const;
-
-    /// Check that the Mask is compatible with the RegBank.
-    /// Indeed, if the RegBank cannot accomadate the "active bits" of the mask,
-    /// there is no way this mapping is valid.
-    ///
-    /// \note This method does not check anything when assertions are disabled.
-    ///
-    /// \return True is the check was successful.
-    bool verify() const;
-  };
-
-  /// Helper struct that represents how a value is mapped through
-  /// different register banks.
-  ///
-  /// \note: So far we do not have any users of the complex mappings
-  /// (mappings with more than one partial mapping), but when we do,
-  /// we would have needed to duplicate partial mappings.
-  /// The alternative could be to use an array of pointers of partial
-  /// mapping (i.e., PartialMapping **BreakDown) and duplicate the
-  /// pointers instead.
-  ///
-  /// E.g.,
-  /// Let say we have a 32-bit add and a <2 x 32-bit> vadd. We
-  /// can expand the
-  /// <2 x 32-bit> add into 2 x 32-bit add.
-  ///
-  /// Currently the TableGen-like file would look like:
-  /// \code
-  /// PartialMapping[] = {
-  /// /*32-bit add*/      {0, 32, GPR}, // Scalar entry repeated for first
-  ///                                   // vec elt.
-  /// /*2x32-bit add*/    {0, 32, GPR}, {32, 32, GPR},
-  /// /*<2x32-bit> vadd*/ {0, 64, VPR}
-  /// }; // PartialMapping duplicated.
-  ///
-  /// ValueMapping[] {
-  ///   /*plain 32-bit add*/       {&PartialMapping[0], 1},
-  ///   /*expanded vadd on 2xadd*/ {&PartialMapping[1], 2},
-  ///   /*plain <2x32-bit> vadd*/  {&PartialMapping[3], 1}
-  /// };
-  /// \endcode
-  ///
-  /// With the array of pointer, we would have:
-  /// \code
-  /// PartialMapping[] = {
-  /// /*32-bit add lower */ { 0, 32, GPR},
-  /// /*32-bit add upper */ {32, 32, GPR},
-  /// /*<2x32-bit> vadd */  { 0, 64, VPR}
-  /// }; // No more duplication.
-  ///
-  /// BreakDowns[] = {
-  /// /*AddBreakDown*/   &PartialMapping[0],
-  /// /*2xAddBreakDown*/ &PartialMapping[0], &PartialMapping[1],
-  /// /*VAddBreakDown*/  &PartialMapping[2]
-  /// }; // Addresses of PartialMapping duplicated (smaller).
-  ///
-  /// ValueMapping[] {
-  ///   /*plain 32-bit add*/       {&BreakDowns[0], 1},
-  ///   /*expanded vadd on 2xadd*/ {&BreakDowns[1], 2},
-  ///   /*plain <2x32-bit> vadd*/  {&BreakDowns[3], 1}
-  /// };
-  /// \endcode
-  ///
-  /// Given that a PartialMapping is actually small, the code size
-  /// impact is actually a degradation. Moreover the compile time will
-  /// be hit by the additional indirection.
-  /// If PartialMapping gets bigger we may reconsider.
-  struct ValueMapping {
-    /// How the value is broken down between the different register banks.
-    const PartialMapping *BreakDown;
-
-    /// Number of partial mapping to break down this value.
-    unsigned NumBreakDowns;
-
-    /// The default constructor creates an invalid (isValid() == false)
-    /// instance.
-    ValueMapping() : ValueMapping(nullptr, 0) {}
-
-    /// Initialize a ValueMapping with the given parameter.
-    /// \p BreakDown needs to have a life time at least as long
-    /// as this instance.
-    ValueMapping(const PartialMapping *BreakDown, unsigned NumBreakDowns)
-        : BreakDown(BreakDown), NumBreakDowns(NumBreakDowns) {}
-
-    /// Iterators through the PartialMappings.
-    const PartialMapping *begin() const { return BreakDown; }
-    const PartialMapping *end() const { return BreakDown + NumBreakDowns; }
-
-    /// \return true if all partial mappings are the same size and register
-    /// bank.
-    bool partsAllUniform() const;
-
-    /// Check if this ValueMapping is valid.
-    bool isValid() const { return BreakDown && NumBreakDowns; }
-
-    /// Verify that this mapping makes sense for a value of
-    /// \p MeaningfulBitWidth.
-    /// \note This method does not check anything when assertions are disabled.
-    ///
-    /// \return True is the check was successful.
-    bool verify(unsigned MeaningfulBitWidth) const;
-
-    /// Print this on dbgs() stream.
-    void dump() const;
-
-    /// Print this on \p OS;
-    void print(raw_ostream &OS) const;
-  };
-
-  /// Helper class that represents how the value of an instruction may be
-  /// mapped and what is the related cost of such mapping.
-  class InstructionMapping {
-    /// Identifier of the mapping.
-    /// This is used to communicate between the target and the optimizers
-    /// which mapping should be realized.
-    unsigned ID = InvalidMappingID;
-
-    /// Cost of this mapping.
-    unsigned Cost = 0;
-
-    /// Mapping of all the operands.
-    const ValueMapping *OperandsMapping = nullptr;
-
-    /// Number of operands.
-    unsigned NumOperands = 0;
-
-    const ValueMapping &getOperandMapping(unsigned i) {
-      assert(i < getNumOperands() && "Out of bound operand");
-      return OperandsMapping[i];
-    }
-
-  public:
-    /// Constructor for the mapping of an instruction.
-    /// \p NumOperands must be equal to number of all the operands of
-    /// the related instruction.
-    /// The rationale is that it is more efficient for the optimizers
-    /// to be able to assume that the mapping of the ith operand is
-    /// at the index i.
-    InstructionMapping(unsigned ID, unsigned Cost,
-                       const ValueMapping *OperandsMapping,
-                       unsigned NumOperands)
-        : ID(ID), Cost(Cost), OperandsMapping(OperandsMapping),
-          NumOperands(NumOperands) {
-    }
-
-    /// Default constructor.
-    /// Use this constructor to express that the mapping is invalid.
-    InstructionMapping() = default;
-
-    /// Get the cost.
-    unsigned getCost() const { return Cost; }
-
-    /// Get the ID.
-    unsigned getID() const { return ID; }
-
-    /// Get the number of operands.
-    unsigned getNumOperands() const { return NumOperands; }
-
-    /// Get the value mapping of the ith operand.
-    /// \pre The mapping for the ith operand has been set.
-    /// \pre The ith operand is a register.
-    const ValueMapping &getOperandMapping(unsigned i) const {
-      const ValueMapping &ValMapping =
-          const_cast<InstructionMapping *>(this)->getOperandMapping(i);
-      return ValMapping;
-    }
-
-    /// Set the mapping for all the operands.
-    /// In other words, OpdsMapping should hold at least getNumOperands
-    /// ValueMapping.
-    void setOperandsMapping(const ValueMapping *OpdsMapping) {
-      OperandsMapping = OpdsMapping;
-    }
-
-    /// Check whether this object is valid.
-    /// This is a lightweight check for obvious wrong instance.
-    bool isValid() const {
-      return getID() != InvalidMappingID && OperandsMapping;
-    }
-
-    /// Verifiy that this mapping makes sense for \p MI.
-    /// \pre \p MI must be connected to a MachineFunction.
-    ///
-    /// \note This method does not check anything when assertions are disabled.
-    ///
-    /// \return True is the check was successful.
-    bool verify(const MachineInstr &MI) const;
-
-    /// Print this on dbgs() stream.
-    void dump() const;
-
-    /// Print this on \p OS;
-    void print(raw_ostream &OS) const;
-  };
-
-  /// Convenient type to represent the alternatives for mapping an
-  /// instruction.
-  /// \todo When we move to TableGen this should be an array ref.
-  using InstructionMappings = SmallVector<const InstructionMapping *, 4>;
-
-  /// Helper class used to get/create the virtual registers that will be used
-  /// to replace the MachineOperand when applying a mapping.
-  class OperandsMapper {
-    /// The OpIdx-th cell contains the index in NewVRegs where the VRegs of the
-    /// OpIdx-th operand starts. -1 means we do not have such mapping yet.
-    /// Note: We use a SmallVector to avoid heap allocation for most cases.
-    SmallVector<int, 8> OpToNewVRegIdx;
-
-    /// Hold the registers that will be used to map MI with InstrMapping.
-    SmallVector<Register, 8> NewVRegs;
-
-    /// Current MachineRegisterInfo, used to create new virtual registers.
-    MachineRegisterInfo &MRI;
-
-    /// Instruction being remapped.
-    MachineInstr &MI;
-
-    /// New mapping of the instruction.
-    const InstructionMapping &InstrMapping;
-
-    /// Constant value identifying that the index in OpToNewVRegIdx
-    /// for an operand has not been set yet.
-    static const int DontKnowIdx;
-
-    /// Get the range in NewVRegs to store all the partial
-    /// values for the \p OpIdx-th operand.
-    ///
-    /// \return The iterator range for the space created.
-    //
-    /// \pre getMI().getOperand(OpIdx).isReg()
-    iterator_range<SmallVectorImpl<Register>::iterator>
-    getVRegsMem(unsigned OpIdx);
-
-    /// Get the end iterator for a range starting at \p StartIdx and
-    /// spannig \p NumVal in NewVRegs.
-    /// \pre StartIdx + NumVal <= NewVRegs.size()
-    SmallVectorImpl<Register>::const_iterator
-    getNewVRegsEnd(unsigned StartIdx, unsigned NumVal) const;
-    SmallVectorImpl<Register>::iterator getNewVRegsEnd(unsigned StartIdx,
-                                                       unsigned NumVal);
-
-  public:
-    /// Create an OperandsMapper that will hold the information to apply \p
-    /// InstrMapping to \p MI.
-    /// \pre InstrMapping.verify(MI)
-    OperandsMapper(MachineInstr &MI, const InstructionMapping &InstrMapping,
-                   MachineRegisterInfo &MRI);
-
-    /// \name Getters.
-    /// @{
-    /// The MachineInstr being remapped.
-    MachineInstr &getMI() const { return MI; }
-
-    /// The final mapping of the instruction.
-    const InstructionMapping &getInstrMapping() const { return InstrMapping; }
-
-    /// The MachineRegisterInfo we used to realize the mapping.
-    MachineRegisterInfo &getMRI() const { return MRI; }
-    /// @}
-
-    /// Create as many new virtual registers as needed for the mapping of the \p
-    /// OpIdx-th operand.
-    /// The number of registers is determined by the number of breakdown for the
-    /// related operand in the instruction mapping.
-    /// The type of the new registers is a plain scalar of the right size.
-    /// The proper type is expected to be set when the mapping is applied to
-    /// the instruction(s) that realizes the mapping.
-    ///
-    /// \pre getMI().getOperand(OpIdx).isReg()
-    ///
-    /// \post All the partial mapping of the \p OpIdx-th operand have been
-    /// assigned a new virtual register.
-    void createVRegs(unsigned OpIdx);
-
-    /// Set the virtual register of the \p PartialMapIdx-th partial mapping of
-    /// the OpIdx-th operand to \p NewVReg.
-    ///
-    /// \pre getMI().getOperand(OpIdx).isReg()
-    /// \pre getInstrMapping().getOperandMapping(OpIdx).BreakDown.size() >
-    /// PartialMapIdx
-    /// \pre NewReg != 0
-    ///
-    /// \post the \p PartialMapIdx-th register of the value mapping of the \p
-    /// OpIdx-th operand has been set.
-    void setVRegs(unsigned OpIdx, unsigned PartialMapIdx, Register NewVReg);
-
-    /// Get all the virtual registers required to map the \p OpIdx-th operand of
-    /// the instruction.
-    ///
-    /// This return an empty range when createVRegs or setVRegs has not been
-    /// called.
-    /// The iterator may be invalidated by a call to setVRegs or createVRegs.
-    ///
-    /// When \p ForDebug is true, we will not check that the list of new virtual
-    /// registers does not contain uninitialized values.
-    ///
-    /// \pre getMI().getOperand(OpIdx).isReg()
-    /// \pre ForDebug || All partial mappings have been set a register
-    iterator_range<SmallVectorImpl<Register>::const_iterator>
-    getVRegs(unsigned OpIdx, bool ForDebug = false) const;
-
-    /// Print this operands mapper on dbgs() stream.
-    void dump() const;
-
-    /// Print this operands mapper on \p OS stream.
-    void print(raw_ostream &OS, bool ForDebug = false) const;
-  };
-
-protected:
-  /// Hold the set of supported register banks.
-  RegisterBank **RegBanks;
-
-  /// Total number of register banks.
-  unsigned NumRegBanks;
-
-  /// Keep dynamically allocated PartialMapping in a separate map.
-  /// This shouldn't be needed when everything gets TableGen'ed.
-  mutable DenseMap<unsigned, std::unique_ptr<const PartialMapping>>
-      MapOfPartialMappings;
-
-  /// Keep dynamically allocated ValueMapping in a separate map.
-  /// This shouldn't be needed when everything gets TableGen'ed.
-  mutable DenseMap<unsigned, std::unique_ptr<const ValueMapping>>
-      MapOfValueMappings;
-
-  /// Keep dynamically allocated array of ValueMapping in a separate map.
-  /// This shouldn't be needed when everything gets TableGen'ed.
-  mutable DenseMap<unsigned, std::unique_ptr<ValueMapping[]>>
-      MapOfOperandsMappings;
-
-  /// Keep dynamically allocated InstructionMapping in a separate map.
-  /// This shouldn't be needed when everything gets TableGen'ed.
-  mutable DenseMap<unsigned, std::unique_ptr<const InstructionMapping>>
-      MapOfInstructionMappings;
-
-  /// Getting the minimal register class of a physreg is expensive.
-  /// Cache this information as we get it.
-  mutable DenseMap<unsigned, const TargetRegisterClass *> PhysRegMinimalRCs;
-
-  /// Create a RegisterBankInfo that can accommodate up to \p NumRegBanks
-  /// RegisterBank instances.
-  RegisterBankInfo(RegisterBank **RegBanks, unsigned NumRegBanks);
-
-  /// This constructor is meaningless.
-  /// It just provides a default constructor that can be used at link time
-  /// when GlobalISel is not built.
-  /// That way, targets can still inherit from this class without doing
-  /// crazy gymnastic to avoid link time failures.
-  /// \note That works because the constructor is inlined.
-  RegisterBankInfo() {
-    llvm_unreachable("This constructor should not be executed");
-  }
-
-  /// Get the register bank identified by \p ID.
-  RegisterBank &getRegBank(unsigned ID) {
-    assert(ID < getNumRegBanks() && "Accessing an unknown register bank");
-    return *RegBanks[ID];
-  }
-
-  /// Get the MinimalPhysRegClass for Reg.
-  /// \pre Reg is a physical register.
-  const TargetRegisterClass &
-  getMinimalPhysRegClass(Register Reg, const TargetRegisterInfo &TRI) const;
-
-  /// Try to get the mapping of \p MI.
-  /// See getInstrMapping for more details on what a mapping represents.
-  ///
-  /// Unlike getInstrMapping the returned InstructionMapping may be invalid
-  /// (isValid() == false).
-  /// This means that the target independent code is not smart enough
-  /// to get the mapping of \p MI and thus, the target has to provide the
-  /// information for \p MI.
-  ///
-  /// This implementation is able to get the mapping of:
-  /// - Target specific instructions by looking at the encoding constraints.
-  /// - Any instruction if all the register operands have already been assigned
-  ///   a register, a register class, or a register bank.
-  /// - Copies and phis if at least one of the operands has been assigned a
-  ///   register, a register class, or a register bank.
-  /// In other words, this method will likely fail to find a mapping for
-  /// any generic opcode that has not been lowered by target specific code.
-  const InstructionMapping &getInstrMappingImpl(const MachineInstr &MI) const;
-
-  /// Get the uniquely generated PartialMapping for the
-  /// given arguments.
-  const PartialMapping &getPartialMapping(unsigned StartIdx, unsigned Length,
-                                          const RegisterBank &RegBank) const;
-
-  /// \name Methods to get a uniquely generated ValueMapping.
-  /// @{
-
-  /// The most common ValueMapping consists of a single PartialMapping.
-  /// Feature a method for that.
-  const ValueMapping &getValueMapping(unsigned StartIdx, unsigned Length,
-                                      const RegisterBank &RegBank) const;
-
-  /// Get the ValueMapping for the given arguments.
-  const ValueMapping &getValueMapping(const PartialMapping *BreakDown,
-                                      unsigned NumBreakDowns) const;
-  /// @}
-
-  /// \name Methods to get a uniquely generated array of ValueMapping.
-  /// @{
-
-  /// Get the uniquely generated array of ValueMapping for the
-  /// elements of between \p Begin and \p End.
-  ///
-  /// Elements that are nullptr will be replaced by
-  /// invalid ValueMapping (ValueMapping::isValid == false).
-  ///
-  /// \pre The pointers on ValueMapping between \p Begin and \p End
-  /// must uniquely identify a ValueMapping. Otherwise, there is no
-  /// guarantee that the return instance will be unique, i.e., another
-  /// OperandsMapping could have the same content.
-  template <typename Iterator>
-  const ValueMapping *getOperandsMapping(Iterator Begin, Iterator End) const;
-
-  /// Get the uniquely generated array of ValueMapping for the
-  /// elements of \p OpdsMapping.
-  ///
-  /// Elements of \p OpdsMapping that are nullptr will be replaced by
-  /// invalid ValueMapping (ValueMapping::isValid == false).
-  const ValueMapping *getOperandsMapping(
-      const SmallVectorImpl<const ValueMapping *> &OpdsMapping) const;
-
-  /// Get the uniquely generated array of ValueMapping for the
-  /// given arguments.
-  ///
-  /// Arguments that are nullptr will be replaced by invalid
-  /// ValueMapping (ValueMapping::isValid == false).
-  const ValueMapping *getOperandsMapping(
-      std::initializer_list<const ValueMapping *> OpdsMapping) const;
-  /// @}
-
-  /// \name Methods to get a uniquely generated InstructionMapping.
-  /// @{
-
-private:
-  /// Method to get a uniquely generated InstructionMapping.
-  const InstructionMapping &
-  getInstructionMappingImpl(bool IsInvalid, unsigned ID = InvalidMappingID,
-                            unsigned Cost = 0,
-                            const ValueMapping *OperandsMapping = nullptr,
-                            unsigned NumOperands = 0) const;
-
-public:
-  /// Method to get a uniquely generated InstructionMapping.
-  const InstructionMapping &
-  getInstructionMapping(unsigned ID, unsigned Cost,
-                        const ValueMapping *OperandsMapping,
-                        unsigned NumOperands) const {
-    return getInstructionMappingImpl(/*IsInvalid*/ false, ID, Cost,
-                                     OperandsMapping, NumOperands);
-  }
-
-  /// Method to get a uniquely generated invalid InstructionMapping.
-  const InstructionMapping &getInvalidInstructionMapping() const {
-    return getInstructionMappingImpl(/*IsInvalid*/ true);
-  }
-  /// @}
-
-  /// Get the register bank for the \p OpIdx-th operand of \p MI form
-  /// the encoding constraints, if any.
-  ///
-  /// \return A register bank that covers the register class of the
-  /// related encoding constraints or nullptr if \p MI did not provide
-  /// enough information to deduce it.
-  const RegisterBank *
-  getRegBankFromConstraints(const MachineInstr &MI, unsigned OpIdx,
-                            const TargetInstrInfo &TII,
-                            const MachineRegisterInfo &MRI) const;
-
-  /// Helper method to apply something that is like the default mapping.
-  /// Basically, that means that \p OpdMapper.getMI() is left untouched
-  /// aside from the reassignment of the register operand that have been
-  /// remapped.
-  ///
-  /// The type of all the new registers that have been created by the
-  /// mapper are properly remapped to the type of the original registers
-  /// they replace. In other words, the semantic of the instruction does
-  /// not change, only the register banks.
-  ///
-  /// If the mapping of one of the operand spans several registers, this
-  /// method will abort as this is not like a default mapping anymore.
-  ///
-  /// \pre For OpIdx in {0..\p OpdMapper.getMI().getNumOperands())
-  ///        the range OpdMapper.getVRegs(OpIdx) is empty or of size 1.
-  static void applyDefaultMapping(const OperandsMapper &OpdMapper);
-
-  /// See ::applyMapping.
-  virtual void applyMappingImpl(const OperandsMapper &OpdMapper) const {
-    llvm_unreachable("The target has to implement that part");
-  }
-
-public:
-  virtual ~RegisterBankInfo() = default;
-
-  /// Get the register bank identified by \p ID.
-  const RegisterBank &getRegBank(unsigned ID) const {
-    return const_cast<RegisterBankInfo *>(this)->getRegBank(ID);
-  }
-
-  /// Get the register bank of \p Reg.
-  /// If Reg has not been assigned a register, a register class,
-  /// or a register bank, then this returns nullptr.
-  ///
-  /// \pre Reg != 0 (NoRegister)
-  const RegisterBank *getRegBank(Register Reg, const MachineRegisterInfo &MRI,
-                                 const TargetRegisterInfo &TRI) const;
-
-  /// Get the total number of register banks.
-  unsigned getNumRegBanks() const { return NumRegBanks; }
-
-  /// Get a register bank that covers \p RC.
-  ///
-  /// \pre \p RC is a user-defined register class (as opposed as one
-  /// generated by TableGen).
-  ///
-  /// \note The mapping RC -> RegBank could be built while adding the
-  /// coverage for the register banks. However, we do not do it, because,
-  /// at least for now, we only need this information for register classes
-  /// that are used in the description of instruction. In other words,
-  /// there are just a handful of them and we do not want to waste space.
-  ///
-  /// \todo This should be TableGen'ed.
-  virtual const RegisterBank &
-  getRegBankFromRegClass(const TargetRegisterClass &RC, LLT Ty) const {
-    llvm_unreachable("The target must override this method");
-  }
-
-  /// Get the cost of a copy from \p B to \p A, or put differently,
-  /// get the cost of A = COPY B. Since register banks may cover
-  /// different size, \p Size specifies what will be the size in bits
-  /// that will be copied around.
-  ///
-  /// \note Since this is a copy, both registers have the same size.
-  virtual unsigned copyCost(const RegisterBank &A, const RegisterBank &B,
-                            unsigned Size) const {
-    // Optimistically assume that copies are coalesced. I.e., when
-    // they are on the same bank, they are free.
-    // Otherwise assume a non-zero cost of 1. The targets are supposed
-    // to override that properly anyway if they care.
-    return &A != &B;
-  }
-
-  /// \returns true if emitting a copy from \p Src to \p Dst is impossible.
-  bool cannotCopy(const RegisterBank &Dst, const RegisterBank &Src,
-                  unsigned Size) const {
-    return copyCost(Dst, Src, Size) == std::numeric_limits<unsigned>::max();
-  }
-
-  /// Get the cost of using \p ValMapping to decompose a register. This is
-  /// similar to ::copyCost, except for cases where multiple copy-like
-  /// operations need to be inserted. If the register is used as a source
-  /// operand and already has a bank assigned, \p CurBank is non-null.
-  virtual unsigned getBreakDownCost(const ValueMapping &ValMapping,
-                                    const RegisterBank *CurBank = nullptr) const {
-    return std::numeric_limits<unsigned>::max();
-  }
-
-  /// Constrain the (possibly generic) virtual register \p Reg to \p RC.
-  ///
-  /// \pre \p Reg is a virtual register that either has a bank or a class.
-  /// \returns The constrained register class, or nullptr if there is none.
-  /// \note This is a generic variant of MachineRegisterInfo::constrainRegClass
-  /// \note Use MachineRegisterInfo::constrainRegAttrs instead for any non-isel
-  /// purpose, including non-select passes of GlobalISel
-  static const TargetRegisterClass *
-  constrainGenericRegister(Register Reg, const TargetRegisterClass &RC,
-                           MachineRegisterInfo &MRI);
-
-  /// Identifier used when the related instruction mapping instance
-  /// is generated by target independent code.
-  /// Make sure not to use that identifier to avoid possible collision.
-  static const unsigned DefaultMappingID;
-
-  /// Identifier used when the related instruction mapping instance
-  /// is generated by the default constructor.
-  /// Make sure not to use that identifier.
-  static const unsigned InvalidMappingID;
-
-  /// Get the mapping of the different operands of \p MI
-  /// on the register bank.
-  /// This mapping should be the direct translation of \p MI.
-  /// In other words, when \p MI is mapped with the returned mapping,
-  /// only the register banks of the operands of \p MI need to be updated.
-  /// In particular, neither the opcode nor the type of \p MI needs to be
-  /// updated for this direct mapping.
-  ///
-  /// The target independent implementation gives a mapping based on
-  /// the register classes for the target specific opcode.
-  /// It uses the ID RegisterBankInfo::DefaultMappingID for that mapping.
-  /// Make sure you do not use that ID for the alternative mapping
-  /// for MI. See getInstrAlternativeMappings for the alternative
-  /// mappings.
-  ///
-  /// For instance, if \p MI is a vector add, the mapping should
-  /// not be a scalarization of the add.
-  ///
-  /// \post returnedVal.verify(MI).
-  ///
-  /// \note If returnedVal does not verify MI, this would probably mean
-  /// that the target does not support that instruction.
-  virtual const InstructionMapping &
-  getInstrMapping(const MachineInstr &MI) const;
-
-  /// Get the alternative mappings for \p MI.
-  /// Alternative in the sense different from getInstrMapping.
-  virtual InstructionMappings
-  getInstrAlternativeMappings(const MachineInstr &MI) const;
-
-  /// Get the possible mapping for \p MI.
-  /// A mapping defines where the different operands may live and at what cost.
-  /// For instance, let us consider:
-  /// v0(16) = G_ADD <2 x i8> v1, v2
-  /// The possible mapping could be:
-  ///
-  /// {/*ID*/VectorAdd, /*Cost*/1, /*v0*/{(0xFFFF, VPR)}, /*v1*/{(0xFFFF, VPR)},
-  ///                              /*v2*/{(0xFFFF, VPR)}}
-  /// {/*ID*/ScalarAddx2, /*Cost*/2, /*v0*/{(0x00FF, GPR),(0xFF00, GPR)},
-  ///                                /*v1*/{(0x00FF, GPR),(0xFF00, GPR)},
-  ///                                /*v2*/{(0x00FF, GPR),(0xFF00, GPR)}}
-  ///
-  /// \note The first alternative of the returned mapping should be the
-  /// direct translation of \p MI current form.
-  ///
-  /// \post !returnedVal.empty().
-  InstructionMappings getInstrPossibleMappings(const MachineInstr &MI) const;
-
-  /// Apply \p OpdMapper.getInstrMapping() to \p OpdMapper.getMI().
-  /// After this call \p OpdMapper.getMI() may not be valid anymore.
-  /// \p OpdMapper.getInstrMapping().getID() carries the information of
-  /// what has been chosen to map \p OpdMapper.getMI(). This ID is set
-  /// by the various getInstrXXXMapping method.
-  ///
-  /// Therefore, getting the mapping and applying it should be kept in
-  /// sync.
-  void applyMapping(const OperandsMapper &OpdMapper) const {
-    // The only mapping we know how to handle is the default mapping.
-    if (OpdMapper.getInstrMapping().getID() == DefaultMappingID)
-      return applyDefaultMapping(OpdMapper);
-    // For other mapping, the target needs to do the right thing.
-    // If that means calling applyDefaultMapping, fine, but this
-    // must be explicitly stated.
-    applyMappingImpl(OpdMapper);
-  }
-
-  /// Get the size in bits of \p Reg.
-  /// Utility method to get the size of any registers. Unlike
-  /// MachineRegisterInfo::getSize, the register does not need to be a
-  /// virtual register.
-  ///
-  /// \pre \p Reg != 0 (NoRegister).
-  unsigned getSizeInBits(Register Reg, const MachineRegisterInfo &MRI,
-                         const TargetRegisterInfo &TRI) const;
-
-  /// Check that information hold by this instance make sense for the
-  /// given \p TRI.
-  ///
-  /// \note This method does not check anything when assertions are disabled.
-  ///
-  /// \return True is the check was successful.
-  bool verify(const TargetRegisterInfo &TRI) const;
-};
-
-inline raw_ostream &
-operator<<(raw_ostream &OS,
-           const RegisterBankInfo::PartialMapping &PartMapping) {
-  PartMapping.print(OS);
-  return OS;
-}
-
-inline raw_ostream &
-operator<<(raw_ostream &OS, const RegisterBankInfo::ValueMapping &ValMapping) {
-  ValMapping.print(OS);
-  return OS;
-}
-
-inline raw_ostream &
-operator<<(raw_ostream &OS,
-           const RegisterBankInfo::InstructionMapping &InstrMapping) {
-  InstrMapping.print(OS);
-  return OS;
-}
-
-inline raw_ostream &
-operator<<(raw_ostream &OS, const RegisterBankInfo::OperandsMapper &OpdMapper) {
-  OpdMapper.print(OS, /*ForDebug*/ false);
-  return OS;
-}
-
-/// Hashing function for PartialMapping.
-/// It is required for the hashing of ValueMapping.
-hash_code hash_value(const RegisterBankInfo::PartialMapping &PartMapping);
-
-} // end namespace llvm
-
-#endif // LLVM_CODEGEN_GLOBALISEL_REGISTERBANKINFO_H
diff --git a/gnu/llvm/llvm/include/llvm/CodeGen/MachineFrameInfo.h b/gnu/llvm/llvm/include/llvm/CodeGen/MachineFrameInfo.h
index ba54ab52e88..351160bd8ee 100644
--- a/gnu/llvm/llvm/include/llvm/CodeGen/MachineFrameInfo.h
+++ b/gnu/llvm/llvm/include/llvm/CodeGen/MachineFrameInfo.h
@@ -15,8 +15,8 @@
 
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/CodeGen/Register.h"
+#include "llvm/CodeGen/TargetFrameLowering.h"
 #include "llvm/Support/Alignment.h"
-#include "llvm/Support/DataTypes.h"
 #include <cassert>
 #include <vector>
 
@@ -49,14 +49,13 @@ class CalleeSavedInfo {
   /// The long-term solution is to model the liveness of callee-saved registers
   /// by implicit uses on the return instructions, however, the required
   /// changes in the ARM backend would be quite extensive.
-  bool Restored;
+  bool Restored = true;
   /// Flag indicating whether the register is spilled to stack or another
   /// register.
-  bool SpilledToReg;
+  bool SpilledToReg = false;
 
 public:
-  explicit CalleeSavedInfo(unsigned R, int FI = 0)
-  : Reg(R), FrameIdx(FI), Restored(true), SpilledToReg(false) {}
+  explicit CalleeSavedInfo(unsigned R, int FI = 0) : Reg(R), FrameIdx(FI) {}
 
   // Accessors.
   Register getReg()                        const { return Reg; }
@@ -180,14 +179,14 @@ private:
     /// If true, the object has been sign-extended.
     bool isSExt = false;
 
-    uint8_t SSPLayout;
+    uint8_t SSPLayout = SSPLK_None;
 
     StackObject(uint64_t Size, Align Alignment, int64_t SPOffset,
                 bool IsImmutable, bool IsSpillSlot, const AllocaInst *Alloca,
                 bool IsAliased, uint8_t StackID = 0)
         : SPOffset(SPOffset), Size(Size), Alignment(Alignment),
           isImmutable(IsImmutable), isSpillSlot(IsSpillSlot), StackID(StackID),
-          Alloca(Alloca), isAliased(IsAliased), SSPLayout(SSPLK_None) {}
+          Alloca(Alloca), isAliased(IsAliased) {}
   };
 
   /// The alignment of the stack.
@@ -345,12 +344,17 @@ private:
   /// Not null, if shrink-wrapping found a better place for the epilogue.
   MachineBasicBlock *Restore = nullptr;
 
+  /// Size of the UnsafeStack Frame
+  uint64_t UnsafeStackSize = 0;
+
 public:
-  explicit MachineFrameInfo(unsigned StackAlignment, bool StackRealignable,
+  explicit MachineFrameInfo(Align StackAlignment, bool StackRealignable,
                             bool ForcedRealign)
-      : StackAlignment(assumeAligned(StackAlignment)),
+      : StackAlignment(StackAlignment),
         StackRealignable(StackRealignable), ForcedRealign(ForcedRealign) {}
 
+  MachineFrameInfo(const MachineFrameInfo &) = delete;
+
   /// Return true if there are any stack objects in this function.
   bool hasStackObjects() const { return !Objects.empty(); }
 
@@ -379,6 +383,7 @@ public:
   /// This object is used for SjLj exceptions.
   int getFunctionContextIndex() const { return FunctionContextIdx; }
   void setFunctionContextIndex(int I) { FunctionContextIdx = I; }
+  bool hasFunctionContextIndex() const { return FunctionContextIdx != -1; }
 
   /// This method may be called any time after instruction
   /// selection is complete to determine if there is a call to
@@ -404,6 +409,20 @@ public:
   bool hasPatchPoint() const { return HasPatchPoint; }
   void setHasPatchPoint(bool s = true) { HasPatchPoint = s; }
 
+  /// Return true if this function requires a split stack prolog, even if it
+  /// uses no stack space. This is only meaningful for functions where
+  /// MachineFunction::shouldSplitStack() returns true.
+  //
+  // For non-leaf functions we have to allow for the possibility that the call
+  // is to a non-split function, as in PR37807. This function could also take
+  // the address of a non-split function. When the linker tries to adjust its
+  // non-existent prologue, it would fail with an error. Mark the object file so
+  // that such failures are not errors. See this Go language bug-report
+  // https://go-review.googlesource.com/c/go/+/148819/
+  bool needsSplitStackProlog() const {
+    return getStackSize() != 0 || hasTailCall();
+  }
+
   /// Return the minimum frame object index.
   int getObjectIndexBegin() const { return -NumFixedObjects; }
 
@@ -488,14 +507,21 @@ public:
     return Objects[ObjectIdx + NumFixedObjects].Alignment;
   }
 
+  /// Should this stack ID be considered in MaxAlignment.
+  bool contributesToMaxAlignment(uint8_t StackID) {
+    return StackID == TargetStackID::Default ||
+           StackID == TargetStackID::ScalableVector;
+  }
+
   /// setObjectAlignment - Change the alignment of the specified stack object.
   void setObjectAlignment(int ObjectIdx, Align Alignment) {
     assert(unsigned(ObjectIdx + NumFixedObjects) < Objects.size() &&
            "Invalid Object Idx!");
     Objects[ObjectIdx + NumFixedObjects].Alignment = Alignment;
 
-    // Only ensure max alignment for the default stack.
-    if (getStackID(ObjectIdx) == 0)
+    // Only ensure max alignment for the default and scalable vector stack.
+    uint8_t StackID = getStackID(ObjectIdx);
+    if (contributesToMaxAlignment(StackID))
       ensureMaxAlignment(Alignment);
   }
 
@@ -507,6 +533,14 @@ public:
     return Objects[ObjectIdx+NumFixedObjects].Alloca;
   }
 
+  /// Remove the underlying Alloca of the specified stack object if it
+  /// exists. This generally should not be used and is for reduction tooling.
+  void clearObjectAllocation(int ObjectIdx) {
+    assert(unsigned(ObjectIdx + NumFixedObjects) < Objects.size() &&
+           "Invalid Object Idx!");
+    Objects[ObjectIdx + NumFixedObjects].Alloca = nullptr;
+  }
+
   /// Return the assigned stack offset of the specified object
   /// from the incoming stack pointer.
   int64_t getObjectOffset(int ObjectIdx) const {
@@ -792,6 +826,9 @@ public:
   MachineBasicBlock *getRestorePoint() const { return Restore; }
   void setRestorePoint(MachineBasicBlock *NewRestore) { Restore = NewRestore; }
 
+  uint64_t getUnsafeStackSize() const { return UnsafeStackSize; }
+  void setUnsafeStackSize(uint64_t Size) { UnsafeStackSize = Size; }
+
   /// Return a set of physical registers that are pristine.
   ///
   /// Pristine registers hold a value that is useless to the current function,
diff --git a/gnu/llvm/llvm/include/llvm/CodeGen/Passes.h b/gnu/llvm/llvm/include/llvm/CodeGen/Passes.h
index 6565e9b8a99..bbc7eb43958 100644
--- a/gnu/llvm/llvm/include/llvm/CodeGen/Passes.h
+++ b/gnu/llvm/llvm/include/llvm/CodeGen/Passes.h
@@ -26,17 +26,19 @@ namespace llvm {
 class FunctionPass;
 class MachineFunction;
 class MachineFunctionPass;
-class MemoryBuffer;
 class ModulePass;
 class Pass;
 class TargetMachine;
-class TargetRegisterClass;
 class raw_ostream;
 
 } // End llvm namespace
 
 // List of target independent CodeGen pass IDs.
 namespace llvm {
+
+  /// AtomicExpandPass - At IR level this pass replace atomic instructions with
+  /// __atomic_* library calls, or target specific instruction which implement the
+  /// same semantics in a way which better fits the target backend.
   FunctionPass *createAtomicExpandPass();
 
   /// createUnreachableBlockEliminationPass - The LLVM code generator does not
@@ -48,10 +50,8 @@ namespace llvm {
   FunctionPass *createUnreachableBlockEliminationPass();
 
   /// createBasicBlockSections Pass - This pass assigns sections to machine
-  /// basic blocks and is enabled with -fbasic-block-sections. Buf is a memory
-  /// buffer that contains the list of functions and basic block ids to
-  /// selectively enable basic block sections.
-  MachineFunctionPass *createBasicBlockSectionsPass(const MemoryBuffer *Buf);
+  /// basic blocks and is enabled with -fbasic-block-sections.
+  MachineFunctionPass *createBasicBlockSectionsPass();
 
   /// createMachineFunctionSplitterPass - This pass splits machine functions
   /// using profile information.
@@ -63,6 +63,10 @@ namespace llvm {
   createMachineFunctionPrinterPass(raw_ostream &OS,
                                    const std::string &Banner ="");
 
+  /// StackFramePrinter pass - This pass prints out the machine function's
+  /// stack frame to the given stream as a debugging tool.
+  MachineFunctionPass *createStackFrameLayoutAnalysisPass();
+
   /// MIRPrinting pass - this pass prints out the LLVM IR into the given stream
   /// using the MIR serialization format.
   MachineFunctionPass *createPrintMIRPass(raw_ostream &OS);
@@ -79,6 +83,10 @@ namespace llvm {
   /// matching during instruction selection.
   FunctionPass *createCodeGenPreparePass();
 
+  /// This pass implements generation of target-specific intrinsics to support
+  /// handling of complex number arithmetic
+  FunctionPass *createComplexDeinterleavingPass(const TargetMachine *TM);
+
   /// AtomicExpandID -- Lowers atomic operations in terms of either cmpxchg
   /// load-linked/store-conditional loops.
   extern char &AtomicExpandID;
@@ -171,6 +179,9 @@ namespace llvm {
   /// This pass adds flow sensitive discriminators.
   extern char &MIRAddFSDiscriminatorsID;
 
+  /// This pass reads flow sensitive profile.
+  extern char &MIRProfileLoaderPassID;
+
   /// FastRegisterAllocation Pass - This pass register allocates as fast as
   /// possible. It is best suited for debug code where live ranges are short.
   ///
@@ -257,6 +268,10 @@ namespace llvm {
   /// It merges disjoint allocas to reduce the stack size.
   extern char &StackColoringID;
 
+  /// StackFramePrinter - This pass prints the stack frame layout and variable
+  /// mappings.
+  extern char &StackFrameLayoutAnalysisPassID;
+
   /// IfConverter - This pass performs machine code if conversion.
   extern char &IfConverterID;
 
@@ -325,6 +340,12 @@ namespace llvm {
   /// machine instructions.
   extern char &MachineCopyPropagationID;
 
+  MachineFunctionPass *createMachineCopyPropagationPass(bool UseCopyInstr);
+
+  /// MachineLateInstrsCleanup - This pass removes redundant identical
+  /// instructions after register allocation and rematerialization.
+  extern char &MachineLateInstrsCleanupID;
+
   /// PeepholeOptimizer - This pass performs peephole optimizations -
   /// like extension and comparison eliminations.
   extern char &PeepholeOptimizerID;
@@ -403,9 +424,16 @@ namespace llvm {
   /// the intrinsic for later emission to the StackMap.
   extern char &StackMapLivenessID;
 
+  // MachineSanitizerBinaryMetadata - appends/finalizes sanitizer binary
+  // metadata after llvm SanitizerBinaryMetadata pass.
+  extern char &MachineSanitizerBinaryMetadataID;
+
   /// RemoveRedundantDebugValues pass.
   extern char &RemoveRedundantDebugValuesID;
 
+  /// MachineCFGPrinter pass.
+  extern char &MachineCFGPrinterID;
+
   /// LiveDebugValues pass
   extern char &LiveDebugValuesID;
 
@@ -482,6 +510,12 @@ namespace llvm {
   /// predicate mask.
   FunctionPass *createExpandVectorPredicationPass();
 
+  // Expands large div/rem instructions.
+  FunctionPass *createExpandLargeDivRemPass();
+
+  // Expands large div/rem instructions.
+  FunctionPass *createExpandLargeFpConvertPass();
+
   // This pass expands memcmp() to load/stores.
   FunctionPass *createExpandMemCmpPass();
 
@@ -491,6 +525,9 @@ namespace llvm {
   // This pass expands indirectbr instructions.
   FunctionPass *createIndirectBrExpandPass();
 
+  /// Creates CFI Fixup pass. \see CFIFixup.cpp
+  FunctionPass *createCFIFixup();
+
   /// Creates CFI Instruction Inserter pass. \see CFIInstrInserter.cpp
   FunctionPass *createCFIInstrInserter();
 
@@ -509,13 +546,18 @@ namespace llvm {
   FunctionPass *createPseudoProbeInserter();
 
   /// Create IR Type Promotion pass. \see TypePromotion.cpp
-  FunctionPass *createTypePromotionPass();
+  FunctionPass *createTypePromotionLegacyPass();
 
   /// Add Flow Sensitive Discriminators. PassNum specifies the
   /// sequence number of this pass (starting from 1).
   FunctionPass *
   createMIRAddFSDiscriminatorsPass(sampleprof::FSDiscriminatorPass P);
 
+  /// Read Flow Sensitive Profile.
+  FunctionPass *createMIRProfileLoaderPass(std::string File,
+                                           std::string RemappingFile,
+                                           sampleprof::FSDiscriminatorPass P);
+
   /// Creates MIR Debugify pass. \see MachineDebugify.cpp
   ModulePass *createDebugifyMachineModulePass();
 
@@ -542,6 +584,16 @@ namespace llvm {
   /// The pass transforms amx intrinsics to scalar operation if the function has
   /// optnone attribute or it is O0.
   FunctionPass *createX86LowerAMXIntrinsicsPass();
+
+  /// When learning an eviction policy, extract score(reward) information,
+  /// otherwise this does nothing
+  FunctionPass *createRegAllocScoringPass();
+
+  /// JMC instrument pass.
+  ModulePass *createJMCInstrumenterPass();
+
+  /// This pass converts conditional moves to conditional jumps when profitable.
+  FunctionPass *createSelectOptimizePass();
 } // End llvm namespace
 
 #endif
diff --git a/gnu/llvm/llvm/include/llvm/CodeGen/TargetFrameLowering.h b/gnu/llvm/llvm/include/llvm/CodeGen/TargetFrameLowering.h
index a2d99334e1a..2d9904e7a24 100644
--- a/gnu/llvm/llvm/include/llvm/CodeGen/TargetFrameLowering.h
+++ b/gnu/llvm/llvm/include/llvm/CodeGen/TargetFrameLowering.h
@@ -140,10 +140,13 @@ public:
   ///
   int getOffsetOfLocalArea() const { return LocalAreaOffset; }
 
-  /// isFPCloseToIncomingSP - Return true if the frame pointer is close to
-  /// the incoming stack pointer, false if it is close to the post-prologue
-  /// stack pointer.
-  virtual bool isFPCloseToIncomingSP() const { return true; }
+  /// Control the placement of special register scavenging spill slots when
+  /// allocating a stack frame.
+  ///
+  /// If this returns true, the frame indexes used by the RegScavenger will be
+  /// allocated closest to the incoming stack pointer.
+  virtual bool allocateScavengingFrameIndexesNearIncomingSP(
+    const MachineFunction &MF) const;
 
   /// assignCalleeSavedSpillSlots - Allows target to override spill slot
   /// assignment logic.  If implemented, assignCalleeSavedSpillSlots() should
@@ -215,16 +218,31 @@ public:
     return nullptr;
   }
 
+  /// emitZeroCallUsedRegs - Zeros out call used registers.
+  virtual void emitZeroCallUsedRegs(BitVector RegsToZero,
+                                    MachineBasicBlock &MBB) const {}
+
   /// With basic block sections, emit callee saved frame moves for basic blocks
   /// that are in a different section.
   virtual void
-  emitCalleeSavedFrameMoves(MachineBasicBlock &MBB,
-                            MachineBasicBlock::iterator MBBI) const {}
+  emitCalleeSavedFrameMovesFullCFA(MachineBasicBlock &MBB,
+                                   MachineBasicBlock::iterator MBBI) const {}
+
+  /// Returns true if we may need to fix the unwind information for the
+  /// function.
+  virtual bool enableCFIFixup(MachineFunction &MF) const;
+
+  /// Emit CFI instructions that recreate the state of the unwind information
+  /// upon fucntion entry.
+  virtual void resetCFIToInitialState(MachineBasicBlock &MBB) const {}
 
   /// Replace a StackProbe stub (if any) with the actual probe code inline
   virtual void inlineStackProbe(MachineFunction &MF,
                                 MachineBasicBlock &PrologueMBB) const {}
 
+  /// Does the stack probe function call return with a modified stack pointer?
+  virtual bool stackProbeFunctionModifiesSP() const { return false; }
+
   /// Adjust the prologue to have the function use segmented stacks. This works
   /// by adding a check even before the "normal" function prologue.
   virtual void adjustForSegmentedStacks(MachineFunction &MF,
diff --git a/gnu/llvm/llvm/include/llvm/DebugInfo/GSYM/Range.h b/gnu/llvm/llvm/include/llvm/DebugInfo/GSYM/Range.h
deleted file mode 100644
index 36ad95602d1..00000000000
--- a/gnu/llvm/llvm/include/llvm/DebugInfo/GSYM/Range.h
+++ /dev/null
@@ -1,130 +0,0 @@
-//===- Range.h --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_DEBUGINFO_GSYM_RANGE_H
-#define LLVM_DEBUGINFO_GSYM_RANGE_H
-
-#include "llvm/ADT/Optional.h"
-#include "llvm/Support/Format.h"
-#include "llvm/Support/raw_ostream.h"
-#include <stdint.h>
-#include <vector>
-
-#define HEX8(v) llvm::format_hex(v, 4)
-#define HEX16(v) llvm::format_hex(v, 6)
-#define HEX32(v) llvm::format_hex(v, 10)
-#define HEX64(v) llvm::format_hex(v, 18)
-
-namespace llvm {
-class DataExtractor;
-class raw_ostream;
-
-namespace gsym {
-
-class FileWriter;
-
-/// A class that represents an address range. The range is specified using
-/// a start and an end address.
-struct AddressRange {
-  uint64_t Start;
-  uint64_t End;
-  AddressRange() : Start(0), End(0) {}
-  AddressRange(uint64_t S, uint64_t E) : Start(S), End(E) {}
-  uint64_t size() const { return End - Start; }
-  bool contains(uint64_t Addr) const { return Start <= Addr && Addr < End; }
-  bool intersects(const AddressRange &R) const {
-    return Start < R.End && R.Start < End;
-  }
-
-  bool operator==(const AddressRange &R) const {
-    return Start == R.Start && End == R.End;
-  }
-  bool operator!=(const AddressRange &R) const {
-    return !(*this == R);
-  }
-  bool operator<(const AddressRange &R) const {
-    return std::make_pair(Start, End) < std::make_pair(R.Start, R.End);
-  }
-  /// AddressRange objects are encoded and decoded to be relative to a base
-  /// address. This will be the FunctionInfo's start address if the AddressRange
-  /// is directly contained in a FunctionInfo, or a base address of the
-  /// containing parent AddressRange or AddressRanges. This allows address
-  /// ranges to be efficiently encoded using ULEB128 encodings as we encode the
-  /// offset and size of each range instead of full addresses. This also makes
-  /// encoded addresses easy to relocate as we just need to relocate one base
-  /// address.
-  /// @{
-  void decode(DataExtractor &Data, uint64_t BaseAddr, uint64_t &Offset);
-  void encode(FileWriter &O, uint64_t BaseAddr) const;
-  /// @}
-
-  /// Skip an address range object in the specified data a the specified
-  /// offset.
-  ///
-  /// \param Data The binary stream to read the data from.
-  ///
-  /// \param Offset The byte offset within \a Data.
-  static void skip(DataExtractor &Data, uint64_t &Offset);
-};
-
-raw_ostream &operator<<(raw_ostream &OS, const AddressRange &R);
-
-/// The AddressRanges class helps normalize address range collections.
-/// This class keeps a sorted vector of AddressRange objects and can perform
-/// insertions and searches efficiently. The address ranges are always sorted
-/// and never contain any invalid or empty address ranges. This allows us to
-/// emit address ranges into the GSYM file efficiently. Intersecting address
-/// ranges are combined during insertion so that we can emit the most compact
-/// representation for address ranges when writing to disk.
-class AddressRanges {
-protected:
-  using Collection = std::vector<AddressRange>;
-  Collection Ranges;
-public:
-  void clear() { Ranges.clear(); }
-  bool empty() const { return Ranges.empty(); }
-  bool contains(uint64_t Addr) const;
-  bool contains(AddressRange Range) const;
-  Optional<AddressRange> getRangeThatContains(uint64_t Addr) const;
-  void insert(AddressRange Range);
-  size_t size() const { return Ranges.size(); }
-  bool operator==(const AddressRanges &RHS) const {
-    return Ranges == RHS.Ranges;
-  }
-  const AddressRange &operator[](size_t i) const {
-    assert(i < Ranges.size());
-    return Ranges[i];
-  }
-  Collection::const_iterator begin() const { return Ranges.begin(); }
-  Collection::const_iterator end() const { return Ranges.end(); }
-
-  /// Address ranges are decoded and encoded to be relative to a base address.
-  /// See the AddressRange comment for the encode and decode methods for full
-  /// details.
-  /// @{
-  void decode(DataExtractor &Data, uint64_t BaseAddr, uint64_t &Offset);
-  void encode(FileWriter &O, uint64_t BaseAddr) const;
-  /// @}
-
-  /// Skip an address range object in the specified data a the specified
-  /// offset.
-  ///
-  /// \param Data The binary stream to read the data from.
-  ///
-  /// \param Offset The byte offset within \a Data.
-  ///
-  /// \returns The number of address ranges that were skipped.
-  static uint64_t skip(DataExtractor &Data, uint64_t &Offset);
-};
-
-raw_ostream &operator<<(raw_ostream &OS, const AddressRanges &AR);
-
-} // namespace gsym
-} // namespace llvm
-
-#endif // LLVM_DEBUGINFO_GSYM_RANGE_H
diff --git a/gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/LLVMSPSSerializers.h b/gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/LLVMSPSSerializers.h
deleted file mode 100644
index f3d616deae8..00000000000
--- a/gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/LLVMSPSSerializers.h
+++ /dev/null
@@ -1,69 +0,0 @@
-//===-- LLVMSPSSerializers.h - SPS serialization for LLVM types -*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// SPS Serialization for common LLVM types.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_EXECUTIONENGINE_ORC_LLVMSPSSERIALIZERS_H
-#define LLVM_EXECUTIONENGINE_ORC_LLVMSPSSERIALIZERS_H
-
-#include "llvm/ADT/StringMap.h"
-#include "llvm/ExecutionEngine/Orc/Shared/SimplePackedSerialization.h"
-
-namespace llvm {
-namespace orc {
-namespace shared {
-
-template <typename SPSValueT, typename ValueT>
-class SPSSerializationTraits<SPSSequence<SPSTuple<SPSString, SPSValueT>>,
-                             StringMap<ValueT>> {
-public:
-  static size_t size(const StringMap<ValueT> &M) {
-    size_t Sz = SPSArgList<uint64_t>::size(static_cast<uint64_t>(M.size()));
-    for (auto &E : M)
-      Sz += SPSArgList<SPSString, SPSValueT>::size(E.first(), E.second);
-    return Sz;
-  }
-
-  static bool serialize(SPSOutputBuffer &OB, const StringMap<ValueT> &M) {
-    if (!SPSArgList<uint64_t>::serialize(OB, static_cast<uint64_t>(M.size())))
-      return false;
-
-    for (auto &E : M)
-      if (!SPSArgList<SPSString, SPSValueT>::serialize(OB, E.first(), E.second))
-        return false;
-
-    return true;
-  }
-
-  static bool deserialize(SPSInputBuffer &IB, StringMap<ValueT> &M) {
-    uint64_t Size;
-    assert(M.empty() && "M already contains elements");
-
-    if (!SPSArgList<uint64_t>::deserialize(IB, Size))
-      return false;
-
-    while (Size--) {
-      StringRef S;
-      ValueT V;
-      if (!SPSArgList<SPSString, SPSValueT>::deserialize(IB, S, V))
-        return false;
-      if (!M.insert(std::make_pair(S, V)).second)
-        return false;
-    }
-
-    return true;
-  }
-};
-
-} // end namespace shared
-} // end namespace orc
-} // end namespace llvm
-
-#endif // LLVM_EXECUTIONENGINE_ORC_LLVMSPSSERIALIZERS_H
diff --git a/gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/OrcRPCExecutorProcessControl.h b/gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/OrcRPCExecutorProcessControl.h
deleted file mode 100644
index 4310ba9ce9e..00000000000
--- a/gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/OrcRPCExecutorProcessControl.h
+++ /dev/null
@@ -1,436 +0,0 @@
-//===-- OrcRPCExecutorProcessControl.h - Remote target control --*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Executor control via ORC RPC.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_EXECUTIONENGINE_ORC_ORCRPCEXECUTORPROCESSCONTROL_H
-#define LLVM_EXECUTIONENGINE_ORC_ORCRPCEXECUTORPROCESSCONTROL_H
-
-#include "llvm/ExecutionEngine/Orc/ExecutorProcessControl.h"
-#include "llvm/ExecutionEngine/Orc/Shared/RPCUtils.h"
-#include "llvm/ExecutionEngine/Orc/Shared/RawByteChannel.h"
-#include "llvm/ExecutionEngine/Orc/TargetProcess/OrcRPCTPCServer.h"
-#include "llvm/Support/MSVCErrorWorkarounds.h"
-
-namespace llvm {
-namespace orc {
-
-/// JITLinkMemoryManager implementation for a process connected via an ORC RPC
-/// endpoint.
-template <typename OrcRPCEPCImplT>
-class OrcRPCEPCJITLinkMemoryManager : public jitlink::JITLinkMemoryManager {
-private:
-  struct HostAlloc {
-    std::unique_ptr<char[]> Mem;
-    uint64_t Size;
-  };
-
-  struct TargetAlloc {
-    JITTargetAddress Address = 0;
-    uint64_t AllocatedSize = 0;
-  };
-
-  using HostAllocMap = DenseMap<int, HostAlloc>;
-  using TargetAllocMap = DenseMap<int, TargetAlloc>;
-
-public:
-  class OrcRPCAllocation : public Allocation {
-  public:
-    OrcRPCAllocation(OrcRPCEPCJITLinkMemoryManager<OrcRPCEPCImplT> &Parent,
-                     HostAllocMap HostAllocs, TargetAllocMap TargetAllocs)
-        : Parent(Parent), HostAllocs(std::move(HostAllocs)),
-          TargetAllocs(std::move(TargetAllocs)) {
-      assert(HostAllocs.size() == TargetAllocs.size() &&
-             "HostAllocs size should match TargetAllocs");
-    }
-
-    ~OrcRPCAllocation() override {
-      assert(TargetAllocs.empty() && "failed to deallocate");
-    }
-
-    MutableArrayRef<char> getWorkingMemory(ProtectionFlags Seg) override {
-      auto I = HostAllocs.find(Seg);
-      assert(I != HostAllocs.end() && "No host allocation for segment");
-      auto &HA = I->second;
-      return {HA.Mem.get(), static_cast<size_t>(HA.Size)};
-    }
-
-    JITTargetAddress getTargetMemory(ProtectionFlags Seg) override {
-      auto I = TargetAllocs.find(Seg);
-      assert(I != TargetAllocs.end() && "No target allocation for segment");
-      return I->second.Address;
-    }
-
-    void finalizeAsync(FinalizeContinuation OnFinalize) override {
-
-      std::vector<tpctypes::BufferWrite> BufferWrites;
-      orcrpctpc::ReleaseOrFinalizeMemRequest FMR;
-
-      for (auto &KV : HostAllocs) {
-        assert(TargetAllocs.count(KV.first) &&
-               "No target allocation for buffer");
-        auto &HA = KV.second;
-        auto &TA = TargetAllocs[KV.first];
-        BufferWrites.push_back({TA.Address, StringRef(HA.Mem.get(), HA.Size)});
-        FMR.push_back({orcrpctpc::toWireProtectionFlags(
-                           static_cast<sys::Memory::ProtectionFlags>(KV.first)),
-                       TA.Address, TA.AllocatedSize});
-      }
-
-      DEBUG_WITH_TYPE("orc", {
-        dbgs() << "finalizeAsync " << (void *)this << ":\n";
-        auto FMRI = FMR.begin();
-        for (auto &B : BufferWrites) {
-          auto Prot = FMRI->Prot;
-          ++FMRI;
-          dbgs() << "  Writing " << formatv("{0:x16}", B.Buffer.size())
-                 << " bytes to " << ((Prot & orcrpctpc::WPF_Read) ? 'R' : '-')
-                 << ((Prot & orcrpctpc::WPF_Write) ? 'W' : '-')
-                 << ((Prot & orcrpctpc::WPF_Exec) ? 'X' : '-')
-                 << " segment: local " << (const void *)B.Buffer.data()
-                 << " -> target " << formatv("{0:x16}", B.Address) << "\n";
-        }
-      });
-      if (auto Err =
-              Parent.Parent.getMemoryAccess().writeBuffers(BufferWrites)) {
-        OnFinalize(std::move(Err));
-        return;
-      }
-
-      DEBUG_WITH_TYPE("orc", dbgs() << " Applying permissions...\n");
-      if (auto Err =
-              Parent.getEndpoint().template callAsync<orcrpctpc::FinalizeMem>(
-                  [OF = std::move(OnFinalize)](Error Err2) {
-                    // FIXME: Dispatch to work queue.
-                    std::thread([OF = std::move(OF),
-                                 Err3 = std::move(Err2)]() mutable {
-                      DEBUG_WITH_TYPE(
-                          "orc", { dbgs() << "  finalizeAsync complete\n"; });
-                      OF(std::move(Err3));
-                    }).detach();
-                    return Error::success();
-                  },
-                  FMR)) {
-        DEBUG_WITH_TYPE("orc", dbgs() << "    failed.\n");
-        Parent.getEndpoint().abandonPendingResponses();
-        Parent.reportError(std::move(Err));
-      }
-      DEBUG_WITH_TYPE("orc", {
-        dbgs() << "Leaving finalizeAsync (finalization may continue in "
-                  "background)\n";
-      });
-    }
-
-    Error deallocate() override {
-      orcrpctpc::ReleaseOrFinalizeMemRequest RMR;
-      for (auto &KV : TargetAllocs)
-        RMR.push_back({orcrpctpc::toWireProtectionFlags(
-                           static_cast<sys::Memory::ProtectionFlags>(KV.first)),
-                       KV.second.Address, KV.second.AllocatedSize});
-      TargetAllocs.clear();
-
-      return Parent.getEndpoint().template callB<orcrpctpc::ReleaseMem>(RMR);
-    }
-
-  private:
-    OrcRPCEPCJITLinkMemoryManager<OrcRPCEPCImplT> &Parent;
-    HostAllocMap HostAllocs;
-    TargetAllocMap TargetAllocs;
-  };
-
-  OrcRPCEPCJITLinkMemoryManager(OrcRPCEPCImplT &Parent) : Parent(Parent) {}
-
-  Expected<std::unique_ptr<Allocation>>
-  allocate(const jitlink::JITLinkDylib *JD,
-           const SegmentsRequestMap &Request) override {
-    orcrpctpc::ReserveMemRequest RMR;
-    HostAllocMap HostAllocs;
-
-    for (auto &KV : Request) {
-      assert(KV.second.getContentSize() <= std::numeric_limits<size_t>::max() &&
-             "Content size is out-of-range for host");
-
-      RMR.push_back({orcrpctpc::toWireProtectionFlags(
-                         static_cast<sys::Memory::ProtectionFlags>(KV.first)),
-                     KV.second.getContentSize() + KV.second.getZeroFillSize(),
-                     KV.second.getAlignment()});
-      HostAllocs[KV.first] = {
-          std::make_unique<char[]>(KV.second.getContentSize()),
-          KV.second.getContentSize()};
-    }
-
-    DEBUG_WITH_TYPE("orc", {
-      dbgs() << "Orc remote memmgr got request:\n";
-      for (auto &KV : Request)
-        dbgs() << "  permissions: "
-               << ((KV.first & sys::Memory::MF_READ) ? 'R' : '-')
-               << ((KV.first & sys::Memory::MF_WRITE) ? 'W' : '-')
-               << ((KV.first & sys::Memory::MF_EXEC) ? 'X' : '-')
-               << ", content size: "
-               << formatv("{0:x16}", KV.second.getContentSize())
-               << " + zero-fill-size: "
-               << formatv("{0:x16}", KV.second.getZeroFillSize())
-               << ", align: " << KV.second.getAlignment() << "\n";
-    });
-
-    // FIXME: LLVM RPC needs to be fixed to support alt
-    // serialization/deserialization on return types. For now just
-    // translate from std::map to DenseMap manually.
-    auto TmpTargetAllocs =
-        Parent.getEndpoint().template callB<orcrpctpc::ReserveMem>(RMR);
-    if (!TmpTargetAllocs)
-      return TmpTargetAllocs.takeError();
-
-    if (TmpTargetAllocs->size() != RMR.size())
-      return make_error<StringError>(
-          "Number of target allocations does not match request",
-          inconvertibleErrorCode());
-
-    TargetAllocMap TargetAllocs;
-    for (auto &E : *TmpTargetAllocs)
-      TargetAllocs[orcrpctpc::fromWireProtectionFlags(E.Prot)] = {
-          E.Address, E.AllocatedSize};
-
-    DEBUG_WITH_TYPE("orc", {
-      auto HAI = HostAllocs.begin();
-      for (auto &KV : TargetAllocs)
-        dbgs() << "  permissions: "
-               << ((KV.first & sys::Memory::MF_READ) ? 'R' : '-')
-               << ((KV.first & sys::Memory::MF_WRITE) ? 'W' : '-')
-               << ((KV.first & sys::Memory::MF_EXEC) ? 'X' : '-')
-               << " assigned local " << (void *)HAI->second.Mem.get()
-               << ", target " << formatv("{0:x16}", KV.second.Address) << "\n";
-    });
-
-    return std::make_unique<OrcRPCAllocation>(*this, std::move(HostAllocs),
-                                              std::move(TargetAllocs));
-  }
-
-private:
-  void reportError(Error Err) { Parent.reportError(std::move(Err)); }
-
-  decltype(std::declval<OrcRPCEPCImplT>().getEndpoint()) getEndpoint() {
-    return Parent.getEndpoint();
-  }
-
-  OrcRPCEPCImplT &Parent;
-};
-
-/// ExecutorProcessControl::MemoryAccess implementation for a process connected
-/// via an ORC RPC endpoint.
-template <typename OrcRPCEPCImplT>
-class OrcRPCEPCMemoryAccess : public ExecutorProcessControl::MemoryAccess {
-public:
-  OrcRPCEPCMemoryAccess(OrcRPCEPCImplT &Parent) : Parent(Parent) {}
-
-  void writeUInt8s(ArrayRef<tpctypes::UInt8Write> Ws,
-                   WriteResultFn OnWriteComplete) override {
-    writeViaRPC<orcrpctpc::WriteUInt8s>(Ws, std::move(OnWriteComplete));
-  }
-
-  void writeUInt16s(ArrayRef<tpctypes::UInt16Write> Ws,
-                    WriteResultFn OnWriteComplete) override {
-    writeViaRPC<orcrpctpc::WriteUInt16s>(Ws, std::move(OnWriteComplete));
-  }
-
-  void writeUInt32s(ArrayRef<tpctypes::UInt32Write> Ws,
-                    WriteResultFn OnWriteComplete) override {
-    writeViaRPC<orcrpctpc::WriteUInt32s>(Ws, std::move(OnWriteComplete));
-  }
-
-  void writeUInt64s(ArrayRef<tpctypes::UInt64Write> Ws,
-                    WriteResultFn OnWriteComplete) override {
-    writeViaRPC<orcrpctpc::WriteUInt64s>(Ws, std::move(OnWriteComplete));
-  }
-
-  void writeBuffers(ArrayRef<tpctypes::BufferWrite> Ws,
-                    WriteResultFn OnWriteComplete) override {
-    writeViaRPC<orcrpctpc::WriteBuffers>(Ws, std::move(OnWriteComplete));
-  }
-
-private:
-  template <typename WriteRPCFunction, typename WriteElementT>
-  void writeViaRPC(ArrayRef<WriteElementT> Ws, WriteResultFn OnWriteComplete) {
-    if (auto Err = Parent.getEndpoint().template callAsync<WriteRPCFunction>(
-            [OWC = std::move(OnWriteComplete)](Error Err2) mutable -> Error {
-              OWC(std::move(Err2));
-              return Error::success();
-            },
-            Ws)) {
-      Parent.reportError(std::move(Err));
-      Parent.getEndpoint().abandonPendingResponses();
-    }
-  }
-
-  OrcRPCEPCImplT &Parent;
-};
-
-// ExecutorProcessControl for a process connected via an ORC RPC Endpoint.
-template <typename RPCEndpointT>
-class OrcRPCExecutorProcessControlBase : public ExecutorProcessControl {
-public:
-  using ErrorReporter = unique_function<void(Error)>;
-
-  using OnCloseConnectionFunction = unique_function<Error(Error)>;
-
-  OrcRPCExecutorProcessControlBase(std::shared_ptr<SymbolStringPool> SSP,
-                                   RPCEndpointT &EP, ErrorReporter ReportError)
-      : ExecutorProcessControl(std::move(SSP)),
-        ReportError(std::move(ReportError)), EP(EP) {
-    using ThisT = OrcRPCExecutorProcessControlBase<RPCEndpointT>;
-    EP.template addAsyncHandler<orcrpctpc::RunWrapper>(*this,
-                                                       &ThisT::runWrapperInJIT);
-  }
-
-  void reportError(Error Err) { ReportError(std::move(Err)); }
-
-  RPCEndpointT &getEndpoint() { return EP; }
-
-  Expected<tpctypes::DylibHandle> loadDylib(const char *DylibPath) override {
-    DEBUG_WITH_TYPE("orc", {
-      dbgs() << "Loading dylib \"" << (DylibPath ? DylibPath : "") << "\" ";
-      if (!DylibPath)
-        dbgs() << "(process symbols)";
-      dbgs() << "\n";
-    });
-    if (!DylibPath)
-      DylibPath = "";
-    auto H = EP.template callB<orcrpctpc::LoadDylib>(DylibPath);
-    DEBUG_WITH_TYPE("orc", {
-      if (H)
-        dbgs() << "  got handle " << formatv("{0:x16}", *H) << "\n";
-      else
-        dbgs() << "  error, unable to load\n";
-    });
-    return H;
-  }
-
-  Expected<std::vector<tpctypes::LookupResult>>
-  lookupSymbols(ArrayRef<LookupRequest> Request) override {
-    std::vector<orcrpctpc::RemoteLookupRequest> RR;
-    for (auto &E : Request) {
-      RR.push_back({});
-      RR.back().first = E.Handle;
-      for (auto &KV : E.Symbols)
-        RR.back().second.push_back(
-            {(*KV.first).str(),
-             KV.second == SymbolLookupFlags::WeaklyReferencedSymbol});
-    }
-    DEBUG_WITH_TYPE("orc", {
-      dbgs() << "Compound lookup:\n";
-      for (auto &R : Request) {
-        dbgs() << "  In " << formatv("{0:x16}", R.Handle) << ": {";
-        bool First = true;
-        for (auto &KV : R.Symbols) {
-          dbgs() << (First ? "" : ",") << " " << *KV.first;
-          First = false;
-        }
-        dbgs() << " }\n";
-      }
-    });
-    return EP.template callB<orcrpctpc::LookupSymbols>(RR);
-  }
-
-  Expected<int32_t> runAsMain(JITTargetAddress MainFnAddr,
-                              ArrayRef<std::string> Args) override {
-    DEBUG_WITH_TYPE("orc", {
-      dbgs() << "Running as main: " << formatv("{0:x16}", MainFnAddr)
-             << ", args = [";
-      for (unsigned I = 0; I != Args.size(); ++I)
-        dbgs() << (I ? "," : "") << " \"" << Args[I] << "\"";
-      dbgs() << "]\n";
-    });
-    auto Result = EP.template callB<orcrpctpc::RunMain>(MainFnAddr, Args);
-    DEBUG_WITH_TYPE("orc", {
-      dbgs() << "  call to " << formatv("{0:x16}", MainFnAddr);
-      if (Result)
-        dbgs() << " returned result " << *Result << "\n";
-      else
-        dbgs() << " failed\n";
-    });
-    return Result;
-  }
-
-  void callWrapperAsync(SendResultFunction OnComplete,
-                        JITTargetAddress WrapperFnAddr,
-                        ArrayRef<char> ArgBuffer) override {
-    DEBUG_WITH_TYPE("orc", {
-      dbgs() << "Running as wrapper function "
-             << formatv("{0:x16}", WrapperFnAddr) << " with "
-             << formatv("{0:x16}", ArgBuffer.size()) << " argument buffer\n";
-    });
-    auto Result = EP.template callB<orcrpctpc::RunWrapper>(
-        WrapperFnAddr,
-        ArrayRef<uint8_t>(reinterpret_cast<const uint8_t *>(ArgBuffer.data()),
-                          ArgBuffer.size()));
-
-    if (!Result)
-      OnComplete(shared::WrapperFunctionResult::createOutOfBandError(
-          toString(Result.takeError())));
-    OnComplete(std::move(*Result));
-  }
-
-  Error closeConnection(OnCloseConnectionFunction OnCloseConnection) {
-    DEBUG_WITH_TYPE("orc", dbgs() << "Closing connection to remote\n");
-    return EP.template callAsync<orcrpctpc::CloseConnection>(
-        std::move(OnCloseConnection));
-  }
-
-  Error closeConnectionAndWait() {
-    std::promise<MSVCPError> P;
-    auto F = P.get_future();
-    if (auto Err = closeConnection([&](Error Err2) -> Error {
-          P.set_value(std::move(Err2));
-          return Error::success();
-        })) {
-      EP.abandonAllPendingResponses();
-      return joinErrors(std::move(Err), F.get());
-    }
-    return F.get();
-  }
-
-protected:
-  /// Subclasses must call this during construction to initialize the
-  /// TargetTriple and PageSize members.
-  Error initializeORCRPCEPCBase() {
-    if (auto EPI = EP.template callB<orcrpctpc::GetExecutorProcessInfo>()) {
-      this->TargetTriple = Triple(EPI->Triple);
-      this->PageSize = PageSize;
-      this->JDI = {ExecutorAddress(EPI->DispatchFuncAddr),
-                   ExecutorAddress(EPI->DispatchCtxAddr)};
-      return Error::success();
-    } else
-      return EPI.takeError();
-  }
-
-private:
-  Error runWrapperInJIT(
-      std::function<Error(Expected<shared::WrapperFunctionResult>)> SendResult,
-      JITTargetAddress FunctionTag, std::vector<uint8_t> ArgBuffer) {
-
-    getExecutionSession().runJITDispatchHandler(
-        [this, SendResult = std::move(SendResult)](
-            Expected<shared::WrapperFunctionResult> R) {
-          if (auto Err = SendResult(std::move(R)))
-            ReportError(std::move(Err));
-        },
-        FunctionTag,
-        {reinterpret_cast<const char *>(ArgBuffer.data()), ArgBuffer.size()});
-    return Error::success();
-  }
-
-  ErrorReporter ReportError;
-  RPCEndpointT &EP;
-};
-
-} // end namespace orc
-} // end namespace llvm
-
-#endif // LLVM_EXECUTIONENGINE_ORC_ORCRPCEXECUTORPROCESSCONTROL_H
diff --git a/gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h b/gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h
deleted file mode 100644
index 3d139740d67..00000000000
--- a/gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h
+++ /dev/null
@@ -1,925 +0,0 @@
-//===- OrcRemoteTargetClient.h - Orc Remote-target Client -------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines the OrcRemoteTargetClient class and helpers. This class
-// can be used to communicate over an RawByteChannel with an
-// OrcRemoteTargetServer instance to support remote-JITing.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_EXECUTIONENGINE_ORC_ORCREMOTETARGETCLIENT_H
-#define LLVM_EXECUTIONENGINE_ORC_ORCREMOTETARGETCLIENT_H
-
-#include "llvm/ADT/Optional.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/StringMap.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/ExecutionEngine/JITSymbol.h"
-#include "llvm/ExecutionEngine/JITLink/JITLinkMemoryManager.h"
-#include "llvm/ExecutionEngine/Orc/IndirectionUtils.h"
-#include "llvm/ExecutionEngine/Orc/OrcRemoteTargetRPCAPI.h"
-#include "llvm/ExecutionEngine/RuntimeDyld.h"
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/Error.h"
-#include "llvm/Support/ErrorHandling.h"
-#include "llvm/Support/Format.h"
-#include "llvm/Support/MathExtras.h"
-#include "llvm/Support/Memory.h"
-#include "llvm/Support/raw_ostream.h"
-#include <algorithm>
-#include <cassert>
-#include <cstdint>
-#include <memory>
-#include <string>
-#include <tuple>
-#include <utility>
-#include <vector>
-
-#define DEBUG_TYPE "orc-remote"
-
-namespace llvm {
-namespace orc {
-namespace remote {
-
-/// This class provides utilities (including memory manager, indirect stubs
-/// manager, and compile callback manager types) that support remote JITing
-/// in ORC.
-///
-/// Each of the utility classes talks to a JIT server (an instance of the
-/// OrcRemoteTargetServer class) via an RPC system (see RPCUtils.h) to carry out
-/// its actions.
-class OrcRemoteTargetClient
-    : public shared::SingleThreadedRPCEndpoint<shared::RawByteChannel> {
-public:
-  /// Remote-mapped RuntimeDyld-compatible memory manager.
-  class RemoteRTDyldMemoryManager : public RuntimeDyld::MemoryManager {
-    friend class OrcRemoteTargetClient;
-
-  public:
-    ~RemoteRTDyldMemoryManager() {
-      Client.destroyRemoteAllocator(Id);
-      LLVM_DEBUG(dbgs() << "Destroyed remote allocator " << Id << "\n");
-    }
-
-    RemoteRTDyldMemoryManager(const RemoteRTDyldMemoryManager &) = delete;
-    RemoteRTDyldMemoryManager &
-    operator=(const RemoteRTDyldMemoryManager &) = delete;
-    RemoteRTDyldMemoryManager(RemoteRTDyldMemoryManager &&) = default;
-    RemoteRTDyldMemoryManager &operator=(RemoteRTDyldMemoryManager &&) = delete;
-
-    uint8_t *allocateCodeSection(uintptr_t Size, unsigned Alignment,
-                                 unsigned SectionID,
-                                 StringRef SectionName) override {
-      Unmapped.back().CodeAllocs.emplace_back(Size, Alignment);
-      uint8_t *Alloc = reinterpret_cast<uint8_t *>(
-          Unmapped.back().CodeAllocs.back().getLocalAddress());
-      LLVM_DEBUG(dbgs() << "Allocator " << Id << " allocated code for "
-                        << SectionName << ": " << Alloc << " (" << Size
-                        << " bytes, alignment " << Alignment << ")\n");
-      return Alloc;
-    }
-
-    uint8_t *allocateDataSection(uintptr_t Size, unsigned Alignment,
-                                 unsigned SectionID, StringRef SectionName,
-                                 bool IsReadOnly) override {
-      if (IsReadOnly) {
-        Unmapped.back().RODataAllocs.emplace_back(Size, Alignment);
-        uint8_t *Alloc = reinterpret_cast<uint8_t *>(
-            Unmapped.back().RODataAllocs.back().getLocalAddress());
-        LLVM_DEBUG(dbgs() << "Allocator " << Id << " allocated ro-data for "
-                          << SectionName << ": " << Alloc << " (" << Size
-                          << " bytes, alignment " << Alignment << ")\n");
-        return Alloc;
-      } // else...
-
-      Unmapped.back().RWDataAllocs.emplace_back(Size, Alignment);
-      uint8_t *Alloc = reinterpret_cast<uint8_t *>(
-          Unmapped.back().RWDataAllocs.back().getLocalAddress());
-      LLVM_DEBUG(dbgs() << "Allocator " << Id << " allocated rw-data for "
-                        << SectionName << ": " << Alloc << " (" << Size
-                        << " bytes, alignment " << Alignment << ")\n");
-      return Alloc;
-    }
-
-    void reserveAllocationSpace(uintptr_t CodeSize, uint32_t CodeAlign,
-                                uintptr_t RODataSize, uint32_t RODataAlign,
-                                uintptr_t RWDataSize,
-                                uint32_t RWDataAlign) override {
-      Unmapped.push_back(ObjectAllocs());
-
-      LLVM_DEBUG(dbgs() << "Allocator " << Id << " reserved:\n");
-
-      if (CodeSize != 0) {
-        Unmapped.back().RemoteCodeAddr =
-            Client.reserveMem(Id, CodeSize, CodeAlign);
-
-        LLVM_DEBUG(
-            dbgs() << "  code: "
-                   << format("0x%016" PRIx64, Unmapped.back().RemoteCodeAddr)
-                   << " (" << CodeSize << " bytes, alignment " << CodeAlign
-                   << ")\n");
-      }
-
-      if (RODataSize != 0) {
-        Unmapped.back().RemoteRODataAddr =
-            Client.reserveMem(Id, RODataSize, RODataAlign);
-
-        LLVM_DEBUG(
-            dbgs() << "  ro-data: "
-                   << format("0x%016" PRIx64, Unmapped.back().RemoteRODataAddr)
-                   << " (" << RODataSize << " bytes, alignment " << RODataAlign
-                   << ")\n");
-      }
-
-      if (RWDataSize != 0) {
-        Unmapped.back().RemoteRWDataAddr =
-            Client.reserveMem(Id, RWDataSize, RWDataAlign);
-
-        LLVM_DEBUG(
-            dbgs() << "  rw-data: "
-                   << format("0x%016" PRIx64, Unmapped.back().RemoteRWDataAddr)
-                   << " (" << RWDataSize << " bytes, alignment " << RWDataAlign
-                   << ")\n");
-      }
-    }
-
-    bool needsToReserveAllocationSpace() override { return true; }
-
-    void registerEHFrames(uint8_t *Addr, uint64_t LoadAddr,
-                          size_t Size) override {
-      UnfinalizedEHFrames.push_back({LoadAddr, Size});
-    }
-
-    void deregisterEHFrames() override {
-      for (auto &Frame : RegisteredEHFrames) {
-        // FIXME: Add error poll.
-        Client.deregisterEHFrames(Frame.Addr, Frame.Size);
-      }
-    }
-
-    void notifyObjectLoaded(RuntimeDyld &Dyld,
-                            const object::ObjectFile &Obj) override {
-      LLVM_DEBUG(dbgs() << "Allocator " << Id << " applied mappings:\n");
-      for (auto &ObjAllocs : Unmapped) {
-        mapAllocsToRemoteAddrs(Dyld, ObjAllocs.CodeAllocs,
-                               ObjAllocs.RemoteCodeAddr);
-        mapAllocsToRemoteAddrs(Dyld, ObjAllocs.RODataAllocs,
-                               ObjAllocs.RemoteRODataAddr);
-        mapAllocsToRemoteAddrs(Dyld, ObjAllocs.RWDataAllocs,
-                               ObjAllocs.RemoteRWDataAddr);
-        Unfinalized.push_back(std::move(ObjAllocs));
-      }
-      Unmapped.clear();
-    }
-
-    bool finalizeMemory(std::string *ErrMsg = nullptr) override {
-      LLVM_DEBUG(dbgs() << "Allocator " << Id << " finalizing:\n");
-
-      for (auto &ObjAllocs : Unfinalized) {
-        if (copyAndProtect(ObjAllocs.CodeAllocs, ObjAllocs.RemoteCodeAddr,
-                           sys::Memory::MF_READ | sys::Memory::MF_EXEC))
-          return true;
-
-        if (copyAndProtect(ObjAllocs.RODataAllocs, ObjAllocs.RemoteRODataAddr,
-                           sys::Memory::MF_READ))
-          return true;
-
-        if (copyAndProtect(ObjAllocs.RWDataAllocs, ObjAllocs.RemoteRWDataAddr,
-                           sys::Memory::MF_READ | sys::Memory::MF_WRITE))
-          return true;
-      }
-      Unfinalized.clear();
-
-      for (auto &EHFrame : UnfinalizedEHFrames) {
-        if (auto Err = Client.registerEHFrames(EHFrame.Addr, EHFrame.Size)) {
-          // FIXME: Replace this once finalizeMemory can return an Error.
-          handleAllErrors(std::move(Err), [&](ErrorInfoBase &EIB) {
-            if (ErrMsg) {
-              raw_string_ostream ErrOut(*ErrMsg);
-              EIB.log(ErrOut);
-            }
-          });
-          return false;
-        }
-      }
-      RegisteredEHFrames = std::move(UnfinalizedEHFrames);
-      UnfinalizedEHFrames = {};
-
-      return false;
-    }
-
-  private:
-    class Alloc {
-    public:
-      Alloc(uint64_t Size, unsigned Align)
-          : Size(Size), Align(Align), Contents(new char[Size + Align - 1]) {}
-
-      Alloc(const Alloc &) = delete;
-      Alloc &operator=(const Alloc &) = delete;
-      Alloc(Alloc &&) = default;
-      Alloc &operator=(Alloc &&) = default;
-
-      uint64_t getSize() const { return Size; }
-
-      unsigned getAlign() const { return Align; }
-
-      char *getLocalAddress() const {
-        uintptr_t LocalAddr = reinterpret_cast<uintptr_t>(Contents.get());
-        LocalAddr = alignTo(LocalAddr, Align);
-        return reinterpret_cast<char *>(LocalAddr);
-      }
-
-      void setRemoteAddress(JITTargetAddress RemoteAddr) {
-        this->RemoteAddr = RemoteAddr;
-      }
-
-      JITTargetAddress getRemoteAddress() const { return RemoteAddr; }
-
-    private:
-      uint64_t Size;
-      unsigned Align;
-      std::unique_ptr<char[]> Contents;
-      JITTargetAddress RemoteAddr = 0;
-    };
-
-    struct ObjectAllocs {
-      ObjectAllocs() = default;
-      ObjectAllocs(const ObjectAllocs &) = delete;
-      ObjectAllocs &operator=(const ObjectAllocs &) = delete;
-      ObjectAllocs(ObjectAllocs &&) = default;
-      ObjectAllocs &operator=(ObjectAllocs &&) = default;
-
-      JITTargetAddress RemoteCodeAddr = 0;
-      JITTargetAddress RemoteRODataAddr = 0;
-      JITTargetAddress RemoteRWDataAddr = 0;
-      std::vector<Alloc> CodeAllocs, RODataAllocs, RWDataAllocs;
-    };
-
-    RemoteRTDyldMemoryManager(OrcRemoteTargetClient &Client,
-                              ResourceIdMgr::ResourceId Id)
-        : Client(Client), Id(Id) {
-      LLVM_DEBUG(dbgs() << "Created remote allocator " << Id << "\n");
-    }
-
-    // Maps all allocations in Allocs to aligned blocks
-    void mapAllocsToRemoteAddrs(RuntimeDyld &Dyld, std::vector<Alloc> &Allocs,
-                                JITTargetAddress NextAddr) {
-      for (auto &Alloc : Allocs) {
-        NextAddr = alignTo(NextAddr, Alloc.getAlign());
-        Dyld.mapSectionAddress(Alloc.getLocalAddress(), NextAddr);
-        LLVM_DEBUG(
-            dbgs() << "     " << static_cast<void *>(Alloc.getLocalAddress())
-                   << " -> " << format("0x%016" PRIx64, NextAddr) << "\n");
-        Alloc.setRemoteAddress(NextAddr);
-
-        // Only advance NextAddr if it was non-null to begin with,
-        // otherwise leave it as null.
-        if (NextAddr)
-          NextAddr += Alloc.getSize();
-      }
-    }
-
-    // Copies data for each alloc in the list, then set permissions on the
-    // segment.
-    bool copyAndProtect(const std::vector<Alloc> &Allocs,
-                        JITTargetAddress RemoteSegmentAddr,
-                        unsigned Permissions) {
-      if (RemoteSegmentAddr) {
-        assert(!Allocs.empty() && "No sections in allocated segment");
-
-        for (auto &Alloc : Allocs) {
-          LLVM_DEBUG(dbgs() << "  copying section: "
-                            << static_cast<void *>(Alloc.getLocalAddress())
-                            << " -> "
-                            << format("0x%016" PRIx64, Alloc.getRemoteAddress())
-                            << " (" << Alloc.getSize() << " bytes)\n";);
-
-          if (Client.writeMem(Alloc.getRemoteAddress(), Alloc.getLocalAddress(),
-                              Alloc.getSize()))
-            return true;
-        }
-
-        LLVM_DEBUG(dbgs() << "  setting "
-                          << (Permissions & sys::Memory::MF_READ ? 'R' : '-')
-                          << (Permissions & sys::Memory::MF_WRITE ? 'W' : '-')
-                          << (Permissions & sys::Memory::MF_EXEC ? 'X' : '-')
-                          << " permissions on block: "
-                          << format("0x%016" PRIx64, RemoteSegmentAddr)
-                          << "\n");
-        if (Client.setProtections(Id, RemoteSegmentAddr, Permissions))
-          return true;
-      }
-      return false;
-    }
-
-    OrcRemoteTargetClient &Client;
-    ResourceIdMgr::ResourceId Id;
-    std::vector<ObjectAllocs> Unmapped;
-    std::vector<ObjectAllocs> Unfinalized;
-
-    struct EHFrame {
-      JITTargetAddress Addr;
-      uint64_t Size;
-    };
-    std::vector<EHFrame> UnfinalizedEHFrames;
-    std::vector<EHFrame> RegisteredEHFrames;
-  };
-
-  class RPCMMAlloc : public jitlink::JITLinkMemoryManager::Allocation {
-    using AllocationMap = DenseMap<unsigned, sys::MemoryBlock>;
-    using FinalizeContinuation =
-        jitlink::JITLinkMemoryManager::Allocation::FinalizeContinuation;
-    using ProtectionFlags = sys::Memory::ProtectionFlags;
-    using SegmentsRequestMap =
-        DenseMap<unsigned, jitlink::JITLinkMemoryManager::SegmentRequest>;
-
-    RPCMMAlloc(OrcRemoteTargetClient &Client, ResourceIdMgr::ResourceId Id)
-        : Client(Client), Id(Id) {}
-
-  public:
-    static Expected<std::unique_ptr<RPCMMAlloc>>
-    Create(OrcRemoteTargetClient &Client, ResourceIdMgr::ResourceId Id,
-           const SegmentsRequestMap &Request) {
-      auto *MM = new RPCMMAlloc(Client, Id);
-
-      if (Error Err = MM->allocateHostBlocks(Request))
-        return std::move(Err);
-
-      if (Error Err = MM->allocateTargetBlocks())
-        return std::move(Err);
-
-      return std::unique_ptr<RPCMMAlloc>(MM);
-    }
-
-    MutableArrayRef<char> getWorkingMemory(ProtectionFlags Seg) override {
-      assert(HostSegBlocks.count(Seg) && "No allocation for segment");
-      return {static_cast<char *>(HostSegBlocks[Seg].base()),
-              HostSegBlocks[Seg].allocatedSize()};
-    }
-
-    JITTargetAddress getTargetMemory(ProtectionFlags Seg) override {
-      assert(TargetSegBlocks.count(Seg) && "No allocation for segment");
-      return pointerToJITTargetAddress(TargetSegBlocks[Seg].base());
-    }
-
-    void finalizeAsync(FinalizeContinuation OnFinalize) override {
-      // Host allocations (working memory) remain ReadWrite.
-      OnFinalize(copyAndProtect());
-    }
-
-    Error deallocate() override {
-      // TODO: Cannot release target allocation. RPCAPI has no function
-      // symmetric to reserveMem(). Add RPC call like freeMem()?
-      return errorCodeToError(sys::Memory::releaseMappedMemory(HostAllocation));
-    }
-
-  private:
-    OrcRemoteTargetClient &Client;
-    ResourceIdMgr::ResourceId Id;
-    AllocationMap HostSegBlocks;
-    AllocationMap TargetSegBlocks;
-    JITTargetAddress TargetSegmentAddr;
-    sys::MemoryBlock HostAllocation;
-
-    Error allocateHostBlocks(const SegmentsRequestMap &Request) {
-      unsigned TargetPageSize = Client.getPageSize();
-
-      if (!isPowerOf2_64(static_cast<uint64_t>(TargetPageSize)))
-        return make_error<StringError>("Host page size is not a power of 2",
-                                       inconvertibleErrorCode());
-
-      auto TotalSize = calcTotalAllocSize(Request, TargetPageSize);
-      if (!TotalSize)
-        return TotalSize.takeError();
-
-      // Allocate one slab to cover all the segments.
-      const sys::Memory::ProtectionFlags ReadWrite =
-          static_cast<sys::Memory::ProtectionFlags>(sys::Memory::MF_READ |
-                                                    sys::Memory::MF_WRITE);
-      std::error_code EC;
-      HostAllocation =
-          sys::Memory::allocateMappedMemory(*TotalSize, nullptr, ReadWrite, EC);
-      if (EC)
-        return errorCodeToError(EC);
-
-      char *SlabAddr = static_cast<char *>(HostAllocation.base());
-#ifndef NDEBUG
-      char *SlabAddrEnd = SlabAddr + HostAllocation.allocatedSize();
-#endif
-
-      // Allocate segment memory from the slab.
-      for (auto &KV : Request) {
-        const auto &Seg = KV.second;
-
-        uint64_t SegmentSize = Seg.getContentSize() + Seg.getZeroFillSize();
-        uint64_t AlignedSegmentSize = alignTo(SegmentSize, TargetPageSize);
-
-        // Zero out zero-fill memory.
-        char *ZeroFillBegin = SlabAddr + Seg.getContentSize();
-        memset(ZeroFillBegin, 0, Seg.getZeroFillSize());
-
-        // Record the block for this segment.
-        HostSegBlocks[KV.first] =
-            sys::MemoryBlock(SlabAddr, AlignedSegmentSize);
-
-        SlabAddr += AlignedSegmentSize;
-        assert(SlabAddr <= SlabAddrEnd && "Out of range");
-      }
-
-      return Error::success();
-    }
-
-    Error allocateTargetBlocks() {
-      // Reserve memory for all blocks on the target. We need as much space on
-      // the target as we allocated on the host.
-      TargetSegmentAddr = Client.reserveMem(Id, HostAllocation.allocatedSize(),
-                                            Client.getPageSize());
-      if (!TargetSegmentAddr)
-        return make_error<StringError>("Failed to reserve memory on the target",
-                                       inconvertibleErrorCode());
-
-      // Map memory blocks into the allocation, that match the host allocation.
-      JITTargetAddress TargetAllocAddr = TargetSegmentAddr;
-      for (const auto &KV : HostSegBlocks) {
-        size_t TargetAllocSize = KV.second.allocatedSize();
-
-        TargetSegBlocks[KV.first] =
-            sys::MemoryBlock(jitTargetAddressToPointer<void *>(TargetAllocAddr),
-                             TargetAllocSize);
-
-        TargetAllocAddr += TargetAllocSize;
-        assert(TargetAllocAddr - TargetSegmentAddr <=
-                   HostAllocation.allocatedSize() &&
-               "Out of range on target");
-      }
-
-      return Error::success();
-    }
-
-    Error copyAndProtect() {
-      unsigned Permissions = 0u;
-
-      // Copy segments one by one.
-      for (auto &KV : TargetSegBlocks) {
-        Permissions |= KV.first;
-
-        const sys::MemoryBlock &TargetBlock = KV.second;
-        const sys::MemoryBlock &HostBlock = HostSegBlocks.lookup(KV.first);
-
-        size_t TargetAllocSize = TargetBlock.allocatedSize();
-        auto TargetAllocAddr = pointerToJITTargetAddress(TargetBlock.base());
-        auto *HostAllocBegin = static_cast<const char *>(HostBlock.base());
-
-        bool CopyErr =
-            Client.writeMem(TargetAllocAddr, HostAllocBegin, TargetAllocSize);
-        if (CopyErr)
-          return createStringError(inconvertibleErrorCode(),
-                                   "Failed to copy %d segment to the target",
-                                   KV.first);
-      }
-
-      // Set permission flags for all segments at once.
-      bool ProtectErr =
-          Client.setProtections(Id, TargetSegmentAddr, Permissions);
-      if (ProtectErr)
-        return createStringError(inconvertibleErrorCode(),
-                                 "Failed to apply permissions for %d segment "
-                                 "on the target",
-                                 Permissions);
-      return Error::success();
-    }
-
-    static Expected<size_t>
-    calcTotalAllocSize(const SegmentsRequestMap &Request,
-                       unsigned TargetPageSize) {
-      size_t TotalSize = 0;
-      for (const auto &KV : Request) {
-        const auto &Seg = KV.second;
-
-        if (Seg.getAlignment() > TargetPageSize)
-          return make_error<StringError>("Cannot request alignment higher than "
-                                         "page alignment on target",
-                                         inconvertibleErrorCode());
-
-        TotalSize = alignTo(TotalSize, TargetPageSize);
-        TotalSize += Seg.getContentSize();
-        TotalSize += Seg.getZeroFillSize();
-      }
-
-      return TotalSize;
-    }
-  };
-
-  class RemoteJITLinkMemoryManager : public jitlink::JITLinkMemoryManager {
-  public:
-    RemoteJITLinkMemoryManager(OrcRemoteTargetClient &Client,
-                               ResourceIdMgr::ResourceId Id)
-        : Client(Client), Id(Id) {}
-
-    RemoteJITLinkMemoryManager(const RemoteJITLinkMemoryManager &) = delete;
-    RemoteJITLinkMemoryManager(RemoteJITLinkMemoryManager &&) = default;
-
-    RemoteJITLinkMemoryManager &
-    operator=(const RemoteJITLinkMemoryManager &) = delete;
-    RemoteJITLinkMemoryManager &
-    operator=(RemoteJITLinkMemoryManager &&) = delete;
-
-    ~RemoteJITLinkMemoryManager() {
-      Client.destroyRemoteAllocator(Id);
-      LLVM_DEBUG(dbgs() << "Destroyed remote allocator " << Id << "\n");
-    }
-
-    Expected<std::unique_ptr<Allocation>>
-    allocate(const jitlink::JITLinkDylib *JD,
-             const SegmentsRequestMap &Request) override {
-      return RPCMMAlloc::Create(Client, Id, Request);
-    }
-
-  private:
-    OrcRemoteTargetClient &Client;
-    ResourceIdMgr::ResourceId Id;
-  };
-
-  /// Remote indirect stubs manager.
-  class RemoteIndirectStubsManager : public IndirectStubsManager {
-  public:
-    RemoteIndirectStubsManager(OrcRemoteTargetClient &Client,
-                               ResourceIdMgr::ResourceId Id)
-        : Client(Client), Id(Id) {}
-
-    ~RemoteIndirectStubsManager() override {
-      Client.destroyIndirectStubsManager(Id);
-    }
-
-    Error createStub(StringRef StubName, JITTargetAddress StubAddr,
-                     JITSymbolFlags StubFlags) override {
-      if (auto Err = reserveStubs(1))
-        return Err;
-
-      return createStubInternal(StubName, StubAddr, StubFlags);
-    }
-
-    Error createStubs(const StubInitsMap &StubInits) override {
-      if (auto Err = reserveStubs(StubInits.size()))
-        return Err;
-
-      for (auto &Entry : StubInits)
-        if (auto Err = createStubInternal(Entry.first(), Entry.second.first,
-                                          Entry.second.second))
-          return Err;
-
-      return Error::success();
-    }
-
-    JITEvaluatedSymbol findStub(StringRef Name, bool ExportedStubsOnly) override {
-      auto I = StubIndexes.find(Name);
-      if (I == StubIndexes.end())
-        return nullptr;
-      auto Key = I->second.first;
-      auto Flags = I->second.second;
-      auto StubSymbol = JITEvaluatedSymbol(getStubAddr(Key), Flags);
-      if (ExportedStubsOnly && !StubSymbol.getFlags().isExported())
-        return nullptr;
-      return StubSymbol;
-    }
-
-    JITEvaluatedSymbol findPointer(StringRef Name) override {
-      auto I = StubIndexes.find(Name);
-      if (I == StubIndexes.end())
-        return nullptr;
-      auto Key = I->second.first;
-      auto Flags = I->second.second;
-      return JITEvaluatedSymbol(getPtrAddr(Key), Flags);
-    }
-
-    Error updatePointer(StringRef Name, JITTargetAddress NewAddr) override {
-      auto I = StubIndexes.find(Name);
-      assert(I != StubIndexes.end() && "No stub pointer for symbol");
-      auto Key = I->second.first;
-      return Client.writePointer(getPtrAddr(Key), NewAddr);
-    }
-
-  private:
-    struct RemoteIndirectStubsInfo {
-      JITTargetAddress StubBase;
-      JITTargetAddress PtrBase;
-      unsigned NumStubs;
-    };
-
-    using StubKey = std::pair<uint16_t, uint16_t>;
-
-    Error reserveStubs(unsigned NumStubs) {
-      if (NumStubs <= FreeStubs.size())
-        return Error::success();
-
-      unsigned NewStubsRequired = NumStubs - FreeStubs.size();
-      JITTargetAddress StubBase;
-      JITTargetAddress PtrBase;
-      unsigned NumStubsEmitted;
-
-      if (auto StubInfoOrErr = Client.emitIndirectStubs(Id, NewStubsRequired))
-        std::tie(StubBase, PtrBase, NumStubsEmitted) = *StubInfoOrErr;
-      else
-        return StubInfoOrErr.takeError();
-
-      unsigned NewBlockId = RemoteIndirectStubsInfos.size();
-      RemoteIndirectStubsInfos.push_back({StubBase, PtrBase, NumStubsEmitted});
-
-      for (unsigned I = 0; I < NumStubsEmitted; ++I)
-        FreeStubs.push_back(std::make_pair(NewBlockId, I));
-
-      return Error::success();
-    }
-
-    Error createStubInternal(StringRef StubName, JITTargetAddress InitAddr,
-                             JITSymbolFlags StubFlags) {
-      auto Key = FreeStubs.back();
-      FreeStubs.pop_back();
-      StubIndexes[StubName] = std::make_pair(Key, StubFlags);
-      return Client.writePointer(getPtrAddr(Key), InitAddr);
-    }
-
-    JITTargetAddress getStubAddr(StubKey K) {
-      assert(RemoteIndirectStubsInfos[K.first].StubBase != 0 &&
-             "Missing stub address");
-      return RemoteIndirectStubsInfos[K.first].StubBase +
-             K.second * Client.getIndirectStubSize();
-    }
-
-    JITTargetAddress getPtrAddr(StubKey K) {
-      assert(RemoteIndirectStubsInfos[K.first].PtrBase != 0 &&
-             "Missing pointer address");
-      return RemoteIndirectStubsInfos[K.first].PtrBase +
-             K.second * Client.getPointerSize();
-    }
-
-    OrcRemoteTargetClient &Client;
-    ResourceIdMgr::ResourceId Id;
-    std::vector<RemoteIndirectStubsInfo> RemoteIndirectStubsInfos;
-    std::vector<StubKey> FreeStubs;
-    StringMap<std::pair<StubKey, JITSymbolFlags>> StubIndexes;
-  };
-
-  class RemoteTrampolinePool : public TrampolinePool {
-  public:
-    RemoteTrampolinePool(OrcRemoteTargetClient &Client) : Client(Client) {}
-
-  private:
-    Error grow() override {
-      JITTargetAddress BlockAddr = 0;
-      uint32_t NumTrampolines = 0;
-      if (auto TrampolineInfoOrErr = Client.emitTrampolineBlock())
-        std::tie(BlockAddr, NumTrampolines) = *TrampolineInfoOrErr;
-      else
-        return TrampolineInfoOrErr.takeError();
-
-      uint32_t TrampolineSize = Client.getTrampolineSize();
-      for (unsigned I = 0; I < NumTrampolines; ++I)
-        AvailableTrampolines.push_back(BlockAddr + (I * TrampolineSize));
-
-      return Error::success();
-    }
-
-    OrcRemoteTargetClient &Client;
-  };
-
-  /// Remote compile callback manager.
-  class RemoteCompileCallbackManager : public JITCompileCallbackManager {
-  public:
-    RemoteCompileCallbackManager(OrcRemoteTargetClient &Client,
-                                 ExecutionSession &ES,
-                                 JITTargetAddress ErrorHandlerAddress)
-        : JITCompileCallbackManager(
-              std::make_unique<RemoteTrampolinePool>(Client), ES,
-              ErrorHandlerAddress) {}
-  };
-
-  /// Create an OrcRemoteTargetClient.
-  /// Channel is the ChannelT instance to communicate on. It is assumed that
-  /// the channel is ready to be read from and written to.
-  static Expected<std::unique_ptr<OrcRemoteTargetClient>>
-  Create(shared::RawByteChannel &Channel, ExecutionSession &ES) {
-    Error Err = Error::success();
-    auto Client = std::unique_ptr<OrcRemoteTargetClient>(
-        new OrcRemoteTargetClient(Channel, ES, Err));
-    if (Err)
-      return std::move(Err);
-    return std::move(Client);
-  }
-
-  /// Call the int(void) function at the given address in the target and return
-  /// its result.
-  Expected<int> callIntVoid(JITTargetAddress Addr) {
-    LLVM_DEBUG(dbgs() << "Calling int(*)(void) "
-                      << format("0x%016" PRIx64, Addr) << "\n");
-    return callB<exec::CallIntVoid>(Addr);
-  }
-
-  /// Call the int(int) function at the given address in the target and return
-  /// its result.
-  Expected<int> callIntInt(JITTargetAddress Addr, int Arg) {
-    LLVM_DEBUG(dbgs() << "Calling int(*)(int) " << format("0x%016" PRIx64, Addr)
-                      << "\n");
-    return callB<exec::CallIntInt>(Addr, Arg);
-  }
-
-  /// Call the int(int, char*[]) function at the given address in the target and
-  /// return its result.
-  Expected<int> callMain(JITTargetAddress Addr,
-                         const std::vector<std::string> &Args) {
-    LLVM_DEBUG(dbgs() << "Calling int(*)(int, char*[]) "
-                      << format("0x%016" PRIx64, Addr) << "\n");
-    return callB<exec::CallMain>(Addr, Args);
-  }
-
-  /// Call the void() function at the given address in the target and wait for
-  /// it to finish.
-  Error callVoidVoid(JITTargetAddress Addr) {
-    LLVM_DEBUG(dbgs() << "Calling void(*)(void) "
-                      << format("0x%016" PRIx64, Addr) << "\n");
-    return callB<exec::CallVoidVoid>(Addr);
-  }
-
-  /// Create an RCMemoryManager which will allocate its memory on the remote
-  /// target.
-  Expected<std::unique_ptr<RemoteRTDyldMemoryManager>>
-  createRemoteMemoryManager() {
-    auto Id = AllocatorIds.getNext();
-    if (auto Err = callB<mem::CreateRemoteAllocator>(Id))
-      return std::move(Err);
-    return std::unique_ptr<RemoteRTDyldMemoryManager>(
-        new RemoteRTDyldMemoryManager(*this, Id));
-  }
-
-  /// Create a JITLink-compatible memory manager which will allocate working
-  /// memory on the host and target memory on the remote target.
-  Expected<std::unique_ptr<RemoteJITLinkMemoryManager>>
-  createRemoteJITLinkMemoryManager() {
-    auto Id = AllocatorIds.getNext();
-    if (auto Err = callB<mem::CreateRemoteAllocator>(Id))
-      return std::move(Err);
-    LLVM_DEBUG(dbgs() << "Created remote allocator " << Id << "\n");
-    return std::unique_ptr<RemoteJITLinkMemoryManager>(
-        new RemoteJITLinkMemoryManager(*this, Id));
-  }
-
-  /// Create an RCIndirectStubsManager that will allocate stubs on the remote
-  /// target.
-  Expected<std::unique_ptr<RemoteIndirectStubsManager>>
-  createIndirectStubsManager() {
-    auto Id = IndirectStubOwnerIds.getNext();
-    if (auto Err = callB<stubs::CreateIndirectStubsOwner>(Id))
-      return std::move(Err);
-    return std::make_unique<RemoteIndirectStubsManager>(*this, Id);
-  }
-
-  Expected<RemoteCompileCallbackManager &>
-  enableCompileCallbacks(JITTargetAddress ErrorHandlerAddress) {
-    assert(!CallbackManager && "CallbackManager already obtained");
-
-    // Emit the resolver block on the JIT server.
-    if (auto Err = callB<stubs::EmitResolverBlock>())
-      return std::move(Err);
-
-    // Create the callback manager.
-    CallbackManager.emplace(*this, ES, ErrorHandlerAddress);
-    RemoteCompileCallbackManager &Mgr = *CallbackManager;
-    return Mgr;
-  }
-
-  /// Search for symbols in the remote process. Note: This should be used by
-  /// symbol resolvers *after* they've searched the local symbol table in the
-  /// JIT stack.
-  Expected<JITTargetAddress> getSymbolAddress(StringRef Name) {
-    return callB<utils::GetSymbolAddress>(Name);
-  }
-
-  /// Get the triple for the remote target.
-  const std::string &getTargetTriple() const { return RemoteTargetTriple; }
-
-  Error terminateSession() { return callB<utils::TerminateSession>(); }
-
-private:
-  OrcRemoteTargetClient(shared::RawByteChannel &Channel, ExecutionSession &ES,
-                        Error &Err)
-      : shared::SingleThreadedRPCEndpoint<shared::RawByteChannel>(Channel,
-                                                                  true),
-        ES(ES) {
-    ErrorAsOutParameter EAO(&Err);
-
-    addHandler<utils::RequestCompile>(
-        [this](JITTargetAddress Addr) -> JITTargetAddress {
-          if (CallbackManager)
-            return CallbackManager->executeCompileCallback(Addr);
-          return 0;
-        });
-
-    if (auto RIOrErr = callB<utils::GetRemoteInfo>()) {
-      std::tie(RemoteTargetTriple, RemotePointerSize, RemotePageSize,
-               RemoteTrampolineSize, RemoteIndirectStubSize) = *RIOrErr;
-      Err = Error::success();
-    } else
-      Err = RIOrErr.takeError();
-  }
-
-  void deregisterEHFrames(JITTargetAddress Addr, uint32_t Size) {
-    if (auto Err = callB<eh::RegisterEHFrames>(Addr, Size))
-      ES.reportError(std::move(Err));
-  }
-
-  void destroyRemoteAllocator(ResourceIdMgr::ResourceId Id) {
-    if (auto Err = callB<mem::DestroyRemoteAllocator>(Id)) {
-      // FIXME: This will be triggered by a removeModuleSet call: Propagate
-      //        error return up through that.
-      llvm_unreachable("Failed to destroy remote allocator.");
-      AllocatorIds.release(Id);
-    }
-  }
-
-  void destroyIndirectStubsManager(ResourceIdMgr::ResourceId Id) {
-    IndirectStubOwnerIds.release(Id);
-    if (auto Err = callB<stubs::DestroyIndirectStubsOwner>(Id))
-      ES.reportError(std::move(Err));
-  }
-
-  Expected<std::tuple<JITTargetAddress, JITTargetAddress, uint32_t>>
-  emitIndirectStubs(ResourceIdMgr::ResourceId Id, uint32_t NumStubsRequired) {
-    return callB<stubs::EmitIndirectStubs>(Id, NumStubsRequired);
-  }
-
-  Expected<std::tuple<JITTargetAddress, uint32_t>> emitTrampolineBlock() {
-    return callB<stubs::EmitTrampolineBlock>();
-  }
-
-  uint32_t getIndirectStubSize() const { return RemoteIndirectStubSize; }
-  uint32_t getPageSize() const { return RemotePageSize; }
-  uint32_t getPointerSize() const { return RemotePointerSize; }
-
-  uint32_t getTrampolineSize() const { return RemoteTrampolineSize; }
-
-  Expected<std::vector<uint8_t>> readMem(char *Dst, JITTargetAddress Src,
-                                         uint64_t Size) {
-    return callB<mem::ReadMem>(Src, Size);
-  }
-
-  Error registerEHFrames(JITTargetAddress &RAddr, uint32_t Size) {
-    // FIXME: Duplicate error and report it via ReportError too?
-    return callB<eh::RegisterEHFrames>(RAddr, Size);
-  }
-
-  JITTargetAddress reserveMem(ResourceIdMgr::ResourceId Id, uint64_t Size,
-                              uint32_t Align) {
-    if (auto AddrOrErr = callB<mem::ReserveMem>(Id, Size, Align))
-      return *AddrOrErr;
-    else {
-      ES.reportError(AddrOrErr.takeError());
-      return 0;
-    }
-  }
-
-  bool setProtections(ResourceIdMgr::ResourceId Id,
-                      JITTargetAddress RemoteSegAddr, unsigned ProtFlags) {
-    if (auto Err = callB<mem::SetProtections>(Id, RemoteSegAddr, ProtFlags)) {
-      ES.reportError(std::move(Err));
-      return true;
-    } else
-      return false;
-  }
-
-  bool writeMem(JITTargetAddress Addr, const char *Src, uint64_t Size) {
-    if (auto Err = callB<mem::WriteMem>(DirectBufferWriter(Src, Addr, Size))) {
-      ES.reportError(std::move(Err));
-      return true;
-    } else
-      return false;
-  }
-
-  Error writePointer(JITTargetAddress Addr, JITTargetAddress PtrVal) {
-    return callB<mem::WritePtr>(Addr, PtrVal);
-  }
-
-  static Error doNothing() { return Error::success(); }
-
-  ExecutionSession &ES;
-  std::function<void(Error)> ReportError;
-  std::string RemoteTargetTriple;
-  uint32_t RemotePointerSize = 0;
-  uint32_t RemotePageSize = 0;
-  uint32_t RemoteTrampolineSize = 0;
-  uint32_t RemoteIndirectStubSize = 0;
-  ResourceIdMgr AllocatorIds, IndirectStubOwnerIds;
-  Optional<RemoteCompileCallbackManager> CallbackManager;
-};
-
-} // end namespace remote
-} // end namespace orc
-} // end namespace llvm
-
-#undef DEBUG_TYPE
-
-#endif // LLVM_EXECUTIONENGINE_ORC_ORCREMOTETARGETCLIENT_H
diff --git a/gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetRPCAPI.h b/gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetRPCAPI.h
deleted file mode 100644
index 367bfb36919..00000000000
--- a/gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetRPCAPI.h
+++ /dev/null
@@ -1,386 +0,0 @@
-//===- OrcRemoteTargetRPCAPI.h - Orc Remote-target RPC API ------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines the Orc remote-target RPC API. It should not be used
-// directly, but is used by the RemoteTargetClient and RemoteTargetServer
-// classes.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_EXECUTIONENGINE_ORC_ORCREMOTETARGETRPCAPI_H
-#define LLVM_EXECUTIONENGINE_ORC_ORCREMOTETARGETRPCAPI_H
-
-#include "llvm/ExecutionEngine/JITSymbol.h"
-#include "llvm/ExecutionEngine/Orc/Shared/RPCUtils.h"
-#include "llvm/ExecutionEngine/Orc/Shared/RawByteChannel.h"
-
-namespace llvm {
-namespace orc {
-
-namespace remote {
-
-/// Template error for missing resources.
-template <typename ResourceIdT>
-class ResourceNotFound
-  : public ErrorInfo<ResourceNotFound<ResourceIdT>> {
-public:
-  static char ID;
-
-  ResourceNotFound(ResourceIdT ResourceId,
-                   std::string ResourceDescription = "")
-    : ResourceId(std::move(ResourceId)),
-      ResourceDescription(std::move(ResourceDescription)) {}
-
-  std::error_code convertToErrorCode() const override {
-    return orcError(OrcErrorCode::UnknownResourceHandle);
-  }
-
-  void log(raw_ostream &OS) const override {
-    OS << (ResourceDescription.empty()
-             ? "Remote resource with id "
-               : ResourceDescription)
-       << " " << ResourceId << " not found";
-  }
-
-private:
-  ResourceIdT ResourceId;
-  std::string ResourceDescription;
-};
-
-template <typename ResourceIdT>
-char ResourceNotFound<ResourceIdT>::ID = 0;
-
-class DirectBufferWriter {
-public:
-  DirectBufferWriter() = default;
-  DirectBufferWriter(const char *Src, JITTargetAddress Dst, uint64_t Size)
-      : Src(Src), Dst(Dst), Size(Size) {}
-
-  const char *getSrc() const { return Src; }
-  JITTargetAddress getDst() const { return Dst; }
-  uint64_t getSize() const { return Size; }
-
-private:
-  const char *Src;
-  JITTargetAddress Dst;
-  uint64_t Size;
-};
-
-} // end namespace remote
-
-namespace shared {
-
-template <> class SerializationTypeName<JITSymbolFlags> {
-public:
-  static const char *getName() { return "JITSymbolFlags"; }
-};
-
-template <typename ChannelT>
-class SerializationTraits<ChannelT, JITSymbolFlags> {
-public:
-
-  static Error serialize(ChannelT &C, const JITSymbolFlags &Flags) {
-    return serializeSeq(C, Flags.getRawFlagsValue(), Flags.getTargetFlags());
-  }
-
-  static Error deserialize(ChannelT &C, JITSymbolFlags &Flags) {
-    JITSymbolFlags::UnderlyingType JITFlags;
-    JITSymbolFlags::TargetFlagsType TargetFlags;
-    if (auto Err = deserializeSeq(C, JITFlags, TargetFlags))
-      return Err;
-    Flags = JITSymbolFlags(static_cast<JITSymbolFlags::FlagNames>(JITFlags),
-                           TargetFlags);
-    return Error::success();
-  }
-};
-
-template <> class SerializationTypeName<remote::DirectBufferWriter> {
-public:
-  static const char *getName() { return "DirectBufferWriter"; }
-};
-
-template <typename ChannelT>
-class SerializationTraits<
-    ChannelT, remote::DirectBufferWriter, remote::DirectBufferWriter,
-    std::enable_if_t<std::is_base_of<RawByteChannel, ChannelT>::value>> {
-public:
-  static Error serialize(ChannelT &C, const remote::DirectBufferWriter &DBW) {
-    if (auto EC = serializeSeq(C, DBW.getDst()))
-      return EC;
-    if (auto EC = serializeSeq(C, DBW.getSize()))
-      return EC;
-    return C.appendBytes(DBW.getSrc(), DBW.getSize());
-  }
-
-  static Error deserialize(ChannelT &C, remote::DirectBufferWriter &DBW) {
-    JITTargetAddress Dst;
-    if (auto EC = deserializeSeq(C, Dst))
-      return EC;
-    uint64_t Size;
-    if (auto EC = deserializeSeq(C, Size))
-      return EC;
-    char *Addr = reinterpret_cast<char *>(static_cast<uintptr_t>(Dst));
-
-    DBW = remote::DirectBufferWriter(nullptr, Dst, Size);
-
-    return C.readBytes(Addr, Size);
-  }
-};
-
-} // end namespace shared
-
-namespace remote {
-
-class ResourceIdMgr {
-public:
-  using ResourceId = uint64_t;
-  static const ResourceId InvalidId = ~0U;
-
-  ResourceIdMgr() = default;
-  explicit ResourceIdMgr(ResourceId FirstValidId)
-    : NextId(std::move(FirstValidId)) {}
-
-  ResourceId getNext() {
-    if (!FreeIds.empty()) {
-      ResourceId I = FreeIds.back();
-      FreeIds.pop_back();
-      return I;
-    }
-    assert(NextId + 1 != ~0ULL && "All ids allocated");
-    return NextId++;
-  }
-
-  void release(ResourceId I) { FreeIds.push_back(I); }
-
-private:
-  ResourceId NextId = 1;
-  std::vector<ResourceId> FreeIds;
-};
-
-/// Registers EH frames on the remote.
-namespace eh {
-
-  /// Registers EH frames on the remote.
-class RegisterEHFrames
-    : public shared::RPCFunction<RegisterEHFrames,
-                                 void(JITTargetAddress Addr, uint32_t Size)> {
-public:
-  static const char *getName() { return "RegisterEHFrames"; }
-};
-
-  /// Deregisters EH frames on the remote.
-class DeregisterEHFrames
-    : public shared::RPCFunction<DeregisterEHFrames,
-                                 void(JITTargetAddress Addr, uint32_t Size)> {
-public:
-  static const char *getName() { return "DeregisterEHFrames"; }
-};
-
-} // end namespace eh
-
-/// RPC functions for executing remote code.
-namespace exec {
-
-  /// Call an 'int32_t()'-type function on the remote, returns the called
-  /// function's return value.
-class CallIntVoid
-    : public shared::RPCFunction<CallIntVoid, int32_t(JITTargetAddress Addr)> {
-public:
-  static const char *getName() { return "CallIntVoid"; }
-};
-
-  /// Call an 'int32_t(int32_t)'-type function on the remote, returns the called
-  /// function's return value.
-class CallIntInt
-    : public shared::RPCFunction<CallIntInt,
-                                 int32_t(JITTargetAddress Addr, int)> {
-public:
-  static const char *getName() { return "CallIntInt"; }
-};
-
-  /// Call an 'int32_t(int32_t, char**)'-type function on the remote, returns the
-  /// called function's return value.
-class CallMain
-    : public shared::RPCFunction<CallMain,
-                                 int32_t(JITTargetAddress Addr,
-                                         std::vector<std::string> Args)> {
-public:
-  static const char *getName() { return "CallMain"; }
-};
-
-  /// Calls a 'void()'-type function on the remote, returns when the called
-  /// function completes.
-class CallVoidVoid
-    : public shared::RPCFunction<CallVoidVoid, void(JITTargetAddress FnAddr)> {
-public:
-  static const char *getName() { return "CallVoidVoid"; }
-};
-
-} // end namespace exec
-
-/// RPC functions for remote memory management / inspection / modification.
-namespace mem {
-
-  /// Creates a memory allocator on the remote.
-class CreateRemoteAllocator
-    : public shared::RPCFunction<CreateRemoteAllocator,
-                                 void(ResourceIdMgr::ResourceId AllocatorID)> {
-public:
-  static const char *getName() { return "CreateRemoteAllocator"; }
-};
-
-  /// Destroys a remote allocator, freeing any memory allocated by it.
-class DestroyRemoteAllocator
-    : public shared::RPCFunction<DestroyRemoteAllocator,
-                                 void(ResourceIdMgr::ResourceId AllocatorID)> {
-public:
-  static const char *getName() { return "DestroyRemoteAllocator"; }
-};
-
-  /// Read a remote memory block.
-class ReadMem
-    : public shared::RPCFunction<
-          ReadMem, std::vector<uint8_t>(JITTargetAddress Src, uint64_t Size)> {
-public:
-  static const char *getName() { return "ReadMem"; }
-};
-
-  /// Reserve a block of memory on the remote via the given allocator.
-class ReserveMem
-    : public shared::RPCFunction<
-          ReserveMem, JITTargetAddress(ResourceIdMgr::ResourceId AllocID,
-                                       uint64_t Size, uint32_t Align)> {
-public:
-  static const char *getName() { return "ReserveMem"; }
-};
-
-  /// Set the memory protection on a memory block.
-class SetProtections
-    : public shared::RPCFunction<
-          SetProtections, void(ResourceIdMgr::ResourceId AllocID,
-                               JITTargetAddress Dst, uint32_t ProtFlags)> {
-public:
-  static const char *getName() { return "SetProtections"; }
-};
-
-  /// Write to a remote memory block.
-class WriteMem
-    : public shared::RPCFunction<WriteMem,
-                                 void(remote::DirectBufferWriter DB)> {
-public:
-  static const char *getName() { return "WriteMem"; }
-};
-
-  /// Write to a remote pointer.
-class WritePtr
-    : public shared::RPCFunction<WritePtr, void(JITTargetAddress Dst,
-                                                JITTargetAddress Val)> {
-public:
-  static const char *getName() { return "WritePtr"; }
-};
-
-} // end namespace mem
-
-/// RPC functions for remote stub and trampoline management.
-namespace stubs {
-
-  /// Creates an indirect stub owner on the remote.
-class CreateIndirectStubsOwner
-    : public shared::RPCFunction<CreateIndirectStubsOwner,
-                                 void(ResourceIdMgr::ResourceId StubOwnerID)> {
-public:
-  static const char *getName() { return "CreateIndirectStubsOwner"; }
-};
-
-  /// RPC function for destroying an indirect stubs owner.
-class DestroyIndirectStubsOwner
-    : public shared::RPCFunction<DestroyIndirectStubsOwner,
-                                 void(ResourceIdMgr::ResourceId StubsOwnerID)> {
-public:
-  static const char *getName() { return "DestroyIndirectStubsOwner"; }
-};
-
-  /// EmitIndirectStubs result is (StubsBase, PtrsBase, NumStubsEmitted).
-class EmitIndirectStubs
-    : public shared::RPCFunction<
-          EmitIndirectStubs,
-          std::tuple<JITTargetAddress, JITTargetAddress, uint32_t>(
-              ResourceIdMgr::ResourceId StubsOwnerID,
-              uint32_t NumStubsRequired)> {
-public:
-  static const char *getName() { return "EmitIndirectStubs"; }
-};
-
-  /// RPC function to emit the resolver block and return its address.
-class EmitResolverBlock
-    : public shared::RPCFunction<EmitResolverBlock, void()> {
-public:
-  static const char *getName() { return "EmitResolverBlock"; }
-};
-
-  /// EmitTrampolineBlock result is (BlockAddr, NumTrampolines).
-class EmitTrampolineBlock
-    : public shared::RPCFunction<EmitTrampolineBlock,
-                                 std::tuple<JITTargetAddress, uint32_t>()> {
-public:
-  static const char *getName() { return "EmitTrampolineBlock"; }
-};
-
-} // end namespace stubs
-
-/// Miscelaneous RPC functions for dealing with remotes.
-namespace utils {
-
-  /// GetRemoteInfo result is (Triple, PointerSize, PageSize, TrampolineSize,
-  ///                          IndirectStubsSize).
-class GetRemoteInfo
-    : public shared::RPCFunction<
-          GetRemoteInfo,
-          std::tuple<std::string, uint32_t, uint32_t, uint32_t, uint32_t>()> {
-public:
-  static const char *getName() { return "GetRemoteInfo"; }
-};
-
-  /// Get the address of a remote symbol.
-class GetSymbolAddress
-    : public shared::RPCFunction<GetSymbolAddress,
-                                 JITTargetAddress(std::string SymbolName)> {
-public:
-  static const char *getName() { return "GetSymbolAddress"; }
-};
-
-  /// Request that the host execute a compile callback.
-class RequestCompile
-    : public shared::RPCFunction<
-          RequestCompile, JITTargetAddress(JITTargetAddress TrampolineAddr)> {
-public:
-  static const char *getName() { return "RequestCompile"; }
-};
-
-  /// Notify the remote and terminate the session.
-class TerminateSession : public shared::RPCFunction<TerminateSession, void()> {
-public:
-  static const char *getName() { return "TerminateSession"; }
-};
-
-} // namespace utils
-
-class OrcRemoteTargetRPCAPI
-    : public shared::SingleThreadedRPCEndpoint<shared::RawByteChannel> {
-public:
-  // FIXME: Remove constructors once MSVC supports synthesizing move-ops.
-  OrcRemoteTargetRPCAPI(shared::RawByteChannel &C)
-      : shared::SingleThreadedRPCEndpoint<shared::RawByteChannel>(C, true) {}
-};
-
-} // end namespace remote
-
-} // end namespace orc
-} // end namespace llvm
-
-#endif // LLVM_EXECUTIONENGINE_ORC_ORCREMOTETARGETRPCAPI_H
diff --git a/gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetServer.h b/gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetServer.h
deleted file mode 100644
index ce9bf064303..00000000000
--- a/gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetServer.h
+++ /dev/null
@@ -1,464 +0,0 @@
-//===- OrcRemoteTargetServer.h - Orc Remote-target Server -------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines the OrcRemoteTargetServer class. It can be used to build a
-// JIT server that can execute code sent from an OrcRemoteTargetClient.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_EXECUTIONENGINE_ORC_ORCREMOTETARGETSERVER_H
-#define LLVM_EXECUTIONENGINE_ORC_ORCREMOTETARGETSERVER_H
-
-#include "llvm/ExecutionEngine/JITSymbol.h"
-#include "llvm/ExecutionEngine/Orc/IndirectionUtils.h"
-#include "llvm/ExecutionEngine/Orc/OrcRemoteTargetRPCAPI.h"
-#include "llvm/ExecutionEngine/Orc/Shared/OrcError.h"
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/Error.h"
-#include "llvm/Support/Format.h"
-#include "llvm/Support/Host.h"
-#include "llvm/Support/Memory.h"
-#include "llvm/Support/Process.h"
-#include "llvm/Support/raw_ostream.h"
-#include <algorithm>
-#include <cassert>
-#include <cstddef>
-#include <cstdint>
-#include <functional>
-#include <map>
-#include <memory>
-#include <string>
-#include <system_error>
-#include <tuple>
-#include <type_traits>
-#include <vector>
-
-#define DEBUG_TYPE "orc-remote"
-
-namespace llvm {
-namespace orc {
-namespace remote {
-
-template <typename ChannelT, typename TargetT>
-class OrcRemoteTargetServer
-    : public shared::SingleThreadedRPCEndpoint<shared::RawByteChannel> {
-public:
-  using SymbolLookupFtor =
-      std::function<JITTargetAddress(const std::string &Name)>;
-
-  using EHFrameRegistrationFtor =
-      std::function<void(uint8_t *Addr, uint32_t Size)>;
-
-  OrcRemoteTargetServer(ChannelT &Channel, SymbolLookupFtor SymbolLookup,
-                        EHFrameRegistrationFtor EHFramesRegister,
-                        EHFrameRegistrationFtor EHFramesDeregister)
-      : shared::SingleThreadedRPCEndpoint<shared::RawByteChannel>(Channel,
-                                                                  true),
-        SymbolLookup(std::move(SymbolLookup)),
-        EHFramesRegister(std::move(EHFramesRegister)),
-        EHFramesDeregister(std::move(EHFramesDeregister)) {
-    using ThisT = std::remove_reference_t<decltype(*this)>;
-    addHandler<exec::CallIntVoid>(*this, &ThisT::handleCallIntVoid);
-    addHandler<exec::CallIntInt>(*this, &ThisT::handleCallIntInt);
-    addHandler<exec::CallMain>(*this, &ThisT::handleCallMain);
-    addHandler<exec::CallVoidVoid>(*this, &ThisT::handleCallVoidVoid);
-    addHandler<mem::CreateRemoteAllocator>(*this,
-                                           &ThisT::handleCreateRemoteAllocator);
-    addHandler<mem::DestroyRemoteAllocator>(
-        *this, &ThisT::handleDestroyRemoteAllocator);
-    addHandler<mem::ReadMem>(*this, &ThisT::handleReadMem);
-    addHandler<mem::ReserveMem>(*this, &ThisT::handleReserveMem);
-    addHandler<mem::SetProtections>(*this, &ThisT::handleSetProtections);
-    addHandler<mem::WriteMem>(*this, &ThisT::handleWriteMem);
-    addHandler<mem::WritePtr>(*this, &ThisT::handleWritePtr);
-    addHandler<eh::RegisterEHFrames>(*this, &ThisT::handleRegisterEHFrames);
-    addHandler<eh::DeregisterEHFrames>(*this, &ThisT::handleDeregisterEHFrames);
-    addHandler<stubs::CreateIndirectStubsOwner>(
-        *this, &ThisT::handleCreateIndirectStubsOwner);
-    addHandler<stubs::DestroyIndirectStubsOwner>(
-        *this, &ThisT::handleDestroyIndirectStubsOwner);
-    addHandler<stubs::EmitIndirectStubs>(*this,
-                                         &ThisT::handleEmitIndirectStubs);
-    addHandler<stubs::EmitResolverBlock>(*this,
-                                         &ThisT::handleEmitResolverBlock);
-    addHandler<stubs::EmitTrampolineBlock>(*this,
-                                           &ThisT::handleEmitTrampolineBlock);
-    addHandler<utils::GetSymbolAddress>(*this, &ThisT::handleGetSymbolAddress);
-    addHandler<utils::GetRemoteInfo>(*this, &ThisT::handleGetRemoteInfo);
-    addHandler<utils::TerminateSession>(*this, &ThisT::handleTerminateSession);
-  }
-
-  // FIXME: Remove move/copy ops once MSVC supports synthesizing move ops.
-  OrcRemoteTargetServer(const OrcRemoteTargetServer &) = delete;
-  OrcRemoteTargetServer &operator=(const OrcRemoteTargetServer &) = delete;
-
-  OrcRemoteTargetServer(OrcRemoteTargetServer &&Other) = default;
-  OrcRemoteTargetServer &operator=(OrcRemoteTargetServer &&) = delete;
-
-  Expected<JITTargetAddress> requestCompile(JITTargetAddress TrampolineAddr) {
-    return callB<utils::RequestCompile>(TrampolineAddr);
-  }
-
-  bool receivedTerminate() const { return TerminateFlag; }
-
-private:
-  struct Allocator {
-    Allocator() = default;
-    Allocator(Allocator &&Other) : Allocs(std::move(Other.Allocs)) {}
-
-    Allocator &operator=(Allocator &&Other) {
-      Allocs = std::move(Other.Allocs);
-      return *this;
-    }
-
-    ~Allocator() {
-      for (auto &Alloc : Allocs)
-        sys::Memory::releaseMappedMemory(Alloc.second);
-    }
-
-    Error allocate(void *&Addr, size_t Size, uint32_t Align) {
-      std::error_code EC;
-      sys::MemoryBlock MB = sys::Memory::allocateMappedMemory(
-          Size, nullptr, sys::Memory::MF_READ | sys::Memory::MF_WRITE, EC);
-      if (EC)
-        return errorCodeToError(EC);
-
-      Addr = MB.base();
-      assert(Allocs.find(MB.base()) == Allocs.end() && "Duplicate alloc");
-      Allocs[MB.base()] = std::move(MB);
-      return Error::success();
-    }
-
-    Error setProtections(void *block, unsigned Flags) {
-      auto I = Allocs.find(block);
-      if (I == Allocs.end())
-        return errorCodeToError(orcError(OrcErrorCode::RemoteMProtectAddrUnrecognized));
-      return errorCodeToError(
-          sys::Memory::protectMappedMemory(I->second, Flags));
-    }
-
-  private:
-    std::map<void *, sys::MemoryBlock> Allocs;
-  };
-
-  static Error doNothing() { return Error::success(); }
-
-  static JITTargetAddress reenter(void *JITTargetAddr, void *TrampolineAddr) {
-    auto T = static_cast<OrcRemoteTargetServer *>(JITTargetAddr);
-    auto AddrOrErr = T->requestCompile(static_cast<JITTargetAddress>(
-        reinterpret_cast<uintptr_t>(TrampolineAddr)));
-    // FIXME: Allow customizable failure substitution functions.
-    assert(AddrOrErr && "Compile request failed");
-    return *AddrOrErr;
-  }
-
-  Expected<int32_t> handleCallIntVoid(JITTargetAddress Addr) {
-    using IntVoidFnTy = int (*)();
-
-    IntVoidFnTy Fn =
-        reinterpret_cast<IntVoidFnTy>(static_cast<uintptr_t>(Addr));
-
-    LLVM_DEBUG(dbgs() << "  Calling " << format("0x%016x", Addr) << "\n");
-    int Result = Fn();
-    LLVM_DEBUG(dbgs() << "  Result = " << Result << "\n");
-
-    return Result;
-  }
-
-  Expected<int32_t> handleCallIntInt(JITTargetAddress Addr, int Arg) {
-    using IntIntFnTy = int (*)(int);
-
-    IntIntFnTy Fn = reinterpret_cast<IntIntFnTy>(static_cast<uintptr_t>(Addr));
-
-    LLVM_DEBUG(dbgs() << "  Calling " << format("0x%016x", Addr)
-                      << " with argument " << Arg << "\n");
-    int Result = Fn(Arg);
-    LLVM_DEBUG(dbgs() << "  Result = " << Result << "\n");
-
-    return Result;
-  }
-
-  Expected<int32_t> handleCallMain(JITTargetAddress Addr,
-                                   std::vector<std::string> Args) {
-    using MainFnTy = int (*)(int, const char *[]);
-
-    MainFnTy Fn = reinterpret_cast<MainFnTy>(static_cast<uintptr_t>(Addr));
-    int ArgC = Args.size() + 1;
-    int Idx = 1;
-    std::unique_ptr<const char *[]> ArgV(new const char *[ArgC + 1]);
-    ArgV[0] = "<jit process>";
-    for (auto &Arg : Args)
-      ArgV[Idx++] = Arg.c_str();
-    ArgV[ArgC] = 0;
-    LLVM_DEBUG(for (int Idx = 0; Idx < ArgC; ++Idx) {
-      llvm::dbgs() << "Arg " << Idx << ": " << ArgV[Idx] << "\n";
-    });
-
-    LLVM_DEBUG(dbgs() << "  Calling " << format("0x%016x", Addr) << "\n");
-    int Result = Fn(ArgC, ArgV.get());
-    LLVM_DEBUG(dbgs() << "  Result = " << Result << "\n");
-
-    return Result;
-  }
-
-  Error handleCallVoidVoid(JITTargetAddress Addr) {
-    using VoidVoidFnTy = void (*)();
-
-    VoidVoidFnTy Fn =
-        reinterpret_cast<VoidVoidFnTy>(static_cast<uintptr_t>(Addr));
-
-    LLVM_DEBUG(dbgs() << "  Calling " << format("0x%016x", Addr) << "\n");
-    Fn();
-    LLVM_DEBUG(dbgs() << "  Complete.\n");
-
-    return Error::success();
-  }
-
-  Error handleCreateRemoteAllocator(ResourceIdMgr::ResourceId Id) {
-    auto I = Allocators.find(Id);
-    if (I != Allocators.end())
-      return errorCodeToError(
-               orcError(OrcErrorCode::RemoteAllocatorIdAlreadyInUse));
-    LLVM_DEBUG(dbgs() << "  Created allocator " << Id << "\n");
-    Allocators[Id] = Allocator();
-    return Error::success();
-  }
-
-  Error handleCreateIndirectStubsOwner(ResourceIdMgr::ResourceId Id) {
-    auto I = IndirectStubsOwners.find(Id);
-    if (I != IndirectStubsOwners.end())
-      return errorCodeToError(
-               orcError(OrcErrorCode::RemoteIndirectStubsOwnerIdAlreadyInUse));
-    LLVM_DEBUG(dbgs() << "  Create indirect stubs owner " << Id << "\n");
-    IndirectStubsOwners[Id] = ISBlockOwnerList();
-    return Error::success();
-  }
-
-  Error handleDeregisterEHFrames(JITTargetAddress TAddr, uint32_t Size) {
-    uint8_t *Addr = reinterpret_cast<uint8_t *>(static_cast<uintptr_t>(TAddr));
-    LLVM_DEBUG(dbgs() << "  Registering EH frames at "
-                      << format("0x%016x", TAddr) << ", Size = " << Size
-                      << " bytes\n");
-    EHFramesDeregister(Addr, Size);
-    return Error::success();
-  }
-
-  Error handleDestroyRemoteAllocator(ResourceIdMgr::ResourceId Id) {
-    auto I = Allocators.find(Id);
-    if (I == Allocators.end())
-      return errorCodeToError(
-               orcError(OrcErrorCode::RemoteAllocatorDoesNotExist));
-    Allocators.erase(I);
-    LLVM_DEBUG(dbgs() << "  Destroyed allocator " << Id << "\n");
-    return Error::success();
-  }
-
-  Error handleDestroyIndirectStubsOwner(ResourceIdMgr::ResourceId Id) {
-    auto I = IndirectStubsOwners.find(Id);
-    if (I == IndirectStubsOwners.end())
-      return errorCodeToError(
-               orcError(OrcErrorCode::RemoteIndirectStubsOwnerDoesNotExist));
-    IndirectStubsOwners.erase(I);
-    return Error::success();
-  }
-
-  Expected<std::tuple<JITTargetAddress, JITTargetAddress, uint32_t>>
-  handleEmitIndirectStubs(ResourceIdMgr::ResourceId Id,
-                          uint32_t NumStubsRequired) {
-    LLVM_DEBUG(dbgs() << "  ISMgr " << Id << " request " << NumStubsRequired
-                      << " stubs.\n");
-
-    auto StubOwnerItr = IndirectStubsOwners.find(Id);
-    if (StubOwnerItr == IndirectStubsOwners.end())
-      return errorCodeToError(
-               orcError(OrcErrorCode::RemoteIndirectStubsOwnerDoesNotExist));
-
-    auto IS = LocalIndirectStubsInfo<TargetT>::create(
-        NumStubsRequired, sys::Process::getPageSizeEstimate());
-    if (!IS)
-      return IS.takeError();
-
-    JITTargetAddress StubsBase = pointerToJITTargetAddress(IS->getStub(0));
-    JITTargetAddress PtrsBase = pointerToJITTargetAddress(IS->getPtr(0));
-    uint32_t NumStubsEmitted = IS->getNumStubs();
-
-    auto &BlockList = StubOwnerItr->second;
-    BlockList.push_back(std::move(*IS));
-
-    return std::make_tuple(StubsBase, PtrsBase, NumStubsEmitted);
-  }
-
-  Error handleEmitResolverBlock() {
-    std::error_code EC;
-    ResolverBlock = sys::OwningMemoryBlock(sys::Memory::allocateMappedMemory(
-        TargetT::ResolverCodeSize, nullptr,
-        sys::Memory::MF_READ | sys::Memory::MF_WRITE, EC));
-    if (EC)
-      return errorCodeToError(EC);
-
-    TargetT::writeResolverCode(static_cast<char *>(ResolverBlock.base()),
-                               pointerToJITTargetAddress(ResolverBlock.base()),
-                               pointerToJITTargetAddress(&reenter),
-                               pointerToJITTargetAddress(this));
-
-    return errorCodeToError(sys::Memory::protectMappedMemory(
-        ResolverBlock.getMemoryBlock(),
-        sys::Memory::MF_READ | sys::Memory::MF_EXEC));
-  }
-
-  Expected<std::tuple<JITTargetAddress, uint32_t>> handleEmitTrampolineBlock() {
-    std::error_code EC;
-    auto TrampolineBlock =
-        sys::OwningMemoryBlock(sys::Memory::allocateMappedMemory(
-            sys::Process::getPageSizeEstimate(), nullptr,
-            sys::Memory::MF_READ | sys::Memory::MF_WRITE, EC));
-    if (EC)
-      return errorCodeToError(EC);
-
-    uint32_t NumTrampolines =
-        (sys::Process::getPageSizeEstimate() - TargetT::PointerSize) /
-        TargetT::TrampolineSize;
-
-    char *TrampolineMem = static_cast<char *>(TrampolineBlock.base());
-    TargetT::writeTrampolines(
-        TrampolineMem, pointerToJITTargetAddress(TrampolineMem),
-        pointerToJITTargetAddress(ResolverBlock.base()), NumTrampolines);
-
-    EC = sys::Memory::protectMappedMemory(TrampolineBlock.getMemoryBlock(),
-                                          sys::Memory::MF_READ |
-                                              sys::Memory::MF_EXEC);
-
-    TrampolineBlocks.push_back(std::move(TrampolineBlock));
-
-    return std::make_tuple(pointerToJITTargetAddress(TrampolineMem),
-                           NumTrampolines);
-  }
-
-  Expected<JITTargetAddress> handleGetSymbolAddress(const std::string &Name) {
-    JITTargetAddress Addr = SymbolLookup(Name);
-    LLVM_DEBUG(dbgs() << "  Symbol '" << Name
-                      << "' =  " << format("0x%016x", Addr) << "\n");
-    return Addr;
-  }
-
-  Expected<std::tuple<std::string, uint32_t, uint32_t, uint32_t, uint32_t>>
-  handleGetRemoteInfo() {
-    std::string ProcessTriple = sys::getProcessTriple();
-    uint32_t PointerSize = TargetT::PointerSize;
-    uint32_t PageSize = sys::Process::getPageSizeEstimate();
-    uint32_t TrampolineSize = TargetT::TrampolineSize;
-    uint32_t IndirectStubSize = TargetT::StubSize;
-    LLVM_DEBUG(dbgs() << "  Remote info:\n"
-                      << "    triple             = '" << ProcessTriple << "'\n"
-                      << "    pointer size       = " << PointerSize << "\n"
-                      << "    page size          = " << PageSize << "\n"
-                      << "    trampoline size    = " << TrampolineSize << "\n"
-                      << "    indirect stub size = " << IndirectStubSize
-                      << "\n");
-    return std::make_tuple(ProcessTriple, PointerSize, PageSize, TrampolineSize,
-                           IndirectStubSize);
-  }
-
-  Expected<std::vector<uint8_t>> handleReadMem(JITTargetAddress RSrc,
-                                               uint64_t Size) {
-    uint8_t *Src = reinterpret_cast<uint8_t *>(static_cast<uintptr_t>(RSrc));
-
-    LLVM_DEBUG(dbgs() << "  Reading " << Size << " bytes from "
-                      << format("0x%016x", RSrc) << "\n");
-
-    std::vector<uint8_t> Buffer;
-    Buffer.resize(Size);
-    for (uint8_t *P = Src; Size != 0; --Size)
-      Buffer.push_back(*P++);
-
-    return Buffer;
-  }
-
-  Error handleRegisterEHFrames(JITTargetAddress TAddr, uint32_t Size) {
-    uint8_t *Addr = reinterpret_cast<uint8_t *>(static_cast<uintptr_t>(TAddr));
-    LLVM_DEBUG(dbgs() << "  Registering EH frames at "
-                      << format("0x%016x", TAddr) << ", Size = " << Size
-                      << " bytes\n");
-    EHFramesRegister(Addr, Size);
-    return Error::success();
-  }
-
-  Expected<JITTargetAddress> handleReserveMem(ResourceIdMgr::ResourceId Id,
-                                              uint64_t Size, uint32_t Align) {
-    auto I = Allocators.find(Id);
-    if (I == Allocators.end())
-      return errorCodeToError(
-               orcError(OrcErrorCode::RemoteAllocatorDoesNotExist));
-    auto &Allocator = I->second;
-    void *LocalAllocAddr = nullptr;
-    if (auto Err = Allocator.allocate(LocalAllocAddr, Size, Align))
-      return std::move(Err);
-
-    LLVM_DEBUG(dbgs() << "  Allocator " << Id << " reserved " << LocalAllocAddr
-                      << " (" << Size << " bytes, alignment " << Align
-                      << ")\n");
-
-    JITTargetAddress AllocAddr = static_cast<JITTargetAddress>(
-        reinterpret_cast<uintptr_t>(LocalAllocAddr));
-
-    return AllocAddr;
-  }
-
-  Error handleSetProtections(ResourceIdMgr::ResourceId Id,
-                             JITTargetAddress Addr, uint32_t Flags) {
-    auto I = Allocators.find(Id);
-    if (I == Allocators.end())
-      return errorCodeToError(
-               orcError(OrcErrorCode::RemoteAllocatorDoesNotExist));
-    auto &Allocator = I->second;
-    void *LocalAddr = reinterpret_cast<void *>(static_cast<uintptr_t>(Addr));
-    LLVM_DEBUG(dbgs() << "  Allocator " << Id << " set permissions on "
-                      << LocalAddr << " to "
-                      << (Flags & sys::Memory::MF_READ ? 'R' : '-')
-                      << (Flags & sys::Memory::MF_WRITE ? 'W' : '-')
-                      << (Flags & sys::Memory::MF_EXEC ? 'X' : '-') << "\n");
-    return Allocator.setProtections(LocalAddr, Flags);
-  }
-
-  Error handleTerminateSession() {
-    TerminateFlag = true;
-    return Error::success();
-  }
-
-  Error handleWriteMem(DirectBufferWriter DBW) {
-    LLVM_DEBUG(dbgs() << "  Writing " << DBW.getSize() << " bytes to "
-                      << format("0x%016x", DBW.getDst()) << "\n");
-    return Error::success();
-  }
-
-  Error handleWritePtr(JITTargetAddress Addr, JITTargetAddress PtrVal) {
-    LLVM_DEBUG(dbgs() << "  Writing pointer *" << format("0x%016x", Addr)
-                      << " = " << format("0x%016x", PtrVal) << "\n");
-    uintptr_t *Ptr =
-        reinterpret_cast<uintptr_t *>(static_cast<uintptr_t>(Addr));
-    *Ptr = static_cast<uintptr_t>(PtrVal);
-    return Error::success();
-  }
-
-  SymbolLookupFtor SymbolLookup;
-  EHFrameRegistrationFtor EHFramesRegister, EHFramesDeregister;
-  std::map<ResourceIdMgr::ResourceId, Allocator> Allocators;
-  using ISBlockOwnerList = std::vector<LocalIndirectStubsInfo<TargetT>>;
-  std::map<ResourceIdMgr::ResourceId, ISBlockOwnerList> IndirectStubsOwners;
-  sys::OwningMemoryBlock ResolverBlock;
-  std::vector<sys::OwningMemoryBlock> TrampolineBlocks;
-  bool TerminateFlag = false;
-};
-
-} // end namespace remote
-} // end namespace orc
-} // end namespace llvm
-
-#undef DEBUG_TYPE
-
-#endif // LLVM_EXECUTIONENGINE_ORC_ORCREMOTETARGETSERVER_H
diff --git a/gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/Shared/FDRawByteChannel.h b/gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/Shared/FDRawByteChannel.h
deleted file mode 100644
index 3f96fe3da49..00000000000
--- a/gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/Shared/FDRawByteChannel.h
+++ /dev/null
@@ -1,79 +0,0 @@
-//===- FDRawByteChannel.h - File descriptor based byte-channel -*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// File descriptor based RawByteChannel.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_EXECUTIONENGINE_ORC_SHARED_FDRAWBYTECHANNEL_H
-#define LLVM_EXECUTIONENGINE_ORC_SHARED_FDRAWBYTECHANNEL_H
-
-#include "llvm/ExecutionEngine/Orc/Shared/RawByteChannel.h"
-
-#if !defined(_MSC_VER) && !defined(__MINGW32__)
-#include <unistd.h>
-#else
-#include <io.h>
-#endif
-
-namespace llvm {
-namespace orc {
-namespace shared {
-
-/// Serialization channel that reads from and writes from file descriptors.
-class FDRawByteChannel final : public RawByteChannel {
-public:
-  FDRawByteChannel(int InFD, int OutFD) : InFD(InFD), OutFD(OutFD) {}
-
-  llvm::Error readBytes(char *Dst, unsigned Size) override {
-    assert(Dst && "Attempt to read into null.");
-    ssize_t Completed = 0;
-    while (Completed < static_cast<ssize_t>(Size)) {
-      ssize_t Read = ::read(InFD, Dst + Completed, Size - Completed);
-      if (Read <= 0) {
-        auto ErrNo = errno;
-        if (ErrNo == EAGAIN || ErrNo == EINTR)
-          continue;
-        else
-          return llvm::errorCodeToError(
-              std::error_code(errno, std::generic_category()));
-      }
-      Completed += Read;
-    }
-    return llvm::Error::success();
-  }
-
-  llvm::Error appendBytes(const char *Src, unsigned Size) override {
-    assert(Src && "Attempt to append from null.");
-    ssize_t Completed = 0;
-    while (Completed < static_cast<ssize_t>(Size)) {
-      ssize_t Written = ::write(OutFD, Src + Completed, Size - Completed);
-      if (Written < 0) {
-        auto ErrNo = errno;
-        if (ErrNo == EAGAIN || ErrNo == EINTR)
-          continue;
-        else
-          return llvm::errorCodeToError(
-              std::error_code(errno, std::generic_category()));
-      }
-      Completed += Written;
-    }
-    return llvm::Error::success();
-  }
-
-  llvm::Error send() override { return llvm::Error::success(); }
-
-private:
-  int InFD, OutFD;
-};
-
-} // namespace shared
-} // namespace orc
-} // namespace llvm
-
-#endif // LLVM_EXECUTIONENGINE_ORC_SHARED_FDRAWBYTECHANNEL_H
diff --git a/gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/Shared/RPCUtils.h b/gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/Shared/RPCUtils.h
deleted file mode 100644
index 1ff47ce4275..00000000000
--- a/gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/Shared/RPCUtils.h
+++ /dev/null
@@ -1,1659 +0,0 @@
-//===- RPCUtils.h - Utilities for building RPC APIs -------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Utilities to support construction of simple RPC APIs.
-//
-// The RPC utilities aim for ease of use (minimal conceptual overhead) for C++
-// programmers, high performance, low memory overhead, and efficient use of the
-// communications channel.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_EXECUTIONENGINE_ORC_SHARED_RPCUTILS_H
-#define LLVM_EXECUTIONENGINE_ORC_SHARED_RPCUTILS_H
-
-#include <map>
-#include <thread>
-#include <vector>
-
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ExecutionEngine/Orc/Shared/OrcError.h"
-#include "llvm/ExecutionEngine/Orc/Shared/Serialization.h"
-#include "llvm/Support/MSVCErrorWorkarounds.h"
-
-#include <future>
-
-namespace llvm {
-namespace orc {
-namespace shared {
-
-/// Base class of all fatal RPC errors (those that necessarily result in the
-/// termination of the RPC session).
-class RPCFatalError : public ErrorInfo<RPCFatalError> {
-public:
-  static char ID;
-};
-
-/// RPCConnectionClosed is returned from RPC operations if the RPC connection
-/// has already been closed due to either an error or graceful disconnection.
-class ConnectionClosed : public ErrorInfo<ConnectionClosed> {
-public:
-  static char ID;
-  std::error_code convertToErrorCode() const override;
-  void log(raw_ostream &OS) const override;
-};
-
-/// BadFunctionCall is returned from handleOne when the remote makes a call with
-/// an unrecognized function id.
-///
-/// This error is fatal because Orc RPC needs to know how to parse a function
-/// call to know where the next call starts, and if it doesn't recognize the
-/// function id it cannot parse the call.
-template <typename FnIdT, typename SeqNoT>
-class BadFunctionCall
-    : public ErrorInfo<BadFunctionCall<FnIdT, SeqNoT>, RPCFatalError> {
-public:
-  static char ID;
-
-  BadFunctionCall(FnIdT FnId, SeqNoT SeqNo)
-      : FnId(std::move(FnId)), SeqNo(std::move(SeqNo)) {}
-
-  std::error_code convertToErrorCode() const override {
-    return orcError(OrcErrorCode::UnexpectedRPCCall);
-  }
-
-  void log(raw_ostream &OS) const override {
-    OS << "Call to invalid RPC function id '" << FnId
-       << "' with "
-          "sequence number "
-       << SeqNo;
-  }
-
-private:
-  FnIdT FnId;
-  SeqNoT SeqNo;
-};
-
-template <typename FnIdT, typename SeqNoT>
-char BadFunctionCall<FnIdT, SeqNoT>::ID = 0;
-
-/// InvalidSequenceNumberForResponse is returned from handleOne when a response
-/// call arrives with a sequence number that doesn't correspond to any in-flight
-/// function call.
-///
-/// This error is fatal because Orc RPC needs to know how to parse the rest of
-/// the response call to know where the next call starts, and if it doesn't have
-/// a result parser for this sequence number it can't do that.
-template <typename SeqNoT>
-class InvalidSequenceNumberForResponse
-    : public ErrorInfo<InvalidSequenceNumberForResponse<SeqNoT>,
-                       RPCFatalError> {
-public:
-  static char ID;
-
-  InvalidSequenceNumberForResponse(SeqNoT SeqNo) : SeqNo(std::move(SeqNo)) {}
-
-  std::error_code convertToErrorCode() const override {
-    return orcError(OrcErrorCode::UnexpectedRPCCall);
-  };
-
-  void log(raw_ostream &OS) const override {
-    OS << "Response has unknown sequence number " << SeqNo;
-  }
-
-private:
-  SeqNoT SeqNo;
-};
-
-template <typename SeqNoT>
-char InvalidSequenceNumberForResponse<SeqNoT>::ID = 0;
-
-/// This non-fatal error will be passed to asynchronous result handlers in place
-/// of a result if the connection goes down before a result returns, or if the
-/// function to be called cannot be negotiated with the remote.
-class ResponseAbandoned : public ErrorInfo<ResponseAbandoned> {
-public:
-  static char ID;
-
-  std::error_code convertToErrorCode() const override;
-  void log(raw_ostream &OS) const override;
-};
-
-/// This error is returned if the remote does not have a handler installed for
-/// the given RPC function.
-class CouldNotNegotiate : public ErrorInfo<CouldNotNegotiate> {
-public:
-  static char ID;
-
-  CouldNotNegotiate(std::string Signature);
-  std::error_code convertToErrorCode() const override;
-  void log(raw_ostream &OS) const override;
-  const std::string &getSignature() const { return Signature; }
-
-private:
-  std::string Signature;
-};
-
-template <typename DerivedFunc, typename FnT> class RPCFunction;
-
-// RPC Function class.
-// DerivedFunc should be a user defined class with a static 'getName()' method
-// returning a const char* representing the function's name.
-template <typename DerivedFunc, typename RetT, typename... ArgTs>
-class RPCFunction<DerivedFunc, RetT(ArgTs...)> {
-public:
-  /// User defined function type.
-  using Type = RetT(ArgTs...);
-
-  /// Return type.
-  using ReturnType = RetT;
-
-  /// Returns the full function prototype as a string.
-  static const char *getPrototype() {
-    static std::string Name = [] {
-      std::string Name;
-      raw_string_ostream(Name)
-          << SerializationTypeName<RetT>::getName() << " "
-          << DerivedFunc::getName() << "("
-          << SerializationTypeNameSequence<ArgTs...>() << ")";
-      return Name;
-    }();
-    return Name.data();
-  }
-};
-
-/// Allocates RPC function ids during autonegotiation.
-/// Specializations of this class must provide four members:
-///
-/// static T getInvalidId():
-///   Should return a reserved id that will be used to represent missing
-/// functions during autonegotiation.
-///
-/// static T getResponseId():
-///   Should return a reserved id that will be used to send function responses
-/// (return values).
-///
-/// static T getNegotiateId():
-///   Should return a reserved id for the negotiate function, which will be used
-/// to negotiate ids for user defined functions.
-///
-/// template <typename Func> T allocate():
-///   Allocate a unique id for function Func.
-template <typename T, typename = void> class RPCFunctionIdAllocator;
-
-/// This specialization of RPCFunctionIdAllocator provides a default
-/// implementation for integral types.
-template <typename T>
-class RPCFunctionIdAllocator<T, std::enable_if_t<std::is_integral<T>::value>> {
-public:
-  static T getInvalidId() { return T(0); }
-  static T getResponseId() { return T(1); }
-  static T getNegotiateId() { return T(2); }
-
-  template <typename Func> T allocate() { return NextId++; }
-
-private:
-  T NextId = 3;
-};
-
-namespace detail {
-
-/// Provides a typedef for a tuple containing the decayed argument types.
-template <typename T> class RPCFunctionArgsTuple;
-
-template <typename RetT, typename... ArgTs>
-class RPCFunctionArgsTuple<RetT(ArgTs...)> {
-public:
-  using Type = std::tuple<std::decay_t<std::remove_reference_t<ArgTs>>...>;
-};
-
-// ResultTraits provides typedefs and utilities specific to the return type
-// of functions.
-template <typename RetT> class ResultTraits {
-public:
-  // The return type wrapped in llvm::Expected.
-  using ErrorReturnType = Expected<RetT>;
-
-#ifdef _MSC_VER
-  // The ErrorReturnType wrapped in a std::promise.
-  using ReturnPromiseType = std::promise<MSVCPExpected<RetT>>;
-
-  // The ErrorReturnType wrapped in a std::future.
-  using ReturnFutureType = std::future<MSVCPExpected<RetT>>;
-#else
-  // The ErrorReturnType wrapped in a std::promise.
-  using ReturnPromiseType = std::promise<ErrorReturnType>;
-
-  // The ErrorReturnType wrapped in a std::future.
-  using ReturnFutureType = std::future<ErrorReturnType>;
-#endif
-
-  // Create a 'blank' value of the ErrorReturnType, ready and safe to
-  // overwrite.
-  static ErrorReturnType createBlankErrorReturnValue() {
-    return ErrorReturnType(RetT());
-  }
-
-  // Consume an abandoned ErrorReturnType.
-  static void consumeAbandoned(ErrorReturnType RetOrErr) {
-    consumeError(RetOrErr.takeError());
-  }
-
-  static ErrorReturnType returnError(Error Err) { return std::move(Err); }
-};
-
-// ResultTraits specialization for void functions.
-template <> class ResultTraits<void> {
-public:
-  // For void functions, ErrorReturnType is llvm::Error.
-  using ErrorReturnType = Error;
-
-#ifdef _MSC_VER
-  // The ErrorReturnType wrapped in a std::promise.
-  using ReturnPromiseType = std::promise<MSVCPError>;
-
-  // The ErrorReturnType wrapped in a std::future.
-  using ReturnFutureType = std::future<MSVCPError>;
-#else
-  // The ErrorReturnType wrapped in a std::promise.
-  using ReturnPromiseType = std::promise<ErrorReturnType>;
-
-  // The ErrorReturnType wrapped in a std::future.
-  using ReturnFutureType = std::future<ErrorReturnType>;
-#endif
-
-  // Create a 'blank' value of the ErrorReturnType, ready and safe to
-  // overwrite.
-  static ErrorReturnType createBlankErrorReturnValue() {
-    return ErrorReturnType::success();
-  }
-
-  // Consume an abandoned ErrorReturnType.
-  static void consumeAbandoned(ErrorReturnType Err) {
-    consumeError(std::move(Err));
-  }
-
-  static ErrorReturnType returnError(Error Err) { return Err; }
-};
-
-// ResultTraits<Error> is equivalent to ResultTraits<void>. This allows
-// handlers for void RPC functions to return either void (in which case they
-// implicitly succeed) or Error (in which case their error return is
-// propagated). See usage in HandlerTraits::runHandlerHelper.
-template <> class ResultTraits<Error> : public ResultTraits<void> {};
-
-// ResultTraits<Expected<T>> is equivalent to ResultTraits<T>. This allows
-// handlers for RPC functions returning a T to return either a T (in which
-// case they implicitly succeed) or Expected<T> (in which case their error
-// return is propagated). See usage in HandlerTraits::runHandlerHelper.
-template <typename RetT>
-class ResultTraits<Expected<RetT>> : public ResultTraits<RetT> {};
-
-// Determines whether an RPC function's defined error return type supports
-// error return value.
-template <typename T> class SupportsErrorReturn {
-public:
-  static const bool value = false;
-};
-
-template <> class SupportsErrorReturn<Error> {
-public:
-  static const bool value = true;
-};
-
-template <typename T> class SupportsErrorReturn<Expected<T>> {
-public:
-  static const bool value = true;
-};
-
-// RespondHelper packages return values based on whether or not the declared
-// RPC function return type supports error returns.
-template <bool FuncSupportsErrorReturn> class RespondHelper;
-
-// RespondHelper specialization for functions that support error returns.
-template <> class RespondHelper<true> {
-public:
-  // Send Expected<T>.
-  template <typename WireRetT, typename HandlerRetT, typename ChannelT,
-            typename FunctionIdT, typename SequenceNumberT>
-  static Error sendResult(ChannelT &C, const FunctionIdT &ResponseId,
-                          SequenceNumberT SeqNo,
-                          Expected<HandlerRetT> ResultOrErr) {
-    if (!ResultOrErr && ResultOrErr.template errorIsA<RPCFatalError>())
-      return ResultOrErr.takeError();
-
-    // Open the response message.
-    if (auto Err = C.startSendMessage(ResponseId, SeqNo))
-      return Err;
-
-    // Serialize the result.
-    if (auto Err =
-            SerializationTraits<ChannelT, WireRetT, Expected<HandlerRetT>>::
-                serialize(C, std::move(ResultOrErr)))
-      return Err;
-
-    // Close the response message.
-    if (auto Err = C.endSendMessage())
-      return Err;
-    return C.send();
-  }
-
-  template <typename ChannelT, typename FunctionIdT, typename SequenceNumberT>
-  static Error sendResult(ChannelT &C, const FunctionIdT &ResponseId,
-                          SequenceNumberT SeqNo, Error Err) {
-    if (Err && Err.isA<RPCFatalError>())
-      return Err;
-    if (auto Err2 = C.startSendMessage(ResponseId, SeqNo))
-      return Err2;
-    if (auto Err2 = serializeSeq(C, std::move(Err)))
-      return Err2;
-    if (auto Err2 = C.endSendMessage())
-      return Err2;
-    return C.send();
-  }
-};
-
-// RespondHelper specialization for functions that do not support error returns.
-template <> class RespondHelper<false> {
-public:
-  template <typename WireRetT, typename HandlerRetT, typename ChannelT,
-            typename FunctionIdT, typename SequenceNumberT>
-  static Error sendResult(ChannelT &C, const FunctionIdT &ResponseId,
-                          SequenceNumberT SeqNo,
-                          Expected<HandlerRetT> ResultOrErr) {
-    if (auto Err = ResultOrErr.takeError())
-      return Err;
-
-    // Open the response message.
-    if (auto Err = C.startSendMessage(ResponseId, SeqNo))
-      return Err;
-
-    // Serialize the result.
-    if (auto Err =
-            SerializationTraits<ChannelT, WireRetT, HandlerRetT>::serialize(
-                C, *ResultOrErr))
-      return Err;
-
-    // End the response message.
-    if (auto Err = C.endSendMessage())
-      return Err;
-
-    return C.send();
-  }
-
-  template <typename ChannelT, typename FunctionIdT, typename SequenceNumberT>
-  static Error sendResult(ChannelT &C, const FunctionIdT &ResponseId,
-                          SequenceNumberT SeqNo, Error Err) {
-    if (Err)
-      return Err;
-    if (auto Err2 = C.startSendMessage(ResponseId, SeqNo))
-      return Err2;
-    if (auto Err2 = C.endSendMessage())
-      return Err2;
-    return C.send();
-  }
-};
-
-// Send a response of the given wire return type (WireRetT) over the
-// channel, with the given sequence number.
-template <typename WireRetT, typename HandlerRetT, typename ChannelT,
-          typename FunctionIdT, typename SequenceNumberT>
-Error respond(ChannelT &C, const FunctionIdT &ResponseId, SequenceNumberT SeqNo,
-              Expected<HandlerRetT> ResultOrErr) {
-  return RespondHelper<SupportsErrorReturn<WireRetT>::value>::
-      template sendResult<WireRetT>(C, ResponseId, SeqNo,
-                                    std::move(ResultOrErr));
-}
-
-// Send an empty response message on the given channel to indicate that
-// the handler ran.
-template <typename WireRetT, typename ChannelT, typename FunctionIdT,
-          typename SequenceNumberT>
-Error respond(ChannelT &C, const FunctionIdT &ResponseId, SequenceNumberT SeqNo,
-              Error Err) {
-  return RespondHelper<SupportsErrorReturn<WireRetT>::value>::sendResult(
-      C, ResponseId, SeqNo, std::move(Err));
-}
-
-// Converts a given type to the equivalent error return type.
-template <typename T> class WrappedHandlerReturn {
-public:
-  using Type = Expected<T>;
-};
-
-template <typename T> class WrappedHandlerReturn<Expected<T>> {
-public:
-  using Type = Expected<T>;
-};
-
-template <> class WrappedHandlerReturn<void> {
-public:
-  using Type = Error;
-};
-
-template <> class WrappedHandlerReturn<Error> {
-public:
-  using Type = Error;
-};
-
-template <> class WrappedHandlerReturn<ErrorSuccess> {
-public:
-  using Type = Error;
-};
-
-// Traits class that strips the response function from the list of handler
-// arguments.
-template <typename FnT> class AsyncHandlerTraits;
-
-template <typename ResultT, typename... ArgTs>
-class AsyncHandlerTraits<Error(std::function<Error(Expected<ResultT>)>,
-                               ArgTs...)> {
-public:
-  using Type = Error(ArgTs...);
-  using ResultType = Expected<ResultT>;
-};
-
-template <typename... ArgTs>
-class AsyncHandlerTraits<Error(std::function<Error(Error)>, ArgTs...)> {
-public:
-  using Type = Error(ArgTs...);
-  using ResultType = Error;
-};
-
-template <typename... ArgTs>
-class AsyncHandlerTraits<ErrorSuccess(std::function<Error(Error)>, ArgTs...)> {
-public:
-  using Type = Error(ArgTs...);
-  using ResultType = Error;
-};
-
-template <typename... ArgTs>
-class AsyncHandlerTraits<void(std::function<Error(Error)>, ArgTs...)> {
-public:
-  using Type = Error(ArgTs...);
-  using ResultType = Error;
-};
-
-template <typename ResponseHandlerT, typename... ArgTs>
-class AsyncHandlerTraits<Error(ResponseHandlerT, ArgTs...)>
-    : public AsyncHandlerTraits<Error(std::decay_t<ResponseHandlerT>,
-                                      ArgTs...)> {};
-
-// This template class provides utilities related to RPC function handlers.
-// The base case applies to non-function types (the template class is
-// specialized for function types) and inherits from the appropriate
-// speciilization for the given non-function type's call operator.
-template <typename HandlerT>
-class HandlerTraits
-    : public HandlerTraits<
-          decltype(&std::remove_reference<HandlerT>::type::operator())> {};
-
-// Traits for handlers with a given function type.
-template <typename RetT, typename... ArgTs>
-class HandlerTraits<RetT(ArgTs...)> {
-public:
-  // Function type of the handler.
-  using Type = RetT(ArgTs...);
-
-  // Return type of the handler.
-  using ReturnType = RetT;
-
-  // Call the given handler with the given arguments.
-  template <typename HandlerT, typename... TArgTs>
-  static typename WrappedHandlerReturn<RetT>::Type
-  unpackAndRun(HandlerT &Handler, std::tuple<TArgTs...> &Args) {
-    return unpackAndRunHelper(Handler, Args,
-                              std::index_sequence_for<TArgTs...>());
-  }
-
-  // Call the given handler with the given arguments.
-  template <typename HandlerT, typename ResponderT, typename... TArgTs>
-  static Error unpackAndRunAsync(HandlerT &Handler, ResponderT &Responder,
-                                 std::tuple<TArgTs...> &Args) {
-    return unpackAndRunAsyncHelper(Handler, Responder, Args,
-                                   std::index_sequence_for<TArgTs...>());
-  }
-
-  // Call the given handler with the given arguments.
-  template <typename HandlerT>
-  static std::enable_if_t<
-      std::is_void<typename HandlerTraits<HandlerT>::ReturnType>::value, Error>
-  run(HandlerT &Handler, ArgTs &&...Args) {
-    Handler(std::move(Args)...);
-    return Error::success();
-  }
-
-  template <typename HandlerT, typename... TArgTs>
-  static std::enable_if_t<
-      !std::is_void<typename HandlerTraits<HandlerT>::ReturnType>::value,
-      typename HandlerTraits<HandlerT>::ReturnType>
-  run(HandlerT &Handler, TArgTs... Args) {
-    return Handler(std::move(Args)...);
-  }
-
-  // Serialize arguments to the channel.
-  template <typename ChannelT, typename... CArgTs>
-  static Error serializeArgs(ChannelT &C, const CArgTs... CArgs) {
-    return SequenceSerialization<ChannelT, ArgTs...>::serialize(C, CArgs...);
-  }
-
-  // Deserialize arguments from the channel.
-  template <typename ChannelT, typename... CArgTs>
-  static Error deserializeArgs(ChannelT &C, std::tuple<CArgTs...> &Args) {
-    return deserializeArgsHelper(C, Args, std::index_sequence_for<CArgTs...>());
-  }
-
-private:
-  template <typename ChannelT, typename... CArgTs, size_t... Indexes>
-  static Error deserializeArgsHelper(ChannelT &C, std::tuple<CArgTs...> &Args,
-                                     std::index_sequence<Indexes...> _) {
-    return SequenceSerialization<ChannelT, ArgTs...>::deserialize(
-        C, std::get<Indexes>(Args)...);
-  }
-
-  template <typename HandlerT, typename ArgTuple, size_t... Indexes>
-  static typename WrappedHandlerReturn<
-      typename HandlerTraits<HandlerT>::ReturnType>::Type
-  unpackAndRunHelper(HandlerT &Handler, ArgTuple &Args,
-                     std::index_sequence<Indexes...>) {
-    return run(Handler, std::move(std::get<Indexes>(Args))...);
-  }
-
-  template <typename HandlerT, typename ResponderT, typename ArgTuple,
-            size_t... Indexes>
-  static typename WrappedHandlerReturn<
-      typename HandlerTraits<HandlerT>::ReturnType>::Type
-  unpackAndRunAsyncHelper(HandlerT &Handler, ResponderT &Responder,
-                          ArgTuple &Args, std::index_sequence<Indexes...>) {
-    return run(Handler, Responder, std::move(std::get<Indexes>(Args))...);
-  }
-};
-
-// Handler traits for free functions.
-template <typename RetT, typename... ArgTs>
-class HandlerTraits<RetT (*)(ArgTs...)> : public HandlerTraits<RetT(ArgTs...)> {
-};
-
-// Handler traits for class methods (especially call operators for lambdas).
-template <typename Class, typename RetT, typename... ArgTs>
-class HandlerTraits<RetT (Class::*)(ArgTs...)>
-    : public HandlerTraits<RetT(ArgTs...)> {};
-
-// Handler traits for const class methods (especially call operators for
-// lambdas).
-template <typename Class, typename RetT, typename... ArgTs>
-class HandlerTraits<RetT (Class::*)(ArgTs...) const>
-    : public HandlerTraits<RetT(ArgTs...)> {};
-
-// Utility to peel the Expected wrapper off a response handler error type.
-template <typename HandlerT> class ResponseHandlerArg;
-
-template <typename ArgT> class ResponseHandlerArg<Error(Expected<ArgT>)> {
-public:
-  using ArgType = Expected<ArgT>;
-  using UnwrappedArgType = ArgT;
-};
-
-template <typename ArgT>
-class ResponseHandlerArg<ErrorSuccess(Expected<ArgT>)> {
-public:
-  using ArgType = Expected<ArgT>;
-  using UnwrappedArgType = ArgT;
-};
-
-template <> class ResponseHandlerArg<Error(Error)> {
-public:
-  using ArgType = Error;
-};
-
-template <> class ResponseHandlerArg<ErrorSuccess(Error)> {
-public:
-  using ArgType = Error;
-};
-
-// ResponseHandler represents a handler for a not-yet-received function call
-// result.
-template <typename ChannelT> class ResponseHandler {
-public:
-  virtual ~ResponseHandler() {}
-
-  // Reads the function result off the wire and acts on it. The meaning of
-  // "act" will depend on how this method is implemented in any given
-  // ResponseHandler subclass but could, for example, mean running a
-  // user-specified handler or setting a promise value.
-  virtual Error handleResponse(ChannelT &C) = 0;
-
-  // Abandons this outstanding result.
-  virtual void abandon() = 0;
-
-  // Create an error instance representing an abandoned response.
-  static Error createAbandonedResponseError() {
-    return make_error<ResponseAbandoned>();
-  }
-};
-
-// ResponseHandler subclass for RPC functions with non-void returns.
-template <typename ChannelT, typename FuncRetT, typename HandlerT>
-class ResponseHandlerImpl : public ResponseHandler<ChannelT> {
-public:
-  ResponseHandlerImpl(HandlerT Handler) : Handler(std::move(Handler)) {}
-
-  // Handle the result by deserializing it from the channel then passing it
-  // to the user defined handler.
-  Error handleResponse(ChannelT &C) override {
-    using UnwrappedArgType = typename ResponseHandlerArg<
-        typename HandlerTraits<HandlerT>::Type>::UnwrappedArgType;
-    UnwrappedArgType Result;
-    if (auto Err =
-            SerializationTraits<ChannelT, FuncRetT,
-                                UnwrappedArgType>::deserialize(C, Result))
-      return Err;
-    if (auto Err = C.endReceiveMessage())
-      return Err;
-    return Handler(std::move(Result));
-  }
-
-  // Abandon this response by calling the handler with an 'abandoned response'
-  // error.
-  void abandon() override {
-    if (auto Err = Handler(this->createAbandonedResponseError())) {
-      // Handlers should not fail when passed an abandoned response error.
-      report_fatal_error(std::move(Err));
-    }
-  }
-
-private:
-  HandlerT Handler;
-};
-
-// ResponseHandler subclass for RPC functions with void returns.
-template <typename ChannelT, typename HandlerT>
-class ResponseHandlerImpl<ChannelT, void, HandlerT>
-    : public ResponseHandler<ChannelT> {
-public:
-  ResponseHandlerImpl(HandlerT Handler) : Handler(std::move(Handler)) {}
-
-  // Handle the result (no actual value, just a notification that the function
-  // has completed on the remote end) by calling the user-defined handler with
-  // Error::success().
-  Error handleResponse(ChannelT &C) override {
-    if (auto Err = C.endReceiveMessage())
-      return Err;
-    return Handler(Error::success());
-  }
-
-  // Abandon this response by calling the handler with an 'abandoned response'
-  // error.
-  void abandon() override {
-    if (auto Err = Handler(this->createAbandonedResponseError())) {
-      // Handlers should not fail when passed an abandoned response error.
-      report_fatal_error(std::move(Err));
-    }
-  }
-
-private:
-  HandlerT Handler;
-};
-
-template <typename ChannelT, typename FuncRetT, typename HandlerT>
-class ResponseHandlerImpl<ChannelT, Expected<FuncRetT>, HandlerT>
-    : public ResponseHandler<ChannelT> {
-public:
-  ResponseHandlerImpl(HandlerT Handler) : Handler(std::move(Handler)) {}
-
-  // Handle the result by deserializing it from the channel then passing it
-  // to the user defined handler.
-  Error handleResponse(ChannelT &C) override {
-    using HandlerArgType = typename ResponseHandlerArg<
-        typename HandlerTraits<HandlerT>::Type>::ArgType;
-    HandlerArgType Result((typename HandlerArgType::value_type()));
-
-    if (auto Err = SerializationTraits<ChannelT, Expected<FuncRetT>,
-                                       HandlerArgType>::deserialize(C, Result))
-      return Err;
-    if (auto Err = C.endReceiveMessage())
-      return Err;
-    return Handler(std::move(Result));
-  }
-
-  // Abandon this response by calling the handler with an 'abandoned response'
-  // error.
-  void abandon() override {
-    if (auto Err = Handler(this->createAbandonedResponseError())) {
-      // Handlers should not fail when passed an abandoned response error.
-      report_fatal_error(std::move(Err));
-    }
-  }
-
-private:
-  HandlerT Handler;
-};
-
-template <typename ChannelT, typename HandlerT>
-class ResponseHandlerImpl<ChannelT, Error, HandlerT>
-    : public ResponseHandler<ChannelT> {
-public:
-  ResponseHandlerImpl(HandlerT Handler) : Handler(std::move(Handler)) {}
-
-  // Handle the result by deserializing it from the channel then passing it
-  // to the user defined handler.
-  Error handleResponse(ChannelT &C) override {
-    Error Result = Error::success();
-    if (auto Err = SerializationTraits<ChannelT, Error, Error>::deserialize(
-            C, Result)) {
-      consumeError(std::move(Result));
-      return Err;
-    }
-    if (auto Err = C.endReceiveMessage()) {
-      consumeError(std::move(Result));
-      return Err;
-    }
-    return Handler(std::move(Result));
-  }
-
-  // Abandon this response by calling the handler with an 'abandoned response'
-  // error.
-  void abandon() override {
-    if (auto Err = Handler(this->createAbandonedResponseError())) {
-      // Handlers should not fail when passed an abandoned response error.
-      report_fatal_error(std::move(Err));
-    }
-  }
-
-private:
-  HandlerT Handler;
-};
-
-// Create a ResponseHandler from a given user handler.
-template <typename ChannelT, typename FuncRetT, typename HandlerT>
-std::unique_ptr<ResponseHandler<ChannelT>> createResponseHandler(HandlerT H) {
-  return std::make_unique<ResponseHandlerImpl<ChannelT, FuncRetT, HandlerT>>(
-      std::move(H));
-}
-
-// Helper for wrapping member functions up as functors. This is useful for
-// installing methods as result handlers.
-template <typename ClassT, typename RetT, typename... ArgTs>
-class MemberFnWrapper {
-public:
-  using MethodT = RetT (ClassT::*)(ArgTs...);
-  MemberFnWrapper(ClassT &Instance, MethodT Method)
-      : Instance(Instance), Method(Method) {}
-  RetT operator()(ArgTs &&...Args) {
-    return (Instance.*Method)(std::move(Args)...);
-  }
-
-private:
-  ClassT &Instance;
-  MethodT Method;
-};
-
-// Helper that provides a Functor for deserializing arguments.
-template <typename... ArgTs> class ReadArgs {
-public:
-  Error operator()() { return Error::success(); }
-};
-
-template <typename ArgT, typename... ArgTs>
-class ReadArgs<ArgT, ArgTs...> : public ReadArgs<ArgTs...> {
-public:
-  ReadArgs(ArgT &Arg, ArgTs &...Args) : ReadArgs<ArgTs...>(Args...), Arg(Arg) {}
-
-  Error operator()(ArgT &ArgVal, ArgTs &...ArgVals) {
-    this->Arg = std::move(ArgVal);
-    return ReadArgs<ArgTs...>::operator()(ArgVals...);
-  }
-
-private:
-  ArgT &Arg;
-};
-
-// Manage sequence numbers.
-template <typename SequenceNumberT> class SequenceNumberManager {
-public:
-  // Reset, making all sequence numbers available.
-  void reset() {
-    std::lock_guard<std::mutex> Lock(SeqNoLock);
-    NextSequenceNumber = 0;
-    FreeSequenceNumbers.clear();
-  }
-
-  // Get the next available sequence number. Will re-use numbers that have
-  // been released.
-  SequenceNumberT getSequenceNumber() {
-    std::lock_guard<std::mutex> Lock(SeqNoLock);
-    if (FreeSequenceNumbers.empty())
-      return NextSequenceNumber++;
-    auto SequenceNumber = FreeSequenceNumbers.back();
-    FreeSequenceNumbers.pop_back();
-    return SequenceNumber;
-  }
-
-  // Release a sequence number, making it available for re-use.
-  void releaseSequenceNumber(SequenceNumberT SequenceNumber) {
-    std::lock_guard<std::mutex> Lock(SeqNoLock);
-    FreeSequenceNumbers.push_back(SequenceNumber);
-  }
-
-private:
-  std::mutex SeqNoLock;
-  SequenceNumberT NextSequenceNumber = 0;
-  std::vector<SequenceNumberT> FreeSequenceNumbers;
-};
-
-// Checks that predicate P holds for each corresponding pair of type arguments
-// from T1 and T2 tuple.
-template <template <class, class> class P, typename T1Tuple, typename T2Tuple>
-class RPCArgTypeCheckHelper;
-
-template <template <class, class> class P>
-class RPCArgTypeCheckHelper<P, std::tuple<>, std::tuple<>> {
-public:
-  static const bool value = true;
-};
-
-template <template <class, class> class P, typename T, typename... Ts,
-          typename U, typename... Us>
-class RPCArgTypeCheckHelper<P, std::tuple<T, Ts...>, std::tuple<U, Us...>> {
-public:
-  static const bool value =
-      P<T, U>::value &&
-      RPCArgTypeCheckHelper<P, std::tuple<Ts...>, std::tuple<Us...>>::value;
-};
-
-template <template <class, class> class P, typename T1Sig, typename T2Sig>
-class RPCArgTypeCheck {
-public:
-  using T1Tuple = typename RPCFunctionArgsTuple<T1Sig>::Type;
-  using T2Tuple = typename RPCFunctionArgsTuple<T2Sig>::Type;
-
-  static_assert(std::tuple_size<T1Tuple>::value >=
-                    std::tuple_size<T2Tuple>::value,
-                "Too many arguments to RPC call");
-  static_assert(std::tuple_size<T1Tuple>::value <=
-                    std::tuple_size<T2Tuple>::value,
-                "Too few arguments to RPC call");
-
-  static const bool value = RPCArgTypeCheckHelper<P, T1Tuple, T2Tuple>::value;
-};
-
-template <typename ChannelT, typename WireT, typename ConcreteT>
-class CanSerialize {
-private:
-  using S = SerializationTraits<ChannelT, WireT, ConcreteT>;
-
-  template <typename T>
-  static std::true_type check(
-      std::enable_if_t<std::is_same<decltype(T::serialize(
-                                        std::declval<ChannelT &>(),
-                                        std::declval<const ConcreteT &>())),
-                                    Error>::value,
-                       void *>);
-
-  template <typename> static std::false_type check(...);
-
-public:
-  static const bool value = decltype(check<S>(0))::value;
-};
-
-template <typename ChannelT, typename WireT, typename ConcreteT>
-class CanDeserialize {
-private:
-  using S = SerializationTraits<ChannelT, WireT, ConcreteT>;
-
-  template <typename T>
-  static std::true_type
-      check(std::enable_if_t<
-            std::is_same<decltype(T::deserialize(std::declval<ChannelT &>(),
-                                                 std::declval<ConcreteT &>())),
-                         Error>::value,
-            void *>);
-
-  template <typename> static std::false_type check(...);
-
-public:
-  static const bool value = decltype(check<S>(0))::value;
-};
-
-/// Contains primitive utilities for defining, calling and handling calls to
-/// remote procedures. ChannelT is a bidirectional stream conforming to the
-/// RPCChannel interface (see RPCChannel.h), FunctionIdT is a procedure
-/// identifier type that must be serializable on ChannelT, and SequenceNumberT
-/// is an integral type that will be used to number in-flight function calls.
-///
-/// These utilities support the construction of very primitive RPC utilities.
-/// Their intent is to ensure correct serialization and deserialization of
-/// procedure arguments, and to keep the client and server's view of the API in
-/// sync.
-template <typename ImplT, typename ChannelT, typename FunctionIdT,
-          typename SequenceNumberT>
-class RPCEndpointBase {
-protected:
-  class OrcRPCInvalid : public RPCFunction<OrcRPCInvalid, void()> {
-  public:
-    static const char *getName() { return "__orc_rpc$invalid"; }
-  };
-
-  class OrcRPCResponse : public RPCFunction<OrcRPCResponse, void()> {
-  public:
-    static const char *getName() { return "__orc_rpc$response"; }
-  };
-
-  class OrcRPCNegotiate
-      : public RPCFunction<OrcRPCNegotiate, FunctionIdT(std::string)> {
-  public:
-    static const char *getName() { return "__orc_rpc$negotiate"; }
-  };
-
-  // Helper predicate for testing for the presence of SerializeTraits
-  // serializers.
-  template <typename WireT, typename ConcreteT>
-  class CanSerializeCheck : detail::CanSerialize<ChannelT, WireT, ConcreteT> {
-  public:
-    using detail::CanSerialize<ChannelT, WireT, ConcreteT>::value;
-
-    static_assert(value, "Missing serializer for argument (Can't serialize the "
-                         "first template type argument of CanSerializeCheck "
-                         "from the second)");
-  };
-
-  // Helper predicate for testing for the presence of SerializeTraits
-  // deserializers.
-  template <typename WireT, typename ConcreteT>
-  class CanDeserializeCheck
-      : detail::CanDeserialize<ChannelT, WireT, ConcreteT> {
-  public:
-    using detail::CanDeserialize<ChannelT, WireT, ConcreteT>::value;
-
-    static_assert(value, "Missing deserializer for argument (Can't deserialize "
-                         "the second template type argument of "
-                         "CanDeserializeCheck from the first)");
-  };
-
-public:
-  /// Construct an RPC instance on a channel.
-  RPCEndpointBase(ChannelT &C, bool LazyAutoNegotiation)
-      : C(C), LazyAutoNegotiation(LazyAutoNegotiation) {
-    // Hold ResponseId in a special variable, since we expect Response to be
-    // called relatively frequently, and want to avoid the map lookup.
-    ResponseId = FnIdAllocator.getResponseId();
-    RemoteFunctionIds[OrcRPCResponse::getPrototype()] = ResponseId;
-
-    // Register the negotiate function id and handler.
-    auto NegotiateId = FnIdAllocator.getNegotiateId();
-    RemoteFunctionIds[OrcRPCNegotiate::getPrototype()] = NegotiateId;
-    Handlers[NegotiateId] = wrapHandler<OrcRPCNegotiate>(
-        [this](const std::string &Name) { return handleNegotiate(Name); });
-  }
-
-  /// Negotiate a function id for Func with the other end of the channel.
-  template <typename Func> Error negotiateFunction(bool Retry = false) {
-    return getRemoteFunctionId<Func>(true, Retry).takeError();
-  }
-
-  /// Append a call Func, does not call send on the channel.
-  /// The first argument specifies a user-defined handler to be run when the
-  /// function returns. The handler should take an Expected<Func::ReturnType>,
-  /// or an Error (if Func::ReturnType is void). The handler will be called
-  /// with an error if the return value is abandoned due to a channel error.
-  template <typename Func, typename HandlerT, typename... ArgTs>
-  Error appendCallAsync(HandlerT Handler, const ArgTs &...Args) {
-
-    static_assert(
-        detail::RPCArgTypeCheck<CanSerializeCheck, typename Func::Type,
-                                void(ArgTs...)>::value,
-        "");
-
-    // Look up the function ID.
-    FunctionIdT FnId;
-    if (auto FnIdOrErr = getRemoteFunctionId<Func>(LazyAutoNegotiation, false))
-      FnId = *FnIdOrErr;
-    else {
-      // Negotiation failed. Notify the handler then return the negotiate-failed
-      // error.
-      cantFail(Handler(make_error<ResponseAbandoned>()));
-      return FnIdOrErr.takeError();
-    }
-
-    SequenceNumberT SeqNo; // initialized in locked scope below.
-    {
-      // Lock the pending responses map and sequence number manager.
-      std::lock_guard<std::mutex> Lock(ResponsesMutex);
-
-      // Allocate a sequence number.
-      SeqNo = SequenceNumberMgr.getSequenceNumber();
-      assert(!PendingResponses.count(SeqNo) &&
-             "Sequence number already allocated");
-
-      // Install the user handler.
-      PendingResponses[SeqNo] =
-          detail::createResponseHandler<ChannelT, typename Func::ReturnType>(
-              std::move(Handler));
-    }
-
-    // Open the function call message.
-    if (auto Err = C.startSendMessage(FnId, SeqNo)) {
-      abandonPendingResponses();
-      return Err;
-    }
-
-    // Serialize the call arguments.
-    if (auto Err = detail::HandlerTraits<typename Func::Type>::serializeArgs(
-            C, Args...)) {
-      abandonPendingResponses();
-      return Err;
-    }
-
-    // Close the function call messagee.
-    if (auto Err = C.endSendMessage()) {
-      abandonPendingResponses();
-      return Err;
-    }
-
-    return Error::success();
-  }
-
-  Error sendAppendedCalls() { return C.send(); };
-
-  template <typename Func, typename HandlerT, typename... ArgTs>
-  Error callAsync(HandlerT Handler, const ArgTs &...Args) {
-    if (auto Err = appendCallAsync<Func>(std::move(Handler), Args...))
-      return Err;
-    return C.send();
-  }
-
-  /// Handle one incoming call.
-  Error handleOne() {
-    FunctionIdT FnId;
-    SequenceNumberT SeqNo;
-    if (auto Err = C.startReceiveMessage(FnId, SeqNo)) {
-      abandonPendingResponses();
-      return Err;
-    }
-    if (FnId == ResponseId)
-      return handleResponse(SeqNo);
-    auto I = Handlers.find(FnId);
-    if (I != Handlers.end())
-      return I->second(C, SeqNo);
-
-    // else: No handler found. Report error to client?
-    return make_error<BadFunctionCall<FunctionIdT, SequenceNumberT>>(FnId,
-                                                                     SeqNo);
-  }
-
-  /// Helper for handling setter procedures - this method returns a functor that
-  /// sets the variables referred to by Args... to values deserialized from the
-  /// channel.
-  /// E.g.
-  ///
-  ///   typedef Function<0, bool, int> Func1;
-  ///
-  ///   ...
-  ///   bool B;
-  ///   int I;
-  ///   if (auto Err = expect<Func1>(Channel, readArgs(B, I)))
-  ///     /* Handle Args */ ;
-  ///
-  template <typename... ArgTs>
-  static detail::ReadArgs<ArgTs...> readArgs(ArgTs &...Args) {
-    return detail::ReadArgs<ArgTs...>(Args...);
-  }
-
-  /// Abandon all outstanding result handlers.
-  ///
-  /// This will call all currently registered result handlers to receive an
-  /// "abandoned" error as their argument. This is used internally by the RPC
-  /// in error situations, but can also be called directly by clients who are
-  /// disconnecting from the remote and don't or can't expect responses to their
-  /// outstanding calls. (Especially for outstanding blocking calls, calling
-  /// this function may be necessary to avoid dead threads).
-  void abandonPendingResponses() {
-    // Lock the pending responses map and sequence number manager.
-    std::lock_guard<std::mutex> Lock(ResponsesMutex);
-
-    for (auto &KV : PendingResponses)
-      KV.second->abandon();
-    PendingResponses.clear();
-    SequenceNumberMgr.reset();
-  }
-
-  /// Remove the handler for the given function.
-  /// A handler must currently be registered for this function.
-  template <typename Func> void removeHandler() {
-    auto IdItr = LocalFunctionIds.find(Func::getPrototype());
-    assert(IdItr != LocalFunctionIds.end() &&
-           "Function does not have a registered handler");
-    auto HandlerItr = Handlers.find(IdItr->second);
-    assert(HandlerItr != Handlers.end() &&
-           "Function does not have a registered handler");
-    Handlers.erase(HandlerItr);
-  }
-
-  /// Clear all handlers.
-  void clearHandlers() { Handlers.clear(); }
-
-protected:
-  FunctionIdT getInvalidFunctionId() const {
-    return FnIdAllocator.getInvalidId();
-  }
-
-  /// Add the given handler to the handler map and make it available for
-  /// autonegotiation and execution.
-  template <typename Func, typename HandlerT>
-  void addHandlerImpl(HandlerT Handler) {
-
-    static_assert(detail::RPCArgTypeCheck<
-                      CanDeserializeCheck, typename Func::Type,
-                      typename detail::HandlerTraits<HandlerT>::Type>::value,
-                  "");
-
-    FunctionIdT NewFnId = FnIdAllocator.template allocate<Func>();
-    LocalFunctionIds[Func::getPrototype()] = NewFnId;
-    Handlers[NewFnId] = wrapHandler<Func>(std::move(Handler));
-  }
-
-  template <typename Func, typename HandlerT>
-  void addAsyncHandlerImpl(HandlerT Handler) {
-
-    static_assert(
-        detail::RPCArgTypeCheck<
-            CanDeserializeCheck, typename Func::Type,
-            typename detail::AsyncHandlerTraits<
-                typename detail::HandlerTraits<HandlerT>::Type>::Type>::value,
-        "");
-
-    FunctionIdT NewFnId = FnIdAllocator.template allocate<Func>();
-    LocalFunctionIds[Func::getPrototype()] = NewFnId;
-    Handlers[NewFnId] = wrapAsyncHandler<Func>(std::move(Handler));
-  }
-
-  Error handleResponse(SequenceNumberT SeqNo) {
-    using Handler = typename decltype(PendingResponses)::mapped_type;
-    Handler PRHandler;
-
-    {
-      // Lock the pending responses map and sequence number manager.
-      std::unique_lock<std::mutex> Lock(ResponsesMutex);
-      auto I = PendingResponses.find(SeqNo);
-
-      if (I != PendingResponses.end()) {
-        PRHandler = std::move(I->second);
-        PendingResponses.erase(I);
-        SequenceNumberMgr.releaseSequenceNumber(SeqNo);
-      } else {
-        // Unlock the pending results map to prevent recursive lock.
-        Lock.unlock();
-        abandonPendingResponses();
-        return make_error<InvalidSequenceNumberForResponse<SequenceNumberT>>(
-            SeqNo);
-      }
-    }
-
-    assert(PRHandler &&
-           "If we didn't find a response handler we should have bailed out");
-
-    if (auto Err = PRHandler->handleResponse(C)) {
-      abandonPendingResponses();
-      return Err;
-    }
-
-    return Error::success();
-  }
-
-  FunctionIdT handleNegotiate(const std::string &Name) {
-    auto I = LocalFunctionIds.find(Name);
-    if (I == LocalFunctionIds.end())
-      return getInvalidFunctionId();
-    return I->second;
-  }
-
-  // Find the remote FunctionId for the given function.
-  template <typename Func>
-  Expected<FunctionIdT> getRemoteFunctionId(bool NegotiateIfNotInMap,
-                                            bool NegotiateIfInvalid) {
-    bool DoNegotiate;
-
-    // Check if we already have a function id...
-    auto I = RemoteFunctionIds.find(Func::getPrototype());
-    if (I != RemoteFunctionIds.end()) {
-      // If it's valid there's nothing left to do.
-      if (I->second != getInvalidFunctionId())
-        return I->second;
-      DoNegotiate = NegotiateIfInvalid;
-    } else
-      DoNegotiate = NegotiateIfNotInMap;
-
-    // We don't have a function id for Func yet, but we're allowed to try to
-    // negotiate one.
-    if (DoNegotiate) {
-      auto &Impl = static_cast<ImplT &>(*this);
-      if (auto RemoteIdOrErr =
-              Impl.template callB<OrcRPCNegotiate>(Func::getPrototype())) {
-        RemoteFunctionIds[Func::getPrototype()] = *RemoteIdOrErr;
-        if (*RemoteIdOrErr == getInvalidFunctionId())
-          return make_error<CouldNotNegotiate>(Func::getPrototype());
-        return *RemoteIdOrErr;
-      } else
-        return RemoteIdOrErr.takeError();
-    }
-
-    // No key was available in the map and we weren't allowed to try to
-    // negotiate one, so return an unknown function error.
-    return make_error<CouldNotNegotiate>(Func::getPrototype());
-  }
-
-  using WrappedHandlerFn = std::function<Error(ChannelT &, SequenceNumberT)>;
-
-  // Wrap the given user handler in the necessary argument-deserialization code,
-  // result-serialization code, and call to the launch policy (if present).
-  template <typename Func, typename HandlerT>
-  WrappedHandlerFn wrapHandler(HandlerT Handler) {
-    return [this, Handler](ChannelT &Channel,
-                           SequenceNumberT SeqNo) mutable -> Error {
-      // Start by deserializing the arguments.
-      using ArgsTuple = typename detail::RPCFunctionArgsTuple<
-          typename detail::HandlerTraits<HandlerT>::Type>::Type;
-      auto Args = std::make_shared<ArgsTuple>();
-
-      if (auto Err =
-              detail::HandlerTraits<typename Func::Type>::deserializeArgs(
-                  Channel, *Args))
-        return Err;
-
-      // GCC 4.7 and 4.8 incorrectly issue a -Wunused-but-set-variable warning
-      // for RPCArgs. Void cast RPCArgs to work around this for now.
-      // FIXME: Remove this workaround once we can assume a working GCC version.
-      (void)Args;
-
-      // End receieve message, unlocking the channel for reading.
-      if (auto Err = Channel.endReceiveMessage())
-        return Err;
-
-      using HTraits = detail::HandlerTraits<HandlerT>;
-      using FuncReturn = typename Func::ReturnType;
-      return detail::respond<FuncReturn>(Channel, ResponseId, SeqNo,
-                                         HTraits::unpackAndRun(Handler, *Args));
-    };
-  }
-
-  // Wrap the given user handler in the necessary argument-deserialization code,
-  // result-serialization code, and call to the launch policy (if present).
-  template <typename Func, typename HandlerT>
-  WrappedHandlerFn wrapAsyncHandler(HandlerT Handler) {
-    return [this, Handler](ChannelT &Channel,
-                           SequenceNumberT SeqNo) mutable -> Error {
-      // Start by deserializing the arguments.
-      using AHTraits = detail::AsyncHandlerTraits<
-          typename detail::HandlerTraits<HandlerT>::Type>;
-      using ArgsTuple =
-          typename detail::RPCFunctionArgsTuple<typename AHTraits::Type>::Type;
-      auto Args = std::make_shared<ArgsTuple>();
-
-      if (auto Err =
-              detail::HandlerTraits<typename Func::Type>::deserializeArgs(
-                  Channel, *Args))
-        return Err;
-
-      // GCC 4.7 and 4.8 incorrectly issue a -Wunused-but-set-variable warning
-      // for RPCArgs. Void cast RPCArgs to work around this for now.
-      // FIXME: Remove this workaround once we can assume a working GCC version.
-      (void)Args;
-
-      // End receieve message, unlocking the channel for reading.
-      if (auto Err = Channel.endReceiveMessage())
-        return Err;
-
-      using HTraits = detail::HandlerTraits<HandlerT>;
-      using FuncReturn = typename Func::ReturnType;
-      auto Responder = [this,
-                        SeqNo](typename AHTraits::ResultType RetVal) -> Error {
-        return detail::respond<FuncReturn>(C, ResponseId, SeqNo,
-                                           std::move(RetVal));
-      };
-
-      return HTraits::unpackAndRunAsync(Handler, Responder, *Args);
-    };
-  }
-
-  ChannelT &C;
-
-  bool LazyAutoNegotiation;
-
-  RPCFunctionIdAllocator<FunctionIdT> FnIdAllocator;
-
-  FunctionIdT ResponseId;
-  std::map<std::string, FunctionIdT> LocalFunctionIds;
-  std::map<const char *, FunctionIdT> RemoteFunctionIds;
-
-  std::map<FunctionIdT, WrappedHandlerFn> Handlers;
-
-  std::mutex ResponsesMutex;
-  detail::SequenceNumberManager<SequenceNumberT> SequenceNumberMgr;
-  std::map<SequenceNumberT, std::unique_ptr<detail::ResponseHandler<ChannelT>>>
-      PendingResponses;
-};
-
-} // end namespace detail
-
-template <typename ChannelT, typename FunctionIdT = uint32_t,
-          typename SequenceNumberT = uint32_t>
-class MultiThreadedRPCEndpoint
-    : public detail::RPCEndpointBase<
-          MultiThreadedRPCEndpoint<ChannelT, FunctionIdT, SequenceNumberT>,
-          ChannelT, FunctionIdT, SequenceNumberT> {
-private:
-  using BaseClass = detail::RPCEndpointBase<
-      MultiThreadedRPCEndpoint<ChannelT, FunctionIdT, SequenceNumberT>,
-      ChannelT, FunctionIdT, SequenceNumberT>;
-
-public:
-  MultiThreadedRPCEndpoint(ChannelT &C, bool LazyAutoNegotiation)
-      : BaseClass(C, LazyAutoNegotiation) {}
-
-  /// Add a handler for the given RPC function.
-  /// This installs the given handler functor for the given RPCFunction, and
-  /// makes the RPC function available for negotiation/calling from the remote.
-  template <typename Func, typename HandlerT>
-  void addHandler(HandlerT Handler) {
-    return this->template addHandlerImpl<Func>(std::move(Handler));
-  }
-
-  /// Add a class-method as a handler.
-  template <typename Func, typename ClassT, typename RetT, typename... ArgTs>
-  void addHandler(ClassT &Object, RetT (ClassT::*Method)(ArgTs...)) {
-    addHandler<Func>(
-        detail::MemberFnWrapper<ClassT, RetT, ArgTs...>(Object, Method));
-  }
-
-  template <typename Func, typename HandlerT>
-  void addAsyncHandler(HandlerT Handler) {
-    return this->template addAsyncHandlerImpl<Func>(std::move(Handler));
-  }
-
-  /// Add a class-method as a handler.
-  template <typename Func, typename ClassT, typename RetT, typename... ArgTs>
-  void addAsyncHandler(ClassT &Object, RetT (ClassT::*Method)(ArgTs...)) {
-    addAsyncHandler<Func>(
-        detail::MemberFnWrapper<ClassT, RetT, ArgTs...>(Object, Method));
-  }
-
-  /// Return type for non-blocking call primitives.
-  template <typename Func>
-  using NonBlockingCallResult = typename detail::ResultTraits<
-      typename Func::ReturnType>::ReturnFutureType;
-
-  /// Call Func on Channel C. Does not block, does not call send. Returns a pair
-  /// of a future result and the sequence number assigned to the result.
-  ///
-  /// This utility function is primarily used for single-threaded mode support,
-  /// where the sequence number can be used to wait for the corresponding
-  /// result. In multi-threaded mode the appendCallNB method, which does not
-  /// return the sequence numeber, should be preferred.
-  template <typename Func, typename... ArgTs>
-  Expected<NonBlockingCallResult<Func>> appendCallNB(const ArgTs &...Args) {
-    using RTraits = detail::ResultTraits<typename Func::ReturnType>;
-    using ErrorReturn = typename RTraits::ErrorReturnType;
-    using ErrorReturnPromise = typename RTraits::ReturnPromiseType;
-
-    ErrorReturnPromise Promise;
-    auto FutureResult = Promise.get_future();
-
-    if (auto Err = this->template appendCallAsync<Func>(
-            [Promise = std::move(Promise)](ErrorReturn RetOrErr) mutable {
-              Promise.set_value(std::move(RetOrErr));
-              return Error::success();
-            },
-            Args...)) {
-      RTraits::consumeAbandoned(FutureResult.get());
-      return std::move(Err);
-    }
-    return std::move(FutureResult);
-  }
-
-  /// The same as appendCallNBWithSeq, except that it calls C.send() to
-  /// flush the channel after serializing the call.
-  template <typename Func, typename... ArgTs>
-  Expected<NonBlockingCallResult<Func>> callNB(const ArgTs &...Args) {
-    auto Result = appendCallNB<Func>(Args...);
-    if (!Result)
-      return Result;
-    if (auto Err = this->C.send()) {
-      this->abandonPendingResponses();
-      detail::ResultTraits<typename Func::ReturnType>::consumeAbandoned(
-          std::move(Result->get()));
-      return std::move(Err);
-    }
-    return Result;
-  }
-
-  /// Call Func on Channel C. Blocks waiting for a result. Returns an Error
-  /// for void functions or an Expected<T> for functions returning a T.
-  ///
-  /// This function is for use in threaded code where another thread is
-  /// handling responses and incoming calls.
-  template <typename Func, typename... ArgTs,
-            typename AltRetT = typename Func::ReturnType>
-  typename detail::ResultTraits<AltRetT>::ErrorReturnType
-  callB(const ArgTs &...Args) {
-    if (auto FutureResOrErr = callNB<Func>(Args...))
-      return FutureResOrErr->get();
-    else
-      return FutureResOrErr.takeError();
-  }
-
-  /// Handle incoming RPC calls.
-  Error handlerLoop() {
-    while (true)
-      if (auto Err = this->handleOne())
-        return Err;
-    return Error::success();
-  }
-};
-
-template <typename ChannelT, typename FunctionIdT = uint32_t,
-          typename SequenceNumberT = uint32_t>
-class SingleThreadedRPCEndpoint
-    : public detail::RPCEndpointBase<
-          SingleThreadedRPCEndpoint<ChannelT, FunctionIdT, SequenceNumberT>,
-          ChannelT, FunctionIdT, SequenceNumberT> {
-private:
-  using BaseClass = detail::RPCEndpointBase<
-      SingleThreadedRPCEndpoint<ChannelT, FunctionIdT, SequenceNumberT>,
-      ChannelT, FunctionIdT, SequenceNumberT>;
-
-public:
-  SingleThreadedRPCEndpoint(ChannelT &C, bool LazyAutoNegotiation)
-      : BaseClass(C, LazyAutoNegotiation) {}
-
-  template <typename Func, typename HandlerT>
-  void addHandler(HandlerT Handler) {
-    return this->template addHandlerImpl<Func>(std::move(Handler));
-  }
-
-  template <typename Func, typename ClassT, typename RetT, typename... ArgTs>
-  void addHandler(ClassT &Object, RetT (ClassT::*Method)(ArgTs...)) {
-    addHandler<Func>(
-        detail::MemberFnWrapper<ClassT, RetT, ArgTs...>(Object, Method));
-  }
-
-  template <typename Func, typename HandlerT>
-  void addAsyncHandler(HandlerT Handler) {
-    return this->template addAsyncHandlerImpl<Func>(std::move(Handler));
-  }
-
-  /// Add a class-method as a handler.
-  template <typename Func, typename ClassT, typename RetT, typename... ArgTs>
-  void addAsyncHandler(ClassT &Object, RetT (ClassT::*Method)(ArgTs...)) {
-    addAsyncHandler<Func>(
-        detail::MemberFnWrapper<ClassT, RetT, ArgTs...>(Object, Method));
-  }
-
-  template <typename Func, typename... ArgTs,
-            typename AltRetT = typename Func::ReturnType>
-  typename detail::ResultTraits<AltRetT>::ErrorReturnType
-  callB(const ArgTs &...Args) {
-    bool ReceivedResponse = false;
-    using AltRetTraits = detail::ResultTraits<AltRetT>;
-    using ResultType = typename AltRetTraits::ErrorReturnType;
-    ResultType Result = AltRetTraits::createBlankErrorReturnValue();
-
-    // We have to 'Check' result (which we know is in a success state at this
-    // point) so that it can be overwritten in the async handler.
-    (void)!!Result;
-
-    if (Error Err = this->template appendCallAsync<Func>(
-            [&](ResultType R) {
-              Result = std::move(R);
-              ReceivedResponse = true;
-              return Error::success();
-            },
-            Args...)) {
-      AltRetTraits::consumeAbandoned(std::move(Result));
-      return AltRetTraits::returnError(std::move(Err));
-    }
-
-    if (Error Err = this->C.send()) {
-      AltRetTraits::consumeAbandoned(std::move(Result));
-      return AltRetTraits::returnError(std::move(Err));
-    }
-
-    while (!ReceivedResponse) {
-      if (Error Err = this->handleOne()) {
-        AltRetTraits::consumeAbandoned(std::move(Result));
-        return AltRetTraits::returnError(std::move(Err));
-      }
-    }
-
-    return Result;
-  }
-};
-
-/// Asynchronous dispatch for a function on an RPC endpoint.
-template <typename RPCClass, typename Func> class RPCAsyncDispatch {
-public:
-  RPCAsyncDispatch(RPCClass &Endpoint) : Endpoint(Endpoint) {}
-
-  template <typename HandlerT, typename... ArgTs>
-  Error operator()(HandlerT Handler, const ArgTs &...Args) const {
-    return Endpoint.template appendCallAsync<Func>(std::move(Handler), Args...);
-  }
-
-private:
-  RPCClass &Endpoint;
-};
-
-/// Construct an asynchronous dispatcher from an RPC endpoint and a Func.
-template <typename Func, typename RPCEndpointT>
-RPCAsyncDispatch<RPCEndpointT, Func> rpcAsyncDispatch(RPCEndpointT &Endpoint) {
-  return RPCAsyncDispatch<RPCEndpointT, Func>(Endpoint);
-}
-
-/// Allows a set of asynchrounous calls to be dispatched, and then
-///        waited on as a group.
-class ParallelCallGroup {
-public:
-  ParallelCallGroup() = default;
-  ParallelCallGroup(const ParallelCallGroup &) = delete;
-  ParallelCallGroup &operator=(const ParallelCallGroup &) = delete;
-
-  /// Make as asynchronous call.
-  template <typename AsyncDispatcher, typename HandlerT, typename... ArgTs>
-  Error call(const AsyncDispatcher &AsyncDispatch, HandlerT Handler,
-             const ArgTs &...Args) {
-    // Increment the count of outstanding calls. This has to happen before
-    // we invoke the call, as the handler may (depending on scheduling)
-    // be run immediately on another thread, and we don't want the decrement
-    // in the wrapped handler below to run before the increment.
-    {
-      std::unique_lock<std::mutex> Lock(M);
-      ++NumOutstandingCalls;
-    }
-
-    // Wrap the user handler in a lambda that will decrement the
-    // outstanding calls count, then poke the condition variable.
-    using ArgType = typename detail::ResponseHandlerArg<
-        typename detail::HandlerTraits<HandlerT>::Type>::ArgType;
-    auto WrappedHandler = [this, Handler = std::move(Handler)](ArgType Arg) {
-      auto Err = Handler(std::move(Arg));
-      std::unique_lock<std::mutex> Lock(M);
-      --NumOutstandingCalls;
-      CV.notify_all();
-      return Err;
-    };
-
-    return AsyncDispatch(std::move(WrappedHandler), Args...);
-  }
-
-  /// Blocks until all calls have been completed and their return value
-  ///        handlers run.
-  void wait() {
-    std::unique_lock<std::mutex> Lock(M);
-    while (NumOutstandingCalls > 0)
-      CV.wait(Lock);
-  }
-
-private:
-  std::mutex M;
-  std::condition_variable CV;
-  uint32_t NumOutstandingCalls = 0;
-};
-
-/// Convenience class for grouping RPCFunctions into APIs that can be
-///        negotiated as a block.
-///
-template <typename... Funcs> class APICalls {
-public:
-  /// Test whether this API contains Function F.
-  template <typename F> class Contains {
-  public:
-    static const bool value = false;
-  };
-
-  /// Negotiate all functions in this API.
-  template <typename RPCEndpoint> static Error negotiate(RPCEndpoint &R) {
-    return Error::success();
-  }
-};
-
-template <typename Func, typename... Funcs> class APICalls<Func, Funcs...> {
-public:
-  template <typename F> class Contains {
-  public:
-    static const bool value = std::is_same<F, Func>::value |
-                              APICalls<Funcs...>::template Contains<F>::value;
-  };
-
-  template <typename RPCEndpoint> static Error negotiate(RPCEndpoint &R) {
-    if (auto Err = R.template negotiateFunction<Func>())
-      return Err;
-    return APICalls<Funcs...>::negotiate(R);
-  }
-};
-
-template <typename... InnerFuncs, typename... Funcs>
-class APICalls<APICalls<InnerFuncs...>, Funcs...> {
-public:
-  template <typename F> class Contains {
-  public:
-    static const bool value =
-        APICalls<InnerFuncs...>::template Contains<F>::value |
-        APICalls<Funcs...>::template Contains<F>::value;
-  };
-
-  template <typename RPCEndpoint> static Error negotiate(RPCEndpoint &R) {
-    if (auto Err = APICalls<InnerFuncs...>::negotiate(R))
-      return Err;
-    return APICalls<Funcs...>::negotiate(R);
-  }
-};
-
-} // end namespace shared
-} // end namespace orc
-} // end namespace llvm
-
-#endif // LLVM_EXECUTIONENGINE_ORC_SHARED_RPCUTILS_H
diff --git a/gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/Shared/RawByteChannel.h b/gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/Shared/RawByteChannel.h
deleted file mode 100644
index 2ee47193925..00000000000
--- a/gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/Shared/RawByteChannel.h
+++ /dev/null
@@ -1,183 +0,0 @@
-//===- RawByteChannel.h -----------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_EXECUTIONENGINE_ORC_SHARED_RAWBYTECHANNEL_H
-#define LLVM_EXECUTIONENGINE_ORC_SHARED_RAWBYTECHANNEL_H
-
-#include "llvm/ADT/StringRef.h"
-#include "llvm/ExecutionEngine/Orc/Shared/Serialization.h"
-#include "llvm/Support/Endian.h"
-#include "llvm/Support/Error.h"
-#include <cstdint>
-#include <mutex>
-#include <string>
-#include <type_traits>
-
-namespace llvm {
-namespace orc {
-namespace shared {
-
-/// Interface for byte-streams to be used with ORC Serialization.
-class RawByteChannel {
-public:
-  virtual ~RawByteChannel() = default;
-
-  /// Read Size bytes from the stream into *Dst.
-  virtual Error readBytes(char *Dst, unsigned Size) = 0;
-
-  /// Read size bytes from *Src and append them to the stream.
-  virtual Error appendBytes(const char *Src, unsigned Size) = 0;
-
-  /// Flush the stream if possible.
-  virtual Error send() = 0;
-
-  /// Notify the channel that we're starting a message send.
-  /// Locks the channel for writing.
-  template <typename FunctionIdT, typename SequenceIdT>
-  Error startSendMessage(const FunctionIdT &FnId, const SequenceIdT &SeqNo) {
-    writeLock.lock();
-    if (auto Err = serializeSeq(*this, FnId, SeqNo)) {
-      writeLock.unlock();
-      return Err;
-    }
-    return Error::success();
-  }
-
-  /// Notify the channel that we're ending a message send.
-  /// Unlocks the channel for writing.
-  Error endSendMessage() {
-    writeLock.unlock();
-    return Error::success();
-  }
-
-  /// Notify the channel that we're starting a message receive.
-  /// Locks the channel for reading.
-  template <typename FunctionIdT, typename SequenceNumberT>
-  Error startReceiveMessage(FunctionIdT &FnId, SequenceNumberT &SeqNo) {
-    readLock.lock();
-    if (auto Err = deserializeSeq(*this, FnId, SeqNo)) {
-      readLock.unlock();
-      return Err;
-    }
-    return Error::success();
-  }
-
-  /// Notify the channel that we're ending a message receive.
-  /// Unlocks the channel for reading.
-  Error endReceiveMessage() {
-    readLock.unlock();
-    return Error::success();
-  }
-
-  /// Get the lock for stream reading.
-  std::mutex &getReadLock() { return readLock; }
-
-  /// Get the lock for stream writing.
-  std::mutex &getWriteLock() { return writeLock; }
-
-private:
-  std::mutex readLock, writeLock;
-};
-
-template <typename ChannelT, typename T>
-class SerializationTraits<
-    ChannelT, T, T,
-    std::enable_if_t<
-        std::is_base_of<RawByteChannel, ChannelT>::value &&
-        (std::is_same<T, uint8_t>::value || std::is_same<T, int8_t>::value ||
-         std::is_same<T, uint16_t>::value || std::is_same<T, int16_t>::value ||
-         std::is_same<T, uint32_t>::value || std::is_same<T, int32_t>::value ||
-         std::is_same<T, uint64_t>::value || std::is_same<T, int64_t>::value ||
-         std::is_same<T, char>::value)>> {
-public:
-  static Error serialize(ChannelT &C, T V) {
-    support::endian::byte_swap<T, support::big>(V);
-    return C.appendBytes(reinterpret_cast<const char *>(&V), sizeof(T));
-  };
-
-  static Error deserialize(ChannelT &C, T &V) {
-    if (auto Err = C.readBytes(reinterpret_cast<char *>(&V), sizeof(T)))
-      return Err;
-    support::endian::byte_swap<T, support::big>(V);
-    return Error::success();
-  };
-};
-
-template <typename ChannelT>
-class SerializationTraits<
-    ChannelT, bool, bool,
-    std::enable_if_t<std::is_base_of<RawByteChannel, ChannelT>::value>> {
-public:
-  static Error serialize(ChannelT &C, bool V) {
-    uint8_t Tmp = V ? 1 : 0;
-    if (auto Err = C.appendBytes(reinterpret_cast<const char *>(&Tmp), 1))
-      return Err;
-    return Error::success();
-  }
-
-  static Error deserialize(ChannelT &C, bool &V) {
-    uint8_t Tmp = 0;
-    if (auto Err = C.readBytes(reinterpret_cast<char *>(&Tmp), 1))
-      return Err;
-    V = Tmp != 0;
-    return Error::success();
-  }
-};
-
-template <typename ChannelT>
-class SerializationTraits<
-    ChannelT, std::string, StringRef,
-    std::enable_if_t<std::is_base_of<RawByteChannel, ChannelT>::value>> {
-public:
-  /// Serialization channel serialization for std::strings.
-  static Error serialize(RawByteChannel &C, StringRef S) {
-    if (auto Err = serializeSeq(C, static_cast<uint64_t>(S.size())))
-      return Err;
-    return C.appendBytes((const char *)S.data(), S.size());
-  }
-};
-
-template <typename ChannelT, typename T>
-class SerializationTraits<
-    ChannelT, std::string, T,
-    std::enable_if_t<std::is_base_of<RawByteChannel, ChannelT>::value &&
-                     (std::is_same<T, const char *>::value ||
-                      std::is_same<T, char *>::value)>> {
-public:
-  static Error serialize(RawByteChannel &C, const char *S) {
-    return SerializationTraits<ChannelT, std::string, StringRef>::serialize(C,
-                                                                            S);
-  }
-};
-
-template <typename ChannelT>
-class SerializationTraits<
-    ChannelT, std::string, std::string,
-    std::enable_if_t<std::is_base_of<RawByteChannel, ChannelT>::value>> {
-public:
-  /// Serialization channel serialization for std::strings.
-  static Error serialize(RawByteChannel &C, const std::string &S) {
-    return SerializationTraits<ChannelT, std::string, StringRef>::serialize(C,
-                                                                            S);
-  }
-
-  /// Serialization channel deserialization for std::strings.
-  static Error deserialize(RawByteChannel &C, std::string &S) {
-    uint64_t Count = 0;
-    if (auto Err = deserializeSeq(C, Count))
-      return Err;
-    S.resize(Count);
-    return C.readBytes(&S[0], Count);
-  }
-};
-
-} // end namespace shared
-} // end namespace orc
-} // end namespace llvm
-
-#endif // LLVM_EXECUTIONENGINE_ORC_SHARED_RAWBYTECHANNEL_H
diff --git a/gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/Shared/Serialization.h b/gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/Shared/Serialization.h
deleted file mode 100644
index 0ea483ba2ab..00000000000
--- a/gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/Shared/Serialization.h
+++ /dev/null
@@ -1,769 +0,0 @@
-//===- Serialization.h ------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_EXECUTIONENGINE_ORC_SHARED_SERIALIZATION_H
-#define LLVM_EXECUTIONENGINE_ORC_SHARED_SERIALIZATION_H
-
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/DenseMap.h"
-#include "llvm/ExecutionEngine/Orc/Shared/OrcError.h"
-#include "llvm/Support/thread.h"
-#include <map>
-#include <mutex>
-#include <set>
-#include <sstream>
-#include <string>
-#include <vector>
-
-namespace llvm {
-namespace orc {
-namespace shared {
-
-template <typename T> class SerializationTypeName;
-
-/// TypeNameSequence is a utility for rendering sequences of types to a string
-/// by rendering each type, separated by ", ".
-template <typename... ArgTs> class SerializationTypeNameSequence {};
-
-/// Render an empty TypeNameSequence to an ostream.
-template <typename OStream>
-OStream &operator<<(OStream &OS, const SerializationTypeNameSequence<> &V) {
-  return OS;
-}
-
-/// Render a TypeNameSequence of a single type to an ostream.
-template <typename OStream, typename ArgT>
-OStream &operator<<(OStream &OS, const SerializationTypeNameSequence<ArgT> &V) {
-  OS << SerializationTypeName<ArgT>::getName();
-  return OS;
-}
-
-/// Render a TypeNameSequence of more than one type to an ostream.
-template <typename OStream, typename ArgT1, typename ArgT2, typename... ArgTs>
-OStream &
-operator<<(OStream &OS,
-           const SerializationTypeNameSequence<ArgT1, ArgT2, ArgTs...> &V) {
-  OS << SerializationTypeName<ArgT1>::getName() << ", "
-     << SerializationTypeNameSequence<ArgT2, ArgTs...>();
-  return OS;
-}
-
-template <> class SerializationTypeName<void> {
-public:
-  static const char *getName() { return "void"; }
-};
-
-template <> class SerializationTypeName<int8_t> {
-public:
-  static const char *getName() { return "int8_t"; }
-};
-
-template <> class SerializationTypeName<uint8_t> {
-public:
-  static const char *getName() { return "uint8_t"; }
-};
-
-template <> class SerializationTypeName<int16_t> {
-public:
-  static const char *getName() { return "int16_t"; }
-};
-
-template <> class SerializationTypeName<uint16_t> {
-public:
-  static const char *getName() { return "uint16_t"; }
-};
-
-template <> class SerializationTypeName<int32_t> {
-public:
-  static const char *getName() { return "int32_t"; }
-};
-
-template <> class SerializationTypeName<uint32_t> {
-public:
-  static const char *getName() { return "uint32_t"; }
-};
-
-template <> class SerializationTypeName<int64_t> {
-public:
-  static const char *getName() { return "int64_t"; }
-};
-
-template <> class SerializationTypeName<uint64_t> {
-public:
-  static const char *getName() { return "uint64_t"; }
-};
-
-template <> class SerializationTypeName<bool> {
-public:
-  static const char *getName() { return "bool"; }
-};
-
-template <> class SerializationTypeName<std::string> {
-public:
-  static const char *getName() { return "std::string"; }
-};
-
-template <> class SerializationTypeName<Error> {
-public:
-  static const char *getName() { return "Error"; }
-};
-
-template <typename T> class SerializationTypeName<Expected<T>> {
-public:
-  static const char *getName() {
-    static std::string Name = [] {
-      std::string Name;
-      raw_string_ostream(Name)
-          << "Expected<" << SerializationTypeNameSequence<T>() << ">";
-      return Name;
-    }();
-    return Name.data();
-  }
-};
-
-template <typename T1, typename T2>
-class SerializationTypeName<std::pair<T1, T2>> {
-public:
-  static const char *getName() {
-    static std::string Name = [] {
-      std::string Name;
-      raw_string_ostream(Name)
-          << "std::pair<" << SerializationTypeNameSequence<T1, T2>() << ">";
-      return Name;
-    }();
-    return Name.data();
-  }
-};
-
-template <typename... ArgTs> class SerializationTypeName<std::tuple<ArgTs...>> {
-public:
-  static const char *getName() {
-    static std::string Name = [] {
-      std::string Name;
-      raw_string_ostream(Name)
-          << "std::tuple<" << SerializationTypeNameSequence<ArgTs...>() << ">";
-      return Name;
-    }();
-    return Name.data();
-  }
-};
-
-template <typename T> class SerializationTypeName<Optional<T>> {
-public:
-  static const char *getName() {
-    static std::string Name = [] {
-      std::string Name;
-      raw_string_ostream(Name)
-          << "Optional<" << SerializationTypeName<T>::getName() << ">";
-      return Name;
-    }();
-    return Name.data();
-  }
-};
-
-template <typename T> class SerializationTypeName<std::vector<T>> {
-public:
-  static const char *getName() {
-    static std::string Name = [] {
-      std::string Name;
-      raw_string_ostream(Name)
-          << "std::vector<" << SerializationTypeName<T>::getName() << ">";
-      return Name;
-    }();
-    return Name.data();
-  }
-};
-
-template <typename T> class SerializationTypeName<std::set<T>> {
-public:
-  static const char *getName() {
-    static std::string Name = [] {
-      std::string Name;
-      raw_string_ostream(Name)
-          << "std::set<" << SerializationTypeName<T>::getName() << ">";
-      return Name;
-    }();
-    return Name.data();
-  }
-};
-
-template <typename K, typename V> class SerializationTypeName<std::map<K, V>> {
-public:
-  static const char *getName() {
-    static std::string Name = [] {
-      std::string Name;
-      raw_string_ostream(Name)
-          << "std::map<" << SerializationTypeNameSequence<K, V>() << ">";
-      return Name;
-    }();
-    return Name.data();
-  }
-};
-
-/// The SerializationTraits<ChannelT, T> class describes how to serialize and
-/// deserialize an instance of type T to/from an abstract channel of type
-/// ChannelT. It also provides a representation of the type's name via the
-/// getName method.
-///
-/// Specializations of this class should provide the following functions:
-///
-///   @code{.cpp}
-///
-///   static const char* getName();
-///   static Error serialize(ChannelT&, const T&);
-///   static Error deserialize(ChannelT&, T&);
-///
-///   @endcode
-///
-/// The third argument of SerializationTraits is intended to support SFINAE.
-/// E.g.:
-///
-///   @code{.cpp}
-///
-///   class MyVirtualChannel { ... };
-///
-///   template <DerivedChannelT>
-///   class SerializationTraits<DerivedChannelT, bool,
-///         std::enable_if_t<
-///           std::is_base_of<VirtChannel, DerivedChannel>::value
-///         >> {
-///   public:
-///     static const char* getName() { ... };
-///   }
-///
-///   @endcode
-template <typename ChannelT, typename WireType,
-          typename ConcreteType = WireType, typename = void>
-class SerializationTraits;
-
-template <typename ChannelT> class SequenceTraits {
-public:
-  static Error emitSeparator(ChannelT &C) { return Error::success(); }
-  static Error consumeSeparator(ChannelT &C) { return Error::success(); }
-};
-
-/// Utility class for serializing sequences of values of varying types.
-/// Specializations of this class contain 'serialize' and 'deserialize' methods
-/// for the given channel. The ArgTs... list will determine the "over-the-wire"
-/// types to be serialized. The serialize and deserialize methods take a list
-/// CArgTs... ("caller arg types") which must be the same length as ArgTs...,
-/// but may be different types from ArgTs, provided that for each CArgT there
-/// is a SerializationTraits specialization
-/// SerializeTraits<ChannelT, ArgT, CArgT> with methods that can serialize the
-/// caller argument to over-the-wire value.
-template <typename ChannelT, typename... ArgTs> class SequenceSerialization;
-
-template <typename ChannelT> class SequenceSerialization<ChannelT> {
-public:
-  static Error serialize(ChannelT &C) { return Error::success(); }
-  static Error deserialize(ChannelT &C) { return Error::success(); }
-};
-
-template <typename ChannelT, typename ArgT>
-class SequenceSerialization<ChannelT, ArgT> {
-public:
-  template <typename CArgT> static Error serialize(ChannelT &C, CArgT &&CArg) {
-    return SerializationTraits<ChannelT, ArgT, std::decay_t<CArgT>>::serialize(
-        C, std::forward<CArgT>(CArg));
-  }
-
-  template <typename CArgT> static Error deserialize(ChannelT &C, CArgT &CArg) {
-    return SerializationTraits<ChannelT, ArgT, CArgT>::deserialize(C, CArg);
-  }
-};
-
-template <typename ChannelT, typename ArgT, typename... ArgTs>
-class SequenceSerialization<ChannelT, ArgT, ArgTs...> {
-public:
-  template <typename CArgT, typename... CArgTs>
-  static Error serialize(ChannelT &C, CArgT &&CArg, CArgTs &&...CArgs) {
-    if (auto Err =
-            SerializationTraits<ChannelT, ArgT, std::decay_t<CArgT>>::serialize(
-                C, std::forward<CArgT>(CArg)))
-      return Err;
-    if (auto Err = SequenceTraits<ChannelT>::emitSeparator(C))
-      return Err;
-    return SequenceSerialization<ChannelT, ArgTs...>::serialize(
-        C, std::forward<CArgTs>(CArgs)...);
-  }
-
-  template <typename CArgT, typename... CArgTs>
-  static Error deserialize(ChannelT &C, CArgT &CArg, CArgTs &...CArgs) {
-    if (auto Err =
-            SerializationTraits<ChannelT, ArgT, CArgT>::deserialize(C, CArg))
-      return Err;
-    if (auto Err = SequenceTraits<ChannelT>::consumeSeparator(C))
-      return Err;
-    return SequenceSerialization<ChannelT, ArgTs...>::deserialize(C, CArgs...);
-  }
-};
-
-template <typename ChannelT, typename... ArgTs>
-Error serializeSeq(ChannelT &C, ArgTs &&...Args) {
-  return SequenceSerialization<ChannelT, std::decay_t<ArgTs>...>::serialize(
-      C, std::forward<ArgTs>(Args)...);
-}
-
-template <typename ChannelT, typename... ArgTs>
-Error deserializeSeq(ChannelT &C, ArgTs &...Args) {
-  return SequenceSerialization<ChannelT, ArgTs...>::deserialize(C, Args...);
-}
-
-template <typename ChannelT> class SerializationTraits<ChannelT, Error> {
-public:
-  using WrappedErrorSerializer =
-      std::function<Error(ChannelT &C, const ErrorInfoBase &)>;
-
-  using WrappedErrorDeserializer =
-      std::function<Error(ChannelT &C, Error &Err)>;
-
-  template <typename ErrorInfoT, typename SerializeFtor,
-            typename DeserializeFtor>
-  static void registerErrorType(std::string Name, SerializeFtor Serialize,
-                                DeserializeFtor Deserialize) {
-    assert(!Name.empty() &&
-           "The empty string is reserved for the Success value");
-
-    const std::string *KeyName = nullptr;
-    {
-      // We're abusing the stability of std::map here: We take a reference to
-      // the key of the deserializers map to save us from duplicating the string
-      // in the serializer. This should be changed to use a stringpool if we
-      // switch to a map type that may move keys in memory.
-      std::lock_guard<std::recursive_mutex> Lock(DeserializersMutex);
-      auto I = Deserializers.insert(
-          Deserializers.begin(),
-          std::make_pair(std::move(Name), std::move(Deserialize)));
-      KeyName = &I->first;
-    }
-
-    {
-      assert(KeyName != nullptr && "No keyname pointer");
-      std::lock_guard<std::recursive_mutex> Lock(SerializersMutex);
-      Serializers[ErrorInfoT::classID()] =
-          [KeyName, Serialize = std::move(Serialize)](
-              ChannelT &C, const ErrorInfoBase &EIB) -> Error {
-        assert(EIB.dynamicClassID() == ErrorInfoT::classID() &&
-               "Serializer called for wrong error type");
-        if (auto Err = serializeSeq(C, *KeyName))
-          return Err;
-        return Serialize(C, static_cast<const ErrorInfoT &>(EIB));
-      };
-    }
-  }
-
-  static Error serialize(ChannelT &C, Error &&Err) {
-    std::lock_guard<std::recursive_mutex> Lock(SerializersMutex);
-
-    if (!Err)
-      return serializeSeq(C, std::string());
-
-    return handleErrors(std::move(Err), [&C](const ErrorInfoBase &EIB) {
-      auto SI = Serializers.find(EIB.dynamicClassID());
-      if (SI == Serializers.end())
-        return serializeAsStringError(C, EIB);
-      return (SI->second)(C, EIB);
-    });
-  }
-
-  static Error deserialize(ChannelT &C, Error &Err) {
-    std::lock_guard<std::recursive_mutex> Lock(DeserializersMutex);
-
-    std::string Key;
-    if (auto Err = deserializeSeq(C, Key))
-      return Err;
-
-    if (Key.empty()) {
-      ErrorAsOutParameter EAO(&Err);
-      Err = Error::success();
-      return Error::success();
-    }
-
-    auto DI = Deserializers.find(Key);
-    assert(DI != Deserializers.end() && "No deserializer for error type");
-    return (DI->second)(C, Err);
-  }
-
-private:
-  static Error serializeAsStringError(ChannelT &C, const ErrorInfoBase &EIB) {
-    std::string ErrMsg;
-    {
-      raw_string_ostream ErrMsgStream(ErrMsg);
-      EIB.log(ErrMsgStream);
-    }
-    return serialize(C, make_error<StringError>(std::move(ErrMsg),
-                                                inconvertibleErrorCode()));
-  }
-
-  static std::recursive_mutex SerializersMutex;
-  static std::recursive_mutex DeserializersMutex;
-  static std::map<const void *, WrappedErrorSerializer> Serializers;
-  static std::map<std::string, WrappedErrorDeserializer> Deserializers;
-};
-
-template <typename ChannelT>
-std::recursive_mutex SerializationTraits<ChannelT, Error>::SerializersMutex;
-
-template <typename ChannelT>
-std::recursive_mutex SerializationTraits<ChannelT, Error>::DeserializersMutex;
-
-template <typename ChannelT>
-std::map<const void *,
-         typename SerializationTraits<ChannelT, Error>::WrappedErrorSerializer>
-    SerializationTraits<ChannelT, Error>::Serializers;
-
-template <typename ChannelT>
-std::map<std::string, typename SerializationTraits<
-                          ChannelT, Error>::WrappedErrorDeserializer>
-    SerializationTraits<ChannelT, Error>::Deserializers;
-
-/// Registers a serializer and deserializer for the given error type on the
-/// given channel type.
-template <typename ChannelT, typename ErrorInfoT, typename SerializeFtor,
-          typename DeserializeFtor>
-void registerErrorSerialization(std::string Name, SerializeFtor &&Serialize,
-                                DeserializeFtor &&Deserialize) {
-  SerializationTraits<ChannelT, Error>::template registerErrorType<ErrorInfoT>(
-      std::move(Name), std::forward<SerializeFtor>(Serialize),
-      std::forward<DeserializeFtor>(Deserialize));
-}
-
-/// Registers serialization/deserialization for StringError.
-template <typename ChannelT> void registerStringError() {
-  static bool AlreadyRegistered = false;
-  if (!AlreadyRegistered) {
-    registerErrorSerialization<ChannelT, StringError>(
-        "StringError",
-        [](ChannelT &C, const StringError &SE) {
-          return serializeSeq(C, SE.getMessage());
-        },
-        [](ChannelT &C, Error &Err) -> Error {
-          ErrorAsOutParameter EAO(&Err);
-          std::string Msg;
-          if (auto E2 = deserializeSeq(C, Msg))
-            return E2;
-          Err = make_error<StringError>(
-              std::move(Msg),
-              orcError(OrcErrorCode::UnknownErrorCodeFromRemote));
-          return Error::success();
-        });
-    AlreadyRegistered = true;
-  }
-}
-
-/// SerializationTraits for Expected<T1> from an Expected<T2>.
-template <typename ChannelT, typename T1, typename T2>
-class SerializationTraits<ChannelT, Expected<T1>, Expected<T2>> {
-public:
-  static Error serialize(ChannelT &C, Expected<T2> &&ValOrErr) {
-    if (ValOrErr) {
-      if (auto Err = serializeSeq(C, true))
-        return Err;
-      return SerializationTraits<ChannelT, T1, T2>::serialize(C, *ValOrErr);
-    }
-    if (auto Err = serializeSeq(C, false))
-      return Err;
-    return serializeSeq(C, ValOrErr.takeError());
-  }
-
-  static Error deserialize(ChannelT &C, Expected<T2> &ValOrErr) {
-    ExpectedAsOutParameter<T2> EAO(&ValOrErr);
-    bool HasValue;
-    if (auto Err = deserializeSeq(C, HasValue))
-      return Err;
-    if (HasValue)
-      return SerializationTraits<ChannelT, T1, T2>::deserialize(C, *ValOrErr);
-    Error Err = Error::success();
-    if (auto E2 = deserializeSeq(C, Err))
-      return E2;
-    ValOrErr = std::move(Err);
-    return Error::success();
-  }
-};
-
-/// SerializationTraits for Expected<T1> from a T2.
-template <typename ChannelT, typename T1, typename T2>
-class SerializationTraits<ChannelT, Expected<T1>, T2> {
-public:
-  static Error serialize(ChannelT &C, T2 &&Val) {
-    return serializeSeq(C, Expected<T2>(std::forward<T2>(Val)));
-  }
-};
-
-/// SerializationTraits for Expected<T1> from an Error.
-template <typename ChannelT, typename T>
-class SerializationTraits<ChannelT, Expected<T>, Error> {
-public:
-  static Error serialize(ChannelT &C, Error &&Err) {
-    return serializeSeq(C, Expected<T>(std::move(Err)));
-  }
-};
-
-/// SerializationTraits default specialization for std::pair.
-template <typename ChannelT, typename T1, typename T2, typename T3, typename T4>
-class SerializationTraits<ChannelT, std::pair<T1, T2>, std::pair<T3, T4>> {
-public:
-  static Error serialize(ChannelT &C, const std::pair<T3, T4> &V) {
-    if (auto Err = SerializationTraits<ChannelT, T1, T3>::serialize(C, V.first))
-      return Err;
-    return SerializationTraits<ChannelT, T2, T4>::serialize(C, V.second);
-  }
-
-  static Error deserialize(ChannelT &C, std::pair<T3, T4> &V) {
-    if (auto Err =
-            SerializationTraits<ChannelT, T1, T3>::deserialize(C, V.first))
-      return Err;
-    return SerializationTraits<ChannelT, T2, T4>::deserialize(C, V.second);
-  }
-};
-
-/// SerializationTraits default specialization for std::tuple.
-template <typename ChannelT, typename... ArgTs>
-class SerializationTraits<ChannelT, std::tuple<ArgTs...>> {
-public:
-  /// RPC channel serialization for std::tuple.
-  static Error serialize(ChannelT &C, const std::tuple<ArgTs...> &V) {
-    return serializeTupleHelper(C, V, std::index_sequence_for<ArgTs...>());
-  }
-
-  /// RPC channel deserialization for std::tuple.
-  static Error deserialize(ChannelT &C, std::tuple<ArgTs...> &V) {
-    return deserializeTupleHelper(C, V, std::index_sequence_for<ArgTs...>());
-  }
-
-private:
-  // Serialization helper for std::tuple.
-  template <size_t... Is>
-  static Error serializeTupleHelper(ChannelT &C, const std::tuple<ArgTs...> &V,
-                                    std::index_sequence<Is...> _) {
-    return serializeSeq(C, std::get<Is>(V)...);
-  }
-
-  // Serialization helper for std::tuple.
-  template <size_t... Is>
-  static Error deserializeTupleHelper(ChannelT &C, std::tuple<ArgTs...> &V,
-                                      std::index_sequence<Is...> _) {
-    return deserializeSeq(C, std::get<Is>(V)...);
-  }
-};
-
-template <typename ChannelT, typename T>
-class SerializationTraits<ChannelT, Optional<T>> {
-public:
-  /// Serialize an Optional<T>.
-  static Error serialize(ChannelT &C, const Optional<T> &O) {
-    if (auto Err = serializeSeq(C, O != None))
-      return Err;
-    if (O)
-      if (auto Err = serializeSeq(C, *O))
-        return Err;
-    return Error::success();
-  }
-
-  /// Deserialize an Optional<T>.
-  static Error deserialize(ChannelT &C, Optional<T> &O) {
-    bool HasValue = false;
-    if (auto Err = deserializeSeq(C, HasValue))
-      return Err;
-    if (HasValue)
-      if (auto Err = deserializeSeq(C, *O))
-        return Err;
-    return Error::success();
-  };
-};
-
-/// SerializationTraits default specialization for std::vector.
-template <typename ChannelT, typename T>
-class SerializationTraits<ChannelT, std::vector<T>> {
-public:
-  /// Serialize a std::vector<T> from std::vector<T>.
-  static Error serialize(ChannelT &C, const std::vector<T> &V) {
-    if (auto Err = serializeSeq(C, static_cast<uint64_t>(V.size())))
-      return Err;
-
-    for (const auto &E : V)
-      if (auto Err = serializeSeq(C, E))
-        return Err;
-
-    return Error::success();
-  }
-
-  /// Deserialize a std::vector<T> to a std::vector<T>.
-  static Error deserialize(ChannelT &C, std::vector<T> &V) {
-    assert(V.empty() &&
-           "Expected default-constructed vector to deserialize into");
-
-    uint64_t Count = 0;
-    if (auto Err = deserializeSeq(C, Count))
-      return Err;
-
-    V.resize(Count);
-    for (auto &E : V)
-      if (auto Err = deserializeSeq(C, E))
-        return Err;
-
-    return Error::success();
-  }
-};
-
-/// Enable vector serialization from an ArrayRef.
-template <typename ChannelT, typename T>
-class SerializationTraits<ChannelT, std::vector<T>, ArrayRef<T>> {
-public:
-  static Error serialize(ChannelT &C, ArrayRef<T> V) {
-    if (auto Err = serializeSeq(C, static_cast<uint64_t>(V.size())))
-      return Err;
-
-    for (const auto &E : V)
-      if (auto Err = serializeSeq(C, E))
-        return Err;
-
-    return Error::success();
-  }
-};
-
-template <typename ChannelT, typename T, typename T2>
-class SerializationTraits<ChannelT, std::set<T>, std::set<T2>> {
-public:
-  /// Serialize a std::set<T> from std::set<T2>.
-  static Error serialize(ChannelT &C, const std::set<T2> &S) {
-    if (auto Err = serializeSeq(C, static_cast<uint64_t>(S.size())))
-      return Err;
-
-    for (const auto &E : S)
-      if (auto Err = SerializationTraits<ChannelT, T, T2>::serialize(C, E))
-        return Err;
-
-    return Error::success();
-  }
-
-  /// Deserialize a std::set<T> to a std::set<T>.
-  static Error deserialize(ChannelT &C, std::set<T2> &S) {
-    assert(S.empty() && "Expected default-constructed set to deserialize into");
-
-    uint64_t Count = 0;
-    if (auto Err = deserializeSeq(C, Count))
-      return Err;
-
-    while (Count-- != 0) {
-      T2 Val;
-      if (auto Err = SerializationTraits<ChannelT, T, T2>::deserialize(C, Val))
-        return Err;
-
-      auto Added = S.insert(Val).second;
-      if (!Added)
-        return make_error<StringError>("Duplicate element in deserialized set",
-                                       orcError(OrcErrorCode::UnknownORCError));
-    }
-
-    return Error::success();
-  }
-};
-
-template <typename ChannelT, typename K, typename V, typename K2, typename V2>
-class SerializationTraits<ChannelT, std::map<K, V>, std::map<K2, V2>> {
-public:
-  /// Serialize a std::map<K, V> from std::map<K2, V2>.
-  static Error serialize(ChannelT &C, const std::map<K2, V2> &M) {
-    if (auto Err = serializeSeq(C, static_cast<uint64_t>(M.size())))
-      return Err;
-
-    for (const auto &E : M) {
-      if (auto Err =
-              SerializationTraits<ChannelT, K, K2>::serialize(C, E.first))
-        return Err;
-      if (auto Err =
-              SerializationTraits<ChannelT, V, V2>::serialize(C, E.second))
-        return Err;
-    }
-
-    return Error::success();
-  }
-
-  /// Deserialize a std::map<K, V> to a std::map<K, V>.
-  static Error deserialize(ChannelT &C, std::map<K2, V2> &M) {
-    assert(M.empty() && "Expected default-constructed map to deserialize into");
-
-    uint64_t Count = 0;
-    if (auto Err = deserializeSeq(C, Count))
-      return Err;
-
-    while (Count-- != 0) {
-      std::pair<K2, V2> Val;
-      if (auto Err =
-              SerializationTraits<ChannelT, K, K2>::deserialize(C, Val.first))
-        return Err;
-
-      if (auto Err =
-              SerializationTraits<ChannelT, V, V2>::deserialize(C, Val.second))
-        return Err;
-
-      auto Added = M.insert(Val).second;
-      if (!Added)
-        return make_error<StringError>("Duplicate element in deserialized map",
-                                       orcError(OrcErrorCode::UnknownORCError));
-    }
-
-    return Error::success();
-  }
-};
-
-template <typename ChannelT, typename K, typename V, typename K2, typename V2>
-class SerializationTraits<ChannelT, std::map<K, V>, DenseMap<K2, V2>> {
-public:
-  /// Serialize a std::map<K, V> from DenseMap<K2, V2>.
-  static Error serialize(ChannelT &C, const DenseMap<K2, V2> &M) {
-    if (auto Err = serializeSeq(C, static_cast<uint64_t>(M.size())))
-      return Err;
-
-    for (auto &E : M) {
-      if (auto Err =
-              SerializationTraits<ChannelT, K, K2>::serialize(C, E.first))
-        return Err;
-
-      if (auto Err =
-              SerializationTraits<ChannelT, V, V2>::serialize(C, E.second))
-        return Err;
-    }
-
-    return Error::success();
-  }
-
-  /// Serialize a std::map<K, V> from DenseMap<K2, V2>.
-  static Error deserialize(ChannelT &C, DenseMap<K2, V2> &M) {
-    assert(M.empty() && "Expected default-constructed map to deserialize into");
-
-    uint64_t Count = 0;
-    if (auto Err = deserializeSeq(C, Count))
-      return Err;
-
-    while (Count-- != 0) {
-      std::pair<K2, V2> Val;
-      if (auto Err =
-              SerializationTraits<ChannelT, K, K2>::deserialize(C, Val.first))
-        return Err;
-
-      if (auto Err =
-              SerializationTraits<ChannelT, V, V2>::deserialize(C, Val.second))
-        return Err;
-
-      auto Added = M.insert(Val).second;
-      if (!Added)
-        return make_error<StringError>("Duplicate element in deserialized map",
-                                       orcError(OrcErrorCode::UnknownORCError));
-    }
-
-    return Error::success();
-  }
-};
-
-} // namespace shared
-} // end namespace orc
-} // end namespace llvm
-
-#endif // LLVM_EXECUTIONENGINE_ORC_SHARED_SERIALIZATION_H
diff --git a/gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/OrcRPCTPCServer.h b/gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/OrcRPCTPCServer.h
deleted file mode 100644
index 96e4341fce6..00000000000
--- a/gnu/llvm/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/OrcRPCTPCServer.h
+++ /dev/null
@@ -1,660 +0,0 @@
-//===-- OrcRPCTPCServer.h -- OrcRPCTargetProcessControl Server --*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// OrcRPCTargetProcessControl server class.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_EXECUTIONENGINE_ORC_TARGETPROCESS_ORCRPCTPCSERVER_H
-#define LLVM_EXECUTIONENGINE_ORC_TARGETPROCESS_ORCRPCTPCSERVER_H
-
-#include "llvm/ADT/BitmaskEnum.h"
-#include "llvm/ExecutionEngine/Orc/Shared/RPCUtils.h"
-#include "llvm/ExecutionEngine/Orc/Shared/RawByteChannel.h"
-#include "llvm/ExecutionEngine/Orc/Shared/TargetProcessControlTypes.h"
-#include "llvm/ExecutionEngine/Orc/Shared/WrapperFunctionUtils.h"
-#include "llvm/ExecutionEngine/Orc/TargetProcess/TargetExecutionUtils.h"
-#include "llvm/Support/DynamicLibrary.h"
-#include "llvm/Support/FormatVariadic.h"
-#include "llvm/Support/Host.h"
-#include "llvm/Support/MathExtras.h"
-#include "llvm/Support/Memory.h"
-#include "llvm/Support/Process.h"
-
-#include <atomic>
-
-namespace llvm {
-namespace orc {
-
-namespace orcrpctpc {
-
-enum WireProtectionFlags : uint8_t {
-  WPF_None = 0,
-  WPF_Read = 1U << 0,
-  WPF_Write = 1U << 1,
-  WPF_Exec = 1U << 2,
-  LLVM_MARK_AS_BITMASK_ENUM(WPF_Exec)
-};
-
-struct ExecutorProcessInfo {
-  std::string Triple;
-  unsigned PageSize;
-  JITTargetAddress DispatchFuncAddr;
-  JITTargetAddress DispatchCtxAddr;
-};
-
-/// Convert from sys::Memory::ProtectionFlags
-inline WireProtectionFlags
-toWireProtectionFlags(sys::Memory::ProtectionFlags PF) {
-  WireProtectionFlags WPF = WPF_None;
-  if (PF & sys::Memory::MF_READ)
-    WPF |= WPF_Read;
-  if (PF & sys::Memory::MF_WRITE)
-    WPF |= WPF_Write;
-  if (PF & sys::Memory::MF_EXEC)
-    WPF |= WPF_Exec;
-  return WPF;
-}
-
-inline sys::Memory::ProtectionFlags
-fromWireProtectionFlags(WireProtectionFlags WPF) {
-  int PF = 0;
-  if (WPF & WPF_Read)
-    PF |= sys::Memory::MF_READ;
-  if (WPF & WPF_Write)
-    PF |= sys::Memory::MF_WRITE;
-  if (WPF & WPF_Exec)
-    PF |= sys::Memory::MF_EXEC;
-  return static_cast<sys::Memory::ProtectionFlags>(PF);
-}
-
-struct ReserveMemRequestElement {
-  WireProtectionFlags Prot = WPF_None;
-  uint64_t Size = 0;
-  uint64_t Alignment = 0;
-};
-
-using ReserveMemRequest = std::vector<ReserveMemRequestElement>;
-
-struct ReserveMemResultElement {
-  WireProtectionFlags Prot = WPF_None;
-  JITTargetAddress Address = 0;
-  uint64_t AllocatedSize = 0;
-};
-
-using ReserveMemResult = std::vector<ReserveMemResultElement>;
-
-struct ReleaseOrFinalizeMemRequestElement {
-  WireProtectionFlags Prot = WPF_None;
-  JITTargetAddress Address = 0;
-  uint64_t Size = 0;
-};
-
-using ReleaseOrFinalizeMemRequest =
-    std::vector<ReleaseOrFinalizeMemRequestElement>;
-
-} // end namespace orcrpctpc
-
-namespace shared {
-
-template <> class SerializationTypeName<WrapperFunctionResult> {
-public:
-  static const char *getName() { return "WrapperFunctionResult"; }
-};
-
-template <typename ChannelT>
-class SerializationTraits<
-    ChannelT, WrapperFunctionResult, WrapperFunctionResult,
-    std::enable_if_t<std::is_base_of<RawByteChannel, ChannelT>::value>> {
-public:
-  static Error serialize(ChannelT &C, const WrapperFunctionResult &E) {
-    if (auto Err = serializeSeq(C, static_cast<uint64_t>(E.size())))
-      return Err;
-    if (E.size() == 0)
-      return Error::success();
-    return C.appendBytes(E.data(), E.size());
-  }
-
-  static Error deserialize(ChannelT &C, WrapperFunctionResult &E) {
-    uint64_t Size;
-    if (auto Err = deserializeSeq(C, Size))
-      return Err;
-
-    WrapperFunctionResult Tmp;
-    char *Data = WrapperFunctionResult::allocate(Tmp, Size);
-
-    if (auto Err = C.readBytes(Data, Size))
-      return Err;
-
-    E = std::move(Tmp);
-
-    return Error::success();
-  }
-};
-
-template <> class SerializationTypeName<tpctypes::UInt8Write> {
-public:
-  static const char *getName() { return "UInt8Write"; }
-};
-
-template <> class SerializationTypeName<tpctypes::UInt16Write> {
-public:
-  static const char *getName() { return "UInt16Write"; }
-};
-
-template <> class SerializationTypeName<tpctypes::UInt32Write> {
-public:
-  static const char *getName() { return "UInt32Write"; }
-};
-
-template <> class SerializationTypeName<tpctypes::UInt64Write> {
-public:
-  static const char *getName() { return "UInt64Write"; }
-};
-
-template <> class SerializationTypeName<tpctypes::BufferWrite> {
-public:
-  static const char *getName() { return "BufferWrite"; }
-};
-
-template <> class SerializationTypeName<orcrpctpc::ReserveMemRequestElement> {
-public:
-  static const char *getName() { return "ReserveMemRequestElement"; }
-};
-
-template <> class SerializationTypeName<orcrpctpc::ReserveMemResultElement> {
-public:
-  static const char *getName() { return "ReserveMemResultElement"; }
-};
-
-template <>
-class SerializationTypeName<orcrpctpc::ReleaseOrFinalizeMemRequestElement> {
-public:
-  static const char *getName() { return "ReleaseOrFinalizeMemRequestElement"; }
-};
-
-template <> class SerializationTypeName<orcrpctpc::ExecutorProcessInfo> {
-public:
-  static const char *getName() { return "ExecutorProcessInfo"; }
-};
-
-template <typename ChannelT, typename WriteT>
-class SerializationTraits<
-    ChannelT, WriteT, WriteT,
-    std::enable_if_t<std::is_same<WriteT, tpctypes::UInt8Write>::value ||
-                     std::is_same<WriteT, tpctypes::UInt16Write>::value ||
-                     std::is_same<WriteT, tpctypes::UInt32Write>::value ||
-                     std::is_same<WriteT, tpctypes::UInt64Write>::value>> {
-public:
-  static Error serialize(ChannelT &C, const WriteT &W) {
-    return serializeSeq(C, W.Address, W.Value);
-  }
-  static Error deserialize(ChannelT &C, WriteT &W) {
-    return deserializeSeq(C, W.Address, W.Value);
-  }
-};
-
-template <typename ChannelT>
-class SerializationTraits<
-    ChannelT, tpctypes::BufferWrite, tpctypes::BufferWrite,
-    std::enable_if_t<std::is_base_of<RawByteChannel, ChannelT>::value>> {
-public:
-  static Error serialize(ChannelT &C, const tpctypes::BufferWrite &W) {
-    uint64_t Size = W.Buffer.size();
-    if (auto Err = serializeSeq(C, W.Address, Size))
-      return Err;
-
-    return C.appendBytes(W.Buffer.data(), Size);
-  }
-  static Error deserialize(ChannelT &C, tpctypes::BufferWrite &W) {
-    JITTargetAddress Address;
-    uint64_t Size;
-
-    if (auto Err = deserializeSeq(C, Address, Size))
-      return Err;
-
-    char *Buffer = jitTargetAddressToPointer<char *>(Address);
-
-    if (auto Err = C.readBytes(Buffer, Size))
-      return Err;
-
-    W = {Address, StringRef(Buffer, Size)};
-    return Error::success();
-  }
-};
-
-template <typename ChannelT>
-class SerializationTraits<ChannelT, orcrpctpc::ReserveMemRequestElement> {
-public:
-  static Error serialize(ChannelT &C,
-                         const orcrpctpc::ReserveMemRequestElement &E) {
-    return serializeSeq(C, static_cast<uint8_t>(E.Prot), E.Size, E.Alignment);
-  }
-
-  static Error deserialize(ChannelT &C,
-                           orcrpctpc::ReserveMemRequestElement &E) {
-    return deserializeSeq(C, *reinterpret_cast<uint8_t *>(&E.Prot), E.Size,
-                          E.Alignment);
-  }
-};
-
-template <typename ChannelT>
-class SerializationTraits<ChannelT, orcrpctpc::ReserveMemResultElement> {
-public:
-  static Error serialize(ChannelT &C,
-                         const orcrpctpc::ReserveMemResultElement &E) {
-    return serializeSeq(C, static_cast<uint8_t>(E.Prot), E.Address,
-                        E.AllocatedSize);
-  }
-
-  static Error deserialize(ChannelT &C, orcrpctpc::ReserveMemResultElement &E) {
-    return deserializeSeq(C, *reinterpret_cast<uint8_t *>(&E.Prot), E.Address,
-                          E.AllocatedSize);
-  }
-};
-
-template <typename ChannelT>
-class SerializationTraits<ChannelT,
-                          orcrpctpc::ReleaseOrFinalizeMemRequestElement> {
-public:
-  static Error
-  serialize(ChannelT &C,
-            const orcrpctpc::ReleaseOrFinalizeMemRequestElement &E) {
-    return serializeSeq(C, static_cast<uint8_t>(E.Prot), E.Address, E.Size);
-  }
-
-  static Error deserialize(ChannelT &C,
-                           orcrpctpc::ReleaseOrFinalizeMemRequestElement &E) {
-    return deserializeSeq(C, *reinterpret_cast<uint8_t *>(&E.Prot), E.Address,
-                          E.Size);
-  }
-};
-
-template <typename ChannelT>
-class SerializationTraits<ChannelT, orcrpctpc::ExecutorProcessInfo> {
-public:
-  static Error serialize(ChannelT &C,
-                         const orcrpctpc::ExecutorProcessInfo &EPI) {
-    return serializeSeq(C, EPI.Triple, EPI.PageSize, EPI.DispatchFuncAddr,
-                        EPI.DispatchCtxAddr);
-  }
-
-  static Error deserialize(ChannelT &C, orcrpctpc::ExecutorProcessInfo &EPI) {
-    return deserializeSeq(C, EPI.Triple, EPI.PageSize, EPI.DispatchFuncAddr,
-                          EPI.DispatchCtxAddr);
-  }
-};
-
-} // end namespace shared
-
-namespace orcrpctpc {
-
-using RemoteSymbolLookupSet = std::vector<std::pair<std::string, bool>>;
-using RemoteLookupRequest =
-    std::pair<tpctypes::DylibHandle, RemoteSymbolLookupSet>;
-
-class GetExecutorProcessInfo
-    : public shared::RPCFunction<GetExecutorProcessInfo,
-                                 orcrpctpc::ExecutorProcessInfo()> {
-public:
-  static const char *getName() { return "GetJITDispatchInfo"; }
-};
-
-class ReserveMem
-    : public shared::RPCFunction<ReserveMem, Expected<ReserveMemResult>(
-                                                 ReserveMemRequest)> {
-public:
-  static const char *getName() { return "ReserveMem"; }
-};
-
-class FinalizeMem
-    : public shared::RPCFunction<FinalizeMem,
-                                 Error(ReleaseOrFinalizeMemRequest)> {
-public:
-  static const char *getName() { return "FinalizeMem"; }
-};
-
-class ReleaseMem
-    : public shared::RPCFunction<ReleaseMem,
-                                 Error(ReleaseOrFinalizeMemRequest)> {
-public:
-  static const char *getName() { return "ReleaseMem"; }
-};
-
-class WriteUInt8s
-    : public shared::RPCFunction<WriteUInt8s,
-                                 Error(std::vector<tpctypes::UInt8Write>)> {
-public:
-  static const char *getName() { return "WriteUInt8s"; }
-};
-
-class WriteUInt16s
-    : public shared::RPCFunction<WriteUInt16s,
-                                 Error(std::vector<tpctypes::UInt16Write>)> {
-public:
-  static const char *getName() { return "WriteUInt16s"; }
-};
-
-class WriteUInt32s
-    : public shared::RPCFunction<WriteUInt32s,
-                                 Error(std::vector<tpctypes::UInt32Write>)> {
-public:
-  static const char *getName() { return "WriteUInt32s"; }
-};
-
-class WriteUInt64s
-    : public shared::RPCFunction<WriteUInt64s,
-                                 Error(std::vector<tpctypes::UInt64Write>)> {
-public:
-  static const char *getName() { return "WriteUInt64s"; }
-};
-
-class WriteBuffers
-    : public shared::RPCFunction<WriteBuffers,
-                                 Error(std::vector<tpctypes::BufferWrite>)> {
-public:
-  static const char *getName() { return "WriteBuffers"; }
-};
-
-class LoadDylib
-    : public shared::RPCFunction<LoadDylib, Expected<tpctypes::DylibHandle>(
-                                                std::string DylibPath)> {
-public:
-  static const char *getName() { return "LoadDylib"; }
-};
-
-class LookupSymbols
-    : public shared::RPCFunction<LookupSymbols,
-                                 Expected<std::vector<tpctypes::LookupResult>>(
-                                     std::vector<RemoteLookupRequest>)> {
-public:
-  static const char *getName() { return "LookupSymbols"; }
-};
-
-class RunMain
-    : public shared::RPCFunction<RunMain,
-                                 int64_t(JITTargetAddress MainAddr,
-                                         std::vector<std::string> Args)> {
-public:
-  static const char *getName() { return "RunMain"; }
-};
-
-class RunWrapper
-    : public shared::RPCFunction<RunWrapper,
-                                 shared::WrapperFunctionResult(
-                                     JITTargetAddress, std::vector<uint8_t>)> {
-public:
-  static const char *getName() { return "RunWrapper"; }
-};
-
-class CloseConnection : public shared::RPCFunction<CloseConnection, void()> {
-public:
-  static const char *getName() { return "CloseConnection"; }
-};
-
-} // end namespace orcrpctpc
-
-/// TargetProcessControl for a process connected via an ORC RPC Endpoint.
-template <typename RPCEndpointT> class OrcRPCTPCServer {
-private:
-  using ThisT = OrcRPCTPCServer<RPCEndpointT>;
-
-public:
-  /// Create an OrcRPCTPCServer from the given endpoint.
-  OrcRPCTPCServer(RPCEndpointT &EP) : EP(EP) {
-
-    TripleStr = sys::getProcessTriple();
-    PageSize = sys::Process::getPageSizeEstimate();
-
-    EP.template addHandler<orcrpctpc::GetExecutorProcessInfo>(
-        *this, &ThisT::getExecutorProcessInfo);
-    EP.template addHandler<orcrpctpc::ReserveMem>(*this, &ThisT::reserveMemory);
-    EP.template addHandler<orcrpctpc::FinalizeMem>(*this,
-                                                   &ThisT::finalizeMemory);
-    EP.template addHandler<orcrpctpc::ReleaseMem>(*this, &ThisT::releaseMemory);
-
-    EP.template addHandler<orcrpctpc::WriteUInt8s>(
-        handleWriteUInt<tpctypes::UInt8Write>);
-    EP.template addHandler<orcrpctpc::WriteUInt16s>(
-        handleWriteUInt<tpctypes::UInt16Write>);
-    EP.template addHandler<orcrpctpc::WriteUInt32s>(
-        handleWriteUInt<tpctypes::UInt32Write>);
-    EP.template addHandler<orcrpctpc::WriteUInt64s>(
-        handleWriteUInt<tpctypes::UInt64Write>);
-    EP.template addHandler<orcrpctpc::WriteBuffers>(handleWriteBuffer);
-
-    EP.template addHandler<orcrpctpc::LoadDylib>(*this, &ThisT::loadDylib);
-    EP.template addHandler<orcrpctpc::LookupSymbols>(*this,
-                                                     &ThisT::lookupSymbols);
-
-    EP.template addHandler<orcrpctpc::RunMain>(*this, &ThisT::runMain);
-    EP.template addHandler<orcrpctpc::RunWrapper>(*this, &ThisT::runWrapper);
-
-    EP.template addHandler<orcrpctpc::CloseConnection>(*this,
-                                                       &ThisT::closeConnection);
-  }
-
-  /// Set the ProgramName to be used as the first argv element when running
-  /// functions via runAsMain.
-  void setProgramName(Optional<std::string> ProgramName = None) {
-    this->ProgramName = std::move(ProgramName);
-  }
-
-  /// Get the RPC endpoint for this server.
-  RPCEndpointT &getEndpoint() { return EP; }
-
-  /// Run the server loop.
-  Error run() {
-    while (!Finished) {
-      if (auto Err = EP.handleOne())
-        return Err;
-    }
-    return Error::success();
-  }
-
-  Expected<shared::WrapperFunctionResult>
-  runWrapperInJIT(JITTargetAddress FunctionId, ArrayRef<char> ArgBuffer) {
-    return EP.template callB<orcrpctpc::RunWrapper>(
-        FunctionId,
-        ArrayRef<uint8_t>(reinterpret_cast<const uint8_t *>(ArgBuffer.data()),
-                          ArgBuffer.size()));
-  }
-
-private:
-  static shared::detail::CWrapperFunctionResult
-  jitDispatchViaOrcRPCTPCServer(void *Ctx, const void *FnTag, const char *Data,
-                                size_t Size) {
-    assert(Ctx && "Attempt to dispatch with null context ptr");
-    auto R = static_cast<ThisT *>(Ctx)->runWrapperInJIT(
-        pointerToJITTargetAddress(FnTag), {Data, Size});
-    if (!R) {
-      auto ErrMsg = toString(R.takeError());
-      return shared::WrapperFunctionResult::createOutOfBandError(ErrMsg.data())
-          .release();
-    }
-    return R->release();
-  }
-
-  orcrpctpc::ExecutorProcessInfo getExecutorProcessInfo() {
-    return {TripleStr, static_cast<uint32_t>(PageSize),
-            pointerToJITTargetAddress(jitDispatchViaOrcRPCTPCServer),
-            pointerToJITTargetAddress(this)};
-  }
-
-  template <typename WriteT>
-  static void handleWriteUInt(const std::vector<WriteT> &Ws) {
-    using ValueT = decltype(std::declval<WriteT>().Value);
-    for (auto &W : Ws)
-      *jitTargetAddressToPointer<ValueT *>(W.Address) = W.Value;
-  }
-
-  std::string getProtStr(orcrpctpc::WireProtectionFlags WPF) {
-    std::string Result;
-    Result += (WPF & orcrpctpc::WPF_Read) ? 'R' : '-';
-    Result += (WPF & orcrpctpc::WPF_Write) ? 'W' : '-';
-    Result += (WPF & orcrpctpc::WPF_Exec) ? 'X' : '-';
-    return Result;
-  }
-
-  static void handleWriteBuffer(const std::vector<tpctypes::BufferWrite> &Ws) {
-    for (auto &W : Ws) {
-      memcpy(jitTargetAddressToPointer<char *>(W.Address), W.Buffer.data(),
-             W.Buffer.size());
-    }
-  }
-
-  Expected<orcrpctpc::ReserveMemResult>
-  reserveMemory(const orcrpctpc::ReserveMemRequest &Request) {
-    orcrpctpc::ReserveMemResult Allocs;
-    auto PF = sys::Memory::MF_READ | sys::Memory::MF_WRITE;
-
-    uint64_t TotalSize = 0;
-
-    for (const auto &E : Request) {
-      uint64_t Size = alignTo(E.Size, PageSize);
-      uint16_t Align = E.Alignment;
-
-      if ((Align > PageSize) || (PageSize % Align))
-        return make_error<StringError>(
-            "Page alignmen does not satisfy requested alignment",
-            inconvertibleErrorCode());
-
-      TotalSize += Size;
-    }
-
-    // Allocate memory slab.
-    std::error_code EC;
-    auto MB = sys::Memory::allocateMappedMemory(TotalSize, nullptr, PF, EC);
-    if (EC)
-      return make_error<StringError>("Unable to allocate memory: " +
-                                         EC.message(),
-                                     inconvertibleErrorCode());
-
-    // Zero-fill the whole thing.
-    memset(MB.base(), 0, MB.allocatedSize());
-
-    // Carve up sections to return.
-    uint64_t SectionBase = 0;
-    for (const auto &E : Request) {
-      uint64_t SectionSize = alignTo(E.Size, PageSize);
-      Allocs.push_back({E.Prot,
-                        pointerToJITTargetAddress(MB.base()) + SectionBase,
-                        SectionSize});
-      SectionBase += SectionSize;
-    }
-
-    return Allocs;
-  }
-
-  Error finalizeMemory(const orcrpctpc::ReleaseOrFinalizeMemRequest &FMR) {
-    for (const auto &E : FMR) {
-      sys::MemoryBlock MB(jitTargetAddressToPointer<void *>(E.Address), E.Size);
-
-      auto PF = orcrpctpc::fromWireProtectionFlags(E.Prot);
-      if (auto EC =
-              sys::Memory::protectMappedMemory(MB, static_cast<unsigned>(PF)))
-        return make_error<StringError>("error protecting memory: " +
-                                           EC.message(),
-                                       inconvertibleErrorCode());
-    }
-    return Error::success();
-  }
-
-  Error releaseMemory(const orcrpctpc::ReleaseOrFinalizeMemRequest &RMR) {
-    for (const auto &E : RMR) {
-      sys::MemoryBlock MB(jitTargetAddressToPointer<void *>(E.Address), E.Size);
-
-      if (auto EC = sys::Memory::releaseMappedMemory(MB))
-        return make_error<StringError>("error release memory: " + EC.message(),
-                                       inconvertibleErrorCode());
-    }
-    return Error::success();
-  }
-
-  Expected<tpctypes::DylibHandle> loadDylib(const std::string &Path) {
-    std::string ErrMsg;
-    const char *DLPath = !Path.empty() ? Path.c_str() : nullptr;
-    auto DL = sys::DynamicLibrary::getPermanentLibrary(DLPath, &ErrMsg);
-    if (!DL.isValid())
-      return make_error<StringError>(std::move(ErrMsg),
-                                     inconvertibleErrorCode());
-
-    tpctypes::DylibHandle H = Dylibs.size();
-    Dylibs[H] = std::move(DL);
-    return H;
-  }
-
-  Expected<std::vector<tpctypes::LookupResult>>
-  lookupSymbols(const std::vector<orcrpctpc::RemoteLookupRequest> &Request) {
-    std::vector<tpctypes::LookupResult> Result;
-
-    for (const auto &E : Request) {
-      auto I = Dylibs.find(E.first);
-      if (I == Dylibs.end())
-        return make_error<StringError>("Unrecognized handle",
-                                       inconvertibleErrorCode());
-      auto &DL = I->second;
-      Result.push_back({});
-
-      for (const auto &KV : E.second) {
-        auto &SymString = KV.first;
-        bool WeakReference = KV.second;
-
-        const char *Sym = SymString.c_str();
-#ifdef __APPLE__
-        if (*Sym == '_')
-          ++Sym;
-#endif
-
-        void *Addr = DL.getAddressOfSymbol(Sym);
-        if (!Addr && !WeakReference)
-          return make_error<StringError>(Twine("Missing definition for ") + Sym,
-                                         inconvertibleErrorCode());
-
-        Result.back().push_back(pointerToJITTargetAddress(Addr));
-      }
-    }
-
-    return Result;
-  }
-
-  int64_t runMain(JITTargetAddress MainFnAddr,
-                  const std::vector<std::string> &Args) {
-    Optional<StringRef> ProgramNameOverride;
-    if (ProgramName)
-      ProgramNameOverride = *ProgramName;
-
-    return runAsMain(
-        jitTargetAddressToFunction<int (*)(int, char *[])>(MainFnAddr), Args,
-        ProgramNameOverride);
-  }
-
-  shared::WrapperFunctionResult
-  runWrapper(JITTargetAddress WrapperFnAddr,
-             const std::vector<uint8_t> &ArgBuffer) {
-    using WrapperFnTy = shared::detail::CWrapperFunctionResult (*)(
-        const char *Data, uint64_t Size);
-    auto *WrapperFn = jitTargetAddressToFunction<WrapperFnTy>(WrapperFnAddr);
-    return WrapperFn(reinterpret_cast<const char *>(ArgBuffer.data()),
-                     ArgBuffer.size());
-  }
-
-  void closeConnection() { Finished = true; }
-
-  std::string TripleStr;
-  uint64_t PageSize = 0;
-  Optional<std::string> ProgramName;
-  RPCEndpointT &EP;
-  std::atomic<bool> Finished{false};
-  DenseMap<tpctypes::DylibHandle, sys::DynamicLibrary> Dylibs;
-};
-
-} // end namespace orc
-} // end namespace llvm
-
-#endif // LLVM_EXECUTIONENGINE_ORC_TARGETPROCESS_ORCRPCTPCSERVER_H
diff --git a/gnu/llvm/llvm/include/llvm/ExecutionEngine/OrcMCJITReplacement.h b/gnu/llvm/llvm/include/llvm/ExecutionEngine/OrcMCJITReplacement.h
deleted file mode 100644
index 6cca1933f39..00000000000
--- a/gnu/llvm/llvm/include/llvm/ExecutionEngine/OrcMCJITReplacement.h
+++ /dev/null
@@ -1,37 +0,0 @@
-//===---- OrcMCJITReplacement.h - Orc-based MCJIT replacement ---*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file forces OrcMCJITReplacement to link in on certain operating systems.
-// (Windows).
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_EXECUTIONENGINE_ORCMCJITREPLACEMENT_H
-#define LLVM_EXECUTIONENGINE_ORCMCJITREPLACEMENT_H
-
-#include "llvm/ExecutionEngine/ExecutionEngine.h"
-#include <cstdlib>
-
-extern "C" void LLVMLinkInOrcMCJITReplacement();
-
-namespace {
-  struct ForceOrcMCJITReplacementLinking {
-    ForceOrcMCJITReplacementLinking() {
-      // We must reference OrcMCJITReplacement in such a way that compilers will
-      // not delete it all as dead code, even with whole program optimization,
-      // yet is effectively a NO-OP. As the compiler isn't smart enough to know
-      // that getenv() never returns -1, this will do the job.
-      if (std::getenv("bar") != (char*) -1)
-        return;
-
-      LLVMLinkInOrcMCJITReplacement();
-    }
-  } ForceOrcMCJITReplacementLinking;
-}
-
-#endif
diff --git a/gnu/llvm/llvm/include/llvm/ExecutionEngine/OrcV1Deprecation.h b/gnu/llvm/llvm/include/llvm/ExecutionEngine/OrcV1Deprecation.h
deleted file mode 100644
index 7ed254b3ee0..00000000000
--- a/gnu/llvm/llvm/include/llvm/ExecutionEngine/OrcV1Deprecation.h
+++ /dev/null
@@ -1,22 +0,0 @@
-//===------ OrcV1Deprecation.h - Memory manager for MC-JIT ------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Tag for suppressing ORCv1 deprecation warnings.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_EXECUTIONENGINE_ORCV1DEPRECATION_H
-#define LLVM_EXECUTIONENGINE_ORCV1DEPRECATION_H
-
-namespace llvm {
-
-enum ORCv1DeprecationAcknowledgement { AcknowledgeORCv1Deprecation };
-
-} // namespace llvm
-
-#endif // LLVM_EXECUTIONENGINE_ORCV1DEPRECATION_H
diff --git a/gnu/llvm/llvm/include/llvm/IR/GlobalIndirectSymbol.h b/gnu/llvm/llvm/include/llvm/IR/GlobalIndirectSymbol.h
deleted file mode 100644
index e45c7529885..00000000000
--- a/gnu/llvm/llvm/include/llvm/IR/GlobalIndirectSymbol.h
+++ /dev/null
@@ -1,93 +0,0 @@
-//===- llvm/GlobalIndirectSymbol.h - GlobalIndirectSymbol class -*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file contains the declaration of the GlobalIndirectSymbol class, which
-// is a base class for GlobalAlias and GlobalIFunc. It contains all common code
-// for aliases and ifuncs.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_IR_GLOBALINDIRECTSYMBOL_H
-#define LLVM_IR_GLOBALINDIRECTSYMBOL_H
-
-#include "llvm/IR/GlobalObject.h"
-#include "llvm/IR/GlobalValue.h"
-#include "llvm/IR/OperandTraits.h"
-#include "llvm/IR/User.h"
-#include "llvm/IR/Value.h"
-#include "llvm/Support/Casting.h"
-#include <cstddef>
-
-namespace llvm {
-
-class GlobalIndirectSymbol : public GlobalValue {
-protected:
-  GlobalIndirectSymbol(Type *Ty, ValueTy VTy, unsigned AddressSpace,
-      LinkageTypes Linkage, const Twine &Name, Constant *Symbol);
-
-public:
-  GlobalIndirectSymbol(const GlobalIndirectSymbol &) = delete;
-  GlobalIndirectSymbol &operator=(const GlobalIndirectSymbol &) = delete;
-
-  // allocate space for exactly one operand
-  void *operator new(size_t S) { return User::operator new(S, 1); }
-  void operator delete(void *Ptr) { User::operator delete(Ptr); }
-
-  /// Provide fast operand accessors
-  DECLARE_TRANSPARENT_OPERAND_ACCESSORS(Constant);
-
-  void copyAttributesFrom(const GlobalValue *Src) {
-    GlobalValue::copyAttributesFrom(Src);
-  }
-
-  /// These methods set and retrieve indirect symbol.
-  void setIndirectSymbol(Constant *Symbol) {
-    setOperand(0, Symbol);
-  }
-  const Constant *getIndirectSymbol() const {
-    return getOperand(0);
-  }
-  Constant *getIndirectSymbol() {
-    return const_cast<Constant *>(
-          static_cast<const GlobalIndirectSymbol *>(this)->getIndirectSymbol());
-  }
-
-  const GlobalObject *getBaseObject() const;
-  GlobalObject *getBaseObject() {
-    return const_cast<GlobalObject *>(
-              static_cast<const GlobalIndirectSymbol *>(this)->getBaseObject());
-  }
-
-  const GlobalObject *getBaseObject(const DataLayout &DL, APInt &Offset) const {
-    return dyn_cast<GlobalObject>(
-        getIndirectSymbol()->stripAndAccumulateInBoundsConstantOffsets(DL,
-                                                                       Offset));
-  }
-  GlobalObject *getBaseObject(const DataLayout &DL, APInt &Offset) {
-    return const_cast<GlobalObject *>(
-                                 static_cast<const GlobalIndirectSymbol *>(this)
-                                   ->getBaseObject(DL, Offset));
-  }
-
-  // Methods for support type inquiry through isa, cast, and dyn_cast:
-  static bool classof(const Value *V) {
-    return V->getValueID() == Value::GlobalAliasVal ||
-           V->getValueID() == Value::GlobalIFuncVal;
-  }
-};
-
-template <>
-struct OperandTraits<GlobalIndirectSymbol> :
-  public FixedNumOperandTraits<GlobalIndirectSymbol, 1> {
-};
-
-DEFINE_TRANSPARENT_OPERAND_ACCESSORS(GlobalIndirectSymbol, Constant)
-
-} // end namespace llvm
-
-#endif // LLVM_IR_GLOBALINDIRECTSYMBOL_H
diff --git a/gnu/llvm/llvm/include/llvm/InitializePasses.h b/gnu/llvm/llvm/include/llvm/InitializePasses.h
index 35d864e9921..50b0c373d05 100644
--- a/gnu/llvm/llvm/include/llvm/InitializePasses.h
+++ b/gnu/llvm/llvm/include/llvm/InitializePasses.h
@@ -18,7 +18,7 @@ namespace llvm {
 
 class PassRegistry;
 
-/// Initialize all passes linked into the TransformUtils library.
+/// Initialize all passes linked into the Core library.
 void initializeCore(PassRegistry&);
 
 /// Initialize all passes linked into the TransformUtils library.
@@ -27,30 +27,18 @@ void initializeTransformUtils(PassRegistry&);
 /// Initialize all passes linked into the ScalarOpts library.
 void initializeScalarOpts(PassRegistry&);
 
-/// Initialize all passes linked into the ObjCARCOpts library.
-void initializeObjCARCOpts(PassRegistry&);
-
 /// Initialize all passes linked into the Vectorize library.
 void initializeVectorization(PassRegistry&);
 
 /// Initialize all passes linked into the InstCombine library.
 void initializeInstCombine(PassRegistry&);
 
-/// Initialize all passes linked into the AggressiveInstCombine library.
-void initializeAggressiveInstCombine(PassRegistry&);
-
 /// Initialize all passes linked into the IPO library.
 void initializeIPO(PassRegistry&);
 
-/// Initialize all passes linked into the Instrumentation library.
-void initializeInstrumentation(PassRegistry&);
-
 /// Initialize all passes linked into the Analysis library.
 void initializeAnalysis(PassRegistry&);
 
-/// Initialize all passes linked into the Coroutines library.
-void initializeCoroutines(PassRegistry&);
-
 /// Initialize all passes linked into the CodeGen library.
 void initializeCodeGen(PassRegistry&);
 
@@ -64,36 +52,27 @@ void initializeAAEvalLegacyPassPass(PassRegistry&);
 void initializeAAResultsWrapperPassPass(PassRegistry&);
 void initializeADCELegacyPassPass(PassRegistry&);
 void initializeAddDiscriminatorsLegacyPassPass(PassRegistry&);
-void initializeModuleAddressSanitizerLegacyPassPass(PassRegistry &);
-void initializeASanGlobalsMetadataWrapperPassPass(PassRegistry &);
-void initializeAddressSanitizerLegacyPassPass(PassRegistry &);
-void initializeAggressiveInstCombinerLegacyPassPass(PassRegistry&);
-void initializeAliasSetPrinterPass(PassRegistry&);
 void initializeAlignmentFromAssumptionsPass(PassRegistry&);
 void initializeAlwaysInlinerLegacyPassPass(PassRegistry&);
+void initializeAssignmentTrackingAnalysisPass(PassRegistry &);
 void initializeAssumeSimplifyPassLegacyPassPass(PassRegistry &);
 void initializeAssumeBuilderPassLegacyPassPass(PassRegistry &);
 void initializeAnnotation2MetadataLegacyPass(PassRegistry &);
-void initializeAnnotationRemarksLegacyPass(PassRegistry &);
-void initializeOpenMPOptCGSCCLegacyPassPass(PassRegistry &);
-void initializeArgPromotionPass(PassRegistry&);
 void initializeAssumptionCacheTrackerPass(PassRegistry&);
 void initializeAtomicExpandPass(PassRegistry&);
 void initializeAttributorLegacyPassPass(PassRegistry&);
 void initializeAttributorCGSCCLegacyPassPass(PassRegistry &);
+void initializeBasicBlockSectionsProfileReaderPass(PassRegistry &);
 void initializeBasicBlockSectionsPass(PassRegistry &);
 void initializeBDCELegacyPassPass(PassRegistry&);
 void initializeBarrierNoopPass(PassRegistry&);
 void initializeBasicAAWrapperPassPass(PassRegistry&);
-void initializeBlockExtractorLegacyPassPass(PassRegistry &);
 void initializeBlockFrequencyInfoWrapperPassPass(PassRegistry&);
-void initializeBoundsCheckingLegacyPassPass(PassRegistry&);
 void initializeBranchFolderPassPass(PassRegistry&);
 void initializeBranchProbabilityInfoWrapperPassPass(PassRegistry&);
 void initializeBranchRelaxationPass(PassRegistry&);
 void initializeBreakCriticalEdgesPass(PassRegistry&);
 void initializeBreakFalseDepsPass(PassRegistry&);
-void initializeCanonicalizeAliasesLegacyPassPass(PassRegistry &);
 void initializeCanonicalizeFreezeInLoopsPass(PassRegistry &);
 void initializeCFGOnlyPrinterLegacyPassPass(PassRegistry&);
 void initializeCFGOnlyViewerLegacyPassPass(PassRegistry&);
@@ -102,10 +81,8 @@ void initializeCFGSimplifyPassPass(PassRegistry&);
 void initializeCFGuardPass(PassRegistry&);
 void initializeCFGuardLongjmpPass(PassRegistry&);
 void initializeCFGViewerLegacyPassPass(PassRegistry&);
+void initializeCFIFixupPass(PassRegistry&);
 void initializeCFIInstrInserterPass(PassRegistry&);
-void initializeCFLAndersAAWrapperPassPass(PassRegistry&);
-void initializeCFLSteensAAWrapperPassPass(PassRegistry&);
-void initializeCGProfileLegacyPassPass(PassRegistry &);
 void initializeCallGraphDOTPrinterPass(PassRegistry&);
 void initializeCallGraphPrinterLegacyPassPass(PassRegistry&);
 void initializeCallGraphViewerPass(PassRegistry&);
@@ -114,31 +91,29 @@ void initializeCallSiteSplittingLegacyPassPass(PassRegistry&);
 void initializeCalledValuePropagationLegacyPassPass(PassRegistry &);
 void initializeCheckDebugMachineModulePass(PassRegistry &);
 void initializeCodeGenPreparePass(PassRegistry&);
+void initializeComplexDeinterleavingLegacyPassPass(PassRegistry&);
 void initializeConstantHoistingLegacyPassPass(PassRegistry&);
 void initializeConstantMergeLegacyPassPass(PassRegistry&);
-void initializeConstraintEliminationPass(PassRegistry &);
-void initializeControlHeightReductionLegacyPassPass(PassRegistry&);
 void initializeCorrelatedValuePropagationPass(PassRegistry&);
 void initializeCostModelAnalysisPass(PassRegistry&);
 void initializeCrossDSOCFIPass(PassRegistry&);
+void initializeCycleInfoWrapperPassPass(PassRegistry &);
 void initializeDAEPass(PassRegistry&);
 void initializeDAHPass(PassRegistry&);
 void initializeDCELegacyPassPass(PassRegistry&);
 void initializeDFAJumpThreadingLegacyPassPass(PassRegistry &);
 void initializeDSELegacyPassPass(PassRegistry&);
-void initializeDataFlowSanitizerLegacyPassPass(PassRegistry &);
 void initializeDeadMachineInstructionElimPass(PassRegistry&);
 void initializeDebugifyMachineModulePass(PassRegistry &);
 void initializeDelinearizationPass(PassRegistry&);
 void initializeDemandedBitsWrapperPassPass(PassRegistry&);
-void initializeDependenceAnalysisPass(PassRegistry&);
 void initializeDependenceAnalysisWrapperPassPass(PassRegistry&);
 void initializeDetectDeadLanesPass(PassRegistry&);
 void initializeDivRemPairsLegacyPassPass(PassRegistry&);
-void initializeDomOnlyPrinterPass(PassRegistry&);
-void initializeDomOnlyViewerPass(PassRegistry&);
-void initializeDomPrinterPass(PassRegistry&);
-void initializeDomViewerPass(PassRegistry&);
+void initializeDomOnlyPrinterWrapperPassPass(PassRegistry &);
+void initializeDomOnlyViewerWrapperPassPass(PassRegistry &);
+void initializeDomPrinterWrapperPassPass(PassRegistry &);
+void initializeDomViewerWrapperPassPass(PassRegistry &);
 void initializeDominanceFrontierWrapperPassPass(PassRegistry&);
 void initializeDominatorTreeWrapperPassPass(PassRegistry&);
 void initializeDwarfEHPrepareLegacyPassPass(PassRegistry &);
@@ -151,7 +126,8 @@ void initializeEarlyTailDuplicatePass(PassRegistry&);
 void initializeEdgeBundlesPass(PassRegistry&);
 void initializeEHContGuardCatchretPass(PassRegistry &);
 void initializeEliminateAvailableExternallyLegacyPassPass(PassRegistry&);
-void initializeEntryExitInstrumenterPass(PassRegistry&);
+void initializeExpandLargeFpConvertLegacyPassPass(PassRegistry&);
+void initializeExpandLargeDivRemLegacyPassPass(PassRegistry&);
 void initializeExpandMemCmpPassPass(PassRegistry&);
 void initializeExpandPostRAPass(PassRegistry&);
 void initializeExpandReductionsPass(PassRegistry&);
@@ -163,16 +139,12 @@ void initializeFinalizeISelPass(PassRegistry&);
 void initializeFinalizeMachineBundlesPass(PassRegistry&);
 void initializeFixIrreduciblePass(PassRegistry &);
 void initializeFixupStatepointCallerSavedPass(PassRegistry&);
-void initializeFlattenCFGPassPass(PassRegistry&);
+void initializeFlattenCFGLegacyPassPass(PassRegistry &);
 void initializeFloat2IntLegacyPassPass(PassRegistry&);
 void initializeForceFunctionAttrsLegacyPassPass(PassRegistry&);
-void initializeForwardControlFlowIntegrityPass(PassRegistry&);
 void initializeFuncletLayoutPass(PassRegistry&);
-void initializeFunctionImportLegacyPassPass(PassRegistry&);
-void initializeFunctionSpecializationLegacyPassPass(PassRegistry &);
 void initializeGCMachineCodeAnalysisPass(PassRegistry&);
 void initializeGCModuleInfoPass(PassRegistry&);
-void initializeGCOVProfilerLegacyPassPass(PassRegistry&);
 void initializeGVNHoistLegacyPassPass(PassRegistry&);
 void initializeGVNLegacyPassPass(PassRegistry&);
 void initializeGVNSinkLegacyPassPass(PassRegistry&);
@@ -183,9 +155,8 @@ void initializeGlobalSplitPass(PassRegistry&);
 void initializeGlobalsAAWrapperPassPass(PassRegistry&);
 void initializeGuardWideningLegacyPassPass(PassRegistry&);
 void initializeHardwareLoopsPass(PassRegistry&);
-void initializeMemProfilerLegacyPassPass(PassRegistry &);
+void initializeMIRProfileLoaderPassPass(PassRegistry &);
 void initializeHotColdSplittingLegacyPassPass(PassRegistry&);
-void initializeHWAddressSanitizerLegacyPassPass(PassRegistry &);
 void initializeIPSCCPLegacyPassPass(PassRegistry&);
 void initializeIRCELegacyPassPass(PassRegistry&);
 void initializeIROutlinerLegacyPassPass(PassRegistry&);
@@ -200,18 +171,16 @@ void initializeIndirectBrExpandPassPass(PassRegistry&);
 void initializeInferAddressSpacesPass(PassRegistry&);
 void initializeInferFunctionAttrsLegacyPassPass(PassRegistry&);
 void initializeInjectTLIMappingsLegacyPass(PassRegistry &);
-void initializeInlineCostAnalysisPass(PassRegistry&);
 void initializeInstCountLegacyPassPass(PassRegistry &);
 void initializeInstNamerPass(PassRegistry&);
 void initializeInstSimplifyLegacyPassPass(PassRegistry &);
-void initializeInstrProfilingLegacyPassPass(PassRegistry&);
-void initializeInstrOrderFileLegacyPassPass(PassRegistry&);
 void initializeInstructionCombiningPassPass(PassRegistry&);
 void initializeInstructionSelectPass(PassRegistry&);
 void initializeInterleavedAccessPass(PassRegistry&);
 void initializeInterleavedLoadCombinePass(PassRegistry &);
 void initializeInternalizeLegacyPassPass(PassRegistry&);
 void initializeIntervalPartitionPass(PassRegistry&);
+void initializeJMCInstrumenterPass(PassRegistry&);
 void initializeJumpThreadingPass(PassRegistry&);
 void initializeLCSSAVerificationPassPass(PassRegistry&);
 void initializeLCSSAWrapperPassPass(PassRegistry&);
@@ -234,9 +203,9 @@ void initializeLiveIntervalsPass(PassRegistry&);
 void initializeLiveRangeShrinkPass(PassRegistry&);
 void initializeLiveRegMatrixPass(PassRegistry&);
 void initializeLiveStacksPass(PassRegistry&);
-void initializeLiveVariablesPass(PassRegistry&);
+void initializeLiveVariablesPass(PassRegistry &);
+void initializeLoadStoreOptPass(PassRegistry &);
 void initializeLoadStoreVectorizerLegacyPassPass(PassRegistry&);
-void initializeLoaderPassPass(PassRegistry&);
 void initializeLocalStackSlotPassPass(PassRegistry&);
 void initializeLocalizerPass(PassRegistry&);
 void initializeLoopAccessLegacyAnalysisPass(PassRegistry&);
@@ -261,7 +230,6 @@ void initializeLoopSimplifyPass(PassRegistry&);
 void initializeLoopStrengthReducePass(PassRegistry&);
 void initializeLoopUnrollAndJamPass(PassRegistry&);
 void initializeLoopUnrollPass(PassRegistry&);
-void initializeLoopUnswitchPass(PassRegistry&);
 void initializeLoopVectorizePass(PassRegistry&);
 void initializeLoopVersioningLICMLegacyPassPass(PassRegistry &);
 void initializeLoopVersioningLegacyPassPass(PassRegistry &);
@@ -269,14 +237,15 @@ void initializeLowerAtomicLegacyPassPass(PassRegistry&);
 void initializeLowerConstantIntrinsicsPass(PassRegistry&);
 void initializeLowerEmuTLSPass(PassRegistry&);
 void initializeLowerExpectIntrinsicPass(PassRegistry&);
+void initializeLowerGlobalDtorsLegacyPassPass(PassRegistry &);
 void initializeLowerGuardIntrinsicLegacyPassPass(PassRegistry&);
 void initializeLowerWidenableConditionLegacyPassPass(PassRegistry&);
 void initializeLowerIntrinsicsPass(PassRegistry&);
 void initializeLowerInvokeLegacyPassPass(PassRegistry&);
 void initializeLowerSwitchLegacyPassPass(PassRegistry &);
-void initializeLowerTypeTestsPass(PassRegistry&);
 void initializeLowerMatrixIntrinsicsLegacyPassPass(PassRegistry &);
 void initializeLowerMatrixIntrinsicsMinimalLegacyPassPass(PassRegistry &);
+void initializeKCFIPass(PassRegistry &);
 void initializeMIRAddFSDiscriminatorsPass(PassRegistry &);
 void initializeMIRCanonicalizerPass(PassRegistry &);
 void initializeMIRNamerPass(PassRegistry &);
@@ -285,13 +254,17 @@ void initializeMachineBlockFrequencyInfoPass(PassRegistry&);
 void initializeMachineBlockPlacementPass(PassRegistry&);
 void initializeMachineBlockPlacementStatsPass(PassRegistry&);
 void initializeMachineBranchProbabilityInfoPass(PassRegistry&);
+void initializeMachineCFGPrinterPass(PassRegistry &);
 void initializeMachineCSEPass(PassRegistry&);
 void initializeMachineCombinerPass(PassRegistry&);
 void initializeMachineCopyPropagationPass(PassRegistry&);
+void initializeMachineCycleInfoPrinterPassPass(PassRegistry &);
+void initializeMachineCycleInfoWrapperPassPass(PassRegistry &);
 void initializeMachineDominanceFrontierPass(PassRegistry&);
 void initializeMachineDominatorTreePass(PassRegistry&);
 void initializeMachineFunctionPrinterPassPass(PassRegistry&);
 void initializeMachineFunctionSplitterPass(PassRegistry &);
+void initializeMachineLateInstrsCleanupPass(PassRegistry&);
 void initializeMachineLICMPass(PassRegistry&);
 void initializeMachineLoopInfoPass(PassRegistry&);
 void initializeMachineModuleInfoWrapperPassPass(PassRegistry &);
@@ -300,9 +273,12 @@ void initializeMachineOutlinerPass(PassRegistry&);
 void initializeMachinePipelinerPass(PassRegistry&);
 void initializeMachinePostDominatorTreePass(PassRegistry&);
 void initializeMachineRegionInfoPassPass(PassRegistry&);
+void initializeMachineSanitizerBinaryMetadataPass(PassRegistry &);
 void initializeMachineSchedulerPass(PassRegistry&);
 void initializeMachineSinkingPass(PassRegistry&);
 void initializeMachineTraceMetricsPass(PassRegistry&);
+void initializeMachineUniformityInfoPrinterPassPass(PassRegistry &);
+void initializeMachineUniformityAnalysisPassPass(PassRegistry &);
 void initializeMachineVerifierPassPass(PassRegistry&);
 void initializeMemCpyOptLegacyPassPass(PassRegistry&);
 void initializeMemDepPrinterPass(PassRegistry&);
@@ -310,34 +286,21 @@ void initializeMemDerefPrinterPass(PassRegistry&);
 void initializeMemoryDependenceWrapperPassPass(PassRegistry&);
 void initializeMemorySSAPrinterLegacyPassPass(PassRegistry&);
 void initializeMemorySSAWrapperPassPass(PassRegistry&);
-void initializeMemorySanitizerLegacyPassPass(PassRegistry&);
 void initializeMergeFunctionsLegacyPassPass(PassRegistry&);
 void initializeMergeICmpsLegacyPassPass(PassRegistry &);
 void initializeMergedLoadStoreMotionLegacyPassPass(PassRegistry&);
 void initializeMetaRenamerPass(PassRegistry&);
 void initializeModuleDebugInfoLegacyPrinterPass(PassRegistry &);
-void initializeModuleMemProfilerLegacyPassPass(PassRegistry &);
 void initializeModuleSummaryIndexWrapperPassPass(PassRegistry&);
 void initializeModuloScheduleTestPass(PassRegistry&);
 void initializeMustExecutePrinterPass(PassRegistry&);
 void initializeMustBeExecutedContextPrinterPass(PassRegistry&);
-void initializeNameAnonGlobalLegacyPassPass(PassRegistry&);
 void initializeNaryReassociateLegacyPassPass(PassRegistry&);
 void initializeNewGVNLegacyPassPass(PassRegistry&);
-void initializeObjCARCAAWrapperPassPass(PassRegistry&);
-void initializeObjCARCAPElimPass(PassRegistry&);
 void initializeObjCARCContractLegacyPassPass(PassRegistry &);
-void initializeObjCARCExpandPass(PassRegistry&);
-void initializeObjCARCOptLegacyPassPass(PassRegistry &);
 void initializeOptimizationRemarkEmitterWrapperPassPass(PassRegistry&);
 void initializeOptimizePHIsPass(PassRegistry&);
-void initializePAEvalPass(PassRegistry&);
 void initializePEIPass(PassRegistry&);
-void initializePGOIndirectCallPromotionLegacyPassPass(PassRegistry&);
-void initializePGOInstrumentationGenLegacyPassPass(PassRegistry&);
-void initializePGOInstrumentationUseLegacyPassPass(PassRegistry&);
-void initializePGOInstrumentationGenCreateVarLegacyPassPass(PassRegistry&);
-void initializePGOMemOPSizeOptLegacyPassPass(PassRegistry&);
 void initializePHIEliminationPass(PassRegistry&);
 void initializePartialInlinerLegacyPassPass(PassRegistry&);
 void initializePartiallyInlineLibCallsLegacyPassPass(PassRegistry&);
@@ -347,12 +310,11 @@ void initializePhiValuesWrapperPassPass(PassRegistry&);
 void initializePhysicalRegisterUsageInfoPass(PassRegistry&);
 void initializePlaceBackedgeSafepointsImplPass(PassRegistry&);
 void initializePlaceSafepointsPass(PassRegistry&);
-void initializePostDomOnlyPrinterPass(PassRegistry&);
-void initializePostDomOnlyViewerPass(PassRegistry&);
-void initializePostDomPrinterPass(PassRegistry&);
-void initializePostDomViewerPass(PassRegistry&);
+void initializePostDomOnlyPrinterWrapperPassPass(PassRegistry &);
+void initializePostDomOnlyViewerWrapperPassPass(PassRegistry &);
+void initializePostDomPrinterWrapperPassPass(PassRegistry &);
+void initializePostDomViewerWrapperPassPass(PassRegistry &);
 void initializePostDominatorTreeWrapperPassPass(PassRegistry&);
-void initializePostInlineEntryExitInstrumenterPass(PassRegistry&);
 void initializePostMachineSchedulerPass(PassRegistry&);
 void initializePostOrderFunctionAttrsLegacyPassPass(PassRegistry&);
 void initializePostRAHazardRecognizerPass(PassRegistry&);
@@ -365,14 +327,16 @@ void initializePrintModulePassWrapperPass(PassRegistry&);
 void initializeProcessImplicitDefsPass(PassRegistry&);
 void initializeProfileSummaryInfoWrapperPassPass(PassRegistry&);
 void initializePromoteLegacyPassPass(PassRegistry&);
-void initializePruneEHPass(PassRegistry&);
 void initializeRABasicPass(PassRegistry&);
 void initializePseudoProbeInserterPass(PassRegistry &);
 void initializeRAGreedyPass(PassRegistry&);
 void initializeReachingDefAnalysisPass(PassRegistry&);
 void initializeReassociateLegacyPassPass(PassRegistry&);
 void initializeRedundantDbgInstEliminationPass(PassRegistry&);
+void initializeRegAllocEvictionAdvisorAnalysisPass(PassRegistry &);
 void initializeRegAllocFastPass(PassRegistry&);
+void initializeRegAllocPriorityAdvisorAnalysisPass(PassRegistry &);
+void initializeRegAllocScoringPass(PassRegistry &);
 void initializeRegBankSelectPass(PassRegistry&);
 void initializeRegToMemLegacyPass(PassRegistry&);
 void initializeRegUsageInfoCollectorPass(PassRegistry&);
@@ -397,8 +361,7 @@ void initializeSLPVectorizerPass(PassRegistry&);
 void initializeSROALegacyPassPass(PassRegistry&);
 void initializeSafeStackLegacyPassPass(PassRegistry&);
 void initializeSafepointIRVerifierPass(PassRegistry&);
-void initializeSampleProfileLoaderLegacyPassPass(PassRegistry&);
-void initializeModuleSanitizerCoverageLegacyPassPass(PassRegistry &);
+void initializeSelectOptimizePass(PassRegistry &);
 void initializeScalarEvolutionWrapperPassPass(PassRegistry&);
 void initializeScalarizeMaskedMemIntrinLegacyPassPass(PassRegistry &);
 void initializeScalarizerLegacyPassPass(PassRegistry&);
@@ -416,6 +379,7 @@ void initializeSlotIndexesPass(PassRegistry&);
 void initializeSpeculativeExecutionLegacyPassPass(PassRegistry&);
 void initializeSpillPlacementPass(PassRegistry&);
 void initializeStackColoringPass(PassRegistry&);
+void initializeStackFrameLayoutAnalysisPassPass(PassRegistry &);
 void initializeStackMapLivenessPass(PassRegistry&);
 void initializeStackProtectorPass(PassRegistry&);
 void initializeStackSafetyGlobalInfoWrapperPassPass(PassRegistry &);
@@ -436,10 +400,11 @@ void initializeTailDuplicatePass(PassRegistry&);
 void initializeTargetLibraryInfoWrapperPassPass(PassRegistry&);
 void initializeTargetPassConfigPass(PassRegistry&);
 void initializeTargetTransformInfoWrapperPassPass(PassRegistry&);
-void initializeThreadSanitizerLegacyPassPass(PassRegistry&);
+void initializeTLSVariableHoistLegacyPassPass(PassRegistry &);
 void initializeTwoAddressInstructionPassPass(PassRegistry&);
 void initializeTypeBasedAAWrapperPassPass(PassRegistry&);
-void initializeTypePromotionPass(PassRegistry&);
+void initializeTypePromotionLegacyPass(PassRegistry&);
+void initializeUniformityInfoWrapperPassPass(PassRegistry &);
 void initializeUnifyFunctionExitNodesLegacyPassPass(PassRegistry &);
 void initializeUnifyLoopExitsLegacyPassPass(PassRegistry &);
 void initializeUnpackMachineBundlesPass(PassRegistry&);
@@ -451,10 +416,8 @@ void initializeVirtRegMapPass(PassRegistry&);
 void initializeVirtRegRewriterPass(PassRegistry&);
 void initializeWarnMissedTransformationsLegacyPass(PassRegistry &);
 void initializeWasmEHPreparePass(PassRegistry&);
-void initializeWholeProgramDevirtPass(PassRegistry&);
 void initializeWinEHPreparePass(PassRegistry&);
 void initializeWriteBitcodePassPass(PassRegistry&);
-void initializeWriteThinLTOBitcodePass(PassRegistry&);
 void initializeXRayInstrumentationPass(PassRegistry&);
 
 } // end namespace llvm
diff --git a/gnu/llvm/llvm/include/llvm/LTO/Caching.h b/gnu/llvm/llvm/include/llvm/LTO/Caching.h
deleted file mode 100644
index 43b978328b7..00000000000
--- a/gnu/llvm/llvm/include/llvm/LTO/Caching.h
+++ /dev/null
@@ -1,38 +0,0 @@
-//===- Caching.h - LLVM Link Time Optimizer Configuration -----------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines the localCache function, which allows clients to add a
-// filesystem cache to ThinLTO.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_LTO_CACHING_H
-#define LLVM_LTO_CACHING_H
-
-#include "llvm/LTO/LTO.h"
-
-namespace llvm {
-namespace lto {
-
-/// This type defines the callback to add a pre-existing native object file
-/// (e.g. in a cache).
-///
-/// Buffer callbacks must be thread safe.
-using AddBufferFn =
-    std::function<void(unsigned Task, std::unique_ptr<MemoryBuffer> MB)>;
-
-/// Create a local file system cache which uses the given cache directory and
-/// file callback. This function also creates the cache directory if it does not
-/// already exist.
-Expected<NativeObjectCache> localCache(StringRef CacheDirectoryPath,
-                                       AddBufferFn AddBuffer);
-
-} // namespace lto
-} // namespace llvm
-
-#endif
diff --git a/gnu/llvm/llvm/include/llvm/MC/MCFixedLenDisassembler.h b/gnu/llvm/llvm/include/llvm/MC/MCFixedLenDisassembler.h
deleted file mode 100644
index 218ae0d1318..00000000000
--- a/gnu/llvm/llvm/include/llvm/MC/MCFixedLenDisassembler.h
+++ /dev/null
@@ -1,33 +0,0 @@
-//===-- llvm/MC/MCFixedLenDisassembler.h - Decoder driver -------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-// Fixed length disassembler decoder state machine driver.
-//===----------------------------------------------------------------------===//
-#ifndef LLVM_MC_MCFIXEDLENDISASSEMBLER_H
-#define LLVM_MC_MCFIXEDLENDISASSEMBLER_H
-
-namespace llvm {
-
-namespace MCD {
-// Disassembler state machine opcodes.
-enum DecoderOps {
-  OPC_ExtractField = 1, // OPC_ExtractField(uint8_t Start, uint8_t Len)
-  OPC_FilterValue,      // OPC_FilterValue(uleb128 Val, uint16_t NumToSkip)
-  OPC_CheckField,       // OPC_CheckField(uint8_t Start, uint8_t Len,
-                        //                uleb128 Val, uint16_t NumToSkip)
-  OPC_CheckPredicate,   // OPC_CheckPredicate(uleb128 PIdx, uint16_t NumToSkip)
-  OPC_Decode,           // OPC_Decode(uleb128 Opcode, uleb128 DIdx)
-  OPC_TryDecode,        // OPC_TryDecode(uleb128 Opcode, uleb128 DIdx,
-                        //               uint16_t NumToSkip)
-  OPC_SoftFail,         // OPC_SoftFail(uleb128 PMask, uleb128 NMask)
-  OPC_Fail              // OPC_Fail()
-};
-
-} // namespace MCDecode
-} // namespace llvm
-
-#endif
diff --git a/gnu/llvm/llvm/include/llvm/Support/AArch64TargetParser.def b/gnu/llvm/llvm/include/llvm/Support/AArch64TargetParser.def
deleted file mode 100644
index ae2fc673c54..00000000000
--- a/gnu/llvm/llvm/include/llvm/Support/AArch64TargetParser.def
+++ /dev/null
@@ -1,239 +0,0 @@
-//===- AARCH64TargetParser.def - AARCH64 target parsing defines ---------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file provides defines to build up the AARCH64 target parser's logic.
-//
-//===----------------------------------------------------------------------===//
-
-// NOTE: NO INCLUDE GUARD DESIRED!
-
-#ifndef AARCH64_ARCH
-#define AARCH64_ARCH(NAME, ID, CPU_ATTR, SUB_ARCH, ARCH_ATTR, ARCH_FPU, ARCH_BASE_EXT)
-#endif
-AARCH64_ARCH("invalid", INVALID, "", "",
-             ARMBuildAttrs::CPUArch::v8_A, FK_NONE, AArch64::AEK_NONE)
-AARCH64_ARCH("armv8-a", ARMV8A, "8-A", "v8", ARMBuildAttrs::CPUArch::v8_A,
-             FK_CRYPTO_NEON_FP_ARMV8,
-             (AArch64::AEK_CRYPTO | AArch64::AEK_FP | AArch64::AEK_SIMD))
-AARCH64_ARCH("armv8.1-a", ARMV8_1A, "8.1-A", "v8.1a",
-             ARMBuildAttrs::CPUArch::v8_A, FK_CRYPTO_NEON_FP_ARMV8,
-             (AArch64::AEK_CRC | AArch64::AEK_CRYPTO | AArch64::AEK_FP |
-              AArch64::AEK_SIMD | AArch64::AEK_LSE | AArch64::AEK_RDM))
-AARCH64_ARCH("armv8.2-a", ARMV8_2A, "8.2-A", "v8.2a",
-             ARMBuildAttrs::CPUArch::v8_A, FK_CRYPTO_NEON_FP_ARMV8,
-             (AArch64::AEK_CRC | AArch64::AEK_CRYPTO | AArch64::AEK_FP |
-              AArch64::AEK_SIMD | AArch64::AEK_RAS | AArch64::AEK_LSE |
-              AArch64::AEK_RDM))
-AARCH64_ARCH("armv8.3-a", ARMV8_3A, "8.3-A", "v8.3a",
-             ARMBuildAttrs::CPUArch::v8_A, FK_CRYPTO_NEON_FP_ARMV8,
-             (AArch64::AEK_CRC | AArch64::AEK_CRYPTO | AArch64::AEK_FP |
-              AArch64::AEK_SIMD | AArch64::AEK_RAS | AArch64::AEK_LSE |
-              AArch64::AEK_RDM | AArch64::AEK_RCPC))
-AARCH64_ARCH("armv8.4-a", ARMV8_4A, "8.4-A", "v8.4a",
-             ARMBuildAttrs::CPUArch::v8_A, FK_CRYPTO_NEON_FP_ARMV8,
-             (AArch64::AEK_CRC | AArch64::AEK_CRYPTO | AArch64::AEK_FP |
-              AArch64::AEK_SIMD | AArch64::AEK_RAS | AArch64::AEK_LSE |
-              AArch64::AEK_RDM | AArch64::AEK_RCPC | AArch64::AEK_DOTPROD))
-AARCH64_ARCH("armv8.5-a", ARMV8_5A, "8.5-A", "v8.5a",
-             ARMBuildAttrs::CPUArch::v8_A, FK_CRYPTO_NEON_FP_ARMV8,
-             (AArch64::AEK_CRC | AArch64::AEK_CRYPTO | AArch64::AEK_FP |
-              AArch64::AEK_SIMD | AArch64::AEK_RAS | AArch64::AEK_LSE |
-              AArch64::AEK_RDM | AArch64::AEK_RCPC | AArch64::AEK_DOTPROD))
-AARCH64_ARCH("armv8.6-a", ARMV8_6A, "8.6-A", "v8.6a",
-             ARMBuildAttrs::CPUArch::v8_A, FK_CRYPTO_NEON_FP_ARMV8,
-             (AArch64::AEK_CRC  | AArch64::AEK_FP   |
-              AArch64::AEK_SIMD | AArch64::AEK_RAS  | AArch64::AEK_LSE     |
-              AArch64::AEK_RDM  | AArch64::AEK_RCPC | AArch64::AEK_DOTPROD |
-              AArch64::AEK_SM4  | AArch64::AEK_SHA3 | AArch64::AEK_BF16    |
-              AArch64::AEK_SHA2 | AArch64::AEK_AES  | AArch64::AEK_I8MM))
-AARCH64_ARCH("armv8.7-a", ARMV8_7A, "8.7-A", "v8.7a",
-             ARMBuildAttrs::CPUArch::v8_A, FK_CRYPTO_NEON_FP_ARMV8,
-             (AArch64::AEK_CRC | AArch64::AEK_FP |
-              AArch64::AEK_SIMD | AArch64::AEK_RAS | AArch64::AEK_LSE |
-              AArch64::AEK_RDM | AArch64::AEK_RCPC | AArch64::AEK_DOTPROD |
-              AArch64::AEK_SM4 | AArch64::AEK_SHA3 | AArch64::AEK_BF16 |
-              AArch64::AEK_SHA2 | AArch64::AEK_AES | AArch64::AEK_I8MM))
-// For v8-R, we do not enable crypto and align with GCC that enables a more
-// minimal set of optional architecture extensions.
-AARCH64_ARCH("armv8-r", ARMV8R, "8-R", "v8r",
-             ARMBuildAttrs::CPUArch::v8_R, FK_CRYPTO_NEON_FP_ARMV8,
-             (AArch64::AEK_CRC     | AArch64::AEK_RDM  | AArch64::AEK_SSBS |
-              AArch64::AEK_DOTPROD | AArch64::AEK_FP   | AArch64::AEK_SIMD |
-              AArch64::AEK_FP16    | AArch64::AEK_FP16FML | AArch64::AEK_RAS |
-              AArch64::AEK_RCPC    | AArch64::AEK_SB))
-#undef AARCH64_ARCH
-
-#ifndef AARCH64_ARCH_EXT_NAME
-#define AARCH64_ARCH_EXT_NAME(NAME, ID, FEATURE, NEGFEATURE)
-#endif
-// FIXME: This would be nicer were it tablegen
-AARCH64_ARCH_EXT_NAME("invalid",      AArch64::AEK_INVALID,     nullptr,  nullptr)
-AARCH64_ARCH_EXT_NAME("none",         AArch64::AEK_NONE,        nullptr,  nullptr)
-AARCH64_ARCH_EXT_NAME("crc",          AArch64::AEK_CRC,         "+crc",   "-crc")
-AARCH64_ARCH_EXT_NAME("lse",          AArch64::AEK_LSE,         "+lse",   "-lse")
-AARCH64_ARCH_EXT_NAME("rdm",          AArch64::AEK_RDM,         "+rdm",   "-rdm")
-AARCH64_ARCH_EXT_NAME("crypto",       AArch64::AEK_CRYPTO,      "+crypto","-crypto")
-AARCH64_ARCH_EXT_NAME("sm4",          AArch64::AEK_SM4,         "+sm4",   "-sm4")
-AARCH64_ARCH_EXT_NAME("sha3",         AArch64::AEK_SHA3,        "+sha3",  "-sha3")
-AARCH64_ARCH_EXT_NAME("sha2",         AArch64::AEK_SHA2,        "+sha2",  "-sha2")
-AARCH64_ARCH_EXT_NAME("aes",          AArch64::AEK_AES,         "+aes",   "-aes")
-AARCH64_ARCH_EXT_NAME("dotprod",      AArch64::AEK_DOTPROD,     "+dotprod","-dotprod")
-AARCH64_ARCH_EXT_NAME("fp",           AArch64::AEK_FP,          "+fp-armv8",  "-fp-armv8")
-AARCH64_ARCH_EXT_NAME("simd",         AArch64::AEK_SIMD,        "+neon",  "-neon")
-AARCH64_ARCH_EXT_NAME("fp16",         AArch64::AEK_FP16,        "+fullfp16",  "-fullfp16")
-AARCH64_ARCH_EXT_NAME("fp16fml",      AArch64::AEK_FP16FML,     "+fp16fml", "-fp16fml")
-AARCH64_ARCH_EXT_NAME("profile",      AArch64::AEK_PROFILE,     "+spe",  "-spe")
-AARCH64_ARCH_EXT_NAME("ras",          AArch64::AEK_RAS,         "+ras",  "-ras")
-AARCH64_ARCH_EXT_NAME("sve",          AArch64::AEK_SVE,         "+sve",  "-sve")
-AARCH64_ARCH_EXT_NAME("sve2",         AArch64::AEK_SVE2,        "+sve2", "-sve2")
-AARCH64_ARCH_EXT_NAME("sve2-aes",     AArch64::AEK_SVE2AES,     "+sve2-aes", "-sve2-aes")
-AARCH64_ARCH_EXT_NAME("sve2-sm4",     AArch64::AEK_SVE2SM4,     "+sve2-sm4", "-sve2-sm4")
-AARCH64_ARCH_EXT_NAME("sve2-sha3",    AArch64::AEK_SVE2SHA3,    "+sve2-sha3", "-sve2-sha3")
-AARCH64_ARCH_EXT_NAME("sve2-bitperm", AArch64::AEK_SVE2BITPERM, "+sve2-bitperm", "-sve2-bitperm")
-AARCH64_ARCH_EXT_NAME("rcpc",         AArch64::AEK_RCPC,        "+rcpc", "-rcpc")
-AARCH64_ARCH_EXT_NAME("rng",          AArch64::AEK_RAND,        "+rand",  "-rand")
-AARCH64_ARCH_EXT_NAME("memtag",       AArch64::AEK_MTE,         "+mte",   "-mte")
-AARCH64_ARCH_EXT_NAME("ssbs",         AArch64::AEK_SSBS,        "+ssbs",  "-ssbs")
-AARCH64_ARCH_EXT_NAME("sb",           AArch64::AEK_SB,          "+sb",    "-sb")
-AARCH64_ARCH_EXT_NAME("predres",      AArch64::AEK_PREDRES,     "+predres", "-predres")
-AARCH64_ARCH_EXT_NAME("bf16",         AArch64::AEK_BF16,        "+bf16",  "-bf16")
-AARCH64_ARCH_EXT_NAME("i8mm",         AArch64::AEK_I8MM,        "+i8mm",  "-i8mm")
-AARCH64_ARCH_EXT_NAME("f32mm",        AArch64::AEK_F32MM,       "+f32mm", "-f32mm")
-AARCH64_ARCH_EXT_NAME("f64mm",        AArch64::AEK_F64MM,       "+f64mm", "-f64mm")
-AARCH64_ARCH_EXT_NAME("tme",          AArch64::AEK_TME,         "+tme",   "-tme")
-AARCH64_ARCH_EXT_NAME("ls64",         AArch64::AEK_LS64,        "+ls64",  "-ls64")
-AARCH64_ARCH_EXT_NAME("brbe",         AArch64::AEK_BRBE,        "+brbe",  "-brbe")
-AARCH64_ARCH_EXT_NAME("pauth",        AArch64::AEK_PAUTH,       "+pauth", "-pauth")
-AARCH64_ARCH_EXT_NAME("flagm",        AArch64::AEK_FLAGM,       "+flagm", "-flagm")
-AARCH64_ARCH_EXT_NAME("sme",          AArch64::AEK_SME,         "+sme",   "-sme")
-AARCH64_ARCH_EXT_NAME("sme-f64",      AArch64::AEK_SMEF64,      "+sme-f64", "-sme-f64")
-AARCH64_ARCH_EXT_NAME("sme-i64",      AArch64::AEK_SMEI64,      "+sme-i64", "-sme-i64")
-#undef AARCH64_ARCH_EXT_NAME
-
-#ifndef AARCH64_CPU_NAME
-#define AARCH64_CPU_NAME(NAME, ID, DEFAULT_FPU, IS_DEFAULT, DEFAULT_EXT)
-#endif
-AARCH64_CPU_NAME("cortex-a34", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_CRC))
-AARCH64_CPU_NAME("cortex-a35", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_CRC))
-AARCH64_CPU_NAME("cortex-a53", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, true,
-                 (AArch64::AEK_CRC))
-AARCH64_CPU_NAME("cortex-a55", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_FP16 | AArch64::AEK_DOTPROD | AArch64::AEK_RCPC))
-AARCH64_CPU_NAME("cortex-a57", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_CRC))
-AARCH64_CPU_NAME("cortex-a65", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_DOTPROD | AArch64::AEK_FP16 | AArch64::AEK_RAS |
-                  AArch64::AEK_RCPC | AArch64::AEK_SSBS))
-AARCH64_CPU_NAME("cortex-a65ae", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_DOTPROD | AArch64::AEK_FP16 | AArch64::AEK_RAS |
-                  AArch64::AEK_RCPC | AArch64::AEK_SSBS))
-AARCH64_CPU_NAME("cortex-a72", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_CRC))
-AARCH64_CPU_NAME("cortex-a73", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_CRC))
-AARCH64_CPU_NAME("cortex-a75", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_FP16 | AArch64::AEK_DOTPROD | AArch64::AEK_RCPC))
-AARCH64_CPU_NAME("cortex-a76", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_FP16 | AArch64::AEK_DOTPROD | AArch64::AEK_RCPC |
-                  AArch64::AEK_SSBS))
-AARCH64_CPU_NAME("cortex-a76ae", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_FP16 | AArch64::AEK_DOTPROD | AArch64::AEK_RCPC |
-                  AArch64::AEK_SSBS))
-AARCH64_CPU_NAME("cortex-a77", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_FP16 | AArch64::AEK_RCPC | AArch64::AEK_DOTPROD |
-                  AArch64::AEK_SSBS))
-AARCH64_CPU_NAME("cortex-a78", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_FP16 | AArch64::AEK_DOTPROD | AArch64::AEK_RCPC |
-                  AArch64::AEK_SSBS))
-AARCH64_CPU_NAME("cortex-a78c", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_FP16 | AArch64::AEK_DOTPROD | AArch64::AEK_RCPC |
-                  AArch64::AEK_SSBS))
-AARCH64_CPU_NAME("cortex-r82", ARMV8R, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_LSE))
-AARCH64_CPU_NAME("cortex-x1", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_FP16 | AArch64::AEK_DOTPROD | AArch64::AEK_RCPC |
-                  AArch64::AEK_SSBS))
-AARCH64_CPU_NAME("neoverse-e1", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_DOTPROD | AArch64::AEK_FP16 | AArch64::AEK_RAS |
-                  AArch64::AEK_RCPC | AArch64::AEK_SSBS))
-AARCH64_CPU_NAME("neoverse-n1", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_DOTPROD | AArch64::AEK_FP16 |
-                  AArch64::AEK_PROFILE | AArch64::AEK_RAS | AArch64::AEK_RCPC |
-                  AArch64::AEK_SSBS))
-AARCH64_CPU_NAME("neoverse-n2", ARMV8_5A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_BF16 | AArch64::AEK_DOTPROD | AArch64::AEK_FP16 |
-                  AArch64::AEK_I8MM | AArch64::AEK_MTE | AArch64::AEK_RAS |
-                  AArch64::AEK_RCPC | AArch64::AEK_SB | AArch64::AEK_SSBS |
-                  AArch64::AEK_SVE | AArch64::AEK_SVE2 | AArch64::AEK_SVE2BITPERM))
-AARCH64_CPU_NAME("neoverse-v1", ARMV8_4A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_RAS | AArch64::AEK_SVE | AArch64::AEK_SSBS |
-                  AArch64::AEK_RCPC | AArch64::AEK_FP16 | AArch64::AEK_BF16 |
-                  AArch64::AEK_DOTPROD ))
-AARCH64_CPU_NAME("cyclone", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_NONE))
-AARCH64_CPU_NAME("apple-a7", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_NONE))
-AARCH64_CPU_NAME("apple-a8", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_NONE))
-AARCH64_CPU_NAME("apple-a9", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_NONE))
-AARCH64_CPU_NAME("apple-a10", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_CRC | AArch64::AEK_RDM))
-AARCH64_CPU_NAME("apple-a11", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_FP16))
-AARCH64_CPU_NAME("apple-a12", ARMV8_3A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_FP16))
-AARCH64_CPU_NAME("apple-a13", ARMV8_4A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_FP16 | AArch64::AEK_FP16FML))
-AARCH64_CPU_NAME("apple-a14", ARMV8_5A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_FP16 | AArch64::AEK_FP16FML))
-AARCH64_CPU_NAME("apple-m1", ARMV8_5A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_FP16 | AArch64::AEK_FP16FML))
-AARCH64_CPU_NAME("apple-s4", ARMV8_3A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_FP16))
-AARCH64_CPU_NAME("apple-s5", ARMV8_3A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_FP16))
-AARCH64_CPU_NAME("exynos-m3", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_CRC))
-AARCH64_CPU_NAME("exynos-m4", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_DOTPROD | AArch64::AEK_FP16))
-AARCH64_CPU_NAME("exynos-m5", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_DOTPROD | AArch64::AEK_FP16))
-AARCH64_CPU_NAME("falkor", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_CRC | AArch64::AEK_RDM))
-AARCH64_CPU_NAME("saphira", ARMV8_3A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_PROFILE))
-AARCH64_CPU_NAME("kryo", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_CRC))
-AARCH64_CPU_NAME("thunderx2t99", ARMV8_1A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_NONE))
-AARCH64_CPU_NAME("thunderx3t110", ARMV8_3A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_CRC | AEK_CRYPTO | AEK_FP | AEK_SIMD |
-                  AEK_LSE | AEK_RAND | AArch64::AEK_PROFILE |
-                  AArch64::AEK_RAS))
-AARCH64_CPU_NAME("thunderx", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_CRC | AArch64::AEK_PROFILE))
-AARCH64_CPU_NAME("thunderxt88", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_CRC | AArch64::AEK_PROFILE))
-AARCH64_CPU_NAME("thunderxt81", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_CRC | AArch64::AEK_PROFILE))
-AARCH64_CPU_NAME("thunderxt83", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_CRC | AArch64::AEK_PROFILE))
-AARCH64_CPU_NAME("tsv110", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_DOTPROD |
-                  AArch64::AEK_FP16 | AArch64::AEK_FP16FML |
-                  AArch64::AEK_PROFILE))
-AARCH64_CPU_NAME("a64fx", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 (AArch64::AEK_FP16 | AArch64::AEK_SVE))
-AARCH64_CPU_NAME("carmel", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
-                 AArch64::AEK_FP16)
-// Invalid CPU
-AARCH64_CPU_NAME("invalid", INVALID, FK_INVALID, true, AArch64::AEK_INVALID)
-#undef AARCH64_CPU_NAME
diff --git a/gnu/llvm/llvm/include/llvm/Support/ARMTargetParser.def b/gnu/llvm/llvm/include/llvm/Support/ARMTargetParser.def
deleted file mode 100644
index 14b169a6e11..00000000000
--- a/gnu/llvm/llvm/include/llvm/Support/ARMTargetParser.def
+++ /dev/null
@@ -1,322 +0,0 @@
-//===- ARMTargetParser.def - ARM target parsing defines ---------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file provides defines to build up the ARM target parser's logic.
-//
-//===----------------------------------------------------------------------===//
-
-// NOTE: NO INCLUDE GUARD DESIRED!
-
-#ifndef ARM_FPU
-#define ARM_FPU(NAME, KIND, VERSION, NEON_SUPPORT, RESTRICTION)
-#endif
-ARM_FPU("invalid", FK_INVALID, FPUVersion::NONE, NeonSupportLevel::None, FPURestriction::None)
-ARM_FPU("none", FK_NONE, FPUVersion::NONE, NeonSupportLevel::None, FPURestriction::None)
-ARM_FPU("vfp", FK_VFP, FPUVersion::VFPV2, NeonSupportLevel::None, FPURestriction::None)
-ARM_FPU("vfpv2", FK_VFPV2, FPUVersion::VFPV2, NeonSupportLevel::None, FPURestriction::None)
-ARM_FPU("vfpv3", FK_VFPV3, FPUVersion::VFPV3, NeonSupportLevel::None, FPURestriction::None)
-ARM_FPU("vfpv3-fp16", FK_VFPV3_FP16, FPUVersion::VFPV3_FP16, NeonSupportLevel::None, FPURestriction::None)
-ARM_FPU("vfpv3-d16", FK_VFPV3_D16, FPUVersion::VFPV3, NeonSupportLevel::None, FPURestriction::D16)
-ARM_FPU("vfpv3-d16-fp16", FK_VFPV3_D16_FP16, FPUVersion::VFPV3_FP16, NeonSupportLevel::None, FPURestriction::D16)
-ARM_FPU("vfpv3xd", FK_VFPV3XD, FPUVersion::VFPV3, NeonSupportLevel::None, FPURestriction::SP_D16)
-ARM_FPU("vfpv3xd-fp16", FK_VFPV3XD_FP16, FPUVersion::VFPV3_FP16, NeonSupportLevel::None, FPURestriction::SP_D16)
-ARM_FPU("vfpv4", FK_VFPV4, FPUVersion::VFPV4, NeonSupportLevel::None, FPURestriction::None)
-ARM_FPU("vfpv4-d16", FK_VFPV4_D16, FPUVersion::VFPV4, NeonSupportLevel::None, FPURestriction::D16)
-ARM_FPU("fpv4-sp-d16", FK_FPV4_SP_D16, FPUVersion::VFPV4, NeonSupportLevel::None, FPURestriction::SP_D16)
-ARM_FPU("fpv5-d16", FK_FPV5_D16, FPUVersion::VFPV5, NeonSupportLevel::None, FPURestriction::D16)
-ARM_FPU("fpv5-sp-d16", FK_FPV5_SP_D16, FPUVersion::VFPV5, NeonSupportLevel::None, FPURestriction::SP_D16)
-ARM_FPU("fp-armv8", FK_FP_ARMV8, FPUVersion::VFPV5, NeonSupportLevel::None, FPURestriction::None)
-ARM_FPU("fp-armv8-fullfp16-d16", FK_FP_ARMV8_FULLFP16_D16, FPUVersion::VFPV5_FULLFP16, NeonSupportLevel::None, FPURestriction::D16)
-ARM_FPU("fp-armv8-fullfp16-sp-d16", FK_FP_ARMV8_FULLFP16_SP_D16, FPUVersion::VFPV5_FULLFP16, NeonSupportLevel::None, FPURestriction::SP_D16)
-ARM_FPU("neon", FK_NEON, FPUVersion::VFPV3, NeonSupportLevel::Neon, FPURestriction::None)
-ARM_FPU("neon-fp16", FK_NEON_FP16, FPUVersion::VFPV3_FP16, NeonSupportLevel::Neon, FPURestriction::None)
-ARM_FPU("neon-vfpv4", FK_NEON_VFPV4, FPUVersion::VFPV4, NeonSupportLevel::Neon, FPURestriction::None)
-ARM_FPU("neon-fp-armv8", FK_NEON_FP_ARMV8, FPUVersion::VFPV5, NeonSupportLevel::Neon, FPURestriction::None)
-ARM_FPU("crypto-neon-fp-armv8", FK_CRYPTO_NEON_FP_ARMV8, FPUVersion::VFPV5, NeonSupportLevel::Crypto,
-        FPURestriction::None)
-ARM_FPU("softvfp", FK_SOFTVFP, FPUVersion::NONE, NeonSupportLevel::None, FPURestriction::None)
-#undef ARM_FPU
-
-#ifndef ARM_ARCH
-#define ARM_ARCH(NAME, ID, CPU_ATTR, SUB_ARCH, ARCH_ATTR, ARCH_FPU, ARCH_BASE_EXT)
-#endif
-ARM_ARCH("invalid", INVALID, "", "",
-          ARMBuildAttrs::CPUArch::Pre_v4, FK_NONE, ARM::AEK_NONE)
-ARM_ARCH("armv2", ARMV2, "2", "v2", ARMBuildAttrs::CPUArch::Pre_v4,
-          FK_NONE, ARM::AEK_NONE)
-ARM_ARCH("armv2a", ARMV2A, "2A", "v2a", ARMBuildAttrs::CPUArch::Pre_v4,
-          FK_NONE, ARM::AEK_NONE)
-ARM_ARCH("armv3", ARMV3, "3", "v3", ARMBuildAttrs::CPUArch::Pre_v4,
-          FK_NONE, ARM::AEK_NONE)
-ARM_ARCH("armv3m", ARMV3M, "3M", "v3m", ARMBuildAttrs::CPUArch::Pre_v4,
-          FK_NONE, ARM::AEK_NONE)
-ARM_ARCH("armv4", ARMV4, "4", "v4", ARMBuildAttrs::CPUArch::v4,
-          FK_NONE, ARM::AEK_NONE)
-ARM_ARCH("armv4t", ARMV4T, "4T", "v4t", ARMBuildAttrs::CPUArch::v4T,
-          FK_NONE, ARM::AEK_NONE)
-ARM_ARCH("armv5t", ARMV5T, "5T", "v5", ARMBuildAttrs::CPUArch::v5T,
-          FK_NONE, ARM::AEK_NONE)
-ARM_ARCH("armv5te", ARMV5TE, "5TE", "v5e", ARMBuildAttrs::CPUArch::v5TE,
-          FK_NONE, ARM::AEK_DSP)
-ARM_ARCH("armv5tej", ARMV5TEJ, "5TEJ", "v5e", ARMBuildAttrs::CPUArch::v5TEJ,
-          FK_NONE, ARM::AEK_DSP)
-ARM_ARCH("armv6", ARMV6, "6", "v6", ARMBuildAttrs::CPUArch::v6,
-          FK_VFPV2, ARM::AEK_DSP)
-ARM_ARCH("armv6k", ARMV6K, "6K", "v6k", ARMBuildAttrs::CPUArch::v6K,
-          FK_VFPV2, ARM::AEK_DSP)
-ARM_ARCH("armv6t2", ARMV6T2, "6T2", "v6t2", ARMBuildAttrs::CPUArch::v6T2,
-          FK_NONE, ARM::AEK_DSP)
-ARM_ARCH("armv6kz", ARMV6KZ, "6KZ", "v6kz", ARMBuildAttrs::CPUArch::v6KZ,
-          FK_VFPV2, (ARM::AEK_SEC | ARM::AEK_DSP))
-ARM_ARCH("armv6-m", ARMV6M, "6-M", "v6m", ARMBuildAttrs::CPUArch::v6_M,
-          FK_NONE, ARM::AEK_NONE)
-ARM_ARCH("armv7-a", ARMV7A, "7-A", "v7", ARMBuildAttrs::CPUArch::v7,
-          FK_NEON, ARM::AEK_DSP)
-ARM_ARCH("armv7ve", ARMV7VE, "7VE", "v7ve", ARMBuildAttrs::CPUArch::v7,
-          FK_NEON, (ARM::AEK_SEC | ARM::AEK_MP | ARM::AEK_VIRT |
-          ARM::AEK_HWDIVARM | ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP))
-ARM_ARCH("armv7-r", ARMV7R, "7-R", "v7r", ARMBuildAttrs::CPUArch::v7,
-          FK_NONE, (ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP))
-ARM_ARCH("armv7-m", ARMV7M, "7-M", "v7m", ARMBuildAttrs::CPUArch::v7,
-          FK_NONE, ARM::AEK_HWDIVTHUMB)
-ARM_ARCH("armv7e-m", ARMV7EM, "7E-M", "v7em", ARMBuildAttrs::CPUArch::v7E_M,
-          FK_NONE, (ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP))
-ARM_ARCH("armv8-a", ARMV8A, "8-A", "v8", ARMBuildAttrs::CPUArch::v8_A,
-         FK_CRYPTO_NEON_FP_ARMV8,
-         (ARM::AEK_SEC | ARM::AEK_MP | ARM::AEK_VIRT | ARM::AEK_HWDIVARM |
-          ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP | ARM::AEK_CRC))
-ARM_ARCH("armv8.1-a", ARMV8_1A, "8.1-A", "v8.1a",
-         ARMBuildAttrs::CPUArch::v8_A, FK_CRYPTO_NEON_FP_ARMV8,
-         (ARM::AEK_SEC | ARM::AEK_MP | ARM::AEK_VIRT | ARM::AEK_HWDIVARM |
-          ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP | ARM::AEK_CRC))
-ARM_ARCH("armv8.2-a", ARMV8_2A, "8.2-A", "v8.2a",
-         ARMBuildAttrs::CPUArch::v8_A, FK_CRYPTO_NEON_FP_ARMV8,
-         (ARM::AEK_SEC | ARM::AEK_MP | ARM::AEK_VIRT | ARM::AEK_HWDIVARM |
-          ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP | ARM::AEK_CRC | ARM::AEK_RAS))
-ARM_ARCH("armv8.3-a", ARMV8_3A, "8.3-A", "v8.3a",
-         ARMBuildAttrs::CPUArch::v8_A, FK_CRYPTO_NEON_FP_ARMV8,
-         (ARM::AEK_SEC | ARM::AEK_MP | ARM::AEK_VIRT | ARM::AEK_HWDIVARM |
-          ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP | ARM::AEK_CRC | ARM::AEK_RAS))
-ARM_ARCH("armv8.4-a", ARMV8_4A, "8.4-A", "v8.4a",
-         ARMBuildAttrs::CPUArch::v8_A, FK_CRYPTO_NEON_FP_ARMV8,
-         (ARM::AEK_SEC | ARM::AEK_MP | ARM::AEK_VIRT | ARM::AEK_HWDIVARM |
-          ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP | ARM::AEK_CRC | ARM::AEK_RAS |
-          ARM::AEK_DOTPROD))
-ARM_ARCH("armv8.5-a", ARMV8_5A, "8.5-A", "v8.5a",
-         ARMBuildAttrs::CPUArch::v8_A, FK_CRYPTO_NEON_FP_ARMV8,
-         (ARM::AEK_SEC | ARM::AEK_MP | ARM::AEK_VIRT | ARM::AEK_HWDIVARM |
-          ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP | ARM::AEK_CRC | ARM::AEK_RAS |
-          ARM::AEK_DOTPROD))
-ARM_ARCH("armv8.6-a", ARMV8_6A, "8.6-A", "v8.6a",
-         ARMBuildAttrs::CPUArch::v8_A, FK_CRYPTO_NEON_FP_ARMV8,
-         (ARM::AEK_SEC        | ARM::AEK_MP   | ARM::AEK_VIRT | ARM::AEK_HWDIVARM |
-          ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP  | ARM::AEK_CRC  | ARM::AEK_RAS |
-          ARM::AEK_DOTPROD    | ARM::AEK_BF16 | ARM::AEK_I8MM))
-ARM_ARCH("armv8.7-a", ARMV8_7A, "8.7-A", "v8.7a",
-         ARMBuildAttrs::CPUArch::v8_A, FK_CRYPTO_NEON_FP_ARMV8,
-         (ARM::AEK_SEC        | ARM::AEK_MP   | ARM::AEK_VIRT | ARM::AEK_HWDIVARM |
-          ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP  | ARM::AEK_CRC  | ARM::AEK_RAS |
-          ARM::AEK_DOTPROD    | ARM::AEK_BF16 | ARM::AEK_I8MM))
-ARM_ARCH("armv8-r", ARMV8R, "8-R", "v8r", ARMBuildAttrs::CPUArch::v8_R,
-          FK_NEON_FP_ARMV8,
-          (ARM::AEK_MP | ARM::AEK_VIRT | ARM::AEK_HWDIVARM | ARM::AEK_HWDIVTHUMB |
-           ARM::AEK_DSP | ARM::AEK_CRC))
-ARM_ARCH("armv8-m.base", ARMV8MBaseline, "8-M.Baseline", "v8m.base",
-          ARMBuildAttrs::CPUArch::v8_M_Base, FK_NONE, ARM::AEK_HWDIVTHUMB)
-ARM_ARCH("armv8-m.main", ARMV8MMainline, "8-M.Mainline", "v8m.main",
-          ARMBuildAttrs::CPUArch::v8_M_Main, FK_FPV5_D16, ARM::AEK_HWDIVTHUMB)
-ARM_ARCH("armv8.1-m.main", ARMV8_1MMainline, "8.1-M.Mainline", "v8.1m.main",
-          ARMBuildAttrs::CPUArch::v8_1_M_Main, FK_FP_ARMV8_FULLFP16_SP_D16, ARM::AEK_HWDIVTHUMB | ARM::AEK_RAS | ARM::AEK_LOB)
-// Non-standard Arch names.
-ARM_ARCH("iwmmxt", IWMMXT, "iwmmxt", "", ARMBuildAttrs::CPUArch::v5TE,
-          FK_NONE, ARM::AEK_NONE)
-ARM_ARCH("iwmmxt2", IWMMXT2, "iwmmxt2", "", ARMBuildAttrs::CPUArch::v5TE,
-          FK_NONE, ARM::AEK_NONE)
-ARM_ARCH("xscale", XSCALE, "xscale", "v5e", ARMBuildAttrs::CPUArch::v5TE,
-          FK_NONE, ARM::AEK_NONE)
-ARM_ARCH("armv7s", ARMV7S, "7-S", "v7s", ARMBuildAttrs::CPUArch::v7,
-          FK_NEON_VFPV4, ARM::AEK_DSP)
-ARM_ARCH("armv7k", ARMV7K, "7-K", "v7k", ARMBuildAttrs::CPUArch::v7,
-          FK_NONE, ARM::AEK_DSP)
-#undef ARM_ARCH
-
-#ifndef ARM_ARCH_EXT_NAME
-#define ARM_ARCH_EXT_NAME(NAME, ID, FEATURE, NEGFEATURE)
-#endif
-// FIXME: This would be nicer were it tablegen
-ARM_ARCH_EXT_NAME("invalid",  ARM::AEK_INVALID,  nullptr,  nullptr)
-ARM_ARCH_EXT_NAME("none",     ARM::AEK_NONE,     nullptr,  nullptr)
-ARM_ARCH_EXT_NAME("crc",      ARM::AEK_CRC,      "+crc",   "-crc")
-ARM_ARCH_EXT_NAME("crypto",   ARM::AEK_CRYPTO,   "+crypto","-crypto")
-ARM_ARCH_EXT_NAME("sha2",     ARM::AEK_SHA2,     "+sha2",  "-sha2")
-ARM_ARCH_EXT_NAME("aes",      ARM::AEK_AES,      "+aes",   "-aes")
-ARM_ARCH_EXT_NAME("dotprod",  ARM::AEK_DOTPROD,  "+dotprod","-dotprod")
-ARM_ARCH_EXT_NAME("dsp",      ARM::AEK_DSP,      "+dsp",   "-dsp")
-ARM_ARCH_EXT_NAME("fp",       ARM::AEK_FP,       nullptr,  nullptr)
-ARM_ARCH_EXT_NAME("fp.dp",    ARM::AEK_FP_DP,    nullptr,  nullptr)
-ARM_ARCH_EXT_NAME("mve",     (ARM::AEK_DSP | ARM::AEK_SIMD), "+mve", "-mve")
-ARM_ARCH_EXT_NAME("mve.fp",  (ARM::AEK_DSP | ARM::AEK_SIMD | ARM::AEK_FP), "+mve.fp", "-mve.fp")
-ARM_ARCH_EXT_NAME("idiv",     (ARM::AEK_HWDIVARM | ARM::AEK_HWDIVTHUMB), nullptr, nullptr)
-ARM_ARCH_EXT_NAME("mp",       ARM::AEK_MP,       nullptr,  nullptr)
-ARM_ARCH_EXT_NAME("simd",     ARM::AEK_SIMD,     nullptr,  nullptr)
-ARM_ARCH_EXT_NAME("sec",      ARM::AEK_SEC,      nullptr,  nullptr)
-ARM_ARCH_EXT_NAME("virt",     ARM::AEK_VIRT,     nullptr,  nullptr)
-ARM_ARCH_EXT_NAME("fp16",     ARM::AEK_FP16,     "+fullfp16",  "-fullfp16")
-ARM_ARCH_EXT_NAME("ras",      ARM::AEK_RAS,      "+ras", "-ras")
-ARM_ARCH_EXT_NAME("os",       ARM::AEK_OS,       nullptr,  nullptr)
-ARM_ARCH_EXT_NAME("iwmmxt",   ARM::AEK_IWMMXT,   nullptr,  nullptr)
-ARM_ARCH_EXT_NAME("iwmmxt2",  ARM::AEK_IWMMXT2,  nullptr,  nullptr)
-ARM_ARCH_EXT_NAME("maverick", ARM::AEK_MAVERICK, nullptr,  nullptr)
-ARM_ARCH_EXT_NAME("xscale",   ARM::AEK_XSCALE,   nullptr,  nullptr)
-ARM_ARCH_EXT_NAME("fp16fml",  ARM::AEK_FP16FML,  "+fp16fml", "-fp16fml")
-ARM_ARCH_EXT_NAME("bf16",     ARM::AEK_BF16,     "+bf16",    "-bf16")
-ARM_ARCH_EXT_NAME("sb",       ARM::AEK_SB,       "+sb",      "-sb")
-ARM_ARCH_EXT_NAME("i8mm",     ARM::AEK_I8MM,     "+i8mm",    "-i8mm")
-ARM_ARCH_EXT_NAME("lob",      ARM::AEK_LOB,      "+lob",   "-lob")
-ARM_ARCH_EXT_NAME("cdecp0",   ARM::AEK_CDECP0,   "+cdecp0",  "-cdecp0")
-ARM_ARCH_EXT_NAME("cdecp1",   ARM::AEK_CDECP1,   "+cdecp1",  "-cdecp1")
-ARM_ARCH_EXT_NAME("cdecp2",   ARM::AEK_CDECP2,   "+cdecp2",  "-cdecp2")
-ARM_ARCH_EXT_NAME("cdecp3",   ARM::AEK_CDECP3,   "+cdecp3",  "-cdecp3")
-ARM_ARCH_EXT_NAME("cdecp4",   ARM::AEK_CDECP4,   "+cdecp4",  "-cdecp4")
-ARM_ARCH_EXT_NAME("cdecp5",   ARM::AEK_CDECP5,   "+cdecp5",  "-cdecp5")
-ARM_ARCH_EXT_NAME("cdecp6",   ARM::AEK_CDECP6,   "+cdecp6",  "-cdecp6")
-ARM_ARCH_EXT_NAME("cdecp7",   ARM::AEK_CDECP7,   "+cdecp7",  "-cdecp7")
-#undef ARM_ARCH_EXT_NAME
-
-#ifndef ARM_HW_DIV_NAME
-#define ARM_HW_DIV_NAME(NAME, ID)
-#endif
-ARM_HW_DIV_NAME("invalid", ARM::AEK_INVALID)
-ARM_HW_DIV_NAME("none", ARM::AEK_NONE)
-ARM_HW_DIV_NAME("thumb", ARM::AEK_HWDIVTHUMB)
-ARM_HW_DIV_NAME("arm", ARM::AEK_HWDIVARM)
-ARM_HW_DIV_NAME("arm,thumb", (ARM::AEK_HWDIVARM | ARM::AEK_HWDIVTHUMB))
-#undef ARM_HW_DIV_NAME
-
-#ifndef ARM_CPU_NAME
-#define ARM_CPU_NAME(NAME, ID, DEFAULT_FPU, IS_DEFAULT, DEFAULT_EXT)
-#endif
-ARM_CPU_NAME("arm8", ARMV4, FK_NONE, false, ARM::AEK_NONE)
-ARM_CPU_NAME("arm810", ARMV4, FK_NONE, false, ARM::AEK_NONE)
-ARM_CPU_NAME("strongarm", ARMV4, FK_NONE, true, ARM::AEK_NONE)
-ARM_CPU_NAME("strongarm110", ARMV4, FK_NONE, false, ARM::AEK_NONE)
-ARM_CPU_NAME("strongarm1100", ARMV4, FK_NONE, false, ARM::AEK_NONE)
-ARM_CPU_NAME("strongarm1110", ARMV4, FK_NONE, false, ARM::AEK_NONE)
-ARM_CPU_NAME("arm7tdmi", ARMV4T, FK_NONE, true, ARM::AEK_NONE)
-ARM_CPU_NAME("arm7tdmi-s", ARMV4T, FK_NONE, false, ARM::AEK_NONE)
-ARM_CPU_NAME("arm710t", ARMV4T, FK_NONE, false, ARM::AEK_NONE)
-ARM_CPU_NAME("arm720t", ARMV4T, FK_NONE, false, ARM::AEK_NONE)
-ARM_CPU_NAME("arm9", ARMV4T, FK_NONE, false, ARM::AEK_NONE)
-ARM_CPU_NAME("arm9tdmi", ARMV4T, FK_NONE, false, ARM::AEK_NONE)
-ARM_CPU_NAME("arm920", ARMV4T, FK_NONE, false, ARM::AEK_NONE)
-ARM_CPU_NAME("arm920t", ARMV4T, FK_NONE, false, ARM::AEK_NONE)
-ARM_CPU_NAME("arm922t", ARMV4T, FK_NONE, false, ARM::AEK_NONE)
-ARM_CPU_NAME("arm940t", ARMV4T, FK_NONE, false, ARM::AEK_NONE)
-ARM_CPU_NAME("ep9312", ARMV4T, FK_NONE, false, ARM::AEK_NONE)
-ARM_CPU_NAME("arm10tdmi", ARMV5T, FK_NONE, true, ARM::AEK_NONE)
-ARM_CPU_NAME("arm1020t", ARMV5T, FK_NONE, false, ARM::AEK_NONE)
-ARM_CPU_NAME("arm9e", ARMV5TE, FK_NONE, false, ARM::AEK_NONE)
-ARM_CPU_NAME("arm946e-s", ARMV5TE, FK_NONE, false, ARM::AEK_NONE)
-ARM_CPU_NAME("arm966e-s", ARMV5TE, FK_NONE, false, ARM::AEK_NONE)
-ARM_CPU_NAME("arm968e-s", ARMV5TE, FK_NONE, false, ARM::AEK_NONE)
-ARM_CPU_NAME("arm10e", ARMV5TE, FK_NONE, false, ARM::AEK_NONE)
-ARM_CPU_NAME("arm1020e", ARMV5TE, FK_NONE, false, ARM::AEK_NONE)
-ARM_CPU_NAME("arm1022e", ARMV5TE, FK_NONE, true, ARM::AEK_NONE)
-ARM_CPU_NAME("arm926ej-s", ARMV5TEJ, FK_NONE, true, ARM::AEK_NONE)
-ARM_CPU_NAME("arm1136j-s", ARMV6, FK_NONE, false, ARM::AEK_NONE)
-ARM_CPU_NAME("arm1136jf-s", ARMV6, FK_VFPV2, true, ARM::AEK_NONE)
-ARM_CPU_NAME("mpcore", ARMV6K, FK_VFPV2, true, ARM::AEK_NONE)
-ARM_CPU_NAME("mpcorenovfp", ARMV6K, FK_NONE, false, ARM::AEK_NONE)
-ARM_CPU_NAME("arm1176jz-s", ARMV6KZ, FK_NONE, false, ARM::AEK_NONE)
-ARM_CPU_NAME("arm1176jzf-s", ARMV6KZ, FK_VFPV2, true, ARM::AEK_NONE)
-ARM_CPU_NAME("arm1156t2-s", ARMV6T2, FK_NONE, true, ARM::AEK_NONE)
-ARM_CPU_NAME("arm1156t2f-s", ARMV6T2, FK_VFPV2, false, ARM::AEK_NONE)
-ARM_CPU_NAME("cortex-m0", ARMV6M, FK_NONE, true, ARM::AEK_NONE)
-ARM_CPU_NAME("cortex-m0plus", ARMV6M, FK_NONE, false, ARM::AEK_NONE)
-ARM_CPU_NAME("cortex-m1", ARMV6M, FK_NONE, false, ARM::AEK_NONE)
-ARM_CPU_NAME("sc000", ARMV6M, FK_NONE, false, ARM::AEK_NONE)
-ARM_CPU_NAME("cortex-a5", ARMV7A, FK_NEON_VFPV4, false,
-             (ARM::AEK_SEC | ARM::AEK_MP))
-ARM_CPU_NAME("cortex-a7", ARMV7A, FK_NEON_VFPV4, false,
-             (ARM::AEK_SEC | ARM::AEK_MP | ARM::AEK_VIRT | ARM::AEK_HWDIVARM |
-              ARM::AEK_HWDIVTHUMB))
-ARM_CPU_NAME("cortex-a8", ARMV7A, FK_NEON, false, ARM::AEK_SEC)
-ARM_CPU_NAME("cortex-a9", ARMV7A, FK_NEON_FP16, false, (ARM::AEK_SEC | ARM::AEK_MP))
-ARM_CPU_NAME("cortex-a12", ARMV7A, FK_NEON_VFPV4, false,
-             (ARM::AEK_SEC | ARM::AEK_MP | ARM::AEK_VIRT | ARM::AEK_HWDIVARM |
-              ARM::AEK_HWDIVTHUMB))
-ARM_CPU_NAME("cortex-a15", ARMV7A, FK_NEON_VFPV4, false,
-             (ARM::AEK_SEC | ARM::AEK_MP | ARM::AEK_VIRT | ARM::AEK_HWDIVARM |
-              ARM::AEK_HWDIVTHUMB))
-ARM_CPU_NAME("cortex-a17", ARMV7A, FK_NEON_VFPV4, false,
-             (ARM::AEK_SEC | ARM::AEK_MP | ARM::AEK_VIRT | ARM::AEK_HWDIVARM |
-              ARM::AEK_HWDIVTHUMB))
-ARM_CPU_NAME("krait", ARMV7A, FK_NEON_VFPV4, false,
-             (ARM::AEK_HWDIVARM | ARM::AEK_HWDIVTHUMB))
-ARM_CPU_NAME("cortex-r4", ARMV7R, FK_NONE, true, ARM::AEK_NONE)
-ARM_CPU_NAME("cortex-r4f", ARMV7R, FK_VFPV3_D16, false, ARM::AEK_NONE)
-ARM_CPU_NAME("cortex-r5", ARMV7R, FK_VFPV3_D16, false,
-             (ARM::AEK_MP | ARM::AEK_HWDIVARM))
-ARM_CPU_NAME("cortex-r7", ARMV7R, FK_VFPV3_D16_FP16, false,
-             (ARM::AEK_MP | ARM::AEK_HWDIVARM))
-ARM_CPU_NAME("cortex-r8", ARMV7R, FK_VFPV3_D16_FP16, false,
-             (ARM::AEK_MP | ARM::AEK_HWDIVARM))
-ARM_CPU_NAME("cortex-r52", ARMV8R, FK_NEON_FP_ARMV8, true, ARM::AEK_NONE)
-ARM_CPU_NAME("sc300", ARMV7M, FK_NONE, false, ARM::AEK_NONE)
-ARM_CPU_NAME("cortex-m3", ARMV7M, FK_NONE, true, ARM::AEK_NONE)
-ARM_CPU_NAME("cortex-m4", ARMV7EM, FK_FPV4_SP_D16, true, ARM::AEK_NONE)
-ARM_CPU_NAME("cortex-m7", ARMV7EM, FK_FPV5_D16, false, ARM::AEK_NONE)
-ARM_CPU_NAME("cortex-m23", ARMV8MBaseline, FK_NONE, false, ARM::AEK_NONE)
-ARM_CPU_NAME("cortex-m33", ARMV8MMainline, FK_FPV5_SP_D16, false, ARM::AEK_DSP)
-ARM_CPU_NAME("cortex-m35p", ARMV8MMainline, FK_FPV5_SP_D16, false, ARM::AEK_DSP)
-ARM_CPU_NAME("cortex-m55", ARMV8_1MMainline, FK_FP_ARMV8_FULLFP16_D16, false,
-             (ARM::AEK_DSP | ARM::AEK_SIMD | ARM::AEK_FP | ARM::AEK_FP16))
-ARM_CPU_NAME("cortex-a32", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false, ARM::AEK_CRC)
-ARM_CPU_NAME("cortex-a35", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false, ARM::AEK_CRC)
-ARM_CPU_NAME("cortex-a53", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false, ARM::AEK_CRC)
-ARM_CPU_NAME("cortex-a55", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
-            (ARM::AEK_FP16 | ARM::AEK_DOTPROD))
-ARM_CPU_NAME("cortex-a57", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false, ARM::AEK_CRC)
-ARM_CPU_NAME("cortex-a72", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false, ARM::AEK_CRC)
-ARM_CPU_NAME("cortex-a73", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false, ARM::AEK_CRC)
-ARM_CPU_NAME("cortex-a75", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
-            (ARM::AEK_FP16 | ARM::AEK_DOTPROD))
-ARM_CPU_NAME("cortex-a76", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
-            (ARM::AEK_FP16 | ARM::AEK_DOTPROD))
-ARM_CPU_NAME("cortex-a76ae", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
-            (ARM::AEK_FP16 | ARM::AEK_DOTPROD))
-ARM_CPU_NAME("cortex-a77", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
-            (ARM::AEK_FP16 | ARM::AEK_DOTPROD))
-ARM_CPU_NAME("cortex-a78", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
-             (ARM::AEK_FP16 | ARM::AEK_DOTPROD))
-ARM_CPU_NAME("cortex-a78c", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
-             ARM::AEK_FP16 | ARM::AEK_DOTPROD)
-ARM_CPU_NAME("cortex-x1", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
-             (ARM::AEK_FP16 | ARM::AEK_DOTPROD))
-ARM_CPU_NAME("neoverse-n1", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
-             (ARM::AEK_FP16 | ARM::AEK_DOTPROD))
-ARM_CPU_NAME("neoverse-n2", ARMV8_5A, FK_CRYPTO_NEON_FP_ARMV8, false,
-             (ARM::AEK_BF16 | ARM::AEK_DOTPROD | ARM::AEK_I8MM | ARM::AEK_RAS |
-              ARM::AEK_SB))
-ARM_CPU_NAME("neoverse-v1", ARMV8_4A, FK_CRYPTO_NEON_FP_ARMV8, false,
-             (ARM::AEK_RAS | ARM::AEK_FP16 | ARM::AEK_BF16 | ARM::AEK_DOTPROD))
-ARM_CPU_NAME("cyclone", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false, ARM::AEK_CRC)
-ARM_CPU_NAME("exynos-m3", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false, ARM::AEK_CRC)
-ARM_CPU_NAME("exynos-m4", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
-             (ARM::AEK_FP16 | ARM::AEK_DOTPROD))
-ARM_CPU_NAME("exynos-m5", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
-             (ARM::AEK_FP16 | ARM::AEK_DOTPROD))
-ARM_CPU_NAME("kryo", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false, ARM::AEK_CRC)
-// Non-standard Arch names.
-ARM_CPU_NAME("iwmmxt", IWMMXT, FK_NONE, true, ARM::AEK_NONE)
-ARM_CPU_NAME("xscale", XSCALE, FK_NONE, true, ARM::AEK_NONE)
-ARM_CPU_NAME("swift", ARMV7S, FK_NEON_VFPV4, true,
-             (ARM::AEK_HWDIVARM | ARM::AEK_HWDIVTHUMB))
-// Invalid CPU
-ARM_CPU_NAME("invalid", INVALID, FK_INVALID, true, ARM::AEK_INVALID)
-#undef ARM_CPU_NAME
diff --git a/gnu/llvm/llvm/include/llvm/Support/RISCVTargetParser.def b/gnu/llvm/llvm/include/llvm/Support/RISCVTargetParser.def
deleted file mode 100644
index 6a06f925810..00000000000
--- a/gnu/llvm/llvm/include/llvm/Support/RISCVTargetParser.def
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef PROC_ALIAS
-#define PROC_ALIAS(NAME, RV32, RV64)
-#endif
-
-PROC_ALIAS("generic", "generic-rv32", "generic-rv64")
-PROC_ALIAS("rocket", "rocket-rv32", "rocket-rv64")
-PROC_ALIAS("sifive-7-series", "sifive-7-rv32", "sifive-7-rv64")
-
-#undef PROC_ALIAS
-
-#ifndef PROC
-#define PROC(ENUM, NAME, FEATURES, DEFAULT_MARCH)
-#endif
-
-PROC(INVALID, {"invalid"}, FK_INVALID, {""})
-PROC(GENERIC_RV32, {"generic-rv32"}, FK_NONE, {""})
-PROC(GENERIC_RV64, {"generic-rv64"}, FK_64BIT, {""})
-PROC(ROCKET_RV32, {"rocket-rv32"}, FK_NONE, {""})
-PROC(ROCKET_RV64, {"rocket-rv64"}, FK_64BIT, {""})
-PROC(SIFIVE_732, {"sifive-7-rv32"}, FK_NONE, {""})
-PROC(SIFIVE_764, {"sifive-7-rv64"}, FK_64BIT, {""})
-PROC(SIFIVE_E31, {"sifive-e31"}, FK_NONE, {"rv32imac"})
-PROC(SIFIVE_U54, {"sifive-u54"}, FK_64BIT, {"rv64gc"})
-PROC(SIFIVE_E76, {"sifive-e76"}, FK_NONE, {"rv32imafc"})
-PROC(SIFIVE_U74, {"sifive-u74"}, FK_64BIT, {"rv64gc"})
-
-#undef PROC
diff --git a/gnu/llvm/llvm/include/llvm/Support/TargetRegistry.h b/gnu/llvm/llvm/include/llvm/Support/TargetRegistry.h
deleted file mode 100644
index e661ae26cb4..00000000000
--- a/gnu/llvm/llvm/include/llvm/Support/TargetRegistry.h
+++ /dev/null
@@ -1,1297 +0,0 @@
-//===- Support/TargetRegistry.h - Target Registration -----------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file exposes the TargetRegistry interface, which tools can use to access
-// the appropriate target specific classes (TargetMachine, AsmPrinter, etc.)
-// which have been registered.
-//
-// Target specific class implementations should register themselves using the
-// appropriate TargetRegistry interfaces.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_SUPPORT_TARGETREGISTRY_H
-#define LLVM_SUPPORT_TARGETREGISTRY_H
-
-#include "llvm-c/DisassemblerTypes.h"
-#include "llvm/ADT/Optional.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/ADT/Triple.h"
-#include "llvm/ADT/iterator_range.h"
-#include "llvm/MC/MCObjectFileInfo.h"
-#include "llvm/Support/CodeGen.h"
-#include "llvm/Support/ErrorHandling.h"
-#include "llvm/Support/FormattedStream.h"
-#include <algorithm>
-#include <cassert>
-#include <cstddef>
-#include <iterator>
-#include <memory>
-#include <string>
-
-namespace llvm {
-
-class AsmPrinter;
-class MCAsmBackend;
-class MCAsmInfo;
-class MCAsmParser;
-class MCCodeEmitter;
-class MCContext;
-class MCDisassembler;
-class MCInstPrinter;
-class MCInstrAnalysis;
-class MCInstrInfo;
-class MCObjectWriter;
-class MCRegisterInfo;
-class MCRelocationInfo;
-class MCStreamer;
-class MCSubtargetInfo;
-class MCSymbolizer;
-class MCTargetAsmParser;
-class MCTargetOptions;
-class MCTargetStreamer;
-class raw_ostream;
-class raw_pwrite_stream;
-class TargetMachine;
-class TargetOptions;
-
-MCStreamer *createNullStreamer(MCContext &Ctx);
-// Takes ownership of \p TAB and \p CE.
-
-/// Create a machine code streamer which will print out assembly for the native
-/// target, suitable for compiling with a native assembler.
-///
-/// \param InstPrint - If given, the instruction printer to use. If not given
-/// the MCInst representation will be printed.  This method takes ownership of
-/// InstPrint.
-///
-/// \param CE - If given, a code emitter to use to show the instruction
-/// encoding inline with the assembly. This method takes ownership of \p CE.
-///
-/// \param TAB - If given, a target asm backend to use to show the fixup
-/// information in conjunction with encoding information. This method takes
-/// ownership of \p TAB.
-///
-/// \param ShowInst - Whether to show the MCInst representation inline with
-/// the assembly.
-MCStreamer *
-createAsmStreamer(MCContext &Ctx, std::unique_ptr<formatted_raw_ostream> OS,
-                  bool isVerboseAsm, bool useDwarfDirectory,
-                  MCInstPrinter *InstPrint, std::unique_ptr<MCCodeEmitter> &&CE,
-                  std::unique_ptr<MCAsmBackend> &&TAB, bool ShowInst);
-
-MCStreamer *createELFStreamer(MCContext &Ctx,
-                              std::unique_ptr<MCAsmBackend> &&TAB,
-                              std::unique_ptr<MCObjectWriter> &&OW,
-                              std::unique_ptr<MCCodeEmitter> &&CE,
-                              bool RelaxAll);
-MCStreamer *createMachOStreamer(MCContext &Ctx,
-                                std::unique_ptr<MCAsmBackend> &&TAB,
-                                std::unique_ptr<MCObjectWriter> &&OW,
-                                std::unique_ptr<MCCodeEmitter> &&CE,
-                                bool RelaxAll, bool DWARFMustBeAtTheEnd,
-                                bool LabelSections = false);
-MCStreamer *createWasmStreamer(MCContext &Ctx,
-                               std::unique_ptr<MCAsmBackend> &&TAB,
-                               std::unique_ptr<MCObjectWriter> &&OW,
-                               std::unique_ptr<MCCodeEmitter> &&CE,
-                               bool RelaxAll);
-MCStreamer *createXCOFFStreamer(MCContext &Ctx,
-                                std::unique_ptr<MCAsmBackend> &&TAB,
-                                std::unique_ptr<MCObjectWriter> &&OW,
-                                std::unique_ptr<MCCodeEmitter> &&CE,
-                                bool RelaxAll);
-
-MCRelocationInfo *createMCRelocationInfo(const Triple &TT, MCContext &Ctx);
-
-MCSymbolizer *createMCSymbolizer(const Triple &TT, LLVMOpInfoCallback GetOpInfo,
-                                 LLVMSymbolLookupCallback SymbolLookUp,
-                                 void *DisInfo, MCContext *Ctx,
-                                 std::unique_ptr<MCRelocationInfo> &&RelInfo);
-
-/// Target - Wrapper for Target specific information.
-///
-/// For registration purposes, this is a POD type so that targets can be
-/// registered without the use of static constructors.
-///
-/// Targets should implement a single global instance of this class (which
-/// will be zero initialized), and pass that instance to the TargetRegistry as
-/// part of their initialization.
-class Target {
-public:
-  friend struct TargetRegistry;
-
-  using ArchMatchFnTy = bool (*)(Triple::ArchType Arch);
-
-  using MCAsmInfoCtorFnTy = MCAsmInfo *(*)(const MCRegisterInfo &MRI,
-                                           const Triple &TT,
-                                           const MCTargetOptions &Options);
-  using MCObjectFileInfoCtorFnTy = MCObjectFileInfo *(*)(MCContext &Ctx,
-                                                         bool PIC,
-                                                         bool LargeCodeModel);
-  using MCInstrInfoCtorFnTy = MCInstrInfo *(*)();
-  using MCInstrAnalysisCtorFnTy = MCInstrAnalysis *(*)(const MCInstrInfo *Info);
-  using MCRegInfoCtorFnTy = MCRegisterInfo *(*)(const Triple &TT);
-  using MCSubtargetInfoCtorFnTy = MCSubtargetInfo *(*)(const Triple &TT,
-                                                       StringRef CPU,
-                                                       StringRef Features);
-  using TargetMachineCtorTy = TargetMachine
-      *(*)(const Target &T, const Triple &TT, StringRef CPU, StringRef Features,
-           const TargetOptions &Options, Optional<Reloc::Model> RM,
-           Optional<CodeModel::Model> CM, CodeGenOpt::Level OL, bool JIT);
-  // If it weren't for layering issues (this header is in llvm/Support, but
-  // depends on MC?) this should take the Streamer by value rather than rvalue
-  // reference.
-  using AsmPrinterCtorTy = AsmPrinter *(*)(
-      TargetMachine &TM, std::unique_ptr<MCStreamer> &&Streamer);
-  using MCAsmBackendCtorTy = MCAsmBackend *(*)(const Target &T,
-                                               const MCSubtargetInfo &STI,
-                                               const MCRegisterInfo &MRI,
-                                               const MCTargetOptions &Options);
-  using MCAsmParserCtorTy = MCTargetAsmParser *(*)(
-      const MCSubtargetInfo &STI, MCAsmParser &P, const MCInstrInfo &MII,
-      const MCTargetOptions &Options);
-  using MCDisassemblerCtorTy = MCDisassembler *(*)(const Target &T,
-                                                   const MCSubtargetInfo &STI,
-                                                   MCContext &Ctx);
-  using MCInstPrinterCtorTy = MCInstPrinter *(*)(const Triple &T,
-                                                 unsigned SyntaxVariant,
-                                                 const MCAsmInfo &MAI,
-                                                 const MCInstrInfo &MII,
-                                                 const MCRegisterInfo &MRI);
-  using MCCodeEmitterCtorTy = MCCodeEmitter *(*)(const MCInstrInfo &II,
-                                                 const MCRegisterInfo &MRI,
-                                                 MCContext &Ctx);
-  using ELFStreamerCtorTy =
-      MCStreamer *(*)(const Triple &T, MCContext &Ctx,
-                      std::unique_ptr<MCAsmBackend> &&TAB,
-                      std::unique_ptr<MCObjectWriter> &&OW,
-                      std::unique_ptr<MCCodeEmitter> &&Emitter, bool RelaxAll);
-  using MachOStreamerCtorTy =
-      MCStreamer *(*)(MCContext &Ctx, std::unique_ptr<MCAsmBackend> &&TAB,
-                      std::unique_ptr<MCObjectWriter> &&OW,
-                      std::unique_ptr<MCCodeEmitter> &&Emitter, bool RelaxAll,
-                      bool DWARFMustBeAtTheEnd);
-  using COFFStreamerCtorTy =
-      MCStreamer *(*)(MCContext &Ctx, std::unique_ptr<MCAsmBackend> &&TAB,
-                      std::unique_ptr<MCObjectWriter> &&OW,
-                      std::unique_ptr<MCCodeEmitter> &&Emitter, bool RelaxAll,
-                      bool IncrementalLinkerCompatible);
-  using WasmStreamerCtorTy =
-      MCStreamer *(*)(const Triple &T, MCContext &Ctx,
-                      std::unique_ptr<MCAsmBackend> &&TAB,
-                      std::unique_ptr<MCObjectWriter> &&OW,
-                      std::unique_ptr<MCCodeEmitter> &&Emitter, bool RelaxAll);
-  using XCOFFStreamerCtorTy =
-      MCStreamer *(*)(const Triple &T, MCContext &Ctx,
-                      std::unique_ptr<MCAsmBackend> &&TAB,
-                      std::unique_ptr<MCObjectWriter> &&OW,
-                      std::unique_ptr<MCCodeEmitter> &&Emitter, bool RelaxAll);
-
-  using NullTargetStreamerCtorTy = MCTargetStreamer *(*)(MCStreamer &S);
-  using AsmTargetStreamerCtorTy = MCTargetStreamer *(*)(
-      MCStreamer &S, formatted_raw_ostream &OS, MCInstPrinter *InstPrint,
-      bool IsVerboseAsm);
-  using ObjectTargetStreamerCtorTy = MCTargetStreamer *(*)(
-      MCStreamer &S, const MCSubtargetInfo &STI);
-  using MCRelocationInfoCtorTy = MCRelocationInfo *(*)(const Triple &TT,
-                                                       MCContext &Ctx);
-  using MCSymbolizerCtorTy = MCSymbolizer *(*)(
-      const Triple &TT, LLVMOpInfoCallback GetOpInfo,
-      LLVMSymbolLookupCallback SymbolLookUp, void *DisInfo, MCContext *Ctx,
-      std::unique_ptr<MCRelocationInfo> &&RelInfo);
-
-private:
-  /// Next - The next registered target in the linked list, maintained by the
-  /// TargetRegistry.
-  Target *Next;
-
-  /// The target function for checking if an architecture is supported.
-  ArchMatchFnTy ArchMatchFn;
-
-  /// Name - The target name.
-  const char *Name;
-
-  /// ShortDesc - A short description of the target.
-  const char *ShortDesc;
-
-  /// BackendName - The name of the backend implementation. This must match the
-  /// name of the 'def X : Target ...' in TableGen.
-  const char *BackendName;
-
-  /// HasJIT - Whether this target supports the JIT.
-  bool HasJIT;
-
-  /// MCAsmInfoCtorFn - Constructor function for this target's MCAsmInfo, if
-  /// registered.
-  MCAsmInfoCtorFnTy MCAsmInfoCtorFn;
-
-  /// Constructor function for this target's MCObjectFileInfo, if registered.
-  MCObjectFileInfoCtorFnTy MCObjectFileInfoCtorFn;
-
-  /// MCInstrInfoCtorFn - Constructor function for this target's MCInstrInfo,
-  /// if registered.
-  MCInstrInfoCtorFnTy MCInstrInfoCtorFn;
-
-  /// MCInstrAnalysisCtorFn - Constructor function for this target's
-  /// MCInstrAnalysis, if registered.
-  MCInstrAnalysisCtorFnTy MCInstrAnalysisCtorFn;
-
-  /// MCRegInfoCtorFn - Constructor function for this target's MCRegisterInfo,
-  /// if registered.
-  MCRegInfoCtorFnTy MCRegInfoCtorFn;
-
-  /// MCSubtargetInfoCtorFn - Constructor function for this target's
-  /// MCSubtargetInfo, if registered.
-  MCSubtargetInfoCtorFnTy MCSubtargetInfoCtorFn;
-
-  /// TargetMachineCtorFn - Construction function for this target's
-  /// TargetMachine, if registered.
-  TargetMachineCtorTy TargetMachineCtorFn;
-
-  /// MCAsmBackendCtorFn - Construction function for this target's
-  /// MCAsmBackend, if registered.
-  MCAsmBackendCtorTy MCAsmBackendCtorFn;
-
-  /// MCAsmParserCtorFn - Construction function for this target's
-  /// MCTargetAsmParser, if registered.
-  MCAsmParserCtorTy MCAsmParserCtorFn;
-
-  /// AsmPrinterCtorFn - Construction function for this target's AsmPrinter,
-  /// if registered.
-  AsmPrinterCtorTy AsmPrinterCtorFn;
-
-  /// MCDisassemblerCtorFn - Construction function for this target's
-  /// MCDisassembler, if registered.
-  MCDisassemblerCtorTy MCDisassemblerCtorFn;
-
-  /// MCInstPrinterCtorFn - Construction function for this target's
-  /// MCInstPrinter, if registered.
-  MCInstPrinterCtorTy MCInstPrinterCtorFn;
-
-  /// MCCodeEmitterCtorFn - Construction function for this target's
-  /// CodeEmitter, if registered.
-  MCCodeEmitterCtorTy MCCodeEmitterCtorFn;
-
-  // Construction functions for the various object formats, if registered.
-  COFFStreamerCtorTy COFFStreamerCtorFn = nullptr;
-  MachOStreamerCtorTy MachOStreamerCtorFn = nullptr;
-  ELFStreamerCtorTy ELFStreamerCtorFn = nullptr;
-  WasmStreamerCtorTy WasmStreamerCtorFn = nullptr;
-  XCOFFStreamerCtorTy XCOFFStreamerCtorFn = nullptr;
-
-  /// Construction function for this target's null TargetStreamer, if
-  /// registered (default = nullptr).
-  NullTargetStreamerCtorTy NullTargetStreamerCtorFn = nullptr;
-
-  /// Construction function for this target's asm TargetStreamer, if
-  /// registered (default = nullptr).
-  AsmTargetStreamerCtorTy AsmTargetStreamerCtorFn = nullptr;
-
-  /// Construction function for this target's obj TargetStreamer, if
-  /// registered (default = nullptr).
-  ObjectTargetStreamerCtorTy ObjectTargetStreamerCtorFn = nullptr;
-
-  /// MCRelocationInfoCtorFn - Construction function for this target's
-  /// MCRelocationInfo, if registered (default = llvm::createMCRelocationInfo)
-  MCRelocationInfoCtorTy MCRelocationInfoCtorFn = nullptr;
-
-  /// MCSymbolizerCtorFn - Construction function for this target's
-  /// MCSymbolizer, if registered (default = llvm::createMCSymbolizer)
-  MCSymbolizerCtorTy MCSymbolizerCtorFn = nullptr;
-
-public:
-  Target() = default;
-
-  /// @name Target Information
-  /// @{
-
-  // getNext - Return the next registered target.
-  const Target *getNext() const { return Next; }
-
-  /// getName - Get the target name.
-  const char *getName() const { return Name; }
-
-  /// getShortDescription - Get a short description of the target.
-  const char *getShortDescription() const { return ShortDesc; }
-
-  /// getBackendName - Get the backend name.
-  const char *getBackendName() const { return BackendName; }
-
-  /// @}
-  /// @name Feature Predicates
-  /// @{
-
-  /// hasJIT - Check if this targets supports the just-in-time compilation.
-  bool hasJIT() const { return HasJIT; }
-
-  /// hasTargetMachine - Check if this target supports code generation.
-  bool hasTargetMachine() const { return TargetMachineCtorFn != nullptr; }
-
-  /// hasMCAsmBackend - Check if this target supports .o generation.
-  bool hasMCAsmBackend() const { return MCAsmBackendCtorFn != nullptr; }
-
-  /// hasMCAsmParser - Check if this target supports assembly parsing.
-  bool hasMCAsmParser() const { return MCAsmParserCtorFn != nullptr; }
-
-  /// @}
-  /// @name Feature Constructors
-  /// @{
-
-  /// createMCAsmInfo - Create a MCAsmInfo implementation for the specified
-  /// target triple.
-  ///
-  /// \param TheTriple This argument is used to determine the target machine
-  /// feature set; it should always be provided. Generally this should be
-  /// either the target triple from the module, or the target triple of the
-  /// host if that does not exist.
-  MCAsmInfo *createMCAsmInfo(const MCRegisterInfo &MRI, StringRef TheTriple,
-                             const MCTargetOptions &Options) const {
-    if (!MCAsmInfoCtorFn)
-      return nullptr;
-    return MCAsmInfoCtorFn(MRI, Triple(TheTriple), Options);
-  }
-
-  /// Create a MCObjectFileInfo implementation for the specified target
-  /// triple.
-  ///
-  MCObjectFileInfo *createMCObjectFileInfo(MCContext &Ctx, bool PIC,
-                                           bool LargeCodeModel = false) const {
-    if (!MCObjectFileInfoCtorFn) {
-      MCObjectFileInfo *MOFI = new MCObjectFileInfo();
-      MOFI->initMCObjectFileInfo(Ctx, PIC, LargeCodeModel);
-      return MOFI;
-    }
-    return MCObjectFileInfoCtorFn(Ctx, PIC, LargeCodeModel);
-  }
-
-  /// createMCInstrInfo - Create a MCInstrInfo implementation.
-  ///
-  MCInstrInfo *createMCInstrInfo() const {
-    if (!MCInstrInfoCtorFn)
-      return nullptr;
-    return MCInstrInfoCtorFn();
-  }
-
-  /// createMCInstrAnalysis - Create a MCInstrAnalysis implementation.
-  ///
-  MCInstrAnalysis *createMCInstrAnalysis(const MCInstrInfo *Info) const {
-    if (!MCInstrAnalysisCtorFn)
-      return nullptr;
-    return MCInstrAnalysisCtorFn(Info);
-  }
-
-  /// createMCRegInfo - Create a MCRegisterInfo implementation.
-  ///
-  MCRegisterInfo *createMCRegInfo(StringRef TT) const {
-    if (!MCRegInfoCtorFn)
-      return nullptr;
-    return MCRegInfoCtorFn(Triple(TT));
-  }
-
-  /// createMCSubtargetInfo - Create a MCSubtargetInfo implementation.
-  ///
-  /// \param TheTriple This argument is used to determine the target machine
-  /// feature set; it should always be provided. Generally this should be
-  /// either the target triple from the module, or the target triple of the
-  /// host if that does not exist.
-  /// \param CPU This specifies the name of the target CPU.
-  /// \param Features This specifies the string representation of the
-  /// additional target features.
-  MCSubtargetInfo *createMCSubtargetInfo(StringRef TheTriple, StringRef CPU,
-                                         StringRef Features) const {
-    if (!MCSubtargetInfoCtorFn)
-      return nullptr;
-    return MCSubtargetInfoCtorFn(Triple(TheTriple), CPU, Features);
-  }
-
-  /// createTargetMachine - Create a target specific machine implementation
-  /// for the specified \p Triple.
-  ///
-  /// \param TT This argument is used to determine the target machine
-  /// feature set; it should always be provided. Generally this should be
-  /// either the target triple from the module, or the target triple of the
-  /// host if that does not exist.
-  TargetMachine *createTargetMachine(StringRef TT, StringRef CPU,
-                                     StringRef Features,
-                                     const TargetOptions &Options,
-                                     Optional<Reloc::Model> RM,
-                                     Optional<CodeModel::Model> CM = None,
-                                     CodeGenOpt::Level OL = CodeGenOpt::Default,
-                                     bool JIT = false) const {
-    if (!TargetMachineCtorFn)
-      return nullptr;
-    return TargetMachineCtorFn(*this, Triple(TT), CPU, Features, Options, RM,
-                               CM, OL, JIT);
-  }
-
-  /// createMCAsmBackend - Create a target specific assembly parser.
-  MCAsmBackend *createMCAsmBackend(const MCSubtargetInfo &STI,
-                                   const MCRegisterInfo &MRI,
-                                   const MCTargetOptions &Options) const {
-    if (!MCAsmBackendCtorFn)
-      return nullptr;
-    return MCAsmBackendCtorFn(*this, STI, MRI, Options);
-  }
-
-  /// createMCAsmParser - Create a target specific assembly parser.
-  ///
-  /// \param Parser The target independent parser implementation to use for
-  /// parsing and lexing.
-  MCTargetAsmParser *createMCAsmParser(const MCSubtargetInfo &STI,
-                                       MCAsmParser &Parser,
-                                       const MCInstrInfo &MII,
-                                       const MCTargetOptions &Options) const {
-    if (!MCAsmParserCtorFn)
-      return nullptr;
-    return MCAsmParserCtorFn(STI, Parser, MII, Options);
-  }
-
-  /// createAsmPrinter - Create a target specific assembly printer pass.  This
-  /// takes ownership of the MCStreamer object.
-  AsmPrinter *createAsmPrinter(TargetMachine &TM,
-                               std::unique_ptr<MCStreamer> &&Streamer) const {
-    if (!AsmPrinterCtorFn)
-      return nullptr;
-    return AsmPrinterCtorFn(TM, std::move(Streamer));
-  }
-
-  MCDisassembler *createMCDisassembler(const MCSubtargetInfo &STI,
-                                       MCContext &Ctx) const {
-    if (!MCDisassemblerCtorFn)
-      return nullptr;
-    return MCDisassemblerCtorFn(*this, STI, Ctx);
-  }
-
-  MCInstPrinter *createMCInstPrinter(const Triple &T, unsigned SyntaxVariant,
-                                     const MCAsmInfo &MAI,
-                                     const MCInstrInfo &MII,
-                                     const MCRegisterInfo &MRI) const {
-    if (!MCInstPrinterCtorFn)
-      return nullptr;
-    return MCInstPrinterCtorFn(T, SyntaxVariant, MAI, MII, MRI);
-  }
-
-  /// createMCCodeEmitter - Create a target specific code emitter.
-  MCCodeEmitter *createMCCodeEmitter(const MCInstrInfo &II,
-                                     const MCRegisterInfo &MRI,
-                                     MCContext &Ctx) const {
-    if (!MCCodeEmitterCtorFn)
-      return nullptr;
-    return MCCodeEmitterCtorFn(II, MRI, Ctx);
-  }
-
-  /// Create a target specific MCStreamer.
-  ///
-  /// \param T The target triple.
-  /// \param Ctx The target context.
-  /// \param TAB The target assembler backend object. Takes ownership.
-  /// \param OW The stream object.
-  /// \param Emitter The target independent assembler object.Takes ownership.
-  /// \param RelaxAll Relax all fixups?
-  MCStreamer *createMCObjectStreamer(const Triple &T, MCContext &Ctx,
-                                     std::unique_ptr<MCAsmBackend> &&TAB,
-                                     std::unique_ptr<MCObjectWriter> &&OW,
-                                     std::unique_ptr<MCCodeEmitter> &&Emitter,
-                                     const MCSubtargetInfo &STI, bool RelaxAll,
-                                     bool IncrementalLinkerCompatible,
-                                     bool DWARFMustBeAtTheEnd) const {
-    MCStreamer *S = nullptr;
-    switch (T.getObjectFormat()) {
-    case Triple::UnknownObjectFormat:
-      llvm_unreachable("Unknown object format");
-    case Triple::COFF:
-      assert(T.isOSWindows() && "only Windows COFF is supported");
-      S = COFFStreamerCtorFn(Ctx, std::move(TAB), std::move(OW),
-                             std::move(Emitter), RelaxAll,
-                             IncrementalLinkerCompatible);
-      break;
-    case Triple::MachO:
-      if (MachOStreamerCtorFn)
-        S = MachOStreamerCtorFn(Ctx, std::move(TAB), std::move(OW),
-                                std::move(Emitter), RelaxAll,
-                                DWARFMustBeAtTheEnd);
-      else
-        S = createMachOStreamer(Ctx, std::move(TAB), std::move(OW),
-                                std::move(Emitter), RelaxAll,
-                                DWARFMustBeAtTheEnd);
-      break;
-    case Triple::ELF:
-      if (ELFStreamerCtorFn)
-        S = ELFStreamerCtorFn(T, Ctx, std::move(TAB), std::move(OW),
-                              std::move(Emitter), RelaxAll);
-      else
-        S = createELFStreamer(Ctx, std::move(TAB), std::move(OW),
-                              std::move(Emitter), RelaxAll);
-      break;
-    case Triple::Wasm:
-      if (WasmStreamerCtorFn)
-        S = WasmStreamerCtorFn(T, Ctx, std::move(TAB), std::move(OW),
-                               std::move(Emitter), RelaxAll);
-      else
-        S = createWasmStreamer(Ctx, std::move(TAB), std::move(OW),
-                               std::move(Emitter), RelaxAll);
-      break;
-    case Triple::GOFF:
-      report_fatal_error("GOFF MCObjectStreamer not implemented yet");
-    case Triple::XCOFF:
-      if (XCOFFStreamerCtorFn)
-        S = XCOFFStreamerCtorFn(T, Ctx, std::move(TAB), std::move(OW),
-                                std::move(Emitter), RelaxAll);
-      else
-        S = createXCOFFStreamer(Ctx, std::move(TAB), std::move(OW),
-                                std::move(Emitter), RelaxAll);
-      break;
-    }
-    if (ObjectTargetStreamerCtorFn)
-      ObjectTargetStreamerCtorFn(*S, STI);
-    return S;
-  }
-
-  MCStreamer *createAsmStreamer(MCContext &Ctx,
-                                std::unique_ptr<formatted_raw_ostream> OS,
-                                bool IsVerboseAsm, bool UseDwarfDirectory,
-                                MCInstPrinter *InstPrint,
-                                std::unique_ptr<MCCodeEmitter> &&CE,
-                                std::unique_ptr<MCAsmBackend> &&TAB,
-                                bool ShowInst) const {
-    formatted_raw_ostream &OSRef = *OS;
-    MCStreamer *S = llvm::createAsmStreamer(
-        Ctx, std::move(OS), IsVerboseAsm, UseDwarfDirectory, InstPrint,
-        std::move(CE), std::move(TAB), ShowInst);
-    createAsmTargetStreamer(*S, OSRef, InstPrint, IsVerboseAsm);
-    return S;
-  }
-
-  MCTargetStreamer *createAsmTargetStreamer(MCStreamer &S,
-                                            formatted_raw_ostream &OS,
-                                            MCInstPrinter *InstPrint,
-                                            bool IsVerboseAsm) const {
-    if (AsmTargetStreamerCtorFn)
-      return AsmTargetStreamerCtorFn(S, OS, InstPrint, IsVerboseAsm);
-    return nullptr;
-  }
-
-  MCStreamer *createNullStreamer(MCContext &Ctx) const {
-    MCStreamer *S = llvm::createNullStreamer(Ctx);
-    createNullTargetStreamer(*S);
-    return S;
-  }
-
-  MCTargetStreamer *createNullTargetStreamer(MCStreamer &S) const {
-    if (NullTargetStreamerCtorFn)
-      return NullTargetStreamerCtorFn(S);
-    return nullptr;
-  }
-
-  /// createMCRelocationInfo - Create a target specific MCRelocationInfo.
-  ///
-  /// \param TT The target triple.
-  /// \param Ctx The target context.
-  MCRelocationInfo *createMCRelocationInfo(StringRef TT, MCContext &Ctx) const {
-    MCRelocationInfoCtorTy Fn = MCRelocationInfoCtorFn
-                                    ? MCRelocationInfoCtorFn
-                                    : llvm::createMCRelocationInfo;
-    return Fn(Triple(TT), Ctx);
-  }
-
-  /// createMCSymbolizer - Create a target specific MCSymbolizer.
-  ///
-  /// \param TT The target triple.
-  /// \param GetOpInfo The function to get the symbolic information for
-  /// operands.
-  /// \param SymbolLookUp The function to lookup a symbol name.
-  /// \param DisInfo The pointer to the block of symbolic information for above
-  /// call
-  /// back.
-  /// \param Ctx The target context.
-  /// \param RelInfo The relocation information for this target. Takes
-  /// ownership.
-  MCSymbolizer *
-  createMCSymbolizer(StringRef TT, LLVMOpInfoCallback GetOpInfo,
-                     LLVMSymbolLookupCallback SymbolLookUp, void *DisInfo,
-                     MCContext *Ctx,
-                     std::unique_ptr<MCRelocationInfo> &&RelInfo) const {
-    MCSymbolizerCtorTy Fn =
-        MCSymbolizerCtorFn ? MCSymbolizerCtorFn : llvm::createMCSymbolizer;
-    return Fn(Triple(TT), GetOpInfo, SymbolLookUp, DisInfo, Ctx,
-              std::move(RelInfo));
-  }
-
-  /// @}
-};
-
-/// TargetRegistry - Generic interface to target specific features.
-struct TargetRegistry {
-  // FIXME: Make this a namespace, probably just move all the Register*
-  // functions into Target (currently they all just set members on the Target
-  // anyway, and Target friends this class so those functions can...
-  // function).
-  TargetRegistry() = delete;
-
-  class iterator {
-    friend struct TargetRegistry;
-
-    const Target *Current = nullptr;
-
-    explicit iterator(Target *T) : Current(T) {}
-
-  public:
-    using iterator_category = std::forward_iterator_tag;
-    using value_type = Target;
-    using difference_type = std::ptrdiff_t;
-    using pointer = value_type *;
-    using reference = value_type &;
-
-    iterator() = default;
-
-    bool operator==(const iterator &x) const { return Current == x.Current; }
-    bool operator!=(const iterator &x) const { return !operator==(x); }
-
-    // Iterator traversal: forward iteration only
-    iterator &operator++() { // Preincrement
-      assert(Current && "Cannot increment end iterator!");
-      Current = Current->getNext();
-      return *this;
-    }
-    iterator operator++(int) { // Postincrement
-      iterator tmp = *this;
-      ++*this;
-      return tmp;
-    }
-
-    const Target &operator*() const {
-      assert(Current && "Cannot dereference end iterator!");
-      return *Current;
-    }
-
-    const Target *operator->() const { return &operator*(); }
-  };
-
-  /// printRegisteredTargetsForVersion - Print the registered targets
-  /// appropriately for inclusion in a tool's version output.
-  static void printRegisteredTargetsForVersion(raw_ostream &OS);
-
-  /// @name Registry Access
-  /// @{
-
-  static iterator_range<iterator> targets();
-
-  /// lookupTarget - Lookup a target based on a target triple.
-  ///
-  /// \param Triple - The triple to use for finding a target.
-  /// \param Error - On failure, an error string describing why no target was
-  /// found.
-  static const Target *lookupTarget(const std::string &Triple,
-                                    std::string &Error);
-
-  /// lookupTarget - Lookup a target based on an architecture name
-  /// and a target triple.  If the architecture name is non-empty,
-  /// then the lookup is done by architecture.  Otherwise, the target
-  /// triple is used.
-  ///
-  /// \param ArchName - The architecture to use for finding a target.
-  /// \param TheTriple - The triple to use for finding a target.  The
-  /// triple is updated with canonical architecture name if a lookup
-  /// by architecture is done.
-  /// \param Error - On failure, an error string describing why no target was
-  /// found.
-  static const Target *lookupTarget(const std::string &ArchName,
-                                    Triple &TheTriple, std::string &Error);
-
-  /// @}
-  /// @name Target Registration
-  /// @{
-
-  /// RegisterTarget - Register the given target. Attempts to register a
-  /// target which has already been registered will be ignored.
-  ///
-  /// Clients are responsible for ensuring that registration doesn't occur
-  /// while another thread is attempting to access the registry. Typically
-  /// this is done by initializing all targets at program startup.
-  ///
-  /// @param T - The target being registered.
-  /// @param Name - The target name. This should be a static string.
-  /// @param ShortDesc - A short target description. This should be a static
-  /// string.
-  /// @param BackendName - The name of the backend. This should be a static
-  /// string that is the same for all targets that share a backend
-  /// implementation and must match the name used in the 'def X : Target ...' in
-  /// TableGen.
-  /// @param ArchMatchFn - The arch match checking function for this target.
-  /// @param HasJIT - Whether the target supports JIT code
-  /// generation.
-  static void RegisterTarget(Target &T, const char *Name, const char *ShortDesc,
-                             const char *BackendName,
-                             Target::ArchMatchFnTy ArchMatchFn,
-                             bool HasJIT = false);
-
-  /// RegisterMCAsmInfo - Register a MCAsmInfo implementation for the
-  /// given target.
-  ///
-  /// Clients are responsible for ensuring that registration doesn't occur
-  /// while another thread is attempting to access the registry. Typically
-  /// this is done by initializing all targets at program startup.
-  ///
-  /// @param T - The target being registered.
-  /// @param Fn - A function to construct a MCAsmInfo for the target.
-  static void RegisterMCAsmInfo(Target &T, Target::MCAsmInfoCtorFnTy Fn) {
-    T.MCAsmInfoCtorFn = Fn;
-  }
-
-  /// Register a MCObjectFileInfo implementation for the given target.
-  ///
-  /// Clients are responsible for ensuring that registration doesn't occur
-  /// while another thread is attempting to access the registry. Typically
-  /// this is done by initializing all targets at program startup.
-  ///
-  /// @param T - The target being registered.
-  /// @param Fn - A function to construct a MCObjectFileInfo for the target.
-  static void RegisterMCObjectFileInfo(Target &T,
-                                       Target::MCObjectFileInfoCtorFnTy Fn) {
-    T.MCObjectFileInfoCtorFn = Fn;
-  }
-
-  /// RegisterMCInstrInfo - Register a MCInstrInfo implementation for the
-  /// given target.
-  ///
-  /// Clients are responsible for ensuring that registration doesn't occur
-  /// while another thread is attempting to access the registry. Typically
-  /// this is done by initializing all targets at program startup.
-  ///
-  /// @param T - The target being registered.
-  /// @param Fn - A function to construct a MCInstrInfo for the target.
-  static void RegisterMCInstrInfo(Target &T, Target::MCInstrInfoCtorFnTy Fn) {
-    T.MCInstrInfoCtorFn = Fn;
-  }
-
-  /// RegisterMCInstrAnalysis - Register a MCInstrAnalysis implementation for
-  /// the given target.
-  static void RegisterMCInstrAnalysis(Target &T,
-                                      Target::MCInstrAnalysisCtorFnTy Fn) {
-    T.MCInstrAnalysisCtorFn = Fn;
-  }
-
-  /// RegisterMCRegInfo - Register a MCRegisterInfo implementation for the
-  /// given target.
-  ///
-  /// Clients are responsible for ensuring that registration doesn't occur
-  /// while another thread is attempting to access the registry. Typically
-  /// this is done by initializing all targets at program startup.
-  ///
-  /// @param T - The target being registered.
-  /// @param Fn - A function to construct a MCRegisterInfo for the target.
-  static void RegisterMCRegInfo(Target &T, Target::MCRegInfoCtorFnTy Fn) {
-    T.MCRegInfoCtorFn = Fn;
-  }
-
-  /// RegisterMCSubtargetInfo - Register a MCSubtargetInfo implementation for
-  /// the given target.
-  ///
-  /// Clients are responsible for ensuring that registration doesn't occur
-  /// while another thread is attempting to access the registry. Typically
-  /// this is done by initializing all targets at program startup.
-  ///
-  /// @param T - The target being registered.
-  /// @param Fn - A function to construct a MCSubtargetInfo for the target.
-  static void RegisterMCSubtargetInfo(Target &T,
-                                      Target::MCSubtargetInfoCtorFnTy Fn) {
-    T.MCSubtargetInfoCtorFn = Fn;
-  }
-
-  /// RegisterTargetMachine - Register a TargetMachine implementation for the
-  /// given target.
-  ///
-  /// Clients are responsible for ensuring that registration doesn't occur
-  /// while another thread is attempting to access the registry. Typically
-  /// this is done by initializing all targets at program startup.
-  ///
-  /// @param T - The target being registered.
-  /// @param Fn - A function to construct a TargetMachine for the target.
-  static void RegisterTargetMachine(Target &T, Target::TargetMachineCtorTy Fn) {
-    T.TargetMachineCtorFn = Fn;
-  }
-
-  /// RegisterMCAsmBackend - Register a MCAsmBackend implementation for the
-  /// given target.
-  ///
-  /// Clients are responsible for ensuring that registration doesn't occur
-  /// while another thread is attempting to access the registry. Typically
-  /// this is done by initializing all targets at program startup.
-  ///
-  /// @param T - The target being registered.
-  /// @param Fn - A function to construct an AsmBackend for the target.
-  static void RegisterMCAsmBackend(Target &T, Target::MCAsmBackendCtorTy Fn) {
-    T.MCAsmBackendCtorFn = Fn;
-  }
-
-  /// RegisterMCAsmParser - Register a MCTargetAsmParser implementation for
-  /// the given target.
-  ///
-  /// Clients are responsible for ensuring that registration doesn't occur
-  /// while another thread is attempting to access the registry. Typically
-  /// this is done by initializing all targets at program startup.
-  ///
-  /// @param T - The target being registered.
-  /// @param Fn - A function to construct an MCTargetAsmParser for the target.
-  static void RegisterMCAsmParser(Target &T, Target::MCAsmParserCtorTy Fn) {
-    T.MCAsmParserCtorFn = Fn;
-  }
-
-  /// RegisterAsmPrinter - Register an AsmPrinter implementation for the given
-  /// target.
-  ///
-  /// Clients are responsible for ensuring that registration doesn't occur
-  /// while another thread is attempting to access the registry. Typically
-  /// this is done by initializing all targets at program startup.
-  ///
-  /// @param T - The target being registered.
-  /// @param Fn - A function to construct an AsmPrinter for the target.
-  static void RegisterAsmPrinter(Target &T, Target::AsmPrinterCtorTy Fn) {
-    T.AsmPrinterCtorFn = Fn;
-  }
-
-  /// RegisterMCDisassembler - Register a MCDisassembler implementation for
-  /// the given target.
-  ///
-  /// Clients are responsible for ensuring that registration doesn't occur
-  /// while another thread is attempting to access the registry. Typically
-  /// this is done by initializing all targets at program startup.
-  ///
-  /// @param T - The target being registered.
-  /// @param Fn - A function to construct an MCDisassembler for the target.
-  static void RegisterMCDisassembler(Target &T,
-                                     Target::MCDisassemblerCtorTy Fn) {
-    T.MCDisassemblerCtorFn = Fn;
-  }
-
-  /// RegisterMCInstPrinter - Register a MCInstPrinter implementation for the
-  /// given target.
-  ///
-  /// Clients are responsible for ensuring that registration doesn't occur
-  /// while another thread is attempting to access the registry. Typically
-  /// this is done by initializing all targets at program startup.
-  ///
-  /// @param T - The target being registered.
-  /// @param Fn - A function to construct an MCInstPrinter for the target.
-  static void RegisterMCInstPrinter(Target &T, Target::MCInstPrinterCtorTy Fn) {
-    T.MCInstPrinterCtorFn = Fn;
-  }
-
-  /// RegisterMCCodeEmitter - Register a MCCodeEmitter implementation for the
-  /// given target.
-  ///
-  /// Clients are responsible for ensuring that registration doesn't occur
-  /// while another thread is attempting to access the registry. Typically
-  /// this is done by initializing all targets at program startup.
-  ///
-  /// @param T - The target being registered.
-  /// @param Fn - A function to construct an MCCodeEmitter for the target.
-  static void RegisterMCCodeEmitter(Target &T, Target::MCCodeEmitterCtorTy Fn) {
-    T.MCCodeEmitterCtorFn = Fn;
-  }
-
-  static void RegisterCOFFStreamer(Target &T, Target::COFFStreamerCtorTy Fn) {
-    T.COFFStreamerCtorFn = Fn;
-  }
-
-  static void RegisterMachOStreamer(Target &T, Target::MachOStreamerCtorTy Fn) {
-    T.MachOStreamerCtorFn = Fn;
-  }
-
-  static void RegisterELFStreamer(Target &T, Target::ELFStreamerCtorTy Fn) {
-    T.ELFStreamerCtorFn = Fn;
-  }
-
-  static void RegisterWasmStreamer(Target &T, Target::WasmStreamerCtorTy Fn) {
-    T.WasmStreamerCtorFn = Fn;
-  }
-
-  static void RegisterXCOFFStreamer(Target &T, Target::XCOFFStreamerCtorTy Fn) {
-    T.XCOFFStreamerCtorFn = Fn;
-  }
-
-  static void RegisterNullTargetStreamer(Target &T,
-                                         Target::NullTargetStreamerCtorTy Fn) {
-    T.NullTargetStreamerCtorFn = Fn;
-  }
-
-  static void RegisterAsmTargetStreamer(Target &T,
-                                        Target::AsmTargetStreamerCtorTy Fn) {
-    T.AsmTargetStreamerCtorFn = Fn;
-  }
-
-  static void
-  RegisterObjectTargetStreamer(Target &T,
-                               Target::ObjectTargetStreamerCtorTy Fn) {
-    T.ObjectTargetStreamerCtorFn = Fn;
-  }
-
-  /// RegisterMCRelocationInfo - Register an MCRelocationInfo
-  /// implementation for the given target.
-  ///
-  /// Clients are responsible for ensuring that registration doesn't occur
-  /// while another thread is attempting to access the registry. Typically
-  /// this is done by initializing all targets at program startup.
-  ///
-  /// @param T - The target being registered.
-  /// @param Fn - A function to construct an MCRelocationInfo for the target.
-  static void RegisterMCRelocationInfo(Target &T,
-                                       Target::MCRelocationInfoCtorTy Fn) {
-    T.MCRelocationInfoCtorFn = Fn;
-  }
-
-  /// RegisterMCSymbolizer - Register an MCSymbolizer
-  /// implementation for the given target.
-  ///
-  /// Clients are responsible for ensuring that registration doesn't occur
-  /// while another thread is attempting to access the registry. Typically
-  /// this is done by initializing all targets at program startup.
-  ///
-  /// @param T - The target being registered.
-  /// @param Fn - A function to construct an MCSymbolizer for the target.
-  static void RegisterMCSymbolizer(Target &T, Target::MCSymbolizerCtorTy Fn) {
-    T.MCSymbolizerCtorFn = Fn;
-  }
-
-  /// @}
-};
-
-//===--------------------------------------------------------------------===//
-
-/// RegisterTarget - Helper template for registering a target, for use in the
-/// target's initialization function. Usage:
-///
-///
-/// Target &getTheFooTarget() { // The global target instance.
-///   static Target TheFooTarget;
-///   return TheFooTarget;
-/// }
-/// extern "C" void LLVMInitializeFooTargetInfo() {
-///   RegisterTarget<Triple::foo> X(getTheFooTarget(), "foo", "Foo
-///   description", "Foo" /* Backend Name */);
-/// }
-template <Triple::ArchType TargetArchType = Triple::UnknownArch,
-          bool HasJIT = false>
-struct RegisterTarget {
-  RegisterTarget(Target &T, const char *Name, const char *Desc,
-                 const char *BackendName) {
-    TargetRegistry::RegisterTarget(T, Name, Desc, BackendName, &getArchMatch,
-                                   HasJIT);
-  }
-
-  static bool getArchMatch(Triple::ArchType Arch) {
-    return Arch == TargetArchType;
-  }
-};
-
-/// RegisterMCAsmInfo - Helper template for registering a target assembly info
-/// implementation.  This invokes the static "Create" method on the class to
-/// actually do the construction.  Usage:
-///
-/// extern "C" void LLVMInitializeFooTarget() {
-///   extern Target TheFooTarget;
-///   RegisterMCAsmInfo<FooMCAsmInfo> X(TheFooTarget);
-/// }
-template <class MCAsmInfoImpl> struct RegisterMCAsmInfo {
-  RegisterMCAsmInfo(Target &T) {
-    TargetRegistry::RegisterMCAsmInfo(T, &Allocator);
-  }
-
-private:
-  static MCAsmInfo *Allocator(const MCRegisterInfo & /*MRI*/, const Triple &TT,
-                              const MCTargetOptions &Options) {
-    return new MCAsmInfoImpl(TT, Options);
-  }
-};
-
-/// RegisterMCAsmInfoFn - Helper template for registering a target assembly info
-/// implementation.  This invokes the specified function to do the
-/// construction.  Usage:
-///
-/// extern "C" void LLVMInitializeFooTarget() {
-///   extern Target TheFooTarget;
-///   RegisterMCAsmInfoFn X(TheFooTarget, TheFunction);
-/// }
-struct RegisterMCAsmInfoFn {
-  RegisterMCAsmInfoFn(Target &T, Target::MCAsmInfoCtorFnTy Fn) {
-    TargetRegistry::RegisterMCAsmInfo(T, Fn);
-  }
-};
-
-/// Helper template for registering a target object file info implementation.
-/// This invokes the static "Create" method on the class to actually do the
-/// construction.  Usage:
-///
-/// extern "C" void LLVMInitializeFooTarget() {
-///   extern Target TheFooTarget;
-///   RegisterMCObjectFileInfo<FooMCObjectFileInfo> X(TheFooTarget);
-/// }
-template <class MCObjectFileInfoImpl> struct RegisterMCObjectFileInfo {
-  RegisterMCObjectFileInfo(Target &T) {
-    TargetRegistry::RegisterMCObjectFileInfo(T, &Allocator);
-  }
-
-private:
-  static MCObjectFileInfo *Allocator(MCContext &Ctx, bool PIC,
-                                     bool LargeCodeModel = false) {
-    return new MCObjectFileInfoImpl(Ctx, PIC, LargeCodeModel);
-  }
-};
-
-/// Helper template for registering a target object file info implementation.
-/// This invokes the specified function to do the construction.  Usage:
-///
-/// extern "C" void LLVMInitializeFooTarget() {
-///   extern Target TheFooTarget;
-///   RegisterMCObjectFileInfoFn X(TheFooTarget, TheFunction);
-/// }
-struct RegisterMCObjectFileInfoFn {
-  RegisterMCObjectFileInfoFn(Target &T, Target::MCObjectFileInfoCtorFnTy Fn) {
-    TargetRegistry::RegisterMCObjectFileInfo(T, Fn);
-  }
-};
-
-/// RegisterMCInstrInfo - Helper template for registering a target instruction
-/// info implementation.  This invokes the static "Create" method on the class
-/// to actually do the construction.  Usage:
-///
-/// extern "C" void LLVMInitializeFooTarget() {
-///   extern Target TheFooTarget;
-///   RegisterMCInstrInfo<FooMCInstrInfo> X(TheFooTarget);
-/// }
-template <class MCInstrInfoImpl> struct RegisterMCInstrInfo {
-  RegisterMCInstrInfo(Target &T) {
-    TargetRegistry::RegisterMCInstrInfo(T, &Allocator);
-  }
-
-private:
-  static MCInstrInfo *Allocator() { return new MCInstrInfoImpl(); }
-};
-
-/// RegisterMCInstrInfoFn - Helper template for registering a target
-/// instruction info implementation.  This invokes the specified function to
-/// do the construction.  Usage:
-///
-/// extern "C" void LLVMInitializeFooTarget() {
-///   extern Target TheFooTarget;
-///   RegisterMCInstrInfoFn X(TheFooTarget, TheFunction);
-/// }
-struct RegisterMCInstrInfoFn {
-  RegisterMCInstrInfoFn(Target &T, Target::MCInstrInfoCtorFnTy Fn) {
-    TargetRegistry::RegisterMCInstrInfo(T, Fn);
-  }
-};
-
-/// RegisterMCInstrAnalysis - Helper template for registering a target
-/// instruction analyzer implementation.  This invokes the static "Create"
-/// method on the class to actually do the construction.  Usage:
-///
-/// extern "C" void LLVMInitializeFooTarget() {
-///   extern Target TheFooTarget;
-///   RegisterMCInstrAnalysis<FooMCInstrAnalysis> X(TheFooTarget);
-/// }
-template <class MCInstrAnalysisImpl> struct RegisterMCInstrAnalysis {
-  RegisterMCInstrAnalysis(Target &T) {
-    TargetRegistry::RegisterMCInstrAnalysis(T, &Allocator);
-  }
-
-private:
-  static MCInstrAnalysis *Allocator(const MCInstrInfo *Info) {
-    return new MCInstrAnalysisImpl(Info);
-  }
-};
-
-/// RegisterMCInstrAnalysisFn - Helper template for registering a target
-/// instruction analyzer implementation.  This invokes the specified function
-/// to do the construction.  Usage:
-///
-/// extern "C" void LLVMInitializeFooTarget() {
-///   extern Target TheFooTarget;
-///   RegisterMCInstrAnalysisFn X(TheFooTarget, TheFunction);
-/// }
-struct RegisterMCInstrAnalysisFn {
-  RegisterMCInstrAnalysisFn(Target &T, Target::MCInstrAnalysisCtorFnTy Fn) {
-    TargetRegistry::RegisterMCInstrAnalysis(T, Fn);
-  }
-};
-
-/// RegisterMCRegInfo - Helper template for registering a target register info
-/// implementation.  This invokes the static "Create" method on the class to
-/// actually do the construction.  Usage:
-///
-/// extern "C" void LLVMInitializeFooTarget() {
-///   extern Target TheFooTarget;
-///   RegisterMCRegInfo<FooMCRegInfo> X(TheFooTarget);
-/// }
-template <class MCRegisterInfoImpl> struct RegisterMCRegInfo {
-  RegisterMCRegInfo(Target &T) {
-    TargetRegistry::RegisterMCRegInfo(T, &Allocator);
-  }
-
-private:
-  static MCRegisterInfo *Allocator(const Triple & /*TT*/) {
-    return new MCRegisterInfoImpl();
-  }
-};
-
-/// RegisterMCRegInfoFn - Helper template for registering a target register
-/// info implementation.  This invokes the specified function to do the
-/// construction.  Usage:
-///
-/// extern "C" void LLVMInitializeFooTarget() {
-///   extern Target TheFooTarget;
-///   RegisterMCRegInfoFn X(TheFooTarget, TheFunction);
-/// }
-struct RegisterMCRegInfoFn {
-  RegisterMCRegInfoFn(Target &T, Target::MCRegInfoCtorFnTy Fn) {
-    TargetRegistry::RegisterMCRegInfo(T, Fn);
-  }
-};
-
-/// RegisterMCSubtargetInfo - Helper template for registering a target
-/// subtarget info implementation.  This invokes the static "Create" method
-/// on the class to actually do the construction.  Usage:
-///
-/// extern "C" void LLVMInitializeFooTarget() {
-///   extern Target TheFooTarget;
-///   RegisterMCSubtargetInfo<FooMCSubtargetInfo> X(TheFooTarget);
-/// }
-template <class MCSubtargetInfoImpl> struct RegisterMCSubtargetInfo {
-  RegisterMCSubtargetInfo(Target &T) {
-    TargetRegistry::RegisterMCSubtargetInfo(T, &Allocator);
-  }
-
-private:
-  static MCSubtargetInfo *Allocator(const Triple & /*TT*/, StringRef /*CPU*/,
-                                    StringRef /*FS*/) {
-    return new MCSubtargetInfoImpl();
-  }
-};
-
-/// RegisterMCSubtargetInfoFn - Helper template for registering a target
-/// subtarget info implementation.  This invokes the specified function to
-/// do the construction.  Usage:
-///
-/// extern "C" void LLVMInitializeFooTarget() {
-///   extern Target TheFooTarget;
-///   RegisterMCSubtargetInfoFn X(TheFooTarget, TheFunction);
-/// }
-struct RegisterMCSubtargetInfoFn {
-  RegisterMCSubtargetInfoFn(Target &T, Target::MCSubtargetInfoCtorFnTy Fn) {
-    TargetRegistry::RegisterMCSubtargetInfo(T, Fn);
-  }
-};
-
-/// RegisterTargetMachine - Helper template for registering a target machine
-/// implementation, for use in the target machine initialization
-/// function. Usage:
-///
-/// extern "C" void LLVMInitializeFooTarget() {
-///   extern Target TheFooTarget;
-///   RegisterTargetMachine<FooTargetMachine> X(TheFooTarget);
-/// }
-template <class TargetMachineImpl> struct RegisterTargetMachine {
-  RegisterTargetMachine(Target &T) {
-    TargetRegistry::RegisterTargetMachine(T, &Allocator);
-  }
-
-private:
-  static TargetMachine *
-  Allocator(const Target &T, const Triple &TT, StringRef CPU, StringRef FS,
-            const TargetOptions &Options, Optional<Reloc::Model> RM,
-            Optional<CodeModel::Model> CM, CodeGenOpt::Level OL, bool JIT) {
-    return new TargetMachineImpl(T, TT, CPU, FS, Options, RM, CM, OL, JIT);
-  }
-};
-
-/// RegisterMCAsmBackend - Helper template for registering a target specific
-/// assembler backend. Usage:
-///
-/// extern "C" void LLVMInitializeFooMCAsmBackend() {
-///   extern Target TheFooTarget;
-///   RegisterMCAsmBackend<FooAsmLexer> X(TheFooTarget);
-/// }
-template <class MCAsmBackendImpl> struct RegisterMCAsmBackend {
-  RegisterMCAsmBackend(Target &T) {
-    TargetRegistry::RegisterMCAsmBackend(T, &Allocator);
-  }
-
-private:
-  static MCAsmBackend *Allocator(const Target &T, const MCSubtargetInfo &STI,
-                                 const MCRegisterInfo &MRI,
-                                 const MCTargetOptions &Options) {
-    return new MCAsmBackendImpl(T, STI, MRI);
-  }
-};
-
-/// RegisterMCAsmParser - Helper template for registering a target specific
-/// assembly parser, for use in the target machine initialization
-/// function. Usage:
-///
-/// extern "C" void LLVMInitializeFooMCAsmParser() {
-///   extern Target TheFooTarget;
-///   RegisterMCAsmParser<FooAsmParser> X(TheFooTarget);
-/// }
-template <class MCAsmParserImpl> struct RegisterMCAsmParser {
-  RegisterMCAsmParser(Target &T) {
-    TargetRegistry::RegisterMCAsmParser(T, &Allocator);
-  }
-
-private:
-  static MCTargetAsmParser *Allocator(const MCSubtargetInfo &STI,
-                                      MCAsmParser &P, const MCInstrInfo &MII,
-                                      const MCTargetOptions &Options) {
-    return new MCAsmParserImpl(STI, P, MII, Options);
-  }
-};
-
-/// RegisterAsmPrinter - Helper template for registering a target specific
-/// assembly printer, for use in the target machine initialization
-/// function. Usage:
-///
-/// extern "C" void LLVMInitializeFooAsmPrinter() {
-///   extern Target TheFooTarget;
-///   RegisterAsmPrinter<FooAsmPrinter> X(TheFooTarget);
-/// }
-template <class AsmPrinterImpl> struct RegisterAsmPrinter {
-  RegisterAsmPrinter(Target &T) {
-    TargetRegistry::RegisterAsmPrinter(T, &Allocator);
-  }
-
-private:
-  static AsmPrinter *Allocator(TargetMachine &TM,
-                               std::unique_ptr<MCStreamer> &&Streamer) {
-    return new AsmPrinterImpl(TM, std::move(Streamer));
-  }
-};
-
-/// RegisterMCCodeEmitter - Helper template for registering a target specific
-/// machine code emitter, for use in the target initialization
-/// function. Usage:
-///
-/// extern "C" void LLVMInitializeFooMCCodeEmitter() {
-///   extern Target TheFooTarget;
-///   RegisterMCCodeEmitter<FooCodeEmitter> X(TheFooTarget);
-/// }
-template <class MCCodeEmitterImpl> struct RegisterMCCodeEmitter {
-  RegisterMCCodeEmitter(Target &T) {
-    TargetRegistry::RegisterMCCodeEmitter(T, &Allocator);
-  }
-
-private:
-  static MCCodeEmitter *Allocator(const MCInstrInfo & /*II*/,
-                                  const MCRegisterInfo & /*MRI*/,
-                                  MCContext & /*Ctx*/) {
-    return new MCCodeEmitterImpl();
-  }
-};
-
-} // end namespace llvm
-
-#endif // LLVM_SUPPORT_TARGETREGISTRY_H
diff --git a/gnu/llvm/llvm/include/llvm/Support/ThreadLocal.h b/gnu/llvm/llvm/include/llvm/Support/ThreadLocal.h
deleted file mode 100644
index d6838c15fc3..00000000000
--- a/gnu/llvm/llvm/include/llvm/Support/ThreadLocal.h
+++ /dev/null
@@ -1,62 +0,0 @@
-//===- llvm/Support/ThreadLocal.h - Thread Local Data ------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file declares the llvm::sys::ThreadLocal class.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_SUPPORT_THREADLOCAL_H
-#define LLVM_SUPPORT_THREADLOCAL_H
-
-#include "llvm/Support/DataTypes.h"
-#include "llvm/Support/Threading.h"
-#include <cassert>
-
-namespace llvm {
-  namespace sys {
-    // ThreadLocalImpl - Common base class of all ThreadLocal instantiations.
-    // YOU SHOULD NEVER USE THIS DIRECTLY.
-    class ThreadLocalImpl {
-      typedef uint64_t ThreadLocalDataTy;
-      /// Platform-specific thread local data.
-      ///
-      /// This is embedded in the class and we avoid malloc'ing/free'ing it,
-      /// to make this class more safe for use along with CrashRecoveryContext.
-      union {
-        char data[sizeof(ThreadLocalDataTy)];
-        ThreadLocalDataTy align_data;
-      };
-    public:
-      ThreadLocalImpl();
-      virtual ~ThreadLocalImpl();
-      void setInstance(const void* d);
-      void *getInstance();
-      void removeInstance();
-    };
-
-    /// ThreadLocal - A class used to abstract thread-local storage.  It holds,
-    /// for each thread, a pointer a single object of type T.
-    template<class T>
-    class ThreadLocal : public ThreadLocalImpl {
-    public:
-      ThreadLocal() : ThreadLocalImpl() { }
-
-      /// get - Fetches a pointer to the object associated with the current
-      /// thread.  If no object has yet been associated, it returns NULL;
-      T* get() { return static_cast<T*>(getInstance()); }
-
-      // set - Associates a pointer to an object with the current thread.
-      void set(T* d) { setInstance(d); }
-
-      // erase - Removes the pointer associated with the current thread.
-      void erase() { removeInstance(); }
-    };
-  }
-}
-
-#endif
diff --git a/gnu/llvm/llvm/include/llvm/Testing/Support/Annotations.h b/gnu/llvm/llvm/include/llvm/Testing/Support/Annotations.h
deleted file mode 100644
index cc99d106152..00000000000
--- a/gnu/llvm/llvm/include/llvm/Testing/Support/Annotations.h
+++ /dev/null
@@ -1,92 +0,0 @@
-//===--- Annotations.h - Annotated source code for tests ---------*- C++-*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-#ifndef LLVM_TESTING_SUPPORT_ANNOTATIONS_H
-#define LLVM_TESTING_SUPPORT_ANNOTATIONS_H
-
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/StringMap.h"
-#include "llvm/ADT/StringRef.h"
-#include <tuple>
-#include <vector>
-
-namespace llvm {
-
-/// Annotations lets you mark points and ranges inside source code, for tests:
-///
-///    Annotations Example(R"cpp(
-///       int complete() { x.pri^ }         // ^ indicates a point
-///       void err() { [["hello" == 42]]; } // [[this is a range]]
-///       $definition^class Foo{};          // points can be named: "definition"
-///       $fail[[static_assert(false, "")]] // ranges can be named too: "fail"
-///    )cpp");
-///
-///    StringRef Code = Example.code();             // annotations stripped.
-///    std::vector<size_t> PP = Example.points();   // all unnamed points
-///    size_t P = Example.point();                  // there must be exactly one
-///    llvm::Range R = Example.range("fail");       // find named ranges
-///
-/// Points/ranges are coordinated into `code()` which is stripped of
-/// annotations.
-///
-/// Ranges may be nested (and points can be inside ranges), but there's no way
-/// to define general overlapping ranges.
-///
-/// FIXME: the choice of the marking syntax makes it impossible to represent
-///        some of the C++ and Objective C constructs (including common ones
-///        like C++ attributes). We can fix this by:
-///          1. introducing an escaping mechanism for the special characters,
-///          2. making characters for marking points and ranges configurable,
-///          3. changing the syntax to something less commonly used,
-///          4. ...
-class Annotations {
-public:
-  /// Two offsets pointing to a continuous substring. End is not included, i.e.
-  /// represents a half-open range.
-  struct Range {
-    size_t Begin = 0;
-    size_t End = 0;
-
-    friend bool operator==(const Range &L, const Range &R) {
-      return std::tie(L.Begin, L.End) == std::tie(R.Begin, R.End);
-    }
-    friend bool operator!=(const Range &L, const Range &R) { return !(L == R); }
-  };
-
-  /// Parses the annotations from Text. Crashes if it's malformed.
-  Annotations(llvm::StringRef Text);
-
-  /// The input text with all annotations stripped.
-  /// All points and ranges are relative to this stripped text.
-  llvm::StringRef code() const { return Code; }
-
-  /// Returns the position of the point marked by ^ (or $name^) in the text.
-  /// Crashes if there isn't exactly one.
-  size_t point(llvm::StringRef Name = "") const;
-  /// Returns the position of all points marked by ^ (or $name^) in the text.
-  /// Order matches the order within the text.
-  std::vector<size_t> points(llvm::StringRef Name = "") const;
-
-  /// Returns the location of the range marked by [[ ]] (or $name[[ ]]).
-  /// Crashes if there isn't exactly one.
-  Range range(llvm::StringRef Name = "") const;
-  /// Returns the location of all ranges marked by [[ ]] (or $name[[ ]]).
-  /// They are ordered by start position within the text.
-  std::vector<Range> ranges(llvm::StringRef Name = "") const;
-
-private:
-  std::string Code;
-  llvm::StringMap<llvm::SmallVector<size_t, 1>> Points;
-  llvm::StringMap<llvm::SmallVector<Range, 1>> Ranges;
-};
-
-llvm::raw_ostream &operator<<(llvm::raw_ostream &O,
-                              const llvm::Annotations::Range &R);
-
-} // namespace llvm
-
-#endif
diff --git a/gnu/llvm/llvm/include/llvm/Transforms/Coroutines.h b/gnu/llvm/llvm/include/llvm/Transforms/Coroutines.h
deleted file mode 100644
index f68ef705fde..00000000000
--- a/gnu/llvm/llvm/include/llvm/Transforms/Coroutines.h
+++ /dev/null
@@ -1,37 +0,0 @@
-//===-- Coroutines.h - Coroutine Transformations ----------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-// Declare accessor functions for coroutine lowering passes.
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TRANSFORMS_COROUTINES_H
-#define LLVM_TRANSFORMS_COROUTINES_H
-
-namespace llvm {
-
-class Pass;
-class PassManagerBuilder;
-
-/// Add all coroutine passes to appropriate extension points.
-void addCoroutinePassesToExtensionPoints(PassManagerBuilder &Builder);
-
-/// Lower coroutine intrinsics that are not needed by later passes.
-Pass *createCoroEarlyLegacyPass();
-
-/// Split up coroutines into multiple functions driving their state machines.
-Pass *createCoroSplitLegacyPass(bool IsOptimizing = false);
-
-/// Analyze coroutines use sites, devirtualize resume/destroy calls and elide
-/// heap allocation for coroutine frame where possible.
-Pass *createCoroElideLegacyPass();
-
-/// Lower all remaining coroutine intrinsics.
-Pass *createCoroCleanupLegacyPass();
-
-}
-
-#endif
diff --git a/gnu/llvm/llvm/include/llvm/Transforms/InstCombine/InstCombineWorklist.h b/gnu/llvm/llvm/include/llvm/Transforms/InstCombine/InstCombineWorklist.h
deleted file mode 100644
index 25aabe199d0..00000000000
--- a/gnu/llvm/llvm/include/llvm/Transforms/InstCombine/InstCombineWorklist.h
+++ /dev/null
@@ -1,128 +0,0 @@
-//===- InstCombineWorklist.h - Worklist for InstCombine pass ----*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TRANSFORMS_INSTCOMBINE_INSTCOMBINEWORKLIST_H
-#define LLVM_TRANSFORMS_INSTCOMBINE_INSTCOMBINEWORKLIST_H
-
-#include "llvm/ADT/DenseMap.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/SetVector.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/IR/Instruction.h"
-#include "llvm/Support/Compiler.h"
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/raw_ostream.h"
-
-#define DEBUG_TYPE "instcombine"
-
-namespace llvm {
-
-/// InstCombineWorklist - This is the worklist management logic for
-/// InstCombine.
-class InstCombineWorklist {
-  SmallVector<Instruction *, 256> Worklist;
-  DenseMap<Instruction *, unsigned> WorklistMap;
-  /// These instructions will be added in reverse order after the current
-  /// combine has finished. This means that these instructions will be visited
-  /// in the order they have been added.
-  SmallSetVector<Instruction *, 16> Deferred;
-
-public:
-  InstCombineWorklist() = default;
-
-  InstCombineWorklist(InstCombineWorklist &&) = default;
-  InstCombineWorklist &operator=(InstCombineWorklist &&) = default;
-
-  bool isEmpty() const { return Worklist.empty() && Deferred.empty(); }
-
-  /// Add instruction to the worklist.
-  /// Instructions will be visited in the order they are added.
-  /// You likely want to use this method.
-  void add(Instruction *I) {
-    if (Deferred.insert(I))
-      LLVM_DEBUG(dbgs() << "IC: ADD DEFERRED: " << *I << '\n');
-  }
-
-  /// Add value to the worklist if it is an instruction.
-  /// Instructions will be visited in the order they are added.
-  void addValue(Value *V) {
-    if (Instruction *I = dyn_cast<Instruction>(V))
-      add(I);
-  }
-
-  /// Push the instruction onto the worklist stack.
-  /// Instructions that have been added first will be visited last.
-  void push(Instruction *I) {
-    assert(I);
-    assert(I->getParent() && "Instruction not inserted yet?");
-
-    if (WorklistMap.insert(std::make_pair(I, Worklist.size())).second) {
-      LLVM_DEBUG(dbgs() << "IC: ADD: " << *I << '\n');
-      Worklist.push_back(I);
-    }
-  }
-
-  void pushValue(Value *V) {
-    if (Instruction *I = dyn_cast<Instruction>(V))
-      push(I);
-  }
-
-  Instruction *popDeferred() {
-    if (Deferred.empty())
-      return nullptr;
-    return Deferred.pop_back_val();
-  }
-
-  void reserve(size_t Size) {
-    Worklist.reserve(Size + 16);
-    WorklistMap.reserve(Size);
-  }
-
-  /// Remove I from the worklist if it exists.
-  void remove(Instruction *I) {
-    DenseMap<Instruction*, unsigned>::iterator It = WorklistMap.find(I);
-    if (It != WorklistMap.end()) {
-      // Don't bother moving everything down, just null out the slot.
-      Worklist[It->second] = nullptr;
-      WorklistMap.erase(It);
-    }
-
-    Deferred.remove(I);
-  }
-
-  Instruction *removeOne() {
-    if (Worklist.empty())
-      return nullptr;
-    Instruction *I = Worklist.pop_back_val();
-    WorklistMap.erase(I);
-    return I;
-  }
-
-  /// When an instruction is simplified, add all users of the instruction
-  /// to the work lists because they might get more simplified now.
-  void pushUsersToWorkList(Instruction &I) {
-    for (User *U : I.users())
-      push(cast<Instruction>(U));
-  }
-
-
-  /// Check that the worklist is empty and nuke the backing store for the map.
-  void zap() {
-    assert(WorklistMap.empty() && "Worklist empty, but map not?");
-    assert(Deferred.empty() && "Deferred instructions left over");
-
-    // Do an explicit clear, this shrinks the map if needed.
-    WorklistMap.clear();
-  }
-};
-
-} // end namespace llvm.
-
-#undef DEBUG_TYPE
-
-#endif
diff --git a/gnu/llvm/llvm/include/llvm/Transforms/Scalar/LowerAtomic.h b/gnu/llvm/llvm/include/llvm/Transforms/Scalar/LowerAtomic.h
deleted file mode 100644
index 87d945d0690..00000000000
--- a/gnu/llvm/llvm/include/llvm/Transforms/Scalar/LowerAtomic.h
+++ /dev/null
@@ -1,35 +0,0 @@
-//===- LowerAtomic.cpp - Lower atomic intrinsics ----------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-/// \file
-// This pass lowers atomic intrinsics to non-atomic form for use in a known
-// non-preemptible environment.
-///
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TRANSFORMS_SCALAR_LOWERATOMIC_H
-#define LLVM_TRANSFORMS_SCALAR_LOWERATOMIC_H
-
-#include "llvm/IR/PassManager.h"
-
-namespace llvm {
-
-/// A pass that lowers atomic intrinsic into non-atomic intrinsics.
-class LowerAtomicPass : public PassInfoMixin<LowerAtomicPass> {
-public:
-  PreservedAnalyses run(Function &F, FunctionAnalysisManager &);
-  static bool isRequired() { return true; }
-};
-
-class AtomicRMWInst;
-/// Convert the given RMWI into primitive load and stores,
-/// assuming that doing so is legal. Return true if the lowering
-/// succeeds.
-bool lowerAtomicRMWInst(AtomicRMWInst *RMWI);
-}
-
-#endif // LLVM_TRANSFORMS_SCALAR_LOWERATOMIC_H
diff --git a/gnu/llvm/llvm/include/llvm/Transforms/Utils/MisExpect.h b/gnu/llvm/llvm/include/llvm/Transforms/Utils/MisExpect.h
new file mode 100644
index 00000000000..216c99a2625
--- /dev/null
+++ b/gnu/llvm/llvm/include/llvm/Transforms/Utils/MisExpect.h
@@ -0,0 +1,82 @@
+//===--- MisExpect.h - Check the use of llvm.expect with PGO data ---------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This contains code to emit diagnostic messages for potentially incorrect
+// usage of the llvm.expect intrinsic. This utility extracts the threshold
+// values from metadata associated with the instrumented Branch or Switch
+// instruction. The threshold values are then used to determine if a diagnostic
+// should be emitted.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_TRANSFORMS_UTILS_MISEXPECT_H
+#define LLVM_TRANSFORMS_UTILS_MISEXPECT_H
+
+#include "llvm/ADT/SmallVector.h"
+#include "llvm/IR/Function.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/LLVMContext.h"
+
+namespace llvm {
+namespace misexpect {
+
+/// checkBackendInstrumentation - compares PGO counters to the thresholds used
+/// for llvm.expect and warns if the PGO counters are outside of the expected
+/// range. It extracts the expected weights from the MD_prof weights attatched
+/// to the instruction, which are are assumed to come from lowered llvm.expect
+/// intrinsics. The RealWeights parameter and the extracted expected weights are
+/// then passed to verifyMisexpect() for verification
+///
+/// \param I The Instruction being checked
+/// \param RealWeights A vector of profile weights for each target block
+void checkBackendInstrumentation(Instruction &I,
+                                 const llvm::ArrayRef<uint32_t> RealWeights);
+
+/// checkFrontendInstrumentation - compares PGO counters to the thresholds used
+/// for llvm.expect and warns if the PGO counters are outside of the expected
+/// range. It extracts the expected weights from the MD_prof weights attatched
+/// to the instruction, which are are assumed to come from profiling data
+/// attached by the frontend prior to llvm.expect intrinsic lowering. The
+/// ExpectedWeights parameter and the extracted real weights are then passed to
+/// verifyMisexpect() for verification
+///
+/// \param I The Instruction being checked
+/// \param ExpectedWeights A vector of the expected weights for each target
+/// block, this determines the threshold values used when emiting diagnostics
+void checkFrontendInstrumentation(Instruction &I,
+                                  const ArrayRef<uint32_t> ExpectedWeights);
+
+/// veryifyMisExpect - compares RealWeights to the thresholds used
+/// for llvm.expect and warns if the PGO counters are outside of the expected
+/// range.
+///
+/// \param I The Instruction being checked
+/// \param RealWeights A vector of profile weights from the profile data
+/// \param ExpectedWeights A vector of the weights attatch by llvm.expect
+void verifyMisExpect(Instruction &I, ArrayRef<uint32_t> RealWeights,
+                     const ArrayRef<uint32_t> ExpectedWeights);
+
+/// checkExpectAnnotations - compares PGO counters to the thresholds used
+/// for llvm.expect and warns if the PGO counters are outside of the expected
+/// range. It extracts the expected weights from the MD_prof weights attatched
+/// to the instruction, which are are assumed to come from lowered llvm.expect
+/// intrinsics. The RealWeights parameter and the extracted expected weights are
+/// then passed to verifyMisexpect() for verification. It is a thin wrapper
+/// around the checkFrontendInstrumentation and checkBackendInstrumentation APIs
+///
+/// \param I The Instruction being checked
+/// \param ExistingWeights A vector of profile weights for each target block
+/// \param IsFrontend A boolean describing if this is Frontend instrumentation
+void checkExpectAnnotations(Instruction &I,
+                            const ArrayRef<uint32_t> ExistingWeights,
+                            bool IsFrontend);
+
+} // namespace misexpect
+} // namespace llvm
+
+#endif
diff --git a/gnu/llvm/llvm/lib/Analysis/CFLAndersAliasAnalysis.cpp b/gnu/llvm/llvm/lib/Analysis/CFLAndersAliasAnalysis.cpp
deleted file mode 100644
index 1216d03e448..00000000000
--- a/gnu/llvm/llvm/lib/Analysis/CFLAndersAliasAnalysis.cpp
+++ /dev/null
@@ -1,931 +0,0 @@
-//===- CFLAndersAliasAnalysis.cpp - Unification-based Alias Analysis ------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements a CFL-based, summary-based alias analysis algorithm. It
-// differs from CFLSteensAliasAnalysis in its inclusion-based nature while
-// CFLSteensAliasAnalysis is unification-based. This pass has worse performance
-// than CFLSteensAliasAnalysis (the worst case complexity of
-// CFLAndersAliasAnalysis is cubic, while the worst case complexity of
-// CFLSteensAliasAnalysis is almost linear), but it is able to yield more
-// precise analysis result. The precision of this analysis is roughly the same
-// as that of an one level context-sensitive Andersen's algorithm.
-//
-// The algorithm used here is based on recursive state machine matching scheme
-// proposed in "Demand-driven alias analysis for C" by Xin Zheng and Radu
-// Rugina. The general idea is to extend the traditional transitive closure
-// algorithm to perform CFL matching along the way: instead of recording
-// "whether X is reachable from Y", we keep track of "whether X is reachable
-// from Y at state Z", where the "state" field indicates where we are in the CFL
-// matching process. To understand the matching better, it is advisable to have
-// the state machine shown in Figure 3 of the paper available when reading the
-// codes: all we do here is to selectively expand the transitive closure by
-// discarding edges that are not recognized by the state machine.
-//
-// There are two differences between our current implementation and the one
-// described in the paper:
-// - Our algorithm eagerly computes all alias pairs after the CFLGraph is built,
-// while in the paper the authors did the computation in a demand-driven
-// fashion. We did not implement the demand-driven algorithm due to the
-// additional coding complexity and higher memory profile, but if we found it
-// necessary we may switch to it eventually.
-// - In the paper the authors use a state machine that does not distinguish
-// value reads from value writes. For example, if Y is reachable from X at state
-// S3, it may be the case that X is written into Y, or it may be the case that
-// there's a third value Z that writes into both X and Y. To make that
-// distinction (which is crucial in building function summary as well as
-// retrieving mod-ref info), we choose to duplicate some of the states in the
-// paper's proposed state machine. The duplication does not change the set the
-// machine accepts. Given a pair of reachable values, it only provides more
-// detailed information on which value is being written into and which is being
-// read from.
-//
-//===----------------------------------------------------------------------===//
-
-// N.B. AliasAnalysis as a whole is phrased as a FunctionPass at the moment, and
-// CFLAndersAA is interprocedural. This is *technically* A Bad Thing, because
-// FunctionPasses are only allowed to inspect the Function that they're being
-// run on. Realistically, this likely isn't a problem until we allow
-// FunctionPasses to run concurrently.
-
-#include "llvm/Analysis/CFLAndersAliasAnalysis.h"
-#include "AliasAnalysisSummary.h"
-#include "CFLGraph.h"
-#include "llvm/ADT/DenseMap.h"
-#include "llvm/ADT/DenseMapInfo.h"
-#include "llvm/ADT/DenseSet.h"
-#include "llvm/ADT/None.h"
-#include "llvm/ADT/Optional.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/iterator_range.h"
-#include "llvm/Analysis/AliasAnalysis.h"
-#include "llvm/Analysis/MemoryLocation.h"
-#include "llvm/IR/Argument.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/PassManager.h"
-#include "llvm/IR/Type.h"
-#include "llvm/InitializePasses.h"
-#include "llvm/Pass.h"
-#include "llvm/Support/Casting.h"
-#include "llvm/Support/Compiler.h"
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/raw_ostream.h"
-#include <algorithm>
-#include <bitset>
-#include <cassert>
-#include <cstddef>
-#include <cstdint>
-#include <functional>
-#include <utility>
-#include <vector>
-
-using namespace llvm;
-using namespace llvm::cflaa;
-
-#define DEBUG_TYPE "cfl-anders-aa"
-
-CFLAndersAAResult::CFLAndersAAResult(
-    std::function<const TargetLibraryInfo &(Function &F)> GetTLI)
-    : GetTLI(std::move(GetTLI)) {}
-CFLAndersAAResult::CFLAndersAAResult(CFLAndersAAResult &&RHS)
-    : AAResultBase(std::move(RHS)), GetTLI(std::move(RHS.GetTLI)) {}
-CFLAndersAAResult::~CFLAndersAAResult() = default;
-
-namespace {
-
-enum class MatchState : uint8_t {
-  // The following state represents S1 in the paper.
-  FlowFromReadOnly = 0,
-  // The following two states together represent S2 in the paper.
-  // The 'NoReadWrite' suffix indicates that there exists an alias path that
-  // does not contain assignment and reverse assignment edges.
-  // The 'ReadOnly' suffix indicates that there exists an alias path that
-  // contains reverse assignment edges only.
-  FlowFromMemAliasNoReadWrite,
-  FlowFromMemAliasReadOnly,
-  // The following two states together represent S3 in the paper.
-  // The 'WriteOnly' suffix indicates that there exists an alias path that
-  // contains assignment edges only.
-  // The 'ReadWrite' suffix indicates that there exists an alias path that
-  // contains both assignment and reverse assignment edges. Note that if X and Y
-  // are reachable at 'ReadWrite' state, it does NOT mean X is both read from
-  // and written to Y. Instead, it means that a third value Z is written to both
-  // X and Y.
-  FlowToWriteOnly,
-  FlowToReadWrite,
-  // The following two states together represent S4 in the paper.
-  FlowToMemAliasWriteOnly,
-  FlowToMemAliasReadWrite,
-};
-
-using StateSet = std::bitset<7>;
-
-const unsigned ReadOnlyStateMask =
-    (1U << static_cast<uint8_t>(MatchState::FlowFromReadOnly)) |
-    (1U << static_cast<uint8_t>(MatchState::FlowFromMemAliasReadOnly));
-const unsigned WriteOnlyStateMask =
-    (1U << static_cast<uint8_t>(MatchState::FlowToWriteOnly)) |
-    (1U << static_cast<uint8_t>(MatchState::FlowToMemAliasWriteOnly));
-
-// A pair that consists of a value and an offset
-struct OffsetValue {
-  const Value *Val;
-  int64_t Offset;
-};
-
-bool operator==(OffsetValue LHS, OffsetValue RHS) {
-  return LHS.Val == RHS.Val && LHS.Offset == RHS.Offset;
-}
-bool operator<(OffsetValue LHS, OffsetValue RHS) {
-  return std::less<const Value *>()(LHS.Val, RHS.Val) ||
-         (LHS.Val == RHS.Val && LHS.Offset < RHS.Offset);
-}
-
-// A pair that consists of an InstantiatedValue and an offset
-struct OffsetInstantiatedValue {
-  InstantiatedValue IVal;
-  int64_t Offset;
-};
-
-bool operator==(OffsetInstantiatedValue LHS, OffsetInstantiatedValue RHS) {
-  return LHS.IVal == RHS.IVal && LHS.Offset == RHS.Offset;
-}
-
-// We use ReachabilitySet to keep track of value aliases (The nonterminal "V" in
-// the paper) during the analysis.
-class ReachabilitySet {
-  using ValueStateMap = DenseMap<InstantiatedValue, StateSet>;
-  using ValueReachMap = DenseMap<InstantiatedValue, ValueStateMap>;
-
-  ValueReachMap ReachMap;
-
-public:
-  using const_valuestate_iterator = ValueStateMap::const_iterator;
-  using const_value_iterator = ValueReachMap::const_iterator;
-
-  // Insert edge 'From->To' at state 'State'
-  bool insert(InstantiatedValue From, InstantiatedValue To, MatchState State) {
-    assert(From != To);
-    auto &States = ReachMap[To][From];
-    auto Idx = static_cast<size_t>(State);
-    if (!States.test(Idx)) {
-      States.set(Idx);
-      return true;
-    }
-    return false;
-  }
-
-  // Return the set of all ('From', 'State') pair for a given node 'To'
-  iterator_range<const_valuestate_iterator>
-  reachableValueAliases(InstantiatedValue V) const {
-    auto Itr = ReachMap.find(V);
-    if (Itr == ReachMap.end())
-      return make_range<const_valuestate_iterator>(const_valuestate_iterator(),
-                                                   const_valuestate_iterator());
-    return make_range<const_valuestate_iterator>(Itr->second.begin(),
-                                                 Itr->second.end());
-  }
-
-  iterator_range<const_value_iterator> value_mappings() const {
-    return make_range<const_value_iterator>(ReachMap.begin(), ReachMap.end());
-  }
-};
-
-// We use AliasMemSet to keep track of all memory aliases (the nonterminal "M"
-// in the paper) during the analysis.
-class AliasMemSet {
-  using MemSet = DenseSet<InstantiatedValue>;
-  using MemMapType = DenseMap<InstantiatedValue, MemSet>;
-
-  MemMapType MemMap;
-
-public:
-  using const_mem_iterator = MemSet::const_iterator;
-
-  bool insert(InstantiatedValue LHS, InstantiatedValue RHS) {
-    // Top-level values can never be memory aliases because one cannot take the
-    // addresses of them
-    assert(LHS.DerefLevel > 0 && RHS.DerefLevel > 0);
-    return MemMap[LHS].insert(RHS).second;
-  }
-
-  const MemSet *getMemoryAliases(InstantiatedValue V) const {
-    auto Itr = MemMap.find(V);
-    if (Itr == MemMap.end())
-      return nullptr;
-    return &Itr->second;
-  }
-};
-
-// We use AliasAttrMap to keep track of the AliasAttr of each node.
-class AliasAttrMap {
-  using MapType = DenseMap<InstantiatedValue, AliasAttrs>;
-
-  MapType AttrMap;
-
-public:
-  using const_iterator = MapType::const_iterator;
-
-  bool add(InstantiatedValue V, AliasAttrs Attr) {
-    auto &OldAttr = AttrMap[V];
-    auto NewAttr = OldAttr | Attr;
-    if (OldAttr == NewAttr)
-      return false;
-    OldAttr = NewAttr;
-    return true;
-  }
-
-  AliasAttrs getAttrs(InstantiatedValue V) const {
-    AliasAttrs Attr;
-    auto Itr = AttrMap.find(V);
-    if (Itr != AttrMap.end())
-      Attr = Itr->second;
-    return Attr;
-  }
-
-  iterator_range<const_iterator> mappings() const {
-    return make_range<const_iterator>(AttrMap.begin(), AttrMap.end());
-  }
-};
-
-struct WorkListItem {
-  InstantiatedValue From;
-  InstantiatedValue To;
-  MatchState State;
-};
-
-struct ValueSummary {
-  struct Record {
-    InterfaceValue IValue;
-    unsigned DerefLevel;
-  };
-  SmallVector<Record, 4> FromRecords, ToRecords;
-};
-
-} // end anonymous namespace
-
-namespace llvm {
-
-// Specialize DenseMapInfo for OffsetValue.
-template <> struct DenseMapInfo<OffsetValue> {
-  static OffsetValue getEmptyKey() {
-    return OffsetValue{DenseMapInfo<const Value *>::getEmptyKey(),
-                       DenseMapInfo<int64_t>::getEmptyKey()};
-  }
-
-  static OffsetValue getTombstoneKey() {
-    return OffsetValue{DenseMapInfo<const Value *>::getTombstoneKey(),
-                       DenseMapInfo<int64_t>::getEmptyKey()};
-  }
-
-  static unsigned getHashValue(const OffsetValue &OVal) {
-    return DenseMapInfo<std::pair<const Value *, int64_t>>::getHashValue(
-        std::make_pair(OVal.Val, OVal.Offset));
-  }
-
-  static bool isEqual(const OffsetValue &LHS, const OffsetValue &RHS) {
-    return LHS == RHS;
-  }
-};
-
-// Specialize DenseMapInfo for OffsetInstantiatedValue.
-template <> struct DenseMapInfo<OffsetInstantiatedValue> {
-  static OffsetInstantiatedValue getEmptyKey() {
-    return OffsetInstantiatedValue{
-        DenseMapInfo<InstantiatedValue>::getEmptyKey(),
-        DenseMapInfo<int64_t>::getEmptyKey()};
-  }
-
-  static OffsetInstantiatedValue getTombstoneKey() {
-    return OffsetInstantiatedValue{
-        DenseMapInfo<InstantiatedValue>::getTombstoneKey(),
-        DenseMapInfo<int64_t>::getEmptyKey()};
-  }
-
-  static unsigned getHashValue(const OffsetInstantiatedValue &OVal) {
-    return DenseMapInfo<std::pair<InstantiatedValue, int64_t>>::getHashValue(
-        std::make_pair(OVal.IVal, OVal.Offset));
-  }
-
-  static bool isEqual(const OffsetInstantiatedValue &LHS,
-                      const OffsetInstantiatedValue &RHS) {
-    return LHS == RHS;
-  }
-};
-
-} // end namespace llvm
-
-class CFLAndersAAResult::FunctionInfo {
-  /// Map a value to other values that may alias it
-  /// Since the alias relation is symmetric, to save some space we assume values
-  /// are properly ordered: if a and b alias each other, and a < b, then b is in
-  /// AliasMap[a] but not vice versa.
-  DenseMap<const Value *, std::vector<OffsetValue>> AliasMap;
-
-  /// Map a value to its corresponding AliasAttrs
-  DenseMap<const Value *, AliasAttrs> AttrMap;
-
-  /// Summary of externally visible effects.
-  AliasSummary Summary;
-
-  Optional<AliasAttrs> getAttrs(const Value *) const;
-
-public:
-  FunctionInfo(const Function &, const SmallVectorImpl<Value *> &,
-               const ReachabilitySet &, const AliasAttrMap &);
-
-  bool mayAlias(const Value *, LocationSize, const Value *, LocationSize) const;
-  const AliasSummary &getAliasSummary() const { return Summary; }
-};
-
-static bool hasReadOnlyState(StateSet Set) {
-  return (Set & StateSet(ReadOnlyStateMask)).any();
-}
-
-static bool hasWriteOnlyState(StateSet Set) {
-  return (Set & StateSet(WriteOnlyStateMask)).any();
-}
-
-static Optional<InterfaceValue>
-getInterfaceValue(InstantiatedValue IValue,
-                  const SmallVectorImpl<Value *> &RetVals) {
-  auto Val = IValue.Val;
-
-  Optional<unsigned> Index;
-  if (auto Arg = dyn_cast<Argument>(Val))
-    Index = Arg->getArgNo() + 1;
-  else if (is_contained(RetVals, Val))
-    Index = 0;
-
-  if (Index)
-    return InterfaceValue{*Index, IValue.DerefLevel};
-  return None;
-}
-
-static void populateAttrMap(DenseMap<const Value *, AliasAttrs> &AttrMap,
-                            const AliasAttrMap &AMap) {
-  for (const auto &Mapping : AMap.mappings()) {
-    auto IVal = Mapping.first;
-
-    // Insert IVal into the map
-    auto &Attr = AttrMap[IVal.Val];
-    // AttrMap only cares about top-level values
-    if (IVal.DerefLevel == 0)
-      Attr |= Mapping.second;
-  }
-}
-
-static void
-populateAliasMap(DenseMap<const Value *, std::vector<OffsetValue>> &AliasMap,
-                 const ReachabilitySet &ReachSet) {
-  for (const auto &OuterMapping : ReachSet.value_mappings()) {
-    // AliasMap only cares about top-level values
-    if (OuterMapping.first.DerefLevel > 0)
-      continue;
-
-    auto Val = OuterMapping.first.Val;
-    auto &AliasList = AliasMap[Val];
-    for (const auto &InnerMapping : OuterMapping.second) {
-      // Again, AliasMap only cares about top-level values
-      if (InnerMapping.first.DerefLevel == 0)
-        AliasList.push_back(OffsetValue{InnerMapping.first.Val, UnknownOffset});
-    }
-
-    // Sort AliasList for faster lookup
-    llvm::sort(AliasList);
-  }
-}
-
-static void populateExternalRelations(
-    SmallVectorImpl<ExternalRelation> &ExtRelations, const Function &Fn,
-    const SmallVectorImpl<Value *> &RetVals, const ReachabilitySet &ReachSet) {
-  // If a function only returns one of its argument X, then X will be both an
-  // argument and a return value at the same time. This is an edge case that
-  // needs special handling here.
-  for (const auto &Arg : Fn.args()) {
-    if (is_contained(RetVals, &Arg)) {
-      auto ArgVal = InterfaceValue{Arg.getArgNo() + 1, 0};
-      auto RetVal = InterfaceValue{0, 0};
-      ExtRelations.push_back(ExternalRelation{ArgVal, RetVal, 0});
-    }
-  }
-
-  // Below is the core summary construction logic.
-  // A naive solution of adding only the value aliases that are parameters or
-  // return values in ReachSet to the summary won't work: It is possible that a
-  // parameter P is written into an intermediate value I, and the function
-  // subsequently returns *I. In that case, *I is does not value alias anything
-  // in ReachSet, and the naive solution will miss a summary edge from (P, 1) to
-  // (I, 1).
-  // To account for the aforementioned case, we need to check each non-parameter
-  // and non-return value for the possibility of acting as an intermediate.
-  // 'ValueMap' here records, for each value, which InterfaceValues read from or
-  // write into it. If both the read list and the write list of a given value
-  // are non-empty, we know that a particular value is an intermidate and we
-  // need to add summary edges from the writes to the reads.
-  DenseMap<Value *, ValueSummary> ValueMap;
-  for (const auto &OuterMapping : ReachSet.value_mappings()) {
-    if (auto Dst = getInterfaceValue(OuterMapping.first, RetVals)) {
-      for (const auto &InnerMapping : OuterMapping.second) {
-        // If Src is a param/return value, we get a same-level assignment.
-        if (auto Src = getInterfaceValue(InnerMapping.first, RetVals)) {
-          // This may happen if both Dst and Src are return values
-          if (*Dst == *Src)
-            continue;
-
-          if (hasReadOnlyState(InnerMapping.second))
-            ExtRelations.push_back(ExternalRelation{*Dst, *Src, UnknownOffset});
-          // No need to check for WriteOnly state, since ReachSet is symmetric
-        } else {
-          // If Src is not a param/return, add it to ValueMap
-          auto SrcIVal = InnerMapping.first;
-          if (hasReadOnlyState(InnerMapping.second))
-            ValueMap[SrcIVal.Val].FromRecords.push_back(
-                ValueSummary::Record{*Dst, SrcIVal.DerefLevel});
-          if (hasWriteOnlyState(InnerMapping.second))
-            ValueMap[SrcIVal.Val].ToRecords.push_back(
-                ValueSummary::Record{*Dst, SrcIVal.DerefLevel});
-        }
-      }
-    }
-  }
-
-  for (const auto &Mapping : ValueMap) {
-    for (const auto &FromRecord : Mapping.second.FromRecords) {
-      for (const auto &ToRecord : Mapping.second.ToRecords) {
-        auto ToLevel = ToRecord.DerefLevel;
-        auto FromLevel = FromRecord.DerefLevel;
-        // Same-level assignments should have already been processed by now
-        if (ToLevel == FromLevel)
-          continue;
-
-        auto SrcIndex = FromRecord.IValue.Index;
-        auto SrcLevel = FromRecord.IValue.DerefLevel;
-        auto DstIndex = ToRecord.IValue.Index;
-        auto DstLevel = ToRecord.IValue.DerefLevel;
-        if (ToLevel > FromLevel)
-          SrcLevel += ToLevel - FromLevel;
-        else
-          DstLevel += FromLevel - ToLevel;
-
-        ExtRelations.push_back(ExternalRelation{
-            InterfaceValue{SrcIndex, SrcLevel},
-            InterfaceValue{DstIndex, DstLevel}, UnknownOffset});
-      }
-    }
-  }
-
-  // Remove duplicates in ExtRelations
-  llvm::sort(ExtRelations);
-  ExtRelations.erase(std::unique(ExtRelations.begin(), ExtRelations.end()),
-                     ExtRelations.end());
-}
-
-static void populateExternalAttributes(
-    SmallVectorImpl<ExternalAttribute> &ExtAttributes, const Function &Fn,
-    const SmallVectorImpl<Value *> &RetVals, const AliasAttrMap &AMap) {
-  for (const auto &Mapping : AMap.mappings()) {
-    if (auto IVal = getInterfaceValue(Mapping.first, RetVals)) {
-      auto Attr = getExternallyVisibleAttrs(Mapping.second);
-      if (Attr.any())
-        ExtAttributes.push_back(ExternalAttribute{*IVal, Attr});
-    }
-  }
-}
-
-CFLAndersAAResult::FunctionInfo::FunctionInfo(
-    const Function &Fn, const SmallVectorImpl<Value *> &RetVals,
-    const ReachabilitySet &ReachSet, const AliasAttrMap &AMap) {
-  populateAttrMap(AttrMap, AMap);
-  populateExternalAttributes(Summary.RetParamAttributes, Fn, RetVals, AMap);
-  populateAliasMap(AliasMap, ReachSet);
-  populateExternalRelations(Summary.RetParamRelations, Fn, RetVals, ReachSet);
-}
-
-Optional<AliasAttrs>
-CFLAndersAAResult::FunctionInfo::getAttrs(const Value *V) const {
-  assert(V != nullptr);
-
-  auto Itr = AttrMap.find(V);
-  if (Itr != AttrMap.end())
-    return Itr->second;
-  return None;
-}
-
-bool CFLAndersAAResult::FunctionInfo::mayAlias(
-    const Value *LHS, LocationSize MaybeLHSSize, const Value *RHS,
-    LocationSize MaybeRHSSize) const {
-  assert(LHS && RHS);
-
-  // Check if we've seen LHS and RHS before. Sometimes LHS or RHS can be created
-  // after the analysis gets executed, and we want to be conservative in those
-  // cases.
-  auto MaybeAttrsA = getAttrs(LHS);
-  auto MaybeAttrsB = getAttrs(RHS);
-  if (!MaybeAttrsA || !MaybeAttrsB)
-    return true;
-
-  // Check AliasAttrs before AliasMap lookup since it's cheaper
-  auto AttrsA = *MaybeAttrsA;
-  auto AttrsB = *MaybeAttrsB;
-  if (hasUnknownOrCallerAttr(AttrsA))
-    return AttrsB.any();
-  if (hasUnknownOrCallerAttr(AttrsB))
-    return AttrsA.any();
-  if (isGlobalOrArgAttr(AttrsA))
-    return isGlobalOrArgAttr(AttrsB);
-  if (isGlobalOrArgAttr(AttrsB))
-    return isGlobalOrArgAttr(AttrsA);
-
-  // At this point both LHS and RHS should point to locally allocated objects
-
-  auto Itr = AliasMap.find(LHS);
-  if (Itr != AliasMap.end()) {
-
-    // Find out all (X, Offset) where X == RHS
-    auto Comparator = [](OffsetValue LHS, OffsetValue RHS) {
-      return std::less<const Value *>()(LHS.Val, RHS.Val);
-    };
-#ifdef EXPENSIVE_CHECKS
-    assert(llvm::is_sorted(Itr->second, Comparator));
-#endif
-    auto RangePair = std::equal_range(Itr->second.begin(), Itr->second.end(),
-                                      OffsetValue{RHS, 0}, Comparator);
-
-    if (RangePair.first != RangePair.second) {
-      // Be conservative about unknown sizes
-      if (!MaybeLHSSize.hasValue() || !MaybeRHSSize.hasValue())
-        return true;
-
-      const uint64_t LHSSize = MaybeLHSSize.getValue();
-      const uint64_t RHSSize = MaybeRHSSize.getValue();
-
-      for (const auto &OVal : make_range(RangePair)) {
-        // Be conservative about UnknownOffset
-        if (OVal.Offset == UnknownOffset)
-          return true;
-
-        // We know that LHS aliases (RHS + OVal.Offset) if the control flow
-        // reaches here. The may-alias query essentially becomes integer
-        // range-overlap queries over two ranges [OVal.Offset, OVal.Offset +
-        // LHSSize) and [0, RHSSize).
-
-        // Try to be conservative on super large offsets
-        if (LLVM_UNLIKELY(LHSSize > INT64_MAX || RHSSize > INT64_MAX))
-          return true;
-
-        auto LHSStart = OVal.Offset;
-        // FIXME: Do we need to guard against integer overflow?
-        auto LHSEnd = OVal.Offset + static_cast<int64_t>(LHSSize);
-        auto RHSStart = 0;
-        auto RHSEnd = static_cast<int64_t>(RHSSize);
-        if (LHSEnd > RHSStart && LHSStart < RHSEnd)
-          return true;
-      }
-    }
-  }
-
-  return false;
-}
-
-static void propagate(InstantiatedValue From, InstantiatedValue To,
-                      MatchState State, ReachabilitySet &ReachSet,
-                      std::vector<WorkListItem> &WorkList) {
-  if (From == To)
-    return;
-  if (ReachSet.insert(From, To, State))
-    WorkList.push_back(WorkListItem{From, To, State});
-}
-
-static void initializeWorkList(std::vector<WorkListItem> &WorkList,
-                               ReachabilitySet &ReachSet,
-                               const CFLGraph &Graph) {
-  for (const auto &Mapping : Graph.value_mappings()) {
-    auto Val = Mapping.first;
-    auto &ValueInfo = Mapping.second;
-    assert(ValueInfo.getNumLevels() > 0);
-
-    // Insert all immediate assignment neighbors to the worklist
-    for (unsigned I = 0, E = ValueInfo.getNumLevels(); I < E; ++I) {
-      auto Src = InstantiatedValue{Val, I};
-      // If there's an assignment edge from X to Y, it means Y is reachable from
-      // X at S3 and X is reachable from Y at S1
-      for (auto &Edge : ValueInfo.getNodeInfoAtLevel(I).Edges) {
-        propagate(Edge.Other, Src, MatchState::FlowFromReadOnly, ReachSet,
-                  WorkList);
-        propagate(Src, Edge.Other, MatchState::FlowToWriteOnly, ReachSet,
-                  WorkList);
-      }
-    }
-  }
-}
-
-static Optional<InstantiatedValue> getNodeBelow(const CFLGraph &Graph,
-                                                InstantiatedValue V) {
-  auto NodeBelow = InstantiatedValue{V.Val, V.DerefLevel + 1};
-  if (Graph.getNode(NodeBelow))
-    return NodeBelow;
-  return None;
-}
-
-static void processWorkListItem(const WorkListItem &Item, const CFLGraph &Graph,
-                                ReachabilitySet &ReachSet, AliasMemSet &MemSet,
-                                std::vector<WorkListItem> &WorkList) {
-  auto FromNode = Item.From;
-  auto ToNode = Item.To;
-
-  auto NodeInfo = Graph.getNode(ToNode);
-  assert(NodeInfo != nullptr);
-
-  // TODO: propagate field offsets
-
-  // FIXME: Here is a neat trick we can do: since both ReachSet and MemSet holds
-  // relations that are symmetric, we could actually cut the storage by half by
-  // sorting FromNode and ToNode before insertion happens.
-
-  // The newly added value alias pair may potentially generate more memory
-  // alias pairs. Check for them here.
-  auto FromNodeBelow = getNodeBelow(Graph, FromNode);
-  auto ToNodeBelow = getNodeBelow(Graph, ToNode);
-  if (FromNodeBelow && ToNodeBelow &&
-      MemSet.insert(*FromNodeBelow, *ToNodeBelow)) {
-    propagate(*FromNodeBelow, *ToNodeBelow,
-              MatchState::FlowFromMemAliasNoReadWrite, ReachSet, WorkList);
-    for (const auto &Mapping : ReachSet.reachableValueAliases(*FromNodeBelow)) {
-      auto Src = Mapping.first;
-      auto MemAliasPropagate = [&](MatchState FromState, MatchState ToState) {
-        if (Mapping.second.test(static_cast<size_t>(FromState)))
-          propagate(Src, *ToNodeBelow, ToState, ReachSet, WorkList);
-      };
-
-      MemAliasPropagate(MatchState::FlowFromReadOnly,
-                        MatchState::FlowFromMemAliasReadOnly);
-      MemAliasPropagate(MatchState::FlowToWriteOnly,
-                        MatchState::FlowToMemAliasWriteOnly);
-      MemAliasPropagate(MatchState::FlowToReadWrite,
-                        MatchState::FlowToMemAliasReadWrite);
-    }
-  }
-
-  // This is the core of the state machine walking algorithm. We expand ReachSet
-  // based on which state we are at (which in turn dictates what edges we
-  // should examine)
-  // From a high-level point of view, the state machine here guarantees two
-  // properties:
-  // - If *X and *Y are memory aliases, then X and Y are value aliases
-  // - If Y is an alias of X, then reverse assignment edges (if there is any)
-  // should precede any assignment edges on the path from X to Y.
-  auto NextAssignState = [&](MatchState State) {
-    for (const auto &AssignEdge : NodeInfo->Edges)
-      propagate(FromNode, AssignEdge.Other, State, ReachSet, WorkList);
-  };
-  auto NextRevAssignState = [&](MatchState State) {
-    for (const auto &RevAssignEdge : NodeInfo->ReverseEdges)
-      propagate(FromNode, RevAssignEdge.Other, State, ReachSet, WorkList);
-  };
-  auto NextMemState = [&](MatchState State) {
-    if (auto AliasSet = MemSet.getMemoryAliases(ToNode)) {
-      for (const auto &MemAlias : *AliasSet)
-        propagate(FromNode, MemAlias, State, ReachSet, WorkList);
-    }
-  };
-
-  switch (Item.State) {
-  case MatchState::FlowFromReadOnly:
-    NextRevAssignState(MatchState::FlowFromReadOnly);
-    NextAssignState(MatchState::FlowToReadWrite);
-    NextMemState(MatchState::FlowFromMemAliasReadOnly);
-    break;
-
-  case MatchState::FlowFromMemAliasNoReadWrite:
-    NextRevAssignState(MatchState::FlowFromReadOnly);
-    NextAssignState(MatchState::FlowToWriteOnly);
-    break;
-
-  case MatchState::FlowFromMemAliasReadOnly:
-    NextRevAssignState(MatchState::FlowFromReadOnly);
-    NextAssignState(MatchState::FlowToReadWrite);
-    break;
-
-  case MatchState::FlowToWriteOnly:
-    NextAssignState(MatchState::FlowToWriteOnly);
-    NextMemState(MatchState::FlowToMemAliasWriteOnly);
-    break;
-
-  case MatchState::FlowToReadWrite:
-    NextAssignState(MatchState::FlowToReadWrite);
-    NextMemState(MatchState::FlowToMemAliasReadWrite);
-    break;
-
-  case MatchState::FlowToMemAliasWriteOnly:
-    NextAssignState(MatchState::FlowToWriteOnly);
-    break;
-
-  case MatchState::FlowToMemAliasReadWrite:
-    NextAssignState(MatchState::FlowToReadWrite);
-    break;
-  }
-}
-
-static AliasAttrMap buildAttrMap(const CFLGraph &Graph,
-                                 const ReachabilitySet &ReachSet) {
-  AliasAttrMap AttrMap;
-  std::vector<InstantiatedValue> WorkList, NextList;
-
-  // Initialize each node with its original AliasAttrs in CFLGraph
-  for (const auto &Mapping : Graph.value_mappings()) {
-    auto Val = Mapping.first;
-    auto &ValueInfo = Mapping.second;
-    for (unsigned I = 0, E = ValueInfo.getNumLevels(); I < E; ++I) {
-      auto Node = InstantiatedValue{Val, I};
-      AttrMap.add(Node, ValueInfo.getNodeInfoAtLevel(I).Attr);
-      WorkList.push_back(Node);
-    }
-  }
-
-  while (!WorkList.empty()) {
-    for (const auto &Dst : WorkList) {
-      auto DstAttr = AttrMap.getAttrs(Dst);
-      if (DstAttr.none())
-        continue;
-
-      // Propagate attr on the same level
-      for (const auto &Mapping : ReachSet.reachableValueAliases(Dst)) {
-        auto Src = Mapping.first;
-        if (AttrMap.add(Src, DstAttr))
-          NextList.push_back(Src);
-      }
-
-      // Propagate attr to the levels below
-      auto DstBelow = getNodeBelow(Graph, Dst);
-      while (DstBelow) {
-        if (AttrMap.add(*DstBelow, DstAttr)) {
-          NextList.push_back(*DstBelow);
-          break;
-        }
-        DstBelow = getNodeBelow(Graph, *DstBelow);
-      }
-    }
-    WorkList.swap(NextList);
-    NextList.clear();
-  }
-
-  return AttrMap;
-}
-
-CFLAndersAAResult::FunctionInfo
-CFLAndersAAResult::buildInfoFrom(const Function &Fn) {
-  CFLGraphBuilder<CFLAndersAAResult> GraphBuilder(
-      *this, GetTLI(const_cast<Function &>(Fn)),
-      // Cast away the constness here due to GraphBuilder's API requirement
-      const_cast<Function &>(Fn));
-  auto &Graph = GraphBuilder.getCFLGraph();
-
-  ReachabilitySet ReachSet;
-  AliasMemSet MemSet;
-
-  std::vector<WorkListItem> WorkList, NextList;
-  initializeWorkList(WorkList, ReachSet, Graph);
-  // TODO: make sure we don't stop before the fix point is reached
-  while (!WorkList.empty()) {
-    for (const auto &Item : WorkList)
-      processWorkListItem(Item, Graph, ReachSet, MemSet, NextList);
-
-    NextList.swap(WorkList);
-    NextList.clear();
-  }
-
-  // Now that we have all the reachability info, propagate AliasAttrs according
-  // to it
-  auto IValueAttrMap = buildAttrMap(Graph, ReachSet);
-
-  return FunctionInfo(Fn, GraphBuilder.getReturnValues(), ReachSet,
-                      std::move(IValueAttrMap));
-}
-
-void CFLAndersAAResult::scan(const Function &Fn) {
-  auto InsertPair = Cache.insert(std::make_pair(&Fn, Optional<FunctionInfo>()));
-  (void)InsertPair;
-  assert(InsertPair.second &&
-         "Trying to scan a function that has already been cached");
-
-  // Note that we can't do Cache[Fn] = buildSetsFrom(Fn) here: the function call
-  // may get evaluated after operator[], potentially triggering a DenseMap
-  // resize and invalidating the reference returned by operator[]
-  auto FunInfo = buildInfoFrom(Fn);
-  Cache[&Fn] = std::move(FunInfo);
-  Handles.emplace_front(const_cast<Function *>(&Fn), this);
-}
-
-void CFLAndersAAResult::evict(const Function *Fn) { Cache.erase(Fn); }
-
-const Optional<CFLAndersAAResult::FunctionInfo> &
-CFLAndersAAResult::ensureCached(const Function &Fn) {
-  auto Iter = Cache.find(&Fn);
-  if (Iter == Cache.end()) {
-    scan(Fn);
-    Iter = Cache.find(&Fn);
-    assert(Iter != Cache.end());
-    assert(Iter->second.hasValue());
-  }
-  return Iter->second;
-}
-
-const AliasSummary *CFLAndersAAResult::getAliasSummary(const Function &Fn) {
-  auto &FunInfo = ensureCached(Fn);
-  if (FunInfo.hasValue())
-    return &FunInfo->getAliasSummary();
-  else
-    return nullptr;
-}
-
-AliasResult CFLAndersAAResult::query(const MemoryLocation &LocA,
-                                     const MemoryLocation &LocB) {
-  auto *ValA = LocA.Ptr;
-  auto *ValB = LocB.Ptr;
-
-  if (!ValA->getType()->isPointerTy() || !ValB->getType()->isPointerTy())
-    return AliasResult::NoAlias;
-
-  auto *Fn = parentFunctionOfValue(ValA);
-  if (!Fn) {
-    Fn = parentFunctionOfValue(ValB);
-    if (!Fn) {
-      // The only times this is known to happen are when globals + InlineAsm are
-      // involved
-      LLVM_DEBUG(
-          dbgs()
-          << "CFLAndersAA: could not extract parent function information.\n");
-      return AliasResult::MayAlias;
-    }
-  } else {
-    assert(!parentFunctionOfValue(ValB) || parentFunctionOfValue(ValB) == Fn);
-  }
-
-  assert(Fn != nullptr);
-  auto &FunInfo = ensureCached(*Fn);
-
-  // AliasMap lookup
-  if (FunInfo->mayAlias(ValA, LocA.Size, ValB, LocB.Size))
-    return AliasResult::MayAlias;
-  return AliasResult::NoAlias;
-}
-
-AliasResult CFLAndersAAResult::alias(const MemoryLocation &LocA,
-                                     const MemoryLocation &LocB,
-                                     AAQueryInfo &AAQI) {
-  if (LocA.Ptr == LocB.Ptr)
-    return AliasResult::MustAlias;
-
-  // Comparisons between global variables and other constants should be
-  // handled by BasicAA.
-  // CFLAndersAA may report NoAlias when comparing a GlobalValue and
-  // ConstantExpr, but every query needs to have at least one Value tied to a
-  // Function, and neither GlobalValues nor ConstantExprs are.
-  if (isa<Constant>(LocA.Ptr) && isa<Constant>(LocB.Ptr))
-    return AAResultBase::alias(LocA, LocB, AAQI);
-
-  AliasResult QueryResult = query(LocA, LocB);
-  if (QueryResult == AliasResult::MayAlias)
-    return AAResultBase::alias(LocA, LocB, AAQI);
-
-  return QueryResult;
-}
-
-AnalysisKey CFLAndersAA::Key;
-
-CFLAndersAAResult CFLAndersAA::run(Function &F, FunctionAnalysisManager &AM) {
-  auto GetTLI = [&AM](Function &F) -> TargetLibraryInfo & {
-    return AM.getResult<TargetLibraryAnalysis>(F);
-  };
-  return CFLAndersAAResult(GetTLI);
-}
-
-char CFLAndersAAWrapperPass::ID = 0;
-INITIALIZE_PASS(CFLAndersAAWrapperPass, "cfl-anders-aa",
-                "Inclusion-Based CFL Alias Analysis", false, true)
-
-ImmutablePass *llvm::createCFLAndersAAWrapperPass() {
-  return new CFLAndersAAWrapperPass();
-}
-
-CFLAndersAAWrapperPass::CFLAndersAAWrapperPass() : ImmutablePass(ID) {
-  initializeCFLAndersAAWrapperPassPass(*PassRegistry::getPassRegistry());
-}
-
-void CFLAndersAAWrapperPass::initializePass() {
-  auto GetTLI = [this](Function &F) -> TargetLibraryInfo & {
-    return this->getAnalysis<TargetLibraryInfoWrapperPass>().getTLI(F);
-  };
-  Result.reset(new CFLAndersAAResult(GetTLI));
-}
-
-void CFLAndersAAWrapperPass::getAnalysisUsage(AnalysisUsage &AU) const {
-  AU.setPreservesAll();
-  AU.addRequired<TargetLibraryInfoWrapperPass>();
-}
diff --git a/gnu/llvm/llvm/lib/Analysis/CFLGraph.h b/gnu/llvm/llvm/lib/Analysis/CFLGraph.h
deleted file mode 100644
index 02a13d673f4..00000000000
--- a/gnu/llvm/llvm/lib/Analysis/CFLGraph.h
+++ /dev/null
@@ -1,667 +0,0 @@
-//===- CFLGraph.h - Abstract stratified sets implementation. -----*- C++-*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-/// \file
-/// This file defines CFLGraph, an auxiliary data structure used by CFL-based
-/// alias analysis.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_LIB_ANALYSIS_CFLGRAPH_H
-#define LLVM_LIB_ANALYSIS_CFLGRAPH_H
-
-#include "AliasAnalysisSummary.h"
-#include "llvm/ADT/APInt.h"
-#include "llvm/ADT/DenseMap.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/iterator_range.h"
-#include "llvm/Analysis/MemoryBuiltins.h"
-#include "llvm/Analysis/TargetLibraryInfo.h"
-#include "llvm/IR/Argument.h"
-#include "llvm/IR/BasicBlock.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/DataLayout.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/GlobalValue.h"
-#include "llvm/IR/InstVisitor.h"
-#include "llvm/IR/InstrTypes.h"
-#include "llvm/IR/Instruction.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/Operator.h"
-#include "llvm/IR/Type.h"
-#include "llvm/IR/Value.h"
-#include "llvm/Support/Casting.h"
-#include "llvm/Support/ErrorHandling.h"
-#include <cassert>
-#include <cstdint>
-#include <vector>
-
-namespace llvm {
-namespace cflaa {
-
-/// The Program Expression Graph (PEG) of CFL analysis
-/// CFLGraph is auxiliary data structure used by CFL-based alias analysis to
-/// describe flow-insensitive pointer-related behaviors. Given an LLVM function,
-/// the main purpose of this graph is to abstract away unrelated facts and
-/// translate the rest into a form that can be easily digested by CFL analyses.
-/// Each Node in the graph is an InstantiatedValue, and each edge represent a
-/// pointer assignment between InstantiatedValue. Pointer
-/// references/dereferences are not explicitly stored in the graph: we
-/// implicitly assume that for each node (X, I) it has a dereference edge to (X,
-/// I+1) and a reference edge to (X, I-1).
-class CFLGraph {
-public:
-  using Node = InstantiatedValue;
-
-  struct Edge {
-    Node Other;
-    int64_t Offset;
-  };
-
-  using EdgeList = std::vector<Edge>;
-
-  struct NodeInfo {
-    EdgeList Edges, ReverseEdges;
-    AliasAttrs Attr;
-  };
-
-  class ValueInfo {
-    std::vector<NodeInfo> Levels;
-
-  public:
-    bool addNodeToLevel(unsigned Level) {
-      auto NumLevels = Levels.size();
-      if (NumLevels > Level)
-        return false;
-      Levels.resize(Level + 1);
-      return true;
-    }
-
-    NodeInfo &getNodeInfoAtLevel(unsigned Level) {
-      assert(Level < Levels.size());
-      return Levels[Level];
-    }
-    const NodeInfo &getNodeInfoAtLevel(unsigned Level) const {
-      assert(Level < Levels.size());
-      return Levels[Level];
-    }
-
-    unsigned getNumLevels() const { return Levels.size(); }
-  };
-
-private:
-  using ValueMap = DenseMap<Value *, ValueInfo>;
-
-  ValueMap ValueImpls;
-
-  NodeInfo *getNode(Node N) {
-    auto Itr = ValueImpls.find(N.Val);
-    if (Itr == ValueImpls.end() || Itr->second.getNumLevels() <= N.DerefLevel)
-      return nullptr;
-    return &Itr->second.getNodeInfoAtLevel(N.DerefLevel);
-  }
-
-public:
-  using const_value_iterator = ValueMap::const_iterator;
-
-  bool addNode(Node N, AliasAttrs Attr = AliasAttrs()) {
-    assert(N.Val != nullptr);
-    auto &ValInfo = ValueImpls[N.Val];
-    auto Changed = ValInfo.addNodeToLevel(N.DerefLevel);
-    ValInfo.getNodeInfoAtLevel(N.DerefLevel).Attr |= Attr;
-    return Changed;
-  }
-
-  void addAttr(Node N, AliasAttrs Attr) {
-    auto *Info = getNode(N);
-    assert(Info != nullptr);
-    Info->Attr |= Attr;
-  }
-
-  void addEdge(Node From, Node To, int64_t Offset = 0) {
-    auto *FromInfo = getNode(From);
-    assert(FromInfo != nullptr);
-    auto *ToInfo = getNode(To);
-    assert(ToInfo != nullptr);
-
-    FromInfo->Edges.push_back(Edge{To, Offset});
-    ToInfo->ReverseEdges.push_back(Edge{From, Offset});
-  }
-
-  const NodeInfo *getNode(Node N) const {
-    auto Itr = ValueImpls.find(N.Val);
-    if (Itr == ValueImpls.end() || Itr->second.getNumLevels() <= N.DerefLevel)
-      return nullptr;
-    return &Itr->second.getNodeInfoAtLevel(N.DerefLevel);
-  }
-
-  AliasAttrs attrFor(Node N) const {
-    auto *Info = getNode(N);
-    assert(Info != nullptr);
-    return Info->Attr;
-  }
-
-  iterator_range<const_value_iterator> value_mappings() const {
-    return make_range<const_value_iterator>(ValueImpls.begin(),
-                                            ValueImpls.end());
-  }
-};
-
-/// A builder class used to create CFLGraph instance from a given function
-/// The CFL-AA that uses this builder must provide its own type as a template
-/// argument. This is necessary for interprocedural processing: CFLGraphBuilder
-/// needs a way of obtaining the summary of other functions when callinsts are
-/// encountered.
-/// As a result, we expect the said CFL-AA to expose a getAliasSummary() public
-/// member function that takes a Function& and returns the corresponding summary
-/// as a const AliasSummary*.
-template <typename CFLAA> class CFLGraphBuilder {
-  // Input of the builder
-  CFLAA &Analysis;
-  const TargetLibraryInfo &TLI;
-
-  // Output of the builder
-  CFLGraph Graph;
-  SmallVector<Value *, 4> ReturnedValues;
-
-  // Helper class
-  /// Gets the edges our graph should have, based on an Instruction*
-  class GetEdgesVisitor : public InstVisitor<GetEdgesVisitor, void> {
-    CFLAA &AA;
-    const DataLayout &DL;
-    const TargetLibraryInfo &TLI;
-
-    CFLGraph &Graph;
-    SmallVectorImpl<Value *> &ReturnValues;
-
-    static bool hasUsefulEdges(ConstantExpr *CE) {
-      // ConstantExpr doesn't have terminators, invokes, or fences, so only
-      // needs to check for compares.
-      return CE->getOpcode() != Instruction::ICmp &&
-             CE->getOpcode() != Instruction::FCmp;
-    }
-
-    // Returns possible functions called by CS into the given SmallVectorImpl.
-    // Returns true if targets found, false otherwise.
-    static bool getPossibleTargets(CallBase &Call,
-                                   SmallVectorImpl<Function *> &Output) {
-      if (auto *Fn = Call.getCalledFunction()) {
-        Output.push_back(Fn);
-        return true;
-      }
-
-      // TODO: If the call is indirect, we might be able to enumerate all
-      // potential targets of the call and return them, rather than just
-      // failing.
-      return false;
-    }
-
-    void addNode(Value *Val, AliasAttrs Attr = AliasAttrs()) {
-      assert(Val != nullptr && Val->getType()->isPointerTy());
-      if (auto GVal = dyn_cast<GlobalValue>(Val)) {
-        if (Graph.addNode(InstantiatedValue{GVal, 0},
-                          getGlobalOrArgAttrFromValue(*GVal)))
-          Graph.addNode(InstantiatedValue{GVal, 1}, getAttrUnknown());
-      } else if (auto CExpr = dyn_cast<ConstantExpr>(Val)) {
-        if (hasUsefulEdges(CExpr)) {
-          if (Graph.addNode(InstantiatedValue{CExpr, 0}))
-            visitConstantExpr(CExpr);
-        }
-      } else
-        Graph.addNode(InstantiatedValue{Val, 0}, Attr);
-    }
-
-    void addAssignEdge(Value *From, Value *To, int64_t Offset = 0) {
-      assert(From != nullptr && To != nullptr);
-      if (!From->getType()->isPointerTy() || !To->getType()->isPointerTy())
-        return;
-      addNode(From);
-      if (To != From) {
-        addNode(To);
-        Graph.addEdge(InstantiatedValue{From, 0}, InstantiatedValue{To, 0},
-                      Offset);
-      }
-    }
-
-    void addDerefEdge(Value *From, Value *To, bool IsRead) {
-      assert(From != nullptr && To != nullptr);
-      // FIXME: This is subtly broken, due to how we model some instructions
-      // (e.g. extractvalue, extractelement) as loads. Since those take
-      // non-pointer operands, we'll entirely skip adding edges for those.
-      //
-      // addAssignEdge seems to have a similar issue with insertvalue, etc.
-      if (!From->getType()->isPointerTy() || !To->getType()->isPointerTy())
-        return;
-      addNode(From);
-      addNode(To);
-      if (IsRead) {
-        Graph.addNode(InstantiatedValue{From, 1});
-        Graph.addEdge(InstantiatedValue{From, 1}, InstantiatedValue{To, 0});
-      } else {
-        Graph.addNode(InstantiatedValue{To, 1});
-        Graph.addEdge(InstantiatedValue{From, 0}, InstantiatedValue{To, 1});
-      }
-    }
-
-    void addLoadEdge(Value *From, Value *To) { addDerefEdge(From, To, true); }
-    void addStoreEdge(Value *From, Value *To) { addDerefEdge(From, To, false); }
-
-  public:
-    GetEdgesVisitor(CFLGraphBuilder &Builder, const DataLayout &DL)
-        : AA(Builder.Analysis), DL(DL), TLI(Builder.TLI), Graph(Builder.Graph),
-          ReturnValues(Builder.ReturnedValues) {}
-
-    void visitInstruction(Instruction &) {
-      llvm_unreachable("Unsupported instruction encountered");
-    }
-
-    void visitReturnInst(ReturnInst &Inst) {
-      if (auto RetVal = Inst.getReturnValue()) {
-        if (RetVal->getType()->isPointerTy()) {
-          addNode(RetVal);
-          ReturnValues.push_back(RetVal);
-        }
-      }
-    }
-
-    void visitPtrToIntInst(PtrToIntInst &Inst) {
-      auto *Ptr = Inst.getOperand(0);
-      addNode(Ptr, getAttrEscaped());
-    }
-
-    void visitIntToPtrInst(IntToPtrInst &Inst) {
-      auto *Ptr = &Inst;
-      addNode(Ptr, getAttrUnknown());
-    }
-
-    void visitCastInst(CastInst &Inst) {
-      auto *Src = Inst.getOperand(0);
-      addAssignEdge(Src, &Inst);
-    }
-
-    void visitFreezeInst(FreezeInst &Inst) {
-      // Accessing freeze(ptr) is equivalent to accessing ptr.
-      // The former raises UB iff latter raises UB.
-      auto *Src = Inst.getOperand(0);
-      addAssignEdge(Src, &Inst);
-    }
-
-    void visitBinaryOperator(BinaryOperator &Inst) {
-      auto *Op1 = Inst.getOperand(0);
-      auto *Op2 = Inst.getOperand(1);
-      addAssignEdge(Op1, &Inst);
-      addAssignEdge(Op2, &Inst);
-    }
-
-    void visitUnaryOperator(UnaryOperator &Inst) {
-      auto *Src = Inst.getOperand(0);
-      addAssignEdge(Src, &Inst);
-    }
-
-    void visitAtomicCmpXchgInst(AtomicCmpXchgInst &Inst) {
-      auto *Ptr = Inst.getPointerOperand();
-      auto *Val = Inst.getNewValOperand();
-      addStoreEdge(Val, Ptr);
-    }
-
-    void visitAtomicRMWInst(AtomicRMWInst &Inst) {
-      auto *Ptr = Inst.getPointerOperand();
-      auto *Val = Inst.getValOperand();
-      addStoreEdge(Val, Ptr);
-    }
-
-    void visitPHINode(PHINode &Inst) {
-      for (Value *Val : Inst.incoming_values())
-        addAssignEdge(Val, &Inst);
-    }
-
-    void visitGEP(GEPOperator &GEPOp) {
-      uint64_t Offset = UnknownOffset;
-      APInt APOffset(DL.getPointerSizeInBits(GEPOp.getPointerAddressSpace()),
-                     0);
-      if (GEPOp.accumulateConstantOffset(DL, APOffset))
-        Offset = APOffset.getSExtValue();
-
-      auto *Op = GEPOp.getPointerOperand();
-      addAssignEdge(Op, &GEPOp, Offset);
-    }
-
-    void visitGetElementPtrInst(GetElementPtrInst &Inst) {
-      auto *GEPOp = cast<GEPOperator>(&Inst);
-      visitGEP(*GEPOp);
-    }
-
-    void visitSelectInst(SelectInst &Inst) {
-      // Condition is not processed here (The actual statement producing
-      // the condition result is processed elsewhere). For select, the
-      // condition is evaluated, but not loaded, stored, or assigned
-      // simply as a result of being the condition of a select.
-
-      auto *TrueVal = Inst.getTrueValue();
-      auto *FalseVal = Inst.getFalseValue();
-      addAssignEdge(TrueVal, &Inst);
-      addAssignEdge(FalseVal, &Inst);
-    }
-
-    void visitAllocaInst(AllocaInst &Inst) { addNode(&Inst); }
-
-    void visitLoadInst(LoadInst &Inst) {
-      auto *Ptr = Inst.getPointerOperand();
-      auto *Val = &Inst;
-      addLoadEdge(Ptr, Val);
-    }
-
-    void visitStoreInst(StoreInst &Inst) {
-      auto *Ptr = Inst.getPointerOperand();
-      auto *Val = Inst.getValueOperand();
-      addStoreEdge(Val, Ptr);
-    }
-
-    void visitVAArgInst(VAArgInst &Inst) {
-      // We can't fully model va_arg here. For *Ptr = Inst.getOperand(0), it
-      // does
-      // two things:
-      //  1. Loads a value from *((T*)*Ptr).
-      //  2. Increments (stores to) *Ptr by some target-specific amount.
-      // For now, we'll handle this like a landingpad instruction (by placing
-      // the
-      // result in its own group, and having that group alias externals).
-      if (Inst.getType()->isPointerTy())
-        addNode(&Inst, getAttrUnknown());
-    }
-
-    static bool isFunctionExternal(Function *Fn) {
-      return !Fn->hasExactDefinition();
-    }
-
-    bool tryInterproceduralAnalysis(CallBase &Call,
-                                    const SmallVectorImpl<Function *> &Fns) {
-      assert(Fns.size() > 0);
-
-      if (Call.arg_size() > MaxSupportedArgsInSummary)
-        return false;
-
-      // Exit early if we'll fail anyway
-      for (auto *Fn : Fns) {
-        if (isFunctionExternal(Fn) || Fn->isVarArg())
-          return false;
-        // Fail if the caller does not provide enough arguments
-        assert(Fn->arg_size() <= Call.arg_size());
-        if (!AA.getAliasSummary(*Fn))
-          return false;
-      }
-
-      for (auto *Fn : Fns) {
-        auto Summary = AA.getAliasSummary(*Fn);
-        assert(Summary != nullptr);
-
-        auto &RetParamRelations = Summary->RetParamRelations;
-        for (auto &Relation : RetParamRelations) {
-          auto IRelation = instantiateExternalRelation(Relation, Call);
-          if (IRelation.hasValue()) {
-            Graph.addNode(IRelation->From);
-            Graph.addNode(IRelation->To);
-            Graph.addEdge(IRelation->From, IRelation->To);
-          }
-        }
-
-        auto &RetParamAttributes = Summary->RetParamAttributes;
-        for (auto &Attribute : RetParamAttributes) {
-          auto IAttr = instantiateExternalAttribute(Attribute, Call);
-          if (IAttr.hasValue())
-            Graph.addNode(IAttr->IValue, IAttr->Attr);
-        }
-      }
-
-      return true;
-    }
-
-    void visitCallBase(CallBase &Call) {
-      // Make sure all arguments and return value are added to the graph first
-      for (Value *V : Call.args())
-        if (V->getType()->isPointerTy())
-          addNode(V);
-      if (Call.getType()->isPointerTy())
-        addNode(&Call);
-
-      // Check if Inst is a call to a library function that
-      // allocates/deallocates on the heap. Those kinds of functions do not
-      // introduce any aliases.
-      // TODO: address other common library functions such as realloc(),
-      // strdup(), etc.
-      if (isMallocOrCallocLikeFn(&Call, &TLI) || isFreeCall(&Call, &TLI))
-        return;
-
-      // TODO: Add support for noalias args/all the other fun function
-      // attributes that we can tack on.
-      SmallVector<Function *, 4> Targets;
-      if (getPossibleTargets(Call, Targets))
-        if (tryInterproceduralAnalysis(Call, Targets))
-          return;
-
-      // Because the function is opaque, we need to note that anything
-      // could have happened to the arguments (unless the function is marked
-      // readonly or readnone), and that the result could alias just about
-      // anything, too (unless the result is marked noalias).
-      if (!Call.onlyReadsMemory())
-        for (Value *V : Call.args()) {
-          if (V->getType()->isPointerTy()) {
-            // The argument itself escapes.
-            Graph.addAttr(InstantiatedValue{V, 0}, getAttrEscaped());
-            // The fate of argument memory is unknown. Note that since
-            // AliasAttrs is transitive with respect to dereference, we only
-            // need to specify it for the first-level memory.
-            Graph.addNode(InstantiatedValue{V, 1}, getAttrUnknown());
-          }
-        }
-
-      if (Call.getType()->isPointerTy()) {
-        auto *Fn = Call.getCalledFunction();
-        if (Fn == nullptr || !Fn->returnDoesNotAlias())
-          // No need to call addNode() since we've added Inst at the
-          // beginning of this function and we know it is not a global.
-          Graph.addAttr(InstantiatedValue{&Call, 0}, getAttrUnknown());
-      }
-    }
-
-    /// Because vectors/aggregates are immutable and unaddressable, there's
-    /// nothing we can do to coax a value out of them, other than calling
-    /// Extract{Element,Value}. We can effectively treat them as pointers to
-    /// arbitrary memory locations we can store in and load from.
-    void visitExtractElementInst(ExtractElementInst &Inst) {
-      auto *Ptr = Inst.getVectorOperand();
-      auto *Val = &Inst;
-      addLoadEdge(Ptr, Val);
-    }
-
-    void visitInsertElementInst(InsertElementInst &Inst) {
-      auto *Vec = Inst.getOperand(0);
-      auto *Val = Inst.getOperand(1);
-      addAssignEdge(Vec, &Inst);
-      addStoreEdge(Val, &Inst);
-    }
-
-    void visitLandingPadInst(LandingPadInst &Inst) {
-      // Exceptions come from "nowhere", from our analysis' perspective.
-      // So we place the instruction its own group, noting that said group may
-      // alias externals
-      if (Inst.getType()->isPointerTy())
-        addNode(&Inst, getAttrUnknown());
-    }
-
-    void visitInsertValueInst(InsertValueInst &Inst) {
-      auto *Agg = Inst.getOperand(0);
-      auto *Val = Inst.getOperand(1);
-      addAssignEdge(Agg, &Inst);
-      addStoreEdge(Val, &Inst);
-    }
-
-    void visitExtractValueInst(ExtractValueInst &Inst) {
-      auto *Ptr = Inst.getAggregateOperand();
-      addLoadEdge(Ptr, &Inst);
-    }
-
-    void visitShuffleVectorInst(ShuffleVectorInst &Inst) {
-      auto *From1 = Inst.getOperand(0);
-      auto *From2 = Inst.getOperand(1);
-      addAssignEdge(From1, &Inst);
-      addAssignEdge(From2, &Inst);
-    }
-
-    void visitConstantExpr(ConstantExpr *CE) {
-      switch (CE->getOpcode()) {
-      case Instruction::GetElementPtr: {
-        auto GEPOp = cast<GEPOperator>(CE);
-        visitGEP(*GEPOp);
-        break;
-      }
-
-      case Instruction::PtrToInt: {
-        addNode(CE->getOperand(0), getAttrEscaped());
-        break;
-      }
-
-      case Instruction::IntToPtr: {
-        addNode(CE, getAttrUnknown());
-        break;
-      }
-
-      case Instruction::BitCast:
-      case Instruction::AddrSpaceCast:
-      case Instruction::Trunc:
-      case Instruction::ZExt:
-      case Instruction::SExt:
-      case Instruction::FPExt:
-      case Instruction::FPTrunc:
-      case Instruction::UIToFP:
-      case Instruction::SIToFP:
-      case Instruction::FPToUI:
-      case Instruction::FPToSI: {
-        addAssignEdge(CE->getOperand(0), CE);
-        break;
-      }
-
-      case Instruction::Select: {
-        addAssignEdge(CE->getOperand(1), CE);
-        addAssignEdge(CE->getOperand(2), CE);
-        break;
-      }
-
-      case Instruction::InsertElement:
-      case Instruction::InsertValue: {
-        addAssignEdge(CE->getOperand(0), CE);
-        addStoreEdge(CE->getOperand(1), CE);
-        break;
-      }
-
-      case Instruction::ExtractElement:
-      case Instruction::ExtractValue: {
-        addLoadEdge(CE->getOperand(0), CE);
-        break;
-      }
-
-      case Instruction::Add:
-      case Instruction::FAdd:
-      case Instruction::Sub:
-      case Instruction::FSub:
-      case Instruction::Mul:
-      case Instruction::FMul:
-      case Instruction::UDiv:
-      case Instruction::SDiv:
-      case Instruction::FDiv:
-      case Instruction::URem:
-      case Instruction::SRem:
-      case Instruction::FRem:
-      case Instruction::And:
-      case Instruction::Or:
-      case Instruction::Xor:
-      case Instruction::Shl:
-      case Instruction::LShr:
-      case Instruction::AShr:
-      case Instruction::ICmp:
-      case Instruction::FCmp:
-      case Instruction::ShuffleVector: {
-        addAssignEdge(CE->getOperand(0), CE);
-        addAssignEdge(CE->getOperand(1), CE);
-        break;
-      }
-
-      case Instruction::FNeg: {
-        addAssignEdge(CE->getOperand(0), CE);
-        break;
-      }
-
-      default:
-        llvm_unreachable("Unknown instruction type encountered!");
-      }
-    }
-  };
-
-  // Helper functions
-
-  // Determines whether or not we an instruction is useless to us (e.g.
-  // FenceInst)
-  static bool hasUsefulEdges(Instruction *Inst) {
-    bool IsNonInvokeRetTerminator = Inst->isTerminator() &&
-                                    !isa<InvokeInst>(Inst) &&
-                                    !isa<ReturnInst>(Inst);
-    return !isa<CmpInst>(Inst) && !isa<FenceInst>(Inst) &&
-           !IsNonInvokeRetTerminator;
-  }
-
-  void addArgumentToGraph(Argument &Arg) {
-    if (Arg.getType()->isPointerTy()) {
-      Graph.addNode(InstantiatedValue{&Arg, 0},
-                    getGlobalOrArgAttrFromValue(Arg));
-      // Pointees of a formal parameter is known to the caller
-      Graph.addNode(InstantiatedValue{&Arg, 1}, getAttrCaller());
-    }
-  }
-
-  // Given an Instruction, this will add it to the graph, along with any
-  // Instructions that are potentially only available from said Instruction
-  // For example, given the following line:
-  //   %0 = load i16* getelementptr ([1 x i16]* @a, 0, 0), align 2
-  // addInstructionToGraph would add both the `load` and `getelementptr`
-  // instructions to the graph appropriately.
-  void addInstructionToGraph(GetEdgesVisitor &Visitor, Instruction &Inst) {
-    if (!hasUsefulEdges(&Inst))
-      return;
-
-    Visitor.visit(Inst);
-  }
-
-  // Builds the graph needed for constructing the StratifiedSets for the given
-  // function
-  void buildGraphFrom(Function &Fn) {
-    GetEdgesVisitor Visitor(*this, Fn.getParent()->getDataLayout());
-
-    for (auto &Bb : Fn.getBasicBlockList())
-      for (auto &Inst : Bb.getInstList())
-        addInstructionToGraph(Visitor, Inst);
-
-    for (auto &Arg : Fn.args())
-      addArgumentToGraph(Arg);
-  }
-
-public:
-  CFLGraphBuilder(CFLAA &Analysis, const TargetLibraryInfo &TLI, Function &Fn)
-      : Analysis(Analysis), TLI(TLI) {
-    buildGraphFrom(Fn);
-  }
-
-  const CFLGraph &getCFLGraph() const { return Graph; }
-  const SmallVector<Value *, 4> &getReturnValues() const {
-    return ReturnedValues;
-  }
-};
-
-} // end namespace cflaa
-} // end namespace llvm
-
-#endif // LLVM_LIB_ANALYSIS_CFLGRAPH_H
diff --git a/gnu/llvm/llvm/lib/Analysis/CFLSteensAliasAnalysis.cpp b/gnu/llvm/llvm/lib/Analysis/CFLSteensAliasAnalysis.cpp
deleted file mode 100644
index 9467bb3c9b2..00000000000
--- a/gnu/llvm/llvm/lib/Analysis/CFLSteensAliasAnalysis.cpp
+++ /dev/null
@@ -1,364 +0,0 @@
-//===- CFLSteensAliasAnalysis.cpp - Unification-based Alias Analysis ------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements a CFL-base, summary-based alias analysis algorithm. It
-// does not depend on types. The algorithm is a mixture of the one described in
-// "Demand-driven alias analysis for C" by Xin Zheng and Radu Rugina, and "Fast
-// algorithms for Dyck-CFL-reachability with applications to Alias Analysis" by
-// Zhang Q, Lyu M R, Yuan H, and Su Z. -- to summarize the papers, we build a
-// graph of the uses of a variable, where each node is a memory location, and
-// each edge is an action that happened on that memory location.  The "actions"
-// can be one of Dereference, Reference, or Assign. The precision of this
-// analysis is roughly the same as that of an one level context-sensitive
-// Steensgaard's algorithm.
-//
-// Two variables are considered as aliasing iff you can reach one value's node
-// from the other value's node and the language formed by concatenating all of
-// the edge labels (actions) conforms to a context-free grammar.
-//
-// Because this algorithm requires a graph search on each query, we execute the
-// algorithm outlined in "Fast algorithms..." (mentioned above)
-// in order to transform the graph into sets of variables that may alias in
-// ~nlogn time (n = number of variables), which makes queries take constant
-// time.
-//===----------------------------------------------------------------------===//
-
-// N.B. AliasAnalysis as a whole is phrased as a FunctionPass at the moment, and
-// CFLSteensAA is interprocedural. This is *technically* A Bad Thing, because
-// FunctionPasses are only allowed to inspect the Function that they're being
-// run on. Realistically, this likely isn't a problem until we allow
-// FunctionPasses to run concurrently.
-
-#include "llvm/Analysis/CFLSteensAliasAnalysis.h"
-#include "AliasAnalysisSummary.h"
-#include "CFLGraph.h"
-#include "StratifiedSets.h"
-#include "llvm/ADT/DenseMap.h"
-#include "llvm/ADT/Optional.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/Analysis/TargetLibraryInfo.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/Type.h"
-#include "llvm/IR/Value.h"
-#include "llvm/InitializePasses.h"
-#include "llvm/Pass.h"
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/raw_ostream.h"
-#include <algorithm>
-#include <cassert>
-#include <limits>
-#include <memory>
-#include <utility>
-
-using namespace llvm;
-using namespace llvm::cflaa;
-
-#define DEBUG_TYPE "cfl-steens-aa"
-
-CFLSteensAAResult::CFLSteensAAResult(
-    std::function<const TargetLibraryInfo &(Function &F)> GetTLI)
-    : AAResultBase(), GetTLI(std::move(GetTLI)) {}
-CFLSteensAAResult::CFLSteensAAResult(CFLSteensAAResult &&Arg)
-    : AAResultBase(std::move(Arg)), GetTLI(std::move(Arg.GetTLI)) {}
-CFLSteensAAResult::~CFLSteensAAResult() = default;
-
-/// Information we have about a function and would like to keep around.
-class CFLSteensAAResult::FunctionInfo {
-  StratifiedSets<InstantiatedValue> Sets;
-  AliasSummary Summary;
-
-public:
-  FunctionInfo(Function &Fn, const SmallVectorImpl<Value *> &RetVals,
-               StratifiedSets<InstantiatedValue> S);
-
-  const StratifiedSets<InstantiatedValue> &getStratifiedSets() const {
-    return Sets;
-  }
-
-  const AliasSummary &getAliasSummary() const { return Summary; }
-};
-
-const StratifiedIndex StratifiedLink::SetSentinel =
-    std::numeric_limits<StratifiedIndex>::max();
-
-//===----------------------------------------------------------------------===//
-// Function declarations that require types defined in the namespace above
-//===----------------------------------------------------------------------===//
-
-/// Determines whether it would be pointless to add the given Value to our sets.
-static bool canSkipAddingToSets(Value *Val) {
-  // Constants can share instances, which may falsely unify multiple
-  // sets, e.g. in
-  // store i32* null, i32** %ptr1
-  // store i32* null, i32** %ptr2
-  // clearly ptr1 and ptr2 should not be unified into the same set, so
-  // we should filter out the (potentially shared) instance to
-  // i32* null.
-  if (isa<Constant>(Val)) {
-    // TODO: Because all of these things are constant, we can determine whether
-    // the data is *actually* mutable at graph building time. This will probably
-    // come for free/cheap with offset awareness.
-    bool CanStoreMutableData = isa<GlobalValue>(Val) ||
-                               isa<ConstantExpr>(Val) ||
-                               isa<ConstantAggregate>(Val);
-    return !CanStoreMutableData;
-  }
-
-  return false;
-}
-
-CFLSteensAAResult::FunctionInfo::FunctionInfo(
-    Function &Fn, const SmallVectorImpl<Value *> &RetVals,
-    StratifiedSets<InstantiatedValue> S)
-    : Sets(std::move(S)) {
-  // Historically, an arbitrary upper-bound of 50 args was selected. We may want
-  // to remove this if it doesn't really matter in practice.
-  if (Fn.arg_size() > MaxSupportedArgsInSummary)
-    return;
-
-  DenseMap<StratifiedIndex, InterfaceValue> InterfaceMap;
-
-  // Our intention here is to record all InterfaceValues that share the same
-  // StratifiedIndex in RetParamRelations. For each valid InterfaceValue, we
-  // have its StratifiedIndex scanned here and check if the index is presented
-  // in InterfaceMap: if it is not, we add the correspondence to the map;
-  // otherwise, an aliasing relation is found and we add it to
-  // RetParamRelations.
-
-  auto AddToRetParamRelations = [&](unsigned InterfaceIndex,
-                                    StratifiedIndex SetIndex) {
-    unsigned Level = 0;
-    while (true) {
-      InterfaceValue CurrValue{InterfaceIndex, Level};
-
-      auto Itr = InterfaceMap.find(SetIndex);
-      if (Itr != InterfaceMap.end()) {
-        if (CurrValue != Itr->second)
-          Summary.RetParamRelations.push_back(
-              ExternalRelation{CurrValue, Itr->second, UnknownOffset});
-        break;
-      }
-
-      auto &Link = Sets.getLink(SetIndex);
-      InterfaceMap.insert(std::make_pair(SetIndex, CurrValue));
-      auto ExternalAttrs = getExternallyVisibleAttrs(Link.Attrs);
-      if (ExternalAttrs.any())
-        Summary.RetParamAttributes.push_back(
-            ExternalAttribute{CurrValue, ExternalAttrs});
-
-      if (!Link.hasBelow())
-        break;
-
-      ++Level;
-      SetIndex = Link.Below;
-    }
-  };
-
-  // Populate RetParamRelations for return values
-  for (auto *RetVal : RetVals) {
-    assert(RetVal != nullptr);
-    assert(RetVal->getType()->isPointerTy());
-    auto RetInfo = Sets.find(InstantiatedValue{RetVal, 0});
-    if (RetInfo.hasValue())
-      AddToRetParamRelations(0, RetInfo->Index);
-  }
-
-  // Populate RetParamRelations for parameters
-  unsigned I = 0;
-  for (auto &Param : Fn.args()) {
-    if (Param.getType()->isPointerTy()) {
-      auto ParamInfo = Sets.find(InstantiatedValue{&Param, 0});
-      if (ParamInfo.hasValue())
-        AddToRetParamRelations(I + 1, ParamInfo->Index);
-    }
-    ++I;
-  }
-}
-
-// Builds the graph + StratifiedSets for a function.
-CFLSteensAAResult::FunctionInfo CFLSteensAAResult::buildSetsFrom(Function *Fn) {
-  CFLGraphBuilder<CFLSteensAAResult> GraphBuilder(*this, GetTLI(*Fn), *Fn);
-  StratifiedSetsBuilder<InstantiatedValue> SetBuilder;
-
-  // Add all CFLGraph nodes and all Dereference edges to StratifiedSets
-  auto &Graph = GraphBuilder.getCFLGraph();
-  for (const auto &Mapping : Graph.value_mappings()) {
-    auto Val = Mapping.first;
-    if (canSkipAddingToSets(Val))
-      continue;
-    auto &ValueInfo = Mapping.second;
-
-    assert(ValueInfo.getNumLevels() > 0);
-    SetBuilder.add(InstantiatedValue{Val, 0});
-    SetBuilder.noteAttributes(InstantiatedValue{Val, 0},
-                              ValueInfo.getNodeInfoAtLevel(0).Attr);
-    for (unsigned I = 0, E = ValueInfo.getNumLevels() - 1; I < E; ++I) {
-      SetBuilder.add(InstantiatedValue{Val, I + 1});
-      SetBuilder.noteAttributes(InstantiatedValue{Val, I + 1},
-                                ValueInfo.getNodeInfoAtLevel(I + 1).Attr);
-      SetBuilder.addBelow(InstantiatedValue{Val, I},
-                          InstantiatedValue{Val, I + 1});
-    }
-  }
-
-  // Add all assign edges to StratifiedSets
-  for (const auto &Mapping : Graph.value_mappings()) {
-    auto Val = Mapping.first;
-    if (canSkipAddingToSets(Val))
-      continue;
-    auto &ValueInfo = Mapping.second;
-
-    for (unsigned I = 0, E = ValueInfo.getNumLevels(); I < E; ++I) {
-      auto Src = InstantiatedValue{Val, I};
-      for (auto &Edge : ValueInfo.getNodeInfoAtLevel(I).Edges)
-        SetBuilder.addWith(Src, Edge.Other);
-    }
-  }
-
-  return FunctionInfo(*Fn, GraphBuilder.getReturnValues(), SetBuilder.build());
-}
-
-void CFLSteensAAResult::scan(Function *Fn) {
-  auto InsertPair = Cache.insert(std::make_pair(Fn, Optional<FunctionInfo>()));
-  (void)InsertPair;
-  assert(InsertPair.second &&
-         "Trying to scan a function that has already been cached");
-
-  // Note that we can't do Cache[Fn] = buildSetsFrom(Fn) here: the function call
-  // may get evaluated after operator[], potentially triggering a DenseMap
-  // resize and invalidating the reference returned by operator[]
-  auto FunInfo = buildSetsFrom(Fn);
-  Cache[Fn] = std::move(FunInfo);
-
-  Handles.emplace_front(Fn, this);
-}
-
-void CFLSteensAAResult::evict(Function *Fn) { Cache.erase(Fn); }
-
-/// Ensures that the given function is available in the cache, and returns the
-/// entry.
-const Optional<CFLSteensAAResult::FunctionInfo> &
-CFLSteensAAResult::ensureCached(Function *Fn) {
-  auto Iter = Cache.find(Fn);
-  if (Iter == Cache.end()) {
-    scan(Fn);
-    Iter = Cache.find(Fn);
-    assert(Iter != Cache.end());
-    assert(Iter->second.hasValue());
-  }
-  return Iter->second;
-}
-
-const AliasSummary *CFLSteensAAResult::getAliasSummary(Function &Fn) {
-  auto &FunInfo = ensureCached(&Fn);
-  if (FunInfo.hasValue())
-    return &FunInfo->getAliasSummary();
-  else
-    return nullptr;
-}
-
-AliasResult CFLSteensAAResult::query(const MemoryLocation &LocA,
-                                     const MemoryLocation &LocB) {
-  auto *ValA = const_cast<Value *>(LocA.Ptr);
-  auto *ValB = const_cast<Value *>(LocB.Ptr);
-
-  if (!ValA->getType()->isPointerTy() || !ValB->getType()->isPointerTy())
-    return AliasResult::NoAlias;
-
-  Function *Fn = nullptr;
-  Function *MaybeFnA = const_cast<Function *>(parentFunctionOfValue(ValA));
-  Function *MaybeFnB = const_cast<Function *>(parentFunctionOfValue(ValB));
-  if (!MaybeFnA && !MaybeFnB) {
-    // The only times this is known to happen are when globals + InlineAsm are
-    // involved
-    LLVM_DEBUG(
-        dbgs()
-        << "CFLSteensAA: could not extract parent function information.\n");
-    return AliasResult::MayAlias;
-  }
-
-  if (MaybeFnA) {
-    Fn = MaybeFnA;
-    assert((!MaybeFnB || MaybeFnB == MaybeFnA) &&
-           "Interprocedural queries not supported");
-  } else {
-    Fn = MaybeFnB;
-  }
-
-  assert(Fn != nullptr);
-  auto &MaybeInfo = ensureCached(Fn);
-  assert(MaybeInfo.hasValue());
-
-  auto &Sets = MaybeInfo->getStratifiedSets();
-  auto MaybeA = Sets.find(InstantiatedValue{ValA, 0});
-  if (!MaybeA.hasValue())
-    return AliasResult::MayAlias;
-
-  auto MaybeB = Sets.find(InstantiatedValue{ValB, 0});
-  if (!MaybeB.hasValue())
-    return AliasResult::MayAlias;
-
-  auto SetA = *MaybeA;
-  auto SetB = *MaybeB;
-  auto AttrsA = Sets.getLink(SetA.Index).Attrs;
-  auto AttrsB = Sets.getLink(SetB.Index).Attrs;
-
-  // If both values are local (meaning the corresponding set has attribute
-  // AttrNone or AttrEscaped), then we know that CFLSteensAA fully models them:
-  // they may-alias each other if and only if they are in the same set.
-  // If at least one value is non-local (meaning it either is global/argument or
-  // it comes from unknown sources like integer cast), the situation becomes a
-  // bit more interesting. We follow three general rules described below:
-  // - Non-local values may alias each other
-  // - AttrNone values do not alias any non-local values
-  // - AttrEscaped do not alias globals/arguments, but they may alias
-  // AttrUnknown values
-  if (SetA.Index == SetB.Index)
-    return AliasResult::MayAlias;
-  if (AttrsA.none() || AttrsB.none())
-    return AliasResult::NoAlias;
-  if (hasUnknownOrCallerAttr(AttrsA) || hasUnknownOrCallerAttr(AttrsB))
-    return AliasResult::MayAlias;
-  if (isGlobalOrArgAttr(AttrsA) && isGlobalOrArgAttr(AttrsB))
-    return AliasResult::MayAlias;
-  return AliasResult::NoAlias;
-}
-
-AnalysisKey CFLSteensAA::Key;
-
-CFLSteensAAResult CFLSteensAA::run(Function &F, FunctionAnalysisManager &AM) {
-  auto GetTLI = [&AM](Function &F) -> const TargetLibraryInfo & {
-    return AM.getResult<TargetLibraryAnalysis>(F);
-  };
-  return CFLSteensAAResult(GetTLI);
-}
-
-char CFLSteensAAWrapperPass::ID = 0;
-INITIALIZE_PASS(CFLSteensAAWrapperPass, "cfl-steens-aa",
-                "Unification-Based CFL Alias Analysis", false, true)
-
-ImmutablePass *llvm::createCFLSteensAAWrapperPass() {
-  return new CFLSteensAAWrapperPass();
-}
-
-CFLSteensAAWrapperPass::CFLSteensAAWrapperPass() : ImmutablePass(ID) {
-  initializeCFLSteensAAWrapperPassPass(*PassRegistry::getPassRegistry());
-}
-
-void CFLSteensAAWrapperPass::initializePass() {
-  auto GetTLI = [this](Function &F) -> const TargetLibraryInfo & {
-    return this->getAnalysis<TargetLibraryInfoWrapperPass>().getTLI(F);
-  };
-  Result.reset(new CFLSteensAAResult(GetTLI));
-}
-
-void CFLSteensAAWrapperPass::getAnalysisUsage(AnalysisUsage &AU) const {
-  AU.setPreservesAll();
-  AU.addRequired<TargetLibraryInfoWrapperPass>();
-}
diff --git a/gnu/llvm/llvm/lib/Analysis/ReleaseModeModelRunner.cpp b/gnu/llvm/llvm/lib/Analysis/ReleaseModeModelRunner.cpp
deleted file mode 100644
index d2bf9538806..00000000000
--- a/gnu/llvm/llvm/lib/Analysis/ReleaseModeModelRunner.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-//===- ReleaseModeModelRunner.cpp - Fast, precompiled model runner  -------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements a model runner wrapping an AOT compiled ML model.
-// Only inference is supported.
-//
-//===----------------------------------------------------------------------===//
-#include "llvm/Config/config.h"
-#if defined(LLVM_HAVE_TF_AOT)
-
-#include "llvm/Analysis/InlineModelFeatureMaps.h"
-#include "llvm/Analysis/MLInlineAdvisor.h"
-
-// codegen-ed file
-#include "InlinerSizeModel.h" // NOLINT
-
-#include <memory>
-#include <vector>
-
-using namespace llvm;
-namespace {
-
-const char FeedPrefix[] = "feed_";
-const char FetchPrefix[] = "fetch_";
-
-/// MLModelRunner - production mode implementation. It uses a AOT-compiled
-/// SavedModel for efficient execution.
-class ReleaseModeModelRunner final : public MLModelRunner {
-public:
-  ReleaseModeModelRunner(LLVMContext &Ctx);
-  virtual ~ReleaseModeModelRunner() = default;
-
-  bool run() override;
-
-  void setFeature(FeatureIndex Index, int64_t Value) override;
-  int64_t getFeature(int Index) const override;
-
-private:
-  std::vector<int32_t> FeatureIndices;
-  int32_t ResultIndex = -1;
-  std::unique_ptr<llvm::InlinerSizeModel> CompiledModel;
-};
-} // namespace
-
-ReleaseModeModelRunner::ReleaseModeModelRunner(LLVMContext &Ctx)
-    : MLModelRunner(Ctx),
-      CompiledModel(std::make_unique<llvm::InlinerSizeModel>()) {
-  assert(CompiledModel && "The CompiledModel should be valid");
-
-  FeatureIndices.resize(NumberOfFeatures);
-
-  for (size_t I = 0; I < NumberOfFeatures; ++I) {
-    const int Index =
-        CompiledModel->LookupArgIndex(FeedPrefix + FeatureNameMap[I]);
-    assert(Index >= 0 && "Cannot find Feature in inlining model");
-    FeatureIndices[I] = Index;
-  }
-
-  ResultIndex =
-      CompiledModel->LookupResultIndex(std::string(FetchPrefix) + DecisionName);
-  assert(ResultIndex >= 0 && "Cannot find DecisionName in inlining model");
-}
-
-int64_t ReleaseModeModelRunner::getFeature(int Index) const {
-  return *static_cast<int64_t *>(
-      CompiledModel->arg_data(FeatureIndices[Index]));
-}
-
-void ReleaseModeModelRunner::setFeature(FeatureIndex Index, int64_t Value) {
-  *static_cast<int64_t *>(CompiledModel->arg_data(
-      FeatureIndices[static_cast<size_t>(Index)])) = Value;
-}
-
-bool ReleaseModeModelRunner::run() {
-  CompiledModel->Run();
-  return static_cast<bool>(
-      *static_cast<int64_t *>(CompiledModel->result_data(ResultIndex)));
-}
-
-std::unique_ptr<InlineAdvisor>
-llvm::getReleaseModeAdvisor(Module &M, ModuleAnalysisManager &MAM) {
-  auto AOTRunner = std::make_unique<ReleaseModeModelRunner>(M.getContext());
-  return std::make_unique<MLInlineAdvisor>(M, MAM, std::move(AOTRunner));
-}
-#endif // defined(LLVM_HAVE_TF_AOT)
diff --git a/gnu/llvm/llvm/lib/Analysis/TFUtils.cpp b/gnu/llvm/llvm/lib/Analysis/TFUtils.cpp
deleted file mode 100644
index e93dc303ae6..00000000000
--- a/gnu/llvm/llvm/lib/Analysis/TFUtils.cpp
+++ /dev/null
@@ -1,542 +0,0 @@
-//===- TFUtils.cpp - tensorflow evaluation utilities ----------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements utilities for interfacing with tensorflow C APIs.
-//
-//===----------------------------------------------------------------------===//
-#include "llvm/Config/config.h"
-#if defined(LLVM_HAVE_TF_API)
-
-#include "llvm/ADT/Twine.h"
-#include "llvm/Analysis/Utils/TFUtils.h"
-#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/JSON.h"
-#include "llvm/Support/ManagedStatic.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Support/raw_ostream.h"
-
-#include "google/protobuf/text_format.h"
-#include "tensorflow/c/c_api.h"
-#include "tensorflow/c/c_api_experimental.h"
-#include "tensorflow/core/example/example.pb.h"
-#include <cassert>
-#include <numeric>
-
-using namespace llvm;
-
-using google::protobuf::Message;
-using google::protobuf::TextFormat;
-
-static cl::opt<bool>
-    ProtobufTextMode("tfutils-text-log", cl::init(false), cl::Hidden,
-                     cl::desc("Output textual (human-readable) protobuf."));
-
-namespace {
-
-using TFGraphPtr = std::unique_ptr<TF_Graph, decltype(&TF_DeleteGraph)>;
-using TFSessionOptionsPtr =
-    std::unique_ptr<TF_SessionOptions, decltype(&TF_DeleteSessionOptions)>;
-using TFStatusPtr = std::unique_ptr<TF_Status, decltype(&TF_DeleteStatus)>;
-
-struct TFInitializer {
-  TFInitializer() {
-    assert(!IsInitialized && "TFInitialized should be called only once");
-    int Argc = 1;
-    const char *Name = "";
-    const char **NamePtr = &Name;
-    TF_InitMain(Name, &Argc, const_cast<char ***>(&NamePtr));
-    IsInitialized = true;
-  }
-  bool IsInitialized = false;
-};
-
-llvm::ManagedStatic<TFInitializer> TFLibInitializer;
-
-bool ensureInitTF() { return TFLibInitializer->IsInitialized; }
-
-TFGraphPtr createTFGraph() {
-  return TFGraphPtr(TF_NewGraph(), &TF_DeleteGraph);
-}
-
-TFStatusPtr createTFStatus() {
-  return TFStatusPtr(TF_NewStatus(), &TF_DeleteStatus);
-}
-
-TFSessionOptionsPtr createTFSessionOptions() {
-  return TFSessionOptionsPtr(TF_NewSessionOptions(), &TF_DeleteSessionOptions);
-}
-} // namespace
-
-namespace llvm {
-class EvaluationResultImpl {
-public:
-  EvaluationResultImpl(size_t OutputSize)
-      : OutputSize(OutputSize), Output(OutputSize){};
-
-  ~EvaluationResultImpl() {
-    for (auto *P : Output)
-      if (P)
-        TF_DeleteTensor(P);
-  }
-
-  EvaluationResultImpl(const EvaluationResultImpl &) = delete;
-  EvaluationResultImpl(EvaluationResultImpl &&Other) = delete;
-  std::vector<TF_Tensor *> &getOutput() { return Output; }
-
-private:
-  const size_t OutputSize;
-  std::vector<TF_Tensor *> Output;
-};
-
-size_t TensorSpec::getElementByteSize() const {
-  return TF_DataTypeSize(static_cast<TF_DataType>(TypeIndex));
-}
-
-TensorSpec::TensorSpec(const std::string &Name, int Port, int TypeIndex,
-                       const std::vector<int64_t> &Shape)
-    : Name(Name), Port(Port), TypeIndex(TypeIndex), Shape(Shape),
-      ElementCount(std::accumulate(Shape.begin(), Shape.end(), 1,
-                                   std::multiplies<int64_t>())) {}
-
-Optional<TensorSpec> getTensorSpecFromJSON(LLVMContext &Ctx,
-                                           const json::Value &Value) {
-  auto EmitError = [&](const llvm::Twine &Message) -> Optional<TensorSpec> {
-    std::string S;
-    llvm::raw_string_ostream OS(S);
-    OS << Value;
-    Ctx.emitError("Unable to parse JSON Value as spec (" + Message + "): " + S);
-    return None;
-  };
-  // FIXME: accept a Path as a parameter, and use it for error reporting.
-  json::Path::Root Root("tensor_spec");
-  json::ObjectMapper Mapper(Value, Root);
-  if (!Mapper)
-    return EmitError("Value is not a dict");
-
-  std::string TensorName;
-  int TensorPort = -1;
-  std::string TensorType;
-  std::vector<int64_t> TensorShape;
-
-  if (!Mapper.map<std::string>("name", TensorName))
-    return EmitError("'name' property not present or not a string");
-  if (!Mapper.map<std::string>("type", TensorType))
-    return EmitError("'type' property not present or not a string");
-  if (!Mapper.map<int>("port", TensorPort))
-    return EmitError("'port' property not present or not an int");
-  if (!Mapper.map<std::vector<int64_t>>("shape", TensorShape))
-    return EmitError("'shape' property not present or not an int array");
-
-#define PARSE_TYPE(T, E)                                                       \
-  if (TensorType == #T)                                                        \
-    return TensorSpec::createSpec<T>(TensorName, TensorShape, TensorPort);
-  TFUTILS_SUPPORTED_TYPES(PARSE_TYPE)
-#undef PARSE_TYPE
-  return None;
-}
-
-Optional<std::vector<LoggedFeatureSpec>>
-loadOutputSpecs(LLVMContext &Ctx, StringRef ExpectedDecisionName,
-                StringRef ModelPath, StringRef SpecFileOverride) {
-  SmallVector<char, 128> OutputSpecsPath;
-  StringRef FileName = SpecFileOverride;
-  if (FileName.empty()) {
-    llvm::sys::path::append(OutputSpecsPath, ModelPath, "output_spec.json");
-    FileName = {OutputSpecsPath.data(), OutputSpecsPath.size()};
-  }
-
-  auto BufferOrError = MemoryBuffer::getFileOrSTDIN(FileName);
-  if (!BufferOrError) {
-    Ctx.emitError("Error opening output specs file: " + FileName + " : " +
-                  BufferOrError.getError().message());
-    return None;
-  }
-  auto ParsedJSONValues = json::parse(BufferOrError.get()->getBuffer());
-  if (!ParsedJSONValues) {
-    Ctx.emitError("Could not parse specs file: " + FileName);
-    return None;
-  }
-  auto ValuesArray = ParsedJSONValues->getAsArray();
-  if (!ValuesArray) {
-    Ctx.emitError("Expected an array of {tensor_spec:<TensorSpec>, "
-                  "logging_name:<name>} dictionaries");
-    return None;
-  }
-  std::vector<LoggedFeatureSpec> Ret;
-  for (const auto &Value : *ValuesArray)
-    if (const auto *Obj = Value.getAsObject())
-      if (const auto *SpecPart = Obj->get("tensor_spec"))
-        if (auto TensorSpec = getTensorSpecFromJSON(Ctx, *SpecPart))
-          if (auto LoggingName = Obj->getString("logging_name")) {
-            if (!TensorSpec->isElementType<int64_t>() &&
-                !TensorSpec->isElementType<int32_t>() &&
-                !TensorSpec->isElementType<float>()) {
-              Ctx.emitError(
-                  "Only int64, int32, and float tensors are supported. "
-                  "Found unsupported type for tensor named " +
-                  TensorSpec->name());
-              return None;
-            }
-            Ret.push_back({*TensorSpec, LoggingName->str()});
-          }
-
-  if (ValuesArray->size() != Ret.size()) {
-    Ctx.emitError(
-        "Unable to parse output spec. It should be a json file containing an "
-        "array of dictionaries. Each dictionary must have a 'tensor_spec' key, "
-        "with a json object describing a TensorSpec; and a 'logging_name' key, "
-        "which is a string to use as name when logging this tensor in the "
-        "training log.");
-    return None;
-  }
-  if (Ret.empty() || *Ret[0].LoggingName != ExpectedDecisionName) {
-    Ctx.emitError("The first output spec must describe the decision tensor, "
-                  "and must have the logging_name " +
-                  StringRef(ExpectedDecisionName));
-    return None;
-  }
-  return Ret;
-}
-
-class TFModelEvaluatorImpl {
-public:
-  TFModelEvaluatorImpl(StringRef SavedModelPath,
-                       const std::vector<TensorSpec> &InputSpecs,
-                       function_ref<TensorSpec(size_t)> GetOutputSpecs,
-                       size_t OutputSpecsSize, const char *Tags);
-
-  bool isValid() const { return IsValid; }
-  size_t OutputSize() const { return OutputFeed.size(); }
-
-  void evaluate(TF_Tensor **Output, TF_Status *Status) {
-    TF_SessionRun(Session, nullptr, InputFeed.data(), Input.data(),
-                  Input.size(), OutputFeed.data(), Output, OutputFeed.size(),
-                  nullptr, 0, nullptr, Status);
-  }
-
-  void initInput(size_t Index, TF_DataType Type,
-                 const std::vector<int64_t> &Dimensions);
-  const std::vector<TF_Tensor *> &getInput() const { return Input; }
-
-  ~TFModelEvaluatorImpl();
-
-private:
-  /// The objects necessary for carrying out an evaluation of the SavedModel.
-  /// They are expensive to set up, and we maintain them accross all the
-  /// evaluations of the model.
-  TF_Session *Session = nullptr;
-  TFGraphPtr Graph;
-  TFSessionOptionsPtr Options;
-
-  /// The specification of the input nodes.
-  std::vector<TF_Output> InputFeed;
-
-  /// The input tensors. They must match by index of the corresponding InputFeed
-  /// value. We set up the tensors once and just mutate theirs scalars before
-  /// each evaluation. The input tensors keep their value after an evaluation.
-  std::vector<TF_Tensor *> Input;
-
-  /// The specification of the output nodes. When evaluating, the tensors in the
-  /// output tensor vector must match by index the corresponding element in the
-  /// OutputFeed.
-  std::vector<TF_Output> OutputFeed;
-
-  void invalidate() { IsValid = false; }
-
-  bool IsValid = true;
-
-  /// Reusable utility for ensuring we can bind the requested Name to a node in
-  /// the SavedModel Graph.
-  bool checkReportAndInvalidate(const TF_Output &Output,
-                                const TensorSpec &OutputSpec);
-};
-
-class LoggerDataImpl {
-  const std::vector<LoggedFeatureSpec> LoggedFeatureSpecs;
-  const TensorSpec RewardSpec;
-
-  tensorflow::SequenceExample SE;
-  std::vector<tensorflow::FeatureList *> FeatureLists;
-  tensorflow::FeatureList *Reward = nullptr;
-
-public:
-  LoggerDataImpl(const std::vector<LoggedFeatureSpec> &LoggedSpecs,
-                 const TensorSpec &RewardSpec, bool IncludeReward)
-      : LoggedFeatureSpecs(LoggedSpecs), RewardSpec(RewardSpec) {
-    auto *FL = SE.mutable_feature_lists()->mutable_feature_list();
-    if (IncludeReward)
-      Reward = &(*FL)[RewardSpec.name()];
-    // Allocate first the map entries, then capture their address. We will not
-    // mutate the set of features after this (i.e. the pointers won't dangle).
-    for (const auto &LFS : LoggedSpecs) {
-      (*FL)[LFS.LoggingName ? *LFS.LoggingName : LFS.Spec.name()] = {};
-    }
-    for (const auto &LFS : LoggedSpecs)
-      FeatureLists.push_back(
-          &(*FL)[LFS.LoggingName ? *LFS.LoggingName : LFS.Spec.name()]);
-  }
-
-  void print(raw_ostream &OS) {
-    std::string OutStr;
-    if (ProtobufTextMode)
-      google::protobuf::TextFormat::PrintToString(SE, &OutStr);
-    else
-      OutStr = SE.SerializeAsString();
-
-    OS << OutStr;
-  }
-
-  char *addNewTensor(size_t FeatureID) {
-    const auto &Spec = LoggedFeatureSpecs[FeatureID].Spec;
-    if (Spec.isElementType<float>()) {
-      auto *RF = FeatureLists[FeatureID]
-                     ->add_feature()
-                     ->mutable_float_list()
-                     ->mutable_value();
-      RF->Resize(Spec.getElementCount(), 0.0);
-      return reinterpret_cast<char *>(RF->mutable_data());
-    } else if (Spec.isElementType<int32_t>() || Spec.isElementType<int64_t>()) {
-      auto *RF = FeatureLists[FeatureID]
-                     ->add_feature()
-                     ->mutable_int64_list()
-                     ->mutable_value();
-      RF->Resize(Spec.getElementCount(), 0);
-      return reinterpret_cast<char *>(RF->mutable_data());
-    }
-    llvm_unreachable("Unsupported tensor type.");
-  }
-
-  template <typename T> void logReward(T Value) {
-    if (RewardSpec.isElementType<float>())
-      Reward->add_feature()->mutable_float_list()->add_value(Value);
-    else if (RewardSpec.isElementType<int32_t>() ||
-             RewardSpec.isElementType<int64_t>())
-      Reward->add_feature()->mutable_int64_list()->add_value(Value);
-    else
-      llvm_unreachable("Unsupported tensor type.");
-  }
-
-  size_t getNrRecords() const {
-    return FeatureLists.empty() ? 0 : FeatureLists[0]->feature().size();
-  }
-};
-} // namespace llvm
-
-TFModelEvaluatorImpl::TFModelEvaluatorImpl(
-    StringRef SavedModelPath, const std::vector<TensorSpec> &InputSpecs,
-    function_ref<TensorSpec(size_t)> GetOutputSpecs, size_t OutputSpecsSize,
-    const char *Tags = "serve")
-    : Graph(createTFGraph()), Options(createTFSessionOptions()),
-      InputFeed(InputSpecs.size()), Input(InputSpecs.size()),
-      OutputFeed(OutputSpecsSize) {
-  if (!ensureInitTF()) {
-    errs() << "Tensorflow should have been initialized";
-    return;
-  }
-  auto Status = createTFStatus();
-
-  Session = TF_LoadSessionFromSavedModel(Options.get(), nullptr,
-                                         SavedModelPath.str().c_str(), &Tags, 1,
-                                         Graph.get(), nullptr, Status.get());
-  if (TF_GetCode(Status.get()) != TF_Code::TF_OK) {
-    errs() << TF_Message(Status.get());
-    invalidate();
-  }
-  for (size_t I = 0; I < InputSpecs.size(); ++I) {
-    auto &InputSpec = InputSpecs[I];
-    InputFeed[I] = {
-        TF_GraphOperationByName(Graph.get(), (InputSpec.name()).c_str()),
-        InputSpec.port()};
-    if (!checkReportAndInvalidate(InputFeed[I], InputSpec))
-      return;
-    initInput(I, static_cast<TF_DataType>(InputSpec.typeIndex()),
-              InputSpec.shape());
-  }
-  for (size_t I = 0; I < OutputSpecsSize; ++I) {
-    auto OutputSpec = GetOutputSpecs(I);
-    OutputFeed[I] = {
-        TF_GraphOperationByName(Graph.get(), (OutputSpec.name()).c_str()),
-        OutputSpec.port()};
-    if (!checkReportAndInvalidate(OutputFeed[I], OutputSpec))
-      return;
-  }
-}
-
-TFModelEvaluator::TFModelEvaluator(
-    StringRef SavedModelPath, const std::vector<TensorSpec> &InputSpecs,
-    function_ref<TensorSpec(size_t)> GetOutputSpecs, size_t OutputSpecsSize,
-    const char *Tags)
-    : Impl(new TFModelEvaluatorImpl(SavedModelPath, InputSpecs, GetOutputSpecs,
-                                    OutputSpecsSize, Tags)) {
-  if (!Impl->isValid())
-    Impl.reset();
-}
-
-TFModelEvaluator::TFModelEvaluator(StringRef SavedModelPath,
-                                   const std::vector<TensorSpec> &InputSpecs,
-                                   const std::vector<TensorSpec> &OutputSpecs,
-                                   const char *Tags)
-    : TFModelEvaluator(
-          SavedModelPath, InputSpecs, [&](size_t I) { return OutputSpecs[I]; },
-          OutputSpecs.size(), Tags) {}
-
-TFModelEvaluatorImpl::~TFModelEvaluatorImpl() {
-  for (auto *T : Input) {
-    TF_DeleteTensor(T);
-  }
-  if (Session == nullptr)
-    return;
-  auto Status = createTFStatus();
-  TF_DeleteSession(Session, Status.get());
-  Session = nullptr;
-  if (TF_GetCode(Status.get()) != TF_Code::TF_OK)
-    errs() << "Could not delete TF session";
-}
-
-bool TFModelEvaluatorImpl::checkReportAndInvalidate(
-    const TF_Output &Output, const TensorSpec &OutputSpec) {
-  if (Output.oper)
-    return true;
-  errs() << "Could not find TF_Output named: " + OutputSpec.name();
-  IsValid = false;
-  return IsValid;
-}
-
-Optional<TFModelEvaluator::EvaluationResult> TFModelEvaluator::evaluate() {
-  if (!isValid())
-    return None;
-  std::unique_ptr<EvaluationResultImpl> Ret =
-      std::make_unique<EvaluationResultImpl>(Impl->OutputSize());
-  auto Status = createTFStatus();
-  Impl->evaluate(Ret->getOutput().data(), Status.get());
-  if (TF_GetCode(Status.get()) != TF_Code::TF_OK) {
-    errs() << TF_Message(Status.get());
-    Impl.reset();
-    return None;
-  }
-  return EvaluationResult(std::move(Ret));
-}
-
-void TFModelEvaluatorImpl::initInput(size_t Index, TF_DataType Type,
-                                     const std::vector<int64_t> &Dimensions) {
-  int64_t TotalSize = TF_DataTypeSize(Type);
-  for (auto &D : Dimensions)
-    TotalSize *= D;
-
-  Input[Index] =
-      TF_AllocateTensor(Type, Dimensions.data(), Dimensions.size(), TotalSize);
-  std::memset(TF_TensorData(Input[Index]), 0, TotalSize);
-}
-
-void *TFModelEvaluator::getUntypedInput(size_t Index) {
-  return TF_TensorData(Impl->getInput()[Index]);
-}
-
-TFModelEvaluator::EvaluationResult::EvaluationResult(
-    std::unique_ptr<EvaluationResultImpl> Impl)
-    : Impl(std::move(Impl)) {}
-
-TFModelEvaluator::EvaluationResult::EvaluationResult(EvaluationResult &&Other)
-    : Impl(std::move(Other.Impl)) {}
-
-TFModelEvaluator::EvaluationResult &
-TFModelEvaluator::EvaluationResult::operator=(EvaluationResult &&Other) {
-  Impl = std::move(Other.Impl);
-  return *this;
-}
-
-void *TFModelEvaluator::EvaluationResult::getUntypedTensorValue(size_t Index) {
-  return TF_TensorData(Impl->getOutput()[Index]);
-}
-
-const void *
-TFModelEvaluator::EvaluationResult::getUntypedTensorValue(size_t Index) const {
-  return TF_TensorData(Impl->getOutput()[Index]);
-}
-
-#define TFUTILS_GETDATATYPE_IMPL(T, E)                                         \
-  template <> int TensorSpec::getDataType<T>() { return E; }
-
-TFUTILS_SUPPORTED_TYPES(TFUTILS_GETDATATYPE_IMPL)
-
-#undef TFUTILS_GETDATATYPE_IMPL
-
-TFModelEvaluator::EvaluationResult::~EvaluationResult() {}
-TFModelEvaluator::~TFModelEvaluator() {}
-
-Logger::Logger(const std::vector<LoggedFeatureSpec> &FeatureSpecs,
-               const TensorSpec &RewardSpec, bool IncludeReward)
-    : FeatureSpecs(FeatureSpecs), RewardSpec(RewardSpec),
-      IncludeReward(IncludeReward),
-      LoggerData(std::make_unique<LoggerDataImpl>(FeatureSpecs, RewardSpec,
-                                                  IncludeReward)) {}
-
-Logger::~Logger() {}
-
-#define LOG_REWARD(NAME, TYPE)                                                 \
-  void Logger::log##NAME##Reward(TYPE Value) {                                 \
-    assert(IncludeReward);                                                     \
-    LoggerData->logReward(Value);                                              \
-  }
-
-LOG_REWARD(Float, float)
-LOG_REWARD(Int32, int32_t)
-LOG_REWARD(Int64, int64_t)
-#undef LOG_REWARD
-
-#define LOG_FINAL_REWARD(NAME, TYPE)                                           \
-  void Logger::log##NAME##FinalReward(TYPE Value) {                            \
-    assert(RewardSpec.isElementType<TYPE>());                                  \
-    for (size_t I = 1; I < LoggerData->getNrRecords(); ++I)                    \
-      log##NAME##Reward(0);                                                    \
-    log##NAME##Reward(Value);                                                  \
-  }
-
-LOG_FINAL_REWARD(Float, float)
-LOG_FINAL_REWARD(Int32, int32_t)
-LOG_FINAL_REWARD(Int64, int64_t)
-#undef LOG_FINAL_REWARD
-
-void Logger::logFloatValue(size_t FeatureID, const float *Value) {
-  assert(FeatureSpecs[FeatureID].Spec.isElementType<float>());
-  logSpecifiedTensorValue(FeatureID, reinterpret_cast<const char *>(Value));
-}
-
-void Logger::logInt64Value(size_t FeatureID, const int64_t *Value) {
-  assert(FeatureSpecs[FeatureID].Spec.isElementType<int64_t>());
-  logSpecifiedTensorValue(FeatureID, reinterpret_cast<const char *>(Value));
-}
-
-void Logger::logInt32Value(size_t FeatureID, const int32_t *Value) {
-  assert(FeatureSpecs[FeatureID].Spec.isElementType<int32_t>());
-  logSpecifiedTensorValue(FeatureID, reinterpret_cast<const char *>(Value));
-}
-
-void Logger::logSpecifiedTensorValue(size_t FeatureID, const char *RawData) {
-  const auto &Spec = FeatureSpecs[FeatureID].Spec;
-  char *Buff = addEntryAndGetFloatOrInt64Buffer(FeatureID);
-  if (Spec.isElementType<int32_t>())
-    for (size_t I = 0; I < Spec.getElementCount(); ++I)
-      (reinterpret_cast<int64_t *>(Buff))[I] =
-          static_cast<int64_t>((reinterpret_cast<const int32_t *>(RawData))[I]);
-  else if (Spec.isElementType<int64_t>() || Spec.isElementType<float>())
-    std::memcpy(Buff, RawData,
-                Spec.getElementCount() * Spec.getElementByteSize());
-  else
-    llvm_unreachable("Unsupported tensor type");
-}
-
-char *Logger::addEntryAndGetFloatOrInt64Buffer(size_t FeatureID) {
-  return reinterpret_cast<char *>(LoggerData->addNewTensor(FeatureID));
-}
-
-void Logger::print(raw_ostream &OS) { LoggerData->print(OS); }
-#endif // defined(LLVM_HAVE_TF_API)
diff --git a/gnu/llvm/llvm/lib/Analysis/models/generate_mock_model.py b/gnu/llvm/llvm/lib/Analysis/models/generate_mock_model.py
deleted file mode 100644
index f1170abba38..00000000000
--- a/gnu/llvm/llvm/lib/Analysis/models/generate_mock_model.py
+++ /dev/null
@@ -1,69 +0,0 @@
-"""Generate a mock model for LLVM tests.
-
-The generated model is not a neural net - it is just a tf.function with the
-correct input and output parameters. By construction, the mock model will always
-output 1.
-"""
-
-import os
-import importlib.util
-import sys
-
-import tensorflow as tf
-
-
-def get_output_spec_path(path):
-  return os.path.join(path, 'output_spec.json')
-
-
-def build_mock_model(path, signature):
-  """Build and save the mock model with the given signature"""
-  module = tf.Module()
-
-  # We have to set this useless variable in order for the TF C API to correctly
-  # intake it
-  module.var = tf.Variable(0.)
-
-  def action(*inputs):
-    s = tf.reduce_sum([tf.cast(x, tf.float32) for x in tf.nest.flatten(inputs)])
-    return {signature['output']: float('inf') + s + module.var}
-
-  module.action = tf.function()(action)
-  action = {'action': module.action.get_concrete_function(signature['inputs'])}
-  tf.saved_model.save(module, path, signatures=action)
-
-  output_spec_path = get_output_spec_path(path)
-  with open(output_spec_path, 'w') as f:
-    print(f'Writing output spec to {output_spec_path}.')
-    f.write(signature['output_spec'])
-
-
-def get_external_signature(config_path):
-  """Get the signature for the desired model.
-
-  We manually import the python file at config_path to avoid adding a gin
-  dependency to the LLVM build.
-  """
-  spec = importlib.util.spec_from_file_location('config', config_path)
-  config = importlib.util.module_from_spec(spec)
-  spec.loader.exec_module(config)
-
-  return {
-      'inputs': config.get_input_signature(),
-      'output': config.get_output_signature(),
-      'output_spec': config.get_output_spec()
-  }
-
-
-def main(argv):
-  assert len(argv) == 3
-  config_path = argv[1]
-  model_path = argv[2]
-
-  print(f'Using config file at [{argv[1]}]')
-  signature = get_external_signature(config_path)
-  build_mock_model(model_path, signature)
-
-
-if __name__ == '__main__':
-  main(sys.argv)
diff --git a/gnu/llvm/llvm/lib/Analysis/models/inlining/config.py b/gnu/llvm/llvm/lib/Analysis/models/inlining/config.py
deleted file mode 100644
index 78d3a8259cc..00000000000
--- a/gnu/llvm/llvm/lib/Analysis/models/inlining/config.py
+++ /dev/null
@@ -1,87 +0,0 @@
-"""Inlining Training config."""
-
-import tensorflow as tf
-
-POLICY_DECISION_LABEL = 'inlining_decision'
-POLICY_OUTPUT_SPEC = """
-[
-    {
-        "logging_name": "inlining_decision",
-        "tensor_spec": {
-            "name": "StatefulPartitionedCall",
-            "port": 0,
-            "type": "int64_t",
-            "shape": [
-                1
-            ]
-        }
-    }
-]
-"""
-
-
-# pylint: disable=g-complex-comprehension
-def get_input_signature():
-  """Returns the list of features for LLVM inlining."""
-  # int64 features
-  inputs = [
-      tf.TensorSpec(dtype=tf.int64, shape=(), name=key) for key in [
-          'caller_basic_block_count',
-          'caller_conditionally_executed_blocks',
-          'caller_users',
-          'callee_basic_block_count',
-          'callee_conditionally_executed_blocks',
-          'callee_users',
-          'nr_ctant_params',
-          'node_count',
-          'edge_count',
-          'callsite_height',
-          'cost_estimate',
-          'inlining_default',
-          'sroa_savings',
-          'sroa_losses',
-          'load_elimination',
-          'call_penalty',
-          'call_argument_setup',
-          'load_relative_intrinsic',
-          'lowered_call_arg_setup',
-          'indirect_call_penalty',
-          'jump_table_penalty',
-          'case_cluster_penalty',
-          'switch_penalty',
-          'unsimplified_common_instructions',
-          'num_loops',
-          'dead_blocks',
-          'simplified_instructions',
-          'constant_args',
-          'constant_offset_ptr_args',
-          'callsite_cost',
-          'cold_cc_penalty',
-          'last_call_to_static_bonus',
-          'is_multiple_blocks',
-          'nested_inlines',
-          'nested_inline_cost_estimate',
-          'threshold',
-      ]
-  ]
-
-  # float32 features
-  inputs.extend([
-      tf.TensorSpec(dtype=tf.float32, shape=(), name=key)
-      for key in ['discount', 'reward']
-  ])
-
-  # int32 features
-  inputs.extend([
-      tf.TensorSpec(dtype=tf.int32, shape=(), name=key)
-      for key in ['step_type']
-  ])
-  return inputs
-
-
-def get_output_signature():
-  return POLICY_DECISION_LABEL
-
-
-def get_output_spec():
-  return POLICY_OUTPUT_SPEC
diff --git a/gnu/llvm/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/gnu/llvm/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
index 1b849faf9fc..dcd49f73a8b 100644
--- a/gnu/llvm/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+++ b/gnu/llvm/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
@@ -27,6 +27,7 @@
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/Statistic.h"
 #include "llvm/ADT/StringRef.h"
+#include "llvm/ADT/TinyPtrVector.h"
 #include "llvm/ADT/Triple.h"
 #include "llvm/ADT/Twine.h"
 #include "llvm/Analysis/ConstantFolding.h"
@@ -48,7 +49,6 @@
 #include "llvm/CodeGen/MachineInstrBundle.h"
 #include "llvm/CodeGen/MachineJumpTableInfo.h"
 #include "llvm/CodeGen/MachineLoopInfo.h"
-#include "llvm/CodeGen/MachineMemOperand.h"
 #include "llvm/CodeGen/MachineModuleInfo.h"
 #include "llvm/CodeGen/MachineModuleInfoImpls.h"
 #include "llvm/CodeGen/MachineOperand.h"
@@ -71,7 +71,6 @@
 #include "llvm/IR/GCStrategy.h"
 #include "llvm/IR/GlobalAlias.h"
 #include "llvm/IR/GlobalIFunc.h"
-#include "llvm/IR/GlobalIndirectSymbol.h"
 #include "llvm/IR/GlobalObject.h"
 #include "llvm/IR/GlobalValue.h"
 #include "llvm/IR/GlobalVariable.h"
@@ -83,39 +82,32 @@
 #include "llvm/IR/PseudoProbe.h"
 #include "llvm/IR/Type.h"
 #include "llvm/IR/Value.h"
+#include "llvm/IR/ValueHandle.h"
 #include "llvm/MC/MCAsmInfo.h"
 #include "llvm/MC/MCContext.h"
 #include "llvm/MC/MCDirectives.h"
-#include "llvm/MC/MCDwarf.h"
 #include "llvm/MC/MCExpr.h"
 #include "llvm/MC/MCInst.h"
 #include "llvm/MC/MCSection.h"
 #include "llvm/MC/MCSectionCOFF.h"
 #include "llvm/MC/MCSectionELF.h"
 #include "llvm/MC/MCSectionMachO.h"
-#include "llvm/MC/MCSectionXCOFF.h"
 #include "llvm/MC/MCStreamer.h"
 #include "llvm/MC/MCSubtargetInfo.h"
 #include "llvm/MC/MCSymbol.h"
 #include "llvm/MC/MCSymbolELF.h"
-#include "llvm/MC/MCSymbolXCOFF.h"
 #include "llvm/MC/MCTargetOptions.h"
 #include "llvm/MC/MCValue.h"
 #include "llvm/MC/SectionKind.h"
 #include "llvm/Pass.h"
-#include "llvm/Remarks/Remark.h"
-#include "llvm/Remarks/RemarkFormat.h"
 #include "llvm/Remarks/RemarkStreamer.h"
-#include "llvm/Remarks/RemarkStringTable.h"
 #include "llvm/Support/Casting.h"
-#include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Format.h"
 #include "llvm/Support/MathExtras.h"
 #include "llvm/Support/Path.h"
-#include "llvm/Support/TargetRegistry.h"
 #include "llvm/Support/Timer.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Target/TargetLoweringObjectFile.h"
@@ -126,8 +118,8 @@
 #include <cinttypes>
 #include <cstdint>
 #include <iterator>
-#include <limits>
 #include <memory>
+#include <optional>
 #include <string>
 #include <utility>
 #include <vector>
@@ -136,11 +128,6 @@ using namespace llvm;
 
 #define DEBUG_TYPE "asm-printer"
 
-// FIXME: this option currently only applies to DWARF, and not CodeView, tables
-static cl::opt<bool>
-    DisableDebugInfoPrinting("disable-debug-info-print", cl::Hidden,
-                             cl::desc("Disable debug info printing"));
-
 const char DWARFGroupName[] = "dwarf";
 const char DWARFGroupDescription[] = "DWARF Emission";
 const char DbgTimerName[] = "emit";
@@ -160,12 +147,176 @@ STATISTIC(EmittedInsts, "Number of machine instrs printed");
 
 char AsmPrinter::ID = 0;
 
-using gcp_map_type = DenseMap<GCStrategy *, std::unique_ptr<GCMetadataPrinter>>;
+namespace {
+class AddrLabelMapCallbackPtr final : CallbackVH {
+  AddrLabelMap *Map = nullptr;
+
+public:
+  AddrLabelMapCallbackPtr() = default;
+  AddrLabelMapCallbackPtr(Value *V) : CallbackVH(V) {}
+
+  void setPtr(BasicBlock *BB) {
+    ValueHandleBase::operator=(BB);
+  }
+
+  void setMap(AddrLabelMap *map) { Map = map; }
+
+  void deleted() override;
+  void allUsesReplacedWith(Value *V2) override;
+};
+} // namespace
+
+class llvm::AddrLabelMap {
+  MCContext &Context;
+  struct AddrLabelSymEntry {
+    /// The symbols for the label.
+    TinyPtrVector<MCSymbol *> Symbols;
+
+    Function *Fn;   // The containing function of the BasicBlock.
+    unsigned Index; // The index in BBCallbacks for the BasicBlock.
+  };
+
+  DenseMap<AssertingVH<BasicBlock>, AddrLabelSymEntry> AddrLabelSymbols;
+
+  /// Callbacks for the BasicBlock's that we have entries for.  We use this so
+  /// we get notified if a block is deleted or RAUWd.
+  std::vector<AddrLabelMapCallbackPtr> BBCallbacks;
+
+  /// This is a per-function list of symbols whose corresponding BasicBlock got
+  /// deleted.  These symbols need to be emitted at some point in the file, so
+  /// AsmPrinter emits them after the function body.
+  DenseMap<AssertingVH<Function>, std::vector<MCSymbol *>>
+      DeletedAddrLabelsNeedingEmission;
+
+public:
+  AddrLabelMap(MCContext &context) : Context(context) {}
+
+  ~AddrLabelMap() {
+    assert(DeletedAddrLabelsNeedingEmission.empty() &&
+           "Some labels for deleted blocks never got emitted");
+  }
+
+  ArrayRef<MCSymbol *> getAddrLabelSymbolToEmit(BasicBlock *BB);
+
+  void takeDeletedSymbolsForFunction(Function *F,
+                                     std::vector<MCSymbol *> &Result);
+
+  void UpdateForDeletedBlock(BasicBlock *BB);
+  void UpdateForRAUWBlock(BasicBlock *Old, BasicBlock *New);
+};
+
+ArrayRef<MCSymbol *> AddrLabelMap::getAddrLabelSymbolToEmit(BasicBlock *BB) {
+  assert(BB->hasAddressTaken() &&
+         "Shouldn't get label for block without address taken");
+  AddrLabelSymEntry &Entry = AddrLabelSymbols[BB];
+
+  // If we already had an entry for this block, just return it.
+  if (!Entry.Symbols.empty()) {
+    assert(BB->getParent() == Entry.Fn && "Parent changed");
+    return Entry.Symbols;
+  }
+
+  // Otherwise, this is a new entry, create a new symbol for it and add an
+  // entry to BBCallbacks so we can be notified if the BB is deleted or RAUWd.
+  BBCallbacks.emplace_back(BB);
+  BBCallbacks.back().setMap(this);
+  Entry.Index = BBCallbacks.size() - 1;
+  Entry.Fn = BB->getParent();
+  MCSymbol *Sym = BB->hasAddressTaken() ? Context.createNamedTempSymbol()
+                                        : Context.createTempSymbol();
+  Entry.Symbols.push_back(Sym);
+  return Entry.Symbols;
+}
+
+/// If we have any deleted symbols for F, return them.
+void AddrLabelMap::takeDeletedSymbolsForFunction(
+    Function *F, std::vector<MCSymbol *> &Result) {
+  DenseMap<AssertingVH<Function>, std::vector<MCSymbol *>>::iterator I =
+      DeletedAddrLabelsNeedingEmission.find(F);
+
+  // If there are no entries for the function, just return.
+  if (I == DeletedAddrLabelsNeedingEmission.end())
+    return;
+
+  // Otherwise, take the list.
+  std::swap(Result, I->second);
+  DeletedAddrLabelsNeedingEmission.erase(I);
+}
+
+//===- Address of Block Management ----------------------------------------===//
+
+ArrayRef<MCSymbol *>
+AsmPrinter::getAddrLabelSymbolToEmit(const BasicBlock *BB) {
+  // Lazily create AddrLabelSymbols.
+  if (!AddrLabelSymbols)
+    AddrLabelSymbols = std::make_unique<AddrLabelMap>(OutContext);
+  return AddrLabelSymbols->getAddrLabelSymbolToEmit(
+      const_cast<BasicBlock *>(BB));
+}
+
+void AsmPrinter::takeDeletedSymbolsForFunction(
+    const Function *F, std::vector<MCSymbol *> &Result) {
+  // If no blocks have had their addresses taken, we're done.
+  if (!AddrLabelSymbols)
+    return;
+  return AddrLabelSymbols->takeDeletedSymbolsForFunction(
+      const_cast<Function *>(F), Result);
+}
+
+void AddrLabelMap::UpdateForDeletedBlock(BasicBlock *BB) {
+  // If the block got deleted, there is no need for the symbol.  If the symbol
+  // was already emitted, we can just forget about it, otherwise we need to
+  // queue it up for later emission when the function is output.
+  AddrLabelSymEntry Entry = std::move(AddrLabelSymbols[BB]);
+  AddrLabelSymbols.erase(BB);
+  assert(!Entry.Symbols.empty() && "Didn't have a symbol, why a callback?");
+  BBCallbacks[Entry.Index] = nullptr; // Clear the callback.
+
+#if !LLVM_MEMORY_SANITIZER_BUILD
+  // BasicBlock is destroyed already, so this access is UB detectable by msan.
+  assert((BB->getParent() == nullptr || BB->getParent() == Entry.Fn) &&
+         "Block/parent mismatch");
+#endif
+
+  for (MCSymbol *Sym : Entry.Symbols) {
+    if (Sym->isDefined())
+      return;
+
+    // If the block is not yet defined, we need to emit it at the end of the
+    // function.  Add the symbol to the DeletedAddrLabelsNeedingEmission list
+    // for the containing Function.  Since the block is being deleted, its
+    // parent may already be removed, we have to get the function from 'Entry'.
+    DeletedAddrLabelsNeedingEmission[Entry.Fn].push_back(Sym);
+  }
+}
+
+void AddrLabelMap::UpdateForRAUWBlock(BasicBlock *Old, BasicBlock *New) {
+  // Get the entry for the RAUW'd block and remove it from our map.
+  AddrLabelSymEntry OldEntry = std::move(AddrLabelSymbols[Old]);
+  AddrLabelSymbols.erase(Old);
+  assert(!OldEntry.Symbols.empty() && "Didn't have a symbol, why a callback?");
+
+  AddrLabelSymEntry &NewEntry = AddrLabelSymbols[New];
+
+  // If New is not address taken, just move our symbol over to it.
+  if (NewEntry.Symbols.empty()) {
+    BBCallbacks[OldEntry.Index].setPtr(New); // Update the callback.
+    NewEntry = std::move(OldEntry);          // Set New's entry.
+    return;
+  }
+
+  BBCallbacks[OldEntry.Index] = nullptr; // Update the callback.
 
-static gcp_map_type &getGCMap(void *&P) {
-  if (!P)
-    P = new gcp_map_type();
-  return *(gcp_map_type*)P;
+  // Otherwise, we need to add the old symbols to the new block's set.
+  llvm::append_range(NewEntry.Symbols, OldEntry.Symbols);
+}
+
+void AddrLabelMapCallbackPtr::deleted() {
+  Map->UpdateForDeletedBlock(cast<BasicBlock>(getValPtr()));
+}
+
+void AddrLabelMapCallbackPtr::allUsesReplacedWith(Value *V2) {
+  Map->UpdateForRAUWBlock(cast<BasicBlock>(getValPtr()), cast<BasicBlock>(V2));
 }
 
 /// getGVAlignment - Return the alignment to use for the specified global
@@ -181,7 +332,7 @@ Align AsmPrinter::getGVAlignment(const GlobalObject *GV, const DataLayout &DL,
     Alignment = InAlign;
 
   // If the GV has a specified alignment, take it into account.
-  const MaybeAlign GVAlign(GV->getAlignment());
+  const MaybeAlign GVAlign(GV->getAlign());
   if (!GVAlign)
     return Alignment;
 
@@ -196,20 +347,16 @@ Align AsmPrinter::getGVAlignment(const GlobalObject *GV, const DataLayout &DL,
 
 AsmPrinter::AsmPrinter(TargetMachine &tm, std::unique_ptr<MCStreamer> Streamer)
     : MachineFunctionPass(ID), TM(tm), MAI(tm.getMCAsmInfo()),
-      OutContext(Streamer->getContext()), OutStreamer(std::move(Streamer)) {
+      OutContext(Streamer->getContext()), OutStreamer(std::move(Streamer)),
+      SM(*this) {
   VerboseAsm = OutStreamer->isVerboseAsm();
+  DwarfUsesRelocationsAcrossSections =
+      MAI->doesDwarfUseRelocationsAcrossSections();
 }
 
 AsmPrinter::~AsmPrinter() {
   assert(!DD && Handlers.size() == NumUserHandlers &&
          "Debug/EH info didn't get finalized");
-
-  if (GCMetadataPrinters) {
-    gcp_map_type &GCMap = getGCMap(GCMetadataPrinters);
-
-    delete &GCMap;
-    GCMetadataPrinters = nullptr;
-  }
 }
 
 bool AsmPrinter::isPositionIndependent() const {
@@ -248,6 +395,11 @@ void AsmPrinter::emitInitialRawDwarfLocDirective(const MachineFunction &MF) {
   if (DD) {
     assert(OutStreamer->hasRawTextSupport() &&
            "Expected assembly output mode.");
+    // This is NVPTX specific and it's unclear why.
+    // PR51079: If we have code without debug information we need to give up.
+    DISubprogram *MFSP = MF.getFunction().getSubprogram();
+    if (!MFSP)
+      return;
     (void)DD->emitInitialLocDirective(MF, /*CUID=*/0);
   }
 }
@@ -267,6 +419,10 @@ void AsmPrinter::getAnalysisUsage(AnalysisUsage &AU) const {
 bool AsmPrinter::doInitialization(Module &M) {
   auto *MMIWP = getAnalysisIfAvailable<MachineModuleInfoWrapperPass>();
   MMI = MMIWP ? &MMIWP->getMMI() : nullptr;
+  HasSplitStack = false;
+  HasNoSplitStack = false;
+
+  AddrLabelSymbols = nullptr;
 
   // Initialize TargetLoweringObjectFile.
   const_cast<TargetLoweringObjectFile&>(getObjFileLowering())
@@ -275,10 +431,7 @@ bool AsmPrinter::doInitialization(Module &M) {
   const_cast<TargetLoweringObjectFile &>(getObjFileLowering())
       .getModuleMetadata(M);
 
-  OutStreamer->InitSections(false);
-
-  if (DisableDebugInfoPrinting)
-    MMI->setDebugInfoAvailability(false);
+  OutStreamer->initSections(false, *TM.getMCSubtargetInfo());
 
   // Emit the version-min deployment target directive if needed.
   //
@@ -289,7 +442,11 @@ bool AsmPrinter::doInitialization(Module &M) {
   // use the directive, where it would need the same conditionalization
   // anyway.
   const Triple &Target = TM.getTargetTriple();
-  OutStreamer->emitVersionForTarget(Target, M.getSDKVersion());
+  Triple TVT(M.getDarwinTargetVariantTriple());
+  OutStreamer->emitVersionForTarget(
+      Target, M.getSDKVersion(),
+      M.getDarwinTargetVariantTriple().empty() ? nullptr : &TVT,
+      M.getDarwinTargetVariantSDKVersion());
 
   // Allow the target to emit any magic that it wants at the start of the file.
   emitStartOfAsmFile(M);
@@ -320,24 +477,18 @@ bool AsmPrinter::doInitialization(Module &M) {
 
   GCModuleInfo *MI = getAnalysisIfAvailable<GCModuleInfo>();
   assert(MI && "AsmPrinter didn't require GCModuleInfo?");
-  for (auto &I : *MI)
-    if (GCMetadataPrinter *MP = GetOrCreateGCPrinter(*I))
+  for (const auto &I : *MI)
+    if (GCMetadataPrinter *MP = getOrCreateGCPrinter(*I))
       MP->beginAssembly(M, *MI, *this);
 
   // Emit module-level inline asm if it exists.
   if (!M.getModuleInlineAsm().empty()) {
-    // We're at the module level. Construct MCSubtarget from the default CPU
-    // and target triple.
-    std::unique_ptr<MCSubtargetInfo> STI(TM.getTarget().createMCSubtargetInfo(
-        TM.getTargetTriple().str(), TM.getTargetCPU(),
-        TM.getTargetFeatureString()));
-    assert(STI && "Unable to create subtarget info");
     OutStreamer->AddComment("Start of file scope inline assembly");
-    OutStreamer->AddBlankLine();
-    emitInlineAsm(M.getModuleInlineAsm() + "\n",
-                  OutContext.getSubtargetCopy(*STI), TM.Options.MCOptions);
+    OutStreamer->addBlankLine();
+    emitInlineAsm(M.getModuleInlineAsm() + "\n", *TM.getMCSubtargetInfo(),
+                  TM.Options.MCOptions);
     OutStreamer->AddComment("End of file scope inline assembly");
-    OutStreamer->AddBlankLine();
+    OutStreamer->addBlankLine();
   }
 
   if (MAI->doesSupportDebugInformation()) {
@@ -349,7 +500,7 @@ bool AsmPrinter::doInitialization(Module &M) {
                             CodeViewLineTablesGroupDescription);
     }
     if (!EmitCodeView || M.getDwarfVersion()) {
-      if (!DisableDebugInfoPrinting) {
+      if (MMI->hasDebugInfo()) {
         DD = new DwarfDebug(this);
         Handlers.emplace_back(std::unique_ptr<DwarfDebug>(DD), DbgTimerName,
                               DbgTimerDescription, DWARFGroupName,
@@ -367,7 +518,7 @@ bool AsmPrinter::doInitialization(Module &M) {
   switch (MAI->getExceptionHandlingType()) {
   case ExceptionHandling::None:
     // We may want to emit CFI for debug.
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case ExceptionHandling::SjLj:
   case ExceptionHandling::DwarfCFI:
   case ExceptionHandling::ARM:
@@ -391,7 +542,7 @@ bool AsmPrinter::doInitialization(Module &M) {
   case ExceptionHandling::None:
     if (!needsCFIForDebug())
       break;
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case ExceptionHandling::SjLj:
   case ExceptionHandling::DwarfCFI:
     ES = new DwarfCFIException(this);
@@ -534,9 +685,9 @@ void AsmPrinter::emitGlobalVariable(const GlobalVariable *GV) {
     if (isVerbose()) {
       // When printing the control variable __emutls_v.*,
       // we don't need to print the original TLS variable name.
-      GV->printAsOperand(OutStreamer->GetCommentOS(),
-                     /*PrintType=*/false, GV->getParent());
-      OutStreamer->GetCommentOS() << '\n';
+      GV->printAsOperand(OutStreamer->getCommentOS(),
+                         /*PrintType=*/false, GV->getParent());
+      OutStreamer->getCommentOS() << '\n';
     }
   }
 
@@ -548,6 +699,16 @@ void AsmPrinter::emitGlobalVariable(const GlobalVariable *GV) {
   // GV's or GVSym's attributes will be used for the EmittedSym.
   emitVisibility(EmittedSym, GV->getVisibility(), !GV->isDeclaration());
 
+  if (GV->isTagged()) {
+    Triple T = TM.getTargetTriple();
+
+    if (T.getArch() != Triple::aarch64 || !T.isAndroid())
+      OutContext.reportError(SMLoc(),
+                             "Tagged symbols (-fsanitize=memtag-globals) are "
+                             "only supported on aarch64 + Android.");
+    OutStreamer->emitSymbolAttribute(EmittedSym, MAI->getMemtagAttr());
+  }
+
   if (!GV->hasInitializer())   // External globals require no extra code.
     return;
 
@@ -580,10 +741,7 @@ void AsmPrinter::emitGlobalVariable(const GlobalVariable *GV) {
   if (GVKind.isCommon()) {
     if (Size == 0) Size = 1;   // .comm Foo, 0 is undefined, avoid it.
     // .comm _foo, 42, 4
-    const bool SupportsAlignment =
-        getObjFileLowering().getCommDirectiveSupportsAlignment();
-    OutStreamer->emitCommonSymbol(GVSym, Size,
-                                  SupportsAlignment ? Alignment.value() : 0);
+    OutStreamer->emitCommonSymbol(GVSym, Size, Alignment);
     return;
   }
 
@@ -598,7 +756,7 @@ void AsmPrinter::emitGlobalVariable(const GlobalVariable *GV) {
       Size = 1; // zerofill of 0 bytes is undefined.
     emitLinkage(GV, GVSym);
     // .zerofill __DATA, __bss, _foo, 400, 5
-    OutStreamer->emitZerofill(TheSection, GVSym, Size, Alignment.value());
+    OutStreamer->emitZerofill(TheSection, GVSym, Size, Alignment);
     return;
   }
 
@@ -617,17 +775,14 @@ void AsmPrinter::emitGlobalVariable(const GlobalVariable *GV) {
     // Prefer to simply fall back to .local / .comm in this case.
     if (MAI->getLCOMMDirectiveAlignmentType() != LCOMM::NoAlignment) {
       // .lcomm _foo, 42
-      OutStreamer->emitLocalCommonSymbol(GVSym, Size, Alignment.value());
+      OutStreamer->emitLocalCommonSymbol(GVSym, Size, Alignment);
       return;
     }
 
     // .local _foo
     OutStreamer->emitSymbolAttribute(GVSym, MCSA_Local);
     // .comm _foo, 42, 4
-    const bool SupportsAlignment =
-        getObjFileLowering().getCommDirectiveSupportsAlignment();
-    OutStreamer->emitCommonSymbol(GVSym, Size,
-                                  SupportsAlignment ? Alignment.value() : 0);
+    OutStreamer->emitCommonSymbol(GVSym, Size, Alignment);
     return;
   }
 
@@ -648,9 +803,9 @@ void AsmPrinter::emitGlobalVariable(const GlobalVariable *GV) {
 
     if (GVKind.isThreadBSS()) {
       TheSection = getObjFileLowering().getTLSBSSSection();
-      OutStreamer->emitTBSSSymbol(TheSection, MangSym, Size, Alignment.value());
+      OutStreamer->emitTBSSSymbol(TheSection, MangSym, Size, Alignment);
     } else if (GVKind.isThreadData()) {
-      OutStreamer->SwitchSection(TheSection);
+      OutStreamer->switchSection(TheSection);
 
       emitAlignment(Alignment, GV);
       OutStreamer->emitLabel(MangSym);
@@ -659,12 +814,12 @@ void AsmPrinter::emitGlobalVariable(const GlobalVariable *GV) {
                          GV->getInitializer());
     }
 
-    OutStreamer->AddBlankLine();
+    OutStreamer->addBlankLine();
 
     // Emit the variable struct for the runtime.
     MCSection *TLVSect = getObjFileLowering().getTLSExtraDataSection();
 
-    OutStreamer->SwitchSection(TLVSect);
+    OutStreamer->switchSection(TLVSect);
     // Emit the linkage here.
     emitLinkage(GV, GVSym);
     OutStreamer->emitLabel(GVSym);
@@ -679,13 +834,13 @@ void AsmPrinter::emitGlobalVariable(const GlobalVariable *GV) {
     OutStreamer->emitIntValue(0, PtrSize);
     OutStreamer->emitSymbolValue(MangSym, PtrSize);
 
-    OutStreamer->AddBlankLine();
+    OutStreamer->addBlankLine();
     return;
   }
 
   MCSymbol *EmittedInitSym = GVSym;
 
-  OutStreamer->SwitchSection(TheSection);
+  OutStreamer->switchSection(TheSection);
 
   emitLinkage(GV, EmittedInitSym);
   emitAlignment(Alignment, GV);
@@ -702,7 +857,7 @@ void AsmPrinter::emitGlobalVariable(const GlobalVariable *GV) {
     OutStreamer->emitELFSize(EmittedInitSym,
                              MCConstantExpr::create(Size, OutContext));
 
-  OutStreamer->AddBlankLine();
+  OutStreamer->addBlankLine();
 }
 
 /// Emit the directive and value for debug thread local expression
@@ -721,7 +876,7 @@ void AsmPrinter::emitFunctionHeader() {
   const Function &F = MF->getFunction();
 
   if (isVerbose())
-    OutStreamer->GetCommentOS()
+    OutStreamer->getCommentOS()
         << "-- Begin function "
         << GlobalValue::dropLLVMManglingEscape(F.getName()) << '\n';
 
@@ -735,7 +890,7 @@ void AsmPrinter::emitFunctionHeader() {
     MF->setSection(getObjFileLowering().getUniqueSectionForFunction(F, TM));
   else
     MF->setSection(getObjFileLowering().SectionForGlobal(&F, TM));
-  OutStreamer->SwitchSection(MF->getSection());
+  OutStreamer->switchSection(MF->getSection());
 
   if (!MAI->hasVisibilityOnlyWithLinkage())
     emitVisibility(CurrentFnSym, F.getVisibility());
@@ -754,10 +909,10 @@ void AsmPrinter::emitFunctionHeader() {
     OutStreamer->emitSymbolAttribute(CurrentFnSym, MCSA_Cold);
 
   if (isVerbose()) {
-    F.printAsOperand(OutStreamer->GetCommentOS(),
-                   /*PrintType=*/false, F.getParent());
+    F.printAsOperand(OutStreamer->getCommentOS(),
+                     /*PrintType=*/false, F.getParent());
     emitFunctionHeaderComment();
-    OutStreamer->GetCommentOS() << '\n';
+    OutStreamer->getCommentOS() << '\n';
   }
 
   // Emit the prefix data.
@@ -779,6 +934,9 @@ void AsmPrinter::emitFunctionHeader() {
     }
   }
 
+  // Emit KCFI type information before patchable-function-prefix nops.
+  emitKCFITypeId(*MF);
+
   // Emit M NOPs for -fpatchable-function-entry=N,M where M>0. We arbitrarily
   // place prefix data before NOPs.
   unsigned PatchableFunctionPrefix = 0;
@@ -815,10 +973,10 @@ void AsmPrinter::emitFunctionHeader() {
   // references to the dangling symbols.  Emit them at the start of the function
   // so that we don't get references to undefined symbols.
   std::vector<MCSymbol*> DeadBlockSyms;
-  MMI->takeDeletedSymbolsForFunction(&F, DeadBlockSyms);
-  for (unsigned i = 0, e = DeadBlockSyms.size(); i != e; ++i) {
+  takeDeletedSymbolsForFunction(&F, DeadBlockSyms);
+  for (MCSymbol *DeadBlockSym : DeadBlockSyms) {
     OutStreamer->AddComment("Address taken block that was later removed");
-    OutStreamer->emitLabel(DeadBlockSyms[i]);
+    OutStreamer->emitLabel(DeadBlockSym);
   }
 
   if (CurrentFnBegin) {
@@ -838,10 +996,33 @@ void AsmPrinter::emitFunctionHeader() {
                        HI.TimerGroupDescription, TimePassesIsEnabled);
     HI.Handler->beginFunction(MF);
   }
+  for (const HandlerInfo &HI : Handlers) {
+    NamedRegionTimer T(HI.TimerName, HI.TimerDescription, HI.TimerGroupName,
+                       HI.TimerGroupDescription, TimePassesIsEnabled);
+    HI.Handler->beginBasicBlockSection(MF->front());
+  }
 
   // Emit the prologue data.
   if (F.hasPrologueData())
     emitGlobalConstant(F.getParent()->getDataLayout(), F.getPrologueData());
+
+  // Emit the function prologue data for the indirect call sanitizer.
+  if (const MDNode *MD = F.getMetadata(LLVMContext::MD_func_sanitize)) {
+    assert(TM.getTargetTriple().getArch() == Triple::x86 ||
+           TM.getTargetTriple().getArch() == Triple::x86_64);
+    assert(MD->getNumOperands() == 2);
+
+    auto *PrologueSig = mdconst::extract<Constant>(MD->getOperand(0));
+    auto *FTRTTIProxy = mdconst::extract<Constant>(MD->getOperand(1));
+    assert(PrologueSig && FTRTTIProxy);
+    emitGlobalConstant(F.getParent()->getDataLayout(), PrologueSig);
+
+    const MCExpr *Proxy = lowerConstant(FTRTTIProxy);
+    const MCExpr *FnExp = MCSymbolRefExpr::create(CurrentFnSym, OutContext);
+    const MCExpr *PCRel = MCBinaryExpr::createSub(Proxy, FnExp, OutContext);
+    // Use 32 bit since only small code model is supported.
+    OutStreamer->emitValue(PCRel, 4u);
+  }
 }
 
 /// EmitFunctionEntryLabel - Emit the label that is the entrypoint for the
@@ -859,8 +1040,13 @@ void AsmPrinter::emitFunctionEntryLabel() {
 
   if (TM.getTargetTriple().isOSBinFormatELF()) {
     MCSymbol *Sym = getSymbolPreferLocal(MF->getFunction());
-    if (Sym != CurrentFnSym)
+    if (Sym != CurrentFnSym) {
+      cast<MCSymbolELF>(Sym)->setType(ELF::STT_FUNC);
+      CurrentFnBeginLocal = Sym;
       OutStreamer->emitLabel(Sym);
+      if (MAI->hasDotTypeDotSizeDirective())
+        OutStreamer->emitSymbolAttribute(Sym, MCSA_ELF_TypeFunction);
+    }
   }
 }
 
@@ -873,7 +1059,7 @@ static void emitComments(const MachineInstr &MI, raw_ostream &CommentOS) {
 
   // We assume a single instruction only has a spill or reload, not
   // both.
-  Optional<unsigned> Size;
+  std::optional<unsigned> Size;
   if ((Size = MI.getRestoreSize(TII))) {
     CommentOS << *Size << "-byte Reload\n";
   } else if ((Size = MI.getFoldedRestoreSize(TII))) {
@@ -910,21 +1096,20 @@ void AsmPrinter::emitImplicitDef(const MachineInstr *MI) const {
      << printReg(RegNo, MF->getSubtarget().getRegisterInfo());
 
   OutStreamer->AddComment(OS.str());
-  OutStreamer->AddBlankLine();
+  OutStreamer->addBlankLine();
 }
 
 static void emitKill(const MachineInstr *MI, AsmPrinter &AP) {
   std::string Str;
   raw_string_ostream OS(Str);
   OS << "kill:";
-  for (unsigned i = 0, e = MI->getNumOperands(); i != e; ++i) {
-    const MachineOperand &Op = MI->getOperand(i);
+  for (const MachineOperand &Op : MI->operands()) {
     assert(Op.isReg() && "KILL instruction must have only register operands");
     OS << ' ' << (Op.isDef() ? "def " : "killed ")
        << printReg(Op.getReg(), AP.MF->getSubtarget().getRegisterInfo());
   }
   AP.OutStreamer->AddComment(OS.str());
-  AP.OutStreamer->AddBlankLine();
+  AP.OutStreamer->addBlankLine();
 }
 
 /// emitDebugValueComment - This method handles the target-independent form
@@ -949,10 +1134,15 @@ static bool emitDebugValueComment(const MachineInstr *MI, AsmPrinter &AP) {
   OS << " <- ";
 
   const DIExpression *Expr = MI->getDebugExpression();
+  // First convert this to a non-variadic expression if possible, to simplify
+  // the output.
+  if (auto NonVariadicExpr = DIExpression::convertToNonVariadicExpression(Expr))
+    Expr = *NonVariadicExpr;
+  // Then, output the possibly-simplified expression.
   if (Expr->getNumElements()) {
     OS << '[';
     ListSeparator LS;
-    for (auto Op : Expr->expr_ops()) {
+    for (auto &Op : Expr->expr_ops()) {
       OS << LS << dwarf::OperationEncodingString(Op.getOp());
       for (unsigned I = 0; I < Op.getNumArgs(); ++I)
         OS << ' ' << Op.getArg(I);
@@ -991,14 +1181,12 @@ static bool emitDebugValueComment(const MachineInstr *MI, AsmPrinter &AP) {
     }
     case MachineOperand::MO_TargetIndex: {
       OS << "!target-index(" << Op.getIndex() << "," << Op.getOffset() << ")";
-      // NOTE: Want this comment at start of line, don't emit with AddComment.
-      AP.OutStreamer->emitRawComment(OS.str());
       break;
     }
     case MachineOperand::MO_Register:
     case MachineOperand::MO_FrameIndex: {
       Register Reg;
-      Optional<StackOffset> Offset;
+      std::optional<StackOffset> Offset;
       if (Op.isReg()) {
         Reg = Op.getReg();
       } else {
@@ -1146,32 +1334,74 @@ void AsmPrinter::emitBBAddrMapSection(const MachineFunction &MF) {
 
   const MCSymbol *FunctionSymbol = getFunctionBegin();
 
-  OutStreamer->PushSection();
-  OutStreamer->SwitchSection(BBAddrMapSection);
+  OutStreamer->pushSection();
+  OutStreamer->switchSection(BBAddrMapSection);
+  OutStreamer->AddComment("version");
+  uint8_t BBAddrMapVersion = OutStreamer->getContext().getBBAddrMapVersion();
+  OutStreamer->emitInt8(BBAddrMapVersion);
+  OutStreamer->AddComment("feature");
+  OutStreamer->emitInt8(0);
+  OutStreamer->AddComment("function address");
   OutStreamer->emitSymbolValue(FunctionSymbol, getPointerSize());
-  // Emit the total number of basic blocks in this function.
+  OutStreamer->AddComment("number of basic blocks");
   OutStreamer->emitULEB128IntValue(MF.size());
+  const MCSymbol *PrevMBBEndSymbol = FunctionSymbol;
   // Emit BB Information for each basic block in the funciton.
   for (const MachineBasicBlock &MBB : MF) {
     const MCSymbol *MBBSymbol =
         MBB.isEntryBlock() ? FunctionSymbol : MBB.getSymbol();
-    // Emit the basic block offset.
-    emitLabelDifferenceAsULEB128(MBBSymbol, FunctionSymbol);
+    // TODO: Remove this check when version 1 is deprecated.
+    if (BBAddrMapVersion > 1) {
+      OutStreamer->AddComment("BB id");
+      // Emit the BB ID for this basic block.
+      OutStreamer->emitULEB128IntValue(*MBB.getBBID());
+    }
+    // Emit the basic block offset relative to the end of the previous block.
+    // This is zero unless the block is padded due to alignment.
+    emitLabelDifferenceAsULEB128(MBBSymbol, PrevMBBEndSymbol);
     // Emit the basic block size. When BBs have alignments, their size cannot
     // always be computed from their offsets.
     emitLabelDifferenceAsULEB128(MBB.getEndSymbol(), MBBSymbol);
+    // Emit the Metadata.
     OutStreamer->emitULEB128IntValue(getBBAddrMapMetadata(MBB));
+    PrevMBBEndSymbol = MBB.getEndSymbol();
   }
-  OutStreamer->PopSection();
+  OutStreamer->popSection();
+}
+
+void AsmPrinter::emitKCFITrapEntry(const MachineFunction &MF,
+                                   const MCSymbol *Symbol) {
+  MCSection *Section =
+      getObjFileLowering().getKCFITrapSection(*MF.getSection());
+  if (!Section)
+    return;
+
+  OutStreamer->pushSection();
+  OutStreamer->switchSection(Section);
+
+  MCSymbol *Loc = OutContext.createLinkerPrivateTempSymbol();
+  OutStreamer->emitLabel(Loc);
+  OutStreamer->emitAbsoluteSymbolDiff(Symbol, Loc, 4);
+
+  OutStreamer->popSection();
+}
+
+void AsmPrinter::emitKCFITypeId(const MachineFunction &MF) {
+  const Function &F = MF.getFunction();
+  if (const MDNode *MD = F.getMetadata(LLVMContext::MD_kcfi_type))
+    emitGlobalConstant(F.getParent()->getDataLayout(),
+                       mdconst::extract<ConstantInt>(MD->getOperand(0)));
 }
 
 void AsmPrinter::emitPseudoProbe(const MachineInstr &MI) {
-  auto GUID = MI.getOperand(0).getImm();
-  auto Index = MI.getOperand(1).getImm();
-  auto Type = MI.getOperand(2).getImm();
-  auto Attr = MI.getOperand(3).getImm();
-  DILocation *DebugLoc = MI.getDebugLoc();
-  PP->emitPseudoProbe(GUID, Index, Type, Attr, DebugLoc);
+  if (PP) {
+    auto GUID = MI.getOperand(0).getImm();
+    auto Index = MI.getOperand(1).getImm();
+    auto Type = MI.getOperand(2).getImm();
+    auto Attr = MI.getOperand(3).getImm();
+    DILocation *DebugLoc = MI.getDebugLoc();
+    PP->emitPseudoProbe(GUID, Index, Type, Attr, DebugLoc);
+  }
 }
 
 void AsmPrinter::emitStackSizeSection(const MachineFunction &MF) {
@@ -1188,15 +1418,16 @@ void AsmPrinter::emitStackSizeSection(const MachineFunction &MF) {
   if (FrameInfo.hasVarSizedObjects())
     return;
 
-  OutStreamer->PushSection();
-  OutStreamer->SwitchSection(StackSizeSection);
+  OutStreamer->pushSection();
+  OutStreamer->switchSection(StackSizeSection);
 
   const MCSymbol *FunctionSymbol = getFunctionBegin();
-  uint64_t StackSize = FrameInfo.getStackSize();
+  uint64_t StackSize =
+      FrameInfo.getStackSize() + FrameInfo.getUnsafeStackSize();
   OutStreamer->emitSymbolValue(FunctionSymbol, TM.getProgramPointerSize());
   OutStreamer->emitULEB128IntValue(StackSize);
 
-  OutStreamer->PopSection();
+  OutStreamer->popSection();
 }
 
 void AsmPrinter::emitStackUsage(const MachineFunction &MF) {
@@ -1207,7 +1438,8 @@ void AsmPrinter::emitStackUsage(const MachineFunction &MF) {
     return;
 
   const MachineFrameInfo &FrameInfo = MF.getFrameInfo();
-  uint64_t StackSize = FrameInfo.getStackSize();
+  uint64_t StackSize =
+      FrameInfo.getStackSize() + FrameInfo.getUnsafeStackSize();
 
   if (StackUsageStream == nullptr) {
     std::error_code EC;
@@ -1230,9 +1462,87 @@ void AsmPrinter::emitStackUsage(const MachineFunction &MF) {
     *StackUsageStream << "static\n";
 }
 
-static bool needFuncLabelsForEHOrDebugInfo(const MachineFunction &MF) {
+void AsmPrinter::emitPCSectionsLabel(const MachineFunction &MF,
+                                     const MDNode &MD) {
+  MCSymbol *S = MF.getContext().createTempSymbol("pcsection");
+  OutStreamer->emitLabel(S);
+  PCSectionsSymbols[&MD].emplace_back(S);
+}
+
+void AsmPrinter::emitPCSections(const MachineFunction &MF) {
+  const Function &F = MF.getFunction();
+  if (PCSectionsSymbols.empty() && !F.hasMetadata(LLVMContext::MD_pcsections))
+    return;
+
+  const CodeModel::Model CM = MF.getTarget().getCodeModel();
+  const unsigned RelativeRelocSize =
+      (CM == CodeModel::Medium || CM == CodeModel::Large) ? getPointerSize()
+                                                          : 4;
+
+  // Switch to PCSection, short-circuiting the common case where the current
+  // section is still valid (assume most MD_pcsections contain just 1 section).
+  auto SwitchSection = [&, Prev = StringRef()](const StringRef &Sec) mutable {
+    if (Sec == Prev)
+      return;
+    MCSection *S = getObjFileLowering().getPCSection(Sec, MF.getSection());
+    assert(S && "PC section is not initialized");
+    OutStreamer->switchSection(S);
+    Prev = Sec;
+  };
+  // Emit symbols into sections and data as specified in the pcsections MDNode.
+  auto EmitForMD = [&](const MDNode &MD, ArrayRef<const MCSymbol *> Syms,
+                       bool Deltas) {
+    // Expect the first operand to be a section name. After that, a tuple of
+    // constants may appear, which will simply be emitted into the current
+    // section (the user of MD_pcsections decides the format of encoded data).
+    assert(isa<MDString>(MD.getOperand(0)) && "first operand not a string");
+    for (const MDOperand &MDO : MD.operands()) {
+      if (auto *S = dyn_cast<MDString>(MDO)) {
+        SwitchSection(S->getString());
+        const MCSymbol *Prev = Syms.front();
+        for (const MCSymbol *Sym : Syms) {
+          if (Sym == Prev || !Deltas) {
+            // Use the entry itself as the base of the relative offset.
+            MCSymbol *Base = MF.getContext().createTempSymbol("pcsection_base");
+            OutStreamer->emitLabel(Base);
+            // Emit relative relocation `addr - base`, which avoids a dynamic
+            // relocation in the final binary. User will get the address with
+            // `base + addr`.
+            emitLabelDifference(Sym, Base, RelativeRelocSize);
+          } else {
+            emitLabelDifference(Sym, Prev, 4);
+          }
+          Prev = Sym;
+        }
+      } else {
+        assert(isa<MDNode>(MDO) && "expecting either string or tuple");
+        const auto *AuxMDs = cast<MDNode>(MDO);
+        for (const MDOperand &AuxMDO : AuxMDs->operands()) {
+          assert(isa<ConstantAsMetadata>(AuxMDO) && "expecting a constant");
+          const auto *C = cast<ConstantAsMetadata>(AuxMDO);
+          emitGlobalConstant(F.getParent()->getDataLayout(), C->getValue());
+        }
+      }
+    }
+  };
+
+  OutStreamer->pushSection();
+  // Emit PCs for function start and function size.
+  if (const MDNode *MD = F.getMetadata(LLVMContext::MD_pcsections))
+    EmitForMD(*MD, {getFunctionBegin(), getFunctionEnd()}, true);
+  // Emit PCs for instructions collected.
+  for (const auto &MS : PCSectionsSymbols)
+    EmitForMD(*MS.first, MS.second, false);
+  OutStreamer->popSection();
+  PCSectionsSymbols.clear();
+}
+
+/// Returns true if function begin and end labels should be emitted.
+static bool needFuncLabels(const MachineFunction &MF) {
   MachineModuleInfo &MMI = MF.getMMI();
-  if (!MF.getLandingPads().empty() || MF.hasEHFunclets() || MMI.hasDebugInfo())
+  if (!MF.getLandingPads().empty() || MF.hasEHFunclets() ||
+      MMI.hasDebugInfo() ||
+      MF.getFunction().hasMetadata(LLVMContext::MD_pcsections))
     return true;
 
   // We might emit an EH table that uses function begin and end labels even if
@@ -1290,6 +1600,9 @@ void AsmPrinter::emitFunctionBody() {
       if (MCSymbol *S = MI.getPreInstrSymbol())
         OutStreamer->emitLabel(S);
 
+      if (MDNode *MD = MI.getPCSections())
+        emitPCSectionsLabel(*MF, *MD);
+
       for (const HandlerInfo &HI : Handlers) {
         NamedRegionTimer T(HI.TimerName, HI.TimerDescription, HI.TimerGroupName,
                            HI.TimerGroupDescription, TimePassesIsEnabled);
@@ -1297,7 +1610,7 @@ void AsmPrinter::emitFunctionBody() {
       }
 
       if (isVerbose())
-        emitComments(MI, OutStreamer->GetCommentOS());
+        emitComments(MI, OutStreamer->getCommentOS());
 
       switch (MI.getOpcode()) {
       case TargetOpcode::CFI_INSTRUCTION:
@@ -1350,6 +1663,9 @@ void AsmPrinter::emitFunctionBody() {
         if (isVerbose())
           OutStreamer->emitRawComment("ARITH_FENCE");
         break;
+      case TargetOpcode::MEMBARRIER:
+        OutStreamer->emitRawComment("MEMBARRIER");
+        break;
       default:
         emitInstruction(&MI);
         if (CanDoExtraAnalysis) {
@@ -1422,7 +1738,7 @@ void AsmPrinter::emitFunctionBody() {
       });
       R << "BasicBlock: " << ore::NV("BasicBlock", MBB.getName()) << "\n";
       for (auto &KV : MnemonicVec) {
-        auto Name = (Twine("INST_") + KV.first.trim()).str();
+        auto Name = (Twine("INST_") + getToken(KV.first.trim()).first).str();
         R << KV.first << ": " << ore::NV(Name, KV.second) << "\n";
       }
       ORE->emit(R);
@@ -1459,7 +1775,7 @@ void AsmPrinter::emitFunctionBody() {
   }
 
   // Switch to the original section in case basic block sections was used.
-  OutStreamer->SwitchSection(MF->getSection());
+  OutStreamer->switchSection(MF->getSection());
 
   const Function &F = MF->getFunction();
   for (const auto &BB : F) {
@@ -1475,8 +1791,11 @@ void AsmPrinter::emitFunctionBody() {
   // Emit target-specific gunk after the function body.
   emitFunctionBodyEnd();
 
-  if (needFuncLabelsForEHOrDebugInfo(*MF) ||
-      MAI->hasDotTypeDotSizeDirective()) {
+  // Even though wasm supports .type and .size in general, function symbols
+  // are automatically sized.
+  bool EmitFunctionSize = MAI->hasDotTypeDotSizeDirective() && !TT.isWasm();
+
+  if (needFuncLabels(*MF) || EmitFunctionSize) {
     // Create a symbol for the end of function.
     CurrentFnEnd = createTempSymbol("func_end");
     OutStreamer->emitLabel(CurrentFnEnd);
@@ -1484,15 +1803,26 @@ void AsmPrinter::emitFunctionBody() {
 
   // If the target wants a .size directive for the size of the function, emit
   // it.
-  if (MAI->hasDotTypeDotSizeDirective()) {
+  if (EmitFunctionSize) {
     // We can get the size as difference between the function label and the
     // temp label.
     const MCExpr *SizeExp = MCBinaryExpr::createSub(
         MCSymbolRefExpr::create(CurrentFnEnd, OutContext),
         MCSymbolRefExpr::create(CurrentFnSymForSize, OutContext), OutContext);
     OutStreamer->emitELFSize(CurrentFnSym, SizeExp);
+    if (CurrentFnBeginLocal)
+      OutStreamer->emitELFSize(CurrentFnBeginLocal, SizeExp);
   }
 
+  // Call endBasicBlockSection on the last block now, if it wasn't already
+  // called.
+  if (!MF->back().isEndSection()) {
+    for (const HandlerInfo &HI : Handlers) {
+      NamedRegionTimer T(HI.TimerName, HI.TimerDescription, HI.TimerGroupName,
+                         HI.TimerGroupDescription, TimePassesIsEnabled);
+      HI.Handler->endBasicBlockSection(MF->back());
+    }
+  }
   for (const HandlerInfo &HI : Handlers) {
     NamedRegionTimer T(HI.TimerName, HI.TimerDescription, HI.TimerGroupName,
                        HI.TimerGroupDescription, TimePassesIsEnabled);
@@ -1517,6 +1847,9 @@ void AsmPrinter::emitFunctionBody() {
   if (MF->hasBBLabels() && HasAnyRealCode)
     emitBBAddrMapSection(*MF);
 
+  // Emit sections containing instruction and function PCs.
+  emitPCSections(*MF);
+
   // Emit section containing stack size metadata.
   emitStackSizeSection(*MF);
 
@@ -1526,9 +1859,9 @@ void AsmPrinter::emitFunctionBody() {
   emitPatchableFunctionEntries();
 
   if (isVerbose())
-    OutStreamer->GetCommentOS() << "-- End function\n";
+    OutStreamer->getCommentOS() << "-- End function\n";
 
-  OutStreamer->AddBlankLine();
+  OutStreamer->addBlankLine();
 }
 
 /// Compute the number of Global Variables that uses a Constant.
@@ -1540,7 +1873,7 @@ static unsigned getNumGlobalVariableUses(const Constant *C) {
     return 1;
 
   unsigned NumUses = 0;
-  for (auto *CU : C->users())
+  for (const auto *CU : C->users())
     NumUses += getNumGlobalVariableUses(dyn_cast<Constant>(CU));
 
   return NumUses;
@@ -1563,7 +1896,7 @@ static bool isGOTEquivalentCandidate(const GlobalVariable *GV,
 
   // To be a got equivalent, at least one of its users need to be a constant
   // expression used by another global variable.
-  for (auto *U : GV->users())
+  for (const auto *U : GV->users())
     NumGOTEquivUsers += getNumGlobalVariableUses(dyn_cast<Constant>(U));
 
   return NumGOTEquivUsers > 0;
@@ -1606,90 +1939,120 @@ void AsmPrinter::emitGlobalGOTEquivs() {
   }
   GlobalGOTEquivs.clear();
 
-  for (auto *GV : FailedCandidates)
+  for (const auto *GV : FailedCandidates)
     emitGlobalVariable(GV);
 }
 
-void AsmPrinter::emitGlobalIndirectSymbol(Module &M,
-                                          const GlobalIndirectSymbol& GIS) {
-  MCSymbol *Name = getSymbol(&GIS);
-  bool IsFunction = GIS.getValueType()->isFunctionTy();
+void AsmPrinter::emitGlobalAlias(Module &M, const GlobalAlias &GA) {
+  MCSymbol *Name = getSymbol(&GA);
+  bool IsFunction = GA.getValueType()->isFunctionTy();
   // Treat bitcasts of functions as functions also. This is important at least
   // on WebAssembly where object and function addresses can't alias each other.
   if (!IsFunction)
-    if (auto *CE = dyn_cast<ConstantExpr>(GIS.getIndirectSymbol()))
-      if (CE->getOpcode() == Instruction::BitCast)
-        IsFunction =
-          CE->getOperand(0)->getType()->getPointerElementType()->isFunctionTy();
+    IsFunction = isa<Function>(GA.getAliasee()->stripPointerCasts());
 
   // AIX's assembly directive `.set` is not usable for aliasing purpose,
   // so AIX has to use the extra-label-at-definition strategy. At this
   // point, all the extra label is emitted, we just have to emit linkage for
   // those labels.
   if (TM.getTargetTriple().isOSBinFormatXCOFF()) {
-    assert(!isa<GlobalIFunc>(GIS) && "IFunc is not supported on AIX.");
     assert(MAI->hasVisibilityOnlyWithLinkage() &&
            "Visibility should be handled with emitLinkage() on AIX.");
-    emitLinkage(&GIS, Name);
+
+    // Linkage for alias of global variable has been emitted.
+    if (isa<GlobalVariable>(GA.getAliaseeObject()))
+      return;
+
+    emitLinkage(&GA, Name);
     // If it's a function, also emit linkage for aliases of function entry
     // point.
     if (IsFunction)
-      emitLinkage(&GIS,
-                  getObjFileLowering().getFunctionEntryPointSymbol(&GIS, TM));
+      emitLinkage(&GA,
+                  getObjFileLowering().getFunctionEntryPointSymbol(&GA, TM));
     return;
   }
 
-  if (GIS.hasExternalLinkage() || !MAI->getWeakRefDirective())
+  if (GA.hasExternalLinkage() || !MAI->getWeakRefDirective())
     OutStreamer->emitSymbolAttribute(Name, MCSA_Global);
-  else if (GIS.hasWeakLinkage() || GIS.hasLinkOnceLinkage())
+  else if (GA.hasWeakLinkage() || GA.hasLinkOnceLinkage())
     OutStreamer->emitSymbolAttribute(Name, MCSA_WeakReference);
   else
-    assert(GIS.hasLocalLinkage() && "Invalid alias or ifunc linkage");
+    assert(GA.hasLocalLinkage() && "Invalid alias linkage");
 
   // Set the symbol type to function if the alias has a function type.
   // This affects codegen when the aliasee is not a function.
-  if (IsFunction)
-    OutStreamer->emitSymbolAttribute(Name, isa<GlobalIFunc>(GIS)
-                                               ? MCSA_ELF_TypeIndFunction
-                                               : MCSA_ELF_TypeFunction);
+  if (IsFunction) {
+    OutStreamer->emitSymbolAttribute(Name, MCSA_ELF_TypeFunction);
+    if (TM.getTargetTriple().isOSBinFormatCOFF()) {
+      OutStreamer->beginCOFFSymbolDef(Name);
+      OutStreamer->emitCOFFSymbolStorageClass(
+          GA.hasLocalLinkage() ? COFF::IMAGE_SYM_CLASS_STATIC
+                               : COFF::IMAGE_SYM_CLASS_EXTERNAL);
+      OutStreamer->emitCOFFSymbolType(COFF::IMAGE_SYM_DTYPE_FUNCTION
+                                      << COFF::SCT_COMPLEX_TYPE_SHIFT);
+      OutStreamer->endCOFFSymbolDef();
+    }
+  }
 
-  emitVisibility(Name, GIS.getVisibility());
+  emitVisibility(Name, GA.getVisibility());
 
-  const MCExpr *Expr = lowerConstant(GIS.getIndirectSymbol());
+  const MCExpr *Expr = lowerConstant(GA.getAliasee());
 
-  if (isa<GlobalAlias>(&GIS) && MAI->hasAltEntry() && isa<MCBinaryExpr>(Expr))
+  if (MAI->hasAltEntry() && isa<MCBinaryExpr>(Expr))
     OutStreamer->emitSymbolAttribute(Name, MCSA_AltEntry);
 
   // Emit the directives as assignments aka .set:
   OutStreamer->emitAssignment(Name, Expr);
-  MCSymbol *LocalAlias = getSymbolPreferLocal(GIS);
+  MCSymbol *LocalAlias = getSymbolPreferLocal(GA);
   if (LocalAlias != Name)
     OutStreamer->emitAssignment(LocalAlias, Expr);
 
-  if (auto *GA = dyn_cast<GlobalAlias>(&GIS)) {
-    // If the aliasee does not correspond to a symbol in the output, i.e. the
-    // alias is not of an object or the aliased object is private, then set the
-    // size of the alias symbol from the type of the alias. We don't do this in
-    // other situations as the alias and aliasee having differing types but same
-    // size may be intentional.
-    const GlobalObject *BaseObject = GA->getBaseObject();
-    if (MAI->hasDotTypeDotSizeDirective() && GA->getValueType()->isSized() &&
-        (!BaseObject || BaseObject->hasPrivateLinkage())) {
-      const DataLayout &DL = M.getDataLayout();
-      uint64_t Size = DL.getTypeAllocSize(GA->getValueType());
-      OutStreamer->emitELFSize(Name, MCConstantExpr::create(Size, OutContext));
-    }
+  // If the aliasee does not correspond to a symbol in the output, i.e. the
+  // alias is not of an object or the aliased object is private, then set the
+  // size of the alias symbol from the type of the alias. We don't do this in
+  // other situations as the alias and aliasee having differing types but same
+  // size may be intentional.
+  const GlobalObject *BaseObject = GA.getAliaseeObject();
+  if (MAI->hasDotTypeDotSizeDirective() && GA.getValueType()->isSized() &&
+      (!BaseObject || BaseObject->hasPrivateLinkage())) {
+    const DataLayout &DL = M.getDataLayout();
+    uint64_t Size = DL.getTypeAllocSize(GA.getValueType());
+    OutStreamer->emitELFSize(Name, MCConstantExpr::create(Size, OutContext));
   }
 }
 
+void AsmPrinter::emitGlobalIFunc(Module &M, const GlobalIFunc &GI) {
+  assert(!TM.getTargetTriple().isOSBinFormatXCOFF() &&
+         "IFunc is not supported on AIX.");
+
+  MCSymbol *Name = getSymbol(&GI);
+
+  if (GI.hasExternalLinkage() || !MAI->getWeakRefDirective())
+    OutStreamer->emitSymbolAttribute(Name, MCSA_Global);
+  else if (GI.hasWeakLinkage() || GI.hasLinkOnceLinkage())
+    OutStreamer->emitSymbolAttribute(Name, MCSA_WeakReference);
+  else
+    assert(GI.hasLocalLinkage() && "Invalid ifunc linkage");
+
+  OutStreamer->emitSymbolAttribute(Name, MCSA_ELF_TypeIndFunction);
+  emitVisibility(Name, GI.getVisibility());
+
+  // Emit the directives as assignments aka .set:
+  const MCExpr *Expr = lowerConstant(GI.getResolver());
+  OutStreamer->emitAssignment(Name, Expr);
+  MCSymbol *LocalAlias = getSymbolPreferLocal(GI);
+  if (LocalAlias != Name)
+    OutStreamer->emitAssignment(LocalAlias, Expr);
+}
+
 void AsmPrinter::emitRemarksSection(remarks::RemarkStreamer &RS) {
   if (!RS.needsSection())
     return;
 
   remarks::RemarkSerializer &RemarkSerializer = RS.getSerializer();
 
-  Optional<SmallString<128>> Filename;
-  if (Optional<StringRef> FilenameRef = RS.getFilename()) {
+  std::optional<SmallString<128>> Filename;
+  if (std::optional<StringRef> FilenameRef = RS.getFilename()) {
     Filename = *FilenameRef;
     sys::fs::make_absolute(*Filename);
     assert(!Filename->empty() && "The filename can't be empty.");
@@ -1705,7 +2068,7 @@ void AsmPrinter::emitRemarksSection(remarks::RemarkStreamer &RS) {
   // Switch to the remarks section.
   MCSection *RemarksSection =
       OutContext.getObjectFileInfo()->getRemarksSection();
-  OutStreamer->SwitchSection(RemarksSection);
+  OutStreamer->switchSection(RemarksSection);
 
   OutStreamer->emitBinaryData(OS.str());
 }
@@ -1776,7 +2139,7 @@ bool AsmPrinter::doFinalization(Module &M) {
     // Output stubs for external and common global variables.
     MachineModuleInfoELF::SymbolListTy Stubs = MMIELF.GetGVStubList();
     if (!Stubs.empty()) {
-      OutStreamer->SwitchSection(TLOF.getDataSection());
+      OutStreamer->switchSection(TLOF.getDataSection());
       const DataLayout &DL = M.getDataLayout();
 
       emitAlignment(Align(DL.getPointerSize()));
@@ -1800,7 +2163,7 @@ bool AsmPrinter::doFinalization(Module &M) {
       for (const auto &Stub : Stubs) {
         SmallString<256> SectionName = StringRef(".rdata$");
         SectionName += Stub.first->getName();
-        OutStreamer->SwitchSection(OutContext.getCOFFSection(
+        OutStreamer->switchSection(OutContext.getCOFFSection(
             SectionName,
             COFF::IMAGE_SCN_CNT_INITIALIZED_DATA | COFF::IMAGE_SCN_MEM_READ |
                 COFF::IMAGE_SCN_LNK_COMDAT,
@@ -1815,6 +2178,17 @@ bool AsmPrinter::doFinalization(Module &M) {
     }
   }
 
+  // This needs to happen before emitting debug information since that can end
+  // arbitrary sections.
+  if (auto *TS = OutStreamer->getTargetStreamer())
+    TS->emitConstantPools();
+
+  // Emit Stack maps before any debug info. Mach-O requires that no data or
+  // text sections come after debug info has been emitted. This matters for
+  // stack maps as they are arbitrary data, and may even have a custom format
+  // through user plugins.
+  emitStackMaps();
+
   // Finalize debug and EH information.
   for (const HandlerInfo &HI : Handlers) {
     NamedRegionTimer T(HI.TimerName, HI.TimerDescription, HI.TimerGroupName,
@@ -1841,6 +2215,17 @@ bool AsmPrinter::doFinalization(Module &M) {
         continue;
       OutStreamer->emitSymbolAttribute(getSymbol(&GO), MCSA_WeakReference);
     }
+    if (shouldEmitWeakSwiftAsyncExtendedFramePointerFlags()) {
+      auto SymbolName = "swift_async_extendedFramePointerFlags";
+      auto Global = M.getGlobalVariable(SymbolName);
+      if (!Global) {
+        auto Int8PtrTy = Type::getInt8PtrTy(M.getContext());
+        Global = new GlobalVariable(M, Int8PtrTy, false,
+                                    GlobalValue::ExternalWeakLinkage, nullptr,
+                                    SymbolName);
+        OutStreamer->emitSymbolAttribute(getSymbol(Global), MCSA_WeakReference);
+      }
+    }
   }
 
   // Print aliases in topological order, that is, for each alias a = b,
@@ -1850,6 +2235,8 @@ bool AsmPrinter::doFinalization(Module &M) {
   SmallVector<const GlobalAlias *, 16> AliasStack;
   SmallPtrSet<const GlobalAlias *, 16> AliasVisited;
   for (const auto &Alias : M.aliases()) {
+    if (Alias.hasAvailableExternallyLinkage())
+      continue;
     for (const GlobalAlias *Cur = &Alias; Cur;
          Cur = dyn_cast<GlobalAlias>(Cur->getAliasee())) {
       if (!AliasVisited.insert(Cur).second)
@@ -1857,16 +2244,16 @@ bool AsmPrinter::doFinalization(Module &M) {
       AliasStack.push_back(Cur);
     }
     for (const GlobalAlias *AncestorAlias : llvm::reverse(AliasStack))
-      emitGlobalIndirectSymbol(M, *AncestorAlias);
+      emitGlobalAlias(M, *AncestorAlias);
     AliasStack.clear();
   }
   for (const auto &IFunc : M.ifuncs())
-    emitGlobalIndirectSymbol(M, IFunc);
+    emitGlobalIFunc(M, IFunc);
 
   GCModuleInfo *MI = getAnalysisIfAvailable<GCModuleInfo>();
   assert(MI && "AsmPrinter didn't require GCModuleInfo?");
   for (GCModuleInfo::iterator I = MI->end(), E = MI->begin(); I != E; )
-    if (GCMetadataPrinter *MP = GetOrCreateGCPrinter(**--I))
+    if (GCMetadataPrinter *MP = getOrCreateGCPrinter(**--I))
       MP->finishAssembly(M, *MI, *this);
 
   // Emit llvm.ident metadata in an '.ident' directive.
@@ -1875,31 +2262,14 @@ bool AsmPrinter::doFinalization(Module &M) {
   // Emit bytes for llvm.commandline metadata.
   emitModuleCommandLines(M);
 
-  // Emit __morestack address if needed for indirect calls.
-  if (MMI->usesMorestackAddr()) {
-    Align Alignment(1);
-    MCSection *ReadOnlySection = getObjFileLowering().getSectionForConstant(
-        getDataLayout(), SectionKind::getReadOnly(),
-        /*C=*/nullptr, Alignment);
-    OutStreamer->SwitchSection(ReadOnlySection);
-
-    MCSymbol *AddrSymbol =
-        OutContext.getOrCreateSymbol(StringRef("__morestack_addr"));
-    OutStreamer->emitLabel(AddrSymbol);
-
-    unsigned PtrSize = MAI->getCodePointerSize();
-    OutStreamer->emitSymbolValue(GetExternalSymbolSymbol("__morestack"),
-                                 PtrSize);
-  }
-
   // Emit .note.GNU-split-stack and .note.GNU-no-split-stack sections if
   // split-stack is used.
-  if (TM.getTargetTriple().isOSBinFormatELF() && MMI->hasSplitStack()) {
-    OutStreamer->SwitchSection(
-        OutContext.getELFSection(".note.GNU-split-stack", ELF::SHT_PROGBITS, 0));
-    if (MMI->hasNosplitStack())
-      OutStreamer->SwitchSection(
-          OutContext.getELFSection(".note.GNU-no-split-stack", ELF::SHT_PROGBITS, 0));
+  if (TM.getTargetTriple().isOSBinFormatELF() && HasSplitStack) {
+    OutStreamer->switchSection(OutContext.getELFSection(".note.GNU-split-stack",
+                                                        ELF::SHT_PROGBITS, 0));
+    if (HasNoSplitStack)
+      OutStreamer->switchSection(OutContext.getELFSection(
+          ".note.GNU-no-split-stack", ELF::SHT_PROGBITS, 0));
   }
 
   // If we don't have any trampolines, then we don't require stack memory
@@ -1907,15 +2277,15 @@ bool AsmPrinter::doFinalization(Module &M) {
   Function *InitTrampolineIntrinsic = M.getFunction("llvm.init.trampoline");
   if (!InitTrampolineIntrinsic || InitTrampolineIntrinsic->use_empty())
     if (MCSection *S = MAI->getNonexecutableStackSection(OutContext))
-      OutStreamer->SwitchSection(S);
+      OutStreamer->switchSection(S);
 
   if (TM.Options.EmitAddrsig) {
     // Emit address-significance attributes for all globals.
     OutStreamer->emitAddrsig();
     for (const GlobalValue &GV : M.global_values()) {
-      if (!GV.use_empty() && !GV.isTransitiveUsedByMetadataOnly() &&
-          !GV.isThreadLocal() && !GV.hasDLLImportStorageClass() &&
-          !GV.getName().startswith("llvm.") && !GV.hasAtLeastLocalUnnamedAddr())
+      if (!GV.use_empty() && !GV.isThreadLocal() &&
+          !GV.hasDLLImportStorageClass() && !GV.getName().startswith("llvm.") &&
+          !GV.hasAtLeastLocalUnnamedAddr())
         OutStreamer->emitAddrsigSym(getSymbol(&GV));
     }
   }
@@ -1928,7 +2298,7 @@ bool AsmPrinter::doFinalization(Module &M) {
           GV.getVisibility() != GlobalValue::DefaultVisibility)
         continue;
 
-      OutStreamer->SwitchSection(
+      OutStreamer->switchSection(
           OutContext.getELFSection(".llvm_sympart", ELF::SHT_LLVM_SYMPART, 0, 0,
                                    "", false, ++UniqueID, nullptr));
       OutStreamer->emitBytes(GV.getPartition());
@@ -1944,8 +2314,9 @@ bool AsmPrinter::doFinalization(Module &M) {
   emitEndOfAsmFile(M);
 
   MMI = nullptr;
+  AddrLabelSymbols = nullptr;
 
-  OutStreamer->Finish();
+  OutStreamer->finish();
   OutStreamer->reset();
   OwnedMLI.reset();
   OwnedMDT.reset();
@@ -1964,6 +2335,16 @@ void AsmPrinter::SetupMachineFunction(MachineFunction &MF) {
   this->MF = &MF;
   const Function &F = MF.getFunction();
 
+  // Record that there are split-stack functions, so we will emit a special
+  // section to tell the linker.
+  if (MF.shouldSplitStack()) {
+    HasSplitStack = true;
+
+    if (!MF.getFrameInfo().needsSplitStackProlog())
+      HasNoSplitStack = true;
+  } else
+    HasNoSplitStack = true;
+
   // Get the function symbol.
   if (!MAI->needsFunctionDescriptors()) {
     CurrentFnSym = getSymbol(&MF.getFunction());
@@ -1982,6 +2363,7 @@ void AsmPrinter::SetupMachineFunction(MachineFunction &MF) {
 
   CurrentFnSymForSize = CurrentFnSym;
   CurrentFnBegin = nullptr;
+  CurrentFnBeginLocal = nullptr;
   CurrentSectionBeginSym = nullptr;
   MBBSectionRanges.clear();
   MBBSectionExceptionSyms.clear();
@@ -1989,7 +2371,7 @@ void AsmPrinter::SetupMachineFunction(MachineFunction &MF) {
   if (F.hasFnAttribute("patchable-function-entry") ||
       F.hasFnAttribute("function-instrument") ||
       F.hasFnAttribute("xray-instruction-threshold") ||
-      needFuncLabelsForEHOrDebugInfo(MF) || NeedsLocalForSize ||
+      needFuncLabels(MF) || NeedsLocalForSize ||
       MF.getTarget().Options.EmitStackSizeSection || MF.hasBBLabels()) {
     CurrentFnBegin = createTempSymbol("func_begin");
     if (NeedsLocalForSize)
@@ -2068,7 +2450,7 @@ void AsmPrinter::emitConstantPool() {
         continue;
 
       if (CurSection != CPSections[i].S) {
-        OutStreamer->SwitchSection(CPSections[i].S);
+        OutStreamer->switchSection(CPSections[i].S);
         emitAlignment(Align(CPSections[i].Alignment));
         CurSection = CPSections[i].S;
         Offset = 0;
@@ -2111,7 +2493,7 @@ void AsmPrinter::emitJumpTableInfo() {
   if (JTInDiffSection) {
     // Drop it in the readonly section.
     MCSection *ReadOnlySection = TLOF.getSectionForJumpTable(F, TM);
-    OutStreamer->SwitchSection(ReadOnlySection);
+    OutStreamer->switchSection(ReadOnlySection);
   }
 
   emitAlignment(Align(MJTI->getEntryAlignment(DL)));
@@ -2134,8 +2516,7 @@ void AsmPrinter::emitJumpTableInfo() {
       SmallPtrSet<const MachineBasicBlock*, 16> EmittedSets;
       const TargetLowering *TLI = MF->getSubtarget().getTargetLowering();
       const MCExpr *Base = TLI->getPICJumpTableRelocBaseExpr(MF,JTI,OutContext);
-      for (unsigned ii = 0, ee = JTBBs.size(); ii != ee; ++ii) {
-        const MachineBasicBlock *MBB = JTBBs[ii];
+      for (const MachineBasicBlock *MBB : JTBBs) {
         if (!EmittedSets.insert(MBB).second)
           continue;
 
@@ -2161,8 +2542,8 @@ void AsmPrinter::emitJumpTableInfo() {
     MCSymbol* JTISymbol = GetJTISymbol(JTI);
     OutStreamer->emitLabel(JTISymbol);
 
-    for (unsigned ii = 0, ee = JTBBs.size(); ii != ee; ++ii)
-      emitJumpTableEntry(MJTI, JTBBs[ii], JTI);
+    for (const MachineBasicBlock *MBB : JTBBs)
+      emitJumpTableEntry(MJTI, MBB, JTI);
   }
   if (!JTInDiffSection)
     OutStreamer->emitDataRegion(MCDR_DataRegionEnd);
@@ -2348,7 +2729,7 @@ void AsmPrinter::emitXXStructorList(const DataLayout &DL, const Constant *List,
     MCSection *OutputSection =
         (IsCtor ? Obj.getStaticCtorSection(S.Priority, KeySym)
                 : Obj.getStaticDtorSection(S.Priority, KeySym));
-    OutStreamer->SwitchSection(OutputSection);
+    OutStreamer->switchSection(OutputSection);
     if (OutStreamer->getCurrentSection() != OutStreamer->getPreviousSection())
       emitAlignment(Align);
     emitXXStructor(DL, S.Func);
@@ -2379,8 +2760,8 @@ void AsmPrinter::emitModuleCommandLines(Module &M) {
   if (!NMD || !NMD->getNumOperands())
     return;
 
-  OutStreamer->PushSection();
-  OutStreamer->SwitchSection(CommandLine);
+  OutStreamer->pushSection();
+  OutStreamer->switchSection(CommandLine);
   OutStreamer->emitZeros(1);
   for (unsigned i = 0, e = NMD->getNumOperands(); i != e; ++i) {
     const MDNode *N = NMD->getOperand(i);
@@ -2390,7 +2771,7 @@ void AsmPrinter::emitModuleCommandLines(Module &M) {
     OutStreamer->emitBytes(S->getString());
     OutStreamer->emitZeros(1);
   }
-  OutStreamer->PopSection();
+  OutStreamer->popSection();
 }
 
 //===--------------------------------------------------------------------===//
@@ -2427,7 +2808,7 @@ void AsmPrinter::emitLabelPlusOffset(const MCSymbol *Label, uint64_t Offset,
                                      unsigned Size,
                                      bool IsSectionRelative) const {
   if (MAI->needsDwarfSectionOffsetDirective() && IsSectionRelative) {
-    OutStreamer->EmitCOFFSecRel32(Label, Offset);
+    OutStreamer->emitCOFFSecRel32(Label, Offset);
     if (Size > 4)
       OutStreamer->emitZeros(Size - 4);
     return;
@@ -2448,17 +2829,23 @@ void AsmPrinter::emitLabelPlusOffset(const MCSymbol *Label, uint64_t Offset,
 // two boundary.  If a global value is specified, and if that global has
 // an explicit alignment requested, it will override the alignment request
 // if required for correctness.
-void AsmPrinter::emitAlignment(Align Alignment, const GlobalObject *GV) const {
+void AsmPrinter::emitAlignment(Align Alignment, const GlobalObject *GV,
+                               unsigned MaxBytesToEmit) const {
   if (GV)
     Alignment = getGVAlignment(GV, GV->getParent()->getDataLayout(), Alignment);
 
   if (Alignment == Align(1))
     return; // 1-byte aligned: no need to emit alignment.
 
-  if (getCurrentSection()->getKind().isText())
-    OutStreamer->emitCodeAlignment(Alignment.value());
-  else
-    OutStreamer->emitValueToAlignment(Alignment.value());
+  if (getCurrentSection()->getKind().isText()) {
+    const MCSubtargetInfo *STI = nullptr;
+    if (this->MF)
+      STI = &getSubtargetInfo();
+    else
+      STI = TM.getMCSubtargetInfo();
+    OutStreamer->emitCodeAlignment(Alignment, STI, MaxBytesToEmit);
+  } else
+    OutStreamer->emitValueToAlignment(Alignment, 0, 1, MaxBytesToEmit);
 }
 
 //===----------------------------------------------------------------------===//
@@ -2480,7 +2867,7 @@ void AsmPrinter::emitTrapAlignment(Align Alignment, const GlobalObject *GV) cons
 /// the OutStreamer, but can be overridden by Target implementations.
 void AsmPrinter::emitTrapToAlignment(Align Alignment) const {
   if (Alignment == Align(1)) return;
-  OutStreamer->emitCodeAlignment(Alignment.value());
+  OutStreamer->emitCodeAlignment(Alignment, &getSubtargetInfo());
 }
 
 
@@ -2507,12 +2894,20 @@ const MCExpr *AsmPrinter::lowerConstant(const Constant *CV) {
   if (const auto *Equiv = dyn_cast<DSOLocalEquivalent>(CV))
     return getObjFileLowering().lowerDSOLocalEquivalent(Equiv, TM);
 
+  if (const NoCFIValue *NC = dyn_cast<NoCFIValue>(CV))
+    return MCSymbolRefExpr::create(getSymbol(NC->getGlobalValue()), Ctx);
+
   const ConstantExpr *CE = dyn_cast<ConstantExpr>(CV);
   if (!CE) {
     llvm_unreachable("Unknown constant value to lower!");
   }
 
+  // The constant expression opcodes are limited to those that are necessary
+  // to represent relocations on supported targets. Expressions involving only
+  // constant addresses are constant folded instead.
   switch (CE->getOpcode()) {
+  default:
+    break; // Error
   case Instruction::AddrSpaceCast: {
     const Constant *Op = CE->getOperand(0);
     unsigned DstAS = CE->getType()->getPointerAddressSpace();
@@ -2520,24 +2915,7 @@ const MCExpr *AsmPrinter::lowerConstant(const Constant *CV) {
     if (TM.isNoopAddrSpaceCast(SrcAS, DstAS))
       return lowerConstant(Op);
 
-    // Fallthrough to error.
-    LLVM_FALLTHROUGH;
-  }
-  default: {
-    // If the code isn't optimized, there may be outstanding folding
-    // opportunities. Attempt to fold the expression using DataLayout as a
-    // last resort before giving up.
-    Constant *C = ConstantFoldConstant(CE, getDataLayout());
-    if (C != CE)
-      return lowerConstant(C);
-
-    // Otherwise report the problem to the user.
-    std::string S;
-    raw_string_ostream OS(S);
-    OS << "Unsupported expression in static initializer: ";
-    CE->printAsOperand(OS, /*PrintType=*/false,
-                   !MF ? nullptr : MF->getFunction().getParent());
-    report_fatal_error(OS.str());
+    break; // Error
   }
   case Instruction::GetElementPtr: {
     // Generate a symbolic expression for the byte address
@@ -2558,7 +2936,7 @@ const MCExpr *AsmPrinter::lowerConstant(const Constant *CV) {
     // expression properly.  This is important for differences between
     // blockaddress labels.  Since the two labels are in the same function, it
     // is reasonable to treat their delta as a 32-bit value.
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case Instruction::BitCast:
     return lowerConstant(CE->getOperand(0));
 
@@ -2588,16 +2966,11 @@ const MCExpr *AsmPrinter::lowerConstant(const Constant *CV) {
     //
     // If the pointer is larger than the resultant integer, then
     // as with Trunc just depend on the assembler to truncate it.
-    if (DL.getTypeAllocSize(Ty).getFixedSize() <=
-        DL.getTypeAllocSize(Op->getType()).getFixedSize())
+    if (DL.getTypeAllocSize(Ty).getFixedValue() <=
+        DL.getTypeAllocSize(Op->getType()).getFixedValue())
       return OpExpr;
 
-    // Otherwise the pointer is smaller than the resultant integer, mask off
-    // the high bits so we are sure to get a proper truncation if the input is
-    // a constant expr.
-    unsigned InBits = DL.getTypeAllocSizeInBits(Op->getType());
-    const MCExpr *MaskExpr = MCConstantExpr::create(~0ULL >> (64-InBits), Ctx);
-    return MCBinaryExpr::createAnd(OpExpr, MaskExpr, Ctx);
+    break; // Error
   }
 
   case Instruction::Sub: {
@@ -2629,42 +3002,41 @@ const MCExpr *AsmPrinter::lowerConstant(const Constant *CV) {
         return RelocExpr;
       }
     }
+
+    const MCExpr *LHS = lowerConstant(CE->getOperand(0));
+    const MCExpr *RHS = lowerConstant(CE->getOperand(1));
+    return MCBinaryExpr::createSub(LHS, RHS, Ctx);
+    break;
   }
-  // else fallthrough
-  LLVM_FALLTHROUGH;
 
-  // The MC library also has a right-shift operator, but it isn't consistently
-  // signed or unsigned between different targets.
-  case Instruction::Add:
-  case Instruction::Mul:
-  case Instruction::SDiv:
-  case Instruction::SRem:
-  case Instruction::Shl:
-  case Instruction::And:
-  case Instruction::Or:
-  case Instruction::Xor: {
+  case Instruction::Add: {
     const MCExpr *LHS = lowerConstant(CE->getOperand(0));
     const MCExpr *RHS = lowerConstant(CE->getOperand(1));
-    switch (CE->getOpcode()) {
-    default: llvm_unreachable("Unknown binary operator constant cast expr");
-    case Instruction::Add: return MCBinaryExpr::createAdd(LHS, RHS, Ctx);
-    case Instruction::Sub: return MCBinaryExpr::createSub(LHS, RHS, Ctx);
-    case Instruction::Mul: return MCBinaryExpr::createMul(LHS, RHS, Ctx);
-    case Instruction::SDiv: return MCBinaryExpr::createDiv(LHS, RHS, Ctx);
-    case Instruction::SRem: return MCBinaryExpr::createMod(LHS, RHS, Ctx);
-    case Instruction::Shl: return MCBinaryExpr::createShl(LHS, RHS, Ctx);
-    case Instruction::And: return MCBinaryExpr::createAnd(LHS, RHS, Ctx);
-    case Instruction::Or:  return MCBinaryExpr::createOr (LHS, RHS, Ctx);
-    case Instruction::Xor: return MCBinaryExpr::createXor(LHS, RHS, Ctx);
-    }
+    return MCBinaryExpr::createAdd(LHS, RHS, Ctx);
   }
   }
+
+  // If the code isn't optimized, there may be outstanding folding
+  // opportunities. Attempt to fold the expression using DataLayout as a
+  // last resort before giving up.
+  Constant *C = ConstantFoldConstant(CE, getDataLayout());
+  if (C != CE)
+    return lowerConstant(C);
+
+  // Otherwise report the problem to the user.
+  std::string S;
+  raw_string_ostream OS(S);
+  OS << "Unsupported expression in static initializer: ";
+  CE->printAsOperand(OS, /*PrintType=*/false,
+                     !MF ? nullptr : MF->getFunction().getParent());
+  report_fatal_error(Twine(OS.str()));
 }
 
 static void emitGlobalConstantImpl(const DataLayout &DL, const Constant *C,
                                    AsmPrinter &AP,
                                    const Constant *BaseCV = nullptr,
-                                   uint64_t Offset = 0);
+                                   uint64_t Offset = 0,
+                                   AsmPrinter::AliasMapTy *AliasList = nullptr);
 
 static void emitGlobalConstantFP(const ConstantFP *CFP, AsmPrinter &AP);
 static void emitGlobalConstantFP(APFloat APF, Type *ET, AsmPrinter &AP);
@@ -2690,7 +3062,7 @@ static int isRepeatedByteSequence(const Value *V, const DataLayout &DL) {
     assert(Size % 8 == 0);
 
     // Extend the element to take zero padding into account.
-    APInt Value = CI->getValue().zextOrSelf(Size);
+    APInt Value = CI->getValue().zext(Size);
     if (!Value.isSplat(8))
       return -1;
 
@@ -2718,9 +3090,21 @@ static int isRepeatedByteSequence(const Value *V, const DataLayout &DL) {
   return -1;
 }
 
-static void emitGlobalConstantDataSequential(const DataLayout &DL,
-                                             const ConstantDataSequential *CDS,
-                                             AsmPrinter &AP) {
+static void emitGlobalAliasInline(AsmPrinter &AP, uint64_t Offset,
+                                  AsmPrinter::AliasMapTy *AliasList) {
+  if (AliasList) {
+    auto AliasIt = AliasList->find(Offset);
+    if (AliasIt != AliasList->end()) {
+      for (const GlobalAlias *GA : AliasIt->second)
+        AP.OutStreamer->emitLabel(AP.getSymbol(GA));
+      AliasList->erase(Offset);
+    }
+  }
+}
+
+static void emitGlobalConstantDataSequential(
+    const DataLayout &DL, const ConstantDataSequential *CDS, AsmPrinter &AP,
+    AsmPrinter::AliasMapTy *AliasList) {
   // See if we can aggregate this into a .fill, if so, emit it as such.
   int Value = isRepeatedByteSequence(CDS, DL);
   if (Value != -1) {
@@ -2737,17 +3121,20 @@ static void emitGlobalConstantDataSequential(const DataLayout &DL,
   // Otherwise, emit the values in successive locations.
   unsigned ElementByteSize = CDS->getElementByteSize();
   if (isa<IntegerType>(CDS->getElementType())) {
-    for (unsigned i = 0, e = CDS->getNumElements(); i != e; ++i) {
+    for (unsigned I = 0, E = CDS->getNumElements(); I != E; ++I) {
+      emitGlobalAliasInline(AP, ElementByteSize * I, AliasList);
       if (AP.isVerbose())
-        AP.OutStreamer->GetCommentOS() << format("0x%" PRIx64 "\n",
-                                                 CDS->getElementAsInteger(i));
-      AP.OutStreamer->emitIntValue(CDS->getElementAsInteger(i),
+        AP.OutStreamer->getCommentOS()
+            << format("0x%" PRIx64 "\n", CDS->getElementAsInteger(I));
+      AP.OutStreamer->emitIntValue(CDS->getElementAsInteger(I),
                                    ElementByteSize);
     }
   } else {
     Type *ET = CDS->getElementType();
-    for (unsigned I = 0, E = CDS->getNumElements(); I != E; ++I)
+    for (unsigned I = 0, E = CDS->getNumElements(); I != E; ++I) {
+      emitGlobalAliasInline(AP, ElementByteSize * I, AliasList);
       emitGlobalConstantFP(CDS->getElementAsAPFloat(I), ET, AP);
+    }
   }
 
   unsigned Size = DL.getTypeAllocSize(CDS->getType());
@@ -2760,7 +3147,8 @@ static void emitGlobalConstantDataSequential(const DataLayout &DL,
 
 static void emitGlobalConstantArray(const DataLayout &DL,
                                     const ConstantArray *CA, AsmPrinter &AP,
-                                    const Constant *BaseCV, uint64_t Offset) {
+                                    const Constant *BaseCV, uint64_t Offset,
+                                    AsmPrinter::AliasMapTy *AliasList) {
   // See if we can aggregate some values.  Make sure it can be
   // represented as a series of bytes of the constant value.
   int Value = isRepeatedByteSequence(CA, DL);
@@ -2768,44 +3156,75 @@ static void emitGlobalConstantArray(const DataLayout &DL,
   if (Value != -1) {
     uint64_t Bytes = DL.getTypeAllocSize(CA->getType());
     AP.OutStreamer->emitFill(Bytes, Value);
-  }
-  else {
-    for (unsigned i = 0, e = CA->getNumOperands(); i != e; ++i) {
-      emitGlobalConstantImpl(DL, CA->getOperand(i), AP, BaseCV, Offset);
-      Offset += DL.getTypeAllocSize(CA->getOperand(i)->getType());
+  } else {
+    for (unsigned I = 0, E = CA->getNumOperands(); I != E; ++I) {
+      emitGlobalConstantImpl(DL, CA->getOperand(I), AP, BaseCV, Offset,
+                             AliasList);
+      Offset += DL.getTypeAllocSize(CA->getOperand(I)->getType());
     }
   }
 }
 
+static void emitGlobalConstantLargeInt(const ConstantInt *CI, AsmPrinter &AP);
+
 static void emitGlobalConstantVector(const DataLayout &DL,
-                                     const ConstantVector *CV, AsmPrinter &AP) {
-  for (unsigned i = 0, e = CV->getType()->getNumElements(); i != e; ++i)
-    emitGlobalConstantImpl(DL, CV->getOperand(i), AP);
+                                     const ConstantVector *CV, AsmPrinter &AP,
+                                     AsmPrinter::AliasMapTy *AliasList) {
+  Type *ElementType = CV->getType()->getElementType();
+  uint64_t ElementSizeInBits = DL.getTypeSizeInBits(ElementType);
+  uint64_t ElementAllocSizeInBits = DL.getTypeAllocSizeInBits(ElementType);
+  uint64_t EmittedSize;
+  if (ElementSizeInBits != ElementAllocSizeInBits) {
+    // If the allocation size of an element is different from the size in bits,
+    // printing each element separately will insert incorrect padding.
+    //
+    // The general algorithm here is complicated; instead of writing it out
+    // here, just use the existing code in ConstantFolding.
+    Type *IntT =
+        IntegerType::get(CV->getContext(), DL.getTypeSizeInBits(CV->getType()));
+    ConstantInt *CI = dyn_cast_or_null<ConstantInt>(ConstantFoldConstant(
+        ConstantExpr::getBitCast(const_cast<ConstantVector *>(CV), IntT), DL));
+    if (!CI) {
+      report_fatal_error(
+          "Cannot lower vector global with unusual element type");
+    }
+    emitGlobalAliasInline(AP, 0, AliasList);
+    emitGlobalConstantLargeInt(CI, AP);
+    EmittedSize = DL.getTypeStoreSize(CV->getType());
+  } else {
+    for (unsigned I = 0, E = CV->getType()->getNumElements(); I != E; ++I) {
+      emitGlobalAliasInline(AP, DL.getTypeAllocSize(CV->getType()) * I, AliasList);
+      emitGlobalConstantImpl(DL, CV->getOperand(I), AP);
+    }
+    EmittedSize =
+        DL.getTypeAllocSize(ElementType) * CV->getType()->getNumElements();
+  }
 
   unsigned Size = DL.getTypeAllocSize(CV->getType());
-  unsigned EmittedSize = DL.getTypeAllocSize(CV->getType()->getElementType()) *
-                         CV->getType()->getNumElements();
   if (unsigned Padding = Size - EmittedSize)
     AP.OutStreamer->emitZeros(Padding);
 }
 
 static void emitGlobalConstantStruct(const DataLayout &DL,
                                      const ConstantStruct *CS, AsmPrinter &AP,
-                                     const Constant *BaseCV, uint64_t Offset) {
+                                     const Constant *BaseCV, uint64_t Offset,
+                                     AsmPrinter::AliasMapTy *AliasList) {
   // Print the fields in successive locations. Pad to align if needed!
   unsigned Size = DL.getTypeAllocSize(CS->getType());
   const StructLayout *Layout = DL.getStructLayout(CS->getType());
   uint64_t SizeSoFar = 0;
-  for (unsigned i = 0, e = CS->getNumOperands(); i != e; ++i) {
-    const Constant *Field = CS->getOperand(i);
+  for (unsigned I = 0, E = CS->getNumOperands(); I != E; ++I) {
+    const Constant *Field = CS->getOperand(I);
 
     // Print the actual field value.
-    emitGlobalConstantImpl(DL, Field, AP, BaseCV, Offset + SizeSoFar);
+    emitGlobalConstantImpl(DL, Field, AP, BaseCV, Offset + SizeSoFar,
+                           AliasList);
 
     // Check if padding is needed and insert one or more 0s.
     uint64_t FieldSize = DL.getTypeAllocSize(Field->getType());
-    uint64_t PadSize = ((i == e-1 ? Size : Layout->getElementOffset(i+1))
-                        - Layout->getElementOffset(i)) - FieldSize;
+    uint64_t PadSize = ((I == E - 1 ? Size : Layout->getElementOffset(I + 1)) -
+                        Layout->getElementOffset(I)) -
+                       FieldSize;
     SizeSoFar += FieldSize + PadSize;
 
     // Insert padding - this may include padding to increase the size of the
@@ -2826,8 +3245,8 @@ static void emitGlobalConstantFP(APFloat APF, Type *ET, AsmPrinter &AP) {
   if (AP.isVerbose()) {
     SmallString<8> StrVal;
     APF.toString(StrVal);
-    ET->print(AP.OutStreamer->GetCommentOS());
-    AP.OutStreamer->GetCommentOS() << ' ' << StrVal << '\n';
+    ET->print(AP.OutStreamer->getCommentOS());
+    AP.OutStreamer->getCommentOS() << ' ' << StrVal << '\n';
   }
 
   // Now iterate through the APInt chunks, emitting them in endian-correct
@@ -3015,7 +3434,9 @@ static void handleIndirectSymViaGOTPCRel(AsmPrinter &AP, const MCExpr **ME,
 
 static void emitGlobalConstantImpl(const DataLayout &DL, const Constant *CV,
                                    AsmPrinter &AP, const Constant *BaseCV,
-                                   uint64_t Offset) {
+                                   uint64_t Offset,
+                                   AsmPrinter::AliasMapTy *AliasList) {
+  emitGlobalAliasInline(AP, Offset, AliasList);
   uint64_t Size = DL.getTypeAllocSize(CV->getType());
 
   // Globals with sub-elements such as combinations of arrays and structs
@@ -3032,8 +3453,8 @@ static void emitGlobalConstantImpl(const DataLayout &DL, const Constant *CV,
 
     if (StoreSize <= 8) {
       if (AP.isVerbose())
-        AP.OutStreamer->GetCommentOS() << format("0x%" PRIx64 "\n",
-                                                 CI->getZExtValue());
+        AP.OutStreamer->getCommentOS()
+            << format("0x%" PRIx64 "\n", CI->getZExtValue());
       AP.OutStreamer->emitIntValue(CI->getZExtValue(), StoreSize);
     } else {
       emitGlobalConstantLargeInt(CI, AP);
@@ -3055,13 +3476,13 @@ static void emitGlobalConstantImpl(const DataLayout &DL, const Constant *CV,
   }
 
   if (const ConstantDataSequential *CDS = dyn_cast<ConstantDataSequential>(CV))
-    return emitGlobalConstantDataSequential(DL, CDS, AP);
+    return emitGlobalConstantDataSequential(DL, CDS, AP, AliasList);
 
   if (const ConstantArray *CVA = dyn_cast<ConstantArray>(CV))
-    return emitGlobalConstantArray(DL, CVA, AP, BaseCV, Offset);
+    return emitGlobalConstantArray(DL, CVA, AP, BaseCV, Offset, AliasList);
 
   if (const ConstantStruct *CVS = dyn_cast<ConstantStruct>(CV))
-    return emitGlobalConstantStruct(DL, CVS, AP, BaseCV, Offset);
+    return emitGlobalConstantStruct(DL, CVS, AP, BaseCV, Offset, AliasList);
 
   if (const ConstantExpr *CE = dyn_cast<ConstantExpr>(CV)) {
     // Look through bitcasts, which might not be able to be MCExpr'ized (e.g. of
@@ -3080,7 +3501,7 @@ static void emitGlobalConstantImpl(const DataLayout &DL, const Constant *CV,
   }
 
   if (const ConstantVector *V = dyn_cast<ConstantVector>(CV))
-    return emitGlobalConstantVector(DL, V, AP);
+    return emitGlobalConstantVector(DL, V, AP, AliasList);
 
   // Otherwise, it must be a ConstantExpr.  Lower it to an MCExpr, then emit it
   // thread the streamer with EmitValue.
@@ -3096,15 +3517,24 @@ static void emitGlobalConstantImpl(const DataLayout &DL, const Constant *CV,
 }
 
 /// EmitGlobalConstant - Print a general LLVM constant to the .s file.
-void AsmPrinter::emitGlobalConstant(const DataLayout &DL, const Constant *CV) {
+void AsmPrinter::emitGlobalConstant(const DataLayout &DL, const Constant *CV,
+                                    AliasMapTy *AliasList) {
   uint64_t Size = DL.getTypeAllocSize(CV->getType());
   if (Size)
-    emitGlobalConstantImpl(DL, CV, *this);
+    emitGlobalConstantImpl(DL, CV, *this, nullptr, 0, AliasList);
   else if (MAI->hasSubsectionsViaSymbols()) {
     // If the global has zero size, emit a single byte so that two labels don't
     // look like they are at the same location.
     OutStreamer->emitIntValue(0, 1);
   }
+  if (!AliasList)
+    return;
+  // TODO: These remaining aliases are not emitted in the correct location. Need
+  // to handle the case where the alias offset doesn't refer to any sub-element.
+  for (auto &AliasPair : *AliasList) {
+    for (const GlobalAlias *GA : AliasPair.second)
+      OutStreamer->emitLabel(getSymbol(GA));
+  }
 }
 
 void AsmPrinter::emitMachineConstantPoolValue(MachineConstantPoolValue *MCPV) {
@@ -3134,11 +3564,12 @@ MCSymbol *AsmPrinter::createTempSymbol(const Twine &Name) const {
 }
 
 MCSymbol *AsmPrinter::GetBlockAddressSymbol(const BlockAddress *BA) const {
-  return MMI->getAddrLabelSymbol(BA->getBasicBlock());
+  return const_cast<AsmPrinter *>(this)->getAddrLabelSymbol(
+      BA->getBasicBlock());
 }
 
 MCSymbol *AsmPrinter::GetBlockAddressSymbol(const BasicBlock *BB) const {
-  return MMI->getAddrLabelSymbol(BB);
+  return const_cast<AsmPrinter *>(this)->getAddrLabelSymbol(BB);
 }
 
 /// GetCPISymbol - Return the symbol for the specified constant pool entry.
@@ -3243,7 +3674,7 @@ static void emitBasicBlockLoopComments(const MachineBasicBlock &MBB,
 
   // Otherwise, it is a loop header.  Print out information about child and
   // parent loops.
-  raw_ostream &OS = AP.OutStreamer->GetCommentOS();
+  raw_ostream &OS = AP.OutStreamer->getCommentOS();
 
   PrintParentLoopComment(OS, Loop->getParentLoop(), AP.getFunctionNumber());
 
@@ -3270,51 +3701,52 @@ void AsmPrinter::emitBasicBlockStart(const MachineBasicBlock &MBB) {
     }
   }
 
-  bool isReachableViaFallthrough =
-    std::find(MBB.pred_begin(), MBB.pred_end(), MBB.getPrevNode()) !=
-      MBB.pred_end();
-  // Emit an alignment directive for this block, if needed.
-  const Align Alignment = MBB.getAlignment();
-  if (Alignment != Align(1)) {
-    if (isReachableViaFallthrough)
-      emitAlignment(Alignment);
-    else
-      emitTrapAlignment(Alignment);
-  }
-
   // Switch to a new section if this basic block must begin a section. The
   // entry block is always placed in the function section and is handled
   // separately.
   if (MBB.isBeginSection() && !MBB.isEntryBlock()) {
-    OutStreamer->SwitchSection(
+    OutStreamer->switchSection(
         getObjFileLowering().getSectionForMachineBasicBlock(MF->getFunction(),
                                                             MBB, TM));
     CurrentSectionBeginSym = MBB.getSymbol();
   }
 
+  bool isReachableViaFallthrough =
+    std::find(MBB.pred_begin(), MBB.pred_end(), MBB.getPrevNode()) !=
+      MBB.pred_end();
+  // Emit an alignment directive for this block, if needed.
+  const Align Alignment = MBB.getAlignment();
+  if (Alignment != Align(1)) {
+    if (isReachableViaFallthrough) {
+      emitAlignment(Alignment, nullptr, MBB.getMaxBytesForAlignment());
+    } else {
+      emitTrapAlignment(Alignment);
+    }
+  }
+
   // If the block has its address taken, emit any labels that were used to
   // reference the block.  It is possible that there is more than one label
   // here, because multiple LLVM BB's may have been RAUW'd to this block after
   // the references were generated.
-  if (MBB.hasAddressTaken()) {
-    const BasicBlock *BB = MBB.getBasicBlock();
+  if (MBB.isIRBlockAddressTaken()) {
     if (isVerbose())
       OutStreamer->AddComment("Block address taken");
 
-    // MBBs can have their address taken as part of CodeGen without having
-    // their corresponding BB's address taken in IR
-    if (BB->hasAddressTaken())
-      for (MCSymbol *Sym : MMI->getAddrLabelSymbolToEmit(BB))
-        OutStreamer->emitLabel(Sym);
+    BasicBlock *BB = MBB.getAddressTakenIRBlock();
+    assert(BB && BB->hasAddressTaken() && "Missing BB");
+    for (MCSymbol *Sym : getAddrLabelSymbolToEmit(BB))
+      OutStreamer->emitLabel(Sym);
+  } else if (isVerbose() && MBB.isMachineBlockAddressTaken()) {
+    OutStreamer->AddComment("Block address taken");
   }
 
   // Print some verbose block comments.
   if (isVerbose()) {
     if (const BasicBlock *BB = MBB.getBasicBlock()) {
       if (BB->hasName()) {
-        BB->printAsOperand(OutStreamer->GetCommentOS(),
+        BB->printAsOperand(OutStreamer->getCommentOS(),
                            /*PrintType=*/false, BB->getModule());
-        OutStreamer->GetCommentOS() << '\n';
+        OutStreamer->getCommentOS() << '\n';
       }
     }
 
@@ -3341,11 +3773,11 @@ void AsmPrinter::emitBasicBlockStart(const MachineBasicBlock &MBB) {
   }
 
   // With BB sections, each basic block must handle CFI information on its own
-  // if it begins a section (Entry block is handled separately by
-  // AsmPrinterHandler::beginFunction).
+  // if it begins a section (Entry block call is handled separately, next to
+  // beginFunction).
   if (MBB.isBeginSection() && !MBB.isEntryBlock())
     for (const HandlerInfo &HI : Handlers)
-      HI.Handler->beginBasicBlock(MBB);
+      HI.Handler->beginBasicBlockSection(MBB);
 }
 
 void AsmPrinter::emitBasicBlockEnd(const MachineBasicBlock &MBB) {
@@ -3353,7 +3785,7 @@ void AsmPrinter::emitBasicBlockEnd(const MachineBasicBlock &MBB) {
   // sections.
   if (MBB.isEndSection())
     for (const HandlerInfo &HI : Handlers)
-      HI.Handler->endBasicBlock(MBB);
+      HI.Handler->endBasicBlockSection(MBB);
 }
 
 void AsmPrinter::emitVisibility(MCSymbol *Sym, unsigned Visibility,
@@ -3435,13 +3867,12 @@ isBlockOnlyReachableByFallthrough(const MachineBasicBlock *MBB) const {
   return true;
 }
 
-GCMetadataPrinter *AsmPrinter::GetOrCreateGCPrinter(GCStrategy &S) {
+GCMetadataPrinter *AsmPrinter::getOrCreateGCPrinter(GCStrategy &S) {
   if (!S.usesMetadata())
     return nullptr;
 
-  gcp_map_type &GCMap = getGCMap(GCMetadataPrinters);
-  gcp_map_type::iterator GCPI = GCMap.find(&S);
-  if (GCPI != GCMap.end())
+  auto [GCPI, Inserted] = GCMetadataPrinters.insert({&S, nullptr});
+  if (!Inserted)
     return GCPI->second.get();
 
   auto Name = S.getName();
@@ -3451,14 +3882,14 @@ GCMetadataPrinter *AsmPrinter::GetOrCreateGCPrinter(GCStrategy &S) {
     if (Name == GCMetaPrinter.getName()) {
       std::unique_ptr<GCMetadataPrinter> GMP = GCMetaPrinter.instantiate();
       GMP->S = &S;
-      auto IterBool = GCMap.insert(std::make_pair(&S, std::move(GMP)));
-      return IterBool.first->second.get();
+      GCPI->second = std::move(GMP);
+      return GCPI->second.get();
     }
 
   report_fatal_error("no GCMetadataPrinter registered for GC: " + Twine(Name));
 }
 
-void AsmPrinter::emitStackMaps(StackMaps &SM) {
+void AsmPrinter::emitStackMaps() {
   GCModuleInfo *MI = getAnalysisIfAvailable<GCModuleInfo>();
   assert(MI && "AsmPrinter didn't require GCModuleInfo?");
   bool NeedsDefault = false;
@@ -3466,8 +3897,8 @@ void AsmPrinter::emitStackMaps(StackMaps &SM) {
     // No GC strategy, use the default format.
     NeedsDefault = true;
   else
-    for (auto &I : *MI) {
-      if (GCMetadataPrinter *MP = GetOrCreateGCPrinter(*I))
+    for (const auto &I : *MI) {
+      if (GCMetadataPrinter *MP = getOrCreateGCPrinter(*I))
         if (MP->emitStackMaps(SM, *this))
           continue;
       // The strategy doesn't have printer or doesn't emit custom stack maps.
@@ -3541,7 +3972,7 @@ void AsmPrinter::emitXRayTable() {
   // range of sleds associated with a function.
   auto &Ctx = OutContext;
   MCSymbol *SledsStart = OutContext.createTempSymbol("xray_sleds_start", true);
-  OutStreamer->SwitchSection(InstMap);
+  OutStreamer->switchSection(InstMap);
   OutStreamer->emitLabel(SledsStart);
   for (const auto &Sled : Sleds) {
     MCSymbol *Dot = Ctx.createTempSymbol();
@@ -3568,11 +3999,12 @@ void AsmPrinter::emitXRayTable() {
   // Each entry here will be 2 * word size aligned, as we're writing down two
   // pointers. This should work for both 32-bit and 64-bit platforms.
   if (FnSledIndex) {
-    OutStreamer->SwitchSection(FnSledIndex);
-    OutStreamer->emitCodeAlignment(2 * WordSizeBytes);
+    OutStreamer->switchSection(FnSledIndex);
+    OutStreamer->emitCodeAlignment(Align(2 * WordSizeBytes),
+                                   &getSubtargetInfo());
     OutStreamer->emitSymbolValue(SledsStart, WordSizeBytes, false);
     OutStreamer->emitSymbolValue(SledsEnd, WordSizeBytes, false);
-    OutStreamer->SwitchSection(PrevSection);
+    OutStreamer->switchSection(PrevSection);
   }
   Sleds.clear();
 }
@@ -3617,7 +4049,7 @@ void AsmPrinter::emitPatchableFunctionEntries() {
       }
       LinkedToSym = cast<MCSymbolELF>(CurrentFnSym);
     }
-    OutStreamer->SwitchSection(OutContext.getELFSection(
+    OutStreamer->switchSection(OutContext.getELFSection(
         "__patchable_function_entries", ELF::SHT_PROGBITS, Flags, 0, GroupName,
         F.hasComdat(), MCSection::NonUniqueID, LinkedToSym));
     emitAlignment(Align(PointerSize));
@@ -3642,6 +4074,12 @@ unsigned int AsmPrinter::getDwarfOffsetByteSize() const {
       OutStreamer->getContext().getDwarfFormat());
 }
 
+dwarf::FormParams AsmPrinter::getDwarfFormParams() const {
+  return {getDwarfVersion(), uint8_t(getPointerSize()),
+          OutStreamer->getContext().getDwarfFormat(),
+          doesDwarfUseRelocationsAcrossSections()};
+}
+
 unsigned int AsmPrinter::getUnitLengthFieldByteSize() const {
   return dwarf::getUnitLengthFieldByteSize(
       OutStreamer->getContext().getDwarfFormat());
diff --git a/gnu/llvm/llvm/lib/CodeGen/CMakeLists.txt b/gnu/llvm/llvm/lib/CodeGen/CMakeLists.txt
index f0c438eb8de..f6192e3a704 100644
--- a/gnu/llvm/llvm/lib/CodeGen/CMakeLists.txt
+++ b/gnu/llvm/llvm/lib/CodeGen/CMakeLists.txt
@@ -1,21 +1,50 @@
+if (DEFINED LLVM_HAVE_TF_AOT OR LLVM_HAVE_TFLITE)
+  include(TensorFlowCompile)
+  set(LLVM_RAEVICT_MODEL_PATH_DEFAULT "models/regalloc-eviction")
+
+  set(LLVM_RAEVICT_MODEL_CURRENT_URL "<UNSPECIFIED>" CACHE STRING "URL to download the LLVM register allocator eviction model")
+
+  if (DEFINED LLVM_HAVE_TF_AOT)
+    tf_find_and_compile(
+      ${LLVM_RAEVICT_MODEL_PATH}
+      ${LLVM_RAEVICT_MODEL_CURRENT_URL}
+      ${LLVM_RAEVICT_MODEL_PATH_DEFAULT}
+      "../Analysis/models/gen-regalloc-eviction-test-model.py"
+      serve
+      action
+      RegallocEvictModel
+      llvm::RegallocEvictModel
+    )
+  endif()
+
+  if (LLVM_HAVE_TFLITE)
+    list(APPEND MLLinkDeps ${tensorflow_c_api} ${tensorflow_fx})
+  endif()
+endif()
+
 add_llvm_component_library(LLVMCodeGen
   AggressiveAntiDepBreaker.cpp
   AllocationOrder.cpp
   Analysis.cpp
+  AssignmentTrackingAnalysis.cpp
   AtomicExpandPass.cpp
   BasicTargetTransformInfo.cpp
   BranchFolding.cpp
   BranchRelaxation.cpp
   BreakFalseDeps.cpp
   BasicBlockSections.cpp
+  BasicBlockSectionsProfileReader.cpp
   CalcSpillWeights.cpp
   CallingConvLower.cpp
   CFGuardLongjmp.cpp
+  CFIFixup.cpp
   CFIInstrInserter.cpp
   CodeGen.cpp
+  CodeGenCommonISel.cpp
   CodeGenPassBuilder.cpp
   CodeGenPrepare.cpp
   CommandFlags.cpp
+  ComplexDeinterleavingPass.cpp
   CriticalAntiDepBreaker.cpp
   DeadMachineInstructionElim.cpp
   DetectDeadLanes.cpp
@@ -25,6 +54,8 @@ add_llvm_component_library(LLVMCodeGen
   EdgeBundles.cpp
   EHContGuardCatchret.cpp
   ExecutionDomainFix.cpp
+  ExpandLargeDivRem.cpp
+  ExpandLargeFpConvert.cpp
   ExpandMemCmp.cpp
   ExpandPostRAPseudos.cpp
   ExpandReductions.cpp
@@ -47,6 +78,7 @@ add_llvm_component_library(LLVMCodeGen
   InterleavedAccessPass.cpp
   InterleavedLoadCombinePass.cpp
   IntrinsicLowering.cpp
+  JMCInstrumenter.cpp
   LatencyPriorityQueue.cpp
   LazyMachineBlockFrequencyInfo.cpp
   LexicalScopes.cpp
@@ -72,10 +104,12 @@ add_llvm_component_library(LLVMCodeGen
   MachineBlockFrequencyInfo.cpp
   MachineBlockPlacement.cpp
   MachineBranchProbabilityInfo.cpp
+  MachineCFGPrinter.cpp
   MachineCombiner.cpp
   MachineCopyPropagation.cpp
   MachineCSE.cpp
   MachineCheckDebugify.cpp
+  MachineCycleAnalysis.cpp
   MachineDebugify.cpp
   MachineDominanceFrontier.cpp
   MachineDominators.cpp
@@ -86,6 +120,7 @@ add_llvm_component_library(LLVMCodeGen
   MachineFunctionSplitter.cpp
   MachineInstrBundle.cpp
   MachineInstr.cpp
+  MachineLateInstrsCleanup.cpp
   MachineLICM.cpp
   MachineLoopInfo.cpp
   MachineLoopUtils.cpp
@@ -103,12 +138,17 @@ add_llvm_component_library(LLVMCodeGen
   MachineScheduler.cpp
   MachineSink.cpp
   MachineSizeOpts.cpp
+  MachineSSAContext.cpp
   MachineSSAUpdater.cpp
   MachineStripDebug.cpp
   MachineTraceMetrics.cpp
+  MachineUniformityAnalysis.cpp
   MachineVerifier.cpp
   MIRFSDiscriminator.cpp
+  MIRSampleProfile.cpp
   MIRYamlMapping.cpp
+  MLRegallocEvictAdvisor.cpp
+  MLRegallocPriorityAdvisor.cpp
   ModuloSchedule.cpp
   MultiHazardRecognizer.cpp
   PatchableFunction.cpp
@@ -135,9 +175,12 @@ add_llvm_component_library(LLVMCodeGen
   ReachingDefAnalysis.cpp
   RegAllocBase.cpp
   RegAllocBasic.cpp
+  RegAllocEvictionAdvisor.cpp
   RegAllocFast.cpp
   RegAllocGreedy.cpp
   RegAllocPBQP.cpp
+  RegAllocPriorityAdvisor.cpp
+  RegAllocScore.cpp
   RegisterClassInfo.cpp
   RegisterCoalescer.cpp
   RegisterPressure.cpp
@@ -155,12 +198,16 @@ add_llvm_component_library(LLVMCodeGen
   ResetMachineFunctionPass.cpp
   ReturnProtectorLowering.cpp
   ReturnProtectorPass.cpp
+  RegisterBank.cpp
+  RegisterBankInfo.cpp
   SafeStack.cpp
   SafeStackLayout.cpp
+  SanitizerBinaryMetadata.cpp
   ScheduleDAG.cpp
   ScheduleDAGInstrs.cpp
   ScheduleDAGPrinter.cpp
   ScoreboardHazardRecognizer.cpp
+  SelectOptimize.cpp
   ShadowStackGCLowering.cpp
   ShrinkWrap.cpp
   SjLjEHPrepare.cpp
@@ -168,6 +215,7 @@ add_llvm_component_library(LLVMCodeGen
   SpillPlacement.cpp
   SplitKit.cpp
   StackColoring.cpp
+  StackFrameLayoutAnalysisPass.cpp
   StackMapLivenessAnalysis.cpp
   StackMaps.cpp
   StackProtector.cpp
@@ -185,14 +233,16 @@ add_llvm_component_library(LLVMCodeGen
   TargetRegisterInfo.cpp
   TargetSchedule.cpp
   TargetSubtargetInfo.cpp
-  TypePromotion.cpp
   TwoAddressInstructionPass.cpp
+  TypePromotion.cpp
   UnreachableBlockElim.cpp
   ValueTypes.cpp
+  VLIWMachineScheduler.cpp
   VirtRegMap.cpp
   WasmEHPrepare.cpp
   WinEHPrepare.cpp
   XRayInstrumentation.cpp
+  ${GeneratedMLSources}
 
   LiveDebugValues/LiveDebugValues.cpp
   LiveDebugValues/VarLocBasedImpl.cpp
@@ -202,10 +252,11 @@ add_llvm_component_library(LLVMCodeGen
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/CodeGen
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/CodeGen/PBQP
 
-  LINK_LIBS ${LLVM_PTHREAD_LIB}
+  LINK_LIBS ${LLVM_PTHREAD_LIB} ${MLLinkDeps}
 
   DEPENDS
   intrinsics_gen
+  ${MLDeps}
 
   LINK_COMPONENTS
   Analysis
@@ -213,10 +264,12 @@ add_llvm_component_library(LLVMCodeGen
   BitWriter
   Core
   MC
+  ObjCARC
   ProfileData
   Scalar
   Support
   Target
+  TargetParser
   TransformUtils
   )
 
diff --git a/gnu/llvm/llvm/lib/CodeGen/GlobalISel/RegisterBank.cpp b/gnu/llvm/llvm/lib/CodeGen/GlobalISel/RegisterBank.cpp
deleted file mode 100644
index 5c4d18ad79c..00000000000
--- a/gnu/llvm/llvm/lib/CodeGen/GlobalISel/RegisterBank.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-//===- llvm/CodeGen/GlobalISel/RegisterBank.cpp - Register Bank --*- C++ -*-==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-/// \file
-/// This file implements the RegisterBank class.
-//===----------------------------------------------------------------------===//
-
-#include "llvm/CodeGen/GlobalISel/RegisterBank.h"
-#include "llvm/ADT/StringExtras.h"
-#include "llvm/CodeGen/TargetRegisterInfo.h"
-#include "llvm/Config/llvm-config.h"
-#include "llvm/Support/Debug.h"
-
-#define DEBUG_TYPE "registerbank"
-
-using namespace llvm;
-
-const unsigned RegisterBank::InvalidID = UINT_MAX;
-
-RegisterBank::RegisterBank(
-    unsigned ID, const char *Name, unsigned Size,
-    const uint32_t *CoveredClasses, unsigned NumRegClasses)
-    : ID(ID), Name(Name), Size(Size) {
-  ContainedRegClasses.resize(NumRegClasses);
-  ContainedRegClasses.setBitsInMask(CoveredClasses);
-}
-
-bool RegisterBank::verify(const TargetRegisterInfo &TRI) const {
-  assert(isValid() && "Invalid register bank");
-  for (unsigned RCId = 0, End = TRI.getNumRegClasses(); RCId != End; ++RCId) {
-    const TargetRegisterClass &RC = *TRI.getRegClass(RCId);
-
-    if (!covers(RC))
-      continue;
-    // Verify that the register bank covers all the sub classes of the
-    // classes it covers.
-
-    // Use a different (slow in that case) method than
-    // RegisterBankInfo to find the subclasses of RC, to make sure
-    // both agree on the covers.
-    for (unsigned SubRCId = 0; SubRCId != End; ++SubRCId) {
-      const TargetRegisterClass &SubRC = *TRI.getRegClass(RCId);
-
-      if (!RC.hasSubClassEq(&SubRC))
-        continue;
-
-      // Verify that the Size of the register bank is big enough to cover
-      // all the register classes it covers.
-      assert(getSize() >= TRI.getRegSizeInBits(SubRC) &&
-             "Size is not big enough for all the subclasses!");
-      assert(covers(SubRC) && "Not all subclasses are covered");
-    }
-  }
-  return true;
-}
-
-bool RegisterBank::covers(const TargetRegisterClass &RC) const {
-  assert(isValid() && "RB hasn't been initialized yet");
-  return ContainedRegClasses.test(RC.getID());
-}
-
-bool RegisterBank::isValid() const {
-  return ID != InvalidID && Name != nullptr && Size != 0 &&
-         // A register bank that does not cover anything is useless.
-         !ContainedRegClasses.empty();
-}
-
-bool RegisterBank::operator==(const RegisterBank &OtherRB) const {
-  // There must be only one instance of a given register bank alive
-  // for the whole compilation.
-  // The RegisterBankInfo is supposed to enforce that.
-  assert((OtherRB.getID() != getID() || &OtherRB == this) &&
-         "ID does not uniquely identify a RegisterBank");
-  return &OtherRB == this;
-}
-
-#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
-LLVM_DUMP_METHOD void RegisterBank::dump(const TargetRegisterInfo *TRI) const {
-  print(dbgs(), /* IsForDebug */ true, TRI);
-}
-#endif
-
-void RegisterBank::print(raw_ostream &OS, bool IsForDebug,
-                         const TargetRegisterInfo *TRI) const {
-  OS << getName();
-  if (!IsForDebug)
-    return;
-  OS << "(ID:" << getID() << ", Size:" << getSize() << ")\n"
-     << "isValid:" << isValid() << '\n'
-     << "Number of Covered register classes: " << ContainedRegClasses.count()
-     << '\n';
-  // Print all the subclasses if we can.
-  // This register classes may not be properly initialized yet.
-  if (!TRI || ContainedRegClasses.empty())
-    return;
-  assert(ContainedRegClasses.size() == TRI->getNumRegClasses() &&
-         "TRI does not match the initialization process?");
-  OS << "Covered register classes:\n";
-  ListSeparator LS;
-  for (unsigned RCId = 0, End = TRI->getNumRegClasses(); RCId != End; ++RCId) {
-    const TargetRegisterClass &RC = *TRI->getRegClass(RCId);
-
-    if (covers(RC))
-      OS << LS << TRI->getRegClassName(&RC);
-  }
-}
diff --git a/gnu/llvm/llvm/lib/CodeGen/GlobalISel/RegisterBankInfo.cpp b/gnu/llvm/llvm/lib/CodeGen/GlobalISel/RegisterBankInfo.cpp
deleted file mode 100644
index e2a96374710..00000000000
--- a/gnu/llvm/llvm/lib/CodeGen/GlobalISel/RegisterBankInfo.cpp
+++ /dev/null
@@ -1,805 +0,0 @@
-//===- llvm/CodeGen/GlobalISel/RegisterBankInfo.cpp --------------*- C++ -*-==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-/// \file
-/// This file implements the RegisterBankInfo class.
-//===----------------------------------------------------------------------===//
-
-#include "llvm/CodeGen/GlobalISel/RegisterBankInfo.h"
-#include "llvm/ADT/SmallString.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/Statistic.h"
-#include "llvm/ADT/iterator_range.h"
-#include "llvm/CodeGen/GlobalISel/RegisterBank.h"
-#include "llvm/CodeGen/MachineBasicBlock.h"
-#include "llvm/CodeGen/MachineFunction.h"
-#include "llvm/CodeGen/MachineRegisterInfo.h"
-#include "llvm/CodeGen/TargetOpcodes.h"
-#include "llvm/CodeGen/TargetRegisterInfo.h"
-#include "llvm/CodeGen/TargetSubtargetInfo.h"
-#include "llvm/Config/llvm-config.h"
-#include "llvm/IR/Type.h"
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/raw_ostream.h"
-
-#include <algorithm> // For std::max.
-
-#define DEBUG_TYPE "registerbankinfo"
-
-using namespace llvm;
-
-STATISTIC(NumPartialMappingsCreated,
-          "Number of partial mappings dynamically created");
-STATISTIC(NumPartialMappingsAccessed,
-          "Number of partial mappings dynamically accessed");
-STATISTIC(NumValueMappingsCreated,
-          "Number of value mappings dynamically created");
-STATISTIC(NumValueMappingsAccessed,
-          "Number of value mappings dynamically accessed");
-STATISTIC(NumOperandsMappingsCreated,
-          "Number of operands mappings dynamically created");
-STATISTIC(NumOperandsMappingsAccessed,
-          "Number of operands mappings dynamically accessed");
-STATISTIC(NumInstructionMappingsCreated,
-          "Number of instruction mappings dynamically created");
-STATISTIC(NumInstructionMappingsAccessed,
-          "Number of instruction mappings dynamically accessed");
-
-const unsigned RegisterBankInfo::DefaultMappingID = UINT_MAX;
-const unsigned RegisterBankInfo::InvalidMappingID = UINT_MAX - 1;
-
-//------------------------------------------------------------------------------
-// RegisterBankInfo implementation.
-//------------------------------------------------------------------------------
-RegisterBankInfo::RegisterBankInfo(RegisterBank **RegBanks,
-                                   unsigned NumRegBanks)
-    : RegBanks(RegBanks), NumRegBanks(NumRegBanks) {
-#ifndef NDEBUG
-  for (unsigned Idx = 0, End = getNumRegBanks(); Idx != End; ++Idx) {
-    assert(RegBanks[Idx] != nullptr && "Invalid RegisterBank");
-    assert(RegBanks[Idx]->isValid() && "RegisterBank should be valid");
-  }
-#endif // NDEBUG
-}
-
-bool RegisterBankInfo::verify(const TargetRegisterInfo &TRI) const {
-#ifndef NDEBUG
-  for (unsigned Idx = 0, End = getNumRegBanks(); Idx != End; ++Idx) {
-    const RegisterBank &RegBank = getRegBank(Idx);
-    assert(Idx == RegBank.getID() &&
-           "ID does not match the index in the array");
-    LLVM_DEBUG(dbgs() << "Verify " << RegBank << '\n');
-    assert(RegBank.verify(TRI) && "RegBank is invalid");
-  }
-#endif // NDEBUG
-  return true;
-}
-
-const RegisterBank *
-RegisterBankInfo::getRegBank(Register Reg, const MachineRegisterInfo &MRI,
-                             const TargetRegisterInfo &TRI) const {
-  if (Register::isPhysicalRegister(Reg)) {
-    // FIXME: This was probably a copy to a virtual register that does have a
-    // type we could use.
-    return &getRegBankFromRegClass(getMinimalPhysRegClass(Reg, TRI), LLT());
-  }
-
-  assert(Reg && "NoRegister does not have a register bank");
-  const RegClassOrRegBank &RegClassOrBank = MRI.getRegClassOrRegBank(Reg);
-  if (auto *RB = RegClassOrBank.dyn_cast<const RegisterBank *>())
-    return RB;
-  if (auto *RC = RegClassOrBank.dyn_cast<const TargetRegisterClass *>())
-    return &getRegBankFromRegClass(*RC, MRI.getType(Reg));
-  return nullptr;
-}
-
-const TargetRegisterClass &
-RegisterBankInfo::getMinimalPhysRegClass(Register Reg,
-                                         const TargetRegisterInfo &TRI) const {
-  assert(Register::isPhysicalRegister(Reg) && "Reg must be a physreg");
-  const auto &RegRCIt = PhysRegMinimalRCs.find(Reg);
-  if (RegRCIt != PhysRegMinimalRCs.end())
-    return *RegRCIt->second;
-  const TargetRegisterClass *PhysRC = TRI.getMinimalPhysRegClass(Reg);
-  PhysRegMinimalRCs[Reg] = PhysRC;
-  return *PhysRC;
-}
-
-const RegisterBank *RegisterBankInfo::getRegBankFromConstraints(
-    const MachineInstr &MI, unsigned OpIdx, const TargetInstrInfo &TII,
-    const MachineRegisterInfo &MRI) const {
-  const TargetRegisterInfo *TRI = MRI.getTargetRegisterInfo();
-
-  // The mapping of the registers may be available via the
-  // register class constraints.
-  const TargetRegisterClass *RC = MI.getRegClassConstraint(OpIdx, &TII, TRI);
-
-  if (!RC)
-    return nullptr;
-
-  Register Reg = MI.getOperand(OpIdx).getReg();
-  const RegisterBank &RegBank = getRegBankFromRegClass(*RC, MRI.getType(Reg));
-  // Sanity check that the target properly implemented getRegBankFromRegClass.
-  assert(RegBank.covers(*RC) &&
-         "The mapping of the register bank does not make sense");
-  return &RegBank;
-}
-
-const TargetRegisterClass *RegisterBankInfo::constrainGenericRegister(
-    Register Reg, const TargetRegisterClass &RC, MachineRegisterInfo &MRI) {
-
-  // If the register already has a class, fallback to MRI::constrainRegClass.
-  auto &RegClassOrBank = MRI.getRegClassOrRegBank(Reg);
-  if (RegClassOrBank.is<const TargetRegisterClass *>())
-    return MRI.constrainRegClass(Reg, &RC);
-
-  const RegisterBank *RB = RegClassOrBank.get<const RegisterBank *>();
-  // Otherwise, all we can do is ensure the bank covers the class, and set it.
-  if (RB && !RB->covers(RC))
-    return nullptr;
-
-  // If nothing was set or the class is simply compatible, set it.
-  MRI.setRegClass(Reg, &RC);
-  return &RC;
-}
-
-/// Check whether or not \p MI should be treated like a copy
-/// for the mappings.
-/// Copy like instruction are special for mapping because
-/// they don't have actual register constraints. Moreover,
-/// they sometimes have register classes assigned and we can
-/// just use that instead of failing to provide a generic mapping.
-static bool isCopyLike(const MachineInstr &MI) {
-  return MI.isCopy() || MI.isPHI() ||
-         MI.getOpcode() == TargetOpcode::REG_SEQUENCE;
-}
-
-const RegisterBankInfo::InstructionMapping &
-RegisterBankInfo::getInstrMappingImpl(const MachineInstr &MI) const {
-  // For copies we want to walk over the operands and try to find one
-  // that has a register bank since the instruction itself will not get
-  // us any constraint.
-  bool IsCopyLike = isCopyLike(MI);
-  // For copy like instruction, only the mapping of the definition
-  // is important. The rest is not constrained.
-  unsigned NumOperandsForMapping = IsCopyLike ? 1 : MI.getNumOperands();
-
-  const MachineFunction &MF = *MI.getMF();
-  const TargetSubtargetInfo &STI = MF.getSubtarget();
-  const TargetRegisterInfo &TRI = *STI.getRegisterInfo();
-  const MachineRegisterInfo &MRI = MF.getRegInfo();
-  // We may need to query the instruction encoding to guess the mapping.
-  const TargetInstrInfo &TII = *STI.getInstrInfo();
-
-  // Before doing anything complicated check if the mapping is not
-  // directly available.
-  bool CompleteMapping = true;
-
-  SmallVector<const ValueMapping *, 8> OperandsMapping(NumOperandsForMapping);
-  for (unsigned OpIdx = 0, EndIdx = MI.getNumOperands(); OpIdx != EndIdx;
-       ++OpIdx) {
-    const MachineOperand &MO = MI.getOperand(OpIdx);
-    if (!MO.isReg())
-      continue;
-    Register Reg = MO.getReg();
-    if (!Reg)
-      continue;
-    // The register bank of Reg is just a side effect of the current
-    // excution and in particular, there is no reason to believe this
-    // is the best default mapping for the current instruction.  Keep
-    // it as an alternative register bank if we cannot figure out
-    // something.
-    const RegisterBank *AltRegBank = getRegBank(Reg, MRI, TRI);
-    // For copy-like instruction, we want to reuse the register bank
-    // that is already set on Reg, if any, since those instructions do
-    // not have any constraints.
-    const RegisterBank *CurRegBank = IsCopyLike ? AltRegBank : nullptr;
-    if (!CurRegBank) {
-      // If this is a target specific instruction, we can deduce
-      // the register bank from the encoding constraints.
-      CurRegBank = getRegBankFromConstraints(MI, OpIdx, TII, MRI);
-      if (!CurRegBank) {
-        // All our attempts failed, give up.
-        CompleteMapping = false;
-
-        if (!IsCopyLike)
-          // MI does not carry enough information to guess the mapping.
-          return getInvalidInstructionMapping();
-        continue;
-      }
-    }
-
-    unsigned Size = getSizeInBits(Reg, MRI, TRI);
-    const ValueMapping *ValMapping = &getValueMapping(0, Size, *CurRegBank);
-    if (IsCopyLike) {
-      if (!OperandsMapping[0]) {
-        if (MI.isRegSequence()) {
-          // For reg_sequence, the result size does not match the input.
-          unsigned ResultSize = getSizeInBits(MI.getOperand(0).getReg(),
-                                              MRI, TRI);
-          OperandsMapping[0] = &getValueMapping(0, ResultSize, *CurRegBank);
-        } else {
-          OperandsMapping[0] = ValMapping;
-        }
-      }
-
-      // The default handling assumes any register bank can be copied to any
-      // other. If this isn't the case, the target should specially deal with
-      // reg_sequence/phi. There may also be unsatisfiable copies.
-      for (; OpIdx != EndIdx; ++OpIdx) {
-        const MachineOperand &MO = MI.getOperand(OpIdx);
-        if (!MO.isReg())
-          continue;
-        Register Reg = MO.getReg();
-        if (!Reg)
-          continue;
-
-        const RegisterBank *AltRegBank = getRegBank(Reg, MRI, TRI);
-        if (AltRegBank &&
-            cannotCopy(*CurRegBank, *AltRegBank, getSizeInBits(Reg, MRI, TRI)))
-          return getInvalidInstructionMapping();
-      }
-
-      CompleteMapping = true;
-      break;
-    }
-
-    OperandsMapping[OpIdx] = ValMapping;
-  }
-
-  if (IsCopyLike && !CompleteMapping) {
-    // No way to deduce the type from what we have.
-    return getInvalidInstructionMapping();
-  }
-
-  assert(CompleteMapping && "Setting an uncomplete mapping");
-  return getInstructionMapping(
-      DefaultMappingID, /*Cost*/ 1,
-      /*OperandsMapping*/ getOperandsMapping(OperandsMapping),
-      NumOperandsForMapping);
-}
-
-/// Hashing function for PartialMapping.
-static hash_code hashPartialMapping(unsigned StartIdx, unsigned Length,
-                                    const RegisterBank *RegBank) {
-  return hash_combine(StartIdx, Length, RegBank ? RegBank->getID() : 0);
-}
-
-/// Overloaded version of hash_value for a PartialMapping.
-hash_code
-llvm::hash_value(const RegisterBankInfo::PartialMapping &PartMapping) {
-  return hashPartialMapping(PartMapping.StartIdx, PartMapping.Length,
-                            PartMapping.RegBank);
-}
-
-const RegisterBankInfo::PartialMapping &
-RegisterBankInfo::getPartialMapping(unsigned StartIdx, unsigned Length,
-                                    const RegisterBank &RegBank) const {
-  ++NumPartialMappingsAccessed;
-
-  hash_code Hash = hashPartialMapping(StartIdx, Length, &RegBank);
-  const auto &It = MapOfPartialMappings.find(Hash);
-  if (It != MapOfPartialMappings.end())
-    return *It->second;
-
-  ++NumPartialMappingsCreated;
-
-  auto &PartMapping = MapOfPartialMappings[Hash];
-  PartMapping = std::make_unique<PartialMapping>(StartIdx, Length, RegBank);
-  return *PartMapping;
-}
-
-const RegisterBankInfo::ValueMapping &
-RegisterBankInfo::getValueMapping(unsigned StartIdx, unsigned Length,
-                                  const RegisterBank &RegBank) const {
-  return getValueMapping(&getPartialMapping(StartIdx, Length, RegBank), 1);
-}
-
-static hash_code
-hashValueMapping(const RegisterBankInfo::PartialMapping *BreakDown,
-                 unsigned NumBreakDowns) {
-  if (LLVM_LIKELY(NumBreakDowns == 1))
-    return hash_value(*BreakDown);
-  SmallVector<size_t, 8> Hashes(NumBreakDowns);
-  for (unsigned Idx = 0; Idx != NumBreakDowns; ++Idx)
-    Hashes.push_back(hash_value(BreakDown[Idx]));
-  return hash_combine_range(Hashes.begin(), Hashes.end());
-}
-
-const RegisterBankInfo::ValueMapping &
-RegisterBankInfo::getValueMapping(const PartialMapping *BreakDown,
-                                  unsigned NumBreakDowns) const {
-  ++NumValueMappingsAccessed;
-
-  hash_code Hash = hashValueMapping(BreakDown, NumBreakDowns);
-  const auto &It = MapOfValueMappings.find(Hash);
-  if (It != MapOfValueMappings.end())
-    return *It->second;
-
-  ++NumValueMappingsCreated;
-
-  auto &ValMapping = MapOfValueMappings[Hash];
-  ValMapping = std::make_unique<ValueMapping>(BreakDown, NumBreakDowns);
-  return *ValMapping;
-}
-
-template <typename Iterator>
-const RegisterBankInfo::ValueMapping *
-RegisterBankInfo::getOperandsMapping(Iterator Begin, Iterator End) const {
-
-  ++NumOperandsMappingsAccessed;
-
-  // The addresses of the value mapping are unique.
-  // Therefore, we can use them directly to hash the operand mapping.
-  hash_code Hash = hash_combine_range(Begin, End);
-  auto &Res = MapOfOperandsMappings[Hash];
-  if (Res)
-    return Res.get();
-
-  ++NumOperandsMappingsCreated;
-
-  // Create the array of ValueMapping.
-  // Note: this array will not hash to this instance of operands
-  // mapping, because we use the pointer of the ValueMapping
-  // to hash and we expect them to uniquely identify an instance
-  // of value mapping.
-  Res = std::make_unique<ValueMapping[]>(std::distance(Begin, End));
-  unsigned Idx = 0;
-  for (Iterator It = Begin; It != End; ++It, ++Idx) {
-    const ValueMapping *ValMap = *It;
-    if (!ValMap)
-      continue;
-    Res[Idx] = *ValMap;
-  }
-  return Res.get();
-}
-
-const RegisterBankInfo::ValueMapping *RegisterBankInfo::getOperandsMapping(
-    const SmallVectorImpl<const RegisterBankInfo::ValueMapping *> &OpdsMapping)
-    const {
-  return getOperandsMapping(OpdsMapping.begin(), OpdsMapping.end());
-}
-
-const RegisterBankInfo::ValueMapping *RegisterBankInfo::getOperandsMapping(
-    std::initializer_list<const RegisterBankInfo::ValueMapping *> OpdsMapping)
-    const {
-  return getOperandsMapping(OpdsMapping.begin(), OpdsMapping.end());
-}
-
-static hash_code
-hashInstructionMapping(unsigned ID, unsigned Cost,
-                       const RegisterBankInfo::ValueMapping *OperandsMapping,
-                       unsigned NumOperands) {
-  return hash_combine(ID, Cost, OperandsMapping, NumOperands);
-}
-
-const RegisterBankInfo::InstructionMapping &
-RegisterBankInfo::getInstructionMappingImpl(
-    bool IsInvalid, unsigned ID, unsigned Cost,
-    const RegisterBankInfo::ValueMapping *OperandsMapping,
-    unsigned NumOperands) const {
-  assert(((IsInvalid && ID == InvalidMappingID && Cost == 0 &&
-           OperandsMapping == nullptr && NumOperands == 0) ||
-          !IsInvalid) &&
-         "Mismatch argument for invalid input");
-  ++NumInstructionMappingsAccessed;
-
-  hash_code Hash =
-      hashInstructionMapping(ID, Cost, OperandsMapping, NumOperands);
-  const auto &It = MapOfInstructionMappings.find(Hash);
-  if (It != MapOfInstructionMappings.end())
-    return *It->second;
-
-  ++NumInstructionMappingsCreated;
-
-  auto &InstrMapping = MapOfInstructionMappings[Hash];
-  InstrMapping = std::make_unique<InstructionMapping>(
-      ID, Cost, OperandsMapping, NumOperands);
-  return *InstrMapping;
-}
-
-const RegisterBankInfo::InstructionMapping &
-RegisterBankInfo::getInstrMapping(const MachineInstr &MI) const {
-  const RegisterBankInfo::InstructionMapping &Mapping = getInstrMappingImpl(MI);
-  if (Mapping.isValid())
-    return Mapping;
-  llvm_unreachable("The target must implement this");
-}
-
-RegisterBankInfo::InstructionMappings
-RegisterBankInfo::getInstrPossibleMappings(const MachineInstr &MI) const {
-  InstructionMappings PossibleMappings;
-  const auto &Mapping = getInstrMapping(MI);
-  if (Mapping.isValid()) {
-    // Put the default mapping first.
-    PossibleMappings.push_back(&Mapping);
-  }
-
-  // Then the alternative mapping, if any.
-  InstructionMappings AltMappings = getInstrAlternativeMappings(MI);
-  append_range(PossibleMappings, AltMappings);
-#ifndef NDEBUG
-  for (const InstructionMapping *Mapping : PossibleMappings)
-    assert(Mapping->verify(MI) && "Mapping is invalid");
-#endif
-  return PossibleMappings;
-}
-
-RegisterBankInfo::InstructionMappings
-RegisterBankInfo::getInstrAlternativeMappings(const MachineInstr &MI) const {
-  // No alternative for MI.
-  return InstructionMappings();
-}
-
-void RegisterBankInfo::applyDefaultMapping(const OperandsMapper &OpdMapper) {
-  MachineInstr &MI = OpdMapper.getMI();
-  MachineRegisterInfo &MRI = OpdMapper.getMRI();
-  LLVM_DEBUG(dbgs() << "Applying default-like mapping\n");
-  for (unsigned OpIdx = 0,
-                EndIdx = OpdMapper.getInstrMapping().getNumOperands();
-       OpIdx != EndIdx; ++OpIdx) {
-    LLVM_DEBUG(dbgs() << "OpIdx " << OpIdx);
-    MachineOperand &MO = MI.getOperand(OpIdx);
-    if (!MO.isReg()) {
-      LLVM_DEBUG(dbgs() << " is not a register, nothing to be done\n");
-      continue;
-    }
-    if (!MO.getReg()) {
-      LLVM_DEBUG(dbgs() << " is $noreg, nothing to be done\n");
-      continue;
-    }
-    assert(OpdMapper.getInstrMapping().getOperandMapping(OpIdx).NumBreakDowns !=
-               0 &&
-           "Invalid mapping");
-    assert(OpdMapper.getInstrMapping().getOperandMapping(OpIdx).NumBreakDowns ==
-               1 &&
-           "This mapping is too complex for this function");
-    iterator_range<SmallVectorImpl<Register>::const_iterator> NewRegs =
-        OpdMapper.getVRegs(OpIdx);
-    if (NewRegs.empty()) {
-      LLVM_DEBUG(dbgs() << " has not been repaired, nothing to be done\n");
-      continue;
-    }
-    Register OrigReg = MO.getReg();
-    Register NewReg = *NewRegs.begin();
-    LLVM_DEBUG(dbgs() << " changed, replace " << printReg(OrigReg, nullptr));
-    MO.setReg(NewReg);
-    LLVM_DEBUG(dbgs() << " with " << printReg(NewReg, nullptr));
-
-    // The OperandsMapper creates plain scalar, we may have to fix that.
-    // Check if the types match and if not, fix that.
-    LLT OrigTy = MRI.getType(OrigReg);
-    LLT NewTy = MRI.getType(NewReg);
-    if (OrigTy != NewTy) {
-      // The default mapping is not supposed to change the size of
-      // the storage. However, right now we don't necessarily bump all
-      // the types to storage size. For instance, we can consider
-      // s16 G_AND legal whereas the storage size is going to be 32.
-      assert(OrigTy.getSizeInBits() <= NewTy.getSizeInBits() &&
-             "Types with difference size cannot be handled by the default "
-             "mapping");
-      LLVM_DEBUG(dbgs() << "\nChange type of new opd from " << NewTy << " to "
-                        << OrigTy);
-      MRI.setType(NewReg, OrigTy);
-    }
-    LLVM_DEBUG(dbgs() << '\n');
-  }
-}
-
-unsigned RegisterBankInfo::getSizeInBits(Register Reg,
-                                         const MachineRegisterInfo &MRI,
-                                         const TargetRegisterInfo &TRI) const {
-  if (Register::isPhysicalRegister(Reg)) {
-    // The size is not directly available for physical registers.
-    // Instead, we need to access a register class that contains Reg and
-    // get the size of that register class.
-    // Because this is expensive, we'll cache the register class by calling
-    auto *RC = &getMinimalPhysRegClass(Reg, TRI);
-    assert(RC && "Expecting Register class");
-    return TRI.getRegSizeInBits(*RC);
-  }
-  return TRI.getRegSizeInBits(Reg, MRI);
-}
-
-//------------------------------------------------------------------------------
-// Helper classes implementation.
-//------------------------------------------------------------------------------
-#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
-LLVM_DUMP_METHOD void RegisterBankInfo::PartialMapping::dump() const {
-  print(dbgs());
-  dbgs() << '\n';
-}
-#endif
-
-bool RegisterBankInfo::PartialMapping::verify() const {
-  assert(RegBank && "Register bank not set");
-  assert(Length && "Empty mapping");
-  assert((StartIdx <= getHighBitIdx()) && "Overflow, switch to APInt?");
-  // Check if the minimum width fits into RegBank.
-  assert(RegBank->getSize() >= Length && "Register bank too small for Mask");
-  return true;
-}
-
-void RegisterBankInfo::PartialMapping::print(raw_ostream &OS) const {
-  OS << "[" << StartIdx << ", " << getHighBitIdx() << "], RegBank = ";
-  if (RegBank)
-    OS << *RegBank;
-  else
-    OS << "nullptr";
-}
-
-bool RegisterBankInfo::ValueMapping::partsAllUniform() const {
-  if (NumBreakDowns < 2)
-    return true;
-
-  const PartialMapping *First = begin();
-  for (const PartialMapping *Part = First + 1; Part != end(); ++Part) {
-    if (Part->Length != First->Length || Part->RegBank != First->RegBank)
-      return false;
-  }
-
-  return true;
-}
-
-bool RegisterBankInfo::ValueMapping::verify(unsigned MeaningfulBitWidth) const {
-  assert(NumBreakDowns && "Value mapped nowhere?!");
-  unsigned OrigValueBitWidth = 0;
-  for (const RegisterBankInfo::PartialMapping &PartMap : *this) {
-    // Check that each register bank is big enough to hold the partial value:
-    // this check is done by PartialMapping::verify
-    assert(PartMap.verify() && "Partial mapping is invalid");
-    // The original value should completely be mapped.
-    // Thus the maximum accessed index + 1 is the size of the original value.
-    OrigValueBitWidth =
-        std::max(OrigValueBitWidth, PartMap.getHighBitIdx() + 1);
-  }
-  assert(OrigValueBitWidth >= MeaningfulBitWidth &&
-         "Meaningful bits not covered by the mapping");
-  APInt ValueMask(OrigValueBitWidth, 0);
-  for (const RegisterBankInfo::PartialMapping &PartMap : *this) {
-    // Check that the union of the partial mappings covers the whole value,
-    // without overlaps.
-    // The high bit is exclusive in the APInt API, thus getHighBitIdx + 1.
-    APInt PartMapMask = APInt::getBitsSet(OrigValueBitWidth, PartMap.StartIdx,
-                                          PartMap.getHighBitIdx() + 1);
-    ValueMask ^= PartMapMask;
-    assert((ValueMask & PartMapMask) == PartMapMask &&
-           "Some partial mappings overlap");
-  }
-  assert(ValueMask.isAllOnesValue() && "Value is not fully mapped");
-  return true;
-}
-
-#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
-LLVM_DUMP_METHOD void RegisterBankInfo::ValueMapping::dump() const {
-  print(dbgs());
-  dbgs() << '\n';
-}
-#endif
-
-void RegisterBankInfo::ValueMapping::print(raw_ostream &OS) const {
-  OS << "#BreakDown: " << NumBreakDowns << " ";
-  bool IsFirst = true;
-  for (const PartialMapping &PartMap : *this) {
-    if (!IsFirst)
-      OS << ", ";
-    OS << '[' << PartMap << ']';
-    IsFirst = false;
-  }
-}
-
-bool RegisterBankInfo::InstructionMapping::verify(
-    const MachineInstr &MI) const {
-  // Check that all the register operands are properly mapped.
-  // Check the constructor invariant.
-  // For PHI, we only care about mapping the definition.
-  assert(NumOperands == (isCopyLike(MI) ? 1 : MI.getNumOperands()) &&
-         "NumOperands must match, see constructor");
-  assert(MI.getParent() && MI.getMF() &&
-         "MI must be connected to a MachineFunction");
-  const MachineFunction &MF = *MI.getMF();
-  const RegisterBankInfo *RBI = MF.getSubtarget().getRegBankInfo();
-  (void)RBI;
-
-  for (unsigned Idx = 0; Idx < NumOperands; ++Idx) {
-    const MachineOperand &MO = MI.getOperand(Idx);
-    if (!MO.isReg()) {
-      assert(!getOperandMapping(Idx).isValid() &&
-             "We should not care about non-reg mapping");
-      continue;
-    }
-    Register Reg = MO.getReg();
-    if (!Reg)
-      continue;
-    assert(getOperandMapping(Idx).isValid() &&
-           "We must have a mapping for reg operands");
-    const RegisterBankInfo::ValueMapping &MOMapping = getOperandMapping(Idx);
-    (void)MOMapping;
-    // Register size in bits.
-    // This size must match what the mapping expects.
-    assert(MOMapping.verify(RBI->getSizeInBits(
-               Reg, MF.getRegInfo(), *MF.getSubtarget().getRegisterInfo())) &&
-           "Value mapping is invalid");
-  }
-  return true;
-}
-
-#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
-LLVM_DUMP_METHOD void RegisterBankInfo::InstructionMapping::dump() const {
-  print(dbgs());
-  dbgs() << '\n';
-}
-#endif
-
-void RegisterBankInfo::InstructionMapping::print(raw_ostream &OS) const {
-  OS << "ID: " << getID() << " Cost: " << getCost() << " Mapping: ";
-
-  for (unsigned OpIdx = 0; OpIdx != NumOperands; ++OpIdx) {
-    const ValueMapping &ValMapping = getOperandMapping(OpIdx);
-    if (OpIdx)
-      OS << ", ";
-    OS << "{ Idx: " << OpIdx << " Map: " << ValMapping << '}';
-  }
-}
-
-const int RegisterBankInfo::OperandsMapper::DontKnowIdx = -1;
-
-RegisterBankInfo::OperandsMapper::OperandsMapper(
-    MachineInstr &MI, const InstructionMapping &InstrMapping,
-    MachineRegisterInfo &MRI)
-    : MRI(MRI), MI(MI), InstrMapping(InstrMapping) {
-  unsigned NumOpds = InstrMapping.getNumOperands();
-  OpToNewVRegIdx.resize(NumOpds, OperandsMapper::DontKnowIdx);
-  assert(InstrMapping.verify(MI) && "Invalid mapping for MI");
-}
-
-iterator_range<SmallVectorImpl<Register>::iterator>
-RegisterBankInfo::OperandsMapper::getVRegsMem(unsigned OpIdx) {
-  assert(OpIdx < getInstrMapping().getNumOperands() && "Out-of-bound access");
-  unsigned NumPartialVal =
-      getInstrMapping().getOperandMapping(OpIdx).NumBreakDowns;
-  int StartIdx = OpToNewVRegIdx[OpIdx];
-
-  if (StartIdx == OperandsMapper::DontKnowIdx) {
-    // This is the first time we try to access OpIdx.
-    // Create the cells that will hold all the partial values at the
-    // end of the list of NewVReg.
-    StartIdx = NewVRegs.size();
-    OpToNewVRegIdx[OpIdx] = StartIdx;
-    for (unsigned i = 0; i < NumPartialVal; ++i)
-      NewVRegs.push_back(0);
-  }
-  SmallVectorImpl<Register>::iterator End =
-      getNewVRegsEnd(StartIdx, NumPartialVal);
-
-  return make_range(&NewVRegs[StartIdx], End);
-}
-
-SmallVectorImpl<Register>::const_iterator
-RegisterBankInfo::OperandsMapper::getNewVRegsEnd(unsigned StartIdx,
-                                                 unsigned NumVal) const {
-  return const_cast<OperandsMapper *>(this)->getNewVRegsEnd(StartIdx, NumVal);
-}
-SmallVectorImpl<Register>::iterator
-RegisterBankInfo::OperandsMapper::getNewVRegsEnd(unsigned StartIdx,
-                                                 unsigned NumVal) {
-  assert((NewVRegs.size() == StartIdx + NumVal ||
-          NewVRegs.size() > StartIdx + NumVal) &&
-         "NewVRegs too small to contain all the partial mapping");
-  return NewVRegs.size() <= StartIdx + NumVal ? NewVRegs.end()
-                                              : &NewVRegs[StartIdx + NumVal];
-}
-
-void RegisterBankInfo::OperandsMapper::createVRegs(unsigned OpIdx) {
-  assert(OpIdx < getInstrMapping().getNumOperands() && "Out-of-bound access");
-  iterator_range<SmallVectorImpl<Register>::iterator> NewVRegsForOpIdx =
-      getVRegsMem(OpIdx);
-  const ValueMapping &ValMapping = getInstrMapping().getOperandMapping(OpIdx);
-  const PartialMapping *PartMap = ValMapping.begin();
-  for (Register &NewVReg : NewVRegsForOpIdx) {
-    assert(PartMap != ValMapping.end() && "Out-of-bound access");
-    assert(NewVReg == 0 && "Register has already been created");
-    // The new registers are always bound to scalar with the right size.
-    // The actual type has to be set when the target does the mapping
-    // of the instruction.
-    // The rationale is that this generic code cannot guess how the
-    // target plans to split the input type.
-    NewVReg = MRI.createGenericVirtualRegister(LLT::scalar(PartMap->Length));
-    MRI.setRegBank(NewVReg, *PartMap->RegBank);
-    ++PartMap;
-  }
-}
-
-void RegisterBankInfo::OperandsMapper::setVRegs(unsigned OpIdx,
-                                                unsigned PartialMapIdx,
-                                                Register NewVReg) {
-  assert(OpIdx < getInstrMapping().getNumOperands() && "Out-of-bound access");
-  assert(getInstrMapping().getOperandMapping(OpIdx).NumBreakDowns >
-             PartialMapIdx &&
-         "Out-of-bound access for partial mapping");
-  // Make sure the memory is initialized for that operand.
-  (void)getVRegsMem(OpIdx);
-  assert(NewVRegs[OpToNewVRegIdx[OpIdx] + PartialMapIdx] == 0 &&
-         "This value is already set");
-  NewVRegs[OpToNewVRegIdx[OpIdx] + PartialMapIdx] = NewVReg;
-}
-
-iterator_range<SmallVectorImpl<Register>::const_iterator>
-RegisterBankInfo::OperandsMapper::getVRegs(unsigned OpIdx,
-                                           bool ForDebug) const {
-  (void)ForDebug;
-  assert(OpIdx < getInstrMapping().getNumOperands() && "Out-of-bound access");
-  int StartIdx = OpToNewVRegIdx[OpIdx];
-
-  if (StartIdx == OperandsMapper::DontKnowIdx)
-    return make_range(NewVRegs.end(), NewVRegs.end());
-
-  unsigned PartMapSize =
-      getInstrMapping().getOperandMapping(OpIdx).NumBreakDowns;
-  SmallVectorImpl<Register>::const_iterator End =
-      getNewVRegsEnd(StartIdx, PartMapSize);
-  iterator_range<SmallVectorImpl<Register>::const_iterator> Res =
-      make_range(&NewVRegs[StartIdx], End);
-#ifndef NDEBUG
-  for (Register VReg : Res)
-    assert((VReg || ForDebug) && "Some registers are uninitialized");
-#endif
-  return Res;
-}
-
-#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
-LLVM_DUMP_METHOD void RegisterBankInfo::OperandsMapper::dump() const {
-  print(dbgs(), true);
-  dbgs() << '\n';
-}
-#endif
-
-void RegisterBankInfo::OperandsMapper::print(raw_ostream &OS,
-                                             bool ForDebug) const {
-  unsigned NumOpds = getInstrMapping().getNumOperands();
-  if (ForDebug) {
-    OS << "Mapping for " << getMI() << "\nwith " << getInstrMapping() << '\n';
-    // Print out the internal state of the index table.
-    OS << "Populated indices (CellNumber, IndexInNewVRegs): ";
-    bool IsFirst = true;
-    for (unsigned Idx = 0; Idx != NumOpds; ++Idx) {
-      if (OpToNewVRegIdx[Idx] != DontKnowIdx) {
-        if (!IsFirst)
-          OS << ", ";
-        OS << '(' << Idx << ", " << OpToNewVRegIdx[Idx] << ')';
-        IsFirst = false;
-      }
-    }
-    OS << '\n';
-  } else
-    OS << "Mapping ID: " << getInstrMapping().getID() << ' ';
-
-  OS << "Operand Mapping: ";
-  // If we have a function, we can pretty print the name of the registers.
-  // Otherwise we will print the raw numbers.
-  const TargetRegisterInfo *TRI =
-      getMI().getParent() && getMI().getMF()
-          ? getMI().getMF()->getSubtarget().getRegisterInfo()
-          : nullptr;
-  bool IsFirst = true;
-  for (unsigned Idx = 0; Idx != NumOpds; ++Idx) {
-    if (OpToNewVRegIdx[Idx] == DontKnowIdx)
-      continue;
-    if (!IsFirst)
-      OS << ", ";
-    IsFirst = false;
-    OS << '(' << printReg(getMI().getOperand(Idx).getReg(), TRI) << ", [";
-    bool IsFirstNewVReg = true;
-    for (Register VReg : getVRegs(Idx)) {
-      if (!IsFirstNewVReg)
-        OS << ", ";
-      IsFirstNewVReg = false;
-      OS << printReg(VReg, TRI);
-    }
-    OS << "])";
-  }
-}
diff --git a/gnu/llvm/llvm/lib/CodeGen/PrologEpilogInserter.cpp b/gnu/llvm/llvm/lib/CodeGen/PrologEpilogInserter.cpp
index 4a32b7802d9..89a45a83f96 100644
--- a/gnu/llvm/llvm/lib/CodeGen/PrologEpilogInserter.cpp
+++ b/gnu/llvm/llvm/lib/CodeGen/PrologEpilogInserter.cpp
@@ -55,10 +55,9 @@
 #include "llvm/MC/MCRegisterInfo.h"
 #include "llvm/Pass.h"
 #include "llvm/Support/CodeGen.h"
-#include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/ErrorHandling.h"
-#include "llvm/Support/MathExtras.h"
+#include "llvm/Support/FormatVariadic.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetOptions.h"
@@ -129,7 +128,19 @@ private:
   void replaceFrameIndices(MachineFunction &MF);
   void replaceFrameIndices(MachineBasicBlock *BB, MachineFunction &MF,
                            int &SPAdj);
+  // Frame indices in debug values are encoded in a target independent
+  // way with simply the frame index and offset rather than any
+  // target-specific addressing mode.
+  bool replaceFrameIndexDebugInstr(MachineFunction &MF, MachineInstr &MI,
+                                   unsigned OpIdx, int SPAdj = 0);
+  // Does same as replaceFrameIndices but using the backward MIR walk and
+  // backward register scavenger walk. Does not yet support call sequence
+  // processing.
+  void replaceFrameIndicesBackward(MachineBasicBlock *BB, MachineFunction &MF,
+                                   int &SPAdj);
+
   void insertPrologEpilogCode(MachineFunction &MF);
+  void insertZeroCallUsedRegs(MachineFunction &MF);
 };
 
 } // end anonymous namespace
@@ -292,10 +303,35 @@ bool PEI::runOnMachineFunction(MachineFunction &MF) {
     assert(!Failed && "Invalid warn-stack-size fn attr value");
     (void)Failed;
   }
+  uint64_t UnsafeStackSize = MFI.getUnsafeStackSize();
+  if (MF.getFunction().hasFnAttribute(Attribute::SafeStack))
+    StackSize += UnsafeStackSize;
+
   if (StackSize > Threshold) {
-    DiagnosticInfoStackSize DiagStackSize(F, StackSize, DS_Warning, Threshold);
+    DiagnosticInfoStackSize DiagStackSize(F, StackSize, Threshold, DS_Warning);
     F.getContext().diagnose(DiagStackSize);
+    int64_t SpillSize = 0;
+    for (int Idx = MFI.getObjectIndexBegin(), End = MFI.getObjectIndexEnd();
+         Idx != End; ++Idx) {
+      if (MFI.isSpillSlotObjectIndex(Idx))
+        SpillSize += MFI.getObjectSize(Idx);
+    }
+
+    float SpillPct =
+        static_cast<float>(SpillSize) / static_cast<float>(StackSize);
+    float VarPct = 1.0f - SpillPct;
+    int64_t VariableSize = StackSize - SpillSize;
+    dbgs() << formatv("{0}/{1} ({3:P}) spills, {2}/{1} ({4:P}) variables",
+                      SpillSize, StackSize, VariableSize, SpillPct, VarPct);
+    if (UnsafeStackSize != 0) {
+      float UnsafePct =
+          static_cast<float>(UnsafeStackSize) / static_cast<float>(StackSize);
+      dbgs() << formatv(", {0}/{2} ({1:P}) unsafe stack", UnsafeStackSize,
+                        UnsafePct, StackSize);
+    }
+    dbgs() << "\n";
   }
+
   ORE->emit([&]() {
     return MachineOptimizationRemarkAnalysis(DEBUG_TYPE, "StackSize",
                                              MF.getFunction().getSubprogram(),
@@ -419,12 +455,28 @@ static void assignCalleeSavedSpillSlots(MachineFunction &F,
 
   const TargetRegisterInfo *RegInfo = F.getSubtarget().getRegisterInfo();
   const MCPhysReg *CSRegs = F.getRegInfo().getCalleeSavedRegs();
+  BitVector CSMask(SavedRegs.size());
+
+  for (unsigned i = 0; CSRegs[i]; ++i)
+    CSMask.set(CSRegs[i]);
 
   std::vector<CalleeSavedInfo> CSI;
   for (unsigned i = 0; CSRegs[i]; ++i) {
     unsigned Reg = CSRegs[i];
-    if (SavedRegs.test(Reg))
-      CSI.push_back(CalleeSavedInfo(Reg));
+    if (SavedRegs.test(Reg)) {
+      bool SavedSuper = false;
+      for (const MCPhysReg &SuperReg : RegInfo->superregs(Reg)) {
+        // Some backends set all aliases for some registers as saved, such as
+        // Mips's $fp, so they appear in SavedRegs but not CSRegs.
+        if (SavedRegs.test(SuperReg) && CSMask.test(SuperReg)) {
+          SavedSuper = true;
+          break;
+        }
+      }
+
+      if (!SavedSuper)
+        CSI.push_back(CalleeSavedInfo(Reg));
+    }
   }
 
   const TargetFrameLowering *TFI = F.getSubtarget().getFrameLowering();
@@ -539,9 +591,9 @@ static void updateLiveness(MachineFunction &MF) {
   const std::vector<CalleeSavedInfo> &CSI = MFI.getCalleeSavedInfo();
 
   MachineRegisterInfo &MRI = MF.getRegInfo();
-  for (unsigned i = 0, e = CSI.size(); i != e; ++i) {
+  for (const CalleeSavedInfo &I : CSI) {
     for (MachineBasicBlock *MBB : Visited) {
-      MCPhysReg Reg = CSI[i].getReg();
+      MCPhysReg Reg = I.getReg();
       // Add the callee-saved register as live-in.
       // It's killed at the spill.
       if (!MRI.isReserved(Reg) && !MBB->isLiveIn(Reg))
@@ -552,20 +604,19 @@ static void updateLiveness(MachineFunction &MF) {
     // each MBB between the prologue and epilogue so that it is not clobbered
     // before it is reloaded in the epilogue. The Visited set contains all
     // blocks outside of the region delimited by prologue/epilogue.
-    if (CSI[i].isSpilledToReg()) {
+    if (I.isSpilledToReg()) {
       for (MachineBasicBlock &MBB : MF) {
         if (Visited.count(&MBB))
           continue;
-        MCPhysReg DstReg = CSI[i].getDstReg();
+        MCPhysReg DstReg = I.getDstReg();
         if (!MBB.isLiveIn(DstReg))
           MBB.addLiveIn(DstReg);
       }
     }
   }
-
 }
 
-/// Insert restore code for the callee-saved registers used in the function.
+/// Insert spill code for the callee-saved registers used in the function.
 static void insertCSRSaves(MachineBasicBlock &SaveBlock,
                            ArrayRef<CalleeSavedInfo> CSI) {
   MachineFunction &MF = *SaveBlock.getParent();
@@ -586,7 +637,7 @@ static void insertCSRSaves(MachineBasicBlock &SaveBlock,
       } else {
         const TargetRegisterClass *RC = TRI->getMinimalPhysRegClass(Reg);
         TII.storeRegToStackSlot(SaveBlock, I, Reg, true, CS.getFrameIdx(), RC,
-                                TRI);
+                                TRI, Register());
       }
     }
   }
@@ -612,7 +663,8 @@ static void insertCSRRestores(MachineBasicBlock &RestoreBlock,
           .addReg(CI.getDstReg(), getKillRegState(true));
       } else {
         const TargetRegisterClass *RC = TRI->getMinimalPhysRegClass(Reg);
-        TII.loadRegFromStackSlot(RestoreBlock, I, Reg, CI.getFrameIdx(), RC, TRI);
+        TII.loadRegFromStackSlot(RestoreBlock, I, Reg, CI.getFrameIdx(), RC,
+                                 TRI, Register());
         assert(I != RestoreBlock.begin() &&
                "loadRegFromStackSlot didn't insert any code!");
         // Insert in reverse order.  loadRegFromStackSlot can insert
@@ -850,8 +902,8 @@ void PEI::calculateFrameObjectOffsets(MachineFunction &MF) {
   // Adjust 'Offset' to point to the end of last fixed sized preallocated
   // object.
   for (int i = MFI.getObjectIndexBegin(); i != 0; ++i) {
-    if (MFI.getStackID(i) !=
-        TargetStackID::Default) // Only allocate objects on the default stack.
+    // Only allocate objects on the default stack.
+    if (MFI.getStackID(i) != TargetStackID::Default)
       continue;
 
     int64_t FixedOff;
@@ -868,55 +920,40 @@ void PEI::calculateFrameObjectOffsets(MachineFunction &MF) {
     if (FixedOff > Offset) Offset = FixedOff;
   }
 
+  Align MaxAlign = MFI.getMaxAlign();
   // First assign frame offsets to stack objects that are used to spill
   // callee saved registers.
-  if (StackGrowsDown && MaxCSFrameIndex >= MinCSFrameIndex) {
-    for (unsigned i = MinCSFrameIndex; i <= MaxCSFrameIndex; ++i) {
-      if (MFI.getStackID(i) !=
-          TargetStackID::Default) // Only allocate objects on the default stack.
-        continue;
+  if (MaxCSFrameIndex >= MinCSFrameIndex) {
+    for (unsigned i = 0; i <= MaxCSFrameIndex - MinCSFrameIndex; ++i) {
+      unsigned FrameIndex =
+          StackGrowsDown ? MinCSFrameIndex + i : MaxCSFrameIndex - i;
 
-      // If the stack grows down, we need to add the size to find the lowest
-      // address of the object.
-      Offset += MFI.getObjectSize(i);
-
-      // Adjust to alignment boundary
-      Offset = alignTo(Offset, MFI.getObjectAlign(i), Skew);
-
-      LLVM_DEBUG(dbgs() << "alloc FI(" << i << ") at SP[" << -Offset << "]\n");
-      MFI.setObjectOffset(i, -Offset);        // Set the computed offset
-    }
-  } else if (MaxCSFrameIndex >= MinCSFrameIndex) {
-    // Be careful about underflow in comparisons agains MinCSFrameIndex.
-    for (unsigned i = MaxCSFrameIndex; i != MinCSFrameIndex - 1; --i) {
-      if (MFI.getStackID(i) !=
-          TargetStackID::Default) // Only allocate objects on the default stack.
+      // Only allocate objects on the default stack.
+      if (MFI.getStackID(FrameIndex) != TargetStackID::Default)
         continue;
 
-      if (MFI.isDeadObjectIndex(i))
+      // TODO: should this just be if (MFI.isDeadObjectIndex(FrameIndex))
+      if (!StackGrowsDown && MFI.isDeadObjectIndex(FrameIndex))
         continue;
 
-      // Adjust to alignment boundary
-      Offset = alignTo(Offset, MFI.getObjectAlign(i), Skew);
-
-      LLVM_DEBUG(dbgs() << "alloc FI(" << i << ") at SP[" << Offset << "]\n");
-      MFI.setObjectOffset(i, Offset);
-      Offset += MFI.getObjectSize(i);
+      AdjustStackOffset(MFI, FrameIndex, StackGrowsDown, Offset, MaxAlign,
+                        Skew);
     }
   }
 
+  assert(MaxAlign == MFI.getMaxAlign() &&
+         "MFI.getMaxAlign should already account for all callee-saved "
+         "registers without a fixed stack slot");
+
   // FixedCSEnd is the stack offset to the end of the fixed and callee-save
   // stack area.
   int64_t FixedCSEnd = Offset;
-  Align MaxAlign = MFI.getMaxAlign();
 
   // Make sure the special register scavenging spill slot is closest to the
   // incoming stack pointer if a frame pointer is required and is closer
   // to the incoming rather than the final stack pointer.
   const TargetRegisterInfo *RegInfo = MF.getSubtarget().getRegisterInfo();
-  bool EarlyScavengingSlots = (TFI.hasFP(MF) && TFI.isFPCloseToIncomingSP() &&
-                               RegInfo->useFPForScavengingIndex(MF) &&
-                               !RegInfo->hasStackRealignment(MF));
+  bool EarlyScavengingSlots = TFI.allocateScavengingFrameIndexesNearIncomingSP(MF);
   if (RS && EarlyScavengingSlots) {
     SmallVector<int, 2> SFIs;
     RS->getScavengingFrameIndices(SFIs);
@@ -968,12 +1005,22 @@ void PEI::calculateFrameObjectOffsets(MachineFunction &MF) {
     // LocalStackSlotPass didn't already allocate a slot for it.
     // If we are told to use the LocalStackAllocationBlock, the stack protector
     // is expected to be already pre-allocated.
-    if (!MFI.getUseLocalStackAllocationBlock())
+    if (MFI.getStackID(StackProtectorFI) != TargetStackID::Default) {
+      // If the stack protector isn't on the default stack then it's up to the
+      // target to set the stack offset.
+      assert(MFI.getObjectOffset(StackProtectorFI) != 0 &&
+             "Offset of stack protector on non-default stack expected to be "
+             "already set.");
+      assert(!MFI.isObjectPreAllocated(MFI.getStackProtectorIndex()) &&
+             "Stack protector on non-default stack expected to not be "
+             "pre-allocated by LocalStackSlotPass.");
+    } else if (!MFI.getUseLocalStackAllocationBlock()) {
       AdjustStackOffset(MFI, StackProtectorFI, StackGrowsDown, Offset, MaxAlign,
                         Skew);
-    else if (!MFI.isObjectPreAllocated(MFI.getStackProtectorIndex()))
+    } else if (!MFI.isObjectPreAllocated(MFI.getStackProtectorIndex())) {
       llvm_unreachable(
           "Stack protector not pre-allocated by LocalStackSlotPass.");
+    }
 
     // Assign large stack objects first.
     for (unsigned i = 0, e = MFI.getObjectIndexEnd(); i != e; ++i) {
@@ -987,8 +1034,8 @@ void PEI::calculateFrameObjectOffsets(MachineFunction &MF) {
         continue;
       if (StackProtectorFI == (int)i || EHRegNodeFrameIndex == (int)i)
         continue;
-      if (MFI.getStackID(i) !=
-          TargetStackID::Default) // Only allocate objects on the default stack.
+      // Only allocate objects on the default stack.
+      if (MFI.getStackID(i) != TargetStackID::Default)
         continue;
 
       switch (MFI.getObjectSSPLayout(i)) {
@@ -1041,8 +1088,8 @@ void PEI::calculateFrameObjectOffsets(MachineFunction &MF) {
       continue;
     if (ProtectedObjs.count(i))
       continue;
-    if (MFI.getStackID(i) !=
-        TargetStackID::Default) // Only allocate objects on the default stack.
+    // Only allocate objects on the default stack.
+    if (MFI.getStackID(i) != TargetStackID::Default)
       continue;
 
     // Add the objects that we need to allocate to our working set.
@@ -1150,6 +1197,9 @@ void PEI::insertPrologEpilogCode(MachineFunction &MF) {
   for (MachineBasicBlock *RestoreBlock : RestoreBlocks)
     TFI.emitEpilogue(MF, *RestoreBlock);
 
+  // Zero call used registers before restoring callee-saved registers.
+  insertZeroCallUsedRegs(MF);
+
   for (MachineBasicBlock *SaveBlock : SaveBlocks)
     TFI.inlineStackProbe(MF, *SaveBlock);
 
@@ -1160,11 +1210,7 @@ void PEI::insertPrologEpilogCode(MachineFunction &MF) {
   if (MF.shouldSplitStack()) {
     for (MachineBasicBlock *SaveBlock : SaveBlocks)
       TFI.adjustForSegmentedStacks(MF, *SaveBlock);
-    // Record that there are split-stack functions, so we will emit a
-    // special section to tell the linker.
-    MF.getMMI().setHasSplitStack(true);
-  } else
-    MF.getMMI().setHasNosplitStack(true);
+  }
 
   // Emit additional code that is required to explicitly handle the stack in
   // HiPE native code (if needed) when loaded in the Erlang/OTP runtime. The
@@ -1176,6 +1222,143 @@ void PEI::insertPrologEpilogCode(MachineFunction &MF) {
       TFI.adjustForHiPEPrologue(MF, *SaveBlock);
 }
 
+/// insertZeroCallUsedRegs - Zero out call used registers.
+void PEI::insertZeroCallUsedRegs(MachineFunction &MF) {
+  const Function &F = MF.getFunction();
+
+  if (!F.hasFnAttribute("zero-call-used-regs"))
+    return;
+
+  using namespace ZeroCallUsedRegs;
+
+  ZeroCallUsedRegsKind ZeroRegsKind =
+      StringSwitch<ZeroCallUsedRegsKind>(
+          F.getFnAttribute("zero-call-used-regs").getValueAsString())
+          .Case("skip", ZeroCallUsedRegsKind::Skip)
+          .Case("used-gpr-arg", ZeroCallUsedRegsKind::UsedGPRArg)
+          .Case("used-gpr", ZeroCallUsedRegsKind::UsedGPR)
+          .Case("used-arg", ZeroCallUsedRegsKind::UsedArg)
+          .Case("used", ZeroCallUsedRegsKind::Used)
+          .Case("all-gpr-arg", ZeroCallUsedRegsKind::AllGPRArg)
+          .Case("all-gpr", ZeroCallUsedRegsKind::AllGPR)
+          .Case("all-arg", ZeroCallUsedRegsKind::AllArg)
+          .Case("all", ZeroCallUsedRegsKind::All);
+
+  if (ZeroRegsKind == ZeroCallUsedRegsKind::Skip)
+    return;
+
+  const bool OnlyGPR = static_cast<unsigned>(ZeroRegsKind) & ONLY_GPR;
+  const bool OnlyUsed = static_cast<unsigned>(ZeroRegsKind) & ONLY_USED;
+  const bool OnlyArg = static_cast<unsigned>(ZeroRegsKind) & ONLY_ARG;
+
+  const TargetRegisterInfo &TRI = *MF.getSubtarget().getRegisterInfo();
+  const BitVector AllocatableSet(TRI.getAllocatableSet(MF));
+
+  // Mark all used registers.
+  BitVector UsedRegs(TRI.getNumRegs());
+  if (OnlyUsed)
+    for (const MachineBasicBlock &MBB : MF)
+      for (const MachineInstr &MI : MBB) {
+        // skip debug instructions
+        if (MI.isDebugInstr())
+          continue;
+
+        for (const MachineOperand &MO : MI.operands()) {
+          if (!MO.isReg())
+            continue;
+
+          MCRegister Reg = MO.getReg();
+          if (AllocatableSet[Reg] && !MO.isImplicit() &&
+              (MO.isDef() || MO.isUse()))
+            UsedRegs.set(Reg);
+        }
+      }
+
+  // Get a list of registers that are used.
+  BitVector LiveIns(TRI.getNumRegs());
+  for (const MachineBasicBlock::RegisterMaskPair &LI : MF.front().liveins())
+    LiveIns.set(LI.PhysReg);
+
+  BitVector RegsToZero(TRI.getNumRegs());
+  for (MCRegister Reg : AllocatableSet.set_bits()) {
+    // Skip over fixed registers.
+    if (TRI.isFixedRegister(MF, Reg))
+      continue;
+
+    // Want only general purpose registers.
+    if (OnlyGPR && !TRI.isGeneralPurposeRegister(MF, Reg))
+      continue;
+
+    // Want only used registers.
+    if (OnlyUsed && !UsedRegs[Reg])
+      continue;
+
+    // Want only registers used for arguments.
+    if (OnlyArg) {
+      if (OnlyUsed) {
+        if (!LiveIns[Reg])
+          continue;
+      } else if (!TRI.isArgumentRegister(MF, Reg)) {
+        continue;
+      }
+    }
+
+    RegsToZero.set(Reg);
+  }
+
+  // Don't clear registers that are live when leaving the function.
+  for (const MachineBasicBlock &MBB : MF)
+    for (const MachineInstr &MI : MBB.terminators()) {
+      if (!MI.isReturn())
+        continue;
+
+      for (const auto &MO : MI.operands()) {
+        if (!MO.isReg())
+          continue;
+
+        MCRegister Reg = MO.getReg();
+
+        // This picks up sibling registers (e.q. %al -> %ah).
+        for (MCRegUnitIterator Unit(Reg, &TRI); Unit.isValid(); ++Unit)
+          RegsToZero.reset(*Unit);
+
+        for (MCPhysReg SReg : TRI.sub_and_superregs_inclusive(Reg))
+          RegsToZero.reset(SReg);
+      }
+    }
+
+  // Don't need to clear registers that are used/clobbered by terminating
+  // instructions.
+  for (const MachineBasicBlock &MBB : MF) {
+    if (!MBB.isReturnBlock())
+      continue;
+
+    MachineBasicBlock::const_iterator MBBI = MBB.getFirstTerminator();
+    for (MachineBasicBlock::const_iterator I = MBBI, E = MBB.end(); I != E;
+         ++I) {
+      for (const MachineOperand &MO : I->operands()) {
+        if (!MO.isReg())
+          continue;
+
+        for (const MCPhysReg &Reg :
+             TRI.sub_and_superregs_inclusive(MO.getReg()))
+          RegsToZero.reset(Reg);
+      }
+    }
+  }
+
+  // Don't clear registers that must be preserved.
+  for (const MCPhysReg *CSRegs = TRI.getCalleeSavedRegs(&MF);
+       MCPhysReg CSReg = *CSRegs; ++CSRegs)
+    for (MCRegister Reg : TRI.sub_and_superregs_inclusive(CSReg))
+      RegsToZero.reset(Reg);
+
+  const TargetFrameLowering &TFI = *MF.getSubtarget().getFrameLowering();
+  for (MachineBasicBlock &MBB : MF)
+    if (MBB.isReturnBlock())
+      TFI.emitZeroCallUsedRegs(RegsToZero, MBB);
+}
+
 /// replaceFrameIndices - Replace all MO_FrameIndex operands with physical
 /// register references and actual offsets.
 void PEI::replaceFrameIndices(MachineFunction &MF) {
@@ -1221,6 +1404,154 @@ void PEI::replaceFrameIndices(MachineFunction &MF) {
   }
 }
 
+bool PEI::replaceFrameIndexDebugInstr(MachineFunction &MF, MachineInstr &MI,
+                                      unsigned OpIdx, int SPAdj) {
+  const TargetFrameLowering *TFI = MF.getSubtarget().getFrameLowering();
+  const TargetRegisterInfo &TRI = *MF.getSubtarget().getRegisterInfo();
+  if (MI.isDebugValue()) {
+
+    MachineOperand &Op = MI.getOperand(OpIdx);
+    assert(MI.isDebugOperand(&Op) &&
+           "Frame indices can only appear as a debug operand in a DBG_VALUE*"
+           " machine instruction");
+    Register Reg;
+    unsigned FrameIdx = Op.getIndex();
+    unsigned Size = MF.getFrameInfo().getObjectSize(FrameIdx);
+
+    StackOffset Offset = TFI->getFrameIndexReference(MF, FrameIdx, Reg);
+    Op.ChangeToRegister(Reg, false /*isDef*/);
+
+    const DIExpression *DIExpr = MI.getDebugExpression();
+
+    // If we have a direct DBG_VALUE, and its location expression isn't
+    // currently complex, then adding an offset will morph it into a
+    // complex location that is interpreted as being a memory address.
+    // This changes a pointer-valued variable to dereference that pointer,
+    // which is incorrect. Fix by adding DW_OP_stack_value.
+
+    if (MI.isNonListDebugValue()) {
+      unsigned PrependFlags = DIExpression::ApplyOffset;
+      if (!MI.isIndirectDebugValue() && !DIExpr->isComplex())
+        PrependFlags |= DIExpression::StackValue;
+
+      // If we have DBG_VALUE that is indirect and has a Implicit location
+      // expression need to insert a deref before prepending a Memory
+      // location expression. Also after doing this we change the DBG_VALUE
+      // to be direct.
+      if (MI.isIndirectDebugValue() && DIExpr->isImplicit()) {
+        SmallVector<uint64_t, 2> Ops = {dwarf::DW_OP_deref_size, Size};
+        bool WithStackValue = true;
+        DIExpr = DIExpression::prependOpcodes(DIExpr, Ops, WithStackValue);
+        // Make the DBG_VALUE direct.
+        MI.getDebugOffset().ChangeToRegister(0, false);
+      }
+      DIExpr = TRI.prependOffsetExpression(DIExpr, PrependFlags, Offset);
+    } else {
+      // The debug operand at DebugOpIndex was a frame index at offset
+      // `Offset`; now the operand has been replaced with the frame
+      // register, we must add Offset with `register x, plus Offset`.
+      unsigned DebugOpIndex = MI.getDebugOperandIndex(&Op);
+      SmallVector<uint64_t, 3> Ops;
+      TRI.getOffsetOpcodes(Offset, Ops);
+      DIExpr = DIExpression::appendOpsToArg(DIExpr, Ops, DebugOpIndex);
+    }
+    MI.getDebugExpressionOp().setMetadata(DIExpr);
+    return true;
+  }
+
+  if (MI.isDebugPHI()) {
+    // Allow stack ref to continue onwards.
+    return true;
+  }
+
+  // TODO: This code should be commoned with the code for
+  // PATCHPOINT. There's no good reason for the difference in
+  // implementation other than historical accident.  The only
+  // remaining difference is the unconditional use of the stack
+  // pointer as the base register.
+  if (MI.getOpcode() == TargetOpcode::STATEPOINT) {
+    assert((!MI.isDebugValue() || OpIdx == 0) &&
+           "Frame indicies can only appear as the first operand of a "
+           "DBG_VALUE machine instruction");
+    Register Reg;
+    MachineOperand &Offset = MI.getOperand(OpIdx + 1);
+    StackOffset refOffset = TFI->getFrameIndexReferencePreferSP(
+        MF, MI.getOperand(OpIdx).getIndex(), Reg, /*IgnoreSPUpdates*/ false);
+    assert(!refOffset.getScalable() &&
+           "Frame offsets with a scalable component are not supported");
+    Offset.setImm(Offset.getImm() + refOffset.getFixed() + SPAdj);
+    MI.getOperand(OpIdx).ChangeToRegister(Reg, false /*isDef*/);
+    return true;
+  }
+  return false;
+}
+
+void PEI::replaceFrameIndicesBackward(MachineBasicBlock *BB,
+                                      MachineFunction &MF, int &SPAdj) {
+  assert(MF.getSubtarget().getRegisterInfo() &&
+         "getRegisterInfo() must be implemented!");
+
+  const TargetRegisterInfo &TRI = *MF.getSubtarget().getRegisterInfo();
+
+  RS->enterBasicBlockEnd(*BB);
+
+  for (MachineInstr &MI : make_early_inc_range(reverse(*BB))) {
+
+    // Register scavenger backward step
+    MachineBasicBlock::iterator Step(MI);
+    for (unsigned i = 0; i != MI.getNumOperands(); ++i) {
+      if (!MI.getOperand(i).isFI())
+        continue;
+
+      if (replaceFrameIndexDebugInstr(MF, MI, i, SPAdj))
+        continue;
+
+      // If this instruction has a FrameIndex operand, we need to
+      // use that target machine register info object to eliminate
+      // it.
+
+      // TRI.eliminateFrameIndex may lower the frame index to a sequence of
+      // instructions. It also can remove/change instructions passed by the
+      // iterator and invalidate the iterator. We have to take care of this. For
+      // that we support two iterators: *Step* - points to the position up to
+      // which the scavenger should scan by the next iteration to have liveness
+      // information up to date. *Curr* - keeps track of the correct RS->MBBI -
+      // the scan start point. It points to the currently processed instruction
+      // right before the frame lowering.
+      //
+      // ITERATORS WORK AS FOLLOWS:
+      // *Step* is shifted one step back right before the frame lowering and
+      // one step forward right after it. No matter how many instructions were
+      // inserted, *Step* will be right after the position which is going to be
+      // processed in the next iteration, thus, in the correct position for the
+      // scavenger to go up to.
+      // *Curr* is shifted one step forward right before calling
+      // TRI.eliminateFrameIndex and one step backward after. Thus, we make sure
+      // it points right to the position that is the correct starting point for
+      // the scavenger to scan.
+      MachineBasicBlock::iterator Curr = ++RS->getCurrentPosition();
+
+      // Shift back
+      --Step;
+
+      bool Removed = TRI.eliminateFrameIndex(MI, SPAdj, i, RS);
+      // Restore to unify logic with a shift back that happens in the end of
+      // the outer loop.
+      ++Step;
+      RS->skipTo(--Curr);
+      if (Removed)
+        break;
+    }
+
+    // Shift it to make RS collect reg info up to the current instruction.
+    if (Step != BB->begin())
+      Step--;
+
+    // Update register states.
+    RS->backward(Step);
+  }
+}
+
 void PEI::replaceFrameIndices(MachineBasicBlock *BB, MachineFunction &MF,
                               int &SPAdj) {
   assert(MF.getSubtarget().getRegisterInfo() &&
@@ -1229,6 +1560,9 @@ void PEI::replaceFrameIndices(MachineBasicBlock *BB, MachineFunction &MF,
   const TargetRegisterInfo &TRI = *MF.getSubtarget().getRegisterInfo();
   const TargetFrameLowering *TFI = MF.getSubtarget().getFrameLowering();
 
+  if (RS && TRI.supportsBackwardScavenger())
+    return replaceFrameIndicesBackward(BB, MF, SPAdj);
+
   if (RS && FrameIndexEliminationScavenging)
     RS->enterBasicBlock(*BB);
 
@@ -1249,84 +1583,8 @@ void PEI::replaceFrameIndices(MachineBasicBlock *BB, MachineFunction &MF,
       if (!MI.getOperand(i).isFI())
         continue;
 
-      // Frame indices in debug values are encoded in a target independent
-      // way with simply the frame index and offset rather than any
-      // target-specific addressing mode.
-      if (MI.isDebugValue()) {
-        MachineOperand &Op = MI.getOperand(i);
-        assert(
-            MI.isDebugOperand(&Op) &&
-            "Frame indices can only appear as a debug operand in a DBG_VALUE*"
-            " machine instruction");
-        Register Reg;
-        unsigned FrameIdx = Op.getIndex();
-        unsigned Size = MF.getFrameInfo().getObjectSize(FrameIdx);
-
-        StackOffset Offset =
-            TFI->getFrameIndexReference(MF, FrameIdx, Reg);
-        Op.ChangeToRegister(Reg, false /*isDef*/);
-        Op.setIsDebug();
-
-        const DIExpression *DIExpr = MI.getDebugExpression();
-
-        // If we have a direct DBG_VALUE, and its location expression isn't
-        // currently complex, then adding an offset will morph it into a
-        // complex location that is interpreted as being a memory address.
-        // This changes a pointer-valued variable to dereference that pointer,
-        // which is incorrect. Fix by adding DW_OP_stack_value.
-
-        if (MI.isNonListDebugValue()) {
-          unsigned PrependFlags = DIExpression::ApplyOffset;
-          if (!MI.isIndirectDebugValue() && !DIExpr->isComplex())
-            PrependFlags |= DIExpression::StackValue;
-
-          // If we have DBG_VALUE that is indirect and has a Implicit location
-          // expression need to insert a deref before prepending a Memory
-          // location expression. Also after doing this we change the DBG_VALUE
-          // to be direct.
-          if (MI.isIndirectDebugValue() && DIExpr->isImplicit()) {
-            SmallVector<uint64_t, 2> Ops = {dwarf::DW_OP_deref_size, Size};
-            bool WithStackValue = true;
-            DIExpr = DIExpression::prependOpcodes(DIExpr, Ops, WithStackValue);
-            // Make the DBG_VALUE direct.
-            MI.getDebugOffset().ChangeToRegister(0, false);
-          }
-          DIExpr = TRI.prependOffsetExpression(DIExpr, PrependFlags, Offset);
-        } else {
-          // The debug operand at DebugOpIndex was a frame index at offset
-          // `Offset`; now the operand has been replaced with the frame
-          // register, we must add Offset with `register x, plus Offset`.
-          unsigned DebugOpIndex = MI.getDebugOperandIndex(&Op);
-          SmallVector<uint64_t, 3> Ops;
-          TRI.getOffsetOpcodes(Offset, Ops);
-          DIExpr = DIExpression::appendOpsToArg(DIExpr, Ops, DebugOpIndex);
-        }
-        MI.getDebugExpressionOp().setMetadata(DIExpr);
+      if (replaceFrameIndexDebugInstr(MF, MI, i, SPAdj))
         continue;
-      } else if (MI.isDebugPHI()) {
-        // Allow stack ref to continue onwards.
-        continue;
-      }
-
-      // TODO: This code should be commoned with the code for
-      // PATCHPOINT. There's no good reason for the difference in
-      // implementation other than historical accident.  The only
-      // remaining difference is the unconditional use of the stack
-      // pointer as the base register.
-      if (MI.getOpcode() == TargetOpcode::STATEPOINT) {
-        assert((!MI.isDebugValue() || i == 0) &&
-               "Frame indicies can only appear as the first operand of a "
-               "DBG_VALUE machine instruction");
-        Register Reg;
-        MachineOperand &Offset = MI.getOperand(i + 1);
-        StackOffset refOffset = TFI->getFrameIndexReferencePreferSP(
-            MF, MI.getOperand(i).getIndex(), Reg, /*IgnoreSPUpdates*/ false);
-        assert(!refOffset.getScalable() &&
-               "Frame offsets with a scalable component are not supported");
-        Offset.setImm(Offset.getImm() + refOffset.getFixed() + SPAdj);
-        MI.getOperand(i).ChangeToRegister(Reg, false /*isDef*/);
-        continue;
-      }
 
       // Some instructions (e.g. inline asm instructions) can have
       // multiple frame indices and/or cause eliminateFrameIndex
diff --git a/gnu/llvm/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/gnu/llvm/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
index dc245f0d7b1..d9cde609e59 100644
--- a/gnu/llvm/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
+++ b/gnu/llvm/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
@@ -20,8 +20,6 @@
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/IntervalMap.h"
-#include "llvm/ADT/None.h"
-#include "llvm/ADT/Optional.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SetVector.h"
 #include "llvm/ADT/SmallBitVector.h"
@@ -35,7 +33,6 @@
 #include "llvm/Analysis/VectorUtils.h"
 #include "llvm/CodeGen/DAGCombine.h"
 #include "llvm/CodeGen/ISDOpcodes.h"
-#include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineMemOperand.h"
 #include "llvm/CodeGen/RuntimeLibcalls.h"
@@ -52,7 +49,6 @@
 #include "llvm/IR/DataLayout.h"
 #include "llvm/IR/DerivedTypes.h"
 #include "llvm/IR/Function.h"
-#include "llvm/IR/LLVMContext.h"
 #include "llvm/IR/Metadata.h"
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/CodeGen.h"
@@ -71,9 +67,11 @@
 #include <cstdint>
 #include <functional>
 #include <iterator>
+#include <optional>
 #include <string>
 #include <tuple>
 #include <utility>
+#include <variant>
 
 using namespace llvm;
 
@@ -129,21 +127,26 @@ static cl::opt<unsigned> StoreMergeDependenceLimit(
 
 static cl::opt<bool> EnableReduceLoadOpStoreWidth(
     "combiner-reduce-load-op-store-width", cl::Hidden, cl::init(true),
-    cl::desc("DAG cominber enable reducing the width of load/op/store "
+    cl::desc("DAG combiner enable reducing the width of load/op/store "
              "sequence"));
 
 static cl::opt<bool> EnableShrinkLoadReplaceStoreWithStore(
     "combiner-shrink-load-replace-store-with-store", cl::Hidden, cl::init(true),
-    cl::desc("DAG cominber enable load/<replace bytes>/store with "
+    cl::desc("DAG combiner enable load/<replace bytes>/store with "
              "a narrower store"));
 
+static cl::opt<bool> EnableVectorFCopySignExtendRound(
+    "combiner-vector-fcopysign-extend-round", cl::Hidden, cl::init(false),
+    cl::desc(
+        "Enable merging extends and rounds into FCOPYSIGN on vector types"));
+
 namespace {
 
   class DAGCombiner {
     SelectionDAG &DAG;
     const TargetLowering &TLI;
     const SelectionDAGTargetInfo *STI;
-    CombineLevel Level;
+    CombineLevel Level = BeforeLegalizeTypes;
     CodeGenOpt::Level OptLevel;
     bool LegalDAG = false;
     bool LegalOperations = false;
@@ -238,8 +241,7 @@ namespace {
   public:
     DAGCombiner(SelectionDAG &D, AliasAnalysis *AA, CodeGenOpt::Level OL)
         : DAG(D), TLI(D.getTargetLoweringInfo()),
-          STI(D.getSubtarget().getSelectionDAGInfo()),
-          Level(BeforeLegalizeTypes), OptLevel(OL), AA(AA) {
+          STI(D.getSubtarget().getSelectionDAGInfo()), OptLevel(OL), AA(AA) {
       ForCodeSize = DAG.shouldOptForSize();
       DisableGenericCombines = STI && STI->disableGenericCombines(OptLevel);
 
@@ -249,8 +251,8 @@ namespace {
       for (MVT VT : MVT::all_valuetypes())
         if (EVT(VT).isSimple() && VT != MVT::Other &&
             TLI.isTypeLegal(EVT(VT)) &&
-            VT.getSizeInBits().getKnownMinSize() >= MaximumLegalStoreInBits)
-          MaximumLegalStoreInBits = VT.getSizeInBits().getKnownMinSize();
+            VT.getSizeInBits().getKnownMinValue() >= MaximumLegalStoreInBits)
+          MaximumLegalStoreInBits = VT.getSizeInBits().getKnownMinValue();
     }
 
     void ConsiderForPruning(SDNode *N) {
@@ -319,7 +321,7 @@ namespace {
     /// If so, return true.
     bool SimplifyDemandedBits(SDValue Op) {
       unsigned BitWidth = Op.getScalarValueSizeInBits();
-      APInt DemandedBits = APInt::getAllOnesValue(BitWidth);
+      APInt DemandedBits = APInt::getAllOnes(BitWidth);
       return SimplifyDemandedBits(Op, DemandedBits);
     }
 
@@ -345,7 +347,7 @@ namespace {
         return false;
 
       unsigned NumElts = Op.getValueType().getVectorNumElements();
-      APInt DemandedElts = APInt::getAllOnesValue(NumElts);
+      APInt DemandedElts = APInt::getAllOnes(NumElts);
       return SimplifyDemandedVectorElts(Op, DemandedElts);
     }
 
@@ -385,6 +387,10 @@ namespace {
     SDValue PromoteExtend(SDValue Op);
     bool PromoteLoad(SDValue Op);
 
+    SDValue combineMinNumMaxNum(const SDLoc &DL, EVT VT, SDValue LHS,
+                                SDValue RHS, SDValue True, SDValue False,
+                                ISD::CondCode CC);
+
     /// Call the node-specific routine that knows how to fold each
     /// particular type of node. If that doesn't do anything, try the
     /// target-specific DAG combines.
@@ -427,6 +433,7 @@ namespace {
     SDValue visitREM(SDNode *N);
     SDValue visitMULHU(SDNode *N);
     SDValue visitMULHS(SDNode *N);
+    SDValue visitAVG(SDNode *N);
     SDValue visitSMUL_LOHI(SDNode *N);
     SDValue visitUMUL_LOHI(SDNode *N);
     SDValue visitMULO(SDNode *N);
@@ -436,11 +443,13 @@ namespace {
     SDValue visitOR(SDNode *N);
     SDValue visitORLike(SDValue N0, SDValue N1, SDNode *N);
     SDValue visitXOR(SDNode *N);
-    SDValue SimplifyVBinOp(SDNode *N);
+    SDValue SimplifyVCastOp(SDNode *N, const SDLoc &DL);
+    SDValue SimplifyVBinOp(SDNode *N, const SDLoc &DL);
     SDValue visitSHL(SDNode *N);
     SDValue visitSRA(SDNode *N);
     SDValue visitSRL(SDNode *N);
     SDValue visitFunnelShift(SDNode *N);
+    SDValue visitSHLSAT(SDNode *N);
     SDValue visitRotate(SDNode *N);
     SDValue visitABS(SDNode *N);
     SDValue visitBSWAP(SDNode *N);
@@ -487,10 +496,7 @@ namespace {
     SDValue visitFCEIL(SDNode *N);
     SDValue visitFTRUNC(SDNode *N);
     SDValue visitFFLOOR(SDNode *N);
-    SDValue visitFMINNUM(SDNode *N);
-    SDValue visitFMAXNUM(SDNode *N);
-    SDValue visitFMINIMUM(SDNode *N);
-    SDValue visitFMAXIMUM(SDNode *N);
+    SDValue visitFMinMax(SDNode *N);
     SDValue visitBRCOND(SDNode *N);
     SDValue visitBR_CC(SDNode *N);
     SDValue visitLOAD(SDNode *N);
@@ -498,6 +504,8 @@ namespace {
     SDValue replaceStoreChain(StoreSDNode *ST, SDValue BetterChain);
     SDValue replaceStoreOfFPConstant(StoreSDNode *ST);
 
+    bool refineExtractVectorEltIntoMultipleNarrowExtractVectorElts(SDNode *N);
+
     SDValue visitSTORE(SDNode *N);
     SDValue visitLIFETIME_END(SDNode *N);
     SDValue visitINSERT_VECTOR_ELT(SDNode *N);
@@ -512,9 +520,13 @@ namespace {
     SDValue visitMSTORE(SDNode *N);
     SDValue visitMGATHER(SDNode *N);
     SDValue visitMSCATTER(SDNode *N);
+    SDValue visitVPGATHER(SDNode *N);
+    SDValue visitVPSCATTER(SDNode *N);
     SDValue visitFP_TO_FP16(SDNode *N);
     SDValue visitFP16_TO_FP(SDNode *N);
+    SDValue visitFP_TO_BF16(SDNode *N);
     SDValue visitVECREDUCE(SDNode *N);
+    SDValue visitVPOp(SDNode *N);
 
     SDValue visitFADDForFMACombine(SDNode *N);
     SDValue visitFSUBForFMACombine(SDNode *N);
@@ -522,7 +534,9 @@ namespace {
 
     SDValue XformToShuffleWithZero(SDNode *N);
     bool reassociationCanBreakAddressingModePattern(unsigned Opc,
-                                                    const SDLoc &DL, SDValue N0,
+                                                    const SDLoc &DL,
+                                                    SDNode *N,
+                                                    SDValue N0,
                                                     SDValue N1);
     SDValue reassociateOpsCommutative(unsigned Opc, const SDLoc &DL, SDValue N0,
                                       SDValue N1);
@@ -551,6 +565,7 @@ namespace {
     SDValue foldLogicOfSetCCs(bool IsAnd, SDValue N0, SDValue N1,
                               const SDLoc &DL);
     SDValue foldSubToUSubSat(EVT DstVT, SDNode *N);
+    SDValue foldABSToABD(SDNode *N);
     SDValue unfoldMaskedMerge(SDNode *N);
     SDValue unfoldExtremeBitClearingToShifts(SDNode *N);
     SDValue SimplifySetCC(EVT VT, SDValue N0, SDValue N1, ISD::CondCode Cond,
@@ -567,11 +582,14 @@ namespace {
     SDValue CombineExtLoad(SDNode *N);
     SDValue CombineZExtLogicopShiftLoad(SDNode *N);
     SDValue combineRepeatedFPDivisors(SDNode *N);
+    SDValue mergeInsertEltWithShuffle(SDNode *N, unsigned InsIndex);
     SDValue combineInsertEltToShuffle(SDNode *N, unsigned InsIndex);
     SDValue ConstantFoldBITCASTofBUILD_VECTOR(SDNode *, EVT);
     SDValue BuildSDIV(SDNode *N);
     SDValue BuildSDIVPow2(SDNode *N);
     SDValue BuildUDIV(SDNode *N);
+    SDValue BuildSREMPow2(SDNode *N);
+    SDValue buildOptimizedSREM(SDValue N0, SDValue N1, SDNode *N);
     SDValue BuildLogBase2(SDValue V, const SDLoc &DL);
     SDValue BuildDivEstimate(SDValue N, SDValue Op, SDNodeFlags Flags);
     SDValue buildRsqrtEstimate(SDValue Op, SDNodeFlags Flags);
@@ -585,21 +603,22 @@ namespace {
                                bool DemandHighBits = true);
     SDValue MatchBSwapHWord(SDNode *N, SDValue N0, SDValue N1);
     SDValue MatchRotatePosNeg(SDValue Shifted, SDValue Pos, SDValue Neg,
-                              SDValue InnerPos, SDValue InnerNeg,
+                              SDValue InnerPos, SDValue InnerNeg, bool HasPos,
                               unsigned PosOpcode, unsigned NegOpcode,
                               const SDLoc &DL);
     SDValue MatchFunnelPosNeg(SDValue N0, SDValue N1, SDValue Pos, SDValue Neg,
-                              SDValue InnerPos, SDValue InnerNeg,
+                              SDValue InnerPos, SDValue InnerNeg, bool HasPos,
                               unsigned PosOpcode, unsigned NegOpcode,
                               const SDLoc &DL);
     SDValue MatchRotate(SDValue LHS, SDValue RHS, const SDLoc &DL);
     SDValue MatchLoadCombine(SDNode *N);
     SDValue mergeTruncStores(StoreSDNode *N);
-    SDValue ReduceLoadWidth(SDNode *N);
+    SDValue reduceLoadWidth(SDNode *N);
     SDValue ReduceLoadOpStoreWidth(SDNode *N);
     SDValue splitMergedValStore(StoreSDNode *ST);
     SDValue TransformFPLoadStorePair(SDNode *N);
     SDValue convertBuildVecZextToZext(SDNode *N);
+    SDValue convertBuildVecZextToBuildVecWithZeros(SDNode *N);
     SDValue reduceBuildVecExtToExtBuildVec(SDNode *N);
     SDValue reduceBuildVecTruncToBitCast(SDNode *N);
     SDValue reduceBuildVecToShuffle(SDNode *N);
@@ -615,7 +634,7 @@ namespace {
                           SmallVectorImpl<SDValue> &Aliases);
 
     /// Return true if there is any possibility that the two addresses overlap.
-    bool isAlias(SDNode *Op0, SDNode *Op1) const;
+    bool mayAlias(SDNode *Op0, SDNode *Op1) const;
 
     /// Walk up chain skipping non-aliasing memory nodes, looking for a better
     /// chain (aliasing node.)
@@ -667,9 +686,8 @@ namespace {
     /// of folding (mul (add x, c1), c2) -> (add (mul x, c2), c1*c2).
     /// MulNode is the original multiply, AddNode is (add x, c1),
     /// and ConstNode is c2.
-    bool isMulAddWithConstProfitable(SDNode *MulNode,
-                                     SDValue &AddNode,
-                                     SDValue &ConstNode);
+    bool isMulAddWithConstProfitable(SDNode *MulNode, SDValue AddNode,
+                                     SDValue ConstNode);
 
     /// This is a helper function for visitAND and visitZERO_EXTEND.  Returns
     /// true if the (and (load x) c) pattern matches an extload.  ExtVT returns
@@ -882,8 +900,8 @@ void DAGCombiner::deleteAndRecombine(SDNode *N) {
 // We provide an Offset so that we can create bitwidths that won't overflow.
 static void zeroExtendToMatch(APInt &LHS, APInt &RHS, unsigned Offset = 0) {
   unsigned Bits = Offset + std::max(LHS.getBitWidth(), RHS.getBitWidth());
-  LHS = LHS.zextOrSelf(Bits);
-  RHS = RHS.zextOrSelf(Bits);
+  LHS = LHS.zext(Bits);
+  RHS = RHS.zext(Bits);
 }
 
 // Return true if this node is a setcc, or is a select_cc
@@ -909,9 +927,8 @@ bool DAGCombiner::isSetCCEquivalent(SDValue N, SDValue &LHS, SDValue &RHS,
     return true;
   }
 
-  if (N.getOpcode() != ISD::SELECT_CC ||
-      !TLI.isConstTrueVal(N.getOperand(2).getNode()) ||
-      !TLI.isConstFalseVal(N.getOperand(3).getNode()))
+  if (N.getOpcode() != ISD::SELECT_CC || !TLI.isConstTrueVal(N.getOperand(2)) ||
+      !TLI.isConstFalseVal(N.getOperand(3)))
     return false;
 
   if (TLI.getBooleanContents(N.getValueType()) ==
@@ -929,7 +946,7 @@ bool DAGCombiner::isSetCCEquivalent(SDValue N, SDValue &LHS, SDValue &RHS,
 /// it is profitable to do so.
 bool DAGCombiner::isOneUseSetCC(SDValue N) const {
   SDValue N0, N1, N2;
-  if (isSetCCEquivalent(N, N0, N1, N2) && N.getNode()->hasOneUse())
+  if (isSetCCEquivalent(N, N0, N1, N2) && N->hasOneUse())
     return true;
   return false;
 }
@@ -999,6 +1016,7 @@ static bool canSplitIdx(LoadSDNode *LD) {
 
 bool DAGCombiner::reassociationCanBreakAddressingModePattern(unsigned Opc,
                                                              const SDLoc &DL,
+                                                             SDNode *N,
                                                              SDValue N0,
                                                              SDValue N1) {
   // Currently this only tries to ensure we don't undo the GEP splits done by
@@ -1007,33 +1025,62 @@ bool DAGCombiner::reassociationCanBreakAddressingModePattern(unsigned Opc,
   // (load/store (add, (add, x, offset1), offset2)) ->
   // (load/store (add, x, offset1+offset2)).
 
-  if (Opc != ISD::ADD || N0.getOpcode() != ISD::ADD)
-    return false;
+  // (load/store (add, (add, x, y), offset2)) ->
+  // (load/store (add, (add, x, offset2), y)).
 
-  if (N0.hasOneUse())
+  if (Opc != ISD::ADD || N0.getOpcode() != ISD::ADD)
     return false;
 
-  auto *C1 = dyn_cast<ConstantSDNode>(N0.getOperand(1));
   auto *C2 = dyn_cast<ConstantSDNode>(N1);
-  if (!C1 || !C2)
+  if (!C2)
     return false;
 
-  const APInt &C1APIntVal = C1->getAPIntValue();
   const APInt &C2APIntVal = C2->getAPIntValue();
-  if (C1APIntVal.getBitWidth() > 64 || C2APIntVal.getBitWidth() > 64)
+  if (C2APIntVal.getSignificantBits() > 64)
     return false;
 
-  const APInt CombinedValueIntVal = C1APIntVal + C2APIntVal;
-  if (CombinedValueIntVal.getBitWidth() > 64)
-    return false;
-  const int64_t CombinedValue = CombinedValueIntVal.getSExtValue();
-
-  for (SDNode *Node : N0->uses()) {
-    auto LoadStore = dyn_cast<MemSDNode>(Node);
-    if (LoadStore) {
-      // Is x[offset2] already not a legal addressing mode? If so then
-      // reassociating the constants breaks nothing (we test offset2 because
-      // that's the one we hope to fold into the load or store).
+  if (auto *C1 = dyn_cast<ConstantSDNode>(N0.getOperand(1))) {
+    if (N0.hasOneUse())
+      return false;
+
+    const APInt &C1APIntVal = C1->getAPIntValue();
+    const APInt CombinedValueIntVal = C1APIntVal + C2APIntVal;
+    if (CombinedValueIntVal.getSignificantBits() > 64)
+      return false;
+    const int64_t CombinedValue = CombinedValueIntVal.getSExtValue();
+
+    for (SDNode *Node : N->uses()) {
+      if (auto *LoadStore = dyn_cast<MemSDNode>(Node)) {
+        // Is x[offset2] already not a legal addressing mode? If so then
+        // reassociating the constants breaks nothing (we test offset2 because
+        // that's the one we hope to fold into the load or store).
+        TargetLoweringBase::AddrMode AM;
+        AM.HasBaseReg = true;
+        AM.BaseOffs = C2APIntVal.getSExtValue();
+        EVT VT = LoadStore->getMemoryVT();
+        unsigned AS = LoadStore->getAddressSpace();
+        Type *AccessTy = VT.getTypeForEVT(*DAG.getContext());
+        if (!TLI.isLegalAddressingMode(DAG.getDataLayout(), AM, AccessTy, AS))
+          continue;
+
+        // Would x[offset1+offset2] still be a legal addressing mode?
+        AM.BaseOffs = CombinedValue;
+        if (!TLI.isLegalAddressingMode(DAG.getDataLayout(), AM, AccessTy, AS))
+          return true;
+      }
+    }
+  } else {
+    if (auto *GA = dyn_cast<GlobalAddressSDNode>(N0.getOperand(1)))
+      if (GA->getOpcode() == ISD::GlobalAddress && TLI.isOffsetFoldingLegal(GA))
+        return false;
+
+    for (SDNode *Node : N->uses()) {
+      auto *LoadStore = dyn_cast<MemSDNode>(Node);
+      if (!LoadStore)
+        return false;
+
+      // Is x[offset2] a legal addressing mode? If so then
+      // reassociating the constants breaks address pattern
       TargetLoweringBase::AddrMode AM;
       AM.HasBaseReg = true;
       AM.BaseOffs = C2APIntVal.getSExtValue();
@@ -1041,13 +1088,9 @@ bool DAGCombiner::reassociationCanBreakAddressingModePattern(unsigned Opc,
       unsigned AS = LoadStore->getAddressSpace();
       Type *AccessTy = VT.getTypeForEVT(*DAG.getContext());
       if (!TLI.isLegalAddressingMode(DAG.getDataLayout(), AM, AccessTy, AS))
-        continue;
-
-      // Would x[offset1+offset2] still be a legal addressing mode?
-      AM.BaseOffs = CombinedValue;
-      if (!TLI.isLegalAddressingMode(DAG.getDataLayout(), AM, AccessTy, AS))
-        return true;
+        return false;
     }
+    return true;
   }
 
   return false;
@@ -1062,23 +1105,64 @@ SDValue DAGCombiner::reassociateOpsCommutative(unsigned Opc, const SDLoc &DL,
   if (N0.getOpcode() != Opc)
     return SDValue();
 
-  if (DAG.isConstantIntBuildVectorOrConstantInt(N0.getOperand(1))) {
-    if (DAG.isConstantIntBuildVectorOrConstantInt(N1)) {
+  SDValue N00 = N0.getOperand(0);
+  SDValue N01 = N0.getOperand(1);
+
+  if (DAG.isConstantIntBuildVectorOrConstantInt(peekThroughBitcasts(N01))) {
+    if (DAG.isConstantIntBuildVectorOrConstantInt(peekThroughBitcasts(N1))) {
       // Reassociate: (op (op x, c1), c2) -> (op x, (op c1, c2))
-      if (SDValue OpNode =
-              DAG.FoldConstantArithmetic(Opc, DL, VT, {N0.getOperand(1), N1}))
-        return DAG.getNode(Opc, DL, VT, N0.getOperand(0), OpNode);
+      if (SDValue OpNode = DAG.FoldConstantArithmetic(Opc, DL, VT, {N01, N1}))
+        return DAG.getNode(Opc, DL, VT, N00, OpNode);
       return SDValue();
     }
-    if (N0.hasOneUse()) {
+    if (TLI.isReassocProfitable(DAG, N0, N1)) {
       // Reassociate: (op (op x, c1), y) -> (op (op x, y), c1)
       //              iff (op x, c1) has one use
-      SDValue OpNode = DAG.getNode(Opc, SDLoc(N0), VT, N0.getOperand(0), N1);
-      if (!OpNode.getNode())
-        return SDValue();
-      return DAG.getNode(Opc, DL, VT, OpNode, N0.getOperand(1));
+      SDValue OpNode = DAG.getNode(Opc, SDLoc(N0), VT, N00, N1);
+      return DAG.getNode(Opc, DL, VT, OpNode, N01);
+    }
+  }
+
+  // Check for repeated operand logic simplifications.
+  if (Opc == ISD::AND || Opc == ISD::OR) {
+    // (N00 & N01) & N00 --> N00 & N01
+    // (N00 & N01) & N01 --> N00 & N01
+    // (N00 | N01) | N00 --> N00 | N01
+    // (N00 | N01) | N01 --> N00 | N01
+    if (N1 == N00 || N1 == N01)
+      return N0;
+  }
+  if (Opc == ISD::XOR) {
+    // (N00 ^ N01) ^ N00 --> N01
+    if (N1 == N00)
+      return N01;
+    // (N00 ^ N01) ^ N01 --> N00
+    if (N1 == N01)
+      return N00;
+  }
+
+  if (TLI.isReassocProfitable(DAG, N0, N1)) {
+    if (N1 != N01) {
+      // Reassociate if (op N00, N1) already exist
+      if (SDNode *NE = DAG.getNodeIfExists(Opc, DAG.getVTList(VT), {N00, N1})) {
+        // if Op (Op N00, N1), N01 already exist
+        // we need to stop reassciate to avoid dead loop
+        if (!DAG.doesNodeExist(Opc, DAG.getVTList(VT), {SDValue(NE, 0), N01}))
+          return DAG.getNode(Opc, DL, VT, SDValue(NE, 0), N01);
+      }
+    }
+
+    if (N1 != N00) {
+      // Reassociate if (op N01, N1) already exist
+      if (SDNode *NE = DAG.getNodeIfExists(Opc, DAG.getVTList(VT), {N01, N1})) {
+        // if Op (Op N01, N1), N00 already exist
+        // we need to stop reassciate to avoid dead loop
+        if (!DAG.doesNodeExist(Opc, DAG.getVTList(VT), {SDValue(NE, 0), N00}))
+          return DAG.getNode(Opc, DL, VT, SDValue(NE, 0), N00);
+      }
     }
   }
+
   return SDValue();
 }
 
@@ -1105,7 +1189,7 @@ SDValue DAGCombiner::CombineTo(SDNode *N, const SDValue *To, unsigned NumTo,
   assert(N->getNumValues() == NumTo && "Broken CombineTo call!");
   ++NodesCombined;
   LLVM_DEBUG(dbgs() << "\nReplacing.1 "; N->dump(&DAG); dbgs() << "\nWith: ";
-             To[0].getNode()->dump(&DAG);
+             To[0].dump(&DAG);
              dbgs() << " and " << NumTo - 1 << " other values\n");
   for (unsigned i = 0, e = NumTo; i != e; ++i)
     assert((!To[i].getNode() ||
@@ -1117,10 +1201,8 @@ SDValue DAGCombiner::CombineTo(SDNode *N, const SDValue *To, unsigned NumTo,
   if (AddTo) {
     // Push the new nodes and any users onto the worklist
     for (unsigned i = 0, e = NumTo; i != e; ++i) {
-      if (To[i].getNode()) {
-        AddToWorklist(To[i].getNode());
-        AddUsersToWorklist(To[i].getNode());
-      }
+      if (To[i].getNode())
+        AddToWorklistWithUsers(To[i].getNode());
     }
   }
 
@@ -1136,23 +1218,17 @@ void DAGCombiner::
 CommitTargetLoweringOpt(const TargetLowering::TargetLoweringOpt &TLO) {
   // Replace the old value with the new one.
   ++NodesCombined;
-  LLVM_DEBUG(dbgs() << "\nReplacing.2 "; TLO.Old.getNode()->dump(&DAG);
-             dbgs() << "\nWith: "; TLO.New.getNode()->dump(&DAG);
-             dbgs() << '\n');
+  LLVM_DEBUG(dbgs() << "\nReplacing.2 "; TLO.Old.dump(&DAG);
+             dbgs() << "\nWith: "; TLO.New.dump(&DAG); dbgs() << '\n');
 
-  // Replace all uses.  If any nodes become isomorphic to other nodes and
-  // are deleted, make sure to remove them from our worklist.
-  WorklistRemover DeadNodes(*this);
+  // Replace all uses.
   DAG.ReplaceAllUsesOfValueWith(TLO.Old, TLO.New);
 
   // Push the new node and any (possibly new) users onto the worklist.
   AddToWorklistWithUsers(TLO.New.getNode());
 
-  // Finally, if the node is now dead, remove it from the graph.  The node
-  // may not be dead if the replacement process recursively simplified to
-  // something else needing this node.
-  if (TLO.Old.getNode()->use_empty())
-    deleteAndRecombine(TLO.Old.getNode());
+  // Finally, if the node is now dead, remove it from the graph.
+  recursivelyDeleteUnusedNodes(TLO.Old.getNode());
 }
 
 /// Check the specified integer node value to see if it can be simplified or if
@@ -1198,12 +1274,13 @@ void DAGCombiner::ReplaceLoadWithPromotedLoad(SDNode *Load, SDNode *ExtLoad) {
   SDValue Trunc = DAG.getNode(ISD::TRUNCATE, DL, VT, SDValue(ExtLoad, 0));
 
   LLVM_DEBUG(dbgs() << "\nReplacing.9 "; Load->dump(&DAG); dbgs() << "\nWith: ";
-             Trunc.getNode()->dump(&DAG); dbgs() << '\n');
-  WorklistRemover DeadNodes(*this);
+             Trunc.dump(&DAG); dbgs() << '\n');
+
   DAG.ReplaceAllUsesOfValueWith(SDValue(Load, 0), Trunc);
   DAG.ReplaceAllUsesOfValueWith(SDValue(Load, 1), SDValue(ExtLoad, 1));
-  deleteAndRecombine(Load);
+
   AddToWorklist(Trunc.getNode());
+  recursivelyDeleteUnusedNodes(Load);
 }
 
 SDValue DAGCombiner::PromoteOperand(SDValue Op, EVT PVT, bool &Replace) {
@@ -1297,7 +1374,7 @@ SDValue DAGCombiner::PromoteIntBinOp(SDValue Op) {
   if (TLI.IsDesirableToPromoteOp(Op, PVT)) {
     assert(PVT != VT && "Don't know what type to promote to!");
 
-    LLVM_DEBUG(dbgs() << "\nPromoting "; Op.getNode()->dump(&DAG));
+    LLVM_DEBUG(dbgs() << "\nPromoting "; Op.dump(&DAG));
 
     bool Replace0 = false;
     SDValue N0 = Op.getOperand(0);
@@ -1324,7 +1401,7 @@ SDValue DAGCombiner::PromoteIntBinOp(SDValue Op) {
 
     // If operands have a use ordering, make sure we deal with
     // predecessor first.
-    if (Replace0 && Replace1 && N0.getNode()->isPredecessorOf(N1.getNode())) {
+    if (Replace0 && Replace1 && N0->isPredecessorOf(N1.getNode())) {
       std::swap(N0, N1);
       std::swap(NN0, NN1);
     }
@@ -1365,11 +1442,10 @@ SDValue DAGCombiner::PromoteIntShiftOp(SDValue Op) {
   if (TLI.IsDesirableToPromoteOp(Op, PVT)) {
     assert(PVT != VT && "Don't know what type to promote to!");
 
-    LLVM_DEBUG(dbgs() << "\nPromoting "; Op.getNode()->dump(&DAG));
+    LLVM_DEBUG(dbgs() << "\nPromoting "; Op.dump(&DAG));
 
     bool Replace = false;
     SDValue N0 = Op.getOperand(0);
-    SDValue N1 = Op.getOperand(1);
     if (Opc == ISD::SRA)
       N0 = SExtPromoteOperand(N0, PVT);
     else if (Opc == ISD::SRL)
@@ -1381,6 +1457,7 @@ SDValue DAGCombiner::PromoteIntShiftOp(SDValue Op) {
       return SDValue();
 
     SDLoc DL(Op);
+    SDValue N1 = Op.getOperand(1);
     SDValue RV =
         DAG.getNode(ISD::TRUNCATE, DL, VT, DAG.getNode(Opc, DL, PVT, N0, N1));
 
@@ -1416,7 +1493,7 @@ SDValue DAGCombiner::PromoteExtend(SDValue Op) {
     // fold (aext (aext x)) -> (aext x)
     // fold (aext (zext x)) -> (zext x)
     // fold (aext (sext x)) -> (sext x)
-    LLVM_DEBUG(dbgs() << "\nPromoting "; Op.getNode()->dump(&DAG));
+    LLVM_DEBUG(dbgs() << "\nPromoting "; Op.dump(&DAG));
     return DAG.getNode(Op.getOpcode(), SDLoc(Op), VT, Op.getOperand(0));
   }
   return SDValue();
@@ -1457,14 +1534,16 @@ bool DAGCombiner::PromoteLoad(SDValue Op) {
     SDValue Result = DAG.getNode(ISD::TRUNCATE, DL, VT, NewLD);
 
     LLVM_DEBUG(dbgs() << "\nPromoting "; N->dump(&DAG); dbgs() << "\nTo: ";
-               Result.getNode()->dump(&DAG); dbgs() << '\n');
-    WorklistRemover DeadNodes(*this);
+               Result.dump(&DAG); dbgs() << '\n');
+
     DAG.ReplaceAllUsesOfValueWith(SDValue(N, 0), Result);
     DAG.ReplaceAllUsesOfValueWith(SDValue(N, 1), NewLD.getValue(1));
-    deleteAndRecombine(N);
+
     AddToWorklist(Result.getNode());
+    recursivelyDeleteUnusedNodes(N);
     return true;
   }
+
   return false;
 }
 
@@ -1571,9 +1650,9 @@ void DAGCombiner::Run(CombineLevel AtLevel) {
            RV.getOpcode() != ISD::DELETED_NODE &&
            "Node was deleted but visit returned new node!");
 
-    LLVM_DEBUG(dbgs() << " ... into: "; RV.getNode()->dump(&DAG));
+    LLVM_DEBUG(dbgs() << " ... into: "; RV.dump(&DAG));
 
-    if (N->getNumValues() == RV.getNode()->getNumValues())
+    if (N->getNumValues() == RV->getNumValues())
       DAG.ReplaceAllUsesWith(N, RV.getNode());
     else {
       assert(N->getValueType(0) == RV.getValueType() &&
@@ -1637,6 +1716,10 @@ SDValue DAGCombiner::visit(SDNode *N) {
   case ISD::UREM:               return visitREM(N);
   case ISD::MULHU:              return visitMULHU(N);
   case ISD::MULHS:              return visitMULHS(N);
+  case ISD::AVGFLOORS:
+  case ISD::AVGFLOORU:
+  case ISD::AVGCEILS:
+  case ISD::AVGCEILU:           return visitAVG(N);
   case ISD::SMUL_LOHI:          return visitSMUL_LOHI(N);
   case ISD::UMUL_LOHI:          return visitUMUL_LOHI(N);
   case ISD::SMULO:
@@ -1655,6 +1738,8 @@ SDValue DAGCombiner::visit(SDNode *N) {
   case ISD::ROTL:               return visitRotate(N);
   case ISD::FSHL:
   case ISD::FSHR:               return visitFunnelShift(N);
+  case ISD::SSHLSAT:
+  case ISD::USHLSAT:            return visitSHLSAT(N);
   case ISD::ABS:                return visitABS(N);
   case ISD::BSWAP:              return visitBSWAP(N);
   case ISD::BITREVERSE:         return visitBITREVERSE(N);
@@ -1676,7 +1761,8 @@ SDValue DAGCombiner::visit(SDNode *N) {
   case ISD::AssertAlign:        return visitAssertAlign(N);
   case ISD::SIGN_EXTEND_INREG:  return visitSIGN_EXTEND_INREG(N);
   case ISD::SIGN_EXTEND_VECTOR_INREG:
-  case ISD::ZERO_EXTEND_VECTOR_INREG: return visitEXTEND_VECTOR_INREG(N);
+  case ISD::ZERO_EXTEND_VECTOR_INREG:
+  case ISD::ANY_EXTEND_VECTOR_INREG: return visitEXTEND_VECTOR_INREG(N);
   case ISD::TRUNCATE:           return visitTRUNCATE(N);
   case ISD::BITCAST:            return visitBITCAST(N);
   case ISD::BUILD_PAIR:         return visitBUILD_PAIR(N);
@@ -1699,10 +1785,10 @@ SDValue DAGCombiner::visit(SDNode *N) {
   case ISD::FNEG:               return visitFNEG(N);
   case ISD::FABS:               return visitFABS(N);
   case ISD::FFLOOR:             return visitFFLOOR(N);
-  case ISD::FMINNUM:            return visitFMINNUM(N);
-  case ISD::FMAXNUM:            return visitFMAXNUM(N);
-  case ISD::FMINIMUM:           return visitFMINIMUM(N);
-  case ISD::FMAXIMUM:           return visitFMAXIMUM(N);
+  case ISD::FMINNUM:
+  case ISD::FMAXNUM:
+  case ISD::FMINIMUM:
+  case ISD::FMAXIMUM:           return visitFMinMax(N);
   case ISD::FCEIL:              return visitFCEIL(N);
   case ISD::FTRUNC:             return visitFTRUNC(N);
   case ISD::BRCOND:             return visitBRCOND(N);
@@ -1724,6 +1810,7 @@ SDValue DAGCombiner::visit(SDNode *N) {
   case ISD::LIFETIME_END:       return visitLIFETIME_END(N);
   case ISD::FP_TO_FP16:         return visitFP_TO_FP16(N);
   case ISD::FP16_TO_FP:         return visitFP16_TO_FP(N);
+  case ISD::FP_TO_BF16:         return visitFP_TO_BF16(N);
   case ISD::FREEZE:             return visitFREEZE(N);
   case ISD::VECREDUCE_FADD:
   case ISD::VECREDUCE_FMUL:
@@ -1738,6 +1825,9 @@ SDValue DAGCombiner::visit(SDNode *N) {
   case ISD::VECREDUCE_UMIN:
   case ISD::VECREDUCE_FMAX:
   case ISD::VECREDUCE_FMIN:     return visitVECREDUCE(N);
+#define BEGIN_REGISTER_VP_SDNODE(SDOPC, ...) case ISD::SDOPC:
+#include "llvm/IR/VPIntrinsics.def"
+    return visitVPOp(N);
   }
   return SDValue();
 }
@@ -1794,8 +1884,7 @@ SDValue DAGCombiner::combine(SDNode *N) {
 
   // If N is a commutative binary node, try to eliminate it if the commuted
   // version is already present in the DAG.
-  if (!RV.getNode() && TLI.isCommutativeBinOp(N->getOpcode()) &&
-      N->getNumValues() == 1) {
+  if (!RV.getNode() && TLI.isCommutativeBinOp(N->getOpcode())) {
     SDValue N0 = N->getOperand(0);
     SDValue N1 = N->getOperand(1);
 
@@ -1891,7 +1980,7 @@ SDValue DAGCombiner::visitTokenFactor(SDNode *N) {
           Changed = true;
           break;
         }
-        LLVM_FALLTHROUGH;
+        [[fallthrough]];
 
       default:
         // Only add if it isn't already in the list.
@@ -2069,8 +2158,9 @@ static bool canFoldInAddressingMode(SDNode *N, SDNode *Use, SelectionDAG &DAG,
       return false;
     VT = ST->getMemoryVT();
     AS = ST->getAddressSpace();
-  } else
+  } else {
     return false;
+  }
 
   TargetLowering::AddrMode AM;
   if (N->getOpcode() == ISD::ADD) {
@@ -2091,17 +2181,75 @@ static bool canFoldInAddressingMode(SDNode *N, SDNode *Use, SelectionDAG &DAG,
     else
       // [reg +/- reg]
       AM.Scale = 1;
-  } else
+  } else {
     return false;
+  }
 
   return TLI.isLegalAddressingMode(DAG.getDataLayout(), AM,
                                    VT.getTypeForEVT(*DAG.getContext()), AS);
 }
 
+/// This inverts a canonicalization in IR that replaces a variable select arm
+/// with an identity constant. Codegen improves if we re-use the variable
+/// operand rather than load a constant. This can also be converted into a
+/// masked vector operation if the target supports it.
+static SDValue foldSelectWithIdentityConstant(SDNode *N, SelectionDAG &DAG,
+                                              bool ShouldCommuteOperands) {
+  // Match a select as operand 1. The identity constant that we are looking for
+  // is only valid as operand 1 of a non-commutative binop.
+  SDValue N0 = N->getOperand(0);
+  SDValue N1 = N->getOperand(1);
+  if (ShouldCommuteOperands)
+    std::swap(N0, N1);
+
+  // TODO: Should this apply to scalar select too?
+  if (N1.getOpcode() != ISD::VSELECT || !N1.hasOneUse())
+    return SDValue();
+
+  // We can't hoist div/rem because of immediate UB (not speculatable).
+  unsigned Opcode = N->getOpcode();
+  if (!DAG.isSafeToSpeculativelyExecute(Opcode))
+    return SDValue();
+
+  EVT VT = N->getValueType(0);
+  SDValue Cond = N1.getOperand(0);
+  SDValue TVal = N1.getOperand(1);
+  SDValue FVal = N1.getOperand(2);
+
+  // This transform increases uses of N0, so freeze it to be safe.
+  // binop N0, (vselect Cond, IDC, FVal) --> vselect Cond, N0, (binop N0, FVal)
+  unsigned OpNo = ShouldCommuteOperands ? 0 : 1;
+  if (isNeutralConstant(Opcode, N->getFlags(), TVal, OpNo)) {
+    SDValue F0 = DAG.getFreeze(N0);
+    SDValue NewBO = DAG.getNode(Opcode, SDLoc(N), VT, F0, FVal, N->getFlags());
+    return DAG.getSelect(SDLoc(N), VT, Cond, F0, NewBO);
+  }
+  // binop N0, (vselect Cond, TVal, IDC) --> vselect Cond, (binop N0, TVal), N0
+  if (isNeutralConstant(Opcode, N->getFlags(), FVal, OpNo)) {
+    SDValue F0 = DAG.getFreeze(N0);
+    SDValue NewBO = DAG.getNode(Opcode, SDLoc(N), VT, F0, TVal, N->getFlags());
+    return DAG.getSelect(SDLoc(N), VT, Cond, NewBO, F0);
+  }
+
+  return SDValue();
+}
+
 SDValue DAGCombiner::foldBinOpIntoSelect(SDNode *BO) {
   assert(TLI.isBinOp(BO->getOpcode()) && BO->getNumValues() == 1 &&
          "Unexpected binary operator");
 
+  const TargetLowering &TLI = DAG.getTargetLoweringInfo();
+  auto BinOpcode = BO->getOpcode();
+  EVT VT = BO->getValueType(0);
+  if (TLI.shouldFoldSelectWithIdentityConstant(BinOpcode, VT)) {
+    if (SDValue Sel = foldSelectWithIdentityConstant(BO, DAG, false))
+      return Sel;
+
+    if (TLI.isCommutativeBinOp(BO->getOpcode()))
+      if (SDValue Sel = foldSelectWithIdentityConstant(BO, DAG, true))
+        return Sel;
+  }
+
   // Don't do this unless the old select is going away. We want to eliminate the
   // binary operator, not replace a binop with a select.
   // TODO: Handle ISD::SELECT_CC.
@@ -2130,11 +2278,10 @@ SDValue DAGCombiner::foldBinOpIntoSelect(SDNode *BO) {
   // propagate non constant operands into select. I.e.:
   // and (select Cond, 0, -1), X --> select Cond, 0, X
   // or X, (select Cond, -1, 0) --> select Cond, -1, X
-  auto BinOpcode = BO->getOpcode();
   bool CanFoldNonConst =
       (BinOpcode == ISD::AND || BinOpcode == ISD::OR) &&
-      (isNullOrNullSplat(CT) || isAllOnesOrAllOnesSplat(CT)) &&
-      (isNullOrNullSplat(CF) || isAllOnesOrAllOnesSplat(CF));
+      ((isNullOrNullSplat(CT) && isAllOnesOrAllOnesSplat(CF)) ||
+       (isNullOrNullSplat(CF) && isAllOnesOrAllOnesSplat(CT)));
 
   SDValue CBO = BO->getOperand(SelOpNo ^ 1);
   if (!CanFoldNonConst &&
@@ -2142,25 +2289,41 @@ SDValue DAGCombiner::foldBinOpIntoSelect(SDNode *BO) {
       !DAG.isConstantFPBuildVectorOrConstantFP(CBO))
     return SDValue();
 
-  EVT VT = BO->getValueType(0);
-
-  // We have a select-of-constants followed by a binary operator with a
-  // constant. Eliminate the binop by pulling the constant math into the select.
-  // Example: add (select Cond, CT, CF), CBO --> select Cond, CT + CBO, CF + CBO
   SDLoc DL(Sel);
-  SDValue NewCT = SelOpNo ? DAG.getNode(BinOpcode, DL, VT, CBO, CT)
-                          : DAG.getNode(BinOpcode, DL, VT, CT, CBO);
-  if (!CanFoldNonConst && !NewCT.isUndef() &&
-      !isConstantOrConstantVector(NewCT, true) &&
-      !DAG.isConstantFPBuildVectorOrConstantFP(NewCT))
-    return SDValue();
+  SDValue NewCT, NewCF;
 
-  SDValue NewCF = SelOpNo ? DAG.getNode(BinOpcode, DL, VT, CBO, CF)
-                          : DAG.getNode(BinOpcode, DL, VT, CF, CBO);
-  if (!CanFoldNonConst && !NewCF.isUndef() &&
-      !isConstantOrConstantVector(NewCF, true) &&
-      !DAG.isConstantFPBuildVectorOrConstantFP(NewCF))
-    return SDValue();
+  if (CanFoldNonConst) {
+    // If CBO is an opaque constant, we can't rely on getNode to constant fold.
+    if ((BinOpcode == ISD::AND && isNullOrNullSplat(CT)) ||
+        (BinOpcode == ISD::OR && isAllOnesOrAllOnesSplat(CT)))
+      NewCT = CT;
+    else
+      NewCT = CBO;
+
+    if ((BinOpcode == ISD::AND && isNullOrNullSplat(CF)) ||
+        (BinOpcode == ISD::OR && isAllOnesOrAllOnesSplat(CF)))
+      NewCF = CF;
+    else
+      NewCF = CBO;
+  } else {
+    // We have a select-of-constants followed by a binary operator with a
+    // constant. Eliminate the binop by pulling the constant math into the
+    // select. Example: add (select Cond, CT, CF), CBO --> select Cond, CT +
+    // CBO, CF + CBO
+    NewCT = SelOpNo ? DAG.getNode(BinOpcode, DL, VT, CBO, CT)
+                    : DAG.getNode(BinOpcode, DL, VT, CT, CBO);
+    if (!CanFoldNonConst && !NewCT.isUndef() &&
+        !isConstantOrConstantVector(NewCT, true) &&
+        !DAG.isConstantFPBuildVectorOrConstantFP(NewCT))
+      return SDValue();
+
+    NewCF = SelOpNo ? DAG.getNode(BinOpcode, DL, VT, CBO, CF)
+                    : DAG.getNode(BinOpcode, DL, VT, CF, CBO);
+    if (!CanFoldNonConst && !NewCF.isUndef() &&
+        !isConstantOrConstantVector(NewCF, true) &&
+        !DAG.isConstantFPBuildVectorOrConstantFP(NewCF))
+      return SDValue();
+  }
 
   SDValue SelectOp = DAG.getSelect(DL, VT, Sel.getOperand(0), NewCT, NewCF);
   SelectOp->setFlags(BO->getFlags());
@@ -2237,15 +2400,26 @@ static SDValue foldAddSubOfSignBit(SDNode *N, SelectionDAG &DAG) {
   // add (srl (not X), 31), C --> add (sra X, 31), (C + 1)
   // sub C, (srl (not X), 31) --> add (srl X, 31), (C - 1)
   SDLoc DL(N);
-  auto ShOpcode = IsAdd ? ISD::SRA : ISD::SRL;
-  SDValue NewShift = DAG.getNode(ShOpcode, DL, VT, Not.getOperand(0), ShAmt);
-  if (SDValue NewC =
-          DAG.FoldConstantArithmetic(IsAdd ? ISD::ADD : ISD::SUB, DL, VT,
-                                     {ConstantOp, DAG.getConstant(1, DL, VT)}))
+  if (SDValue NewC = DAG.FoldConstantArithmetic(
+          IsAdd ? ISD::ADD : ISD::SUB, DL, VT,
+          {ConstantOp, DAG.getConstant(1, DL, VT)})) {
+    SDValue NewShift = DAG.getNode(IsAdd ? ISD::SRA : ISD::SRL, DL, VT,
+                                   Not.getOperand(0), ShAmt);
     return DAG.getNode(ISD::ADD, DL, VT, NewShift, NewC);
+  }
+
   return SDValue();
 }
 
+static bool isADDLike(SDValue V, const SelectionDAG &DAG) {
+  unsigned Opcode = V.getOpcode();
+  if (Opcode == ISD::OR)
+    return DAG.haveNoCommonBitsSet(V.getOperand(0), V.getOperand(1));
+  if (Opcode == ISD::XOR)
+    return isMinSignedConstant(V.getOperand(1));
+  return false;
+}
+
 /// Try to fold a node that behaves like an ADD (note that N isn't necessarily
 /// an ISD::ADD here, it could for example be an ISD::OR if we know that there
 /// are no common bits set in the operands).
@@ -2255,97 +2429,89 @@ SDValue DAGCombiner::visitADDLike(SDNode *N) {
   EVT VT = N0.getValueType();
   SDLoc DL(N);
 
+  // fold (add x, undef) -> undef
+  if (N0.isUndef())
+    return N0;
+  if (N1.isUndef())
+    return N1;
+
+  // fold (add c1, c2) -> c1+c2
+  if (SDValue C = DAG.FoldConstantArithmetic(ISD::ADD, DL, VT, {N0, N1}))
+    return C;
+
+  // canonicalize constant to RHS
+  if (DAG.isConstantIntBuildVectorOrConstantInt(N0) &&
+      !DAG.isConstantIntBuildVectorOrConstantInt(N1))
+    return DAG.getNode(ISD::ADD, DL, VT, N1, N0);
+
   // fold vector ops
   if (VT.isVector()) {
-    if (SDValue FoldedVOp = SimplifyVBinOp(N))
+    if (SDValue FoldedVOp = SimplifyVBinOp(N, DL))
       return FoldedVOp;
 
     // fold (add x, 0) -> x, vector edition
     if (ISD::isConstantSplatVectorAllZeros(N1.getNode()))
       return N0;
-    if (ISD::isConstantSplatVectorAllZeros(N0.getNode()))
-      return N1;
-  }
-
-  // fold (add x, undef) -> undef
-  if (N0.isUndef())
-    return N0;
-
-  if (N1.isUndef())
-    return N1;
-
-  if (DAG.isConstantIntBuildVectorOrConstantInt(N0)) {
-    // canonicalize constant to RHS
-    if (!DAG.isConstantIntBuildVectorOrConstantInt(N1))
-      return DAG.getNode(ISD::ADD, DL, VT, N1, N0);
-    // fold (add c1, c2) -> c1+c2
-    return DAG.FoldConstantArithmetic(ISD::ADD, DL, VT, {N0, N1});
   }
 
   // fold (add x, 0) -> x
   if (isNullConstant(N1))
     return N0;
 
-  if (isConstantOrConstantVector(N1, /* NoOpaque */ true)) {
+  if (N0.getOpcode() == ISD::SUB) {
+    SDValue N00 = N0.getOperand(0);
+    SDValue N01 = N0.getOperand(1);
+
     // fold ((A-c1)+c2) -> (A+(c2-c1))
-    if (N0.getOpcode() == ISD::SUB &&
-        isConstantOrConstantVector(N0.getOperand(1), /* NoOpaque */ true)) {
-      SDValue Sub =
-          DAG.FoldConstantArithmetic(ISD::SUB, DL, VT, {N1, N0.getOperand(1)});
-      assert(Sub && "Constant folding failed");
+    if (SDValue Sub = DAG.FoldConstantArithmetic(ISD::SUB, DL, VT, {N1, N01}))
       return DAG.getNode(ISD::ADD, DL, VT, N0.getOperand(0), Sub);
-    }
 
     // fold ((c1-A)+c2) -> (c1+c2)-A
-    if (N0.getOpcode() == ISD::SUB &&
-        isConstantOrConstantVector(N0.getOperand(0), /* NoOpaque */ true)) {
-      SDValue Add =
-          DAG.FoldConstantArithmetic(ISD::ADD, DL, VT, {N1, N0.getOperand(0)});
-      assert(Add && "Constant folding failed");
+    if (SDValue Add = DAG.FoldConstantArithmetic(ISD::ADD, DL, VT, {N1, N00}))
       return DAG.getNode(ISD::SUB, DL, VT, Add, N0.getOperand(1));
-    }
+  }
 
-    // add (sext i1 X), 1 -> zext (not i1 X)
-    // We don't transform this pattern:
-    //   add (zext i1 X), -1 -> sext (not i1 X)
-    // because most (?) targets generate better code for the zext form.
-    if (N0.getOpcode() == ISD::SIGN_EXTEND && N0.hasOneUse() &&
-        isOneOrOneSplat(N1)) {
-      SDValue X = N0.getOperand(0);
-      if ((!LegalOperations ||
-           (TLI.isOperationLegal(ISD::XOR, X.getValueType()) &&
-            TLI.isOperationLegal(ISD::ZERO_EXTEND, VT))) &&
-          X.getScalarValueSizeInBits() == 1) {
-        SDValue Not = DAG.getNOT(DL, X, X.getValueType());
-        return DAG.getNode(ISD::ZERO_EXTEND, DL, VT, Not);
-      }
+  // add (sext i1 X), 1 -> zext (not i1 X)
+  // We don't transform this pattern:
+  //   add (zext i1 X), -1 -> sext (not i1 X)
+  // because most (?) targets generate better code for the zext form.
+  if (N0.getOpcode() == ISD::SIGN_EXTEND && N0.hasOneUse() &&
+      isOneOrOneSplat(N1)) {
+    SDValue X = N0.getOperand(0);
+    if ((!LegalOperations ||
+         (TLI.isOperationLegal(ISD::XOR, X.getValueType()) &&
+          TLI.isOperationLegal(ISD::ZERO_EXTEND, VT))) &&
+        X.getScalarValueSizeInBits() == 1) {
+      SDValue Not = DAG.getNOT(DL, X, X.getValueType());
+      return DAG.getNode(ISD::ZERO_EXTEND, DL, VT, Not);
     }
+  }
 
-    // Fold (add (or x, c0), c1) -> (add x, (c0 + c1)) if (or x, c0) is
-    // equivalent to (add x, c0).
-    if (N0.getOpcode() == ISD::OR &&
-        isConstantOrConstantVector(N0.getOperand(1), /* NoOpaque */ true) &&
-        DAG.haveNoCommonBitsSet(N0.getOperand(0), N0.getOperand(1))) {
-      if (SDValue Add0 = DAG.FoldConstantArithmetic(ISD::ADD, DL, VT,
-                                                    {N1, N0.getOperand(1)}))
-        return DAG.getNode(ISD::ADD, DL, VT, N0.getOperand(0), Add0);
-    }
+  // Fold (add (or x, c0), c1) -> (add x, (c0 + c1))
+  // iff (or x, c0) is equivalent to (add x, c0).
+  // Fold (add (xor x, c0), c1) -> (add x, (c0 + c1))
+  // iff (xor x, c0) is equivalent to (add x, c0).
+  if (isADDLike(N0, DAG)) {
+    SDValue N01 = N0.getOperand(1);
+    if (SDValue Add = DAG.FoldConstantArithmetic(ISD::ADD, DL, VT, {N1, N01}))
+      return DAG.getNode(ISD::ADD, DL, VT, N0.getOperand(0), Add);
   }
 
   if (SDValue NewSel = foldBinOpIntoSelect(N))
     return NewSel;
 
   // reassociate add
-  if (!reassociationCanBreakAddressingModePattern(ISD::ADD, DL, N0, N1)) {
+  if (!reassociationCanBreakAddressingModePattern(ISD::ADD, DL, N, N0, N1)) {
     if (SDValue RADD = reassociateOps(ISD::ADD, DL, N0, N1, N->getFlags()))
       return RADD;
 
     // Reassociate (add (or x, c), y) -> (add add(x, y), c)) if (or x, c) is
     // equivalent to (add x, c).
+    // Reassociate (add (xor x, c), y) -> (add add(x, y), c)) if (xor x, c) is
+    // equivalent to (add x, c).
     auto ReassociateAddOr = [&](SDValue N0, SDValue N1) {
-      if (N0.getOpcode() == ISD::OR && N0.hasOneUse() &&
-          isConstantOrConstantVector(N0.getOperand(1), /* NoOpaque */ true) &&
-          DAG.haveNoCommonBitsSet(N0.getOperand(0), N0.getOperand(1))) {
+      if (isADDLike(N0, DAG) && N0.hasOneUse() &&
+          isConstantOrConstantVector(N0.getOperand(1), /* NoOpaque */ true)) {
         return DAG.getNode(ISD::ADD, DL, VT,
                            DAG.getNode(ISD::ADD, DL, VT, N1, N0.getOperand(0)),
                            N0.getOperand(1));
@@ -2405,7 +2571,8 @@ SDValue DAGCombiner::visitADDLike(SDNode *N) {
                        N1.getOperand(1));
 
   // fold (A-B)+(C-D) to (A+C)-(B+D) when A or C is constant
-  if (N0.getOpcode() == ISD::SUB && N1.getOpcode() == ISD::SUB) {
+  if (N0.getOpcode() == ISD::SUB && N1.getOpcode() == ISD::SUB &&
+      N0->hasOneUse() && N1->hasOneUse()) {
     SDValue N00 = N0.getOperand(0);
     SDValue N01 = N0.getOperand(1);
     SDValue N10 = N1.getOperand(0);
@@ -2458,8 +2625,8 @@ SDValue DAGCombiner::visitADDLike(SDNode *N) {
     //   add (add x, y), 1
     // And if the target does not like this form then turn into:
     //   sub y, (xor x, -1)
-    if (!TLI.preferIncOfAddToSubOfNot(VT) && N0.hasOneUse() &&
-        N0.getOpcode() == ISD::ADD) {
+    if (!TLI.preferIncOfAddToSubOfNot(VT) && N0.getOpcode() == ISD::ADD &&
+        N0.hasOneUse()) {
       SDValue Not = DAG.getNode(ISD::XOR, DL, VT, N0.getOperand(0),
                                 DAG.getAllOnesConstant(DL, VT));
       return DAG.getNode(ISD::SUB, DL, VT, N0.getOperand(1), Not);
@@ -2467,7 +2634,7 @@ SDValue DAGCombiner::visitADDLike(SDNode *N) {
   }
 
   // (x - y) + -1  ->  add (xor y, -1), x
-  if (N0.hasOneUse() && N0.getOpcode() == ISD::SUB &&
+  if (N0.getOpcode() == ISD::SUB && N0.hasOneUse() &&
       isAllOnesOrAllOnesSplat(N1)) {
     SDValue Xor = DAG.getNode(ISD::XOR, DL, VT, N0.getOperand(1), N1);
     return DAG.getNode(ISD::ADD, DL, VT, Xor, N0.getOperand(0));
@@ -2510,9 +2677,9 @@ SDValue DAGCombiner::visitADD(SDNode *N) {
   }
 
   // fold a+vscale(c1)+vscale(c2) -> a+vscale(c1+c2)
-  if ((N0.getOpcode() == ISD::ADD) &&
-      (N0.getOperand(1).getOpcode() == ISD::VSCALE) &&
-      (N1.getOpcode() == ISD::VSCALE)) {
+  if (N0.getOpcode() == ISD::ADD &&
+      N0.getOperand(1).getOpcode() == ISD::VSCALE &&
+      N1.getOpcode() == ISD::VSCALE) {
     const APInt &VS0 = N0.getOperand(1)->getConstantOperandAPInt(0);
     const APInt &VS1 = N1->getConstantOperandAPInt(0);
     SDValue VS = DAG.getVScale(DL, VT, VS0 + VS1);
@@ -2529,9 +2696,9 @@ SDValue DAGCombiner::visitADD(SDNode *N) {
   }
 
   // Fold a + step_vector(c1) + step_vector(c2) to a + step_vector(c1+c2)
-  if ((N0.getOpcode() == ISD::ADD) &&
-      (N0.getOperand(1).getOpcode() == ISD::STEP_VECTOR) &&
-      (N1.getOpcode() == ISD::STEP_VECTOR)) {
+  if (N0.getOpcode() == ISD::ADD &&
+      N0.getOperand(1).getOpcode() == ISD::STEP_VECTOR &&
+      N1.getOpcode() == ISD::STEP_VECTOR) {
     const APInt &SV0 = N0.getOperand(1)->getConstantOperandAPInt(0);
     const APInt &SV1 = N1->getConstantOperandAPInt(0);
     APInt NewStep = SV0 + SV1;
@@ -2549,27 +2716,27 @@ SDValue DAGCombiner::visitADDSAT(SDNode *N) {
   EVT VT = N0.getValueType();
   SDLoc DL(N);
 
+  // fold (add_sat x, undef) -> -1
+  if (N0.isUndef() || N1.isUndef())
+    return DAG.getAllOnesConstant(DL, VT);
+
+  // fold (add_sat c1, c2) -> c3
+  if (SDValue C = DAG.FoldConstantArithmetic(Opcode, DL, VT, {N0, N1}))
+    return C;
+
+  // canonicalize constant to RHS
+  if (DAG.isConstantIntBuildVectorOrConstantInt(N0) &&
+      !DAG.isConstantIntBuildVectorOrConstantInt(N1))
+    return DAG.getNode(Opcode, DL, VT, N1, N0);
+
   // fold vector ops
   if (VT.isVector()) {
-    // TODO SimplifyVBinOp
+    if (SDValue FoldedVOp = SimplifyVBinOp(N, DL))
+      return FoldedVOp;
 
     // fold (add_sat x, 0) -> x, vector edition
     if (ISD::isConstantSplatVectorAllZeros(N1.getNode()))
       return N0;
-    if (ISD::isConstantSplatVectorAllZeros(N0.getNode()))
-      return N1;
-  }
-
-  // fold (add_sat x, undef) -> -1
-  if (N0.isUndef() || N1.isUndef())
-    return DAG.getAllOnesConstant(DL, VT);
-
-  if (DAG.isConstantIntBuildVectorOrConstantInt(N0)) {
-    // canonicalize constant to RHS
-    if (!DAG.isConstantIntBuildVectorOrConstantInt(N1))
-      return DAG.getNode(Opcode, DL, VT, N1, N0);
-    // fold (add_sat c1, c2) -> c3
-    return DAG.FoldConstantArithmetic(Opcode, DL, VT, {N0, N1});
   }
 
   // fold (add_sat x, 0) -> x
@@ -2611,7 +2778,7 @@ static SDValue getAsCarry(const TargetLowering &TLI, SDValue V) {
       V.getOpcode() != ISD::UADDO && V.getOpcode() != ISD::USUBO)
     return SDValue();
 
-  EVT VT = V.getNode()->getValueType(0);
+  EVT VT = V->getValueType(0);
   if (!TLI.isOperationLegalOrCustom(V.getOpcode(), VT))
     return SDValue();
 
@@ -2631,16 +2798,26 @@ static SDValue getAsCarry(const TargetLowering &TLI, SDValue V) {
 /// the opcode and bypass the mask operation.
 static SDValue foldAddSubMasked1(bool IsAdd, SDValue N0, SDValue N1,
                                  SelectionDAG &DAG, const SDLoc &DL) {
+  if (N1.getOpcode() == ISD::ZERO_EXTEND)
+    N1 = N1.getOperand(0);
+
   if (N1.getOpcode() != ISD::AND || !isOneOrOneSplat(N1->getOperand(1)))
     return SDValue();
 
   EVT VT = N0.getValueType();
-  if (DAG.ComputeNumSignBits(N1.getOperand(0)) != VT.getScalarSizeInBits())
+  SDValue N10 = N1.getOperand(0);
+  if (N10.getValueType() != VT && N10.getOpcode() == ISD::TRUNCATE)
+    N10 = N10.getOperand(0);
+
+  if (N10.getValueType() != VT)
+    return SDValue();
+
+  if (DAG.ComputeNumSignBits(N10) != VT.getScalarSizeInBits())
     return SDValue();
 
   // add N0, (and (AssertSext X, i1), 1) --> sub N0, X
   // sub N0, (and (AssertSext X, i1), 1) --> add N0, X
-  return DAG.getNode(IsAdd ? ISD::SUB : ISD::ADD, DL, VT, N0, N1.getOperand(0));
+  return DAG.getNode(IsAdd ? ISD::SUB : ISD::ADD, DL, VT, N0, N10);
 }
 
 /// Helper for doing combines based on N0 and N1 being added to each other.
@@ -2664,27 +2841,27 @@ SDValue DAGCombiner::visitADDLikeCommutative(SDValue N0, SDValue N1,
   //   add (add x, 1), y
   // And if the target does not like this form then turn into:
   //   sub y, (xor x, -1)
-  if (!TLI.preferIncOfAddToSubOfNot(VT) && N0.hasOneUse() &&
-      N0.getOpcode() == ISD::ADD && isOneOrOneSplat(N0.getOperand(1))) {
+  if (!TLI.preferIncOfAddToSubOfNot(VT) && N0.getOpcode() == ISD::ADD &&
+      N0.hasOneUse() && isOneOrOneSplat(N0.getOperand(1))) {
     SDValue Not = DAG.getNode(ISD::XOR, DL, VT, N0.getOperand(0),
                               DAG.getAllOnesConstant(DL, VT));
     return DAG.getNode(ISD::SUB, DL, VT, N1, Not);
   }
 
-  // Hoist one-use subtraction by non-opaque constant:
-  //   (x - C) + y  ->  (x + y) - C
-  // This is necessary because SUB(X,C) -> ADD(X,-C) doesn't work for vectors.
-  if (N0.hasOneUse() && N0.getOpcode() == ISD::SUB &&
-      isConstantOrConstantVector(N0.getOperand(1), /*NoOpaques=*/true)) {
-    SDValue Add = DAG.getNode(ISD::ADD, DL, VT, N0.getOperand(0), N1);
-    return DAG.getNode(ISD::SUB, DL, VT, Add, N0.getOperand(1));
-  }
-  // Hoist one-use subtraction from non-opaque constant:
-  //   (C - x) + y  ->  (y - x) + C
-  if (N0.hasOneUse() && N0.getOpcode() == ISD::SUB &&
-      isConstantOrConstantVector(N0.getOperand(0), /*NoOpaques=*/true)) {
-    SDValue Sub = DAG.getNode(ISD::SUB, DL, VT, N1, N0.getOperand(1));
-    return DAG.getNode(ISD::ADD, DL, VT, Sub, N0.getOperand(0));
+  if (N0.getOpcode() == ISD::SUB && N0.hasOneUse()) {
+    // Hoist one-use subtraction by non-opaque constant:
+    //   (x - C) + y  ->  (x + y) - C
+    // This is necessary because SUB(X,C) -> ADD(X,-C) doesn't work for vectors.
+    if (isConstantOrConstantVector(N0.getOperand(1), /*NoOpaques=*/true)) {
+      SDValue Add = DAG.getNode(ISD::ADD, DL, VT, N0.getOperand(0), N1);
+      return DAG.getNode(ISD::SUB, DL, VT, Add, N0.getOperand(1));
+    }
+    // Hoist one-use subtraction from non-opaque constant:
+    //   (C - x) + y  ->  (y - x) + C
+    if (isConstantOrConstantVector(N0.getOperand(0), /*NoOpaques=*/true)) {
+      SDValue Sub = DAG.getNode(ISD::SUB, DL, VT, N1, N0.getOperand(1));
+      return DAG.getNode(ISD::ADD, DL, VT, Sub, N0.getOperand(0));
+    }
   }
 
   // If the target's bool is represented as 0/1, prefer to make this 'sub 0/1'
@@ -2781,7 +2958,7 @@ static SDValue extractBooleanFlip(SDValue V, SelectionDAG &DAG,
       IsFlip = Const->isOne();
       break;
     case TargetLowering::ZeroOrNegativeOneBooleanContent:
-      IsFlip = Const->isAllOnesValue();
+      IsFlip = Const->isAllOnes();
       break;
     case TargetLowering::UndefinedBooleanContent:
       IsFlip = (Const->getAPIntValue() & 0x01) == 1;
@@ -2921,6 +3098,17 @@ SDValue DAGCombiner::visitADDCARRY(SDNode *N) {
   if (SDValue Combined = visitADDCARRYLike(N1, N0, CarryIn, N))
     return Combined;
 
+  // We want to avoid useless duplication.
+  // TODO: This is done automatically for binary operations. As ADDCARRY is
+  // not a binary operation, this is not really possible to leverage this
+  // existing mechanism for it. However, if more operations require the same
+  // deduplication logic, then it may be worth generalize.
+  SDValue Ops[] = {N1, N0, CarryIn};
+  SDNode *CSENode =
+      DAG.getNodeIfExists(ISD::ADDCARRY, N->getVTList(), Ops, N->getFlags());
+  if (CSENode)
+    return SDValue(CSENode, 0);
+
   return SDValue();
 }
 
@@ -2952,7 +3140,7 @@ SDValue DAGCombiner::visitSADDO_CARRY(SDNode *N) {
  *   (addcarry X, 0, (addcarry A, B, Z):Carry)
  *
  * The end result is usually an increase in operation required, but because the
- * carry is now linearized, other tranforms can kick in and optimize the DAG.
+ * carry is now linearized, other transforms can kick in and optimize the DAG.
  *
  * Patterns typically look something like
  *            (uaddo A, B)
@@ -3059,23 +3247,27 @@ static SDValue combineADDCARRYDiamond(DAGCombiner &Combiner, SelectionDAG &DAG,
 //
 // Our goal is to identify A, B, and CarryIn and produce ADDCARRY/SUBCARRY with
 // a single path for carry/borrow out propagation:
-static SDValue combineCarryDiamond(DAGCombiner &Combiner, SelectionDAG &DAG,
-                                   const TargetLowering &TLI, SDValue Carry0,
-                                   SDValue Carry1, SDNode *N) {
-  if (Carry0.getResNo() != 1 || Carry1.getResNo() != 1)
+static SDValue combineCarryDiamond(SelectionDAG &DAG, const TargetLowering &TLI,
+                                   SDValue N0, SDValue N1, SDNode *N) {
+  SDValue Carry0 = getAsCarry(TLI, N0);
+  if (!Carry0)
+    return SDValue();
+  SDValue Carry1 = getAsCarry(TLI, N1);
+  if (!Carry1)
     return SDValue();
+
   unsigned Opcode = Carry0.getOpcode();
   if (Opcode != Carry1.getOpcode())
     return SDValue();
   if (Opcode != ISD::UADDO && Opcode != ISD::USUBO)
     return SDValue();
 
-  // Canonicalize the add/sub of A and B as Carry0 and the add/sub of the
-  // carry/borrow in as Carry1. (The top and middle uaddo nodes respectively in
-  // the above ASCII art.)
-  if (Carry1.getOperand(0) != Carry0.getValue(0) &&
-      Carry1.getOperand(1) != Carry0.getValue(0))
+  // Canonicalize the add/sub of A and B (the top node in the above ASCII art)
+  // as Carry0 and the add/sub of the carry in as Carry1 (the middle node).
+  if (Carry1.getNode()->isOperandOf(Carry0.getNode()))
     std::swap(Carry0, Carry1);
+
+  // Check if nodes are connected in expected way.
   if (Carry1.getOperand(0) != Carry0.getValue(0) &&
       Carry1.getOperand(1) != Carry0.getValue(0))
     return SDValue();
@@ -3255,25 +3447,31 @@ SDValue DAGCombiner::visitSUB(SDNode *N) {
   EVT VT = N0.getValueType();
   SDLoc DL(N);
 
-  // fold vector ops
-  if (VT.isVector()) {
-    if (SDValue FoldedVOp = SimplifyVBinOp(N))
-      return FoldedVOp;
-
-    // fold (sub x, 0) -> x, vector edition
-    if (ISD::isConstantSplatVectorAllZeros(N1.getNode()))
-      return N0;
-  }
+  auto PeekThroughFreeze = [](SDValue N) {
+    if (N->getOpcode() == ISD::FREEZE && N.hasOneUse())
+      return N->getOperand(0);
+    return N;
+  };
 
   // fold (sub x, x) -> 0
   // FIXME: Refactor this and xor and other similar operations together.
-  if (N0 == N1)
+  if (PeekThroughFreeze(N0) == PeekThroughFreeze(N1))
     return tryFoldToZero(DL, TLI, VT, DAG, LegalOperations);
 
   // fold (sub c1, c2) -> c3
   if (SDValue C = DAG.FoldConstantArithmetic(ISD::SUB, DL, VT, {N0, N1}))
     return C;
 
+  // fold vector ops
+  if (VT.isVector()) {
+    if (SDValue FoldedVOp = SimplifyVBinOp(N, DL))
+      return FoldedVOp;
+
+    // fold (sub x, 0) -> x, vector edition
+    if (ISD::isConstantSplatVectorAllZeros(N1.getNode()))
+      return N0;
+  }
+
   if (SDValue NewSel = foldBinOpIntoSelect(N))
     return NewSel;
 
@@ -3315,21 +3513,17 @@ SDValue DAGCombiner::visitSUB(SDNode *N) {
     }
 
     // Convert 0 - abs(x).
-    SDValue Result;
-    if (N1->getOpcode() == ISD::ABS &&
-        !TLI.isOperationLegalOrCustom(ISD::ABS, VT) &&
-        TLI.expandABS(N1.getNode(), Result, DAG, true))
-      return Result;
+    if (N1.getOpcode() == ISD::ABS && N1.hasOneUse() &&
+        !TLI.isOperationLegalOrCustom(ISD::ABS, VT))
+      if (SDValue Result = TLI.expandABS(N1.getNode(), DAG, true))
+        return Result;
 
     // Fold neg(splat(neg(x)) -> splat(x)
     if (VT.isVector()) {
       SDValue N1S = DAG.getSplatValue(N1, true);
       if (N1S && N1S.getOpcode() == ISD::SUB &&
-          isNullConstant(N1S.getOperand(0))) {
-        if (VT.isScalableVector())
-          return DAG.getSplatVector(VT, DL, N1S.getOperand(1));
-        return DAG.getSplatBuildVector(VT, DL, N1S.getOperand(1));
-      }
+          isNullConstant(N1S.getOperand(0)))
+        return DAG.getSplat(VT, DL, N1S.getOperand(1));
     }
   }
 
@@ -3354,44 +3548,31 @@ SDValue DAGCombiner::visitSUB(SDNode *N) {
     return N0.getOperand(0);
 
   // fold (A+C1)-C2 -> A+(C1-C2)
-  if (N0.getOpcode() == ISD::ADD &&
-      isConstantOrConstantVector(N1, /* NoOpaques */ true) &&
-      isConstantOrConstantVector(N0.getOperand(1), /* NoOpaques */ true)) {
-    SDValue NewC =
-        DAG.FoldConstantArithmetic(ISD::SUB, DL, VT, {N0.getOperand(1), N1});
-    assert(NewC && "Constant folding failed");
-    return DAG.getNode(ISD::ADD, DL, VT, N0.getOperand(0), NewC);
+  if (N0.getOpcode() == ISD::ADD) {
+    SDValue N01 = N0.getOperand(1);
+    if (SDValue NewC = DAG.FoldConstantArithmetic(ISD::SUB, DL, VT, {N01, N1}))
+      return DAG.getNode(ISD::ADD, DL, VT, N0.getOperand(0), NewC);
   }
 
   // fold C2-(A+C1) -> (C2-C1)-A
   if (N1.getOpcode() == ISD::ADD) {
     SDValue N11 = N1.getOperand(1);
-    if (isConstantOrConstantVector(N0, /* NoOpaques */ true) &&
-        isConstantOrConstantVector(N11, /* NoOpaques */ true)) {
-      SDValue NewC = DAG.FoldConstantArithmetic(ISD::SUB, DL, VT, {N0, N11});
-      assert(NewC && "Constant folding failed");
+    if (SDValue NewC = DAG.FoldConstantArithmetic(ISD::SUB, DL, VT, {N0, N11}))
       return DAG.getNode(ISD::SUB, DL, VT, NewC, N1.getOperand(0));
-    }
   }
 
   // fold (A-C1)-C2 -> A-(C1+C2)
-  if (N0.getOpcode() == ISD::SUB &&
-      isConstantOrConstantVector(N1, /* NoOpaques */ true) &&
-      isConstantOrConstantVector(N0.getOperand(1), /* NoOpaques */ true)) {
-    SDValue NewC =
-        DAG.FoldConstantArithmetic(ISD::ADD, DL, VT, {N0.getOperand(1), N1});
-    assert(NewC && "Constant folding failed");
-    return DAG.getNode(ISD::SUB, DL, VT, N0.getOperand(0), NewC);
+  if (N0.getOpcode() == ISD::SUB) {
+    SDValue N01 = N0.getOperand(1);
+    if (SDValue NewC = DAG.FoldConstantArithmetic(ISD::ADD, DL, VT, {N01, N1}))
+      return DAG.getNode(ISD::SUB, DL, VT, N0.getOperand(0), NewC);
   }
 
   // fold (c1-A)-c2 -> (c1-c2)-A
-  if (N0.getOpcode() == ISD::SUB &&
-      isConstantOrConstantVector(N1, /* NoOpaques */ true) &&
-      isConstantOrConstantVector(N0.getOperand(0), /* NoOpaques */ true)) {
-    SDValue NewC =
-        DAG.FoldConstantArithmetic(ISD::SUB, DL, VT, {N0.getOperand(0), N1});
-    assert(NewC && "Constant folding failed");
-    return DAG.getNode(ISD::SUB, DL, VT, NewC, N0.getOperand(1));
+  if (N0.getOpcode() == ISD::SUB) {
+    SDValue N00 = N0.getOperand(0);
+    if (SDValue NewC = DAG.FoldConstantArithmetic(ISD::SUB, DL, VT, {N00, N1}))
+      return DAG.getNode(ISD::SUB, DL, VT, NewC, N0.getOperand(1));
   }
 
   // fold ((A+(B+or-C))-B) -> A+or-C
@@ -3471,7 +3652,7 @@ SDValue DAGCombiner::visitSUB(SDNode *N) {
     return V;
 
   // (x - y) - 1  ->  add (xor y, -1), x
-  if (N0.hasOneUse() && N0.getOpcode() == ISD::SUB && isOneOrOneSplat(N1)) {
+  if (N0.getOpcode() == ISD::SUB && N0.hasOneUse() && isOneOrOneSplat(N1)) {
     SDValue Xor = DAG.getNode(ISD::XOR, DL, VT, N0.getOperand(1),
                               DAG.getAllOnesConstant(DL, VT));
     return DAG.getNode(ISD::ADD, DL, VT, Xor, N0.getOperand(0));
@@ -3488,26 +3669,26 @@ SDValue DAGCombiner::visitSUB(SDNode *N) {
 
   // Hoist one-use addition by non-opaque constant:
   //   (x + C) - y  ->  (x - y) + C
-  if (N0.hasOneUse() && N0.getOpcode() == ISD::ADD &&
+  if (N0.getOpcode() == ISD::ADD && N0.hasOneUse() &&
       isConstantOrConstantVector(N0.getOperand(1), /*NoOpaques=*/true)) {
     SDValue Sub = DAG.getNode(ISD::SUB, DL, VT, N0.getOperand(0), N1);
     return DAG.getNode(ISD::ADD, DL, VT, Sub, N0.getOperand(1));
   }
   // y - (x + C)  ->  (y - x) - C
-  if (N1.hasOneUse() && N1.getOpcode() == ISD::ADD &&
+  if (N1.getOpcode() == ISD::ADD && N1.hasOneUse() &&
       isConstantOrConstantVector(N1.getOperand(1), /*NoOpaques=*/true)) {
     SDValue Sub = DAG.getNode(ISD::SUB, DL, VT, N0, N1.getOperand(0));
     return DAG.getNode(ISD::SUB, DL, VT, Sub, N1.getOperand(1));
   }
   // (x - C) - y  ->  (x - y) - C
   // This is necessary because SUB(X,C) -> ADD(X,-C) doesn't work for vectors.
-  if (N0.hasOneUse() && N0.getOpcode() == ISD::SUB &&
+  if (N0.getOpcode() == ISD::SUB && N0.hasOneUse() &&
       isConstantOrConstantVector(N0.getOperand(1), /*NoOpaques=*/true)) {
     SDValue Sub = DAG.getNode(ISD::SUB, DL, VT, N0.getOperand(0), N1);
     return DAG.getNode(ISD::SUB, DL, VT, Sub, N0.getOperand(1));
   }
   // (C - x) - y  ->  C - (x + y)
-  if (N0.hasOneUse() && N0.getOpcode() == ISD::SUB &&
+  if (N0.getOpcode() == ISD::SUB && N0.hasOneUse() &&
       isConstantOrConstantVector(N0.getOperand(0), /*NoOpaques=*/true)) {
     SDValue Add = DAG.getNode(ISD::ADD, DL, VT, N0.getOperand(1), N1);
     return DAG.getNode(ISD::SUB, DL, VT, N0.getOperand(0), Add);
@@ -3562,7 +3743,7 @@ SDValue DAGCombiner::visitSUB(SDNode *N) {
   }
 
   // canonicalize (sub X, (vscale * C)) to (add X, (vscale * -C))
-  if (N1.getOpcode() == ISD::VSCALE) {
+  if (N1.getOpcode() == ISD::VSCALE && N1.hasOneUse()) {
     const APInt &IntVal = N1.getConstantOperandAPInt(0);
     return DAG.getNode(ISD::ADD, DL, VT, N0, DAG.getVScale(DL, VT, -IntVal));
   }
@@ -3586,6 +3767,21 @@ SDValue DAGCombiner::visitSUB(SDNode *N) {
     }
   }
 
+  // As with the previous fold, prefer add for more folding potential.
+  // Subtracting SMIN/0 is the same as adding SMIN/0:
+  // N0 - (X << BW-1) --> N0 + (X << BW-1)
+  if (N1.getOpcode() == ISD::SHL) {
+    ConstantSDNode *ShlC = isConstOrConstSplat(N1.getOperand(1));
+    if (ShlC && ShlC->getAPIntValue() == VT.getScalarSizeInBits() - 1)
+      return DAG.getNode(ISD::ADD, DL, VT, N1, N0);
+  }
+
+  // (sub (subcarry X, 0, Carry), Y) -> (subcarry X, Y, Carry)
+  if (N0.getOpcode() == ISD::SUBCARRY && isNullConstant(N0.getOperand(1)) &&
+      N0.getResNo() == 0 && N0.hasOneUse())
+    return DAG.getNode(ISD::SUBCARRY, DL, N0->getVTList(),
+                       N0.getOperand(0), N1, N0.getOperand(2));
+
   if (TLI.isOperationLegalOrCustom(ISD::ADDCARRY, VT)) {
     // (sub Carry, X)  ->  (addcarry (sub 0, X), 0, Carry)
     if (SDValue Carry = getAsCarry(TLI, N0)) {
@@ -3598,6 +3794,35 @@ SDValue DAGCombiner::visitSUB(SDNode *N) {
     }
   }
 
+  // If there's no chance of borrowing from adjacent bits, then sub is xor:
+  // sub C0, X --> xor X, C0
+  if (ConstantSDNode *C0 = isConstOrConstSplat(N0)) {
+    if (!C0->isOpaque()) {
+      const APInt &C0Val = C0->getAPIntValue();
+      const APInt &MaybeOnes = ~DAG.computeKnownBits(N1).Zero;
+      if ((C0Val - MaybeOnes) == (C0Val ^ MaybeOnes))
+        return DAG.getNode(ISD::XOR, DL, VT, N1, N0);
+    }
+  }
+
+  // max(a,b) - min(a,b) --> abd(a,b)
+  auto MatchSubMaxMin = [&](unsigned Max, unsigned Min, unsigned Abd) {
+    if (N0.getOpcode() != Max || N1.getOpcode() != Min)
+      return SDValue();
+    if ((N0.getOperand(0) != N1.getOperand(0) ||
+         N0.getOperand(1) != N1.getOperand(1)) &&
+        (N0.getOperand(0) != N1.getOperand(1) ||
+         N0.getOperand(1) != N1.getOperand(0)))
+      return SDValue();
+    if (!TLI.isOperationLegalOrCustom(Abd, VT))
+      return SDValue();
+    return DAG.getNode(Abd, DL, VT, N0.getOperand(0), N0.getOperand(1));
+  };
+  if (SDValue R = MatchSubMaxMin(ISD::SMAX, ISD::SMIN, ISD::ABDS))
+    return R;
+  if (SDValue R = MatchSubMaxMin(ISD::UMAX, ISD::UMIN, ISD::ABDU))
+    return R;
+
   return SDValue();
 }
 
@@ -3607,15 +3832,6 @@ SDValue DAGCombiner::visitSUBSAT(SDNode *N) {
   EVT VT = N0.getValueType();
   SDLoc DL(N);
 
-  // fold vector ops
-  if (VT.isVector()) {
-    // TODO SimplifyVBinOp
-
-    // fold (sub_sat x, 0) -> x, vector edition
-    if (ISD::isConstantSplatVectorAllZeros(N1.getNode()))
-      return N0;
-  }
-
   // fold (sub_sat x, undef) -> 0
   if (N0.isUndef() || N1.isUndef())
     return DAG.getConstant(0, DL, VT);
@@ -3628,6 +3844,16 @@ SDValue DAGCombiner::visitSUBSAT(SDNode *N) {
   if (SDValue C = DAG.FoldConstantArithmetic(N->getOpcode(), DL, VT, {N0, N1}))
     return C;
 
+  // fold vector ops
+  if (VT.isVector()) {
+    if (SDValue FoldedVOp = SimplifyVBinOp(N, DL))
+      return FoldedVOp;
+
+    // fold (sub_sat x, 0) -> x, vector edition
+    if (ISD::isConstantSplatVectorAllZeros(N1.getNode()))
+      return N0;
+  }
+
   // fold (sub_sat x, 0) -> x
   if (isNullConstant(N1))
     return N0;
@@ -3772,18 +3998,28 @@ SDValue DAGCombiner::visitMUL(SDNode *N) {
   SDValue N0 = N->getOperand(0);
   SDValue N1 = N->getOperand(1);
   EVT VT = N0.getValueType();
+  SDLoc DL(N);
 
   // fold (mul x, undef) -> 0
   if (N0.isUndef() || N1.isUndef())
-    return DAG.getConstant(0, SDLoc(N), VT);
+    return DAG.getConstant(0, DL, VT);
 
-  bool N1IsConst = false;
-  bool N1IsOpaqueConst = false;
-  APInt ConstValue1;
+  // fold (mul c1, c2) -> c1*c2
+  if (SDValue C = DAG.FoldConstantArithmetic(ISD::MUL, DL, VT, {N0, N1}))
+    return C;
 
-  // fold vector ops
+  // canonicalize constant to RHS (vector doesn't have to splat)
+  if (DAG.isConstantIntBuildVectorOrConstantInt(N0) &&
+      !DAG.isConstantIntBuildVectorOrConstantInt(N1))
+    return DAG.getNode(ISD::MUL, DL, VT, N1, N0);
+
+  bool N1IsConst = false;
+  bool N1IsOpaqueConst = false;
+  APInt ConstValue1;
+
+  // fold vector ops
   if (VT.isVector()) {
-    if (SDValue FoldedVOp = SimplifyVBinOp(N))
+    if (SDValue FoldedVOp = SimplifyVBinOp(N, DL))
       return FoldedVOp;
 
     N1IsConst = ISD::isConstantSplatVector(N1.getNode(), ConstValue1);
@@ -3798,38 +4034,25 @@ SDValue DAGCombiner::visitMUL(SDNode *N) {
     }
   }
 
-  // fold (mul c1, c2) -> c1*c2
-  if (SDValue C = DAG.FoldConstantArithmetic(ISD::MUL, SDLoc(N), VT, {N0, N1}))
-    return C;
-
-  // canonicalize constant to RHS (vector doesn't have to splat)
-  if (DAG.isConstantIntBuildVectorOrConstantInt(N0) &&
-     !DAG.isConstantIntBuildVectorOrConstantInt(N1))
-    return DAG.getNode(ISD::MUL, SDLoc(N), VT, N1, N0);
-
   // fold (mul x, 0) -> 0
-  if (N1IsConst && ConstValue1.isNullValue())
+  if (N1IsConst && ConstValue1.isZero())
     return N1;
 
   // fold (mul x, 1) -> x
-  if (N1IsConst && ConstValue1.isOneValue())
+  if (N1IsConst && ConstValue1.isOne())
     return N0;
 
   if (SDValue NewSel = foldBinOpIntoSelect(N))
     return NewSel;
 
   // fold (mul x, -1) -> 0-x
-  if (N1IsConst && ConstValue1.isAllOnesValue()) {
-    SDLoc DL(N);
-    return DAG.getNode(ISD::SUB, DL, VT,
-                       DAG.getConstant(0, DL, VT), N0);
-  }
+  if (N1IsConst && ConstValue1.isAllOnes())
+    return DAG.getNegative(N0, DL, VT);
 
   // fold (mul x, (1 << c)) -> x << c
   if (isConstantOrConstantVector(N1, /*NoOpaques*/ true) &&
       DAG.isKnownToBeAPowerOfTwo(N1) &&
       (!VT.isVector() || Level <= AfterLegalizeVectorOps)) {
-    SDLoc DL(N);
     SDValue LogBase2 = BuildLogBase2(N1, DL);
     EVT ShiftVT = getShiftAmountTy(N0.getValueType());
     SDValue Trunc = DAG.getZExtOrTrunc(LogBase2, DL, ShiftVT);
@@ -3837,9 +4060,8 @@ SDValue DAGCombiner::visitMUL(SDNode *N) {
   }
 
   // fold (mul x, -(1 << c)) -> -(x << c) or (-x) << c
-  if (N1IsConst && !N1IsOpaqueConst && (-ConstValue1).isPowerOf2()) {
+  if (N1IsConst && !N1IsOpaqueConst && ConstValue1.isNegatedPowerOf2()) {
     unsigned Log2Val = (-ConstValue1).logBase2();
-    SDLoc DL(N);
     // FIXME: If the input is something that is easily negated (e.g. a
     // single-use add), we should put the negate there.
     return DAG.getNode(ISD::SUB, DL, VT,
@@ -3849,6 +4071,21 @@ SDValue DAGCombiner::visitMUL(SDNode *N) {
                                       getShiftAmountTy(N0.getValueType()))));
   }
 
+  // Attempt to reuse an existing umul_lohi/smul_lohi node, but only if the
+  // hi result is in use in case we hit this mid-legalization.
+  for (unsigned LoHiOpc : {ISD::UMUL_LOHI, ISD::SMUL_LOHI}) {
+    if (!LegalOperations || TLI.isOperationLegalOrCustom(LoHiOpc, VT)) {
+      SDVTList LoHiVT = DAG.getVTList(VT, VT);
+      // TODO: Can we match commutable operands with getNodeIfExists?
+      if (SDNode *LoHi = DAG.getNodeIfExists(LoHiOpc, LoHiVT, {N0, N1}))
+        if (LoHi->hasAnyUseOfValue(1))
+          return SDValue(LoHi, 0);
+      if (SDNode *LoHi = DAG.getNodeIfExists(LoHiOpc, LoHiVT, {N1, N0}))
+        if (LoHi->hasAnyUseOfValue(1))
+          return SDValue(LoHi, 0);
+    }
+  }
+
   // Try to transform:
   // (1) multiply-by-(power-of-2 +/- 1) into shift and add/sub.
   // mul x, (2^N + 1) --> add (shl x, N), x
@@ -3884,7 +4121,6 @@ SDValue DAGCombiner::visitMUL(SDNode *N) {
       ShAmt += TZeros;
       assert(ShAmt < VT.getScalarSizeInBits() &&
              "multiply-by-constant generated out of bounds shift");
-      SDLoc DL(N);
       SDValue Shl =
           DAG.getNode(ISD::SHL, DL, VT, N0, DAG.getConstant(ShAmt, DL, VT));
       SDValue R =
@@ -3893,39 +4129,36 @@ SDValue DAGCombiner::visitMUL(SDNode *N) {
                                            DAG.getConstant(TZeros, DL, VT)))
                  : DAG.getNode(MathOp, DL, VT, Shl, N0);
       if (ConstValue1.isNegative())
-        R = DAG.getNode(ISD::SUB, DL, VT, DAG.getConstant(0, DL, VT), R);
+        R = DAG.getNegative(R, DL, VT);
       return R;
     }
   }
 
   // (mul (shl X, c1), c2) -> (mul X, c2 << c1)
-  if (N0.getOpcode() == ISD::SHL &&
-      isConstantOrConstantVector(N1, /* NoOpaques */ true) &&
-      isConstantOrConstantVector(N0.getOperand(1), /* NoOpaques */ true)) {
-    SDValue C3 = DAG.getNode(ISD::SHL, SDLoc(N), VT, N1, N0.getOperand(1));
-    if (isConstantOrConstantVector(C3))
-      return DAG.getNode(ISD::MUL, SDLoc(N), VT, N0.getOperand(0), C3);
+  if (N0.getOpcode() == ISD::SHL) {
+    SDValue N01 = N0.getOperand(1);
+    if (SDValue C3 = DAG.FoldConstantArithmetic(ISD::SHL, DL, VT, {N1, N01}))
+      return DAG.getNode(ISD::MUL, DL, VT, N0.getOperand(0), C3);
   }
 
   // Change (mul (shl X, C), Y) -> (shl (mul X, Y), C) when the shift has one
   // use.
   {
-    SDValue Sh(nullptr, 0), Y(nullptr, 0);
+    SDValue Sh, Y;
 
     // Check for both (mul (shl X, C), Y)  and  (mul Y, (shl X, C)).
     if (N0.getOpcode() == ISD::SHL &&
-        isConstantOrConstantVector(N0.getOperand(1)) &&
-        N0.getNode()->hasOneUse()) {
+        isConstantOrConstantVector(N0.getOperand(1)) && N0->hasOneUse()) {
       Sh = N0; Y = N1;
     } else if (N1.getOpcode() == ISD::SHL &&
                isConstantOrConstantVector(N1.getOperand(1)) &&
-               N1.getNode()->hasOneUse()) {
+               N1->hasOneUse()) {
       Sh = N1; Y = N0;
     }
 
     if (Sh.getNode()) {
-      SDValue Mul = DAG.getNode(ISD::MUL, SDLoc(N), VT, Sh.getOperand(0), Y);
-      return DAG.getNode(ISD::SHL, SDLoc(N), VT, Mul, Sh.getOperand(1));
+      SDValue Mul = DAG.getNode(ISD::MUL, DL, VT, Sh.getOperand(0), Y);
+      return DAG.getNode(ISD::SHL, DL, VT, Mul, Sh.getOperand(1));
     }
   }
 
@@ -3934,28 +4167,27 @@ SDValue DAGCombiner::visitMUL(SDNode *N) {
       N0.getOpcode() == ISD::ADD &&
       DAG.isConstantIntBuildVectorOrConstantInt(N0.getOperand(1)) &&
       isMulAddWithConstProfitable(N, N0, N1))
-      return DAG.getNode(ISD::ADD, SDLoc(N), VT,
-                         DAG.getNode(ISD::MUL, SDLoc(N0), VT,
-                                     N0.getOperand(0), N1),
-                         DAG.getNode(ISD::MUL, SDLoc(N1), VT,
-                                     N0.getOperand(1), N1));
+    return DAG.getNode(
+        ISD::ADD, DL, VT,
+        DAG.getNode(ISD::MUL, SDLoc(N0), VT, N0.getOperand(0), N1),
+        DAG.getNode(ISD::MUL, SDLoc(N1), VT, N0.getOperand(1), N1));
 
   // Fold (mul (vscale * C0), C1) to (vscale * (C0 * C1)).
-  if (N0.getOpcode() == ISD::VSCALE)
-    if (ConstantSDNode *NC1 = isConstOrConstSplat(N1)) {
-      const APInt &C0 = N0.getConstantOperandAPInt(0);
-      const APInt &C1 = NC1->getAPIntValue();
-      return DAG.getVScale(SDLoc(N), VT, C0 * C1);
-    }
+  ConstantSDNode *NC1 = isConstOrConstSplat(N1);
+  if (N0.getOpcode() == ISD::VSCALE && NC1) {
+    const APInt &C0 = N0.getConstantOperandAPInt(0);
+    const APInt &C1 = NC1->getAPIntValue();
+    return DAG.getVScale(DL, VT, C0 * C1);
+  }
 
   // Fold (mul step_vector(C0), C1) to (step_vector(C0 * C1)).
   APInt MulVal;
-  if (N0.getOpcode() == ISD::STEP_VECTOR)
-    if (ISD::isConstantSplatVector(N1.getNode(), MulVal)) {
-      const APInt &C0 = N0.getConstantOperandAPInt(0);
-      APInt NewStep = C0 * MulVal;
-      return DAG.getStepVector(SDLoc(N), VT, NewStep);
-    }
+  if (N0.getOpcode() == ISD::STEP_VECTOR &&
+      ISD::isConstantSplatVector(N1.getNode(), MulVal)) {
+    const APInt &C0 = N0.getConstantOperandAPInt(0);
+    APInt NewStep = C0 * MulVal;
+    return DAG.getStepVector(DL, VT, NewStep);
+  }
 
   // Fold ((mul x, 0/undef) -> 0,
   //       (mul x, 1) -> x) -> x)
@@ -3966,7 +4198,7 @@ SDValue DAGCombiner::visitMUL(SDNode *N) {
     SmallBitVector ClearMask;
     ClearMask.reserve(NumElts);
     auto IsClearMask = [&ClearMask](ConstantSDNode *V) {
-      if (!V || V->isNullValue()) {
+      if (!V || V->isZero()) {
         ClearMask.push_back(true);
         return true;
       }
@@ -3976,7 +4208,6 @@ SDValue DAGCombiner::visitMUL(SDNode *N) {
     if ((!LegalOperations || TLI.isOperationLegalOrCustom(ISD::AND, VT)) &&
         ISD::matchUnaryPredicate(N1, IsClearMask, /*AllowUndefs*/ true)) {
       assert(N1.getOpcode() == ISD::BUILD_VECTOR && "Unknown constant vector");
-      SDLoc DL(N);
       EVT LegalSVT = N1.getOperand(0).getValueType();
       SDValue Zero = DAG.getConstant(0, DL, LegalSVT);
       SDValue AllOnes = DAG.getAllOnesConstant(DL, LegalSVT);
@@ -3989,9 +4220,13 @@ SDValue DAGCombiner::visitMUL(SDNode *N) {
   }
 
   // reassociate mul
-  if (SDValue RMUL = reassociateOps(ISD::MUL, SDLoc(N), N0, N1, N->getFlags()))
+  if (SDValue RMUL = reassociateOps(ISD::MUL, DL, N0, N1, N->getFlags()))
     return RMUL;
 
+  // Simplify the operands using demanded-bits information.
+  if (SimplifyDemandedBits(SDValue(N, 0)))
+    return SDValue(N, 0);
+
   return SDValue();
 }
 
@@ -4052,9 +4287,7 @@ SDValue DAGCombiner::useDivRem(SDNode *Node) {
   SDValue Op0 = Node->getOperand(0);
   SDValue Op1 = Node->getOperand(1);
   SDValue combined;
-  for (SDNode::use_iterator UI = Op0.getNode()->use_begin(),
-         UE = Op0.getNode()->use_end(); UI != UE; ++UI) {
-    SDNode *User = *UI;
+  for (SDNode *User : Op0->uses()) {
     if (User == Node || User->getOpcode() == ISD::DELETED_NODE ||
         User->use_empty())
       continue;
@@ -4111,7 +4344,7 @@ static SDValue simplifyDivRem(SDNode *N, SelectionDAG &DAG) {
   // 0 / X -> 0
   // 0 % X -> 0
   ConstantSDNode *N0C = isConstOrConstSplat(N0);
-  if (N0C && N0C->isNullValue())
+  if (N0C && N0C->isZero())
     return N0;
 
   // X / X -> 1
@@ -4136,22 +4369,21 @@ SDValue DAGCombiner::visitSDIV(SDNode *N) {
   SDValue N1 = N->getOperand(1);
   EVT VT = N->getValueType(0);
   EVT CCVT = getSetCCResultType(VT);
-
-  // fold vector ops
-  if (VT.isVector())
-    if (SDValue FoldedVOp = SimplifyVBinOp(N))
-      return FoldedVOp;
-
   SDLoc DL(N);
 
   // fold (sdiv c1, c2) -> c1/c2
-  ConstantSDNode *N1C = isConstOrConstSplat(N1);
   if (SDValue C = DAG.FoldConstantArithmetic(ISD::SDIV, DL, VT, {N0, N1}))
     return C;
 
+  // fold vector ops
+  if (VT.isVector())
+    if (SDValue FoldedVOp = SimplifyVBinOp(N, DL))
+      return FoldedVOp;
+
   // fold (sdiv X, -1) -> 0-X
-  if (N1C && N1C->isAllOnesValue())
-    return DAG.getNode(ISD::SUB, DL, VT, DAG.getConstant(0, DL, VT), N0);
+  ConstantSDNode *N1C = isConstOrConstSplat(N1);
+  if (N1C && N1C->isAllOnes())
+    return DAG.getNegative(N0, DL, VT);
 
   // fold (sdiv X, MIN_SIGNED) -> select(X == MIN_SIGNED, 1, 0)
   if (N1C && N1C->getAPIntValue().isMinSignedValue())
@@ -4195,29 +4427,33 @@ SDValue DAGCombiner::visitSDIV(SDNode *N) {
   return SDValue();
 }
 
-SDValue DAGCombiner::visitSDIVLike(SDValue N0, SDValue N1, SDNode *N) {
-  SDLoc DL(N);
-  EVT VT = N->getValueType(0);
-  EVT CCVT = getSetCCResultType(VT);
-  unsigned BitWidth = VT.getScalarSizeInBits();
-
+static bool isDivisorPowerOfTwo(SDValue Divisor) {
   // Helper for determining whether a value is a power-2 constant scalar or a
   // vector of such elements.
   auto IsPowerOfTwo = [](ConstantSDNode *C) {
-    if (C->isNullValue() || C->isOpaque())
+    if (C->isZero() || C->isOpaque())
       return false;
     if (C->getAPIntValue().isPowerOf2())
       return true;
-    if ((-C->getAPIntValue()).isPowerOf2())
+    if (C->getAPIntValue().isNegatedPowerOf2())
       return true;
     return false;
   };
 
+  return ISD::matchUnaryPredicate(Divisor, IsPowerOfTwo);
+}
+
+SDValue DAGCombiner::visitSDIVLike(SDValue N0, SDValue N1, SDNode *N) {
+  SDLoc DL(N);
+  EVT VT = N->getValueType(0);
+  EVT CCVT = getSetCCResultType(VT);
+  unsigned BitWidth = VT.getScalarSizeInBits();
+
   // fold (sdiv X, pow2) -> simple ops after legalize
   // FIXME: We check for the exact bit here because the generic lowering gives
   // better results in that case. The target-specific lowering should learn how
   // to handle exact sdivs efficiently.
-  if (!N->getFlags().hasExact() && ISD::matchUnaryPredicate(N1, IsPowerOfTwo)) {
+  if (!N->getFlags().hasExact() && isDivisorPowerOfTwo(N1)) {
     // Target-specific implementation of sdiv x, pow2.
     if (SDValue Res = BuildSDIVPow2(N))
       return Res;
@@ -4281,24 +4517,24 @@ SDValue DAGCombiner::visitUDIV(SDNode *N) {
   SDValue N1 = N->getOperand(1);
   EVT VT = N->getValueType(0);
   EVT CCVT = getSetCCResultType(VT);
-
-  // fold vector ops
-  if (VT.isVector())
-    if (SDValue FoldedVOp = SimplifyVBinOp(N))
-      return FoldedVOp;
-
   SDLoc DL(N);
 
   // fold (udiv c1, c2) -> c1/c2
-  ConstantSDNode *N1C = isConstOrConstSplat(N1);
   if (SDValue C = DAG.FoldConstantArithmetic(ISD::UDIV, DL, VT, {N0, N1}))
     return C;
 
+  // fold vector ops
+  if (VT.isVector())
+    if (SDValue FoldedVOp = SimplifyVBinOp(N, DL))
+      return FoldedVOp;
+
   // fold (udiv X, -1) -> select(X == -1, 1, 0)
-  if (N1C && N1C->getAPIntValue().isAllOnesValue())
+  ConstantSDNode *N1C = isConstOrConstSplat(N1);
+  if (N1C && N1C->isAllOnes() && CCVT.isVector() == VT.isVector()) {
     return DAG.getSelect(DL, VT, DAG.getSetCC(DL, CCVT, N0, N1, ISD::SETEQ),
                          DAG.getConstant(1, DL, VT),
                          DAG.getConstant(0, DL, VT));
+  }
 
   if (SDValue V = simplifyDivRem(N, DAG))
     return V;
@@ -4374,6 +4610,16 @@ SDValue DAGCombiner::visitUDIVLike(SDValue N0, SDValue N1, SDNode *N) {
   return SDValue();
 }
 
+SDValue DAGCombiner::buildOptimizedSREM(SDValue N0, SDValue N1, SDNode *N) {
+  if (!N->getFlags().hasExact() && isDivisorPowerOfTwo(N1) &&
+      !DAG.doesNodeExist(ISD::SDIV, N->getVTList(), {N0, N1})) {
+    // Target-specific implementation of srem x, pow2.
+    if (SDValue Res = BuildSREMPow2(N))
+      return Res;
+  }
+  return SDValue();
+}
+
 // handles ISD::SREM and ISD::UREM
 SDValue DAGCombiner::visitREM(SDNode *N) {
   unsigned Opcode = N->getOpcode();
@@ -4386,14 +4632,17 @@ SDValue DAGCombiner::visitREM(SDNode *N) {
   SDLoc DL(N);
 
   // fold (rem c1, c2) -> c1%c2
-  ConstantSDNode *N1C = isConstOrConstSplat(N1);
   if (SDValue C = DAG.FoldConstantArithmetic(Opcode, DL, VT, {N0, N1}))
     return C;
 
-  // fold (urem X, -1) -> select(X == -1, 0, x)
-  if (!isSigned && N1C && N1C->getAPIntValue().isAllOnesValue())
-    return DAG.getSelect(DL, VT, DAG.getSetCC(DL, CCVT, N0, N1, ISD::SETEQ),
-                         DAG.getConstant(0, DL, VT), N0);
+  // fold (urem X, -1) -> select(FX == -1, 0, FX)
+  // Freeze the numerator to avoid a miscompile with an undefined value.
+  if (!isSigned && llvm::isAllOnesOrAllOnesSplat(N1, /*AllowUndefs*/ false) &&
+      CCVT.isVector() == VT.isVector()) {
+    SDValue F0 = DAG.getFreeze(N0);
+    SDValue EqualsNeg1 = DAG.getSetCC(DL, CCVT, F0, N1, ISD::SETEQ);
+    return DAG.getSelect(DL, VT, EqualsNeg1, DAG.getConstant(0, DL, VT), F0);
+  }
 
   if (SDValue V = simplifyDivRem(N, DAG))
     return V;
@@ -4414,9 +4663,12 @@ SDValue DAGCombiner::visitREM(SDNode *N) {
       AddToWorklist(Add.getNode());
       return DAG.getNode(ISD::AND, DL, VT, N0, Add);
     }
-    if (N1.getOpcode() == ISD::SHL &&
+    // fold (urem x, (shl pow2, y)) -> (and x, (add (shl pow2, y), -1))
+    // fold (urem x, (lshr pow2, y)) -> (and x, (add (lshr pow2, y), -1))
+    // TODO: We should sink the following into isKnownToBePowerOfTwo
+    // using a OrZero parameter analogous to our handling in ValueTracking.
+    if ((N1.getOpcode() == ISD::SHL || N1.getOpcode() == ISD::SRL) &&
         DAG.isKnownToBeAPowerOfTwo(N1.getOperand(0))) {
-      // fold (urem x, (shl pow2, y)) -> (and x, (add (shl pow2, y), -1))
       SDValue NegOne = DAG.getAllOnesConstant(DL, VT);
       SDValue Add = DAG.getNode(ISD::ADD, DL, VT, N1, NegOne);
       AddToWorklist(Add.getNode());
@@ -4434,9 +4686,15 @@ SDValue DAGCombiner::visitREM(SDNode *N) {
   // combine will not return a DIVREM.  Regardless, checking cheapness here
   // makes sense since the simplification results in fatter code.
   if (DAG.isKnownNeverZero(N1) && !TLI.isIntDivCheap(VT, Attr)) {
+    if (isSigned) {
+      // check if we can build faster implementation for srem
+      if (SDValue OptimizedRem = buildOptimizedSREM(N0, N1, N))
+        return OptimizedRem;
+    }
+
     SDValue OptimizedDiv =
         isSigned ? visitSDIVLike(N0, N1, N) : visitUDIVLike(N0, N1, N);
-    if (OptimizedDiv.getNode()) {
+    if (OptimizedDiv.getNode() && OptimizedDiv.getNode() != N) {
       // If the equivalent Div node also exists, update its users.
       unsigned DivOpcode = isSigned ? ISD::SDIV : ISD::UDIV;
       if (SDNode *DivNode = DAG.getNodeIfExists(DivOpcode, N->getVTList(),
@@ -4463,21 +4721,29 @@ SDValue DAGCombiner::visitMULHS(SDNode *N) {
   EVT VT = N->getValueType(0);
   SDLoc DL(N);
 
+  // fold (mulhs c1, c2)
+  if (SDValue C = DAG.FoldConstantArithmetic(ISD::MULHS, DL, VT, {N0, N1}))
+    return C;
+
+  // canonicalize constant to RHS.
+  if (DAG.isConstantIntBuildVectorOrConstantInt(N0) &&
+      !DAG.isConstantIntBuildVectorOrConstantInt(N1))
+    return DAG.getNode(ISD::MULHS, DL, N->getVTList(), N1, N0);
+
   if (VT.isVector()) {
+    if (SDValue FoldedVOp = SimplifyVBinOp(N, DL))
+      return FoldedVOp;
+
     // fold (mulhs x, 0) -> 0
-    // do not return N0/N1, because undef node may exist.
-    if (ISD::isConstantSplatVectorAllZeros(N0.getNode()) ||
-        ISD::isConstantSplatVectorAllZeros(N1.getNode()))
+    // do not return N1, because undef node may exist.
+    if (ISD::isConstantSplatVectorAllZeros(N1.getNode()))
       return DAG.getConstant(0, DL, VT);
   }
 
-  // fold (mulhs c1, c2)
-  if (SDValue C = DAG.FoldConstantArithmetic(ISD::MULHS, DL, VT, {N0, N1}))
-    return C;
-
   // fold (mulhs x, 0) -> 0
   if (isNullConstant(N1))
     return N1;
+
   // fold (mulhs x, 1) -> (sra x, size(x)-1)
   if (isOneConstant(N1))
     return DAG.getNode(ISD::SRA, DL, N0.getValueType(), N0,
@@ -4515,24 +4781,33 @@ SDValue DAGCombiner::visitMULHU(SDNode *N) {
   EVT VT = N->getValueType(0);
   SDLoc DL(N);
 
+  // fold (mulhu c1, c2)
+  if (SDValue C = DAG.FoldConstantArithmetic(ISD::MULHU, DL, VT, {N0, N1}))
+    return C;
+
+  // canonicalize constant to RHS.
+  if (DAG.isConstantIntBuildVectorOrConstantInt(N0) &&
+      !DAG.isConstantIntBuildVectorOrConstantInt(N1))
+    return DAG.getNode(ISD::MULHU, DL, N->getVTList(), N1, N0);
+
   if (VT.isVector()) {
+    if (SDValue FoldedVOp = SimplifyVBinOp(N, DL))
+      return FoldedVOp;
+
     // fold (mulhu x, 0) -> 0
-    // do not return N0/N1, because undef node may exist.
-    if (ISD::isConstantSplatVectorAllZeros(N0.getNode()) ||
-        ISD::isConstantSplatVectorAllZeros(N1.getNode()))
+    // do not return N1, because undef node may exist.
+    if (ISD::isConstantSplatVectorAllZeros(N1.getNode()))
       return DAG.getConstant(0, DL, VT);
   }
 
-  // fold (mulhu c1, c2)
-  if (SDValue C = DAG.FoldConstantArithmetic(ISD::MULHU, DL, VT, {N0, N1}))
-    return C;
-
   // fold (mulhu x, 0) -> 0
   if (isNullConstant(N1))
     return N1;
+
   // fold (mulhu x, 1) -> 0
   if (isOneConstant(N1))
     return DAG.getConstant(0, DL, N0.getValueType());
+
   // fold (mulhu x, undef) -> 0
   if (N0.isUndef() || N1.isUndef())
     return DAG.getConstant(0, DL, VT);
@@ -4567,6 +4842,52 @@ SDValue DAGCombiner::visitMULHU(SDNode *N) {
     }
   }
 
+  // Simplify the operands using demanded-bits information.
+  // We don't have demanded bits support for MULHU so this just enables constant
+  // folding based on known bits.
+  if (SimplifyDemandedBits(SDValue(N, 0)))
+    return SDValue(N, 0);
+
+  return SDValue();
+}
+
+SDValue DAGCombiner::visitAVG(SDNode *N) {
+  unsigned Opcode = N->getOpcode();
+  SDValue N0 = N->getOperand(0);
+  SDValue N1 = N->getOperand(1);
+  EVT VT = N->getValueType(0);
+  SDLoc DL(N);
+
+  // fold (avg c1, c2)
+  if (SDValue C = DAG.FoldConstantArithmetic(Opcode, DL, VT, {N0, N1}))
+    return C;
+
+  // canonicalize constant to RHS.
+  if (DAG.isConstantIntBuildVectorOrConstantInt(N0) &&
+      !DAG.isConstantIntBuildVectorOrConstantInt(N1))
+    return DAG.getNode(Opcode, DL, N->getVTList(), N1, N0);
+
+  if (VT.isVector()) {
+    if (SDValue FoldedVOp = SimplifyVBinOp(N, DL))
+      return FoldedVOp;
+
+    // fold (avgfloor x, 0) -> x >> 1
+    if (ISD::isConstantSplatVectorAllZeros(N1.getNode())) {
+      if (Opcode == ISD::AVGFLOORS)
+        return DAG.getNode(ISD::SRA, DL, VT, N0, DAG.getConstant(1, DL, VT));
+      if (Opcode == ISD::AVGFLOORU)
+        return DAG.getNode(ISD::SRL, DL, VT, N0, DAG.getConstant(1, DL, VT));
+    }
+  }
+
+  // fold (avg x, undef) -> x
+  if (N0.isUndef())
+    return N1;
+  if (N1.isUndef())
+    return N0;
+
+  // TODO If we use avg for scalars anywhere, we can add (avgfl x, 0) -> x >> 1
+
   return SDValue();
 }
 
@@ -4623,9 +4944,16 @@ SDValue DAGCombiner::visitSMUL_LOHI(SDNode *N) {
   if (SDValue Res = SimplifyNodeWithTwoResults(N, ISD::MUL, ISD::MULHS))
     return Res;
 
+  SDValue N0 = N->getOperand(0);
+  SDValue N1 = N->getOperand(1);
   EVT VT = N->getValueType(0);
   SDLoc DL(N);
 
+  // canonicalize constant to RHS (vector doesn't have to splat)
+  if (DAG.isConstantIntBuildVectorOrConstantInt(N0) &&
+      !DAG.isConstantIntBuildVectorOrConstantInt(N1))
+    return DAG.getNode(ISD::SMUL_LOHI, DL, N->getVTList(), N1, N0);
+
   // If the type is twice as wide is legal, transform the mulhu to a wider
   // multiply plus a shift.
   if (VT.isSimple() && !VT.isVector()) {
@@ -4633,8 +4961,8 @@ SDValue DAGCombiner::visitSMUL_LOHI(SDNode *N) {
     unsigned SimpleSize = Simple.getSizeInBits();
     EVT NewVT = EVT::getIntegerVT(*DAG.getContext(), SimpleSize*2);
     if (TLI.isOperationLegal(ISD::MUL, NewVT)) {
-      SDValue Lo = DAG.getNode(ISD::SIGN_EXTEND, DL, NewVT, N->getOperand(0));
-      SDValue Hi = DAG.getNode(ISD::SIGN_EXTEND, DL, NewVT, N->getOperand(1));
+      SDValue Lo = DAG.getNode(ISD::SIGN_EXTEND, DL, NewVT, N0);
+      SDValue Hi = DAG.getNode(ISD::SIGN_EXTEND, DL, NewVT, N1);
       Lo = DAG.getNode(ISD::MUL, DL, NewVT, Lo, Hi);
       // Compute the high part as N1.
       Hi = DAG.getNode(ISD::SRL, DL, NewVT, Lo,
@@ -4654,19 +4982,26 @@ SDValue DAGCombiner::visitUMUL_LOHI(SDNode *N) {
   if (SDValue Res = SimplifyNodeWithTwoResults(N, ISD::MUL, ISD::MULHU))
     return Res;
 
+  SDValue N0 = N->getOperand(0);
+  SDValue N1 = N->getOperand(1);
   EVT VT = N->getValueType(0);
   SDLoc DL(N);
 
+  // canonicalize constant to RHS (vector doesn't have to splat)
+  if (DAG.isConstantIntBuildVectorOrConstantInt(N0) &&
+      !DAG.isConstantIntBuildVectorOrConstantInt(N1))
+    return DAG.getNode(ISD::UMUL_LOHI, DL, N->getVTList(), N1, N0);
+
   // (umul_lohi N0, 0) -> (0, 0)
-  if (isNullConstant(N->getOperand(1))) {
+  if (isNullConstant(N1)) {
     SDValue Zero = DAG.getConstant(0, DL, VT);
     return CombineTo(N, Zero, Zero);
   }
 
   // (umul_lohi N0, 1) -> (N0, 0)
-  if (isOneConstant(N->getOperand(1))) {
+  if (isOneConstant(N1)) {
     SDValue Zero = DAG.getConstant(0, DL, VT);
-    return CombineTo(N, N->getOperand(0), Zero);
+    return CombineTo(N, N0, Zero);
   }
 
   // If the type is twice as wide is legal, transform the mulhu to a wider
@@ -4676,8 +5011,8 @@ SDValue DAGCombiner::visitUMUL_LOHI(SDNode *N) {
     unsigned SimpleSize = Simple.getSizeInBits();
     EVT NewVT = EVT::getIntegerVT(*DAG.getContext(), SimpleSize*2);
     if (TLI.isOperationLegal(ISD::MUL, NewVT)) {
-      SDValue Lo = DAG.getNode(ISD::ZERO_EXTEND, DL, NewVT, N->getOperand(0));
-      SDValue Hi = DAG.getNode(ISD::ZERO_EXTEND, DL, NewVT, N->getOperand(1));
+      SDValue Lo = DAG.getNode(ISD::ZERO_EXTEND, DL, NewVT, N0);
+      SDValue Hi = DAG.getNode(ISD::ZERO_EXTEND, DL, NewVT, N1);
       Lo = DAG.getNode(ISD::MUL, DL, NewVT, Lo, Hi);
       // Compute the high part as N1.
       Hi = DAG.getNode(ISD::SRL, DL, NewVT, Lo,
@@ -4728,7 +5063,9 @@ SDValue DAGCombiner::visitMULO(SDNode *N) {
                      DAG.getConstant(0, DL, CarryVT));
 
   // (mulo x, 2) -> (addo x, x)
-  if (N1C && N1C->getAPIntValue() == 2)
+  // FIXME: This needs a freeze.
+  if (N1C && N1C->getAPIntValue() == 2 &&
+      (!IsSigned || VT.getScalarSizeInBits() > 2))
     return DAG.getNode(IsSigned ? ISD::SADDO : ISD::UADDO, DL,
                        N->getVTList(), N0, N0);
 
@@ -4763,25 +5100,178 @@ SDValue DAGCombiner::visitMULO(SDNode *N) {
   return SDValue();
 }
 
+// Function to calculate whether the Min/Max pair of SDNodes (potentially
+// swapped around) make a signed saturate pattern, clamping to between a signed
+// saturate of -2^(BW-1) and 2^(BW-1)-1, or an unsigned saturate of 0 and 2^BW.
+// Returns the node being clamped and the bitwidth of the clamp in BW. Should
+// work with both SMIN/SMAX nodes and setcc/select combo. The operands are the
+// same as SimplifySelectCC. N0<N1 ? N2 : N3.
+static SDValue isSaturatingMinMax(SDValue N0, SDValue N1, SDValue N2,
+                                  SDValue N3, ISD::CondCode CC, unsigned &BW,
+                                  bool &Unsigned) {
+  auto isSignedMinMax = [&](SDValue N0, SDValue N1, SDValue N2, SDValue N3,
+                            ISD::CondCode CC) {
+    // The compare and select operand should be the same or the select operands
+    // should be truncated versions of the comparison.
+    if (N0 != N2 && (N2.getOpcode() != ISD::TRUNCATE || N0 != N2.getOperand(0)))
+      return 0;
+    // The constants need to be the same or a truncated version of each other.
+    ConstantSDNode *N1C = isConstOrConstSplat(N1);
+    ConstantSDNode *N3C = isConstOrConstSplat(N3);
+    if (!N1C || !N3C)
+      return 0;
+    const APInt &C1 = N1C->getAPIntValue();
+    const APInt &C2 = N3C->getAPIntValue();
+    if (C1.getBitWidth() < C2.getBitWidth() || C1 != C2.sext(C1.getBitWidth()))
+      return 0;
+    return CC == ISD::SETLT ? ISD::SMIN : (CC == ISD::SETGT ? ISD::SMAX : 0);
+  };
+
+  // Check the initial value is a SMIN/SMAX equivalent.
+  unsigned Opcode0 = isSignedMinMax(N0, N1, N2, N3, CC);
+  if (!Opcode0)
+    return SDValue();
+
+  SDValue N00, N01, N02, N03;
+  ISD::CondCode N0CC;
+  switch (N0.getOpcode()) {
+  case ISD::SMIN:
+  case ISD::SMAX:
+    N00 = N02 = N0.getOperand(0);
+    N01 = N03 = N0.getOperand(1);
+    N0CC = N0.getOpcode() == ISD::SMIN ? ISD::SETLT : ISD::SETGT;
+    break;
+  case ISD::SELECT_CC:
+    N00 = N0.getOperand(0);
+    N01 = N0.getOperand(1);
+    N02 = N0.getOperand(2);
+    N03 = N0.getOperand(3);
+    N0CC = cast<CondCodeSDNode>(N0.getOperand(4))->get();
+    break;
+  case ISD::SELECT:
+  case ISD::VSELECT:
+    if (N0.getOperand(0).getOpcode() != ISD::SETCC)
+      return SDValue();
+    N00 = N0.getOperand(0).getOperand(0);
+    N01 = N0.getOperand(0).getOperand(1);
+    N02 = N0.getOperand(1);
+    N03 = N0.getOperand(2);
+    N0CC = cast<CondCodeSDNode>(N0.getOperand(0).getOperand(2))->get();
+    break;
+  default:
+    return SDValue();
+  }
+
+  unsigned Opcode1 = isSignedMinMax(N00, N01, N02, N03, N0CC);
+  if (!Opcode1 || Opcode0 == Opcode1)
+    return SDValue();
+
+  ConstantSDNode *MinCOp = isConstOrConstSplat(Opcode0 == ISD::SMIN ? N1 : N01);
+  ConstantSDNode *MaxCOp = isConstOrConstSplat(Opcode0 == ISD::SMIN ? N01 : N1);
+  if (!MinCOp || !MaxCOp || MinCOp->getValueType(0) != MaxCOp->getValueType(0))
+    return SDValue();
+
+  const APInt &MinC = MinCOp->getAPIntValue();
+  const APInt &MaxC = MaxCOp->getAPIntValue();
+  APInt MinCPlus1 = MinC + 1;
+  if (-MaxC == MinCPlus1 && MinCPlus1.isPowerOf2()) {
+    BW = MinCPlus1.exactLogBase2() + 1;
+    Unsigned = false;
+    return N02;
+  }
+
+  if (MaxC == 0 && MinCPlus1.isPowerOf2()) {
+    BW = MinCPlus1.exactLogBase2();
+    Unsigned = true;
+    return N02;
+  }
+
+  return SDValue();
+}
+
+static SDValue PerformMinMaxFpToSatCombine(SDValue N0, SDValue N1, SDValue N2,
+                                           SDValue N3, ISD::CondCode CC,
+                                           SelectionDAG &DAG) {
+  unsigned BW;
+  bool Unsigned;
+  SDValue Fp = isSaturatingMinMax(N0, N1, N2, N3, CC, BW, Unsigned);
+  if (!Fp || Fp.getOpcode() != ISD::FP_TO_SINT)
+    return SDValue();
+  EVT FPVT = Fp.getOperand(0).getValueType();
+  EVT NewVT = EVT::getIntegerVT(*DAG.getContext(), BW);
+  if (FPVT.isVector())
+    NewVT = EVT::getVectorVT(*DAG.getContext(), NewVT,
+                             FPVT.getVectorElementCount());
+  unsigned NewOpc = Unsigned ? ISD::FP_TO_UINT_SAT : ISD::FP_TO_SINT_SAT;
+  if (!DAG.getTargetLoweringInfo().shouldConvertFpToSat(NewOpc, FPVT, NewVT))
+    return SDValue();
+  SDLoc DL(Fp);
+  SDValue Sat = DAG.getNode(NewOpc, DL, NewVT, Fp.getOperand(0),
+                            DAG.getValueType(NewVT.getScalarType()));
+  return Unsigned ? DAG.getZExtOrTrunc(Sat, DL, N2->getValueType(0))
+                  : DAG.getSExtOrTrunc(Sat, DL, N2->getValueType(0));
+}
+
+static SDValue PerformUMinFpToSatCombine(SDValue N0, SDValue N1, SDValue N2,
+                                         SDValue N3, ISD::CondCode CC,
+                                         SelectionDAG &DAG) {
+  // We are looking for UMIN(FPTOUI(X), (2^n)-1), which may have come via a
+  // select/vselect/select_cc. The two operands pairs for the select (N2/N3) may
+  // be truncated versions of the the setcc (N0/N1).
+  if ((N0 != N2 &&
+       (N2.getOpcode() != ISD::TRUNCATE || N0 != N2.getOperand(0))) ||
+      N0.getOpcode() != ISD::FP_TO_UINT || CC != ISD::SETULT)
+    return SDValue();
+  ConstantSDNode *N1C = isConstOrConstSplat(N1);
+  ConstantSDNode *N3C = isConstOrConstSplat(N3);
+  if (!N1C || !N3C)
+    return SDValue();
+  const APInt &C1 = N1C->getAPIntValue();
+  const APInt &C3 = N3C->getAPIntValue();
+  if (!(C1 + 1).isPowerOf2() || C1.getBitWidth() < C3.getBitWidth() ||
+      C1 != C3.zext(C1.getBitWidth()))
+    return SDValue();
+
+  unsigned BW = (C1 + 1).exactLogBase2();
+  EVT FPVT = N0.getOperand(0).getValueType();
+  EVT NewVT = EVT::getIntegerVT(*DAG.getContext(), BW);
+  if (FPVT.isVector())
+    NewVT = EVT::getVectorVT(*DAG.getContext(), NewVT,
+                             FPVT.getVectorElementCount());
+  if (!DAG.getTargetLoweringInfo().shouldConvertFpToSat(ISD::FP_TO_UINT_SAT,
+                                                        FPVT, NewVT))
+    return SDValue();
+
+  SDValue Sat =
+      DAG.getNode(ISD::FP_TO_UINT_SAT, SDLoc(N0), NewVT, N0.getOperand(0),
+                  DAG.getValueType(NewVT.getScalarType()));
+  return DAG.getZExtOrTrunc(Sat, SDLoc(N0), N3.getValueType());
+}
+
 SDValue DAGCombiner::visitIMINMAX(SDNode *N) {
   SDValue N0 = N->getOperand(0);
   SDValue N1 = N->getOperand(1);
   EVT VT = N0.getValueType();
   unsigned Opcode = N->getOpcode();
-
-  // fold vector ops
-  if (VT.isVector())
-    if (SDValue FoldedVOp = SimplifyVBinOp(N))
-      return FoldedVOp;
+  SDLoc DL(N);
 
   // fold operation with constant operands.
-  if (SDValue C = DAG.FoldConstantArithmetic(Opcode, SDLoc(N), VT, {N0, N1}))
+  if (SDValue C = DAG.FoldConstantArithmetic(Opcode, DL, VT, {N0, N1}))
     return C;
 
+  // If the operands are the same, this is a no-op.
+  if (N0 == N1)
+    return N0;
+
   // canonicalize constant to RHS
   if (DAG.isConstantIntBuildVectorOrConstantInt(N0) &&
       !DAG.isConstantIntBuildVectorOrConstantInt(N1))
-    return DAG.getNode(N->getOpcode(), SDLoc(N), VT, N1, N0);
+    return DAG.getNode(Opcode, DL, VT, N1, N0);
+
+  // fold vector ops
+  if (VT.isVector())
+    if (SDValue FoldedVOp = SimplifyVBinOp(N, DL))
+      return FoldedVOp;
 
   // Is sign bits are zero, flip between UMIN/UMAX and SMIN/SMAX.
   // Only do this if the current op isn't legal and the flipped is.
@@ -4797,9 +5287,17 @@ SDValue DAGCombiner::visitIMINMAX(SDNode *N) {
     default: llvm_unreachable("Unknown MINMAX opcode");
     }
     if (TLI.isOperationLegal(AltOpcode, VT))
-      return DAG.getNode(AltOpcode, SDLoc(N), VT, N0, N1);
+      return DAG.getNode(AltOpcode, DL, VT, N0, N1);
   }
 
+  if (Opcode == ISD::SMIN || Opcode == ISD::SMAX)
+    if (SDValue S = PerformMinMaxFpToSatCombine(
+            N0, N1, N0, N1, Opcode == ISD::SMIN ? ISD::SETLT : ISD::SETGT, DAG))
+      return S;
+  if (Opcode == ISD::UMIN)
+    if (SDValue S = PerformUMinFpToSatCombine(N0, N1, N0, N1, ISD::SETULT, DAG))
+      return S;
+
   // Simplify the operands using demanded-bits information.
   if (SimplifyDemandedBits(SDValue(N, 0)))
     return SDValue(N, 0);
@@ -4897,6 +5395,21 @@ SDValue DAGCombiner::hoistLogicOpWithSameOpcodeHands(SDNode *N) {
     return DAG.getNode(HandOpcode, DL, VT, Logic);
   }
 
+  // For funnel shifts FSHL/FSHR:
+  // logic_op (OP x, x1, s), (OP y, y1, s) -->
+  // --> OP (logic_op x, y), (logic_op, x1, y1), s
+  if ((HandOpcode == ISD::FSHL || HandOpcode == ISD::FSHR) &&
+      N0.getOperand(2) == N1.getOperand(2)) {
+    if (!N0.hasOneUse() || !N1.hasOneUse())
+      return SDValue();
+    SDValue X1 = N0.getOperand(1);
+    SDValue Y1 = N1.getOperand(1);
+    SDValue S = N0.getOperand(2);
+    SDValue Logic0 = DAG.getNode(LogicOpcode, DL, VT, X, Y);
+    SDValue Logic1 = DAG.getNode(LogicOpcode, DL, VT, X1, Y1);
+    return DAG.getNode(HandOpcode, DL, VT, Logic0, Logic1, S);
+  }
+
   // Simplify xor/and/or (bitcast(A), bitcast(B)) -> bitcast(op (A,B))
   // Only perform this optimization up until type legalization, before
   // LegalizeVectorOprs. LegalizeVectorOprs promotes vector operations by
@@ -5070,29 +5583,27 @@ SDValue DAGCombiner::foldLogicOfSetCCs(bool IsAnd, SDValue N0, SDValue N1,
     }
 
     // Turn compare of constants whose difference is 1 bit into add+and+setcc.
-    // TODO - support non-uniform vector amounts.
     if ((IsAnd && CC1 == ISD::SETNE) || (!IsAnd && CC1 == ISD::SETEQ)) {
       // Match a shared variable operand and 2 non-opaque constant operands.
-      ConstantSDNode *C0 = isConstOrConstSplat(LR);
-      ConstantSDNode *C1 = isConstOrConstSplat(RR);
-      if (LL == RL && C0 && C1 && !C0->isOpaque() && !C1->isOpaque()) {
+      auto MatchDiffPow2 = [&](ConstantSDNode *C0, ConstantSDNode *C1) {
+        // The difference of the constants must be a single bit.
         const APInt &CMax =
             APIntOps::umax(C0->getAPIntValue(), C1->getAPIntValue());
         const APInt &CMin =
             APIntOps::umin(C0->getAPIntValue(), C1->getAPIntValue());
-        // The difference of the constants must be a single bit.
-        if ((CMax - CMin).isPowerOf2()) {
-          // and/or (setcc X, CMax, ne), (setcc X, CMin, ne/eq) -->
-          // setcc ((sub X, CMin), ~(CMax - CMin)), 0, ne/eq
-          SDValue Max = DAG.getNode(ISD::UMAX, DL, OpVT, LR, RR);
-          SDValue Min = DAG.getNode(ISD::UMIN, DL, OpVT, LR, RR);
-          SDValue Offset = DAG.getNode(ISD::SUB, DL, OpVT, LL, Min);
-          SDValue Diff = DAG.getNode(ISD::SUB, DL, OpVT, Max, Min);
-          SDValue Mask = DAG.getNOT(DL, Diff, OpVT);
-          SDValue And = DAG.getNode(ISD::AND, DL, OpVT, Offset, Mask);
-          SDValue Zero = DAG.getConstant(0, DL, OpVT);
-          return DAG.getSetCC(DL, VT, And, Zero, CC0);
-        }
+        return !C0->isOpaque() && !C1->isOpaque() && (CMax - CMin).isPowerOf2();
+      };
+      if (LL == RL && ISD::matchBinaryPredicate(LR, RR, MatchDiffPow2)) {
+        // and/or (setcc X, CMax, ne), (setcc X, CMin, ne/eq) -->
+        // setcc ((sub X, CMin), ~(CMax - CMin)), 0, ne/eq
+        SDValue Max = DAG.getNode(ISD::UMAX, DL, OpVT, LR, RR);
+        SDValue Min = DAG.getNode(ISD::UMIN, DL, OpVT, LR, RR);
+        SDValue Offset = DAG.getNode(ISD::SUB, DL, OpVT, LL, Min);
+        SDValue Diff = DAG.getNode(ISD::SUB, DL, OpVT, Max, Min);
+        SDValue Mask = DAG.getNOT(DL, Diff, OpVT);
+        SDValue And = DAG.getNode(ISD::AND, DL, OpVT, Offset, Mask);
+        SDValue Zero = DAG.getConstant(0, DL, OpVT);
+        return DAG.getSetCC(DL, VT, And, Zero, CC0);
       }
     }
   }
@@ -5489,7 +6000,7 @@ bool DAGCombiner::BackwardsPropagateMask(SDNode *N) {
       if (And.getOpcode() == ISD ::AND)
         And = SDValue(
             DAG.UpdateNodeOperands(And.getNode(), SDValue(Load, 0), MaskOp), 0);
-      SDValue NewLoad = ReduceLoadWidth(And.getNode());
+      SDValue NewLoad = reduceLoadWidth(And.getNode());
       assert(NewLoad &&
              "Shouldn't be masking the load if it can't be narrowed");
       CombineTo(Load, NewLoad, NewLoad.getValue(1));
@@ -5566,47 +6077,187 @@ static SDValue combineShiftAnd1ToBitTest(SDNode *And, SelectionDAG &DAG) {
   if (!TLI.isTypeLegal(VT))
     return SDValue();
 
-  // Look through an optional extension and find a 'not'.
-  // TODO: Should we favor test+set even without the 'not' op?
-  SDValue Not = And->getOperand(0), And1 = And->getOperand(1);
-  if (Not.getOpcode() == ISD::ANY_EXTEND)
-    Not = Not.getOperand(0);
-  if (!isBitwiseNot(Not) || !Not.hasOneUse() || !isOneConstant(And1))
+  // Look through an optional extension.
+  SDValue And0 = And->getOperand(0), And1 = And->getOperand(1);
+  if (And0.getOpcode() == ISD::ANY_EXTEND && And0.hasOneUse())
+    And0 = And0.getOperand(0);
+  if (!isOneConstant(And1) || !And0.hasOneUse())
     return SDValue();
 
-  // Look though an optional truncation. The source operand may not be the same
-  // type as the original 'and', but that is ok because we are masking off
-  // everything but the low bit.
-  SDValue Srl = Not.getOperand(0);
-  if (Srl.getOpcode() == ISD::TRUNCATE)
-    Srl = Srl.getOperand(0);
+  SDValue Src = And0;
+
+  // Attempt to find a 'not' op.
+  // TODO: Should we favor test+set even without the 'not' op?
+  bool FoundNot = false;
+  if (isBitwiseNot(Src)) {
+    FoundNot = true;
+    Src = Src.getOperand(0);
+
+    // Look though an optional truncation. The source operand may not be the
+    // same type as the original 'and', but that is ok because we are masking
+    // off everything but the low bit.
+    if (Src.getOpcode() == ISD::TRUNCATE && Src.hasOneUse())
+      Src = Src.getOperand(0);
+  }
 
   // Match a shift-right by constant.
-  if (Srl.getOpcode() != ISD::SRL || !Srl.hasOneUse() ||
-      !isa<ConstantSDNode>(Srl.getOperand(1)))
+  if (Src.getOpcode() != ISD::SRL || !Src.hasOneUse())
     return SDValue();
 
   // We might have looked through casts that make this transform invalid.
   // TODO: If the source type is wider than the result type, do the mask and
   //       compare in the source type.
-  const APInt &ShiftAmt = Srl.getConstantOperandAPInt(1);
-  unsigned VTBitWidth = VT.getSizeInBits();
-  if (ShiftAmt.uge(VTBitWidth))
+  unsigned VTBitWidth = VT.getScalarSizeInBits();
+  SDValue ShiftAmt = Src.getOperand(1);
+  auto *ShiftAmtC = dyn_cast<ConstantSDNode>(ShiftAmt);
+  if (!ShiftAmtC || !ShiftAmtC->getAPIntValue().ult(VTBitWidth))
+    return SDValue();
+
+  // Set source to shift source.
+  Src = Src.getOperand(0);
+
+  // Try again to find a 'not' op.
+  // TODO: Should we favor test+set even with two 'not' ops?
+  if (!FoundNot) {
+    if (!isBitwiseNot(Src))
+      return SDValue();
+    Src = Src.getOperand(0);
+  }
+
+  if (!TLI.hasBitTest(Src, ShiftAmt))
     return SDValue();
 
   // Turn this into a bit-test pattern using mask op + setcc:
   // and (not (srl X, C)), 1 --> (and X, 1<<C) == 0
+  // and (srl (not X), C)), 1 --> (and X, 1<<C) == 0
   SDLoc DL(And);
-  SDValue X = DAG.getZExtOrTrunc(Srl.getOperand(0), DL, VT);
+  SDValue X = DAG.getZExtOrTrunc(Src, DL, VT);
   EVT CCVT = TLI.getSetCCResultType(DAG.getDataLayout(), *DAG.getContext(), VT);
   SDValue Mask = DAG.getConstant(
-      APInt::getOneBitSet(VTBitWidth, ShiftAmt.getZExtValue()), DL, VT);
+      APInt::getOneBitSet(VTBitWidth, ShiftAmtC->getZExtValue()), DL, VT);
   SDValue NewAnd = DAG.getNode(ISD::AND, DL, VT, X, Mask);
   SDValue Zero = DAG.getConstant(0, DL, VT);
   SDValue Setcc = DAG.getSetCC(DL, CCVT, NewAnd, Zero, ISD::SETEQ);
   return DAG.getZExtOrTrunc(Setcc, DL, VT);
 }
 
+/// For targets that support usubsat, match a bit-hack form of that operation
+/// that ends in 'and' and convert it.
+static SDValue foldAndToUsubsat(SDNode *N, SelectionDAG &DAG) {
+  SDValue N0 = N->getOperand(0);
+  SDValue N1 = N->getOperand(1);
+  EVT VT = N1.getValueType();
+
+  // Canonicalize SRA as operand 1.
+  if (N0.getOpcode() == ISD::SRA)
+    std::swap(N0, N1);
+
+  // xor/add with SMIN (signmask) are logically equivalent.
+  if (N0.getOpcode() != ISD::XOR && N0.getOpcode() != ISD::ADD)
+    return SDValue();
+
+  if (N1.getOpcode() != ISD::SRA || !N0.hasOneUse() || !N1.hasOneUse() ||
+      N0.getOperand(0) != N1.getOperand(0))
+    return SDValue();
+
+  unsigned BitWidth = VT.getScalarSizeInBits();
+  ConstantSDNode *XorC = isConstOrConstSplat(N0.getOperand(1), true);
+  ConstantSDNode *SraC = isConstOrConstSplat(N1.getOperand(1), true);
+  if (!XorC || !XorC->getAPIntValue().isSignMask() ||
+      !SraC || SraC->getAPIntValue() != BitWidth - 1)
+    return SDValue();
+
+  // (i8 X ^ 128) & (i8 X s>> 7) --> usubsat X, 128
+  // (i8 X + 128) & (i8 X s>> 7) --> usubsat X, 128
+  SDLoc DL(N);
+  SDValue SignMask = DAG.getConstant(XorC->getAPIntValue(), DL, VT);
+  return DAG.getNode(ISD::USUBSAT, DL, VT, N0.getOperand(0), SignMask);
+}
+
+/// Given a bitwise logic operation N with a matching bitwise logic operand,
+/// fold a pattern where 2 of the source operands are identically shifted
+/// values. For example:
+/// ((X0 << Y) | Z) | (X1 << Y) --> ((X0 | X1) << Y) | Z
+static SDValue foldLogicOfShifts(SDNode *N, SDValue LogicOp, SDValue ShiftOp,
+                                 SelectionDAG &DAG) {
+  unsigned LogicOpcode = N->getOpcode();
+  assert((LogicOpcode == ISD::AND || LogicOpcode == ISD::OR ||
+          LogicOpcode == ISD::XOR)
+         && "Expected bitwise logic operation");
+
+  if (!LogicOp.hasOneUse() || !ShiftOp.hasOneUse())
+    return SDValue();
+
+  // Match another bitwise logic op and a shift.
+  unsigned ShiftOpcode = ShiftOp.getOpcode();
+  if (LogicOp.getOpcode() != LogicOpcode ||
+      !(ShiftOpcode == ISD::SHL || ShiftOpcode == ISD::SRL ||
+        ShiftOpcode == ISD::SRA))
+    return SDValue();
+
+  // Match another shift op inside the first logic operand. Handle both commuted
+  // possibilities.
+  // LOGIC (LOGIC (SH X0, Y), Z), (SH X1, Y) --> LOGIC (SH (LOGIC X0, X1), Y), Z
+  // LOGIC (LOGIC Z, (SH X0, Y)), (SH X1, Y) --> LOGIC (SH (LOGIC X0, X1), Y), Z
+  SDValue X1 = ShiftOp.getOperand(0);
+  SDValue Y = ShiftOp.getOperand(1);
+  SDValue X0, Z;
+  if (LogicOp.getOperand(0).getOpcode() == ShiftOpcode &&
+      LogicOp.getOperand(0).getOperand(1) == Y) {
+    X0 = LogicOp.getOperand(0).getOperand(0);
+    Z = LogicOp.getOperand(1);
+  } else if (LogicOp.getOperand(1).getOpcode() == ShiftOpcode &&
+             LogicOp.getOperand(1).getOperand(1) == Y) {
+    X0 = LogicOp.getOperand(1).getOperand(0);
+    Z = LogicOp.getOperand(0);
+  } else {
+    return SDValue();
+  }
+
+  EVT VT = N->getValueType(0);
+  SDLoc DL(N);
+  SDValue LogicX = DAG.getNode(LogicOpcode, DL, VT, X0, X1);
+  SDValue NewShift = DAG.getNode(ShiftOpcode, DL, VT, LogicX, Y);
+  return DAG.getNode(LogicOpcode, DL, VT, NewShift, Z);
+}
+
+/// Given a tree of logic operations with shape like
+/// (LOGIC (LOGIC (X, Y), LOGIC (Z, Y)))
+/// try to match and fold shift operations with the same shift amount.
+/// For example:
+/// LOGIC (LOGIC (SH X0, Y), Z), (LOGIC (SH X1, Y), W) -->
+/// --> LOGIC (SH (LOGIC X0, X1), Y), (LOGIC Z, W)
+static SDValue foldLogicTreeOfShifts(SDNode *N, SDValue LeftHand,
+                                     SDValue RightHand, SelectionDAG &DAG) {
+  unsigned LogicOpcode = N->getOpcode();
+  assert((LogicOpcode == ISD::AND || LogicOpcode == ISD::OR ||
+          LogicOpcode == ISD::XOR));
+  if (LeftHand.getOpcode() != LogicOpcode ||
+      RightHand.getOpcode() != LogicOpcode)
+    return SDValue();
+  if (!LeftHand.hasOneUse() || !RightHand.hasOneUse())
+    return SDValue();
+
+  // Try to match one of following patterns:
+  // LOGIC (LOGIC (SH X0, Y), Z), (LOGIC (SH X1, Y), W)
+  // LOGIC (LOGIC (SH X0, Y), Z), (LOGIC W, (SH X1, Y))
+  // Note that foldLogicOfShifts will handle commuted versions of the left hand
+  // itself.
+  SDValue CombinedShifts, W;
+  SDValue R0 = RightHand.getOperand(0);
+  SDValue R1 = RightHand.getOperand(1);
+  if ((CombinedShifts = foldLogicOfShifts(N, LeftHand, R0, DAG)))
+    W = R1;
+  else if ((CombinedShifts = foldLogicOfShifts(N, LeftHand, R1, DAG)))
+    W = R0;
+  else
+    return SDValue();
+
+  EVT VT = N->getValueType(0);
+  SDLoc DL(N);
+  return DAG.getNode(LogicOpcode, DL, VT, CombinedShifts, W);
+}
+
 SDValue DAGCombiner::visitAND(SDNode *N) {
   SDValue N0 = N->getOperand(0);
   SDValue N1 = N->getOperand(1);
@@ -5616,71 +6267,67 @@ SDValue DAGCombiner::visitAND(SDNode *N) {
   if (N0 == N1)
     return N0;
 
+  // fold (and c1, c2) -> c1&c2
+  if (SDValue C = DAG.FoldConstantArithmetic(ISD::AND, SDLoc(N), VT, {N0, N1}))
+    return C;
+
+  // canonicalize constant to RHS
+  if (DAG.isConstantIntBuildVectorOrConstantInt(N0) &&
+      !DAG.isConstantIntBuildVectorOrConstantInt(N1))
+    return DAG.getNode(ISD::AND, SDLoc(N), VT, N1, N0);
+
   // fold vector ops
   if (VT.isVector()) {
-    if (SDValue FoldedVOp = SimplifyVBinOp(N))
+    if (SDValue FoldedVOp = SimplifyVBinOp(N, SDLoc(N)))
       return FoldedVOp;
 
     // fold (and x, 0) -> 0, vector edition
-    if (ISD::isConstantSplatVectorAllZeros(N0.getNode()))
-      // do not return N0, because undef node may exist in N0
-      return DAG.getConstant(APInt::getNullValue(N0.getScalarValueSizeInBits()),
-                             SDLoc(N), N0.getValueType());
     if (ISD::isConstantSplatVectorAllZeros(N1.getNode()))
       // do not return N1, because undef node may exist in N1
-      return DAG.getConstant(APInt::getNullValue(N1.getScalarValueSizeInBits()),
+      return DAG.getConstant(APInt::getZero(N1.getScalarValueSizeInBits()),
                              SDLoc(N), N1.getValueType());
 
     // fold (and x, -1) -> x, vector edition
-    if (ISD::isConstantSplatVectorAllOnes(N0.getNode()))
-      return N1;
     if (ISD::isConstantSplatVectorAllOnes(N1.getNode()))
       return N0;
 
-    // fold (and (masked_load) (build_vec (x, ...))) to zext_masked_load
+    // fold (and (masked_load) (splat_vec (x, ...))) to zext_masked_load
     auto *MLoad = dyn_cast<MaskedLoadSDNode>(N0);
-    auto *BVec = dyn_cast<BuildVectorSDNode>(N1);
-    if (MLoad && BVec && MLoad->getExtensionType() == ISD::EXTLOAD &&
-        N0.hasOneUse() && N1.hasOneUse()) {
+    ConstantSDNode *Splat = isConstOrConstSplat(N1, true, true);
+    if (MLoad && MLoad->getExtensionType() == ISD::EXTLOAD && Splat &&
+        N1.hasOneUse()) {
       EVT LoadVT = MLoad->getMemoryVT();
       EVT ExtVT = VT;
       if (TLI.isLoadExtLegal(ISD::ZEXTLOAD, ExtVT, LoadVT)) {
         // For this AND to be a zero extension of the masked load the elements
         // of the BuildVec must mask the bottom bits of the extended element
         // type
-        if (ConstantSDNode *Splat = BVec->getConstantSplatNode()) {
-          uint64_t ElementSize =
-              LoadVT.getVectorElementType().getScalarSizeInBits();
-          if (Splat->getAPIntValue().isMask(ElementSize)) {
-            return DAG.getMaskedLoad(
-                ExtVT, SDLoc(N), MLoad->getChain(), MLoad->getBasePtr(),
-                MLoad->getOffset(), MLoad->getMask(), MLoad->getPassThru(),
-                LoadVT, MLoad->getMemOperand(), MLoad->getAddressingMode(),
-                ISD::ZEXTLOAD, MLoad->isExpandingLoad());
-          }
+        uint64_t ElementSize =
+            LoadVT.getVectorElementType().getScalarSizeInBits();
+        if (Splat->getAPIntValue().isMask(ElementSize)) {
+          auto NewLoad = DAG.getMaskedLoad(
+              ExtVT, SDLoc(N), MLoad->getChain(), MLoad->getBasePtr(),
+              MLoad->getOffset(), MLoad->getMask(), MLoad->getPassThru(),
+              LoadVT, MLoad->getMemOperand(), MLoad->getAddressingMode(),
+              ISD::ZEXTLOAD, MLoad->isExpandingLoad());
+          bool LoadHasOtherUsers = !N0.hasOneUse();
+          CombineTo(N, NewLoad);
+          if (LoadHasOtherUsers)
+            CombineTo(MLoad, NewLoad.getValue(0), NewLoad.getValue(1));
+          return SDValue(N, 0);
         }
       }
     }
   }
 
-  // fold (and c1, c2) -> c1&c2
-  ConstantSDNode *N1C = isConstOrConstSplat(N1);
-  if (SDValue C = DAG.FoldConstantArithmetic(ISD::AND, SDLoc(N), VT, {N0, N1}))
-    return C;
-
-  // canonicalize constant to RHS
-  if (DAG.isConstantIntBuildVectorOrConstantInt(N0) &&
-      !DAG.isConstantIntBuildVectorOrConstantInt(N1))
-    return DAG.getNode(ISD::AND, SDLoc(N), VT, N1, N0);
-
   // fold (and x, -1) -> x
   if (isAllOnesConstant(N1))
     return N0;
 
   // if (and x, c) is known to be zero, return 0
   unsigned BitWidth = VT.getScalarSizeInBits();
-  if (N1C && DAG.MaskedValueIsZero(SDValue(N, 0),
-                                   APInt::getAllOnesValue(BitWidth)))
+  ConstantSDNode *N1C = isConstOrConstSplat(N1);
+  if (N1C && DAG.MaskedValueIsZero(SDValue(N, 0), APInt::getAllOnes(BitWidth)))
     return DAG.getConstant(0, SDLoc(N), VT);
 
   if (SDValue NewSel = foldBinOpIntoSelect(N))
@@ -5690,14 +6337,6 @@ SDValue DAGCombiner::visitAND(SDNode *N) {
   if (SDValue RAND = reassociateOps(ISD::AND, SDLoc(N), N0, N1, N->getFlags()))
     return RAND;
 
-  // Try to convert a constant mask AND into a shuffle clear mask.
-  if (VT.isVector())
-    if (SDValue Shuffle = XformToShuffleWithZero(N))
-      return Shuffle;
-
-  if (SDValue Combined = combineCarryDiamond(*this, DAG, TLI, N0, N1, N))
-    return Combined;
-
   // fold (and (or x, C), D) -> D if (C & D) == D
   auto MatchSubset = [](ConstantSDNode *LHS, ConstantSDNode *RHS) {
     return RHS->getAPIntValue().isSubsetOf(LHS->getAPIntValue());
@@ -5705,23 +6344,32 @@ SDValue DAGCombiner::visitAND(SDNode *N) {
   if (N0.getOpcode() == ISD::OR &&
       ISD::matchBinaryPredicate(N0.getOperand(1), N1, MatchSubset))
     return N1;
+
   // fold (and (any_ext V), c) -> (zero_ext V) if 'and' only clears top bits.
   if (N1C && N0.getOpcode() == ISD::ANY_EXTEND) {
     SDValue N0Op0 = N0.getOperand(0);
     APInt Mask = ~N1C->getAPIntValue();
     Mask = Mask.trunc(N0Op0.getScalarValueSizeInBits());
-    if (DAG.MaskedValueIsZero(N0Op0, Mask)) {
-      SDValue Zext = DAG.getNode(ISD::ZERO_EXTEND, SDLoc(N),
-                                 N0.getValueType(), N0Op0);
-
-      // Replace uses of the AND with uses of the Zero extend node.
-      CombineTo(N, Zext);
+    if (DAG.MaskedValueIsZero(N0Op0, Mask))
+      return DAG.getNode(ISD::ZERO_EXTEND, SDLoc(N), N0.getValueType(), N0Op0);
+  }
 
-      // We actually want to replace all uses of the any_extend with the
-      // zero_extend, to avoid duplicating things.  This will later cause this
-      // AND to be folded.
-      CombineTo(N0.getNode(), Zext);
-      return SDValue(N, 0);   // Return N so it doesn't get rechecked!
+  // fold (and (ext (and V, c1)), c2) -> (and (ext V), (and c1, (ext c2)))
+  if (ISD::isExtOpcode(N0.getOpcode())) {
+    unsigned ExtOpc = N0.getOpcode();
+    SDValue N0Op0 = N0.getOperand(0);
+    if (N0Op0.getOpcode() == ISD::AND &&
+        (ExtOpc != ISD::ZERO_EXTEND || !TLI.isZExtFree(N0Op0, VT)) &&
+        DAG.isConstantIntBuildVectorOrConstantInt(N1) &&
+        DAG.isConstantIntBuildVectorOrConstantInt(N0Op0.getOperand(1)) &&
+        N0->hasOneUse() && N0Op0->hasOneUse()) {
+      SDLoc DL(N);
+      SDValue NewMask =
+          DAG.getNode(ISD::AND, DL, VT, N1,
+                      DAG.getNode(ExtOpc, DL, VT, N0Op0.getOperand(1)));
+      return DAG.getNode(ISD::AND, DL, VT,
+                         DAG.getNode(ExtOpc, DL, VT, N0Op0.getOperand(0)),
+                         NewMask);
     }
   }
 
@@ -5742,8 +6390,9 @@ SDValue DAGCombiner::visitAND(SDNode *N) {
     // Get the constant (if applicable) the zero'th operand is being ANDed with.
     // This can be a pure constant or a vector splat, in which case we treat the
     // vector as a scalar and use the splat value.
-    APInt Constant = APInt::getNullValue(1);
-    if (const ConstantSDNode *C = dyn_cast<ConstantSDNode>(N1)) {
+    APInt Constant = APInt::getZero(1);
+    if (const ConstantSDNode *C = isConstOrConstSplat(
+            N1, /*AllowUndef=*/false, /*AllowTruncation=*/true)) {
       Constant = C->getAPIntValue();
     } else if (BuildVectorSDNode *Vector = dyn_cast<BuildVectorSDNode>(N1)) {
       APInt SplatValue, SplatUndef;
@@ -5773,7 +6422,7 @@ SDValue DAGCombiner::visitAND(SDNode *N) {
         // Make sure that variable 'Constant' is only set if 'SplatBitSize' is a
         // multiple of 'BitWidth'. Otherwise, we could propagate a wrong value.
         if ((SplatBitSize % EltBitWidth) == 0) {
-          Constant = APInt::getAllOnesValue(EltBitWidth);
+          Constant = APInt::getAllOnes(EltBitWidth);
           for (unsigned i = 0, n = (SplatBitSize / EltBitWidth); i < n; ++i)
             Constant &= SplatValue.extractBits(EltBitWidth, i * EltBitWidth);
         }
@@ -5800,7 +6449,7 @@ SDValue DAGCombiner::visitAND(SDNode *N) {
     case ISD::NON_EXTLOAD: B = true; break;
     }
 
-    if (B && Constant.isAllOnesValue()) {
+    if (B && Constant.isAllOnes()) {
       // If the load type was an EXTLOAD, convert to ZEXTLOAD in order to
       // preserve semantics once we get rid of the AND.
       SDValue NewLoad(Load, 0);
@@ -5829,6 +6478,33 @@ SDValue DAGCombiner::visitAND(SDNode *N) {
     }
   }
 
+  // Try to convert a constant mask AND into a shuffle clear mask.
+  if (VT.isVector())
+    if (SDValue Shuffle = XformToShuffleWithZero(N))
+      return Shuffle;
+
+  if (SDValue Combined = combineCarryDiamond(DAG, TLI, N0, N1, N))
+    return Combined;
+
+  if (N0.getOpcode() == ISD::EXTRACT_SUBVECTOR && N0.hasOneUse() && N1C &&
+      ISD::isExtOpcode(N0.getOperand(0).getOpcode())) {
+    SDValue Ext = N0.getOperand(0);
+    EVT ExtVT = Ext->getValueType(0);
+    SDValue Extendee = Ext->getOperand(0);
+
+    unsigned ScalarWidth = Extendee.getValueType().getScalarSizeInBits();
+    if (N1C->getAPIntValue().isMask(ScalarWidth) &&
+        (!LegalOperations || TLI.isOperationLegal(ISD::ZERO_EXTEND, ExtVT))) {
+      //    (and (extract_subvector (zext|anyext|sext v) _) iN_mask)
+      // => (extract_subvector (iN_zeroext v))
+      SDValue ZeroExtExtendee =
+          DAG.getNode(ISD::ZERO_EXTEND, SDLoc(N), ExtVT, Extendee);
+
+      return DAG.getNode(ISD::EXTRACT_SUBVECTOR, SDLoc(N), VT, ZeroExtExtendee,
+                         N0.getOperand(1));
+    }
+  }
+
   // fold (and (masked_gather x)) -> (zext_masked_gather x)
   if (auto *GN0 = dyn_cast<MaskedGatherSDNode>(N0)) {
     EVT MemVT = GN0->getMemoryVT();
@@ -5853,18 +6529,9 @@ SDValue DAGCombiner::visitAND(SDNode *N) {
 
   // fold (and (load x), 255) -> (zextload x, i8)
   // fold (and (extload x, i16), 255) -> (zextload x, i8)
-  // fold (and (any_ext (extload x, i16)), 255) -> (zextload x, i8)
-  if (!VT.isVector() && N1C && (N0.getOpcode() == ISD::LOAD ||
-                                (N0.getOpcode() == ISD::ANY_EXTEND &&
-                                 N0.getOperand(0).getOpcode() == ISD::LOAD))) {
-    if (SDValue Res = ReduceLoadWidth(N)) {
-      LoadSDNode *LN0 = N0->getOpcode() == ISD::ANY_EXTEND
-        ? cast<LoadSDNode>(N0.getOperand(0)) : cast<LoadSDNode>(N0);
-      AddToWorklist(N);
-      DAG.ReplaceAllUsesOfValueWith(SDValue(LN0, 0), Res);
-      return SDValue(N, 0);
-    }
-  }
+  if (N1C && N0.getOpcode() == ISD::LOAD && !VT.isVector())
+    if (SDValue Res = reduceLoadWidth(N))
+      return Res;
 
   if (LegalTypes) {
     // Attempt to propagate the AND back up to the leaves which, if they're
@@ -5883,6 +6550,11 @@ SDValue DAGCombiner::visitAND(SDNode *N) {
     if (SDValue V = hoistLogicOpWithSameOpcodeHands(N))
       return V;
 
+  if (SDValue R = foldLogicOfShifts(N, N0, N1, DAG))
+    return R;
+  if (SDValue R = foldLogicOfShifts(N, N1, N0, DAG))
+    return R;
+
   // Masking the negated extension of a boolean is just the zero-extended
   // boolean:
   // and (sub 0, zext(bool X)), 1 --> zext(bool X)
@@ -5941,9 +6613,8 @@ SDValue DAGCombiner::visitAND(SDNode *N) {
   if (SDValue Shifts = unfoldExtremeBitClearingToShifts(N))
     return Shifts;
 
-  if (TLI.hasBitTest(N0, N1))
-    if (SDValue V = combineShiftAnd1ToBitTest(N, DAG))
-      return V;
+  if (SDValue V = combineShiftAnd1ToBitTest(N, DAG))
+    return V;
 
   // Recognize the following pattern:
   //
@@ -5970,6 +6641,16 @@ SDValue DAGCombiner::visitAND(SDNode *N) {
   if (IsAndZeroExtMask(N0, N1))
     return DAG.getNode(ISD::ZERO_EXTEND, SDLoc(N), VT, N0.getOperand(0));
 
+  if (hasOperation(ISD::USUBSAT, VT))
+    if (SDValue V = foldAndToUsubsat(N, DAG))
+      return V;
+
+  // Postpone until legalization completed to avoid interference with bswap
+  // folding
+  if (LegalOperations || VT.isVector())
+    if (SDValue R = foldLogicTreeOfShifts(N, N0, N1, DAG))
+      return R;
+
   return SDValue();
 }
 
@@ -5989,11 +6670,11 @@ SDValue DAGCombiner::MatchBSwapHWordLow(SDNode *N, SDValue N0, SDValue N1,
   bool LookPassAnd0 = false;
   bool LookPassAnd1 = false;
   if (N0.getOpcode() == ISD::AND && N0.getOperand(0).getOpcode() == ISD::SRL)
-      std::swap(N0, N1);
+    std::swap(N0, N1);
   if (N1.getOpcode() == ISD::AND && N1.getOperand(0).getOpcode() == ISD::SHL)
-      std::swap(N0, N1);
+    std::swap(N0, N1);
   if (N0.getOpcode() == ISD::AND) {
-    if (!N0.getNode()->hasOneUse())
+    if (!N0->hasOneUse())
       return SDValue();
     ConstantSDNode *N01C = dyn_cast<ConstantSDNode>(N0.getOperand(1));
     // Also handle 0xffff since the LHS is guaranteed to have zeros there.
@@ -6006,7 +6687,7 @@ SDValue DAGCombiner::MatchBSwapHWordLow(SDNode *N, SDValue N0, SDValue N1,
   }
 
   if (N1.getOpcode() == ISD::AND) {
-    if (!N1.getNode()->hasOneUse())
+    if (!N1->hasOneUse())
       return SDValue();
     ConstantSDNode *N11C = dyn_cast<ConstantSDNode>(N1.getOperand(1));
     if (!N11C || N11C->getZExtValue() != 0xFF)
@@ -6019,7 +6700,7 @@ SDValue DAGCombiner::MatchBSwapHWordLow(SDNode *N, SDValue N0, SDValue N1,
     std::swap(N0, N1);
   if (N0.getOpcode() != ISD::SHL || N1.getOpcode() != ISD::SRL)
     return SDValue();
-  if (!N0.getNode()->hasOneUse() || !N1.getNode()->hasOneUse())
+  if (!N0->hasOneUse() || !N1->hasOneUse())
     return SDValue();
 
   ConstantSDNode *N01C = dyn_cast<ConstantSDNode>(N0.getOperand(1));
@@ -6032,7 +6713,7 @@ SDValue DAGCombiner::MatchBSwapHWordLow(SDNode *N, SDValue N0, SDValue N1,
   // Look for (shl (and a, 0xff), 8), (srl (and a, 0xff00), 8)
   SDValue N00 = N0->getOperand(0);
   if (!LookPassAnd0 && N00.getOpcode() == ISD::AND) {
-    if (!N00.getNode()->hasOneUse())
+    if (!N00->hasOneUse())
       return SDValue();
     ConstantSDNode *N001C = dyn_cast<ConstantSDNode>(N00.getOperand(1));
     if (!N001C || N001C->getZExtValue() != 0xFF)
@@ -6043,7 +6724,7 @@ SDValue DAGCombiner::MatchBSwapHWordLow(SDNode *N, SDValue N0, SDValue N1,
 
   SDValue N10 = N1->getOperand(0);
   if (!LookPassAnd1 && N10.getOpcode() == ISD::AND) {
-    if (!N10.getNode()->hasOneUse())
+    if (!N10->hasOneUse())
       return SDValue();
     ConstantSDNode *N101C = dyn_cast<ConstantSDNode>(N10.getOperand(1));
     // Also allow 0xFFFF since the bits will be shifted out. This is needed
@@ -6061,19 +6742,23 @@ SDValue DAGCombiner::MatchBSwapHWordLow(SDNode *N, SDValue N0, SDValue N1,
   // Make sure everything beyond the low halfword gets set to zero since the SRL
   // 16 will clear the top bits.
   unsigned OpSizeInBits = VT.getSizeInBits();
-  if (DemandHighBits && OpSizeInBits > 16) {
+  if (OpSizeInBits > 16) {
     // If the left-shift isn't masked out then the only way this is a bswap is
     // if all bits beyond the low 8 are 0. In that case the entire pattern
     // reduces to a left shift anyway: leave it for other parts of the combiner.
-    if (!LookPassAnd0)
+    if (DemandHighBits && !LookPassAnd0)
       return SDValue();
 
     // However, if the right shift isn't masked out then it might be because
-    // it's not needed. See if we can spot that too.
-    if (!LookPassAnd1 &&
-        !DAG.MaskedValueIsZero(
-            N10, APInt::getHighBitsSet(OpSizeInBits, OpSizeInBits - 16)))
-      return SDValue();
+    // it's not needed. See if we can spot that too. If the high bits aren't
+    // demanded, we only need bits 23:16 to be zero. Otherwise, we need all
+    // upper bits to be zero.
+    if (!LookPassAnd1) {
+      unsigned HighBit = DemandHighBits ? OpSizeInBits : 24;
+      if (!DAG.MaskedValueIsZero(N10,
+                                 APInt::getBitsSet(OpSizeInBits, 16, HighBit)))
+        return SDValue();
+    }
   }
 
   SDValue Res = DAG.getNode(ISD::BSWAP, SDLoc(N), VT, N00);
@@ -6093,7 +6778,7 @@ SDValue DAGCombiner::MatchBSwapHWordLow(SDNode *N, SDValue N0, SDValue N1,
 /// ((x & 0x00ff0000) << 8) |
 /// ((x & 0xff000000) >> 8)
 static bool isBSwapHWordElement(SDValue N, MutableArrayRef<SDNode *> Parts) {
-  if (!N.getNode()->hasOneUse())
+  if (!N->hasOneUse())
     return false;
 
   unsigned Opc = N.getOpcode();
@@ -6280,8 +6965,9 @@ SDValue DAGCombiner::MatchBSwapHWord(SDNode *N, SDValue N0, SDValue N1) {
     if (!(isBSwapHWordElement(N01, Parts) && isBSwapHWordPair(N00, Parts)) &&
         !(isBSwapHWordElement(N00, Parts) && isBSwapHWordPair(N01, Parts)))
       return SDValue();
-  } else
+  } else {
     return SDValue();
+  }
 
   // Make sure the parts are all coming from the same node.
   if (Parts[0] != Parts[1] || Parts[0] != Parts[2] || Parts[0] != Parts[3])
@@ -6319,7 +7005,7 @@ SDValue DAGCombiner::visitORLike(SDValue N0, SDValue N1, SDNode *N) {
   // (or (and X, C1), (and Y, C2))  -> (and (or X, Y), C3) if possible.
   if (N0.getOpcode() == ISD::AND && N1.getOpcode() == ISD::AND &&
       // Don't increase # computations.
-      (N0.getNode()->hasOneUse() || N1.getNode()->hasOneUse())) {
+      (N0->hasOneUse() || N1->hasOneUse())) {
     // We can only do this xform if we know that bits from X that are set in C2
     // but not in C1 are already zero.  Likewise for Y.
     if (const ConstantSDNode *N0O1C =
@@ -6347,7 +7033,7 @@ SDValue DAGCombiner::visitORLike(SDValue N0, SDValue N1, SDNode *N) {
       N1.getOpcode() == ISD::AND &&
       N0.getOperand(0) == N1.getOperand(0) &&
       // Don't increase # computations.
-      (N0.getNode()->hasOneUse() || N1.getNode()->hasOneUse())) {
+      (N0->hasOneUse() || N1->hasOneUse())) {
     SDValue X = DAG.getNode(ISD::OR, SDLoc(N0), VT,
                             N0.getOperand(1), N1.getOperand(1));
     return DAG.getNode(ISD::AND, DL, VT, N0.getOperand(0), X);
@@ -6357,19 +7043,68 @@ SDValue DAGCombiner::visitORLike(SDValue N0, SDValue N1, SDNode *N) {
 }
 
 /// OR combines for which the commuted variant will be tried as well.
-static SDValue visitORCommutative(
-    SelectionDAG &DAG, SDValue N0, SDValue N1, SDNode *N) {
+static SDValue visitORCommutative(SelectionDAG &DAG, SDValue N0, SDValue N1,
+                                  SDNode *N) {
   EVT VT = N0.getValueType();
   if (N0.getOpcode() == ISD::AND) {
+    SDValue N00 = N0.getOperand(0);
+    SDValue N01 = N0.getOperand(1);
+
+    // fold or (and x, y), x --> x
+    if (N00 == N1 || N01 == N1)
+      return N1;
+
     // fold (or (and X, (xor Y, -1)), Y) -> (or X, Y)
-    if (isBitwiseNot(N0.getOperand(1)) && N0.getOperand(1).getOperand(0) == N1)
-      return DAG.getNode(ISD::OR, SDLoc(N), VT, N0.getOperand(0), N1);
+    // TODO: Set AllowUndefs = true.
+    if (getBitwiseNotOperand(N01, N00,
+                             /* AllowUndefs */ false) == N1)
+      return DAG.getNode(ISD::OR, SDLoc(N), VT, N00, N1);
 
     // fold (or (and (xor Y, -1), X), Y) -> (or X, Y)
-    if (isBitwiseNot(N0.getOperand(0)) && N0.getOperand(0).getOperand(0) == N1)
-      return DAG.getNode(ISD::OR, SDLoc(N), VT, N0.getOperand(1), N1);
+    if (getBitwiseNotOperand(N00, N01,
+                             /* AllowUndefs */ false) == N1)
+      return DAG.getNode(ISD::OR, SDLoc(N), VT, N01, N1);
+  }
+
+  if (N0.getOpcode() == ISD::XOR) {
+    // fold or (xor x, y), x --> or x, y
+    //      or (xor x, y), (x and/or y) --> or x, y
+    SDValue N00 = N0.getOperand(0);
+    SDValue N01 = N0.getOperand(1);
+    if (N00 == N1)
+      return DAG.getNode(ISD::OR, SDLoc(N), VT, N01, N1);
+    if (N01 == N1)
+      return DAG.getNode(ISD::OR, SDLoc(N), VT, N00, N1);
+
+    if (N1.getOpcode() == ISD::AND || N1.getOpcode() == ISD::OR) {
+      SDValue N10 = N1.getOperand(0);
+      SDValue N11 = N1.getOperand(1);
+      if ((N00 == N10 && N01 == N11) || (N00 == N11 && N01 == N10))
+        return DAG.getNode(ISD::OR, SDLoc(N), VT, N00, N01);
+    }
   }
 
+  if (SDValue R = foldLogicOfShifts(N, N0, N1, DAG))
+    return R;
+
+  auto peekThroughZext = [](SDValue V) {
+    if (V->getOpcode() == ISD::ZERO_EXTEND)
+      return V->getOperand(0);
+    return V;
+  };
+
+  // (fshl X, ?, Y) | (shl X, Y) --> fshl X, ?, Y
+  if (N0.getOpcode() == ISD::FSHL && N1.getOpcode() == ISD::SHL &&
+      N0.getOperand(0) == N1.getOperand(0) &&
+      peekThroughZext(N0.getOperand(2)) == peekThroughZext(N1.getOperand(1)))
+    return N0;
+
+  // (fshr ?, X, Y) | (srl X, Y) --> fshr ?, X, Y
+  if (N0.getOpcode() == ISD::FSHR && N1.getOpcode() == ISD::SRL &&
+      N0.getOperand(1) == N1.getOperand(0) &&
+      peekThroughZext(N0.getOperand(2)) == peekThroughZext(N1.getOperand(1)))
+    return N0;
+
   return SDValue();
 }
 
@@ -6382,31 +7117,34 @@ SDValue DAGCombiner::visitOR(SDNode *N) {
   if (N0 == N1)
     return N0;
 
+  // fold (or c1, c2) -> c1|c2
+  if (SDValue C = DAG.FoldConstantArithmetic(ISD::OR, SDLoc(N), VT, {N0, N1}))
+    return C;
+
+  // canonicalize constant to RHS
+  if (DAG.isConstantIntBuildVectorOrConstantInt(N0) &&
+      !DAG.isConstantIntBuildVectorOrConstantInt(N1))
+    return DAG.getNode(ISD::OR, SDLoc(N), VT, N1, N0);
+
   // fold vector ops
   if (VT.isVector()) {
-    if (SDValue FoldedVOp = SimplifyVBinOp(N))
+    if (SDValue FoldedVOp = SimplifyVBinOp(N, SDLoc(N)))
       return FoldedVOp;
 
     // fold (or x, 0) -> x, vector edition
-    if (ISD::isConstantSplatVectorAllZeros(N0.getNode()))
-      return N1;
     if (ISD::isConstantSplatVectorAllZeros(N1.getNode()))
       return N0;
 
     // fold (or x, -1) -> -1, vector edition
-    if (ISD::isConstantSplatVectorAllOnes(N0.getNode()))
-      // do not return N0, because undef node may exist in N0
-      return DAG.getAllOnesConstant(SDLoc(N), N0.getValueType());
     if (ISD::isConstantSplatVectorAllOnes(N1.getNode()))
       // do not return N1, because undef node may exist in N1
       return DAG.getAllOnesConstant(SDLoc(N), N1.getValueType());
 
     // fold (or (shuf A, V_0, MA), (shuf B, V_0, MB)) -> (shuf A, B, Mask)
-    // Do this only if the resulting shuffle is legal.
-    if (isa<ShuffleVectorSDNode>(N0) &&
-        isa<ShuffleVectorSDNode>(N1) &&
-        // Avoid folding a node with illegal type.
-        TLI.isTypeLegal(VT)) {
+    // Do this only if the resulting type / shuffle is legal.
+    auto *SV0 = dyn_cast<ShuffleVectorSDNode>(N0);
+    auto *SV1 = dyn_cast<ShuffleVectorSDNode>(N1);
+    if (SV0 && SV1 && TLI.isTypeLegal(VT)) {
       bool ZeroN00 = ISD::isBuildVectorAllZeros(N0.getOperand(0).getNode());
       bool ZeroN01 = ISD::isBuildVectorAllZeros(N0.getOperand(1).getNode());
       bool ZeroN10 = ISD::isBuildVectorAllZeros(N1.getOperand(0).getNode());
@@ -6415,11 +7153,9 @@ SDValue DAGCombiner::visitOR(SDNode *N) {
       if ((ZeroN00 != ZeroN01) && (ZeroN10 != ZeroN11)) {
         assert((!ZeroN00 || !ZeroN01) && "Both inputs zero!");
         assert((!ZeroN10 || !ZeroN11) && "Both inputs zero!");
-        const ShuffleVectorSDNode *SV0 = cast<ShuffleVectorSDNode>(N0);
-        const ShuffleVectorSDNode *SV1 = cast<ShuffleVectorSDNode>(N1);
         bool CanFold = true;
         int NumElts = VT.getVectorNumElements();
-        SmallVector<int, 4> Mask(NumElts);
+        SmallVector<int, 4> Mask(NumElts, -1);
 
         for (int i = 0; i != NumElts; ++i) {
           int M0 = SV0->getMaskElt(i);
@@ -6431,10 +7167,8 @@ SDValue DAGCombiner::visitOR(SDNode *N) {
 
           // If one element is zero and the otherside is undef, keep undef.
           // This also handles the case that both are undef.
-          if ((M0Zero && M1 < 0) || (M1Zero && M0 < 0)) {
-            Mask[i] = -1;
+          if ((M0Zero && M1 < 0) || (M1Zero && M0 < 0))
             continue;
-          }
 
           // Make sure only one of the elements is zero.
           if (M0Zero == M1Zero) {
@@ -6465,16 +7199,6 @@ SDValue DAGCombiner::visitOR(SDNode *N) {
     }
   }
 
-  // fold (or c1, c2) -> c1|c2
-  ConstantSDNode *N1C = dyn_cast<ConstantSDNode>(N1);
-  if (SDValue C = DAG.FoldConstantArithmetic(ISD::OR, SDLoc(N), VT, {N0, N1}))
-    return C;
-
-  // canonicalize constant to RHS
-  if (DAG.isConstantIntBuildVectorOrConstantInt(N0) &&
-     !DAG.isConstantIntBuildVectorOrConstantInt(N1))
-    return DAG.getNode(ISD::OR, SDLoc(N), VT, N1, N0);
-
   // fold (or x, 0) -> x
   if (isNullConstant(N1))
     return N0;
@@ -6487,13 +7211,14 @@ SDValue DAGCombiner::visitOR(SDNode *N) {
     return NewSel;
 
   // fold (or x, c) -> c iff (x & ~c) == 0
+  ConstantSDNode *N1C = dyn_cast<ConstantSDNode>(N1);
   if (N1C && DAG.MaskedValueIsZero(N0, ~N1C->getAPIntValue()))
     return N1;
 
   if (SDValue Combined = visitORLike(N0, N1, N))
     return Combined;
 
-  if (SDValue Combined = combineCarryDiamond(*this, DAG, TLI, N0, N1, N))
+  if (SDValue Combined = combineCarryDiamond(DAG, TLI, N0, N1, N))
     return Combined;
 
   // Recognize halfword bswaps as (bswap + rotl 16) or (bswap + shl 16)
@@ -6511,7 +7236,7 @@ SDValue DAGCombiner::visitOR(SDNode *N) {
   auto MatchIntersect = [](ConstantSDNode *C1, ConstantSDNode *C2) {
     return !C1 || !C2 || C1->getAPIntValue().intersects(C2->getAPIntValue());
   };
-  if (N0.getOpcode() == ISD::AND && N0.getNode()->hasOneUse() &&
+  if (N0.getOpcode() == ISD::AND && N0->hasOneUse() &&
       ISD::matchBinaryPredicate(N0.getOperand(1), N1, MatchIntersect, true)) {
     if (SDValue COR = DAG.FoldConstantArithmetic(ISD::OR, SDLoc(N1), VT,
                                                  {N1, N0.getOperand(1)})) {
@@ -6548,10 +7273,17 @@ SDValue DAGCombiner::visitOR(SDNode *N) {
     if (SDValue Combined = visitADDLike(N))
       return Combined;
 
+  // Postpone until legalization completed to avoid interference with bswap
+  // folding
+  if (LegalOperations || VT.isVector())
+    if (SDValue R = foldLogicTreeOfShifts(N, N0, N1, DAG))
+      return R;
+
   return SDValue();
 }
 
-static SDValue stripConstantMask(SelectionDAG &DAG, SDValue Op, SDValue &Mask) {
+static SDValue stripConstantMask(const SelectionDAG &DAG, SDValue Op,
+                                 SDValue &Mask) {
   if (Op.getOpcode() == ISD::AND &&
       DAG.isConstantIntBuildVectorOrConstantInt(Op.getOperand(1))) {
     Mask = Op.getOperand(1);
@@ -6561,7 +7293,7 @@ static SDValue stripConstantMask(SelectionDAG &DAG, SDValue Op, SDValue &Mask) {
 }
 
 /// Match "(X shl/srl V1) & V2" where V2 may not be present.
-static bool matchRotateHalf(SelectionDAG &DAG, SDValue Op, SDValue &Shift,
+static bool matchRotateHalf(const SelectionDAG &DAG, SDValue Op, SDValue &Shift,
                             SDValue &Mask) {
   Op = stripConstantMask(DAG, Op, Mask);
   if (Op.getOpcode() == ISD::SRL || Op.getOpcode() == ISD::SHL) {
@@ -6599,9 +7331,8 @@ static SDValue extractShiftForRotate(SelectionDAG &DAG, SDValue OppShift,
                                      SDValue ExtractFrom, SDValue &Mask,
                                      const SDLoc &DL) {
   assert(OppShift && ExtractFrom && "Empty SDValue");
-  assert(
-      (OppShift.getOpcode() == ISD::SHL || OppShift.getOpcode() == ISD::SRL) &&
-      "Existing shift must be valid as a rotate half");
+  if (OppShift.getOpcode() != ISD::SHL && OppShift.getOpcode() != ISD::SRL)
+    return SDValue();
 
   ExtractFrom = stripConstantMask(DAG, ExtractFrom, Mask);
 
@@ -6716,6 +7447,7 @@ static SDValue extractShiftForRotate(SelectionDAG &DAG, SDValue OppShift,
 // Otherwise if matching a general funnel shift, it should be clear.
 static bool matchRotateSub(SDValue Pos, SDValue Neg, unsigned EltSize,
                            SelectionDAG &DAG, bool IsRotate) {
+  const auto &TLI = DAG.getTargetLoweringInfo();
   // If EltSize is a power of 2 then:
   //
   //  (a) (Pos == 0 ? 0 : EltSize - Pos) == (EltSize - Pos) & (EltSize - 1)
@@ -6747,17 +7479,20 @@ static bool matchRotateSub(SDValue Pos, SDValue Neg, unsigned EltSize,
   // always invokes undefined behavior for 32-bit X.
   //
   // Below, Mask == EltSize - 1 when using [A] and is all-ones otherwise.
+  // This allows us to peek through any operations that only affect Mask's
+  // un-demanded bits.
   //
-  // NOTE: We can only do this when matching an AND and not a general
-  // funnel shift.
+  // NOTE: We can only do this when matching operations which won't modify the
+  // least Log2(EltSize) significant bits and not a general funnel shift.
   unsigned MaskLoBits = 0;
-  if (IsRotate && Neg.getOpcode() == ISD::AND && isPowerOf2_64(EltSize)) {
-    if (ConstantSDNode *NegC = isConstOrConstSplat(Neg.getOperand(1))) {
-      KnownBits Known = DAG.computeKnownBits(Neg.getOperand(0));
-      unsigned Bits = Log2_64(EltSize);
-      if (NegC->getAPIntValue().getActiveBits() <= Bits &&
-          ((NegC->getAPIntValue() | Known.Zero).countTrailingOnes() >= Bits)) {
-        Neg = Neg.getOperand(0);
+  if (IsRotate && isPowerOf2_64(EltSize)) {
+    unsigned Bits = Log2_64(EltSize);
+    unsigned NegBits = Neg.getScalarValueSizeInBits();
+    if (NegBits >= Bits) {
+      APInt DemandedBits = APInt::getLowBitsSet(NegBits, Bits);
+      if (SDValue Inner =
+              TLI.SimplifyMultipleUseDemandedBits(Neg, DemandedBits, DAG)) {
+        Neg = Inner;
         MaskLoBits = Bits;
       }
     }
@@ -6771,15 +7506,17 @@ static bool matchRotateSub(SDValue Pos, SDValue Neg, unsigned EltSize,
     return false;
   SDValue NegOp1 = Neg.getOperand(1);
 
-  // On the RHS of [A], if Pos is Pos' & (EltSize - 1), just replace Pos with
-  // Pos'.  The truncation is redundant for the purpose of the equality.
-  if (MaskLoBits && Pos.getOpcode() == ISD::AND) {
-    if (ConstantSDNode *PosC = isConstOrConstSplat(Pos.getOperand(1))) {
-      KnownBits Known = DAG.computeKnownBits(Pos.getOperand(0));
-      if (PosC->getAPIntValue().getActiveBits() <= MaskLoBits &&
-          ((PosC->getAPIntValue() | Known.Zero).countTrailingOnes() >=
-           MaskLoBits))
-        Pos = Pos.getOperand(0);
+  // On the RHS of [A], if Pos is the result of operation on Pos' that won't
+  // affect Mask's demanded bits, just replace Pos with Pos'. These operations
+  // are redundant for the purpose of the equality.
+  if (MaskLoBits) {
+    unsigned PosBits = Pos.getScalarValueSizeInBits();
+    if (PosBits >= MaskLoBits) {
+      APInt DemandedBits = APInt::getLowBitsSet(PosBits, MaskLoBits);
+      if (SDValue Inner =
+              TLI.SimplifyMultipleUseDemandedBits(Pos, DemandedBits, DAG)) {
+        Pos = Inner;
+      }
     }
   }
 
@@ -6831,8 +7568,9 @@ static bool matchRotateSub(SDValue Pos, SDValue Neg, unsigned EltSize,
 // Neg with outer conversions stripped away.
 SDValue DAGCombiner::MatchRotatePosNeg(SDValue Shifted, SDValue Pos,
                                        SDValue Neg, SDValue InnerPos,
-                                       SDValue InnerNeg, unsigned PosOpcode,
-                                       unsigned NegOpcode, const SDLoc &DL) {
+                                       SDValue InnerNeg, bool HasPos,
+                                       unsigned PosOpcode, unsigned NegOpcode,
+                                       const SDLoc &DL) {
   // fold (or (shl x, (*ext y)),
   //          (srl x, (*ext (sub 32, y)))) ->
   //   (rotl x, y) or (rotr x, (sub 32, y))
@@ -6843,7 +7581,6 @@ SDValue DAGCombiner::MatchRotatePosNeg(SDValue Shifted, SDValue Pos,
   EVT VT = Shifted.getValueType();
   if (matchRotateSub(InnerPos, InnerNeg, VT.getScalarSizeInBits(), DAG,
                      /*IsRotate*/ true)) {
-    bool HasPos = TLI.isOperationLegalOrCustom(PosOpcode, VT);
     return DAG.getNode(HasPos ? PosOpcode : NegOpcode, DL, VT, Shifted,
                        HasPos ? Pos : Neg);
   }
@@ -6859,8 +7596,9 @@ SDValue DAGCombiner::MatchRotatePosNeg(SDValue Shifted, SDValue Pos,
 // TODO: Merge with MatchRotatePosNeg.
 SDValue DAGCombiner::MatchFunnelPosNeg(SDValue N0, SDValue N1, SDValue Pos,
                                        SDValue Neg, SDValue InnerPos,
-                                       SDValue InnerNeg, unsigned PosOpcode,
-                                       unsigned NegOpcode, const SDLoc &DL) {
+                                       SDValue InnerNeg, bool HasPos,
+                                       unsigned PosOpcode, unsigned NegOpcode,
+                                       const SDLoc &DL) {
   EVT VT = N0.getValueType();
   unsigned EltBits = VT.getScalarSizeInBits();
 
@@ -6872,7 +7610,6 @@ SDValue DAGCombiner::MatchFunnelPosNeg(SDValue N0, SDValue N1, SDValue Pos,
   //          (srl x1, (*ext y))) ->
   //   (fshr x0, x1, y) or (fshl x0, x1, (sub 32, y))
   if (matchRotateSub(InnerPos, InnerNeg, EltBits, DAG, /*IsRotate*/ N0 == N1)) {
-    bool HasPos = TLI.isOperationLegalOrCustom(PosOpcode, VT);
     return DAG.getNode(HasPos ? PosOpcode : NegOpcode, DL, VT, N0, N1,
                        HasPos ? Pos : Neg);
   }
@@ -6925,17 +7662,26 @@ SDValue DAGCombiner::MatchFunnelPosNeg(SDValue N0, SDValue N1, SDValue Pos,
 // a rot[lr]. This also matches funnel shift patterns, similar to rotation but
 // with different shifted sources.
 SDValue DAGCombiner::MatchRotate(SDValue LHS, SDValue RHS, const SDLoc &DL) {
-  // Must be a legal type.  Expanded 'n promoted things won't work with rotates.
   EVT VT = LHS.getValueType();
-  if (!TLI.isTypeLegal(VT))
-    return SDValue();
 
   // The target must have at least one rotate/funnel flavor.
+  // We still try to match rotate by constant pre-legalization.
+  // TODO: Support pre-legalization funnel-shift by constant.
   bool HasROTL = hasOperation(ISD::ROTL, VT);
   bool HasROTR = hasOperation(ISD::ROTR, VT);
   bool HasFSHL = hasOperation(ISD::FSHL, VT);
   bool HasFSHR = hasOperation(ISD::FSHR, VT);
-  if (!HasROTL && !HasROTR && !HasFSHL && !HasFSHR)
+
+  // If the type is going to be promoted and the target has enabled custom
+  // lowering for rotate, allow matching rotate by non-constants. Only allow
+  // this for scalar types.
+  if (VT.isScalarInteger() && TLI.getTypeAction(*DAG.getContext(), VT) ==
+                                  TargetLowering::TypePromoteInteger) {
+    HasROTL |= TLI.getOperationAction(ISD::ROTL, VT) == TargetLowering::Custom;
+    HasROTR |= TLI.getOperationAction(ISD::ROTR, VT) == TargetLowering::Custom;
+  }
+
+  if (LegalOperations && !HasROTL && !HasROTR && !HasFSHL && !HasFSHR)
     return SDValue();
 
   // Check for truncated rotate.
@@ -6988,10 +7734,6 @@ SDValue DAGCombiner::MatchRotate(SDValue LHS, SDValue RHS, const SDLoc &DL) {
   if (LHSShift.getOpcode() == RHSShift.getOpcode())
     return SDValue(); // Shifts must disagree.
 
-  bool IsRotate = LHSShift.getOperand(0) == RHSShift.getOperand(0);
-  if (!IsRotate && !(HasFSHL || HasFSHR))
-    return SDValue(); // Requires funnel shift support.
-
   // Canonicalize shl to left side in a shl/srl pair.
   if (RHSShift.getOpcode() == ISD::SHL) {
     std::swap(LHS, RHS);
@@ -6999,30 +7741,22 @@ SDValue DAGCombiner::MatchRotate(SDValue LHS, SDValue RHS, const SDLoc &DL) {
     std::swap(LHSMask, RHSMask);
   }
 
+  // Something has gone wrong - we've lost the shl/srl pair - bail.
+  if (LHSShift.getOpcode() != ISD::SHL || RHSShift.getOpcode() != ISD::SRL)
+    return SDValue();
+
   unsigned EltSizeInBits = VT.getScalarSizeInBits();
   SDValue LHSShiftArg = LHSShift.getOperand(0);
   SDValue LHSShiftAmt = LHSShift.getOperand(1);
   SDValue RHSShiftArg = RHSShift.getOperand(0);
   SDValue RHSShiftAmt = RHSShift.getOperand(1);
 
-  // fold (or (shl x, C1), (srl x, C2)) -> (rotl x, C1)
-  // fold (or (shl x, C1), (srl x, C2)) -> (rotr x, C2)
-  // fold (or (shl x, C1), (srl y, C2)) -> (fshl x, y, C1)
-  // fold (or (shl x, C1), (srl y, C2)) -> (fshr x, y, C2)
-  // iff C1+C2 == EltSizeInBits
   auto MatchRotateSum = [EltSizeInBits](ConstantSDNode *LHS,
                                         ConstantSDNode *RHS) {
     return (LHS->getAPIntValue() + RHS->getAPIntValue()) == EltSizeInBits;
   };
-  if (ISD::matchBinaryPredicate(LHSShiftAmt, RHSShiftAmt, MatchRotateSum)) {
-    SDValue Res;
-    if (IsRotate && (HasROTL || HasROTR))
-      Res = DAG.getNode(HasROTL ? ISD::ROTL : ISD::ROTR, DL, VT, LHSShiftArg,
-                        HasROTL ? LHSShiftAmt : RHSShiftAmt);
-    else
-      Res = DAG.getNode(HasFSHL ? ISD::FSHL : ISD::FSHR, DL, VT, LHSShiftArg,
-                        RHSShiftArg, HasFSHL ? LHSShiftAmt : RHSShiftAmt);
 
+  auto ApplyMasks = [&](SDValue Res) {
     // If there is an AND of either shifted operand, apply it to the result.
     if (LHSMask.getNode() || RHSMask.getNode()) {
       SDValue AllOnes = DAG.getAllOnesConstant(DL, VT);
@@ -7043,8 +7777,78 @@ SDValue DAGCombiner::MatchRotate(SDValue LHS, SDValue RHS, const SDLoc &DL) {
     }
 
     return Res;
+  };
+
+  // TODO: Support pre-legalization funnel-shift by constant.
+  bool IsRotate = LHSShiftArg == RHSShiftArg;
+  if (!IsRotate && !(HasFSHL || HasFSHR)) {
+    if (TLI.isTypeLegal(VT) && LHS.hasOneUse() && RHS.hasOneUse() &&
+        ISD::matchBinaryPredicate(LHSShiftAmt, RHSShiftAmt, MatchRotateSum)) {
+      // Look for a disguised rotate by constant.
+      // The common shifted operand X may be hidden inside another 'or'.
+      SDValue X, Y;
+      auto matchOr = [&X, &Y](SDValue Or, SDValue CommonOp) {
+        if (!Or.hasOneUse() || Or.getOpcode() != ISD::OR)
+          return false;
+        if (CommonOp == Or.getOperand(0)) {
+          X = CommonOp;
+          Y = Or.getOperand(1);
+          return true;
+        }
+        if (CommonOp == Or.getOperand(1)) {
+          X = CommonOp;
+          Y = Or.getOperand(0);
+          return true;
+        }
+        return false;
+      };
+
+      SDValue Res;
+      if (matchOr(LHSShiftArg, RHSShiftArg)) {
+        // (shl (X | Y), C1) | (srl X, C2) --> (rotl X, C1) | (shl Y, C1)
+        SDValue RotX = DAG.getNode(ISD::ROTL, DL, VT, X, LHSShiftAmt);
+        SDValue ShlY = DAG.getNode(ISD::SHL, DL, VT, Y, LHSShiftAmt);
+        Res = DAG.getNode(ISD::OR, DL, VT, RotX, ShlY);
+      } else if (matchOr(RHSShiftArg, LHSShiftArg)) {
+        // (shl X, C1) | (srl (X | Y), C2) --> (rotl X, C1) | (srl Y, C2)
+        SDValue RotX = DAG.getNode(ISD::ROTL, DL, VT, X, LHSShiftAmt);
+        SDValue SrlY = DAG.getNode(ISD::SRL, DL, VT, Y, RHSShiftAmt);
+        Res = DAG.getNode(ISD::OR, DL, VT, RotX, SrlY);
+      } else {
+        return SDValue();
+      }
+
+      return ApplyMasks(Res);
+    }
+
+    return SDValue(); // Requires funnel shift support.
+  }
+
+  // fold (or (shl x, C1), (srl x, C2)) -> (rotl x, C1)
+  // fold (or (shl x, C1), (srl x, C2)) -> (rotr x, C2)
+  // fold (or (shl x, C1), (srl y, C2)) -> (fshl x, y, C1)
+  // fold (or (shl x, C1), (srl y, C2)) -> (fshr x, y, C2)
+  // iff C1+C2 == EltSizeInBits
+  if (ISD::matchBinaryPredicate(LHSShiftAmt, RHSShiftAmt, MatchRotateSum)) {
+    SDValue Res;
+    if (IsRotate && (HasROTL || HasROTR || !(HasFSHL || HasFSHR))) {
+      bool UseROTL = !LegalOperations || HasROTL;
+      Res = DAG.getNode(UseROTL ? ISD::ROTL : ISD::ROTR, DL, VT, LHSShiftArg,
+                        UseROTL ? LHSShiftAmt : RHSShiftAmt);
+    } else {
+      bool UseFSHL = !LegalOperations || HasFSHL;
+      Res = DAG.getNode(UseFSHL ? ISD::FSHL : ISD::FSHR, DL, VT, LHSShiftArg,
+                        RHSShiftArg, UseFSHL ? LHSShiftAmt : RHSShiftAmt);
+    }
+
+    return ApplyMasks(Res);
   }
 
+  // Even pre-legalization, we can't easily rotate/funnel-shift by a variable
+  // shift.
+  if (!HasROTL && !HasROTR && !HasFSHL && !HasFSHR)
+    return SDValue();
+
   // If there is a mask here, and we have a variable shift, we can't be sure
   // that we're masking out the right stuff.
   if (LHSMask.getNode() || RHSMask.getNode())
@@ -7068,26 +7872,26 @@ SDValue DAGCombiner::MatchRotate(SDValue LHS, SDValue RHS, const SDLoc &DL) {
   if (IsRotate && (HasROTL || HasROTR)) {
     SDValue TryL =
         MatchRotatePosNeg(LHSShiftArg, LHSShiftAmt, RHSShiftAmt, LExtOp0,
-                          RExtOp0, ISD::ROTL, ISD::ROTR, DL);
+                          RExtOp0, HasROTL, ISD::ROTL, ISD::ROTR, DL);
     if (TryL)
       return TryL;
 
     SDValue TryR =
         MatchRotatePosNeg(RHSShiftArg, RHSShiftAmt, LHSShiftAmt, RExtOp0,
-                          LExtOp0, ISD::ROTR, ISD::ROTL, DL);
+                          LExtOp0, HasROTR, ISD::ROTR, ISD::ROTL, DL);
     if (TryR)
       return TryR;
   }
 
   SDValue TryL =
       MatchFunnelPosNeg(LHSShiftArg, RHSShiftArg, LHSShiftAmt, RHSShiftAmt,
-                        LExtOp0, RExtOp0, ISD::FSHL, ISD::FSHR, DL);
+                        LExtOp0, RExtOp0, HasFSHL, ISD::FSHL, ISD::FSHR, DL);
   if (TryL)
     return TryL;
 
   SDValue TryR =
       MatchFunnelPosNeg(LHSShiftArg, RHSShiftArg, RHSShiftAmt, LHSShiftAmt,
-                        RExtOp0, LExtOp0, ISD::FSHR, ISD::FSHL, DL);
+                        RExtOp0, LExtOp0, HasFSHR, ISD::FSHR, ISD::FSHL, DL);
   if (TryR)
     return TryR;
 
@@ -7104,87 +7908,135 @@ struct ByteProvider {
   // ByteOffset is the offset of the byte in the value produced by the load.
   LoadSDNode *Load = nullptr;
   unsigned ByteOffset = 0;
+  unsigned VectorOffset = 0;
 
   ByteProvider() = default;
 
-  static ByteProvider getMemory(LoadSDNode *Load, unsigned ByteOffset) {
-    return ByteProvider(Load, ByteOffset);
+  static ByteProvider getMemory(LoadSDNode *Load, unsigned ByteOffset,
+                                unsigned VectorOffset) {
+    return ByteProvider(Load, ByteOffset, VectorOffset);
   }
 
-  static ByteProvider getConstantZero() { return ByteProvider(nullptr, 0); }
+  static ByteProvider getConstantZero() { return ByteProvider(nullptr, 0, 0); }
 
   bool isConstantZero() const { return !Load; }
   bool isMemory() const { return Load; }
 
   bool operator==(const ByteProvider &Other) const {
-    return Other.Load == Load && Other.ByteOffset == ByteOffset;
+    return Other.Load == Load && Other.ByteOffset == ByteOffset &&
+           Other.VectorOffset == VectorOffset;
   }
 
 private:
-  ByteProvider(LoadSDNode *Load, unsigned ByteOffset)
-      : Load(Load), ByteOffset(ByteOffset) {}
+  ByteProvider(LoadSDNode *Load, unsigned ByteOffset, unsigned VectorOffset)
+      : Load(Load), ByteOffset(ByteOffset), VectorOffset(VectorOffset) {}
 };
 
 } // end anonymous namespace
 
 /// Recursively traverses the expression calculating the origin of the requested
-/// byte of the given value. Returns None if the provider can't be calculated.
+/// byte of the given value. Returns std::nullopt if the provider can't be
+/// calculated.
+///
+/// For all the values except the root of the expression, we verify that the
+/// value has exactly one use and if not then return std::nullopt. This way if
+/// the origin of the byte is returned it's guaranteed that the values which
+/// contribute to the byte are not used outside of this expression.
+
+/// However, there is a special case when dealing with vector loads -- we allow
+/// more than one use if the load is a vector type.  Since the values that
+/// contribute to the byte ultimately come from the ExtractVectorElements of the
+/// Load, we don't care if the Load has uses other than ExtractVectorElements,
+/// because those operations are independent from the pattern to be combined.
+/// For vector loads, we simply care that the ByteProviders are adjacent
+/// positions of the same vector, and their index matches the byte that is being
+/// provided. This is captured by the \p VectorIndex algorithm. \p VectorIndex
+/// is the index used in an ExtractVectorElement, and \p StartingIndex is the
+/// byte position we are trying to provide for the LoadCombine. If these do
+/// not match, then we can not combine the vector loads. \p Index uses the
+/// byte position we are trying to provide for and is matched against the
+/// shl and load size. The \p Index algorithm ensures the requested byte is
+/// provided for by the pattern, and the pattern does not over provide bytes.
+///
 ///
-/// For all the values except the root of the expression verifies that the value
-/// has exactly one use and if it's not true return None. This way if the origin
-/// of the byte is returned it's guaranteed that the values which contribute to
-/// the byte are not used outside of this expression.
+/// The supported LoadCombine pattern for vector loads is as follows
+///                              or
+///                          /        \
+///                         or        shl
+///                       /     \      |
+///                     or      shl   zext
+///                   /    \     |     |
+///                 shl   zext  zext  EVE*
+///                  |     |     |     |
+///                 zext  EVE*  EVE*  LOAD
+///                  |     |     |
+///                 EVE*  LOAD  LOAD
+///                  |
+///                 LOAD
 ///
-/// Because the parts of the expression are not allowed to have more than one
-/// use this function iterates over trees, not DAGs. So it never visits the same
-/// node more than once.
-static const Optional<ByteProvider>
+/// *ExtractVectorElement
+static const std::optional<ByteProvider>
 calculateByteProvider(SDValue Op, unsigned Index, unsigned Depth,
-                      bool Root = false) {
+                      std::optional<uint64_t> VectorIndex,
+                      unsigned StartingIndex = 0) {
+
   // Typical i64 by i8 pattern requires recursion up to 8 calls depth
   if (Depth == 10)
-    return None;
+    return std::nullopt;
+
+  // Only allow multiple uses if the instruction is a vector load (in which
+  // case we will use the load for every ExtractVectorElement)
+  if (Depth && !Op.hasOneUse() &&
+      (Op.getOpcode() != ISD::LOAD || !Op.getValueType().isVector()))
+    return std::nullopt;
 
-  if (!Root && !Op.hasOneUse())
-    return None;
+  // Fail to combine if we have encountered anything but a LOAD after handling
+  // an ExtractVectorElement.
+  if (Op.getOpcode() != ISD::LOAD && VectorIndex.has_value())
+    return std::nullopt;
 
-  assert(Op.getValueType().isScalarInteger() && "can't handle other types");
   unsigned BitWidth = Op.getValueSizeInBits();
   if (BitWidth % 8 != 0)
-    return None;
+    return std::nullopt;
   unsigned ByteWidth = BitWidth / 8;
   assert(Index < ByteWidth && "invalid index requested");
   (void) ByteWidth;
 
   switch (Op.getOpcode()) {
   case ISD::OR: {
-    auto LHS = calculateByteProvider(Op->getOperand(0), Index, Depth + 1);
+    auto LHS =
+        calculateByteProvider(Op->getOperand(0), Index, Depth + 1, VectorIndex);
     if (!LHS)
-      return None;
-    auto RHS = calculateByteProvider(Op->getOperand(1), Index, Depth + 1);
+      return std::nullopt;
+    auto RHS =
+        calculateByteProvider(Op->getOperand(1), Index, Depth + 1, VectorIndex);
     if (!RHS)
-      return None;
+      return std::nullopt;
 
     if (LHS->isConstantZero())
       return RHS;
     if (RHS->isConstantZero())
       return LHS;
-    return None;
+    return std::nullopt;
   }
   case ISD::SHL: {
     auto ShiftOp = dyn_cast<ConstantSDNode>(Op->getOperand(1));
     if (!ShiftOp)
-      return None;
+      return std::nullopt;
 
     uint64_t BitShift = ShiftOp->getZExtValue();
+
     if (BitShift % 8 != 0)
-      return None;
+      return std::nullopt;
     uint64_t ByteShift = BitShift / 8;
 
+    // If we are shifting by an amount greater than the index we are trying to
+    // provide, then do not provide anything. Otherwise, subtract the index by
+    // the amount we shifted by.
     return Index < ByteShift
                ? ByteProvider::getConstantZero()
                : calculateByteProvider(Op->getOperand(0), Index - ByteShift,
-                                       Depth + 1);
+                                       Depth + 1, VectorIndex, Index);
   }
   case ISD::ANY_EXTEND:
   case ISD::SIGN_EXTEND:
@@ -7192,37 +8044,70 @@ calculateByteProvider(SDValue Op, unsigned Index, unsigned Depth,
     SDValue NarrowOp = Op->getOperand(0);
     unsigned NarrowBitWidth = NarrowOp.getScalarValueSizeInBits();
     if (NarrowBitWidth % 8 != 0)
-      return None;
+      return std::nullopt;
     uint64_t NarrowByteWidth = NarrowBitWidth / 8;
 
     if (Index >= NarrowByteWidth)
       return Op.getOpcode() == ISD::ZERO_EXTEND
-                 ? Optional<ByteProvider>(ByteProvider::getConstantZero())
-                 : None;
-    return calculateByteProvider(NarrowOp, Index, Depth + 1);
+                 ? std::optional<ByteProvider>(ByteProvider::getConstantZero())
+                 : std::nullopt;
+    return calculateByteProvider(NarrowOp, Index, Depth + 1, VectorIndex,
+                                 StartingIndex);
   }
   case ISD::BSWAP:
     return calculateByteProvider(Op->getOperand(0), ByteWidth - Index - 1,
-                                 Depth + 1);
+                                 Depth + 1, VectorIndex, StartingIndex);
+  case ISD::EXTRACT_VECTOR_ELT: {
+    auto OffsetOp = dyn_cast<ConstantSDNode>(Op->getOperand(1));
+    if (!OffsetOp)
+      return std::nullopt;
+
+    VectorIndex = OffsetOp->getZExtValue();
+
+    SDValue NarrowOp = Op->getOperand(0);
+    unsigned NarrowBitWidth = NarrowOp.getScalarValueSizeInBits();
+    if (NarrowBitWidth % 8 != 0)
+      return std::nullopt;
+    uint64_t NarrowByteWidth = NarrowBitWidth / 8;
+
+    // Check to see if the position of the element in the vector corresponds
+    // with the byte we are trying to provide for. In the case of a vector of
+    // i8, this simply means the VectorIndex == StartingIndex. For non i8 cases,
+    // the element will provide a range of bytes. For example, if we have a
+    // vector of i16s, each element provides two bytes (V[1] provides byte 2 and
+    // 3).
+    if (*VectorIndex * NarrowByteWidth > StartingIndex)
+      return std::nullopt;
+    if ((*VectorIndex + 1) * NarrowByteWidth <= StartingIndex)
+      return std::nullopt;
+
+    return calculateByteProvider(Op->getOperand(0), Index, Depth + 1,
+                                 VectorIndex, StartingIndex);
+  }
   case ISD::LOAD: {
     auto L = cast<LoadSDNode>(Op.getNode());
     if (!L->isSimple() || L->isIndexed())
-      return None;
+      return std::nullopt;
 
     unsigned NarrowBitWidth = L->getMemoryVT().getSizeInBits();
     if (NarrowBitWidth % 8 != 0)
-      return None;
+      return std::nullopt;
     uint64_t NarrowByteWidth = NarrowBitWidth / 8;
 
+    // If the width of the load does not reach byte we are trying to provide for
+    // and it is not a ZEXTLOAD, then the load does not provide for the byte in
+    // question
     if (Index >= NarrowByteWidth)
       return L->getExtensionType() == ISD::ZEXTLOAD
-                 ? Optional<ByteProvider>(ByteProvider::getConstantZero())
-                 : None;
-    return ByteProvider::getMemory(L, Index);
+                 ? std::optional<ByteProvider>(ByteProvider::getConstantZero())
+                 : std::nullopt;
+
+    unsigned BPVectorIndex = VectorIndex.value_or(0U);
+    return ByteProvider::getMemory(L, Index, BPVectorIndex);
   }
   }
 
-  return None;
+  return std::nullopt;
 }
 
 static unsigned littleEndianByteAt(unsigned BW, unsigned i) {
@@ -7235,13 +8120,13 @@ static unsigned bigEndianByteAt(unsigned BW, unsigned i) {
 
 // Check if the bytes offsets we are looking at match with either big or
 // little endian value loaded. Return true for big endian, false for little
-// endian, and None if match failed.
-static Optional<bool> isBigEndian(const ArrayRef<int64_t> ByteOffsets,
-                                  int64_t FirstOffset) {
+// endian, and std::nullopt if match failed.
+static std::optional<bool> isBigEndian(const ArrayRef<int64_t> ByteOffsets,
+                                       int64_t FirstOffset) {
   // The endian can be decided only when it is 2 bytes at least.
   unsigned Width = ByteOffsets.size();
   if (Width < 2)
-    return None;
+    return std::nullopt;
 
   bool BigEndian = true, LittleEndian = true;
   for (unsigned i = 0; i < Width; i++) {
@@ -7249,7 +8134,7 @@ static Optional<bool> isBigEndian(const ArrayRef<int64_t> ByteOffsets,
     LittleEndian &= CurrentByteOffset == littleEndianByteAt(Width, i);
     BigEndian &= CurrentByteOffset == bigEndianByteAt(Width, i);
     if (!BigEndian && !LittleEndian)
-      return None;
+      return std::nullopt;
   }
 
   assert((BigEndian != LittleEndian) && "It should be either big endian or"
@@ -7296,7 +8181,7 @@ SDValue DAGCombiner::mergeTruncStores(StoreSDNode *N) {
   // TODO: If there is evidence that running this later would help, this
   //       limitation could be removed. Legality checks may need to be added
   //       for the created store and optional bswap/rotate.
-  if (LegalOperations)
+  if (LegalOperations || OptLevel == CodeGenOpt::None)
     return SDValue();
 
   // We only handle merging simple stores of 1-4 bytes.
@@ -7312,9 +8197,13 @@ SDValue DAGCombiner::mergeTruncStores(StoreSDNode *N) {
   while (auto *Store = dyn_cast<StoreSDNode>(Chain)) {
     // All stores must be the same size to ensure that we are writing all of the
     // bytes in the wide value.
+    // This store should have exactly one use as a chain operand for another
+    // store in the merging set. If there are other chain uses, then the
+    // transform may not be safe because order of loads/stores outside of this
+    // set may not be preserved.
     // TODO: We could allow multiple sizes by tracking each stored byte.
     if (Store->getMemoryVT() != MemVT || !Store->isSimple() ||
-        Store->isIndexed())
+        Store->isIndexed() || !Store->hasOneUse())
       return SDValue();
     Stores.push_back(Store);
     Chain = Store->getChain();
@@ -7338,8 +8227,8 @@ SDValue DAGCombiner::mergeTruncStores(StoreSDNode *N) {
   SmallVector<int64_t, 8> OffsetMap(NumStores, INT64_MAX);
   int64_t FirstOffset = INT64_MAX;
   StoreSDNode *FirstStore = nullptr;
-  Optional<BaseIndexOffset> Base;
-  for (auto Store : Stores) {
+  std::optional<BaseIndexOffset> Base;
+  for (auto *Store : Stores) {
     // All the stores store different parts of the CombinedValue. A truncate is
     // required to get the partial value.
     SDValue Trunc = Store->getValue();
@@ -7406,7 +8295,7 @@ SDValue DAGCombiner::mergeTruncStores(StoreSDNode *N) {
 
   // Check that a store of the wide type is both allowed and fast on the target
   const DataLayout &Layout = DAG.getDataLayout();
-  bool Fast = false;
+  unsigned Fast = 0;
   bool Allowed = TLI.allowsMemoryAccess(Context, Layout, WideVT,
                                         *FirstStore->getMemOperand(), &Fast);
   if (!Allowed || !Fast)
@@ -7510,7 +8399,8 @@ SDValue DAGCombiner::MatchLoadCombine(SDNode *N) {
   bool IsBigEndianTarget = DAG.getDataLayout().isBigEndian();
   auto MemoryByteOffset = [&] (ByteProvider P) {
     assert(P.isMemory() && "Must be a memory byte provider");
-    unsigned LoadBitWidth = P.Load->getMemoryVT().getSizeInBits();
+    unsigned LoadBitWidth = P.Load->getMemoryVT().getScalarSizeInBits();
+
     assert(LoadBitWidth % 8 == 0 &&
            "can only analyze providers for individual bytes not bit");
     unsigned LoadByteWidth = LoadBitWidth / 8;
@@ -7519,11 +8409,11 @@ SDValue DAGCombiner::MatchLoadCombine(SDNode *N) {
             : littleEndianByteAt(LoadByteWidth, P.ByteOffset);
   };
 
-  Optional<BaseIndexOffset> Base;
+  std::optional<BaseIndexOffset> Base;
   SDValue Chain;
 
   SmallPtrSet<LoadSDNode *, 8> Loads;
-  Optional<ByteProvider> FirstByteProvider;
+  std::optional<ByteProvider> FirstByteProvider;
   int64_t FirstOffset = INT64_MAX;
 
   // Check if all the bytes of the OR we are looking at are loaded from the same
@@ -7531,7 +8421,9 @@ SDValue DAGCombiner::MatchLoadCombine(SDNode *N) {
   SmallVector<int64_t, 8> ByteOffsets(ByteWidth);
   unsigned ZeroExtendedBytes = 0;
   for (int i = ByteWidth - 1; i >= 0; --i) {
-    auto P = calculateByteProvider(SDValue(N, 0), i, 0, /*Root=*/true);
+    auto P =
+        calculateByteProvider(SDValue(N, 0), i, 0, /*VectorIndex*/ std::nullopt,
+                              /*StartingIndex*/ i);
     if (!P)
       return SDValue();
 
@@ -7545,10 +8437,6 @@ SDValue DAGCombiner::MatchLoadCombine(SDNode *N) {
     assert(P->isMemory() && "provenance should either be memory or zero");
 
     LoadSDNode *L = P->Load;
-    assert(L->hasNUsesOfValue(1, 0) && L->isSimple() &&
-           !L->isIndexed() &&
-           "Must be enforced by calculateByteProvider");
-    assert(L->getOffset().isUndef() && "Unindexed load must have undef offset");
 
     // All loads must share the same chain
     SDValue LChain = L->getChain();
@@ -7560,8 +8448,25 @@ SDValue DAGCombiner::MatchLoadCombine(SDNode *N) {
     // Loads must share the same base address
     BaseIndexOffset Ptr = BaseIndexOffset::match(L, DAG);
     int64_t ByteOffsetFromBase = 0;
+
+    // For vector loads, the expected load combine pattern will have an
+    // ExtractElement for each index in the vector. While each of these
+    // ExtractElements will be accessing the same base address as determined
+    // by the load instruction, the actual bytes they interact with will differ
+    // due to different ExtractElement indices. To accurately determine the
+    // byte position of an ExtractElement, we offset the base load ptr with
+    // the index multiplied by the byte size of each element in the vector.
+    if (L->getMemoryVT().isVector()) {
+      unsigned LoadWidthInBit = L->getMemoryVT().getScalarSizeInBits();
+      if (LoadWidthInBit % 8 != 0)
+        return SDValue();
+      unsigned ByteOffsetFromVector = P->VectorOffset * LoadWidthInBit / 8;
+      Ptr.addToOffset(ByteOffsetFromVector);
+    }
+
     if (!Base)
       Base = Ptr;
+
     else if (!Base->equalBaseIndex(Ptr, DAG, ByteOffsetFromBase))
       return SDValue();
 
@@ -7577,6 +8482,7 @@ SDValue DAGCombiner::MatchLoadCombine(SDNode *N) {
 
     Loads.insert(L);
   }
+
   assert(!Loads.empty() && "All the bytes of the value must be loaded from "
          "memory, so there must be at least one load which produces the value");
   assert(Base && "Base address of the accessed memory location must be set");
@@ -7600,9 +8506,9 @@ SDValue DAGCombiner::MatchLoadCombine(SDNode *N) {
 
   // Check if the bytes of the OR we are looking at match with either big or
   // little endian value load
-  Optional<bool> IsBigEndian = isBigEndian(
-      makeArrayRef(ByteOffsets).drop_back(ZeroExtendedBytes), FirstOffset);
-  if (!IsBigEndian.hasValue())
+  std::optional<bool> IsBigEndian = isBigEndian(
+      ArrayRef(ByteOffsets).drop_back(ZeroExtendedBytes), FirstOffset);
+  if (!IsBigEndian)
     return SDValue();
 
   assert(FirstByteProvider && "must be set");
@@ -7636,7 +8542,7 @@ SDValue DAGCombiner::MatchLoadCombine(SDNode *N) {
     return SDValue();
 
   // Check that a load of the wide type is both allowed and fast on the target
-  bool Fast = false;
+  unsigned Fast = 0;
   bool Allowed =
       TLI.allowsMemoryAccess(*DAG.getContext(), DAG.getDataLayout(), MemVT,
                              *FirstLoad->getMemOperand(), &Fast);
@@ -7671,9 +8577,12 @@ SDValue DAGCombiner::MatchLoadCombine(SDNode *N) {
 //    |  D  |
 // Into:
 //   (x & m) | (y & ~m)
-// If y is a constant, and the 'andn' does not work with immediates,
-// we unfold into a different pattern:
+// If y is a constant, m is not a 'not', and the 'andn' does not work with
+// immediates, we unfold into a different pattern:
 //   ~(~x & m) & (m | y)
+// If x is a constant, m is a 'not', and the 'andn' does not work with
+// immediates, we unfold into a different pattern:
+//   (x | ~m) & ~(~m & ~y)
 // NOTE: we don't unfold the pattern if 'xor' is actually a 'not', because at
 //       the very least that breaks andnpd / andnps patterns, and because those
 //       patterns are simplified in IR and shouldn't be created in the DAG
@@ -7728,8 +8637,9 @@ SDValue DAGCombiner::unfoldMaskedMerge(SDNode *N) {
 
   SDLoc DL(N);
 
-  // If Y is a constant, check that 'andn' works with immediates.
-  if (!TLI.hasAndNot(Y)) {
+  // If Y is a constant, check that 'andn' works with immediates. Unless M is
+  // a bitwise not that would already allow ANDN to be used.
+  if (!TLI.hasAndNot(Y) && !isBitwiseNot(M)) {
     assert(TLI.hasAndNot(X) && "Only mask is a variable? Unreachable.");
     // If not, we need to do a bit more work to make sure andn is still used.
     SDValue NotX = DAG.getNOT(DL, X, VT);
@@ -7739,6 +8649,19 @@ SDValue DAGCombiner::unfoldMaskedMerge(SDNode *N) {
     return DAG.getNode(ISD::AND, DL, VT, NotLHS, RHS);
   }
 
+  // If X is a constant and M is a bitwise not, check that 'andn' works with
+  // immediates.
+  if (!TLI.hasAndNot(X) && isBitwiseNot(M)) {
+    assert(TLI.hasAndNot(Y) && "Only mask is a variable? Unreachable.");
+    // If not, we need to do a bit more work to make sure andn is still used.
+    SDValue NotM = M.getOperand(0);
+    SDValue LHS = DAG.getNode(ISD::OR, DL, VT, X, NotM);
+    SDValue NotY = DAG.getNOT(DL, Y, VT);
+    SDValue RHS = DAG.getNode(ISD::AND, DL, VT, NotM, NotY);
+    SDValue NotRHS = DAG.getNOT(DL, RHS, VT);
+    return DAG.getNode(ISD::AND, DL, VT, LHS, NotRHS);
+  }
+
   SDValue LHS = DAG.getNode(ISD::AND, DL, VT, X, M);
   SDValue NotM = DAG.getNOT(DL, M, VT);
   SDValue RHS = DAG.getNode(ISD::AND, DL, VT, Y, NotM);
@@ -7750,21 +8673,9 @@ SDValue DAGCombiner::visitXOR(SDNode *N) {
   SDValue N0 = N->getOperand(0);
   SDValue N1 = N->getOperand(1);
   EVT VT = N0.getValueType();
-
-  // fold vector ops
-  if (VT.isVector()) {
-    if (SDValue FoldedVOp = SimplifyVBinOp(N))
-      return FoldedVOp;
-
-    // fold (xor x, 0) -> x, vector edition
-    if (ISD::isConstantSplatVectorAllZeros(N0.getNode()))
-      return N1;
-    if (ISD::isConstantSplatVectorAllZeros(N1.getNode()))
-      return N0;
-  }
+  SDLoc DL(N);
 
   // fold (xor undef, undef) -> 0. This is a common idiom (misuse).
-  SDLoc DL(N);
   if (N0.isUndef() && N1.isUndef())
     return DAG.getConstant(0, DL, VT);
 
@@ -7780,9 +8691,19 @@ SDValue DAGCombiner::visitXOR(SDNode *N) {
 
   // canonicalize constant to RHS
   if (DAG.isConstantIntBuildVectorOrConstantInt(N0) &&
-     !DAG.isConstantIntBuildVectorOrConstantInt(N1))
+      !DAG.isConstantIntBuildVectorOrConstantInt(N1))
     return DAG.getNode(ISD::XOR, DL, VT, N1, N0);
 
+  // fold vector ops
+  if (VT.isVector()) {
+    if (SDValue FoldedVOp = SimplifyVBinOp(N, DL))
+      return FoldedVOp;
+
+    // fold (xor x, 0) -> x, vector edition
+    if (ISD::isConstantSplatVectorAllZeros(N1.getNode()))
+      return N0;
+  }
+
   // fold (xor x, 0) -> x
   if (isNullConstant(N1))
     return N0;
@@ -7794,11 +8715,23 @@ SDValue DAGCombiner::visitXOR(SDNode *N) {
   if (SDValue RXOR = reassociateOps(ISD::XOR, DL, N0, N1, N->getFlags()))
     return RXOR;
 
+  // fold (a^b) -> (a|b) iff a and b share no bits.
+  if ((!LegalOperations || TLI.isOperationLegal(ISD::OR, VT)) &&
+      DAG.haveNoCommonBitsSet(N0, N1))
+    return DAG.getNode(ISD::OR, DL, VT, N0, N1);
+
+  // look for 'add-like' folds:
+  // XOR(N0,MIN_SIGNED_VALUE) == ADD(N0,MIN_SIGNED_VALUE)
+  if ((!LegalOperations || TLI.isOperationLegal(ISD::ADD, VT)) &&
+      isMinSignedConstant(N1))
+    if (SDValue Combined = visitADDLike(N))
+      return Combined;
+
   // fold !(x cc y) -> (x !cc y)
   unsigned N0Opcode = N0.getOpcode();
   SDValue LHS, RHS, CC;
-  if (TLI.isConstTrueVal(N1.getNode()) &&
-      isSetCCEquivalent(N0, LHS, RHS, CC, /*MatchStrict*/true)) {
+  if (TLI.isConstTrueVal(N1) &&
+      isSetCCEquivalent(N0, LHS, RHS, CC, /*MatchStrict*/ true)) {
     ISD::CondCode NotCC = ISD::getSetCCInverse(cast<CondCodeSDNode>(CC)->get(),
                                                LHS.getValueType());
     if (!LegalOperations ||
@@ -7878,8 +8811,7 @@ SDValue DAGCombiner::visitXOR(SDNode *N) {
   // fold (not (add X, -1)) -> (neg X)
   if (isAllOnesConstant(N1) && N0.getOpcode() == ISD::ADD &&
       isAllOnesOrAllOnesSplat(N0.getOperand(1))) {
-    return DAG.getNode(ISD::SUB, DL, VT, DAG.getConstant(0, DL, VT),
-                       N0.getOperand(0));
+    return DAG.getNegative(N0.getOperand(0), DL, VT);
   }
 
   // fold (xor (and x, y), y) -> (and (not x), y)
@@ -7890,28 +8822,6 @@ SDValue DAGCombiner::visitXOR(SDNode *N) {
     return DAG.getNode(ISD::AND, DL, VT, NotX, N1);
   }
 
-  if ((N0Opcode == ISD::SRL || N0Opcode == ISD::SHL) && N0.hasOneUse()) {
-    ConstantSDNode *XorC = isConstOrConstSplat(N1);
-    ConstantSDNode *ShiftC = isConstOrConstSplat(N0.getOperand(1));
-    unsigned BitWidth = VT.getScalarSizeInBits();
-    if (XorC && ShiftC) {
-      // Don't crash on an oversized shift. We can not guarantee that a bogus
-      // shift has been simplified to undef.
-      uint64_t ShiftAmt = ShiftC->getLimitedValue();
-      if (ShiftAmt < BitWidth) {
-        APInt Ones = APInt::getAllOnesValue(BitWidth);
-        Ones = N0Opcode == ISD::SHL ? Ones.shl(ShiftAmt) : Ones.lshr(ShiftAmt);
-        if (XorC->getAPIntValue() == Ones) {
-          // If the xor constant is a shifted -1, do a 'not' before the shift:
-          // xor (X << ShiftC), XorC --> (not X) << ShiftC
-          // xor (X >> ShiftC), XorC --> (not X) >> ShiftC
-          SDValue Not = DAG.getNOT(DL, N0.getOperand(0), VT);
-          return DAG.getNode(N0Opcode, DL, VT, Not, N0.getOperand(1));
-        }
-      }
-    }
-  }
-
   // fold Y = sra (X, size(X)-1); xor (add (X, Y), Y) -> (abs X)
   if (TLI.isOperationLegalOrCustom(ISD::ABS, VT)) {
     SDValue A = N0Opcode == ISD::ADD ? N0 : N1;
@@ -7959,6 +8869,13 @@ SDValue DAGCombiner::visitXOR(SDNode *N) {
     if (SDValue V = hoistLogicOpWithSameOpcodeHands(N))
       return V;
 
+  if (SDValue R = foldLogicOfShifts(N, N0, N1, DAG))
+    return R;
+  if (SDValue R = foldLogicOfShifts(N, N1, N0, DAG))
+    return R;
+  if (SDValue R = foldLogicTreeOfShifts(N, N0, N1, DAG))
+    return R;
+
   // Unfold  ((x ^ y) & m) ^ y  into  (x & m) | (y & ~m)  if profitable
   if (SDValue MM = unfoldMaskedMerge(N))
     return MM;
@@ -7967,7 +8884,7 @@ SDValue DAGCombiner::visitXOR(SDNode *N) {
   if (SimplifyDemandedBits(SDValue(N, 0)))
     return SDValue(N, 0);
 
-  if (SDValue Combined = combineCarryDiamond(*this, DAG, TLI, N0, N1, N))
+  if (SDValue Combined = combineCarryDiamond(DAG, TLI, N0, N1, N))
     return Combined;
 
   return SDValue();
@@ -8057,13 +8974,9 @@ SDValue DAGCombiner::visitShiftByConstant(SDNode *N) {
   if (!LHS.hasOneUse() || !TLI.isDesirableToCommuteWithShift(N, Level))
     return SDValue();
 
-  // TODO: This is limited to early combining because it may reveal regressions
-  //       otherwise. But since we just checked a target hook to see if this is
-  //       desirable, that should have filtered out cases where this interferes
-  //       with some other pattern matching.
-  if (!LegalTypes)
-    if (SDValue R = combineShiftOfShiftedLogic(N, DAG))
-      return R;
+  // Fold shift(bitop(shift(x,c1),y), c2) -> bitop(shift(x,c1+c2),shift(y,c2)).
+  if (SDValue R = combineShiftOfShiftedLogic(N, DAG))
+    return R;
 
   // We want to pull some binops through shifts, so that we have (and (shift))
   // instead of (shift (and)), likewise for add, or, xor, etc.  This sort of
@@ -8082,11 +8995,6 @@ SDValue DAGCombiner::visitShiftByConstant(SDNode *N) {
     break;
   }
 
-  // We require the RHS of the binop to be a constant and not opaque as well.
-  ConstantSDNode *BinOpCst = getAsNonOpaqueConstant(LHS.getOperand(1));
-  if (!BinOpCst)
-    return SDValue();
-
   // FIXME: disable this unless the input to the binop is a shift by a constant
   // or is copy/select. Enable this in other cases when figure out it's exactly
   // profitable.
@@ -8104,16 +9012,17 @@ SDValue DAGCombiner::visitShiftByConstant(SDNode *N) {
   if (IsCopyOrSelect && N->hasOneUse())
     return SDValue();
 
-  // Fold the constants, shifting the binop RHS by the shift amount.
+  // Attempt to fold the constants, shifting the binop RHS by the shift amount.
   SDLoc DL(N);
   EVT VT = N->getValueType(0);
-  SDValue NewRHS = DAG.getNode(N->getOpcode(), DL, VT, LHS.getOperand(1),
-                               N->getOperand(1));
-  assert(isa<ConstantSDNode>(NewRHS) && "Folding was not successful!");
+  if (SDValue NewRHS = DAG.FoldConstantArithmetic(
+          N->getOpcode(), DL, VT, {LHS.getOperand(1), N->getOperand(1)})) {
+    SDValue NewShift = DAG.getNode(N->getOpcode(), DL, VT, LHS.getOperand(0),
+                                   N->getOperand(1));
+    return DAG.getNode(LHS.getOpcode(), DL, VT, NewShift, NewRHS);
+  }
 
-  SDValue NewShift = DAG.getNode(N->getOpcode(), DL, VT, LHS.getOperand(0),
-                                 N->getOperand(1));
-  return DAG.getNode(LHS.getOpcode(), DL, VT, NewShift, NewRHS);
+  return SDValue();
 }
 
 SDValue DAGCombiner::distributeTruncateThroughAnd(SDNode *N) {
@@ -8189,7 +9098,9 @@ SDValue DAGCombiner::visitRotate(SDNode *N) {
   }
 
   unsigned NextOp = N0.getOpcode();
-  // fold (rot* (rot* x, c2), c1) -> (rot* x, c1 +- c2 % bitsize)
+
+  // fold (rot* (rot* x, c2), c1)
+  //   -> (rot* x, ((c1 % bitsize) +- (c2 % bitsize) + bitsize) % bitsize)
   if (NextOp == ISD::ROTL || NextOp == ISD::ROTR) {
     SDNode *C1 = DAG.isConstantIntBuildVectorOrConstantInt(N1);
     SDNode *C2 = DAG.isConstantIntBuildVectorOrConstantInt(N0.getOperand(1));
@@ -8197,14 +9108,21 @@ SDValue DAGCombiner::visitRotate(SDNode *N) {
       EVT ShiftVT = C1->getValueType(0);
       bool SameSide = (N->getOpcode() == NextOp);
       unsigned CombineOp = SameSide ? ISD::ADD : ISD::SUB;
-      if (SDValue CombinedShift = DAG.FoldConstantArithmetic(
-              CombineOp, dl, ShiftVT, {N1, N0.getOperand(1)})) {
-        SDValue BitsizeC = DAG.getConstant(Bitsize, dl, ShiftVT);
-        SDValue CombinedShiftNorm = DAG.FoldConstantArithmetic(
-            ISD::SREM, dl, ShiftVT, {CombinedShift, BitsizeC});
-        return DAG.getNode(N->getOpcode(), dl, VT, N0->getOperand(0),
-                           CombinedShiftNorm);
-      }
+      SDValue BitsizeC = DAG.getConstant(Bitsize, dl, ShiftVT);
+      SDValue Norm1 = DAG.FoldConstantArithmetic(ISD::UREM, dl, ShiftVT,
+                                                 {N1, BitsizeC});
+      SDValue Norm2 = DAG.FoldConstantArithmetic(ISD::UREM, dl, ShiftVT,
+                                                 {N0.getOperand(1), BitsizeC});
+      if (Norm1 && Norm2)
+        if (SDValue CombinedShift = DAG.FoldConstantArithmetic(
+                CombineOp, dl, ShiftVT, {Norm1, Norm2})) {
+          CombinedShift = DAG.FoldConstantArithmetic(ISD::ADD, dl, ShiftVT,
+                                                     {CombinedShift, BitsizeC});
+          SDValue CombinedShiftNorm = DAG.FoldConstantArithmetic(
+              ISD::UREM, dl, ShiftVT, {CombinedShift, BitsizeC});
+          return DAG.getNode(N->getOpcode(), dl, VT, N0->getOperand(0),
+                             CombinedShiftNorm);
+        }
     }
   }
   return SDValue();
@@ -8220,9 +9138,13 @@ SDValue DAGCombiner::visitSHL(SDNode *N) {
   EVT ShiftVT = N1.getValueType();
   unsigned OpSizeInBits = VT.getScalarSizeInBits();
 
+  // fold (shl c1, c2) -> c1<<c2
+  if (SDValue C = DAG.FoldConstantArithmetic(ISD::SHL, SDLoc(N), VT, {N0, N1}))
+    return C;
+
   // fold vector ops
   if (VT.isVector()) {
-    if (SDValue FoldedVOp = SimplifyVBinOp(N))
+    if (SDValue FoldedVOp = SimplifyVBinOp(N, SDLoc(N)))
       return FoldedVOp;
 
     BuildVectorSDNode *N1CV = dyn_cast<BuildVectorSDNode>(N1);
@@ -8245,18 +9167,11 @@ SDValue DAGCombiner::visitSHL(SDNode *N) {
     }
   }
 
-  ConstantSDNode *N1C = isConstOrConstSplat(N1);
-
-  // fold (shl c1, c2) -> c1<<c2
-  if (SDValue C = DAG.FoldConstantArithmetic(ISD::SHL, SDLoc(N), VT, {N0, N1}))
-    return C;
-
   if (SDValue NewSel = foldBinOpIntoSelect(N))
     return NewSel;
 
   // if (shl x, c) is known to be zero, return 0
-  if (DAG.MaskedValueIsZero(SDValue(N, 0),
-                            APInt::getAllOnesValue(OpSizeInBits)))
+  if (DAG.MaskedValueIsZero(SDValue(N, 0), APInt::getAllOnes(OpSizeInBits)))
     return DAG.getConstant(0, SDLoc(N), VT);
 
   // fold (shl x, (trunc (and y, c))) -> (shl x, (and (trunc y), (trunc c))).
@@ -8367,51 +9282,63 @@ SDValue DAGCombiner::visitSHL(SDNode *N) {
     }
   }
 
-  // fold (shl (sr[la] exact X,  C1), C2) -> (shl    X, (C2-C1)) if C1 <= C2
-  // fold (shl (sr[la] exact X,  C1), C2) -> (sr[la] X, (C2-C1)) if C1  > C2
-  // TODO - support non-uniform vector shift amounts.
-  if (N1C && (N0.getOpcode() == ISD::SRL || N0.getOpcode() == ISD::SRA) &&
-      N0->getFlags().hasExact()) {
-    if (ConstantSDNode *N0C1 = isConstOrConstSplat(N0.getOperand(1))) {
-      uint64_t C1 = N0C1->getZExtValue();
-      uint64_t C2 = N1C->getZExtValue();
-      SDLoc DL(N);
-      if (C1 <= C2)
-        return DAG.getNode(ISD::SHL, DL, VT, N0.getOperand(0),
-                           DAG.getConstant(C2 - C1, DL, ShiftVT));
-      return DAG.getNode(N0.getOpcode(), DL, VT, N0.getOperand(0),
-                         DAG.getConstant(C1 - C2, DL, ShiftVT));
+  if (N0.getOpcode() == ISD::SRL || N0.getOpcode() == ISD::SRA) {
+    auto MatchShiftAmount = [OpSizeInBits](ConstantSDNode *LHS,
+                                           ConstantSDNode *RHS) {
+      const APInt &LHSC = LHS->getAPIntValue();
+      const APInt &RHSC = RHS->getAPIntValue();
+      return LHSC.ult(OpSizeInBits) && RHSC.ult(OpSizeInBits) &&
+             LHSC.getZExtValue() <= RHSC.getZExtValue();
+    };
+
+    SDLoc DL(N);
+
+    // fold (shl (sr[la] exact X,  C1), C2) -> (shl    X, (C2-C1)) if C1 <= C2
+    // fold (shl (sr[la] exact X,  C1), C2) -> (sr[la] X, (C2-C1)) if C1 >= C2
+    if (N0->getFlags().hasExact()) {
+      if (ISD::matchBinaryPredicate(N0.getOperand(1), N1, MatchShiftAmount,
+                                    /*AllowUndefs*/ false,
+                                    /*AllowTypeMismatch*/ true)) {
+        SDValue N01 = DAG.getZExtOrTrunc(N0.getOperand(1), DL, ShiftVT);
+        SDValue Diff = DAG.getNode(ISD::SUB, DL, ShiftVT, N1, N01);
+        return DAG.getNode(ISD::SHL, DL, VT, N0.getOperand(0), Diff);
+      }
+      if (ISD::matchBinaryPredicate(N1, N0.getOperand(1), MatchShiftAmount,
+                                    /*AllowUndefs*/ false,
+                                    /*AllowTypeMismatch*/ true)) {
+        SDValue N01 = DAG.getZExtOrTrunc(N0.getOperand(1), DL, ShiftVT);
+        SDValue Diff = DAG.getNode(ISD::SUB, DL, ShiftVT, N01, N1);
+        return DAG.getNode(N0.getOpcode(), DL, VT, N0.getOperand(0), Diff);
+      }
     }
-  }
 
-  // fold (shl (srl x, c1), c2) -> (and (shl x, (sub c2, c1), MASK) or
-  //                               (and (srl x, (sub c1, c2), MASK)
-  // Only fold this if the inner shift has no other uses -- if it does, folding
-  // this will increase the total number of instructions.
-  // TODO - drop hasOneUse requirement if c1 == c2?
-  // TODO - support non-uniform vector shift amounts.
-  if (N1C && N0.getOpcode() == ISD::SRL && N0.hasOneUse() &&
-      TLI.shouldFoldConstantShiftPairToMask(N, Level)) {
-    if (ConstantSDNode *N0C1 = isConstOrConstSplat(N0.getOperand(1))) {
-      if (N0C1->getAPIntValue().ult(OpSizeInBits)) {
-        uint64_t c1 = N0C1->getZExtValue();
-        uint64_t c2 = N1C->getZExtValue();
-        APInt Mask = APInt::getHighBitsSet(OpSizeInBits, OpSizeInBits - c1);
-        SDValue Shift;
-        if (c2 > c1) {
-          Mask <<= c2 - c1;
-          SDLoc DL(N);
-          Shift = DAG.getNode(ISD::SHL, DL, VT, N0.getOperand(0),
-                              DAG.getConstant(c2 - c1, DL, ShiftVT));
-        } else {
-          Mask.lshrInPlace(c1 - c2);
-          SDLoc DL(N);
-          Shift = DAG.getNode(ISD::SRL, DL, VT, N0.getOperand(0),
-                              DAG.getConstant(c1 - c2, DL, ShiftVT));
-        }
-        SDLoc DL(N0);
-        return DAG.getNode(ISD::AND, DL, VT, Shift,
-                           DAG.getConstant(Mask, DL, VT));
+    // fold (shl (srl x, c1), c2) -> (and (shl x, (sub c2, c1), MASK) or
+    //                               (and (srl x, (sub c1, c2), MASK)
+    // Only fold this if the inner shift has no other uses -- if it does,
+    // folding this will increase the total number of instructions.
+    if (N0.getOpcode() == ISD::SRL &&
+        (N0.getOperand(1) == N1 || N0.hasOneUse()) &&
+        TLI.shouldFoldConstantShiftPairToMask(N, Level)) {
+      if (ISD::matchBinaryPredicate(N1, N0.getOperand(1), MatchShiftAmount,
+                                    /*AllowUndefs*/ false,
+                                    /*AllowTypeMismatch*/ true)) {
+        SDValue N01 = DAG.getZExtOrTrunc(N0.getOperand(1), DL, ShiftVT);
+        SDValue Diff = DAG.getNode(ISD::SUB, DL, ShiftVT, N01, N1);
+        SDValue Mask = DAG.getAllOnesConstant(DL, VT);
+        Mask = DAG.getNode(ISD::SHL, DL, VT, Mask, N01);
+        Mask = DAG.getNode(ISD::SRL, DL, VT, Mask, Diff);
+        SDValue Shift = DAG.getNode(ISD::SRL, DL, VT, N0.getOperand(0), Diff);
+        return DAG.getNode(ISD::AND, DL, VT, Shift, Mask);
+      }
+      if (ISD::matchBinaryPredicate(N0.getOperand(1), N1, MatchShiftAmount,
+                                    /*AllowUndefs*/ false,
+                                    /*AllowTypeMismatch*/ true)) {
+        SDValue N01 = DAG.getZExtOrTrunc(N0.getOperand(1), DL, ShiftVT);
+        SDValue Diff = DAG.getNode(ISD::SUB, DL, ShiftVT, N1, N01);
+        SDValue Mask = DAG.getAllOnesConstant(DL, VT);
+        Mask = DAG.getNode(ISD::SHL, DL, VT, Mask, N1);
+        SDValue Shift = DAG.getNode(ISD::SHL, DL, VT, N0.getOperand(0), Diff);
+        return DAG.getNode(ISD::AND, DL, VT, Shift, Mask);
       }
     }
   }
@@ -8430,7 +9357,7 @@ SDValue DAGCombiner::visitSHL(SDNode *N) {
   // Variant of version done on multiply, except mul by a power of 2 is turned
   // into a shift.
   if ((N0.getOpcode() == ISD::ADD || N0.getOpcode() == ISD::OR) &&
-      N0.getNode()->hasOneUse() &&
+      N0->hasOneUse() &&
       isConstantOrConstantVector(N1, /* No Opaques */ true) &&
       isConstantOrConstantVector(N0.getOperand(1), /* No Opaques */ true) &&
       TLI.isDesirableToCommuteWithShift(N, Level)) {
@@ -8442,36 +9369,35 @@ SDValue DAGCombiner::visitSHL(SDNode *N) {
   }
 
   // fold (shl (mul x, c1), c2) -> (mul x, c1 << c2)
-  if (N0.getOpcode() == ISD::MUL && N0.getNode()->hasOneUse() &&
-      isConstantOrConstantVector(N1, /* No Opaques */ true) &&
-      isConstantOrConstantVector(N0.getOperand(1), /* No Opaques */ true)) {
-    SDValue Shl = DAG.getNode(ISD::SHL, SDLoc(N1), VT, N0.getOperand(1), N1);
-    if (isConstantOrConstantVector(Shl))
+  if (N0.getOpcode() == ISD::MUL && N0->hasOneUse()) {
+    SDValue N01 = N0.getOperand(1);
+    if (SDValue Shl =
+            DAG.FoldConstantArithmetic(ISD::SHL, SDLoc(N1), VT, {N01, N1}))
       return DAG.getNode(ISD::MUL, SDLoc(N), VT, N0.getOperand(0), Shl);
   }
 
+  ConstantSDNode *N1C = isConstOrConstSplat(N1);
   if (N1C && !N1C->isOpaque())
     if (SDValue NewSHL = visitShiftByConstant(N))
       return NewSHL;
 
   // Fold (shl (vscale * C0), C1) to (vscale * (C0 << C1)).
-  if (N0.getOpcode() == ISD::VSCALE)
-    if (ConstantSDNode *NC1 = isConstOrConstSplat(N->getOperand(1))) {
-      const APInt &C0 = N0.getConstantOperandAPInt(0);
-      const APInt &C1 = NC1->getAPIntValue();
-      return DAG.getVScale(SDLoc(N), VT, C0 << C1);
-    }
+  if (N0.getOpcode() == ISD::VSCALE && N1C) {
+    const APInt &C0 = N0.getConstantOperandAPInt(0);
+    const APInt &C1 = N1C->getAPIntValue();
+    return DAG.getVScale(SDLoc(N), VT, C0 << C1);
+  }
 
   // Fold (shl step_vector(C0), C1) to (step_vector(C0 << C1)).
   APInt ShlVal;
-  if (N0.getOpcode() == ISD::STEP_VECTOR)
-    if (ISD::isConstantSplatVector(N1.getNode(), ShlVal)) {
-      const APInt &C0 = N0.getConstantOperandAPInt(0);
-      if (ShlVal.ult(C0.getBitWidth())) {
-        APInt NewStep = C0 << ShlVal;
-        return DAG.getStepVector(SDLoc(N), VT, NewStep);
-      }
+  if (N0.getOpcode() == ISD::STEP_VECTOR &&
+      ISD::isConstantSplatVector(N1.getNode(), ShlVal)) {
+    const APInt &C0 = N0.getConstantOperandAPInt(0);
+    if (ShlVal.ult(C0.getBitWidth())) {
+      APInt NewStep = C0 << ShlVal;
+      return DAG.getStepVector(SDLoc(N), VT, NewStep);
     }
+  }
 
   return SDValue();
 }
@@ -8501,28 +9427,65 @@ static SDValue combineShiftToMULH(SDNode *N, SelectionDAG &DAG,
   // Both operands must be equivalent extend nodes.
   SDValue LeftOp = ShiftOperand.getOperand(0);
   SDValue RightOp = ShiftOperand.getOperand(1);
+
   bool IsSignExt = LeftOp.getOpcode() == ISD::SIGN_EXTEND;
   bool IsZeroExt = LeftOp.getOpcode() == ISD::ZERO_EXTEND;
 
-  if ((!(IsSignExt || IsZeroExt)) || LeftOp.getOpcode() != RightOp.getOpcode())
+  if (!IsSignExt && !IsZeroExt)
     return SDValue();
 
-  EVT WideVT1 = LeftOp.getValueType();
-  EVT WideVT2 = RightOp.getValueType();
-  (void)WideVT2;
-  // Proceed with the transformation if the wide types match.
-  assert((WideVT1 == WideVT2) &&
-         "Cannot have a multiply node with two different operand types.");
-
   EVT NarrowVT = LeftOp.getOperand(0).getValueType();
-  // Check that the two extend nodes are the same type.
-  if (NarrowVT !=  RightOp.getOperand(0).getValueType())
+  unsigned NarrowVTSize = NarrowVT.getScalarSizeInBits();
+
+  // return true if U may use the lower bits of its operands
+  auto UserOfLowerBits = [NarrowVTSize](SDNode *U) {
+    if (U->getOpcode() != ISD::SRL && U->getOpcode() != ISD::SRA) {
+      return true;
+    }
+    ConstantSDNode *UShiftAmtSrc = isConstOrConstSplat(U->getOperand(1));
+    if (!UShiftAmtSrc) {
+      return true;
+    }
+    unsigned UShiftAmt = UShiftAmtSrc->getZExtValue();
+    return UShiftAmt < NarrowVTSize;
+  };
+
+  // If the lower part of the MUL is also used and MUL_LOHI is supported
+  // do not introduce the MULH in favor of MUL_LOHI
+  unsigned MulLoHiOp = IsSignExt ? ISD::SMUL_LOHI : ISD::UMUL_LOHI;
+  if (!ShiftOperand.hasOneUse() &&
+      TLI.isOperationLegalOrCustom(MulLoHiOp, NarrowVT) &&
+      llvm::any_of(ShiftOperand->uses(), UserOfLowerBits)) {
     return SDValue();
+  }
+
+  SDValue MulhRightOp;
+  if (ConstantSDNode *Constant = isConstOrConstSplat(RightOp)) {
+    unsigned ActiveBits = IsSignExt
+                              ? Constant->getAPIntValue().getMinSignedBits()
+                              : Constant->getAPIntValue().getActiveBits();
+    if (ActiveBits > NarrowVTSize)
+      return SDValue();
+    MulhRightOp = DAG.getConstant(
+        Constant->getAPIntValue().trunc(NarrowVT.getScalarSizeInBits()), DL,
+        NarrowVT);
+  } else {
+    if (LeftOp.getOpcode() != RightOp.getOpcode())
+      return SDValue();
+    // Check that the two extend nodes are the same type.
+    if (NarrowVT != RightOp.getOperand(0).getValueType())
+      return SDValue();
+    MulhRightOp = RightOp.getOperand(0);
+  }
+
+  EVT WideVT = LeftOp.getValueType();
+  // Proceed with the transformation if the wide types match.
+  assert((WideVT == RightOp.getValueType()) &&
+         "Cannot have a multiply node with two different operand types.");
 
   // Proceed with the transformation if the wide type is twice as large
   // as the narrow type.
-  unsigned NarrowVTSize = NarrowVT.getScalarSizeInBits();
-  if (WideVT1.getScalarSizeInBits() != 2 * NarrowVTSize)
+  if (WideVT.getScalarSizeInBits() != 2 * NarrowVTSize)
     return SDValue();
 
   // Check the shift amount with the narrow type size.
@@ -8540,10 +9503,10 @@ static SDValue combineShiftToMULH(SDNode *N, SelectionDAG &DAG,
   if (!TLI.isOperationLegalOrCustom(MulhOpcode, NarrowVT))
     return SDValue();
 
-  SDValue Result = DAG.getNode(MulhOpcode, DL, NarrowVT, LeftOp.getOperand(0),
-                               RightOp.getOperand(0));
-  return (N->getOpcode() == ISD::SRA ? DAG.getSExtOrTrunc(Result, DL, WideVT1)
-                                     : DAG.getZExtOrTrunc(Result, DL, WideVT1));
+  SDValue Result =
+      DAG.getNode(MulhOpcode, DL, NarrowVT, LeftOp.getOperand(0), MulhRightOp);
+  return (N->getOpcode() == ISD::SRA ? DAG.getSExtOrTrunc(Result, DL, WideVT)
+                                     : DAG.getZExtOrTrunc(Result, DL, WideVT));
 }
 
 SDValue DAGCombiner::visitSRA(SDNode *N) {
@@ -8555,6 +9518,10 @@ SDValue DAGCombiner::visitSRA(SDNode *N) {
   EVT VT = N0.getValueType();
   unsigned OpSizeInBits = VT.getScalarSizeInBits();
 
+  // fold (sra c1, c2) -> (sra c1, c2)
+  if (SDValue C = DAG.FoldConstantArithmetic(ISD::SRA, SDLoc(N), VT, {N0, N1}))
+    return C;
+
   // Arithmetic shifting an all-sign-bit value is a no-op.
   // fold (sra 0, x) -> 0
   // fold (sra -1, x) -> -1
@@ -8563,20 +9530,15 @@ SDValue DAGCombiner::visitSRA(SDNode *N) {
 
   // fold vector ops
   if (VT.isVector())
-    if (SDValue FoldedVOp = SimplifyVBinOp(N))
+    if (SDValue FoldedVOp = SimplifyVBinOp(N, SDLoc(N)))
       return FoldedVOp;
 
-  ConstantSDNode *N1C = isConstOrConstSplat(N1);
-
-  // fold (sra c1, c2) -> (sra c1, c2)
-  if (SDValue C = DAG.FoldConstantArithmetic(ISD::SRA, SDLoc(N), VT, {N0, N1}))
-    return C;
-
   if (SDValue NewSel = foldBinOpIntoSelect(N))
     return NewSel;
 
   // fold (sra (shl x, c1), c1) -> sext_inreg for some c1 and target supports
   // sext_inreg.
+  ConstantSDNode *N1C = isConstOrConstSplat(N1);
   if (N1C && N0.getOpcode() == ISD::SHL && N1 == N0.getOperand(1)) {
     unsigned LowBits = OpSizeInBits - (unsigned)N1C->getZExtValue();
     EVT ExtVT = EVT::getIntegerVT(*DAG.getContext(), LowBits);
@@ -8670,31 +9632,44 @@ SDValue DAGCombiner::visitSRA(SDNode *N) {
   // We convert trunc/ext to opposing shifts in IR, but casts may be cheaper.
   //   sra (add (shl X, N1C), AddC), N1C -->
   //   sext (add (trunc X to (width - N1C)), AddC')
-  if (N0.getOpcode() == ISD::ADD && N0.hasOneUse() && N1C &&
-      N0.getOperand(0).getOpcode() == ISD::SHL &&
-      N0.getOperand(0).getOperand(1) == N1 && N0.getOperand(0).hasOneUse()) {
-    if (ConstantSDNode *AddC = isConstOrConstSplat(N0.getOperand(1))) {
-      SDValue Shl = N0.getOperand(0);
-      // Determine what the truncate's type would be and ask the target if that
-      // is a free operation.
-      LLVMContext &Ctx = *DAG.getContext();
-      unsigned ShiftAmt = N1C->getZExtValue();
-      EVT TruncVT = EVT::getIntegerVT(Ctx, OpSizeInBits - ShiftAmt);
-      if (VT.isVector())
-        TruncVT = EVT::getVectorVT(Ctx, TruncVT, VT.getVectorElementCount());
-
-      // TODO: The simple type check probably belongs in the default hook
-      //       implementation and/or target-specific overrides (because
-      //       non-simple types likely require masking when legalized), but that
-      //       restriction may conflict with other transforms.
-      if (TruncVT.isSimple() && isTypeLegal(TruncVT) &&
-          TLI.isTruncateFree(VT, TruncVT)) {
-        SDLoc DL(N);
-        SDValue Trunc = DAG.getZExtOrTrunc(Shl.getOperand(0), DL, TruncVT);
-        SDValue ShiftC = DAG.getConstant(AddC->getAPIntValue().lshr(ShiftAmt).
-                             trunc(TruncVT.getScalarSizeInBits()), DL, TruncVT);
-        SDValue Add = DAG.getNode(ISD::ADD, DL, TruncVT, Trunc, ShiftC);
-        return DAG.getSExtOrTrunc(Add, DL, VT);
+  //   sra (sub AddC, (shl X, N1C)), N1C -->
+  //   sext (sub AddC1',(trunc X to (width - N1C)))
+  if ((N0.getOpcode() == ISD::ADD || N0.getOpcode() == ISD::SUB) && N1C &&
+      N0.hasOneUse()) {
+    bool IsAdd = N0.getOpcode() == ISD::ADD;
+    SDValue Shl = N0.getOperand(IsAdd ? 0 : 1);
+    if (Shl.getOpcode() == ISD::SHL && Shl.getOperand(1) == N1 &&
+        Shl.hasOneUse()) {
+      // TODO: AddC does not need to be a splat.
+      if (ConstantSDNode *AddC =
+              isConstOrConstSplat(N0.getOperand(IsAdd ? 1 : 0))) {
+        // Determine what the truncate's type would be and ask the target if
+        // that is a free operation.
+        LLVMContext &Ctx = *DAG.getContext();
+        unsigned ShiftAmt = N1C->getZExtValue();
+        EVT TruncVT = EVT::getIntegerVT(Ctx, OpSizeInBits - ShiftAmt);
+        if (VT.isVector())
+          TruncVT = EVT::getVectorVT(Ctx, TruncVT, VT.getVectorElementCount());
+
+        // TODO: The simple type check probably belongs in the default hook
+        //       implementation and/or target-specific overrides (because
+        //       non-simple types likely require masking when legalized), but
+        //       that restriction may conflict with other transforms.
+        if (TruncVT.isSimple() && isTypeLegal(TruncVT) &&
+            TLI.isTruncateFree(VT, TruncVT)) {
+          SDLoc DL(N);
+          SDValue Trunc = DAG.getZExtOrTrunc(Shl.getOperand(0), DL, TruncVT);
+          SDValue ShiftC =
+              DAG.getConstant(AddC->getAPIntValue().lshr(ShiftAmt).trunc(
+                                  TruncVT.getScalarSizeInBits()),
+                              DL, TruncVT);
+          SDValue Add;
+          if (IsAdd)
+            Add = DAG.getNode(ISD::ADD, DL, TruncVT, Trunc, ShiftC);
+          else
+            Add = DAG.getNode(ISD::SUB, DL, TruncVT, ShiftC, Trunc);
+          return DAG.getSExtOrTrunc(Add, DL, VT);
+        }
       }
     }
   }
@@ -8721,8 +9696,10 @@ SDValue DAGCombiner::visitSRA(SDNode *N) {
       unsigned TruncBits = LargeVT.getScalarSizeInBits() - OpSizeInBits;
       if (LargeShift->getAPIntValue() == TruncBits) {
         SDLoc DL(N);
-        SDValue Amt = DAG.getConstant(N1C->getZExtValue() + TruncBits, DL,
-                                      getShiftAmountTy(LargeVT));
+        EVT LargeShiftVT = getShiftAmountTy(LargeVT);
+        SDValue Amt = DAG.getZExtOrTrunc(N1, DL, LargeShiftVT);
+        Amt = DAG.getNode(ISD::ADD, DL, LargeShiftVT, Amt,
+                          DAG.getConstant(TruncBits, DL, LargeShiftVT));
         SDValue SRA =
             DAG.getNode(ISD::SRA, DL, LargeVT, N0Op0.getOperand(0), Amt);
         return DAG.getNode(ISD::TRUNCATE, DL, VT, SRA);
@@ -8747,6 +9724,10 @@ SDValue DAGCombiner::visitSRA(SDNode *N) {
   if (SDValue MULH = combineShiftToMULH(N, DAG, TLI))
     return MULH;
 
+  // Attempt to convert a sra of a load into a narrower sign-extending load.
+  if (SDValue NarrowLoad = reduceLoadWidth(N))
+    return NarrowLoad;
+
   return SDValue();
 }
 
@@ -8757,25 +9738,25 @@ SDValue DAGCombiner::visitSRL(SDNode *N) {
     return V;
 
   EVT VT = N0.getValueType();
+  EVT ShiftVT = N1.getValueType();
   unsigned OpSizeInBits = VT.getScalarSizeInBits();
 
-  // fold vector ops
-  if (VT.isVector())
-    if (SDValue FoldedVOp = SimplifyVBinOp(N))
-      return FoldedVOp;
-
-  ConstantSDNode *N1C = isConstOrConstSplat(N1);
-
   // fold (srl c1, c2) -> c1 >>u c2
   if (SDValue C = DAG.FoldConstantArithmetic(ISD::SRL, SDLoc(N), VT, {N0, N1}))
     return C;
 
+  // fold vector ops
+  if (VT.isVector())
+    if (SDValue FoldedVOp = SimplifyVBinOp(N, SDLoc(N)))
+      return FoldedVOp;
+
   if (SDValue NewSel = foldBinOpIntoSelect(N))
     return NewSel;
 
   // if (srl x, c) is known to be zero, return 0
-  if (N1C && DAG.MaskedValueIsZero(SDValue(N, 0),
-                                   APInt::getAllOnesValue(OpSizeInBits)))
+  ConstantSDNode *N1C = isConstOrConstSplat(N1);
+  if (N1C &&
+      DAG.MaskedValueIsZero(SDValue(N, 0), APInt::getAllOnes(OpSizeInBits)))
     return DAG.getConstant(0, SDLoc(N), VT);
 
   // fold (srl (srl x, c1), c2) -> 0 or (srl x, (add c1, c2))
@@ -8799,7 +9780,6 @@ SDValue DAGCombiner::visitSRL(SDNode *N) {
     };
     if (ISD::matchBinaryPredicate(N1, N0.getOperand(1), MatchInRange)) {
       SDLoc DL(N);
-      EVT ShiftVT = N1.getValueType();
       SDValue Sum = DAG.getNode(ISD::ADD, DL, ShiftVT, N1, N0.getOperand(1));
       return DAG.getNode(ISD::SRL, DL, VT, N0.getOperand(0), Sum);
     }
@@ -8843,15 +9823,41 @@ SDValue DAGCombiner::visitSRL(SDNode *N) {
     }
   }
 
-  // fold (srl (shl x, c), c) -> (and x, cst2)
-  // TODO - (srl (shl x, c1), c2).
-  if (N0.getOpcode() == ISD::SHL && N0.getOperand(1) == N1 &&
-      isConstantOrConstantVector(N1, /* NoOpaques */ true)) {
-    SDLoc DL(N);
-    SDValue Mask =
-        DAG.getNode(ISD::SRL, DL, VT, DAG.getAllOnesConstant(DL, VT), N1);
-    AddToWorklist(Mask.getNode());
-    return DAG.getNode(ISD::AND, DL, VT, N0.getOperand(0), Mask);
+  // fold (srl (shl x, c1), c2) -> (and (shl x, (sub c1, c2), MASK) or
+  //                               (and (srl x, (sub c2, c1), MASK)
+  if (N0.getOpcode() == ISD::SHL &&
+      (N0.getOperand(1) == N1 || N0->hasOneUse()) &&
+      TLI.shouldFoldConstantShiftPairToMask(N, Level)) {
+    auto MatchShiftAmount = [OpSizeInBits](ConstantSDNode *LHS,
+                                           ConstantSDNode *RHS) {
+      const APInt &LHSC = LHS->getAPIntValue();
+      const APInt &RHSC = RHS->getAPIntValue();
+      return LHSC.ult(OpSizeInBits) && RHSC.ult(OpSizeInBits) &&
+             LHSC.getZExtValue() <= RHSC.getZExtValue();
+    };
+    if (ISD::matchBinaryPredicate(N1, N0.getOperand(1), MatchShiftAmount,
+                                  /*AllowUndefs*/ false,
+                                  /*AllowTypeMismatch*/ true)) {
+      SDLoc DL(N);
+      SDValue N01 = DAG.getZExtOrTrunc(N0.getOperand(1), DL, ShiftVT);
+      SDValue Diff = DAG.getNode(ISD::SUB, DL, ShiftVT, N01, N1);
+      SDValue Mask = DAG.getAllOnesConstant(DL, VT);
+      Mask = DAG.getNode(ISD::SRL, DL, VT, Mask, N01);
+      Mask = DAG.getNode(ISD::SHL, DL, VT, Mask, Diff);
+      SDValue Shift = DAG.getNode(ISD::SHL, DL, VT, N0.getOperand(0), Diff);
+      return DAG.getNode(ISD::AND, DL, VT, Shift, Mask);
+    }
+    if (ISD::matchBinaryPredicate(N0.getOperand(1), N1, MatchShiftAmount,
+                                  /*AllowUndefs*/ false,
+                                  /*AllowTypeMismatch*/ true)) {
+      SDLoc DL(N);
+      SDValue N01 = DAG.getZExtOrTrunc(N0.getOperand(1), DL, ShiftVT);
+      SDValue Diff = DAG.getNode(ISD::SUB, DL, ShiftVT, N1, N01);
+      SDValue Mask = DAG.getAllOnesConstant(DL, VT);
+      Mask = DAG.getNode(ISD::SRL, DL, VT, Mask, N1);
+      SDValue Shift = DAG.getNode(ISD::SRL, DL, VT, N0.getOperand(0), Diff);
+      return DAG.getNode(ISD::AND, DL, VT, Shift, Mask);
+    }
   }
 
   // fold (srl (anyextend x), c) -> (and (anyextend (srl x, c)), mask)
@@ -8940,7 +9946,7 @@ SDValue DAGCombiner::visitSRL(SDNode *N) {
       return NewSRL;
 
   // Attempt to convert a srl of a load into a narrower zero-extending load.
-  if (SDValue NarrowLoad = ReduceLoadWidth(N))
+  if (SDValue NarrowLoad = reduceLoadWidth(N))
     return NarrowLoad;
 
   // Here is a common situation. We want to optimize:
@@ -8960,16 +9966,23 @@ SDValue DAGCombiner::visitSRL(SDNode *N) {
   // However when after the source operand of SRL is optimized into AND, the SRL
   // itself may not be optimized further. Look for it and add the BRCOND into
   // the worklist.
+  //
+  // The also tends to happen for binary operations when SimplifyDemandedBits
+  // is involved.
+  //
+  // FIXME: This is unecessary if we process the DAG in topological order,
+  // which we plan to do. This workaround can be removed once the DAG is
+  // processed in topological order.
   if (N->hasOneUse()) {
     SDNode *Use = *N->use_begin();
-    if (Use->getOpcode() == ISD::BRCOND)
-      AddToWorklist(Use);
-    else if (Use->getOpcode() == ISD::TRUNCATE && Use->hasOneUse()) {
-      // Also look pass the truncate.
+
+    // Look pass the truncate.
+    if (Use->getOpcode() == ISD::TRUNCATE && Use->hasOneUse())
       Use = *Use->use_begin();
-      if (Use->getOpcode() == ISD::BRCOND)
-        AddToWorklist(Use);
-    }
+
+    if (Use->getOpcode() == ISD::BRCOND || Use->getOpcode() == ISD::AND ||
+        Use->getOpcode() == ISD::OR || Use->getOpcode() == ISD::XOR)
+      AddToWorklist(Use);
   }
 
   // Try to transform this shift into a multiply-high if
@@ -9045,7 +10058,7 @@ SDValue DAGCombiner::visitFunnelShift(SDNode *N) {
           uint64_t PtrOff =
               IsFSHL ? (((BitWidth - ShAmt) % BitWidth) / 8) : (ShAmt / 8);
           Align NewAlign = commonAlignment(RHS->getAlign(), PtrOff);
-          bool Fast = false;
+          unsigned Fast = 0;
           if (TLI.allowsMemoryAccess(*DAG.getContext(), DAG.getDataLayout(), VT,
                                      RHS->getAddressSpace(), NewAlign,
                                      RHS->getMemOperand()->getFlags(), &Fast) &&
@@ -9094,11 +10107,42 @@ SDValue DAGCombiner::visitFunnelShift(SDNode *N) {
   return SDValue();
 }
 
+SDValue DAGCombiner::visitSHLSAT(SDNode *N) {
+  SDValue N0 = N->getOperand(0);
+  SDValue N1 = N->getOperand(1);
+  if (SDValue V = DAG.simplifyShift(N0, N1))
+    return V;
+
+  EVT VT = N0.getValueType();
+
+  // fold (*shlsat c1, c2) -> c1<<c2
+  if (SDValue C =
+          DAG.FoldConstantArithmetic(N->getOpcode(), SDLoc(N), VT, {N0, N1}))
+    return C;
+
+  ConstantSDNode *N1C = isConstOrConstSplat(N1);
+
+  if (!LegalOperations || TLI.isOperationLegalOrCustom(ISD::SHL, VT)) {
+    // fold (sshlsat x, c) -> (shl x, c)
+    if (N->getOpcode() == ISD::SSHLSAT && N1C &&
+        N1C->getAPIntValue().ult(DAG.ComputeNumSignBits(N0)))
+      return DAG.getNode(ISD::SHL, SDLoc(N), VT, N0, N1);
+
+    // fold (ushlsat x, c) -> (shl x, c)
+    if (N->getOpcode() == ISD::USHLSAT && N1C &&
+        N1C->getAPIntValue().ule(
+            DAG.computeKnownBits(N0).countMinLeadingZeros()))
+      return DAG.getNode(ISD::SHL, SDLoc(N), VT, N0, N1);
+  }
+
+  return SDValue();
+}
+
 // Given a ABS node, detect the following pattern:
 // (ABS (SUB (EXTEND a), (EXTEND b))).
 // Generates UABD/SABD instruction.
-static SDValue combineABSToABD(SDNode *N, SelectionDAG &DAG,
-                               const TargetLowering &TLI) {
+SDValue DAGCombiner::foldABSToABD(SDNode *N) {
+  EVT VT = N->getValueType(0);
   SDValue AbsOp1 = N->getOperand(0);
   SDValue Op0, Op1;
 
@@ -9111,21 +10155,34 @@ static SDValue combineABSToABD(SDNode *N, SelectionDAG &DAG,
   unsigned Opc0 = Op0.getOpcode();
   // Check if the operands of the sub are (zero|sign)-extended.
   if (Opc0 != Op1.getOpcode() ||
-      (Opc0 != ISD::ZERO_EXTEND && Opc0 != ISD::SIGN_EXTEND))
+      (Opc0 != ISD::ZERO_EXTEND && Opc0 != ISD::SIGN_EXTEND)) {
+    // fold (abs (sub nsw x, y)) -> abds(x, y)
+    if (AbsOp1->getFlags().hasNoSignedWrap() &&
+        TLI.isOperationLegalOrCustom(ISD::ABDS, VT))
+      return DAG.getNode(ISD::ABDS, SDLoc(N), VT, Op0, Op1);
     return SDValue();
+  }
 
   EVT VT1 = Op0.getOperand(0).getValueType();
   EVT VT2 = Op1.getOperand(0).getValueType();
-  // Check if the operands are of same type and valid size.
   unsigned ABDOpcode = (Opc0 == ISD::SIGN_EXTEND) ? ISD::ABDS : ISD::ABDU;
-  if (VT1 != VT2 || !TLI.isOperationLegalOrCustom(ABDOpcode, VT1))
-    return SDValue();
 
-  Op0 = Op0.getOperand(0);
-  Op1 = Op1.getOperand(0);
-  SDValue ABD =
-      DAG.getNode(ABDOpcode, SDLoc(N), Op0->getValueType(0), Op0, Op1);
-  return DAG.getNode(ISD::ZERO_EXTEND, SDLoc(N), N->getValueType(0), ABD);
+  // fold abs(sext(x) - sext(y)) -> zext(abds(x, y))
+  // fold abs(zext(x) - zext(y)) -> zext(abdu(x, y))
+  // NOTE: Extensions must be equivalent.
+  if (VT1 == VT2 && TLI.isOperationLegalOrCustom(ABDOpcode, VT1)) {
+    Op0 = Op0.getOperand(0);
+    Op1 = Op1.getOperand(0);
+    SDValue ABD = DAG.getNode(ABDOpcode, SDLoc(N), VT1, Op0, Op1);
+    return DAG.getNode(ISD::ZERO_EXTEND, SDLoc(N), VT, ABD);
+  }
+
+  // fold abs(sext(x) - sext(y)) -> abds(sext(x), sext(y))
+  // fold abs(zext(x) - zext(y)) -> abdu(zext(x), zext(y))
+  if (TLI.isOperationLegalOrCustom(ABDOpcode, VT))
+    return DAG.getNode(ABDOpcode, SDLoc(N), VT, Op0, Op1);
+
+  return SDValue();
 }
 
 SDValue DAGCombiner::visitABS(SDNode *N) {
@@ -9142,22 +10199,84 @@ SDValue DAGCombiner::visitABS(SDNode *N) {
   if (DAG.SignBitIsZero(N0))
     return N0;
 
-  if (SDValue ABD = combineABSToABD(N, DAG, TLI))
+  if (SDValue ABD = foldABSToABD(N))
     return ABD;
 
+  // fold (abs (sign_extend_inreg x)) -> (zero_extend (abs (truncate x)))
+  // iff zero_extend/truncate are free.
+  if (N0.getOpcode() == ISD::SIGN_EXTEND_INREG) {
+    EVT ExtVT = cast<VTSDNode>(N0.getOperand(1))->getVT();
+    if (TLI.isTruncateFree(VT, ExtVT) && TLI.isZExtFree(ExtVT, VT) &&
+        TLI.isTypeDesirableForOp(ISD::ABS, ExtVT) &&
+        hasOperation(ISD::ABS, ExtVT)) {
+      SDLoc DL(N);
+      return DAG.getNode(
+          ISD::ZERO_EXTEND, DL, VT,
+          DAG.getNode(ISD::ABS, DL, ExtVT,
+                      DAG.getNode(ISD::TRUNCATE, DL, ExtVT, N0.getOperand(0))));
+    }
+  }
+
   return SDValue();
 }
 
 SDValue DAGCombiner::visitBSWAP(SDNode *N) {
   SDValue N0 = N->getOperand(0);
   EVT VT = N->getValueType(0);
+  SDLoc DL(N);
 
   // fold (bswap c1) -> c2
   if (DAG.isConstantIntBuildVectorOrConstantInt(N0))
-    return DAG.getNode(ISD::BSWAP, SDLoc(N), VT, N0);
+    return DAG.getNode(ISD::BSWAP, DL, VT, N0);
   // fold (bswap (bswap x)) -> x
   if (N0.getOpcode() == ISD::BSWAP)
-    return N0->getOperand(0);
+    return N0.getOperand(0);
+
+  // Canonicalize bswap(bitreverse(x)) -> bitreverse(bswap(x)). If bitreverse
+  // isn't supported, it will be expanded to bswap followed by a manual reversal
+  // of bits in each byte. By placing bswaps before bitreverse, we can remove
+  // the two bswaps if the bitreverse gets expanded.
+  if (N0.getOpcode() == ISD::BITREVERSE && N0.hasOneUse()) {
+    SDValue BSwap = DAG.getNode(ISD::BSWAP, DL, VT, N0.getOperand(0));
+    return DAG.getNode(ISD::BITREVERSE, DL, VT, BSwap);
+  }
+
+  // fold (bswap shl(x,c)) -> (zext(bswap(trunc(shl(x,sub(c,bw/2))))))
+  // iff x >= bw/2 (i.e. lower half is known zero)
+  unsigned BW = VT.getScalarSizeInBits();
+  if (BW >= 32 && N0.getOpcode() == ISD::SHL && N0.hasOneUse()) {
+    auto *ShAmt = dyn_cast<ConstantSDNode>(N0.getOperand(1));
+    EVT HalfVT = EVT::getIntegerVT(*DAG.getContext(), BW / 2);
+    if (ShAmt && ShAmt->getAPIntValue().ult(BW) &&
+        ShAmt->getZExtValue() >= (BW / 2) &&
+        (ShAmt->getZExtValue() % 16) == 0 && TLI.isTypeLegal(HalfVT) &&
+        TLI.isTruncateFree(VT, HalfVT) &&
+        (!LegalOperations || hasOperation(ISD::BSWAP, HalfVT))) {
+      SDValue Res = N0.getOperand(0);
+      if (uint64_t NewShAmt = (ShAmt->getZExtValue() - (BW / 2)))
+        Res = DAG.getNode(ISD::SHL, DL, VT, Res,
+                          DAG.getConstant(NewShAmt, DL, getShiftAmountTy(VT)));
+      Res = DAG.getZExtOrTrunc(Res, DL, HalfVT);
+      Res = DAG.getNode(ISD::BSWAP, DL, HalfVT, Res);
+      return DAG.getZExtOrTrunc(Res, DL, VT);
+    }
+  }
+
+  // Try to canonicalize bswap-of-logical-shift-by-8-bit-multiple as
+  // inverse-shift-of-bswap:
+  // bswap (X u<< C) --> (bswap X) u>> C
+  // bswap (X u>> C) --> (bswap X) u<< C
+  if ((N0.getOpcode() == ISD::SHL || N0.getOpcode() == ISD::SRL) &&
+      N0.hasOneUse()) {
+    auto *ShAmt = dyn_cast<ConstantSDNode>(N0.getOperand(1));
+    if (ShAmt && ShAmt->getAPIntValue().ult(BW) &&
+        ShAmt->getZExtValue() % 8 == 0) {
+      SDValue NewSwap = DAG.getNode(ISD::BSWAP, DL, VT, N0.getOperand(0));
+      unsigned InverseShift = N0.getOpcode() == ISD::SHL ? ISD::SRL : ISD::SHL;
+      return DAG.getNode(InverseShift, DL, VT, NewSwap, N0.getOperand(1));
+    }
+  }
+
   return SDValue();
 }
 
@@ -9251,14 +10370,11 @@ static bool isLegalToCombineMinNumMaxNum(SelectionDAG &DAG, SDValue LHS,
          DAG.isKnownNeverNaN(LHS) && DAG.isKnownNeverNaN(RHS);
 }
 
-/// Generate Min/Max node
-static SDValue combineMinNumMaxNum(const SDLoc &DL, EVT VT, SDValue LHS,
-                                   SDValue RHS, SDValue True, SDValue False,
-                                   ISD::CondCode CC, const TargetLowering &TLI,
-                                   SelectionDAG &DAG) {
-  if (!(LHS == True && RHS == False) && !(LHS == False && RHS == True))
-    return SDValue();
-
+static SDValue combineMinNumMaxNumImpl(const SDLoc &DL, EVT VT, SDValue LHS,
+                                       SDValue RHS, SDValue True, SDValue False,
+                                       ISD::CondCode CC,
+                                       const TargetLowering &TLI,
+                                       SelectionDAG &DAG) {
   EVT TransformVT = TLI.getTypeToTransformTo(*DAG.getContext(), VT);
   switch (CC) {
   case ISD::SETOLT:
@@ -9299,6 +10415,47 @@ static SDValue combineMinNumMaxNum(const SDLoc &DL, EVT VT, SDValue LHS,
   }
 }
 
+/// Generate Min/Max node
+SDValue DAGCombiner::combineMinNumMaxNum(const SDLoc &DL, EVT VT, SDValue LHS,
+                                         SDValue RHS, SDValue True,
+                                         SDValue False, ISD::CondCode CC) {
+  if ((LHS == True && RHS == False) || (LHS == False && RHS == True))
+    return combineMinNumMaxNumImpl(DL, VT, LHS, RHS, True, False, CC, TLI, DAG);
+
+  // If we can't directly match this, try to see if we can pull an fneg out of
+  // the select.
+  SDValue NegTrue = TLI.getCheaperOrNeutralNegatedExpression(
+      True, DAG, LegalOperations, ForCodeSize);
+  if (!NegTrue)
+    return SDValue();
+
+  HandleSDNode NegTrueHandle(NegTrue);
+
+  // Try to unfold an fneg from the select if we are comparing the negated
+  // constant.
+  //
+  // select (setcc x, K) (fneg x), -K -> fneg(minnum(x, K))
+  //
+  // TODO: Handle fabs
+  if (LHS == NegTrue) {
+    // If we can't directly match this, try to see if we can pull an fneg out of
+    // the select.
+    SDValue NegRHS = TLI.getCheaperOrNeutralNegatedExpression(
+        RHS, DAG, LegalOperations, ForCodeSize);
+    if (NegRHS) {
+      HandleSDNode NegRHSHandle(NegRHS);
+      if (NegRHS == False) {
+        SDValue Combined = combineMinNumMaxNumImpl(DL, VT, LHS, RHS, NegTrue,
+                                                   False, CC, TLI, DAG);
+        if (Combined)
+          return DAG.getNode(ISD::FNEG, DL, VT, Combined);
+      }
+    }
+  }
+
+  return SDValue();
+}
+
 /// If a (v)select has a condition value that is a sign-bit test, try to smear
 /// the condition operand sign-bit across the value width and use it as a mask.
 static SDValue foldSelectOfConstantsUsingSra(SDNode *N, SelectionDAG &DAG) {
@@ -9336,6 +10493,25 @@ static SDValue foldSelectOfConstantsUsingSra(SDNode *N, SelectionDAG &DAG) {
   return SDValue();
 }
 
+static bool shouldConvertSelectOfConstantsToMath(const SDValue &Cond, EVT VT,
+                                                 const TargetLowering &TLI) {
+  if (!TLI.convertSelectOfConstantsToMath(VT))
+    return false;
+
+  if (Cond.getOpcode() != ISD::SETCC || !Cond->hasOneUse())
+    return true;
+  if (!TLI.isOperationLegalOrCustom(ISD::SELECT_CC, VT))
+    return true;
+
+  ISD::CondCode CC = cast<CondCodeSDNode>(Cond.getOperand(2))->get();
+  if (CC == ISD::SETLT && isNullOrNullSplat(Cond.getOperand(1)))
+    return true;
+  if (CC == ISD::SETGT && isAllOnesOrAllOnesSplat(Cond.getOperand(1)))
+    return true;
+
+  return false;
+}
+
 SDValue DAGCombiner::foldSelectOfConstants(SDNode *N) {
   SDValue Cond = N->getOperand(0);
   SDValue N1 = N->getOperand(1);
@@ -9352,95 +10528,106 @@ SDValue DAGCombiner::foldSelectOfConstants(SDNode *N) {
   if (!C1 || !C2)
     return SDValue();
 
+  if (CondVT != MVT::i1 || LegalOperations) {
+    // fold (select Cond, 0, 1) -> (xor Cond, 1)
+    // We can't do this reliably if integer based booleans have different contents
+    // to floating point based booleans. This is because we can't tell whether we
+    // have an integer-based boolean or a floating-point-based boolean unless we
+    // can find the SETCC that produced it and inspect its operands. This is
+    // fairly easy if C is the SETCC node, but it can potentially be
+    // undiscoverable (or not reasonably discoverable). For example, it could be
+    // in another basic block or it could require searching a complicated
+    // expression.
+    if (CondVT.isInteger() &&
+        TLI.getBooleanContents(/*isVec*/false, /*isFloat*/true) ==
+            TargetLowering::ZeroOrOneBooleanContent &&
+        TLI.getBooleanContents(/*isVec*/false, /*isFloat*/false) ==
+            TargetLowering::ZeroOrOneBooleanContent &&
+        C1->isZero() && C2->isOne()) {
+      SDValue NotCond =
+          DAG.getNode(ISD::XOR, DL, CondVT, Cond, DAG.getConstant(1, DL, CondVT));
+      if (VT.bitsEq(CondVT))
+        return NotCond;
+      return DAG.getZExtOrTrunc(NotCond, DL, VT);
+    }
+
+    return SDValue();
+  }
+
   // Only do this before legalization to avoid conflicting with target-specific
   // transforms in the other direction (create a select from a zext/sext). There
   // is also a target-independent combine here in DAGCombiner in the other
   // direction for (select Cond, -1, 0) when the condition is not i1.
-  if (CondVT == MVT::i1 && !LegalOperations) {
-    if (C1->isNullValue() && C2->isOne()) {
-      // select Cond, 0, 1 --> zext (!Cond)
-      SDValue NotCond = DAG.getNOT(DL, Cond, MVT::i1);
-      if (VT != MVT::i1)
-        NotCond = DAG.getNode(ISD::ZERO_EXTEND, DL, VT, NotCond);
-      return NotCond;
-    }
-    if (C1->isNullValue() && C2->isAllOnesValue()) {
-      // select Cond, 0, -1 --> sext (!Cond)
-      SDValue NotCond = DAG.getNOT(DL, Cond, MVT::i1);
-      if (VT != MVT::i1)
-        NotCond = DAG.getNode(ISD::SIGN_EXTEND, DL, VT, NotCond);
-      return NotCond;
-    }
-    if (C1->isOne() && C2->isNullValue()) {
-      // select Cond, 1, 0 --> zext (Cond)
-      if (VT != MVT::i1)
-        Cond = DAG.getNode(ISD::ZERO_EXTEND, DL, VT, Cond);
-      return Cond;
-    }
-    if (C1->isAllOnesValue() && C2->isNullValue()) {
-      // select Cond, -1, 0 --> sext (Cond)
-      if (VT != MVT::i1)
-        Cond = DAG.getNode(ISD::SIGN_EXTEND, DL, VT, Cond);
-      return Cond;
-    }
-
-    // Use a target hook because some targets may prefer to transform in the
-    // other direction.
-    if (TLI.convertSelectOfConstantsToMath(VT)) {
-      // For any constants that differ by 1, we can transform the select into an
-      // extend and add.
-      const APInt &C1Val = C1->getAPIntValue();
-      const APInt &C2Val = C2->getAPIntValue();
-      if (C1Val - 1 == C2Val) {
-        // select Cond, C1, C1-1 --> add (zext Cond), C1-1
-        if (VT != MVT::i1)
-          Cond = DAG.getNode(ISD::ZERO_EXTEND, DL, VT, Cond);
-        return DAG.getNode(ISD::ADD, DL, VT, Cond, N2);
-      }
-      if (C1Val + 1 == C2Val) {
-        // select Cond, C1, C1+1 --> add (sext Cond), C1+1
-        if (VT != MVT::i1)
-          Cond = DAG.getNode(ISD::SIGN_EXTEND, DL, VT, Cond);
-        return DAG.getNode(ISD::ADD, DL, VT, Cond, N2);
-      }
+  assert(CondVT == MVT::i1 && !LegalOperations);
 
-      // select Cond, Pow2, 0 --> (zext Cond) << log2(Pow2)
-      if (C1Val.isPowerOf2() && C2Val.isNullValue()) {
-        if (VT != MVT::i1)
-          Cond = DAG.getNode(ISD::ZERO_EXTEND, DL, VT, Cond);
-        SDValue ShAmtC = DAG.getConstant(C1Val.exactLogBase2(), DL, VT);
-        return DAG.getNode(ISD::SHL, DL, VT, Cond, ShAmtC);
-      }
+  // select Cond, 1, 0 --> zext (Cond)
+  if (C1->isOne() && C2->isZero())
+    return DAG.getZExtOrTrunc(Cond, DL, VT);
 
-      if (SDValue V = foldSelectOfConstantsUsingSra(N, DAG))
-        return V;
-    }
+  // select Cond, -1, 0 --> sext (Cond)
+  if (C1->isAllOnes() && C2->isZero())
+    return DAG.getSExtOrTrunc(Cond, DL, VT);
+
+  // select Cond, 0, 1 --> zext (!Cond)
+  if (C1->isZero() && C2->isOne()) {
+    SDValue NotCond = DAG.getNOT(DL, Cond, MVT::i1);
+    NotCond = DAG.getZExtOrTrunc(NotCond, DL, VT);
+    return NotCond;
+  }
 
+  // select Cond, 0, -1 --> sext (!Cond)
+  if (C1->isZero() && C2->isAllOnes()) {
+    SDValue NotCond = DAG.getNOT(DL, Cond, MVT::i1);
+    NotCond = DAG.getSExtOrTrunc(NotCond, DL, VT);
+    return NotCond;
+  }
+
+  // Use a target hook because some targets may prefer to transform in the
+  // other direction.
+  if (!shouldConvertSelectOfConstantsToMath(Cond, VT, TLI))
     return SDValue();
+
+  // For any constants that differ by 1, we can transform the select into
+  // an extend and add.
+  const APInt &C1Val = C1->getAPIntValue();
+  const APInt &C2Val = C2->getAPIntValue();
+
+  // select Cond, C1, C1-1 --> add (zext Cond), C1-1
+  if (C1Val - 1 == C2Val) {
+    Cond = DAG.getZExtOrTrunc(Cond, DL, VT);
+    return DAG.getNode(ISD::ADD, DL, VT, Cond, N2);
   }
 
-  // fold (select Cond, 0, 1) -> (xor Cond, 1)
-  // We can't do this reliably if integer based booleans have different contents
-  // to floating point based booleans. This is because we can't tell whether we
-  // have an integer-based boolean or a floating-point-based boolean unless we
-  // can find the SETCC that produced it and inspect its operands. This is
-  // fairly easy if C is the SETCC node, but it can potentially be
-  // undiscoverable (or not reasonably discoverable). For example, it could be
-  // in another basic block or it could require searching a complicated
-  // expression.
-  if (CondVT.isInteger() &&
-      TLI.getBooleanContents(/*isVec*/false, /*isFloat*/true) ==
-          TargetLowering::ZeroOrOneBooleanContent &&
-      TLI.getBooleanContents(/*isVec*/false, /*isFloat*/false) ==
-          TargetLowering::ZeroOrOneBooleanContent &&
-      C1->isNullValue() && C2->isOne()) {
-    SDValue NotCond =
-        DAG.getNode(ISD::XOR, DL, CondVT, Cond, DAG.getConstant(1, DL, CondVT));
-    if (VT.bitsEq(CondVT))
-      return NotCond;
-    return DAG.getZExtOrTrunc(NotCond, DL, VT);
+  // select Cond, C1, C1+1 --> add (sext Cond), C1+1
+  if (C1Val + 1 == C2Val) {
+    Cond = DAG.getSExtOrTrunc(Cond, DL, VT);
+    return DAG.getNode(ISD::ADD, DL, VT, Cond, N2);
+  }
+
+  // select Cond, Pow2, 0 --> (zext Cond) << log2(Pow2)
+  if (C1Val.isPowerOf2() && C2Val.isZero()) {
+    Cond = DAG.getZExtOrTrunc(Cond, DL, VT);
+    SDValue ShAmtC =
+        DAG.getShiftAmountConstant(C1Val.exactLogBase2(), VT, DL);
+    return DAG.getNode(ISD::SHL, DL, VT, Cond, ShAmtC);
+  }
+
+  // select Cond, -1, C --> or (sext Cond), C
+  if (C1->isAllOnes()) {
+    Cond = DAG.getSExtOrTrunc(Cond, DL, VT);
+    return DAG.getNode(ISD::OR, DL, VT, Cond, N2);
+  }
+
+  // select Cond, C, -1 --> or (sext (not Cond)), C
+  if (C2->isAllOnes()) {
+    SDValue NotCond = DAG.getNOT(DL, Cond, MVT::i1);
+    NotCond = DAG.getSExtOrTrunc(NotCond, DL, VT);
+    return DAG.getNode(ISD::OR, DL, VT, NotCond, N1);
   }
 
+  if (SDValue V = foldSelectOfConstantsUsingSra(N, DAG))
+    return V;
+
   return SDValue();
 }
 
@@ -9478,6 +10665,64 @@ static SDValue foldBoolSelectToLogic(SDNode *N, SelectionDAG &DAG) {
   return SDValue();
 }
 
+static SDValue foldVSelectToSignBitSplatMask(SDNode *N, SelectionDAG &DAG) {
+  SDValue N0 = N->getOperand(0);
+  SDValue N1 = N->getOperand(1);
+  SDValue N2 = N->getOperand(2);
+  EVT VT = N->getValueType(0);
+  if (N0.getOpcode() != ISD::SETCC || !N0.hasOneUse())
+    return SDValue();
+
+  SDValue Cond0 = N0.getOperand(0);
+  SDValue Cond1 = N0.getOperand(1);
+  ISD::CondCode CC = cast<CondCodeSDNode>(N0.getOperand(2))->get();
+  if (VT != Cond0.getValueType())
+    return SDValue();
+
+  // Match a signbit check of Cond0 as "Cond0 s<0". Swap select operands if the
+  // compare is inverted from that pattern ("Cond0 s> -1").
+  if (CC == ISD::SETLT && isNullOrNullSplat(Cond1))
+    ; // This is the pattern we are looking for.
+  else if (CC == ISD::SETGT && isAllOnesOrAllOnesSplat(Cond1))
+    std::swap(N1, N2);
+  else
+    return SDValue();
+
+  // (Cond0 s< 0) ? N1 : 0 --> (Cond0 s>> BW-1) & N1
+  if (isNullOrNullSplat(N2)) {
+    SDLoc DL(N);
+    SDValue ShiftAmt = DAG.getConstant(VT.getScalarSizeInBits() - 1, DL, VT);
+    SDValue Sra = DAG.getNode(ISD::SRA, DL, VT, Cond0, ShiftAmt);
+    return DAG.getNode(ISD::AND, DL, VT, Sra, N1);
+  }
+
+  // (Cond0 s< 0) ? -1 : N2 --> (Cond0 s>> BW-1) | N2
+  if (isAllOnesOrAllOnesSplat(N1)) {
+    SDLoc DL(N);
+    SDValue ShiftAmt = DAG.getConstant(VT.getScalarSizeInBits() - 1, DL, VT);
+    SDValue Sra = DAG.getNode(ISD::SRA, DL, VT, Cond0, ShiftAmt);
+    return DAG.getNode(ISD::OR, DL, VT, Sra, N2);
+  }
+
+  // If we have to invert the sign bit mask, only do that transform if the
+  // target has a bitwise 'and not' instruction (the invert is free).
+  // (Cond0 s< -0) ? 0 : N2 --> ~(Cond0 s>> BW-1) & N2
+  const TargetLowering &TLI = DAG.getTargetLoweringInfo();
+  if (isNullOrNullSplat(N1) && TLI.hasAndNot(N1)) {
+    SDLoc DL(N);
+    SDValue ShiftAmt = DAG.getConstant(VT.getScalarSizeInBits() - 1, DL, VT);
+    SDValue Sra = DAG.getNode(ISD::SRA, DL, VT, Cond0, ShiftAmt);
+    SDValue Not = DAG.getNOT(DL, Sra, VT);
+    return DAG.getNode(ISD::AND, DL, VT, Not, N2);
+  }
+
+  // TODO: There's another pattern in this family, but it may require
+  //       implementing hasOrNot() to check for profitability:
+  //       (Cond0 s> -1) ? -1 : N2 --> ~(Cond0 s>> BW-1) | N2
+
+  return SDValue();
+}
+
 SDValue DAGCombiner::visitSELECT(SDNode *N) {
   SDValue N0 = N->getOperand(0);
   SDValue N1 = N->getOperand(1);
@@ -9490,10 +10735,17 @@ SDValue DAGCombiner::visitSELECT(SDNode *N) {
   if (SDValue V = DAG.simplifySelect(N0, N1, N2))
     return V;
 
-  if (SDValue V = foldSelectOfConstants(N))
+  if (SDValue V = foldBoolSelectToLogic(N, DAG))
     return V;
 
-  if (SDValue V = foldBoolSelectToLogic(N, DAG))
+  // select (not Cond), N1, N2 -> select Cond, N2, N1
+  if (SDValue F = extractBooleanFlip(N0, DAG, TLI, false)) {
+    SDValue SelectOp = DAG.getSelect(DL, VT, F, N2, N1);
+    SelectOp->setFlags(Flags);
+    return SelectOp;
+  }
+
+  if (SDValue V = foldSelectOfConstants(N))
     return V;
 
   // If we can fold this based on the true/false value, do so.
@@ -9578,13 +10830,6 @@ SDValue DAGCombiner::visitSELECT(SDNode *N) {
     }
   }
 
-  // select (not Cond), N1, N2 -> select Cond, N2, N1
-  if (SDValue F = extractBooleanFlip(N0, DAG, TLI, false)) {
-    SDValue SelectOp = DAG.getSelect(DL, VT, F, N2, N1);
-    SelectOp->setFlags(Flags);
-    return SelectOp;
-  }
-
   // Fold selects based on a setcc into other things, such as min/max/abs.
   if (N0.getOpcode() == ISD::SETCC) {
     SDValue Cond0 = N0.getOperand(0), Cond1 = N0.getOperand(1);
@@ -9595,8 +10840,8 @@ SDValue DAGCombiner::visitSELECT(SDNode *N) {
     //
     // This is OK if we don't care what happens if either operand is a NaN.
     if (N0.hasOneUse() && isLegalToCombineMinNumMaxNum(DAG, N1, N2, TLI))
-      if (SDValue FMinMax = combineMinNumMaxNum(DL, VT, Cond0, Cond1, N1, N2,
-                                                CC, TLI, DAG))
+      if (SDValue FMinMax =
+              combineMinNumMaxNum(DL, VT, Cond0, Cond1, N1, N2, CC))
         return FMinMax;
 
     // Use 'unsigned add with overflow' to optimize an unsigned saturating add.
@@ -9633,7 +10878,7 @@ SDValue DAGCombiner::visitSELECT(SDNode *N) {
          TLI.isOperationLegalOrCustom(ISD::SELECT_CC, VT))) {
       // Any flags available in a select/setcc fold will be on the setcc as they
       // migrated from fcmp
-      Flags = N0.getNode()->getFlags();
+      Flags = N0->getFlags();
       SDValue SelectNode = DAG.getNode(ISD::SELECT_CC, DL, VT, Cond0, Cond1, N1,
                                        N2, N0.getOperand(2));
       SelectNode->setFlags(Flags);
@@ -9702,43 +10947,68 @@ static SDValue ConvertSelectToConcatVector(SDNode *N, SelectionDAG &DAG) {
          "same value. This should have been addressed before this function.");
   return DAG.getNode(
       ISD::CONCAT_VECTORS, DL, VT,
-      BottomHalf->isNullValue() ? RHS->getOperand(0) : LHS->getOperand(0),
-      TopHalf->isNullValue() ? RHS->getOperand(1) : LHS->getOperand(1));
+      BottomHalf->isZero() ? RHS->getOperand(0) : LHS->getOperand(0),
+      TopHalf->isZero() ? RHS->getOperand(1) : LHS->getOperand(1));
 }
 
-bool refineUniformBase(SDValue &BasePtr, SDValue &Index, SelectionDAG &DAG) {
-  if (!isNullConstant(BasePtr) || Index.getOpcode() != ISD::ADD)
+bool refineUniformBase(SDValue &BasePtr, SDValue &Index, bool IndexIsScaled,
+                       SelectionDAG &DAG, const SDLoc &DL) {
+  if (Index.getOpcode() != ISD::ADD)
     return false;
 
-  // For now we check only the LHS of the add.
-  SDValue LHS = Index.getOperand(0);
-  SDValue SplatVal = DAG.getSplatValue(LHS);
-  if (!SplatVal)
+  // Only perform the transformation when existing operands can be reused.
+  if (IndexIsScaled)
     return false;
 
-  BasePtr = SplatVal;
-  Index = Index.getOperand(1);
-  return true;
+  if (!isNullConstant(BasePtr) && !Index.hasOneUse())
+    return false;
+
+  EVT VT = BasePtr.getValueType();
+  if (SDValue SplatVal = DAG.getSplatValue(Index.getOperand(0));
+      SplatVal && SplatVal.getValueType() == VT) {
+    if (isNullConstant(BasePtr))
+      BasePtr = SplatVal;
+    else
+      BasePtr = DAG.getNode(ISD::ADD, DL, VT, BasePtr, SplatVal);
+    Index = Index.getOperand(1);
+    return true;
+  }
+  if (SDValue SplatVal = DAG.getSplatValue(Index.getOperand(1));
+      SplatVal && SplatVal.getValueType() == VT) {
+    if (isNullConstant(BasePtr))
+      BasePtr = SplatVal;
+    else
+      BasePtr = DAG.getNode(ISD::ADD, DL, VT, BasePtr, SplatVal);
+    Index = Index.getOperand(0);
+    return true;
+  }
+  return false;
 }
 
 // Fold sext/zext of index into index type.
-bool refineIndexType(MaskedGatherScatterSDNode *MGS, SDValue &Index,
-                     bool Scaled, SelectionDAG &DAG) {
+bool refineIndexType(SDValue &Index, ISD::MemIndexType &IndexType, EVT DataVT,
+                     SelectionDAG &DAG) {
   const TargetLowering &TLI = DAG.getTargetLoweringInfo();
 
+  // It's always safe to look through zero extends.
   if (Index.getOpcode() == ISD::ZERO_EXTEND) {
     SDValue Op = Index.getOperand(0);
-    MGS->setIndexType(Scaled ? ISD::UNSIGNED_SCALED : ISD::UNSIGNED_UNSCALED);
-    if (TLI.shouldRemoveExtendFromGSIndex(Op.getValueType())) {
+    if (TLI.shouldRemoveExtendFromGSIndex(Op.getValueType(), DataVT)) {
+      IndexType = ISD::UNSIGNED_SCALED;
       Index = Op;
       return true;
     }
+    if (ISD::isIndexTypeSigned(IndexType)) {
+      IndexType = ISD::UNSIGNED_SCALED;
+      return true;
+    }
   }
 
-  if (Index.getOpcode() == ISD::SIGN_EXTEND) {
+  // It's only safe to look through sign extends when Index is signed.
+  if (Index.getOpcode() == ISD::SIGN_EXTEND &&
+      ISD::isIndexTypeSigned(IndexType)) {
     SDValue Op = Index.getOperand(0);
-    MGS->setIndexType(Scaled ? ISD::SIGNED_SCALED : ISD::SIGNED_UNSCALED);
-    if (TLI.shouldRemoveExtendFromGSIndex(Op.getValueType())) {
+    if (TLI.shouldRemoveExtendFromGSIndex(Op.getValueType(), DataVT)) {
       Index = Op;
       return true;
     }
@@ -9747,6 +11017,37 @@ bool refineIndexType(MaskedGatherScatterSDNode *MGS, SDValue &Index,
   return false;
 }
 
+SDValue DAGCombiner::visitVPSCATTER(SDNode *N) {
+  VPScatterSDNode *MSC = cast<VPScatterSDNode>(N);
+  SDValue Mask = MSC->getMask();
+  SDValue Chain = MSC->getChain();
+  SDValue Index = MSC->getIndex();
+  SDValue Scale = MSC->getScale();
+  SDValue StoreVal = MSC->getValue();
+  SDValue BasePtr = MSC->getBasePtr();
+  SDValue VL = MSC->getVectorLength();
+  ISD::MemIndexType IndexType = MSC->getIndexType();
+  SDLoc DL(N);
+
+  // Zap scatters with a zero mask.
+  if (ISD::isConstantSplatVectorAllZeros(Mask.getNode()))
+    return Chain;
+
+  if (refineUniformBase(BasePtr, Index, MSC->isIndexScaled(), DAG, DL)) {
+    SDValue Ops[] = {Chain, StoreVal, BasePtr, Index, Scale, Mask, VL};
+    return DAG.getScatterVP(DAG.getVTList(MVT::Other), MSC->getMemoryVT(),
+                            DL, Ops, MSC->getMemOperand(), IndexType);
+  }
+
+  if (refineIndexType(Index, IndexType, StoreVal.getValueType(), DAG)) {
+    SDValue Ops[] = {Chain, StoreVal, BasePtr, Index, Scale, Mask, VL};
+    return DAG.getScatterVP(DAG.getVTList(MVT::Other), MSC->getMemoryVT(),
+                            DL, Ops, MSC->getMemOperand(), IndexType);
+  }
+
+  return SDValue();
+}
+
 SDValue DAGCombiner::visitMSCATTER(SDNode *N) {
   MaskedScatterSDNode *MSC = cast<MaskedScatterSDNode>(N);
   SDValue Mask = MSC->getMask();
@@ -9755,24 +11056,25 @@ SDValue DAGCombiner::visitMSCATTER(SDNode *N) {
   SDValue Scale = MSC->getScale();
   SDValue StoreVal = MSC->getValue();
   SDValue BasePtr = MSC->getBasePtr();
+  ISD::MemIndexType IndexType = MSC->getIndexType();
   SDLoc DL(N);
 
   // Zap scatters with a zero mask.
   if (ISD::isConstantSplatVectorAllZeros(Mask.getNode()))
     return Chain;
 
-  if (refineUniformBase(BasePtr, Index, DAG)) {
+  if (refineUniformBase(BasePtr, Index, MSC->isIndexScaled(), DAG, DL)) {
     SDValue Ops[] = {Chain, StoreVal, Mask, BasePtr, Index, Scale};
-    return DAG.getMaskedScatter(
-        DAG.getVTList(MVT::Other), MSC->getMemoryVT(), DL, Ops,
-        MSC->getMemOperand(), MSC->getIndexType(), MSC->isTruncatingStore());
+    return DAG.getMaskedScatter(DAG.getVTList(MVT::Other), MSC->getMemoryVT(),
+                                DL, Ops, MSC->getMemOperand(), IndexType,
+                                MSC->isTruncatingStore());
   }
 
-  if (refineIndexType(MSC, Index, MSC->isIndexScaled(), DAG)) {
+  if (refineIndexType(Index, IndexType, StoreVal.getValueType(), DAG)) {
     SDValue Ops[] = {Chain, StoreVal, Mask, BasePtr, Index, Scale};
-    return DAG.getMaskedScatter(
-        DAG.getVTList(MVT::Other), MSC->getMemoryVT(), DL, Ops,
-        MSC->getMemOperand(), MSC->getIndexType(), MSC->isTruncatingStore());
+    return DAG.getMaskedScatter(DAG.getVTList(MVT::Other), MSC->getMemoryVT(),
+                                DL, Ops, MSC->getMemOperand(), IndexType,
+                                MSC->isTruncatingStore());
   }
 
   return SDValue();
@@ -9782,6 +11084,8 @@ SDValue DAGCombiner::visitMSTORE(SDNode *N) {
   MaskedStoreSDNode *MST = cast<MaskedStoreSDNode>(N);
   SDValue Mask = MST->getMask();
   SDValue Chain = MST->getChain();
+  SDValue Value = MST->getValue();
+  SDValue Ptr = MST->getBasePtr();
   SDLoc DL(N);
 
   // Zap masked stores with a zero mask.
@@ -9790,16 +11094,82 @@ SDValue DAGCombiner::visitMSTORE(SDNode *N) {
 
   // If this is a masked load with an all ones mask, we can use a unmasked load.
   // FIXME: Can we do this for indexed, compressing, or truncating stores?
-  if (ISD::isConstantSplatVectorAllOnes(Mask.getNode()) &&
-      MST->isUnindexed() && !MST->isCompressingStore() &&
-      !MST->isTruncatingStore())
+  if (ISD::isConstantSplatVectorAllOnes(Mask.getNode()) && MST->isUnindexed() &&
+      !MST->isCompressingStore() && !MST->isTruncatingStore())
     return DAG.getStore(MST->getChain(), SDLoc(N), MST->getValue(),
-                        MST->getBasePtr(), MST->getMemOperand());
+                        MST->getBasePtr(), MST->getPointerInfo(),
+                        MST->getOriginalAlign(), MachineMemOperand::MOStore,
+                        MST->getAAInfo());
 
   // Try transforming N to an indexed store.
   if (CombineToPreIndexedLoadStore(N) || CombineToPostIndexedLoadStore(N))
     return SDValue(N, 0);
 
+  if (MST->isTruncatingStore() && MST->isUnindexed() &&
+      Value.getValueType().isInteger() &&
+      (!isa<ConstantSDNode>(Value) ||
+       !cast<ConstantSDNode>(Value)->isOpaque())) {
+    APInt TruncDemandedBits =
+        APInt::getLowBitsSet(Value.getScalarValueSizeInBits(),
+                             MST->getMemoryVT().getScalarSizeInBits());
+
+    // See if we can simplify the operation with
+    // SimplifyDemandedBits, which only works if the value has a single use.
+    if (SimplifyDemandedBits(Value, TruncDemandedBits)) {
+      // Re-visit the store if anything changed and the store hasn't been merged
+      // with another node (N is deleted) SimplifyDemandedBits will add Value's
+      // node back to the worklist if necessary, but we also need to re-visit
+      // the Store node itself.
+      if (N->getOpcode() != ISD::DELETED_NODE)
+        AddToWorklist(N);
+      return SDValue(N, 0);
+    }
+  }
+
+  // If this is a TRUNC followed by a masked store, fold this into a masked
+  // truncating store.  We can do this even if this is already a masked
+  // truncstore.
+  // TODO: Try combine to masked compress store if possiable.
+  if ((Value.getOpcode() == ISD::TRUNCATE) && Value->hasOneUse() &&
+      MST->isUnindexed() && !MST->isCompressingStore() &&
+      TLI.canCombineTruncStore(Value.getOperand(0).getValueType(),
+                               MST->getMemoryVT(), LegalOperations)) {
+    auto Mask = TLI.promoteTargetBoolean(DAG, MST->getMask(),
+                                         Value.getOperand(0).getValueType());
+    return DAG.getMaskedStore(Chain, SDLoc(N), Value.getOperand(0), Ptr,
+                              MST->getOffset(), Mask, MST->getMemoryVT(),
+                              MST->getMemOperand(), MST->getAddressingMode(),
+                              /*IsTruncating=*/true);
+  }
+
+  return SDValue();
+}
+
+SDValue DAGCombiner::visitVPGATHER(SDNode *N) {
+  VPGatherSDNode *MGT = cast<VPGatherSDNode>(N);
+  SDValue Mask = MGT->getMask();
+  SDValue Chain = MGT->getChain();
+  SDValue Index = MGT->getIndex();
+  SDValue Scale = MGT->getScale();
+  SDValue BasePtr = MGT->getBasePtr();
+  SDValue VL = MGT->getVectorLength();
+  ISD::MemIndexType IndexType = MGT->getIndexType();
+  SDLoc DL(N);
+
+  if (refineUniformBase(BasePtr, Index, MGT->isIndexScaled(), DAG, DL)) {
+    SDValue Ops[] = {Chain, BasePtr, Index, Scale, Mask, VL};
+    return DAG.getGatherVP(
+        DAG.getVTList(N->getValueType(0), MVT::Other), MGT->getMemoryVT(), DL,
+        Ops, MGT->getMemOperand(), IndexType);
+  }
+
+  if (refineIndexType(Index, IndexType, N->getValueType(0), DAG)) {
+    SDValue Ops[] = {Chain, BasePtr, Index, Scale, Mask, VL};
+    return DAG.getGatherVP(
+        DAG.getVTList(N->getValueType(0), MVT::Other), MGT->getMemoryVT(), DL,
+        Ops, MGT->getMemOperand(), IndexType);
+  }
+
   return SDValue();
 }
 
@@ -9811,26 +11181,25 @@ SDValue DAGCombiner::visitMGATHER(SDNode *N) {
   SDValue Scale = MGT->getScale();
   SDValue PassThru = MGT->getPassThru();
   SDValue BasePtr = MGT->getBasePtr();
+  ISD::MemIndexType IndexType = MGT->getIndexType();
   SDLoc DL(N);
 
   // Zap gathers with a zero mask.
   if (ISD::isConstantSplatVectorAllZeros(Mask.getNode()))
     return CombineTo(N, PassThru, MGT->getChain());
 
-  if (refineUniformBase(BasePtr, Index, DAG)) {
+  if (refineUniformBase(BasePtr, Index, MGT->isIndexScaled(), DAG, DL)) {
     SDValue Ops[] = {Chain, PassThru, Mask, BasePtr, Index, Scale};
-    return DAG.getMaskedGather(DAG.getVTList(N->getValueType(0), MVT::Other),
-                               MGT->getMemoryVT(), DL, Ops,
-                               MGT->getMemOperand(), MGT->getIndexType(),
-                               MGT->getExtensionType());
+    return DAG.getMaskedGather(
+        DAG.getVTList(N->getValueType(0), MVT::Other), MGT->getMemoryVT(), DL,
+        Ops, MGT->getMemOperand(), IndexType, MGT->getExtensionType());
   }
 
-  if (refineIndexType(MGT, Index, MGT->isIndexScaled(), DAG)) {
+  if (refineIndexType(Index, IndexType, N->getValueType(0), DAG)) {
     SDValue Ops[] = {Chain, PassThru, Mask, BasePtr, Index, Scale};
-    return DAG.getMaskedGather(DAG.getVTList(N->getValueType(0), MVT::Other),
-                               MGT->getMemoryVT(), DL, Ops,
-                               MGT->getMemOperand(), MGT->getIndexType(),
-                               MGT->getExtensionType());
+    return DAG.getMaskedGather(
+        DAG.getVTList(N->getValueType(0), MVT::Other), MGT->getMemoryVT(), DL,
+        Ops, MGT->getMemOperand(), IndexType, MGT->getExtensionType());
   }
 
   return SDValue();
@@ -9847,11 +11216,12 @@ SDValue DAGCombiner::visitMLOAD(SDNode *N) {
 
   // If this is a masked load with an all ones mask, we can use a unmasked load.
   // FIXME: Can we do this for indexed, expanding, or extending loads?
-  if (ISD::isConstantSplatVectorAllOnes(Mask.getNode()) &&
-      MLD->isUnindexed() && !MLD->isExpandingLoad() &&
-      MLD->getExtensionType() == ISD::NON_EXTLOAD) {
-    SDValue NewLd = DAG.getLoad(N->getValueType(0), SDLoc(N), MLD->getChain(),
-                                MLD->getBasePtr(), MLD->getMemOperand());
+  if (ISD::isConstantSplatVectorAllOnes(Mask.getNode()) && MLD->isUnindexed() &&
+      !MLD->isExpandingLoad() && MLD->getExtensionType() == ISD::NON_EXTLOAD) {
+    SDValue NewLd = DAG.getLoad(
+        N->getValueType(0), SDLoc(N), MLD->getChain(), MLD->getBasePtr(),
+        MLD->getPointerInfo(), MLD->getOriginalAlign(),
+        MachineMemOperand::MOLoad, MLD->getAAInfo(), MLD->getRanges());
     return CombineTo(N, NewLd, NewLd.getValue(1));
   }
 
@@ -9870,7 +11240,7 @@ SDValue DAGCombiner::foldVSelectOfConstants(SDNode *N) {
   SDValue N2 = N->getOperand(2);
   EVT VT = N->getValueType(0);
   if (!Cond.hasOneUse() || Cond.getScalarValueSizeInBits() != 1 ||
-      !TLI.convertSelectOfConstantsToMath(VT) ||
+      !shouldConvertSelectOfConstantsToMath(Cond, VT, TLI) ||
       !ISD::isBuildVectorOfConstantSDNodes(N1.getNode()) ||
       !ISD::isBuildVectorOfConstantSDNodes(N2.getNode()))
     return SDValue();
@@ -9983,11 +11353,15 @@ SDValue DAGCombiner::visitVSELECT(SDNode *N) {
     // NaN.
     //
     if (N0.hasOneUse() && isLegalToCombineMinNumMaxNum(DAG, LHS, RHS, TLI)) {
-      if (SDValue FMinMax =
-              combineMinNumMaxNum(DL, VT, LHS, RHS, N1, N2, CC, TLI, DAG))
+      if (SDValue FMinMax = combineMinNumMaxNum(DL, VT, LHS, RHS, N1, N2, CC))
         return FMinMax;
     }
 
+    if (SDValue S = PerformMinMaxFpToSatCombine(LHS, RHS, N1, N2, CC, DAG))
+      return S;
+    if (SDValue S = PerformUMinFpToSatCombine(LHS, RHS, N1, N2, CC, DAG))
+      return S;
+
     // If this select has a condition (setcc) with narrower operands than the
     // select, try to widen the compare to match the select width.
     // TODO: This should be extended to handle any constant.
@@ -10078,23 +11452,25 @@ SDValue DAGCombiner::visitVSELECT(SDNode *N) {
         Other = N1;
       }
 
+      // zext(x) >= y ? trunc(zext(x) - y) : 0
+      // --> usubsat(trunc(zext(x)),trunc(umin(y,SatLimit)))
+      // zext(x) >  y ? trunc(zext(x) - y) : 0
+      // --> usubsat(trunc(zext(x)),trunc(umin(y,SatLimit)))
+      if (Other && Other.getOpcode() == ISD::TRUNCATE &&
+          Other.getOperand(0).getOpcode() == ISD::SUB &&
+          (SatCC == ISD::SETUGE || SatCC == ISD::SETUGT)) {
+        SDValue OpLHS = Other.getOperand(0).getOperand(0);
+        SDValue OpRHS = Other.getOperand(0).getOperand(1);
+        if (LHS == OpLHS && RHS == OpRHS && LHS.getOpcode() == ISD::ZERO_EXTEND)
+          if (SDValue R = getTruncatedUSUBSAT(VT, LHS.getValueType(), LHS, RHS,
+                                              DAG, DL))
+            return R;
+      }
+
       if (Other && Other.getNumOperands() == 2) {
         SDValue CondRHS = RHS;
         SDValue OpLHS = Other.getOperand(0), OpRHS = Other.getOperand(1);
 
-        if (Other.getOpcode() == ISD::SUB &&
-            LHS.getOpcode() == ISD::ZERO_EXTEND && LHS.getOperand(0) == OpLHS &&
-            OpRHS.getOpcode() == ISD::TRUNCATE && OpRHS.getOperand(0) == RHS) {
-          // Look for a general sub with unsigned saturation first.
-          // zext(x) >= y ? x - trunc(y) : 0
-          // --> usubsat(x,trunc(umin(y,SatLimit)))
-          // zext(x) >  y ? x - trunc(y) : 0
-          // --> usubsat(x,trunc(umin(y,SatLimit)))
-          if (SatCC == ISD::SETUGE || SatCC == ISD::SETUGT)
-            return getTruncatedUSUBSAT(VT, LHS.getValueType(), LHS, RHS, DAG,
-                                       DL);
-        }
-
         if (OpLHS == LHS) {
           // Look for a general sub with unsigned saturation first.
           // x >= y ? x-y : 0 --> usubsat x, y
@@ -10118,15 +11494,14 @@ SDValue DAGCombiner::visitVSELECT(SDNode *N) {
               if (SatCC == ISD::SETUGT && Other.getOpcode() == ISD::ADD &&
                   ISD::matchBinaryPredicate(OpRHS, CondRHS, MatchUSUBSAT,
                                             /*AllowUndefs*/ true)) {
-                OpRHS = DAG.getNode(ISD::SUB, DL, VT,
-                                    DAG.getConstant(0, DL, VT), OpRHS);
+                OpRHS = DAG.getNegative(OpRHS, DL, VT);
                 return DAG.getNode(ISD::USUBSAT, DL, VT, OpLHS, OpRHS);
               }
 
               // Another special case: If C was a sign bit, the sub has been
               // canonicalized into a xor.
-              // FIXME: Would it be better to use computeKnownBits to determine
-              //        whether it's safe to decanonicalize the xor?
+              // FIXME: Would it be better to use computeKnownBits to
+              // determine whether it's safe to decanonicalize the xor?
               // x s< 0 ? x^C : 0 --> usubsat x, C
               APInt SplatValue;
               if (SatCC == ISD::SETLT && Other.getOpcode() == ISD::XOR &&
@@ -10168,6 +11543,13 @@ SDValue DAGCombiner::visitVSELECT(SDNode *N) {
   if (SDValue V = foldVSelectOfConstants(N))
     return V;
 
+  if (hasOperation(ISD::SRA, VT))
+    if (SDValue V = foldVSelectToSignBitSplatMask(N, DAG))
+      return V;
+
+  if (SimplifyDemandedVectorElts(SDValue(N, 0)))
+    return SDValue(N, 0);
+
   return SDValue();
 }
 
@@ -10183,22 +11565,28 @@ SDValue DAGCombiner::visitSELECT_CC(SDNode *N) {
   if (N2 == N3)
     return N2;
 
+  // select_cc bool, 0, x, y, seteq -> select bool, y, x
+  if (CC == ISD::SETEQ && !LegalTypes && N0.getValueType() == MVT::i1 &&
+      isNullConstant(N1))
+    return DAG.getSelect(SDLoc(N), N2.getValueType(), N0, N3, N2);
+
   // Determine if the condition we're dealing with is constant
   if (SDValue SCC = SimplifySetCC(getSetCCResultType(N0.getValueType()), N0, N1,
                                   CC, SDLoc(N), false)) {
     AddToWorklist(SCC.getNode());
 
-    if (ConstantSDNode *SCCC = dyn_cast<ConstantSDNode>(SCC.getNode())) {
-      if (!SCCC->isNullValue())
-        return N2;    // cond always true -> true val
-      else
-        return N3;    // cond always false -> false val
-    } else if (SCC->isUndef()) {
-      // When the condition is UNDEF, just return the first operand. This is
-      // coherent the DAG creation, no setcc node is created in this case
+    // cond always true -> true val
+    // cond always false -> false val
+    if (auto *SCCC = dyn_cast<ConstantSDNode>(SCC.getNode()))
+      return SCCC->isZero() ? N3 : N2;
+
+    // When the condition is UNDEF, just return the first operand. This is
+    // coherent the DAG creation, no setcc node is created in this case
+    if (SCC->isUndef())
       return N2;
-    } else if (SCC.getOpcode() == ISD::SETCC) {
-      // Fold to a simpler select_cc
+
+    // Fold to a simpler select_cc
+    if (SCC.getOpcode() == ISD::SETCC) {
       SDValue SelectOp = DAG.getNode(
           ISD::SELECT_CC, SDLoc(N), N2.getValueType(), SCC.getOperand(0),
           SCC.getOperand(1), N2, N3, SCC.getOperand(2));
@@ -10247,13 +11635,13 @@ SDValue DAGCombiner::visitSETCC(SDNode *N) {
 
     // Is 'X Cond C' always true or false?
     auto IsAlwaysTrueOrFalse = [](ISD::CondCode Cond, ConstantSDNode *C) {
-      bool False = (Cond == ISD::SETULT && C->isNullValue()) ||
+      bool False = (Cond == ISD::SETULT && C->isZero()) ||
                    (Cond == ISD::SETLT  && C->isMinSignedValue()) ||
-                   (Cond == ISD::SETUGT && C->isAllOnesValue()) ||
+                   (Cond == ISD::SETUGT && C->isAllOnes()) ||
                    (Cond == ISD::SETGT  && C->isMaxSignedValue());
-      bool True =  (Cond == ISD::SETULE && C->isAllOnesValue()) ||
+      bool True =  (Cond == ISD::SETULE && C->isAllOnes()) ||
                    (Cond == ISD::SETLE  && C->isMaxSignedValue()) ||
-                   (Cond == ISD::SETUGE && C->isNullValue()) ||
+                   (Cond == ISD::SETUGE && C->isZero()) ||
                    (Cond == ISD::SETGE  && C->isMinSignedValue());
       return True || False;
     };
@@ -10396,9 +11784,11 @@ static SDValue tryToFoldExtendOfConstant(SDNode *N, const TargetLowering &TLI,
   SDLoc DL(N);
 
   assert((Opcode == ISD::SIGN_EXTEND || Opcode == ISD::ZERO_EXTEND ||
-         Opcode == ISD::ANY_EXTEND || Opcode == ISD::SIGN_EXTEND_VECTOR_INREG ||
-         Opcode == ISD::ZERO_EXTEND_VECTOR_INREG)
-         && "Expected EXTEND dag node in input!");
+          Opcode == ISD::ANY_EXTEND ||
+          Opcode == ISD::SIGN_EXTEND_VECTOR_INREG ||
+          Opcode == ISD::ZERO_EXTEND_VECTOR_INREG ||
+          Opcode == ISD::ANY_EXTEND_VECTOR_INREG) &&
+         "Expected EXTEND dag node in input!");
 
   // fold (sext c1) -> c1
   // fold (zext c1) -> c1
@@ -10446,15 +11836,13 @@ static SDValue tryToFoldExtendOfConstant(SDNode *N, const TargetLowering &TLI,
   SmallVector<SDValue, 8> Elts;
   unsigned NumElts = VT.getVectorNumElements();
 
-  // For zero-extensions, UNDEF elements still guarantee to have the upper
-  // bits set to zero.
-  bool IsZext =
-      Opcode == ISD::ZERO_EXTEND || Opcode == ISD::ZERO_EXTEND_VECTOR_INREG;
-
   for (unsigned i = 0; i != NumElts; ++i) {
     SDValue Op = N0.getOperand(i);
     if (Op.isUndef()) {
-      Elts.push_back(IsZext ? DAG.getConstant(0, DL, SVT) : DAG.getUNDEF(SVT));
+      if (Opcode == ISD::ANY_EXTEND || Opcode == ISD::ANY_EXTEND_VECTOR_INREG)
+        Elts.push_back(DAG.getUNDEF(SVT));
+      else
+        Elts.push_back(DAG.getConstant(0, DL, SVT));
       continue;
     }
 
@@ -10481,9 +11869,8 @@ static bool ExtendUsesToFormExtLoad(EVT VT, SDNode *N, SDValue N0,
                                     const TargetLowering &TLI) {
   bool HasCopyToRegUses = false;
   bool isTruncFree = TLI.isTruncateFree(VT, N0.getValueType());
-  for (SDNode::use_iterator UI = N0.getNode()->use_begin(),
-                            UE = N0.getNode()->use_end();
-       UI != UE; ++UI) {
+  for (SDNode::use_iterator UI = N0->use_begin(), UE = N0->use_end(); UI != UE;
+       ++UI) {
     SDNode *User = *UI;
     if (User == N)
       continue;
@@ -10815,9 +12202,12 @@ static SDValue tryToFoldExtOfLoad(SelectionDAG &DAG, DAGCombiner &Combiner,
                                   bool LegalOperations, SDNode *N, SDValue N0,
                                   ISD::LoadExtType ExtLoadType,
                                   ISD::NodeType ExtOpc) {
+  // TODO: isFixedLengthVector() should be removed and any negative effects on
+  // code generation being the result of that target's implementation of
+  // isVectorLoadExtDesirable().
   if (!ISD::isNON_EXTLoad(N0.getNode()) ||
       !ISD::isUNINDEXEDLoad(N0.getNode()) ||
-      ((LegalOperations || VT.isVector() ||
+      ((LegalOperations || VT.isFixedLengthVector() ||
         !cast<LoadSDNode>(N0)->isSimple()) &&
        !TLI.isLoadExtLegal(ExtLoadType, VT, N0.getValueType())))
     return {};
@@ -10862,7 +12252,7 @@ static SDValue tryToFoldExtOfMaskedLoad(SelectionDAG &DAG,
   if (!Ld || Ld->getExtensionType() != ISD::NON_EXTLOAD)
     return SDValue();
 
-  if (!TLI.isLoadExtLegal(ExtLoadType, VT, Ld->getValueType(0)))
+  if (!TLI.isLoadExtLegalOrCustom(ExtLoadType, VT, Ld->getValueType(0)))
     return SDValue();
 
   if (!TLI.isVectorLoadExtDesirable(SDValue(N, 0)))
@@ -10926,6 +12316,9 @@ SDValue DAGCombiner::foldSextSetcc(SDNode *N) {
   EVT N00VT = N00.getValueType();
   SDLoc DL(N);
 
+  // Propagate fast-math-flags.
+  SelectionDAG::FlagInserter FlagsInserter(DAG, N0->getFlags());
+
   // On some architectures (such as SSE/NEON/etc) the SETCC result type is
   // the same size as the compared operands. Try to optimize sext(setcc())
   // if this is the case.
@@ -11020,7 +12413,7 @@ SDValue DAGCombiner::foldSextSetcc(SDNode *N) {
   if (SDValue SCC = SimplifySelectCC(DL, N00, N01, ExtTrueVal, Zero, CC, true))
     return SCC;
 
-  if (!VT.isVector() && !TLI.convertSelectOfConstantsToMath(VT)) {
+  if (!VT.isVector() && !shouldConvertSelectOfConstantsToMath(N0, VT, TLI)) {
     EVT SetCCVT = getSetCCResultType(N00VT);
     // Don't do this transform for i1 because there's a select transform
     // that would reverse it.
@@ -11041,6 +12434,14 @@ SDValue DAGCombiner::visitSIGN_EXTEND(SDNode *N) {
   EVT VT = N->getValueType(0);
   SDLoc DL(N);
 
+  if (VT.isVector())
+    if (SDValue FoldedVOp = SimplifyVCastOp(N, DL))
+      return FoldedVOp;
+
+  // sext(undef) = 0 because the top bit will all be the same.
+  if (N0.isUndef())
+    return DAG.getConstant(0, DL, VT);
+
   if (SDValue Res = tryToFoldExtendOfConstant(N, TLI, DAG, LegalTypes))
     return Res;
 
@@ -11049,10 +12450,21 @@ SDValue DAGCombiner::visitSIGN_EXTEND(SDNode *N) {
   if (N0.getOpcode() == ISD::SIGN_EXTEND || N0.getOpcode() == ISD::ANY_EXTEND)
     return DAG.getNode(ISD::SIGN_EXTEND, DL, VT, N0.getOperand(0));
 
+  // fold (sext (sext_inreg x)) -> (sext (trunc x))
+  if (N0.getOpcode() == ISD::SIGN_EXTEND_INREG) {
+    SDValue N00 = N0.getOperand(0);
+    EVT ExtVT = cast<VTSDNode>(N0->getOperand(1))->getVT();
+    if (N00.getOpcode() == ISD::TRUNCATE &&
+        (!LegalTypes || TLI.isTypeLegal(ExtVT))) {
+      SDValue T = DAG.getNode(ISD::TRUNCATE, DL, ExtVT, N00.getOperand(0));
+      return DAG.getNode(ISD::SIGN_EXTEND, DL, VT, T);
+    }
+  }
+
   if (N0.getOpcode() == ISD::TRUNCATE) {
     // fold (sext (truncate (load x))) -> (sext (smaller load x))
     // fold (sext (truncate (srl (load x), c))) -> (sext (smaller load (x+c/n)))
-    if (SDValue NarrowLoad = ReduceLoadWidth(N0.getNode())) {
+    if (SDValue NarrowLoad = reduceLoadWidth(N0.getNode())) {
       SDNode *oye = N0.getOperand(0).getNode();
       if (NarrowLoad.getNode() != N0.getNode()) {
         CombineTo(N0.getNode(), NarrowLoad);
@@ -11185,7 +12597,7 @@ SDValue DAGCombiner::visitSIGN_EXTEND(SDNode *N) {
       N0.getOperand(1).getOpcode() == ISD::ZERO_EXTEND &&
       TLI.isOperationLegalOrCustom(ISD::SUB, VT)) {
     SDValue Zext = DAG.getZExtOrTrunc(N0.getOperand(1).getOperand(0), DL, VT);
-    return DAG.getNode(ISD::SUB, DL, VT, DAG.getConstant(0, DL, VT), Zext);
+    return DAG.getNegative(Zext, DL, VT);
   }
   // Eliminate this sign extend by doing a decrement in the destination type:
   // sext i32 ((zext i8 X to i32) + (-1)) to i64 --> (zext i8 X to i64) + (-1)
@@ -11210,10 +12622,10 @@ SDValue DAGCombiner::visitSIGN_EXTEND(SDNode *N) {
         // Return SDValue here as the xor should have already been replaced in
         // this sext.
         return SDValue();
-      } else {
-        // Return a new sext with the new xor.
-        return DAG.getNode(ISD::SIGN_EXTEND, DL, VT, NewXor);
       }
+
+      // Return a new sext with the new xor.
+      return DAG.getNode(ISD::SIGN_EXTEND, DL, VT, NewXor);
     }
 
     SDValue Zext = DAG.getNode(ISD::ZERO_EXTEND, DL, VT, N0.getOperand(0));
@@ -11256,7 +12668,7 @@ static bool isTruncateOf(SelectionDAG &DAG, SDValue N, SDValue &Op,
 
   Known = DAG.computeKnownBits(Op);
 
-  return (Known.Zero | 1).isAllOnesValue();
+  return (Known.Zero | 1).isAllOnes();
 }
 
 /// Given an extending node with a pop-count operand, if the target does not
@@ -11282,10 +12694,45 @@ static SDValue widenCtPop(SDNode *Extend, SelectionDAG &DAG) {
   return DAG.getNode(ISD::CTPOP, DL, VT, NewZext);
 }
 
+// If we have (zext (abs X)) where X is a type that will be promoted by type
+// legalization, convert to (abs (sext X)). But don't extend past a legal type.
+static SDValue widenAbs(SDNode *Extend, SelectionDAG &DAG) {
+  assert(Extend->getOpcode() == ISD::ZERO_EXTEND && "Expected zero extend.");
+
+  EVT VT = Extend->getValueType(0);
+  if (VT.isVector())
+    return SDValue();
+
+  SDValue Abs = Extend->getOperand(0);
+  if (Abs.getOpcode() != ISD::ABS || !Abs.hasOneUse())
+    return SDValue();
+
+  EVT AbsVT = Abs.getValueType();
+  const TargetLowering &TLI = DAG.getTargetLoweringInfo();
+  if (TLI.getTypeAction(*DAG.getContext(), AbsVT) !=
+      TargetLowering::TypePromoteInteger)
+    return SDValue();
+
+  EVT LegalVT = TLI.getTypeToTransformTo(*DAG.getContext(), AbsVT);
+
+  SDValue SExt =
+      DAG.getNode(ISD::SIGN_EXTEND, SDLoc(Abs), LegalVT, Abs.getOperand(0));
+  SDValue NewAbs = DAG.getNode(ISD::ABS, SDLoc(Abs), LegalVT, SExt);
+  return DAG.getZExtOrTrunc(NewAbs, SDLoc(Extend), VT);
+}
+
 SDValue DAGCombiner::visitZERO_EXTEND(SDNode *N) {
   SDValue N0 = N->getOperand(0);
   EVT VT = N->getValueType(0);
 
+  if (VT.isVector())
+    if (SDValue FoldedVOp = SimplifyVCastOp(N, SDLoc(N)))
+      return FoldedVOp;
+
+  // zext(undef) = 0
+  if (N0.isUndef())
+    return DAG.getConstant(0, SDLoc(N), VT);
+
   if (SDValue Res = tryToFoldExtendOfConstant(N, TLI, DAG, LegalTypes))
     return Res;
 
@@ -11316,7 +12763,7 @@ SDValue DAGCombiner::visitZERO_EXTEND(SDNode *N) {
   if (N0.getOpcode() == ISD::TRUNCATE) {
     // fold (zext (truncate (load x))) -> (zext (smaller load x))
     // fold (zext (truncate (srl (load x), c))) -> (zext (smaller load (x+c/n)))
-    if (SDValue NarrowLoad = ReduceLoadWidth(N0.getNode())) {
+    if (SDValue NarrowLoad = reduceLoadWidth(N0.getNode())) {
       SDNode *oye = N0.getOperand(0).getNode();
       if (NarrowLoad.getNode() != N0.getNode()) {
         CombineTo(N0.getNode(), NarrowLoad);
@@ -11459,6 +12906,9 @@ SDValue DAGCombiner::visitZERO_EXTEND(SDNode *N) {
     return V;
 
   if (N0.getOpcode() == ISD::SETCC) {
+    // Propagate fast-math-flags.
+    SelectionDAG::FlagInserter FlagsInserter(DAG, N0->getFlags());
+
     // Only do this before legalize for now.
     if (!LegalOperations && VT.isVector() &&
         N0.getValueType().getVectorElementType() == MVT::i1) {
@@ -11535,6 +12985,9 @@ SDValue DAGCombiner::visitZERO_EXTEND(SDNode *N) {
   if (SDValue NewCtPop = widenCtPop(N, DAG))
     return NewCtPop;
 
+  if (SDValue V = widenAbs(N, DAG))
+    return V;
+
   if (SDValue Res = tryToFoldExtendSelectLoad(N, TLI, DAG))
     return Res;
 
@@ -11545,6 +12998,10 @@ SDValue DAGCombiner::visitANY_EXTEND(SDNode *N) {
   SDValue N0 = N->getOperand(0);
   EVT VT = N->getValueType(0);
 
+  // aext(undef) = undef
+  if (N0.isUndef())
+    return DAG.getUNDEF(VT);
+
   if (SDValue Res = tryToFoldExtendOfConstant(N, TLI, DAG, LegalTypes))
     return Res;
 
@@ -11559,7 +13016,7 @@ SDValue DAGCombiner::visitANY_EXTEND(SDNode *N) {
   // fold (aext (truncate (load x))) -> (aext (smaller load x))
   // fold (aext (truncate (srl (load x), c))) -> (aext (small load (x+c/n)))
   if (N0.getOpcode() == ISD::TRUNCATE) {
-    if (SDValue NarrowLoad = ReduceLoadWidth(N0.getNode())) {
+    if (SDValue NarrowLoad = reduceLoadWidth(N0.getNode())) {
       SDNode *oye = N0.getOperand(0).getNode();
       if (NarrowLoad.getNode() != N0.getNode()) {
         CombineTo(N0.getNode(), NarrowLoad);
@@ -11582,11 +13039,10 @@ SDValue DAGCombiner::visitANY_EXTEND(SDNode *N) {
       !TLI.isTruncateFree(N0.getOperand(0).getOperand(0).getValueType(),
                           N0.getValueType())) {
     SDLoc DL(N);
-    SDValue X = N0.getOperand(0).getOperand(0);
-    X = DAG.getAnyExtOrTrunc(X, DL, VT);
-    APInt Mask = N0.getConstantOperandAPInt(1).zext(VT.getSizeInBits());
-    return DAG.getNode(ISD::AND, DL, VT,
-                       X, DAG.getConstant(Mask, DL, VT));
+    SDValue X = DAG.getAnyExtOrTrunc(N0.getOperand(0).getOperand(0), DL, VT);
+    SDValue Y = DAG.getNode(ISD::ANY_EXTEND, DL, VT, N0.getOperand(1));
+    assert(isa<ConstantSDNode>(Y) && "Expected constant to be folded!");
+    return DAG.getNode(ISD::AND, DL, VT, X, Y);
   }
 
   // fold (aext (load x)) -> (aext (truncate (extload x)))
@@ -11647,6 +13103,9 @@ SDValue DAGCombiner::visitANY_EXTEND(SDNode *N) {
   }
 
   if (N0.getOpcode() == ISD::SETCC) {
+    // Propagate fast-math-flags.
+    SelectionDAG::FlagInserter FlagsInserter(DAG, N0->getFlags());
+
     // For vectors:
     // aext(setcc) -> vsetcc
     // aext(setcc) -> truncate(vsetcc)
@@ -11714,13 +13173,9 @@ SDValue DAGCombiner::visitAssertExt(SDNode *N) {
     // This eliminates the later assert:
     // assert (trunc (assert X, i8) to iN), i1 --> trunc (assert X, i1) to iN
     // assert (trunc (assert X, i1) to iN), i8 --> trunc (assert X, i1) to iN
+    SDLoc DL(N);
     SDValue BigA = N0.getOperand(0);
     EVT BigA_AssertVT = cast<VTSDNode>(BigA.getOperand(1))->getVT();
-    assert(BigA_AssertVT.bitsLE(N0.getValueType()) &&
-           "Asserting zero/sign-extended bits to a type larger than the "
-           "truncated destination does not provide information");
-
-    SDLoc DL(N);
     EVT MinAssertVT = AssertVT.bitsLT(BigA_AssertVT) ? AssertVT : BigA_AssertVT;
     SDValue MinAssertVTVal = DAG.getValueType(MinAssertVT);
     SDValue NewAssert = DAG.getNode(Opcode, DL, BigA.getValueType(),
@@ -11736,10 +13191,6 @@ SDValue DAGCombiner::visitAssertExt(SDNode *N) {
       Opcode == ISD::AssertZext) {
     SDValue BigA = N0.getOperand(0);
     EVT BigA_AssertVT = cast<VTSDNode>(BigA.getOperand(1))->getVT();
-    assert(BigA_AssertVT.bitsLE(N0.getValueType()) &&
-           "Asserting zero/sign-extended bits to a type larger than the "
-           "truncated destination does not provide information");
-
     if (AssertVT.bitsLT(BigA_AssertVT)) {
       SDLoc DL(N);
       SDValue NewAssert = DAG.getNode(Opcode, DL, BigA.getValueType(),
@@ -11790,13 +13241,10 @@ SDValue DAGCombiner::visitAssertAlign(SDNode *N) {
   return SDValue();
 }
 
-/// If the result of a wider load is shifted to right of N  bits and then
-/// truncated to a narrower type and where N is a multiple of number of bits of
-/// the narrower type, transform it to a narrower load from address + N / num of
-/// bits of new type. Also narrow the load if the result is masked with an AND
-/// to effectively produce a smaller type. If the result is to be extended, also
-/// fold the extension to form a extending load.
-SDValue DAGCombiner::ReduceLoadWidth(SDNode *N) {
+/// If the result of a load is shifted/masked/truncated to an effectively
+/// narrower type, try to transform the load to a narrower type and/or
+/// use an extending load.
+SDValue DAGCombiner::reduceLoadWidth(SDNode *N) {
   unsigned Opc = N->getOpcode();
 
   ISD::LoadExtType ExtType = ISD::NON_EXTLOAD;
@@ -11808,32 +13256,48 @@ SDValue DAGCombiner::ReduceLoadWidth(SDNode *N) {
   if (VT.isVector())
     return SDValue();
 
+  // The ShAmt variable is used to indicate that we've consumed a right
+  // shift. I.e. we want to narrow the width of the load by skipping to load the
+  // ShAmt least significant bits.
   unsigned ShAmt = 0;
+  // A special case is when the least significant bits from the load are masked
+  // away, but using an AND rather than a right shift. HasShiftedOffset is used
+  // to indicate that the narrowed load should be left-shifted ShAmt bits to get
+  // the result.
   bool HasShiftedOffset = false;
   // Special case: SIGN_EXTEND_INREG is basically truncating to ExtVT then
   // extended to VT.
   if (Opc == ISD::SIGN_EXTEND_INREG) {
     ExtType = ISD::SEXTLOAD;
     ExtVT = cast<VTSDNode>(N->getOperand(1))->getVT();
-  } else if (Opc == ISD::SRL) {
-    // Another special-case: SRL is basically zero-extending a narrower value,
-    // or it maybe shifting a higher subword, half or byte into the lowest
-    // bits.
-    ExtType = ISD::ZEXTLOAD;
-    N0 = SDValue(N, 0);
+  } else if (Opc == ISD::SRL || Opc == ISD::SRA) {
+    // Another special-case: SRL/SRA is basically zero/sign-extending a narrower
+    // value, or it may be shifting a higher subword, half or byte into the
+    // lowest bits.
 
-    auto *LN0 = dyn_cast<LoadSDNode>(N0.getOperand(0));
-    auto *N01 = dyn_cast<ConstantSDNode>(N0.getOperand(1));
-    if (!N01 || !LN0)
+    // Only handle shift with constant shift amount, and the shiftee must be a
+    // load.
+    auto *LN = dyn_cast<LoadSDNode>(N0);
+    auto *N1C = dyn_cast<ConstantSDNode>(N->getOperand(1));
+    if (!N1C || !LN)
+      return SDValue();
+    // If the shift amount is larger than the memory type then we're not
+    // accessing any of the loaded bytes.
+    ShAmt = N1C->getZExtValue();
+    uint64_t MemoryWidth = LN->getMemoryVT().getScalarSizeInBits();
+    if (MemoryWidth <= ShAmt)
+      return SDValue();
+    // Attempt to fold away the SRL by using ZEXTLOAD and SRA by using SEXTLOAD.
+    ExtType = Opc == ISD::SRL ? ISD::ZEXTLOAD : ISD::SEXTLOAD;
+    ExtVT = EVT::getIntegerVT(*DAG.getContext(), MemoryWidth - ShAmt);
+    // If original load is a SEXTLOAD then we can't simply replace it by a
+    // ZEXTLOAD (we could potentially replace it by a more narrow SEXTLOAD
+    // followed by a ZEXT, but that is not handled at the moment). Similarly if
+    // the original load is a ZEXTLOAD and we want to use a SEXTLOAD.
+    if ((LN->getExtensionType() == ISD::SEXTLOAD ||
+         LN->getExtensionType() == ISD::ZEXTLOAD) &&
+        LN->getExtensionType() != ExtType)
       return SDValue();
-
-    uint64_t ShiftAmt = N01->getZExtValue();
-    uint64_t MemoryWidth = LN0->getMemoryVT().getScalarSizeInBits();
-    if (LN0->getExtensionType() != ISD::SEXTLOAD && MemoryWidth > ShiftAmt)
-      ExtVT = EVT::getIntegerVT(*DAG.getContext(), MemoryWidth - ShiftAmt);
-    else
-      ExtVT = EVT::getIntegerVT(*DAG.getContext(),
-                                VT.getScalarSizeInBits() - ShiftAmt);
   } else if (Opc == ISD::AND) {
     // An AND with a constant mask is the same as a truncate + zero-extend.
     auto AndC = dyn_cast<ConstantSDNode>(N->getOperand(1));
@@ -11844,67 +13308,90 @@ SDValue DAGCombiner::ReduceLoadWidth(SDNode *N) {
     unsigned ActiveBits = 0;
     if (Mask.isMask()) {
       ActiveBits = Mask.countTrailingOnes();
-    } else if (Mask.isShiftedMask()) {
-      ShAmt = Mask.countTrailingZeros();
-      APInt ShiftedMask = Mask.lshr(ShAmt);
-      ActiveBits = ShiftedMask.countTrailingOnes();
+    } else if (Mask.isShiftedMask(ShAmt, ActiveBits)) {
       HasShiftedOffset = true;
-    } else
+    } else {
       return SDValue();
+    }
 
     ExtType = ISD::ZEXTLOAD;
     ExtVT = EVT::getIntegerVT(*DAG.getContext(), ActiveBits);
   }
 
-  if (N0.getOpcode() == ISD::SRL && N0.hasOneUse()) {
-    SDValue SRL = N0;
-    if (auto *ConstShift = dyn_cast<ConstantSDNode>(SRL.getOperand(1))) {
-      ShAmt = ConstShift->getZExtValue();
-      unsigned EVTBits = ExtVT.getScalarSizeInBits();
-      // Is the shift amount a multiple of size of VT?
-      if ((ShAmt & (EVTBits-1)) == 0) {
-        N0 = N0.getOperand(0);
-        // Is the load width a multiple of size of VT?
-        if ((N0.getScalarValueSizeInBits() & (EVTBits - 1)) != 0)
-          return SDValue();
-      }
+  // In case Opc==SRL we've already prepared ExtVT/ExtType/ShAmt based on doing
+  // a right shift. Here we redo some of those checks, to possibly adjust the
+  // ExtVT even further based on "a masking AND". We could also end up here for
+  // other reasons (e.g. based on Opc==TRUNCATE) and that is why some checks
+  // need to be done here as well.
+  if (Opc == ISD::SRL || N0.getOpcode() == ISD::SRL) {
+    SDValue SRL = Opc == ISD::SRL ? SDValue(N, 0) : N0;
+    // Bail out when the SRL has more than one use. This is done for historical
+    // (undocumented) reasons. Maybe intent was to guard the AND-masking below
+    // check below? And maybe it could be non-profitable to do the transform in
+    // case the SRL has multiple uses and we get here with Opc!=ISD::SRL?
+    // FIXME: Can't we just skip this check for the Opc==ISD::SRL case.
+    if (!SRL.hasOneUse())
+      return SDValue();
 
-      // At this point, we must have a load or else we can't do the transform.
-      auto *LN0 = dyn_cast<LoadSDNode>(N0);
-      if (!LN0) return SDValue();
+    // Only handle shift with constant shift amount, and the shiftee must be a
+    // load.
+    auto *LN = dyn_cast<LoadSDNode>(SRL.getOperand(0));
+    auto *SRL1C = dyn_cast<ConstantSDNode>(SRL.getOperand(1));
+    if (!SRL1C || !LN)
+      return SDValue();
 
-      // Because a SRL must be assumed to *need* to zero-extend the high bits
-      // (as opposed to anyext the high bits), we can't combine the zextload
-      // lowering of SRL and an sextload.
-      if (LN0->getExtensionType() == ISD::SEXTLOAD)
-        return SDValue();
+    // If the shift amount is larger than the input type then we're not
+    // accessing any of the loaded bytes.  If the load was a zextload/extload
+    // then the result of the shift+trunc is zero/undef (handled elsewhere).
+    ShAmt = SRL1C->getZExtValue();
+    uint64_t MemoryWidth = LN->getMemoryVT().getSizeInBits();
+    if (ShAmt >= MemoryWidth)
+      return SDValue();
 
-      // If the shift amount is larger than the input type then we're not
-      // accessing any of the loaded bytes.  If the load was a zextload/extload
-      // then the result of the shift+trunc is zero/undef (handled elsewhere).
-      if (ShAmt >= LN0->getMemoryVT().getSizeInBits())
-        return SDValue();
+    // Because a SRL must be assumed to *need* to zero-extend the high bits
+    // (as opposed to anyext the high bits), we can't combine the zextload
+    // lowering of SRL and an sextload.
+    if (LN->getExtensionType() == ISD::SEXTLOAD)
+      return SDValue();
 
-      // If the SRL is only used by a masking AND, we may be able to adjust
-      // the ExtVT to make the AND redundant.
-      SDNode *Mask = *(SRL->use_begin());
-      if (Mask->getOpcode() == ISD::AND &&
-          isa<ConstantSDNode>(Mask->getOperand(1))) {
-        const APInt& ShiftMask = Mask->getConstantOperandAPInt(1);
-        if (ShiftMask.isMask()) {
-          EVT MaskedVT = EVT::getIntegerVT(*DAG.getContext(),
-                                           ShiftMask.countTrailingOnes());
-          // If the mask is smaller, recompute the type.
-          if ((ExtVT.getScalarSizeInBits() > MaskedVT.getScalarSizeInBits()) &&
-              TLI.isLoadExtLegal(ExtType, N0.getValueType(), MaskedVT))
-            ExtVT = MaskedVT;
-        }
+    // Avoid reading outside the memory accessed by the original load (could
+    // happened if we only adjust the load base pointer by ShAmt). Instead we
+    // try to narrow the load even further. The typical scenario here is:
+    //   (i64 (truncate (i96 (srl (load x), 64)))) ->
+    //     (i64 (truncate (i96 (zextload (load i32 + offset) from i32))))
+    if (ExtVT.getScalarSizeInBits() > MemoryWidth - ShAmt) {
+      // Don't replace sextload by zextload.
+      if (ExtType == ISD::SEXTLOAD)
+        return SDValue();
+      // Narrow the load.
+      ExtType = ISD::ZEXTLOAD;
+      ExtVT = EVT::getIntegerVT(*DAG.getContext(), MemoryWidth - ShAmt);
+    }
+
+    // If the SRL is only used by a masking AND, we may be able to adjust
+    // the ExtVT to make the AND redundant.
+    SDNode *Mask = *(SRL->use_begin());
+    if (SRL.hasOneUse() && Mask->getOpcode() == ISD::AND &&
+        isa<ConstantSDNode>(Mask->getOperand(1))) {
+      const APInt& ShiftMask = Mask->getConstantOperandAPInt(1);
+      if (ShiftMask.isMask()) {
+        EVT MaskedVT = EVT::getIntegerVT(*DAG.getContext(),
+                                         ShiftMask.countTrailingOnes());
+        // If the mask is smaller, recompute the type.
+        if ((ExtVT.getScalarSizeInBits() > MaskedVT.getScalarSizeInBits()) &&
+            TLI.isLoadExtLegal(ExtType, SRL.getValueType(), MaskedVT))
+          ExtVT = MaskedVT;
       }
     }
+
+    N0 = SRL.getOperand(0);
   }
 
-  // If the load is shifted left (and the result isn't shifted back right),
-  // we can fold the truncate through the shift.
+  // If the load is shifted left (and the result isn't shifted back right), we
+  // can fold a truncate through the shift. The typical scenario is that N
+  // points at a TRUNCATE here so the attempted fold is:
+  //   (truncate (shl (load x), c))) -> (shl (narrow load x), c)
+  // ShLeftAmt will indicate how much a narrowed load should be shifted left.
   unsigned ShLeftAmt = 0;
   if (ShAmt == 0 && N0.getOpcode() == ISD::SHL && N0.hasOneUse() &&
       ExtVT == VT && TLI.isNarrowingProfitable(N0.getValueType(), VT)) {
@@ -11927,17 +13414,17 @@ SDValue DAGCombiner::ReduceLoadWidth(SDNode *N) {
 
   auto AdjustBigEndianShift = [&](unsigned ShAmt) {
     unsigned LVTStoreBits =
-        LN0->getMemoryVT().getStoreSizeInBits().getFixedSize();
-    unsigned EVTStoreBits = ExtVT.getStoreSizeInBits().getFixedSize();
+        LN0->getMemoryVT().getStoreSizeInBits().getFixedValue();
+    unsigned EVTStoreBits = ExtVT.getStoreSizeInBits().getFixedValue();
     return LVTStoreBits - EVTStoreBits - ShAmt;
   };
 
-  // For big endian targets, we need to adjust the offset to the pointer to
-  // load the correct bytes.
-  if (DAG.getDataLayout().isBigEndian())
-    ShAmt = AdjustBigEndianShift(ShAmt);
+  // We need to adjust the pointer to the load by ShAmt bits in order to load
+  // the correct bytes.
+  unsigned PtrAdjustmentInBits =
+      DAG.getDataLayout().isBigEndian() ? AdjustBigEndianShift(ShAmt) : ShAmt;
 
-  uint64_t PtrOff = ShAmt / 8;
+  uint64_t PtrOff = PtrAdjustmentInBits / 8;
   Align NewAlign = commonAlignment(LN0->getAlign(), PtrOff);
   SDLoc DL(LN0);
   // The original load itself didn't wrap, so an offset within it doesn't.
@@ -11980,11 +13467,6 @@ SDValue DAGCombiner::ReduceLoadWidth(SDNode *N) {
   }
 
   if (HasShiftedOffset) {
-    // Recalculate the shift amount after it has been altered to calculate
-    // the offset.
-    if (DAG.getDataLayout().isBigEndian())
-      ShAmt = AdjustBigEndianShift(ShAmt);
-
     // We're using a shifted mask, so the load now has an offset. This means
     // that data has been loaded into the lower bytes than it would have been
     // before, so we need to shl the loaded data into the correct position in the
@@ -12015,7 +13497,7 @@ SDValue DAGCombiner::visitSIGN_EXTEND_INREG(SDNode *N) {
     return DAG.getNode(ISD::SIGN_EXTEND_INREG, SDLoc(N), VT, N0, N1);
 
   // If the input is already sign extended, just drop the extension.
-  if (DAG.ComputeNumSignBits(N0) >= (VTBits - ExtVTBits + 1))
+  if (ExtVTBits >= DAG.ComputeMaxSignificantBits(N0))
     return N0;
 
   // fold (sext_in_reg (sext_in_reg x, VT2), VT1) -> (sext_in_reg x, minVT) pt2
@@ -12032,7 +13514,7 @@ SDValue DAGCombiner::visitSIGN_EXTEND_INREG(SDNode *N) {
     SDValue N00 = N0.getOperand(0);
     unsigned N00Bits = N00.getScalarValueSizeInBits();
     if ((N00Bits <= ExtVTBits ||
-         (N00Bits - DAG.ComputeNumSignBits(N00)) < ExtVTBits) &&
+         DAG.ComputeMaxSignificantBits(N00) <= ExtVTBits) &&
         (!LegalOperations || TLI.isOperationLegal(ISD::SIGN_EXTEND, VT)))
       return DAG.getNode(ISD::SIGN_EXTEND, SDLoc(N), VT, N00);
   }
@@ -12051,8 +13533,7 @@ SDValue DAGCombiner::visitSIGN_EXTEND_INREG(SDNode *N) {
     APInt DemandedSrcElts = APInt::getLowBitsSet(SrcElts, DstElts);
     if ((N00Bits == ExtVTBits ||
          (!IsZext && (N00Bits < ExtVTBits ||
-                      (N00Bits - DAG.ComputeNumSignBits(N00, DemandedSrcElts)) <
-                          ExtVTBits))) &&
+                      DAG.ComputeMaxSignificantBits(N00) <= ExtVTBits))) &&
         (!LegalOperations ||
          TLI.isOperationLegal(ISD::SIGN_EXTEND_VECTOR_INREG, VT)))
       return DAG.getNode(ISD::SIGN_EXTEND_VECTOR_INREG, SDLoc(N), VT, N00);
@@ -12078,7 +13559,7 @@ SDValue DAGCombiner::visitSIGN_EXTEND_INREG(SDNode *N) {
 
   // fold (sext_in_reg (load x)) -> (smaller sextload x)
   // fold (sext_in_reg (srl (load x), c)) -> (smaller sextload (x+c/evtbits))
-  if (SDValue NarrowLoad = ReduceLoadWidth(N))
+  if (SDValue NarrowLoad = reduceLoadWidth(N))
     return NarrowLoad;
 
   // fold (sext_in_reg (srl X, 24), i8) -> (sra X, 24)
@@ -12168,23 +13649,82 @@ SDValue DAGCombiner::visitSIGN_EXTEND_INREG(SDNode *N) {
     }
   }
 
-  // Form (sext_inreg (bswap >> 16)) or (sext_inreg (rotl (bswap) 16))
-  if (ExtVTBits <= 16 && N0.getOpcode() == ISD::OR) {
-    if (SDValue BSwap = MatchBSwapHWordLow(N0.getNode(), N0.getOperand(0),
-                                           N0.getOperand(1), false))
-      return DAG.getNode(ISD::SIGN_EXTEND_INREG, SDLoc(N), VT, BSwap, N1);
-  }
+  // Form (sext_inreg (bswap >> 16)) or (sext_inreg (rotl (bswap) 16))
+  if (ExtVTBits <= 16 && N0.getOpcode() == ISD::OR) {
+    if (SDValue BSwap = MatchBSwapHWordLow(N0.getNode(), N0.getOperand(0),
+                                           N0.getOperand(1), false))
+      return DAG.getNode(ISD::SIGN_EXTEND_INREG, SDLoc(N), VT, BSwap, N1);
+  }
+
+  // Fold (iM_signext_inreg
+  //        (extract_subvector (zext|anyext|sext iN_v to _) _)
+  //        from iN)
+  //      -> (extract_subvector (signext iN_v to iM))
+  if (N0.getOpcode() == ISD::EXTRACT_SUBVECTOR && N0.hasOneUse() &&
+      ISD::isExtOpcode(N0.getOperand(0).getOpcode())) {
+    SDValue InnerExt = N0.getOperand(0);
+    EVT InnerExtVT = InnerExt->getValueType(0);
+    SDValue Extendee = InnerExt->getOperand(0);
+
+    if (ExtVTBits == Extendee.getValueType().getScalarSizeInBits() &&
+        (!LegalOperations ||
+         TLI.isOperationLegal(ISD::SIGN_EXTEND, InnerExtVT))) {
+      SDValue SignExtExtendee =
+          DAG.getNode(ISD::SIGN_EXTEND, SDLoc(N), InnerExtVT, Extendee);
+      return DAG.getNode(ISD::EXTRACT_SUBVECTOR, SDLoc(N), VT, SignExtExtendee,
+                         N0.getOperand(1));
+    }
+  }
+
+  return SDValue();
+}
+
+static SDValue
+foldExtendVectorInregToExtendOfSubvector(SDNode *N, const TargetLowering &TLI,
+                                         SelectionDAG &DAG,
+                                         bool LegalOperations) {
+  unsigned InregOpcode = N->getOpcode();
+  unsigned Opcode = DAG.getOpcode_EXTEND(InregOpcode);
+
+  SDValue Src = N->getOperand(0);
+  EVT VT = N->getValueType(0);
+  EVT SrcVT = EVT::getVectorVT(*DAG.getContext(),
+                               Src.getValueType().getVectorElementType(),
+                               VT.getVectorElementCount());
+
+  assert((InregOpcode == ISD::SIGN_EXTEND_VECTOR_INREG ||
+          InregOpcode == ISD::ZERO_EXTEND_VECTOR_INREG ||
+          InregOpcode == ISD::ANY_EXTEND_VECTOR_INREG) &&
+         "Expected EXTEND_VECTOR_INREG dag node in input!");
+
+  // Profitability check: our operand must be an one-use CONCAT_VECTORS.
+  // FIXME: one-use check may be overly restrictive
+  if (!Src.hasOneUse() || Src.getOpcode() != ISD::CONCAT_VECTORS)
+    return SDValue();
+
+  // Profitability check: we must be extending exactly one of it's operands.
+  // FIXME: this is probably overly restrictive.
+  Src = Src.getOperand(0);
+  if (Src.getValueType() != SrcVT)
+    return SDValue();
+
+  if (LegalOperations && !TLI.isOperationLegal(Opcode, VT))
+    return SDValue();
 
-  return SDValue();
+  return DAG.getNode(Opcode, SDLoc(N), VT, Src);
 }
 
 SDValue DAGCombiner::visitEXTEND_VECTOR_INREG(SDNode *N) {
   SDValue N0 = N->getOperand(0);
   EVT VT = N->getValueType(0);
 
-  // {s/z}ext_vector_inreg(undef) = 0 because the top bits must be the same.
-  if (N0.isUndef())
-    return DAG.getConstant(0, SDLoc(N), VT);
+  if (N0.isUndef()) {
+    // aext_vector_inreg(undef) = undef because the top bits are undefined.
+    // {s/z}ext_vector_inreg(undef) = 0 because the top bits must be the same.
+    return N->getOpcode() == ISD::ANY_EXTEND_VECTOR_INREG
+               ? DAG.getUNDEF(VT)
+               : DAG.getConstant(0, SDLoc(N), VT);
+  }
 
   if (SDValue Res = tryToFoldExtendOfConstant(N, TLI, DAG, LegalTypes))
     return Res;
@@ -12192,6 +13732,10 @@ SDValue DAGCombiner::visitEXTEND_VECTOR_INREG(SDNode *N) {
   if (SimplifyDemandedVectorElts(SDValue(N, 0)))
     return SDValue(N, 0);
 
+  if (SDValue R = foldExtendVectorInregToExtendOfSubvector(N, TLI, DAG,
+                                                           LegalOperations))
+    return R;
+
   return SDValue();
 }
 
@@ -12231,6 +13775,19 @@ SDValue DAGCombiner::visitTRUNCATE(SDNode *N) {
     return N0.getOperand(0);
   }
 
+  // Try to narrow a truncate-of-sext_in_reg to the destination type:
+  // trunc (sign_ext_inreg X, iM) to iN --> sign_ext_inreg (trunc X to iN), iM
+  if (!LegalTypes && N0.getOpcode() == ISD::SIGN_EXTEND_INREG &&
+      N0.hasOneUse()) {
+    SDValue X = N0.getOperand(0);
+    SDValue ExtVal = N0.getOperand(1);
+    EVT ExtVT = cast<VTSDNode>(ExtVal)->getVT();
+    if (ExtVT.bitsLT(VT)) {
+      SDValue TrX = DAG.getNode(ISD::TRUNCATE, SDLoc(N), VT, X);
+      return DAG.getNode(ISD::SIGN_EXTEND_INREG, SDLoc(N), VT, TrX, ExtVal);
+    }
+  }
+
   // If this is anyext(trunc), don't fold it, allow ourselves to be folded.
   if (N->hasOneUse() && (N->use_begin()->getOpcode() == ISD::ANY_EXTEND))
     return SDValue();
@@ -12289,7 +13846,7 @@ SDValue DAGCombiner::visitTRUNCATE(SDNode *N) {
     SDValue Amt = N0.getOperand(1);
     KnownBits Known = DAG.computeKnownBits(Amt);
     unsigned Size = VT.getScalarSizeInBits();
-    if (Known.getBitWidth() - Known.countMinLeadingZeros() <= Log2_32(Size)) {
+    if (Known.countMaxActiveBits() <= Log2_32(Size)) {
       SDLoc SL(N);
       EVT AmtVT = TLI.getShiftAmountTy(VT, DAG.getDataLayout());
 
@@ -12350,22 +13907,10 @@ SDValue DAGCombiner::visitTRUNCATE(SDNode *N) {
     }
   }
 
-  // See if we can simplify the input to this truncate through knowledge that
-  // only the low bits are being used.
-  // For example "trunc (or (shl x, 8), y)" // -> trunc y
-  // Currently we only perform this optimization on scalars because vectors
-  // may have different active low bits.
-  if (!VT.isVector()) {
-    APInt Mask =
-        APInt::getLowBitsSet(N0.getValueSizeInBits(), VT.getSizeInBits());
-    if (SDValue Shorter = DAG.GetDemandedBits(N0, Mask))
-      return DAG.getNode(ISD::TRUNCATE, SDLoc(N), VT, Shorter);
-  }
-
   // fold (truncate (load x)) -> (smaller load x)
   // fold (truncate (srl (load x), c)) -> (smaller load (x+c/evtbits))
   if (!LegalTypes || TLI.isTypeDesirableForOp(N0.getOpcode(), VT)) {
-    if (SDValue Reduced = ReduceLoadWidth(N))
+    if (SDValue Reduced = reduceLoadWidth(N))
       return Reduced;
 
     // Handle the case where the load remains an extending load even
@@ -12448,21 +13993,6 @@ SDValue DAGCombiner::visitTRUNCATE(SDNode *N) {
   if (SimplifyDemandedBits(SDValue(N, 0)))
     return SDValue(N, 0);
 
-  // (trunc adde(X, Y, Carry)) -> (adde trunc(X), trunc(Y), Carry)
-  // (trunc addcarry(X, Y, Carry)) -> (addcarry trunc(X), trunc(Y), Carry)
-  // When the adde's carry is not used.
-  if ((N0.getOpcode() == ISD::ADDE || N0.getOpcode() == ISD::ADDCARRY) &&
-      N0.hasOneUse() && !N0.getNode()->hasAnyUseOfValue(1) &&
-      // We only do for addcarry before legalize operation
-      ((!LegalOperations && N0.getOpcode() == ISD::ADDCARRY) ||
-       TLI.isOperationLegal(N0.getOpcode(), VT))) {
-    SDLoc SL(N);
-    auto X = DAG.getNode(ISD::TRUNCATE, SL, VT, N0.getOperand(0));
-    auto Y = DAG.getNode(ISD::TRUNCATE, SL, VT, N0.getOperand(1));
-    auto VTs = DAG.getVTList(VT, N0->getValueType(1));
-    return DAG.getNode(N0.getOpcode(), SL, VTs, X, Y, N0.getOperand(2));
-  }
-
   // fold (truncate (extract_subvector(ext x))) ->
   //      (extract_subvector x)
   // TODO: This can be generalized to cover cases where the truncate and extract
@@ -12507,6 +14037,22 @@ SDValue DAGCombiner::visitTRUNCATE(SDNode *N) {
       }
     }
     break;
+  case ISD::ADDE:
+  case ISD::ADDCARRY:
+    // (trunc adde(X, Y, Carry)) -> (adde trunc(X), trunc(Y), Carry)
+    // (trunc addcarry(X, Y, Carry)) -> (addcarry trunc(X), trunc(Y), Carry)
+    // When the adde's carry is not used.
+    // We only do for addcarry before legalize operation
+    if (((!LegalOperations && N0.getOpcode() == ISD::ADDCARRY) ||
+         TLI.isOperationLegal(N0.getOpcode(), VT)) &&
+        N0.hasOneUse() && !N0->hasAnyUseOfValue(1)) {
+      SDLoc DL(N);
+      SDValue X = DAG.getNode(ISD::TRUNCATE, DL, VT, N0.getOperand(0));
+      SDValue Y = DAG.getNode(ISD::TRUNCATE, DL, VT, N0.getOperand(1));
+      SDVTList VTs = DAG.getVTList(VT, N0->getValueType(1));
+      return DAG.getNode(N0.getOpcode(), DL, VTs, X, Y, N0.getOperand(2));
+    }
+    break;
   case ISD::USUBSAT:
     // Truncate the USUBSAT only if LHS is a known zero-extension, its not
     // enough to know that the upper bits are zero we must ensure that we don't
@@ -12537,8 +14083,8 @@ static SDNode *getBuildPairElt(SDNode *N, unsigned i) {
 SDValue DAGCombiner::CombineConsecutiveLoads(SDNode *N, EVT VT) {
   assert(N->getOpcode() == ISD::BUILD_PAIR);
 
-  LoadSDNode *LD1 = dyn_cast<LoadSDNode>(getBuildPairElt(N, 0));
-  LoadSDNode *LD2 = dyn_cast<LoadSDNode>(getBuildPairElt(N, 1));
+  auto *LD1 = dyn_cast<LoadSDNode>(getBuildPairElt(N, 0));
+  auto *LD2 = dyn_cast<LoadSDNode>(getBuildPairElt(N, 1));
 
   // A BUILD_PAIR is always having the least significant part in elt 0 and the
   // most significant part in elt 1. So when combining into one large load, we
@@ -12546,22 +14092,20 @@ SDValue DAGCombiner::CombineConsecutiveLoads(SDNode *N, EVT VT) {
   if (DAG.getDataLayout().isBigEndian())
     std::swap(LD1, LD2);
 
-  if (!LD1 || !LD2 || !ISD::isNON_EXTLoad(LD1) || !LD1->hasOneUse() ||
+  if (!LD1 || !LD2 || !ISD::isNON_EXTLoad(LD1) || !ISD::isNON_EXTLoad(LD2) ||
+      !LD1->hasOneUse() || !LD2->hasOneUse() ||
       LD1->getAddressSpace() != LD2->getAddressSpace())
     return SDValue();
+
+  unsigned LD1Fast = 0;
   EVT LD1VT = LD1->getValueType(0);
   unsigned LD1Bytes = LD1VT.getStoreSize();
-  if (ISD::isNON_EXTLoad(LD2) && LD2->hasOneUse() &&
-      DAG.areNonVolatileConsecutiveLoads(LD2, LD1, LD1Bytes, 1)) {
-    Align Alignment = LD1->getAlign();
-    Align NewAlign = DAG.getDataLayout().getABITypeAlign(
-        VT.getTypeForEVT(*DAG.getContext()));
-
-    if (NewAlign <= Alignment &&
-        (!LegalOperations || TLI.isOperationLegal(ISD::LOAD, VT)))
-      return DAG.getLoad(VT, SDLoc(N), LD1->getChain(), LD1->getBasePtr(),
-                         LD1->getPointerInfo(), Alignment);
-  }
+  if ((!LegalOperations || TLI.isOperationLegal(ISD::LOAD, VT)) &&
+      DAG.areNonVolatileConsecutiveLoads(LD2, LD1, LD1Bytes, 1) &&
+      TLI.allowsMemoryAccess(*DAG.getContext(), DAG.getDataLayout(), VT,
+                             *LD1->getMemOperand(), &LD1Fast) && LD1Fast)
+    return DAG.getLoad(VT, SDLoc(N), LD1->getChain(), LD1->getBasePtr(),
+                       LD1->getPointerInfo(), LD1->getAlign());
 
   return SDValue();
 }
@@ -12642,7 +14186,7 @@ SDValue DAGCombiner::visitBITCAST(SDNode *N) {
       (!LegalTypes ||
        (!LegalOperations && VT.isInteger() && N0.getValueType().isInteger() &&
         TLI.isTypeLegal(VT.getVectorElementType()))) &&
-      N0.getOpcode() == ISD::BUILD_VECTOR && N0.getNode()->hasOneUse() &&
+      N0.getOpcode() == ISD::BUILD_VECTOR && N0->hasOneUse() &&
       cast<BuildVectorSDNode>(N0)->isConstant())
     return ConstantFoldBITCASTofBUILD_VECTOR(N0.getNode(),
                                              VT.getVectorElementType());
@@ -12710,8 +14254,8 @@ SDValue DAGCombiner::visitBITCAST(SDNode *N) {
   // This often reduces constant pool loads.
   if (((N0.getOpcode() == ISD::FNEG && !TLI.isFNegFree(N0.getValueType())) ||
        (N0.getOpcode() == ISD::FABS && !TLI.isFAbsFree(N0.getValueType()))) &&
-      N0.getNode()->hasOneUse() && VT.isInteger() &&
-      !VT.isVector() && !N0.getValueType().isVector()) {
+      N0->hasOneUse() && VT.isInteger() && !VT.isVector() &&
+      !N0.getValueType().isVector()) {
     SDValue NewConv = DAG.getBitcast(VT, N0.getOperand(0));
     AddToWorklist(NewConv.getNode());
 
@@ -12759,9 +14303,9 @@ SDValue DAGCombiner::visitBITCAST(SDNode *N) {
   //                     (xor (bitcast cst), (bitcast x)), 0),
   //                    signbit)
   //     (xor (bitcast cst) (build_pair flipbit, flipbit))
-  if (N0.getOpcode() == ISD::FCOPYSIGN && N0.getNode()->hasOneUse() &&
-      isa<ConstantFPSDNode>(N0.getOperand(0)) &&
-      VT.isInteger() && !VT.isVector()) {
+  if (N0.getOpcode() == ISD::FCOPYSIGN && N0->hasOneUse() &&
+      isa<ConstantFPSDNode>(N0.getOperand(0)) && VT.isInteger() &&
+      !VT.isVector()) {
     unsigned OrigXWidth = N0.getOperand(1).getValueSizeInBits();
     EVT IntXVT = EVT::getIntegerVT(*DAG.getContext(), OrigXWidth);
     if (isTypeLegal(IntXVT)) {
@@ -12843,8 +14387,7 @@ SDValue DAGCombiner::visitBITCAST(SDNode *N) {
       if (Op.getOpcode() == ISD::BITCAST &&
           Op.getOperand(0).getValueType() == VT)
         return SDValue(Op.getOperand(0));
-      if (Op.isUndef() || ISD::isBuildVectorOfConstantSDNodes(Op.getNode()) ||
-          ISD::isBuildVectorOfConstantFPSDNodes(Op.getNode()))
+      if (Op.isUndef() || isAnyConstantBuildVector(Op))
         return DAG.getBitcast(VT, Op);
       return SDValue();
     };
@@ -12884,7 +14427,72 @@ SDValue DAGCombiner::visitFREEZE(SDNode *N) {
   if (DAG.isGuaranteedNotToBeUndefOrPoison(N0, /*PoisonOnly*/ false))
     return N0;
 
-  return SDValue();
+  // Fold freeze(op(x, ...)) -> op(freeze(x), ...).
+  // Try to push freeze through instructions that propagate but don't produce
+  // poison as far as possible. If an operand of freeze follows three
+  // conditions 1) one-use, 2) does not produce poison, and 3) has all but one
+  // guaranteed-non-poison operands (or is a BUILD_VECTOR or similar) then push
+  // the freeze through to the operands that are not guaranteed non-poison.
+  // NOTE: we will strip poison-generating flags, so ignore them here.
+  if (DAG.canCreateUndefOrPoison(N0, /*PoisonOnly*/ false,
+                                 /*ConsiderFlags*/ false) ||
+      N0->getNumValues() != 1 || !N0->hasOneUse())
+    return SDValue();
+
+  bool AllowMultipleMaybePoisonOperands = N0.getOpcode() == ISD::BUILD_VECTOR;
+
+  SmallSetVector<SDValue, 8> MaybePoisonOperands;
+  for (SDValue Op : N0->ops()) {
+    if (DAG.isGuaranteedNotToBeUndefOrPoison(Op, /*PoisonOnly*/ false,
+                                             /*Depth*/ 1))
+      continue;
+    bool HadMaybePoisonOperands = !MaybePoisonOperands.empty();
+    bool IsNewMaybePoisonOperand = MaybePoisonOperands.insert(Op);
+    if (!HadMaybePoisonOperands)
+      continue;
+    if (IsNewMaybePoisonOperand && !AllowMultipleMaybePoisonOperands) {
+      // Multiple maybe-poison ops when not allowed - bail out.
+      return SDValue();
+    }
+  }
+  // NOTE: the whole op may be not guaranteed to not be undef or poison because
+  // it could create undef or poison due to it's poison-generating flags.
+  // So not finding any maybe-poison operands is fine.
+
+  for (SDValue MaybePoisonOperand : MaybePoisonOperands) {
+    // Don't replace every single UNDEF everywhere with frozen UNDEF, though.
+    if (MaybePoisonOperand.getOpcode() == ISD::UNDEF)
+      continue;
+    // First, freeze each offending operand.
+    SDValue FrozenMaybePoisonOperand = DAG.getFreeze(MaybePoisonOperand);
+    // Then, change all other uses of unfrozen operand to use frozen operand.
+    DAG.ReplaceAllUsesOfValueWith(MaybePoisonOperand, FrozenMaybePoisonOperand);
+    if (FrozenMaybePoisonOperand.getOpcode() == ISD::FREEZE &&
+        FrozenMaybePoisonOperand.getOperand(0) == FrozenMaybePoisonOperand) {
+      // But, that also updated the use in the freeze we just created, thus
+      // creating a cycle in a DAG. Let's undo that by mutating the freeze.
+      DAG.UpdateNodeOperands(FrozenMaybePoisonOperand.getNode(),
+                             MaybePoisonOperand);
+    }
+  }
+
+  // The whole node may have been updated, so the value we were holding
+  // may no longer be valid. Re-fetch the operand we're `freeze`ing.
+  N0 = N->getOperand(0);
+
+  // Finally, recreate the node, it's operands were updated to use
+  // frozen operands, so we just need to use it's "original" operands.
+  SmallVector<SDValue> Ops(N0->op_begin(), N0->op_end());
+  // Special-handle ISD::UNDEF, each single one of them can be it's own thing.
+  for (SDValue &Op : Ops) {
+    if (Op.getOpcode() == ISD::UNDEF)
+      Op = DAG.getFreeze(Op);
+  }
+  // NOTE: this strips poison generating flags.
+  SDValue R = DAG.getNode(N0.getOpcode(), SDLoc(N0), N0->getVTList(), Ops);
+  assert(DAG.isGuaranteedNotToBeUndefOrPoison(R, /*PoisonOnly*/ false) &&
+         "Can't create node that may be undef/poison!");
+  return R;
 }
 
 /// We know that BV is a build_vector node with Constant, ConstantFP or Undef
@@ -12937,69 +14545,45 @@ ConstantFoldBITCASTofBUILD_VECTOR(SDNode *BV, EVT DstEltVT) {
     return ConstantFoldBITCASTofBUILD_VECTOR(Tmp, DstEltVT);
   }
 
-  SDLoc DL(BV);
-
   // Okay, we know the src/dst types are both integers of differing types.
-  // Handling growing first.
   assert(SrcEltVT.isInteger() && DstEltVT.isInteger());
-  if (SrcBitSize < DstBitSize) {
-    unsigned NumInputsPerOutput = DstBitSize/SrcBitSize;
-
-    SmallVector<SDValue, 8> Ops;
-    for (unsigned i = 0, e = BV->getNumOperands(); i != e;
-         i += NumInputsPerOutput) {
-      bool isLE = DAG.getDataLayout().isLittleEndian();
-      APInt NewBits = APInt(DstBitSize, 0);
-      bool EltIsUndef = true;
-      for (unsigned j = 0; j != NumInputsPerOutput; ++j) {
-        // Shift the previously computed bits over.
-        NewBits <<= SrcBitSize;
-        SDValue Op = BV->getOperand(i+ (isLE ? (NumInputsPerOutput-j-1) : j));
-        if (Op.isUndef()) continue;
-        EltIsUndef = false;
-
-        NewBits |= cast<ConstantSDNode>(Op)->getAPIntValue().
-                   zextOrTrunc(SrcBitSize).zext(DstBitSize);
-      }
 
-      if (EltIsUndef)
-        Ops.push_back(DAG.getUNDEF(DstEltVT));
-      else
-        Ops.push_back(DAG.getConstant(NewBits, DL, DstEltVT));
-    }
+  // TODO: Should ConstantFoldBITCASTofBUILD_VECTOR always take a
+  // BuildVectorSDNode?
+  auto *BVN = cast<BuildVectorSDNode>(BV);
 
-    EVT VT = EVT::getVectorVT(*DAG.getContext(), DstEltVT, Ops.size());
-    return DAG.getBuildVector(VT, DL, Ops);
-  }
+  // Extract the constant raw bit data.
+  BitVector UndefElements;
+  SmallVector<APInt> RawBits;
+  bool IsLE = DAG.getDataLayout().isLittleEndian();
+  if (!BVN->getConstantRawBits(IsLE, DstBitSize, RawBits, UndefElements))
+    return SDValue();
 
-  // Finally, this must be the case where we are shrinking elements: each input
-  // turns into multiple outputs.
-  unsigned NumOutputsPerInput = SrcBitSize/DstBitSize;
-  EVT VT = EVT::getVectorVT(*DAG.getContext(), DstEltVT,
-                            NumOutputsPerInput*BV->getNumOperands());
+  SDLoc DL(BV);
   SmallVector<SDValue, 8> Ops;
+  for (unsigned I = 0, E = RawBits.size(); I != E; ++I) {
+    if (UndefElements[I])
+      Ops.push_back(DAG.getUNDEF(DstEltVT));
+    else
+      Ops.push_back(DAG.getConstant(RawBits[I], DL, DstEltVT));
+  }
 
-  for (const SDValue &Op : BV->op_values()) {
-    if (Op.isUndef()) {
-      Ops.append(NumOutputsPerInput, DAG.getUNDEF(DstEltVT));
-      continue;
-    }
-
-    APInt OpVal = cast<ConstantSDNode>(Op)->
-                  getAPIntValue().zextOrTrunc(SrcBitSize);
+  EVT VT = EVT::getVectorVT(*DAG.getContext(), DstEltVT, Ops.size());
+  return DAG.getBuildVector(VT, DL, Ops);
+}
 
-    for (unsigned j = 0; j != NumOutputsPerInput; ++j) {
-      APInt ThisVal = OpVal.trunc(DstBitSize);
-      Ops.push_back(DAG.getConstant(ThisVal, DL, DstEltVT));
-      OpVal.lshrInPlace(DstBitSize);
-    }
+// Returns true if floating point contraction is allowed on the FMUL-SDValue
+// `N`
+static bool isContractableFMUL(const TargetOptions &Options, SDValue N) {
+  assert(N.getOpcode() == ISD::FMUL);
 
-    // For big endian targets, swap the order of the pieces of each element.
-    if (DAG.getDataLayout().isBigEndian())
-      std::reverse(Ops.end()-NumOutputsPerInput, Ops.end());
-  }
+  return Options.AllowFPOpFusion == FPOpFusion::Fast || Options.UnsafeFPMath ||
+         N->getFlags().hasAllowContract();
+}
 
-  return DAG.getBuildVector(VT, DL, Ops);
+// Returns true if `N` can assume no infinities involved in its computation.
+static bool hasNoInfs(const TargetOptions &Options, SDValue N) {
+  return Options.NoInfsFPMath || N->getFlags().hasNoInfs();
 }
 
 /// Try to perform FMA combining on a given FADD node.
@@ -13038,6 +14622,11 @@ SDValue DAGCombiner::visitFADDForFMACombine(SDNode *N) {
   unsigned PreferredFusedOpcode = HasFMAD ? ISD::FMAD : ISD::FMA;
   bool Aggressive = TLI.enableAggressiveFMAFusion(VT);
 
+  auto isFusedOp = [&](SDValue N) {
+    unsigned Opcode = N.getOpcode();
+    return Opcode == ISD::FMA || Opcode == ISD::FMAD;
+  };
+
   // Is the node an FMUL and contractable either due to global flags or
   // SDNodeFlags.
   auto isContractableFMUL = [AllowFusionGlobally](SDValue N) {
@@ -13048,7 +14637,7 @@ SDValue DAGCombiner::visitFADDForFMACombine(SDNode *N) {
   // If we have two choices trying to fold (fadd (fmul u, v), (fmul x, y)),
   // prefer to fold the multiply with fewer uses.
   if (Aggressive && isContractableFMUL(N0) && isContractableFMUL(N1)) {
-    if (N0.getNode()->use_size() > N1.getNode()->use_size())
+    if (N0->use_size() > N1->use_size())
       std::swap(N0, N1);
   }
 
@@ -13067,26 +14656,37 @@ SDValue DAGCombiner::visitFADDForFMACombine(SDNode *N) {
 
   // fadd (fma A, B, (fmul C, D)), E --> fma A, B, (fma C, D, E)
   // fadd E, (fma A, B, (fmul C, D)) --> fma A, B, (fma C, D, E)
+  // This also works with nested fma instructions:
+  // fadd (fma A, B, (fma (C, D, (fmul (E, F))))), G -->
+  // fma A, B, (fma C, D, fma (E, F, G))
+  // fadd (G, (fma A, B, (fma (C, D, (fmul (E, F)))))) -->
+  // fma A, B, (fma C, D, fma (E, F, G)).
   // This requires reassociation because it changes the order of operations.
-  SDValue FMA, E;
-  if (CanReassociate && N0.getOpcode() == PreferredFusedOpcode &&
-      N0.getOperand(2).getOpcode() == ISD::FMUL && N0.hasOneUse() &&
-      N0.getOperand(2).hasOneUse()) {
-    FMA = N0;
-    E = N1;
-  } else if (CanReassociate && N1.getOpcode() == PreferredFusedOpcode &&
-             N1.getOperand(2).getOpcode() == ISD::FMUL && N1.hasOneUse() &&
-             N1.getOperand(2).hasOneUse()) {
-    FMA = N1;
-    E = N0;
-  }
-  if (FMA && E) {
-    SDValue A = FMA.getOperand(0);
-    SDValue B = FMA.getOperand(1);
-    SDValue C = FMA.getOperand(2).getOperand(0);
-    SDValue D = FMA.getOperand(2).getOperand(1);
-    SDValue CDE = DAG.getNode(PreferredFusedOpcode, SL, VT, C, D, E);
-    return DAG.getNode(PreferredFusedOpcode, SL, VT, A, B, CDE);
+  if (CanReassociate) {
+    SDValue FMA, E;
+    if (isFusedOp(N0) && N0.hasOneUse()) {
+      FMA = N0;
+      E = N1;
+    } else if (isFusedOp(N1) && N1.hasOneUse()) {
+      FMA = N1;
+      E = N0;
+    }
+
+    SDValue TmpFMA = FMA;
+    while (E && isFusedOp(TmpFMA) && TmpFMA.hasOneUse()) {
+      SDValue FMul = TmpFMA->getOperand(2);
+      if (FMul.getOpcode() == ISD::FMUL && FMul.hasOneUse()) {
+        SDValue C = FMul.getOperand(0);
+        SDValue D = FMul.getOperand(1);
+        SDValue CDE = DAG.getNode(PreferredFusedOpcode, SL, VT, C, D, E);
+        DAG.ReplaceAllUsesOfValueWith(FMul, CDE);
+        // Replacing the inner FMul could cause the outer FMA to be simplified
+        // away.
+        return FMA.getOpcode() == ISD::DELETED_NODE ? SDValue() : FMA;
+      }
+
+      TmpFMA = TmpFMA->getOperand(2);
+    }
   }
 
   // Look through FP_EXTEND nodes to do more combining.
@@ -13130,7 +14730,7 @@ SDValue DAGCombiner::visitFADDForFMACombine(SDNode *N) {
                                      DAG.getNode(ISD::FP_EXTEND, SL, VT, V),
                                      Z));
     };
-    if (N0.getOpcode() == PreferredFusedOpcode) {
+    if (isFusedOp(N0)) {
       SDValue N02 = N0.getOperand(2);
       if (N02.getOpcode() == ISD::FP_EXTEND) {
         SDValue N020 = N02.getOperand(0);
@@ -13160,7 +14760,7 @@ SDValue DAGCombiner::visitFADDForFMACombine(SDNode *N) {
     };
     if (N0.getOpcode() == ISD::FP_EXTEND) {
       SDValue N00 = N0.getOperand(0);
-      if (N00.getOpcode() == PreferredFusedOpcode) {
+      if (isFusedOp(N00)) {
         SDValue N002 = N00.getOperand(2);
         if (isContractableFMUL(N002) &&
             TLI.isFPExtFoldable(DAG, PreferredFusedOpcode, VT,
@@ -13174,7 +14774,7 @@ SDValue DAGCombiner::visitFADDForFMACombine(SDNode *N) {
 
     // fold (fadd x, (fma y, z, (fpext (fmul u, v)))
     //   -> (fma y, z, (fma (fpext u), (fpext v), x))
-    if (N1.getOpcode() == PreferredFusedOpcode) {
+    if (isFusedOp(N1)) {
       SDValue N12 = N1.getOperand(2);
       if (N12.getOpcode() == ISD::FP_EXTEND) {
         SDValue N120 = N12.getOperand(0);
@@ -13195,7 +14795,7 @@ SDValue DAGCombiner::visitFADDForFMACombine(SDNode *N) {
     // interesting for all targets, especially GPUs.
     if (N1.getOpcode() == ISD::FP_EXTEND) {
       SDValue N10 = N1.getOperand(0);
-      if (N10.getOpcode() == PreferredFusedOpcode) {
+      if (isFusedOp(N10)) {
         SDValue N102 = N10.getOperand(2);
         if (isContractableFMUL(N102) &&
             TLI.isFPExtFoldable(DAG, PreferredFusedOpcode, VT,
@@ -13278,7 +14878,7 @@ SDValue DAGCombiner::visitFSUBForFMACombine(SDNode *N) {
   // If we have two choices trying to fold (fsub (fmul u, v), (fmul x, y)),
   // prefer to fold the multiply with fewer uses.
   if (isContractableFMUL(N0) && isContractableFMUL(N1) &&
-      (N0.getNode()->use_size() > N1.getNode()->use_size())) {
+      (N0->use_size() > N1->use_size())) {
     // fold (fsub (fmul a, b), (fmul c, d)) -> (fma (fneg c), d, (fmul a, b))
     if (SDValue V = tryToFoldXSubYZ(N0, N1))
       return V;
@@ -13386,17 +14986,22 @@ SDValue DAGCombiner::visitFSUBForFMACombine(SDNode *N) {
     return Options.UnsafeFPMath || N->getFlags().hasAllowReassociation();
   };
 
-  auto isContractableAndReassociableFMUL = [isContractableFMUL,
-                                            isReassociable](SDValue N) {
+  auto isContractableAndReassociableFMUL = [&isContractableFMUL,
+                                            &isReassociable](SDValue N) {
     return isContractableFMUL(N) && isReassociable(N.getNode());
   };
 
+  auto isFusedOp = [&](SDValue N) {
+    unsigned Opcode = N.getOpcode();
+    return Opcode == ISD::FMA || Opcode == ISD::FMAD;
+  };
+
   // More folding opportunities when target permits.
   if (Aggressive && isReassociable(N)) {
     bool CanFuse = Options.UnsafeFPMath || N->getFlags().hasAllowContract();
     // fold (fsub (fma x, y, (fmul u, v)), z)
     //   -> (fma x, y (fma u, v, (fneg z)))
-    if (CanFuse && N0.getOpcode() == PreferredFusedOpcode &&
+    if (CanFuse && isFusedOp(N0) &&
         isContractableAndReassociableFMUL(N0.getOperand(2)) &&
         N0->hasOneUse() && N0.getOperand(2)->hasOneUse()) {
       return DAG.getNode(PreferredFusedOpcode, SL, VT, N0.getOperand(0),
@@ -13409,7 +15014,7 @@ SDValue DAGCombiner::visitFSUBForFMACombine(SDNode *N) {
 
     // fold (fsub x, (fma y, z, (fmul u, v)))
     //   -> (fma (fneg y), z, (fma (fneg u), v, x))
-    if (CanFuse && N1.getOpcode() == PreferredFusedOpcode &&
+    if (CanFuse && isFusedOp(N1) &&
         isContractableAndReassociableFMUL(N1.getOperand(2)) &&
         N1->hasOneUse() && NoSignedZero) {
       SDValue N20 = N1.getOperand(2).getOperand(0);
@@ -13423,8 +15028,7 @@ SDValue DAGCombiner::visitFSUBForFMACombine(SDNode *N) {
 
     // fold (fsub (fma x, y, (fpext (fmul u, v))), z)
     //   -> (fma x, y (fma (fpext u), (fpext v), (fneg z)))
-    if (N0.getOpcode() == PreferredFusedOpcode &&
-        N0->hasOneUse()) {
+    if (isFusedOp(N0) && N0->hasOneUse()) {
       SDValue N02 = N0.getOperand(2);
       if (N02.getOpcode() == ISD::FP_EXTEND) {
         SDValue N020 = N02.getOperand(0);
@@ -13450,7 +15054,7 @@ SDValue DAGCombiner::visitFSUBForFMACombine(SDNode *N) {
     // interesting for all targets, especially GPUs.
     if (N0.getOpcode() == ISD::FP_EXTEND) {
       SDValue N00 = N0.getOperand(0);
-      if (N00.getOpcode() == PreferredFusedOpcode) {
+      if (isFusedOp(N00)) {
         SDValue N002 = N00.getOperand(2);
         if (isContractableAndReassociableFMUL(N002) &&
             TLI.isFPExtFoldable(DAG, PreferredFusedOpcode, VT,
@@ -13470,8 +15074,7 @@ SDValue DAGCombiner::visitFSUBForFMACombine(SDNode *N) {
 
     // fold (fsub x, (fma y, z, (fpext (fmul u, v))))
     //   -> (fma (fneg y), z, (fma (fneg (fpext u)), (fpext v), x))
-    if (N1.getOpcode() == PreferredFusedOpcode &&
-        N1.getOperand(2).getOpcode() == ISD::FP_EXTEND &&
+    if (isFusedOp(N1) && N1.getOperand(2).getOpcode() == ISD::FP_EXTEND &&
         N1->hasOneUse()) {
       SDValue N120 = N1.getOperand(2).getOperand(0);
       if (isContractableAndReassociableFMUL(N120) &&
@@ -13495,8 +15098,7 @@ SDValue DAGCombiner::visitFSUBForFMACombine(SDNode *N) {
     // FIXME: This turns two single-precision and one double-precision
     // operation into two double-precision operations, which might not be
     // interesting for all targets, especially GPUs.
-    if (N1.getOpcode() == ISD::FP_EXTEND &&
-        N1.getOperand(0).getOpcode() == PreferredFusedOpcode) {
+    if (N1.getOpcode() == ISD::FP_EXTEND && isFusedOp(N1.getOperand(0))) {
       SDValue CvtSrc = N1.getOperand(0);
       SDValue N100 = CvtSrc.getOperand(0);
       SDValue N101 = CvtSrc.getOperand(1);
@@ -13537,12 +15139,13 @@ SDValue DAGCombiner::visitFMULForFMADistributiveCombine(SDNode *N) {
 
   // The transforms below are incorrect when x == 0 and y == inf, because the
   // intermediate multiplication produces a nan.
-  if (!Options.NoInfsFPMath)
+  SDValue FAdd = N0.getOpcode() == ISD::FADD ? N0 : N1;
+  if (!hasNoInfs(Options, FAdd))
     return SDValue();
 
   // Floating-point multiply-add without intermediate rounding.
   bool HasFMA =
-      (Options.AllowFPOpFusion == FPOpFusion::Fast || Options.UnsafeFPMath) &&
+      isContractableFMUL(Options, SDValue(N, 0)) &&
       TLI.isFMAFasterThanFMulAndFAdd(DAG.getMachineFunction(), VT) &&
       (!LegalOperations || TLI.isOperationLegalOrCustom(ISD::FMA, VT));
 
@@ -13619,8 +15222,8 @@ SDValue DAGCombiner::visitFMULForFMADistributiveCombine(SDNode *N) {
 SDValue DAGCombiner::visitFADD(SDNode *N) {
   SDValue N0 = N->getOperand(0);
   SDValue N1 = N->getOperand(1);
-  bool N0CFP = DAG.isConstantFPBuildVectorOrConstantFP(N0);
-  bool N1CFP = DAG.isConstantFPBuildVectorOrConstantFP(N1);
+  SDNode *N0CFP = DAG.isConstantFPBuildVectorOrConstantFP(N0);
+  SDNode *N1CFP = DAG.isConstantFPBuildVectorOrConstantFP(N1);
   EVT VT = N->getValueType(0);
   SDLoc DL(N);
   const TargetOptions &Options = DAG.getTarget().Options;
@@ -13630,19 +15233,19 @@ SDValue DAGCombiner::visitFADD(SDNode *N) {
   if (SDValue R = DAG.simplifyFPBinop(N->getOpcode(), N0, N1, Flags))
     return R;
 
-  // fold vector ops
-  if (VT.isVector())
-    if (SDValue FoldedVOp = SimplifyVBinOp(N))
-      return FoldedVOp;
-
   // fold (fadd c1, c2) -> c1 + c2
-  if (N0CFP && N1CFP)
-    return DAG.getNode(ISD::FADD, DL, VT, N0, N1);
+  if (SDValue C = DAG.FoldConstantArithmetic(ISD::FADD, DL, VT, {N0, N1}))
+    return C;
 
   // canonicalize constant to RHS
   if (N0CFP && !N1CFP)
     return DAG.getNode(ISD::FADD, DL, VT, N1, N0);
 
+  // fold vector ops
+  if (VT.isVector())
+    if (SDValue FoldedVOp = SimplifyVBinOp(N, DL))
+      return FoldedVOp;
+
   // N0 + -0.0 --> N0 (also allowed with +0.0 and fast-math)
   ConstantFPSDNode *N1C = isConstOrConstSplatFP(N1, true);
   if (N1C && N1C->isZero())
@@ -13717,8 +15320,10 @@ SDValue DAGCombiner::visitFADD(SDNode *N) {
     // of rounding steps.
     if (TLI.isOperationLegalOrCustom(ISD::FMUL, VT) && !N0CFP && !N1CFP) {
       if (N0.getOpcode() == ISD::FMUL) {
-        bool CFP00 = DAG.isConstantFPBuildVectorOrConstantFP(N0.getOperand(0));
-        bool CFP01 = DAG.isConstantFPBuildVectorOrConstantFP(N0.getOperand(1));
+        SDNode *CFP00 =
+            DAG.isConstantFPBuildVectorOrConstantFP(N0.getOperand(0));
+        SDNode *CFP01 =
+            DAG.isConstantFPBuildVectorOrConstantFP(N0.getOperand(1));
 
         // (fadd (fmul x, c), x) -> (fmul x, c+1)
         if (CFP01 && !CFP00 && N0.getOperand(0) == N1) {
@@ -13738,8 +15343,10 @@ SDValue DAGCombiner::visitFADD(SDNode *N) {
       }
 
       if (N1.getOpcode() == ISD::FMUL) {
-        bool CFP10 = DAG.isConstantFPBuildVectorOrConstantFP(N1.getOperand(0));
-        bool CFP11 = DAG.isConstantFPBuildVectorOrConstantFP(N1.getOperand(1));
+        SDNode *CFP10 =
+            DAG.isConstantFPBuildVectorOrConstantFP(N1.getOperand(0));
+        SDNode *CFP11 =
+            DAG.isConstantFPBuildVectorOrConstantFP(N1.getOperand(1));
 
         // (fadd x, (fmul x, c)) -> (fmul x, c+1)
         if (CFP11 && !CFP10 && N1.getOperand(0) == N0) {
@@ -13759,7 +15366,8 @@ SDValue DAGCombiner::visitFADD(SDNode *N) {
       }
 
       if (N0.getOpcode() == ISD::FADD) {
-        bool CFP00 = DAG.isConstantFPBuildVectorOrConstantFP(N0.getOperand(0));
+        SDNode *CFP00 =
+            DAG.isConstantFPBuildVectorOrConstantFP(N0.getOperand(0));
         // (fadd (fadd x, x), x) -> (fmul x, 3.0)
         if (!CFP00 && N0.getOperand(0) == N0.getOperand(1) &&
             (N0.getOperand(0) == N1)) {
@@ -13769,7 +15377,8 @@ SDValue DAGCombiner::visitFADD(SDNode *N) {
       }
 
       if (N1.getOpcode() == ISD::FADD) {
-        bool CFP10 = DAG.isConstantFPBuildVectorOrConstantFP(N1.getOperand(0));
+        SDNode *CFP10 =
+            DAG.isConstantFPBuildVectorOrConstantFP(N1.getOperand(0));
         // (fadd x, (fadd x, x)) -> (fmul x, 3.0)
         if (!CFP10 && N1.getOperand(0) == N1.getOperand(1) &&
             N1.getOperand(0) == N0) {
@@ -13838,15 +15447,15 @@ SDValue DAGCombiner::visitFSUB(SDNode *N) {
   if (SDValue R = DAG.simplifyFPBinop(N->getOpcode(), N0, N1, Flags))
     return R;
 
+  // fold (fsub c1, c2) -> c1-c2
+  if (SDValue C = DAG.FoldConstantArithmetic(ISD::FSUB, DL, VT, {N0, N1}))
+    return C;
+
   // fold vector ops
   if (VT.isVector())
-    if (SDValue FoldedVOp = SimplifyVBinOp(N))
+    if (SDValue FoldedVOp = SimplifyVBinOp(N, DL))
       return FoldedVOp;
 
-  // fold (fsub c1, c2) -> c1-c2
-  if (N0CFP && N1CFP)
-    return DAG.getNode(ISD::FSUB, DL, VT, N0, N1);
-
   if (SDValue NewSel = foldBinOpIntoSelect(N))
     return NewSel;
 
@@ -13911,7 +15520,6 @@ SDValue DAGCombiner::visitFSUB(SDNode *N) {
 SDValue DAGCombiner::visitFMUL(SDNode *N) {
   SDValue N0 = N->getOperand(0);
   SDValue N1 = N->getOperand(1);
-  ConstantFPSDNode *N0CFP = isConstOrConstSplatFP(N0, true);
   ConstantFPSDNode *N1CFP = isConstOrConstSplatFP(N1, true);
   EVT VT = N->getValueType(0);
   SDLoc DL(N);
@@ -13922,22 +15530,20 @@ SDValue DAGCombiner::visitFMUL(SDNode *N) {
   if (SDValue R = DAG.simplifyFPBinop(N->getOpcode(), N0, N1, Flags))
     return R;
 
-  // fold vector ops
-  if (VT.isVector()) {
-    // This just handles C1 * C2 for vectors. Other vector folds are below.
-    if (SDValue FoldedVOp = SimplifyVBinOp(N))
-      return FoldedVOp;
-  }
-
   // fold (fmul c1, c2) -> c1*c2
-  if (N0CFP && N1CFP)
-    return DAG.getNode(ISD::FMUL, DL, VT, N0, N1);
+  if (SDValue C = DAG.FoldConstantArithmetic(ISD::FMUL, DL, VT, {N0, N1}))
+    return C;
 
   // canonicalize constant to RHS
   if (DAG.isConstantFPBuildVectorOrConstantFP(N0) &&
      !DAG.isConstantFPBuildVectorOrConstantFP(N1))
     return DAG.getNode(ISD::FMUL, DL, VT, N1, N0);
 
+  // fold vector ops
+  if (VT.isVector())
+    if (SDValue FoldedVOp = SimplifyVBinOp(N, DL))
+      return FoldedVOp;
+
   if (SDValue NewSel = foldBinOpIntoSelect(N))
     return NewSel;
 
@@ -13970,10 +15576,13 @@ SDValue DAGCombiner::visitFMUL(SDNode *N) {
   if (N1CFP && N1CFP->isExactlyValue(+2.0))
     return DAG.getNode(ISD::FADD, DL, VT, N0, N0);
 
-  // fold (fmul X, -1.0) -> (fneg X)
-  if (N1CFP && N1CFP->isExactlyValue(-1.0))
-    if (!LegalOperations || TLI.isOperationLegal(ISD::FNEG, VT))
-      return DAG.getNode(ISD::FNEG, DL, VT, N0);
+  // fold (fmul X, -1.0) -> (fsub -0.0, X)
+  if (N1CFP && N1CFP->isExactlyValue(-1.0)) {
+    if (!LegalOperations || TLI.isOperationLegal(ISD::FSUB, VT)) {
+      return DAG.getNode(ISD::FSUB, DL, VT,
+                         DAG.getConstantFP(-0.0, DL, VT), N0, Flags);
+    }
+  }
 
   // -N0 * -N1 --> N0 * N1
   TargetLowering::NegatibleCost CostN0 =
@@ -13982,12 +15591,14 @@ SDValue DAGCombiner::visitFMUL(SDNode *N) {
       TargetLowering::NegatibleCost::Expensive;
   SDValue NegN0 =
       TLI.getNegatedExpression(N0, DAG, LegalOperations, ForCodeSize, CostN0);
-  SDValue NegN1 =
-      TLI.getNegatedExpression(N1, DAG, LegalOperations, ForCodeSize, CostN1);
-  if (NegN0 && NegN1 &&
-      (CostN0 == TargetLowering::NegatibleCost::Cheaper ||
-       CostN1 == TargetLowering::NegatibleCost::Cheaper))
-    return DAG.getNode(ISD::FMUL, DL, VT, NegN0, NegN1);
+  if (NegN0) {
+    HandleSDNode NegN0Handle(NegN0);
+    SDValue NegN1 =
+        TLI.getNegatedExpression(N1, DAG, LegalOperations, ForCodeSize, CostN1);
+    if (NegN1 && (CostN0 == TargetLowering::NegatibleCost::Cheaper ||
+                  CostN1 == TargetLowering::NegatibleCost::Cheaper))
+      return DAG.getNode(ISD::FMUL, DL, VT, NegN0, NegN1);
+  }
 
   // fold (fmul X, (select (fcmp X > 0.0), -1.0, 1.0)) -> (fneg (fabs X))
   // fold (fmul X, (select (fcmp X > 0.0), 1.0, -1.0)) -> (fabs X)
@@ -14016,7 +15627,7 @@ SDValue DAGCombiner::visitFMUL(SDNode *N) {
       case ISD::SETLT:
       case ISD::SETLE:
         std::swap(TrueOpnd, FalseOpnd);
-        LLVM_FALLTHROUGH;
+        [[fallthrough]];
       case ISD::SETOGT:
       case ISD::SETUGT:
       case ISD::SETOGE:
@@ -14056,7 +15667,7 @@ SDValue DAGCombiner::visitFMA(SDNode *N) {
   // FMA nodes have flags that propagate to the created nodes.
   SelectionDAG::FlagInserter FlagsInserter(DAG, N);
 
-  bool UnsafeFPMath =
+  bool CanReassociate =
       Options.UnsafeFPMath || N->getFlags().hasAllowReassociation();
 
   // Constant fold FMA.
@@ -14073,14 +15684,17 @@ SDValue DAGCombiner::visitFMA(SDNode *N) {
       TargetLowering::NegatibleCost::Expensive;
   SDValue NegN0 =
       TLI.getNegatedExpression(N0, DAG, LegalOperations, ForCodeSize, CostN0);
-  SDValue NegN1 =
-      TLI.getNegatedExpression(N1, DAG, LegalOperations, ForCodeSize, CostN1);
-  if (NegN0 && NegN1 &&
-      (CostN0 == TargetLowering::NegatibleCost::Cheaper ||
-       CostN1 == TargetLowering::NegatibleCost::Cheaper))
-    return DAG.getNode(ISD::FMA, DL, VT, NegN0, NegN1, N2);
-
-  if (UnsafeFPMath) {
+  if (NegN0) {
+    HandleSDNode NegN0Handle(NegN0);
+    SDValue NegN1 =
+        TLI.getNegatedExpression(N1, DAG, LegalOperations, ForCodeSize, CostN1);
+    if (NegN1 && (CostN0 == TargetLowering::NegatibleCost::Cheaper ||
+                  CostN1 == TargetLowering::NegatibleCost::Cheaper))
+      return DAG.getNode(ISD::FMA, DL, VT, NegN0, NegN1, N2);
+  }
+
+  // FIXME: use fast math flags instead of Options.UnsafeFPMath
+  if (Options.UnsafeFPMath) {
     if (N0CFP && N0CFP->isZero())
       return N2;
     if (N1CFP && N1CFP->isZero())
@@ -14097,7 +15711,7 @@ SDValue DAGCombiner::visitFMA(SDNode *N) {
      !DAG.isConstantFPBuildVectorOrConstantFP(N1))
     return DAG.getNode(ISD::FMA, SDLoc(N), VT, N1, N0, N2);
 
-  if (UnsafeFPMath) {
+  if (CanReassociate) {
     // (fma x, c1, (fmul x, c2)) -> (fmul x, c1+c2)
     if (N2.getOpcode() == ISD::FMUL && N0 == N2.getOperand(0) &&
         DAG.isConstantFPBuildVectorOrConstantFP(N1) &&
@@ -14138,7 +15752,7 @@ SDValue DAGCombiner::visitFMA(SDNode *N) {
     }
   }
 
-  if (UnsafeFPMath) {
+  if (CanReassociate) {
     // (fma x, c, x) -> (fmul x, (c+1))
     if (N1CFP && N0 == N2) {
       return DAG.getNode(
@@ -14194,7 +15808,7 @@ SDValue DAGCombiner::combineRepeatedFPDivisors(SDNode *N) {
   unsigned NumElts = 1;
   EVT VT = N->getValueType(0);
   if (VT.isVector() && DAG.isSplatValue(N1))
-    NumElts = VT.getVectorNumElements();
+    NumElts = VT.getVectorMinNumElements();
 
   if (!MinUses || (N1->use_size() * NumElts) < MinUses)
     return SDValue();
@@ -14246,8 +15860,6 @@ SDValue DAGCombiner::combineRepeatedFPDivisors(SDNode *N) {
 SDValue DAGCombiner::visitFDIV(SDNode *N) {
   SDValue N0 = N->getOperand(0);
   SDValue N1 = N->getOperand(1);
-  ConstantFPSDNode *N0CFP = dyn_cast<ConstantFPSDNode>(N0);
-  ConstantFPSDNode *N1CFP = dyn_cast<ConstantFPSDNode>(N1);
   EVT VT = N->getValueType(0);
   SDLoc DL(N);
   const TargetOptions &Options = DAG.getTarget().Options;
@@ -14257,15 +15869,15 @@ SDValue DAGCombiner::visitFDIV(SDNode *N) {
   if (SDValue R = DAG.simplifyFPBinop(N->getOpcode(), N0, N1, Flags))
     return R;
 
+  // fold (fdiv c1, c2) -> c1/c2
+  if (SDValue C = DAG.FoldConstantArithmetic(ISD::FDIV, DL, VT, {N0, N1}))
+    return C;
+
   // fold vector ops
   if (VT.isVector())
-    if (SDValue FoldedVOp = SimplifyVBinOp(N))
+    if (SDValue FoldedVOp = SimplifyVBinOp(N, DL))
       return FoldedVOp;
 
-  // fold (fdiv c1, c2) -> c1/c2
-  if (N0CFP && N1CFP)
-    return DAG.getNode(ISD::FDIV, SDLoc(N), VT, N0, N1);
-
   if (SDValue NewSel = foldBinOpIntoSelect(N))
     return NewSel;
 
@@ -14274,7 +15886,7 @@ SDValue DAGCombiner::visitFDIV(SDNode *N) {
 
   if (Options.UnsafeFPMath || Flags.hasAllowReciprocal()) {
     // fold (fdiv X, c2) -> fmul X, 1/c2 if losing precision is acceptable.
-    if (N1CFP) {
+    if (auto *N1CFP = dyn_cast<ConstantFPSDNode>(N1)) {
       // Compute the reciprocal 1.0 / c2.
       const APFloat &N1APF = N1CFP->getValueAPF();
       APFloat Recip(N1APF.getSemantics(), 1); // 1.0
@@ -14377,12 +15989,14 @@ SDValue DAGCombiner::visitFDIV(SDNode *N) {
       TargetLowering::NegatibleCost::Expensive;
   SDValue NegN0 =
       TLI.getNegatedExpression(N0, DAG, LegalOperations, ForCodeSize, CostN0);
-  SDValue NegN1 =
-      TLI.getNegatedExpression(N1, DAG, LegalOperations, ForCodeSize, CostN1);
-  if (NegN0 && NegN1 &&
-      (CostN0 == TargetLowering::NegatibleCost::Cheaper ||
-       CostN1 == TargetLowering::NegatibleCost::Cheaper))
-    return DAG.getNode(ISD::FDIV, SDLoc(N), VT, NegN0, NegN1);
+  if (NegN0) {
+    HandleSDNode NegN0Handle(NegN0);
+    SDValue NegN1 =
+        TLI.getNegatedExpression(N1, DAG, LegalOperations, ForCodeSize, CostN1);
+    if (NegN1 && (CostN0 == TargetLowering::NegatibleCost::Cheaper ||
+                  CostN1 == TargetLowering::NegatibleCost::Cheaper))
+      return DAG.getNode(ISD::FDIV, SDLoc(N), VT, NegN0, NegN1);
+  }
 
   return SDValue();
 }
@@ -14390,8 +16004,6 @@ SDValue DAGCombiner::visitFDIV(SDNode *N) {
 SDValue DAGCombiner::visitFREM(SDNode *N) {
   SDValue N0 = N->getOperand(0);
   SDValue N1 = N->getOperand(1);
-  ConstantFPSDNode *N0CFP = dyn_cast<ConstantFPSDNode>(N0);
-  ConstantFPSDNode *N1CFP = dyn_cast<ConstantFPSDNode>(N1);
   EVT VT = N->getValueType(0);
   SDNodeFlags Flags = N->getFlags();
   SelectionDAG::FlagInserter FlagsInserter(DAG, N);
@@ -14400,8 +16012,8 @@ SDValue DAGCombiner::visitFREM(SDNode *N) {
     return R;
 
   // fold (frem c1, c2) -> fmod(c1,c2)
-  if (N0CFP && N1CFP)
-    return DAG.getNode(ISD::FREM, SDLoc(N), VT, N0, N1);
+  if (SDValue C = DAG.FoldConstantArithmetic(ISD::FREM, SDLoc(N), VT, {N0, N1}))
+    return C;
 
   if (SDValue NewSel = foldBinOpIntoSelect(N))
     return NewSel;
@@ -14451,11 +16063,7 @@ static inline bool CanCombineFCOPYSIGN_EXTEND_ROUND(SDNode *N) {
     if (N1Op0VT == MVT::f128)
       return false;
 
-    // Avoid mismatched vector operand types, for better instruction selection.
-    if (N1Op0VT.isVector())
-      return false;
-
-    return true;
+    return !N1Op0VT.isVector() || EnableVectorFCopySignExtendRound;
   }
   return false;
 }
@@ -14463,12 +16071,12 @@ static inline bool CanCombineFCOPYSIGN_EXTEND_ROUND(SDNode *N) {
 SDValue DAGCombiner::visitFCOPYSIGN(SDNode *N) {
   SDValue N0 = N->getOperand(0);
   SDValue N1 = N->getOperand(1);
-  bool N0CFP = DAG.isConstantFPBuildVectorOrConstantFP(N0);
-  bool N1CFP = DAG.isConstantFPBuildVectorOrConstantFP(N1);
   EVT VT = N->getValueType(0);
 
-  if (N0CFP && N1CFP) // Constant fold
-    return DAG.getNode(ISD::FCOPYSIGN, SDLoc(N), VT, N0, N1);
+  // fold (fcopysign c1, c2) -> fcopysign(c1,c2)
+  if (SDValue C =
+          DAG.FoldConstantArithmetic(ISD::FCOPYSIGN, SDLoc(N), VT, {N0, N1}))
+    return C;
 
   if (ConstantFPSDNode *N1C = isConstOrConstSplatFP(N->getOperand(1))) {
     const APFloat &V = N1C->getValueAPF();
@@ -14586,14 +16194,6 @@ SDValue DAGCombiner::visitFPOW(SDNode *N) {
 
 static SDValue foldFPToIntToFP(SDNode *N, SelectionDAG &DAG,
                                const TargetLowering &TLI) {
-  // This optimization is guarded by a function attribute because it may produce
-  // unexpected results. Ie, programs may be relying on the platform-specific
-  // undefined behavior when the float-to-int conversion overflows.
-  const Function &F = DAG.getMachineFunction().getFunction();
-  Attribute StrictOverflow = F.getFnAttribute("strict-float-cast-overflow");
-  if (StrictOverflow.getValueAsString().equals("false"))
-    return SDValue();
-
   // We only do this if the target has legal ftrunc. Otherwise, we'd likely be
   // replacing casts with a libcall. We also must be allowed to ignore -0.0
   // because FTRUNC will return -0.0 for (-1.0, -0.0), but using integer
@@ -14733,7 +16333,7 @@ static SDValue FoldIntToFPToInt(SDNode *N, SelectionDAG &DAG) {
   // This means this is also safe for a signed input and unsigned output, since
   // a negative input would lead to undefined behavior.
   unsigned InputSize = (int)SrcVT.getScalarSizeInBits() - IsInputSigned;
-  unsigned OutputSize = (int)VT.getScalarSizeInBits() - IsOutputSigned;
+  unsigned OutputSize = (int)VT.getScalarSizeInBits();
   unsigned ActualSize = std::min(InputSize, OutputSize);
   const fltSemantics &sem = DAG.EVTToAPFloatSemantics(N0.getValueType());
 
@@ -14785,12 +16385,12 @@ SDValue DAGCombiner::visitFP_TO_UINT(SDNode *N) {
 SDValue DAGCombiner::visitFP_ROUND(SDNode *N) {
   SDValue N0 = N->getOperand(0);
   SDValue N1 = N->getOperand(1);
-  ConstantFPSDNode *N0CFP = dyn_cast<ConstantFPSDNode>(N0);
   EVT VT = N->getValueType(0);
 
   // fold (fp_round c1fp) -> c1fp
-  if (N0CFP)
-    return DAG.getNode(ISD::FP_ROUND, SDLoc(N), VT, N0, N1);
+  if (SDValue C =
+          DAG.FoldConstantArithmetic(ISD::FP_ROUND, SDLoc(N), VT, {N0, N1}))
+    return C;
 
   // fold (fp_round (fp_extend x)) -> x
   if (N0.getOpcode() == ISD::FP_EXTEND && VT == N0.getOperand(0).getValueType())
@@ -14818,13 +16418,14 @@ SDValue DAGCombiner::visitFP_ROUND(SDNode *N) {
     // Also, this is a value preserving truncation iff both fp_round's are.
     if (DAG.getTarget().Options.UnsafeFPMath || N0IsTrunc) {
       SDLoc DL(N);
-      return DAG.getNode(ISD::FP_ROUND, DL, VT, N0.getOperand(0),
-                         DAG.getIntPtrConstant(NIsTrunc && N0IsTrunc, DL));
+      return DAG.getNode(
+          ISD::FP_ROUND, DL, VT, N0.getOperand(0),
+          DAG.getIntPtrConstant(NIsTrunc && N0IsTrunc, DL, /*isTarget=*/true));
     }
   }
 
   // fold (fp_round (copysign X, Y)) -> (copysign (fp_round X), Y)
-  if (N0.getOpcode() == ISD::FCOPYSIGN && N0.getNode()->hasOneUse()) {
+  if (N0.getOpcode() == ISD::FCOPYSIGN && N0->hasOneUse()) {
     SDValue Tmp = DAG.getNode(ISD::FP_ROUND, SDLoc(N0), VT,
                               N0.getOperand(0), N1);
     AddToWorklist(Tmp.getNode());
@@ -14842,6 +16443,10 @@ SDValue DAGCombiner::visitFP_EXTEND(SDNode *N) {
   SDValue N0 = N->getOperand(0);
   EVT VT = N->getValueType(0);
 
+  if (VT.isVector())
+    if (SDValue FoldedVOp = SimplifyVCastOp(N, SDLoc(N)))
+      return FoldedVOp;
+
   // If this is fp_round(fpextend), don't fold it, allow ourselves to be folded.
   if (N->hasOneUse() &&
       N->use_begin()->getOpcode() == ISD::FP_ROUND)
@@ -14870,18 +16475,18 @@ SDValue DAGCombiner::visitFP_EXTEND(SDNode *N) {
 
   // fold (fpext (load x)) -> (fpext (fptrunc (extload x)))
   if (ISD::isNormalLoad(N0.getNode()) && N0.hasOneUse() &&
-       TLI.isLoadExtLegal(ISD::EXTLOAD, VT, N0.getValueType())) {
+      TLI.isLoadExtLegalOrCustom(ISD::EXTLOAD, VT, N0.getValueType())) {
     LoadSDNode *LN0 = cast<LoadSDNode>(N0);
     SDValue ExtLoad = DAG.getExtLoad(ISD::EXTLOAD, SDLoc(N), VT,
                                      LN0->getChain(),
                                      LN0->getBasePtr(), N0.getValueType(),
                                      LN0->getMemOperand());
     CombineTo(N, ExtLoad);
-    CombineTo(N0.getNode(),
-              DAG.getNode(ISD::FP_ROUND, SDLoc(N0),
-                          N0.getValueType(), ExtLoad,
-                          DAG.getIntPtrConstant(1, SDLoc(N0))),
-              ExtLoad.getValue(1));
+    CombineTo(
+        N0.getNode(),
+        DAG.getNode(ISD::FP_ROUND, SDLoc(N0), N0.getValueType(), ExtLoad,
+                    DAG.getIntPtrConstant(1, SDLoc(N0), /*isTarget=*/true)),
+        ExtLoad.getValue(1));
     return SDValue(N, 0);   // Return N so it doesn't get rechecked!
   }
 
@@ -14967,31 +16572,26 @@ SDValue DAGCombiner::visitFNEG(SDNode *N) {
   return SDValue();
 }
 
-static SDValue visitFMinMax(SelectionDAG &DAG, SDNode *N,
-                            APFloat (*Op)(const APFloat &, const APFloat &)) {
+SDValue DAGCombiner::visitFMinMax(SDNode *N) {
   SDValue N0 = N->getOperand(0);
   SDValue N1 = N->getOperand(1);
   EVT VT = N->getValueType(0);
-  const ConstantFPSDNode *N0CFP = isConstOrConstSplatFP(N0);
-  const ConstantFPSDNode *N1CFP = isConstOrConstSplatFP(N1);
   const SDNodeFlags Flags = N->getFlags();
   unsigned Opc = N->getOpcode();
   bool PropagatesNaN = Opc == ISD::FMINIMUM || Opc == ISD::FMAXIMUM;
   bool IsMin = Opc == ISD::FMINNUM || Opc == ISD::FMINIMUM;
   SelectionDAG::FlagInserter FlagsInserter(DAG, N);
 
-  if (N0CFP && N1CFP) {
-    const APFloat &C0 = N0CFP->getValueAPF();
-    const APFloat &C1 = N1CFP->getValueAPF();
-    return DAG.getConstantFP(Op(C0, C1), SDLoc(N), VT);
-  }
+  // Constant fold.
+  if (SDValue C = DAG.FoldConstantArithmetic(Opc, SDLoc(N), VT, {N0, N1}))
+    return C;
 
   // Canonicalize to constant on RHS.
   if (DAG.isConstantFPBuildVectorOrConstantFP(N0) &&
       !DAG.isConstantFPBuildVectorOrConstantFP(N1))
     return DAG.getNode(N->getOpcode(), SDLoc(N), VT, N1, N0);
 
-  if (N1CFP) {
+  if (const ConstantFPSDNode *N1CFP = isConstOrConstSplatFP(N1)) {
     const APFloat &AF = N1CFP->getValueAPF();
 
     // minnum(X, nan) -> X
@@ -15023,22 +16623,6 @@ static SDValue visitFMinMax(SelectionDAG &DAG, SDNode *N,
   return SDValue();
 }
 
-SDValue DAGCombiner::visitFMINNUM(SDNode *N) {
-  return visitFMinMax(DAG, N, minnum);
-}
-
-SDValue DAGCombiner::visitFMAXNUM(SDNode *N) {
-  return visitFMinMax(DAG, N, maxnum);
-}
-
-SDValue DAGCombiner::visitFMINIMUM(SDNode *N) {
-  return visitFMinMax(DAG, N, minimum);
-}
-
-SDValue DAGCombiner::visitFMAXIMUM(SDNode *N) {
-  return visitFMinMax(DAG, N, maximum);
-}
-
 SDValue DAGCombiner::visitFABS(SDNode *N) {
   SDValue N0 = N->getOperand(0);
   EVT VT = N->getValueType(0);
@@ -15289,7 +16873,7 @@ bool DAGCombiner::CombineToPreIndexedLoadStore(SDNode *N) {
   // If the pointer is not an add/sub, or if it doesn't have multiple uses, bail
   // out.  There is no reason to make this a preinc/predec.
   if ((Ptr.getOpcode() != ISD::ADD && Ptr.getOpcode() != ISD::SUB) ||
-      Ptr.getNode()->hasOneUse())
+      Ptr->hasOneUse())
     return false;
 
   // Ask the target to do addressing mode selection.
@@ -15349,8 +16933,8 @@ bool DAGCombiner::CombineToPreIndexedLoadStore(SDNode *N) {
   // a copy of the original base pointer.
   SmallVector<SDNode *, 16> OtherUses;
   if (isa<ConstantSDNode>(Offset))
-    for (SDNode::use_iterator UI = BasePtr.getNode()->use_begin(),
-                              UE = BasePtr.getNode()->use_end();
+    for (SDNode::use_iterator UI = BasePtr->use_begin(),
+                              UE = BasePtr->use_end();
          UI != UE; ++UI) {
       SDUse &Use = UI.getUse();
       // Skip the use that is Ptr and uses of other results from BasePtr's
@@ -15388,7 +16972,7 @@ bool DAGCombiner::CombineToPreIndexedLoadStore(SDNode *N) {
   // Now check for #3 and #4.
   bool RealUse = false;
 
-  for (SDNode *Use : Ptr.getNode()->uses()) {
+  for (SDNode *Use : Ptr->uses()) {
     if (Use == N)
       continue;
     if (SDNode::hasPredecessorHelper(Use, Visited, Worklist))
@@ -15421,7 +17005,7 @@ bool DAGCombiner::CombineToPreIndexedLoadStore(SDNode *N) {
   ++PreIndexedNodes;
   ++NodesCombined;
   LLVM_DEBUG(dbgs() << "\nReplacing.4 "; N->dump(&DAG); dbgs() << "\nWith: ";
-             Result.getNode()->dump(&DAG); dbgs() << '\n');
+             Result.dump(&DAG); dbgs() << '\n');
   WorklistRemover DeadNodes(*this);
   if (IsLoad) {
     DAG.ReplaceAllUsesOfValueWith(SDValue(N, 0), Result.getValue(0));
@@ -15511,7 +17095,7 @@ static bool shouldCombineToPostInc(SDNode *N, SDValue Ptr, SDNode *PtrUse,
     return false;
 
   SmallPtrSet<const SDNode *, 32> Visited;
-  for (SDNode *Use : BasePtr.getNode()->uses()) {
+  for (SDNode *Use : BasePtr->uses()) {
     if (Use == Ptr.getNode())
       continue;
 
@@ -15548,7 +17132,7 @@ static SDNode *getPostIndexedLoadStoreOp(SDNode *N, bool &IsLoad,
                                          const TargetLowering &TLI) {
   if (!getCombineLoadStoreParts(N, ISD::POST_INC, ISD::POST_DEC, IsLoad,
                                 IsMasked, Ptr, TLI) ||
-      Ptr.getNode()->hasOneUse())
+      Ptr->hasOneUse())
     return nullptr;
 
   // Try turning it into a post-indexed load / store except when
@@ -15608,9 +17192,8 @@ bool DAGCombiner::CombineToPostIndexedLoadStore(SDNode *N) {
                                                 BasePtr, Offset, AM);
   ++PostIndexedNodes;
   ++NodesCombined;
-  LLVM_DEBUG(dbgs() << "\nReplacing.5 "; N->dump(&DAG);
-             dbgs() << "\nWith: "; Result.getNode()->dump(&DAG);
-             dbgs() << '\n');
+  LLVM_DEBUG(dbgs() << "\nReplacing.5 "; N->dump(&DAG); dbgs() << "\nWith: ";
+             Result.dump(&DAG); dbgs() << '\n');
   WorklistRemover DeadNodes(*this);
   if (IsLoad) {
     DAG.ReplaceAllUsesOfValueWith(SDValue(N, 0), Result.getValue(0));
@@ -15658,7 +17241,6 @@ static inline ElementCount numVectorEltsOrZero(EVT T) {
 }
 
 bool DAGCombiner::getTruncatedStoreValue(StoreSDNode *ST, SDValue &Val) {
-  Val = ST->getValue();
   EVT STType = Val.getValueType();
   EVT STMemType = ST->getMemoryVT();
   if (STType == STMemType)
@@ -15714,7 +17296,7 @@ SDValue DAGCombiner::ForwardStoreValueToDirectLoad(LoadSDNode *LD) {
   SDValue Chain = LD->getOperand(0);
   StoreSDNode *ST = dyn_cast<StoreSDNode>(Chain.getNode());
   // TODO: Relax this restriction for unordered atomics (see D66309)
-  if (!ST || !ST->isSimple())
+  if (!ST || !ST->isSimple() || ST->getAddressSpace() != LD->getAddressSpace())
     return SDValue();
 
   EVT LDType = LD->getValueType(0);
@@ -15750,9 +17332,10 @@ SDValue DAGCombiner::ForwardStoreValueToDirectLoad(LoadSDNode *LD) {
   // significant bit in the loaded value maps to the least significant bit in
   // the stored value). With Offset=n (for n > 0) the loaded value starts at the
   // n:th least significant byte of the stored value.
+  int64_t OrigOffset = Offset;
   if (DAG.getDataLayout().isBigEndian())
-    Offset = ((int64_t)STMemType.getStoreSizeInBits().getFixedSize() -
-              (int64_t)LDMemType.getStoreSizeInBits().getFixedSize()) /
+    Offset = ((int64_t)STMemType.getStoreSizeInBits().getFixedValue() -
+              (int64_t)LDMemType.getStoreSizeInBits().getFixedValue()) /
                  8 -
              Offset;
 
@@ -15764,8 +17347,8 @@ SDValue DAGCombiner::ForwardStoreValueToDirectLoad(LoadSDNode *LD) {
   if (LdStScalable)
     STCoversLD = (Offset == 0) && LdMemSize == StMemSize;
   else
-    STCoversLD = (Offset >= 0) && (Offset * 8 + LdMemSize.getFixedSize() <=
-                                   StMemSize.getFixedSize());
+    STCoversLD = (Offset >= 0) && (Offset * 8 + LdMemSize.getFixedValue() <=
+                                   StMemSize.getFixedValue());
 
   auto ReplaceLd = [&](LoadSDNode *LD, SDValue Val, SDValue Chain) -> SDValue {
     if (LD->isIndexed()) {
@@ -15794,18 +17377,30 @@ SDValue DAGCombiner::ForwardStoreValueToDirectLoad(LoadSDNode *LD) {
       // Mask to size of LDMemType
       auto Mask =
           DAG.getConstant(APInt::getLowBitsSet(STType.getFixedSizeInBits(),
-                                               StMemSize.getFixedSize()),
+                                               StMemSize.getFixedValue()),
                           SDLoc(ST), STType);
       auto Val = DAG.getNode(ISD::AND, SDLoc(LD), LDType, ST->getValue(), Mask);
       return ReplaceLd(LD, Val, Chain);
     }
   }
 
+  // Handle some cases for big-endian that would be Offset 0 and handled for
+  // little-endian.
+  SDValue Val = ST->getValue();
+  if (DAG.getDataLayout().isBigEndian() && Offset > 0 && OrigOffset == 0) {
+    if (STType.isInteger() && !STType.isVector() && LDType.isInteger() &&
+        !LDType.isVector() && isTypeLegal(STType) &&
+        TLI.isOperationLegal(ISD::SRL, STType)) {
+      Val = DAG.getNode(ISD::SRL, SDLoc(LD), STType, Val,
+                        DAG.getConstant(Offset * 8, SDLoc(LD), STType));
+      Offset = 0;
+    }
+  }
+
   // TODO: Deal with nonzero offset.
   if (LD->getBasePtr().isUndef() || Offset != 0)
     return SDValue();
   // Model necessary truncations / extenstions.
-  SDValue Val;
   // Truncate Value To Stored Memory Size.
   do {
     if (!getTruncatedStoreValue(ST, Val))
@@ -15851,7 +17446,7 @@ SDValue DAGCombiner::visitLOAD(SDNode *N) {
         // Now we replace use of chain2 with chain1.  This makes the second load
         // isomorphic to the one we are deleting, and thus makes this load live.
         LLVM_DEBUG(dbgs() << "\nReplacing.6 "; N->dump(&DAG);
-                   dbgs() << "\nWith chain: "; Chain.getNode()->dump(&DAG);
+                   dbgs() << "\nWith chain: "; Chain.dump(&DAG);
                    dbgs() << "\n");
         WorklistRemover DeadNodes(*this);
         DAG.ReplaceAllUsesOfValueWith(SDValue(N, 1), Chain);
@@ -15882,7 +17477,7 @@ SDValue DAGCombiner::visitLOAD(SDNode *N) {
         } else
           Index = DAG.getUNDEF(N->getValueType(1));
         LLVM_DEBUG(dbgs() << "\nReplacing.7 "; N->dump(&DAG);
-                   dbgs() << "\nWith: "; Undef.getNode()->dump(&DAG);
+                   dbgs() << "\nWith: "; Undef.dump(&DAG);
                    dbgs() << " and 2 other values\n");
         WorklistRemover DeadNodes(*this);
         DAG.ReplaceAllUsesOfValueWith(SDValue(N, 0), Undef);
@@ -16244,11 +17839,12 @@ struct LoadedSlice {
       return false;
 
     // Check if it will be merged with the load.
-    // 1. Check the alignment constraint.
-    Align RequiredAlignment = DAG->getDataLayout().getABITypeAlign(
-        ResVT.getTypeForEVT(*DAG->getContext()));
-
-    if (RequiredAlignment > getAlign())
+    // 1. Check the alignment / fast memory access constraint.
+    unsigned IsFast = 0;
+    if (!TLI.allowsMemoryAccess(*DAG->getContext(), DAG->getDataLayout(), ResVT,
+                                Origin->getAddressSpace(), getAlign(),
+                                Origin->getMemOperand()->getFlags(), &IsFast) ||
+        !IsFast)
       return false;
 
     // 2. Check that the load is a legal operation for that type.
@@ -16269,7 +17865,7 @@ struct LoadedSlice {
 /// \p UsedBits looks like 0..0 1..1 0..0.
 static bool areUsedBitsDense(const APInt &UsedBits) {
   // If all the bits are one, this is dense!
-  if (UsedBits.isAllOnesValue())
+  if (UsedBits.isAllOnes())
     return true;
 
   // Get rid of the unused bits on the right.
@@ -16278,7 +17874,7 @@ static bool areUsedBitsDense(const APInt &UsedBits) {
   if (NarrowedUsedBits.countLeadingZeros())
     NarrowedUsedBits = NarrowedUsedBits.trunc(NarrowedUsedBits.getActiveBits());
   // Check that the chunk of bits is completely used.
-  return NarrowedUsedBits.isAllOnesValue();
+  return NarrowedUsedBits.isAllOnes();
 }
 
 /// Check whether or not \p First and \p Second are next to each other
@@ -16593,11 +18189,19 @@ ShrinkLoadReplaceStoreWithStore(const std::pair<unsigned, unsigned> &MaskInfo,
 
   // Check that it is legal on the target to do this.  It is legal if the new
   // VT we're shrinking to (i8/i16/i32) is legal or we're still before type
-  // legalization (and the target doesn't explicitly think this is a bad idea).
+  // legalization. If the source type is legal, but the store type isn't, see
+  // if we can use a truncating store.
   MVT VT = MVT::getIntegerVT(NumBytes * 8);
   const TargetLowering &TLI = DAG.getTargetLoweringInfo();
-  if (!DC->isTypeLegal(VT))
+  bool UseTruncStore;
+  if (DC->isTypeLegal(VT))
+    UseTruncStore = false;
+  else if (TLI.isTypeLegal(IVal.getValueType()) &&
+           TLI.isTruncStoreLegal(IVal.getValueType(), VT))
+    UseTruncStore = true;
+  else
     return SDValue();
+  // Check that the target doesn't think this is a bad idea.
   if (St->getMemOperand() &&
       !TLI.allowsMemoryAccess(*DAG.getContext(), DAG.getDataLayout(), VT,
                               *St->getMemOperand()))
@@ -16625,10 +18229,15 @@ ShrinkLoadReplaceStoreWithStore(const std::pair<unsigned, unsigned> &MaskInfo,
     Ptr = DAG.getMemBasePlusOffset(Ptr, TypeSize::Fixed(StOffset), DL);
   }
 
+  ++OpsNarrowed;
+  if (UseTruncStore)
+    return DAG.getTruncStore(St->getChain(), SDLoc(St), IVal, Ptr,
+                             St->getPointerInfo().getWithOffset(StOffset),
+                             VT, St->getOriginalAlign());
+
   // Truncate down to the new size.
   IVal = DAG.getNode(ISD::TRUNCATE, SDLoc(IVal), VT, IVal);
 
-  ++OpsNarrowed;
   return DAG
       .getStore(St->getChain(), SDLoc(St), IVal, Ptr,
                 St->getPointerInfo().getWithOffset(StOffset),
@@ -16649,11 +18258,15 @@ SDValue DAGCombiner::ReduceLoadOpStoreWidth(SDNode *N) {
   SDValue Ptr   = ST->getBasePtr();
   EVT VT = Value.getValueType();
 
-  if (ST->isTruncatingStore() || VT.isVector() || !Value.hasOneUse())
+  if (ST->isTruncatingStore() || VT.isVector())
     return SDValue();
 
   unsigned Opc = Value.getOpcode();
 
+  if ((Opc != ISD::OR && Opc != ISD::XOR && Opc != ISD::AND) ||
+      !Value.hasOneUse())
+    return SDValue();
+
   // If this is "store (or X, Y), P" and X is "(and (load P), cst)", where cst
   // is a byte mask indicating a consecutive number of bytes, check to see if
   // Y is known to provide just those bytes.  If so, we try to replace the
@@ -16678,8 +18291,7 @@ SDValue DAGCombiner::ReduceLoadOpStoreWidth(SDNode *N) {
   if (!EnableReduceLoadOpStoreWidth)
     return SDValue();
 
-  if ((Opc != ISD::OR && Opc != ISD::XOR && Opc != ISD::AND) ||
-      Value.getOperand(1).getOpcode() != ISD::Constant)
+  if (Value.getOperand(1).getOpcode() != ISD::Constant)
     return SDValue();
 
   SDValue N0 = Value.getOperand(0);
@@ -16696,8 +18308,8 @@ SDValue DAGCombiner::ReduceLoadOpStoreWidth(SDNode *N) {
     unsigned BitWidth = N1.getValueSizeInBits();
     APInt Imm = cast<ConstantSDNode>(N1)->getAPIntValue();
     if (Opc == ISD::AND)
-      Imm ^= APInt::getAllOnesValue(BitWidth);
-    if (Imm == 0 || Imm.isAllOnesValue())
+      Imm ^= APInt::getAllOnes(BitWidth);
+    if (Imm == 0 || Imm.isAllOnes())
       return SDValue();
     unsigned ShAmt = Imm.countTrailingZeros();
     unsigned MSB = BitWidth - Imm.countLeadingZeros() - 1;
@@ -16724,16 +18336,19 @@ SDValue DAGCombiner::ReduceLoadOpStoreWidth(SDNode *N) {
     if ((Imm & Mask) == Imm) {
       APInt NewImm = (Imm & Mask).lshr(ShAmt).trunc(NewBW);
       if (Opc == ISD::AND)
-        NewImm ^= APInt::getAllOnesValue(NewBW);
+        NewImm ^= APInt::getAllOnes(NewBW);
       uint64_t PtrOff = ShAmt / 8;
       // For big endian targets, we need to adjust the offset to the pointer to
       // load the correct bytes.
       if (DAG.getDataLayout().isBigEndian())
         PtrOff = (BitWidth + 7 - NewBW) / 8 - PtrOff;
 
+      unsigned IsFast = 0;
       Align NewAlign = commonAlignment(LD->getAlign(), PtrOff);
-      Type *NewVTTy = NewVT.getTypeForEVT(*DAG.getContext());
-      if (NewAlign < DAG.getDataLayout().getABITypeAlign(NewVTTy))
+      if (!TLI.allowsMemoryAccess(*DAG.getContext(), DAG.getDataLayout(), NewVT,
+                                  LD->getAddressSpace(), NewAlign,
+                                  LD->getMemOperand()->getFlags(), &IsFast) ||
+          !IsFast)
         return SDValue();
 
       SDValue NewPtr =
@@ -16787,27 +18402,26 @@ SDValue DAGCombiner::TransformFPLoadStorePair(SDNode *N) {
     if (VTSize.isScalable())
       return SDValue();
 
-    EVT IntVT = EVT::getIntegerVT(*DAG.getContext(), VTSize.getFixedSize());
+    unsigned FastLD = 0, FastST = 0;
+    EVT IntVT = EVT::getIntegerVT(*DAG.getContext(), VTSize.getFixedValue());
     if (!TLI.isOperationLegal(ISD::LOAD, IntVT) ||
         !TLI.isOperationLegal(ISD::STORE, IntVT) ||
         !TLI.isDesirableToTransformToIntegerOp(ISD::LOAD, VT) ||
-        !TLI.isDesirableToTransformToIntegerOp(ISD::STORE, VT))
-      return SDValue();
-
-    Align LDAlign = LD->getAlign();
-    Align STAlign = ST->getAlign();
-    Type *IntVTTy = IntVT.getTypeForEVT(*DAG.getContext());
-    Align ABIAlign = DAG.getDataLayout().getABITypeAlign(IntVTTy);
-    if (LDAlign < ABIAlign || STAlign < ABIAlign)
+        !TLI.isDesirableToTransformToIntegerOp(ISD::STORE, VT) ||
+        !TLI.allowsMemoryAccess(*DAG.getContext(), DAG.getDataLayout(), IntVT,
+                                *LD->getMemOperand(), &FastLD) ||
+        !TLI.allowsMemoryAccess(*DAG.getContext(), DAG.getDataLayout(), IntVT,
+                                *ST->getMemOperand(), &FastST) ||
+        !FastLD || !FastST)
       return SDValue();
 
     SDValue NewLD =
         DAG.getLoad(IntVT, SDLoc(Value), LD->getChain(), LD->getBasePtr(),
-                    LD->getPointerInfo(), LDAlign);
+                    LD->getPointerInfo(), LD->getAlign());
 
     SDValue NewST =
         DAG.getStore(ST->getChain(), SDLoc(N), NewLD, ST->getBasePtr(),
-                     ST->getPointerInfo(), STAlign);
+                     ST->getPointerInfo(), ST->getAlign());
 
     AddToWorklist(NewLD.getNode());
     AddToWorklist(NewST.getNode());
@@ -16833,13 +18447,14 @@ SDValue DAGCombiner::TransformFPLoadStorePair(SDNode *N) {
 //     (A + c1) * c3
 //     (A + c2) * c3
 // We're checking for cases where we have common "c3 * A" expressions.
-bool DAGCombiner::isMulAddWithConstProfitable(SDNode *MulNode,
-                                              SDValue &AddNode,
-                                              SDValue &ConstNode) {
+bool DAGCombiner::isMulAddWithConstProfitable(SDNode *MulNode, SDValue AddNode,
+                                              SDValue ConstNode) {
   APInt Val;
 
-  // If the add only has one use, this would be OK to do.
-  if (AddNode.getNode()->hasOneUse())
+  // If the add only has one use, and the target thinks the folding is
+  // profitable or does not lead to worse code, this would be OK to do.
+  if (AddNode->hasOneUse() &&
+      TLI.isMulAddWithConstProfitable(AddNode, ConstNode))
     return true;
 
   // Walk all the users of the constant with which we're multiplying.
@@ -16931,6 +18546,22 @@ bool DAGCombiner::mergeStoresOfConstantsOrVecElts(
   unsigned SizeInBits = NumStores * ElementSizeBits;
   unsigned NumMemElts = MemVT.isVector() ? MemVT.getVectorNumElements() : 1;
 
+  std::optional<MachineMemOperand::Flags> Flags;
+  AAMDNodes AAInfo;
+  for (unsigned I = 0; I != NumStores; ++I) {
+    StoreSDNode *St = cast<StoreSDNode>(StoreNodes[I].MemNode);
+    if (!Flags) {
+      Flags = St->getMemOperand()->getFlags();
+      AAInfo = St->getAAInfo();
+      continue;
+    }
+    // Skip merging if there's an inconsistent flag.
+    if (Flags != St->getMemOperand()->getFlags())
+      return false;
+    // Concatenate AA metadata.
+    AAInfo = AAInfo.concat(St->getAAInfo());
+  }
+
   EVT StoreTy;
   if (UseVector) {
     unsigned Elts = NumStores * NumMemElts;
@@ -16956,7 +18587,9 @@ bool DAGCombiner::mergeStoresOfConstantsOrVecElts(
             if (isa<ConstantFPSDNode>(Val)) {
               // Not clear how to truncate FP values.
               return false;
-            } else if (auto *C = dyn_cast<ConstantSDNode>(Val))
+            }
+
+            if (auto *C = dyn_cast<ConstantSDNode>(Val))
               Val = DAG.getConstant(C->getAPIntValue()
                                         .zextOrTrunc(Val.getValueSizeInBits())
                                         .zextOrTrunc(ElementSizeBits),
@@ -16988,6 +18621,9 @@ bool DAGCombiner::mergeStoresOfConstantsOrVecElts(
           // We may need to add a bitcast here to get types to line up.
           if (MemVTScalarTy != Val.getValueType().getScalarType()) {
             Val = DAG.getBitcast(MemVT, Val);
+          } else if (MemVT.isVector() &&
+                     Val.getOpcode() == ISD::EXTRACT_VECTOR_ELT) {
+            Val = DAG.getNode(ISD::BUILD_VECTOR, DL, MemVT, Val);
           } else {
             unsigned OpC = MemVT.isVector() ? ISD::EXTRACT_SUBVECTOR
                                             : ISD::EXTRACT_VECTOR_ELT;
@@ -17048,9 +18684,9 @@ bool DAGCombiner::mergeStoresOfConstantsOrVecElts(
   // make sure we use trunc store if it's necessary to be legal.
   SDValue NewStore;
   if (!UseTrunc) {
-    NewStore =
-        DAG.getStore(NewChain, DL, StoredVal, FirstInChain->getBasePtr(),
-                     FirstInChain->getPointerInfo(), FirstInChain->getAlign());
+    NewStore = DAG.getStore(NewChain, DL, StoredVal, FirstInChain->getBasePtr(),
+                            FirstInChain->getPointerInfo(),
+                            FirstInChain->getAlign(), *Flags, AAInfo);
   } else { // Must be realized as a trunc store
     EVT LegalizedStoredValTy =
         TLI.getTypeToTransformTo(*DAG.getContext(), StoredVal.getValueType());
@@ -17062,7 +18698,7 @@ bool DAGCombiner::mergeStoresOfConstantsOrVecElts(
     NewStore = DAG.getTruncStore(
         NewChain, DL, ExtendedStoreVal, FirstInChain->getBasePtr(),
         FirstInChain->getPointerInfo(), StoredVal.getValueType() /*TVT*/,
-        FirstInChain->getAlign(), FirstInChain->getMemOperand()->getFlags());
+        FirstInChain->getAlign(), *Flags, AAInfo);
   }
 
   // Replace all merged stores with the new store.
@@ -17218,6 +18854,10 @@ void DAGCombiner::getStoreMergeCandidates(
         for (auto I2 = (*I)->use_begin(), E2 = (*I)->use_end(); I2 != E2; ++I2)
           TryToAddCandidate(I2);
       }
+      // Check stores that depend on the root (e.g. Store 3 in the chart above).
+      if (I.getOperandNo() == 0 && isa<StoreSDNode>(*I)) {
+        TryToAddCandidate(I);
+      }
     }
   } else {
     for (auto I = RootNode->use_begin(), E = RootNode->use_end();
@@ -17226,11 +18866,9 @@ void DAGCombiner::getStoreMergeCandidates(
   }
 }
 
-// We need to check that merging these stores does not cause a loop in
-// the DAG. Any store candidate may depend on another candidate
-// indirectly through its operand (we already consider dependencies
-// through the chain). Check in parallel by searching up from
-// non-chain operands of candidates.
+// We need to check that merging these stores does not cause a loop in the
+// DAG. Any store candidate may depend on another candidate indirectly through
+// its operands. Check in parallel by searching up from operands of candidates.
 bool DAGCombiner::checkMergeStoreCandidatesForDependencies(
     SmallVectorImpl<MemOpLink> &StoreNodes, unsigned NumStores,
     SDNode *RootNode) {
@@ -17264,8 +18902,13 @@ bool DAGCombiner::checkMergeStoreCandidatesForDependencies(
     SDNode *N = StoreNodes[i].MemNode;
     // Of the 4 Store Operands:
     //   * Chain (Op 0) -> We have already considered these
-    //                    in candidate selection and can be
-    //                    safely ignored
+    //                     in candidate selection, but only by following the
+    //                     chain dependencies. We could still have a chain
+    //                     dependency to a load, that has a non-chain dep to
+    //                     another load, that depends on a store, etc. So it is
+    //                     possible to have dependencies that consist of a mix
+    //                     of chain and non-chain deps, and we need to include
+    //                     chain operands in the analysis here..
     //   * Value (Op 1) -> Cycles may happen (e.g. through load chains)
     //   * Address (Op 2) -> Merged addresses may only vary by a fixed constant,
     //                       but aren't necessarily fromt the same base node, so
@@ -17273,7 +18916,7 @@ bool DAGCombiner::checkMergeStoreCandidatesForDependencies(
     //   * (Op 3) -> Represents the pre or post-indexing offset (or undef for
     //               non-indexed stores). Not constant on all targets (e.g. ARM)
     //               and so can participate in a cycle.
-    for (unsigned j = 1; j < N->getNumOperands(); ++j)
+    for (unsigned j = 0; j < N->getNumOperands(); ++j)
       Worklist.push_back(N->getOperand(j).getNode());
   }
   // Search through DAG. We can stop early if we find a store node.
@@ -17348,7 +18991,7 @@ bool DAGCombiner::tryStoreMergeOfConstants(
   while (NumConsecutiveStores >= 2) {
     LSBaseSDNode *FirstInChain = StoreNodes[0].MemNode;
     unsigned FirstStoreAS = FirstInChain->getAddressSpace();
-    unsigned FirstStoreAlign = FirstInChain->getAlignment();
+    Align FirstStoreAlign = FirstInChain->getAlign();
     unsigned LastLegalType = 1;
     unsigned LastLegalVectorType = 1;
     bool LastIntegerTrunc = false;
@@ -17359,7 +19002,7 @@ bool DAGCombiner::tryStoreMergeOfConstants(
       SDValue StoredVal = ST->getValue();
       bool IsElementZero = false;
       if (ConstantSDNode *C = dyn_cast<ConstantSDNode>(StoredVal))
-        IsElementZero = C->isNullValue();
+        IsElementZero = C->isZero();
       else if (ConstantFPSDNode *C = dyn_cast<ConstantFPSDNode>(StoredVal))
         IsElementZero = C->getConstantFPValue()->isNullValue();
       if (IsElementZero) {
@@ -17371,14 +19014,15 @@ bool DAGCombiner::tryStoreMergeOfConstants(
       // Find a legal type for the constant store.
       unsigned SizeInBits = (i + 1) * ElementSizeBytes * 8;
       EVT StoreTy = EVT::getIntegerVT(Context, SizeInBits);
-      bool IsFast = false;
+      unsigned IsFast = 0;
 
       // Break early when size is too large to be legal.
       if (StoreTy.getSizeInBits() > MaximumLegalStoreInBits)
         break;
 
       if (TLI.isTypeLegal(StoreTy) &&
-          TLI.canMergeStoresTo(FirstStoreAS, StoreTy, DAG) &&
+          TLI.canMergeStoresTo(FirstStoreAS, StoreTy,
+                               DAG.getMachineFunction()) &&
           TLI.allowsMemoryAccess(Context, DL, StoreTy,
                                  *FirstInChain->getMemOperand(), &IsFast) &&
           IsFast) {
@@ -17390,7 +19034,8 @@ bool DAGCombiner::tryStoreMergeOfConstants(
         EVT LegalizedStoredValTy =
             TLI.getTypeToTransformTo(Context, StoredVal.getValueType());
         if (TLI.isTruncStoreLegal(LegalizedStoredValTy, StoreTy) &&
-            TLI.canMergeStoresTo(FirstStoreAS, LegalizedStoredValTy, DAG) &&
+            TLI.canMergeStoresTo(FirstStoreAS, LegalizedStoredValTy,
+                                 DAG.getMachineFunction()) &&
             TLI.allowsMemoryAccess(Context, DL, StoreTy,
                                    *FirstInChain->getMemOperand(), &IsFast) &&
             IsFast) {
@@ -17409,7 +19054,7 @@ bool DAGCombiner::tryStoreMergeOfConstants(
         unsigned Elts = (i + 1) * NumMemElts;
         EVT Ty = EVT::getVectorVT(Context, MemVT.getScalarType(), Elts);
         if (TLI.isTypeLegal(Ty) && TLI.isTypeLegal(MemVT) &&
-            TLI.canMergeStoresTo(FirstStoreAS, Ty, DAG) &&
+            TLI.canMergeStoresTo(FirstStoreAS, Ty, DAG.getMachineFunction()) &&
             TLI.allowsMemoryAccess(Context, DL, Ty,
                                    *FirstInChain->getMemOperand(), &IsFast) &&
             IsFast)
@@ -17434,7 +19079,7 @@ bool DAGCombiner::tryStoreMergeOfConstants(
       unsigned NumSkip = 1;
       while ((NumSkip < NumConsecutiveStores) &&
              (NumSkip < FirstZeroAfterNonZero) &&
-             (StoreNodes[NumSkip].MemNode->getAlignment() <= FirstStoreAlign))
+             (StoreNodes[NumSkip].MemNode->getAlign() <= FirstStoreAlign))
         NumSkip++;
 
       StoreNodes.erase(StoreNodes.begin(), StoreNodes.begin() + NumSkip);
@@ -17473,19 +19118,20 @@ bool DAGCombiner::tryStoreMergeOfExtracts(
   while (NumConsecutiveStores >= 2) {
     LSBaseSDNode *FirstInChain = StoreNodes[0].MemNode;
     unsigned FirstStoreAS = FirstInChain->getAddressSpace();
-    unsigned FirstStoreAlign = FirstInChain->getAlignment();
+    Align FirstStoreAlign = FirstInChain->getAlign();
     unsigned NumStoresToMerge = 1;
     for (unsigned i = 0; i < NumConsecutiveStores; ++i) {
       // Find a legal type for the vector store.
       unsigned Elts = (i + 1) * NumMemElts;
       EVT Ty = EVT::getVectorVT(*DAG.getContext(), MemVT.getScalarType(), Elts);
-      bool IsFast = false;
+      unsigned IsFast = 0;
 
       // Break early when size is too large to be legal.
       if (Ty.getSizeInBits() > MaximumLegalStoreInBits)
         break;
 
-      if (TLI.isTypeLegal(Ty) && TLI.canMergeStoresTo(FirstStoreAS, Ty, DAG) &&
+      if (TLI.isTypeLegal(Ty) &&
+          TLI.canMergeStoresTo(FirstStoreAS, Ty, DAG.getMachineFunction()) &&
           TLI.allowsMemoryAccess(Context, DL, Ty,
                                  *FirstInChain->getMemOperand(), &IsFast) &&
           IsFast)
@@ -17503,7 +19149,7 @@ bool DAGCombiner::tryStoreMergeOfExtracts(
       // improved. Drop as many candidates as we can here.
       unsigned NumSkip = 1;
       while ((NumSkip < NumConsecutiveStores) &&
-             (StoreNodes[NumSkip].MemNode->getAlignment() <= FirstStoreAlign))
+             (StoreNodes[NumSkip].MemNode->getAlign() <= FirstStoreAlign))
         NumSkip++;
 
       StoreNodes.erase(StoreNodes.begin(), StoreNodes.begin() + NumSkip);
@@ -17631,10 +19277,15 @@ bool DAGCombiner::tryStoreMergeOfLoads(SmallVectorImpl<MemOpLink> &StoreNodes,
       if (StoreTy.getSizeInBits() > MaximumLegalStoreInBits)
         break;
 
-      bool IsFastSt = false;
-      bool IsFastLd = false;
-      if (TLI.isTypeLegal(StoreTy) &&
-          TLI.canMergeStoresTo(FirstStoreAS, StoreTy, DAG) &&
+      unsigned IsFastSt = 0;
+      unsigned IsFastLd = 0;
+      // Don't try vector types if we need a rotate. We may still fail the
+      // legality checks for the integer type, but we can't handle the rotate
+      // case with vectors.
+      // FIXME: We could use a shuffle in place of the rotate.
+      if (!NeedRotate && TLI.isTypeLegal(StoreTy) &&
+          TLI.canMergeStoresTo(FirstStoreAS, StoreTy,
+                               DAG.getMachineFunction()) &&
           TLI.allowsMemoryAccess(Context, DL, StoreTy,
                                  *FirstInChain->getMemOperand(), &IsFastSt) &&
           IsFastSt &&
@@ -17648,7 +19299,8 @@ bool DAGCombiner::tryStoreMergeOfLoads(SmallVectorImpl<MemOpLink> &StoreNodes,
       unsigned SizeInBits = (i + 1) * ElementSizeBytes * 8;
       StoreTy = EVT::getIntegerVT(Context, SizeInBits);
       if (TLI.isTypeLegal(StoreTy) &&
-          TLI.canMergeStoresTo(FirstStoreAS, StoreTy, DAG) &&
+          TLI.canMergeStoresTo(FirstStoreAS, StoreTy,
+                               DAG.getMachineFunction()) &&
           TLI.allowsMemoryAccess(Context, DL, StoreTy,
                                  *FirstInChain->getMemOperand(), &IsFastSt) &&
           IsFastSt &&
@@ -17662,7 +19314,8 @@ bool DAGCombiner::tryStoreMergeOfLoads(SmallVectorImpl<MemOpLink> &StoreNodes,
                  TargetLowering::TypePromoteInteger) {
         EVT LegalizedStoredValTy = TLI.getTypeToTransformTo(Context, StoreTy);
         if (TLI.isTruncStoreLegal(LegalizedStoredValTy, StoreTy) &&
-            TLI.canMergeStoresTo(FirstStoreAS, LegalizedStoredValTy, DAG) &&
+            TLI.canMergeStoresTo(FirstStoreAS, LegalizedStoredValTy,
+                                 DAG.getMachineFunction()) &&
             TLI.isLoadExtLegal(ISD::ZEXTLOAD, LegalizedStoredValTy, StoreTy) &&
             TLI.isLoadExtLegal(ISD::SEXTLOAD, LegalizedStoredValTy, StoreTy) &&
             TLI.isLoadExtLegal(ISD::EXTLOAD, LegalizedStoredValTy, StoreTy) &&
@@ -17793,7 +19446,7 @@ bool DAGCombiner::tryStoreMergeOfLoads(SmallVectorImpl<MemOpLink> &StoreNodes,
     for (unsigned i = 0; i < NumElem; ++i) {
       SDValue Val = StoreNodes[i].MemNode->getOperand(1);
       CombineTo(StoreNodes[i].MemNode, NewStore);
-      if (Val.getNode()->use_empty())
+      if (Val->use_empty())
         recursivelyDeleteUnusedNodes(Val.getNode());
     }
 
@@ -17943,6 +19596,7 @@ SDValue DAGCombiner::replaceStoreOfFPConstant(StoreSDNode *ST) {
   default:
     llvm_unreachable("Unknown FP type");
   case MVT::f16:    // We don't do this for these yet.
+  case MVT::bf16:
   case MVT::f80:
   case MVT::f128:
   case MVT::ppcf128:
@@ -17950,7 +19604,6 @@ SDValue DAGCombiner::replaceStoreOfFPConstant(StoreSDNode *ST) {
   case MVT::f32:
     if ((isTypeLegal(MVT::i32) && !LegalOperations && ST->isSimple()) ||
         TLI.isOperationLegalOrCustom(ISD::STORE, MVT::i32)) {
-      ;
       Tmp = DAG.getConstant((uint32_t)CFP->getValueAPF().
                             bitcastToAPInt().getZExtValue(), SDLoc(CFP),
                             MVT::i32);
@@ -17962,7 +19615,6 @@ SDValue DAGCombiner::replaceStoreOfFPConstant(StoreSDNode *ST) {
     if ((TLI.isTypeLegal(MVT::i64) && !LegalOperations &&
          ST->isSimple()) ||
         TLI.isOperationLegalOrCustom(ISD::STORE, MVT::i64)) {
-      ;
       Tmp = DAG.getConstant(CFP->getValueAPF().bitcastToAPInt().
                             getZExtValue(), SDLoc(CFP), MVT::i64);
       return DAG.getStore(Chain, DL, Tmp,
@@ -18068,20 +19720,22 @@ SDValue DAGCombiner::visitSTORE(SDNode *N) {
       Value.getValueType().isInteger() &&
       (!isa<ConstantSDNode>(Value) ||
        !cast<ConstantSDNode>(Value)->isOpaque())) {
+    // Convert a truncating store of a extension into a standard store.
+    if ((Value.getOpcode() == ISD::ZERO_EXTEND ||
+         Value.getOpcode() == ISD::SIGN_EXTEND ||
+         Value.getOpcode() == ISD::ANY_EXTEND) &&
+        Value.getOperand(0).getValueType() == ST->getMemoryVT() &&
+        TLI.isOperationLegalOrCustom(ISD::STORE, ST->getMemoryVT()))
+      return DAG.getStore(Chain, SDLoc(N), Value.getOperand(0), Ptr,
+                          ST->getMemOperand());
+
     APInt TruncDemandedBits =
         APInt::getLowBitsSet(Value.getScalarValueSizeInBits(),
                              ST->getMemoryVT().getScalarSizeInBits());
 
-    // See if we can simplify the input to this truncstore with knowledge that
-    // only the low bits are being used.  For example:
-    // "truncstore (or (shl x, 8), y), i8"  -> "truncstore y, i8"
+    // See if we can simplify the operation with SimplifyDemandedBits, which
+    // only works if the value has a single use.
     AddToWorklist(Value.getNode());
-    if (SDValue Shorter = DAG.GetDemandedBits(Value, TruncDemandedBits))
-      return DAG.getTruncStore(Chain, SDLoc(N), Shorter, Ptr, ST->getMemoryVT(),
-                               ST->getMemOperand());
-
-    // Otherwise, see if we can simplify the operation with
-    // SimplifyDemandedBits, which only works if the value has a single use.
     if (SimplifyDemandedBits(Value, TruncDemandedBits)) {
       // Re-visit the store if anything changed and the store hasn't been merged
       // with another node (N is deleted) SimplifyDemandedBits will add Value's
@@ -18091,6 +19745,28 @@ SDValue DAGCombiner::visitSTORE(SDNode *N) {
         AddToWorklist(N);
       return SDValue(N, 0);
     }
+
+    // Otherwise, see if we can simplify the input to this truncstore with
+    // knowledge that only the low bits are being used.  For example:
+    // "truncstore (or (shl x, 8), y), i8"  -> "truncstore y, i8"
+    if (SDValue Shorter =
+            TLI.SimplifyMultipleUseDemandedBits(Value, TruncDemandedBits, DAG))
+      return DAG.getTruncStore(Chain, SDLoc(N), Shorter, Ptr, ST->getMemoryVT(),
+                               ST->getMemOperand());
+
+    // If we're storing a truncated constant, see if we can simplify it.
+    // TODO: Move this to targetShrinkDemandedConstant?
+    if (auto *Cst = dyn_cast<ConstantSDNode>(Value))
+      if (!Cst->isOpaque()) {
+        const APInt &CValue = Cst->getAPIntValue();
+        APInt NewVal = CValue & TruncDemandedBits;
+        if (NewVal != CValue) {
+          SDValue Shorter =
+              DAG.getConstant(NewVal, SDLoc(N), Value.getValueType());
+          return DAG.getTruncStore(Chain, SDLoc(N), Shorter, Ptr,
+                                   ST->getMemoryVT(), ST->getMemOperand());
+        }
+      }
   }
 
   // If this is a load followed by a store to the same location, then the store
@@ -18112,8 +19788,8 @@ SDValue DAGCombiner::visitSTORE(SDNode *N) {
   if (StoreSDNode *ST1 = dyn_cast<StoreSDNode>(Chain)) {
     if (ST->isUnindexed() && ST->isSimple() &&
         ST1->isUnindexed() && ST1->isSimple()) {
-      if (ST1->getBasePtr() == Ptr && ST1->getValue() == Value &&
-          ST->getMemoryVT() == ST1->getMemoryVT() &&
+      if (OptLevel != CodeGenOpt::None && ST1->getBasePtr() == Ptr &&
+          ST1->getValue() == Value && ST->getMemoryVT() == ST1->getMemoryVT() &&
           ST->getAddressSpace() == ST1->getAddressSpace()) {
         // If this is a store followed by a store with the same value to the
         // same location, then the store is dead/noop.
@@ -18147,7 +19823,7 @@ SDValue DAGCombiner::visitSTORE(SDNode *N) {
   // truncating store.  We can do this even if this is already a truncstore.
   if ((Value.getOpcode() == ISD::FP_ROUND ||
        Value.getOpcode() == ISD::TRUNCATE) &&
-      Value.getNode()->hasOneUse() && ST->isUnindexed() &&
+      Value->hasOneUse() && ST->isUnindexed() &&
       TLI.canCombineTruncStore(Value.getOperand(0).getValueType(),
                                ST->getMemoryVT(), LegalOperations)) {
     return DAG.getTruncStore(Chain, SDLoc(N), Value.getOperand(0),
@@ -18214,7 +19890,7 @@ SDValue DAGCombiner::visitLIFETIME_END(SDNode *N) {
     case ISD::LIFETIME_END:
       // We can forward past any lifetime start/end that can be proven not to
       // alias the node.
-      if (!isAlias(Chain.getNode(), N))
+      if (!mayAlias(Chain.getNode(), N))
         Chains.push_back(Chain.getOperand(0));
       break;
     case ISD::STORE: {
@@ -18231,7 +19907,7 @@ SDValue DAGCombiner::visitLIFETIME_END(SDNode *N) {
       // If we store purely within object bounds just before its lifetime ends,
       // we can remove the store.
       if (LifetimeEndBase.contains(DAG, LifetimeEnd->getSize() * 8, StoreBase,
-                                   StoreSize.getFixedSize() * 8)) {
+                                   StoreSize.getFixedValue() * 8)) {
         LLVM_DEBUG(dbgs() << "\nRemoving store:"; StoreBase.dump();
                    dbgs() << "\nwithin LIFETIME_END of : ";
                    LifetimeEndBase.dump(); dbgs() << "\n");
@@ -18351,86 +20027,113 @@ SDValue DAGCombiner::splitMergedValStore(StoreSDNode *ST) {
   return St1;
 }
 
-/// Convert a disguised subvector insertion into a shuffle:
-SDValue DAGCombiner::combineInsertEltToShuffle(SDNode *N, unsigned InsIndex) {
-  assert(N->getOpcode() == ISD::INSERT_VECTOR_ELT &&
-         "Expected extract_vector_elt");
-  SDValue InsertVal = N->getOperand(1);
-  SDValue Vec = N->getOperand(0);
+// Merge an insertion into an existing shuffle:
+// (insert_vector_elt (vector_shuffle X, Y, Mask),
+//                   .(extract_vector_elt X, N), InsIndex)
+//   --> (vector_shuffle X, Y, NewMask)
+//  and variations where shuffle operands may be CONCAT_VECTORS.
+static bool mergeEltWithShuffle(SDValue &X, SDValue &Y, ArrayRef<int> Mask,
+                                SmallVectorImpl<int> &NewMask, SDValue Elt,
+                                unsigned InsIndex) {
+  if (Elt.getOpcode() != ISD::EXTRACT_VECTOR_ELT ||
+      !isa<ConstantSDNode>(Elt.getOperand(1)))
+    return false;
 
-  // (insert_vector_elt (vector_shuffle X, Y), (extract_vector_elt X, N),
-  // InsIndex)
-  //   --> (vector_shuffle X, Y) and variations where shuffle operands may be
-  //   CONCAT_VECTORS.
-  if (Vec.getOpcode() == ISD::VECTOR_SHUFFLE && Vec.hasOneUse() &&
-      InsertVal.getOpcode() == ISD::EXTRACT_VECTOR_ELT &&
-      isa<ConstantSDNode>(InsertVal.getOperand(1))) {
-    ShuffleVectorSDNode *SVN = cast<ShuffleVectorSDNode>(Vec.getNode());
-    ArrayRef<int> Mask = SVN->getMask();
+  // Vec's operand 0 is using indices from 0 to N-1 and
+  // operand 1 from N to 2N - 1, where N is the number of
+  // elements in the vectors.
+  SDValue InsertVal0 = Elt.getOperand(0);
+  int ElementOffset = -1;
+
+  // We explore the inputs of the shuffle in order to see if we find the
+  // source of the extract_vector_elt. If so, we can use it to modify the
+  // shuffle rather than perform an insert_vector_elt.
+  SmallVector<std::pair<int, SDValue>, 8> ArgWorkList;
+  ArgWorkList.emplace_back(Mask.size(), Y);
+  ArgWorkList.emplace_back(0, X);
+
+  while (!ArgWorkList.empty()) {
+    int ArgOffset;
+    SDValue ArgVal;
+    std::tie(ArgOffset, ArgVal) = ArgWorkList.pop_back_val();
+
+    if (ArgVal == InsertVal0) {
+      ElementOffset = ArgOffset;
+      break;
+    }
 
-    SDValue X = Vec.getOperand(0);
-    SDValue Y = Vec.getOperand(1);
-
-    // Vec's operand 0 is using indices from 0 to N-1 and
-    // operand 1 from N to 2N - 1, where N is the number of
-    // elements in the vectors.
-    SDValue InsertVal0 = InsertVal.getOperand(0);
-    int ElementOffset = -1;
-
-    // We explore the inputs of the shuffle in order to see if we find the
-    // source of the extract_vector_elt. If so, we can use it to modify the
-    // shuffle rather than perform an insert_vector_elt.
-    SmallVector<std::pair<int, SDValue>, 8> ArgWorkList;
-    ArgWorkList.emplace_back(Mask.size(), Y);
-    ArgWorkList.emplace_back(0, X);
-
-    while (!ArgWorkList.empty()) {
-      int ArgOffset;
-      SDValue ArgVal;
-      std::tie(ArgOffset, ArgVal) = ArgWorkList.pop_back_val();
-
-      if (ArgVal == InsertVal0) {
-        ElementOffset = ArgOffset;
-        break;
+    // Peek through concat_vector.
+    if (ArgVal.getOpcode() == ISD::CONCAT_VECTORS) {
+      int CurrentArgOffset =
+          ArgOffset + ArgVal.getValueType().getVectorNumElements();
+      int Step = ArgVal.getOperand(0).getValueType().getVectorNumElements();
+      for (SDValue Op : reverse(ArgVal->ops())) {
+        CurrentArgOffset -= Step;
+        ArgWorkList.emplace_back(CurrentArgOffset, Op);
       }
 
-      // Peek through concat_vector.
-      if (ArgVal.getOpcode() == ISD::CONCAT_VECTORS) {
-        int CurrentArgOffset =
-            ArgOffset + ArgVal.getValueType().getVectorNumElements();
-        int Step = ArgVal.getOperand(0).getValueType().getVectorNumElements();
-        for (SDValue Op : reverse(ArgVal->ops())) {
-          CurrentArgOffset -= Step;
-          ArgWorkList.emplace_back(CurrentArgOffset, Op);
-        }
-
-        // Make sure we went through all the elements and did not screw up index
-        // computation.
-        assert(CurrentArgOffset == ArgOffset);
-      }
+      // Make sure we went through all the elements and did not screw up index
+      // computation.
+      assert(CurrentArgOffset == ArgOffset);
     }
+  }
 
-    if (ElementOffset != -1) {
-      SmallVector<int, 16> NewMask(Mask.begin(), Mask.end());
+  // If we failed to find a match, see if we can replace an UNDEF shuffle
+  // operand.
+  if (ElementOffset == -1) {
+    if (!Y.isUndef() || InsertVal0.getValueType() != Y.getValueType())
+      return false;
+    ElementOffset = Mask.size();
+    Y = InsertVal0;
+  }
 
-      auto *ExtrIndex = cast<ConstantSDNode>(InsertVal.getOperand(1));
-      NewMask[InsIndex] = ElementOffset + ExtrIndex->getZExtValue();
-      assert(NewMask[InsIndex] <
-                 (int)(2 * Vec.getValueType().getVectorNumElements()) &&
-             NewMask[InsIndex] >= 0 && "NewMask[InsIndex] is out of bound");
+  NewMask.assign(Mask.begin(), Mask.end());
+  NewMask[InsIndex] = ElementOffset + Elt.getConstantOperandVal(1);
+  assert(NewMask[InsIndex] < (int)(2 * Mask.size()) && NewMask[InsIndex] >= 0 &&
+         "NewMask[InsIndex] is out of bound");
+  return true;
+}
 
-      SDValue LegalShuffle =
-              TLI.buildLegalVectorShuffle(Vec.getValueType(), SDLoc(N), X,
-                                          Y, NewMask, DAG);
-      if (LegalShuffle)
-        return LegalShuffle;
-    }
+// Merge an insertion into an existing shuffle:
+// (insert_vector_elt (vector_shuffle X, Y), (extract_vector_elt X, N),
+// InsIndex)
+//   --> (vector_shuffle X, Y) and variations where shuffle operands may be
+//   CONCAT_VECTORS.
+SDValue DAGCombiner::mergeInsertEltWithShuffle(SDNode *N, unsigned InsIndex) {
+  assert(N->getOpcode() == ISD::INSERT_VECTOR_ELT &&
+         "Expected extract_vector_elt");
+  SDValue InsertVal = N->getOperand(1);
+  SDValue Vec = N->getOperand(0);
+
+  auto *SVN = dyn_cast<ShuffleVectorSDNode>(Vec);
+  if (!SVN || !Vec.hasOneUse())
+    return SDValue();
+
+  ArrayRef<int> Mask = SVN->getMask();
+  SDValue X = Vec.getOperand(0);
+  SDValue Y = Vec.getOperand(1);
+
+  SmallVector<int, 16> NewMask(Mask);
+  if (mergeEltWithShuffle(X, Y, Mask, NewMask, InsertVal, InsIndex)) {
+    SDValue LegalShuffle = TLI.buildLegalVectorShuffle(
+        Vec.getValueType(), SDLoc(N), X, Y, NewMask, DAG);
+    if (LegalShuffle)
+      return LegalShuffle;
   }
 
-  // insert_vector_elt V, (bitcast X from vector type), IdxC -->
-  // bitcast(shuffle (bitcast V), (extended X), Mask)
-  // Note: We do not use an insert_subvector node because that requires a
-  // legal subvector type.
+  return SDValue();
+}
+
+// Convert a disguised subvector insertion into a shuffle:
+// insert_vector_elt V, (bitcast X from vector type), IdxC -->
+// bitcast(shuffle (bitcast V), (extended X), Mask)
+// Note: We do not use an insert_subvector node because that requires a
+// legal subvector type.
+SDValue DAGCombiner::combineInsertEltToShuffle(SDNode *N, unsigned InsIndex) {
+  assert(N->getOpcode() == ISD::INSERT_VECTOR_ELT &&
+         "Expected extract_vector_elt");
+  SDValue InsertVal = N->getOperand(1);
+
   if (InsertVal.getOpcode() != ISD::BITCAST || !InsertVal.hasOneUse() ||
       !InsertVal.getOperand(0).getValueType().isVector())
     return SDValue();
@@ -18505,14 +20208,8 @@ SDValue DAGCombiner::visitINSERT_VECTOR_ELT(SDNode *N) {
   if (!IndexC) {
     // If this is variable insert to undef vector, it might be better to splat:
     // inselt undef, InVal, EltNo --> build_vector < InVal, InVal, ... >
-    if (InVec.isUndef() && TLI.shouldSplatInsEltVarIndex(VT)) {
-      if (VT.isScalableVector())
-        return DAG.getSplatVector(VT, DL, InVal);
-      else {
-        SmallVector<SDValue, 8> Ops(VT.getVectorNumElements(), InVal);
-        return DAG.getBuildVector(VT, DL, Ops);
-      }
-    }
+    if (InVec.isUndef() && TLI.shouldSplatInsEltVarIndex(VT))
+      return DAG.getSplat(VT, DL, InVal);
     return SDValue();
   }
 
@@ -18523,8 +20220,15 @@ SDValue DAGCombiner::visitINSERT_VECTOR_ELT(SDNode *N) {
 
   // We must know which element is being inserted for folds below here.
   unsigned Elt = IndexC->getZExtValue();
-  if (SDValue Shuf = combineInsertEltToShuffle(N, Elt))
-    return Shuf;
+
+  // Handle <1 x ???> vector insertion special cases.
+  if (NumElts == 1) {
+    // insert_vector_elt(x, extract_vector_elt(y, 0), 0) -> y
+    if (InVal.getOpcode() == ISD::EXTRACT_VECTOR_ELT &&
+        InVal.getOperand(0).getValueType() == VT &&
+        isNullConstant(InVal.getOperand(1)))
+      return InVal.getOperand(0);
+  }
 
   // Canonicalize insert_vector_elt dag nodes.
   // Example:
@@ -18546,36 +20250,130 @@ SDValue DAGCombiner::visitINSERT_VECTOR_ELT(SDNode *N) {
     }
   }
 
-  // If we can't generate a legal BUILD_VECTOR, exit
-  if (LegalOperations && !TLI.isOperationLegal(ISD::BUILD_VECTOR, VT))
-    return SDValue();
+  if (SDValue Shuf = mergeInsertEltWithShuffle(N, Elt))
+    return Shuf;
+
+  if (SDValue Shuf = combineInsertEltToShuffle(N, Elt))
+    return Shuf;
+
+  // Attempt to convert an insert_vector_elt chain into a legal build_vector.
+  if (!LegalOperations || TLI.isOperationLegal(ISD::BUILD_VECTOR, VT)) {
+    // vXi1 vector - we don't need to recurse.
+    if (NumElts == 1)
+      return DAG.getBuildVector(VT, DL, {InVal});
+
+    // If we haven't already collected the element, insert into the op list.
+    EVT MaxEltVT = InVal.getValueType();
+    auto AddBuildVectorOp = [&](SmallVectorImpl<SDValue> &Ops, SDValue Elt,
+                                unsigned Idx) {
+      if (!Ops[Idx]) {
+        Ops[Idx] = Elt;
+        if (VT.isInteger()) {
+          EVT EltVT = Elt.getValueType();
+          MaxEltVT = MaxEltVT.bitsGE(EltVT) ? MaxEltVT : EltVT;
+        }
+      }
+    };
+
+    // Ensure all the operands are the same value type, fill any missing
+    // operands with UNDEF and create the BUILD_VECTOR.
+    auto CanonicalizeBuildVector = [&](SmallVectorImpl<SDValue> &Ops) {
+      assert(Ops.size() == NumElts && "Unexpected vector size");
+      for (SDValue &Op : Ops) {
+        if (Op)
+          Op = VT.isInteger() ? DAG.getAnyExtOrTrunc(Op, DL, MaxEltVT) : Op;
+        else
+          Op = DAG.getUNDEF(MaxEltVT);
+      }
+      return DAG.getBuildVector(VT, DL, Ops);
+    };
+
+    SmallVector<SDValue, 8> Ops(NumElts, SDValue());
+    Ops[Elt] = InVal;
+
+    // Recurse up a INSERT_VECTOR_ELT chain to build a BUILD_VECTOR.
+    for (SDValue CurVec = InVec; CurVec;) {
+      // UNDEF - build new BUILD_VECTOR from already inserted operands.
+      if (CurVec.isUndef())
+        return CanonicalizeBuildVector(Ops);
+
+      // BUILD_VECTOR - insert unused operands and build new BUILD_VECTOR.
+      if (CurVec.getOpcode() == ISD::BUILD_VECTOR && CurVec.hasOneUse()) {
+        for (unsigned I = 0; I != NumElts; ++I)
+          AddBuildVectorOp(Ops, CurVec.getOperand(I), I);
+        return CanonicalizeBuildVector(Ops);
+      }
+
+      // SCALAR_TO_VECTOR - insert unused scalar and build new BUILD_VECTOR.
+      if (CurVec.getOpcode() == ISD::SCALAR_TO_VECTOR && CurVec.hasOneUse()) {
+        AddBuildVectorOp(Ops, CurVec.getOperand(0), 0);
+        return CanonicalizeBuildVector(Ops);
+      }
+
+      // INSERT_VECTOR_ELT - insert operand and continue up the chain.
+      if (CurVec.getOpcode() == ISD::INSERT_VECTOR_ELT && CurVec.hasOneUse())
+        if (auto *CurIdx = dyn_cast<ConstantSDNode>(CurVec.getOperand(2)))
+          if (CurIdx->getAPIntValue().ult(NumElts)) {
+            unsigned Idx = CurIdx->getZExtValue();
+            AddBuildVectorOp(Ops, CurVec.getOperand(1), Idx);
+
+            // Found entire BUILD_VECTOR.
+            if (all_of(Ops, [](SDValue Op) { return !!Op; }))
+              return CanonicalizeBuildVector(Ops);
+
+            CurVec = CurVec->getOperand(0);
+            continue;
+          }
+
+      // VECTOR_SHUFFLE - if all the operands match the shuffle's sources,
+      // update the shuffle mask (and second operand if we started with unary
+      // shuffle) and create a new legal shuffle.
+      if (CurVec.getOpcode() == ISD::VECTOR_SHUFFLE && CurVec.hasOneUse()) {
+        auto *SVN = cast<ShuffleVectorSDNode>(CurVec);
+        SDValue LHS = SVN->getOperand(0);
+        SDValue RHS = SVN->getOperand(1);
+        SmallVector<int, 16> Mask(SVN->getMask());
+        bool Merged = true;
+        for (auto I : enumerate(Ops)) {
+          SDValue &Op = I.value();
+          if (Op) {
+            SmallVector<int, 16> NewMask;
+            if (!mergeEltWithShuffle(LHS, RHS, Mask, NewMask, Op, I.index())) {
+              Merged = false;
+              break;
+            }
+            Mask = std::move(NewMask);
+          }
+        }
+        if (Merged)
+          if (SDValue NewShuffle =
+                  TLI.buildLegalVectorShuffle(VT, DL, LHS, RHS, Mask, DAG))
+            return NewShuffle;
+      }
+
+      // Failed to find a match in the chain - bail.
+      break;
+    }
+
+    // See if we can fill in the missing constant elements as zeros.
+    // TODO: Should we do this for any constant?
+    APInt DemandedZeroElts = APInt::getZero(NumElts);
+    for (unsigned I = 0; I != NumElts; ++I)
+      if (!Ops[I])
+        DemandedZeroElts.setBit(I);
 
-  // Check that the operand is a BUILD_VECTOR (or UNDEF, which can essentially
-  // be converted to a BUILD_VECTOR).  Fill in the Ops vector with the
-  // vector elements.
-  SmallVector<SDValue, 8> Ops;
-  // Do not combine these two vectors if the output vector will not replace
-  // the input vector.
-  if (InVec.getOpcode() == ISD::BUILD_VECTOR && InVec.hasOneUse()) {
-    Ops.append(InVec.getNode()->op_begin(),
-               InVec.getNode()->op_end());
-  } else if (InVec.isUndef()) {
-    Ops.append(NumElts, DAG.getUNDEF(InVal.getValueType()));
-  } else {
-    return SDValue();
-  }
-  assert(Ops.size() == NumElts && "Unexpected vector size");
+    if (DAG.MaskedVectorIsZero(InVec, DemandedZeroElts)) {
+      SDValue Zero = VT.isInteger() ? DAG.getConstant(0, DL, MaxEltVT)
+                                    : DAG.getConstantFP(0, DL, MaxEltVT);
+      for (unsigned I = 0; I != NumElts; ++I)
+        if (!Ops[I])
+          Ops[I] = Zero;
 
-  // Insert the element
-  if (Elt < Ops.size()) {
-    // All the operands of BUILD_VECTOR must have the same type;
-    // we enforce that here.
-    EVT OpVT = Ops[0].getValueType();
-    Ops[Elt] = OpVT.isInteger() ? DAG.getAnyExtOrTrunc(InVal, DL, OpVT) : InVal;
+      return CanonicalizeBuildVector(Ops);
+    }
   }
 
-  // Return the new vector
-  return DAG.getBuildVector(VT, DL, Ops);
+  return SDValue();
 }
 
 SDValue DAGCombiner::scalarizeExtractedVectorLoad(SDNode *EVE, EVT InVecVT,
@@ -18592,76 +20390,65 @@ SDValue DAGCombiner::scalarizeExtractedVectorLoad(SDNode *EVE, EVT InVecVT,
   if (!VecEltVT.isByteSized())
     return SDValue();
 
-  Align Alignment = OriginalLoad->getAlign();
-  Align NewAlign = DAG.getDataLayout().getABITypeAlign(
-      VecEltVT.getTypeForEVT(*DAG.getContext()));
-
-  if (NewAlign > Alignment ||
-      !TLI.isOperationLegalOrCustom(ISD::LOAD, VecEltVT))
-    return SDValue();
-
-  ISD::LoadExtType ExtTy = ResultVT.bitsGT(VecEltVT) ?
-    ISD::NON_EXTLOAD : ISD::EXTLOAD;
-  if (!TLI.shouldReduceLoadWidth(OriginalLoad, ExtTy, VecEltVT))
+  ISD::LoadExtType ExtTy =
+      ResultVT.bitsGT(VecEltVT) ? ISD::NON_EXTLOAD : ISD::EXTLOAD;
+  if (!TLI.isOperationLegalOrCustom(ISD::LOAD, VecEltVT) ||
+      !TLI.shouldReduceLoadWidth(OriginalLoad, ExtTy, VecEltVT))
     return SDValue();
 
-  Alignment = NewAlign;
-
+  Align Alignment = OriginalLoad->getAlign();
   MachinePointerInfo MPI;
   SDLoc DL(EVE);
   if (auto *ConstEltNo = dyn_cast<ConstantSDNode>(EltNo)) {
     int Elt = ConstEltNo->getZExtValue();
     unsigned PtrOff = VecEltVT.getSizeInBits() * Elt / 8;
     MPI = OriginalLoad->getPointerInfo().getWithOffset(PtrOff);
+    Alignment = commonAlignment(Alignment, PtrOff);
   } else {
     // Discard the pointer info except the address space because the memory
     // operand can't represent this new access since the offset is variable.
     MPI = MachinePointerInfo(OriginalLoad->getPointerInfo().getAddrSpace());
+    Alignment = commonAlignment(Alignment, VecEltVT.getSizeInBits() / 8);
   }
+
+  unsigned IsFast = 0;
+  if (!TLI.allowsMemoryAccess(*DAG.getContext(), DAG.getDataLayout(), VecEltVT,
+                              OriginalLoad->getAddressSpace(), Alignment,
+                              OriginalLoad->getMemOperand()->getFlags(),
+                              &IsFast) ||
+      !IsFast)
+    return SDValue();
+
   SDValue NewPtr = TLI.getVectorElementPointer(DAG, OriginalLoad->getBasePtr(),
                                                InVecVT, EltNo);
 
-  // The replacement we need to do here is a little tricky: we need to
-  // replace an extractelement of a load with a load.
-  // Use ReplaceAllUsesOfValuesWith to do the replacement.
-  // Note that this replacement assumes that the extractvalue is the only
-  // use of the load; that's okay because we don't want to perform this
-  // transformation in other cases anyway.
+  // We are replacing a vector load with a scalar load. The new load must have
+  // identical memory op ordering to the original.
   SDValue Load;
-  SDValue Chain;
   if (ResultVT.bitsGT(VecEltVT)) {
     // If the result type of vextract is wider than the load, then issue an
     // extending load instead.
-    ISD::LoadExtType ExtType = TLI.isLoadExtLegal(ISD::ZEXTLOAD, ResultVT,
-                                                  VecEltVT)
-                                   ? ISD::ZEXTLOAD
-                                   : ISD::EXTLOAD;
-    Load = DAG.getExtLoad(ExtType, SDLoc(EVE), ResultVT,
-                          OriginalLoad->getChain(), NewPtr, MPI, VecEltVT,
-                          Alignment, OriginalLoad->getMemOperand()->getFlags(),
+    ISD::LoadExtType ExtType =
+        TLI.isLoadExtLegal(ISD::ZEXTLOAD, ResultVT, VecEltVT) ? ISD::ZEXTLOAD
+                                                              : ISD::EXTLOAD;
+    Load = DAG.getExtLoad(ExtType, DL, ResultVT, OriginalLoad->getChain(),
+                          NewPtr, MPI, VecEltVT, Alignment,
+                          OriginalLoad->getMemOperand()->getFlags(),
                           OriginalLoad->getAAInfo());
-    Chain = Load.getValue(1);
+    DAG.makeEquivalentMemoryOrdering(OriginalLoad, Load);
   } else {
-    Load = DAG.getLoad(
-        VecEltVT, SDLoc(EVE), OriginalLoad->getChain(), NewPtr, MPI, Alignment,
-        OriginalLoad->getMemOperand()->getFlags(), OriginalLoad->getAAInfo());
-    Chain = Load.getValue(1);
+    // The result type is narrower or the same width as the vector element
+    Load = DAG.getLoad(VecEltVT, DL, OriginalLoad->getChain(), NewPtr, MPI,
+                       Alignment, OriginalLoad->getMemOperand()->getFlags(),
+                       OriginalLoad->getAAInfo());
+    DAG.makeEquivalentMemoryOrdering(OriginalLoad, Load);
     if (ResultVT.bitsLT(VecEltVT))
-      Load = DAG.getNode(ISD::TRUNCATE, SDLoc(EVE), ResultVT, Load);
+      Load = DAG.getNode(ISD::TRUNCATE, DL, ResultVT, Load);
     else
       Load = DAG.getBitcast(ResultVT, Load);
   }
-  WorklistRemover DeadNodes(*this);
-  SDValue From[] = { SDValue(EVE, 0), SDValue(OriginalLoad, 1) };
-  SDValue To[] = { Load, Chain };
-  DAG.ReplaceAllUsesOfValuesWith(From, To, 2);
-  // Make sure to revisit this node to clean it up; it will usually be dead.
-  AddToWorklist(EVE);
-  // Since we're explicitly calling ReplaceAllUses, add the new node to the
-  // worklist explicitly as well.
-  AddToWorklistWithUsers(Load.getNode());
   ++OpsNarrowed;
-  return SDValue(EVE, 0);
+  return Load;
 }
 
 /// Transform a vector binary operation into a scalar binary operation by moving
@@ -18673,7 +20460,7 @@ static SDValue scalarizeExtractedBinop(SDNode *ExtElt, SelectionDAG &DAG,
   SDValue Index = ExtElt->getOperand(1);
   auto *IndexC = dyn_cast<ConstantSDNode>(Index);
   if (!IndexC || !TLI.isBinOp(Vec.getOpcode()) || !Vec.hasOneUse() ||
-      Vec.getNode()->getNumValues() != 1)
+      Vec->getNumValues() != 1)
     return SDValue();
 
   // Targets may want to avoid this to prevent an expensive register transfer.
@@ -18685,8 +20472,11 @@ static SDValue scalarizeExtractedBinop(SDNode *ExtElt, SelectionDAG &DAG,
   // extract.
   SDValue Op0 = Vec.getOperand(0);
   SDValue Op1 = Vec.getOperand(1);
+  APInt SplatVal;
   if (isAnyConstantBuildVector(Op0, true) ||
-      isAnyConstantBuildVector(Op1, true)) {
+      ISD::isConstantSplatVector(Op0.getNode(), SplatVal) ||
+      isAnyConstantBuildVector(Op1, true) ||
+      ISD::isConstantSplatVector(Op1.getNode(), SplatVal)) {
     // extractelt (binop X, C), IndexC --> binop (extractelt X, IndexC), C'
     // extractelt (binop C, X), IndexC --> binop C', (extractelt X, IndexC)
     SDLoc DL(ExtElt);
@@ -18699,6 +20489,168 @@ static SDValue scalarizeExtractedBinop(SDNode *ExtElt, SelectionDAG &DAG,
   return SDValue();
 }
 
+// Given a ISD::EXTRACT_VECTOR_ELT, which is a glorified bit sequence extract,
+// recursively analyse all of it's users. and try to model themselves as
+// bit sequence extractions. If all of them agree on the new, narrower element
+// type, and all of them can be modelled as ISD::EXTRACT_VECTOR_ELT's of that
+// new element type, do so now.
+// This is mainly useful to recover from legalization that scalarized
+// the vector as wide elements, but tries to rebuild it with narrower elements.
+//
+// Some more nodes could be modelled if that helps cover interesting patterns.
+bool DAGCombiner::refineExtractVectorEltIntoMultipleNarrowExtractVectorElts(
+    SDNode *N) {
+  // We perform this optimization post type-legalization because
+  // the type-legalizer often scalarizes integer-promoted vectors.
+  // Performing this optimization before may cause legalizaton cycles.
+  if (Level != AfterLegalizeVectorOps && Level != AfterLegalizeTypes)
+    return false;
+
+  // TODO: Add support for big-endian.
+  if (DAG.getDataLayout().isBigEndian())
+    return false;
+
+  SDValue VecOp = N->getOperand(0);
+  EVT VecVT = VecOp.getValueType();
+  assert(!VecVT.isScalableVector() && "Only for fixed vectors.");
+
+  // We must start with a constant extraction index.
+  auto *IndexC = dyn_cast<ConstantSDNode>(N->getOperand(1));
+  if (!IndexC)
+    return false;
+
+  assert(IndexC->getZExtValue() < VecVT.getVectorNumElements() &&
+         "Original ISD::EXTRACT_VECTOR_ELT is undefinend?");
+
+  // TODO: deal with the case of implicit anyext of the extraction.
+  unsigned VecEltBitWidth = VecVT.getScalarSizeInBits();
+  EVT ScalarVT = N->getValueType(0);
+  if (VecVT.getScalarType() != ScalarVT)
+    return false;
+
+  // TODO: deal with the cases other than everything being integer-typed.
+  if (!ScalarVT.isScalarInteger())
+    return false;
+
+  struct Entry {
+    SDNode *Producer;
+
+    // Which bits of VecOp does it contain?
+    unsigned BitPos;
+    int NumBits;
+    // NOTE: the actual width of \p Producer may be wider than NumBits!
+
+    Entry(Entry &&) = default;
+    Entry(SDNode *Producer_, unsigned BitPos_, int NumBits_)
+        : Producer(Producer_), BitPos(BitPos_), NumBits(NumBits_) {}
+
+    Entry() = delete;
+    Entry(const Entry &) = delete;
+    Entry &operator=(const Entry &) = delete;
+    Entry &operator=(Entry &&) = delete;
+  };
+  SmallVector<Entry, 32> Worklist;
+  SmallVector<Entry, 32> Leafs;
+
+  // We start at the "root" ISD::EXTRACT_VECTOR_ELT.
+  Worklist.emplace_back(N, /*BitPos=*/VecEltBitWidth * IndexC->getZExtValue(),
+                        /*NumBits=*/VecEltBitWidth);
+
+  while (!Worklist.empty()) {
+    Entry E = Worklist.pop_back_val();
+    // Does the node not even use any of the VecOp bits?
+    if (!(E.NumBits > 0 && E.BitPos < VecVT.getSizeInBits() &&
+          E.BitPos + E.NumBits <= VecVT.getSizeInBits()))
+      return false; // Let's allow the other combines clean this up first.
+    // Did we fail to model any of the users of the Producer?
+    bool ProducerIsLeaf = false;
+    // Look at each user of this Producer.
+    for (SDNode *User : E.Producer->uses()) {
+      switch (User->getOpcode()) {
+      // TODO: support ISD::BITCAST
+      // TODO: support ISD::ANY_EXTEND
+      // TODO: support ISD::ZERO_EXTEND
+      // TODO: support ISD::SIGN_EXTEND
+      case ISD::TRUNCATE:
+        // Truncation simply means we keep position, but extract less bits.
+        Worklist.emplace_back(User, E.BitPos,
+                              /*NumBits=*/User->getValueSizeInBits(0));
+        break;
+      // TODO: support ISD::SRA
+      // TODO: support ISD::SHL
+      case ISD::SRL:
+        // We should be shifting the Producer by a constant amount.
+        if (auto *ShAmtC = dyn_cast<ConstantSDNode>(User->getOperand(1));
+            User->getOperand(0).getNode() == E.Producer && ShAmtC) {
+          // Logical right-shift means that we start extraction later,
+          // but stop it at the same position we did previously.
+          unsigned ShAmt = ShAmtC->getZExtValue();
+          Worklist.emplace_back(User, E.BitPos + ShAmt, E.NumBits - ShAmt);
+          break;
+        }
+        [[fallthrough]];
+      default:
+        // We can not model this user of the Producer.
+        // Which means the current Producer will be a ISD::EXTRACT_VECTOR_ELT.
+        ProducerIsLeaf = true;
+        // Profitability check: all users that we can not model
+        //                      must be ISD::BUILD_VECTOR's.
+        if (User->getOpcode() != ISD::BUILD_VECTOR)
+          return false;
+        break;
+      }
+    }
+    if (ProducerIsLeaf)
+      Leafs.emplace_back(std::move(E));
+  }
+
+  unsigned NewVecEltBitWidth = Leafs.front().NumBits;
+
+  // If we are still at the same element granularity, give up,
+  if (NewVecEltBitWidth == VecEltBitWidth)
+    return false;
+
+  // The vector width must be a multiple of the new element width.
+  if (VecVT.getSizeInBits() % NewVecEltBitWidth != 0)
+    return false;
+
+  // All leafs must agree on the new element width.
+  // All leafs must not expect any "padding" bits ontop of that width.
+  // All leafs must start extraction from multiple of that width.
+  if (!all_of(Leafs, [NewVecEltBitWidth](const Entry &E) {
+        return (unsigned)E.NumBits == NewVecEltBitWidth &&
+               E.Producer->getValueSizeInBits(0) == NewVecEltBitWidth &&
+               E.BitPos % NewVecEltBitWidth == 0;
+      }))
+    return false;
+
+  EVT NewScalarVT = EVT::getIntegerVT(*DAG.getContext(), NewVecEltBitWidth);
+  EVT NewVecVT = EVT::getVectorVT(*DAG.getContext(), NewScalarVT,
+                                  VecVT.getSizeInBits() / NewVecEltBitWidth);
+
+  if (LegalTypes &&
+      !(TLI.isTypeLegal(NewScalarVT) && TLI.isTypeLegal(NewVecVT)))
+    return false;
+
+  if (LegalOperations &&
+      !(TLI.isOperationLegalOrCustom(ISD::BITCAST, NewVecVT) &&
+        TLI.isOperationLegalOrCustom(ISD::EXTRACT_VECTOR_ELT, NewVecVT)))
+    return false;
+
+  SDValue NewVecOp = DAG.getBitcast(NewVecVT, VecOp);
+  for (const Entry &E : Leafs) {
+    SDLoc DL(E.Producer);
+    unsigned NewIndex = E.BitPos / NewVecEltBitWidth;
+    assert(NewIndex < NewVecVT.getVectorNumElements() &&
+           "Creating out-of-bounds ISD::EXTRACT_VECTOR_ELT?");
+    SDValue V = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, DL, NewScalarVT, NewVecOp,
+                            DAG.getVectorIdxConstant(NewIndex, DL));
+    CombineTo(E.Producer, V);
+  }
+
+  return true;
+}
+
 SDValue DAGCombiner::visitEXTRACT_VECTOR_ELT(SDNode *N) {
   SDValue VecOp = N->getOperand(0);
   SDValue Index = N->getOperand(1);
@@ -18729,8 +20681,9 @@ SDValue DAGCombiner::visitEXTRACT_VECTOR_ELT(SDNode *N) {
     // EXTRACT_VECTOR_ELT may widen the extracted vector.
     SDValue InOp = VecOp.getOperand(0);
     if (InOp.getValueType() != ScalarVT) {
-      assert(InOp.getValueType().isInteger() && ScalarVT.isInteger());
-      return DAG.getSExtOrTrunc(InOp, DL, ScalarVT);
+      assert(InOp.getValueType().isInteger() && ScalarVT.isInteger() &&
+             InOp.getValueType().bitsGT(ScalarVT));
+      return DAG.getNode(ISD::TRUNCATE, DL, ScalarVT, InOp);
     }
     return InOp;
   }
@@ -18741,6 +20694,12 @@ SDValue DAGCombiner::visitEXTRACT_VECTOR_ELT(SDNode *N) {
       IndexC->getAPIntValue().uge(VecVT.getVectorNumElements()))
     return DAG.getUNDEF(ScalarVT);
 
+  // extract_vector_elt(freeze(x)), idx -> freeze(extract_vector_elt(x)), idx
+  if (VecOp.hasOneUse() && VecOp.getOpcode() == ISD::FREEZE) {
+    return DAG.getFreeze(DAG.getNode(ISD::EXTRACT_VECTOR_ELT, DL, ScalarVT,
+                                     VecOp.getOperand(0), Index));
+  }
+
   // extract_vector_elt (build_vector x, y), 1 -> y
   if (((IndexC && VecOp.getOpcode() == ISD::BUILD_VECTOR) ||
        VecOp.getOpcode() == ISD::SPLAT_VECTOR) &&
@@ -18762,6 +20721,9 @@ SDValue DAGCombiner::visitEXTRACT_VECTOR_ELT(SDNode *N) {
     // converts.
   }
 
+  if (SDValue BO = scalarizeExtractedBinop(N, DAG, LegalOperations))
+    return BO;
+
   if (VecVT.isScalableVector())
     return SDValue();
 
@@ -18783,7 +20745,7 @@ SDValue DAGCombiner::visitEXTRACT_VECTOR_ELT(SDNode *N) {
     unsigned BCTruncElt = IsLE ? 0 : NumElts - 1;
     SDValue BCSrc = VecOp.getOperand(0);
     if (ExtractIndex == BCTruncElt && BCSrc.getValueType().isScalarInteger())
-      return DAG.getNode(ISD::TRUNCATE, DL, ScalarVT, BCSrc);
+      return DAG.getAnyExtOrTrunc(BCSrc, DL, ScalarVT);
 
     if (LegalTypes && BCSrc.getValueType().isInteger() &&
         BCSrc.getOpcode() == ISD::SCALAR_TO_VECTOR) {
@@ -18807,9 +20769,6 @@ SDValue DAGCombiner::visitEXTRACT_VECTOR_ELT(SDNode *N) {
     }
   }
 
-  if (SDValue BO = scalarizeExtractedBinop(N, DAG, LegalOperations))
-    return BO;
-
   // Transform: (EXTRACT_VECTOR_ELT( VECTOR_SHUFFLE )) -> EXTRACT_VECTOR_ELT.
   // We only perform this optimization before the op legalization phase because
   // we may introduce new vector instructions which are not backed by TD
@@ -18863,7 +20822,7 @@ SDValue DAGCombiner::visitEXTRACT_VECTOR_ELT(SDNode *N) {
                Use->getOperand(0) == VecOp &&
                isa<ConstantSDNode>(Use->getOperand(1));
       })) {
-    APInt DemandedElts = APInt::getNullValue(NumElts);
+    APInt DemandedElts = APInt::getZero(NumElts);
     for (SDNode *Use : VecOp->uses()) {
       auto *CstElt = cast<ConstantSDNode>(Use->getOperand(1));
       if (CstElt->getAPIntValue().ult(NumElts))
@@ -18876,7 +20835,7 @@ SDValue DAGCombiner::visitEXTRACT_VECTOR_ELT(SDNode *N) {
         AddToWorklist(N);
       return SDValue(N, 0);
     }
-    APInt DemandedBits = APInt::getAllOnesValue(VecEltBitWidth);
+    APInt DemandedBits = APInt::getAllOnes(VecEltBitWidth);
     if (SimplifyDemandedBits(VecOp, DemandedBits, DemandedElts, true)) {
       // We simplified the vector operand of this extract element. If this
       // extract is not dead, visit it again so it is folded properly.
@@ -18886,6 +20845,9 @@ SDValue DAGCombiner::visitEXTRACT_VECTOR_ELT(SDNode *N) {
     }
   }
 
+  if (refineExtractVectorEltIntoMultipleNarrowExtractVectorElts(N))
+    return SDValue(N, 0);
+
   // Everything under here is trying to match an extract of a loaded value.
   // If the result of load has to be truncated, then it's not necessarily
   // profitable.
@@ -19127,7 +21089,7 @@ SDValue DAGCombiner::reduceBuildVecExtToExtBuildVec(SDNode *N) {
 
 // Simplify (build_vec (trunc $1)
 //                     (trunc (srl $1 half-width))
-//                     (trunc (srl $1 (2 * half-width))) …)
+//                     (trunc (srl $1 (2 * half-width))))
 // to (bitcast $1)
 SDValue DAGCombiner::reduceBuildVecTruncToBitCast(SDNode *N) {
   assert(N->getOpcode() == ISD::BUILD_VECTOR && "Expected build vector");
@@ -19188,7 +21150,7 @@ SDValue DAGCombiner::reduceBuildVecTruncToBitCast(SDNode *N) {
       if (!isa<ConstantSDNode>(ShiftAmtVal))
         return SDValue();
 
-      uint64_t ShiftAmt = In.getNode()->getConstantOperandVal(1);
+      uint64_t ShiftAmt = In.getConstantOperandVal(1);
 
       // The extracted value is not extracted at the right position
       if (ShiftAmt != i * ScalarTypeBitsize)
@@ -19280,6 +21242,29 @@ SDValue DAGCombiner::createBuildVecShuffle(const SDLoc &DL, SDNode *N,
       SmallVector<SDValue, 2> ConcatOps(2, DAG.getUNDEF(InVT2));
       ConcatOps[0] = VecIn2;
       VecIn2 = DAG.getNode(ISD::CONCAT_VECTORS, DL, VT, ConcatOps);
+    } else if (InVT1Size / VTSize > 1 && InVT1Size % VTSize == 0) {
+      if (!TLI.isExtractSubvectorCheap(VT, InVT1, NumElems) ||
+          !TLI.isTypeLegal(InVT1) || !TLI.isTypeLegal(InVT2))
+        return SDValue();
+      // If dest vector has less than two elements, then use shuffle and extract
+      // from larger regs will cost even more.
+      if (VT.getVectorNumElements() <= 2 || !VecIn2.getNode())
+        return SDValue();
+      assert(InVT2Size <= InVT1Size &&
+             "Second input is not going to be larger than the first one.");
+
+      // VecIn1 is wider than the output, and we have another, possibly
+      // smaller input. Pad the smaller input with undefs, shuffle at the
+      // input vector width, and extract the output.
+      // The shuffle type is different than VT, so check legality again.
+      if (LegalOperations && !TLI.isOperationLegal(ISD::VECTOR_SHUFFLE, InVT1))
+        return SDValue();
+
+      if (InVT1 != InVT2) {
+        VecIn2 = DAG.getNode(ISD::INSERT_SUBVECTOR, DL, InVT1,
+                             DAG.getUNDEF(InVT1), VecIn2, ZeroIdx);
+      }
+      ShuffleNumElems = InVT1Size / VTSize * NumElems;
     } else {
       // TODO: Support cases where the length mismatch isn't exactly by a
       // factor of 2.
@@ -19376,10 +21361,9 @@ static SDValue reduceBuildVecToShuffleWithZero(SDNode *BV, SelectionDAG &DAG) {
       // the source vector. The high bits map to zero. We will use a zero vector
       // as the 2nd source operand of the shuffle, so use the 1st element of
       // that vector (mask value is number-of-elements) for the high bits.
-      if (i % ZextRatio == 0)
-        ShufMask[i] = Extract.getConstantOperandVal(1);
-      else
-        ShufMask[i] = NumMaskElts;
+      int Low = DAG.getDataLayout().isBigEndian() ? (ZextRatio - 1) : 0;
+      ShufMask[i] = (i % ZextRatio == Low) ? Extract.getConstantOperandVal(1)
+                                           : NumMaskElts;
     }
 
     // Undef elements of the build vector remain undef because we initialize
@@ -19629,18 +21613,39 @@ SDValue DAGCombiner::reduceBuildVecToShuffle(SDNode *N) {
       int Left = 2 * In;
       int Right = 2 * In + 1;
       SmallVector<int, 8> Mask(NumElems, -1);
-      for (unsigned i = 0; i != NumElems; ++i) {
-        if (VectorMask[i] == Left) {
-          Mask[i] = i;
-          VectorMask[i] = In;
-        } else if (VectorMask[i] == Right) {
-          Mask[i] = i + NumElems;
-          VectorMask[i] = In;
+      SDValue L = Shuffles[Left];
+      ArrayRef<int> LMask;
+      bool IsLeftShuffle = L.getOpcode() == ISD::VECTOR_SHUFFLE &&
+                           L.use_empty() && L.getOperand(1).isUndef() &&
+                           L.getOperand(0).getValueType() == L.getValueType();
+      if (IsLeftShuffle) {
+        LMask = cast<ShuffleVectorSDNode>(L.getNode())->getMask();
+        L = L.getOperand(0);
+      }
+      SDValue R = Shuffles[Right];
+      ArrayRef<int> RMask;
+      bool IsRightShuffle = R.getOpcode() == ISD::VECTOR_SHUFFLE &&
+                            R.use_empty() && R.getOperand(1).isUndef() &&
+                            R.getOperand(0).getValueType() == R.getValueType();
+      if (IsRightShuffle) {
+        RMask = cast<ShuffleVectorSDNode>(R.getNode())->getMask();
+        R = R.getOperand(0);
+      }
+      for (unsigned I = 0; I != NumElems; ++I) {
+        if (VectorMask[I] == Left) {
+          Mask[I] = I;
+          if (IsLeftShuffle)
+            Mask[I] = LMask[I];
+          VectorMask[I] = In;
+        } else if (VectorMask[I] == Right) {
+          Mask[I] = I + NumElems;
+          if (IsRightShuffle)
+            Mask[I] = RMask[I] + NumElems;
+          VectorMask[I] = In;
         }
       }
 
-      Shuffles[In] =
-          DAG.getVectorShuffle(VT, DL, Shuffles[Left], Shuffles[Right], Mask);
+      Shuffles[In] = DAG.getVectorShuffle(VT, DL, L, R, Mask);
     }
   }
   return Shuffles[0];
@@ -19671,8 +21676,10 @@ SDValue DAGCombiner::convertBuildVecZextToZext(SDNode *N) {
 
   // Make sure the first element matches
   // (zext (extract_vector_elt X, C))
+  // Offset must be a constant multiple of the
+  // known-minimum vector length of the result type.
   int64_t Offset = checkElem(Op0);
-  if (Offset < 0)
+  if (Offset < 0 || (Offset % VT.getVectorNumElements()) != 0)
     return SDValue();
 
   unsigned NumElems = N->getNumOperands();
@@ -19697,6 +21704,127 @@ SDValue DAGCombiner::convertBuildVecZextToZext(SDNode *N) {
                      VT, In);
 }
 
+// If this is a very simple BUILD_VECTOR with first element being a ZERO_EXTEND,
+// and all other elements being constant zero's, granularize the BUILD_VECTOR's
+// element width, absorbing the ZERO_EXTEND, turning it into a constant zero op.
+// This patten can appear during legalization.
+//
+// NOTE: This can be generalized to allow more than a single
+//       non-constant-zero op, UNDEF's, and to be KnownBits-based,
+SDValue DAGCombiner::convertBuildVecZextToBuildVecWithZeros(SDNode *N) {
+  // Don't run this after legalization. Targets may have other preferences.
+  if (Level >= AfterLegalizeDAG)
+    return SDValue();
+
+  // FIXME: support big-endian.
+  if (DAG.getDataLayout().isBigEndian())
+    return SDValue();
+
+  EVT VT = N->getValueType(0);
+  EVT OpVT = N->getOperand(0).getValueType();
+  assert(!VT.isScalableVector() && "Encountered scalable BUILD_VECTOR?");
+
+  EVT OpIntVT = EVT::getIntegerVT(*DAG.getContext(), OpVT.getSizeInBits());
+
+  if (!TLI.isTypeLegal(OpIntVT) ||
+      (LegalOperations && !TLI.isOperationLegalOrCustom(ISD::BITCAST, OpIntVT)))
+    return SDValue();
+
+  unsigned EltBitwidth = VT.getScalarSizeInBits();
+  // NOTE: the actual width of operands may be wider than that!
+
+  // Analyze all operands of this BUILD_VECTOR. What is the largest number of
+  // active bits they all have? We'll want to truncate them all to that width.
+  unsigned ActiveBits = 0;
+  APInt KnownZeroOps(VT.getVectorNumElements(), 0);
+  for (auto I : enumerate(N->ops())) {
+    SDValue Op = I.value();
+    // FIXME: support UNDEF elements?
+    if (auto *Cst = dyn_cast<ConstantSDNode>(Op)) {
+      unsigned OpActiveBits =
+          Cst->getAPIntValue().trunc(EltBitwidth).getActiveBits();
+      if (OpActiveBits == 0) {
+        KnownZeroOps.setBit(I.index());
+        continue;
+      }
+      // Profitability check: don't allow non-zero constant operands.
+      return SDValue();
+    }
+    // Profitability check: there must only be a single non-zero operand,
+    // and it must be the first operand of the BUILD_VECTOR.
+    if (I.index() != 0)
+      return SDValue();
+    // The operand must be a zero-extension itself.
+    // FIXME: this could be generalized to known leading zeros check.
+    if (Op.getOpcode() != ISD::ZERO_EXTEND)
+      return SDValue();
+    unsigned CurrActiveBits =
+        Op.getOperand(0).getValueSizeInBits().getFixedValue();
+    assert(!ActiveBits && "Already encountered non-constant-zero operand?");
+    ActiveBits = CurrActiveBits;
+    // We want to at least halve the element size.
+    if (2 * ActiveBits > EltBitwidth)
+      return SDValue();
+  }
+
+  // This BUILD_VECTOR must have at least one non-constant-zero operand.
+  if (ActiveBits == 0)
+    return SDValue();
+
+  // We have EltBitwidth bits, the *minimal* chunk size is ActiveBits,
+  // into how many chunks can we split our element width?
+  EVT NewScalarIntVT, NewIntVT;
+  std::optional<unsigned> Factor;
+  // We can split the element into at least two chunks, but not into more
+  // than |_ EltBitwidth / ActiveBits _| chunks. Find a largest split factor
+  // for which the element width is a multiple of it,
+  // and the resulting types/operations on that chunk width are legal.
+  assert(2 * ActiveBits <= EltBitwidth &&
+         "We know that half or less bits of the element are active.");
+  for (unsigned Scale = EltBitwidth / ActiveBits; Scale >= 2; --Scale) {
+    if (EltBitwidth % Scale != 0)
+      continue;
+    unsigned ChunkBitwidth = EltBitwidth / Scale;
+    assert(ChunkBitwidth >= ActiveBits && "As per starting point.");
+    NewScalarIntVT = EVT::getIntegerVT(*DAG.getContext(), ChunkBitwidth);
+    NewIntVT = EVT::getVectorVT(*DAG.getContext(), NewScalarIntVT,
+                                Scale * N->getNumOperands());
+    if (!TLI.isTypeLegal(NewScalarIntVT) || !TLI.isTypeLegal(NewIntVT) ||
+        (LegalOperations &&
+         !(TLI.isOperationLegalOrCustom(ISD::TRUNCATE, NewScalarIntVT) &&
+           TLI.isOperationLegalOrCustom(ISD::BUILD_VECTOR, NewIntVT))))
+      continue;
+    Factor = Scale;
+    break;
+  }
+  if (!Factor)
+    return SDValue();
+
+  SDLoc DL(N);
+  SDValue ZeroOp = DAG.getConstant(0, DL, NewScalarIntVT);
+
+  // Recreate the BUILD_VECTOR, with elements now being Factor times smaller.
+  SmallVector<SDValue, 16> NewOps;
+  NewOps.reserve(NewIntVT.getVectorNumElements());
+  for (auto I : enumerate(N->ops())) {
+    SDValue Op = I.value();
+    assert(!Op.isUndef() && "FIXME: after allowing UNDEF's, handle them here.");
+    unsigned SrcOpIdx = I.index();
+    if (KnownZeroOps[SrcOpIdx]) {
+      NewOps.append(*Factor, ZeroOp);
+      continue;
+    }
+    Op = DAG.getBitcast(OpIntVT, Op);
+    Op = DAG.getNode(ISD::TRUNCATE, DL, NewScalarIntVT, Op);
+    NewOps.emplace_back(Op);
+    NewOps.append(*Factor - 1, ZeroOp);
+  }
+  assert(NewOps.size() == NewIntVT.getVectorNumElements());
+  SDValue NewBV = DAG.getBuildVector(NewIntVT, DL, NewOps);
+  NewBV = DAG.getBitcast(VT, NewBV);
+  return NewBV;
+}
+
 SDValue DAGCombiner::visitBUILD_VECTOR(SDNode *N) {
   EVT VT = N->getValueType(0);
 
@@ -19762,6 +21890,9 @@ SDValue DAGCombiner::visitBUILD_VECTOR(SDNode *N) {
   if (SDValue V = convertBuildVecZextToZext(N))
     return V;
 
+  if (SDValue V = convertBuildVecZextToBuildVecWithZeros(N))
+    return V;
+
   if (SDValue V = reduceBuildVecExtToExtBuildVec(N))
     return V;
 
@@ -19843,6 +21974,44 @@ static SDValue combineConcatVectorOfScalars(SDNode *N, SelectionDAG &DAG) {
   return DAG.getBitcast(VT, DAG.getBuildVector(VecVT, DL, Ops));
 }
 
+// Attempt to merge nested concat_vectors/undefs.
+// Fold concat_vectors(concat_vectors(x,y,z,w),u,u,concat_vectors(a,b,c,d))
+//  --> concat_vectors(x,y,z,w,u,u,u,u,u,u,u,u,a,b,c,d)
+static SDValue combineConcatVectorOfConcatVectors(SDNode *N,
+                                                  SelectionDAG &DAG) {
+  EVT VT = N->getValueType(0);
+
+  // Ensure we're concatenating UNDEF and CONCAT_VECTORS nodes of similar types.
+  EVT SubVT;
+  SDValue FirstConcat;
+  for (const SDValue &Op : N->ops()) {
+    if (Op.isUndef())
+      continue;
+    if (Op.getOpcode() != ISD::CONCAT_VECTORS)
+      return SDValue();
+    if (!FirstConcat) {
+      SubVT = Op.getOperand(0).getValueType();
+      if (!DAG.getTargetLoweringInfo().isTypeLegal(SubVT))
+        return SDValue();
+      FirstConcat = Op;
+      continue;
+    }
+    if (SubVT != Op.getOperand(0).getValueType())
+      return SDValue();
+  }
+  assert(FirstConcat && "Concat of all-undefs found");
+
+  SmallVector<SDValue> ConcatOps;
+  for (const SDValue &Op : N->ops()) {
+    if (Op.isUndef()) {
+      ConcatOps.append(FirstConcat->getNumOperands(), DAG.getUNDEF(SubVT));
+      continue;
+    }
+    ConcatOps.append(Op->op_begin(), Op->op_end());
+  }
+  return DAG.getNode(ISD::CONCAT_VECTORS, SDLoc(N), VT, ConcatOps);
+}
+
 // Check to see if this is a CONCAT_VECTORS of a bunch of EXTRACT_SUBVECTOR
 // operations. If so, and if the EXTRACT_SUBVECTOR vector inputs come from at
 // most two distinct vectors the same size as the result, attempt to turn this
@@ -19984,6 +22153,109 @@ static SDValue combineConcatVectorOfCasts(SDNode *N, SelectionDAG &DAG) {
   return DAG.getNode(CastOpcode, DL, VT, NewConcat);
 }
 
+// See if this is a simple CONCAT_VECTORS with no UNDEF operands, and if one of
+// the operands is a SHUFFLE_VECTOR, and all other operands are also operands
+// to that SHUFFLE_VECTOR, create wider SHUFFLE_VECTOR.
+static SDValue combineConcatVectorOfShuffleAndItsOperands(
+    SDNode *N, SelectionDAG &DAG, const TargetLowering &TLI, bool LegalTypes,
+    bool LegalOperations) {
+  EVT VT = N->getValueType(0);
+  EVT OpVT = N->getOperand(0).getValueType();
+  if (VT.isScalableVector())
+    return SDValue();
+
+  // For now, only allow simple 2-operand concatenations.
+  if (N->getNumOperands() != 2)
+    return SDValue();
+
+  // Don't create illegal types/shuffles when not allowed to.
+  if ((LegalTypes && !TLI.isTypeLegal(VT)) ||
+      (LegalOperations &&
+       !TLI.isOperationLegalOrCustom(ISD::VECTOR_SHUFFLE, VT)))
+    return SDValue();
+
+  // Analyze all of the operands of the CONCAT_VECTORS. Out of all of them,
+  // we want to find one that is: (1) a SHUFFLE_VECTOR (2) only used by us,
+  // and (3) all operands of CONCAT_VECTORS must be either that SHUFFLE_VECTOR,
+  // or one of the operands of that SHUFFLE_VECTOR (but not UNDEF!).
+  // (4) and for now, the SHUFFLE_VECTOR must be unary.
+  ShuffleVectorSDNode *SVN = nullptr;
+  for (SDValue Op : N->ops()) {
+    if (auto *CurSVN = dyn_cast<ShuffleVectorSDNode>(Op);
+        CurSVN && CurSVN->getOperand(1).isUndef() && N->isOnlyUserOf(CurSVN) &&
+        all_of(N->ops(), [CurSVN](SDValue Op) {
+          // FIXME: can we allow UNDEF operands?
+          return !Op.isUndef() &&
+                 (Op.getNode() == CurSVN || is_contained(CurSVN->ops(), Op));
+        })) {
+      SVN = CurSVN;
+      break;
+    }
+  }
+  if (!SVN)
+    return SDValue();
+
+  // We are going to pad the shuffle operands, so any indice, that was picking
+  // from the second operand, must be adjusted.
+  SmallVector<int, 16> AdjustedMask;
+  AdjustedMask.reserve(SVN->getMask().size());
+  assert(SVN->getOperand(1).isUndef() && "Expected unary shuffle!");
+  append_range(AdjustedMask, SVN->getMask());
+
+  // Identity masks for the operands of the (padded) shuffle.
+  SmallVector<int, 32> IdentityMask(2 * OpVT.getVectorNumElements());
+  MutableArrayRef<int> FirstShufOpIdentityMask =
+      MutableArrayRef<int>(IdentityMask)
+          .take_front(OpVT.getVectorNumElements());
+  MutableArrayRef<int> SecondShufOpIdentityMask =
+      MutableArrayRef<int>(IdentityMask).take_back(OpVT.getVectorNumElements());
+  std::iota(FirstShufOpIdentityMask.begin(), FirstShufOpIdentityMask.end(), 0);
+  std::iota(SecondShufOpIdentityMask.begin(), SecondShufOpIdentityMask.end(),
+            VT.getVectorNumElements());
+
+  // New combined shuffle mask.
+  SmallVector<int, 32> Mask;
+  Mask.reserve(VT.getVectorNumElements());
+  for (SDValue Op : N->ops()) {
+    assert(!Op.isUndef() && "Not expecting to concatenate UNDEF.");
+    if (Op.getNode() == SVN) {
+      append_range(Mask, AdjustedMask);
+      continue;
+    }
+    if (Op == SVN->getOperand(0)) {
+      append_range(Mask, FirstShufOpIdentityMask);
+      continue;
+    }
+    if (Op == SVN->getOperand(1)) {
+      append_range(Mask, SecondShufOpIdentityMask);
+      continue;
+    }
+    llvm_unreachable("Unexpected operand!");
+  }
+
+  // Don't create illegal shuffle masks.
+  if (!TLI.isShuffleMaskLegal(Mask, VT))
+    return SDValue();
+
+  // Pad the shuffle operands with UNDEF.
+  SDLoc dl(N);
+  std::array<SDValue, 2> ShufOps;
+  for (auto I : zip(SVN->ops(), ShufOps)) {
+    SDValue ShufOp = std::get<0>(I);
+    SDValue &NewShufOp = std::get<1>(I);
+    if (ShufOp.isUndef())
+      NewShufOp = DAG.getUNDEF(VT);
+    else {
+      SmallVector<SDValue, 2> ShufOpParts(N->getNumOperands(),
+                                          DAG.getUNDEF(OpVT));
+      ShufOpParts[0] = ShufOp;
+      NewShufOp = DAG.getNode(ISD::CONCAT_VECTORS, dl, VT, ShufOpParts);
+    }
+  }
+  // Finally, create the new wide shuffle.
+  return DAG.getVectorShuffle(VT, dl, ShufOps[0], ShufOps[1], Mask);
+}
+
 SDValue DAGCombiner::visitCONCAT_VECTORS(SDNode *N) {
   // If we only have one input vector, we don't need to do any concatenation.
   if (N->getNumOperands() == 1)
@@ -20102,17 +22374,27 @@ SDValue DAGCombiner::visitCONCAT_VECTORS(SDNode *N) {
   }
 
   // Fold CONCAT_VECTORS of only bitcast scalars (or undef) to BUILD_VECTOR.
+  // FIXME: Add support for concat_vectors(bitcast(vec0),bitcast(vec1),...).
   if (SDValue V = combineConcatVectorOfScalars(N, DAG))
     return V;
 
-  // Fold CONCAT_VECTORS of EXTRACT_SUBVECTOR (or undef) to VECTOR_SHUFFLE.
-  if (Level < AfterLegalizeVectorOps && TLI.isTypeLegal(VT))
+  if (Level < AfterLegalizeVectorOps && TLI.isTypeLegal(VT)) {
+    // Fold CONCAT_VECTORS of CONCAT_VECTORS (or undef) to VECTOR_SHUFFLE.
+    if (SDValue V = combineConcatVectorOfConcatVectors(N, DAG))
+      return V;
+
+    // Fold CONCAT_VECTORS of EXTRACT_SUBVECTOR (or undef) to VECTOR_SHUFFLE.
     if (SDValue V = combineConcatVectorOfExtracts(N, DAG))
       return V;
+  }
 
   if (SDValue V = combineConcatVectorOfCasts(N, DAG))
     return V;
 
+  if (SDValue V = combineConcatVectorOfShuffleAndItsOperands(
+          N, DAG, TLI, LegalTypes, LegalOperations))
+    return V;
+
   // Type legalization of vectors and DAG canonicalization of SHUFFLE_VECTOR
   // nodes often generate nop CONCAT_VECTOR nodes. Scan the CONCAT_VECTOR
   // operands and look for a CONCAT operations that place the incoming vectors
@@ -20182,7 +22464,7 @@ static SDValue narrowInsertExtractVectorBinOp(SDNode *Extract,
   const TargetLowering &TLI = DAG.getTargetLoweringInfo();
   SDValue BinOp = Extract->getOperand(0);
   unsigned BinOpcode = BinOp.getOpcode();
-  if (!TLI.isBinOp(BinOpcode) || BinOp.getNode()->getNumValues() != 1)
+  if (!TLI.isBinOp(BinOpcode) || BinOp->getNumValues() != 1)
     return SDValue();
 
   EVT VecVT = BinOp.getValueType();
@@ -20231,7 +22513,7 @@ static SDValue narrowExtractedVectorBinOp(SDNode *Extract, SelectionDAG &DAG,
   const TargetLowering &TLI = DAG.getTargetLoweringInfo();
   SDValue BinOp = peekThroughBitcasts(Extract->getOperand(0));
   unsigned BOpcode = BinOp.getOpcode();
-  if (!TLI.isBinOp(BOpcode) || BinOp.getNode()->getNumValues() != 1)
+  if (!TLI.isBinOp(BOpcode) || BinOp->getNumValues() != 1)
     return SDValue();
 
   // Exclude the fake form of fneg (fsub -0.0, x) because that is likely to be
@@ -20290,8 +22572,8 @@ static SDValue narrowExtractedVectorBinOp(SDNode *Extract, SelectionDAG &DAG,
                             BinOp.getOperand(0), NewExtIndex);
     SDValue Y = DAG.getNode(ISD::EXTRACT_SUBVECTOR, DL, NarrowBVT,
                             BinOp.getOperand(1), NewExtIndex);
-    SDValue NarrowBinOp = DAG.getNode(BOpcode, DL, NarrowBVT, X, Y,
-                                      BinOp.getNode()->getFlags());
+    SDValue NarrowBinOp =
+        DAG.getNode(BOpcode, DL, NarrowBVT, X, Y, BinOp->getFlags());
     return DAG.getBitcast(VT, NarrowBinOp);
   }
 
@@ -20350,9 +22632,7 @@ static SDValue narrowExtractedVectorLoad(SDNode *Extract, SelectionDAG &DAG) {
     return SDValue();
 
   auto *Ld = dyn_cast<LoadSDNode>(Extract->getOperand(0));
-  auto *ExtIdx = dyn_cast<ConstantSDNode>(Extract->getOperand(1));
-  if (!Ld || Ld->getExtensionType() || !Ld->isSimple() ||
-      !ExtIdx)
+  if (!Ld || Ld->getExtensionType() || !Ld->isSimple())
     return SDValue();
 
   // Allow targets to opt-out.
@@ -20362,7 +22642,7 @@ static SDValue narrowExtractedVectorLoad(SDNode *Extract, SelectionDAG &DAG) {
   if (!VT.isByteSized())
     return SDValue();
 
-  unsigned Index = ExtIdx->getZExtValue();
+  unsigned Index = Extract->getConstantOperandVal(1);
   unsigned NumElts = VT.getVectorMinNumElements();
 
   // The definition of EXTRACT_SUBVECTOR states that the index must be a
@@ -20373,31 +22653,181 @@ static SDValue narrowExtractedVectorLoad(SDNode *Extract, SelectionDAG &DAG) {
   // It's fine to use TypeSize here as we know the offset will not be negative.
   TypeSize Offset = VT.getStoreSize() * (Index / NumElts);
 
-  const TargetLowering &TLI = DAG.getTargetLoweringInfo();
-  if (!TLI.shouldReduceLoadWidth(Ld, Ld->getExtensionType(), VT))
+  const TargetLowering &TLI = DAG.getTargetLoweringInfo();
+  if (!TLI.shouldReduceLoadWidth(Ld, Ld->getExtensionType(), VT))
+    return SDValue();
+
+  // The narrow load will be offset from the base address of the old load if
+  // we are extracting from something besides index 0 (little-endian).
+  SDLoc DL(Extract);
+
+  // TODO: Use "BaseIndexOffset" to make this more effective.
+  SDValue NewAddr = DAG.getMemBasePlusOffset(Ld->getBasePtr(), Offset, DL);
+
+  uint64_t StoreSize = MemoryLocation::getSizeOrUnknown(VT.getStoreSize());
+  MachineFunction &MF = DAG.getMachineFunction();
+  MachineMemOperand *MMO;
+  if (Offset.isScalable()) {
+    MachinePointerInfo MPI =
+        MachinePointerInfo(Ld->getPointerInfo().getAddrSpace());
+    MMO = MF.getMachineMemOperand(Ld->getMemOperand(), MPI, StoreSize);
+  } else
+    MMO = MF.getMachineMemOperand(Ld->getMemOperand(), Offset.getFixedValue(),
+                                  StoreSize);
+
+  SDValue NewLd = DAG.getLoad(VT, DL, Ld->getChain(), NewAddr, MMO);
+  DAG.makeEquivalentMemoryOrdering(Ld, NewLd);
+  return NewLd;
+}
+
+/// Given  EXTRACT_SUBVECTOR(VECTOR_SHUFFLE(Op0, Op1, Mask)),
+/// try to produce  VECTOR_SHUFFLE(EXTRACT_SUBVECTOR(Op?, ?),
+///                                EXTRACT_SUBVECTOR(Op?, ?),
+///                                Mask'))
+/// iff it is legal and profitable to do so. Notably, the trimmed mask
+/// (containing only the elements that are extracted)
+/// must reference at most two subvectors.
+static SDValue foldExtractSubvectorFromShuffleVector(SDNode *N,
+                                                     SelectionDAG &DAG,
+                                                     const TargetLowering &TLI,
+                                                     bool LegalOperations) {
+  assert(N->getOpcode() == ISD::EXTRACT_SUBVECTOR &&
+         "Must only be called on EXTRACT_SUBVECTOR's");
+
+  SDValue N0 = N->getOperand(0);
+
+  // Only deal with non-scalable vectors.
+  EVT NarrowVT = N->getValueType(0);
+  EVT WideVT = N0.getValueType();
+  if (!NarrowVT.isFixedLengthVector() || !WideVT.isFixedLengthVector())
+    return SDValue();
+
+  // The operand must be a shufflevector.
+  auto *WideShuffleVector = dyn_cast<ShuffleVectorSDNode>(N0);
+  if (!WideShuffleVector)
+    return SDValue();
+
+  // The old shuffleneeds to go away.
+  if (!WideShuffleVector->hasOneUse())
+    return SDValue();
+
+  // And the narrow shufflevector that we'll form must be legal.
+  if (LegalOperations &&
+      !TLI.isOperationLegalOrCustom(ISD::VECTOR_SHUFFLE, NarrowVT))
+    return SDValue();
+
+  uint64_t FirstExtractedEltIdx = N->getConstantOperandVal(1);
+  int NumEltsExtracted = NarrowVT.getVectorNumElements();
+  assert((FirstExtractedEltIdx % NumEltsExtracted) == 0 &&
+         "Extract index is not a multiple of the output vector length.");
+
+  int WideNumElts = WideVT.getVectorNumElements();
+
+  SmallVector<int, 16> NewMask;
+  NewMask.reserve(NumEltsExtracted);
+  SmallSetVector<std::pair<SDValue /*Op*/, int /*SubvectorIndex*/>, 2>
+      DemandedSubvectors;
+
+  // Try to decode the wide mask into narrow mask from at most two subvectors.
+  for (int M : WideShuffleVector->getMask().slice(FirstExtractedEltIdx,
+                                                  NumEltsExtracted)) {
+    assert((M >= -1) && (M < (2 * WideNumElts)) &&
+           "Out-of-bounds shuffle mask?");
+
+    if (M < 0) {
+      // Does not depend on operands, does not require adjustment.
+      NewMask.emplace_back(M);
+      continue;
+    }
+
+    // From which operand of the shuffle does this shuffle mask element pick?
+    int WideShufOpIdx = M / WideNumElts;
+    // Which element of that operand is picked?
+    int OpEltIdx = M % WideNumElts;
+
+    assert((OpEltIdx + WideShufOpIdx * WideNumElts) == M &&
+           "Shuffle mask vector decomposition failure.");
+
+    // And which NumEltsExtracted-sized subvector of that operand is that?
+    int OpSubvecIdx = OpEltIdx / NumEltsExtracted;
+    // And which element within that subvector of that operand is that?
+    int OpEltIdxInSubvec = OpEltIdx % NumEltsExtracted;
+
+    assert((OpEltIdxInSubvec + OpSubvecIdx * NumEltsExtracted) == OpEltIdx &&
+           "Shuffle mask subvector decomposition failure.");
+
+    assert((OpEltIdxInSubvec + OpSubvecIdx * NumEltsExtracted +
+            WideShufOpIdx * WideNumElts) == M &&
+           "Shuffle mask full decomposition failure.");
+
+    SDValue Op = WideShuffleVector->getOperand(WideShufOpIdx);
+
+    if (Op.isUndef()) {
+      // Picking from an undef operand. Let's adjust mask instead.
+      NewMask.emplace_back(-1);
+      continue;
+    }
+
+    // Profitability check: only deal with extractions from the first subvector.
+    if (OpSubvecIdx != 0)
+      return SDValue();
+
+    const std::pair<SDValue, int> DemandedSubvector =
+        std::make_pair(Op, OpSubvecIdx);
+
+    if (DemandedSubvectors.insert(DemandedSubvector)) {
+      if (DemandedSubvectors.size() > 2)
+        return SDValue(); // We can't handle more than two subvectors.
+      // How many elements into the WideVT does this subvector start?
+      int Index = NumEltsExtracted * OpSubvecIdx;
+      // Bail out if the extraction isn't going to be cheap.
+      if (!TLI.isExtractSubvectorCheap(NarrowVT, WideVT, Index))
+        return SDValue();
+    }
+
+    // Ok, but from which operand of the new shuffle will this element pick?
+    int NewOpIdx =
+        getFirstIndexOf(DemandedSubvectors.getArrayRef(), DemandedSubvector);
+    assert((NewOpIdx == 0 || NewOpIdx == 1) && "Unexpected operand index.");
+
+    int AdjM = OpEltIdxInSubvec + NewOpIdx * NumEltsExtracted;
+    NewMask.emplace_back(AdjM);
+  }
+  assert(NewMask.size() == (unsigned)NumEltsExtracted && "Produced bad mask.");
+  assert(DemandedSubvectors.size() <= 2 &&
+         "Should have ended up demanding at most two subvectors.");
+
+  // Did we discover that the shuffle does not actually depend on operands?
+  if (DemandedSubvectors.empty())
+    return DAG.getUNDEF(NarrowVT);
+
+  // We still perform the exact same EXTRACT_SUBVECTOR,  just on different
+  // operand[s]/index[es], so there is no point in checking for it's legality.
+
+  // Do not turn a legal shuffle into an illegal one.
+  if (TLI.isShuffleMaskLegal(WideShuffleVector->getMask(), WideVT) &&
+      !TLI.isShuffleMaskLegal(NewMask, NarrowVT))
     return SDValue();
 
-  // The narrow load will be offset from the base address of the old load if
-  // we are extracting from something besides index 0 (little-endian).
-  SDLoc DL(Extract);
+  SDLoc DL(N);
 
-  // TODO: Use "BaseIndexOffset" to make this more effective.
-  SDValue NewAddr = DAG.getMemBasePlusOffset(Ld->getBasePtr(), Offset, DL);
+  SmallVector<SDValue, 2> NewOps;
+  for (const std::pair<SDValue /*Op*/, int /*SubvectorIndex*/>
+           &DemandedSubvector : DemandedSubvectors) {
+    // How many elements into the WideVT does this subvector start?
+    int Index = NumEltsExtracted * DemandedSubvector.second;
+    SDValue IndexC = DAG.getVectorIdxConstant(Index, DL);
+    NewOps.emplace_back(DAG.getNode(ISD::EXTRACT_SUBVECTOR, DL, NarrowVT,
+                                    DemandedSubvector.first, IndexC));
+  }
+  assert((NewOps.size() == 1 || NewOps.size() == 2) &&
+         "Should end up with either one or two ops");
 
-  uint64_t StoreSize = MemoryLocation::getSizeOrUnknown(VT.getStoreSize());
-  MachineFunction &MF = DAG.getMachineFunction();
-  MachineMemOperand *MMO;
-  if (Offset.isScalable()) {
-    MachinePointerInfo MPI =
-        MachinePointerInfo(Ld->getPointerInfo().getAddrSpace());
-    MMO = MF.getMachineMemOperand(Ld->getMemOperand(), MPI, StoreSize);
-  } else
-    MMO = MF.getMachineMemOperand(Ld->getMemOperand(), Offset.getFixedSize(),
-                                  StoreSize);
+  // If we ended up with only one operand, pad with an undef.
+  if (NewOps.size() == 1)
+    NewOps.emplace_back(DAG.getUNDEF(NarrowVT));
 
-  SDValue NewLd = DAG.getLoad(VT, DL, Ld->getChain(), NewAddr, MMO);
-  DAG.makeEquivalentMemoryOrdering(Ld, NewLd);
-  return NewLd;
+  return DAG.getVectorShuffle(NarrowVT, DL, NewOps[0], NewOps[1], NewMask);
 }
 
 SDValue DAGCombiner::visitEXTRACT_SUBVECTOR(SDNode *N) {
@@ -20424,6 +22854,12 @@ SDValue DAGCombiner::visitEXTRACT_SUBVECTOR(SDNode *N) {
     }
   }
 
+  // ty1 extract_vector(ty2 splat(V))) -> ty1 splat(V)
+  if (V.getOpcode() == ISD::SPLAT_VECTOR)
+    if (DAG.isConstantValueOfAnyType(V.getOperand(0)) || V.hasOneUse())
+      if (!LegalOperations || TLI.isOperationLegal(ISD::SPLAT_VECTOR, NVT))
+        return DAG.getSplatVector(NVT, SDLoc(N), V.getOperand(0));
+
   // Try to move vector bitcast after extract_subv by scaling extraction index:
   // extract_subv (bitcast X), Index --> bitcast (extract_subv X, Index')
   if (V.getOpcode() == ISD::BITCAST &&
@@ -20491,7 +22927,7 @@ SDValue DAGCombiner::visitEXTRACT_SUBVECTOR(SDNode *N) {
     // If the concatenated source types match this extract, it's a direct
     // simplification:
     // extract_subvec (concat V1, V2, ...), i --> Vi
-    if (ConcatSrcNumElts == ExtNumElts)
+    if (NVT.getVectorElementCount() == ConcatSrcVT.getVectorElementCount())
       return V.getOperand(ConcatOpIdx);
 
     // If the concatenated source vectors are a multiple length of this extract,
@@ -20499,7 +22935,8 @@ SDValue DAGCombiner::visitEXTRACT_SUBVECTOR(SDNode *N) {
     // concat operand. Example:
     //   v2i8 extract_subvec (v16i8 concat (v8i8 X), (v8i8 Y), 14 -->
     //   v2i8 extract_subvec v8i8 Y, 6
-    if (NVT.isFixedLengthVector() && ConcatSrcNumElts % ExtNumElts == 0) {
+    if (NVT.isFixedLengthVector() && ConcatSrcVT.isFixedLengthVector() &&
+        ConcatSrcNumElts % ExtNumElts == 0) {
       SDLoc DL(N);
       unsigned NewExtIdx = ExtIdx - ConcatOpIdx * ConcatSrcNumElts;
       assert(NewExtIdx + ExtNumElts <= ConcatSrcNumElts &&
@@ -20512,6 +22949,10 @@ SDValue DAGCombiner::visitEXTRACT_SUBVECTOR(SDNode *N) {
     }
   }
 
+  if (SDValue V =
+          foldExtractSubvectorFromShuffleVector(N, DAG, TLI, LegalOperations))
+    return V;
+
   V = peekThroughBitcasts(V);
 
   // If the input is a build vector. Try to make a smaller build vector.
@@ -20784,20 +23225,60 @@ static SDValue combineShuffleOfScalars(ShuffleVectorSDNode *SVN,
       SVT = (SVT.bitsLT(Op.getValueType()) ? Op.getValueType() : SVT);
   if (SVT != VT.getScalarType())
     for (SDValue &Op : Ops)
-      Op = TLI.isZExtFree(Op.getValueType(), SVT)
-               ? DAG.getZExtOrTrunc(Op, SDLoc(SVN), SVT)
-               : DAG.getSExtOrTrunc(Op, SDLoc(SVN), SVT);
+      Op = Op.isUndef() ? DAG.getUNDEF(SVT)
+                        : (TLI.isZExtFree(Op.getValueType(), SVT)
+                               ? DAG.getZExtOrTrunc(Op, SDLoc(SVN), SVT)
+                               : DAG.getSExtOrTrunc(Op, SDLoc(SVN), SVT));
   return DAG.getBuildVector(VT, SDLoc(SVN), Ops);
 }
 
+// Match shuffles that can be converted to *_vector_extend_in_reg.
+// This is often generated during legalization.
+// e.g. v4i32 <0,u,1,u> -> (v2i64 any_vector_extend_in_reg(v4i32 src)),
+// and returns the EVT to which the extension should be performed.
+// NOTE: this assumes that the src is the first operand of the shuffle.
+static std::optional<EVT> canCombineShuffleToExtendVectorInreg(
+    unsigned Opcode, EVT VT, std::function<bool(unsigned)> Match,
+    SelectionDAG &DAG, const TargetLowering &TLI, bool LegalTypes,
+    bool LegalOperations) {
+  bool IsBigEndian = DAG.getDataLayout().isBigEndian();
+
+  // TODO Add support for big-endian when we have a test case.
+  if (!VT.isInteger() || IsBigEndian)
+    return std::nullopt;
+
+  unsigned NumElts = VT.getVectorNumElements();
+  unsigned EltSizeInBits = VT.getScalarSizeInBits();
+
+  // Attempt to match a '*_extend_vector_inreg' shuffle, we just search for
+  // power-of-2 extensions as they are the most likely.
+  // FIXME: should try Scale == NumElts case too,
+  for (unsigned Scale = 2; Scale < NumElts; Scale *= 2) {
+    // The vector width must be a multiple of Scale.
+    if (NumElts % Scale != 0)
+      continue;
+
+    EVT OutSVT = EVT::getIntegerVT(*DAG.getContext(), EltSizeInBits * Scale);
+    EVT OutVT = EVT::getVectorVT(*DAG.getContext(), OutSVT, NumElts / Scale);
+
+    if ((LegalTypes && !TLI.isTypeLegal(OutVT)) ||
+        (LegalOperations && !TLI.isOperationLegalOrCustom(Opcode, OutVT)))
+      continue;
+
+    if (Match(Scale))
+      return OutVT;
+  }
+
+  return std::nullopt;
+}
+
 // Match shuffles that can be converted to any_vector_extend_in_reg.
 // This is often generated during legalization.
 // e.g. v4i32 <0,u,1,u> -> (v2i64 any_vector_extend_in_reg(v4i32 src))
-// TODO Add support for ZERO_EXTEND_VECTOR_INREG when we have a test case.
-static SDValue combineShuffleToVectorExtend(ShuffleVectorSDNode *SVN,
-                                            SelectionDAG &DAG,
-                                            const TargetLowering &TLI,
-                                            bool LegalOperations) {
+static SDValue combineShuffleToAnyExtendVectorInreg(ShuffleVectorSDNode *SVN,
+                                                    SelectionDAG &DAG,
+                                                    const TargetLowering &TLI,
+                                                    bool LegalOperations) {
   EVT VT = SVN->getValueType(0);
   bool IsBigEndian = DAG.getDataLayout().isBigEndian();
 
@@ -20805,13 +23286,9 @@ static SDValue combineShuffleToVectorExtend(ShuffleVectorSDNode *SVN,
   if (!VT.isInteger() || IsBigEndian)
     return SDValue();
 
-  unsigned NumElts = VT.getVectorNumElements();
-  unsigned EltSizeInBits = VT.getScalarSizeInBits();
-  ArrayRef<int> Mask = SVN->getMask();
-  SDValue N0 = SVN->getOperand(0);
-
   // shuffle<0,-1,1,-1> == (v2i64 anyextend_vector_inreg(v4i32))
-  auto isAnyExtend = [&Mask, &NumElts](unsigned Scale) {
+  auto isAnyExtend = [NumElts = VT.getVectorNumElements(),
+                      Mask = SVN->getMask()](unsigned Scale) {
     for (unsigned i = 0; i != NumElts; ++i) {
       if (Mask[i] < 0)
         continue;
@@ -20822,27 +23299,138 @@ static SDValue combineShuffleToVectorExtend(ShuffleVectorSDNode *SVN,
     return true;
   };
 
-  // Attempt to match a '*_extend_vector_inreg' shuffle, we just search for
-  // power-of-2 extensions as they are the most likely.
-  for (unsigned Scale = 2; Scale < NumElts; Scale *= 2) {
-    // Check for non power of 2 vector sizes
-    if (NumElts % Scale != 0)
-      continue;
-    if (!isAnyExtend(Scale))
-      continue;
+  unsigned Opcode = ISD::ANY_EXTEND_VECTOR_INREG;
+  SDValue N0 = SVN->getOperand(0);
+  // Never create an illegal type. Only create unsupported operations if we
+  // are pre-legalization.
+  std::optional<EVT> OutVT = canCombineShuffleToExtendVectorInreg(
+      Opcode, VT, isAnyExtend, DAG, TLI, /*LegalTypes=*/true, LegalOperations);
+  if (!OutVT)
+    return SDValue();
+  return DAG.getBitcast(VT, DAG.getNode(Opcode, SDLoc(SVN), *OutVT, N0));
+}
 
-    EVT OutSVT = EVT::getIntegerVT(*DAG.getContext(), EltSizeInBits * Scale);
-    EVT OutVT = EVT::getVectorVT(*DAG.getContext(), OutSVT, NumElts / Scale);
-    // Never create an illegal type. Only create unsupported operations if we
-    // are pre-legalization.
-    if (TLI.isTypeLegal(OutVT))
-      if (!LegalOperations ||
-          TLI.isOperationLegalOrCustom(ISD::ANY_EXTEND_VECTOR_INREG, OutVT))
-        return DAG.getBitcast(VT,
-                              DAG.getNode(ISD::ANY_EXTEND_VECTOR_INREG,
-                                          SDLoc(SVN), OutVT, N0));
-  }
+// Match shuffles that can be converted to zero_extend_vector_inreg.
+// This is often generated during legalization.
+// e.g. v4i32 <0,z,1,u> -> (v2i64 zero_extend_vector_inreg(v4i32 src))
+static SDValue combineShuffleToZeroExtendVectorInReg(ShuffleVectorSDNode *SVN,
+                                                     SelectionDAG &DAG,
+                                                     const TargetLowering &TLI,
+                                                     bool LegalOperations) {
+  bool LegalTypes = true;
+  EVT VT = SVN->getValueType(0);
+  assert(!VT.isScalableVector() && "Encountered scalable shuffle?");
+  unsigned NumElts = VT.getVectorNumElements();
+  unsigned EltSizeInBits = VT.getScalarSizeInBits();
+
+  // TODO: add support for big-endian when we have a test case.
+  bool IsBigEndian = DAG.getDataLayout().isBigEndian();
+  if (!VT.isInteger() || IsBigEndian)
+    return SDValue();
+
+  SmallVector<int, 16> Mask(SVN->getMask().begin(), SVN->getMask().end());
+  auto ForEachDecomposedIndice = [NumElts, &Mask](auto Fn) {
+    for (int &Indice : Mask) {
+      if (Indice < 0)
+        continue;
+      int OpIdx = (unsigned)Indice < NumElts ? 0 : 1;
+      int OpEltIdx = (unsigned)Indice < NumElts ? Indice : Indice - NumElts;
+      Fn(Indice, OpIdx, OpEltIdx);
+    }
+  };
+
+  // Which elements of which operand does this shuffle demand?
+  std::array<APInt, 2> OpsDemandedElts;
+  for (APInt &OpDemandedElts : OpsDemandedElts)
+    OpDemandedElts = APInt::getZero(NumElts);
+  ForEachDecomposedIndice(
+      [&OpsDemandedElts](int &Indice, int OpIdx, int OpEltIdx) {
+        OpsDemandedElts[OpIdx].setBit(OpEltIdx);
+      });
+
+  // Element-wise(!), which of these demanded elements are know to be zero?
+  std::array<APInt, 2> OpsKnownZeroElts;
+  for (auto I : zip(SVN->ops(), OpsDemandedElts, OpsKnownZeroElts))
+    std::get<2>(I) =
+        DAG.computeVectorKnownZeroElements(std::get<0>(I), std::get<1>(I));
+
+  // Manifest zeroable element knowledge in the shuffle mask.
+  // NOTE: we don't have 'zeroable' sentinel value in generic DAG,
+  //       this is a local invention, but it won't leak into DAG.
+  // FIXME: should we not manifest them, but just check when matching?
+  bool HadZeroableElts = false;
+  ForEachDecomposedIndice([&OpsKnownZeroElts, &HadZeroableElts](
+                              int &Indice, int OpIdx, int OpEltIdx) {
+    if (OpsKnownZeroElts[OpIdx][OpEltIdx]) {
+      Indice = -2; // Zeroable element.
+      HadZeroableElts = true;
+    }
+  });
+
+  // Don't proceed unless we've refined at least one zeroable mask indice.
+  // If we didn't, then we are still trying to match the same shuffle mask
+  // we previously tried to match as ISD::ANY_EXTEND_VECTOR_INREG,
+  // and evidently failed. Proceeding will lead to endless combine loops.
+  if (!HadZeroableElts)
+    return SDValue();
+
+  // The shuffle may be more fine-grained than we want. Widen elements first.
+  // FIXME: should we do this before manifesting zeroable shuffle mask indices?
+  SmallVector<int, 16> ScaledMask;
+  getShuffleMaskWithWidestElts(Mask, ScaledMask);
+  assert(Mask.size() >= ScaledMask.size() &&
+         Mask.size() % ScaledMask.size() == 0 && "Unexpected mask widening.");
+  int Prescale = Mask.size() / ScaledMask.size();
+
+  NumElts = ScaledMask.size();
+  EltSizeInBits *= Prescale;
+
+  EVT PrescaledVT = EVT::getVectorVT(
+      *DAG.getContext(), EVT::getIntegerVT(*DAG.getContext(), EltSizeInBits),
+      NumElts);
+
+  if (LegalTypes && !TLI.isTypeLegal(PrescaledVT) && TLI.isTypeLegal(VT))
+    return SDValue();
+
+  // For example,
+  // shuffle<0,z,1,-1> == (v2i64 zero_extend_vector_inreg(v4i32))
+  // But not shuffle<z,z,1,-1> and not shuffle<0,z,z,-1> ! (for same types)
+  auto isZeroExtend = [NumElts, &ScaledMask](unsigned Scale) {
+    assert(Scale >= 2 && Scale <= NumElts && NumElts % Scale == 0 &&
+           "Unexpected mask scaling factor.");
+    ArrayRef<int> Mask = ScaledMask;
+    for (unsigned SrcElt = 0, NumSrcElts = NumElts / Scale;
+         SrcElt != NumSrcElts; ++SrcElt) {
+      // Analyze the shuffle mask in Scale-sized chunks.
+      ArrayRef<int> MaskChunk = Mask.take_front(Scale);
+      assert(MaskChunk.size() == Scale && "Unexpected mask size.");
+      Mask = Mask.drop_front(MaskChunk.size());
+      // The first indice in this chunk must be SrcElt, but not zero!
+      // FIXME: undef should be fine, but that results in more-defined result.
+      if (int FirstIndice = MaskChunk[0]; (unsigned)FirstIndice != SrcElt)
+        return false;
+      // The rest of the indices in this chunk must be zeros.
+      // FIXME: undef should be fine, but that results in more-defined result.
+      if (!all_of(MaskChunk.drop_front(1),
+                  [](int Indice) { return Indice == -2; }))
+        return false;
+    }
+    assert(Mask.empty() && "Did not process the whole mask?");
+    return true;
+  };
 
+  unsigned Opcode = ISD::ZERO_EXTEND_VECTOR_INREG;
+  for (bool Commuted : {false, true}) {
+    SDValue Op = SVN->getOperand(!Commuted ? 0 : 1);
+    if (Commuted)
+      ShuffleVectorSDNode::commuteMask(ScaledMask);
+    std::optional<EVT> OutVT = canCombineShuffleToExtendVectorInreg(
+        Opcode, PrescaledVT, isZeroExtend, DAG, TLI, LegalTypes,
+        LegalOperations);
+    if (OutVT)
+      return DAG.getBitcast(VT, DAG.getNode(Opcode, SDLoc(SVN), *OutVT,
+                                            DAG.getBitcast(PrescaledVT, Op)));
+  }
   return SDValue();
 }
 
@@ -20914,8 +23502,58 @@ static SDValue combineTruncationShuffle(ShuffleVectorSDNode *SVN,
 // the masks of the shuffles.
 static SDValue combineShuffleOfSplatVal(ShuffleVectorSDNode *Shuf,
                                         SelectionDAG &DAG) {
+  EVT VT = Shuf->getValueType(0);
+  unsigned NumElts = VT.getVectorNumElements();
+
   if (!Shuf->getOperand(1).isUndef())
     return SDValue();
+
+  // See if this unary non-splat shuffle actually *is* a splat shuffle,
+  // in disguise, with all demanded elements being identical.
+  // FIXME: this can be done per-operand.
+  if (!Shuf->isSplat()) {
+    APInt DemandedElts(NumElts, 0);
+    for (int Idx : Shuf->getMask()) {
+      if (Idx < 0)
+        continue; // Ignore sentinel indices.
+      assert((unsigned)Idx < NumElts && "Out-of-bounds shuffle indice?");
+      DemandedElts.setBit(Idx);
+    }
+    assert(DemandedElts.countPopulation() > 1 && "Is a splat shuffle already?");
+    APInt UndefElts;
+    if (DAG.isSplatValue(Shuf->getOperand(0), DemandedElts, UndefElts)) {
+      // Even if all demanded elements are splat, some of them could be undef.
+      // Which lowest demanded element is *not* known-undef?
+      std::optional<unsigned> MinNonUndefIdx;
+      for (int Idx : Shuf->getMask()) {
+        if (Idx < 0 || UndefElts[Idx])
+          continue; // Ignore sentinel indices, and undef elements.
+        MinNonUndefIdx = std::min<unsigned>(Idx, MinNonUndefIdx.value_or(~0U));
+      }
+      if (!MinNonUndefIdx)
+        return DAG.getUNDEF(VT); // All undef - result is undef.
+      assert(*MinNonUndefIdx < NumElts && "Expected valid element index.");
+      SmallVector<int, 8> SplatMask(Shuf->getMask().begin(),
+                                    Shuf->getMask().end());
+      for (int &Idx : SplatMask) {
+        if (Idx < 0)
+          continue; // Passthrough sentinel indices.
+        // Otherwise, just pick the lowest demanded non-undef element.
+        // Or sentinel undef, if we know we'd pick a known-undef element.
+        Idx = UndefElts[Idx] ? -1 : *MinNonUndefIdx;
+      }
+      assert(SplatMask != Shuf->getMask() && "Expected mask to change!");
+      return DAG.getVectorShuffle(VT, SDLoc(Shuf), Shuf->getOperand(0),
+                                  Shuf->getOperand(1), SplatMask);
+    }
+  }
+
+  // If the inner operand is a known splat with no undefs, just return that directly.
+  // TODO: Create DemandedElts mask from Shuf's mask.
+  // TODO: Allow undef elements and merge with the shuffle code below.
+  if (DAG.isSplatValue(Shuf->getOperand(0), /*AllowUndefs*/ false))
+    return Shuf->getOperand(0);
+
   auto *Splat = dyn_cast<ShuffleVectorSDNode>(Shuf->getOperand(0));
   if (!Splat || !Splat->isSplat())
     return SDValue();
@@ -20962,6 +23600,53 @@ static SDValue combineShuffleOfSplatVal(ShuffleVectorSDNode *Shuf,
                               NewMask);
 }
 
+// Combine shuffles of bitcasts into a shuffle of the bitcast type, providing
+// the mask can be treated as a larger type.
+static SDValue combineShuffleOfBitcast(ShuffleVectorSDNode *SVN,
+                                       SelectionDAG &DAG,
+                                       const TargetLowering &TLI,
+                                       bool LegalOperations) {
+  SDValue Op0 = SVN->getOperand(0);
+  SDValue Op1 = SVN->getOperand(1);
+  EVT VT = SVN->getValueType(0);
+  if (Op0.getOpcode() != ISD::BITCAST)
+    return SDValue();
+  EVT InVT = Op0.getOperand(0).getValueType();
+  if (!InVT.isVector() ||
+      (!Op1.isUndef() && (Op1.getOpcode() != ISD::BITCAST ||
+                          Op1.getOperand(0).getValueType() != InVT)))
+    return SDValue();
+  if (isAnyConstantBuildVector(Op0.getOperand(0)) &&
+      (Op1.isUndef() || isAnyConstantBuildVector(Op1.getOperand(0))))
+    return SDValue();
+
+  int VTLanes = VT.getVectorNumElements();
+  int InLanes = InVT.getVectorNumElements();
+  if (VTLanes <= InLanes || VTLanes % InLanes != 0 ||
+      (LegalOperations &&
+       !TLI.isOperationLegalOrCustom(ISD::VECTOR_SHUFFLE, InVT)))
+    return SDValue();
+  int Factor = VTLanes / InLanes;
+
+  // Check that each group of lanes in the mask are either undef or make a valid
+  // mask for the wider lane type.
+  ArrayRef<int> Mask = SVN->getMask();
+  SmallVector<int> NewMask;
+  if (!widenShuffleMaskElts(Factor, Mask, NewMask))
+    return SDValue();
+
+  if (!TLI.isShuffleMaskLegal(NewMask, InVT))
+    return SDValue();
+
+  // Create the new shuffle with the new mask and bitcast it back to the
+  // original type.
+  SDLoc DL(SVN);
+  Op0 = Op0.getOperand(0);
+  Op1 = Op1.isUndef() ? DAG.getUNDEF(InVT) : Op1.getOperand(0);
+  SDValue NewShuf = DAG.getVectorShuffle(InVT, DL, Op0, Op1, NewMask);
+  return DAG.getBitcast(VT, NewShuf);
+}
+
 /// Combine shuffle of shuffle of the form:
 /// shuf (shuf X, undef, InnerMask), undef, OuterMask --> splat X
 static SDValue formSplatFromShuffles(ShuffleVectorSDNode *OuterShuf,
@@ -21046,7 +23731,7 @@ static SDValue replaceShuffleOfInsert(ShuffleVectorSDNode *Shuf,
   // First, check if we are taking one element of a vector and shuffling that
   // element into another vector.
   ArrayRef<int> Mask = Shuf->getMask();
-  SmallVector<int, 16> CommutedMask(Mask.begin(), Mask.end());
+  SmallVector<int, 16> CommutedMask(Mask);
   SDValue Op0 = Shuf->getOperand(0);
   SDValue Op1 = Shuf->getOperand(1);
   int ShufOp0Index = getShuffleMaskIndexOfOneElementFromOp0IntoOp1(Mask);
@@ -21134,15 +23819,9 @@ SDValue DAGCombiner::visitVECTOR_SHUFFLE(SDNode *N) {
   ShuffleVectorSDNode *SVN = cast<ShuffleVectorSDNode>(N);
 
   // Canonicalize shuffle v, v -> v, undef
-  if (N0 == N1) {
-    SmallVector<int, 8> NewMask;
-    for (unsigned i = 0; i != NumElts; ++i) {
-      int Idx = SVN->getMaskElt(i);
-      if (Idx >= (int)NumElts) Idx -= NumElts;
-      NewMask.push_back(Idx);
-    }
-    return DAG.getVectorShuffle(VT, SDLoc(N), N0, DAG.getUNDEF(VT), NewMask);
-  }
+  if (N0 == N1)
+    return DAG.getVectorShuffle(VT, SDLoc(N), N0, DAG.getUNDEF(VT),
+                                createUnaryMask(SVN->getMask(), NumElts));
 
   // Canonicalize shuffle undef, v -> v, undef.  Commute the shuffle mask.
   if (N0.isUndef())
@@ -21179,7 +23858,7 @@ SDValue DAGCombiner::visitVECTOR_SHUFFLE(SDNode *N) {
   if (SVN->isSplat() && SVN->getSplatIndex() < (int)NumElts) {
     int SplatIndex = SVN->getSplatIndex();
     if (N0.hasOneUse() && TLI.isExtractVecEltCheap(VT, SplatIndex) &&
-        TLI.isBinOp(N0.getOpcode()) && N0.getNode()->getNumValues() == 1) {
+        TLI.isBinOp(N0.getOpcode()) && N0->getNumValues() == 1) {
       // splat (vector_bo L, R), Index -->
       // splat (scalar_bo (extelt L, Index), (extelt R, Index))
       SDValue L = N0.getOperand(0), R = N0.getOperand(1);
@@ -21188,13 +23867,43 @@ SDValue DAGCombiner::visitVECTOR_SHUFFLE(SDNode *N) {
       SDValue Index = DAG.getVectorIdxConstant(SplatIndex, DL);
       SDValue ExtL = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, DL, EltVT, L, Index);
       SDValue ExtR = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, DL, EltVT, R, Index);
-      SDValue NewBO = DAG.getNode(N0.getOpcode(), DL, EltVT, ExtL, ExtR,
-                                  N0.getNode()->getFlags());
+      SDValue NewBO =
+          DAG.getNode(N0.getOpcode(), DL, EltVT, ExtL, ExtR, N0->getFlags());
       SDValue Insert = DAG.getNode(ISD::SCALAR_TO_VECTOR, DL, VT, NewBO);
       SmallVector<int, 16> ZeroMask(VT.getVectorNumElements(), 0);
       return DAG.getVectorShuffle(VT, DL, Insert, DAG.getUNDEF(VT), ZeroMask);
     }
 
+    // splat(scalar_to_vector(x), 0) -> build_vector(x,...,x)
+    // splat(insert_vector_elt(v, x, c), c) -> build_vector(x,...,x)
+    if ((!LegalOperations || TLI.isOperationLegal(ISD::BUILD_VECTOR, VT)) &&
+        N0.hasOneUse()) {
+      if (N0.getOpcode() == ISD::SCALAR_TO_VECTOR && SplatIndex == 0)
+        return DAG.getSplatBuildVector(VT, SDLoc(N), N0.getOperand(0));
+
+      if (N0.getOpcode() == ISD::INSERT_VECTOR_ELT)
+        if (auto *Idx = dyn_cast<ConstantSDNode>(N0.getOperand(2)))
+          if (Idx->getAPIntValue() == SplatIndex)
+            return DAG.getSplatBuildVector(VT, SDLoc(N), N0.getOperand(1));
+
+      // Look through a bitcast if LE and splatting lane 0, through to a
+      // scalar_to_vector or a build_vector.
+      if (N0.getOpcode() == ISD::BITCAST && N0.getOperand(0).hasOneUse() &&
+          SplatIndex == 0 && DAG.getDataLayout().isLittleEndian() &&
+          (N0.getOperand(0).getOpcode() == ISD::SCALAR_TO_VECTOR ||
+           N0.getOperand(0).getOpcode() == ISD::BUILD_VECTOR)) {
+        EVT N00VT = N0.getOperand(0).getValueType();
+        if (VT.getScalarSizeInBits() <= N00VT.getScalarSizeInBits() &&
+            VT.isInteger() && N00VT.isInteger()) {
+          EVT InVT =
+              TLI.getTypeToTransformTo(*DAG.getContext(), VT.getScalarType());
+          SDValue Op = DAG.getZExtOrTrunc(N0.getOperand(0).getOperand(0),
+                                          SDLoc(N), InVT);
+          return DAG.getSplatBuildVector(VT, SDLoc(N), Op);
+        }
+      }
+    }
+
     // If this is a bit convert that changes the element type of the vector but
     // not the number of vector elements, look through it.  Be careful not to
     // look though conversions that change things like v4f32 to v2f64.
@@ -21253,7 +23962,8 @@ SDValue DAGCombiner::visitVECTOR_SHUFFLE(SDNode *N) {
     return ShufOp;
 
   // Match shuffles that can be converted to any_vector_extend_in_reg.
-  if (SDValue V = combineShuffleToVectorExtend(SVN, DAG, TLI, LegalOperations))
+  if (SDValue V =
+          combineShuffleToAnyExtendVectorInreg(SVN, DAG, TLI, LegalOperations))
     return V;
 
   // Combine "truncate_vector_in_reg" style shuffles.
@@ -21293,6 +24003,127 @@ SDValue DAGCombiner::visitVECTOR_SHUFFLE(SDNode *N) {
     }
   }
 
+  // See if we can replace a shuffle with an insert_subvector.
+  // e.g. v2i32 into v8i32:
+  // shuffle(lhs,concat(rhs0,rhs1,rhs2,rhs3),0,1,2,3,10,11,6,7).
+  // --> insert_subvector(lhs,rhs1,4).
+  if (Level < AfterLegalizeVectorOps && TLI.isTypeLegal(VT) &&
+      TLI.isOperationLegalOrCustom(ISD::INSERT_SUBVECTOR, VT)) {
+    auto ShuffleToInsert = [&](SDValue LHS, SDValue RHS, ArrayRef<int> Mask) {
+      // Ensure RHS subvectors are legal.
+      assert(RHS.getOpcode() == ISD::CONCAT_VECTORS && "Can't find subvectors");
+      EVT SubVT = RHS.getOperand(0).getValueType();
+      int NumSubVecs = RHS.getNumOperands();
+      int NumSubElts = SubVT.getVectorNumElements();
+      assert((NumElts % NumSubElts) == 0 && "Subvector mismatch");
+      if (!TLI.isTypeLegal(SubVT))
+        return SDValue();
+
+      // Don't bother if we have an unary shuffle (matches undef + LHS elts).
+      if (all_of(Mask, [NumElts](int M) { return M < (int)NumElts; }))
+        return SDValue();
+
+      // Search [NumSubElts] spans for RHS sequence.
+      // TODO: Can we avoid nested loops to increase performance?
+      SmallVector<int> InsertionMask(NumElts);
+      for (int SubVec = 0; SubVec != NumSubVecs; ++SubVec) {
+        for (int SubIdx = 0; SubIdx != (int)NumElts; SubIdx += NumSubElts) {
+          // Reset mask to identity.
+          std::iota(InsertionMask.begin(), InsertionMask.end(), 0);
+
+          // Add subvector insertion.
+          std::iota(InsertionMask.begin() + SubIdx,
+                    InsertionMask.begin() + SubIdx + NumSubElts,
+                    NumElts + (SubVec * NumSubElts));
+
+          // See if the shuffle mask matches the reference insertion mask.
+          bool MatchingShuffle = true;
+          for (int i = 0; i != (int)NumElts; ++i) {
+            int ExpectIdx = InsertionMask[i];
+            int ActualIdx = Mask[i];
+            if (0 <= ActualIdx && ExpectIdx != ActualIdx) {
+              MatchingShuffle = false;
+              break;
+            }
+          }
+
+          if (MatchingShuffle)
+            return DAG.getNode(ISD::INSERT_SUBVECTOR, SDLoc(N), VT, LHS,
+                               RHS.getOperand(SubVec),
+                               DAG.getVectorIdxConstant(SubIdx, SDLoc(N)));
+        }
+      }
+      return SDValue();
+    };
+    ArrayRef<int> Mask = SVN->getMask();
+    if (N1.getOpcode() == ISD::CONCAT_VECTORS)
+      if (SDValue InsertN1 = ShuffleToInsert(N0, N1, Mask))
+        return InsertN1;
+    if (N0.getOpcode() == ISD::CONCAT_VECTORS) {
+      SmallVector<int> CommuteMask(Mask);
+      ShuffleVectorSDNode::commuteMask(CommuteMask);
+      if (SDValue InsertN0 = ShuffleToInsert(N1, N0, CommuteMask))
+        return InsertN0;
+    }
+  }
+
+  // If we're not performing a select/blend shuffle, see if we can convert the
+  // shuffle into a AND node, with all the out-of-lane elements are known zero.
+  if (Level < AfterLegalizeDAG && TLI.isTypeLegal(VT)) {
+    bool IsInLaneMask = true;
+    ArrayRef<int> Mask = SVN->getMask();
+    SmallVector<int, 16> ClearMask(NumElts, -1);
+    APInt DemandedLHS = APInt::getNullValue(NumElts);
+    APInt DemandedRHS = APInt::getNullValue(NumElts);
+    for (int I = 0; I != (int)NumElts; ++I) {
+      int M = Mask[I];
+      if (M < 0)
+        continue;
+      ClearMask[I] = M == I ? I : (I + NumElts);
+      IsInLaneMask &= (M == I) || (M == (int)(I + NumElts));
+      if (M != I) {
+        APInt &Demanded = M < (int)NumElts ? DemandedLHS : DemandedRHS;
+        Demanded.setBit(M % NumElts);
+      }
+    }
+    // TODO: Should we try to mask with N1 as well?
+    if (!IsInLaneMask &&
+        (!DemandedLHS.isNullValue() || !DemandedRHS.isNullValue()) &&
+        (DemandedLHS.isNullValue() ||
+         DAG.MaskedVectorIsZero(N0, DemandedLHS)) &&
+        (DemandedRHS.isNullValue() ||
+         DAG.MaskedVectorIsZero(N1, DemandedRHS))) {
+      SDLoc DL(N);
+      EVT IntVT = VT.changeVectorElementTypeToInteger();
+      EVT IntSVT = VT.getVectorElementType().changeTypeToInteger();
+      // Transform the type to a legal type so that the buildvector constant
+      // elements are not illegal. Make sure that the result is larger than the
+      // original type, incase the value is split into two (eg i64->i32).
+      if (!TLI.isTypeLegal(IntSVT) && LegalTypes)
+        IntSVT = TLI.getTypeToTransformTo(*DAG.getContext(), IntSVT);
+      if (IntSVT.getSizeInBits() >= IntVT.getScalarSizeInBits()) {
+        SDValue ZeroElt = DAG.getConstant(0, DL, IntSVT);
+        SDValue AllOnesElt = DAG.getAllOnesConstant(DL, IntSVT);
+        SmallVector<SDValue, 16> AndMask(NumElts, DAG.getUNDEF(IntSVT));
+        for (int I = 0; I != (int)NumElts; ++I)
+          if (0 <= Mask[I])
+            AndMask[I] = Mask[I] == I ? AllOnesElt : ZeroElt;
+
+        // See if a clear mask is legal instead of going via
+        // XformToShuffleWithZero which loses UNDEF mask elements.
+        if (TLI.isVectorClearMaskLegal(ClearMask, IntVT))
+          return DAG.getBitcast(
+              VT, DAG.getVectorShuffle(IntVT, DL, DAG.getBitcast(IntVT, N0),
+                                      DAG.getConstant(0, DL, IntVT), ClearMask));
+
+        if (TLI.isOperationLegalOrCustom(ISD::AND, IntVT))
+          return DAG.getBitcast(
+              VT, DAG.getNode(ISD::AND, DL, IntVT, DAG.getBitcast(IntVT, N0),
+                              DAG.getBuildVector(IntVT, DL, AndMask)));
+      }
+    }
+  }
+
   // Attempt to combine a shuffle of 2 inputs of 'scalar sources' -
   // BUILD_VECTOR or SCALAR_TO_VECTOR into a single BUILD_VECTOR.
   if (Level < AfterLegalizeDAG && TLI.isTypeLegal(VT))
@@ -21354,6 +24185,11 @@ SDValue DAGCombiner::visitVECTOR_SHUFFLE(SDNode *N) {
     }
   }
 
+  // Match shuffles of bitcasts, so long as the mask can be treated as the
+  // larger type.
+  if (SDValue V = combineShuffleOfBitcast(SVN, DAG, TLI, LegalOperations))
+    return V;
+
   // Compute the combined shuffle mask for a shuffle with SV0 as the first
   // operand, and SV1 as the second operand.
   // i.e. Merge SVN(OtherSVN, N1) -> shuffle(SV0, SV1, Mask) iff Commute = false
@@ -21613,55 +24449,101 @@ SDValue DAGCombiner::visitVECTOR_SHUFFLE(SDNode *N) {
   if (SDValue V = foldShuffleOfConcatUndefs(SVN, DAG))
     return V;
 
+  // Match shuffles that can be converted to ISD::ZERO_EXTEND_VECTOR_INREG.
+  // Perform this really late, because it could eliminate knowledge
+  // of undef elements created by this shuffle.
+  if (Level < AfterLegalizeTypes)
+    if (SDValue V = combineShuffleToZeroExtendVectorInReg(SVN, DAG, TLI,
+                                                          LegalOperations))
+      return V;
+
   return SDValue();
 }
 
 SDValue DAGCombiner::visitSCALAR_TO_VECTOR(SDNode *N) {
-  SDValue InVal = N->getOperand(0);
   EVT VT = N->getValueType(0);
+  if (!VT.isFixedLengthVector())
+    return SDValue();
+
+  // Try to convert a scalar binop with an extracted vector element to a vector
+  // binop. This is intended to reduce potentially expensive register moves.
+  // TODO: Check if both operands are extracted.
+  // TODO: Generalize this, so it can be called from visitINSERT_VECTOR_ELT().
+  SDValue Scalar = N->getOperand(0);
+  unsigned Opcode = Scalar.getOpcode();
+  EVT VecEltVT = VT.getScalarType();
+  if (Scalar.hasOneUse() && Scalar->getNumValues() == 1 &&
+      TLI.isBinOp(Opcode) && Scalar.getValueType() == VecEltVT &&
+      Scalar.getOperand(0).getValueType() == VecEltVT &&
+      Scalar.getOperand(1).getValueType() == VecEltVT &&
+      DAG.isSafeToSpeculativelyExecute(Opcode) && hasOperation(Opcode, VT)) {
+    // Match an extract element and get a shuffle mask equivalent.
+    SmallVector<int, 8> ShufMask(VT.getVectorNumElements(), -1);
+
+    for (int i : {0, 1}) {
+      // s2v (bo (extelt V, Idx), C) --> shuffle (bo V, C'), {Idx, -1, -1...}
+      // s2v (bo C, (extelt V, Idx)) --> shuffle (bo C', V), {Idx, -1, -1...}
+      SDValue EE = Scalar.getOperand(i);
+      auto *C = dyn_cast<ConstantSDNode>(Scalar.getOperand(i ? 0 : 1));
+      if (C && EE.getOpcode() == ISD::EXTRACT_VECTOR_ELT &&
+          EE.getOperand(0).getValueType() == VT &&
+          isa<ConstantSDNode>(EE.getOperand(1))) {
+        // Mask = {ExtractIndex, undef, undef....}
+        ShufMask[0] = EE.getConstantOperandVal(1);
+        // Make sure the shuffle is legal if we are crossing lanes.
+        if (TLI.isShuffleMaskLegal(ShufMask, VT)) {
+          SDLoc DL(N);
+          SDValue V[] = {EE.getOperand(0),
+                         DAG.getConstant(C->getAPIntValue(), DL, VT)};
+          SDValue VecBO = DAG.getNode(Opcode, DL, VT, V[i], V[1 - i]);
+          return DAG.getVectorShuffle(VT, DL, VecBO, DAG.getUNDEF(VT),
+                                      ShufMask);
+        }
+      }
+    }
+  }
 
   // Replace a SCALAR_TO_VECTOR(EXTRACT_VECTOR_ELT(V,C0)) pattern
   // with a VECTOR_SHUFFLE and possible truncate.
-  if (InVal.getOpcode() == ISD::EXTRACT_VECTOR_ELT &&
-      VT.isFixedLengthVector() &&
-      InVal->getOperand(0).getValueType().isFixedLengthVector()) {
-    SDValue InVec = InVal->getOperand(0);
-    SDValue EltNo = InVal->getOperand(1);
-    auto InVecT = InVec.getValueType();
-    if (ConstantSDNode *C0 = dyn_cast<ConstantSDNode>(EltNo)) {
-      SmallVector<int, 8> NewMask(InVecT.getVectorNumElements(), -1);
-      int Elt = C0->getZExtValue();
-      NewMask[0] = Elt;
-      // If we have an implict truncate do truncate here as long as it's legal.
-      // if it's not legal, this should
-      if (VT.getScalarType() != InVal.getValueType() &&
-          InVal.getValueType().isScalarInteger() &&
-          isTypeLegal(VT.getScalarType())) {
-        SDValue Val =
-            DAG.getNode(ISD::TRUNCATE, SDLoc(InVal), VT.getScalarType(), InVal);
-        return DAG.getNode(ISD::SCALAR_TO_VECTOR, SDLoc(N), VT, Val);
-      }
-      if (VT.getScalarType() == InVecT.getScalarType() &&
-          VT.getVectorNumElements() <= InVecT.getVectorNumElements()) {
-        SDValue LegalShuffle =
-          TLI.buildLegalVectorShuffle(InVecT, SDLoc(N), InVec,
-                                      DAG.getUNDEF(InVecT), NewMask, DAG);
-        if (LegalShuffle) {
-          // If the initial vector is the correct size this shuffle is a
-          // valid result.
-          if (VT == InVecT)
-            return LegalShuffle;
-          // If not we must truncate the vector.
-          if (VT.getVectorNumElements() != InVecT.getVectorNumElements()) {
-            SDValue ZeroIdx = DAG.getVectorIdxConstant(0, SDLoc(N));
-            EVT SubVT = EVT::getVectorVT(*DAG.getContext(),
-                                         InVecT.getVectorElementType(),
-                                         VT.getVectorNumElements());
-            return DAG.getNode(ISD::EXTRACT_SUBVECTOR, SDLoc(N), SubVT,
-                               LegalShuffle, ZeroIdx);
-          }
-        }
-      }
+  if (Opcode != ISD::EXTRACT_VECTOR_ELT ||
+      !Scalar.getOperand(0).getValueType().isFixedLengthVector())
+    return SDValue();
+
+  // If we have an implicit truncate, truncate here if it is legal.
+  if (VecEltVT != Scalar.getValueType() &&
+      Scalar.getValueType().isScalarInteger() && isTypeLegal(VecEltVT)) {
+    SDValue Val = DAG.getNode(ISD::TRUNCATE, SDLoc(Scalar), VecEltVT, Scalar);
+    return DAG.getNode(ISD::SCALAR_TO_VECTOR, SDLoc(N), VT, Val);
+  }
+
+  auto *ExtIndexC = dyn_cast<ConstantSDNode>(Scalar.getOperand(1));
+  if (!ExtIndexC)
+    return SDValue();
+
+  SDValue SrcVec = Scalar.getOperand(0);
+  EVT SrcVT = SrcVec.getValueType();
+  unsigned SrcNumElts = SrcVT.getVectorNumElements();
+  unsigned VTNumElts = VT.getVectorNumElements();
+  if (VecEltVT == SrcVT.getScalarType() && VTNumElts <= SrcNumElts) {
+    // Create a shuffle equivalent for scalar-to-vector: {ExtIndex, -1, -1, ...}
+    SmallVector<int, 8> Mask(SrcNumElts, -1);
+    Mask[0] = ExtIndexC->getZExtValue();
+    SDValue LegalShuffle = TLI.buildLegalVectorShuffle(
+        SrcVT, SDLoc(N), SrcVec, DAG.getUNDEF(SrcVT), Mask, DAG);
+    if (!LegalShuffle)
+      return SDValue();
+
+    // If the initial vector is the same size, the shuffle is the result.
+    if (VT == SrcVT)
+      return LegalShuffle;
+
+    // If not, shorten the shuffled vector.
+    if (VTNumElts != SrcNumElts) {
+      SDValue ZeroIdx = DAG.getVectorIdxConstant(0, SDLoc(N));
+      EVT SubVT = EVT::getVectorVT(*DAG.getContext(),
+                                   SrcVT.getVectorElementType(), VTNumElts);
+      return DAG.getNode(ISD::EXTRACT_SUBVECTOR, SDLoc(N), SubVT, LegalShuffle,
+                         ZeroIdx);
     }
   }
 
@@ -21685,6 +24567,11 @@ SDValue DAGCombiner::visitINSERT_SUBVECTOR(SDNode *N) {
       N1.getOperand(1) == N2 && N1.getOperand(0).getValueType() == VT)
     return N1.getOperand(0);
 
+  // Simplify scalar inserts into an undef vector:
+  // insert_subvector undef, (splat X), N2 -> splat X
+  if (N0.isUndef() && N1.getOpcode() == ISD::SPLAT_VECTOR)
+    return DAG.getNode(ISD::SPLAT_VECTOR, SDLoc(N), VT, N1.getOperand(0));
+
   // If we are inserting a bitcast value into an undef, with the same
   // number of elements, just use the bitcast input of the extract.
   // i.e. INSERT_SUBVECTOR UNDEF (BITCAST N1) N2 ->
@@ -21832,6 +24719,16 @@ SDValue DAGCombiner::visitFP16_TO_FP(SDNode *N) {
   return SDValue();
 }
 
+SDValue DAGCombiner::visitFP_TO_BF16(SDNode *N) {
+  SDValue N0 = N->getOperand(0);
+
+  // fold (fp_to_bf16 (bf16_to_fp op)) -> op
+  if (N0->getOpcode() == ISD::BF16_TO_FP)
+    return N0->getOperand(0);
+
+  return SDValue();
+}
+
 SDValue DAGCombiner::visitVECREDUCE(SDNode *N) {
   SDValue N0 = N->getOperand(0);
   EVT VT = N0.getValueType();
@@ -21859,6 +24756,62 @@ SDValue DAGCombiner::visitVECREDUCE(SDNode *N) {
       return DAG.getNode(NewOpcode, SDLoc(N), N->getValueType(0), N0);
   }
 
+  // vecreduce_or(insert_subvector(zero or undef, val)) -> vecreduce_or(val)
+  // vecreduce_and(insert_subvector(ones or undef, val)) -> vecreduce_and(val)
+  if (N0.getOpcode() == ISD::INSERT_SUBVECTOR &&
+      TLI.isTypeLegal(N0.getOperand(1).getValueType())) {
+    SDValue Vec = N0.getOperand(0);
+    SDValue Subvec = N0.getOperand(1);
+    if ((Opcode == ISD::VECREDUCE_OR &&
+         (N0.getOperand(0).isUndef() || isNullOrNullSplat(Vec))) ||
+        (Opcode == ISD::VECREDUCE_AND &&
+         (N0.getOperand(0).isUndef() || isAllOnesOrAllOnesSplat(Vec))))
+      return DAG.getNode(Opcode, SDLoc(N), N->getValueType(0), Subvec);
+  }
+
+  return SDValue();
+}
+
+SDValue DAGCombiner::visitVPOp(SDNode *N) {
+
+  if (N->getOpcode() == ISD::VP_GATHER)
+    if (SDValue SD = visitVPGATHER(N))
+      return SD;
+
+  if (N->getOpcode() == ISD::VP_SCATTER)
+    if (SDValue SD = visitVPSCATTER(N))
+      return SD;
+
+  // VP operations in which all vector elements are disabled - either by
+  // determining that the mask is all false or that the EVL is 0 - can be
+  // eliminated.
+  bool AreAllEltsDisabled = false;
+  if (auto EVLIdx = ISD::getVPExplicitVectorLengthIdx(N->getOpcode()))
+    AreAllEltsDisabled |= isNullConstant(N->getOperand(*EVLIdx));
+  if (auto MaskIdx = ISD::getVPMaskIdx(N->getOpcode()))
+    AreAllEltsDisabled |=
+        ISD::isConstantSplatVectorAllZeros(N->getOperand(*MaskIdx).getNode());
+
+  // This is the only generic VP combine we support for now.
+  if (!AreAllEltsDisabled)
+    return SDValue();
+
+  // Binary operations can be replaced by UNDEF.
+  if (ISD::isVPBinaryOp(N->getOpcode()))
+    return DAG.getUNDEF(N->getValueType(0));
+
+  // VP Memory operations can be replaced by either the chain (stores) or the
+  // chain + undef (loads).
+  if (const auto *MemSD = dyn_cast<MemSDNode>(N)) {
+    if (MemSD->writeMem())
+      return MemSD->getChain();
+    return CombineTo(N, DAG.getUNDEF(N->getValueType(0)), MemSD->getChain());
+  }
+
+  // Reduction operations return the start operand when no elements are active.
+  if (ISD::isVPReduction(N->getOpcode()))
+    return N->getOperand(0);
+
   return SDValue();
 }
 
@@ -21918,7 +24871,7 @@ SDValue DAGCombiner::XformToShuffleWithZero(SDNode *N) {
       else
         Bits = Bits.extractBits(NumSubBits, SubIdx * NumSubBits);
 
-      if (Bits.isAllOnesValue())
+      if (Bits.isAllOnes())
         Indices.push_back(i);
       else if (Bits == 0)
         Indices.push_back(i + NumSubElts);
@@ -21953,7 +24906,8 @@ SDValue DAGCombiner::XformToShuffleWithZero(SDNode *N) {
 
 /// If a vector binop is performed on splat values, it may be profitable to
 /// extract, scalarize, and insert/splat.
-static SDValue scalarizeBinOpOfSplats(SDNode *N, SelectionDAG &DAG) {
+static SDValue scalarizeBinOpOfSplats(SDNode *N, SelectionDAG &DAG,
+                                      const SDLoc &DL) {
   SDValue N0 = N->getOperand(0);
   SDValue N1 = N->getOperand(1);
   unsigned Opcode = N->getOpcode();
@@ -21967,14 +24921,17 @@ static SDValue scalarizeBinOpOfSplats(SDNode *N, SelectionDAG &DAG) {
   int Index0, Index1;
   SDValue Src0 = DAG.getSplatSourceVector(N0, Index0);
   SDValue Src1 = DAG.getSplatSourceVector(N1, Index1);
+  // Extract element from splat_vector should be free.
+  // TODO: use DAG.isSplatValue instead?
+  bool IsBothSplatVector = N0.getOpcode() == ISD::SPLAT_VECTOR &&
+                           N1.getOpcode() == ISD::SPLAT_VECTOR;
   if (!Src0 || !Src1 || Index0 != Index1 ||
       Src0.getValueType().getVectorElementType() != EltVT ||
       Src1.getValueType().getVectorElementType() != EltVT ||
-      !TLI.isExtractVecEltCheap(VT, Index0) ||
+      !(IsBothSplatVector || TLI.isExtractVecEltCheap(VT, Index0)) ||
       !TLI.isOperationLegalOrCustom(Opcode, EltVT))
     return SDValue();
 
-  SDLoc DL(N);
   SDValue IndexC = DAG.getVectorIdxConstant(Index0, DL);
   SDValue X = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, DL, EltVT, Src0, IndexC);
   SDValue Y = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, DL, EltVT, Src1, IndexC);
@@ -21993,27 +24950,52 @@ static SDValue scalarizeBinOpOfSplats(SDNode *N, SelectionDAG &DAG) {
   }
 
   // bo (splat X, Index), (splat Y, Index) --> splat (bo X, Y), Index
-  SmallVector<SDValue, 8> Ops(VT.getVectorNumElements(), ScalarBO);
-  return DAG.getBuildVector(VT, DL, Ops);
+  return DAG.getSplat(VT, DL, ScalarBO);
+}
+
+/// Visit a vector cast operation, like FP_EXTEND.
+SDValue DAGCombiner::SimplifyVCastOp(SDNode *N, const SDLoc &DL) {
+  EVT VT = N->getValueType(0);
+  assert(VT.isVector() && "SimplifyVCastOp only works on vectors!");
+  EVT EltVT = VT.getVectorElementType();
+  unsigned Opcode = N->getOpcode();
+
+  SDValue N0 = N->getOperand(0);
+  EVT SrcVT = N0->getValueType(0);
+  EVT SrcEltVT = SrcVT.getVectorElementType();
+  const TargetLowering &TLI = DAG.getTargetLoweringInfo();
+
+  // TODO: promote operation might be also good here?
+  int Index0;
+  SDValue Src0 = DAG.getSplatSourceVector(N0, Index0);
+  if (Src0 &&
+      (N0.getOpcode() == ISD::SPLAT_VECTOR ||
+       TLI.isExtractVecEltCheap(VT, Index0)) &&
+      TLI.isOperationLegalOrCustom(Opcode, EltVT) &&
+      TLI.preferScalarizeSplat(Opcode)) {
+    SDValue IndexC = DAG.getVectorIdxConstant(Index0, DL);
+    SDValue Elt =
+        DAG.getNode(ISD::EXTRACT_VECTOR_ELT, DL, SrcEltVT, Src0, IndexC);
+    SDValue ScalarBO = DAG.getNode(Opcode, DL, EltVT, Elt, N->getFlags());
+    if (VT.isScalableVector())
+      return DAG.getSplatVector(VT, DL, ScalarBO);
+    SmallVector<SDValue, 8> Ops(VT.getVectorNumElements(), ScalarBO);
+    return DAG.getBuildVector(VT, DL, Ops);
+  }
+
+  return SDValue();
 }
 
 /// Visit a binary vector operation, like ADD.
-SDValue DAGCombiner::SimplifyVBinOp(SDNode *N) {
-  assert(N->getValueType(0).isVector() &&
-         "SimplifyVBinOp only works on vectors!");
+SDValue DAGCombiner::SimplifyVBinOp(SDNode *N, const SDLoc &DL) {
+  EVT VT = N->getValueType(0);
+  assert(VT.isVector() && "SimplifyVBinOp only works on vectors!");
 
   SDValue LHS = N->getOperand(0);
   SDValue RHS = N->getOperand(1);
-  SDValue Ops[] = {LHS, RHS};
-  EVT VT = N->getValueType(0);
   unsigned Opcode = N->getOpcode();
   SDNodeFlags Flags = N->getFlags();
 
-  // See if we can constant fold the vector operation.
-  if (SDValue Fold = DAG.FoldConstantVectorArithmetic(
-          Opcode, SDLoc(LHS), LHS.getValueType(), Ops, N->getFlags()))
-    return Fold;
-
   // Move unary shuffles with identical masks after a vector binop:
   // VBinOp (shuffle A, Undef, Mask), (shuffle B, Undef, Mask))
   //   --> shuffle (VBinOp A, B), Undef, Mask
@@ -22021,15 +25003,12 @@ SDValue DAGCombiner::SimplifyVBinOp(SDNode *N) {
   // same types of operations that are in the original sequence. We do have to
   // restrict ops like integer div that have immediate UB (eg, div-by-zero)
   // though. This code is adapted from the identical transform in instcombine.
-  if (Opcode != ISD::UDIV && Opcode != ISD::SDIV &&
-      Opcode != ISD::UREM && Opcode != ISD::SREM &&
-      Opcode != ISD::UDIVREM && Opcode != ISD::SDIVREM) {
+  if (DAG.isSafeToSpeculativelyExecute(Opcode)) {
     auto *Shuf0 = dyn_cast<ShuffleVectorSDNode>(LHS);
     auto *Shuf1 = dyn_cast<ShuffleVectorSDNode>(RHS);
     if (Shuf0 && Shuf1 && Shuf0->getMask().equals(Shuf1->getMask()) &&
         LHS.getOperand(1).isUndef() && RHS.getOperand(1).isUndef() &&
         (LHS.hasOneUse() || RHS.hasOneUse() || LHS == RHS)) {
-      SDLoc DL(N);
       SDValue NewBinOp = DAG.getNode(Opcode, DL, VT, LHS.getOperand(0),
                                      RHS.getOperand(0), Flags);
       SDValue UndefV = LHS.getOperand(1);
@@ -22042,21 +25021,19 @@ SDValue DAGCombiner::SimplifyVBinOp(SDNode *N) {
     // demanded elements analysis. It is further limited to not change a splat
     // of an inserted scalar because that may be optimized better by
     // load-folding or other target-specific behaviors.
-    if (isConstOrConstSplat(RHS) && Shuf0 && is_splat(Shuf0->getMask()) &&
+    if (isConstOrConstSplat(RHS) && Shuf0 && all_equal(Shuf0->getMask()) &&
         Shuf0->hasOneUse() && Shuf0->getOperand(1).isUndef() &&
         Shuf0->getOperand(0).getOpcode() != ISD::INSERT_VECTOR_ELT) {
       // binop (splat X), (splat C) --> splat (binop X, C)
-      SDLoc DL(N);
       SDValue X = Shuf0->getOperand(0);
       SDValue NewBinOp = DAG.getNode(Opcode, DL, VT, X, RHS, Flags);
       return DAG.getVectorShuffle(VT, DL, NewBinOp, DAG.getUNDEF(VT),
                                   Shuf0->getMask());
     }
-    if (isConstOrConstSplat(LHS) && Shuf1 && is_splat(Shuf1->getMask()) &&
+    if (isConstOrConstSplat(LHS) && Shuf1 && all_equal(Shuf1->getMask()) &&
         Shuf1->hasOneUse() && Shuf1->getOperand(1).isUndef() &&
         Shuf1->getOperand(0).getOpcode() != ISD::INSERT_VECTOR_ELT) {
       // binop (splat C), (splat X) --> splat (binop C, X)
-      SDLoc DL(N);
       SDValue X = Shuf1->getOperand(0);
       SDValue NewBinOp = DAG.getNode(Opcode, DL, VT, LHS, X, Flags);
       return DAG.getVectorShuffle(VT, DL, NewBinOp, DAG.getUNDEF(VT),
@@ -22080,7 +25057,6 @@ SDValue DAGCombiner::SimplifyVBinOp(SDNode *N) {
         TLI.isOperationLegalOrCustomOrPromote(Opcode, NarrowVT,
                                               LegalOperations)) {
       // (binop undef, undef) may not return undef, so compute that result.
-      SDLoc DL(N);
       SDValue VecC =
           DAG.getNode(Opcode, DL, VT, DAG.getUNDEF(VT), DAG.getUNDEF(VT));
       SDValue NarrowBO = DAG.getNode(Opcode, DL, NarrowVT, X, Y);
@@ -22107,7 +25083,6 @@ SDValue DAGCombiner::SimplifyVBinOp(SDNode *N) {
     EVT NarrowVT = LHS.getOperand(0).getValueType();
     if (NarrowVT == RHS.getOperand(0).getValueType() &&
         TLI.isOperationLegalOrCustomOrPromote(Opcode, NarrowVT)) {
-      SDLoc DL(N);
       unsigned NumOperands = LHS.getNumOperands();
       SmallVector<SDValue, 4> ConcatOps;
       for (unsigned i = 0; i != NumOperands; ++i) {
@@ -22120,7 +25095,7 @@ SDValue DAGCombiner::SimplifyVBinOp(SDNode *N) {
     }
   }
 
-  if (SDValue V = scalarizeBinOpOfSplats(N, DAG))
+  if (SDValue V = scalarizeBinOpOfSplats(N, DAG, DL))
     return V;
 
   return SDValue();
@@ -22128,7 +25103,8 @@ SDValue DAGCombiner::SimplifyVBinOp(SDNode *N) {
 
 SDValue DAGCombiner::SimplifySelect(const SDLoc &DL, SDValue N0, SDValue N1,
                                     SDValue N2) {
-  assert(N0.getOpcode() ==ISD::SETCC && "First argument must be a SetCC node!");
+  assert(N0.getOpcode() == ISD::SETCC &&
+         "First argument must be a SetCC node!");
 
   SDValue SCC = SimplifySelectCC(DL, N0.getOperand(0), N0.getOperand(1), N1, N2,
                                  cast<CondCodeSDNode>(N0.getOperand(2))->get());
@@ -22140,7 +25116,7 @@ SDValue DAGCombiner::SimplifySelect(const SDLoc &DL, SDValue N0, SDValue N1,
     // Check to see if we got a select_cc back (to turn into setcc/select).
     // Otherwise, just return whatever node we got back, like fabs.
     if (SCC.getOpcode() == ISD::SELECT_CC) {
-      const SDNodeFlags Flags = N0.getNode()->getFlags();
+      const SDNodeFlags Flags = N0->getFlags();
       SDValue SETCC = DAG.getNode(ISD::SETCC, SDLoc(N0),
                                   N0.getValueType(),
                                   SCC.getOperand(0), SCC.getOperand(1),
@@ -22434,15 +25410,23 @@ SDValue DAGCombiner::foldSelectOfBinops(SDNode *N) {
   if (!TLI.isBinOp(BinOpc) || (N2.getOpcode() != BinOpc))
     return SDValue();
 
-  if (!N->isOnlyUserOf(N0.getNode()) || !N->isOnlyUserOf(N1.getNode()))
+  // The use checks are intentionally on SDNode because we may be dealing
+  // with opcodes that produce more than one SDValue.
+  // TODO: Do we really need to check N0 (the condition operand of the select)?
+  //       But removing that clause could cause an infinite loop...
+  if (!N0->hasOneUse() || !N1->hasOneUse() || !N2->hasOneUse())
     return SDValue();
 
+  // Binops may include opcodes that return multiple values, so all values
+  // must be created/propagated from the newly created binops below.
+  SDVTList OpVTs = N1->getVTList();
+
   // Fold select(cond, binop(x, y), binop(z, y))
   //  --> binop(select(cond, x, z), y)
   if (N1.getOperand(1) == N2.getOperand(1)) {
     SDValue NewSel =
         DAG.getSelect(DL, VT, N0, N1.getOperand(0), N2.getOperand(0));
-    SDValue NewBinOp = DAG.getNode(BinOpc, DL, VT, NewSel, N1.getOperand(1));
+    SDValue NewBinOp = DAG.getNode(BinOpc, DL, OpVTs, NewSel, N1.getOperand(1));
     NewBinOp->setFlags(N1->getFlags());
     NewBinOp->intersectFlagsWith(N2->getFlags());
     return NewBinOp;
@@ -22456,7 +25440,7 @@ SDValue DAGCombiner::foldSelectOfBinops(SDNode *N) {
       VT == N2.getOperand(1).getValueType()) {
     SDValue NewSel =
         DAG.getSelect(DL, VT, N0, N1.getOperand(1), N2.getOperand(1));
-    SDValue NewBinOp = DAG.getNode(BinOpc, DL, VT, N1.getOperand(0), NewSel);
+    SDValue NewBinOp = DAG.getNode(BinOpc, DL, OpVTs, N1.getOperand(0), NewSel);
     NewBinOp->setFlags(N1->getFlags());
     NewBinOp->intersectFlagsWith(N2->getFlags());
     return NewBinOp;
@@ -22584,7 +25568,7 @@ SDValue DAGCombiner::SimplifySelectCC(const SDLoc &DL, SDValue N0, SDValue N1,
     if (auto *SCCC = dyn_cast<ConstantSDNode>(SCC)) {
       // fold select_cc true, x, y -> x
       // fold select_cc false, x, y -> y
-      return !(SCCC->isNullValue()) ? N2 : N3;
+      return !(SCCC->isZero()) ? N2 : N3;
     }
   }
 
@@ -22595,7 +25579,7 @@ SDValue DAGCombiner::SimplifySelectCC(const SDLoc &DL, SDValue N0, SDValue N1,
   if (SDValue V = foldSelectCCToShiftAnd(DL, N0, N1, N2, N3, CC))
     return V;
 
-  // fold (select_cc seteq (and x, y), 0, 0, A) -> (and (shr (shl x)) A)
+  // fold (select_cc seteq (and x, y), 0, 0, A) -> (and (sra (shl x)) A)
   // where y is has a single bit set.
   // A plaintext description would be, we can turn the SELECT_CC into an AND
   // when the condition can be materialized as an all-ones register.  Any
@@ -22683,7 +25667,7 @@ SDValue DAGCombiner::SimplifySelectCC(const SDLoc &DL, SDValue N0, SDValue N1,
   // select_cc setne X, 0, ctlz_zero_undef(X), sizeof(X) -> ctlz(X)
   // select_cc setne X, 0, cttz(X), sizeof(X) -> cttz(X)
   // select_cc setne X, 0, cttz_zero_undef(X), sizeof(X) -> cttz(X)
-  if (N1C && N1C->isNullValue() && (CC == ISD::SETEQ || CC == ISD::SETNE)) {
+  if (N1C && N1C->isZero() && (CC == ISD::SETEQ || CC == ISD::SETNE)) {
     SDValue ValueOnZero = N2;
     SDValue Count = N3;
     // If the condition is NE instead of E, swap the operands.
@@ -22710,6 +25694,25 @@ SDValue DAGCombiner::SimplifySelectCC(const SDLoc &DL, SDValue N0, SDValue N1,
     }
   }
 
+  // Fold select_cc setgt X, -1, C, ~C -> xor (ashr X, BW-1), C
+  // Fold select_cc setlt X, 0, C, ~C -> xor (ashr X, BW-1), ~C
+  if (!NotExtCompare && N1C && N2C && N3C &&
+      N2C->getAPIntValue() == ~N3C->getAPIntValue() &&
+      ((N1C->isAllOnes() && CC == ISD::SETGT) ||
+       (N1C->isZero() && CC == ISD::SETLT)) &&
+      !TLI.shouldAvoidTransformToShift(VT, CmpOpVT.getScalarSizeInBits() - 1)) {
+    SDValue ASR = DAG.getNode(
+        ISD::SRA, DL, CmpOpVT, N0,
+        DAG.getConstant(CmpOpVT.getScalarSizeInBits() - 1, DL, CmpOpVT));
+    return DAG.getNode(ISD::XOR, DL, VT, DAG.getSExtOrTrunc(ASR, DL, VT),
+                       DAG.getSExtOrTrunc(CC == ISD::SETLT ? N3 : N2, DL, VT));
+  }
+
+  if (SDValue S = PerformMinMaxFpToSatCombine(N0, N1, N2, N3, CC, DAG))
+    return S;
+  if (SDValue S = PerformUMinFpToSatCombine(N0, N1, N2, N3, CC, DAG))
+    return S;
+
   return SDValue();
 }
 
@@ -22750,7 +25753,7 @@ SDValue DAGCombiner::BuildSDIVPow2(SDNode *N) {
     return SDValue();
 
   // Avoid division by zero.
-  if (C->isNullValue())
+  if (C->isZero())
     return SDValue();
 
   SmallVector<SDNode *, 8> Built;
@@ -22783,6 +25786,27 @@ SDValue DAGCombiner::BuildUDIV(SDNode *N) {
   return SDValue();
 }
 
+/// Given an ISD::SREM node expressing a remainder by constant power of 2,
+/// return a DAG expression that will generate the same value.
+SDValue DAGCombiner::BuildSREMPow2(SDNode *N) {
+  ConstantSDNode *C = isConstOrConstSplat(N->getOperand(1));
+  if (!C)
+    return SDValue();
+
+  // Avoid division by zero.
+  if (C->isZero())
+    return SDValue();
+
+  SmallVector<SDNode *, 8> Built;
+  if (SDValue S = TLI.BuildSREMPow2(N, C->getAPIntValue(), DAG, Built)) {
+    for (SDNode *N : Built)
+      AddToWorklist(N);
+    return S;
+  }
+
+  return SDValue();
+}
+
 /// Determines the LogBase2 value for a non-null input value using the
 /// transform: LogBase2(V) = (EltBits - 1) - ctlz(V).
 SDValue DAGCombiner::BuildLogBase2(SDValue V, const SDLoc &DL) {
@@ -22795,7 +25819,7 @@ SDValue DAGCombiner::BuildLogBase2(SDValue V, const SDLoc &DL) {
 
 /// Newton iteration for a function: F(X) is X_{i+1} = X_i - F(X_i)/F'(X_i)
 /// For the reciprocal, we need to find the zero of the function:
-///   F(X) = A X - 1 [which has a zero at X = 1/A]
+///   F(X) = 1/X - A [which has a zero at X = 1/A]
 ///     =>
 ///   X_{i+1} = X_i (2 - A X_i) = X_i + X_i (1 - A X_i) [this second form
 ///     does not require additional intermediate precision]
@@ -22806,9 +25830,10 @@ SDValue DAGCombiner::BuildDivEstimate(SDValue N, SDValue Op,
   if (LegalDAG)
     return SDValue();
 
-  // TODO: Handle half and/or extended types?
+  // TODO: Handle extended types?
   EVT VT = Op.getValueType();
-  if (VT.getScalarType() != MVT::f32 && VT.getScalarType() != MVT::f64)
+  if (VT.getScalarType() != MVT::f16 && VT.getScalarType() != MVT::f32 &&
+      VT.getScalarType() != MVT::f64)
     return SDValue();
 
   // If estimates are explicitly disabled for this function, we're done.
@@ -22945,9 +25970,10 @@ SDValue DAGCombiner::buildSqrtEstimateImpl(SDValue Op, SDNodeFlags Flags,
   if (LegalDAG)
     return SDValue();
 
-  // TODO: Handle half and/or extended types?
+  // TODO: Handle extended types?
   EVT VT = Op.getValueType();
-  if (VT.getScalarType() != MVT::f32 && VT.getScalarType() != MVT::f64)
+  if (VT.getScalarType() != MVT::f16 && VT.getScalarType() != MVT::f32 &&
+      VT.getScalarType() != MVT::f64)
     return SDValue();
 
   // If estimates are explicitly disabled for this function, we're done.
@@ -22997,14 +26023,14 @@ SDValue DAGCombiner::buildSqrtEstimate(SDValue Op, SDNodeFlags Flags) {
 }
 
 /// Return true if there is any possibility that the two addresses overlap.
-bool DAGCombiner::isAlias(SDNode *Op0, SDNode *Op1) const {
+bool DAGCombiner::mayAlias(SDNode *Op0, SDNode *Op1) const {
 
   struct MemUseCharacteristics {
     bool IsVolatile;
     bool IsAtomic;
     SDValue BasePtr;
     int64_t Offset;
-    Optional<int64_t> NumBytes;
+    std::optional<int64_t> NumBytes;
     MachineMemOperand *MMO;
   };
 
@@ -23019,21 +26045,26 @@ bool DAGCombiner::isAlias(SDNode *Op0, SDNode *Op1) const {
                            : 0;
       uint64_t Size =
           MemoryLocation::getSizeOrUnknown(LSN->getMemoryVT().getStoreSize());
-      return {LSN->isVolatile(), LSN->isAtomic(), LSN->getBasePtr(),
+      return {LSN->isVolatile(),
+              LSN->isAtomic(),
+              LSN->getBasePtr(),
               Offset /*base offset*/,
-              Optional<int64_t>(Size),
+              std::optional<int64_t>(Size),
               LSN->getMemOperand()};
     }
     if (const auto *LN = cast<LifetimeSDNode>(N))
-      return {false /*isVolatile*/, /*isAtomic*/ false, LN->getOperand(1),
+      return {false /*isVolatile*/,
+              /*isAtomic*/ false,
+              LN->getOperand(1),
               (LN->hasOffset()) ? LN->getOffset() : 0,
-              (LN->hasOffset()) ? Optional<int64_t>(LN->getSize())
-                                : Optional<int64_t>(),
+              (LN->hasOffset()) ? std::optional<int64_t>(LN->getSize())
+                                : std::optional<int64_t>(),
               (MachineMemOperand *)nullptr};
     // Default.
-    return {false /*isvolatile*/, /*isAtomic*/ false, SDValue(),
-            (int64_t)0 /*offset*/,
-            Optional<int64_t>() /*size*/, (MachineMemOperand *)nullptr};
+    return {false /*isvolatile*/,
+            /*isAtomic*/ false,          SDValue(),
+            (int64_t)0 /*offset*/,       std::optional<int64_t>() /*size*/,
+            (MachineMemOperand *)nullptr};
   };
 
   MemUseCharacteristics MUC0 = getCharacteristics(Op0),
@@ -23090,7 +26121,7 @@ bool DAGCombiner::isAlias(SDNode *Op0, SDNode *Op1) const {
   auto &Size0 = MUC0.NumBytes;
   auto &Size1 = MUC1.NumBytes;
   if (OrigAlignment0 == OrigAlignment1 && SrcValOffset0 != SrcValOffset1 &&
-      Size0.hasValue() && Size1.hasValue() && *Size0 == *Size1 &&
+      Size0.has_value() && Size1.has_value() && *Size0 == *Size1 &&
       OrigAlignment0 > *Size0 && SrcValOffset0 % *Size0 == 0 &&
       SrcValOffset1 % *Size1 == 0) {
     int64_t OffAlign0 = SrcValOffset0 % OrigAlignment0.value();
@@ -23111,8 +26142,8 @@ bool DAGCombiner::isAlias(SDNode *Op0, SDNode *Op1) const {
     UseAA = false;
 #endif
 
-  if (UseAA && AA && MUC0.MMO->getValue() && MUC1.MMO->getValue() &&
-      Size0.hasValue() && Size1.hasValue()) {
+  if (UseAA && AA && MUC0.MMO->getValue() && MUC1.MMO->getValue() && Size0 &&
+      Size1) {
     // Use alias analysis information.
     int64_t MinOffset = std::min(SrcValOffset0, SrcValOffset1);
     int64_t Overlap0 = *Size0 + SrcValOffset0 - MinOffset;
@@ -23145,7 +26176,7 @@ void DAGCombiner::GatherAllAliases(SDNode *N, SDValue OriginalChain,
   unsigned Depth = 0;
 
   // Attempt to improve chain by a single step
-  std::function<bool(SDValue &)> ImproveChain = [&](SDValue &C) -> bool {
+  auto ImproveChain = [&](SDValue &C) -> bool {
     switch (C.getOpcode()) {
     case ISD::EntryToken:
       // No need to mark EntryToken.
@@ -23157,7 +26188,7 @@ void DAGCombiner::GatherAllAliases(SDNode *N, SDValue OriginalChain,
       // TODO: Relax aliasing for unordered atomics (see D66309)
       bool IsOpLoad = isa<LoadSDNode>(C.getNode()) &&
                       cast<LSBaseSDNode>(C.getNode())->isSimple();
-      if ((IsLoad && IsOpLoad) || !isAlias(N, C.getNode())) {
+      if ((IsLoad && IsOpLoad) || !mayAlias(N, C.getNode())) {
         // Look further up the chain.
         C = C.getOperand(0);
         return true;
@@ -23175,7 +26206,7 @@ void DAGCombiner::GatherAllAliases(SDNode *N, SDValue OriginalChain,
     case ISD::LIFETIME_END: {
       // We can forward past any lifetime start/end that can be proven not to
       // alias the memory access.
-      if (!isAlias(N, C.getNode())) {
+      if (!mayAlias(N, C.getNode())) {
         // Look further up the chain.
         C = C.getOperand(0);
         return true;
@@ -23260,13 +26291,6 @@ SDValue DAGCombiner::FindBetterChain(SDNode *N, SDValue OldChain) {
   return DAG.getTokenFactor(SDLoc(N), Aliases);
 }
 
-namespace {
-// TODO: Replace with with std::monostate when we move to C++17.
-struct UnitT { } Unit;
-bool operator==(const UnitT &, const UnitT &) { return true; }
-bool operator!=(const UnitT &, const UnitT &) { return false; }
-} // namespace
-
 // This function tries to collect a bunch of potentially interesting
 // nodes to improve the chains of, all at once. This might seem
 // redundant, as this function gets called when visiting every store
@@ -23287,8 +26311,8 @@ bool DAGCombiner::parallelizeChainedStores(StoreSDNode *St) {
   // the common case, every store writes to the immediately previous address
   // space and thus merged with the previous interval at insertion time.
 
-  using IMap =
-      llvm::IntervalMap<int64_t, UnitT, 8, IntervalMapHalfOpenInfo<int64_t>>;
+  using IMap = llvm::IntervalMap<int64_t, std::monostate, 8,
+                                 IntervalMapHalfOpenInfo<int64_t>>;
   IMap::Allocator A;
   IMap Intervals(A);
 
@@ -23315,7 +26339,8 @@ bool DAGCombiner::parallelizeChainedStores(StoreSDNode *St) {
     return false;
 
   // Add ST's interval.
-  Intervals.insert(0, (St->getMemoryVT().getSizeInBits() + 7) / 8, Unit);
+  Intervals.insert(0, (St->getMemoryVT().getSizeInBits() + 7) / 8,
+                   std::monostate{});
 
   while (StoreSDNode *Chain = dyn_cast<StoreSDNode>(STChain->getChain())) {
     if (Chain->getMemoryVT().isScalableVector())
@@ -23344,7 +26369,7 @@ bool DAGCombiner::parallelizeChainedStores(StoreSDNode *St) {
     // If there's a previous interval, we should start after it.
     if (I != Intervals.begin() && (--I).stop() <= Offset)
       break;
-    Intervals.insert(Offset, Offset + Length, Unit);
+    Intervals.insert(Offset, Offset + Length, std::monostate{});
 
     ChainedStores.push_back(Chain);
     STChain = Chain;
diff --git a/gnu/llvm/llvm/lib/CodeGen/TargetPassConfig.cpp b/gnu/llvm/llvm/lib/CodeGen/TargetPassConfig.cpp
index a0c6fed21bb..f8bbb185068 100644
--- a/gnu/llvm/llvm/lib/CodeGen/TargetPassConfig.cpp
+++ b/gnu/llvm/llvm/lib/CodeGen/TargetPassConfig.cpp
@@ -16,12 +16,11 @@
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Analysis/BasicAliasAnalysis.h"
-#include "llvm/Analysis/CFLAndersAliasAnalysis.h"
-#include "llvm/Analysis/CFLSteensAliasAnalysis.h"
 #include "llvm/Analysis/CallGraphSCCPass.h"
 #include "llvm/Analysis/ScopedNoAliasAA.h"
 #include "llvm/Analysis/TargetTransformInfo.h"
 #include "llvm/Analysis/TypeBasedAliasAnalysis.h"
+#include "llvm/CodeGen/BasicBlockSectionsProfileReader.h"
 #include "llvm/CodeGen/CSEConfigBase.h"
 #include "llvm/CodeGen/MachineFunctionPass.h"
 #include "llvm/CodeGen/MachinePassRegistry.h"
@@ -47,8 +46,8 @@
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/Transforms/Utils.h"
-#include "llvm/Transforms/Utils/SymbolRewriter.h"
 #include <cassert>
+#include <optional>
 #include <string>
 
 using namespace llvm;
@@ -115,20 +114,18 @@ static cl::opt<bool> PrintGCInfo("print-gc", cl::Hidden,
     cl::desc("Dump garbage collector data"));
 static cl::opt<cl::boolOrDefault>
     VerifyMachineCode("verify-machineinstrs", cl::Hidden,
-                      cl::desc("Verify generated machine code"),
-                      cl::ZeroOrMore);
-static cl::opt<cl::boolOrDefault> DebugifyAndStripAll(
-    "debugify-and-strip-all-safe", cl::Hidden,
-    cl::desc(
-        "Debugify MIR before and Strip debug after "
-        "each pass except those known to be unsafe when debug info is present"),
-    cl::ZeroOrMore);
+                      cl::desc("Verify generated machine code"));
+static cl::opt<cl::boolOrDefault>
+    DebugifyAndStripAll("debugify-and-strip-all-safe", cl::Hidden,
+                        cl::desc("Debugify MIR before and Strip debug after "
+                                 "each pass except those known to be unsafe "
+                                 "when debug info is present"));
 static cl::opt<cl::boolOrDefault> DebugifyCheckAndStripAll(
     "debugify-check-and-strip-all-safe", cl::Hidden,
     cl::desc(
         "Debugify MIR before, by checking and stripping the debug info after, "
-        "each pass except those known to be unsafe when debug info is present"),
-    cl::ZeroOrMore);
+        "each pass except those known to be unsafe when debug info is "
+        "present"));
 // Enable or disable the MachineOutliner.
 static cl::opt<RunOutliner> EnableMachineOutliner(
     "enable-machine-outliner", cl::desc("Enable the machine outliner"),
@@ -139,6 +136,11 @@ static cl::opt<RunOutliner> EnableMachineOutliner(
                           "Disable all outlining"),
                // Sentinel value for unspecified option.
                clEnumValN(RunOutliner::AlwaysOutline, "", "")));
+// Disable the pass to fix unwind information. Whether the pass is included in
+// the pipeline is controlled via the target options, this option serves as
+// manual override.
+static cl::opt<bool> DisableCFIFixup("disable-cfi-fixup", cl::Hidden,
+                                     cl::desc("Disable the CFI fixup pass"));
 // Enable or disable FastISel. Both options are needed, because
 // FastISel is enabled by default with -fast, and we wish to be
 // able to enable or disable fast-isel independently from -O0.
@@ -172,6 +174,24 @@ static cl::opt<bool>
     FSNoFinalDiscrim("fs-no-final-discrim", cl::init(false), cl::Hidden,
                      cl::desc("Do not insert FS-AFDO discriminators before "
                               "emit."));
+// Disable MIRProfileLoader before RegAlloc. This is for for debugging and
+// tuning purpose.
+static cl::opt<bool> DisableRAFSProfileLoader(
+    "disable-ra-fsprofile-loader", cl::init(false), cl::Hidden,
+    cl::desc("Disable MIRProfileLoader before RegAlloc"));
+// Disable MIRProfileLoader before BloackPlacement. This is for for debugging
+// and tuning purpose.
+static cl::opt<bool> DisableLayoutFSProfileLoader(
+    "disable-layout-fsprofile-loader", cl::init(false), cl::Hidden,
+    cl::desc("Disable MIRProfileLoader before BlockPlacement"));
+// Specify FSProfile file name.
+static cl::opt<std::string>
+    FSProfileFile("fs-profile-file", cl::init(""), cl::value_desc("filename"),
+                  cl::desc("Flow Sensitive profile file name."), cl::Hidden);
+// Specify Remapping file for FSProfile.
+static cl::opt<std::string> FSRemappingFile(
+    "fs-remapping-file", cl::init(""), cl::value_desc("filename"),
+    cl::desc("Flow Sensitive profile remapping file name."), cl::Hidden);
 
 // Temporary option to allow experimenting with MachineScheduler as a post-RA
 // scheduler. Targets can "properly" enable this with
@@ -187,18 +207,6 @@ static cl::opt<bool> MISchedPostRA(
 static cl::opt<bool> EarlyLiveIntervals("early-live-intervals", cl::Hidden,
     cl::desc("Run live interval analysis earlier in the pipeline"));
 
-// Experimental option to use CFL-AA in codegen
-static cl::opt<CFLAAType> UseCFLAA(
-    "use-cfl-aa-in-codegen", cl::init(CFLAAType::None), cl::Hidden,
-    cl::desc("Enable the new, experimental CFL alias analysis in CodeGen"),
-    cl::values(clEnumValN(CFLAAType::None, "none", "Disable CFL-AA"),
-               clEnumValN(CFLAAType::Steensgaard, "steens",
-                          "Enable unification-based CFL-AA"),
-               clEnumValN(CFLAAType::Andersen, "anders",
-                          "Enable inclusion-based CFL-AA"),
-               clEnumValN(CFLAAType::Both, "both",
-                          "Enable both variants of CFL-AA")));
-
 /// Option names for limiting the codegen pipeline.
 /// Those are used in error reporting and we didn't want
 /// to duplicate their names all over the place.
@@ -238,6 +246,11 @@ static cl::opt<bool> DisableExpandReductions(
     "disable-expand-reductions", cl::init(false), cl::Hidden,
     cl::desc("Disable the expand reduction intrinsics pass from running"));
 
+/// Disable the select optimization pass.
+static cl::opt<bool> DisableSelectOptimize(
+    "disable-select-optimize", cl::init(true), cl::Hidden,
+    cl::desc("Disable the select-optimization pass from running"));
+
 /// Allow standard passes to be disabled by command line options. This supports
 /// simple binary flags that either suppress the pass or do nothing.
 /// i.e. -disable-mypass=false has no effect.
@@ -308,6 +321,28 @@ static IdentifyingPassPtr overridePass(AnalysisID StandardID,
   return TargetID;
 }
 
+// Find the FSProfile file name. The internal option takes the precedence
+// before getting from TargetMachine.
+static std::string getFSProfileFile(const TargetMachine *TM) {
+  if (!FSProfileFile.empty())
+    return FSProfileFile.getValue();
+  const std::optional<PGOOptions> &PGOOpt = TM->getPGOOption();
+  if (PGOOpt == std::nullopt || PGOOpt->Action != PGOOptions::SampleUse)
+    return std::string();
+  return PGOOpt->ProfileFile;
+}
+
+// Find the Profile remapping file name. The internal option takes the
+// precedence before getting from TargetMachine.
+static std::string getFSRemappingFile(const TargetMachine *TM) {
+  if (!FSRemappingFile.empty())
+    return FSRemappingFile.getValue();
+  const std::optional<PGOOptions> &PGOOpt = TM->getPGOOption();
+  if (PGOOpt == std::nullopt || PGOOpt->Action != PGOOptions::SampleUse)
+    return std::string();
+  return PGOOpt->ProfileRemappingFile;
+}
+
 //===---------------------------------------------------------------------===//
 /// TargetPassConfig
 //===---------------------------------------------------------------------===//
@@ -321,12 +356,9 @@ namespace {
 struct InsertedPass {
   AnalysisID TargetPassID;
   IdentifyingPassPtr InsertedPassID;
-  bool VerifyAfter;
 
-  InsertedPass(AnalysisID TargetPassID, IdentifyingPassPtr InsertedPassID,
-               bool VerifyAfter)
-      : TargetPassID(TargetPassID), InsertedPassID(InsertedPassID),
-        VerifyAfter(VerifyAfter) {}
+  InsertedPass(AnalysisID TargetPassID, IdentifyingPassPtr InsertedPassID)
+      : TargetPassID(TargetPassID), InsertedPassID(InsertedPassID) {}
 
   Pass *getInsertedPass() const {
     assert(InsertedPassID.isValid() && "Illegal Pass ID!");
@@ -447,12 +479,12 @@ CGPassBuilderOption llvm::getCGPassBuilderOption() {
   SET_BOOLEAN_OPTION(EnableImplicitNullChecks)
   SET_BOOLEAN_OPTION(EnableMachineOutliner)
   SET_BOOLEAN_OPTION(MISchedPostRA)
-  SET_BOOLEAN_OPTION(UseCFLAA)
   SET_BOOLEAN_OPTION(DisableMergeICmps)
   SET_BOOLEAN_OPTION(DisableLSR)
   SET_BOOLEAN_OPTION(DisableConstantHoisting)
   SET_BOOLEAN_OPTION(DisableCGP)
   SET_BOOLEAN_OPTION(DisablePartialLibcallInlining)
+  SET_BOOLEAN_OPTION(DisableSelectOptimize)
   SET_BOOLEAN_OPTION(PrintLSR)
   SET_BOOLEAN_OPTION(PrintISelInput)
   SET_BOOLEAN_OPTION(PrintGCInfo)
@@ -502,7 +534,7 @@ static void registerPartialPipelineCallback(PassInstrumentationCallbacks &PIC,
 
   PIC.registerShouldRunOptionalPassCallback(
       [=, EnableCurrent = StartBefore.empty() && StartAfter.empty(),
-       EnableNext = Optional<bool>(), StartBeforeCount = 0u,
+       EnableNext = std::optional<bool>(), StartBeforeCount = 0u,
        StartAfterCount = 0u, StopBeforeCount = 0u,
        StopAfterCount = 0u](StringRef P, Any) mutable {
         bool StartBeforePass = !StartBefore.empty() && P.contains(StartBefore);
@@ -601,14 +633,13 @@ CodeGenOpt::Level TargetPassConfig::getOptLevel() const {
 
 /// Insert InsertedPassID pass after TargetPassID.
 void TargetPassConfig::insertPass(AnalysisID TargetPassID,
-                                  IdentifyingPassPtr InsertedPassID,
-                                  bool VerifyAfter) {
+                                  IdentifyingPassPtr InsertedPassID) {
   assert(((!InsertedPassID.isInstance() &&
            TargetPassID != InsertedPassID.getID()) ||
           (InsertedPassID.isInstance() &&
            TargetPassID != InsertedPassID.getInstance()->getPassID())) &&
          "Insert a pass after itself!");
-  Impl->InsertedPasses.emplace_back(TargetPassID, InsertedPassID, VerifyAfter);
+  Impl->InsertedPasses.emplace_back(TargetPassID, InsertedPassID);
 }
 
 /// createPassConfig - Create a pass configuration object to be used by
@@ -686,7 +717,7 @@ bool TargetPassConfig::isPassSubstitutedOrOverridden(AnalysisID ID) const {
 /// a later pass or that it should stop after an earlier pass, then do not add
 /// the pass.  Finally, compare the current pass against the StartAfter
 /// and StopAfter options and change the Started/Stopped flags accordingly.
-void TargetPassConfig::addPass(Pass *P, bool verifyAfter) {
+void TargetPassConfig::addPass(Pass *P) {
   assert(!Initialized && "PassConfig is immutable");
 
   // Cache the Pass ID here in case the pass manager finds this pass is
@@ -700,21 +731,21 @@ void TargetPassConfig::addPass(Pass *P, bool verifyAfter) {
   if (StopBefore == PassID && StopBeforeCount++ == StopBeforeInstanceNum)
     Stopped = true;
   if (Started && !Stopped) {
-    if (AddingMachinePasses)
+    if (AddingMachinePasses) {
+      // Construct banner message before PM->add() as that may delete the pass.
+      std::string Banner =
+          std::string("After ") + std::string(P->getPassName());
       addMachinePrePasses();
-    std::string Banner;
-    // Construct banner message before PM->add() as that may delete the pass.
-    if (AddingMachinePasses && verifyAfter)
-      Banner = std::string("After ") + std::string(P->getPassName());
-    PM->add(P);
-    if (AddingMachinePasses)
-      addMachinePostPasses(Banner, /*AllowVerify*/ verifyAfter);
+      PM->add(P);
+      addMachinePostPasses(Banner);
+    } else {
+      PM->add(P);
+    }
 
     // Add the passes after the pass P if there is any.
-    for (const auto &IP : Impl->InsertedPasses) {
+    for (const auto &IP : Impl->InsertedPasses)
       if (IP.TargetPassID == PassID)
-        addPass(IP.getInsertedPass(), IP.VerifyAfter);
-    }
+        addPass(IP.getInsertedPass());
   } else {
     delete P;
   }
@@ -733,7 +764,7 @@ void TargetPassConfig::addPass(Pass *P, bool verifyAfter) {
 ///
 /// addPass cannot return a pointer to the pass instance because is internal the
 /// PassManager and the instance we create here may already be freed.
-AnalysisID TargetPassConfig::addPass(AnalysisID PassID, bool verifyAfter) {
+AnalysisID TargetPassConfig::addPass(AnalysisID PassID) {
   IdentifyingPassPtr TargetID = getPassSubstitution(PassID);
   IdentifyingPassPtr FinalPtr = overridePass(PassID, TargetID);
   if (!FinalPtr.isValid())
@@ -748,7 +779,7 @@ AnalysisID TargetPassConfig::addPass(AnalysisID PassID, bool verifyAfter) {
       llvm_unreachable("Pass ID not registered");
   }
   AnalysisID FinalID = P->getPassID();
-  addPass(P, verifyAfter); // Ends the lifetime of P.
+  addPass(P); // Ends the lifetime of P.
 
   return FinalID;
 }
@@ -792,8 +823,7 @@ void TargetPassConfig::addMachinePrePasses(bool AllowDebugify) {
     addDebugifyPass();
 }
 
-void TargetPassConfig::addMachinePostPasses(const std::string &Banner,
-                                            bool AllowVerify, bool AllowStrip) {
+void TargetPassConfig::addMachinePostPasses(const std::string &Banner) {
   if (DebugifyIsSafe) {
     if (DebugifyCheckAndStripAll == cl::BOU_TRUE) {
       addCheckDebugPass();
@@ -801,8 +831,7 @@ void TargetPassConfig::addMachinePostPasses(const std::string &Banner,
     } else if (DebugifyAndStripAll == cl::BOU_TRUE)
       addStripDebugPass();
   }
-  if (AllowVerify)
-    addVerifyPass(Banner);
+  addVerifyPass(Banner);
 }
 
 /// Add common target configurable passes that perform LLVM IR to IR transforms
@@ -814,21 +843,6 @@ void TargetPassConfig::addIRPasses() {
     addPass(createVerifierPass());
 
   if (getOptLevel() != CodeGenOpt::None) {
-    switch (UseCFLAA) {
-    case CFLAAType::Steensgaard:
-      addPass(createCFLSteensAAWrapperPass());
-      break;
-    case CFLAAType::Andersen:
-      addPass(createCFLAndersAAWrapperPass());
-      break;
-    case CFLAAType::Both:
-      addPass(createCFLAndersAAWrapperPass());
-      addPass(createCFLSteensAAWrapperPass());
-      break;
-    default:
-      break;
-    }
-
     // Basic AliasAnalysis support.
     // Add TypeBasedAliasAnalysis before BasicAliasAnalysis so that
     // BasicAliasAnalysis wins if they disagree. This is intended to help
@@ -861,6 +875,12 @@ void TargetPassConfig::addIRPasses() {
   addPass(&ShadowStackGCLoweringID);
   addPass(createLowerConstantIntrinsicsPass());
 
+  // For MachO, lower @llvm.global_dtors into @llvm.global_ctors with
+  // __cxa_atexit() calls to avoid emitting the deprecated __mod_term_func.
+  if (TM->getTargetTriple().isOSBinFormatMachO() &&
+      TM->Options.LowerGlobalDtorsViaCxaAtExit)
+    addPass(createLowerGlobalDtorsLegacyPass());
+
   // Make sure that no unreachable blocks are instruction selected.
   addPass(createUnreachableBlockEliminationPass());
 
@@ -888,6 +908,13 @@ void TargetPassConfig::addIRPasses() {
   // Allow disabling it for testing purposes.
   if (!DisableExpandReductions)
     addPass(createExpandReductionsPass());
+
+  if (getOptLevel() != CodeGenOpt::None)
+    addPass(createTLSVariableHoistPass());
+
+  // Convert conditional moves to conditional jumps when profitable.
+  if (getOptLevel() != CodeGenOpt::None && !DisableSelectOptimize)
+    addPass(createSelectOptimizePass());
 }
 
 /// Turn exception handling constructs into something the code generators can
@@ -904,7 +931,7 @@ void TargetPassConfig::addPassesToHandleExceptions() {
     // pad is shared by multiple invokes and is also a target of a normal
     // edge from elsewhere.
     addPass(createSjLjEHPreparePass(TM));
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case ExceptionHandling::DwarfCFI:
   case ExceptionHandling::ARM:
   case ExceptionHandling::AIX:
@@ -1004,13 +1031,13 @@ bool TargetPassConfig::addCoreISelPasses() {
   //        pass manager into two. GlobalISel with the fallback path disabled
   //        and -run-pass seem to be unaffected. The majority of GlobalISel
   //        testing uses -run-pass so this probably isn't too bad.
-  SaveAndRestore<bool> SavedDebugifyIsSafe(DebugifyIsSafe);
+  SaveAndRestore SavedDebugifyIsSafe(DebugifyIsSafe);
   if (Selector != SelectorType::GlobalISel || !isGlobalISelAbortEnabled())
     DebugifyIsSafe = false;
 
   // Add instruction selector passes.
   if (Selector == SelectorType::GlobalISel) {
-    SaveAndRestore<bool> SavedAddingMachinePasses(AddingMachinePasses, true);
+    SaveAndRestore SavedAddingMachinePasses(AddingMachinePasses, true);
     if (addIRTranslator())
       return true;
 
@@ -1059,6 +1086,8 @@ bool TargetPassConfig::addISelPasses() {
 
   addPass(createPreISelIntrinsicLoweringPass());
   PM->add(createTargetTransformInfoWrapperPass(TM->getTargetIRAnalysis()));
+  addPass(createExpandLargeDivRemPass());
+  addPass(createExpandLargeFpConvertPass());
   addIRPasses();
   addCodeGenPrepare();
   addPassesToHandleExceptions();
@@ -1115,6 +1144,18 @@ void TargetPassConfig::addMachinePasses() {
   // where it becomes safe again so stop debugifying here.
   DebugifyIsSafe = false;
 
+  // Add a FSDiscriminator pass right before RA, so that we could get
+  // more precise SampleFDO profile for RA.
+  if (EnableFSDiscriminator) {
+    addPass(createMIRAddFSDiscriminatorsPass(
+        sampleprof::FSDiscriminatorPass::Pass1));
+    const std::string ProfileFile = getFSProfileFile(TM);
+    if (!ProfileFile.empty() && !DisableRAFSProfileLoader)
+      addPass(
+          createMIRProfileLoaderPass(ProfileFile, getFSRemappingFile(TM),
+                                     sampleprof::FSDiscriminatorPass::Pass1));
+  }
+
   // Run register allocation and passes that are tightly coupled with it,
   // including phi elimination and scheduling.
   if (getOptimizeRegAlloc())
@@ -1125,7 +1166,7 @@ void TargetPassConfig::addMachinePasses() {
   // Run post-ra passes.
   addPostRegAlloc();
 
-  addPass(&RemoveRedundantDebugValuesID, false);
+  addPass(&RemoveRedundantDebugValuesID);
 
   addPass(&FixupStatepointCallerSavedID);
 
@@ -1167,7 +1208,7 @@ void TargetPassConfig::addMachinePasses() {
   // GC
   if (addGCPasses()) {
     if (PrintGCInfo)
-      addPass(createGCInfoPrinter(dbgs()), false);
+      addPass(createGCInfoPrinter(dbgs()));
   }
 
   // Basic block placement.
@@ -1197,10 +1238,11 @@ void TargetPassConfig::addMachinePasses() {
 
   // FIXME: Some backends are incompatible with running the verifier after
   // addPreEmitPass.  Maybe only pass "false" here for those targets?
-  addPass(&FuncletLayoutID, false);
+  addPass(&FuncletLayoutID);
 
-  addPass(&StackMapLivenessID, false);
-  addPass(&LiveDebugValuesID, false);
+  addPass(&StackMapLivenessID);
+  addPass(&LiveDebugValuesID);
+  addPass(&MachineSanitizerBinaryMetadataID);
 
   if (TM->Options.EnableMachineOutliner && getOptLevel() != CodeGenOpt::None &&
       EnableMachineOutliner != RunOutliner::NeverOutline) {
@@ -1217,19 +1259,24 @@ void TargetPassConfig::addMachinePasses() {
   // FIXME: In principle, BasicBlockSection::Labels and splitting can used
   // together. Update this check once we have addressed any issues.
   if (TM->getBBSectionsType() != llvm::BasicBlockSection::None) {
-    addPass(llvm::createBasicBlockSectionsPass(TM->getBBSectionsFuncListBuf()));
+    if (TM->getBBSectionsType() == llvm::BasicBlockSection::List) {
+      addPass(llvm::createBasicBlockSectionsProfileReaderPass(
+          TM->getBBSectionsFuncListBuf()));
+    }
+    addPass(llvm::createBasicBlockSectionsPass());
   } else if (TM->Options.EnableMachineFunctionSplitter ||
              EnableMachineFunctionSplitter) {
     addPass(createMachineFunctionSplitterPass());
   }
 
+  if (!DisableCFIFixup && TM->Options.EnableCFIFixup)
+    addPass(createCFIFixup());
+
+  PM->add(createStackFrameLayoutAnalysisPass());
+
   // Add passes that directly emit MI after all other MI passes.
   addPreEmitPass2();
 
-  // Insert pseudo probe annotation for callsite profiling
-  if (TM->Options.PseudoProbeForProfiling)
-    addPass(createPseudoProbeInserter());
-
   AddingMachinePasses = false;
 }
 
@@ -1336,6 +1383,11 @@ FunctionPass *TargetPassConfig::createRegAllocPass(bool Optimized) {
   return createTargetRegisterAllocator(Optimized);
 }
 
+bool TargetPassConfig::isCustomizedRegAlloc() {
+  return RegAlloc !=
+         (RegisterRegAlloc::FunctionPassCtor)&useDefaultRegisterAllocator;
+}
+
 bool TargetPassConfig::addRegAssignAndRewriteFast() {
   if (RegAlloc != (RegisterRegAlloc::FunctionPassCtor)&useDefaultRegisterAllocator &&
       RegAlloc != (RegisterRegAlloc::FunctionPassCtor)&createFastRegisterAllocator)
@@ -1359,6 +1411,9 @@ bool TargetPassConfig::addRegAssignAndRewriteOptimized() {
   // Finally rewrite virtual registers.
   addPass(&VirtRegRewriterID);
 
+  // Regalloc scoring for ML-driven eviction - noop except when learning a new
+  // eviction policy.
+  addPass(createRegAllocScoringPass());
   return true;
 }
 
@@ -1371,8 +1426,8 @@ bool TargetPassConfig::usingDefaultRegAlloc() const {
 /// Add the minimum set of target-independent passes that are required for
 /// register allocation. No coalescing or scheduling.
 void TargetPassConfig::addFastRegAlloc() {
-  addPass(&PHIEliminationID, false);
-  addPass(&TwoAddressInstructionPassID, false);
+  addPass(&PHIEliminationID);
+  addPass(&TwoAddressInstructionPassID);
 
   addRegAssignAndRewriteFast();
 }
@@ -1381,9 +1436,9 @@ void TargetPassConfig::addFastRegAlloc() {
 /// optimized register allocation, including coalescing, machine instruction
 /// scheduling, and register allocation itself.
 void TargetPassConfig::addOptimizedRegAlloc() {
-  addPass(&DetectDeadLanesID, false);
+  addPass(&DetectDeadLanesID);
 
-  addPass(&ProcessImplicitDefsID, false);
+  addPass(&ProcessImplicitDefsID);
 
   // LiveVariables currently requires pure SSA form.
   //
@@ -1395,18 +1450,18 @@ void TargetPassConfig::addOptimizedRegAlloc() {
   // When LiveVariables is removed this has to be removed/moved either.
   // Explicit addition of UnreachableMachineBlockElim allows stopping before or
   // after it with -stop-before/-stop-after.
-  addPass(&UnreachableMachineBlockElimID, false);
-  addPass(&LiveVariablesID, false);
+  addPass(&UnreachableMachineBlockElimID);
+  addPass(&LiveVariablesID);
 
   // Edge splitting is smarter with machine loop info.
-  addPass(&MachineLoopInfoID, false);
-  addPass(&PHIEliminationID, false);
+  addPass(&MachineLoopInfoID);
+  addPass(&PHIEliminationID);
 
   // Eventually, we want to run LiveIntervals before PHI elimination.
   if (EarlyLiveIntervals)
-    addPass(&LiveIntervalsID, false);
+    addPass(&LiveIntervalsID);
 
-  addPass(&TwoAddressInstructionPassID, false);
+  addPass(&TwoAddressInstructionPassID);
   addPass(&RegisterCoalescerID);
 
   // The machine scheduler may accidentally create disconnected components
@@ -1419,9 +1474,6 @@ void TargetPassConfig::addOptimizedRegAlloc() {
 
   if (addRegAssignAndRewriteOptimized()) {
     // Perform stack slot coloring and post-ra machine LICM.
-    //
-    // FIXME: Re-enable coloring with register when it's capable of adding
-    // kill markers.
     addPass(&StackSlotColoringID);
 
     // Allow targets to expand pseudo instructions depending on the choice of
@@ -1445,6 +1497,9 @@ void TargetPassConfig::addOptimizedRegAlloc() {
 
 /// Add passes that optimize machine instructions after register allocation.
 void TargetPassConfig::addMachineLateOptimization() {
+  // Cleanup of redundant immediate/address loads.
+  addPass(&MachineLateInstrsCleanupID);
+
   // Branch folding must be run after regalloc and prolog/epilog insertion.
   addPass(&BranchFolderPassID);
 
@@ -1461,12 +1516,21 @@ void TargetPassConfig::addMachineLateOptimization() {
 
 /// Add standard GC passes.
 bool TargetPassConfig::addGCPasses() {
-  addPass(&GCMachineCodeAnalysisID, false);
+  addPass(&GCMachineCodeAnalysisID);
   return true;
 }
 
 /// Add standard basic block placement passes.
 void TargetPassConfig::addBlockPlacement() {
+  if (EnableFSDiscriminator) {
+    addPass(createMIRAddFSDiscriminatorsPass(
+        sampleprof::FSDiscriminatorPass::Pass2));
+    const std::string ProfileFile = getFSProfileFile(TM);
+    if (!ProfileFile.empty() && !DisableLayoutFSProfileLoader)
+      addPass(
+          createMIRProfileLoaderPass(ProfileFile, getFSRemappingFile(TM),
+                                     sampleprof::FSDiscriminatorPass::Pass2));
+  }
   if (addPass(&MachineBlockPlacementID)) {
     // Run a separate pass to collect block placement statistics.
     if (EnableBlockPlacementStats)
diff --git a/gnu/llvm/llvm/lib/DebugInfo/GSYM/Range.cpp b/gnu/llvm/llvm/lib/DebugInfo/GSYM/Range.cpp
deleted file mode 100644
index 044ddb8ba1b..00000000000
--- a/gnu/llvm/llvm/lib/DebugInfo/GSYM/Range.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-//===- Range.cpp ------------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/DebugInfo/GSYM/Range.h"
-#include "llvm/DebugInfo/GSYM/FileWriter.h"
-#include "llvm/Support/DataExtractor.h"
-#include <algorithm>
-#include <inttypes.h>
-
-using namespace llvm;
-using namespace gsym;
-
-
-void AddressRanges::insert(AddressRange Range) {
-  if (Range.size() == 0)
-    return;
-
-  auto It = llvm::upper_bound(Ranges, Range);
-  auto It2 = It;
-  while (It2 != Ranges.end() && It2->Start < Range.End)
-    ++It2;
-  if (It != It2) {
-    Range.End = std::max(Range.End, It2[-1].End);
-    It = Ranges.erase(It, It2);
-  }
-  if (It != Ranges.begin() && Range.Start < It[-1].End)
-    It[-1].End = std::max(It[-1].End, Range.End);
-  else
-    Ranges.insert(It, Range);
-}
-
-bool AddressRanges::contains(uint64_t Addr) const {
-  auto It = std::partition_point(
-      Ranges.begin(), Ranges.end(),
-      [=](const AddressRange &R) { return R.Start <= Addr; });
-  return It != Ranges.begin() && Addr < It[-1].End;
-}
-
-bool AddressRanges::contains(AddressRange Range) const {
-  if (Range.size() == 0)
-    return false;
-  auto It = std::partition_point(
-      Ranges.begin(), Ranges.end(),
-      [=](const AddressRange &R) { return R.Start <= Range.Start; });
-  if (It == Ranges.begin())
-    return false;
-  return Range.End <= It[-1].End;
-}
-
-Optional<AddressRange>
-AddressRanges::getRangeThatContains(uint64_t Addr) const {
-  auto It = std::partition_point(
-      Ranges.begin(), Ranges.end(),
-      [=](const AddressRange &R) { return R.Start <= Addr; });
-  if (It != Ranges.begin() && Addr < It[-1].End)
-    return It[-1];
-  return llvm::None;
-}
-
-raw_ostream &llvm::gsym::operator<<(raw_ostream &OS, const AddressRange &R) {
-  return OS << '[' << HEX64(R.Start) << " - " << HEX64(R.End) << ")";
-}
-
-raw_ostream &llvm::gsym::operator<<(raw_ostream &OS, const AddressRanges &AR) {
-  size_t Size = AR.size();
-  for (size_t I = 0; I < Size; ++I) {
-    if (I)
-      OS << ' ';
-    OS << AR[I];
-  }
-  return OS;
-}
-
-void AddressRange::encode(FileWriter &O, uint64_t BaseAddr) const {
-  assert(Start >= BaseAddr);
-  O.writeULEB(Start - BaseAddr);
-  O.writeULEB(size());
-}
-
-void AddressRange::decode(DataExtractor &Data, uint64_t BaseAddr,
-                          uint64_t &Offset) {
-  const uint64_t AddrOffset = Data.getULEB128(&Offset);
-  const uint64_t Size = Data.getULEB128(&Offset);
-  const uint64_t StartAddr = BaseAddr + AddrOffset;
-  Start = StartAddr;
-  End = StartAddr + Size;
-}
-
-void AddressRanges::encode(FileWriter &O, uint64_t BaseAddr) const {
-  O.writeULEB(Ranges.size());
-  if (Ranges.empty())
-    return;
-  for (auto Range : Ranges)
-    Range.encode(O, BaseAddr);
-}
-
-void AddressRanges::decode(DataExtractor &Data, uint64_t BaseAddr,
-                           uint64_t &Offset) {
-  clear();
-  uint64_t NumRanges = Data.getULEB128(&Offset);
-  if (NumRanges == 0)
-    return;
-  Ranges.resize(NumRanges);
-  for (auto &Range : Ranges)
-    Range.decode(Data, BaseAddr, Offset);
-}
-
-void AddressRange::skip(DataExtractor &Data, uint64_t &Offset) {
-  Data.getULEB128(&Offset);
-  Data.getULEB128(&Offset);
-}
-
-uint64_t AddressRanges::skip(DataExtractor &Data, uint64_t &Offset) {
-  uint64_t NumRanges = Data.getULEB128(&Offset);
-  for (uint64_t I=0; I<NumRanges; ++I)
-    AddressRange::skip(Data, Offset);
-  return NumRanges;
-}
diff --git a/gnu/llvm/llvm/lib/DebugInfo/Symbolize/SymbolizableObjectFile.h b/gnu/llvm/llvm/lib/DebugInfo/Symbolize/SymbolizableObjectFile.h
deleted file mode 100644
index 8fb003fff0a..00000000000
--- a/gnu/llvm/llvm/lib/DebugInfo/Symbolize/SymbolizableObjectFile.h
+++ /dev/null
@@ -1,103 +0,0 @@
-//===- SymbolizableObjectFile.h ---------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file declares the SymbolizableObjectFile class.
-//
-//===----------------------------------------------------------------------===//
-#ifndef LLVM_LIB_DEBUGINFO_SYMBOLIZE_SYMBOLIZABLEOBJECTFILE_H
-#define LLVM_LIB_DEBUGINFO_SYMBOLIZE_SYMBOLIZABLEOBJECTFILE_H
-
-#include "llvm/ADT/StringRef.h"
-#include "llvm/DebugInfo/DIContext.h"
-#include "llvm/DebugInfo/Symbolize/SymbolizableModule.h"
-#include "llvm/Support/Error.h"
-#include <cstdint>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
-namespace llvm {
-
-class DataExtractor;
-
-namespace symbolize {
-
-class SymbolizableObjectFile : public SymbolizableModule {
-public:
-  static Expected<std::unique_ptr<SymbolizableObjectFile>>
-  create(const object::ObjectFile *Obj, std::unique_ptr<DIContext> DICtx,
-         bool UntagAddresses);
-
-  DILineInfo symbolizeCode(object::SectionedAddress ModuleOffset,
-                           DILineInfoSpecifier LineInfoSpecifier,
-                           bool UseSymbolTable) const override;
-  DIInliningInfo symbolizeInlinedCode(object::SectionedAddress ModuleOffset,
-                                      DILineInfoSpecifier LineInfoSpecifier,
-                                      bool UseSymbolTable) const override;
-  DIGlobal symbolizeData(object::SectionedAddress ModuleOffset) const override;
-  std::vector<DILocal>
-  symbolizeFrame(object::SectionedAddress ModuleOffset) const override;
-
-  // Return true if this is a 32-bit x86 PE COFF module.
-  bool isWin32Module() const override;
-
-  // Returns the preferred base of the module, i.e. where the loader would place
-  // it in memory assuming there were no conflicts.
-  uint64_t getModulePreferredBase() const override;
-
-private:
-  bool shouldOverrideWithSymbolTable(FunctionNameKind FNKind,
-                                     bool UseSymbolTable) const;
-
-  bool getNameFromSymbolTable(uint64_t Address, std::string &Name,
-                              uint64_t &Addr, uint64_t &Size,
-                              std::string &FileName) const;
-  // For big-endian PowerPC64 ELF, OpdAddress is the address of the .opd
-  // (function descriptor) section and OpdExtractor refers to its contents.
-  Error addSymbol(const object::SymbolRef &Symbol, uint64_t SymbolSize,
-                  DataExtractor *OpdExtractor = nullptr,
-                  uint64_t OpdAddress = 0);
-  Error addCoffExportSymbols(const object::COFFObjectFile *CoffObj);
-
-  /// Search for the first occurence of specified Address in ObjectFile.
-  uint64_t getModuleSectionIndexForAddress(uint64_t Address) const;
-
-  const object::ObjectFile *Module;
-  std::unique_ptr<DIContext> DebugInfoContext;
-  bool UntagAddresses;
-
-  struct SymbolDesc {
-    uint64_t Addr;
-    // If size is 0, assume that symbol occupies the whole memory range up to
-    // the following symbol.
-    uint64_t Size;
-
-    StringRef Name;
-    // Non-zero if this is an ELF local symbol. See the comment in
-    // getNameFromSymbolTable.
-    uint32_t ELFLocalSymIdx;
-
-    bool operator<(const SymbolDesc &RHS) const {
-      return Addr != RHS.Addr ? Addr < RHS.Addr : Size < RHS.Size;
-    }
-  };
-  std::vector<SymbolDesc> Symbols;
-  // (index, filename) pairs of ELF STT_FILE symbols.
-  std::vector<std::pair<uint32_t, StringRef>> FileSymbols;
-
-  SymbolizableObjectFile(const object::ObjectFile *Obj,
-                         std::unique_ptr<DIContext> DICtx,
-                         bool UntagAddresses);
-};
-
-} // end namespace symbolize
-
-} // end namespace llvm
-
-#endif // LLVM_LIB_DEBUGINFO_SYMBOLIZE_SYMBOLIZABLEOBJECTFILE_H
diff --git a/gnu/llvm/llvm/lib/ExecutionEngine/Orc/Shared/RPCError.cpp b/gnu/llvm/llvm/lib/ExecutionEngine/Orc/Shared/RPCError.cpp
deleted file mode 100644
index a55cb220f21..00000000000
--- a/gnu/llvm/llvm/lib/ExecutionEngine/Orc/Shared/RPCError.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-//===--------------- RPCError.cpp - RPCERror implementation ---------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// RPC Error type implmentations.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ExecutionEngine/Orc/Shared/RPCUtils.h"
-#include "llvm/Support/Error.h"
-#include "llvm/Support/raw_ostream.h"
-
-#include <string>
-#include <system_error>
-
-char llvm::orc::shared::RPCFatalError::ID = 0;
-char llvm::orc::shared::ConnectionClosed::ID = 0;
-char llvm::orc::shared::ResponseAbandoned::ID = 0;
-char llvm::orc::shared::CouldNotNegotiate::ID = 0;
-
-namespace llvm {
-namespace orc {
-namespace shared {
-
-std::error_code ConnectionClosed::convertToErrorCode() const {
-  return orcError(OrcErrorCode::RPCConnectionClosed);
-}
-
-void ConnectionClosed::log(raw_ostream &OS) const {
-  OS << "RPC connection already closed";
-}
-
-std::error_code ResponseAbandoned::convertToErrorCode() const {
-  return orcError(OrcErrorCode::RPCResponseAbandoned);
-}
-
-void ResponseAbandoned::log(raw_ostream &OS) const {
-  OS << "RPC response abandoned";
-}
-
-CouldNotNegotiate::CouldNotNegotiate(std::string Signature)
-    : Signature(std::move(Signature)) {}
-
-std::error_code CouldNotNegotiate::convertToErrorCode() const {
-  return orcError(OrcErrorCode::RPCCouldNotNegotiateFunction);
-}
-
-void CouldNotNegotiate::log(raw_ostream &OS) const {
-  OS << "Could not negotiate RPC function " << Signature;
-}
-
-} // end namespace shared
-} // end namespace orc
-} // end namespace llvm
diff --git a/gnu/llvm/llvm/lib/IR/ConstantFold.h b/gnu/llvm/llvm/lib/IR/ConstantFold.h
deleted file mode 100644
index 0cdd5cf3cbc..00000000000
--- a/gnu/llvm/llvm/lib/IR/ConstantFold.h
+++ /dev/null
@@ -1,56 +0,0 @@
-//===-- ConstantFolding.h - Internal Constant Folding Interface -*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines the (internal) constant folding interfaces for LLVM.  These
-// interfaces are used by the ConstantExpr::get* methods to automatically fold
-// constants when possible.
-//
-// These operators may return a null object if they don't know how to perform
-// the specified operation on the specified constant types.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_LIB_IR_CONSTANTFOLD_H
-#define LLVM_LIB_IR_CONSTANTFOLD_H
-
-#include "llvm/ADT/Optional.h"
-
-namespace llvm {
-template <typename T> class ArrayRef;
-  class Value;
-  class Constant;
-  class Type;
-
-  // Constant fold various types of instruction...
-  Constant *ConstantFoldCastInstruction(
-    unsigned opcode,     ///< The opcode of the cast
-    Constant *V,         ///< The source constant
-    Type *DestTy   ///< The destination type
-  );
-  Constant *ConstantFoldSelectInstruction(Constant *Cond,
-                                          Constant *V1, Constant *V2);
-  Constant *ConstantFoldExtractElementInstruction(Constant *Val, Constant *Idx);
-  Constant *ConstantFoldInsertElementInstruction(Constant *Val, Constant *Elt,
-                                                 Constant *Idx);
-  Constant *ConstantFoldShuffleVectorInstruction(Constant *V1, Constant *V2,
-                                                 ArrayRef<int> Mask);
-  Constant *ConstantFoldExtractValueInstruction(Constant *Agg,
-                                                ArrayRef<unsigned> Idxs);
-  Constant *ConstantFoldInsertValueInstruction(Constant *Agg, Constant *Val,
-                                               ArrayRef<unsigned> Idxs);
-  Constant *ConstantFoldUnaryInstruction(unsigned Opcode, Constant *V);
-  Constant *ConstantFoldBinaryInstruction(unsigned Opcode, Constant *V1,
-                                          Constant *V2);
-  Constant *ConstantFoldCompareInstruction(unsigned short predicate,
-                                           Constant *C1, Constant *C2);
-  Constant *ConstantFoldGetElementPtr(Type *Ty, Constant *C, bool InBounds,
-                                      Optional<unsigned> InRangeIndex,
-                                      ArrayRef<Value *> Idxs);
-} // End llvm namespace
-
-#endif
diff --git a/gnu/llvm/llvm/lib/LTO/Caching.cpp b/gnu/llvm/llvm/lib/LTO/Caching.cpp
deleted file mode 100644
index 75a89e729f4..00000000000
--- a/gnu/llvm/llvm/lib/LTO/Caching.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-//===-Caching.cpp - LLVM Link Time Optimizer Cache Handling ---------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements the Caching for ThinLTO.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/LTO/Caching.h"
-#include "llvm/ADT/StringExtras.h"
-#include "llvm/Support/Errc.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Support/Process.h"
-#include "llvm/Support/raw_ostream.h"
-
-#if !defined(_MSC_VER) && !defined(__MINGW32__)
-#include <unistd.h>
-#else
-#include <io.h>
-#endif
-
-using namespace llvm;
-using namespace llvm::lto;
-
-Expected<NativeObjectCache> lto::localCache(StringRef CacheDirectoryPath,
-                                            AddBufferFn AddBuffer) {
-  if (std::error_code EC = sys::fs::create_directories(CacheDirectoryPath))
-    return errorCodeToError(EC);
-
-  return [=](unsigned Task, StringRef Key) -> AddStreamFn {
-    // This choice of file name allows the cache to be pruned (see pruneCache()
-    // in include/llvm/Support/CachePruning.h).
-    SmallString<64> EntryPath;
-    sys::path::append(EntryPath, CacheDirectoryPath, "llvmcache-" + Key);
-    // First, see if we have a cache hit.
-    SmallString<64> ResultPath;
-    Expected<sys::fs::file_t> FDOrErr = sys::fs::openNativeFileForRead(
-        Twine(EntryPath), sys::fs::OF_UpdateAtime, &ResultPath);
-    std::error_code EC;
-    if (FDOrErr) {
-      ErrorOr<std::unique_ptr<MemoryBuffer>> MBOrErr =
-          MemoryBuffer::getOpenFile(*FDOrErr, EntryPath,
-                                    /*FileSize=*/-1,
-                                    /*RequiresNullTerminator=*/false);
-      sys::fs::closeFile(*FDOrErr);
-      if (MBOrErr) {
-        AddBuffer(Task, std::move(*MBOrErr));
-        return AddStreamFn();
-      }
-      EC = MBOrErr.getError();
-    } else {
-      EC = errorToErrorCode(FDOrErr.takeError());
-    }
-
-    // On Windows we can fail to open a cache file with a permission denied
-    // error. This generally means that another process has requested to delete
-    // the file while it is still open, but it could also mean that another
-    // process has opened the file without the sharing permissions we need.
-    // Since the file is probably being deleted we handle it in the same way as
-    // if the file did not exist at all.
-    if (EC != errc::no_such_file_or_directory && EC != errc::permission_denied)
-      report_fatal_error(Twine("Failed to open cache file ") + EntryPath +
-                         ": " + EC.message() + "\n");
-
-    // This native object stream is responsible for commiting the resulting
-    // file to the cache and calling AddBuffer to add it to the link.
-    struct CacheStream : NativeObjectStream {
-      AddBufferFn AddBuffer;
-      sys::fs::TempFile TempFile;
-      std::string EntryPath;
-      unsigned Task;
-
-      CacheStream(std::unique_ptr<raw_pwrite_stream> OS, AddBufferFn AddBuffer,
-                  sys::fs::TempFile TempFile, std::string EntryPath,
-                  unsigned Task)
-          : NativeObjectStream(std::move(OS)), AddBuffer(std::move(AddBuffer)),
-            TempFile(std::move(TempFile)), EntryPath(std::move(EntryPath)),
-            Task(Task) {}
-
-      ~CacheStream() {
-        // Make sure the stream is closed before committing it.
-        OS.reset();
-
-        // Open the file first to avoid racing with a cache pruner.
-        ErrorOr<std::unique_ptr<MemoryBuffer>> MBOrErr =
-            MemoryBuffer::getOpenFile(
-                sys::fs::convertFDToNativeFile(TempFile.FD), TempFile.TmpName,
-                /*FileSize=*/-1, /*RequiresNullTerminator=*/false);
-        if (!MBOrErr)
-          report_fatal_error(Twine("Failed to open new cache file ") +
-                             TempFile.TmpName + ": " +
-                             MBOrErr.getError().message() + "\n");
-
-        // On POSIX systems, this will atomically replace the destination if
-        // it already exists. We try to emulate this on Windows, but this may
-        // fail with a permission denied error (for example, if the destination
-        // is currently opened by another process that does not give us the
-        // sharing permissions we need). Since the existing file should be
-        // semantically equivalent to the one we are trying to write, we give
-        // AddBuffer a copy of the bytes we wrote in that case. We do this
-        // instead of just using the existing file, because the pruner might
-        // delete the file before we get a chance to use it.
-        Error E = TempFile.keep(EntryPath);
-        E = handleErrors(std::move(E), [&](const ECError &E) -> Error {
-          std::error_code EC = E.convertToErrorCode();
-          if (EC != errc::permission_denied)
-            return errorCodeToError(EC);
-
-          auto MBCopy = MemoryBuffer::getMemBufferCopy((*MBOrErr)->getBuffer(),
-                                                       EntryPath);
-          MBOrErr = std::move(MBCopy);
-
-          // FIXME: should we consume the discard error?
-          consumeError(TempFile.discard());
-
-          return Error::success();
-        });
-
-        if (E)
-          report_fatal_error(Twine("Failed to rename temporary file ") +
-                             TempFile.TmpName + " to " + EntryPath + ": " +
-                             toString(std::move(E)) + "\n");
-
-        AddBuffer(Task, std::move(*MBOrErr));
-      }
-    };
-
-    return [=](size_t Task) -> std::unique_ptr<NativeObjectStream> {
-      // Write to a temporary to avoid race condition
-      SmallString<64> TempFilenameModel;
-      sys::path::append(TempFilenameModel, CacheDirectoryPath, "Thin-%%%%%%.tmp.o");
-      Expected<sys::fs::TempFile> Temp = sys::fs::TempFile::create(
-          TempFilenameModel, sys::fs::owner_read | sys::fs::owner_write);
-      if (!Temp) {
-        errs() << "Error: " << toString(Temp.takeError()) << "\n";
-        report_fatal_error("ThinLTO: Can't get a temporary file");
-      }
-
-      // This CacheStream will move the temporary file into the cache when done.
-      return std::make_unique<CacheStream>(
-          std::make_unique<raw_fd_ostream>(Temp->FD, /* ShouldClose */ false),
-          AddBuffer, std::move(*Temp), std::string(EntryPath.str()), Task);
-    };
-  };
-}
diff --git a/gnu/llvm/llvm/lib/MC/MCELFStreamer.cpp b/gnu/llvm/llvm/lib/MC/MCELFStreamer.cpp
index 7b820e37aef..b5f6ee31e40 100644
--- a/gnu/llvm/llvm/lib/MC/MCELFStreamer.cpp
+++ b/gnu/llvm/llvm/lib/MC/MCELFStreamer.cpp
@@ -29,10 +29,10 @@
 #include "llvm/MC/MCStreamer.h"
 #include "llvm/MC/MCSymbol.h"
 #include "llvm/MC/MCSymbolELF.h"
+#include "llvm/MC/TargetRegistry.h"
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/LEB128.h"
-#include "llvm/Support/TargetRegistry.h"
 #include "llvm/Support/raw_ostream.h"
 #include <cassert>
 #include <cstdint>
@@ -88,15 +88,16 @@ void MCELFStreamer::mergeFragment(MCDataFragment *DF,
   DF->getContents().append(EF->getContents().begin(), EF->getContents().end());
 }
 
-void MCELFStreamer::InitSections(bool NoExecStack) {
+void MCELFStreamer::initSections(bool NoExecStack, const MCSubtargetInfo &STI) {
   MCContext &Ctx = getContext();
-  SwitchSection(Ctx.getObjectFileInfo()->getTextSection());
-  emitCodeAlignment(4);
+  switchSection(Ctx.getObjectFileInfo()->getTextSection());
+  emitCodeAlignment(Align(Ctx.getObjectFileInfo()->getTextSectionAlignment()),
+                    &STI);
 
   if (NoExecStack) {
     MCSection *s = Ctx.getAsmInfo()->getNonexecutableStackSection(Ctx);
     if (s)
-	SwitchSection(s);
+      switchSection(s);
   }
 }
 
@@ -142,9 +143,8 @@ void MCELFStreamer::emitAssemblerFlag(MCAssemblerFlag Flag) {
 // needs to be aligned to at least the bundle size.
 static void setSectionAlignmentForBundling(const MCAssembler &Assembler,
                                            MCSection *Section) {
-  if (Section && Assembler.isBundlingEnabled() && Section->hasInstructions() &&
-      Section->getAlignment() < Assembler.getBundleAlignSize())
-    Section->setAlignment(Align(Assembler.getBundleAlignSize()));
+  if (Section && Assembler.isBundlingEnabled() && Section->hasInstructions())
+    Section->ensureMinAlignment(Align(Assembler.getBundleAlignSize()));
 }
 
 void MCELFStreamer::changeSection(MCSection *Section,
@@ -218,6 +218,7 @@ bool MCELFStreamer::emitSymbolAttribute(MCSymbol *S, MCSymbolAttr Attribute) {
   case MCSA_WeakDefAutoPrivate:
   case MCSA_Invalid:
   case MCSA_IndirectSymbol:
+  case MCSA_Exported:
     return false;
 
   case MCSA_NoDeadStrip:
@@ -227,6 +228,7 @@ bool MCELFStreamer::emitSymbolAttribute(MCSymbol *S, MCSymbolAttr Attribute) {
   case MCSA_ELF_TypeGnuUniqueObject:
     Symbol->setType(CombineSymbolTypes(Symbol->getType(), ELF::STT_OBJECT));
     Symbol->setBinding(ELF::STB_GNU_UNIQUE);
+    getAssembler().getWriter().markGnuAbi();
     break;
 
   case MCSA_Global:
@@ -264,6 +266,7 @@ bool MCELFStreamer::emitSymbolAttribute(MCSymbol *S, MCSymbolAttr Attribute) {
 
   case MCSA_ELF_TypeIndFunction:
     Symbol->setType(CombineSymbolTypes(Symbol->getType(), ELF::STT_GNU_IFUNC));
+    getAssembler().getWriter().markGnuAbi();
     break;
 
   case MCSA_ELF_TypeObject:
@@ -287,6 +290,10 @@ bool MCELFStreamer::emitSymbolAttribute(MCSymbol *S, MCSymbolAttr Attribute) {
     Symbol->setVisibility(ELF::STV_PROTECTED);
     break;
 
+  case MCSA_Memtag:
+    Symbol->setMemtag(true);
+    break;
+
   case MCSA_Hidden:
     Symbol->setVisibility(ELF::STV_HIDDEN);
     break;
@@ -306,7 +313,7 @@ bool MCELFStreamer::emitSymbolAttribute(MCSymbol *S, MCSymbolAttr Attribute) {
 }
 
 void MCELFStreamer::emitCommonSymbol(MCSymbol *S, uint64_t Size,
-                                     unsigned ByteAlignment) {
+                                     Align ByteAlignment) {
   auto *Symbol = cast<MCSymbolELF>(S);
   getAssembler().registerSymbol(*Symbol);
 
@@ -319,16 +326,16 @@ void MCELFStreamer::emitCommonSymbol(MCSymbol *S, uint64_t Size,
     MCSection &Section = *getAssembler().getContext().getELFSection(
         ".bss", ELF::SHT_NOBITS, ELF::SHF_WRITE | ELF::SHF_ALLOC);
     MCSectionSubPair P = getCurrentSection();
-    SwitchSection(&Section);
+    switchSection(&Section);
 
     emitValueToAlignment(ByteAlignment, 0, 1, 0);
     emitLabel(Symbol);
     emitZeros(Size);
 
-    SwitchSection(P.first, P.second);
+    switchSection(P.first, P.second);
   } else {
-    if(Symbol->declareCommon(Size, ByteAlignment))
-      report_fatal_error("Symbol: " + Symbol->getName() +
+    if (Symbol->declareCommon(Size, ByteAlignment))
+      report_fatal_error(Twine("Symbol: ") + Symbol->getName() +
                          " redeclared as different type");
   }
 
@@ -348,7 +355,7 @@ void MCELFStreamer::emitELFSymverDirective(const MCSymbol *OriginalSym,
 }
 
 void MCELFStreamer::emitLocalCommonSymbol(MCSymbol *S, uint64_t Size,
-                                          unsigned ByteAlignment) {
+                                          Align ByteAlignment) {
   auto *Symbol = cast<MCSymbolELF>(S);
   // FIXME: Should this be caught and done earlier?
   getAssembler().registerSymbol(*Symbol);
@@ -364,14 +371,13 @@ void MCELFStreamer::emitValueImpl(const MCExpr *Value, unsigned Size,
   MCObjectStreamer::emitValueImpl(Value, Size, Loc);
 }
 
-void MCELFStreamer::emitValueToAlignment(unsigned ByteAlignment,
-                                         int64_t Value,
+void MCELFStreamer::emitValueToAlignment(Align Alignment, int64_t Value,
                                          unsigned ValueSize,
                                          unsigned MaxBytesToEmit) {
   if (isBundleLocked())
     report_fatal_error("Emitting values inside a locked bundle is forbidden");
-  MCObjectStreamer::emitValueToAlignment(ByteAlignment, Value,
-                                         ValueSize, MaxBytesToEmit);
+  MCObjectStreamer::emitValueToAlignment(Alignment, Value, ValueSize,
+                                         MaxBytesToEmit);
 }
 
 void MCELFStreamer::emitCGProfileEntry(const MCSymbolRefExpr *From,
@@ -383,15 +389,15 @@ void MCELFStreamer::emitCGProfileEntry(const MCSymbolRefExpr *From,
 void MCELFStreamer::emitIdent(StringRef IdentString) {
   MCSection *Comment = getAssembler().getContext().getELFSection(
       ".comment", ELF::SHT_PROGBITS, ELF::SHF_MERGE | ELF::SHF_STRINGS, 1);
-  PushSection();
-  SwitchSection(Comment);
+  pushSection();
+  switchSection(Comment);
   if (!SeenIdent) {
     emitInt8(0);
     SeenIdent = true;
   }
   emitBytes(IdentString);
   emitInt8(0);
-  PopSection();
+  popSection();
 }
 
 void MCELFStreamer::fixSymbolsInTLSFixups(const MCExpr *expr) {
@@ -498,12 +504,12 @@ void MCELFStreamer::finalizeCGProfileEntry(const MCSymbolRefExpr *&SRE,
   }
   const MCConstantExpr *MCOffset = MCConstantExpr::create(Offset, getContext());
   MCObjectStreamer::visitUsedExpr(*SRE);
-  if (Optional<std::pair<bool, std::string>> Err =
+  if (std::optional<std::pair<bool, std::string>> Err =
           MCObjectStreamer::emitRelocDirective(
               *MCOffset, "BFD_RELOC_NONE", SRE, SRE->getLoc(),
               *getContext().getSubtargetInfo()))
     report_fatal_error("Relocation for CG Profile could not be created: " +
-                       Err->second);
+                       Twine(Err->second));
 }
 
 void MCELFStreamer::finalizeCGProfile() {
@@ -513,8 +519,8 @@ void MCELFStreamer::finalizeCGProfile() {
   MCSection *CGProfile = getAssembler().getContext().getELFSection(
       ".llvm.call-graph-profile", ELF::SHT_LLVM_CALL_GRAPH_PROFILE,
       ELF::SHF_EXCLUDE, /*sizeof(Elf_CGProfile_Impl<>)=*/8);
-  PushSection();
-  SwitchSection(CGProfile);
+  pushSection();
+  switchSection(CGProfile);
   uint64_t Offset = 0;
   for (MCAssembler::CGProfileEntry &E : Asm.CGProfile) {
     finalizeCGProfileEntry(E.From, Offset);
@@ -522,7 +528,7 @@ void MCELFStreamer::finalizeCGProfile() {
     emitIntValue(E.Count, sizeof(uint64_t));
     Offset += sizeof(uint64_t);
   }
-  PopSection();
+  popSection();
 }
 
 void MCELFStreamer::emitInstToFragment(const MCInst &Inst,
@@ -635,12 +641,12 @@ void MCELFStreamer::emitInstToData(const MCInst &Inst,
   }
 }
 
-void MCELFStreamer::emitBundleAlignMode(unsigned AlignPow2) {
-  assert(AlignPow2 <= 30 && "Invalid bundle alignment");
+void MCELFStreamer::emitBundleAlignMode(Align Alignment) {
+  assert(Log2(Alignment) <= 30 && "Invalid bundle alignment");
   MCAssembler &Assembler = getAssembler();
-  if (AlignPow2 > 0 && (Assembler.getBundleAlignSize() == 0 ||
-                        Assembler.getBundleAlignSize() == 1U << AlignPow2))
-    Assembler.setBundleAlignSize(1U << AlignPow2);
+  if (Alignment > 1 && (Assembler.getBundleAlignSize() == 0 ||
+                        Assembler.getBundleAlignSize() == Alignment.value()))
+    Assembler.setBundleAlignSize(Alignment.value());
   else
     report_fatal_error(".bundle_align_mode cannot be changed once set");
 }
@@ -648,8 +654,6 @@ void MCELFStreamer::emitBundleAlignMode(unsigned AlignPow2) {
 void MCELFStreamer::emitBundleLock(bool AlignToEnd) {
   MCSection &Sec = *getCurrentSectionOnly();
 
-  // Sanity checks
-  //
   if (!getAssembler().isBundlingEnabled())
     report_fatal_error(".bundle_lock forbidden when bundling is disabled");
 
@@ -669,7 +673,6 @@ void MCELFStreamer::emitBundleLock(bool AlignToEnd) {
 void MCELFStreamer::emitBundleUnlock() {
   MCSection &Sec = *getCurrentSectionOnly();
 
-  // Sanity checks
   if (!getAssembler().isBundlingEnabled())
     report_fatal_error(".bundle_unlock forbidden when bundling is disabled");
   else if (!isBundleLocked())
@@ -727,13 +730,13 @@ void MCELFStreamer::emitSymbolDesc(MCSymbol *Symbol, unsigned DescValue) {
 }
 
 void MCELFStreamer::emitZerofill(MCSection *Section, MCSymbol *Symbol,
-                                 uint64_t Size, unsigned ByteAlignment,
+                                 uint64_t Size, Align ByteAlignment,
                                  SMLoc Loc) {
   llvm_unreachable("ELF doesn't support this directive");
 }
 
 void MCELFStreamer::emitTBSSSymbol(MCSection *Section, MCSymbol *Symbol,
-                                   uint64_t Size, unsigned ByteAlignment) {
+                                   uint64_t Size, Align ByteAlignment) {
   llvm_unreachable("ELF doesn't support this directive");
 }
 
@@ -837,10 +840,10 @@ void MCELFStreamer::createAttributesSection(
 
   // Switch section to AttributeSection or get/create the section.
   if (AttributeSection) {
-    SwitchSection(AttributeSection);
+    switchSection(AttributeSection);
   } else {
     AttributeSection = getContext().getELFSection(Section, Type, 0);
-    SwitchSection(AttributeSection);
+    switchSection(AttributeSection);
 
     // Format version
     emitInt8(0x41);
diff --git a/gnu/llvm/llvm/lib/MC/MCParser/AsmParser.cpp b/gnu/llvm/llvm/lib/MC/MCParser/AsmParser.cpp
index 047ed1660a8..0bf8708d6a5 100644
--- a/gnu/llvm/llvm/lib/MC/MCParser/AsmParser.cpp
+++ b/gnu/llvm/llvm/lib/MC/MCParser/AsmParser.cpp
@@ -13,7 +13,6 @@
 #include "llvm/ADT/APFloat.h"
 #include "llvm/ADT/APInt.h"
 #include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/None.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallSet.h"
 #include "llvm/ADT/SmallString.h"
@@ -33,7 +32,6 @@
 #include "llvm/MC/MCInstPrinter.h"
 #include "llvm/MC/MCInstrDesc.h"
 #include "llvm/MC/MCInstrInfo.h"
-#include "llvm/MC/MCObjectFileInfo.h"
 #include "llvm/MC/MCParser/AsmCond.h"
 #include "llvm/MC/MCParser/AsmLexer.h"
 #include "llvm/MC/MCParser/MCAsmLexer.h"
@@ -65,6 +63,7 @@
 #include <cstdint>
 #include <deque>
 #include <memory>
+#include <optional>
 #include <sstream>
 #include <string>
 #include <tuple>
@@ -75,8 +74,6 @@ using namespace llvm;
 
 MCAsmParserSemaCallback::~MCAsmParserSemaCallback() = default;
 
-extern cl::opt<unsigned> AsmMacroMaxNestingDepth;
-
 namespace {
 
 /// Helper types for tracking macro definitions.
@@ -159,7 +156,7 @@ private:
     int64_t LineNumber;
     SMLoc Loc;
     unsigned Buf;
-    CppHashInfoTy() : Filename(), LineNumber(0), Loc(), Buf(0) {}
+    CppHashInfoTy() : LineNumber(0), Buf(0) {}
   };
   CppHashInfoTy CppHashInfo;
 
@@ -240,9 +237,11 @@ public:
     AssemblerDialect = i;
   }
 
-  void Note(SMLoc L, const Twine &Msg, SMRange Range = None) override;
-  bool Warning(SMLoc L, const Twine &Msg, SMRange Range = None) override;
-  bool printError(SMLoc L, const Twine &Msg, SMRange Range = None) override;
+  void Note(SMLoc L, const Twine &Msg, SMRange Range = std::nullopt) override;
+  bool Warning(SMLoc L, const Twine &Msg,
+               SMRange Range = std::nullopt) override;
+  bool printError(SMLoc L, const Twine &Msg,
+                  SMRange Range = std::nullopt) override;
 
   const AsmToken &Lex() override;
 
@@ -325,7 +324,7 @@ private:
 
   void printMacroInstantiations();
   void printMessage(SMLoc Loc, SourceMgr::DiagKind Kind, const Twine &Msg,
-                    SMRange Range = None) const {
+                    SMRange Range = std::nullopt) const {
     ArrayRef<SMRange> Ranges(Range);
     SrcMgr.PrintMessage(Loc, Kind, Msg, Ranges);
   }
@@ -356,8 +355,14 @@ private:
   /// return the contents from the current token up to the end or comma.
   StringRef parseStringToComma();
 
-  bool parseAssignment(StringRef Name, bool allow_redef,
-                       bool NoDeadStrip = false);
+  enum class AssignmentKind {
+    Set,
+    Equiv,
+    Equal,
+    LTOSetConditional,
+  };
+
+  bool parseAssignment(StringRef Name, AssignmentKind Kind);
 
   unsigned getBinOpPrecedence(AsmToken::TokenKind K,
                               MCBinaryExpr::Opcode &Kind);
@@ -534,6 +539,9 @@ private:
     DK_ADDRSIG_SYM,
     DK_PSEUDO_PROBE,
     DK_LTO_DISCARD,
+    DK_LTO_SET_CONDITIONAL,
+    DK_CFI_MTE_TAGGED_FRAME,
+    DK_MEMTAG,
     DK_END
   };
 
@@ -564,8 +572,8 @@ private:
                                const fltSemantics &); // ".single", ...
   bool parseDirectiveFill(); // ".fill"
   bool parseDirectiveZero(); // ".zero"
-  // ".set", ".equ", ".equiv"
-  bool parseDirectiveSet(StringRef IDVal, bool allow_redef);
+  // ".set", ".equ", ".equiv", ".lto_set_conditional"
+  bool parseDirectiveSet(StringRef IDVal, AssignmentKind Kind);
   bool parseDirectiveOrg(); // ".org"
   // ".align{,32}", ".p2align{,w,l}"
   bool parseDirectiveAlign(bool IsPow2, unsigned ValueSize);
@@ -746,9 +754,12 @@ public:
 
 namespace llvm {
 
+extern cl::opt<unsigned> AsmMacroMaxNestingDepth;
+
 extern MCAsmParserExtension *createDarwinAsmParser();
 extern MCAsmParserExtension *createELFAsmParser();
 extern MCAsmParserExtension *createCOFFAsmParser();
+extern MCAsmParserExtension *createGOFFAsmParser();
 extern MCAsmParserExtension *createXCOFFAsmParser();
 extern MCAsmParserExtension *createWasmAsmParser();
 
@@ -783,13 +794,21 @@ AsmParser::AsmParser(SourceMgr &SM, MCContext &Ctx, MCStreamer &Out,
     PlatformParser.reset(createELFAsmParser());
     break;
   case MCContext::IsGOFF:
-    report_fatal_error("GOFFAsmParser support not implemented yet");
+    PlatformParser.reset(createGOFFAsmParser());
+    break;
+  case MCContext::IsSPIRV:
+    report_fatal_error(
+        "Need to implement createSPIRVAsmParser for SPIRV format.");
+    break;
   case MCContext::IsWasm:
     PlatformParser.reset(createWasmAsmParser());
     break;
   case MCContext::IsXCOFF:
     PlatformParser.reset(createXCOFFAsmParser());
     break;
+  case MCContext::IsDXContainer:
+    llvm_unreachable("DXContainer is not supported yet");
+    break;
   }
 
   PlatformParser->Initialize(*this);
@@ -932,10 +951,9 @@ bool AsmParser::enabledGenDwarfForAssembly() {
     // Use the first #line directive for this, if any. It's preprocessed, so
     // there is no checksum, and of course no source directive.
     if (!FirstCppHashFilename.empty())
-      getContext().setMCLineTableRootFile(/*CUID=*/0,
-                                          getContext().getCompilationDir(),
-                                          FirstCppHashFilename,
-                                          /*Cksum=*/None, /*Source=*/None);
+      getContext().setMCLineTableRootFile(
+          /*CUID=*/0, getContext().getCompilationDir(), FirstCppHashFilename,
+          /*Cksum=*/std::nullopt, /*Source=*/std::nullopt);
     const MCDwarfFile &RootFile =
         getContext().getMCDwarfLineTable(/*CUID=*/0).getRootFile();
     getContext().setGenDwarfFileNumber(getStreamer().emitDwarfFileDirective(
@@ -950,7 +968,7 @@ bool AsmParser::Run(bool NoInitialTextSection, bool NoFinalize) {
 
   // Create the initial section, if requested.
   if (!NoInitialTextSection)
-    Out.InitSections(false);
+    Out.initSections(false, getTargetParser().getSTI());
 
   // Prime the lexer.
   Lex();
@@ -1056,18 +1074,21 @@ bool AsmParser::Run(bool NoInitialTextSection, bool NoFinalize) {
       }
     }
   }
-
   // Finalize the output stream if there are no errors and if the client wants
   // us to.
-  if (!HadError && !NoFinalize)
-    Out.Finish(Lexer.getLoc());
+  if (!HadError && !NoFinalize) {
+    if (auto *TS = Out.getTargetStreamer())
+      TS->emitConstantPools();
+
+    Out.finish(Lexer.getLoc());
+  }
 
   return HadError || getContext().hadError();
 }
 
 bool AsmParser::checkForValidSection() {
   if (!ParsingMSInlineAsm && !getStreamer().getCurrentSectionOnly()) {
-    Out.InitSections(false);
+    Out.initSections(false, getTargetParser().getSTI());
     return Error(getTok().getLoc(),
                  "expected section directive before assembly directive");
   }
@@ -1113,11 +1134,8 @@ StringRef AsmParser::parseStringToComma() {
 bool AsmParser::parseParenExpr(const MCExpr *&Res, SMLoc &EndLoc) {
   if (parseExpression(Res))
     return true;
-  if (Lexer.isNot(AsmToken::RParen))
-    return TokError("expected ')' in parentheses expression");
   EndLoc = Lexer.getTok().getEndLoc();
-  Lex();
-  return false;
+  return parseRParen();
 }
 
 /// Parse a bracket expression and return it.
@@ -1206,9 +1224,7 @@ bool AsmParser::parsePrimaryExpr(const MCExpr *&Res, SMLoc &EndLoc,
       Lex(); // eat '('.
       StringRef VName;
       parseIdentifier(VName);
-      // eat ')'.
-      if (parseToken(AsmToken::RParen,
-                     "unexpected token in variant, expected ')'"))
+      if (parseRParen())
         return true;
       Split = std::make_pair(Identifier, VName);
     }
@@ -1371,9 +1387,8 @@ bool AsmParser::parsePrimaryExpr(const MCExpr *&Res, SMLoc &EndLoc,
     Lex(); // Eat the operator.
     if (parseExpression(Res, EndLoc))
       return true;
-    if (Lexer.isNot(AsmToken::RParen))
-      return TokError("expected ')'");
-    Lex(); // Eat the operator.
+    if (parseRParen())
+      return true;
     Res = getTargetParser().createTargetUnaryExpr(Res, FirstTokenKind, Ctx);
     return !Res;
   }
@@ -1545,8 +1560,7 @@ bool AsmParser::parseParenExprOfDepth(unsigned ParenDepth, const MCExpr *&Res,
     // This is the same behavior as parseParenExpression().
     if (ParenDepth - 1 > 0) {
       EndLoc = getTok().getEndLoc();
-      if (parseToken(AsmToken::RParen,
-                     "expected ')' in parentheses expression"))
+      if (parseRParen())
         return true;
     }
   }
@@ -1779,7 +1793,7 @@ bool AsmParser::parseStatement(ParseStatementInfo &Info,
     // if this is a line comment we can drop it safely
     if (getTok().getString().empty() || getTok().getString().front() == '\r' ||
         getTok().getString().front() == '\n')
-      Out.AddBlankLine();
+      Out.addBlankLine();
     Lex();
     return false;
   }
@@ -1891,16 +1905,14 @@ bool AsmParser::parseStatement(ParseStatementInfo &Info,
 
   // FIXME: Recurse on local labels?
 
-  // See what kind of statement we have.
-  switch (Lexer.getKind()) {
-  case AsmToken::Colon: {
-    if (!getTargetParser().isLabel(ID))
-      break;
+  // Check for a label.
+  //   ::= identifier ':'
+  //   ::= number ':'
+  if (Lexer.is(AsmToken::Colon) && getTargetParser().isLabel(ID)) {
     if (checkForValidSection())
       return true;
 
-    // identifier ':'   -> Label.
-    Lex();
+    Lex(); // Consume the ':'.
 
     // Diagnose attempt to use '.' as a label.
     if (IDVal == ".")
@@ -1936,7 +1948,7 @@ bool AsmParser::parseStatement(ParseStatementInfo &Info,
     }
 
     // Consume any end of statement token, if present, to avoid spurious
-    // AddBlankLine calls().
+    // addBlankLine calls().
     if (getTok().is(AsmToken::EndOfStatement)) {
       Lex();
     }
@@ -1944,7 +1956,7 @@ bool AsmParser::parseStatement(ParseStatementInfo &Info,
     if (discardLTOSymbol(IDVal))
       return false;
 
-    getTargetParser().doBeforeLabelEmit(Sym);
+    getTargetParser().doBeforeLabelEmit(Sym, IDLoc);
 
     // Emit the label.
     if (!getTargetParser().isParsingMSInlineAsm())
@@ -1961,16 +1973,11 @@ bool AsmParser::parseStatement(ParseStatementInfo &Info,
     return false;
   }
 
-  case AsmToken::Equal:
-    if (!getTargetParser().equalIsAsmAssignment())
-      break;
-    // identifier '=' ... -> assignment statement
+  // Check for an assignment statement.
+  //   ::= identifier '='
+  if (Lexer.is(AsmToken::Equal) && getTargetParser().equalIsAsmAssignment()) {
     Lex();
-
-    return parseAssignment(IDVal, true);
-
-  default: // Normal instruction or directive.
-    break;
+    return parseAssignment(IDVal, AssignmentKind::Equal);
   }
 
   // If macros are enabled, check to see if this is a macro instantiation.
@@ -2026,9 +2033,11 @@ bool AsmParser::parseStatement(ParseStatementInfo &Info,
       break;
     case DK_SET:
     case DK_EQU:
-      return parseDirectiveSet(IDVal, true);
+      return parseDirectiveSet(IDVal, AssignmentKind::Set);
     case DK_EQUIV:
-      return parseDirectiveSet(IDVal, false);
+      return parseDirectiveSet(IDVal, AssignmentKind::Equiv);
+    case DK_LTO_SET_CONDITIONAL:
+      return parseDirectiveSet(IDVal, AssignmentKind::LTOSetConditional);
     case DK_ASCII:
       return parseDirectiveAscii(IDVal, false);
     case DK_ASCIZ:
@@ -2288,6 +2297,8 @@ bool AsmParser::parseStatement(ParseStatementInfo &Info,
       return parseDirectivePseudoProbe();
     case DK_LTO_DISCARD:
       return parseDirectiveLTODiscard();
+    case DK_MEMTAG:
+      return parseDirectiveSymbolAttribute(MCSA_Memtag);
     }
 
     return Error(IDLoc, "unknown directive");
@@ -2924,11 +2935,13 @@ void AsmParser::handleMacroExit() {
   ActiveMacros.pop_back();
 }
 
-bool AsmParser::parseAssignment(StringRef Name, bool allow_redef,
-                                bool NoDeadStrip) {
+bool AsmParser::parseAssignment(StringRef Name, AssignmentKind Kind) {
   MCSymbol *Sym;
   const MCExpr *Value;
-  if (MCParserUtils::parseAssignmentExpression(Name, allow_redef, *this, Sym,
+  SMLoc ExprLoc = getTok().getLoc();
+  bool AllowRedef =
+      Kind == AssignmentKind::Set || Kind == AssignmentKind::Equal;
+  if (MCParserUtils::parseAssignmentExpression(Name, AllowRedef, *this, Sym,
                                                Value))
     return true;
 
@@ -2943,9 +2956,22 @@ bool AsmParser::parseAssignment(StringRef Name, bool allow_redef,
     return false;
 
   // Do the assignment.
-  Out.emitAssignment(Sym, Value);
-  if (NoDeadStrip)
+  switch (Kind) {
+  case AssignmentKind::Equal:
+    Out.emitAssignment(Sym, Value);
+    break;
+  case AssignmentKind::Set:
+  case AssignmentKind::Equiv:
+    Out.emitAssignment(Sym, Value);
     Out.emitSymbolAttribute(Sym, MCSA_NoDeadStrip);
+    break;
+  case AssignmentKind::LTOSetConditional:
+    if (Value->getKind() != MCExpr::SymbolRef)
+      return Error(ExprLoc, "expected identifier");
+
+    Out.emitConditionalAssignment(Sym, Value);
+    break;
+  }
 
   return false;
 }
@@ -2997,10 +3023,11 @@ bool AsmParser::parseIdentifier(StringRef &Res) {
 ///   ::= .equ identifier ',' expression
 ///   ::= .equiv identifier ',' expression
 ///   ::= .set identifier ',' expression
-bool AsmParser::parseDirectiveSet(StringRef IDVal, bool allow_redef) {
+///   ::= .lto_set_conditional identifier ',' expression
+bool AsmParser::parseDirectiveSet(StringRef IDVal, AssignmentKind Kind) {
   StringRef Name;
   if (check(parseIdentifier(Name), "expected identifier") || parseComma() ||
-      parseAssignment(Name, allow_redef, true))
+      parseAssignment(Name, Kind))
     return true;
   return false;
 }
@@ -3152,7 +3179,7 @@ bool AsmParser::parseDirectiveReloc(SMLoc DirectiveLoc) {
 
   const MCTargetAsmParser &MCT = getTargetParser();
   const MCSubtargetInfo &STI = MCT.getSTI();
-  if (Optional<std::pair<bool, std::string>> Err =
+  if (std::optional<std::pair<bool, std::string>> Err =
           getStreamer().emitRelocDirective(*Offset, Name, Expr, DirectiveLoc,
                                            STI))
     return Error(Err->first ? NameLoc : OffsetLoc, Err->second);
@@ -3426,10 +3453,14 @@ bool AsmParser::parseDirectiveAlign(bool IsPow2, unsigned ValueSize) {
     // up to one.
     if (Alignment == 0)
       Alignment = 1;
-    if (!isPowerOf2_64(Alignment))
+    else if (!isPowerOf2_64(Alignment)) {
       ReturnVal |= Error(AlignmentLoc, "alignment must be a power of 2");
-    if (!isUInt<32>(Alignment))
+      Alignment = PowerOf2Floor(Alignment);
+    }
+    if (!isUInt<32>(Alignment)) {
       ReturnVal |= Error(AlignmentLoc, "alignment must be smaller than 2**32");
+      Alignment = 1u << 31;
+    }
   }
 
   // Diagnose non-sensical max bytes to align.
@@ -3452,13 +3483,14 @@ bool AsmParser::parseDirectiveAlign(bool IsPow2, unsigned ValueSize) {
   // directive.
   const MCSection *Section = getStreamer().getCurrentSectionOnly();
   assert(Section && "must have section to emit alignment");
-  bool UseCodeAlign = Section->UseCodeAlign();
+  bool useCodeAlign = Section->useCodeAlign();
   if ((!HasFillExpr || Lexer.getMAI().getTextAlignFillValue() == FillExpr) &&
-      ValueSize == 1 && UseCodeAlign) {
-    getStreamer().emitCodeAlignment(Alignment, MaxBytesToFill);
+      ValueSize == 1 && useCodeAlign) {
+    getStreamer().emitCodeAlignment(
+        Align(Alignment), &getTargetParser().getSTI(), MaxBytesToFill);
   } else {
     // FIXME: Target specific behavior about how the "extra" bytes are filled.
-    getStreamer().emitValueToAlignment(Alignment, FillExpr, ValueSize,
+    getStreamer().emitValueToAlignment(Align(Alignment), FillExpr, ValueSize,
                                        MaxBytesToFill);
   }
 
@@ -3503,7 +3535,7 @@ bool AsmParser::parseDirectiveFile(SMLoc DirectiveLoc) {
   uint64_t MD5Hi, MD5Lo;
   bool HasMD5 = false;
 
-  Optional<StringRef> Source;
+  std::optional<StringRef> Source;
   bool HasSource = false;
   std::string SourceString;
 
@@ -3547,12 +3579,12 @@ bool AsmParser::parseDirectiveFile(SMLoc DirectiveLoc) {
       Ctx.setGenDwarfForAssembly(false);
     }
 
-    Optional<MD5::MD5Result> CKMem;
+    std::optional<MD5::MD5Result> CKMem;
     if (HasMD5) {
       MD5::MD5Result Sum;
       for (unsigned i = 0; i != 8; ++i) {
-        Sum.Bytes[i] = uint8_t(MD5Hi >> ((7 - i) * 8));
-        Sum.Bytes[i + 8] = uint8_t(MD5Lo >> ((7 - i) * 8));
+        Sum[i] = uint8_t(MD5Hi >> ((7 - i) * 8));
+        Sum[i + 8] = uint8_t(MD5Lo >> ((7 - i) * 8));
       }
       CKMem = Sum;
     }
@@ -3723,8 +3755,7 @@ bool AsmParser::parseDirectiveCVFile() {
         parseEscapedString(Checksum) ||
         parseIntToken(ChecksumKind,
                       "expected checksum kind in '.cv_file' directive") ||
-        parseToken(AsmToken::EndOfStatement,
-                   "unexpected token in '.cv_file' directive"))
+        parseEOL())
       return true;
   }
 
@@ -3734,7 +3765,7 @@ bool AsmParser::parseDirectiveCVFile() {
   ArrayRef<uint8_t> ChecksumAsBytes(reinterpret_cast<const uint8_t *>(CKMem),
                                     Checksum.size());
 
-  if (!getStreamer().EmitCVFileDirective(FileNumber, Filename, ChecksumAsBytes,
+  if (!getStreamer().emitCVFileDirective(FileNumber, Filename, ChecksumAsBytes,
                                          static_cast<uint8_t>(ChecksumKind)))
     return Error(FileNumberLoc, "file number already allocated");
 
@@ -3770,12 +3801,10 @@ bool AsmParser::parseDirectiveCVFuncId() {
   SMLoc FunctionIdLoc = getTok().getLoc();
   int64_t FunctionId;
 
-  if (parseCVFunctionId(FunctionId, ".cv_func_id") ||
-      parseToken(AsmToken::EndOfStatement,
-                 "unexpected token in '.cv_func_id' directive"))
+  if (parseCVFunctionId(FunctionId, ".cv_func_id") || parseEOL())
     return true;
 
-  if (!getStreamer().EmitCVFuncIdDirective(FunctionId))
+  if (!getStreamer().emitCVFuncIdDirective(FunctionId))
     return Error(FunctionIdLoc, "function id already allocated");
 
   return false;
@@ -3831,11 +3860,10 @@ bool AsmParser::parseDirectiveCVInlineSiteId() {
     Lex();
   }
 
-  if (parseToken(AsmToken::EndOfStatement,
-                 "unexpected token in '.cv_inline_site_id' directive"))
+  if (parseEOL())
     return true;
 
-  if (!getStreamer().EmitCVInlineSiteIdDirective(FunctionId, IAFunc, IAFile,
+  if (!getStreamer().emitCVInlineSiteIdDirective(FunctionId, IAFunc, IAFile,
                                                  IALine, IACol, FunctionIdLoc))
     return Error(FunctionIdLoc, "function id already allocated");
 
@@ -3956,7 +3984,7 @@ bool AsmParser::parseDirectiveCVInlineLinetable() {
                                   "expected identifier in directive"))
     return true;
 
-  if (parseToken(AsmToken::EndOfStatement, "Expected End of Statement"))
+  if (parseEOL())
     return true;
 
   MCSymbol *FnStartSym = getContext().getOrCreateSymbol(FnStartName);
@@ -4117,7 +4145,7 @@ bool AsmParser::parseDirectiveCVFileChecksumOffset() {
   int64_t FileNo;
   if (parseIntToken(FileNo, "expected identifier in directive"))
     return true;
-  if (parseToken(AsmToken::EndOfStatement, "Expected End of Statement"))
+  if (parseEOL())
     return true;
   getStreamer().emitCVFileChecksumOffsetDirective(FileNo);
   return false;
@@ -4133,7 +4161,7 @@ bool AsmParser::parseDirectiveCVFPOData() {
   if (parseEOL())
     return true;
   MCSymbol *ProcSym = getContext().getOrCreateSymbol(ProcName);
-  getStreamer().EmitCVFPOData(ProcSym, DirLoc);
+  getStreamer().emitCVFPOData(ProcSym, DirLoc);
   return false;
 }
 
@@ -4194,10 +4222,10 @@ bool AsmParser::parseDirectiveCFIEndProc() {
 /// parse register name or number.
 bool AsmParser::parseRegisterOrRegisterNumber(int64_t &Register,
                                               SMLoc DirectiveLoc) {
-  unsigned RegNo;
+  MCRegister RegNo;
 
   if (getLexer().isNot(AsmToken::Integer)) {
-    if (getTargetParser().ParseRegister(RegNo, DirectiveLoc, DirectiveLoc))
+    if (getTargetParser().parseRegister(RegNo, DirectiveLoc, DirectiveLoc))
       return true;
     Register = getContext().getRegisterInfo()->getDwarfRegNum(RegNo, true);
   } else
@@ -4781,9 +4809,7 @@ bool AsmParser::parseDirectiveBundleAlignMode() {
             "invalid bundle alignment size (expected between 0 and 30)"))
     return true;
 
-  // Because of AlignSizePow2's verified range we can safely truncate it to
-  // unsigned.
-  getStreamer().emitBundleAlignMode(static_cast<unsigned>(AlignSizePow2));
+  getStreamer().emitBundleAlignMode(Align(1ULL << AlignSizePow2));
   return false;
 }
 
@@ -4959,8 +4985,9 @@ bool AsmParser::parseDirectiveSymbolAttribute(MCSymbolAttr Attr) {
 
     MCSymbol *Sym = getContext().getOrCreateSymbol(Name);
 
-    // Assembler local symbols don't make any sense here. Complain loudly.
-    if (Sym->isTemporary())
+    // Assembler local symbols don't make any sense here, except for directives
+    // that the symbol should be tagged.
+    if (Sym->isTemporary() && Attr != MCSA_Memtag)
       return Error(Loc, "non-local symbol required");
 
     if (!getStreamer().emitSymbolAttribute(Sym, Attr))
@@ -5020,15 +5047,7 @@ bool AsmParser::parseDirectiveComm(bool IsLocal) {
   // NOTE: a size of zero for a .comm should create a undefined symbol
   // but a size of .lcomm creates a bss symbol of size zero.
   if (Size < 0)
-    return Error(SizeLoc, "invalid '.comm' or '.lcomm' directive size, can't "
-                          "be less than zero");
-
-  // NOTE: The alignment in the directive is a power of 2 value, the assembler
-  // may internally end up wanting an alignment in bytes.
-  // FIXME: Diagnose overflow.
-  if (Pow2Alignment < 0)
-    return Error(Pow2AlignmentLoc, "invalid '.comm' or '.lcomm' directive "
-                                   "alignment, can't be less than zero");
+    return Error(SizeLoc, "size must be non-negative");
 
   Sym->redefineIfPossible();
   if (!Sym->isUndefined())
@@ -5036,11 +5055,12 @@ bool AsmParser::parseDirectiveComm(bool IsLocal) {
 
   // Create the Symbol as a common or local common with Size and Pow2Alignment
   if (IsLocal) {
-    getStreamer().emitLocalCommonSymbol(Sym, Size, 1 << Pow2Alignment);
+    getStreamer().emitLocalCommonSymbol(Sym, Size,
+                                        Align(1ULL << Pow2Alignment));
     return false;
   }
 
-  getStreamer().emitCommonSymbol(Sym, Size, 1 << Pow2Alignment);
+  getStreamer().emitCommonSymbol(Sym, Size, Align(1ULL << Pow2Alignment));
   return false;
 }
 
@@ -5538,6 +5558,7 @@ void AsmParser::initializeDirectiveKindMap() {
   DirectiveKindMap[".cfi_register"] = DK_CFI_REGISTER;
   DirectiveKindMap[".cfi_window_save"] = DK_CFI_WINDOW_SAVE;
   DirectiveKindMap[".cfi_b_key_frame"] = DK_CFI_B_KEY_FRAME;
+  DirectiveKindMap[".cfi_mte_tagged_frame"] = DK_CFI_MTE_TAGGED_FRAME;
   DirectiveKindMap[".macros_on"] = DK_MACROS_ON;
   DirectiveKindMap[".macros_off"] = DK_MACROS_OFF;
   DirectiveKindMap[".macro"] = DK_MACRO;
@@ -5579,6 +5600,8 @@ void AsmParser::initializeDirectiveKindMap() {
   DirectiveKindMap[".addrsig_sym"] = DK_ADDRSIG_SYM;
   DirectiveKindMap[".pseudoprobe"] = DK_PSEUDO_PROBE;
   DirectiveKindMap[".lto_discard"] = DK_LTO_DISCARD;
+  DirectiveKindMap[".lto_set_conditional"] = DK_LTO_SET_CONDITIONAL;
+  DirectiveKindMap[".memtag"] = DK_MEMTAG;
 }
 
 MCAsmMacro *AsmParser::parseMacroLikeBody(SMLoc DirectiveLoc) {
@@ -5674,7 +5697,8 @@ bool AsmParser::parseDirectiveRept(SMLoc DirectiveLoc, StringRef Dir) {
   raw_svector_ostream OS(Buf);
   while (Count--) {
     // Note that the AtPseudoVariable is disabled for instantiations of .rep(t).
-    if (expandMacro(OS, M->Body, None, None, false, getTok().getLoc()))
+    if (expandMacro(OS, M->Body, std::nullopt, std::nullopt, false,
+                    getTok().getLoc()))
       return true;
   }
   instantiateMacroLikeBody(M, DirectiveLoc, OS);
@@ -5883,10 +5907,16 @@ bool AsmParser::parseDirectivePseudoProbe() {
     InlineStack.push_back(Site);
   }
 
+  // Parse function entry name
+  StringRef FnName;
+  if (parseIdentifier(FnName))
+    return Error(getLexer().getLoc(), "unexpected token in '.pseudoprobe' directive");
+  MCSymbol *FnSym = getContext().lookupSymbol(FnName);
+
   if (parseEOL())
     return true;
 
-  getStreamer().emitPseudoProbe(Guid, Index, Type, Attr, InlineStack);
+  getStreamer().emitPseudoProbe(Guid, Index, Type, Attr, InlineStack, FnSym);
   return false;
 }
 
@@ -6009,28 +6039,30 @@ bool AsmParser::parseMSInlineAsm(
       }
 
       bool isOutput = (i == 1) && Desc.mayStore();
+      bool Restricted = Operand.isMemUseUpRegs();
       SMLoc Start = SMLoc::getFromPointer(SymName.data());
       if (isOutput) {
         ++InputIdx;
         OutputDecls.push_back(OpDecl);
         OutputDeclsAddressOf.push_back(Operand.needAddressOf());
         OutputConstraints.push_back(("=" + Constraint).str());
-        AsmStrRewrites.emplace_back(AOK_Output, Start, SymName.size());
+        AsmStrRewrites.emplace_back(AOK_Output, Start, SymName.size(), 0,
+                                    Restricted);
       } else {
         InputDecls.push_back(OpDecl);
         InputDeclsAddressOf.push_back(Operand.needAddressOf());
         InputConstraints.push_back(Constraint.str());
-        if (Desc.OpInfo[i - 1].isBranchTarget())
-          AsmStrRewrites.emplace_back(AOK_CallInput, Start, SymName.size());
+        if (Desc.operands()[i - 1].isBranchTarget())
+          AsmStrRewrites.emplace_back(AOK_CallInput, Start, SymName.size(), 0,
+                                      Restricted);
         else
-          AsmStrRewrites.emplace_back(AOK_Input, Start, SymName.size());
+          AsmStrRewrites.emplace_back(AOK_Input, Start, SymName.size(), 0,
+                                      Restricted);
       }
     }
 
     // Consider implicit defs to be clobbers.  Think of cpuid and push.
-    ArrayRef<MCPhysReg> ImpDefs(Desc.getImplicitDefs(),
-                                Desc.getNumImplicitDefs());
-    llvm::append_range(ClobberRegs, ImpDefs);
+    llvm::append_range(ClobberRegs, Desc.implicit_defs());
   }
 
   // Set the number of Outputs and Inputs.
@@ -6138,13 +6170,19 @@ bool AsmParser::parseMSInlineAsm(
       OS << Ctx.getAsmInfo()->getPrivateLabelPrefix() << AR.Label;
       break;
     case AOK_Input:
-      OS << '$' << InputIdx++;
+      if (AR.IntelExpRestricted)
+        OS << "${" << InputIdx++ << ":P}";
+      else
+        OS << '$' << InputIdx++;
       break;
     case AOK_CallInput:
       OS << "${" << InputIdx++ << ":P}";
       break;
     case AOK_Output:
-      OS << '$' << OutputIdx++;
+      if (AR.IntelExpRestricted)
+        OS << "${" << OutputIdx++ << ":P}";
+      else
+        OS << '$' << OutputIdx++;
       break;
     case AOK_SizeDirective:
       switch (AR.Val) {
@@ -6225,7 +6263,7 @@ bool HLASMAsmParser::parseAsHLASMLabel(ParseStatementInfo &Info,
           ? LabelVal.upper()
           : LabelVal);
 
-  getTargetParser().doBeforeLabelEmit(Sym);
+  getTargetParser().doBeforeLabelEmit(Sym, LabelLoc);
 
   // Emit the label.
   Out.emitLabel(Sym, LabelLoc);
@@ -6281,7 +6319,7 @@ bool HLASMAsmParser::parseStatement(ParseStatementInfo &Info,
     // if this is a line comment we can drop it safely
     if (getTok().getString().empty() || getTok().getString().front() == '\r' ||
         getTok().getString().front() == '\n')
-      Out.AddBlankLine();
+      Out.addBlankLine();
     Lex();
     return false;
   }
@@ -6297,7 +6335,7 @@ bool HLASMAsmParser::parseStatement(ParseStatementInfo &Info,
   if (Lexer.is(AsmToken::EndOfStatement)) {
     if (getTok().getString().front() == '\n' ||
         getTok().getString().front() == '\r') {
-      Out.AddBlankLine();
+      Out.addBlankLine();
       Lex();
       return false;
     }
diff --git a/gnu/llvm/llvm/lib/Support/AArch64TargetParser.cpp b/gnu/llvm/llvm/lib/Support/AArch64TargetParser.cpp
deleted file mode 100644
index 2993892097e..00000000000
--- a/gnu/llvm/llvm/lib/Support/AArch64TargetParser.cpp
+++ /dev/null
@@ -1,281 +0,0 @@
-//===-- AArch64TargetParser - Parser for AArch64 features -------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements a target parser to recognise AArch64 hardware features
-// such as FPU/CPU/ARCH and extension names.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/AArch64TargetParser.h"
-#include "llvm/ADT/StringSwitch.h"
-#include "llvm/ADT/Triple.h"
-#include <cctype>
-
-using namespace llvm;
-
-static unsigned checkArchVersion(llvm::StringRef Arch) {
-  if (Arch.size() >= 2 && Arch[0] == 'v' && std::isdigit(Arch[1]))
-    return (Arch[1] - 48);
-  return 0;
-}
-
-unsigned AArch64::getDefaultFPU(StringRef CPU, AArch64::ArchKind AK) {
-  if (CPU == "generic")
-    return AArch64ARCHNames[static_cast<unsigned>(AK)].DefaultFPU;
-
-  return StringSwitch<unsigned>(CPU)
-#define AARCH64_CPU_NAME(NAME, ID, DEFAULT_FPU, IS_DEFAULT, DEFAULT_EXT)       \
-  .Case(NAME, ARM::DEFAULT_FPU)
-#include "../../include/llvm/Support/AArch64TargetParser.def"
-  .Default(ARM::FK_INVALID);
-}
-
-uint64_t AArch64::getDefaultExtensions(StringRef CPU, AArch64::ArchKind AK) {
-  if (CPU == "generic")
-    return AArch64ARCHNames[static_cast<unsigned>(AK)].ArchBaseExtensions;
-
-  return StringSwitch<uint64_t>(CPU)
-#define AARCH64_CPU_NAME(NAME, ID, DEFAULT_FPU, IS_DEFAULT, DEFAULT_EXT)       \
-  .Case(NAME, AArch64ARCHNames[static_cast<unsigned>(ArchKind::ID)]            \
-                      .ArchBaseExtensions |                                    \
-                  DEFAULT_EXT)
-#include "../../include/llvm/Support/AArch64TargetParser.def"
-  .Default(AArch64::AEK_INVALID);
-}
-
-AArch64::ArchKind AArch64::getCPUArchKind(StringRef CPU) {
-  if (CPU == "generic")
-    return ArchKind::ARMV8A;
-
-  return StringSwitch<AArch64::ArchKind>(CPU)
-#define AARCH64_CPU_NAME(NAME, ID, DEFAULT_FPU, IS_DEFAULT, DEFAULT_EXT)       \
-  .Case(NAME, ArchKind::ID)
-#include "../../include/llvm/Support/AArch64TargetParser.def"
-  .Default(ArchKind::INVALID);
-}
-
-bool AArch64::getExtensionFeatures(uint64_t Extensions,
-                                   std::vector<StringRef> &Features) {
-  if (Extensions == AArch64::AEK_INVALID)
-    return false;
-
-  if (Extensions & AEK_FP)
-    Features.push_back("+fp-armv8");
-  if (Extensions & AEK_SIMD)
-    Features.push_back("+neon");
-  if (Extensions & AEK_CRC)
-    Features.push_back("+crc");
-  if (Extensions & AEK_CRYPTO)
-    Features.push_back("+crypto");
-  if (Extensions & AEK_DOTPROD)
-    Features.push_back("+dotprod");
-  if (Extensions & AEK_FP16FML)
-    Features.push_back("+fp16fml");
-  if (Extensions & AEK_FP16)
-    Features.push_back("+fullfp16");
-  if (Extensions & AEK_PROFILE)
-    Features.push_back("+spe");
-  if (Extensions & AEK_RAS)
-    Features.push_back("+ras");
-  if (Extensions & AEK_LSE)
-    Features.push_back("+lse");
-  if (Extensions & AEK_RDM)
-    Features.push_back("+rdm");
-  if (Extensions & AEK_SVE)
-    Features.push_back("+sve");
-  if (Extensions & AEK_SVE2)
-    Features.push_back("+sve2");
-  if (Extensions & AEK_SVE2AES)
-    Features.push_back("+sve2-aes");
-  if (Extensions & AEK_SVE2SM4)
-    Features.push_back("+sve2-sm4");
-  if (Extensions & AEK_SVE2SHA3)
-    Features.push_back("+sve2-sha3");
-  if (Extensions & AEK_SVE2BITPERM)
-    Features.push_back("+sve2-bitperm");
-  if (Extensions & AEK_RCPC)
-    Features.push_back("+rcpc");
-  if (Extensions & AEK_BRBE)
-    Features.push_back("+brbe");
-  if (Extensions & AEK_PAUTH)
-    Features.push_back("+pauth");
-  if (Extensions & AEK_FLAGM)
-    Features.push_back("+flagm");
-  if (Extensions & AArch64::AEK_SME)
-    Features.push_back("+sme");
-  if (Extensions & AArch64::AEK_SMEF64)
-    Features.push_back("+sme-f64");
-  if (Extensions & AArch64::AEK_SMEI64)
-    Features.push_back("+sme-i64");
-
-  return true;
-}
-
-bool AArch64::getArchFeatures(AArch64::ArchKind AK,
-                              std::vector<StringRef> &Features) {
-  if (AK == ArchKind::ARMV8_1A)
-    Features.push_back("+v8.1a");
-  if (AK == ArchKind::ARMV8_2A)
-    Features.push_back("+v8.2a");
-  if (AK == ArchKind::ARMV8_3A)
-    Features.push_back("+v8.3a");
-  if (AK == ArchKind::ARMV8_4A)
-    Features.push_back("+v8.4a");
-  if (AK == ArchKind::ARMV8_5A)
-    Features.push_back("+v8.5a");
-  if (AK == AArch64::ArchKind::ARMV8_6A)
-    Features.push_back("+v8.6a");
-  if (AK == AArch64::ArchKind::ARMV8_7A)
-    Features.push_back("+v8.7a");
-  if(AK == AArch64::ArchKind::ARMV8R)
-    Features.push_back("+v8r");
-
-  return AK != ArchKind::INVALID;
-}
-
-StringRef AArch64::getArchName(AArch64::ArchKind AK) {
-  return AArch64ARCHNames[static_cast<unsigned>(AK)].getName();
-}
-
-StringRef AArch64::getCPUAttr(AArch64::ArchKind AK) {
-  return AArch64ARCHNames[static_cast<unsigned>(AK)].getCPUAttr();
-}
-
-StringRef AArch64::getSubArch(AArch64::ArchKind AK) {
-  return AArch64ARCHNames[static_cast<unsigned>(AK)].getSubArch();
-}
-
-unsigned AArch64::getArchAttr(AArch64::ArchKind AK) {
-  return AArch64ARCHNames[static_cast<unsigned>(AK)].ArchAttr;
-}
-
-StringRef AArch64::getArchExtName(unsigned ArchExtKind) {
-  for (const auto &AE : AArch64ARCHExtNames)
-    if (ArchExtKind == AE.ID)
-      return AE.getName();
-  return StringRef();
-}
-
-StringRef AArch64::getArchExtFeature(StringRef ArchExt) {
-  if (ArchExt.startswith("no")) {
-    StringRef ArchExtBase(ArchExt.substr(2));
-    for (const auto &AE : AArch64ARCHExtNames) {
-      if (AE.NegFeature && ArchExtBase == AE.getName())
-        return StringRef(AE.NegFeature);
-    }
-  }
-
-  for (const auto &AE : AArch64ARCHExtNames)
-    if (AE.Feature && ArchExt == AE.getName())
-      return StringRef(AE.Feature);
-  return StringRef();
-}
-
-StringRef AArch64::getDefaultCPU(StringRef Arch) {
-  ArchKind AK = parseArch(Arch);
-  if (AK == ArchKind::INVALID)
-    return StringRef();
-
-  // Look for multiple AKs to find the default for pair AK+Name.
-  for (const auto &CPU : AArch64CPUNames)
-    if (CPU.ArchID == AK && CPU.Default)
-      return CPU.getName();
-
-  // If we can't find a default then target the architecture instead
-  return "generic";
-}
-
-void AArch64::fillValidCPUArchList(SmallVectorImpl<StringRef> &Values) {
-  for (const auto &Arch : AArch64CPUNames) {
-    if (Arch.ArchID != ArchKind::INVALID)
-      Values.push_back(Arch.getName());
-  }
-}
-
-bool AArch64::isX18ReservedByDefault(const Triple &TT) {
-  return TT.isAndroid() || TT.isOSDarwin() || TT.isOSFuchsia() ||
-         TT.isOSWindows();
-}
-
-// Allows partial match, ex. "v8a" matches "armv8a".
-AArch64::ArchKind AArch64::parseArch(StringRef Arch) {
-  Arch = ARM::getCanonicalArchName(Arch);
-  if (checkArchVersion(Arch) < 8)
-    return ArchKind::INVALID;
-
-  StringRef Syn = ARM::getArchSynonym(Arch);
-  for (const auto &A : AArch64ARCHNames) {
-    if (A.getName().endswith(Syn))
-      return A.ID;
-  }
-  return ArchKind::INVALID;
-}
-
-AArch64::ArchExtKind AArch64::parseArchExt(StringRef ArchExt) {
-  for (const auto &A : AArch64ARCHExtNames) {
-    if (ArchExt == A.getName())
-      return static_cast<ArchExtKind>(A.ID);
-  }
-  return AArch64::AEK_INVALID;
-}
-
-AArch64::ArchKind AArch64::parseCPUArch(StringRef CPU) {
-  for (const auto &C : AArch64CPUNames) {
-    if (CPU == C.getName())
-      return C.ArchID;
-  }
-  return ArchKind::INVALID;
-}
-
-// Parse a branch protection specification, which has the form
-//   standard | none | [bti,pac-ret[+b-key,+leaf]*]
-// Returns true on success, with individual elements of the specification
-// returned in `PBP`. Returns false in error, with `Err` containing
-// an erroneous part of the spec.
-bool AArch64::parseBranchProtection(StringRef Spec, ParsedBranchProtection &PBP,
-                                    StringRef &Err) {
-  PBP = {"none", "a_key", false};
-  if (Spec == "none")
-    return true; // defaults are ok
-
-  if (Spec == "standard") {
-    PBP.Scope = "non-leaf";
-    PBP.BranchTargetEnforcement = true;
-    return true;
-  }
-
-  SmallVector<StringRef, 4> Opts;
-  Spec.split(Opts, "+");
-  for (int I = 0, E = Opts.size(); I != E; ++I) {
-    StringRef Opt = Opts[I].trim();
-    if (Opt == "bti") {
-      PBP.BranchTargetEnforcement = true;
-      continue;
-    }
-    if (Opt == "pac-ret") {
-      PBP.Scope = "non-leaf";
-      for (; I + 1 != E; ++I) {
-        StringRef PACOpt = Opts[I + 1].trim();
-        if (PACOpt == "leaf")
-          PBP.Scope = "all";
-        else if (PACOpt == "b-key")
-          PBP.Key = "b_key";
-        else
-          break;
-      }
-      continue;
-    }
-    if (Opt == "")
-      Err = "<empty>";
-    else
-      Err = Opt;
-    return false;
-  }
-
-  return true;
-}
diff --git a/gnu/llvm/llvm/lib/Support/ARMTargetParser.cpp b/gnu/llvm/llvm/lib/Support/ARMTargetParser.cpp
deleted file mode 100644
index 94b48df2799..00000000000
--- a/gnu/llvm/llvm/lib/Support/ARMTargetParser.cpp
+++ /dev/null
@@ -1,624 +0,0 @@
-//===-- ARMTargetParser - Parser for ARM target features --------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements a target parser to recognise ARM hardware features
-// such as FPU/CPU/ARCH/extensions and specific support such as HWDIV.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/ARMTargetParser.h"
-#include "llvm/ADT/StringSwitch.h"
-#include "llvm/ADT/Triple.h"
-#include <cctype>
-
-using namespace llvm;
-
-static StringRef getHWDivSynonym(StringRef HWDiv) {
-  return StringSwitch<StringRef>(HWDiv)
-      .Case("thumb,arm", "arm,thumb")
-      .Default(HWDiv);
-}
-
-// Allows partial match, ex. "v7a" matches "armv7a".
-ARM::ArchKind ARM::parseArch(StringRef Arch) {
-  Arch = getCanonicalArchName(Arch);
-  StringRef Syn = getArchSynonym(Arch);
-  for (const auto &A : ARCHNames) {
-    if (A.getName().endswith(Syn))
-      return A.ID;
-  }
-  return ArchKind::INVALID;
-}
-
-// Version number (ex. v7 = 7).
-unsigned ARM::parseArchVersion(StringRef Arch) {
-  Arch = getCanonicalArchName(Arch);
-  switch (parseArch(Arch)) {
-  case ArchKind::ARMV2:
-  case ArchKind::ARMV2A:
-    return 2;
-  case ArchKind::ARMV3:
-  case ArchKind::ARMV3M:
-    return 3;
-  case ArchKind::ARMV4:
-  case ArchKind::ARMV4T:
-    return 4;
-  case ArchKind::ARMV5T:
-  case ArchKind::ARMV5TE:
-  case ArchKind::IWMMXT:
-  case ArchKind::IWMMXT2:
-  case ArchKind::XSCALE:
-  case ArchKind::ARMV5TEJ:
-    return 5;
-  case ArchKind::ARMV6:
-  case ArchKind::ARMV6K:
-  case ArchKind::ARMV6T2:
-  case ArchKind::ARMV6KZ:
-  case ArchKind::ARMV6M:
-    return 6;
-  case ArchKind::ARMV7A:
-  case ArchKind::ARMV7VE:
-  case ArchKind::ARMV7R:
-  case ArchKind::ARMV7M:
-  case ArchKind::ARMV7S:
-  case ArchKind::ARMV7EM:
-  case ArchKind::ARMV7K:
-    return 7;
-  case ArchKind::ARMV8A:
-  case ArchKind::ARMV8_1A:
-  case ArchKind::ARMV8_2A:
-  case ArchKind::ARMV8_3A:
-  case ArchKind::ARMV8_4A:
-  case ArchKind::ARMV8_5A:
-  case ArchKind::ARMV8_6A:
-  case ArchKind::ARMV8_7A:
-  case ArchKind::ARMV8R:
-  case ArchKind::ARMV8MBaseline:
-  case ArchKind::ARMV8MMainline:
-  case ArchKind::ARMV8_1MMainline:
-    return 8;
-  case ArchKind::INVALID:
-    return 0;
-  }
-  llvm_unreachable("Unhandled architecture");
-}
-
-// Profile A/R/M
-ARM::ProfileKind ARM::parseArchProfile(StringRef Arch) {
-  Arch = getCanonicalArchName(Arch);
-  switch (parseArch(Arch)) {
-  case ArchKind::ARMV6M:
-  case ArchKind::ARMV7M:
-  case ArchKind::ARMV7EM:
-  case ArchKind::ARMV8MMainline:
-  case ArchKind::ARMV8MBaseline:
-  case ArchKind::ARMV8_1MMainline:
-    return ProfileKind::M;
-  case ArchKind::ARMV7R:
-  case ArchKind::ARMV8R:
-    return ProfileKind::R;
-  case ArchKind::ARMV7A:
-  case ArchKind::ARMV7VE:
-  case ArchKind::ARMV7K:
-  case ArchKind::ARMV8A:
-  case ArchKind::ARMV8_1A:
-  case ArchKind::ARMV8_2A:
-  case ArchKind::ARMV8_3A:
-  case ArchKind::ARMV8_4A:
-  case ArchKind::ARMV8_5A:
-  case ArchKind::ARMV8_6A:
-  case ArchKind::ARMV8_7A:
-    return ProfileKind::A;
-  case ArchKind::ARMV2:
-  case ArchKind::ARMV2A:
-  case ArchKind::ARMV3:
-  case ArchKind::ARMV3M:
-  case ArchKind::ARMV4:
-  case ArchKind::ARMV4T:
-  case ArchKind::ARMV5T:
-  case ArchKind::ARMV5TE:
-  case ArchKind::ARMV5TEJ:
-  case ArchKind::ARMV6:
-  case ArchKind::ARMV6K:
-  case ArchKind::ARMV6T2:
-  case ArchKind::ARMV6KZ:
-  case ArchKind::ARMV7S:
-  case ArchKind::IWMMXT:
-  case ArchKind::IWMMXT2:
-  case ArchKind::XSCALE:
-  case ArchKind::INVALID:
-    return ProfileKind::INVALID;
-  }
-  llvm_unreachable("Unhandled architecture");
-}
-
-StringRef ARM::getArchSynonym(StringRef Arch) {
-  return StringSwitch<StringRef>(Arch)
-      .Case("v5", "v5t")
-      .Case("v5e", "v5te")
-      .Case("v6j", "v6")
-      .Case("v6hl", "v6k")
-      .Cases("v6m", "v6sm", "v6s-m", "v6-m")
-      .Cases("v6z", "v6zk", "v6kz")
-      .Cases("v7", "v7a", "v7hl", "v7l", "v7-a")
-      .Case("v7r", "v7-r")
-      .Case("v7m", "v7-m")
-      .Case("v7em", "v7e-m")
-      .Cases("v8", "v8a", "v8l", "aarch64", "arm64", "v8-a")
-      .Case("v8.1a", "v8.1-a")
-      .Case("v8.2a", "v8.2-a")
-      .Case("v8.3a", "v8.3-a")
-      .Case("v8.4a", "v8.4-a")
-      .Case("v8.5a", "v8.5-a")
-      .Case("v8.6a", "v8.6-a")
-      .Case("v8.7a", "v8.7-a")
-      .Case("v8r", "v8-r")
-      .Case("v8m.base", "v8-m.base")
-      .Case("v8m.main", "v8-m.main")
-      .Case("v8.1m.main", "v8.1-m.main")
-      .Default(Arch);
-}
-
-bool ARM::getFPUFeatures(unsigned FPUKind, std::vector<StringRef> &Features) {
-
-  if (FPUKind >= FK_LAST || FPUKind == FK_INVALID)
-    return false;
-
-  static const struct FPUFeatureNameInfo {
-    const char *PlusName, *MinusName;
-    FPUVersion MinVersion;
-    FPURestriction MaxRestriction;
-  } FPUFeatureInfoList[] = {
-    // We have to specify the + and - versions of the name in full so
-    // that we can return them as static StringRefs.
-    //
-    // Also, the SubtargetFeatures ending in just "sp" are listed here
-    // under FPURestriction::None, which is the only FPURestriction in
-    // which they would be valid (since FPURestriction::SP doesn't
-    // exist).
-    {"+vfp2", "-vfp2", FPUVersion::VFPV2, FPURestriction::D16},
-    {"+vfp2sp", "-vfp2sp", FPUVersion::VFPV2, FPURestriction::SP_D16},
-    {"+vfp3", "-vfp3", FPUVersion::VFPV3, FPURestriction::None},
-    {"+vfp3d16", "-vfp3d16", FPUVersion::VFPV3, FPURestriction::D16},
-    {"+vfp3d16sp", "-vfp3d16sp", FPUVersion::VFPV3, FPURestriction::SP_D16},
-    {"+vfp3sp", "-vfp3sp", FPUVersion::VFPV3, FPURestriction::None},
-    {"+fp16", "-fp16", FPUVersion::VFPV3_FP16, FPURestriction::SP_D16},
-    {"+vfp4", "-vfp4", FPUVersion::VFPV4, FPURestriction::None},
-    {"+vfp4d16", "-vfp4d16", FPUVersion::VFPV4, FPURestriction::D16},
-    {"+vfp4d16sp", "-vfp4d16sp", FPUVersion::VFPV4, FPURestriction::SP_D16},
-    {"+vfp4sp", "-vfp4sp", FPUVersion::VFPV4, FPURestriction::None},
-    {"+fp-armv8", "-fp-armv8", FPUVersion::VFPV5, FPURestriction::None},
-    {"+fp-armv8d16", "-fp-armv8d16", FPUVersion::VFPV5, FPURestriction::D16},
-    {"+fp-armv8d16sp", "-fp-armv8d16sp", FPUVersion::VFPV5, FPURestriction::SP_D16},
-    {"+fp-armv8sp", "-fp-armv8sp", FPUVersion::VFPV5, FPURestriction::None},
-    {"+fullfp16", "-fullfp16", FPUVersion::VFPV5_FULLFP16, FPURestriction::SP_D16},
-    {"+fp64", "-fp64", FPUVersion::VFPV2, FPURestriction::D16},
-    {"+d32", "-d32", FPUVersion::VFPV3, FPURestriction::None},
-  };
-
-  for (const auto &Info: FPUFeatureInfoList) {
-    if (FPUNames[FPUKind].FPUVer >= Info.MinVersion &&
-        FPUNames[FPUKind].Restriction <= Info.MaxRestriction)
-      Features.push_back(Info.PlusName);
-    else
-      Features.push_back(Info.MinusName);
-  }
-
-  static const struct NeonFeatureNameInfo {
-    const char *PlusName, *MinusName;
-    NeonSupportLevel MinSupportLevel;
-  } NeonFeatureInfoList[] = {
-      {"+neon", "-neon", NeonSupportLevel::Neon},
-      {"+sha2", "-sha2", NeonSupportLevel::Crypto},
-      {"+aes", "-aes", NeonSupportLevel::Crypto},
-  };
-
-  for (const auto &Info: NeonFeatureInfoList) {
-    if (FPUNames[FPUKind].NeonSupport >= Info.MinSupportLevel)
-      Features.push_back(Info.PlusName);
-    else
-      Features.push_back(Info.MinusName);
-  }
-
-  return true;
-}
-
-// Little/Big endian
-ARM::EndianKind ARM::parseArchEndian(StringRef Arch) {
-  if (Arch.startswith("armeb") || Arch.startswith("thumbeb") ||
-      Arch.startswith("aarch64_be"))
-    return EndianKind::BIG;
-
-  if (Arch.startswith("arm") || Arch.startswith("thumb")) {
-    if (Arch.endswith("eb"))
-      return EndianKind::BIG;
-    else
-      return EndianKind::LITTLE;
-  }
-
-  if (Arch.startswith("aarch64") || Arch.startswith("aarch64_32"))
-    return EndianKind::LITTLE;
-
-  return EndianKind::INVALID;
-}
-
-// ARM, Thumb, AArch64
-ARM::ISAKind ARM::parseArchISA(StringRef Arch) {
-  return StringSwitch<ISAKind>(Arch)
-      .StartsWith("aarch64", ISAKind::AARCH64)
-      .StartsWith("arm64", ISAKind::AARCH64)
-      .StartsWith("thumb", ISAKind::THUMB)
-      .StartsWith("arm", ISAKind::ARM)
-      .Default(ISAKind::INVALID);
-}
-
-unsigned ARM::parseFPU(StringRef FPU) {
-  StringRef Syn = getFPUSynonym(FPU);
-  for (const auto &F : FPUNames) {
-    if (Syn == F.getName())
-      return F.ID;
-  }
-  return FK_INVALID;
-}
-
-ARM::NeonSupportLevel ARM::getFPUNeonSupportLevel(unsigned FPUKind) {
-  if (FPUKind >= FK_LAST)
-    return NeonSupportLevel::None;
-  return FPUNames[FPUKind].NeonSupport;
-}
-
-// MArch is expected to be of the form (arm|thumb)?(eb)?(v.+)?(eb)?, but
-// (iwmmxt|xscale)(eb)? is also permitted. If the former, return
-// "v.+", if the latter, return unmodified string, minus 'eb'.
-// If invalid, return empty string.
-StringRef ARM::getCanonicalArchName(StringRef Arch) {
-  size_t offset = StringRef::npos;
-  StringRef A = Arch;
-  StringRef Error = "";
-
-  // Begins with "arm" / "thumb", move past it.
-  if (A.startswith("arm64_32"))
-    offset = 8;
-  else if (A.startswith("arm64e"))
-    offset = 6;
-  else if (A.startswith("arm64"))
-    offset = 5;
-  else if (A.startswith("aarch64_32"))
-    offset = 10;
-  else if (A.startswith("arm"))
-    offset = 3;
-  else if (A.startswith("thumb"))
-    offset = 5;
-  else if (A.startswith("aarch64")) {
-    offset = 7;
-    // AArch64 uses "_be", not "eb" suffix.
-    if (A.find("eb") != StringRef::npos)
-      return Error;
-    if (A.substr(offset, 3) == "_be")
-      offset += 3;
-  }
-
-  // Ex. "armebv7", move past the "eb".
-  if (offset != StringRef::npos && A.substr(offset, 2) == "eb")
-    offset += 2;
-  // Or, if it ends with eb ("armv7eb"), chop it off.
-  else if (A.endswith("eb"))
-    A = A.substr(0, A.size() - 2);
-  // Trim the head
-  if (offset != StringRef::npos)
-    A = A.substr(offset);
-
-  // Empty string means offset reached the end, which means it's valid.
-  if (A.empty())
-    return Arch;
-
-  // Only match non-marketing names
-  if (offset != StringRef::npos) {
-    // Must start with 'vN'.
-    if (A.size() >= 2 && (A[0] != 'v' || !std::isdigit(A[1])))
-      return Error;
-    // Can't have an extra 'eb'.
-    if (A.find("eb") != StringRef::npos)
-      return Error;
-  }
-
-  // Arch will either be a 'v' name (v7a) or a marketing name (xscale).
-  return A;
-}
-
-StringRef ARM::getFPUSynonym(StringRef FPU) {
-  return StringSwitch<StringRef>(FPU)
-      .Cases("fpa", "fpe2", "fpe3", "maverick", "invalid") // Unsupported
-      .Case("vfp2", "vfpv2")
-      .Case("vfp3", "vfpv3")
-      .Case("vfp4", "vfpv4")
-      .Case("vfp3-d16", "vfpv3-d16")
-      .Case("vfp4-d16", "vfpv4-d16")
-      .Cases("fp4-sp-d16", "vfpv4-sp-d16", "fpv4-sp-d16")
-      .Cases("fp4-dp-d16", "fpv4-dp-d16", "vfpv4-d16")
-      .Case("fp5-sp-d16", "fpv5-sp-d16")
-      .Cases("fp5-dp-d16", "fpv5-dp-d16", "fpv5-d16")
-      // FIXME: Clang uses it, but it's bogus, since neon defaults to vfpv3.
-      .Case("neon-vfpv3", "neon")
-      .Default(FPU);
-}
-
-StringRef ARM::getFPUName(unsigned FPUKind) {
-  if (FPUKind >= FK_LAST)
-    return StringRef();
-  return FPUNames[FPUKind].getName();
-}
-
-ARM::FPUVersion ARM::getFPUVersion(unsigned FPUKind) {
-  if (FPUKind >= FK_LAST)
-    return FPUVersion::NONE;
-  return FPUNames[FPUKind].FPUVer;
-}
-
-ARM::FPURestriction ARM::getFPURestriction(unsigned FPUKind) {
-  if (FPUKind >= FK_LAST)
-    return FPURestriction::None;
-  return FPUNames[FPUKind].Restriction;
-}
-
-unsigned ARM::getDefaultFPU(StringRef CPU, ARM::ArchKind AK) {
-  if (CPU == "generic")
-    return ARM::ARCHNames[static_cast<unsigned>(AK)].DefaultFPU;
-
-  return StringSwitch<unsigned>(CPU)
-#define ARM_CPU_NAME(NAME, ID, DEFAULT_FPU, IS_DEFAULT, DEFAULT_EXT)           \
-  .Case(NAME, DEFAULT_FPU)
-#include "llvm/Support/ARMTargetParser.def"
-   .Default(ARM::FK_INVALID);
-}
-
-uint64_t ARM::getDefaultExtensions(StringRef CPU, ARM::ArchKind AK) {
-  if (CPU == "generic")
-    return ARM::ARCHNames[static_cast<unsigned>(AK)].ArchBaseExtensions;
-
-  return StringSwitch<uint64_t>(CPU)
-#define ARM_CPU_NAME(NAME, ID, DEFAULT_FPU, IS_DEFAULT, DEFAULT_EXT)           \
-  .Case(NAME,                                                                  \
-        ARCHNames[static_cast<unsigned>(ArchKind::ID)].ArchBaseExtensions |    \
-            DEFAULT_EXT)
-#include "llvm/Support/ARMTargetParser.def"
-  .Default(ARM::AEK_INVALID);
-}
-
-bool ARM::getHWDivFeatures(uint64_t HWDivKind,
-                           std::vector<StringRef> &Features) {
-
-  if (HWDivKind == AEK_INVALID)
-    return false;
-
-  if (HWDivKind & AEK_HWDIVARM)
-    Features.push_back("+hwdiv-arm");
-  else
-    Features.push_back("-hwdiv-arm");
-
-  if (HWDivKind & AEK_HWDIVTHUMB)
-    Features.push_back("+hwdiv");
-  else
-    Features.push_back("-hwdiv");
-
-  return true;
-}
-
-bool ARM::getExtensionFeatures(uint64_t Extensions,
-                               std::vector<StringRef> &Features) {
-
-  if (Extensions == AEK_INVALID)
-    return false;
-
-  for (const auto &AE : ARCHExtNames) {
-    if ((Extensions & AE.ID) == AE.ID && AE.Feature)
-      Features.push_back(AE.Feature);
-    else if (AE.NegFeature)
-      Features.push_back(AE.NegFeature);
-  }
-
-  return getHWDivFeatures(Extensions, Features);
-}
-
-StringRef ARM::getArchName(ARM::ArchKind AK) {
-  return ARCHNames[static_cast<unsigned>(AK)].getName();
-}
-
-StringRef ARM::getCPUAttr(ARM::ArchKind AK) {
-  return ARCHNames[static_cast<unsigned>(AK)].getCPUAttr();
-}
-
-StringRef ARM::getSubArch(ARM::ArchKind AK) {
-  return ARCHNames[static_cast<unsigned>(AK)].getSubArch();
-}
-
-unsigned ARM::getArchAttr(ARM::ArchKind AK) {
-  return ARCHNames[static_cast<unsigned>(AK)].ArchAttr;
-}
-
-StringRef ARM::getArchExtName(uint64_t ArchExtKind) {
-  for (const auto &AE : ARCHExtNames) {
-    if (ArchExtKind == AE.ID)
-      return AE.getName();
-  }
-  return StringRef();
-}
-
-static bool stripNegationPrefix(StringRef &Name) {
-  if (Name.startswith("no")) {
-    Name = Name.substr(2);
-    return true;
-  }
-  return false;
-}
-
-StringRef ARM::getArchExtFeature(StringRef ArchExt) {
-  bool Negated = stripNegationPrefix(ArchExt);
-  for (const auto &AE : ARCHExtNames) {
-    if (AE.Feature && ArchExt == AE.getName())
-      return StringRef(Negated ? AE.NegFeature : AE.Feature);
-  }
-
-  return StringRef();
-}
-
-static unsigned findDoublePrecisionFPU(unsigned InputFPUKind) {
-  const ARM::FPUName &InputFPU = ARM::FPUNames[InputFPUKind];
-
-  // If the input FPU already supports double-precision, then there
-  // isn't any different FPU we can return here.
-  //
-  // The current available FPURestriction values are None (no
-  // restriction), D16 (only 16 d-regs) and SP_D16 (16 d-regs
-  // and single precision only); there's no value representing
-  // SP restriction without D16. So this test just means 'is it
-  // SP only?'.
-  if (InputFPU.Restriction != ARM::FPURestriction::SP_D16)
-    return ARM::FK_INVALID;
-
-  // Otherwise, look for an FPU entry with all the same fields, except
-  // that SP_D16 has been replaced with just D16, representing adding
-  // double precision and not changing anything else.
-  for (const ARM::FPUName &CandidateFPU : ARM::FPUNames) {
-    if (CandidateFPU.FPUVer == InputFPU.FPUVer &&
-        CandidateFPU.NeonSupport == InputFPU.NeonSupport &&
-        CandidateFPU.Restriction == ARM::FPURestriction::D16) {
-      return CandidateFPU.ID;
-    }
-  }
-
-  // nothing found
-  return ARM::FK_INVALID;
-}
-
-bool ARM::appendArchExtFeatures(StringRef CPU, ARM::ArchKind AK,
-                                StringRef ArchExt,
-                                std::vector<StringRef> &Features,
-                                unsigned &ArgFPUID) {
-
-  size_t StartingNumFeatures = Features.size();
-  const bool Negated = stripNegationPrefix(ArchExt);
-  uint64_t ID = parseArchExt(ArchExt);
-
-  if (ID == AEK_INVALID)
-    return false;
-
-  for (const auto &AE : ARCHExtNames) {
-    if (Negated) {
-      if ((AE.ID & ID) == ID && AE.NegFeature)
-        Features.push_back(AE.NegFeature);
-    } else {
-      if ((AE.ID & ID) == AE.ID && AE.Feature)
-        Features.push_back(AE.Feature);
-    }
-  }
-
-  if (CPU == "")
-    CPU = "generic";
-
-  if (ArchExt == "fp" || ArchExt == "fp.dp") {
-    unsigned FPUKind;
-    if (ArchExt == "fp.dp") {
-      if (Negated) {
-        Features.push_back("-fp64");
-        return true;
-      }
-      FPUKind = findDoublePrecisionFPU(getDefaultFPU(CPU, AK));
-    } else if (Negated) {
-      FPUKind = ARM::FK_NONE;
-    } else {
-      FPUKind = getDefaultFPU(CPU, AK);
-    }
-    ArgFPUID = FPUKind;
-    return ARM::getFPUFeatures(FPUKind, Features);
-  }
-  return StartingNumFeatures != Features.size();
-}
-
-StringRef ARM::getDefaultCPU(StringRef Arch) {
-  ArchKind AK = parseArch(Arch);
-  if (AK == ArchKind::INVALID)
-    return StringRef();
-
-  // Look for multiple AKs to find the default for pair AK+Name.
-  for (const auto &CPU : CPUNames) {
-    if (CPU.ArchID == AK && CPU.Default)
-      return CPU.getName();
-  }
-
-  // If we can't find a default then target the architecture instead
-  return "generic";
-}
-
-uint64_t ARM::parseHWDiv(StringRef HWDiv) {
-  StringRef Syn = getHWDivSynonym(HWDiv);
-  for (const auto &D : HWDivNames) {
-    if (Syn == D.getName())
-      return D.ID;
-  }
-  return AEK_INVALID;
-}
-
-uint64_t ARM::parseArchExt(StringRef ArchExt) {
-  for (const auto &A : ARCHExtNames) {
-    if (ArchExt == A.getName())
-      return A.ID;
-  }
-  return AEK_INVALID;
-}
-
-ARM::ArchKind ARM::parseCPUArch(StringRef CPU) {
-  for (const auto &C : CPUNames) {
-    if (CPU == C.getName())
-      return C.ArchID;
-  }
-  return ArchKind::INVALID;
-}
-
-void ARM::fillValidCPUArchList(SmallVectorImpl<StringRef> &Values) {
-  for (const CpuNames<ArchKind> &Arch : CPUNames) {
-    if (Arch.ArchID != ArchKind::INVALID)
-      Values.push_back(Arch.getName());
-  }
-}
-
-StringRef ARM::computeDefaultTargetABI(const Triple &TT, StringRef CPU) {
-  StringRef ArchName =
-      CPU.empty() ? TT.getArchName() : getArchName(parseCPUArch(CPU));
-
-  if (TT.isOSBinFormatMachO()) {
-    if (TT.getEnvironment() == Triple::EABI ||
-        TT.getOS() == Triple::UnknownOS ||
-        parseArchProfile(ArchName) == ProfileKind::M)
-      return "aapcs";
-    if (TT.isWatchABI())
-      return "aapcs16";
-    return "apcs-gnu";
-  } else if (TT.isOSWindows())
-    // FIXME: this is invalid for WindowsCE.
-    return "aapcs";
-
-  // Select the default based on the platform.
-  switch (TT.getEnvironment()) {
-  case Triple::Android:
-  case Triple::GNUEABI:
-  case Triple::GNUEABIHF:
-  case Triple::MuslEABI:
-  case Triple::MuslEABIHF:
-    return "aapcs-linux";
-  case Triple::EABIHF:
-  case Triple::EABI:
-    return "aapcs";
-  default:
-    if (TT.isOSNetBSD())
-      return "apcs-gnu";
-    if (TT.isOSOpenBSD())
-      return "aapcs-linux";
-    return "aapcs";
-  }
-}
diff --git a/gnu/llvm/llvm/lib/Support/Host.cpp b/gnu/llvm/llvm/lib/Support/Host.cpp
deleted file mode 100644
index f873ff06f1f..00000000000
--- a/gnu/llvm/llvm/lib/Support/Host.cpp
+++ /dev/null
@@ -1,1738 +0,0 @@
-//===-- Host.cpp - Implement OS Host Concept --------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-//  This file implements the operating system Host concept.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/Host.h"
-#include "llvm/ADT/SmallSet.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/StringMap.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/ADT/StringSwitch.h"
-#include "llvm/ADT/Triple.h"
-#include "llvm/Config/llvm-config.h"
-#include "llvm/Support/BCD.h"
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/X86TargetParser.h"
-#include "llvm/Support/raw_ostream.h"
-#include <assert.h>
-#include <string.h>
-
-// Include the platform-specific parts of this class.
-#ifdef LLVM_ON_UNIX
-#include "Unix/Host.inc"
-#include <sched.h>
-#endif
-#ifdef _WIN32
-#include "Windows/Host.inc"
-#endif
-#ifdef _MSC_VER
-#include <intrin.h>
-#endif
-#if defined(__APPLE__) && (!defined(__x86_64__))
-#include <mach/host_info.h>
-#include <mach/mach.h>
-#include <mach/mach_host.h>
-#include <mach/machine.h>
-#endif
-#ifdef _AIX
-#include <sys/systemcfg.h>
-#endif
-
-#define DEBUG_TYPE "host-detection"
-
-//===----------------------------------------------------------------------===//
-//
-//  Implementations of the CPU detection routines
-//
-//===----------------------------------------------------------------------===//
-
-using namespace llvm;
-
-static std::unique_ptr<llvm::MemoryBuffer>
-    LLVM_ATTRIBUTE_UNUSED getProcCpuinfoContent() {
-  llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> Text =
-      llvm::MemoryBuffer::getFileAsStream("/proc/cpuinfo");
-  if (std::error_code EC = Text.getError()) {
-    llvm::errs() << "Can't read "
-                 << "/proc/cpuinfo: " << EC.message() << "\n";
-    return nullptr;
-  }
-  return std::move(*Text);
-}
-
-StringRef sys::detail::getHostCPUNameForPowerPC(StringRef ProcCpuinfoContent) {
-  // Access to the Processor Version Register (PVR) on PowerPC is privileged,
-  // and so we must use an operating-system interface to determine the current
-  // processor type. On Linux, this is exposed through the /proc/cpuinfo file.
-  const char *generic = "generic";
-
-  // The cpu line is second (after the 'processor: 0' line), so if this
-  // buffer is too small then something has changed (or is wrong).
-  StringRef::const_iterator CPUInfoStart = ProcCpuinfoContent.begin();
-  StringRef::const_iterator CPUInfoEnd = ProcCpuinfoContent.end();
-
-  StringRef::const_iterator CIP = CPUInfoStart;
-
-  StringRef::const_iterator CPUStart = 0;
-  size_t CPULen = 0;
-
-  // We need to find the first line which starts with cpu, spaces, and a colon.
-  // After the colon, there may be some additional spaces and then the cpu type.
-  while (CIP < CPUInfoEnd && CPUStart == 0) {
-    if (CIP < CPUInfoEnd && *CIP == '\n')
-      ++CIP;
-
-    if (CIP < CPUInfoEnd && *CIP == 'c') {
-      ++CIP;
-      if (CIP < CPUInfoEnd && *CIP == 'p') {
-        ++CIP;
-        if (CIP < CPUInfoEnd && *CIP == 'u') {
-          ++CIP;
-          while (CIP < CPUInfoEnd && (*CIP == ' ' || *CIP == '\t'))
-            ++CIP;
-
-          if (CIP < CPUInfoEnd && *CIP == ':') {
-            ++CIP;
-            while (CIP < CPUInfoEnd && (*CIP == ' ' || *CIP == '\t'))
-              ++CIP;
-
-            if (CIP < CPUInfoEnd) {
-              CPUStart = CIP;
-              while (CIP < CPUInfoEnd && (*CIP != ' ' && *CIP != '\t' &&
-                                          *CIP != ',' && *CIP != '\n'))
-                ++CIP;
-              CPULen = CIP - CPUStart;
-            }
-          }
-        }
-      }
-    }
-
-    if (CPUStart == 0)
-      while (CIP < CPUInfoEnd && *CIP != '\n')
-        ++CIP;
-  }
-
-  if (CPUStart == 0)
-    return generic;
-
-  return StringSwitch<const char *>(StringRef(CPUStart, CPULen))
-      .Case("604e", "604e")
-      .Case("604", "604")
-      .Case("7400", "7400")
-      .Case("7410", "7400")
-      .Case("7447", "7400")
-      .Case("7455", "7450")
-      .Case("G4", "g4")
-      .Case("POWER4", "970")
-      .Case("PPC970FX", "970")
-      .Case("PPC970MP", "970")
-      .Case("G5", "g5")
-      .Case("POWER5", "g5")
-      .Case("A2", "a2")
-      .Case("POWER6", "pwr6")
-      .Case("POWER7", "pwr7")
-      .Case("POWER8", "pwr8")
-      .Case("POWER8E", "pwr8")
-      .Case("POWER8NVL", "pwr8")
-      .Case("POWER9", "pwr9")
-      .Case("POWER10", "pwr10")
-      // FIXME: If we get a simulator or machine with the capabilities of
-      // mcpu=future, we should revisit this and add the name reported by the
-      // simulator/machine.
-      .Default(generic);
-}
-
-StringRef sys::detail::getHostCPUNameForARM(StringRef ProcCpuinfoContent) {
-  // The cpuid register on arm is not accessible from user space. On Linux,
-  // it is exposed through the /proc/cpuinfo file.
-
-  // Read 32 lines from /proc/cpuinfo, which should contain the CPU part line
-  // in all cases.
-  SmallVector<StringRef, 32> Lines;
-  ProcCpuinfoContent.split(Lines, "\n");
-
-  // Look for the CPU implementer line.
-  StringRef Implementer;
-  StringRef Hardware;
-  StringRef Part;
-  for (unsigned I = 0, E = Lines.size(); I != E; ++I) {
-    if (Lines[I].startswith("CPU implementer"))
-      Implementer = Lines[I].substr(15).ltrim("\t :");
-    if (Lines[I].startswith("Hardware"))
-      Hardware = Lines[I].substr(8).ltrim("\t :");
-    if (Lines[I].startswith("CPU part"))
-      Part = Lines[I].substr(8).ltrim("\t :");
-  }
-
-  if (Implementer == "0x41") { // ARM Ltd.
-    // MSM8992/8994 may give cpu part for the core that the kernel is running on,
-    // which is undeterministic and wrong. Always return cortex-a53 for these SoC.
-    if (Hardware.endswith("MSM8994") || Hardware.endswith("MSM8996"))
-      return "cortex-a53";
-
-
-    // The CPU part is a 3 digit hexadecimal number with a 0x prefix. The
-    // values correspond to the "Part number" in the CP15/c0 register. The
-    // contents are specified in the various processor manuals.
-    // This corresponds to the Main ID Register in Technical Reference Manuals.
-    // and is used in programs like sys-utils
-    return StringSwitch<const char *>(Part)
-        .Case("0x926", "arm926ej-s")
-        .Case("0xb02", "mpcore")
-        .Case("0xb36", "arm1136j-s")
-        .Case("0xb56", "arm1156t2-s")
-        .Case("0xb76", "arm1176jz-s")
-        .Case("0xc08", "cortex-a8")
-        .Case("0xc09", "cortex-a9")
-        .Case("0xc0f", "cortex-a15")
-        .Case("0xc20", "cortex-m0")
-        .Case("0xc23", "cortex-m3")
-        .Case("0xc24", "cortex-m4")
-        .Case("0xd22", "cortex-m55")
-        .Case("0xd02", "cortex-a34")
-        .Case("0xd04", "cortex-a35")
-        .Case("0xd03", "cortex-a53")
-        .Case("0xd07", "cortex-a57")
-        .Case("0xd08", "cortex-a72")
-        .Case("0xd09", "cortex-a73")
-        .Case("0xd0a", "cortex-a75")
-        .Case("0xd0b", "cortex-a76")
-        .Case("0xd0d", "cortex-a77")
-        .Case("0xd41", "cortex-a78")
-        .Case("0xd44", "cortex-x1")
-        .Case("0xd0c", "neoverse-n1")
-        .Case("0xd49", "neoverse-n2")
-        .Default("generic");
-  }
-
-  if (Implementer == "0x42" || Implementer == "0x43") { // Broadcom | Cavium.
-    return StringSwitch<const char *>(Part)
-      .Case("0x516", "thunderx2t99")
-      .Case("0x0516", "thunderx2t99")
-      .Case("0xaf", "thunderx2t99")
-      .Case("0x0af", "thunderx2t99")
-      .Case("0xa1", "thunderxt88")
-      .Case("0x0a1", "thunderxt88")
-      .Default("generic");
-  }
-
-  if (Implementer == "0x46") { // Fujitsu Ltd.
-    return StringSwitch<const char *>(Part)
-      .Case("0x001", "a64fx")
-      .Default("generic");
-  }
-
-  if (Implementer == "0x4e") { // NVIDIA Corporation
-    return StringSwitch<const char *>(Part)
-        .Case("0x004", "carmel")
-        .Default("generic");
-  }
-
-  if (Implementer == "0x48") // HiSilicon Technologies, Inc.
-    // The CPU part is a 3 digit hexadecimal number with a 0x prefix. The
-    // values correspond to the "Part number" in the CP15/c0 register. The
-    // contents are specified in the various processor manuals.
-    return StringSwitch<const char *>(Part)
-      .Case("0xd01", "tsv110")
-      .Default("generic");
-
-  if (Implementer == "0x51") // Qualcomm Technologies, Inc.
-    // The CPU part is a 3 digit hexadecimal number with a 0x prefix. The
-    // values correspond to the "Part number" in the CP15/c0 register. The
-    // contents are specified in the various processor manuals.
-    return StringSwitch<const char *>(Part)
-        .Case("0x06f", "krait") // APQ8064
-        .Case("0x201", "kryo")
-        .Case("0x205", "kryo")
-        .Case("0x211", "kryo")
-        .Case("0x800", "cortex-a73") // Kryo 2xx Gold
-        .Case("0x801", "cortex-a73") // Kryo 2xx Silver
-        .Case("0x802", "cortex-a75") // Kryo 3xx Gold
-        .Case("0x803", "cortex-a75") // Kryo 3xx Silver
-        .Case("0x804", "cortex-a76") // Kryo 4xx Gold
-        .Case("0x805", "cortex-a76") // Kryo 4xx/5xx Silver
-        .Case("0xc00", "falkor")
-        .Case("0xc01", "saphira")
-        .Default("generic");
-  if (Implementer == "0x53") { // Samsung Electronics Co., Ltd.
-    // The Exynos chips have a convoluted ID scheme that doesn't seem to follow
-    // any predictive pattern across variants and parts.
-    unsigned Variant = 0, Part = 0;
-
-    // Look for the CPU variant line, whose value is a 1 digit hexadecimal
-    // number, corresponding to the Variant bits in the CP15/C0 register.
-    for (auto I : Lines)
-      if (I.consume_front("CPU variant"))
-        I.ltrim("\t :").getAsInteger(0, Variant);
-
-    // Look for the CPU part line, whose value is a 3 digit hexadecimal
-    // number, corresponding to the PartNum bits in the CP15/C0 register.
-    for (auto I : Lines)
-      if (I.consume_front("CPU part"))
-        I.ltrim("\t :").getAsInteger(0, Part);
-
-    unsigned Exynos = (Variant << 12) | Part;
-    switch (Exynos) {
-    default:
-      // Default by falling through to Exynos M3.
-      LLVM_FALLTHROUGH;
-    case 0x1002:
-      return "exynos-m3";
-    case 0x1003:
-      return "exynos-m4";
-    }
-  }
-
-  return "generic";
-}
-
-namespace {
-StringRef getCPUNameFromS390Model(unsigned int Id, bool HaveVectorSupport) {
-  switch (Id) {
-    case 2064:  // z900 not supported by LLVM
-    case 2066:
-    case 2084:  // z990 not supported by LLVM
-    case 2086:
-    case 2094:  // z9-109 not supported by LLVM
-    case 2096:
-      return "generic";
-    case 2097:
-    case 2098:
-      return "z10";
-    case 2817:
-    case 2818:
-      return "z196";
-    case 2827:
-    case 2828:
-      return "zEC12";
-    case 2964:
-    case 2965:
-      return HaveVectorSupport? "z13" : "zEC12";
-    case 3906:
-    case 3907:
-      return HaveVectorSupport? "z14" : "zEC12";
-    case 8561:
-    case 8562:
-      return HaveVectorSupport? "z15" : "zEC12";
-    case 3931:
-    case 3932:
-    default:
-      return HaveVectorSupport? "arch14" : "zEC12";
-  }
-}
-} // end anonymous namespace
-
-StringRef sys::detail::getHostCPUNameForS390x(StringRef ProcCpuinfoContent) {
-  // STIDP is a privileged operation, so use /proc/cpuinfo instead.
-
-  // The "processor 0:" line comes after a fair amount of other information,
-  // including a cache breakdown, but this should be plenty.
-  SmallVector<StringRef, 32> Lines;
-  ProcCpuinfoContent.split(Lines, "\n");
-
-  // Look for the CPU features.
-  SmallVector<StringRef, 32> CPUFeatures;
-  for (unsigned I = 0, E = Lines.size(); I != E; ++I)
-    if (Lines[I].startswith("features")) {
-      size_t Pos = Lines[I].find(':');
-      if (Pos != StringRef::npos) {
-        Lines[I].drop_front(Pos + 1).split(CPUFeatures, ' ');
-        break;
-      }
-    }
-
-  // We need to check for the presence of vector support independently of
-  // the machine type, since we may only use the vector register set when
-  // supported by the kernel (and hypervisor).
-  bool HaveVectorSupport = false;
-  for (unsigned I = 0, E = CPUFeatures.size(); I != E; ++I) {
-    if (CPUFeatures[I] == "vx")
-      HaveVectorSupport = true;
-  }
-
-  // Now check the processor machine type.
-  for (unsigned I = 0, E = Lines.size(); I != E; ++I) {
-    if (Lines[I].startswith("processor ")) {
-      size_t Pos = Lines[I].find("machine = ");
-      if (Pos != StringRef::npos) {
-        Pos += sizeof("machine = ") - 1;
-        unsigned int Id;
-        if (!Lines[I].drop_front(Pos).getAsInteger(10, Id))
-          return getCPUNameFromS390Model(Id, HaveVectorSupport);
-      }
-      break;
-    }
-  }
-
-  return "generic";
-}
-
-StringRef sys::detail::getHostCPUNameForBPF() {
-#if !defined(__linux__) || !defined(__x86_64__)
-  return "generic";
-#else
-  uint8_t v3_insns[40] __attribute__ ((aligned (8))) =
-      /* BPF_MOV64_IMM(BPF_REG_0, 0) */
-    { 0xb7, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-      /* BPF_MOV64_IMM(BPF_REG_2, 1) */
-      0xb7, 0x2, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0,
-      /* BPF_JMP32_REG(BPF_JLT, BPF_REG_0, BPF_REG_2, 1) */
-      0xae, 0x20, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0,
-      /* BPF_MOV64_IMM(BPF_REG_0, 1) */
-      0xb7, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0,
-      /* BPF_EXIT_INSN() */
-      0x95, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 };
-
-  uint8_t v2_insns[40] __attribute__ ((aligned (8))) =
-      /* BPF_MOV64_IMM(BPF_REG_0, 0) */
-    { 0xb7, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-      /* BPF_MOV64_IMM(BPF_REG_2, 1) */
-      0xb7, 0x2, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0,
-      /* BPF_JMP_REG(BPF_JLT, BPF_REG_0, BPF_REG_2, 1) */
-      0xad, 0x20, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0,
-      /* BPF_MOV64_IMM(BPF_REG_0, 1) */
-      0xb7, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0,
-      /* BPF_EXIT_INSN() */
-      0x95, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 };
-
-  struct bpf_prog_load_attr {
-    uint32_t prog_type;
-    uint32_t insn_cnt;
-    uint64_t insns;
-    uint64_t license;
-    uint32_t log_level;
-    uint32_t log_size;
-    uint64_t log_buf;
-    uint32_t kern_version;
-    uint32_t prog_flags;
-  } attr = {};
-  attr.prog_type = 1; /* BPF_PROG_TYPE_SOCKET_FILTER */
-  attr.insn_cnt = 5;
-  attr.insns = (uint64_t)v3_insns;
-  attr.license = (uint64_t)"DUMMY";
-
-  int fd = syscall(321 /* __NR_bpf */, 5 /* BPF_PROG_LOAD */, &attr,
-                   sizeof(attr));
-  if (fd >= 0) {
-    close(fd);
-    return "v3";
-  }
-
-  /* Clear the whole attr in case its content changed by syscall. */
-  memset(&attr, 0, sizeof(attr));
-  attr.prog_type = 1; /* BPF_PROG_TYPE_SOCKET_FILTER */
-  attr.insn_cnt = 5;
-  attr.insns = (uint64_t)v2_insns;
-  attr.license = (uint64_t)"DUMMY";
-  fd = syscall(321 /* __NR_bpf */, 5 /* BPF_PROG_LOAD */, &attr, sizeof(attr));
-  if (fd >= 0) {
-    close(fd);
-    return "v2";
-  }
-  return "v1";
-#endif
-}
-
-#if defined(__i386__) || defined(_M_IX86) || \
-    defined(__x86_64__) || defined(_M_X64)
-
-// The check below for i386 was copied from clang's cpuid.h (__get_cpuid_max).
-// Check motivated by bug reports for OpenSSL crashing on CPUs without CPUID
-// support. Consequently, for i386, the presence of CPUID is checked first
-// via the corresponding eflags bit.
-// Removal of cpuid.h header motivated by PR30384
-// Header cpuid.h and method __get_cpuid_max are not used in llvm, clang, openmp
-// or test-suite, but are used in external projects e.g. libstdcxx
-static bool isCpuIdSupported() {
-#if defined(__GNUC__) || defined(__clang__)
-#if defined(__i386__)
-  int __cpuid_supported;
-  __asm__("  pushfl\n"
-          "  popl   %%eax\n"
-          "  movl   %%eax,%%ecx\n"
-          "  xorl   $0x00200000,%%eax\n"
-          "  pushl  %%eax\n"
-          "  popfl\n"
-          "  pushfl\n"
-          "  popl   %%eax\n"
-          "  movl   $0,%0\n"
-          "  cmpl   %%eax,%%ecx\n"
-          "  je     1f\n"
-          "  movl   $1,%0\n"
-          "1:"
-          : "=r"(__cpuid_supported)
-          :
-          : "eax", "ecx");
-  if (!__cpuid_supported)
-    return false;
-#endif
-  return true;
-#endif
-  return true;
-}
-
-/// getX86CpuIDAndInfo - Execute the specified cpuid and return the 4 values in
-/// the specified arguments.  If we can't run cpuid on the host, return true.
-static bool getX86CpuIDAndInfo(unsigned value, unsigned *rEAX, unsigned *rEBX,
-                               unsigned *rECX, unsigned *rEDX) {
-#if defined(__GNUC__) || defined(__clang__)
-#if defined(__x86_64__)
-  // gcc doesn't know cpuid would clobber ebx/rbx. Preserve it manually.
-  // FIXME: should we save this for Clang?
-  __asm__("movq\t%%rbx, %%rsi\n\t"
-          "cpuid\n\t"
-          "xchgq\t%%rbx, %%rsi\n\t"
-          : "=a"(*rEAX), "=S"(*rEBX), "=c"(*rECX), "=d"(*rEDX)
-          : "a"(value));
-  return false;
-#elif defined(__i386__)
-  __asm__("movl\t%%ebx, %%esi\n\t"
-          "cpuid\n\t"
-          "xchgl\t%%ebx, %%esi\n\t"
-          : "=a"(*rEAX), "=S"(*rEBX), "=c"(*rECX), "=d"(*rEDX)
-          : "a"(value));
-  return false;
-#else
-  return true;
-#endif
-#elif defined(_MSC_VER)
-  // The MSVC intrinsic is portable across x86 and x64.
-  int registers[4];
-  __cpuid(registers, value);
-  *rEAX = registers[0];
-  *rEBX = registers[1];
-  *rECX = registers[2];
-  *rEDX = registers[3];
-  return false;
-#else
-  return true;
-#endif
-}
-
-namespace llvm {
-namespace sys {
-namespace detail {
-namespace x86 {
-
-VendorSignatures getVendorSignature(unsigned *MaxLeaf) {
-  unsigned EAX = 0, EBX = 0, ECX = 0, EDX = 0;
-  if (MaxLeaf == nullptr)
-    MaxLeaf = &EAX;
-  else
-    *MaxLeaf = 0;
-
-  if (!isCpuIdSupported())
-    return VendorSignatures::UNKNOWN;
-
-  if (getX86CpuIDAndInfo(0, MaxLeaf, &EBX, &ECX, &EDX) || *MaxLeaf < 1)
-    return VendorSignatures::UNKNOWN;
-
-  // "Genu ineI ntel"
-  if (EBX == 0x756e6547 && EDX == 0x49656e69 && ECX == 0x6c65746e)
-    return VendorSignatures::GENUINE_INTEL;
-
-  // "Auth enti cAMD"
-  if (EBX == 0x68747541 && EDX == 0x69746e65 && ECX == 0x444d4163)
-    return VendorSignatures::AUTHENTIC_AMD;
-
-  return VendorSignatures::UNKNOWN;
-}
-
-} // namespace x86
-} // namespace detail
-} // namespace sys
-} // namespace llvm
-
-using namespace llvm::sys::detail::x86;
-
-/// getX86CpuIDAndInfoEx - Execute the specified cpuid with subleaf and return
-/// the 4 values in the specified arguments.  If we can't run cpuid on the host,
-/// return true.
-static bool getX86CpuIDAndInfoEx(unsigned value, unsigned subleaf,
-                                 unsigned *rEAX, unsigned *rEBX, unsigned *rECX,
-                                 unsigned *rEDX) {
-#if defined(__GNUC__) || defined(__clang__)
-#if defined(__x86_64__)
-  // gcc doesn't know cpuid would clobber ebx/rbx. Preserve it manually.
-  // FIXME: should we save this for Clang?
-  __asm__("movq\t%%rbx, %%rsi\n\t"
-          "cpuid\n\t"
-          "xchgq\t%%rbx, %%rsi\n\t"
-          : "=a"(*rEAX), "=S"(*rEBX), "=c"(*rECX), "=d"(*rEDX)
-          : "a"(value), "c"(subleaf));
-  return false;
-#elif defined(__i386__)
-  __asm__("movl\t%%ebx, %%esi\n\t"
-          "cpuid\n\t"
-          "xchgl\t%%ebx, %%esi\n\t"
-          : "=a"(*rEAX), "=S"(*rEBX), "=c"(*rECX), "=d"(*rEDX)
-          : "a"(value), "c"(subleaf));
-  return false;
-#else
-  return true;
-#endif
-#elif defined(_MSC_VER)
-  int registers[4];
-  __cpuidex(registers, value, subleaf);
-  *rEAX = registers[0];
-  *rEBX = registers[1];
-  *rECX = registers[2];
-  *rEDX = registers[3];
-  return false;
-#else
-  return true;
-#endif
-}
-
-// Read control register 0 (XCR0). Used to detect features such as AVX.
-static bool getX86XCR0(unsigned *rEAX, unsigned *rEDX) {
-#if defined(__GNUC__) || defined(__clang__)
-  // Check xgetbv; this uses a .byte sequence instead of the instruction
-  // directly because older assemblers do not include support for xgetbv and
-  // there is no easy way to conditionally compile based on the assembler used.
-  __asm__(".byte 0x0f, 0x01, 0xd0" : "=a"(*rEAX), "=d"(*rEDX) : "c"(0));
-  return false;
-#elif defined(_MSC_FULL_VER) && defined(_XCR_XFEATURE_ENABLED_MASK)
-  unsigned long long Result = _xgetbv(_XCR_XFEATURE_ENABLED_MASK);
-  *rEAX = Result;
-  *rEDX = Result >> 32;
-  return false;
-#else
-  return true;
-#endif
-}
-
-static void detectX86FamilyModel(unsigned EAX, unsigned *Family,
-                                 unsigned *Model) {
-  *Family = (EAX >> 8) & 0xf; // Bits 8 - 11
-  *Model = (EAX >> 4) & 0xf;  // Bits 4 - 7
-  if (*Family == 6 || *Family == 0xf) {
-    if (*Family == 0xf)
-      // Examine extended family ID if family ID is F.
-      *Family += (EAX >> 20) & 0xff; // Bits 20 - 27
-    // Examine extended model ID if family ID is 6 or F.
-    *Model += ((EAX >> 16) & 0xf) << 4; // Bits 16 - 19
-  }
-}
-
-static StringRef
-getIntelProcessorTypeAndSubtype(unsigned Family, unsigned Model,
-                                const unsigned *Features,
-                                unsigned *Type, unsigned *Subtype) {
-  auto testFeature = [&](unsigned F) {
-    return (Features[F / 32] & (1U << (F % 32))) != 0;
-  };
-
-  StringRef CPU;
-
-  switch (Family) {
-  case 3:
-    CPU = "i386";
-    break;
-  case 4:
-    CPU = "i486";
-    break;
-  case 5:
-    if (testFeature(X86::FEATURE_MMX)) {
-      CPU = "pentium-mmx";
-      break;
-    }
-    CPU = "pentium";
-    break;
-  case 6:
-    switch (Model) {
-    case 0x0f: // Intel Core 2 Duo processor, Intel Core 2 Duo mobile
-               // processor, Intel Core 2 Quad processor, Intel Core 2 Quad
-               // mobile processor, Intel Core 2 Extreme processor, Intel
-               // Pentium Dual-Core processor, Intel Xeon processor, model
-               // 0Fh. All processors are manufactured using the 65 nm process.
-    case 0x16: // Intel Celeron processor model 16h. All processors are
-               // manufactured using the 65 nm process
-      CPU = "core2";
-      *Type = X86::INTEL_CORE2;
-      break;
-    case 0x17: // Intel Core 2 Extreme processor, Intel Xeon processor, model
-               // 17h. All processors are manufactured using the 45 nm process.
-               //
-               // 45nm: Penryn , Wolfdale, Yorkfield (XE)
-    case 0x1d: // Intel Xeon processor MP. All processors are manufactured using
-               // the 45 nm process.
-      CPU = "penryn";
-      *Type = X86::INTEL_CORE2;
-      break;
-    case 0x1a: // Intel Core i7 processor and Intel Xeon processor. All
-               // processors are manufactured using the 45 nm process.
-    case 0x1e: // Intel(R) Core(TM) i7 CPU         870  @ 2.93GHz.
-               // As found in a Summer 2010 model iMac.
-    case 0x1f:
-    case 0x2e:              // Nehalem EX
-      CPU = "nehalem";
-      *Type = X86::INTEL_COREI7;
-      *Subtype = X86::INTEL_COREI7_NEHALEM;
-      break;
-    case 0x25: // Intel Core i7, laptop version.
-    case 0x2c: // Intel Core i7 processor and Intel Xeon processor. All
-               // processors are manufactured using the 32 nm process.
-    case 0x2f: // Westmere EX
-      CPU = "westmere";
-      *Type = X86::INTEL_COREI7;
-      *Subtype = X86::INTEL_COREI7_WESTMERE;
-      break;
-    case 0x2a: // Intel Core i7 processor. All processors are manufactured
-               // using the 32 nm process.
-    case 0x2d:
-      CPU = "sandybridge";
-      *Type = X86::INTEL_COREI7;
-      *Subtype = X86::INTEL_COREI7_SANDYBRIDGE;
-      break;
-    case 0x3a:
-    case 0x3e:              // Ivy Bridge EP
-      CPU = "ivybridge";
-      *Type = X86::INTEL_COREI7;
-      *Subtype = X86::INTEL_COREI7_IVYBRIDGE;
-      break;
-
-    // Haswell:
-    case 0x3c:
-    case 0x3f:
-    case 0x45:
-    case 0x46:
-      CPU = "haswell";
-      *Type = X86::INTEL_COREI7;
-      *Subtype = X86::INTEL_COREI7_HASWELL;
-      break;
-
-    // Broadwell:
-    case 0x3d:
-    case 0x47:
-    case 0x4f:
-    case 0x56:
-      CPU = "broadwell";
-      *Type = X86::INTEL_COREI7;
-      *Subtype = X86::INTEL_COREI7_BROADWELL;
-      break;
-
-    // Skylake:
-    case 0x4e:              // Skylake mobile
-    case 0x5e:              // Skylake desktop
-    case 0x8e:              // Kaby Lake mobile
-    case 0x9e:              // Kaby Lake desktop
-    case 0xa5:              // Comet Lake-H/S
-    case 0xa6:              // Comet Lake-U
-      CPU = "skylake";
-      *Type = X86::INTEL_COREI7;
-      *Subtype = X86::INTEL_COREI7_SKYLAKE;
-      break;
-
-    // Rocketlake:
-    case 0xa7:
-      CPU = "rocketlake";
-      *Type = X86::INTEL_COREI7;
-      *Subtype = X86::INTEL_COREI7_ROCKETLAKE;
-      break;
-
-    // Skylake Xeon:
-    case 0x55:
-      *Type = X86::INTEL_COREI7;
-      if (testFeature(X86::FEATURE_AVX512BF16)) {
-        CPU = "cooperlake";
-        *Subtype = X86::INTEL_COREI7_COOPERLAKE;
-      } else if (testFeature(X86::FEATURE_AVX512VNNI)) {
-        CPU = "cascadelake";
-        *Subtype = X86::INTEL_COREI7_CASCADELAKE;
-      } else {
-        CPU = "skylake-avx512";
-        *Subtype = X86::INTEL_COREI7_SKYLAKE_AVX512;
-      }
-      break;
-
-    // Cannonlake:
-    case 0x66:
-      CPU = "cannonlake";
-      *Type = X86::INTEL_COREI7;
-      *Subtype = X86::INTEL_COREI7_CANNONLAKE;
-      break;
-
-    // Icelake:
-    case 0x7d:
-    case 0x7e:
-      CPU = "icelake-client";
-      *Type = X86::INTEL_COREI7;
-      *Subtype = X86::INTEL_COREI7_ICELAKE_CLIENT;
-      break;
-
-    // Icelake Xeon:
-    case 0x6a:
-    case 0x6c:
-      CPU = "icelake-server";
-      *Type = X86::INTEL_COREI7;
-      *Subtype = X86::INTEL_COREI7_ICELAKE_SERVER;
-      break;
-
-    // Sapphire Rapids:
-    case 0x8f:
-      CPU = "sapphirerapids";
-      *Type = X86::INTEL_COREI7;
-      *Subtype = X86::INTEL_COREI7_SAPPHIRERAPIDS;
-      break;
-
-    case 0x1c: // Most 45 nm Intel Atom processors
-    case 0x26: // 45 nm Atom Lincroft
-    case 0x27: // 32 nm Atom Medfield
-    case 0x35: // 32 nm Atom Midview
-    case 0x36: // 32 nm Atom Midview
-      CPU = "bonnell";
-      *Type = X86::INTEL_BONNELL;
-      break;
-
-    // Atom Silvermont codes from the Intel software optimization guide.
-    case 0x37:
-    case 0x4a:
-    case 0x4d:
-    case 0x5a:
-    case 0x5d:
-    case 0x4c: // really airmont
-      CPU = "silvermont";
-      *Type = X86::INTEL_SILVERMONT;
-      break;
-    // Goldmont:
-    case 0x5c: // Apollo Lake
-    case 0x5f: // Denverton
-      CPU = "goldmont";
-      *Type = X86::INTEL_GOLDMONT;
-      break;
-    case 0x7a:
-      CPU = "goldmont-plus";
-      *Type = X86::INTEL_GOLDMONT_PLUS;
-      break;
-    case 0x86:
-      CPU = "tremont";
-      *Type = X86::INTEL_TREMONT;
-      break;
-
-    // Xeon Phi (Knights Landing + Knights Mill):
-    case 0x57:
-      CPU = "knl";
-      *Type = X86::INTEL_KNL;
-      break;
-    case 0x85:
-      CPU = "knm";
-      *Type = X86::INTEL_KNM;
-      break;
-
-    default: // Unknown family 6 CPU, try to guess.
-      // Don't both with Type/Subtype here, they aren't used by the caller.
-      // They're used above to keep the code in sync with compiler-rt.
-      // TODO detect tigerlake host from model
-      if (testFeature(X86::FEATURE_AVX512VP2INTERSECT)) {
-        CPU = "tigerlake";
-      } else if (testFeature(X86::FEATURE_AVX512VBMI2)) {
-        CPU = "icelake-client";
-      } else if (testFeature(X86::FEATURE_AVX512VBMI)) {
-        CPU = "cannonlake";
-      } else if (testFeature(X86::FEATURE_AVX512BF16)) {
-        CPU = "cooperlake";
-      } else if (testFeature(X86::FEATURE_AVX512VNNI)) {
-        CPU = "cascadelake";
-      } else if (testFeature(X86::FEATURE_AVX512VL)) {
-        CPU = "skylake-avx512";
-      } else if (testFeature(X86::FEATURE_AVX512ER)) {
-        CPU = "knl";
-      } else if (testFeature(X86::FEATURE_CLFLUSHOPT)) {
-        if (testFeature(X86::FEATURE_SHA))
-          CPU = "goldmont";
-        else
-          CPU = "skylake";
-      } else if (testFeature(X86::FEATURE_ADX)) {
-        CPU = "broadwell";
-      } else if (testFeature(X86::FEATURE_AVX2)) {
-        CPU = "haswell";
-      } else if (testFeature(X86::FEATURE_AVX)) {
-        CPU = "sandybridge";
-      } else if (testFeature(X86::FEATURE_SSE4_2)) {
-        if (testFeature(X86::FEATURE_MOVBE))
-          CPU = "silvermont";
-        else
-          CPU = "nehalem";
-      } else if (testFeature(X86::FEATURE_SSE4_1)) {
-        CPU = "penryn";
-      } else if (testFeature(X86::FEATURE_SSSE3)) {
-        if (testFeature(X86::FEATURE_MOVBE))
-          CPU = "bonnell";
-        else
-          CPU = "core2";
-      } else if (testFeature(X86::FEATURE_64BIT)) {
-        CPU = "core2";
-      } else if (testFeature(X86::FEATURE_SSE3)) {
-        CPU = "yonah";
-      } else if (testFeature(X86::FEATURE_SSE2)) {
-        CPU = "pentium-m";
-      } else if (testFeature(X86::FEATURE_SSE)) {
-        CPU = "pentium3";
-      } else if (testFeature(X86::FEATURE_MMX)) {
-        CPU = "pentium2";
-      } else {
-        CPU = "pentiumpro";
-      }
-      break;
-    }
-    break;
-  case 15: {
-    if (testFeature(X86::FEATURE_64BIT)) {
-      CPU = "nocona";
-      break;
-    }
-    if (testFeature(X86::FEATURE_SSE3)) {
-      CPU = "prescott";
-      break;
-    }
-    CPU = "pentium4";
-    break;
-  }
-  default:
-    break; // Unknown.
-  }
-
-  return CPU;
-}
-
-static StringRef
-getAMDProcessorTypeAndSubtype(unsigned Family, unsigned Model,
-                              const unsigned *Features,
-                              unsigned *Type, unsigned *Subtype) {
-  auto testFeature = [&](unsigned F) {
-    return (Features[F / 32] & (1U << (F % 32))) != 0;
-  };
-
-  StringRef CPU;
-
-  switch (Family) {
-  case 4:
-    CPU = "i486";
-    break;
-  case 5:
-    CPU = "pentium";
-    switch (Model) {
-    case 6:
-    case 7:
-      CPU = "k6";
-      break;
-    case 8:
-      CPU = "k6-2";
-      break;
-    case 9:
-    case 13:
-      CPU = "k6-3";
-      break;
-    case 10:
-      CPU = "geode";
-      break;
-    }
-    break;
-  case 6:
-    if (testFeature(X86::FEATURE_SSE)) {
-      CPU = "athlon-xp";
-      break;
-    }
-    CPU = "athlon";
-    break;
-  case 15:
-    if (testFeature(X86::FEATURE_SSE3)) {
-      CPU = "k8-sse3";
-      break;
-    }
-    CPU = "k8";
-    break;
-  case 16:
-    CPU = "amdfam10";
-    *Type = X86::AMDFAM10H; // "amdfam10"
-    switch (Model) {
-    case 2:
-      *Subtype = X86::AMDFAM10H_BARCELONA;
-      break;
-    case 4:
-      *Subtype = X86::AMDFAM10H_SHANGHAI;
-      break;
-    case 8:
-      *Subtype = X86::AMDFAM10H_ISTANBUL;
-      break;
-    }
-    break;
-  case 20:
-    CPU = "btver1";
-    *Type = X86::AMD_BTVER1;
-    break;
-  case 21:
-    CPU = "bdver1";
-    *Type = X86::AMDFAM15H;
-    if (Model >= 0x60 && Model <= 0x7f) {
-      CPU = "bdver4";
-      *Subtype = X86::AMDFAM15H_BDVER4;
-      break; // 60h-7Fh: Excavator
-    }
-    if (Model >= 0x30 && Model <= 0x3f) {
-      CPU = "bdver3";
-      *Subtype = X86::AMDFAM15H_BDVER3;
-      break; // 30h-3Fh: Steamroller
-    }
-    if ((Model >= 0x10 && Model <= 0x1f) || Model == 0x02) {
-      CPU = "bdver2";
-      *Subtype = X86::AMDFAM15H_BDVER2;
-      break; // 02h, 10h-1Fh: Piledriver
-    }
-    if (Model <= 0x0f) {
-      *Subtype = X86::AMDFAM15H_BDVER1;
-      break; // 00h-0Fh: Bulldozer
-    }
-    break;
-  case 22:
-    CPU = "btver2";
-    *Type = X86::AMD_BTVER2;
-    break;
-  case 23:
-    CPU = "znver1";
-    *Type = X86::AMDFAM17H;
-    if ((Model >= 0x30 && Model <= 0x3f) || Model == 0x71) {
-      CPU = "znver2";
-      *Subtype = X86::AMDFAM17H_ZNVER2;
-      break; // 30h-3fh, 71h: Zen2
-    }
-    if (Model <= 0x0f) {
-      *Subtype = X86::AMDFAM17H_ZNVER1;
-      break; // 00h-0Fh: Zen1
-    }
-    break;
-  case 25:
-    CPU = "znver3";
-    *Type = X86::AMDFAM19H;
-    if (Model <= 0x0f) {
-      *Subtype = X86::AMDFAM19H_ZNVER3;
-      break; // 00h-0Fh: Zen3
-    }
-    break;
-  default:
-    break; // Unknown AMD CPU.
-  }
-
-  return CPU;
-}
-
-static void getAvailableFeatures(unsigned ECX, unsigned EDX, unsigned MaxLeaf,
-                                 unsigned *Features) {
-  unsigned EAX, EBX;
-
-  auto setFeature = [&](unsigned F) {
-    Features[F / 32] |= 1U << (F % 32);
-  };
-
-  if ((EDX >> 15) & 1)
-    setFeature(X86::FEATURE_CMOV);
-  if ((EDX >> 23) & 1)
-    setFeature(X86::FEATURE_MMX);
-  if ((EDX >> 25) & 1)
-    setFeature(X86::FEATURE_SSE);
-  if ((EDX >> 26) & 1)
-    setFeature(X86::FEATURE_SSE2);
-
-  if ((ECX >> 0) & 1)
-    setFeature(X86::FEATURE_SSE3);
-  if ((ECX >> 1) & 1)
-    setFeature(X86::FEATURE_PCLMUL);
-  if ((ECX >> 9) & 1)
-    setFeature(X86::FEATURE_SSSE3);
-  if ((ECX >> 12) & 1)
-    setFeature(X86::FEATURE_FMA);
-  if ((ECX >> 19) & 1)
-    setFeature(X86::FEATURE_SSE4_1);
-  if ((ECX >> 20) & 1)
-    setFeature(X86::FEATURE_SSE4_2);
-  if ((ECX >> 23) & 1)
-    setFeature(X86::FEATURE_POPCNT);
-  if ((ECX >> 25) & 1)
-    setFeature(X86::FEATURE_AES);
-
-  if ((ECX >> 22) & 1)
-    setFeature(X86::FEATURE_MOVBE);
-
-  // If CPUID indicates support for XSAVE, XRESTORE and AVX, and XGETBV
-  // indicates that the AVX registers will be saved and restored on context
-  // switch, then we have full AVX support.
-  const unsigned AVXBits = (1 << 27) | (1 << 28);
-  bool HasAVX = ((ECX & AVXBits) == AVXBits) && !getX86XCR0(&EAX, &EDX) &&
-                ((EAX & 0x6) == 0x6);
-#if defined(__APPLE__)
-  // Darwin lazily saves the AVX512 context on first use: trust that the OS will
-  // save the AVX512 context if we use AVX512 instructions, even the bit is not
-  // set right now.
-  bool HasAVX512Save = true;
-#else
-  // AVX512 requires additional context to be saved by the OS.
-  bool HasAVX512Save = HasAVX && ((EAX & 0xe0) == 0xe0);
-#endif
-
-  if (HasAVX)
-    setFeature(X86::FEATURE_AVX);
-
-  bool HasLeaf7 =
-      MaxLeaf >= 0x7 && !getX86CpuIDAndInfoEx(0x7, 0x0, &EAX, &EBX, &ECX, &EDX);
-
-  if (HasLeaf7 && ((EBX >> 3) & 1))
-    setFeature(X86::FEATURE_BMI);
-  if (HasLeaf7 && ((EBX >> 5) & 1) && HasAVX)
-    setFeature(X86::FEATURE_AVX2);
-  if (HasLeaf7 && ((EBX >> 8) & 1))
-    setFeature(X86::FEATURE_BMI2);
-  if (HasLeaf7 && ((EBX >> 16) & 1) && HasAVX512Save)
-    setFeature(X86::FEATURE_AVX512F);
-  if (HasLeaf7 && ((EBX >> 17) & 1) && HasAVX512Save)
-    setFeature(X86::FEATURE_AVX512DQ);
-  if (HasLeaf7 && ((EBX >> 19) & 1))
-    setFeature(X86::FEATURE_ADX);
-  if (HasLeaf7 && ((EBX >> 21) & 1) && HasAVX512Save)
-    setFeature(X86::FEATURE_AVX512IFMA);
-  if (HasLeaf7 && ((EBX >> 23) & 1))
-    setFeature(X86::FEATURE_CLFLUSHOPT);
-  if (HasLeaf7 && ((EBX >> 26) & 1) && HasAVX512Save)
-    setFeature(X86::FEATURE_AVX512PF);
-  if (HasLeaf7 && ((EBX >> 27) & 1) && HasAVX512Save)
-    setFeature(X86::FEATURE_AVX512ER);
-  if (HasLeaf7 && ((EBX >> 28) & 1) && HasAVX512Save)
-    setFeature(X86::FEATURE_AVX512CD);
-  if (HasLeaf7 && ((EBX >> 29) & 1))
-    setFeature(X86::FEATURE_SHA);
-  if (HasLeaf7 && ((EBX >> 30) & 1) && HasAVX512Save)
-    setFeature(X86::FEATURE_AVX512BW);
-  if (HasLeaf7 && ((EBX >> 31) & 1) && HasAVX512Save)
-    setFeature(X86::FEATURE_AVX512VL);
-
-  if (HasLeaf7 && ((ECX >> 1) & 1) && HasAVX512Save)
-    setFeature(X86::FEATURE_AVX512VBMI);
-  if (HasLeaf7 && ((ECX >> 6) & 1) && HasAVX512Save)
-    setFeature(X86::FEATURE_AVX512VBMI2);
-  if (HasLeaf7 && ((ECX >> 8) & 1))
-    setFeature(X86::FEATURE_GFNI);
-  if (HasLeaf7 && ((ECX >> 10) & 1) && HasAVX)
-    setFeature(X86::FEATURE_VPCLMULQDQ);
-  if (HasLeaf7 && ((ECX >> 11) & 1) && HasAVX512Save)
-    setFeature(X86::FEATURE_AVX512VNNI);
-  if (HasLeaf7 && ((ECX >> 12) & 1) && HasAVX512Save)
-    setFeature(X86::FEATURE_AVX512BITALG);
-  if (HasLeaf7 && ((ECX >> 14) & 1) && HasAVX512Save)
-    setFeature(X86::FEATURE_AVX512VPOPCNTDQ);
-
-  if (HasLeaf7 && ((EDX >> 2) & 1) && HasAVX512Save)
-    setFeature(X86::FEATURE_AVX5124VNNIW);
-  if (HasLeaf7 && ((EDX >> 3) & 1) && HasAVX512Save)
-    setFeature(X86::FEATURE_AVX5124FMAPS);
-  if (HasLeaf7 && ((EDX >> 8) & 1) && HasAVX512Save)
-    setFeature(X86::FEATURE_AVX512VP2INTERSECT);
-
-  bool HasLeaf7Subleaf1 =
-      MaxLeaf >= 7 && !getX86CpuIDAndInfoEx(0x7, 0x1, &EAX, &EBX, &ECX, &EDX);
-  if (HasLeaf7Subleaf1 && ((EAX >> 5) & 1) && HasAVX512Save)
-    setFeature(X86::FEATURE_AVX512BF16);
-
-  unsigned MaxExtLevel;
-  getX86CpuIDAndInfo(0x80000000, &MaxExtLevel, &EBX, &ECX, &EDX);
-
-  bool HasExtLeaf1 = MaxExtLevel >= 0x80000001 &&
-                     !getX86CpuIDAndInfo(0x80000001, &EAX, &EBX, &ECX, &EDX);
-  if (HasExtLeaf1 && ((ECX >> 6) & 1))
-    setFeature(X86::FEATURE_SSE4_A);
-  if (HasExtLeaf1 && ((ECX >> 11) & 1))
-    setFeature(X86::FEATURE_XOP);
-  if (HasExtLeaf1 && ((ECX >> 16) & 1))
-    setFeature(X86::FEATURE_FMA4);
-
-  if (HasExtLeaf1 && ((EDX >> 29) & 1))
-    setFeature(X86::FEATURE_64BIT);
-}
-
-StringRef sys::getHostCPUName() {
-  unsigned MaxLeaf = 0;
-  const VendorSignatures Vendor = getVendorSignature(&MaxLeaf);
-  if (Vendor == VendorSignatures::UNKNOWN)
-    return "generic";
-
-  unsigned EAX = 0, EBX = 0, ECX = 0, EDX = 0;
-  getX86CpuIDAndInfo(0x1, &EAX, &EBX, &ECX, &EDX);
-
-  unsigned Family = 0, Model = 0;
-  unsigned Features[(X86::CPU_FEATURE_MAX + 31) / 32] = {0};
-  detectX86FamilyModel(EAX, &Family, &Model);
-  getAvailableFeatures(ECX, EDX, MaxLeaf, Features);
-
-  // These aren't consumed in this file, but we try to keep some source code the
-  // same or similar to compiler-rt.
-  unsigned Type = 0;
-  unsigned Subtype = 0;
-
-  StringRef CPU;
-
-  if (Vendor == VendorSignatures::GENUINE_INTEL) {
-    CPU = getIntelProcessorTypeAndSubtype(Family, Model, Features, &Type,
-                                          &Subtype);
-  } else if (Vendor == VendorSignatures::AUTHENTIC_AMD) {
-    CPU = getAMDProcessorTypeAndSubtype(Family, Model, Features, &Type,
-                                        &Subtype);
-  }
-
-  if (!CPU.empty())
-    return CPU;
-
-  return "generic";
-}
-
-#elif defined(__APPLE__) && (defined(__ppc__) || defined(__powerpc__))
-StringRef sys::getHostCPUName() {
-  host_basic_info_data_t hostInfo;
-  mach_msg_type_number_t infoCount;
-
-  infoCount = HOST_BASIC_INFO_COUNT;
-  mach_port_t hostPort = mach_host_self();
-  host_info(hostPort, HOST_BASIC_INFO, (host_info_t)&hostInfo,
-            &infoCount);
-  mach_port_deallocate(mach_task_self(), hostPort);
-
-  if (hostInfo.cpu_type != CPU_TYPE_POWERPC)
-    return "generic";
-
-  switch (hostInfo.cpu_subtype) {
-  case CPU_SUBTYPE_POWERPC_601:
-    return "601";
-  case CPU_SUBTYPE_POWERPC_602:
-    return "602";
-  case CPU_SUBTYPE_POWERPC_603:
-    return "603";
-  case CPU_SUBTYPE_POWERPC_603e:
-    return "603e";
-  case CPU_SUBTYPE_POWERPC_603ev:
-    return "603ev";
-  case CPU_SUBTYPE_POWERPC_604:
-    return "604";
-  case CPU_SUBTYPE_POWERPC_604e:
-    return "604e";
-  case CPU_SUBTYPE_POWERPC_620:
-    return "620";
-  case CPU_SUBTYPE_POWERPC_750:
-    return "750";
-  case CPU_SUBTYPE_POWERPC_7400:
-    return "7400";
-  case CPU_SUBTYPE_POWERPC_7450:
-    return "7450";
-  case CPU_SUBTYPE_POWERPC_970:
-    return "970";
-  default:;
-  }
-
-  return "generic";
-}
-#elif defined(__linux__) && (defined(__ppc__) || defined(__powerpc__))
-StringRef sys::getHostCPUName() {
-  std::unique_ptr<llvm::MemoryBuffer> P = getProcCpuinfoContent();
-  StringRef Content = P ? P->getBuffer() : "";
-  return detail::getHostCPUNameForPowerPC(Content);
-}
-#elif defined(__linux__) && (defined(__arm__) || defined(__aarch64__))
-StringRef sys::getHostCPUName() {
-  std::unique_ptr<llvm::MemoryBuffer> P = getProcCpuinfoContent();
-  StringRef Content = P ? P->getBuffer() : "";
-  return detail::getHostCPUNameForARM(Content);
-}
-#elif defined(__linux__) && defined(__s390x__)
-StringRef sys::getHostCPUName() {
-  std::unique_ptr<llvm::MemoryBuffer> P = getProcCpuinfoContent();
-  StringRef Content = P ? P->getBuffer() : "";
-  return detail::getHostCPUNameForS390x(Content);
-}
-#elif defined(__MVS__)
-StringRef sys::getHostCPUName() {
-  // Get pointer to Communications Vector Table (CVT).
-  // The pointer is located at offset 16 of the Prefixed Save Area (PSA).
-  // It is stored as 31 bit pointer and will be zero-extended to 64 bit.
-  int *StartToCVTOffset = reinterpret_cast<int *>(0x10);
-  // Since its stored as a 31-bit pointer, get the 4 bytes from the start
-  // of address.
-  int ReadValue = *StartToCVTOffset;
-  // Explicitly clear the high order bit.
-  ReadValue = (ReadValue & 0x7FFFFFFF);
-  char *CVT = reinterpret_cast<char *>(ReadValue);
-  // The model number is located in the CVT prefix at offset -6 and stored as
-  // signless packed decimal.
-  uint16_t Id = *(uint16_t *)&CVT[-6];
-  // Convert number to integer.
-  Id = decodePackedBCD<uint16_t>(Id, false);
-  // Check for vector support. It's stored in field CVTFLAG5 (offset 244),
-  // bit CVTVEF (X'80'). The facilities list is part of the PSA but the vector
-  // extension can only be used if bit CVTVEF is on.
-  bool HaveVectorSupport = CVT[244] & 0x80;
-  return getCPUNameFromS390Model(Id, HaveVectorSupport);
-}
-#elif defined(__APPLE__) && defined(__aarch64__)
-StringRef sys::getHostCPUName() {
-  return "cyclone";
-}
-#elif defined(__APPLE__) && defined(__arm__)
-StringRef sys::getHostCPUName() {
-  host_basic_info_data_t hostInfo;
-  mach_msg_type_number_t infoCount;
-
-  infoCount = HOST_BASIC_INFO_COUNT;
-  mach_port_t hostPort = mach_host_self();
-  host_info(hostPort, HOST_BASIC_INFO, (host_info_t)&hostInfo,
-            &infoCount);
-  mach_port_deallocate(mach_task_self(), hostPort);
-
-  if (hostInfo.cpu_type != CPU_TYPE_ARM) {
-    assert(false && "CPUType not equal to ARM should not be possible on ARM");
-    return "generic";
-  }
-  switch (hostInfo.cpu_subtype) {
-    case CPU_SUBTYPE_ARM_V7S:
-      return "swift";
-    default:;
-    }
-
-  return "generic";
-}
-#elif defined(_AIX)
-StringRef sys::getHostCPUName() {
-  switch (_system_configuration.implementation) {
-  case POWER_4:
-    if (_system_configuration.version == PV_4_3)
-      return "970";
-    return "pwr4";
-  case POWER_5:
-    if (_system_configuration.version == PV_5)
-      return "pwr5";
-    return "pwr5x";
-  case POWER_6:
-    if (_system_configuration.version == PV_6_Compat)
-      return "pwr6";
-    return "pwr6x";
-  case POWER_7:
-    return "pwr7";
-  case POWER_8:
-    return "pwr8";
-  case POWER_9:
-    return "pwr9";
-// TODO: simplify this once the macro is available in all OS levels.
-#ifdef POWER_10
-  case POWER_10:
-#else
-  case 0x40000:
-#endif
-    return "pwr10";
-  default:
-    return "generic";
-  }
-}
-#else
-StringRef sys::getHostCPUName() { return "generic"; }
-namespace llvm {
-namespace sys {
-namespace detail {
-namespace x86 {
-
-VendorSignatures getVendorSignature(unsigned *MaxLeaf) {
-  return VendorSignatures::UNKNOWN;
-}
-
-} // namespace x86
-} // namespace detail
-} // namespace sys
-} // namespace llvm
-#endif
-
-#if defined(__linux__) && (defined(__i386__) || defined(__x86_64__))
-// On Linux, the number of physical cores can be computed from /proc/cpuinfo,
-// using the number of unique physical/core id pairs. The following
-// implementation reads the /proc/cpuinfo format on an x86_64 system.
-int computeHostNumPhysicalCores() {
-  // Enabled represents the number of physical id/core id pairs with at least
-  // one processor id enabled by the CPU affinity mask.
-  cpu_set_t Affinity, Enabled;
-  if (sched_getaffinity(0, sizeof(Affinity), &Affinity) != 0)
-    return -1;
-  CPU_ZERO(&Enabled);
-
-  // Read /proc/cpuinfo as a stream (until EOF reached). It cannot be
-  // mmapped because it appears to have 0 size.
-  llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> Text =
-      llvm::MemoryBuffer::getFileAsStream("/proc/cpuinfo");
-  if (std::error_code EC = Text.getError()) {
-    llvm::errs() << "Can't read "
-                 << "/proc/cpuinfo: " << EC.message() << "\n";
-    return -1;
-  }
-  SmallVector<StringRef, 8> strs;
-  (*Text)->getBuffer().split(strs, "\n", /*MaxSplit=*/-1,
-                             /*KeepEmpty=*/false);
-  int CurProcessor = -1;
-  int CurPhysicalId = -1;
-  int CurSiblings = -1;
-  int CurCoreId = -1;
-  for (StringRef Line : strs) {
-    std::pair<StringRef, StringRef> Data = Line.split(':');
-    auto Name = Data.first.trim();
-    auto Val = Data.second.trim();
-    // These fields are available if the kernel is configured with CONFIG_SMP.
-    if (Name == "processor")
-      Val.getAsInteger(10, CurProcessor);
-    else if (Name == "physical id")
-      Val.getAsInteger(10, CurPhysicalId);
-    else if (Name == "siblings")
-      Val.getAsInteger(10, CurSiblings);
-    else if (Name == "core id") {
-      Val.getAsInteger(10, CurCoreId);
-      // The processor id corresponds to an index into cpu_set_t.
-      if (CPU_ISSET(CurProcessor, &Affinity))
-        CPU_SET(CurPhysicalId * CurSiblings + CurCoreId, &Enabled);
-    }
-  }
-  return CPU_COUNT(&Enabled);
-}
-#elif defined(__linux__) && defined(__powerpc__)
-int computeHostNumPhysicalCores() {
-  cpu_set_t Affinity;
-  if (sched_getaffinity(0, sizeof(Affinity), &Affinity) == 0)
-    return CPU_COUNT(&Affinity);
-
-  // The call to sched_getaffinity() may have failed because the Affinity
-  // mask is too small for the number of CPU's on the system (i.e. the
-  // system has more than 1024 CPUs). Allocate a mask large enough for
-  // twice as many CPUs.
-  cpu_set_t *DynAffinity;
-  DynAffinity = CPU_ALLOC(2048);
-  if (sched_getaffinity(0, CPU_ALLOC_SIZE(2048), DynAffinity) == 0) {
-    int NumCPUs = CPU_COUNT(DynAffinity);
-    CPU_FREE(DynAffinity);
-    return NumCPUs;
-  }
-  return -1;
-}
-#elif defined(__linux__) && defined(__s390x__)
-int computeHostNumPhysicalCores() { return sysconf(_SC_NPROCESSORS_ONLN); }
-#elif defined(__APPLE__)
-#include <sys/param.h>
-#include <sys/sysctl.h>
-
-// Gets the number of *physical cores* on the machine.
-int computeHostNumPhysicalCores() {
-  uint32_t count;
-  size_t len = sizeof(count);
-  sysctlbyname("hw.physicalcpu", &count, &len, NULL, 0);
-  if (count < 1) {
-    int nm[2];
-    nm[0] = CTL_HW;
-    nm[1] = HW_AVAILCPU;
-    sysctl(nm, 2, &count, &len, NULL, 0);
-    if (count < 1)
-      return -1;
-  }
-  return count;
-}
-#elif defined(__MVS__)
-int computeHostNumPhysicalCores() {
-  enum {
-    // Byte offset of the pointer to the Communications Vector Table (CVT) in
-    // the Prefixed Save Area (PSA). The table entry is a 31-bit pointer and
-    // will be zero-extended to uintptr_t.
-    FLCCVT = 16,
-    // Byte offset of the pointer to the Common System Data Area (CSD) in the
-    // CVT. The table entry is a 31-bit pointer and will be zero-extended to
-    // uintptr_t.
-    CVTCSD = 660,
-    // Byte offset to the number of live CPs in the LPAR, stored as a signed
-    // 32-bit value in the table.
-    CSD_NUMBER_ONLINE_STANDARD_CPS = 264,
-  };
-  char *PSA = 0;
-  char *CVT = reinterpret_cast<char *>(
-      static_cast<uintptr_t>(reinterpret_cast<unsigned int &>(PSA[FLCCVT])));
-  char *CSD = reinterpret_cast<char *>(
-      static_cast<uintptr_t>(reinterpret_cast<unsigned int &>(CVT[CVTCSD])));
-  return reinterpret_cast<int &>(CSD[CSD_NUMBER_ONLINE_STANDARD_CPS]);
-}
-#elif defined(_WIN32) && LLVM_ENABLE_THREADS != 0
-// Defined in llvm/lib/Support/Windows/Threading.inc
-int computeHostNumPhysicalCores();
-#else
-// On other systems, return -1 to indicate unknown.
-static int computeHostNumPhysicalCores() { return -1; }
-#endif
-
-int sys::getHostNumPhysicalCores() {
-  static int NumCores = computeHostNumPhysicalCores();
-  return NumCores;
-}
-
-#if defined(__i386__) || defined(_M_IX86) || \
-    defined(__x86_64__) || defined(_M_X64)
-bool sys::getHostCPUFeatures(StringMap<bool> &Features) {
-  unsigned EAX = 0, EBX = 0, ECX = 0, EDX = 0;
-  unsigned MaxLevel;
-
-  if (getX86CpuIDAndInfo(0, &MaxLevel, &EBX, &ECX, &EDX) || MaxLevel < 1)
-    return false;
-
-  getX86CpuIDAndInfo(1, &EAX, &EBX, &ECX, &EDX);
-
-  Features["cx8"]    = (EDX >>  8) & 1;
-  Features["cmov"]   = (EDX >> 15) & 1;
-  Features["mmx"]    = (EDX >> 23) & 1;
-  Features["fxsr"]   = (EDX >> 24) & 1;
-  Features["sse"]    = (EDX >> 25) & 1;
-  Features["sse2"]   = (EDX >> 26) & 1;
-
-  Features["sse3"]   = (ECX >>  0) & 1;
-  Features["pclmul"] = (ECX >>  1) & 1;
-  Features["ssse3"]  = (ECX >>  9) & 1;
-  Features["cx16"]   = (ECX >> 13) & 1;
-  Features["sse4.1"] = (ECX >> 19) & 1;
-  Features["sse4.2"] = (ECX >> 20) & 1;
-  Features["movbe"]  = (ECX >> 22) & 1;
-  Features["popcnt"] = (ECX >> 23) & 1;
-  Features["aes"]    = (ECX >> 25) & 1;
-  Features["rdrnd"]  = (ECX >> 30) & 1;
-
-  // If CPUID indicates support for XSAVE, XRESTORE and AVX, and XGETBV
-  // indicates that the AVX registers will be saved and restored on context
-  // switch, then we have full AVX support.
-  bool HasXSave = ((ECX >> 27) & 1) && !getX86XCR0(&EAX, &EDX);
-  bool HasAVXSave = HasXSave && ((ECX >> 28) & 1) && ((EAX & 0x6) == 0x6);
-#if defined(__APPLE__)
-  // Darwin lazily saves the AVX512 context on first use: trust that the OS will
-  // save the AVX512 context if we use AVX512 instructions, even the bit is not
-  // set right now.
-  bool HasAVX512Save = true;
-#else
-  // AVX512 requires additional context to be saved by the OS.
-  bool HasAVX512Save = HasAVXSave && ((EAX & 0xe0) == 0xe0);
-#endif
-  // AMX requires additional context to be saved by the OS.
-  const unsigned AMXBits = (1 << 17) | (1 << 18);
-  bool HasAMXSave = HasXSave && ((EAX & AMXBits) == AMXBits);
-
-  Features["avx"]   = HasAVXSave;
-  Features["fma"]   = ((ECX >> 12) & 1) && HasAVXSave;
-  // Only enable XSAVE if OS has enabled support for saving YMM state.
-  Features["xsave"] = ((ECX >> 26) & 1) && HasAVXSave;
-  Features["f16c"]  = ((ECX >> 29) & 1) && HasAVXSave;
-
-  unsigned MaxExtLevel;
-  getX86CpuIDAndInfo(0x80000000, &MaxExtLevel, &EBX, &ECX, &EDX);
-
-  bool HasExtLeaf1 = MaxExtLevel >= 0x80000001 &&
-                     !getX86CpuIDAndInfo(0x80000001, &EAX, &EBX, &ECX, &EDX);
-  Features["sahf"]   = HasExtLeaf1 && ((ECX >>  0) & 1);
-  Features["lzcnt"]  = HasExtLeaf1 && ((ECX >>  5) & 1);
-  Features["sse4a"]  = HasExtLeaf1 && ((ECX >>  6) & 1);
-  Features["prfchw"] = HasExtLeaf1 && ((ECX >>  8) & 1);
-  Features["xop"]    = HasExtLeaf1 && ((ECX >> 11) & 1) && HasAVXSave;
-  Features["lwp"]    = HasExtLeaf1 && ((ECX >> 15) & 1);
-  Features["fma4"]   = HasExtLeaf1 && ((ECX >> 16) & 1) && HasAVXSave;
-  Features["tbm"]    = HasExtLeaf1 && ((ECX >> 21) & 1);
-  Features["mwaitx"] = HasExtLeaf1 && ((ECX >> 29) & 1);
-
-  Features["64bit"]  = HasExtLeaf1 && ((EDX >> 29) & 1);
-
-  // Miscellaneous memory related features, detected by
-  // using the 0x80000008 leaf of the CPUID instruction
-  bool HasExtLeaf8 = MaxExtLevel >= 0x80000008 &&
-                     !getX86CpuIDAndInfo(0x80000008, &EAX, &EBX, &ECX, &EDX);
-  Features["clzero"]   = HasExtLeaf8 && ((EBX >> 0) & 1);
-  Features["wbnoinvd"] = HasExtLeaf8 && ((EBX >> 9) & 1);
-
-  bool HasLeaf7 =
-      MaxLevel >= 7 && !getX86CpuIDAndInfoEx(0x7, 0x0, &EAX, &EBX, &ECX, &EDX);
-
-  Features["fsgsbase"]   = HasLeaf7 && ((EBX >>  0) & 1);
-  Features["sgx"]        = HasLeaf7 && ((EBX >>  2) & 1);
-  Features["bmi"]        = HasLeaf7 && ((EBX >>  3) & 1);
-  // AVX2 is only supported if we have the OS save support from AVX.
-  Features["avx2"]       = HasLeaf7 && ((EBX >>  5) & 1) && HasAVXSave;
-  Features["bmi2"]       = HasLeaf7 && ((EBX >>  8) & 1);
-  Features["invpcid"]    = HasLeaf7 && ((EBX >> 10) & 1);
-  Features["rtm"]        = HasLeaf7 && ((EBX >> 11) & 1);
-  // AVX512 is only supported if the OS supports the context save for it.
-  Features["avx512f"]    = HasLeaf7 && ((EBX >> 16) & 1) && HasAVX512Save;
-  Features["avx512dq"]   = HasLeaf7 && ((EBX >> 17) & 1) && HasAVX512Save;
-  Features["rdseed"]     = HasLeaf7 && ((EBX >> 18) & 1);
-  Features["adx"]        = HasLeaf7 && ((EBX >> 19) & 1);
-  Features["avx512ifma"] = HasLeaf7 && ((EBX >> 21) & 1) && HasAVX512Save;
-  Features["clflushopt"] = HasLeaf7 && ((EBX >> 23) & 1);
-  Features["clwb"]       = HasLeaf7 && ((EBX >> 24) & 1);
-  Features["avx512pf"]   = HasLeaf7 && ((EBX >> 26) & 1) && HasAVX512Save;
-  Features["avx512er"]   = HasLeaf7 && ((EBX >> 27) & 1) && HasAVX512Save;
-  Features["avx512cd"]   = HasLeaf7 && ((EBX >> 28) & 1) && HasAVX512Save;
-  Features["sha"]        = HasLeaf7 && ((EBX >> 29) & 1);
-  Features["avx512bw"]   = HasLeaf7 && ((EBX >> 30) & 1) && HasAVX512Save;
-  Features["avx512vl"]   = HasLeaf7 && ((EBX >> 31) & 1) && HasAVX512Save;
-
-  Features["prefetchwt1"]     = HasLeaf7 && ((ECX >>  0) & 1);
-  Features["avx512vbmi"]      = HasLeaf7 && ((ECX >>  1) & 1) && HasAVX512Save;
-  Features["pku"]             = HasLeaf7 && ((ECX >>  4) & 1);
-  Features["waitpkg"]         = HasLeaf7 && ((ECX >>  5) & 1);
-  Features["avx512vbmi2"]     = HasLeaf7 && ((ECX >>  6) & 1) && HasAVX512Save;
-  Features["shstk"]           = HasLeaf7 && ((ECX >>  7) & 1);
-  Features["gfni"]            = HasLeaf7 && ((ECX >>  8) & 1);
-  Features["vaes"]            = HasLeaf7 && ((ECX >>  9) & 1) && HasAVXSave;
-  Features["vpclmulqdq"]      = HasLeaf7 && ((ECX >> 10) & 1) && HasAVXSave;
-  Features["avx512vnni"]      = HasLeaf7 && ((ECX >> 11) & 1) && HasAVX512Save;
-  Features["avx512bitalg"]    = HasLeaf7 && ((ECX >> 12) & 1) && HasAVX512Save;
-  Features["avx512vpopcntdq"] = HasLeaf7 && ((ECX >> 14) & 1) && HasAVX512Save;
-  Features["rdpid"]           = HasLeaf7 && ((ECX >> 22) & 1);
-  Features["kl"]              = HasLeaf7 && ((ECX >> 23) & 1); // key locker
-  Features["cldemote"]        = HasLeaf7 && ((ECX >> 25) & 1);
-  Features["movdiri"]         = HasLeaf7 && ((ECX >> 27) & 1);
-  Features["movdir64b"]       = HasLeaf7 && ((ECX >> 28) & 1);
-  Features["enqcmd"]          = HasLeaf7 && ((ECX >> 29) & 1);
-
-  Features["uintr"]           = HasLeaf7 && ((EDX >> 5) & 1);
-  Features["avx512vp2intersect"] =
-      HasLeaf7 && ((EDX >> 8) & 1) && HasAVX512Save;
-  Features["serialize"]       = HasLeaf7 && ((EDX >> 14) & 1);
-  Features["tsxldtrk"]        = HasLeaf7 && ((EDX >> 16) & 1);
-  // There are two CPUID leafs which information associated with the pconfig
-  // instruction:
-  // EAX=0x7, ECX=0x0 indicates the availability of the instruction (via the 18th
-  // bit of EDX), while the EAX=0x1b leaf returns information on the
-  // availability of specific pconfig leafs.
-  // The target feature here only refers to the the first of these two.
-  // Users might need to check for the availability of specific pconfig
-  // leaves using cpuid, since that information is ignored while
-  // detecting features using the "-march=native" flag.
-  // For more info, see X86 ISA docs.
-  Features["pconfig"] = HasLeaf7 && ((EDX >> 18) & 1);
-  Features["amx-bf16"]   = HasLeaf7 && ((EDX >> 22) & 1) && HasAMXSave;
-  Features["amx-tile"]   = HasLeaf7 && ((EDX >> 24) & 1) && HasAMXSave;
-  Features["amx-int8"]   = HasLeaf7 && ((EDX >> 25) & 1) && HasAMXSave;
-  bool HasLeaf7Subleaf1 =
-      MaxLevel >= 7 && !getX86CpuIDAndInfoEx(0x7, 0x1, &EAX, &EBX, &ECX, &EDX);
-  Features["avxvnni"]    = HasLeaf7Subleaf1 && ((EAX >> 4) & 1) && HasAVXSave;
-  Features["avx512bf16"] = HasLeaf7Subleaf1 && ((EAX >> 5) & 1) && HasAVX512Save;
-  Features["hreset"]     = HasLeaf7Subleaf1 && ((EAX >> 22) & 1);
-
-  bool HasLeafD = MaxLevel >= 0xd &&
-                  !getX86CpuIDAndInfoEx(0xd, 0x1, &EAX, &EBX, &ECX, &EDX);
-
-  // Only enable XSAVE if OS has enabled support for saving YMM state.
-  Features["xsaveopt"] = HasLeafD && ((EAX >> 0) & 1) && HasAVXSave;
-  Features["xsavec"]   = HasLeafD && ((EAX >> 1) & 1) && HasAVXSave;
-  Features["xsaves"]   = HasLeafD && ((EAX >> 3) & 1) && HasAVXSave;
-
-  bool HasLeaf14 = MaxLevel >= 0x14 &&
-                  !getX86CpuIDAndInfoEx(0x14, 0x0, &EAX, &EBX, &ECX, &EDX);
-
-  Features["ptwrite"] = HasLeaf14 && ((EBX >> 4) & 1);
-
-  bool HasLeaf19 =
-      MaxLevel >= 0x19 && !getX86CpuIDAndInfo(0x19, &EAX, &EBX, &ECX, &EDX);
-  Features["widekl"] = HasLeaf7 && HasLeaf19 && ((EBX >> 2) & 1);
-
-  return true;
-}
-#elif defined(__linux__) && (defined(__arm__) || defined(__aarch64__))
-bool sys::getHostCPUFeatures(StringMap<bool> &Features) {
-  std::unique_ptr<llvm::MemoryBuffer> P = getProcCpuinfoContent();
-  if (!P)
-    return false;
-
-  SmallVector<StringRef, 32> Lines;
-  P->getBuffer().split(Lines, "\n");
-
-  SmallVector<StringRef, 32> CPUFeatures;
-
-  // Look for the CPU features.
-  for (unsigned I = 0, E = Lines.size(); I != E; ++I)
-    if (Lines[I].startswith("Features")) {
-      Lines[I].split(CPUFeatures, ' ');
-      break;
-    }
-
-#if defined(__aarch64__)
-  // Keep track of which crypto features we have seen
-  enum { CAP_AES = 0x1, CAP_PMULL = 0x2, CAP_SHA1 = 0x4, CAP_SHA2 = 0x8 };
-  uint32_t crypto = 0;
-#endif
-
-  for (unsigned I = 0, E = CPUFeatures.size(); I != E; ++I) {
-    StringRef LLVMFeatureStr = StringSwitch<StringRef>(CPUFeatures[I])
-#if defined(__aarch64__)
-                                   .Case("asimd", "neon")
-                                   .Case("fp", "fp-armv8")
-                                   .Case("crc32", "crc")
-#else
-                                   .Case("half", "fp16")
-                                   .Case("neon", "neon")
-                                   .Case("vfpv3", "vfp3")
-                                   .Case("vfpv3d16", "d16")
-                                   .Case("vfpv4", "vfp4")
-                                   .Case("idiva", "hwdiv-arm")
-                                   .Case("idivt", "hwdiv")
-#endif
-                                   .Default("");
-
-#if defined(__aarch64__)
-    // We need to check crypto separately since we need all of the crypto
-    // extensions to enable the subtarget feature
-    if (CPUFeatures[I] == "aes")
-      crypto |= CAP_AES;
-    else if (CPUFeatures[I] == "pmull")
-      crypto |= CAP_PMULL;
-    else if (CPUFeatures[I] == "sha1")
-      crypto |= CAP_SHA1;
-    else if (CPUFeatures[I] == "sha2")
-      crypto |= CAP_SHA2;
-#endif
-
-    if (LLVMFeatureStr != "")
-      Features[LLVMFeatureStr] = true;
-  }
-
-#if defined(__aarch64__)
-  // If we have all crypto bits we can add the feature
-  if (crypto == (CAP_AES | CAP_PMULL | CAP_SHA1 | CAP_SHA2))
-    Features["crypto"] = true;
-#endif
-
-  return true;
-}
-#elif defined(_WIN32) && (defined(__aarch64__) || defined(_M_ARM64))
-bool sys::getHostCPUFeatures(StringMap<bool> &Features) {
-  if (IsProcessorFeaturePresent(PF_ARM_NEON_INSTRUCTIONS_AVAILABLE))
-    Features["neon"] = true;
-  if (IsProcessorFeaturePresent(PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE))
-    Features["crc"] = true;
-  if (IsProcessorFeaturePresent(PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE))
-    Features["crypto"] = true;
-
-  return true;
-}
-#else
-bool sys::getHostCPUFeatures(StringMap<bool> &Features) { return false; }
-#endif
-
-std::string sys::getProcessTriple() {
-  std::string TargetTripleString = updateTripleOSVersion(LLVM_HOST_TRIPLE);
-  Triple PT(Triple::normalize(TargetTripleString));
-
-  if (sizeof(void *) == 8 && PT.isArch32Bit())
-    PT = PT.get64BitArchVariant();
-  if (sizeof(void *) == 4 && PT.isArch64Bit())
-    PT = PT.get32BitArchVariant();
-
-  return PT.str();
-}
diff --git a/gnu/llvm/llvm/lib/Support/TargetParser.cpp b/gnu/llvm/llvm/lib/Support/TargetParser.cpp
deleted file mode 100644
index 1dadce4b904..00000000000
--- a/gnu/llvm/llvm/lib/Support/TargetParser.cpp
+++ /dev/null
@@ -1,335 +0,0 @@
-//===-- TargetParser - Parser for target features ---------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements a target parser to recognise hardware features such as
-// FPU/CPU/ARCH names as well as specific support such as HDIV, etc.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/TargetParser.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/SmallString.h"
-#include "llvm/ADT/StringSwitch.h"
-#include "llvm/ADT/Twine.h"
-#include "llvm/Support/ARMBuildAttributes.h"
-
-using namespace llvm;
-using namespace AMDGPU;
-
-namespace {
-
-struct GPUInfo {
-  StringLiteral Name;
-  StringLiteral CanonicalName;
-  AMDGPU::GPUKind Kind;
-  unsigned Features;
-};
-
-constexpr GPUInfo R600GPUs[] = {
-  // Name       Canonical    Kind        Features
-  //            Name
-  {{"r600"},    {"r600"},    GK_R600,    FEATURE_NONE },
-  {{"rv630"},   {"r600"},    GK_R600,    FEATURE_NONE },
-  {{"rv635"},   {"r600"},    GK_R600,    FEATURE_NONE },
-  {{"r630"},    {"r630"},    GK_R630,    FEATURE_NONE },
-  {{"rs780"},   {"rs880"},   GK_RS880,   FEATURE_NONE },
-  {{"rs880"},   {"rs880"},   GK_RS880,   FEATURE_NONE },
-  {{"rv610"},   {"rs880"},   GK_RS880,   FEATURE_NONE },
-  {{"rv620"},   {"rs880"},   GK_RS880,   FEATURE_NONE },
-  {{"rv670"},   {"rv670"},   GK_RV670,   FEATURE_NONE },
-  {{"rv710"},   {"rv710"},   GK_RV710,   FEATURE_NONE },
-  {{"rv730"},   {"rv730"},   GK_RV730,   FEATURE_NONE },
-  {{"rv740"},   {"rv770"},   GK_RV770,   FEATURE_NONE },
-  {{"rv770"},   {"rv770"},   GK_RV770,   FEATURE_NONE },
-  {{"cedar"},   {"cedar"},   GK_CEDAR,   FEATURE_NONE },
-  {{"palm"},    {"cedar"},   GK_CEDAR,   FEATURE_NONE },
-  {{"cypress"}, {"cypress"}, GK_CYPRESS, FEATURE_FMA  },
-  {{"hemlock"}, {"cypress"}, GK_CYPRESS, FEATURE_FMA  },
-  {{"juniper"}, {"juniper"}, GK_JUNIPER, FEATURE_NONE },
-  {{"redwood"}, {"redwood"}, GK_REDWOOD, FEATURE_NONE },
-  {{"sumo"},    {"sumo"},    GK_SUMO,    FEATURE_NONE },
-  {{"sumo2"},   {"sumo"},    GK_SUMO,    FEATURE_NONE },
-  {{"barts"},   {"barts"},   GK_BARTS,   FEATURE_NONE },
-  {{"caicos"},  {"caicos"},  GK_CAICOS,  FEATURE_NONE },
-  {{"aruba"},   {"cayman"},  GK_CAYMAN,  FEATURE_FMA  },
-  {{"cayman"},  {"cayman"},  GK_CAYMAN,  FEATURE_FMA  },
-  {{"turks"},   {"turks"},   GK_TURKS,   FEATURE_NONE }
-};
-
-// This table should be sorted by the value of GPUKind
-// Don't bother listing the implicitly true features
-constexpr GPUInfo AMDGCNGPUs[] = {
-  // Name         Canonical    Kind        Features
-  //              Name
-  {{"gfx600"},    {"gfx600"},  GK_GFX600,  FEATURE_FAST_FMA_F32},
-  {{"tahiti"},    {"gfx600"},  GK_GFX600,  FEATURE_FAST_FMA_F32},
-  {{"gfx601"},    {"gfx601"},  GK_GFX601,  FEATURE_NONE},
-  {{"pitcairn"},  {"gfx601"},  GK_GFX601,  FEATURE_NONE},
-  {{"verde"},     {"gfx601"},  GK_GFX601,  FEATURE_NONE},
-  {{"gfx602"},    {"gfx602"},  GK_GFX602,  FEATURE_NONE},
-  {{"hainan"},    {"gfx602"},  GK_GFX602,  FEATURE_NONE},
-  {{"oland"},     {"gfx602"},  GK_GFX602,  FEATURE_NONE},
-  {{"gfx700"},    {"gfx700"},  GK_GFX700,  FEATURE_NONE},
-  {{"kaveri"},    {"gfx700"},  GK_GFX700,  FEATURE_NONE},
-  {{"gfx701"},    {"gfx701"},  GK_GFX701,  FEATURE_FAST_FMA_F32},
-  {{"hawaii"},    {"gfx701"},  GK_GFX701,  FEATURE_FAST_FMA_F32},
-  {{"gfx702"},    {"gfx702"},  GK_GFX702,  FEATURE_FAST_FMA_F32},
-  {{"gfx703"},    {"gfx703"},  GK_GFX703,  FEATURE_NONE},
-  {{"kabini"},    {"gfx703"},  GK_GFX703,  FEATURE_NONE},
-  {{"mullins"},   {"gfx703"},  GK_GFX703,  FEATURE_NONE},
-  {{"gfx704"},    {"gfx704"},  GK_GFX704,  FEATURE_NONE},
-  {{"bonaire"},   {"gfx704"},  GK_GFX704,  FEATURE_NONE},
-  {{"gfx705"},    {"gfx705"},  GK_GFX705,  FEATURE_NONE},
-  {{"gfx801"},    {"gfx801"},  GK_GFX801,  FEATURE_FAST_FMA_F32|FEATURE_FAST_DENORMAL_F32|FEATURE_XNACK},
-  {{"carrizo"},   {"gfx801"},  GK_GFX801,  FEATURE_FAST_FMA_F32|FEATURE_FAST_DENORMAL_F32|FEATURE_XNACK},
-  {{"gfx802"},    {"gfx802"},  GK_GFX802,  FEATURE_FAST_DENORMAL_F32},
-  {{"iceland"},   {"gfx802"},  GK_GFX802,  FEATURE_FAST_DENORMAL_F32},
-  {{"tonga"},     {"gfx802"},  GK_GFX802,  FEATURE_FAST_DENORMAL_F32},
-  {{"gfx803"},    {"gfx803"},  GK_GFX803,  FEATURE_FAST_DENORMAL_F32},
-  {{"fiji"},      {"gfx803"},  GK_GFX803,  FEATURE_FAST_DENORMAL_F32},
-  {{"polaris10"}, {"gfx803"},  GK_GFX803,  FEATURE_FAST_DENORMAL_F32},
-  {{"polaris11"}, {"gfx803"},  GK_GFX803,  FEATURE_FAST_DENORMAL_F32},
-  {{"gfx805"},    {"gfx805"},  GK_GFX805,  FEATURE_FAST_DENORMAL_F32},
-  {{"tongapro"},  {"gfx805"},  GK_GFX805,  FEATURE_FAST_DENORMAL_F32},
-  {{"gfx810"},    {"gfx810"},  GK_GFX810,  FEATURE_FAST_DENORMAL_F32|FEATURE_XNACK},
-  {{"stoney"},    {"gfx810"},  GK_GFX810,  FEATURE_FAST_DENORMAL_F32|FEATURE_XNACK},
-  {{"gfx900"},    {"gfx900"},  GK_GFX900,  FEATURE_FAST_FMA_F32|FEATURE_FAST_DENORMAL_F32|FEATURE_XNACK},
-  {{"gfx902"},    {"gfx902"},  GK_GFX902,  FEATURE_FAST_FMA_F32|FEATURE_FAST_DENORMAL_F32|FEATURE_XNACK},
-  {{"gfx904"},    {"gfx904"},  GK_GFX904,  FEATURE_FAST_FMA_F32|FEATURE_FAST_DENORMAL_F32|FEATURE_XNACK},
-  {{"gfx906"},    {"gfx906"},  GK_GFX906,  FEATURE_FAST_FMA_F32|FEATURE_FAST_DENORMAL_F32|FEATURE_XNACK|FEATURE_SRAMECC},
-  {{"gfx908"},    {"gfx908"},  GK_GFX908,  FEATURE_FAST_FMA_F32|FEATURE_FAST_DENORMAL_F32|FEATURE_XNACK|FEATURE_SRAMECC},
-  {{"gfx909"},    {"gfx909"},  GK_GFX909,  FEATURE_FAST_FMA_F32|FEATURE_FAST_DENORMAL_F32|FEATURE_XNACK},
-  {{"gfx90a"},    {"gfx90a"},  GK_GFX90A,  FEATURE_FAST_FMA_F32|FEATURE_FAST_DENORMAL_F32|FEATURE_XNACK|FEATURE_SRAMECC},
-  {{"gfx90c"},    {"gfx90c"},  GK_GFX90C,  FEATURE_FAST_FMA_F32|FEATURE_FAST_DENORMAL_F32|FEATURE_XNACK},
-  {{"gfx1010"},   {"gfx1010"}, GK_GFX1010, FEATURE_FAST_FMA_F32|FEATURE_FAST_DENORMAL_F32|FEATURE_WAVE32|FEATURE_XNACK},
-  {{"gfx1011"},   {"gfx1011"}, GK_GFX1011, FEATURE_FAST_FMA_F32|FEATURE_FAST_DENORMAL_F32|FEATURE_WAVE32|FEATURE_XNACK},
-  {{"gfx1012"},   {"gfx1012"}, GK_GFX1012, FEATURE_FAST_FMA_F32|FEATURE_FAST_DENORMAL_F32|FEATURE_WAVE32|FEATURE_XNACK},
-  {{"gfx1013"},   {"gfx1013"}, GK_GFX1013, FEATURE_FAST_FMA_F32|FEATURE_FAST_DENORMAL_F32|FEATURE_WAVE32|FEATURE_XNACK},
-  {{"gfx1030"},   {"gfx1030"}, GK_GFX1030, FEATURE_FAST_FMA_F32|FEATURE_FAST_DENORMAL_F32|FEATURE_WAVE32},
-  {{"gfx1031"},   {"gfx1031"}, GK_GFX1031, FEATURE_FAST_FMA_F32|FEATURE_FAST_DENORMAL_F32|FEATURE_WAVE32},
-  {{"gfx1032"},   {"gfx1032"}, GK_GFX1032, FEATURE_FAST_FMA_F32|FEATURE_FAST_DENORMAL_F32|FEATURE_WAVE32},
-  {{"gfx1033"},   {"gfx1033"}, GK_GFX1033, FEATURE_FAST_FMA_F32|FEATURE_FAST_DENORMAL_F32|FEATURE_WAVE32},
-  {{"gfx1034"},   {"gfx1034"}, GK_GFX1034, FEATURE_FAST_FMA_F32|FEATURE_FAST_DENORMAL_F32|FEATURE_WAVE32},
-  {{"gfx1035"},   {"gfx1035"}, GK_GFX1035, FEATURE_FAST_FMA_F32|FEATURE_FAST_DENORMAL_F32|FEATURE_WAVE32},
-};
-
-const GPUInfo *getArchEntry(AMDGPU::GPUKind AK, ArrayRef<GPUInfo> Table) {
-  GPUInfo Search = { {""}, {""}, AK, AMDGPU::FEATURE_NONE };
-
-  auto I =
-      llvm::lower_bound(Table, Search, [](const GPUInfo &A, const GPUInfo &B) {
-        return A.Kind < B.Kind;
-      });
-
-  if (I == Table.end())
-    return nullptr;
-  return I;
-}
-
-} // namespace
-
-StringRef llvm::AMDGPU::getArchNameAMDGCN(GPUKind AK) {
-  if (const auto *Entry = getArchEntry(AK, AMDGCNGPUs))
-    return Entry->CanonicalName;
-  return "";
-}
-
-StringRef llvm::AMDGPU::getArchNameR600(GPUKind AK) {
-  if (const auto *Entry = getArchEntry(AK, R600GPUs))
-    return Entry->CanonicalName;
-  return "";
-}
-
-AMDGPU::GPUKind llvm::AMDGPU::parseArchAMDGCN(StringRef CPU) {
-  for (const auto &C : AMDGCNGPUs) {
-    if (CPU == C.Name)
-      return C.Kind;
-  }
-
-  return AMDGPU::GPUKind::GK_NONE;
-}
-
-AMDGPU::GPUKind llvm::AMDGPU::parseArchR600(StringRef CPU) {
-  for (const auto &C : R600GPUs) {
-    if (CPU == C.Name)
-      return C.Kind;
-  }
-
-  return AMDGPU::GPUKind::GK_NONE;
-}
-
-unsigned AMDGPU::getArchAttrAMDGCN(GPUKind AK) {
-  if (const auto *Entry = getArchEntry(AK, AMDGCNGPUs))
-    return Entry->Features;
-  return FEATURE_NONE;
-}
-
-unsigned AMDGPU::getArchAttrR600(GPUKind AK) {
-  if (const auto *Entry = getArchEntry(AK, R600GPUs))
-    return Entry->Features;
-  return FEATURE_NONE;
-}
-
-void AMDGPU::fillValidArchListAMDGCN(SmallVectorImpl<StringRef> &Values) {
-  // XXX: Should this only report unique canonical names?
-  for (const auto &C : AMDGCNGPUs)
-    Values.push_back(C.Name);
-}
-
-void AMDGPU::fillValidArchListR600(SmallVectorImpl<StringRef> &Values) {
-  for (const auto &C : R600GPUs)
-    Values.push_back(C.Name);
-}
-
-AMDGPU::IsaVersion AMDGPU::getIsaVersion(StringRef GPU) {
-  AMDGPU::GPUKind AK = parseArchAMDGCN(GPU);
-  if (AK == AMDGPU::GPUKind::GK_NONE) {
-    if (GPU == "generic-hsa")
-      return {7, 0, 0};
-    if (GPU == "generic")
-      return {6, 0, 0};
-    return {0, 0, 0};
-  }
-
-  switch (AK) {
-  case GK_GFX600:  return {6, 0, 0};
-  case GK_GFX601:  return {6, 0, 1};
-  case GK_GFX602:  return {6, 0, 2};
-  case GK_GFX700:  return {7, 0, 0};
-  case GK_GFX701:  return {7, 0, 1};
-  case GK_GFX702:  return {7, 0, 2};
-  case GK_GFX703:  return {7, 0, 3};
-  case GK_GFX704:  return {7, 0, 4};
-  case GK_GFX705:  return {7, 0, 5};
-  case GK_GFX801:  return {8, 0, 1};
-  case GK_GFX802:  return {8, 0, 2};
-  case GK_GFX803:  return {8, 0, 3};
-  case GK_GFX805:  return {8, 0, 5};
-  case GK_GFX810:  return {8, 1, 0};
-  case GK_GFX900:  return {9, 0, 0};
-  case GK_GFX902:  return {9, 0, 2};
-  case GK_GFX904:  return {9, 0, 4};
-  case GK_GFX906:  return {9, 0, 6};
-  case GK_GFX908:  return {9, 0, 8};
-  case GK_GFX909:  return {9, 0, 9};
-  case GK_GFX90A:  return {9, 0, 10};
-  case GK_GFX90C:  return {9, 0, 12};
-  case GK_GFX1010: return {10, 1, 0};
-  case GK_GFX1011: return {10, 1, 1};
-  case GK_GFX1012: return {10, 1, 2};
-  case GK_GFX1013: return {10, 1, 3};
-  case GK_GFX1030: return {10, 3, 0};
-  case GK_GFX1031: return {10, 3, 1};
-  case GK_GFX1032: return {10, 3, 2};
-  case GK_GFX1033: return {10, 3, 3};
-  case GK_GFX1034: return {10, 3, 4};
-  case GK_GFX1035: return {10, 3, 5};
-  default:         return {0, 0, 0};
-  }
-}
-
-StringRef AMDGPU::getCanonicalArchName(const Triple &T, StringRef Arch) {
-  assert(T.isAMDGPU());
-  auto ProcKind = T.isAMDGCN() ? parseArchAMDGCN(Arch) : parseArchR600(Arch);
-  if (ProcKind == GK_NONE)
-    return StringRef();
-
-  return T.isAMDGCN() ? getArchNameAMDGCN(ProcKind) : getArchNameR600(ProcKind);
-}
-
-namespace llvm {
-namespace RISCV {
-
-struct CPUInfo {
-  StringLiteral Name;
-  CPUKind Kind;
-  unsigned Features;
-  StringLiteral DefaultMarch;
-  bool is64Bit() const { return (Features & FK_64BIT); }
-};
-
-constexpr CPUInfo RISCVCPUInfo[] = {
-#define PROC(ENUM, NAME, FEATURES, DEFAULT_MARCH)                              \
-  {NAME, CK_##ENUM, FEATURES, DEFAULT_MARCH},
-#include "llvm/Support/RISCVTargetParser.def"
-};
-
-bool checkCPUKind(CPUKind Kind, bool IsRV64) {
-  if (Kind == CK_INVALID)
-    return false;
-  return RISCVCPUInfo[static_cast<unsigned>(Kind)].is64Bit() == IsRV64;
-}
-
-bool checkTuneCPUKind(CPUKind Kind, bool IsRV64) {
-  if (Kind == CK_INVALID)
-    return false;
-  return RISCVCPUInfo[static_cast<unsigned>(Kind)].is64Bit() == IsRV64;
-}
-
-CPUKind parseCPUKind(StringRef CPU) {
-  return llvm::StringSwitch<CPUKind>(CPU)
-#define PROC(ENUM, NAME, FEATURES, DEFAULT_MARCH) .Case(NAME, CK_##ENUM)
-#include "llvm/Support/RISCVTargetParser.def"
-      .Default(CK_INVALID);
-}
-
-StringRef resolveTuneCPUAlias(StringRef TuneCPU, bool IsRV64) {
-  return llvm::StringSwitch<StringRef>(TuneCPU)
-#define PROC_ALIAS(NAME, RV32, RV64) .Case(NAME, IsRV64 ? StringRef(RV64) : StringRef(RV32))
-#include "llvm/Support/RISCVTargetParser.def"
-      .Default(TuneCPU);
-}
-
-CPUKind parseTuneCPUKind(StringRef TuneCPU, bool IsRV64) {
-  TuneCPU = resolveTuneCPUAlias(TuneCPU, IsRV64);
-
-  return llvm::StringSwitch<CPUKind>(TuneCPU)
-#define PROC(ENUM, NAME, FEATURES, DEFAULT_MARCH) .Case(NAME, CK_##ENUM)
-#include "llvm/Support/RISCVTargetParser.def"
-      .Default(CK_INVALID);
-}
-
-StringRef getMArchFromMcpu(StringRef CPU) {
-  CPUKind Kind = parseCPUKind(CPU);
-  return RISCVCPUInfo[static_cast<unsigned>(Kind)].DefaultMarch;
-}
-
-void fillValidCPUArchList(SmallVectorImpl<StringRef> &Values, bool IsRV64) {
-  for (const auto &C : RISCVCPUInfo) {
-    if (C.Kind != CK_INVALID && IsRV64 == C.is64Bit())
-      Values.emplace_back(C.Name);
-  }
-}
-
-void fillValidTuneCPUArchList(SmallVectorImpl<StringRef> &Values, bool IsRV64) {
-  for (const auto &C : RISCVCPUInfo) {
-    if (C.Kind != CK_INVALID && IsRV64 == C.is64Bit())
-      Values.emplace_back(C.Name);
-  }
-#define PROC_ALIAS(NAME, RV32, RV64) Values.emplace_back(StringRef(NAME));
-#include "llvm/Support/RISCVTargetParser.def"
-}
-
-// Get all features except standard extension feature
-bool getCPUFeaturesExceptStdExt(CPUKind Kind,
-                                std::vector<StringRef> &Features) {
-  unsigned CPUFeatures = RISCVCPUInfo[static_cast<unsigned>(Kind)].Features;
-
-  if (CPUFeatures == FK_INVALID)
-    return false;
-
-  if (CPUFeatures & FK_64BIT)
-    Features.push_back("+64bit");
-  else
-    Features.push_back("-64bit");
-
-  return true;
-}
-
-} // namespace RISCV
-} // namespace llvm
diff --git a/gnu/llvm/llvm/lib/Support/TargetRegistry.cpp b/gnu/llvm/llvm/lib/Support/TargetRegistry.cpp
deleted file mode 100644
index 1f9c3bbf822..00000000000
--- a/gnu/llvm/llvm/lib/Support/TargetRegistry.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-//===--- TargetRegistry.cpp - Target registration -------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/raw_ostream.h"
-#include <cassert>
-#include <vector>
-using namespace llvm;
-
-// Clients are responsible for avoid race conditions in registration.
-static Target *FirstTarget = nullptr;
-
-iterator_range<TargetRegistry::iterator> TargetRegistry::targets() {
-  return make_range(iterator(FirstTarget), iterator());
-}
-
-const Target *TargetRegistry::lookupTarget(const std::string &ArchName,
-                                           Triple &TheTriple,
-                                           std::string &Error) {
-  // Allocate target machine.  First, check whether the user has explicitly
-  // specified an architecture to compile for. If so we have to look it up by
-  // name, because it might be a backend that has no mapping to a target triple.
-  const Target *TheTarget = nullptr;
-  if (!ArchName.empty()) {
-    auto I = find_if(targets(),
-                     [&](const Target &T) { return ArchName == T.getName(); });
-
-    if (I == targets().end()) {
-      Error = "error: invalid target '" + ArchName + "'.\n";
-      return nullptr;
-    }
-
-    TheTarget = &*I;
-
-    // Adjust the triple to match (if known), otherwise stick with the
-    // given triple.
-    Triple::ArchType Type = Triple::getArchTypeForLLVMName(ArchName);
-    if (Type != Triple::UnknownArch)
-      TheTriple.setArch(Type);
-  } else {
-    // Get the target specific parser.
-    std::string TempError;
-    TheTarget = TargetRegistry::lookupTarget(TheTriple.getTriple(), TempError);
-    if (!TheTarget) {
-      Error = ": error: unable to get target for '"
-            + TheTriple.getTriple()
-            + "', see --version and --triple.\n";
-      return nullptr;
-    }
-  }
-
-  return TheTarget;
-}
-
-const Target *TargetRegistry::lookupTarget(const std::string &TT,
-                                           std::string &Error) {
-  // Provide special warning when no targets are initialized.
-  if (targets().begin() == targets().end()) {
-    Error = "Unable to find target for this triple (no targets are registered)";
-    return nullptr;
-  }
-  Triple::ArchType Arch = Triple(TT).getArch();
-  auto ArchMatch = [&](const Target &T) { return T.ArchMatchFn(Arch); };
-  auto I = find_if(targets(), ArchMatch);
-
-  if (I == targets().end()) {
-    Error = "No available targets are compatible with triple \"" + TT + "\"";
-    return nullptr;
-  }
-
-  auto J = std::find_if(std::next(I), targets().end(), ArchMatch);
-  if (J != targets().end()) {
-    Error = std::string("Cannot choose between targets \"") + I->Name +
-            "\" and \"" + J->Name + "\"";
-    return nullptr;
-  }
-
-  return &*I;
-}
-
-void TargetRegistry::RegisterTarget(Target &T, const char *Name,
-                                    const char *ShortDesc,
-                                    const char *BackendName,
-                                    Target::ArchMatchFnTy ArchMatchFn,
-                                    bool HasJIT) {
-  assert(Name && ShortDesc && ArchMatchFn &&
-         "Missing required target information!");
-
-  // Check if this target has already been initialized, we allow this as a
-  // convenience to some clients.
-  if (T.Name)
-    return;
-
-  // Add to the list of targets.
-  T.Next = FirstTarget;
-  FirstTarget = &T;
-
-  T.Name = Name;
-  T.ShortDesc = ShortDesc;
-  T.BackendName = BackendName;
-  T.ArchMatchFn = ArchMatchFn;
-  T.HasJIT = HasJIT;
-}
-
-static int TargetArraySortFn(const std::pair<StringRef, const Target *> *LHS,
-                             const std::pair<StringRef, const Target *> *RHS) {
-  return LHS->first.compare(RHS->first);
-}
-
-void TargetRegistry::printRegisteredTargetsForVersion(raw_ostream &OS) {
-  std::vector<std::pair<StringRef, const Target*> > Targets;
-  size_t Width = 0;
-  for (const auto &T : TargetRegistry::targets()) {
-    Targets.push_back(std::make_pair(T.getName(), &T));
-    Width = std::max(Width, Targets.back().first.size());
-  }
-  array_pod_sort(Targets.begin(), Targets.end(), TargetArraySortFn);
-
-  OS << "  Registered Targets:\n";
-  for (unsigned i = 0, e = Targets.size(); i != e; ++i) {
-    OS << "    " << Targets[i].first;
-    OS.indent(Width - Targets[i].first.size()) << " - "
-      << Targets[i].second->getShortDescription() << '\n';
-  }
-  if (Targets.empty())
-    OS << "    (none)\n";
-}
diff --git a/gnu/llvm/llvm/lib/Support/ThreadLocal.cpp b/gnu/llvm/llvm/lib/Support/ThreadLocal.cpp
deleted file mode 100644
index 44e6223cf17..00000000000
--- a/gnu/llvm/llvm/lib/Support/ThreadLocal.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-//===- ThreadLocal.cpp - Thread Local Data ----------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements the llvm::sys::ThreadLocal class.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/ThreadLocal.h"
-#include "llvm/Config/llvm-config.h"
-#include "llvm/Support/Compiler.h"
-
-//===----------------------------------------------------------------------===//
-//=== WARNING: Implementation here must contain only TRULY operating system
-//===          independent code.
-//===----------------------------------------------------------------------===//
-
-#if !defined(LLVM_ENABLE_THREADS) || LLVM_ENABLE_THREADS == 0
-// Define all methods as no-ops if threading is explicitly disabled
-namespace llvm {
-using namespace sys;
-ThreadLocalImpl::ThreadLocalImpl() : data() { }
-ThreadLocalImpl::~ThreadLocalImpl() { }
-void ThreadLocalImpl::setInstance(const void* d) {
-  static_assert(sizeof(d) <= sizeof(data), "size too big");
-  void **pd = reinterpret_cast<void**>(&data);
-  *pd = const_cast<void*>(d);
-}
-void *ThreadLocalImpl::getInstance() {
-  void **pd = reinterpret_cast<void**>(&data);
-  return *pd;
-}
-void ThreadLocalImpl::removeInstance() {
-  setInstance(nullptr);
-}
-}
-#elif defined(LLVM_ON_UNIX)
-#include "Unix/ThreadLocal.inc"
-#elif defined( _WIN32)
-#include "Windows/ThreadLocal.inc"
-#else
-#warning Neither LLVM_ON_UNIX nor _WIN32 set in Support/ThreadLocal.cpp
-#endif
diff --git a/gnu/llvm/llvm/lib/Support/Triple.cpp b/gnu/llvm/llvm/lib/Support/Triple.cpp
deleted file mode 100644
index 88311546354..00000000000
--- a/gnu/llvm/llvm/lib/Support/Triple.cpp
+++ /dev/null
@@ -1,1781 +0,0 @@
-//===--- Triple.cpp - Target triple helper class --------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/Triple.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/SmallString.h"
-#include "llvm/ADT/StringExtras.h"
-#include "llvm/ADT/StringSwitch.h"
-#include "llvm/Support/ErrorHandling.h"
-#include "llvm/Support/Host.h"
-#include "llvm/Support/SwapByteOrder.h"
-#include "llvm/Support/TargetParser.h"
-#include "llvm/Support/VersionTuple.h"
-#include <cassert>
-#include <cstring>
-using namespace llvm;
-
-StringRef Triple::getArchTypeName(ArchType Kind) {
-  switch (Kind) {
-  case UnknownArch:    return "unknown";
-
-  case aarch64:        return "aarch64";
-  case aarch64_32:     return "aarch64_32";
-  case aarch64_be:     return "aarch64_be";
-  case amdgcn:         return "amdgcn";
-  case amdil64:        return "amdil64";
-  case amdil:          return "amdil";
-  case arc:            return "arc";
-  case arm:            return "arm";
-  case armeb:          return "armeb";
-  case avr:            return "avr";
-  case bpfeb:          return "bpfeb";
-  case bpfel:          return "bpfel";
-  case csky:           return "csky";
-  case hexagon:        return "hexagon";
-  case hsail64:        return "hsail64";
-  case hsail:          return "hsail";
-  case kalimba:        return "kalimba";
-  case lanai:          return "lanai";
-  case le32:           return "le32";
-  case le64:           return "le64";
-  case m68k:           return "m68k";
-  case mips64:         return "mips64";
-  case mips64el:       return "mips64el";
-  case mips:           return "mips";
-  case mipsel:         return "mipsel";
-  case msp430:         return "msp430";
-  case nvptx64:        return "nvptx64";
-  case nvptx:          return "nvptx";
-  case ppc64:          return "powerpc64";
-  case ppc64le:        return "powerpc64le";
-  case ppc:            return "powerpc";
-  case ppcle:          return "powerpcle";
-  case r600:           return "r600";
-  case renderscript32: return "renderscript32";
-  case renderscript64: return "renderscript64";
-  case riscv32:        return "riscv32";
-  case riscv64:        return "riscv64";
-  case shave:          return "shave";
-  case sparc:          return "sparc";
-  case sparcel:        return "sparcel";
-  case sparcv9:        return "sparcv9";
-  case spir64:         return "spir64";
-  case spir:           return "spir";
-  case systemz:        return "s390x";
-  case tce:            return "tce";
-  case tcele:          return "tcele";
-  case thumb:          return "thumb";
-  case thumbeb:        return "thumbeb";
-  case ve:             return "ve";
-  case wasm32:         return "wasm32";
-  case wasm64:         return "wasm64";
-  case x86:            return "i386";
-  case x86_64:         return "x86_64";
-  case xcore:          return "xcore";
-  }
-
-  llvm_unreachable("Invalid ArchType!");
-}
-
-StringRef Triple::getArchTypePrefix(ArchType Kind) {
-  switch (Kind) {
-  default:
-    return StringRef();
-
-  case aarch64:
-  case aarch64_be:
-  case aarch64_32:  return "aarch64";
-
-  case arc:         return "arc";
-
-  case arm:
-  case armeb:
-  case thumb:
-  case thumbeb:     return "arm";
-
-  case avr:         return "avr";
-
-  case ppc64:
-  case ppc64le:
-  case ppc:
-  case ppcle:       return "ppc";
-
-  case m68k:        return "m68k";
-
-  case mips:
-  case mipsel:
-  case mips64:
-  case mips64el:    return "mips";
-
-  case hexagon:     return "hexagon";
-
-  case amdgcn:      return "amdgcn";
-  case r600:        return "r600";
-
-  case bpfel:
-  case bpfeb:       return "bpf";
-
-  case sparcv9:
-  case sparcel:
-  case sparc:       return "sparc";
-
-  case systemz:     return "s390";
-
-  case x86:
-  case x86_64:      return "x86";
-
-  case xcore:       return "xcore";
-
-  // NVPTX intrinsics are namespaced under nvvm.
-  case nvptx:       return "nvvm";
-  case nvptx64:     return "nvvm";
-
-  case le32:        return "le32";
-  case le64:        return "le64";
-
-  case amdil:
-  case amdil64:     return "amdil";
-
-  case hsail:
-  case hsail64:     return "hsail";
-
-  case spir:
-  case spir64:      return "spir";
-  case kalimba:     return "kalimba";
-  case lanai:       return "lanai";
-  case shave:       return "shave";
-  case wasm32:
-  case wasm64:      return "wasm";
-
-  case riscv32:
-  case riscv64:     return "riscv";
-
-  case ve:          return "ve";
-  case csky:        return "csky";
-  }
-}
-
-StringRef Triple::getVendorTypeName(VendorType Kind) {
-  switch (Kind) {
-  case UnknownVendor: return "unknown";
-
-  case AMD: return "amd";
-  case Apple: return "apple";
-  case CSR: return "csr";
-  case Freescale: return "fsl";
-  case IBM: return "ibm";
-  case ImaginationTechnologies: return "img";
-  case Mesa: return "mesa";
-  case MipsTechnologies: return "mti";
-  case Myriad: return "myriad";
-  case NVIDIA: return "nvidia";
-  case OpenEmbedded: return "oe";
-  case PC: return "pc";
-  case SCEI: return "scei";
-  case SUSE: return "suse";
-  }
-
-  llvm_unreachable("Invalid VendorType!");
-}
-
-StringRef Triple::getOSTypeName(OSType Kind) {
-  switch (Kind) {
-  case UnknownOS: return "unknown";
-
-  case AIX: return "aix";
-  case AMDHSA: return "amdhsa";
-  case AMDPAL: return "amdpal";
-  case Ananas: return "ananas";
-  case CUDA: return "cuda";
-  case CloudABI: return "cloudabi";
-  case Contiki: return "contiki";
-  case Darwin: return "darwin";
-  case DragonFly: return "dragonfly";
-  case ELFIAMCU: return "elfiamcu";
-  case Emscripten: return "emscripten";
-  case FreeBSD: return "freebsd";
-  case Fuchsia: return "fuchsia";
-  case Haiku: return "haiku";
-  case HermitCore: return "hermit";
-  case Hurd: return "hurd";
-  case IOS: return "ios";
-  case KFreeBSD: return "kfreebsd";
-  case Linux: return "linux";
-  case Lv2: return "lv2";
-  case MacOSX: return "macosx";
-  case Mesa3D: return "mesa3d";
-  case Minix: return "minix";
-  case NVCL: return "nvcl";
-  case NaCl: return "nacl";
-  case NetBSD: return "netbsd";
-  case OpenBSD: return "openbsd";
-  case PS4: return "ps4";
-  case RTEMS: return "rtems";
-  case Solaris: return "solaris";
-  case TvOS: return "tvos";
-  case WASI: return "wasi";
-  case WatchOS: return "watchos";
-  case Win32: return "windows";
-  case ZOS: return "zos";
-  }
-
-  llvm_unreachable("Invalid OSType");
-}
-
-StringRef Triple::getEnvironmentTypeName(EnvironmentType Kind) {
-  switch (Kind) {
-  case UnknownEnvironment: return "unknown";
-  case Android: return "android";
-  case CODE16: return "code16";
-  case CoreCLR: return "coreclr";
-  case Cygnus: return "cygnus";
-  case EABI: return "eabi";
-  case EABIHF: return "eabihf";
-  case GNU: return "gnu";
-  case GNUABI64: return "gnuabi64";
-  case GNUABIN32: return "gnuabin32";
-  case GNUEABI: return "gnueabi";
-  case GNUEABIHF: return "gnueabihf";
-  case GNUX32: return "gnux32";
-  case GNUILP32: return "gnu_ilp32";
-  case Itanium: return "itanium";
-  case MSVC: return "msvc";
-  case MacABI: return "macabi";
-  case Musl: return "musl";
-  case MuslEABI: return "musleabi";
-  case MuslEABIHF: return "musleabihf";
-  case MuslX32: return "muslx32";
-  case Simulator: return "simulator";
-  }
-
-  llvm_unreachable("Invalid EnvironmentType!");
-}
-
-static Triple::ArchType parseBPFArch(StringRef ArchName) {
-  if (ArchName.equals("bpf")) {
-    if (sys::IsLittleEndianHost)
-      return Triple::bpfel;
-    else
-      return Triple::bpfeb;
-  } else if (ArchName.equals("bpf_be") || ArchName.equals("bpfeb")) {
-    return Triple::bpfeb;
-  } else if (ArchName.equals("bpf_le") || ArchName.equals("bpfel")) {
-    return Triple::bpfel;
-  } else {
-    return Triple::UnknownArch;
-  }
-}
-
-Triple::ArchType Triple::getArchTypeForLLVMName(StringRef Name) {
-  Triple::ArchType BPFArch(parseBPFArch(Name));
-  return StringSwitch<Triple::ArchType>(Name)
-    .Case("aarch64", aarch64)
-    .Case("aarch64_be", aarch64_be)
-    .Case("aarch64_32", aarch64_32)
-    .Case("arc", arc)
-    .Case("arm64", aarch64) // "arm64" is an alias for "aarch64"
-    .Case("arm64_32", aarch64_32)
-    .Case("arm", arm)
-    .Case("armeb", armeb)
-    .Case("avr", avr)
-    .StartsWith("bpf", BPFArch)
-    .Case("m68k", m68k)
-    .Case("mips", mips)
-    .Case("mipsel", mipsel)
-    .Case("mips64", mips64)
-    .Case("mips64el", mips64el)
-    .Case("msp430", msp430)
-    .Case("ppc64", ppc64)
-    .Case("ppc32", ppc)
-    .Case("ppc", ppc)
-    .Case("ppc32le", ppcle)
-    .Case("ppcle", ppcle)
-    .Case("ppc64le", ppc64le)
-    .Case("r600", r600)
-    .Case("amdgcn", amdgcn)
-    .Case("riscv32", riscv32)
-    .Case("riscv64", riscv64)
-    .Case("hexagon", hexagon)
-    .Case("sparc", sparc)
-    .Case("sparcel", sparcel)
-    .Case("sparcv9", sparcv9)
-    .Case("systemz", systemz)
-    .Case("tce", tce)
-    .Case("tcele", tcele)
-    .Case("thumb", thumb)
-    .Case("thumbeb", thumbeb)
-    .Case("x86", x86)
-    .Case("x86-64", x86_64)
-    .Case("xcore", xcore)
-    .Case("nvptx", nvptx)
-    .Case("nvptx64", nvptx64)
-    .Case("le32", le32)
-    .Case("le64", le64)
-    .Case("amdil", amdil)
-    .Case("amdil64", amdil64)
-    .Case("hsail", hsail)
-    .Case("hsail64", hsail64)
-    .Case("spir", spir)
-    .Case("spir64", spir64)
-    .Case("kalimba", kalimba)
-    .Case("lanai", lanai)
-    .Case("shave", shave)
-    .Case("wasm32", wasm32)
-    .Case("wasm64", wasm64)
-    .Case("renderscript32", renderscript32)
-    .Case("renderscript64", renderscript64)
-    .Case("ve", ve)
-    .Case("csky", csky)
-    .Default(UnknownArch);
-}
-
-static Triple::ArchType parseARMArch(StringRef ArchName) {
-  ARM::ISAKind ISA = ARM::parseArchISA(ArchName);
-  ARM::EndianKind ENDIAN = ARM::parseArchEndian(ArchName);
-
-  Triple::ArchType arch = Triple::UnknownArch;
-  switch (ENDIAN) {
-  case ARM::EndianKind::LITTLE: {
-    switch (ISA) {
-    case ARM::ISAKind::ARM:
-      arch = Triple::arm;
-      break;
-    case ARM::ISAKind::THUMB:
-      arch = Triple::thumb;
-      break;
-    case ARM::ISAKind::AARCH64:
-      arch = Triple::aarch64;
-      break;
-    case ARM::ISAKind::INVALID:
-      break;
-    }
-    break;
-  }
-  case ARM::EndianKind::BIG: {
-    switch (ISA) {
-    case ARM::ISAKind::ARM:
-      arch = Triple::armeb;
-      break;
-    case ARM::ISAKind::THUMB:
-      arch = Triple::thumbeb;
-      break;
-    case ARM::ISAKind::AARCH64:
-      arch = Triple::aarch64_be;
-      break;
-    case ARM::ISAKind::INVALID:
-      break;
-    }
-    break;
-  }
-  case ARM::EndianKind::INVALID: {
-    break;
-  }
-  }
-
-  ArchName = ARM::getCanonicalArchName(ArchName);
-  if (ArchName.empty())
-    return Triple::UnknownArch;
-
-  // Thumb only exists in v4+
-  if (ISA == ARM::ISAKind::THUMB &&
-      (ArchName.startswith("v2") || ArchName.startswith("v3")))
-    return Triple::UnknownArch;
-
-  // Thumb only for v6m
-  ARM::ProfileKind Profile = ARM::parseArchProfile(ArchName);
-  unsigned Version = ARM::parseArchVersion(ArchName);
-  if (Profile == ARM::ProfileKind::M && Version == 6) {
-    if (ENDIAN == ARM::EndianKind::BIG)
-      return Triple::thumbeb;
-    else
-      return Triple::thumb;
-  }
-
-  return arch;
-}
-
-static Triple::ArchType parseArch(StringRef ArchName) {
-  auto AT = StringSwitch<Triple::ArchType>(ArchName)
-    .Cases("i386", "i486", "i586", "i686", Triple::x86)
-    // FIXME: Do we need to support these?
-    .Cases("i786", "i886", "i986", Triple::x86)
-    .Cases("amd64", "x86_64", "x86_64h", Triple::x86_64)
-    .Cases("powerpc", "powerpcspe", "ppc", "ppc32", Triple::ppc)
-    .Cases("powerpcle", "ppcle", "ppc32le", Triple::ppcle)
-    .Cases("powerpc64", "ppu", "ppc64", Triple::ppc64)
-    .Cases("powerpc64le", "ppc64le", Triple::ppc64le)
-    .Case("xscale", Triple::arm)
-    .Case("xscaleeb", Triple::armeb)
-    .Case("aarch64", Triple::aarch64)
-    .Case("aarch64_be", Triple::aarch64_be)
-    .Case("aarch64_32", Triple::aarch64_32)
-    .Case("arc", Triple::arc)
-    .Case("arm64", Triple::aarch64)
-    .Case("arm64_32", Triple::aarch64_32)
-    .Case("arm64e", Triple::aarch64)
-    .Case("arm", Triple::arm)
-    .Case("armeb", Triple::armeb)
-    .Case("thumb", Triple::thumb)
-    .Case("thumbeb", Triple::thumbeb)
-    .Case("avr", Triple::avr)
-    .Case("m68k", Triple::m68k)
-    .Case("msp430", Triple::msp430)
-    .Cases("mips", "mipseb", "mipsallegrex", "mipsisa32r6",
-           "mipsr6", Triple::mips)
-    .Cases("mipsel", "mipsallegrexel", "mipsisa32r6el", "mipsr6el",
-           Triple::mipsel)
-    .Cases("mips64", "mips64eb", "mipsn32", "mipsisa64r6",
-           "mips64r6", "mipsn32r6", Triple::mips64)
-    .Cases("mips64el", "mipsn32el", "mipsisa64r6el", "mips64r6el",
-           "mipsn32r6el", Triple::mips64el)
-    .Case("r600", Triple::r600)
-    .Case("amdgcn", Triple::amdgcn)
-    .Case("riscv32", Triple::riscv32)
-    .Case("riscv64", Triple::riscv64)
-    .Case("hexagon", Triple::hexagon)
-    .Cases("s390x", "systemz", Triple::systemz)
-    .Case("sparc", Triple::sparc)
-    .Case("sparcel", Triple::sparcel)
-    .Cases("sparcv9", "sparc64", Triple::sparcv9)
-    .Case("tce", Triple::tce)
-    .Case("tcele", Triple::tcele)
-    .Case("xcore", Triple::xcore)
-    .Case("nvptx", Triple::nvptx)
-    .Case("nvptx64", Triple::nvptx64)
-    .Case("le32", Triple::le32)
-    .Case("le64", Triple::le64)
-    .Case("amdil", Triple::amdil)
-    .Case("amdil64", Triple::amdil64)
-    .Case("hsail", Triple::hsail)
-    .Case("hsail64", Triple::hsail64)
-    .Case("spir", Triple::spir)
-    .Case("spir64", Triple::spir64)
-    .StartsWith("kalimba", Triple::kalimba)
-    .Case("lanai", Triple::lanai)
-    .Case("renderscript32", Triple::renderscript32)
-    .Case("renderscript64", Triple::renderscript64)
-    .Case("shave", Triple::shave)
-    .Case("ve", Triple::ve)
-    .Case("wasm32", Triple::wasm32)
-    .Case("wasm64", Triple::wasm64)
-    .Case("csky", Triple::csky)
-    .Default(Triple::UnknownArch);
-
-  // Some architectures require special parsing logic just to compute the
-  // ArchType result.
-  if (AT == Triple::UnknownArch) {
-    if (ArchName.startswith("arm") || ArchName.startswith("thumb") ||
-        ArchName.startswith("aarch64"))
-      return parseARMArch(ArchName);
-    if (ArchName.startswith("bpf"))
-      return parseBPFArch(ArchName);
-  }
-
-  return AT;
-}
-
-static Triple::VendorType parseVendor(StringRef VendorName) {
-  return StringSwitch<Triple::VendorType>(VendorName)
-    .Case("apple", Triple::Apple)
-    .Case("pc", Triple::PC)
-    .Case("scei", Triple::SCEI)
-    .Case("sie", Triple::SCEI)
-    .Case("fsl", Triple::Freescale)
-    .Case("ibm", Triple::IBM)
-    .Case("img", Triple::ImaginationTechnologies)
-    .Case("mti", Triple::MipsTechnologies)
-    .Case("nvidia", Triple::NVIDIA)
-    .Case("csr", Triple::CSR)
-    .Case("myriad", Triple::Myriad)
-    .Case("amd", Triple::AMD)
-    .Case("mesa", Triple::Mesa)
-    .Case("suse", Triple::SUSE)
-    .Case("oe", Triple::OpenEmbedded)
-    .Default(Triple::UnknownVendor);
-}
-
-static Triple::OSType parseOS(StringRef OSName) {
-  return StringSwitch<Triple::OSType>(OSName)
-    .StartsWith("ananas", Triple::Ananas)
-    .StartsWith("cloudabi", Triple::CloudABI)
-    .StartsWith("darwin", Triple::Darwin)
-    .StartsWith("dragonfly", Triple::DragonFly)
-    .StartsWith("freebsd", Triple::FreeBSD)
-    .StartsWith("fuchsia", Triple::Fuchsia)
-    .StartsWith("ios", Triple::IOS)
-    .StartsWith("kfreebsd", Triple::KFreeBSD)
-    .StartsWith("linux", Triple::Linux)
-    .StartsWith("lv2", Triple::Lv2)
-    .StartsWith("macos", Triple::MacOSX)
-    .StartsWith("netbsd", Triple::NetBSD)
-    .StartsWith("openbsd", Triple::OpenBSD)
-    .StartsWith("solaris", Triple::Solaris)
-    .StartsWith("win32", Triple::Win32)
-    .StartsWith("windows", Triple::Win32)
-    .StartsWith("zos", Triple::ZOS)
-    .StartsWith("haiku", Triple::Haiku)
-    .StartsWith("minix", Triple::Minix)
-    .StartsWith("rtems", Triple::RTEMS)
-    .StartsWith("nacl", Triple::NaCl)
-    .StartsWith("aix", Triple::AIX)
-    .StartsWith("cuda", Triple::CUDA)
-    .StartsWith("nvcl", Triple::NVCL)
-    .StartsWith("amdhsa", Triple::AMDHSA)
-    .StartsWith("ps4", Triple::PS4)
-    .StartsWith("elfiamcu", Triple::ELFIAMCU)
-    .StartsWith("tvos", Triple::TvOS)
-    .StartsWith("watchos", Triple::WatchOS)
-    .StartsWith("mesa3d", Triple::Mesa3D)
-    .StartsWith("contiki", Triple::Contiki)
-    .StartsWith("amdpal", Triple::AMDPAL)
-    .StartsWith("hermit", Triple::HermitCore)
-    .StartsWith("hurd", Triple::Hurd)
-    .StartsWith("wasi", Triple::WASI)
-    .StartsWith("emscripten", Triple::Emscripten)
-    .Default(Triple::UnknownOS);
-}
-
-static Triple::EnvironmentType parseEnvironment(StringRef EnvironmentName) {
-  return StringSwitch<Triple::EnvironmentType>(EnvironmentName)
-      .StartsWith("eabihf", Triple::EABIHF)
-      .StartsWith("eabi", Triple::EABI)
-      .StartsWith("gnuabin32", Triple::GNUABIN32)
-      .StartsWith("gnuabi64", Triple::GNUABI64)
-      .StartsWith("gnueabihf", Triple::GNUEABIHF)
-      .StartsWith("gnueabi", Triple::GNUEABI)
-      .StartsWith("gnux32", Triple::GNUX32)
-      .StartsWith("gnu_ilp32", Triple::GNUILP32)
-      .StartsWith("code16", Triple::CODE16)
-      .StartsWith("gnu", Triple::GNU)
-      .StartsWith("android", Triple::Android)
-      .StartsWith("musleabihf", Triple::MuslEABIHF)
-      .StartsWith("musleabi", Triple::MuslEABI)
-      .StartsWith("muslx32", Triple::MuslX32)
-      .StartsWith("musl", Triple::Musl)
-      .StartsWith("msvc", Triple::MSVC)
-      .StartsWith("itanium", Triple::Itanium)
-      .StartsWith("cygnus", Triple::Cygnus)
-      .StartsWith("coreclr", Triple::CoreCLR)
-      .StartsWith("simulator", Triple::Simulator)
-      .StartsWith("macabi", Triple::MacABI)
-      .Default(Triple::UnknownEnvironment);
-}
-
-static Triple::ObjectFormatType parseFormat(StringRef EnvironmentName) {
-  return StringSwitch<Triple::ObjectFormatType>(EnvironmentName)
-    // "xcoff" must come before "coff" because of the order-dependendent
-    // pattern matching.
-    .EndsWith("xcoff", Triple::XCOFF)
-    .EndsWith("coff", Triple::COFF)
-    .EndsWith("elf", Triple::ELF)
-    .EndsWith("goff", Triple::GOFF)
-    .EndsWith("macho", Triple::MachO)
-    .EndsWith("wasm", Triple::Wasm)
-    .Default(Triple::UnknownObjectFormat);
-}
-
-static Triple::SubArchType parseSubArch(StringRef SubArchName) {
-  if (SubArchName.startswith("mips") &&
-      (SubArchName.endswith("r6el") || SubArchName.endswith("r6")))
-    return Triple::MipsSubArch_r6;
-
-  if (SubArchName == "powerpcspe")
-    return Triple::PPCSubArch_spe;
-
-  if (SubArchName == "arm64e")
-    return Triple::AArch64SubArch_arm64e;
-
-  StringRef ARMSubArch = ARM::getCanonicalArchName(SubArchName);
-
-  // For now, this is the small part. Early return.
-  if (ARMSubArch.empty())
-    return StringSwitch<Triple::SubArchType>(SubArchName)
-      .EndsWith("kalimba3", Triple::KalimbaSubArch_v3)
-      .EndsWith("kalimba4", Triple::KalimbaSubArch_v4)
-      .EndsWith("kalimba5", Triple::KalimbaSubArch_v5)
-      .Default(Triple::NoSubArch);
-
-  // ARM sub arch.
-  switch(ARM::parseArch(ARMSubArch)) {
-  case ARM::ArchKind::ARMV4:
-    return Triple::NoSubArch;
-  case ARM::ArchKind::ARMV4T:
-    return Triple::ARMSubArch_v4t;
-  case ARM::ArchKind::ARMV5T:
-    return Triple::ARMSubArch_v5;
-  case ARM::ArchKind::ARMV5TE:
-  case ARM::ArchKind::IWMMXT:
-  case ARM::ArchKind::IWMMXT2:
-  case ARM::ArchKind::XSCALE:
-  case ARM::ArchKind::ARMV5TEJ:
-    return Triple::ARMSubArch_v5te;
-  case ARM::ArchKind::ARMV6:
-    return Triple::ARMSubArch_v6;
-  case ARM::ArchKind::ARMV6K:
-  case ARM::ArchKind::ARMV6KZ:
-    return Triple::ARMSubArch_v6k;
-  case ARM::ArchKind::ARMV6T2:
-    return Triple::ARMSubArch_v6t2;
-  case ARM::ArchKind::ARMV6M:
-    return Triple::ARMSubArch_v6m;
-  case ARM::ArchKind::ARMV7A:
-  case ARM::ArchKind::ARMV7R:
-    return Triple::ARMSubArch_v7;
-  case ARM::ArchKind::ARMV7VE:
-    return Triple::ARMSubArch_v7ve;
-  case ARM::ArchKind::ARMV7K:
-    return Triple::ARMSubArch_v7k;
-  case ARM::ArchKind::ARMV7M:
-    return Triple::ARMSubArch_v7m;
-  case ARM::ArchKind::ARMV7S:
-    return Triple::ARMSubArch_v7s;
-  case ARM::ArchKind::ARMV7EM:
-    return Triple::ARMSubArch_v7em;
-  case ARM::ArchKind::ARMV8A:
-    return Triple::ARMSubArch_v8;
-  case ARM::ArchKind::ARMV8_1A:
-    return Triple::ARMSubArch_v8_1a;
-  case ARM::ArchKind::ARMV8_2A:
-    return Triple::ARMSubArch_v8_2a;
-  case ARM::ArchKind::ARMV8_3A:
-    return Triple::ARMSubArch_v8_3a;
-  case ARM::ArchKind::ARMV8_4A:
-    return Triple::ARMSubArch_v8_4a;
-  case ARM::ArchKind::ARMV8_5A:
-    return Triple::ARMSubArch_v8_5a;
-  case ARM::ArchKind::ARMV8_6A:
-    return Triple::ARMSubArch_v8_6a;
-  case ARM::ArchKind::ARMV8_7A:
-    return Triple::ARMSubArch_v8_7a;
-  case ARM::ArchKind::ARMV8R:
-    return Triple::ARMSubArch_v8r;
-  case ARM::ArchKind::ARMV8MBaseline:
-    return Triple::ARMSubArch_v8m_baseline;
-  case ARM::ArchKind::ARMV8MMainline:
-    return Triple::ARMSubArch_v8m_mainline;
-  case ARM::ArchKind::ARMV8_1MMainline:
-    return Triple::ARMSubArch_v8_1m_mainline;
-  default:
-    return Triple::NoSubArch;
-  }
-}
-
-static StringRef getObjectFormatTypeName(Triple::ObjectFormatType Kind) {
-  switch (Kind) {
-  case Triple::UnknownObjectFormat: return "";
-  case Triple::COFF:  return "coff";
-  case Triple::ELF:   return "elf";
-  case Triple::GOFF:  return "goff";
-  case Triple::MachO: return "macho";
-  case Triple::Wasm:  return "wasm";
-  case Triple::XCOFF: return "xcoff";
-  }
-  llvm_unreachable("unknown object format type");
-}
-
-static Triple::ObjectFormatType getDefaultFormat(const Triple &T) {
-  switch (T.getArch()) {
-  case Triple::UnknownArch:
-  case Triple::aarch64:
-  case Triple::aarch64_32:
-  case Triple::arm:
-  case Triple::thumb:
-  case Triple::x86:
-  case Triple::x86_64:
-    if (T.isOSDarwin())
-      return Triple::MachO;
-    else if (T.isOSWindows())
-      return Triple::COFF;
-    return Triple::ELF;
-
-  case Triple::aarch64_be:
-  case Triple::amdgcn:
-  case Triple::amdil64:
-  case Triple::amdil:
-  case Triple::arc:
-  case Triple::armeb:
-  case Triple::avr:
-  case Triple::bpfeb:
-  case Triple::bpfel:
-  case Triple::csky:
-  case Triple::hexagon:
-  case Triple::hsail64:
-  case Triple::hsail:
-  case Triple::kalimba:
-  case Triple::lanai:
-  case Triple::le32:
-  case Triple::le64:
-  case Triple::m68k:
-  case Triple::mips64:
-  case Triple::mips64el:
-  case Triple::mips:
-  case Triple::mipsel:
-  case Triple::msp430:
-  case Triple::nvptx64:
-  case Triple::nvptx:
-  case Triple::ppc64le:
-  case Triple::ppcle:
-  case Triple::r600:
-  case Triple::renderscript32:
-  case Triple::renderscript64:
-  case Triple::riscv32:
-  case Triple::riscv64:
-  case Triple::shave:
-  case Triple::sparc:
-  case Triple::sparcel:
-  case Triple::sparcv9:
-  case Triple::spir64:
-  case Triple::spir:
-  case Triple::tce:
-  case Triple::tcele:
-  case Triple::thumbeb:
-  case Triple::ve:
-  case Triple::xcore:
-    return Triple::ELF;
-
-  case Triple::ppc64:
-  case Triple::ppc:
-    if (T.isOSAIX())
-      return Triple::XCOFF;
-    return Triple::ELF;
-
-  case Triple::systemz:
-    if (T.isOSzOS())
-      return Triple::GOFF;
-    return Triple::ELF;
-
-  case Triple::wasm32:
-  case Triple::wasm64:
-    return Triple::Wasm;
-  }
-  llvm_unreachable("unknown architecture");
-}
-
-/// Construct a triple from the string representation provided.
-///
-/// This stores the string representation and parses the various pieces into
-/// enum members.
-Triple::Triple(const Twine &Str)
-    : Data(Str.str()), Arch(UnknownArch), SubArch(NoSubArch),
-      Vendor(UnknownVendor), OS(UnknownOS), Environment(UnknownEnvironment),
-      ObjectFormat(UnknownObjectFormat) {
-  // Do minimal parsing by hand here.
-  SmallVector<StringRef, 4> Components;
-  StringRef(Data).split(Components, '-', /*MaxSplit*/ 3);
-  if (Components.size() > 0) {
-    Arch = parseArch(Components[0]);
-    SubArch = parseSubArch(Components[0]);
-    if (Components.size() > 1) {
-      Vendor = parseVendor(Components[1]);
-      if (Components.size() > 2) {
-        OS = parseOS(Components[2]);
-        if (Components.size() > 3) {
-          Environment = parseEnvironment(Components[3]);
-          ObjectFormat = parseFormat(Components[3]);
-        }
-      }
-    } else {
-      Environment =
-          StringSwitch<Triple::EnvironmentType>(Components[0])
-              .StartsWith("mipsn32", Triple::GNUABIN32)
-              .StartsWith("mips64", Triple::GNUABI64)
-              .StartsWith("mipsisa64", Triple::GNUABI64)
-              .StartsWith("mipsisa32", Triple::GNU)
-              .Cases("mips", "mipsel", "mipsr6", "mipsr6el", Triple::GNU)
-              .Default(UnknownEnvironment);
-    }
-  }
-  if (ObjectFormat == UnknownObjectFormat)
-    ObjectFormat = getDefaultFormat(*this);
-}
-
-/// Construct a triple from string representations of the architecture,
-/// vendor, and OS.
-///
-/// This joins each argument into a canonical string representation and parses
-/// them into enum members. It leaves the environment unknown and omits it from
-/// the string representation.
-Triple::Triple(const Twine &ArchStr, const Twine &VendorStr, const Twine &OSStr)
-    : Data((ArchStr + Twine('-') + VendorStr + Twine('-') + OSStr).str()),
-      Arch(parseArch(ArchStr.str())),
-      SubArch(parseSubArch(ArchStr.str())),
-      Vendor(parseVendor(VendorStr.str())),
-      OS(parseOS(OSStr.str())),
-      Environment(), ObjectFormat(Triple::UnknownObjectFormat) {
-  ObjectFormat = getDefaultFormat(*this);
-}
-
-/// Construct a triple from string representations of the architecture,
-/// vendor, OS, and environment.
-///
-/// This joins each argument into a canonical string representation and parses
-/// them into enum members.
-Triple::Triple(const Twine &ArchStr, const Twine &VendorStr, const Twine &OSStr,
-               const Twine &EnvironmentStr)
-    : Data((ArchStr + Twine('-') + VendorStr + Twine('-') + OSStr + Twine('-') +
-            EnvironmentStr).str()),
-      Arch(parseArch(ArchStr.str())),
-      SubArch(parseSubArch(ArchStr.str())),
-      Vendor(parseVendor(VendorStr.str())),
-      OS(parseOS(OSStr.str())),
-      Environment(parseEnvironment(EnvironmentStr.str())),
-      ObjectFormat(parseFormat(EnvironmentStr.str())) {
-  if (ObjectFormat == Triple::UnknownObjectFormat)
-    ObjectFormat = getDefaultFormat(*this);
-}
-
-std::string Triple::normalize(StringRef Str) {
-  bool IsMinGW32 = false;
-  bool IsCygwin = false;
-
-  // Parse into components.
-  SmallVector<StringRef, 4> Components;
-  Str.split(Components, '-');
-
-  // If the first component corresponds to a known architecture, preferentially
-  // use it for the architecture.  If the second component corresponds to a
-  // known vendor, preferentially use it for the vendor, etc.  This avoids silly
-  // component movement when a component parses as (eg) both a valid arch and a
-  // valid os.
-  ArchType Arch = UnknownArch;
-  if (Components.size() > 0)
-    Arch = parseArch(Components[0]);
-  VendorType Vendor = UnknownVendor;
-  if (Components.size() > 1)
-    Vendor = parseVendor(Components[1]);
-  OSType OS = UnknownOS;
-  if (Components.size() > 2) {
-    OS = parseOS(Components[2]);
-    IsCygwin = Components[2].startswith("cygwin");
-    IsMinGW32 = Components[2].startswith("mingw");
-  }
-  EnvironmentType Environment = UnknownEnvironment;
-  if (Components.size() > 3)
-    Environment = parseEnvironment(Components[3]);
-  ObjectFormatType ObjectFormat = UnknownObjectFormat;
-  if (Components.size() > 4)
-    ObjectFormat = parseFormat(Components[4]);
-
-  // Note which components are already in their final position.  These will not
-  // be moved.
-  bool Found[4];
-  Found[0] = Arch != UnknownArch;
-  Found[1] = Vendor != UnknownVendor;
-  Found[2] = OS != UnknownOS;
-  Found[3] = Environment != UnknownEnvironment;
-
-  // If they are not there already, permute the components into their canonical
-  // positions by seeing if they parse as a valid architecture, and if so moving
-  // the component to the architecture position etc.
-  for (unsigned Pos = 0; Pos != array_lengthof(Found); ++Pos) {
-    if (Found[Pos])
-      continue; // Already in the canonical position.
-
-    for (unsigned Idx = 0; Idx != Components.size(); ++Idx) {
-      // Do not reparse any components that already matched.
-      if (Idx < array_lengthof(Found) && Found[Idx])
-        continue;
-
-      // Does this component parse as valid for the target position?
-      bool Valid = false;
-      StringRef Comp = Components[Idx];
-      switch (Pos) {
-      default: llvm_unreachable("unexpected component type!");
-      case 0:
-        Arch = parseArch(Comp);
-        Valid = Arch != UnknownArch;
-        break;
-      case 1:
-        Vendor = parseVendor(Comp);
-        Valid = Vendor != UnknownVendor;
-        break;
-      case 2:
-        OS = parseOS(Comp);
-        IsCygwin = Comp.startswith("cygwin");
-        IsMinGW32 = Comp.startswith("mingw");
-        Valid = OS != UnknownOS || IsCygwin || IsMinGW32;
-        break;
-      case 3:
-        Environment = parseEnvironment(Comp);
-        Valid = Environment != UnknownEnvironment;
-        if (!Valid) {
-          ObjectFormat = parseFormat(Comp);
-          Valid = ObjectFormat != UnknownObjectFormat;
-        }
-        break;
-      }
-      if (!Valid)
-        continue; // Nope, try the next component.
-
-      // Move the component to the target position, pushing any non-fixed
-      // components that are in the way to the right.  This tends to give
-      // good results in the common cases of a forgotten vendor component
-      // or a wrongly positioned environment.
-      if (Pos < Idx) {
-        // Insert left, pushing the existing components to the right.  For
-        // example, a-b-i386 -> i386-a-b when moving i386 to the front.
-        StringRef CurrentComponent(""); // The empty component.
-        // Replace the component we are moving with an empty component.
-        std::swap(CurrentComponent, Components[Idx]);
-        // Insert the component being moved at Pos, displacing any existing
-        // components to the right.
-        for (unsigned i = Pos; !CurrentComponent.empty(); ++i) {
-          // Skip over any fixed components.
-          while (i < array_lengthof(Found) && Found[i])
-            ++i;
-          // Place the component at the new position, getting the component
-          // that was at this position - it will be moved right.
-          std::swap(CurrentComponent, Components[i]);
-        }
-      } else if (Pos > Idx) {
-        // Push right by inserting empty components until the component at Idx
-        // reaches the target position Pos.  For example, pc-a -> -pc-a when
-        // moving pc to the second position.
-        do {
-          // Insert one empty component at Idx.
-          StringRef CurrentComponent(""); // The empty component.
-          for (unsigned i = Idx; i < Components.size();) {
-            // Place the component at the new position, getting the component
-            // that was at this position - it will be moved right.
-            std::swap(CurrentComponent, Components[i]);
-            // If it was placed on top of an empty component then we are done.
-            if (CurrentComponent.empty())
-              break;
-            // Advance to the next component, skipping any fixed components.
-            while (++i < array_lengthof(Found) && Found[i])
-              ;
-          }
-          // The last component was pushed off the end - append it.
-          if (!CurrentComponent.empty())
-            Components.push_back(CurrentComponent);
-
-          // Advance Idx to the component's new position.
-          while (++Idx < array_lengthof(Found) && Found[Idx])
-            ;
-        } while (Idx < Pos); // Add more until the final position is reached.
-      }
-      assert(Pos < Components.size() && Components[Pos] == Comp &&
-             "Component moved wrong!");
-      Found[Pos] = true;
-      break;
-    }
-  }
-
-  // Replace empty components with "unknown" value.
-  for (unsigned i = 0, e = Components.size(); i < e; ++i) {
-    if (Components[i].empty())
-      Components[i] = "unknown";
-  }
-
-  // Special case logic goes here.  At this point Arch, Vendor and OS have the
-  // correct values for the computed components.
-  std::string NormalizedEnvironment;
-  if (Environment == Triple::Android && Components[3].startswith("androideabi")) {
-    StringRef AndroidVersion = Components[3].drop_front(strlen("androideabi"));
-    if (AndroidVersion.empty()) {
-      Components[3] = "android";
-    } else {
-      NormalizedEnvironment = Twine("android", AndroidVersion).str();
-      Components[3] = NormalizedEnvironment;
-    }
-  }
-
-  // SUSE uses "gnueabi" to mean "gnueabihf"
-  if (Vendor == Triple::SUSE && Environment == llvm::Triple::GNUEABI)
-    Components[3] = "gnueabihf";
-
-  if (OS == Triple::Win32) {
-    Components.resize(4);
-    Components[2] = "windows";
-    if (Environment == UnknownEnvironment) {
-      if (ObjectFormat == UnknownObjectFormat || ObjectFormat == Triple::COFF)
-        Components[3] = "msvc";
-      else
-        Components[3] = getObjectFormatTypeName(ObjectFormat);
-    }
-  } else if (IsMinGW32) {
-    Components.resize(4);
-    Components[2] = "windows";
-    Components[3] = "gnu";
-  } else if (IsCygwin) {
-    Components.resize(4);
-    Components[2] = "windows";
-    Components[3] = "cygnus";
-  }
-  if (IsMinGW32 || IsCygwin ||
-      (OS == Triple::Win32 && Environment != UnknownEnvironment)) {
-    if (ObjectFormat != UnknownObjectFormat && ObjectFormat != Triple::COFF) {
-      Components.resize(5);
-      Components[4] = getObjectFormatTypeName(ObjectFormat);
-    }
-  }
-
-  // Stick the corrected components back together to form the normalized string.
-  return join(Components, "-");
-}
-
-StringRef Triple::getArchName() const {
-  return StringRef(Data).split('-').first;           // Isolate first component
-}
-
-StringRef Triple::getVendorName() const {
-  StringRef Tmp = StringRef(Data).split('-').second; // Strip first component
-  return Tmp.split('-').first;                       // Isolate second component
-}
-
-StringRef Triple::getOSName() const {
-  StringRef Tmp = StringRef(Data).split('-').second; // Strip first component
-  Tmp = Tmp.split('-').second;                       // Strip second component
-  return Tmp.split('-').first;                       // Isolate third component
-}
-
-StringRef Triple::getEnvironmentName() const {
-  StringRef Tmp = StringRef(Data).split('-').second; // Strip first component
-  Tmp = Tmp.split('-').second;                       // Strip second component
-  return Tmp.split('-').second;                      // Strip third component
-}
-
-StringRef Triple::getOSAndEnvironmentName() const {
-  StringRef Tmp = StringRef(Data).split('-').second; // Strip first component
-  return Tmp.split('-').second;                      // Strip second component
-}
-
-static unsigned EatNumber(StringRef &Str) {
-  assert(!Str.empty() && isDigit(Str[0]) && "Not a number");
-  unsigned Result = 0;
-
-  do {
-    // Consume the leading digit.
-    Result = Result*10 + (Str[0] - '0');
-
-    // Eat the digit.
-    Str = Str.substr(1);
-  } while (!Str.empty() && isDigit(Str[0]));
-
-  return Result;
-}
-
-static void parseVersionFromName(StringRef Name, unsigned &Major,
-                                 unsigned &Minor, unsigned &Micro) {
-  // Any unset version defaults to 0.
-  Major = Minor = Micro = 0;
-
-  // Parse up to three components.
-  unsigned *Components[3] = {&Major, &Minor, &Micro};
-  for (unsigned i = 0; i != 3; ++i) {
-    if (Name.empty() || Name[0] < '0' || Name[0] > '9')
-      break;
-
-    // Consume the leading number.
-    *Components[i] = EatNumber(Name);
-
-    // Consume the separator, if present.
-    if (Name.startswith("."))
-      Name = Name.substr(1);
-  }
-}
-
-void Triple::getEnvironmentVersion(unsigned &Major, unsigned &Minor,
-                                   unsigned &Micro) const {
-  StringRef EnvironmentName = getEnvironmentName();
-  StringRef EnvironmentTypeName = getEnvironmentTypeName(getEnvironment());
-  if (EnvironmentName.startswith(EnvironmentTypeName))
-    EnvironmentName = EnvironmentName.substr(EnvironmentTypeName.size());
-
-  parseVersionFromName(EnvironmentName, Major, Minor, Micro);
-}
-
-void Triple::getOSVersion(unsigned &Major, unsigned &Minor,
-                          unsigned &Micro) const {
-  StringRef OSName = getOSName();
-  // Assume that the OS portion of the triple starts with the canonical name.
-  StringRef OSTypeName = getOSTypeName(getOS());
-  if (OSName.startswith(OSTypeName))
-    OSName = OSName.substr(OSTypeName.size());
-  else if (getOS() == MacOSX)
-    OSName.consume_front("macos");
-
-  parseVersionFromName(OSName, Major, Minor, Micro);
-}
-
-bool Triple::getMacOSXVersion(unsigned &Major, unsigned &Minor,
-                              unsigned &Micro) const {
-  getOSVersion(Major, Minor, Micro);
-
-  switch (getOS()) {
-  default: llvm_unreachable("unexpected OS for Darwin triple");
-  case Darwin:
-    // Default to darwin8, i.e., MacOSX 10.4.
-    if (Major == 0)
-      Major = 8;
-    // Darwin version numbers are skewed from OS X versions.
-    if (Major < 4)
-      return false;
-    if (Major <= 19) {
-      Micro = 0;
-      Minor = Major - 4;
-      Major = 10;
-    } else {
-      Micro = 0;
-      Minor = 0;
-      // darwin20+ corresponds to macOS 11+.
-      Major = 11 + Major - 20;
-    }
-    break;
-  case MacOSX:
-    // Default to 10.4.
-    if (Major == 0) {
-      Major = 10;
-      Minor = 4;
-    } else if (Major < 10)
-      return false;
-    break;
-  case IOS:
-  case TvOS:
-  case WatchOS:
-    // Ignore the version from the triple.  This is only handled because the
-    // the clang driver combines OS X and IOS support into a common Darwin
-    // toolchain that wants to know the OS X version number even when targeting
-    // IOS.
-    Major = 10;
-    Minor = 4;
-    Micro = 0;
-    break;
-  }
-  return true;
-}
-
-void Triple::getiOSVersion(unsigned &Major, unsigned &Minor,
-                           unsigned &Micro) const {
-  switch (getOS()) {
-  default: llvm_unreachable("unexpected OS for Darwin triple");
-  case Darwin:
-  case MacOSX:
-    // Ignore the version from the triple.  This is only handled because the
-    // the clang driver combines OS X and IOS support into a common Darwin
-    // toolchain that wants to know the iOS version number even when targeting
-    // OS X.
-    Major = 5;
-    Minor = 0;
-    Micro = 0;
-    break;
-  case IOS:
-  case TvOS:
-    getOSVersion(Major, Minor, Micro);
-    // Default to 5.0 (or 7.0 for arm64).
-    if (Major == 0)
-      Major = (getArch() == aarch64) ? 7 : 5;
-    break;
-  case WatchOS:
-    llvm_unreachable("conflicting triple info");
-  }
-}
-
-void Triple::getWatchOSVersion(unsigned &Major, unsigned &Minor,
-                               unsigned &Micro) const {
-  switch (getOS()) {
-  default: llvm_unreachable("unexpected OS for Darwin triple");
-  case Darwin:
-  case MacOSX:
-    // Ignore the version from the triple.  This is only handled because the
-    // the clang driver combines OS X and IOS support into a common Darwin
-    // toolchain that wants to know the iOS version number even when targeting
-    // OS X.
-    Major = 2;
-    Minor = 0;
-    Micro = 0;
-    break;
-  case WatchOS:
-    getOSVersion(Major, Minor, Micro);
-    if (Major == 0)
-      Major = 2;
-    break;
-  case IOS:
-    llvm_unreachable("conflicting triple info");
-  }
-}
-
-void Triple::setTriple(const Twine &Str) {
-  *this = Triple(Str);
-}
-
-void Triple::setArch(ArchType Kind) {
-  setArchName(getArchTypeName(Kind));
-}
-
-void Triple::setVendor(VendorType Kind) {
-  setVendorName(getVendorTypeName(Kind));
-}
-
-void Triple::setOS(OSType Kind) {
-  setOSName(getOSTypeName(Kind));
-}
-
-void Triple::setEnvironment(EnvironmentType Kind) {
-  if (ObjectFormat == getDefaultFormat(*this))
-    return setEnvironmentName(getEnvironmentTypeName(Kind));
-
-  setEnvironmentName((getEnvironmentTypeName(Kind) + Twine("-") +
-                      getObjectFormatTypeName(ObjectFormat)).str());
-}
-
-void Triple::setObjectFormat(ObjectFormatType Kind) {
-  if (Environment == UnknownEnvironment)
-    return setEnvironmentName(getObjectFormatTypeName(Kind));
-
-  setEnvironmentName((getEnvironmentTypeName(Environment) + Twine("-") +
-                      getObjectFormatTypeName(Kind)).str());
-}
-
-void Triple::setArchName(StringRef Str) {
-  // Work around a miscompilation bug for Twines in gcc 4.0.3.
-  SmallString<64> Triple;
-  Triple += Str;
-  Triple += "-";
-  Triple += getVendorName();
-  Triple += "-";
-  Triple += getOSAndEnvironmentName();
-  setTriple(Triple);
-}
-
-void Triple::setVendorName(StringRef Str) {
-  setTriple(getArchName() + "-" + Str + "-" + getOSAndEnvironmentName());
-}
-
-void Triple::setOSName(StringRef Str) {
-  if (hasEnvironment())
-    setTriple(getArchName() + "-" + getVendorName() + "-" + Str +
-              "-" + getEnvironmentName());
-  else
-    setTriple(getArchName() + "-" + getVendorName() + "-" + Str);
-}
-
-void Triple::setEnvironmentName(StringRef Str) {
-  setTriple(getArchName() + "-" + getVendorName() + "-" + getOSName() +
-            "-" + Str);
-}
-
-void Triple::setOSAndEnvironmentName(StringRef Str) {
-  setTriple(getArchName() + "-" + getVendorName() + "-" + Str);
-}
-
-static unsigned getArchPointerBitWidth(llvm::Triple::ArchType Arch) {
-  switch (Arch) {
-  case llvm::Triple::UnknownArch:
-    return 0;
-
-  case llvm::Triple::avr:
-  case llvm::Triple::msp430:
-    return 16;
-
-  case llvm::Triple::aarch64_32:
-  case llvm::Triple::amdil:
-  case llvm::Triple::arc:
-  case llvm::Triple::arm:
-  case llvm::Triple::armeb:
-  case llvm::Triple::csky:
-  case llvm::Triple::hexagon:
-  case llvm::Triple::hsail:
-  case llvm::Triple::kalimba:
-  case llvm::Triple::lanai:
-  case llvm::Triple::le32:
-  case llvm::Triple::m68k:
-  case llvm::Triple::mips:
-  case llvm::Triple::mipsel:
-  case llvm::Triple::nvptx:
-  case llvm::Triple::ppc:
-  case llvm::Triple::ppcle:
-  case llvm::Triple::r600:
-  case llvm::Triple::renderscript32:
-  case llvm::Triple::riscv32:
-  case llvm::Triple::shave:
-  case llvm::Triple::sparc:
-  case llvm::Triple::sparcel:
-  case llvm::Triple::spir:
-  case llvm::Triple::tce:
-  case llvm::Triple::tcele:
-  case llvm::Triple::thumb:
-  case llvm::Triple::thumbeb:
-  case llvm::Triple::wasm32:
-  case llvm::Triple::x86:
-  case llvm::Triple::xcore:
-    return 32;
-
-  case llvm::Triple::aarch64:
-  case llvm::Triple::aarch64_be:
-  case llvm::Triple::amdgcn:
-  case llvm::Triple::amdil64:
-  case llvm::Triple::bpfeb:
-  case llvm::Triple::bpfel:
-  case llvm::Triple::hsail64:
-  case llvm::Triple::le64:
-  case llvm::Triple::mips64:
-  case llvm::Triple::mips64el:
-  case llvm::Triple::nvptx64:
-  case llvm::Triple::ppc64:
-  case llvm::Triple::ppc64le:
-  case llvm::Triple::renderscript64:
-  case llvm::Triple::riscv64:
-  case llvm::Triple::sparcv9:
-  case llvm::Triple::spir64:
-  case llvm::Triple::systemz:
-  case llvm::Triple::ve:
-  case llvm::Triple::wasm64:
-  case llvm::Triple::x86_64:
-    return 64;
-  }
-  llvm_unreachable("Invalid architecture value");
-}
-
-bool Triple::isArch64Bit() const {
-  return getArchPointerBitWidth(getArch()) == 64;
-}
-
-bool Triple::isArch32Bit() const {
-  return getArchPointerBitWidth(getArch()) == 32;
-}
-
-bool Triple::isArch16Bit() const {
-  return getArchPointerBitWidth(getArch()) == 16;
-}
-
-Triple Triple::get32BitArchVariant() const {
-  Triple T(*this);
-  switch (getArch()) {
-  case Triple::UnknownArch:
-  case Triple::amdgcn:
-  case Triple::avr:
-  case Triple::bpfeb:
-  case Triple::bpfel:
-  case Triple::msp430:
-  case Triple::systemz:
-  case Triple::ve:
-    T.setArch(UnknownArch);
-    break;
-
-  case Triple::aarch64_32:
-  case Triple::amdil:
-  case Triple::arc:
-  case Triple::arm:
-  case Triple::armeb:
-  case Triple::csky:
-  case Triple::hexagon:
-  case Triple::hsail:
-  case Triple::kalimba:
-  case Triple::lanai:
-  case Triple::le32:
-  case Triple::m68k:
-  case Triple::mips:
-  case Triple::mipsel:
-  case Triple::nvptx:
-  case Triple::ppc:
-  case Triple::ppcle:
-  case Triple::r600:
-  case Triple::renderscript32:
-  case Triple::riscv32:
-  case Triple::shave:
-  case Triple::sparc:
-  case Triple::sparcel:
-  case Triple::spir:
-  case Triple::tce:
-  case Triple::tcele:
-  case Triple::thumb:
-  case Triple::thumbeb:
-  case Triple::wasm32:
-  case Triple::x86:
-  case Triple::xcore:
-    // Already 32-bit.
-    break;
-
-  case Triple::aarch64:        T.setArch(Triple::arm);     break;
-  case Triple::aarch64_be:     T.setArch(Triple::armeb);   break;
-  case Triple::amdil64:        T.setArch(Triple::amdil);   break;
-  case Triple::hsail64:        T.setArch(Triple::hsail);   break;
-  case Triple::le64:           T.setArch(Triple::le32);    break;
-  case Triple::mips64:         T.setArch(Triple::mips);    break;
-  case Triple::mips64el:       T.setArch(Triple::mipsel);  break;
-  case Triple::nvptx64:        T.setArch(Triple::nvptx);   break;
-  case Triple::ppc64:          T.setArch(Triple::ppc);     break;
-  case Triple::ppc64le:        T.setArch(Triple::ppcle);   break;
-  case Triple::renderscript64: T.setArch(Triple::renderscript32); break;
-  case Triple::riscv64:        T.setArch(Triple::riscv32); break;
-  case Triple::sparcv9:        T.setArch(Triple::sparc);   break;
-  case Triple::spir64:         T.setArch(Triple::spir);    break;
-  case Triple::wasm64:         T.setArch(Triple::wasm32);  break;
-  case Triple::x86_64:         T.setArch(Triple::x86);     break;
-  }
-  return T;
-}
-
-Triple Triple::get64BitArchVariant() const {
-  Triple T(*this);
-  switch (getArch()) {
-  case Triple::UnknownArch:
-  case Triple::arc:
-  case Triple::avr:
-  case Triple::csky:
-  case Triple::hexagon:
-  case Triple::kalimba:
-  case Triple::lanai:
-  case Triple::m68k:
-  case Triple::msp430:
-  case Triple::r600:
-  case Triple::shave:
-  case Triple::sparcel:
-  case Triple::tce:
-  case Triple::tcele:
-  case Triple::xcore:
-    T.setArch(UnknownArch);
-    break;
-
-  case Triple::aarch64:
-  case Triple::aarch64_be:
-  case Triple::amdgcn:
-  case Triple::amdil64:
-  case Triple::bpfeb:
-  case Triple::bpfel:
-  case Triple::hsail64:
-  case Triple::le64:
-  case Triple::mips64:
-  case Triple::mips64el:
-  case Triple::nvptx64:
-  case Triple::ppc64:
-  case Triple::ppc64le:
-  case Triple::renderscript64:
-  case Triple::riscv64:
-  case Triple::sparcv9:
-  case Triple::spir64:
-  case Triple::systemz:
-  case Triple::ve:
-  case Triple::wasm64:
-  case Triple::x86_64:
-    // Already 64-bit.
-    break;
-
-  case Triple::aarch64_32:      T.setArch(Triple::aarch64);    break;
-  case Triple::amdil:           T.setArch(Triple::amdil64);    break;
-  case Triple::arm:             T.setArch(Triple::aarch64);    break;
-  case Triple::armeb:           T.setArch(Triple::aarch64_be); break;
-  case Triple::hsail:           T.setArch(Triple::hsail64);    break;
-  case Triple::le32:            T.setArch(Triple::le64);       break;
-  case Triple::mips:            T.setArch(Triple::mips64);     break;
-  case Triple::mipsel:          T.setArch(Triple::mips64el);   break;
-  case Triple::nvptx:           T.setArch(Triple::nvptx64);    break;
-  case Triple::ppc:             T.setArch(Triple::ppc64);      break;
-  case Triple::ppcle:           T.setArch(Triple::ppc64le);    break;
-  case Triple::renderscript32:  T.setArch(Triple::renderscript64);     break;
-  case Triple::riscv32:         T.setArch(Triple::riscv64);    break;
-  case Triple::sparc:           T.setArch(Triple::sparcv9);    break;
-  case Triple::spir:            T.setArch(Triple::spir64);     break;
-  case Triple::thumb:           T.setArch(Triple::aarch64);    break;
-  case Triple::thumbeb:         T.setArch(Triple::aarch64_be); break;
-  case Triple::wasm32:          T.setArch(Triple::wasm64);     break;
-  case Triple::x86:             T.setArch(Triple::x86_64);     break;
-  }
-  return T;
-}
-
-Triple Triple::getBigEndianArchVariant() const {
-  Triple T(*this);
-  // Already big endian.
-  if (!isLittleEndian())
-    return T;
-  switch (getArch()) {
-  case Triple::UnknownArch:
-  case Triple::amdgcn:
-  case Triple::amdil64:
-  case Triple::amdil:
-  case Triple::avr:
-  case Triple::hexagon:
-  case Triple::hsail64:
-  case Triple::hsail:
-  case Triple::kalimba:
-  case Triple::le32:
-  case Triple::le64:
-  case Triple::msp430:
-  case Triple::nvptx64:
-  case Triple::nvptx:
-  case Triple::r600:
-  case Triple::renderscript32:
-  case Triple::renderscript64:
-  case Triple::riscv32:
-  case Triple::riscv64:
-  case Triple::shave:
-  case Triple::spir64:
-  case Triple::spir:
-  case Triple::wasm32:
-  case Triple::wasm64:
-  case Triple::x86:
-  case Triple::x86_64:
-  case Triple::xcore:
-  case Triple::ve:
-  case Triple::csky:
-
-  // ARM is intentionally unsupported here, changing the architecture would
-  // drop any arch suffixes.
-  case Triple::arm:
-  case Triple::thumb:
-    T.setArch(UnknownArch);
-    break;
-
-  case Triple::aarch64: T.setArch(Triple::aarch64_be); break;
-  case Triple::bpfel:   T.setArch(Triple::bpfeb);      break;
-  case Triple::mips64el:T.setArch(Triple::mips64);     break;
-  case Triple::mipsel:  T.setArch(Triple::mips);       break;
-  case Triple::ppcle:   T.setArch(Triple::ppc);        break;
-  case Triple::ppc64le: T.setArch(Triple::ppc64);      break;
-  case Triple::sparcel: T.setArch(Triple::sparc);      break;
-  case Triple::tcele:   T.setArch(Triple::tce);        break;
-  default:
-    llvm_unreachable("getBigEndianArchVariant: unknown triple.");
-  }
-  return T;
-}
-
-Triple Triple::getLittleEndianArchVariant() const {
-  Triple T(*this);
-  if (isLittleEndian())
-    return T;
-
-  switch (getArch()) {
-  case Triple::UnknownArch:
-  case Triple::lanai:
-  case Triple::sparcv9:
-  case Triple::systemz:
-  case Triple::m68k:
-
-  // ARM is intentionally unsupported here, changing the architecture would
-  // drop any arch suffixes.
-  case Triple::armeb:
-  case Triple::thumbeb:
-    T.setArch(UnknownArch);
-    break;
-
-  case Triple::aarch64_be: T.setArch(Triple::aarch64);  break;
-  case Triple::bpfeb:      T.setArch(Triple::bpfel);    break;
-  case Triple::mips64:     T.setArch(Triple::mips64el); break;
-  case Triple::mips:       T.setArch(Triple::mipsel);   break;
-  case Triple::ppc:        T.setArch(Triple::ppcle);    break;
-  case Triple::ppc64:      T.setArch(Triple::ppc64le);  break;
-  case Triple::sparc:      T.setArch(Triple::sparcel);  break;
-  case Triple::tce:        T.setArch(Triple::tcele);    break;
-  default:
-    llvm_unreachable("getLittleEndianArchVariant: unknown triple.");
-  }
-  return T;
-}
-
-bool Triple::isLittleEndian() const {
-  switch (getArch()) {
-  case Triple::aarch64:
-  case Triple::aarch64_32:
-  case Triple::amdgcn:
-  case Triple::amdil64:
-  case Triple::amdil:
-  case Triple::arm:
-  case Triple::avr:
-  case Triple::bpfel:
-  case Triple::csky:
-  case Triple::hexagon:
-  case Triple::hsail64:
-  case Triple::hsail:
-  case Triple::kalimba:
-  case Triple::le32:
-  case Triple::le64:
-  case Triple::mips64el:
-  case Triple::mipsel:
-  case Triple::msp430:
-  case Triple::nvptx64:
-  case Triple::nvptx:
-  case Triple::ppcle:
-  case Triple::ppc64le:
-  case Triple::r600:
-  case Triple::renderscript32:
-  case Triple::renderscript64:
-  case Triple::riscv32:
-  case Triple::riscv64:
-  case Triple::shave:
-  case Triple::sparcel:
-  case Triple::spir64:
-  case Triple::spir:
-  case Triple::tcele:
-  case Triple::thumb:
-  case Triple::ve:
-  case Triple::wasm32:
-  case Triple::wasm64:
-  case Triple::x86:
-  case Triple::x86_64:
-  case Triple::xcore:
-    return true;
-  default:
-    return false;
-  }
-}
-
-bool Triple::isCompatibleWith(const Triple &Other) const {
-  // ARM and Thumb triples are compatible, if subarch, vendor and OS match.
-  if ((getArch() == Triple::thumb && Other.getArch() == Triple::arm) ||
-      (getArch() == Triple::arm && Other.getArch() == Triple::thumb) ||
-      (getArch() == Triple::thumbeb && Other.getArch() == Triple::armeb) ||
-      (getArch() == Triple::armeb && Other.getArch() == Triple::thumbeb)) {
-    if (getVendor() == Triple::Apple)
-      return getSubArch() == Other.getSubArch() &&
-             getVendor() == Other.getVendor() && getOS() == Other.getOS();
-    else
-      return getSubArch() == Other.getSubArch() &&
-             getVendor() == Other.getVendor() && getOS() == Other.getOS() &&
-             getEnvironment() == Other.getEnvironment() &&
-             getObjectFormat() == Other.getObjectFormat();
-  }
-
-  // If vendor is apple, ignore the version number.
-  if (getVendor() == Triple::Apple)
-    return getArch() == Other.getArch() && getSubArch() == Other.getSubArch() &&
-           getVendor() == Other.getVendor() && getOS() == Other.getOS();
-
-  return *this == Other;
-}
-
-std::string Triple::merge(const Triple &Other) const {
-  // If vendor is apple, pick the triple with the larger version number.
-  if (getVendor() == Triple::Apple)
-    if (Other.isOSVersionLT(*this))
-      return str();
-
-  return Other.str();
-}
-
-bool Triple::isMacOSXVersionLT(unsigned Major, unsigned Minor,
-                               unsigned Micro) const {
-  assert(isMacOSX() && "Not an OS X triple!");
-
-  // If this is OS X, expect a sane version number.
-  if (getOS() == Triple::MacOSX)
-    return isOSVersionLT(Major, Minor, Micro);
-
-  // Otherwise, compare to the "Darwin" number.
-  if (Major == 10) {
-    return isOSVersionLT(Minor + 4, Micro, 0);
-  } else {
-    assert(Major >= 11 && "Unexpected major version");
-    return isOSVersionLT(Major - 11 + 20, Minor, Micro);
-  }
-}
-
-VersionTuple Triple::getMinimumSupportedOSVersion() const {
-  if (getVendor() != Triple::Apple || getArch() != Triple::aarch64)
-    return VersionTuple();
-  switch (getOS()) {
-  case Triple::MacOSX:
-    // ARM64 slice is supported starting from macOS 11.0+.
-    return VersionTuple(11, 0, 0);
-  case Triple::IOS:
-    // ARM64 slice is supported starting from Mac Catalyst 14 (macOS 11).
-    // ARM64 simulators are supported for iOS 14+.
-    if (isMacCatalystEnvironment() || isSimulatorEnvironment())
-      return VersionTuple(14, 0, 0);
-    // ARM64e slice is supported starting from iOS 14.
-    if (isArm64e())
-      return VersionTuple(14, 0, 0);
-    break;
-  case Triple::TvOS:
-    // ARM64 simulators are supported for tvOS 14+.
-    if (isSimulatorEnvironment())
-      return VersionTuple(14, 0, 0);
-    break;
-  case Triple::WatchOS:
-    // ARM64 simulators are supported for watchOS 7+.
-    if (isSimulatorEnvironment())
-      return VersionTuple(7, 0, 0);
-    break;
-  default:
-    break;
-  }
-  return VersionTuple();
-}
-
-StringRef Triple::getARMCPUForArch(StringRef MArch) const {
-  if (MArch.empty())
-    MArch = getArchName();
-  MArch = ARM::getCanonicalArchName(MArch);
-
-  // Some defaults are forced.
-  switch (getOS()) {
-  case llvm::Triple::FreeBSD:
-  case llvm::Triple::NetBSD:
-    if (!MArch.empty() && MArch == "v6")
-      return "arm1176jzf-s";
-    if (!MArch.empty() && MArch == "v7")
-      return "cortex-a8";
-    break;
-  case llvm::Triple::Win32:
-    // FIXME: this is invalid for WindowsCE
-    if (ARM::parseArchVersion(MArch) <= 7)
-      return "cortex-a9";
-    break;
-  case llvm::Triple::IOS:
-  case llvm::Triple::MacOSX:
-  case llvm::Triple::TvOS:
-  case llvm::Triple::WatchOS:
-    if (MArch == "v7k")
-      return "cortex-a7";
-    break;
-  default:
-    break;
-  }
-
-  if (MArch.empty())
-    return StringRef();
-
-  StringRef CPU = ARM::getDefaultCPU(MArch);
-  if (!CPU.empty() && !CPU.equals("invalid"))
-    return CPU;
-
-  // If no specific architecture version is requested, return the minimum CPU
-  // required by the OS and environment.
-  switch (getOS()) {
-  case llvm::Triple::NetBSD:
-    switch (getEnvironment()) {
-    case llvm::Triple::EABI:
-    case llvm::Triple::EABIHF:
-    case llvm::Triple::GNUEABI:
-    case llvm::Triple::GNUEABIHF:
-      return "arm926ej-s";
-    default:
-      return "strongarm";
-    }
-  case llvm::Triple::NaCl:
-  case llvm::Triple::OpenBSD:
-    return "cortex-a8";
-  default:
-    switch (getEnvironment()) {
-    case llvm::Triple::EABIHF:
-    case llvm::Triple::GNUEABIHF:
-    case llvm::Triple::MuslEABIHF:
-      return "arm1176jzf-s";
-    default:
-      return "arm7tdmi";
-    }
-  }
-
-  llvm_unreachable("invalid arch name");
-}
-
-VersionTuple Triple::getCanonicalVersionForOS(OSType OSKind,
-                                              const VersionTuple &Version) {
-  switch (OSKind) {
-  case MacOSX:
-    // macOS 10.16 is canonicalized to macOS 11.
-    if (Version == VersionTuple(10, 16))
-      return VersionTuple(11, 0);
-    LLVM_FALLTHROUGH;
-  default:
-    return Version;
-  }
-}
diff --git a/gnu/llvm/llvm/lib/Support/Unix/Host.inc b/gnu/llvm/llvm/lib/Support/Unix/Host.inc
deleted file mode 100644
index dfcfdd0dee6..00000000000
--- a/gnu/llvm/llvm/lib/Support/Unix/Host.inc
+++ /dev/null
@@ -1,84 +0,0 @@
-//===- llvm/Support/Unix/Host.inc -------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements the UNIX Host support.
-//
-//===----------------------------------------------------------------------===//
-
-//===----------------------------------------------------------------------===//
-//=== WARNING: Implementation here must contain only generic UNIX code that
-//===          is guaranteed to work on *all* UNIX variants.
-//===----------------------------------------------------------------------===//
-
-#include "Unix.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Config/config.h"
-#include <cctype>
-#include <string>
-#include <sys/utsname.h>
-
-using namespace llvm;
-
-static std::string getOSVersion() {
-  struct utsname info;
-
-  if (uname(&info))
-    return "";
-
-  return info.release;
-}
-
-static std::string updateTripleOSVersion(std::string TargetTripleString) {
-  // On darwin, we want to update the version to match that of the target.
-  std::string::size_type DarwinDashIdx = TargetTripleString.find("-darwin");
-  if (DarwinDashIdx != std::string::npos) {
-    TargetTripleString.resize(DarwinDashIdx + strlen("-darwin"));
-    TargetTripleString += getOSVersion();
-    return TargetTripleString;
-  }
-  std::string::size_type MacOSDashIdx = TargetTripleString.find("-macos");
-  if (MacOSDashIdx != std::string::npos) {
-    TargetTripleString.resize(MacOSDashIdx);
-    // Reset the OS to darwin as the OS version from `uname` doesn't use the
-    // macOS version scheme.
-    TargetTripleString += "-darwin";
-    TargetTripleString += getOSVersion();
-  }
-  // On AIX, the AIX version and release should be that of the current host
-  // unless if the version has already been specified.
-  if (Triple(LLVM_HOST_TRIPLE).getOS() == Triple::AIX) {
-    Triple TT(TargetTripleString);
-    if (TT.getOS() == Triple::AIX && !TT.getOSMajorVersion()) {
-      struct utsname name;
-      if (uname(&name) != -1) {
-        std::string NewOSName = std::string(Triple::getOSTypeName(Triple::AIX));
-        NewOSName += name.version;
-        NewOSName += '.';
-        NewOSName += name.release;
-        NewOSName += ".0.0";
-        TT.setOSName(NewOSName);
-        return TT.str();
-      }
-    }
-  }
-  return TargetTripleString;
-}
-
-std::string sys::getDefaultTargetTriple() {
-  std::string TargetTripleString =
-      updateTripleOSVersion(LLVM_DEFAULT_TARGET_TRIPLE);
-
-  // Override the default target with an environment variable named by
-  // LLVM_TARGET_TRIPLE_ENV.
-#if defined(LLVM_TARGET_TRIPLE_ENV)
-  if (const char *EnvTriple = std::getenv(LLVM_TARGET_TRIPLE_ENV))
-    TargetTripleString = EnvTriple;
-#endif
-
-  return TargetTripleString;
-}
diff --git a/gnu/llvm/llvm/lib/Support/Unix/Process.inc b/gnu/llvm/llvm/lib/Support/Unix/Process.inc
index 27d646793d7..5ce27a7c0aa 100644
--- a/gnu/llvm/llvm/lib/Support/Unix/Process.inc
+++ b/gnu/llvm/llvm/lib/Support/Unix/Process.inc
@@ -14,8 +14,8 @@
 #include "llvm/ADT/Hashing.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Config/config.h"
-#include "llvm/Support/ManagedStatic.h"
 #include <mutex>
+#include <optional>
 #if HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
@@ -41,10 +41,10 @@
 #include <malloc/malloc.h>
 #endif
 #ifdef HAVE_SYS_IOCTL_H
-#  include <sys/ioctl.h>
+#include <sys/ioctl.h>
 #endif
 #ifdef HAVE_TERMIOS_H
-#  include <termios.h>
+#include <termios.h>
 #endif
 
 //===----------------------------------------------------------------------===//
@@ -55,14 +55,15 @@
 using namespace llvm;
 using namespace sys;
 
-static std::pair<std::chrono::microseconds, std::chrono::microseconds> getRUsageTimes() {
+static std::pair<std::chrono::microseconds, std::chrono::microseconds>
+getRUsageTimes() {
 #if defined(HAVE_GETRUSAGE)
   struct rusage RU;
   ::getrusage(RUSAGE_SELF, &RU);
-  return { toDuration(RU.ru_utime), toDuration(RU.ru_stime) };
+  return {toDuration(RU.ru_utime), toDuration(RU.ru_stime)};
 #else
 #warning Cannot get usage times on this platform
-  return { std::chrono::microseconds::zero(), std::chrono::microseconds::zero() };
+  return {std::chrono::microseconds::zero(), std::chrono::microseconds::zero()};
 #endif
 }
 
@@ -100,7 +101,7 @@ size_t Process::GetMallocUsage() {
 #elif defined(HAVE_MALLOC_ZONE_STATISTICS) && defined(HAVE_MALLOC_MALLOC_H)
   malloc_statistics_t Stats;
   malloc_zone_statistics(malloc_default_zone(), &Stats);
-  return Stats.size_in_use;   // darwin
+  return Stats.size_in_use; // darwin
 #elif defined(HAVE_MALLCTL)
   size_t alloc, sz;
   sz = sizeof(size_t);
@@ -110,9 +111,9 @@ size_t Process::GetMallocUsage() {
 #elif defined(HAVE_SBRK)
   // Note this is only an approximation and more closely resembles
   // the value returned by mallinfo in the arena field.
-  static char *StartOfMemory = reinterpret_cast<char*>(::sbrk(0));
-  char *EndOfMemory = (char*)sbrk(0);
-  if (EndOfMemory != ((char*)-1) && StartOfMemory != ((char*)-1))
+  static char *StartOfMemory = reinterpret_cast<char *>(::sbrk(0));
+  char *EndOfMemory = (char *)sbrk(0);
+  if (EndOfMemory != ((char *)-1) && StartOfMemory != ((char *)-1))
     return EndOfMemory - StartOfMemory;
   return 0;
 #else
@@ -121,7 +122,8 @@ size_t Process::GetMallocUsage() {
 #endif
 }
 
-void Process::GetTimeUsage(TimePoint<> &elapsed, std::chrono::nanoseconds &user_time,
+void Process::GetTimeUsage(TimePoint<> &elapsed,
+                           std::chrono::nanoseconds &user_time,
                            std::chrono::nanoseconds &sys_time) {
   elapsed = std::chrono::system_clock::now();
   std::tie(user_time, sys_time) = getRUsageTimes();
@@ -150,10 +152,9 @@ void Process::PreventCoreFiles() {
   exception_port_t OriginalPorts[EXC_TYPES_COUNT];
   exception_behavior_t OriginalBehaviors[EXC_TYPES_COUNT];
   thread_state_flavor_t OriginalFlavors[EXC_TYPES_COUNT];
-  kern_return_t err =
-    task_get_exception_ports(mach_task_self(), EXC_MASK_ALL, OriginalMasks,
-                             &Count, OriginalPorts, OriginalBehaviors,
-                             OriginalFlavors);
+  kern_return_t err = task_get_exception_ports(
+      mach_task_self(), EXC_MASK_ALL, OriginalMasks, &Count, OriginalPorts,
+      OriginalBehaviors, OriginalFlavors);
   if (err == KERN_SUCCESS) {
     // replace each with MACH_PORT_NULL.
     for (unsigned i = 0; i != Count; ++i)
@@ -164,20 +165,20 @@ void Process::PreventCoreFiles() {
 
   // Disable crash reporting on Mac OS X 10.5
   signal(SIGABRT, _exit);
-  signal(SIGILL,  _exit);
-  signal(SIGFPE,  _exit);
+  signal(SIGILL, _exit);
+  signal(SIGFPE, _exit);
   signal(SIGSEGV, _exit);
-  signal(SIGBUS,  _exit);
+  signal(SIGBUS, _exit);
 #endif
 
   coreFilesPrevented = true;
 }
 
-Optional<std::string> Process::GetEnv(StringRef Name) {
+std::optional<std::string> Process::GetEnv(StringRef Name) {
   std::string NameStr = Name.str();
   const char *Val = ::getenv(NameStr.c_str());
   if (!Val)
-    return None;
+    return std::nullopt;
   return std::string(Val);
 }
 
@@ -198,7 +199,7 @@ private:
   int &FD;
   bool KeepOpen;
 };
-}
+} // namespace
 
 std::error_code Process::FixupStandardFileDescriptors() {
   int NullFD = -1;
@@ -240,7 +241,7 @@ std::error_code Process::SafelyCloseFileDescriptor(int FD) {
   if (sigfillset(&FullSet) < 0 || sigfillset(&SavedSet) < 0)
     return std::error_code(errno, std::generic_category());
 
-  // Atomically swap our current signal mask with a full mask.
+    // Atomically swap our current signal mask with a full mask.
 #if LLVM_ENABLE_THREADS
   if (int EC = pthread_sigmask(SIG_SETMASK, &FullSet, &SavedSet))
     return std::error_code(EC, std::generic_category());
@@ -327,9 +328,22 @@ extern "C" int del_curterm(struct term *termp);
 extern "C" int tigetnum(char *capname);
 #endif
 
-#ifdef LLVM_ENABLE_TERMINFO
-static ManagedStatic<std::mutex> TermColorMutex;
-#endif
+bool checkTerminalEnvironmentForColors() {
+  if (const char *TermStr = std::getenv("TERM")) {
+    return StringSwitch<bool>(TermStr)
+        .Case("ansi", true)
+        .Case("cygwin", true)
+        .Case("linux", true)
+        .StartsWith("screen", true)
+        .StartsWith("xterm", true)
+        .StartsWith("vt100", true)
+        .StartsWith("rxvt", true)
+        .EndsWith("color", true)
+        .Default(false);
+  }
+
+  return false;
+}
 
 static bool terminalHasColors(int fd) {
 #if defined(__OpenBSD__)
@@ -338,7 +352,8 @@ static bool terminalHasColors(int fd) {
 
 #ifdef LLVM_ENABLE_TERMINFO
   // First, acquire a global lock because these C routines are thread hostile.
-  std::lock_guard<std::mutex> G(*TermColorMutex);
+  static std::mutex TermColorMutex;
+  std::lock_guard<std::mutex> G(TermColorMutex);
 
   struct term *previous_term = set_curterm(nullptr);
   int errret = 0;
@@ -360,7 +375,9 @@ static bool terminalHasColors(int fd) {
   //
   // The 'tigetnum' routine returns -2 or -1 on errors, and might return 0 if
   // the terminfo says that no colors are supported.
-  bool HasColors = tigetnum(const_cast<char *>("colors")) > 0;
+  int colors_ti = tigetnum(const_cast<char *>("colors"));
+  bool HasColors =
+      colors_ti >= 0 ? colors_ti : checkTerminalEnvironmentForColors();
 
   // Now extract the structure allocated by setupterm and free its memory
   // through a really silly dance.
@@ -368,27 +385,12 @@ static bool terminalHasColors(int fd) {
   (void)del_curterm(termp); // Drop any errors here.
 
   // Return true if we found a color capabilities for the current terminal.
-  if (HasColors)
-    return true;
+  return HasColors;
 #else
   // When the terminfo database is not available, check if the current terminal
   // is one of terminals that are known to support ANSI color escape codes.
-  if (const char *TermStr = std::getenv("TERM")) {
-    return StringSwitch<bool>(TermStr)
-      .Case("ansi", true)
-      .Case("cygwin", true)
-      .Case("linux", true)
-      .StartsWith("screen", true)
-      .StartsWith("xterm", true)
-      .StartsWith("vt100", true)
-      .StartsWith("rxvt", true)
-      .EndsWith("color", true)
-      .Default(false);
-  }
+  return checkTerminalEnvironmentForColors();
 #endif
-
-  // Otherwise, be conservative.
-  return false;
 }
 
 bool Process::FileDescriptorHasColors(int fd) {
@@ -415,20 +417,14 @@ bool Process::ColorNeedsFlush() {
 }
 
 const char *Process::OutputColor(char code, bool bold, bool bg) {
-  return colorcodes[bg?1:0][bold?1:0][code&7];
+  return colorcodes[bg ? 1 : 0][bold ? 1 : 0][code & 7];
 }
 
-const char *Process::OutputBold(bool bg) {
-  return "\033[1m";
-}
+const char *Process::OutputBold(bool bg) { return "\033[1m"; }
 
-const char *Process::OutputReverse() {
-  return "\033[7m";
-}
+const char *Process::OutputReverse() { return "\033[7m"; }
 
-const char *Process::ResetColor() {
-  return "\033[0m";
-}
+const char *Process::ResetColor() { return "\033[0m"; }
 
 #if !HAVE_DECL_ARC4RANDOM
 static unsigned GetRandomNumberSeed() {
@@ -465,5 +461,4 @@ unsigned llvm::sys::Process::GetRandomNumber() {
 #endif
 }
 
-LLVM_ATTRIBUTE_NORETURN
-void Process::ExitNoCleanup(int RetCode) { _Exit(RetCode); }
+[[noreturn]] void Process::ExitNoCleanup(int RetCode) { _Exit(RetCode); }
diff --git a/gnu/llvm/llvm/lib/Support/Unix/ThreadLocal.inc b/gnu/llvm/llvm/lib/Support/Unix/ThreadLocal.inc
deleted file mode 100644
index a402ae98042..00000000000
--- a/gnu/llvm/llvm/lib/Support/Unix/ThreadLocal.inc
+++ /dev/null
@@ -1,70 +0,0 @@
-//=== llvm/Support/Unix/ThreadLocal.inc - Unix Thread Local Data -*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements the Unix specific (non-pthread) ThreadLocal class.
-//
-//===----------------------------------------------------------------------===//
-
-//===----------------------------------------------------------------------===//
-//=== WARNING: Implementation here must contain only generic UNIX code that
-//===          is guaranteed to work on *all* UNIX variants.
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Config/config.h"
-
-#if defined(HAVE_PTHREAD_H) && defined(HAVE_PTHREAD_GETSPECIFIC)
-
-#include <cassert>
-#include <pthread.h>
-#include <stdlib.h>
-
-namespace llvm {
-using namespace sys;
-
-ThreadLocalImpl::ThreadLocalImpl() : data() {
-  static_assert(sizeof(pthread_key_t) <= sizeof(data), "size too big");
-  pthread_key_t* key = reinterpret_cast<pthread_key_t*>(&data);
-  int errorcode = pthread_key_create(key, nullptr);
-  assert(errorcode == 0);
-  (void) errorcode;
-}
-
-ThreadLocalImpl::~ThreadLocalImpl() {
-  pthread_key_t* key = reinterpret_cast<pthread_key_t*>(&data);
-  int errorcode = pthread_key_delete(*key);
-  assert(errorcode == 0);
-  (void) errorcode;
-}
-
-void ThreadLocalImpl::setInstance(const void* d) {
-  pthread_key_t* key = reinterpret_cast<pthread_key_t*>(&data);
-  int errorcode = pthread_setspecific(*key, d);
-  assert(errorcode == 0);
-  (void) errorcode;
-}
-
-void *ThreadLocalImpl::getInstance() {
-  pthread_key_t* key = reinterpret_cast<pthread_key_t*>(&data);
-  return pthread_getspecific(*key);
-}
-
-void ThreadLocalImpl::removeInstance() {
-  setInstance(nullptr);
-}
-
-}
-#else
-namespace llvm {
-using namespace sys;
-ThreadLocalImpl::ThreadLocalImpl() : data() { }
-ThreadLocalImpl::~ThreadLocalImpl() { }
-void ThreadLocalImpl::setInstance(const void* d) { data = const_cast<void*>(d);}
-void *ThreadLocalImpl::getInstance() { return data; }
-void ThreadLocalImpl::removeInstance() { setInstance(0); }
-}
-#endif
diff --git a/gnu/llvm/llvm/lib/Support/Windows/Host.inc b/gnu/llvm/llvm/lib/Support/Windows/Host.inc
deleted file mode 100644
index 5583db90904..00000000000
--- a/gnu/llvm/llvm/lib/Support/Windows/Host.inc
+++ /dev/null
@@ -1,33 +0,0 @@
-//===- llvm/Support/Win32/Host.inc ------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements the Win32 Host support.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/Windows/WindowsSupport.h"
-#include <cstdio>
-#include <string>
-
-using namespace llvm;
-
-static std::string updateTripleOSVersion(std::string Triple) {
-  return Triple;
-}
-
-std::string sys::getDefaultTargetTriple() {
-  const char *Triple = LLVM_DEFAULT_TARGET_TRIPLE;
-
-  // Override the default target with an environment variable named by LLVM_TARGET_TRIPLE_ENV.
-#if defined(LLVM_TARGET_TRIPLE_ENV)
-  if (const char *EnvTriple = std::getenv(LLVM_TARGET_TRIPLE_ENV))
-    Triple = EnvTriple;
-#endif
-
-  return Triple;
-}
diff --git a/gnu/llvm/llvm/lib/Support/Windows/ThreadLocal.inc b/gnu/llvm/llvm/lib/Support/Windows/ThreadLocal.inc
deleted file mode 100644
index 696e5c843ea..00000000000
--- a/gnu/llvm/llvm/lib/Support/Windows/ThreadLocal.inc
+++ /dev/null
@@ -1,51 +0,0 @@
-//= llvm/Support/Win32/ThreadLocal.inc - Win32 Thread Local Data -*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements the Win32 specific (non-pthread) ThreadLocal class.
-//
-//===----------------------------------------------------------------------===//
-
-//===----------------------------------------------------------------------===//
-//=== WARNING: Implementation here must contain only generic Win32 code that
-//===          is guaranteed to work on *all* Win32 variants.
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/Windows/WindowsSupport.h"
-#include "llvm/Support/ThreadLocal.h"
-
-namespace llvm {
-
-sys::ThreadLocalImpl::ThreadLocalImpl() : data() {
-  static_assert(sizeof(DWORD) <= sizeof(data), "size too big");
-  DWORD* tls = reinterpret_cast<DWORD*>(&data);
-  *tls = TlsAlloc();
-  assert(*tls != TLS_OUT_OF_INDEXES);
-}
-
-sys::ThreadLocalImpl::~ThreadLocalImpl() {
-  DWORD* tls = reinterpret_cast<DWORD*>(&data);
-  TlsFree(*tls);
-}
-
-void *sys::ThreadLocalImpl::getInstance() {
-  DWORD* tls = reinterpret_cast<DWORD*>(&data);
-  return TlsGetValue(*tls);
-}
-
-void sys::ThreadLocalImpl::setInstance(const void* d){
-  DWORD* tls = reinterpret_cast<DWORD*>(&data);
-  int errorcode = TlsSetValue(*tls, const_cast<void*>(d));
-  assert(errorcode != 0);
-  (void)errorcode;
-}
-
-void sys::ThreadLocalImpl::removeInstance() {
-  setInstance(0);
-}
-
-}
diff --git a/gnu/llvm/llvm/lib/Support/X86TargetParser.cpp b/gnu/llvm/llvm/lib/Support/X86TargetParser.cpp
deleted file mode 100644
index c9530659caa..00000000000
--- a/gnu/llvm/llvm/lib/Support/X86TargetParser.cpp
+++ /dev/null
@@ -1,662 +0,0 @@
-//===-- X86TargetParser - Parser for X86 features ---------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements a target parser to recognise X86 hardware features.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/X86TargetParser.h"
-#include "llvm/ADT/Triple.h"
-
-using namespace llvm;
-using namespace llvm::X86;
-
-namespace {
-
-/// Container class for CPU features.
-/// This is a constexpr reimplementation of a subset of std::bitset. It would be
-/// nice to use std::bitset directly, but it doesn't support constant
-/// initialization.
-class FeatureBitset {
-  static constexpr unsigned NUM_FEATURE_WORDS =
-      (X86::CPU_FEATURE_MAX + 31) / 32;
-
-  // This cannot be a std::array, operator[] is not constexpr until C++17.
-  uint32_t Bits[NUM_FEATURE_WORDS] = {};
-
-public:
-  constexpr FeatureBitset() = default;
-  constexpr FeatureBitset(std::initializer_list<unsigned> Init) {
-    for (auto I : Init)
-      set(I);
-  }
-
-  bool any() const {
-    return llvm::any_of(Bits, [](uint64_t V) { return V != 0; });
-  }
-
-  constexpr FeatureBitset &set(unsigned I) {
-    // GCC <6.2 crashes if this is written in a single statement.
-    uint32_t NewBits = Bits[I / 32] | (uint32_t(1) << (I % 32));
-    Bits[I / 32] = NewBits;
-    return *this;
-  }
-
-  constexpr bool operator[](unsigned I) const {
-    uint32_t Mask = uint32_t(1) << (I % 32);
-    return (Bits[I / 32] & Mask) != 0;
-  }
-
-  constexpr FeatureBitset &operator&=(const FeatureBitset &RHS) {
-    for (unsigned I = 0, E = array_lengthof(Bits); I != E; ++I) {
-      // GCC <6.2 crashes if this is written in a single statement.
-      uint32_t NewBits = Bits[I] & RHS.Bits[I];
-      Bits[I] = NewBits;
-    }
-    return *this;
-  }
-
-  constexpr FeatureBitset &operator|=(const FeatureBitset &RHS) {
-    for (unsigned I = 0, E = array_lengthof(Bits); I != E; ++I) {
-      // GCC <6.2 crashes if this is written in a single statement.
-      uint32_t NewBits = Bits[I] | RHS.Bits[I];
-      Bits[I] = NewBits;
-    }
-    return *this;
-  }
-
-  // gcc 5.3 miscompiles this if we try to write this using operator&=.
-  constexpr FeatureBitset operator&(const FeatureBitset &RHS) const {
-    FeatureBitset Result;
-    for (unsigned I = 0, E = array_lengthof(Bits); I != E; ++I)
-      Result.Bits[I] = Bits[I] & RHS.Bits[I];
-    return Result;
-  }
-
-  // gcc 5.3 miscompiles this if we try to write this using operator&=.
-  constexpr FeatureBitset operator|(const FeatureBitset &RHS) const {
-    FeatureBitset Result;
-    for (unsigned I = 0, E = array_lengthof(Bits); I != E; ++I)
-      Result.Bits[I] = Bits[I] | RHS.Bits[I];
-    return Result;
-  }
-
-  constexpr FeatureBitset operator~() const {
-    FeatureBitset Result;
-    for (unsigned I = 0, E = array_lengthof(Bits); I != E; ++I)
-      Result.Bits[I] = ~Bits[I];
-    return Result;
-  }
-
-  constexpr bool operator!=(const FeatureBitset &RHS) const {
-    for (unsigned I = 0, E = array_lengthof(Bits); I != E; ++I)
-      if (Bits[I] != RHS.Bits[I])
-        return true;
-    return false;
-  }
-};
-
-struct ProcInfo {
-  StringLiteral Name;
-  X86::CPUKind Kind;
-  unsigned KeyFeature;
-  FeatureBitset Features;
-};
-
-struct FeatureInfo {
-  StringLiteral Name;
-  FeatureBitset ImpliedFeatures;
-};
-
-} // end anonymous namespace
-
-#define X86_FEATURE(ENUM, STRING)                                              \
-  constexpr FeatureBitset Feature##ENUM = {X86::FEATURE_##ENUM};
-#include "llvm/Support/X86TargetParser.def"
-
-// Pentium with MMX.
-constexpr FeatureBitset FeaturesPentiumMMX =
-    FeatureX87 | FeatureCMPXCHG8B | FeatureMMX;
-
-// Pentium 2 and 3.
-constexpr FeatureBitset FeaturesPentium2 =
-    FeatureX87 | FeatureCMPXCHG8B | FeatureMMX | FeatureFXSR;
-constexpr FeatureBitset FeaturesPentium3 = FeaturesPentium2 | FeatureSSE;
-
-// Pentium 4 CPUs
-constexpr FeatureBitset FeaturesPentium4 = FeaturesPentium3 | FeatureSSE2;
-constexpr FeatureBitset FeaturesPrescott = FeaturesPentium4 | FeatureSSE3;
-constexpr FeatureBitset FeaturesNocona =
-    FeaturesPrescott | Feature64BIT | FeatureCMPXCHG16B;
-
-// Basic 64-bit capable CPU.
-constexpr FeatureBitset FeaturesX86_64 = FeaturesPentium4 | Feature64BIT;
-constexpr FeatureBitset FeaturesX86_64_V2 = FeaturesX86_64 | FeatureSAHF |
-                                            FeaturePOPCNT | FeatureSSE4_2 |
-                                            FeatureCMPXCHG16B;
-constexpr FeatureBitset FeaturesX86_64_V3 =
-    FeaturesX86_64_V2 | FeatureAVX2 | FeatureBMI | FeatureBMI2 | FeatureF16C |
-    FeatureFMA | FeatureLZCNT | FeatureMOVBE | FeatureXSAVE;
-constexpr FeatureBitset FeaturesX86_64_V4 = FeaturesX86_64_V3 |
-                                            FeatureAVX512BW | FeatureAVX512CD |
-                                            FeatureAVX512DQ | FeatureAVX512VL;
-
-// Intel Core CPUs
-constexpr FeatureBitset FeaturesCore2 =
-    FeaturesNocona | FeatureSAHF | FeatureSSSE3;
-constexpr FeatureBitset FeaturesPenryn = FeaturesCore2 | FeatureSSE4_1;
-constexpr FeatureBitset FeaturesNehalem =
-    FeaturesPenryn | FeaturePOPCNT | FeatureSSE4_2;
-constexpr FeatureBitset FeaturesWestmere = FeaturesNehalem | FeaturePCLMUL;
-constexpr FeatureBitset FeaturesSandyBridge =
-    FeaturesWestmere | FeatureAVX | FeatureXSAVE | FeatureXSAVEOPT;
-constexpr FeatureBitset FeaturesIvyBridge =
-    FeaturesSandyBridge | FeatureF16C | FeatureFSGSBASE | FeatureRDRND;
-constexpr FeatureBitset FeaturesHaswell =
-    FeaturesIvyBridge | FeatureAVX2 | FeatureBMI | FeatureBMI2 | FeatureFMA |
-    FeatureINVPCID | FeatureLZCNT | FeatureMOVBE;
-constexpr FeatureBitset FeaturesBroadwell =
-    FeaturesHaswell | FeatureADX | FeaturePRFCHW | FeatureRDSEED;
-
-// Intel Knights Landing and Knights Mill
-// Knights Landing has feature parity with Broadwell.
-constexpr FeatureBitset FeaturesKNL =
-    FeaturesBroadwell | FeatureAES | FeatureAVX512F | FeatureAVX512CD |
-    FeatureAVX512ER | FeatureAVX512PF | FeaturePREFETCHWT1;
-constexpr FeatureBitset FeaturesKNM = FeaturesKNL | FeatureAVX512VPOPCNTDQ;
-
-// Intel Skylake processors.
-constexpr FeatureBitset FeaturesSkylakeClient =
-    FeaturesBroadwell | FeatureAES | FeatureCLFLUSHOPT | FeatureXSAVEC |
-    FeatureXSAVES | FeatureSGX;
-// SkylakeServer inherits all SkylakeClient features except SGX.
-// FIXME: That doesn't match gcc.
-constexpr FeatureBitset FeaturesSkylakeServer =
-    (FeaturesSkylakeClient & ~FeatureSGX) | FeatureAVX512F | FeatureAVX512CD |
-    FeatureAVX512DQ | FeatureAVX512BW | FeatureAVX512VL | FeatureCLWB |
-    FeaturePKU;
-constexpr FeatureBitset FeaturesCascadeLake =
-    FeaturesSkylakeServer | FeatureAVX512VNNI;
-constexpr FeatureBitset FeaturesCooperLake =
-    FeaturesCascadeLake | FeatureAVX512BF16;
-
-// Intel 10nm processors.
-constexpr FeatureBitset FeaturesCannonlake =
-    FeaturesSkylakeClient | FeatureAVX512F | FeatureAVX512CD | FeatureAVX512DQ |
-    FeatureAVX512BW | FeatureAVX512VL | FeatureAVX512IFMA | FeatureAVX512VBMI |
-    FeaturePKU | FeatureSHA;
-constexpr FeatureBitset FeaturesICLClient =
-    FeaturesCannonlake | FeatureAVX512BITALG | FeatureAVX512VBMI2 |
-    FeatureAVX512VNNI | FeatureAVX512VPOPCNTDQ | FeatureGFNI | FeatureRDPID |
-    FeatureVAES | FeatureVPCLMULQDQ;
-constexpr FeatureBitset FeaturesRocketlake = FeaturesICLClient & ~FeatureSGX;
-constexpr FeatureBitset FeaturesICLServer =
-    FeaturesICLClient | FeatureCLWB | FeaturePCONFIG | FeatureWBNOINVD;
-constexpr FeatureBitset FeaturesTigerlake =
-    FeaturesICLClient | FeatureAVX512VP2INTERSECT | FeatureMOVDIR64B |
-    FeatureCLWB | FeatureMOVDIRI | FeatureSHSTK | FeatureKL | FeatureWIDEKL;
-constexpr FeatureBitset FeaturesSapphireRapids =
-    FeaturesICLServer | FeatureAMX_TILE | FeatureAMX_INT8 | FeatureAMX_BF16 |
-    FeatureAVX512BF16 | FeatureAVX512VP2INTERSECT | FeatureCLDEMOTE |
-    FeatureENQCMD | FeatureMOVDIR64B | FeatureMOVDIRI | FeaturePTWRITE |
-    FeatureSERIALIZE | FeatureSHSTK | FeatureTSXLDTRK | FeatureUINTR |
-    FeatureWAITPKG | FeatureAVXVNNI;
-
-// Intel Atom processors.
-// Bonnell has feature parity with Core2 and adds MOVBE.
-constexpr FeatureBitset FeaturesBonnell = FeaturesCore2 | FeatureMOVBE;
-// Silvermont has parity with Westmere and Bonnell plus PRFCHW and RDRND.
-constexpr FeatureBitset FeaturesSilvermont =
-    FeaturesBonnell | FeaturesWestmere | FeaturePRFCHW | FeatureRDRND;
-constexpr FeatureBitset FeaturesGoldmont =
-    FeaturesSilvermont | FeatureAES | FeatureCLFLUSHOPT | FeatureFSGSBASE |
-    FeatureRDSEED | FeatureSHA | FeatureXSAVE | FeatureXSAVEC |
-    FeatureXSAVEOPT | FeatureXSAVES;
-constexpr FeatureBitset FeaturesGoldmontPlus =
-    FeaturesGoldmont | FeaturePTWRITE | FeatureRDPID | FeatureSGX;
-constexpr FeatureBitset FeaturesTremont =
-    FeaturesGoldmontPlus | FeatureCLWB | FeatureGFNI;
-constexpr FeatureBitset FeaturesAlderlake =
-    FeaturesTremont | FeatureADX | FeatureBMI | FeatureBMI2 | FeatureF16C |
-    FeatureFMA | FeatureINVPCID | FeatureLZCNT | FeaturePCONFIG | FeaturePKU |
-    FeatureSERIALIZE | FeatureSHSTK | FeatureVAES | FeatureVPCLMULQDQ |
-    FeatureCLDEMOTE | FeatureMOVDIR64B | FeatureMOVDIRI | FeatureWAITPKG |
-    FeatureAVXVNNI | FeatureHRESET | FeatureWIDEKL;
-
-// Geode Processor.
-constexpr FeatureBitset FeaturesGeode =
-    FeatureX87 | FeatureCMPXCHG8B | FeatureMMX | Feature3DNOW | Feature3DNOWA;
-
-// K6 processor.
-constexpr FeatureBitset FeaturesK6 = FeatureX87 | FeatureCMPXCHG8B | FeatureMMX;
-
-// K7 and K8 architecture processors.
-constexpr FeatureBitset FeaturesAthlon =
-    FeatureX87 | FeatureCMPXCHG8B | FeatureMMX | Feature3DNOW | Feature3DNOWA;
-constexpr FeatureBitset FeaturesAthlonXP =
-    FeaturesAthlon | FeatureFXSR | FeatureSSE;
-constexpr FeatureBitset FeaturesK8 =
-    FeaturesAthlonXP | FeatureSSE2 | Feature64BIT;
-constexpr FeatureBitset FeaturesK8SSE3 = FeaturesK8 | FeatureSSE3;
-constexpr FeatureBitset FeaturesAMDFAM10 =
-    FeaturesK8SSE3 | FeatureCMPXCHG16B | FeatureLZCNT | FeaturePOPCNT |
-    FeaturePRFCHW | FeatureSAHF | FeatureSSE4_A;
-
-// Bobcat architecture processors.
-constexpr FeatureBitset FeaturesBTVER1 =
-    FeatureX87 | FeatureCMPXCHG8B | FeatureCMPXCHG16B | Feature64BIT |
-    FeatureFXSR | FeatureLZCNT | FeatureMMX | FeaturePOPCNT | FeaturePRFCHW |
-    FeatureSSE | FeatureSSE2 | FeatureSSE3 | FeatureSSSE3 | FeatureSSE4_A |
-    FeatureSAHF;
-constexpr FeatureBitset FeaturesBTVER2 =
-    FeaturesBTVER1 | FeatureAES | FeatureAVX | FeatureBMI | FeatureF16C |
-    FeatureMOVBE | FeaturePCLMUL | FeatureXSAVE | FeatureXSAVEOPT;
-
-// AMD Bulldozer architecture processors.
-constexpr FeatureBitset FeaturesBDVER1 =
-    FeatureX87 | FeatureAES | FeatureAVX | FeatureCMPXCHG8B |
-    FeatureCMPXCHG16B | Feature64BIT | FeatureFMA4 | FeatureFXSR | FeatureLWP |
-    FeatureLZCNT | FeatureMMX | FeaturePCLMUL | FeaturePOPCNT | FeaturePRFCHW |
-    FeatureSAHF | FeatureSSE | FeatureSSE2 | FeatureSSE3 | FeatureSSSE3 |
-    FeatureSSE4_1 | FeatureSSE4_2 | FeatureSSE4_A | FeatureXOP | FeatureXSAVE;
-constexpr FeatureBitset FeaturesBDVER2 =
-    FeaturesBDVER1 | FeatureBMI | FeatureFMA | FeatureF16C | FeatureTBM;
-constexpr FeatureBitset FeaturesBDVER3 =
-    FeaturesBDVER2 | FeatureFSGSBASE | FeatureXSAVEOPT;
-constexpr FeatureBitset FeaturesBDVER4 = FeaturesBDVER3 | FeatureAVX2 |
-                                         FeatureBMI2 | FeatureMOVBE |
-                                         FeatureMWAITX | FeatureRDRND;
-
-// AMD Zen architecture processors.
-constexpr FeatureBitset FeaturesZNVER1 =
-    FeatureX87 | FeatureADX | FeatureAES | FeatureAVX | FeatureAVX2 |
-    FeatureBMI | FeatureBMI2 | FeatureCLFLUSHOPT | FeatureCLZERO |
-    FeatureCMPXCHG8B | FeatureCMPXCHG16B | Feature64BIT | FeatureF16C |
-    FeatureFMA | FeatureFSGSBASE | FeatureFXSR | FeatureLZCNT | FeatureMMX |
-    FeatureMOVBE | FeatureMWAITX | FeaturePCLMUL | FeaturePOPCNT |
-    FeaturePRFCHW | FeatureRDRND | FeatureRDSEED | FeatureSAHF | FeatureSHA |
-    FeatureSSE | FeatureSSE2 | FeatureSSE3 | FeatureSSSE3 | FeatureSSE4_1 |
-    FeatureSSE4_2 | FeatureSSE4_A | FeatureXSAVE | FeatureXSAVEC |
-    FeatureXSAVEOPT | FeatureXSAVES;
-constexpr FeatureBitset FeaturesZNVER2 =
-    FeaturesZNVER1 | FeatureCLWB | FeatureRDPID | FeatureWBNOINVD;
-static constexpr FeatureBitset FeaturesZNVER3 = FeaturesZNVER2 |
-                                                FeatureINVPCID | FeaturePKU |
-                                                FeatureVAES | FeatureVPCLMULQDQ;
-
-constexpr ProcInfo Processors[] = {
-  // Empty processor. Include X87 and CMPXCHG8 for backwards compatibility.
-  { {""}, CK_None, ~0U, FeatureX87 | FeatureCMPXCHG8B },
-  // i386-generation processors.
-  { {"i386"}, CK_i386, ~0U, FeatureX87 },
-  // i486-generation processors.
-  { {"i486"}, CK_i486, ~0U, FeatureX87 },
-  { {"winchip-c6"}, CK_WinChipC6, ~0U, FeaturesPentiumMMX },
-  { {"winchip2"}, CK_WinChip2, ~0U, FeaturesPentiumMMX | Feature3DNOW },
-  { {"c3"}, CK_C3, ~0U, FeaturesPentiumMMX | Feature3DNOW },
-  // i586-generation processors, P5 microarchitecture based.
-  { {"i586"}, CK_i586, ~0U, FeatureX87 | FeatureCMPXCHG8B },
-  { {"pentium"}, CK_Pentium, ~0U, FeatureX87 | FeatureCMPXCHG8B },
-  { {"pentium-mmx"}, CK_PentiumMMX, ~0U, FeaturesPentiumMMX },
-  // i686-generation processors, P6 / Pentium M microarchitecture based.
-  { {"pentiumpro"}, CK_PentiumPro, ~0U, FeatureX87 | FeatureCMPXCHG8B },
-  { {"i686"}, CK_i686, ~0U, FeatureX87 | FeatureCMPXCHG8B },
-  { {"pentium2"}, CK_Pentium2, ~0U, FeaturesPentium2 },
-  { {"pentium3"}, CK_Pentium3, ~0U, FeaturesPentium3 },
-  { {"pentium3m"}, CK_Pentium3, ~0U, FeaturesPentium3 },
-  { {"pentium-m"}, CK_PentiumM, ~0U, FeaturesPentium4 },
-  { {"c3-2"}, CK_C3_2, ~0U, FeaturesPentium3 },
-  { {"yonah"}, CK_Yonah, ~0U, FeaturesPrescott },
-  // Netburst microarchitecture based processors.
-  { {"pentium4"}, CK_Pentium4, ~0U, FeaturesPentium4 },
-  { {"pentium4m"}, CK_Pentium4, ~0U, FeaturesPentium4 },
-  { {"prescott"}, CK_Prescott, ~0U, FeaturesPrescott },
-  { {"nocona"}, CK_Nocona, ~0U, FeaturesNocona },
-  // Core microarchitecture based processors.
-  { {"core2"}, CK_Core2, ~0U, FeaturesCore2 },
-  { {"penryn"}, CK_Penryn, ~0U, FeaturesPenryn },
-  // Atom processors
-  { {"bonnell"}, CK_Bonnell, FEATURE_SSSE3, FeaturesBonnell },
-  { {"atom"}, CK_Bonnell, FEATURE_SSSE3, FeaturesBonnell },
-  { {"silvermont"}, CK_Silvermont, FEATURE_SSE4_2, FeaturesSilvermont },
-  { {"slm"}, CK_Silvermont, FEATURE_SSE4_2, FeaturesSilvermont },
-  { {"goldmont"}, CK_Goldmont, FEATURE_SSE4_2, FeaturesGoldmont },
-  { {"goldmont-plus"}, CK_GoldmontPlus, FEATURE_SSE4_2, FeaturesGoldmontPlus },
-  { {"tremont"}, CK_Tremont, FEATURE_SSE4_2, FeaturesTremont },
-  // Nehalem microarchitecture based processors.
-  { {"nehalem"}, CK_Nehalem, FEATURE_SSE4_2, FeaturesNehalem },
-  { {"corei7"}, CK_Nehalem, FEATURE_SSE4_2, FeaturesNehalem },
-  // Westmere microarchitecture based processors.
-  { {"westmere"}, CK_Westmere, FEATURE_PCLMUL, FeaturesWestmere },
-  // Sandy Bridge microarchitecture based processors.
-  { {"sandybridge"}, CK_SandyBridge, FEATURE_AVX, FeaturesSandyBridge },
-  { {"corei7-avx"}, CK_SandyBridge, FEATURE_AVX, FeaturesSandyBridge },
-  // Ivy Bridge microarchitecture based processors.
-  { {"ivybridge"}, CK_IvyBridge, FEATURE_AVX, FeaturesIvyBridge },
-  { {"core-avx-i"}, CK_IvyBridge, FEATURE_AVX, FeaturesIvyBridge },
-  // Haswell microarchitecture based processors.
-  { {"haswell"}, CK_Haswell, FEATURE_AVX2, FeaturesHaswell },
-  { {"core-avx2"}, CK_Haswell, FEATURE_AVX2, FeaturesHaswell },
-  // Broadwell microarchitecture based processors.
-  { {"broadwell"}, CK_Broadwell, FEATURE_AVX2, FeaturesBroadwell },
-  // Skylake client microarchitecture based processors.
-  { {"skylake"}, CK_SkylakeClient, FEATURE_AVX2, FeaturesSkylakeClient },
-  // Skylake server microarchitecture based processors.
-  { {"skylake-avx512"}, CK_SkylakeServer, FEATURE_AVX512F, FeaturesSkylakeServer },
-  { {"skx"}, CK_SkylakeServer, FEATURE_AVX512F, FeaturesSkylakeServer },
-  // Cascadelake Server microarchitecture based processors.
-  { {"cascadelake"}, CK_Cascadelake, FEATURE_AVX512VNNI, FeaturesCascadeLake },
-  // Cooperlake Server microarchitecture based processors.
-  { {"cooperlake"}, CK_Cooperlake, FEATURE_AVX512BF16, FeaturesCooperLake },
-  // Cannonlake client microarchitecture based processors.
-  { {"cannonlake"}, CK_Cannonlake, FEATURE_AVX512VBMI, FeaturesCannonlake },
-  // Icelake client microarchitecture based processors.
-  { {"icelake-client"}, CK_IcelakeClient, FEATURE_AVX512VBMI2, FeaturesICLClient },
-  // Rocketlake microarchitecture based processors.
-  { {"rocketlake"}, CK_Rocketlake, FEATURE_AVX512VBMI2, FeaturesRocketlake },
-  // Icelake server microarchitecture based processors.
-  { {"icelake-server"}, CK_IcelakeServer, FEATURE_AVX512VBMI2, FeaturesICLServer },
-  // Tigerlake microarchitecture based processors.
-  { {"tigerlake"}, CK_Tigerlake, FEATURE_AVX512VP2INTERSECT, FeaturesTigerlake },
-  // Sapphire Rapids microarchitecture based processors.
-  { {"sapphirerapids"}, CK_SapphireRapids, FEATURE_AVX512VP2INTERSECT, FeaturesSapphireRapids },
-  // Alderlake microarchitecture based processors.
-  { {"alderlake"}, CK_Alderlake, FEATURE_AVX2, FeaturesAlderlake },
-  // Knights Landing processor.
-  { {"knl"}, CK_KNL, FEATURE_AVX512F, FeaturesKNL },
-  // Knights Mill processor.
-  { {"knm"}, CK_KNM, FEATURE_AVX5124FMAPS, FeaturesKNM },
-  // Lakemont microarchitecture based processors.
-  { {"lakemont"}, CK_Lakemont, ~0U, FeatureCMPXCHG8B },
-  // K6 architecture processors.
-  { {"k6"}, CK_K6, ~0U, FeaturesK6 },
-  { {"k6-2"}, CK_K6_2, ~0U, FeaturesK6 | Feature3DNOW },
-  { {"k6-3"}, CK_K6_3, ~0U, FeaturesK6 | Feature3DNOW },
-  // K7 architecture processors.
-  { {"athlon"}, CK_Athlon, ~0U, FeaturesAthlon },
-  { {"athlon-tbird"}, CK_Athlon, ~0U, FeaturesAthlon },
-  { {"athlon-xp"}, CK_AthlonXP, ~0U, FeaturesAthlonXP },
-  { {"athlon-mp"}, CK_AthlonXP, ~0U, FeaturesAthlonXP },
-  { {"athlon-4"}, CK_AthlonXP, ~0U, FeaturesAthlonXP },
-  // K8 architecture processors.
-  { {"k8"}, CK_K8, ~0U, FeaturesK8 },
-  { {"athlon64"}, CK_K8, ~0U, FeaturesK8 },
-  { {"athlon-fx"}, CK_K8, ~0U, FeaturesK8 },
-  { {"opteron"}, CK_K8, ~0U, FeaturesK8 },
-  { {"k8-sse3"}, CK_K8SSE3, ~0U, FeaturesK8SSE3 },
-  { {"athlon64-sse3"}, CK_K8SSE3, ~0U, FeaturesK8SSE3 },
-  { {"opteron-sse3"}, CK_K8SSE3, ~0U, FeaturesK8SSE3 },
-  { {"amdfam10"}, CK_AMDFAM10, FEATURE_SSE4_A, FeaturesAMDFAM10 },
-  { {"barcelona"}, CK_AMDFAM10, FEATURE_SSE4_A, FeaturesAMDFAM10 },
-  // Bobcat architecture processors.
-  { {"btver1"}, CK_BTVER1, FEATURE_SSE4_A, FeaturesBTVER1 },
-  { {"btver2"}, CK_BTVER2, FEATURE_BMI, FeaturesBTVER2 },
-  // Bulldozer architecture processors.
-  { {"bdver1"}, CK_BDVER1, FEATURE_XOP, FeaturesBDVER1 },
-  { {"bdver2"}, CK_BDVER2, FEATURE_FMA, FeaturesBDVER2 },
-  { {"bdver3"}, CK_BDVER3, FEATURE_FMA, FeaturesBDVER3 },
-  { {"bdver4"}, CK_BDVER4, FEATURE_AVX2, FeaturesBDVER4 },
-  // Zen architecture processors.
-  { {"znver1"}, CK_ZNVER1, FEATURE_AVX2, FeaturesZNVER1 },
-  { {"znver2"}, CK_ZNVER2, FEATURE_AVX2, FeaturesZNVER2 },
-  { {"znver3"}, CK_ZNVER3, FEATURE_AVX2, FeaturesZNVER3 },
-  // Generic 64-bit processor.
-  { {"x86-64"}, CK_x86_64, ~0U, FeaturesX86_64 },
-  { {"x86-64-v2"}, CK_x86_64_v2, ~0U, FeaturesX86_64_V2 },
-  { {"x86-64-v3"}, CK_x86_64_v3, ~0U, FeaturesX86_64_V3 },
-  { {"x86-64-v4"}, CK_x86_64_v4, ~0U, FeaturesX86_64_V4 },
-  // Geode processors.
-  { {"geode"}, CK_Geode, ~0U, FeaturesGeode },
-};
-
-constexpr const char *NoTuneList[] = {"x86-64-v2", "x86-64-v3", "x86-64-v4"};
-
-X86::CPUKind llvm::X86::parseArchX86(StringRef CPU, bool Only64Bit) {
-  for (const auto &P : Processors)
-    if (P.Name == CPU && (P.Features[FEATURE_64BIT] || !Only64Bit))
-      return P.Kind;
-
-  return CK_None;
-}
-
-X86::CPUKind llvm::X86::parseTuneCPU(StringRef CPU, bool Only64Bit) {
-  if (llvm::is_contained(NoTuneList, CPU))
-    return CK_None;
-  return parseArchX86(CPU, Only64Bit);
-}
-
-void llvm::X86::fillValidCPUArchList(SmallVectorImpl<StringRef> &Values,
-                                     bool Only64Bit) {
-  for (const auto &P : Processors)
-    if (!P.Name.empty() && (P.Features[FEATURE_64BIT] || !Only64Bit))
-      Values.emplace_back(P.Name);
-}
-
-void llvm::X86::fillValidTuneCPUList(SmallVectorImpl<StringRef> &Values,
-                                     bool Only64Bit) {
-  for (const ProcInfo &P : Processors)
-    if (!P.Name.empty() && (P.Features[FEATURE_64BIT] || !Only64Bit) &&
-        !llvm::is_contained(NoTuneList, P.Name))
-      Values.emplace_back(P.Name);
-}
-
-ProcessorFeatures llvm::X86::getKeyFeature(X86::CPUKind Kind) {
-  // FIXME: Can we avoid a linear search here? The table might be sorted by
-  // CPUKind so we could binary search?
-  for (const auto &P : Processors) {
-    if (P.Kind == Kind) {
-      assert(P.KeyFeature != ~0U && "Processor does not have a key feature.");
-      return static_cast<ProcessorFeatures>(P.KeyFeature);
-    }
-  }
-
-  llvm_unreachable("Unable to find CPU kind!");
-}
-
-// Features with no dependencies.
-constexpr FeatureBitset ImpliedFeatures64BIT = {};
-constexpr FeatureBitset ImpliedFeaturesADX = {};
-constexpr FeatureBitset ImpliedFeaturesBMI = {};
-constexpr FeatureBitset ImpliedFeaturesBMI2 = {};
-constexpr FeatureBitset ImpliedFeaturesCLDEMOTE = {};
-constexpr FeatureBitset ImpliedFeaturesCLFLUSHOPT = {};
-constexpr FeatureBitset ImpliedFeaturesCLWB = {};
-constexpr FeatureBitset ImpliedFeaturesCLZERO = {};
-constexpr FeatureBitset ImpliedFeaturesCMOV = {};
-constexpr FeatureBitset ImpliedFeaturesCMPXCHG16B = {};
-constexpr FeatureBitset ImpliedFeaturesCMPXCHG8B = {};
-constexpr FeatureBitset ImpliedFeaturesENQCMD = {};
-constexpr FeatureBitset ImpliedFeaturesFSGSBASE = {};
-constexpr FeatureBitset ImpliedFeaturesFXSR = {};
-constexpr FeatureBitset ImpliedFeaturesINVPCID = {};
-constexpr FeatureBitset ImpliedFeaturesLWP = {};
-constexpr FeatureBitset ImpliedFeaturesLZCNT = {};
-constexpr FeatureBitset ImpliedFeaturesMWAITX = {};
-constexpr FeatureBitset ImpliedFeaturesMOVBE = {};
-constexpr FeatureBitset ImpliedFeaturesMOVDIR64B = {};
-constexpr FeatureBitset ImpliedFeaturesMOVDIRI = {};
-constexpr FeatureBitset ImpliedFeaturesPCONFIG = {};
-constexpr FeatureBitset ImpliedFeaturesPOPCNT = {};
-constexpr FeatureBitset ImpliedFeaturesPKU = {};
-constexpr FeatureBitset ImpliedFeaturesPREFETCHWT1 = {};
-constexpr FeatureBitset ImpliedFeaturesPRFCHW = {};
-constexpr FeatureBitset ImpliedFeaturesPTWRITE = {};
-constexpr FeatureBitset ImpliedFeaturesRDPID = {};
-constexpr FeatureBitset ImpliedFeaturesRDRND = {};
-constexpr FeatureBitset ImpliedFeaturesRDSEED = {};
-constexpr FeatureBitset ImpliedFeaturesRTM = {};
-constexpr FeatureBitset ImpliedFeaturesSAHF = {};
-constexpr FeatureBitset ImpliedFeaturesSERIALIZE = {};
-constexpr FeatureBitset ImpliedFeaturesSGX = {};
-constexpr FeatureBitset ImpliedFeaturesSHSTK = {};
-constexpr FeatureBitset ImpliedFeaturesTBM = {};
-constexpr FeatureBitset ImpliedFeaturesTSXLDTRK = {};
-constexpr FeatureBitset ImpliedFeaturesUINTR = {};
-constexpr FeatureBitset ImpliedFeaturesWAITPKG = {};
-constexpr FeatureBitset ImpliedFeaturesWBNOINVD = {};
-constexpr FeatureBitset ImpliedFeaturesVZEROUPPER = {};
-constexpr FeatureBitset ImpliedFeaturesX87 = {};
-constexpr FeatureBitset ImpliedFeaturesXSAVE = {};
-
-// Not really CPU features, but need to be in the table because clang uses
-// target features to communicate them to the backend.
-constexpr FeatureBitset ImpliedFeaturesRETPOLINE_EXTERNAL_THUNK = {};
-constexpr FeatureBitset ImpliedFeaturesRETPOLINE_INDIRECT_BRANCHES = {};
-constexpr FeatureBitset ImpliedFeaturesRETPOLINE_INDIRECT_CALLS = {};
-constexpr FeatureBitset ImpliedFeaturesLVI_CFI = {};
-constexpr FeatureBitset ImpliedFeaturesLVI_LOAD_HARDENING = {};
-
-// XSAVE features are dependent on basic XSAVE.
-constexpr FeatureBitset ImpliedFeaturesXSAVEC = FeatureXSAVE;
-constexpr FeatureBitset ImpliedFeaturesXSAVEOPT = FeatureXSAVE;
-constexpr FeatureBitset ImpliedFeaturesXSAVES = FeatureXSAVE;
-
-// MMX->3DNOW->3DNOWA chain.
-constexpr FeatureBitset ImpliedFeaturesMMX = {};
-constexpr FeatureBitset ImpliedFeatures3DNOW = FeatureMMX;
-constexpr FeatureBitset ImpliedFeatures3DNOWA = Feature3DNOW;
-
-// SSE/AVX/AVX512F chain.
-constexpr FeatureBitset ImpliedFeaturesSSE = {};
-constexpr FeatureBitset ImpliedFeaturesSSE2 = FeatureSSE;
-constexpr FeatureBitset ImpliedFeaturesSSE3 = FeatureSSE2;
-constexpr FeatureBitset ImpliedFeaturesSSSE3 = FeatureSSE3;
-constexpr FeatureBitset ImpliedFeaturesSSE4_1 = FeatureSSSE3;
-constexpr FeatureBitset ImpliedFeaturesSSE4_2 = FeatureSSE4_1;
-constexpr FeatureBitset ImpliedFeaturesAVX = FeatureSSE4_2;
-constexpr FeatureBitset ImpliedFeaturesAVX2 = FeatureAVX;
-constexpr FeatureBitset ImpliedFeaturesAVX512F =
-    FeatureAVX2 | FeatureF16C | FeatureFMA;
-
-// Vector extensions that build on SSE or AVX.
-constexpr FeatureBitset ImpliedFeaturesAES = FeatureSSE2;
-constexpr FeatureBitset ImpliedFeaturesF16C = FeatureAVX;
-constexpr FeatureBitset ImpliedFeaturesFMA = FeatureAVX;
-constexpr FeatureBitset ImpliedFeaturesGFNI = FeatureSSE2;
-constexpr FeatureBitset ImpliedFeaturesPCLMUL = FeatureSSE2;
-constexpr FeatureBitset ImpliedFeaturesSHA = FeatureSSE2;
-constexpr FeatureBitset ImpliedFeaturesVAES = FeatureAES | FeatureAVX;
-constexpr FeatureBitset ImpliedFeaturesVPCLMULQDQ = FeatureAVX | FeaturePCLMUL;
-
-// AVX512 features.
-constexpr FeatureBitset ImpliedFeaturesAVX512CD = FeatureAVX512F;
-constexpr FeatureBitset ImpliedFeaturesAVX512BW = FeatureAVX512F;
-constexpr FeatureBitset ImpliedFeaturesAVX512DQ = FeatureAVX512F;
-constexpr FeatureBitset ImpliedFeaturesAVX512ER = FeatureAVX512F;
-constexpr FeatureBitset ImpliedFeaturesAVX512PF = FeatureAVX512F;
-constexpr FeatureBitset ImpliedFeaturesAVX512VL = FeatureAVX512F;
-
-constexpr FeatureBitset ImpliedFeaturesAVX512BF16 = FeatureAVX512BW;
-constexpr FeatureBitset ImpliedFeaturesAVX512BITALG = FeatureAVX512BW;
-constexpr FeatureBitset ImpliedFeaturesAVX512IFMA = FeatureAVX512F;
-constexpr FeatureBitset ImpliedFeaturesAVX512VNNI = FeatureAVX512F;
-constexpr FeatureBitset ImpliedFeaturesAVX512VPOPCNTDQ = FeatureAVX512F;
-constexpr FeatureBitset ImpliedFeaturesAVX512VBMI = FeatureAVX512BW;
-constexpr FeatureBitset ImpliedFeaturesAVX512VBMI2 = FeatureAVX512BW;
-constexpr FeatureBitset ImpliedFeaturesAVX512VP2INTERSECT = FeatureAVX512F;
-
-// FIXME: These two aren't really implemented and just exist in the feature
-// list for __builtin_cpu_supports. So omit their dependencies.
-constexpr FeatureBitset ImpliedFeaturesAVX5124FMAPS = {};
-constexpr FeatureBitset ImpliedFeaturesAVX5124VNNIW = {};
-
-// SSE4_A->FMA4->XOP chain.
-constexpr FeatureBitset ImpliedFeaturesSSE4_A = FeatureSSE3;
-constexpr FeatureBitset ImpliedFeaturesFMA4 = FeatureAVX | FeatureSSE4_A;
-constexpr FeatureBitset ImpliedFeaturesXOP = FeatureFMA4;
-
-// AMX Features
-constexpr FeatureBitset ImpliedFeaturesAMX_TILE = {};
-constexpr FeatureBitset ImpliedFeaturesAMX_BF16 = FeatureAMX_TILE;
-constexpr FeatureBitset ImpliedFeaturesAMX_INT8 = FeatureAMX_TILE;
-constexpr FeatureBitset ImpliedFeaturesHRESET = {};
-
-// Key Locker Features
-constexpr FeatureBitset ImpliedFeaturesKL = FeatureSSE2;
-constexpr FeatureBitset ImpliedFeaturesWIDEKL = FeatureKL;
-
-// AVXVNNI Features
-constexpr FeatureBitset ImpliedFeaturesAVXVNNI = FeatureAVX2;
-
-constexpr FeatureInfo FeatureInfos[X86::CPU_FEATURE_MAX] = {
-#define X86_FEATURE(ENUM, STR) {{STR}, ImpliedFeatures##ENUM},
-#include "llvm/Support/X86TargetParser.def"
-};
-
-void llvm::X86::getFeaturesForCPU(StringRef CPU,
-                                  SmallVectorImpl<StringRef> &EnabledFeatures) {
-  auto I = llvm::find_if(Processors,
-                         [&](const ProcInfo &P) { return P.Name == CPU; });
-  assert(I != std::end(Processors) && "Processor not found!");
-
-  FeatureBitset Bits = I->Features;
-
-  // Remove the 64-bit feature which we only use to validate if a CPU can
-  // be used with 64-bit mode.
-  Bits &= ~Feature64BIT;
-
-  // Add the string version of all set bits.
-  for (unsigned i = 0; i != CPU_FEATURE_MAX; ++i)
-    if (Bits[i] && !FeatureInfos[i].Name.empty())
-      EnabledFeatures.push_back(FeatureInfos[i].Name);
-}
-
-// For each feature that is (transitively) implied by this feature, set it.
-static void getImpliedEnabledFeatures(FeatureBitset &Bits,
-                                      const FeatureBitset &Implies) {
-  // Fast path: Implies is often empty.
-  if (!Implies.any())
-    return;
-  FeatureBitset Prev;
-  Bits |= Implies;
-  do {
-    Prev = Bits;
-    for (unsigned i = CPU_FEATURE_MAX; i;)
-      if (Bits[--i])
-        Bits |= FeatureInfos[i].ImpliedFeatures;
-  } while (Prev != Bits);
-}
-
-/// Create bit vector of features that are implied disabled if the feature
-/// passed in Value is disabled.
-static void getImpliedDisabledFeatures(FeatureBitset &Bits, unsigned Value) {
-  // Check all features looking for any dependent on this feature. If we find
-  // one, mark it and recursively find any feature that depend on it.
-  FeatureBitset Prev;
-  Bits.set(Value);
-  do {
-    Prev = Bits;
-    for (unsigned i = 0; i != CPU_FEATURE_MAX; ++i)
-      if ((FeatureInfos[i].ImpliedFeatures & Bits).any())
-        Bits.set(i);
-  } while (Prev != Bits);
-}
-
-void llvm::X86::updateImpliedFeatures(
-    StringRef Feature, bool Enabled,
-    StringMap<bool> &Features) {
-  auto I = llvm::find_if(
-      FeatureInfos, [&](const FeatureInfo &FI) { return FI.Name == Feature; });
-  if (I == std::end(FeatureInfos)) {
-    // FIXME: This shouldn't happen, but may not have all features in the table
-    // yet.
-    return;
-  }
-
-  FeatureBitset ImpliedBits;
-  if (Enabled)
-    getImpliedEnabledFeatures(ImpliedBits, I->ImpliedFeatures);
-  else
-    getImpliedDisabledFeatures(ImpliedBits,
-                               std::distance(std::begin(FeatureInfos), I));
-
-  // Update the map entry for all implied features.
-  for (unsigned i = 0; i != CPU_FEATURE_MAX; ++i)
-    if (ImpliedBits[i] && !FeatureInfos[i].Name.empty())
-      Features[FeatureInfos[i].Name] = Enabled;
-}
diff --git a/gnu/llvm/llvm/lib/Target/AArch64/AArch64AsmPrinter.cpp b/gnu/llvm/llvm/lib/Target/AArch64/AArch64AsmPrinter.cpp
index cac1a0f2565..ea4827ddb82 100644
--- a/gnu/llvm/llvm/lib/Target/AArch64/AArch64AsmPrinter.cpp
+++ b/gnu/llvm/llvm/lib/Target/AArch64/AArch64AsmPrinter.cpp
@@ -50,9 +50,9 @@
 #include "llvm/MC/MCSectionELF.h"
 #include "llvm/MC/MCStreamer.h"
 #include "llvm/MC/MCSymbol.h"
+#include "llvm/MC/TargetRegistry.h"
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/ErrorHandling.h"
-#include "llvm/Support/TargetRegistry.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Transforms/Instrumentation/HWAddressSanitizer.h"
@@ -70,14 +70,14 @@ namespace {
 
 class AArch64AsmPrinter : public AsmPrinter {
   AArch64MCInstLower MCInstLowering;
-  StackMaps SM;
   FaultMaps FM;
   const AArch64Subtarget *STI;
+  bool ShouldEmitWeakSwiftAsyncExtendedFramePointerFlags = false;
 
 public:
   AArch64AsmPrinter(TargetMachine &TM, std::unique_ptr<MCStreamer> Streamer)
       : AsmPrinter(TM, std::move(Streamer)), MCInstLowering(OutContext, *this),
-        SM(*this), FM(*this) {}
+        FM(*this) {}
 
   StringRef getPassName() const override { return "AArch64 Assembly Printer"; }
 
@@ -94,6 +94,8 @@ public:
 
   void LowerJumpTableDest(MCStreamer &OutStreamer, const MachineInstr &MI);
 
+  void LowerMOPS(MCStreamer &OutStreamer, const MachineInstr &MI);
+
   void LowerSTACKMAP(MCStreamer &OutStreamer, StackMaps &SM,
                      const MachineInstr &MI);
   void LowerPATCHPOINT(MCStreamer &OutStreamer, StackMaps &SM,
@@ -108,6 +110,7 @@ public:
 
   typedef std::tuple<unsigned, bool, uint32_t> HwasanMemaccessTuple;
   std::map<HwasanMemaccessTuple, MCSymbol *> HwasanMemaccessSymbols;
+  void LowerKCFI_CHECK(const MachineInstr &MI);
   void LowerHWASAN_CHECK_MEMACCESS(const MachineInstr &MI);
   void emitHwasanMemaccessSymbols(Module &M);
 
@@ -129,7 +132,7 @@ public:
 
   bool runOnMachineFunction(MachineFunction &MF) override {
     AArch64FI = MF.getInfo<AArch64FunctionInfo>();
-    STI = static_cast<const AArch64Subtarget*>(&MF.getSubtarget());
+    STI = &MF.getSubtarget<AArch64Subtarget>();
 
     SetupMachineFunction(MF);
 
@@ -140,10 +143,10 @@ public:
       int Type =
         COFF::IMAGE_SYM_DTYPE_FUNCTION << COFF::SCT_COMPLEX_TYPE_SHIFT;
 
-      OutStreamer->BeginCOFFSymbolDef(CurrentFnSym);
-      OutStreamer->EmitCOFFSymbolStorageClass(Scl);
-      OutStreamer->EmitCOFFSymbolType(Type);
-      OutStreamer->EndCOFFSymbolDef();
+      OutStreamer->beginCOFFSymbolDef(CurrentFnSym);
+      OutStreamer->emitCOFFSymbolStorageClass(Scl);
+      OutStreamer->emitCOFFSymbolType(Type);
+      OutStreamer->endCOFFSymbolDef();
     }
 
     // Emit the rest of the function body.
@@ -186,6 +189,10 @@ private:
   using MInstToMCSymbol = std::map<const MachineInstr *, MCSymbol *>;
 
   MInstToMCSymbol LOHInstToLabel;
+
+  bool shouldEmitWeakSwiftAsyncExtendedFramePointerFlags() const override {
+    return ShouldEmitWeakSwiftAsyncExtendedFramePointerFlags;
+  }
 };
 
 } // end anonymous namespace
@@ -194,26 +201,32 @@ void AArch64AsmPrinter::emitStartOfAsmFile(Module &M) {
   const Triple &TT = TM.getTargetTriple();
 
   if (TT.isOSBinFormatCOFF()) {
-    // Emit an absolute @feat.00 symbol.  This appears to be some kind of
-    // compiler features bitfield read by link.exe.
+    // Emit an absolute @feat.00 symbol
     MCSymbol *S = MMI->getContext().getOrCreateSymbol(StringRef("@feat.00"));
-    OutStreamer->BeginCOFFSymbolDef(S);
-    OutStreamer->EmitCOFFSymbolStorageClass(COFF::IMAGE_SYM_CLASS_STATIC);
-    OutStreamer->EmitCOFFSymbolType(COFF::IMAGE_SYM_DTYPE_NULL);
-    OutStreamer->EndCOFFSymbolDef();
-    int64_t Feat00Flags = 0;
+    OutStreamer->beginCOFFSymbolDef(S);
+    OutStreamer->emitCOFFSymbolStorageClass(COFF::IMAGE_SYM_CLASS_STATIC);
+    OutStreamer->emitCOFFSymbolType(COFF::IMAGE_SYM_DTYPE_NULL);
+    OutStreamer->endCOFFSymbolDef();
+    int64_t Feat00Value = 0;
 
     if (M.getModuleFlag("cfguard")) {
-      Feat00Flags |= 0x800; // Object is CFG-aware.
+      // Object is CFG-aware.
+      Feat00Value |= COFF::Feat00Flags::GuardCF;
     }
 
     if (M.getModuleFlag("ehcontguard")) {
-      Feat00Flags |= 0x4000; // Object also has EHCont.
+      // Object also has EHCont.
+      Feat00Value |= COFF::Feat00Flags::GuardEHCont;
+    }
+
+    if (M.getModuleFlag("ms-kernel")) {
+      // Object is compiled with /kernel.
+      Feat00Value |= COFF::Feat00Flags::Kernel;
     }
 
     OutStreamer->emitSymbolAttribute(S, MCSA_Global);
     OutStreamer->emitAssignment(
-        S, MCConstantExpr::create(Feat00Flags, MMI->getContext()));
+        S, MCConstantExpr::create(Feat00Value, MMI->getContext()));
   }
 
   if (!TT.isOSBinFormatELF())
@@ -235,16 +248,16 @@ void AArch64AsmPrinter::emitStartOfAsmFile(Module &M) {
     return;
 
   // Emit a .note.gnu.property section with the flags.
-  if (auto *TS = static_cast<AArch64TargetStreamer *>(
-          OutStreamer->getTargetStreamer()))
-    TS->emitNoteSection(Flags);
+  auto *TS =
+      static_cast<AArch64TargetStreamer *>(OutStreamer->getTargetStreamer());
+  TS->emitNoteSection(Flags);
 }
 
 void AArch64AsmPrinter::emitFunctionHeaderComment() {
   const AArch64FunctionInfo *FI = MF->getInfo<AArch64FunctionInfo>();
-  Optional<std::string> OutlinerString = FI->getOutliningStyle();
-  if (OutlinerString != None)
-    OutStreamer->GetCommentOS() << ' ' << OutlinerString;
+  std::optional<std::string> OutlinerString = FI->getOutliningStyle();
+  if (OutlinerString != std::nullopt)
+    OutStreamer->getCommentOS() << ' ' << OutlinerString;
 }
 
 void AArch64AsmPrinter::LowerPATCHABLE_FUNCTION_ENTER(const MachineInstr &MI)
@@ -293,7 +306,7 @@ void AArch64AsmPrinter::emitSled(const MachineInstr &MI, SledKind Kind) {
   //   ;DATA: higher 32 bits of the address of the trampoline
   //   LDP X0, X30, [SP], #16 ; pop X0 and the link register from the stack
   //
-  OutStreamer->emitCodeAlignment(4);
+  OutStreamer->emitCodeAlignment(Align(4), &getSubtargetInfo());
   auto CurSled = OutContext.createTempSymbol("xray_sled_", true);
   OutStreamer->emitLabel(CurSled);
   auto Target = OutContext.createTempSymbol();
@@ -310,6 +323,107 @@ void AArch64AsmPrinter::emitSled(const MachineInstr &MI, SledKind Kind) {
   recordSled(CurSled, MI, Kind, 2);
 }
 
+void AArch64AsmPrinter::LowerKCFI_CHECK(const MachineInstr &MI) {
+  Register AddrReg = MI.getOperand(0).getReg();
+  assert(std::next(MI.getIterator())->isCall() &&
+         "KCFI_CHECK not followed by a call instruction");
+  assert(std::next(MI.getIterator())->getOperand(0).getReg() == AddrReg &&
+         "KCFI_CHECK call target doesn't match call operand");
+
+  // Default to using the intra-procedure-call temporary registers for
+  // comparing the hashes.
+  unsigned ScratchRegs[] = {AArch64::W16, AArch64::W17};
+  if (AddrReg == AArch64::XZR) {
+    // Checking XZR makes no sense. Instead of emitting a load, zero
+    // ScratchRegs[0] and use it for the ESR AddrIndex below.
+    AddrReg = getXRegFromWReg(ScratchRegs[0]);
+    EmitToStreamer(*OutStreamer, MCInstBuilder(AArch64::ORRXrs)
+                                     .addReg(AddrReg)
+                                     .addReg(AArch64::XZR)
+                                     .addReg(AArch64::XZR)
+                                     .addImm(0));
+  } else {
+    // If one of the scratch registers is used for the call target (e.g.
+    // with AArch64::TCRETURNriBTI), we can clobber another caller-saved
+    // temporary register instead (in this case, AArch64::W9) as the check
+    // is immediately followed by the call instruction.
+    for (auto &Reg : ScratchRegs) {
+      if (Reg == getWRegFromXReg(AddrReg)) {
+        Reg = AArch64::W9;
+        break;
+      }
+    }
+    assert(ScratchRegs[0] != AddrReg && ScratchRegs[1] != AddrReg &&
+           "Invalid scratch registers for KCFI_CHECK");
+
+    // Adjust the offset for patchable-function-prefix. This assumes that
+    // patchable-function-prefix is the same for all functions.
+    int64_t PrefixNops = 0;
+    (void)MI.getMF()
+        ->getFunction()
+        .getFnAttribute("patchable-function-prefix")
+        .getValueAsString()
+        .getAsInteger(10, PrefixNops);
+
+    // Load the target function type hash.
+    EmitToStreamer(*OutStreamer, MCInstBuilder(AArch64::LDURWi)
+                                     .addReg(ScratchRegs[0])
+                                     .addReg(AddrReg)
+                                     .addImm(-(PrefixNops * 4 + 4)));
+  }
+
+  // Load the expected type hash.
+  const int64_t Type = MI.getOperand(1).getImm();
+  EmitToStreamer(*OutStreamer, MCInstBuilder(AArch64::MOVKWi)
+                                   .addReg(ScratchRegs[1])
+                                   .addReg(ScratchRegs[1])
+                                   .addImm(Type & 0xFFFF)
+                                   .addImm(0));
+  EmitToStreamer(*OutStreamer, MCInstBuilder(AArch64::MOVKWi)
+                                   .addReg(ScratchRegs[1])
+                                   .addReg(ScratchRegs[1])
+                                   .addImm((Type >> 16) & 0xFFFF)
+                                   .addImm(16));
+
+  // Compare the hashes and trap if there's a mismatch.
+  EmitToStreamer(*OutStreamer, MCInstBuilder(AArch64::SUBSWrs)
+                                   .addReg(AArch64::WZR)
+                                   .addReg(ScratchRegs[0])
+                                   .addReg(ScratchRegs[1])
+                                   .addImm(0));
+
+  MCSymbol *Pass = OutContext.createTempSymbol();
+  EmitToStreamer(*OutStreamer,
+                 MCInstBuilder(AArch64::Bcc)
+                     .addImm(AArch64CC::EQ)
+                     .addExpr(MCSymbolRefExpr::create(Pass, OutContext)));
+
+  // The base ESR is 0x8000 and the register information is encoded in bits
+  // 0-9 as follows:
+  // - 0-4: n, where the register Xn contains the target address
+  // - 5-9: m, where the register Wm contains the expected type hash
+  // Where n, m are in [0, 30].
+  unsigned TypeIndex = ScratchRegs[1] - AArch64::W0;
+  unsigned AddrIndex;
+  switch (AddrReg) {
+  default:
+    AddrIndex = AddrReg - AArch64::X0;
+    break;
+  case AArch64::FP:
+    AddrIndex = 29;
+    break;
+  case AArch64::LR:
+    AddrIndex = 30;
+    break;
+  }
+
+  assert(AddrIndex < 31 && TypeIndex < 31);
+
+  unsigned ESR = 0x8000 | ((TypeIndex & 31) << 5) | (AddrIndex & 31);
+  EmitToStreamer(*OutStreamer, MCInstBuilder(AArch64::BRK).addImm(ESR));
+  OutStreamer->emitLabel(Pass);
+}
+
 void AArch64AsmPrinter::LowerHWASAN_CHECK_MEMACCESS(const MachineInstr &MI) {
   Register Reg = MI.getOperand(0).getReg();
   bool IsShort =
@@ -371,10 +485,10 @@ void AArch64AsmPrinter::emitHwasanMemaccessSymbols(Module &M) {
     bool CompileKernel =
         (AccessInfo >> HWASanAccessInfo::CompileKernelShift) & 1;
 
-    OutStreamer->SwitchSection(OutContext.getELFSection(
+    OutStreamer->switchSection(OutContext.getELFSection(
         ".text.hot", ELF::SHT_PROGBITS,
-        ELF::SHF_EXECINSTR | ELF::SHF_ALLOC | ELF::SHF_GROUP, 0,
-        Sym->getName(), /*IsComdat=*/true));
+        ELF::SHF_EXECINSTR | ELF::SHF_ALLOC | ELF::SHF_GROUP, 0, Sym->getName(),
+        /*IsComdat=*/true));
 
     OutStreamer->emitSymbolAttribute(Sym, MCSA_ELF_TypeFunction);
     OutStreamer->emitSymbolAttribute(Sym, MCSA_Weak);
@@ -572,9 +686,8 @@ void AArch64AsmPrinter::emitEndOfAsmFile(Module &M) {
     // generates code that does this, it is always safe to set.
     OutStreamer->emitAssemblerFlag(MCAF_SubsectionsViaSymbols);
   }
-  
+
   // Emit stack and fault map information.
-  emitStackMaps(SM);
   FM.serializeToFaultMapSection();
 
 }
@@ -620,7 +733,7 @@ void AArch64AsmPrinter::printOperand(const MachineInstr *MI, unsigned OpNum,
     llvm_unreachable("<unknown operand type>");
   case MachineOperand::MO_Register: {
     Register Reg = MO.getReg();
-    assert(Register::isPhysicalRegister(Reg));
+    assert(Reg.isPhysical());
     assert(!MO.getSubReg() && "Subregs should be eliminated!");
     O << AArch64InstPrinter::getRegisterName(Reg);
     break;
@@ -818,18 +931,9 @@ void AArch64AsmPrinter::emitJumpTableInfo() {
   const std::vector<MachineJumpTableEntry> &JT = MJTI->getJumpTables();
   if (JT.empty()) return;
 
-  const Function &F = MF->getFunction();
   const TargetLoweringObjectFile &TLOF = getObjFileLowering();
-  bool JTInDiffSection =
-      !STI->isTargetCOFF() ||
-      !TLOF.shouldPutJumpTableInFunctionSection(
-          MJTI->getEntryKind() == MachineJumpTableInfo::EK_LabelDifference32,
-          F);
-  if (JTInDiffSection) {
-      // Drop it in the readonly section.
-      MCSection *ReadOnlySec = TLOF.getSectionForJumpTable(F, TM);
-      OutStreamer->SwitchSection(ReadOnlySec);
-  }
+  MCSection *ReadOnlySec = TLOF.getSectionForJumpTable(MF->getFunction(), TM);
+  OutStreamer->switchSection(ReadOnlySec);
 
   auto AFI = MF->getInfo<AArch64FunctionInfo>();
   for (unsigned JTI = 0, e = JT.size(); JTI != e; ++JTI) {
@@ -867,7 +971,7 @@ void AArch64AsmPrinter::emitFunctionEntryLabel() {
   if (MF->getFunction().getCallingConv() == CallingConv::AArch64_VectorCall ||
       MF->getFunction().getCallingConv() ==
           CallingConv::AArch64_SVE_VectorCall ||
-      STI->getRegisterInfo()->hasSVEArgsOrReturn(MF)) {
+      MF->getInfo<AArch64FunctionInfo>()->isSVECC()) {
     auto *TS =
         static_cast<AArch64TargetStreamer *>(OutStreamer->getTargetStreamer());
     TS->emitDirectiveVariantPCS(CurrentFnSym);
@@ -940,6 +1044,43 @@ void AArch64AsmPrinter::LowerJumpTableDest(llvm::MCStreamer &OutStreamer,
                                   .addImm(Size == 4 ? 0 : 2));
 }
 
+void AArch64AsmPrinter::LowerMOPS(llvm::MCStreamer &OutStreamer,
+                                  const llvm::MachineInstr &MI) {
+  unsigned Opcode = MI.getOpcode();
+  assert(STI->hasMOPS());
+  assert(STI->hasMTE() || Opcode != AArch64::MOPSMemorySetTaggingPseudo);
+
+  const auto Ops = [Opcode]() -> std::array<unsigned, 3> {
+    if (Opcode == AArch64::MOPSMemoryCopyPseudo)
+      return {AArch64::CPYFP, AArch64::CPYFM, AArch64::CPYFE};
+    if (Opcode == AArch64::MOPSMemoryMovePseudo)
+      return {AArch64::CPYP, AArch64::CPYM, AArch64::CPYE};
+    if (Opcode == AArch64::MOPSMemorySetPseudo)
+      return {AArch64::SETP, AArch64::SETM, AArch64::SETE};
+    if (Opcode == AArch64::MOPSMemorySetTaggingPseudo)
+      return {AArch64::SETGP, AArch64::SETGM, AArch64::MOPSSETGE};
+    llvm_unreachable("Unhandled memory operation pseudo");
+  }();
+  const bool IsSet = Opcode == AArch64::MOPSMemorySetPseudo ||
+                     Opcode == AArch64::MOPSMemorySetTaggingPseudo;
+
+  for (auto Op : Ops) {
+    int i = 0;
+    auto MCIB = MCInstBuilder(Op);
+    // Destination registers
+    MCIB.addReg(MI.getOperand(i++).getReg());
+    MCIB.addReg(MI.getOperand(i++).getReg());
+    if (!IsSet)
+      MCIB.addReg(MI.getOperand(i++).getReg());
+    // Input registers
+    MCIB.addReg(MI.getOperand(i++).getReg());
+    MCIB.addReg(MI.getOperand(i++).getReg());
+    MCIB.addReg(MI.getOperand(i++).getReg());
+
+    EmitToStreamer(OutStreamer, MCIB);
+  }
+}
+
 void AArch64AsmPrinter::LowerSTACKMAP(MCStreamer &OutStreamer, StackMaps &SM,
                                       const MachineInstr &MI) {
   unsigned NumNOPBytes = StackMapOpers(&MI).getNumPatchBytes();
@@ -1080,11 +1221,10 @@ void AArch64AsmPrinter::LowerFAULTING_OP(const MachineInstr &FaultingMI) {
   if (DefRegister != (Register)0)
     MI.addOperand(MCOperand::createReg(DefRegister));
 
-  for (auto I = FaultingMI.operands_begin() + OperandsBeginIdx,
-            E = FaultingMI.operands_end();
-       I != E; ++I) {
+  for (const MachineOperand &MO :
+       llvm::drop_begin(FaultingMI.operands(), OperandsBeginIdx)) {
     MCOperand Dest;
-    lowerOperand(*I, Dest);
+    lowerOperand(MO, Dest);
     MI.addOperand(Dest);
   }
 
@@ -1094,7 +1234,8 @@ void AArch64AsmPrinter::LowerFAULTING_OP(const MachineInstr &FaultingMI) {
 
 void AArch64AsmPrinter::emitFMov0(const MachineInstr &MI) {
   Register DestReg = MI.getOperand(0).getReg();
-  if (STI->hasZeroCycleZeroingFP() && !STI->hasZeroCycleZeroingFPWorkaround()) {
+  if (STI->hasZeroCycleZeroingFP() && !STI->hasZeroCycleZeroingFPWorkaround() &&
+      STI->hasNEON()) {
     // Convert H/S register to corresponding D register
     if (AArch64::H0 <= DestReg && DestReg <= AArch64::H31)
       DestReg = AArch64::D0 + (DestReg - AArch64::H0);
@@ -1137,10 +1278,21 @@ void AArch64AsmPrinter::emitFMov0(const MachineInstr &MI) {
 #include "AArch64GenMCPseudoLowering.inc"
 
 void AArch64AsmPrinter::emitInstruction(const MachineInstr *MI) {
+  AArch64_MC::verifyInstructionPredicates(MI->getOpcode(), STI->getFeatureBits());
+
   // Do any auto-generated pseudo lowerings.
   if (emitPseudoExpansionLowering(*OutStreamer, MI))
     return;
 
+  if (MI->getOpcode() == AArch64::ADRP) {
+    for (auto &Opd : MI->operands()) {
+      if (Opd.isSymbol() && StringRef(Opd.getSymbolName()) ==
+                                "swift_async_extendedFramePointerFlags") {
+        ShouldEmitWeakSwiftAsyncExtendedFramePointerFlags = true;
+      }
+    }
+  }
+
   if (AArch64FI->getLOHRelated().count(MI)) {
     // Generate a label for LOH related instruction
     MCSymbol *LOHLabel = createTempSymbol("loh");
@@ -1218,7 +1370,7 @@ void AArch64AsmPrinter::emitInstruction(const MachineInstr *MI) {
     break;
 
   case AArch64::DBG_VALUE:
-  case AArch64::DBG_VALUE_LIST: {
+  case AArch64::DBG_VALUE_LIST:
     if (isVerbose() && OutStreamer->hasRawTextSupport()) {
       SmallString<128> TmpStr;
       raw_svector_ostream OS(TmpStr);
@@ -1238,8 +1390,18 @@ void AArch64AsmPrinter::emitInstruction(const MachineInstr *MI) {
 
       OutStreamer->emitCFIBKeyFrame();
       return;
-    }
-    }
+  }
+
+  case AArch64::EMITMTETAGGED: {
+    ExceptionHandling ExceptionHandlingType = MAI->getExceptionHandlingType();
+    if (ExceptionHandlingType != ExceptionHandling::DwarfCFI &&
+        ExceptionHandlingType != ExceptionHandling::ARM)
+      return;
+
+    if (getFunctionCFISectionType(*MF) != CFISection::None)
+      OutStreamer->emitCFIMTETaggedFrame();
+    return;
+  }
 
   // Tail calls use pseudo instructions so they have the proper code-gen
   // attributes (isCall, isReturn, etc.). We lower them to the real
@@ -1358,6 +1520,13 @@ void AArch64AsmPrinter::emitInstruction(const MachineInstr *MI) {
     emitFMov0(*MI);
     return;
 
+  case AArch64::MOPSMemoryCopyPseudo:
+  case AArch64::MOPSMemoryMovePseudo:
+  case AArch64::MOPSMemorySetPseudo:
+  case AArch64::MOPSMemorySetTaggingPseudo:
+    LowerMOPS(*OutStreamer, *MI);
+    return;
+
   case TargetOpcode::STACKMAP:
     return LowerSTACKMAP(*OutStreamer, SM, *MI);
 
@@ -1382,6 +1551,10 @@ void AArch64AsmPrinter::emitInstruction(const MachineInstr *MI) {
     LowerPATCHABLE_TAIL_CALL(*MI);
     return;
 
+  case AArch64::KCFI_CHECK:
+    LowerKCFI_CHECK(*MI);
+    return;
+
   case AArch64::HWASAN_CHECK_MEMACCESS:
   case AArch64::HWASAN_CHECK_MEMACCESS_SHORTGRANULES:
     LowerHWASAN_CHECK_MEMACCESS(*MI);
@@ -1501,6 +1674,9 @@ void AArch64AsmPrinter::emitInstruction(const MachineInstr *MI) {
     return;
     }
 
+  case AArch64::SEH_PACSignLR:
+    TS->emitARM64WinCFIPACSignLR();
+    return;
   }
 
   // Finally, do the automated lowerings for everything else.
diff --git a/gnu/llvm/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp b/gnu/llvm/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp
index 7235a8cd4bc..299ac4b44c2 100644
--- a/gnu/llvm/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp
+++ b/gnu/llvm/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp
@@ -117,6 +117,72 @@
 //
 // FIXME: also explain the redzone concept.
 //
+// An example of the prologue:
+//
+//     .globl __foo
+//     .align 2
+//  __foo:
+// Ltmp0:
+//     .cfi_startproc
+//     .cfi_personality 155, ___gxx_personality_v0
+// Leh_func_begin:
+//     .cfi_lsda 16, Lexception33
+//
+//     stp  xa,bx, [sp, -#offset]!
+//     ...
+//     stp  x28, x27, [sp, #offset-32]
+//     stp  fp, lr, [sp, #offset-16]
+//     add  fp, sp, #offset - 16
+//     sub  sp, sp, #1360
+//
+// The Stack:
+//       +-------------------------------------------+
+// 10000 | ........ | ........ | ........ | ........ |
+// 10004 | ........ | ........ | ........ | ........ |
+//       +-------------------------------------------+
+// 10008 | ........ | ........ | ........ | ........ |
+// 1000c | ........ | ........ | ........ | ........ |
+//       +===========================================+
+// 10010 |                X28 Register               |
+// 10014 |                X28 Register               |
+//       +-------------------------------------------+
+// 10018 |                X27 Register               |
+// 1001c |                X27 Register               |
+//       +===========================================+
+// 10020 |                Frame Pointer              |
+// 10024 |                Frame Pointer              |
+//       +-------------------------------------------+
+// 10028 |                Link Register              |
+// 1002c |                Link Register              |
+//       +===========================================+
+// 10030 | ........ | ........ | ........ | ........ |
+// 10034 | ........ | ........ | ........ | ........ |
+//       +-------------------------------------------+
+// 10038 | ........ | ........ | ........ | ........ |
+// 1003c | ........ | ........ | ........ | ........ |
+//       +-------------------------------------------+
+//
+//     [sp] = 10030        ::    >>initial value<<
+//     sp = 10020          ::  stp fp, lr, [sp, #-16]!
+//     fp = sp == 10020    ::  mov fp, sp
+//     [sp] == 10020       ::  stp x28, x27, [sp, #-16]!
+//     sp == 10010         ::    >>final value<<
+//
+// The frame pointer (w29) points to address 10020. If we use an offset of
+// '16' from 'w29', we get the CFI offsets of -8 for w30, -16 for w29, -24
+// for w27, and -32 for w28:
+//
+//  Ltmp1:
+//     .cfi_def_cfa w29, 16
+//  Ltmp2:
+//     .cfi_offset w30, -8
+//  Ltmp3:
+//     .cfi_offset w29, -16
+//  Ltmp4:
+//     .cfi_offset w27, -24
+//  Ltmp5:
+//     .cfi_offset w28, -32
+//
 //===----------------------------------------------------------------------===//
 
 #include "AArch64FrameLowering.h"
@@ -127,6 +193,7 @@
 #include "AArch64Subtarget.h"
 #include "AArch64TargetMachine.h"
 #include "MCTargetDesc/AArch64AddressingModes.h"
+#include "MCTargetDesc/AArch64MCTargetDesc.h"
 #include "llvm/ADT/ScopeExit.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/Statistic.h"
@@ -155,7 +222,6 @@
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/ErrorHandling.h"
-#include "llvm/Support/LEB128.h"
 #include "llvm/Support/MathExtras.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Target/TargetMachine.h"
@@ -163,6 +229,7 @@
 #include <cassert>
 #include <cstdint>
 #include <iterator>
+#include <optional>
 #include <vector>
 
 using namespace llvm;
@@ -188,7 +255,7 @@ static cl::opt<bool> OrderFrameObjects("aarch64-order-frame-objects",
                                        cl::init(true), cl::Hidden);
 
 cl::opt<bool> EnableHomogeneousPrologEpilog(
-    "homogeneous-prolog-epilog", cl::init(false), cl::ZeroOrMore, cl::Hidden,
+    "homogeneous-prolog-epilog", cl::Hidden,
     cl::desc("Emit homogeneous prologue and epilogue for the size "
              "optimization (default = off)"));
 
@@ -234,6 +301,7 @@ static int64_t getArgumentStackToRestore(MachineFunction &MF,
 static bool produceCompactUnwindFrame(MachineFunction &MF);
 static bool needsWinCFI(const MachineFunction &MF);
 static StackOffset getSVEStackSize(const MachineFunction &MF);
+static bool needsShadowCallStackPrologueEpilogue(MachineFunction &MF);
 
 /// Returns true if a homogeneous prolog or epilog code can be emitted
 /// for the size optimization. If possible, a frame helper call is injected.
@@ -441,137 +509,303 @@ MachineBasicBlock::iterator AArch64FrameLowering::eliminateCallFramePseudoInstr(
   return MBB.erase(I);
 }
 
-// Convenience function to create a DWARF expression for
-//   Expr + NumBytes + NumVGScaledBytes * AArch64::VG
-static void appendVGScaledOffsetExpr(SmallVectorImpl<char> &Expr,
-                                     int NumBytes, int NumVGScaledBytes, unsigned VG,
-                                     llvm::raw_string_ostream &Comment) {
-  uint8_t buffer[16];
+void AArch64FrameLowering::emitCalleeSavedGPRLocations(
+    MachineBasicBlock &MBB, MachineBasicBlock::iterator MBBI) const {
+  MachineFunction &MF = *MBB.getParent();
+  MachineFrameInfo &MFI = MF.getFrameInfo();
 
-  if (NumBytes) {
-    Expr.push_back(dwarf::DW_OP_consts);
-    Expr.append(buffer, buffer + encodeSLEB128(NumBytes, buffer));
-    Expr.push_back((uint8_t)dwarf::DW_OP_plus);
-    Comment << (NumBytes < 0 ? " - " : " + ") << std::abs(NumBytes);
-  }
+  const std::vector<CalleeSavedInfo> &CSI = MFI.getCalleeSavedInfo();
+  if (CSI.empty())
+    return;
 
-  if (NumVGScaledBytes) {
-    Expr.push_back((uint8_t)dwarf::DW_OP_consts);
-    Expr.append(buffer, buffer + encodeSLEB128(NumVGScaledBytes, buffer));
+  const TargetSubtargetInfo &STI = MF.getSubtarget();
+  const TargetRegisterInfo &TRI = *STI.getRegisterInfo();
+  const TargetInstrInfo &TII = *STI.getInstrInfo();
+  DebugLoc DL = MBB.findDebugLoc(MBBI);
 
-    Expr.push_back((uint8_t)dwarf::DW_OP_bregx);
-    Expr.append(buffer, buffer + encodeULEB128(VG, buffer));
-    Expr.push_back(0);
+  for (const auto &Info : CSI) {
+    if (MFI.getStackID(Info.getFrameIdx()) == TargetStackID::ScalableVector)
+      continue;
 
-    Expr.push_back((uint8_t)dwarf::DW_OP_mul);
-    Expr.push_back((uint8_t)dwarf::DW_OP_plus);
+    assert(!Info.isSpilledToReg() && "Spilling to registers not implemented");
+    unsigned DwarfReg = TRI.getDwarfRegNum(Info.getReg(), true);
 
-    Comment << (NumVGScaledBytes < 0 ? " - " : " + ")
-            << std::abs(NumVGScaledBytes) << " * VG";
+    int64_t Offset =
+        MFI.getObjectOffset(Info.getFrameIdx()) - getOffsetOfLocalArea();
+    unsigned CFIIndex = MF.addFrameInst(
+        MCCFIInstruction::createOffset(nullptr, DwarfReg, Offset));
+    BuildMI(MBB, MBBI, DL, TII.get(TargetOpcode::CFI_INSTRUCTION))
+        .addCFIIndex(CFIIndex)
+        .setMIFlags(MachineInstr::FrameSetup);
   }
 }
 
-// Creates an MCCFIInstruction:
-//    { DW_CFA_def_cfa_expression, ULEB128 (sizeof expr), expr }
-MCCFIInstruction AArch64FrameLowering::createDefCFAExpressionFromSP(
-    const TargetRegisterInfo &TRI, const StackOffset &OffsetFromSP) const {
-  int64_t NumBytes, NumVGScaledBytes;
-  AArch64InstrInfo::decomposeStackOffsetForDwarfOffsets(OffsetFromSP, NumBytes,
-                                                        NumVGScaledBytes);
+void AArch64FrameLowering::emitCalleeSavedSVELocations(
+    MachineBasicBlock &MBB, MachineBasicBlock::iterator MBBI) const {
+  MachineFunction &MF = *MBB.getParent();
+  MachineFrameInfo &MFI = MF.getFrameInfo();
+
+  // Add callee saved registers to move list.
+  const std::vector<CalleeSavedInfo> &CSI = MFI.getCalleeSavedInfo();
+  if (CSI.empty())
+    return;
 
-  std::string CommentBuffer = "sp";
-  llvm::raw_string_ostream Comment(CommentBuffer);
+  const TargetSubtargetInfo &STI = MF.getSubtarget();
+  const TargetRegisterInfo &TRI = *STI.getRegisterInfo();
+  const TargetInstrInfo &TII = *STI.getInstrInfo();
+  DebugLoc DL = MBB.findDebugLoc(MBBI);
+  AArch64FunctionInfo &AFI = *MF.getInfo<AArch64FunctionInfo>();
+
+  for (const auto &Info : CSI) {
+    if (!(MFI.getStackID(Info.getFrameIdx()) == TargetStackID::ScalableVector))
+      continue;
+
+    // Not all unwinders may know about SVE registers, so assume the lowest
+    // common demoninator.
+    assert(!Info.isSpilledToReg() && "Spilling to registers not implemented");
+    unsigned Reg = Info.getReg();
+    if (!static_cast<const AArch64RegisterInfo &>(TRI).regNeedsCFI(Reg, Reg))
+      continue;
 
-  // Build up the expression (SP + NumBytes + NumVGScaledBytes * AArch64::VG)
-  SmallString<64> Expr;
-  Expr.push_back((uint8_t)(dwarf::DW_OP_breg0 + /*SP*/ 31));
-  Expr.push_back(0);
-  appendVGScaledOffsetExpr(Expr, NumBytes, NumVGScaledBytes,
-                           TRI.getDwarfRegNum(AArch64::VG, true), Comment);
+    StackOffset Offset =
+        StackOffset::getScalable(MFI.getObjectOffset(Info.getFrameIdx())) -
+        StackOffset::getFixed(AFI.getCalleeSavedStackSize(MFI));
 
-  // Wrap this into DW_CFA_def_cfa.
-  SmallString<64> DefCfaExpr;
-  DefCfaExpr.push_back(dwarf::DW_CFA_def_cfa_expression);
-  uint8_t buffer[16];
-  DefCfaExpr.append(buffer,
-                    buffer + encodeULEB128(Expr.size(), buffer));
-  DefCfaExpr.append(Expr.str());
-  return MCCFIInstruction::createEscape(nullptr, DefCfaExpr.str(),
-                                        Comment.str());
+    unsigned CFIIndex = MF.addFrameInst(createCFAOffset(TRI, Reg, Offset));
+    BuildMI(MBB, MBBI, DL, TII.get(TargetOpcode::CFI_INSTRUCTION))
+        .addCFIIndex(CFIIndex)
+        .setMIFlags(MachineInstr::FrameSetup);
+  }
+}
+
+static void insertCFISameValue(const MCInstrDesc &Desc, MachineFunction &MF,
+                               MachineBasicBlock &MBB,
+                               MachineBasicBlock::iterator InsertPt,
+                               unsigned DwarfReg) {
+  unsigned CFIIndex =
+      MF.addFrameInst(MCCFIInstruction::createSameValue(nullptr, DwarfReg));
+  BuildMI(MBB, InsertPt, DebugLoc(), Desc).addCFIIndex(CFIIndex);
 }
 
-MCCFIInstruction AArch64FrameLowering::createCfaOffset(
-    const TargetRegisterInfo &TRI, unsigned Reg,
-    const StackOffset &OffsetFromDefCFA) const {
-  int64_t NumBytes, NumVGScaledBytes;
-  AArch64InstrInfo::decomposeStackOffsetForDwarfOffsets(
-      OffsetFromDefCFA, NumBytes, NumVGScaledBytes);
+void AArch64FrameLowering::resetCFIToInitialState(
+    MachineBasicBlock &MBB) const {
 
-  unsigned DwarfReg = TRI.getDwarfRegNum(Reg, true);
+  MachineFunction &MF = *MBB.getParent();
+  const auto &Subtarget = MF.getSubtarget<AArch64Subtarget>();
+  const TargetInstrInfo &TII = *Subtarget.getInstrInfo();
+  const auto &TRI =
+      static_cast<const AArch64RegisterInfo &>(*Subtarget.getRegisterInfo());
+  const auto &MFI = *MF.getInfo<AArch64FunctionInfo>();
 
-  // Non-scalable offsets can use DW_CFA_offset directly.
-  if (!NumVGScaledBytes)
-    return MCCFIInstruction::createOffset(nullptr, DwarfReg, NumBytes);
+  const MCInstrDesc &CFIDesc = TII.get(TargetOpcode::CFI_INSTRUCTION);
+  DebugLoc DL;
 
-  std::string CommentBuffer;
-  llvm::raw_string_ostream Comment(CommentBuffer);
-  Comment << printReg(Reg, &TRI) << "  @ cfa";
+  // Reset the CFA to `SP + 0`.
+  MachineBasicBlock::iterator InsertPt = MBB.begin();
+  unsigned CFIIndex = MF.addFrameInst(MCCFIInstruction::cfiDefCfa(
+      nullptr, TRI.getDwarfRegNum(AArch64::SP, true), 0));
+  BuildMI(MBB, InsertPt, DL, CFIDesc).addCFIIndex(CFIIndex);
 
-  // Build up expression (NumBytes + NumVGScaledBytes * AArch64::VG)
-  SmallString<64> OffsetExpr;
-  appendVGScaledOffsetExpr(OffsetExpr, NumBytes, NumVGScaledBytes,
-                           TRI.getDwarfRegNum(AArch64::VG, true), Comment);
+  // Flip the RA sign state.
+  if (MFI.shouldSignReturnAddress(MF)) {
+    CFIIndex = MF.addFrameInst(MCCFIInstruction::createNegateRAState(nullptr));
+    BuildMI(MBB, InsertPt, DL, CFIDesc).addCFIIndex(CFIIndex);
+  }
 
-  // Wrap this into DW_CFA_expression
-  SmallString<64> CfaExpr;
-  CfaExpr.push_back(dwarf::DW_CFA_expression);
-  uint8_t buffer[16];
-  CfaExpr.append(buffer, buffer + encodeULEB128(DwarfReg, buffer));
-  CfaExpr.append(buffer, buffer + encodeULEB128(OffsetExpr.size(), buffer));
-  CfaExpr.append(OffsetExpr.str());
+  // Shadow call stack uses X18, reset it.
+  if (needsShadowCallStackPrologueEpilogue(MF))
+    insertCFISameValue(CFIDesc, MF, MBB, InsertPt,
+                       TRI.getDwarfRegNum(AArch64::X18, true));
 
-  return MCCFIInstruction::createEscape(nullptr, CfaExpr.str(), Comment.str());
+  // Emit .cfi_same_value for callee-saved registers.
+  const std::vector<CalleeSavedInfo> &CSI =
+      MF.getFrameInfo().getCalleeSavedInfo();
+  for (const auto &Info : CSI) {
+    unsigned Reg = Info.getReg();
+    if (!TRI.regNeedsCFI(Reg, Reg))
+      continue;
+    insertCFISameValue(CFIDesc, MF, MBB, InsertPt,
+                       TRI.getDwarfRegNum(Reg, true));
+  }
 }
 
-void AArch64FrameLowering::emitCalleeSavedFrameMoves(
-    MachineBasicBlock &MBB, MachineBasicBlock::iterator MBBI) const {
+static void emitCalleeSavedRestores(MachineBasicBlock &MBB,
+                                    MachineBasicBlock::iterator MBBI,
+                                    bool SVE) {
   MachineFunction &MF = *MBB.getParent();
   MachineFrameInfo &MFI = MF.getFrameInfo();
-  const TargetSubtargetInfo &STI = MF.getSubtarget();
-  const TargetRegisterInfo *TRI = STI.getRegisterInfo();
-  const TargetInstrInfo *TII = STI.getInstrInfo();
-  DebugLoc DL = MBB.findDebugLoc(MBBI);
 
-  // Add callee saved registers to move list.
   const std::vector<CalleeSavedInfo> &CSI = MFI.getCalleeSavedInfo();
   if (CSI.empty())
     return;
 
+  const TargetSubtargetInfo &STI = MF.getSubtarget();
+  const TargetRegisterInfo &TRI = *STI.getRegisterInfo();
+  const TargetInstrInfo &TII = *STI.getInstrInfo();
+  DebugLoc DL = MBB.findDebugLoc(MBBI);
+
   for (const auto &Info : CSI) {
-    unsigned Reg = Info.getReg();
+    if (SVE !=
+        (MFI.getStackID(Info.getFrameIdx()) == TargetStackID::ScalableVector))
+      continue;
 
-    // Not all unwinders may know about SVE registers, so assume the lowest
-    // common demoninator.
-    unsigned NewReg;
-    if (static_cast<const AArch64RegisterInfo *>(TRI)->regNeedsCFI(Reg, NewReg))
-      Reg = NewReg;
-    else
+    unsigned Reg = Info.getReg();
+    if (SVE &&
+        !static_cast<const AArch64RegisterInfo &>(TRI).regNeedsCFI(Reg, Reg))
       continue;
 
-    StackOffset Offset;
-    if (MFI.getStackID(Info.getFrameIdx()) == TargetStackID::ScalableVector) {
-      AArch64FunctionInfo *AFI = MF.getInfo<AArch64FunctionInfo>();
-      Offset =
-          StackOffset::getScalable(MFI.getObjectOffset(Info.getFrameIdx())) -
-          StackOffset::getFixed(AFI->getCalleeSavedStackSize(MFI));
-    } else {
-      Offset = StackOffset::getFixed(MFI.getObjectOffset(Info.getFrameIdx()) -
-                                     getOffsetOfLocalArea());
-    }
-    unsigned CFIIndex = MF.addFrameInst(createCfaOffset(*TRI, Reg, Offset));
-    BuildMI(MBB, MBBI, DL, TII->get(TargetOpcode::CFI_INSTRUCTION))
+    unsigned CFIIndex = MF.addFrameInst(MCCFIInstruction::createRestore(
+        nullptr, TRI.getDwarfRegNum(Info.getReg(), true)));
+    BuildMI(MBB, MBBI, DL, TII.get(TargetOpcode::CFI_INSTRUCTION))
         .addCFIIndex(CFIIndex)
-        .setMIFlags(MachineInstr::FrameSetup);
+        .setMIFlags(MachineInstr::FrameDestroy);
+  }
+}
+
+void AArch64FrameLowering::emitCalleeSavedGPRRestores(
+    MachineBasicBlock &MBB, MachineBasicBlock::iterator MBBI) const {
+  emitCalleeSavedRestores(MBB, MBBI, false);
+}
+
+void AArch64FrameLowering::emitCalleeSavedSVERestores(
+    MachineBasicBlock &MBB, MachineBasicBlock::iterator MBBI) const {
+  emitCalleeSavedRestores(MBB, MBBI, true);
+}
+
+static MCRegister getRegisterOrZero(MCRegister Reg, bool HasSVE) {
+  switch (Reg.id()) {
+  default:
+    // The called routine is expected to preserve r19-r28
+    // r29 and r30 are used as frame pointer and link register resp.
+    return 0;
+
+    // GPRs
+#define CASE(n)                                                                \
+  case AArch64::W##n:                                                          \
+  case AArch64::X##n:                                                          \
+    return AArch64::X##n
+  CASE(0);
+  CASE(1);
+  CASE(2);
+  CASE(3);
+  CASE(4);
+  CASE(5);
+  CASE(6);
+  CASE(7);
+  CASE(8);
+  CASE(9);
+  CASE(10);
+  CASE(11);
+  CASE(12);
+  CASE(13);
+  CASE(14);
+  CASE(15);
+  CASE(16);
+  CASE(17);
+  CASE(18);
+#undef CASE
+
+    // FPRs
+#define CASE(n)                                                                \
+  case AArch64::B##n:                                                          \
+  case AArch64::H##n:                                                          \
+  case AArch64::S##n:                                                          \
+  case AArch64::D##n:                                                          \
+  case AArch64::Q##n:                                                          \
+    return HasSVE ? AArch64::Z##n : AArch64::Q##n
+  CASE(0);
+  CASE(1);
+  CASE(2);
+  CASE(3);
+  CASE(4);
+  CASE(5);
+  CASE(6);
+  CASE(7);
+  CASE(8);
+  CASE(9);
+  CASE(10);
+  CASE(11);
+  CASE(12);
+  CASE(13);
+  CASE(14);
+  CASE(15);
+  CASE(16);
+  CASE(17);
+  CASE(18);
+  CASE(19);
+  CASE(20);
+  CASE(21);
+  CASE(22);
+  CASE(23);
+  CASE(24);
+  CASE(25);
+  CASE(26);
+  CASE(27);
+  CASE(28);
+  CASE(29);
+  CASE(30);
+  CASE(31);
+#undef CASE
+  }
+}
+
+void AArch64FrameLowering::emitZeroCallUsedRegs(BitVector RegsToZero,
+                                                MachineBasicBlock &MBB) const {
+  // Insertion point.
+  MachineBasicBlock::iterator MBBI = MBB.getFirstTerminator();
+
+  // Fake a debug loc.
+  DebugLoc DL;
+  if (MBBI != MBB.end())
+    DL = MBBI->getDebugLoc();
+
+  const MachineFunction &MF = *MBB.getParent();
+  const AArch64Subtarget &STI = MF.getSubtarget<AArch64Subtarget>();
+  const AArch64RegisterInfo &TRI = *STI.getRegisterInfo();
+
+  BitVector GPRsToZero(TRI.getNumRegs());
+  BitVector FPRsToZero(TRI.getNumRegs());
+  bool HasSVE = STI.hasSVE();
+  for (MCRegister Reg : RegsToZero.set_bits()) {
+    if (TRI.isGeneralPurposeRegister(MF, Reg)) {
+      // For GPRs, we only care to clear out the 64-bit register.
+      if (MCRegister XReg = getRegisterOrZero(Reg, HasSVE))
+        GPRsToZero.set(XReg);
+    } else if (AArch64::FPR128RegClass.contains(Reg) ||
+               AArch64::FPR64RegClass.contains(Reg) ||
+               AArch64::FPR32RegClass.contains(Reg) ||
+               AArch64::FPR16RegClass.contains(Reg) ||
+               AArch64::FPR8RegClass.contains(Reg)) {
+      // For FPRs,
+      if (MCRegister XReg = getRegisterOrZero(Reg, HasSVE))
+        FPRsToZero.set(XReg);
+    }
+  }
+
+  const AArch64InstrInfo &TII = *STI.getInstrInfo();
+
+  // Zero out GPRs.
+  for (MCRegister Reg : GPRsToZero.set_bits())
+    BuildMI(MBB, MBBI, DL, TII.get(AArch64::MOVi64imm), Reg).addImm(0);
+
+  // Zero out FP/vector registers.
+  for (MCRegister Reg : FPRsToZero.set_bits())
+    if (HasSVE)
+      BuildMI(MBB, MBBI, DL, TII.get(AArch64::DUP_ZI_D), Reg)
+        .addImm(0)
+        .addImm(0);
+    else
+      BuildMI(MBB, MBBI, DL, TII.get(AArch64::MOVIv2d_ns), Reg).addImm(0);
+
+  if (HasSVE) {
+    for (MCRegister PReg :
+         {AArch64::P0, AArch64::P1, AArch64::P2, AArch64::P3, AArch64::P4,
+          AArch64::P5, AArch64::P6, AArch64::P7, AArch64::P8, AArch64::P9,
+          AArch64::P10, AArch64::P11, AArch64::P12, AArch64::P13, AArch64::P14,
+          AArch64::P15}) {
+      if (RegsToZero[PReg])
+        BuildMI(MBB, MBBI, DL, TII.get(AArch64::PFALSE), PReg);
+    }
   }
 }
 
@@ -638,11 +872,8 @@ static bool windowsRequiresStackProbe(MachineFunction &MF,
   const Function &F = MF.getFunction();
   // TODO: When implementing stack protectors, take that into account
   // for the probe threshold.
-  unsigned StackProbeSize = 4096;
-  if (F.hasFnAttribute("stack-probe-size"))
-    F.getFnAttribute("stack-probe-size")
-        .getValueAsString()
-        .getAsInteger(0, StackProbeSize);
+  unsigned StackProbeSize =
+      F.getFnAttributeAsParsedInteger("stack-probe-size", 4096);
   return (StackSizeInBytes >= StackProbeSize) &&
          !F.hasFnAttribute("no-stack-arg-probe");
 }
@@ -755,7 +986,7 @@ static MachineBasicBlock::iterator InsertSEH(MachineBasicBlock::iterator MBBI,
     llvm_unreachable("No SEH Opcode for this instruction");
   case AArch64::LDPDpost:
     Imm = -Imm;
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case AArch64::STPDpre: {
     unsigned Reg0 = RegInfo->getSEHRegNum(MBBI->getOperand(1).getReg());
     unsigned Reg1 = RegInfo->getSEHRegNum(MBBI->getOperand(2).getReg());
@@ -768,7 +999,7 @@ static MachineBasicBlock::iterator InsertSEH(MachineBasicBlock::iterator MBBI,
   }
   case AArch64::LDPXpost:
     Imm = -Imm;
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case AArch64::STPXpre: {
     Register Reg0 = MBBI->getOperand(1).getReg();
     Register Reg1 = MBBI->getOperand(2).getReg();
@@ -786,7 +1017,7 @@ static MachineBasicBlock::iterator InsertSEH(MachineBasicBlock::iterator MBBI,
   }
   case AArch64::LDRDpost:
     Imm = -Imm;
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case AArch64::STRDpre: {
     unsigned Reg = RegInfo->getSEHRegNum(MBBI->getOperand(1).getReg());
     MIB = BuildMI(MF, DL, TII.get(AArch64::SEH_SaveFReg_X))
@@ -797,7 +1028,7 @@ static MachineBasicBlock::iterator InsertSEH(MachineBasicBlock::iterator MBBI,
   }
   case AArch64::LDRXpost:
     Imm = -Imm;
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case AArch64::STRXpre: {
     unsigned Reg =  RegInfo->getSEHRegNum(MBBI->getOperand(1).getReg());
     MIB = BuildMI(MF, DL, TII.get(AArch64::SEH_SaveReg_X))
@@ -882,16 +1113,9 @@ static void fixupSEHOpcode(MachineBasicBlock::iterator MBBI,
 static MachineBasicBlock::iterator convertCalleeSaveRestoreToSPPrePostIncDec(
     MachineBasicBlock &MBB, MachineBasicBlock::iterator MBBI,
     const DebugLoc &DL, const TargetInstrInfo *TII, int CSStackSizeInc,
-    bool NeedsWinCFI, bool *HasWinCFI, bool InProlog = true) {
-  // Ignore instructions that do not operate on SP, i.e. shadow call stack
-  // instructions and associated CFI instruction.
-  while (MBBI->getOpcode() == AArch64::STRXpost ||
-         MBBI->getOpcode() == AArch64::LDRXpre ||
-         MBBI->getOpcode() == AArch64::CFI_INSTRUCTION) {
-    if (MBBI->getOpcode() != AArch64::CFI_INSTRUCTION)
-      assert(MBBI->getOperand(0).getReg() != AArch64::SP);
-    ++MBBI;
-  }
+    bool NeedsWinCFI, bool *HasWinCFI, bool EmitCFI,
+    MachineInstr::MIFlag FrameFlag = MachineInstr::FrameSetup,
+    int CFAOffset = 0) {
   unsigned NewOpc;
   switch (MBBI->getOpcode()) {
   default:
@@ -950,12 +1174,14 @@ static MachineBasicBlock::iterator convertCalleeSaveRestoreToSPPrePostIncDec(
 
   // If the first store isn't right where we want SP then we can't fold the
   // update in so create a normal arithmetic instruction instead.
+  MachineFunction &MF = *MBB.getParent();
   if (MBBI->getOperand(MBBI->getNumOperands() - 1).getImm() != 0 ||
       CSStackSizeInc < MinOffset || CSStackSizeInc > MaxOffset) {
     emitFrameOffset(MBB, MBBI, DL, AArch64::SP, AArch64::SP,
-                    StackOffset::getFixed(CSStackSizeInc), TII,
-                    InProlog ? MachineInstr::FrameSetup
-                             : MachineInstr::FrameDestroy);
+                    StackOffset::getFixed(CSStackSizeInc), TII, FrameFlag,
+                    false, false, nullptr, EmitCFI,
+                    StackOffset::getFixed(CFAOffset));
+
     return std::prev(MBBI);
   }
 
@@ -982,8 +1208,15 @@ static MachineBasicBlock::iterator convertCalleeSaveRestoreToSPPrePostIncDec(
   // Generate a new SEH code that corresponds to the new instruction.
   if (NeedsWinCFI) {
     *HasWinCFI = true;
-    InsertSEH(*MIB, *TII,
-              InProlog ? MachineInstr::FrameSetup : MachineInstr::FrameDestroy);
+    InsertSEH(*MIB, *TII, FrameFlag);
+  }
+
+  if (EmitCFI) {
+    unsigned CFIIndex = MF.addFrameInst(
+        MCCFIInstruction::cfiDefCfaOffset(nullptr, CFAOffset - CSStackSizeInc));
+    BuildMI(MBB, MBBI, DL, TII->get(TargetOpcode::CFI_INSTRUCTION))
+        .addCFIIndex(CFIIndex)
+        .setMIFlags(FrameFlag);
   }
 
   return std::prev(MBB.erase(MBBI));
@@ -999,16 +1232,6 @@ static void fixupCalleeSaveRestoreStackOffset(MachineInstr &MI,
     return;
 
   unsigned Opc = MI.getOpcode();
-
-  // Ignore instructions that do not operate on SP, i.e. shadow call stack
-  // instructions and associated CFI instruction.
-  if (Opc == AArch64::STRXpost || Opc == AArch64::LDRXpre ||
-      Opc == AArch64::CFI_INSTRUCTION) {
-    if (Opc != AArch64::CFI_INSTRUCTION)
-      assert(MI.getOperand(0).getReg() != AArch64::SP);
-    return;
-  }
-
   unsigned Scale;
   switch (Opc) {
   case AArch64::STPXi:
@@ -1050,38 +1273,6 @@ static void fixupCalleeSaveRestoreStackOffset(MachineInstr &MI,
   }
 }
 
-static void adaptForLdStOpt(MachineBasicBlock &MBB,
-                            MachineBasicBlock::iterator FirstSPPopI,
-                            MachineBasicBlock::iterator LastPopI) {
-  // Sometimes (when we restore in the same order as we save), we can end up
-  // with code like this:
-  //
-  // ldp      x26, x25, [sp]
-  // ldp      x24, x23, [sp, #16]
-  // ldp      x22, x21, [sp, #32]
-  // ldp      x20, x19, [sp, #48]
-  // add      sp, sp, #64
-  //
-  // In this case, it is always better to put the first ldp at the end, so
-  // that the load-store optimizer can run and merge the ldp and the add into
-  // a post-index ldp.
-  // If we managed to grab the first pop instruction, move it to the end.
-  if (ReverseCSRRestoreSeq)
-    MBB.splice(FirstSPPopI, &MBB, LastPopI);
-  // We should end up with something like this now:
-  //
-  // ldp      x24, x23, [sp, #16]
-  // ldp      x22, x21, [sp, #32]
-  // ldp      x20, x19, [sp, #48]
-  // ldp      x26, x25, [sp]
-  // add      sp, sp, #64
-  //
-  // and the load-store optimizer can merge the last two instructions into:
-  //
-  // ldp      x26, x25, [sp], #64
-  //
-}
-
 static bool isTargetWindows(const MachineFunction &MF) {
   return MF.getSubtarget<AArch64Subtarget>().isTargetWindows();
 }
@@ -1100,6 +1291,80 @@ static bool IsSVECalleeSave(MachineBasicBlock::iterator I) {
   }
 }
 
+static bool needsShadowCallStackPrologueEpilogue(MachineFunction &MF) {
+  if (!(llvm::any_of(
+            MF.getFrameInfo().getCalleeSavedInfo(),
+            [](const auto &Info) { return Info.getReg() == AArch64::LR; }) &&
+        MF.getFunction().hasFnAttribute(Attribute::ShadowCallStack)))
+    return false;
+
+  if (!MF.getSubtarget<AArch64Subtarget>().isXRegisterReserved(18))
+    report_fatal_error("Must reserve x18 to use shadow call stack");
+
+  return true;
+}
+
+static void emitShadowCallStackPrologue(const TargetInstrInfo &TII,
+                                        MachineFunction &MF,
+                                        MachineBasicBlock &MBB,
+                                        MachineBasicBlock::iterator MBBI,
+                                        const DebugLoc &DL, bool NeedsWinCFI,
+                                        bool NeedsUnwindInfo) {
+  // Shadow call stack prolog: str x30, [x18], #8
+  BuildMI(MBB, MBBI, DL, TII.get(AArch64::STRXpost))
+      .addReg(AArch64::X18, RegState::Define)
+      .addReg(AArch64::LR)
+      .addReg(AArch64::X18)
+      .addImm(8)
+      .setMIFlag(MachineInstr::FrameSetup);
+
+  // This instruction also makes x18 live-in to the entry block.
+  MBB.addLiveIn(AArch64::X18);
+
+  if (NeedsWinCFI)
+    BuildMI(MBB, MBBI, DL, TII.get(AArch64::SEH_Nop))
+        .setMIFlag(MachineInstr::FrameSetup);
+
+  if (NeedsUnwindInfo) {
+    // Emit a CFI instruction that causes 8 to be subtracted from the value of
+    // x18 when unwinding past this frame.
+    static const char CFIInst[] = {
+        dwarf::DW_CFA_val_expression,
+        18, // register
+        2,  // length
+        static_cast<char>(unsigned(dwarf::DW_OP_breg18)),
+        static_cast<char>(-8) & 0x7f, // addend (sleb128)
+    };
+    unsigned CFIIndex = MF.addFrameInst(MCCFIInstruction::createEscape(
+        nullptr, StringRef(CFIInst, sizeof(CFIInst))));
+    BuildMI(MBB, MBBI, DL, TII.get(AArch64::CFI_INSTRUCTION))
+        .addCFIIndex(CFIIndex)
+        .setMIFlag(MachineInstr::FrameSetup);
+  }
+}
+
+static void emitShadowCallStackEpilogue(const TargetInstrInfo &TII,
+                                        MachineFunction &MF,
+                                        MachineBasicBlock &MBB,
+                                        MachineBasicBlock::iterator MBBI,
+                                        const DebugLoc &DL) {
+  // Shadow call stack epilog: ldr x30, [x18, #-8]!
+  BuildMI(MBB, MBBI, DL, TII.get(AArch64::LDRXpre))
+      .addReg(AArch64::X18, RegState::Define)
+      .addReg(AArch64::LR, RegState::Define)
+      .addReg(AArch64::X18)
+      .addImm(-8)
+      .setMIFlag(MachineInstr::FrameDestroy);
+
+  if (MF.getInfo<AArch64FunctionInfo>()->needsAsyncDwarfUnwindInfo(MF)) {
+    unsigned CFIIndex =
+        MF.addFrameInst(MCCFIInstruction::createRestore(nullptr, 18));
+    BuildMI(MBB, MBBI, DL, TII.get(TargetOpcode::CFI_INSTRUCTION))
+        .addCFIIndex(CFIIndex)
+        .setMIFlags(MachineInstr::FrameDestroy);
+  }
+}
+
 void AArch64FrameLowering::emitPrologue(MachineFunction &MF,
                                         MachineBasicBlock &MBB) const {
   MachineBasicBlock::iterator MBBI = MBB.begin();
@@ -1110,8 +1375,7 @@ void AArch64FrameLowering::emitPrologue(MachineFunction &MF,
   const TargetInstrInfo *TII = Subtarget.getInstrInfo();
   MachineModuleInfo &MMI = MF.getMMI();
   AArch64FunctionInfo *AFI = MF.getInfo<AArch64FunctionInfo>();
-  bool needsFrameMoves =
-      MF.needsFrameMoves() && !MF.getTarget().getMCAsmInfo()->usesWindowsCFI();
+  bool EmitCFI = AFI->needsDwarfUnwindInfo(MF);
   bool HasFP = hasFP(MF);
   bool NeedsWinCFI = needsWinCFI(MF);
   bool HasWinCFI = false;
@@ -1129,29 +1393,38 @@ void AArch64FrameLowering::emitPrologue(MachineFunction &MF,
   DebugLoc DL;
 
   const auto &MFnI = *MF.getInfo<AArch64FunctionInfo>();
-  if (MFnI.shouldSignReturnAddress()) {
+  if (needsShadowCallStackPrologueEpilogue(MF))
+    emitShadowCallStackPrologue(*TII, MF, MBB, MBBI, DL, NeedsWinCFI,
+                                MFnI.needsDwarfUnwindInfo(MF));
 
-    unsigned PACI;
+  if (MFnI.shouldSignReturnAddress(MF)) {
     if (MFnI.shouldSignWithBKey()) {
       BuildMI(MBB, MBBI, DL, TII->get(AArch64::EMITBKEY))
           .setMIFlag(MachineInstr::FrameSetup);
-      PACI = Subtarget.hasPAuth() ? AArch64::PACIB : AArch64::PACIBSP;
-    } else {
-      PACI = Subtarget.hasPAuth() ? AArch64::PACIA : AArch64::PACIASP;
     }
 
-    auto MI = BuildMI(MBB, MBBI, DL, TII->get(PACI));
-    if (Subtarget.hasPAuth())
-      MI.addReg(AArch64::LR, RegState::Define)
-          .addReg(AArch64::LR)
-          .addReg(AArch64::SP, RegState::InternalRead);
-    MI.setMIFlag(MachineInstr::FrameSetup);
+    // No SEH opcode for this one; it doesn't materialize into an
+    // instruction on Windows.
+    BuildMI(MBB, MBBI, DL,
+            TII->get(MFnI.shouldSignWithBKey() ? AArch64::PACIBSP
+                                               : AArch64::PACIASP))
+        .setMIFlag(MachineInstr::FrameSetup);
 
-    unsigned CFIIndex =
-        MF.addFrameInst(MCCFIInstruction::createNegateRAState(nullptr));
-    BuildMI(MBB, MBBI, DL, TII->get(TargetOpcode::CFI_INSTRUCTION))
-        .addCFIIndex(CFIIndex)
-        .setMIFlags(MachineInstr::FrameSetup);
+    if (EmitCFI) {
+      unsigned CFIIndex =
+          MF.addFrameInst(MCCFIInstruction::createNegateRAState(nullptr));
+      BuildMI(MBB, MBBI, DL, TII->get(TargetOpcode::CFI_INSTRUCTION))
+          .addCFIIndex(CFIIndex)
+          .setMIFlags(MachineInstr::FrameSetup);
+    } else if (NeedsWinCFI) {
+      HasWinCFI = true;
+      BuildMI(MBB, MBBI, DL, TII->get(AArch64::SEH_PACSignLR))
+          .setMIFlag(MachineInstr::FrameSetup);
+    }
+  }
+  if (EmitCFI && MFnI.isMTETagged()) {
+    BuildMI(MBB, MBBI, DL, TII->get(AArch64::EMITMTETAGGED))
+        .setMIFlag(MachineInstr::FrameSetup);
   }
 
   // We signal the presence of a Swift extended frame to external tools by
@@ -1159,11 +1432,33 @@ void AArch64FrameLowering::emitPrologue(MachineFunction &MF,
   // ORR is sufficient, it is assumed a Swift kernel would initialize the TBI
   // bits so that is still true.
   if (HasFP && AFI->hasSwiftAsyncContext()) {
-    // ORR x29, x29, #0x1000_0000_0000_0000
-    BuildMI(MBB, MBBI, DL, TII->get(AArch64::ORRXri), AArch64::FP)
-        .addUse(AArch64::FP)
-        .addImm(0x1100)
-        .setMIFlag(MachineInstr::FrameSetup);
+    switch (MF.getTarget().Options.SwiftAsyncFramePointer) {
+    case SwiftAsyncFramePointerMode::DeploymentBased:
+      if (Subtarget.swiftAsyncContextIsDynamicallySet()) {
+        // The special symbol below is absolute and has a *value* that can be
+        // combined with the frame pointer to signal an extended frame.
+        BuildMI(MBB, MBBI, DL, TII->get(AArch64::LOADgot), AArch64::X16)
+            .addExternalSymbol("swift_async_extendedFramePointerFlags",
+                               AArch64II::MO_GOT);
+        BuildMI(MBB, MBBI, DL, TII->get(AArch64::ORRXrs), AArch64::FP)
+            .addUse(AArch64::FP)
+            .addUse(AArch64::X16)
+            .addImm(Subtarget.isTargetILP32() ? 32 : 0);
+        break;
+      }
+      [[fallthrough]];
+
+    case SwiftAsyncFramePointerMode::Always:
+      // ORR x29, x29, #0x1000_0000_0000_0000
+      BuildMI(MBB, MBBI, DL, TII->get(AArch64::ORRXri), AArch64::FP)
+          .addUse(AArch64::FP)
+          .addImm(0x1100)
+          .setMIFlag(MachineInstr::FrameSetup);
+      break;
+
+    case SwiftAsyncFramePointerMode::Never:
+      break;
+    }
   }
 
   // All calls are tail calls in GHC calling conv, and functions have no
@@ -1173,7 +1468,7 @@ void AArch64FrameLowering::emitPrologue(MachineFunction &MF,
 
   // Set tagged base pointer to the requested stack slot.
   // Ideally it should match SP value after prologue.
-  Optional<int> TBPI = AFI->getTaggedBasePointerIndex();
+  std::optional<int> TBPI = AFI->getTaggedBasePointerIndex();
   if (TBPI)
     AFI->setTaggedBasePointerOffset(-MFI.getObjectOffset(*TBPI));
   else
@@ -1206,7 +1501,7 @@ void AArch64FrameLowering::emitPrologue(MachineFunction &MF,
       emitFrameOffset(MBB, MBBI, DL, AArch64::SP, AArch64::SP,
                       StackOffset::getFixed(-NumBytes), TII,
                       MachineInstr::FrameSetup, false, NeedsWinCFI, &HasWinCFI);
-      if (!NeedsWinCFI && needsFrameMoves) {
+      if (EmitCFI) {
         // Label used to tie together the PROLOG_LABEL and the MachineMoves.
         MCSymbol *FrameLabel = MMI.getContext().createTempSymbol();
           // Encode the stack size of the leaf function.
@@ -1240,14 +1535,16 @@ void AArch64FrameLowering::emitPrologue(MachineFunction &MF,
     assert(!SVEStackSize && "Cannot combine SP bump with SVE");
     emitFrameOffset(MBB, MBBI, DL, AArch64::SP, AArch64::SP,
                     StackOffset::getFixed(-NumBytes), TII,
-                    MachineInstr::FrameSetup, false, NeedsWinCFI, &HasWinCFI);
+                    MachineInstr::FrameSetup, false, NeedsWinCFI, &HasWinCFI,
+                    EmitCFI);
     NumBytes = 0;
   } else if (HomPrologEpilog) {
     // Stack has been already adjusted.
     NumBytes -= PrologueSaveSize;
   } else if (PrologueSaveSize != 0) {
     MBBI = convertCalleeSaveRestoreToSPPrePostIncDec(
-        MBB, MBBI, DL, TII, -PrologueSaveSize, NeedsWinCFI, &HasWinCFI);
+        MBB, MBBI, DL, TII, -PrologueSaveSize, NeedsWinCFI, &HasWinCFI,
+        EmitCFI);
     NumBytes -= PrologueSaveSize;
   }
   assert(NumBytes >= 0 && "Negative stack allocation size!?");
@@ -1300,11 +1597,45 @@ void AArch64FrameLowering::emitPrologue(MachineFunction &MF,
       emitFrameOffset(MBB, MBBI, DL, AArch64::FP, AArch64::SP,
                       StackOffset::getFixed(FPOffset), TII,
                       MachineInstr::FrameSetup, false, NeedsWinCFI, &HasWinCFI);
+      if (NeedsWinCFI && HasWinCFI) {
+        BuildMI(MBB, MBBI, DL, TII->get(AArch64::SEH_PrologEnd))
+            .setMIFlag(MachineInstr::FrameSetup);
+        // After setting up the FP, the rest of the prolog doesn't need to be
+        // included in the SEH unwind info.
+        NeedsWinCFI = false;
+      }
+    }
+    if (EmitCFI) {
+      // Define the current CFA rule to use the provided FP.
+      const int OffsetToFirstCalleeSaveFromFP =
+          AFI->getCalleeSaveBaseToFrameRecordOffset() -
+          AFI->getCalleeSavedStackSize();
+      Register FramePtr = RegInfo->getFrameRegister(MF);
+      unsigned Reg = RegInfo->getDwarfRegNum(FramePtr, true);
+      unsigned CFIIndex = MF.addFrameInst(MCCFIInstruction::cfiDefCfa(
+          nullptr, Reg, FixedObject - OffsetToFirstCalleeSaveFromFP));
+      BuildMI(MBB, MBBI, DL, TII->get(TargetOpcode::CFI_INSTRUCTION))
+          .addCFIIndex(CFIIndex)
+          .setMIFlags(MachineInstr::FrameSetup);
     }
   }
 
-  if (windowsRequiresStackProbe(MF, NumBytes)) {
-    uint64_t NumWords = NumBytes >> 4;
+  // Now emit the moves for whatever callee saved regs we have (including FP,
+  // LR if those are saved). Frame instructions for SVE register are emitted
+  // later, after the instruction which actually save SVE regs.
+  if (EmitCFI)
+    emitCalleeSavedGPRLocations(MBB, MBBI);
+
+  // Alignment is required for the parent frame, not the funclet
+  const bool NeedsRealignment =
+      NumBytes && !IsFunclet && RegInfo->hasStackRealignment(MF);
+  int64_t RealignmentPadding =
+      (NeedsRealignment && MFI.getMaxAlign() > Align(16))
+          ? MFI.getMaxAlign().value() - 16
+          : 0;
+
+  if (windowsRequiresStackProbe(MF, NumBytes + RealignmentPadding)) {
+    uint64_t NumWords = (NumBytes + RealignmentPadding) >> 4;
     if (NeedsWinCFI) {
       HasWinCFI = true;
       // alloc_l can hold at most 256MB, so assume that NumBytes doesn't
@@ -1338,13 +1669,14 @@ void AArch64FrameLowering::emitPrologue(MachineFunction &MF,
           .setMIFlags(MachineInstr::FrameSetup);
     }
 
+    const char* ChkStk = Subtarget.getChkStkName();
     switch (MF.getTarget().getCodeModel()) {
     case CodeModel::Tiny:
     case CodeModel::Small:
     case CodeModel::Medium:
     case CodeModel::Kernel:
       BuildMI(MBB, MBBI, DL, TII->get(AArch64::BL))
-          .addExternalSymbol("__chkstk")
+          .addExternalSymbol(ChkStk)
           .addReg(AArch64::X15, RegState::Implicit)
           .addReg(AArch64::X16, RegState::Implicit | RegState::Define | RegState::Dead)
           .addReg(AArch64::X17, RegState::Implicit | RegState::Define | RegState::Dead)
@@ -1359,8 +1691,8 @@ void AArch64FrameLowering::emitPrologue(MachineFunction &MF,
     case CodeModel::Large:
       BuildMI(MBB, MBBI, DL, TII->get(AArch64::MOVaddrEXT))
           .addReg(AArch64::X16, RegState::Define)
-          .addExternalSymbol("__chkstk")
-          .addExternalSymbol("__chkstk")
+          .addExternalSymbol(ChkStk)
+          .addExternalSymbol(ChkStk)
           .setMIFlags(MachineInstr::FrameSetup);
       if (NeedsWinCFI) {
         HasWinCFI = true;
@@ -1395,6 +1727,23 @@ void AArch64FrameLowering::emitPrologue(MachineFunction &MF,
           .setMIFlag(MachineInstr::FrameSetup);
     }
     NumBytes = 0;
+
+    if (RealignmentPadding > 0) {
+      BuildMI(MBB, MBBI, DL, TII->get(AArch64::ADDXri), AArch64::X15)
+          .addReg(AArch64::SP)
+          .addImm(RealignmentPadding)
+          .addImm(0);
+
+      uint64_t AndMask = ~(MFI.getMaxAlign().value() - 1);
+      BuildMI(MBB, MBBI, DL, TII->get(AArch64::ANDXri), AArch64::SP)
+          .addReg(AArch64::X15, RegState::Kill)
+          .addImm(AArch64_AM::encodeLogicalImmediate(AndMask, 64));
+      AFI->setStackRealigned(true);
+
+      // No need for SEH instructions here; if we're realigning the stack,
+      // we've set a frame pointer and already finished the SEH prologue.
+      assert(!NeedsWinCFI);
+    }
   }
 
   StackOffset AllocateBefore = SVEStackSize, AllocateAfter = {};
@@ -1415,20 +1764,24 @@ void AArch64FrameLowering::emitPrologue(MachineFunction &MF,
   }
 
   // Allocate space for the callee saves (if any).
-  emitFrameOffset(MBB, CalleeSavesBegin, DL, AArch64::SP, AArch64::SP,
-                  -AllocateBefore, TII,
-                  MachineInstr::FrameSetup);
+  emitFrameOffset(
+      MBB, CalleeSavesBegin, DL, AArch64::SP, AArch64::SP, -AllocateBefore, TII,
+      MachineInstr::FrameSetup, false, false, nullptr,
+      EmitCFI && !HasFP && AllocateBefore,
+      StackOffset::getFixed((int64_t)MFI.getStackSize() - NumBytes));
+
+  if (EmitCFI)
+    emitCalleeSavedSVELocations(MBB, CalleeSavesEnd);
 
   // Finally allocate remaining SVE stack space.
   emitFrameOffset(MBB, CalleeSavesEnd, DL, AArch64::SP, AArch64::SP,
-                  -AllocateAfter, TII,
-                  MachineInstr::FrameSetup);
+                  -AllocateAfter, TII, MachineInstr::FrameSetup, false, false,
+                  nullptr, EmitCFI && !HasFP && AllocateAfter,
+                  AllocateBefore + StackOffset::getFixed(
+                                       (int64_t)MFI.getStackSize() - NumBytes));
 
   // Allocate space for the rest of the frame.
   if (NumBytes) {
-    // Alignment is required for the parent frame, not the funclet
-    const bool NeedsRealignment =
-        !IsFunclet && RegInfo->hasStackRealignment(MF);
     unsigned scratchSPReg = AArch64::SP;
 
     if (NeedsRealignment) {
@@ -1437,40 +1790,35 @@ void AArch64FrameLowering::emitPrologue(MachineFunction &MF,
     }
 
     // If we're a leaf function, try using the red zone.
-    if (!canUseRedZone(MF))
+    if (!canUseRedZone(MF)) {
       // FIXME: in the case of dynamic re-alignment, NumBytes doesn't have
       // the correct value here, as NumBytes also includes padding bytes,
       // which shouldn't be counted here.
-      emitFrameOffset(MBB, MBBI, DL, scratchSPReg, AArch64::SP,
-                      StackOffset::getFixed(-NumBytes), TII,
-                      MachineInstr::FrameSetup, false, NeedsWinCFI, &HasWinCFI);
-
+      emitFrameOffset(
+          MBB, MBBI, DL, scratchSPReg, AArch64::SP,
+          StackOffset::getFixed(-NumBytes), TII, MachineInstr::FrameSetup,
+          false, NeedsWinCFI, &HasWinCFI, EmitCFI && !HasFP,
+          SVEStackSize +
+              StackOffset::getFixed((int64_t)MFI.getStackSize() - NumBytes));
+    }
     if (NeedsRealignment) {
-      const unsigned NrBitsToZero = Log2(MFI.getMaxAlign());
-      assert(NrBitsToZero > 1);
+      assert(MFI.getMaxAlign() > Align(1));
       assert(scratchSPReg != AArch64::SP);
 
       // SUB X9, SP, NumBytes
       //   -- X9 is temporary register, so shouldn't contain any live data here,
       //   -- free to use. This is already produced by emitFrameOffset above.
       // AND SP, X9, 0b11111...0000
-      // The logical immediates have a non-trivial encoding. The following
-      // formula computes the encoded immediate with all ones but
-      // NrBitsToZero zero bits as least significant bits.
-      uint32_t andMaskEncoded = (1 << 12)                         // = N
-                                | ((64 - NrBitsToZero) << 6)      // immr
-                                | ((64 - NrBitsToZero - 1) << 0); // imms
+      uint64_t AndMask = ~(MFI.getMaxAlign().value() - 1);
 
       BuildMI(MBB, MBBI, DL, TII->get(AArch64::ANDXri), AArch64::SP)
           .addReg(scratchSPReg, RegState::Kill)
-          .addImm(andMaskEncoded);
+          .addImm(AArch64_AM::encodeLogicalImmediate(AndMask, 64));
       AFI->setStackRealigned(true);
-      if (NeedsWinCFI) {
-        HasWinCFI = true;
-        BuildMI(MBB, MBBI, DL, TII->get(AArch64::SEH_StackAlloc))
-            .addImm(NumBytes & andMaskEncoded)
-            .setMIFlag(MachineInstr::FrameSetup);
-      }
+
+      // No need for SEH instructions here; if we're realigning the stack,
+      // we've set a frame pointer and already finished the SEH prologue.
+      assert(!NeedsWinCFI);
     }
   }
 
@@ -1511,115 +1859,12 @@ void AArch64FrameLowering::emitPrologue(MachineFunction &MF,
       MBB.addLiveIn(AArch64::X1);
     }
   }
-
-  if (needsFrameMoves) {
-    // An example of the prologue:
-    //
-    //     .globl __foo
-    //     .align 2
-    //  __foo:
-    // Ltmp0:
-    //     .cfi_startproc
-    //     .cfi_personality 155, ___gxx_personality_v0
-    // Leh_func_begin:
-    //     .cfi_lsda 16, Lexception33
-    //
-    //     stp  xa,bx, [sp, -#offset]!
-    //     ...
-    //     stp  x28, x27, [sp, #offset-32]
-    //     stp  fp, lr, [sp, #offset-16]
-    //     add  fp, sp, #offset - 16
-    //     sub  sp, sp, #1360
-    //
-    // The Stack:
-    //       +-------------------------------------------+
-    // 10000 | ........ | ........ | ........ | ........ |
-    // 10004 | ........ | ........ | ........ | ........ |
-    //       +-------------------------------------------+
-    // 10008 | ........ | ........ | ........ | ........ |
-    // 1000c | ........ | ........ | ........ | ........ |
-    //       +===========================================+
-    // 10010 |                X28 Register               |
-    // 10014 |                X28 Register               |
-    //       +-------------------------------------------+
-    // 10018 |                X27 Register               |
-    // 1001c |                X27 Register               |
-    //       +===========================================+
-    // 10020 |                Frame Pointer              |
-    // 10024 |                Frame Pointer              |
-    //       +-------------------------------------------+
-    // 10028 |                Link Register              |
-    // 1002c |                Link Register              |
-    //       +===========================================+
-    // 10030 | ........ | ........ | ........ | ........ |
-    // 10034 | ........ | ........ | ........ | ........ |
-    //       +-------------------------------------------+
-    // 10038 | ........ | ........ | ........ | ........ |
-    // 1003c | ........ | ........ | ........ | ........ |
-    //       +-------------------------------------------+
-    //
-    //     [sp] = 10030        ::    >>initial value<<
-    //     sp = 10020          ::  stp fp, lr, [sp, #-16]!
-    //     fp = sp == 10020    ::  mov fp, sp
-    //     [sp] == 10020       ::  stp x28, x27, [sp, #-16]!
-    //     sp == 10010         ::    >>final value<<
-    //
-    // The frame pointer (w29) points to address 10020. If we use an offset of
-    // '16' from 'w29', we get the CFI offsets of -8 for w30, -16 for w29, -24
-    // for w27, and -32 for w28:
-    //
-    //  Ltmp1:
-    //     .cfi_def_cfa w29, 16
-    //  Ltmp2:
-    //     .cfi_offset w30, -8
-    //  Ltmp3:
-    //     .cfi_offset w29, -16
-    //  Ltmp4:
-    //     .cfi_offset w27, -24
-    //  Ltmp5:
-    //     .cfi_offset w28, -32
-
-    if (HasFP) {
-      const int OffsetToFirstCalleeSaveFromFP =
-          AFI->getCalleeSaveBaseToFrameRecordOffset() -
-          AFI->getCalleeSavedStackSize();
-      Register FramePtr = RegInfo->getFrameRegister(MF);
-
-      // Define the current CFA rule to use the provided FP.
-      unsigned Reg = RegInfo->getDwarfRegNum(FramePtr, true);
-      unsigned CFIIndex = MF.addFrameInst(
-          MCCFIInstruction::cfiDefCfa(nullptr, Reg, FixedObject - OffsetToFirstCalleeSaveFromFP));
-      BuildMI(MBB, MBBI, DL, TII->get(TargetOpcode::CFI_INSTRUCTION))
-          .addCFIIndex(CFIIndex)
-          .setMIFlags(MachineInstr::FrameSetup);
-    } else {
-      unsigned CFIIndex;
-      if (SVEStackSize) {
-        const TargetSubtargetInfo &STI = MF.getSubtarget();
-        const TargetRegisterInfo &TRI = *STI.getRegisterInfo();
-        StackOffset TotalSize =
-            SVEStackSize + StackOffset::getFixed((int64_t)MFI.getStackSize());
-        CFIIndex = MF.addFrameInst(createDefCFAExpressionFromSP(TRI, TotalSize));
-      } else {
-        // Encode the stack size of the leaf function.
-        CFIIndex = MF.addFrameInst(
-            MCCFIInstruction::cfiDefCfaOffset(nullptr, MFI.getStackSize()));
-      }
-      BuildMI(MBB, MBBI, DL, TII->get(TargetOpcode::CFI_INSTRUCTION))
-          .addCFIIndex(CFIIndex)
-          .setMIFlags(MachineInstr::FrameSetup);
-    }
-
-    // Now emit the moves for whatever callee saved regs we have (including FP,
-    // LR if those are saved).
-    emitCalleeSavedFrameMoves(MBB, MBBI);
-  }
 }
 
-static void InsertReturnAddressAuth(MachineFunction &MF,
-                                    MachineBasicBlock &MBB) {
+static void InsertReturnAddressAuth(MachineFunction &MF, MachineBasicBlock &MBB,
+                                    bool NeedsWinCFI, bool *HasWinCFI) {
   const auto &MFI = *MF.getInfo<AArch64FunctionInfo>();
-  if (!MFI.shouldSignReturnAddress())
+  if (!MFI.shouldSignReturnAddress(MF))
     return;
   const AArch64Subtarget &Subtarget = MF.getSubtarget<AArch64Subtarget>();
   const TargetInstrInfo *TII = Subtarget.getInstrInfo();
@@ -1632,9 +1877,12 @@ static void InsertReturnAddressAuth(MachineFunction &MF,
   // The AUTIASP instruction assembles to a hint instruction before v8.3a so
   // this instruction can safely used for any v8a architecture.
   // From v8.3a onwards there are optimised authenticate LR and return
-  // instructions, namely RETA{A,B}, that can be used instead.
-  if (Subtarget.hasPAuth() && MBBI != MBB.end() &&
-      MBBI->getOpcode() == AArch64::RET_ReallyLR) {
+  // instructions, namely RETA{A,B}, that can be used instead. In this case the
+  // DW_CFA_AARCH64_negate_ra_state can't be emitted.
+  if (Subtarget.hasPAuth() &&
+      !MF.getFunction().hasFnAttribute(Attribute::ShadowCallStack) &&
+      MBBI != MBB.end() && MBBI->getOpcode() == AArch64::RET_ReallyLR &&
+      !NeedsWinCFI) {
     BuildMI(MBB, MBBI, DL,
             TII->get(MFI.shouldSignWithBKey() ? AArch64::RETAB : AArch64::RETAA))
         .copyImplicitOps(*MBBI);
@@ -1644,6 +1892,17 @@ static void InsertReturnAddressAuth(MachineFunction &MF,
         MBB, MBBI, DL,
         TII->get(MFI.shouldSignWithBKey() ? AArch64::AUTIBSP : AArch64::AUTIASP))
         .setMIFlag(MachineInstr::FrameDestroy);
+
+    unsigned CFIIndex =
+        MF.addFrameInst(MCCFIInstruction::createNegateRAState(nullptr));
+    BuildMI(MBB, MBBI, DL, TII->get(TargetOpcode::CFI_INSTRUCTION))
+        .addCFIIndex(CFIIndex)
+        .setMIFlags(MachineInstr::FrameDestroy);
+    if (NeedsWinCFI) {
+      *HasWinCFI = true;
+      BuildMI(MBB, MBBI, DL, TII->get(AArch64::SEH_PACSignLR))
+          .setMIFlag(MachineInstr::FrameDestroy);
+    }
   }
 }
 
@@ -1665,6 +1924,8 @@ void AArch64FrameLowering::emitEpilogue(MachineFunction &MF,
   const TargetInstrInfo *TII = Subtarget.getInstrInfo();
   DebugLoc DL;
   bool NeedsWinCFI = needsWinCFI(MF);
+  bool EmitCFI =
+      MF.getInfo<AArch64FunctionInfo>()->needsAsyncDwarfUnwindInfo(MF);
   bool HasWinCFI = false;
   bool IsFunclet = false;
   auto WinCFI = make_scope_exit([&]() { assert(HasWinCFI == MF.hasWinCFI()); });
@@ -1674,6 +1935,18 @@ void AArch64FrameLowering::emitEpilogue(MachineFunction &MF,
     IsFunclet = isFuncletReturnInstr(*MBBI);
   }
 
+  auto FinishingTouches = make_scope_exit([&]() {
+    InsertReturnAddressAuth(MF, MBB, NeedsWinCFI, &HasWinCFI);
+    if (needsShadowCallStackPrologueEpilogue(MF))
+      emitShadowCallStackEpilogue(*TII, MF, MBB, MBB.getFirstTerminator(), DL);
+    if (EmitCFI)
+      emitCalleeSavedGPRRestores(MBB, MBB.getFirstTerminator());
+    if (HasWinCFI)
+      BuildMI(MBB, MBB.getFirstTerminator(), DL,
+              TII->get(AArch64::SEH_EpilogEnd))
+          .setMIFlag(MachineInstr::FrameDestroy);
+  });
+
   int64_t NumBytes = IsFunclet ? getWinEHFuncletFrameSize(MF)
                                : MFI.getStackSize();
   AArch64FunctionInfo *AFI = MF.getInfo<AArch64FunctionInfo>();
@@ -1686,36 +1959,6 @@ void AArch64FrameLowering::emitEpilogue(MachineFunction &MF,
   // How much of the stack used by incoming arguments this function is expected
   // to restore in this particular epilogue.
   int64_t ArgumentStackToRestore = getArgumentStackToRestore(MF, MBB);
-
-  // The stack frame should be like below,
-  //
-  //      ----------------------                     ---
-  //      |                    |                      |
-  //      | BytesInStackArgArea|              CalleeArgStackSize
-  //      | (NumReusableBytes) |                (of tail call)
-  //      |                    |                     ---
-  //      |                    |                      |
-  //      ---------------------|        ---           |
-  //      |                    |         |            |
-  //      |   CalleeSavedReg   |         |            |
-  //      | (CalleeSavedStackSize)|      |            |
-  //      |                    |         |            |
-  //      ---------------------|         |         NumBytes
-  //      |                    |     StackSize  (StackAdjustUp)
-  //      |   LocalStackSize   |         |            |
-  //      | (covering callee   |         |            |
-  //      |       args)        |         |            |
-  //      |                    |         |            |
-  //      ----------------------        ---          ---
-  //
-  // So NumBytes = StackSize + BytesInStackArgArea - CalleeArgStackSize
-  //             = StackSize + ArgumentPopSize
-  //
-  // AArch64TargetLowering::LowerCall figures out ArgumentPopSize and keeps
-  // it as the 2nd argument of AArch64ISD::TC_RETURN.
-
-  auto Cleanup = make_scope_exit([&] { InsertReturnAddressAuth(MF, MBB); });
-
   bool IsWin64 =
       Subtarget.isCallingConvWin64(MF.getFunction().getCallingConv());
   unsigned FixedObject = getFixedObjectSize(MF, AFI, IsWin64, IsFunclet);
@@ -1750,9 +1993,11 @@ void AArch64FrameLowering::emitEpilogue(MachineFunction &MF,
   bool CombineSPBump = shouldCombineCSRLocalStackBumpInEpilogue(MBB, NumBytes);
   // Assume we can't combine the last pop with the sp restore.
 
+  bool CombineAfterCSRBump = false;
   if (!CombineSPBump && PrologueSaveSize != 0) {
     MachineBasicBlock::iterator Pop = std::prev(MBB.getFirstTerminator());
-    while (AArch64InstrInfo::isSEHInstruction(*Pop))
+    while (Pop->getOpcode() == TargetOpcode::CFI_INSTRUCTION ||
+           AArch64InstrInfo::isSEHInstruction(*Pop))
       Pop = std::prev(Pop);
     // Converting the last ldp to a post-index ldp is valid only if the last
     // ldp's offset is 0.
@@ -1760,15 +2005,17 @@ void AArch64FrameLowering::emitEpilogue(MachineFunction &MF,
     // If the offset is 0 and the AfterCSR pop is not actually trying to
     // allocate more stack for arguments (in space that an untimely interrupt
     // may clobber), convert it to a post-index ldp.
-    if (OffsetOp.getImm() == 0 && AfterCSRPopSize >= 0)
+    if (OffsetOp.getImm() == 0 && AfterCSRPopSize >= 0) {
       convertCalleeSaveRestoreToSPPrePostIncDec(
-          MBB, Pop, DL, TII, PrologueSaveSize, NeedsWinCFI, &HasWinCFI, false);
-    else {
+          MBB, Pop, DL, TII, PrologueSaveSize, NeedsWinCFI, &HasWinCFI, EmitCFI,
+          MachineInstr::FrameDestroy, PrologueSaveSize);
+    } else {
       // If not, make sure to emit an add after the last ldp.
       // We're doing this by transfering the size to be restored from the
       // adjustment *before* the CSR pops to the adjustment *after* the CSR
       // pops.
       AfterCSRPopSize += PrologueSaveSize;
+      CombineAfterCSRBump = true;
     }
   }
 
@@ -1801,15 +2048,27 @@ void AArch64FrameLowering::emitEpilogue(MachineFunction &MF,
   }
 
   if (hasFP(MF) && AFI->hasSwiftAsyncContext()) {
-    // We need to reset FP to its untagged state on return. Bit 60 is currently
-    // used to show the presence of an extended frame.
-
-    // BIC x29, x29, #0x1000_0000_0000_0000
-    BuildMI(MBB, MBB.getFirstTerminator(), DL, TII->get(AArch64::ANDXri),
-            AArch64::FP)
-        .addUse(AArch64::FP)
-        .addImm(0x10fe)
-        .setMIFlag(MachineInstr::FrameDestroy);
+    switch (MF.getTarget().Options.SwiftAsyncFramePointer) {
+    case SwiftAsyncFramePointerMode::DeploymentBased:
+      // Avoid the reload as it is GOT relative, and instead fall back to the
+      // hardcoded value below.  This allows a mismatch between the OS and
+      // application without immediately terminating on the difference.
+      [[fallthrough]];
+    case SwiftAsyncFramePointerMode::Always:
+      // We need to reset FP to its untagged state on return. Bit 60 is
+      // currently used to show the presence of an extended frame.
+
+      // BIC x29, x29, #0x1000_0000_0000_0000
+      BuildMI(MBB, MBB.getFirstTerminator(), DL, TII->get(AArch64::ANDXri),
+              AArch64::FP)
+          .addUse(AArch64::FP)
+          .addImm(0x10fe)
+          .setMIFlag(MachineInstr::FrameDestroy);
+      break;
+
+    case SwiftAsyncFramePointerMode::Never:
+      break;
+    }
   }
 
   const StackOffset &SVEStackSize = getSVEStackSize(MF);
@@ -1817,14 +2076,22 @@ void AArch64FrameLowering::emitEpilogue(MachineFunction &MF,
   // If there is a single SP update, insert it before the ret and we're done.
   if (CombineSPBump) {
     assert(!SVEStackSize && "Cannot combine SP bump with SVE");
+
+    // When we are about to restore the CSRs, the CFA register is SP again.
+    if (EmitCFI && hasFP(MF)) {
+      const AArch64RegisterInfo &RegInfo = *Subtarget.getRegisterInfo();
+      unsigned Reg = RegInfo.getDwarfRegNum(AArch64::SP, true);
+      unsigned CFIIndex =
+          MF.addFrameInst(MCCFIInstruction::cfiDefCfa(nullptr, Reg, NumBytes));
+      BuildMI(MBB, LastPopI, DL, TII->get(TargetOpcode::CFI_INSTRUCTION))
+          .addCFIIndex(CFIIndex)
+          .setMIFlags(MachineInstr::FrameDestroy);
+    }
+
     emitFrameOffset(MBB, MBB.getFirstTerminator(), DL, AArch64::SP, AArch64::SP,
                     StackOffset::getFixed(NumBytes + (int64_t)AfterCSRPopSize),
                     TII, MachineInstr::FrameDestroy, false, NeedsWinCFI,
-                    &HasWinCFI);
-    if (HasWinCFI)
-      BuildMI(MBB, MBB.getFirstTerminator(), DL,
-              TII->get(AArch64::SEH_EpilogEnd))
-          .setMIFlag(MachineInstr::FrameDestroy);
+                    &HasWinCFI, EmitCFI, StackOffset::getFixed(NumBytes));
     return;
   }
 
@@ -1852,30 +2119,44 @@ void AArch64FrameLowering::emitEpilogue(MachineFunction &MF,
 
   // Deallocate the SVE area.
   if (SVEStackSize) {
-    if (AFI->isStackRealigned()) {
-      if (int64_t CalleeSavedSize = AFI->getSVECalleeSavedStackSize())
+    // If we have stack realignment or variable sized objects on the stack,
+    // restore the stack pointer from the frame pointer prior to SVE CSR
+    // restoration.
+    if (AFI->isStackRealigned() || MFI.hasVarSizedObjects()) {
+      if (int64_t CalleeSavedSize = AFI->getSVECalleeSavedStackSize()) {
         // Set SP to start of SVE callee-save area from which they can
         // be reloaded. The code below will deallocate the stack space
         // space by moving FP -> SP.
         emitFrameOffset(MBB, RestoreBegin, DL, AArch64::SP, AArch64::FP,
                         StackOffset::getScalable(-CalleeSavedSize), TII,
                         MachineInstr::FrameDestroy);
+      }
     } else {
       if (AFI->getSVECalleeSavedStackSize()) {
         // Deallocate the non-SVE locals first before we can deallocate (and
         // restore callee saves) from the SVE area.
-        emitFrameOffset(MBB, RestoreBegin, DL, AArch64::SP, AArch64::SP,
-                        StackOffset::getFixed(NumBytes), TII,
-                        MachineInstr::FrameDestroy);
+        emitFrameOffset(
+            MBB, RestoreBegin, DL, AArch64::SP, AArch64::SP,
+            StackOffset::getFixed(NumBytes), TII, MachineInstr::FrameDestroy,
+            false, false, nullptr, EmitCFI && !hasFP(MF),
+            SVEStackSize + StackOffset::getFixed(NumBytes + PrologueSaveSize));
         NumBytes = 0;
       }
 
       emitFrameOffset(MBB, RestoreBegin, DL, AArch64::SP, AArch64::SP,
-                      DeallocateBefore, TII, MachineInstr::FrameDestroy);
+                      DeallocateBefore, TII, MachineInstr::FrameDestroy, false,
+                      false, nullptr, EmitCFI && !hasFP(MF),
+                      SVEStackSize +
+                          StackOffset::getFixed(NumBytes + PrologueSaveSize));
 
       emitFrameOffset(MBB, RestoreEnd, DL, AArch64::SP, AArch64::SP,
-                      DeallocateAfter, TII, MachineInstr::FrameDestroy);
+                      DeallocateAfter, TII, MachineInstr::FrameDestroy, false,
+                      false, nullptr, EmitCFI && !hasFP(MF),
+                      DeallocateAfter +
+                          StackOffset::getFixed(NumBytes + PrologueSaveSize));
     }
+    if (EmitCFI)
+      emitCalleeSavedSVERestores(MBB, RestoreEnd);
   }
 
   if (!hasFP(MF)) {
@@ -1885,28 +2166,24 @@ void AArch64FrameLowering::emitEpilogue(MachineFunction &MF,
     if (RedZone && AfterCSRPopSize == 0)
       return;
 
+    // Pop the local variables off the stack. If there are no callee-saved
+    // registers, it means we are actually positioned at the terminator and can
+    // combine stack increment for the locals and the stack increment for
+    // callee-popped arguments into (possibly) a single instruction and be done.
     bool NoCalleeSaveRestore = PrologueSaveSize == 0;
     int64_t StackRestoreBytes = RedZone ? 0 : NumBytes;
     if (NoCalleeSaveRestore)
       StackRestoreBytes += AfterCSRPopSize;
 
+    emitFrameOffset(
+        MBB, LastPopI, DL, AArch64::SP, AArch64::SP,
+        StackOffset::getFixed(StackRestoreBytes), TII,
+        MachineInstr::FrameDestroy, false, NeedsWinCFI, &HasWinCFI, EmitCFI,
+        StackOffset::getFixed((RedZone ? 0 : NumBytes) + PrologueSaveSize));
+
     // If we were able to combine the local stack pop with the argument pop,
     // then we're done.
-    bool Done = NoCalleeSaveRestore || AfterCSRPopSize == 0;
-
-    // If we're done after this, make sure to help the load store optimizer.
-    if (Done)
-      adaptForLdStOpt(MBB, MBB.getFirstTerminator(), LastPopI);
-
-    emitFrameOffset(MBB, LastPopI, DL, AArch64::SP, AArch64::SP,
-                    StackOffset::getFixed(StackRestoreBytes), TII,
-                    MachineInstr::FrameDestroy, false, NeedsWinCFI, &HasWinCFI);
-    if (Done) {
-      if (HasWinCFI) {
-        BuildMI(MBB, MBB.getFirstTerminator(), DL,
-                TII->get(AArch64::SEH_EpilogEnd))
-            .setMIFlag(MachineInstr::FrameDestroy);
-      }
+    if (NoCalleeSaveRestore || AfterCSRPopSize == 0) {
       return;
     }
 
@@ -1927,33 +2204,30 @@ void AArch64FrameLowering::emitEpilogue(MachineFunction &MF,
                     StackOffset::getFixed(NumBytes), TII,
                     MachineInstr::FrameDestroy, false, NeedsWinCFI);
 
+  // When we are about to restore the CSRs, the CFA register is SP again.
+  if (EmitCFI && hasFP(MF)) {
+    const AArch64RegisterInfo &RegInfo = *Subtarget.getRegisterInfo();
+    unsigned Reg = RegInfo.getDwarfRegNum(AArch64::SP, true);
+    unsigned CFIIndex = MF.addFrameInst(
+        MCCFIInstruction::cfiDefCfa(nullptr, Reg, PrologueSaveSize));
+    BuildMI(MBB, LastPopI, DL, TII->get(TargetOpcode::CFI_INSTRUCTION))
+        .addCFIIndex(CFIIndex)
+        .setMIFlags(MachineInstr::FrameDestroy);
+  }
+
   // This must be placed after the callee-save restore code because that code
   // assumes the SP is at the same location as it was after the callee-save save
   // code in the prologue.
   if (AfterCSRPopSize) {
     assert(AfterCSRPopSize > 0 && "attempting to reallocate arg stack that an "
                                   "interrupt may have clobbered");
-    // Find an insertion point for the first ldp so that it goes before the
-    // shadow call stack epilog instruction. This ensures that the restore of
-    // lr from x18 is placed after the restore from sp.
-    auto FirstSPPopI = MBB.getFirstTerminator();
-    while (FirstSPPopI != Begin) {
-      auto Prev = std::prev(FirstSPPopI);
-      if (Prev->getOpcode() != AArch64::LDRXpre ||
-          Prev->getOperand(0).getReg() == AArch64::SP)
-        break;
-      FirstSPPopI = Prev;
-    }
 
-    adaptForLdStOpt(MBB, FirstSPPopI, LastPopI);
-
-    emitFrameOffset(MBB, FirstSPPopI, DL, AArch64::SP, AArch64::SP,
-                    StackOffset::getFixed(AfterCSRPopSize), TII,
-                    MachineInstr::FrameDestroy, false, NeedsWinCFI, &HasWinCFI);
+    emitFrameOffset(
+        MBB, MBB.getFirstTerminator(), DL, AArch64::SP, AArch64::SP,
+        StackOffset::getFixed(AfterCSRPopSize), TII, MachineInstr::FrameDestroy,
+        false, NeedsWinCFI, &HasWinCFI, EmitCFI,
+        StackOffset::getFixed(CombineAfterCSRBump ? PrologueSaveSize : 0));
   }
-  if (HasWinCFI)
-    BuildMI(MBB, MBB.getFirstTerminator(), DL, TII->get(AArch64::SEH_EpilogEnd))
-        .setMIFlag(MachineInstr::FrameDestroy);
 }
 
 /// getFrameIndexReference - Provide a base+offset reference to an FI slot for
@@ -2040,8 +2314,9 @@ StackOffset AArch64FrameLowering::resolveFrameOffsetReference(
   // right thing for the emergency spill slot.
   bool UseFP = false;
   if (AFI->hasStackFrame() && !isSVE) {
-    // We shouldn't prefer using the FP when there is an SVE area
-    // in between the FP and the non-SVE locals/spills.
+    // We shouldn't prefer using the FP to access fixed-sized stack objects when
+    // there are scalable (SVE) objects in between the FP and the fixed-sized
+    // objects.
     PreferFP &= !SVEStackSize;
 
     // Note: Keeping the following as multiple 'if' statements rather than
@@ -2062,7 +2337,7 @@ StackOffset AArch64FrameLowering::resolveFrameOffsetReference(
       // offsets is smaller than for positive ones. If an offset is available
       // via the FP and the SP, use whichever is closest.
       bool FPOffsetFits = !ForSimm || FPOffset >= -256;
-      PreferFP |= Offset > -FPOffset;
+      PreferFP |= Offset > -FPOffset && !SVEStackSize;
 
       if (MFI.hasVarSizedObjects()) {
         // If we have variable sized objects, we can use either FP or BP, as the
@@ -2171,7 +2446,8 @@ static bool produceCompactUnwindFrame(MachineFunction &MF) {
 }
 
 static bool invalidateWindowsRegisterPairing(unsigned Reg1, unsigned Reg2,
-                                             bool NeedsWinCFI, bool IsFirst) {
+                                             bool NeedsWinCFI, bool IsFirst,
+                                             const TargetRegisterInfo *TRI) {
   // If we are generating register pairs for a Windows function that requires
   // EH support, then pair consecutive registers only.  There are no unwind
   // opcodes for saves/restores of non-consectuve register pairs.
@@ -2183,7 +2459,7 @@ static bool invalidateWindowsRegisterPairing(unsigned Reg1, unsigned Reg2,
     return true;
   if (!NeedsWinCFI)
     return false;
-  if (Reg2 == Reg1 + 1)
+  if (TRI->getEncodingValue(Reg2) == TRI->getEncodingValue(Reg1) + 1)
     return false;
   // If pairing a GPR with LR, the pair can be described by the save_lrpair
   // opcode. If this is the first register pair, it would end up with a
@@ -2202,9 +2478,11 @@ static bool invalidateWindowsRegisterPairing(unsigned Reg1, unsigned Reg2,
 /// the frame-record. This means any other register pairing with LR is invalid.
 static bool invalidateRegisterPairing(unsigned Reg1, unsigned Reg2,
                                       bool UsesWinAAPCS, bool NeedsWinCFI,
-                                      bool NeedsFrameRecord, bool IsFirst) {
+                                      bool NeedsFrameRecord, bool IsFirst,
+                                      const TargetRegisterInfo *TRI) {
   if (UsesWinAAPCS)
-    return invalidateWindowsRegisterPairing(Reg1, Reg2, NeedsWinCFI, IsFirst);
+    return invalidateWindowsRegisterPairing(Reg1, Reg2, NeedsWinCFI, IsFirst,
+                                            TRI);
 
   // If we need to store the frame record, don't pair any register
   // with LR other than FP.
@@ -2249,7 +2527,7 @@ struct RegPairInfo {
 static void computeCalleeSaveRegisterPairs(
     MachineFunction &MF, ArrayRef<CalleeSavedInfo> CSI,
     const TargetRegisterInfo *TRI, SmallVectorImpl<RegPairInfo> &RegPairs,
-    bool &NeedShadowCallStackProlog, bool NeedsFrameRecord) {
+    bool NeedsFrameRecord) {
 
   if (CSI.empty())
     return;
@@ -2263,8 +2541,8 @@ static void computeCalleeSaveRegisterPairs(
   (void)CC;
   // MachO's compact unwind format relies on all registers being stored in
   // pairs.
-  assert((!produceCompactUnwindFrame(MF) ||
-          CC == CallingConv::PreserveMost ||
+  assert((!produceCompactUnwindFrame(MF) || CC == CallingConv::PreserveMost ||
+          CC == CallingConv::CXX_FAST_TLS || CC == CallingConv::Win64 ||
           (Count & 1) == 0) &&
          "Odd number of callee-saved regs to spill!");
   int ByteOffset = AFI->getCalleeSavedStackSize();
@@ -2303,19 +2581,20 @@ static void computeCalleeSaveRegisterPairs(
 
     // Add the next reg to the pair if it is in the same register class.
     if (unsigned(i + RegInc) < Count) {
-      unsigned NextReg = CSI[i + RegInc].getReg();
+      Register NextReg = CSI[i + RegInc].getReg();
       bool IsFirst = i == FirstReg;
       switch (RPI.Type) {
       case RegPairInfo::GPR:
         if (AArch64::GPR64RegClass.contains(NextReg) &&
             !invalidateRegisterPairing(RPI.Reg1, NextReg, IsWindows,
-                                       NeedsWinCFI, NeedsFrameRecord, IsFirst))
+                                       NeedsWinCFI, NeedsFrameRecord, IsFirst,
+                                       TRI))
           RPI.Reg2 = NextReg;
         break;
       case RegPairInfo::FPR64:
         if (AArch64::FPR64RegClass.contains(NextReg) &&
             !invalidateWindowsRegisterPairing(RPI.Reg1, NextReg, NeedsWinCFI,
-                                              IsFirst))
+                                              IsFirst, TRI))
           RPI.Reg2 = NextReg;
         break;
       case RegPairInfo::FPR128:
@@ -2328,15 +2607,6 @@ static void computeCalleeSaveRegisterPairs(
       }
     }
 
-    // If either of the registers to be saved is the lr register, it means that
-    // we also need to save lr in the shadow call stack.
-    if ((RPI.Reg1 == AArch64::LR || RPI.Reg2 == AArch64::LR) &&
-        MF.getFunction().hasFnAttribute(Attribute::ShadowCallStack)) {
-      if (!MF.getSubtarget<AArch64Subtarget>().isXRegisterReserved(18))
-        report_fatal_error("Must reserve x18 to use shadow call stack");
-      NeedShadowCallStackProlog = true;
-    }
-
     // GPRs and FPRs are saved in pairs of 64-bit regs. We expect the CSI
     // list to come in sorted by frame index so that we can issue the store
     // pair instructions directly. Assert if we see anything otherwise.
@@ -2358,8 +2628,8 @@ static void computeCalleeSaveRegisterPairs(
 
     // MachO's compact unwind format relies on all registers being stored in
     // adjacent register pairs.
-    assert((!produceCompactUnwindFrame(MF) ||
-            CC == CallingConv::PreserveMost ||
+    assert((!produceCompactUnwindFrame(MF) || CC == CallingConv::PreserveMost ||
+            CC == CallingConv::CXX_FAST_TLS || CC == CallingConv::Win64 ||
             (RPI.isPaired() &&
              ((RPI.Reg1 == AArch64::LR && RPI.Reg2 == AArch64::FP) ||
               RPI.Reg1 + 1 == RPI.Reg2))) &&
@@ -2455,45 +2725,9 @@ bool AArch64FrameLowering::spillCalleeSavedRegisters(
   DebugLoc DL;
   SmallVector<RegPairInfo, 8> RegPairs;
 
-  bool NeedShadowCallStackProlog = false;
-  computeCalleeSaveRegisterPairs(MF, CSI, TRI, RegPairs,
-                                 NeedShadowCallStackProlog, hasFP(MF));
-  const MachineRegisterInfo &MRI = MF.getRegInfo();
-
-  if (NeedShadowCallStackProlog) {
-    // Shadow call stack prolog: str x30, [x18], #8
-    BuildMI(MBB, MI, DL, TII.get(AArch64::STRXpost))
-        .addReg(AArch64::X18, RegState::Define)
-        .addReg(AArch64::LR)
-        .addReg(AArch64::X18)
-        .addImm(8)
-        .setMIFlag(MachineInstr::FrameSetup);
-
-    if (NeedsWinCFI)
-      BuildMI(MBB, MI, DL, TII.get(AArch64::SEH_Nop))
-          .setMIFlag(MachineInstr::FrameSetup);
-
-    if (!MF.getFunction().hasFnAttribute(Attribute::NoUnwind)) {
-      // Emit a CFI instruction that causes 8 to be subtracted from the value of
-      // x18 when unwinding past this frame.
-      static const char CFIInst[] = {
-          dwarf::DW_CFA_val_expression,
-          18, // register
-          2,  // length
-          static_cast<char>(unsigned(dwarf::DW_OP_breg18)),
-          static_cast<char>(-8) & 0x7f, // addend (sleb128)
-      };
-      unsigned CFIIndex = MF.addFrameInst(MCCFIInstruction::createEscape(
-          nullptr, StringRef(CFIInst, sizeof(CFIInst))));
-      BuildMI(MBB, MI, DL, TII.get(AArch64::CFI_INSTRUCTION))
-          .addCFIIndex(CFIIndex)
-          .setMIFlag(MachineInstr::FrameSetup);
-    }
-
-    // This instruction also makes x18 live-in to the entry block.
-    MBB.addLiveIn(AArch64::X18);
-  }
+  computeCalleeSaveRegisterPairs(MF, CSI, TRI, RegPairs, hasFP(MF));
 
+  const MachineRegisterInfo &MRI = MF.getRegInfo();
   if (homogeneousPrologEpilog(MF)) {
     auto MIB = BuildMI(MBB, MI, DL, TII.get(AArch64::HOM_Prolog))
                    .setMIFlag(MachineInstr::FrameSetup);
@@ -2510,9 +2744,7 @@ bool AArch64FrameLowering::spillCalleeSavedRegisters(
     }
     return true;
   }
-  for (auto RPII = RegPairs.rbegin(), RPIE = RegPairs.rend(); RPII != RPIE;
-       ++RPII) {
-    RegPairInfo RPI = *RPII;
+  for (const RegPairInfo &RPI : llvm::reverse(RegPairs)) {
     unsigned Reg1 = RPI.Reg1;
     unsigned Reg2 = RPI.Reg2;
     unsigned StrOpc;
@@ -2605,7 +2837,7 @@ bool AArch64FrameLowering::spillCalleeSavedRegisters(
 }
 
 bool AArch64FrameLowering::restoreCalleeSavedRegisters(
-    MachineBasicBlock &MBB, MachineBasicBlock::iterator MI,
+    MachineBasicBlock &MBB, MachineBasicBlock::iterator MBBI,
     MutableArrayRef<CalleeSavedInfo> CSI, const TargetRegisterInfo *TRI) const {
   MachineFunction &MF = *MBB.getParent();
   const TargetInstrInfo &TII = *MF.getSubtarget().getInstrInfo();
@@ -2613,14 +2845,12 @@ bool AArch64FrameLowering::restoreCalleeSavedRegisters(
   SmallVector<RegPairInfo, 8> RegPairs;
   bool NeedsWinCFI = needsWinCFI(MF);
 
-  if (MI != MBB.end())
-    DL = MI->getDebugLoc();
+  if (MBBI != MBB.end())
+    DL = MBBI->getDebugLoc();
 
-  bool NeedShadowCallStackProlog = false;
-  computeCalleeSaveRegisterPairs(MF, CSI, TRI, RegPairs,
-                                 NeedShadowCallStackProlog, hasFP(MF));
+  computeCalleeSaveRegisterPairs(MF, CSI, TRI, RegPairs, hasFP(MF));
 
-  auto EmitMI = [&](const RegPairInfo &RPI) {
+  auto EmitMI = [&](const RegPairInfo &RPI) -> MachineBasicBlock::iterator {
     unsigned Reg1 = RPI.Reg1;
     unsigned Reg2 = RPI.Reg2;
 
@@ -2677,7 +2907,7 @@ bool AArch64FrameLowering::restoreCalleeSavedRegisters(
       std::swap(Reg1, Reg2);
       std::swap(FrameIdxReg1, FrameIdxReg2);
     }
-    MachineInstrBuilder MIB = BuildMI(MBB, MI, DL, TII.get(LdrOpc));
+    MachineInstrBuilder MIB = BuildMI(MBB, MBBI, DL, TII.get(LdrOpc));
     if (RPI.isPaired()) {
       MIB.addReg(Reg2, getDefRegState(true));
       MIB.addMemOperand(MF.getMachineMemOperand(
@@ -2694,6 +2924,8 @@ bool AArch64FrameLowering::restoreCalleeSavedRegisters(
         MachineMemOperand::MOLoad, Size, Alignment));
     if (NeedsWinCFI)
       InsertSEH(MIB, TII, MachineInstr::FrameDestroy);
+
+    return MIB->getIterator();
   };
 
   // SVE objects are always restored in reverse order.
@@ -2701,31 +2933,33 @@ bool AArch64FrameLowering::restoreCalleeSavedRegisters(
     if (RPI.isScalable())
       EmitMI(RPI);
 
-  if (ReverseCSRRestoreSeq) {
-    for (const RegPairInfo &RPI : reverse(RegPairs))
-      if (!RPI.isScalable())
-        EmitMI(RPI);
-  } else if (homogeneousPrologEpilog(MF, &MBB)) {
-    auto MIB = BuildMI(MBB, MI, DL, TII.get(AArch64::HOM_Epilog))
+  if (homogeneousPrologEpilog(MF, &MBB)) {
+    auto MIB = BuildMI(MBB, MBBI, DL, TII.get(AArch64::HOM_Epilog))
                    .setMIFlag(MachineInstr::FrameDestroy);
     for (auto &RPI : RegPairs) {
       MIB.addReg(RPI.Reg1, RegState::Define);
       MIB.addReg(RPI.Reg2, RegState::Define);
     }
     return true;
-  } else
-    for (const RegPairInfo &RPI : RegPairs)
-      if (!RPI.isScalable())
-        EmitMI(RPI);
-
-  if (NeedShadowCallStackProlog) {
-    // Shadow call stack epilog: ldr x30, [x18, #-8]!
-    BuildMI(MBB, MI, DL, TII.get(AArch64::LDRXpre))
-        .addReg(AArch64::X18, RegState::Define)
-        .addReg(AArch64::LR, RegState::Define)
-        .addReg(AArch64::X18)
-        .addImm(-8)
-        .setMIFlag(MachineInstr::FrameDestroy);
+  }
+
+  if (ReverseCSRRestoreSeq) {
+    MachineBasicBlock::iterator First = MBB.end();
+    for (const RegPairInfo &RPI : reverse(RegPairs)) {
+      if (RPI.isScalable())
+        continue;
+      MachineBasicBlock::iterator It = EmitMI(RPI);
+      if (First == MBB.end())
+        First = It;
+    }
+    if (First != MBB.end())
+      MBB.splice(MBBI, &MBB, First);
+  } else {
+    for (const RegPairInfo &RPI : RegPairs) {
+      if (RPI.isScalable())
+        continue;
+      (void)EmitMI(RPI);
+    }
   }
 
   return true;
@@ -2928,6 +3162,15 @@ bool AArch64FrameLowering::assignCalleeSavedSpillSlots(
   // stack slots for them.
   MachineFrameInfo &MFI = MF.getFrameInfo();
   auto *AFI = MF.getInfo<AArch64FunctionInfo>();
+
+  bool UsesWinAAPCS = isTargetWindows(MF);
+  if (UsesWinAAPCS && hasFP(MF) && AFI->hasSwiftAsyncContext()) {
+    int FrameIdx = MFI.CreateStackObject(8, Align(16), true);
+    AFI->setSwiftAsyncContextFrameIdx(FrameIdx);
+    if ((unsigned)FrameIdx < MinCSFrameIndex) MinCSFrameIndex = FrameIdx;
+    if ((unsigned)FrameIdx > MaxCSFrameIndex) MaxCSFrameIndex = FrameIdx;
+  }
+
   for (auto &CS : CSI) {
     Register Reg = CS.getReg();
     const TargetRegisterClass *RC = RegInfo->getMinimalPhysRegClass(Reg);
@@ -2941,7 +3184,8 @@ bool AArch64FrameLowering::assignCalleeSavedSpillSlots(
     if ((unsigned)FrameIdx > MaxCSFrameIndex) MaxCSFrameIndex = FrameIdx;
 
     // Grab 8 bytes below FP for the extended asynchronous frame info.
-    if (hasFP(MF) && AFI->hasSwiftAsyncContext() && Reg == AArch64::FP) {
+    if (hasFP(MF) && AFI->hasSwiftAsyncContext() && !UsesWinAAPCS &&
+        Reg == AArch64::FP) {
       FrameIdx = MFI.CreateStackObject(8, Alignment, true);
       AFI->setSwiftAsyncContextFrameIdx(FrameIdx);
       if ((unsigned)FrameIdx < MinCSFrameIndex) MinCSFrameIndex = FrameIdx;
@@ -3021,10 +3265,21 @@ static int64_t determineSVEStackObjectOffsets(MachineFrameInfo &MFI,
 
   // Create a buffer of SVE objects to allocate and sort it.
   SmallVector<int, 8> ObjectsToAllocate;
+  // If we have a stack protector, and we've previously decided that we have SVE
+  // objects on the stack and thus need it to go in the SVE stack area, then it
+  // needs to go first.
+  int StackProtectorFI = -1;
+  if (MFI.hasStackProtectorIndex()) {
+    StackProtectorFI = MFI.getStackProtectorIndex();
+    if (MFI.getStackID(StackProtectorFI) == TargetStackID::ScalableVector)
+      ObjectsToAllocate.push_back(StackProtectorFI);
+  }
   for (int I = 0, E = MFI.getObjectIndexEnd(); I != E; ++I) {
     unsigned StackID = MFI.getStackID(I);
     if (StackID != TargetStackID::ScalableVector)
       continue;
+    if (I == StackProtectorFI)
+      continue;
     if (MaxCSFrameIndex >= I && I >= MinCSFrameIndex)
       continue;
     if (MFI.isDeadObjectIndex(I))
@@ -3104,7 +3359,7 @@ void AArch64FrameLowering::processFunctionBeforeFrameFinalized(
   DebugLoc DL;
   RS->enterBasicBlockEnd(MBB);
   RS->backward(std::prev(MBBI));
-  unsigned DstReg = RS->FindUnusedReg(&AArch64::GPR64commonRegClass);
+  Register DstReg = RS->FindUnusedReg(&AArch64::GPR64commonRegClass);
   assert(DstReg && "There must be a free register after frame setup");
   BuildMI(MBB, MBBI, DL, TII.get(AArch64::MOVi64imm), DstReg).addImm(-2);
   BuildMI(MBB, MBBI, DL, TII.get(AArch64::STURXi))
@@ -3136,7 +3391,7 @@ class TagStoreEdit {
   StackOffset FrameRegOffset;
   int64_t Size;
   // If not None, move FrameReg to (FrameReg + FrameRegUpdate) at the end.
-  Optional<int64_t> FrameRegUpdate;
+  std::optional<int64_t> FrameRegUpdate;
   // MIFlags for any FrameReg updating instructions.
   unsigned FrameRegUpdateFlags;
 
@@ -3166,7 +3421,7 @@ public:
   // instructions. May skip if the replacement is not profitable. May invalidate
   // the input iterator and replace it with a valid one.
   void emitCode(MachineBasicBlock::iterator &InsertI,
-                const AArch64FrameLowering *TFI, bool IsLast);
+                const AArch64FrameLowering *TFI, bool TryMergeSPUpdate);
 };
 
 void TagStoreEdit::emitUnrolled(MachineBasicBlock::iterator InsertI) {
@@ -3305,7 +3560,8 @@ void mergeMemRefs(const SmallVectorImpl<TagStoreInstr> &TSE,
 }
 
 void TagStoreEdit::emitCode(MachineBasicBlock::iterator &InsertI,
-                            const AArch64FrameLowering *TFI, bool IsLast) {
+                            const AArch64FrameLowering *TFI,
+                            bool TryMergeSPUpdate) {
   if (TagStores.empty())
     return;
   TagStoreInstr &FirstTagStore = TagStores[0];
@@ -3318,7 +3574,7 @@ void TagStoreEdit::emitCode(MachineBasicBlock::iterator &InsertI,
       *MF, FirstTagStore.Offset, false /*isFixed*/, false /*isSVE*/, Reg,
       /*PreferFP=*/false, /*ForSimm=*/true);
   FrameReg = Reg;
-  FrameRegUpdate = None;
+  FrameRegUpdate = std::nullopt;
 
   mergeMemRefs(TagStores, CombinedMemRefs);
 
@@ -3335,8 +3591,8 @@ void TagStoreEdit::emitCode(MachineBasicBlock::iterator &InsertI,
     emitUnrolled(InsertI);
   } else {
     MachineInstr *UpdateInstr = nullptr;
-    int64_t TotalOffset;
-    if (IsLast) {
+    int64_t TotalOffset = 0;
+    if (TryMergeSPUpdate) {
       // See if we can merge base register update into the STGloop.
       // This is done in AArch64LoadStoreOptimizer for "normal" stores,
       // but STGloop is way too unusual for that, and also it only
@@ -3477,11 +3733,11 @@ MachineBasicBlock::iterator tryMergeAdjacentSTG(MachineBasicBlock::iterator II,
   // Find contiguous runs of tagged memory and emit shorter instruction
   // sequencies for them when possible.
   TagStoreEdit TSE(MBB, FirstZeroData);
-  Optional<int64_t> EndOffset;
+  std::optional<int64_t> EndOffset;
   for (auto &Instr : Instrs) {
     if (EndOffset && *EndOffset != Instr.Offset) {
       // Found a gap.
-      TSE.emitCode(InsertI, TFI, /*IsLast = */ false);
+      TSE.emitCode(InsertI, TFI, /*TryMergeSPUpdate = */ false);
       TSE.clear();
     }
 
@@ -3489,7 +3745,11 @@ MachineBasicBlock::iterator tryMergeAdjacentSTG(MachineBasicBlock::iterator II,
     EndOffset = Instr.Offset + Instr.Size;
   }
 
-  TSE.emitCode(InsertI, TFI, /*IsLast = */ true);
+  const MachineFunction *MF = MBB->getParent();
+  // Multiple FP/SP updates in a loop cannot be described by CFI instructions.
+  TSE.emitCode(
+      InsertI, TFI, /*TryMergeSPUpdate = */
+      !MF->getInfo<AArch64FunctionInfo>()->needsAsyncDwarfUnwindInfo(*MF));
 
   return InsertI;
 }
@@ -3517,7 +3777,14 @@ StackOffset AArch64FrameLowering::getFrameIndexReferencePreferSP(
     return StackOffset::getFixed(MFI.getObjectOffset(FI));
   }
 
-  return getFrameIndexReference(MF, FI, FrameReg);
+  // Go to common code if we cannot provide sp + offset.
+  if (MFI.hasVarSizedObjects() ||
+      MF.getInfo<AArch64FunctionInfo>()->getStackSizeSVE() ||
+      MF.getSubtarget().getRegisterInfo()->hasStackRealignment(MF))
+    return getFrameIndexReference(MF, FI, FrameReg);
+
+  FrameReg = AArch64::SP;
+  return getStackOffset(MF, MFI.getObjectOffset(FI));
 }
 
 /// The parent frame offset (aka dispFrame) is only used on X86_64 to retrieve
@@ -3668,7 +3935,7 @@ void AArch64FrameLowering::orderFrameObjects(
   // and save one instruction when generating the base pointer because IRG does
   // not allow an immediate offset.
   const AArch64FunctionInfo &AFI = *MF.getInfo<AArch64FunctionInfo>();
-  Optional<int> TBPI = AFI.getTaggedBasePointerIndex();
+  std::optional<int> TBPI = AFI.getTaggedBasePointerIndex();
   if (TBPI) {
     FrameObjects[*TBPI].ObjectFirst = true;
     FrameObjects[*TBPI].GroupFirst = true;
diff --git a/gnu/llvm/llvm/lib/Target/AArch64/AArch64FrameLowering.h b/gnu/llvm/llvm/lib/Target/AArch64/AArch64FrameLowering.h
index 8e7d340ceed..f3314535f7a 100644
--- a/gnu/llvm/llvm/lib/Target/AArch64/AArch64FrameLowering.h
+++ b/gnu/llvm/llvm/lib/Target/AArch64/AArch64FrameLowering.h
@@ -19,8 +19,6 @@
 
 namespace llvm {
 
-class MCCFIInstruction;
-
 class AArch64FrameLowering : public TargetFrameLowering {
 public:
 
@@ -30,9 +28,7 @@ public:
       : TargetFrameLowering(StackGrowsDown, Align(16), 0, Align(16),
                             true /*StackRealignable*/), RPL() {}
 
-  void
-  emitCalleeSavedFrameMoves(MachineBasicBlock &MBB,
-                            MachineBasicBlock::iterator MBBI) const override;
+  void resetCFIToInitialState(MachineBasicBlock &MBB) const override;
 
   MachineBasicBlock::iterator
   eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,
@@ -73,8 +69,6 @@ public:
   bool hasFP(const MachineFunction &MF) const override;
   bool hasReservedCallFrame(const MachineFunction &MF) const override;
 
-  bool hasSwiftExtendedFrame(const MachineFunction &MF) const;
-
   bool assignCalleeSavedSpillSlots(MachineFunction &MF,
                                    const TargetRegisterInfo *TRI,
                                    std::vector<CalleeSavedInfo> &CSI,
@@ -150,13 +144,20 @@ private:
   int64_t assignSVEStackObjectOffsets(MachineFrameInfo &MF,
                                       int &MinCSFrameIndex,
                                       int &MaxCSFrameIndex) const;
-  MCCFIInstruction
-  createDefCFAExpressionFromSP(const TargetRegisterInfo &TRI,
-                               const StackOffset &OffsetFromSP) const;
-  MCCFIInstruction createCfaOffset(const TargetRegisterInfo &MRI, unsigned DwarfReg,
-                                   const StackOffset &OffsetFromDefCFA) const;
   bool shouldCombineCSRLocalStackBumpInEpilogue(MachineBasicBlock &MBB,
                                                 unsigned StackBumpBytes) const;
+  void emitCalleeSavedGPRLocations(MachineBasicBlock &MBB,
+                                   MachineBasicBlock::iterator MBBI) const;
+  void emitCalleeSavedSVELocations(MachineBasicBlock &MBB,
+                                   MachineBasicBlock::iterator MBBI) const;
+  void emitCalleeSavedGPRRestores(MachineBasicBlock &MBB,
+                                  MachineBasicBlock::iterator MBBI) const;
+  void emitCalleeSavedSVERestores(MachineBasicBlock &MBB,
+                                  MachineBasicBlock::iterator MBBI) const;
+
+  /// Emit target zero call-used regs.
+  void emitZeroCallUsedRegs(BitVector RegsToZero,
+                            MachineBasicBlock &MBB) const override;
 };
 
 } // End llvm namespace
diff --git a/gnu/llvm/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp b/gnu/llvm/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
index 779d651e927..4eea1786cc1 100644
--- a/gnu/llvm/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
+++ b/gnu/llvm/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
@@ -29,10 +29,15 @@
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/Triple.h"
 #include "llvm/ADT/Twine.h"
+#include "llvm/Analysis/LoopInfo.h"
+#include "llvm/Analysis/MemoryLocation.h"
 #include "llvm/Analysis/ObjCARCUtil.h"
+#include "llvm/Analysis/TargetTransformInfo.h"
+#include "llvm/Analysis/ValueTracking.h"
 #include "llvm/Analysis/VectorUtils.h"
 #include "llvm/CodeGen/Analysis.h"
 #include "llvm/CodeGen/CallingConvLower.h"
+#include "llvm/CodeGen/ISDOpcodes.h"
 #include "llvm/CodeGen/MachineBasicBlock.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/MachineFunction.h"
@@ -73,6 +78,7 @@
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/ErrorHandling.h"
+#include "llvm/Support/InstructionCost.h"
 #include "llvm/Support/KnownBits.h"
 #include "llvm/Support/MachineValueType.h"
 #include "llvm/Support/MathExtras.h"
@@ -87,6 +93,7 @@
 #include <cstdlib>
 #include <iterator>
 #include <limits>
+#include <optional>
 #include <tuple>
 #include <utility>
 #include <vector>
@@ -124,6 +131,12 @@ EnableCombineMGatherIntrinsics("aarch64-enable-mgather-combine", cl::Hidden,
                                          "gather intrinsics"),
                                 cl::init(true));
 
+// All of the XOR, OR and CMP use ALU ports, and data dependency will become the
+// bottleneck after this transform on high end CPU. So this max leaf node
+// limitation is guard cmp+ccmp will be profitable.
+static cl::opt<unsigned> MaxXors("aarch64-max-xors", cl::init(16), cl::Hidden,
+                                 cl::desc("Maximum of xors"));
+
 /// Value type used for condition codes.
 static const MVT MVT_CC = MVT::i32;
 
@@ -193,7 +206,7 @@ static inline bool isPackedVectorType(EVT VT, SelectionDAG &DAG) {
   assert(VT.isVector() && DAG.getTargetLoweringInfo().isTypeLegal(VT) &&
          "Expected legal vector type!");
   return VT.isFixedLengthVector() ||
-         VT.getSizeInBits().getKnownMinSize() == AArch64::SVEBitsPerBlock;
+         VT.getSizeInBits().getKnownMinValue() == AArch64::SVEBitsPerBlock;
 }
 
 // Returns true for ####_MERGE_PASSTHRU opcodes, whose operands have a leading
@@ -204,6 +217,9 @@ static bool isMergePassthruOpcode(unsigned Opc) {
     return false;
   case AArch64ISD::BITREVERSE_MERGE_PASSTHRU:
   case AArch64ISD::BSWAP_MERGE_PASSTHRU:
+  case AArch64ISD::REVH_MERGE_PASSTHRU:
+  case AArch64ISD::REVW_MERGE_PASSTHRU:
+  case AArch64ISD::REVD_MERGE_PASSTHRU:
   case AArch64ISD::CTLZ_MERGE_PASSTHRU:
   case AArch64ISD::CTPOP_MERGE_PASSTHRU:
   case AArch64ISD::DUP_MERGE_PASSTHRU:
@@ -232,6 +248,70 @@ static bool isMergePassthruOpcode(unsigned Opc) {
   }
 }
 
+// Returns true if inactive lanes are known to be zeroed by construction.
+static bool isZeroingInactiveLanes(SDValue Op) {
+  switch (Op.getOpcode()) {
+  default:
+    // We guarantee i1 splat_vectors to zero the other lanes by
+    // implementing it with ptrue and possibly a punpklo for nxv1i1.
+    if (ISD::isConstantSplatVectorAllOnes(Op.getNode()))
+      return true;
+    return false;
+  case AArch64ISD::PTRUE:
+  case AArch64ISD::SETCC_MERGE_ZERO:
+    return true;
+  case ISD::INTRINSIC_WO_CHAIN:
+    switch (Op.getConstantOperandVal(0)) {
+    default:
+      return false;
+    case Intrinsic::aarch64_sve_ptrue:
+    case Intrinsic::aarch64_sve_pnext:
+    case Intrinsic::aarch64_sve_cmpeq:
+    case Intrinsic::aarch64_sve_cmpne:
+    case Intrinsic::aarch64_sve_cmpge:
+    case Intrinsic::aarch64_sve_cmpgt:
+    case Intrinsic::aarch64_sve_cmphs:
+    case Intrinsic::aarch64_sve_cmphi:
+    case Intrinsic::aarch64_sve_cmpeq_wide:
+    case Intrinsic::aarch64_sve_cmpne_wide:
+    case Intrinsic::aarch64_sve_cmpge_wide:
+    case Intrinsic::aarch64_sve_cmpgt_wide:
+    case Intrinsic::aarch64_sve_cmplt_wide:
+    case Intrinsic::aarch64_sve_cmple_wide:
+    case Intrinsic::aarch64_sve_cmphs_wide:
+    case Intrinsic::aarch64_sve_cmphi_wide:
+    case Intrinsic::aarch64_sve_cmplo_wide:
+    case Intrinsic::aarch64_sve_cmpls_wide:
+    case Intrinsic::aarch64_sve_fcmpeq:
+    case Intrinsic::aarch64_sve_fcmpne:
+    case Intrinsic::aarch64_sve_fcmpge:
+    case Intrinsic::aarch64_sve_fcmpgt:
+    case Intrinsic::aarch64_sve_fcmpuo:
+    case Intrinsic::aarch64_sve_facgt:
+    case Intrinsic::aarch64_sve_facge:
+    case Intrinsic::aarch64_sve_whilege:
+    case Intrinsic::aarch64_sve_whilegt:
+    case Intrinsic::aarch64_sve_whilehi:
+    case Intrinsic::aarch64_sve_whilehs:
+    case Intrinsic::aarch64_sve_whilele:
+    case Intrinsic::aarch64_sve_whilelo:
+    case Intrinsic::aarch64_sve_whilels:
+    case Intrinsic::aarch64_sve_whilelt:
+    case Intrinsic::aarch64_sve_match:
+    case Intrinsic::aarch64_sve_nmatch:
+    case Intrinsic::aarch64_sve_whilege_x2:
+    case Intrinsic::aarch64_sve_whilegt_x2:
+    case Intrinsic::aarch64_sve_whilehi_x2:
+    case Intrinsic::aarch64_sve_whilehs_x2:
+    case Intrinsic::aarch64_sve_whilele_x2:
+    case Intrinsic::aarch64_sve_whilelo_x2:
+    case Intrinsic::aarch64_sve_whilels_x2:
+    case Intrinsic::aarch64_sve_whilelt_x2:
+      return true;
+    }
+  }
+}
+
 AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM,
                                              const AArch64Subtarget &STI)
     : TargetLowering(TM), Subtarget(&STI) {
@@ -285,8 +365,9 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM,
       addQRTypeForNEON(MVT::v8bf16);
   }
 
-  if (Subtarget->hasSVE()) {
+  if (Subtarget->hasSVEorSME()) {
     // Add legal sve predicate types
+    addRegisterClass(MVT::nxv1i1, &AArch64::PPRRegClass);
     addRegisterClass(MVT::nxv2i1, &AArch64::PPRRegClass);
     addRegisterClass(MVT::nxv4i1, &AArch64::PPRRegClass);
     addRegisterClass(MVT::nxv8i1, &AArch64::PPRRegClass);
@@ -320,50 +401,6 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM,
         if (useSVEForFixedLengthVectorVT(VT))
           addRegisterClass(VT, &AArch64::ZPRRegClass);
     }
-
-    for (auto VT : { MVT::nxv16i8, MVT::nxv8i16, MVT::nxv4i32, MVT::nxv2i64 }) {
-      setOperationAction(ISD::SADDSAT, VT, Legal);
-      setOperationAction(ISD::UADDSAT, VT, Legal);
-      setOperationAction(ISD::SSUBSAT, VT, Legal);
-      setOperationAction(ISD::USUBSAT, VT, Legal);
-      setOperationAction(ISD::UREM, VT, Expand);
-      setOperationAction(ISD::SREM, VT, Expand);
-      setOperationAction(ISD::SDIVREM, VT, Expand);
-      setOperationAction(ISD::UDIVREM, VT, Expand);
-    }
-
-    for (auto VT :
-         { MVT::nxv2i8, MVT::nxv2i16, MVT::nxv2i32, MVT::nxv2i64, MVT::nxv4i8,
-           MVT::nxv4i16, MVT::nxv4i32, MVT::nxv8i8, MVT::nxv8i16 })
-      setOperationAction(ISD::SIGN_EXTEND_INREG, VT, Legal);
-
-    for (auto VT :
-         { MVT::nxv2f16, MVT::nxv4f16, MVT::nxv8f16, MVT::nxv2f32, MVT::nxv4f32,
-           MVT::nxv2f64 }) {
-      setCondCodeAction(ISD::SETO, VT, Expand);
-      setCondCodeAction(ISD::SETOLT, VT, Expand);
-      setCondCodeAction(ISD::SETLT, VT, Expand);
-      setCondCodeAction(ISD::SETOLE, VT, Expand);
-      setCondCodeAction(ISD::SETLE, VT, Expand);
-      setCondCodeAction(ISD::SETULT, VT, Expand);
-      setCondCodeAction(ISD::SETULE, VT, Expand);
-      setCondCodeAction(ISD::SETUGE, VT, Expand);
-      setCondCodeAction(ISD::SETUGT, VT, Expand);
-      setCondCodeAction(ISD::SETUEQ, VT, Expand);
-      setCondCodeAction(ISD::SETUNE, VT, Expand);
-
-      setOperationAction(ISD::FREM, VT, Expand);
-      setOperationAction(ISD::FPOW, VT, Expand);
-      setOperationAction(ISD::FPOWI, VT, Expand);
-      setOperationAction(ISD::FCOS, VT, Expand);
-      setOperationAction(ISD::FSIN, VT, Expand);
-      setOperationAction(ISD::FSINCOS, VT, Expand);
-      setOperationAction(ISD::FEXP, VT, Expand);
-      setOperationAction(ISD::FEXP2, VT, Expand);
-      setOperationAction(ISD::FLOG, VT, Expand);
-      setOperationAction(ISD::FLOG2, VT, Expand);
-      setOperationAction(ISD::FLOG10, VT, Expand);
-    }
   }
 
   // Compute derived properties from the register classes
@@ -385,7 +422,7 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM,
   setOperationAction(ISD::STRICT_FSETCCS, MVT::f64, Custom);
   setOperationAction(ISD::BITREVERSE, MVT::i32, Legal);
   setOperationAction(ISD::BITREVERSE, MVT::i64, Legal);
-  setOperationAction(ISD::BRCOND, MVT::Other, Expand);
+  setOperationAction(ISD::BRCOND, MVT::Other, Custom);
   setOperationAction(ISD::BR_CC, MVT::i32, Custom);
   setOperationAction(ISD::BR_CC, MVT::i64, Custom);
   setOperationAction(ISD::BR_CC, MVT::f16, Custom);
@@ -394,15 +431,18 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM,
   setOperationAction(ISD::SELECT, MVT::i32, Custom);
   setOperationAction(ISD::SELECT, MVT::i64, Custom);
   setOperationAction(ISD::SELECT, MVT::f16, Custom);
+  setOperationAction(ISD::SELECT, MVT::bf16, Custom);
   setOperationAction(ISD::SELECT, MVT::f32, Custom);
   setOperationAction(ISD::SELECT, MVT::f64, Custom);
   setOperationAction(ISD::SELECT_CC, MVT::i32, Custom);
   setOperationAction(ISD::SELECT_CC, MVT::i64, Custom);
   setOperationAction(ISD::SELECT_CC, MVT::f16, Custom);
+  setOperationAction(ISD::SELECT_CC, MVT::bf16, Expand);
   setOperationAction(ISD::SELECT_CC, MVT::f32, Custom);
   setOperationAction(ISD::SELECT_CC, MVT::f64, Custom);
   setOperationAction(ISD::BR_JT, MVT::Other, Custom);
   setOperationAction(ISD::JumpTable, MVT::i64, Custom);
+  setOperationAction(ISD::SETCCCARRY, MVT::i64, Custom);
 
   setOperationAction(ISD::SHL_PARTS, MVT::i64, Custom);
   setOperationAction(ISD::SRA_PARTS, MVT::i64, Custom);
@@ -444,6 +484,8 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM,
   setOperationAction(ISD::SELECT, MVT::f128, Custom);
   setOperationAction(ISD::SELECT_CC, MVT::f128, Custom);
   setOperationAction(ISD::FP_EXTEND, MVT::f128, Custom);
+  // FIXME: f128 FMINIMUM and FMAXIMUM (including STRICT versions) currently
+  // aren't handled.
 
   // Lowering for many of the conversions is actually specified by the non-f128
   // type. The LowerXXX function will be trivial when f128 isn't involved.
@@ -504,16 +546,6 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM,
   // BlockAddress
   setOperationAction(ISD::BlockAddress, MVT::i64, Custom);
 
-  // Add/Sub overflow ops with MVT::Glues are lowered to NZCV dependences.
-  setOperationAction(ISD::ADDC, MVT::i32, Custom);
-  setOperationAction(ISD::ADDE, MVT::i32, Custom);
-  setOperationAction(ISD::SUBC, MVT::i32, Custom);
-  setOperationAction(ISD::SUBE, MVT::i32, Custom);
-  setOperationAction(ISD::ADDC, MVT::i64, Custom);
-  setOperationAction(ISD::ADDE, MVT::i64, Custom);
-  setOperationAction(ISD::SUBC, MVT::i64, Custom);
-  setOperationAction(ISD::SUBE, MVT::i64, Custom);
-
   // AArch64 lacks both left-rotate and popcount instructions.
   setOperationAction(ISD::ROTL, MVT::i32, Expand);
   setOperationAction(ISD::ROTL, MVT::i64, Expand);
@@ -530,12 +562,40 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM,
   setOperationAction(ISD::UMUL_LOHI, MVT::i64, Expand);
   setOperationAction(ISD::SMUL_LOHI, MVT::i64, Expand);
 
-  setOperationAction(ISD::CTPOP, MVT::i32, Custom);
-  setOperationAction(ISD::CTPOP, MVT::i64, Custom);
-  setOperationAction(ISD::CTPOP, MVT::i128, Custom);
+  if (Subtarget->hasCSSC()) {
+    setOperationAction(ISD::CTPOP, MVT::i32, Legal);
+    setOperationAction(ISD::CTPOP, MVT::i64, Legal);
+    setOperationAction(ISD::CTPOP, MVT::i128, Expand);
+
+    setOperationAction(ISD::PARITY, MVT::i128, Expand);
+
+    setOperationAction(ISD::CTTZ, MVT::i32, Legal);
+    setOperationAction(ISD::CTTZ, MVT::i64, Legal);
+    setOperationAction(ISD::CTTZ, MVT::i128, Expand);
+
+    setOperationAction(ISD::ABS, MVT::i32, Legal);
+    setOperationAction(ISD::ABS, MVT::i64, Legal);
+
+    setOperationAction(ISD::SMAX, MVT::i32, Legal);
+    setOperationAction(ISD::SMAX, MVT::i64, Legal);
+    setOperationAction(ISD::UMAX, MVT::i32, Legal);
+    setOperationAction(ISD::UMAX, MVT::i64, Legal);
+
+    setOperationAction(ISD::SMIN, MVT::i32, Legal);
+    setOperationAction(ISD::SMIN, MVT::i64, Legal);
+    setOperationAction(ISD::UMIN, MVT::i32, Legal);
+    setOperationAction(ISD::UMIN, MVT::i64, Legal);
+  } else {
+    setOperationAction(ISD::CTPOP, MVT::i32, Custom);
+    setOperationAction(ISD::CTPOP, MVT::i64, Custom);
+    setOperationAction(ISD::CTPOP, MVT::i128, Custom);
+
+    setOperationAction(ISD::PARITY, MVT::i64, Custom);
+    setOperationAction(ISD::PARITY, MVT::i128, Custom);
 
-  setOperationAction(ISD::ABS, MVT::i32, Custom);
-  setOperationAction(ISD::ABS, MVT::i64, Custom);
+    setOperationAction(ISD::ABS, MVT::i32, Custom);
+    setOperationAction(ISD::ABS, MVT::i64, Custom);
+  }
 
   setOperationAction(ISD::SDIVREM, MVT::i32, Expand);
   setOperationAction(ISD::SDIVREM, MVT::i64, Expand);
@@ -564,6 +624,15 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM,
   setOperationAction(ISD::UMULO, MVT::i32, Custom);
   setOperationAction(ISD::UMULO, MVT::i64, Custom);
 
+  setOperationAction(ISD::ADDCARRY, MVT::i32, Custom);
+  setOperationAction(ISD::ADDCARRY, MVT::i64, Custom);
+  setOperationAction(ISD::SUBCARRY, MVT::i32, Custom);
+  setOperationAction(ISD::SUBCARRY, MVT::i64, Custom);
+  setOperationAction(ISD::SADDO_CARRY, MVT::i32, Custom);
+  setOperationAction(ISD::SADDO_CARRY, MVT::i64, Custom);
+  setOperationAction(ISD::SSUBO_CARRY, MVT::i32, Custom);
+  setOperationAction(ISD::SSUBO_CARRY, MVT::i64, Custom);
+
   setOperationAction(ISD::FSIN, MVT::f32, Expand);
   setOperationAction(ISD::FSIN, MVT::f64, Expand);
   setOperationAction(ISD::FCOS, MVT::f32, Expand);
@@ -577,74 +646,47 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM,
   else
     setOperationAction(ISD::FCOPYSIGN, MVT::f16, Promote);
 
-  setOperationAction(ISD::FREM,    MVT::f16,   Promote);
-  setOperationAction(ISD::FREM,    MVT::v4f16, Expand);
-  setOperationAction(ISD::FREM,    MVT::v8f16, Expand);
-  setOperationAction(ISD::FPOW,    MVT::f16,   Promote);
-  setOperationAction(ISD::FPOW,    MVT::v4f16, Expand);
-  setOperationAction(ISD::FPOW,    MVT::v8f16, Expand);
-  setOperationAction(ISD::FPOWI,   MVT::f16,   Promote);
-  setOperationAction(ISD::FPOWI,   MVT::v4f16, Expand);
-  setOperationAction(ISD::FPOWI,   MVT::v8f16, Expand);
-  setOperationAction(ISD::FCOS,    MVT::f16,   Promote);
-  setOperationAction(ISD::FCOS,    MVT::v4f16, Expand);
-  setOperationAction(ISD::FCOS,    MVT::v8f16, Expand);
-  setOperationAction(ISD::FSIN,    MVT::f16,   Promote);
-  setOperationAction(ISD::FSIN,    MVT::v4f16, Expand);
-  setOperationAction(ISD::FSIN,    MVT::v8f16, Expand);
-  setOperationAction(ISD::FSINCOS, MVT::f16,   Promote);
-  setOperationAction(ISD::FSINCOS, MVT::v4f16, Expand);
-  setOperationAction(ISD::FSINCOS, MVT::v8f16, Expand);
-  setOperationAction(ISD::FEXP,    MVT::f16,   Promote);
-  setOperationAction(ISD::FEXP,    MVT::v4f16, Expand);
-  setOperationAction(ISD::FEXP,    MVT::v8f16, Expand);
-  setOperationAction(ISD::FEXP2,   MVT::f16,   Promote);
-  setOperationAction(ISD::FEXP2,   MVT::v4f16, Expand);
-  setOperationAction(ISD::FEXP2,   MVT::v8f16, Expand);
-  setOperationAction(ISD::FLOG,    MVT::f16,   Promote);
-  setOperationAction(ISD::FLOG,    MVT::v4f16, Expand);
-  setOperationAction(ISD::FLOG,    MVT::v8f16, Expand);
-  setOperationAction(ISD::FLOG2,   MVT::f16,   Promote);
-  setOperationAction(ISD::FLOG2,   MVT::v4f16, Expand);
-  setOperationAction(ISD::FLOG2,   MVT::v8f16, Expand);
-  setOperationAction(ISD::FLOG10,  MVT::f16,   Promote);
-  setOperationAction(ISD::FLOG10,  MVT::v4f16, Expand);
-  setOperationAction(ISD::FLOG10,  MVT::v8f16, Expand);
+  for (auto Op : {ISD::FREM,        ISD::FPOW,         ISD::FPOWI,
+                  ISD::FCOS,        ISD::FSIN,         ISD::FSINCOS,
+                  ISD::FEXP,        ISD::FEXP2,        ISD::FLOG,
+                  ISD::FLOG2,       ISD::FLOG10,       ISD::STRICT_FREM,
+                  ISD::STRICT_FPOW, ISD::STRICT_FPOWI, ISD::STRICT_FCOS,
+                  ISD::STRICT_FSIN, ISD::STRICT_FEXP,  ISD::STRICT_FEXP2,
+                  ISD::STRICT_FLOG, ISD::STRICT_FLOG2, ISD::STRICT_FLOG10}) {
+    setOperationAction(Op, MVT::f16, Promote);
+    setOperationAction(Op, MVT::v4f16, Expand);
+    setOperationAction(Op, MVT::v8f16, Expand);
+  }
 
   if (!Subtarget->hasFullFP16()) {
-    setOperationAction(ISD::SELECT,      MVT::f16,  Promote);
-    setOperationAction(ISD::SELECT_CC,   MVT::f16,  Promote);
-    setOperationAction(ISD::SETCC,       MVT::f16,  Promote);
-    setOperationAction(ISD::BR_CC,       MVT::f16,  Promote);
-    setOperationAction(ISD::FADD,        MVT::f16,  Promote);
-    setOperationAction(ISD::FSUB,        MVT::f16,  Promote);
-    setOperationAction(ISD::FMUL,        MVT::f16,  Promote);
-    setOperationAction(ISD::FDIV,        MVT::f16,  Promote);
-    setOperationAction(ISD::FMA,         MVT::f16,  Promote);
-    setOperationAction(ISD::FNEG,        MVT::f16,  Promote);
-    setOperationAction(ISD::FABS,        MVT::f16,  Promote);
-    setOperationAction(ISD::FCEIL,       MVT::f16,  Promote);
-    setOperationAction(ISD::FSQRT,       MVT::f16,  Promote);
-    setOperationAction(ISD::FFLOOR,      MVT::f16,  Promote);
-    setOperationAction(ISD::FNEARBYINT,  MVT::f16,  Promote);
-    setOperationAction(ISD::FRINT,       MVT::f16,  Promote);
-    setOperationAction(ISD::FROUND,      MVT::f16,  Promote);
-    setOperationAction(ISD::FROUNDEVEN,  MVT::f16,  Promote);
-    setOperationAction(ISD::FTRUNC,      MVT::f16,  Promote);
-    setOperationAction(ISD::FMINNUM,     MVT::f16,  Promote);
-    setOperationAction(ISD::FMAXNUM,     MVT::f16,  Promote);
-    setOperationAction(ISD::FMINIMUM,    MVT::f16,  Promote);
-    setOperationAction(ISD::FMAXIMUM,    MVT::f16,  Promote);
+    for (auto Op :
+         {ISD::SETCC,          ISD::SELECT_CC,
+          ISD::BR_CC,          ISD::FADD,           ISD::FSUB,
+          ISD::FMUL,           ISD::FDIV,           ISD::FMA,
+          ISD::FNEG,           ISD::FABS,           ISD::FCEIL,
+          ISD::FSQRT,          ISD::FFLOOR,         ISD::FNEARBYINT,
+          ISD::FRINT,          ISD::FROUND,         ISD::FROUNDEVEN,
+          ISD::FTRUNC,         ISD::FMINNUM,        ISD::FMAXNUM,
+          ISD::FMINIMUM,       ISD::FMAXIMUM,       ISD::STRICT_FADD,
+          ISD::STRICT_FSUB,    ISD::STRICT_FMUL,    ISD::STRICT_FDIV,
+          ISD::STRICT_FMA,     ISD::STRICT_FCEIL,   ISD::STRICT_FFLOOR,
+          ISD::STRICT_FSQRT,   ISD::STRICT_FRINT,   ISD::STRICT_FNEARBYINT,
+          ISD::STRICT_FROUND,  ISD::STRICT_FTRUNC,  ISD::STRICT_FROUNDEVEN,
+          ISD::STRICT_FMINNUM, ISD::STRICT_FMAXNUM, ISD::STRICT_FMINIMUM,
+          ISD::STRICT_FMAXIMUM})
+      setOperationAction(Op, MVT::f16, Promote);
+
+    // Round-to-integer need custom lowering for fp16, as Promote doesn't work
+    // because the result type is integer.
+    for (auto Op : {ISD::STRICT_LROUND, ISD::STRICT_LLROUND, ISD::STRICT_LRINT,
+                    ISD::STRICT_LLRINT})
+      setOperationAction(Op, MVT::f16, Custom);
 
     // promote v4f16 to v4f32 when that is known to be safe.
-    setOperationAction(ISD::FADD,        MVT::v4f16, Promote);
-    setOperationAction(ISD::FSUB,        MVT::v4f16, Promote);
-    setOperationAction(ISD::FMUL,        MVT::v4f16, Promote);
-    setOperationAction(ISD::FDIV,        MVT::v4f16, Promote);
-    AddPromotedToType(ISD::FADD,         MVT::v4f16, MVT::v4f32);
-    AddPromotedToType(ISD::FSUB,         MVT::v4f16, MVT::v4f32);
-    AddPromotedToType(ISD::FMUL,         MVT::v4f16, MVT::v4f32);
-    AddPromotedToType(ISD::FDIV,         MVT::v4f16, MVT::v4f32);
+    setOperationPromotedToType(ISD::FADD, MVT::v4f16, MVT::v4f32);
+    setOperationPromotedToType(ISD::FSUB, MVT::v4f16, MVT::v4f32);
+    setOperationPromotedToType(ISD::FMUL, MVT::v4f16, MVT::v4f32);
+    setOperationPromotedToType(ISD::FDIV, MVT::v4f16, MVT::v4f32);
 
     setOperationAction(ISD::FABS,        MVT::v4f16, Expand);
     setOperationAction(ISD::FNEG,        MVT::v4f16, Expand);
@@ -687,41 +729,39 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM,
   }
 
   // AArch64 has implementations of a lot of rounding-like FP operations.
-  for (MVT Ty : {MVT::f32, MVT::f64}) {
-    setOperationAction(ISD::FFLOOR, Ty, Legal);
-    setOperationAction(ISD::FNEARBYINT, Ty, Legal);
-    setOperationAction(ISD::FCEIL, Ty, Legal);
-    setOperationAction(ISD::FRINT, Ty, Legal);
-    setOperationAction(ISD::FTRUNC, Ty, Legal);
-    setOperationAction(ISD::FROUND, Ty, Legal);
-    setOperationAction(ISD::FROUNDEVEN, Ty, Legal);
-    setOperationAction(ISD::FMINNUM, Ty, Legal);
-    setOperationAction(ISD::FMAXNUM, Ty, Legal);
-    setOperationAction(ISD::FMINIMUM, Ty, Legal);
-    setOperationAction(ISD::FMAXIMUM, Ty, Legal);
-    setOperationAction(ISD::LROUND, Ty, Legal);
-    setOperationAction(ISD::LLROUND, Ty, Legal);
-    setOperationAction(ISD::LRINT, Ty, Legal);
-    setOperationAction(ISD::LLRINT, Ty, Legal);
-  }
-
-  if (Subtarget->hasFullFP16()) {
-    setOperationAction(ISD::FNEARBYINT, MVT::f16, Legal);
-    setOperationAction(ISD::FFLOOR,  MVT::f16, Legal);
-    setOperationAction(ISD::FCEIL,   MVT::f16, Legal);
-    setOperationAction(ISD::FRINT,   MVT::f16, Legal);
-    setOperationAction(ISD::FTRUNC,  MVT::f16, Legal);
-    setOperationAction(ISD::FROUND,  MVT::f16, Legal);
-    setOperationAction(ISD::FROUNDEVEN,  MVT::f16, Legal);
-    setOperationAction(ISD::FMINNUM, MVT::f16, Legal);
-    setOperationAction(ISD::FMAXNUM, MVT::f16, Legal);
-    setOperationAction(ISD::FMINIMUM, MVT::f16, Legal);
-    setOperationAction(ISD::FMAXIMUM, MVT::f16, Legal);
-  }
+  for (auto Op :
+       {ISD::FFLOOR,          ISD::FNEARBYINT,      ISD::FCEIL,
+        ISD::FRINT,           ISD::FTRUNC,          ISD::FROUND,
+        ISD::FROUNDEVEN,      ISD::FMINNUM,         ISD::FMAXNUM,
+        ISD::FMINIMUM,        ISD::FMAXIMUM,        ISD::LROUND,
+        ISD::LLROUND,         ISD::LRINT,           ISD::LLRINT,
+        ISD::STRICT_FFLOOR,   ISD::STRICT_FCEIL,    ISD::STRICT_FNEARBYINT,
+        ISD::STRICT_FRINT,    ISD::STRICT_FTRUNC,   ISD::STRICT_FROUNDEVEN,
+        ISD::STRICT_FROUND,   ISD::STRICT_FMINNUM,  ISD::STRICT_FMAXNUM,
+        ISD::STRICT_FMINIMUM, ISD::STRICT_FMAXIMUM, ISD::STRICT_LROUND,
+        ISD::STRICT_LLROUND,  ISD::STRICT_LRINT,    ISD::STRICT_LLRINT}) {
+    for (MVT Ty : {MVT::f32, MVT::f64})
+      setOperationAction(Op, Ty, Legal);
+    if (Subtarget->hasFullFP16())
+      setOperationAction(Op, MVT::f16, Legal);
+  }
+
+  // Basic strict FP operations are legal
+  for (auto Op : {ISD::STRICT_FADD, ISD::STRICT_FSUB, ISD::STRICT_FMUL,
+                  ISD::STRICT_FDIV, ISD::STRICT_FMA, ISD::STRICT_FSQRT}) {
+    for (MVT Ty : {MVT::f32, MVT::f64})
+      setOperationAction(Op, Ty, Legal);
+    if (Subtarget->hasFullFP16())
+      setOperationAction(Op, MVT::f16, Legal);
+  }
+
+  // Strict conversion to a larger type is legal
+  for (auto VT : {MVT::f32, MVT::f64})
+    setOperationAction(ISD::STRICT_FP_EXTEND, VT, Legal);
 
   setOperationAction(ISD::PREFETCH, MVT::Other, Custom);
 
-  setOperationAction(ISD::FLT_ROUNDS_, MVT::i32, Custom);
+  setOperationAction(ISD::GET_ROUNDING, MVT::i32, Custom);
   setOperationAction(ISD::SET_ROUNDING, MVT::Other, Custom);
 
   setOperationAction(ISD::ATOMIC_CMP_SWAP, MVT::i128, Custom);
@@ -785,6 +825,13 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM,
   setOperationAction(ISD::LOAD, MVT::i128, Custom);
   setOperationAction(ISD::STORE, MVT::i128, Custom);
 
+  // Aligned 128-bit loads and stores are single-copy atomic according to the
+  // v8.4a spec.
+  if (Subtarget->hasLSE2()) {
+    setOperationAction(ISD::ATOMIC_LOAD, MVT::i128, Custom);
+    setOperationAction(ISD::ATOMIC_STORE, MVT::i128, Custom);
+  }
+
   // 256 bit non-temporal stores can be lowered to STNP. Do this as part of the
   // custom lowering, as there are no un-paired non-temporal stores and
   // legalization will break up 256 bit inputs.
@@ -796,10 +843,19 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM,
   setOperationAction(ISD::STORE, MVT::v4f64, Custom);
   setOperationAction(ISD::STORE, MVT::v4i64, Custom);
 
-  // Lower READCYCLECOUNTER using an mrs from PMCCNTR_EL0.
-  // This requires the Performance Monitors extension.
-  if (Subtarget->hasPerfMon())
-    setOperationAction(ISD::READCYCLECOUNTER, MVT::i64, Legal);
+  // 256 bit non-temporal loads can be lowered to LDNP. This is done using
+  // custom lowering, as there are no un-paired non-temporal loads legalization
+  // will break up 256 bit inputs.
+  setOperationAction(ISD::LOAD, MVT::v32i8, Custom);
+  setOperationAction(ISD::LOAD, MVT::v16i16, Custom);
+  setOperationAction(ISD::LOAD, MVT::v16f16, Custom);
+  setOperationAction(ISD::LOAD, MVT::v8i32, Custom);
+  setOperationAction(ISD::LOAD, MVT::v8f32, Custom);
+  setOperationAction(ISD::LOAD, MVT::v4f64, Custom);
+  setOperationAction(ISD::LOAD, MVT::v4i64, Custom);
+
+  // Lower READCYCLECOUNTER using an mrs from CNTVCT_EL0.
+  setOperationAction(ISD::READCYCLECOUNTER, MVT::i64, Legal);
 
   if (getLibcallName(RTLIB::SINCOS_STRET_F32) != nullptr &&
       getLibcallName(RTLIB::SINCOS_STRET_F64) != nullptr) {
@@ -880,64 +936,58 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM,
 
   // Vector add and sub nodes may conceal a high-half opportunity.
   // Also, try to fold ADD into CSINC/CSINV..
-  setTargetDAGCombine(ISD::ADD);
-  setTargetDAGCombine(ISD::ABS);
-  setTargetDAGCombine(ISD::SUB);
-  setTargetDAGCombine(ISD::SRL);
-  setTargetDAGCombine(ISD::XOR);
-  setTargetDAGCombine(ISD::SINT_TO_FP);
-  setTargetDAGCombine(ISD::UINT_TO_FP);
-
-  // TODO: Do the same for FP_TO_*INT_SAT.
-  setTargetDAGCombine(ISD::FP_TO_SINT);
-  setTargetDAGCombine(ISD::FP_TO_UINT);
-  setTargetDAGCombine(ISD::FDIV);
+  setTargetDAGCombine({ISD::ADD, ISD::ABS, ISD::SUB, ISD::XOR, ISD::SINT_TO_FP,
+                       ISD::UINT_TO_FP});
+
+  setTargetDAGCombine({ISD::FP_TO_SINT, ISD::FP_TO_UINT, ISD::FP_TO_SINT_SAT,
+                       ISD::FP_TO_UINT_SAT, ISD::FDIV});
 
   // Try and combine setcc with csel
   setTargetDAGCombine(ISD::SETCC);
 
   setTargetDAGCombine(ISD::INTRINSIC_WO_CHAIN);
 
-  setTargetDAGCombine(ISD::ANY_EXTEND);
-  setTargetDAGCombine(ISD::ZERO_EXTEND);
-  setTargetDAGCombine(ISD::SIGN_EXTEND);
-  setTargetDAGCombine(ISD::VECTOR_SPLICE);
-  setTargetDAGCombine(ISD::SIGN_EXTEND_INREG);
+  setTargetDAGCombine({ISD::ANY_EXTEND, ISD::ZERO_EXTEND, ISD::SIGN_EXTEND,
+                       ISD::VECTOR_SPLICE, ISD::SIGN_EXTEND_INREG,
+                       ISD::CONCAT_VECTORS, ISD::EXTRACT_SUBVECTOR,
+                       ISD::INSERT_SUBVECTOR, ISD::STORE, ISD::BUILD_VECTOR});
   setTargetDAGCombine(ISD::TRUNCATE);
-  setTargetDAGCombine(ISD::CONCAT_VECTORS);
-  setTargetDAGCombine(ISD::STORE);
-  if (Subtarget->supportsAddressTopByteIgnored())
-    setTargetDAGCombine(ISD::LOAD);
+  setTargetDAGCombine(ISD::LOAD);
+
+  setTargetDAGCombine(ISD::MSTORE);
 
   setTargetDAGCombine(ISD::MUL);
 
-  setTargetDAGCombine(ISD::SELECT);
-  setTargetDAGCombine(ISD::VSELECT);
+  setTargetDAGCombine({ISD::SELECT, ISD::VSELECT});
+
+  setTargetDAGCombine({ISD::INTRINSIC_VOID, ISD::INTRINSIC_W_CHAIN,
+                       ISD::INSERT_VECTOR_ELT, ISD::EXTRACT_VECTOR_ELT,
+                       ISD::VECREDUCE_ADD, ISD::STEP_VECTOR});
+
+  setTargetDAGCombine({ISD::MGATHER, ISD::MSCATTER});
 
-  setTargetDAGCombine(ISD::INTRINSIC_VOID);
-  setTargetDAGCombine(ISD::INTRINSIC_W_CHAIN);
-  setTargetDAGCombine(ISD::INSERT_VECTOR_ELT);
-  setTargetDAGCombine(ISD::EXTRACT_VECTOR_ELT);
-  setTargetDAGCombine(ISD::VECREDUCE_ADD);
-  setTargetDAGCombine(ISD::STEP_VECTOR);
+  setTargetDAGCombine(ISD::FP_EXTEND);
 
   setTargetDAGCombine(ISD::GlobalAddress);
 
+  setTargetDAGCombine(ISD::CTLZ);
+
   // In case of strict alignment, avoid an excessive number of byte wide stores.
   MaxStoresPerMemsetOptSize = 8;
-  MaxStoresPerMemset = Subtarget->requiresStrictAlign()
-                       ? MaxStoresPerMemsetOptSize : 32;
+  MaxStoresPerMemset =
+      Subtarget->requiresStrictAlign() ? MaxStoresPerMemsetOptSize : 32;
 
   MaxGluedStoresPerMemcpy = 4;
   MaxStoresPerMemcpyOptSize = 4;
-  MaxStoresPerMemcpy = Subtarget->requiresStrictAlign()
-                       ? MaxStoresPerMemcpyOptSize : 16;
+  MaxStoresPerMemcpy =
+      Subtarget->requiresStrictAlign() ? MaxStoresPerMemcpyOptSize : 16;
 
-  MaxStoresPerMemmoveOptSize = MaxStoresPerMemmove = 4;
+  MaxStoresPerMemmoveOptSize = 4;
+  MaxStoresPerMemmove = 4;
 
   MaxLoadsPerMemcmpOptSize = 4;
-  MaxLoadsPerMemcmp = Subtarget->requiresStrictAlign()
-                      ? MaxLoadsPerMemcmpOptSize : 8;
+  MaxLoadsPerMemcmp =
+      Subtarget->requiresStrictAlign() ? MaxLoadsPerMemcmpOptSize : 8;
 
   setStackPointerRegisterToSaveRestore(AArch64::SP);
 
@@ -949,6 +999,7 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM,
   setMinFunctionAlignment(Align(4));
   // Set preferred alignments.
   setPrefLoopAlignment(Align(1ULL << STI.getPrefLoopLogAlignment()));
+  setMaxBytesForAlignment(STI.getMaxBytesForLoopAlignment());
   setPrefFunctionAlignment(Align(1ULL << STI.getPrefFunctionLogAlignment()));
 
   // Only change the limit for entries in a jump table if specified by
@@ -959,66 +1010,57 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM,
 
   setHasExtractBitsInsn(true);
 
+  setMaxDivRemBitWidthSupported(128);
+
   setOperationAction(ISD::INTRINSIC_WO_CHAIN, MVT::Other, Custom);
 
   if (Subtarget->hasNEON()) {
     // FIXME: v1f64 shouldn't be legal if we can avoid it, because it leads to
     // silliness like this:
-    setOperationAction(ISD::FABS, MVT::v1f64, Expand);
-    setOperationAction(ISD::FADD, MVT::v1f64, Expand);
-    setOperationAction(ISD::FCEIL, MVT::v1f64, Expand);
-    setOperationAction(ISD::FCOPYSIGN, MVT::v1f64, Expand);
-    setOperationAction(ISD::FCOS, MVT::v1f64, Expand);
-    setOperationAction(ISD::FDIV, MVT::v1f64, Expand);
-    setOperationAction(ISD::FFLOOR, MVT::v1f64, Expand);
-    setOperationAction(ISD::FMA, MVT::v1f64, Expand);
-    setOperationAction(ISD::FMUL, MVT::v1f64, Expand);
-    setOperationAction(ISD::FNEARBYINT, MVT::v1f64, Expand);
-    setOperationAction(ISD::FNEG, MVT::v1f64, Expand);
-    setOperationAction(ISD::FPOW, MVT::v1f64, Expand);
-    setOperationAction(ISD::FREM, MVT::v1f64, Expand);
-    setOperationAction(ISD::FROUND, MVT::v1f64, Expand);
-    setOperationAction(ISD::FROUNDEVEN, MVT::v1f64, Expand);
-    setOperationAction(ISD::FRINT, MVT::v1f64, Expand);
-    setOperationAction(ISD::FSIN, MVT::v1f64, Expand);
-    setOperationAction(ISD::FSINCOS, MVT::v1f64, Expand);
-    setOperationAction(ISD::FSQRT, MVT::v1f64, Expand);
-    setOperationAction(ISD::FSUB, MVT::v1f64, Expand);
-    setOperationAction(ISD::FTRUNC, MVT::v1f64, Expand);
-    setOperationAction(ISD::SETCC, MVT::v1f64, Expand);
-    setOperationAction(ISD::BR_CC, MVT::v1f64, Expand);
-    setOperationAction(ISD::SELECT, MVT::v1f64, Expand);
-    setOperationAction(ISD::SELECT_CC, MVT::v1f64, Expand);
-    setOperationAction(ISD::FP_EXTEND, MVT::v1f64, Expand);
-
-    setOperationAction(ISD::FP_TO_SINT, MVT::v1i64, Expand);
-    setOperationAction(ISD::FP_TO_UINT, MVT::v1i64, Expand);
-    setOperationAction(ISD::SINT_TO_FP, MVT::v1i64, Expand);
-    setOperationAction(ISD::UINT_TO_FP, MVT::v1i64, Expand);
-    setOperationAction(ISD::FP_ROUND, MVT::v1f64, Expand);
-
-    setOperationAction(ISD::MUL, MVT::v1i64, Expand);
+    for (auto Op :
+         {ISD::SELECT,         ISD::SELECT_CC,      ISD::SETCC,
+          ISD::BR_CC,          ISD::FADD,           ISD::FSUB,
+          ISD::FMUL,           ISD::FDIV,           ISD::FMA,
+          ISD::FNEG,           ISD::FABS,           ISD::FCEIL,
+          ISD::FSQRT,          ISD::FFLOOR,         ISD::FNEARBYINT,
+          ISD::FRINT,          ISD::FROUND,         ISD::FROUNDEVEN,
+          ISD::FTRUNC,         ISD::FMINNUM,        ISD::FMAXNUM,
+          ISD::FMINIMUM,       ISD::FMAXIMUM,       ISD::STRICT_FADD,
+          ISD::STRICT_FSUB,    ISD::STRICT_FMUL,    ISD::STRICT_FDIV,
+          ISD::STRICT_FMA,     ISD::STRICT_FCEIL,   ISD::STRICT_FFLOOR,
+          ISD::STRICT_FSQRT,   ISD::STRICT_FRINT,   ISD::STRICT_FNEARBYINT,
+          ISD::STRICT_FROUND,  ISD::STRICT_FTRUNC,  ISD::STRICT_FROUNDEVEN,
+          ISD::STRICT_FMINNUM, ISD::STRICT_FMAXNUM, ISD::STRICT_FMINIMUM,
+          ISD::STRICT_FMAXIMUM})
+      setOperationAction(Op, MVT::v1f64, Expand);
+
+    for (auto Op :
+         {ISD::FP_TO_SINT, ISD::FP_TO_UINT, ISD::SINT_TO_FP, ISD::UINT_TO_FP,
+          ISD::FP_ROUND, ISD::FP_TO_SINT_SAT, ISD::FP_TO_UINT_SAT, ISD::MUL,
+          ISD::STRICT_FP_TO_SINT, ISD::STRICT_FP_TO_UINT,
+          ISD::STRICT_SINT_TO_FP, ISD::STRICT_UINT_TO_FP, ISD::STRICT_FP_ROUND})
+      setOperationAction(Op, MVT::v1i64, Expand);
 
     // AArch64 doesn't have a direct vector ->f32 conversion instructions for
     // elements smaller than i32, so promote the input to i32 first.
     setOperationPromotedToType(ISD::UINT_TO_FP, MVT::v4i8, MVT::v4i32);
     setOperationPromotedToType(ISD::SINT_TO_FP, MVT::v4i8, MVT::v4i32);
-    setOperationPromotedToType(ISD::SINT_TO_FP, MVT::v8i8, MVT::v8i32);
-    setOperationPromotedToType(ISD::UINT_TO_FP, MVT::v8i8, MVT::v8i32);
-    setOperationPromotedToType(ISD::UINT_TO_FP, MVT::v16i8, MVT::v16i32);
-    setOperationPromotedToType(ISD::SINT_TO_FP, MVT::v16i8, MVT::v16i32);
 
     // Similarly, there is no direct i32 -> f64 vector conversion instruction.
-    setOperationAction(ISD::SINT_TO_FP, MVT::v2i32, Custom);
-    setOperationAction(ISD::UINT_TO_FP, MVT::v2i32, Custom);
-    setOperationAction(ISD::SINT_TO_FP, MVT::v2i64, Custom);
-    setOperationAction(ISD::UINT_TO_FP, MVT::v2i64, Custom);
     // Or, direct i32 -> f16 vector conversion.  Set it so custom, so the
     // conversion happens in two steps: v4i32 -> v4f32 -> v4f16
-    setOperationAction(ISD::SINT_TO_FP, MVT::v4i32, Custom);
-    setOperationAction(ISD::UINT_TO_FP, MVT::v4i32, Custom);
+    for (auto Op : {ISD::SINT_TO_FP, ISD::UINT_TO_FP, ISD::STRICT_SINT_TO_FP,
+                    ISD::STRICT_UINT_TO_FP})
+      for (auto VT : {MVT::v2i32, MVT::v2i64, MVT::v4i32})
+        setOperationAction(Op, VT, Custom);
 
     if (Subtarget->hasFullFP16()) {
+      setOperationAction(ISD::ConstantFP, MVT::f16, Legal);
+
+      setOperationAction(ISD::SINT_TO_FP, MVT::v8i8, Custom);
+      setOperationAction(ISD::UINT_TO_FP, MVT::v8i8, Custom);
+      setOperationAction(ISD::SINT_TO_FP, MVT::v16i8, Custom);
+      setOperationAction(ISD::UINT_TO_FP, MVT::v16i8, Custom);
       setOperationAction(ISD::SINT_TO_FP, MVT::v4i16, Custom);
       setOperationAction(ISD::UINT_TO_FP, MVT::v4i16, Custom);
       setOperationAction(ISD::SINT_TO_FP, MVT::v8i16, Custom);
@@ -1026,6 +1068,10 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM,
     } else {
       // when AArch64 doesn't have fullfp16 support, promote the input
       // to i32 first.
+      setOperationPromotedToType(ISD::SINT_TO_FP, MVT::v8i8, MVT::v8i32);
+      setOperationPromotedToType(ISD::UINT_TO_FP, MVT::v8i8, MVT::v8i32);
+      setOperationPromotedToType(ISD::UINT_TO_FP, MVT::v16i8, MVT::v16i32);
+      setOperationPromotedToType(ISD::SINT_TO_FP, MVT::v16i8, MVT::v16i32);
       setOperationPromotedToType(ISD::UINT_TO_FP, MVT::v4i16, MVT::v4i32);
       setOperationPromotedToType(ISD::SINT_TO_FP, MVT::v4i16, MVT::v4i32);
       setOperationPromotedToType(ISD::SINT_TO_FP, MVT::v8i16, MVT::v8i32);
@@ -1040,6 +1086,12 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM,
     setOperationAction(ISD::BITREVERSE, MVT::v4i32, Custom);
     setOperationAction(ISD::BITREVERSE, MVT::v1i64, Custom);
     setOperationAction(ISD::BITREVERSE, MVT::v2i64, Custom);
+    for (auto VT : {MVT::v1i64, MVT::v2i64}) {
+      setOperationAction(ISD::UMAX, VT, Custom);
+      setOperationAction(ISD::SMAX, VT, Custom);
+      setOperationAction(ISD::UMIN, VT, Custom);
+      setOperationAction(ISD::SMIN, VT, Custom);
+    }
 
     // AArch64 doesn't have MUL.2d:
     setOperationAction(ISD::MUL, MVT::v2i64, Expand);
@@ -1059,6 +1111,10 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM,
 
     for (MVT VT : {MVT::v8i8, MVT::v4i16, MVT::v2i32, MVT::v16i8, MVT::v8i16,
                    MVT::v4i32}) {
+      setOperationAction(ISD::AVGFLOORS, VT, Legal);
+      setOperationAction(ISD::AVGFLOORU, VT, Legal);
+      setOperationAction(ISD::AVGCEILS, VT, Legal);
+      setOperationAction(ISD::AVGCEILU, VT, Legal);
       setOperationAction(ISD::ABDS, VT, Legal);
       setOperationAction(ISD::ABDU, VT, Legal);
     }
@@ -1112,31 +1168,18 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM,
     }
 
     // AArch64 has implementations of a lot of rounding-like FP operations.
-    for (MVT Ty : {MVT::v2f32, MVT::v4f32, MVT::v2f64}) {
-      setOperationAction(ISD::FFLOOR, Ty, Legal);
-      setOperationAction(ISD::FNEARBYINT, Ty, Legal);
-      setOperationAction(ISD::FCEIL, Ty, Legal);
-      setOperationAction(ISD::FRINT, Ty, Legal);
-      setOperationAction(ISD::FTRUNC, Ty, Legal);
-      setOperationAction(ISD::FROUND, Ty, Legal);
-      setOperationAction(ISD::FROUNDEVEN, Ty, Legal);
-    }
-
-    if (Subtarget->hasFullFP16()) {
-      for (MVT Ty : {MVT::v4f16, MVT::v8f16}) {
-        setOperationAction(ISD::FFLOOR, Ty, Legal);
-        setOperationAction(ISD::FNEARBYINT, Ty, Legal);
-        setOperationAction(ISD::FCEIL, Ty, Legal);
-        setOperationAction(ISD::FRINT, Ty, Legal);
-        setOperationAction(ISD::FTRUNC, Ty, Legal);
-        setOperationAction(ISD::FROUND, Ty, Legal);
-        setOperationAction(ISD::FROUNDEVEN, Ty, Legal);
-      }
+    for (auto Op :
+         {ISD::FFLOOR, ISD::FNEARBYINT, ISD::FCEIL, ISD::FRINT, ISD::FTRUNC,
+          ISD::FROUND, ISD::FROUNDEVEN, ISD::STRICT_FFLOOR,
+          ISD::STRICT_FNEARBYINT, ISD::STRICT_FCEIL, ISD::STRICT_FRINT,
+          ISD::STRICT_FTRUNC, ISD::STRICT_FROUND, ISD::STRICT_FROUNDEVEN}) {
+      for (MVT Ty : {MVT::v2f32, MVT::v4f32, MVT::v2f64})
+        setOperationAction(Op, Ty, Legal);
+      if (Subtarget->hasFullFP16())
+        for (MVT Ty : {MVT::v4f16, MVT::v8f16})
+          setOperationAction(Op, Ty, Legal);
     }
 
-    if (Subtarget->hasSVE())
-      setOperationAction(ISD::VSCALE, MVT::i32, Custom);
-
     setTruncStoreAction(MVT::v4i16, MVT::v4i8, Custom);
 
     setLoadExtAction(ISD::EXTLOAD,  MVT::v4i16, MVT::v4i8, Custom);
@@ -1145,6 +1188,27 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM,
     setLoadExtAction(ISD::EXTLOAD,  MVT::v4i32, MVT::v4i8, Custom);
     setLoadExtAction(ISD::SEXTLOAD, MVT::v4i32, MVT::v4i8, Custom);
     setLoadExtAction(ISD::ZEXTLOAD, MVT::v4i32, MVT::v4i8, Custom);
+
+    // ADDP custom lowering
+    for (MVT VT : { MVT::v32i8, MVT::v16i16, MVT::v8i32, MVT::v4i64 })
+      setOperationAction(ISD::ADD, VT, Custom);
+    // FADDP custom lowering
+    for (MVT VT : { MVT::v16f16, MVT::v8f32, MVT::v4f64 })
+      setOperationAction(ISD::FADD, VT, Custom);
+  }
+
+  if (Subtarget->hasSME()) {
+    setOperationAction(ISD::INTRINSIC_W_CHAIN, MVT::Other, Custom);
+  }
+
+  // FIXME: Move lowering for more nodes here if those are common between
+  // SVE and SME.
+  if (Subtarget->hasSVEorSME()) {
+    for (auto VT :
+         {MVT::nxv16i1, MVT::nxv8i1, MVT::nxv4i1, MVT::nxv2i1, MVT::nxv1i1}) {
+      setOperationAction(ISD::SPLAT_VECTOR, VT, Custom);
+      setOperationAction(ISD::EXTRACT_VECTOR_ELT, VT, Custom);
+    }
   }
 
   if (Subtarget->hasSVE()) {
@@ -1165,7 +1229,7 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM,
       setOperationAction(ISD::MUL, VT, Custom);
       setOperationAction(ISD::MULHS, VT, Custom);
       setOperationAction(ISD::MULHU, VT, Custom);
-      setOperationAction(ISD::SPLAT_VECTOR, VT, Custom);
+      setOperationAction(ISD::SPLAT_VECTOR, VT, Legal);
       setOperationAction(ISD::VECTOR_SPLICE, VT, Custom);
       setOperationAction(ISD::SELECT, VT, Custom);
       setOperationAction(ISD::SETCC, VT, Custom);
@@ -1179,6 +1243,8 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM,
       setOperationAction(ISD::SRL, VT, Custom);
       setOperationAction(ISD::SRA, VT, Custom);
       setOperationAction(ISD::ABS, VT, Custom);
+      setOperationAction(ISD::ABDS, VT, Custom);
+      setOperationAction(ISD::ABDU, VT, Custom);
       setOperationAction(ISD::VECREDUCE_ADD, VT, Custom);
       setOperationAction(ISD::VECREDUCE_AND, VT, Custom);
       setOperationAction(ISD::VECREDUCE_OR, VT, Custom);
@@ -1193,6 +1259,22 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM,
       setOperationAction(ISD::SELECT_CC, VT, Expand);
       setOperationAction(ISD::ROTL, VT, Expand);
       setOperationAction(ISD::ROTR, VT, Expand);
+
+      setOperationAction(ISD::SADDSAT, VT, Legal);
+      setOperationAction(ISD::UADDSAT, VT, Legal);
+      setOperationAction(ISD::SSUBSAT, VT, Legal);
+      setOperationAction(ISD::USUBSAT, VT, Legal);
+      setOperationAction(ISD::UREM, VT, Expand);
+      setOperationAction(ISD::SREM, VT, Expand);
+      setOperationAction(ISD::SDIVREM, VT, Expand);
+      setOperationAction(ISD::UDIVREM, VT, Expand);
+
+      if (Subtarget->hasSVE2()) {
+        setOperationAction(ISD::AVGFLOORS, VT, Custom);
+        setOperationAction(ISD::AVGFLOORU, VT, Custom);
+        setOperationAction(ISD::AVGCEILS, VT, Custom);
+        setOperationAction(ISD::AVGCEILU, VT, Custom);
+      }
     }
 
     // Illegal unpacked integer vector types.
@@ -1203,22 +1285,27 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM,
 
     // Legalize unpacked bitcasts to REINTERPRET_CAST.
     for (auto VT : {MVT::nxv2i16, MVT::nxv4i16, MVT::nxv2i32, MVT::nxv2bf16,
-                    MVT::nxv2f16, MVT::nxv4f16, MVT::nxv2f32})
+                    MVT::nxv4bf16, MVT::nxv2f16, MVT::nxv4f16, MVT::nxv2f32})
       setOperationAction(ISD::BITCAST, VT, Custom);
 
-    for (auto VT : {MVT::nxv16i1, MVT::nxv8i1, MVT::nxv4i1, MVT::nxv2i1}) {
+    for (auto VT :
+         { MVT::nxv2i8, MVT::nxv2i16, MVT::nxv2i32, MVT::nxv2i64, MVT::nxv4i8,
+           MVT::nxv4i16, MVT::nxv4i32, MVT::nxv8i8, MVT::nxv8i16 })
+      setOperationAction(ISD::SIGN_EXTEND_INREG, VT, Legal);
+
+    for (auto VT :
+         {MVT::nxv16i1, MVT::nxv8i1, MVT::nxv4i1, MVT::nxv2i1, MVT::nxv1i1}) {
       setOperationAction(ISD::CONCAT_VECTORS, VT, Custom);
       setOperationAction(ISD::SELECT, VT, Custom);
       setOperationAction(ISD::SETCC, VT, Custom);
-      setOperationAction(ISD::SPLAT_VECTOR, VT, Custom);
       setOperationAction(ISD::TRUNCATE, VT, Custom);
       setOperationAction(ISD::VECREDUCE_AND, VT, Custom);
       setOperationAction(ISD::VECREDUCE_OR, VT, Custom);
       setOperationAction(ISD::VECREDUCE_XOR, VT, Custom);
 
       setOperationAction(ISD::SELECT_CC, VT, Expand);
-      setOperationAction(ISD::EXTRACT_VECTOR_ELT, VT, Custom);
       setOperationAction(ISD::INSERT_VECTOR_ELT, VT, Custom);
+      setOperationAction(ISD::INSERT_SUBVECTOR, VT, Custom);
 
       // There are no legal MVT::nxv16f## based types.
       if (VT != MVT::nxv16i1) {
@@ -1237,18 +1324,33 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM,
       setOperationAction(ISD::MSCATTER, VT, Custom);
     }
 
-    for (MVT VT : MVT::fp_scalable_vector_valuetypes()) {
-      for (MVT InnerVT : MVT::fp_scalable_vector_valuetypes()) {
-        // Avoid marking truncating FP stores as legal to prevent the
-        // DAGCombiner from creating unsupported truncating stores.
+    // Firstly, exclude all scalable vector extending loads/truncating stores,
+    // include both integer and floating scalable vector.
+    for (MVT VT : MVT::scalable_vector_valuetypes()) {
+      for (MVT InnerVT : MVT::scalable_vector_valuetypes()) {
         setTruncStoreAction(VT, InnerVT, Expand);
-        // SVE does not have floating-point extending loads.
         setLoadExtAction(ISD::SEXTLOAD, VT, InnerVT, Expand);
         setLoadExtAction(ISD::ZEXTLOAD, VT, InnerVT, Expand);
         setLoadExtAction(ISD::EXTLOAD, VT, InnerVT, Expand);
       }
     }
 
+    // Then, selectively enable those which we directly support.
+    setTruncStoreAction(MVT::nxv2i64, MVT::nxv2i8, Legal);
+    setTruncStoreAction(MVT::nxv2i64, MVT::nxv2i16, Legal);
+    setTruncStoreAction(MVT::nxv2i64, MVT::nxv2i32, Legal);
+    setTruncStoreAction(MVT::nxv4i32, MVT::nxv4i8, Legal);
+    setTruncStoreAction(MVT::nxv4i32, MVT::nxv4i16, Legal);
+    setTruncStoreAction(MVT::nxv8i16, MVT::nxv8i8, Legal);
+    for (auto Op : {ISD::ZEXTLOAD, ISD::SEXTLOAD, ISD::EXTLOAD}) {
+      setLoadExtAction(Op, MVT::nxv2i64, MVT::nxv2i8, Legal);
+      setLoadExtAction(Op, MVT::nxv2i64, MVT::nxv2i16, Legal);
+      setLoadExtAction(Op, MVT::nxv2i64, MVT::nxv2i32, Legal);
+      setLoadExtAction(Op, MVT::nxv4i32, MVT::nxv4i8, Legal);
+      setLoadExtAction(Op, MVT::nxv4i32, MVT::nxv4i16, Legal);
+      setLoadExtAction(Op, MVT::nxv8i16, MVT::nxv8i8, Legal);
+    }
+
     // SVE supports truncating stores of 64 and 128-bit vectors
     setTruncStoreAction(MVT::v2i64, MVT::v2i8, Custom);
     setTruncStoreAction(MVT::v2i64, MVT::v2i16, Custom);
@@ -1263,9 +1365,10 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM,
       setOperationAction(ISD::MGATHER, VT, Custom);
       setOperationAction(ISD::MSCATTER, VT, Custom);
       setOperationAction(ISD::MLOAD, VT, Custom);
-      setOperationAction(ISD::SPLAT_VECTOR, VT, Custom);
+      setOperationAction(ISD::SPLAT_VECTOR, VT, Legal);
       setOperationAction(ISD::SELECT, VT, Custom);
       setOperationAction(ISD::FADD, VT, Custom);
+      setOperationAction(ISD::FCOPYSIGN, VT, Custom);
       setOperationAction(ISD::FDIV, VT, Custom);
       setOperationAction(ISD::FMA, VT, Custom);
       setOperationAction(ISD::FMAXIMUM, VT, Custom);
@@ -1293,6 +1396,29 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM,
       setOperationAction(ISD::VECTOR_SPLICE, VT, Custom);
 
       setOperationAction(ISD::SELECT_CC, VT, Expand);
+      setOperationAction(ISD::FREM, VT, Expand);
+      setOperationAction(ISD::FPOW, VT, Expand);
+      setOperationAction(ISD::FPOWI, VT, Expand);
+      setOperationAction(ISD::FCOS, VT, Expand);
+      setOperationAction(ISD::FSIN, VT, Expand);
+      setOperationAction(ISD::FSINCOS, VT, Expand);
+      setOperationAction(ISD::FEXP, VT, Expand);
+      setOperationAction(ISD::FEXP2, VT, Expand);
+      setOperationAction(ISD::FLOG, VT, Expand);
+      setOperationAction(ISD::FLOG2, VT, Expand);
+      setOperationAction(ISD::FLOG10, VT, Expand);
+
+      setCondCodeAction(ISD::SETO, VT, Expand);
+      setCondCodeAction(ISD::SETOLT, VT, Expand);
+      setCondCodeAction(ISD::SETLT, VT, Expand);
+      setCondCodeAction(ISD::SETOLE, VT, Expand);
+      setCondCodeAction(ISD::SETLE, VT, Expand);
+      setCondCodeAction(ISD::SETULT, VT, Expand);
+      setCondCodeAction(ISD::SETULE, VT, Expand);
+      setCondCodeAction(ISD::SETUGE, VT, Expand);
+      setCondCodeAction(ISD::SETUGT, VT, Expand);
+      setCondCodeAction(ISD::SETUEQ, VT, Expand);
+      setCondCodeAction(ISD::SETONE, VT, Expand);
     }
 
     for (auto VT : {MVT::nxv2bf16, MVT::nxv4bf16, MVT::nxv8bf16}) {
@@ -1300,13 +1426,47 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM,
       setOperationAction(ISD::MGATHER, VT, Custom);
       setOperationAction(ISD::MSCATTER, VT, Custom);
       setOperationAction(ISD::MLOAD, VT, Custom);
+      setOperationAction(ISD::INSERT_SUBVECTOR, VT, Custom);
+      setOperationAction(ISD::SPLAT_VECTOR, VT, Legal);
     }
 
-    setOperationAction(ISD::SPLAT_VECTOR, MVT::nxv8bf16, Custom);
-
     setOperationAction(ISD::INTRINSIC_WO_CHAIN, MVT::i8, Custom);
     setOperationAction(ISD::INTRINSIC_WO_CHAIN, MVT::i16, Custom);
 
+    // NEON doesn't support integer divides, but SVE does
+    for (auto VT : {MVT::v8i8, MVT::v16i8, MVT::v4i16, MVT::v8i16, MVT::v2i32,
+                    MVT::v4i32, MVT::v1i64, MVT::v2i64}) {
+      setOperationAction(ISD::SDIV, VT, Custom);
+      setOperationAction(ISD::UDIV, VT, Custom);
+    }
+
+    // NEON doesn't support 64-bit vector integer muls, but SVE does.
+    setOperationAction(ISD::MUL, MVT::v1i64, Custom);
+    setOperationAction(ISD::MUL, MVT::v2i64, Custom);
+
+    // NEON doesn't support across-vector reductions, but SVE does.
+    for (auto VT : {MVT::v4f16, MVT::v8f16, MVT::v2f32, MVT::v4f32, MVT::v2f64})
+      setOperationAction(ISD::VECREDUCE_SEQ_FADD, VT, Custom);
+
+    if (Subtarget->forceStreamingCompatibleSVE()) {
+      setTruncStoreAction(MVT::v2f32, MVT::v2f16, Custom);
+      setTruncStoreAction(MVT::v4f32, MVT::v4f16, Custom);
+      setTruncStoreAction(MVT::v8f32, MVT::v8f16, Custom);
+      setTruncStoreAction(MVT::v1f64, MVT::v1f16, Custom);
+      setTruncStoreAction(MVT::v2f64, MVT::v2f16, Custom);
+      setTruncStoreAction(MVT::v4f64, MVT::v4f16, Custom);
+      setTruncStoreAction(MVT::v1f64, MVT::v1f32, Custom);
+      setTruncStoreAction(MVT::v2f64, MVT::v2f32, Custom);
+      setTruncStoreAction(MVT::v4f64, MVT::v4f32, Custom);
+      for (MVT VT : {MVT::v8i8, MVT::v16i8, MVT::v4i16, MVT::v8i16, MVT::v2i32,
+                     MVT::v4i32, MVT::v1i64, MVT::v2i64})
+        addTypeForStreamingSVE(VT);
+
+      for (MVT VT :
+           {MVT::v4f16, MVT::v8f16, MVT::v2f32, MVT::v4f32, MVT::v2f64})
+        addTypeForStreamingSVE(VT);
+    }
+
     // NOTE: Currently this has to happen after computeRegisterProperties rather
     // than the preferred option of combining it with the addRegisterClass call.
     if (Subtarget->useSVEForFixedLengthVectors()) {
@@ -1333,32 +1493,14 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM,
       setOperationAction(ISD::CTLZ, MVT::v1i64, Custom);
       setOperationAction(ISD::CTLZ, MVT::v2i64, Custom);
       setOperationAction(ISD::CTTZ, MVT::v1i64, Custom);
-      setOperationAction(ISD::MUL, MVT::v1i64, Custom);
-      setOperationAction(ISD::MUL, MVT::v2i64, Custom);
       setOperationAction(ISD::MULHS, MVT::v1i64, Custom);
       setOperationAction(ISD::MULHS, MVT::v2i64, Custom);
       setOperationAction(ISD::MULHU, MVT::v1i64, Custom);
       setOperationAction(ISD::MULHU, MVT::v2i64, Custom);
-      setOperationAction(ISD::SDIV, MVT::v8i8, Custom);
-      setOperationAction(ISD::SDIV, MVT::v16i8, Custom);
-      setOperationAction(ISD::SDIV, MVT::v4i16, Custom);
-      setOperationAction(ISD::SDIV, MVT::v8i16, Custom);
-      setOperationAction(ISD::SDIV, MVT::v2i32, Custom);
-      setOperationAction(ISD::SDIV, MVT::v4i32, Custom);
-      setOperationAction(ISD::SDIV, MVT::v1i64, Custom);
-      setOperationAction(ISD::SDIV, MVT::v2i64, Custom);
       setOperationAction(ISD::SMAX, MVT::v1i64, Custom);
       setOperationAction(ISD::SMAX, MVT::v2i64, Custom);
       setOperationAction(ISD::SMIN, MVT::v1i64, Custom);
       setOperationAction(ISD::SMIN, MVT::v2i64, Custom);
-      setOperationAction(ISD::UDIV, MVT::v8i8, Custom);
-      setOperationAction(ISD::UDIV, MVT::v16i8, Custom);
-      setOperationAction(ISD::UDIV, MVT::v4i16, Custom);
-      setOperationAction(ISD::UDIV, MVT::v8i16, Custom);
-      setOperationAction(ISD::UDIV, MVT::v2i32, Custom);
-      setOperationAction(ISD::UDIV, MVT::v4i32, Custom);
-      setOperationAction(ISD::UDIV, MVT::v1i64, Custom);
-      setOperationAction(ISD::UDIV, MVT::v2i64, Custom);
       setOperationAction(ISD::UMAX, MVT::v1i64, Custom);
       setOperationAction(ISD::UMAX, MVT::v2i64, Custom);
       setOperationAction(ISD::UMIN, MVT::v1i64, Custom);
@@ -1378,10 +1520,6 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM,
         setOperationAction(ISD::VECREDUCE_XOR, VT, Custom);
       }
 
-      // FP operations with no NEON support.
-      for (auto VT : {MVT::v4f16, MVT::v8f16, MVT::v2f32, MVT::v4f32,
-                      MVT::v1f64, MVT::v2f64})
-        setOperationAction(ISD::VECREDUCE_SEQ_FADD, VT, Custom);
 
       // Use SVE for vectors with more than 2 elements.
       for (auto VT : {MVT::v4f16, MVT::v8f16, MVT::v4f32})
@@ -1392,9 +1530,20 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM,
     setOperationPromotedToType(ISD::VECTOR_SPLICE, MVT::nxv4i1, MVT::nxv4i32);
     setOperationPromotedToType(ISD::VECTOR_SPLICE, MVT::nxv8i1, MVT::nxv8i16);
     setOperationPromotedToType(ISD::VECTOR_SPLICE, MVT::nxv16i1, MVT::nxv16i8);
+
+    setOperationAction(ISD::VSCALE, MVT::i32, Custom);
+  }
+
+  if (Subtarget->hasMOPS() && Subtarget->hasMTE()) {
+    // Only required for llvm.aarch64.mops.memset.tag
+    setOperationAction(ISD::INTRINSIC_W_CHAIN, MVT::i8, Custom);
   }
 
+  setOperationAction(ISD::INTRINSIC_VOID, MVT::Other, Custom);
+
   PredictableSelectIsExpensive = Subtarget->predictableSelectIsExpensive();
+
+  IsStrictFPEnabled = true;
 }
 
 void AArch64TargetLowering::addTypeForNEON(MVT VT) {
@@ -1426,6 +1575,7 @@ void AArch64TargetLowering::addTypeForNEON(MVT VT) {
   setOperationAction(ISD::EXTRACT_VECTOR_ELT, VT, Custom);
   setOperationAction(ISD::INSERT_VECTOR_ELT, VT, Custom);
   setOperationAction(ISD::BUILD_VECTOR, VT, Custom);
+  setOperationAction(ISD::ZERO_EXTEND_VECTOR_INREG, VT, Custom);
   setOperationAction(ISD::VECTOR_SHUFFLE, VT, Custom);
   setOperationAction(ISD::EXTRACT_SUBVECTOR, VT, Custom);
   setOperationAction(ISD::SRA, VT, Custom);
@@ -1451,8 +1601,10 @@ void AArch64TargetLowering::addTypeForNEON(MVT VT) {
   setOperationAction(ISD::SREM, VT, Expand);
   setOperationAction(ISD::FREM, VT, Expand);
 
-  setOperationAction(ISD::FP_TO_SINT, VT, Custom);
-  setOperationAction(ISD::FP_TO_UINT, VT, Custom);
+  for (unsigned Opcode :
+       {ISD::FP_TO_SINT, ISD::FP_TO_UINT, ISD::FP_TO_SINT_SAT,
+        ISD::FP_TO_UINT_SAT, ISD::STRICT_FP_TO_SINT, ISD::STRICT_FP_TO_UINT})
+    setOperationAction(Opcode, VT, Custom);
 
   if (!VT.isFloatingPoint())
     setOperationAction(ISD::ABS, VT, Legal);
@@ -1462,14 +1614,39 @@ void AArch64TargetLowering::addTypeForNEON(MVT VT) {
     for (unsigned Opcode : {ISD::SMIN, ISD::SMAX, ISD::UMIN, ISD::UMAX})
       setOperationAction(Opcode, VT, Legal);
 
-  // F[MIN|MAX][NUM|NAN] are available for all FP NEON types.
+  // F[MIN|MAX][NUM|NAN] and simple strict operations are available for all FP
+  // NEON types.
   if (VT.isFloatingPoint() &&
       VT.getVectorElementType() != MVT::bf16 &&
       (VT.getVectorElementType() != MVT::f16 || Subtarget->hasFullFP16()))
     for (unsigned Opcode :
-         {ISD::FMINIMUM, ISD::FMAXIMUM, ISD::FMINNUM, ISD::FMAXNUM})
+         {ISD::FMINIMUM, ISD::FMAXIMUM, ISD::FMINNUM, ISD::FMAXNUM,
+          ISD::STRICT_FMINIMUM, ISD::STRICT_FMAXIMUM, ISD::STRICT_FMINNUM,
+          ISD::STRICT_FMAXNUM, ISD::STRICT_FADD, ISD::STRICT_FSUB,
+          ISD::STRICT_FMUL, ISD::STRICT_FDIV, ISD::STRICT_FMA,
+          ISD::STRICT_FSQRT})
       setOperationAction(Opcode, VT, Legal);
 
+  // Strict fp extend and trunc are legal
+  if (VT.isFloatingPoint() && VT.getScalarSizeInBits() != 16)
+    setOperationAction(ISD::STRICT_FP_EXTEND, VT, Legal);
+  if (VT.isFloatingPoint() && VT.getScalarSizeInBits() != 64)
+    setOperationAction(ISD::STRICT_FP_ROUND, VT, Legal);
+
+  // FIXME: We could potentially make use of the vector comparison instructions
+  // for STRICT_FSETCC and STRICT_FSETCSS, but there's a number of
+  // complications:
+  //  * FCMPEQ/NE are quiet comparisons, the rest are signalling comparisons,
+  //    so we would need to expand when the condition code doesn't match the
+  //    kind of comparison.
+  //  * Some kinds of comparison require more than one FCMXY instruction so
+  //    would need to be expanded instead.
+  //  * The lowering of the non-strict versions involves target-specific ISD
+  //    nodes so we would likely need to add strict versions of all of them and
+  //    handle them appropriately.
+  setOperationAction(ISD::STRICT_FSETCC, VT, Expand);
+  setOperationAction(ISD::STRICT_FSETCCS, VT, Expand);
+
   if (Subtarget->isLittleEndian()) {
     for (unsigned im = (unsigned)ISD::PRE_INC;
          im != (unsigned)ISD::LAST_INDEXED_MODE; ++im) {
@@ -1477,58 +1654,98 @@ void AArch64TargetLowering::addTypeForNEON(MVT VT) {
       setIndexedStoreAction(im, VT, Legal);
     }
   }
+
+  if (Subtarget->hasD128()) {
+    setOperationAction(ISD::READ_REGISTER, MVT::i128, Custom);
+    setOperationAction(ISD::WRITE_REGISTER, MVT::i128, Custom);
+  }
 }
 
-void AArch64TargetLowering::addTypeForFixedLengthSVE(MVT VT) {
-  assert(VT.isFixedLengthVector() && "Expected fixed length vector type!");
+bool AArch64TargetLowering::shouldExpandGetActiveLaneMask(EVT ResVT,
+                                                          EVT OpVT) const {
+  // Only SVE has a 1:1 mapping from intrinsic -> instruction (whilelo).
+  if (!Subtarget->hasSVE())
+    return true;
 
-  // By default everything must be expanded.
+  // We can only support legal predicate result types. We can use the SVE
+  // whilelo instruction for generating fixed-width predicates too.
+  if (ResVT != MVT::nxv2i1 && ResVT != MVT::nxv4i1 && ResVT != MVT::nxv8i1 &&
+      ResVT != MVT::nxv16i1 && ResVT != MVT::v2i1 && ResVT != MVT::v4i1 &&
+      ResVT != MVT::v8i1 && ResVT != MVT::v16i1)
+    return true;
+
+  // The whilelo instruction only works with i32 or i64 scalar inputs.
+  if (OpVT != MVT::i32 && OpVT != MVT::i64)
+    return true;
+
+  return false;
+}
+
+void AArch64TargetLowering::addTypeForStreamingSVE(MVT VT) {
+  // By default set all operations to Expand,
+  // then change to Legal/Custom if needed.
   for (unsigned Op = 0; Op < ISD::BUILTIN_OP_END; ++Op)
     setOperationAction(Op, VT, Expand);
 
-  // We use EXTRACT_SUBVECTOR to "cast" a scalable vector to a fixed length one.
-  setOperationAction(ISD::EXTRACT_SUBVECTOR, VT, Custom);
+  assert(VT.isFixedLengthVector() && "Expected fixed length vector type!");
 
   if (VT.isFloatingPoint()) {
     setCondCodeAction(ISD::SETO, VT, Expand);
     setCondCodeAction(ISD::SETOLT, VT, Expand);
-    setCondCodeAction(ISD::SETLT, VT, Expand);
     setCondCodeAction(ISD::SETOLE, VT, Expand);
-    setCondCodeAction(ISD::SETLE, VT, Expand);
     setCondCodeAction(ISD::SETULT, VT, Expand);
     setCondCodeAction(ISD::SETULE, VT, Expand);
     setCondCodeAction(ISD::SETUGE, VT, Expand);
     setCondCodeAction(ISD::SETUGT, VT, Expand);
     setCondCodeAction(ISD::SETUEQ, VT, Expand);
-    setCondCodeAction(ISD::SETUNE, VT, Expand);
+    setCondCodeAction(ISD::SETONE, VT, Expand);
   }
 
-  // Mark integer truncating stores as having custom lowering
+  // STORE, LOAD, SCALAR_TO_VECTOR and BITCAST are natively supported,
+  // so no need to Custom/Expand them.
+  setOperationAction(ISD::STORE, VT, Legal);
+  setOperationAction(ISD::LOAD, VT, Legal);
+  setOperationAction(ISD::SCALAR_TO_VECTOR, VT, Legal);
+  setOperationAction(ISD::BITCAST, VT, Legal);
+
+  // Mark integer truncating stores/extending loads as having custom lowering
   if (VT.isInteger()) {
     MVT InnerVT = VT.changeVectorElementType(MVT::i8);
     while (InnerVT != VT) {
       setTruncStoreAction(VT, InnerVT, Custom);
+      setLoadExtAction(ISD::ZEXTLOAD, VT, InnerVT, Custom);
+      setLoadExtAction(ISD::SEXTLOAD, VT, InnerVT, Custom);
       InnerVT = InnerVT.changeVectorElementType(
           MVT::getIntegerVT(2 * InnerVT.getScalarSizeInBits()));
     }
   }
 
-  // Lower fixed length vector operations to scalable equivalents.
+  // Mark floating-point truncating stores/extending loads as having custom
+  // lowering
+  if (VT.isFloatingPoint()) {
+    MVT InnerVT = VT.changeVectorElementType(MVT::f16);
+    while (InnerVT != VT) {
+      setTruncStoreAction(VT, InnerVT, Custom);
+      setLoadExtAction(ISD::EXTLOAD, VT, InnerVT, Custom);
+      InnerVT = InnerVT.changeVectorElementType(
+          MVT::getFloatingPointVT(2 * InnerVT.getScalarSizeInBits()));
+    }
+  }
+
   setOperationAction(ISD::ABS, VT, Custom);
   setOperationAction(ISD::ADD, VT, Custom);
   setOperationAction(ISD::AND, VT, Custom);
   setOperationAction(ISD::ANY_EXTEND, VT, Custom);
-  setOperationAction(ISD::BITCAST, VT, Custom);
-  setOperationAction(ISD::BITREVERSE, VT, Custom);
-  setOperationAction(ISD::BSWAP, VT, Custom);
+  setOperationAction(ISD::BUILD_VECTOR, VT, Custom);
   setOperationAction(ISD::CONCAT_VECTORS, VT, Custom);
   setOperationAction(ISD::CTLZ, VT, Custom);
   setOperationAction(ISD::CTPOP, VT, Custom);
-  setOperationAction(ISD::CTTZ, VT, Custom);
+  setOperationAction(ISD::EXTRACT_SUBVECTOR, VT, Custom);
+  setOperationAction(ISD::EXTRACT_VECTOR_ELT, VT, Custom);
   setOperationAction(ISD::FABS, VT, Custom);
   setOperationAction(ISD::FADD, VT, Custom);
-  setOperationAction(ISD::EXTRACT_VECTOR_ELT, VT, Custom);
   setOperationAction(ISD::FCEIL, VT, Custom);
+  setOperationAction(ISD::FCOPYSIGN, VT, Custom);
   setOperationAction(ISD::FDIV, VT, Custom);
   setOperationAction(ISD::FFLOOR, VT, Custom);
   setOperationAction(ISD::FMA, VT, Custom);
@@ -1539,7 +1756,6 @@ void AArch64TargetLowering::addTypeForFixedLengthSVE(MVT VT) {
   setOperationAction(ISD::FMUL, VT, Custom);
   setOperationAction(ISD::FNEARBYINT, VT, Custom);
   setOperationAction(ISD::FNEG, VT, Custom);
-  setOperationAction(ISD::FP_EXTEND, VT, Custom);
   setOperationAction(ISD::FP_ROUND, VT, Custom);
   setOperationAction(ISD::FP_TO_SINT, VT, Custom);
   setOperationAction(ISD::FP_TO_UINT, VT, Custom);
@@ -1549,29 +1765,23 @@ void AArch64TargetLowering::addTypeForFixedLengthSVE(MVT VT) {
   setOperationAction(ISD::FSQRT, VT, Custom);
   setOperationAction(ISD::FSUB, VT, Custom);
   setOperationAction(ISD::FTRUNC, VT, Custom);
-  setOperationAction(ISD::LOAD, VT, Custom);
-  setOperationAction(ISD::MGATHER, VT, Custom);
+  setOperationAction(ISD::INSERT_VECTOR_ELT, VT, Custom);
   setOperationAction(ISD::MLOAD, VT, Custom);
-  setOperationAction(ISD::MSCATTER, VT, Custom);
   setOperationAction(ISD::MSTORE, VT, Custom);
   setOperationAction(ISD::MUL, VT, Custom);
   setOperationAction(ISD::MULHS, VT, Custom);
   setOperationAction(ISD::MULHU, VT, Custom);
   setOperationAction(ISD::OR, VT, Custom);
   setOperationAction(ISD::SDIV, VT, Custom);
-  setOperationAction(ISD::SELECT, VT, Custom);
   setOperationAction(ISD::SETCC, VT, Custom);
   setOperationAction(ISD::SHL, VT, Custom);
   setOperationAction(ISD::SIGN_EXTEND, VT, Custom);
-  setOperationAction(ISD::SIGN_EXTEND_INREG, VT, Custom);
   setOperationAction(ISD::SINT_TO_FP, VT, Custom);
   setOperationAction(ISD::SMAX, VT, Custom);
   setOperationAction(ISD::SMIN, VT, Custom);
   setOperationAction(ISD::SPLAT_VECTOR, VT, Custom);
-  setOperationAction(ISD::VECTOR_SPLICE, VT, Custom);
   setOperationAction(ISD::SRA, VT, Custom);
   setOperationAction(ISD::SRL, VT, Custom);
-  setOperationAction(ISD::STORE, VT, Custom);
   setOperationAction(ISD::SUB, VT, Custom);
   setOperationAction(ISD::TRUNCATE, VT, Custom);
   setOperationAction(ISD::UDIV, VT, Custom);
@@ -1579,47 +1789,191 @@ void AArch64TargetLowering::addTypeForFixedLengthSVE(MVT VT) {
   setOperationAction(ISD::UMAX, VT, Custom);
   setOperationAction(ISD::UMIN, VT, Custom);
   setOperationAction(ISD::VECREDUCE_ADD, VT, Custom);
-  setOperationAction(ISD::VECREDUCE_AND, VT, Custom);
   setOperationAction(ISD::VECREDUCE_FADD, VT, Custom);
-  setOperationAction(ISD::VECREDUCE_SEQ_FADD, VT, Custom);
   setOperationAction(ISD::VECREDUCE_FMAX, VT, Custom);
   setOperationAction(ISD::VECREDUCE_FMIN, VT, Custom);
-  setOperationAction(ISD::VECREDUCE_OR, VT, Custom);
-  setOperationAction(ISD::INSERT_VECTOR_ELT, VT, Custom);
+  setOperationAction(ISD::VECREDUCE_SEQ_FADD, VT, Custom);
   setOperationAction(ISD::VECREDUCE_SMAX, VT, Custom);
   setOperationAction(ISD::VECREDUCE_SMIN, VT, Custom);
   setOperationAction(ISD::VECREDUCE_UMAX, VT, Custom);
   setOperationAction(ISD::VECREDUCE_UMIN, VT, Custom);
-  setOperationAction(ISD::VECREDUCE_XOR, VT, Custom);
   setOperationAction(ISD::VECTOR_SHUFFLE, VT, Custom);
-  setOperationAction(ISD::VSELECT, VT, Custom);
   setOperationAction(ISD::XOR, VT, Custom);
   setOperationAction(ISD::ZERO_EXTEND, VT, Custom);
 }
 
-void AArch64TargetLowering::addDRTypeForNEON(MVT VT) {
-  addRegisterClass(VT, &AArch64::FPR64RegClass);
-  addTypeForNEON(VT);
-}
+void AArch64TargetLowering::addTypeForFixedLengthSVE(MVT VT) {
+  assert(VT.isFixedLengthVector() && "Expected fixed length vector type!");
 
-void AArch64TargetLowering::addQRTypeForNEON(MVT VT) {
-  addRegisterClass(VT, &AArch64::FPR128RegClass);
-  addTypeForNEON(VT);
-}
+  // By default everything must be expanded.
+  for (unsigned Op = 0; Op < ISD::BUILTIN_OP_END; ++Op)
+    setOperationAction(Op, VT, Expand);
 
-EVT AArch64TargetLowering::getSetCCResultType(const DataLayout &,
-                                              LLVMContext &C, EVT VT) const {
-  if (!VT.isVector())
-    return MVT::i32;
-  if (VT.isScalableVector())
-    return EVT::getVectorVT(C, MVT::i1, VT.getVectorElementCount());
-  return VT.changeVectorElementTypeToInteger();
-}
+  if (VT.isFloatingPoint()) {
+    setCondCodeAction(ISD::SETO, VT, Expand);
+    setCondCodeAction(ISD::SETOLT, VT, Expand);
+    setCondCodeAction(ISD::SETOLE, VT, Expand);
+    setCondCodeAction(ISD::SETULT, VT, Expand);
+    setCondCodeAction(ISD::SETULE, VT, Expand);
+    setCondCodeAction(ISD::SETUGE, VT, Expand);
+    setCondCodeAction(ISD::SETUGT, VT, Expand);
+    setCondCodeAction(ISD::SETUEQ, VT, Expand);
+    setCondCodeAction(ISD::SETONE, VT, Expand);
+  }
 
-static bool optimizeLogicalImm(SDValue Op, unsigned Size, uint64_t Imm,
-                               const APInt &Demanded,
-                               TargetLowering::TargetLoweringOpt &TLO,
-                               unsigned NewOpc) {
+  // Mark integer truncating stores/extending loads as having custom lowering
+  if (VT.isInteger()) {
+    MVT InnerVT = VT.changeVectorElementType(MVT::i8);
+    while (InnerVT != VT) {
+      setTruncStoreAction(VT, InnerVT, Custom);
+      setLoadExtAction(ISD::ZEXTLOAD, VT, InnerVT, Custom);
+      setLoadExtAction(ISD::SEXTLOAD, VT, InnerVT, Custom);
+      InnerVT = InnerVT.changeVectorElementType(
+          MVT::getIntegerVT(2 * InnerVT.getScalarSizeInBits()));
+    }
+  }
+
+  // Mark floating-point truncating stores/extending loads as having custom
+  // lowering
+  if (VT.isFloatingPoint()) {
+    MVT InnerVT = VT.changeVectorElementType(MVT::f16);
+    while (InnerVT != VT) {
+      setTruncStoreAction(VT, InnerVT, Custom);
+      setLoadExtAction(ISD::EXTLOAD, VT, InnerVT, Custom);
+      InnerVT = InnerVT.changeVectorElementType(
+          MVT::getFloatingPointVT(2 * InnerVT.getScalarSizeInBits()));
+    }
+  }
+
+  // Lower fixed length vector operations to scalable equivalents.
+  setOperationAction(ISD::ABS, VT, Custom);
+  setOperationAction(ISD::ADD, VT, Custom);
+  setOperationAction(ISD::AND, VT, Custom);
+  setOperationAction(ISD::ANY_EXTEND, VT, Custom);
+  setOperationAction(ISD::BITCAST, VT, Custom);
+  setOperationAction(ISD::BITREVERSE, VT, Custom);
+  setOperationAction(ISD::BSWAP, VT, Custom);
+  setOperationAction(ISD::BUILD_VECTOR, VT, Custom);
+  setOperationAction(ISD::CONCAT_VECTORS, VT, Custom);
+  setOperationAction(ISD::CTLZ, VT, Custom);
+  setOperationAction(ISD::CTPOP, VT, Custom);
+  setOperationAction(ISD::CTTZ, VT, Custom);
+  setOperationAction(ISD::EXTRACT_SUBVECTOR, VT, Custom);
+  setOperationAction(ISD::EXTRACT_VECTOR_ELT, VT, Custom);
+  setOperationAction(ISD::FABS, VT, Custom);
+  setOperationAction(ISD::FADD, VT, Custom);
+  setOperationAction(ISD::FCEIL, VT, Custom);
+  setOperationAction(ISD::FCOPYSIGN, VT, Custom);
+  setOperationAction(ISD::FDIV, VT, Custom);
+  setOperationAction(ISD::FFLOOR, VT, Custom);
+  setOperationAction(ISD::FMA, VT, Custom);
+  setOperationAction(ISD::FMAXIMUM, VT, Custom);
+  setOperationAction(ISD::FMAXNUM, VT, Custom);
+  setOperationAction(ISD::FMINIMUM, VT, Custom);
+  setOperationAction(ISD::FMINNUM, VT, Custom);
+  setOperationAction(ISD::FMUL, VT, Custom);
+  setOperationAction(ISD::FNEARBYINT, VT, Custom);
+  setOperationAction(ISD::FNEG, VT, Custom);
+  setOperationAction(ISD::FP_EXTEND, VT, Custom);
+  setOperationAction(ISD::FP_ROUND, VT, Custom);
+  setOperationAction(ISD::FP_TO_SINT, VT, Custom);
+  setOperationAction(ISD::FP_TO_UINT, VT, Custom);
+  setOperationAction(ISD::FRINT, VT, Custom);
+  setOperationAction(ISD::FROUND, VT, Custom);
+  setOperationAction(ISD::FROUNDEVEN, VT, Custom);
+  setOperationAction(ISD::FSQRT, VT, Custom);
+  setOperationAction(ISD::FSUB, VT, Custom);
+  setOperationAction(ISD::FTRUNC, VT, Custom);
+  setOperationAction(ISD::INSERT_VECTOR_ELT, VT, Custom);
+  setOperationAction(ISD::LOAD, VT, Custom);
+  setOperationAction(ISD::MGATHER, VT, Custom);
+  setOperationAction(ISD::MLOAD, VT, Custom);
+  setOperationAction(ISD::MSCATTER, VT, Custom);
+  setOperationAction(ISD::MSTORE, VT, Custom);
+  setOperationAction(ISD::MUL, VT, Custom);
+  setOperationAction(ISD::MULHS, VT, Custom);
+  setOperationAction(ISD::MULHU, VT, Custom);
+  setOperationAction(ISD::OR, VT, Custom);
+  setOperationAction(ISD::SDIV, VT, Custom);
+  setOperationAction(ISD::SELECT, VT, Custom);
+  setOperationAction(ISD::SETCC, VT, Custom);
+  setOperationAction(ISD::SHL, VT, Custom);
+  setOperationAction(ISD::SIGN_EXTEND, VT, Custom);
+  setOperationAction(ISD::SIGN_EXTEND_INREG, VT, Custom);
+  setOperationAction(ISD::SINT_TO_FP, VT, Custom);
+  setOperationAction(ISD::SMAX, VT, Custom);
+  setOperationAction(ISD::SMIN, VT, Custom);
+  setOperationAction(ISD::SPLAT_VECTOR, VT, Custom);
+  setOperationAction(ISD::SRA, VT, Custom);
+  setOperationAction(ISD::SRL, VT, Custom);
+  setOperationAction(ISD::STORE, VT, Custom);
+  setOperationAction(ISD::SUB, VT, Custom);
+  setOperationAction(ISD::TRUNCATE, VT, Custom);
+  setOperationAction(ISD::UDIV, VT, Custom);
+  setOperationAction(ISD::UINT_TO_FP, VT, Custom);
+  setOperationAction(ISD::UMAX, VT, Custom);
+  setOperationAction(ISD::UMIN, VT, Custom);
+  setOperationAction(ISD::VECREDUCE_ADD, VT, Custom);
+  setOperationAction(ISD::VECREDUCE_AND, VT, Custom);
+  setOperationAction(ISD::VECREDUCE_FADD, VT, Custom);
+  setOperationAction(ISD::VECREDUCE_FMAX, VT, Custom);
+  setOperationAction(ISD::VECREDUCE_FMIN, VT, Custom);
+  setOperationAction(ISD::VECREDUCE_OR, VT, Custom);
+  setOperationAction(ISD::VECREDUCE_SEQ_FADD, VT, Custom);
+  setOperationAction(ISD::VECREDUCE_SMAX, VT, Custom);
+  setOperationAction(ISD::VECREDUCE_SMIN, VT, Custom);
+  setOperationAction(ISD::VECREDUCE_UMAX, VT, Custom);
+  setOperationAction(ISD::VECREDUCE_UMIN, VT, Custom);
+  setOperationAction(ISD::VECREDUCE_XOR, VT, Custom);
+  setOperationAction(ISD::VECTOR_SHUFFLE, VT, Custom);
+  setOperationAction(ISD::VECTOR_SPLICE, VT, Custom);
+  setOperationAction(ISD::VSELECT, VT, Custom);
+  setOperationAction(ISD::XOR, VT, Custom);
+  setOperationAction(ISD::ZERO_EXTEND, VT, Custom);
+}
+
+void AArch64TargetLowering::addDRTypeForNEON(MVT VT) {
+  addRegisterClass(VT, &AArch64::FPR64RegClass);
+  addTypeForNEON(VT);
+}
+
+void AArch64TargetLowering::addQRTypeForNEON(MVT VT) {
+  addRegisterClass(VT, &AArch64::FPR128RegClass);
+  addTypeForNEON(VT);
+}
+
+EVT AArch64TargetLowering::getSetCCResultType(const DataLayout &,
+                                              LLVMContext &C, EVT VT) const {
+  if (!VT.isVector())
+    return MVT::i32;
+  if (VT.isScalableVector())
+    return EVT::getVectorVT(C, MVT::i1, VT.getVectorElementCount());
+  return VT.changeVectorElementTypeToInteger();
+}
+
+// isIntImmediate - This method tests to see if the node is a constant
+// operand. If so Imm will receive the value.
+static bool isIntImmediate(const SDNode *N, uint64_t &Imm) {
+  if (const ConstantSDNode *C = dyn_cast<const ConstantSDNode>(N)) {
+    Imm = C->getZExtValue();
+    return true;
+  }
+  return false;
+}
+
+// isOpcWithIntImmediate - This method tests to see if the node is a specific
+// opcode and that it has a immediate integer right operand.
+// If so Imm will receive the value.
+static bool isOpcWithIntImmediate(const SDNode *N, unsigned Opc,
+                                  uint64_t &Imm) {
+  return N->getOpcode() == Opc &&
+         isIntImmediate(N->getOperand(1).getNode(), Imm);
+}
+
+static bool optimizeLogicalImm(SDValue Op, unsigned Size, uint64_t Imm,
+                               const APInt &Demanded,
+                               TargetLowering::TargetLoweringOpt &TLO,
+                               unsigned NewOpc) {
   uint64_t OldImm = Imm, NewImm, Enc;
   uint64_t Mask = ((uint64_t)(-1LL) >> (64 - Size)), OrigMask = Mask;
 
@@ -1757,11 +2111,21 @@ bool AArch64TargetLowering::targetShrinkDemandedConstant(
 /// computeKnownBitsForTargetNode - Determine which of the bits specified in
 /// Mask are known to be either zero or one and return them Known.
 void AArch64TargetLowering::computeKnownBitsForTargetNode(
-    const SDValue Op, KnownBits &Known,
-    const APInt &DemandedElts, const SelectionDAG &DAG, unsigned Depth) const {
+    const SDValue Op, KnownBits &Known, const APInt &DemandedElts,
+    const SelectionDAG &DAG, unsigned Depth) const {
   switch (Op.getOpcode()) {
   default:
     break;
+  case AArch64ISD::DUP: {
+    SDValue SrcOp = Op.getOperand(0);
+    Known = DAG.computeKnownBits(SrcOp, Depth + 1);
+    if (SrcOp.getValueSizeInBits() != Op.getScalarValueSizeInBits()) {
+      assert(SrcOp.getValueSizeInBits() > Op.getScalarValueSizeInBits() &&
+             "Expected DUP implicit truncation");
+      Known = Known.trunc(Op.getScalarValueSizeInBits());
+    }
+    break;
+  }
   case AArch64ISD::CSEL: {
     KnownBits Known2;
     Known = DAG.computeKnownBits(Op->getOperand(0), Depth + 1);
@@ -1769,6 +2133,34 @@ void AArch64TargetLowering::computeKnownBitsForTargetNode(
     Known = KnownBits::commonBits(Known, Known2);
     break;
   }
+  case AArch64ISD::BICi: {
+    // Compute the bit cleared value.
+    uint64_t Mask =
+        ~(Op->getConstantOperandVal(1) << Op->getConstantOperandVal(2));
+    Known = DAG.computeKnownBits(Op->getOperand(0), Depth + 1);
+    Known &= KnownBits::makeConstant(APInt(Known.getBitWidth(), Mask));
+    break;
+  }
+  case AArch64ISD::VLSHR: {
+    KnownBits Known2;
+    Known = DAG.computeKnownBits(Op->getOperand(0), Depth + 1);
+    Known2 = DAG.computeKnownBits(Op->getOperand(1), Depth + 1);
+    Known = KnownBits::lshr(Known, Known2);
+    break;
+  }
+  case AArch64ISD::VASHR: {
+    KnownBits Known2;
+    Known = DAG.computeKnownBits(Op->getOperand(0), Depth + 1);
+    Known2 = DAG.computeKnownBits(Op->getOperand(1), Depth + 1);
+    Known = KnownBits::ashr(Known, Known2);
+    break;
+  }
+  case AArch64ISD::MOVI: {
+    ConstantSDNode *CN = cast<ConstantSDNode>(Op->getOperand(0));
+    Known =
+        KnownBits::makeConstant(APInt(Known.getBitWidth(), CN->getZExtValue()));
+    break;
+  }
   case AArch64ISD::LOADgot:
   case AArch64ISD::ADDlow: {
     if (!Subtarget->isTargetILP32())
@@ -1777,6 +2169,11 @@ void AArch64TargetLowering::computeKnownBitsForTargetNode(
     Known.Zero = APInt::getHighBitsSet(64, 32);
     break;
   }
+  case AArch64ISD::ASSERT_ZEXT_BOOL: {
+    Known = DAG.computeKnownBits(Op->getOperand(0), Depth + 1);
+    Known.Zero |= APInt(Known.getBitWidth(), 0xFE);
+    break;
+  }
   case ISD::INTRINSIC_W_CHAIN: {
     ConstantSDNode *CN = cast<ConstantSDNode>(Op->getOperand(1));
     Intrinsic::ID IntID = static_cast<Intrinsic::ID>(CN->getZExtValue());
@@ -1830,7 +2227,7 @@ MVT AArch64TargetLowering::getScalarShiftAmountTy(const DataLayout &DL,
 
 bool AArch64TargetLowering::allowsMisalignedMemoryAccesses(
     EVT VT, unsigned AddrSpace, Align Alignment, MachineMemOperand::Flags Flags,
-    bool *Fast) const {
+    unsigned *Fast) const {
   if (Subtarget->requiresStrictAlign())
     return false;
 
@@ -1855,7 +2252,7 @@ bool AArch64TargetLowering::allowsMisalignedMemoryAccesses(
 // Same as above but handling LLTs instead.
 bool AArch64TargetLowering::allowsMisalignedMemoryAccesses(
     LLT Ty, unsigned AddrSpace, Align Alignment, MachineMemOperand::Flags Flags,
-    bool *Fast) const {
+    unsigned *Fast) const {
   if (Subtarget->requiresStrictAlign())
     return false;
 
@@ -1891,6 +2288,10 @@ const char *AArch64TargetLowering::getTargetNodeName(unsigned Opcode) const {
   switch ((AArch64ISD::NodeType)Opcode) {
   case AArch64ISD::FIRST_NUMBER:
     break;
+    MAKE_CASE(AArch64ISD::OBSCURE_COPY)
+    MAKE_CASE(AArch64ISD::SMSTART)
+    MAKE_CASE(AArch64ISD::SMSTOP)
+    MAKE_CASE(AArch64ISD::RESTORE_ZA)
     MAKE_CASE(AArch64ISD::CALL)
     MAKE_CASE(AArch64ISD::ADRP)
     MAKE_CASE(AArch64ISD::ADR)
@@ -1904,20 +2305,25 @@ const char *AArch64TargetLowering::getTargetNodeName(unsigned Opcode) const {
     MAKE_CASE(AArch64ISD::CSINC)
     MAKE_CASE(AArch64ISD::THREAD_POINTER)
     MAKE_CASE(AArch64ISD::TLSDESC_CALLSEQ)
-    MAKE_CASE(AArch64ISD::ADD_PRED)
+    MAKE_CASE(AArch64ISD::ABDS_PRED)
+    MAKE_CASE(AArch64ISD::ABDU_PRED)
+    MAKE_CASE(AArch64ISD::HADDS_PRED)
+    MAKE_CASE(AArch64ISD::HADDU_PRED)
     MAKE_CASE(AArch64ISD::MUL_PRED)
     MAKE_CASE(AArch64ISD::MULHS_PRED)
     MAKE_CASE(AArch64ISD::MULHU_PRED)
+    MAKE_CASE(AArch64ISD::RHADDS_PRED)
+    MAKE_CASE(AArch64ISD::RHADDU_PRED)
     MAKE_CASE(AArch64ISD::SDIV_PRED)
     MAKE_CASE(AArch64ISD::SHL_PRED)
     MAKE_CASE(AArch64ISD::SMAX_PRED)
     MAKE_CASE(AArch64ISD::SMIN_PRED)
     MAKE_CASE(AArch64ISD::SRA_PRED)
     MAKE_CASE(AArch64ISD::SRL_PRED)
-    MAKE_CASE(AArch64ISD::SUB_PRED)
     MAKE_CASE(AArch64ISD::UDIV_PRED)
     MAKE_CASE(AArch64ISD::UMAX_PRED)
     MAKE_CASE(AArch64ISD::UMIN_PRED)
+    MAKE_CASE(AArch64ISD::SRAD_MERGE_OP1)
     MAKE_CASE(AArch64ISD::FNEG_MERGE_PASSTHRU)
     MAKE_CASE(AArch64ISD::SIGN_EXTEND_INREG_MERGE_PASSTHRU)
     MAKE_CASE(AArch64ISD::ZERO_EXTEND_INREG_MERGE_PASSTHRU)
@@ -1958,6 +2364,7 @@ const char *AArch64TargetLowering::getTargetNodeName(unsigned Opcode) const {
     MAKE_CASE(AArch64ISD::DUPLANE16)
     MAKE_CASE(AArch64ISD::DUPLANE32)
     MAKE_CASE(AArch64ISD::DUPLANE64)
+    MAKE_CASE(AArch64ISD::DUPLANE128)
     MAKE_CASE(AArch64ISD::MOVI)
     MAKE_CASE(AArch64ISD::MOVIshift)
     MAKE_CASE(AArch64ISD::MOVIedit)
@@ -2005,10 +2412,6 @@ const char *AArch64TargetLowering::getTargetNodeName(unsigned Opcode) const {
     MAKE_CASE(AArch64ISD::FCMLTz)
     MAKE_CASE(AArch64ISD::SADDV)
     MAKE_CASE(AArch64ISD::UADDV)
-    MAKE_CASE(AArch64ISD::SRHADD)
-    MAKE_CASE(AArch64ISD::URHADD)
-    MAKE_CASE(AArch64ISD::SHADD)
-    MAKE_CASE(AArch64ISD::UHADD)
     MAKE_CASE(AArch64ISD::SDOT)
     MAKE_CASE(AArch64ISD::UDOT)
     MAKE_CASE(AArch64ISD::SMINV)
@@ -2047,6 +2450,7 @@ const char *AArch64TargetLowering::getTargetNodeName(unsigned Opcode) const {
     MAKE_CASE(AArch64ISD::FMINNMV_PRED)
     MAKE_CASE(AArch64ISD::FMUL_PRED)
     MAKE_CASE(AArch64ISD::FSUB_PRED)
+    MAKE_CASE(AArch64ISD::RDSVL)
     MAKE_CASE(AArch64ISD::BIC)
     MAKE_CASE(AArch64ISD::BIT)
     MAKE_CASE(AArch64ISD::CBZ)
@@ -2090,6 +2494,7 @@ const char *AArch64TargetLowering::getTargetNodeName(unsigned Opcode) const {
     MAKE_CASE(AArch64ISD::ST4LANEpost)
     MAKE_CASE(AArch64ISD::SMULL)
     MAKE_CASE(AArch64ISD::UMULL)
+    MAKE_CASE(AArch64ISD::PMULL)
     MAKE_CASE(AArch64ISD::FRECPE)
     MAKE_CASE(AArch64ISD::FRECPS)
     MAKE_CASE(AArch64ISD::FRSQRTE)
@@ -2104,6 +2509,7 @@ const char *AArch64TargetLowering::getTargetNodeName(unsigned Opcode) const {
     MAKE_CASE(AArch64ISD::UUNPKLO)
     MAKE_CASE(AArch64ISD::INSR)
     MAKE_CASE(AArch64ISD::PTEST)
+    MAKE_CASE(AArch64ISD::PTEST_ANY)
     MAKE_CASE(AArch64ISD::PTRUE)
     MAKE_CASE(AArch64ISD::LD1_MERGE_ZERO)
     MAKE_CASE(AArch64ISD::LD1S_MERGE_ZERO)
@@ -2158,16 +2564,30 @@ const char *AArch64TargetLowering::getTargetNodeName(unsigned Opcode) const {
     MAKE_CASE(AArch64ISD::SSTNT1_PRED)
     MAKE_CASE(AArch64ISD::SSTNT1_INDEX_PRED)
     MAKE_CASE(AArch64ISD::LDP)
+    MAKE_CASE(AArch64ISD::LDNP)
     MAKE_CASE(AArch64ISD::STP)
     MAKE_CASE(AArch64ISD::STNP)
     MAKE_CASE(AArch64ISD::BITREVERSE_MERGE_PASSTHRU)
     MAKE_CASE(AArch64ISD::BSWAP_MERGE_PASSTHRU)
+    MAKE_CASE(AArch64ISD::REVH_MERGE_PASSTHRU)
+    MAKE_CASE(AArch64ISD::REVW_MERGE_PASSTHRU)
+    MAKE_CASE(AArch64ISD::REVD_MERGE_PASSTHRU)
     MAKE_CASE(AArch64ISD::CTLZ_MERGE_PASSTHRU)
     MAKE_CASE(AArch64ISD::CTPOP_MERGE_PASSTHRU)
     MAKE_CASE(AArch64ISD::DUP_MERGE_PASSTHRU)
     MAKE_CASE(AArch64ISD::INDEX_VECTOR)
+    MAKE_CASE(AArch64ISD::ADDP)
+    MAKE_CASE(AArch64ISD::SADDLP)
     MAKE_CASE(AArch64ISD::UADDLP)
     MAKE_CASE(AArch64ISD::CALL_RVMARKER)
+    MAKE_CASE(AArch64ISD::ASSERT_ZEXT_BOOL)
+    MAKE_CASE(AArch64ISD::MOPS_MEMSET)
+    MAKE_CASE(AArch64ISD::MOPS_MEMSET_TAGGING)
+    MAKE_CASE(AArch64ISD::MOPS_MEMCOPY)
+    MAKE_CASE(AArch64ISD::MOPS_MEMMOVE)
+    MAKE_CASE(AArch64ISD::CALL_BTI)
+    MAKE_CASE(AArch64ISD::MRRS)
+    MAKE_CASE(AArch64ISD::MSRR)
   }
 #undef MAKE_CASE
   return nullptr;
@@ -2241,8 +2661,103 @@ MachineBasicBlock *AArch64TargetLowering::EmitLoweredCatchRet(
   return BB;
 }
 
+MachineBasicBlock *
+AArch64TargetLowering::EmitTileLoad(unsigned Opc, unsigned BaseReg,
+                                    MachineInstr &MI,
+                                    MachineBasicBlock *BB) const {
+  const TargetInstrInfo *TII = Subtarget->getInstrInfo();
+  MachineInstrBuilder MIB = BuildMI(*BB, MI, MI.getDebugLoc(), TII->get(Opc));
+
+  MIB.addReg(BaseReg + MI.getOperand(0).getImm(), RegState::Define);
+  MIB.add(MI.getOperand(1)); // slice index register
+  MIB.add(MI.getOperand(2)); // slice index offset
+  MIB.add(MI.getOperand(3)); // pg
+  MIB.add(MI.getOperand(4)); // base
+  MIB.add(MI.getOperand(5)); // offset
+
+  MI.eraseFromParent(); // The pseudo is gone now.
+  return BB;
+}
+
+MachineBasicBlock *
+AArch64TargetLowering::EmitFill(MachineInstr &MI, MachineBasicBlock *BB) const {
+  const TargetInstrInfo *TII = Subtarget->getInstrInfo();
+  MachineInstrBuilder MIB =
+      BuildMI(*BB, MI, MI.getDebugLoc(), TII->get(AArch64::LDR_ZA));
+
+  MIB.addReg(AArch64::ZA, RegState::Define);
+  MIB.add(MI.getOperand(0)); // Vector select register
+  MIB.add(MI.getOperand(1)); // Vector select offset
+  MIB.add(MI.getOperand(2)); // Base
+  MIB.add(MI.getOperand(1)); // Offset, same as vector select offset
+
+  MI.eraseFromParent(); // The pseudo is gone now.
+  return BB;
+}
+
+MachineBasicBlock *
+AArch64TargetLowering::EmitZAInstr(unsigned Opc, unsigned BaseReg,
+                                   MachineInstr &MI,
+                                   MachineBasicBlock *BB, bool HasTile) const {
+  const TargetInstrInfo *TII = Subtarget->getInstrInfo();
+  MachineInstrBuilder MIB = BuildMI(*BB, MI, MI.getDebugLoc(), TII->get(Opc));
+  unsigned StartIdx = 0;
+
+  if (HasTile) {
+    MIB.addReg(BaseReg + MI.getOperand(0).getImm(), RegState::Define);
+    MIB.addReg(BaseReg + MI.getOperand(0).getImm());
+    StartIdx = 1;
+  } else
+    MIB.addReg(BaseReg, RegState::Define).addReg(BaseReg);
+
+  for (unsigned I = StartIdx; I < MI.getNumOperands(); ++I)
+    MIB.add(MI.getOperand(I));
+
+  MI.eraseFromParent(); // The pseudo is gone now.
+  return BB;
+}
+
+MachineBasicBlock *
+AArch64TargetLowering::EmitZero(MachineInstr &MI, MachineBasicBlock *BB) const {
+  const TargetInstrInfo *TII = Subtarget->getInstrInfo();
+  MachineInstrBuilder MIB =
+      BuildMI(*BB, MI, MI.getDebugLoc(), TII->get(AArch64::ZERO_M));
+  MIB.add(MI.getOperand(0)); // Mask
+
+  unsigned Mask = MI.getOperand(0).getImm();
+  for (unsigned I = 0; I < 8; I++) {
+    if (Mask & (1 << I))
+      MIB.addDef(AArch64::ZAD0 + I, RegState::ImplicitDefine);
+  }
+
+  MI.eraseFromParent(); // The pseudo is gone now.
+  return BB;
+}
+
 MachineBasicBlock *AArch64TargetLowering::EmitInstrWithCustomInserter(
     MachineInstr &MI, MachineBasicBlock *BB) const {
+
+  int SMEOrigInstr = AArch64::getSMEPseudoMap(MI.getOpcode());
+  if (SMEOrigInstr != -1) {
+    const TargetInstrInfo *TII = Subtarget->getInstrInfo();
+    uint64_t SMEMatrixType =
+        TII->get(MI.getOpcode()).TSFlags & AArch64::SMEMatrixTypeMask;
+    switch (SMEMatrixType) {
+    case (AArch64::SMEMatrixArray):
+      return EmitZAInstr(SMEOrigInstr, AArch64::ZA, MI, BB, /*HasTile*/ false);
+    case (AArch64::SMEMatrixTileB):
+      return EmitZAInstr(SMEOrigInstr, AArch64::ZAB0, MI, BB, /*HasTile*/ true);
+    case (AArch64::SMEMatrixTileH):
+      return EmitZAInstr(SMEOrigInstr, AArch64::ZAH0, MI, BB, /*HasTile*/ true);
+    case (AArch64::SMEMatrixTileS):
+      return EmitZAInstr(SMEOrigInstr, AArch64::ZAS0, MI, BB, /*HasTile*/ true);
+    case (AArch64::SMEMatrixTileD):
+      return EmitZAInstr(SMEOrigInstr, AArch64::ZAD0, MI, BB, /*HasTile*/ true);
+    case (AArch64::SMEMatrixTileQ):
+      return EmitZAInstr(SMEOrigInstr, AArch64::ZAQ0, MI, BB, /*HasTile*/ true);
+    }
+  }
+
   switch (MI.getOpcode()) {
   default:
 #ifndef NDEBUG
@@ -2252,14 +2767,48 @@ MachineBasicBlock *AArch64TargetLowering::EmitInstrWithCustomInserter(
 
   case AArch64::F128CSEL:
     return EmitF128CSEL(MI, BB);
-
+  case TargetOpcode::STATEPOINT:
+    // STATEPOINT is a pseudo instruction which has no implicit defs/uses
+    // while bl call instruction (where statepoint will be lowered at the end)
+    // has implicit def. This def is early-clobber as it will be set at
+    // the moment of the call and earlier than any use is read.
+    // Add this implicit dead def here as a workaround.
+    MI.addOperand(*MI.getMF(),
+                  MachineOperand::CreateReg(
+                      AArch64::LR, /*isDef*/ true,
+                      /*isImp*/ true, /*isKill*/ false, /*isDead*/ true,
+                      /*isUndef*/ false, /*isEarlyClobber*/ true));
+    [[fallthrough]];
   case TargetOpcode::STACKMAP:
   case TargetOpcode::PATCHPOINT:
-  case TargetOpcode::STATEPOINT:
     return emitPatchPoint(MI, BB);
 
   case AArch64::CATCHRET:
     return EmitLoweredCatchRet(MI, BB);
+  case AArch64::LD1_MXIPXX_H_PSEUDO_B:
+    return EmitTileLoad(AArch64::LD1_MXIPXX_H_B, AArch64::ZAB0, MI, BB);
+  case AArch64::LD1_MXIPXX_H_PSEUDO_H:
+    return EmitTileLoad(AArch64::LD1_MXIPXX_H_H, AArch64::ZAH0, MI, BB);
+  case AArch64::LD1_MXIPXX_H_PSEUDO_S:
+    return EmitTileLoad(AArch64::LD1_MXIPXX_H_S, AArch64::ZAS0, MI, BB);
+  case AArch64::LD1_MXIPXX_H_PSEUDO_D:
+    return EmitTileLoad(AArch64::LD1_MXIPXX_H_D, AArch64::ZAD0, MI, BB);
+  case AArch64::LD1_MXIPXX_H_PSEUDO_Q:
+    return EmitTileLoad(AArch64::LD1_MXIPXX_H_Q, AArch64::ZAQ0, MI, BB);
+  case AArch64::LD1_MXIPXX_V_PSEUDO_B:
+    return EmitTileLoad(AArch64::LD1_MXIPXX_V_B, AArch64::ZAB0, MI, BB);
+  case AArch64::LD1_MXIPXX_V_PSEUDO_H:
+    return EmitTileLoad(AArch64::LD1_MXIPXX_V_H, AArch64::ZAH0, MI, BB);
+  case AArch64::LD1_MXIPXX_V_PSEUDO_S:
+    return EmitTileLoad(AArch64::LD1_MXIPXX_V_S, AArch64::ZAS0, MI, BB);
+  case AArch64::LD1_MXIPXX_V_PSEUDO_D:
+    return EmitTileLoad(AArch64::LD1_MXIPXX_V_D, AArch64::ZAD0, MI, BB);
+  case AArch64::LD1_MXIPXX_V_PSEUDO_Q:
+    return EmitTileLoad(AArch64::LD1_MXIPXX_V_Q, AArch64::ZAQ0, MI, BB);
+  case AArch64::LDR_ZA_PSEUDO:
+    return EmitFill(MI, BB);
+  case AArch64::ZERO_M_PSEUDO:
+    return EmitZero(MI, BB);
   }
 }
 
@@ -2277,6 +2826,8 @@ static SDValue convertToScalableVector(SelectionDAG &DAG, EVT VT, SDValue V);
 static SDValue convertFromScalableVector(SelectionDAG &DAG, EVT VT, SDValue V);
 static SDValue convertFixedMaskToScalableVector(SDValue Mask,
                                                 SelectionDAG &DAG);
+static SDValue getPredicateForScalableVector(SelectionDAG &DAG, SDLoc &DL,
+                                             EVT VT);
 
 /// isZerosVector - Check whether SDNode N is a zero-filled vector.
 static bool isZerosVector(const SDNode *N) {
@@ -2291,9 +2842,7 @@ static bool isZerosVector(const SDNode *N) {
     return false;
 
   auto Opnd0 = N->getOperand(0);
-  auto *CINT = dyn_cast<ConstantSDNode>(Opnd0);
-  auto *CFP = dyn_cast<ConstantFPSDNode>(Opnd0);
-  return (CINT && CINT->isNullValue()) || (CFP && CFP->isZero());
+  return isNullConstant(Opnd0) || isNullFPConstant(Opnd0);
 }
 
 /// changeIntCCToAArch64CC - Convert a DAG integer condition code to an AArch64
@@ -2431,7 +2980,7 @@ static void changeVectorFPCCToAArch64CC(ISD::CondCode CC,
     break;
   case ISD::SETUO:
     Invert = true;
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case ISD::SETO:
     CondCode = AArch64CC::MI;
     CondCode2 = AArch64CC::GE;
@@ -2478,7 +3027,17 @@ static SDValue emitStrictFPComparison(SDValue LHS, SDValue RHS, const SDLoc &dl,
                                       bool IsSignaling) {
   EVT VT = LHS.getValueType();
   assert(VT != MVT::f128);
-  assert(VT != MVT::f16 && "Lowering of strict fp16 not yet implemented");
+
+  const bool FullFP16 = DAG.getSubtarget<AArch64Subtarget>().hasFullFP16();
+
+  if (VT == MVT::f16 && !FullFP16) {
+    LHS = DAG.getNode(ISD::STRICT_FP_EXTEND, dl, {MVT::f32, MVT::Other},
+                      {Chain, LHS});
+    RHS = DAG.getNode(ISD::STRICT_FP_EXTEND, dl, {MVT::f32, MVT::Other},
+                      {LHS.getValue(1), RHS});
+    Chain = RHS.getValue(1);
+    VT = MVT::f32;
+  }
   unsigned Opcode =
       IsSignaling ? AArch64ISD::STRICT_FCMPE : AArch64ISD::STRICT_FCMP;
   return DAG.getNode(Opcode, dl, {VT, MVT::Other}, {Chain, LHS, RHS});
@@ -2487,8 +3046,7 @@ static SDValue emitStrictFPComparison(SDValue LHS, SDValue RHS, const SDLoc &dl,
 static SDValue emitComparison(SDValue LHS, SDValue RHS, ISD::CondCode CC,
                               const SDLoc &dl, SelectionDAG &DAG) {
   EVT VT = LHS.getValueType();
-  const bool FullFP16 =
-    static_cast<const AArch64Subtarget &>(DAG.getSubtarget()).hasFullFP16();
+  const bool FullFP16 = DAG.getSubtarget<AArch64Subtarget>().hasFullFP16();
 
   if (VT.isFloatingPoint()) {
     assert(VT != MVT::f128);
@@ -2596,8 +3154,7 @@ static SDValue emitConditionalComparison(SDValue LHS, SDValue RHS,
                                          AArch64CC::CondCode OutCC,
                                          const SDLoc &DL, SelectionDAG &DAG) {
   unsigned Opcode = 0;
-  const bool FullFP16 =
-    static_cast<const AArch64Subtarget &>(DAG.getSubtarget()).hasFullFP16();
+  const bool FullFP16 = DAG.getSubtarget<AArch64Subtarget>().hasFullFP16();
 
   if (LHS.getValueType().isFloatingPoint()) {
     assert(LHS.getValueType() != MVT::f128);
@@ -2975,9 +3532,9 @@ static SDValue getAArch64Cmp(SDValue LHS, SDValue RHS, ISD::CondCode CC,
       }
     }
 
-    if (!Cmp && (RHSC->isNullValue() || RHSC->isOne())) {
+    if (!Cmp && (RHSC->isZero() || RHSC->isOne())) {
       if ((Cmp = emitConjunction(DAG, LHS, AArch64CC))) {
-        if ((CC == ISD::SETNE) ^ RHSC->isNullValue())
+        if ((CC == ISD::SETNE) ^ RHSC->isZero())
           AArch64CC = AArch64CC::getInvertedCondCode(AArch64CC);
       }
     }
@@ -3082,7 +3639,8 @@ getAArch64XALUOOp(AArch64CC::CondCode &CC, SDValue Op, SelectionDAG &DAG) {
 }
 
 SDValue AArch64TargetLowering::LowerXOR(SDValue Op, SelectionDAG &DAG) const {
-  if (useSVEForFixedLengthVectorVT(Op.getValueType()))
+  if (useSVEForFixedLengthVectorVT(Op.getValueType(),
+                                   Subtarget->forceStreamingCompatibleSVE()))
     return LowerToScalableOp(Op, DAG);
 
   SDValue Sel = Op.getOperand(0);
@@ -3142,14 +3700,14 @@ SDValue AArch64TargetLowering::LowerXOR(SDValue Op, SelectionDAG &DAG) const {
 
   // We can commute the SELECT_CC by inverting the condition.  This
   // might be needed to make this fit into a CSINV pattern.
-  if (CTVal->isAllOnesValue() && CFVal->isNullValue()) {
+  if (CTVal->isAllOnes() && CFVal->isZero()) {
     std::swap(TVal, FVal);
     std::swap(CTVal, CFVal);
     CC = ISD::getSetCCInverse(CC, LHS.getValueType());
   }
 
   // If the constants line up, perform the transform!
-  if (CTVal->isNullValue() && CFVal->isAllOnesValue()) {
+  if (CTVal->isZero() && CFVal->isAllOnes()) {
     SDValue CCVal;
     SDValue Cmp = getAArch64Cmp(LHS, RHS, CC, CCVal, DAG, dl);
 
@@ -3164,40 +3722,68 @@ SDValue AArch64TargetLowering::LowerXOR(SDValue Op, SelectionDAG &DAG) const {
   return Op;
 }
 
-static SDValue LowerADDC_ADDE_SUBC_SUBE(SDValue Op, SelectionDAG &DAG) {
-  EVT VT = Op.getValueType();
+// If Invert is false, sets 'C' bit of NZCV to 0 if value is 0, else sets 'C'
+// bit to 1. If Invert is true, sets 'C' bit of NZCV to 1 if value is 0, else
+// sets 'C' bit to 0.
+static SDValue valueToCarryFlag(SDValue Value, SelectionDAG &DAG, bool Invert) {
+  SDLoc DL(Value);
+  EVT VT = Value.getValueType();
+  SDValue Op0 = Invert ? DAG.getConstant(0, DL, VT) : Value;
+  SDValue Op1 = Invert ? Value : DAG.getConstant(1, DL, VT);
+  SDValue Cmp =
+      DAG.getNode(AArch64ISD::SUBS, DL, DAG.getVTList(VT, MVT::Glue), Op0, Op1);
+  return Cmp.getValue(1);
+}
 
-  // Let legalize expand this if it isn't a legal type yet.
-  if (!DAG.getTargetLoweringInfo().isTypeLegal(VT))
+// If Invert is false, value is 1 if 'C' bit of NZCV is 1, else 0.
+// If Invert is true, value is 0 if 'C' bit of NZCV is 1, else 1.
+static SDValue carryFlagToValue(SDValue Flag, EVT VT, SelectionDAG &DAG,
+                                bool Invert) {
+  assert(Flag.getResNo() == 1);
+  SDLoc DL(Flag);
+  SDValue Zero = DAG.getConstant(0, DL, VT);
+  SDValue One = DAG.getConstant(1, DL, VT);
+  unsigned Cond = Invert ? AArch64CC::LO : AArch64CC::HS;
+  SDValue CC = DAG.getConstant(Cond, DL, MVT::i32);
+  return DAG.getNode(AArch64ISD::CSEL, DL, VT, One, Zero, CC, Flag);
+}
+
+// Value is 1 if 'V' bit of NZCV is 1, else 0
+static SDValue overflowFlagToValue(SDValue Flag, EVT VT, SelectionDAG &DAG) {
+  assert(Flag.getResNo() == 1);
+  SDLoc DL(Flag);
+  SDValue Zero = DAG.getConstant(0, DL, VT);
+  SDValue One = DAG.getConstant(1, DL, VT);
+  SDValue CC = DAG.getConstant(AArch64CC::VS, DL, MVT::i32);
+  return DAG.getNode(AArch64ISD::CSEL, DL, VT, One, Zero, CC, Flag);
+}
+
+// This lowering is inefficient, but it will get cleaned up by
+// `foldOverflowCheck`
+static SDValue lowerADDSUBCARRY(SDValue Op, SelectionDAG &DAG, unsigned Opcode,
+                                bool IsSigned) {
+  EVT VT0 = Op.getValue(0).getValueType();
+  EVT VT1 = Op.getValue(1).getValueType();
+
+  if (VT0 != MVT::i32 && VT0 != MVT::i64)
     return SDValue();
 
-  SDVTList VTs = DAG.getVTList(VT, MVT::i32);
+  bool InvertCarry = Opcode == AArch64ISD::SBCS;
+  SDValue OpLHS = Op.getOperand(0);
+  SDValue OpRHS = Op.getOperand(1);
+  SDValue OpCarryIn = valueToCarryFlag(Op.getOperand(2), DAG, InvertCarry);
 
-  unsigned Opc;
-  bool ExtraOp = false;
-  switch (Op.getOpcode()) {
-  default:
-    llvm_unreachable("Invalid code");
-  case ISD::ADDC:
-    Opc = AArch64ISD::ADDS;
-    break;
-  case ISD::SUBC:
-    Opc = AArch64ISD::SUBS;
-    break;
-  case ISD::ADDE:
-    Opc = AArch64ISD::ADCS;
-    ExtraOp = true;
-    break;
-  case ISD::SUBE:
-    Opc = AArch64ISD::SBCS;
-    ExtraOp = true;
-    break;
-  }
+  SDLoc DL(Op);
+  SDVTList VTs = DAG.getVTList(VT0, VT1);
+
+  SDValue Sum = DAG.getNode(Opcode, DL, DAG.getVTList(VT0, MVT::Glue), OpLHS,
+                            OpRHS, OpCarryIn);
+
+  SDValue OutFlag =
+      IsSigned ? overflowFlagToValue(Sum.getValue(1), VT1, DAG)
+               : carryFlagToValue(Sum.getValue(1), VT1, DAG, InvertCarry);
 
-  if (!ExtraOp)
-    return DAG.getNode(Opc, SDLoc(Op), VTs, Op.getOperand(0), Op.getOperand(1));
-  return DAG.getNode(Opc, SDLoc(Op), VTs, Op.getOperand(0), Op.getOperand(1),
-                     Op.getOperand(2));
+  return DAG.getNode(ISD::MERGE_VALUES, DL, VTs, Sum, OutFlag);
 }
 
 static SDValue LowerXALUO(SDValue Op, SelectionDAG &DAG) {
@@ -3254,7 +3840,8 @@ static SDValue LowerPREFETCH(SDValue Op, SelectionDAG &DAG) {
                    (Locality << 1) |    // Cache level bits
                    (unsigned)IsStream;  // Stream bit
   return DAG.getNode(AArch64ISD::PREFETCH, DL, MVT::Other, Op.getOperand(0),
-                     DAG.getConstant(PrfOp, DL, MVT::i32), Op.getOperand(1));
+                     DAG.getTargetConstant(PrfOp, DL, MVT::i32),
+                     Op.getOperand(1));
 }
 
 SDValue AArch64TargetLowering::LowerFP_EXTEND(SDValue Op,
@@ -3279,7 +3866,8 @@ SDValue AArch64TargetLowering::LowerFP_ROUND(SDValue Op,
   SDValue SrcVal = Op.getOperand(IsStrict ? 1 : 0);
   EVT SrcVT = SrcVal.getValueType();
 
-  if (useSVEForFixedLengthVectorVT(SrcVT))
+  if (useSVEForFixedLengthVectorVT(SrcVT,
+                                   Subtarget->forceStreamingCompatibleSVE()))
     return LowerFixedLengthFPRoundToSVE(Op, DAG);
 
   if (SrcVT != MVT::f128) {
@@ -3299,7 +3887,8 @@ SDValue AArch64TargetLowering::LowerVectorFP_TO_INT(SDValue Op,
   // Warning: We maintain cost tables in AArch64TargetTransformInfo.cpp.
   // Any additional optimization in this function should be recorded
   // in the cost tables.
-  EVT InVT = Op.getOperand(0).getValueType();
+  bool IsStrict = Op->isStrictFPOpcode();
+  EVT InVT = Op.getOperand(IsStrict ? 1 : 0).getValueType();
   EVT VT = Op.getValueType();
 
   if (VT.isScalableVector()) {
@@ -3309,7 +3898,10 @@ SDValue AArch64TargetLowering::LowerVectorFP_TO_INT(SDValue Op,
     return LowerToPredicatedOp(Op, DAG, Opcode);
   }
 
-  if (useSVEForFixedLengthVectorVT(VT) || useSVEForFixedLengthVectorVT(InVT))
+  if (useSVEForFixedLengthVectorVT(VT,
+                                   Subtarget->forceStreamingCompatibleSVE()) ||
+      useSVEForFixedLengthVectorVT(InVT,
+                                   Subtarget->forceStreamingCompatibleSVE()))
     return LowerFixedLengthFPToIntToSVE(Op, DAG);
 
   unsigned NumElts = InVT.getVectorNumElements();
@@ -3319,6 +3911,12 @@ SDValue AArch64TargetLowering::LowerVectorFP_TO_INT(SDValue Op,
       !Subtarget->hasFullFP16()) {
     MVT NewVT = MVT::getVectorVT(MVT::f32, NumElts);
     SDLoc dl(Op);
+    if (IsStrict) {
+      SDValue Ext = DAG.getNode(ISD::STRICT_FP_EXTEND, dl, {NewVT, MVT::Other},
+                                {Op.getOperand(0), Op.getOperand(1)});
+      return DAG.getNode(Op.getOpcode(), dl, {VT, MVT::Other},
+                         {Ext.getValue(1), Ext.getValue(0)});
+    }
     return DAG.getNode(
         Op.getOpcode(), dl, Op.getValueType(),
         DAG.getNode(ISD::FP_EXTEND, dl, NewVT, Op.getOperand(0)));
@@ -3328,6 +3926,13 @@ SDValue AArch64TargetLowering::LowerVectorFP_TO_INT(SDValue Op,
   uint64_t InVTSize = InVT.getFixedSizeInBits();
   if (VTSize < InVTSize) {
     SDLoc dl(Op);
+    if (IsStrict) {
+      InVT = InVT.changeVectorElementTypeToInteger();
+      SDValue Cv = DAG.getNode(Op.getOpcode(), dl, {InVT, MVT::Other},
+                               {Op.getOperand(0), Op.getOperand(1)});
+      SDValue Trunc = DAG.getNode(ISD::TRUNCATE, dl, VT, Cv);
+      return DAG.getMergeValues({Trunc, Cv.getValue(1)}, dl);
+    }
     SDValue Cv =
         DAG.getNode(Op.getOpcode(), dl, InVT.changeVectorElementTypeToInteger(),
                     Op.getOperand(0));
@@ -3339,10 +3944,30 @@ SDValue AArch64TargetLowering::LowerVectorFP_TO_INT(SDValue Op,
     MVT ExtVT =
         MVT::getVectorVT(MVT::getFloatingPointVT(VT.getScalarSizeInBits()),
                          VT.getVectorNumElements());
+    if (IsStrict) {
+      SDValue Ext = DAG.getNode(ISD::STRICT_FP_EXTEND, dl, {ExtVT, MVT::Other},
+                                {Op.getOperand(0), Op.getOperand(1)});
+      return DAG.getNode(Op.getOpcode(), dl, {VT, MVT::Other},
+                         {Ext.getValue(1), Ext.getValue(0)});
+    }
     SDValue Ext = DAG.getNode(ISD::FP_EXTEND, dl, ExtVT, Op.getOperand(0));
     return DAG.getNode(Op.getOpcode(), dl, VT, Ext);
   }
 
+  // Use a scalar operation for conversions between single-element vectors of
+  // the same size.
+  if (NumElts == 1) {
+    SDLoc dl(Op);
+    SDValue Extract = DAG.getNode(
+        ISD::EXTRACT_VECTOR_ELT, dl, InVT.getScalarType(),
+        Op.getOperand(IsStrict ? 1 : 0), DAG.getConstant(0, dl, MVT::i64));
+    EVT ScalarVT = VT.getScalarType();
+    if (IsStrict)
+      return DAG.getNode(Op.getOpcode(), dl, {ScalarVT, MVT::Other},
+                         {Op.getOperand(0), Extract});
+    return DAG.getNode(Op.getOpcode(), dl, ScalarVT, Extract);
+  }
+
   // Type changing conversions are illegal.
   return Op;
 }
@@ -3357,8 +3982,14 @@ SDValue AArch64TargetLowering::LowerFP_TO_INT(SDValue Op,
 
   // f16 conversions are promoted to f32 when full fp16 is not supported.
   if (SrcVal.getValueType() == MVT::f16 && !Subtarget->hasFullFP16()) {
-    assert(!IsStrict && "Lowering of strict fp16 not yet implemented");
     SDLoc dl(Op);
+    if (IsStrict) {
+      SDValue Ext =
+          DAG.getNode(ISD::STRICT_FP_EXTEND, dl, {MVT::f32, MVT::Other},
+                      {Op.getOperand(0), SrcVal});
+      return DAG.getNode(Op.getOpcode(), dl, {Op.getValueType(), MVT::Other},
+                         {Ext.getValue(1), Ext.getValue(0)});
+    }
     return DAG.getNode(
         Op.getOpcode(), dl, Op.getValueType(),
         DAG.getNode(ISD::FP_EXTEND, dl, MVT::f32, SrcVal));
@@ -3372,52 +4003,140 @@ SDValue AArch64TargetLowering::LowerFP_TO_INT(SDValue Op,
   return SDValue();
 }
 
-SDValue AArch64TargetLowering::LowerFP_TO_INT_SAT(SDValue Op,
-                                                  SelectionDAG &DAG) const {
-  // AArch64 FP-to-int conversions saturate to the destination register size, so
+SDValue
+AArch64TargetLowering::LowerVectorFP_TO_INT_SAT(SDValue Op,
+                                                SelectionDAG &DAG) const {
+  // AArch64 FP-to-int conversions saturate to the destination element size, so
   // we can lower common saturating conversions to simple instructions.
   SDValue SrcVal = Op.getOperand(0);
-
   EVT SrcVT = SrcVal.getValueType();
   EVT DstVT = Op.getValueType();
-
   EVT SatVT = cast<VTSDNode>(Op.getOperand(1))->getVT();
+
+  uint64_t SrcElementWidth = SrcVT.getScalarSizeInBits();
+  uint64_t DstElementWidth = DstVT.getScalarSizeInBits();
   uint64_t SatWidth = SatVT.getScalarSizeInBits();
-  uint64_t DstWidth = DstVT.getScalarSizeInBits();
-  assert(SatWidth <= DstWidth && "Saturation width cannot exceed result width");
+  assert(SatWidth <= DstElementWidth &&
+         "Saturation width cannot exceed result width");
 
-  // TODO: Support lowering of NEON and SVE conversions.
-  if (SrcVT.isVector())
+  // TODO: Consider lowering to SVE operations, as in LowerVectorFP_TO_INT.
+  // Currently, the `llvm.fpto[su]i.sat.*` intrinsics don't accept scalable
+  // types, so this is hard to reach.
+  if (DstVT.isScalableVector())
     return SDValue();
 
-  // TODO: Saturate to SatWidth explicitly.
-  if (SatWidth != DstWidth)
+  EVT SrcElementVT = SrcVT.getVectorElementType();
+
+  // In the absence of FP16 support, promote f16 to f32 and saturate the result.
+  if (SrcElementVT == MVT::f16 &&
+      (!Subtarget->hasFullFP16() || DstElementWidth > 16)) {
+    MVT F32VT = MVT::getVectorVT(MVT::f32, SrcVT.getVectorNumElements());
+    SrcVal = DAG.getNode(ISD::FP_EXTEND, SDLoc(Op), F32VT, SrcVal);
+    SrcVT = F32VT;
+    SrcElementVT = MVT::f32;
+    SrcElementWidth = 32;
+  } else if (SrcElementVT != MVT::f64 && SrcElementVT != MVT::f32 &&
+             SrcElementVT != MVT::f16)
     return SDValue();
 
-  // In the absence of FP16 support, promote f32 to f16, like LowerFP_TO_INT().
-  if (SrcVT == MVT::f16 && !Subtarget->hasFullFP16())
-    return DAG.getNode(Op.getOpcode(), SDLoc(Op), Op.getValueType(),
-                       DAG.getNode(ISD::FP_EXTEND, SDLoc(Op), MVT::f32, SrcVal),
-                       Op.getOperand(1));
-
+  SDLoc DL(Op);
   // Cases that we can emit directly.
-  if ((SrcVT == MVT::f64 || SrcVT == MVT::f32 ||
-       (SrcVT == MVT::f16 && Subtarget->hasFullFP16())) &&
-      (DstVT == MVT::i64 || DstVT == MVT::i32))
-    return Op;
+  if (SrcElementWidth == DstElementWidth && SrcElementWidth == SatWidth)
+    return DAG.getNode(Op.getOpcode(), DL, DstVT, SrcVal,
+                       DAG.getValueType(DstVT.getScalarType()));
+
+  // Otherwise we emit a cvt that saturates to a higher BW, and saturate the
+  // result. This is only valid if the legal cvt is larger than the saturate
+  // width. For double, as we don't have MIN/MAX, it can be simpler to scalarize
+  // (at least until sqxtn is selected).
+  if (SrcElementWidth < SatWidth || SrcElementVT == MVT::f64)
+    return SDValue();
 
-  // For all other cases, fall back on the expanded form.
-  return SDValue();
+  EVT IntVT = SrcVT.changeVectorElementTypeToInteger();
+  SDValue NativeCvt = DAG.getNode(Op.getOpcode(), DL, IntVT, SrcVal,
+                                  DAG.getValueType(IntVT.getScalarType()));
+  SDValue Sat;
+  if (Op.getOpcode() == ISD::FP_TO_SINT_SAT) {
+    SDValue MinC = DAG.getConstant(
+        APInt::getSignedMaxValue(SatWidth).sext(SrcElementWidth), DL, IntVT);
+    SDValue Min = DAG.getNode(ISD::SMIN, DL, IntVT, NativeCvt, MinC);
+    SDValue MaxC = DAG.getConstant(
+        APInt::getSignedMinValue(SatWidth).sext(SrcElementWidth), DL, IntVT);
+    Sat = DAG.getNode(ISD::SMAX, DL, IntVT, Min, MaxC);
+  } else {
+    SDValue MinC = DAG.getConstant(
+        APInt::getAllOnesValue(SatWidth).zext(SrcElementWidth), DL, IntVT);
+    Sat = DAG.getNode(ISD::UMIN, DL, IntVT, NativeCvt, MinC);
+  }
+
+  return DAG.getNode(ISD::TRUNCATE, DL, DstVT, Sat);
 }
 
-SDValue AArch64TargetLowering::LowerVectorINT_TO_FP(SDValue Op,
-                                                    SelectionDAG &DAG) const {
-  // Warning: We maintain cost tables in AArch64TargetTransformInfo.cpp.
-  // Any additional optimization in this function should be recorded
+SDValue AArch64TargetLowering::LowerFP_TO_INT_SAT(SDValue Op,
+                                                  SelectionDAG &DAG) const {
+  // AArch64 FP-to-int conversions saturate to the destination register size, so
+  // we can lower common saturating conversions to simple instructions.
+  SDValue SrcVal = Op.getOperand(0);
+  EVT SrcVT = SrcVal.getValueType();
+
+  if (SrcVT.isVector())
+    return LowerVectorFP_TO_INT_SAT(Op, DAG);
+
+  EVT DstVT = Op.getValueType();
+  EVT SatVT = cast<VTSDNode>(Op.getOperand(1))->getVT();
+  uint64_t SatWidth = SatVT.getScalarSizeInBits();
+  uint64_t DstWidth = DstVT.getScalarSizeInBits();
+  assert(SatWidth <= DstWidth && "Saturation width cannot exceed result width");
+
+  // In the absence of FP16 support, promote f16 to f32 and saturate the result.
+  if (SrcVT == MVT::f16 && !Subtarget->hasFullFP16()) {
+    SrcVal = DAG.getNode(ISD::FP_EXTEND, SDLoc(Op), MVT::f32, SrcVal);
+    SrcVT = MVT::f32;
+  } else if (SrcVT != MVT::f64 && SrcVT != MVT::f32 && SrcVT != MVT::f16)
+    return SDValue();
+
+  SDLoc DL(Op);
+  // Cases that we can emit directly.
+  if ((SrcVT == MVT::f64 || SrcVT == MVT::f32 ||
+       (SrcVT == MVT::f16 && Subtarget->hasFullFP16())) &&
+      DstVT == SatVT && (DstVT == MVT::i64 || DstVT == MVT::i32))
+    return DAG.getNode(Op.getOpcode(), DL, DstVT, SrcVal,
+                       DAG.getValueType(DstVT));
+
+  // Otherwise we emit a cvt that saturates to a higher BW, and saturate the
+  // result. This is only valid if the legal cvt is larger than the saturate
+  // width.
+  if (DstWidth < SatWidth)
+    return SDValue();
+
+  SDValue NativeCvt =
+      DAG.getNode(Op.getOpcode(), DL, DstVT, SrcVal, DAG.getValueType(DstVT));
+  SDValue Sat;
+  if (Op.getOpcode() == ISD::FP_TO_SINT_SAT) {
+    SDValue MinC = DAG.getConstant(
+        APInt::getSignedMaxValue(SatWidth).sext(DstWidth), DL, DstVT);
+    SDValue Min = DAG.getNode(ISD::SMIN, DL, DstVT, NativeCvt, MinC);
+    SDValue MaxC = DAG.getConstant(
+        APInt::getSignedMinValue(SatWidth).sext(DstWidth), DL, DstVT);
+    Sat = DAG.getNode(ISD::SMAX, DL, DstVT, Min, MaxC);
+  } else {
+    SDValue MinC = DAG.getConstant(
+        APInt::getAllOnesValue(SatWidth).zext(DstWidth), DL, DstVT);
+    Sat = DAG.getNode(ISD::UMIN, DL, DstVT, NativeCvt, MinC);
+  }
+
+  return DAG.getNode(ISD::TRUNCATE, DL, DstVT, Sat);
+}
+
+SDValue AArch64TargetLowering::LowerVectorINT_TO_FP(SDValue Op,
+                                                    SelectionDAG &DAG) const {
+  // Warning: We maintain cost tables in AArch64TargetTransformInfo.cpp.
+  // Any additional optimization in this function should be recorded
   // in the cost tables.
+  bool IsStrict = Op->isStrictFPOpcode();
   EVT VT = Op.getValueType();
   SDLoc dl(Op);
-  SDValue In = Op.getOperand(0);
+  SDValue In = Op.getOperand(IsStrict ? 1 : 0);
   EVT InVT = In.getValueType();
   unsigned Opc = Op.getOpcode();
   bool IsSigned = Opc == ISD::SINT_TO_FP || Opc == ISD::STRICT_SINT_TO_FP;
@@ -3436,7 +4155,10 @@ SDValue AArch64TargetLowering::LowerVectorINT_TO_FP(SDValue Op,
     return LowerToPredicatedOp(Op, DAG, Opcode);
   }
 
-  if (useSVEForFixedLengthVectorVT(VT) || useSVEForFixedLengthVectorVT(InVT))
+  if (useSVEForFixedLengthVectorVT(VT,
+                                   Subtarget->forceStreamingCompatibleSVE()) ||
+      useSVEForFixedLengthVectorVT(InVT,
+                                   Subtarget->forceStreamingCompatibleSVE()))
     return LowerFixedLengthIntToFPToSVE(Op, DAG);
 
   uint64_t VTSize = VT.getFixedSizeInBits();
@@ -3445,17 +4167,40 @@ SDValue AArch64TargetLowering::LowerVectorINT_TO_FP(SDValue Op,
     MVT CastVT =
         MVT::getVectorVT(MVT::getFloatingPointVT(InVT.getScalarSizeInBits()),
                          InVT.getVectorNumElements());
+    if (IsStrict) {
+      In = DAG.getNode(Opc, dl, {CastVT, MVT::Other},
+                       {Op.getOperand(0), In});
+      return DAG.getNode(
+          ISD::STRICT_FP_ROUND, dl, {VT, MVT::Other},
+          {In.getValue(1), In.getValue(0), DAG.getIntPtrConstant(0, dl)});
+    }
     In = DAG.getNode(Opc, dl, CastVT, In);
-    return DAG.getNode(ISD::FP_ROUND, dl, VT, In, DAG.getIntPtrConstant(0, dl));
+    return DAG.getNode(ISD::FP_ROUND, dl, VT, In,
+                       DAG.getIntPtrConstant(0, dl, /*isTarget=*/true));
   }
 
   if (VTSize > InVTSize) {
     unsigned CastOpc = IsSigned ? ISD::SIGN_EXTEND : ISD::ZERO_EXTEND;
     EVT CastVT = VT.changeVectorElementTypeToInteger();
     In = DAG.getNode(CastOpc, dl, CastVT, In);
+    if (IsStrict)
+      return DAG.getNode(Opc, dl, {VT, MVT::Other}, {Op.getOperand(0), In});
     return DAG.getNode(Opc, dl, VT, In);
   }
 
+  // Use a scalar operation for conversions between single-element vectors of
+  // the same size.
+  if (VT.getVectorNumElements() == 1) {
+    SDValue Extract = DAG.getNode(
+        ISD::EXTRACT_VECTOR_ELT, dl, InVT.getScalarType(),
+        In, DAG.getConstant(0, dl, MVT::i64));
+    EVT ScalarVT = VT.getScalarType();
+    if (IsStrict)
+      return DAG.getNode(Op.getOpcode(), dl, {ScalarVT, MVT::Other},
+                         {Op.getOperand(0), Extract});
+    return DAG.getNode(Op.getOpcode(), dl, ScalarVT, Extract);
+  }
+
   return Op;
 }
 
@@ -3468,10 +4213,15 @@ SDValue AArch64TargetLowering::LowerINT_TO_FP(SDValue Op,
   SDValue SrcVal = Op.getOperand(IsStrict ? 1 : 0);
 
   // f16 conversions are promoted to f32 when full fp16 is not supported.
-  if (Op.getValueType() == MVT::f16 &&
-      !Subtarget->hasFullFP16()) {
-    assert(!IsStrict && "Lowering of strict fp16 not yet implemented");
+  if (Op.getValueType() == MVT::f16 && !Subtarget->hasFullFP16()) {
     SDLoc dl(Op);
+    if (IsStrict) {
+      SDValue Val = DAG.getNode(Op.getOpcode(), dl, {MVT::f32, MVT::Other},
+                                {Op.getOperand(0), SrcVal});
+      return DAG.getNode(
+          ISD::STRICT_FP_ROUND, dl, {MVT::f16, MVT::Other},
+          {Val.getValue(1), Val.getValue(0), DAG.getIntPtrConstant(0, dl)});
+    }
     return DAG.getNode(
         ISD::FP_ROUND, dl, MVT::f16,
         DAG.getNode(Op.getOpcode(), dl, MVT::f32, SrcVal),
@@ -3534,6 +4284,14 @@ SDValue AArch64TargetLowering::LowerBITCAST(SDValue Op,
     return LowerFixedLengthBitcastToSVE(Op, DAG);
 
   if (OpVT.isScalableVector()) {
+    // Bitcasting between unpacked vector types of different element counts is
+    // not a NOP because the live elements are laid out differently.
+    //                01234567
+    // e.g. nxv2i32 = XX??XX??
+    //      nxv4f16 = X?X?X?X?
+    if (OpVT.getVectorElementCount() != ArgVT.getVectorElementCount())
+      return SDValue();
+
     if (isTypeLegal(OpVT) && !isTypeLegal(ArgVT)) {
       assert(OpVT.isFloatingPoint() && !ArgVT.isFloatingPoint() &&
              "Expected int->fp bitcast!");
@@ -3548,6 +4306,10 @@ SDValue AArch64TargetLowering::LowerBITCAST(SDValue Op,
   if (OpVT != MVT::f16 && OpVT != MVT::bf16)
     return SDValue();
 
+  // Bitcasts between f16 and bf16 are legal.
+  if (ArgVT == MVT::f16 || ArgVT == MVT::bf16)
+    return Op;
+
   assert(ArgVT == MVT::i16);
   SDLoc DL(Op);
 
@@ -3593,6 +4355,22 @@ static SDValue addRequiredExtensionForVectorMULL(SDValue N, SelectionDAG &DAG,
   return DAG.getNode(ExtOpcode, SDLoc(N), NewVT, N);
 }
 
+// Returns lane if Op extracts from a two-element vector and lane is constant
+// (i.e., extractelt(<2 x Ty> %v, ConstantLane)), and std::nullopt otherwise.
+static std::optional<uint64_t>
+getConstantLaneNumOfExtractHalfOperand(SDValue &Op) {
+  SDNode *OpNode = Op.getNode();
+  if (OpNode->getOpcode() != ISD::EXTRACT_VECTOR_ELT)
+    return std::nullopt;
+
+  EVT VT = OpNode->getOperand(0).getValueType();
+  ConstantSDNode *C = dyn_cast<ConstantSDNode>(OpNode->getOperand(1));
+  if (!VT.isFixedLengthVector() || VT.getVectorNumElements() != 2 || !C)
+    return std::nullopt;
+
+  return C->getZExtValue();
+}
+
 static bool isExtendedBUILD_VECTOR(SDNode *N, SelectionDAG &DAG,
                                    bool isSigned) {
   EVT VT = N->getValueType(0);
@@ -3678,8 +4456,8 @@ static bool isAddSubZExt(SDNode *N, SelectionDAG &DAG) {
   return false;
 }
 
-SDValue AArch64TargetLowering::LowerFLT_ROUNDS_(SDValue Op,
-                                                SelectionDAG &DAG) const {
+SDValue AArch64TargetLowering::LowerGET_ROUNDING(SDValue Op,
+                                                 SelectionDAG &DAG) const {
   // The rounding mode is in bits 23:22 of the FPSCR.
   // The ARM rounding mode value to FLT_ROUNDS mapping is 0->1, 1->2, 2->3, 3->0
   // The formula we use to implement this is (((FPSCR + 1 << 22) >> 22) & 3)
@@ -3745,14 +4523,101 @@ SDValue AArch64TargetLowering::LowerSET_ROUNDING(SDValue Op,
   return DAG.getNode(ISD::INTRINSIC_VOID, DL, MVT::Other, Ops2);
 }
 
+static unsigned selectUmullSmull(SDNode *&N0, SDNode *&N1, SelectionDAG &DAG,
+                                 SDLoc DL, bool &IsMLA) {
+  bool IsN0SExt = isSignExtended(N0, DAG);
+  bool IsN1SExt = isSignExtended(N1, DAG);
+  if (IsN0SExt && IsN1SExt)
+    return AArch64ISD::SMULL;
+
+  bool IsN0ZExt = isZeroExtended(N0, DAG);
+  bool IsN1ZExt = isZeroExtended(N1, DAG);
+
+  if (IsN0ZExt && IsN1ZExt)
+    return AArch64ISD::UMULL;
+
+  // Select SMULL if we can replace zext with sext.
+  if (((IsN0SExt && IsN1ZExt) || (IsN0ZExt && IsN1SExt)) &&
+      !isExtendedBUILD_VECTOR(N0, DAG, false) &&
+      !isExtendedBUILD_VECTOR(N1, DAG, false)) {
+    SDValue ZextOperand;
+    if (IsN0ZExt)
+      ZextOperand = N0->getOperand(0);
+    else
+      ZextOperand = N1->getOperand(0);
+    if (DAG.SignBitIsZero(ZextOperand)) {
+      SDNode *NewSext =
+          DAG.getSExtOrTrunc(ZextOperand, DL, N0->getValueType(0)).getNode();
+      if (IsN0ZExt)
+        N0 = NewSext;
+      else
+        N1 = NewSext;
+      return AArch64ISD::SMULL;
+    }
+  }
+
+  // Select UMULL if we can replace the other operand with an extend.
+  if (IsN0ZExt || IsN1ZExt) {
+    EVT VT = N0->getValueType(0);
+    APInt Mask = APInt::getHighBitsSet(VT.getScalarSizeInBits(),
+                                       VT.getScalarSizeInBits() / 2);
+    if (DAG.MaskedValueIsZero(SDValue(IsN0ZExt ? N1 : N0, 0), Mask)) {
+      EVT HalfVT;
+      switch (VT.getSimpleVT().SimpleTy) {
+      case MVT::v2i64:
+        HalfVT = MVT::v2i32;
+        break;
+      case MVT::v4i32:
+        HalfVT = MVT::v4i16;
+        break;
+      case MVT::v8i16:
+        HalfVT = MVT::v8i8;
+        break;
+      default:
+        return 0;
+      }
+      // Truncate and then extend the result.
+      SDValue NewExt = DAG.getNode(ISD::TRUNCATE, DL, HalfVT,
+                                   SDValue(IsN0ZExt ? N1 : N0, 0));
+      NewExt = DAG.getZExtOrTrunc(NewExt, DL, VT);
+      if (IsN0ZExt)
+        N1 = NewExt.getNode();
+      else
+        N0 = NewExt.getNode();
+      return AArch64ISD::UMULL;
+    }
+  }
+
+  if (!IsN1SExt && !IsN1ZExt)
+    return 0;
+
+  // Look for (s/zext A + s/zext B) * (s/zext C). We want to turn these
+  // into (s/zext A * s/zext C) + (s/zext B * s/zext C)
+  if (IsN1SExt && isAddSubSExt(N0, DAG)) {
+    IsMLA = true;
+    return AArch64ISD::SMULL;
+  }
+  if (IsN1ZExt && isAddSubZExt(N0, DAG)) {
+    IsMLA = true;
+    return AArch64ISD::UMULL;
+  }
+  if (IsN0ZExt && isAddSubZExt(N1, DAG)) {
+    std::swap(N0, N1);
+    IsMLA = true;
+    return AArch64ISD::UMULL;
+  }
+  return 0;
+}
+
 SDValue AArch64TargetLowering::LowerMUL(SDValue Op, SelectionDAG &DAG) const {
   EVT VT = Op.getValueType();
 
   // If SVE is available then i64 vector multiplications can also be made legal.
-  bool OverrideNEON = VT == MVT::v2i64 || VT == MVT::v1i64;
+  bool OverrideNEON = VT == MVT::v2i64 || VT == MVT::v1i64 ||
+                      Subtarget->forceStreamingCompatibleSVE();
 
   if (VT.isScalableVector() || useSVEForFixedLengthVectorVT(VT, OverrideNEON))
-    return LowerToPredicatedOp(Op, DAG, AArch64ISD::MUL_PRED, OverrideNEON);
+    return LowerToPredicatedOp(Op, DAG, AArch64ISD::MUL_PRED);
 
   // Multiplications are only custom-lowered for 128-bit vectors so that
   // VMULL can be detected.  Otherwise v2i64 multiplications are not legal.
@@ -3760,45 +4625,20 @@ SDValue AArch64TargetLowering::LowerMUL(SDValue Op, SelectionDAG &DAG) const {
          "unexpected type for custom-lowering ISD::MUL");
   SDNode *N0 = Op.getOperand(0).getNode();
   SDNode *N1 = Op.getOperand(1).getNode();
-  unsigned NewOpc = 0;
   bool isMLA = false;
-  bool isN0SExt = isSignExtended(N0, DAG);
-  bool isN1SExt = isSignExtended(N1, DAG);
-  if (isN0SExt && isN1SExt)
-    NewOpc = AArch64ISD::SMULL;
-  else {
-    bool isN0ZExt = isZeroExtended(N0, DAG);
-    bool isN1ZExt = isZeroExtended(N1, DAG);
-    if (isN0ZExt && isN1ZExt)
-      NewOpc = AArch64ISD::UMULL;
-    else if (isN1SExt || isN1ZExt) {
-      // Look for (s/zext A + s/zext B) * (s/zext C). We want to turn these
-      // into (s/zext A * s/zext C) + (s/zext B * s/zext C)
-      if (isN1SExt && isAddSubSExt(N0, DAG)) {
-        NewOpc = AArch64ISD::SMULL;
-        isMLA = true;
-      } else if (isN1ZExt && isAddSubZExt(N0, DAG)) {
-        NewOpc =  AArch64ISD::UMULL;
-        isMLA = true;
-      } else if (isN0ZExt && isAddSubZExt(N1, DAG)) {
-        std::swap(N0, N1);
-        NewOpc =  AArch64ISD::UMULL;
-        isMLA = true;
-      }
-    }
+  SDLoc DL(Op);
+  unsigned NewOpc = selectUmullSmull(N0, N1, DAG, DL, isMLA);
 
-    if (!NewOpc) {
-      if (VT == MVT::v2i64)
-        // Fall through to expand this.  It is not legal.
-        return SDValue();
-      else
-        // Other vector multiplications are legal.
-        return Op;
-    }
+  if (!NewOpc) {
+    if (VT == MVT::v2i64)
+      // Fall through to expand this.  It is not legal.
+      return SDValue();
+    else
+      // Other vector multiplications are legal.
+      return Op;
   }
 
   // Legalize to a S/UMULL instruction
-  SDLoc DL(Op);
   SDValue Op0;
   SDValue Op1 = skipExtensionForVectorMULL(N1, DAG);
   if (!isMLA) {
@@ -3823,39 +4663,196 @@ SDValue AArch64TargetLowering::LowerMUL(SDValue Op, SelectionDAG &DAG) const {
 
 static inline SDValue getPTrue(SelectionDAG &DAG, SDLoc DL, EVT VT,
                                int Pattern) {
+  if (VT == MVT::nxv1i1 && Pattern == AArch64SVEPredPattern::all)
+    return DAG.getConstant(1, DL, MVT::nxv1i1);
   return DAG.getNode(AArch64ISD::PTRUE, DL, VT,
                      DAG.getTargetConstant(Pattern, DL, MVT::i32));
 }
 
-static SDValue lowerConvertToSVBool(SDValue Op, SelectionDAG &DAG) {
+static SDValue optimizeWhile(SDValue Op, SelectionDAG &DAG, bool IsSigned,
+                             bool IsLess, bool IsEqual) {
+  if (!isa<ConstantSDNode>(Op.getOperand(1)) ||
+      !isa<ConstantSDNode>(Op.getOperand(2)))
+    return SDValue();
+
+  SDLoc dl(Op);
+  APInt X = Op.getConstantOperandAPInt(1);
+  APInt Y = Op.getConstantOperandAPInt(2);
+  APInt NumActiveElems;
+  bool Overflow;
+  if (IsLess)
+    NumActiveElems = IsSigned ? Y.ssub_ov(X, Overflow) : Y.usub_ov(X, Overflow);
+  else
+    NumActiveElems = IsSigned ? X.ssub_ov(Y, Overflow) : X.usub_ov(Y, Overflow);
+
+  if (Overflow)
+    return SDValue();
+
+  if (IsEqual) {
+    APInt One(NumActiveElems.getBitWidth(), 1, IsSigned);
+    NumActiveElems = IsSigned ? NumActiveElems.sadd_ov(One, Overflow)
+                              : NumActiveElems.uadd_ov(One, Overflow);
+    if (Overflow)
+      return SDValue();
+  }
+
+  std::optional<unsigned> PredPattern =
+      getSVEPredPatternFromNumElements(NumActiveElems.getZExtValue());
+  unsigned MinSVEVectorSize = std::max(
+      DAG.getSubtarget<AArch64Subtarget>().getMinSVEVectorSizeInBits(), 128u);
+  unsigned ElementSize = 128 / Op.getValueType().getVectorMinNumElements();
+  if (PredPattern != std::nullopt &&
+      NumActiveElems.getZExtValue() <= (MinSVEVectorSize / ElementSize))
+    return getPTrue(DAG, dl, Op.getValueType(), *PredPattern);
+
+  return SDValue();
+}
+
+// Returns a safe bitcast between two scalable vector predicates, where
+// any newly created lanes from a widening bitcast are defined as zero.
+static SDValue getSVEPredicateBitCast(EVT VT, SDValue Op, SelectionDAG &DAG) {
   SDLoc DL(Op);
-  EVT OutVT = Op.getValueType();
-  SDValue InOp = Op.getOperand(1);
-  EVT InVT = InOp.getValueType();
+  EVT InVT = Op.getValueType();
+
+  assert(InVT.getVectorElementType() == MVT::i1 &&
+         VT.getVectorElementType() == MVT::i1 &&
+         "Expected a predicate-to-predicate bitcast");
+  assert(VT.isScalableVector() && DAG.getTargetLoweringInfo().isTypeLegal(VT) &&
+         InVT.isScalableVector() &&
+         DAG.getTargetLoweringInfo().isTypeLegal(InVT) &&
+         "Only expect to cast between legal scalable predicate types!");
 
   // Return the operand if the cast isn't changing type,
-  // i.e. <n x 16 x i1> -> <n x 16 x i1>
-  if (InVT == OutVT)
-    return InOp;
+  // e.g. <n x 16 x i1> -> <n x 16 x i1>
+  if (InVT == VT)
+    return Op;
 
-  SDValue Reinterpret =
-      DAG.getNode(AArch64ISD::REINTERPRET_CAST, DL, OutVT, InOp);
+  SDValue Reinterpret = DAG.getNode(AArch64ISD::REINTERPRET_CAST, DL, VT, Op);
 
-  // If the argument converted to an svbool is a ptrue or a comparison, the
-  // lanes introduced by the widening are zero by construction.
-  switch (InOp.getOpcode()) {
-  case AArch64ISD::SETCC_MERGE_ZERO:
+  // We only have to zero the lanes if new lanes are being defined, e.g. when
+  // casting from <vscale x 2 x i1> to <vscale x 16 x i1>. If this is not the
+  // case (e.g. when casting from <vscale x 16 x i1> -> <vscale x 2 x i1>) then
+  // we can return here.
+  if (InVT.bitsGT(VT))
     return Reinterpret;
-  case ISD::INTRINSIC_WO_CHAIN:
-    if (InOp.getConstantOperandVal(0) == Intrinsic::aarch64_sve_ptrue)
-      return Reinterpret;
+
+  // Check if the other lanes are already known to be zeroed by
+  // construction.
+  if (isZeroingInactiveLanes(Op))
+    return Reinterpret;
+
+  // Zero the newly introduced lanes.
+  SDValue Mask = DAG.getConstant(1, DL, InVT);
+  Mask = DAG.getNode(AArch64ISD::REINTERPRET_CAST, DL, VT, Mask);
+  return DAG.getNode(ISD::AND, DL, VT, Reinterpret, Mask);
+}
+
+SDValue AArch64TargetLowering::getPStateSM(SelectionDAG &DAG, SDValue Chain,
+                                           SMEAttrs Attrs, SDLoc DL,
+                                           EVT VT) const {
+  if (Attrs.hasStreamingInterfaceOrBody())
+    return DAG.getConstant(1, DL, VT);
+
+  if (Attrs.hasNonStreamingInterfaceAndBody())
+    return DAG.getConstant(0, DL, VT);
+
+  assert(Attrs.hasStreamingCompatibleInterface() && "Unexpected interface");
+
+  SDValue Callee = DAG.getExternalSymbol("__arm_sme_state",
+                                         getPointerTy(DAG.getDataLayout()));
+  Type *Int64Ty = Type::getInt64Ty(*DAG.getContext());
+  Type *RetTy = StructType::get(Int64Ty, Int64Ty);
+  TargetLowering::CallLoweringInfo CLI(DAG);
+  ArgListTy Args;
+  CLI.setDebugLoc(DL).setChain(Chain).setLibCallee(
+      CallingConv::AArch64_SME_ABI_Support_Routines_PreserveMost_From_X2,
+      RetTy, Callee, std::move(Args));
+  std::pair<SDValue, SDValue> CallResult = LowerCallTo(CLI);
+  SDValue Mask = DAG.getConstant(/*PSTATE.SM*/ 1, DL, MVT::i64);
+  return DAG.getNode(ISD::AND, DL, MVT::i64, CallResult.first.getOperand(0),
+                     Mask);
+}
+
+static std::optional<SMEAttrs> getCalleeAttrsFromExternalFunction(SDValue V) {
+  if (auto *ES = dyn_cast<ExternalSymbolSDNode>(V)) {
+    StringRef S(ES->getSymbol());
+    if (S == "__arm_sme_state" || S == "__arm_tpidr2_save")
+      return SMEAttrs(SMEAttrs::SM_Compatible | SMEAttrs::ZA_Preserved);
+    if (S == "__arm_tpidr2_restore")
+      return SMEAttrs(SMEAttrs::SM_Compatible | SMEAttrs::ZA_Shared);
   }
+  return std::nullopt;
+}
+
+SDValue AArch64TargetLowering::LowerINTRINSIC_VOID(SDValue Op,
+                                                   SelectionDAG &DAG) const {
+  unsigned IntNo = Op.getConstantOperandVal(1);
+  SDLoc DL(Op);
+  switch (IntNo) {
+  default:
+    return SDValue(); // Don't custom lower most intrinsics.
+  case Intrinsic::aarch64_prefetch: {
+    SDValue Chain = Op.getOperand(0);
+    SDValue Addr = Op.getOperand(2);
+
+    unsigned IsWrite = cast<ConstantSDNode>(Op.getOperand(3))->getZExtValue();
+    unsigned Locality = cast<ConstantSDNode>(Op.getOperand(4))->getZExtValue();
+    unsigned IsStream = cast<ConstantSDNode>(Op.getOperand(5))->getZExtValue();
+    unsigned IsData = cast<ConstantSDNode>(Op.getOperand(6))->getZExtValue();
+    unsigned PrfOp = (IsWrite << 4) |    // Load/Store bit
+                     (!IsData << 3) |    // IsDataCache bit
+                     (Locality << 1) |   // Cache level bits
+                     (unsigned)IsStream; // Stream bit
+
+    return DAG.getNode(AArch64ISD::PREFETCH, DL, MVT::Other, Chain,
+                       DAG.getTargetConstant(PrfOp, DL, MVT::i32), Addr);
+  }
+  case Intrinsic::aarch64_sme_za_enable:
+    return DAG.getNode(
+        AArch64ISD::SMSTART, DL, MVT::Other,
+        Op->getOperand(0), // Chain
+        DAG.getTargetConstant((int32_t)(AArch64SVCR::SVCRZA), DL, MVT::i32),
+        DAG.getConstant(0, DL, MVT::i64), DAG.getConstant(1, DL, MVT::i64));
+  case Intrinsic::aarch64_sme_za_disable:
+    return DAG.getNode(
+        AArch64ISD::SMSTOP, DL, MVT::Other,
+        Op->getOperand(0), // Chain
+        DAG.getTargetConstant((int32_t)(AArch64SVCR::SVCRZA), DL, MVT::i32),
+        DAG.getConstant(0, DL, MVT::i64), DAG.getConstant(1, DL, MVT::i64));
+  }
+}
+
+SDValue AArch64TargetLowering::LowerINTRINSIC_W_CHAIN(SDValue Op,
+                                                      SelectionDAG &DAG) const {
+  unsigned IntNo = Op.getConstantOperandVal(1);
+  SDLoc DL(Op);
+  switch (IntNo) {
+  default:
+    return SDValue(); // Don't custom lower most intrinsics.
+  case Intrinsic::aarch64_mops_memset_tag: {
+    auto Node = cast<MemIntrinsicSDNode>(Op.getNode());
+    SDValue Chain = Node->getChain();
+    SDValue Dst = Op.getOperand(2);
+    SDValue Val = Op.getOperand(3);
+    Val = DAG.getAnyExtOrTrunc(Val, DL, MVT::i64);
+    SDValue Size = Op.getOperand(4);
+    auto Alignment = Node->getMemOperand()->getAlign();
+    bool IsVol = Node->isVolatile();
+    auto DstPtrInfo = Node->getPointerInfo();
 
-  // Otherwise, zero the newly introduced lanes.
-  SDValue Mask = getPTrue(DAG, DL, InVT, AArch64SVEPredPattern::all);
-  SDValue MaskReinterpret =
-      DAG.getNode(AArch64ISD::REINTERPRET_CAST, DL, OutVT, Mask);
-  return DAG.getNode(ISD::AND, DL, OutVT, Reinterpret, MaskReinterpret);
+    const auto &SDI =
+        static_cast<const AArch64SelectionDAGInfo &>(DAG.getSelectionDAGInfo());
+    SDValue MS =
+        SDI.EmitMOPS(AArch64ISD::MOPS_MEMSET_TAGGING, DAG, DL, Chain, Dst, Val,
+                     Size, Alignment, IsVol, DstPtrInfo, MachinePointerInfo{});
+
+    // MOPS_MEMSET_TAGGING has 3 results (DstWb, SizeWb, Chain) whereas the
+    // intrinsic has 2. So hide SizeWb using MERGE_VALUES. Otherwise
+    // LowerOperationWrapper will complain that the number of results has
+    // changed.
+    return DAG.getMergeValues({MS.getValue(0), MS.getValue(2)}, DL);
+  }
+  }
 }
 
 SDValue AArch64TargetLowering::LowerINTRINSIC_WO_CHAIN(SDValue Op,
@@ -3881,6 +4878,64 @@ SDValue AArch64TargetLowering::LowerINTRINSIC_WO_CHAIN(SDValue Op,
       report_fatal_error("Unexpected type for AArch64 NEON intrinic");
     }
   }
+  case Intrinsic::aarch64_neon_pmull64: {
+    SDValue LHS = Op.getOperand(1);
+    SDValue RHS = Op.getOperand(2);
+
+    std::optional<uint64_t> LHSLane =
+        getConstantLaneNumOfExtractHalfOperand(LHS);
+    std::optional<uint64_t> RHSLane =
+        getConstantLaneNumOfExtractHalfOperand(RHS);
+
+    assert((!LHSLane || *LHSLane < 2) && "Expect lane to be None or 0 or 1");
+    assert((!RHSLane || *RHSLane < 2) && "Expect lane to be None or 0 or 1");
+
+    // 'aarch64_neon_pmull64' takes i64 parameters; while pmull/pmull2
+    // instructions execute on SIMD registers. So canonicalize i64 to v1i64,
+    // which ISel recognizes better. For example, generate a ldr into d*
+    // registers as opposed to a GPR load followed by a fmov.
+    auto TryVectorizeOperand = [](SDValue N, std::optional<uint64_t> NLane,
+                                  std::optional<uint64_t> OtherLane,
+                                  const SDLoc &dl,
+                                  SelectionDAG &DAG) -> SDValue {
+      // If the operand is an higher half itself, rewrite it to
+      // extract_high_v2i64; this way aarch64_neon_pmull64 could
+      // re-use the dag-combiner function with aarch64_neon_{pmull,smull,umull}.
+      if (NLane && *NLane == 1)
+        return DAG.getNode(ISD::EXTRACT_SUBVECTOR, dl, MVT::v1i64,
+                           N.getOperand(0), DAG.getConstant(1, dl, MVT::i64));
+
+      // Operand N is not a higher half but the other operand is.
+      if (OtherLane && *OtherLane == 1) {
+        // If this operand is a lower half, rewrite it to
+        // extract_high_v2i64(duplane(<2 x Ty>, 0)). This saves a roundtrip to
+        // align lanes of two operands. A roundtrip sequence (to move from lane
+        // 1 to lane 0) is like this:
+        //   mov x8, v0.d[1]
+        //   fmov d0, x8
+        if (NLane && *NLane == 0)
+          return DAG.getNode(ISD::EXTRACT_SUBVECTOR, dl, MVT::v1i64,
+                             DAG.getNode(AArch64ISD::DUPLANE64, dl, MVT::v2i64,
+                                         N.getOperand(0),
+                                         DAG.getConstant(0, dl, MVT::i64)),
+                             DAG.getConstant(1, dl, MVT::i64));
+
+        // Otherwise just dup from main to all lanes.
+        return DAG.getNode(AArch64ISD::DUP, dl, MVT::v1i64, N);
+      }
+
+      // Neither operand is an extract of higher half, so codegen may just use
+      // the non-high version of PMULL instruction. Use v1i64 to represent i64.
+      assert(N.getValueType() == MVT::i64 &&
+             "Intrinsic aarch64_neon_pmull64 requires i64 parameters");
+      return DAG.getNode(ISD::SCALAR_TO_VECTOR, dl, MVT::v1i64, N);
+    };
+
+    LHS = TryVectorizeOperand(LHS, LHSLane, RHSLane, dl, DAG);
+    RHS = TryVectorizeOperand(RHS, RHSLane, LHSLane, dl, DAG);
+
+    return DAG.getNode(AArch64ISD::PMULL, dl, Op.getValueType(), LHS, RHS);
+  }
   case Intrinsic::aarch64_neon_smax:
     return DAG.getNode(ISD::SMAX, dl, Op.getValueType(),
                        Op.getOperand(1), Op.getOperand(2));
@@ -3893,7 +4948,42 @@ SDValue AArch64TargetLowering::LowerINTRINSIC_WO_CHAIN(SDValue Op,
   case Intrinsic::aarch64_neon_umin:
     return DAG.getNode(ISD::UMIN, dl, Op.getValueType(),
                        Op.getOperand(1), Op.getOperand(2));
-
+  case Intrinsic::aarch64_neon_scalar_sqxtn:
+  case Intrinsic::aarch64_neon_scalar_sqxtun:
+  case Intrinsic::aarch64_neon_scalar_uqxtn: {
+    assert(Op.getValueType() == MVT::i32 || Op.getValueType() == MVT::f32);
+    if (Op.getValueType() == MVT::i32)
+      return DAG.getNode(ISD::BITCAST, dl, MVT::i32,
+                         DAG.getNode(ISD::INTRINSIC_WO_CHAIN, dl, MVT::f32,
+                                     Op.getOperand(0),
+                                     DAG.getNode(ISD::BITCAST, dl, MVT::f64,
+                                                 Op.getOperand(1))));
+    return SDValue();
+  }
+  case Intrinsic::aarch64_sve_whilelo:
+    return optimizeWhile(Op, DAG, /*IsSigned=*/false, /*IsLess=*/true,
+                         /*IsEqual=*/false);
+  case Intrinsic::aarch64_sve_whilelt:
+    return optimizeWhile(Op, DAG, /*IsSigned=*/true, /*IsLess=*/true,
+                         /*IsEqual=*/false);
+  case Intrinsic::aarch64_sve_whilels:
+    return optimizeWhile(Op, DAG, /*IsSigned=*/false, /*IsLess=*/true,
+                         /*IsEqual=*/true);
+  case Intrinsic::aarch64_sve_whilele:
+    return optimizeWhile(Op, DAG, /*IsSigned=*/true, /*IsLess=*/true,
+                         /*IsEqual=*/true);
+  case Intrinsic::aarch64_sve_whilege:
+    return optimizeWhile(Op, DAG, /*IsSigned=*/true, /*IsLess=*/false,
+                         /*IsEqual=*/true);
+  case Intrinsic::aarch64_sve_whilegt:
+    return optimizeWhile(Op, DAG, /*IsSigned=*/true, /*IsLess=*/false,
+                         /*IsEqual=*/false);
+  case Intrinsic::aarch64_sve_whilehs:
+    return optimizeWhile(Op, DAG, /*IsSigned=*/false, /*IsLess=*/false,
+                         /*IsEqual=*/true);
+  case Intrinsic::aarch64_sve_whilehi:
+    return optimizeWhile(Op, DAG, /*IsSigned=*/false, /*IsLess=*/false,
+                         /*IsEqual=*/false);
   case Intrinsic::aarch64_sve_sunpkhi:
     return DAG.getNode(AArch64ISD::SUNPKHI, dl, Op.getValueType(),
                        Op.getOperand(1));
@@ -3946,11 +5036,31 @@ SDValue AArch64TargetLowering::LowerINTRINSIC_WO_CHAIN(SDValue Op,
     return DAG.getNode(AArch64ISD::SPLICE, dl, Op.getValueType(),
                        Op.getOperand(1), Op.getOperand(2), Op.getOperand(3));
   case Intrinsic::aarch64_sve_ptrue:
-    return DAG.getNode(AArch64ISD::PTRUE, dl, Op.getValueType(),
-                       Op.getOperand(1));
+    return getPTrue(DAG, dl, Op.getValueType(),
+                    cast<ConstantSDNode>(Op.getOperand(1))->getZExtValue());
   case Intrinsic::aarch64_sve_clz:
     return DAG.getNode(AArch64ISD::CTLZ_MERGE_PASSTHRU, dl, Op.getValueType(),
                        Op.getOperand(2), Op.getOperand(3), Op.getOperand(1));
+  case Intrinsic::aarch64_sme_cntsb:
+    return DAG.getNode(AArch64ISD::RDSVL, dl, Op.getValueType(),
+                       DAG.getConstant(1, dl, MVT::i32));
+  case Intrinsic::aarch64_sme_cntsh: {
+    SDValue One = DAG.getConstant(1, dl, MVT::i32);
+    SDValue Bytes = DAG.getNode(AArch64ISD::RDSVL, dl, Op.getValueType(), One);
+    return DAG.getNode(ISD::SRL, dl, Op.getValueType(), Bytes, One);
+  }
+  case Intrinsic::aarch64_sme_cntsw: {
+    SDValue Bytes = DAG.getNode(AArch64ISD::RDSVL, dl, Op.getValueType(),
+                                DAG.getConstant(1, dl, MVT::i32));
+    return DAG.getNode(ISD::SRL, dl, Op.getValueType(), Bytes,
+                       DAG.getConstant(2, dl, MVT::i32));
+  }
+  case Intrinsic::aarch64_sme_cntsd: {
+    SDValue Bytes = DAG.getNode(AArch64ISD::RDSVL, dl, Op.getValueType(),
+                                DAG.getConstant(1, dl, MVT::i32));
+    return DAG.getNode(ISD::SRL, dl, Op.getValueType(), Bytes,
+                       DAG.getConstant(3, dl, MVT::i32));
+  }
   case Intrinsic::aarch64_sve_cnt: {
     SDValue Data = Op.getOperand(3);
     // CTPOP only supports integer operands.
@@ -3962,10 +5072,9 @@ SDValue AArch64TargetLowering::LowerINTRINSIC_WO_CHAIN(SDValue Op,
   case Intrinsic::aarch64_sve_dupq_lane:
     return LowerDUPQLane(Op, DAG);
   case Intrinsic::aarch64_sve_convert_from_svbool:
-    return DAG.getNode(AArch64ISD::REINTERPRET_CAST, dl, Op.getValueType(),
-                       Op.getOperand(1));
+    return getSVEPredicateBitCast(Op.getValueType(), Op.getOperand(1), DAG);
   case Intrinsic::aarch64_sve_convert_to_svbool:
-    return lowerConvertToSVBool(Op, DAG);
+    return getSVEPredicateBitCast(MVT::nxv16i1, Op.getOperand(1), DAG);
   case Intrinsic::aarch64_sve_fneg:
     return DAG.getNode(AArch64ISD::FNEG_MERGE_PASSTHRU, dl, Op.getValueType(),
                        Op.getOperand(2), Op.getOperand(3), Op.getOperand(1));
@@ -4012,6 +5121,18 @@ SDValue AArch64TargetLowering::LowerINTRINSIC_WO_CHAIN(SDValue Op,
   case Intrinsic::aarch64_sve_frecpx:
     return DAG.getNode(AArch64ISD::FRECPX_MERGE_PASSTHRU, dl, Op.getValueType(),
                        Op.getOperand(2), Op.getOperand(3), Op.getOperand(1));
+  case Intrinsic::aarch64_sve_frecpe_x:
+    return DAG.getNode(AArch64ISD::FRECPE, dl, Op.getValueType(),
+                       Op.getOperand(1));
+  case Intrinsic::aarch64_sve_frecps_x:
+    return DAG.getNode(AArch64ISD::FRECPS, dl, Op.getValueType(),
+                       Op.getOperand(1), Op.getOperand(2));
+  case Intrinsic::aarch64_sve_frsqrte_x:
+    return DAG.getNode(AArch64ISD::FRSQRTE, dl, Op.getValueType(),
+                       Op.getOperand(1));
+  case Intrinsic::aarch64_sve_frsqrts_x:
+    return DAG.getNode(AArch64ISD::FRSQRTS, dl, Op.getValueType(),
+                       Op.getOperand(1), Op.getOperand(2));
   case Intrinsic::aarch64_sve_fabs:
     return DAG.getNode(AArch64ISD::FABS_MERGE_PASSTHRU, dl, Op.getValueType(),
                        Op.getOperand(2), Op.getOperand(3), Op.getOperand(1));
@@ -4037,6 +5158,15 @@ SDValue AArch64TargetLowering::LowerINTRINSIC_WO_CHAIN(SDValue Op,
   case Intrinsic::aarch64_sve_revb:
     return DAG.getNode(AArch64ISD::BSWAP_MERGE_PASSTHRU, dl, Op.getValueType(),
                        Op.getOperand(2), Op.getOperand(3), Op.getOperand(1));
+  case Intrinsic::aarch64_sve_revh:
+    return DAG.getNode(AArch64ISD::REVH_MERGE_PASSTHRU, dl, Op.getValueType(),
+                       Op.getOperand(2), Op.getOperand(3), Op.getOperand(1));
+  case Intrinsic::aarch64_sve_revw:
+    return DAG.getNode(AArch64ISD::REVW_MERGE_PASSTHRU, dl, Op.getValueType(),
+                       Op.getOperand(2), Op.getOperand(3), Op.getOperand(1));
+  case Intrinsic::aarch64_sve_revd:
+    return DAG.getNode(AArch64ISD::REVD_MERGE_PASSTHRU, dl, Op.getValueType(),
+                       Op.getOperand(2), Op.getOperand(3), Op.getOperand(1));
   case Intrinsic::aarch64_sve_sxtb:
     return DAG.getNode(
         AArch64ISD::SIGN_EXTEND_INREG_MERGE_PASSTHRU, dl, Op.getValueType(),
@@ -4073,7 +5203,6 @@ SDValue AArch64TargetLowering::LowerINTRINSIC_WO_CHAIN(SDValue Op,
         Op.getOperand(2), Op.getOperand(3),
         DAG.getValueType(Op.getValueType().changeVectorElementType(MVT::i32)),
         Op.getOperand(1));
-
   case Intrinsic::localaddress: {
     const auto &MF = DAG.getMachineFunction();
     const auto *RegInfo = Subtarget->getRegisterInfo();
@@ -4119,9 +5248,9 @@ SDValue AArch64TargetLowering::LowerINTRINSIC_WO_CHAIN(SDValue Op,
                         IntNo == Intrinsic::aarch64_neon_shadd);
     bool IsRoundingAdd = (IntNo == Intrinsic::aarch64_neon_srhadd ||
                           IntNo == Intrinsic::aarch64_neon_urhadd);
-    unsigned Opcode =
-        IsSignedAdd ? (IsRoundingAdd ? AArch64ISD::SRHADD : AArch64ISD::SHADD)
-                    : (IsRoundingAdd ? AArch64ISD::URHADD : AArch64ISD::UHADD);
+    unsigned Opcode = IsSignedAdd
+                          ? (IsRoundingAdd ? ISD::AVGCEILS : ISD::AVGFLOORS)
+                          : (IsRoundingAdd ? ISD::AVGCEILU : ISD::AVGFLOORU);
     return DAG.getNode(Opcode, dl, Op.getValueType(), Op.getOperand(1),
                        Op.getOperand(2));
   }
@@ -4132,8 +5261,11 @@ SDValue AArch64TargetLowering::LowerINTRINSIC_WO_CHAIN(SDValue Op,
     return DAG.getNode(Opcode, dl, Op.getValueType(), Op.getOperand(1),
                        Op.getOperand(2));
   }
+  case Intrinsic::aarch64_neon_saddlp:
   case Intrinsic::aarch64_neon_uaddlp: {
-    unsigned Opcode = AArch64ISD::UADDLP;
+    unsigned Opcode = IntNo == Intrinsic::aarch64_neon_uaddlp
+                          ? AArch64ISD::UADDLP
+                          : AArch64ISD::SADDLP;
     return DAG.getNode(Opcode, dl, Op.getValueType(), Op.getOperand(1));
   }
   case Intrinsic::aarch64_neon_sdot:
@@ -4147,6 +5279,12 @@ SDValue AArch64TargetLowering::LowerINTRINSIC_WO_CHAIN(SDValue Op,
     return DAG.getNode(Opcode, dl, Op.getValueType(), Op.getOperand(1),
                        Op.getOperand(2), Op.getOperand(3));
   }
+  case Intrinsic::get_active_lane_mask: {
+    SDValue ID =
+        DAG.getTargetConstant(Intrinsic::aarch64_sve_whilelo, dl, MVT::i64);
+    return DAG.getNode(ISD::INTRINSIC_WO_CHAIN, dl, Op.getValueType(), ID,
+                       Op.getOperand(1), Op.getOperand(2));
+  }
   }
 }
 
@@ -4159,17 +5297,26 @@ bool AArch64TargetLowering::shouldExtendGSIndex(EVT VT, EVT &EltTy) const {
   return false;
 }
 
-bool AArch64TargetLowering::shouldRemoveExtendFromGSIndex(EVT VT) const {
-  if (VT.getVectorElementType() == MVT::i32 &&
-      VT.getVectorElementCount().getKnownMinValue() >= 4 &&
-      !VT.isFixedLengthVector())
-    return true;
+bool AArch64TargetLowering::shouldRemoveExtendFromGSIndex(EVT IndexVT,
+                                                          EVT DataVT) const {
+  // SVE only supports implicit extension of 32-bit indices.
+  if (!Subtarget->hasSVE() || IndexVT.getVectorElementType() != MVT::i32)
+    return false;
 
-  return false;
+  // Indices cannot be smaller than the main data type.
+  if (IndexVT.getScalarSizeInBits() < DataVT.getScalarSizeInBits())
+    return false;
+
+  // Scalable vectors with "vscale * 2" or fewer elements sit within a 64-bit
+  // element container type, which would violate the previous clause.
+  return DataVT.isFixedLengthVector() || DataVT.getVectorMinNumElements() > 2;
 }
 
 bool AArch64TargetLowering::isVectorLoadExtDesirable(SDValue ExtVal) const {
-  return ExtVal.getValueType().isScalableVector();
+  return ExtVal.getValueType().isScalableVector() ||
+         useSVEForFixedLengthVectorVT(
+             ExtVal.getValueType(),
+             /*OverrideNEON=*/Subtarget->useSVEForFixedLengthVectors());
 }
 
 unsigned getGatherVecOpcode(bool IsScaled, bool IsSigned, bool NeedsExtend) {
@@ -4195,29 +5342,6 @@ unsigned getGatherVecOpcode(bool IsScaled, bool IsSigned, bool NeedsExtend) {
   return AddrModes.find(Key)->second;
 }
 
-unsigned getScatterVecOpcode(bool IsScaled, bool IsSigned, bool NeedsExtend) {
-  std::map<std::tuple<bool, bool, bool>, unsigned> AddrModes = {
-      {std::make_tuple(/*Scaled*/ false, /*Signed*/ false, /*Extend*/ false),
-       AArch64ISD::SST1_PRED},
-      {std::make_tuple(/*Scaled*/ false, /*Signed*/ false, /*Extend*/ true),
-       AArch64ISD::SST1_UXTW_PRED},
-      {std::make_tuple(/*Scaled*/ false, /*Signed*/ true, /*Extend*/ false),
-       AArch64ISD::SST1_PRED},
-      {std::make_tuple(/*Scaled*/ false, /*Signed*/ true, /*Extend*/ true),
-       AArch64ISD::SST1_SXTW_PRED},
-      {std::make_tuple(/*Scaled*/ true, /*Signed*/ false, /*Extend*/ false),
-       AArch64ISD::SST1_SCALED_PRED},
-      {std::make_tuple(/*Scaled*/ true, /*Signed*/ false, /*Extend*/ true),
-       AArch64ISD::SST1_UXTW_SCALED_PRED},
-      {std::make_tuple(/*Scaled*/ true, /*Signed*/ true, /*Extend*/ false),
-       AArch64ISD::SST1_SCALED_PRED},
-      {std::make_tuple(/*Scaled*/ true, /*Signed*/ true, /*Extend*/ true),
-       AArch64ISD::SST1_SXTW_SCALED_PRED},
-  };
-  auto Key = std::make_tuple(IsScaled, IsSigned, NeedsExtend);
-  return AddrModes.find(Key)->second;
-}
-
 unsigned getSignExtendedGatherOpcode(unsigned Opcode) {
   switch (Opcode) {
   default:
@@ -4240,267 +5364,184 @@ unsigned getSignExtendedGatherOpcode(unsigned Opcode) {
   }
 }
 
-bool getGatherScatterIndexIsExtended(SDValue Index) {
-  unsigned Opcode = Index.getOpcode();
-  if (Opcode == ISD::SIGN_EXTEND_INREG)
-    return true;
-
-  if (Opcode == ISD::AND) {
-    SDValue Splat = Index.getOperand(1);
-    if (Splat.getOpcode() != ISD::SPLAT_VECTOR)
-      return false;
-    ConstantSDNode *Mask = dyn_cast<ConstantSDNode>(Splat.getOperand(0));
-    if (!Mask || Mask->getZExtValue() != 0xFFFFFFFF)
-      return false;
-    return true;
-  }
-
-  return false;
-}
-
-// If the base pointer of a masked gather or scatter is null, we
-// may be able to swap BasePtr & Index and use the vector + register
-// or vector + immediate addressing mode, e.g.
-// VECTOR + REGISTER:
-//    getelementptr nullptr, <vscale x N x T> (splat(%offset)) + %indices)
-// -> getelementptr %offset, <vscale x N x T> %indices
-// VECTOR + IMMEDIATE:
-//    getelementptr nullptr, <vscale x N x T> (splat(#x)) + %indices)
-// -> getelementptr #x, <vscale x N x T> %indices
-void selectGatherScatterAddrMode(SDValue &BasePtr, SDValue &Index, EVT MemVT,
-                                 unsigned &Opcode, bool IsGather,
-                                 SelectionDAG &DAG) {
-  if (!isNullConstant(BasePtr))
-    return;
-
-  // FIXME: This will not match for fixed vector type codegen as the nodes in
-  // question will have fixed<->scalable conversions around them. This should be
-  // moved to a DAG combine or complex pattern so that is executes after all of
-  // the fixed vector insert and extracts have been removed. This deficiency
-  // will result in a sub-optimal addressing mode being used, i.e. an ADD not
-  // being folded into the scatter/gather.
-  ConstantSDNode *Offset = nullptr;
-  if (Index.getOpcode() == ISD::ADD)
-    if (auto SplatVal = DAG.getSplatValue(Index.getOperand(1))) {
-      if (isa<ConstantSDNode>(SplatVal))
-        Offset = cast<ConstantSDNode>(SplatVal);
-      else {
-        BasePtr = SplatVal;
-        Index = Index->getOperand(0);
-        return;
-      }
-    }
-
-  unsigned NewOp =
-      IsGather ? AArch64ISD::GLD1_IMM_MERGE_ZERO : AArch64ISD::SST1_IMM_PRED;
-
-  if (!Offset) {
-    std::swap(BasePtr, Index);
-    Opcode = NewOp;
-    return;
-  }
-
-  uint64_t OffsetVal = Offset->getZExtValue();
-  unsigned ScalarSizeInBytes = MemVT.getScalarSizeInBits() / 8;
-  auto ConstOffset = DAG.getConstant(OffsetVal, SDLoc(Index), MVT::i64);
-
-  if (OffsetVal % ScalarSizeInBytes || OffsetVal / ScalarSizeInBytes > 31) {
-    // Index is out of range for the immediate addressing mode
-    BasePtr = ConstOffset;
-    Index = Index->getOperand(0);
-    return;
-  }
-
-  // Immediate is in range
-  Opcode = NewOp;
-  BasePtr = Index->getOperand(0);
-  Index = ConstOffset;
-}
-
 SDValue AArch64TargetLowering::LowerMGATHER(SDValue Op,
                                             SelectionDAG &DAG) const {
-  SDLoc DL(Op);
   MaskedGatherSDNode *MGT = cast<MaskedGatherSDNode>(Op);
-  assert(MGT && "Can only custom lower gather load nodes");
-
-  bool IsFixedLength = MGT->getMemoryVT().isFixedLengthVector();
 
-  SDValue Index = MGT->getIndex();
+  SDLoc DL(Op);
   SDValue Chain = MGT->getChain();
   SDValue PassThru = MGT->getPassThru();
   SDValue Mask = MGT->getMask();
   SDValue BasePtr = MGT->getBasePtr();
-  ISD::LoadExtType ExtTy = MGT->getExtensionType();
-
-  ISD::MemIndexType IndexType = MGT->getIndexType();
-  bool IsScaled =
-      IndexType == ISD::SIGNED_SCALED || IndexType == ISD::UNSIGNED_SCALED;
-  bool IsSigned =
-      IndexType == ISD::SIGNED_SCALED || IndexType == ISD::SIGNED_UNSCALED;
-  bool IdxNeedsExtend =
-      getGatherScatterIndexIsExtended(Index) ||
-      Index.getSimpleValueType().getVectorElementType() == MVT::i32;
-  bool ResNeedsSignExtend = ExtTy == ISD::EXTLOAD || ExtTy == ISD::SEXTLOAD;
-
-  EVT VT = PassThru.getSimpleValueType();
-  EVT IndexVT = Index.getSimpleValueType();
+  SDValue Index = MGT->getIndex();
+  SDValue Scale = MGT->getScale();
+  EVT VT = Op.getValueType();
   EVT MemVT = MGT->getMemoryVT();
-  SDValue InputVT = DAG.getValueType(MemVT);
-
-  if (VT.getVectorElementType() == MVT::bf16 &&
-      !static_cast<const AArch64Subtarget &>(DAG.getSubtarget()).hasBF16())
-    return SDValue();
+  ISD::LoadExtType ExtType = MGT->getExtensionType();
+  ISD::MemIndexType IndexType = MGT->getIndexType();
 
-  if (IsFixedLength) {
+  // SVE supports zero (and so undef) passthrough values only, everything else
+  // must be handled manually by an explicit select on the load's output.
+  if (!PassThru->isUndef() && !isZerosVector(PassThru.getNode())) {
+    SDValue Ops[] = {Chain, DAG.getUNDEF(VT), Mask, BasePtr, Index, Scale};
+    SDValue Load =
+        DAG.getMaskedGather(MGT->getVTList(), MemVT, DL, Ops,
+                            MGT->getMemOperand(), IndexType, ExtType);
+    SDValue Select = DAG.getSelect(DL, VT, Mask, Load, PassThru);
+    return DAG.getMergeValues({Select, Load.getValue(1)}, DL);
+  }
+
+  bool IsScaled = MGT->isIndexScaled();
+  bool IsSigned = MGT->isIndexSigned();
+
+  // SVE supports an index scaled by sizeof(MemVT.elt) only, everything else
+  // must be calculated before hand.
+  uint64_t ScaleVal = cast<ConstantSDNode>(Scale)->getZExtValue();
+  if (IsScaled && ScaleVal != MemVT.getScalarStoreSize()) {
+    assert(isPowerOf2_64(ScaleVal) && "Expecting power-of-two types");
+    EVT IndexVT = Index.getValueType();
+    Index = DAG.getNode(ISD::SHL, DL, IndexVT, Index,
+                        DAG.getConstant(Log2_32(ScaleVal), DL, IndexVT));
+    Scale = DAG.getTargetConstant(1, DL, Scale.getValueType());
+
+    SDValue Ops[] = {Chain, PassThru, Mask, BasePtr, Index, Scale};
+    return DAG.getMaskedGather(MGT->getVTList(), MemVT, DL, Ops,
+                               MGT->getMemOperand(), IndexType, ExtType);
+  }
+
+  // Lower fixed length gather to a scalable equivalent.
+  if (VT.isFixedLengthVector()) {
     assert(Subtarget->useSVEForFixedLengthVectors() &&
-           "Cannot lower when not using SVE for fixed vectors");
-    if (MemVT.getScalarSizeInBits() <= IndexVT.getScalarSizeInBits()) {
-      IndexVT = getContainerForFixedLengthVector(DAG, IndexVT);
-      MemVT = IndexVT.changeVectorElementType(MemVT.getVectorElementType());
-    } else {
-      MemVT = getContainerForFixedLengthVector(DAG, MemVT);
-      IndexVT = MemVT.changeTypeToInteger();
-    }
-    InputVT = DAG.getValueType(MemVT.changeTypeToInteger());
-    Mask = DAG.getNode(
-        ISD::ZERO_EXTEND, DL,
-        VT.changeVectorElementType(IndexVT.getVectorElementType()), Mask);
-  }
-
-  if (PassThru->isUndef() || isZerosVector(PassThru.getNode()))
-    PassThru = SDValue();
-
-  if (VT.isFloatingPoint() && !IsFixedLength) {
-    // Handle FP data by using an integer gather and casting the result.
-    if (PassThru) {
-      EVT PassThruVT = getPackedSVEVectorVT(VT.getVectorElementCount());
-      PassThru = getSVESafeBitCast(PassThruVT, PassThru, DAG);
-    }
-    InputVT = DAG.getValueType(MemVT.changeVectorElementTypeToInteger());
-  }
-
-  SDVTList VTs = DAG.getVTList(IndexVT, MVT::Other);
-
-  if (getGatherScatterIndexIsExtended(Index))
-    Index = Index.getOperand(0);
-
-  unsigned Opcode = getGatherVecOpcode(IsScaled, IsSigned, IdxNeedsExtend);
-  selectGatherScatterAddrMode(BasePtr, Index, MemVT, Opcode,
-                              /*isGather=*/true, DAG);
-
-  if (ResNeedsSignExtend)
-    Opcode = getSignExtendedGatherOpcode(Opcode);
-
-  if (IsFixedLength) {
-    if (Index.getSimpleValueType().isFixedLengthVector())
-      Index = convertToScalableVector(DAG, IndexVT, Index);
-    if (BasePtr.getSimpleValueType().isFixedLengthVector())
-      BasePtr = convertToScalableVector(DAG, IndexVT, BasePtr);
+           "Cannot lower when not using SVE for fixed vectors!");
+
+    // NOTE: Handle floating-point as if integer then bitcast the result.
+    EVT DataVT = VT.changeVectorElementTypeToInteger();
+    MemVT = MemVT.changeVectorElementTypeToInteger();
+
+    // Find the smallest integer fixed length vector we can use for the gather.
+    EVT PromotedVT = VT.changeVectorElementType(MVT::i32);
+    if (DataVT.getVectorElementType() == MVT::i64 ||
+        Index.getValueType().getVectorElementType() == MVT::i64 ||
+        Mask.getValueType().getVectorElementType() == MVT::i64)
+      PromotedVT = VT.changeVectorElementType(MVT::i64);
+
+    // Promote vector operands except for passthrough, which we know is either
+    // undef or zero, and thus best constructed directly.
+    unsigned ExtOpcode = IsSigned ? ISD::SIGN_EXTEND : ISD::ZERO_EXTEND;
+    Index = DAG.getNode(ExtOpcode, DL, PromotedVT, Index);
+    Mask = DAG.getNode(ISD::SIGN_EXTEND, DL, PromotedVT, Mask);
+
+    // A promoted result type forces the need for an extending load.
+    if (PromotedVT != DataVT && ExtType == ISD::NON_EXTLOAD)
+      ExtType = ISD::EXTLOAD;
+
+    EVT ContainerVT = getContainerForFixedLengthVector(DAG, PromotedVT);
+
+    // Convert fixed length vector operands to scalable.
+    MemVT = ContainerVT.changeVectorElementType(MemVT.getVectorElementType());
+    Index = convertToScalableVector(DAG, ContainerVT, Index);
     Mask = convertFixedMaskToScalableVector(Mask, DAG);
-  }
-
-  SDValue Ops[] = {Chain, Mask, BasePtr, Index, InputVT};
-  SDValue Result = DAG.getNode(Opcode, DL, VTs, Ops);
-  Chain = Result.getValue(1);
-
-  if (IsFixedLength) {
-    Result = convertFromScalableVector(
-        DAG, VT.changeVectorElementType(IndexVT.getVectorElementType()),
-        Result);
-    Result = DAG.getNode(ISD::TRUNCATE, DL, VT.changeTypeToInteger(), Result);
-    Result = DAG.getNode(ISD::BITCAST, DL, VT, Result);
-
-    if (PassThru)
-      Result = DAG.getSelect(DL, VT, MGT->getMask(), Result, PassThru);
-  } else {
-    if (PassThru)
-      Result = DAG.getSelect(DL, IndexVT, Mask, Result, PassThru);
-
+    PassThru = PassThru->isUndef() ? DAG.getUNDEF(ContainerVT)
+                                   : DAG.getConstant(0, DL, ContainerVT);
+
+    // Emit equivalent scalable vector gather.
+    SDValue Ops[] = {Chain, PassThru, Mask, BasePtr, Index, Scale};
+    SDValue Load =
+        DAG.getMaskedGather(DAG.getVTList(ContainerVT, MVT::Other), MemVT, DL,
+                            Ops, MGT->getMemOperand(), IndexType, ExtType);
+
+    // Extract fixed length data then convert to the required result type.
+    SDValue Result = convertFromScalableVector(DAG, PromotedVT, Load);
+    Result = DAG.getNode(ISD::TRUNCATE, DL, DataVT, Result);
     if (VT.isFloatingPoint())
-      Result = getSVESafeBitCast(VT, Result, DAG);
+      Result = DAG.getNode(ISD::BITCAST, DL, VT, Result);
+
+    return DAG.getMergeValues({Result, Load.getValue(1)}, DL);
   }
 
-  return DAG.getMergeValues({Result, Chain}, DL);
+  // Everything else is legal.
+  return Op;
 }
 
 SDValue AArch64TargetLowering::LowerMSCATTER(SDValue Op,
                                              SelectionDAG &DAG) const {
-  SDLoc DL(Op);
   MaskedScatterSDNode *MSC = cast<MaskedScatterSDNode>(Op);
-  assert(MSC && "Can only custom lower scatter store nodes");
-
-  bool IsFixedLength = MSC->getMemoryVT().isFixedLengthVector();
 
-  SDValue Index = MSC->getIndex();
+  SDLoc DL(Op);
   SDValue Chain = MSC->getChain();
   SDValue StoreVal = MSC->getValue();
   SDValue Mask = MSC->getMask();
   SDValue BasePtr = MSC->getBasePtr();
-
-  ISD::MemIndexType IndexType = MSC->getIndexType();
-  bool IsScaled =
-      IndexType == ISD::SIGNED_SCALED || IndexType == ISD::UNSIGNED_SCALED;
-  bool IsSigned =
-      IndexType == ISD::SIGNED_SCALED || IndexType == ISD::SIGNED_UNSCALED;
-  bool NeedsExtend =
-      getGatherScatterIndexIsExtended(Index) ||
-      Index.getSimpleValueType().getVectorElementType() == MVT::i32;
-
-  EVT VT = StoreVal.getSimpleValueType();
-  EVT IndexVT = Index.getSimpleValueType();
-  SDVTList VTs = DAG.getVTList(MVT::Other);
+  SDValue Index = MSC->getIndex();
+  SDValue Scale = MSC->getScale();
+  EVT VT = StoreVal.getValueType();
   EVT MemVT = MSC->getMemoryVT();
-  SDValue InputVT = DAG.getValueType(MemVT);
+  ISD::MemIndexType IndexType = MSC->getIndexType();
+  bool Truncating = MSC->isTruncatingStore();
 
-  if (VT.getVectorElementType() == MVT::bf16 &&
-      !static_cast<const AArch64Subtarget &>(DAG.getSubtarget()).hasBF16())
-    return SDValue();
+  bool IsScaled = MSC->isIndexScaled();
+  bool IsSigned = MSC->isIndexSigned();
 
-  if (IsFixedLength) {
-    assert(Subtarget->useSVEForFixedLengthVectors() &&
-           "Cannot lower when not using SVE for fixed vectors");
-    if (MemVT.getScalarSizeInBits() <= IndexVT.getScalarSizeInBits()) {
-      IndexVT = getContainerForFixedLengthVector(DAG, IndexVT);
-      MemVT = IndexVT.changeVectorElementType(MemVT.getVectorElementType());
-    } else {
-      MemVT = getContainerForFixedLengthVector(DAG, MemVT);
-      IndexVT = MemVT.changeTypeToInteger();
-    }
-    InputVT = DAG.getValueType(MemVT.changeTypeToInteger());
-
-    StoreVal =
-        DAG.getNode(ISD::BITCAST, DL, VT.changeTypeToInteger(), StoreVal);
-    StoreVal = DAG.getNode(
-        ISD::ANY_EXTEND, DL,
-        VT.changeVectorElementType(IndexVT.getVectorElementType()), StoreVal);
-    StoreVal = convertToScalableVector(DAG, IndexVT, StoreVal);
-    Mask = DAG.getNode(
-        ISD::ZERO_EXTEND, DL,
-        VT.changeVectorElementType(IndexVT.getVectorElementType()), Mask);
-  } else if (VT.isFloatingPoint()) {
-    // Handle FP data by casting the data so an integer scatter can be used.
-    EVT StoreValVT = getPackedSVEVectorVT(VT.getVectorElementCount());
-    StoreVal = getSVESafeBitCast(StoreValVT, StoreVal, DAG);
-    InputVT = DAG.getValueType(MemVT.changeVectorElementTypeToInteger());
+  // SVE supports an index scaled by sizeof(MemVT.elt) only, everything else
+  // must be calculated before hand.
+  uint64_t ScaleVal = cast<ConstantSDNode>(Scale)->getZExtValue();
+  if (IsScaled && ScaleVal != MemVT.getScalarStoreSize()) {
+    assert(isPowerOf2_64(ScaleVal) && "Expecting power-of-two types");
+    EVT IndexVT = Index.getValueType();
+    Index = DAG.getNode(ISD::SHL, DL, IndexVT, Index,
+                        DAG.getConstant(Log2_32(ScaleVal), DL, IndexVT));
+    Scale = DAG.getTargetConstant(1, DL, Scale.getValueType());
+
+    SDValue Ops[] = {Chain, StoreVal, Mask, BasePtr, Index, Scale};
+    return DAG.getMaskedScatter(MSC->getVTList(), MemVT, DL, Ops,
+                                MSC->getMemOperand(), IndexType, Truncating);
   }
 
-  if (getGatherScatterIndexIsExtended(Index))
-    Index = Index.getOperand(0);
+  // Lower fixed length scatter to a scalable equivalent.
+  if (VT.isFixedLengthVector()) {
+    assert(Subtarget->useSVEForFixedLengthVectors() &&
+           "Cannot lower when not using SVE for fixed vectors!");
 
-  unsigned Opcode = getScatterVecOpcode(IsScaled, IsSigned, NeedsExtend);
-  selectGatherScatterAddrMode(BasePtr, Index, MemVT, Opcode,
-                              /*isGather=*/false, DAG);
+    // Once bitcast we treat floating-point scatters as if integer.
+    if (VT.isFloatingPoint()) {
+      VT = VT.changeVectorElementTypeToInteger();
+      MemVT = MemVT.changeVectorElementTypeToInteger();
+      StoreVal = DAG.getNode(ISD::BITCAST, DL, VT, StoreVal);
+    }
 
-  if (IsFixedLength) {
-    if (Index.getSimpleValueType().isFixedLengthVector())
-      Index = convertToScalableVector(DAG, IndexVT, Index);
-    if (BasePtr.getSimpleValueType().isFixedLengthVector())
-      BasePtr = convertToScalableVector(DAG, IndexVT, BasePtr);
+    // Find the smallest integer fixed length vector we can use for the scatter.
+    EVT PromotedVT = VT.changeVectorElementType(MVT::i32);
+    if (VT.getVectorElementType() == MVT::i64 ||
+        Index.getValueType().getVectorElementType() == MVT::i64 ||
+        Mask.getValueType().getVectorElementType() == MVT::i64)
+      PromotedVT = VT.changeVectorElementType(MVT::i64);
+
+    // Promote vector operands.
+    unsigned ExtOpcode = IsSigned ? ISD::SIGN_EXTEND : ISD::ZERO_EXTEND;
+    Index = DAG.getNode(ExtOpcode, DL, PromotedVT, Index);
+    Mask = DAG.getNode(ISD::SIGN_EXTEND, DL, PromotedVT, Mask);
+    StoreVal = DAG.getNode(ISD::ANY_EXTEND, DL, PromotedVT, StoreVal);
+
+    // A promoted value type forces the need for a truncating store.
+    if (PromotedVT != VT)
+      Truncating = true;
+
+    EVT ContainerVT = getContainerForFixedLengthVector(DAG, PromotedVT);
+
+    // Convert fixed length vector operands to scalable.
+    MemVT = ContainerVT.changeVectorElementType(MemVT.getVectorElementType());
+    Index = convertToScalableVector(DAG, ContainerVT, Index);
     Mask = convertFixedMaskToScalableVector(Mask, DAG);
+    StoreVal = convertToScalableVector(DAG, ContainerVT, StoreVal);
+
+    // Emit equivalent scalable vector scatter.
+    SDValue Ops[] = {Chain, StoreVal, Mask, BasePtr, Index, Scale};
+    return DAG.getMaskedScatter(MSC->getVTList(), MemVT, DL, Ops,
+                                MSC->getMemOperand(), IndexType, Truncating);
   }
 
-  SDValue Ops[] = {Chain, StoreVal, Mask, BasePtr, Index, InputVT};
-  return DAG.getNode(Opcode, DL, VTs, Ops);
+  // Everything else is legal.
+  return Op;
 }
 
 SDValue AArch64TargetLowering::LowerMLOAD(SDValue Op, SelectionDAG &DAG) const {
@@ -4509,7 +5550,9 @@ SDValue AArch64TargetLowering::LowerMLOAD(SDValue Op, SelectionDAG &DAG) const {
   assert(LoadNode && "Expected custom lowering of a masked load node");
   EVT VT = Op->getValueType(0);
 
-  if (useSVEForFixedLengthVectorVT(VT, true))
+  if (useSVEForFixedLengthVectorVT(
+          VT,
+          /*OverrideNEON=*/Subtarget->useSVEForFixedLengthVectors()))
     return LowerFixedLengthVectorMLoadToSVE(Op, DAG);
 
   SDValue PassThru = LoadNode->getPassThru();
@@ -4576,7 +5619,9 @@ SDValue AArch64TargetLowering::LowerSTORE(SDValue Op,
   EVT MemVT = StoreNode->getMemoryVT();
 
   if (VT.isVector()) {
-    if (useSVEForFixedLengthVectorVT(VT, true))
+    if (useSVEForFixedLengthVectorVT(
+            VT,
+            /*OverrideNEON=*/Subtarget->useSVEForFixedLengthVectors()))
       return LowerFixedLengthVectorStoreToSVE(Op, DAG);
 
     unsigned AS = StoreNode->getAddressSpace();
@@ -4618,18 +5663,7 @@ SDValue AArch64TargetLowering::LowerSTORE(SDValue Op,
       return Result;
     }
   } else if (MemVT == MVT::i128 && StoreNode->isVolatile()) {
-    assert(StoreNode->getValue()->getValueType(0) == MVT::i128);
-    SDValue Lo =
-        DAG.getNode(ISD::EXTRACT_ELEMENT, Dl, MVT::i64, StoreNode->getValue(),
-                    DAG.getConstant(0, Dl, MVT::i64));
-    SDValue Hi =
-        DAG.getNode(ISD::EXTRACT_ELEMENT, Dl, MVT::i64, StoreNode->getValue(),
-                    DAG.getConstant(1, Dl, MVT::i64));
-    SDValue Result = DAG.getMemIntrinsicNode(
-        AArch64ISD::STP, Dl, DAG.getVTList(MVT::Other),
-        {StoreNode->getChain(), Lo, Hi, StoreNode->getBasePtr()},
-        StoreNode->getMemoryVT(), StoreNode->getMemOperand());
-    return Result;
+    return LowerStore128(Op, DAG);
   } else if (MemVT == MVT::i64x8) {
     SDValue Value = StoreNode->getValue();
     assert(Value->getValueType(0) == MVT::i64x8);
@@ -4650,6 +5684,31 @@ SDValue AArch64TargetLowering::LowerSTORE(SDValue Op,
   return SDValue();
 }
 
+/// Lower atomic or volatile 128-bit stores to a single STP instruction.
+SDValue AArch64TargetLowering::LowerStore128(SDValue Op,
+                                             SelectionDAG &DAG) const {
+  MemSDNode *StoreNode = cast<MemSDNode>(Op);
+  assert(StoreNode->getMemoryVT() == MVT::i128);
+  assert(StoreNode->isVolatile() || StoreNode->isAtomic());
+  assert(!StoreNode->isAtomic() ||
+         StoreNode->getMergedOrdering() == AtomicOrdering::Unordered ||
+         StoreNode->getMergedOrdering() == AtomicOrdering::Monotonic);
+
+  SDValue Value = StoreNode->getOpcode() == ISD::STORE
+                      ? StoreNode->getOperand(1)
+                      : StoreNode->getOperand(2);
+  SDLoc DL(Op);
+  SDValue Lo = DAG.getNode(ISD::EXTRACT_ELEMENT, DL, MVT::i64, Value,
+                           DAG.getConstant(0, DL, MVT::i64));
+  SDValue Hi = DAG.getNode(ISD::EXTRACT_ELEMENT, DL, MVT::i64, Value,
+                           DAG.getConstant(1, DL, MVT::i64));
+  SDValue Result = DAG.getMemIntrinsicNode(
+      AArch64ISD::STP, DL, DAG.getVTList(MVT::Other),
+      {StoreNode->getChain(), Lo, Hi, StoreNode->getBasePtr()},
+      StoreNode->getMemoryVT(), StoreNode->getMemOperand());
+  return Result;
+}
+
 SDValue AArch64TargetLowering::LowerLOAD(SDValue Op,
                                          SelectionDAG &DAG) const {
   SDLoc DL(Op);
@@ -4722,6 +5781,22 @@ SDValue AArch64TargetLowering::LowerABS(SDValue Op, SelectionDAG &DAG) const {
                      Cmp.getValue(1));
 }
 
+static SDValue LowerBRCOND(SDValue Op, SelectionDAG &DAG) {
+  SDValue Chain = Op.getOperand(0);
+  SDValue Cond = Op.getOperand(1);
+  SDValue Dest = Op.getOperand(2);
+
+  AArch64CC::CondCode CC;
+  if (SDValue Cmp = emitConjunction(DAG, Cond, CC)) {
+    SDLoc dl(Op);
+    SDValue CCVal = DAG.getConstant(CC, dl, MVT::i32);
+    return DAG.getNode(AArch64ISD::BRCOND, dl, MVT::Other, Chain, Dest, CCVal,
+                       Cmp);
+  }
+
+  return SDValue();
+}
+
 SDValue AArch64TargetLowering::LowerOperation(SDValue Op,
                                               SelectionDAG &DAG) const {
   LLVM_DEBUG(dbgs() << "Custom lowering: ");
@@ -4741,6 +5816,10 @@ SDValue AArch64TargetLowering::LowerOperation(SDValue Op,
   case ISD::STRICT_FSETCC:
   case ISD::STRICT_FSETCCS:
     return LowerSETCC(Op, DAG);
+  case ISD::SETCCCARRY:
+    return LowerSETCCCARRY(Op, DAG);
+  case ISD::BRCOND:
+    return LowerBRCOND(Op, DAG);
   case ISD::BR_CC:
     return LowerBR_CC(Op, DAG);
   case ISD::SELECT:
@@ -4761,11 +5840,14 @@ SDValue AArch64TargetLowering::LowerOperation(SDValue Op,
     return LowerVACOPY(Op, DAG);
   case ISD::VAARG:
     return LowerVAARG(Op, DAG);
-  case ISD::ADDC:
-  case ISD::ADDE:
-  case ISD::SUBC:
-  case ISD::SUBE:
-    return LowerADDC_ADDE_SUBC_SUBE(Op, DAG);
+  case ISD::ADDCARRY:
+    return lowerADDSUBCARRY(Op, DAG, AArch64ISD::ADCS, false /*unsigned*/);
+  case ISD::SUBCARRY:
+    return lowerADDSUBCARRY(Op, DAG, AArch64ISD::SBCS, false /*unsigned*/);
+  case ISD::SADDO_CARRY:
+    return lowerADDSUBCARRY(Op, DAG, AArch64ISD::ADCS, true /*signed*/);
+  case ISD::SSUBO_CARRY:
+    return lowerADDSUBCARRY(Op, DAG, AArch64ISD::SBCS, true /*signed*/);
   case ISD::SADDO:
   case ISD::UADDO:
   case ISD::SSUBO:
@@ -4824,6 +5906,8 @@ SDValue AArch64TargetLowering::LowerOperation(SDValue Op,
     return LowerEXTRACT_VECTOR_ELT(Op, DAG);
   case ISD::BUILD_VECTOR:
     return LowerBUILD_VECTOR(Op, DAG);
+  case ISD::ZERO_EXTEND_VECTOR_INREG:
+    return LowerZERO_EXTEND_VECTOR_INREG(Op, DAG);
   case ISD::VECTOR_SHUFFLE:
     return LowerVECTOR_SHUFFLE(Op, DAG);
   case ISD::SPLAT_VECTOR:
@@ -4836,17 +5920,10 @@ SDValue AArch64TargetLowering::LowerOperation(SDValue Op,
   case ISD::UDIV:
     return LowerDIV(Op, DAG);
   case ISD::SMIN:
-    return LowerToPredicatedOp(Op, DAG, AArch64ISD::SMIN_PRED,
-                               /*OverrideNEON=*/true);
   case ISD::UMIN:
-    return LowerToPredicatedOp(Op, DAG, AArch64ISD::UMIN_PRED,
-                               /*OverrideNEON=*/true);
   case ISD::SMAX:
-    return LowerToPredicatedOp(Op, DAG, AArch64ISD::SMAX_PRED,
-                               /*OverrideNEON=*/true);
   case ISD::UMAX:
-    return LowerToPredicatedOp(Op, DAG, AArch64ISD::UMAX_PRED,
-                               /*OverrideNEON=*/true);
+    return LowerMinMax(Op, DAG);
   case ISD::SRA:
   case ISD::SRL:
   case ISD::SHL:
@@ -4856,7 +5933,8 @@ SDValue AArch64TargetLowering::LowerOperation(SDValue Op,
   case ISD::SRA_PARTS:
     return LowerShiftParts(Op, DAG);
   case ISD::CTPOP:
-    return LowerCTPOP(Op, DAG);
+  case ISD::PARITY:
+    return LowerCTPOP_PARITY(Op, DAG);
   case ISD::FCOPYSIGN:
     return LowerFCOPYSIGN(Op, DAG);
   case ISD::OR:
@@ -4880,20 +5958,28 @@ SDValue AArch64TargetLowering::LowerOperation(SDValue Op,
     return LowerFP_TO_INT_SAT(Op, DAG);
   case ISD::FSINCOS:
     return LowerFSINCOS(Op, DAG);
-  case ISD::FLT_ROUNDS_:
-    return LowerFLT_ROUNDS_(Op, DAG);
+  case ISD::GET_ROUNDING:
+    return LowerGET_ROUNDING(Op, DAG);
   case ISD::SET_ROUNDING:
     return LowerSET_ROUNDING(Op, DAG);
   case ISD::MUL:
     return LowerMUL(Op, DAG);
   case ISD::MULHS:
-    return LowerToPredicatedOp(Op, DAG, AArch64ISD::MULHS_PRED,
-                               /*OverrideNEON=*/true);
+    return LowerToPredicatedOp(Op, DAG, AArch64ISD::MULHS_PRED);
   case ISD::MULHU:
-    return LowerToPredicatedOp(Op, DAG, AArch64ISD::MULHU_PRED,
-                               /*OverrideNEON=*/true);
+    return LowerToPredicatedOp(Op, DAG, AArch64ISD::MULHU_PRED);
+  case ISD::INTRINSIC_W_CHAIN:
+    return LowerINTRINSIC_W_CHAIN(Op, DAG);
   case ISD::INTRINSIC_WO_CHAIN:
     return LowerINTRINSIC_WO_CHAIN(Op, DAG);
+  case ISD::INTRINSIC_VOID:
+    return LowerINTRINSIC_VOID(Op, DAG);
+  case ISD::ATOMIC_STORE:
+    if (cast<MemSDNode>(Op)->getMemoryVT() == MVT::i128) {
+      assert(Subtarget->hasLSE2());
+      return LowerStore128(Op, DAG);
+    }
+    return SDValue();
   case ISD::STORE:
     return LowerSTORE(Op, DAG);
   case ISD::MSTORE:
@@ -4944,15 +6030,14 @@ SDValue AArch64TargetLowering::LowerOperation(SDValue Op,
   case ISD::MLOAD:
     return LowerMLOAD(Op, DAG);
   case ISD::LOAD:
-    if (useSVEForFixedLengthVectorVT(Op.getValueType()))
+    if (useSVEForFixedLengthVectorVT(Op.getValueType(),
+                                     Subtarget->forceStreamingCompatibleSVE()))
       return LowerFixedLengthVectorLoadToSVE(Op, DAG);
     return LowerLOAD(Op, DAG);
   case ISD::ADD:
-    return LowerToPredicatedOp(Op, DAG, AArch64ISD::ADD_PRED);
   case ISD::AND:
-    return LowerToScalableOp(Op, DAG);
   case ISD::SUB:
-    return LowerToPredicatedOp(Op, DAG, AArch64ISD::SUB_PRED);
+    return LowerToScalableOp(Op, DAG);
   case ISD::FMAXIMUM:
     return LowerToPredicatedOp(Op, DAG, AArch64ISD::FMAX_PRED);
   case ISD::FMAXNUM:
@@ -4965,17 +6050,60 @@ SDValue AArch64TargetLowering::LowerOperation(SDValue Op,
     return LowerFixedLengthVectorSelectToSVE(Op, DAG);
   case ISD::ABS:
     return LowerABS(Op, DAG);
+  case ISD::ABDS:
+    return LowerToPredicatedOp(Op, DAG, AArch64ISD::ABDS_PRED);
+  case ISD::ABDU:
+    return LowerToPredicatedOp(Op, DAG, AArch64ISD::ABDU_PRED);
+  case ISD::AVGFLOORS:
+    return LowerToPredicatedOp(Op, DAG, AArch64ISD::HADDS_PRED);
+  case ISD::AVGFLOORU:
+    return LowerToPredicatedOp(Op, DAG, AArch64ISD::HADDU_PRED);
+  case ISD::AVGCEILS:
+    return LowerToPredicatedOp(Op, DAG, AArch64ISD::RHADDS_PRED);
+  case ISD::AVGCEILU:
+    return LowerToPredicatedOp(Op, DAG, AArch64ISD::RHADDU_PRED);
   case ISD::BITREVERSE:
     return LowerBitreverse(Op, DAG);
   case ISD::BSWAP:
     return LowerToPredicatedOp(Op, DAG, AArch64ISD::BSWAP_MERGE_PASSTHRU);
   case ISD::CTLZ:
-    return LowerToPredicatedOp(Op, DAG, AArch64ISD::CTLZ_MERGE_PASSTHRU,
-                               /*OverrideNEON=*/true);
+    return LowerToPredicatedOp(Op, DAG, AArch64ISD::CTLZ_MERGE_PASSTHRU);
   case ISD::CTTZ:
     return LowerCTTZ(Op, DAG);
   case ISD::VECTOR_SPLICE:
     return LowerVECTOR_SPLICE(Op, DAG);
+  case ISD::STRICT_LROUND:
+  case ISD::STRICT_LLROUND:
+  case ISD::STRICT_LRINT:
+  case ISD::STRICT_LLRINT: {
+    assert(Op.getOperand(1).getValueType() == MVT::f16 &&
+           "Expected custom lowering of rounding operations only for f16");
+    SDLoc DL(Op);
+    SDValue Ext = DAG.getNode(ISD::STRICT_FP_EXTEND, DL, {MVT::f32, MVT::Other},
+                              {Op.getOperand(0), Op.getOperand(1)});
+    return DAG.getNode(Op.getOpcode(), DL, {Op.getValueType(), MVT::Other},
+                       {Ext.getValue(1), Ext.getValue(0)});
+  }
+  case ISD::WRITE_REGISTER: {
+    assert(Op.getOperand(2).getValueType() == MVT::i128 &&
+           "WRITE_REGISTER custom lowering is only for 128-bit sysregs");
+    SDLoc DL(Op);
+
+    SDValue Chain = Op.getOperand(0);
+    SDValue SysRegName = Op.getOperand(1);
+    SDValue Pair = Op.getOperand(2);
+
+    SDValue PairLo = DAG.getNode(ISD::EXTRACT_ELEMENT, DL, MVT::i64, Pair,
+                                 DAG.getConstant(0, DL, MVT::i32));
+    SDValue PairHi = DAG.getNode(ISD::EXTRACT_ELEMENT, DL, MVT::i64, Pair,
+                                 DAG.getConstant(1, DL, MVT::i32));
+
+    // chain = MSRR(chain, sysregname, lo, hi)
+    SDValue Result = DAG.getNode(AArch64ISD::MSRR, DL, MVT::Other, Chain,
+                                 SysRegName, PairLo, PairHi);
+
+    return Result;
+  }
   }
 }
 
@@ -4983,12 +6111,13 @@ bool AArch64TargetLowering::mergeStoresAfterLegalization(EVT VT) const {
   return !Subtarget->useSVEForFixedLengthVectors();
 }
 
+bool AArch64TargetLowering::isVScaleKnownToBeAPowerOfTwo() const {
+  return true;
+}
+
 bool AArch64TargetLowering::useSVEForFixedLengthVectorVT(
     EVT VT, bool OverrideNEON) const {
-  if (!Subtarget->useSVEForFixedLengthVectors())
-    return false;
-
-  if (!VT.isFixedLengthVector())
+  if (!VT.isFixedLengthVector() || !VT.isSimple())
     return false;
 
   // Don't use SVE for vectors we cannot scalarize if required.
@@ -5010,12 +6139,16 @@ bool AArch64TargetLowering::useSVEForFixedLengthVectorVT(
 
   // All SVE implementations support NEON sized vectors.
   if (OverrideNEON && (VT.is128BitVector() || VT.is64BitVector()))
-    return true;
+    return Subtarget->hasSVE();
 
   // Ensure NEON MVTs only belong to a single register class.
   if (VT.getFixedSizeInBits() <= 128)
     return false;
 
+  // Ensure wider than NEON code generation is enabled.
+  if (!Subtarget->useSVEForFixedLengthVectors())
+    return false;
+
   // Don't use SVE for types that don't fit.
   if (VT.getFixedSizeInBits() > Subtarget->getMinSVEVectorSizeInBits())
     return false;
@@ -5032,6 +6165,36 @@ bool AArch64TargetLowering::useSVEForFixedLengthVectorVT(
 //                      Calling Convention Implementation
 //===----------------------------------------------------------------------===//
 
+static unsigned getIntrinsicID(const SDNode *N) {
+  unsigned Opcode = N->getOpcode();
+  switch (Opcode) {
+  default:
+    return Intrinsic::not_intrinsic;
+  case ISD::INTRINSIC_WO_CHAIN: {
+    unsigned IID = cast<ConstantSDNode>(N->getOperand(0))->getZExtValue();
+    if (IID < Intrinsic::num_intrinsics)
+      return IID;
+    return Intrinsic::not_intrinsic;
+  }
+  }
+}
+
+bool AArch64TargetLowering::isReassocProfitable(SelectionDAG &DAG, SDValue N0,
+                                                SDValue N1) const {
+  if (!N0.hasOneUse())
+    return false;
+
+  unsigned IID = getIntrinsicID(N1.getNode());
+  // Avoid reassociating expressions that can be lowered to smlal/umlal.
+  if (IID == Intrinsic::aarch64_neon_umull ||
+      N1.getOpcode() == AArch64ISD::UMULL ||
+      IID == Intrinsic::aarch64_neon_smull ||
+      N1.getOpcode() == AArch64ISD::SMULL)
+    return N0.getOpcode() != ISD::ADD;
+
+  return true;
+}
+
 /// Selects the correct CCAssignFn for a given CallingConvention value.
 CCAssignFn *AArch64TargetLowering::CCAssignFnForCall(CallingConv::ID CC,
                                                      bool IsVarArg) const {
@@ -5049,8 +6212,11 @@ CCAssignFn *AArch64TargetLowering::CCAssignFnForCall(CallingConv::ID CC,
   case CallingConv::Swift:
   case CallingConv::SwiftTail:
   case CallingConv::Tail:
-    if (Subtarget->isTargetWindows() && IsVarArg)
+    if (Subtarget->isTargetWindows() && IsVarArg) {
+      if (Subtarget->isWindowsArm64EC())
+        return CC_AArch64_Arm64EC_VarArg;
       return CC_AArch64_Win64_VarArg;
+    }
     if (!Subtarget->isTargetDarwin())
       return CC_AArch64_AAPCS;
     if (!IsVarArg)
@@ -5058,11 +6224,18 @@ CCAssignFn *AArch64TargetLowering::CCAssignFnForCall(CallingConv::ID CC,
     return Subtarget->isTargetILP32() ? CC_AArch64_DarwinPCS_ILP32_VarArg
                                       : CC_AArch64_DarwinPCS_VarArg;
    case CallingConv::Win64:
-    return IsVarArg ? CC_AArch64_Win64_VarArg : CC_AArch64_AAPCS;
+     if (IsVarArg) {
+       if (Subtarget->isWindowsArm64EC())
+         return CC_AArch64_Arm64EC_VarArg;
+       return CC_AArch64_Win64_VarArg;
+     }
+     return CC_AArch64_AAPCS;
    case CallingConv::CFGuard_Check:
      return CC_AArch64_Win64_CFGuard_Check;
    case CallingConv::AArch64_VectorCall:
    case CallingConv::AArch64_SVE_VectorCall:
+   case CallingConv::AArch64_SME_ABI_Support_Routines_PreserveMost_From_X0:
+   case CallingConv::AArch64_SME_ABI_Support_Routines_PreserveMost_From_X2:
      return CC_AArch64_AAPCS;
   }
 }
@@ -5073,19 +6246,56 @@ AArch64TargetLowering::CCAssignFnForReturn(CallingConv::ID CC) const {
                                       : RetCC_AArch64_AAPCS;
 }
 
+
+unsigned
+AArch64TargetLowering::allocateLazySaveBuffer(SDValue &Chain, const SDLoc &DL,
+                                              SelectionDAG &DAG) const {
+  MachineFunction &MF = DAG.getMachineFunction();
+  MachineFrameInfo &MFI = MF.getFrameInfo();
+
+  // Allocate a lazy-save buffer object of size SVL.B * SVL.B (worst-case)
+  SDValue N = DAG.getNode(AArch64ISD::RDSVL, DL, MVT::i64,
+                          DAG.getConstant(1, DL, MVT::i32));
+  SDValue NN = DAG.getNode(ISD::MUL, DL, MVT::i64, N, N);
+  SDValue Ops[] = {Chain, NN, DAG.getConstant(1, DL, MVT::i64)};
+  SDVTList VTs = DAG.getVTList(MVT::i64, MVT::Other);
+  SDValue Buffer = DAG.getNode(ISD::DYNAMIC_STACKALLOC, DL, VTs, Ops);
+  Chain = Buffer.getValue(1);
+  MFI.CreateVariableSizedObject(Align(1), nullptr);
+
+  // Allocate an additional TPIDR2 object on the stack (16 bytes)
+  unsigned TPIDR2Obj = MFI.CreateStackObject(16, Align(16), false);
+
+  // Store the buffer pointer to the TPIDR2 stack object.
+  MachinePointerInfo MPI = MachinePointerInfo::getStack(MF, TPIDR2Obj);
+  SDValue Ptr = DAG.getFrameIndex(
+      TPIDR2Obj,
+      DAG.getTargetLoweringInfo().getFrameIndexTy(DAG.getDataLayout()));
+  Chain = DAG.getStore(Chain, DL, Buffer, Ptr, MPI);
+
+  return TPIDR2Obj;
+}
+
 SDValue AArch64TargetLowering::LowerFormalArguments(
     SDValue Chain, CallingConv::ID CallConv, bool isVarArg,
     const SmallVectorImpl<ISD::InputArg> &Ins, const SDLoc &DL,
     SelectionDAG &DAG, SmallVectorImpl<SDValue> &InVals) const {
   MachineFunction &MF = DAG.getMachineFunction();
+  const Function &F = MF.getFunction();
   MachineFrameInfo &MFI = MF.getFrameInfo();
-  bool IsWin64 = Subtarget->isCallingConvWin64(MF.getFunction().getCallingConv());
+  bool IsWin64 = Subtarget->isCallingConvWin64(F.getCallingConv());
+  AArch64FunctionInfo *FuncInfo = MF.getInfo<AArch64FunctionInfo>();
+
+  SmallVector<ISD::OutputArg, 4> Outs;
+  GetReturnInfo(CallConv, F.getReturnType(), F.getAttributes(), Outs,
+                DAG.getTargetLoweringInfo(), MF.getDataLayout());
+  if (any_of(Outs, [](ISD::OutputArg &Out){ return Out.VT.isScalableVector(); }))
+    FuncInfo->setIsSVECC(true);
 
   // Assign locations to all of the incoming arguments.
   SmallVector<CCValAssign, 16> ArgLocs;
   DenseMap<unsigned, SDValue> CopiedRegs;
-  CCState CCInfo(CallConv, isVarArg, DAG.getMachineFunction(), ArgLocs,
-                 *DAG.getContext());
+  CCState CCInfo(CallConv, isVarArg, MF, ArgLocs, *DAG.getContext());
 
   // At this point, Ins[].VT may already be promoted to i32. To correctly
   // handle passing i8 as i8 instead of i32 on stack, we pass in both i32 and
@@ -5094,7 +6304,7 @@ SDValue AArch64TargetLowering::LowerFormalArguments(
   // we use a special version of AnalyzeFormalArguments to pass in ValVT and
   // LocVT.
   unsigned NumArgs = Ins.size();
-  Function::const_arg_iterator CurOrigArg = MF.getFunction().arg_begin();
+  Function::const_arg_iterator CurOrigArg = F.arg_begin();
   unsigned CurArgIdx = 0;
   for (unsigned i = 0; i != NumArgs; ++i) {
     MVT ValVT = Ins[i].VT;
@@ -5121,6 +6331,13 @@ SDValue AArch64TargetLowering::LowerFormalArguments(
     assert(!Res && "Call operand has unhandled type");
     (void)Res;
   }
+
+  SMEAttrs Attrs(MF.getFunction());
+  bool IsLocallyStreaming =
+      !Attrs.hasStreamingInterface() && Attrs.hasStreamingBody();
+  assert(Chain.getOpcode() == ISD::EntryToken && "Unexpected Chain value");
+  SDValue Glue = Chain.getValue(1);
+
   SmallVector<SDValue, 16> ArgValues;
   unsigned ExtraArgLocs = 0;
   for (unsigned i = 0, e = Ins.size(); i != e; ++i) {
@@ -5165,16 +6382,33 @@ SDValue AArch64TargetLowering::LowerFormalArguments(
       else if (RegVT == MVT::f128 || RegVT.is128BitVector())
         RC = &AArch64::FPR128RegClass;
       else if (RegVT.isScalableVector() &&
-               RegVT.getVectorElementType() == MVT::i1)
+               RegVT.getVectorElementType() == MVT::i1) {
+        FuncInfo->setIsSVECC(true);
         RC = &AArch64::PPRRegClass;
-      else if (RegVT.isScalableVector())
+      } else if (RegVT.isScalableVector()) {
+        FuncInfo->setIsSVECC(true);
         RC = &AArch64::ZPRRegClass;
-      else
+      } else
         llvm_unreachable("RegVT not supported by FORMAL_ARGUMENTS Lowering");
 
       // Transform the arguments in physical registers into virtual ones.
-      unsigned Reg = MF.addLiveIn(VA.getLocReg(), RC);
-      ArgValue = DAG.getCopyFromReg(Chain, DL, Reg, RegVT);
+      Register Reg = MF.addLiveIn(VA.getLocReg(), RC);
+
+      if (IsLocallyStreaming) {
+        // LocallyStreamingFunctions must insert the SMSTART in the correct
+        // position, so we use Glue to ensure no instructions can be scheduled
+        // between the chain of:
+        //        t0: ch,glue = EntryNode
+        //      t1:  res,ch,glue = CopyFromReg
+        //     ...
+        //   tn: res,ch,glue = CopyFromReg t(n-1), ..
+        // t(n+1): ch, glue = SMSTART t0:0, ...., tn:2
+        // ^^^^^^
+        // This will be the new Chain/Root node.
+        ArgValue = DAG.getCopyFromReg(Chain, DL, Reg, RegVT, Glue);
+        Glue = ArgValue.getValue(2);
+      } else
+        ArgValue = DAG.getCopyFromReg(Chain, DL, Reg, RegVT);
 
       // If this is an 8, 16 or 32-bit value, it is really passed promoted
       // to 64 bits.  Insert an assert[sz]ext to capture this, then
@@ -5185,8 +6419,9 @@ SDValue AArch64TargetLowering::LowerFormalArguments(
       case CCValAssign::Full:
         break;
       case CCValAssign::Indirect:
-        assert(VA.getValVT().isScalableVector() &&
-               "Only scalable vectors can be passed indirectly");
+        assert((VA.getValVT().isScalableVector() ||
+                Subtarget->isWindowsArm64EC()) &&
+               "Indirect arguments should be scalable on most subtargets");
         break;
       case CCValAssign::BCvt:
         ArgValue = DAG.getNode(ISD::BITCAST, DL, VA.getValVT(), ArgValue);
@@ -5213,10 +6448,24 @@ SDValue AArch64TargetLowering::LowerFormalArguments(
           !Ins[i].Flags.isInConsecutiveRegs())
         BEAlign = 8 - ArgSize;
 
-      int FI = MFI.CreateFixedObject(ArgSize, ArgOffset + BEAlign, true);
+      SDValue FIN;
+      MachinePointerInfo PtrInfo;
+      if (isVarArg && Subtarget->isWindowsArm64EC()) {
+        // In the ARM64EC varargs convention, fixed arguments on the stack are
+        // accessed relative to x4, not sp.
+        unsigned ObjOffset = ArgOffset + BEAlign;
+        Register VReg = MF.addLiveIn(AArch64::X4, &AArch64::GPR64RegClass);
+        SDValue Val = DAG.getCopyFromReg(Chain, DL, VReg, MVT::i64);
+        FIN = DAG.getNode(ISD::ADD, DL, MVT::i64, Val,
+                          DAG.getConstant(ObjOffset, DL, MVT::i64));
+        PtrInfo = MachinePointerInfo::getUnknownStack(MF);
+      } else {
+        int FI = MFI.CreateFixedObject(ArgSize, ArgOffset + BEAlign, true);
 
-      // Create load nodes to retrieve arguments from the stack.
-      SDValue FIN = DAG.getFrameIndex(FI, getPointerTy(DAG.getDataLayout()));
+        // Create load nodes to retrieve arguments from the stack.
+        FIN = DAG.getFrameIndex(FI, getPointerTy(DAG.getDataLayout()));
+        PtrInfo = MachinePointerInfo::getFixedStack(MF, FI);
+      }
 
       // For NON_EXTLOAD, generic code in getLoad assert(ValVT == MemVT)
       ISD::LoadExtType ExtType = ISD::NON_EXTLOAD;
@@ -5230,8 +6479,9 @@ SDValue AArch64TargetLowering::LowerFormalArguments(
         MemVT = VA.getLocVT();
         break;
       case CCValAssign::Indirect:
-        assert(VA.getValVT().isScalableVector() &&
-               "Only scalable vectors can be passed indirectly");
+        assert((VA.getValVT().isScalableVector() ||
+                Subtarget->isWindowsArm64EC()) &&
+               "Indirect arguments should be scalable on most subtargets");
         MemVT = VA.getLocVT();
         break;
       case CCValAssign::SExt:
@@ -5245,17 +6495,16 @@ SDValue AArch64TargetLowering::LowerFormalArguments(
         break;
       }
 
-      ArgValue = DAG.getExtLoad(
-          ExtType, DL, VA.getLocVT(), Chain, FIN,
-          MachinePointerInfo::getFixedStack(DAG.getMachineFunction(), FI),
-          MemVT);
+      ArgValue = DAG.getExtLoad(ExtType, DL, VA.getLocVT(), Chain, FIN, PtrInfo,
+                                MemVT);
     }
 
     if (VA.getLocInfo() == CCValAssign::Indirect) {
-      assert(VA.getValVT().isScalableVector() &&
-           "Only scalable vectors can be passed indirectly");
+      assert(
+          (VA.getValVT().isScalableVector() || Subtarget->isWindowsArm64EC()) &&
+          "Indirect arguments should be scalable on most subtargets");
 
-      uint64_t PartSize = VA.getValVT().getStoreSize().getKnownMinSize();
+      uint64_t PartSize = VA.getValVT().getStoreSize().getKnownMinValue();
       unsigned NumParts = 1;
       if (Ins[i].Flags.isInConsecutiveRegs()) {
         assert(!Ins[i].Flags.isInConsecutiveRegsLast());
@@ -5273,9 +6522,16 @@ SDValue AArch64TargetLowering::LowerFormalArguments(
         InVals.push_back(ArgValue);
         NumParts--;
         if (NumParts > 0) {
-          SDValue BytesIncrement = DAG.getVScale(
-              DL, Ptr.getValueType(),
-              APInt(Ptr.getValueSizeInBits().getFixedSize(), PartSize));
+          SDValue BytesIncrement;
+          if (PartLoad.isScalableVector()) {
+            BytesIncrement = DAG.getVScale(
+                DL, Ptr.getValueType(),
+                APInt(Ptr.getValueSizeInBits().getFixedValue(), PartSize));
+          } else {
+            BytesIncrement = DAG.getConstant(
+                APInt(Ptr.getValueSizeInBits().getFixedValue(), PartSize), DL,
+                Ptr.getValueType());
+          }
           SDNodeFlags Flags;
           Flags.setNoUnsignedWrap(true);
           Ptr = DAG.getNode(ISD::ADD, DL, Ptr.getValueType(), Ptr,
@@ -5288,13 +6544,46 @@ SDValue AArch64TargetLowering::LowerFormalArguments(
       if (Subtarget->isTargetILP32() && Ins[i].Flags.isPointer())
         ArgValue = DAG.getNode(ISD::AssertZext, DL, ArgValue.getValueType(),
                                ArgValue, DAG.getValueType(MVT::i32));
+
+      // i1 arguments are zero-extended to i8 by the caller. Emit a
+      // hint to reflect this.
+      if (Ins[i].isOrigArg()) {
+        Argument *OrigArg = F.getArg(Ins[i].getOrigArgIndex());
+        if (OrigArg->getType()->isIntegerTy(1)) {
+          if (!Ins[i].Flags.isZExt()) {
+            ArgValue = DAG.getNode(AArch64ISD::ASSERT_ZEXT_BOOL, DL,
+                                   ArgValue.getValueType(), ArgValue);
+          }
+        }
+      }
+
       InVals.push_back(ArgValue);
     }
   }
   assert((ArgLocs.size() + ExtraArgLocs) == Ins.size());
 
+  // Insert the SMSTART if this is a locally streaming function and
+  // make sure it is Glued to the last CopyFromReg value.
+  if (IsLocallyStreaming) {
+    const AArch64RegisterInfo *TRI = Subtarget->getRegisterInfo();
+    Chain = DAG.getNode(
+        AArch64ISD::SMSTART, DL, DAG.getVTList(MVT::Other, MVT::Glue),
+        {DAG.getRoot(),
+          DAG.getTargetConstant((int32_t)AArch64SVCR::SVCRSM, DL, MVT::i32),
+         DAG.getConstant(0, DL, MVT::i64), DAG.getConstant(1, DL, MVT::i64),
+         DAG.getRegisterMask(TRI->getSMStartStopCallPreservedMask()), Glue});
+    // Ensure that the SMSTART happens after the CopyWithChain such that its
+    // chain result is used.
+    for (unsigned I=0; I<InVals.size(); ++I) {
+      Register Reg = MF.getRegInfo().createVirtualRegister(
+          getRegClassFor(InVals[I].getValueType().getSimpleVT()));
+      Chain = DAG.getCopyToReg(Chain, DL, Reg, InVals[I]);
+      InVals[I] = DAG.getCopyFromReg(Chain, DL, Reg,
+                                     InVals[I].getValueType());
+    }
+  }
+
   // varargs
-  AArch64FunctionInfo *FuncInfo = MF.getInfo<AArch64FunctionInfo>();
   if (isVarArg) {
     if (!Subtarget->isTargetDarwin() || IsWin64) {
       // The AAPCS variadic function ABI is identical to the non-variadic
@@ -5309,6 +6598,7 @@ SDValue AArch64TargetLowering::LowerFormalArguments(
     unsigned StackOffset = CCInfo.getNextStackOffset();
     // We currently pass all varargs at 8-byte alignment, or 4 for ILP32
     StackOffset = alignTo(StackOffset, Subtarget->isTargetILP32() ? 4 : 8);
+    FuncInfo->setVarArgsStackOffset(StackOffset);
     FuncInfo->setVarArgsStackIndex(MFI.CreateFixedObject(4, StackOffset, true));
 
     if (MFI.hasMustTailInVarArgFunc()) {
@@ -5323,7 +6613,7 @@ SDValue AArch64TargetLowering::LowerFormalArguments(
 
       // Conservatively forward X8, since it might be used for aggregate return.
       if (!CCInfo.isAllocated(AArch64::X8)) {
-        unsigned X8VReg = MF.addLiveIn(AArch64::X8, &AArch64::GPR64RegClass);
+        Register X8VReg = MF.addLiveIn(AArch64::X8, &AArch64::GPR64RegClass);
         Forwards.push_back(ForwardedRegister(X8VReg, AArch64::X8, MVT::i64));
       }
     }
@@ -5334,7 +6624,7 @@ SDValue AArch64TargetLowering::LowerFormalArguments(
   // epilogue.
   if (IsWin64) {
     for (unsigned I = 0, E = Ins.size(); I != E; ++I) {
-      if (Ins[I].Flags.isInReg()) {
+      if (Ins[I].Flags.isInReg() && Ins[I].Flags.isSRet()) {
         assert(!FuncInfo->getSRetReturnReg());
 
         MVT PtrTy = getPointerTy(DAG.getDataLayout());
@@ -5372,6 +6662,12 @@ SDValue AArch64TargetLowering::LowerFormalArguments(
   if (Subtarget->hasCustomCallingConv())
     Subtarget->getRegisterInfo()->UpdateCustomCalleeSavedRegs(MF);
 
+  // Conservatively assume the function requires the lazy-save mechanism.
+  if (SMEAttrs(MF.getFunction()).hasZAState()) {
+    unsigned TPIDR2Obj = allocateLazySaveBuffer(Chain, DL, DAG);
+    FuncInfo->setLazySaveTPIDR2Obj(TPIDR2Obj);
+  }
+
   return Chain;
 }
 
@@ -5390,7 +6686,12 @@ void AArch64TargetLowering::saveVarArgRegisters(CCState &CCInfo,
   static const MCPhysReg GPRArgRegs[] = { AArch64::X0, AArch64::X1, AArch64::X2,
                                           AArch64::X3, AArch64::X4, AArch64::X5,
                                           AArch64::X6, AArch64::X7 };
-  static const unsigned NumGPRArgRegs = array_lengthof(GPRArgRegs);
+  unsigned NumGPRArgRegs = std::size(GPRArgRegs);
+  if (Subtarget->isWindowsArm64EC()) {
+    // In the ARM64EC ABI, only x0-x3 are used to pass arguments to varargs
+    // functions.
+    NumGPRArgRegs = 4;
+  }
   unsigned FirstVariadicGPR = CCInfo.getFirstUnallocated(GPRArgRegs);
 
   unsigned GPRSaveSize = 8 * (NumGPRArgRegs - FirstVariadicGPR);
@@ -5404,18 +6705,28 @@ void AArch64TargetLowering::saveVarArgRegisters(CCState &CCInfo,
     } else
       GPRIdx = MFI.CreateStackObject(GPRSaveSize, Align(8), false);
 
-    SDValue FIN = DAG.getFrameIndex(GPRIdx, PtrVT);
+    SDValue FIN;
+    if (Subtarget->isWindowsArm64EC()) {
+      // With the Arm64EC ABI, we reserve the save area as usual, but we
+      // compute its address relative to x4.  For a normal AArch64->AArch64
+      // call, x4 == sp on entry, but calls from an entry thunk can pass in a
+      // different address.
+      Register VReg = MF.addLiveIn(AArch64::X4, &AArch64::GPR64RegClass);
+      SDValue Val = DAG.getCopyFromReg(Chain, DL, VReg, MVT::i64);
+      FIN = DAG.getNode(ISD::SUB, DL, MVT::i64, Val,
+                        DAG.getConstant(GPRSaveSize, DL, MVT::i64));
+    } else {
+      FIN = DAG.getFrameIndex(GPRIdx, PtrVT);
+    }
 
     for (unsigned i = FirstVariadicGPR; i < NumGPRArgRegs; ++i) {
-      unsigned VReg = MF.addLiveIn(GPRArgRegs[i], &AArch64::GPR64RegClass);
+      Register VReg = MF.addLiveIn(GPRArgRegs[i], &AArch64::GPR64RegClass);
       SDValue Val = DAG.getCopyFromReg(Chain, DL, VReg, MVT::i64);
-      SDValue Store = DAG.getStore(
-          Val.getValue(1), DL, Val, FIN,
-          IsWin64
-              ? MachinePointerInfo::getFixedStack(DAG.getMachineFunction(),
-                                                  GPRIdx,
-                                                  (i - FirstVariadicGPR) * 8)
-              : MachinePointerInfo::getStack(DAG.getMachineFunction(), i * 8));
+      SDValue Store =
+          DAG.getStore(Val.getValue(1), DL, Val, FIN,
+                       IsWin64 ? MachinePointerInfo::getFixedStack(
+                                     MF, GPRIdx, (i - FirstVariadicGPR) * 8)
+                               : MachinePointerInfo::getStack(MF, i * 8));
       MemOps.push_back(Store);
       FIN =
           DAG.getNode(ISD::ADD, DL, PtrVT, FIN, DAG.getConstant(8, DL, PtrVT));
@@ -5428,7 +6739,7 @@ void AArch64TargetLowering::saveVarArgRegisters(CCState &CCInfo,
     static const MCPhysReg FPRArgRegs[] = {
         AArch64::Q0, AArch64::Q1, AArch64::Q2, AArch64::Q3,
         AArch64::Q4, AArch64::Q5, AArch64::Q6, AArch64::Q7};
-    static const unsigned NumFPRArgRegs = array_lengthof(FPRArgRegs);
+    static const unsigned NumFPRArgRegs = std::size(FPRArgRegs);
     unsigned FirstVariadicFPR = CCInfo.getFirstUnallocated(FPRArgRegs);
 
     unsigned FPRSaveSize = 16 * (NumFPRArgRegs - FirstVariadicFPR);
@@ -5439,12 +6750,11 @@ void AArch64TargetLowering::saveVarArgRegisters(CCState &CCInfo,
       SDValue FIN = DAG.getFrameIndex(FPRIdx, PtrVT);
 
       for (unsigned i = FirstVariadicFPR; i < NumFPRArgRegs; ++i) {
-        unsigned VReg = MF.addLiveIn(FPRArgRegs[i], &AArch64::FPR128RegClass);
+        Register VReg = MF.addLiveIn(FPRArgRegs[i], &AArch64::FPR128RegClass);
         SDValue Val = DAG.getCopyFromReg(Chain, DL, VReg, MVT::f128);
 
-        SDValue Store = DAG.getStore(
-            Val.getValue(1), DL, Val, FIN,
-            MachinePointerInfo::getStack(DAG.getMachineFunction(), i * 16));
+        SDValue Store = DAG.getStore(Val.getValue(1), DL, Val, FIN,
+                                     MachinePointerInfo::getStack(MF, i * 16));
         MemOps.push_back(Store);
         FIN = DAG.getNode(ISD::ADD, DL, PtrVT, FIN,
                           DAG.getConstant(16, DL, PtrVT));
@@ -5463,17 +6773,10 @@ void AArch64TargetLowering::saveVarArgRegisters(CCState &CCInfo,
 /// appropriate copies out of appropriate physical registers.
 SDValue AArch64TargetLowering::LowerCallResult(
     SDValue Chain, SDValue InFlag, CallingConv::ID CallConv, bool isVarArg,
-    const SmallVectorImpl<ISD::InputArg> &Ins, const SDLoc &DL,
+    const SmallVectorImpl<CCValAssign> &RVLocs, const SDLoc &DL,
     SelectionDAG &DAG, SmallVectorImpl<SDValue> &InVals, bool isThisReturn,
     SDValue ThisVal) const {
-  CCAssignFn *RetCC = CCAssignFnForReturn(CallConv);
-  // Assign locations to each value returned by this call.
-  SmallVector<CCValAssign, 16> RVLocs;
   DenseMap<unsigned, SDValue> CopiedRegs;
-  CCState CCInfo(CallConv, isVarArg, DAG.getMachineFunction(), RVLocs,
-                 *DAG.getContext());
-  CCInfo.AnalyzeCallResult(Ins, RetCC);
-
   // Copy all of the result registers out of their specified physreg.
   for (unsigned i = 0; i != RVLocs.size(); ++i) {
     CCValAssign VA = RVLocs[i];
@@ -5509,9 +6812,9 @@ SDValue AArch64TargetLowering::LowerCallResult(
     case CCValAssign::AExtUpper:
       Val = DAG.getNode(ISD::SRL, DL, VA.getLocVT(), Val,
                         DAG.getConstant(32, DL, VA.getLocVT()));
-      LLVM_FALLTHROUGH;
+      [[fallthrough]];
     case CCValAssign::AExt:
-      LLVM_FALLTHROUGH;
+      [[fallthrough]];
     case CCValAssign::ZExt:
       Val = DAG.getZExtOrTrunc(Val, DL, VA.getValVT());
       break;
@@ -5545,24 +6848,82 @@ static bool mayTailCallThisCC(CallingConv::ID CC) {
   }
 }
 
+static void analyzeCallOperands(const AArch64TargetLowering &TLI,
+                                const AArch64Subtarget *Subtarget,
+                                const TargetLowering::CallLoweringInfo &CLI,
+                                CCState &CCInfo) {
+  const SelectionDAG &DAG = CLI.DAG;
+  CallingConv::ID CalleeCC = CLI.CallConv;
+  bool IsVarArg = CLI.IsVarArg;
+  const SmallVector<ISD::OutputArg, 32> &Outs = CLI.Outs;
+  bool IsCalleeWin64 = Subtarget->isCallingConvWin64(CalleeCC);
+
+  unsigned NumArgs = Outs.size();
+  for (unsigned i = 0; i != NumArgs; ++i) {
+    MVT ArgVT = Outs[i].VT;
+    ISD::ArgFlagsTy ArgFlags = Outs[i].Flags;
+
+    bool UseVarArgCC = false;
+    if (IsVarArg) {
+      // On Windows, the fixed arguments in a vararg call are passed in GPRs
+      // too, so use the vararg CC to force them to integer registers.
+      if (IsCalleeWin64) {
+        UseVarArgCC = true;
+      } else {
+        UseVarArgCC = !Outs[i].IsFixed;
+      }
+    }
+
+    if (!UseVarArgCC) {
+      // Get type of the original argument.
+      EVT ActualVT =
+          TLI.getValueType(DAG.getDataLayout(), CLI.Args[Outs[i].OrigArgIndex].Ty,
+                       /*AllowUnknown*/ true);
+      MVT ActualMVT = ActualVT.isSimple() ? ActualVT.getSimpleVT() : ArgVT;
+      // If ActualMVT is i1/i8/i16, we should set LocVT to i8/i8/i16.
+      if (ActualMVT == MVT::i1 || ActualMVT == MVT::i8)
+        ArgVT = MVT::i8;
+      else if (ActualMVT == MVT::i16)
+        ArgVT = MVT::i16;
+    }
+
+    CCAssignFn *AssignFn = TLI.CCAssignFnForCall(CalleeCC, UseVarArgCC);
+    bool Res = AssignFn(i, ArgVT, ArgVT, CCValAssign::Full, ArgFlags, CCInfo);
+    assert(!Res && "Call operand has unhandled type");
+    (void)Res;
+  }
+}
+
 bool AArch64TargetLowering::isEligibleForTailCallOptimization(
-    SDValue Callee, CallingConv::ID CalleeCC, bool isVarArg,
-    const SmallVectorImpl<ISD::OutputArg> &Outs,
-    const SmallVectorImpl<SDValue> &OutVals,
-    const SmallVectorImpl<ISD::InputArg> &Ins, SelectionDAG &DAG) const {
+    const CallLoweringInfo &CLI) const {
+  CallingConv::ID CalleeCC = CLI.CallConv;
   if (!mayTailCallThisCC(CalleeCC))
     return false;
 
+  SDValue Callee = CLI.Callee;
+  bool IsVarArg = CLI.IsVarArg;
+  const SmallVector<ISD::OutputArg, 32> &Outs = CLI.Outs;
+  const SmallVector<SDValue, 32> &OutVals = CLI.OutVals;
+  const SmallVector<ISD::InputArg, 32> &Ins = CLI.Ins;
+  const SelectionDAG &DAG = CLI.DAG;
   MachineFunction &MF = DAG.getMachineFunction();
   const Function &CallerF = MF.getFunction();
   CallingConv::ID CallerCC = CallerF.getCallingConv();
 
+  // SME Streaming functions are not eligible for TCO as they may require
+  // the streaming mode or ZA to be restored after returning from the call.
+  SMEAttrs CallerAttrs(MF.getFunction());
+  auto CalleeAttrs = CLI.CB ? SMEAttrs(*CLI.CB) : SMEAttrs(SMEAttrs::Normal);
+  if (CallerAttrs.requiresSMChange(CalleeAttrs) ||
+      CallerAttrs.requiresLazySave(CalleeAttrs))
+    return false;
+
   // Functions using the C or Fast calling convention that have an SVE signature
   // preserve more registers and should assume the SVE_VectorCall CC.
   // The check for matching callee-saved regs will determine whether it is
   // eligible for TCO.
   if ((CallerCC == CallingConv::C || CallerCC == CallingConv::Fast) &&
-      AArch64RegisterInfo::hasSVEArgsOrReturn(&MF))
+      MF.getInfo<AArch64FunctionInfo>()->isSVECC())
     CallerCC = CallingConv::AArch64_SVE_VectorCall;
 
   bool CCMatch = CallerCC == CalleeCC;
@@ -5617,30 +6978,14 @@ bool AArch64TargetLowering::isEligibleForTailCallOptimization(
 
   // I want anyone implementing a new calling convention to think long and hard
   // about this assert.
-  assert((!isVarArg || CalleeCC == CallingConv::C) &&
+  assert((!IsVarArg || CalleeCC == CallingConv::C) &&
          "Unexpected variadic calling convention");
 
   LLVMContext &C = *DAG.getContext();
-  if (isVarArg && !Outs.empty()) {
-    // At least two cases here: if caller is fastcc then we can't have any
-    // memory arguments (we'd be expected to clean up the stack afterwards). If
-    // caller is C then we could potentially use its argument area.
-
-    // FIXME: for now we take the most conservative of these in both cases:
-    // disallow all variadic memory operands.
-    SmallVector<CCValAssign, 16> ArgLocs;
-    CCState CCInfo(CalleeCC, isVarArg, MF, ArgLocs, C);
-
-    CCInfo.AnalyzeCallOperands(Outs, CCAssignFnForCall(CalleeCC, true));
-    for (const CCValAssign &ArgLoc : ArgLocs)
-      if (!ArgLoc.isRegLoc())
-        return false;
-  }
-
   // Check that the call results are passed in the same way.
   if (!CCState::resultsCompatible(CalleeCC, CallerCC, MF, C, Ins,
-                                  CCAssignFnForCall(CalleeCC, isVarArg),
-                                  CCAssignFnForCall(CallerCC, isVarArg)))
+                                  CCAssignFnForCall(CalleeCC, IsVarArg),
+                                  CCAssignFnForCall(CallerCC, IsVarArg)))
     return false;
   // The callee has to preserve all registers the caller needs to preserve.
   const AArch64RegisterInfo *TRI = Subtarget->getRegisterInfo();
@@ -5660,9 +7005,22 @@ bool AArch64TargetLowering::isEligibleForTailCallOptimization(
     return true;
 
   SmallVector<CCValAssign, 16> ArgLocs;
-  CCState CCInfo(CalleeCC, isVarArg, MF, ArgLocs, C);
+  CCState CCInfo(CalleeCC, IsVarArg, MF, ArgLocs, C);
 
-  CCInfo.AnalyzeCallOperands(Outs, CCAssignFnForCall(CalleeCC, isVarArg));
+  analyzeCallOperands(*this, Subtarget, CLI, CCInfo);
+
+  if (IsVarArg && !(CLI.CB && CLI.CB->isMustTailCall())) {
+    // When we are musttail, additional checks have been done and we can safely ignore this check
+    // At least two cases here: if caller is fastcc then we can't have any
+    // memory arguments (we'd be expected to clean up the stack afterwards). If
+    // caller is C then we could potentially use its argument area.
+
+    // FIXME: for now we take the most conservative of these in both cases:
+    // disallow all variadic memory operands.
+    for (const CCValAssign &ArgLoc : ArgLocs)
+      if (!ArgLoc.isRegLoc())
+        return false;
+  }
 
   const AArch64FunctionInfo *FuncInfo = MF.getInfo<AArch64FunctionInfo>();
 
@@ -5670,9 +7028,10 @@ bool AArch64TargetLowering::isEligibleForTailCallOptimization(
   // 'getBytesInStackArgArea' is not sufficient to determine whether we need to
   // allocate space on the stack. That is why we determine this explicitly here
   // the call cannot be a tailcall.
-  if (llvm::any_of(ArgLocs, [](CCValAssign &A) {
+  if (llvm::any_of(ArgLocs, [&](CCValAssign &A) {
         assert((A.getLocInfo() != CCValAssign::Indirect ||
-                A.getValVT().isScalableVector()) &&
+                A.getValVT().isScalableVector() ||
+                Subtarget->isWindowsArm64EC()) &&
                "Expected value to be scalable");
         return A.getLocInfo() == CCValAssign::Indirect;
       }))
@@ -5704,10 +7063,8 @@ SDValue AArch64TargetLowering::addTokenForArgument(SDValue Chain,
   ArgChains.push_back(Chain);
 
   // Add a chain value for each stack argument corresponding
-  for (SDNode::use_iterator U = DAG.getEntryNode().getNode()->use_begin(),
-                            UE = DAG.getEntryNode().getNode()->use_end();
-       U != UE; ++U)
-    if (LoadSDNode *L = dyn_cast<LoadSDNode>(*U))
+  for (SDNode *U : DAG.getEntryNode().getNode()->uses())
+    if (LoadSDNode *L = dyn_cast<LoadSDNode>(U))
       if (FrameIndexSDNode *FI = dyn_cast<FrameIndexSDNode>(L->getBasePtr()))
         if (FI->getIndex() < 0) {
           int64_t InFirstByte = MFI.getObjectOffset(FI->getIndex());
@@ -5729,6 +7086,37 @@ bool AArch64TargetLowering::DoesCalleeRestoreStack(CallingConv::ID CallCC,
          CallCC == CallingConv::Tail || CallCC == CallingConv::SwiftTail;
 }
 
+// Check if the value is zero-extended from i1 to i8
+static bool checkZExtBool(SDValue Arg, const SelectionDAG &DAG) {
+  unsigned SizeInBits = Arg.getValueType().getSizeInBits();
+  if (SizeInBits < 8)
+    return false;
+
+  APInt RequredZero(SizeInBits, 0xFE);
+  KnownBits Bits = DAG.computeKnownBits(Arg, 4);
+  bool ZExtBool = (Bits.Zero & RequredZero) == RequredZero;
+  return ZExtBool;
+}
+
+SDValue AArch64TargetLowering::changeStreamingMode(
+    SelectionDAG &DAG, SDLoc DL, bool Enable,
+    SDValue Chain, SDValue InFlag, SDValue PStateSM, bool Entry) const {
+  const AArch64RegisterInfo *TRI = Subtarget->getRegisterInfo();
+  SDValue RegMask = DAG.getRegisterMask(TRI->getSMStartStopCallPreservedMask());
+  SDValue MSROp =
+      DAG.getTargetConstant((int32_t)AArch64SVCR::SVCRSM, DL, MVT::i32);
+
+  SDValue ExpectedSMVal =
+      DAG.getTargetConstant(Entry ? Enable : !Enable, DL, MVT::i64);
+  SmallVector<SDValue> Ops = {Chain, MSROp, PStateSM, ExpectedSMVal, RegMask};
+
+  if (InFlag)
+    Ops.push_back(InFlag);
+
+  unsigned Opcode = Enable ? AArch64ISD::SMSTART : AArch64ISD::SMSTOP;
+  return DAG.getNode(Opcode, DL, DAG.getVTList(MVT::Other, MVT::Glue), Ops);
+}
+
 /// LowerCall - Lower a call to a callseq_start + CALL + callseq_end chain,
 /// and add input and output parameter nodes.
 SDValue
@@ -5742,7 +7130,7 @@ AArch64TargetLowering::LowerCall(CallLoweringInfo &CLI,
   SDValue Chain = CLI.Chain;
   SDValue Callee = CLI.Callee;
   bool &IsTailCall = CLI.IsTailCall;
-  CallingConv::ID CallConv = CLI.CallConv;
+  CallingConv::ID &CallConv = CLI.CallConv;
   bool IsVarArg = CLI.IsVarArg;
 
   MachineFunction &MF = DAG.getMachineFunction();
@@ -5751,27 +7139,54 @@ AArch64TargetLowering::LowerCall(CallLoweringInfo &CLI,
 
   AArch64FunctionInfo *FuncInfo = MF.getInfo<AArch64FunctionInfo>();
   bool TailCallOpt = MF.getTarget().Options.GuaranteedTailCallOpt;
+  bool IsCFICall = CLI.CB && CLI.CB->isIndirectCall() && CLI.CFIType;
   bool IsSibCall = false;
-  bool IsCalleeWin64 = Subtarget->isCallingConvWin64(CallConv);
+  bool GuardWithBTI = false;
+
+  if (CLI.CB && CLI.CB->getAttributes().hasFnAttr(Attribute::ReturnsTwice) &&
+      !Subtarget->noBTIAtReturnTwice()) {
+    GuardWithBTI = FuncInfo->branchTargetEnforcement();
+  }
+
+  // Analyze operands of the call, assigning locations to each operand.
+  SmallVector<CCValAssign, 16> ArgLocs;
+  CCState CCInfo(CallConv, IsVarArg, MF, ArgLocs, *DAG.getContext());
+
+  if (IsVarArg) {
+    unsigned NumArgs = Outs.size();
+
+    for (unsigned i = 0; i != NumArgs; ++i) {
+      if (!Outs[i].IsFixed && Outs[i].VT.isScalableVector())
+        report_fatal_error("Passing SVE types to variadic functions is "
+                           "currently not supported");
+    }
+  }
+
+  analyzeCallOperands(*this, Subtarget, CLI, CCInfo);
+
+  CCAssignFn *RetCC = CCAssignFnForReturn(CallConv);
+  // Assign locations to each value returned by this call.
+  SmallVector<CCValAssign, 16> RVLocs;
+  CCState RetCCInfo(CallConv, IsVarArg, DAG.getMachineFunction(), RVLocs,
+                    *DAG.getContext());
+  RetCCInfo.AnalyzeCallResult(Ins, RetCC);
 
   // Check callee args/returns for SVE registers and set calling convention
   // accordingly.
   if (CallConv == CallingConv::C || CallConv == CallingConv::Fast) {
-    bool CalleeOutSVE = any_of(Outs, [](ISD::OutputArg &Out){
-      return Out.VT.isScalableVector();
-    });
-    bool CalleeInSVE = any_of(Ins, [](ISD::InputArg &In){
-      return In.VT.isScalableVector();
-    });
-
-    if (CalleeInSVE || CalleeOutSVE)
+    auto HasSVERegLoc = [](CCValAssign &Loc) {
+      if (!Loc.isRegLoc())
+        return false;
+      return AArch64::ZPRRegClass.contains(Loc.getLocReg()) ||
+             AArch64::PPRRegClass.contains(Loc.getLocReg());
+    };
+    if (any_of(RVLocs, HasSVERegLoc) || any_of(ArgLocs, HasSVERegLoc))
       CallConv = CallingConv::AArch64_SVE_VectorCall;
   }
 
   if (IsTailCall) {
     // Check if it's really possible to do a tail call.
-    IsTailCall = isEligibleForTailCallOptimization(
-        Callee, CallConv, IsVarArg, Outs, OutVals, Ins, DAG);
+    IsTailCall = isEligibleForTailCallOptimization(CLI);
 
     // A sibling call is one where we're under the usual C ABI and not planning
     // to change that but can still do a tail call:
@@ -5787,62 +7202,6 @@ AArch64TargetLowering::LowerCall(CallLoweringInfo &CLI,
     report_fatal_error("failed to perform tail call elimination on a call "
                        "site marked musttail");
 
-  // Analyze operands of the call, assigning locations to each operand.
-  SmallVector<CCValAssign, 16> ArgLocs;
-  CCState CCInfo(CallConv, IsVarArg, DAG.getMachineFunction(), ArgLocs,
-                 *DAG.getContext());
-
-  if (IsVarArg) {
-    // Handle fixed and variable vector arguments differently.
-    // Variable vector arguments always go into memory.
-    unsigned NumArgs = Outs.size();
-
-    for (unsigned i = 0; i != NumArgs; ++i) {
-      MVT ArgVT = Outs[i].VT;
-      if (!Outs[i].IsFixed && ArgVT.isScalableVector())
-        report_fatal_error("Passing SVE types to variadic functions is "
-                           "currently not supported");
-
-      ISD::ArgFlagsTy ArgFlags = Outs[i].Flags;
-      bool UseVarArgCC = !Outs[i].IsFixed;
-      // On Windows, the fixed arguments in a vararg call are passed in GPRs
-      // too, so use the vararg CC to force them to integer registers.
-      if (IsCalleeWin64)
-        UseVarArgCC = true;
-      CCAssignFn *AssignFn = CCAssignFnForCall(CallConv, UseVarArgCC);
-      bool Res = AssignFn(i, ArgVT, ArgVT, CCValAssign::Full, ArgFlags, CCInfo);
-      assert(!Res && "Call operand has unhandled type");
-      (void)Res;
-    }
-  } else {
-    // At this point, Outs[].VT may already be promoted to i32. To correctly
-    // handle passing i8 as i8 instead of i32 on stack, we pass in both i32 and
-    // i8 to CC_AArch64_AAPCS with i32 being ValVT and i8 being LocVT.
-    // Since AnalyzeCallOperands uses Ins[].VT for both ValVT and LocVT, here
-    // we use a special version of AnalyzeCallOperands to pass in ValVT and
-    // LocVT.
-    unsigned NumArgs = Outs.size();
-    for (unsigned i = 0; i != NumArgs; ++i) {
-      MVT ValVT = Outs[i].VT;
-      // Get type of the original argument.
-      EVT ActualVT = getValueType(DAG.getDataLayout(),
-                                  CLI.getArgs()[Outs[i].OrigArgIndex].Ty,
-                                  /*AllowUnknown*/ true);
-      MVT ActualMVT = ActualVT.isSimple() ? ActualVT.getSimpleVT() : ValVT;
-      ISD::ArgFlagsTy ArgFlags = Outs[i].Flags;
-      // If ActualMVT is i1/i8/i16, we should set LocVT to i8/i8/i16.
-      if (ActualMVT == MVT::i1 || ActualMVT == MVT::i8)
-        ValVT = MVT::i8;
-      else if (ActualMVT == MVT::i16)
-        ValVT = MVT::i16;
-
-      CCAssignFn *AssignFn = CCAssignFnForCall(CallConv, /*IsVarArg=*/false);
-      bool Res = AssignFn(i, ValVT, ValVT, CCValAssign::Full, ArgFlags, CCInfo);
-      assert(!Res && "Call operand has unhandled type");
-      (void)Res;
-    }
-  }
-
   // Get a count of how many bytes are to be pushed on the stack.
   unsigned NumBytes = CCInfo.getNextStackOffset();
 
@@ -5884,6 +7243,44 @@ AArch64TargetLowering::LowerCall(CallLoweringInfo &CLI,
     assert(FPDiff % 16 == 0 && "unaligned stack on tail call");
   }
 
+  // Determine whether we need any streaming mode changes.
+  SMEAttrs CalleeAttrs, CallerAttrs(MF.getFunction());
+  if (CLI.CB)
+    CalleeAttrs = SMEAttrs(*CLI.CB);
+  else if (std::optional<SMEAttrs> Attrs =
+               getCalleeAttrsFromExternalFunction(CLI.Callee))
+    CalleeAttrs = *Attrs;
+
+  bool RequiresLazySave = CallerAttrs.requiresLazySave(CalleeAttrs);
+
+  MachineFrameInfo &MFI = MF.getFrameInfo();
+  if (RequiresLazySave) {
+    // Set up a lazy save mechanism by storing the runtime live slices
+    // (worst-case N*N) to the TPIDR2 stack object.
+    SDValue N = DAG.getNode(AArch64ISD::RDSVL, DL, MVT::i64,
+                            DAG.getConstant(1, DL, MVT::i32));
+    SDValue NN = DAG.getNode(ISD::MUL, DL, MVT::i64, N, N);
+    unsigned TPIDR2Obj = FuncInfo->getLazySaveTPIDR2Obj();
+
+    MachinePointerInfo MPI = MachinePointerInfo::getStack(MF, TPIDR2Obj);
+    SDValue TPIDR2ObjAddr = DAG.getFrameIndex(TPIDR2Obj,
+        DAG.getTargetLoweringInfo().getFrameIndexTy(DAG.getDataLayout()));
+    SDValue BufferPtrAddr =
+        DAG.getNode(ISD::ADD, DL, TPIDR2ObjAddr.getValueType(), TPIDR2ObjAddr,
+                    DAG.getConstant(8, DL, TPIDR2ObjAddr.getValueType()));
+    Chain = DAG.getTruncStore(Chain, DL, NN, BufferPtrAddr, MPI, MVT::i16);
+    Chain = DAG.getNode(
+        ISD::INTRINSIC_VOID, DL, MVT::Other, Chain,
+        DAG.getConstant(Intrinsic::aarch64_sme_set_tpidr2, DL, MVT::i32),
+        TPIDR2ObjAddr);
+  }
+
+  SDValue PStateSM;
+  std::optional<bool> RequiresSMChange =
+      CallerAttrs.requiresSMChange(CalleeAttrs);
+  if (RequiresSMChange)
+    PStateSM = getPStateSM(DAG, Chain, CallerAttrs, DL, MVT::i64);
+
   // Adjust the stack pointer for the new arguments...
   // These operations are automatically eliminated by the prolog/epilog pass
   if (!IsSibCall)
@@ -5927,8 +7324,22 @@ AArch64TargetLowering::LowerCall(CallLoweringInfo &CLI,
     case CCValAssign::AExt:
       if (Outs[i].ArgVT == MVT::i1) {
         // AAPCS requires i1 to be zero-extended to 8-bits by the caller.
-        Arg = DAG.getNode(ISD::TRUNCATE, DL, MVT::i1, Arg);
-        Arg = DAG.getNode(ISD::ZERO_EXTEND, DL, MVT::i8, Arg);
+        //
+        // Check if we actually have to do this, because the value may
+        // already be zero-extended.
+        //
+        // We cannot just emit a (zext i8 (trunc (assert-zext i8)))
+        // and rely on DAGCombiner to fold this, because the following
+        // (anyext i32) is combined with (zext i8) in DAG.getNode:
+        //
+        //   (ext (zext x)) -> (zext x)
+        //
+        // This will give us (zext i32), which we cannot remove, so
+        // try to check this beforehand.
+        if (!checkZExtBool(Arg, DAG)) {
+          Arg = DAG.getNode(ISD::TRUNCATE, DL, MVT::i1, Arg);
+          Arg = DAG.getNode(ISD::ZERO_EXTEND, DL, MVT::i8, Arg);
+        }
       }
       Arg = DAG.getNode(ISD::ANY_EXTEND, DL, VA.getLocVT(), Arg);
       break;
@@ -5948,10 +7359,11 @@ AArch64TargetLowering::LowerCall(CallLoweringInfo &CLI,
       Arg = DAG.getNode(ISD::FP_EXTEND, DL, VA.getLocVT(), Arg);
       break;
     case CCValAssign::Indirect:
-      assert(VA.getValVT().isScalableVector() &&
-             "Only scalable vectors can be passed indirectly");
+      bool isScalable = VA.getValVT().isScalableVector();
+      assert((isScalable || Subtarget->isWindowsArm64EC()) &&
+             "Indirect arguments should be scalable on most subtargets");
 
-      uint64_t StoreSize = VA.getValVT().getStoreSize().getKnownMinSize();
+      uint64_t StoreSize = VA.getValVT().getStoreSize().getKnownMinValue();
       uint64_t PartSize = StoreSize;
       unsigned NumParts = 1;
       if (Outs[i].Flags.isInConsecutiveRegs()) {
@@ -5961,14 +7373,13 @@ AArch64TargetLowering::LowerCall(CallLoweringInfo &CLI,
         StoreSize *= NumParts;
       }
 
-      MachineFrameInfo &MFI = DAG.getMachineFunction().getFrameInfo();
       Type *Ty = EVT(VA.getValVT()).getTypeForEVT(*DAG.getContext());
       Align Alignment = DAG.getDataLayout().getPrefTypeAlign(Ty);
       int FI = MFI.CreateStackObject(StoreSize, Alignment, false);
-      MFI.setStackID(FI, TargetStackID::ScalableVector);
+      if (isScalable)
+        MFI.setStackID(FI, TargetStackID::ScalableVector);
 
-      MachinePointerInfo MPI =
-          MachinePointerInfo::getFixedStack(DAG.getMachineFunction(), FI);
+      MachinePointerInfo MPI = MachinePointerInfo::getFixedStack(MF, FI);
       SDValue Ptr = DAG.getFrameIndex(
           FI, DAG.getTargetLoweringInfo().getFrameIndexTy(DAG.getDataLayout()));
       SDValue SpillSlot = Ptr;
@@ -5979,9 +7390,16 @@ AArch64TargetLowering::LowerCall(CallLoweringInfo &CLI,
         Chain = DAG.getStore(Chain, DL, OutVals[i], Ptr, MPI);
         NumParts--;
         if (NumParts > 0) {
-          SDValue BytesIncrement = DAG.getVScale(
-              DL, Ptr.getValueType(),
-              APInt(Ptr.getValueSizeInBits().getFixedSize(), PartSize));
+          SDValue BytesIncrement;
+          if (isScalable) {
+            BytesIncrement = DAG.getVScale(
+                DL, Ptr.getValueType(),
+                APInt(Ptr.getValueSizeInBits().getFixedValue(), PartSize));
+          } else {
+            BytesIncrement = DAG.getConstant(
+                APInt(Ptr.getValueSizeInBits().getFixedValue(), PartSize), DL,
+                Ptr.getValueType());
+          }
           SDNodeFlags Flags;
           Flags.setNoUnsignedWrap(true);
 
@@ -6025,6 +7443,11 @@ AArch64TargetLowering::LowerCall(CallLoweringInfo &CLI,
           return ArgReg.Reg == VA.getLocReg();
         });
       } else {
+        // Add an extra level of indirection for streaming mode changes by
+        // using a pseudo copy node that cannot be rematerialised between a
+        // smstart/smstop and the call by the simple register coalescer.
+        if (RequiresSMChange && isa<FrameIndexSDNode>(Arg))
+          Arg = DAG.getNode(AArch64ISD::OBSCURE_COPY, DL, MVT::i64, Arg);
         RegsToPass.emplace_back(VA.getLocReg(), Arg);
         RegsUsed.insert(VA.getLocReg());
         const TargetOptions &Options = DAG.getTarget().Options;
@@ -6063,8 +7486,7 @@ AArch64TargetLowering::LowerCall(CallLoweringInfo &CLI,
         int FI = MF.getFrameInfo().CreateFixedObject(OpSize, Offset, true);
 
         DstAddr = DAG.getFrameIndex(FI, PtrVT);
-        DstInfo =
-            MachinePointerInfo::getFixedStack(DAG.getMachineFunction(), FI);
+        DstInfo = MachinePointerInfo::getFixedStack(MF, FI);
 
         // Make sure any stack arguments overlapping with where we're storing
         // are loaded before this eventual operation. Otherwise they'll be
@@ -6074,8 +7496,7 @@ AArch64TargetLowering::LowerCall(CallLoweringInfo &CLI,
         SDValue PtrOff = DAG.getIntPtrConstant(Offset, DL);
 
         DstAddr = DAG.getNode(ISD::ADD, DL, PtrVT, StackPtr, PtrOff);
-        DstInfo = MachinePointerInfo::getStack(DAG.getMachineFunction(),
-                                               LocMemOffset);
+        DstInfo = MachinePointerInfo::getStack(MF, LocMemOffset);
       }
 
       if (Outs[i].Flags.isByVal()) {
@@ -6102,12 +7523,29 @@ AArch64TargetLowering::LowerCall(CallLoweringInfo &CLI,
     }
   }
 
+  if (IsVarArg && Subtarget->isWindowsArm64EC()) {
+    // For vararg calls, the Arm64EC ABI requires values in x4 and x5
+    // describing the argument list.  x4 contains the address of the
+    // first stack parameter. x5 contains the size in bytes of all parameters
+    // passed on the stack.
+    RegsToPass.emplace_back(AArch64::X4, StackPtr);
+    RegsToPass.emplace_back(AArch64::X5,
+                            DAG.getConstant(NumBytes, DL, MVT::i64));
+  }
+
   if (!MemOpChains.empty())
     Chain = DAG.getNode(ISD::TokenFactor, DL, MVT::Other, MemOpChains);
 
+  SDValue InFlag;
+  if (RequiresSMChange) {
+    SDValue NewChain = changeStreamingMode(DAG, DL, *RequiresSMChange, Chain,
+                                           InFlag, PStateSM, true);
+    Chain = NewChain.getValue(0);
+    InFlag = NewChain.getValue(1);
+  }
+
   // Build a sequence of copy-to-reg nodes chained together with token chain
   // and flag operands which copy the outgoing args into the appropriate regs.
-  SDValue InFlag;
   for (auto &RegToPass : RegsToPass) {
     Chain = DAG.getCopyToReg(Chain, DL, RegToPass.first,
                              RegToPass.second, InFlag);
@@ -6145,8 +7583,7 @@ AArch64TargetLowering::LowerCall(CallLoweringInfo &CLI,
   // we've carefully laid out the parameters so that when sp is reset they'll be
   // in the correct location.
   if (IsTailCall && !IsSibCall) {
-    Chain = DAG.getCALLSEQ_END(Chain, DAG.getIntPtrConstant(0, DL, true),
-                               DAG.getIntPtrConstant(0, DL, true), InFlag, DL);
+    Chain = DAG.getCALLSEQ_END(Chain, 0, 0, InFlag, DL);
     InFlag = Chain.getValue(1);
   }
 
@@ -6199,22 +7636,37 @@ AArch64TargetLowering::LowerCall(CallLoweringInfo &CLI,
   if (IsTailCall) {
     MF.getFrameInfo().setHasTailCall();
     SDValue Ret = DAG.getNode(AArch64ISD::TC_RETURN, DL, NodeTys, Ops);
+
+    if (IsCFICall)
+      Ret.getNode()->setCFIType(CLI.CFIType->getZExtValue());
+
     DAG.addCallSiteInfo(Ret.getNode(), std::move(CSInfo));
     return Ret;
   }
 
   unsigned CallOpc = AArch64ISD::CALL;
   // Calls with operand bundle "clang.arc.attachedcall" are special. They should
-  // be expanded to the call, directly followed by a special marker sequence.
-  // Use the CALL_RVMARKER to do that.
+  // be expanded to the call, directly followed by a special marker sequence and
+  // a call to an ObjC library function.  Use CALL_RVMARKER to do that.
   if (CLI.CB && objcarc::hasAttachedCallOpBundle(CLI.CB)) {
     assert(!IsTailCall &&
            "tail calls cannot be marked with clang.arc.attachedcall");
     CallOpc = AArch64ISD::CALL_RVMARKER;
-  }
+
+    // Add a target global address for the retainRV/claimRV runtime function
+    // just before the call target.
+    Function *ARCFn = *objcarc::getAttachedARCFunction(CLI.CB);
+    auto GA = DAG.getTargetGlobalAddress(ARCFn, DL, PtrVT);
+    Ops.insert(Ops.begin() + 1, GA);
+  } else if (GuardWithBTI)
+    CallOpc = AArch64ISD::CALL_BTI;
 
   // Returns a chain and a flag for retval copy to use.
   Chain = DAG.getNode(CallOpc, DL, NodeTys, Ops);
+
+  if (IsCFICall)
+    Chain.getNode()->setCFIType(CLI.CFIType->getZExtValue());
+
   DAG.addNoMergeSiteInfo(Chain.getNode(), CLI.NoMerge);
   InFlag = Chain.getValue(1);
   DAG.addCallSiteInfo(Chain.getNode(), std::move(CSInfo));
@@ -6222,17 +7674,77 @@ AArch64TargetLowering::LowerCall(CallLoweringInfo &CLI,
   uint64_t CalleePopBytes =
       DoesCalleeRestoreStack(CallConv, TailCallOpt) ? alignTo(NumBytes, 16) : 0;
 
-  Chain = DAG.getCALLSEQ_END(Chain, DAG.getIntPtrConstant(NumBytes, DL, true),
-                             DAG.getIntPtrConstant(CalleePopBytes, DL, true),
-                             InFlag, DL);
-  if (!Ins.empty())
-    InFlag = Chain.getValue(1);
+  Chain = DAG.getCALLSEQ_END(Chain, NumBytes, CalleePopBytes, InFlag, DL);
+  InFlag = Chain.getValue(1);
 
   // Handle result values, copying them out of physregs into vregs that we
   // return.
-  return LowerCallResult(Chain, InFlag, CallConv, IsVarArg, Ins, DL, DAG,
-                         InVals, IsThisReturn,
-                         IsThisReturn ? OutVals[0] : SDValue());
+  SDValue Result = LowerCallResult(Chain, InFlag, CallConv, IsVarArg, RVLocs,
+                                   DL, DAG, InVals, IsThisReturn,
+                                   IsThisReturn ? OutVals[0] : SDValue());
+
+  if (!Ins.empty())
+    InFlag = Result.getValue(Result->getNumValues() - 1);
+
+  if (RequiresSMChange) {
+    assert(PStateSM && "Expected a PStateSM to be set");
+    Result = changeStreamingMode(DAG, DL, !*RequiresSMChange, Result, InFlag,
+                                 PStateSM, false);
+  }
+
+  if (RequiresLazySave) {
+    // Unconditionally resume ZA.
+    Result = DAG.getNode(
+        AArch64ISD::SMSTART, DL, MVT::Other, Result,
+        DAG.getTargetConstant((int32_t)(AArch64SVCR::SVCRZA), DL, MVT::i32),
+        DAG.getConstant(0, DL, MVT::i64), DAG.getConstant(1, DL, MVT::i64));
+
+    // Conditionally restore the lazy save using a pseudo node.
+    unsigned FI = FuncInfo->getLazySaveTPIDR2Obj();
+    SDValue RegMask = DAG.getRegisterMask(
+        TRI->SMEABISupportRoutinesCallPreservedMaskFromX0());
+    SDValue RestoreRoutine = DAG.getTargetExternalSymbol(
+        "__arm_tpidr2_restore", getPointerTy(DAG.getDataLayout()));
+    SDValue TPIDR2_EL0 = DAG.getNode(
+        ISD::INTRINSIC_W_CHAIN, DL, MVT::i64, Result,
+        DAG.getConstant(Intrinsic::aarch64_sme_get_tpidr2, DL, MVT::i32));
+
+    // Copy the address of the TPIDR2 block into X0 before 'calling' the
+    // RESTORE_ZA pseudo.
+    SDValue Glue;
+    SDValue TPIDR2Block = DAG.getFrameIndex(
+        FI, DAG.getTargetLoweringInfo().getFrameIndexTy(DAG.getDataLayout()));
+    Result = DAG.getCopyToReg(Result, DL, AArch64::X0, TPIDR2Block, Glue);
+    Result = DAG.getNode(AArch64ISD::RESTORE_ZA, DL, MVT::Other,
+                         {Result, TPIDR2_EL0,
+                          DAG.getRegister(AArch64::X0, MVT::i64),
+                          RestoreRoutine,
+                          RegMask,
+                          Result.getValue(1)});
+
+    // Finally reset the TPIDR2_EL0 register to 0.
+    Result = DAG.getNode(
+        ISD::INTRINSIC_VOID, DL, MVT::Other, Result,
+        DAG.getConstant(Intrinsic::aarch64_sme_set_tpidr2, DL, MVT::i32),
+        DAG.getConstant(0, DL, MVT::i64));
+  }
+
+  if (RequiresSMChange || RequiresLazySave) {
+    for (unsigned I = 0; I < InVals.size(); ++I) {
+      // The smstart/smstop is chained as part of the call, but when the
+      // resulting chain is discarded (which happens when the call is not part
+      // of a chain, e.g. a call to @llvm.cos()), we need to ensure the
+      // smstart/smstop is chained to the result value. We can do that by doing
+      // a vreg -> vreg copy.
+      Register Reg = MF.getRegInfo().createVirtualRegister(
+          getRegClassFor(InVals[I].getValueType().getSimpleVT()));
+      SDValue X = DAG.getCopyToReg(Result, DL, Reg, InVals[I]);
+      InVals[I] = DAG.getCopyFromReg(X, DL, Reg,
+                                     InVals[I].getValueType());
+    }
+  }
+
+  return Result;
 }
 
 bool AArch64TargetLowering::CanLowerReturn(
@@ -6255,8 +7767,7 @@ AArch64TargetLowering::LowerReturn(SDValue Chain, CallingConv::ID CallConv,
 
   CCAssignFn *RetCC = CCAssignFnForReturn(CallConv);
   SmallVector<CCValAssign, 16> RVLocs;
-  CCState CCInfo(CallConv, isVarArg, DAG.getMachineFunction(), RVLocs,
-                 *DAG.getContext());
+  CCState CCInfo(CallConv, isVarArg, MF, RVLocs, *DAG.getContext());
   CCInfo.AnalyzeReturn(Outs, RetCC);
 
   // Copy the result values into the output registers.
@@ -6308,6 +7819,19 @@ AArch64TargetLowering::LowerReturn(SDValue Chain, CallingConv::ID CallConv,
     }
   }
 
+  const AArch64RegisterInfo *TRI = Subtarget->getRegisterInfo();
+
+  // Emit SMSTOP before returning from a locally streaming function
+  SMEAttrs FuncAttrs(MF.getFunction());
+  if (FuncAttrs.hasStreamingBody() && !FuncAttrs.hasStreamingInterface()) {
+    Chain = DAG.getNode(
+        AArch64ISD::SMSTOP, DL, DAG.getVTList(MVT::Other, MVT::Glue), Chain,
+        DAG.getTargetConstant((int32_t)AArch64SVCR::SVCRSM, DL, MVT::i32),
+        DAG.getConstant(1, DL, MVT::i64), DAG.getConstant(0, DL, MVT::i64),
+        DAG.getRegisterMask(TRI->getSMStartStopCallPreservedMask()));
+    Flag = Chain.getValue(1);
+  }
+
   SmallVector<SDValue, 4> RetOps(1, Chain);
   for (auto &RetVal : RetVals) {
     Chain = DAG.getCopyToReg(Chain, DL, RetVal.first, RetVal.second, Flag);
@@ -6332,9 +7856,7 @@ AArch64TargetLowering::LowerReturn(SDValue Chain, CallingConv::ID CallConv,
       DAG.getRegister(RetValReg, getPointerTy(DAG.getDataLayout())));
   }
 
-  const AArch64RegisterInfo *TRI = Subtarget->getRegisterInfo();
-  const MCPhysReg *I =
-      TRI->getCalleeSavedRegsViaCopy(&DAG.getMachineFunction());
+  const MCPhysReg *I = TRI->getCalleeSavedRegsViaCopy(&MF);
   if (I) {
     for (; *I; ++I) {
       if (AArch64::GPR64RegClass.contains(*I))
@@ -6465,7 +7987,8 @@ SDValue AArch64TargetLowering::LowerGlobalAddress(SDValue Op,
   }
   EVT PtrVT = getPointerTy(DAG.getDataLayout());
   SDLoc DL(GN);
-  if (OpFlags & (AArch64II::MO_DLLIMPORT | AArch64II::MO_COFFSTUB))
+  if (OpFlags & (AArch64II::MO_DLLIMPORT | AArch64II::MO_DLLIMPORTAUX |
+                 AArch64II::MO_COFFSTUB))
     Result = DAG.getLoad(PtrVT, DL, DAG.getEntryNode(), Result,
                          MachinePointerInfo::getGOT(DAG.getMachineFunction()));
   return Result;
@@ -6990,79 +8513,98 @@ SDValue AArch64TargetLowering::LowerBR_CC(SDValue Op, SelectionDAG &DAG) const {
 
 SDValue AArch64TargetLowering::LowerFCOPYSIGN(SDValue Op,
                                               SelectionDAG &DAG) const {
+  if (!Subtarget->hasNEON())
+    return SDValue();
+
   EVT VT = Op.getValueType();
+  EVT IntVT = VT.changeTypeToInteger();
   SDLoc DL(Op);
 
   SDValue In1 = Op.getOperand(0);
   SDValue In2 = Op.getOperand(1);
   EVT SrcVT = In2.getValueType();
 
-  if (SrcVT.bitsLT(VT))
-    In2 = DAG.getNode(ISD::FP_EXTEND, DL, VT, In2);
-  else if (SrcVT.bitsGT(VT))
-    In2 = DAG.getNode(ISD::FP_ROUND, DL, VT, In2, DAG.getIntPtrConstant(0, DL));
+  if (!SrcVT.bitsEq(VT))
+    In2 = DAG.getFPExtendOrRound(In2, DL, VT);
 
-  EVT VecVT;
-  uint64_t EltMask;
-  SDValue VecVal1, VecVal2;
+  if (VT.isScalableVector())
+    IntVT =
+        getPackedSVEVectorVT(VT.getVectorElementType().changeTypeToInteger());
+
+  if (VT.isFixedLengthVector() &&
+    useSVEForFixedLengthVectorVT(VT, Subtarget->forceStreamingCompatibleSVE())) {
+    EVT ContainerVT = getContainerForFixedLengthVector(DAG, VT);
 
-  auto setVecVal = [&] (int Idx) {
+    In1 = convertToScalableVector(DAG, ContainerVT, In1);
+    In2 = convertToScalableVector(DAG, ContainerVT, In2);
+
+    SDValue Res = DAG.getNode(ISD::FCOPYSIGN, DL, ContainerVT, In1, In2);
+    return convertFromScalableVector(DAG, VT, Res);
+  }
+
+  auto BitCast = [this](EVT VT, SDValue Op, SelectionDAG &DAG) {
+    if (VT.isScalableVector())
+      return getSVESafeBitCast(VT, Op, DAG);
+
+    return DAG.getBitcast(VT, Op);
+  };
+
+  SDValue VecVal1, VecVal2;
+  EVT VecVT;
+  auto SetVecVal = [&](int Idx = -1) {
     if (!VT.isVector()) {
-      VecVal1 = DAG.getTargetInsertSubreg(Idx, DL, VecVT,
-                                          DAG.getUNDEF(VecVT), In1);
-      VecVal2 = DAG.getTargetInsertSubreg(Idx, DL, VecVT,
-                                          DAG.getUNDEF(VecVT), In2);
+      VecVal1 =
+          DAG.getTargetInsertSubreg(Idx, DL, VecVT, DAG.getUNDEF(VecVT), In1);
+      VecVal2 =
+          DAG.getTargetInsertSubreg(Idx, DL, VecVT, DAG.getUNDEF(VecVT), In2);
     } else {
-      VecVal1 = DAG.getNode(ISD::BITCAST, DL, VecVT, In1);
-      VecVal2 = DAG.getNode(ISD::BITCAST, DL, VecVT, In2);
+      VecVal1 = BitCast(VecVT, In1, DAG);
+      VecVal2 = BitCast(VecVT, In2, DAG);
     }
   };
-
-  if (VT == MVT::f32 || VT == MVT::v2f32 || VT == MVT::v4f32) {
-    VecVT = (VT == MVT::v2f32 ? MVT::v2i32 : MVT::v4i32);
-    EltMask = 0x80000000ULL;
-    setVecVal(AArch64::ssub);
-  } else if (VT == MVT::f64 || VT == MVT::v2f64) {
+  if (VT.isVector()) {
+    VecVT = IntVT;
+    SetVecVal();
+  } else if (VT == MVT::f64) {
     VecVT = MVT::v2i64;
-
-    // We want to materialize a mask with the high bit set, but the AdvSIMD
-    // immediate moves cannot materialize that in a single instruction for
-    // 64-bit elements. Instead, materialize zero and then negate it.
-    EltMask = 0;
-
-    setVecVal(AArch64::dsub);
-  } else if (VT == MVT::f16 || VT == MVT::v4f16 || VT == MVT::v8f16) {
-    VecVT = (VT == MVT::v4f16 ? MVT::v4i16 : MVT::v8i16);
-    EltMask = 0x8000ULL;
-    setVecVal(AArch64::hsub);
+    SetVecVal(AArch64::dsub);
+  } else if (VT == MVT::f32) {
+    VecVT = MVT::v4i32;
+    SetVecVal(AArch64::ssub);
+  } else if (VT == MVT::f16) {
+    VecVT = MVT::v8i16;
+    SetVecVal(AArch64::hsub);
   } else {
     llvm_unreachable("Invalid type for copysign!");
   }
 
-  SDValue BuildVec = DAG.getConstant(EltMask, DL, VecVT);
+  unsigned BitWidth = In1.getScalarValueSizeInBits();
+  SDValue SignMaskV = DAG.getConstant(~APInt::getSignMask(BitWidth), DL, VecVT);
 
-  // If we couldn't materialize the mask above, then the mask vector will be
-  // the zero vector, and we need to negate it here.
+  // We want to materialize a mask with every bit but the high bit set, but the
+  // AdvSIMD immediate moves cannot materialize that in a single instruction for
+  // 64-bit elements. Instead, materialize all bits set and then negate that.
   if (VT == MVT::f64 || VT == MVT::v2f64) {
-    BuildVec = DAG.getNode(ISD::BITCAST, DL, MVT::v2f64, BuildVec);
-    BuildVec = DAG.getNode(ISD::FNEG, DL, MVT::v2f64, BuildVec);
-    BuildVec = DAG.getNode(ISD::BITCAST, DL, MVT::v2i64, BuildVec);
+    SignMaskV = DAG.getConstant(APInt::getAllOnes(BitWidth), DL, VecVT);
+    SignMaskV = DAG.getNode(ISD::BITCAST, DL, MVT::v2f64, SignMaskV);
+    SignMaskV = DAG.getNode(ISD::FNEG, DL, MVT::v2f64, SignMaskV);
+    SignMaskV = DAG.getNode(ISD::BITCAST, DL, MVT::v2i64, SignMaskV);
   }
 
-  SDValue Sel =
-      DAG.getNode(AArch64ISD::BIT, DL, VecVT, VecVal1, VecVal2, BuildVec);
-
+  SDValue BSP =
+      DAG.getNode(AArch64ISD::BSP, DL, VecVT, SignMaskV, VecVal1, VecVal2);
   if (VT == MVT::f16)
-    return DAG.getTargetExtractSubreg(AArch64::hsub, DL, VT, Sel);
+    return DAG.getTargetExtractSubreg(AArch64::hsub, DL, VT, BSP);
   if (VT == MVT::f32)
-    return DAG.getTargetExtractSubreg(AArch64::ssub, DL, VT, Sel);
-  else if (VT == MVT::f64)
-    return DAG.getTargetExtractSubreg(AArch64::dsub, DL, VT, Sel);
-  else
-    return DAG.getNode(ISD::BITCAST, DL, VT, Sel);
+    return DAG.getTargetExtractSubreg(AArch64::ssub, DL, VT, BSP);
+  if (VT == MVT::f64)
+    return DAG.getTargetExtractSubreg(AArch64::dsub, DL, VT, BSP);
+
+  return BitCast(VT, BSP, DAG);
 }
 
-SDValue AArch64TargetLowering::LowerCTPOP(SDValue Op, SelectionDAG &DAG) const {
+SDValue AArch64TargetLowering::LowerCTPOP_PARITY(SDValue Op,
+                                                 SelectionDAG &DAG) const {
   if (DAG.getMachineFunction().getFunction().hasFnAttribute(
           Attribute::NoImplicitFloat))
     return SDValue();
@@ -7070,7 +8612,17 @@ SDValue AArch64TargetLowering::LowerCTPOP(SDValue Op, SelectionDAG &DAG) const {
   if (!Subtarget->hasNEON())
     return SDValue();
 
-  // While there is no integer popcount instruction, it can
+  bool IsParity = Op.getOpcode() == ISD::PARITY;
+  SDValue Val = Op.getOperand(0);
+  SDLoc DL(Op);
+  EVT VT = Op.getValueType();
+
+  // for i32, general parity function using EORs is more efficient compared to
+  // using floating point
+  if (VT == MVT::i32 && IsParity)
+    return SDValue();
+
+  // If there is no CNT instruction available, GPR popcount can
   // be more efficiently lowered to the following sequence that uses
   // AdvSIMD registers/instructions as long as the copies to/from
   // the AdvSIMD registers are cheap.
@@ -7078,10 +8630,6 @@ SDValue AArch64TargetLowering::LowerCTPOP(SDValue Op, SelectionDAG &DAG) const {
   //  CNT     V0.8B, V0.8B  // 8xbyte pop-counts
   //  ADDV    B0, V0.8B     // sum 8xbyte pop-counts
   //  UMOV    X0, V0.B[0]   // copy byte result back to integer reg
-  SDValue Val = Op.getOperand(0);
-  SDLoc DL(Op);
-  EVT VT = Op.getValueType();
-
   if (VT == MVT::i32 || VT == MVT::i64) {
     if (VT == MVT::i32)
       Val = DAG.getNode(ISD::ZERO_EXTEND, DL, MVT::i64, Val);
@@ -7092,6 +8640,10 @@ SDValue AArch64TargetLowering::LowerCTPOP(SDValue Op, SelectionDAG &DAG) const {
         ISD::INTRINSIC_WO_CHAIN, DL, MVT::i32,
         DAG.getConstant(Intrinsic::aarch64_neon_uaddlv, DL, MVT::i32), CtPop);
 
+    if (IsParity)
+      UaddLV = DAG.getNode(ISD::AND, DL, MVT::i32, UaddLV,
+                           DAG.getConstant(1, DL, MVT::i32));
+
     if (VT == MVT::i64)
       UaddLV = DAG.getNode(ISD::ZERO_EXTEND, DL, MVT::i64, UaddLV);
     return UaddLV;
@@ -7103,10 +8655,18 @@ SDValue AArch64TargetLowering::LowerCTPOP(SDValue Op, SelectionDAG &DAG) const {
         ISD::INTRINSIC_WO_CHAIN, DL, MVT::i32,
         DAG.getConstant(Intrinsic::aarch64_neon_uaddlv, DL, MVT::i32), CtPop);
 
+    if (IsParity)
+      UaddLV = DAG.getNode(ISD::AND, DL, MVT::i32, UaddLV,
+                           DAG.getConstant(1, DL, MVT::i32));
+
     return DAG.getNode(ISD::ZERO_EXTEND, DL, MVT::i128, UaddLV);
   }
 
-  if (VT.isScalableVector() || useSVEForFixedLengthVectorVT(VT))
+  assert(!IsParity && "ISD::PARITY of vector types not supported");
+
+  if (VT.isScalableVector() ||
+      useSVEForFixedLengthVectorVT(VT,
+                                   Subtarget->forceStreamingCompatibleSVE()))
     return LowerToPredicatedOp(Op, DAG, AArch64ISD::CTPOP_MERGE_PASSTHRU);
 
   assert((VT == MVT::v1i64 || VT == MVT::v2i64 || VT == MVT::v2i32 ||
@@ -7135,21 +8695,69 @@ SDValue AArch64TargetLowering::LowerCTPOP(SDValue Op, SelectionDAG &DAG) const {
 SDValue AArch64TargetLowering::LowerCTTZ(SDValue Op, SelectionDAG &DAG) const {
   EVT VT = Op.getValueType();
   assert(VT.isScalableVector() ||
-         useSVEForFixedLengthVectorVT(VT, /*OverrideNEON=*/true));
+         useSVEForFixedLengthVectorVT(
+             VT, /*OverrideNEON=*/Subtarget->useSVEForFixedLengthVectors()));
 
   SDLoc DL(Op);
   SDValue RBIT = DAG.getNode(ISD::BITREVERSE, DL, VT, Op.getOperand(0));
   return DAG.getNode(ISD::CTLZ, DL, VT, RBIT);
 }
 
+SDValue AArch64TargetLowering::LowerMinMax(SDValue Op,
+                                           SelectionDAG &DAG) const {
+
+  EVT VT = Op.getValueType();
+  SDLoc DL(Op);
+  unsigned Opcode = Op.getOpcode();
+  ISD::CondCode CC;
+  switch (Opcode) {
+  default:
+    llvm_unreachable("Wrong instruction");
+  case ISD::SMAX:
+    CC = ISD::SETGT;
+    break;
+  case ISD::SMIN:
+    CC = ISD::SETLT;
+    break;
+  case ISD::UMAX:
+    CC = ISD::SETUGT;
+    break;
+  case ISD::UMIN:
+    CC = ISD::SETULT;
+    break;
+  }
+
+  if (VT.isScalableVector() ||
+      useSVEForFixedLengthVectorVT(
+          VT, /*OverrideNEON=*/Subtarget->useSVEForFixedLengthVectors())) {
+    switch (Opcode) {
+    default:
+      llvm_unreachable("Wrong instruction");
+    case ISD::SMAX:
+      return LowerToPredicatedOp(Op, DAG, AArch64ISD::SMAX_PRED);
+    case ISD::SMIN:
+      return LowerToPredicatedOp(Op, DAG, AArch64ISD::SMIN_PRED);
+    case ISD::UMAX:
+      return LowerToPredicatedOp(Op, DAG, AArch64ISD::UMAX_PRED);
+    case ISD::UMIN:
+      return LowerToPredicatedOp(Op, DAG, AArch64ISD::UMIN_PRED);
+    }
+  }
+
+  SDValue Op0 = Op.getOperand(0);
+  SDValue Op1 = Op.getOperand(1);
+  SDValue Cond = DAG.getSetCC(DL, VT, Op0, Op1, CC);
+  return DAG.getSelect(DL, VT, Cond, Op0, Op1);
+}
+
 SDValue AArch64TargetLowering::LowerBitreverse(SDValue Op,
                                                SelectionDAG &DAG) const {
   EVT VT = Op.getValueType();
 
   if (VT.isScalableVector() ||
-      useSVEForFixedLengthVectorVT(VT, /*OverrideNEON=*/true))
-    return LowerToPredicatedOp(Op, DAG, AArch64ISD::BITREVERSE_MERGE_PASSTHRU,
-                               true);
+      useSVEForFixedLengthVectorVT(
+          VT, /*OverrideNEON=*/Subtarget->useSVEForFixedLengthVectors()))
+    return LowerToPredicatedOp(Op, DAG, AArch64ISD::BITREVERSE_MERGE_PASSTHRU);
 
   SDLoc DL(Op);
   SDValue REVB;
@@ -7192,6 +8800,70 @@ SDValue AArch64TargetLowering::LowerBitreverse(SDValue Op,
                      DAG.getNode(ISD::BITREVERSE, DL, VST, REVB));
 }
 
+// Check whether the continuous comparison sequence.
+static bool
+isOrXorChain(SDValue N, unsigned &Num,
+             SmallVector<std::pair<SDValue, SDValue>, 16> &WorkList) {
+  if (Num == MaxXors)
+    return false;
+
+  // Skip the one-use zext
+  if (N->getOpcode() == ISD::ZERO_EXTEND && N->hasOneUse())
+    N = N->getOperand(0);
+
+  // The leaf node must be XOR
+  if (N->getOpcode() == ISD::XOR) {
+    WorkList.push_back(std::make_pair(N->getOperand(0), N->getOperand(1)));
+    Num++;
+    return true;
+  }
+
+  // All the non-leaf nodes must be OR.
+  if (N->getOpcode() != ISD::OR || !N->hasOneUse())
+    return false;
+
+  if (isOrXorChain(N->getOperand(0), Num, WorkList) &&
+      isOrXorChain(N->getOperand(1), Num, WorkList))
+    return true;
+  return false;
+}
+
+// Transform chains of ORs and XORs, which usually outlined by memcmp/bmp.
+static SDValue performOrXorChainCombine(SDNode *N, SelectionDAG &DAG) {
+  SDValue LHS = N->getOperand(0);
+  SDValue RHS = N->getOperand(1);
+  SDLoc DL(N);
+  EVT VT = N->getValueType(0);
+  SmallVector<std::pair<SDValue, SDValue>, 16> WorkList;
+
+  // Only handle integer compares.
+  if (N->getOpcode() != ISD::SETCC)
+    return SDValue();
+
+  ISD::CondCode Cond = cast<CondCodeSDNode>(N->getOperand(2))->get();
+  // Try to express conjunction "cmp 0 (or (xor A0 A1) (xor B0 B1))" as:
+  // sub A0, A1; ccmp B0, B1, 0, eq; cmp inv(Cond) flag
+  unsigned NumXors = 0;
+  if ((Cond == ISD::SETEQ || Cond == ISD::SETNE) && isNullConstant(RHS) &&
+      LHS->getOpcode() == ISD::OR && LHS->hasOneUse() &&
+      isOrXorChain(LHS, NumXors, WorkList)) {
+    SDValue XOR0, XOR1;
+    std::tie(XOR0, XOR1) = WorkList[0];
+    unsigned LogicOp = (Cond == ISD::SETEQ) ? ISD::AND : ISD::OR;
+    SDValue Cmp = DAG.getSetCC(DL, VT, XOR0, XOR1, Cond);
+    for (unsigned I = 1; I < WorkList.size(); I++) {
+      std::tie(XOR0, XOR1) = WorkList[I];
+      SDValue CmpChain = DAG.getSetCC(DL, VT, XOR0, XOR1, Cond);
+      Cmp = DAG.getNode(LogicOp, DL, VT, Cmp, CmpChain);
+    }
+
+    // Exit early by inverting the condition, which help reduce indentations.
+    return Cmp;
+  }
+
+  return SDValue();
+}
+
 SDValue AArch64TargetLowering::LowerSETCC(SDValue Op, SelectionDAG &DAG) const {
 
   if (Op.getValueType().isVector())
@@ -7280,6 +8952,36 @@ SDValue AArch64TargetLowering::LowerSETCC(SDValue Op, SelectionDAG &DAG) const {
   return IsStrict ? DAG.getMergeValues({Res, Cmp.getValue(1)}, dl) : Res;
 }
 
+SDValue AArch64TargetLowering::LowerSETCCCARRY(SDValue Op,
+                                               SelectionDAG &DAG) const {
+
+  SDValue LHS = Op.getOperand(0);
+  SDValue RHS = Op.getOperand(1);
+  EVT VT = LHS.getValueType();
+  if (VT != MVT::i32 && VT != MVT::i64)
+    return SDValue();
+
+  SDLoc DL(Op);
+  SDValue Carry = Op.getOperand(2);
+  // SBCS uses a carry not a borrow so the carry flag should be inverted first.
+  SDValue InvCarry = valueToCarryFlag(Carry, DAG, true);
+  SDValue Cmp = DAG.getNode(AArch64ISD::SBCS, DL, DAG.getVTList(VT, MVT::Glue),
+                            LHS, RHS, InvCarry);
+
+  EVT OpVT = Op.getValueType();
+  SDValue TVal = DAG.getConstant(1, DL, OpVT);
+  SDValue FVal = DAG.getConstant(0, DL, OpVT);
+
+  ISD::CondCode Cond = cast<CondCodeSDNode>(Op.getOperand(3))->get();
+  ISD::CondCode CondInv = ISD::getSetCCInverse(Cond, VT);
+  SDValue CCVal =
+      DAG.getConstant(changeIntCCToAArch64CC(CondInv), DL, MVT::i32);
+  // Inputs are swapped because the condition is inverted. This will allow
+  // matching with a single CSINC instruction.
+  return DAG.getNode(AArch64ISD::CSEL, DL, OpVT, FVal, TVal, CCVal,
+                     Cmp.getValue(1));
+}
+
 SDValue AArch64TargetLowering::LowerSELECT_CC(ISD::CondCode CC, SDValue LHS,
                                               SDValue RHS, SDValue TVal,
                                               SDValue FVal, const SDLoc &dl,
@@ -7314,8 +9016,8 @@ SDValue AArch64TargetLowering::LowerSELECT_CC(ISD::CondCode CC, SDValue LHS,
     // Check for sign pattern (SELECT_CC setgt, iN lhs, -1, 1, -1) and transform
     // into (OR (ASR lhs, N-1), 1), which requires less instructions for the
     // supported types.
-    if (CC == ISD::SETGT && RHSC && RHSC->isAllOnesValue() && CTVal && CFVal &&
-        CTVal->isOne() && CFVal->isAllOnesValue() &&
+    if (CC == ISD::SETGT && RHSC && RHSC->isAllOnes() && CTVal && CFVal &&
+        CTVal->isOne() && CFVal->isAllOnes() &&
         LHS.getValueType() == TVal.getValueType()) {
       EVT VT = LHS.getValueType();
       SDValue Shift =
@@ -7328,11 +9030,11 @@ SDValue AArch64TargetLowering::LowerSELECT_CC(ISD::CondCode CC, SDValue LHS,
 
     // If both the TVal and the FVal are constants, see if we can swap them in
     // order to for a CSINV or CSINC out of them.
-    if (CTVal && CFVal && CTVal->isAllOnesValue() && CFVal->isNullValue()) {
+    if (CTVal && CFVal && CTVal->isAllOnes() && CFVal->isZero()) {
       std::swap(TVal, FVal);
       std::swap(CTVal, CFVal);
       CC = ISD::getSetCCInverse(CC, LHS.getValueType());
-    } else if (CTVal && CFVal && CTVal->isOne() && CFVal->isNullValue()) {
+    } else if (CTVal && CFVal && CTVal->isOne() && CFVal->isZero()) {
       std::swap(TVal, FVal);
       std::swap(CTVal, CFVal);
       CC = ISD::getSetCCInverse(CC, LHS.getValueType());
@@ -7381,12 +9083,17 @@ SDValue AArch64TargetLowering::LowerSELECT_CC(ISD::CondCode CC, SDValue LHS,
             Swap = true;
           }
         }
+      } else {
         // 64-bit check whether we can use CSINC.
-      } else if ((TrueVal == FalseVal + 1) || (TrueVal + 1 == FalseVal)) {
-        Opcode = AArch64ISD::CSINC;
+        const uint64_t TrueVal64 = TrueVal;
+        const uint64_t FalseVal64 = FalseVal;
+
+        if ((TrueVal64 == FalseVal64 + 1) || (TrueVal64 + 1 == FalseVal64)) {
+          Opcode = AArch64ISD::CSINC;
 
-        if (TrueVal > FalseVal) {
-          Swap = true;
+          if (TrueVal > FalseVal) {
+            Swap = true;
+          }
         }
       }
 
@@ -7411,7 +9118,7 @@ SDValue AArch64TargetLowering::LowerSELECT_CC(ISD::CondCode CC, SDValue LHS,
     // FVal, respectively.
     ConstantSDNode *RHSVal = dyn_cast<ConstantSDNode>(RHS);
     if (Opcode == AArch64ISD::CSEL && RHSVal && !RHSVal->isOne() &&
-        !RHSVal->isNullValue() && !RHSVal->isAllOnesValue()) {
+        !RHSVal->isZero() && !RHSVal->isAllOnes()) {
       AArch64CC::CondCode AArch64CC = changeIntCCToAArch64CC(CC);
       // Transform "a == C ? C : x" to "a == C ? a : x" and "a != C ? x : C" to
       // "a != C ? x : a" to avoid materializing C.
@@ -7484,11 +9191,41 @@ SDValue AArch64TargetLowering::LowerSELECT_CC(ISD::CondCode CC, SDValue LHS,
 
 SDValue AArch64TargetLowering::LowerVECTOR_SPLICE(SDValue Op,
                                                   SelectionDAG &DAG) const {
-
   EVT Ty = Op.getValueType();
   auto Idx = Op.getConstantOperandAPInt(2);
-  if (Idx.sge(-1) && Idx.slt(Ty.getVectorMinNumElements()))
+  int64_t IdxVal = Idx.getSExtValue();
+  assert(Ty.isScalableVector() &&
+         "Only expect scalable vectors for custom lowering of VECTOR_SPLICE");
+
+  // We can use the splice instruction for certain index values where we are
+  // able to efficiently generate the correct predicate. The index will be
+  // inverted and used directly as the input to the ptrue instruction, i.e.
+  // -1 -> vl1, -2 -> vl2, etc. The predicate will then be reversed to get the
+  // splice predicate. However, we can only do this if we can guarantee that
+  // there are enough elements in the vector, hence we check the index <= min
+  // number of elements.
+  std::optional<unsigned> PredPattern;
+  if (Ty.isScalableVector() && IdxVal < 0 &&
+      (PredPattern = getSVEPredPatternFromNumElements(std::abs(IdxVal))) !=
+          std::nullopt) {
+    SDLoc DL(Op);
+
+    // Create a predicate where all but the last -IdxVal elements are false.
+    EVT PredVT = Ty.changeVectorElementType(MVT::i1);
+    SDValue Pred = getPTrue(DAG, DL, PredVT, *PredPattern);
+    Pred = DAG.getNode(ISD::VECTOR_REVERSE, DL, PredVT, Pred);
+
+    // Now splice the two inputs together using the predicate.
+    return DAG.getNode(AArch64ISD::SPLICE, DL, Ty, Pred, Op.getOperand(0),
+                       Op.getOperand(1));
+  }
+
+  // This will select to an EXT instruction, which has a maximum immediate
+  // value of 255, hence 2048-bits is the maximum value we can lower.
+  if (IdxVal >= 0 &&
+      IdxVal < int64_t(2048 / Ty.getVectorElementType().getSizeInBits()))
     return Op;
+
   return SDValue();
 }
 
@@ -7557,7 +9294,32 @@ SDValue AArch64TargetLowering::LowerSELECT(SDValue Op,
     RHS = DAG.getConstant(0, DL, CCVal.getValueType());
     CC = ISD::SETNE;
   }
-  return LowerSELECT_CC(CC, LHS, RHS, TVal, FVal, DL, DAG);
+
+  // If we are lowering a f16 and we do not have fullf16, convert to a f32 in
+  // order to use FCSELSrrr
+  if ((Ty == MVT::f16 || Ty == MVT::bf16) && !Subtarget->hasFullFP16()) {
+    TVal = SDValue(
+        DAG.getMachineNode(TargetOpcode::INSERT_SUBREG, DL, MVT::f32,
+                           DAG.getUNDEF(MVT::f32), TVal,
+                           DAG.getTargetConstant(AArch64::hsub, DL, MVT::i32)),
+        0);
+    FVal = SDValue(
+        DAG.getMachineNode(TargetOpcode::INSERT_SUBREG, DL, MVT::f32,
+                           DAG.getUNDEF(MVT::f32), FVal,
+                           DAG.getTargetConstant(AArch64::hsub, DL, MVT::i32)),
+        0);
+  }
+
+  SDValue Res = LowerSELECT_CC(CC, LHS, RHS, TVal, FVal, DL, DAG);
+
+  if ((Ty == MVT::f16 || Ty == MVT::bf16) && !Subtarget->hasFullFP16()) {
+    Res = SDValue(
+        DAG.getMachineNode(TargetOpcode::EXTRACT_SUBREG, DL, Ty, Res,
+                           DAG.getTargetConstant(AArch64::hsub, DL, MVT::i32)),
+        0);
+  }
+
+  return Res;
 }
 
 SDValue AArch64TargetLowering::LowerJumpTable(SDValue Op,
@@ -7639,14 +9401,30 @@ SDValue AArch64TargetLowering::LowerDarwin_VASTART(SDValue Op,
 
 SDValue AArch64TargetLowering::LowerWin64_VASTART(SDValue Op,
                                                   SelectionDAG &DAG) const {
-  AArch64FunctionInfo *FuncInfo =
-      DAG.getMachineFunction().getInfo<AArch64FunctionInfo>();
+  MachineFunction &MF = DAG.getMachineFunction();
+  AArch64FunctionInfo *FuncInfo = MF.getInfo<AArch64FunctionInfo>();
 
   SDLoc DL(Op);
-  SDValue FR = DAG.getFrameIndex(FuncInfo->getVarArgsGPRSize() > 0
-                                     ? FuncInfo->getVarArgsGPRIndex()
-                                     : FuncInfo->getVarArgsStackIndex(),
-                                 getPointerTy(DAG.getDataLayout()));
+  SDValue FR;
+  if (Subtarget->isWindowsArm64EC()) {
+    // With the Arm64EC ABI, we compute the address of the varargs save area
+    // relative to x4. For a normal AArch64->AArch64 call, x4 == sp on entry,
+    // but calls from an entry thunk can pass in a different address.
+    Register VReg = MF.addLiveIn(AArch64::X4, &AArch64::GPR64RegClass);
+    SDValue Val = DAG.getCopyFromReg(DAG.getEntryNode(), DL, VReg, MVT::i64);
+    uint64_t StackOffset;
+    if (FuncInfo->getVarArgsGPRSize() > 0)
+      StackOffset = -(uint64_t)FuncInfo->getVarArgsGPRSize();
+    else
+      StackOffset = FuncInfo->getVarArgsStackOffset();
+    FR = DAG.getNode(ISD::ADD, DL, MVT::i64, Val,
+                     DAG.getConstant(StackOffset, DL, MVT::i64));
+  } else {
+    FR = DAG.getFrameIndex(FuncInfo->getVarArgsGPRSize() > 0
+                               ? FuncInfo->getVarArgsGPRIndex()
+                               : FuncInfo->getVarArgsStackIndex(),
+                           getPointerTy(DAG.getDataLayout()));
+  }
   const Value *SV = cast<SrcValueSDNode>(Op.getOperand(2))->getValue();
   return DAG.getStore(Op.getOperand(0), DL, FR, Op.getOperand(1),
                       MachinePointerInfo(SV));
@@ -7821,8 +9599,9 @@ SDValue AArch64TargetLowering::LowerVAARG(SDValue Op, SelectionDAG &DAG) const {
     SDValue WideFP =
         DAG.getLoad(MVT::f64, DL, APStore, VAList, MachinePointerInfo());
     // Round the value down to an f32.
-    SDValue NarrowFP = DAG.getNode(ISD::FP_ROUND, DL, VT, WideFP.getValue(0),
-                                   DAG.getIntPtrConstant(1, DL));
+    SDValue NarrowFP =
+        DAG.getNode(ISD::FP_ROUND, DL, VT, WideFP.getValue(0),
+                    DAG.getIntPtrConstant(1, DL, /*isTarget=*/true));
     SDValue Ops[] = { NarrowFP, WideFP.getValue(1) };
     // Merge the rounded value with the chain output of the load.
     return DAG.getMergeValues(Ops, DL);
@@ -7915,7 +9694,7 @@ SDValue AArch64TargetLowering::LowerRETURNADDR(SDValue Op,
   } else {
     // Return LR, which contains the return address. Mark it an implicit
     // live-in.
-    unsigned Reg = MF.addLiveIn(AArch64::LR, &AArch64::GPR64RegClass);
+    Register Reg = MF.addLiveIn(AArch64::LR, &AArch64::GPR64RegClass);
     ReturnAddress = DAG.getCopyFromReg(DAG.getEntryNode(), DL, Reg, VT);
   }
 
@@ -7996,10 +9775,12 @@ static SDValue getEstimate(const AArch64Subtarget *ST, unsigned Opcode,
                            SDValue Operand, SelectionDAG &DAG,
                            int &ExtraSteps) {
   EVT VT = Operand.getValueType();
-  if (ST->hasNEON() &&
-      (VT == MVT::f64 || VT == MVT::v1f64 || VT == MVT::v2f64 ||
-       VT == MVT::f32 || VT == MVT::v1f32 ||
-       VT == MVT::v2f32 || VT == MVT::v4f32)) {
+  if ((ST->hasNEON() &&
+       (VT == MVT::f64 || VT == MVT::v1f64 || VT == MVT::v2f64 ||
+        VT == MVT::f32 || VT == MVT::v1f32 || VT == MVT::v2f32 ||
+        VT == MVT::v4f32)) ||
+      (ST->hasSVE() &&
+       (VT == MVT::nxv8f16 || VT == MVT::nxv4f32 || VT == MVT::nxv2f64))) {
     if (ExtraSteps == TargetLoweringBase::ReciprocalEstimate::Unspecified)
       // For the reciprocal estimates, convergence is quadratic, so the number
       // of digits is doubled after each iteration.  In ARMv8, the accuracy of
@@ -8558,12 +10339,13 @@ SDValue AArch64TargetLowering::ReconstructShuffle(SDValue Op,
     if (V.isUndef())
       continue;
     else if (V.getOpcode() != ISD::EXTRACT_VECTOR_ELT ||
-             !isa<ConstantSDNode>(V.getOperand(1))) {
+             !isa<ConstantSDNode>(V.getOperand(1)) ||
+             V.getOperand(0).getValueType().isScalableVector()) {
       LLVM_DEBUG(
           dbgs() << "Reshuffle failed: "
                     "a shuffle can only come from building a vector from "
-                    "various elements of other vectors, provided their "
-                    "indices are constant\n");
+                    "various elements of other fixed-width vectors, provided "
+                    "their indices are constant\n");
       return SDValue();
     }
 
@@ -8579,10 +10361,72 @@ SDValue AArch64TargetLowering::ReconstructShuffle(SDValue Op,
     Source->MaxElt = std::max(Source->MaxElt, EltNo);
   }
 
+  // If we have 3 or 4 sources, try to generate a TBL, which will at least be
+  // better than moving to/from gpr registers for larger vectors.
+  if ((Sources.size() == 3 || Sources.size() == 4) && NumElts > 4) {
+    // Construct a mask for the tbl. We may need to adjust the index for types
+    // larger than i8.
+    SmallVector<unsigned, 16> Mask;
+    unsigned OutputFactor = VT.getScalarSizeInBits() / 8;
+    for (unsigned I = 0; I < NumElts; ++I) {
+      SDValue V = Op.getOperand(I);
+      if (V.isUndef()) {
+        for (unsigned OF = 0; OF < OutputFactor; OF++)
+          Mask.push_back(-1);
+        continue;
+      }
+      // Set the Mask lanes adjusted for the size of the input and output
+      // lanes. The Mask is always i8, so it will set OutputFactor lanes per
+      // output element, adjusted in their positions per input and output types.
+      unsigned Lane = V.getConstantOperandVal(1);
+      for (unsigned S = 0; S < Sources.size(); S++) {
+        if (V.getOperand(0) == Sources[S].Vec) {
+          unsigned InputSize = Sources[S].Vec.getScalarValueSizeInBits();
+          unsigned InputBase = 16 * S + Lane * InputSize / 8;
+          for (unsigned OF = 0; OF < OutputFactor; OF++)
+            Mask.push_back(InputBase + OF);
+          break;
+        }
+      }
+    }
+
+    // Construct the tbl3/tbl4 out of an intrinsic, the sources converted to
+    // v16i8, and the TBLMask
+    SmallVector<SDValue, 16> TBLOperands;
+    TBLOperands.push_back(DAG.getConstant(Sources.size() == 3
+                                              ? Intrinsic::aarch64_neon_tbl3
+                                              : Intrinsic::aarch64_neon_tbl4,
+                                          dl, MVT::i32));
+    for (unsigned i = 0; i < Sources.size(); i++) {
+      SDValue Src = Sources[i].Vec;
+      EVT SrcVT = Src.getValueType();
+      Src = DAG.getBitcast(SrcVT.is64BitVector() ? MVT::v8i8 : MVT::v16i8, Src);
+      assert((SrcVT.is64BitVector() || SrcVT.is128BitVector()) &&
+             "Expected a legally typed vector");
+      if (SrcVT.is64BitVector())
+        Src = DAG.getNode(ISD::CONCAT_VECTORS, dl, MVT::v16i8, Src,
+                          DAG.getUNDEF(MVT::v8i8));
+      TBLOperands.push_back(Src);
+    }
+
+    SmallVector<SDValue, 16> TBLMask;
+    for (unsigned i = 0; i < Mask.size(); i++)
+      TBLMask.push_back(DAG.getConstant(Mask[i], dl, MVT::i32));
+    assert((Mask.size() == 8 || Mask.size() == 16) &&
+           "Expected a v8i8 or v16i8 Mask");
+    TBLOperands.push_back(
+        DAG.getBuildVector(Mask.size() == 8 ? MVT::v8i8 : MVT::v16i8, dl, TBLMask));
+
+    SDValue Shuffle =
+        DAG.getNode(ISD::INTRINSIC_WO_CHAIN, dl,
+                    Mask.size() == 8 ? MVT::v8i8 : MVT::v16i8, TBLOperands);
+    return DAG.getBitcast(VT, Shuffle);
+  }
+
   if (Sources.size() > 2) {
-    LLVM_DEBUG(
-        dbgs() << "Reshuffle failed: currently only do something sane when at "
-                  "most two source vectors are involved\n");
+    LLVM_DEBUG(dbgs() << "Reshuffle failed: currently only do something "
+                      << "sensible when at most two source vectors are "
+                      << "involved\n");
     return SDValue();
   }
 
@@ -8607,8 +10451,8 @@ SDValue AArch64TargetLowering::ReconstructShuffle(SDValue Op,
   for (auto &Src : Sources) {
     EVT SrcVT = Src.ShuffleVec.getValueType();
 
-    uint64_t SrcVTSize = SrcVT.getFixedSizeInBits();
-    if (SrcVTSize == VTSize)
+    TypeSize SrcVTSize = SrcVT.getSizeInBits();
+    if (SrcVTSize == TypeSize::Fixed(VTSize))
       continue;
 
     // This stage of the search produces a source with the same element type as
@@ -8617,7 +10461,7 @@ SDValue AArch64TargetLowering::ReconstructShuffle(SDValue Op,
     unsigned NumSrcElts = VTSize / EltVT.getFixedSizeInBits();
     EVT DestVT = EVT::getVectorVT(*DAG.getContext(), EltVT, NumSrcElts);
 
-    if (SrcVTSize < VTSize) {
+    if (SrcVTSize.getFixedValue() < VTSize) {
       assert(2 * SrcVTSize == VTSize);
       // We can pad out the smaller vector for free, so if it's part of a
       // shuffle...
@@ -8627,7 +10471,7 @@ SDValue AArch64TargetLowering::ReconstructShuffle(SDValue Op,
       continue;
     }
 
-    if (SrcVTSize != 2 * VTSize) {
+    if (SrcVTSize.getFixedValue() != 2 * VTSize) {
       LLVM_DEBUG(
           dbgs() << "Reshuffle failed: result vector too small to extract\n");
       return SDValue();
@@ -8688,7 +10532,7 @@ SDValue AArch64TargetLowering::ReconstructShuffle(SDValue Op,
     Src.WindowBase *= Src.WindowScale;
   }
 
-  // Final sanity check before we try to actually produce a shuffle.
+  // Final check before we try to actually produce a shuffle.
   LLVM_DEBUG(for (auto Src
                   : Sources)
                  assert(Src.ShuffleVec.getValueType() == ShuffleVT););
@@ -8773,6 +10617,56 @@ static bool isSingletonEXTMask(ArrayRef<int> M, EVT VT, unsigned &Imm) {
   return true;
 }
 
+// Detect patterns of a0,a1,a2,a3,b0,b1,b2,b3,c0,c1,c2,c3,d0,d1,d2,d3 from
+// v4i32s. This is really a truncate, which we can construct out of (legal)
+// concats and truncate nodes.
+static SDValue ReconstructTruncateFromBuildVector(SDValue V, SelectionDAG &DAG) {
+  if (V.getValueType() != MVT::v16i8)
+    return SDValue();
+  assert(V.getNumOperands() == 16 && "Expected 16 operands on the BUILDVECTOR");
+
+  for (unsigned X = 0; X < 4; X++) {
+    // Check the first item in each group is an extract from lane 0 of a v4i32
+    // or v4i16.
+    SDValue BaseExt = V.getOperand(X * 4);
+    if (BaseExt.getOpcode() != ISD::EXTRACT_VECTOR_ELT ||
+        (BaseExt.getOperand(0).getValueType() != MVT::v4i16 &&
+         BaseExt.getOperand(0).getValueType() != MVT::v4i32) ||
+        !isa<ConstantSDNode>(BaseExt.getOperand(1)) ||
+        BaseExt.getConstantOperandVal(1) != 0)
+      return SDValue();
+    SDValue Base = BaseExt.getOperand(0);
+    // And check the other items are extracts from the same vector.
+    for (unsigned Y = 1; Y < 4; Y++) {
+      SDValue Ext = V.getOperand(X * 4 + Y);
+      if (Ext.getOpcode() != ISD::EXTRACT_VECTOR_ELT ||
+          Ext.getOperand(0) != Base ||
+          !isa<ConstantSDNode>(Ext.getOperand(1)) ||
+          Ext.getConstantOperandVal(1) != Y)
+        return SDValue();
+    }
+  }
+
+  // Turn the buildvector into a series of truncates and concates, which will
+  // become uzip1's. Any v4i32s we found get truncated to v4i16, which are
+  // concat together to produce 2 v8i16. These are both truncated and concat
+  // together.
+  SDLoc DL(V);
+  SDValue Trunc[4] = {
+      V.getOperand(0).getOperand(0), V.getOperand(4).getOperand(0),
+      V.getOperand(8).getOperand(0), V.getOperand(12).getOperand(0)};
+  for (SDValue &V : Trunc)
+    if (V.getValueType() == MVT::v4i32)
+      V = DAG.getNode(ISD::TRUNCATE, DL, MVT::v4i16, V);
+  SDValue Concat0 =
+      DAG.getNode(ISD::CONCAT_VECTORS, DL, MVT::v8i16, Trunc[0], Trunc[1]);
+  SDValue Concat1 =
+      DAG.getNode(ISD::CONCAT_VECTORS, DL, MVT::v8i16, Trunc[2], Trunc[3]);
+  SDValue Trunc0 = DAG.getNode(ISD::TRUNCATE, DL, MVT::v8i8, Concat0);
+  SDValue Trunc1 = DAG.getNode(ISD::TRUNCATE, DL, MVT::v8i8, Concat1);
+  return DAG.getNode(ISD::CONCAT_VECTORS, DL, MVT::v16i8, Trunc0, Trunc1);
+}
+
 /// Check if a vector shuffle corresponds to a DUP instructions with a larger
 /// element width than the vector lane type. If that is the case the function
 /// returns true and writes the value of the DUP instruction lane operand into
@@ -8861,9 +10755,10 @@ static bool isEXTMask(ArrayRef<int> M, EVT VT, bool &ReverseEXT,
   APInt ExpectedElt = APInt(MaskBits, *FirstRealElt + 1);
   // The following shuffle indices must be the successive elements after the
   // first real element.
-  const int *FirstWrongElt = std::find_if(FirstRealElt + 1, M.end(),
-      [&](int Elt) {return Elt != ExpectedElt++ && Elt != -1;});
-  if (FirstWrongElt != M.end())
+  bool FoundWrongElt = std::any_of(FirstRealElt + 1, M.end(), [&](int Elt) {
+    return Elt != ExpectedElt++ && Elt != -1;
+  });
+  if (FoundWrongElt)
     return false;
 
   // The index of an EXT is the first element if it is not UNDEF.
@@ -8892,13 +10787,11 @@ static bool isEXTMask(ArrayRef<int> M, EVT VT, bool &ReverseEXT,
 /// instruction with the specified blocksize.  (The order of the elements
 /// within each block of the vector is reversed.)
 static bool isREVMask(ArrayRef<int> M, EVT VT, unsigned BlockSize) {
-  assert((BlockSize == 16 || BlockSize == 32 || BlockSize == 64) &&
-         "Only possible block sizes for REV are: 16, 32, 64");
-
-  unsigned EltSz = VT.getScalarSizeInBits();
-  if (EltSz == 64)
-    return false;
+  assert((BlockSize == 16 || BlockSize == 32 || BlockSize == 64 ||
+          BlockSize == 128) &&
+         "Only possible block sizes for REV are: 16, 32, 64, 128");
 
+  unsigned EltSz = VT.getScalarSizeInBits();
   unsigned NumElts = VT.getVectorNumElements();
   unsigned BlockElts = M[0] + 1;
   // If the first shuffle index is UNDEF, be optimistic.
@@ -9102,8 +10995,12 @@ static SDValue tryFormConcatFromShuffle(SDValue Op, SelectionDAG &DAG) {
 }
 
 /// GeneratePerfectShuffle - Given an entry in the perfect-shuffle table, emit
-/// the specified operations to build the shuffle.
-static SDValue GeneratePerfectShuffle(unsigned PFEntry, SDValue LHS,
+/// the specified operations to build the shuffle. ID is the perfect-shuffle
+//ID, V1 and V2 are the original shuffle inputs. PFEntry is the Perfect shuffle
+//table entry and LHS/RHS are the immediate inputs for this stage of the
+//shuffle.
+static SDValue GeneratePerfectShuffle(unsigned ID, SDValue V1,
+                                      SDValue V2, unsigned PFEntry, SDValue LHS,
                                       SDValue RHS, SelectionDAG &DAG,
                                       const SDLoc &dl) {
   unsigned OpNum = (PFEntry >> 26) & 0x0F;
@@ -9120,12 +11017,13 @@ static SDValue GeneratePerfectShuffle(unsigned PFEntry, SDValue LHS,
     OP_VEXT1,
     OP_VEXT2,
     OP_VEXT3,
-    OP_VUZPL, // VUZP, left result
-    OP_VUZPR, // VUZP, right result
-    OP_VZIPL, // VZIP, left result
-    OP_VZIPR, // VZIP, right result
-    OP_VTRNL, // VTRN, left result
-    OP_VTRNR  // VTRN, right result
+    OP_VUZPL,  // VUZP, left result
+    OP_VUZPR,  // VUZP, right result
+    OP_VZIPL,  // VZIP, left result
+    OP_VZIPR,  // VZIP, right result
+    OP_VTRNL,  // VTRN, left result
+    OP_VTRNR,  // VTRN, right result
+    OP_MOVLANE // Move lane. RHSID is the lane to move into
   };
 
   if (OpNum == OP_COPY) {
@@ -9135,9 +11033,71 @@ static SDValue GeneratePerfectShuffle(unsigned PFEntry, SDValue LHS,
     return RHS;
   }
 
+  if (OpNum == OP_MOVLANE) {
+    // Decompose a PerfectShuffle ID to get the Mask for lane Elt
+    auto getPFIDLane = [](unsigned ID, int Elt) -> int {
+      assert(Elt < 4 && "Expected Perfect Lanes to be less than 4");
+      Elt = 3 - Elt;
+      while (Elt > 0) {
+        ID /= 9;
+        Elt--;
+      }
+      return (ID % 9 == 8) ? -1 : ID % 9;
+    };
+
+    // For OP_MOVLANE shuffles, the RHSID represents the lane to move into. We
+    // get the lane to move from from the PFID, which is always from the
+    // original vectors (V1 or V2).
+    SDValue OpLHS = GeneratePerfectShuffle(
+        LHSID, V1, V2, PerfectShuffleTable[LHSID], LHS, RHS, DAG, dl);
+    EVT VT = OpLHS.getValueType();
+    assert(RHSID < 8 && "Expected a lane index for RHSID!");
+    unsigned ExtLane = 0;
+    SDValue Input;
+
+    // OP_MOVLANE are either D movs (if bit 0x4 is set) or S movs. D movs
+    // convert into a higher type.
+    if (RHSID & 0x4) {
+      int MaskElt = getPFIDLane(ID, (RHSID & 0x01) << 1) >> 1;
+      if (MaskElt == -1)
+        MaskElt = (getPFIDLane(ID, ((RHSID & 0x01) << 1) + 1) - 1) >> 1;
+      assert(MaskElt >= 0 && "Didn't expect an undef movlane index!");
+      ExtLane = MaskElt < 2 ? MaskElt : (MaskElt - 2);
+      Input = MaskElt < 2 ? V1 : V2;
+      if (VT.getScalarSizeInBits() == 16) {
+        Input = DAG.getBitcast(MVT::v2f32, Input);
+        OpLHS = DAG.getBitcast(MVT::v2f32, OpLHS);
+      } else {
+        assert(VT.getScalarSizeInBits() == 32 &&
+               "Expected 16 or 32 bit shuffle elemements");
+        Input = DAG.getBitcast(MVT::v2f64, Input);
+        OpLHS = DAG.getBitcast(MVT::v2f64, OpLHS);
+      }
+    } else {
+      int MaskElt = getPFIDLane(ID, RHSID);
+      assert(MaskElt >= 0 && "Didn't expect an undef movlane index!");
+      ExtLane = MaskElt < 4 ? MaskElt : (MaskElt - 4);
+      Input = MaskElt < 4 ? V1 : V2;
+      // Be careful about creating illegal types. Use f16 instead of i16.
+      if (VT == MVT::v4i16) {
+        Input = DAG.getBitcast(MVT::v4f16, Input);
+        OpLHS = DAG.getBitcast(MVT::v4f16, OpLHS);
+      }
+    }
+    SDValue Ext = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, dl,
+                              Input.getValueType().getVectorElementType(),
+                              Input, DAG.getVectorIdxConstant(ExtLane, dl));
+    SDValue Ins =
+        DAG.getNode(ISD::INSERT_VECTOR_ELT, dl, Input.getValueType(), OpLHS,
+                    Ext, DAG.getVectorIdxConstant(RHSID & 0x3, dl));
+    return DAG.getBitcast(VT, Ins);
+  }
+
   SDValue OpLHS, OpRHS;
-  OpLHS = GeneratePerfectShuffle(PerfectShuffleTable[LHSID], LHS, RHS, DAG, dl);
-  OpRHS = GeneratePerfectShuffle(PerfectShuffleTable[RHSID], LHS, RHS, DAG, dl);
+  OpLHS = GeneratePerfectShuffle(LHSID, V1, V2, PerfectShuffleTable[LHSID], LHS,
+                                 RHS, DAG, dl);
+  OpRHS = GeneratePerfectShuffle(RHSID, V1, V2, PerfectShuffleTable[RHSID], LHS,
+                                 RHS, DAG, dl);
   EVT VT = OpLHS.getValueType();
 
   switch (OpNum) {
@@ -9216,14 +11176,16 @@ static SDValue GenerateTBL(SDValue Op, ArrayRef<int> ShuffleMask,
   EVT EltVT = Op.getValueType().getVectorElementType();
   unsigned BytesPerElt = EltVT.getSizeInBits() / 8;
 
-  SmallVector<SDValue, 8> TBLMask;
-  for (int Val : ShuffleMask) {
-    for (unsigned Byte = 0; Byte < BytesPerElt; ++Byte) {
-      unsigned Offset = Byte + Val * BytesPerElt;
-      TBLMask.push_back(DAG.getConstant(Offset, DL, MVT::i32));
-    }
+  bool Swap = false;
+  if (V1.isUndef() || isZerosVector(V1.getNode())) {
+    std::swap(V1, V2);
+    Swap = true;
   }
 
+  // If the V2 source is undef or zero then we can use a tbl1, as tbl1 will fill
+  // out of range values with 0s. We do need to make sure that any out-of-range
+  // values are really out-of-range for a v16i8 vector.
+  bool IsUndefOrZero = V2.isUndef() || isZerosVector(V2.getNode());
   MVT IndexVT = MVT::v8i8;
   unsigned IndexLen = 8;
   if (Op.getValueSizeInBits() == 128) {
@@ -9231,26 +11193,36 @@ static SDValue GenerateTBL(SDValue Op, ArrayRef<int> ShuffleMask,
     IndexLen = 16;
   }
 
+  SmallVector<SDValue, 8> TBLMask;
+  for (int Val : ShuffleMask) {
+    for (unsigned Byte = 0; Byte < BytesPerElt; ++Byte) {
+      unsigned Offset = Byte + Val * BytesPerElt;
+      if (Swap)
+        Offset = Offset < IndexLen ? Offset + IndexLen : Offset - IndexLen;
+      if (IsUndefOrZero && Offset >= IndexLen)
+        Offset = 255;
+      TBLMask.push_back(DAG.getConstant(Offset, DL, MVT::i32));
+    }
+  }
+
   SDValue V1Cst = DAG.getNode(ISD::BITCAST, DL, IndexVT, V1);
   SDValue V2Cst = DAG.getNode(ISD::BITCAST, DL, IndexVT, V2);
 
   SDValue Shuffle;
-  if (V2.getNode()->isUndef()) {
+  if (IsUndefOrZero) {
     if (IndexLen == 8)
       V1Cst = DAG.getNode(ISD::CONCAT_VECTORS, DL, MVT::v16i8, V1Cst, V1Cst);
     Shuffle = DAG.getNode(
         ISD::INTRINSIC_WO_CHAIN, DL, IndexVT,
         DAG.getConstant(Intrinsic::aarch64_neon_tbl1, DL, MVT::i32), V1Cst,
-        DAG.getBuildVector(IndexVT, DL,
-                           makeArrayRef(TBLMask.data(), IndexLen)));
+        DAG.getBuildVector(IndexVT, DL, ArrayRef(TBLMask.data(), IndexLen)));
   } else {
     if (IndexLen == 8) {
       V1Cst = DAG.getNode(ISD::CONCAT_VECTORS, DL, MVT::v16i8, V1Cst, V2Cst);
       Shuffle = DAG.getNode(
           ISD::INTRINSIC_WO_CHAIN, DL, IndexVT,
           DAG.getConstant(Intrinsic::aarch64_neon_tbl1, DL, MVT::i32), V1Cst,
-          DAG.getBuildVector(IndexVT, DL,
-                             makeArrayRef(TBLMask.data(), IndexLen)));
+          DAG.getBuildVector(IndexVT, DL, ArrayRef(TBLMask.data(), IndexLen)));
     } else {
       // FIXME: We cannot, for the moment, emit a TBL2 instruction because we
       // cannot currently represent the register constraints on the input
@@ -9261,8 +11233,8 @@ static SDValue GenerateTBL(SDValue Op, ArrayRef<int> ShuffleMask,
       Shuffle = DAG.getNode(
           ISD::INTRINSIC_WO_CHAIN, DL, IndexVT,
           DAG.getConstant(Intrinsic::aarch64_neon_tbl2, DL, MVT::i32), V1Cst,
-          V2Cst, DAG.getBuildVector(IndexVT, DL,
-                                    makeArrayRef(TBLMask.data(), IndexLen)));
+          V2Cst,
+          DAG.getBuildVector(IndexVT, DL, ArrayRef(TBLMask.data(), IndexLen)));
     }
   }
   return DAG.getNode(ISD::BITCAST, DL, Op.getValueType(), Shuffle);
@@ -9300,6 +11272,10 @@ static SDValue constructDup(SDValue V, int Lane, SDLoc dl, EVT VT,
     if (ExtIdxInBits % CastedEltBitWidth != 0)
       return false;
 
+    // Can't handle cases where vector size is not 128-bit
+    if (!Extract.getOperand(0).getValueType().is128BitVector())
+      return false;
+
     // Update the lane value by offsetting with the scaled extract index.
     LaneC += ExtIdxInBits / CastedEltBitWidth;
 
@@ -9317,7 +11293,8 @@ static SDValue constructDup(SDValue V, int Lane, SDLoc dl, EVT VT,
   MVT CastVT;
   if (getScaledOffsetDup(V, Lane, CastVT)) {
     V = DAG.getBitcast(CastVT, V.getOperand(0).getOperand(0));
-  } else if (V.getOpcode() == ISD::EXTRACT_SUBVECTOR) {
+  } else if (V.getOpcode() == ISD::EXTRACT_SUBVECTOR &&
+             V.getOperand(0).getValueType().is128BitVector()) {
     // The lane is incremented by the index of the extract.
     // Example: dup v2f32 (extract v4f32 X, 2), 1 --> dup v4f32 X, 3
     Lane += V.getConstantOperandVal(1);
@@ -9335,6 +11312,152 @@ static SDValue constructDup(SDValue V, int Lane, SDLoc dl, EVT VT,
   return DAG.getNode(Opcode, dl, VT, V, DAG.getConstant(Lane, dl, MVT::i64));
 }
 
+// Return true if we can get a new shuffle mask by checking the parameter mask
+// array to test whether every two adjacent mask values are continuous and
+// starting from an even number.
+static bool isWideTypeMask(ArrayRef<int> M, EVT VT,
+                           SmallVectorImpl<int> &NewMask) {
+  unsigned NumElts = VT.getVectorNumElements();
+  if (NumElts % 2 != 0)
+    return false;
+
+  NewMask.clear();
+  for (unsigned i = 0; i < NumElts; i += 2) {
+    int M0 = M[i];
+    int M1 = M[i + 1];
+
+    // If both elements are undef, new mask is undef too.
+    if (M0 == -1 && M1 == -1) {
+      NewMask.push_back(-1);
+      continue;
+    }
+
+    if (M0 == -1 && M1 != -1 && (M1 % 2) == 1) {
+      NewMask.push_back(M1 / 2);
+      continue;
+    }
+
+    if (M0 != -1 && (M0 % 2) == 0 && ((M0 + 1) == M1 || M1 == -1)) {
+      NewMask.push_back(M0 / 2);
+      continue;
+    }
+
+    NewMask.clear();
+    return false;
+  }
+
+  assert(NewMask.size() == NumElts / 2 && "Incorrect size for mask!");
+  return true;
+}
+
+// Try to widen element type to get a new mask value for a better permutation
+// sequence, so that we can use NEON shuffle instructions, such as zip1/2,
+// UZP1/2, TRN1/2, REV, INS, etc.
+// For example:
+//  shufflevector <4 x i32> %a, <4 x i32> %b,
+//                <4 x i32> <i32 6, i32 7, i32 2, i32 3>
+// is equivalent to:
+//  shufflevector <2 x i64> %a, <2 x i64> %b, <2 x i32> <i32 3, i32 1>
+// Finally, we can get:
+//  mov     v0.d[0], v1.d[1]
+static SDValue tryWidenMaskForShuffle(SDValue Op, SelectionDAG &DAG) {
+  SDLoc DL(Op);
+  EVT VT = Op.getValueType();
+  EVT ScalarVT = VT.getVectorElementType();
+  unsigned ElementSize = ScalarVT.getFixedSizeInBits();
+  SDValue V0 = Op.getOperand(0);
+  SDValue V1 = Op.getOperand(1);
+  ArrayRef<int> Mask = cast<ShuffleVectorSDNode>(Op)->getMask();
+
+  // If combining adjacent elements, like two i16's -> i32, two i32's -> i64 ...
+  // We need to make sure the wider element type is legal. Thus, ElementSize
+  // should be not larger than 32 bits, and i1 type should also be excluded.
+  if (ElementSize > 32 || ElementSize == 1)
+    return SDValue();
+
+  SmallVector<int, 8> NewMask;
+  if (isWideTypeMask(Mask, VT, NewMask)) {
+    MVT NewEltVT = VT.isFloatingPoint()
+                       ? MVT::getFloatingPointVT(ElementSize * 2)
+                       : MVT::getIntegerVT(ElementSize * 2);
+    MVT NewVT = MVT::getVectorVT(NewEltVT, VT.getVectorNumElements() / 2);
+    if (DAG.getTargetLoweringInfo().isTypeLegal(NewVT)) {
+      V0 = DAG.getBitcast(NewVT, V0);
+      V1 = DAG.getBitcast(NewVT, V1);
+      return DAG.getBitcast(VT,
+                            DAG.getVectorShuffle(NewVT, DL, V0, V1, NewMask));
+    }
+  }
+
+  return SDValue();
+}
+
+// Try to fold shuffle (tbl2, tbl2) into a single tbl4.
+static SDValue tryToConvertShuffleOfTbl2ToTbl4(SDValue Op,
+                                               ArrayRef<int> ShuffleMask,
+                                               SelectionDAG &DAG) {
+  SDValue Tbl1 = Op->getOperand(0);
+  SDValue Tbl2 = Op->getOperand(1);
+  SDLoc dl(Op);
+  SDValue Tbl2ID =
+      DAG.getTargetConstant(Intrinsic::aarch64_neon_tbl2, dl, MVT::i64);
+
+  EVT VT = Op.getValueType();
+  if (Tbl1->getOpcode() != ISD::INTRINSIC_WO_CHAIN ||
+      Tbl1->getOperand(0) != Tbl2ID ||
+      Tbl2->getOpcode() != ISD::INTRINSIC_WO_CHAIN ||
+      Tbl2->getOperand(0) != Tbl2ID)
+    return SDValue();
+
+  if (Tbl1->getValueType(0) != MVT::v16i8 ||
+      Tbl2->getValueType(0) != MVT::v16i8)
+    return SDValue();
+
+  SDValue Mask1 = Tbl1->getOperand(3);
+  SDValue Mask2 = Tbl2->getOperand(3);
+  SmallVector<SDValue, 16> TBLMaskParts(16, SDValue());
+  for (unsigned I = 0; I < 16; I++) {
+    if (ShuffleMask[I] < 16)
+      TBLMaskParts[I] = Mask1->getOperand(ShuffleMask[I]);
+    else {
+      auto *C =
+          dyn_cast<ConstantSDNode>(Mask2->getOperand(ShuffleMask[I] - 16));
+      if (!C)
+        return SDValue();
+      TBLMaskParts[I] = DAG.getConstant(C->getSExtValue() + 32, dl, MVT::i32);
+    }
+  }
+
+  SDValue TBLMask = DAG.getBuildVector(VT, dl, TBLMaskParts);
+  SDValue ID =
+      DAG.getTargetConstant(Intrinsic::aarch64_neon_tbl4, dl, MVT::i64);
+
+  return DAG.getNode(ISD::INTRINSIC_WO_CHAIN, dl, MVT::v16i8,
+                     {ID, Tbl1->getOperand(1), Tbl1->getOperand(2),
+                      Tbl2->getOperand(1), Tbl2->getOperand(2), TBLMask});
+}
+
+// Baseline legalization for ZERO_EXTEND_VECTOR_INREG will blend-in zeros,
+// but we don't have an appropriate instruction,
+// so custom-lower it as ZIP1-with-zeros.
+SDValue
+AArch64TargetLowering::LowerZERO_EXTEND_VECTOR_INREG(SDValue Op,
+                                                     SelectionDAG &DAG) const {
+  SDLoc dl(Op);
+  EVT VT = Op.getValueType();
+  SDValue SrcOp = Op.getOperand(0);
+  EVT SrcVT = SrcOp.getValueType();
+  assert(VT.getScalarSizeInBits() % SrcVT.getScalarSizeInBits() == 0 &&
+         "Unexpected extension factor.");
+  unsigned Scale = VT.getScalarSizeInBits() / SrcVT.getScalarSizeInBits();
+  // FIXME: support multi-step zipping?
+  if (Scale != 2)
+    return SDValue();
+  SDValue Zeros = DAG.getConstant(0, dl, SrcVT);
+  return DAG.getBitcast(VT,
+                        DAG.getNode(AArch64ISD::ZIP1, dl, SrcVT, SrcOp, Zeros));
+}
+
 SDValue AArch64TargetLowering::LowerVECTOR_SHUFFLE(SDValue Op,
                                                    SelectionDAG &DAG) const {
   SDLoc dl(Op);
@@ -9342,7 +11465,8 @@ SDValue AArch64TargetLowering::LowerVECTOR_SHUFFLE(SDValue Op,
 
   ShuffleVectorSDNode *SVN = cast<ShuffleVectorSDNode>(Op.getNode());
 
-  if (useSVEForFixedLengthVectorVT(VT))
+  if (useSVEForFixedLengthVectorVT(VT,
+                                   Subtarget->forceStreamingCompatibleSVE()))
     return LowerFixedLengthVECTOR_SHUFFLEToSVE(Op, DAG);
 
   // Convert shuffles that are directly supported on NEON to target-specific
@@ -9358,6 +11482,9 @@ SDValue AArch64TargetLowering::LowerVECTOR_SHUFFLE(SDValue Op,
   assert(ShuffleMask.size() == VT.getVectorNumElements() &&
          "Unexpected VECTOR_SHUFFLE mask size!");
 
+  if (SDValue Res = tryToConvertShuffleOfTbl2ToTbl4(Op, ShuffleMask, DAG))
+    return Res;
+
   if (SVN->isSplat()) {
     int Lane = SVN->getSplatIndex();
     // If this is undef splat, generate it via "just" vdup, if possible.
@@ -9482,6 +11609,9 @@ SDValue AArch64TargetLowering::LowerVECTOR_SHUFFLE(SDValue Op,
         DstLaneV);
   }
 
+  if (SDValue NewSD = tryWidenMaskForShuffle(Op, DAG))
+    return NewSD;
+
   // If the shuffle is not directly supported and it has 4 elements, use
   // the PerfectShuffle-generated table to synthesize it from other shuffles.
   unsigned NumElts = VT.getVectorNumElements();
@@ -9498,10 +11628,8 @@ SDValue AArch64TargetLowering::LowerVECTOR_SHUFFLE(SDValue Op,
     unsigned PFTableIndex = PFIndexes[0] * 9 * 9 * 9 + PFIndexes[1] * 9 * 9 +
                             PFIndexes[2] * 9 + PFIndexes[3];
     unsigned PFEntry = PerfectShuffleTable[PFTableIndex];
-    unsigned Cost = (PFEntry >> 30);
-
-    if (Cost <= 4)
-      return GeneratePerfectShuffle(PFEntry, V1, V2, DAG, dl);
+    return GeneratePerfectShuffle(PFTableIndex, V1, V2, PFEntry, V1, V2, DAG,
+                                  dl);
   }
 
   return GenerateTBL(Op, ShuffleMask, DAG);
@@ -9509,54 +11637,34 @@ SDValue AArch64TargetLowering::LowerVECTOR_SHUFFLE(SDValue Op,
 
 SDValue AArch64TargetLowering::LowerSPLAT_VECTOR(SDValue Op,
                                                  SelectionDAG &DAG) const {
-  SDLoc dl(Op);
   EVT VT = Op.getValueType();
-  EVT ElemVT = VT.getScalarType();
-  SDValue SplatVal = Op.getOperand(0);
 
-  if (useSVEForFixedLengthVectorVT(VT))
+  if (useSVEForFixedLengthVectorVT(VT,
+                                   Subtarget->forceStreamingCompatibleSVE()))
     return LowerToScalableOp(Op, DAG);
 
-  // Extend input splat value where needed to fit into a GPR (32b or 64b only)
-  // FPRs don't have this restriction.
-  switch (ElemVT.getSimpleVT().SimpleTy) {
-  case MVT::i1: {
-    // The only legal i1 vectors are SVE vectors, so we can use SVE-specific
-    // lowering code.
-    if (auto *ConstVal = dyn_cast<ConstantSDNode>(SplatVal)) {
-      if (ConstVal->isOne())
-        return getPTrue(DAG, dl, VT, AArch64SVEPredPattern::all);
-      // TODO: Add special case for constant false
-    }
-    // The general case of i1.  There isn't any natural way to do this,
-    // so we use some trickery with whilelo.
-    SplatVal = DAG.getAnyExtOrTrunc(SplatVal, dl, MVT::i64);
-    SplatVal = DAG.getNode(ISD::SIGN_EXTEND_INREG, dl, MVT::i64, SplatVal,
-                           DAG.getValueType(MVT::i1));
-    SDValue ID = DAG.getTargetConstant(Intrinsic::aarch64_sve_whilelo, dl,
-                                       MVT::i64);
-    return DAG.getNode(ISD::INTRINSIC_WO_CHAIN, dl, VT, ID,
-                       DAG.getConstant(0, dl, MVT::i64), SplatVal);
-  }
-  case MVT::i8:
-  case MVT::i16:
-  case MVT::i32:
-    SplatVal = DAG.getAnyExtOrTrunc(SplatVal, dl, MVT::i32);
-    break;
-  case MVT::i64:
-    SplatVal = DAG.getAnyExtOrTrunc(SplatVal, dl, MVT::i64);
-    break;
-  case MVT::f16:
-  case MVT::bf16:
-  case MVT::f32:
-  case MVT::f64:
-    // Fine as is
-    break;
-  default:
-    report_fatal_error("Unsupported SPLAT_VECTOR input operand type");
-  }
+  assert(VT.isScalableVector() && VT.getVectorElementType() == MVT::i1 &&
+         "Unexpected vector type!");
+
+  // We can handle the constant cases during isel.
+  if (isa<ConstantSDNode>(Op.getOperand(0)))
+    return Op;
 
-  return DAG.getNode(AArch64ISD::DUP, dl, VT, SplatVal);
+  // There isn't a natural way to handle the general i1 case, so we use some
+  // trickery with whilelo.
+  SDLoc DL(Op);
+  SDValue SplatVal = DAG.getAnyExtOrTrunc(Op.getOperand(0), DL, MVT::i64);
+  SplatVal = DAG.getNode(ISD::SIGN_EXTEND_INREG, DL, MVT::i64, SplatVal,
+                         DAG.getValueType(MVT::i1));
+  SDValue ID =
+      DAG.getTargetConstant(Intrinsic::aarch64_sve_whilelo, DL, MVT::i64);
+  SDValue Zero = DAG.getConstant(0, DL, MVT::i64);
+  if (VT == MVT::nxv1i1)
+    return DAG.getNode(ISD::EXTRACT_SUBVECTOR, DL, MVT::nxv1i1,
+                       DAG.getNode(ISD::INTRINSIC_WO_CHAIN, DL, MVT::nxv2i1, ID,
+                                   Zero, SplatVal),
+                       Zero);
+  return DAG.getNode(ISD::INTRINSIC_WO_CHAIN, DL, VT, ID, Zero, SplatVal);
 }
 
 SDValue AArch64TargetLowering::LowerDUPQLane(SDValue Op,
@@ -9568,22 +11676,21 @@ SDValue AArch64TargetLowering::LowerDUPQLane(SDValue Op,
     return SDValue();
 
   // Current lowering only supports the SVE-ACLE types.
-  if (VT.getSizeInBits().getKnownMinSize() != AArch64::SVEBitsPerBlock)
+  if (VT.getSizeInBits().getKnownMinValue() != AArch64::SVEBitsPerBlock)
     return SDValue();
 
   // The DUPQ operation is indepedent of element type so normalise to i64s.
-  SDValue V = DAG.getNode(ISD::BITCAST, DL, MVT::nxv2i64, Op.getOperand(1));
   SDValue Idx128 = Op.getOperand(2);
 
   // DUPQ can be used when idx is in range.
   auto *CIdx = dyn_cast<ConstantSDNode>(Idx128);
   if (CIdx && (CIdx->getZExtValue() <= 3)) {
     SDValue CI = DAG.getTargetConstant(CIdx->getZExtValue(), DL, MVT::i64);
-    SDNode *DUPQ =
-        DAG.getMachineNode(AArch64::DUP_ZZI_Q, DL, MVT::nxv2i64, V, CI);
-    return DAG.getNode(ISD::BITCAST, DL, VT, SDValue(DUPQ, 0));
+    return DAG.getNode(AArch64ISD::DUPLANE128, DL, VT, Op.getOperand(1), CI);
   }
 
+  SDValue V = DAG.getNode(ISD::BITCAST, DL, MVT::nxv2i64, Op.getOperand(1));
+
   // The ACLE says this must produce the same result as:
   //   svtbl(data, svadd_x(svptrue_b64(),
   //                       svand_x(svptrue_b64(), svindex_u64(0, 1), 1),
@@ -9653,9 +11760,13 @@ static SDValue tryAdvSIMDModImm64(unsigned NewOp, SDValue Op, SelectionDAG &DAG,
 static SDValue tryAdvSIMDModImm32(unsigned NewOp, SDValue Op, SelectionDAG &DAG,
                                   const APInt &Bits,
                                   const SDValue *LHS = nullptr) {
+  EVT VT = Op.getValueType();
+  if (VT.isFixedLengthVector() &&
+      DAG.getSubtarget<AArch64Subtarget>().forceStreamingCompatibleSVE())
+    return SDValue();
+
   if (Bits.getHiBits(64) == Bits.getLoBits(64)) {
     uint64_t Value = Bits.zextOrTrunc(64).getZExtValue();
-    EVT VT = Op.getValueType();
     MVT MovTy = (VT.getSizeInBits() == 128) ? MVT::v4i32 : MVT::v2i32;
     bool isAdvSIMDModImm = false;
     uint64_t Shift;
@@ -9701,9 +11812,13 @@ static SDValue tryAdvSIMDModImm32(unsigned NewOp, SDValue Op, SelectionDAG &DAG,
 static SDValue tryAdvSIMDModImm16(unsigned NewOp, SDValue Op, SelectionDAG &DAG,
                                   const APInt &Bits,
                                   const SDValue *LHS = nullptr) {
+  EVT VT = Op.getValueType();
+  if (VT.isFixedLengthVector() &&
+      DAG.getSubtarget<AArch64Subtarget>().forceStreamingCompatibleSVE())
+    return SDValue();
+
   if (Bits.getHiBits(64) == Bits.getLoBits(64)) {
     uint64_t Value = Bits.zextOrTrunc(64).getZExtValue();
-    EVT VT = Op.getValueType();
     MVT MovTy = (VT.getSizeInBits() == 128) ? MVT::v8i16 : MVT::v4i16;
     bool isAdvSIMDModImm = false;
     uint64_t Shift;
@@ -9840,20 +11955,6 @@ static bool isAllConstantBuildVector(const SDValue &PotentialBVec,
   return true;
 }
 
-static unsigned getIntrinsicID(const SDNode *N) {
-  unsigned Opcode = N->getOpcode();
-  switch (Opcode) {
-  default:
-    return Intrinsic::not_intrinsic;
-  case ISD::INTRINSIC_WO_CHAIN: {
-    unsigned IID = cast<ConstantSDNode>(N->getOperand(0))->getZExtValue();
-    if (IID < Intrinsic::num_intrinsics)
-      return IID;
-    return Intrinsic::not_intrinsic;
-  }
-  }
-}
-
 // Attempt to form a vector S[LR]I from (or (and X, BvecC1), (lsl Y, C2)),
 // to (SLI X, Y, C2), where X and Y have matching vector types, BvecC1 is a
 // BUILD_VECTORs with constant element C1, C2 is a constant, and:
@@ -9944,7 +12045,8 @@ static SDValue tryLowerToSLI(SDNode *N, SelectionDAG &DAG) {
 
 SDValue AArch64TargetLowering::LowerVectorOR(SDValue Op,
                                              SelectionDAG &DAG) const {
-  if (useSVEForFixedLengthVectorVT(Op.getValueType()))
+  if (useSVEForFixedLengthVectorVT(Op.getValueType(),
+                                   Subtarget->forceStreamingCompatibleSVE()))
     return LowerToScalableOp(Op, DAG);
 
   // Attempt to form a vector S[LR]I from (or (and X, C1), (lsl Y, C2))
@@ -10064,8 +12166,28 @@ SDValue AArch64TargetLowering::LowerBUILD_VECTOR(SDValue Op,
                                                  SelectionDAG &DAG) const {
   EVT VT = Op.getValueType();
 
+  if (useSVEForFixedLengthVectorVT(VT,
+                                   Subtarget->forceStreamingCompatibleSVE())) {
+    if (auto SeqInfo = cast<BuildVectorSDNode>(Op)->isConstantSequence()) {
+      SDLoc DL(Op);
+      EVT ContainerVT = getContainerForFixedLengthVector(DAG, VT);
+      SDValue Start = DAG.getConstant(SeqInfo->first, DL, ContainerVT);
+      SDValue Steps = DAG.getStepVector(DL, ContainerVT, SeqInfo->second);
+      SDValue Seq = DAG.getNode(ISD::ADD, DL, ContainerVT, Start, Steps);
+      return convertFromScalableVector(DAG, Op.getValueType(), Seq);
+    }
+
+    // Revert to common legalisation for all other variants.
+    return SDValue();
+  }
+
   // Try to build a simple constant vector.
   Op = NormalizeBuildVector(Op, DAG);
+  // Thought this might return a non-BUILD_VECTOR (e.g. CONCAT_VECTORS), if so,
+  // abort.
+  if (Op.getOpcode() != ISD::BUILD_VECTOR)
+    return SDValue();
+
   if (VT.isInteger()) {
     // Certain vector constants, used to express things like logical NOT and
     // arithmetic NEG, are passed through unmodified.  This allows special
@@ -10077,7 +12199,7 @@ SDValue AArch64TargetLowering::LowerBUILD_VECTOR(SDValue Op,
         unsigned BitSize = VT.getVectorElementType().getSizeInBits();
         APInt Val(BitSize,
                   Const->getAPIntValue().zextOrTrunc(BitSize).getZExtValue());
-        if (Val.isNullValue() || Val.isAllOnesValue())
+        if (Val.isZero() || Val.isAllOnes())
           return Op;
       }
   }
@@ -10304,6 +12426,12 @@ SDValue AArch64TargetLowering::LowerBUILD_VECTOR(SDValue Op,
     return SDValue();
   }
 
+  // Detect patterns of a0,a1,a2,a3,b0,b1,b2,b3,c0,c1,c2,c3,d0,d1,d2,d3 from
+  // v4i32s. This is really a truncate, which we can construct out of (legal)
+  // concats and truncate nodes.
+  if (SDValue M = ReconstructTruncateFromBuildVector(Op, DAG))
+    return M;
+
   // Empirical tests suggest this is rarely worth it for vectors of length <= 2.
   if (NumElts >= 4) {
     if (SDValue shuffle = ReconstructShuffle(Op, DAG))
@@ -10374,15 +12502,37 @@ SDValue AArch64TargetLowering::LowerBUILD_VECTOR(SDValue Op,
 
 SDValue AArch64TargetLowering::LowerCONCAT_VECTORS(SDValue Op,
                                                    SelectionDAG &DAG) const {
-  if (useSVEForFixedLengthVectorVT(Op.getValueType()))
+  if (useSVEForFixedLengthVectorVT(Op.getValueType(),
+                                   Subtarget->forceStreamingCompatibleSVE()))
     return LowerFixedLengthConcatVectorsToSVE(Op, DAG);
 
   assert(Op.getValueType().isScalableVector() &&
          isTypeLegal(Op.getValueType()) &&
          "Expected legal scalable vector type!");
 
-  if (isTypeLegal(Op.getOperand(0).getValueType()) && Op.getNumOperands() == 2)
-    return Op;
+  if (isTypeLegal(Op.getOperand(0).getValueType())) {
+    unsigned NumOperands = Op->getNumOperands();
+    assert(NumOperands > 1 && isPowerOf2_32(NumOperands) &&
+           "Unexpected number of operands in CONCAT_VECTORS");
+
+    if (NumOperands == 2)
+      return Op;
+
+    // Concat each pair of subvectors and pack into the lower half of the array.
+    SmallVector<SDValue> ConcatOps(Op->op_begin(), Op->op_end());
+    while (ConcatOps.size() > 1) {
+      for (unsigned I = 0, E = ConcatOps.size(); I != E; I += 2) {
+        SDValue V1 = ConcatOps[I];
+        SDValue V2 = ConcatOps[I + 1];
+        EVT SubVT = V1.getValueType();
+        EVT PairVT = SubVT.getDoubleNumVectorElementsVT(*DAG.getContext());
+        ConcatOps[I / 2] =
+            DAG.getNode(ISD::CONCAT_VECTORS, SDLoc(Op), PairVT, V1, V2);
+      }
+      ConcatOps.resize(ConcatOps.size() / 2);
+    }
+    return ConcatOps[0];
+  }
 
   return SDValue();
 }
@@ -10391,7 +12541,8 @@ SDValue AArch64TargetLowering::LowerINSERT_VECTOR_ELT(SDValue Op,
                                                       SelectionDAG &DAG) const {
   assert(Op.getOpcode() == ISD::INSERT_VECTOR_ELT && "Unknown opcode!");
 
-  if (useSVEForFixedLengthVectorVT(Op.getValueType()))
+  if (useSVEForFixedLengthVectorVT(Op.getValueType(),
+                                   Subtarget->forceStreamingCompatibleSVE()))
     return LowerFixedLengthInsertVectorElt(Op, DAG);
 
   // Check for non-constant or out of range lane.
@@ -10459,7 +12610,8 @@ AArch64TargetLowering::LowerEXTRACT_VECTOR_ELT(SDValue Op,
     return DAG.getAnyExtOrTrunc(Extract, DL, Op.getValueType());
   }
 
-  if (useSVEForFixedLengthVectorVT(VT))
+  if (useSVEForFixedLengthVectorVT(VT,
+                                   Subtarget->forceStreamingCompatibleSVE()))
     return LowerFixedLengthExtractVectorElt(Op, DAG);
 
   // Check for non-constant or out of range lane.
@@ -10502,6 +12654,10 @@ SDValue AArch64TargetLowering::LowerEXTRACT_SUBVECTOR(SDValue Op,
   unsigned Idx = cast<ConstantSDNode>(Op.getOperand(1))->getZExtValue();
   unsigned Size = Op.getValueSizeInBits();
 
+  // If we don't have legal types yet, do nothing
+  if (!DAG.getTargetLoweringInfo().isTypeLegal(InVT))
+    return SDValue();
+
   if (InVT.isScalableVector()) {
     // This will be matched by custom code during ISelDAGToDAG.
     if (Idx == 0 && isPackedVectorType(InVT, DAG))
@@ -10517,9 +12673,22 @@ SDValue AArch64TargetLowering::LowerEXTRACT_SUBVECTOR(SDValue Op,
   // If this is extracting the upper 64-bits of a 128-bit vector, we match
   // that directly.
   if (Size == 64 && Idx * InVT.getScalarSizeInBits() == 64 &&
-      InVT.getSizeInBits() == 128)
+      InVT.getSizeInBits() == 128 && !Subtarget->forceStreamingCompatibleSVE())
     return Op;
 
+  if (useSVEForFixedLengthVectorVT(InVT,
+                                   Subtarget->forceStreamingCompatibleSVE())) {
+    SDLoc DL(Op);
+
+    EVT ContainerVT = getContainerForFixedLengthVector(DAG, InVT);
+    SDValue NewInVec =
+        convertToScalableVector(DAG, ContainerVT, Op.getOperand(0));
+
+    SDValue Splice = DAG.getNode(ISD::VECTOR_SPLICE, DL, ContainerVT, NewInVec,
+                                 NewInVec, DAG.getConstant(Idx, DL, MVT::i64));
+    return convertFromScalableVector(DAG, Op.getValueType(), Splice);
+  }
+
   return SDValue();
 }
 
@@ -10531,44 +12700,123 @@ SDValue AArch64TargetLowering::LowerINSERT_SUBVECTOR(SDValue Op,
   EVT InVT = Op.getOperand(1).getValueType();
   unsigned Idx = cast<ConstantSDNode>(Op.getOperand(2))->getZExtValue();
 
-  if (InVT.isScalableVector()) {
-    SDLoc DL(Op);
-    EVT VT = Op.getValueType();
+  SDValue Vec0 = Op.getOperand(0);
+  SDValue Vec1 = Op.getOperand(1);
+  SDLoc DL(Op);
+  EVT VT = Op.getValueType();
 
-    if (!isTypeLegal(VT) || !VT.isInteger())
+  if (InVT.isScalableVector()) {
+    if (!isTypeLegal(VT))
       return SDValue();
 
-    SDValue Vec0 = Op.getOperand(0);
-    SDValue Vec1 = Op.getOperand(1);
+    // Break down insert_subvector into simpler parts.
+    if (VT.getVectorElementType() == MVT::i1) {
+      unsigned NumElts = VT.getVectorMinNumElements();
+      EVT HalfVT = VT.getHalfNumVectorElementsVT(*DAG.getContext());
+
+      SDValue Lo, Hi;
+      Lo = DAG.getNode(ISD::EXTRACT_SUBVECTOR, DL, HalfVT, Vec0,
+                       DAG.getVectorIdxConstant(0, DL));
+      Hi = DAG.getNode(ISD::EXTRACT_SUBVECTOR, DL, HalfVT, Vec0,
+                       DAG.getVectorIdxConstant(NumElts / 2, DL));
+      if (Idx < (NumElts / 2)) {
+        SDValue NewLo = DAG.getNode(ISD::INSERT_SUBVECTOR, DL, HalfVT, Lo, Vec1,
+                                    DAG.getVectorIdxConstant(Idx, DL));
+        return DAG.getNode(AArch64ISD::UZP1, DL, VT, NewLo, Hi);
+      } else {
+        SDValue NewHi =
+            DAG.getNode(ISD::INSERT_SUBVECTOR, DL, HalfVT, Hi, Vec1,
+                        DAG.getVectorIdxConstant(Idx - (NumElts / 2), DL));
+        return DAG.getNode(AArch64ISD::UZP1, DL, VT, Lo, NewHi);
+      }
+    }
 
     // Ensure the subvector is half the size of the main vector.
     if (VT.getVectorElementCount() != (InVT.getVectorElementCount() * 2))
       return SDValue();
 
-    // Extend elements of smaller vector...
-    EVT WideVT = InVT.widenIntegerVectorElementType(*(DAG.getContext()));
-    SDValue ExtVec = DAG.getNode(ISD::ANY_EXTEND, DL, WideVT, Vec1);
+    // Here narrow and wide refers to the vector element types. After "casting"
+    // both vectors must have the same bit length and so because the subvector
+    // has fewer elements, those elements need to be bigger.
+    EVT NarrowVT = getPackedSVEVectorVT(VT.getVectorElementCount());
+    EVT WideVT = getPackedSVEVectorVT(InVT.getVectorElementCount());
+
+    // NOP cast operands to the largest legal vector of the same element count.
+    if (VT.isFloatingPoint()) {
+      Vec0 = getSVESafeBitCast(NarrowVT, Vec0, DAG);
+      Vec1 = getSVESafeBitCast(WideVT, Vec1, DAG);
+    } else {
+      // Legal integer vectors are already their largest so Vec0 is fine as is.
+      Vec1 = DAG.getNode(ISD::ANY_EXTEND, DL, WideVT, Vec1);
+    }
 
+    // To replace the top/bottom half of vector V with vector SubV we widen the
+    // preserved half of V, concatenate this to SubV (the order depending on the
+    // half being replaced) and then narrow the result.
+    SDValue Narrow;
     if (Idx == 0) {
       SDValue HiVec0 = DAG.getNode(AArch64ISD::UUNPKHI, DL, WideVT, Vec0);
-      return DAG.getNode(AArch64ISD::UZP1, DL, VT, ExtVec, HiVec0);
-    } else if (Idx == InVT.getVectorMinNumElements()) {
+      Narrow = DAG.getNode(AArch64ISD::UZP1, DL, NarrowVT, Vec1, HiVec0);
+    } else {
+      assert(Idx == InVT.getVectorMinNumElements() &&
+             "Invalid subvector index!");
       SDValue LoVec0 = DAG.getNode(AArch64ISD::UUNPKLO, DL, WideVT, Vec0);
-      return DAG.getNode(AArch64ISD::UZP1, DL, VT, LoVec0, ExtVec);
+      Narrow = DAG.getNode(AArch64ISD::UZP1, DL, NarrowVT, LoVec0, Vec1);
     }
 
-    return SDValue();
+    return getSVESafeBitCast(VT, Narrow, DAG);
   }
 
-  // This will be matched by custom code during ISelDAGToDAG.
-  if (Idx == 0 && isPackedVectorType(InVT, DAG) && Op.getOperand(0).isUndef())
-    return Op;
+  if (Idx == 0 && isPackedVectorType(VT, DAG)) {
+    // This will be matched by custom code during ISelDAGToDAG.
+    if (Vec0.isUndef())
+      return Op;
+
+    std::optional<unsigned> PredPattern =
+        getSVEPredPatternFromNumElements(InVT.getVectorNumElements());
+    auto PredTy = VT.changeVectorElementType(MVT::i1);
+    SDValue PTrue = getPTrue(DAG, DL, PredTy, *PredPattern);
+    SDValue ScalableVec1 = convertToScalableVector(DAG, VT, Vec1);
+    return DAG.getNode(ISD::VSELECT, DL, VT, PTrue, ScalableVec1, Vec0);
+  }
 
   return SDValue();
 }
 
+static bool isPow2Splat(SDValue Op, uint64_t &SplatVal, bool &Negated) {
+  if (Op.getOpcode() != AArch64ISD::DUP &&
+      Op.getOpcode() != ISD::SPLAT_VECTOR &&
+      Op.getOpcode() != ISD::BUILD_VECTOR)
+    return false;
+
+  if (Op.getOpcode() == ISD::BUILD_VECTOR &&
+      !isAllConstantBuildVector(Op, SplatVal))
+    return false;
+
+  if (Op.getOpcode() != ISD::BUILD_VECTOR &&
+      !isa<ConstantSDNode>(Op->getOperand(0)))
+    return false;
+
+  SplatVal = Op->getConstantOperandVal(0);
+  if (Op.getValueType().getVectorElementType() != MVT::i64)
+    SplatVal = (int32_t)SplatVal;
+
+  Negated = false;
+  if (isPowerOf2_64(SplatVal))
+    return true;
+
+  Negated = true;
+  if (isPowerOf2_64(-SplatVal)) {
+    SplatVal = -SplatVal;
+    return true;
+  }
+
+  return false;
+}
+
 SDValue AArch64TargetLowering::LowerDIV(SDValue Op, SelectionDAG &DAG) const {
   EVT VT = Op.getValueType();
+  SDLoc dl(Op);
 
   if (useSVEForFixedLengthVectorVT(VT, /*OverrideNEON=*/true))
     return LowerFixedLengthVectorIntDivideToSVE(Op, DAG);
@@ -10578,6 +12826,19 @@ SDValue AArch64TargetLowering::LowerDIV(SDValue Op, SelectionDAG &DAG) const {
   bool Signed = Op.getOpcode() == ISD::SDIV;
   unsigned PredOpcode = Signed ? AArch64ISD::SDIV_PRED : AArch64ISD::UDIV_PRED;
 
+  bool Negated;
+  uint64_t SplatVal;
+  if (Signed && isPow2Splat(Op.getOperand(1), SplatVal, Negated)) {
+    SDValue Pg = getPredicateForScalableVector(DAG, dl, VT);
+    SDValue Res =
+        DAG.getNode(AArch64ISD::SRAD_MERGE_OP1, dl, VT, Pg, Op->getOperand(0),
+                    DAG.getTargetConstant(Log2_64(SplatVal), dl, MVT::i32));
+    if (Negated)
+      Res = DAG.getNode(ISD::SUB, dl, VT, DAG.getConstant(0, dl, VT), Res);
+
+    return Res;
+  }
+
   if (VT == MVT::nxv4i32 || VT == MVT::nxv2i64)
     return LowerToPredicatedOp(Op, DAG, PredOpcode);
 
@@ -10591,7 +12852,6 @@ SDValue AArch64TargetLowering::LowerDIV(SDValue Op, SelectionDAG &DAG) const {
   else
     llvm_unreachable("Unexpected Custom DIV operation");
 
-  SDLoc dl(Op);
   unsigned UnpkLo = Signed ? AArch64ISD::SUNPKLO : AArch64ISD::UUNPKLO;
   unsigned UnpkHi = Signed ? AArch64ISD::SUNPKHI : AArch64ISD::UUNPKHI;
   SDValue Op0Lo = DAG.getNode(UnpkLo, dl, WidenedVT, Op.getOperand(0));
@@ -10605,26 +12865,14 @@ SDValue AArch64TargetLowering::LowerDIV(SDValue Op, SelectionDAG &DAG) const {
 
 bool AArch64TargetLowering::isShuffleMaskLegal(ArrayRef<int> M, EVT VT) const {
   // Currently no fixed length shuffles that require SVE are legal.
-  if (useSVEForFixedLengthVectorVT(VT))
+  if (useSVEForFixedLengthVectorVT(VT,
+                                   Subtarget->forceStreamingCompatibleSVE()))
     return false;
 
   if (VT.getVectorNumElements() == 4 &&
       (VT.is128BitVector() || VT.is64BitVector())) {
-    unsigned PFIndexes[4];
-    for (unsigned i = 0; i != 4; ++i) {
-      if (M[i] < 0)
-        PFIndexes[i] = 8;
-      else
-        PFIndexes[i] = M[i];
-    }
-
-    // Compute the index in the perfect shuffle table.
-    unsigned PFTableIndex = PFIndexes[0] * 9 * 9 * 9 + PFIndexes[1] * 9 * 9 +
-                            PFIndexes[2] * 9 + PFIndexes[3];
-    unsigned PFEntry = PerfectShuffleTable[PFTableIndex];
-    unsigned Cost = (PFEntry >> 30);
-
-    if (Cost <= 4)
+    unsigned Cost = getPerfectShuffleCost(M);
+    if (Cost <= 1)
       return true;
   }
 
@@ -10645,6 +12893,12 @@ bool AArch64TargetLowering::isShuffleMaskLegal(ArrayRef<int> M, EVT VT) const {
           isConcatMask(M, VT, VT.getSizeInBits() == 128));
 }
 
+bool AArch64TargetLowering::isVectorClearMaskLegal(ArrayRef<int> M,
+                                                   EVT VT) const {
+  // Just delegate to the generic legality, clear masks aren't special.
+  return isShuffleMaskLegal(M, VT);
+}
+
 /// getVShiftImm - Check if this is a valid build_vector for the immediate
 /// operand of a vector shift operation, where all the elements of the
 /// build_vector must have the same constant integer value.
@@ -10704,7 +12958,8 @@ SDValue AArch64TargetLowering::LowerTRUNCATE(SDValue Op,
   if (!VT.isVector() || VT.isScalableVector())
     return SDValue();
 
-  if (useSVEForFixedLengthVectorVT(Op.getOperand(0).getValueType()))
+  if (useSVEForFixedLengthVectorVT(Op.getOperand(0).getValueType(),
+                                   Subtarget->forceStreamingCompatibleSVE()))
     return LowerFixedLengthVectorTruncateToSVE(Op, DAG);
 
   return SDValue();
@@ -10721,11 +12976,10 @@ SDValue AArch64TargetLowering::LowerVectorSRA_SRL_SHL(SDValue Op,
   unsigned EltSize = VT.getScalarSizeInBits();
 
   switch (Op.getOpcode()) {
-  default:
-    llvm_unreachable("unexpected shift opcode");
-
   case ISD::SHL:
-    if (VT.isScalableVector() || useSVEForFixedLengthVectorVT(VT))
+    if (VT.isScalableVector() ||
+        useSVEForFixedLengthVectorVT(VT,
+                                     Subtarget->forceStreamingCompatibleSVE()))
       return LowerToPredicatedOp(Op, DAG, AArch64ISD::SHL_PRED);
 
     if (isVShiftLImm(Op.getOperand(1), VT, false, Cnt) && Cnt < EltSize)
@@ -10737,7 +12991,9 @@ SDValue AArch64TargetLowering::LowerVectorSRA_SRL_SHL(SDValue Op,
                        Op.getOperand(0), Op.getOperand(1));
   case ISD::SRA:
   case ISD::SRL:
-    if (VT.isScalableVector() || useSVEForFixedLengthVectorVT(VT)) {
+    if (VT.isScalableVector() ||
+        useSVEForFixedLengthVectorVT(
+            VT, Subtarget->forceStreamingCompatibleSVE())) {
       unsigned Opc = Op.getOpcode() == ISD::SRA ? AArch64ISD::SRA_PRED
                                                 : AArch64ISD::SRL_PRED;
       return LowerToPredicatedOp(Op, DAG, Opc);
@@ -10766,7 +13022,7 @@ SDValue AArch64TargetLowering::LowerVectorSRA_SRL_SHL(SDValue Op,
     return NegShiftLeft;
   }
 
-  return SDValue();
+  llvm_unreachable("unexpected shift opcode");
 }
 
 static SDValue EmitVectorComparison(SDValue LHS, SDValue RHS,
@@ -10806,6 +13062,11 @@ static SDValue EmitVectorComparison(SDValue LHS, SDValue RHS,
       if (IsZero)
         return DAG.getNode(AArch64ISD::FCMGTz, dl, VT, LHS);
       return DAG.getNode(AArch64ISD::FCMGT, dl, VT, LHS, RHS);
+    case AArch64CC::LE:
+      if (!NoNans)
+        return SDValue();
+      // If we ignore NaNs then we can use to the LS implementation.
+      [[fallthrough]];
     case AArch64CC::LS:
       if (IsZero)
         return DAG.getNode(AArch64ISD::FCMLEz, dl, VT, LHS);
@@ -10814,7 +13075,7 @@ static SDValue EmitVectorComparison(SDValue LHS, SDValue RHS,
       if (!NoNans)
         return SDValue();
       // If we ignore NaNs then we can use to the MI implementation.
-      LLVM_FALLTHROUGH;
+      [[fallthrough]];
     case AArch64CC::MI:
       if (IsZero)
         return DAG.getNode(AArch64ISD::FCMLTz, dl, VT, LHS);
@@ -10869,7 +13130,8 @@ SDValue AArch64TargetLowering::LowerVSETCC(SDValue Op,
   if (Op.getValueType().isScalableVector())
     return LowerToPredicatedOp(Op, DAG, AArch64ISD::SETCC_MERGE_ZERO);
 
-  if (useSVEForFixedLengthVectorVT(Op.getOperand(0).getValueType()))
+  if (useSVEForFixedLengthVectorVT(Op.getOperand(0).getValueType(),
+                                   Subtarget->forceStreamingCompatibleSVE()))
     return LowerFixedLengthVectorSetccToSVE(Op, DAG);
 
   ISD::CondCode CC = cast<CondCodeSDNode>(Op.getOperand(2))->get();
@@ -10886,8 +13148,7 @@ SDValue AArch64TargetLowering::LowerVSETCC(SDValue Op,
     return DAG.getSExtOrTrunc(Cmp, dl, Op.getValueType());
   }
 
-  const bool FullFP16 =
-    static_cast<const AArch64Subtarget &>(DAG.getSubtarget()).hasFullFP16();
+  const bool FullFP16 = DAG.getSubtarget<AArch64Subtarget>().hasFullFP16();
 
   // Make v4f16 (only) fcmp operations utilise vector instructions
   // v8f16 support will be a litle more complicated
@@ -10911,7 +13172,7 @@ SDValue AArch64TargetLowering::LowerVSETCC(SDValue Op,
   bool ShouldInvert;
   changeVectorFPCCToAArch64CC(CC, CC1, CC2, ShouldInvert);
 
-  bool NoNaNs = getTargetMachine().Options.NoNaNsFPMath;
+  bool NoNaNs = getTargetMachine().Options.NoNaNsFPMath || Op->getFlags().hasNoNaNs();
   SDValue Cmp =
       EmitVectorComparison(LHS, RHS, CC1, NoNaNs, CmpVT, dl, DAG);
   if (!Cmp.getNode())
@@ -10948,14 +13209,16 @@ SDValue AArch64TargetLowering::LowerVECREDUCE(SDValue Op,
 
   // Try to lower fixed length reductions to SVE.
   EVT SrcVT = Src.getValueType();
-  bool OverrideNEON = Op.getOpcode() == ISD::VECREDUCE_AND ||
+  bool OverrideNEON = Subtarget->forceStreamingCompatibleSVE() ||
+                      Op.getOpcode() == ISD::VECREDUCE_AND ||
                       Op.getOpcode() == ISD::VECREDUCE_OR ||
                       Op.getOpcode() == ISD::VECREDUCE_XOR ||
                       Op.getOpcode() == ISD::VECREDUCE_FADD ||
                       (Op.getOpcode() != ISD::VECREDUCE_ADD &&
                        SrcVT.getVectorElementType() == MVT::i64);
   if (SrcVT.isScalableVector() ||
-      useSVEForFixedLengthVectorVT(SrcVT, OverrideNEON)) {
+      useSVEForFixedLengthVectorVT(
+          SrcVT, OverrideNEON && Subtarget->useSVEForFixedLengthVectors())) {
 
     if (SrcVT.getVectorElementType() == MVT::i1)
       return LowerPredReductionToSVE(Op, DAG);
@@ -11020,7 +13283,7 @@ SDValue AArch64TargetLowering::LowerVECREDUCE(SDValue Op,
 
 SDValue AArch64TargetLowering::LowerATOMIC_LOAD_SUB(SDValue Op,
                                                     SelectionDAG &DAG) const {
-  auto &Subtarget = static_cast<const AArch64Subtarget &>(DAG.getSubtarget());
+  auto &Subtarget = DAG.getSubtarget<AArch64Subtarget>();
   if (!Subtarget.hasLSE() && !Subtarget.outlineAtomics())
     return SDValue();
 
@@ -11037,7 +13300,7 @@ SDValue AArch64TargetLowering::LowerATOMIC_LOAD_SUB(SDValue Op,
 
 SDValue AArch64TargetLowering::LowerATOMIC_LOAD_AND(SDValue Op,
                                                     SelectionDAG &DAG) const {
-  auto &Subtarget = static_cast<const AArch64Subtarget &>(DAG.getSubtarget());
+  auto &Subtarget = DAG.getSubtarget<AArch64Subtarget>();
   if (!Subtarget.hasLSE() && !Subtarget.outlineAtomics())
     return SDValue();
 
@@ -11056,7 +13319,8 @@ SDValue AArch64TargetLowering::LowerWindowsDYNAMIC_STACKALLOC(
     SDValue Op, SDValue Chain, SDValue &Size, SelectionDAG &DAG) const {
   SDLoc dl(Op);
   EVT PtrVT = getPointerTy(DAG.getDataLayout());
-  SDValue Callee = DAG.getTargetExternalSymbol("__chkstk", PtrVT, 0);
+  SDValue Callee = DAG.getTargetExternalSymbol(Subtarget->getChkStkName(),
+                                               PtrVT, 0);
 
   const AArch64RegisterInfo *TRI = Subtarget->getRegisterInfo();
   const uint32_t *Mask = TRI->getWindowsStackProbePreservedMask();
@@ -11119,8 +13383,7 @@ AArch64TargetLowering::LowerDYNAMIC_STACKALLOC(SDValue Op,
                      DAG.getConstant(-(uint64_t)Align->value(), dl, VT));
   Chain = DAG.getCopyToReg(Chain, dl, AArch64::SP, SP);
 
-  Chain = DAG.getCALLSEQ_END(Chain, DAG.getIntPtrConstant(0, dl, true),
-                             DAG.getIntPtrConstant(0, dl, true), SDValue(), dl);
+  Chain = DAG.getCALLSEQ_END(Chain, 0, 0, SDValue(), dl);
 
   SDValue Ops[2] = {SP, Chain};
   return DAG.getMergeValues(Ops, dl);
@@ -11133,8 +13396,8 @@ SDValue AArch64TargetLowering::LowerVSCALE(SDValue Op,
 
   SDLoc DL(Op);
   APInt MulImm = cast<ConstantSDNode>(Op.getOperand(0))->getAPIntValue();
-  return DAG.getZExtOrTrunc(DAG.getVScale(DL, MVT::i64, MulImm.sextOrSelf(64)),
-                            DL, VT);
+  return DAG.getZExtOrTrunc(DAG.getVScale(DL, MVT::i64, MulImm.sext(64)), DL,
+                            VT);
 }
 
 /// Set the IntrinsicInfo for the `aarch64_sve_st<N>` intrinsics.
@@ -11155,7 +13418,7 @@ setInfoSVEStN(const AArch64TargetLowering &TLI, const DataLayout &DL,
   // memVT is `NumVecs * VT`.
   Info.memVT = EVT::getVectorVT(CI.getType()->getContext(), VT.getScalarType(),
                                 EC * NumVecs);
-  Info.ptrVal = CI.getArgOperand(CI.getNumArgOperands() - 1);
+  Info.ptrVal = CI.getArgOperand(CI.arg_size() - 1);
   Info.offset = 0;
   Info.align.reset();
   Info.flags = MachineMemOperand::MOStore;
@@ -11193,7 +13456,7 @@ bool AArch64TargetLowering::getTgtMemIntrinsic(IntrinsicInfo &Info,
     // Conservatively set memVT to the entire set of vectors loaded.
     uint64_t NumElts = DL.getTypeSizeInBits(I.getType()) / 64;
     Info.memVT = EVT::getVectorVT(I.getType()->getContext(), MVT::i64, NumElts);
-    Info.ptrVal = I.getArgOperand(I.getNumArgOperands() - 1);
+    Info.ptrVal = I.getArgOperand(I.arg_size() - 1);
     Info.offset = 0;
     Info.align.reset();
     // volatile loads with NEON intrinsics not supported
@@ -11212,14 +13475,14 @@ bool AArch64TargetLowering::getTgtMemIntrinsic(IntrinsicInfo &Info,
     Info.opc = ISD::INTRINSIC_VOID;
     // Conservatively set memVT to the entire set of vectors stored.
     unsigned NumElts = 0;
-    for (unsigned ArgI = 0, ArgE = I.getNumArgOperands(); ArgI < ArgE; ++ArgI) {
-      Type *ArgTy = I.getArgOperand(ArgI)->getType();
+    for (const Value *Arg : I.args()) {
+      Type *ArgTy = Arg->getType();
       if (!ArgTy->isVectorTy())
         break;
       NumElts += DL.getTypeSizeInBits(ArgTy) / 64;
     }
     Info.memVT = EVT::getVectorVT(I.getType()->getContext(), MVT::i64, NumElts);
-    Info.ptrVal = I.getArgOperand(I.getNumArgOperands() - 1);
+    Info.ptrVal = I.getArgOperand(I.arg_size() - 1);
     Info.offset = 0;
     Info.align.reset();
     // volatile stores with NEON intrinsics not supported
@@ -11228,23 +13491,23 @@ bool AArch64TargetLowering::getTgtMemIntrinsic(IntrinsicInfo &Info,
   }
   case Intrinsic::aarch64_ldaxr:
   case Intrinsic::aarch64_ldxr: {
-    PointerType *PtrTy = cast<PointerType>(I.getArgOperand(0)->getType());
+    Type *ValTy = I.getParamElementType(0);
     Info.opc = ISD::INTRINSIC_W_CHAIN;
-    Info.memVT = MVT::getVT(PtrTy->getElementType());
+    Info.memVT = MVT::getVT(ValTy);
     Info.ptrVal = I.getArgOperand(0);
     Info.offset = 0;
-    Info.align = DL.getABITypeAlign(PtrTy->getElementType());
+    Info.align = DL.getABITypeAlign(ValTy);
     Info.flags = MachineMemOperand::MOLoad | MachineMemOperand::MOVolatile;
     return true;
   }
   case Intrinsic::aarch64_stlxr:
   case Intrinsic::aarch64_stxr: {
-    PointerType *PtrTy = cast<PointerType>(I.getArgOperand(1)->getType());
+    Type *ValTy = I.getParamElementType(1);
     Info.opc = ISD::INTRINSIC_W_CHAIN;
-    Info.memVT = MVT::getVT(PtrTy->getElementType());
+    Info.memVT = MVT::getVT(ValTy);
     Info.ptrVal = I.getArgOperand(1);
     Info.offset = 0;
-    Info.align = DL.getABITypeAlign(PtrTy->getElementType());
+    Info.align = DL.getABITypeAlign(ValTy);
     Info.flags = MachineMemOperand::MOStore | MachineMemOperand::MOVolatile;
     return true;
   }
@@ -11267,27 +13530,37 @@ bool AArch64TargetLowering::getTgtMemIntrinsic(IntrinsicInfo &Info,
     Info.flags = MachineMemOperand::MOStore | MachineMemOperand::MOVolatile;
     return true;
   case Intrinsic::aarch64_sve_ldnt1: {
-    PointerType *PtrTy = cast<PointerType>(I.getArgOperand(1)->getType());
+    Type *ElTy = cast<VectorType>(I.getType())->getElementType();
     Info.opc = ISD::INTRINSIC_W_CHAIN;
     Info.memVT = MVT::getVT(I.getType());
     Info.ptrVal = I.getArgOperand(1);
     Info.offset = 0;
-    Info.align = DL.getABITypeAlign(PtrTy->getElementType());
-    Info.flags = MachineMemOperand::MOLoad;
-    if (Intrinsic == Intrinsic::aarch64_sve_ldnt1)
-      Info.flags |= MachineMemOperand::MONonTemporal;
+    Info.align = DL.getABITypeAlign(ElTy);
+    Info.flags = MachineMemOperand::MOLoad | MachineMemOperand::MONonTemporal;
     return true;
   }
   case Intrinsic::aarch64_sve_stnt1: {
-    PointerType *PtrTy = cast<PointerType>(I.getArgOperand(2)->getType());
+    Type *ElTy =
+        cast<VectorType>(I.getArgOperand(0)->getType())->getElementType();
     Info.opc = ISD::INTRINSIC_W_CHAIN;
     Info.memVT = MVT::getVT(I.getOperand(0)->getType());
     Info.ptrVal = I.getArgOperand(2);
     Info.offset = 0;
-    Info.align = DL.getABITypeAlign(PtrTy->getElementType());
+    Info.align = DL.getABITypeAlign(ElTy);
+    Info.flags = MachineMemOperand::MOStore | MachineMemOperand::MONonTemporal;
+    return true;
+  }
+  case Intrinsic::aarch64_mops_memset_tag: {
+    Value *Dst = I.getArgOperand(0);
+    Value *Val = I.getArgOperand(1);
+    Info.opc = ISD::INTRINSIC_W_CHAIN;
+    Info.memVT = MVT::getVT(Val->getType());
+    Info.ptrVal = Dst;
+    Info.offset = 0;
+    Info.align = I.getParamAlign(0).valueOrOne();
     Info.flags = MachineMemOperand::MOStore;
-    if (Intrinsic == Intrinsic::aarch64_sve_stnt1)
-      Info.flags |= MachineMemOperand::MONonTemporal;
+    // The size of the memory being operated on is unknown at this point
+    Info.size = MemoryLocation::UnknownSize;
     return true;
   }
   default:
@@ -11317,6 +13590,9 @@ bool AArch64TargetLowering::shouldReduceLoadWidth(SDNode *Load,
       Base.getOperand(1).getOpcode() == ISD::SHL &&
       Base.getOperand(1).hasOneUse() &&
       Base.getOperand(1).getOperand(1).getOpcode() == ISD::Constant) {
+    // It's unknown whether a scalable vector has a power-of-2 bitwidth.
+    if (Mem->getMemoryVT().isScalableVector())
+      return false;
     // The shift can be combined if it matches the size of the value being
     // loaded (and so reducing the width would make it not match).
     uint64_t ShiftAmount = Base.getOperand(1).getConstantOperandVal(1);
@@ -11332,8 +13608,8 @@ bool AArch64TargetLowering::shouldReduceLoadWidth(SDNode *Load,
 bool AArch64TargetLowering::isTruncateFree(Type *Ty1, Type *Ty2) const {
   if (!Ty1->isIntegerTy() || !Ty2->isIntegerTy())
     return false;
-  uint64_t NumBits1 = Ty1->getPrimitiveSizeInBits().getFixedSize();
-  uint64_t NumBits2 = Ty2->getPrimitiveSizeInBits().getFixedSize();
+  uint64_t NumBits1 = Ty1->getPrimitiveSizeInBits().getFixedValue();
+  uint64_t NumBits2 = Ty2->getPrimitiveSizeInBits().getFixedValue();
   return NumBits1 > NumBits2;
 }
 bool AArch64TargetLowering::isTruncateFree(EVT VT1, EVT VT2) const {
@@ -11356,8 +13632,7 @@ bool AArch64TargetLowering::isProfitableToHoist(Instruction *I) const {
 
   Instruction *User = I->user_back();
 
-  if (User &&
-      !(User->getOpcode() == Instruction::FSub ||
+  if (!(User->getOpcode() == Instruction::FSub ||
         User->getOpcode() == Instruction::FAdd))
     return true;
 
@@ -11435,7 +13710,8 @@ bool AArch64TargetLowering::isExtFreeImpl(const Instruction *Ext) const {
       // Get the shift amount based on the scaling factor:
       // log2(sizeof(IdxTy)) - log2(8).
       uint64_t ShiftAmt =
-        countTrailingZeros(DL.getTypeStoreSizeInBits(IdxTy).getFixedSize()) - 3;
+          countTrailingZeros(DL.getTypeStoreSizeInBits(IdxTy).getFixedValue()) -
+          3;
       // Is the constant foldable in the shift of the addressing mode?
       // I.e., shift amount is between 1 and 4 inclusive.
       if (ShiftAmt == 0 || ShiftAmt > 4)
@@ -11447,7 +13723,7 @@ bool AArch64TargetLowering::isExtFreeImpl(const Instruction *Ext) const {
       // trunc(sext ty1 to ty2) to ty1.
       if (Instr->getType() == Ext->getOperand(0)->getType())
         continue;
-      LLVM_FALLTHROUGH;
+      [[fallthrough]];
     default:
       return false;
     }
@@ -11458,14 +13734,21 @@ bool AArch64TargetLowering::isExtFreeImpl(const Instruction *Ext) const {
   return true;
 }
 
+static bool isSplatShuffle(Value *V) {
+  if (auto *Shuf = dyn_cast<ShuffleVectorInst>(V))
+    return all_equal(Shuf->getShuffleMask());
+  return false;
+}
+
 /// Check if both Op1 and Op2 are shufflevector extracts of either the lower
 /// or upper half of the vector elements.
-static bool areExtractShuffleVectors(Value *Op1, Value *Op2) {
+static bool areExtractShuffleVectors(Value *Op1, Value *Op2,
+                                     bool AllowSplat = false) {
   auto areTypesHalfed = [](Value *FullV, Value *HalfV) {
     auto *FullTy = FullV->getType();
     auto *HalfTy = HalfV->getType();
-    return FullTy->getPrimitiveSizeInBits().getFixedSize() ==
-           2 * HalfTy->getPrimitiveSizeInBits().getFixedSize();
+    return FullTy->getPrimitiveSizeInBits().getFixedValue() ==
+           2 * HalfTy->getPrimitiveSizeInBits().getFixedValue();
   };
 
   auto extractHalf = [](Value *FullV, Value *HalfV) {
@@ -11475,25 +13758,39 @@ static bool areExtractShuffleVectors(Value *Op1, Value *Op2) {
   };
 
   ArrayRef<int> M1, M2;
-  Value *S1Op1, *S2Op1;
+  Value *S1Op1 = nullptr, *S2Op1 = nullptr;
   if (!match(Op1, m_Shuffle(m_Value(S1Op1), m_Undef(), m_Mask(M1))) ||
       !match(Op2, m_Shuffle(m_Value(S2Op1), m_Undef(), m_Mask(M2))))
     return false;
 
+  // If we allow splats, set S1Op1/S2Op1 to nullptr for the relavant arg so that
+  // it is not checked as an extract below.
+  if (AllowSplat && isSplatShuffle(Op1))
+    S1Op1 = nullptr;
+  if (AllowSplat && isSplatShuffle(Op2))
+    S2Op1 = nullptr;
+
   // Check that the operands are half as wide as the result and we extract
   // half of the elements of the input vectors.
-  if (!areTypesHalfed(S1Op1, Op1) || !areTypesHalfed(S2Op1, Op2) ||
-      !extractHalf(S1Op1, Op1) || !extractHalf(S2Op1, Op2))
+  if ((S1Op1 && (!areTypesHalfed(S1Op1, Op1) || !extractHalf(S1Op1, Op1))) ||
+      (S2Op1 && (!areTypesHalfed(S2Op1, Op2) || !extractHalf(S2Op1, Op2))))
     return false;
 
   // Check the mask extracts either the lower or upper half of vector
   // elements.
-  int M1Start = -1;
-  int M2Start = -1;
+  int M1Start = 0;
+  int M2Start = 0;
   int NumElements = cast<FixedVectorType>(Op1->getType())->getNumElements() * 2;
-  if (!ShuffleVectorInst::isExtractSubvectorMask(M1, NumElements, M1Start) ||
-      !ShuffleVectorInst::isExtractSubvectorMask(M2, NumElements, M2Start) ||
-      M1Start != M2Start || (M1Start != 0 && M2Start != (NumElements / 2)))
+  if ((S1Op1 &&
+       !ShuffleVectorInst::isExtractSubvectorMask(M1, NumElements, M1Start)) ||
+      (S2Op1 &&
+       !ShuffleVectorInst::isExtractSubvectorMask(M2, NumElements, M2Start)))
+    return false;
+
+  if ((M1Start != 0 && M1Start != (NumElements / 2)) ||
+      (M2Start != 0 && M2Start != (NumElements / 2)))
+    return false;
+  if (S1Op1 && S2Op1 && M1Start != M2Start)
     return false;
 
   return true;
@@ -11537,18 +13834,85 @@ static bool areOperandsOfVmullHighP64(Value *Op1, Value *Op2) {
 /// shufflevectors extracts and/or sext/zext can be folded into (u,s)subl(2).
 bool AArch64TargetLowering::shouldSinkOperands(
     Instruction *I, SmallVectorImpl<Use *> &Ops) const {
-  if (!I->getType()->isVectorTy())
-    return false;
-
   if (IntrinsicInst *II = dyn_cast<IntrinsicInst>(I)) {
     switch (II->getIntrinsicID()) {
+    case Intrinsic::aarch64_neon_smull:
     case Intrinsic::aarch64_neon_umull:
+      if (areExtractShuffleVectors(II->getOperand(0), II->getOperand(1),
+                                   /*AllowSplat=*/true)) {
+        Ops.push_back(&II->getOperandUse(0));
+        Ops.push_back(&II->getOperandUse(1));
+        return true;
+      }
+      [[fallthrough]];
+
+    case Intrinsic::fma:
+      if (isa<VectorType>(I->getType()) &&
+          cast<VectorType>(I->getType())->getElementType()->isHalfTy() &&
+          !Subtarget->hasFullFP16())
+        return false;
+      [[fallthrough]];
+    case Intrinsic::aarch64_neon_sqdmull:
+    case Intrinsic::aarch64_neon_sqdmulh:
+    case Intrinsic::aarch64_neon_sqrdmulh:
+      // Sink splats for index lane variants
+      if (isSplatShuffle(II->getOperand(0)))
+        Ops.push_back(&II->getOperandUse(0));
+      if (isSplatShuffle(II->getOperand(1)))
+        Ops.push_back(&II->getOperandUse(1));
+      return !Ops.empty();
+    case Intrinsic::aarch64_sve_ptest_first:
+    case Intrinsic::aarch64_sve_ptest_last:
+      if (auto *IIOp = dyn_cast<IntrinsicInst>(II->getOperand(0)))
+        if (IIOp->getIntrinsicID() == Intrinsic::aarch64_sve_ptrue)
+          Ops.push_back(&II->getOperandUse(0));
+      return !Ops.empty();
+    case Intrinsic::aarch64_sme_write_horiz:
+    case Intrinsic::aarch64_sme_write_vert:
+    case Intrinsic::aarch64_sme_writeq_horiz:
+    case Intrinsic::aarch64_sme_writeq_vert: {
+      auto *Idx = dyn_cast<Instruction>(II->getOperand(1));
+      if (!Idx || Idx->getOpcode() != Instruction::Add)
+        return false;
+      Ops.push_back(&II->getOperandUse(1));
+      return true;
+    }
+    case Intrinsic::aarch64_sme_read_horiz:
+    case Intrinsic::aarch64_sme_read_vert:
+    case Intrinsic::aarch64_sme_readq_horiz:
+    case Intrinsic::aarch64_sme_readq_vert:
+    case Intrinsic::aarch64_sme_ld1b_vert:
+    case Intrinsic::aarch64_sme_ld1h_vert:
+    case Intrinsic::aarch64_sme_ld1w_vert:
+    case Intrinsic::aarch64_sme_ld1d_vert:
+    case Intrinsic::aarch64_sme_ld1q_vert:
+    case Intrinsic::aarch64_sme_st1b_vert:
+    case Intrinsic::aarch64_sme_st1h_vert:
+    case Intrinsic::aarch64_sme_st1w_vert:
+    case Intrinsic::aarch64_sme_st1d_vert:
+    case Intrinsic::aarch64_sme_st1q_vert:
+    case Intrinsic::aarch64_sme_ld1b_horiz:
+    case Intrinsic::aarch64_sme_ld1h_horiz:
+    case Intrinsic::aarch64_sme_ld1w_horiz:
+    case Intrinsic::aarch64_sme_ld1d_horiz:
+    case Intrinsic::aarch64_sme_ld1q_horiz:
+    case Intrinsic::aarch64_sme_st1b_horiz:
+    case Intrinsic::aarch64_sme_st1h_horiz:
+    case Intrinsic::aarch64_sme_st1w_horiz:
+    case Intrinsic::aarch64_sme_st1d_horiz:
+    case Intrinsic::aarch64_sme_st1q_horiz: {
+      auto *Idx = dyn_cast<Instruction>(II->getOperand(3));
+      if (!Idx || Idx->getOpcode() != Instruction::Add)
+        return false;
+      Ops.push_back(&II->getOperandUse(3));
+      return true;
+    }
+    case Intrinsic::aarch64_neon_pmull:
       if (!areExtractShuffleVectors(II->getOperand(0), II->getOperand(1)))
         return false;
       Ops.push_back(&II->getOperandUse(0));
       Ops.push_back(&II->getOperandUse(1));
       return true;
-
     case Intrinsic::aarch64_neon_pmull64:
       if (!areOperandsOfVmullHighP64(II->getArgOperand(0),
                                      II->getArgOperand(1)))
@@ -11556,12 +13920,14 @@ bool AArch64TargetLowering::shouldSinkOperands(
       Ops.push_back(&II->getArgOperandUse(0));
       Ops.push_back(&II->getArgOperandUse(1));
       return true;
-
     default:
       return false;
     }
   }
 
+  if (!I->getType()->isVectorTy())
+    return false;
+
   switch (I->getOpcode()) {
   case Instruction::Sub:
   case Instruction::Add: {
@@ -11572,7 +13938,7 @@ bool AArch64TargetLowering::shouldSinkOperands(
     // can sink them too.
     auto Ext1 = cast<Instruction>(I->getOperand(0));
     auto Ext2 = cast<Instruction>(I->getOperand(1));
-    if (areExtractShuffleVectors(Ext1, Ext2)) {
+    if (areExtractShuffleVectors(Ext1->getOperand(0), Ext2->getOperand(0))) {
       Ops.push_back(&Ext1->getOperandUse(0));
       Ops.push_back(&Ext2->getOperandUse(0));
     }
@@ -11583,14 +13949,37 @@ bool AArch64TargetLowering::shouldSinkOperands(
     return true;
   }
   case Instruction::Mul: {
-    bool IsProfitable = false;
+    int NumZExts = 0, NumSExts = 0;
     for (auto &Op : I->operands()) {
       // Make sure we are not already sinking this operand
       if (any_of(Ops, [&](Use *U) { return U->get() == Op; }))
         continue;
 
-      ShuffleVectorInst *Shuffle = dyn_cast<ShuffleVectorInst>(Op);
-      if (!Shuffle || !Shuffle->isZeroEltSplat())
+      if (match(&Op, m_SExt(m_Value()))) {
+        NumSExts++;
+        continue;
+      } else if (match(&Op, m_ZExt(m_Value()))) {
+        NumZExts++;
+        continue;
+      }
+
+      ShuffleVectorInst *Shuffle = dyn_cast<ShuffleVectorInst>(Op);
+
+      // If the Shuffle is a splat and the operand is a zext/sext, sinking the
+      // operand and the s/zext can help create indexed s/umull. This is
+      // especially useful to prevent i64 mul being scalarized.
+      if (Shuffle && isSplatShuffle(Shuffle) &&
+          match(Shuffle->getOperand(0), m_ZExtOrSExt(m_Value()))) {
+        Ops.push_back(&Shuffle->getOperandUse(0));
+        Ops.push_back(&Op);
+        if (match(Shuffle->getOperand(0), m_SExt(m_Value())))
+          NumSExts++;
+        else
+          NumZExts++;
+        continue;
+      }
+
+      if (!Shuffle)
         continue;
 
       Value *ShuffleOperand = Shuffle->getOperand(0);
@@ -11609,15 +13998,27 @@ bool AArch64TargetLowering::shouldSinkOperands(
         continue;
 
       unsigned Opcode = OperandInstr->getOpcode();
-      if (Opcode != Instruction::SExt && Opcode != Instruction::ZExt)
-        continue;
+      if (Opcode == Instruction::SExt)
+        NumSExts++;
+      else if (Opcode == Instruction::ZExt)
+        NumZExts++;
+      else {
+        // If we find that the top bits are known 0, then we can sink and allow
+        // the backend to generate a umull.
+        unsigned Bitwidth = I->getType()->getScalarSizeInBits();
+        APInt UpperMask = APInt::getHighBitsSet(Bitwidth, Bitwidth / 2);
+        const DataLayout &DL = I->getFunction()->getParent()->getDataLayout();
+        if (!MaskedValueIsZero(OperandInstr, UpperMask, DL))
+          continue;
+        NumZExts++;
+      }
 
       Ops.push_back(&Shuffle->getOperandUse(0));
       Ops.push_back(&Op);
-      IsProfitable = true;
     }
 
-    return IsProfitable;
+    // Is it profitable to sink if we found two of the same type of extends.
+    return !Ops.empty() && (NumSExts == 2 || NumZExts == 2);
   }
   default:
     return false;
@@ -11625,6 +14026,242 @@ bool AArch64TargetLowering::shouldSinkOperands(
   return false;
 }
 
+static void createTblShuffleForZExt(ZExtInst *ZExt, bool IsLittleEndian) {
+  Value *Op = ZExt->getOperand(0);
+  auto *SrcTy = cast<FixedVectorType>(Op->getType());
+  auto *DstTy = cast<FixedVectorType>(ZExt->getType());
+  auto SrcWidth = cast<IntegerType>(SrcTy->getElementType())->getBitWidth();
+  auto DstWidth = cast<IntegerType>(DstTy->getElementType())->getBitWidth();
+  assert(DstWidth % SrcWidth == 0 &&
+         "TBL lowering is not supported for a ZExt instruction with this "
+         "source & destination element type.");
+  unsigned ZExtFactor = DstWidth / SrcWidth;
+  unsigned NumElts = SrcTy->getNumElements();
+  IRBuilder<> Builder(ZExt);
+  SmallVector<int> Mask;
+  // Create a mask that selects <0,...,Op[i]> for each lane of the destination
+  // vector to replace the original ZExt. This can later be lowered to a set of
+  // tbl instructions.
+  for (unsigned i = 0; i < NumElts * ZExtFactor; i++) {
+    if (IsLittleEndian) {
+      if (i % ZExtFactor == 0)
+        Mask.push_back(i / ZExtFactor);
+      else
+        Mask.push_back(NumElts);
+    } else {
+      if ((i + 1) % ZExtFactor == 0)
+        Mask.push_back((i - ZExtFactor + 1) / ZExtFactor);
+      else
+        Mask.push_back(NumElts);
+    }
+  }
+
+  auto *FirstEltZero = Builder.CreateInsertElement(
+      PoisonValue::get(SrcTy), Builder.getInt8(0), uint64_t(0));
+  Value *Result = Builder.CreateShuffleVector(Op, FirstEltZero, Mask);
+  Result = Builder.CreateBitCast(Result, DstTy);
+  ZExt->replaceAllUsesWith(Result);
+  ZExt->eraseFromParent();
+}
+
+static void createTblForTrunc(TruncInst *TI, bool IsLittleEndian) {
+  IRBuilder<> Builder(TI);
+  SmallVector<Value *> Parts;
+  int NumElements = cast<FixedVectorType>(TI->getType())->getNumElements();
+  auto *SrcTy = cast<FixedVectorType>(TI->getOperand(0)->getType());
+  auto *DstTy = cast<FixedVectorType>(TI->getType());
+  assert(SrcTy->getElementType()->isIntegerTy() &&
+         "Non-integer type source vector element is not supported");
+  assert(DstTy->getElementType()->isIntegerTy(8) &&
+         "Unsupported destination vector element type");
+  unsigned SrcElemTySz =
+      cast<IntegerType>(SrcTy->getElementType())->getBitWidth();
+  unsigned DstElemTySz =
+      cast<IntegerType>(DstTy->getElementType())->getBitWidth();
+  assert((SrcElemTySz % DstElemTySz == 0) &&
+         "Cannot lower truncate to tbl instructions for a source element size "
+         "that is not divisible by the destination element size");
+  unsigned TruncFactor = SrcElemTySz / DstElemTySz;
+  assert((SrcElemTySz == 16 || SrcElemTySz == 32 || SrcElemTySz == 64) &&
+         "Unsupported source vector element type size");
+  Type *VecTy = FixedVectorType::get(Builder.getInt8Ty(), 16);
+
+  // Create a mask to choose every nth byte from the source vector table of
+  // bytes to create the truncated destination vector, where 'n' is the truncate
+  // ratio. For example, for a truncate from Yxi64 to Yxi8, choose
+  // 0,8,16,..Y*8th bytes for the little-endian format
+  SmallVector<Constant *, 16> MaskConst;
+  for (int Itr = 0; Itr < 16; Itr++) {
+    if (Itr < NumElements)
+      MaskConst.push_back(Builder.getInt8(
+          IsLittleEndian ? Itr * TruncFactor
+                         : Itr * TruncFactor + (TruncFactor - 1)));
+    else
+      MaskConst.push_back(Builder.getInt8(255));
+  }
+
+  int MaxTblSz = 128 * 4;
+  int MaxSrcSz = SrcElemTySz * NumElements;
+  int ElemsPerTbl =
+      (MaxTblSz > MaxSrcSz) ? NumElements : (MaxTblSz / SrcElemTySz);
+  assert(ElemsPerTbl <= 16 &&
+         "Maximum elements selected using TBL instruction cannot exceed 16!");
+
+  int ShuffleCount = 128 / SrcElemTySz;
+  SmallVector<int> ShuffleLanes;
+  for (int i = 0; i < ShuffleCount; ++i)
+    ShuffleLanes.push_back(i);
+
+  // Create TBL's table of bytes in 1,2,3 or 4 FP/SIMD registers using shuffles
+  // over the source vector. If TBL's maximum 4 FP/SIMD registers are saturated,
+  // call TBL & save the result in a vector of TBL results for combining later.
+  SmallVector<Value *> Results;
+  while (ShuffleLanes.back() < NumElements) {
+    Parts.push_back(Builder.CreateBitCast(
+        Builder.CreateShuffleVector(TI->getOperand(0), ShuffleLanes), VecTy));
+
+    if (Parts.size() == 4) {
+      auto *F = Intrinsic::getDeclaration(TI->getModule(),
+                                          Intrinsic::aarch64_neon_tbl4, VecTy);
+      Parts.push_back(ConstantVector::get(MaskConst));
+      Results.push_back(Builder.CreateCall(F, Parts));
+      Parts.clear();
+    }
+
+    for (int i = 0; i < ShuffleCount; ++i)
+      ShuffleLanes[i] += ShuffleCount;
+  }
+
+  assert((Parts.empty() || Results.empty()) &&
+         "Lowering trunc for vectors requiring different TBL instructions is "
+         "not supported!");
+  // Call TBL for the residual table bytes present in 1,2, or 3 FP/SIMD
+  // registers
+  if (!Parts.empty()) {
+    Intrinsic::ID TblID;
+    switch (Parts.size()) {
+    case 1:
+      TblID = Intrinsic::aarch64_neon_tbl1;
+      break;
+    case 2:
+      TblID = Intrinsic::aarch64_neon_tbl2;
+      break;
+    case 3:
+      TblID = Intrinsic::aarch64_neon_tbl3;
+      break;
+    }
+
+    auto *F = Intrinsic::getDeclaration(TI->getModule(), TblID, VecTy);
+    Parts.push_back(ConstantVector::get(MaskConst));
+    Results.push_back(Builder.CreateCall(F, Parts));
+  }
+
+  // Extract the destination vector from TBL result(s) after combining them
+  // where applicable. Currently, at most two TBLs are supported.
+  assert(Results.size() <= 2 && "Trunc lowering does not support generation of "
+                                "more than 2 tbl instructions!");
+  Value *FinalResult = Results[0];
+  if (Results.size() == 1) {
+    if (ElemsPerTbl < 16) {
+      SmallVector<int> FinalMask(ElemsPerTbl);
+      std::iota(FinalMask.begin(), FinalMask.end(), 0);
+      FinalResult = Builder.CreateShuffleVector(Results[0], FinalMask);
+    }
+  } else {
+    SmallVector<int> FinalMask(ElemsPerTbl * Results.size());
+    if (ElemsPerTbl < 16) {
+      std::iota(FinalMask.begin(), FinalMask.begin() + ElemsPerTbl, 0);
+      std::iota(FinalMask.begin() + ElemsPerTbl, FinalMask.end(), 16);
+    } else {
+      std::iota(FinalMask.begin(), FinalMask.end(), 0);
+    }
+    FinalResult =
+        Builder.CreateShuffleVector(Results[0], Results[1], FinalMask);
+  }
+
+  TI->replaceAllUsesWith(FinalResult);
+  TI->eraseFromParent();
+}
+
+bool AArch64TargetLowering::optimizeExtendOrTruncateConversion(Instruction *I,
+                                                               Loop *L) const {
+  // shuffle_vector instructions are serialized when targeting SVE,
+  // see LowerSPLAT_VECTOR. This peephole is not beneficial.
+  if (Subtarget->useSVEForFixedLengthVectors())
+    return false;
+
+  // Try to optimize conversions using tbl. This requires materializing constant
+  // index vectors, which can increase code size and add loads. Skip the
+  // transform unless the conversion is in a loop block guaranteed to execute
+  // and we are not optimizing for size.
+  Function *F = I->getParent()->getParent();
+  if (!L || L->getHeader() != I->getParent() || F->hasMinSize() ||
+      F->hasOptSize())
+    return false;
+
+  auto *SrcTy = dyn_cast<FixedVectorType>(I->getOperand(0)->getType());
+  auto *DstTy = dyn_cast<FixedVectorType>(I->getType());
+  if (!SrcTy || !DstTy)
+    return false;
+
+  // Convert 'zext <Y x i8> %x to <Y x i8X>' to a shuffle that can be
+  // lowered to tbl instructions to insert the original i8 elements
+  // into i8x lanes. This is enabled for cases where it is beneficial.
+  auto *ZExt = dyn_cast<ZExtInst>(I);
+  if (ZExt && SrcTy->getElementType()->isIntegerTy(8)) {
+    auto DstWidth = cast<IntegerType>(DstTy->getElementType())->getBitWidth();
+    if (DstWidth % 8 == 0 && DstWidth > 16 && DstWidth < 64) {
+      createTblShuffleForZExt(ZExt, Subtarget->isLittleEndian());
+      return true;
+    }
+  }
+
+  auto *UIToFP = dyn_cast<UIToFPInst>(I);
+  if (UIToFP && SrcTy->getElementType()->isIntegerTy(8) &&
+      DstTy->getElementType()->isFloatTy()) {
+    IRBuilder<> Builder(I);
+    auto *ZExt = cast<ZExtInst>(
+        Builder.CreateZExt(I->getOperand(0), VectorType::getInteger(DstTy)));
+    auto *UI = Builder.CreateUIToFP(ZExt, DstTy);
+    I->replaceAllUsesWith(UI);
+    I->eraseFromParent();
+    createTblShuffleForZExt(ZExt, Subtarget->isLittleEndian());
+    return true;
+  }
+
+  // Convert 'fptoui <(8|16) x float> to <(8|16) x i8>' to a wide fptoui
+  // followed by a truncate lowered to using tbl.4.
+  auto *FPToUI = dyn_cast<FPToUIInst>(I);
+  if (FPToUI &&
+      (SrcTy->getNumElements() == 8 || SrcTy->getNumElements() == 16) &&
+      SrcTy->getElementType()->isFloatTy() &&
+      DstTy->getElementType()->isIntegerTy(8)) {
+    IRBuilder<> Builder(I);
+    auto *WideConv = Builder.CreateFPToUI(FPToUI->getOperand(0),
+                                          VectorType::getInteger(SrcTy));
+    auto *TruncI = Builder.CreateTrunc(WideConv, DstTy);
+    I->replaceAllUsesWith(TruncI);
+    I->eraseFromParent();
+    createTblForTrunc(cast<TruncInst>(TruncI), Subtarget->isLittleEndian());
+    return true;
+  }
+
+  // Convert 'trunc <(8|16) x (i32|i64)> %x to <(8|16) x i8>' to an appropriate
+  // tbl instruction selecting the lowest/highest (little/big endian) 8 bits
+  // per lane of the input that is represented using 1,2,3 or 4 128-bit table
+  // registers
+  auto *TI = dyn_cast<TruncInst>(I);
+  if (TI && DstTy->getElementType()->isIntegerTy(8) &&
+      ((SrcTy->getElementType()->isIntegerTy(32) ||
+        SrcTy->getElementType()->isIntegerTy(64)) &&
+       (SrcTy->getNumElements() == 16 || SrcTy->getNumElements() == 8))) {
+    createTblForTrunc(TI, Subtarget->isLittleEndian());
+    return true;
+  }
+
+  return false;
+}
+
 bool AArch64TargetLowering::hasPairedLoad(EVT LoadedType,
                                           Align &RequiredAligment) const {
   if (!LoadedType.isSimple() ||
@@ -11638,10 +14275,12 @@ bool AArch64TargetLowering::hasPairedLoad(EVT LoadedType,
 
 /// A helper function for determining the number of interleaved accesses we
 /// will generate when lowering accesses of the given type.
-unsigned
-AArch64TargetLowering::getNumInterleavedAccesses(VectorType *VecTy,
-                                                 const DataLayout &DL) const {
-  return (DL.getTypeSizeInBits(VecTy) + 127) / 128;
+unsigned AArch64TargetLowering::getNumInterleavedAccesses(
+    VectorType *VecTy, const DataLayout &DL, bool UseScalable) const {
+  unsigned VecSize = 128;
+  if (UseScalable)
+    VecSize = std::max(Subtarget->getMinSVEVectorSizeInBits(), 128u);
+  return std::max<unsigned>(1, (DL.getTypeSizeInBits(VecTy) + 127) / VecSize);
 }
 
 MachineMemOperand::Flags
@@ -11653,24 +14292,68 @@ AArch64TargetLowering::getTargetMMOFlags(const Instruction &I) const {
 }
 
 bool AArch64TargetLowering::isLegalInterleavedAccessType(
-    VectorType *VecTy, const DataLayout &DL) const {
+    VectorType *VecTy, const DataLayout &DL, bool &UseScalable) const {
 
   unsigned VecSize = DL.getTypeSizeInBits(VecTy);
   unsigned ElSize = DL.getTypeSizeInBits(VecTy->getElementType());
+  unsigned NumElements = cast<FixedVectorType>(VecTy)->getNumElements();
+
+  UseScalable = false;
+
+  // Ensure that the predicate for this number of elements is available.
+  if (Subtarget->hasSVE() && !getSVEPredPatternFromNumElements(NumElements))
+    return false;
 
   // Ensure the number of vector elements is greater than 1.
-  if (cast<FixedVectorType>(VecTy)->getNumElements() < 2)
+  if (NumElements < 2)
     return false;
 
   // Ensure the element type is legal.
   if (ElSize != 8 && ElSize != 16 && ElSize != 32 && ElSize != 64)
     return false;
 
+  if (Subtarget->forceStreamingCompatibleSVE() ||
+      (Subtarget->useSVEForFixedLengthVectors() &&
+       (VecSize % Subtarget->getMinSVEVectorSizeInBits() == 0 ||
+        (VecSize < Subtarget->getMinSVEVectorSizeInBits() &&
+         isPowerOf2_32(NumElements) && VecSize > 128)))) {
+    UseScalable = true;
+    return true;
+  }
+
   // Ensure the total vector size is 64 or a multiple of 128. Types larger than
   // 128 will be split into multiple interleaved accesses.
   return VecSize == 64 || VecSize % 128 == 0;
 }
 
+static ScalableVectorType *getSVEContainerIRType(FixedVectorType *VTy) {
+  if (VTy->getElementType() == Type::getDoubleTy(VTy->getContext()))
+    return ScalableVectorType::get(VTy->getElementType(), 2);
+
+  if (VTy->getElementType() == Type::getFloatTy(VTy->getContext()))
+    return ScalableVectorType::get(VTy->getElementType(), 4);
+
+  if (VTy->getElementType() == Type::getBFloatTy(VTy->getContext()))
+    return ScalableVectorType::get(VTy->getElementType(), 8);
+
+  if (VTy->getElementType() == Type::getHalfTy(VTy->getContext()))
+    return ScalableVectorType::get(VTy->getElementType(), 8);
+
+  if (VTy->getElementType() == Type::getInt64Ty(VTy->getContext()))
+    return ScalableVectorType::get(VTy->getElementType(), 2);
+
+  if (VTy->getElementType() == Type::getInt32Ty(VTy->getContext()))
+    return ScalableVectorType::get(VTy->getElementType(), 4);
+
+  if (VTy->getElementType() == Type::getInt16Ty(VTy->getContext()))
+    return ScalableVectorType::get(VTy->getElementType(), 8);
+
+  if (VTy->getElementType() == Type::getInt8Ty(VTy->getContext()))
+    return ScalableVectorType::get(VTy->getElementType(), 16);
+
+  llvm_unreachable("Cannot handle input vector type");
+}
+
 /// Lower an interleaved load into a ldN intrinsic.
 ///
 /// E.g. Lower an interleaved load (Factor = 2):
@@ -11698,10 +14381,12 @@ bool AArch64TargetLowering::lowerInterleavedLoad(
   // Skip if we do not have NEON and skip illegal vector types. We can
   // "legalize" wide vector types into multiple interleaved accesses as long as
   // the vector types are divisible by 128.
-  if (!Subtarget->hasNEON() || !isLegalInterleavedAccessType(VTy, DL))
+  bool UseScalable;
+  if (!Subtarget->hasNEON() ||
+      !isLegalInterleavedAccessType(VTy, DL, UseScalable))
     return false;
 
-  unsigned NumLoads = getNumInterleavedAccesses(VTy, DL);
+  unsigned NumLoads = getNumInterleavedAccesses(VTy, DL, UseScalable);
 
   auto *FVTy = cast<FixedVectorType>(VTy);
 
@@ -11712,48 +14397,84 @@ bool AArch64TargetLowering::lowerInterleavedLoad(
     FVTy =
         FixedVectorType::get(DL.getIntPtrType(EltTy), FVTy->getNumElements());
 
+  // If we're going to generate more than one load, reset the sub-vector type
+  // to something legal.
+  FVTy = FixedVectorType::get(FVTy->getElementType(),
+                              FVTy->getNumElements() / NumLoads);
+
+  auto *LDVTy =
+      UseScalable ? cast<VectorType>(getSVEContainerIRType(FVTy)) : FVTy;
+
   IRBuilder<> Builder(LI);
 
   // The base address of the load.
   Value *BaseAddr = LI->getPointerOperand();
 
   if (NumLoads > 1) {
-    // If we're going to generate more than one load, reset the sub-vector type
-    // to something legal.
-    FVTy = FixedVectorType::get(FVTy->getElementType(),
-                                FVTy->getNumElements() / NumLoads);
-
     // We will compute the pointer operand of each load from the original base
     // address using GEPs. Cast the base address to a pointer to the scalar
     // element type.
     BaseAddr = Builder.CreateBitCast(
         BaseAddr,
-        FVTy->getElementType()->getPointerTo(LI->getPointerAddressSpace()));
-  }
-
-  Type *PtrTy = FVTy->getPointerTo(LI->getPointerAddressSpace());
-  Type *Tys[2] = {FVTy, PtrTy};
-  static const Intrinsic::ID LoadInts[3] = {Intrinsic::aarch64_neon_ld2,
-                                            Intrinsic::aarch64_neon_ld3,
-                                            Intrinsic::aarch64_neon_ld4};
-  Function *LdNFunc =
-      Intrinsic::getDeclaration(LI->getModule(), LoadInts[Factor - 2], Tys);
+        LDVTy->getElementType()->getPointerTo(LI->getPointerAddressSpace()));
+  }
+
+  Type *PtrTy =
+      UseScalable
+          ? LDVTy->getElementType()->getPointerTo(LI->getPointerAddressSpace())
+          : LDVTy->getPointerTo(LI->getPointerAddressSpace());
+  Type *PredTy = VectorType::get(Type::getInt1Ty(LDVTy->getContext()),
+                                 LDVTy->getElementCount());
+
+  static const Intrinsic::ID SVELoadIntrs[3] = {
+      Intrinsic::aarch64_sve_ld2_sret, Intrinsic::aarch64_sve_ld3_sret,
+      Intrinsic::aarch64_sve_ld4_sret};
+  static const Intrinsic::ID NEONLoadIntrs[3] = {Intrinsic::aarch64_neon_ld2,
+                                                 Intrinsic::aarch64_neon_ld3,
+                                                 Intrinsic::aarch64_neon_ld4};
+  Function *LdNFunc;
+  if (UseScalable)
+    LdNFunc = Intrinsic::getDeclaration(LI->getModule(),
+                                        SVELoadIntrs[Factor - 2], {LDVTy});
+  else
+    LdNFunc = Intrinsic::getDeclaration(
+        LI->getModule(), NEONLoadIntrs[Factor - 2], {LDVTy, PtrTy});
 
   // Holds sub-vectors extracted from the load intrinsic return values. The
   // sub-vectors are associated with the shufflevector instructions they will
   // replace.
   DenseMap<ShuffleVectorInst *, SmallVector<Value *, 4>> SubVecs;
 
+  Value *PTrue = nullptr;
+  if (UseScalable) {
+    std::optional<unsigned> PgPattern =
+        getSVEPredPatternFromNumElements(FVTy->getNumElements());
+    if (Subtarget->getMinSVEVectorSizeInBits() ==
+            Subtarget->getMaxSVEVectorSizeInBits() &&
+        Subtarget->getMinSVEVectorSizeInBits() == DL.getTypeSizeInBits(FVTy))
+      PgPattern = AArch64SVEPredPattern::all;
+
+    auto *PTruePat =
+        ConstantInt::get(Type::getInt32Ty(LDVTy->getContext()), *PgPattern);
+    PTrue = Builder.CreateIntrinsic(Intrinsic::aarch64_sve_ptrue, {PredTy},
+                                    {PTruePat});
+  }
+
   for (unsigned LoadCount = 0; LoadCount < NumLoads; ++LoadCount) {
 
     // If we're generating more than one load, compute the base address of
     // subsequent loads as an offset from the previous.
     if (LoadCount > 0)
-      BaseAddr = Builder.CreateConstGEP1_32(FVTy->getElementType(), BaseAddr,
+      BaseAddr = Builder.CreateConstGEP1_32(LDVTy->getElementType(), BaseAddr,
                                             FVTy->getNumElements() * Factor);
 
-    CallInst *LdN = Builder.CreateCall(
-        LdNFunc, Builder.CreateBitCast(BaseAddr, PtrTy), "ldN");
+    CallInst *LdN;
+    if (UseScalable)
+      LdN = Builder.CreateCall(
+          LdNFunc, {PTrue, Builder.CreateBitCast(BaseAddr, PtrTy)}, "ldN");
+    else
+      LdN = Builder.CreateCall(LdNFunc, Builder.CreateBitCast(BaseAddr, PtrTy),
+                               "ldN");
 
     // Extract and store the sub-vectors returned by the load intrinsic.
     for (unsigned i = 0; i < Shuffles.size(); i++) {
@@ -11762,11 +14483,17 @@ bool AArch64TargetLowering::lowerInterleavedLoad(
 
       Value *SubVec = Builder.CreateExtractValue(LdN, Index);
 
+      if (UseScalable)
+        SubVec = Builder.CreateExtractVector(
+            FVTy, SubVec,
+            ConstantInt::get(Type::getInt64Ty(VTy->getContext()), 0));
+
       // Convert the integer vector to pointer vector if the element is pointer.
       if (EltTy->isPointerTy())
         SubVec = Builder.CreateIntToPtr(
             SubVec, FixedVectorType::get(SVI->getType()->getElementType(),
                                          FVTy->getNumElements()));
+
       SubVecs[SVI].push_back(SubVec);
     }
   }
@@ -11814,6 +14541,11 @@ bool AArch64TargetLowering::lowerInterleavedLoad(
 bool AArch64TargetLowering::lowerInterleavedStore(StoreInst *SI,
                                                   ShuffleVectorInst *SVI,
                                                   unsigned Factor) const {
+  // Skip if streaming compatible SVE is enabled, because it generates invalid
+  // code in streaming mode when SVE length is not specified.
+  if (Subtarget->forceStreamingCompatibleSVE())
+    return false;
+
   assert(Factor >= 2 && Factor <= getMaxSupportedInterleaveFactor() &&
          "Invalid interleave factor");
 
@@ -11825,14 +14557,16 @@ bool AArch64TargetLowering::lowerInterleavedStore(StoreInst *SI,
   auto *SubVecTy = FixedVectorType::get(EltTy, LaneLen);
 
   const DataLayout &DL = SI->getModule()->getDataLayout();
+  bool UseScalable;
 
   // Skip if we do not have NEON and skip illegal vector types. We can
   // "legalize" wide vector types into multiple interleaved accesses as long as
   // the vector types are divisible by 128.
-  if (!Subtarget->hasNEON() || !isLegalInterleavedAccessType(SubVecTy, DL))
+  if (!Subtarget->hasNEON() ||
+      !isLegalInterleavedAccessType(SubVecTy, DL, UseScalable))
     return false;
 
-  unsigned NumStores = getNumInterleavedAccesses(SubVecTy, DL);
+  unsigned NumStores = getNumInterleavedAccesses(SubVecTy, DL, UseScalable);
 
   Value *Op0 = SVI->getOperand(0);
   Value *Op1 = SVI->getOperand(1);
@@ -11853,15 +14587,18 @@ bool AArch64TargetLowering::lowerInterleavedStore(StoreInst *SI,
     SubVecTy = FixedVectorType::get(IntTy, LaneLen);
   }
 
+  // If we're going to generate more than one store, reset the lane length
+  // and sub-vector type to something legal.
+  LaneLen /= NumStores;
+  SubVecTy = FixedVectorType::get(SubVecTy->getElementType(), LaneLen);
+
+  auto *STVTy = UseScalable ? cast<VectorType>(getSVEContainerIRType(SubVecTy))
+                            : SubVecTy;
+
   // The base address of the store.
   Value *BaseAddr = SI->getPointerOperand();
 
   if (NumStores > 1) {
-    // If we're going to generate more than one store, reset the lane length
-    // and sub-vector type to something legal.
-    LaneLen /= NumStores;
-    SubVecTy = FixedVectorType::get(SubVecTy->getElementType(), LaneLen);
-
     // We will compute the pointer operand of each store from the original base
     // address using GEPs. Cast the base address to a pointer to the scalar
     // element type.
@@ -11872,13 +14609,49 @@ bool AArch64TargetLowering::lowerInterleavedStore(StoreInst *SI,
 
   auto Mask = SVI->getShuffleMask();
 
-  Type *PtrTy = SubVecTy->getPointerTo(SI->getPointerAddressSpace());
-  Type *Tys[2] = {SubVecTy, PtrTy};
-  static const Intrinsic::ID StoreInts[3] = {Intrinsic::aarch64_neon_st2,
-                                             Intrinsic::aarch64_neon_st3,
-                                             Intrinsic::aarch64_neon_st4};
-  Function *StNFunc =
-      Intrinsic::getDeclaration(SI->getModule(), StoreInts[Factor - 2], Tys);
+  // Sanity check if all the indices are NOT in range.
+  // If mask is `undef` or `poison`, `Mask` may be a vector of -1s.
+  // If all of them are `undef`, OOB read will happen later.
+  if (llvm::all_of(Mask, [](int Idx) { return Idx == UndefMaskElem; })) {
+    return false;
+  }
+
+  Type *PtrTy =
+      UseScalable
+          ? STVTy->getElementType()->getPointerTo(SI->getPointerAddressSpace())
+          : STVTy->getPointerTo(SI->getPointerAddressSpace());
+  Type *PredTy = VectorType::get(Type::getInt1Ty(STVTy->getContext()),
+                                 STVTy->getElementCount());
+
+  static const Intrinsic::ID SVEStoreIntrs[3] = {Intrinsic::aarch64_sve_st2,
+                                                 Intrinsic::aarch64_sve_st3,
+                                                 Intrinsic::aarch64_sve_st4};
+  static const Intrinsic::ID NEONStoreIntrs[3] = {Intrinsic::aarch64_neon_st2,
+                                                  Intrinsic::aarch64_neon_st3,
+                                                  Intrinsic::aarch64_neon_st4};
+  Function *StNFunc;
+  if (UseScalable)
+    StNFunc = Intrinsic::getDeclaration(SI->getModule(),
+                                        SVEStoreIntrs[Factor - 2], {STVTy});
+  else
+    StNFunc = Intrinsic::getDeclaration(
+        SI->getModule(), NEONStoreIntrs[Factor - 2], {STVTy, PtrTy});
+
+  Value *PTrue = nullptr;
+  if (UseScalable) {
+    std::optional<unsigned> PgPattern =
+        getSVEPredPatternFromNumElements(SubVecTy->getNumElements());
+    if (Subtarget->getMinSVEVectorSizeInBits() ==
+            Subtarget->getMaxSVEVectorSizeInBits() &&
+        Subtarget->getMinSVEVectorSizeInBits() ==
+            DL.getTypeSizeInBits(SubVecTy))
+      PgPattern = AArch64SVEPredPattern::all;
+
+    auto *PTruePat =
+        ConstantInt::get(Type::getInt32Ty(STVTy->getContext()), *PgPattern);
+    PTrue = Builder.CreateIntrinsic(Intrinsic::aarch64_sve_ptrue, {PredTy},
+                                    {PTruePat});
+  }
 
   for (unsigned StoreCount = 0; StoreCount < NumStores; ++StoreCount) {
 
@@ -11886,16 +14659,17 @@ bool AArch64TargetLowering::lowerInterleavedStore(StoreInst *SI,
 
     // Split the shufflevector operands into sub vectors for the new stN call.
     for (unsigned i = 0; i < Factor; i++) {
+      Value *Shuffle;
       unsigned IdxI = StoreCount * LaneLen * Factor + i;
       if (Mask[IdxI] >= 0) {
-        Ops.push_back(Builder.CreateShuffleVector(
-            Op0, Op1, createSequentialMask(Mask[IdxI], LaneLen, 0)));
+        Shuffle = Builder.CreateShuffleVector(
+            Op0, Op1, createSequentialMask(Mask[IdxI], LaneLen, 0));
       } else {
         unsigned StartMask = 0;
         for (unsigned j = 1; j < LaneLen; j++) {
-          unsigned IdxJ = StoreCount * LaneLen * Factor + j;
-          if (Mask[IdxJ * Factor + IdxI] >= 0) {
-            StartMask = Mask[IdxJ * Factor + IdxI] - IdxJ;
+          unsigned IdxJ = StoreCount * LaneLen * Factor + j * Factor + i;
+          if (Mask[IdxJ] >= 0) {
+            StartMask = Mask[IdxJ] - j;
             break;
           }
         }
@@ -11904,11 +14678,21 @@ bool AArch64TargetLowering::lowerInterleavedStore(StoreInst *SI,
         // In the case of all undefs we're defaulting to using elems from 0
         // Note: StartMask cannot be negative, it's checked in
         // isReInterleaveMask
-        Ops.push_back(Builder.CreateShuffleVector(
-            Op0, Op1, createSequentialMask(StartMask, LaneLen, 0)));
+        Shuffle = Builder.CreateShuffleVector(
+            Op0, Op1, createSequentialMask(StartMask, LaneLen, 0));
       }
+
+      if (UseScalable)
+        Shuffle = Builder.CreateInsertVector(
+            STVTy, UndefValue::get(STVTy), Shuffle,
+            ConstantInt::get(Type::getInt64Ty(STVTy->getContext()), 0));
+
+      Ops.push_back(Shuffle);
     }
 
+    if (UseScalable)
+      Ops.push_back(PTrue);
+
     // If we generating more than one store, we compute the base address of
     // subsequent stores as an offset from the previous.
     if (StoreCount > 0)
@@ -11921,62 +14705,9 @@ bool AArch64TargetLowering::lowerInterleavedStore(StoreInst *SI,
   return true;
 }
 
-// Lower an SVE structured load intrinsic returning a tuple type to target
-// specific intrinsic taking the same input but returning a multi-result value
-// of the split tuple type.
-//
-// E.g. Lowering an LD3:
-//
-//  call <vscale x 12 x i32> @llvm.aarch64.sve.ld3.nxv12i32(
-//                                                    <vscale x 4 x i1> %pred,
-//                                                    <vscale x 4 x i32>* %addr)
-//
-//  Output DAG:
-//
-//    t0: ch = EntryToken
-//        t2: nxv4i1,ch = CopyFromReg t0, Register:nxv4i1 %0
-//        t4: i64,ch = CopyFromReg t0, Register:i64 %1
-//    t5: nxv4i32,nxv4i32,nxv4i32,ch = AArch64ISD::SVE_LD3 t0, t2, t4
-//    t6: nxv12i32 = concat_vectors t5, t5:1, t5:2
-//
-// This is called pre-legalization to avoid widening/splitting issues with
-// non-power-of-2 tuple types used for LD3, such as nxv12i32.
-SDValue AArch64TargetLowering::LowerSVEStructLoad(unsigned Intrinsic,
-                                                  ArrayRef<SDValue> LoadOps,
-                                                  EVT VT, SelectionDAG &DAG,
-                                                  const SDLoc &DL) const {
-  assert(VT.isScalableVector() && "Can only lower scalable vectors");
-
-  unsigned N, Opcode;
-  static std::map<unsigned, std::pair<unsigned, unsigned>> IntrinsicMap = {
-      {Intrinsic::aarch64_sve_ld2, {2, AArch64ISD::SVE_LD2_MERGE_ZERO}},
-      {Intrinsic::aarch64_sve_ld3, {3, AArch64ISD::SVE_LD3_MERGE_ZERO}},
-      {Intrinsic::aarch64_sve_ld4, {4, AArch64ISD::SVE_LD4_MERGE_ZERO}}};
-
-  std::tie(N, Opcode) = IntrinsicMap[Intrinsic];
-  assert(VT.getVectorElementCount().getKnownMinValue() % N == 0 &&
-         "invalid tuple vector type!");
-
-  EVT SplitVT =
-      EVT::getVectorVT(*DAG.getContext(), VT.getVectorElementType(),
-                       VT.getVectorElementCount().divideCoefficientBy(N));
-  assert(isTypeLegal(SplitVT));
-
-  SmallVector<EVT, 5> VTs(N, SplitVT);
-  VTs.push_back(MVT::Other); // Chain
-  SDVTList NodeTys = DAG.getVTList(VTs);
-
-  SDValue PseudoLoad = DAG.getNode(Opcode, DL, NodeTys, LoadOps);
-  SmallVector<SDValue, 4> PseudoLoadOps;
-  for (unsigned I = 0; I < N; ++I)
-    PseudoLoadOps.push_back(SDValue(PseudoLoad.getNode(), I));
-  return DAG.getNode(ISD::CONCAT_VECTORS, DL, VT, PseudoLoadOps);
-}
-
 EVT AArch64TargetLowering::getOptimalMemOpType(
     const MemOp &Op, const AttributeList &FuncAttributes) const {
-  bool CanImplicitFloat =
-      !FuncAttributes.hasFnAttribute(Attribute::NoImplicitFloat);
+  bool CanImplicitFloat = !FuncAttributes.hasFnAttr(Attribute::NoImplicitFloat);
   bool CanUseNEON = Subtarget->hasNEON() && CanImplicitFloat;
   bool CanUseFP = Subtarget->hasFPARMv8() && CanImplicitFloat;
   // Only use AdvSIMD to implement memset of 32-byte and above. It would have
@@ -11986,15 +14717,15 @@ EVT AArch64TargetLowering::getOptimalMemOpType(
   auto AlignmentIsAcceptable = [&](EVT VT, Align AlignCheck) {
     if (Op.isAligned(AlignCheck))
       return true;
-    bool Fast;
+    unsigned Fast;
     return allowsMisalignedMemoryAccesses(VT, 0, Align(1),
                                           MachineMemOperand::MONone, &Fast) &&
            Fast;
   };
 
   if (CanUseNEON && Op.isMemset() && !IsSmallMemset &&
-      AlignmentIsAcceptable(MVT::v2i64, Align(16)))
-    return MVT::v2i64;
+      AlignmentIsAcceptable(MVT::v16i8, Align(16)))
+    return MVT::v16i8;
   if (CanUseFP && !IsSmallMemset && AlignmentIsAcceptable(MVT::f128, Align(16)))
     return MVT::f128;
   if (Op.size() >= 8 && AlignmentIsAcceptable(MVT::i64, Align(8)))
@@ -12006,8 +14737,7 @@ EVT AArch64TargetLowering::getOptimalMemOpType(
 
 LLT AArch64TargetLowering::getOptimalMemOpLLT(
     const MemOp &Op, const AttributeList &FuncAttributes) const {
-  bool CanImplicitFloat =
-      !FuncAttributes.hasFnAttribute(Attribute::NoImplicitFloat);
+  bool CanImplicitFloat = !FuncAttributes.hasFnAttr(Attribute::NoImplicitFloat);
   bool CanUseNEON = Subtarget->hasNEON() && CanImplicitFloat;
   bool CanUseFP = Subtarget->hasFPARMv8() && CanImplicitFloat;
   // Only use AdvSIMD to implement memset of 32-byte and above. It would have
@@ -12017,7 +14747,7 @@ LLT AArch64TargetLowering::getOptimalMemOpLLT(
   auto AlignmentIsAcceptable = [&](EVT VT, Align AlignCheck) {
     if (Op.isAligned(AlignCheck))
       return true;
-    bool Fast;
+    unsigned Fast;
     return allowsMisalignedMemoryAccesses(VT, 0, Align(1),
                                           MachineMemOperand::MONone, &Fast) &&
            Fast;
@@ -12051,6 +14781,33 @@ bool AArch64TargetLowering::isLegalAddImmediate(int64_t Immed) const {
   return IsLegal;
 }
 
+// Return false to prevent folding
+// (mul (add x, c1), c2) -> (add (mul x, c2), c2*c1) in DAGCombine,
+// if the folding leads to worse code.
+bool AArch64TargetLowering::isMulAddWithConstProfitable(
+    SDValue AddNode, SDValue ConstNode) const {
+  // Let the DAGCombiner decide for vector types and large types.
+  const EVT VT = AddNode.getValueType();
+  if (VT.isVector() || VT.getScalarSizeInBits() > 64)
+    return true;
+
+  // It is worse if c1 is legal add immediate, while c1*c2 is not
+  // and has to be composed by at least two instructions.
+  const ConstantSDNode *C1Node = cast<ConstantSDNode>(AddNode.getOperand(1));
+  const ConstantSDNode *C2Node = cast<ConstantSDNode>(ConstNode);
+  const int64_t C1 = C1Node->getSExtValue();
+  const APInt C1C2 = C1Node->getAPIntValue() * C2Node->getAPIntValue();
+  if (!isLegalAddImmediate(C1) || isLegalAddImmediate(C1C2.getSExtValue()))
+    return true;
+  SmallVector<AArch64_IMM::ImmInsnModel, 4> Insn;
+  AArch64_IMM::expandMOVImm(C1C2.getZExtValue(), VT.getSizeInBits(), Insn);
+  if (Insn.size() > 1)
+    return false;
+
+  // Default to true and let the DAGCombiner decide.
+  return true;
+}
+
 // Integer comparisons are implemented with ADDS/SUBS, so the range of valid
 // immediates is the same as for an add or a sub.
 bool AArch64TargetLowering::isLegalICmpImmediate(int64_t Immed) const {
@@ -12121,22 +14878,6 @@ bool AArch64TargetLowering::shouldConsiderGEPOffsetSplit() const {
   return true;
 }
 
-InstructionCost AArch64TargetLowering::getScalingFactorCost(
-    const DataLayout &DL, const AddrMode &AM, Type *Ty, unsigned AS) const {
-  // Scaling factors are not free at all.
-  // Operands                     | Rt Latency
-  // -------------------------------------------
-  // Rt, [Xn, Xm]                 | 4
-  // -------------------------------------------
-  // Rt, [Xn, Xm, lsl #imm]       | Rn: 4 Rm: 5
-  // Rt, [Xn, Wm, <extend> #imm]  |
-  if (isLegalAddressingMode(DL, AM, Ty, AS))
-    // Scale represents reg2 * scale, thus account for 1 if
-    // it is not equal to 0 or 1.
-    return AM.Scale != 0 && AM.Scale != 1;
-  return -1;
-}
-
 bool AArch64TargetLowering::isFMAFasterThanFMulAndFAdd(
     const MachineFunction &MF, EVT VT) const {
   VT = VT.getScalarType();
@@ -12170,7 +14911,8 @@ bool AArch64TargetLowering::isFMAFasterThanFMulAndFAdd(const Function &F,
 
 bool AArch64TargetLowering::generateFMAsInMachineCombiner(
     EVT VT, CodeGenOpt::Level OptLevel) const {
-  return (OptLevel >= CodeGenOpt::Aggressive) && !VT.isScalableVector();
+  return (OptLevel >= CodeGenOpt::Aggressive) && !VT.isScalableVector() &&
+         !useSVEForFixedLengthVectorVT(VT);
 }
 
 const MCPhysReg *
@@ -12187,18 +14929,77 @@ AArch64TargetLowering::getScratchRegisters(CallingConv::ID) const {
 bool
 AArch64TargetLowering::isDesirableToCommuteWithShift(const SDNode *N,
                                                      CombineLevel Level) const {
-  N = N->getOperand(0).getNode();
+  assert((N->getOpcode() == ISD::SHL || N->getOpcode() == ISD::SRA ||
+          N->getOpcode() == ISD::SRL) &&
+         "Expected shift op");
+
+  SDValue ShiftLHS = N->getOperand(0);
   EVT VT = N->getValueType(0);
-    // If N is unsigned bit extraction: ((x >> C) & mask), then do not combine
-    // it with shift to let it be lowered to UBFX.
-  if (N->getOpcode() == ISD::AND && (VT == MVT::i32 || VT == MVT::i64) &&
-      isa<ConstantSDNode>(N->getOperand(1))) {
-    uint64_t TruncMask = N->getConstantOperandVal(1);
-    if (isMask_64(TruncMask) &&
-      N->getOperand(0).getOpcode() == ISD::SRL &&
-      isa<ConstantSDNode>(N->getOperand(0)->getOperand(1)))
-      return false;
+
+  // If ShiftLHS is unsigned bit extraction: ((x >> C) & mask), then do not
+  // combine it with shift 'N' to let it be lowered to UBFX except:
+  // ((x >> C) & mask) << C.
+  if (ShiftLHS.getOpcode() == ISD::AND && (VT == MVT::i32 || VT == MVT::i64) &&
+      isa<ConstantSDNode>(ShiftLHS.getOperand(1))) {
+    uint64_t TruncMask = ShiftLHS.getConstantOperandVal(1);
+    if (isMask_64(TruncMask)) {
+      SDValue AndLHS = ShiftLHS.getOperand(0);
+      if (AndLHS.getOpcode() == ISD::SRL) {
+        if (auto *SRLC = dyn_cast<ConstantSDNode>(AndLHS.getOperand(1))) {
+          if (N->getOpcode() == ISD::SHL)
+            if (auto *SHLC = dyn_cast<ConstantSDNode>(N->getOperand(1)))
+              return SRLC->getZExtValue() == SHLC->getZExtValue();
+          return false;
+        }
+      }
+    }
+  }
+  return true;
+}
+
+bool AArch64TargetLowering::isDesirableToCommuteXorWithShift(
+    const SDNode *N) const {
+  assert(N->getOpcode() == ISD::XOR &&
+         (N->getOperand(0).getOpcode() == ISD::SHL ||
+          N->getOperand(0).getOpcode() == ISD::SRL) &&
+         "Expected XOR(SHIFT) pattern");
+
+  // Only commute if the entire NOT mask is a hidden shifted mask.
+  auto *XorC = dyn_cast<ConstantSDNode>(N->getOperand(1));
+  auto *ShiftC = dyn_cast<ConstantSDNode>(N->getOperand(0).getOperand(1));
+  if (XorC && ShiftC) {
+    unsigned MaskIdx, MaskLen;
+    if (XorC->getAPIntValue().isShiftedMask(MaskIdx, MaskLen)) {
+      unsigned ShiftAmt = ShiftC->getZExtValue();
+      unsigned BitWidth = N->getValueType(0).getScalarSizeInBits();
+      if (N->getOperand(0).getOpcode() == ISD::SHL)
+        return MaskIdx == ShiftAmt && MaskLen == (BitWidth - ShiftAmt);
+      return MaskIdx == 0 && MaskLen == (BitWidth - ShiftAmt);
+    }
+  }
+
+  return false;
+}
+
+bool AArch64TargetLowering::shouldFoldConstantShiftPairToMask(
+    const SDNode *N, CombineLevel Level) const {
+  assert(((N->getOpcode() == ISD::SHL &&
+           N->getOperand(0).getOpcode() == ISD::SRL) ||
+          (N->getOpcode() == ISD::SRL &&
+           N->getOperand(0).getOpcode() == ISD::SHL)) &&
+         "Expected shift-shift mask");
+  // Don't allow multiuse shift folding with the same shift amount.
+  if (!N->getOperand(0)->hasOneUse())
+    return false;
+
+  // Only fold srl(shl(x,c1),c2) iff C1 >= C2 to prevent loss of UBFX patterns.
+  EVT VT = N->getValueType(0);
+  if (N->getOpcode() == ISD::SRL && (VT == MVT::i32 || VT == MVT::i64)) {
+    auto *C1 = dyn_cast<ConstantSDNode>(N->getOperand(0).getOperand(1));
+    auto *C2 = dyn_cast<ConstantSDNode>(N->getOperand(1));
+    return (!C1 || !C2 || C1->getZExtValue() >= C2->getZExtValue());
   }
+
   return true;
 }
 
@@ -12230,7 +15031,7 @@ bool AArch64TargetLowering::isExtractSubvectorCheap(EVT ResVT, EVT SrcVT,
   if (!isOperationLegalOrCustom(ISD::EXTRACT_SUBVECTOR, ResVT))
     return false;
 
-  return (Index == 0 || Index == ResVT.getVectorNumElements());
+  return (Index == 0 || Index == ResVT.getVectorMinNumElements());
 }
 
 /// Turn vector tests of the signbit in the form of:
@@ -12398,6 +15199,61 @@ static SDValue performVecReduceAddCombine(SDNode *N, SelectionDAG &DAG,
   return DAG.getNode(ISD::VECREDUCE_ADD, DL, N->getValueType(0), Dot);
 }
 
+// Given an (integer) vecreduce, we know the order of the inputs does not
+// matter. We can convert UADDV(add(zext(extract_lo(x)), zext(extract_hi(x))))
+// into UADDV(UADDLP(x)). This can also happen through an extra add, where we
+// transform UADDV(add(y, add(zext(extract_lo(x)), zext(extract_hi(x))))).
+static SDValue performUADDVCombine(SDNode *N, SelectionDAG &DAG) {
+  auto DetectAddExtract = [&](SDValue A) {
+    // Look for add(zext(extract_lo(x)), zext(extract_hi(x))), returning
+    // UADDLP(x) if found.
+    if (A.getOpcode() != ISD::ADD)
+      return SDValue();
+    EVT VT = A.getValueType();
+    SDValue Op0 = A.getOperand(0);
+    SDValue Op1 = A.getOperand(1);
+    if (Op0.getOpcode() != Op0.getOpcode() ||
+        (Op0.getOpcode() != ISD::ZERO_EXTEND &&
+         Op0.getOpcode() != ISD::SIGN_EXTEND))
+      return SDValue();
+    SDValue Ext0 = Op0.getOperand(0);
+    SDValue Ext1 = Op1.getOperand(0);
+    if (Ext0.getOpcode() != ISD::EXTRACT_SUBVECTOR ||
+        Ext1.getOpcode() != ISD::EXTRACT_SUBVECTOR ||
+        Ext0.getOperand(0) != Ext1.getOperand(0))
+      return SDValue();
+    // Check that the type is twice the add types, and the extract are from
+    // upper/lower parts of the same source.
+    if (Ext0.getOperand(0).getValueType().getVectorNumElements() !=
+        VT.getVectorNumElements() * 2)
+      return SDValue();
+    if ((Ext0.getConstantOperandVal(1) != 0 &&
+         Ext1.getConstantOperandVal(1) != VT.getVectorNumElements()) &&
+        (Ext1.getConstantOperandVal(1) != 0 &&
+         Ext0.getConstantOperandVal(1) != VT.getVectorNumElements()))
+      return SDValue();
+    unsigned Opcode = Op0.getOpcode() == ISD::ZERO_EXTEND ? AArch64ISD::UADDLP
+                                                          : AArch64ISD::SADDLP;
+    return DAG.getNode(Opcode, SDLoc(A), VT, Ext0.getOperand(0));
+  };
+
+  SDValue A = N->getOperand(0);
+  if (SDValue R = DetectAddExtract(A))
+    return DAG.getNode(N->getOpcode(), SDLoc(N), N->getValueType(0), R);
+  if (A.getOpcode() == ISD::ADD) {
+    if (SDValue R = DetectAddExtract(A.getOperand(0)))
+      return DAG.getNode(N->getOpcode(), SDLoc(N), N->getValueType(0),
+                         DAG.getNode(ISD::ADD, SDLoc(A), A.getValueType(), R,
+                                     A.getOperand(1)));
+    if (SDValue R = DetectAddExtract(A.getOperand(1)))
+      return DAG.getNode(N->getOpcode(), SDLoc(N), N->getValueType(0),
+                         DAG.getNode(ISD::ADD, SDLoc(A), A.getValueType(), R,
+                                     A.getOperand(0)));
+  }
+  return SDValue();
+}
+
+
 static SDValue performXorCombine(SDNode *N, SelectionDAG &DAG,
                                  TargetLowering::DAGCombinerInfo &DCI,
                                  const AArch64Subtarget *Subtarget) {
@@ -12415,10 +15271,16 @@ AArch64TargetLowering::BuildSDIVPow2(SDNode *N, const APInt &Divisor,
   if (isIntDivCheap(N->getValueType(0), Attr))
     return SDValue(N,0); // Lower SDIV as SDIV
 
-  // fold (sdiv X, pow2)
   EVT VT = N->getValueType(0);
+
+  // For scalable and fixed types, mark them as cheap so we can handle it much
+  // later. This allows us to handle larger than legal types.
+  if (VT.isScalableVector() || Subtarget->useSVEForFixedLengthVectors())
+    return SDValue(N, 0);
+
+  // fold (sdiv X, pow2)
   if ((VT != MVT::i32 && VT != MVT::i64) ||
-      !(Divisor.isPowerOf2() || (-Divisor).isPowerOf2()))
+      !(Divisor.isPowerOf2() || Divisor.isNegatedPowerOf2()))
     return SDValue();
 
   SDLoc DL(N);
@@ -12450,17 +15312,74 @@ AArch64TargetLowering::BuildSDIVPow2(SDNode *N, const APInt &Divisor,
   return DAG.getNode(ISD::SUB, DL, VT, DAG.getConstant(0, DL, VT), SRA);
 }
 
-static bool IsSVECntIntrinsic(SDValue S) {
+SDValue
+AArch64TargetLowering::BuildSREMPow2(SDNode *N, const APInt &Divisor,
+                                     SelectionDAG &DAG,
+                                     SmallVectorImpl<SDNode *> &Created) const {
+  AttributeList Attr = DAG.getMachineFunction().getFunction().getAttributes();
+  if (isIntDivCheap(N->getValueType(0), Attr))
+    return SDValue(N, 0); // Lower SREM as SREM
+
+  EVT VT = N->getValueType(0);
+
+  // For scalable and fixed types, mark them as cheap so we can handle it much
+  // later. This allows us to handle larger than legal types.
+  if (VT.isScalableVector() || Subtarget->useSVEForFixedLengthVectors())
+    return SDValue(N, 0);
+
+  // fold (srem X, pow2)
+  if ((VT != MVT::i32 && VT != MVT::i64) ||
+      !(Divisor.isPowerOf2() || Divisor.isNegatedPowerOf2()))
+    return SDValue();
+
+  unsigned Lg2 = Divisor.countTrailingZeros();
+  if (Lg2 == 0)
+    return SDValue();
+
+  SDLoc DL(N);
+  SDValue N0 = N->getOperand(0);
+  SDValue Pow2MinusOne = DAG.getConstant((1ULL << Lg2) - 1, DL, VT);
+  SDValue Zero = DAG.getConstant(0, DL, VT);
+  SDValue CCVal, CSNeg;
+  if (Lg2 == 1) {
+    SDValue Cmp = getAArch64Cmp(N0, Zero, ISD::SETGE, CCVal, DAG, DL);
+    SDValue And = DAG.getNode(ISD::AND, DL, VT, N0, Pow2MinusOne);
+    CSNeg = DAG.getNode(AArch64ISD::CSNEG, DL, VT, And, And, CCVal, Cmp);
+
+    Created.push_back(Cmp.getNode());
+    Created.push_back(And.getNode());
+  } else {
+    SDValue CCVal = DAG.getConstant(AArch64CC::MI, DL, MVT_CC);
+    SDVTList VTs = DAG.getVTList(VT, MVT::i32);
+
+    SDValue Negs = DAG.getNode(AArch64ISD::SUBS, DL, VTs, Zero, N0);
+    SDValue AndPos = DAG.getNode(ISD::AND, DL, VT, N0, Pow2MinusOne);
+    SDValue AndNeg = DAG.getNode(ISD::AND, DL, VT, Negs, Pow2MinusOne);
+    CSNeg = DAG.getNode(AArch64ISD::CSNEG, DL, VT, AndPos, AndNeg, CCVal,
+                        Negs.getValue(1));
+
+    Created.push_back(Negs.getNode());
+    Created.push_back(AndPos.getNode());
+    Created.push_back(AndNeg.getNode());
+  }
+
+  return CSNeg;
+}
+
+static std::optional<unsigned> IsSVECntIntrinsic(SDValue S) {
   switch(getIntrinsicID(S.getNode())) {
   default:
     break;
   case Intrinsic::aarch64_sve_cntb:
+    return 8;
   case Intrinsic::aarch64_sve_cnth:
+    return 16;
   case Intrinsic::aarch64_sve_cntw:
+    return 32;
   case Intrinsic::aarch64_sve_cntd:
-    return true;
+    return 64;
   }
-  return false;
+  return {};
 }
 
 /// Calculates what the pre-extend type is, based on the extension
@@ -12471,11 +15390,10 @@ static bool IsSVECntIntrinsic(SDValue S) {
 /// operations need a bit more inspection to get this information.
 ///
 /// \param Extend The SDNode from the DAG that represents the extend operation
-/// \param DAG The SelectionDAG hosting the \p Extend node
 ///
 /// \returns The type representing the \p Extend source type, or \p MVT::Other
 /// if no valid type can be determined
-static EVT calculatePreExtendType(SDValue Extend, SelectionDAG &DAG) {
+static EVT calculatePreExtendType(SDValue Extend) {
   switch (Extend.getOpcode()) {
   case ISD::SIGN_EXTEND:
   case ISD::ZERO_EXTEND:
@@ -12508,121 +15426,178 @@ static EVT calculatePreExtendType(SDValue Extend, SelectionDAG &DAG) {
   default:
     return MVT::Other;
   }
-
-  llvm_unreachable("Code path unhandled in calculatePreExtendType!");
 }
 
-/// Combines a dup(sext/zext) node pattern into sext/zext(dup)
-/// making use of the vector SExt/ZExt rather than the scalar SExt/ZExt
-static SDValue performCommonVectorExtendCombine(SDValue VectorShuffle,
-                                                SelectionDAG &DAG) {
-
-  ShuffleVectorSDNode *ShuffleNode =
-      dyn_cast<ShuffleVectorSDNode>(VectorShuffle.getNode());
-  if (!ShuffleNode)
-    return SDValue();
-
-  // Ensuring the mask is zero before continuing
-  if (!ShuffleNode->isSplat() || ShuffleNode->getSplatIndex() != 0)
-    return SDValue();
-
-  SDValue InsertVectorElt = VectorShuffle.getOperand(0);
-
-  if (InsertVectorElt.getOpcode() != ISD::INSERT_VECTOR_ELT)
-    return SDValue();
-
-  SDValue InsertLane = InsertVectorElt.getOperand(2);
-  ConstantSDNode *Constant = dyn_cast<ConstantSDNode>(InsertLane.getNode());
-  // Ensures the insert is inserting into lane 0
-  if (!Constant || Constant->getZExtValue() != 0)
+/// Combines a buildvector(sext/zext) or shuffle(sext/zext, undef) node pattern
+/// into sext/zext(buildvector) or sext/zext(shuffle) making use of the vector
+/// SExt/ZExt rather than the scalar SExt/ZExt
+static SDValue performBuildShuffleExtendCombine(SDValue BV, SelectionDAG &DAG) {
+  EVT VT = BV.getValueType();
+  if (BV.getOpcode() != ISD::BUILD_VECTOR &&
+      BV.getOpcode() != ISD::VECTOR_SHUFFLE)
     return SDValue();
 
-  SDValue Extend = InsertVectorElt.getOperand(1);
+  // Use the first item in the buildvector/shuffle to get the size of the
+  // extend, and make sure it looks valid.
+  SDValue Extend = BV->getOperand(0);
   unsigned ExtendOpcode = Extend.getOpcode();
-
   bool IsSExt = ExtendOpcode == ISD::SIGN_EXTEND ||
                 ExtendOpcode == ISD::SIGN_EXTEND_INREG ||
                 ExtendOpcode == ISD::AssertSext;
   if (!IsSExt && ExtendOpcode != ISD::ZERO_EXTEND &&
       ExtendOpcode != ISD::AssertZext && ExtendOpcode != ISD::AND)
     return SDValue();
-
-  EVT TargetType = VectorShuffle.getValueType();
-  EVT PreExtendType = calculatePreExtendType(Extend, DAG);
-
-  if ((TargetType != MVT::v8i16 && TargetType != MVT::v4i32 &&
-       TargetType != MVT::v2i64) ||
-      (PreExtendType == MVT::Other))
+  // Shuffle inputs are vector, limit to SIGN_EXTEND and ZERO_EXTEND to ensure
+  // calculatePreExtendType will work without issue.
+  if (BV.getOpcode() == ISD::VECTOR_SHUFFLE &&
+      ExtendOpcode != ISD::SIGN_EXTEND && ExtendOpcode != ISD::ZERO_EXTEND)
     return SDValue();
 
   // Restrict valid pre-extend data type
-  if (PreExtendType != MVT::i8 && PreExtendType != MVT::i16 &&
-      PreExtendType != MVT::i32)
-    return SDValue();
-
-  EVT PreExtendVT = TargetType.changeVectorElementType(PreExtendType);
-
-  if (PreExtendVT.getVectorElementCount() != TargetType.getVectorElementCount())
-    return SDValue();
-
-  if (TargetType.getScalarSizeInBits() != PreExtendVT.getScalarSizeInBits() * 2)
+  EVT PreExtendType = calculatePreExtendType(Extend);
+  if (PreExtendType == MVT::Other ||
+      PreExtendType.getScalarSizeInBits() != VT.getScalarSizeInBits() / 2)
     return SDValue();
 
-  SDLoc DL(VectorShuffle);
-
-  SDValue InsertVectorNode = DAG.getNode(
-      InsertVectorElt.getOpcode(), DL, PreExtendVT, DAG.getUNDEF(PreExtendVT),
-      DAG.getAnyExtOrTrunc(Extend.getOperand(0), DL, PreExtendType),
-      DAG.getConstant(0, DL, MVT::i64));
-
-  std::vector<int> ShuffleMask(TargetType.getVectorElementCount().getValue());
-
-  SDValue VectorShuffleNode =
-      DAG.getVectorShuffle(PreExtendVT, DL, InsertVectorNode,
-                           DAG.getUNDEF(PreExtendVT), ShuffleMask);
-
-  SDValue ExtendNode = DAG.getNode(IsSExt ? ISD::SIGN_EXTEND : ISD::ZERO_EXTEND,
-                                   DL, TargetType, VectorShuffleNode);
+  // Make sure all other operands are equally extended
+  for (SDValue Op : drop_begin(BV->ops())) {
+    if (Op.isUndef())
+      continue;
+    unsigned Opc = Op.getOpcode();
+    bool OpcIsSExt = Opc == ISD::SIGN_EXTEND || Opc == ISD::SIGN_EXTEND_INREG ||
+                     Opc == ISD::AssertSext;
+    if (OpcIsSExt != IsSExt || calculatePreExtendType(Op) != PreExtendType)
+      return SDValue();
+  }
 
-  return ExtendNode;
+  SDValue NBV;
+  SDLoc DL(BV);
+  if (BV.getOpcode() == ISD::BUILD_VECTOR) {
+    EVT PreExtendVT = VT.changeVectorElementType(PreExtendType);
+    EVT PreExtendLegalType =
+        PreExtendType.getScalarSizeInBits() < 32 ? MVT::i32 : PreExtendType;
+    SmallVector<SDValue, 8> NewOps;
+    for (SDValue Op : BV->ops())
+      NewOps.push_back(Op.isUndef() ? DAG.getUNDEF(PreExtendLegalType)
+                                    : DAG.getAnyExtOrTrunc(Op.getOperand(0), DL,
+                                                           PreExtendLegalType));
+    NBV = DAG.getNode(ISD::BUILD_VECTOR, DL, PreExtendVT, NewOps);
+  } else { // BV.getOpcode() == ISD::VECTOR_SHUFFLE
+    EVT PreExtendVT = VT.changeVectorElementType(PreExtendType.getScalarType());
+    NBV = DAG.getVectorShuffle(PreExtendVT, DL, BV.getOperand(0).getOperand(0),
+                               BV.getOperand(1).isUndef()
+                                   ? DAG.getUNDEF(PreExtendVT)
+                                   : BV.getOperand(1).getOperand(0),
+                               cast<ShuffleVectorSDNode>(BV)->getMask());
+  }
+  return DAG.getNode(IsSExt ? ISD::SIGN_EXTEND : ISD::ZERO_EXTEND, DL, VT, NBV);
 }
 
 /// Combines a mul(dup(sext/zext)) node pattern into mul(sext/zext(dup))
 /// making use of the vector SExt/ZExt rather than the scalar SExt/ZExt
 static SDValue performMulVectorExtendCombine(SDNode *Mul, SelectionDAG &DAG) {
   // If the value type isn't a vector, none of the operands are going to be dups
-  if (!Mul->getValueType(0).isVector())
+  EVT VT = Mul->getValueType(0);
+  if (VT != MVT::v8i16 && VT != MVT::v4i32 && VT != MVT::v2i64)
     return SDValue();
 
-  SDValue Op0 = performCommonVectorExtendCombine(Mul->getOperand(0), DAG);
-  SDValue Op1 = performCommonVectorExtendCombine(Mul->getOperand(1), DAG);
+  SDValue Op0 = performBuildShuffleExtendCombine(Mul->getOperand(0), DAG);
+  SDValue Op1 = performBuildShuffleExtendCombine(Mul->getOperand(1), DAG);
 
   // Neither operands have been changed, don't make any further changes
   if (!Op0 && !Op1)
     return SDValue();
 
   SDLoc DL(Mul);
-  return DAG.getNode(Mul->getOpcode(), DL, Mul->getValueType(0),
-                     Op0 ? Op0 : Mul->getOperand(0),
+  return DAG.getNode(Mul->getOpcode(), DL, VT, Op0 ? Op0 : Mul->getOperand(0),
                      Op1 ? Op1 : Mul->getOperand(1));
 }
 
+// Combine v4i32 Mul(And(Srl(X, 15), 0x10001), 0xffff) -> v8i16 CMLTz
+// Same for other types with equivalent constants.
+static SDValue performMulVectorCmpZeroCombine(SDNode *N, SelectionDAG &DAG) {
+  EVT VT = N->getValueType(0);
+  if (VT != MVT::v2i64 && VT != MVT::v1i64 && VT != MVT::v2i32 &&
+      VT != MVT::v4i32 && VT != MVT::v4i16 && VT != MVT::v8i16)
+    return SDValue();
+  if (N->getOperand(0).getOpcode() != ISD::AND ||
+      N->getOperand(0).getOperand(0).getOpcode() != ISD::SRL)
+    return SDValue();
+
+  SDValue And = N->getOperand(0);
+  SDValue Srl = And.getOperand(0);
+
+  APInt V1, V2, V3;
+  if (!ISD::isConstantSplatVector(N->getOperand(1).getNode(), V1) ||
+      !ISD::isConstantSplatVector(And.getOperand(1).getNode(), V2) ||
+      !ISD::isConstantSplatVector(Srl.getOperand(1).getNode(), V3))
+    return SDValue();
+
+  unsigned HalfSize = VT.getScalarSizeInBits() / 2;
+  if (!V1.isMask(HalfSize) || V2 != (1ULL | 1ULL << HalfSize) ||
+      V3 != (HalfSize - 1))
+    return SDValue();
+
+  EVT HalfVT = EVT::getVectorVT(*DAG.getContext(),
+                                EVT::getIntegerVT(*DAG.getContext(), HalfSize),
+                                VT.getVectorElementCount() * 2);
+
+  SDLoc DL(N);
+  SDValue In = DAG.getNode(AArch64ISD::NVCAST, DL, HalfVT, Srl.getOperand(0));
+  SDValue CM = DAG.getNode(AArch64ISD::CMLTz, DL, HalfVT, In);
+  return DAG.getNode(AArch64ISD::NVCAST, DL, VT, CM);
+}
+
 static SDValue performMulCombine(SDNode *N, SelectionDAG &DAG,
                                  TargetLowering::DAGCombinerInfo &DCI,
                                  const AArch64Subtarget *Subtarget) {
 
   if (SDValue Ext = performMulVectorExtendCombine(N, DAG))
     return Ext;
+  if (SDValue Ext = performMulVectorCmpZeroCombine(N, DAG))
+    return Ext;
 
   if (DCI.isBeforeLegalizeOps())
     return SDValue();
 
+  // Canonicalize X*(Y+1) -> X*Y+X and (X+1)*Y -> X*Y+Y,
+  // and in MachineCombiner pass, add+mul will be combined into madd.
+  // Similarly, X*(1-Y) -> X - X*Y and (1-Y)*X -> X - Y*X.
+  SDLoc DL(N);
+  EVT VT = N->getValueType(0);
+  SDValue N0 = N->getOperand(0);
+  SDValue N1 = N->getOperand(1);
+  SDValue MulOper;
+  unsigned AddSubOpc;
+
+  auto IsAddSubWith1 = [&](SDValue V) -> bool {
+    AddSubOpc = V->getOpcode();
+    if ((AddSubOpc == ISD::ADD || AddSubOpc == ISD::SUB) && V->hasOneUse()) {
+      SDValue Opnd = V->getOperand(1);
+      MulOper = V->getOperand(0);
+      if (AddSubOpc == ISD::SUB)
+        std::swap(Opnd, MulOper);
+      if (auto C = dyn_cast<ConstantSDNode>(Opnd))
+        return C->isOne();
+    }
+    return false;
+  };
+
+  if (IsAddSubWith1(N0)) {
+    SDValue MulVal = DAG.getNode(ISD::MUL, DL, VT, N1, MulOper);
+    return DAG.getNode(AddSubOpc, DL, VT, N1, MulVal);
+  }
+
+  if (IsAddSubWith1(N1)) {
+    SDValue MulVal = DAG.getNode(ISD::MUL, DL, VT, N0, MulOper);
+    return DAG.getNode(AddSubOpc, DL, VT, N0, MulVal);
+  }
+
   // The below optimizations require a constant RHS.
-  if (!isa<ConstantSDNode>(N->getOperand(1)))
+  if (!isa<ConstantSDNode>(N1))
     return SDValue();
 
-  SDValue N0 = N->getOperand(0);
-  ConstantSDNode *C = cast<ConstantSDNode>(N->getOperand(1));
+  ConstantSDNode *C = cast<ConstantSDNode>(N1);
   const APInt &ConstValue = C->getAPIntValue();
 
   // Allow the scaling to be folded into the `cnt` instruction by preventing
@@ -12640,9 +15615,8 @@ static SDValue performMulCombine(SDNode *N, SelectionDAG &DAG,
   // 64-bit is 5 cycles, so this is always a win.
   // More aggressively, some multiplications N0 * C can be lowered to
   // shift+add+shift if the constant C = A * B where A = 2^N + 1 and B = 2^M,
-  // e.g. 6=3*2=(2+1)*2.
-  // TODO: consider lowering more cases, e.g. C = 14, -6, -14 or even 45
-  // which equals to (1+2)*16-(1+2).
+  // e.g. 6=3*2=(2+1)*2, 45=(1+4)*(1+8)
+  // TODO: lower more cases.
 
   // TrailingZeroes is used to test if the mul can be lowered to
   // shift+add+shift.
@@ -12662,62 +15636,92 @@ static SDValue performMulCombine(SDNode *N, SelectionDAG &DAG,
   // Use ShiftedConstValue instead of ConstValue to support both shift+add/sub
   // and shift+add+shift.
   APInt ShiftedConstValue = ConstValue.ashr(TrailingZeroes);
+  unsigned ShiftAmt;
+
+  auto Shl = [&](SDValue N0, unsigned N1) {
+    SDValue RHS = DAG.getConstant(N1, DL, MVT::i64);
+    return DAG.getNode(ISD::SHL, DL, VT, N0, RHS);
+  };
+  auto Add = [&](SDValue N0, SDValue N1) {
+    return DAG.getNode(ISD::ADD, DL, VT, N0, N1);
+  };
+  auto Sub = [&](SDValue N0, SDValue N1) {
+    return DAG.getNode(ISD::SUB, DL, VT, N0, N1);
+  };
+  auto Negate = [&](SDValue N) {
+    SDValue Zero = DAG.getConstant(0, DL, VT);
+    return DAG.getNode(ISD::SUB, DL, VT, Zero, N);
+  };
 
-  unsigned ShiftAmt, AddSubOpc;
-  // Is the shifted value the LHS operand of the add/sub?
-  bool ShiftValUseIsN0 = true;
-  // Do we need to negate the result?
-  bool NegateResult = false;
+  // Can the const C be decomposed into (1+2^M1)*(1+2^N1), eg:
+  // C = 45 is equal to (1+4)*(1+8), we don't decompose it into (1+2)*(16-1) as
+  // the (2^N - 1) can't be execused via a single instruction.
+  auto isPowPlusPlusConst = [](APInt C, APInt &M, APInt &N) {
+    unsigned BitWidth = C.getBitWidth();
+    for (unsigned i = 1; i < BitWidth / 2; i++) {
+      APInt Rem;
+      APInt X(BitWidth, (1 << i) + 1);
+      APInt::sdivrem(C, X, N, Rem);
+      APInt NVMinus1 = N - 1;
+      if (Rem == 0 && NVMinus1.isPowerOf2()) {
+        M = X;
+        return true;
+      }
+    }
+    return false;
+  };
 
   if (ConstValue.isNonNegative()) {
-    // (mul x, 2^N + 1) => (add (shl x, N), x)
-    // (mul x, 2^N - 1) => (sub (shl x, N), x)
     // (mul x, (2^N + 1) * 2^M) => (shl (add (shl x, N), x), M)
+    // (mul x, 2^N - 1) => (sub (shl x, N), x)
+    // (mul x, (2^(N-M) - 1) * 2^M) => (sub (shl x, N), (shl x, M))
+    // (mul x, (2^M + 1) * (2^N + 1))
+    //     => MV = (add (shl x, M), x); (add (shl MV, N), MV)
     APInt SCVMinus1 = ShiftedConstValue - 1;
+    APInt SCVPlus1 = ShiftedConstValue + 1;
     APInt CVPlus1 = ConstValue + 1;
+    APInt CVM, CVN;
     if (SCVMinus1.isPowerOf2()) {
       ShiftAmt = SCVMinus1.logBase2();
-      AddSubOpc = ISD::ADD;
+      return Shl(Add(Shl(N0, ShiftAmt), N0), TrailingZeroes);
     } else if (CVPlus1.isPowerOf2()) {
       ShiftAmt = CVPlus1.logBase2();
-      AddSubOpc = ISD::SUB;
-    } else
-      return SDValue();
+      return Sub(Shl(N0, ShiftAmt), N0);
+    } else if (SCVPlus1.isPowerOf2()) {
+      ShiftAmt = SCVPlus1.logBase2() + TrailingZeroes;
+      return Sub(Shl(N0, ShiftAmt), Shl(N0, TrailingZeroes));
+    } else if (Subtarget->hasLSLFast() &&
+               isPowPlusPlusConst(ConstValue, CVM, CVN)) {
+      APInt CVMMinus1 = CVM - 1;
+      APInt CVNMinus1 = CVN - 1;
+      unsigned ShiftM1 = CVMMinus1.logBase2();
+      unsigned ShiftN1 = CVNMinus1.logBase2();
+      // LSLFast implicate that Shifts <= 3 places are fast
+      if (ShiftM1 <= 3 && ShiftN1 <= 3) {
+        SDValue MVal = Add(Shl(N0, ShiftM1), N0);
+        return Add(Shl(MVal, ShiftN1), MVal);
+      }
+    }
   } else {
     // (mul x, -(2^N - 1)) => (sub x, (shl x, N))
     // (mul x, -(2^N + 1)) => - (add (shl x, N), x)
+    // (mul x, -(2^(N-M) - 1) * 2^M) => (sub (shl x, M), (shl x, N))
+    APInt SCVPlus1 = -ShiftedConstValue + 1;
     APInt CVNegPlus1 = -ConstValue + 1;
     APInt CVNegMinus1 = -ConstValue - 1;
     if (CVNegPlus1.isPowerOf2()) {
       ShiftAmt = CVNegPlus1.logBase2();
-      AddSubOpc = ISD::SUB;
-      ShiftValUseIsN0 = false;
+      return Sub(N0, Shl(N0, ShiftAmt));
     } else if (CVNegMinus1.isPowerOf2()) {
       ShiftAmt = CVNegMinus1.logBase2();
-      AddSubOpc = ISD::ADD;
-      NegateResult = true;
-    } else
-      return SDValue();
+      return Negate(Add(Shl(N0, ShiftAmt), N0));
+    } else if (SCVPlus1.isPowerOf2()) {
+      ShiftAmt = SCVPlus1.logBase2() + TrailingZeroes;
+      return Sub(Shl(N0, TrailingZeroes), Shl(N0, ShiftAmt));
+    }
   }
 
-  SDLoc DL(N);
-  EVT VT = N->getValueType(0);
-  SDValue ShiftedVal = DAG.getNode(ISD::SHL, DL, VT, N0,
-                                   DAG.getConstant(ShiftAmt, DL, MVT::i64));
-
-  SDValue AddSubN0 = ShiftValUseIsN0 ? ShiftedVal : N0;
-  SDValue AddSubN1 = ShiftValUseIsN0 ? N0 : ShiftedVal;
-  SDValue Res = DAG.getNode(AddSubOpc, DL, VT, AddSubN0, AddSubN1);
-  assert(!(NegateResult && TrailingZeroes) &&
-         "NegateResult and TrailingZeroes cannot both be true for now.");
-  // Negate the result.
-  if (NegateResult)
-    return DAG.getNode(ISD::SUB, DL, VT, DAG.getConstant(0, DL, VT), Res);
-  // Shift the result.
-  if (TrailingZeroes)
-    return DAG.getNode(ISD::SHL, DL, VT, Res,
-                       DAG.getConstant(TrailingZeroes, DL, MVT::i64));
-  return Res;
+  return SDValue();
 }
 
 static SDValue performVectorCompareAndMaskUnaryOpCombine(SDNode *N,
@@ -12790,7 +15794,7 @@ static SDValue performIntToFpCombine(SDNode *N, SelectionDAG &DAG,
       !cast<LoadSDNode>(N0)->isVolatile()) {
     LoadSDNode *LN0 = cast<LoadSDNode>(N0);
     SDValue Load = DAG.getLoad(VT, SDLoc(N), LN0->getChain(), LN0->getBasePtr(),
-                               LN0->getPointerInfo(), LN0->getAlignment(),
+                               LN0->getPointerInfo(), LN0->getAlign(),
                                LN0->getMemOperand()->getFlags());
 
     // Make sure successors of the original load stay after it by updating them
@@ -12810,15 +15814,17 @@ static SDValue performIntToFpCombine(SDNode *N, SelectionDAG &DAG,
 static SDValue performFpToIntCombine(SDNode *N, SelectionDAG &DAG,
                                      TargetLowering::DAGCombinerInfo &DCI,
                                      const AArch64Subtarget *Subtarget) {
-  if (!Subtarget->hasNEON())
+  if (!Subtarget->hasNEON() || Subtarget->forceStreamingCompatibleSVE())
     return SDValue();
 
   if (!N->getValueType(0).isSimple())
     return SDValue();
 
   SDValue Op = N->getOperand(0);
-  if (!Op.getValueType().isVector() || !Op.getValueType().isSimple() ||
-      Op.getOpcode() != ISD::FMUL)
+  if (!Op.getValueType().isSimple() || Op.getOpcode() != ISD::FMUL)
+    return SDValue();
+
+  if (!Op.getValueType().is64BitVector() && !Op.getValueType().is128BitVector())
     return SDValue();
 
   SDValue ConstVec = Op->getOperand(1);
@@ -12827,7 +15833,8 @@ static SDValue performFpToIntCombine(SDNode *N, SelectionDAG &DAG,
 
   MVT FloatTy = Op.getSimpleValueType().getVectorElementType();
   uint32_t FloatBits = FloatTy.getSizeInBits();
-  if (FloatBits != 32 && FloatBits != 64)
+  if (FloatBits != 32 && FloatBits != 64 &&
+      (FloatBits != 16 || !Subtarget->hasFullFP16()))
     return SDValue();
 
   MVT IntTy = N->getSimpleValueType(0).getVectorElementType();
@@ -12846,27 +15853,20 @@ static SDValue performFpToIntCombine(SDNode *N, SelectionDAG &DAG,
   if (C == -1 || C == 0 || C > Bits)
     return SDValue();
 
-  MVT ResTy;
-  unsigned NumLanes = Op.getValueType().getVectorNumElements();
-  switch (NumLanes) {
-  default:
-    return SDValue();
-  case 2:
-    ResTy = FloatBits == 32 ? MVT::v2i32 : MVT::v2i64;
-    break;
-  case 4:
-    ResTy = FloatBits == 32 ? MVT::v4i32 : MVT::v4i64;
-    break;
-  }
-
-  if (ResTy == MVT::v4i64 && DCI.isBeforeLegalizeOps())
+  EVT ResTy = Op.getValueType().changeVectorElementTypeToInteger();
+  if (!DAG.getTargetLoweringInfo().isTypeLegal(ResTy))
     return SDValue();
 
-  assert((ResTy != MVT::v4i64 || DCI.isBeforeLegalizeOps()) &&
-         "Illegal vector type after legalization");
+  if (N->getOpcode() == ISD::FP_TO_SINT_SAT ||
+      N->getOpcode() == ISD::FP_TO_UINT_SAT) {
+    EVT SatVT = cast<VTSDNode>(N->getOperand(1))->getVT();
+    if (SatVT.getScalarSizeInBits() != IntBits || IntBits != FloatBits)
+      return SDValue();
+  }
 
   SDLoc DL(N);
-  bool IsSigned = N->getOpcode() == ISD::FP_TO_SINT;
+  bool IsSigned = (N->getOpcode() == ISD::FP_TO_SINT ||
+                   N->getOpcode() == ISD::FP_TO_SINT_SAT);
   unsigned IntrinsicOpcode = IsSigned ? Intrinsic::aarch64_neon_vcvtfp2fxs
                                       : Intrinsic::aarch64_neon_vcvtfp2fxu;
   SDValue FixConv =
@@ -13013,8 +16013,8 @@ static SDValue tryCombineToEXTR(SDNode *N,
                      DAG.getConstant(ShiftRHS, DL, MVT::i64));
 }
 
-static SDValue tryCombineToBSL(SDNode *N,
-                                TargetLowering::DAGCombinerInfo &DCI) {
+static SDValue tryCombineToBSL(SDNode *N, TargetLowering::DAGCombinerInfo &DCI,
+                               const AArch64TargetLowering &TLI) {
   EVT VT = N->getValueType(0);
   SelectionDAG &DAG = DCI.DAG;
   SDLoc DL(N);
@@ -13024,7 +16024,11 @@ static SDValue tryCombineToBSL(SDNode *N,
 
   // The combining code currently only works for NEON vectors. In particular,
   // it does not work for SVE when dealing with vectors wider than 128 bits.
-  if (!VT.is64BitVector() && !VT.is128BitVector())
+  // It also doesn't work for streaming mode because it causes generating
+  // bsl instructions that are invalid in streaming mode.
+  if (TLI.useSVEForFixedLengthVectorVT(
+          VT,
+          DAG.getSubtarget<AArch64Subtarget>().forceStreamingCompatibleSVE()))
     return SDValue();
 
   SDValue N0 = N->getOperand(0);
@@ -13103,19 +16107,101 @@ static SDValue tryCombineToBSL(SDNode *N,
   return SDValue();
 }
 
+// Given a tree of and/or(csel(0, 1, cc0), csel(0, 1, cc1)), we may be able to
+// convert to csel(ccmp(.., cc0)), depending on cc1:
+
+// (AND (CSET cc0 cmp0) (CSET cc1 (CMP x1 y1)))
+// =>
+// (CSET cc1 (CCMP x1 y1 !cc1 cc0 cmp0))
+//
+// (OR (CSET cc0 cmp0) (CSET cc1 (CMP x1 y1)))
+// =>
+// (CSET cc1 (CCMP x1 y1 cc1 !cc0 cmp0))
+static SDValue performANDORCSELCombine(SDNode *N, SelectionDAG &DAG) {
+  EVT VT = N->getValueType(0);
+  SDValue CSel0 = N->getOperand(0);
+  SDValue CSel1 = N->getOperand(1);
+
+  if (CSel0.getOpcode() != AArch64ISD::CSEL ||
+      CSel1.getOpcode() != AArch64ISD::CSEL)
+    return SDValue();
+
+  if (!CSel0->hasOneUse() || !CSel1->hasOneUse())
+    return SDValue();
+
+  if (!isNullConstant(CSel0.getOperand(0)) ||
+      !isOneConstant(CSel0.getOperand(1)) ||
+      !isNullConstant(CSel1.getOperand(0)) ||
+      !isOneConstant(CSel1.getOperand(1)))
+    return SDValue();
+
+  SDValue Cmp0 = CSel0.getOperand(3);
+  SDValue Cmp1 = CSel1.getOperand(3);
+  AArch64CC::CondCode CC0 = (AArch64CC::CondCode)CSel0.getConstantOperandVal(2);
+  AArch64CC::CondCode CC1 = (AArch64CC::CondCode)CSel1.getConstantOperandVal(2);
+  if (!Cmp0->hasOneUse() || !Cmp1->hasOneUse())
+    return SDValue();
+  if (Cmp1.getOpcode() != AArch64ISD::SUBS &&
+      Cmp0.getOpcode() == AArch64ISD::SUBS) {
+    std::swap(Cmp0, Cmp1);
+    std::swap(CC0, CC1);
+  }
+
+  if (Cmp1.getOpcode() != AArch64ISD::SUBS)
+    return SDValue();
+
+  SDLoc DL(N);
+  SDValue CCmp, Condition;
+  unsigned NZCV;
+
+  if (N->getOpcode() == ISD::AND) {
+    AArch64CC::CondCode InvCC0 = AArch64CC::getInvertedCondCode(CC0);
+    Condition = DAG.getConstant(InvCC0, DL, MVT_CC);
+    NZCV = AArch64CC::getNZCVToSatisfyCondCode(CC1);
+  } else {
+    AArch64CC::CondCode InvCC1 = AArch64CC::getInvertedCondCode(CC1);
+    Condition = DAG.getConstant(CC0, DL, MVT_CC);
+    NZCV = AArch64CC::getNZCVToSatisfyCondCode(InvCC1);
+  }
+
+  SDValue NZCVOp = DAG.getConstant(NZCV, DL, MVT::i32);
+
+  auto *Op1 = dyn_cast<ConstantSDNode>(Cmp1.getOperand(1));
+  if (Op1 && Op1->getAPIntValue().isNegative() &&
+      Op1->getAPIntValue().sgt(-32)) {
+    // CCMP accept the constant int the range [0, 31]
+    // if the Op1 is a constant in the range [-31, -1], we
+    // can select to CCMN to avoid the extra mov
+    SDValue AbsOp1 =
+        DAG.getConstant(Op1->getAPIntValue().abs(), DL, Op1->getValueType(0));
+    CCmp = DAG.getNode(AArch64ISD::CCMN, DL, MVT_CC, Cmp1.getOperand(0), AbsOp1,
+                       NZCVOp, Condition, Cmp0);
+  } else {
+    CCmp = DAG.getNode(AArch64ISD::CCMP, DL, MVT_CC, Cmp1.getOperand(0),
+                       Cmp1.getOperand(1), NZCVOp, Condition, Cmp0);
+  }
+  return DAG.getNode(AArch64ISD::CSEL, DL, VT, CSel0.getOperand(0),
+                     CSel0.getOperand(1), DAG.getConstant(CC1, DL, MVT::i32),
+                     CCmp);
+}
+
 static SDValue performORCombine(SDNode *N, TargetLowering::DAGCombinerInfo &DCI,
-                                const AArch64Subtarget *Subtarget) {
-  // Attempt to form an EXTR from (or (shl VAL1, #N), (srl VAL2, #RegWidth-N))
+                                const AArch64Subtarget *Subtarget,
+                                const AArch64TargetLowering &TLI) {
   SelectionDAG &DAG = DCI.DAG;
   EVT VT = N->getValueType(0);
 
+  if (SDValue R = performANDORCSELCombine(N, DAG))
+    return R;
+
   if (!DAG.getTargetLoweringInfo().isTypeLegal(VT))
     return SDValue();
 
+  // Attempt to form an EXTR from (or (shl VAL1, #N), (srl VAL2, #RegWidth-N))
   if (SDValue Res = tryCombineToEXTR(N, DCI))
     return Res;
 
-  if (SDValue Res = tryCombineToBSL(N, DCI))
+  if (SDValue Res = tryCombineToBSL(N, DCI, TLI))
     return Res;
 
   return SDValue();
@@ -13148,6 +16234,64 @@ static bool isConstantSplatVectorMaskForType(SDNode *N, EVT MemVT) {
   return false;
 }
 
+static bool isAllInactivePredicate(SDValue N) {
+  // Look through cast.
+  while (N.getOpcode() == AArch64ISD::REINTERPRET_CAST)
+    N = N.getOperand(0);
+
+  return ISD::isConstantSplatVectorAllZeros(N.getNode());
+}
+
+static bool isAllActivePredicate(SelectionDAG &DAG, SDValue N) {
+  unsigned NumElts = N.getValueType().getVectorMinNumElements();
+
+  // Look through cast.
+  while (N.getOpcode() == AArch64ISD::REINTERPRET_CAST) {
+    N = N.getOperand(0);
+    // When reinterpreting from a type with fewer elements the "new" elements
+    // are not active, so bail if they're likely to be used.
+    if (N.getValueType().getVectorMinNumElements() < NumElts)
+      return false;
+  }
+
+  if (ISD::isConstantSplatVectorAllOnes(N.getNode()))
+    return true;
+
+  // "ptrue p.<ty>, all" can be considered all active when <ty> is the same size
+  // or smaller than the implicit element type represented by N.
+  // NOTE: A larger element count implies a smaller element type.
+  if (N.getOpcode() == AArch64ISD::PTRUE &&
+      N.getConstantOperandVal(0) == AArch64SVEPredPattern::all)
+    return N.getValueType().getVectorMinNumElements() >= NumElts;
+
+  // If we're compiling for a specific vector-length, we can check if the
+  // pattern's VL equals that of the scalable vector at runtime.
+  if (N.getOpcode() == AArch64ISD::PTRUE) {
+    const auto &Subtarget = DAG.getSubtarget<AArch64Subtarget>();
+    unsigned MinSVESize = Subtarget.getMinSVEVectorSizeInBits();
+    unsigned MaxSVESize = Subtarget.getMaxSVEVectorSizeInBits();
+    if (MaxSVESize && MinSVESize == MaxSVESize) {
+      unsigned VScale = MaxSVESize / AArch64::SVEBitsPerBlock;
+      unsigned PatNumElts =
+          getNumElementsFromSVEPredPattern(N.getConstantOperandVal(0));
+      return PatNumElts == (NumElts * VScale);
+    }
+  }
+
+  return false;
+}
+
+static SDValue performReinterpretCastCombine(SDNode *N) {
+  SDValue LeafOp = SDValue(N, 0);
+  SDValue Op = N->getOperand(0);
+  while (Op.getOpcode() == AArch64ISD::REINTERPRET_CAST &&
+         LeafOp.getValueType() != Op.getValueType())
+    Op = Op->getOperand(0);
+  if (LeafOp.getValueType() == Op.getValueType())
+    return Op;
+  return SDValue();
+}
+
 static SDValue performSVEAndCombine(SDNode *N,
                                     TargetLowering::DAGCombinerInfo &DCI) {
   if (DCI.isBeforeLegalizeOps())
@@ -13162,11 +16306,14 @@ static SDValue performSVEAndCombine(SDNode *N,
     SDValue UnpkOp = Src->getOperand(0);
     SDValue Dup = N->getOperand(1);
 
-    if (Dup.getOpcode() != AArch64ISD::DUP)
+    if (Dup.getOpcode() != ISD::SPLAT_VECTOR)
       return SDValue();
 
     SDLoc DL(N);
     ConstantSDNode *C = dyn_cast<ConstantSDNode>(Dup->getOperand(0));
+    if (!C)
+      return SDValue();
+
     uint64_t ExtVal = C->getZExtValue();
 
     // If the mask is fully covered by the unpack, we don't need to push
@@ -13182,8 +16329,7 @@ static SDValue performSVEAndCombine(SDNode *N,
 
     // Otherwise, make sure we propagate the AND to the operand
     // of the unpack
-    Dup = DAG.getNode(AArch64ISD::DUP, DL,
-                      UnpkOp->getValueType(0),
+    Dup = DAG.getNode(ISD::SPLAT_VECTOR, DL, UnpkOp->getValueType(0),
                       DAG.getConstant(Mask.zextOrTrunc(32), DL, MVT::i32));
 
     SDValue And = DAG.getNode(ISD::AND, DL,
@@ -13192,6 +16338,13 @@ static SDValue performSVEAndCombine(SDNode *N,
     return DAG.getNode(Opc, DL, N->getValueType(0), And);
   }
 
+  // If both sides of AND operations are i1 splat_vectors then
+  // we can produce just i1 splat_vector as the result.
+  if (isAllActivePredicate(DAG, N->getOperand(0)))
+    return N->getOperand(1);
+  if (isAllActivePredicate(DAG, N->getOperand(1)))
+    return N->getOperand(0);
+
   if (!EnableCombineMGatherIntrinsics)
     return SDValue();
 
@@ -13241,8 +16394,13 @@ static SDValue performANDCombine(SDNode *N,
                                  TargetLowering::DAGCombinerInfo &DCI) {
   SelectionDAG &DAG = DCI.DAG;
   SDValue LHS = N->getOperand(0);
+  SDValue RHS = N->getOperand(1);
   EVT VT = N->getValueType(0);
-  if (!VT.isVector() || !DAG.getTargetLoweringInfo().isTypeLegal(VT))
+
+  if (SDValue R = performANDORCSELCombine(N, DAG))
+    return R;
+
+  if (!DAG.getTargetLoweringInfo().isTypeLegal(VT))
     return SDValue();
 
   if (VT.isScalableVector())
@@ -13250,11 +16408,10 @@ static SDValue performANDCombine(SDNode *N,
 
   // The combining code below works only for NEON vectors. In particular, it
   // does not work for SVE when dealing with vectors wider than 128 bits.
-  if (!(VT.is64BitVector() || VT.is128BitVector()))
+  if (!VT.is64BitVector() && !VT.is128BitVector())
     return SDValue();
 
-  BuildVectorSDNode *BVN =
-      dyn_cast<BuildVectorSDNode>(N->getOperand(1).getNode());
+  BuildVectorSDNode *BVN = dyn_cast<BuildVectorSDNode>(RHS.getNode());
   if (!BVN)
     return SDValue();
 
@@ -13285,135 +16442,125 @@ static SDValue performANDCombine(SDNode *N,
   return SDValue();
 }
 
-static SDValue performSRLCombine(SDNode *N,
-                                 TargetLowering::DAGCombinerInfo &DCI) {
-  SelectionDAG &DAG = DCI.DAG;
-  EVT VT = N->getValueType(0);
-  if (VT != MVT::i32 && VT != MVT::i64)
-    return SDValue();
-
-  // Canonicalize (srl (bswap i32 x), 16) to (rotr (bswap i32 x), 16), if the
-  // high 16-bits of x are zero. Similarly, canonicalize (srl (bswap i64 x), 32)
-  // to (rotr (bswap i64 x), 32), if the high 32-bits of x are zero.
-  SDValue N0 = N->getOperand(0);
-  if (N0.getOpcode() == ISD::BSWAP) {
-    SDLoc DL(N);
-    SDValue N1 = N->getOperand(1);
-    SDValue N00 = N0.getOperand(0);
-    if (ConstantSDNode *C = dyn_cast<ConstantSDNode>(N1)) {
-      uint64_t ShiftAmt = C->getZExtValue();
-      if (VT == MVT::i32 && ShiftAmt == 16 &&
-          DAG.MaskedValueIsZero(N00, APInt::getHighBitsSet(32, 16)))
-        return DAG.getNode(ISD::ROTR, DL, VT, N0, N1);
-      if (VT == MVT::i64 && ShiftAmt == 32 &&
-          DAG.MaskedValueIsZero(N00, APInt::getHighBitsSet(64, 32)))
-        return DAG.getNode(ISD::ROTR, DL, VT, N0, N1);
-    }
+static bool hasPairwiseAdd(unsigned Opcode, EVT VT, bool FullFP16) {
+  switch (Opcode) {
+  case ISD::STRICT_FADD:
+  case ISD::FADD:
+    return (FullFP16 && VT == MVT::f16) || VT == MVT::f32 || VT == MVT::f64;
+  case ISD::ADD:
+    return VT == MVT::i64;
+  default:
+    return false;
   }
-  return SDValue();
 }
 
-// Attempt to form urhadd(OpA, OpB) from
-// truncate(vlshr(sub(zext(OpB), xor(zext(OpA), Ones(ElemSizeInBits))), 1))
-// or uhadd(OpA, OpB) from truncate(vlshr(add(zext(OpA), zext(OpB)), 1)).
-// The original form of the first expression is
-// truncate(srl(add(zext(OpB), add(zext(OpA), 1)), 1)) and the
-// (OpA + OpB + 1) subexpression will have been changed to (OpB - (~OpA)).
-// Before this function is called the srl will have been lowered to
-// AArch64ISD::VLSHR.
-// This pass can also recognize signed variants of the patterns that use sign
-// extension instead of zero extension and form a srhadd(OpA, OpB) or a
-// shadd(OpA, OpB) from them.
-static SDValue
-performVectorTruncateCombine(SDNode *N, TargetLowering::DAGCombinerInfo &DCI,
-                             SelectionDAG &DAG) {
-  EVT VT = N->getValueType(0);
+static SDValue getPTest(SelectionDAG &DAG, EVT VT, SDValue Pg, SDValue Op,
+                        AArch64CC::CondCode Cond);
+
+static bool isPredicateCCSettingOp(SDValue N) {
+  if ((N.getOpcode() == ISD::SETCC) ||
+      (N.getOpcode() == ISD::INTRINSIC_WO_CHAIN &&
+       (N.getConstantOperandVal(0) == Intrinsic::aarch64_sve_whilege ||
+        N.getConstantOperandVal(0) == Intrinsic::aarch64_sve_whilegt ||
+        N.getConstantOperandVal(0) == Intrinsic::aarch64_sve_whilehi ||
+        N.getConstantOperandVal(0) == Intrinsic::aarch64_sve_whilehs ||
+        N.getConstantOperandVal(0) == Intrinsic::aarch64_sve_whilele ||
+        N.getConstantOperandVal(0) == Intrinsic::aarch64_sve_whilelo ||
+        N.getConstantOperandVal(0) == Intrinsic::aarch64_sve_whilels ||
+        N.getConstantOperandVal(0) == Intrinsic::aarch64_sve_whilelt ||
+        // get_active_lane_mask is lowered to a whilelo instruction.
+        N.getConstantOperandVal(0) == Intrinsic::get_active_lane_mask)))
+    return true;
 
-  // Since we are looking for a right shift by a constant value of 1 and we are
-  // operating on types at least 16 bits in length (sign/zero extended OpA and
-  // OpB, which are at least 8 bits), it follows that the truncate will always
-  // discard the shifted-in bit and therefore the right shift will be logical
-  // regardless of the signedness of OpA and OpB.
-  SDValue Shift = N->getOperand(0);
-  if (Shift.getOpcode() != AArch64ISD::VLSHR)
+  return false;
+}
+
+// Materialize : i1 = extract_vector_elt t37, Constant:i64<0>
+// ... into: "ptrue p, all" + PTEST
+static SDValue
+performFirstTrueTestVectorCombine(SDNode *N,
+                                  TargetLowering::DAGCombinerInfo &DCI,
+                                  const AArch64Subtarget *Subtarget) {
+  assert(N->getOpcode() == ISD::EXTRACT_VECTOR_ELT);
+  // Make sure PTEST can be legalised with illegal types.
+  if (!Subtarget->hasSVE() || DCI.isBeforeLegalize())
     return SDValue();
 
-  // Is the right shift using an immediate value of 1?
-  uint64_t ShiftAmount = Shift.getConstantOperandVal(1);
-  if (ShiftAmount != 1)
+  SDValue N0 = N->getOperand(0);
+  EVT VT = N0.getValueType();
+
+  if (!VT.isScalableVector() || VT.getVectorElementType() != MVT::i1 ||
+      !isNullConstant(N->getOperand(1)))
     return SDValue();
 
-  SDValue ExtendOpA, ExtendOpB;
-  SDValue ShiftOp0 = Shift.getOperand(0);
-  unsigned ShiftOp0Opc = ShiftOp0.getOpcode();
-  if (ShiftOp0Opc == ISD::SUB) {
+  // Restricted the DAG combine to only cases where we're extracting from a
+  // flag-setting operation.
+  if (!isPredicateCCSettingOp(N0))
+    return SDValue();
 
-    SDValue Xor = ShiftOp0.getOperand(1);
-    if (Xor.getOpcode() != ISD::XOR)
-      return SDValue();
+  // Extracts of lane 0 for SVE can be expressed as PTEST(Op, FIRST) ? 1 : 0
+  SelectionDAG &DAG = DCI.DAG;
+  SDValue Pg = getPTrue(DAG, SDLoc(N), VT, AArch64SVEPredPattern::all);
+  return getPTest(DAG, N->getValueType(0), Pg, N0, AArch64CC::FIRST_ACTIVE);
+}
 
-    // Is the XOR using a constant amount of all ones in the right hand side?
-    uint64_t C;
-    if (!isAllConstantBuildVector(Xor.getOperand(1), C))
-      return SDValue();
+// Materialize : Idx = (add (mul vscale, NumEls), -1)
+//               i1 = extract_vector_elt t37, Constant:i64<Idx>
+//     ... into: "ptrue p, all" + PTEST
+static SDValue
+performLastTrueTestVectorCombine(SDNode *N,
+                                 TargetLowering::DAGCombinerInfo &DCI,
+                                 const AArch64Subtarget *Subtarget) {
+  assert(N->getOpcode() == ISD::EXTRACT_VECTOR_ELT);
+  // Make sure PTEST is legal types.
+  if (!Subtarget->hasSVE() || DCI.isBeforeLegalize())
+    return SDValue();
 
-    unsigned ElemSizeInBits = VT.getScalarSizeInBits();
-    APInt CAsAPInt(ElemSizeInBits, C);
-    if (CAsAPInt != APInt::getAllOnesValue(ElemSizeInBits))
-      return SDValue();
+  SDValue N0 = N->getOperand(0);
+  EVT OpVT = N0.getValueType();
 
-    ExtendOpA = Xor.getOperand(0);
-    ExtendOpB = ShiftOp0.getOperand(0);
-  } else if (ShiftOp0Opc == ISD::ADD) {
-    ExtendOpA = ShiftOp0.getOperand(0);
-    ExtendOpB = ShiftOp0.getOperand(1);
-  } else
+  if (!OpVT.isScalableVector() || OpVT.getVectorElementType() != MVT::i1)
     return SDValue();
 
-  unsigned ExtendOpAOpc = ExtendOpA.getOpcode();
-  unsigned ExtendOpBOpc = ExtendOpB.getOpcode();
-  if (!(ExtendOpAOpc == ExtendOpBOpc &&
-        (ExtendOpAOpc == ISD::ZERO_EXTEND || ExtendOpAOpc == ISD::SIGN_EXTEND)))
+  // Idx == (add (mul vscale, NumEls), -1)
+  SDValue Idx = N->getOperand(1);
+  if (Idx.getOpcode() != ISD::ADD || !isAllOnesConstant(Idx.getOperand(1)))
     return SDValue();
 
-  // Is the result of the right shift being truncated to the same value type as
-  // the original operands, OpA and OpB?
-  SDValue OpA = ExtendOpA.getOperand(0);
-  SDValue OpB = ExtendOpB.getOperand(0);
-  EVT OpAVT = OpA.getValueType();
-  assert(ExtendOpA.getValueType() == ExtendOpB.getValueType());
-  if (!(VT == OpAVT && OpAVT == OpB.getValueType()))
+  SDValue VS = Idx.getOperand(0);
+  if (VS.getOpcode() != ISD::VSCALE)
     return SDValue();
 
-  SDLoc DL(N);
-  bool IsSignExtend = ExtendOpAOpc == ISD::SIGN_EXTEND;
-  bool IsRHADD = ShiftOp0Opc == ISD::SUB;
-  unsigned HADDOpc = IsSignExtend
-                         ? (IsRHADD ? AArch64ISD::SRHADD : AArch64ISD::SHADD)
-                         : (IsRHADD ? AArch64ISD::URHADD : AArch64ISD::UHADD);
-  SDValue ResultHADD = DAG.getNode(HADDOpc, DL, VT, OpA, OpB);
+  unsigned NumEls = OpVT.getVectorElementCount().getKnownMinValue();
+  if (VS.getConstantOperandVal(0) != NumEls)
+    return SDValue();
 
-  return ResultHADD;
+  // Extracts of lane EC-1 for SVE can be expressed as PTEST(Op, LAST) ? 1 : 0
+  SelectionDAG &DAG = DCI.DAG;
+  SDValue Pg = getPTrue(DAG, SDLoc(N), OpVT, AArch64SVEPredPattern::all);
+  return getPTest(DAG, N->getValueType(0), Pg, N0, AArch64CC::LAST_ACTIVE);
 }
 
-static bool hasPairwiseAdd(unsigned Opcode, EVT VT, bool FullFP16) {
-  switch (Opcode) {
-  case ISD::FADD:
-    return (FullFP16 && VT == MVT::f16) || VT == MVT::f32 || VT == MVT::f64;
-  case ISD::ADD:
-    return VT == MVT::i64;
-  default:
-    return false;
-  }
-}
+static SDValue
+performExtractVectorEltCombine(SDNode *N, TargetLowering::DAGCombinerInfo &DCI,
+                               const AArch64Subtarget *Subtarget) {
+  assert(N->getOpcode() == ISD::EXTRACT_VECTOR_ELT);
+  if (SDValue Res = performFirstTrueTestVectorCombine(N, DCI, Subtarget))
+    return Res;
+  if (SDValue Res = performLastTrueTestVectorCombine(N, DCI, Subtarget))
+    return Res;
 
-static SDValue performExtractVectorEltCombine(SDNode *N, SelectionDAG &DAG) {
+  SelectionDAG &DAG = DCI.DAG;
   SDValue N0 = N->getOperand(0), N1 = N->getOperand(1);
   ConstantSDNode *ConstantN1 = dyn_cast<ConstantSDNode>(N1);
 
   EVT VT = N->getValueType(0);
-  const bool FullFP16 =
-      static_cast<const AArch64Subtarget &>(DAG.getSubtarget()).hasFullFP16();
+  const bool FullFP16 = DAG.getSubtarget<AArch64Subtarget>().hasFullFP16();
+  bool IsStrict = N0->isStrictFPOpcode();
+
+  // extract(dup x) -> x
+  if (N0.getOpcode() == AArch64ISD::DUP)
+    return DAG.getZExtOrTrunc(N0.getOperand(0), SDLoc(N), VT);
 
   // Rewrite for pairwise fadd pattern
   //   (f32 (extract_vector_elt
@@ -13422,11 +16569,14 @@ static SDValue performExtractVectorEltCombine(SDNode *N, SelectionDAG &DAG) {
   // ->
   //   (f32 (fadd (extract_vector_elt (vXf32 Other) 0)
   //              (extract_vector_elt (vXf32 Other) 1))
+  // For strict_fadd we need to make sure the old strict_fadd can be deleted, so
+  // we can only do this when it's used only by the extract_vector_elt.
   if (ConstantN1 && ConstantN1->getZExtValue() == 0 &&
-      hasPairwiseAdd(N0->getOpcode(), VT, FullFP16)) {
+      hasPairwiseAdd(N0->getOpcode(), VT, FullFP16) &&
+      (!IsStrict || N0.hasOneUse())) {
     SDLoc DL(N0);
-    SDValue N00 = N0->getOperand(0);
-    SDValue N01 = N0->getOperand(1);
+    SDValue N00 = N0->getOperand(IsStrict ? 1 : 0);
+    SDValue N01 = N0->getOperand(IsStrict ? 2 : 1);
 
     ShuffleVectorSDNode *Shuffle = dyn_cast<ShuffleVectorSDNode>(N01);
     SDValue Other = N00;
@@ -13439,11 +16589,23 @@ static SDValue performExtractVectorEltCombine(SDNode *N, SelectionDAG &DAG) {
 
     if (Shuffle && Shuffle->getMaskElt(0) == 1 &&
         Other == Shuffle->getOperand(0)) {
-      return DAG.getNode(N0->getOpcode(), DL, VT,
-                         DAG.getNode(ISD::EXTRACT_VECTOR_ELT, DL, VT, Other,
-                                     DAG.getConstant(0, DL, MVT::i64)),
-                         DAG.getNode(ISD::EXTRACT_VECTOR_ELT, DL, VT, Other,
-                                     DAG.getConstant(1, DL, MVT::i64)));
+      SDValue Extract1 = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, DL, VT, Other,
+                                     DAG.getConstant(0, DL, MVT::i64));
+      SDValue Extract2 = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, DL, VT, Other,
+                                     DAG.getConstant(1, DL, MVT::i64));
+      if (!IsStrict)
+        return DAG.getNode(N0->getOpcode(), DL, VT, Extract1, Extract2);
+
+      // For strict_fadd we need uses of the final extract_vector to be replaced
+      // with the strict_fadd, but we also need uses of the chain output of the
+      // original strict_fadd to use the chain output of the new strict_fadd as
+      // otherwise it may not be deleted.
+      SDValue Ret = DAG.getNode(N0->getOpcode(), DL,
+                                {VT, MVT::Other},
+                                {N0->getOperand(0), Extract1, Extract2});
+      DAG.ReplaceAllUsesOfValueWith(SDValue(N, 0), Ret);
+      DAG.ReplaceAllUsesOfValueWith(N0.getValue(1), Ret.getValue(1));
+      return SDValue(N, 0);
     }
   }
 
@@ -13458,6 +16620,9 @@ static SDValue performConcatVectorsCombine(SDNode *N,
   SDValue N0 = N->getOperand(0), N1 = N->getOperand(1);
   unsigned N0Opc = N0->getOpcode(), N1Opc = N1->getOpcode();
 
+  if (VT.isScalableVector())
+    return SDValue();
+
   // Optimize concat_vectors of truncated vectors, where the intermediate
   // type is illegal, to avoid said illegality,  e.g.,
   //   (v4i16 (concat_vectors (v2i16 (truncate (v2i64))),
@@ -13490,25 +16655,90 @@ static SDValue performConcatVectorsCombine(SDNode *N,
     }
   }
 
-  // Wait 'til after everything is legalized to try this. That way we have
+  if (N->getOperand(0).getValueType() == MVT::v4i8) {
+    // If we have a concat of v4i8 loads, convert them to a buildvector of f32
+    // loads to prevent having to go through the v4i8 load legalization that
+    // needs to extend each element into a larger type.
+    if (N->getNumOperands() % 2 == 0 && all_of(N->op_values(), [](SDValue V) {
+          if (V.getValueType() != MVT::v4i8)
+            return false;
+          if (V.isUndef())
+            return true;
+          LoadSDNode *LD = dyn_cast<LoadSDNode>(V);
+          return LD && V.hasOneUse() && LD->isSimple() && !LD->isIndexed() &&
+                 LD->getExtensionType() == ISD::NON_EXTLOAD;
+        })) {
+      EVT NVT =
+          EVT::getVectorVT(*DAG.getContext(), MVT::f32, N->getNumOperands());
+      SmallVector<SDValue> Ops;
+
+      for (unsigned i = 0; i < N->getNumOperands(); i++) {
+        SDValue V = N->getOperand(i);
+        if (V.isUndef())
+          Ops.push_back(DAG.getUNDEF(MVT::f32));
+        else {
+          LoadSDNode *LD = cast<LoadSDNode>(V);
+          SDValue NewLoad =
+              DAG.getLoad(MVT::f32, dl, LD->getChain(), LD->getBasePtr(),
+                          LD->getMemOperand());
+          DAG.ReplaceAllUsesOfValueWith(SDValue(LD, 1), NewLoad.getValue(1));
+          Ops.push_back(NewLoad);
+        }
+      }
+      return DAG.getBitcast(N->getValueType(0),
+                            DAG.getBuildVector(NVT, dl, Ops));
+    }
+  }
+
+  // Canonicalise concat_vectors to replace concatenations of truncated nots
+  // with nots of concatenated truncates. This in some cases allows for multiple
+  // redundant negations to be eliminated.
+  //  (concat_vectors (v4i16 (truncate (not (v4i32)))),
+  //                  (v4i16 (truncate (not (v4i32)))))
+  // ->
+  //  (not (concat_vectors (v4i16 (truncate (v4i32))),
+  //                       (v4i16 (truncate (v4i32)))))
+  if (N->getNumOperands() == 2 && N0Opc == ISD::TRUNCATE &&
+      N1Opc == ISD::TRUNCATE && N->isOnlyUserOf(N0.getNode()) &&
+      N->isOnlyUserOf(N1.getNode())) {
+    auto isBitwiseVectorNegate = [](SDValue V) {
+      return V->getOpcode() == ISD::XOR &&
+             ISD::isConstantSplatVectorAllOnes(V.getOperand(1).getNode());
+    };
+    SDValue N00 = N0->getOperand(0);
+    SDValue N10 = N1->getOperand(0);
+    if (isBitwiseVectorNegate(N00) && N0->isOnlyUserOf(N00.getNode()) &&
+        isBitwiseVectorNegate(N10) && N1->isOnlyUserOf(N10.getNode())) {
+      return DAG.getNOT(
+          dl,
+          DAG.getNode(ISD::CONCAT_VECTORS, dl, VT,
+                      DAG.getNode(ISD::TRUNCATE, dl, N0.getValueType(),
+                                  N00->getOperand(0)),
+                      DAG.getNode(ISD::TRUNCATE, dl, N1.getValueType(),
+                                  N10->getOperand(0))),
+          VT);
+    }
+  }
+
+  // Wait till after everything is legalized to try this. That way we have
   // legal vector types and such.
   if (DCI.isBeforeLegalizeOps())
     return SDValue();
 
-  // Optimise concat_vectors of two [us]rhadds or [us]hadds that use extracted
-  // subvectors from the same original vectors. Combine these into a single
-  // [us]rhadd or [us]hadd that operates on the two original vectors. Example:
-  //  (v16i8 (concat_vectors (v8i8 (urhadd (extract_subvector (v16i8 OpA, <0>),
-  //                                        extract_subvector (v16i8 OpB,
-  //                                        <0>))),
-  //                         (v8i8 (urhadd (extract_subvector (v16i8 OpA, <8>),
-  //                                        extract_subvector (v16i8 OpB,
-  //                                        <8>)))))
+  // Optimise concat_vectors of two [us]avgceils or [us]avgfloors that use
+  // extracted subvectors from the same original vectors. Combine these into a
+  // single avg that operates on the two original vectors.
+  // avgceil is the target independant name for rhadd, avgfloor is a hadd.
+  // Example:
+  //  (concat_vectors (v8i8 (avgceils (extract_subvector (v16i8 OpA, <0>),
+  //                                   extract_subvector (v16i8 OpB, <0>))),
+  //                  (v8i8 (avgceils (extract_subvector (v16i8 OpA, <8>),
+  //                                   extract_subvector (v16i8 OpB, <8>)))))
   // ->
-  //  (v16i8(urhadd(v16i8 OpA, v16i8 OpB)))
+  //  (v16i8(avgceils(v16i8 OpA, v16i8 OpB)))
   if (N->getNumOperands() == 2 && N0Opc == N1Opc &&
-      (N0Opc == AArch64ISD::URHADD || N0Opc == AArch64ISD::SRHADD ||
-       N0Opc == AArch64ISD::UHADD || N0Opc == AArch64ISD::SHADD)) {
+      (N0Opc == ISD::AVGCEILU || N0Opc == ISD::AVGCEILS ||
+       N0Opc == ISD::AVGFLOORU || N0Opc == ISD::AVGFLOORS)) {
     SDValue N00 = N0->getOperand(0);
     SDValue N01 = N0->getOperand(1);
     SDValue N10 = N1->getOperand(0);
@@ -13545,7 +16775,7 @@ static SDValue performConcatVectorsCombine(SDNode *N,
   // If we see a (concat_vectors (v1x64 A), (v1x64 A)) it's really a vector
   // splat. The indexed instructions are going to be expecting a DUPLANE64, so
   // canonicalise to that.
-  if (N0 == N1 && VT.getVectorNumElements() == 2) {
+  if (N->getNumOperands() == 2 && N0 == N1 && VT.getVectorNumElements() == 2) {
     assert(VT.getScalarSizeInBits() == 64);
     return DAG.getNode(AArch64ISD::DUPLANE64, dl, VT, WidenVector(N0, DAG),
                        DAG.getConstant(0, dl, MVT::i64));
@@ -13560,7 +16790,7 @@ static SDValue performConcatVectorsCombine(SDNode *N,
   // becomes
   //    (bitconvert (concat_vectors (v4i16 (bitconvert LHS)), RHS))
 
-  if (N1Opc != ISD::BITCAST)
+  if (N->getNumOperands() != 2 || N1Opc != ISD::BITCAST)
     return SDValue();
   SDValue RHS = N1->getOperand(0);
   MVT RHSTy = RHS.getValueType().getSimpleVT();
@@ -13579,6 +16809,71 @@ static SDValue performConcatVectorsCombine(SDNode *N,
                                  RHS));
 }
 
+static SDValue
+performExtractSubvectorCombine(SDNode *N, TargetLowering::DAGCombinerInfo &DCI,
+                               SelectionDAG &DAG) {
+  if (DCI.isBeforeLegalizeOps())
+    return SDValue();
+
+  EVT VT = N->getValueType(0);
+  if (!VT.isScalableVector() || VT.getVectorElementType() != MVT::i1)
+    return SDValue();
+
+  SDValue V = N->getOperand(0);
+
+  // NOTE: This combine exists in DAGCombiner, but that version's legality check
+  // blocks this combine because the non-const case requires custom lowering.
+  //
+  // ty1 extract_vector(ty2 splat(const))) -> ty1 splat(const)
+  if (V.getOpcode() == ISD::SPLAT_VECTOR)
+    if (isa<ConstantSDNode>(V.getOperand(0)))
+      return DAG.getNode(ISD::SPLAT_VECTOR, SDLoc(N), VT, V.getOperand(0));
+
+  return SDValue();
+}
+
+static SDValue
+performInsertSubvectorCombine(SDNode *N, TargetLowering::DAGCombinerInfo &DCI,
+                              SelectionDAG &DAG) {
+  SDLoc DL(N);
+  SDValue Vec = N->getOperand(0);
+  SDValue SubVec = N->getOperand(1);
+  uint64_t IdxVal = N->getConstantOperandVal(2);
+  EVT VecVT = Vec.getValueType();
+  EVT SubVT = SubVec.getValueType();
+
+  // Only do this for legal fixed vector types.
+  if (!VecVT.isFixedLengthVector() ||
+      !DAG.getTargetLoweringInfo().isTypeLegal(VecVT) ||
+      !DAG.getTargetLoweringInfo().isTypeLegal(SubVT))
+    return SDValue();
+
+  // Ignore widening patterns.
+  if (IdxVal == 0 && Vec.isUndef())
+    return SDValue();
+
+  // Subvector must be half the width and an "aligned" insertion.
+  unsigned NumSubElts = SubVT.getVectorNumElements();
+  if ((SubVT.getSizeInBits() * 2) != VecVT.getSizeInBits() ||
+      (IdxVal != 0 && IdxVal != NumSubElts))
+    return SDValue();
+
+  // Fold insert_subvector -> concat_vectors
+  // insert_subvector(Vec,Sub,lo) -> concat_vectors(Sub,extract(Vec,hi))
+  // insert_subvector(Vec,Sub,hi) -> concat_vectors(extract(Vec,lo),Sub)
+  SDValue Lo, Hi;
+  if (IdxVal == 0) {
+    Lo = SubVec;
+    Hi = DAG.getNode(ISD::EXTRACT_SUBVECTOR, DL, SubVT, Vec,
+                     DAG.getVectorIdxConstant(NumSubElts, DL));
+  } else {
+    Lo = DAG.getNode(ISD::EXTRACT_SUBVECTOR, DL, SubVT, Vec,
+                     DAG.getVectorIdxConstant(0, DL));
+    Hi = SubVec;
+  }
+  return DAG.getNode(ISD::CONCAT_VECTORS, DL, VecVT, Lo, Hi);
+}
+
 static SDValue tryCombineFixedPointConvert(SDNode *N,
                                            TargetLowering::DAGCombinerInfo &DCI,
                                            SelectionDAG &DAG) {
@@ -13597,33 +16892,34 @@ static SDValue tryCombineFixedPointConvert(SDNode *N,
 
   // Check the operand and see if it originates from a lane extract.
   SDValue Op1 = N->getOperand(1);
-  if (Op1.getOpcode() == ISD::EXTRACT_VECTOR_ELT) {
-    // Yep, no additional predication needed. Perform the transform.
-    SDValue IID = N->getOperand(0);
-    SDValue Shift = N->getOperand(2);
-    SDValue Vec = Op1.getOperand(0);
-    SDValue Lane = Op1.getOperand(1);
-    EVT ResTy = N->getValueType(0);
-    EVT VecResTy;
-    SDLoc DL(N);
+  if (Op1.getOpcode() != ISD::EXTRACT_VECTOR_ELT)
+    return SDValue();
 
-    // The vector width should be 128 bits by the time we get here, even
-    // if it started as 64 bits (the extract_vector handling will have
-    // done so).
-    assert(Vec.getValueSizeInBits() == 128 &&
-           "unexpected vector size on extract_vector_elt!");
-    if (Vec.getValueType() == MVT::v4i32)
-      VecResTy = MVT::v4f32;
-    else if (Vec.getValueType() == MVT::v2i64)
-      VecResTy = MVT::v2f64;
-    else
-      llvm_unreachable("unexpected vector type!");
+  // Yep, no additional predication needed. Perform the transform.
+  SDValue IID = N->getOperand(0);
+  SDValue Shift = N->getOperand(2);
+  SDValue Vec = Op1.getOperand(0);
+  SDValue Lane = Op1.getOperand(1);
+  EVT ResTy = N->getValueType(0);
+  EVT VecResTy;
+  SDLoc DL(N);
 
-    SDValue Convert =
-        DAG.getNode(ISD::INTRINSIC_WO_CHAIN, DL, VecResTy, IID, Vec, Shift);
-    return DAG.getNode(ISD::EXTRACT_VECTOR_ELT, DL, ResTy, Convert, Lane);
-  }
-  return SDValue();
+  // The vector width should be 128 bits by the time we get here, even
+  // if it started as 64 bits (the extract_vector handling will have
+  // done so). Bail if it is not.
+  if (Vec.getValueSizeInBits() != 128)
+    return SDValue();
+
+  if (Vec.getValueType() == MVT::v4i32)
+    VecResTy = MVT::v4f32;
+  else if (Vec.getValueType() == MVT::v2i64)
+    VecResTy = MVT::v2f64;
+  else
+    return SDValue();
+
+  SDValue Convert =
+      DAG.getNode(ISD::INTRINSIC_WO_CHAIN, DL, VecResTy, IID, Vec, Shift);
+  return DAG.getNode(ISD::EXTRACT_VECTOR_ELT, DL, ResTy, Convert, Lane);
 }
 
 // AArch64 high-vector "long" operations are formed by performing the non-high
@@ -13642,6 +16938,11 @@ static SDValue tryCombineFixedPointConvert(SDNode *N,
 // It also supports immediate DUP-like nodes (MOVI/MVNi), which we can fold
 // similarly here.
 static SDValue tryExtendDUPToExtractHigh(SDValue N, SelectionDAG &DAG) {
+  MVT VT = N.getSimpleValueType();
+  if (N.getOpcode() == ISD::EXTRACT_SUBVECTOR &&
+      N.getConstantOperandVal(1) == 0)
+    N = N.getOperand(0);
+
   switch (N.getOpcode()) {
   case AArch64ISD::DUP:
   case AArch64ISD::DUPLANE8:
@@ -13662,18 +16963,19 @@ static SDValue tryExtendDUPToExtractHigh(SDValue N, SelectionDAG &DAG) {
     return SDValue();
   }
 
-  MVT NarrowTy = N.getSimpleValueType();
-  if (!NarrowTy.is64BitVector())
+  if (!VT.is64BitVector())
     return SDValue();
 
-  MVT ElementTy = NarrowTy.getVectorElementType();
-  unsigned NumElems = NarrowTy.getVectorNumElements();
-  MVT NewVT = MVT::getVectorVT(ElementTy, NumElems * 2);
+  SDLoc DL(N);
+  unsigned NumElems = VT.getVectorNumElements();
+  if (N.getValueType().is64BitVector()) {
+    MVT ElementTy = VT.getVectorElementType();
+    MVT NewVT = MVT::getVectorVT(ElementTy, NumElems * 2);
+    N = DAG.getNode(N->getOpcode(), DL, NewVT, N->ops());
+  }
 
-  SDLoc dl(N);
-  return DAG.getNode(ISD::EXTRACT_SUBVECTOR, dl, NarrowTy,
-                     DAG.getNode(N->getOpcode(), dl, NewVT, N->ops()),
-                     DAG.getConstant(NumElems, dl, MVT::i64));
+  return DAG.getNode(ISD::EXTRACT_SUBVECTOR, DL, VT, N,
+                     DAG.getConstant(NumElems, DL, MVT::i64));
 }
 
 static bool isEssentiallyExtractHighSubvector(SDValue N) {
@@ -13759,7 +17061,7 @@ static bool isSetCC(SDValue Op, SetCCInfoAndKind &SetCCInfo) {
     SetCCInfo.Info.AArch64.CC =
         AArch64CC::getInvertedCondCode(SetCCInfo.Info.AArch64.CC);
   }
-  return TValue->isOne() && FValue->isNullValue();
+  return TValue->isOne() && FValue->isZero();
 }
 
 // Returns true if Op is setcc or zext of setcc.
@@ -13823,7 +17125,7 @@ static SDValue performSetccAddFolding(SDNode *Op, SelectionDAG &DAG) {
 }
 
 // ADD(UADDV a, UADDV b) -->  UADDV(ADD a, b)
-static SDValue performUADDVCombine(SDNode *N, SelectionDAG &DAG) {
+static SDValue performAddUADDVCombine(SDNode *N, SelectionDAG &DAG) {
   EVT VT = N->getValueType(0);
   // Only scalar integer and vector types.
   if (N->getOpcode() != ISD::ADD || !VT.isScalarInteger())
@@ -13837,7 +17139,7 @@ static SDValue performUADDVCombine(SDNode *N, SelectionDAG &DAG) {
 
   auto *LHSN1 = dyn_cast<ConstantSDNode>(LHS->getOperand(1));
   auto *RHSN1 = dyn_cast<ConstantSDNode>(RHS->getOperand(1));
-  if (!LHSN1 || LHSN1 != RHSN1 || !RHSN1->isNullValue())
+  if (!LHSN1 || LHSN1 != RHSN1 || !RHSN1->isZero())
     return SDValue();
 
   SDValue Op1 = LHS->getOperand(0);
@@ -13849,14 +17151,89 @@ static SDValue performUADDVCombine(SDNode *N, SelectionDAG &DAG) {
       OpVT1.getVectorElementType() != VT)
     return SDValue();
 
-  SDValue Val1 = Op1.getOperand(0);
-  SDValue Val2 = Op2.getOperand(0);
-  EVT ValVT = Val1->getValueType(0);
+  SDValue Val1 = Op1.getOperand(0);
+  SDValue Val2 = Op2.getOperand(0);
+  EVT ValVT = Val1->getValueType(0);
+  SDLoc DL(N);
+  SDValue AddVal = DAG.getNode(ISD::ADD, DL, ValVT, Val1, Val2);
+  return DAG.getNode(ISD::EXTRACT_VECTOR_ELT, DL, VT,
+                     DAG.getNode(AArch64ISD::UADDV, DL, ValVT, AddVal),
+                     DAG.getConstant(0, DL, MVT::i64));
+}
+
+/// Perform the scalar expression combine in the form of:
+///   CSEL(c, 1, cc) + b => CSINC(b+c, b, cc)
+///   CSNEG(c, -1, cc) + b => CSINC(b+c, b, cc)
+static SDValue performAddCSelIntoCSinc(SDNode *N, SelectionDAG &DAG) {
+  EVT VT = N->getValueType(0);
+  if (!VT.isScalarInteger() || N->getOpcode() != ISD::ADD)
+    return SDValue();
+
+  SDValue LHS = N->getOperand(0);
+  SDValue RHS = N->getOperand(1);
+
+  // Handle commutivity.
+  if (LHS.getOpcode() != AArch64ISD::CSEL &&
+      LHS.getOpcode() != AArch64ISD::CSNEG) {
+    std::swap(LHS, RHS);
+    if (LHS.getOpcode() != AArch64ISD::CSEL &&
+        LHS.getOpcode() != AArch64ISD::CSNEG) {
+      return SDValue();
+    }
+  }
+
+  if (!LHS.hasOneUse())
+    return SDValue();
+
+  AArch64CC::CondCode AArch64CC =
+      static_cast<AArch64CC::CondCode>(LHS.getConstantOperandVal(2));
+
+  // The CSEL should include a const one operand, and the CSNEG should include
+  // One or NegOne operand.
+  ConstantSDNode *CTVal = dyn_cast<ConstantSDNode>(LHS.getOperand(0));
+  ConstantSDNode *CFVal = dyn_cast<ConstantSDNode>(LHS.getOperand(1));
+  if (!CTVal || !CFVal)
+    return SDValue();
+
+  if (!(LHS.getOpcode() == AArch64ISD::CSEL &&
+        (CTVal->isOne() || CFVal->isOne())) &&
+      !(LHS.getOpcode() == AArch64ISD::CSNEG &&
+        (CTVal->isOne() || CFVal->isAllOnes())))
+    return SDValue();
+
+  // Switch CSEL(1, c, cc) to CSEL(c, 1, !cc)
+  if (LHS.getOpcode() == AArch64ISD::CSEL && CTVal->isOne() &&
+      !CFVal->isOne()) {
+    std::swap(CTVal, CFVal);
+    AArch64CC = AArch64CC::getInvertedCondCode(AArch64CC);
+  }
+
   SDLoc DL(N);
-  SDValue AddVal = DAG.getNode(ISD::ADD, DL, ValVT, Val1, Val2);
-  return DAG.getNode(ISD::EXTRACT_VECTOR_ELT, DL, VT,
-                     DAG.getNode(AArch64ISD::UADDV, DL, ValVT, AddVal),
-                     DAG.getConstant(0, DL, MVT::i64));
+  // Switch CSNEG(1, c, cc) to CSNEG(-c, -1, !cc)
+  if (LHS.getOpcode() == AArch64ISD::CSNEG && CTVal->isOne() &&
+      !CFVal->isAllOnes()) {
+    APInt C = -1 * CFVal->getAPIntValue();
+    CTVal = cast<ConstantSDNode>(DAG.getConstant(C, DL, VT));
+    CFVal = cast<ConstantSDNode>(DAG.getAllOnesConstant(DL, VT));
+    AArch64CC = AArch64CC::getInvertedCondCode(AArch64CC);
+  }
+
+  // It might be neutral for larger constants, as the immediate need to be
+  // materialized in a register.
+  APInt ADDC = CTVal->getAPIntValue();
+  const TargetLowering &TLI = DAG.getTargetLoweringInfo();
+  if (!TLI.isLegalAddImmediate(ADDC.getSExtValue()))
+    return SDValue();
+
+  assert(((LHS.getOpcode() == AArch64ISD::CSEL && CFVal->isOne()) ||
+          (LHS.getOpcode() == AArch64ISD::CSNEG && CFVal->isAllOnes())) &&
+         "Unexpected constant value");
+
+  SDValue NewNode = DAG.getNode(ISD::ADD, DL, VT, RHS, SDValue(CTVal, 0));
+  SDValue CCVal = DAG.getConstant(AArch64CC, DL, MVT::i32);
+  SDValue Cmp = LHS.getOperand(3);
+
+  return DAG.getNode(AArch64ISD::CSINC, DL, VT, NewNode, RHS, CCVal, Cmp);
 }
 
 // ADD(UDOT(zero, x, y), A) -->  UDOT(A, x, y)
@@ -13882,6 +17259,49 @@ static SDValue performAddDotCombine(SDNode *N, SelectionDAG &DAG) {
                      Dot.getOperand(2));
 }
 
+static bool isNegatedInteger(SDValue Op) {
+  return Op.getOpcode() == ISD::SUB && isNullConstant(Op.getOperand(0));
+}
+
+static SDValue getNegatedInteger(SDValue Op, SelectionDAG &DAG) {
+  SDLoc DL(Op);
+  EVT VT = Op.getValueType();
+  SDValue Zero = DAG.getConstant(0, DL, VT);
+  return DAG.getNode(ISD::SUB, DL, VT, Zero, Op);
+}
+
+// Try to fold
+//
+// (neg (csel X, Y)) -> (csel (neg X), (neg Y))
+//
+// The folding helps csel to be matched with csneg without generating
+// redundant neg instruction, which includes negation of the csel expansion
+// of abs node lowered by lowerABS.
+static SDValue performNegCSelCombine(SDNode *N, SelectionDAG &DAG) {
+  if (!isNegatedInteger(SDValue(N, 0)))
+    return SDValue();
+
+  SDValue CSel = N->getOperand(1);
+  if (CSel.getOpcode() != AArch64ISD::CSEL || !CSel->hasOneUse())
+    return SDValue();
+
+  SDValue N0 = CSel.getOperand(0);
+  SDValue N1 = CSel.getOperand(1);
+
+  // If both of them is not negations, it's not worth the folding as it
+  // introduces two additional negations while reducing one negation.
+  if (!isNegatedInteger(N0) && !isNegatedInteger(N1))
+    return SDValue();
+
+  SDValue N0N = getNegatedInteger(N0, DAG);
+  SDValue N1N = getNegatedInteger(N1, DAG);
+
+  SDLoc DL(N);
+  EVT VT = CSel.getValueType();
+  return DAG.getNode(AArch64ISD::CSEL, DL, VT, N0N, N1N, CSel.getOperand(2),
+                     CSel.getOperand(3));
+}
+
 // The basic add/sub long vector instructions have variants with "2" on the end
 // which act on the high-half of their inputs. They are normally matched by
 // patterns like:
@@ -13935,14 +17355,279 @@ static SDValue performAddSubLongCombine(SDNode *N,
   return DAG.getNode(N->getOpcode(), SDLoc(N), VT, LHS, RHS);
 }
 
+static bool isCMP(SDValue Op) {
+  return Op.getOpcode() == AArch64ISD::SUBS &&
+         !Op.getNode()->hasAnyUseOfValue(0);
+}
+
+// (CSEL 1 0 CC Cond) => CC
+// (CSEL 0 1 CC Cond) => !CC
+static std::optional<AArch64CC::CondCode> getCSETCondCode(SDValue Op) {
+  if (Op.getOpcode() != AArch64ISD::CSEL)
+    return std::nullopt;
+  auto CC = static_cast<AArch64CC::CondCode>(Op.getConstantOperandVal(2));
+  if (CC == AArch64CC::AL || CC == AArch64CC::NV)
+    return std::nullopt;
+  SDValue OpLHS = Op.getOperand(0);
+  SDValue OpRHS = Op.getOperand(1);
+  if (isOneConstant(OpLHS) && isNullConstant(OpRHS))
+    return CC;
+  if (isNullConstant(OpLHS) && isOneConstant(OpRHS))
+    return getInvertedCondCode(CC);
+
+  return std::nullopt;
+}
+
+// (ADC{S} l r (CMP (CSET HS carry) 1)) => (ADC{S} l r carry)
+// (SBC{S} l r (CMP 0 (CSET LO carry))) => (SBC{S} l r carry)
+static SDValue foldOverflowCheck(SDNode *Op, SelectionDAG &DAG, bool IsAdd) {
+  SDValue CmpOp = Op->getOperand(2);
+  if (!isCMP(CmpOp))
+    return SDValue();
+
+  if (IsAdd) {
+    if (!isOneConstant(CmpOp.getOperand(1)))
+      return SDValue();
+  } else {
+    if (!isNullConstant(CmpOp.getOperand(0)))
+      return SDValue();
+  }
+
+  SDValue CsetOp = CmpOp->getOperand(IsAdd ? 0 : 1);
+  auto CC = getCSETCondCode(CsetOp);
+  if (CC != (IsAdd ? AArch64CC::HS : AArch64CC::LO))
+    return SDValue();
+
+  return DAG.getNode(Op->getOpcode(), SDLoc(Op), Op->getVTList(),
+                     Op->getOperand(0), Op->getOperand(1),
+                     CsetOp.getOperand(3));
+}
+
+// (ADC x 0 cond) => (CINC x HS cond)
+static SDValue foldADCToCINC(SDNode *N, SelectionDAG &DAG) {
+  SDValue LHS = N->getOperand(0);
+  SDValue RHS = N->getOperand(1);
+  SDValue Cond = N->getOperand(2);
+
+  if (!isNullConstant(RHS))
+    return SDValue();
+
+  EVT VT = N->getValueType(0);
+  SDLoc DL(N);
+
+  // (CINC x cc cond) <=> (CSINC x x !cc cond)
+  SDValue CC = DAG.getConstant(AArch64CC::LO, DL, MVT::i32);
+  return DAG.getNode(AArch64ISD::CSINC, DL, VT, LHS, LHS, CC, Cond);
+}
+
+// Transform vector add(zext i8 to i32, zext i8 to i32)
+//  into sext(add(zext(i8 to i16), zext(i8 to i16)) to i32)
+// This allows extra uses of saddl/uaddl at the lower vector widths, and less
+// extends.
+static SDValue performVectorAddSubExtCombine(SDNode *N, SelectionDAG &DAG) {
+  EVT VT = N->getValueType(0);
+  if (!VT.isFixedLengthVector() || VT.getSizeInBits() <= 128 ||
+      (N->getOperand(0).getOpcode() != ISD::ZERO_EXTEND &&
+       N->getOperand(0).getOpcode() != ISD::SIGN_EXTEND) ||
+      (N->getOperand(1).getOpcode() != ISD::ZERO_EXTEND &&
+       N->getOperand(1).getOpcode() != ISD::SIGN_EXTEND) ||
+      N->getOperand(0).getOperand(0).getValueType() !=
+          N->getOperand(1).getOperand(0).getValueType())
+    return SDValue();
+
+  SDValue N0 = N->getOperand(0).getOperand(0);
+  SDValue N1 = N->getOperand(1).getOperand(0);
+  EVT InVT = N0.getValueType();
+
+  EVT S1 = InVT.getScalarType();
+  EVT S2 = VT.getScalarType();
+  if ((S2 == MVT::i32 && S1 == MVT::i8) ||
+      (S2 == MVT::i64 && (S1 == MVT::i8 || S1 == MVT::i16))) {
+    SDLoc DL(N);
+    EVT HalfVT = EVT::getVectorVT(*DAG.getContext(),
+                                  S2.getHalfSizedIntegerVT(*DAG.getContext()),
+                                  VT.getVectorElementCount());
+    SDValue NewN0 = DAG.getNode(N->getOperand(0).getOpcode(), DL, HalfVT, N0);
+    SDValue NewN1 = DAG.getNode(N->getOperand(1).getOpcode(), DL, HalfVT, N1);
+    SDValue NewOp = DAG.getNode(N->getOpcode(), DL, HalfVT, NewN0, NewN1);
+    return DAG.getNode(ISD::SIGN_EXTEND, DL, VT, NewOp);
+  }
+  return SDValue();
+}
+
+static SDValue performBuildVectorCombine(SDNode *N,
+                                         TargetLowering::DAGCombinerInfo &DCI,
+                                         SelectionDAG &DAG) {
+  SDLoc DL(N);
+  EVT VT = N->getValueType(0);
+
+  // A build vector of two extracted elements is equivalent to an
+  // extract subvector where the inner vector is any-extended to the
+  // extract_vector_elt VT.
+  //    (build_vector (extract_elt_iXX_to_i32 vec Idx+0)
+  //                  (extract_elt_iXX_to_i32 vec Idx+1))
+  // => (extract_subvector (anyext_iXX_to_i32 vec) Idx)
+
+  // For now, only consider the v2i32 case, which arises as a result of
+  // legalization.
+  if (VT != MVT::v2i32)
+    return SDValue();
+
+  SDValue Elt0 = N->getOperand(0), Elt1 = N->getOperand(1);
+  // Reminder, EXTRACT_VECTOR_ELT has the effect of any-extending to its VT.
+  if (Elt0->getOpcode() == ISD::EXTRACT_VECTOR_ELT &&
+      Elt1->getOpcode() == ISD::EXTRACT_VECTOR_ELT &&
+      // Constant index.
+      isa<ConstantSDNode>(Elt0->getOperand(1)) &&
+      isa<ConstantSDNode>(Elt1->getOperand(1)) &&
+      // Both EXTRACT_VECTOR_ELT from same vector...
+      Elt0->getOperand(0) == Elt1->getOperand(0) &&
+      // ... and contiguous. First element's index +1 == second element's index.
+      Elt0->getConstantOperandVal(1) + 1 == Elt1->getConstantOperandVal(1) &&
+      // EXTRACT_SUBVECTOR requires that Idx be a constant multiple of
+      // ResultType's known minimum vector length.
+      Elt0->getConstantOperandVal(1) % VT.getVectorMinNumElements() == 0) {
+    SDValue VecToExtend = Elt0->getOperand(0);
+    EVT ExtVT = VecToExtend.getValueType().changeVectorElementType(MVT::i32);
+    if (!DAG.getTargetLoweringInfo().isTypeLegal(ExtVT))
+      return SDValue();
+
+    SDValue SubvectorIdx = DAG.getVectorIdxConstant(Elt0->getConstantOperandVal(1), DL);
+
+    SDValue Ext = DAG.getNode(ISD::ANY_EXTEND, DL, ExtVT, VecToExtend);
+    return DAG.getNode(ISD::EXTRACT_SUBVECTOR, DL, MVT::v2i32, Ext,
+                       SubvectorIdx);
+  }
+
+  return SDValue();
+}
+
+static SDValue performTruncateCombine(SDNode *N,
+                                      SelectionDAG &DAG) {
+  EVT VT = N->getValueType(0);
+  SDValue N0 = N->getOperand(0);
+  if (VT.isFixedLengthVector() && VT.is64BitVector() && N0.hasOneUse() &&
+      N0.getOpcode() == AArch64ISD::DUP) {
+    SDValue Op = N0.getOperand(0);
+    if (VT.getScalarType() == MVT::i32 &&
+        N0.getOperand(0).getValueType().getScalarType() == MVT::i64)
+      Op = DAG.getNode(ISD::TRUNCATE, SDLoc(N), MVT::i32, Op);
+    return DAG.getNode(N0.getOpcode(), SDLoc(N), VT, Op);
+  }
+
+  return SDValue();
+}
+
+// Check an node is an extend or shift operand
+static bool isExtendOrShiftOperand(SDValue N) {
+  unsigned Opcode = N.getOpcode();
+  if (Opcode == ISD::SIGN_EXTEND || Opcode == ISD::SIGN_EXTEND_INREG ||
+      Opcode == ISD::ZERO_EXTEND || Opcode == ISD::ANY_EXTEND) {
+    EVT SrcVT;
+    if (Opcode == ISD::SIGN_EXTEND_INREG)
+      SrcVT = cast<VTSDNode>(N.getOperand(1))->getVT();
+    else
+      SrcVT = N.getOperand(0).getValueType();
+
+    return SrcVT == MVT::i32 || SrcVT == MVT::i16 || SrcVT == MVT::i8;
+  } else if (Opcode == ISD::AND) {
+    ConstantSDNode *CSD = dyn_cast<ConstantSDNode>(N.getOperand(1));
+    if (!CSD)
+      return false;
+    uint64_t AndMask = CSD->getZExtValue();
+    return AndMask == 0xff || AndMask == 0xffff || AndMask == 0xffffffff;
+  } else if (Opcode == ISD::SHL || Opcode == ISD::SRL || Opcode == ISD::SRA) {
+    return isa<ConstantSDNode>(N.getOperand(1));
+  }
+
+  return false;
+}
+
+// (N - Y) + Z --> (Z - Y) + N
+// when N is an extend or shift operand
+static SDValue performAddCombineSubShift(SDNode *N, SDValue SUB, SDValue Z,
+                                         SelectionDAG &DAG) {
+  auto IsOneUseExtend = [](SDValue N) {
+    return N.hasOneUse() && isExtendOrShiftOperand(N);
+  };
+
+  // DAGCombiner will revert the combination when Z is constant cause
+  // dead loop. So don't enable the combination when Z is constant.
+  // If Z is one use shift C, we also can't do the optimization.
+  // It will falling to self infinite loop.
+  if (isa<ConstantSDNode>(Z) || IsOneUseExtend(Z))
+    return SDValue();
+
+  if (SUB.getOpcode() != ISD::SUB || !SUB.hasOneUse())
+    return SDValue();
+
+  SDValue Shift = SUB.getOperand(0);
+  if (!IsOneUseExtend(Shift))
+    return SDValue();
+
+  SDLoc DL(N);
+  EVT VT = N->getValueType(0);
+
+  SDValue Y = SUB.getOperand(1);
+  SDValue NewSub = DAG.getNode(ISD::SUB, DL, VT, Z, Y);
+  return DAG.getNode(ISD::ADD, DL, VT, NewSub, Shift);
+}
+
+static SDValue performAddCombineForShiftedOperands(SDNode *N,
+                                                   SelectionDAG &DAG) {
+  // NOTE: Swapping LHS and RHS is not done for SUB, since SUB is not
+  // commutative.
+  if (N->getOpcode() != ISD::ADD)
+    return SDValue();
+
+  // Bail out when value type is not one of {i32, i64}, since AArch64 ADD with
+  // shifted register is only available for i32 and i64.
+  EVT VT = N->getValueType(0);
+  if (VT != MVT::i32 && VT != MVT::i64)
+    return SDValue();
+
+  SDLoc DL(N);
+  SDValue LHS = N->getOperand(0);
+  SDValue RHS = N->getOperand(1);
+
+  if (SDValue Val = performAddCombineSubShift(N, LHS, RHS, DAG))
+    return Val;
+  if (SDValue Val = performAddCombineSubShift(N, RHS, LHS, DAG))
+    return Val;
+
+  uint64_t LHSImm = 0, RHSImm = 0;
+  // If both operand are shifted by imm and shift amount is not greater than 4
+  // for one operand, swap LHS and RHS to put operand with smaller shift amount
+  // on RHS.
+  //
+  // On many AArch64 processors (Cortex A78, Neoverse N1/N2/V1, etc), ADD with
+  // LSL shift (shift <= 4) has smaller latency and larger throughput than ADD
+  // with LSL (shift > 4). For the rest of processors, this is no-op for
+  // performance or correctness.
+  if (isOpcWithIntImmediate(LHS.getNode(), ISD::SHL, LHSImm) &&
+      isOpcWithIntImmediate(RHS.getNode(), ISD::SHL, RHSImm) && LHSImm <= 4 &&
+      RHSImm > 4 && LHS.hasOneUse())
+    return DAG.getNode(ISD::ADD, DL, VT, RHS, LHS);
+
+  return SDValue();
+}
+
 static SDValue performAddSubCombine(SDNode *N,
                                     TargetLowering::DAGCombinerInfo &DCI,
                                     SelectionDAG &DAG) {
   // Try to change sum of two reductions.
-  if (SDValue Val = performUADDVCombine(N, DAG))
+  if (SDValue Val = performAddUADDVCombine(N, DAG))
     return Val;
   if (SDValue Val = performAddDotCombine(N, DAG))
     return Val;
+  if (SDValue Val = performAddCSelIntoCSinc(N, DAG))
+    return Val;
+  if (SDValue Val = performNegCSelCombine(N, DAG))
+    return Val;
+  if (SDValue Val = performVectorAddSubExtCombine(N, DAG))
+    return Val;
+  if (SDValue Val = performAddCombineForShiftedOperands(N, DAG))
+    return Val;
 
   return performAddSubLongCombine(N, DCI, DAG);
 }
@@ -14118,11 +17803,11 @@ static SDValue LowerSVEIntrinsicEXT(SDNode *N, SelectionDAG &DAG) {
   assert(VT.isScalableVector() && "Expected a scalable vector.");
 
   // Current lowering only supports the SVE-ACLE types.
-  if (VT.getSizeInBits().getKnownMinSize() != AArch64::SVEBitsPerBlock)
+  if (VT.getSizeInBits().getKnownMinValue() != AArch64::SVEBitsPerBlock)
     return SDValue();
 
   unsigned ElemSize = VT.getVectorElementType().getSizeInBits() / 8;
-  unsigned ByteSize = VT.getSizeInBits().getKnownMinSize() / 8;
+  unsigned ByteSize = VT.getSizeInBits().getKnownMinValue() / 8;
   EVT ByteVT =
       EVT::getVectorVT(Ctx, MVT::i8, ElementCount::getScalable(ByteSize));
 
@@ -14208,14 +17893,28 @@ static SDValue getPTest(SelectionDAG &DAG, EVT VT, SDValue Pg, SDValue Op,
   assert(Op.getValueType().isScalableVector() &&
          TLI.isTypeLegal(Op.getValueType()) &&
          "Expected legal scalable vector type!");
+  assert(Op.getValueType() == Pg.getValueType() &&
+         "Expected same type for PTEST operands");
 
   // Ensure target specific opcodes are using legal type.
   EVT OutVT = TLI.getTypeToTransformTo(*DAG.getContext(), VT);
   SDValue TVal = DAG.getConstant(1, DL, OutVT);
   SDValue FVal = DAG.getConstant(0, DL, OutVT);
 
+  // Ensure operands have type nxv16i1.
+  if (Op.getValueType() != MVT::nxv16i1) {
+    if ((Cond == AArch64CC::ANY_ACTIVE || Cond == AArch64CC::NONE_ACTIVE) &&
+        isZeroingInactiveLanes(Op))
+      Pg = DAG.getNode(AArch64ISD::REINTERPRET_CAST, DL, MVT::nxv16i1, Pg);
+    else
+      Pg = getSVEPredicateBitCast(MVT::nxv16i1, Pg, DAG);
+    Op = DAG.getNode(AArch64ISD::REINTERPRET_CAST, DL, MVT::nxv16i1, Op);
+  }
+
   // Set condition code (CC) flags.
-  SDValue Test = DAG.getNode(AArch64ISD::PTEST, DL, MVT::Other, Pg, Op);
+  SDValue Test = DAG.getNode(
+      Cond == AArch64CC::ANY_ACTIVE ? AArch64ISD::PTEST_ANY : AArch64ISD::PTEST,
+      DL, MVT::Other, Pg, Op);
 
   // Convert CC to integer based on requested condition.
   // NOTE: Cond is inverted to promote CSEL's removal when it feeds a compare.
@@ -14283,46 +17982,24 @@ static SDValue combineSVEReductionOrderedFP(SDNode *N, unsigned Opc,
                      Zero);
 }
 
-static bool isAllActivePredicate(SDValue N) {
-  unsigned NumElts = N.getValueType().getVectorMinNumElements();
-
-  // Look through cast.
-  while (N.getOpcode() == AArch64ISD::REINTERPRET_CAST) {
-    N = N.getOperand(0);
-    // When reinterpreting from a type with fewer elements the "new" elements
-    // are not active, so bail if they're likely to be used.
-    if (N.getValueType().getVectorMinNumElements() < NumElts)
-      return false;
-  }
-
-  // "ptrue p.<ty>, all" can be considered all active when <ty> is the same size
-  // or smaller than the implicit element type represented by N.
-  // NOTE: A larger element count implies a smaller element type.
-  if (N.getOpcode() == AArch64ISD::PTRUE &&
-      N.getConstantOperandVal(0) == AArch64SVEPredPattern::all)
-    return N.getValueType().getVectorMinNumElements() >= NumElts;
-
-  return false;
-}
-
 // If a merged operation has no inactive lanes we can relax it to a predicated
 // or unpredicated operation, which potentially allows better isel (perhaps
 // using immediate forms) or relaxing register reuse requirements.
 static SDValue convertMergedOpToPredOp(SDNode *N, unsigned Opc,
-                                       SelectionDAG &DAG,
-                                       bool UnpredOp = false) {
+                                       SelectionDAG &DAG, bool UnpredOp = false,
+                                       bool SwapOperands = false) {
   assert(N->getOpcode() == ISD::INTRINSIC_WO_CHAIN && "Expected intrinsic!");
   assert(N->getNumOperands() == 4 && "Expected 3 operand intrinsic!");
   SDValue Pg = N->getOperand(1);
+  SDValue Op1 = N->getOperand(SwapOperands ? 3 : 2);
+  SDValue Op2 = N->getOperand(SwapOperands ? 2 : 3);
 
   // ISD way to specify an all active predicate.
-  if (isAllActivePredicate(Pg)) {
+  if (isAllActivePredicate(DAG, Pg)) {
     if (UnpredOp)
-      return DAG.getNode(Opc, SDLoc(N), N->getValueType(0), N->getOperand(2),
-                         N->getOperand(3));
-    else
-      return DAG.getNode(Opc, SDLoc(N), N->getValueType(0), Pg,
-                         N->getOperand(2), N->getOperand(3));
+      return DAG.getNode(Opc, SDLoc(N), N->getValueType(0), Op1, Op2);
+
+    return DAG.getNode(Opc, SDLoc(N), N->getValueType(0), Pg, Op1, Op2);
   }
 
   // FUTURE: SplatVector(true)
@@ -14337,6 +18014,39 @@ static SDValue performIntrinsicCombine(SDNode *N,
   switch (IID) {
   default:
     break;
+  case Intrinsic::get_active_lane_mask: {
+    SDValue Res = SDValue();
+    EVT VT = N->getValueType(0);
+    if (VT.isFixedLengthVector()) {
+      // We can use the SVE whilelo instruction to lower this intrinsic by
+      // creating the appropriate sequence of scalable vector operations and
+      // then extracting a fixed-width subvector from the scalable vector.
+
+      SDLoc DL(N);
+      SDValue ID =
+          DAG.getTargetConstant(Intrinsic::aarch64_sve_whilelo, DL, MVT::i64);
+
+      EVT WhileVT = EVT::getVectorVT(
+          *DAG.getContext(), MVT::i1,
+          ElementCount::getScalable(VT.getVectorNumElements()));
+
+      // Get promoted scalable vector VT, i.e. promote nxv4i1 -> nxv4i32.
+      EVT PromVT = getPromotedVTForPredicate(WhileVT);
+
+      // Get the fixed-width equivalent of PromVT for extraction.
+      EVT ExtVT =
+          EVT::getVectorVT(*DAG.getContext(), PromVT.getVectorElementType(),
+                           VT.getVectorElementCount());
+
+      Res = DAG.getNode(ISD::INTRINSIC_WO_CHAIN, DL, WhileVT, ID,
+                        N->getOperand(1), N->getOperand(2));
+      Res = DAG.getNode(ISD::SIGN_EXTEND, DL, PromVT, Res);
+      Res = DAG.getNode(ISD::EXTRACT_SUBVECTOR, DL, ExtVT, Res,
+                        DAG.getConstant(0, DL, MVT::i64));
+      Res = DAG.getNode(ISD::TRUNCATE, DL, VT, Res);
+    }
+    return Res;
+  }
   case Intrinsic::aarch64_neon_vcvtfxs2fp:
   case Intrinsic::aarch64_neon_vcvtfxu2fp:
     return tryCombineFixedPointConvert(N, DCI, DAG);
@@ -14365,8 +18075,14 @@ static SDValue performIntrinsicCombine(SDNode *N,
     return DAG.getNode(ISD::FMINNUM, SDLoc(N), N->getValueType(0),
                        N->getOperand(1), N->getOperand(2));
   case Intrinsic::aarch64_neon_smull:
+    return DAG.getNode(AArch64ISD::SMULL, SDLoc(N), N->getValueType(0),
+                       N->getOperand(1), N->getOperand(2));
   case Intrinsic::aarch64_neon_umull:
+    return DAG.getNode(AArch64ISD::UMULL, SDLoc(N), N->getValueType(0),
+                       N->getOperand(1), N->getOperand(2));
   case Intrinsic::aarch64_neon_pmull:
+    return DAG.getNode(AArch64ISD::PMULL, SDLoc(N), N->getValueType(0),
+                       N->getOperand(1), N->getOperand(2));
   case Intrinsic::aarch64_neon_sqdmull:
     return tryCombineLongOpWithDup(IID, N, DCI, DAG);
   case Intrinsic::aarch64_neon_sqshl:
@@ -14377,6 +18093,17 @@ static SDValue performIntrinsicCombine(SDNode *N,
   case Intrinsic::aarch64_neon_sshl:
   case Intrinsic::aarch64_neon_ushl:
     return tryCombineShiftImm(IID, N, DAG);
+  case Intrinsic::aarch64_neon_rshrn: {
+    EVT VT = N->getOperand(1).getValueType();
+    SDLoc DL(N);
+    SDValue Imm =
+        DAG.getConstant(1LLU << (N->getConstantOperandVal(2) - 1), DL, VT);
+    SDValue Add = DAG.getNode(ISD::ADD, DL, VT, N->getOperand(1), Imm);
+    SDValue Sht =
+        DAG.getNode(ISD::SRL, DL, VT, Add,
+                    DAG.getConstant(N->getConstantOperandVal(2), DL, VT));
+    return DAG.getNode(ISD::TRUNCATE, DL, N->getValueType(0), Sht);
+  }
   case Intrinsic::aarch64_crc32b:
   case Intrinsic::aarch64_crc32cb:
     return tryCombineCRC32(0xff, N, DAG);
@@ -14416,24 +18143,54 @@ static SDValue performIntrinsicCombine(SDNode *N,
     return LowerSVEIntrinsicEXT(N, DAG);
   case Intrinsic::aarch64_sve_mul:
     return convertMergedOpToPredOp(N, AArch64ISD::MUL_PRED, DAG);
+  case Intrinsic::aarch64_sve_mul_u:
+    return DAG.getNode(AArch64ISD::MUL_PRED, SDLoc(N), N->getValueType(0),
+                       N->getOperand(1), N->getOperand(2), N->getOperand(3));
   case Intrinsic::aarch64_sve_smulh:
     return convertMergedOpToPredOp(N, AArch64ISD::MULHS_PRED, DAG);
+  case Intrinsic::aarch64_sve_smulh_u:
+    return DAG.getNode(AArch64ISD::MULHS_PRED, SDLoc(N), N->getValueType(0),
+                       N->getOperand(1), N->getOperand(2), N->getOperand(3));
   case Intrinsic::aarch64_sve_umulh:
     return convertMergedOpToPredOp(N, AArch64ISD::MULHU_PRED, DAG);
+  case Intrinsic::aarch64_sve_umulh_u:
+    return DAG.getNode(AArch64ISD::MULHU_PRED, SDLoc(N), N->getValueType(0),
+                       N->getOperand(1), N->getOperand(2), N->getOperand(3));
   case Intrinsic::aarch64_sve_smin:
     return convertMergedOpToPredOp(N, AArch64ISD::SMIN_PRED, DAG);
+  case Intrinsic::aarch64_sve_smin_u:
+    return DAG.getNode(AArch64ISD::SMIN_PRED, SDLoc(N), N->getValueType(0),
+                       N->getOperand(1), N->getOperand(2), N->getOperand(3));
   case Intrinsic::aarch64_sve_umin:
     return convertMergedOpToPredOp(N, AArch64ISD::UMIN_PRED, DAG);
+  case Intrinsic::aarch64_sve_umin_u:
+    return DAG.getNode(AArch64ISD::UMIN_PRED, SDLoc(N), N->getValueType(0),
+                       N->getOperand(1), N->getOperand(2), N->getOperand(3));
   case Intrinsic::aarch64_sve_smax:
     return convertMergedOpToPredOp(N, AArch64ISD::SMAX_PRED, DAG);
+  case Intrinsic::aarch64_sve_smax_u:
+    return DAG.getNode(AArch64ISD::SMAX_PRED, SDLoc(N), N->getValueType(0),
+                       N->getOperand(1), N->getOperand(2), N->getOperand(3));
   case Intrinsic::aarch64_sve_umax:
     return convertMergedOpToPredOp(N, AArch64ISD::UMAX_PRED, DAG);
+  case Intrinsic::aarch64_sve_umax_u:
+    return DAG.getNode(AArch64ISD::UMAX_PRED, SDLoc(N), N->getValueType(0),
+                       N->getOperand(1), N->getOperand(2), N->getOperand(3));
   case Intrinsic::aarch64_sve_lsl:
     return convertMergedOpToPredOp(N, AArch64ISD::SHL_PRED, DAG);
+  case Intrinsic::aarch64_sve_lsl_u:
+    return DAG.getNode(AArch64ISD::SHL_PRED, SDLoc(N), N->getValueType(0),
+                       N->getOperand(1), N->getOperand(2), N->getOperand(3));
   case Intrinsic::aarch64_sve_lsr:
     return convertMergedOpToPredOp(N, AArch64ISD::SRL_PRED, DAG);
+  case Intrinsic::aarch64_sve_lsr_u:
+    return DAG.getNode(AArch64ISD::SRL_PRED, SDLoc(N), N->getValueType(0),
+                       N->getOperand(1), N->getOperand(2), N->getOperand(3));
   case Intrinsic::aarch64_sve_asr:
     return convertMergedOpToPredOp(N, AArch64ISD::SRA_PRED, DAG);
+  case Intrinsic::aarch64_sve_asr_u:
+    return DAG.getNode(AArch64ISD::SRA_PRED, SDLoc(N), N->getValueType(0),
+                       N->getOperand(1), N->getOperand(2), N->getOperand(3));
   case Intrinsic::aarch64_sve_fadd:
     return convertMergedOpToPredOp(N, AArch64ISD::FADD_PRED, DAG);
   case Intrinsic::aarch64_sve_fsub:
@@ -14442,8 +18199,16 @@ static SDValue performIntrinsicCombine(SDNode *N,
     return convertMergedOpToPredOp(N, AArch64ISD::FMUL_PRED, DAG);
   case Intrinsic::aarch64_sve_add:
     return convertMergedOpToPredOp(N, ISD::ADD, DAG, true);
+  case Intrinsic::aarch64_sve_add_u:
+    return DAG.getNode(ISD::ADD, SDLoc(N), N->getValueType(0), N->getOperand(2),
+                       N->getOperand(3));
   case Intrinsic::aarch64_sve_sub:
     return convertMergedOpToPredOp(N, ISD::SUB, DAG, true);
+  case Intrinsic::aarch64_sve_sub_u:
+    return DAG.getNode(ISD::SUB, SDLoc(N), N->getValueType(0), N->getOperand(2),
+                       N->getOperand(3));
+  case Intrinsic::aarch64_sve_subr:
+    return convertMergedOpToPredOp(N, ISD::SUB, DAG, true, true);
   case Intrinsic::aarch64_sve_and:
     return convertMergedOpToPredOp(N, ISD::AND, DAG, true);
   case Intrinsic::aarch64_sve_bic:
@@ -14452,6 +18217,22 @@ static SDValue performIntrinsicCombine(SDNode *N,
     return convertMergedOpToPredOp(N, ISD::XOR, DAG, true);
   case Intrinsic::aarch64_sve_orr:
     return convertMergedOpToPredOp(N, ISD::OR, DAG, true);
+  case Intrinsic::aarch64_sve_sabd:
+    return convertMergedOpToPredOp(N, ISD::ABDS, DAG, true);
+  case Intrinsic::aarch64_sve_sabd_u:
+    return DAG.getNode(ISD::ABDS, SDLoc(N), N->getValueType(0),
+                       N->getOperand(2), N->getOperand(3));
+  case Intrinsic::aarch64_sve_uabd:
+    return convertMergedOpToPredOp(N, ISD::ABDU, DAG, true);
+  case Intrinsic::aarch64_sve_uabd_u:
+    return DAG.getNode(ISD::ABDU, SDLoc(N), N->getValueType(0),
+                       N->getOperand(2), N->getOperand(3));
+  case Intrinsic::aarch64_sve_sdiv_u:
+    return DAG.getNode(AArch64ISD::SDIV_PRED, SDLoc(N), N->getValueType(0),
+                       N->getOperand(1), N->getOperand(2), N->getOperand(3));
+  case Intrinsic::aarch64_sve_udiv_u:
+    return DAG.getNode(AArch64ISD::UDIV_PRED, SDLoc(N), N->getValueType(0),
+                       N->getOperand(1), N->getOperand(2), N->getOperand(3));
   case Intrinsic::aarch64_sve_sqadd:
     return convertMergedOpToPredOp(N, ISD::SADDSAT, DAG, true);
   case Intrinsic::aarch64_sve_sqsub:
@@ -14472,6 +18253,9 @@ static SDValue performIntrinsicCombine(SDNode *N,
   case Intrinsic::aarch64_sve_uqsub_x:
     return DAG.getNode(ISD::USUBSAT, SDLoc(N), N->getValueType(0),
                        N->getOperand(1), N->getOperand(2));
+  case Intrinsic::aarch64_sve_asrd:
+    return DAG.getNode(AArch64ISD::SRAD_MERGE_OP1, SDLoc(N), N->getValueType(0),
+                       N->getOperand(1), N->getOperand(2), N->getOperand(3));
   case Intrinsic::aarch64_sve_cmphs:
     if (!N->getOperand(2).getValueType().isFloatingPoint())
       return DAG.getNode(AArch64ISD::SETCC_MERGE_ZERO, SDLoc(N),
@@ -14561,6 +18345,52 @@ static SDValue performIntrinsicCombine(SDNode *N,
   return SDValue();
 }
 
+static bool isCheapToExtend(const SDValue &N) {
+  unsigned OC = N->getOpcode();
+  return OC == ISD::LOAD || OC == ISD::MLOAD ||
+         ISD::isConstantSplatVectorAllZeros(N.getNode());
+}
+
+static SDValue
+performSignExtendSetCCCombine(SDNode *N, TargetLowering::DAGCombinerInfo &DCI,
+                              SelectionDAG &DAG) {
+  // If we have (sext (setcc A B)) and A and B are cheap to extend,
+  // we can move the sext into the arguments and have the same result. For
+  // example, if A and B are both loads, we can make those extending loads and
+  // avoid an extra instruction. This pattern appears often in VLS code
+  // generation where the inputs to the setcc have a different size to the
+  // instruction that wants to use the result of the setcc.
+  assert(N->getOpcode() == ISD::SIGN_EXTEND &&
+         N->getOperand(0)->getOpcode() == ISD::SETCC);
+  const SDValue SetCC = N->getOperand(0);
+
+  const SDValue CCOp0 = SetCC.getOperand(0);
+  const SDValue CCOp1 = SetCC.getOperand(1);
+  if (!CCOp0->getValueType(0).isInteger() ||
+      !CCOp1->getValueType(0).isInteger())
+    return SDValue();
+
+  ISD::CondCode Code =
+      cast<CondCodeSDNode>(SetCC->getOperand(2).getNode())->get();
+
+  ISD::NodeType ExtType =
+      isSignedIntSetCC(Code) ? ISD::SIGN_EXTEND : ISD::ZERO_EXTEND;
+
+  if (isCheapToExtend(SetCC.getOperand(0)) &&
+      isCheapToExtend(SetCC.getOperand(1))) {
+    const SDValue Ext1 =
+        DAG.getNode(ExtType, SDLoc(N), N->getValueType(0), CCOp0);
+    const SDValue Ext2 =
+        DAG.getNode(ExtType, SDLoc(N), N->getValueType(0), CCOp1);
+
+    return DAG.getSetCC(
+        SDLoc(SetCC), N->getValueType(0), Ext1, Ext2,
+        cast<CondCodeSDNode>(SetCC->getOperand(2).getNode())->get());
+  }
+
+  return SDValue();
+}
+
 static SDValue performExtendCombine(SDNode *N,
                                     TargetLowering::DAGCombinerInfo &DCI,
                                     SelectionDAG &DAG) {
@@ -14579,13 +18409,19 @@ static SDValue performExtendCombine(SDNode *N,
 
     return DAG.getNode(ISD::ZERO_EXTEND, SDLoc(N), N->getValueType(0), NewABD);
   }
+
+  if (N->getValueType(0).isFixedLengthVector() &&
+      N->getOpcode() == ISD::SIGN_EXTEND &&
+      N->getOperand(0)->getOpcode() == ISD::SETCC)
+    return performSignExtendSetCCCombine(N, DCI, DAG);
+
   return SDValue();
 }
 
 static SDValue splitStoreSplat(SelectionDAG &DAG, StoreSDNode &St,
                                SDValue SplatVal, unsigned NumVecElts) {
   assert(!St.isTruncatingStore() && "cannot split truncating vector store");
-  unsigned OrigAlignment = St.getAlignment();
+  Align OrigAlignment = St.getAlign();
   unsigned EltOffset = SplatVal.getValueType().getSizeInBits() / 8;
 
   // Create scalar stores. This is at least as good as the code sequence for a
@@ -14610,7 +18446,7 @@ static SDValue splitStoreSplat(SelectionDAG &DAG, StoreSDNode &St,
 
   unsigned Offset = EltOffset;
   while (--NumVecElts) {
-    unsigned Alignment = MinAlign(OrigAlignment, Offset);
+    Align Alignment = commonAlignment(OrigAlignment, Offset);
     SDValue OffsetPtr =
         DAG.getNode(ISD::ADD, DL, MVT::i64, BasePtr,
                     DAG.getConstant(BaseOffset + Offset, DL, MVT::i64));
@@ -14656,7 +18492,7 @@ static SDValue performLD1Combine(SDNode *N, SelectionDAG &DAG, unsigned Opc) {
   SDLoc DL(N);
   EVT VT = N->getValueType(0);
 
-  if (VT.getSizeInBits().getKnownMinSize() > AArch64::SVEBitsPerBlock)
+  if (VT.getSizeInBits().getKnownMinValue() > AArch64::SVEBitsPerBlock)
     return SDValue();
 
   EVT ContainerVT = VT;
@@ -14683,10 +18519,6 @@ static SDValue performLDNT1Combine(SDNode *N, SelectionDAG &DAG) {
   EVT VT = N->getValueType(0);
   EVT PtrTy = N->getOperand(3).getValueType();
 
-  if (VT == MVT::nxv8bf16 &&
-      !static_cast<const AArch64Subtarget &>(DAG.getSubtarget()).hasBF16())
-    return SDValue();
-
   EVT LoadVT = VT;
   if (VT.isFloatingPoint())
     LoadVT = VT.changeTypeToInteger();
@@ -14714,9 +18546,6 @@ static SDValue performLD1ReplicateCombine(SDNode *N, SelectionDAG &DAG) {
                 "Unsupported opcode.");
   SDLoc DL(N);
   EVT VT = N->getValueType(0);
-  if (VT == MVT::nxv8bf16 &&
-      !static_cast<const AArch64Subtarget &>(DAG.getSubtarget()).hasBF16())
-    return SDValue();
 
   EVT LoadVT = VT;
   if (VT.isFloatingPoint())
@@ -14739,10 +18568,6 @@ static SDValue performST1Combine(SDNode *N, SelectionDAG &DAG) {
   EVT HwSrcVt = getSVEContainerType(DataVT);
   SDValue InputVT = DAG.getValueType(DataVT);
 
-  if (DataVT == MVT::nxv8bf16 &&
-      !static_cast<const AArch64Subtarget &>(DAG.getSubtarget()).hasBF16())
-    return SDValue();
-
   if (DataVT.isFloatingPoint())
     InputVT = DAG.getValueType(HwSrcVt);
 
@@ -14769,10 +18594,6 @@ static SDValue performSTNT1Combine(SDNode *N, SelectionDAG &DAG) {
   EVT DataVT = Data.getValueType();
   EVT PtrTy = N->getOperand(4).getValueType();
 
-  if (DataVT == MVT::nxv8bf16 &&
-      !static_cast<const AArch64Subtarget &>(DAG.getSubtarget()).hasBF16())
-    return SDValue();
-
   if (DataVT.isFloatingPoint())
     Data = DAG.getNode(ISD::BITCAST, DL, DataVT.changeTypeToInteger(), Data);
 
@@ -14959,8 +18780,8 @@ static SDValue splitStores(SDNode *N, TargetLowering::DAGCombinerInfo &DCI,
   // extensions can use this to mark that it does not want splitting to happen
   // (by underspecifying alignment to be 1 or 2). Furthermore, the chance of
   // eliminating alignment hazards is only 1 in 8 for alignment of 2.
-  if (VT.getSizeInBits() != 128 || S->getAlignment() >= 16 ||
-      S->getAlignment() <= 2)
+  if (VT.getSizeInBits() != 128 || S->getAlign() >= Align(16) ||
+      S->getAlign() <= Align(2))
     return SDValue();
 
   // If we get a splat of a scalar convert this vector store to a store of
@@ -14981,11 +18802,11 @@ static SDValue splitStores(SDNode *N, TargetLowering::DAGCombinerInfo &DCI,
   SDValue BasePtr = S->getBasePtr();
   SDValue NewST1 =
       DAG.getStore(S->getChain(), DL, SubVector0, BasePtr, S->getPointerInfo(),
-                   S->getAlignment(), S->getMemOperand()->getFlags());
+                   S->getAlign(), S->getMemOperand()->getFlags());
   SDValue OffsetPtr = DAG.getNode(ISD::ADD, DL, MVT::i64, BasePtr,
                                   DAG.getConstant(8, DL, MVT::i64));
   return DAG.getStore(NewST1.getValue(0), DL, SubVector1, OffsetPtr,
-                      S->getPointerInfo(), S->getAlignment(),
+                      S->getPointerInfo(), S->getAlign(),
                       S->getMemOperand()->getFlags());
 }
 
@@ -14999,12 +18820,88 @@ static SDValue performSpliceCombine(SDNode *N, SelectionDAG &DAG) {
   return SDValue();
 }
 
+static SDValue performUnpackCombine(SDNode *N, SelectionDAG &DAG,
+                                    const AArch64Subtarget *Subtarget) {
+  assert((N->getOpcode() == AArch64ISD::UUNPKHI ||
+          N->getOpcode() == AArch64ISD::UUNPKLO) &&
+         "Unexpected Opcode!");
+
+  // uunpklo/hi undef -> undef
+  if (N->getOperand(0).isUndef())
+    return DAG.getUNDEF(N->getValueType(0));
+
+  // If this is a masked load followed by an UUNPKLO, fold this into a masked
+  // extending load.  We can do this even if this is already a masked
+  // {z,}extload.
+  if (N->getOperand(0).getOpcode() == ISD::MLOAD &&
+      N->getOpcode() == AArch64ISD::UUNPKLO) {
+    MaskedLoadSDNode *MLD = cast<MaskedLoadSDNode>(N->getOperand(0));
+    SDValue Mask = MLD->getMask();
+    SDLoc DL(N);
+
+    if (MLD->isUnindexed() && MLD->getExtensionType() != ISD::SEXTLOAD &&
+        SDValue(MLD, 0).hasOneUse() && Mask->getOpcode() == AArch64ISD::PTRUE &&
+        (MLD->getPassThru()->isUndef() ||
+         isZerosVector(MLD->getPassThru().getNode()))) {
+      unsigned MinSVESize = Subtarget->getMinSVEVectorSizeInBits();
+      unsigned PgPattern = Mask->getConstantOperandVal(0);
+      EVT VT = N->getValueType(0);
+
+      // Ensure we can double the size of the predicate pattern
+      unsigned NumElts = getNumElementsFromSVEPredPattern(PgPattern);
+      if (NumElts &&
+          NumElts * VT.getVectorElementType().getSizeInBits() <= MinSVESize) {
+        Mask =
+            getPTrue(DAG, DL, VT.changeVectorElementType(MVT::i1), PgPattern);
+        SDValue PassThru = DAG.getConstant(0, DL, VT);
+        SDValue NewLoad = DAG.getMaskedLoad(
+            VT, DL, MLD->getChain(), MLD->getBasePtr(), MLD->getOffset(), Mask,
+            PassThru, MLD->getMemoryVT(), MLD->getMemOperand(),
+            MLD->getAddressingMode(), ISD::ZEXTLOAD);
+
+        DAG.ReplaceAllUsesOfValueWith(SDValue(MLD, 1), NewLoad.getValue(1));
+
+        return NewLoad;
+      }
+    }
+  }
+
+  return SDValue();
+}
+
 static SDValue performUzpCombine(SDNode *N, SelectionDAG &DAG) {
   SDLoc DL(N);
   SDValue Op0 = N->getOperand(0);
   SDValue Op1 = N->getOperand(1);
   EVT ResVT = N->getValueType(0);
 
+  // uzp1(x, undef) -> concat(truncate(x), undef)
+  if (Op1.getOpcode() == ISD::UNDEF) {
+    EVT BCVT = MVT::Other, HalfVT = MVT::Other;
+    switch (ResVT.getSimpleVT().SimpleTy) {
+    default:
+      break;
+    case MVT::v16i8:
+      BCVT = MVT::v8i16;
+      HalfVT = MVT::v8i8;
+      break;
+    case MVT::v8i16:
+      BCVT = MVT::v4i32;
+      HalfVT = MVT::v4i16;
+      break;
+    case MVT::v4i32:
+      BCVT = MVT::v2i64;
+      HalfVT = MVT::v2i32;
+      break;
+    }
+    if (BCVT != MVT::Other) {
+      SDValue BC = DAG.getBitcast(BCVT, Op0);
+      SDValue Trunc = DAG.getNode(ISD::TRUNCATE, DL, HalfVT, BC);
+      return DAG.getNode(ISD::CONCAT_VECTORS, DL, ResVT, Trunc,
+                         DAG.getUNDEF(HalfVT));
+    }
+  }
+
   // uzp1(unpklo(uzp1(x, y)), z) => uzp1(x, z)
   if (Op0.getOpcode() == AArch64ISD::UUNPKLO) {
     if (Op0.getOperand(0).getOpcode() == AArch64ISD::UZP1) {
@@ -15021,7 +18918,76 @@ static SDValue performUzpCombine(SDNode *N, SelectionDAG &DAG) {
     }
   }
 
-  return SDValue();
+  // uzp1(xtn x, xtn y) -> xtn(uzp1 (x, y))
+  // Only implemented on little-endian subtargets.
+  bool IsLittleEndian = DAG.getDataLayout().isLittleEndian();
+
+  // This optimization only works on little endian.
+  if (!IsLittleEndian)
+    return SDValue();
+
+  if (ResVT != MVT::v2i32 && ResVT != MVT::v4i16 && ResVT != MVT::v8i8)
+    return SDValue();
+
+  auto getSourceOp = [](SDValue Operand) -> SDValue {
+    const unsigned Opcode = Operand.getOpcode();
+    if (Opcode == ISD::TRUNCATE)
+      return Operand->getOperand(0);
+    if (Opcode == ISD::BITCAST &&
+        Operand->getOperand(0).getOpcode() == ISD::TRUNCATE)
+      return Operand->getOperand(0)->getOperand(0);
+    return SDValue();
+  };
+
+  SDValue SourceOp0 = getSourceOp(Op0);
+  SDValue SourceOp1 = getSourceOp(Op1);
+
+  if (!SourceOp0 || !SourceOp1)
+    return SDValue();
+
+  if (SourceOp0.getValueType() != SourceOp1.getValueType() ||
+      !SourceOp0.getValueType().isSimple())
+    return SDValue();
+
+  EVT ResultTy;
+
+  switch (SourceOp0.getSimpleValueType().SimpleTy) {
+  case MVT::v2i64:
+    ResultTy = MVT::v4i32;
+    break;
+  case MVT::v4i32:
+    ResultTy = MVT::v8i16;
+    break;
+  case MVT::v8i16:
+    ResultTy = MVT::v16i8;
+    break;
+  default:
+    return SDValue();
+  }
+
+  SDValue UzpOp0 = DAG.getNode(ISD::BITCAST, DL, ResultTy, SourceOp0);
+  SDValue UzpOp1 = DAG.getNode(ISD::BITCAST, DL, ResultTy, SourceOp1);
+  SDValue UzpResult =
+      DAG.getNode(AArch64ISD::UZP1, DL, UzpOp0.getValueType(), UzpOp0, UzpOp1);
+
+  EVT BitcastResultTy;
+
+  switch (ResVT.getSimpleVT().SimpleTy) {
+  case MVT::v2i32:
+    BitcastResultTy = MVT::v2i64;
+    break;
+  case MVT::v4i16:
+    BitcastResultTy = MVT::v4i32;
+    break;
+  case MVT::v8i8:
+    BitcastResultTy = MVT::v8i16;
+    break;
+  default:
+    llvm_unreachable("Should be one of {v2i32, v4i16, v8i8}");
+  }
+
+  return DAG.getNode(ISD::TRUNCATE, DL, ResVT,
+                     DAG.getNode(ISD::BITCAST, DL, BitcastResultTy, UzpResult));
 }
 
 static SDValue performGLD1Combine(SDNode *N, SelectionDAG &DAG) {
@@ -15104,6 +19070,23 @@ static SDValue performVectorShiftCombine(SDNode *N,
   return SDValue();
 }
 
+static SDValue performSunpkloCombine(SDNode *N, SelectionDAG &DAG) {
+  // sunpklo(sext(pred)) -> sext(extract_low_half(pred))
+  // This transform works in partnership with performSetCCPunpkCombine to
+  // remove unnecessary transfer of predicates into standard registers and back
+  if (N->getOperand(0).getOpcode() == ISD::SIGN_EXTEND &&
+      N->getOperand(0)->getOperand(0)->getValueType(0).getScalarType() ==
+          MVT::i1) {
+    SDValue CC = N->getOperand(0)->getOperand(0);
+    auto VT = CC->getValueType(0).getHalfNumVectorElementsVT(*DAG.getContext());
+    SDValue Unpk = DAG.getNode(ISD::EXTRACT_SUBVECTOR, SDLoc(N), VT, CC,
+                               DAG.getVectorIdxConstant(0, SDLoc(N)));
+    return DAG.getNode(ISD::SIGN_EXTEND, SDLoc(N), N->getValueType(0), Unpk);
+  }
+
+  return SDValue();
+}
+
 /// Target-specific DAG combine function for post-increment LD1 (lane) and
 /// post-increment LD1R.
 static SDValue performPostLD1Combine(SDNode *N,
@@ -15115,7 +19098,7 @@ static SDValue performPostLD1Combine(SDNode *N,
   SelectionDAG &DAG = DCI.DAG;
   EVT VT = N->getValueType(0);
 
-  if (VT.isScalableVector())
+  if (!VT.is128BitVector() && !VT.is64BitVector())
     return SDValue();
 
   unsigned LoadIdx = IsLaneOp ? 1 : 0;
@@ -15241,20 +19224,126 @@ static SDValue foldTruncStoreOfExt(SelectionDAG &DAG, SDNode *N) {
         ExtOpCode != ISD::ANY_EXTEND)
       return SDValue();
     SDValue Orig = Ext->getOperand(0);
-    if (Store->getMemoryVT() != Orig->getValueType(0))
+    if (Store->getMemoryVT() != Orig.getValueType())
       return SDValue();
     return DAG.getStore(Store->getChain(), SDLoc(Store), Orig,
-                        Store->getBasePtr(), Store->getPointerInfo(),
-                        Store->getAlign());
+                        Store->getBasePtr(), Store->getMemOperand());
   }
 
   return SDValue();
 }
 
+// Perform TBI simplification if supported by the target and try to break up
+// nontemporal loads larger than 256-bits loads for odd types so LDNPQ 256-bit
+// load instructions can be selected.
+static SDValue performLOADCombine(SDNode *N,
+                                  TargetLowering::DAGCombinerInfo &DCI,
+                                  SelectionDAG &DAG,
+                                  const AArch64Subtarget *Subtarget) {
+  if (Subtarget->supportsAddressTopByteIgnored())
+    performTBISimplification(N->getOperand(1), DCI, DAG);
+
+  LoadSDNode *LD = cast<LoadSDNode>(N);
+  EVT MemVT = LD->getMemoryVT();
+  if (LD->isVolatile() || !LD->isNonTemporal() || !Subtarget->isLittleEndian())
+    return SDValue(N, 0);
+
+  if (MemVT.isScalableVector() || MemVT.getSizeInBits() <= 256 ||
+      MemVT.getSizeInBits() % 256 == 0 ||
+      256 % MemVT.getScalarSizeInBits() != 0)
+    return SDValue(N, 0);
+
+  SDLoc DL(LD);
+  SDValue Chain = LD->getChain();
+  SDValue BasePtr = LD->getBasePtr();
+  SDNodeFlags Flags = LD->getFlags();
+  SmallVector<SDValue, 4> LoadOps;
+  SmallVector<SDValue, 4> LoadOpsChain;
+  // Replace any non temporal load over 256-bit with a series of 256 bit loads
+  // and a scalar/vector load less than 256. This way we can utilize 256-bit
+  // loads and reduce the amount of load instructions generated.
+  MVT NewVT =
+      MVT::getVectorVT(MemVT.getVectorElementType().getSimpleVT(),
+                       256 / MemVT.getVectorElementType().getSizeInBits());
+  unsigned Num256Loads = MemVT.getSizeInBits() / 256;
+  // Create all 256-bit loads starting from offset 0 and up to Num256Loads-1*32.
+  for (unsigned I = 0; I < Num256Loads; I++) {
+    unsigned PtrOffset = I * 32;
+    SDValue NewPtr = DAG.getMemBasePlusOffset(
+        BasePtr, TypeSize::Fixed(PtrOffset), DL, Flags);
+    Align NewAlign = commonAlignment(LD->getAlign(), PtrOffset);
+    SDValue NewLoad = DAG.getLoad(
+        NewVT, DL, Chain, NewPtr, LD->getPointerInfo().getWithOffset(PtrOffset),
+        NewAlign, LD->getMemOperand()->getFlags(), LD->getAAInfo());
+    LoadOps.push_back(NewLoad);
+    LoadOpsChain.push_back(SDValue(cast<SDNode>(NewLoad), 1));
+  }
+
+  // Process remaining bits of the load operation.
+  // This is done by creating an UNDEF vector to match the size of the
+  // 256-bit loads and inserting the remaining load to it. We extract the
+  // original load type at the end using EXTRACT_SUBVECTOR instruction.
+  unsigned BitsRemaining = MemVT.getSizeInBits() % 256;
+  unsigned PtrOffset = (MemVT.getSizeInBits() - BitsRemaining) / 8;
+  MVT RemainingVT = MVT::getVectorVT(
+      MemVT.getVectorElementType().getSimpleVT(),
+      BitsRemaining / MemVT.getVectorElementType().getSizeInBits());
+  SDValue NewPtr =
+      DAG.getMemBasePlusOffset(BasePtr, TypeSize::Fixed(PtrOffset), DL, Flags);
+  Align NewAlign = commonAlignment(LD->getAlign(), PtrOffset);
+  SDValue RemainingLoad =
+      DAG.getLoad(RemainingVT, DL, Chain, NewPtr,
+                  LD->getPointerInfo().getWithOffset(PtrOffset), NewAlign,
+                  LD->getMemOperand()->getFlags(), LD->getAAInfo());
+  SDValue UndefVector = DAG.getUNDEF(NewVT);
+  SDValue InsertIdx = DAG.getVectorIdxConstant(0, DL);
+  SDValue ExtendedReminingLoad =
+      DAG.getNode(ISD::INSERT_SUBVECTOR, DL, NewVT,
+                  {UndefVector, RemainingLoad, InsertIdx});
+  LoadOps.push_back(ExtendedReminingLoad);
+  LoadOpsChain.push_back(SDValue(cast<SDNode>(RemainingLoad), 1));
+  EVT ConcatVT =
+      EVT::getVectorVT(*DAG.getContext(), MemVT.getScalarType(),
+                       LoadOps.size() * NewVT.getVectorNumElements());
+  SDValue ConcatVectors =
+      DAG.getNode(ISD::CONCAT_VECTORS, DL, ConcatVT, LoadOps);
+  // Extract the original vector type size.
+  SDValue ExtractSubVector =
+      DAG.getNode(ISD::EXTRACT_SUBVECTOR, DL, MemVT,
+                  {ConcatVectors, DAG.getVectorIdxConstant(0, DL)});
+  SDValue TokenFactor =
+      DAG.getNode(ISD::TokenFactor, DL, MVT::Other, LoadOpsChain);
+  return DAG.getMergeValues({ExtractSubVector, TokenFactor}, DL);
+}
+
 static SDValue performSTORECombine(SDNode *N,
                                    TargetLowering::DAGCombinerInfo &DCI,
                                    SelectionDAG &DAG,
                                    const AArch64Subtarget *Subtarget) {
+  StoreSDNode *ST = cast<StoreSDNode>(N);
+  SDValue Chain = ST->getChain();
+  SDValue Value = ST->getValue();
+  SDValue Ptr = ST->getBasePtr();
+  EVT ValueVT = Value.getValueType();
+
+  auto hasValidElementTypeForFPTruncStore = [](EVT VT) {
+    EVT EltVT = VT.getVectorElementType();
+    return EltVT == MVT::f32 || EltVT == MVT::f64;
+  };
+
+  // If this is an FP_ROUND followed by a store, fold this into a truncating
+  // store. We can do this even if this is already a truncstore.
+  // We purposefully don't care about legality of the nodes here as we know
+  // they can be split down into something legal.
+  if (DCI.isBeforeLegalizeOps() && Value.getOpcode() == ISD::FP_ROUND &&
+      Value.getNode()->hasOneUse() && ST->isUnindexed() &&
+      Subtarget->useSVEForFixedLengthVectors() &&
+      ValueVT.isFixedLengthVector() &&
+      ValueVT.getFixedSizeInBits() >= Subtarget->getMinSVEVectorSizeInBits() &&
+      hasValidElementTypeForFPTruncStore(Value.getOperand(0).getValueType()))
+    return DAG.getTruncStore(Chain, SDLoc(N), Value.getOperand(0), Ptr,
+                             ST->getMemoryVT(), ST->getMemOperand());
+
   if (SDValue Split = splitStores(N, DCI, DAG, Subtarget))
     return Split;
 
@@ -15268,6 +19357,207 @@ static SDValue performSTORECombine(SDNode *N,
   return SDValue();
 }
 
+static SDValue performMSTORECombine(SDNode *N,
+                                    TargetLowering::DAGCombinerInfo &DCI,
+                                    SelectionDAG &DAG,
+                                    const AArch64Subtarget *Subtarget) {
+  MaskedStoreSDNode *MST = cast<MaskedStoreSDNode>(N);
+  SDValue Value = MST->getValue();
+  SDValue Mask = MST->getMask();
+  SDLoc DL(N);
+
+  // If this is a UZP1 followed by a masked store, fold this into a masked
+  // truncating store.  We can do this even if this is already a masked
+  // truncstore.
+  if (Value.getOpcode() == AArch64ISD::UZP1 && Value->hasOneUse() &&
+      MST->isUnindexed() && Mask->getOpcode() == AArch64ISD::PTRUE &&
+      Value.getValueType().isInteger()) {
+    Value = Value.getOperand(0);
+    if (Value.getOpcode() == ISD::BITCAST) {
+      EVT HalfVT =
+          Value.getValueType().getHalfNumVectorElementsVT(*DAG.getContext());
+      EVT InVT = Value.getOperand(0).getValueType();
+
+      if (HalfVT.widenIntegerVectorElementType(*DAG.getContext()) == InVT) {
+        unsigned MinSVESize = Subtarget->getMinSVEVectorSizeInBits();
+        unsigned PgPattern = Mask->getConstantOperandVal(0);
+
+        // Ensure we can double the size of the predicate pattern
+        unsigned NumElts = getNumElementsFromSVEPredPattern(PgPattern);
+        if (NumElts && NumElts * InVT.getVectorElementType().getSizeInBits() <=
+                           MinSVESize) {
+          Mask = getPTrue(DAG, DL, InVT.changeVectorElementType(MVT::i1),
+                          PgPattern);
+          return DAG.getMaskedStore(MST->getChain(), DL, Value.getOperand(0),
+                                    MST->getBasePtr(), MST->getOffset(), Mask,
+                                    MST->getMemoryVT(), MST->getMemOperand(),
+                                    MST->getAddressingMode(),
+                                    /*IsTruncating=*/true);
+        }
+      }
+    }
+  }
+
+  return SDValue();
+}
+
+/// \return true if part of the index was folded into the Base.
+static bool foldIndexIntoBase(SDValue &BasePtr, SDValue &Index, SDValue Scale,
+                              SDLoc DL, SelectionDAG &DAG) {
+  // This function assumes a vector of i64 indices.
+  EVT IndexVT = Index.getValueType();
+  if (!IndexVT.isVector() || IndexVT.getVectorElementType() != MVT::i64)
+    return false;
+
+  // Simplify:
+  //   BasePtr = Ptr
+  //   Index = X + splat(Offset)
+  // ->
+  //   BasePtr = Ptr + Offset * scale.
+  //   Index = X
+  if (Index.getOpcode() == ISD::ADD) {
+    if (auto Offset = DAG.getSplatValue(Index.getOperand(1))) {
+      Offset = DAG.getNode(ISD::MUL, DL, MVT::i64, Offset, Scale);
+      BasePtr = DAG.getNode(ISD::ADD, DL, MVT::i64, BasePtr, Offset);
+      Index = Index.getOperand(0);
+      return true;
+    }
+  }
+
+  // Simplify:
+  //   BasePtr = Ptr
+  //   Index = (X + splat(Offset)) << splat(Shift)
+  // ->
+  //   BasePtr = Ptr + (Offset << Shift) * scale)
+  //   Index = X << splat(shift)
+  if (Index.getOpcode() == ISD::SHL &&
+      Index.getOperand(0).getOpcode() == ISD::ADD) {
+    SDValue Add = Index.getOperand(0);
+    SDValue ShiftOp = Index.getOperand(1);
+    SDValue OffsetOp = Add.getOperand(1);
+    if (auto Shift = DAG.getSplatValue(ShiftOp))
+      if (auto Offset = DAG.getSplatValue(OffsetOp)) {
+        Offset = DAG.getNode(ISD::SHL, DL, MVT::i64, Offset, Shift);
+        Offset = DAG.getNode(ISD::MUL, DL, MVT::i64, Offset, Scale);
+        BasePtr = DAG.getNode(ISD::ADD, DL, MVT::i64, BasePtr, Offset);
+        Index = DAG.getNode(ISD::SHL, DL, Index.getValueType(),
+                            Add.getOperand(0), ShiftOp);
+        return true;
+      }
+  }
+
+  return false;
+}
+
+// Analyse the specified address returning true if a more optimal addressing
+// mode is available. When returning true all parameters are updated to reflect
+// their recommended values.
+static bool findMoreOptimalIndexType(const MaskedGatherScatterSDNode *N,
+                                     SDValue &BasePtr, SDValue &Index,
+                                     SelectionDAG &DAG) {
+  // Try to iteratively fold parts of the index into the base pointer to
+  // simplify the index as much as possible.
+  bool Changed = false;
+  while (foldIndexIntoBase(BasePtr, Index, N->getScale(), SDLoc(N), DAG))
+    Changed = true;
+
+  // Only consider element types that are pointer sized as smaller types can
+  // be easily promoted.
+  EVT IndexVT = Index.getValueType();
+  if (IndexVT.getVectorElementType() != MVT::i64 || IndexVT == MVT::nxv2i64)
+    return Changed;
+
+  // Can indices be trivially shrunk?
+  EVT DataVT = N->getOperand(1).getValueType();
+  // Don't attempt to shrink the index for fixed vectors of 64 bit data since it
+  // will later be re-extended to 64 bits in legalization
+  if (DataVT.isFixedLengthVector() && DataVT.getScalarSizeInBits() == 64)
+    return Changed;
+  if (ISD::isVectorShrinkable(Index.getNode(), 32, N->isIndexSigned())) {
+    EVT NewIndexVT = IndexVT.changeVectorElementType(MVT::i32);
+    Index = DAG.getNode(ISD::TRUNCATE, SDLoc(N), NewIndexVT, Index);
+    return true;
+  }
+
+  // Match:
+  //   Index = step(const)
+  int64_t Stride = 0;
+  if (Index.getOpcode() == ISD::STEP_VECTOR) {
+    Stride = cast<ConstantSDNode>(Index.getOperand(0))->getSExtValue();
+  }
+  // Match:
+  //   Index = step(const) << shift(const)
+  else if (Index.getOpcode() == ISD::SHL &&
+           Index.getOperand(0).getOpcode() == ISD::STEP_VECTOR) {
+    SDValue RHS = Index.getOperand(1);
+    if (auto *Shift =
+            dyn_cast_or_null<ConstantSDNode>(DAG.getSplatValue(RHS))) {
+      int64_t Step = (int64_t)Index.getOperand(0).getConstantOperandVal(1);
+      Stride = Step << Shift->getZExtValue();
+    }
+  }
+
+  // Return early because no supported pattern is found.
+  if (Stride == 0)
+    return Changed;
+
+  if (Stride < std::numeric_limits<int32_t>::min() ||
+      Stride > std::numeric_limits<int32_t>::max())
+    return Changed;
+
+  const auto &Subtarget = DAG.getSubtarget<AArch64Subtarget>();
+  unsigned MaxVScale =
+      Subtarget.getMaxSVEVectorSizeInBits() / AArch64::SVEBitsPerBlock;
+  int64_t LastElementOffset =
+      IndexVT.getVectorMinNumElements() * Stride * MaxVScale;
+
+  if (LastElementOffset < std::numeric_limits<int32_t>::min() ||
+      LastElementOffset > std::numeric_limits<int32_t>::max())
+    return Changed;
+
+  EVT NewIndexVT = IndexVT.changeVectorElementType(MVT::i32);
+  // Stride does not scale explicitly by 'Scale', because it happens in
+  // the gather/scatter addressing mode.
+  Index = DAG.getStepVector(SDLoc(N), NewIndexVT, APInt(32, Stride));
+  return true;
+}
+
+static SDValue performMaskedGatherScatterCombine(
+    SDNode *N, TargetLowering::DAGCombinerInfo &DCI, SelectionDAG &DAG) {
+  MaskedGatherScatterSDNode *MGS = cast<MaskedGatherScatterSDNode>(N);
+  assert(MGS && "Can only combine gather load or scatter store nodes");
+
+  if (!DCI.isBeforeLegalize())
+    return SDValue();
+
+  SDLoc DL(MGS);
+  SDValue Chain = MGS->getChain();
+  SDValue Scale = MGS->getScale();
+  SDValue Index = MGS->getIndex();
+  SDValue Mask = MGS->getMask();
+  SDValue BasePtr = MGS->getBasePtr();
+  ISD::MemIndexType IndexType = MGS->getIndexType();
+
+  if (!findMoreOptimalIndexType(MGS, BasePtr, Index, DAG))
+    return SDValue();
+
+  // Here we catch such cases early and change MGATHER's IndexType to allow
+  // the use of an Index that's more legalisation friendly.
+  if (auto *MGT = dyn_cast<MaskedGatherSDNode>(MGS)) {
+    SDValue PassThru = MGT->getPassThru();
+    SDValue Ops[] = {Chain, PassThru, Mask, BasePtr, Index, Scale};
+    return DAG.getMaskedGather(
+        DAG.getVTList(N->getValueType(0), MVT::Other), MGT->getMemoryVT(), DL,
+        Ops, MGT->getMemOperand(), IndexType, MGT->getExtensionType());
+  }
+  auto *MSC = cast<MaskedScatterSDNode>(MGS);
+  SDValue Data = MSC->getValue();
+  SDValue Ops[] = {Chain, Data, Mask, BasePtr, Index, Scale};
+  return DAG.getMaskedScatter(DAG.getVTList(MVT::Other), MSC->getMemoryVT(), DL,
+                              Ops, MSC->getMemOperand(), IndexType,
+                              MSC->isTruncatingStore());
+}
+
 /// Target-specific DAG combine function for NEON load/store intrinsics
 /// to merge base address updates.
 static SDValue performNEONPostLDSTCombine(SDNode *N,
@@ -15385,7 +19675,7 @@ static SDValue performNEONPostLDSTCombine(SDNode *N,
       Tys[n] = VecTy;
     Tys[n++] = MVT::i64;  // Type of write back register
     Tys[n] = MVT::Other;  // Type of the chain
-    SDVTList SDTys = DAG.getVTList(makeArrayRef(Tys, NumResultVecs + 2));
+    SDVTList SDTys = DAG.getVTList(ArrayRef(Tys, NumResultVecs + 2));
 
     MemIntrinsicSDNode *MemInt = cast<MemIntrinsicSDNode>(N);
     SDValue UpdN = DAG.getMemIntrinsicNode(NewOpc, SDLoc(N), SDTys, Ops,
@@ -15587,6 +19877,54 @@ static bool isEquivalentMaskless(unsigned CC, unsigned width,
   return false;
 }
 
+// (X & C) >u Mask --> (X & (C & (~Mask)) != 0
+// (X & C) <u Pow2 --> (X & (C & ~(Pow2-1)) == 0
+static SDValue performSubsToAndsCombine(SDNode *N, SDNode *SubsNode,
+                                        SDNode *AndNode, SelectionDAG &DAG,
+                                        unsigned CCIndex, unsigned CmpIndex,
+                                        unsigned CC) {
+  ConstantSDNode *SubsC = dyn_cast<ConstantSDNode>(SubsNode->getOperand(1));
+  if (!SubsC)
+    return SDValue();
+
+  APInt SubsAP = SubsC->getAPIntValue();
+  if (CC == AArch64CC::HI) {
+    if (!SubsAP.isMask())
+      return SDValue();
+  } else if (CC == AArch64CC::LO) {
+    if (!SubsAP.isPowerOf2())
+      return SDValue();
+  } else
+    return SDValue();
+
+  ConstantSDNode *AndC = dyn_cast<ConstantSDNode>(AndNode->getOperand(1));
+  if (!AndC)
+    return SDValue();
+
+  APInt MaskAP = CC == AArch64CC::HI ? SubsAP : (SubsAP - 1);
+
+  SDLoc DL(N);
+  APInt AndSMask = (~MaskAP) & AndC->getAPIntValue();
+  SDValue ANDS = DAG.getNode(
+      AArch64ISD::ANDS, DL, SubsNode->getVTList(), AndNode->getOperand(0),
+      DAG.getConstant(AndSMask, DL, SubsC->getValueType(0)));
+  SDValue AArch64_CC =
+      DAG.getConstant(CC == AArch64CC::HI ? AArch64CC::NE : AArch64CC::EQ, DL,
+                      N->getOperand(CCIndex)->getValueType(0));
+
+  // For now, only performCSELCombine and performBRCONDCombine call this
+  // function. And both of them pass 2 for CCIndex, 3 for CmpIndex with 4
+  // operands. So just init the ops direct to simplify the code. If we have some
+  // other case with different CCIndex, CmpIndex, we need to use for loop to
+  // rewrite the code here.
+  // TODO: Do we need to assert number of operand is 4 here?
+  assert((CCIndex == 2 && CmpIndex == 3) &&
+         "Expected CCIndex to be 2 and CmpIndex to be 3.");
+  SDValue Ops[] = {N->getOperand(0), N->getOperand(1), AArch64_CC,
+                   ANDS.getValue(1)};
+  return DAG.getNode(N->getOpcode(), N, N->getVTList(), Ops);
+}
+
 static
 SDValue performCONDCombine(SDNode *N,
                            TargetLowering::DAGCombinerInfo &DCI,
@@ -15596,7 +19934,7 @@ SDValue performCONDCombine(SDNode *N,
   SDNode *SubsNode = N->getOperand(CmpIndex).getNode();
   unsigned CondOpcode = SubsNode->getOpcode();
 
-  if (CondOpcode != AArch64ISD::SUBS)
+  if (CondOpcode != AArch64ISD::SUBS || SubsNode->hasAnyUseOfValue(0))
     return SDValue();
 
   // There is a SUBS feeding this condition. Is it fed by a mask we can
@@ -15608,6 +19946,10 @@ SDValue performCONDCombine(SDNode *N,
   if (AndNode->getOpcode() != ISD::AND)
     return SDValue();
 
+  if (SDValue Val = performSubsToAndsCombine(N, SubsNode, AndNode, DAG, CCIndex,
+                                             CmpIndex, CC))
+    return Val;
+
   if (ConstantSDNode *CN = dyn_cast<ConstantSDNode>(AndNode->getOperand(1))) {
     uint32_t CNV = CN->getZExtValue();
     if (CNV == 255)
@@ -15724,6 +20066,107 @@ static SDValue performBRCONDCombine(SDNode *N,
   return SDValue();
 }
 
+static SDValue foldCSELofCTTZ(SDNode *N, SelectionDAG &DAG) {
+  unsigned CC = N->getConstantOperandVal(2);
+  SDValue SUBS = N->getOperand(3);
+  SDValue Zero, CTTZ;
+
+  if (CC == AArch64CC::EQ && SUBS.getOpcode() == AArch64ISD::SUBS) {
+    Zero = N->getOperand(0);
+    CTTZ = N->getOperand(1);
+  } else if (CC == AArch64CC::NE && SUBS.getOpcode() == AArch64ISD::SUBS) {
+    Zero = N->getOperand(1);
+    CTTZ = N->getOperand(0);
+  } else
+    return SDValue();
+
+  if ((CTTZ.getOpcode() != ISD::CTTZ && CTTZ.getOpcode() != ISD::TRUNCATE) ||
+      (CTTZ.getOpcode() == ISD::TRUNCATE &&
+       CTTZ.getOperand(0).getOpcode() != ISD::CTTZ))
+    return SDValue();
+
+  assert((CTTZ.getValueType() == MVT::i32 || CTTZ.getValueType() == MVT::i64) &&
+         "Illegal type in CTTZ folding");
+
+  if (!isNullConstant(Zero) || !isNullConstant(SUBS.getOperand(1)))
+    return SDValue();
+
+  SDValue X = CTTZ.getOpcode() == ISD::TRUNCATE
+                  ? CTTZ.getOperand(0).getOperand(0)
+                  : CTTZ.getOperand(0);
+
+  if (X != SUBS.getOperand(0))
+    return SDValue();
+
+  unsigned BitWidth = CTTZ.getOpcode() == ISD::TRUNCATE
+                          ? CTTZ.getOperand(0).getValueSizeInBits()
+                          : CTTZ.getValueSizeInBits();
+  SDValue BitWidthMinusOne =
+      DAG.getConstant(BitWidth - 1, SDLoc(N), CTTZ.getValueType());
+  return DAG.getNode(ISD::AND, SDLoc(N), CTTZ.getValueType(), CTTZ,
+                     BitWidthMinusOne);
+}
+
+// (CSEL l r EQ (CMP (CSEL x y cc2 cond) x)) => (CSEL l r cc2 cond)
+// (CSEL l r EQ (CMP (CSEL x y cc2 cond) y)) => (CSEL l r !cc2 cond)
+// Where x and y are constants and x != y
+
+// (CSEL l r NE (CMP (CSEL x y cc2 cond) x)) => (CSEL l r !cc2 cond)
+// (CSEL l r NE (CMP (CSEL x y cc2 cond) y)) => (CSEL l r cc2 cond)
+// Where x and y are constants and x != y
+static SDValue foldCSELOfCSEL(SDNode *Op, SelectionDAG &DAG) {
+  SDValue L = Op->getOperand(0);
+  SDValue R = Op->getOperand(1);
+  AArch64CC::CondCode OpCC =
+      static_cast<AArch64CC::CondCode>(Op->getConstantOperandVal(2));
+
+  SDValue OpCmp = Op->getOperand(3);
+  if (!isCMP(OpCmp))
+    return SDValue();
+
+  SDValue CmpLHS = OpCmp.getOperand(0);
+  SDValue CmpRHS = OpCmp.getOperand(1);
+
+  if (CmpRHS.getOpcode() == AArch64ISD::CSEL)
+    std::swap(CmpLHS, CmpRHS);
+  else if (CmpLHS.getOpcode() != AArch64ISD::CSEL)
+    return SDValue();
+
+  SDValue X = CmpLHS->getOperand(0);
+  SDValue Y = CmpLHS->getOperand(1);
+  if (!isa<ConstantSDNode>(X) || !isa<ConstantSDNode>(Y) || X == Y) {
+    return SDValue();
+  }
+
+  // If one of the constant is opaque constant, x,y sdnode is still different
+  // but the real value maybe the same. So check APInt here to make sure the
+  // code is correct.
+  ConstantSDNode *CX = cast<ConstantSDNode>(X);
+  ConstantSDNode *CY = cast<ConstantSDNode>(Y);
+  if (CX->getAPIntValue() == CY->getAPIntValue())
+    return SDValue();
+
+  AArch64CC::CondCode CC =
+      static_cast<AArch64CC::CondCode>(CmpLHS->getConstantOperandVal(2));
+  SDValue Cond = CmpLHS->getOperand(3);
+
+  if (CmpRHS == Y)
+    CC = AArch64CC::getInvertedCondCode(CC);
+  else if (CmpRHS != X)
+    return SDValue();
+
+  if (OpCC == AArch64CC::NE)
+    CC = AArch64CC::getInvertedCondCode(CC);
+  else if (OpCC != AArch64CC::EQ)
+    return SDValue();
+
+  SDLoc DL(Op);
+  EVT VT = Op->getValueType(0);
+
+  SDValue CCValue = DAG.getConstant(CC, DL, MVT::i32);
+  return DAG.getNode(AArch64ISD::CSEL, DL, VT, L, R, CCValue, Cond);
+}
+
 // Optimize CSEL instructions
 static SDValue performCSELCombine(SDNode *N,
                                   TargetLowering::DAGCombinerInfo &DCI,
@@ -15732,22 +20175,83 @@ static SDValue performCSELCombine(SDNode *N,
   if (N->getOperand(0) == N->getOperand(1))
     return N->getOperand(0);
 
+  if (SDValue R = foldCSELOfCSEL(N, DAG))
+    return R;
+
+  // CSEL 0, cttz(X), eq(X, 0) -> AND cttz bitwidth-1
+  // CSEL cttz(X), 0, ne(X, 0) -> AND cttz bitwidth-1
+  if (SDValue Folded = foldCSELofCTTZ(N, DAG))
+		return Folded;
+
   return performCONDCombine(N, DCI, DAG, 2, 3);
 }
 
-static SDValue performSETCCCombine(SDNode *N, SelectionDAG &DAG) {
+// Try to re-use an already extended operand of a vector SetCC feeding a
+// extended select. Doing so avoids requiring another full extension of the
+// SET_CC result when lowering the select.
+static SDValue tryToWidenSetCCOperands(SDNode *Op, SelectionDAG &DAG) {
+  EVT Op0MVT = Op->getOperand(0).getValueType();
+  if (!Op0MVT.isVector() || Op->use_empty())
+    return SDValue();
+
+  // Make sure that all uses of Op are VSELECTs with result matching types where
+  // the result type has a larger element type than the SetCC operand.
+  SDNode *FirstUse = *Op->use_begin();
+  if (FirstUse->getOpcode() != ISD::VSELECT)
+    return SDValue();
+  EVT UseMVT = FirstUse->getValueType(0);
+  if (UseMVT.getScalarSizeInBits() <= Op0MVT.getScalarSizeInBits())
+    return SDValue();
+  if (any_of(Op->uses(), [&UseMVT](const SDNode *N) {
+        return N->getOpcode() != ISD::VSELECT || N->getValueType(0) != UseMVT;
+      }))
+    return SDValue();
+
+  APInt V;
+  if (!ISD::isConstantSplatVector(Op->getOperand(1).getNode(), V))
+    return SDValue();
+
+  SDLoc DL(Op);
+  SDValue Op0ExtV;
+  SDValue Op1ExtV;
+  ISD::CondCode CC = cast<CondCodeSDNode>(Op->getOperand(2))->get();
+  // Check if the first operand of the SET_CC is already extended. If it is,
+  // split the SET_CC and re-use the extended version of the operand.
+  SDNode *Op0SExt = DAG.getNodeIfExists(ISD::SIGN_EXTEND, DAG.getVTList(UseMVT),
+                                        Op->getOperand(0));
+  SDNode *Op0ZExt = DAG.getNodeIfExists(ISD::ZERO_EXTEND, DAG.getVTList(UseMVT),
+                                        Op->getOperand(0));
+  if (Op0SExt && (isSignedIntSetCC(CC) || isIntEqualitySetCC(CC))) {
+    Op0ExtV = SDValue(Op0SExt, 0);
+    Op1ExtV = DAG.getNode(ISD::SIGN_EXTEND, DL, UseMVT, Op->getOperand(1));
+  } else if (Op0ZExt && (isUnsignedIntSetCC(CC) || isIntEqualitySetCC(CC))) {
+    Op0ExtV = SDValue(Op0ZExt, 0);
+    Op1ExtV = DAG.getNode(ISD::ZERO_EXTEND, DL, UseMVT, Op->getOperand(1));
+  } else
+    return SDValue();
+
+  return DAG.getNode(ISD::SETCC, DL, UseMVT.changeVectorElementType(MVT::i1),
+                     Op0ExtV, Op1ExtV, Op->getOperand(2));
+}
+
+static SDValue performSETCCCombine(SDNode *N,
+                                   TargetLowering::DAGCombinerInfo &DCI,
+                                   SelectionDAG &DAG) {
   assert(N->getOpcode() == ISD::SETCC && "Unexpected opcode!");
   SDValue LHS = N->getOperand(0);
   SDValue RHS = N->getOperand(1);
   ISD::CondCode Cond = cast<CondCodeSDNode>(N->getOperand(2))->get();
+  SDLoc DL(N);
+  EVT VT = N->getValueType(0);
+
+  if (SDValue V = tryToWidenSetCCOperands(N, DAG))
+    return V;
 
   // setcc (csel 0, 1, cond, X), 1, ne ==> csel 0, 1, !cond, X
   if (Cond == ISD::SETNE && isOneConstant(RHS) &&
       LHS->getOpcode() == AArch64ISD::CSEL &&
       isNullConstant(LHS->getOperand(0)) && isOneConstant(LHS->getOperand(1)) &&
       LHS->hasOneUse()) {
-    SDLoc DL(N);
-
     // Invert CSEL's condition.
     auto *OpCC = cast<ConstantSDNode>(LHS.getOperand(2));
     auto OldCond = static_cast<AArch64CC::CondCode>(OpCC->getZExtValue());
@@ -15758,29 +20262,147 @@ static SDValue performSETCCCombine(SDNode *N, SelectionDAG &DAG) {
         DAG.getNode(AArch64ISD::CSEL, DL, LHS.getValueType(), LHS.getOperand(0),
                     LHS.getOperand(1), DAG.getConstant(NewCond, DL, MVT::i32),
                     LHS.getOperand(3));
-    return DAG.getZExtOrTrunc(CSEL, DL, N->getValueType(0));
+    return DAG.getZExtOrTrunc(CSEL, DL, VT);
+  }
+
+  // setcc (srl x, imm), 0, ne ==> setcc (and x, (-1 << imm)), 0, ne
+  if (Cond == ISD::SETNE && isNullConstant(RHS) &&
+      LHS->getOpcode() == ISD::SRL && isa<ConstantSDNode>(LHS->getOperand(1)) &&
+      LHS->hasOneUse()) {
+    EVT TstVT = LHS->getValueType(0);
+    if (TstVT.isScalarInteger() && TstVT.getFixedSizeInBits() <= 64) {
+      // this pattern will get better opt in emitComparison
+      uint64_t TstImm = -1ULL << LHS->getConstantOperandVal(1);
+      SDValue TST = DAG.getNode(ISD::AND, DL, TstVT, LHS->getOperand(0),
+                                DAG.getConstant(TstImm, DL, TstVT));
+      return DAG.getNode(ISD::SETCC, DL, VT, TST, RHS, N->getOperand(2));
+    }
+  }
+
+  // setcc (iN (bitcast (vNi1 X))), 0, (eq|ne)
+  //   ==> setcc (iN (zext (i1 (vecreduce_or (vNi1 X))))), 0, (eq|ne)
+  if (DCI.isBeforeLegalize() && VT.isScalarInteger() &&
+      (Cond == ISD::SETEQ || Cond == ISD::SETNE) && isNullConstant(RHS) &&
+      LHS->getOpcode() == ISD::BITCAST) {
+    EVT ToVT = LHS->getValueType(0);
+    EVT FromVT = LHS->getOperand(0).getValueType();
+    if (FromVT.isFixedLengthVector() &&
+        FromVT.getVectorElementType() == MVT::i1) {
+      LHS = DAG.getNode(ISD::VECREDUCE_OR, DL, MVT::i1, LHS->getOperand(0));
+      LHS = DAG.getNode(ISD::ZERO_EXTEND, DL, ToVT, LHS);
+      return DAG.getSetCC(DL, VT, LHS, RHS, Cond);
+    }
+  }
+
+  // Try to perform the memcmp when the result is tested for [in]equality with 0
+  if (SDValue V = performOrXorChainCombine(N, DAG))
+    return V;
+
+  return SDValue();
+}
+
+// Replace a flag-setting operator (eg ANDS) with the generic version
+// (eg AND) if the flag is unused.
+static SDValue performFlagSettingCombine(SDNode *N,
+                                         TargetLowering::DAGCombinerInfo &DCI,
+                                         unsigned GenericOpcode) {
+  SDLoc DL(N);
+  SDValue LHS = N->getOperand(0);
+  SDValue RHS = N->getOperand(1);
+  EVT VT = N->getValueType(0);
+
+  // If the flag result isn't used, convert back to a generic opcode.
+  if (!N->hasAnyUseOfValue(1)) {
+    SDValue Res = DCI.DAG.getNode(GenericOpcode, DL, VT, N->ops());
+    return DCI.DAG.getMergeValues({Res, DCI.DAG.getConstant(0, DL, MVT::i32)},
+                                  DL);
   }
 
+  // Combine identical generic nodes into this node, re-using the result.
+  if (SDNode *Generic = DCI.DAG.getNodeIfExists(
+          GenericOpcode, DCI.DAG.getVTList(VT), {LHS, RHS}))
+    DCI.CombineTo(Generic, SDValue(N, 0));
+
+  return SDValue();
+}
+
+static SDValue performSetCCPunpkCombine(SDNode *N, SelectionDAG &DAG) {
+  // setcc_merge_zero pred
+  //   (sign_extend (extract_subvector (setcc_merge_zero ... pred ...))), 0, ne
+  //   => extract_subvector (inner setcc_merge_zero)
+  SDValue Pred = N->getOperand(0);
+  SDValue LHS = N->getOperand(1);
+  SDValue RHS = N->getOperand(2);
+  ISD::CondCode Cond = cast<CondCodeSDNode>(N->getOperand(3))->get();
+
+  if (Cond != ISD::SETNE || !isZerosVector(RHS.getNode()) ||
+      LHS->getOpcode() != ISD::SIGN_EXTEND)
+    return SDValue();
+
+  SDValue Extract = LHS->getOperand(0);
+  if (Extract->getOpcode() != ISD::EXTRACT_SUBVECTOR ||
+      Extract->getValueType(0) != N->getValueType(0) ||
+      Extract->getConstantOperandVal(1) != 0)
+    return SDValue();
+
+  SDValue InnerSetCC = Extract->getOperand(0);
+  if (InnerSetCC->getOpcode() != AArch64ISD::SETCC_MERGE_ZERO)
+    return SDValue();
+
+  // By this point we've effectively got
+  // zero_inactive_lanes_and_trunc_i1(sext_i1(A)). If we can prove A's inactive
+  // lanes are already zero then the trunc(sext()) sequence is redundant and we
+  // can operate on A directly.
+  SDValue InnerPred = InnerSetCC.getOperand(0);
+  if (Pred.getOpcode() == AArch64ISD::PTRUE &&
+      InnerPred.getOpcode() == AArch64ISD::PTRUE &&
+      Pred.getConstantOperandVal(0) == InnerPred.getConstantOperandVal(0) &&
+      Pred->getConstantOperandVal(0) >= AArch64SVEPredPattern::vl1 &&
+      Pred->getConstantOperandVal(0) <= AArch64SVEPredPattern::vl256)
+    return Extract;
+
   return SDValue();
 }
 
-static SDValue performSetccMergeZeroCombine(SDNode *N, SelectionDAG &DAG) {
+static SDValue
+performSetccMergeZeroCombine(SDNode *N, TargetLowering::DAGCombinerInfo &DCI) {
   assert(N->getOpcode() == AArch64ISD::SETCC_MERGE_ZERO &&
          "Unexpected opcode!");
 
+  SelectionDAG &DAG = DCI.DAG;
   SDValue Pred = N->getOperand(0);
   SDValue LHS = N->getOperand(1);
   SDValue RHS = N->getOperand(2);
   ISD::CondCode Cond = cast<CondCodeSDNode>(N->getOperand(3))->get();
 
-  // setcc_merge_zero pred (sign_extend (setcc_merge_zero ... pred ...)), 0, ne
-  //    => inner setcc_merge_zero
+  if (SDValue V = performSetCCPunpkCombine(N, DAG))
+    return V;
+
   if (Cond == ISD::SETNE && isZerosVector(RHS.getNode()) &&
       LHS->getOpcode() == ISD::SIGN_EXTEND &&
-      LHS->getOperand(0)->getValueType(0) == N->getValueType(0) &&
-      LHS->getOperand(0)->getOpcode() == AArch64ISD::SETCC_MERGE_ZERO &&
-      LHS->getOperand(0)->getOperand(0) == Pred)
-    return LHS->getOperand(0);
+      LHS->getOperand(0)->getValueType(0) == N->getValueType(0)) {
+    //    setcc_merge_zero(
+    //       pred, extend(setcc_merge_zero(pred, ...)), != splat(0))
+    // => setcc_merge_zero(pred, ...)
+    if (LHS->getOperand(0)->getOpcode() == AArch64ISD::SETCC_MERGE_ZERO &&
+        LHS->getOperand(0)->getOperand(0) == Pred)
+      return LHS->getOperand(0);
+
+    //    setcc_merge_zero(
+    //        all_active, extend(nxvNi1 ...), != splat(0))
+    // -> nxvNi1 ...
+    if (isAllActivePredicate(DAG, Pred))
+      return LHS->getOperand(0);
+
+    //    setcc_merge_zero(
+    //        pred, extend(nxvNi1 ...), != splat(0))
+    // -> nxvNi1 and(pred, ...)
+    if (DCI.isAfterLegalizeDAG())
+      // Do this after legalization to allow more folds on setcc_merge_zero
+      // to be recognized.
+      return DAG.getNode(ISD::AND, SDLoc(N), N->getValueType(0),
+                         LHS->getOperand(0), Pred);
+  }
 
   return SDValue();
 }
@@ -15888,15 +20510,62 @@ static SDValue performTBZCombine(SDNode *N,
                      DAG.getConstant(Bit, DL, MVT::i64), N->getOperand(3));
 }
 
+// Swap vselect operands where it may allow a predicated operation to achieve
+// the `sel`.
+//
+//     (vselect (setcc ( condcode) (_) (_)) (a)          (op (a) (b)))
+//  => (vselect (setcc (!condcode) (_) (_)) (op (a) (b)) (a))
+static SDValue trySwapVSelectOperands(SDNode *N, SelectionDAG &DAG) {
+  auto SelectA = N->getOperand(1);
+  auto SelectB = N->getOperand(2);
+  auto NTy = N->getValueType(0);
+
+  if (!NTy.isScalableVector())
+    return SDValue();
+  SDValue SetCC = N->getOperand(0);
+  if (SetCC.getOpcode() != ISD::SETCC || !SetCC.hasOneUse())
+    return SDValue();
+
+  switch (SelectB.getOpcode()) {
+  default:
+    return SDValue();
+  case ISD::FMUL:
+  case ISD::FSUB:
+  case ISD::FADD:
+    break;
+  }
+  if (SelectA != SelectB.getOperand(0))
+    return SDValue();
+
+  ISD::CondCode CC = cast<CondCodeSDNode>(SetCC.getOperand(2))->get();
+  ISD::CondCode InverseCC =
+      ISD::getSetCCInverse(CC, SetCC.getOperand(0).getValueType());
+  auto InverseSetCC =
+      DAG.getSetCC(SDLoc(SetCC), SetCC.getValueType(), SetCC.getOperand(0),
+                   SetCC.getOperand(1), InverseCC);
+
+  return DAG.getNode(ISD::VSELECT, SDLoc(N), NTy,
+                     {InverseSetCC, SelectB, SelectA});
+}
+
 // vselect (v1i1 setcc) ->
 //     vselect (v1iXX setcc)  (XX is the size of the compared operand type)
 // FIXME: Currently the type legalizer can't handle VSELECT having v1i1 as
 // condition. If it can legalize "VSELECT v1i1" correctly, no need to combine
 // such VSELECT.
 static SDValue performVSelectCombine(SDNode *N, SelectionDAG &DAG) {
+  if (auto SwapResult = trySwapVSelectOperands(N, DAG))
+    return SwapResult;
+
   SDValue N0 = N->getOperand(0);
   EVT CCVT = N0.getValueType();
 
+  if (isAllActivePredicate(DAG, N0))
+    return N->getOperand(1);
+
+  if (isAllInactivePredicate(N0))
+    return N->getOperand(2);
+
   // Check for sign pattern (VSELECT setgt, iN lhs, -1, 1, -1) and transform
   // into (OR (ASR lhs, N-1), 1), which requires less instructions for the
   // supported types.
@@ -15911,12 +20580,11 @@ static SDValue performVSelectCombine(SDNode *N, SelectionDAG &DAG) {
     APInt SplatLHSVal;
     if (CmpLHS.getValueType() == N->getOperand(1).getValueType() &&
         VT.isSimple() &&
-        is_contained(
-            makeArrayRef({MVT::v8i8, MVT::v16i8, MVT::v4i16, MVT::v8i16,
-                          MVT::v2i32, MVT::v4i32, MVT::v2i64}),
-            VT.getSimpleVT().SimpleTy) &&
+        is_contained(ArrayRef({MVT::v8i8, MVT::v16i8, MVT::v4i16, MVT::v8i16,
+                               MVT::v2i32, MVT::v4i32, MVT::v2i64}),
+                     VT.getSimpleVT().SimpleTy) &&
         ISD::isConstantSplatVector(SplatLHS, SplatLHSVal) &&
-        SplatLHSVal.isOneValue() && ISD::isConstantSplatVectorAllOnes(CmpRHS) &&
+        SplatLHSVal.isOne() && ISD::isConstantSplatVectorAllOnes(CmpRHS) &&
         ISD::isConstantSplatVectorAllOnes(SplatRHS)) {
       unsigned NumElts = VT.getVectorNumElements();
       SmallVector<SDValue, 8> Ops(
@@ -16018,6 +20686,24 @@ static SDValue performSelectCombine(SDNode *N,
   return DAG.getSelect(DL, ResVT, Mask, N->getOperand(1), N->getOperand(2));
 }
 
+static SDValue performDUPCombine(SDNode *N,
+                                 TargetLowering::DAGCombinerInfo &DCI) {
+  EVT VT = N->getValueType(0);
+  // If "v2i32 DUP(x)" and "v4i32 DUP(x)" both exist, use an extract from the
+  // 128bit vector version.
+  if (VT.is64BitVector() && DCI.isAfterLegalizeDAG()) {
+    EVT LVT = VT.getDoubleNumVectorElementsVT(*DCI.DAG.getContext());
+    if (SDNode *LN = DCI.DAG.getNodeIfExists(
+            N->getOpcode(), DCI.DAG.getVTList(LVT), {N->getOperand(0)})) {
+      SDLoc DL(N);
+      return DCI.DAG.getNode(ISD::EXTRACT_SUBVECTOR, DL, VT, SDValue(LN, 0),
+                             DCI.DAG.getConstant(0, DL, MVT::i64));
+    }
+  }
+
+  return performPostLD1Combine(N, DCI, false);
+}
+
 /// Get rid of unnecessary NVCASTs (that don't change the type).
 static SDValue performNVCASTCombine(SDNode *N) {
   if (N->getValueType(0) == N->getOperand(0).getValueType())
@@ -16058,13 +20744,14 @@ static SDValue performGlobalAddressCombine(SDNode *N, SelectionDAG &DAG,
 
   // Check whether folding this offset is legal. It must not go out of bounds of
   // the referenced object to avoid violating the code model, and must be
-  // smaller than 2^21 because this is the largest offset expressible in all
-  // object formats.
+  // smaller than 2^20 because this is the largest offset expressible in all
+  // object formats. (The IMAGE_REL_ARM64_PAGEBASE_REL21 relocation in COFF
+  // stores an immediate signed 21 bit offset.)
   //
   // This check also prevents us from folding negative offsets, which will end
   // up being treated in the same way as large positive ones. They could also
   // cause code model violations, and aren't really common enough to matter.
-  if (Offset >= (1 << 21))
+  if (Offset >= (1 << 20))
     return SDValue();
 
   const GlobalValue *GV = GN->getGlobal();
@@ -16079,6 +20766,17 @@ static SDValue performGlobalAddressCombine(SDNode *N, SelectionDAG &DAG,
                      DAG.getConstant(MinOffset, DL, MVT::i64));
 }
 
+static SDValue performCTLZCombine(SDNode *N, SelectionDAG &DAG,
+                                  const AArch64Subtarget *Subtarget) {
+  SDValue BR = N->getOperand(0);
+  if (!Subtarget->hasCSSC() || BR.getOpcode() != ISD::BITREVERSE ||
+      !BR.getValueType().isScalarInteger())
+    return SDValue();
+
+  SDLoc DL(N);
+  return DAG.getNode(ISD::CTTZ, DL, BR.getValueType(), BR.getOperand(0));
+}
+
 // Turns the vector of indices into a vector of byte offstes by scaling Offset
 // by (BitWidth / 8).
 static SDValue getScaledOffsetForBitWidth(SelectionDAG &DAG, SDValue Offset,
@@ -16138,7 +20836,7 @@ static SDValue performScatterStoreCombine(SDNode *N, SelectionDAG &DAG,
   MVT SrcElVT = SrcVT.getVectorElementType().getSimpleVT();
 
   // Make sure that source data will fit into an SVE register
-  if (SrcVT.getSizeInBits().getKnownMinSize() > AArch64::SVEBitsPerBlock)
+  if (SrcVT.getSizeInBits().getKnownMinValue() > AArch64::SVEBitsPerBlock)
     return SDValue();
 
   // For FPs, ACLE only supports _packed_ single and double precision types.
@@ -16240,7 +20938,7 @@ static SDValue performGatherLoadCombine(SDNode *N, SelectionDAG &DAG,
   SDLoc DL(N);
 
   // Make sure that the loaded data will fit into an SVE register
-  if (RetVT.getSizeInBits().getKnownMinSize() > AArch64::SVEBitsPerBlock)
+  if (RetVT.getSizeInBits().getKnownMinValue() > AArch64::SVEBitsPerBlock)
     return SDValue();
 
   // Depending on the addressing mode, this is either a pointer or a vector of
@@ -16575,7 +21273,7 @@ performInsertVectorEltCombine(SDNode *N, TargetLowering::DAGCombinerInfo &DCI) {
   return performPostLD1Combine(N, DCI, true);
 }
 
-SDValue performSVESpliceCombine(SDNode *N, SelectionDAG &DAG) {
+static SDValue performSVESpliceCombine(SDNode *N, SelectionDAG &DAG) {
   EVT Ty = N->getValueType(0);
   if (Ty.isInteger())
     return SDValue();
@@ -16597,6 +21295,99 @@ SDValue performSVESpliceCombine(SDNode *N, SelectionDAG &DAG) {
   return DAG.getBitcast(Ty, Trunc);
 }
 
+static SDValue performFPExtendCombine(SDNode *N, SelectionDAG &DAG,
+                                      TargetLowering::DAGCombinerInfo &DCI,
+                                      const AArch64Subtarget *Subtarget) {
+  SDValue N0 = N->getOperand(0);
+  EVT VT = N->getValueType(0);
+
+  // If this is fp_round(fpextend), don't fold it, allow ourselves to be folded.
+  if (N->hasOneUse() && N->use_begin()->getOpcode() == ISD::FP_ROUND)
+    return SDValue();
+
+  auto hasValidElementTypeForFPExtLoad = [](EVT VT) {
+    EVT EltVT = VT.getVectorElementType();
+    return EltVT == MVT::f32 || EltVT == MVT::f64;
+  };
+
+  // fold (fpext (load x)) -> (fpext (fptrunc (extload x)))
+  // We purposefully don't care about legality of the nodes here as we know
+  // they can be split down into something legal.
+  if (DCI.isBeforeLegalizeOps() && ISD::isNormalLoad(N0.getNode()) &&
+      N0.hasOneUse() && Subtarget->useSVEForFixedLengthVectors() &&
+      VT.isFixedLengthVector() && hasValidElementTypeForFPExtLoad(VT) &&
+      VT.getFixedSizeInBits() >= Subtarget->getMinSVEVectorSizeInBits()) {
+    LoadSDNode *LN0 = cast<LoadSDNode>(N0);
+    SDValue ExtLoad = DAG.getExtLoad(ISD::EXTLOAD, SDLoc(N), VT,
+                                     LN0->getChain(), LN0->getBasePtr(),
+                                     N0.getValueType(), LN0->getMemOperand());
+    DCI.CombineTo(N, ExtLoad);
+    DCI.CombineTo(
+        N0.getNode(),
+        DAG.getNode(ISD::FP_ROUND, SDLoc(N0), N0.getValueType(), ExtLoad,
+                    DAG.getIntPtrConstant(1, SDLoc(N0), /*isTarget=*/true)),
+        ExtLoad.getValue(1));
+    return SDValue(N, 0); // Return N so it doesn't get rechecked!
+  }
+
+  return SDValue();
+}
+
+static SDValue performBSPExpandForSVE(SDNode *N, SelectionDAG &DAG,
+                                      const AArch64Subtarget *Subtarget) {
+  EVT VT = N->getValueType(0);
+
+  // Don't expand for NEON, SVE2 or SME
+  if (!VT.isScalableVector() || Subtarget->hasSVE2() || Subtarget->hasSME())
+    return SDValue();
+
+  SDLoc DL(N);
+
+  SDValue Mask = N->getOperand(0);
+  SDValue In1 = N->getOperand(1);
+  SDValue In2 = N->getOperand(2);
+
+  SDValue InvMask = DAG.getNOT(DL, Mask, VT);
+  SDValue Sel = DAG.getNode(ISD::AND, DL, VT, Mask, In1);
+  SDValue SelInv = DAG.getNode(ISD::AND, DL, VT, InvMask, In2);
+  return DAG.getNode(ISD::OR, DL, VT, Sel, SelInv);
+}
+
+static SDValue performDupLane128Combine(SDNode *N, SelectionDAG &DAG) {
+  EVT VT = N->getValueType(0);
+
+  SDValue Insert = N->getOperand(0);
+  if (Insert.getOpcode() != ISD::INSERT_SUBVECTOR)
+    return SDValue();
+
+  if (!Insert.getOperand(0).isUndef())
+    return SDValue();
+
+  uint64_t IdxInsert = Insert.getConstantOperandVal(2);
+  uint64_t IdxDupLane = N->getConstantOperandVal(1);
+  if (IdxInsert != 0 || IdxDupLane != 0)
+    return SDValue();
+
+  SDValue Bitcast = Insert.getOperand(1);
+  if (Bitcast.getOpcode() != ISD::BITCAST)
+    return SDValue();
+
+  SDValue Subvec = Bitcast.getOperand(0);
+  EVT SubvecVT = Subvec.getValueType();
+  if (!SubvecVT.is128BitVector())
+    return SDValue();
+  EVT NewSubvecVT =
+      getPackedSVEVectorVT(Subvec.getValueType().getVectorElementType());
+
+  SDLoc DL(N);
+  SDValue NewInsert =
+      DAG.getNode(ISD::INSERT_SUBVECTOR, DL, NewSubvecVT,
+                  DAG.getUNDEF(NewSubvecVT), Subvec, Insert->getOperand(2));
+  SDValue NewDuplane128 = DAG.getNode(AArch64ISD::DUPLANE128, DL, NewSubvecVT,
+                                      NewInsert, N->getOperand(1));
+  return DAG.getNode(ISD::BITCAST, DL, VT, NewDuplane128);
+}
+
 SDValue AArch64TargetLowering::PerformDAGCombine(SDNode *N,
                                                  DAGCombinerInfo &DCI) const {
   SelectionDAG &DAG = DCI.DAG;
@@ -16607,6 +21398,26 @@ SDValue AArch64TargetLowering::PerformDAGCombine(SDNode *N,
   case ISD::ADD:
   case ISD::SUB:
     return performAddSubCombine(N, DCI, DAG);
+  case ISD::BUILD_VECTOR:
+    return performBuildVectorCombine(N, DCI, DAG);
+  case ISD::TRUNCATE:
+    return performTruncateCombine(N, DAG);
+  case AArch64ISD::ANDS:
+    return performFlagSettingCombine(N, DCI, ISD::AND);
+  case AArch64ISD::ADC:
+    if (auto R = foldOverflowCheck(N, DAG, /* IsAdd */ true))
+      return R;
+    return foldADCToCINC(N, DAG);
+  case AArch64ISD::SBC:
+    return foldOverflowCheck(N, DAG, /* IsAdd */ false);
+  case AArch64ISD::ADCS:
+    if (auto R = foldOverflowCheck(N, DAG, /* IsAdd */ true))
+      return R;
+    return performFlagSettingCombine(N, DCI, AArch64ISD::ADC);
+  case AArch64ISD::SBCS:
+    if (auto R = foldOverflowCheck(N, DAG, /* IsAdd */ false))
+      return R;
+    return performFlagSettingCombine(N, DCI, AArch64ISD::SBC);
   case ISD::XOR:
     return performXorCombine(N, DAG, DCI, Subtarget);
   case ISD::MUL:
@@ -16616,15 +21427,15 @@ SDValue AArch64TargetLowering::PerformDAGCombine(SDNode *N,
     return performIntToFpCombine(N, DAG, Subtarget);
   case ISD::FP_TO_SINT:
   case ISD::FP_TO_UINT:
+  case ISD::FP_TO_SINT_SAT:
+  case ISD::FP_TO_UINT_SAT:
     return performFpToIntCombine(N, DAG, DCI, Subtarget);
   case ISD::FDIV:
     return performFDivCombine(N, DAG, DCI, Subtarget);
   case ISD::OR:
-    return performORCombine(N, DCI, Subtarget);
+    return performORCombine(N, DCI, Subtarget, *this);
   case ISD::AND:
     return performANDCombine(N, DCI);
-  case ISD::SRL:
-    return performSRLCombine(N, DCI);
   case ISD::INTRINSIC_WO_CHAIN:
     return performIntrinsicCombine(N, DCI, Subtarget);
   case ISD::ANY_EXTEND:
@@ -16633,24 +21444,31 @@ SDValue AArch64TargetLowering::PerformDAGCombine(SDNode *N,
     return performExtendCombine(N, DCI, DAG);
   case ISD::SIGN_EXTEND_INREG:
     return performSignExtendInRegCombine(N, DCI, DAG);
-  case ISD::TRUNCATE:
-    return performVectorTruncateCombine(N, DCI, DAG);
   case ISD::CONCAT_VECTORS:
     return performConcatVectorsCombine(N, DCI, DAG);
+  case ISD::EXTRACT_SUBVECTOR:
+    return performExtractSubvectorCombine(N, DCI, DAG);
+  case ISD::INSERT_SUBVECTOR:
+    return performInsertSubvectorCombine(N, DCI, DAG);
   case ISD::SELECT:
     return performSelectCombine(N, DCI);
   case ISD::VSELECT:
     return performVSelectCombine(N, DCI.DAG);
   case ISD::SETCC:
-    return performSETCCCombine(N, DAG);
+    return performSETCCCombine(N, DCI, DAG);
   case ISD::LOAD:
-    if (performTBISimplification(N->getOperand(1), DCI, DAG))
-      return SDValue(N, 0);
-    break;
+    return performLOADCombine(N, DCI, DAG, Subtarget);
   case ISD::STORE:
     return performSTORECombine(N, DCI, DAG, Subtarget);
+  case ISD::MSTORE:
+    return performMSTORECombine(N, DCI, DAG, Subtarget);
+  case ISD::MGATHER:
+  case ISD::MSCATTER:
+    return performMaskedGatherScatterCombine(N, DCI, DAG);
   case ISD::VECTOR_SPLICE:
     return performSVESpliceCombine(N, DAG);
+  case ISD::FP_EXTEND:
+    return performFPExtendCombine(N, DAG, DCI, Subtarget);
   case AArch64ISD::BRCOND:
     return performBRCONDCombine(N, DCI, DAG);
   case AArch64ISD::TBNZ:
@@ -16659,15 +21477,22 @@ SDValue AArch64TargetLowering::PerformDAGCombine(SDNode *N,
   case AArch64ISD::CSEL:
     return performCSELCombine(N, DCI, DAG);
   case AArch64ISD::DUP:
-    return performPostLD1Combine(N, DCI, false);
+    return performDUPCombine(N, DCI);
+  case AArch64ISD::DUPLANE128:
+    return performDupLane128Combine(N, DAG);
   case AArch64ISD::NVCAST:
     return performNVCASTCombine(N);
   case AArch64ISD::SPLICE:
     return performSpliceCombine(N, DAG);
+  case AArch64ISD::UUNPKLO:
+  case AArch64ISD::UUNPKHI:
+    return performUnpackCombine(N, DAG, Subtarget);
   case AArch64ISD::UZP1:
     return performUzpCombine(N, DAG);
   case AArch64ISD::SETCC_MERGE_ZERO:
-    return performSetccMergeZeroCombine(N, DAG);
+    return performSetccMergeZeroCombine(N, DCI);
+  case AArch64ISD::REINTERPRET_CAST:
+    return performReinterpretCastCombine(N);
   case AArch64ISD::GLD1_MERGE_ZERO:
   case AArch64ISD::GLD1_SCALED_MERGE_ZERO:
   case AArch64ISD::GLD1_UXTW_MERGE_ZERO:
@@ -16686,12 +21511,22 @@ SDValue AArch64TargetLowering::PerformDAGCombine(SDNode *N,
   case AArch64ISD::VASHR:
   case AArch64ISD::VLSHR:
     return performVectorShiftCombine(N, *this, DCI);
+  case AArch64ISD::SUNPKLO:
+    return performSunpkloCombine(N, DAG);
+  case AArch64ISD::BSP:
+    return performBSPExpandForSVE(N, DAG, Subtarget);
   case ISD::INSERT_VECTOR_ELT:
     return performInsertVectorEltCombine(N, DCI);
   case ISD::EXTRACT_VECTOR_ELT:
-    return performExtractVectorEltCombine(N, DAG);
+    return performExtractVectorEltCombine(N, DCI, Subtarget);
   case ISD::VECREDUCE_ADD:
     return performVecReduceAddCombine(N, DCI.DAG, Subtarget);
+  case AArch64ISD::UADDV:
+    return performUADDVCombine(N, DAG);
+  case AArch64ISD::SMULL:
+  case AArch64ISD::UMULL:
+  case AArch64ISD::PMULL:
+    return tryCombineLongOpWithDup(Intrinsic::not_intrinsic, N, DCI, DAG);
   case ISD::INTRINSIC_VOID:
   case ISD::INTRINSIC_W_CHAIN:
     switch (cast<ConstantSDNode>(N->getOperand(1))->getZExtValue()) {
@@ -16832,85 +21667,6 @@ SDValue AArch64TargetLowering::PerformDAGCombine(SDNode *N,
                                         /*OnlyPackedOffsets=*/false);
     case Intrinsic::aarch64_sve_st1_scatter_scalar_offset:
       return performScatterStoreCombine(N, DAG, AArch64ISD::SST1_IMM_PRED);
-    case Intrinsic::aarch64_sve_tuple_get: {
-      SDLoc DL(N);
-      SDValue Chain = N->getOperand(0);
-      SDValue Src1 = N->getOperand(2);
-      SDValue Idx = N->getOperand(3);
-
-      uint64_t IdxConst = cast<ConstantSDNode>(Idx)->getZExtValue();
-      EVT ResVT = N->getValueType(0);
-      uint64_t NumLanes = ResVT.getVectorElementCount().getKnownMinValue();
-      SDValue ExtIdx = DAG.getVectorIdxConstant(IdxConst * NumLanes, DL);
-      SDValue Val =
-          DAG.getNode(ISD::EXTRACT_SUBVECTOR, DL, ResVT, Src1, ExtIdx);
-      return DAG.getMergeValues({Val, Chain}, DL);
-    }
-    case Intrinsic::aarch64_sve_tuple_set: {
-      SDLoc DL(N);
-      SDValue Chain = N->getOperand(0);
-      SDValue Tuple = N->getOperand(2);
-      SDValue Idx = N->getOperand(3);
-      SDValue Vec = N->getOperand(4);
-
-      EVT TupleVT = Tuple.getValueType();
-      uint64_t TupleLanes = TupleVT.getVectorElementCount().getKnownMinValue();
-
-      uint64_t IdxConst = cast<ConstantSDNode>(Idx)->getZExtValue();
-      uint64_t NumLanes =
-          Vec.getValueType().getVectorElementCount().getKnownMinValue();
-
-      if ((TupleLanes % NumLanes) != 0)
-        report_fatal_error("invalid tuple vector!");
-
-      uint64_t NumVecs = TupleLanes / NumLanes;
-
-      SmallVector<SDValue, 4> Opnds;
-      for (unsigned I = 0; I < NumVecs; ++I) {
-        if (I == IdxConst)
-          Opnds.push_back(Vec);
-        else {
-          SDValue ExtIdx = DAG.getVectorIdxConstant(I * NumLanes, DL);
-          Opnds.push_back(DAG.getNode(ISD::EXTRACT_SUBVECTOR, DL,
-                                      Vec.getValueType(), Tuple, ExtIdx));
-        }
-      }
-      SDValue Concat =
-          DAG.getNode(ISD::CONCAT_VECTORS, DL, Tuple.getValueType(), Opnds);
-      return DAG.getMergeValues({Concat, Chain}, DL);
-    }
-    case Intrinsic::aarch64_sve_tuple_create2:
-    case Intrinsic::aarch64_sve_tuple_create3:
-    case Intrinsic::aarch64_sve_tuple_create4: {
-      SDLoc DL(N);
-      SDValue Chain = N->getOperand(0);
-
-      SmallVector<SDValue, 4> Opnds;
-      for (unsigned I = 2; I < N->getNumOperands(); ++I)
-        Opnds.push_back(N->getOperand(I));
-
-      EVT VT = Opnds[0].getValueType();
-      EVT EltVT = VT.getVectorElementType();
-      EVT DestVT = EVT::getVectorVT(*DAG.getContext(), EltVT,
-                                    VT.getVectorElementCount() *
-                                        (N->getNumOperands() - 2));
-      SDValue Concat = DAG.getNode(ISD::CONCAT_VECTORS, DL, DestVT, Opnds);
-      return DAG.getMergeValues({Concat, Chain}, DL);
-    }
-    case Intrinsic::aarch64_sve_ld2:
-    case Intrinsic::aarch64_sve_ld3:
-    case Intrinsic::aarch64_sve_ld4: {
-      SDLoc DL(N);
-      SDValue Chain = N->getOperand(0);
-      SDValue Mask = N->getOperand(2);
-      SDValue BasePtr = N->getOperand(3);
-      SDValue LoadOps[] = {Chain, Mask, BasePtr};
-      unsigned IntrinsicID =
-          cast<ConstantSDNode>(N->getOperand(1))->getZExtValue();
-      SDValue Result =
-          LowerSVEStructLoad(IntrinsicID, LoadOps, N->getValueType(0), DAG, DL);
-      return DAG.getMergeValues({Result, Chain}, DL);
-    }
     case Intrinsic::aarch64_rndr:
     case Intrinsic::aarch64_rndrrs: {
       unsigned IntrinsicID =
@@ -16935,6 +21691,8 @@ SDValue AArch64TargetLowering::PerformDAGCombine(SDNode *N,
     break;
   case ISD::GlobalAddress:
     return performGlobalAddressCombine(N, DAG, Subtarget, getTargetMachine());
+  case ISD::CTLZ:
+    return performCTLZCombine(N, DAG, Subtarget);
   }
   return SDValue();
 }
@@ -16984,14 +21742,38 @@ bool AArch64TargetLowering::mayBeEmittedAsTailCall(const CallInst *CI) const {
   return CI->isTailCall();
 }
 
-bool AArch64TargetLowering::getIndexedAddressParts(SDNode *Op, SDValue &Base,
-                                                   SDValue &Offset,
-                                                   ISD::MemIndexedMode &AM,
-                                                   bool &IsInc,
-                                                   SelectionDAG &DAG) const {
+bool AArch64TargetLowering::getIndexedAddressParts(
+    SDNode *N, SDNode *Op, SDValue &Base, SDValue &Offset,
+    ISD::MemIndexedMode &AM, bool &IsInc, SelectionDAG &DAG) const {
   if (Op->getOpcode() != ISD::ADD && Op->getOpcode() != ISD::SUB)
     return false;
 
+  // Non-null if there is exactly one user of the loaded value (ignoring chain).
+  SDNode *ValOnlyUser = nullptr;
+  for (SDNode::use_iterator UI = N->use_begin(), UE = N->use_end(); UI != UE;
+       ++UI) {
+    if (UI.getUse().getResNo() == 1)
+      continue; // Ignore chain.
+    if (ValOnlyUser == nullptr)
+      ValOnlyUser = *UI;
+    else {
+      ValOnlyUser = nullptr; // Multiple non-chain uses, bail out.
+      break;
+    }
+  }
+
+  auto IsUndefOrZero = [](SDValue V) {
+    return V.isUndef() || isNullOrNullSplat(V, /*AllowUndefs*/ true);
+  };
+
+  // If the only user of the value is a scalable vector splat, it is
+  // preferable to do a replicating load (ld1r*).
+  if (ValOnlyUser && ValOnlyUser->getValueType(0).isScalableVector() &&
+      (ValOnlyUser->getOpcode() == ISD::SPLAT_VECTOR ||
+       (ValOnlyUser->getOpcode() == AArch64ISD::DUP_MERGE_PASSTHRU &&
+        IsUndefOrZero(ValOnlyUser->getOperand(2)))))
+    return false;
+
   Base = Op->getOperand(0);
   // All of the indexed addressing mode instructions take a signed
   // 9 bit immediate offset.
@@ -17024,7 +21806,7 @@ bool AArch64TargetLowering::getPreIndexedAddressParts(SDNode *N, SDValue &Base,
     return false;
 
   bool IsInc;
-  if (!getIndexedAddressParts(Ptr.getNode(), Base, Offset, AM, IsInc, DAG))
+  if (!getIndexedAddressParts(N, Ptr.getNode(), Base, Offset, AM, IsInc, DAG))
     return false;
   AM = IsInc ? ISD::PRE_INC : ISD::PRE_DEC;
   return true;
@@ -17045,7 +21827,7 @@ bool AArch64TargetLowering::getPostIndexedAddressParts(
     return false;
 
   bool IsInc;
-  if (!getIndexedAddressParts(Op, Base, Offset, AM, IsInc, DAG))
+  if (!getIndexedAddressParts(N, Op, Base, Offset, AM, IsInc, DAG))
     return false;
   // Post-indexing updates the base, so it's not a valid transform
   // if that's not the same as the load's pointer.
@@ -17065,6 +21847,15 @@ void AArch64TargetLowering::ReplaceBITCASTResults(
   if (VT.isScalableVector() && !isTypeLegal(VT) && isTypeLegal(SrcVT)) {
     assert(!VT.isFloatingPoint() && SrcVT.isFloatingPoint() &&
            "Expected fp->int bitcast!");
+
+    // Bitcasting between unpacked vector types of different element counts is
+    // not a NOP because the live elements are laid out differently.
+    //                01234567
+    // e.g. nxv2i32 = XX??XX??
+    //      nxv4f16 = X?X?X?X?
+    if (VT.getVectorElementCount() != SrcVT.getVectorElementCount())
+      return;
+
     SDValue CastResult = getSVESafeBitCast(getSVEContainerType(VT), Op, DAG);
     Results.push_back(DAG.getNode(ISD::TRUNCATE, DL, VT, CastResult));
     return;
@@ -17082,6 +21873,53 @@ void AArch64TargetLowering::ReplaceBITCASTResults(
   Results.push_back(DAG.getNode(ISD::TRUNCATE, DL, MVT::i16, Op));
 }
 
+static void ReplaceAddWithADDP(SDNode *N, SmallVectorImpl<SDValue> &Results,
+                               SelectionDAG &DAG,
+                               const AArch64Subtarget *Subtarget) {
+  EVT VT = N->getValueType(0);
+  if (!VT.is256BitVector() ||
+      (VT.getScalarType().isFloatingPoint() &&
+       !N->getFlags().hasAllowReassociation()) ||
+      (VT.getScalarType() == MVT::f16 && !Subtarget->hasFullFP16()))
+    return;
+
+  SDValue X = N->getOperand(0);
+  auto *Shuf = dyn_cast<ShuffleVectorSDNode>(N->getOperand(1));
+  if (!Shuf) {
+    Shuf = dyn_cast<ShuffleVectorSDNode>(N->getOperand(0));
+    X = N->getOperand(1);
+    if (!Shuf)
+      return;
+  }
+
+  if (Shuf->getOperand(0) != X || !Shuf->getOperand(1)->isUndef())
+    return;
+
+  // Check the mask is 1,0,3,2,5,4,...
+  ArrayRef<int> Mask = Shuf->getMask();
+  for (int I = 0, E = Mask.size(); I < E; I++)
+    if (Mask[I] != (I % 2 == 0 ? I + 1 : I - 1))
+      return;
+
+  SDLoc DL(N);
+  auto LoHi = DAG.SplitVector(X, DL);
+  assert(LoHi.first.getValueType() == LoHi.second.getValueType());
+  SDValue Addp = DAG.getNode(AArch64ISD::ADDP, N, LoHi.first.getValueType(),
+                             LoHi.first, LoHi.second);
+
+  // Shuffle the elements back into order.
+  SmallVector<int> NMask;
+  for (unsigned I = 0, E = VT.getVectorNumElements() / 2; I < E; I++) {
+    NMask.push_back(I);
+    NMask.push_back(I);
+  }
+  Results.push_back(
+      DAG.getVectorShuffle(VT, DL,
+                           DAG.getNode(ISD::CONCAT_VECTORS, DL, VT, Addp,
+                                       DAG.getUNDEF(LoHi.first.getValueType())),
+                           DAG.getUNDEF(VT), NMask));
+}
+
 static void ReplaceReductionResults(SDNode *N,
                                     SmallVectorImpl<SDValue> &Results,
                                     SelectionDAG &DAG, unsigned InterOp,
@@ -17259,9 +22097,14 @@ void AArch64TargetLowering::ReplaceNodeResults(
   case ISD::VECREDUCE_UMIN:
     Results.push_back(LowerVECREDUCE(SDValue(N, 0), DAG));
     return;
+  case ISD::ADD:
+  case ISD::FADD:
+    ReplaceAddWithADDP(N, Results, DAG, Subtarget);
+    return;
 
   case ISD::CTPOP:
-    if (SDValue Result = LowerCTPOP(SDValue(N, 0), DAG))
+  case ISD::PARITY:
+    if (SDValue Result = LowerCTPOP_PARITY(SDValue(N, 0), DAG))
       Results.push_back(Result);
     return;
   case AArch64ISD::SADDV:
@@ -17284,39 +22127,69 @@ void AArch64TargetLowering::ReplaceNodeResults(
     return;
   case ISD::FP_TO_UINT:
   case ISD::FP_TO_SINT:
+  case ISD::STRICT_FP_TO_SINT:
+  case ISD::STRICT_FP_TO_UINT:
     assert(N->getValueType(0) == MVT::i128 && "unexpected illegal conversion");
     // Let normal code take care of it by not adding anything to Results.
     return;
   case ISD::ATOMIC_CMP_SWAP:
     ReplaceCMP_SWAP_128Results(N, Results, DAG, Subtarget);
     return;
+  case ISD::ATOMIC_LOAD:
   case ISD::LOAD: {
-    assert(SDValue(N, 0).getValueType() == MVT::i128 &&
-           "unexpected load's value type");
-    LoadSDNode *LoadNode = cast<LoadSDNode>(N);
-    if (!LoadNode->isVolatile() || LoadNode->getMemoryVT() != MVT::i128) {
-      // Non-volatile loads are optimized later in AArch64's load/store
-      // optimizer.
+    MemSDNode *LoadNode = cast<MemSDNode>(N);
+    EVT MemVT = LoadNode->getMemoryVT();
+    // Handle lowering 256 bit non temporal loads into LDNP for little-endian
+    // targets.
+    if (LoadNode->isNonTemporal() && Subtarget->isLittleEndian() &&
+        MemVT.getSizeInBits() == 256u &&
+        (MemVT.getScalarSizeInBits() == 8u ||
+         MemVT.getScalarSizeInBits() == 16u ||
+         MemVT.getScalarSizeInBits() == 32u ||
+         MemVT.getScalarSizeInBits() == 64u)) {
+
+      SDValue Result = DAG.getMemIntrinsicNode(
+          AArch64ISD::LDNP, SDLoc(N),
+          DAG.getVTList({MemVT.getHalfNumVectorElementsVT(*DAG.getContext()),
+                         MemVT.getHalfNumVectorElementsVT(*DAG.getContext()),
+                         MVT::Other}),
+          {LoadNode->getChain(), LoadNode->getBasePtr()},
+          LoadNode->getMemoryVT(), LoadNode->getMemOperand());
+
+      SDValue Pair = DAG.getNode(ISD::CONCAT_VECTORS, SDLoc(N), MemVT,
+                                 Result.getValue(0), Result.getValue(1));
+      Results.append({Pair, Result.getValue(2) /* Chain */});
       return;
     }
 
-    SDValue Result = DAG.getMemIntrinsicNode(
-        AArch64ISD::LDP, SDLoc(N),
-        DAG.getVTList({MVT::i64, MVT::i64, MVT::Other}),
-        {LoadNode->getChain(), LoadNode->getBasePtr()}, LoadNode->getMemoryVT(),
-        LoadNode->getMemOperand());
+    if ((!LoadNode->isVolatile() && !LoadNode->isAtomic()) ||
+        LoadNode->getMemoryVT() != MVT::i128) {
+      // Non-volatile or atomic loads are optimized later in AArch64's load/store
+      // optimizer.
+      return;
+    }
 
-    SDValue Pair = DAG.getNode(ISD::BUILD_PAIR, SDLoc(N), MVT::i128,
-                               Result.getValue(0), Result.getValue(1));
-    Results.append({Pair, Result.getValue(2) /* Chain */});
+    if (SDValue(N, 0).getValueType() == MVT::i128) {
+      SDValue Result = DAG.getMemIntrinsicNode(
+          AArch64ISD::LDP, SDLoc(N),
+          DAG.getVTList({MVT::i64, MVT::i64, MVT::Other}),
+          {LoadNode->getChain(), LoadNode->getBasePtr()},
+          LoadNode->getMemoryVT(), LoadNode->getMemOperand());
+
+      SDValue Pair = DAG.getNode(ISD::BUILD_PAIR, SDLoc(N), MVT::i128,
+                                 Result.getValue(0), Result.getValue(1));
+      Results.append({Pair, Result.getValue(2) /* Chain */});
+    }
     return;
   }
   case ISD::EXTRACT_SUBVECTOR:
     ReplaceExtractSubVectorResults(N, Results, DAG);
     return;
   case ISD::INSERT_SUBVECTOR:
-    // Custom lowering has been requested for INSERT_SUBVECTOR -- but delegate
-    // to common code for result type legalisation
+  case ISD::CONCAT_VECTORS:
+    // Custom lowering has been requested for INSERT_SUBVECTOR and
+    // CONCAT_VECTORS -- but delegate to common code for result type
+    // legalisation
     return;
   case ISD::INTRINSIC_WO_CHAIN: {
     EVT VT = N->getValueType(0);
@@ -17360,6 +22233,25 @@ void AArch64TargetLowering::ReplaceNodeResults(
     }
     }
   }
+  case ISD::READ_REGISTER: {
+    SDLoc DL(N);
+    assert(N->getValueType(0) == MVT::i128 &&
+           "READ_REGISTER custom lowering is only for 128-bit sysregs");
+    SDValue Chain = N->getOperand(0);
+    SDValue SysRegName = N->getOperand(1);
+
+    SDValue Result = DAG.getNode(
+        AArch64ISD::MRRS, DL, DAG.getVTList({MVT::i64, MVT::i64, MVT::Other}),
+        Chain, SysRegName);
+
+    // Sysregs are not endian. Result.getValue(0) always contains the lower half
+    // of the 128-bit System Register value.
+    SDValue Pair = DAG.getNode(ISD::BUILD_PAIR, DL, MVT::i128,
+                               Result.getValue(0), Result.getValue(1));
+    Results.push_back(Pair);
+    Results.push_back(Result.getValue(2)); // Chain
+    return;
+  }
   }
 }
 
@@ -17387,12 +22279,61 @@ AArch64TargetLowering::getPreferredVectorAction(MVT VT) const {
   return TargetLoweringBase::getPreferredVectorAction(VT);
 }
 
+// In v8.4a, ldp and stp instructions are guaranteed to be single-copy atomic
+// provided the address is 16-byte aligned.
+bool AArch64TargetLowering::isOpSuitableForLDPSTP(const Instruction *I) const {
+  if (!Subtarget->hasLSE2())
+    return false;
+
+  if (auto LI = dyn_cast<LoadInst>(I))
+    return LI->getType()->getPrimitiveSizeInBits() == 128 &&
+           LI->getAlign() >= Align(16);
+
+  if (auto SI = dyn_cast<StoreInst>(I))
+    return SI->getValueOperand()->getType()->getPrimitiveSizeInBits() == 128 &&
+           SI->getAlign() >= Align(16);
+
+  return false;
+}
+
+bool AArch64TargetLowering::shouldInsertFencesForAtomic(
+    const Instruction *I) const {
+  return isOpSuitableForLDPSTP(I);
+}
+
+bool AArch64TargetLowering::shouldInsertTrailingFenceForAtomicStore(
+    const Instruction *I) const {
+  // Store-Release instructions only provide seq_cst guarantees when paired with
+  // Load-Acquire instructions. MSVC CRT does not use these instructions to
+  // implement seq_cst loads and stores, so we need additional explicit fences
+  // after memory writes.
+  if (!Subtarget->getTargetTriple().isWindowsMSVCEnvironment())
+    return false;
+
+  switch (I->getOpcode()) {
+  default:
+    return false;
+  case Instruction::AtomicCmpXchg:
+    return cast<AtomicCmpXchgInst>(I)->getSuccessOrdering() ==
+           AtomicOrdering::SequentiallyConsistent;
+  case Instruction::AtomicRMW:
+    return cast<AtomicRMWInst>(I)->getOrdering() ==
+           AtomicOrdering::SequentiallyConsistent;
+  case Instruction::Store:
+    return cast<StoreInst>(I)->getOrdering() ==
+           AtomicOrdering::SequentiallyConsistent;
+  }
+}
+
 // Loads and stores less than 128-bits are already atomic; ones above that
 // are doomed anyway, so defer to the default libcall and blame the OS when
 // things go wrong.
-bool AArch64TargetLowering::shouldExpandAtomicStoreInIR(StoreInst *SI) const {
+TargetLoweringBase::AtomicExpansionKind
+AArch64TargetLowering::shouldExpandAtomicStoreInIR(StoreInst *SI) const {
   unsigned Size = SI->getValueOperand()->getType()->getPrimitiveSizeInBits();
-  return Size == 128;
+  if (Size != 128 || isOpSuitableForLDPSTP(SI))
+    return AtomicExpansionKind::None;
+  return AtomicExpansionKind::Expand;
 }
 
 // Loads and stores less than 128-bits are already atomic; ones above that
@@ -17401,7 +22342,22 @@ bool AArch64TargetLowering::shouldExpandAtomicStoreInIR(StoreInst *SI) const {
 TargetLowering::AtomicExpansionKind
 AArch64TargetLowering::shouldExpandAtomicLoadInIR(LoadInst *LI) const {
   unsigned Size = LI->getType()->getPrimitiveSizeInBits();
-  return Size == 128 ? AtomicExpansionKind::LLSC : AtomicExpansionKind::None;
+
+  if (Size != 128 || isOpSuitableForLDPSTP(LI))
+    return AtomicExpansionKind::None;
+
+  // At -O0, fast-regalloc cannot cope with the live vregs necessary to
+  // implement atomicrmw without spilling. If the target address is also on the
+  // stack and close enough to the spill slot, this can lead to a situation
+  // where the monitor always gets cleared and the atomic operation can never
+  // succeed. So at -O0 lower this operation to a CAS loop.
+  if (getTargetMachine().getOptLevel() == CodeGenOpt::None)
+    return AtomicExpansionKind::CmpXChg;
+
+  // Using CAS for an atomic load has a better chance of succeeding under high
+  // contention situations. So use it if available.
+  return Subtarget->hasLSE() ? AtomicExpansionKind::CmpXChg
+                             : AtomicExpansionKind::LLSC;
 }
 
 // For the real atomic operations, we have ldxr/stxr up to 128 bits,
@@ -17438,8 +22394,10 @@ AArch64TargetLowering::shouldExpandAtomicRMWInIR(AtomicRMWInst *AI) const {
   // implement atomicrmw without spilling. If the target address is also on the
   // stack and close enough to the spill slot, this can lead to a situation
   // where the monitor always gets cleared and the atomic operation can never
-  // succeed. So at -O0 lower this operation to a CAS loop.
-  if (getTargetMachine().getOptLevel() == CodeGenOpt::None)
+  // succeed. So at -O0 lower this operation to a CAS loop. Also worthwhile if
+  // we have a single CAS instruction that can replace the loop.
+  if (getTargetMachine().getOptLevel() == CodeGenOpt::None ||
+      Subtarget->hasLSE())
     return AtomicExpansionKind::CmpXChg;
 
   return AtomicExpansionKind::LLSC;
@@ -17500,7 +22458,10 @@ Value *AArch64TargetLowering::emitLoadLinked(IRBuilderBase &Builder,
 
   const DataLayout &DL = M->getDataLayout();
   IntegerType *IntEltTy = Builder.getIntNTy(DL.getTypeSizeInBits(ValueTy));
-  Value *Trunc = Builder.CreateTrunc(Builder.CreateCall(Ldxr, Addr), IntEltTy);
+  CallInst *CI = Builder.CreateCall(Ldxr, Addr);
+  CI->addParamAttr(
+      0, Attribute::get(Builder.getContext(), Attribute::ElementType, ValueTy));
+  Value *Trunc = Builder.CreateTrunc(CI, IntEltTy);
 
   return Builder.CreateBitCast(Trunc, ValueTy);
 }
@@ -17541,10 +22502,13 @@ Value *AArch64TargetLowering::emitStoreConditional(IRBuilderBase &Builder,
   IntegerType *IntValTy = Builder.getIntNTy(DL.getTypeSizeInBits(Val->getType()));
   Val = Builder.CreateBitCast(Val, IntValTy);
 
-  return Builder.CreateCall(Stxr,
-                            {Builder.CreateZExtOrBitCast(
-                                 Val, Stxr->getFunctionType()->getParamType(0)),
-                             Addr});
+  CallInst *CI = Builder.CreateCall(
+      Stxr, {Builder.CreateZExtOrBitCast(
+                 Val, Stxr->getFunctionType()->getParamType(0)),
+             Addr});
+  CI->addParamAttr(1, Attribute::get(Builder.getContext(),
+                                     Attribute::ElementType, Val->getType()));
+  return CI;
 }
 
 bool AArch64TargetLowering::functionArgumentNeedsConsecutiveRegisters(
@@ -17552,13 +22516,13 @@ bool AArch64TargetLowering::functionArgumentNeedsConsecutiveRegisters(
     const DataLayout &DL) const {
   if (!Ty->isArrayTy()) {
     const TypeSize &TySize = Ty->getPrimitiveSizeInBits();
-    return TySize.isScalable() && TySize.getKnownMinSize() > 128;
+    return TySize.isScalable() && TySize.getKnownMinValue() > 128;
   }
 
   // All non aggregate members of the type must have the same type
   SmallVector<EVT> ValueVTs;
   ComputeValueVTs(*this, DL, Ty, ValueVTs);
-  return is_splat(ValueVTs);
+  return all_equal(ValueVTs);
 }
 
 bool AArch64TargetLowering::shouldNormalizeToSelectSequence(LLVMContext &,
@@ -17600,11 +22564,11 @@ void AArch64TargetLowering::insertSSPDeclarations(Module &M) const {
 
     // MSVC CRT has a function to validate security cookie.
     FunctionCallee SecurityCheckCookie = M.getOrInsertFunction(
-        "__security_check_cookie", Type::getVoidTy(M.getContext()),
-        Type::getInt8PtrTy(M.getContext()));
+        Subtarget->getSecurityCheckCookieName(),
+        Type::getVoidTy(M.getContext()), Type::getInt8PtrTy(M.getContext()));
     if (Function *F = dyn_cast<Function>(SecurityCheckCookie.getCallee())) {
       F->setCallingConv(CallingConv::Win64);
-      F->addAttribute(1, Attribute::AttrKind::InReg);
+      F->addParamAttr(0, Attribute::AttrKind::InReg);
     }
     return;
   }
@@ -17621,7 +22585,7 @@ Value *AArch64TargetLowering::getSDagStackGuard(const Module &M) const {
 Function *AArch64TargetLowering::getSSPStackGuardCheck(const Module &M) const {
   // MSVC CRT has a function to validate security cookie.
   if (Subtarget->getTargetTriple().isWindowsMSVCEnvironment())
-    return M.getFunction("__security_check_cookie");
+    return M.getFunction(Subtarget->getSecurityCheckCookieName());
   return TargetLowering::getSSPStackGuardCheck(M);
 }
 
@@ -17667,12 +22631,14 @@ bool AArch64TargetLowering::
   return X.getValueType().isScalarInteger() || NewShiftOpcode == ISD::SHL;
 }
 
-bool AArch64TargetLowering::shouldExpandShift(SelectionDAG &DAG,
-                                              SDNode *N) const {
+TargetLowering::ShiftLegalizationStrategy
+AArch64TargetLowering::preferredShiftLegalizationStrategy(
+    SelectionDAG &DAG, SDNode *N, unsigned int ExpansionFactor) const {
   if (DAG.getMachineFunction().getFunction().hasMinSize() &&
       !Subtarget->isTargetWindows() && !Subtarget->isTargetDarwin())
-    return false;
-  return true;
+    return ShiftLegalizationStrategy::LowerToLibcall;
+  return TargetLowering::preferredShiftLegalizationStrategy(DAG, N,
+                                                            ExpansionFactor);
 }
 
 void AArch64TargetLowering::initializeSplitCSR(MachineBasicBlock *Entry) const {
@@ -17730,7 +22696,7 @@ bool AArch64TargetLowering::isIntDivCheap(EVT VT, AttributeList Attr) const {
   // integer division, leaving the division as-is is a loss even in terms of
   // size, because it will have to be scalarized, while the alternative code
   // sequence can be performed in vector form.
-  bool OptSize = Attr.hasFnAttribute(Attribute::MinSize);
+  bool OptSize = Attr.hasFnAttr(Attribute::MinSize);
   return OptSize && !VT.isVector();
 }
 
@@ -17739,6 +22705,15 @@ bool AArch64TargetLowering::preferIncOfAddToSubOfNot(EVT VT) const {
   return VT.isScalarInteger();
 }
 
+bool AArch64TargetLowering::shouldConvertFpToSat(unsigned Op, EVT FPVT,
+                                                 EVT VT) const {
+  // v8f16 without fp16 need to be extended to v8f32, which is more difficult to
+  // legalize.
+  if (FPVT == MVT::v8f16 && !Subtarget->hasFullFP16())
+    return false;
+  return TargetLowering::shouldConvertFpToSat(Op, FPVT, VT);
+}
+
 bool AArch64TargetLowering::enableAggressiveFMAFusion(EVT VT) const {
   return Subtarget->hasAggressiveFMA() && VT.isFloatingPoint();
 }
@@ -17752,7 +22727,25 @@ AArch64TargetLowering::getVaListSizeInBits(const DataLayout &DL) const {
 }
 
 void AArch64TargetLowering::finalizeLowering(MachineFunction &MF) const {
-  MF.getFrameInfo().computeMaxCallFrameSize(MF);
+  MachineFrameInfo &MFI = MF.getFrameInfo();
+  // If we have any vulnerable SVE stack objects then the stack protector
+  // needs to be placed at the top of the SVE stack area, as the SVE locals
+  // are placed above the other locals, so we allocate it as if it were a
+  // scalable vector.
+  // FIXME: It may be worthwhile having a specific interface for this rather
+  // than doing it here in finalizeLowering.
+  if (MFI.hasStackProtectorIndex()) {
+    for (unsigned int i = 0, e = MFI.getObjectIndexEnd(); i != e; ++i) {
+      if (MFI.getStackID(i) == TargetStackID::ScalableVector &&
+          MFI.getObjectSSPLayout(i) != MachineFrameInfo::SSPLK_None) {
+        MFI.setStackID(MFI.getStackProtectorIndex(),
+                       TargetStackID::ScalableVector);
+        MFI.setObjectAlignment(MFI.getStackProtectorIndex(), Align(16));
+        break;
+      }
+    }
+  }
+  MFI.computeMaxCallFrameSize(MF);
   TargetLoweringBase::finalizeLowering(MF);
 }
 
@@ -17763,6 +22756,21 @@ bool AArch64TargetLowering::needsFixedCatchObjects() const {
 
 bool AArch64TargetLowering::shouldLocalize(
     const MachineInstr &MI, const TargetTransformInfo *TTI) const {
+  auto &MF = *MI.getMF();
+  auto &MRI = MF.getRegInfo();
+  auto maxUses = [](unsigned RematCost) {
+    // A cost of 1 means remats are basically free.
+    if (RematCost == 1)
+      return std::numeric_limits<unsigned>::max();
+    if (RematCost == 2)
+      return 2U;
+
+    // Remat is too expensive, only sink if there's one user.
+    if (RematCost > 2)
+      return 1U;
+    llvm_unreachable("Unexpected remat cost");
+  };
+
   switch (MI.getOpcode()) {
   case TargetOpcode::G_GLOBAL_VALUE: {
     // On Darwin, TLS global vars get selected into function calls, which
@@ -17773,6 +22781,21 @@ bool AArch64TargetLowering::shouldLocalize(
       return false;
     break;
   }
+  case TargetOpcode::G_CONSTANT: {
+    auto *CI = MI.getOperand(1).getCImm();
+    APInt Imm = CI->getValue();
+    InstructionCost Cost = TTI->getIntImmCost(
+        Imm, CI->getType(), TargetTransformInfo::TCK_CodeSize);
+    assert(Cost.isValid() && "Expected a valid imm cost");
+
+    unsigned RematCost = *Cost.getValue();
+    Register Reg = MI.getOperand(0).getReg();
+    unsigned MaxUses = maxUses(RematCost);
+    // Don't pass UINT_MAX sentinal value to hasAtMostUserInstrs().
+    if (MaxUses == std::numeric_limits<unsigned>::max())
+      --MaxUses;
+    return MRI.hasAtMostUserInstrs(Reg, MaxUses);
+  }
   // If we legalized G_GLOBAL_VALUE into ADRP + G_ADD_LOW, mark both as being
   // localizable.
   case AArch64::ADRP:
@@ -17797,6 +22820,15 @@ bool AArch64TargetLowering::fallBackToDAGISel(const Instruction &Inst) const {
       return true;
   }
 
+  // Checks to allow the use of SME instructions
+  if (auto *Base = dyn_cast<CallBase>(&Inst)) {
+    auto CallerAttrs = SMEAttrs(*Inst.getFunction());
+    auto CalleeAttrs = SMEAttrs(*Base);
+    if (CallerAttrs.requiresSMChange(CalleeAttrs,
+                                     /*BodyOverridesInterface=*/false) ||
+        CallerAttrs.requiresLazySave(CalleeAttrs))
+      return true;
+  }
   return false;
 }
 
@@ -17832,42 +22864,19 @@ static SDValue getPredicateForFixedLengthVector(SelectionDAG &DAG, SDLoc &DL,
          DAG.getTargetLoweringInfo().isTypeLegal(VT) &&
          "Expected legal fixed length vector!");
 
-  int PgPattern;
-  switch (VT.getVectorNumElements()) {
-  default:
-    llvm_unreachable("unexpected element count for SVE predicate");
-  case 1:
-    PgPattern = AArch64SVEPredPattern::vl1;
-    break;
-  case 2:
-    PgPattern = AArch64SVEPredPattern::vl2;
-    break;
-  case 4:
-    PgPattern = AArch64SVEPredPattern::vl4;
-    break;
-  case 8:
-    PgPattern = AArch64SVEPredPattern::vl8;
-    break;
-  case 16:
-    PgPattern = AArch64SVEPredPattern::vl16;
-    break;
-  case 32:
-    PgPattern = AArch64SVEPredPattern::vl32;
-    break;
-  case 64:
-    PgPattern = AArch64SVEPredPattern::vl64;
-    break;
-  case 128:
-    PgPattern = AArch64SVEPredPattern::vl128;
-    break;
-  case 256:
-    PgPattern = AArch64SVEPredPattern::vl256;
-    break;
-  }
+  std::optional<unsigned> PgPattern =
+      getSVEPredPatternFromNumElements(VT.getVectorNumElements());
+  assert(PgPattern && "Unexpected element count for SVE predicate");
 
-  // TODO: For vectors that are exactly getMaxSVEVectorSizeInBits big, we can
-  // use AArch64SVEPredPattern::all, which can enable the use of unpredicated
+  // For vectors that are exactly getMaxSVEVectorSizeInBits big, we can use
+  // AArch64SVEPredPattern::all, which can enable the use of unpredicated
   // variants of instructions when available.
+  const auto &Subtarget = DAG.getSubtarget<AArch64Subtarget>();
+  unsigned MinSVESize = Subtarget.getMinSVEVectorSizeInBits();
+  unsigned MaxSVESize = Subtarget.getMaxSVEVectorSizeInBits();
+  if (MaxSVESize && MinSVESize == MaxSVESize &&
+      MaxSVESize == VT.getSizeInBits())
+    PgPattern = AArch64SVEPredPattern::all;
 
   MVT MaskVT;
   switch (VT.getVectorElementType().getSimpleVT().SimpleTy) {
@@ -17890,8 +22899,7 @@ static SDValue getPredicateForFixedLengthVector(SelectionDAG &DAG, SDLoc &DL,
     break;
   }
 
-  return DAG.getNode(AArch64ISD::PTRUE, DL, MaskVT,
-                     DAG.getTargetConstant(PgPattern, DL, MVT::i64));
+  return getPTrue(DAG, DL, MaskVT, *PgPattern);
 }
 
 static SDValue getPredicateForScalableVector(SelectionDAG &DAG, SDLoc &DL,
@@ -17939,15 +22947,35 @@ SDValue AArch64TargetLowering::LowerFixedLengthVectorLoadToSVE(
   SDLoc DL(Op);
   EVT VT = Op.getValueType();
   EVT ContainerVT = getContainerForFixedLengthVector(DAG, VT);
+  EVT LoadVT = ContainerVT;
+  EVT MemVT = Load->getMemoryVT();
 
-  auto NewLoad = DAG.getMaskedLoad(
-      ContainerVT, DL, Load->getChain(), Load->getBasePtr(), Load->getOffset(),
-      getPredicateForFixedLengthVector(DAG, DL, VT), DAG.getUNDEF(ContainerVT),
-      Load->getMemoryVT(), Load->getMemOperand(), Load->getAddressingMode(),
-      Load->getExtensionType());
+  auto Pg = getPredicateForFixedLengthVector(DAG, DL, VT);
+
+  if (VT.isFloatingPoint()) {
+    LoadVT = ContainerVT.changeTypeToInteger();
+    MemVT = MemVT.changeTypeToInteger();
+  }
 
-  auto Result = convertFromScalableVector(DAG, VT, NewLoad);
-  SDValue MergedValues[2] = {Result, Load->getChain()};
+  SDValue NewLoad = DAG.getMaskedLoad(
+      LoadVT, DL, Load->getChain(), Load->getBasePtr(), Load->getOffset(), Pg,
+      DAG.getUNDEF(LoadVT), MemVT, Load->getMemOperand(),
+      Load->getAddressingMode(), Load->getExtensionType());
+
+  SDValue Result = NewLoad;
+  if (VT.isFloatingPoint() && Load->getExtensionType() == ISD::EXTLOAD) {
+    EVT ExtendVT = ContainerVT.changeVectorElementType(
+        Load->getMemoryVT().getVectorElementType());
+
+    Result = getSVESafeBitCast(ExtendVT, Result, DAG);
+    Result = DAG.getNode(AArch64ISD::FP_EXTEND_MERGE_PASSTHRU, DL, ContainerVT,
+                         Pg, Result, DAG.getUNDEF(ContainerVT));
+  } else if (VT.isFloatingPoint()) {
+    Result = DAG.getNode(ISD::BITCAST, DL, ContainerVT, Result);
+  }
+
+  Result = convertFromScalableVector(DAG, VT, Result);
+  SDValue MergedValues[2] = {Result, NewLoad.getValue(1)};
   return DAG.getMergeValues(MergedValues, DL);
 }
 
@@ -17957,12 +22985,15 @@ static SDValue convertFixedMaskToScalableVector(SDValue Mask,
   EVT InVT = Mask.getValueType();
   EVT ContainerVT = getContainerForFixedLengthVector(DAG, InVT);
 
+  auto Pg = getPredicateForFixedLengthVector(DAG, DL, InVT);
+
+  if (ISD::isBuildVectorAllOnes(Mask.getNode()))
+    return Pg;
+
   auto Op1 = convertToScalableVector(DAG, ContainerVT, Mask);
   auto Op2 = DAG.getConstant(0, DL, ContainerVT);
-  auto Pg = getPredicateForFixedLengthVector(DAG, DL, InVT);
 
-  EVT CmpVT = Pg.getValueType();
-  return DAG.getNode(AArch64ISD::SETCC_MERGE_ZERO, DL, CmpVT,
+  return DAG.getNode(AArch64ISD::SETCC_MERGE_ZERO, DL, Pg.getValueType(),
                      {Pg, Op1, Op2, DAG.getCondCode(ISD::SETNE)});
 }
 
@@ -17971,9 +23002,6 @@ SDValue AArch64TargetLowering::LowerFixedLengthVectorMLoadToSVE(
     SDValue Op, SelectionDAG &DAG) const {
   auto Load = cast<MaskedLoadSDNode>(Op);
 
-  if (Load->getExtensionType() != ISD::LoadExtType::NON_EXTLOAD)
-    return SDValue();
-
   SDLoc DL(Op);
   EVT VT = Op.getValueType();
   EVT ContainerVT = getContainerForFixedLengthVector(DAG, VT);
@@ -17995,19 +23023,20 @@ SDValue AArch64TargetLowering::LowerFixedLengthVectorMLoadToSVE(
       IsPassThruZeroOrUndef = true;
   }
 
-  auto NewLoad = DAG.getMaskedLoad(
+  SDValue NewLoad = DAG.getMaskedLoad(
       ContainerVT, DL, Load->getChain(), Load->getBasePtr(), Load->getOffset(),
       Mask, PassThru, Load->getMemoryVT(), Load->getMemOperand(),
       Load->getAddressingMode(), Load->getExtensionType());
 
+  SDValue Result = NewLoad;
   if (!IsPassThruZeroOrUndef) {
     SDValue OldPassThru =
         convertToScalableVector(DAG, ContainerVT, Load->getPassThru());
-    NewLoad = DAG.getSelect(DL, ContainerVT, Mask, NewLoad, OldPassThru);
+    Result = DAG.getSelect(DL, ContainerVT, Mask, Result, OldPassThru);
   }
 
-  auto Result = convertFromScalableVector(DAG, VT, NewLoad);
-  SDValue MergedValues[2] = {Result, Load->getChain()};
+  Result = convertFromScalableVector(DAG, VT, Result);
+  SDValue MergedValues[2] = {Result, NewLoad.getValue(1)};
   return DAG.getMergeValues(MergedValues, DL);
 }
 
@@ -18019,21 +23048,35 @@ SDValue AArch64TargetLowering::LowerFixedLengthVectorStoreToSVE(
   SDLoc DL(Op);
   EVT VT = Store->getValue().getValueType();
   EVT ContainerVT = getContainerForFixedLengthVector(DAG, VT);
+  EVT MemVT = Store->getMemoryVT();
 
+  auto Pg = getPredicateForFixedLengthVector(DAG, DL, VT);
   auto NewValue = convertToScalableVector(DAG, ContainerVT, Store->getValue());
-  return DAG.getMaskedStore(
-      Store->getChain(), DL, NewValue, Store->getBasePtr(), Store->getOffset(),
-      getPredicateForFixedLengthVector(DAG, DL, VT), Store->getMemoryVT(),
-      Store->getMemOperand(), Store->getAddressingMode(),
-      Store->isTruncatingStore());
+
+  if (VT.isFloatingPoint() && Store->isTruncatingStore()) {
+    EVT TruncVT = ContainerVT.changeVectorElementType(
+        Store->getMemoryVT().getVectorElementType());
+    MemVT = MemVT.changeTypeToInteger();
+    NewValue = DAG.getNode(AArch64ISD::FP_ROUND_MERGE_PASSTHRU, DL, TruncVT, Pg,
+                           NewValue, DAG.getTargetConstant(0, DL, MVT::i64),
+                           DAG.getUNDEF(TruncVT));
+    NewValue =
+        getSVESafeBitCast(ContainerVT.changeTypeToInteger(), NewValue, DAG);
+  } else if (VT.isFloatingPoint()) {
+    MemVT = MemVT.changeTypeToInteger();
+    NewValue =
+        getSVESafeBitCast(ContainerVT.changeTypeToInteger(), NewValue, DAG);
+  }
+
+  return DAG.getMaskedStore(Store->getChain(), DL, NewValue,
+                            Store->getBasePtr(), Store->getOffset(), Pg, MemVT,
+                            Store->getMemOperand(), Store->getAddressingMode(),
+                            Store->isTruncatingStore());
 }
 
 SDValue AArch64TargetLowering::LowerFixedLengthVectorMStoreToSVE(
     SDValue Op, SelectionDAG &DAG) const {
-  auto Store = cast<MaskedStoreSDNode>(Op);
-
-  if (Store->isTruncatingStore())
-    return SDValue();
+  auto *Store = cast<MaskedStoreSDNode>(Op);
 
   SDLoc DL(Op);
   EVT VT = Store->getValue().getValueType();
@@ -18057,55 +23100,61 @@ SDValue AArch64TargetLowering::LowerFixedLengthVectorIntDivideToSVE(
   bool Signed = Op.getOpcode() == ISD::SDIV;
   unsigned PredOpcode = Signed ? AArch64ISD::SDIV_PRED : AArch64ISD::UDIV_PRED;
 
+  bool Negated;
+  uint64_t SplatVal;
+  if (Signed && isPow2Splat(Op.getOperand(1), SplatVal, Negated)) {
+    EVT ContainerVT = getContainerForFixedLengthVector(DAG, VT);
+    SDValue Op1 = convertToScalableVector(DAG, ContainerVT, Op.getOperand(0));
+    SDValue Op2 = DAG.getTargetConstant(Log2_64(SplatVal), dl, MVT::i32);
+
+    SDValue Pg = getPredicateForFixedLengthVector(DAG, dl, VT);
+    SDValue Res =
+        DAG.getNode(AArch64ISD::SRAD_MERGE_OP1, dl, ContainerVT, Pg, Op1, Op2);
+    if (Negated)
+      Res = DAG.getNode(ISD::SUB, dl, ContainerVT,
+                        DAG.getConstant(0, dl, ContainerVT), Res);
+
+    return convertFromScalableVector(DAG, VT, Res);
+  }
+
   // Scalable vector i32/i64 DIV is supported.
   if (EltVT == MVT::i32 || EltVT == MVT::i64)
-    return LowerToPredicatedOp(Op, DAG, PredOpcode, /*OverrideNEON=*/true);
+    return LowerToPredicatedOp(Op, DAG, PredOpcode);
 
   // Scalable vector i8/i16 DIV is not supported. Promote it to i32.
-  EVT ContainerVT = getContainerForFixedLengthVector(DAG, VT);
   EVT HalfVT = VT.getHalfNumVectorElementsVT(*DAG.getContext());
-  EVT FixedWidenedVT = HalfVT.widenIntegerVectorElementType(*DAG.getContext());
-  EVT ScalableWidenedVT = getContainerForFixedLengthVector(DAG, FixedWidenedVT);
-
-  // If this is not a full vector, extend, div, and truncate it.
-  EVT WidenedVT = VT.widenIntegerVectorElementType(*DAG.getContext());
-  if (DAG.getTargetLoweringInfo().isTypeLegal(WidenedVT)) {
-    unsigned ExtendOpcode = Signed ? ISD::SIGN_EXTEND : ISD::ZERO_EXTEND;
-    SDValue Op0 = DAG.getNode(ExtendOpcode, dl, WidenedVT, Op.getOperand(0));
-    SDValue Op1 = DAG.getNode(ExtendOpcode, dl, WidenedVT, Op.getOperand(1));
-    SDValue Div = DAG.getNode(Op.getOpcode(), dl, WidenedVT, Op0, Op1);
+  EVT PromVT = HalfVT.widenIntegerVectorElementType(*DAG.getContext());
+  unsigned ExtendOpcode = Signed ? ISD::SIGN_EXTEND : ISD::ZERO_EXTEND;
+
+  // If the wider type is legal: extend, op, and truncate.
+  EVT WideVT = VT.widenIntegerVectorElementType(*DAG.getContext());
+  if (DAG.getTargetLoweringInfo().isTypeLegal(WideVT)) {
+    SDValue Op0 = DAG.getNode(ExtendOpcode, dl, WideVT, Op.getOperand(0));
+    SDValue Op1 = DAG.getNode(ExtendOpcode, dl, WideVT, Op.getOperand(1));
+    SDValue Div = DAG.getNode(Op.getOpcode(), dl, WideVT, Op0, Op1);
     return DAG.getNode(ISD::TRUNCATE, dl, VT, Div);
   }
 
-  // Convert the operands to scalable vectors.
-  SDValue Op0 = convertToScalableVector(DAG, ContainerVT, Op.getOperand(0));
-  SDValue Op1 = convertToScalableVector(DAG, ContainerVT, Op.getOperand(1));
+  auto HalveAndExtendVector = [&DAG, &dl, &HalfVT, &PromVT,
+                               &ExtendOpcode](SDValue Op) {
+    SDValue IdxZero = DAG.getConstant(0, dl, MVT::i64);
+    SDValue IdxHalf =
+        DAG.getConstant(HalfVT.getVectorNumElements(), dl, MVT::i64);
+    SDValue Lo = DAG.getNode(ISD::EXTRACT_SUBVECTOR, dl, HalfVT, Op, IdxZero);
+    SDValue Hi = DAG.getNode(ISD::EXTRACT_SUBVECTOR, dl, HalfVT, Op, IdxHalf);
+    return std::pair<SDValue, SDValue>(
+        {DAG.getNode(ExtendOpcode, dl, PromVT, Lo),
+         DAG.getNode(ExtendOpcode, dl, PromVT, Hi)});
+  };
 
-  // Extend the scalable operands.
-  unsigned UnpkLo = Signed ? AArch64ISD::SUNPKLO : AArch64ISD::UUNPKLO;
-  unsigned UnpkHi = Signed ? AArch64ISD::SUNPKHI : AArch64ISD::UUNPKHI;
-  SDValue Op0Lo = DAG.getNode(UnpkLo, dl, ScalableWidenedVT, Op0);
-  SDValue Op1Lo = DAG.getNode(UnpkLo, dl, ScalableWidenedVT, Op1);
-  SDValue Op0Hi = DAG.getNode(UnpkHi, dl, ScalableWidenedVT, Op0);
-  SDValue Op1Hi = DAG.getNode(UnpkHi, dl, ScalableWidenedVT, Op1);
-
-  // Convert back to fixed vectors so the DIV can be further lowered.
-  Op0Lo = convertFromScalableVector(DAG, FixedWidenedVT, Op0Lo);
-  Op1Lo = convertFromScalableVector(DAG, FixedWidenedVT, Op1Lo);
-  Op0Hi = convertFromScalableVector(DAG, FixedWidenedVT, Op0Hi);
-  Op1Hi = convertFromScalableVector(DAG, FixedWidenedVT, Op1Hi);
-  SDValue ResultLo = DAG.getNode(Op.getOpcode(), dl, FixedWidenedVT,
-                                 Op0Lo, Op1Lo);
-  SDValue ResultHi = DAG.getNode(Op.getOpcode(), dl, FixedWidenedVT,
-                                 Op0Hi, Op1Hi);
-
-  // Convert again to scalable vectors to truncate.
-  ResultLo = convertToScalableVector(DAG, ScalableWidenedVT, ResultLo);
-  ResultHi = convertToScalableVector(DAG, ScalableWidenedVT, ResultHi);
-  SDValue ScalableResult = DAG.getNode(AArch64ISD::UZP1, dl, ContainerVT,
-                                       ResultLo, ResultHi);
-
-  return convertFromScalableVector(DAG, VT, ScalableResult);
+  // If wider type is not legal: split, extend, op, trunc and concat.
+  auto [Op0LoExt, Op0HiExt] = HalveAndExtendVector(Op.getOperand(0));
+  auto [Op1LoExt, Op1HiExt] = HalveAndExtendVector(Op.getOperand(1));
+  SDValue Lo = DAG.getNode(Op.getOpcode(), dl, PromVT, Op0LoExt, Op1LoExt);
+  SDValue Hi = DAG.getNode(Op.getOpcode(), dl, PromVT, Op0HiExt, Op1HiExt);
+  SDValue LoTrunc = DAG.getNode(ISD::TRUNCATE, dl, HalfVT, Lo);
+  SDValue HiTrunc = DAG.getNode(ISD::TRUNCATE, dl, HalfVT, Hi);
+  return DAG.getNode(ISD::CONCAT_VECTORS, dl, VT, {LoTrunc, HiTrunc});
 }
 
 SDValue AArch64TargetLowering::LowerFixedLengthVectorIntExtendToSVE(
@@ -18129,12 +23178,12 @@ SDValue AArch64TargetLowering::LowerFixedLengthVectorIntExtendToSVE(
     Val = DAG.getNode(ExtendOpc, DL, MVT::nxv8i16, Val);
     if (VT.getVectorElementType() == MVT::i16)
       break;
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case MVT::nxv8i16:
     Val = DAG.getNode(ExtendOpc, DL, MVT::nxv4i32, Val);
     if (VT.getVectorElementType() == MVT::i32)
       break;
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case MVT::nxv4i32:
     Val = DAG.getNode(ExtendOpc, DL, MVT::nxv2i64, Val);
     assert(VT.getVectorElementType() == MVT::i64 && "Unexpected element type!");
@@ -18163,13 +23212,13 @@ SDValue AArch64TargetLowering::LowerFixedLengthVectorTruncateToSVE(
     Val = DAG.getNode(AArch64ISD::UZP1, DL, MVT::nxv4i32, Val, Val);
     if (VT.getVectorElementType() == MVT::i32)
       break;
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case MVT::nxv4i32:
     Val = DAG.getNode(ISD::BITCAST, DL, MVT::nxv8i16, Val);
     Val = DAG.getNode(AArch64ISD::UZP1, DL, MVT::nxv8i16, Val, Val);
     if (VT.getVectorElementType() == MVT::i16)
       break;
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case MVT::nxv8i16:
     Val = DAG.getNode(ISD::BITCAST, DL, MVT::nxv16i8, Val);
     Val = DAG.getNode(AArch64ISD::UZP1, DL, MVT::nxv16i8, Val, Val);
@@ -18214,13 +23263,13 @@ SDValue AArch64TargetLowering::LowerFixedLengthInsertVectorElt(
 // NOTE: The results for inactive lanes are undefined.
 SDValue AArch64TargetLowering::LowerToPredicatedOp(SDValue Op,
                                                    SelectionDAG &DAG,
-                                                   unsigned NewOp,
-                                                   bool OverrideNEON) const {
+                                                   unsigned NewOp) const {
   EVT VT = Op.getValueType();
   SDLoc DL(Op);
   auto Pg = getPredicateForVector(DAG, DL, VT);
 
-  if (useSVEForFixedLengthVectorVT(VT, OverrideNEON)) {
+  if (VT.isFixedLengthVector()) {
+    assert(isTypeLegal(VT) && "Expected only legal fixed-width types");
     EVT ContainerVT = getContainerForFixedLengthVector(DAG, VT);
 
     // Create list of operands by converting existing ones to scalable types.
@@ -18238,8 +23287,8 @@ SDValue AArch64TargetLowering::LowerToPredicatedOp(SDValue Op,
         continue;
       }
 
-      assert(useSVEForFixedLengthVectorVT(V.getValueType(), OverrideNEON) &&
-             "Only fixed length vectors are supported!");
+      assert(isTypeLegal(V.getValueType()) &&
+             "Expected only legal fixed-width types");
       Operands.push_back(convertToScalableVector(DAG, ContainerVT, V));
     }
 
@@ -18263,7 +23312,7 @@ SDValue AArch64TargetLowering::LowerToPredicatedOp(SDValue Op,
   if (isMergePassthruOpcode(NewOp))
     Operands.push_back(DAG.getUNDEF(VT));
 
-  return DAG.getNode(NewOp, DL, VT, Operands);
+  return DAG.getNode(NewOp, DL, VT, Operands, Op->getFlags());
 }
 
 // If a fixed length vector operation has no side effects when applied to
@@ -18272,7 +23321,7 @@ SDValue AArch64TargetLowering::LowerToPredicatedOp(SDValue Op,
 SDValue AArch64TargetLowering::LowerToScalableOp(SDValue Op,
                                                  SelectionDAG &DAG) const {
   EVT VT = Op.getValueType();
-  assert(useSVEForFixedLengthVectorVT(VT) &&
+  assert(VT.isFixedLengthVector() && isTypeLegal(VT) &&
          "Only expected to lower fixed length vector operation!");
   EVT ContainerVT = getContainerForFixedLengthVector(DAG, VT);
 
@@ -18288,7 +23337,8 @@ SDValue AArch64TargetLowering::LowerToScalableOp(SDValue Op,
     }
 
     // "cast" fixed length vector to a scalable vector.
-    assert(useSVEForFixedLengthVectorVT(V.getValueType()) &&
+    assert(V.getValueType().isFixedLengthVector() &&
+           isTypeLegal(V.getValueType()) &&
            "Only fixed length vectors are supported!");
     Ops.push_back(convertToScalableVector(DAG, ContainerVT, V));
   }
@@ -18341,7 +23391,12 @@ SDValue AArch64TargetLowering::LowerPredReductionToSVE(SDValue ReduceOp,
   default:
     return SDValue();
   case ISD::VECREDUCE_OR:
-    return getPTest(DAG, VT, Pg, Op, AArch64CC::ANY_ACTIVE);
+    if (isAllActivePredicate(DAG, Pg) && OpVT == MVT::nxv16i1)
+      // The predicate can be 'Op' because
+      // vecreduce_or(Op & <all true>) <=> vecreduce_or(Op).
+      return getPTest(DAG, VT, Op, Op, AArch64CC::ANY_ACTIVE);
+    else
+      return getPTest(DAG, VT, Pg, Op, AArch64CC::ANY_ACTIVE);
   case ISD::VECREDUCE_AND: {
     Op = DAG.getNode(ISD::XOR, DL, OpVT, Op, Pg);
     return getPTest(DAG, VT, Pg, Op, AArch64CC::NONE_ACTIVE);
@@ -18349,6 +23404,11 @@ SDValue AArch64TargetLowering::LowerPredReductionToSVE(SDValue ReduceOp,
   case ISD::VECREDUCE_XOR: {
     SDValue ID =
         DAG.getTargetConstant(Intrinsic::aarch64_sve_cntp, DL, MVT::i64);
+    if (OpVT == MVT::nxv1i1) {
+      // Emulate a CNTP on .Q using .D and a different governing predicate.
+      Pg = DAG.getNode(AArch64ISD::REINTERPRET_CAST, DL, MVT::nxv2i1, Pg);
+      Op = DAG.getNode(AArch64ISD::REINTERPRET_CAST, DL, MVT::nxv2i1, Op);
+    }
     SDValue Cntp =
         DAG.getNode(ISD::INTRINSIC_WO_CHAIN, DL, MVT::i64, ID, Pg, Op);
     return DAG.getAnyExtOrTrunc(Cntp, DL, VT);
@@ -18365,7 +23425,9 @@ SDValue AArch64TargetLowering::LowerReductionToSVE(unsigned Opcode,
   SDValue VecOp = ScalarOp.getOperand(0);
   EVT SrcVT = VecOp.getValueType();
 
-  if (useSVEForFixedLengthVectorVT(SrcVT, true)) {
+  if (useSVEForFixedLengthVectorVT(
+          SrcVT,
+          /*OverrideNEON=*/Subtarget->useSVEForFixedLengthVectors())) {
     EVT ContainerVT = getContainerForFixedLengthVector(DAG, SrcVT);
     VecOp = convertToScalableVector(DAG, ContainerVT, VecOp);
   }
@@ -18420,7 +23482,7 @@ SDValue AArch64TargetLowering::LowerFixedLengthVectorSetccToSVE(
   EVT InVT = Op.getOperand(0).getValueType();
   EVT ContainerVT = getContainerForFixedLengthVector(DAG, InVT);
 
-  assert(useSVEForFixedLengthVectorVT(InVT) &&
+  assert(InVT.isFixedLengthVector() && isTypeLegal(InVT) &&
          "Only expected to lower fixed length vector operation!");
   assert(Op.getValueType() == InVT.changeTypeToInteger() &&
          "Expected integer result of the same bit length as the inputs!");
@@ -18552,24 +23614,23 @@ AArch64TargetLowering::LowerFixedLengthIntToFPToSVE(SDValue Op,
   EVT ContainerDstVT = getContainerForFixedLengthVector(DAG, VT);
   EVT ContainerSrcVT = getContainerForFixedLengthVector(DAG, SrcVT);
 
-  if (ContainerSrcVT.getVectorElementType().getSizeInBits() <=
-      ContainerDstVT.getVectorElementType().getSizeInBits()) {
-    SDValue Pg = getPredicateForVector(DAG, DL, VT);
+  if (VT.bitsGE(SrcVT)) {
+    SDValue Pg = getPredicateForFixedLengthVector(DAG, DL, VT);
 
     Val = DAG.getNode(IsSigned ? ISD::SIGN_EXTEND : ISD::ZERO_EXTEND, DL,
                       VT.changeTypeToInteger(), Val);
 
-    Val = convertToScalableVector(DAG, ContainerSrcVT, Val);
-    Val = getSVESafeBitCast(ContainerDstVT.changeTypeToInteger(), Val, DAG);
-    // Safe to use a larger than specified operand since we just unpacked the
-    // data, hence the upper bits are zero.
+    // Safe to use a larger than specified operand because by promoting the
+    // value nothing has changed from an arithmetic point of view.
+    Val =
+        convertToScalableVector(DAG, ContainerDstVT.changeTypeToInteger(), Val);
     Val = DAG.getNode(Opcode, DL, ContainerDstVT, Pg, Val,
                       DAG.getUNDEF(ContainerDstVT));
     return convertFromScalableVector(DAG, VT, Val);
   } else {
     EVT CvtVT = ContainerSrcVT.changeVectorElementType(
         ContainerDstVT.getVectorElementType());
-    SDValue Pg = getPredicateForVector(DAG, DL, CvtVT);
+    SDValue Pg = getPredicateForFixedLengthVector(DAG, DL, SrcVT);
 
     Val = convertToScalableVector(DAG, ContainerSrcVT, Val);
     Val = DAG.getNode(Opcode, DL, CvtVT, Pg, Val, DAG.getUNDEF(CvtVT));
@@ -18597,23 +23658,22 @@ AArch64TargetLowering::LowerFixedLengthFPToIntToSVE(SDValue Op,
   EVT ContainerDstVT = getContainerForFixedLengthVector(DAG, VT);
   EVT ContainerSrcVT = getContainerForFixedLengthVector(DAG, SrcVT);
 
-  if (ContainerSrcVT.getVectorElementType().getSizeInBits() <=
-      ContainerDstVT.getVectorElementType().getSizeInBits()) {
+  if (VT.bitsGT(SrcVT)) {
     EVT CvtVT = ContainerDstVT.changeVectorElementType(
       ContainerSrcVT.getVectorElementType());
-    SDValue Pg = getPredicateForVector(DAG, DL, VT);
+    SDValue Pg = getPredicateForFixedLengthVector(DAG, DL, VT);
 
     Val = DAG.getNode(ISD::BITCAST, DL, SrcVT.changeTypeToInteger(), Val);
     Val = DAG.getNode(ISD::ANY_EXTEND, DL, VT, Val);
 
-    Val = convertToScalableVector(DAG, ContainerSrcVT, Val);
+    Val = convertToScalableVector(DAG, ContainerDstVT, Val);
     Val = getSVESafeBitCast(CvtVT, Val, DAG);
     Val = DAG.getNode(Opcode, DL, ContainerDstVT, Pg, Val,
                       DAG.getUNDEF(ContainerDstVT));
     return convertFromScalableVector(DAG, VT, Val);
   } else {
     EVT CvtVT = ContainerSrcVT.changeTypeToInteger();
-    SDValue Pg = getPredicateForVector(DAG, DL, CvtVT);
+    SDValue Pg = getPredicateForFixedLengthVector(DAG, DL, SrcVT);
 
     // Safe to use a larger than specified result since an fp_to_int where the
     // result doesn't fit into the destination is undefined.
@@ -18641,16 +23701,28 @@ SDValue AArch64TargetLowering::LowerFixedLengthVECTOR_SHUFFLEToSVE(
   Op1 = convertToScalableVector(DAG, ContainerVT, Op1);
   Op2 = convertToScalableVector(DAG, ContainerVT, Op2);
 
+  auto MinLegalExtractEltScalarTy = [](EVT ScalarTy) -> EVT {
+    if (ScalarTy == MVT::i8 || ScalarTy == MVT::i16)
+      return MVT::i32;
+    return ScalarTy;
+  };
+
+  if (SVN->isSplat()) {
+    unsigned Lane = std::max(0, SVN->getSplatIndex());
+    EVT ScalarTy = MinLegalExtractEltScalarTy(VT.getVectorElementType());
+    SDValue SplatEl = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, DL, ScalarTy, Op1,
+                                  DAG.getConstant(Lane, DL, MVT::i64));
+    Op = DAG.getNode(ISD::SPLAT_VECTOR, DL, ContainerVT, SplatEl);
+    return convertFromScalableVector(DAG, VT, Op);
+  }
+
   bool ReverseEXT = false;
   unsigned Imm;
   if (isEXTMask(ShuffleMask, VT, ReverseEXT, Imm) &&
       Imm == VT.getVectorNumElements() - 1) {
     if (ReverseEXT)
       std::swap(Op1, Op2);
-
-    EVT ScalarTy = VT.getVectorElementType();
-    if ((ScalarTy == MVT::i8) || (ScalarTy == MVT::i16))
-      ScalarTy = MVT::i32;
+    EVT ScalarTy = MinLegalExtractEltScalarTy(VT.getVectorElementType());
     SDValue Scalar = DAG.getNode(
         ISD::EXTRACT_VECTOR_ELT, DL, ScalarTy, Op1,
         DAG.getConstant(VT.getVectorNumElements() - 1, DL, MVT::i64));
@@ -18658,6 +23730,106 @@ SDValue AArch64TargetLowering::LowerFixedLengthVECTOR_SHUFFLEToSVE(
     return convertFromScalableVector(DAG, VT, Op);
   }
 
+  for (unsigned LaneSize : {64U, 32U, 16U}) {
+    if (isREVMask(ShuffleMask, VT, LaneSize)) {
+      EVT NewVT =
+          getPackedSVEVectorVT(EVT::getIntegerVT(*DAG.getContext(), LaneSize));
+      unsigned RevOp;
+      unsigned EltSz = VT.getScalarSizeInBits();
+      if (EltSz == 8)
+        RevOp = AArch64ISD::BSWAP_MERGE_PASSTHRU;
+      else if (EltSz == 16)
+        RevOp = AArch64ISD::REVH_MERGE_PASSTHRU;
+      else
+        RevOp = AArch64ISD::REVW_MERGE_PASSTHRU;
+
+      Op = DAG.getNode(ISD::BITCAST, DL, NewVT, Op1);
+      Op = LowerToPredicatedOp(Op, DAG, RevOp);
+      Op = DAG.getNode(ISD::BITCAST, DL, ContainerVT, Op);
+      return convertFromScalableVector(DAG, VT, Op);
+    }
+  }
+
+  if (Subtarget->hasSVE2p1() && VT.getScalarSizeInBits() == 64 &&
+      isREVMask(ShuffleMask, VT, 128)) {
+    if (!VT.isFloatingPoint())
+      return LowerToPredicatedOp(Op, DAG, AArch64ISD::REVD_MERGE_PASSTHRU);
+
+    EVT NewVT = getPackedSVEVectorVT(EVT::getIntegerVT(*DAG.getContext(), 64));
+    Op = DAG.getNode(ISD::BITCAST, DL, NewVT, Op1);
+    Op = LowerToPredicatedOp(Op, DAG, AArch64ISD::REVD_MERGE_PASSTHRU);
+    Op = DAG.getNode(ISD::BITCAST, DL, ContainerVT, Op);
+    return convertFromScalableVector(DAG, VT, Op);
+  }
+
+  unsigned WhichResult;
+  if (isZIPMask(ShuffleMask, VT, WhichResult) && WhichResult == 0)
+    return convertFromScalableVector(
+        DAG, VT, DAG.getNode(AArch64ISD::ZIP1, DL, ContainerVT, Op1, Op2));
+
+  if (isTRNMask(ShuffleMask, VT, WhichResult)) {
+    unsigned Opc = (WhichResult == 0) ? AArch64ISD::TRN1 : AArch64ISD::TRN2;
+    return convertFromScalableVector(
+        DAG, VT, DAG.getNode(Opc, DL, ContainerVT, Op1, Op2));
+  }
+
+  if (isZIP_v_undef_Mask(ShuffleMask, VT, WhichResult) && WhichResult == 0)
+    return convertFromScalableVector(
+        DAG, VT, DAG.getNode(AArch64ISD::ZIP1, DL, ContainerVT, Op1, Op1));
+
+  if (isTRN_v_undef_Mask(ShuffleMask, VT, WhichResult)) {
+    unsigned Opc = (WhichResult == 0) ? AArch64ISD::TRN1 : AArch64ISD::TRN2;
+    return convertFromScalableVector(
+        DAG, VT, DAG.getNode(Opc, DL, ContainerVT, Op1, Op1));
+  }
+
+  // Functions like isZIPMask return true when a ISD::VECTOR_SHUFFLE's mask
+  // represents the same logical operation as performed by a ZIP instruction. In
+  // isolation these functions do not mean the ISD::VECTOR_SHUFFLE is exactly
+  // equivalent to an AArch64 instruction. There's the extra component of
+  // ISD::VECTOR_SHUFFLE's value type to consider. Prior to SVE these functions
+  // only operated on 64/128bit vector types that have a direct mapping to a
+  // target register and so an exact mapping is implied.
+  // However, when using SVE for fixed length vectors, most legal vector types
+  // are actually sub-vectors of a larger SVE register. When mapping
+  // ISD::VECTOR_SHUFFLE to an SVE instruction care must be taken to consider
+  // how the mask's indices translate. Specifically, when the mapping requires
+  // an exact meaning for a specific vector index (e.g. Index X is the last
+  // vector element in the register) then such mappings are often only safe when
+  // the exact SVE register size is know. The main exception to this is when
+  // indices are logically relative to the first element of either
+  // ISD::VECTOR_SHUFFLE operand because these relative indices don't change
+  // when converting from fixed-length to scalable vector types (i.e. the start
+  // of a fixed length vector is always the start of a scalable vector).
+  unsigned MinSVESize = Subtarget->getMinSVEVectorSizeInBits();
+  unsigned MaxSVESize = Subtarget->getMaxSVEVectorSizeInBits();
+  if (MinSVESize == MaxSVESize && MaxSVESize == VT.getSizeInBits()) {
+    if (ShuffleVectorInst::isReverseMask(ShuffleMask) && Op2.isUndef()) {
+      Op = DAG.getNode(ISD::VECTOR_REVERSE, DL, ContainerVT, Op1);
+      return convertFromScalableVector(DAG, VT, Op);
+    }
+
+    if (isZIPMask(ShuffleMask, VT, WhichResult) && WhichResult != 0)
+      return convertFromScalableVector(
+          DAG, VT, DAG.getNode(AArch64ISD::ZIP2, DL, ContainerVT, Op1, Op2));
+
+    if (isUZPMask(ShuffleMask, VT, WhichResult)) {
+      unsigned Opc = (WhichResult == 0) ? AArch64ISD::UZP1 : AArch64ISD::UZP2;
+      return convertFromScalableVector(
+          DAG, VT, DAG.getNode(Opc, DL, ContainerVT, Op1, Op2));
+    }
+
+    if (isZIP_v_undef_Mask(ShuffleMask, VT, WhichResult) && WhichResult != 0)
+      return convertFromScalableVector(
+          DAG, VT, DAG.getNode(AArch64ISD::ZIP2, DL, ContainerVT, Op1, Op1));
+
+    if (isUZP_v_undef_Mask(ShuffleMask, VT, WhichResult)) {
+      unsigned Opc = (WhichResult == 0) ? AArch64ISD::UZP1 : AArch64ISD::UZP2;
+      return convertFromScalableVector(
+          DAG, VT, DAG.getNode(Opc, DL, ContainerVT, Op1, Op1));
+    }
+  }
+
   return SDValue();
 }
 
@@ -18665,25 +23837,31 @@ SDValue AArch64TargetLowering::getSVESafeBitCast(EVT VT, SDValue Op,
                                                  SelectionDAG &DAG) const {
   SDLoc DL(Op);
   EVT InVT = Op.getValueType();
-  const TargetLowering &TLI = DAG.getTargetLoweringInfo();
-  (void)TLI;
 
-  assert(VT.isScalableVector() && TLI.isTypeLegal(VT) &&
-         InVT.isScalableVector() && TLI.isTypeLegal(InVT) &&
+  assert(VT.isScalableVector() && isTypeLegal(VT) &&
+         InVT.isScalableVector() && isTypeLegal(InVT) &&
          "Only expect to cast between legal scalable vector types!");
-  assert((VT.getVectorElementType() == MVT::i1) ==
-             (InVT.getVectorElementType() == MVT::i1) &&
-         "Cannot cast between data and predicate scalable vector types!");
+  assert(VT.getVectorElementType() != MVT::i1 &&
+         InVT.getVectorElementType() != MVT::i1 &&
+         "For predicate bitcasts, use getSVEPredicateBitCast");
 
   if (InVT == VT)
     return Op;
 
-  if (VT.getVectorElementType() == MVT::i1)
-    return DAG.getNode(AArch64ISD::REINTERPRET_CAST, DL, VT, Op);
-
   EVT PackedVT = getPackedSVEVectorVT(VT.getVectorElementType());
   EVT PackedInVT = getPackedSVEVectorVT(InVT.getVectorElementType());
 
+  // Safe bitcasting between unpacked vector types of different element counts
+  // is currently unsupported because the following is missing the necessary
+  // work to ensure the result's elements live where they're supposed to within
+  // an SVE register.
+  //                01234567
+  // e.g. nxv2i32 = XX??XX??
+  //      nxv4f16 = X?X?X?X?
+  assert((VT.getVectorElementCount() == InVT.getVectorElementCount() ||
+          VT == PackedVT || InVT == PackedInVT) &&
+         "Unexpected bitcast!");
+
   // Pack input if required.
   if (InVT != PackedInVT)
     Op = DAG.getNode(AArch64ISD::REINTERPRET_CAST, DL, PackedInVT, Op);
@@ -18697,8 +23875,9 @@ SDValue AArch64TargetLowering::getSVESafeBitCast(EVT VT, SDValue Op,
   return Op;
 }
 
-bool AArch64TargetLowering::isAllActivePredicate(SDValue N) const {
-  return ::isAllActivePredicate(N);
+bool AArch64TargetLowering::isAllActivePredicate(SelectionDAG &DAG,
+                                                 SDValue N) const {
+  return ::isAllActivePredicate(DAG, N);
 }
 
 EVT AArch64TargetLowering::getPromotedVTForPredicate(EVT VT) const {
@@ -18743,13 +23922,130 @@ bool AArch64TargetLowering::SimplifyDemandedBitsForTargetNode(
     // used - simplify to just Val.
     return TLO.CombineTo(Op, ShiftR->getOperand(0));
   }
+  case ISD::INTRINSIC_WO_CHAIN: {
+    if (auto ElementSize = IsSVECntIntrinsic(Op)) {
+      unsigned MaxSVEVectorSizeInBits = Subtarget->getMaxSVEVectorSizeInBits();
+      if (!MaxSVEVectorSizeInBits)
+        MaxSVEVectorSizeInBits = AArch64::SVEMaxBitsPerVector;
+      unsigned MaxElements = MaxSVEVectorSizeInBits / *ElementSize;
+      // The SVE count intrinsics don't support the multiplier immediate so we
+      // don't have to account for that here. The value returned may be slightly
+      // over the true required bits, as this is based on the "ALL" pattern. The
+      // other patterns are also exposed by these intrinsics, but they all
+      // return a value that's strictly less than "ALL".
+      unsigned RequiredBits = llvm::bit_width(MaxElements);
+      unsigned BitWidth = Known.Zero.getBitWidth();
+      if (RequiredBits < BitWidth)
+        Known.Zero.setHighBits(BitWidth - RequiredBits);
+      return false;
+    }
+  }
   }
 
   return TargetLowering::SimplifyDemandedBitsForTargetNode(
       Op, OriginalDemandedBits, OriginalDemandedElts, Known, TLO, Depth);
 }
 
-bool AArch64TargetLowering::isConstantUnsignedBitfieldExtactLegal(
+bool AArch64TargetLowering::isTargetCanonicalConstantNode(SDValue Op) const {
+  return Op.getOpcode() == AArch64ISD::DUP ||
+         Op.getOpcode() == AArch64ISD::MOVI ||
+         (Op.getOpcode() == ISD::EXTRACT_SUBVECTOR &&
+          Op.getOperand(0).getOpcode() == AArch64ISD::DUP) ||
+         TargetLowering::isTargetCanonicalConstantNode(Op);
+}
+
+bool AArch64TargetLowering::isConstantUnsignedBitfieldExtractLegal(
     unsigned Opc, LLT Ty1, LLT Ty2) const {
   return Ty1 == Ty2 && (Ty1 == LLT::scalar(32) || Ty1 == LLT::scalar(64));
 }
+
+bool AArch64TargetLowering::isComplexDeinterleavingSupported() const {
+  return Subtarget->hasComplxNum();
+}
+
+bool AArch64TargetLowering::isComplexDeinterleavingOperationSupported(
+    ComplexDeinterleavingOperation Operation, Type *Ty) const {
+  auto *VTy = dyn_cast<FixedVectorType>(Ty);
+  if (!VTy)
+    return false;
+
+  auto *ScalarTy = VTy->getScalarType();
+  unsigned NumElements = VTy->getNumElements();
+
+  unsigned VTyWidth = VTy->getScalarSizeInBits() * NumElements;
+  if ((VTyWidth < 128 && VTyWidth != 64) || !llvm::isPowerOf2_32(VTyWidth))
+    return false;
+
+  return (ScalarTy->isHalfTy() && Subtarget->hasFullFP16()) ||
+         ScalarTy->isFloatTy() || ScalarTy->isDoubleTy();
+}
+
+Value *AArch64TargetLowering::createComplexDeinterleavingIR(
+    Instruction *I, ComplexDeinterleavingOperation OperationType,
+    ComplexDeinterleavingRotation Rotation, Value *InputA, Value *InputB,
+    Value *Accumulator) const {
+  FixedVectorType *Ty = cast<FixedVectorType>(InputA->getType());
+
+  IRBuilder<> B(I);
+
+  unsigned TyWidth = Ty->getScalarSizeInBits() * Ty->getNumElements();
+
+  assert(((TyWidth >= 128 && llvm::isPowerOf2_32(TyWidth)) || TyWidth == 64) &&
+         "Vector type must be either 64 or a power of 2 that is at least 128");
+
+  if (TyWidth > 128) {
+    int Stride = Ty->getNumElements() / 2;
+    auto SplitSeq = llvm::seq<int>(0, Ty->getNumElements());
+    auto SplitSeqVec = llvm::to_vector(SplitSeq);
+    ArrayRef<int> LowerSplitMask(&SplitSeqVec[0], Stride);
+    ArrayRef<int> UpperSplitMask(&SplitSeqVec[Stride], Stride);
+
+    auto *LowerSplitA = B.CreateShuffleVector(InputA, LowerSplitMask);
+    auto *LowerSplitB = B.CreateShuffleVector(InputB, LowerSplitMask);
+    auto *UpperSplitA = B.CreateShuffleVector(InputA, UpperSplitMask);
+    auto *UpperSplitB = B.CreateShuffleVector(InputB, UpperSplitMask);
+    Value *LowerSplitAcc = nullptr;
+    Value *UpperSplitAcc = nullptr;
+
+    if (Accumulator) {
+      LowerSplitAcc = B.CreateShuffleVector(Accumulator, LowerSplitMask);
+      UpperSplitAcc = B.CreateShuffleVector(Accumulator, UpperSplitMask);
+    }
+
+    auto *LowerSplitInt = createComplexDeinterleavingIR(
+        I, OperationType, Rotation, LowerSplitA, LowerSplitB, LowerSplitAcc);
+    auto *UpperSplitInt = createComplexDeinterleavingIR(
+        I, OperationType, Rotation, UpperSplitA, UpperSplitB, UpperSplitAcc);
+
+    ArrayRef<int> JoinMask(&SplitSeqVec[0], Ty->getNumElements());
+    return B.CreateShuffleVector(LowerSplitInt, UpperSplitInt, JoinMask);
+  }
+
+  if (OperationType == ComplexDeinterleavingOperation::CMulPartial) {
+    Intrinsic::ID IdMap[4] = {Intrinsic::aarch64_neon_vcmla_rot0,
+                              Intrinsic::aarch64_neon_vcmla_rot90,
+                              Intrinsic::aarch64_neon_vcmla_rot180,
+                              Intrinsic::aarch64_neon_vcmla_rot270};
+
+    if (Accumulator == nullptr)
+      Accumulator = ConstantFP::get(Ty, 0);
+
+    return B.CreateIntrinsic(IdMap[(int)Rotation], Ty,
+                             {Accumulator, InputB, InputA});
+  }
+
+  if (OperationType == ComplexDeinterleavingOperation::CAdd) {
+    Intrinsic::ID IntId = Intrinsic::not_intrinsic;
+    if (Rotation == ComplexDeinterleavingRotation::Rotation_90)
+      IntId = Intrinsic::aarch64_neon_vcadd_rot90;
+    else if (Rotation == ComplexDeinterleavingRotation::Rotation_270)
+      IntId = Intrinsic::aarch64_neon_vcadd_rot270;
+
+    if (IntId == Intrinsic::not_intrinsic)
+      return nullptr;
+
+    return B.CreateIntrinsic(IntId, Ty, {InputA, InputB});
+  }
+
+  return nullptr;
+}
diff --git a/gnu/llvm/llvm/lib/Target/AArch64/AArch64InstrInfo.cpp b/gnu/llvm/llvm/lib/Target/AArch64/AArch64InstrInfo.cpp
index 0aec46ce3ab..3091e87cadb 100644
--- a/gnu/llvm/llvm/lib/Target/AArch64/AArch64InstrInfo.cpp
+++ b/gnu/llvm/llvm/lib/Target/AArch64/AArch64InstrInfo.cpp
@@ -19,6 +19,7 @@
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/CodeGen/MachineBasicBlock.h"
+#include "llvm/CodeGen/MachineCombinerPattern.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineInstr.h"
@@ -42,6 +43,7 @@
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/ErrorHandling.h"
+#include "llvm/Support/LEB128.h"
 #include "llvm/Support/MathExtras.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetOptions.h"
@@ -93,9 +95,18 @@ unsigned AArch64InstrInfo::getInstSizeInBytes(const MachineInstr &MI) const {
   //        before the assembly printer.
   unsigned NumBytes = 0;
   const MCInstrDesc &Desc = MI.getDesc();
+
+  // Size should be preferably set in
+  // llvm/lib/Target/AArch64/AArch64InstrInfo.td (default case).
+  // Specific cases handle instructions of variable sizes
   switch (Desc.getOpcode()) {
   default:
-    // Anything not explicitly designated otherwise is a normal 4-byte insn.
+    if (Desc.getSize())
+      return Desc.getSize();
+
+    // Anything not explicitly designated otherwise (i.e. pseudo-instructions
+    // with fixed constant size but not specified in .td file) is a normal
+    // 4-byte insn.
     NumBytes = 4;
 
     if (Desc.getSize() > 0)
@@ -118,29 +129,9 @@ unsigned AArch64InstrInfo::getInstSizeInBytes(const MachineInstr &MI) const {
     if (NumBytes == 0)
       NumBytes = 4;
     break;
-  case AArch64::TLSDESC_CALLSEQ:
-    // This gets lowered to an instruction sequence which takes 16 bytes
-    NumBytes = 16;
-    break;
-  case AArch64::SpeculationBarrierISBDSBEndBB:
-    // This gets lowered to 2 4-byte instructions.
-    NumBytes = 8;
-    break;
-  case AArch64::SpeculationBarrierSBEndBB:
-    // This gets lowered to 1 4-byte instructions.
-    NumBytes = 4;
-    break;
-  case AArch64::JumpTableDest32:
-  case AArch64::JumpTableDest16:
-  case AArch64::JumpTableDest8:
-    NumBytes = 12;
-    break;
   case AArch64::SPACE:
     NumBytes = MI.getOperand(1).getImm();
     break;
-  case AArch64::StoreSwiftAsyncContext:
-    NumBytes = 20;
-    break;
   case TargetOpcode::BUNDLE:
     NumBytes = getInstBundleLength(MI);
     break;
@@ -562,7 +553,7 @@ static unsigned canFoldIntoCSel(const MachineRegisterInfo &MRI, unsigned VReg,
     if (DefMI->findRegisterDefOperandIdx(AArch64::NZCV, true) == -1)
       return 0;
     // fall-through to ADDXri and ADDWri.
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case AArch64::ADDXri:
   case AArch64::ADDWri:
     // add x, 1 -> csinc.
@@ -590,7 +581,7 @@ static unsigned canFoldIntoCSel(const MachineRegisterInfo &MRI, unsigned VReg,
     if (DefMI->findRegisterDefOperandIdx(AArch64::NZCV, true) == -1)
       return 0;
     // fall-through to SUBXrr and SUBWrr.
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case AArch64::SUBXrr:
   case AArch64::SUBWrr: {
     // neg x -> csneg, represented as sub dst, xzr, src.
@@ -1029,6 +1020,7 @@ bool AArch64InstrInfo::isSEHInstruction(const MachineInstr &MI) {
     case AArch64::SEH_PrologEnd:
     case AArch64::SEH_EpilogStart:
     case AArch64::SEH_EpilogEnd:
+    case AArch64::SEH_PACSignLR:
       return true;
   }
 }
@@ -1106,37 +1098,34 @@ bool AArch64InstrInfo::isSchedulingBoundary(const MachineInstr &MI,
   case AArch64::ISB:
     // DSB and ISB also are scheduling barriers.
     return true;
+  case AArch64::MSRpstatesvcrImm1:
+    // SMSTART and SMSTOP are also scheduling barriers.
+    return true;
   default:;
   }
-  return isSEHInstruction(MI);
+  if (isSEHInstruction(MI))
+    return true;
+  auto Next = std::next(MI.getIterator());
+  return Next != MBB->end() && Next->isCFIInstruction();
 }
 
 /// analyzeCompare - For a comparison instruction, return the source registers
 /// in SrcReg and SrcReg2, and the value it compares against in CmpValue.
 /// Return true if the comparison instruction can be analyzed.
 bool AArch64InstrInfo::analyzeCompare(const MachineInstr &MI, Register &SrcReg,
-                                      Register &SrcReg2, int &CmpMask,
-                                      int &CmpValue) const {
+                                      Register &SrcReg2, int64_t &CmpMask,
+                                      int64_t &CmpValue) const {
   // The first operand can be a frame index where we'd normally expect a
   // register.
   assert(MI.getNumOperands() >= 2 && "All AArch64 cmps should have 2 operands");
   if (!MI.getOperand(1).isReg())
     return false;
 
-  auto NormalizeCmpValue = [](int64_t Value) -> int {
-    // Comparison immediates may be 64-bit, but CmpValue is only an int.
-    // Normalize to 0/1/2 return value, where 2 indicates any value apart from
-    // 0 or 1.
-    // TODO: Switch CmpValue to int64_t in the API to avoid this.
-    if (Value == 0 || Value == 1)
-      return Value;
-    return 2;
-  };
-
   switch (MI.getOpcode()) {
   default:
     break;
   case AArch64::PTEST_PP:
+  case AArch64::PTEST_PP_ANY:
     SrcReg = MI.getOperand(0).getReg();
     SrcReg2 = MI.getOperand(1).getReg();
     // Not sure about the mask and value for now...
@@ -1168,7 +1157,7 @@ bool AArch64InstrInfo::analyzeCompare(const MachineInstr &MI, Register &SrcReg,
     SrcReg = MI.getOperand(1).getReg();
     SrcReg2 = 0;
     CmpMask = ~0;
-    CmpValue = NormalizeCmpValue(MI.getOperand(2).getImm());
+    CmpValue = MI.getOperand(2).getImm();
     return true;
   case AArch64::ANDSWri:
   case AArch64::ANDSXri:
@@ -1177,9 +1166,9 @@ bool AArch64InstrInfo::analyzeCompare(const MachineInstr &MI, Register &SrcReg,
     SrcReg = MI.getOperand(1).getReg();
     SrcReg2 = 0;
     CmpMask = ~0;
-    CmpValue = NormalizeCmpValue(AArch64_AM::decodeLogicalImmediate(
+    CmpValue = AArch64_AM::decodeLogicalImmediate(
                    MI.getOperand(2).getImm(),
-                   MI.getOpcode() == AArch64::ANDSWri ? 32 : 64));
+                   MI.getOpcode() == AArch64::ANDSWri ? 32 : 64);
     return true;
   }
 
@@ -1213,7 +1202,7 @@ static bool UpdateOperandRegClass(MachineInstr &Instr) {
            "Operand has register constraints without being a register!");
 
     Register Reg = MO.getReg();
-    if (Register::isPhysicalRegister(Reg)) {
+    if (Reg.isPhysical()) {
       if (!OpRegCstraints->contains(Reg))
         return false;
     } else if (!OpRegCstraints->hasSubClassEq(MRI->getRegClass(Reg)) &&
@@ -1322,76 +1311,105 @@ bool AArch64InstrInfo::optimizePTestInstr(
   bool PredIsPTestLike = isPTestLikeOpcode(PredOpcode);
   bool PredIsWhileLike = isWhileOpcode(PredOpcode);
 
-  if (isPTrueOpcode(MaskOpcode) && (PredIsPTestLike || PredIsWhileLike)) {
-    // For PTEST(PTRUE, OTHER_INST), PTEST is redundant when PTRUE doesn't
-    // deactivate any lanes OTHER_INST might set.
-    uint64_t MaskElementSize = getElementSizeForOpcode(MaskOpcode);
-    uint64_t PredElementSize = getElementSizeForOpcode(PredOpcode);
-
-    // Must be an all active predicate of matching element size.
-    if ((PredElementSize != MaskElementSize) ||
-        (Mask->getOperand(1).getImm() != 31))
-      return false;
+  if (isPTrueOpcode(MaskOpcode) && (PredIsPTestLike || PredIsWhileLike) &&
+      getElementSizeForOpcode(MaskOpcode) ==
+          getElementSizeForOpcode(PredOpcode) &&
+      Mask->getOperand(1).getImm() == 31) {
+    // For PTEST(PTRUE_ALL, WHILE), if the element size matches, the PTEST is
+    // redundant since WHILE performs an implicit PTEST with an all active
+    // mask. Must be an all active predicate of matching element size.
+
+    // For PTEST(PTRUE_ALL, PTEST_LIKE), the PTEST is redundant if the
+    // PTEST_LIKE instruction uses the same all active mask and the element
+    // size matches. If the PTEST has a condition of any then it is always
+    // redundant.
+    if (PredIsPTestLike) {
+      auto PTestLikeMask = MRI->getUniqueVRegDef(Pred->getOperand(1).getReg());
+      if (Mask != PTestLikeMask && PTest->getOpcode() != AArch64::PTEST_PP_ANY)
+        return false;
+    }
 
     // Fallthough to simply remove the PTEST.
-  } else if ((Mask == Pred) && (PredIsPTestLike || PredIsWhileLike)) {
+  } else if ((Mask == Pred) && (PredIsPTestLike || PredIsWhileLike) &&
+             PTest->getOpcode() == AArch64::PTEST_PP_ANY) {
     // For PTEST(PG, PG), PTEST is redundant when PG is the result of an
-    // instruction that sets the flags as PTEST would.
+    // instruction that sets the flags as PTEST would. This is only valid when
+    // the condition is any.
 
     // Fallthough to simply remove the PTEST.
   } else if (PredIsPTestLike) {
-    // For PTEST(PG_1, PTEST_LIKE(PG2, ...)), PTEST is redundant when both
-    // instructions use the same predicate.
+    // For PTEST(PG, PTEST_LIKE(PG, ...)), the PTEST is redundant since the
+    // flags are set based on the same mask 'PG', but PTEST_LIKE must operate
+    // on 8-bit predicates like the PTEST.  Otherwise, for instructions like
+    // compare that also support 16/32/64-bit predicates, the implicit PTEST
+    // performed by the compare could consider fewer lanes for these element
+    // sizes.
+    //
+    // For example, consider
+    //
+    //   ptrue p0.b                    ; P0=1111-1111-1111-1111
+    //   index z0.s, #0, #1            ; Z0=<0,1,2,3>
+    //   index z1.s, #1, #1            ; Z1=<1,2,3,4>
+    //   cmphi p1.s, p0/z, z1.s, z0.s  ; P1=0001-0001-0001-0001
+    //                                 ;       ^ last active
+    //   ptest p0, p1.b                ; P1=0001-0001-0001-0001
+    //                                 ;     ^ last active
+    //
+    // where the compare generates a canonical all active 32-bit predicate
+    // (equivalent to 'ptrue p1.s, all'). The implicit PTEST sets the last
+    // active flag, whereas the PTEST instruction with the same mask doesn't.
+    // For PTEST_ANY this doesn't apply as the flags in this case would be
+    // identical regardless of element size.
     auto PTestLikeMask = MRI->getUniqueVRegDef(Pred->getOperand(1).getReg());
-    if (Mask != PTestLikeMask)
+    uint64_t PredElementSize = getElementSizeForOpcode(PredOpcode);
+    if ((Mask != PTestLikeMask) ||
+        (PredElementSize != AArch64::ElementSizeB &&
+         PTest->getOpcode() != AArch64::PTEST_PP_ANY))
       return false;
 
     // Fallthough to simply remove the PTEST.
   } else {
-    switch (Pred->getOpcode()) {
+    // If OP in PTEST(PG, OP(PG, ...)) has a flag-setting variant change the
+    // opcode so the PTEST becomes redundant.
+    switch (PredOpcode) {
+    case AArch64::AND_PPzPP:
+    case AArch64::BIC_PPzPP:
+    case AArch64::EOR_PPzPP:
+    case AArch64::NAND_PPzPP:
+    case AArch64::NOR_PPzPP:
+    case AArch64::ORN_PPzPP:
+    case AArch64::ORR_PPzPP:
+    case AArch64::BRKA_PPzP:
+    case AArch64::BRKPA_PPzPP:
     case AArch64::BRKB_PPzP:
-    case AArch64::BRKPB_PPzPP: {
-      // Op 0 is chain, 1 is the mask, 2 the previous predicate to
-      // propagate, 3 the new predicate.
-
-      // Check to see if our mask is the same as the brkpb's. If
-      // not the resulting flag bits may be different and we
-      // can't remove the ptest.
+    case AArch64::BRKPB_PPzPP:
+    case AArch64::RDFFR_PPz: {
+      // Check to see if our mask is the same. If not the resulting flag bits
+      // may be different and we can't remove the ptest.
       auto *PredMask = MRI->getUniqueVRegDef(Pred->getOperand(1).getReg());
       if (Mask != PredMask)
         return false;
-
-      // Switch to the new opcode
-      NewOp = Pred->getOpcode() == AArch64::BRKB_PPzP ? AArch64::BRKBS_PPzP
-                                                      : AArch64::BRKPBS_PPzPP;
-      OpChanged = true;
       break;
     }
     case AArch64::BRKN_PPzP: {
-      auto *PredMask = MRI->getUniqueVRegDef(Pred->getOperand(1).getReg());
-      if (Mask != PredMask)
+      // BRKN uses an all active implicit mask to set flags unlike the other
+      // flag-setting instructions.
+      // PTEST(PTRUE_B(31), BRKN(PG, A, B)) -> BRKNS(PG, A, B).
+      if ((MaskOpcode != AArch64::PTRUE_B) ||
+          (Mask->getOperand(1).getImm() != 31))
         return false;
-
-      NewOp = AArch64::BRKNS_PPzP;
-      OpChanged = true;
       break;
     }
-    case AArch64::RDFFR_PPz: {
-      // rdffr   p1.b, PredMask=p0/z <--- Definition of Pred
-      // ptest   Mask=p0, Pred=p1.b  <--- If equal masks, remove this and use
-      //                                  `rdffrs p1.b, p0/z` above.
-      auto *PredMask = MRI->getUniqueVRegDef(Pred->getOperand(1).getReg());
-      if (Mask != PredMask)
-        return false;
-
-      NewOp = AArch64::RDFFRS_PPz;
-      OpChanged = true;
+    case AArch64::PTRUE_B:
+      // PTEST(OP=PTRUE_B(A), OP) -> PTRUES_B(A)
       break;
-    }
     default:
       // Bail out if we don't recognize the input
       return false;
     }
+
+    NewOp = convertToFlagSettingOpc(PredOpcode);
+    OpChanged = true;
   }
 
   const TargetRegisterInfo *TRI = &getRegisterInfo();
@@ -1440,8 +1458,8 @@ bool AArch64InstrInfo::optimizePTestInstr(
 ///    instruction.
 ///    Only comparison with zero is supported.
 bool AArch64InstrInfo::optimizeCompareInstr(
-    MachineInstr &CmpInstr, Register SrcReg, Register SrcReg2, int CmpMask,
-    int CmpValue, const MachineRegisterInfo *MRI) const {
+    MachineInstr &CmpInstr, Register SrcReg, Register SrcReg2, int64_t CmpMask,
+    int64_t CmpValue, const MachineRegisterInfo *MRI) const {
   assert(CmpInstr.getParent());
   assert(MRI);
 
@@ -1459,19 +1477,17 @@ bool AArch64InstrInfo::optimizeCompareInstr(
       return false;
     const MCInstrDesc &MCID = get(NewOpc);
     CmpInstr.setDesc(MCID);
-    CmpInstr.RemoveOperand(DeadNZCVIdx);
+    CmpInstr.removeOperand(DeadNZCVIdx);
     bool succeeded = UpdateOperandRegClass(CmpInstr);
     (void)succeeded;
     assert(succeeded && "Some operands reg class are incompatible!");
     return true;
   }
 
-  if (CmpInstr.getOpcode() == AArch64::PTEST_PP)
+  if (CmpInstr.getOpcode() == AArch64::PTEST_PP ||
+      CmpInstr.getOpcode() == AArch64::PTEST_PP_ANY)
     return optimizePTestInstr(&CmpInstr, SrcReg, SrcReg2, MRI);
 
-  // Warning: CmpValue == 2 indicates *any* value apart from 0 or 1.
-  assert((CmpValue == 0 || CmpValue == 1 || CmpValue == 2) &&
-         "CmpValue must be 0, 1, or 2!");
   if (SrcReg2 != 0)
     return false;
 
@@ -1574,27 +1590,6 @@ findCondCodeUseOperandIdxForBranchOrSelect(const MachineInstr &Instr) {
   }
 }
 
-namespace {
-
-struct UsedNZCV {
-  bool N = false;
-  bool Z = false;
-  bool C = false;
-  bool V = false;
-
-  UsedNZCV() = default;
-
-  UsedNZCV &operator|=(const UsedNZCV &UsedFlags) {
-    this->N |= UsedFlags.N;
-    this->Z |= UsedFlags.Z;
-    this->C |= UsedFlags.C;
-    this->V |= UsedFlags.V;
-    return *this;
-  }
-};
-
-} // end anonymous namespace
-
 /// Find a condition code used by the instruction.
 /// Returns AArch64CC::Invalid if either the instruction does not use condition
 /// codes or we don't optimize CmpInstr in the presence of such instructions.
@@ -1620,7 +1615,7 @@ static UsedNZCV getUsedNZCV(AArch64CC::CondCode CC) {
   case AArch64CC::HI: // Z clear and C set
   case AArch64CC::LS: // Z set   or  C clear
     UsedFlags.Z = true;
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case AArch64CC::HS: // C set
   case AArch64CC::LO: // C clear
     UsedFlags.C = true;
@@ -1639,7 +1634,7 @@ static UsedNZCV getUsedNZCV(AArch64CC::CondCode CC) {
   case AArch64CC::GT: // Z clear, N and V the same
   case AArch64CC::LE: // Z set,   N and V differ
     UsedFlags.Z = true;
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case AArch64CC::GE: // N and V the same
   case AArch64CC::LT: // N and V differ
     UsedFlags.N = true;
@@ -1649,21 +1644,21 @@ static UsedNZCV getUsedNZCV(AArch64CC::CondCode CC) {
   return UsedFlags;
 }
 
-/// \returns Conditions flags used after \p CmpInstr in its MachineBB if they
-/// are not containing C or V flags and NZCV flags are not alive in successors
-/// of the same \p CmpInstr and \p MI parent. \returns None otherwise.
+/// \returns Conditions flags used after \p CmpInstr in its MachineBB if NZCV
+/// flags are not alive in successors of the same \p CmpInstr and \p MI parent.
+/// \returns std::nullopt otherwise.
 ///
 /// Collect instructions using that flags in \p CCUseInstrs if provided.
-static Optional<UsedNZCV>
-examineCFlagsUse(MachineInstr &MI, MachineInstr &CmpInstr,
-                 const TargetRegisterInfo &TRI,
-                 SmallVectorImpl<MachineInstr *> *CCUseInstrs = nullptr) {
+std::optional<UsedNZCV>
+llvm::examineCFlagsUse(MachineInstr &MI, MachineInstr &CmpInstr,
+                       const TargetRegisterInfo &TRI,
+                       SmallVectorImpl<MachineInstr *> *CCUseInstrs) {
   MachineBasicBlock *CmpParent = CmpInstr.getParent();
   if (MI.getParent() != CmpParent)
-    return None;
+    return std::nullopt;
 
   if (areCFlagsAliveInSuccessors(CmpParent))
-    return None;
+    return std::nullopt;
 
   UsedNZCV NZCVUsedAfterCmp;
   for (MachineInstr &Instr : instructionsWithoutDebug(
@@ -1671,7 +1666,7 @@ examineCFlagsUse(MachineInstr &MI, MachineInstr &CmpInstr,
     if (Instr.readsRegister(AArch64::NZCV, &TRI)) {
       AArch64CC::CondCode CC = findCondCodeUsedByInstr(Instr);
       if (CC == AArch64CC::Invalid) // Unsupported conditional instruction
-        return None;
+        return std::nullopt;
       NZCVUsedAfterCmp |= getUsedNZCV(CC);
       if (CCUseInstrs)
         CCUseInstrs->push_back(&Instr);
@@ -1679,8 +1674,6 @@ examineCFlagsUse(MachineInstr &MI, MachineInstr &CmpInstr,
     if (Instr.modifiesRegister(AArch64::NZCV, &TRI))
       break;
   }
-  if (NZCVUsedAfterCmp.C || NZCVUsedAfterCmp.V)
-    return None;
   return NZCVUsedAfterCmp;
 }
 
@@ -1711,7 +1704,8 @@ static bool canInstrSubstituteCmpInstr(MachineInstr &MI, MachineInstr &CmpInstr,
   if (!isADDSRegImm(CmpOpcode) && !isSUBSRegImm(CmpOpcode))
     return false;
 
-  if (!examineCFlagsUse(MI, CmpInstr, TRI))
+  std::optional<UsedNZCV> NZVCUsed = examineCFlagsUse(MI, CmpInstr, TRI);
+  if (!NZVCUsed || NZVCUsed->C || NZVCUsed->V)
     return false;
 
   AccessKind AccessToCheck = AK_Write;
@@ -1796,11 +1790,11 @@ static bool canCmpInstrBeRemoved(MachineInstr &MI, MachineInstr &CmpInstr,
   if (MIUsedNZCV.C || MIUsedNZCV.V)
     return false;
 
-  Optional<UsedNZCV> NZCVUsedAfterCmp =
+  std::optional<UsedNZCV> NZCVUsedAfterCmp =
       examineCFlagsUse(MI, CmpInstr, TRI, &CCUseInstrs);
   // Condition flags are not used in CmpInstr basic block successors and only
   // Z or N flags allowed to be used after CmpInstr within its basic block
-  if (!NZCVUsedAfterCmp)
+  if (!NZCVUsedAfterCmp || NZCVUsedAfterCmp->C || NZCVUsedAfterCmp->V)
     return false;
   // Z or N flag used after CmpInstr must correspond to the flag used in MI
   if ((MIUsedNZCV.Z && NZCVUsedAfterCmp->N) ||
@@ -1822,7 +1816,7 @@ static bool canCmpInstrBeRemoved(MachineInstr &MI, MachineInstr &CmpInstr,
   return true;
 }
 
-/// Remove comparision in csinc-cmp sequence
+/// Remove comparison in csinc-cmp sequence
 ///
 /// Examples:
 /// 1. \code
@@ -2106,10 +2100,8 @@ bool AArch64InstrInfo::isFPRCopy(const MachineInstr &MI) {
   default:
     break;
   case TargetOpcode::COPY: {
-    // FPR64 copies will by lowered to ORR.16b
     Register DstReg = MI.getOperand(0).getReg();
-    return (AArch64::FPR64RegClass.contains(DstReg) ||
-            AArch64::FPR128RegClass.contains(DstReg));
+    return AArch64::FPR128RegClass.contains(DstReg);
   }
   case AArch64::ORRv16i8:
     if (MI.getOperand(1).getReg() == MI.getOperand(2).getReg()) {
@@ -2225,7 +2217,7 @@ bool AArch64InstrInfo::hasUnscaledLdStOffset(unsigned Opc) {
   }
 }
 
-Optional<unsigned> AArch64InstrInfo::getUnscaledLdSt(unsigned Opc) {
+std::optional<unsigned> AArch64InstrInfo::getUnscaledLdSt(unsigned Opc) {
   switch (Opc) {
   default: return {};
   case AArch64::PRFMui: return AArch64::PRFUMi;
@@ -2281,32 +2273,61 @@ unsigned AArch64InstrInfo::getLoadStoreImmIdx(unsigned Opc) {
   case AArch64::STNPSi:
   case AArch64::LDG:
   case AArch64::STGPi:
+
   case AArch64::LD1B_IMM:
-  case AArch64::LD1H_IMM:
-  case AArch64::LD1W_IMM:
-  case AArch64::LD1D_IMM:
-  case AArch64::ST1B_IMM:
-  case AArch64::ST1H_IMM:
-  case AArch64::ST1W_IMM:
-  case AArch64::ST1D_IMM:
   case AArch64::LD1B_H_IMM:
+  case AArch64::LD1B_S_IMM:
+  case AArch64::LD1B_D_IMM:
   case AArch64::LD1SB_H_IMM:
+  case AArch64::LD1SB_S_IMM:
+  case AArch64::LD1SB_D_IMM:
+  case AArch64::LD1H_IMM:
   case AArch64::LD1H_S_IMM:
+  case AArch64::LD1H_D_IMM:
   case AArch64::LD1SH_S_IMM:
+  case AArch64::LD1SH_D_IMM:
+  case AArch64::LD1W_IMM:
   case AArch64::LD1W_D_IMM:
   case AArch64::LD1SW_D_IMM:
+  case AArch64::LD1D_IMM:
+
+  case AArch64::LD2B_IMM:
+  case AArch64::LD2H_IMM:
+  case AArch64::LD2W_IMM:
+  case AArch64::LD2D_IMM:
+  case AArch64::LD3B_IMM:
+  case AArch64::LD3H_IMM:
+  case AArch64::LD3W_IMM:
+  case AArch64::LD3D_IMM:
+  case AArch64::LD4B_IMM:
+  case AArch64::LD4H_IMM:
+  case AArch64::LD4W_IMM:
+  case AArch64::LD4D_IMM:
+
+  case AArch64::ST1B_IMM:
   case AArch64::ST1B_H_IMM:
-  case AArch64::ST1H_S_IMM:
-  case AArch64::ST1W_D_IMM:
-  case AArch64::LD1B_S_IMM:
-  case AArch64::LD1SB_S_IMM:
-  case AArch64::LD1H_D_IMM:
-  case AArch64::LD1SH_D_IMM:
   case AArch64::ST1B_S_IMM:
-  case AArch64::ST1H_D_IMM:
-  case AArch64::LD1B_D_IMM:
-  case AArch64::LD1SB_D_IMM:
   case AArch64::ST1B_D_IMM:
+  case AArch64::ST1H_IMM:
+  case AArch64::ST1H_S_IMM:
+  case AArch64::ST1H_D_IMM:
+  case AArch64::ST1W_IMM:
+  case AArch64::ST1W_D_IMM:
+  case AArch64::ST1D_IMM:
+
+  case AArch64::ST2B_IMM:
+  case AArch64::ST2H_IMM:
+  case AArch64::ST2W_IMM:
+  case AArch64::ST2D_IMM:
+  case AArch64::ST3B_IMM:
+  case AArch64::ST3H_IMM:
+  case AArch64::ST3W_IMM:
+  case AArch64::ST3D_IMM:
+  case AArch64::ST4B_IMM:
+  case AArch64::ST4H_IMM:
+  case AArch64::ST4W_IMM:
+  case AArch64::ST4D_IMM:
+
   case AArch64::LD1RB_IMM:
   case AArch64::LD1RB_H_IMM:
   case AArch64::LD1RB_S_IMM:
@@ -2323,6 +2344,32 @@ unsigned AArch64InstrInfo::getLoadStoreImmIdx(unsigned Opc) {
   case AArch64::LD1RW_D_IMM:
   case AArch64::LD1RSW_IMM:
   case AArch64::LD1RD_IMM:
+
+  case AArch64::LDNT1B_ZRI:
+  case AArch64::LDNT1H_ZRI:
+  case AArch64::LDNT1W_ZRI:
+  case AArch64::LDNT1D_ZRI:
+  case AArch64::STNT1B_ZRI:
+  case AArch64::STNT1H_ZRI:
+  case AArch64::STNT1W_ZRI:
+  case AArch64::STNT1D_ZRI:
+
+  case AArch64::LDNF1B_IMM:
+  case AArch64::LDNF1B_H_IMM:
+  case AArch64::LDNF1B_S_IMM:
+  case AArch64::LDNF1B_D_IMM:
+  case AArch64::LDNF1SB_H_IMM:
+  case AArch64::LDNF1SB_S_IMM:
+  case AArch64::LDNF1SB_D_IMM:
+  case AArch64::LDNF1H_IMM:
+  case AArch64::LDNF1H_S_IMM:
+  case AArch64::LDNF1H_D_IMM:
+  case AArch64::LDNF1SH_S_IMM:
+  case AArch64::LDNF1SH_D_IMM:
+  case AArch64::LDNF1W_IMM:
+  case AArch64::LDNF1W_D_IMM:
+  case AArch64::LDNF1SW_D_IMM:
+  case AArch64::LDNF1D_IMM:
     return 3;
   case AArch64::ADDG:
   case AArch64::STGOffset:
@@ -2374,91 +2421,93 @@ bool AArch64InstrInfo::isPairableLdStInst(const MachineInstr &MI) {
   }
 }
 
-unsigned AArch64InstrInfo::convertToFlagSettingOpc(unsigned Opc,
-                                                   bool &Is64Bit) {
+unsigned AArch64InstrInfo::convertToFlagSettingOpc(unsigned Opc) {
   switch (Opc) {
   default:
     llvm_unreachable("Opcode has no flag setting equivalent!");
   // 32-bit cases:
   case AArch64::ADDWri:
-    Is64Bit = false;
     return AArch64::ADDSWri;
   case AArch64::ADDWrr:
-    Is64Bit = false;
     return AArch64::ADDSWrr;
   case AArch64::ADDWrs:
-    Is64Bit = false;
     return AArch64::ADDSWrs;
   case AArch64::ADDWrx:
-    Is64Bit = false;
     return AArch64::ADDSWrx;
   case AArch64::ANDWri:
-    Is64Bit = false;
     return AArch64::ANDSWri;
   case AArch64::ANDWrr:
-    Is64Bit = false;
     return AArch64::ANDSWrr;
   case AArch64::ANDWrs:
-    Is64Bit = false;
     return AArch64::ANDSWrs;
   case AArch64::BICWrr:
-    Is64Bit = false;
     return AArch64::BICSWrr;
   case AArch64::BICWrs:
-    Is64Bit = false;
     return AArch64::BICSWrs;
   case AArch64::SUBWri:
-    Is64Bit = false;
     return AArch64::SUBSWri;
   case AArch64::SUBWrr:
-    Is64Bit = false;
     return AArch64::SUBSWrr;
   case AArch64::SUBWrs:
-    Is64Bit = false;
     return AArch64::SUBSWrs;
   case AArch64::SUBWrx:
-    Is64Bit = false;
     return AArch64::SUBSWrx;
   // 64-bit cases:
   case AArch64::ADDXri:
-    Is64Bit = true;
     return AArch64::ADDSXri;
   case AArch64::ADDXrr:
-    Is64Bit = true;
     return AArch64::ADDSXrr;
   case AArch64::ADDXrs:
-    Is64Bit = true;
     return AArch64::ADDSXrs;
   case AArch64::ADDXrx:
-    Is64Bit = true;
     return AArch64::ADDSXrx;
   case AArch64::ANDXri:
-    Is64Bit = true;
     return AArch64::ANDSXri;
   case AArch64::ANDXrr:
-    Is64Bit = true;
     return AArch64::ANDSXrr;
   case AArch64::ANDXrs:
-    Is64Bit = true;
     return AArch64::ANDSXrs;
   case AArch64::BICXrr:
-    Is64Bit = true;
     return AArch64::BICSXrr;
   case AArch64::BICXrs:
-    Is64Bit = true;
     return AArch64::BICSXrs;
   case AArch64::SUBXri:
-    Is64Bit = true;
     return AArch64::SUBSXri;
   case AArch64::SUBXrr:
-    Is64Bit = true;
     return AArch64::SUBSXrr;
   case AArch64::SUBXrs:
-    Is64Bit = true;
     return AArch64::SUBSXrs;
   case AArch64::SUBXrx:
-    Is64Bit = true;
     return AArch64::SUBSXrx;
+  // SVE instructions:
+  case AArch64::AND_PPzPP:
+    return AArch64::ANDS_PPzPP;
+  case AArch64::BIC_PPzPP:
+    return AArch64::BICS_PPzPP;
+  case AArch64::EOR_PPzPP:
+    return AArch64::EORS_PPzPP;
+  case AArch64::NAND_PPzPP:
+    return AArch64::NANDS_PPzPP;
+  case AArch64::NOR_PPzPP:
+    return AArch64::NORS_PPzPP;
+  case AArch64::ORN_PPzPP:
+    return AArch64::ORNS_PPzPP;
+  case AArch64::ORR_PPzPP:
+    return AArch64::ORRS_PPzPP;
+  case AArch64::BRKA_PPzP:
+    return AArch64::BRKAS_PPzP;
+  case AArch64::BRKPA_PPzPP:
+    return AArch64::BRKPAS_PPzPP;
+  case AArch64::BRKB_PPzP:
+    return AArch64::BRKBS_PPzP;
+  case AArch64::BRKPB_PPzPP:
+    return AArch64::BRKPBS_PPzPP;
+  case AArch64::BRKN_PPzP:
+    return AArch64::BRKNS_PPzP;
+  case AArch64::RDFFR_PPz:
+    return AArch64::RDFFRS_PPz;
+  case AArch64::PTRUE_B:
+    return AArch64::PTRUES_B;
   }
 }
 
@@ -2548,21 +2597,22 @@ bool AArch64InstrInfo::getMemOperandsWithOffsetWidth(
   return true;
 }
 
-Optional<ExtAddrMode>
+std::optional<ExtAddrMode>
 AArch64InstrInfo::getAddrModeFromMemoryOp(const MachineInstr &MemI,
                                           const TargetRegisterInfo *TRI) const {
   const MachineOperand *Base; // Filled with the base operand of MI.
   int64_t Offset;             // Filled with the offset of MI.
   bool OffsetIsScalable;
   if (!getMemOperandWithOffset(MemI, Base, Offset, OffsetIsScalable, TRI))
-    return None;
+    return std::nullopt;
 
   if (!Base->isReg())
-    return None;
+    return std::nullopt;
   ExtAddrMode AM;
   AM.BaseReg = Base->getReg();
   AM.Displacement = Offset;
   AM.ScaledReg = 0;
+  AM.Scale = 0;
   return AM;
 }
 
@@ -2600,11 +2650,11 @@ bool AArch64InstrInfo::getMemOperandWithOffsetWidth(
   // set to 1.
   if (LdSt.getNumExplicitOperands() == 3) {
     BaseOp = &LdSt.getOperand(1);
-    Offset = LdSt.getOperand(2).getImm() * Scale.getKnownMinSize();
+    Offset = LdSt.getOperand(2).getImm() * Scale.getKnownMinValue();
   } else {
     assert(LdSt.getNumExplicitOperands() == 4 && "invalid number of operands");
     BaseOp = &LdSt.getOperand(2);
-    Offset = LdSt.getOperand(3).getImm() * Scale.getKnownMinSize();
+    Offset = LdSt.getOperand(3).getImm() * Scale.getKnownMinValue();
   }
   OffsetIsScalable = Scale.isScalable();
 
@@ -2873,10 +2923,22 @@ bool AArch64InstrInfo::getMemOpInfo(unsigned Opcode, TypeSize &Scale,
   case AArch64::LD1H_IMM:
   case AArch64::LD1W_IMM:
   case AArch64::LD1D_IMM:
+  case AArch64::LDNT1B_ZRI:
+  case AArch64::LDNT1H_ZRI:
+  case AArch64::LDNT1W_ZRI:
+  case AArch64::LDNT1D_ZRI:
   case AArch64::ST1B_IMM:
   case AArch64::ST1H_IMM:
   case AArch64::ST1W_IMM:
   case AArch64::ST1D_IMM:
+  case AArch64::STNT1B_ZRI:
+  case AArch64::STNT1H_ZRI:
+  case AArch64::STNT1W_ZRI:
+  case AArch64::STNT1D_ZRI:
+  case AArch64::LDNF1B_IMM:
+  case AArch64::LDNF1H_IMM:
+  case AArch64::LDNF1W_IMM:
+  case AArch64::LDNF1D_IMM:
     // A full vectors worth of data
     // Width = mbytes * elements
     Scale = TypeSize::Scalable(16);
@@ -2884,6 +2946,45 @@ bool AArch64InstrInfo::getMemOpInfo(unsigned Opcode, TypeSize &Scale,
     MinOffset = -8;
     MaxOffset = 7;
     break;
+  case AArch64::LD2B_IMM:
+  case AArch64::LD2H_IMM:
+  case AArch64::LD2W_IMM:
+  case AArch64::LD2D_IMM:
+  case AArch64::ST2B_IMM:
+  case AArch64::ST2H_IMM:
+  case AArch64::ST2W_IMM:
+  case AArch64::ST2D_IMM:
+    Scale = TypeSize::Scalable(32);
+    Width = SVEMaxBytesPerVector * 2;
+    MinOffset = -8;
+    MaxOffset = 7;
+    break;
+  case AArch64::LD3B_IMM:
+  case AArch64::LD3H_IMM:
+  case AArch64::LD3W_IMM:
+  case AArch64::LD3D_IMM:
+  case AArch64::ST3B_IMM:
+  case AArch64::ST3H_IMM:
+  case AArch64::ST3W_IMM:
+  case AArch64::ST3D_IMM:
+    Scale = TypeSize::Scalable(48);
+    Width = SVEMaxBytesPerVector * 3;
+    MinOffset = -8;
+    MaxOffset = 7;
+    break;
+  case AArch64::LD4B_IMM:
+  case AArch64::LD4H_IMM:
+  case AArch64::LD4W_IMM:
+  case AArch64::LD4D_IMM:
+  case AArch64::ST4B_IMM:
+  case AArch64::ST4H_IMM:
+  case AArch64::ST4W_IMM:
+  case AArch64::ST4D_IMM:
+    Scale = TypeSize::Scalable(64);
+    Width = SVEMaxBytesPerVector * 4;
+    MinOffset = -8;
+    MaxOffset = 7;
+    break;
   case AArch64::LD1B_H_IMM:
   case AArch64::LD1SB_H_IMM:
   case AArch64::LD1H_S_IMM:
@@ -2893,6 +2994,12 @@ bool AArch64InstrInfo::getMemOpInfo(unsigned Opcode, TypeSize &Scale,
   case AArch64::ST1B_H_IMM:
   case AArch64::ST1H_S_IMM:
   case AArch64::ST1W_D_IMM:
+  case AArch64::LDNF1B_H_IMM:
+  case AArch64::LDNF1SB_H_IMM:
+  case AArch64::LDNF1H_S_IMM:
+  case AArch64::LDNF1SH_S_IMM:
+  case AArch64::LDNF1W_D_IMM:
+  case AArch64::LDNF1SW_D_IMM:
     // A half vector worth of data
     // Width = mbytes * elements
     Scale = TypeSize::Scalable(8);
@@ -2906,6 +3013,10 @@ bool AArch64InstrInfo::getMemOpInfo(unsigned Opcode, TypeSize &Scale,
   case AArch64::LD1SH_D_IMM:
   case AArch64::ST1B_S_IMM:
   case AArch64::ST1H_D_IMM:
+  case AArch64::LDNF1B_S_IMM:
+  case AArch64::LDNF1SB_S_IMM:
+  case AArch64::LDNF1H_D_IMM:
+  case AArch64::LDNF1SH_D_IMM:
     // A quarter vector worth of data
     // Width = mbytes * elements
     Scale = TypeSize::Scalable(4);
@@ -2916,6 +3027,8 @@ bool AArch64InstrInfo::getMemOpInfo(unsigned Opcode, TypeSize &Scale,
   case AArch64::LD1B_D_IMM:
   case AArch64::LD1SB_D_IMM:
   case AArch64::ST1B_D_IMM:
+  case AArch64::LDNF1B_D_IMM:
+  case AArch64::LDNF1SB_D_IMM:
     // A eighth vector worth of data
     // Width = mbytes * elements
     Scale = TypeSize::Scalable(2);
@@ -3080,6 +3193,86 @@ bool AArch64InstrInfo::isPreLdSt(const MachineInstr &MI) {
   return isPreLd(MI) || isPreSt(MI);
 }
 
+bool AArch64InstrInfo::isPairedLdSt(const MachineInstr &MI) {
+  switch (MI.getOpcode()) {
+  default:
+    return false;
+  case AArch64::LDPSi:
+  case AArch64::LDPSWi:
+  case AArch64::LDPDi:
+  case AArch64::LDPQi:
+  case AArch64::LDPWi:
+  case AArch64::LDPXi:
+  case AArch64::STPSi:
+  case AArch64::STPDi:
+  case AArch64::STPQi:
+  case AArch64::STPWi:
+  case AArch64::STPXi:
+  case AArch64::STGPi:
+    return true;
+  }
+}
+
+const MachineOperand &AArch64InstrInfo::getLdStBaseOp(const MachineInstr &MI) {
+  unsigned Idx =
+      AArch64InstrInfo::isPairedLdSt(MI) || AArch64InstrInfo::isPreLdSt(MI) ? 2
+                                                                            : 1;
+  return MI.getOperand(Idx);
+}
+
+const MachineOperand &
+AArch64InstrInfo::getLdStOffsetOp(const MachineInstr &MI) {
+  unsigned Idx =
+      AArch64InstrInfo::isPairedLdSt(MI) || AArch64InstrInfo::isPreLdSt(MI) ? 3
+                                                                            : 2;
+  return MI.getOperand(Idx);
+}
+
+static const TargetRegisterClass *getRegClass(const MachineInstr &MI,
+                                              Register Reg) {
+  if (MI.getParent() == nullptr)
+    return nullptr;
+  const MachineFunction *MF = MI.getParent()->getParent();
+  return MF ? MF->getRegInfo().getRegClassOrNull(Reg) : nullptr;
+}
+
+bool AArch64InstrInfo::isQForm(const MachineInstr &MI) {
+  auto IsQFPR = [&](const MachineOperand &Op) {
+    if (!Op.isReg())
+      return false;
+    auto Reg = Op.getReg();
+    if (Reg.isPhysical())
+      return AArch64::FPR128RegClass.contains(Reg);
+    const TargetRegisterClass *TRC = ::getRegClass(MI, Reg);
+    return TRC == &AArch64::FPR128RegClass ||
+           TRC == &AArch64::FPR128_loRegClass;
+  };
+  return llvm::any_of(MI.operands(), IsQFPR);
+}
+
+bool AArch64InstrInfo::isFpOrNEON(const MachineInstr &MI) {
+  auto IsFPR = [&](const MachineOperand &Op) {
+    if (!Op.isReg())
+      return false;
+    auto Reg = Op.getReg();
+    if (Reg.isPhysical())
+      return AArch64::FPR128RegClass.contains(Reg) ||
+             AArch64::FPR64RegClass.contains(Reg) ||
+             AArch64::FPR32RegClass.contains(Reg) ||
+             AArch64::FPR16RegClass.contains(Reg) ||
+             AArch64::FPR8RegClass.contains(Reg);
+
+    const TargetRegisterClass *TRC = ::getRegClass(MI, Reg);
+    return TRC == &AArch64::FPR128RegClass ||
+           TRC == &AArch64::FPR128_loRegClass ||
+           TRC == &AArch64::FPR64RegClass ||
+           TRC == &AArch64::FPR64_loRegClass ||
+           TRC == &AArch64::FPR32RegClass || TRC == &AArch64::FPR16RegClass ||
+           TRC == &AArch64::FPR8RegClass;
+  };
+  return llvm::any_of(MI.operands(), IsFPR);
+}
+
 // Scale the unscaled offsets.  Returns false if the unscaled offset can't be
 // scaled.
 static bool scaleOffset(unsigned Opc, int64_t &Offset) {
@@ -3345,7 +3538,7 @@ void AArch64InstrInfo::copyPhysReg(MachineBasicBlock &MBB,
   // Copy a Predicate register by ORRing with itself.
   if (AArch64::PPRRegClass.contains(DestReg) &&
       AArch64::PPRRegClass.contains(SrcReg)) {
-    assert(Subtarget.hasSVE() && "Unexpected SVE register.");
+    assert(Subtarget.hasSVEorSME() && "Unexpected SVE register.");
     BuildMI(MBB, I, DL, get(AArch64::ORR_PPzPP), DestReg)
       .addReg(SrcReg) // Pg
       .addReg(SrcReg)
@@ -3356,7 +3549,7 @@ void AArch64InstrInfo::copyPhysReg(MachineBasicBlock &MBB,
   // Copy a Z register by ORRing with itself.
   if (AArch64::ZPRRegClass.contains(DestReg) &&
       AArch64::ZPRRegClass.contains(SrcReg)) {
-    assert(Subtarget.hasSVE() && "Unexpected SVE register.");
+    assert(Subtarget.hasSVEorSME() && "Unexpected SVE register.");
     BuildMI(MBB, I, DL, get(AArch64::ORR_ZZZ), DestReg)
       .addReg(SrcReg)
       .addReg(SrcReg, getKillRegState(KillSrc));
@@ -3366,6 +3559,7 @@ void AArch64InstrInfo::copyPhysReg(MachineBasicBlock &MBB,
   // Copy a Z register pair by copying the individual sub-registers.
   if (AArch64::ZPR2RegClass.contains(DestReg) &&
       AArch64::ZPR2RegClass.contains(SrcReg)) {
+    assert(Subtarget.hasSVEorSME() && "Unexpected SVE register.");
     static const unsigned Indices[] = {AArch64::zsub0, AArch64::zsub1};
     copyPhysRegTuple(MBB, I, DL, DestReg, SrcReg, KillSrc, AArch64::ORR_ZZZ,
                      Indices);
@@ -3375,6 +3569,7 @@ void AArch64InstrInfo::copyPhysReg(MachineBasicBlock &MBB,
   // Copy a Z register triple by copying the individual sub-registers.
   if (AArch64::ZPR3RegClass.contains(DestReg) &&
       AArch64::ZPR3RegClass.contains(SrcReg)) {
+    assert(Subtarget.hasSVEorSME() && "Unexpected SVE register.");
     static const unsigned Indices[] = {AArch64::zsub0, AArch64::zsub1,
                                        AArch64::zsub2};
     copyPhysRegTuple(MBB, I, DL, DestReg, SrcReg, KillSrc, AArch64::ORR_ZZZ,
@@ -3385,6 +3580,7 @@ void AArch64InstrInfo::copyPhysReg(MachineBasicBlock &MBB,
   // Copy a Z register quad by copying the individual sub-registers.
   if (AArch64::ZPR4RegClass.contains(DestReg) &&
       AArch64::ZPR4RegClass.contains(SrcReg)) {
+    assert(Subtarget.hasSVEorSME() && "Unexpected SVE register.");
     static const unsigned Indices[] = {AArch64::zsub0, AArch64::zsub1,
                                        AArch64::zsub2, AArch64::zsub3};
     copyPhysRegTuple(MBB, I, DL, DestReg, SrcReg, KillSrc, AArch64::ORR_ZZZ,
@@ -3489,7 +3685,12 @@ void AArch64InstrInfo::copyPhysReg(MachineBasicBlock &MBB,
 
   if (AArch64::FPR128RegClass.contains(DestReg) &&
       AArch64::FPR128RegClass.contains(SrcReg)) {
-    if (Subtarget.hasNEON()) {
+    if (Subtarget.forceStreamingCompatibleSVE()) {
+      BuildMI(MBB, I, DL, get(AArch64::ORR_ZZZ))
+          .addReg(AArch64::Z0 + (DestReg - AArch64::Q0), RegState::Define)
+          .addReg(AArch64::Z0 + (SrcReg - AArch64::Q0))
+          .addReg(AArch64::Z0 + (SrcReg - AArch64::Q0));
+    } else if (Subtarget.hasNEON()) {
       BuildMI(MBB, I, DL, get(AArch64::ORRv16i8), DestReg)
           .addReg(SrcReg)
           .addReg(SrcReg, getKillRegState(KillSrc));
@@ -3510,77 +3711,37 @@ void AArch64InstrInfo::copyPhysReg(MachineBasicBlock &MBB,
 
   if (AArch64::FPR64RegClass.contains(DestReg) &&
       AArch64::FPR64RegClass.contains(SrcReg)) {
-    if (Subtarget.hasNEON()) {
-      DestReg = RI.getMatchingSuperReg(DestReg, AArch64::dsub,
-                                       &AArch64::FPR128RegClass);
-      SrcReg = RI.getMatchingSuperReg(SrcReg, AArch64::dsub,
-                                      &AArch64::FPR128RegClass);
-      BuildMI(MBB, I, DL, get(AArch64::ORRv16i8), DestReg)
-          .addReg(SrcReg)
-          .addReg(SrcReg, getKillRegState(KillSrc));
-    } else {
-      BuildMI(MBB, I, DL, get(AArch64::FMOVDr), DestReg)
-          .addReg(SrcReg, getKillRegState(KillSrc));
-    }
+    BuildMI(MBB, I, DL, get(AArch64::FMOVDr), DestReg)
+        .addReg(SrcReg, getKillRegState(KillSrc));
     return;
   }
 
   if (AArch64::FPR32RegClass.contains(DestReg) &&
       AArch64::FPR32RegClass.contains(SrcReg)) {
-    if (Subtarget.hasNEON()) {
-      DestReg = RI.getMatchingSuperReg(DestReg, AArch64::ssub,
-                                       &AArch64::FPR128RegClass);
-      SrcReg = RI.getMatchingSuperReg(SrcReg, AArch64::ssub,
-                                      &AArch64::FPR128RegClass);
-      BuildMI(MBB, I, DL, get(AArch64::ORRv16i8), DestReg)
-          .addReg(SrcReg)
-          .addReg(SrcReg, getKillRegState(KillSrc));
-    } else {
-      BuildMI(MBB, I, DL, get(AArch64::FMOVSr), DestReg)
-          .addReg(SrcReg, getKillRegState(KillSrc));
-    }
+    BuildMI(MBB, I, DL, get(AArch64::FMOVSr), DestReg)
+        .addReg(SrcReg, getKillRegState(KillSrc));
     return;
   }
 
   if (AArch64::FPR16RegClass.contains(DestReg) &&
       AArch64::FPR16RegClass.contains(SrcReg)) {
-    if (Subtarget.hasNEON()) {
-      DestReg = RI.getMatchingSuperReg(DestReg, AArch64::hsub,
-                                       &AArch64::FPR128RegClass);
-      SrcReg = RI.getMatchingSuperReg(SrcReg, AArch64::hsub,
-                                      &AArch64::FPR128RegClass);
-      BuildMI(MBB, I, DL, get(AArch64::ORRv16i8), DestReg)
-          .addReg(SrcReg)
-          .addReg(SrcReg, getKillRegState(KillSrc));
-    } else {
-      DestReg = RI.getMatchingSuperReg(DestReg, AArch64::hsub,
-                                       &AArch64::FPR32RegClass);
-      SrcReg = RI.getMatchingSuperReg(SrcReg, AArch64::hsub,
-                                      &AArch64::FPR32RegClass);
-      BuildMI(MBB, I, DL, get(AArch64::FMOVSr), DestReg)
-          .addReg(SrcReg, getKillRegState(KillSrc));
-    }
+    DestReg =
+        RI.getMatchingSuperReg(DestReg, AArch64::hsub, &AArch64::FPR32RegClass);
+    SrcReg =
+        RI.getMatchingSuperReg(SrcReg, AArch64::hsub, &AArch64::FPR32RegClass);
+    BuildMI(MBB, I, DL, get(AArch64::FMOVSr), DestReg)
+        .addReg(SrcReg, getKillRegState(KillSrc));
     return;
   }
 
   if (AArch64::FPR8RegClass.contains(DestReg) &&
       AArch64::FPR8RegClass.contains(SrcReg)) {
-    if (Subtarget.hasNEON()) {
-      DestReg = RI.getMatchingSuperReg(DestReg, AArch64::bsub,
-                                       &AArch64::FPR128RegClass);
-      SrcReg = RI.getMatchingSuperReg(SrcReg, AArch64::bsub,
-                                      &AArch64::FPR128RegClass);
-      BuildMI(MBB, I, DL, get(AArch64::ORRv16i8), DestReg)
-          .addReg(SrcReg)
-          .addReg(SrcReg, getKillRegState(KillSrc));
-    } else {
-      DestReg = RI.getMatchingSuperReg(DestReg, AArch64::bsub,
-                                       &AArch64::FPR32RegClass);
-      SrcReg = RI.getMatchingSuperReg(SrcReg, AArch64::bsub,
-                                      &AArch64::FPR32RegClass);
-      BuildMI(MBB, I, DL, get(AArch64::FMOVSr), DestReg)
-          .addReg(SrcReg, getKillRegState(KillSrc));
-    }
+    DestReg =
+        RI.getMatchingSuperReg(DestReg, AArch64::bsub, &AArch64::FPR32RegClass);
+    SrcReg =
+        RI.getMatchingSuperReg(SrcReg, AArch64::bsub, &AArch64::FPR32RegClass);
+    BuildMI(MBB, I, DL, get(AArch64::FMOVSr), DestReg)
+        .addReg(SrcReg, getKillRegState(KillSrc));
     return;
   }
 
@@ -3645,7 +3806,7 @@ static void storeRegPairToStackSlot(const TargetRegisterInfo &TRI,
                                     MachineMemOperand *MMO) {
   Register SrcReg0 = SrcReg;
   Register SrcReg1 = SrcReg;
-  if (Register::isPhysicalRegister(SrcReg)) {
+  if (SrcReg.isPhysical()) {
     SrcReg0 = TRI.getSubReg(SrcReg, SubIdx0);
     SubIdx0 = 0;
     SrcReg1 = TRI.getSubReg(SrcReg, SubIdx1);
@@ -3659,10 +3820,12 @@ static void storeRegPairToStackSlot(const TargetRegisterInfo &TRI,
       .addMemOperand(MMO);
 }
 
-void AArch64InstrInfo::storeRegToStackSlot(
-    MachineBasicBlock &MBB, MachineBasicBlock::iterator MBBI, Register SrcReg,
-    bool isKill, int FI, const TargetRegisterClass *RC,
-    const TargetRegisterInfo *TRI) const {
+void AArch64InstrInfo::storeRegToStackSlot(MachineBasicBlock &MBB,
+                                           MachineBasicBlock::iterator MBBI,
+                                           Register SrcReg, bool isKill, int FI,
+                                           const TargetRegisterClass *RC,
+                                           const TargetRegisterInfo *TRI,
+                                           Register VReg) const {
   MachineFunction &MF = *MBB.getParent();
   MachineFrameInfo &MFI = MF.getFrameInfo();
 
@@ -3690,7 +3853,7 @@ void AArch64InstrInfo::storeRegToStackSlot(
   case 4:
     if (AArch64::GPR32allRegClass.hasSubClassEq(RC)) {
       Opc = AArch64::STRWui;
-      if (Register::isVirtualRegister(SrcReg))
+      if (SrcReg.isVirtual())
         MF.getRegInfo().constrainRegClass(SrcReg, &AArch64::GPR32RegClass);
       else
         assert(SrcReg != AArch64::WSP);
@@ -3700,7 +3863,7 @@ void AArch64InstrInfo::storeRegToStackSlot(
   case 8:
     if (AArch64::GPR64allRegClass.hasSubClassEq(RC)) {
       Opc = AArch64::STRXui;
-      if (Register::isVirtualRegister(SrcReg))
+      if (SrcReg.isVirtual())
         MF.getRegInfo().constrainRegClass(SrcReg, &AArch64::GPR64RegClass);
       else
         assert(SrcReg != AArch64::SP);
@@ -3798,7 +3961,7 @@ static void loadRegPairFromStackSlot(const TargetRegisterInfo &TRI,
   Register DestReg0 = DestReg;
   Register DestReg1 = DestReg;
   bool IsUndef = true;
-  if (Register::isPhysicalRegister(DestReg)) {
+  if (DestReg.isPhysical()) {
     DestReg0 = TRI.getSubReg(DestReg, SubIdx0);
     SubIdx0 = 0;
     DestReg1 = TRI.getSubReg(DestReg, SubIdx1);
@@ -3813,10 +3976,12 @@ static void loadRegPairFromStackSlot(const TargetRegisterInfo &TRI,
       .addMemOperand(MMO);
 }
 
-void AArch64InstrInfo::loadRegFromStackSlot(
-    MachineBasicBlock &MBB, MachineBasicBlock::iterator MBBI, Register DestReg,
-    int FI, const TargetRegisterClass *RC,
-    const TargetRegisterInfo *TRI) const {
+void AArch64InstrInfo::loadRegFromStackSlot(MachineBasicBlock &MBB,
+                                            MachineBasicBlock::iterator MBBI,
+                                            Register DestReg, int FI,
+                                            const TargetRegisterClass *RC,
+                                            const TargetRegisterInfo *TRI,
+                                            Register VReg) const {
   MachineFunction &MF = *MBB.getParent();
   MachineFrameInfo &MFI = MF.getFrameInfo();
   MachinePointerInfo PtrInfo = MachinePointerInfo::getFixedStack(MF, FI);
@@ -3844,7 +4009,7 @@ void AArch64InstrInfo::loadRegFromStackSlot(
   case 4:
     if (AArch64::GPR32allRegClass.hasSubClassEq(RC)) {
       Opc = AArch64::LDRWui;
-      if (Register::isVirtualRegister(DestReg))
+      if (DestReg.isVirtual())
         MF.getRegInfo().constrainRegClass(DestReg, &AArch64::GPR32RegClass);
       else
         assert(DestReg != AArch64::WSP);
@@ -3854,7 +4019,7 @@ void AArch64InstrInfo::loadRegFromStackSlot(
   case 8:
     if (AArch64::GPR64allRegClass.hasSubClassEq(RC)) {
       Opc = AArch64::LDRXui;
-      if (Register::isVirtualRegister(DestReg))
+      if (DestReg.isVirtual())
         MF.getRegInfo().constrainRegClass(DestReg, &AArch64::GPR64RegClass);
       else
         assert(DestReg != AArch64::SP);
@@ -3994,6 +4159,119 @@ void AArch64InstrInfo::decomposeStackOffsetForFrameOffsets(
   }
 }
 
+// Convenience function to create a DWARF expression for
+//   Expr + NumBytes + NumVGScaledBytes * AArch64::VG
+static void appendVGScaledOffsetExpr(SmallVectorImpl<char> &Expr, int NumBytes,
+                                     int NumVGScaledBytes, unsigned VG,
+                                     llvm::raw_string_ostream &Comment) {
+  uint8_t buffer[16];
+
+  if (NumBytes) {
+    Expr.push_back(dwarf::DW_OP_consts);
+    Expr.append(buffer, buffer + encodeSLEB128(NumBytes, buffer));
+    Expr.push_back((uint8_t)dwarf::DW_OP_plus);
+    Comment << (NumBytes < 0 ? " - " : " + ") << std::abs(NumBytes);
+  }
+
+  if (NumVGScaledBytes) {
+    Expr.push_back((uint8_t)dwarf::DW_OP_consts);
+    Expr.append(buffer, buffer + encodeSLEB128(NumVGScaledBytes, buffer));
+
+    Expr.push_back((uint8_t)dwarf::DW_OP_bregx);
+    Expr.append(buffer, buffer + encodeULEB128(VG, buffer));
+    Expr.push_back(0);
+
+    Expr.push_back((uint8_t)dwarf::DW_OP_mul);
+    Expr.push_back((uint8_t)dwarf::DW_OP_plus);
+
+    Comment << (NumVGScaledBytes < 0 ? " - " : " + ")
+            << std::abs(NumVGScaledBytes) << " * VG";
+  }
+}
+
+// Creates an MCCFIInstruction:
+//    { DW_CFA_def_cfa_expression, ULEB128 (sizeof expr), expr }
+static MCCFIInstruction createDefCFAExpression(const TargetRegisterInfo &TRI,
+                                               unsigned Reg,
+                                               const StackOffset &Offset) {
+  int64_t NumBytes, NumVGScaledBytes;
+  AArch64InstrInfo::decomposeStackOffsetForDwarfOffsets(Offset, NumBytes,
+                                                        NumVGScaledBytes);
+  std::string CommentBuffer;
+  llvm::raw_string_ostream Comment(CommentBuffer);
+
+  if (Reg == AArch64::SP)
+    Comment << "sp";
+  else if (Reg == AArch64::FP)
+    Comment << "fp";
+  else
+    Comment << printReg(Reg, &TRI);
+
+  // Build up the expression (Reg + NumBytes + NumVGScaledBytes * AArch64::VG)
+  SmallString<64> Expr;
+  unsigned DwarfReg = TRI.getDwarfRegNum(Reg, true);
+  Expr.push_back((uint8_t)(dwarf::DW_OP_breg0 + DwarfReg));
+  Expr.push_back(0);
+  appendVGScaledOffsetExpr(Expr, NumBytes, NumVGScaledBytes,
+                           TRI.getDwarfRegNum(AArch64::VG, true), Comment);
+
+  // Wrap this into DW_CFA_def_cfa.
+  SmallString<64> DefCfaExpr;
+  DefCfaExpr.push_back(dwarf::DW_CFA_def_cfa_expression);
+  uint8_t buffer[16];
+  DefCfaExpr.append(buffer, buffer + encodeULEB128(Expr.size(), buffer));
+  DefCfaExpr.append(Expr.str());
+  return MCCFIInstruction::createEscape(nullptr, DefCfaExpr.str(),
+                                        Comment.str());
+}
+
+MCCFIInstruction llvm::createDefCFA(const TargetRegisterInfo &TRI,
+                                    unsigned FrameReg, unsigned Reg,
+                                    const StackOffset &Offset,
+                                    bool LastAdjustmentWasScalable) {
+  if (Offset.getScalable())
+    return createDefCFAExpression(TRI, Reg, Offset);
+
+  if (FrameReg == Reg && !LastAdjustmentWasScalable)
+    return MCCFIInstruction::cfiDefCfaOffset(nullptr, int(Offset.getFixed()));
+
+  unsigned DwarfReg = TRI.getDwarfRegNum(Reg, true);
+  return MCCFIInstruction::cfiDefCfa(nullptr, DwarfReg, (int)Offset.getFixed());
+}
+
+MCCFIInstruction llvm::createCFAOffset(const TargetRegisterInfo &TRI,
+                                       unsigned Reg,
+                                       const StackOffset &OffsetFromDefCFA) {
+  int64_t NumBytes, NumVGScaledBytes;
+  AArch64InstrInfo::decomposeStackOffsetForDwarfOffsets(
+      OffsetFromDefCFA, NumBytes, NumVGScaledBytes);
+
+  unsigned DwarfReg = TRI.getDwarfRegNum(Reg, true);
+
+  // Non-scalable offsets can use DW_CFA_offset directly.
+  if (!NumVGScaledBytes)
+    return MCCFIInstruction::createOffset(nullptr, DwarfReg, NumBytes);
+
+  std::string CommentBuffer;
+  llvm::raw_string_ostream Comment(CommentBuffer);
+  Comment << printReg(Reg, &TRI) << "  @ cfa";
+
+  // Build up expression (NumBytes + NumVGScaledBytes * AArch64::VG)
+  SmallString<64> OffsetExpr;
+  appendVGScaledOffsetExpr(OffsetExpr, NumBytes, NumVGScaledBytes,
+                           TRI.getDwarfRegNum(AArch64::VG, true), Comment);
+
+  // Wrap this into DW_CFA_expression
+  SmallString<64> CfaExpr;
+  CfaExpr.push_back(dwarf::DW_CFA_expression);
+  uint8_t buffer[16];
+  CfaExpr.append(buffer, buffer + encodeULEB128(DwarfReg, buffer));
+  CfaExpr.append(buffer, buffer + encodeULEB128(OffsetExpr.size(), buffer));
+  CfaExpr.append(OffsetExpr.str());
+
+  return MCCFIInstruction::createEscape(nullptr, CfaExpr.str(), Comment.str());
+}
+
 // Helper function to emit a frame offset adjustment from a given
 // pointer (SrcReg), stored into DestReg. This function is explicit
 // in that it requires the opcode.
@@ -4003,7 +4281,8 @@ static void emitFrameOffsetAdj(MachineBasicBlock &MBB,
                                unsigned SrcReg, int64_t Offset, unsigned Opc,
                                const TargetInstrInfo *TII,
                                MachineInstr::MIFlag Flag, bool NeedsWinCFI,
-                               bool *HasWinCFI) {
+                               bool *HasWinCFI, bool EmitCFAOffset,
+                               StackOffset CFAOffset, unsigned FrameReg) {
   int Sign = 1;
   unsigned MaxEncoding, ShiftSize;
   switch (Opc) {
@@ -4016,6 +4295,8 @@ static void emitFrameOffsetAdj(MachineBasicBlock &MBB,
     break;
   case AArch64::ADDVL_XXI:
   case AArch64::ADDPL_XXI:
+  case AArch64::ADDSVL_XXI:
+  case AArch64::ADDSPL_XXI:
     MaxEncoding = 31;
     ShiftSize = 0;
     if (Offset < 0) {
@@ -4028,6 +4309,13 @@ static void emitFrameOffsetAdj(MachineBasicBlock &MBB,
     llvm_unreachable("Unsupported opcode");
   }
 
+  // `Offset` can be in bytes or in "scalable bytes".
+  int VScale = 1;
+  if (Opc == AArch64::ADDVL_XXI || Opc == AArch64::ADDSVL_XXI)
+    VScale = 16;
+  else if (Opc == AArch64::ADDPL_XXI || Opc == AArch64::ADDSPL_XXI)
+    VScale = 2;
+
   // FIXME: If the offset won't fit in 24-bits, compute the offset into a
   // scratch register.  If DestReg is a virtual register, use it as the
   // scratch register; otherwise, create a new virtual register (to be
@@ -4065,6 +4353,26 @@ static void emitFrameOffsetAdj(MachineBasicBlock &MBB,
           AArch64_AM::getShifterImm(AArch64_AM::LSL, LocalShiftSize));
     MBI = MBI.setMIFlag(Flag);
 
+    auto Change =
+        VScale == 1
+            ? StackOffset::getFixed(ThisVal << LocalShiftSize)
+            : StackOffset::getScalable(VScale * (ThisVal << LocalShiftSize));
+    if (Sign == -1 || Opc == AArch64::SUBXri || Opc == AArch64::SUBSXri)
+      CFAOffset += Change;
+    else
+      CFAOffset -= Change;
+    if (EmitCFAOffset && DestReg == TmpReg) {
+      MachineFunction &MF = *MBB.getParent();
+      const TargetSubtargetInfo &STI = MF.getSubtarget();
+      const TargetRegisterInfo &TRI = *STI.getRegisterInfo();
+
+      unsigned CFIIndex = MF.addFrameInst(
+          createDefCFA(TRI, FrameReg, DestReg, CFAOffset, VScale != 1));
+      BuildMI(MBB, MBBI, DL, TII->get(TargetOpcode::CFI_INSTRUCTION))
+          .addCFIIndex(CFIIndex)
+          .setMIFlags(Flag);
+    }
+
     if (NeedsWinCFI) {
       assert(Sign == 1 && "SEH directives should always have a positive sign");
       int Imm = (int)(ThisVal << LocalShiftSize);
@@ -4088,8 +4396,6 @@ static void emitFrameOffsetAdj(MachineBasicBlock &MBB,
             .addImm(Imm)
             .setMIFlag(Flag);
       }
-      if (HasWinCFI)
-        *HasWinCFI = true;
     }
 
     SrcReg = TmpReg;
@@ -4101,7 +4407,17 @@ void llvm::emitFrameOffset(MachineBasicBlock &MBB,
                            unsigned DestReg, unsigned SrcReg,
                            StackOffset Offset, const TargetInstrInfo *TII,
                            MachineInstr::MIFlag Flag, bool SetNZCV,
-                           bool NeedsWinCFI, bool *HasWinCFI) {
+                           bool NeedsWinCFI, bool *HasWinCFI,
+                           bool EmitCFAOffset, StackOffset CFAOffset,
+                           unsigned FrameReg) {
+  // If a function is marked as arm_locally_streaming, then the runtime value of
+  // vscale in the prologue/epilogue is different the runtime value of vscale
+  // in the function's body. To avoid having to consider multiple vscales,
+  // we can use `addsvl` to allocate any scalable stack-slots, which under
+  // most circumstances will be only locals, not callee-save slots.
+  const Function &F = MBB.getParent()->getFunction();
+  bool UseSVL = F.hasFnAttribute("aarch64_pstate_sm_body");
+
   int64_t Bytes, NumPredicateVectors, NumDataVectors;
   AArch64InstrInfo::decomposeStackOffsetForFrameOffsets(
       Offset, Bytes, NumPredicateVectors, NumDataVectors);
@@ -4116,8 +4432,13 @@ void llvm::emitFrameOffset(MachineBasicBlock &MBB,
       Opc = SetNZCV ? AArch64::SUBSXri : AArch64::SUBXri;
     }
     emitFrameOffsetAdj(MBB, MBBI, DL, DestReg, SrcReg, Bytes, Opc, TII, Flag,
-                       NeedsWinCFI, HasWinCFI);
+                       NeedsWinCFI, HasWinCFI, EmitCFAOffset, CFAOffset,
+                       FrameReg);
+    CFAOffset += (Opc == AArch64::ADDXri || Opc == AArch64::ADDSXri)
+                     ? StackOffset::getFixed(-Bytes)
+                     : StackOffset::getFixed(Bytes);
     SrcReg = DestReg;
+    FrameReg = DestReg;
   }
 
   assert(!(SetNZCV && (NumPredicateVectors || NumDataVectors)) &&
@@ -4127,14 +4448,19 @@ void llvm::emitFrameOffset(MachineBasicBlock &MBB,
 
   if (NumDataVectors) {
     emitFrameOffsetAdj(MBB, MBBI, DL, DestReg, SrcReg, NumDataVectors,
-                       AArch64::ADDVL_XXI, TII, Flag, NeedsWinCFI, nullptr);
+                       UseSVL ? AArch64::ADDSVL_XXI : AArch64::ADDVL_XXI,
+                       TII, Flag, NeedsWinCFI, nullptr, EmitCFAOffset,
+                       CFAOffset, FrameReg);
+    CFAOffset += StackOffset::getScalable(-NumDataVectors * 16);
     SrcReg = DestReg;
   }
 
   if (NumPredicateVectors) {
     assert(DestReg != AArch64::SP && "Unaligned access to SP");
     emitFrameOffsetAdj(MBB, MBBI, DL, DestReg, SrcReg, NumPredicateVectors,
-                       AArch64::ADDPL_XXI, TII, Flag, NeedsWinCFI, nullptr);
+                       UseSVL ? AArch64::ADDSPL_XXI : AArch64::ADDPL_XXI,
+                       TII, Flag, NeedsWinCFI, nullptr, EmitCFAOffset,
+                       CFAOffset, FrameReg);
   }
 }
 
@@ -4158,14 +4484,17 @@ MachineInstr *AArch64InstrInfo::foldMemoryOperandImpl(
   if (MI.isFullCopy()) {
     Register DstReg = MI.getOperand(0).getReg();
     Register SrcReg = MI.getOperand(1).getReg();
-    if (SrcReg == AArch64::SP && Register::isVirtualRegister(DstReg)) {
+    if (SrcReg == AArch64::SP && DstReg.isVirtual()) {
       MF.getRegInfo().constrainRegClass(DstReg, &AArch64::GPR64RegClass);
       return nullptr;
     }
-    if (DstReg == AArch64::SP && Register::isVirtualRegister(SrcReg)) {
+    if (DstReg == AArch64::SP && SrcReg.isVirtual()) {
       MF.getRegInfo().constrainRegClass(SrcReg, &AArch64::GPR64RegClass);
       return nullptr;
     }
+    // Nothing can folded with copy from/to NZCV.
+    if (SrcReg == AArch64::NZCV || DstReg == AArch64::NZCV)
+      return nullptr;
   }
 
   // Handle the case where a copy is being spilled or filled but the source
@@ -4217,10 +4546,10 @@ MachineInstr *AArch64InstrInfo::foldMemoryOperandImpl(
              "Mismatched register size in non subreg COPY");
       if (IsSpill)
         storeRegToStackSlot(MBB, InsertPt, SrcReg, SrcMO.isKill(), FrameIndex,
-                            getRegClass(SrcReg), &TRI);
+                            getRegClass(SrcReg), &TRI, Register());
       else
         loadRegFromStackSlot(MBB, InsertPt, DstReg, FrameIndex,
-                             getRegClass(DstReg), &TRI);
+                             getRegClass(DstReg), &TRI, Register());
       return &*--InsertPt;
     }
 
@@ -4233,7 +4562,7 @@ MachineInstr *AArch64InstrInfo::foldMemoryOperandImpl(
     //
     //   STRXui %xzr, %stack.0
     //
-    if (IsSpill && DstMO.isUndef() && Register::isPhysicalRegister(SrcReg)) {
+    if (IsSpill && DstMO.isUndef() && SrcReg.isPhysical()) {
       assert(SrcMO.getSubReg() == 0 &&
              "Unexpected subreg on physical register");
       const TargetRegisterClass *SpillRC;
@@ -4266,7 +4595,7 @@ MachineInstr *AArch64InstrInfo::foldMemoryOperandImpl(
         if (unsigned WidenedSrcReg =
                 TRI.getMatchingSuperReg(SrcReg, SpillSubreg, SpillRC)) {
           storeRegToStackSlot(MBB, InsertPt, WidenedSrcReg, SrcMO.isKill(),
-                              FrameIndex, SpillRC, &TRI);
+                              FrameIndex, SpillRC, &TRI, Register());
           return &*--InsertPt;
         }
     }
@@ -4301,7 +4630,8 @@ MachineInstr *AArch64InstrInfo::foldMemoryOperandImpl(
         assert(TRI.getRegSizeInBits(*getRegClass(SrcReg)) ==
                    TRI.getRegSizeInBits(*FillRC) &&
                "Mismatched regclass size on folded subreg COPY");
-        loadRegFromStackSlot(MBB, InsertPt, DstReg, FrameIndex, FillRC, &TRI);
+        loadRegFromStackSlot(MBB, InsertPt, DstReg, FrameIndex, FillRC, &TRI,
+                             Register());
         MachineInstr &LoadMI = *--InsertPt;
         MachineOperand &LoadDst = LoadMI.getOperand(0);
         assert(LoadDst.getSubReg() == 0 && "unexpected subreg on fill load");
@@ -4346,6 +4676,10 @@ int llvm::isAArch64FrameOffsetLegal(const MachineInstr &MI,
   case AArch64::ST1Twov1d:
   case AArch64::ST1Threev1d:
   case AArch64::ST1Fourv1d:
+  case AArch64::ST1i8:
+  case AArch64::ST1i16:
+  case AArch64::ST1i32:
+  case AArch64::ST1i64:
   case AArch64::IRG:
   case AArch64::IRGstack:
   case AArch64::STGloop:
@@ -4363,7 +4697,7 @@ int llvm::isAArch64FrameOffsetLegal(const MachineInstr &MI,
 
   // Construct the complete offset.
   bool IsMulVL = ScaleValue.isScalable();
-  unsigned Scale = ScaleValue.getKnownMinSize();
+  unsigned Scale = ScaleValue.getKnownMinValue();
   int64_t Offset = IsMulVL ? SOffset.getScalable() : SOffset.getFixed();
 
   const MachineOperand &ImmOpnd =
@@ -4373,7 +4707,7 @@ int llvm::isAArch64FrameOffsetLegal(const MachineInstr &MI,
   // If the offset doesn't match the scale, we rewrite the instruction to
   // use the unscaled instruction instead. Likewise, if we have a negative
   // offset and there is an unscaled op to use.
-  Optional<unsigned> UnscaledOp =
+  std::optional<unsigned> UnscaledOp =
       AArch64InstrInfo::getUnscaledLdSt(MI.getOpcode());
   bool useUnscaledOp = UnscaledOp && (Offset % Scale || Offset < 0);
   if (useUnscaledOp &&
@@ -4381,7 +4715,7 @@ int llvm::isAArch64FrameOffsetLegal(const MachineInstr &MI,
                                       MaxOff))
     llvm_unreachable("unhandled opcode in isAArch64FrameOffsetLegal");
 
-  Scale = ScaleValue.getKnownMinSize();
+  Scale = ScaleValue.getKnownMinValue();
   assert(IsMulVL == ScaleValue.isScalable() &&
          "Unscaled opcode has different value for scalable");
 
@@ -4570,7 +4904,7 @@ static bool canCombine(MachineBasicBlock &MBB, MachineOperand &MO,
   MachineRegisterInfo &MRI = MBB.getParent()->getRegInfo();
   MachineInstr *MI = nullptr;
 
-  if (MO.isReg() && Register::isVirtualRegister(MO.getReg()))
+  if (MO.isReg() && MO.getReg().isVirtual())
     MI = MRI.getUniqueVRegDef(MO.getReg());
   // And it needs to be in the trace (otherwise, it won't have a depth).
   if (!MI || MI->getParent() != &MBB || (unsigned)MI->getOpcode() != CombineOpc)
@@ -4588,6 +4922,10 @@ static bool canCombine(MachineBasicBlock &MBB, MachineOperand &MO,
       return false;
   }
 
+  if (isCombineInstrSettingFlag(CombineOpc) &&
+      MI->findRegisterDefOperandIdx(AArch64::NZCV, true) == -1)
+    return false;
+
   return true;
 }
 
@@ -4609,25 +4947,105 @@ static bool canCombineWithFMUL(MachineBasicBlock &MBB, MachineOperand &MO,
 //       1. Other data types (integer, vectors)
 //       2. Other math / logic operations (xor, or)
 //       3. Other forms of the same operation (intrinsics and other variants)
-bool AArch64InstrInfo::isAssociativeAndCommutative(
-    const MachineInstr &Inst) const {
+bool AArch64InstrInfo::isAssociativeAndCommutative(const MachineInstr &Inst,
+                                                   bool Invert) const {
+  if (Invert)
+    return false;
   switch (Inst.getOpcode()) {
-  case AArch64::FADDDrr:
+  // == Floating-point types ==
+  // -- Floating-point instructions --
+  case AArch64::FADDHrr:
   case AArch64::FADDSrr:
-  case AArch64::FADDv2f32:
-  case AArch64::FADDv2f64:
-  case AArch64::FADDv4f32:
-  case AArch64::FMULDrr:
+  case AArch64::FADDDrr:
+  case AArch64::FMULHrr:
   case AArch64::FMULSrr:
+  case AArch64::FMULDrr:
+  case AArch64::FMULX16:
   case AArch64::FMULX32:
   case AArch64::FMULX64:
-  case AArch64::FMULXv2f32:
-  case AArch64::FMULXv2f64:
-  case AArch64::FMULXv4f32:
+  // -- Advanced SIMD instructions --
+  case AArch64::FADDv4f16:
+  case AArch64::FADDv8f16:
+  case AArch64::FADDv2f32:
+  case AArch64::FADDv4f32:
+  case AArch64::FADDv2f64:
+  case AArch64::FMULv4f16:
+  case AArch64::FMULv8f16:
   case AArch64::FMULv2f32:
-  case AArch64::FMULv2f64:
   case AArch64::FMULv4f32:
-    return Inst.getParent()->getParent()->getTarget().Options.UnsafeFPMath;
+  case AArch64::FMULv2f64:
+  case AArch64::FMULXv4f16:
+  case AArch64::FMULXv8f16:
+  case AArch64::FMULXv2f32:
+  case AArch64::FMULXv4f32:
+  case AArch64::FMULXv2f64:
+  // -- SVE instructions --
+  // Opcodes FMULX_ZZZ_? don't exist because there is no unpredicated FMULX
+  // in the SVE instruction set (though there are predicated ones).
+  case AArch64::FADD_ZZZ_H:
+  case AArch64::FADD_ZZZ_S:
+  case AArch64::FADD_ZZZ_D:
+  case AArch64::FMUL_ZZZ_H:
+  case AArch64::FMUL_ZZZ_S:
+  case AArch64::FMUL_ZZZ_D:
+    return Inst.getParent()->getParent()->getTarget().Options.UnsafeFPMath ||
+           (Inst.getFlag(MachineInstr::MIFlag::FmReassoc) &&
+            Inst.getFlag(MachineInstr::MIFlag::FmNsz));
+
+  // == Integer types ==
+  // -- Base instructions --
+  // Opcodes MULWrr and MULXrr don't exist because
+  // `MUL <Wd>, <Wn>, <Wm>` and `MUL <Xd>, <Xn>, <Xm>` are aliases of
+  // `MADD <Wd>, <Wn>, <Wm>, WZR` and `MADD <Xd>, <Xn>, <Xm>, XZR` respectively.
+  // The machine-combiner does not support three-source-operands machine
+  // instruction. So we cannot reassociate MULs.
+  case AArch64::ADDWrr:
+  case AArch64::ADDXrr:
+  case AArch64::ANDWrr:
+  case AArch64::ANDXrr:
+  case AArch64::ORRWrr:
+  case AArch64::ORRXrr:
+  case AArch64::EORWrr:
+  case AArch64::EORXrr:
+  case AArch64::EONWrr:
+  case AArch64::EONXrr:
+  // -- Advanced SIMD instructions --
+  // Opcodes MULv1i64 and MULv2i64 don't exist because there is no 64-bit MUL
+  // in the Advanced SIMD instruction set.
+  case AArch64::ADDv8i8:
+  case AArch64::ADDv16i8:
+  case AArch64::ADDv4i16:
+  case AArch64::ADDv8i16:
+  case AArch64::ADDv2i32:
+  case AArch64::ADDv4i32:
+  case AArch64::ADDv1i64:
+  case AArch64::ADDv2i64:
+  case AArch64::MULv8i8:
+  case AArch64::MULv16i8:
+  case AArch64::MULv4i16:
+  case AArch64::MULv8i16:
+  case AArch64::MULv2i32:
+  case AArch64::MULv4i32:
+  case AArch64::ANDv8i8:
+  case AArch64::ANDv16i8:
+  case AArch64::ORRv8i8:
+  case AArch64::ORRv16i8:
+  case AArch64::EORv8i8:
+  case AArch64::EORv16i8:
+  // -- SVE instructions --
+  case AArch64::ADD_ZZZ_B:
+  case AArch64::ADD_ZZZ_H:
+  case AArch64::ADD_ZZZ_S:
+  case AArch64::ADD_ZZZ_D:
+  case AArch64::MUL_ZZZ_B:
+  case AArch64::MUL_ZZZ_H:
+  case AArch64::MUL_ZZZ_S:
+  case AArch64::MUL_ZZZ_D:
+  case AArch64::AND_ZZZ:
+  case AArch64::ORR_ZZZ:
+  case AArch64::EOR_ZZZ:
+    return true;
+
   default:
     return false;
   }
@@ -4918,6 +5336,59 @@ static bool getFMAPatterns(MachineInstr &Root,
   return Found;
 }
 
+static bool getFMULPatterns(MachineInstr &Root,
+                            SmallVectorImpl<MachineCombinerPattern> &Patterns) {
+  MachineBasicBlock &MBB = *Root.getParent();
+  bool Found = false;
+
+  auto Match = [&](unsigned Opcode, int Operand,
+                   MachineCombinerPattern Pattern) -> bool {
+    MachineRegisterInfo &MRI = MBB.getParent()->getRegInfo();
+    MachineOperand &MO = Root.getOperand(Operand);
+    MachineInstr *MI = nullptr;
+    if (MO.isReg() && MO.getReg().isVirtual())
+      MI = MRI.getUniqueVRegDef(MO.getReg());
+    // Ignore No-op COPYs in FMUL(COPY(DUP(..)))
+    if (MI && MI->getOpcode() == TargetOpcode::COPY &&
+        MI->getOperand(1).getReg().isVirtual())
+      MI = MRI.getUniqueVRegDef(MI->getOperand(1).getReg());
+    if (MI && MI->getOpcode() == Opcode) {
+      Patterns.push_back(Pattern);
+      return true;
+    }
+    return false;
+  };
+
+  typedef MachineCombinerPattern MCP;
+
+  switch (Root.getOpcode()) {
+  default:
+    return false;
+  case AArch64::FMULv2f32:
+    Found = Match(AArch64::DUPv2i32lane, 1, MCP::FMULv2i32_indexed_OP1);
+    Found |= Match(AArch64::DUPv2i32lane, 2, MCP::FMULv2i32_indexed_OP2);
+    break;
+  case AArch64::FMULv2f64:
+    Found = Match(AArch64::DUPv2i64lane, 1, MCP::FMULv2i64_indexed_OP1);
+    Found |= Match(AArch64::DUPv2i64lane, 2, MCP::FMULv2i64_indexed_OP2);
+    break;
+  case AArch64::FMULv4f16:
+    Found = Match(AArch64::DUPv4i16lane, 1, MCP::FMULv4i16_indexed_OP1);
+    Found |= Match(AArch64::DUPv4i16lane, 2, MCP::FMULv4i16_indexed_OP2);
+    break;
+  case AArch64::FMULv4f32:
+    Found = Match(AArch64::DUPv4i32lane, 1, MCP::FMULv4i32_indexed_OP1);
+    Found |= Match(AArch64::DUPv4i32lane, 2, MCP::FMULv4i32_indexed_OP2);
+    break;
+  case AArch64::FMULv8f16:
+    Found = Match(AArch64::DUPv8i16lane, 1, MCP::FMULv8i16_indexed_OP1);
+    Found |= Match(AArch64::DUPv8i16lane, 2, MCP::FMULv8i16_indexed_OP2);
+    break;
+  }
+
+  return Found;
+}
+
 /// Return true when a code sequence can improve throughput. It
 /// should be called only for instructions in loops.
 /// \param Pattern - combiner pattern
@@ -4981,6 +5452,16 @@ bool AArch64InstrInfo::isThroughputPattern(
   case MachineCombinerPattern::FMLSv2f64_OP2:
   case MachineCombinerPattern::FMLSv4i32_indexed_OP2:
   case MachineCombinerPattern::FMLSv4f32_OP2:
+  case MachineCombinerPattern::FMULv2i32_indexed_OP1:
+  case MachineCombinerPattern::FMULv2i32_indexed_OP2:
+  case MachineCombinerPattern::FMULv2i64_indexed_OP1:
+  case MachineCombinerPattern::FMULv2i64_indexed_OP2:
+  case MachineCombinerPattern::FMULv4i16_indexed_OP1:
+  case MachineCombinerPattern::FMULv4i16_indexed_OP2:
+  case MachineCombinerPattern::FMULv4i32_indexed_OP1:
+  case MachineCombinerPattern::FMULv4i32_indexed_OP2:
+  case MachineCombinerPattern::FMULv8i16_indexed_OP1:
+  case MachineCombinerPattern::FMULv8i16_indexed_OP2:
   case MachineCombinerPattern::MULADDv8i8_OP1:
   case MachineCombinerPattern::MULADDv8i8_OP2:
   case MachineCombinerPattern::MULADDv16i8_OP1:
@@ -5025,6 +5506,42 @@ bool AArch64InstrInfo::isThroughputPattern(
   } // end switch (Pattern)
   return false;
 }
+
+/// Find other MI combine patterns.
+static bool getMiscPatterns(MachineInstr &Root,
+                            SmallVectorImpl<MachineCombinerPattern> &Patterns)
+{
+  // A - (B + C)  ==>   (A - B) - C  or  (A - C) - B
+  unsigned Opc = Root.getOpcode();
+  MachineBasicBlock &MBB = *Root.getParent();
+
+  switch (Opc) {
+  case AArch64::SUBWrr:
+  case AArch64::SUBSWrr:
+  case AArch64::SUBXrr:
+  case AArch64::SUBSXrr:
+    // Found candidate root.
+    break;
+  default:
+    return false;
+  }
+
+  if (isCombineInstrSettingFlag(Opc) &&
+      Root.findRegisterDefOperandIdx(AArch64::NZCV, true) == -1)
+    return false;
+
+  if (canCombine(MBB, Root.getOperand(2), AArch64::ADDWrr) ||
+      canCombine(MBB, Root.getOperand(2), AArch64::ADDSWrr) ||
+      canCombine(MBB, Root.getOperand(2), AArch64::ADDXrr) ||
+      canCombine(MBB, Root.getOperand(2), AArch64::ADDSXrr)) {
+    Patterns.push_back(MachineCombinerPattern::SUBADD_OP1);
+    Patterns.push_back(MachineCombinerPattern::SUBADD_OP2);
+    return true;
+  }
+
+  return false;
+}
+
 /// Return true when there is potentially a faster code sequence for an
 /// instruction chain ending in \p Root. All potential patterns are listed in
 /// the \p Pattern vector. Pattern should be sorted in priority order since the
@@ -5037,9 +5554,15 @@ bool AArch64InstrInfo::getMachineCombinerPatterns(
   if (getMaddPatterns(Root, Patterns))
     return true;
   // Floating point patterns
+  if (getFMULPatterns(Root, Patterns))
+    return true;
   if (getFMAPatterns(Root, Patterns))
     return true;
 
+  // Other patterns
+  if (getMiscPatterns(Root, Patterns))
+    return true;
+
   return TargetInstrInfo::getMachineCombinerPatterns(Root, Patterns,
                                                      DoRegPressureReduce);
 }
@@ -5081,7 +5604,7 @@ genFusedMultiply(MachineFunction &MF, MachineRegisterInfo &MRI,
   Register SrcReg1 = MUL->getOperand(2).getReg();
   bool Src1IsKill = MUL->getOperand(2).isKill();
 
-  unsigned SrcReg2;
+  Register SrcReg2;
   bool Src2IsKill;
   if (ReplacedAddend) {
     // If we just generated a new addend, we must be it's only use.
@@ -5092,29 +5615,29 @@ genFusedMultiply(MachineFunction &MF, MachineRegisterInfo &MRI,
     Src2IsKill = Root.getOperand(IdxOtherOpd).isKill();
   }
 
-  if (Register::isVirtualRegister(ResultReg))
+  if (ResultReg.isVirtual())
     MRI.constrainRegClass(ResultReg, RC);
-  if (Register::isVirtualRegister(SrcReg0))
+  if (SrcReg0.isVirtual())
     MRI.constrainRegClass(SrcReg0, RC);
-  if (Register::isVirtualRegister(SrcReg1))
+  if (SrcReg1.isVirtual())
     MRI.constrainRegClass(SrcReg1, RC);
-  if (Register::isVirtualRegister(SrcReg2))
+  if (SrcReg2.isVirtual())
     MRI.constrainRegClass(SrcReg2, RC);
 
   MachineInstrBuilder MIB;
   if (kind == FMAInstKind::Default)
-    MIB = BuildMI(MF, Root.getDebugLoc(), TII->get(MaddOpc), ResultReg)
+    MIB = BuildMI(MF, MIMetadata(Root), TII->get(MaddOpc), ResultReg)
               .addReg(SrcReg0, getKillRegState(Src0IsKill))
               .addReg(SrcReg1, getKillRegState(Src1IsKill))
               .addReg(SrcReg2, getKillRegState(Src2IsKill));
   else if (kind == FMAInstKind::Indexed)
-    MIB = BuildMI(MF, Root.getDebugLoc(), TII->get(MaddOpc), ResultReg)
+    MIB = BuildMI(MF, MIMetadata(Root), TII->get(MaddOpc), ResultReg)
               .addReg(SrcReg2, getKillRegState(Src2IsKill))
               .addReg(SrcReg0, getKillRegState(Src0IsKill))
               .addReg(SrcReg1, getKillRegState(Src1IsKill))
               .addImm(MUL->getOperand(3).getImm());
   else if (kind == FMAInstKind::Accumulator)
-    MIB = BuildMI(MF, Root.getDebugLoc(), TII->get(MaddOpc), ResultReg)
+    MIB = BuildMI(MF, MIMetadata(Root), TII->get(MaddOpc), ResultReg)
               .addReg(SrcReg2, getKillRegState(Src2IsKill))
               .addReg(SrcReg0, getKillRegState(Src0IsKill))
               .addReg(SrcReg1, getKillRegState(Src1IsKill));
@@ -5125,6 +5648,45 @@ genFusedMultiply(MachineFunction &MF, MachineRegisterInfo &MRI,
   return MUL;
 }
 
+/// Fold (FMUL x (DUP y lane)) into (FMUL_indexed x y lane)
+static MachineInstr *
+genIndexedMultiply(MachineInstr &Root,
+                   SmallVectorImpl<MachineInstr *> &InsInstrs,
+                   unsigned IdxDupOp, unsigned MulOpc,
+                   const TargetRegisterClass *RC, MachineRegisterInfo &MRI) {
+  assert(((IdxDupOp == 1) || (IdxDupOp == 2)) &&
+         "Invalid index of FMUL operand");
+
+  MachineFunction &MF = *Root.getMF();
+  const TargetInstrInfo *TII = MF.getSubtarget().getInstrInfo();
+
+  MachineInstr *Dup =
+      MF.getRegInfo().getUniqueVRegDef(Root.getOperand(IdxDupOp).getReg());
+
+  if (Dup->getOpcode() == TargetOpcode::COPY)
+    Dup = MRI.getUniqueVRegDef(Dup->getOperand(1).getReg());
+
+  Register DupSrcReg = Dup->getOperand(1).getReg();
+  MRI.clearKillFlags(DupSrcReg);
+  MRI.constrainRegClass(DupSrcReg, RC);
+
+  unsigned DupSrcLane = Dup->getOperand(2).getImm();
+
+  unsigned IdxMulOp = IdxDupOp == 1 ? 2 : 1;
+  MachineOperand &MulOp = Root.getOperand(IdxMulOp);
+
+  Register ResultReg = Root.getOperand(0).getReg();
+
+  MachineInstrBuilder MIB;
+  MIB = BuildMI(MF, MIMetadata(Root), TII->get(MulOpc), ResultReg)
+            .add(MulOp)
+            .addReg(DupSrcReg)
+            .addImm(DupSrcLane);
+
+  InsInstrs.push_back(MIB);
+  return &Root;
+}
+
 /// genFusedMultiplyAcc - Helper to generate fused multiply accumulate
 /// instructions.
 ///
@@ -5146,7 +5708,7 @@ static Register genNeg(MachineFunction &MF, MachineRegisterInfo &MRI,
                        unsigned MnegOpc, const TargetRegisterClass *RC) {
   Register NewVR = MRI.createVirtualRegister(RC);
   MachineInstrBuilder MIB =
-      BuildMI(MF, Root.getDebugLoc(), TII->get(MnegOpc), NewVR)
+      BuildMI(MF, MIMetadata(Root), TII->get(MnegOpc), NewVR)
           .add(Root.getOperand(2));
   InsInstrs.push_back(MIB);
 
@@ -5232,17 +5794,17 @@ static MachineInstr *genMaddR(MachineFunction &MF, MachineRegisterInfo &MRI,
   Register SrcReg1 = MUL->getOperand(2).getReg();
   bool Src1IsKill = MUL->getOperand(2).isKill();
 
-  if (Register::isVirtualRegister(ResultReg))
+  if (ResultReg.isVirtual())
     MRI.constrainRegClass(ResultReg, RC);
-  if (Register::isVirtualRegister(SrcReg0))
+  if (SrcReg0.isVirtual())
     MRI.constrainRegClass(SrcReg0, RC);
-  if (Register::isVirtualRegister(SrcReg1))
+  if (SrcReg1.isVirtual())
     MRI.constrainRegClass(SrcReg1, RC);
   if (Register::isVirtualRegister(VR))
     MRI.constrainRegClass(VR, RC);
 
   MachineInstrBuilder MIB =
-      BuildMI(MF, Root.getDebugLoc(), TII->get(MaddOpc), ResultReg)
+      BuildMI(MF, MIMetadata(Root), TII->get(MaddOpc), ResultReg)
           .addReg(SrcReg0, getKillRegState(Src0IsKill))
           .addReg(SrcReg1, getKillRegState(Src1IsKill))
           .addReg(VR);
@@ -5251,6 +5813,53 @@ static MachineInstr *genMaddR(MachineFunction &MF, MachineRegisterInfo &MRI,
   return MUL;
 }
 
+/// Do the following transformation
+/// A - (B + C)  ==>   (A - B) - C
+/// A - (B + C)  ==>   (A - C) - B
+static void
+genSubAdd2SubSub(MachineFunction &MF, MachineRegisterInfo &MRI,
+                 const TargetInstrInfo *TII, MachineInstr &Root,
+                 SmallVectorImpl<MachineInstr *> &InsInstrs,
+                 SmallVectorImpl<MachineInstr *> &DelInstrs,
+                 unsigned IdxOpd1,
+                 DenseMap<unsigned, unsigned> &InstrIdxForVirtReg) {
+  assert(IdxOpd1 == 1 || IdxOpd1 == 2);
+  unsigned IdxOtherOpd = IdxOpd1 == 1 ? 2 : 1;
+  MachineInstr *AddMI = MRI.getUniqueVRegDef(Root.getOperand(2).getReg());
+
+  Register ResultReg = Root.getOperand(0).getReg();
+  Register RegA = Root.getOperand(1).getReg();
+  bool RegAIsKill = Root.getOperand(1).isKill();
+  Register RegB = AddMI->getOperand(IdxOpd1).getReg();
+  bool RegBIsKill = AddMI->getOperand(IdxOpd1).isKill();
+  Register RegC = AddMI->getOperand(IdxOtherOpd).getReg();
+  bool RegCIsKill = AddMI->getOperand(IdxOtherOpd).isKill();
+  Register NewVR = MRI.createVirtualRegister(MRI.getRegClass(RegA));
+
+  unsigned Opcode = Root.getOpcode();
+  if (Opcode == AArch64::SUBSWrr)
+    Opcode = AArch64::SUBWrr;
+  else if (Opcode == AArch64::SUBSXrr)
+    Opcode = AArch64::SUBXrr;
+  else
+    assert((Opcode == AArch64::SUBWrr || Opcode == AArch64::SUBXrr) &&
+           "Unexpected instruction opcode.");
+
+  MachineInstrBuilder MIB1 =
+      BuildMI(MF, MIMetadata(Root), TII->get(Opcode), NewVR)
+          .addReg(RegA, getKillRegState(RegAIsKill))
+          .addReg(RegB, getKillRegState(RegBIsKill));
+  MachineInstrBuilder MIB2 =
+      BuildMI(MF, MIMetadata(Root), TII->get(Opcode), ResultReg)
+          .addReg(NewVR, getKillRegState(true))
+          .addReg(RegC, getKillRegState(RegCIsKill));
+
+  InstrIdxForVirtReg.insert(std::make_pair(NewVR, 0));
+  InsInstrs.push_back(MIB1);
+  InsInstrs.push_back(MIB2);
+  DelInstrs.push_back(AddMI);
+}
+
 /// When getMachineCombinerPatterns() finds potential patterns,
 /// this function generates the instructions that could replace the
 /// original code sequence
@@ -5273,6 +5882,18 @@ void AArch64InstrInfo::genAlternativeCodeSequence(
     TargetInstrInfo::genAlternativeCodeSequence(Root, Pattern, InsInstrs,
                                                 DelInstrs, InstrIdxForVirtReg);
     return;
+  case MachineCombinerPattern::SUBADD_OP1:
+    // A - (B + C)
+    // ==> (A - B) - C
+    genSubAdd2SubSub(MF, MRI, TII, Root, InsInstrs, DelInstrs, 1,
+                     InstrIdxForVirtReg);
+    break;
+  case MachineCombinerPattern::SUBADD_OP2:
+    // A - (B + C)
+    // ==> (A - C) - B
+    genSubAdd2SubSub(MF, MRI, TII, Root, InsInstrs, DelInstrs, 2,
+                     InstrIdxForVirtReg);
+    break;
   case MachineCombinerPattern::MULADDW_OP1:
   case MachineCombinerPattern::MULADDX_OP1:
     // MUL I=A,B,0
@@ -5307,7 +5928,7 @@ void AArch64InstrInfo::genAlternativeCodeSequence(
   case MachineCombinerPattern::MULADDXI_OP1: {
     // MUL I=A,B,0
     // ADD R,I,Imm
-    // ==> ORR  V, ZR, Imm
+    // ==> MOV V, Imm
     // ==> MADD R,A,B,V
     // --- Create(MADD);
     const TargetRegisterClass *OrrRC;
@@ -5335,16 +5956,34 @@ void AArch64InstrInfo::genAlternativeCodeSequence(
       Imm = Imm << Val;
     }
     uint64_t UImm = SignExtend64(Imm, BitSize);
-    uint64_t Encoding;
-    if (AArch64_AM::processLogicalImmediate(UImm, BitSize, Encoding)) {
-      MachineInstrBuilder MIB1 =
-          BuildMI(MF, Root.getDebugLoc(), TII->get(OrrOpc), NewVR)
-              .addReg(ZeroReg)
-              .addImm(Encoding);
-      InsInstrs.push_back(MIB1);
-      InstrIdxForVirtReg.insert(std::make_pair(NewVR, 0));
-      MUL = genMaddR(MF, MRI, TII, Root, InsInstrs, 1, Opc, NewVR, RC);
+    // The immediate can be composed via a single instruction.
+    SmallVector<AArch64_IMM::ImmInsnModel, 4> Insn;
+    AArch64_IMM::expandMOVImm(UImm, BitSize, Insn);
+    if (Insn.size() != 1)
+      return;
+    auto MovI = Insn.begin();
+    MachineInstrBuilder MIB1;
+    // MOV is an alias for one of three instructions: movz, movn, and orr.
+    if (MovI->Opcode == OrrOpc)
+      MIB1 = BuildMI(MF, MIMetadata(Root), TII->get(OrrOpc), NewVR)
+                 .addReg(ZeroReg)
+                 .addImm(MovI->Op2);
+    else {
+      if (BitSize == 32)
+        assert((MovI->Opcode == AArch64::MOVNWi ||
+                MovI->Opcode == AArch64::MOVZWi) &&
+               "Expected opcode");
+      else
+        assert((MovI->Opcode == AArch64::MOVNXi ||
+                MovI->Opcode == AArch64::MOVZXi) &&
+               "Expected opcode");
+      MIB1 = BuildMI(MF, MIMetadata(Root), TII->get(MovI->Opcode), NewVR)
+                 .addImm(MovI->Op1)
+                 .addImm(MovI->Op2);
     }
+    InsInstrs.push_back(MIB1);
+    InstrIdxForVirtReg.insert(std::make_pair(NewVR, 0));
+    MUL = genMaddR(MF, MRI, TII, Root, InsInstrs, 1, Opc, NewVR, RC);
     break;
   }
   case MachineCombinerPattern::MULSUBW_OP1:
@@ -5372,7 +6011,7 @@ void AArch64InstrInfo::genAlternativeCodeSequence(
     Register NewVR = MRI.createVirtualRegister(SubRC);
     // SUB NewVR, 0, C
     MachineInstrBuilder MIB1 =
-        BuildMI(MF, Root.getDebugLoc(), TII->get(SubOpc), NewVR)
+        BuildMI(MF, MIMetadata(Root), TII->get(SubOpc), NewVR)
             .addReg(ZeroReg)
             .add(Root.getOperand(2));
     InsInstrs.push_back(MIB1);
@@ -5399,7 +6038,7 @@ void AArch64InstrInfo::genAlternativeCodeSequence(
   case MachineCombinerPattern::MULSUBXI_OP1: {
     // MUL I=A,B,0
     // SUB R,I, Imm
-    // ==> ORR  V, ZR, -Imm
+    // ==> MOV  V, -Imm
     // ==> MADD R,A,B,V // = -Imm + A*B
     // --- Create(MADD);
     const TargetRegisterClass *OrrRC;
@@ -5426,16 +6065,34 @@ void AArch64InstrInfo::genAlternativeCodeSequence(
       Imm = Imm << Val;
     }
     uint64_t UImm = SignExtend64(-Imm, BitSize);
-    uint64_t Encoding;
-    if (AArch64_AM::processLogicalImmediate(UImm, BitSize, Encoding)) {
-      MachineInstrBuilder MIB1 =
-          BuildMI(MF, Root.getDebugLoc(), TII->get(OrrOpc), NewVR)
-              .addReg(ZeroReg)
-              .addImm(Encoding);
-      InsInstrs.push_back(MIB1);
-      InstrIdxForVirtReg.insert(std::make_pair(NewVR, 0));
-      MUL = genMaddR(MF, MRI, TII, Root, InsInstrs, 1, Opc, NewVR, RC);
+    // The immediate can be composed via a single instruction.
+    SmallVector<AArch64_IMM::ImmInsnModel, 4> Insn;
+    AArch64_IMM::expandMOVImm(UImm, BitSize, Insn);
+    if (Insn.size() != 1)
+      return;
+    auto MovI = Insn.begin();
+    MachineInstrBuilder MIB1;
+    // MOV is an alias for one of three instructions: movz, movn, and orr.
+    if (MovI->Opcode == OrrOpc)
+      MIB1 = BuildMI(MF, MIMetadata(Root), TII->get(OrrOpc), NewVR)
+                 .addReg(ZeroReg)
+                 .addImm(MovI->Op2);
+    else {
+      if (BitSize == 32)
+        assert((MovI->Opcode == AArch64::MOVNWi ||
+                MovI->Opcode == AArch64::MOVZWi) &&
+               "Expected opcode");
+      else
+        assert((MovI->Opcode == AArch64::MOVNXi ||
+                MovI->Opcode == AArch64::MOVZXi) &&
+               "Expected opcode");
+      MIB1 = BuildMI(MF, MIMetadata(Root), TII->get(MovI->Opcode), NewVR)
+                 .addImm(MovI->Op1)
+                 .addImm(MovI->Op2);
     }
+    InsInstrs.push_back(MIB1);
+    InstrIdxForVirtReg.insert(std::make_pair(NewVR, 0));
+    MUL = genMaddR(MF, MRI, TII, Root, InsInstrs, 1, Opc, NewVR, RC);
     break;
   }
 
@@ -5921,7 +6578,7 @@ void AArch64InstrInfo::genAlternativeCodeSequence(
     RC = &AArch64::FPR64RegClass;
     Register NewVR = MRI.createVirtualRegister(RC);
     MachineInstrBuilder MIB1 =
-        BuildMI(MF, Root.getDebugLoc(), TII->get(AArch64::FNEGv4f16), NewVR)
+        BuildMI(MF, MIMetadata(Root), TII->get(AArch64::FNEGv4f16), NewVR)
             .add(Root.getOperand(2));
     InsInstrs.push_back(MIB1);
     InstrIdxForVirtReg.insert(std::make_pair(NewVR, 0));
@@ -5968,7 +6625,7 @@ void AArch64InstrInfo::genAlternativeCodeSequence(
     RC = &AArch64::FPR128RegClass;
     Register NewVR = MRI.createVirtualRegister(RC);
     MachineInstrBuilder MIB1 =
-        BuildMI(MF, Root.getDebugLoc(), TII->get(AArch64::FNEGv8f16), NewVR)
+        BuildMI(MF, MIMetadata(Root), TII->get(AArch64::FNEGv8f16), NewVR)
             .add(Root.getOperand(2));
     InsInstrs.push_back(MIB1);
     InstrIdxForVirtReg.insert(std::make_pair(NewVR, 0));
@@ -6028,7 +6685,7 @@ void AArch64InstrInfo::genAlternativeCodeSequence(
     RC = &AArch64::FPR64RegClass;
     Register NewVR = MRI.createVirtualRegister(RC);
     MachineInstrBuilder MIB1 =
-        BuildMI(MF, Root.getDebugLoc(), TII->get(AArch64::FNEGv2f32), NewVR)
+        BuildMI(MF, MIMetadata(Root), TII->get(AArch64::FNEGv2f32), NewVR)
             .add(Root.getOperand(2));
     InsInstrs.push_back(MIB1);
     InstrIdxForVirtReg.insert(std::make_pair(NewVR, 0));
@@ -6048,7 +6705,7 @@ void AArch64InstrInfo::genAlternativeCodeSequence(
     RC = &AArch64::FPR128RegClass;
     Register NewVR = MRI.createVirtualRegister(RC);
     MachineInstrBuilder MIB1 =
-        BuildMI(MF, Root.getDebugLoc(), TII->get(AArch64::FNEGv4f32), NewVR)
+        BuildMI(MF, MIMetadata(Root), TII->get(AArch64::FNEGv4f32), NewVR)
             .add(Root.getOperand(2));
     InsInstrs.push_back(MIB1);
     InstrIdxForVirtReg.insert(std::make_pair(NewVR, 0));
@@ -6068,7 +6725,7 @@ void AArch64InstrInfo::genAlternativeCodeSequence(
     RC = &AArch64::FPR128RegClass;
     Register NewVR = MRI.createVirtualRegister(RC);
     MachineInstrBuilder MIB1 =
-        BuildMI(MF, Root.getDebugLoc(), TII->get(AArch64::FNEGv2f64), NewVR)
+        BuildMI(MF, MIMetadata(Root), TII->get(AArch64::FNEGv2f64), NewVR)
             .add(Root.getOperand(2));
     InsInstrs.push_back(MIB1);
     InstrIdxForVirtReg.insert(std::make_pair(NewVR, 0));
@@ -6083,13 +6740,59 @@ void AArch64InstrInfo::genAlternativeCodeSequence(
     }
     break;
   }
+  case MachineCombinerPattern::FMULv2i32_indexed_OP1:
+  case MachineCombinerPattern::FMULv2i32_indexed_OP2: {
+    unsigned IdxDupOp =
+        (Pattern == MachineCombinerPattern::FMULv2i32_indexed_OP1) ? 1 : 2;
+    genIndexedMultiply(Root, InsInstrs, IdxDupOp, AArch64::FMULv2i32_indexed,
+                       &AArch64::FPR128RegClass, MRI);
+    break;
+  }
+  case MachineCombinerPattern::FMULv2i64_indexed_OP1:
+  case MachineCombinerPattern::FMULv2i64_indexed_OP2: {
+    unsigned IdxDupOp =
+        (Pattern == MachineCombinerPattern::FMULv2i64_indexed_OP1) ? 1 : 2;
+    genIndexedMultiply(Root, InsInstrs, IdxDupOp, AArch64::FMULv2i64_indexed,
+                       &AArch64::FPR128RegClass, MRI);
+    break;
+  }
+  case MachineCombinerPattern::FMULv4i16_indexed_OP1:
+  case MachineCombinerPattern::FMULv4i16_indexed_OP2: {
+    unsigned IdxDupOp =
+        (Pattern == MachineCombinerPattern::FMULv4i16_indexed_OP1) ? 1 : 2;
+    genIndexedMultiply(Root, InsInstrs, IdxDupOp, AArch64::FMULv4i16_indexed,
+                       &AArch64::FPR128_loRegClass, MRI);
+    break;
+  }
+  case MachineCombinerPattern::FMULv4i32_indexed_OP1:
+  case MachineCombinerPattern::FMULv4i32_indexed_OP2: {
+    unsigned IdxDupOp =
+        (Pattern == MachineCombinerPattern::FMULv4i32_indexed_OP1) ? 1 : 2;
+    genIndexedMultiply(Root, InsInstrs, IdxDupOp, AArch64::FMULv4i32_indexed,
+                       &AArch64::FPR128RegClass, MRI);
+    break;
+  }
+  case MachineCombinerPattern::FMULv8i16_indexed_OP1:
+  case MachineCombinerPattern::FMULv8i16_indexed_OP2: {
+    unsigned IdxDupOp =
+        (Pattern == MachineCombinerPattern::FMULv8i16_indexed_OP1) ? 1 : 2;
+    genIndexedMultiply(Root, InsInstrs, IdxDupOp, AArch64::FMULv8i16_indexed,
+                       &AArch64::FPR128_loRegClass, MRI);
+    break;
+  }
   } // end switch (Pattern)
   // Record MUL and ADD/SUB for deletion
-  // FIXME: This assertion fails in CodeGen/AArch64/tailmerging_in_mbp.ll and
-  // CodeGen/AArch64/urem-seteq-nonzero.ll.
-  // assert(MUL && "MUL was never set");
-  DelInstrs.push_back(MUL);
+  if (MUL)
+    DelInstrs.push_back(MUL);
   DelInstrs.push_back(&Root);
+
+  // Set the flags on the inserted instructions to be the merged flags of the
+  // instructions that we have combined.
+  uint16_t Flags = Root.getFlags();
+  if (MUL)
+    Flags = Root.mergeFlagsWith(*MUL);
+  for (auto *MI : InsInstrs)
+    MI->setFlags(Flags);
 }
 
 /// Replace csincr-branch sequence by simple conditional branch
@@ -6171,7 +6874,7 @@ bool AArch64InstrInfo::optimizeCondBranch(MachineInstr &MI) const {
   MachineFunction *MF = MBB->getParent();
   MachineRegisterInfo *MRI = &MF->getRegInfo();
   Register VReg = MI.getOperand(0).getReg();
-  if (!Register::isVirtualRegister(VReg))
+  if (!VReg.isVirtual())
     return false;
 
   MachineInstr *DefMI = MRI->getVRegDef(VReg);
@@ -6207,7 +6910,7 @@ bool AArch64InstrInfo::optimizeCondBranch(MachineInstr &MI) const {
 
     MachineOperand &MO = DefMI->getOperand(1);
     Register NewReg = MO.getReg();
-    if (!Register::isVirtualRegister(NewReg))
+    if (!NewReg.isVirtual())
       return false;
 
     assert(!MRI->def_empty(NewReg) && "Register must be defined.");
@@ -6281,7 +6984,7 @@ AArch64InstrInfo::getSerializableDirectMachineOperandTargetFlags() const {
       {MO_G3, "aarch64-g3"},     {MO_G2, "aarch64-g2"},
       {MO_G1, "aarch64-g1"},     {MO_G0, "aarch64-g0"},
       {MO_HI12, "aarch64-hi12"}};
-  return makeArrayRef(TargetFlags);
+  return ArrayRef(TargetFlags);
 }
 
 ArrayRef<std::pair<unsigned, const char *>>
@@ -6295,9 +6998,10 @@ AArch64InstrInfo::getSerializableBitmaskMachineOperandTargetFlags() const {
       {MO_S, "aarch64-s"},
       {MO_TLS, "aarch64-tls"},
       {MO_DLLIMPORT, "aarch64-dllimport"},
+      {MO_DLLIMPORTAUX, "aarch64-dllimportaux"},
       {MO_PREL, "aarch64-prel"},
       {MO_TAGGED, "aarch64-tagged"}};
-  return makeArrayRef(TargetFlags);
+  return ArrayRef(TargetFlags);
 }
 
 ArrayRef<std::pair<MachineMemOperand::Flags, const char *>>
@@ -6305,7 +7009,7 @@ AArch64InstrInfo::getSerializableMachineMemOperandTargetFlags() const {
   static const std::pair<MachineMemOperand::Flags, const char *> TargetFlags[] =
       {{MOSuppressPair, "aarch64-suppress-pair"},
        {MOStridedAccess, "aarch64-strided-access"}};
-  return makeArrayRef(TargetFlags);
+  return ArrayRef(TargetFlags);
 }
 
 /// Constants defining how certain sequences should be outlined.
@@ -6402,13 +7106,12 @@ enum MachineOutlinerMBBFlags {
   UnsafeRegsDead = 0x8
 };
 
-unsigned
-AArch64InstrInfo::findRegisterToSaveLRTo(const outliner::Candidate &C) const {
-  assert(C.LRUWasSet && "LRU wasn't set?");
+Register
+AArch64InstrInfo::findRegisterToSaveLRTo(outliner::Candidate &C) const {
   MachineFunction *MF = C.getMF();
-  const AArch64RegisterInfo *ARI = static_cast<const AArch64RegisterInfo *>(
-      MF->getSubtarget().getRegisterInfo());
-
+  const TargetRegisterInfo &TRI = *MF->getSubtarget().getRegisterInfo();
+  const AArch64RegisterInfo *ARI =
+      static_cast<const AArch64RegisterInfo *>(&TRI);
   // Check if there is an available register across the sequence that we can
   // use.
   for (unsigned Reg : AArch64::GPR64RegClass) {
@@ -6416,12 +7119,11 @@ AArch64InstrInfo::findRegisterToSaveLRTo(const outliner::Candidate &C) const {
         Reg != AArch64::LR &&  // LR is not reserved, but don't use it.
         Reg != AArch64::X16 && // X16 is not guaranteed to be preserved.
         Reg != AArch64::X17 && // Ditto for X17.
-        C.LRU.available(Reg) && C.UsedInSequence.available(Reg))
+        C.isAvailableAcrossAndOutOfSeq(Reg, TRI) &&
+        C.isAvailableInsideSeq(Reg, TRI))
       return Reg;
   }
-
-  // No suitable register. Return 0.
-  return 0u;
+  return Register();
 }
 
 static bool
@@ -6567,10 +7269,8 @@ outliner::OutlinedFunction AArch64InstrInfo::getOutliningCandidateInfo(
   unsigned FlagsSetInAll = 0xF;
 
   // Compute liveness information for each candidate, and set FlagsSetInAll.
-  std::for_each(RepeatedSequenceLocs.begin(), RepeatedSequenceLocs.end(),
-                [&FlagsSetInAll](outliner::Candidate &C) {
-                  FlagsSetInAll &= C.Flags;
-                });
+  for (outliner::Candidate &C : RepeatedSequenceLocs)
+    FlagsSetInAll &= C.Flags;
 
   // According to the AArch64 Procedure Call Standard, the following are
   // undefined on entry/exit from a function call:
@@ -6588,10 +7288,8 @@ outliner::OutlinedFunction AArch64InstrInfo::getOutliningCandidateInfo(
     // to compute liveness here.
     if (C.Flags & UnsafeRegsDead)
       return false;
-    C.initLRU(TRI);
-    LiveRegUnits LRU = C.LRU;
-    return (!LRU.available(AArch64::W16) || !LRU.available(AArch64::W17) ||
-            !LRU.available(AArch64::NZCV));
+    return C.isAnyUnavailableAcrossOrOutOfSeq(
+        {AArch64::W16, AArch64::W17, AArch64::NZCV}, TRI);
   };
 
   // Are there any candidates where those registers are live?
@@ -6628,17 +7326,10 @@ outliner::OutlinedFunction AArch64InstrInfo::getOutliningCandidateInfo(
   // We check to see if CFI Instructions are present, and if they are
   // we find the number of CFI Instructions in the candidates.
   unsigned CFICount = 0;
-  MachineBasicBlock::iterator MBBI = RepeatedSequenceLocs[0].front();
-  for (unsigned Loc = RepeatedSequenceLocs[0].getStartIdx();
-       Loc < RepeatedSequenceLocs[0].getEndIdx() + 1; Loc++) {
-    const std::vector<MCCFIInstruction> &CFIInstructions =
-        RepeatedSequenceLocs[0].getMF()->getFrameInstructions();
-    if (MBBI->isCFIInstruction()) {
-      unsigned CFIIndex = MBBI->getOperand(0).getCFIIndex();
-      MCCFIInstruction CFI = CFIInstructions[CFIIndex];
+  for (auto &I : make_range(RepeatedSequenceLocs[0].front(),
+                            std::next(RepeatedSequenceLocs[0].back()))) {
+    if (I.isCFIInstruction())
       CFICount++;
-    }
-    MBBI++;
   }
 
   // We compare the number of found CFI Instructions to  the number of CFI
@@ -6695,8 +7386,8 @@ outliner::OutlinedFunction AArch64InstrInfo::getOutliningCandidateInfo(
       getMemOpInfo(MI.getOpcode(), Scale, DummyWidth, MinOffset, MaxOffset);
 
       Offset += 16; // Update the offset to what it would be if we outlined.
-      if (Offset < MinOffset * (int64_t)Scale.getFixedSize() ||
-          Offset > MaxOffset * (int64_t)Scale.getFixedSize())
+      if (Offset < MinOffset * (int64_t)Scale.getFixedValue() ||
+          Offset > MaxOffset * (int64_t)Scale.getFixedValue())
         return false;
 
       // It's in range, so we can outline it.
@@ -6741,8 +7432,6 @@ outliner::OutlinedFunction AArch64InstrInfo::getOutliningCandidateInfo(
 
     // Check if we have to save LR.
     for (outliner::Candidate &C : RepeatedSequenceLocs) {
-      C.initLRU(TRI);
-
       // If we have a noreturn caller, then we're going to be conservative and
       // say that we have to save LR. If we don't have a ret at the end of the
       // block, then we can't reason about liveness accurately.
@@ -6753,7 +7442,7 @@ outliner::OutlinedFunction AArch64InstrInfo::getOutliningCandidateInfo(
           C.getMF()->getFunction().hasFnAttribute(Attribute::NoReturn);
 
       // Is LR available? If so, we don't need a save.
-      if (C.LRU.available(AArch64::LR) && !IsNoReturn) {
+      if (C.isAvailableAcrossAndOutOfSeq(AArch64::LR, TRI) && !IsNoReturn) {
         NumBytesNoStackCalls += 4;
         C.setCallInfo(MachineOutlinerNoLRSave, 4);
         CandidatesWithoutStackFixups.push_back(C);
@@ -6769,7 +7458,7 @@ outliner::OutlinedFunction AArch64InstrInfo::getOutliningCandidateInfo(
 
       // Is SP used in the sequence at all? If not, we don't have to modify
       // the stack, so we are guaranteed to get the same frame.
-      else if (C.UsedInSequence.available(AArch64::SP)) {
+      else if (C.isAvailableInsideSeq(AArch64::SP, TRI)) {
         NumBytesNoStackCalls += 12;
         C.setCallInfo(MachineOutlinerDefault, 12);
         CandidatesWithoutStackFixups.push_back(C);
@@ -6838,11 +7527,12 @@ outliner::OutlinedFunction AArch64InstrInfo::getOutliningCandidateInfo(
       // LR to (ie one extra stack save/restore).
       //
       if (FlagsSetInAll & MachineOutlinerMBBFlags::HasCalls) {
-        erase_if(RepeatedSequenceLocs, [this](outliner::Candidate &C) {
+        erase_if(RepeatedSequenceLocs, [this, &TRI](outliner::Candidate &C) {
           return (std::any_of(
                      C.front(), std::next(C.back()),
                      [](const MachineInstr &MI) { return MI.isCall(); })) &&
-                 (!C.LRU.available(AArch64::LR) || !findRegisterToSaveLRTo(C));
+                 (!C.isAvailableAcrossAndOutOfSeq(AArch64::LR, TRI) ||
+                  !findRegisterToSaveLRTo(C));
         });
       }
     }
@@ -6913,7 +7603,7 @@ bool AArch64InstrInfo::isFunctionSafeToOutlineFrom(
   // modify the stack. Check if hasRedZone is true or unknown; if yes, don't
   // outline from it.
   AArch64FunctionInfo *AFI = MF.getInfo<AArch64FunctionInfo>();
-  if (!AFI || AFI->hasRedZone().getValueOr(true))
+  if (!AFI || AFI->hasRedZone().value_or(true))
     return false;
 
   // FIXME: Teach the outliner to generate/handle Windows unwind info.
@@ -6926,14 +7616,16 @@ bool AArch64InstrInfo::isFunctionSafeToOutlineFrom(
 
 bool AArch64InstrInfo::isMBBSafeToOutlineFrom(MachineBasicBlock &MBB,
                                               unsigned &Flags) const {
+  if (!TargetInstrInfo::isMBBSafeToOutlineFrom(MBB, Flags))
+    return false;
   // Check if LR is available through all of the MBB. If it's not, then set
   // a flag.
   assert(MBB.getParent()->getRegInfo().tracksLiveness() &&
          "Suitable Machine Function for outlining must track liveness");
   LiveRegUnits LRU(getRegisterInfo());
 
-  std::for_each(MBB.rbegin(), MBB.rend(),
-                [&LRU](MachineInstr &MI) { LRU.accumulate(MI); });
+  for (MachineInstr &MI : llvm::reverse(MBB))
+    LRU.accumulate(MI);
 
   // Check if each of the unsafe registers are available...
   bool W16AvailableInBlock = LRU.available(AArch64::W16);
@@ -7171,14 +7863,14 @@ void AArch64InstrInfo::fixupPostOutline(MachineBasicBlock &MBB) const {
     // We've pushed the return address to the stack, so add 16 to the offset.
     // This is safe, since we already checked if it would overflow when we
     // checked if this instruction was legal to outline.
-    int64_t NewImm = (Offset + 16) / (int64_t)Scale.getFixedSize();
+    int64_t NewImm = (Offset + 16) / (int64_t)Scale.getFixedValue();
     StackOffsetOperand.setImm(NewImm);
   }
 }
 
 static void signOutlinedFunction(MachineFunction &MF, MachineBasicBlock &MBB,
                                  bool ShouldSignReturnAddr,
-                                 bool ShouldSignReturnAddrWithAKey) {
+                                 bool ShouldSignReturnAddrWithBKey) {
   if (ShouldSignReturnAddr) {
     MachineBasicBlock::iterator MBBPAC = MBB.begin();
     MachineBasicBlock::iterator MBBAUT = MBB.getFirstTerminator();
@@ -7196,42 +7888,44 @@ static void signOutlinedFunction(MachineFunction &MF, MachineBasicBlock &MBB,
     //    PACIASP                   EMITBKEY
     //    CFI_INSTRUCTION           PACIBSP
     //                              CFI_INSTRUCTION
-    unsigned PACI;
-    if (ShouldSignReturnAddrWithAKey) {
-      PACI = Subtarget.hasPAuth() ? AArch64::PACIA : AArch64::PACIASP;
-    } else {
+    if (ShouldSignReturnAddrWithBKey) {
       BuildMI(MBB, MBBPAC, DebugLoc(), TII->get(AArch64::EMITBKEY))
           .setMIFlag(MachineInstr::FrameSetup);
-      PACI = Subtarget.hasPAuth() ? AArch64::PACIB : AArch64::PACIBSP;
     }
 
-    auto MI = BuildMI(MBB, MBBPAC, DebugLoc(), TII->get(PACI));
-    if (Subtarget.hasPAuth())
-      MI.addReg(AArch64::LR, RegState::Define)
-          .addReg(AArch64::LR)
-          .addReg(AArch64::SP, RegState::InternalRead);
-    MI.setMIFlag(MachineInstr::FrameSetup);
-
-    unsigned CFIIndex =
-        MF.addFrameInst(MCCFIInstruction::createNegateRAState(nullptr));
-    BuildMI(MBB, MBBPAC, DebugLoc(), TII->get(AArch64::CFI_INSTRUCTION))
-        .addCFIIndex(CFIIndex)
-        .setMIFlags(MachineInstr::FrameSetup);
+    BuildMI(MBB, MBBPAC, DebugLoc(),
+            TII->get(ShouldSignReturnAddrWithBKey ? AArch64::PACIBSP
+                                                  : AArch64::PACIASP))
+        .setMIFlag(MachineInstr::FrameSetup);
+
+    if (MF.getInfo<AArch64FunctionInfo>()->needsDwarfUnwindInfo(MF)) {
+      unsigned CFIIndex =
+          MF.addFrameInst(MCCFIInstruction::createNegateRAState(nullptr));
+      BuildMI(MBB, MBBPAC, DebugLoc(), TII->get(AArch64::CFI_INSTRUCTION))
+          .addCFIIndex(CFIIndex)
+          .setMIFlags(MachineInstr::FrameSetup);
+    }
 
     // If v8.3a features are available we can replace a RET instruction by
-    // RETAA or RETAB and omit the AUT instructions
+    // RETAA or RETAB and omit the AUT instructions. In this case the
+    // DW_CFA_AARCH64_negate_ra_state can't be emitted.
     if (Subtarget.hasPAuth() && MBBAUT != MBB.end() &&
         MBBAUT->getOpcode() == AArch64::RET) {
       BuildMI(MBB, MBBAUT, DL,
-              TII->get(ShouldSignReturnAddrWithAKey ? AArch64::RETAA
-                                                    : AArch64::RETAB))
+              TII->get(ShouldSignReturnAddrWithBKey ? AArch64::RETAB
+                                                    : AArch64::RETAA))
           .copyImplicitOps(*MBBAUT);
       MBB.erase(MBBAUT);
     } else {
       BuildMI(MBB, MBBAUT, DL,
-              TII->get(ShouldSignReturnAddrWithAKey ? AArch64::AUTIASP
-                                                    : AArch64::AUTIBSP))
+              TII->get(ShouldSignReturnAddrWithBKey ? AArch64::AUTIBSP
+                                                    : AArch64::AUTIASP))
           .setMIFlag(MachineInstr::FrameDestroy);
+      unsigned CFIIndexAuth =
+          MF.addFrameInst(MCCFIInstruction::createNegateRAState(nullptr));
+      BuildMI(MBB, MBBAUT, DL, TII->get(TargetOpcode::CFI_INSTRUCTION))
+          .addCFIIndex(CFIIndexAuth)
+          .setMIFlags(MachineInstr::FrameDestroy);
     }
   }
 }
@@ -7303,24 +7997,26 @@ void AArch64InstrInfo::buildOutlinedFrame(
                                 .addImm(-16);
     It = MBB.insert(It, STRXpre);
 
-    const TargetSubtargetInfo &STI = MF.getSubtarget();
-    const MCRegisterInfo *MRI = STI.getRegisterInfo();
-    unsigned DwarfReg = MRI->getDwarfRegNum(AArch64::LR, true);
-
-    // Add a CFI saying the stack was moved 16 B down.
-    int64_t StackPosEntry =
-        MF.addFrameInst(MCCFIInstruction::cfiDefCfaOffset(nullptr, 16));
-    BuildMI(MBB, It, DebugLoc(), get(AArch64::CFI_INSTRUCTION))
-        .addCFIIndex(StackPosEntry)
-        .setMIFlags(MachineInstr::FrameSetup);
-
-    // Add a CFI saying that the LR that we want to find is now 16 B higher than
-    // before.
-    int64_t LRPosEntry =
-        MF.addFrameInst(MCCFIInstruction::createOffset(nullptr, DwarfReg, -16));
-    BuildMI(MBB, It, DebugLoc(), get(AArch64::CFI_INSTRUCTION))
-        .addCFIIndex(LRPosEntry)
-        .setMIFlags(MachineInstr::FrameSetup);
+    if (MF.getInfo<AArch64FunctionInfo>()->needsDwarfUnwindInfo(MF)) {
+      const TargetSubtargetInfo &STI = MF.getSubtarget();
+      const MCRegisterInfo *MRI = STI.getRegisterInfo();
+      unsigned DwarfReg = MRI->getDwarfRegNum(AArch64::LR, true);
+
+      // Add a CFI saying the stack was moved 16 B down.
+      int64_t StackPosEntry =
+          MF.addFrameInst(MCCFIInstruction::cfiDefCfaOffset(nullptr, 16));
+      BuildMI(MBB, It, DebugLoc(), get(AArch64::CFI_INSTRUCTION))
+          .addCFIIndex(StackPosEntry)
+          .setMIFlags(MachineInstr::FrameSetup);
+
+      // Add a CFI saying that the LR that we want to find is now 16 B higher
+      // than before.
+      int64_t LRPosEntry = MF.addFrameInst(
+          MCCFIInstruction::createOffset(nullptr, DwarfReg, -16));
+      BuildMI(MBB, It, DebugLoc(), get(AArch64::CFI_INSTRUCTION))
+          .addCFIIndex(LRPosEntry)
+          .setMIFlags(MachineInstr::FrameSetup);
+    }
 
     // Insert a restore before the terminator for the function.
     MachineInstr *LDRXpost = BuildMI(MF, DebugLoc(), get(AArch64::LDRXpost))
@@ -7338,13 +8034,13 @@ void AArch64InstrInfo::buildOutlinedFrame(
   bool ShouldSignReturnAddr = MFI.shouldSignReturnAddress(!IsLeafFunction);
 
   // a_key is the default
-  bool ShouldSignReturnAddrWithAKey = !MFI.shouldSignWithBKey();
+  bool ShouldSignReturnAddrWithBKey = MFI.shouldSignWithBKey();
 
   // If this is a tail call outlined function, then there's already a return.
   if (OF.FrameConstructionID == MachineOutlinerTailCall ||
       OF.FrameConstructionID == MachineOutlinerThunk) {
     signOutlinedFunction(MF, MBB, ShouldSignReturnAddr,
-                         ShouldSignReturnAddrWithAKey);
+                         ShouldSignReturnAddrWithBKey);
     return;
   }
 
@@ -7359,7 +8055,7 @@ void AArch64InstrInfo::buildOutlinedFrame(
   MBB.insert(MBB.end(), ret);
 
   signOutlinedFunction(MF, MBB, ShouldSignReturnAddr,
-                       ShouldSignReturnAddrWithAKey);
+                       ShouldSignReturnAddrWithBKey);
 
   FI->setOutliningStyle("Function");
 
@@ -7374,7 +8070,7 @@ void AArch64InstrInfo::buildOutlinedFrame(
 
 MachineBasicBlock::iterator AArch64InstrInfo::insertOutlinedCall(
     Module &M, MachineBasicBlock &MBB, MachineBasicBlock::iterator &It,
-    MachineFunction &MF, const outliner::Candidate &C) const {
+    MachineFunction &MF, outliner::Candidate &C) const {
 
   // Are we tail calling?
   if (C.CallConstructionID == MachineOutlinerTailCall) {
@@ -7405,10 +8101,14 @@ MachineBasicBlock::iterator AArch64InstrInfo::insertOutlinedCall(
   if (C.CallConstructionID == MachineOutlinerRegSave) {
     // FIXME: This logic should be sunk into a target-specific interface so that
     // we don't have to recompute the register.
-    unsigned Reg = findRegisterToSaveLRTo(C);
-    assert(Reg != 0 && "No callee-saved register available?");
+    Register Reg = findRegisterToSaveLRTo(C);
+    assert(Reg && "No callee-saved register available?");
+
+    // LR has to be a live in so that we can save it.
+    if (!MBB.isLiveIn(AArch64::LR))
+      MBB.addLiveIn(AArch64::LR);
 
-    // Save and restore LR from that register.
+    // Save and restore LR from Reg.
     Save = BuildMI(MF, DebugLoc(), get(AArch64::ORRXrs), Reg)
                .addReg(AArch64::XZR)
                .addReg(AArch64::LR)
@@ -7449,7 +8149,7 @@ bool AArch64InstrInfo::shouldOutlineFromFunctionByDefault(
   return MF.getFunction().hasMinSize();
 }
 
-Optional<DestSourcePair>
+std::optional<DestSourcePair>
 AArch64InstrInfo::isCopyInstrImpl(const MachineInstr &MI) const {
 
   // AArch64::ORRWrs and AArch64::ORRXrs with WZR/XZR reg
@@ -7466,11 +8166,11 @@ AArch64InstrInfo::isCopyInstrImpl(const MachineInstr &MI) const {
     return DestSourcePair{MI.getOperand(0), MI.getOperand(2)};
   }
 
-  return None;
+  return std::nullopt;
 }
 
-Optional<RegImmPair> AArch64InstrInfo::isAddImmediate(const MachineInstr &MI,
-                                                      Register Reg) const {
+std::optional<RegImmPair>
+AArch64InstrInfo::isAddImmediate(const MachineInstr &MI, Register Reg) const {
   int Sign = 1;
   int64_t Offset = 0;
 
@@ -7478,17 +8178,17 @@ Optional<RegImmPair> AArch64InstrInfo::isAddImmediate(const MachineInstr &MI,
   // destination register.
   const MachineOperand &Op0 = MI.getOperand(0);
   if (!Op0.isReg() || Reg != Op0.getReg())
-    return None;
+    return std::nullopt;
 
   switch (MI.getOpcode()) {
   default:
-    return None;
+    return std::nullopt;
   case AArch64::SUBWri:
   case AArch64::SUBXri:
   case AArch64::SUBSWri:
   case AArch64::SUBSXri:
     Sign *= -1;
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case AArch64::ADDSWri:
   case AArch64::ADDSXri:
   case AArch64::ADDWri:
@@ -7496,7 +8196,7 @@ Optional<RegImmPair> AArch64InstrInfo::isAddImmediate(const MachineInstr &MI,
     // TODO: Third operand can be global address (usually some string).
     if (!MI.getOperand(0).isReg() || !MI.getOperand(1).isReg() ||
         !MI.getOperand(2).isImm())
-      return None;
+      return std::nullopt;
     int Shift = MI.getOperand(3).getImm();
     assert((Shift == 0 || Shift == 12) && "Shift can be either 0 or 12");
     Offset = Sign * (MI.getOperand(2).getImm() << Shift);
@@ -7508,13 +8208,13 @@ Optional<RegImmPair> AArch64InstrInfo::isAddImmediate(const MachineInstr &MI,
 /// If the given ORR instruction is a copy, and \p DescribedReg overlaps with
 /// the destination register then, if possible, describe the value in terms of
 /// the source register.
-static Optional<ParamLoadedValue>
+static std::optional<ParamLoadedValue>
 describeORRLoadedValue(const MachineInstr &MI, Register DescribedReg,
                        const TargetInstrInfo *TII,
                        const TargetRegisterInfo *TRI) {
   auto DestSrc = TII->isCopyInstr(MI);
   if (!DestSrc)
-    return None;
+    return std::nullopt;
 
   Register DestReg = DestSrc->Destination->getReg();
   Register SrcReg = DestSrc->Source->getReg();
@@ -7540,10 +8240,10 @@ describeORRLoadedValue(const MachineInstr &MI, Register DescribedReg,
   assert(!TRI->isSuperOrSubRegisterEq(DestReg, DescribedReg) &&
          "Unhandled ORR[XW]rs copy case");
 
-  return None;
+  return std::nullopt;
 }
 
-Optional<ParamLoadedValue>
+std::optional<ParamLoadedValue>
 AArch64InstrInfo::describeLoadedValue(const MachineInstr &MI,
                                       Register Reg) const {
   const MachineFunction *MF = MI.getMF();
@@ -7554,10 +8254,10 @@ AArch64InstrInfo::describeLoadedValue(const MachineInstr &MI,
     // MOVZWi may be used for producing zero-extended 32-bit immediates in
     // 64-bit parameters, so we need to consider super-registers.
     if (!TRI->isSuperRegisterEq(MI.getOperand(0).getReg(), Reg))
-      return None;
+      return std::nullopt;
 
     if (!MI.getOperand(1).isImm())
-      return None;
+      return std::nullopt;
     int64_t Immediate = MI.getOperand(1).getImm();
     int Shift = MI.getOperand(2).getImm();
     return ParamLoadedValue(MachineOperand::CreateImm(Immediate << Shift),
diff --git a/gnu/llvm/llvm/lib/Target/AArch64/AArch64InstrInfo.td b/gnu/llvm/llvm/lib/Target/AArch64/AArch64InstrInfo.td
index b78b09aa6ac..e1e7db2014d 100644
--- a/gnu/llvm/llvm/lib/Target/AArch64/AArch64InstrInfo.td
+++ b/gnu/llvm/llvm/lib/Target/AArch64/AArch64InstrInfo.td
@@ -13,161 +13,239 @@
 //===----------------------------------------------------------------------===//
 // ARM Instruction Predicate Definitions.
 //
+def HasV8_0a         : Predicate<"Subtarget->hasV8_0aOps()">,
+                                 AssemblerPredicate<(all_of HasV8_0aOps), "armv8.0a">;
 def HasV8_1a         : Predicate<"Subtarget->hasV8_1aOps()">,
-                                 AssemblerPredicate<(all_of HasV8_1aOps), "armv8.1a">;
+                                 AssemblerPredicateWithAll<(all_of HasV8_1aOps), "armv8.1a">;
 def HasV8_2a         : Predicate<"Subtarget->hasV8_2aOps()">,
-                                 AssemblerPredicate<(all_of HasV8_2aOps), "armv8.2a">;
+                                 AssemblerPredicateWithAll<(all_of HasV8_2aOps), "armv8.2a">;
 def HasV8_3a         : Predicate<"Subtarget->hasV8_3aOps()">,
-                                 AssemblerPredicate<(all_of HasV8_3aOps), "armv8.3a">;
+                                 AssemblerPredicateWithAll<(all_of HasV8_3aOps), "armv8.3a">;
 def HasV8_4a         : Predicate<"Subtarget->hasV8_4aOps()">,
-                                 AssemblerPredicate<(all_of HasV8_4aOps), "armv8.4a">;
+                                 AssemblerPredicateWithAll<(all_of HasV8_4aOps), "armv8.4a">;
 def HasV8_5a         : Predicate<"Subtarget->hasV8_5aOps()">,
-                                 AssemblerPredicate<(all_of HasV8_5aOps), "armv8.5a">;
+                                 AssemblerPredicateWithAll<(all_of HasV8_5aOps), "armv8.5a">;
 def HasV8_6a         : Predicate<"Subtarget->hasV8_6aOps()">,
-                                 AssemblerPredicate<(all_of HasV8_6aOps), "armv8.6a">;
+                                 AssemblerPredicateWithAll<(all_of HasV8_6aOps), "armv8.6a">;
 def HasV8_7a         : Predicate<"Subtarget->hasV8_7aOps()">,
-                                 AssemblerPredicate<(all_of HasV8_7aOps), "armv8.7a">;
+                                 AssemblerPredicateWithAll<(all_of HasV8_7aOps), "armv8.7a">;
+def HasV8_8a         : Predicate<"Subtarget->hasV8_8aOps()">,
+                                 AssemblerPredicateWithAll<(all_of HasV8_8aOps), "armv8.8a">;
+def HasV8_9a         : Predicate<"Subtarget->hasV8_9aOps()">,
+                                 AssemblerPredicateWithAll<(all_of HasV8_9aOps), "armv8.9a">;
+def HasV9_0a         : Predicate<"Subtarget->hasV9_0aOps()">,
+                                 AssemblerPredicateWithAll<(all_of HasV9_0aOps), "armv9-a">;
+def HasV9_1a         : Predicate<"Subtarget->hasV9_1aOps()">,
+                                 AssemblerPredicateWithAll<(all_of HasV9_1aOps), "armv9.1a">;
+def HasV9_2a         : Predicate<"Subtarget->hasV9_2aOps()">,
+                                 AssemblerPredicateWithAll<(all_of HasV9_2aOps), "armv9.2a">;
+def HasV9_3a         : Predicate<"Subtarget->hasV9_3aOps()">,
+                                 AssemblerPredicateWithAll<(all_of HasV9_3aOps), "armv9.3a">;
+def HasV9_4a         : Predicate<"Subtarget->hasV9_4aOps()">,
+                                 AssemblerPredicateWithAll<(all_of HasV9_4aOps), "armv9.4a">;
+def HasV8_0r         : Predicate<"Subtarget->hasV8_0rOps()">,
+                                 AssemblerPredicateWithAll<(all_of HasV8_0rOps), "armv8-r">;
+
+def HasEL2VMSA       : Predicate<"Subtarget->hasEL2VMSA()">,
+                       AssemblerPredicateWithAll<(all_of FeatureEL2VMSA), "el2vmsa">;
+
+def HasEL3           : Predicate<"Subtarget->hasEL3()">,
+                       AssemblerPredicateWithAll<(all_of FeatureEL3), "el3">;
+
 def HasVH            : Predicate<"Subtarget->hasVH()">,
-                       AssemblerPredicate<(all_of FeatureVH), "vh">;
+                       AssemblerPredicateWithAll<(all_of FeatureVH), "vh">;
 
 def HasLOR           : Predicate<"Subtarget->hasLOR()">,
-                       AssemblerPredicate<(all_of FeatureLOR), "lor">;
+                       AssemblerPredicateWithAll<(all_of FeatureLOR), "lor">;
 
 def HasPAuth         : Predicate<"Subtarget->hasPAuth()">,
-                       AssemblerPredicate<(all_of FeaturePAuth), "pauth">;
+                       AssemblerPredicateWithAll<(all_of FeaturePAuth), "pauth">;
 
 def HasJS            : Predicate<"Subtarget->hasJS()">,
-                       AssemblerPredicate<(all_of FeatureJS), "jsconv">;
+                       AssemblerPredicateWithAll<(all_of FeatureJS), "jsconv">;
 
 def HasCCIDX         : Predicate<"Subtarget->hasCCIDX()">,
-                       AssemblerPredicate<(all_of FeatureCCIDX), "ccidx">;
+                       AssemblerPredicateWithAll<(all_of FeatureCCIDX), "ccidx">;
 
 def HasComplxNum      : Predicate<"Subtarget->hasComplxNum()">,
-                       AssemblerPredicate<(all_of FeatureComplxNum), "complxnum">;
+                       AssemblerPredicateWithAll<(all_of FeatureComplxNum), "complxnum">;
 
 def HasNV            : Predicate<"Subtarget->hasNV()">,
-                       AssemblerPredicate<(all_of FeatureNV), "nv">;
+                       AssemblerPredicateWithAll<(all_of FeatureNV), "nv">;
 
 def HasMPAM          : Predicate<"Subtarget->hasMPAM()">,
-                       AssemblerPredicate<(all_of FeatureMPAM), "mpam">;
+                       AssemblerPredicateWithAll<(all_of FeatureMPAM), "mpam">;
 
 def HasDIT           : Predicate<"Subtarget->hasDIT()">,
-                       AssemblerPredicate<(all_of FeatureDIT), "dit">;
+                       AssemblerPredicateWithAll<(all_of FeatureDIT), "dit">;
 
 def HasTRACEV8_4         : Predicate<"Subtarget->hasTRACEV8_4()">,
-                       AssemblerPredicate<(all_of FeatureTRACEV8_4), "tracev8.4">;
+                       AssemblerPredicateWithAll<(all_of FeatureTRACEV8_4), "tracev8.4">;
 
 def HasAM            : Predicate<"Subtarget->hasAM()">,
-                       AssemblerPredicate<(all_of FeatureAM), "am">;
+                       AssemblerPredicateWithAll<(all_of FeatureAM), "am">;
 
 def HasSEL2          : Predicate<"Subtarget->hasSEL2()">,
-                       AssemblerPredicate<(all_of FeatureSEL2), "sel2">;
-
-def HasPMU           : Predicate<"Subtarget->hasPMU()">,
-                       AssemblerPredicate<(all_of FeaturePMU), "pmu">;
+                       AssemblerPredicateWithAll<(all_of FeatureSEL2), "sel2">;
 
 def HasTLB_RMI          : Predicate<"Subtarget->hasTLB_RMI()">,
-                       AssemblerPredicate<(all_of FeatureTLB_RMI), "tlb-rmi">;
+                       AssemblerPredicateWithAll<(all_of FeatureTLB_RMI), "tlb-rmi">;
 
 def HasFlagM         : Predicate<"Subtarget->hasFlagM()">,
-                       AssemblerPredicate<(all_of FeatureFlagM), "flagm">;
+                       AssemblerPredicateWithAll<(all_of FeatureFlagM), "flagm">;
 
 def HasRCPC_IMMO      : Predicate<"Subtarget->hasRCPCImm()">,
-                       AssemblerPredicate<(all_of FeatureRCPC_IMMO), "rcpc-immo">;
+                       AssemblerPredicateWithAll<(all_of FeatureRCPC_IMMO), "rcpc-immo">;
 
 def HasFPARMv8       : Predicate<"Subtarget->hasFPARMv8()">,
-                               AssemblerPredicate<(all_of FeatureFPARMv8), "fp-armv8">;
+                               AssemblerPredicateWithAll<(all_of FeatureFPARMv8), "fp-armv8">;
 def HasNEON          : Predicate<"Subtarget->hasNEON()">,
-                                 AssemblerPredicate<(all_of FeatureNEON), "neon">;
+                                 AssemblerPredicateWithAll<(all_of FeatureNEON), "neon">;
 def HasCrypto        : Predicate<"Subtarget->hasCrypto()">,
-                                 AssemblerPredicate<(all_of FeatureCrypto), "crypto">;
+                                 AssemblerPredicateWithAll<(all_of FeatureCrypto), "crypto">;
 def HasSM4           : Predicate<"Subtarget->hasSM4()">,
-                                 AssemblerPredicate<(all_of FeatureSM4), "sm4">;
+                                 AssemblerPredicateWithAll<(all_of FeatureSM4), "sm4">;
 def HasSHA3          : Predicate<"Subtarget->hasSHA3()">,
-                                 AssemblerPredicate<(all_of FeatureSHA3), "sha3">;
+                                 AssemblerPredicateWithAll<(all_of FeatureSHA3), "sha3">;
 def HasSHA2          : Predicate<"Subtarget->hasSHA2()">,
-                                 AssemblerPredicate<(all_of FeatureSHA2), "sha2">;
+                                 AssemblerPredicateWithAll<(all_of FeatureSHA2), "sha2">;
 def HasAES           : Predicate<"Subtarget->hasAES()">,
-                                 AssemblerPredicate<(all_of FeatureAES), "aes">;
+                                 AssemblerPredicateWithAll<(all_of FeatureAES), "aes">;
 def HasDotProd       : Predicate<"Subtarget->hasDotProd()">,
-                                 AssemblerPredicate<(all_of FeatureDotProd), "dotprod">;
+                                 AssemblerPredicateWithAll<(all_of FeatureDotProd), "dotprod">;
 def HasCRC           : Predicate<"Subtarget->hasCRC()">,
-                                 AssemblerPredicate<(all_of FeatureCRC), "crc">;
+                                 AssemblerPredicateWithAll<(all_of FeatureCRC), "crc">;
+def HasCSSC          : Predicate<"Subtarget->hasCSSC()">,
+                                 AssemblerPredicateWithAll<(all_of FeatureCSSC), "cssc">;
+def HasNoCSSC        : Predicate<"!Subtarget->hasCSSC()">;
 def HasLSE           : Predicate<"Subtarget->hasLSE()">,
-                                 AssemblerPredicate<(all_of FeatureLSE), "lse">;
+                                 AssemblerPredicateWithAll<(all_of FeatureLSE), "lse">;
 def HasNoLSE         : Predicate<"!Subtarget->hasLSE()">;
 def HasRAS           : Predicate<"Subtarget->hasRAS()">,
-                                 AssemblerPredicate<(all_of FeatureRAS), "ras">;
+                                 AssemblerPredicateWithAll<(all_of FeatureRAS), "ras">;
 def HasRDM           : Predicate<"Subtarget->hasRDM()">,
-                                 AssemblerPredicate<(all_of FeatureRDM), "rdm">;
-def HasPerfMon       : Predicate<"Subtarget->hasPerfMon()">;
+                                 AssemblerPredicateWithAll<(all_of FeatureRDM), "rdm">;
 def HasFullFP16      : Predicate<"Subtarget->hasFullFP16()">,
-                                 AssemblerPredicate<(all_of FeatureFullFP16), "fullfp16">;
+                                 AssemblerPredicateWithAll<(all_of FeatureFullFP16), "fullfp16">;
 def HasFP16FML       : Predicate<"Subtarget->hasFP16FML()">,
-                                 AssemblerPredicate<(all_of FeatureFP16FML), "fp16fml">;
+                                 AssemblerPredicateWithAll<(all_of FeatureFP16FML), "fp16fml">;
 def HasSPE           : Predicate<"Subtarget->hasSPE()">,
-                                 AssemblerPredicate<(all_of FeatureSPE), "spe">;
+                                 AssemblerPredicateWithAll<(all_of FeatureSPE), "spe">;
 def HasFuseAES       : Predicate<"Subtarget->hasFuseAES()">,
-                                 AssemblerPredicate<(all_of FeatureFuseAES),
+                                 AssemblerPredicateWithAll<(all_of FeatureFuseAES),
                                  "fuse-aes">;
 def HasSVE           : Predicate<"Subtarget->hasSVE()">,
-                                 AssemblerPredicate<(all_of FeatureSVE), "sve">;
+                                 AssemblerPredicateWithAll<(all_of FeatureSVE), "sve">;
 def HasSVE2          : Predicate<"Subtarget->hasSVE2()">,
-                                 AssemblerPredicate<(all_of FeatureSVE2), "sve2">;
+                                 AssemblerPredicateWithAll<(all_of FeatureSVE2), "sve2">;
+def HasSVE2p1        : Predicate<"Subtarget->hasSVE2p1()">,
+                                 AssemblerPredicate<(any_of FeatureSVE2p1), "sve2p1">;
 def HasSVE2AES       : Predicate<"Subtarget->hasSVE2AES()">,
-                                 AssemblerPredicate<(all_of FeatureSVE2AES), "sve2-aes">;
+                                 AssemblerPredicateWithAll<(all_of FeatureSVE2AES), "sve2-aes">;
 def HasSVE2SM4       : Predicate<"Subtarget->hasSVE2SM4()">,
-                                 AssemblerPredicate<(all_of FeatureSVE2SM4), "sve2-sm4">;
+                                 AssemblerPredicateWithAll<(all_of FeatureSVE2SM4), "sve2-sm4">;
 def HasSVE2SHA3      : Predicate<"Subtarget->hasSVE2SHA3()">,
-                                 AssemblerPredicate<(all_of FeatureSVE2SHA3), "sve2-sha3">;
+                                 AssemblerPredicateWithAll<(all_of FeatureSVE2SHA3), "sve2-sha3">;
 def HasSVE2BitPerm   : Predicate<"Subtarget->hasSVE2BitPerm()">,
-                                 AssemblerPredicate<(all_of FeatureSVE2BitPerm), "sve2-bitperm">;
+                                 AssemblerPredicateWithAll<(all_of FeatureSVE2BitPerm), "sve2-bitperm">;
+def HasB16B16        : Predicate<"Subtarget->hasB16B16()">,
+                                 AssemblerPredicateWithAll<(all_of FeatureB16B16), "b16b16">;
 def HasSME           : Predicate<"Subtarget->hasSME()">,
-                                 AssemblerPredicate<(all_of FeatureSME), "sme">;
-def HasSMEF64        : Predicate<"Subtarget->hasSMEF64()">,
-                                 AssemblerPredicate<(all_of FeatureSMEF64), "sme-f64">;
-def HasSMEI64        : Predicate<"Subtarget->hasSMEI64()">,
-                                 AssemblerPredicate<(all_of FeatureSMEI64), "sme-i64">;
+                                 AssemblerPredicateWithAll<(all_of FeatureSME), "sme">;
+def HasSMEF64F64     : Predicate<"Subtarget->hasSMEF64F64()">,
+                                 AssemblerPredicateWithAll<(all_of FeatureSMEF64F64), "sme-f64f64">;
+def HasSMEF16F16     : Predicate<"Subtarget->hasSMEF16F16()">,
+                                 AssemblerPredicateWithAll<(all_of FeatureSMEF16F16), "sme-f16f16">;
+def HasSMEI16I64     : Predicate<"Subtarget->hasSMEI16I64()">,
+                                 AssemblerPredicateWithAll<(all_of FeatureSMEI16I64), "sme-i16i64">;
+def HasSME2          : Predicate<"Subtarget->hasSME2()">,
+                                 AssemblerPredicateWithAll<(all_of FeatureSME2), "sme2">;
+def HasSME2p1        : Predicate<"Subtarget->hasSME2p1()">,
+                                 AssemblerPredicateWithAll<(all_of FeatureSME2p1), "sme2p1">;
+
+// A subset of SVE(2) instructions are legal in Streaming SVE execution mode,
+// they should be enabled if either has been specified.
+def HasSVEorSME
+    : Predicate<"Subtarget->hasSVEorSME()">,
+                AssemblerPredicateWithAll<(any_of FeatureSVE, FeatureSME),
+                "sve or sme">;
+def HasSVE2orSME
+    : Predicate<"Subtarget->hasSVE2() || Subtarget->hasSME()">,
+                AssemblerPredicateWithAll<(any_of FeatureSVE2, FeatureSME),
+                "sve2 or sme">;
+def HasSVE2p1_or_HasSME
+    : Predicate<"Subtarget->hasSVE2p1() || Subtarget->hasSME()">,
+                 AssemblerPredicateWithAll<(any_of FeatureSME, FeatureSVE2p1), "sme or sve2p1">;
+def HasSVE2p1_or_HasSME2
+    : Predicate<"Subtarget->hasSVE2p1() || Subtarget->hasSME2()">,
+                 AssemblerPredicateWithAll<(any_of FeatureSME2, FeatureSVE2p1), "sme2 or sve2p1">;
+def HasSVE2p1_or_HasSME2p1
+    : Predicate<"Subtarget->hasSVE2p1() || Subtarget->hasSME2p1()">,
+                 AssemblerPredicateWithAll<(any_of FeatureSME2p1, FeatureSVE2p1), "sme2p1 or sve2p1">;
+// A subset of NEON instructions are legal in Streaming SVE execution mode,
+// they should be enabled if either has been specified.
+def HasNEONorSME
+    : Predicate<"Subtarget->hasNEON() || Subtarget->hasSME()">,
+                AssemblerPredicateWithAll<(any_of FeatureNEON, FeatureSME),
+                "neon or sme">;
 def HasRCPC          : Predicate<"Subtarget->hasRCPC()">,
-                                 AssemblerPredicate<(all_of FeatureRCPC), "rcpc">;
+                                 AssemblerPredicateWithAll<(all_of FeatureRCPC), "rcpc">;
 def HasAltNZCV       : Predicate<"Subtarget->hasAlternativeNZCV()">,
-                       AssemblerPredicate<(all_of FeatureAltFPCmp), "altnzcv">;
+                       AssemblerPredicateWithAll<(all_of FeatureAltFPCmp), "altnzcv">;
 def HasFRInt3264     : Predicate<"Subtarget->hasFRInt3264()">,
-                       AssemblerPredicate<(all_of FeatureFRInt3264), "frint3264">;
+                       AssemblerPredicateWithAll<(all_of FeatureFRInt3264), "frint3264">;
 def HasSB            : Predicate<"Subtarget->hasSB()">,
-                       AssemblerPredicate<(all_of FeatureSB), "sb">;
+                       AssemblerPredicateWithAll<(all_of FeatureSB), "sb">;
 def HasPredRes      : Predicate<"Subtarget->hasPredRes()">,
-                       AssemblerPredicate<(all_of FeaturePredRes), "predres">;
+                       AssemblerPredicateWithAll<(all_of FeaturePredRes), "predres">;
 def HasCCDP          : Predicate<"Subtarget->hasCCDP()">,
-                       AssemblerPredicate<(all_of FeatureCacheDeepPersist), "ccdp">;
+                       AssemblerPredicateWithAll<(all_of FeatureCacheDeepPersist), "ccdp">;
 def HasBTI           : Predicate<"Subtarget->hasBTI()">,
-                       AssemblerPredicate<(all_of FeatureBranchTargetId), "bti">;
+                       AssemblerPredicateWithAll<(all_of FeatureBranchTargetId), "bti">;
 def HasMTE           : Predicate<"Subtarget->hasMTE()">,
-                       AssemblerPredicate<(all_of FeatureMTE), "mte">;
+                       AssemblerPredicateWithAll<(all_of FeatureMTE), "mte">;
 def HasTME           : Predicate<"Subtarget->hasTME()">,
-                       AssemblerPredicate<(all_of FeatureTME), "tme">;
+                       AssemblerPredicateWithAll<(all_of FeatureTME), "tme">;
 def HasETE           : Predicate<"Subtarget->hasETE()">,
-                       AssemblerPredicate<(all_of FeatureETE), "ete">;
+                       AssemblerPredicateWithAll<(all_of FeatureETE), "ete">;
 def HasTRBE          : Predicate<"Subtarget->hasTRBE()">,
-                       AssemblerPredicate<(all_of FeatureTRBE), "trbe">;
+                       AssemblerPredicateWithAll<(all_of FeatureTRBE), "trbe">;
 def HasBF16          : Predicate<"Subtarget->hasBF16()">,
-                       AssemblerPredicate<(all_of FeatureBF16), "bf16">;
+                       AssemblerPredicateWithAll<(all_of FeatureBF16), "bf16">;
 def HasMatMulInt8    : Predicate<"Subtarget->hasMatMulInt8()">,
-                       AssemblerPredicate<(all_of FeatureMatMulInt8), "i8mm">;
+                       AssemblerPredicateWithAll<(all_of FeatureMatMulInt8), "i8mm">;
 def HasMatMulFP32    : Predicate<"Subtarget->hasMatMulFP32()">,
-                       AssemblerPredicate<(all_of FeatureMatMulFP32), "f32mm">;
+                       AssemblerPredicateWithAll<(all_of FeatureMatMulFP32), "f32mm">;
 def HasMatMulFP64    : Predicate<"Subtarget->hasMatMulFP64()">,
-                       AssemblerPredicate<(all_of FeatureMatMulFP64), "f64mm">;
+                       AssemblerPredicateWithAll<(all_of FeatureMatMulFP64), "f64mm">;
 def HasXS            : Predicate<"Subtarget->hasXS()">,
-                       AssemblerPredicate<(all_of FeatureXS), "xs">;
+                       AssemblerPredicateWithAll<(all_of FeatureXS), "xs">;
 def HasWFxT          : Predicate<"Subtarget->hasWFxT()">,
-                       AssemblerPredicate<(all_of FeatureWFxT), "wfxt">;
+                       AssemblerPredicateWithAll<(all_of FeatureWFxT), "wfxt">;
 def HasLS64          : Predicate<"Subtarget->hasLS64()">,
-                       AssemblerPredicate<(all_of FeatureLS64), "ls64">;
+                       AssemblerPredicateWithAll<(all_of FeatureLS64), "ls64">;
 def HasBRBE          : Predicate<"Subtarget->hasBRBE()">,
-                       AssemblerPredicate<(all_of FeatureBRBE), "brbe">;
+                       AssemblerPredicateWithAll<(all_of FeatureBRBE), "brbe">;
 def HasSPE_EEF       : Predicate<"Subtarget->hasSPE_EEF()">,
-                       AssemblerPredicate<(all_of FeatureSPE_EEF), "spe-eef">;
+                       AssemblerPredicateWithAll<(all_of FeatureSPE_EEF), "spe-eef">;
+def HasHBC           : Predicate<"Subtarget->hasHBC()">,
+                       AssemblerPredicateWithAll<(all_of FeatureHBC), "hbc">;
+def HasMOPS          : Predicate<"Subtarget->hasMOPS()">,
+                       AssemblerPredicateWithAll<(all_of FeatureMOPS), "mops">;
+def HasCLRBHB        : Predicate<"Subtarget->hasCLRBHB()">,
+                       AssemblerPredicateWithAll<(all_of FeatureCLRBHB), "clrbhb">;
+def HasSPECRES2      : Predicate<"Subtarget->hasSPECRES2()">,
+                       AssemblerPredicateWithAll<(all_of FeatureSPECRES2), "specres2">;
+def HasITE           : Predicate<"Subtarget->hasITE()">,
+                       AssemblerPredicateWithAll<(all_of FeatureITE), "ite">;
+def HasTHE           : Predicate<"Subtarget->hasTHE()">,
+                       AssemblerPredicateWithAll<(all_of FeatureTHE), "the">;
+def HasRCPC3         : Predicate<"Subtarget->hasRCPC3()">,
+                       AssemblerPredicateWithAll<(all_of FeatureRCPC3), "rcpc3">;
+def HasLSE128        : Predicate<"Subtarget->hasLSE128()">,
+                       AssemblerPredicateWithAll<(all_of FeatureLSE128), "lse128">;
+def HasD128          : Predicate<"Subtarget->hasD128()">,
+                       AssemblerPredicateWithAll<(all_of FeatureD128), "d128">;
 def IsLE             : Predicate<"Subtarget->isLittleEndian()">;
 def IsBE             : Predicate<"!Subtarget->isLittleEndian()">;
 def IsWindows        : Predicate<"Subtarget->isTargetWindows()">;
@@ -180,6 +258,10 @@ def UseNegativeImmediates
     : Predicate<"false">, AssemblerPredicate<(all_of (not FeatureNoNegativeImmediates)),
                                              "NegativeImmediates">;
 
+def UseScalarIncVL : Predicate<"Subtarget->useScalarIncVL()">;
+
+def NotInStreamingSVEMode  : Predicate<"!Subtarget->forceStreamingCompatibleSVE()">;
+
 def AArch64LocalRecover : SDNode<"ISD::LOCAL_RECOVER",
                                   SDTypeProfile<1, 1, [SDTCisSameAs<0, 1>,
                                                        SDTCisInt<1>]>>;
@@ -280,6 +362,7 @@ def SDT_AArch64TLSDescCall : SDTypeProfile<0, -2, [SDTCisPtrTy<0>,
 def SDT_AArch64uaddlp : SDTypeProfile<1, 1, [SDTCisVec<0>, SDTCisVec<1>]>;
 
 def SDT_AArch64ldp : SDTypeProfile<2, 1, [SDTCisVT<0, i64>, SDTCisSameAs<0, 1>, SDTCisPtrTy<2>]>;
+def SDT_AArch64ldnp : SDTypeProfile<2, 1, [SDTCisVT<0, v4i32>, SDTCisSameAs<0, 1>, SDTCisPtrTy<2>]>;
 def SDT_AArch64stp : SDTypeProfile<0, 3, [SDTCisVT<0, i64>, SDTCisSameAs<0, 1>, SDTCisPtrTy<2>]>;
 def SDT_AArch64stnp : SDTypeProfile<0, 3, [SDTCisVT<0, v4i32>, SDTCisSameAs<0, 1>, SDTCisPtrTy<2>]>;
 
@@ -312,49 +395,49 @@ def nonext_masked_load :
          cast<MaskedLoadSDNode>(N)->isUnindexed() &&
          !cast<MaskedLoadSDNode>(N)->isNonTemporal();
 }]>;
-// sign extending masked load fragments.
-def asext_masked_load :
+// Any/Zero extending masked load fragments.
+def azext_masked_load :
   PatFrag<(ops node:$ptr, node:$pred, node:$def),
           (masked_ld node:$ptr, undef, node:$pred, node:$def),[{
   return (cast<MaskedLoadSDNode>(N)->getExtensionType() == ISD::EXTLOAD ||
-          cast<MaskedLoadSDNode>(N)->getExtensionType() == ISD::SEXTLOAD) &&
+          cast<MaskedLoadSDNode>(N)->getExtensionType() == ISD::ZEXTLOAD) &&
          cast<MaskedLoadSDNode>(N)->isUnindexed();
 }]>;
-def asext_masked_load_i8 :
+def azext_masked_load_i8 :
   PatFrag<(ops node:$ptr, node:$pred, node:$def),
-          (asext_masked_load node:$ptr, node:$pred, node:$def), [{
+          (azext_masked_load node:$ptr, node:$pred, node:$def), [{
   return cast<MaskedLoadSDNode>(N)->getMemoryVT().getScalarType() == MVT::i8;
 }]>;
-def asext_masked_load_i16 :
+def azext_masked_load_i16 :
   PatFrag<(ops node:$ptr, node:$pred, node:$def),
-          (asext_masked_load node:$ptr, node:$pred, node:$def), [{
+          (azext_masked_load node:$ptr, node:$pred, node:$def), [{
   return cast<MaskedLoadSDNode>(N)->getMemoryVT().getScalarType() == MVT::i16;
 }]>;
-def asext_masked_load_i32 :
+def azext_masked_load_i32 :
   PatFrag<(ops node:$ptr, node:$pred, node:$def),
-          (asext_masked_load node:$ptr, node:$pred, node:$def), [{
+          (azext_masked_load node:$ptr, node:$pred, node:$def), [{
   return cast<MaskedLoadSDNode>(N)->getMemoryVT().getScalarType() == MVT::i32;
 }]>;
-// zero extending masked load fragments.
-def zext_masked_load :
+// Sign extending masked load fragments.
+def sext_masked_load :
   PatFrag<(ops node:$ptr, node:$pred, node:$def),
           (masked_ld node:$ptr, undef, node:$pred, node:$def), [{
-  return cast<MaskedLoadSDNode>(N)->getExtensionType() == ISD::ZEXTLOAD &&
+  return cast<MaskedLoadSDNode>(N)->getExtensionType() == ISD::SEXTLOAD &&
          cast<MaskedLoadSDNode>(N)->isUnindexed();
 }]>;
-def zext_masked_load_i8 :
+def sext_masked_load_i8 :
   PatFrag<(ops node:$ptr, node:$pred, node:$def),
-          (zext_masked_load node:$ptr, node:$pred, node:$def), [{
+          (sext_masked_load node:$ptr, node:$pred, node:$def), [{
   return cast<MaskedLoadSDNode>(N)->getMemoryVT().getScalarType() == MVT::i8;
 }]>;
-def zext_masked_load_i16 :
+def sext_masked_load_i16 :
   PatFrag<(ops node:$ptr, node:$pred, node:$def),
-          (zext_masked_load node:$ptr, node:$pred, node:$def), [{
+          (sext_masked_load node:$ptr, node:$pred, node:$def), [{
   return cast<MaskedLoadSDNode>(N)->getMemoryVT().getScalarType() == MVT::i16;
 }]>;
-def zext_masked_load_i32 :
+def sext_masked_load_i32 :
   PatFrag<(ops node:$ptr, node:$pred, node:$def),
-          (zext_masked_load node:$ptr, node:$pred, node:$def), [{
+          (sext_masked_load node:$ptr, node:$pred, node:$def), [{
   return cast<MaskedLoadSDNode>(N)->getMemoryVT().getScalarType() == MVT::i32;
 }]>;
 
@@ -405,6 +488,80 @@ def non_temporal_store :
          cast<MaskedStoreSDNode>(N)->isNonTemporal();
 }]>;
 
+multiclass masked_gather_scatter<PatFrags GatherScatterOp> {
+  // offsets = (signed)Index << sizeof(elt)
+  def NAME#_signed_scaled :
+    PatFrag<(ops node:$val, node:$pred, node:$ptr, node:$idx),
+            (GatherScatterOp node:$val, node:$pred, node:$ptr, node:$idx),[{
+    auto MGS = cast<MaskedGatherScatterSDNode>(N);
+    bool Signed = MGS->isIndexSigned() ||
+        MGS->getIndex().getValueType().getVectorElementType() == MVT::i64;
+    return Signed && MGS->isIndexScaled();
+  }]>;
+  // offsets = (signed)Index
+  def NAME#_signed_unscaled :
+    PatFrag<(ops node:$val, node:$pred, node:$ptr, node:$idx),
+            (GatherScatterOp node:$val, node:$pred, node:$ptr, node:$idx),[{
+    auto MGS = cast<MaskedGatherScatterSDNode>(N);
+    bool Signed = MGS->isIndexSigned() ||
+        MGS->getIndex().getValueType().getVectorElementType() == MVT::i64;
+    return Signed && !MGS->isIndexScaled();
+  }]>;
+  // offsets = (unsigned)Index << sizeof(elt)
+  def NAME#_unsigned_scaled :
+    PatFrag<(ops node:$val, node:$pred, node:$ptr, node:$idx),
+            (GatherScatterOp node:$val, node:$pred, node:$ptr, node:$idx),[{
+    auto MGS = cast<MaskedGatherScatterSDNode>(N);
+    bool Signed = MGS->isIndexSigned() ||
+        MGS->getIndex().getValueType().getVectorElementType() == MVT::i64;
+    return !Signed && MGS->isIndexScaled();
+  }]>;
+  // offsets = (unsigned)Index
+  def NAME#_unsigned_unscaled :
+    PatFrag<(ops node:$val, node:$pred, node:$ptr, node:$idx),
+            (GatherScatterOp node:$val, node:$pred, node:$ptr, node:$idx),[{
+    auto MGS = cast<MaskedGatherScatterSDNode>(N);
+    bool Signed = MGS->isIndexSigned() ||
+        MGS->getIndex().getValueType().getVectorElementType() == MVT::i64;
+    return !Signed && !MGS->isIndexScaled();
+  }]>;
+}
+
+defm nonext_masked_gather    : masked_gather_scatter<nonext_masked_gather>;
+defm azext_masked_gather_i8  : masked_gather_scatter<azext_masked_gather_i8>;
+defm azext_masked_gather_i16 : masked_gather_scatter<azext_masked_gather_i16>;
+defm azext_masked_gather_i32 : masked_gather_scatter<azext_masked_gather_i32>;
+defm sext_masked_gather_i8   : masked_gather_scatter<sext_masked_gather_i8>;
+defm sext_masked_gather_i16  : masked_gather_scatter<sext_masked_gather_i16>;
+defm sext_masked_gather_i32  : masked_gather_scatter<sext_masked_gather_i32>;
+
+defm nontrunc_masked_scatter  : masked_gather_scatter<nontrunc_masked_scatter>;
+defm trunc_masked_scatter_i8  : masked_gather_scatter<trunc_masked_scatter_i8>;
+defm trunc_masked_scatter_i16 : masked_gather_scatter<trunc_masked_scatter_i16>;
+defm trunc_masked_scatter_i32 : masked_gather_scatter<trunc_masked_scatter_i32>;
+
+// top16Zero - answer true if the upper 16 bits of $src are 0, false otherwise
+def top16Zero: PatLeaf<(i32 GPR32:$src), [{
+  return SDValue(N,0)->getValueType(0) == MVT::i32 &&
+         CurDAG->MaskedValueIsZero(SDValue(N,0), APInt::getHighBitsSet(32, 16));
+  }]>;
+
+// top32Zero - answer true if the upper 32 bits of $src are 0, false otherwise
+def top32Zero: PatLeaf<(i64 GPR64:$src), [{
+  return SDValue(N,0)->getValueType(0) == MVT::i64 &&
+         CurDAG->MaskedValueIsZero(SDValue(N,0), APInt::getHighBitsSet(64, 32));
+  }]>;
+
+// topbitsallzero - Return true if all bits except the lowest bit are known zero
+def topbitsallzero32: PatLeaf<(i32 GPR32:$src), [{
+  return SDValue(N,0)->getValueType(0) == MVT::i32 &&
+         CurDAG->MaskedValueIsZero(SDValue(N,0), APInt::getHighBitsSet(32, 31));
+  }]>;
+def topbitsallzero64: PatLeaf<(i64 GPR64:$src), [{
+  return SDValue(N,0)->getValueType(0) == MVT::i64 &&
+         CurDAG->MaskedValueIsZero(SDValue(N,0), APInt::getHighBitsSet(64, 63));
+  }]>;
+
 // Node definitions.
 def AArch64adrp          : SDNode<"AArch64ISD::ADRP", SDTIntUnaryOp, []>;
 def AArch64adr           : SDNode<"AArch64ISD::ADR", SDTIntUnaryOp, []>;
@@ -423,6 +580,11 @@ def AArch64call          : SDNode<"AArch64ISD::CALL",
                                 [SDNPHasChain, SDNPOptInGlue, SDNPOutGlue,
                                  SDNPVariadic]>;
 
+def AArch64call_bti      : SDNode<"AArch64ISD::CALL_BTI",
+                                SDTypeProfile<0, -1, [SDTCisPtrTy<0>]>,
+                                [SDNPHasChain, SDNPOptInGlue, SDNPOutGlue,
+                                 SDNPVariadic]>;
+
 def AArch64call_rvmarker: SDNode<"AArch64ISD::CALL_RVMARKER",
                              SDTypeProfile<0, -1, [SDTCisPtrTy<0>]>,
                              [SDNPHasChain, SDNPOptInGlue, SDNPOutGlue,
@@ -476,6 +638,7 @@ def AArch64duplane8  : SDNode<"AArch64ISD::DUPLANE8", SDT_AArch64DupLane>;
 def AArch64duplane16 : SDNode<"AArch64ISD::DUPLANE16", SDT_AArch64DupLane>;
 def AArch64duplane32 : SDNode<"AArch64ISD::DUPLANE32", SDT_AArch64DupLane>;
 def AArch64duplane64 : SDNode<"AArch64ISD::DUPLANE64", SDT_AArch64DupLane>;
+def AArch64duplane128 : SDNode<"AArch64ISD::DUPLANE128", SDT_AArch64DupLane>;
 
 def AArch64insr      : SDNode<"AArch64ISD::INSR", SDT_AArch64Insr>;
 
@@ -562,8 +725,12 @@ def AArch64NvCast : SDNode<"AArch64ISD::NVCAST", SDTUnaryOp>;
 
 def SDT_AArch64mull : SDTypeProfile<1, 2, [SDTCisInt<0>, SDTCisInt<1>,
                                     SDTCisSameAs<1, 2>]>;
-def AArch64smull    : SDNode<"AArch64ISD::SMULL", SDT_AArch64mull>;
-def AArch64umull    : SDNode<"AArch64ISD::UMULL", SDT_AArch64mull>;
+def AArch64pmull    : SDNode<"AArch64ISD::PMULL", SDT_AArch64mull,
+                             [SDNPCommutative]>;
+def AArch64smull    : SDNode<"AArch64ISD::SMULL", SDT_AArch64mull,
+                             [SDNPCommutative]>;
+def AArch64umull    : SDNode<"AArch64ISD::UMULL", SDT_AArch64mull,
+                             [SDNPCommutative]>;
 
 def AArch64frecpe   : SDNode<"AArch64ISD::FRECPE", SDTFPUnaryOp>;
 def AArch64frecps   : SDNode<"AArch64ISD::FRECPS", SDTFPBinOp>;
@@ -580,11 +747,6 @@ def AArch64uminv    : SDNode<"AArch64ISD::UMINV", SDT_AArch64UnaryVec>;
 def AArch64smaxv    : SDNode<"AArch64ISD::SMAXV", SDT_AArch64UnaryVec>;
 def AArch64umaxv    : SDNode<"AArch64ISD::UMAXV", SDT_AArch64UnaryVec>;
 
-def AArch64srhadd   : SDNode<"AArch64ISD::SRHADD", SDT_AArch64binvec>;
-def AArch64urhadd   : SDNode<"AArch64ISD::URHADD", SDT_AArch64binvec>;
-def AArch64shadd   : SDNode<"AArch64ISD::SHADD", SDT_AArch64binvec>;
-def AArch64uhadd   : SDNode<"AArch64ISD::UHADD", SDT_AArch64binvec>;
-
 def AArch64uabd     : PatFrags<(ops node:$lhs, node:$rhs),
                                [(abdu node:$lhs, node:$rhs),
                                 (int_aarch64_neon_uabd node:$lhs, node:$rhs)]>;
@@ -592,10 +754,22 @@ def AArch64sabd     : PatFrags<(ops node:$lhs, node:$rhs),
                                [(abds node:$lhs, node:$rhs),
                                 (int_aarch64_neon_sabd node:$lhs, node:$rhs)]>;
 
+def AArch64addp_n   : SDNode<"AArch64ISD::ADDP", SDT_AArch64Zip>;
 def AArch64uaddlp_n : SDNode<"AArch64ISD::UADDLP", SDT_AArch64uaddlp>;
+def AArch64saddlp_n : SDNode<"AArch64ISD::SADDLP", SDT_AArch64uaddlp>;
+def AArch64addp     : PatFrags<(ops node:$Rn, node:$Rm),
+                               [(AArch64addp_n node:$Rn, node:$Rm),
+                                (int_aarch64_neon_addp node:$Rn, node:$Rm)]>;
 def AArch64uaddlp   : PatFrags<(ops node:$src),
                                [(AArch64uaddlp_n node:$src),
                                 (int_aarch64_neon_uaddlp node:$src)]>;
+def AArch64saddlp   : PatFrags<(ops node:$src),
+                               [(AArch64saddlp_n node:$src),
+                                (int_aarch64_neon_saddlp node:$src)]>;
+def AArch64faddp     : PatFrags<(ops node:$Rn, node:$Rm),
+                                [(AArch64addp_n node:$Rn, node:$Rm),
+                                 (int_aarch64_neon_faddp node:$Rn, node:$Rm)]>;
+def AArch64roundingvlshr : ComplexPattern<vAny, 2, "SelectRoundingVLShr", [AArch64vlshr]>;
 
 def SDT_AArch64SETTAG : SDTypeProfile<0, 2, [SDTCisPtrTy<0>, SDTCisPtrTy<1>]>;
 def AArch64stg : SDNode<"AArch64ISD::STG", SDT_AArch64SETTAG, [SDNPHasChain, SDNPMayStore, SDNPMemOperand]>;
@@ -612,6 +786,7 @@ def AArch64uunpkhi : SDNode<"AArch64ISD::UUNPKHI", SDT_AArch64unpk>;
 def AArch64uunpklo : SDNode<"AArch64ISD::UUNPKLO", SDT_AArch64unpk>;
 
 def AArch64ldp : SDNode<"AArch64ISD::LDP", SDT_AArch64ldp, [SDNPHasChain, SDNPMayLoad, SDNPMemOperand]>;
+def AArch64ldnp : SDNode<"AArch64ISD::LDNP", SDT_AArch64ldnp, [SDNPHasChain, SDNPMayLoad, SDNPMemOperand]>;
 def AArch64stp : SDNode<"AArch64ISD::STP", SDT_AArch64stp, [SDNPHasChain, SDNPMayStore, SDNPMemOperand]>;
 def AArch64stnp : SDNode<"AArch64ISD::STNP", SDT_AArch64stnp, [SDNPHasChain, SDNPMayStore, SDNPMemOperand]>;
 
@@ -619,6 +794,28 @@ def AArch64tbl : SDNode<"AArch64ISD::TBL", SDT_AArch64TBL>;
 def AArch64mrs : SDNode<"AArch64ISD::MRS",
                         SDTypeProfile<1, 1, [SDTCisVT<0, i64>, SDTCisVT<1, i32>]>,
                         [SDNPHasChain, SDNPOutGlue]>;
+
+// Match add node and also treat an 'or' node is as an 'add' if the or'ed operands
+// have no common bits.
+def add_and_or_is_add : PatFrags<(ops node:$lhs, node:$rhs),
+                         [(add node:$lhs, node:$rhs), (or node:$lhs, node:$rhs)],[{
+   if (N->getOpcode() == ISD::ADD)
+     return true;
+   return CurDAG->haveNoCommonBitsSet(N->getOperand(0), N->getOperand(1));
+}]> {
+  let GISelPredicateCode = [{
+     // Only handle G_ADD for now. FIXME. build capability to compute whether
+     // operands of G_OR have common bits set or not.
+     return MI.getOpcode() == TargetOpcode::G_ADD;
+  }];
+}
+
+// Match mul with enough sign-bits. Can be reduced to a smaller mul operand.
+def smullwithsignbits : PatFrag<(ops node:$l, node:$r), (mul node:$l, node:$r), [{
+  return CurDAG->ComputeNumSignBits(N->getOperand(0)) > 32 &&
+         CurDAG->ComputeNumSignBits(N->getOperand(1)) > 32;
+}]>;
+
 //===----------------------------------------------------------------------===//
 
 //===----------------------------------------------------------------------===//
@@ -673,40 +870,40 @@ let isReMaterializable = 1, isCodeGenOnly = 1 in {
 // removed, along with the AArch64Wrapper node.
 
 let AddedComplexity = 10 in
-def LOADgot : Pseudo<(outs GPR64:$dst), (ins i64imm:$addr),
-                     [(set GPR64:$dst, (AArch64LOADgot tglobaladdr:$addr))]>,
+def LOADgot : Pseudo<(outs GPR64common:$dst), (ins i64imm:$addr),
+                     [(set GPR64common:$dst, (AArch64LOADgot tglobaladdr:$addr))]>,
               Sched<[WriteLDAdr]>;
 
 // The MOVaddr instruction should match only when the add is not folded
 // into a load or store address.
 def MOVaddr
-    : Pseudo<(outs GPR64:$dst), (ins i64imm:$hi, i64imm:$low),
-             [(set GPR64:$dst, (AArch64addlow (AArch64adrp tglobaladdr:$hi),
+    : Pseudo<(outs GPR64common:$dst), (ins i64imm:$hi, i64imm:$low),
+             [(set GPR64common:$dst, (AArch64addlow (AArch64adrp tglobaladdr:$hi),
                                             tglobaladdr:$low))]>,
       Sched<[WriteAdrAdr]>;
 def MOVaddrJT
-    : Pseudo<(outs GPR64:$dst), (ins i64imm:$hi, i64imm:$low),
-             [(set GPR64:$dst, (AArch64addlow (AArch64adrp tjumptable:$hi),
+    : Pseudo<(outs GPR64common:$dst), (ins i64imm:$hi, i64imm:$low),
+             [(set GPR64common:$dst, (AArch64addlow (AArch64adrp tjumptable:$hi),
                                              tjumptable:$low))]>,
       Sched<[WriteAdrAdr]>;
 def MOVaddrCP
-    : Pseudo<(outs GPR64:$dst), (ins i64imm:$hi, i64imm:$low),
-             [(set GPR64:$dst, (AArch64addlow (AArch64adrp tconstpool:$hi),
+    : Pseudo<(outs GPR64common:$dst), (ins i64imm:$hi, i64imm:$low),
+             [(set GPR64common:$dst, (AArch64addlow (AArch64adrp tconstpool:$hi),
                                              tconstpool:$low))]>,
       Sched<[WriteAdrAdr]>;
 def MOVaddrBA
-    : Pseudo<(outs GPR64:$dst), (ins i64imm:$hi, i64imm:$low),
-             [(set GPR64:$dst, (AArch64addlow (AArch64adrp tblockaddress:$hi),
+    : Pseudo<(outs GPR64common:$dst), (ins i64imm:$hi, i64imm:$low),
+             [(set GPR64common:$dst, (AArch64addlow (AArch64adrp tblockaddress:$hi),
                                              tblockaddress:$low))]>,
       Sched<[WriteAdrAdr]>;
 def MOVaddrTLS
-    : Pseudo<(outs GPR64:$dst), (ins i64imm:$hi, i64imm:$low),
-             [(set GPR64:$dst, (AArch64addlow (AArch64adrp tglobaltlsaddr:$hi),
+    : Pseudo<(outs GPR64common:$dst), (ins i64imm:$hi, i64imm:$low),
+             [(set GPR64common:$dst, (AArch64addlow (AArch64adrp tglobaltlsaddr:$hi),
                                             tglobaltlsaddr:$low))]>,
       Sched<[WriteAdrAdr]>;
 def MOVaddrEXT
-    : Pseudo<(outs GPR64:$dst), (ins i64imm:$hi, i64imm:$low),
-             [(set GPR64:$dst, (AArch64addlow (AArch64adrp texternalsym:$hi),
+    : Pseudo<(outs GPR64common:$dst), (ins i64imm:$hi, i64imm:$low),
+             [(set GPR64common:$dst, (AArch64addlow (AArch64adrp texternalsym:$hi),
                                             texternalsym:$low))]>,
       Sched<[WriteAdrAdr]>;
 // Normally AArch64addlow either gets folded into a following ldr/str,
@@ -714,8 +911,8 @@ def MOVaddrEXT
 // might appear without either of them, so allow lowering it into a plain
 // add.
 def ADDlowTLS
-    : Pseudo<(outs GPR64:$dst), (ins GPR64:$src, i64imm:$low),
-             [(set GPR64:$dst, (AArch64addlow GPR64:$src,
+    : Pseudo<(outs GPR64sp:$dst), (ins GPR64sp:$src, i64imm:$low),
+             [(set GPR64sp:$dst, (AArch64addlow GPR64sp:$src,
                                             tglobaltlsaddr:$low))]>,
       Sched<[WriteAdr]>;
 
@@ -738,6 +935,7 @@ def : Pat<(AArch64LOADgot texternalsym:$addr),
 def : Pat<(AArch64LOADgot tconstpool:$addr),
           (LOADgot tconstpool:$addr)>;
 
+// In general these get lowered into a sequence of three 4-byte instructions.
 // 32-bit jump table destination is actually only 2 instructions since we can
 // use the table itself as a PC-relative base. But optimization occurs after
 // branch relaxation so be pessimistic.
@@ -773,8 +971,12 @@ let hasSideEffects = 1, isCodeGenOnly = 1 in {
 // SpeculationBarrierEndBB must only be used after an unconditional control
 // flow, i.e. after a terminator for which isBarrier is True.
 let hasSideEffects = 1, isCodeGenOnly = 1, isTerminator = 1, isBarrier = 1 in {
+  // This gets lowered to a pair of 4-byte instructions.
+  let Size = 8 in
   def SpeculationBarrierISBDSBEndBB
       : Pseudo<(outs), (ins), []>, Sched<[]>;
+  // This gets lowered to a 4-byte instruction.
+  let Size = 4 in
   def SpeculationBarrierSBEndBB
       : Pseudo<(outs), (ins), []>, Sched<[]>;
 }
@@ -863,7 +1065,7 @@ defm UDOTlane : SIMDThreeSameVectorDotIndex<1, 0, 0b10, "udot", AArch64udot>;
 }
 
 // ARMv8.6-A BFloat
-let Predicates = [HasBF16] in {
+let Predicates = [HasNEON, HasBF16] in {
 defm BFDOT       : SIMDThreeSameVectorBFDot<1, "bfdot">;
 defm BF16DOTlane : SIMDThreeSameVectorBF16DotI<0, "bfdot">;
 def BFMMLA       : SIMDThreeSameVectorBF16MatrixMul<"bfmmla">;
@@ -873,7 +1075,6 @@ def BFMLALBIdx   : SIMDBF16MLALIndex<0, "bfmlalb", int_aarch64_neon_bfmlalb>;
 def BFMLALTIdx   : SIMDBF16MLALIndex<1, "bfmlalt", int_aarch64_neon_bfmlalt>;
 def BFCVTN       : SIMD_BFCVTN;
 def BFCVTN2      : SIMD_BFCVTN2;
-def BFCVT        : BF16ToSinglePrecision<"bfcvt">;
 
 // Vector-scalar BFDOT:
 // The second source operand of the 64-bit variant of BF16DOTlane is a 128-bit
@@ -893,6 +1094,10 @@ def : Pat<(v2f32 (int_aarch64_neon_bfdot
                              VectorIndexS:$idx)>;
 }
 
+let Predicates = [HasNEONorSME, HasBF16] in {
+def BFCVT : BF16ToSinglePrecision<"bfcvt">;
+}
+
 // ARMv8.6A AArch64 matrix multiplication
 let Predicates = [HasMatMulInt8] in {
 def  SMMLA : SIMDThreeSameVectorMatMul<0, 0, "smmla", int_aarch64_neon_smmla>;
@@ -966,6 +1171,24 @@ def : SHA3_pattern<EOR3, int_aarch64_crypto_eor3u, v8i16>;
 def : SHA3_pattern<EOR3, int_aarch64_crypto_eor3u, v4i32>;
 def : SHA3_pattern<EOR3, int_aarch64_crypto_eor3u, v2i64>;
 
+class EOR3_pattern<ValueType VecTy>
+  : Pat<(xor (xor (VecTy V128:$Vn), (VecTy V128:$Vm)), (VecTy V128:$Va)),
+        (EOR3 (VecTy V128:$Vn), (VecTy V128:$Vm), (VecTy V128:$Va))>;
+
+def : EOR3_pattern<v16i8>;
+def : EOR3_pattern<v8i16>;
+def : EOR3_pattern<v4i32>;
+def : EOR3_pattern<v2i64>;
+
+class BCAX_pattern<ValueType VecTy>
+  : Pat<(xor (VecTy V128:$Vn), (and (VecTy V128:$Vm), (vnot (VecTy V128:$Va)))),
+        (BCAX (VecTy V128:$Vn), (VecTy V128:$Vm), (VecTy V128:$Va))>;
+
+def : BCAX_pattern<v16i8>;
+def : BCAX_pattern<v8i16>;
+def : BCAX_pattern<v4i32>;
+def : BCAX_pattern<v2i64>;
+
 def : SHA3_pattern<BCAX, int_aarch64_crypto_bcaxu, v16i8>;
 def : SHA3_pattern<BCAX, int_aarch64_crypto_bcaxu, v8i16>;
 def : SHA3_pattern<BCAX, int_aarch64_crypto_bcaxu, v4i32>;
@@ -1042,8 +1265,7 @@ defm FCMLA : SIMDThreeSameVectorTiedComplexHSD<1, 0b110, complexrotateop,
                                                "fcmla", null_frag>;
 defm FCADD : SIMDThreeSameVectorComplexHSD<1, 0b111, complexrotateopodd,
                                            "fcadd", null_frag>;
-defm FCMLA : SIMDIndexedTiedComplexHSD<1, 0, 1, complexrotateop, "fcmla",
-                                       null_frag>;
+defm FCMLA : SIMDIndexedTiedComplexHSD<0, 1, complexrotateop, "fcmla">;
 
 let Predicates = [HasComplxNum, HasNEON, HasFullFP16] in {
   def : Pat<(v4f16 (int_aarch64_neon_vcadd_rot90 (v4f16 V64:$Rn), (v4f16 V64:$Rm))),
@@ -1180,23 +1402,30 @@ let Predicates = [HasPAuth] in {
   def : InstAlias<"autib1716", (AUTIB1716), 1>;
   def : InstAlias<"xpaclri", (XPACLRI), 1>;
 
-  multiclass SignAuth<bits<3> prefix, bits<3> prefix_z, string asm> {
-    def IA   : SignAuthOneData<prefix, 0b00, !strconcat(asm, "ia")>;
-    def IB   : SignAuthOneData<prefix, 0b01, !strconcat(asm, "ib")>;
-    def DA   : SignAuthOneData<prefix, 0b10, !strconcat(asm, "da")>;
-    def DB   : SignAuthOneData<prefix, 0b11, !strconcat(asm, "db")>;
-    def IZA  : SignAuthZero<prefix_z, 0b00, !strconcat(asm, "iza")>;
-    def DZA  : SignAuthZero<prefix_z, 0b10, !strconcat(asm, "dza")>;
-    def IZB  : SignAuthZero<prefix_z, 0b01, !strconcat(asm, "izb")>;
-    def DZB  : SignAuthZero<prefix_z, 0b11, !strconcat(asm, "dzb")>;
+  multiclass SignAuth<bits<3> prefix, bits<3> prefix_z, string asm,
+                      SDPatternOperator op> {
+    def IA   : SignAuthOneData<prefix, 0b00, !strconcat(asm,  "ia"), op>;
+    def IB   : SignAuthOneData<prefix, 0b01, !strconcat(asm,  "ib"), op>;
+    def DA   : SignAuthOneData<prefix, 0b10, !strconcat(asm,  "da"), op>;
+    def DB   : SignAuthOneData<prefix, 0b11, !strconcat(asm,  "db"), op>;
+    def IZA  : SignAuthZero<prefix_z,  0b00, !strconcat(asm, "iza"), op>;
+    def DZA  : SignAuthZero<prefix_z,  0b10, !strconcat(asm, "dza"), op>;
+    def IZB  : SignAuthZero<prefix_z,  0b01, !strconcat(asm, "izb"), op>;
+    def DZB  : SignAuthZero<prefix_z,  0b11, !strconcat(asm, "dzb"), op>;
   }
 
-  defm PAC : SignAuth<0b000, 0b010, "pac">;
-  defm AUT : SignAuth<0b001, 0b011, "aut">;
+  defm PAC : SignAuth<0b000, 0b010, "pac", int_ptrauth_sign>;
+  defm AUT : SignAuth<0b001, 0b011, "aut", null_frag>;
 
   def XPACI : ClearAuth<0, "xpaci">;
+  def : Pat<(int_ptrauth_strip GPR64:$Rd, 0), (XPACI GPR64:$Rd)>;
+  def : Pat<(int_ptrauth_strip GPR64:$Rd, 1), (XPACI GPR64:$Rd)>;
+
   def XPACD : ClearAuth<1, "xpacd">;
-  def PACGA : SignAuthTwoOperand<0b1100, "pacga", null_frag>;
+  def : Pat<(int_ptrauth_strip GPR64:$Rd, 2), (XPACD GPR64:$Rd)>;
+  def : Pat<(int_ptrauth_strip GPR64:$Rd, 3), (XPACD GPR64:$Rd)>;
+
+  def PACGA : SignAuthTwoOperand<0b1100, "pacga", int_ptrauth_sign_generic>;
 
   // Combined Instructions
   let isBranch = 1, isTerminator = 1, isBarrier = 1, isIndirectBranch = 1  in {
@@ -1280,6 +1509,7 @@ def : InstAlias<"clrex", (CLREX 0xf)>;
 def : InstAlias<"isb", (ISB 0xf)>;
 def : InstAlias<"ssbb", (DSB 0)>;
 def : InstAlias<"pssbb", (DSB 4)>;
+def : InstAlias<"dfb", (DSB 0b1100)>, Requires<[HasV8_0r]>;
 
 def MRS    : MRSI;
 def MSR    : MSRI;
@@ -1294,6 +1524,12 @@ def : Pat<(AArch64mrs imm:$id),
 def MOVbaseTLS : Pseudo<(outs GPR64:$dst), (ins),
                        [(set GPR64:$dst, AArch64threadpointer)]>, Sched<[WriteSys]>;
 
+// This gets lowered into a 24-byte instruction sequence
+let Defs = [ X9, X16, X17, NZCV ], Size = 24 in {
+def KCFI_CHECK : Pseudo<
+  (outs), (ins GPR64:$ptr, i32imm:$type), []>, Sched<[]>;
+}
+
 let Uses = [ X9 ], Defs = [ X16, X17, LR, NZCV ] in {
 def HWASAN_CHECK_MEMACCESS : Pseudo<
   (outs), (ins GPR64noip:$ptr, i32imm:$accessinfo),
@@ -1308,13 +1544,20 @@ def HWASAN_CHECK_MEMACCESS_SHORTGRANULES : Pseudo<
   Sched<[]>;
 }
 
-// The cycle counter PMC register is PMCCNTR_EL0.
-let Predicates = [HasPerfMon] in
-def : Pat<(readcyclecounter), (MRS 0xdce8)>;
+// The virtual cycle counter register is CNTVCT_EL0.
+def : Pat<(readcyclecounter), (MRS 0xdf02)>;
 
 // FPCR register
-def : Pat<(i64 (int_aarch64_get_fpcr)), (MRS 0xda20)>;
-def : Pat<(int_aarch64_set_fpcr i64:$val), (MSR 0xda20, GPR64:$val)>;
+let Uses = [FPCR] in
+def MRS_FPCR : Pseudo<(outs GPR64:$dst), (ins),
+                      [(set GPR64:$dst, (int_aarch64_get_fpcr))]>,
+               PseudoInstExpansion<(MRS GPR64:$dst, 0xda20)>,
+               Sched<[WriteSys]>;
+let Defs = [FPCR] in
+def MSR_FPCR : Pseudo<(outs), (ins GPR64:$val),
+                      [(int_aarch64_set_fpcr i64:$val)]>,
+               PseudoInstExpansion<(MSR 0xda20, GPR64:$val)>,
+               Sched<[WriteSys]>;
 
 // Generic system instructions
 def SYSxt  : SystemXtI<0, "sys">;
@@ -1333,7 +1576,7 @@ def TSTART : TMSystemI<0b0000, "tstart",
 def TCOMMIT : TMSystemINoOperand<0b0000, "tcommit", [(int_aarch64_tcommit)]>;
 
 def TCANCEL : TMSystemException<0b011, "tcancel",
-                                [(int_aarch64_tcancel i64_imm0_65535:$imm)]>;
+                                [(int_aarch64_tcancel timm64_0_65535:$imm)]>;
 
 def TTEST : TMSystemI<0b0001, "ttest", [(set GPR64:$Rt, (int_aarch64_ttest))]> {
   let mayLoad = 0;
@@ -1352,12 +1595,12 @@ let PostEncoderMethod = "fixMOVZ" in
 defm MOVZ : MoveImmediate<0b10, "movz">;
 
 // First group of aliases covers an implicit "lsl #0".
-def : InstAlias<"movk $dst, $imm", (MOVKWi GPR32:$dst, i32_imm0_65535:$imm, 0), 0>;
-def : InstAlias<"movk $dst, $imm", (MOVKXi GPR64:$dst, i32_imm0_65535:$imm, 0), 0>;
-def : InstAlias<"movn $dst, $imm", (MOVNWi GPR32:$dst, i32_imm0_65535:$imm, 0)>;
-def : InstAlias<"movn $dst, $imm", (MOVNXi GPR64:$dst, i32_imm0_65535:$imm, 0)>;
-def : InstAlias<"movz $dst, $imm", (MOVZWi GPR32:$dst, i32_imm0_65535:$imm, 0)>;
-def : InstAlias<"movz $dst, $imm", (MOVZXi GPR64:$dst, i32_imm0_65535:$imm, 0)>;
+def : InstAlias<"movk $dst, $imm", (MOVKWi GPR32:$dst, timm32_0_65535:$imm, 0), 0>;
+def : InstAlias<"movk $dst, $imm", (MOVKXi GPR64:$dst, timm32_0_65535:$imm, 0), 0>;
+def : InstAlias<"movn $dst, $imm", (MOVNWi GPR32:$dst, timm32_0_65535:$imm, 0)>;
+def : InstAlias<"movn $dst, $imm", (MOVNXi GPR64:$dst, timm32_0_65535:$imm, 0)>;
+def : InstAlias<"movz $dst, $imm", (MOVZWi GPR32:$dst, timm32_0_65535:$imm, 0)>;
+def : InstAlias<"movz $dst, $imm", (MOVZXi GPR64:$dst, timm32_0_65535:$imm, 0)>;
 
 // Next, we have various ELF relocations with the ":XYZ_g0:sym" syntax.
 def : InstAlias<"movz $Rd, $sym", (MOVZXi GPR64:$Rd, movw_symbol_g3:$sym, 48)>;
@@ -1539,6 +1782,11 @@ def : InstAlias<"mov $dst, $src",
 defm ADDS : AddSubS<0, "adds", AArch64add_flag, "cmn", "subs", "cmp">;
 defm SUBS : AddSubS<1, "subs", AArch64sub_flag, "cmp", "adds", "cmn">;
 
+def copyFromSP: PatLeaf<(i64 GPR64:$src), [{
+  return N->getOpcode() == ISD::CopyFromReg &&
+         cast<RegisterSDNode>(N->getOperand(1))->getReg() == AArch64::SP;
+}]>;
+
 // Use SUBS instead of SUB to enable CSE between SUBS and SUB.
 def : Pat<(sub GPR32sp:$Rn, addsub_shifted_imm32:$imm),
           (SUBSWri GPR32sp:$Rn, addsub_shifted_imm32:$imm)>;
@@ -1557,6 +1805,8 @@ def : Pat<(sub GPR32sp:$R2, arith_extended_reg32_i32:$R3),
           (SUBSWrx GPR32sp:$R2, arith_extended_reg32_i32:$R3)>;
 def : Pat<(sub GPR64sp:$R2, arith_extended_reg32to64_i64:$R3),
           (SUBSXrx GPR64sp:$R2, arith_extended_reg32to64_i64:$R3)>;
+def : Pat<(sub copyFromSP:$R2, (arith_uxtx GPR64:$R3, arith_extendlsl64:$imm)),
+          (SUBXrx64 GPR64sp:$R2, GPR64:$R3, arith_extendlsl64:$imm)>;
 }
 
 // Because of the immediate format for add/sub-imm instructions, the
@@ -1628,8 +1878,8 @@ def : ShiftAlias<"rorv", RORVXr, GPR64>;
 
 // Multiply-add
 let AddedComplexity = 5 in {
-defm MADD : MulAccum<0, "madd", add>;
-defm MSUB : MulAccum<1, "msub", sub>;
+defm MADD : MulAccum<0, "madd">;
+defm MSUB : MulAccum<1, "msub">;
 
 def : Pat<(i32 (mul GPR32:$Rn, GPR32:$Rm)),
           (MADDWrrr GPR32:$Rn, GPR32:$Rm, WZR)>;
@@ -1703,6 +1953,46 @@ def : Pat<(i64 (sub GPR64:$Ra, (mul (sext_inreg GPR64:$Rn, i32),
                                     (s64imm_32bit:$C)))),
           (SMSUBLrrr (i32 (EXTRACT_SUBREG GPR64:$Rn, sub_32)),
                      (MOVi32imm (trunc_imm imm:$C)), GPR64:$Ra)>;
+
+def : Pat<(i64 (smullwithsignbits GPR64:$Rn, GPR64:$Rm)),
+          (SMADDLrrr (EXTRACT_SUBREG $Rn, sub_32), (EXTRACT_SUBREG $Rm, sub_32), XZR)>;
+def : Pat<(i64 (smullwithsignbits GPR64:$Rn, (sext GPR32:$Rm))),
+          (SMADDLrrr (EXTRACT_SUBREG $Rn, sub_32), $Rm, XZR)>;
+
+def : Pat<(i64 (add (smullwithsignbits GPR64:$Rn, GPR64:$Rm), GPR64:$Ra)),
+          (SMADDLrrr (EXTRACT_SUBREG $Rn, sub_32), (EXTRACT_SUBREG $Rm, sub_32), GPR64:$Ra)>;
+def : Pat<(i64 (add (smullwithsignbits GPR64:$Rn, (sext GPR32:$Rm)), GPR64:$Ra)),
+          (SMADDLrrr (EXTRACT_SUBREG $Rn, sub_32), $Rm, GPR64:$Ra)>;
+
+def : Pat<(i64 (ineg (smullwithsignbits GPR64:$Rn, GPR64:$Rm))),
+          (SMSUBLrrr (EXTRACT_SUBREG $Rn, sub_32), (EXTRACT_SUBREG $Rm, sub_32), XZR)>;
+def : Pat<(i64 (ineg (smullwithsignbits GPR64:$Rn, (sext GPR32:$Rm)))),
+          (SMSUBLrrr (EXTRACT_SUBREG $Rn, sub_32), $Rm, XZR)>;
+
+def : Pat<(i64 (sub GPR64:$Ra, (smullwithsignbits GPR64:$Rn, GPR64:$Rm))),
+          (SMSUBLrrr (EXTRACT_SUBREG $Rn, sub_32), (EXTRACT_SUBREG $Rm, sub_32), GPR64:$Ra)>;
+def : Pat<(i64 (sub GPR64:$Ra, (smullwithsignbits GPR64:$Rn, (sext GPR32:$Rm)))),
+          (SMSUBLrrr (EXTRACT_SUBREG $Rn, sub_32), $Rm, GPR64:$Ra)>;
+
+def : Pat<(i64 (mul top32Zero:$Rn, top32Zero:$Rm)),
+          (UMADDLrrr (EXTRACT_SUBREG $Rn, sub_32), (EXTRACT_SUBREG $Rm, sub_32), XZR)>;
+def : Pat<(i64 (mul top32Zero:$Rn, (zext GPR32:$Rm))),
+          (UMADDLrrr (EXTRACT_SUBREG $Rn, sub_32), $Rm, XZR)>;
+
+def : Pat<(i64 (add (mul top32Zero:$Rn, top32Zero:$Rm), GPR64:$Ra)),
+          (UMADDLrrr (EXTRACT_SUBREG $Rn, sub_32), (EXTRACT_SUBREG $Rm, sub_32), GPR64:$Ra)>;
+def : Pat<(i64 (add (mul top32Zero:$Rn, (zext GPR32:$Rm)), GPR64:$Ra)),
+          (UMADDLrrr (EXTRACT_SUBREG $Rn, sub_32), $Rm, GPR64:$Ra)>;
+
+def : Pat<(i64 (ineg (mul top32Zero:$Rn, top32Zero:$Rm))),
+          (UMSUBLrrr (EXTRACT_SUBREG $Rn, sub_32), (EXTRACT_SUBREG $Rm, sub_32), XZR)>;
+def : Pat<(i64 (ineg (mul top32Zero:$Rn, (zext GPR32:$Rm)))),
+          (UMSUBLrrr (EXTRACT_SUBREG $Rn, sub_32), $Rm, XZR)>;
+
+def : Pat<(i64 (sub GPR64:$Ra, (mul top32Zero:$Rn, top32Zero:$Rm))),
+          (UMSUBLrrr (EXTRACT_SUBREG $Rn, sub_32), (EXTRACT_SUBREG $Rm, sub_32), GPR64:$Ra)>;
+def : Pat<(i64 (sub GPR64:$Ra, (mul top32Zero:$Rn, (zext GPR32:$Rm)))),
+          (UMSUBLrrr (EXTRACT_SUBREG $Rn, sub_32), $Rm, GPR64:$Ra)>;
 } // AddedComplexity = 5
 
 def : MulAccumWAlias<"mul", MADDWrrr>;
@@ -1801,12 +2091,11 @@ defm : STOPregister<"stumin","LDUMIN">;// STUMINx
 // v8.5 Memory Tagging Extension
 let Predicates = [HasMTE] in {
 
-def IRG   : BaseTwoOperand<0b0100, GPR64sp, "irg", int_aarch64_irg, GPR64sp, GPR64>,
-            Sched<[]>{
-  let Inst{31} = 1;
-}
-def GMI   : BaseTwoOperand<0b0101, GPR64, "gmi", int_aarch64_gmi, GPR64sp>, Sched<[]>{
-  let Inst{31} = 1;
+def IRG   : BaseTwoOperandRegReg<0b1, 0b0, 0b000100, GPR64sp, "irg",
+                                 int_aarch64_irg, GPR64sp, GPR64>, Sched<[]>;
+
+def GMI   : BaseTwoOperandRegReg<0b1, 0b0, 0b000101, GPR64, "gmi",
+                                 int_aarch64_gmi, GPR64sp>, Sched<[]> {
   let isNotDuplicable = 1;
 }
 def ADDG  : AddSubG<0, "addg", null_frag>;
@@ -1929,7 +2218,7 @@ defm BICS : LogicalRegS<0b11, 1, "bics",
                         BinOpFrag<(AArch64and_flag node:$LHS, (not node:$RHS))>>;
 defm AND  : LogicalReg<0b00, 0, "and", and>;
 defm BIC  : LogicalReg<0b00, 1, "bic",
-                       BinOpFrag<(and node:$LHS, (not node:$RHS))>>;
+                       BinOpFrag<(and node:$LHS, (not node:$RHS))>, 3>;
 defm EON  : LogicalReg<0b10, 1, "eon",
                        BinOpFrag<(not (xor node:$LHS, node:$RHS))>>;
 defm EOR  : LogicalReg<0b10, 0, "eor", xor>;
@@ -1972,13 +2261,13 @@ def : Pat<(not GPR64:$Xm), (ORNXrr XZR, GPR64:$Xm)>;
 // One operand data processing instructions.
 //===----------------------------------------------------------------------===//
 
-defm CLS    : OneOperandData<0b101, "cls">;
-defm CLZ    : OneOperandData<0b100, "clz", ctlz>;
-defm RBIT   : OneOperandData<0b000, "rbit", bitreverse>;
+defm CLS    : OneOperandData<0b000101, "cls">;
+defm CLZ    : OneOperandData<0b000100, "clz", ctlz>;
+defm RBIT   : OneOperandData<0b000000, "rbit", bitreverse>;
 
-def  REV16Wr : OneWRegData<0b001, "rev16",
-                                  UnOpFrag<(rotr (bswap node:$LHS), (i64 16))>>;
-def  REV16Xr : OneXRegData<0b001, "rev16", null_frag>;
+def  REV16Wr : OneWRegData<0b000001, "rev16",
+                                     UnOpFrag<(rotr (bswap node:$LHS), (i64 16))>>;
+def  REV16Xr : OneXRegData<0b000001, "rev16", null_frag>;
 
 def : Pat<(cttz GPR32:$Rn),
           (CLZWr (RBITWr GPR32:$Rn))>;
@@ -1996,10 +2285,10 @@ def : Pat<(int_aarch64_cls64 GPR64:$Rm), (EXTRACT_SUBREG (CLSXr GPR64:$Rm), sub_
 // Unlike the other one operand instructions, the instructions with the "rev"
 // mnemonic do *not* just different in the size bit, but actually use different
 // opcode bits for the different sizes.
-def REVWr   : OneWRegData<0b010, "rev", bswap>;
-def REVXr   : OneXRegData<0b011, "rev", bswap>;
-def REV32Xr : OneXRegData<0b010, "rev32",
-                                 UnOpFrag<(rotr (bswap node:$LHS), (i64 32))>>;
+def REVWr   : OneWRegData<0b000010, "rev", bswap>;
+def REVXr   : OneXRegData<0b000011, "rev", bswap>;
+def REV32Xr : OneXRegData<0b000010, "rev32",
+                                    UnOpFrag<(rotr (bswap node:$LHS), (i64 32))>>;
 
 def : InstAlias<"rev64 $Rd, $Rn", (REVXr GPR64:$Rd, GPR64:$Rn), 0>;
 
@@ -2008,6 +2297,14 @@ def : InstAlias<"rev64 $Rd, $Rn", (REVXr GPR64:$Rd, GPR64:$Rn), 0>;
 def : Pat<(bswap (rotr GPR32:$Rn, (i64 16))), (REV16Wr GPR32:$Rn)>;
 def : Pat<(bswap (rotr GPR64:$Rn, (i64 32))), (REV32Xr GPR64:$Rn)>;
 
+// Match (srl (bswap x), C) -> revC if the upper bswap bits are known zero.
+def : Pat<(srl (bswap top16Zero:$Rn), (i64 16)), (REV16Wr GPR32:$Rn)>;
+def : Pat<(srl (bswap top32Zero:$Rn), (i64 32)), (REV32Xr GPR64:$Rn)>;
+
+def : Pat<(or (and (srl GPR64:$Rn, (i64 8)), (i64 0x00ff00ff00ff00ff)),
+              (and (shl GPR64:$Rn, (i64 8)), (i64 0xff00ff00ff00ff00))),
+          (REV16Xr GPR64:$Rn)>;
+
 //===----------------------------------------------------------------------===//
 // Bitfield immediate extraction instruction.
 //===----------------------------------------------------------------------===//
@@ -2185,6 +2482,20 @@ def : Pat<(add GPR32:$val, (AArch64csel (i32 0), (i32 1), (i32 imm:$cc), NZCV)),
 def : Pat<(add GPR64:$val, (zext (AArch64csel (i32 0), (i32 1), (i32 imm:$cc), NZCV))),
           (CSINCXr GPR64:$val, GPR64:$val, (i32 imm:$cc))>;
 
+def : Pat<(or (topbitsallzero32:$val), (AArch64csel (i32 0), (i32 1), (i32 imm:$cc), NZCV)),
+          (CSINCWr GPR32:$val, WZR, imm:$cc)>;
+def : Pat<(or (topbitsallzero64:$val), (AArch64csel (i64 0), (i64 1), (i32 imm:$cc), NZCV)),
+          (CSINCXr GPR64:$val, XZR, imm:$cc)>;
+def : Pat<(or (topbitsallzero64:$val), (zext (AArch64csel (i32 0), (i32 1), (i32 imm:$cc), NZCV))),
+          (CSINCXr GPR64:$val, XZR, imm:$cc)>;
+
+def : Pat<(and (topbitsallzero32:$val), (AArch64csel (i32 0), (i32 1), (i32 imm:$cc), NZCV)),
+          (CSELWr WZR, GPR32:$val, imm:$cc)>;
+def : Pat<(and (topbitsallzero64:$val), (AArch64csel (i64 0), (i64 1), (i32 imm:$cc), NZCV)),
+          (CSELXr XZR, GPR64:$val, imm:$cc)>;
+def : Pat<(and (topbitsallzero64:$val), (zext (AArch64csel (i32 0), (i32 1), (i32 imm:$cc), NZCV))),
+          (CSELXr XZR, GPR64:$val, imm:$cc)>;
+
 // The inverse of the condition code from the alias instruction is what is used
 // in the aliased instruction. The parser all ready inverts the condition code
 // for these aliases.
@@ -2255,6 +2566,8 @@ let isCall = 1, Defs = [LR], Uses = [SP] in {
                 PseudoInstExpansion<(BLR GPR64:$Rn)>;
   def BLR_RVMARKER : Pseudo<(outs), (ins variable_ops), []>,
                      Sched<[WriteBrReg]>;
+  def BLR_BTI : Pseudo<(outs), (ins variable_ops), []>,
+                Sched<[WriteBrReg]>;
 } // isCall
 
 def : Pat<(AArch64call GPR64:$Rn),
@@ -2264,8 +2577,12 @@ def : Pat<(AArch64call GPR64noip:$Rn),
           (BLRNoIP GPR64noip:$Rn)>,
       Requires<[SLSBLRMitigation]>;
 
-def : Pat<(AArch64call_rvmarker GPR64:$Rn),
-          (BLR_RVMARKER GPR64:$Rn)>,
+def : Pat<(AArch64call_rvmarker (i64 tglobaladdr:$rvfunc), GPR64:$Rn),
+          (BLR_RVMARKER tglobaladdr:$rvfunc, GPR64:$Rn)>,
+      Requires<[NoSLSBLRMitigation]>;
+
+def : Pat<(AArch64call_bti GPR64:$Rn),
+          (BLR_BTI GPR64:$Rn)>,
       Requires<[NoSLSBLRMitigation]>;
 
 let isBranch = 1, isTerminator = 1, isBarrier = 1, isIndirectBranch = 1 in {
@@ -2294,9 +2611,14 @@ def TLSDESCCALL : Pseudo<(outs), (ins i64imm:$sym), []>, Sched<[]> {
 // augmentation string.
 def EMITBKEY : Pseudo<(outs), (ins), []>, Sched<[]> {}
 
+// Pseudo instruction to tell the streamer to emit a 'G' character into the
+// augmentation string.
+def EMITMTETAGGED : Pseudo<(outs), (ins), []>, Sched<[]> {}
+
 // FIXME: maybe the scratch register used shouldn't be fixed to X1?
 // FIXME: can "hasSideEffects be dropped?
-let isCall = 1, Defs = [LR, X0, X1], hasSideEffects = 1,
+// This gets lowered to an instruction sequence which takes 16 bytes
+let isCall = 1, Defs = [LR, X0, X1], hasSideEffects = 1, Size = 16,
     isCodeGenOnly = 1 in
 def TLSDESC_CALLSEQ
     : Pseudo<(outs), (ins i64imm:$sym),
@@ -2308,7 +2630,12 @@ def : Pat<(AArch64tlsdesc_callseq texternalsym:$sym),
 //===----------------------------------------------------------------------===//
 // Conditional branch (immediate) instruction.
 //===----------------------------------------------------------------------===//
-def Bcc : BranchCond;
+def Bcc : BranchCond<0, "b">;
+
+// Armv8.8-A variant form which hints to the branch predictor that
+// this branch is very likely to go the same way nearly all the time
+// (even though it is not known at compile time _which_ way that is).
+def BCcc : BranchCond<1, "bc">, Requires<[HasHBC]>;
 
 //===----------------------------------------------------------------------===//
 // Compare-and-branch instructions.
@@ -2338,20 +2665,21 @@ def : Pat<(AArch64call texternalsym:$func), (BL texternalsym:$func)>;
 // Exception generation instructions.
 //===----------------------------------------------------------------------===//
 let isTrap = 1 in {
-def BRK   : ExceptionGeneration<0b001, 0b00, "brk">;
+def BRK   : ExceptionGeneration<0b001, 0b00, "brk",
+                                [(int_aarch64_break timm32_0_65535:$imm)]>;
 }
 def DCPS1 : ExceptionGeneration<0b101, 0b01, "dcps1">;
 def DCPS2 : ExceptionGeneration<0b101, 0b10, "dcps2">;
-def DCPS3 : ExceptionGeneration<0b101, 0b11, "dcps3">;
+def DCPS3 : ExceptionGeneration<0b101, 0b11, "dcps3">, Requires<[HasEL3]>;
 def HLT   : ExceptionGeneration<0b010, 0b00, "hlt">;
 def HVC   : ExceptionGeneration<0b000, 0b10, "hvc">;
-def SMC   : ExceptionGeneration<0b000, 0b11, "smc">;
+def SMC   : ExceptionGeneration<0b000, 0b11, "smc">, Requires<[HasEL3]>;
 def SVC   : ExceptionGeneration<0b000, 0b01, "svc">;
 
 // DCPSn defaults to an immediate operand of zero if unspecified.
 def : InstAlias<"dcps1", (DCPS1 0)>;
 def : InstAlias<"dcps2", (DCPS2 0)>;
-def : InstAlias<"dcps3", (DCPS3 0)>;
+def : InstAlias<"dcps3", (DCPS3 0)>, Requires<[HasEL3]>;
 
 def UDF : UDFType<0, "udf">;
 
@@ -2397,6 +2725,8 @@ defm LDNPQ : LoadPairNoAlloc<0b10, 1, FPR128Op, simm7s16, "ldnp">;
 def : Pat<(AArch64ldp (am_indexed7s64 GPR64sp:$Rn, simm7s8:$offset)),
           (LDPXi GPR64sp:$Rn, simm7s8:$offset)>;
 
+def : Pat<(AArch64ldnp (am_indexed7s128 GPR64sp:$Rn, simm7s16:$offset)),
+          (LDNPQi GPR64sp:$Rn, simm7s16:$offset)>;
 //---
 // (register offset)
 //---
@@ -2750,7 +3080,7 @@ def : Pat<(i64 (zextloadi32 (am_indexed32 GPR64sp:$Rn, uimm12s4:$offset))),
 
 // Pre-fetch.
 def PRFMui : PrefetchUI<0b11, 0, 0b10, "prfm",
-                        [(AArch64Prefetch imm:$Rt,
+                        [(AArch64Prefetch timm:$Rt,
                                         (am_indexed64 GPR64sp:$Rn,
                                                       uimm12s8:$offset))]>;
 
@@ -2995,7 +3325,7 @@ def : InstAlias<"ldrsw $Rt, [$Rn, $offset]",
 
 // Pre-fetch.
 defm PRFUM : PrefetchUnscaled<0b11, 0, 0b10, "prfum",
-                  [(AArch64Prefetch imm:$Rt,
+                  [(AArch64Prefetch timm:$Rt,
                                   (am_unscaled64 GPR64sp:$Rn, simm9:$offset))]>;
 
 //---
@@ -3122,7 +3452,7 @@ defm STRB : Store8RO< 0b00,  1, 0b00, FPR8Op,   "str", untyped, store>;
 defm STRH : Store16RO<0b01,  1, 0b00, FPR16Op,  "str", f16,     store>;
 defm STRS : Store32RO<0b10,  1, 0b00, FPR32Op,  "str", f32,     store>;
 defm STRD : Store64RO<0b11,  1, 0b00, FPR64Op,  "str", f64,     store>;
-defm STRQ : Store128RO<0b00, 1, 0b10, FPR128Op, "str", f128,    store>;
+defm STRQ : Store128RO<0b00, 1, 0b10, FPR128Op, "str">;
 
 let Predicates = [UseSTRQro], AddedComplexity = 10 in {
   def : Pat<(store (f128 FPR128:$Rt),
@@ -3663,6 +3993,21 @@ def STLRX  : StoreRelease  <0b11, 1, 0, 0, 1, GPR64, "stlr">;
 def STLRB  : StoreRelease  <0b00, 1, 0, 0, 1, GPR32, "stlrb">;
 def STLRH  : StoreRelease  <0b01, 1, 0, 0, 1, GPR32, "stlrh">;
 
+/*
+Aliases for when offset=0. Note that in contrast to LoadAcquire which has a $Rn
+of type GPR64sp0, we deliberately choose to make $Rn of type GPR64sp and add an
+alias for the case of immediate #0. This is because new STLR versions (from
+LRCPC3 extension) do have a non-zero immediate value, so GPR64sp0 is not
+appropriate anymore (it parses and discards the optional zero). This is not the
+case for LoadAcquire because the new LRCPC3 LDAR instructions are post-indexed,
+and the immediate values are not inside the [] brackets and thus not accepted
+by GPR64sp0 parser.
+*/
+def STLRW0  : InstAlias<"stlr\t$Rt, [$Rn, #0]" , (STLRW   GPR32: $Rt, GPR64sp:$Rn)>;
+def STLRX0  : InstAlias<"stlr\t$Rt, [$Rn, #0]" , (STLRX   GPR64: $Rt, GPR64sp:$Rn)>;
+def STLRB0  : InstAlias<"stlrb\t$Rt, [$Rn, #0]", (STLRB   GPR32: $Rt, GPR64sp:$Rn)>;
+def STLRH0  : InstAlias<"stlrh\t$Rt, [$Rn, #0]", (STLRH   GPR32: $Rt, GPR64sp:$Rn)>;
+
 def STLXRW : StoreExclusive<0b10, 0, 0, 0, 1, GPR32, "stlxr">;
 def STLXRX : StoreExclusive<0b11, 0, 0, 0, 1, GPR64, "stlxr">;
 def STLXRB : StoreExclusive<0b00, 0, 0, 0, 1, GPR32, "stlxrb">;
@@ -3697,6 +4042,12 @@ let Predicates = [HasLOR] in {
   def STLLRX  : StoreRelease   <0b11, 1, 0, 0, 0, GPR64, "stllr">;
   def STLLRB  : StoreRelease   <0b00, 1, 0, 0, 0, GPR32, "stllrb">;
   def STLLRH  : StoreRelease   <0b01, 1, 0, 0, 0, GPR32, "stllrh">;
+
+  // Aliases for when offset=0
+  def STLLRW0 : InstAlias<"stllr\t$Rt,  [$Rn, #0]",  (STLLRW   GPR32: $Rt, GPR64sp:$Rn)>;
+  def STLLRX0 : InstAlias<"stllr\t$Rt,  [$Rn, #0]",  (STLLRX   GPR64: $Rt, GPR64sp:$Rn)>;
+  def STLLRB0 : InstAlias<"stllrb\t$Rt, [$Rn, #0]",  (STLLRB   GPR32: $Rt, GPR64sp:$Rn)>;
+  def STLLRH0 : InstAlias<"stllrh\t$Rt, [$Rn, #0]",  (STLLRH   GPR32: $Rt, GPR64sp:$Rn)>;
 }
 
 //===----------------------------------------------------------------------===//
@@ -3718,35 +4069,56 @@ defm FCVTZU : FPToIntegerScaled<0b11, 0b001, "fcvtzu", any_fp_to_uint>;
 
 // AArch64's FCVT instructions saturate when out of range.
 multiclass FPToIntegerSatPats<SDNode to_int_sat, string INST> {
+  let Predicates = [HasFullFP16] in {
   def : Pat<(i32 (to_int_sat f16:$Rn, i32)),
             (!cast<Instruction>(INST # UWHr) f16:$Rn)>;
-  def : Pat<(i32 (to_int_sat f32:$Rn, i32)),
-            (!cast<Instruction>(INST # UWSr) f32:$Rn)>;
-  def : Pat<(i32 (to_int_sat f64:$Rn, i32)),
-            (!cast<Instruction>(INST # UWDr) f64:$Rn)>;
   def : Pat<(i64 (to_int_sat f16:$Rn, i64)),
             (!cast<Instruction>(INST # UXHr) f16:$Rn)>;
+  }
+  def : Pat<(i32 (to_int_sat f32:$Rn, i32)),
+            (!cast<Instruction>(INST # UWSr) f32:$Rn)>;
   def : Pat<(i64 (to_int_sat f32:$Rn, i64)),
             (!cast<Instruction>(INST # UXSr) f32:$Rn)>;
+  def : Pat<(i32 (to_int_sat f64:$Rn, i32)),
+            (!cast<Instruction>(INST # UWDr) f64:$Rn)>;
   def : Pat<(i64 (to_int_sat f64:$Rn, i64)),
             (!cast<Instruction>(INST # UXDr) f64:$Rn)>;
+
+  let Predicates = [HasFullFP16] in {
+  def : Pat<(i32 (to_int_sat (fmul f16:$Rn, fixedpoint_f16_i32:$scale), i32)),
+            (!cast<Instruction>(INST # SWHri) $Rn, $scale)>;
+  def : Pat<(i64 (to_int_sat (fmul f16:$Rn, fixedpoint_f16_i64:$scale), i64)),
+            (!cast<Instruction>(INST # SXHri) $Rn, $scale)>;
+  }
+  def : Pat<(i32 (to_int_sat (fmul f32:$Rn, fixedpoint_f32_i32:$scale), i32)),
+            (!cast<Instruction>(INST # SWSri) $Rn, $scale)>;
+  def : Pat<(i64 (to_int_sat (fmul f32:$Rn, fixedpoint_f32_i64:$scale), i64)),
+            (!cast<Instruction>(INST # SXSri) $Rn, $scale)>;
+  def : Pat<(i32 (to_int_sat (fmul f64:$Rn, fixedpoint_f64_i32:$scale), i32)),
+            (!cast<Instruction>(INST # SWDri) $Rn, $scale)>;
+  def : Pat<(i64 (to_int_sat (fmul f64:$Rn, fixedpoint_f64_i64:$scale), i64)),
+            (!cast<Instruction>(INST # SXDri) $Rn, $scale)>;
 }
 
 defm : FPToIntegerSatPats<fp_to_sint_sat, "FCVTZS">;
 defm : FPToIntegerSatPats<fp_to_uint_sat, "FCVTZU">;
 
 multiclass FPToIntegerIntPats<Intrinsic round, string INST> {
+  let Predicates = [HasFullFP16] in {
   def : Pat<(i32 (round f16:$Rn)), (!cast<Instruction>(INST # UWHr) $Rn)>;
   def : Pat<(i64 (round f16:$Rn)), (!cast<Instruction>(INST # UXHr) $Rn)>;
+  }
   def : Pat<(i32 (round f32:$Rn)), (!cast<Instruction>(INST # UWSr) $Rn)>;
   def : Pat<(i64 (round f32:$Rn)), (!cast<Instruction>(INST # UXSr) $Rn)>;
   def : Pat<(i32 (round f64:$Rn)), (!cast<Instruction>(INST # UWDr) $Rn)>;
   def : Pat<(i64 (round f64:$Rn)), (!cast<Instruction>(INST # UXDr) $Rn)>;
 
+  let Predicates = [HasFullFP16] in {
   def : Pat<(i32 (round (fmul f16:$Rn, fixedpoint_f16_i32:$scale))),
             (!cast<Instruction>(INST # SWHri) $Rn, $scale)>;
   def : Pat<(i64 (round (fmul f16:$Rn, fixedpoint_f16_i64:$scale))),
             (!cast<Instruction>(INST # SXHri) $Rn, $scale)>;
+  }
   def : Pat<(i32 (round (fmul f32:$Rn, fixedpoint_f32_i32:$scale))),
             (!cast<Instruction>(INST # SWSri) $Rn, $scale)>;
   def : Pat<(i64 (round (fmul f32:$Rn, fixedpoint_f32_i64:$scale))),
@@ -3771,10 +4143,12 @@ multiclass FPToIntegerPats<SDNode to_int, SDNode to_int_sat, SDNode round, strin
             (!cast<Instruction>(INST # UXDr) f64:$Rn)>;
 
   // These instructions saturate like fp_to_[su]int_sat.
+  let Predicates = [HasFullFP16] in {
   def : Pat<(i32 (to_int_sat (round f16:$Rn), i32)),
             (!cast<Instruction>(INST # UWHr) f16:$Rn)>;
   def : Pat<(i64 (to_int_sat (round f16:$Rn), i64)),
             (!cast<Instruction>(INST # UXHr) f16:$Rn)>;
+  }
   def : Pat<(i32 (to_int_sat (round f32:$Rn), i32)),
             (!cast<Instruction>(INST # UWSr) f32:$Rn)>;
   def : Pat<(i64 (to_int_sat (round f32:$Rn), i64)),
@@ -3797,24 +4171,24 @@ defm : FPToIntegerPats<fp_to_uint, fp_to_uint_sat, fround, "FCVTAU">;
 
 
 let Predicates = [HasFullFP16] in {
-  def : Pat<(i32 (lround f16:$Rn)),
+  def : Pat<(i32 (any_lround f16:$Rn)),
             (!cast<Instruction>(FCVTASUWHr) f16:$Rn)>;
-  def : Pat<(i64 (lround f16:$Rn)),
+  def : Pat<(i64 (any_lround f16:$Rn)),
             (!cast<Instruction>(FCVTASUXHr) f16:$Rn)>;
-  def : Pat<(i64 (llround f16:$Rn)),
+  def : Pat<(i64 (any_llround f16:$Rn)),
             (!cast<Instruction>(FCVTASUXHr) f16:$Rn)>;
 }
-def : Pat<(i32 (lround f32:$Rn)),
+def : Pat<(i32 (any_lround f32:$Rn)),
           (!cast<Instruction>(FCVTASUWSr) f32:$Rn)>;
-def : Pat<(i32 (lround f64:$Rn)),
+def : Pat<(i32 (any_lround f64:$Rn)),
           (!cast<Instruction>(FCVTASUWDr) f64:$Rn)>;
-def : Pat<(i64 (lround f32:$Rn)),
+def : Pat<(i64 (any_lround f32:$Rn)),
           (!cast<Instruction>(FCVTASUXSr) f32:$Rn)>;
-def : Pat<(i64 (lround f64:$Rn)),
+def : Pat<(i64 (any_lround f64:$Rn)),
           (!cast<Instruction>(FCVTASUXDr) f64:$Rn)>;
-def : Pat<(i64 (llround f32:$Rn)),
+def : Pat<(i64 (any_llround f32:$Rn)),
           (!cast<Instruction>(FCVTASUXSr) f32:$Rn)>;
-def : Pat<(i64 (llround f64:$Rn)),
+def : Pat<(i64 (any_llround f64:$Rn)),
           (!cast<Instruction>(FCVTASUXDr) f64:$Rn)>;
 
 //===----------------------------------------------------------------------===//
@@ -3845,6 +4219,12 @@ def : InstAlias<"fmov $Rd, #0.0", (FMOVWHr FPR16:$Rd, WZR), 0>,
 def : InstAlias<"fmov $Rd, #0.0", (FMOVWSr FPR32:$Rd, WZR), 0>;
 def : InstAlias<"fmov $Rd, #0.0", (FMOVXDr FPR64:$Rd, XZR), 0>;
 
+// Pattern for FP16 immediates
+let Predicates = [HasFullFP16] in {
+  def : Pat<(f16 fpimm:$in),
+    (FMOVWHr (MOVi32imm (bitcast_fpimm_to_i32 f16:$in)))>;
+}
+
 //===----------------------------------------------------------------------===//
 // Floating point conversion instruction.
 //===----------------------------------------------------------------------===//
@@ -3855,20 +4235,20 @@ defm FCVT : FPConversion<"fcvt">;
 // Floating point single operand instructions.
 //===----------------------------------------------------------------------===//
 
-defm FABS   : SingleOperandFPData<0b0001, "fabs", fabs>;
-defm FMOV   : SingleOperandFPData<0b0000, "fmov">;
-defm FNEG   : SingleOperandFPData<0b0010, "fneg", fneg>;
-defm FRINTA : SingleOperandFPData<0b1100, "frinta", fround>;
-defm FRINTI : SingleOperandFPData<0b1111, "frinti", fnearbyint>;
-defm FRINTM : SingleOperandFPData<0b1010, "frintm", ffloor>;
-defm FRINTN : SingleOperandFPData<0b1000, "frintn", froundeven>;
-defm FRINTP : SingleOperandFPData<0b1001, "frintp", fceil>;
+defm FABS   : SingleOperandFPDataNoException<0b0001, "fabs", fabs>;
+defm FMOV   : SingleOperandFPDataNoException<0b0000, "fmov">;
+defm FNEG   : SingleOperandFPDataNoException<0b0010, "fneg", fneg>;
+defm FRINTA : SingleOperandFPData<0b1100, "frinta", any_fround>;
+defm FRINTI : SingleOperandFPData<0b1111, "frinti", any_fnearbyint>;
+defm FRINTM : SingleOperandFPData<0b1010, "frintm", any_ffloor>;
+defm FRINTN : SingleOperandFPData<0b1000, "frintn", any_froundeven>;
+defm FRINTP : SingleOperandFPData<0b1001, "frintp", any_fceil>;
 
-defm FRINTX : SingleOperandFPData<0b1110, "frintx", frint>;
-defm FRINTZ : SingleOperandFPData<0b1011, "frintz", ftrunc>;
+defm FRINTX : SingleOperandFPData<0b1110, "frintx", any_frint>;
+defm FRINTZ : SingleOperandFPData<0b1011, "frintz", any_ftrunc>;
 
 let SchedRW = [WriteFDiv] in {
-defm FSQRT  : SingleOperandFPData<0b0011, "fsqrt", fsqrt>;
+defm FSQRT  : SingleOperandFPData<0b0011, "fsqrt", any_fsqrt>;
 }
 
 let Predicates = [HasFRInt3264] in {
@@ -3878,44 +4258,57 @@ let Predicates = [HasFRInt3264] in {
   defm FRINT64X : FRIntNNT<0b11, "frint64x", int_aarch64_frint64x>;
 } // HasFRInt3264
 
+// Emitting strict_lrint as two instructions is valid as any exceptions that
+// occur will happen in exactly one of the instructions (e.g. if the input is
+// not an integer the inexact exception will happen in the FRINTX but not then
+// in the FCVTZS as the output of FRINTX is an integer).
 let Predicates = [HasFullFP16] in {
-  def : Pat<(i32 (lrint f16:$Rn)),
+  def : Pat<(i32 (any_lrint f16:$Rn)),
             (FCVTZSUWHr (!cast<Instruction>(FRINTXHr) f16:$Rn))>;
-  def : Pat<(i64 (lrint f16:$Rn)),
+  def : Pat<(i64 (any_lrint f16:$Rn)),
             (FCVTZSUXHr (!cast<Instruction>(FRINTXHr) f16:$Rn))>;
-  def : Pat<(i64 (llrint f16:$Rn)),
+  def : Pat<(i64 (any_llrint f16:$Rn)),
             (FCVTZSUXHr (!cast<Instruction>(FRINTXHr) f16:$Rn))>;
 }
-def : Pat<(i32 (lrint f32:$Rn)),
+def : Pat<(i32 (any_lrint f32:$Rn)),
           (FCVTZSUWSr (!cast<Instruction>(FRINTXSr) f32:$Rn))>;
-def : Pat<(i32 (lrint f64:$Rn)),
+def : Pat<(i32 (any_lrint f64:$Rn)),
           (FCVTZSUWDr (!cast<Instruction>(FRINTXDr) f64:$Rn))>;
-def : Pat<(i64 (lrint f32:$Rn)),
+def : Pat<(i64 (any_lrint f32:$Rn)),
           (FCVTZSUXSr (!cast<Instruction>(FRINTXSr) f32:$Rn))>;
-def : Pat<(i64 (lrint f64:$Rn)),
+def : Pat<(i64 (any_lrint f64:$Rn)),
           (FCVTZSUXDr (!cast<Instruction>(FRINTXDr) f64:$Rn))>;
-def : Pat<(i64 (llrint f32:$Rn)),
+def : Pat<(i64 (any_llrint f32:$Rn)),
           (FCVTZSUXSr (!cast<Instruction>(FRINTXSr) f32:$Rn))>;
-def : Pat<(i64 (llrint f64:$Rn)),
+def : Pat<(i64 (any_llrint f64:$Rn)),
           (FCVTZSUXDr (!cast<Instruction>(FRINTXDr) f64:$Rn))>;
 
 //===----------------------------------------------------------------------===//
 // Floating point two operand instructions.
 //===----------------------------------------------------------------------===//
 
-defm FADD   : TwoOperandFPData<0b0010, "fadd", fadd>;
+defm FADD   : TwoOperandFPData<0b0010, "fadd", any_fadd>;
 let SchedRW = [WriteFDiv] in {
-defm FDIV   : TwoOperandFPData<0b0001, "fdiv", fdiv>;
+defm FDIV   : TwoOperandFPData<0b0001, "fdiv", any_fdiv>;
 }
-defm FMAXNM : TwoOperandFPData<0b0110, "fmaxnm", fmaxnum>;
-defm FMAX   : TwoOperandFPData<0b0100, "fmax", fmaximum>;
-defm FMINNM : TwoOperandFPData<0b0111, "fminnm", fminnum>;
-defm FMIN   : TwoOperandFPData<0b0101, "fmin", fminimum>;
+defm FMAXNM : TwoOperandFPData<0b0110, "fmaxnm", any_fmaxnum>;
+defm FMAX   : TwoOperandFPData<0b0100, "fmax", any_fmaximum>;
+defm FMINNM : TwoOperandFPData<0b0111, "fminnm", any_fminnum>;
+defm FMIN   : TwoOperandFPData<0b0101, "fmin", any_fminimum>;
 let SchedRW = [WriteFMul] in {
-defm FMUL   : TwoOperandFPData<0b0000, "fmul", fmul>;
-defm FNMUL  : TwoOperandFPDataNeg<0b1000, "fnmul", fmul>;
+defm FMUL   : TwoOperandFPData<0b0000, "fmul", any_fmul>;
+defm FNMUL  : TwoOperandFPDataNeg<0b1000, "fnmul", any_fmul>;
 }
-defm FSUB   : TwoOperandFPData<0b0011, "fsub", fsub>;
+defm FSUB   : TwoOperandFPData<0b0011, "fsub", any_fsub>;
+
+// Match reassociated forms of FNMUL.
+def : Pat<(fmul (fneg FPR16:$a), (f16 FPR16:$b)),
+          (FNMULHrr FPR16:$a, FPR16:$b)>,
+          Requires<[HasFullFP16]>;
+def : Pat<(fmul (fneg FPR32:$a), (f32 FPR32:$b)),
+          (FNMULSrr FPR32:$a, FPR32:$b)>;
+def : Pat<(fmul (fneg FPR64:$a), (f64 FPR64:$b)),
+          (FNMULDrr FPR64:$a, FPR64:$b)>;
 
 def : Pat<(v1f64 (fmaximum (v1f64 FPR64:$Rn), (v1f64 FPR64:$Rm))),
           (FMAXDrr FPR64:$Rn, FPR64:$Rm)>;
@@ -3930,13 +4323,13 @@ def : Pat<(v1f64 (fminnum (v1f64 FPR64:$Rn), (v1f64 FPR64:$Rm))),
 // Floating point three operand instructions.
 //===----------------------------------------------------------------------===//
 
-defm FMADD  : ThreeOperandFPData<0, 0, "fmadd", fma>;
+defm FMADD  : ThreeOperandFPData<0, 0, "fmadd", any_fma>;
 defm FMSUB  : ThreeOperandFPData<0, 1, "fmsub",
-     TriOpFrag<(fma node:$LHS, (fneg node:$MHS), node:$RHS)> >;
+     TriOpFrag<(any_fma node:$LHS, (fneg node:$MHS), node:$RHS)> >;
 defm FNMADD : ThreeOperandFPData<1, 0, "fnmadd",
-     TriOpFrag<(fneg (fma node:$LHS, node:$MHS, node:$RHS))> >;
+     TriOpFrag<(fneg (any_fma node:$LHS, node:$MHS, node:$RHS))> >;
 defm FNMSUB : ThreeOperandFPData<1, 1, "fnmsub",
-     TriOpFrag<(fma node:$LHS, node:$MHS, (fneg node:$RHS))> >;
+     TriOpFrag<(any_fma node:$LHS, node:$MHS, (fneg node:$RHS))> >;
 
 // The following def pats catch the case where the LHS of an FMA is negated.
 // The TriOpFrag above catches the case where the middle operand is negated.
@@ -3988,6 +4381,10 @@ defm FCCMP  : FPCondComparison<0, "fccmp", AArch64fccmp>;
 
 defm FCSEL : FPCondSelect<"fcsel">;
 
+let Predicates = [HasFullFP16] in
+def : Pat<(bf16 (AArch64csel (bf16 FPR16:$Rn), (bf16 FPR16:$Rm), (i32 imm:$cond), NZCV)),
+          (FCSELHrrr FPR16:$Rn, FPR16:$Rm, imm:$cond)>;
+
 // CSEL instructions providing f128 types need to be handled by a
 // pseudo-instruction since the eventual code will need to introduce basic
 // blocks and control flow.
@@ -4022,6 +4419,7 @@ let isPseudo = 1 in {
   def SEH_PrologEnd : Pseudo<(outs), (ins), []>, Sched<[]>;
   def SEH_EpilogStart : Pseudo<(outs), (ins), []>, Sched<[]>;
   def SEH_EpilogEnd : Pseudo<(outs), (ins), []>, Sched<[]>;
+  def SEH_PACSignLR : Pseudo<(outs), (ins), []>, Sched<[]>;
 }
 
 // Pseudo instructions for Windows EH
@@ -4065,25 +4463,25 @@ def : Pat<(xor (v8i16 (AArch64vashr v8i16:$src, (i32 15))),
                                 (zext (v8i8 V64:$opB))),
                            (AArch64vashr v8i16:$src, (i32 15))))),
           (UABDLv8i8_v8i16 V64:$opA, V64:$opB)>;
-def : Pat<(abs (v8i16 (sub (zext (extract_high_v16i8 V128:$opA)),
-                           (zext (extract_high_v16i8 V128:$opB))))),
+def : Pat<(abs (v8i16 (sub (zext (extract_high_v16i8 (v16i8 V128:$opA))),
+                           (zext (extract_high_v16i8 (v16i8 V128:$opB)))))),
           (UABDLv16i8_v8i16 V128:$opA, V128:$opB)>;
 def : Pat<(xor (v8i16 (AArch64vashr v8i16:$src, (i32 15))),
-               (v8i16 (add (sub (zext (extract_high_v16i8 V128:$opA)),
-                                (zext (extract_high_v16i8 V128:$opB))),
+               (v8i16 (add (sub (zext (extract_high_v16i8 (v16i8 V128:$opA))),
+                                (zext (extract_high_v16i8 (v16i8 V128:$opB)))),
                            (AArch64vashr v8i16:$src, (i32 15))))),
           (UABDLv16i8_v8i16 V128:$opA, V128:$opB)>;
 def : Pat<(abs (v4i32 (sub (zext (v4i16 V64:$opA)),
                            (zext (v4i16 V64:$opB))))),
           (UABDLv4i16_v4i32 V64:$opA, V64:$opB)>;
-def : Pat<(abs (v4i32 (sub (zext (extract_high_v8i16 V128:$opA)),
-                           (zext (extract_high_v8i16 V128:$opB))))),
+def : Pat<(abs (v4i32 (sub (zext (extract_high_v8i16 (v8i16 V128:$opA))),
+                           (zext (extract_high_v8i16 (v8i16 V128:$opB)))))),
           (UABDLv8i16_v4i32 V128:$opA, V128:$opB)>;
 def : Pat<(abs (v2i64 (sub (zext (v2i32 V64:$opA)),
                            (zext (v2i32 V64:$opB))))),
           (UABDLv2i32_v2i64 V64:$opA, V64:$opB)>;
-def : Pat<(abs (v2i64 (sub (zext (extract_high_v4i32 V128:$opA)),
-                           (zext (extract_high_v4i32 V128:$opB))))),
+def : Pat<(abs (v2i64 (sub (zext (extract_high_v4i32 (v4i32 V128:$opA))),
+                           (zext (extract_high_v4i32 (v4i32 V128:$opB)))))),
           (UABDLv4i32_v2i64 V128:$opA, V128:$opB)>;
 
 defm ABS    : SIMDTwoVectorBHSD<0, 0b01011, "abs", abs>;
@@ -4095,7 +4493,22 @@ defm CMGT   : SIMDCmpTwoVector<0, 0b01000, "cmgt", AArch64cmgtz>;
 defm CMLE   : SIMDCmpTwoVector<1, 0b01001, "cmle", AArch64cmlez>;
 defm CMLT   : SIMDCmpTwoVector<0, 0b01010, "cmlt", AArch64cmltz>;
 defm CNT    : SIMDTwoVectorB<0, 0b00, 0b00101, "cnt", ctpop>;
-defm FABS   : SIMDTwoVectorFP<0, 1, 0b01111, "fabs", fabs>;
+defm FABS   : SIMDTwoVectorFPNoException<0, 1, 0b01111, "fabs", fabs>;
+
+def : Pat<(v8i8 (AArch64vashr (v8i8 V64:$Rn), (i32 7))),
+          (CMLTv8i8rz V64:$Rn)>;
+def : Pat<(v4i16 (AArch64vashr (v4i16 V64:$Rn), (i32 15))),
+          (CMLTv4i16rz V64:$Rn)>;
+def : Pat<(v2i32 (AArch64vashr (v2i32 V64:$Rn), (i32 31))),
+          (CMLTv2i32rz V64:$Rn)>;
+def : Pat<(v16i8 (AArch64vashr (v16i8 V128:$Rn), (i32 7))),
+          (CMLTv16i8rz V128:$Rn)>;
+def : Pat<(v8i16 (AArch64vashr (v8i16 V128:$Rn), (i32 15))),
+          (CMLTv8i16rz V128:$Rn)>;
+def : Pat<(v4i32 (AArch64vashr (v4i32 V128:$Rn), (i32 31))),
+          (CMLTv4i32rz V128:$Rn)>;
+def : Pat<(v2i64 (AArch64vashr (v2i64 V128:$Rn), (i32 63))),
+          (CMLTv2i64rz V128:$Rn)>;
 
 defm FCMEQ  : SIMDFPCmpTwoVector<0, 1, 0b01101, "fcmeq", AArch64fcmeqz>;
 defm FCMGE  : SIMDFPCmpTwoVector<1, 1, 0b01100, "fcmge", AArch64fcmgez>;
@@ -4110,9 +4523,9 @@ def : Pat<(v4f32 (int_aarch64_neon_vcvthf2fp (v4i16 V64:$Rn))),
 def : Pat<(v4f32 (int_aarch64_neon_vcvthf2fp (extract_subvector (v8i16 V128:$Rn),
                                                               (i64 4)))),
           (FCVTLv8i16 V128:$Rn)>;
-def : Pat<(v2f64 (fpextend (v2f32 V64:$Rn))), (FCVTLv2i32 V64:$Rn)>;
+def : Pat<(v2f64 (any_fpextend (v2f32 V64:$Rn))), (FCVTLv2i32 V64:$Rn)>;
 
-def : Pat<(v4f32 (fpextend (v4f16 V64:$Rn))), (FCVTLv4i16 V64:$Rn)>;
+def : Pat<(v4f32 (any_fpextend (v4f16 V64:$Rn))), (FCVTLv4i16 V64:$Rn)>;
 
 defm FCVTMS : SIMDTwoVectorFPToInt<0,0,0b11011, "fcvtms",int_aarch64_neon_fcvtms>;
 defm FCVTMU : SIMDTwoVectorFPToInt<1,0,0b11011, "fcvtmu",int_aarch64_neon_fcvtmu>;
@@ -4124,16 +4537,34 @@ def : Pat<(v4i16 (int_aarch64_neon_vcvtfp2hf (v4f32 V128:$Rn))),
 def : Pat<(concat_vectors V64:$Rd,
                           (v4i16 (int_aarch64_neon_vcvtfp2hf (v4f32 V128:$Rn)))),
           (FCVTNv8i16 (INSERT_SUBREG (IMPLICIT_DEF), V64:$Rd, dsub), V128:$Rn)>;
-def : Pat<(v2f32 (fpround (v2f64 V128:$Rn))), (FCVTNv2i32 V128:$Rn)>;
-def : Pat<(v4f16 (fpround (v4f32 V128:$Rn))), (FCVTNv4i16 V128:$Rn)>;
-def : Pat<(concat_vectors V64:$Rd, (v2f32 (fpround (v2f64 V128:$Rn)))),
+def : Pat<(v2f32 (any_fpround (v2f64 V128:$Rn))), (FCVTNv2i32 V128:$Rn)>;
+def : Pat<(v4f16 (any_fpround (v4f32 V128:$Rn))), (FCVTNv4i16 V128:$Rn)>;
+def : Pat<(concat_vectors V64:$Rd, (v2f32 (any_fpround (v2f64 V128:$Rn)))),
           (FCVTNv4i32 (INSERT_SUBREG (IMPLICIT_DEF), V64:$Rd, dsub), V128:$Rn)>;
 defm FCVTPS : SIMDTwoVectorFPToInt<0,1,0b11010, "fcvtps",int_aarch64_neon_fcvtps>;
 defm FCVTPU : SIMDTwoVectorFPToInt<1,1,0b11010, "fcvtpu",int_aarch64_neon_fcvtpu>;
 defm FCVTXN : SIMDFPInexactCvtTwoVector<1, 0, 0b10110, "fcvtxn",
                                         int_aarch64_neon_fcvtxn>;
-defm FCVTZS : SIMDTwoVectorFPToInt<0, 1, 0b11011, "fcvtzs", fp_to_sint>;
-defm FCVTZU : SIMDTwoVectorFPToInt<1, 1, 0b11011, "fcvtzu", fp_to_uint>;
+defm FCVTZS : SIMDTwoVectorFPToInt<0, 1, 0b11011, "fcvtzs", any_fp_to_sint>;
+defm FCVTZU : SIMDTwoVectorFPToInt<1, 1, 0b11011, "fcvtzu", any_fp_to_uint>;
+
+// AArch64's FCVT instructions saturate when out of range.
+multiclass SIMDTwoVectorFPToIntSatPats<SDNode to_int_sat, string INST> {
+  let Predicates = [HasFullFP16] in {
+  def : Pat<(v4i16 (to_int_sat v4f16:$Rn, i16)),
+            (!cast<Instruction>(INST # v4f16) v4f16:$Rn)>;
+  def : Pat<(v8i16 (to_int_sat v8f16:$Rn, i16)),
+            (!cast<Instruction>(INST # v8f16) v8f16:$Rn)>;
+  }
+  def : Pat<(v2i32 (to_int_sat v2f32:$Rn, i32)),
+            (!cast<Instruction>(INST # v2f32) v2f32:$Rn)>;
+  def : Pat<(v4i32 (to_int_sat v4f32:$Rn, i32)),
+            (!cast<Instruction>(INST # v4f32) v4f32:$Rn)>;
+  def : Pat<(v2i64 (to_int_sat v2f64:$Rn, i64)),
+            (!cast<Instruction>(INST # v2f64) v2f64:$Rn)>;
+}
+defm : SIMDTwoVectorFPToIntSatPats<fp_to_sint_sat, "FCVTZS">;
+defm : SIMDTwoVectorFPToIntSatPats<fp_to_uint_sat, "FCVTZU">;
 
 def : Pat<(v4i16 (int_aarch64_neon_fcvtzs v4f16:$Rn)), (FCVTZSv4f16 $Rn)>;
 def : Pat<(v8i16 (int_aarch64_neon_fcvtzs v8f16:$Rn)), (FCVTZSv8f16 $Rn)>;
@@ -4147,15 +4578,15 @@ def : Pat<(v2i32 (int_aarch64_neon_fcvtzu v2f32:$Rn)), (FCVTZUv2f32 $Rn)>;
 def : Pat<(v4i32 (int_aarch64_neon_fcvtzu v4f32:$Rn)), (FCVTZUv4f32 $Rn)>;
 def : Pat<(v2i64 (int_aarch64_neon_fcvtzu v2f64:$Rn)), (FCVTZUv2f64 $Rn)>;
 
-defm FNEG   : SIMDTwoVectorFP<1, 1, 0b01111, "fneg", fneg>;
+defm FNEG   : SIMDTwoVectorFPNoException<1, 1, 0b01111, "fneg", fneg>;
 defm FRECPE : SIMDTwoVectorFP<0, 1, 0b11101, "frecpe", int_aarch64_neon_frecpe>;
-defm FRINTA : SIMDTwoVectorFP<1, 0, 0b11000, "frinta", fround>;
-defm FRINTI : SIMDTwoVectorFP<1, 1, 0b11001, "frinti", fnearbyint>;
-defm FRINTM : SIMDTwoVectorFP<0, 0, 0b11001, "frintm", ffloor>;
-defm FRINTN : SIMDTwoVectorFP<0, 0, 0b11000, "frintn", froundeven>;
-defm FRINTP : SIMDTwoVectorFP<0, 1, 0b11000, "frintp", fceil>;
-defm FRINTX : SIMDTwoVectorFP<1, 0, 0b11001, "frintx", frint>;
-defm FRINTZ : SIMDTwoVectorFP<0, 1, 0b11001, "frintz", ftrunc>;
+defm FRINTA : SIMDTwoVectorFP<1, 0, 0b11000, "frinta", any_fround>;
+defm FRINTI : SIMDTwoVectorFP<1, 1, 0b11001, "frinti", any_fnearbyint>;
+defm FRINTM : SIMDTwoVectorFP<0, 0, 0b11001, "frintm", any_ffloor>;
+defm FRINTN : SIMDTwoVectorFP<0, 0, 0b11000, "frintn", any_froundeven>;
+defm FRINTP : SIMDTwoVectorFP<0, 1, 0b11000, "frintp", any_fceil>;
+defm FRINTX : SIMDTwoVectorFP<1, 0, 0b11001, "frintx", any_frint>;
+defm FRINTZ : SIMDTwoVectorFP<0, 1, 0b11001, "frintz", any_ftrunc>;
 
 let Predicates = [HasFRInt3264] in {
   defm FRINT32Z : FRIntNNTVector<0, 0, "frint32z", int_aarch64_neon_frint32z>;
@@ -4165,7 +4596,7 @@ let Predicates = [HasFRInt3264] in {
 } // HasFRInt3264
 
 defm FRSQRTE: SIMDTwoVectorFP<1, 1, 0b11101, "frsqrte", int_aarch64_neon_frsqrte>;
-defm FSQRT  : SIMDTwoVectorFP<1, 1, 0b11111, "fsqrt", fsqrt>;
+defm FSQRT  : SIMDTwoVectorFP<1, 1, 0b11111, "fsqrt", any_fsqrt>;
 defm NEG    : SIMDTwoVectorBHSD<1, 0b01011, "neg",
                                UnOpFrag<(sub immAllZerosV, node:$LHS)> >;
 defm NOT    : SIMDTwoVectorB<1, 0b00, 0b00101, "not", vnot>;
@@ -4187,9 +4618,9 @@ defm REV16  : SIMDTwoVectorB<0, 0b00, 0b00001, "rev16", AArch64rev16>;
 defm REV32  : SIMDTwoVectorBH<1, 0b00000, "rev32", AArch64rev32>;
 defm REV64  : SIMDTwoVectorBHS<0, 0b00000, "rev64", AArch64rev64>;
 defm SADALP : SIMDLongTwoVectorTied<0, 0b00110, "sadalp",
-       BinOpFrag<(add node:$LHS, (int_aarch64_neon_saddlp node:$RHS))> >;
-defm SADDLP : SIMDLongTwoVector<0, 0b00010, "saddlp", int_aarch64_neon_saddlp>;
-defm SCVTF  : SIMDTwoVectorIntToFP<0, 0, 0b11101, "scvtf", sint_to_fp>;
+       BinOpFrag<(add node:$LHS, (AArch64saddlp node:$RHS))> >;
+defm SADDLP : SIMDLongTwoVector<0, 0b00010, "saddlp", AArch64saddlp>;
+defm SCVTF  : SIMDTwoVectorIntToFP<0, 0, 0b11101, "scvtf", any_sint_to_fp>;
 defm SHLL   : SIMDVectorLShiftLongBySizeBHS;
 defm SQABS  : SIMDTwoVectorBHSD<0, 0b00111, "sqabs", int_aarch64_neon_sqabs>;
 defm SQNEG  : SIMDTwoVectorBHSD<1, 0b00111, "sqneg", int_aarch64_neon_sqneg>;
@@ -4199,7 +4630,7 @@ defm SUQADD : SIMDTwoVectorBHSDTied<0, 0b00011, "suqadd",int_aarch64_neon_suqadd
 defm UADALP : SIMDLongTwoVectorTied<1, 0b00110, "uadalp",
        BinOpFrag<(add node:$LHS, (AArch64uaddlp node:$RHS))> >;
 defm UADDLP : SIMDLongTwoVector<1, 0b00010, "uaddlp", AArch64uaddlp>;
-defm UCVTF  : SIMDTwoVectorIntToFP<1, 0, 0b11101, "ucvtf", uint_to_fp>;
+defm UCVTF  : SIMDTwoVectorIntToFP<1, 0, 0b11101, "ucvtf", any_uint_to_fp>;
 defm UQXTN  : SIMDMixedTwoVector<1, 0b10100, "uqxtn", int_aarch64_neon_uqxtn>;
 defm URECPE : SIMDTwoVectorS<0, 1, 0b11100, "urecpe", int_aarch64_neon_urecpe>;
 defm URSQRTE: SIMDTwoVectorS<1, 1, 0b11100, "ursqrte", int_aarch64_neon_ursqrte>;
@@ -4223,15 +4654,15 @@ def : Pat<(v4f32  (AArch64rev64 V128:$Rn)), (REV64v4i32 V128:$Rn)>;
 multiclass SIMDVectorLShiftLongBySizeBHSPats<SDPatternOperator ext> {
   def : Pat<(AArch64vshl (v8i16 (ext (v8i8 V64:$Rn))), (i32 8)),
             (SHLLv8i8 V64:$Rn)>;
-  def : Pat<(AArch64vshl (v8i16 (ext (extract_high_v16i8 V128:$Rn))), (i32 8)),
+  def : Pat<(AArch64vshl (v8i16 (ext (extract_high_v16i8 (v16i8 V128:$Rn)))), (i32 8)),
             (SHLLv16i8 V128:$Rn)>;
   def : Pat<(AArch64vshl (v4i32 (ext (v4i16 V64:$Rn))), (i32 16)),
             (SHLLv4i16 V64:$Rn)>;
-  def : Pat<(AArch64vshl (v4i32 (ext (extract_high_v8i16 V128:$Rn))), (i32 16)),
+  def : Pat<(AArch64vshl (v4i32 (ext (extract_high_v8i16 (v8i16 V128:$Rn)))), (i32 16)),
             (SHLLv8i16 V128:$Rn)>;
   def : Pat<(AArch64vshl (v2i64 (ext (v2i32 V64:$Rn))), (i32 32)),
             (SHLLv2i32 V64:$Rn)>;
-  def : Pat<(AArch64vshl (v2i64 (ext (extract_high_v4i32 V128:$Rn))), (i32 32)),
+  def : Pat<(AArch64vshl (v2i64 (ext (extract_high_v4i32 (v4i32 V128:$Rn)))), (i32 32)),
             (SHLLv4i32 V128:$Rn)>;
 }
 
@@ -4270,12 +4701,38 @@ def : Pat<(v4i16 (trunc (smax (smin (v4i32 V128:$Vn), (v4i32 VImm7FFF)),
                               (v4i32 VImm8000)))),
           (SQXTNv4i16 V128:$Vn)>;
 
+// concat_vectors(Vd, trunc(smin(smax Vm, -128), 127) ~> SQXTN2(Vd, Vn)
+// with reversed min/max
+def : Pat<(v16i8 (concat_vectors
+                 (v8i8 V64:$Vd),
+                 (v8i8 (trunc (smin (smax (v8i16 V128:$Vn), (v8i16 VImm80)),
+                                          (v8i16 VImm7F)))))),
+          (SQXTNv16i8 (INSERT_SUBREG (IMPLICIT_DEF), V64:$Vd, dsub), V128:$Vn)>;
+def : Pat<(v16i8 (concat_vectors
+                 (v8i8 V64:$Vd),
+                 (v8i8 (trunc (smax (smin (v8i16 V128:$Vn), (v8i16 VImm7F)),
+                                          (v8i16 VImm80)))))),
+          (SQXTNv16i8 (INSERT_SUBREG (IMPLICIT_DEF), V64:$Vd, dsub), V128:$Vn)>;
+
+// concat_vectors(Vd, trunc(smin(smax Vm, -32768), 32767) ~> SQXTN2(Vd, Vn)
+// with reversed min/max
+def : Pat<(v8i16 (concat_vectors
+                 (v4i16 V64:$Vd),
+                 (v4i16 (trunc (smin (smax (v4i32 V128:$Vn), (v4i32 VImm8000)),
+                                           (v4i32 VImm7FFF)))))),
+          (SQXTNv8i16 (INSERT_SUBREG (IMPLICIT_DEF), V64:$Vd, dsub), V128:$Vn)>;
+def : Pat<(v8i16 (concat_vectors
+                 (v4i16 V64:$Vd),
+                 (v4i16 (trunc (smax (smin (v4i32 V128:$Vn), (v4i32 VImm7FFF)),
+                                           (v4i32 VImm8000)))))),
+          (SQXTNv8i16 (INSERT_SUBREG (IMPLICIT_DEF), V64:$Vd, dsub), V128:$Vn)>;
+
 //===----------------------------------------------------------------------===//
 // Advanced SIMD three vector instructions.
 //===----------------------------------------------------------------------===//
 
 defm ADD     : SIMDThreeSameVector<0, 0b10000, "add", add>;
-defm ADDP    : SIMDThreeSameVector<0, 0b10111, "addp", int_aarch64_neon_addp>;
+defm ADDP    : SIMDThreeSameVector<0, 0b10111, "addp", AArch64addp>;
 defm CMEQ    : SIMDThreeSameVector<1, 0b10001, "cmeq", AArch64cmeq>;
 defm CMGE    : SIMDThreeSameVector<0, 0b00111, "cmge", AArch64cmge>;
 defm CMGT    : SIMDThreeSameVector<0, 0b00110, "cmgt", AArch64cmgt>;
@@ -4296,33 +4753,33 @@ def : Pat<(fabs (fsub VT:$Rn, VT:$Rm)), (!cast<Instruction>("FABD"#VT) VT:$Rn, V
 }
 defm FACGE   : SIMDThreeSameVectorFPCmp<1,0,0b101,"facge",int_aarch64_neon_facge>;
 defm FACGT   : SIMDThreeSameVectorFPCmp<1,1,0b101,"facgt",int_aarch64_neon_facgt>;
-defm FADDP   : SIMDThreeSameVectorFP<1,0,0b010,"faddp",int_aarch64_neon_faddp>;
-defm FADD    : SIMDThreeSameVectorFP<0,0,0b010,"fadd", fadd>;
+defm FADDP   : SIMDThreeSameVectorFP<1,0,0b010,"faddp", AArch64faddp>;
+defm FADD    : SIMDThreeSameVectorFP<0,0,0b010,"fadd", any_fadd>;
 defm FCMEQ   : SIMDThreeSameVectorFPCmp<0, 0, 0b100, "fcmeq", AArch64fcmeq>;
 defm FCMGE   : SIMDThreeSameVectorFPCmp<1, 0, 0b100, "fcmge", AArch64fcmge>;
 defm FCMGT   : SIMDThreeSameVectorFPCmp<1, 1, 0b100, "fcmgt", AArch64fcmgt>;
-defm FDIV    : SIMDThreeSameVectorFP<1,0,0b111,"fdiv", fdiv>;
+defm FDIV    : SIMDThreeSameVectorFP<1,0,0b111,"fdiv", any_fdiv>;
 defm FMAXNMP : SIMDThreeSameVectorFP<1,0,0b000,"fmaxnmp", int_aarch64_neon_fmaxnmp>;
-defm FMAXNM  : SIMDThreeSameVectorFP<0,0,0b000,"fmaxnm", fmaxnum>;
+defm FMAXNM  : SIMDThreeSameVectorFP<0,0,0b000,"fmaxnm", any_fmaxnum>;
 defm FMAXP   : SIMDThreeSameVectorFP<1,0,0b110,"fmaxp", int_aarch64_neon_fmaxp>;
-defm FMAX    : SIMDThreeSameVectorFP<0,0,0b110,"fmax", fmaximum>;
+defm FMAX    : SIMDThreeSameVectorFP<0,0,0b110,"fmax", any_fmaximum>;
 defm FMINNMP : SIMDThreeSameVectorFP<1,1,0b000,"fminnmp", int_aarch64_neon_fminnmp>;
-defm FMINNM  : SIMDThreeSameVectorFP<0,1,0b000,"fminnm", fminnum>;
+defm FMINNM  : SIMDThreeSameVectorFP<0,1,0b000,"fminnm", any_fminnum>;
 defm FMINP   : SIMDThreeSameVectorFP<1,1,0b110,"fminp", int_aarch64_neon_fminp>;
-defm FMIN    : SIMDThreeSameVectorFP<0,1,0b110,"fmin", fminimum>;
+defm FMIN    : SIMDThreeSameVectorFP<0,1,0b110,"fmin", any_fminimum>;
 
 // NOTE: The operands of the PatFrag are reordered on FMLA/FMLS because the
 // instruction expects the addend first, while the fma intrinsic puts it last.
 defm FMLA     : SIMDThreeSameVectorFPTied<0, 0, 0b001, "fmla",
-            TriOpFrag<(fma node:$RHS, node:$MHS, node:$LHS)> >;
+            TriOpFrag<(any_fma node:$RHS, node:$MHS, node:$LHS)> >;
 defm FMLS     : SIMDThreeSameVectorFPTied<0, 1, 0b001, "fmls",
-            TriOpFrag<(fma node:$MHS, (fneg node:$RHS), node:$LHS)> >;
+            TriOpFrag<(any_fma node:$MHS, (fneg node:$RHS), node:$LHS)> >;
 
 defm FMULX    : SIMDThreeSameVectorFP<0,0,0b011,"fmulx", int_aarch64_neon_fmulx>;
-defm FMUL     : SIMDThreeSameVectorFP<1,0,0b011,"fmul", fmul>;
+defm FMUL     : SIMDThreeSameVectorFP<1,0,0b011,"fmul", any_fmul>;
 defm FRECPS   : SIMDThreeSameVectorFP<0,0,0b111,"frecps", int_aarch64_neon_frecps>;
 defm FRSQRTS  : SIMDThreeSameVectorFP<0,1,0b111,"frsqrts", int_aarch64_neon_frsqrts>;
-defm FSUB     : SIMDThreeSameVectorFP<0,1,0b010,"fsub", fsub>;
+defm FSUB     : SIMDThreeSameVectorFP<0,1,0b010,"fsub", any_fsub>;
 
 // MLA and MLS are generated in MachineCombine
 defm MLA      : SIMDThreeSameVectorBHSTied<0, 0b10010, "mla", null_frag>;
@@ -4333,7 +4790,7 @@ defm PMUL     : SIMDThreeSameVectorB<1, 0b10011, "pmul", int_aarch64_neon_pmul>;
 defm SABA     : SIMDThreeSameVectorBHSTied<0, 0b01111, "saba",
       TriOpFrag<(add node:$LHS, (AArch64sabd node:$MHS, node:$RHS))> >;
 defm SABD     : SIMDThreeSameVectorBHS<0,0b01110,"sabd", AArch64sabd>;
-defm SHADD    : SIMDThreeSameVectorBHS<0,0b00000,"shadd", AArch64shadd>;
+defm SHADD    : SIMDThreeSameVectorBHS<0,0b00000,"shadd", avgfloors>;
 defm SHSUB    : SIMDThreeSameVectorBHS<0,0b00100,"shsub", int_aarch64_neon_shsub>;
 defm SMAXP    : SIMDThreeSameVectorBHS<0,0b10100,"smaxp", int_aarch64_neon_smaxp>;
 defm SMAX     : SIMDThreeSameVectorBHS<0,0b01100,"smax", smax>;
@@ -4345,14 +4802,14 @@ defm SQRDMULH : SIMDThreeSameVectorHS<1,0b10110,"sqrdmulh",int_aarch64_neon_sqrd
 defm SQRSHL   : SIMDThreeSameVector<0,0b01011,"sqrshl", int_aarch64_neon_sqrshl>;
 defm SQSHL    : SIMDThreeSameVector<0,0b01001,"sqshl", int_aarch64_neon_sqshl>;
 defm SQSUB    : SIMDThreeSameVector<0,0b00101,"sqsub", int_aarch64_neon_sqsub>;
-defm SRHADD   : SIMDThreeSameVectorBHS<0,0b00010,"srhadd", AArch64srhadd>;
+defm SRHADD   : SIMDThreeSameVectorBHS<0,0b00010,"srhadd", avgceils>;
 defm SRSHL    : SIMDThreeSameVector<0,0b01010,"srshl", int_aarch64_neon_srshl>;
 defm SSHL     : SIMDThreeSameVector<0,0b01000,"sshl", int_aarch64_neon_sshl>;
 defm SUB      : SIMDThreeSameVector<1,0b10000,"sub", sub>;
 defm UABA     : SIMDThreeSameVectorBHSTied<1, 0b01111, "uaba",
       TriOpFrag<(add node:$LHS, (AArch64uabd node:$MHS, node:$RHS))> >;
 defm UABD     : SIMDThreeSameVectorBHS<1,0b01110,"uabd", AArch64uabd>;
-defm UHADD    : SIMDThreeSameVectorBHS<1,0b00000,"uhadd", AArch64uhadd>;
+defm UHADD    : SIMDThreeSameVectorBHS<1,0b00000,"uhadd", avgflooru>;
 defm UHSUB    : SIMDThreeSameVectorBHS<1,0b00100,"uhsub", int_aarch64_neon_uhsub>;
 defm UMAXP    : SIMDThreeSameVectorBHS<1,0b10100,"umaxp", int_aarch64_neon_umaxp>;
 defm UMAX     : SIMDThreeSameVectorBHS<1,0b01100,"umax", umax>;
@@ -4362,13 +4819,13 @@ defm UQADD    : SIMDThreeSameVector<1,0b00001,"uqadd", int_aarch64_neon_uqadd>;
 defm UQRSHL   : SIMDThreeSameVector<1,0b01011,"uqrshl", int_aarch64_neon_uqrshl>;
 defm UQSHL    : SIMDThreeSameVector<1,0b01001,"uqshl", int_aarch64_neon_uqshl>;
 defm UQSUB    : SIMDThreeSameVector<1,0b00101,"uqsub", int_aarch64_neon_uqsub>;
-defm URHADD   : SIMDThreeSameVectorBHS<1,0b00010,"urhadd", AArch64urhadd>;
+defm URHADD   : SIMDThreeSameVectorBHS<1,0b00010,"urhadd", avgceilu>;
 defm URSHL    : SIMDThreeSameVector<1,0b01010,"urshl", int_aarch64_neon_urshl>;
 defm USHL     : SIMDThreeSameVector<1,0b01000,"ushl", int_aarch64_neon_ushl>;
 defm SQRDMLAH : SIMDThreeSameVectorSQRDMLxHTiedHS<1,0b10000,"sqrdmlah",
-                                                  int_aarch64_neon_sqadd>;
+                                                  int_aarch64_neon_sqrdmlah>;
 defm SQRDMLSH : SIMDThreeSameVectorSQRDMLxHTiedHS<1,0b10001,"sqrdmlsh",
-                                                    int_aarch64_neon_sqsub>;
+                                                    int_aarch64_neon_sqrdmlsh>;
 
 // Extra saturate patterns, other than the intrinsics matches above
 defm : SIMDThreeSameVectorExtraPatterns<"SQADD", saddsat>;
@@ -4602,11 +5059,13 @@ defm CMTST    : SIMDThreeScalarD<0, 0b10001, "cmtst", AArch64cmtst>;
 defm FABD     : SIMDFPThreeScalar<1, 1, 0b010, "fabd", int_aarch64_sisd_fabd>;
 def : Pat<(v1f64 (int_aarch64_neon_fabd (v1f64 FPR64:$Rn), (v1f64 FPR64:$Rm))),
           (FABD64 FPR64:$Rn, FPR64:$Rm)>;
-let Predicates = [HasFullFP16] in {
+let Predicates = [HasNEON, HasFullFP16] in {
 def : Pat<(fabs (fsub f16:$Rn, f16:$Rm)), (FABD16 f16:$Rn, f16:$Rm)>;
 }
+let Predicates = [HasNEON] in {
 def : Pat<(fabs (fsub f32:$Rn, f32:$Rm)), (FABD32 f32:$Rn, f32:$Rm)>;
 def : Pat<(fabs (fsub f64:$Rn, f64:$Rm)), (FABD64 f64:$Rn, f64:$Rm)>;
+}
 defm FACGE    : SIMDThreeScalarFPCmp<1, 0, 0b101, "facge",
                                      int_aarch64_neon_facge>;
 defm FACGT    : SIMDThreeScalarFPCmp<1, 1, 0b101, "facgt",
@@ -4614,9 +5073,9 @@ defm FACGT    : SIMDThreeScalarFPCmp<1, 1, 0b101, "facgt",
 defm FCMEQ    : SIMDThreeScalarFPCmp<0, 0, 0b100, "fcmeq", AArch64fcmeq>;
 defm FCMGE    : SIMDThreeScalarFPCmp<1, 0, 0b100, "fcmge", AArch64fcmge>;
 defm FCMGT    : SIMDThreeScalarFPCmp<1, 1, 0b100, "fcmgt", AArch64fcmgt>;
-defm FMULX    : SIMDFPThreeScalar<0, 0, 0b011, "fmulx", int_aarch64_neon_fmulx>;
-defm FRECPS   : SIMDFPThreeScalar<0, 0, 0b111, "frecps", int_aarch64_neon_frecps>;
-defm FRSQRTS  : SIMDFPThreeScalar<0, 1, 0b111, "frsqrts", int_aarch64_neon_frsqrts>;
+defm FMULX    : SIMDFPThreeScalar<0, 0, 0b011, "fmulx", int_aarch64_neon_fmulx, HasNEONorSME>;
+defm FRECPS   : SIMDFPThreeScalar<0, 0, 0b111, "frecps", int_aarch64_neon_frecps, HasNEONorSME>;
+defm FRSQRTS  : SIMDFPThreeScalar<0, 1, 0b111, "frsqrts", int_aarch64_neon_frsqrts, HasNEONorSME>;
 defm SQADD    : SIMDThreeScalarBHSD<0, 0b00001, "sqadd", int_aarch64_neon_sqadd>;
 defm SQDMULH  : SIMDThreeScalarHS<  0, 0b10110, "sqdmulh", int_aarch64_neon_sqdmulh>;
 defm SQRDMULH : SIMDThreeScalarHS<  1, 0b10110, "sqrdmulh", int_aarch64_neon_sqrdmulh>;
@@ -4635,15 +5094,11 @@ defm USHL     : SIMDThreeScalarD<   1, 0b01000, "ushl", int_aarch64_neon_ushl>;
 let Predicates = [HasRDM] in {
   defm SQRDMLAH : SIMDThreeScalarHSTied<1, 0, 0b10000, "sqrdmlah">;
   defm SQRDMLSH : SIMDThreeScalarHSTied<1, 0, 0b10001, "sqrdmlsh">;
-  def : Pat<(i32 (int_aarch64_neon_sqadd
-                   (i32 FPR32:$Rd),
-                   (i32 (int_aarch64_neon_sqrdmulh (i32 FPR32:$Rn),
-                                                   (i32 FPR32:$Rm))))),
+  def : Pat<(i32 (int_aarch64_neon_sqrdmlah (i32 FPR32:$Rd), (i32 FPR32:$Rn),
+                                            (i32 FPR32:$Rm))),
             (SQRDMLAHv1i32 FPR32:$Rd, FPR32:$Rn, FPR32:$Rm)>;
-  def : Pat<(i32 (int_aarch64_neon_sqsub
-                   (i32 FPR32:$Rd),
-                   (i32 (int_aarch64_neon_sqrdmulh (i32 FPR32:$Rn),
-                                                   (i32 FPR32:$Rm))))),
+  def : Pat<(i32 (int_aarch64_neon_sqrdmlsh (i32 FPR32:$Rd), (i32 FPR32:$Rn),
+                                            (i32 FPR32:$Rm))),
             (SQRDMLSHv1i32 FPR32:$Rd, FPR32:$Rn, FPR32:$Rm)>;
 }
 
@@ -4693,7 +5148,7 @@ def : Pat<(i64 (int_aarch64_neon_sqsub (i64 FPR64:$Rd),
 // Advanced SIMD two scalar instructions.
 //===----------------------------------------------------------------------===//
 
-defm ABS    : SIMDTwoScalarD<    0, 0b01011, "abs", abs>;
+defm ABS    : SIMDTwoScalarD<    0, 0b01011, "abs", abs, [HasNoCSSC]>;
 defm CMEQ   : SIMDCmpTwoScalarD< 0, 0b01001, "cmeq", AArch64cmeqz>;
 defm CMGE   : SIMDCmpTwoScalarD< 1, 0b01000, "cmge", AArch64cmgez>;
 defm CMGT   : SIMDCmpTwoScalarD< 0, 0b01000, "cmgt", AArch64cmgtz>;
@@ -4715,9 +5170,9 @@ defm FCVTPU : SIMDFPTwoScalar<   1, 1, 0b11010, "fcvtpu">;
 def  FCVTXNv1i64 : SIMDInexactCvtTwoScalar<0b10110, "fcvtxn">;
 defm FCVTZS : SIMDFPTwoScalar<   0, 1, 0b11011, "fcvtzs">;
 defm FCVTZU : SIMDFPTwoScalar<   1, 1, 0b11011, "fcvtzu">;
-defm FRECPE : SIMDFPTwoScalar<   0, 1, 0b11101, "frecpe">;
-defm FRECPX : SIMDFPTwoScalar<   0, 1, 0b11111, "frecpx">;
-defm FRSQRTE : SIMDFPTwoScalar<  1, 1, 0b11101, "frsqrte">;
+defm FRECPE : SIMDFPTwoScalar<   0, 1, 0b11101, "frecpe", HasNEONorSME>;
+defm FRECPX : SIMDFPTwoScalar<   0, 1, 0b11111, "frecpx", HasNEONorSME>;
+defm FRSQRTE : SIMDFPTwoScalar<  1, 1, 0b11101, "frsqrte", HasNEONorSME>;
 defm NEG    : SIMDTwoScalarD<    1, 0b01011, "neg",
                                  UnOpFrag<(sub immAllZerosV, node:$LHS)> >;
 defm SCVTF  : SIMDFPTwoScalarCVT<   0, 0, 0b11101, "scvtf", AArch64sitof>;
@@ -4732,6 +5187,9 @@ defm UQXTN  : SIMDTwoScalarMixedBHS<1, 0b10100, "uqxtn", int_aarch64_neon_scalar
 defm USQADD : SIMDTwoScalarBHSDTied< 1, 0b00011, "usqadd",
                                     int_aarch64_neon_usqadd>;
 
+def : Pat<(v1i64 (AArch64vashr (v1i64 V64:$Rn), (i32 63))),
+          (CMLTv1i64rz V64:$Rn)>;
+
 def : Pat<(v1i64 (int_aarch64_neon_fcvtas (v1f64 FPR64:$Rn))),
           (FCVTASv1i64 FPR64:$Rn)>;
 def : Pat<(v1i64 (int_aarch64_neon_fcvtau (v1f64 FPR64:$Rn))),
@@ -4830,23 +5288,21 @@ def : Pat<(v2f64 (AArch64frsqrts (v2f64 FPR128:$Rn), (v2f64 FPR128:$Rm))),
 // int values in FP registers using the corresponding NEON instructions to
 // avoid more costly int <-> fp register transfers.
 let Predicates = [HasNEON] in {
-def : Pat<(f64 (sint_to_fp (i64 (fp_to_sint f64:$Rn)))),
+def : Pat<(f64 (any_sint_to_fp (i64 (any_fp_to_sint f64:$Rn)))),
           (SCVTFv1i64 (i64 (FCVTZSv1i64 f64:$Rn)))>;
-def : Pat<(f32 (sint_to_fp (i32 (fp_to_sint f32:$Rn)))),
+def : Pat<(f32 (any_sint_to_fp (i32 (any_fp_to_sint f32:$Rn)))),
           (SCVTFv1i32 (i32 (FCVTZSv1i32 f32:$Rn)))>;
-def : Pat<(f64 (uint_to_fp (i64 (fp_to_uint f64:$Rn)))),
+def : Pat<(f64 (any_uint_to_fp (i64 (any_fp_to_uint f64:$Rn)))),
           (UCVTFv1i64 (i64 (FCVTZUv1i64 f64:$Rn)))>;
-def : Pat<(f32 (uint_to_fp (i32 (fp_to_uint f32:$Rn)))),
+def : Pat<(f32 (any_uint_to_fp (i32 (any_fp_to_uint f32:$Rn)))),
           (UCVTFv1i32 (i32 (FCVTZUv1i32 f32:$Rn)))>;
 
 let Predicates = [HasFullFP16] in {
-def : Pat<(f16 (sint_to_fp (i32 (fp_to_sint f16:$Rn)))),
+def : Pat<(f16 (any_sint_to_fp (i32 (any_fp_to_sint f16:$Rn)))),
           (SCVTFv1i16 (f16 (FCVTZSv1f16 f16:$Rn)))>;
-def : Pat<(f16 (uint_to_fp (i32 (fp_to_uint f16:$Rn)))),
+def : Pat<(f16 (any_uint_to_fp (i32 (any_fp_to_uint f16:$Rn)))),
           (UCVTFv1i16 (f16 (FCVTZUv1f16 f16:$Rn)))>;
 }
-}
-
 // If an integer is about to be converted to a floating point value,
 // just load it on the floating point unit.
 // Here are the patterns for 8 and 16-bits to float.
@@ -4933,6 +5389,7 @@ def : Pat <(f64 (uint_to_fp (i32
                           (LDURSi GPR64sp:$Rn, simm9:$offset), ssub))>;
 // 64-bits -> double are handled in target specific dag combine:
 // performIntToFpCombine.
+} // let Predicates = [HasNEON]
 
 //===----------------------------------------------------------------------===//
 // Advanced SIMD three different-sized vector instructions.
@@ -4942,7 +5399,7 @@ defm ADDHN  : SIMDNarrowThreeVectorBHS<0,0b0100,"addhn", int_aarch64_neon_addhn>
 defm SUBHN  : SIMDNarrowThreeVectorBHS<0,0b0110,"subhn", int_aarch64_neon_subhn>;
 defm RADDHN : SIMDNarrowThreeVectorBHS<1,0b0100,"raddhn",int_aarch64_neon_raddhn>;
 defm RSUBHN : SIMDNarrowThreeVectorBHS<1,0b0110,"rsubhn",int_aarch64_neon_rsubhn>;
-defm PMULL  : SIMDDifferentThreeVectorBD<0,0b1110,"pmull",int_aarch64_neon_pmull>;
+defm PMULL  : SIMDDifferentThreeVectorBD<0,0b1110,"pmull", AArch64pmull>;
 defm SABAL  : SIMDLongThreeVectorTiedBHSabal<0,0b0101,"sabal",
                                              AArch64sabd>;
 defm SABDL   : SIMDLongThreeVectorBHSabdl<0, 0b0111, "sabdl",
@@ -4952,10 +5409,10 @@ defm SADDL   : SIMDLongThreeVectorBHS<   0, 0b0000, "saddl",
 defm SADDW   : SIMDWideThreeVectorBHS<   0, 0b0001, "saddw",
                  BinOpFrag<(add node:$LHS, (sext node:$RHS))>>;
 defm SMLAL   : SIMDLongThreeVectorTiedBHS<0, 0b1000, "smlal",
-    TriOpFrag<(add node:$LHS, (int_aarch64_neon_smull node:$MHS, node:$RHS))>>;
+    TriOpFrag<(add node:$LHS, (AArch64smull node:$MHS, node:$RHS))>>;
 defm SMLSL   : SIMDLongThreeVectorTiedBHS<0, 0b1010, "smlsl",
-    TriOpFrag<(sub node:$LHS, (int_aarch64_neon_smull node:$MHS, node:$RHS))>>;
-defm SMULL   : SIMDLongThreeVectorBHS<0, 0b1100, "smull", int_aarch64_neon_smull>;
+    TriOpFrag<(sub node:$LHS, (AArch64smull node:$MHS, node:$RHS))>>;
+defm SMULL   : SIMDLongThreeVectorBHS<0, 0b1100, "smull", AArch64smull>;
 defm SQDMLAL : SIMDLongThreeVectorSQDMLXTiedHS<0, 0b1001, "sqdmlal",
                                                int_aarch64_neon_sqadd>;
 defm SQDMLSL : SIMDLongThreeVectorSQDMLXTiedHS<0, 0b1011, "sqdmlsl",
@@ -4973,10 +5430,10 @@ defm UADDL   : SIMDLongThreeVectorBHS<1, 0b0000, "uaddl",
 defm UADDW   : SIMDWideThreeVectorBHS<1, 0b0001, "uaddw",
                  BinOpFrag<(add node:$LHS, (zanyext node:$RHS))>>;
 defm UMLAL   : SIMDLongThreeVectorTiedBHS<1, 0b1000, "umlal",
-    TriOpFrag<(add node:$LHS, (int_aarch64_neon_umull node:$MHS, node:$RHS))>>;
+    TriOpFrag<(add node:$LHS, (AArch64umull node:$MHS, node:$RHS))>>;
 defm UMLSL   : SIMDLongThreeVectorTiedBHS<1, 0b1010, "umlsl",
-    TriOpFrag<(sub node:$LHS, (int_aarch64_neon_umull node:$MHS, node:$RHS))>>;
-defm UMULL   : SIMDLongThreeVectorBHS<1, 0b1100, "umull", int_aarch64_neon_umull>;
+    TriOpFrag<(sub node:$LHS, (AArch64umull node:$MHS, node:$RHS))>>;
+defm UMULL   : SIMDLongThreeVectorBHS<1, 0b1100, "umull", AArch64umull>;
 defm USUBL   : SIMDLongThreeVectorBHS<1, 0b0010, "usubl",
                  BinOpFrag<(sub (zanyext node:$LHS), (zanyext node:$RHS))>>;
 defm USUBW   : SIMDWideThreeVectorBHS<   1, 0b0011, "usubw",
@@ -5011,84 +5468,21 @@ multiclass Neon_mul_acc_widen_patterns<SDPatternOperator opnode, SDPatternOperat
                                      V64:$Rn, V64:$Rm)), dsub)>;
 }
 
-defm : Neon_mul_acc_widen_patterns<add, int_aarch64_neon_umull,
+defm : Neon_mul_acc_widen_patterns<add, AArch64umull,
      UMLALv8i8_v8i16, UMLALv4i16_v4i32, UMLALv2i32_v2i64>;
-defm : Neon_mul_acc_widen_patterns<add, int_aarch64_neon_smull,
+defm : Neon_mul_acc_widen_patterns<add, AArch64smull,
      SMLALv8i8_v8i16, SMLALv4i16_v4i32, SMLALv2i32_v2i64>;
-defm : Neon_mul_acc_widen_patterns<sub, int_aarch64_neon_umull,
+defm : Neon_mul_acc_widen_patterns<sub, AArch64umull,
      UMLSLv8i8_v8i16, UMLSLv4i16_v4i32, UMLSLv2i32_v2i64>;
-defm : Neon_mul_acc_widen_patterns<sub, int_aarch64_neon_smull,
+defm : Neon_mul_acc_widen_patterns<sub, AArch64smull,
      SMLSLv8i8_v8i16, SMLSLv4i16_v4i32, SMLSLv2i32_v2i64>;
 
-// Additional patterns for SMULL and UMULL
-multiclass Neon_mul_widen_patterns<SDPatternOperator opnode,
-  Instruction INST8B, Instruction INST4H, Instruction INST2S> {
-  def : Pat<(v8i16 (opnode (v8i8 V64:$Rn), (v8i8 V64:$Rm))),
-            (INST8B V64:$Rn, V64:$Rm)>;
-  def : Pat<(v4i32 (opnode (v4i16 V64:$Rn), (v4i16 V64:$Rm))),
-            (INST4H V64:$Rn, V64:$Rm)>;
-  def : Pat<(v2i64 (opnode (v2i32 V64:$Rn), (v2i32 V64:$Rm))),
-            (INST2S V64:$Rn, V64:$Rm)>;
-}
-
-defm : Neon_mul_widen_patterns<AArch64smull, SMULLv8i8_v8i16,
-  SMULLv4i16_v4i32, SMULLv2i32_v2i64>;
-defm : Neon_mul_widen_patterns<AArch64umull, UMULLv8i8_v8i16,
-  UMULLv4i16_v4i32, UMULLv2i32_v2i64>;
-
-// Patterns for smull2/umull2.
-multiclass Neon_mul_high_patterns<SDPatternOperator opnode,
-  Instruction INST8B, Instruction INST4H, Instruction INST2S> {
-  def : Pat<(v8i16 (opnode (extract_high_v16i8 V128:$Rn),
-                           (extract_high_v16i8 V128:$Rm))),
-             (INST8B V128:$Rn, V128:$Rm)>;
-  def : Pat<(v4i32 (opnode (extract_high_v8i16 V128:$Rn),
-                           (extract_high_v8i16 V128:$Rm))),
-             (INST4H V128:$Rn, V128:$Rm)>;
-  def : Pat<(v2i64 (opnode (extract_high_v4i32 V128:$Rn),
-                           (extract_high_v4i32 V128:$Rm))),
-             (INST2S V128:$Rn, V128:$Rm)>;
-}
-
-defm : Neon_mul_high_patterns<AArch64smull, SMULLv16i8_v8i16,
-  SMULLv8i16_v4i32, SMULLv4i32_v2i64>;
-defm : Neon_mul_high_patterns<AArch64umull, UMULLv16i8_v8i16,
-  UMULLv8i16_v4i32, UMULLv4i32_v2i64>;
-
-// Additional patterns for SMLAL/SMLSL and UMLAL/UMLSL
-multiclass Neon_mulacc_widen_patterns<SDPatternOperator opnode,
-  Instruction INST8B, Instruction INST4H, Instruction INST2S> {
-  def : Pat<(v8i16 (opnode (v8i16 V128:$Rd), (v8i8 V64:$Rn), (v8i8 V64:$Rm))),
-            (INST8B V128:$Rd, V64:$Rn, V64:$Rm)>;
-  def : Pat<(v4i32 (opnode (v4i32 V128:$Rd), (v4i16 V64:$Rn), (v4i16 V64:$Rm))),
-            (INST4H V128:$Rd, V64:$Rn, V64:$Rm)>;
-  def : Pat<(v2i64 (opnode (v2i64 V128:$Rd), (v2i32 V64:$Rn), (v2i32 V64:$Rm))),
-            (INST2S  V128:$Rd, V64:$Rn, V64:$Rm)>;
-}
-
-defm : Neon_mulacc_widen_patterns<
-  TriOpFrag<(add node:$LHS, (AArch64smull node:$MHS, node:$RHS))>,
-  SMLALv8i8_v8i16, SMLALv4i16_v4i32, SMLALv2i32_v2i64>;
-defm : Neon_mulacc_widen_patterns<
-  TriOpFrag<(add node:$LHS, (AArch64umull node:$MHS, node:$RHS))>,
-  UMLALv8i8_v8i16, UMLALv4i16_v4i32, UMLALv2i32_v2i64>;
-defm : Neon_mulacc_widen_patterns<
-  TriOpFrag<(sub node:$LHS, (AArch64smull node:$MHS, node:$RHS))>,
-  SMLSLv8i8_v8i16, SMLSLv4i16_v4i32, SMLSLv2i32_v2i64>;
-defm : Neon_mulacc_widen_patterns<
-  TriOpFrag<(sub node:$LHS, (AArch64umull node:$MHS, node:$RHS))>,
-  UMLSLv8i8_v8i16, UMLSLv4i16_v4i32, UMLSLv2i32_v2i64>;
-
-// Patterns for 64-bit pmull
-def : Pat<(int_aarch64_neon_pmull64 V64:$Rn, V64:$Rm),
-          (PMULLv1i64 V64:$Rn, V64:$Rm)>;
-def : Pat<(int_aarch64_neon_pmull64 (extractelt (v2i64 V128:$Rn), (i64 1)),
-                                    (extractelt (v2i64 V128:$Rm), (i64 1))),
-          (PMULLv2i64 V128:$Rn, V128:$Rm)>;
-
 // CodeGen patterns for addhn and subhn instructions, which can actually be
 // written in LLVM IR without too much difficulty.
 
+// Prioritize ADDHN and SUBHN over UZP2.
+let AddedComplexity = 10 in {
+
 // ADDHN
 def : Pat<(v8i8 (trunc (v8i16 (AArch64vlshr (add V128:$Rn, V128:$Rm), (i32 8))))),
           (ADDHNv8i16_v8i8 V128:$Rn, V128:$Rm)>;
@@ -5139,6 +5533,8 @@ def : Pat<(concat_vectors (v2i32 V64:$Rd),
           (SUBHNv2i64_v4i32 (SUBREG_TO_REG (i32 0), V64:$Rd, dsub),
                             V128:$Rn, V128:$Rm)>;
 
+} // AddedComplexity = 10
+
 //----------------------------------------------------------------------------
 // AdvSIMD bitwise extract from vector instruction.
 //----------------------------------------------------------------------------
@@ -5195,6 +5591,29 @@ defm UZP2 : SIMDZipVector<0b101, "uzp2", AArch64uzp2>;
 defm ZIP1 : SIMDZipVector<0b011, "zip1", AArch64zip1>;
 defm ZIP2 : SIMDZipVector<0b111, "zip2", AArch64zip2>;
 
+def : Pat<(v16i8 (concat_vectors (v8i8 (trunc (v8i16 V128:$Vn))),
+                                 (v8i8 (trunc (v8i16 V128:$Vm))))),
+          (UZP1v16i8 V128:$Vn, V128:$Vm)>;
+def : Pat<(v8i16 (concat_vectors (v4i16 (trunc (v4i32 V128:$Vn))),
+                                 (v4i16 (trunc (v4i32 V128:$Vm))))),
+          (UZP1v8i16 V128:$Vn, V128:$Vm)>;
+def : Pat<(v4i32 (concat_vectors (v2i32 (trunc (v2i64 V128:$Vn))),
+                                 (v2i32 (trunc (v2i64 V128:$Vm))))),
+          (UZP1v4i32 V128:$Vn, V128:$Vm)>;
+
+def : Pat<(v16i8 (concat_vectors
+                 (v8i8 (trunc (AArch64vlshr (v8i16 V128:$Vn), (i32 8)))),
+                 (v8i8 (trunc (AArch64vlshr (v8i16 V128:$Vm), (i32 8)))))),
+          (UZP2v16i8 V128:$Vn, V128:$Vm)>;
+def : Pat<(v8i16 (concat_vectors
+                 (v4i16 (trunc (AArch64vlshr (v4i32 V128:$Vn), (i32 16)))),
+                 (v4i16 (trunc (AArch64vlshr (v4i32 V128:$Vm), (i32 16)))))),
+          (UZP2v8i16 V128:$Vn, V128:$Vm)>;
+def : Pat<(v4i32 (concat_vectors
+                 (v2i32 (trunc (AArch64vlshr (v2i64 V128:$Vn), (i32 32)))),
+                 (v2i32 (trunc (AArch64vlshr (v2i64 V128:$Vm), (i32 32)))))),
+          (UZP2v4i32 V128:$Vn, V128:$Vm)>;
+
 //----------------------------------------------------------------------------
 // AdvSIMD TBL/TBX instructions
 //----------------------------------------------------------------------------
@@ -5216,10 +5635,10 @@ def : Pat<(v16i8 (int_aarch64_neon_tbx1 (v16i8 V128:$Rd),
 
 
 //----------------------------------------------------------------------------
-// AdvSIMD scalar CPY instruction
+// AdvSIMD scalar DUP instruction
 //----------------------------------------------------------------------------
 
-defm CPY : SIMDScalarCPY<"cpy">;
+defm DUP : SIMDScalarDUP<"mov">;
 
 //----------------------------------------------------------------------------
 // AdvSIMD scalar pairwise instructions
@@ -5232,19 +5651,22 @@ defm FMAXP   : SIMDFPPairwiseScalar<0, 0b01111, "fmaxp">;
 defm FMINNMP : SIMDFPPairwiseScalar<1, 0b01100, "fminnmp">;
 defm FMINP   : SIMDFPPairwiseScalar<1, 0b01111, "fminp">;
 
+// Only the lower half of the result of the inner FADDP is used in the patterns
+// below, so the second operand does not matter. Re-use the first input
+// operand, so no additional dependencies need to be introduced.
 let Predicates = [HasFullFP16] in {
 def : Pat<(f16 (vecreduce_fadd (v8f16 V128:$Rn))),
             (FADDPv2i16p
               (EXTRACT_SUBREG
-                 (FADDPv8f16 (FADDPv8f16 V128:$Rn, (v8f16 (IMPLICIT_DEF))), (v8f16 (IMPLICIT_DEF))),
+                 (FADDPv8f16 (FADDPv8f16 V128:$Rn, V128:$Rn), V128:$Rn),
                dsub))>;
 def : Pat<(f16 (vecreduce_fadd (v4f16 V64:$Rn))),
-          (FADDPv2i16p (FADDPv4f16 V64:$Rn, (v4f16 (IMPLICIT_DEF))))>;
+          (FADDPv2i16p (FADDPv4f16 V64:$Rn, V64:$Rn))>;
 }
 def : Pat<(f32 (vecreduce_fadd (v4f32 V128:$Rn))),
           (FADDPv2i32p
             (EXTRACT_SUBREG
-              (FADDPv4f32 V128:$Rn, (v4f32 (IMPLICIT_DEF))),
+              (FADDPv4f32 V128:$Rn, V128:$Rn),
              dsub))>;
 def : Pat<(f32 (vecreduce_fadd (v2f32 V64:$Rn))),
           (FADDPv2i32p V64:$Rn)>;
@@ -5453,6 +5875,10 @@ def : Pat<(v8i8 (scalar_to_vector GPR32:$Rn)),
           (SUBREG_TO_REG (i32 0),
                          (f32 (COPY_TO_REGCLASS GPR32:$Rn, FPR32)), ssub)>;
 
+// The top bits will be zero from the FMOVWSr
+def : Pat<(v8i8 (bitconvert (i64 (zext GPR32:$Rn)))),
+          (SUBREG_TO_REG (i32 0), (f32 (FMOVWSr GPR32:$Rn)), ssub)>;
+
 def : Pat<(v8i16 (scalar_to_vector GPR32:$Rn)),
           (SUBREG_TO_REG (i32 0),
                          (f32 (COPY_TO_REGCLASS GPR32:$Rn, FPR32)), ssub)>;
@@ -5628,9 +6054,26 @@ defm : Neon_INS_elt_pattern<v8bf16, v4bf16, bf16, INSvi16lane>;
 defm : Neon_INS_elt_pattern<v4f32, v2f32, f32, INSvi32lane>;
 defm : Neon_INS_elt_pattern<v2f64, v1f64, f64, INSvi64lane>;
 
+// Insert from bitcast
+// vector_insert(bitcast(f32 src), n, lane) -> INSvi32lane(src, lane, INSERT_SUBREG(-, n), 0)
+def : Pat<(v4i32 (vector_insert v4i32:$src, (i32 (bitconvert (f32 FPR32:$Sn))), imm:$Immd)),
+          (INSvi32lane V128:$src, imm:$Immd, (INSERT_SUBREG (IMPLICIT_DEF), FPR32:$Sn, ssub), 0)>;
+def : Pat<(v2i64 (vector_insert v2i64:$src, (i64 (bitconvert (f64 FPR64:$Sn))), imm:$Immd)),
+          (INSvi64lane V128:$src, imm:$Immd, (INSERT_SUBREG (IMPLICIT_DEF), FPR64:$Sn, dsub), 0)>;
+
+// bitcast of an extract
+// f32 bitcast(vector_extract(v4i32 src, lane)) -> EXTRACT_SUBREG(INSvi32lane(-, 0, src, lane))
+def : Pat<(f32 (bitconvert (i32 (vector_extract v4i32:$src, imm:$Immd)))),
+          (EXTRACT_SUBREG (INSvi32lane (IMPLICIT_DEF), 0, V128:$src, imm:$Immd), ssub)>;
+def : Pat<(f32 (bitconvert (i32 (vector_extract v4i32:$src, 0)))),
+          (EXTRACT_SUBREG V128:$src, ssub)>;
+def : Pat<(f64 (bitconvert (i64 (vector_extract v2i64:$src, imm:$Immd)))),
+          (EXTRACT_SUBREG (INSvi64lane (IMPLICIT_DEF), 0, V128:$src, imm:$Immd), dsub)>;
+def : Pat<(f64 (bitconvert (i64 (vector_extract v2i64:$src, 0)))),
+          (EXTRACT_SUBREG V128:$src, dsub)>;
 
 // Floating point vector extractions are codegen'd as either a sequence of
-// subregister extractions, or a MOV (aka CPY here, alias for DUP) if
+// subregister extractions, or a MOV (aka DUP here) if
 // the lane number is anything other than zero.
 def : Pat<(vector_extract (v2f64 V128:$Rn), 0),
           (f64 (EXTRACT_SUBREG V128:$Rn, dsub))>;
@@ -5643,13 +6086,13 @@ def : Pat<(vector_extract (v8bf16 V128:$Rn), 0),
 
 
 def : Pat<(vector_extract (v2f64 V128:$Rn), VectorIndexD:$idx),
-          (f64 (CPYi64 V128:$Rn, VectorIndexD:$idx))>;
+          (f64 (DUPi64 V128:$Rn, VectorIndexD:$idx))>;
 def : Pat<(vector_extract (v4f32 V128:$Rn), VectorIndexS:$idx),
-          (f32 (CPYi32 V128:$Rn, VectorIndexS:$idx))>;
+          (f32 (DUPi32 V128:$Rn, VectorIndexS:$idx))>;
 def : Pat<(vector_extract (v8f16 V128:$Rn), VectorIndexH:$idx),
-          (f16 (CPYi16 V128:$Rn, VectorIndexH:$idx))>;
+          (f16 (DUPi16 V128:$Rn, VectorIndexH:$idx))>;
 def : Pat<(vector_extract (v8bf16 V128:$Rn), VectorIndexH:$idx),
-          (bf16 (CPYi16 V128:$Rn, VectorIndexH:$idx))>;
+          (bf16 (DUPi16 V128:$Rn, VectorIndexH:$idx))>;
 
 // All concat_vectors operations are canonicalised to act on i64 vectors for
 // AArch64. In the general case we need an instruction, which had just as well be
@@ -5696,24 +6139,28 @@ defm FMAXV   : SIMDFPAcrossLanes<0b01111, 0, "fmaxv", int_aarch64_neon_fmaxv>;
 defm FMINNMV : SIMDFPAcrossLanes<0b01100, 1, "fminnmv", int_aarch64_neon_fminnmv>;
 defm FMINV   : SIMDFPAcrossLanes<0b01111, 1, "fminv", int_aarch64_neon_fminv>;
 
-// Patterns for uaddv(uaddlp(x)) ==> uaddlv
-def : Pat<(i32 (vector_extract (v8i16 (insert_subvector undef,
-            (v4i16 (AArch64uaddv (v4i16 (AArch64uaddlp (v8i8 V64:$op))))),
-            (i64 0))), (i64 0))),
-          (EXTRACT_SUBREG (INSERT_SUBREG (v4i16 (IMPLICIT_DEF)),
-           (UADDLVv4i16v V64:$op), ssub), ssub)>;
-def : Pat<(i32 (vector_extract (v8i16 (AArch64uaddv (v8i16 (AArch64uaddlp
-           (v16i8 V128:$op))))), (i64 0))),
-          (EXTRACT_SUBREG (INSERT_SUBREG (v8i16 (IMPLICIT_DEF)),
-           (UADDLVv16i8v V128:$op), hsub), ssub)>;
-def : Pat<(v4i32 (AArch64uaddv (v4i32 (AArch64uaddlp (v8i16 V128:$op))))),
-          (INSERT_SUBREG (v4i32 (IMPLICIT_DEF)), (UADDLVv8i16v V128:$op), ssub)>;
-
-// Patterns for addp(uaddlp(x))) ==> uaddlv
-def : Pat<(v2i32 (AArch64uaddv (v2i32 (AArch64uaddlp (v4i16 V64:$op))))),
-          (INSERT_SUBREG (v2i32 (IMPLICIT_DEF)), (UADDLVv4i16v V64:$op), ssub)>;
-def : Pat<(v2i64 (AArch64uaddv (v2i64 (AArch64uaddlp (v4i32 V128:$op))))),
-          (INSERT_SUBREG (v2i64 (IMPLICIT_DEF)), (UADDLVv4i32v V128:$op), dsub)>;
+multiclass SIMDAcrossLaneLongPairIntrinsic<string Opc, SDPatternOperator addlp> {
+  // Patterns for addv(addlp(x)) ==> addlv
+  def : Pat<(i32 (vector_extract (v8i16 (insert_subvector undef,
+              (v4i16 (AArch64uaddv (v4i16 (addlp (v8i8 V64:$op))))),
+              (i64 0))), (i64 0))),
+            (EXTRACT_SUBREG (INSERT_SUBREG (v4i16 (IMPLICIT_DEF)),
+              (!cast<Instruction>(Opc#"v8i8v") V64:$op), hsub), ssub)>;
+  def : Pat<(i32 (vector_extract (v8i16 (AArch64uaddv (v8i16 (addlp (v16i8 V128:$op))))), (i64 0))),
+            (EXTRACT_SUBREG (INSERT_SUBREG (v8i16 (IMPLICIT_DEF)),
+              (!cast<Instruction>(Opc#"v16i8v") V128:$op), hsub), ssub)>;
+  def : Pat<(v4i32 (AArch64uaddv (v4i32 (addlp (v8i16 V128:$op))))),
+            (INSERT_SUBREG (v4i32 (IMPLICIT_DEF)), (!cast<Instruction>(Opc#"v8i16v") V128:$op), ssub)>;
+
+  // Patterns for addp(addlp(x))) ==> addlv
+  def : Pat<(v2i32 (AArch64uaddv (v2i32 (addlp (v4i16 V64:$op))))),
+            (INSERT_SUBREG (v2i32 (IMPLICIT_DEF)), (!cast<Instruction>(Opc#"v4i16v") V64:$op), ssub)>;
+  def : Pat<(v2i64 (AArch64uaddv (v2i64 (addlp (v4i32 V128:$op))))),
+            (INSERT_SUBREG (v2i64 (IMPLICIT_DEF)), (!cast<Instruction>(Opc#"v4i32v") V128:$op), dsub)>;
+}
+
+defm : SIMDAcrossLaneLongPairIntrinsic<"UADDLV", AArch64uaddlp>;
+defm : SIMDAcrossLaneLongPairIntrinsic<"SADDLV", AArch64saddlp>;
 
 // Patterns for across-vector intrinsics, that have a node equivalent, that
 // returns a vector (with only the low lane defined) instead of a scalar.
@@ -6025,6 +6472,14 @@ def : Pat<(v8i8  immAllOnesV), (EXTRACT_SUBREG (MOVIv2d_ns (i32 255)), dsub)>;
 let isReMaterializable = 1, isAsCheapAsAMove = 1 in
 defm MOVI      : SIMDModifiedImmVectorShift<0, 0b10, 0b00, "movi">;
 
+let Predicates = [HasNEON] in {
+  // Using the MOVI to materialize fp constants.
+  def : Pat<(f32 fpimm32SIMDModImmType4:$in),
+            (EXTRACT_SUBREG (MOVIv2i32 (fpimm32SIMDModImmType4XForm f32:$in),
+                                       (i32 24)),
+                            ssub)>;
+}
+
 def : InstAlias<"movi $Vd.4h, $imm", (MOVIv4i16 V64:$Vd,  imm0_255:$imm, 0), 0>;
 def : InstAlias<"movi $Vd.8h, $imm", (MOVIv8i16 V128:$Vd, imm0_255:$imm, 0), 0>;
 def : InstAlias<"movi $Vd.2s, $imm", (MOVIv2i32 V64:$Vd,  imm0_255:$imm, 0), 0>;
@@ -6113,18 +6568,18 @@ let hasSideEffects = 0 in {
 // On the other hand, there are quite a few valid combinatorial options due to
 // the commutativity of multiplication and the fact that (-x) * y = x * (-y).
 defm : SIMDFPIndexedTiedPatterns<"FMLA",
-           TriOpFrag<(fma node:$RHS, node:$MHS, node:$LHS)>>;
+           TriOpFrag<(any_fma node:$RHS, node:$MHS, node:$LHS)>>;
 defm : SIMDFPIndexedTiedPatterns<"FMLA",
-           TriOpFrag<(fma node:$MHS, node:$RHS, node:$LHS)>>;
+           TriOpFrag<(any_fma node:$MHS, node:$RHS, node:$LHS)>>;
 
 defm : SIMDFPIndexedTiedPatterns<"FMLS",
-           TriOpFrag<(fma node:$MHS, (fneg node:$RHS), node:$LHS)> >;
+           TriOpFrag<(any_fma node:$MHS, (fneg node:$RHS), node:$LHS)> >;
 defm : SIMDFPIndexedTiedPatterns<"FMLS",
-           TriOpFrag<(fma node:$RHS, (fneg node:$MHS), node:$LHS)> >;
+           TriOpFrag<(any_fma node:$RHS, (fneg node:$MHS), node:$LHS)> >;
 defm : SIMDFPIndexedTiedPatterns<"FMLS",
-           TriOpFrag<(fma (fneg node:$RHS), node:$MHS, node:$LHS)> >;
+           TriOpFrag<(any_fma (fneg node:$RHS), node:$MHS, node:$LHS)> >;
 defm : SIMDFPIndexedTiedPatterns<"FMLS",
-           TriOpFrag<(fma (fneg node:$MHS), node:$RHS, node:$LHS)> >;
+           TriOpFrag<(any_fma (fneg node:$MHS), node:$RHS, node:$LHS)> >;
 
 multiclass FMLSIndexedAfterNegPatterns<SDPatternOperator OpNode> {
   // 3 variants for the .2s version: DUPLANE from 128-bit, DUPLANE from 64-bit
@@ -6203,22 +6658,22 @@ multiclass FMLSIndexedAfterNegPatterns<SDPatternOperator OpNode> {
 }
 
 defm : FMLSIndexedAfterNegPatterns<
-           TriOpFrag<(fma node:$RHS, node:$MHS, node:$LHS)> >;
+           TriOpFrag<(any_fma node:$RHS, node:$MHS, node:$LHS)> >;
 defm : FMLSIndexedAfterNegPatterns<
-           TriOpFrag<(fma node:$MHS, node:$RHS, node:$LHS)> >;
+           TriOpFrag<(any_fma node:$MHS, node:$RHS, node:$LHS)> >;
 
 defm FMULX : SIMDFPIndexed<1, 0b1001, "fmulx", int_aarch64_neon_fmulx>;
-defm FMUL  : SIMDFPIndexed<0, 0b1001, "fmul", fmul>;
+defm FMUL  : SIMDFPIndexed<0, 0b1001, "fmul", any_fmul>;
 
-def : Pat<(v2f32 (fmul V64:$Rn, (AArch64dup (f32 FPR32:$Rm)))),
+def : Pat<(v2f32 (any_fmul V64:$Rn, (AArch64dup (f32 FPR32:$Rm)))),
           (FMULv2i32_indexed V64:$Rn,
             (INSERT_SUBREG (v4i32 (IMPLICIT_DEF)), FPR32:$Rm, ssub),
             (i64 0))>;
-def : Pat<(v4f32 (fmul V128:$Rn, (AArch64dup (f32 FPR32:$Rm)))),
+def : Pat<(v4f32 (any_fmul V128:$Rn, (AArch64dup (f32 FPR32:$Rm)))),
           (FMULv4i32_indexed V128:$Rn,
             (INSERT_SUBREG (v4i32 (IMPLICIT_DEF)), FPR32:$Rm, ssub),
             (i64 0))>;
-def : Pat<(v2f64 (fmul V128:$Rn, (AArch64dup (f64 FPR64:$Rm)))),
+def : Pat<(v2f64 (any_fmul V128:$Rn, (AArch64dup (f64 FPR64:$Rm)))),
           (FMULv2i64_indexed V128:$Rn,
             (INSERT_SUBREG (v4i32 (IMPLICIT_DEF)), FPR64:$Rm, dsub),
             (i64 0))>;
@@ -6237,26 +6692,24 @@ defm MLS   : SIMDVectorIndexedHSTied<1, 0b0100, "mls", null_frag>;
 
 defm MUL   : SIMDVectorIndexedHS<0, 0b1000, "mul", mul>;
 defm SMLAL : SIMDVectorIndexedLongSDTied<0, 0b0010, "smlal",
-    TriOpFrag<(add node:$LHS, (int_aarch64_neon_smull node:$MHS, node:$RHS))>>;
+    TriOpFrag<(add node:$LHS, (AArch64smull node:$MHS, node:$RHS))>>;
 defm SMLSL : SIMDVectorIndexedLongSDTied<0, 0b0110, "smlsl",
-    TriOpFrag<(sub node:$LHS, (int_aarch64_neon_smull node:$MHS, node:$RHS))>>;
-defm SMULL : SIMDVectorIndexedLongSD<0, 0b1010, "smull",
-                int_aarch64_neon_smull>;
+    TriOpFrag<(sub node:$LHS, (AArch64smull node:$MHS, node:$RHS))>>;
+defm SMULL : SIMDVectorIndexedLongSD<0, 0b1010, "smull", AArch64smull>;
 defm SQDMLAL : SIMDIndexedLongSQDMLXSDTied<0, 0b0011, "sqdmlal",
                                            int_aarch64_neon_sqadd>;
 defm SQDMLSL : SIMDIndexedLongSQDMLXSDTied<0, 0b0111, "sqdmlsl",
                                            int_aarch64_neon_sqsub>;
 defm SQRDMLAH : SIMDIndexedSQRDMLxHSDTied<1, 0b1101, "sqrdmlah",
-                                          int_aarch64_neon_sqadd>;
+                                          int_aarch64_neon_sqrdmlah>;
 defm SQRDMLSH : SIMDIndexedSQRDMLxHSDTied<1, 0b1111, "sqrdmlsh",
-                                          int_aarch64_neon_sqsub>;
+                                          int_aarch64_neon_sqrdmlsh>;
 defm SQDMULL : SIMDIndexedLongSD<0, 0b1011, "sqdmull", int_aarch64_neon_sqdmull>;
 defm UMLAL   : SIMDVectorIndexedLongSDTied<1, 0b0010, "umlal",
-    TriOpFrag<(add node:$LHS, (int_aarch64_neon_umull node:$MHS, node:$RHS))>>;
+    TriOpFrag<(add node:$LHS, (AArch64umull node:$MHS, node:$RHS))>>;
 defm UMLSL   : SIMDVectorIndexedLongSDTied<1, 0b0110, "umlsl",
-    TriOpFrag<(sub node:$LHS, (int_aarch64_neon_umull node:$MHS, node:$RHS))>>;
-defm UMULL   : SIMDVectorIndexedLongSD<1, 0b1010, "umull",
-                int_aarch64_neon_umull>;
+    TriOpFrag<(sub node:$LHS, (AArch64umull node:$MHS, node:$RHS))>>;
+defm UMULL   : SIMDVectorIndexedLongSD<1, 0b1010, "umull", AArch64umull>;
 
 // A scalar sqdmull with the second operand being a vector lane can be
 // handled directly with the indexed instruction encoding.
@@ -6304,7 +6757,7 @@ def : Pat<(v1f64 (int_aarch64_neon_vcvtfxu2fp (v1i64 FPR64:$Rn),
 def : Pat<(int_aarch64_neon_vcvtfxs2fp FPR32:$Rn, vecshiftR32:$imm),
           (SCVTFs FPR32:$Rn, vecshiftR32:$imm)>;
 
-// Patterns for FP16 Instrinsics - requires reg copy to/from as i16s not supported.
+// Patterns for FP16 Intrinsics - requires reg copy to/from as i16s not supported.
 
 def : Pat<(f16 (int_aarch64_neon_vcvtfxs2fp (i32 (sext_inreg FPR32:$Rn, i16)), vecshiftR16:$imm)),
           (SCVTFh (EXTRACT_SUBREG FPR32:$Rn, hsub), vecshiftR16:$imm)>;
@@ -6370,7 +6823,7 @@ defm SRSRA    : SIMDScalarRShiftDTied<   0, 0b00110, "srsra",
                    (AArch64srshri node:$MHS, node:$RHS))>>;
 defm SSHR     : SIMDScalarRShiftD<   0, 0b00000, "sshr", AArch64vashr>;
 defm SSRA     : SIMDScalarRShiftDTied<   0, 0b00010, "ssra",
-    TriOpFrag<(add node:$LHS,
+    TriOpFrag<(add_and_or_is_add node:$LHS,
                    (AArch64vashr node:$MHS, node:$RHS))>>;
 defm UQRSHRN  : SIMDScalarRShiftBHS< 1, 0b10011, "uqrshrn",
                                      int_aarch64_neon_uqrshrn>;
@@ -6383,7 +6836,7 @@ defm URSRA    : SIMDScalarRShiftDTied<   1, 0b00110, "ursra",
                    (AArch64urshri node:$MHS, node:$RHS))>>;
 defm USHR     : SIMDScalarRShiftD<   1, 0b00000, "ushr", AArch64vlshr>;
 defm USRA     : SIMDScalarRShiftDTied<   1, 0b00010, "usra",
-    TriOpFrag<(add node:$LHS,
+    TriOpFrag<(add_and_or_is_add node:$LHS,
                    (AArch64vlshr node:$MHS, node:$RHS))>>;
 
 //----------------------------------------------------------------------------
@@ -6394,7 +6847,7 @@ defm FCVTZU:SIMDVectorRShiftSD<1, 0b11111, "fcvtzu", int_aarch64_neon_vcvtfp2fxu
 defm SCVTF: SIMDVectorRShiftToFP<0, 0b11100, "scvtf",
                                    int_aarch64_neon_vcvtfxs2fp>;
 defm RSHRN   : SIMDVectorRShiftNarrowBHS<0, 0b10001, "rshrn",
-                                         int_aarch64_neon_rshrn>;
+                          BinOpFrag<(trunc (AArch64roundingvlshr node:$LHS, node:$RHS))>>;
 defm SHL     : SIMDVectorLShiftBHSD<0, 0b01010, "shl", AArch64vshl>;
 defm SHRN    : SIMDVectorRShiftNarrowBHS<0, 0b10000, "shrn",
                           BinOpFrag<(trunc (AArch64vashr node:$LHS, node:$RHS))>>;
@@ -6425,7 +6878,7 @@ defm SSHLL   : SIMDVectorLShiftLongBHSD<0, 0b10100, "sshll",
 
 defm SSHR    : SIMDVectorRShiftBHSD<0, 0b00000, "sshr", AArch64vashr>;
 defm SSRA    : SIMDVectorRShiftBHSDTied<0, 0b00010, "ssra",
-                TriOpFrag<(add node:$LHS, (AArch64vashr node:$MHS, node:$RHS))>>;
+                TriOpFrag<(add_and_or_is_add node:$LHS, (AArch64vashr node:$MHS, node:$RHS))>>;
 defm UCVTF   : SIMDVectorRShiftToFP<1, 0b11100, "ucvtf",
                         int_aarch64_neon_vcvtfxu2fp>;
 defm UQRSHRN : SIMDVectorRShiftNarrowBHS<1, 0b10011, "uqrshrn",
@@ -6441,7 +6894,37 @@ defm USHLL   : SIMDVectorLShiftLongBHSD<1, 0b10100, "ushll",
                 BinOpFrag<(AArch64vshl (zext node:$LHS), node:$RHS)>>;
 defm USHR    : SIMDVectorRShiftBHSD<1, 0b00000, "ushr", AArch64vlshr>;
 defm USRA    : SIMDVectorRShiftBHSDTied<1, 0b00010, "usra",
-                TriOpFrag<(add node:$LHS, (AArch64vlshr node:$MHS, node:$RHS))> >;
+                TriOpFrag<(add_and_or_is_add node:$LHS, (AArch64vlshr node:$MHS, node:$RHS))> >;
+
+// RADDHN patterns for when RSHRN shifts by half the size of the vector element
+def : Pat<(v8i8 (trunc (AArch64vlshr (add (v8i16 V128:$Vn), (AArch64movi_shift (i32 128), (i32 0))), (i32 8)))),
+          (RADDHNv8i16_v8i8 V128:$Vn, (v8i16 (MOVIv2d_ns (i32 0))))>;
+def : Pat<(v4i16 (trunc (AArch64vlshr (add (v4i32 V128:$Vn), (AArch64movi_shift (i32 128), (i32 8))), (i32 16)))),
+          (RADDHNv4i32_v4i16 V128:$Vn, (v4i32 (MOVIv2d_ns (i32 0))))>;
+let AddedComplexity = 5 in
+def : Pat<(v2i32 (trunc (AArch64vlshr (add (v2i64 V128:$Vn), (AArch64dup (i64 2147483648))), (i32 32)))),
+          (RADDHNv2i64_v2i32 V128:$Vn, (v2i64 (MOVIv2d_ns (i32 0))))>;
+
+// RADDHN2 patterns for when RSHRN shifts by half the size of the vector element
+def : Pat<(v16i8 (concat_vectors
+                 (v8i8 V64:$Vd),
+                 (v8i8 (trunc (AArch64vlshr (add (v8i16 V128:$Vn), (AArch64movi_shift (i32 128), (i32 0))), (i32 8)))))),
+          (RADDHNv8i16_v16i8
+                 (INSERT_SUBREG (IMPLICIT_DEF), V64:$Vd, dsub), V128:$Vn,
+                 (v8i16 (MOVIv2d_ns (i32 0))))>;
+def : Pat<(v8i16 (concat_vectors
+                 (v4i16 V64:$Vd),
+                 (v4i16 (trunc (AArch64vlshr (add (v4i32 V128:$Vn), (AArch64movi_shift (i32 128), (i32 8))), (i32 16)))))),
+          (RADDHNv4i32_v8i16
+                 (INSERT_SUBREG (IMPLICIT_DEF), V64:$Vd, dsub), V128:$Vn,
+                 (v4i32 (MOVIv2d_ns (i32 0))))>;
+let AddedComplexity = 5 in
+def : Pat<(v4i32 (concat_vectors
+                 (v2i32 V64:$Vd),
+                 (v2i32 (trunc (AArch64vlshr (add (v2i64 V128:$Vn), (AArch64dup (i64 2147483648))), (i32 32)))))),
+          (RADDHNv2i64_v4i32
+                 (INSERT_SUBREG (IMPLICIT_DEF), V64:$Vd, dsub), V128:$Vn,
+                 (v2i64 (MOVIv2d_ns (i32 0))))>;
 
 // SHRN patterns for when a logical right shift was used instead of arithmetic
 // (the immediate guarantees no sign bits actually end up in the result so it
@@ -6583,7 +7066,7 @@ class SExtLoadi8CVTf32Pat<dag addrmode, dag INST>
                                   dsub)),
                                0),
                              ssub)))>,
-    Requires<[NotForCodeSize, UseAlternateSExtLoadCVTF32]>;
+    Requires<[NotForCodeSize, UseAlternateSExtLoadCVTF32, HasNEON]>;
 
 def : SExtLoadi8CVTf32Pat<(ro8.Wpat GPR64sp:$Rn, GPR32:$Rm, ro8.Wext:$ext),
                           (LDRBroW  GPR64sp:$Rn, GPR32:$Rm, ro8.Wext:$ext)>;
@@ -6603,7 +7086,8 @@ class SExtLoadi16CVTf32Pat<dag addrmode, dag INST>
                                   INST,
                                   hsub),
                                 0),
-                            ssub)))>, Requires<[NotForCodeSize]>;
+                            ssub)))>,
+    Requires<[NotForCodeSize, UseAlternateSExtLoadCVTF32, HasNEON]>;
 
 def : SExtLoadi16CVTf32Pat<(ro16.Wpat GPR64sp:$Rn, GPR32:$Rm, ro16.Wext:$ext),
                            (LDRHroW   GPR64sp:$Rn, GPR32:$Rm, ro16.Wext:$ext)>;
@@ -6637,7 +7121,7 @@ class SExtLoadi16CVTf64Pat<dag addrmode, dag INST>
                                    dsub)),
                                0),
                              dsub)))>,
-    Requires<[NotForCodeSize, UseAlternateSExtLoadCVTF32]>;
+    Requires<[NotForCodeSize, UseAlternateSExtLoadCVTF32, HasNEON]>;
 
 def : SExtLoadi16CVTf64Pat<(ro16.Wpat GPR64sp:$Rn, GPR32:$Rm, ro16.Wext:$ext),
                            (LDRHroW GPR64sp:$Rn, GPR32:$Rm, ro16.Wext:$ext)>;
@@ -6656,7 +7140,8 @@ class SExtLoadi32CVTf64Pat<dag addrmode, dag INST>
                                   INST,
                                   ssub),
                                0),
-                             dsub)))>, Requires<[NotForCodeSize]>;
+                             dsub)))>,
+    Requires<[NotForCodeSize, UseAlternateSExtLoadCVTF32, HasNEON]>;
 
 def : SExtLoadi32CVTf64Pat<(ro32.Wpat GPR64sp:$Rn, GPR32:$Rm, ro32.Wext:$ext),
                            (LDRSroW GPR64sp:$Rn, GPR32:$Rm, ro32.Wext:$ext)>;
@@ -6815,16 +7300,17 @@ def : Ld1Lane128IdxOpPat<extloadi8, VectorIndexH, v8i16, i32, LD1i8, VectorIndex
 
 // Same as above, but the first element is populated using
 // scalar_to_vector + insert_subvector instead of insert_vector_elt.
-class Ld1Lane128FirstElm<ValueType ResultTy, ValueType VecTy,
-                        SDPatternOperator ExtLoad, Instruction LD1>
-  : Pat<(ResultTy (scalar_to_vector (i32 (ExtLoad GPR64sp:$Rn)))),
-          (ResultTy (EXTRACT_SUBREG
-            (LD1 (VecTy (IMPLICIT_DEF)), 0, GPR64sp:$Rn), dsub))>;
-
-def : Ld1Lane128FirstElm<v2i32, v8i16, extloadi16, LD1i16>;
-def : Ld1Lane128FirstElm<v2i32, v16i8, extloadi8, LD1i8>;
-def : Ld1Lane128FirstElm<v4i16, v16i8, extloadi8, LD1i8>;
+let Predicates = [NotInStreamingSVEMode] in {
+  class Ld1Lane128FirstElm<ValueType ResultTy, ValueType VecTy,
+                          SDPatternOperator ExtLoad, Instruction LD1>
+    : Pat<(ResultTy (scalar_to_vector (i32 (ExtLoad GPR64sp:$Rn)))),
+            (ResultTy (EXTRACT_SUBREG
+              (LD1 (VecTy (IMPLICIT_DEF)), 0, GPR64sp:$Rn), dsub))>;
 
+  def : Ld1Lane128FirstElm<v2i32, v8i16, extloadi16, LD1i16>;
+  def : Ld1Lane128FirstElm<v2i32, v16i8, extloadi8, LD1i8>;
+  def : Ld1Lane128FirstElm<v4i16, v16i8, extloadi8, LD1i8>;
+}
 class Ld1Lane64Pat<SDPatternOperator scalar_load, Operand VecIndex,
                    ValueType VTy, ValueType STy, Instruction LD1>
   : Pat<(vector_insert (VTy VecListOne64:$Rd),
@@ -6972,9 +7458,9 @@ def AESIMCrr : AESInst<    0b0111, "aesimc", int_aarch64_crypto_aesimc>;
 // for AES fusion on some CPUs.
 let hasSideEffects = 0, mayStore = 0, mayLoad = 0 in {
 def AESMCrrTied: Pseudo<(outs V128:$Rd), (ins V128:$Rn), [], "$Rn = $Rd">,
-                        Sched<[WriteV]>;
+                        Sched<[WriteVq]>;
 def AESIMCrrTied: Pseudo<(outs V128:$Rd), (ins V128:$Rn), [], "$Rn = $Rd">,
-                         Sched<[WriteV]>;
+                         Sched<[WriteVq]>;
 }
 
 // Only use constrained versions of AES(I)MC instructions if they are paired with
@@ -7012,14 +7498,6 @@ def SHA256SU0rr : SHATiedInstVV<0b0010, "sha256su0",int_aarch64_crypto_sha256su0
 //----------------------------------------------------------------------------
 // FIXME: Like for X86, these should go in their own separate .td file.
 
-def def32 : PatLeaf<(i32 GPR32:$src), [{
-  return isDef32(*N);
-}]>;
-
-// In the case of a 32-bit def that is known to implicitly zero-extend,
-// we can use a SUBREG_TO_REG.
-def : Pat<(i64 (zext def32:$src)), (SUBREG_TO_REG (i64 0), GPR32:$src, sub_32)>;
-
 // For an anyext, we don't care what the high bits are, so we can perform an
 // INSERT_SUBREF into an IMPLICIT_DEF.
 def : Pat<(i64 (anyext GPR32:$src)),
@@ -7061,6 +7539,11 @@ def : Pat<(shl (i64 (sext GPR32:$Rn)), (i64 imm0_63:$imm)),
                    (i64 (i64shift_a        imm0_63:$imm)),
                    (i64 (i64shift_sext_i32 imm0_63:$imm)))>;
 
+def : Pat<(shl (i64 (zext GPR32:$Rn)), (i64 imm0_63:$imm)),
+          (UBFMXri (INSERT_SUBREG (i64 (IMPLICIT_DEF)), GPR32:$Rn, sub_32),
+                   (i64 (i64shift_a        imm0_63:$imm)),
+                   (i64 (i64shift_sext_i32 imm0_63:$imm)))>;
+
 // sra patterns have an AddedComplexity of 10, so make sure we have a higher
 // AddedComplexity for the following patterns since we want to match sext + sra
 // patterns before we attempt to match a single sra node.
@@ -7183,99 +7666,16 @@ def : Pat<(v4i32 (mulhu V128:$Rn, V128:$Rm)),
 //
 
 // Natural vector casts (64 bit)
-def : Pat<(v8i8 (AArch64NvCast (v2i32 FPR64:$src))), (v8i8 FPR64:$src)>;
-def : Pat<(v4i16 (AArch64NvCast (v2i32 FPR64:$src))), (v4i16 FPR64:$src)>;
-def : Pat<(v4f16 (AArch64NvCast (v2i32 FPR64:$src))), (v4f16 FPR64:$src)>;
-def : Pat<(v4bf16 (AArch64NvCast (v2i32 FPR64:$src))), (v4bf16 FPR64:$src)>;
-def : Pat<(v2i32 (AArch64NvCast (v2i32 FPR64:$src))), (v2i32 FPR64:$src)>;
-def : Pat<(v2f32 (AArch64NvCast (v2i32 FPR64:$src))), (v2f32 FPR64:$src)>;
-def : Pat<(v1i64 (AArch64NvCast (v2i32 FPR64:$src))), (v1i64 FPR64:$src)>;
-
-def : Pat<(v8i8 (AArch64NvCast (v4i16 FPR64:$src))), (v8i8 FPR64:$src)>;
-def : Pat<(v4i16 (AArch64NvCast (v4i16 FPR64:$src))), (v4i16 FPR64:$src)>;
-def : Pat<(v4f16 (AArch64NvCast (v4i16 FPR64:$src))), (v4f16 FPR64:$src)>;
-def : Pat<(v4bf16 (AArch64NvCast (v4i16 FPR64:$src))), (v4bf16 FPR64:$src)>;
-def : Pat<(v2i32 (AArch64NvCast (v4i16 FPR64:$src))), (v2i32 FPR64:$src)>;
-def : Pat<(v1i64 (AArch64NvCast (v4i16 FPR64:$src))), (v1i64 FPR64:$src)>;
-
-def : Pat<(v8i8 (AArch64NvCast (v8i8 FPR64:$src))), (v8i8 FPR64:$src)>;
-def : Pat<(v4i16 (AArch64NvCast (v8i8 FPR64:$src))), (v4i16 FPR64:$src)>;
-def : Pat<(v4f16 (AArch64NvCast (v8i8 FPR64:$src))), (v4f16 FPR64:$src)>;
-def : Pat<(v4bf16 (AArch64NvCast (v8i8 FPR64:$src))), (v4bf16 FPR64:$src)>;
-def : Pat<(v2i32 (AArch64NvCast (v8i8 FPR64:$src))), (v2i32 FPR64:$src)>;
-def : Pat<(v2f32 (AArch64NvCast (v8i8 FPR64:$src))), (v2f32 FPR64:$src)>;
-def : Pat<(v1i64 (AArch64NvCast (v8i8 FPR64:$src))), (v1i64 FPR64:$src)>;
-
-def : Pat<(v8i8 (AArch64NvCast (f64 FPR64:$src))), (v8i8 FPR64:$src)>;
-def : Pat<(v4i16 (AArch64NvCast (f64 FPR64:$src))), (v4i16 FPR64:$src)>;
-def : Pat<(v4f16 (AArch64NvCast (f64 FPR64:$src))), (v4f16 FPR64:$src)>;
-def : Pat<(v4bf16 (AArch64NvCast (f64 FPR64:$src))), (v4bf16 FPR64:$src)>;
-def : Pat<(v2i32 (AArch64NvCast (f64 FPR64:$src))), (v2i32 FPR64:$src)>;
-def : Pat<(v2f32 (AArch64NvCast (f64 FPR64:$src))), (v2f32 FPR64:$src)>;
-def : Pat<(v1i64 (AArch64NvCast (f64 FPR64:$src))), (v1i64 FPR64:$src)>;
-def : Pat<(v1f64 (AArch64NvCast (f64 FPR64:$src))), (v1f64 FPR64:$src)>;
-
-def : Pat<(v8i8 (AArch64NvCast (v2f32 FPR64:$src))), (v8i8 FPR64:$src)>;
-def : Pat<(v4i16 (AArch64NvCast (v2f32 FPR64:$src))), (v4i16 FPR64:$src)>;
-def : Pat<(v2i32 (AArch64NvCast (v2f32 FPR64:$src))), (v2i32 FPR64:$src)>;
-def : Pat<(v2f32 (AArch64NvCast (v2f32 FPR64:$src))), (v2f32 FPR64:$src)>;
-def : Pat<(v1i64 (AArch64NvCast (v2f32 FPR64:$src))), (v1i64 FPR64:$src)>;
-def : Pat<(v1f64 (AArch64NvCast (v2f32 FPR64:$src))), (v1f64 FPR64:$src)>;
+foreach VT = [ v8i8, v4i16, v4f16, v4bf16, v2i32, v2f32, v1i64, v1f64, f64 ] in
+  foreach VT2 = [ v8i8, v4i16, v4f16, v4bf16, v2i32, v2f32, v1i64, v1f64, f64 ] in
+    def : Pat<(VT (AArch64NvCast (VT2 FPR64:$src))),
+              (VT FPR64:$src)>;
 
 // Natural vector casts (128 bit)
-def : Pat<(v16i8 (AArch64NvCast (v4i32 FPR128:$src))), (v16i8 FPR128:$src)>;
-def : Pat<(v8i16 (AArch64NvCast (v4i32 FPR128:$src))), (v8i16 FPR128:$src)>;
-def : Pat<(v8f16 (AArch64NvCast (v4i32 FPR128:$src))), (v8f16 FPR128:$src)>;
-def : Pat<(v8bf16 (AArch64NvCast (v4i32 FPR128:$src))), (v8bf16 FPR128:$src)>;
-def : Pat<(v4i32 (AArch64NvCast (v4i32 FPR128:$src))), (v4i32 FPR128:$src)>;
-def : Pat<(v4f32 (AArch64NvCast (v4i32 FPR128:$src))), (v4f32 FPR128:$src)>;
-def : Pat<(v2i64 (AArch64NvCast (v4i32 FPR128:$src))), (v2i64 FPR128:$src)>;
-def : Pat<(v2f64 (AArch64NvCast (v4i32 FPR128:$src))), (v2f64 FPR128:$src)>;
-
-def : Pat<(v16i8 (AArch64NvCast (v8i16 FPR128:$src))), (v16i8 FPR128:$src)>;
-def : Pat<(v8i16 (AArch64NvCast (v8i16 FPR128:$src))), (v8i16 FPR128:$src)>;
-def : Pat<(v8f16 (AArch64NvCast (v8i16 FPR128:$src))), (v8f16 FPR128:$src)>;
-def : Pat<(v8bf16 (AArch64NvCast (v8i16 FPR128:$src))), (v8bf16 FPR128:$src)>;
-def : Pat<(v4i32 (AArch64NvCast (v8i16 FPR128:$src))), (v4i32 FPR128:$src)>;
-def : Pat<(v2i64 (AArch64NvCast (v8i16 FPR128:$src))), (v2i64 FPR128:$src)>;
-def : Pat<(v4f32 (AArch64NvCast (v8i16 FPR128:$src))), (v4f32 FPR128:$src)>;
-def : Pat<(v2f64 (AArch64NvCast (v8i16 FPR128:$src))), (v2f64 FPR128:$src)>;
-
-def : Pat<(v16i8 (AArch64NvCast (v16i8 FPR128:$src))), (v16i8 FPR128:$src)>;
-def : Pat<(v8i16 (AArch64NvCast (v16i8 FPR128:$src))), (v8i16 FPR128:$src)>;
-def : Pat<(v8f16 (AArch64NvCast (v16i8 FPR128:$src))), (v8f16 FPR128:$src)>;
-def : Pat<(v8bf16 (AArch64NvCast (v16i8 FPR128:$src))), (v8bf16 FPR128:$src)>;
-def : Pat<(v4i32 (AArch64NvCast (v16i8 FPR128:$src))), (v4i32 FPR128:$src)>;
-def : Pat<(v2i64 (AArch64NvCast (v16i8 FPR128:$src))), (v2i64 FPR128:$src)>;
-def : Pat<(v4f32 (AArch64NvCast (v16i8 FPR128:$src))), (v4f32 FPR128:$src)>;
-def : Pat<(v2f64 (AArch64NvCast (v16i8 FPR128:$src))), (v2f64 FPR128:$src)>;
-
-def : Pat<(v16i8 (AArch64NvCast (v2i64 FPR128:$src))), (v16i8 FPR128:$src)>;
-def : Pat<(v8i16 (AArch64NvCast (v2i64 FPR128:$src))), (v8i16 FPR128:$src)>;
-def : Pat<(v8f16 (AArch64NvCast (v2i64 FPR128:$src))), (v8f16 FPR128:$src)>;
-def : Pat<(v8bf16 (AArch64NvCast (v2i64 FPR128:$src))), (v8bf16 FPR128:$src)>;
-def : Pat<(v4i32 (AArch64NvCast (v2i64 FPR128:$src))), (v4i32 FPR128:$src)>;
-def : Pat<(v2i64 (AArch64NvCast (v2i64 FPR128:$src))), (v2i64 FPR128:$src)>;
-def : Pat<(v4f32 (AArch64NvCast (v2i64 FPR128:$src))), (v4f32 FPR128:$src)>;
-def : Pat<(v2f64 (AArch64NvCast (v2i64 FPR128:$src))), (v2f64 FPR128:$src)>;
-
-def : Pat<(v16i8 (AArch64NvCast (v4f32 FPR128:$src))), (v16i8 FPR128:$src)>;
-def : Pat<(v8i16 (AArch64NvCast (v4f32 FPR128:$src))), (v8i16 FPR128:$src)>;
-def : Pat<(v4i32 (AArch64NvCast (v4f32 FPR128:$src))), (v4i32 FPR128:$src)>;
-def : Pat<(v4f32 (AArch64NvCast (v4f32 FPR128:$src))), (v4f32 FPR128:$src)>;
-def : Pat<(v2i64 (AArch64NvCast (v4f32 FPR128:$src))), (v2i64 FPR128:$src)>;
-def : Pat<(v8f16 (AArch64NvCast (v4f32 FPR128:$src))), (v8f16 FPR128:$src)>;
-def : Pat<(v8bf16 (AArch64NvCast (v4f32 FPR128:$src))), (v8bf16 FPR128:$src)>;
-def : Pat<(v2f64 (AArch64NvCast (v4f32 FPR128:$src))), (v2f64 FPR128:$src)>;
-
-def : Pat<(v16i8 (AArch64NvCast (v2f64 FPR128:$src))), (v16i8 FPR128:$src)>;
-def : Pat<(v8i16 (AArch64NvCast (v2f64 FPR128:$src))), (v8i16 FPR128:$src)>;
-def : Pat<(v4i32 (AArch64NvCast (v2f64 FPR128:$src))), (v4i32 FPR128:$src)>;
-def : Pat<(v2i64 (AArch64NvCast (v2f64 FPR128:$src))), (v2i64 FPR128:$src)>;
-def : Pat<(v2f64 (AArch64NvCast (v2f64 FPR128:$src))), (v2f64 FPR128:$src)>;
-def : Pat<(v8f16 (AArch64NvCast (v2f64 FPR128:$src))), (v8f16 FPR128:$src)>;
-def : Pat<(v8bf16 (AArch64NvCast (v2f64 FPR128:$src))), (v8bf16 FPR128:$src)>;
-def : Pat<(v4f32 (AArch64NvCast (v2f64 FPR128:$src))), (v4f32 FPR128:$src)>;
+foreach VT = [ v16i8, v8i16, v8f16, v8bf16, v4i32, v4f32, v2i64, v2f64 ] in
+  foreach VT2 = [ v16i8, v8i16, v8f16, v8bf16, v4i32, v4f32, v2i64, v2f64 ] in
+    def : Pat<(VT (AArch64NvCast (VT2 FPR128:$src))),
+              (VT FPR128:$src)>;
 
 let Predicates = [IsLE] in {
 def : Pat<(v8i8  (bitconvert GPR64:$Xn)), (COPY_TO_REGCLASS GPR64:$Xn, FPR64)>;
@@ -7348,6 +7748,9 @@ def : Pat<(i64 (bitconvert (f64 FPR64:$Xn))),
 def : Pat<(i64 (bitconvert (v1f64 V64:$Vn))),
           (COPY_TO_REGCLASS V64:$Vn, GPR64)>;
 
+def : Pat<(f16 (bitconvert (bf16 FPR16:$src))), (f16 FPR16:$src)>;
+def : Pat<(bf16 (bitconvert (f16 FPR16:$src))), (bf16 FPR16:$src)>;
+
 let Predicates = [IsLE] in {
 def : Pat<(v1i64 (bitconvert (v2i32 FPR64:$src))), (v1i64 FPR64:$src)>;
 def : Pat<(v1i64 (bitconvert (v4i16 FPR64:$src))), (v1i64 FPR64:$src)>;
@@ -7886,17 +8289,17 @@ defm : InsertSubvectorUndef<i64>;
 def : Pat<(i64 (add (vector_extract (v2i64 FPR128:$Rn), (i64 0)),
                     (vector_extract (v2i64 FPR128:$Rn), (i64 1)))),
            (i64 (ADDPv2i64p (v2i64 FPR128:$Rn)))>;
-def : Pat<(f64 (fadd (vector_extract (v2f64 FPR128:$Rn), (i64 0)),
-                     (vector_extract (v2f64 FPR128:$Rn), (i64 1)))),
+def : Pat<(f64 (any_fadd (vector_extract (v2f64 FPR128:$Rn), (i64 0)),
+                         (vector_extract (v2f64 FPR128:$Rn), (i64 1)))),
            (f64 (FADDPv2i64p (v2f64 FPR128:$Rn)))>;
     // vector_extract on 64-bit vectors gets promoted to a 128 bit vector,
     // so we match on v4f32 here, not v2f32. This will also catch adding
     // the low two lanes of a true v4f32 vector.
-def : Pat<(fadd (vector_extract (v4f32 FPR128:$Rn), (i64 0)),
-                (vector_extract (v4f32 FPR128:$Rn), (i64 1))),
+def : Pat<(any_fadd (vector_extract (v4f32 FPR128:$Rn), (i64 0)),
+                    (vector_extract (v4f32 FPR128:$Rn), (i64 1))),
           (f32 (FADDPv2i32p (EXTRACT_SUBREG FPR128:$Rn, dsub)))>;
-def : Pat<(fadd (vector_extract (v8f16 FPR128:$Rn), (i64 0)),
-                (vector_extract (v8f16 FPR128:$Rn), (i64 1))),
+def : Pat<(any_fadd (vector_extract (v8f16 FPR128:$Rn), (i64 0)),
+                    (vector_extract (v8f16 FPR128:$Rn), (i64 1))),
           (f16 (FADDPv2i16p (EXTRACT_SUBREG FPR128:$Rn, dsub)))>;
 
 // Scalar 64-bit shifts in FPR64 registers.
@@ -7918,7 +8321,7 @@ class NTStore128Pat<ValueType VT> :
   Pat<(nontemporalstore (VT FPR128:$Rt),
         (am_indexed7s64 GPR64sp:$Rn, simm7s8:$offset)),
       (STNPDi (EXTRACT_SUBREG FPR128:$Rt, dsub),
-              (CPYi64 FPR128:$Rt, (i64 1)),
+              (DUPi64 FPR128:$Rt, (i64 1)),
               GPR64sp:$Rn, simm7s8:$offset)>;
 
 def : NTStore128Pat<v2i64>;
@@ -7930,7 +8333,7 @@ class NTStore64Pat<ValueType VT> :
   Pat<(nontemporalstore (VT FPR64:$Rt),
         (am_indexed7s32 GPR64sp:$Rn, simm7s4:$offset)),
       (STNPSi (EXTRACT_SUBREG FPR64:$Rt, ssub),
-              (CPYi32 (SUBREG_TO_REG (i64 0), FPR64:$Rt, dsub), (i64 1)),
+              (DUPi32 (SUBREG_TO_REG (i64 0), FPR64:$Rt, dsub), (i64 1)),
               GPR64sp:$Rn, simm7s4:$offset)>;
 
 // FIXME: Shouldn't v1f64 loads/stores be promoted to v1i64?
@@ -8131,11 +8534,269 @@ let Predicates = [HasLS64] in {
   def : ST64BPattern<int_aarch64_st64bv0, ST64BV0>;
 }
 
-let Defs = [X16, X17], mayStore = 1, isCodeGenOnly = 1 in
+let Predicates = [HasMOPS] in {
+  let Defs = [NZCV] in {
+    defm CPYFP : MOPSMemoryCopyInsns<0b00, "cpyfp">;
+
+    defm CPYP : MOPSMemoryMoveInsns<0b00, "cpyp">;
+
+    defm SETP : MOPSMemorySetInsns<0b00, "setp">;
+  }
+  let Uses = [NZCV] in {
+    defm CPYFM : MOPSMemoryCopyInsns<0b01, "cpyfm">;
+    defm CPYFE : MOPSMemoryCopyInsns<0b10, "cpyfe">;
+
+    defm CPYM : MOPSMemoryMoveInsns<0b01, "cpym">;
+    defm CPYE : MOPSMemoryMoveInsns<0b10, "cpye">;
+
+    defm SETM : MOPSMemorySetInsns<0b01, "setm">;
+    defm SETE : MOPSMemorySetInsns<0b10, "sete">;
+  }
+}
+let Predicates = [HasMOPS, HasMTE] in {
+  let Defs = [NZCV] in {
+    defm SETGP     : MOPSMemorySetTaggingInsns<0b00, "setgp">;
+  }
+  let Uses = [NZCV] in {
+    defm SETGM     : MOPSMemorySetTaggingInsns<0b01, "setgm">;
+    // Can't use SETGE because it's a reserved name in TargetSelectionDAG.td
+    defm MOPSSETGE : MOPSMemorySetTaggingInsns<0b10, "setge">;
+  }
+}
+
+// MOPS Node operands: 0: Dst, 1: Src or Value, 2: Size, 3: Chain
+// MOPS Node results: 0: Dst writeback, 1: Size writeback, 2: Chain
+def SDT_AArch64mops : SDTypeProfile<2, 3, [ SDTCisInt<0>, SDTCisInt<1>, SDTCisInt<2> ]>;
+def AArch64mops_memset : SDNode<"AArch64ISD::MOPS_MEMSET", SDT_AArch64mops>;
+def AArch64mops_memset_tagging : SDNode<"AArch64ISD::MOPS_MEMSET_TAGGING", SDT_AArch64mops>;
+def AArch64mops_memcopy : SDNode<"AArch64ISD::MOPS_MEMCOPY", SDT_AArch64mops>;
+def AArch64mops_memmove : SDNode<"AArch64ISD::MOPS_MEMMOVE", SDT_AArch64mops>;
+
+// MOPS operations always contain three 4-byte instructions
+let Predicates = [HasMOPS], Defs = [NZCV], Size = 12, mayStore = 1 in {
+  let mayLoad = 1 in {
+    def MOPSMemoryCopyPseudo : Pseudo<(outs GPR64common:$Rd_wb, GPR64common:$Rs_wb, GPR64:$Rn_wb),
+                                      (ins GPR64common:$Rd, GPR64common:$Rs, GPR64:$Rn),
+                                      [], "$Rd = $Rd_wb,$Rs = $Rs_wb,$Rn = $Rn_wb">, Sched<[]>;
+    def MOPSMemoryMovePseudo : Pseudo<(outs GPR64common:$Rd_wb, GPR64common:$Rs_wb, GPR64:$Rn_wb),
+                                      (ins GPR64common:$Rd, GPR64common:$Rs, GPR64:$Rn),
+                                      [], "$Rd = $Rd_wb,$Rs = $Rs_wb,$Rn = $Rn_wb">, Sched<[]>;
+  }
+  let mayLoad = 0 in {
+    def MOPSMemorySetPseudo  : Pseudo<(outs GPR64common:$Rd_wb, GPR64:$Rn_wb),
+                                      (ins GPR64common:$Rd, GPR64:$Rn, GPR64:$Rm),
+                                      [], "$Rd = $Rd_wb,$Rn = $Rn_wb">, Sched<[]>;
+  }
+}
+let Predicates = [HasMOPS, HasMTE], Defs = [NZCV], Size = 12, mayLoad = 0, mayStore = 1 in {
+  def MOPSMemorySetTaggingPseudo : Pseudo<(outs GPR64common:$Rd_wb, GPR64:$Rn_wb),
+                                          (ins GPR64common:$Rd, GPR64:$Rn, GPR64:$Rm),
+                                          [], "$Rd = $Rd_wb,$Rn = $Rn_wb">, Sched<[]>;
+}
+
+// This gets lowered into an instruction sequence of 20 bytes
+let Defs = [X16, X17], mayStore = 1, isCodeGenOnly = 1, Size = 20 in
 def StoreSwiftAsyncContext
       : Pseudo<(outs), (ins GPR64:$ctx, GPR64sp:$base, simm9:$offset),
                []>, Sched<[]>;
 
+def AArch64AssertZExtBool : SDNode<"AArch64ISD::ASSERT_ZEXT_BOOL", SDT_assert>;
+def : Pat<(AArch64AssertZExtBool GPR32:$op),
+          (i32 GPR32:$op)>;
+
+//===----------------------------===//
+// 2022 Architecture Extensions:
+//===----------------------------===//
+
+def : InstAlias<"clrbhb",  (HINT 22), 0>;
+let Predicates = [HasCLRBHB] in {
+  def : InstAlias<"clrbhb",  (HINT 22), 1>;
+}
+
+//===----------------------------------------------------------------------===//
+// Translation Hardening Extension (FEAT_THE)
+//===----------------------------------------------------------------------===//
+defm RCW     : ReadCheckWriteCompareAndSwap;
+
+defm RCWCLR  : ReadCheckWriteOperation<0b001, "clr">;
+defm RCWSET  : ReadCheckWriteOperation<0b011, "set">;
+defm RCWSWP  : ReadCheckWriteOperation<0b010, "swp">;
+
+//===----------------------------------------------------------------------===//
+// General Data-Processing Instructions (FEAT_V94_DP)
+//===----------------------------------------------------------------------===//
+defm ABS : OneOperandData<0b001000, "abs", abs>, Requires<[HasCSSC]>;
+defm CNT : OneOperandData<0b000111, "cnt", ctpop>, Requires<[HasCSSC]>;
+defm CTZ : OneOperandData<0b000110, "ctz", cttz>, Requires<[HasCSSC]>;
+
+defm SMAX : ComparisonOp<0, 0, "smax", smax>, Requires<[HasCSSC]>;
+defm SMIN : ComparisonOp<0, 1, "smin", smin>, Requires<[HasCSSC]>;
+defm UMAX : ComparisonOp<1, 0, "umax", umax>, Requires<[HasCSSC]>;
+defm UMIN : ComparisonOp<1, 1, "umin", umin>, Requires<[HasCSSC]>;
+
+def RPRFM:
+    I<(outs), (ins rprfop:$Rt, GPR64:$Rm, GPR64sp:$Rn),
+      "rprfm", "\t$Rt, $Rm, [$Rn]", "", []>,
+    Sched<[]> {
+  bits<6> Rt;
+  bits<5> Rn;
+  bits<5> Rm;
+  let Inst{2-0} = Rt{2-0};
+  let Inst{4-3} = 0b11;
+  let Inst{9-5} = Rn;
+  let Inst{11-10} = 0b10;
+  let Inst{13-12} = Rt{4-3};
+  let Inst{14} = 0b1;
+  let Inst{15} = Rt{5};
+  let Inst{20-16} = Rm;
+  let Inst{31-21} = 0b11111000101;
+  let mayLoad = 0;
+  let mayStore = 0;
+  let hasSideEffects = 1;
+  // RPRFM overlaps with PRFM (reg), when the decoder method of PRFM returns
+  // Fail, the decoder should attempt to decode RPRFM. This requires setting
+  // the decoder namespace to "Fallback".
+  let DecoderNamespace = "Fallback";
+}
+
+//===----------------------------------------------------------------------===//
+// 128-bit Atomics (FEAT_LSE128)
+//===----------------------------------------------------------------------===//
+let Predicates = [HasLSE128] in {
+  def SWPP     : LSE128Base<0b000, 0b00, 0b1, "swpp">;
+  def SWPPA    : LSE128Base<0b000, 0b10, 0b1, "swppa">;
+  def SWPPAL   : LSE128Base<0b000, 0b11, 0b1, "swppal">;
+  def SWPPL    : LSE128Base<0b000, 0b01, 0b1, "swppl">;
+  def LDCLRP   : LSE128Base<0b001, 0b00, 0b0, "ldclrp">;
+  def LDCLRPA  : LSE128Base<0b001, 0b10, 0b0, "ldclrpa">;
+  def LDCLRPAL : LSE128Base<0b001, 0b11, 0b0, "ldclrpal">;
+  def LDCLRPL  : LSE128Base<0b001, 0b01, 0b0, "ldclrpl">;
+  def LDSETP   : LSE128Base<0b011, 0b00, 0b0, "ldsetp">;
+  def LDSETPA  : LSE128Base<0b011, 0b10, 0b0, "ldsetpa">;
+  def LDSETPAL : LSE128Base<0b011, 0b11, 0b0, "ldsetpal">;
+  def LDSETPL  : LSE128Base<0b011, 0b01, 0b0, "ldsetpl">;
+}
+
+//===----------------------------------------------------------------------===//
+// RCPC Instructions (FEAT_LRCPC3)
+//===----------------------------------------------------------------------===//
+
+let Predicates = [HasRCPC3] in {
+  //                                             size   opc    opc2
+  def STILPWpre:  BaseLRCPC3IntegerLoadStorePair<0b10, 0b00, 0b0000, (outs GPR64sp:$wback), (ins GPR32:$Rt, GPR32:$Rt2, GPR64sp:$Rn), "stilp", "\t$Rt, $Rt2, [$Rn, #-8]!", "$Rn = $wback">;
+  def STILPXpre:  BaseLRCPC3IntegerLoadStorePair<0b11, 0b00, 0b0000, (outs GPR64sp:$wback), (ins GPR64:$Rt, GPR64:$Rt2, GPR64sp:$Rn), "stilp", "\t$Rt, $Rt2, [$Rn, #-16]!", "$Rn = $wback">;
+  def STILPW:     BaseLRCPC3IntegerLoadStorePair<0b10, 0b00, 0b0001, (outs), (ins GPR32:$Rt, GPR32:$Rt2, GPR64sp:$Rn), "stilp", "\t$Rt, $Rt2, [$Rn]", "">;
+  def STILPX:     BaseLRCPC3IntegerLoadStorePair<0b11, 0b00, 0b0001, (outs), (ins GPR64:$Rt, GPR64:$Rt2, GPR64sp:$Rn), "stilp", "\t$Rt, $Rt2, [$Rn]", "">;
+  def LDIAPPWpre: BaseLRCPC3IntegerLoadStorePair<0b10, 0b01, 0b0000, (outs GPR64sp:$wback, GPR32:$Rt, GPR32:$Rt2), (ins GPR64sp:$Rn), "ldiapp", "\t$Rt, $Rt2, [$Rn], #8", "$Rn = $wback">;
+  def LDIAPPXpre: BaseLRCPC3IntegerLoadStorePair<0b11, 0b01, 0b0000, (outs GPR64sp:$wback, GPR64:$Rt, GPR64:$Rt2), (ins GPR64sp:$Rn), "ldiapp", "\t$Rt, $Rt2, [$Rn], #16", "$Rn = $wback">;
+  def LDIAPPW:    BaseLRCPC3IntegerLoadStorePair<0b10, 0b01, 0b0001, (outs GPR32:$Rt, GPR32:$Rt2), (ins GPR64sp0:$Rn), "ldiapp", "\t$Rt, $Rt2, [$Rn]", "">;
+  def LDIAPPX:    BaseLRCPC3IntegerLoadStorePair<0b11, 0b01, 0b0001, (outs GPR64:$Rt, GPR64:$Rt2), (ins GPR64sp0:$Rn), "ldiapp", "\t$Rt, $Rt2, [$Rn]", "">;
+
+  // Aliases for when offset=0
+  def : InstAlias<"stilp\t$Rt, $Rt2, [$Rn, #0]", (STILPW GPR32: $Rt, GPR32: $Rt2, GPR64sp:$Rn)>;
+  def : InstAlias<"stilp\t$Rt, $Rt2, [$Rn, #0]", (STILPX GPR64: $Rt, GPR64: $Rt2, GPR64sp:$Rn)>;
+
+  //                                        size   opc
+  def STLRWpre:  BaseLRCPC3IntegerLoadStore<0b10, 0b10, (outs GPR64sp:$wback),            (ins GPR32:$Rt, GPR64sp:$Rn), "stlr",  "\t$Rt, [$Rn, #-4]!", "$Rn = $wback">;
+  def STLRXpre:  BaseLRCPC3IntegerLoadStore<0b11, 0b10, (outs GPR64sp:$wback),            (ins GPR64:$Rt, GPR64sp:$Rn), "stlr",  "\t$Rt, [$Rn, #-8]!", "$Rn = $wback">;
+  def LDAPRWpre: BaseLRCPC3IntegerLoadStore<0b10, 0b11, (outs GPR64sp:$wback, GPR32:$Rt), (ins GPR64sp:$Rn),            "ldapr", "\t$Rt, [$Rn], #4",   "$Rn = $wback">;
+  def LDAPRXpre: BaseLRCPC3IntegerLoadStore<0b11, 0b11, (outs GPR64sp:$wback, GPR64:$Rt), (ins GPR64sp:$Rn),            "ldapr", "\t$Rt, [$Rn], #8",   "$Rn = $wback">;
+}
+
+let Predicates = [HasRCPC3, HasNEON] in {
+  //                                              size   opc regtype
+  defm STLURb:  LRCPC3NEONLoadStoreUnscaledOffset<0b00, 0b00, FPR8  , (outs), (ins FPR8  :$Rt, GPR64sp:$Rn, simm9:$simm), "stlur">;
+  defm STLURh:  LRCPC3NEONLoadStoreUnscaledOffset<0b01, 0b00, FPR16 , (outs), (ins FPR16 :$Rt, GPR64sp:$Rn, simm9:$simm), "stlur">;
+  defm STLURs:  LRCPC3NEONLoadStoreUnscaledOffset<0b10, 0b00, FPR32 , (outs), (ins FPR32 :$Rt, GPR64sp:$Rn, simm9:$simm), "stlur">;
+  defm STLURd:  LRCPC3NEONLoadStoreUnscaledOffset<0b11, 0b00, FPR64 , (outs), (ins FPR64 :$Rt, GPR64sp:$Rn, simm9:$simm), "stlur">;
+  defm STLURq:  LRCPC3NEONLoadStoreUnscaledOffset<0b00, 0b10, FPR128, (outs), (ins FPR128:$Rt, GPR64sp:$Rn, simm9:$simm), "stlur">;
+  defm LDAPURb: LRCPC3NEONLoadStoreUnscaledOffset<0b00, 0b01, FPR8  , (outs FPR8  :$Rt), (ins GPR64sp:$Rn, simm9:$simm), "ldapur">;
+  defm LDAPURh: LRCPC3NEONLoadStoreUnscaledOffset<0b01, 0b01, FPR16 , (outs FPR16 :$Rt), (ins GPR64sp:$Rn, simm9:$simm), "ldapur">;
+  defm LDAPURs: LRCPC3NEONLoadStoreUnscaledOffset<0b10, 0b01, FPR32 , (outs FPR32 :$Rt), (ins GPR64sp:$Rn, simm9:$simm), "ldapur">;
+  defm LDAPURd: LRCPC3NEONLoadStoreUnscaledOffset<0b11, 0b01, FPR64 , (outs FPR64 :$Rt), (ins GPR64sp:$Rn, simm9:$simm), "ldapur">;
+  defm LDAPURq: LRCPC3NEONLoadStoreUnscaledOffset<0b00, 0b11, FPR128, (outs FPR128:$Rt), (ins GPR64sp:$Rn, simm9:$simm), "ldapur">;
+
+  //                                L
+  def STL1:  LRCPC3NEONLdStSingle<0b0, (outs), (ins VecListOned:$Vt, VectorIndexD:$Q, GPR64sp:$Rn) , "stl1", "">;
+  def LDAP1: LRCPC3NEONLdStSingle<0b1, (outs VecListOned:$dst), (ins VecListOned:$Vt, VectorIndexD:$Q, GPR64sp0:$Rn), "ldap1", "$Vt = $dst">;
+
+  // Aliases for when offset=0
+  def : InstAlias<"stl1\t$Vt$Q, [$Rn, #0]", (STL1 VecListOned:$Vt, VectorIndexD:$Q, GPR64sp:$Rn)>;
+}
+
+//===----------------------------------------------------------------------===//
+// 128-bit System Instructions (FEAT_SYSINSTR128)
+//===----------------------------------------------------------------------===//
+let Predicates = [HasD128] in {
+  def SYSPxt  : SystemPXtI<0, "sysp">;
+
+  def SYSPxt_XZR
+    : BaseSystemI<0, (outs),
+        (ins imm0_7:$op1, sys_cr_op:$Cn, sys_cr_op:$Cm, imm0_7:$op2, SyspXzrPairOperand:$xzr_pair),
+        "sysp", "\t$op1, $Cn, $Cm, $op2, $xzr_pair">,
+      Sched<[WriteSys]>
+  {
+    // Had to use a custom decoder because tablegen interprets this as having 4 fields (why?)
+    // and therefore autogenerates a decoder that builds an MC representation that has 4 fields
+    // (decodeToMCInst), but when printing we expect the MC representation to have 5 fields (one
+    // extra for the XZR) because AArch64InstPrinter::printInstruction in AArch64GenAsmWriter.inc
+    // is based off of the asm template (maybe) and therefore wants to print 5 operands.
+    // I could add a bits<5> xzr_pair. But without a way to constrain it to 0b11111 here it would
+    // overlap with the main SYSP instruction.
+    let DecoderMethod = "DecodeSyspXzrInstruction";
+    bits<3> op1;
+    bits<4> Cn;
+    bits<4> Cm;
+    bits<3> op2;
+    let Inst{22}    = 0b1; // override BaseSystemI
+    let Inst{20-19} = 0b01;
+    let Inst{18-16} = op1;
+    let Inst{15-12} = Cn;
+    let Inst{11-8}  = Cm;
+    let Inst{7-5}   = op2;
+    let Inst{4-0}   = 0b11111;
+  }
+
+  def : InstAlias<"sysp $op1, $Cn, $Cm, $op2",
+                  (SYSPxt_XZR imm0_7:$op1, sys_cr_op:$Cn, sys_cr_op:$Cm, imm0_7:$op2, XZR)>;
+}
+
+//---
+// 128-bit System Registers (FEAT_SYSREG128)
+//---
+
+// Instruction encoding:
+//
+//          31       22|21|20|19|18 16|15 12|11 8|7 5|4 0
+// MRRS      1101010101| 1| 1|o0|  op1|   Cn|  Cm|op2| Rt
+// MSRR      1101010101| 0| 1|o0|  op1|   Cn|  Cm|op2| Rt
+
+// Instruction syntax:
+//
+// MRRS <Xt>, <Xt+1>, <sysreg|S<op0>_<op1>_<Cn>_<Cm>_<op2>>
+// MSRR <sysreg|S<op0>_<op1>_<Cn>_<Cm>_<op2>>, <Xt>, <Xt+1>
+//
+// ...where t is even (X0, X2, etc).
+
+let Predicates = [HasD128] in {
+  def MRRS : RtSystemI128<1,
+    (outs MrrsMssrPairClassOperand:$Rt), (ins mrs_sysreg_op:$systemreg),
+    "mrrs", "\t$Rt, $systemreg">
+  {
+    bits<16> systemreg;
+    let Inst{20-5} = systemreg;
+  }
+
+  def MSRR : RtSystemI128<0,
+    (outs),  (ins msr_sysreg_op:$systemreg, MrrsMssrPairClassOperand:$Rt),
+    "msrr", "\t$systemreg, $Rt">
+  {
+    bits<16> systemreg;
+    let Inst{20-5} = systemreg;
+  }
+}
+
+
 include "AArch64InstrAtomics.td"
 include "AArch64SVEInstrInfo.td"
 include "AArch64SMEInstrInfo.td"
diff --git a/gnu/llvm/llvm/lib/Target/AArch64/AArch64Subtarget.h b/gnu/llvm/llvm/lib/Target/AArch64/AArch64Subtarget.h
index fbdb9a01768..184090dcab7 100644
--- a/gnu/llvm/llvm/lib/Target/AArch64/AArch64Subtarget.h
+++ b/gnu/llvm/llvm/lib/Target/AArch64/AArch64Subtarget.h
@@ -22,7 +22,7 @@
 #include "llvm/CodeGen/GlobalISel/InlineAsmLowering.h"
 #include "llvm/CodeGen/GlobalISel/InstructionSelector.h"
 #include "llvm/CodeGen/GlobalISel/LegalizerInfo.h"
-#include "llvm/CodeGen/GlobalISel/RegisterBankInfo.h"
+#include "llvm/CodeGen/RegisterBankInfo.h"
 #include "llvm/CodeGen/TargetSubtargetInfo.h"
 #include "llvm/IR/DataLayout.h"
 #include <string>
@@ -40,16 +40,21 @@ public:
   enum ARMProcFamilyEnum : uint8_t {
     Others,
     A64FX,
+    Ampere1,
+    Ampere1A,
     AppleA7,
     AppleA10,
     AppleA11,
     AppleA12,
     AppleA13,
     AppleA14,
+    AppleA15,
+    AppleA16,
     Carmel,
     CortexA35,
     CortexA53,
     CortexA55,
+    CortexA510,
     CortexA57,
     CortexA65,
     CortexA72,
@@ -59,15 +64,22 @@ public:
     CortexA77,
     CortexA78,
     CortexA78C,
+    CortexA710,
+    CortexA715,
     CortexR82,
     CortexX1,
+    CortexX1C,
+    CortexX2,
+    CortexX3,
     ExynosM3,
     Falkor,
     Kryo,
     NeoverseE1,
     NeoverseN1,
     NeoverseN2,
+    Neoverse512TVB,
     NeoverseV1,
+    NeoverseV2,
     Saphira,
     ThunderX2T99,
     ThunderX,
@@ -82,174 +94,14 @@ protected:
   /// ARMProcFamily - ARM processor family: Cortex-A53, Cortex-A57, and others.
   ARMProcFamilyEnum ARMProcFamily = Others;
 
-  bool HasV8_1aOps = false;
-  bool HasV8_2aOps = false;
-  bool HasV8_3aOps = false;
-  bool HasV8_4aOps = false;
-  bool HasV8_5aOps = false;
-  bool HasV8_6aOps = false;
-  bool HasV8_7aOps = false;
-
-  bool HasV8_0rOps = false;
-  bool HasCONTEXTIDREL2 = false;
-
-  bool HasFPARMv8 = false;
-  bool HasNEON = false;
-  bool HasCrypto = false;
-  bool HasDotProd = false;
-  bool HasCRC = false;
-  bool HasLSE = false;
-  bool HasRAS = false;
-  bool HasRDM = false;
-  bool HasPerfMon = false;
-  bool HasFullFP16 = false;
-  bool HasFP16FML = false;
-  bool HasSPE = false;
-
-  // ARMv8.1 extensions
-  bool HasVH = false;
-  bool HasPAN = false;
-  bool HasLOR = false;
-
-  // ARMv8.2 extensions
-  bool HasPsUAO = false;
-  bool HasPAN_RWV = false;
-  bool HasCCPP = false;
-
-  // SVE extensions
-  bool HasSVE = false;
-  bool UseExperimentalZeroingPseudos = false;
-
-  // Armv8.2 Crypto extensions
-  bool HasSM4 = false;
-  bool HasSHA3 = false;
-  bool HasSHA2 = false;
-  bool HasAES = false;
-
-  // ARMv8.3 extensions
-  bool HasPAuth = false;
-  bool HasJS = false;
-  bool HasCCIDX = false;
-  bool HasComplxNum = false;
-
-  // ARMv8.4 extensions
-  bool HasNV = false;
-  bool HasMPAM = false;
-  bool HasDIT = false;
-  bool HasTRACEV8_4 = false;
-  bool HasAM = false;
-  bool HasSEL2 = false;
-  bool HasPMU = false;
-  bool HasTLB_RMI = false;
-  bool HasFlagM = false;
-  bool HasRCPC_IMMO = false;
-
-  bool HasLSLFast = false;
-  bool HasRCPC = false;
-  bool HasAggressiveFMA = false;
-
-  // Armv8.5-A Extensions
-  bool HasAlternativeNZCV = false;
-  bool HasFRInt3264 = false;
-  bool HasSpecRestrict = false;
-  bool HasSSBS = false;
-  bool HasSB = false;
-  bool HasPredRes = false;
-  bool HasCCDP = false;
-  bool HasBTI = false;
-  bool HasRandGen = false;
-  bool HasMTE = false;
-  bool HasTME = false;
-
-  // Armv8.6-A Extensions
-  bool HasBF16 = false;
-  bool HasMatMulInt8 = false;
-  bool HasMatMulFP32 = false;
-  bool HasMatMulFP64 = false;
-  bool HasAMVS = false;
-  bool HasFineGrainedTraps = false;
-  bool HasEnhancedCounterVirtualization = false;
-
-  // Armv8.7-A Extensions
-  bool HasXS = false;
-  bool HasWFxT = false;
-  bool HasHCX = false;
-  bool HasLS64 = false;
-
-  // Arm SVE2 extensions
-  bool HasSVE2 = false;
-  bool HasSVE2AES = false;
-  bool HasSVE2SM4 = false;
-  bool HasSVE2SHA3 = false;
-  bool HasSVE2BitPerm = false;
-
-  // Armv9-A Extensions
-  bool HasRME = false;
-
-  // Arm Scalable Matrix Extension (SME)
-  bool HasSME = false;
-  bool HasSMEF64 = false;
-  bool HasSMEI64 = false;
-
-  // Future architecture extensions.
-  bool HasETE = false;
-  bool HasTRBE = false;
-  bool HasBRBE = false;
-  bool HasPAUTH = false;
-  bool HasSPE_EEF = false;
-
-  // HasZeroCycleRegMove - Has zero-cycle register mov instructions.
-  bool HasZeroCycleRegMove = false;
-
-  // HasZeroCycleZeroing - Has zero-cycle zeroing instructions.
-  bool HasZeroCycleZeroing = false;
-  bool HasZeroCycleZeroingGP = false;
-  bool HasZeroCycleZeroingFPWorkaround = false;
-
-  // It is generally beneficial to rewrite "fmov s0, wzr" to "movi d0, #0".
-  // as movi is more efficient across all cores. Newer cores can eliminate
-  // fmovs early and there is no difference with movi, but this not true for
-  // all implementations.
-  bool HasZeroCycleZeroingFP = true;
-
-  // StrictAlign - Disallow unaligned memory accesses.
-  bool StrictAlign = false;
-
-  // NegativeImmediates - transform instructions with negative immediates
-  bool NegativeImmediates = true;
-
   // Enable 64-bit vectorization in SLP.
   unsigned MinVectorRegisterBitWidth = 64;
 
-  bool OutlineAtomics = false;
-  bool PredictableSelectIsExpensive = false;
-  bool BalanceFPOps = false;
-  bool CustomAsCheapAsMove = false;
-  bool ExynosAsCheapAsMove = false;
-  bool UsePostRAScheduler = false;
-  bool Misaligned128StoreIsSlow = false;
-  bool Paired128IsSlow = false;
-  bool STRQroIsSlow = false;
-  bool UseAlternateSExtLoadCVTF32Pattern = false;
-  bool HasArithmeticBccFusion = false;
-  bool HasArithmeticCbzFusion = false;
-  bool HasCmpBccFusion = false;
-  bool HasFuseAddress = false;
-  bool HasFuseAES = false;
-  bool HasFuseArithmeticLogic = false;
-  bool HasFuseCCSelect = false;
-  bool HasFuseCryptoEOR = false;
-  bool HasFuseLiterals = false;
-  bool DisableLatencySchedHeuristic = false;
-  bool UseRSqrt = false;
-  bool Force32BitJumpTables = false;
-  bool UseEL1ForTP = false;
-  bool UseEL2ForTP = false;
-  bool UseEL3ForTP = false;
-  bool AllowTaggedGlobals = false;
-  bool HardenSlsRetBr = false;
-  bool HardenSlsBlr = false;
-  bool HardenSlsNoComdat = false;
+// Bool members corresponding to the SubtargetFeatures defined in tablegen
+#define GET_SUBTARGETINFO_MACRO(ATTRIBUTE, DEFAULT, GETTER)                    \
+  bool ATTRIBUTE = DEFAULT;
+#include "AArch64GenSubtargetInfo.inc"
+
   uint8_t MaxInterleaveFactor = 2;
   uint8_t VectorInsertExtractBaseCost = 3;
   uint16_t CacheLineSize = 0;
@@ -258,19 +110,24 @@ protected:
   unsigned MaxPrefetchIterationsAhead = UINT_MAX;
   unsigned PrefFunctionLogAlignment = 0;
   unsigned PrefLoopLogAlignment = 0;
+  unsigned MaxBytesForLoopAlignment = 0;
   unsigned MaxJumpTableSize = 0;
-  unsigned WideningBaseCost = 0;
 
   // ReserveXRegister[i] - X#i is not available as a general purpose register.
   BitVector ReserveXRegister;
 
+  // ReserveXRegisterForRA[i] - X#i is not available for register allocator.
+  BitVector ReserveXRegisterForRA;
+
   // CustomCallUsedXRegister[i] - X#i call saved.
   BitVector CustomCallSavedXRegs;
 
   bool IsLittle;
 
+  bool StreamingSVEModeDisabled;
   unsigned MinSVEVectorSizeInBits;
   unsigned MaxSVEVectorSizeInBits;
+  unsigned VScaleForTuning = 2;
 
   /// TargetTriple - What processor and OS we're targeting.
   Triple TargetTriple;
@@ -292,7 +149,8 @@ private:
   /// passed in feature string so that we can use initializer lists for
   /// subtarget initialization.
   AArch64Subtarget &initializeSubtargetDependencies(StringRef FS,
-                                                    StringRef CPUString);
+                                                    StringRef CPUString,
+                                                    StringRef TuneCPUString);
 
   /// Initialize properties based on the selected processor family.
   void initializeProperties();
@@ -300,11 +158,16 @@ private:
 public:
   /// This constructor initializes the data members to match that
   /// of the specified triple.
-  AArch64Subtarget(const Triple &TT, const std::string &CPU,
-                   const std::string &FS, const TargetMachine &TM,
-                   bool LittleEndian,
+  AArch64Subtarget(const Triple &TT, StringRef CPU, StringRef TuneCPU,
+                   StringRef FS, const TargetMachine &TM, bool LittleEndian,
                    unsigned MinSVEVectorSizeInBitsOverride = 0,
-                   unsigned MaxSVEVectorSizeInBitsOverride = 0);
+                   unsigned MaxSVEVectorSizeInBitsOverride = 0,
+                   bool StreamingSVEModeDisabled = true);
+
+// Getters for SubtargetFeatures defined in tablegen
+#define GET_SUBTARGETINFO_MACRO(ATTRIBUTE, DEFAULT, GETTER)                    \
+  bool GETTER() const { return ATTRIBUTE; }
+#include "AArch64GenSubtargetInfo.inc"
 
   const AArch64SelectionDAGInfo *getSelectionDAGInfo() const override {
     return &TSInfo;
@@ -326,9 +189,7 @@ public:
   const RegisterBankInfo *getRegBankInfo() const override;
   const Triple &getTargetTriple() const { return TargetTriple; }
   bool enableMachineScheduler() const override { return true; }
-  bool enablePostRAScheduler() const override {
-    return UsePostRAScheduler;
-  }
+  bool enablePostRAScheduler() const override { return usePostRAScheduler(); }
 
   /// Returns ARM processor family.
   /// Avoid this function! CPU specifics should be kept local to this class
@@ -338,93 +199,37 @@ public:
     return ARMProcFamily;
   }
 
-  bool hasV8_1aOps() const { return HasV8_1aOps; }
-  bool hasV8_2aOps() const { return HasV8_2aOps; }
-  bool hasV8_3aOps() const { return HasV8_3aOps; }
-  bool hasV8_4aOps() const { return HasV8_4aOps; }
-  bool hasV8_5aOps() const { return HasV8_5aOps; }
-  bool hasV8_0rOps() const { return HasV8_0rOps; }
-
-  bool hasZeroCycleRegMove() const { return HasZeroCycleRegMove; }
-
-  bool hasZeroCycleZeroingGP() const { return HasZeroCycleZeroingGP; }
-
-  bool hasZeroCycleZeroingFP() const { return HasZeroCycleZeroingFP; }
-
-  bool hasZeroCycleZeroingFPWorkaround() const {
-    return HasZeroCycleZeroingFPWorkaround;
-  }
-
-  bool requiresStrictAlign() const { return StrictAlign; }
-
   bool isXRaySupported() const override { return true; }
 
   unsigned getMinVectorRegisterBitWidth() const {
+    // Don't assume any minimum vector size when PSTATE.SM may not be 0.
+    if (!isStreamingSVEModeDisabled())
+      return 0;
     return MinVectorRegisterBitWidth;
   }
 
   bool isXRegisterReserved(size_t i) const { return ReserveXRegister[i]; }
-  unsigned getNumXRegisterReserved() const { return ReserveXRegister.count(); }
+  bool isXRegisterReservedForRA(size_t i) const { return ReserveXRegisterForRA[i]; }
+  unsigned getNumXRegisterReserved() const {
+    BitVector AllReservedX(AArch64::GPR64commonRegClass.getNumRegs());
+    AllReservedX |= ReserveXRegister;
+    AllReservedX |= ReserveXRegisterForRA;
+    return AllReservedX.count();
+  }
   bool isXRegCustomCalleeSaved(size_t i) const {
     return CustomCallSavedXRegs[i];
   }
   bool hasCustomCallingConv() const { return CustomCallSavedXRegs.any(); }
-  bool hasFPARMv8() const { return HasFPARMv8; }
-  bool hasNEON() const { return HasNEON; }
-  bool hasCrypto() const { return HasCrypto; }
-  bool hasDotProd() const { return HasDotProd; }
-  bool hasCRC() const { return HasCRC; }
-  bool hasLSE() const { return HasLSE; }
-  bool hasRAS() const { return HasRAS; }
-  bool hasRDM() const { return HasRDM; }
-  bool hasSM4() const { return HasSM4; }
-  bool hasSHA3() const { return HasSHA3; }
-  bool hasSHA2() const { return HasSHA2; }
-  bool hasAES() const { return HasAES; }
-  bool hasCONTEXTIDREL2() const { return HasCONTEXTIDREL2; }
-  bool balanceFPOps() const { return BalanceFPOps; }
-  bool predictableSelectIsExpensive() const {
-    return PredictableSelectIsExpensive;
-  }
-  bool hasCustomCheapAsMoveHandling() const { return CustomAsCheapAsMove; }
-  bool hasExynosCheapAsMoveHandling() const { return ExynosAsCheapAsMove; }
-  bool isMisaligned128StoreSlow() const { return Misaligned128StoreIsSlow; }
-  bool isPaired128Slow() const { return Paired128IsSlow; }
-  bool isSTRQroSlow() const { return STRQroIsSlow; }
-  bool useAlternateSExtLoadCVTF32Pattern() const {
-    return UseAlternateSExtLoadCVTF32Pattern;
-  }
-  bool hasArithmeticBccFusion() const { return HasArithmeticBccFusion; }
-  bool hasArithmeticCbzFusion() const { return HasArithmeticCbzFusion; }
-  bool hasCmpBccFusion() const { return HasCmpBccFusion; }
-  bool hasFuseAddress() const { return HasFuseAddress; }
-  bool hasFuseAES() const { return HasFuseAES; }
-  bool hasFuseArithmeticLogic() const { return HasFuseArithmeticLogic; }
-  bool hasFuseCCSelect() const { return HasFuseCCSelect; }
-  bool hasFuseCryptoEOR() const { return HasFuseCryptoEOR; }
-  bool hasFuseLiterals() const { return HasFuseLiterals; }
 
   /// Return true if the CPU supports any kind of instruction fusion.
   bool hasFusion() const {
     return hasArithmeticBccFusion() || hasArithmeticCbzFusion() ||
-           hasFuseAES() || hasFuseArithmeticLogic() ||
-           hasFuseCCSelect() || hasFuseLiterals();
+           hasFuseAES() || hasFuseArithmeticLogic() || hasFuseCCSelect() ||
+           hasFuseAdrpAdd() || hasFuseLiterals();
   }
 
-  bool hardenSlsRetBr() const { return HardenSlsRetBr; }
-  bool hardenSlsBlr() const { return HardenSlsBlr; }
-  bool hardenSlsNoComdat() const { return HardenSlsNoComdat; }
-
-  bool useEL1ForTP() const { return UseEL1ForTP; }
-  bool useEL2ForTP() const { return UseEL2ForTP; }
-  bool useEL3ForTP() const { return UseEL3ForTP; }
-
-  bool useRSqrt() const { return UseRSqrt; }
-  bool force32BitJumpTables() const { return Force32BitJumpTables; }
   unsigned getMaxInterleaveFactor() const { return MaxInterleaveFactor; }
-  unsigned getVectorInsertExtractBaseCost() const {
-    return VectorInsertExtractBaseCost;
-  }
+  unsigned getVectorInsertExtractBaseCost() const;
   unsigned getCacheLineSize() const override { return CacheLineSize; }
   unsigned getPrefetchDistance() const override { return PrefetchDistance; }
   unsigned getMinPrefetchStride(unsigned NumMemAccesses,
@@ -441,60 +246,16 @@ public:
   }
   unsigned getPrefLoopLogAlignment() const { return PrefLoopLogAlignment; }
 
-  unsigned getMaximumJumpTableSize() const { return MaxJumpTableSize; }
-
-  unsigned getWideningBaseCost() const { return WideningBaseCost; }
-
-  bool useExperimentalZeroingPseudos() const {
-    return UseExperimentalZeroingPseudos;
+  unsigned getMaxBytesForLoopAlignment() const {
+    return MaxBytesForLoopAlignment;
   }
 
+  unsigned getMaximumJumpTableSize() const { return MaxJumpTableSize; }
+
   /// CPU has TBI (top byte of addresses is ignored during HW address
   /// translation) and OS enables it.
   bool supportsAddressTopByteIgnored() const;
 
-  bool hasPerfMon() const { return HasPerfMon; }
-  bool hasFullFP16() const { return HasFullFP16; }
-  bool hasFP16FML() const { return HasFP16FML; }
-  bool hasSPE() const { return HasSPE; }
-  bool hasLSLFast() const { return HasLSLFast; }
-  bool hasSVE() const { return HasSVE; }
-  bool hasSVE2() const { return HasSVE2; }
-  bool hasRCPC() const { return HasRCPC; }
-  bool hasAggressiveFMA() const { return HasAggressiveFMA; }
-  bool hasAlternativeNZCV() const { return HasAlternativeNZCV; }
-  bool hasFRInt3264() const { return HasFRInt3264; }
-  bool hasSpecRestrict() const { return HasSpecRestrict; }
-  bool hasSSBS() const { return HasSSBS; }
-  bool hasSB() const { return HasSB; }
-  bool hasPredRes() const { return HasPredRes; }
-  bool hasCCDP() const { return HasCCDP; }
-  bool hasBTI() const { return HasBTI; }
-  bool hasRandGen() const { return HasRandGen; }
-  bool hasMTE() const { return HasMTE; }
-  bool hasTME() const { return HasTME; }
-  bool hasPAUTH() const { return HasPAUTH; }
-  // Arm SVE2 extensions
-  bool hasSVE2AES() const { return HasSVE2AES; }
-  bool hasSVE2SM4() const { return HasSVE2SM4; }
-  bool hasSVE2SHA3() const { return HasSVE2SHA3; }
-  bool hasSVE2BitPerm() const { return HasSVE2BitPerm; }
-  bool hasMatMulInt8() const { return HasMatMulInt8; }
-  bool hasMatMulFP32() const { return HasMatMulFP32; }
-  bool hasMatMulFP64() const { return HasMatMulFP64; }
-
-  // Armv8.6-A Extensions
-  bool hasBF16() const { return HasBF16; }
-  bool hasFineGrainedTraps() const { return HasFineGrainedTraps; }
-  bool hasEnhancedCounterVirtualization() const {
-    return HasEnhancedCounterVirtualization;
-  }
-
-  // Arm Scalable Matrix Extension (SME)
-  bool hasSME() const { return HasSME; }
-  bool hasSMEF64() const { return HasSMEF64; }
-  bool hasSMEI64() const { return HasSMEI64; }
-
   bool isLittleEndian() const { return IsLittle; }
 
   bool isTargetDarwin() const { return TargetTriple.isOSDarwin(); }
@@ -504,6 +265,7 @@ public:
   bool isTargetWindows() const { return TargetTriple.isOSWindows(); }
   bool isTargetAndroid() const { return TargetTriple.isAndroid(); }
   bool isTargetFuchsia() const { return TargetTriple.isOSFuchsia(); }
+  bool isWindowsArm64EC() const { return TargetTriple.isWindowsArm64EC(); }
 
   bool isTargetCOFF() const { return TargetTriple.isOSBinFormatCOFF(); }
   bool isTargetELF() const { return TargetTriple.isOSBinFormatELF(); }
@@ -516,37 +278,6 @@ public:
 
   bool useAA() const override;
 
-  bool outlineAtomics() const { return OutlineAtomics; }
-
-  bool hasVH() const { return HasVH; }
-  bool hasPAN() const { return HasPAN; }
-  bool hasLOR() const { return HasLOR; }
-
-  bool hasPsUAO() const { return HasPsUAO; }
-  bool hasPAN_RWV() const { return HasPAN_RWV; }
-  bool hasCCPP() const { return HasCCPP; }
-
-  bool hasPAuth() const { return HasPAuth; }
-  bool hasJS() const { return HasJS; }
-  bool hasCCIDX() const { return HasCCIDX; }
-  bool hasComplxNum() const { return HasComplxNum; }
-
-  bool hasNV() const { return HasNV; }
-  bool hasMPAM() const { return HasMPAM; }
-  bool hasDIT() const { return HasDIT; }
-  bool hasTRACEV8_4() const { return HasTRACEV8_4; }
-  bool hasAM() const { return HasAM; }
-  bool hasAMVS() const { return HasAMVS; }
-  bool hasXS() const { return HasXS; }
-  bool hasWFxT() const { return HasWFxT; }
-  bool hasHCX() const { return HasHCX; }
-  bool hasLS64() const { return HasLS64; }
-  bool hasSEL2() const { return HasSEL2; }
-  bool hasPMU() const { return HasPMU; }
-  bool hasTLB_RMI() const { return HasTLB_RMI; }
-  bool hasFlagM() const { return HasFlagM; }
-  bool hasRCPC_IMMO() const { return HasRCPC_IMMO; }
-
   bool addrSinkUsingGEPs() const override {
     // Keeping GEPs inbounds is important for exploiting AArch64
     // addressing-modes in ILP32 mode.
@@ -577,13 +308,19 @@ public:
   unsigned classifyGlobalFunctionReference(const GlobalValue *GV,
                                            const TargetMachine &TM) const;
 
+  /// This function is design to compatible with the function def in other
+  /// targets and escape build error about the virtual function def in base
+  /// class TargetSubtargetInfo. Updeate me if AArch64 target need to use it.
+  unsigned char
+  classifyGlobalFunctionReference(const GlobalValue *GV) const override {
+    return 0;
+  }
+
   void overrideSchedPolicy(MachineSchedPolicy &Policy,
                            unsigned NumRegionInstrs) const override;
 
   bool enableEarlyIfConversion() const override;
 
-  bool enableAdvancedRASplitCost() const override { return false; }
-
   std::unique_ptr<PBQPRAConstraint> getCustomPBQPConstraints() const override;
 
   bool isCallingConvWin64(CallingConv::ID CC) const {
@@ -599,22 +336,74 @@ public:
     }
   }
 
+  /// Return whether FrameLowering should always set the "extended frame
+  /// present" bit in FP, or set it based on a symbol in the runtime.
+  bool swiftAsyncContextIsDynamicallySet() const {
+    // Older OS versions (particularly system unwinders) are confused by the
+    // Swift extended frame, so when building code that might be run on them we
+    // must dynamically query the concurrency library to determine whether
+    // extended frames should be flagged as present.
+    const Triple &TT = getTargetTriple();
+
+    unsigned Major = TT.getOSVersion().getMajor();
+    switch(TT.getOS()) {
+    default:
+      return false;
+    case Triple::IOS:
+    case Triple::TvOS:
+      return Major < 15;
+    case Triple::WatchOS:
+      return Major < 8;
+    case Triple::MacOSX:
+    case Triple::Darwin:
+      return Major < 12;
+    }
+  }
+
   void mirFileLoaded(MachineFunction &MF) const override;
 
+  bool hasSVEorSME() const { return hasSVE() || hasSME(); }
+
   // Return the known range for the bit length of SVE data registers. A value
   // of 0 means nothing is known about that particular limit beyong what's
   // implied by the architecture.
   unsigned getMaxSVEVectorSizeInBits() const {
-    assert(HasSVE && "Tried to get SVE vector length without SVE support!");
+    assert(hasSVEorSME() &&
+           "Tried to get SVE vector length without SVE support!");
     return MaxSVEVectorSizeInBits;
   }
 
   unsigned getMinSVEVectorSizeInBits() const {
-    assert(HasSVE && "Tried to get SVE vector length without SVE support!");
+    assert(hasSVEorSME() &&
+           "Tried to get SVE vector length without SVE support!");
     return MinSVEVectorSizeInBits;
   }
 
-  bool useSVEForFixedLengthVectors() const;
+  bool useSVEForFixedLengthVectors() const {
+    if (forceStreamingCompatibleSVE())
+      return true;
+
+    // Prefer NEON unless larger SVE registers are available.
+    return hasSVE() && getMinSVEVectorSizeInBits() >= 256;
+  }
+
+  bool forceStreamingCompatibleSVE() const;
+
+  unsigned getVScaleForTuning() const { return VScaleForTuning; }
+
+  const char* getChkStkName() const {
+    if (isWindowsArm64EC())
+      return "__chkstk_arm64ec";
+    return "__chkstk";
+  }
+
+  const char* getSecurityCheckCookieName() const {
+    if (isWindowsArm64EC())
+      return "__security_check_cookie_arm64ec";
+    return "__security_check_cookie";
+  }
+
+  bool isStreamingSVEModeDisabled() const { return StreamingSVEModeDisabled; }
 };
 } // End llvm namespace
 
diff --git a/gnu/llvm/llvm/lib/Target/AArch64/AArch64TargetMachine.cpp b/gnu/llvm/llvm/lib/Target/AArch64/AArch64TargetMachine.cpp
index d25e8d10529..b93a097d245 100644
--- a/gnu/llvm/llvm/lib/Target/AArch64/AArch64TargetMachine.cpp
+++ b/gnu/llvm/llvm/lib/Target/AArch64/AArch64TargetMachine.cpp
@@ -12,6 +12,7 @@
 #include "AArch64TargetMachine.h"
 #include "AArch64.h"
 #include "AArch64MachineFunctionInfo.h"
+#include "AArch64MachineScheduler.h"
 #include "AArch64MacroFusion.h"
 #include "AArch64Subtarget.h"
 #include "AArch64TargetObjectFile.h"
@@ -21,30 +22,35 @@
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/Triple.h"
 #include "llvm/Analysis/TargetTransformInfo.h"
+#include "llvm/CodeGen/CFIFixup.h"
 #include "llvm/CodeGen/CSEConfigBase.h"
+#include "llvm/CodeGen/GlobalISel/CSEInfo.h"
 #include "llvm/CodeGen/GlobalISel/IRTranslator.h"
 #include "llvm/CodeGen/GlobalISel/InstructionSelect.h"
 #include "llvm/CodeGen/GlobalISel/Legalizer.h"
+#include "llvm/CodeGen/GlobalISel/LoadStoreOpt.h"
 #include "llvm/CodeGen/GlobalISel/Localizer.h"
 #include "llvm/CodeGen/GlobalISel/RegBankSelect.h"
 #include "llvm/CodeGen/MIRParser/MIParser.h"
 #include "llvm/CodeGen/MachineScheduler.h"
 #include "llvm/CodeGen/Passes.h"
+#include "llvm/CodeGen/TargetInstrInfo.h"
 #include "llvm/CodeGen/TargetPassConfig.h"
 #include "llvm/IR/Attributes.h"
 #include "llvm/IR/Function.h"
 #include "llvm/InitializePasses.h"
 #include "llvm/MC/MCAsmInfo.h"
 #include "llvm/MC/MCTargetOptions.h"
+#include "llvm/MC/TargetRegistry.h"
 #include "llvm/Pass.h"
 #include "llvm/Support/CodeGen.h"
 #include "llvm/Support/CommandLine.h"
-#include "llvm/Support/TargetRegistry.h"
 #include "llvm/Target/TargetLoweringObjectFile.h"
 #include "llvm/Target/TargetOptions.h"
 #include "llvm/Transforms/CFGuard.h"
 #include "llvm/Transforms/Scalar.h"
 #include <memory>
+#include <optional>
 #include <string>
 
 using namespace llvm;
@@ -58,6 +64,11 @@ static cl::opt<bool>
                        cl::desc("Enable the conditional branch tuning pass"),
                        cl::init(true), cl::Hidden);
 
+static cl::opt<bool> EnableAArch64CopyPropagation(
+    "aarch64-enable-copy-propagation",
+    cl::desc("Enable the copy propagation with AArch64 copy instr"),
+    cl::init(true), cl::Hidden);
+
 static cl::opt<bool> EnableMCR("aarch64-enable-mcr",
                                cl::desc("Enable the machine combiner pass"),
                                cl::init(true), cl::Hidden);
@@ -115,16 +126,16 @@ static cl::opt<bool>
                   cl::desc("Enable the condition optimizer pass"),
                   cl::init(true), cl::Hidden);
 
-static cl::opt<bool>
-EnableA53Fix835769("aarch64-fix-cortex-a53-835769", cl::Hidden,
-                cl::desc("Work around Cortex-A53 erratum 835769"),
-                cl::init(false));
-
 static cl::opt<bool>
     EnableGEPOpt("aarch64-enable-gep-opt", cl::Hidden,
                  cl::desc("Enable optimizations on complex GEPs"),
                  cl::init(false));
 
+static cl::opt<bool>
+    EnableSelectOpt("aarch64-select-opt", cl::Hidden,
+                    cl::desc("Enable select to branch optimizations"),
+                    cl::init(true));
+
 static cl::opt<bool>
     BranchRelaxation("aarch64-enable-branch-relax", cl::Hidden, cl::init(true),
                      cl::desc("Relax out of range conditional branches"));
@@ -175,6 +186,16 @@ static cl::opt<unsigned> SVEVectorBitsMinOpt(
 
 extern cl::opt<bool> EnableHomogeneousPrologEpilog;
 
+static cl::opt<bool> EnableGISelLoadStoreOptPreLegal(
+    "aarch64-enable-gisel-ldst-prelegal",
+    cl::desc("Enable GlobalISel's pre-legalizer load/store optimization pass"),
+    cl::init(true), cl::Hidden);
+
+static cl::opt<bool> EnableGISelLoadStoreOptPostLegal(
+    "aarch64-enable-gisel-ldst-postlegal",
+    cl::desc("Enable GlobalISel's post-legalizer load/store optimization pass"),
+    cl::init(false), cl::Hidden);
+
 extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeAArch64Target() {
   // Register the target.
   RegisterTargetMachine<AArch64leTargetMachine> X(getTheAArch64leTarget());
@@ -194,7 +215,9 @@ extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeAArch64Target() {
   initializeAArch64ConditionOptimizerPass(*PR);
   initializeAArch64DeadRegisterDefinitionsPass(*PR);
   initializeAArch64ExpandPseudoPass(*PR);
+  initializeAArch64KCFIPass(*PR);
   initializeAArch64LoadStoreOptPass(*PR);
+  initializeAArch64MIPeepholeOptPass(*PR);
   initializeAArch64SIMDInstrOptPass(*PR);
   initializeAArch64O0PreLegalizerCombinerPass(*PR);
   initializeAArch64PreLegalizerCombinerPass(*PR);
@@ -207,12 +230,14 @@ extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeAArch64Target() {
   initializeFalkorHWPFFixPass(*PR);
   initializeFalkorMarkStridedAccessesLegacyPass(*PR);
   initializeLDTLSCleanupPass(*PR);
+  initializeSMEABIPass(*PR);
   initializeSVEIntrinsicOptsPass(*PR);
   initializeAArch64SpeculationHardeningPass(*PR);
   initializeAArch64SLSHardeningPass(*PR);
   initializeAArch64StackTaggingPass(*PR);
   initializeAArch64StackTaggingPreRAPass(*PR);
   initializeAArch64LowerHomogeneousPrologEpilogPass(*PR);
+  initializeAArch64DAGToDAGISelPass(*PR);
 }
 
 //===----------------------------------------------------------------------===//
@@ -251,21 +276,21 @@ static StringRef computeDefaultCPU(const Triple &TT, StringRef CPU) {
 }
 
 static Reloc::Model getEffectiveRelocModel(const Triple &TT,
-                                           Optional<Reloc::Model> RM) {
+                                           std::optional<Reloc::Model> RM) {
   // AArch64 Darwin and Windows are always PIC.
   if (TT.isOSDarwin() || TT.isOSWindows())
     return Reloc::PIC_;
   // On ELF platforms the default static relocation model has a smart enough
   // linker to cope with referencing external symbols defined in a shared
   // library. Hence DynamicNoPIC doesn't need to be promoted to PIC.
-  if (!RM.hasValue() || *RM == Reloc::DynamicNoPIC)
+  if (!RM || *RM == Reloc::DynamicNoPIC)
     return Reloc::Static;
   return *RM;
 }
 
 static CodeModel::Model
-getEffectiveAArch64CodeModel(const Triple &TT, Optional<CodeModel::Model> CM,
-                             bool JIT) {
+getEffectiveAArch64CodeModel(const Triple &TT,
+                             std::optional<CodeModel::Model> CM, bool JIT) {
   if (CM) {
     if (*CM != CodeModel::Small && *CM != CodeModel::Tiny &&
         *CM != CodeModel::Large) {
@@ -291,8 +316,8 @@ getEffectiveAArch64CodeModel(const Triple &TT, Optional<CodeModel::Model> CM,
 AArch64TargetMachine::AArch64TargetMachine(const Target &T, const Triple &TT,
                                            StringRef CPU, StringRef FS,
                                            const TargetOptions &Options,
-                                           Optional<Reloc::Model> RM,
-                                           Optional<CodeModel::Model> CM,
+                                           std::optional<Reloc::Model> RM,
+                                           std::optional<CodeModel::Model> CM,
                                            CodeGenOpt::Level OL, bool JIT,
                                            bool LittleEndian)
     : LLVMTargetMachine(T,
@@ -348,6 +373,10 @@ AArch64TargetMachine::AArch64TargetMachine(const Target &T, const Triple &TT,
 
   // AArch64 supports the debug entry values.
   setSupportsDebugEntryValues(true);
+
+  // AArch64 supports fixing up the DWARF unwind information.
+  if (!getMCAsmInfo()->usesWindowsCFI())
+    setCFIFixup(true);
 }
 
 AArch64TargetMachine::~AArch64TargetMachine() = default;
@@ -355,23 +384,25 @@ AArch64TargetMachine::~AArch64TargetMachine() = default;
 const AArch64Subtarget *
 AArch64TargetMachine::getSubtargetImpl(const Function &F) const {
   Attribute CPUAttr = F.getFnAttribute("target-cpu");
+  Attribute TuneAttr = F.getFnAttribute("tune-cpu");
   Attribute FSAttr = F.getFnAttribute("target-features");
 
-  std::string CPU =
-      CPUAttr.isValid() ? CPUAttr.getValueAsString().str() : TargetCPU;
-  std::string FS =
-      FSAttr.isValid() ? FSAttr.getValueAsString().str() : TargetFS;
+  StringRef CPU = CPUAttr.isValid() ? CPUAttr.getValueAsString() : TargetCPU;
+  StringRef TuneCPU = TuneAttr.isValid() ? TuneAttr.getValueAsString() : CPU;
+  StringRef FS = FSAttr.isValid() ? FSAttr.getValueAsString() : TargetFS;
 
-  SmallString<512> Key;
+  bool StreamingSVEModeDisabled =
+      !F.hasFnAttribute("aarch64_pstate_sm_enabled") &&
+      !F.hasFnAttribute("aarch64_pstate_sm_compatible") &&
+      !F.hasFnAttribute("aarch64_pstate_sm_body");
 
   unsigned MinSVEVectorSize = 0;
   unsigned MaxSVEVectorSize = 0;
   Attribute VScaleRangeAttr = F.getFnAttribute(Attribute::VScaleRange);
   if (VScaleRangeAttr.isValid()) {
-    std::tie(MinSVEVectorSize, MaxSVEVectorSize) =
-        VScaleRangeAttr.getVScaleRangeArgs();
-    MinSVEVectorSize *= 128;
-    MaxSVEVectorSize *= 128;
+    std::optional<unsigned> VScaleMax = VScaleRangeAttr.getVScaleRangeMax();
+    MinSVEVectorSize = VScaleRangeAttr.getVScaleRangeMin() * 128;
+    MaxSVEVectorSize = VScaleMax ? *VScaleMax * 128 : 0;
   } else {
     MinSVEVectorSize = SVEVectorBitsMinOpt;
     MaxSVEVectorSize = SVEVectorBitsMaxOpt;
@@ -394,12 +425,10 @@ AArch64TargetMachine::getSubtargetImpl(const Function &F) const {
         (std::max(MinSVEVectorSize, MaxSVEVectorSize) / 128) * 128;
   }
 
-  Key += "SVEMin";
-  Key += std::to_string(MinSVEVectorSize);
-  Key += "SVEMax";
-  Key += std::to_string(MaxSVEVectorSize);
-  Key += CPU;
-  Key += FS;
+  SmallString<512> Key;
+  raw_svector_ostream(Key) << "SVEMin" << MinSVEVectorSize << "SVEMax"
+                           << MaxSVEVectorSize << "StreamingSVEModeDisabled="
+                           << StreamingSVEModeDisabled << CPU << TuneCPU << FS;
 
   auto &I = SubtargetMap[Key];
   if (!I) {
@@ -407,9 +436,9 @@ AArch64TargetMachine::getSubtargetImpl(const Function &F) const {
     // creation will depend on the TM and the code generation flags on the
     // function that reside in TargetOptions.
     resetTargetOptions(F);
-    I = std::make_unique<AArch64Subtarget>(TargetTriple, CPU, FS, *this,
-                                           isLittle, MinSVEVectorSize,
-                                           MaxSVEVectorSize);
+    I = std::make_unique<AArch64Subtarget>(
+        TargetTriple, CPU, TuneCPU, FS, *this, isLittle, MinSVEVectorSize,
+        MaxSVEVectorSize, StreamingSVEModeDisabled);
   }
   return I.get();
 }
@@ -418,16 +447,16 @@ void AArch64leTargetMachine::anchor() { }
 
 AArch64leTargetMachine::AArch64leTargetMachine(
     const Target &T, const Triple &TT, StringRef CPU, StringRef FS,
-    const TargetOptions &Options, Optional<Reloc::Model> RM,
-    Optional<CodeModel::Model> CM, CodeGenOpt::Level OL, bool JIT)
+    const TargetOptions &Options, std::optional<Reloc::Model> RM,
+    std::optional<CodeModel::Model> CM, CodeGenOpt::Level OL, bool JIT)
     : AArch64TargetMachine(T, TT, CPU, FS, Options, RM, CM, OL, JIT, true) {}
 
 void AArch64beTargetMachine::anchor() { }
 
 AArch64beTargetMachine::AArch64beTargetMachine(
     const Target &T, const Triple &TT, StringRef CPU, StringRef FS,
-    const TargetOptions &Options, Optional<Reloc::Model> RM,
-    Optional<CodeModel::Model> CM, CodeGenOpt::Level OL, bool JIT)
+    const TargetOptions &Options, std::optional<Reloc::Model> RM,
+    std::optional<CodeModel::Model> CM, CodeGenOpt::Level OL, bool JIT)
     : AArch64TargetMachine(T, TT, CPU, FS, Options, RM, CM, OL, JIT, false) {}
 
 namespace {
@@ -459,19 +488,22 @@ public:
   ScheduleDAGInstrs *
   createPostMachineScheduler(MachineSchedContext *C) const override {
     const AArch64Subtarget &ST = C->MF->getSubtarget<AArch64Subtarget>();
+    ScheduleDAGMI *DAG =
+        new ScheduleDAGMI(C, std::make_unique<AArch64PostRASchedStrategy>(C),
+                          /* RemoveKillFlags=*/true);
     if (ST.hasFusion()) {
       // Run the Macro Fusion after RA again since literals are expanded from
       // pseudos then (v. addPreSched2()).
-      ScheduleDAGMI *DAG = createGenericSchedPostRA(C);
       DAG->addMutation(createAArch64MacroFusionDAGMutation());
       return DAG;
     }
 
-    return nullptr;
+    return DAG;
   }
 
   void addIRPasses()  override;
   bool addPreISel() override;
+  void addCodeGenPrepare() override;
   bool addInstSelector() override;
   bool addIRTranslator() override;
   void addPreLegalizeMachineIR() override;
@@ -480,6 +512,7 @@ public:
   bool addRegBankSelect() override;
   void addPreGlobalInstructionSelect() override;
   bool addGlobalInstructionSelect() override;
+  void addMachineSSAOptimization() override;
   bool addILPOpts() override;
   void addPreRegAlloc() override;
   void addPostRegAlloc() override;
@@ -493,7 +526,7 @@ public:
 } // end anonymous namespace
 
 TargetTransformInfo
-AArch64TargetMachine::getTargetTransformInfo(const Function &F) {
+AArch64TargetMachine::getTargetTransformInfo(const Function &F) const {
   return TargetTransformInfo(AArch64TTIImpl(this, F));
 }
 
@@ -520,6 +553,7 @@ void AArch64PassConfig::addIRPasses() {
   if (TM->getOptLevel() != CodeGenOpt::None && EnableAtomicTidy)
     addPass(createCFGSimplificationPass(SimplifyCFGOptions()
                                             .forwardSwitchCondToPhi(true)
+                                            .convertSwitchRangeToICmp(true)
                                             .convertSwitchToLookupTable(true)
                                             .needCanonicalLoops(false)
                                             .hoistCommonInsts(true)
@@ -536,17 +570,6 @@ void AArch64PassConfig::addIRPasses() {
       addPass(createFalkorMarkStridedAccessesPass());
   }
 
-  TargetPassConfig::addIRPasses();
-
-  addPass(createAArch64StackTaggingPass(
-      /*IsOptNone=*/TM->getOptLevel() == CodeGenOpt::None));
-
-  // Match interleaved memory accesses to ldN/stN intrinsics.
-  if (TM->getOptLevel() != CodeGenOpt::None) {
-    addPass(createInterleavedLoadCombinePass());
-    addPass(createInterleavedAccessPass());
-  }
-
   if (TM->getOptLevel() == CodeGenOpt::Aggressive && EnableGEPOpt) {
     // Call SeparateConstOffsetFromGEP pass to extract constants within indices
     // and lower a GEP with multiple indices to either arithmetic operations or
@@ -560,9 +583,35 @@ void AArch64PassConfig::addIRPasses() {
     addPass(createLICMPass());
   }
 
+  TargetPassConfig::addIRPasses();
+
+  if (getOptLevel() == CodeGenOpt::Aggressive && EnableSelectOpt)
+    addPass(createSelectOptimizePass());
+
+  addPass(createAArch64StackTaggingPass(
+      /*IsOptNone=*/TM->getOptLevel() == CodeGenOpt::None));
+
+  // Match complex arithmetic patterns
+  if (TM->getOptLevel() >= CodeGenOpt::Default)
+    addPass(createComplexDeinterleavingPass(TM));
+
+  // Match interleaved memory accesses to ldN/stN intrinsics.
+  if (TM->getOptLevel() != CodeGenOpt::None) {
+    addPass(createInterleavedLoadCombinePass());
+    addPass(createInterleavedAccessPass());
+  }
+
+  // Expand any functions marked with SME attributes which require special
+  // changes for the calling convention or that require the lazy-saving
+  // mechanism specified in the SME ABI.
+  addPass(createSMEABIPass());
+
   // Add Control Flow Guard checks.
   if (TM->getTargetTriple().isOSWindows())
     addPass(createCFGuardCheckPass());
+
+  if (TM->Options.JMCInstrument)
+    addPass(createJMCInstrumenterPass());
 }
 
 // Pass Pipeline Configuration
@@ -598,6 +647,12 @@ bool AArch64PassConfig::addPreISel() {
   return false;
 }
 
+void AArch64PassConfig::addCodeGenPrepare() {
+  if (getOptLevel() != CodeGenOpt::None)
+    addPass(createTypePromotionLegacyPass());
+  TargetPassConfig::addCodeGenPrepare();
+}
+
 bool AArch64PassConfig::addInstSelector() {
   addPass(createAArch64ISelDag(getAArch64TargetMachine(), getOptLevel()));
 
@@ -618,8 +673,11 @@ bool AArch64PassConfig::addIRTranslator() {
 void AArch64PassConfig::addPreLegalizeMachineIR() {
   if (getOptLevel() == CodeGenOpt::None)
     addPass(createAArch64O0PreLegalizerCombiner());
-  else
+  else {
     addPass(createAArch64PreLegalizerCombiner());
+    if (EnableGISelLoadStoreOptPreLegal)
+      addPass(new LoadStoreOpt());
+  }
 }
 
 bool AArch64PassConfig::addLegalizeMachineIR() {
@@ -629,8 +687,11 @@ bool AArch64PassConfig::addLegalizeMachineIR() {
 
 void AArch64PassConfig::addPreRegBankSelect() {
   bool IsOptNone = getOptLevel() == CodeGenOpt::None;
-  if (!IsOptNone)
+  if (!IsOptNone) {
     addPass(createAArch64PostLegalizerCombiner(IsOptNone));
+    if (EnableGISelLoadStoreOptPostLegal)
+      addPass(new LoadStoreOpt());
+  }
   addPass(createAArch64PostLegalizerLowering());
 }
 
@@ -650,6 +711,14 @@ bool AArch64PassConfig::addGlobalInstructionSelect() {
   return false;
 }
 
+void AArch64PassConfig::addMachineSSAOptimization() {
+  // Run default MachineSSAOptimization first.
+  TargetPassConfig::addMachineSSAOptimization();
+
+  if (TM->getOptLevel() != CodeGenOpt::None)
+    addPass(createAArch64MIPeepholeOptPass());
+}
+
 bool AArch64PassConfig::addILPOpts() {
   if (EnableCondOpt)
     addPass(createAArch64ConditionOptimizerPass());
@@ -704,6 +773,8 @@ void AArch64PassConfig::addPreSched2() {
     if (EnableLoadStoreOpt)
       addPass(createAArch64LoadStoreOptimizationPass());
   }
+  // Emit KCFI checks for indirect calls.
+  addPass(createAArch64KCFIPass());
 
   // The AArch64SpeculationHardeningPass destroys dominator tree and natural
   // loop info, which is needed for the FalkorHWPFFixPass and also later on.
@@ -728,8 +799,11 @@ void AArch64PassConfig::addPreEmitPass() {
   if (TM->getOptLevel() >= CodeGenOpt::Aggressive && EnableLoadStoreOpt)
     addPass(createAArch64LoadStoreOptimizationPass());
 
-  if (EnableA53Fix835769)
-    addPass(createAArch64A53Fix835769());
+  if (TM->getOptLevel() >= CodeGenOpt::Aggressive &&
+      EnableAArch64CopyPropagation)
+    addPass(createMachineCopyPropagationPass(true));
+
+  addPass(createAArch64A53Fix835769());
 
   if (EnableBranchTargets)
     addPass(createAArch64BranchTargetsPass());
@@ -760,6 +834,13 @@ void AArch64PassConfig::addPreEmitPass2() {
   addPass(createUnpackMachineBundles(nullptr));
 }
 
+MachineFunctionInfo *AArch64TargetMachine::createMachineFunctionInfo(
+    BumpPtrAllocator &Allocator, const Function &F,
+    const TargetSubtargetInfo *STI) const {
+  return AArch64FunctionInfo::create<AArch64FunctionInfo>(
+      Allocator, F, static_cast<const AArch64Subtarget *>(STI));
+}
+
 yaml::MachineFunctionInfo *
 AArch64TargetMachine::createDefaultFuncInfoYAML() const {
   return new yaml::AArch64FunctionInfo();
@@ -774,8 +855,7 @@ AArch64TargetMachine::convertFuncInfoToYAML(const MachineFunction &MF) const {
 bool AArch64TargetMachine::parseMachineFunctionInfo(
     const yaml::MachineFunctionInfo &MFI, PerFunctionMIParsingState &PFS,
     SMDiagnostic &Error, SMRange &SourceRange) const {
-  const auto &YamlMFI =
-      reinterpret_cast<const yaml::AArch64FunctionInfo &>(MFI);
+  const auto &YamlMFI = static_cast<const yaml::AArch64FunctionInfo &>(MFI);
   MachineFunction &MF = PFS.MF;
   MF.getInfo<AArch64FunctionInfo>()->initializeBaseYamlFields(YamlMFI);
   return false;
diff --git a/gnu/llvm/llvm/lib/Target/AArch64/CMakeLists.txt b/gnu/llvm/llvm/lib/Target/AArch64/CMakeLists.txt
index 06f769766c3..227f6df1d54 100644
--- a/gnu/llvm/llvm/lib/Target/AArch64/CMakeLists.txt
+++ b/gnu/llvm/llvm/lib/Target/AArch64/CMakeLists.txt
@@ -62,10 +62,13 @@ add_llvm_target(AArch64CodeGen
   AArch64ISelDAGToDAG.cpp
   AArch64ISelLowering.cpp
   AArch64InstrInfo.cpp
+  AArch64KCFI.cpp
   AArch64LoadStoreOptimizer.cpp
   AArch64LowerHomogeneousPrologEpilog.cpp
   AArch64MachineFunctionInfo.cpp
+  AArch64MachineScheduler.cpp
   AArch64MacroFusion.cpp
+  AArch64MIPeepholeOpt.cpp
   AArch64MCInstLower.cpp
   AArch64PromoteConstant.cpp
   AArch64PBQPRegAlloc.cpp
@@ -81,6 +84,7 @@ add_llvm_target(AArch64CodeGen
   AArch64TargetMachine.cpp
   AArch64TargetObjectFile.cpp
   AArch64TargetTransformInfo.cpp
+  SMEABIPass.cpp
   SVEIntrinsicOpts.cpp
   AArch64SIMDInstrOpt.cpp
 
@@ -100,6 +104,7 @@ add_llvm_target(AArch64CodeGen
   SelectionDAG
   Support
   Target
+  TargetParser
   TransformUtils
   GlobalISel
   CFGuard
diff --git a/gnu/llvm/llvm/lib/Target/AArch64/GISel/select-saddo.mir b/gnu/llvm/llvm/lib/Target/AArch64/GISel/select-saddo.mir
deleted file mode 100644
index 6f05bd7ac83..00000000000
--- a/gnu/llvm/llvm/lib/Target/AArch64/GISel/select-saddo.mir
+++ /dev/null
@@ -1,158 +0,0 @@
-# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py
-# RUN: llc -verify-machineinstrs -mtriple aarch64-unknown-uknown -global-isel -run-pass=instruction-select %s -o - | FileCheck %s
-
-...
----
-name:            saddo_s32
-alignment:       4
-legalized:       true
-regBankSelected: true
-tracksRegLiveness: true
-body:             |
-  bb.1.entry:
-    liveins: $w0, $w1, $x2
-
-    ; CHECK-LABEL: name: saddo_s32
-    ; CHECK: liveins: $w0, $w1, $x2
-    ; CHECK: %reg0:gpr32 = COPY $w0
-    ; CHECK: %reg1:gpr32 = COPY $w1
-    ; CHECK: %saddo:gpr32 = ADDSWrr %reg0, %reg1, implicit-def $nzcv
-    ; CHECK: [[CSINCWr:%[0-9]+]]:gpr32 = CSINCWr $wzr, $wzr, 7, implicit $nzcv
-    ; CHECK: $w0 = COPY %saddo
-    ; CHECK: RET_ReallyLR implicit $w0
-    %reg0:gpr(s32) = COPY $w0
-    %reg1:gpr(s32) = COPY $w1
-    %saddo:gpr(s32), %4:gpr(s1) = G_SADDO %reg0, %reg1
-    $w0 = COPY %saddo(s32)
-    RET_ReallyLR implicit $w0
-
-...
----
-name:            saddo_s64
-alignment:       4
-legalized:       true
-regBankSelected: true
-tracksRegLiveness: true
-body:             |
-  bb.1.entry:
-    liveins: $x0, $x1, $x2
-
-    ; CHECK-LABEL: name: saddo_s64
-    ; CHECK: liveins: $x0, $x1, $x2
-    ; CHECK: %reg0:gpr64 = COPY $x0
-    ; CHECK: %reg1:gpr64 = COPY $x1
-    ; CHECK: %saddo:gpr64 = ADDSXrr %reg0, %reg1, implicit-def $nzcv
-    ; CHECK: [[CSINCWr:%[0-9]+]]:gpr32 = CSINCWr $wzr, $wzr, 7, implicit $nzcv
-    ; CHECK: $x0 = COPY %saddo
-    ; CHECK: RET_ReallyLR implicit $x0
-    %reg0:gpr(s64) = COPY $x0
-    %reg1:gpr(s64) = COPY $x1
-    %saddo:gpr(s64), %4:gpr(s1) = G_SADDO %reg0, %reg1
-    $x0 = COPY %saddo(s64)
-    RET_ReallyLR implicit $x0
-
-...
----
-name:            saddo_s32_imm
-alignment:       4
-legalized:       true
-regBankSelected: true
-tracksRegLiveness: true
-body:             |
-  bb.1.entry:
-    liveins: $w0, $w1, $x2
-    ; Check that we get ADDSWri when we can fold in a constant.
-    ;
-    ; CHECK-LABEL: name: saddo_s32_imm
-    ; CHECK: liveins: $w0, $w1, $x2
-    ; CHECK: %copy:gpr32sp = COPY $w0
-    ; CHECK: %saddo:gpr32 = ADDSWri %copy, 16, 0, implicit-def $nzcv
-    ; CHECK: %overflow:gpr32 = CSINCWr $wzr, $wzr, 7, implicit $nzcv
-    ; CHECK: $w0 = COPY %saddo
-    ; CHECK: RET_ReallyLR implicit $w0
-    %copy:gpr(s32) = COPY $w0
-    %constant:gpr(s32) = G_CONSTANT i32 16
-    %saddo:gpr(s32), %overflow:gpr(s1) = G_SADDO %copy, %constant
-    $w0 = COPY %saddo(s32)
-    RET_ReallyLR implicit $w0
-
-...
----
-name:            saddo_s32_shifted
-alignment:       4
-legalized:       true
-regBankSelected: true
-tracksRegLiveness: true
-body:             |
-  bb.1.entry:
-    liveins: $w0, $w1, $x2
-    ; Check that we get ADDSWrs when we can fold in a shift.
-    ;
-    ; CHECK-LABEL: name: saddo_s32_shifted
-    ; CHECK: liveins: $w0, $w1, $x2
-    ; CHECK: %reg0:gpr32 = COPY $w0
-    ; CHECK: %reg1:gpr32 = COPY $w1
-    ; CHECK: %add:gpr32 = ADDSWrs %reg0, %reg1, 16, implicit-def $nzcv
-    ; CHECK: %overflow:gpr32 = CSINCWr $wzr, $wzr, 7, implicit $nzcv
-    ; CHECK: $w0 = COPY %add
-    ; CHECK: RET_ReallyLR implicit $w0
-    %reg0:gpr(s32) = COPY $w0
-    %reg1:gpr(s32) = COPY $w1
-    %constant:gpr(s32) = G_CONSTANT i32 16
-    %shift:gpr(s32) = G_SHL %reg1(s32), %constant(s32)
-    %add:gpr(s32), %overflow:gpr(s1) = G_SADDO %reg0, %shift
-    $w0 = COPY %add(s32)
-    RET_ReallyLR implicit $w0
-
-...
----
-name:            saddo_s32_neg_imm
-alignment:       4
-legalized:       true
-regBankSelected: true
-tracksRegLiveness: true
-body:             |
-  bb.1.entry:
-    liveins: $w0, $w1, $x2
-    ; Check that we get SUBSWri when we can fold in a negative constant.
-    ;
-    ; CHECK-LABEL: name: saddo_s32_neg_imm
-    ; CHECK: liveins: $w0, $w1, $x2
-    ; CHECK: %copy:gpr32sp = COPY $w0
-    ; CHECK: %add:gpr32 = SUBSWri %copy, 16, 0, implicit-def $nzcv
-    ; CHECK: %overflow:gpr32 = CSINCWr $wzr, $wzr, 7, implicit $nzcv
-    ; CHECK: $w0 = COPY %add
-    ; CHECK: RET_ReallyLR implicit $w0
-    %copy:gpr(s32) = COPY $w0
-    %constant:gpr(s32) = G_CONSTANT i32 -16
-    %add:gpr(s32), %overflow:gpr(s1) = G_SADDO %copy, %constant
-    $w0 = COPY %add(s32)
-    RET_ReallyLR implicit $w0
-
-...
----
-name:            saddo_arith_extended
-alignment:       4
-legalized:       true
-regBankSelected: true
-tracksRegLiveness: true
-body:             |
-  bb.1.entry:
-    liveins: $w0, $x0
-    ; Check that we get ADDSXrx.
-    ; CHECK-LABEL: name: saddo_arith_extended
-    ; CHECK: liveins: $w0, $x0
-    ; CHECK: %reg0:gpr64sp = COPY $x0
-    ; CHECK: %reg1:gpr32 = COPY $w0
-    ; CHECK: %add:gpr64 = ADDSXrx %reg0, %reg1, 18, implicit-def $nzcv
-    ; CHECK: %flags:gpr32 = CSINCWr $wzr, $wzr, 7, implicit $nzcv
-    ; CHECK: $x0 = COPY %add
-    ; CHECK: RET_ReallyLR implicit $x0
-    %reg0:gpr(s64) = COPY $x0
-    %reg1:gpr(s32) = COPY $w0
-    %ext:gpr(s64) = G_ZEXT %reg1(s32)
-    %cst:gpr(s64) = G_CONSTANT i64 2
-    %shift:gpr(s64) = G_SHL %ext, %cst(s64)
-    %add:gpr(s64), %flags:gpr(s1) = G_SADDO %reg0, %shift
-    $x0 = COPY %add(s64)
-    RET_ReallyLR implicit $x0
diff --git a/gnu/llvm/llvm/lib/Target/AArch64/GISel/select-ssubo.mir b/gnu/llvm/llvm/lib/Target/AArch64/GISel/select-ssubo.mir
deleted file mode 100644
index f6b1794645f..00000000000
--- a/gnu/llvm/llvm/lib/Target/AArch64/GISel/select-ssubo.mir
+++ /dev/null
@@ -1,158 +0,0 @@
-# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py
-# RUN: llc -verify-machineinstrs -mtriple aarch64-unknown-uknown -global-isel -run-pass=instruction-select %s -o - | FileCheck %s
-
-...
----
-name:            ssubo_s32
-alignment:       4
-legalized:       true
-regBankSelected: true
-tracksRegLiveness: true
-body:             |
-  bb.1.entry:
-    liveins: $w0, $w1, $x2
-
-    ; CHECK-LABEL: name: ssubo_s32
-    ; CHECK: liveins: $w0, $w1, $x2
-    ; CHECK: %reg0:gpr32 = COPY $w0
-    ; CHECK: %reg1:gpr32 = COPY $w1
-    ; CHECK: %ssubo:gpr32 = SUBSWrr %reg0, %reg1, implicit-def $nzcv
-    ; CHECK: [[CSINCWr:%[0-9]+]]:gpr32 = CSINCWr $wzr, $wzr, 7, implicit $nzcv
-    ; CHECK: $w0 = COPY %ssubo
-    ; CHECK: RET_ReallyLR implicit $w0
-    %reg0:gpr(s32) = COPY $w0
-    %reg1:gpr(s32) = COPY $w1
-    %ssubo:gpr(s32), %4:gpr(s1) = G_SSUBO %reg0, %reg1
-    $w0 = COPY %ssubo(s32)
-    RET_ReallyLR implicit $w0
-
-...
----
-name:            ssubo_s64
-alignment:       4
-legalized:       true
-regBankSelected: true
-tracksRegLiveness: true
-body:             |
-  bb.1.entry:
-    liveins: $x0, $x1, $x2
-
-    ; CHECK-LABEL: name: ssubo_s64
-    ; CHECK: liveins: $x0, $x1, $x2
-    ; CHECK: %reg0:gpr64 = COPY $x0
-    ; CHECK: %reg1:gpr64 = COPY $x1
-    ; CHECK: %ssubo:gpr64 = SUBSXrr %reg0, %reg1, implicit-def $nzcv
-    ; CHECK: [[CSINCWr:%[0-9]+]]:gpr32 = CSINCWr $wzr, $wzr, 7, implicit $nzcv
-    ; CHECK: $x0 = COPY %ssubo
-    ; CHECK: RET_ReallyLR implicit $x0
-    %reg0:gpr(s64) = COPY $x0
-    %reg1:gpr(s64) = COPY $x1
-    %ssubo:gpr(s64), %4:gpr(s1) = G_SSUBO %reg0, %reg1
-    $x0 = COPY %ssubo(s64)
-    RET_ReallyLR implicit $x0
-
-...
----
-name:            ssubo_s32_imm
-alignment:       4
-legalized:       true
-regBankSelected: true
-tracksRegLiveness: true
-body:             |
-  bb.1.entry:
-    liveins: $w0, $w1, $x2
-    ; Check that we get SUBSWri when we can fold in a constant.
-    ;
-    ; CHECK-LABEL: name: ssubo_s32_imm
-    ; CHECK: liveins: $w0, $w1, $x2
-    ; CHECK: %copy:gpr32sp = COPY $w0
-    ; CHECK: %ssubo:gpr32 = SUBSWri %copy, 16, 0, implicit-def $nzcv
-    ; CHECK: %overflow:gpr32 = CSINCWr $wzr, $wzr, 7, implicit $nzcv
-    ; CHECK: $w0 = COPY %ssubo
-    ; CHECK: RET_ReallyLR implicit $w0
-    %copy:gpr(s32) = COPY $w0
-    %constant:gpr(s32) = G_CONSTANT i32 16
-    %ssubo:gpr(s32), %overflow:gpr(s1) = G_SSUBO %copy, %constant
-    $w0 = COPY %ssubo(s32)
-    RET_ReallyLR implicit $w0
-
-...
----
-name:            ssubo_s32_shifted
-alignment:       4
-legalized:       true
-regBankSelected: true
-tracksRegLiveness: true
-body:             |
-  bb.1.entry:
-    liveins: $w0, $w1, $x2
-    ; Check that we get SUBSWrs when we can fold in a shift.
-    ;
-    ; CHECK-LABEL: name: ssubo_s32_shifted
-    ; CHECK: liveins: $w0, $w1, $x2
-    ; CHECK: %reg0:gpr32 = COPY $w0
-    ; CHECK: %reg1:gpr32 = COPY $w1
-    ; CHECK: %sub:gpr32 = SUBSWrs %reg0, %reg1, 16, implicit-def $nzcv
-    ; CHECK: %overflow:gpr32 = CSINCWr $wzr, $wzr, 7, implicit $nzcv
-    ; CHECK: $w0 = COPY %sub
-    ; CHECK: RET_ReallyLR implicit $w0
-    %reg0:gpr(s32) = COPY $w0
-    %reg1:gpr(s32) = COPY $w1
-    %constant:gpr(s32) = G_CONSTANT i32 16
-    %shift:gpr(s32) = G_SHL %reg1(s32), %constant(s32)
-    %sub:gpr(s32), %overflow:gpr(s1) = G_SSUBO %reg0, %shift
-    $w0 = COPY %sub(s32)
-    RET_ReallyLR implicit $w0
-
-...
----
-name:            ssubo_s32_neg_imm
-alignment:       4
-legalized:       true
-regBankSelected: true
-tracksRegLiveness: true
-body:             |
-  bb.1.entry:
-    liveins: $w0, $w1, $x2
-    ; Check that we get ADDSWri when we can fold in a negative constant.
-    ;
-    ; CHECK-LABEL: name: ssubo_s32_neg_imm
-    ; CHECK: liveins: $w0, $w1, $x2
-    ; CHECK: %copy:gpr32sp = COPY $w0
-    ; CHECK: %sub:gpr32 = ADDSWri %copy, 16, 0, implicit-def $nzcv
-    ; CHECK: %overflow:gpr32 = CSINCWr $wzr, $wzr, 7, implicit $nzcv
-    ; CHECK: $w0 = COPY %sub
-    ; CHECK: RET_ReallyLR implicit $w0
-    %copy:gpr(s32) = COPY $w0
-    %constant:gpr(s32) = G_CONSTANT i32 -16
-    %sub:gpr(s32), %overflow:gpr(s1) = G_SSUBO %copy, %constant
-    $w0 = COPY %sub(s32)
-    RET_ReallyLR implicit $w0
-
-...
----
-name:            ssubo_arith_extended
-alignment:       4
-legalized:       true
-regBankSelected: true
-tracksRegLiveness: true
-body:             |
-  bb.1.entry:
-    liveins: $w0, $x0
-    ; Check that we get SUBSXrx.
-    ; CHECK-LABEL: name: ssubo_arith_extended
-    ; CHECK: liveins: $w0, $x0
-    ; CHECK: %reg0:gpr64sp = COPY $x0
-    ; CHECK: %reg1:gpr32 = COPY $w0
-    ; CHECK: %sub:gpr64 = SUBSXrx %reg0, %reg1, 18, implicit-def $nzcv
-    ; CHECK: %flags:gpr32 = CSINCWr $wzr, $wzr, 7, implicit $nzcv
-    ; CHECK: $x0 = COPY %sub
-    ; CHECK: RET_ReallyLR implicit $x0
-    %reg0:gpr(s64) = COPY $x0
-    %reg1:gpr(s32) = COPY $w0
-    %ext:gpr(s64) = G_ZEXT %reg1(s32)
-    %cst:gpr(s64) = G_CONSTANT i64 2
-    %shift:gpr(s64) = G_SHL %ext, %cst(s64)
-    %sub:gpr(s64), %flags:gpr(s1) = G_SSUBO %reg0, %shift
-    $x0 = COPY %sub(s64)
-    RET_ReallyLR implicit $x0
diff --git a/gnu/llvm/llvm/lib/Target/AMDGPU/AMDGPUFixFunctionBitcasts.cpp b/gnu/llvm/llvm/lib/Target/AMDGPU/AMDGPUFixFunctionBitcasts.cpp
deleted file mode 100644
index ea6c6d0fd21..00000000000
--- a/gnu/llvm/llvm/lib/Target/AMDGPU/AMDGPUFixFunctionBitcasts.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-//===-- AMDGPUFixFunctionBitcasts.cpp - Fix function bitcasts -------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-///
-/// \file
-/// Promote indirect (bitcast) calls to direct calls when they are statically
-/// known to be direct. Required when InstCombine is not run (e.g. at OptNone)
-/// because AMDGPU does not support indirect calls.
-///
-//===----------------------------------------------------------------------===//
-
-#include "AMDGPU.h"
-#include "llvm/IR/InstVisitor.h"
-#include "llvm/Pass.h"
-#include "llvm/Transforms/Utils/CallPromotionUtils.h"
-
-using namespace llvm;
-
-#define DEBUG_TYPE "amdgpu-fix-function-bitcasts"
-
-namespace {
-class AMDGPUFixFunctionBitcasts final
-    : public ModulePass,
-      public InstVisitor<AMDGPUFixFunctionBitcasts> {
-
-  bool runOnModule(Module &M) override;
-
-  bool Modified;
-
-public:
-  void visitCallBase(CallBase &CB) {
-    if (CB.getCalledFunction())
-      return;
-    auto *Callee =
-        dyn_cast<Function>(CB.getCalledOperand()->stripPointerCasts());
-    if (Callee && isLegalToPromote(CB, Callee)) {
-      promoteCall(CB, Callee);
-      Modified = true;
-    }
-  }
-
-  static char ID;
-  AMDGPUFixFunctionBitcasts() : ModulePass(ID) {}
-};
-} // End anonymous namespace
-
-char AMDGPUFixFunctionBitcasts::ID = 0;
-char &llvm::AMDGPUFixFunctionBitcastsID = AMDGPUFixFunctionBitcasts::ID;
-INITIALIZE_PASS(AMDGPUFixFunctionBitcasts, DEBUG_TYPE,
-                "Fix function bitcasts for AMDGPU", false, false)
-
-ModulePass *llvm::createAMDGPUFixFunctionBitcastsPass() {
-  return new AMDGPUFixFunctionBitcasts();
-}
-
-bool AMDGPUFixFunctionBitcasts::runOnModule(Module &M) {
-  Modified = false;
-  visit(M);
-  return Modified;
-}
diff --git a/gnu/llvm/llvm/lib/Target/AMDGPU/AMDILCFGStructurizer.cpp b/gnu/llvm/llvm/lib/Target/AMDGPU/AMDILCFGStructurizer.cpp
deleted file mode 100644
index 56befe4ed0d..00000000000
--- a/gnu/llvm/llvm/lib/Target/AMDGPU/AMDILCFGStructurizer.cpp
+++ /dev/null
@@ -1,1656 +0,0 @@
-//===- AMDILCFGStructurizer.cpp - CFG Structurizer ------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//==-----------------------------------------------------------------------===//
-
-#include "AMDGPU.h"
-#include "MCTargetDesc/AMDGPUMCTargetDesc.h"
-#include "R600RegisterInfo.h"
-#include "R600Subtarget.h"
-#include "llvm/ADT/SCCIterator.h"
-#include "llvm/ADT/Statistic.h"
-#include "llvm/CodeGen/MachineFunction.h"
-#include "llvm/CodeGen/MachineFunctionPass.h"
-#include "llvm/CodeGen/MachineJumpTableInfo.h"
-#include "llvm/CodeGen/MachineLoopInfo.h"
-#include "llvm/CodeGen/MachinePostDominators.h"
-#include "llvm/InitializePasses.h"
-
-using namespace llvm;
-
-#define DEBUG_TYPE "structcfg"
-
-#define DEFAULT_VEC_SLOTS 8
-
-// TODO: move-begin.
-
-//===----------------------------------------------------------------------===//
-//
-// Statistics for CFGStructurizer.
-//
-//===----------------------------------------------------------------------===//
-
-STATISTIC(numSerialPatternMatch,    "CFGStructurizer number of serial pattern "
-    "matched");
-STATISTIC(numIfPatternMatch,        "CFGStructurizer number of if pattern "
-    "matched");
-STATISTIC(numClonedBlock,           "CFGStructurizer cloned blocks");
-STATISTIC(numClonedInstr,           "CFGStructurizer cloned instructions");
-
-namespace llvm {
-
-void initializeAMDGPUCFGStructurizerPass(PassRegistry &);
-
-} // end namespace llvm
-
-namespace {
-
-//===----------------------------------------------------------------------===//
-//
-// Miscellaneous utility for CFGStructurizer.
-//
-//===----------------------------------------------------------------------===//
-
-#define SHOWNEWINSTR(i) LLVM_DEBUG(dbgs() << "New instr: " << *i << "\n");
-
-#define SHOWNEWBLK(b, msg)                                                     \
-  LLVM_DEBUG(dbgs() << msg << "BB" << b->getNumber() << "size " << b->size();  \
-             dbgs() << "\n";);
-
-#define SHOWBLK_DETAIL(b, msg)                                                 \
-  LLVM_DEBUG(if (b) {                                                          \
-    dbgs() << msg << "BB" << b->getNumber() << "size " << b->size();           \
-    b->print(dbgs());                                                          \
-    dbgs() << "\n";                                                            \
-  });
-
-#define INVALIDSCCNUM -1
-
-//===----------------------------------------------------------------------===//
-//
-// supporting data structure for CFGStructurizer
-//
-//===----------------------------------------------------------------------===//
-
-class BlockInformation {
-public:
-  bool IsRetired = false;
-  int SccNum = INVALIDSCCNUM;
-
-  BlockInformation() = default;
-};
-
-//===----------------------------------------------------------------------===//
-//
-// CFGStructurizer
-//
-//===----------------------------------------------------------------------===//
-
-class AMDGPUCFGStructurizer : public MachineFunctionPass {
-public:
-  using MBBVector = SmallVector<MachineBasicBlock *, 32>;
-  using MBBInfoMap = std::map<MachineBasicBlock *, BlockInformation *>;
-  using LoopLandInfoMap = std::map<MachineLoop *, MachineBasicBlock *>;
-
-  enum PathToKind {
-    Not_SinglePath = 0,
-    SinglePath_InPath = 1,
-    SinglePath_NotInPath = 2
-  };
-
-  static char ID;
-
-  AMDGPUCFGStructurizer() : MachineFunctionPass(ID) {
-    initializeAMDGPUCFGStructurizerPass(*PassRegistry::getPassRegistry());
-  }
-
-  StringRef getPassName() const override {
-    return "AMDGPU Control Flow Graph structurizer Pass";
-  }
-
-  void getAnalysisUsage(AnalysisUsage &AU) const override {
-    AU.addRequired<MachineDominatorTree>();
-    AU.addRequired<MachinePostDominatorTree>();
-    AU.addRequired<MachineLoopInfo>();
-    MachineFunctionPass::getAnalysisUsage(AU);
-  }
-
-  /// Perform the CFG structurization
-  bool run();
-
-  /// Perform the CFG preparation
-  /// This step will remove every unconditionnal/dead jump instructions and make
-  /// sure all loops have an exit block
-  bool prepare();
-
-  bool runOnMachineFunction(MachineFunction &MF) override {
-    TII = MF.getSubtarget<R600Subtarget>().getInstrInfo();
-    TRI = &TII->getRegisterInfo();
-    LLVM_DEBUG(MF.dump(););
-    OrderedBlks.clear();
-    Visited.clear();
-    FuncRep = &MF;
-    MLI = &getAnalysis<MachineLoopInfo>();
-    LLVM_DEBUG(dbgs() << "LoopInfo:\n"; PrintLoopinfo(*MLI););
-    MDT = &getAnalysis<MachineDominatorTree>();
-    LLVM_DEBUG(MDT->print(dbgs(), (const Module *)nullptr););
-    PDT = &getAnalysis<MachinePostDominatorTree>();
-    LLVM_DEBUG(PDT->print(dbgs()););
-    prepare();
-    run();
-    LLVM_DEBUG(MF.dump(););
-    return true;
-  }
-
-protected:
-  MachineDominatorTree *MDT;
-  MachinePostDominatorTree *PDT;
-  MachineLoopInfo *MLI;
-  const R600InstrInfo *TII = nullptr;
-  const R600RegisterInfo *TRI = nullptr;
-
-  // PRINT FUNCTIONS
-  /// Print the ordered Blocks.
-  void printOrderedBlocks() const {
-    size_t i = 0;
-    for (MBBVector::const_iterator iterBlk = OrderedBlks.begin(),
-        iterBlkEnd = OrderedBlks.end(); iterBlk != iterBlkEnd; ++iterBlk, ++i) {
-      dbgs() << "BB" << (*iterBlk)->getNumber();
-      dbgs() << "(" << getSCCNum(*iterBlk) << "," << (*iterBlk)->size() << ")";
-      if (i != 0 && i % 10 == 0) {
-        dbgs() << "\n";
-      } else {
-        dbgs() << " ";
-      }
-    }
-  }
-
-  static void PrintLoopinfo(const MachineLoopInfo &LoopInfo) {
-    for (MachineLoop::iterator iter = LoopInfo.begin(),
-         iterEnd = LoopInfo.end(); iter != iterEnd; ++iter) {
-      (*iter)->print(dbgs());
-    }
-  }
-
-  // UTILITY FUNCTIONS
-  int getSCCNum(MachineBasicBlock *MBB) const;
-  MachineBasicBlock *getLoopLandInfo(MachineLoop *LoopRep) const;
-  bool hasBackEdge(MachineBasicBlock *MBB) const;
-  bool isRetiredBlock(MachineBasicBlock *MBB) const;
-  bool isActiveLoophead(MachineBasicBlock *MBB) const;
-  PathToKind singlePathTo(MachineBasicBlock *SrcMBB, MachineBasicBlock *DstMBB,
-      bool AllowSideEntry = true) const;
-  int countActiveBlock(MBBVector::const_iterator It,
-      MBBVector::const_iterator E) const;
-  bool needMigrateBlock(MachineBasicBlock *MBB) const;
-
-  // Utility Functions
-  void reversePredicateSetter(MachineBasicBlock::iterator I,
-                              MachineBasicBlock &MBB);
-  /// Compute the reversed DFS post order of Blocks
-  void orderBlocks(MachineFunction *MF);
-
-  // Function originally from CFGStructTraits
-  void insertInstrEnd(MachineBasicBlock *MBB, int NewOpcode,
-                      const DebugLoc &DL = DebugLoc());
-  MachineInstr *insertInstrBefore(MachineBasicBlock *MBB, int NewOpcode,
-                                  const DebugLoc &DL = DebugLoc());
-  MachineInstr *insertInstrBefore(MachineBasicBlock::iterator I, int NewOpcode);
-  void insertCondBranchBefore(MachineBasicBlock::iterator I, int NewOpcode,
-                              const DebugLoc &DL);
-  void insertCondBranchBefore(MachineBasicBlock *MBB,
-                              MachineBasicBlock::iterator I, int NewOpcode,
-                              int RegNum, const DebugLoc &DL);
-
-  static int getBranchNzeroOpcode(int OldOpcode);
-  static int getBranchZeroOpcode(int OldOpcode);
-  static int getContinueNzeroOpcode(int OldOpcode);
-  static int getContinueZeroOpcode(int OldOpcode);
-  static MachineBasicBlock *getTrueBranch(MachineInstr *MI);
-  static void setTrueBranch(MachineInstr *MI, MachineBasicBlock *MBB);
-  static MachineBasicBlock *getFalseBranch(MachineBasicBlock *MBB,
-      MachineInstr *MI);
-  static bool isCondBranch(MachineInstr *MI);
-  static bool isUncondBranch(MachineInstr *MI);
-  static DebugLoc getLastDebugLocInBB(MachineBasicBlock *MBB);
-  static MachineInstr *getNormalBlockBranchInstr(MachineBasicBlock *MBB);
-
-  /// The correct naming for this is getPossibleLoopendBlockBranchInstr.
-  ///
-  /// BB with backward-edge could have move instructions after the branch
-  /// instruction.  Such move instruction "belong to" the loop backward-edge.
-  MachineInstr *getLoopendBlockBranchInstr(MachineBasicBlock *MBB);
-
-  static MachineInstr *getReturnInstr(MachineBasicBlock *MBB);
-  static bool isReturnBlock(MachineBasicBlock *MBB);
-  static void cloneSuccessorList(MachineBasicBlock *DstMBB,
-      MachineBasicBlock *SrcMBB);
-  static MachineBasicBlock *clone(MachineBasicBlock *MBB);
-
-  /// MachineBasicBlock::ReplaceUsesOfBlockWith doesn't serve the purpose
-  /// because the AMDGPU instruction is not recognized as terminator fix this
-  /// and retire this routine
-  void replaceInstrUseOfBlockWith(MachineBasicBlock *SrcMBB,
-      MachineBasicBlock *OldMBB, MachineBasicBlock *NewBlk);
-
-  static void wrapup(MachineBasicBlock *MBB);
-
-  int patternMatch(MachineBasicBlock *MBB);
-  int patternMatchGroup(MachineBasicBlock *MBB);
-  int serialPatternMatch(MachineBasicBlock *MBB);
-  int ifPatternMatch(MachineBasicBlock *MBB);
-  int loopendPatternMatch();
-  int mergeLoop(MachineLoop *LoopRep);
-
-  /// return true iff src1Blk->succ_size() == 0 && src1Blk and src2Blk are in
-  /// the same loop with LoopLandInfo without explicitly keeping track of
-  /// loopContBlks and loopBreakBlks, this is a method to get the information.
-  bool isSameloopDetachedContbreak(MachineBasicBlock *Src1MBB,
-      MachineBasicBlock *Src2MBB);
-  int handleJumpintoIf(MachineBasicBlock *HeadMBB,
-      MachineBasicBlock *TrueMBB, MachineBasicBlock *FalseMBB);
-  int handleJumpintoIfImp(MachineBasicBlock *HeadMBB,
-      MachineBasicBlock *TrueMBB, MachineBasicBlock *FalseMBB);
-  int improveSimpleJumpintoIf(MachineBasicBlock *HeadMBB,
-      MachineBasicBlock *TrueMBB, MachineBasicBlock *FalseMBB,
-      MachineBasicBlock **LandMBBPtr);
-  void showImproveSimpleJumpintoIf(MachineBasicBlock *HeadMBB,
-      MachineBasicBlock *TrueMBB, MachineBasicBlock *FalseMBB,
-      MachineBasicBlock *LandMBB, bool Detail = false);
-  int cloneOnSideEntryTo(MachineBasicBlock *PreMBB,
-      MachineBasicBlock *SrcMBB, MachineBasicBlock *DstMBB);
-  void mergeSerialBlock(MachineBasicBlock *DstMBB,
-      MachineBasicBlock *SrcMBB);
-
-  void mergeIfthenelseBlock(MachineInstr *BranchMI,
-      MachineBasicBlock *MBB, MachineBasicBlock *TrueMBB,
-      MachineBasicBlock *FalseMBB, MachineBasicBlock *LandMBB);
-  void mergeLooplandBlock(MachineBasicBlock *DstMBB,
-      MachineBasicBlock *LandMBB);
-  void mergeLoopbreakBlock(MachineBasicBlock *ExitingMBB,
-      MachineBasicBlock *LandMBB);
-  void settleLoopcontBlock(MachineBasicBlock *ContingMBB,
-      MachineBasicBlock *ContMBB);
-
-  /// normalizeInfiniteLoopExit change
-  ///   B1:
-  ///        uncond_br LoopHeader
-  ///
-  /// to
-  ///   B1:
-  ///        cond_br 1 LoopHeader dummyExit
-  /// and return the newly added dummy exit block
-  MachineBasicBlock *normalizeInfiniteLoopExit(MachineLoop *LoopRep);
-  void removeUnconditionalBranch(MachineBasicBlock *MBB);
-
-  /// Remove duplicate branches instructions in a block.
-  /// For instance
-  /// B0:
-  ///    cond_br X B1 B2
-  ///    cond_br X B1 B2
-  /// is transformed to
-  /// B0:
-  ///    cond_br X B1 B2
-  void removeRedundantConditionalBranch(MachineBasicBlock *MBB);
-
-  void addDummyExitBlock(SmallVectorImpl<MachineBasicBlock *> &RetMBB);
-  void removeSuccessor(MachineBasicBlock *MBB);
-  MachineBasicBlock *cloneBlockForPredecessor(MachineBasicBlock *MBB,
-      MachineBasicBlock *PredMBB);
-  void migrateInstruction(MachineBasicBlock *SrcMBB,
-      MachineBasicBlock *DstMBB, MachineBasicBlock::iterator I);
-  void recordSccnum(MachineBasicBlock *MBB, int SCCNum);
-  void retireBlock(MachineBasicBlock *MBB);
-
-private:
-  MBBInfoMap BlockInfoMap;
-  LoopLandInfoMap LLInfoMap;
-  std::map<MachineLoop *, bool> Visited;
-  MachineFunction *FuncRep;
-  SmallVector<MachineBasicBlock *, DEFAULT_VEC_SLOTS> OrderedBlks;
-};
-
-} // end anonymous namespace
-
-char AMDGPUCFGStructurizer::ID = 0;
-
-int AMDGPUCFGStructurizer::getSCCNum(MachineBasicBlock *MBB) const {
-  MBBInfoMap::const_iterator It = BlockInfoMap.find(MBB);
-  if (It == BlockInfoMap.end())
-    return INVALIDSCCNUM;
-  return (*It).second->SccNum;
-}
-
-MachineBasicBlock *AMDGPUCFGStructurizer::getLoopLandInfo(MachineLoop *LoopRep)
-    const {
-  LoopLandInfoMap::const_iterator It = LLInfoMap.find(LoopRep);
-  if (It == LLInfoMap.end())
-    return nullptr;
-  return (*It).second;
-}
-
-bool AMDGPUCFGStructurizer::hasBackEdge(MachineBasicBlock *MBB) const {
-  MachineLoop *LoopRep = MLI->getLoopFor(MBB);
-  if (!LoopRep)
-    return false;
-  MachineBasicBlock *LoopHeader = LoopRep->getHeader();
-  return MBB->isSuccessor(LoopHeader);
-}
-
-bool AMDGPUCFGStructurizer::isRetiredBlock(MachineBasicBlock *MBB) const {
-  MBBInfoMap::const_iterator It = BlockInfoMap.find(MBB);
-  if (It == BlockInfoMap.end())
-    return false;
-  return (*It).second->IsRetired;
-}
-
-bool AMDGPUCFGStructurizer::isActiveLoophead(MachineBasicBlock *MBB) const {
-  MachineLoop *LoopRep = MLI->getLoopFor(MBB);
-  while (LoopRep && LoopRep->getHeader() == MBB) {
-    MachineBasicBlock *LoopLand = getLoopLandInfo(LoopRep);
-    if(!LoopLand)
-      return true;
-    if (!isRetiredBlock(LoopLand))
-      return true;
-    LoopRep = LoopRep->getParentLoop();
-  }
-  return false;
-}
-
-AMDGPUCFGStructurizer::PathToKind AMDGPUCFGStructurizer::singlePathTo(
-    MachineBasicBlock *SrcMBB, MachineBasicBlock *DstMBB,
-    bool AllowSideEntry) const {
-  assert(DstMBB);
-  if (SrcMBB == DstMBB)
-    return SinglePath_InPath;
-  while (SrcMBB && SrcMBB->succ_size() == 1) {
-    SrcMBB = *SrcMBB->succ_begin();
-    if (SrcMBB == DstMBB)
-      return SinglePath_InPath;
-    if (!AllowSideEntry && SrcMBB->pred_size() > 1)
-      return Not_SinglePath;
-  }
-  if (SrcMBB && SrcMBB->succ_size()==0)
-    return SinglePath_NotInPath;
-  return Not_SinglePath;
-}
-
-int AMDGPUCFGStructurizer::countActiveBlock(MBBVector::const_iterator It,
-    MBBVector::const_iterator E) const {
-  int Count = 0;
-  while (It != E) {
-    if (!isRetiredBlock(*It))
-      ++Count;
-    ++It;
-  }
-  return Count;
-}
-
-bool AMDGPUCFGStructurizer::needMigrateBlock(MachineBasicBlock *MBB) const {
-  unsigned BlockSizeThreshold = 30;
-  unsigned CloneInstrThreshold = 100;
-  bool MultiplePreds = MBB && (MBB->pred_size() > 1);
-
-  if(!MultiplePreds)
-    return false;
-  unsigned BlkSize = MBB->size();
-  return ((BlkSize > BlockSizeThreshold) &&
-      (BlkSize * (MBB->pred_size() - 1) > CloneInstrThreshold));
-}
-
-void AMDGPUCFGStructurizer::reversePredicateSetter(
-    MachineBasicBlock::iterator I, MachineBasicBlock &MBB) {
-  assert(I.isValid() && "Expected valid iterator");
-  for (;; --I) {
-    if (I == MBB.end())
-      continue;
-    if (I->getOpcode() == R600::PRED_X) {
-      switch (I->getOperand(2).getImm()) {
-      case R600::PRED_SETE_INT:
-        I->getOperand(2).setImm(R600::PRED_SETNE_INT);
-        return;
-      case R600::PRED_SETNE_INT:
-        I->getOperand(2).setImm(R600::PRED_SETE_INT);
-        return;
-      case R600::PRED_SETE:
-        I->getOperand(2).setImm(R600::PRED_SETNE);
-        return;
-      case R600::PRED_SETNE:
-        I->getOperand(2).setImm(R600::PRED_SETE);
-        return;
-      default:
-        llvm_unreachable("PRED_X Opcode invalid!");
-      }
-    }
-  }
-}
-
-void AMDGPUCFGStructurizer::insertInstrEnd(MachineBasicBlock *MBB,
-                                           int NewOpcode, const DebugLoc &DL) {
-  MachineInstr *MI =
-      MBB->getParent()->CreateMachineInstr(TII->get(NewOpcode), DL);
-  MBB->push_back(MI);
-  //assume the instruction doesn't take any reg operand ...
-  SHOWNEWINSTR(MI);
-}
-
-MachineInstr *AMDGPUCFGStructurizer::insertInstrBefore(MachineBasicBlock *MBB,
-                                                       int NewOpcode,
-                                                       const DebugLoc &DL) {
-  MachineInstr *MI =
-      MBB->getParent()->CreateMachineInstr(TII->get(NewOpcode), DL);
-  if (!MBB->empty())
-    MBB->insert(MBB->begin(), MI);
-  else
-    MBB->push_back(MI);
-  SHOWNEWINSTR(MI);
-  return MI;
-}
-
-MachineInstr *AMDGPUCFGStructurizer::insertInstrBefore(
-    MachineBasicBlock::iterator I, int NewOpcode) {
-  MachineInstr *OldMI = &(*I);
-  MachineBasicBlock *MBB = OldMI->getParent();
-  MachineInstr *NewMBB =
-      MBB->getParent()->CreateMachineInstr(TII->get(NewOpcode), DebugLoc());
-  MBB->insert(I, NewMBB);
-  //assume the instruction doesn't take any reg operand ...
-  SHOWNEWINSTR(NewMBB);
-  return NewMBB;
-}
-
-void AMDGPUCFGStructurizer::insertCondBranchBefore(
-    MachineBasicBlock::iterator I, int NewOpcode, const DebugLoc &DL) {
-  MachineInstr *OldMI = &(*I);
-  MachineBasicBlock *MBB = OldMI->getParent();
-  MachineFunction *MF = MBB->getParent();
-  MachineInstr *NewMI = MF->CreateMachineInstr(TII->get(NewOpcode), DL);
-  MBB->insert(I, NewMI);
-  MachineInstrBuilder MIB(*MF, NewMI);
-  MIB.addReg(OldMI->getOperand(1).getReg(), false);
-  SHOWNEWINSTR(NewMI);
-  //erase later oldInstr->eraseFromParent();
-}
-
-void AMDGPUCFGStructurizer::insertCondBranchBefore(
-    MachineBasicBlock *blk, MachineBasicBlock::iterator I, int NewOpcode,
-    int RegNum, const DebugLoc &DL) {
-  MachineFunction *MF = blk->getParent();
-  MachineInstr *NewInstr = MF->CreateMachineInstr(TII->get(NewOpcode), DL);
-  //insert before
-  blk->insert(I, NewInstr);
-  MachineInstrBuilder(*MF, NewInstr).addReg(RegNum, false);
-  SHOWNEWINSTR(NewInstr);
-}
-
-int AMDGPUCFGStructurizer::getBranchNzeroOpcode(int OldOpcode) {
-  switch(OldOpcode) {
-  case R600::JUMP_COND:
-  case R600::JUMP: return R600::IF_PREDICATE_SET;
-  case R600::BRANCH_COND_i32:
-  case R600::BRANCH_COND_f32: return R600::IF_LOGICALNZ_f32;
-  default: llvm_unreachable("internal error");
-  }
-  return -1;
-}
-
-int AMDGPUCFGStructurizer::getBranchZeroOpcode(int OldOpcode) {
-  switch(OldOpcode) {
-  case R600::JUMP_COND:
-  case R600::JUMP: return R600::IF_PREDICATE_SET;
-  case R600::BRANCH_COND_i32:
-  case R600::BRANCH_COND_f32: return R600::IF_LOGICALZ_f32;
-  default: llvm_unreachable("internal error");
-  }
-  return -1;
-}
-
-int AMDGPUCFGStructurizer::getContinueNzeroOpcode(int OldOpcode) {
-  switch(OldOpcode) {
-  case R600::JUMP_COND:
-  case R600::JUMP: return R600::CONTINUE_LOGICALNZ_i32;
-  default: llvm_unreachable("internal error");
-  }
-  return -1;
-}
-
-int AMDGPUCFGStructurizer::getContinueZeroOpcode(int OldOpcode) {
-  switch(OldOpcode) {
-  case R600::JUMP_COND:
-  case R600::JUMP: return R600::CONTINUE_LOGICALZ_i32;
-  default: llvm_unreachable("internal error");
-  }
-  return -1;
-}
-
-MachineBasicBlock *AMDGPUCFGStructurizer::getTrueBranch(MachineInstr *MI) {
-  return MI->getOperand(0).getMBB();
-}
-
-void AMDGPUCFGStructurizer::setTrueBranch(MachineInstr *MI,
-    MachineBasicBlock *MBB) {
-  MI->getOperand(0).setMBB(MBB);
-}
-
-MachineBasicBlock *
-AMDGPUCFGStructurizer::getFalseBranch(MachineBasicBlock *MBB,
-    MachineInstr *MI) {
-  assert(MBB->succ_size() == 2);
-  MachineBasicBlock *TrueBranch = getTrueBranch(MI);
-  MachineBasicBlock::succ_iterator It = MBB->succ_begin();
-  MachineBasicBlock::succ_iterator Next = It;
-  ++Next;
-  return (*It == TrueBranch) ? *Next : *It;
-}
-
-bool AMDGPUCFGStructurizer::isCondBranch(MachineInstr *MI) {
-  switch (MI->getOpcode()) {
-    case R600::JUMP_COND:
-    case R600::BRANCH_COND_i32:
-    case R600::BRANCH_COND_f32: return true;
-  default:
-    return false;
-  }
-  return false;
-}
-
-bool AMDGPUCFGStructurizer::isUncondBranch(MachineInstr *MI) {
-  switch (MI->getOpcode()) {
-  case R600::JUMP:
-  case R600::BRANCH:
-    return true;
-  default:
-    return false;
-  }
-  return false;
-}
-
-DebugLoc AMDGPUCFGStructurizer::getLastDebugLocInBB(MachineBasicBlock *MBB) {
-  //get DebugLoc from the first MachineBasicBlock instruction with debug info
-  DebugLoc DL;
-  for (MachineBasicBlock::iterator It = MBB->begin(); It != MBB->end();
-      ++It) {
-    MachineInstr *instr = &(*It);
-    if (instr->getDebugLoc())
-      DL = instr->getDebugLoc();
-  }
-  return DL;
-}
-
-MachineInstr *AMDGPUCFGStructurizer::getNormalBlockBranchInstr(
-    MachineBasicBlock *MBB) {
-  MachineBasicBlock::reverse_iterator It = MBB->rbegin();
-  MachineInstr *MI = &*It;
-  if (MI && (isCondBranch(MI) || isUncondBranch(MI)))
-    return MI;
-  return nullptr;
-}
-
-MachineInstr *AMDGPUCFGStructurizer::getLoopendBlockBranchInstr(
-    MachineBasicBlock *MBB) {
-  for (MachineBasicBlock::reverse_iterator It = MBB->rbegin(), E = MBB->rend();
-      It != E; ++It) {
-    // FIXME: Simplify
-    MachineInstr *MI = &*It;
-    if (MI) {
-      if (isCondBranch(MI) || isUncondBranch(MI))
-        return MI;
-      else if (!TII->isMov(MI->getOpcode()))
-        break;
-    }
-  }
-  return nullptr;
-}
-
-MachineInstr *AMDGPUCFGStructurizer::getReturnInstr(MachineBasicBlock *MBB) {
-  MachineBasicBlock::reverse_iterator It = MBB->rbegin();
-  if (It != MBB->rend()) {
-    MachineInstr *instr = &(*It);
-    if (instr->getOpcode() == R600::RETURN)
-      return instr;
-  }
-  return nullptr;
-}
-
-bool AMDGPUCFGStructurizer::isReturnBlock(MachineBasicBlock *MBB) {
-  MachineInstr *MI = getReturnInstr(MBB);
-  bool IsReturn = (MBB->succ_size() == 0);
-  if (MI)
-    assert(IsReturn);
-  else if (IsReturn)
-    LLVM_DEBUG(dbgs() << "BB" << MBB->getNumber()
-                      << " is return block without RETURN instr\n";);
-  return  IsReturn;
-}
-
-void AMDGPUCFGStructurizer::cloneSuccessorList(MachineBasicBlock *DstMBB,
-    MachineBasicBlock *SrcMBB) {
-  for (MachineBasicBlock::succ_iterator It = SrcMBB->succ_begin(),
-       iterEnd = SrcMBB->succ_end(); It != iterEnd; ++It)
-    DstMBB->addSuccessor(*It);  // *iter's predecessor is also taken care of
-}
-
-MachineBasicBlock *AMDGPUCFGStructurizer::clone(MachineBasicBlock *MBB) {
-  MachineFunction *Func = MBB->getParent();
-  MachineBasicBlock *NewMBB = Func->CreateMachineBasicBlock();
-  Func->push_back(NewMBB);  //insert to function
-  for (const MachineInstr &It : *MBB)
-    NewMBB->push_back(Func->CloneMachineInstr(&It));
-  return NewMBB;
-}
-
-void AMDGPUCFGStructurizer::replaceInstrUseOfBlockWith(
-    MachineBasicBlock *SrcMBB, MachineBasicBlock *OldMBB,
-    MachineBasicBlock *NewBlk) {
-  MachineInstr *BranchMI = getLoopendBlockBranchInstr(SrcMBB);
-  if (BranchMI && isCondBranch(BranchMI) &&
-      getTrueBranch(BranchMI) == OldMBB)
-    setTrueBranch(BranchMI, NewBlk);
-}
-
-void AMDGPUCFGStructurizer::wrapup(MachineBasicBlock *MBB) {
-  assert((!MBB->getParent()->getJumpTableInfo()
-          || MBB->getParent()->getJumpTableInfo()->isEmpty())
-         && "found a jump table");
-
-   //collect continue right before endloop
-   SmallVector<MachineInstr *, DEFAULT_VEC_SLOTS> ContInstr;
-   MachineBasicBlock::iterator Pre = MBB->begin();
-   MachineBasicBlock::iterator E = MBB->end();
-   MachineBasicBlock::iterator It = Pre;
-   while (It != E) {
-     if (Pre->getOpcode() == R600::CONTINUE
-         && It->getOpcode() == R600::ENDLOOP)
-       ContInstr.push_back(&*Pre);
-     Pre = It;
-     ++It;
-   }
-
-   //delete continue right before endloop
-   for (unsigned i = 0; i < ContInstr.size(); ++i)
-      ContInstr[i]->eraseFromParent();
-
-   // TODO to fix up jump table so later phase won't be confused.  if
-   // (jumpTableInfo->isEmpty() == false) { need to clean the jump table, but
-   // there isn't such an interface yet.  alternatively, replace all the other
-   // blocks in the jump table with the entryBlk //}
-}
-
-bool AMDGPUCFGStructurizer::prepare() {
-  bool Changed = false;
-
-  //FIXME: if not reducible flow graph, make it so ???
-
-  LLVM_DEBUG(dbgs() << "AMDGPUCFGStructurizer::prepare\n";);
-
-  orderBlocks(FuncRep);
-
-  SmallVector<MachineBasicBlock *, DEFAULT_VEC_SLOTS> RetBlks;
-
-  // Add an ExitBlk to loop that don't have one
-  for (MachineLoopInfo::iterator It = MLI->begin(),
-       E = MLI->end(); It != E; ++It) {
-    MachineLoop *LoopRep = (*It);
-    MBBVector ExitingMBBs;
-    LoopRep->getExitingBlocks(ExitingMBBs);
-
-    if (ExitingMBBs.size() == 0) {
-      MachineBasicBlock* DummyExitBlk = normalizeInfiniteLoopExit(LoopRep);
-      if (DummyExitBlk)
-        RetBlks.push_back(DummyExitBlk);
-    }
-  }
-
-  // Remove unconditional branch instr.
-  // Add dummy exit block iff there are multiple returns.
-  for (SmallVectorImpl<MachineBasicBlock *>::const_iterator
-       It = OrderedBlks.begin(), E = OrderedBlks.end(); It != E; ++It) {
-    MachineBasicBlock *MBB = *It;
-    removeUnconditionalBranch(MBB);
-    removeRedundantConditionalBranch(MBB);
-    if (isReturnBlock(MBB)) {
-      RetBlks.push_back(MBB);
-    }
-    assert(MBB->succ_size() <= 2);
-  }
-
-  if (RetBlks.size() >= 2) {
-    addDummyExitBlock(RetBlks);
-    Changed = true;
-  }
-
-  return Changed;
-}
-
-bool AMDGPUCFGStructurizer::run() {
-  //Assume reducible CFG...
-  LLVM_DEBUG(dbgs() << "AMDGPUCFGStructurizer::run\n");
-
-#ifdef STRESSTEST
-  //Use the worse block ordering to test the algorithm.
-  ReverseVector(orderedBlks);
-#endif
-
-  LLVM_DEBUG(dbgs() << "Ordered blocks:\n"; printOrderedBlocks(););
-  int NumIter = 0;
-  bool Finish = false;
-  MachineBasicBlock *MBB;
-  bool MakeProgress = false;
-  int NumRemainedBlk = countActiveBlock(OrderedBlks.begin(),
-                                        OrderedBlks.end());
-
-  do {
-    ++NumIter;
-    LLVM_DEBUG(dbgs() << "numIter = " << NumIter
-                      << ", numRemaintedBlk = " << NumRemainedBlk << "\n";);
-
-    SmallVectorImpl<MachineBasicBlock *>::const_iterator It =
-        OrderedBlks.begin();
-    SmallVectorImpl<MachineBasicBlock *>::const_iterator E =
-        OrderedBlks.end();
-
-    SmallVectorImpl<MachineBasicBlock *>::const_iterator SccBeginIter =
-        It;
-    MachineBasicBlock *SccBeginMBB = nullptr;
-    int SccNumBlk = 0;  // The number of active blocks, init to a
-                        // maximum possible number.
-    int SccNumIter;     // Number of iteration in this SCC.
-
-    while (It != E) {
-      MBB = *It;
-
-      if (!SccBeginMBB) {
-        SccBeginIter = It;
-        SccBeginMBB = MBB;
-        SccNumIter = 0;
-        SccNumBlk = NumRemainedBlk; // Init to maximum possible number.
-        LLVM_DEBUG(dbgs() << "start processing SCC" << getSCCNum(SccBeginMBB);
-                   dbgs() << "\n";);
-      }
-
-      if (!isRetiredBlock(MBB))
-        patternMatch(MBB);
-
-      ++It;
-
-      bool ContNextScc = true;
-      if (It == E
-          || getSCCNum(SccBeginMBB) != getSCCNum(*It)) {
-        // Just finish one scc.
-        ++SccNumIter;
-        int sccRemainedNumBlk = countActiveBlock(SccBeginIter, It);
-        if (sccRemainedNumBlk != 1 && sccRemainedNumBlk >= SccNumBlk) {
-          LLVM_DEBUG(dbgs() << "Can't reduce SCC " << getSCCNum(MBB)
-                            << ", sccNumIter = " << SccNumIter;
-                     dbgs() << "doesn't make any progress\n";);
-          ContNextScc = true;
-        } else if (sccRemainedNumBlk != 1 && sccRemainedNumBlk < SccNumBlk) {
-          SccNumBlk = sccRemainedNumBlk;
-          It = SccBeginIter;
-          ContNextScc = false;
-          LLVM_DEBUG(dbgs() << "repeat processing SCC" << getSCCNum(MBB)
-                            << "sccNumIter = " << SccNumIter << '\n';);
-        } else {
-          // Finish the current scc.
-          ContNextScc = true;
-        }
-      } else {
-        // Continue on next component in the current scc.
-        ContNextScc = false;
-      }
-
-      if (ContNextScc)
-        SccBeginMBB = nullptr;
-    } //while, "one iteration" over the function.
-
-    MachineBasicBlock *EntryMBB =
-        *GraphTraits<MachineFunction *>::nodes_begin(FuncRep);
-    if (EntryMBB->succ_size() == 0) {
-      Finish = true;
-      LLVM_DEBUG(dbgs() << "Reduce to one block\n";);
-    } else {
-      int NewnumRemainedBlk
-        = countActiveBlock(OrderedBlks.begin(), OrderedBlks.end());
-      // consider cloned blocks ??
-      if (NewnumRemainedBlk == 1 || NewnumRemainedBlk < NumRemainedBlk) {
-        MakeProgress = true;
-        NumRemainedBlk = NewnumRemainedBlk;
-      } else {
-        MakeProgress = false;
-        LLVM_DEBUG(dbgs() << "No progress\n";);
-      }
-    }
-  } while (!Finish && MakeProgress);
-
-  // Misc wrap up to maintain the consistency of the Function representation.
-  wrapup(*GraphTraits<MachineFunction *>::nodes_begin(FuncRep));
-
-  // Detach retired Block, release memory.
-  for (MBBInfoMap::iterator It = BlockInfoMap.begin(), E = BlockInfoMap.end();
-      It != E; ++It) {
-    if ((*It).second && (*It).second->IsRetired) {
-      assert(((*It).first)->getNumber() != -1);
-      LLVM_DEBUG(dbgs() << "Erase BB" << ((*It).first)->getNumber() << "\n";);
-      (*It).first->eraseFromParent();  //Remove from the parent Function.
-    }
-    delete (*It).second;
-  }
-  BlockInfoMap.clear();
-  LLInfoMap.clear();
-
-  if (!Finish) {
-    LLVM_DEBUG(FuncRep->viewCFG());
-    report_fatal_error("IRREDUCIBLE_CFG");
-  }
-
-  return true;
-}
-
-void AMDGPUCFGStructurizer::orderBlocks(MachineFunction *MF) {
-  int SccNum = 0;
-  MachineBasicBlock *MBB;
-  for (scc_iterator<MachineFunction *> It = scc_begin(MF); !It.isAtEnd();
-       ++It, ++SccNum) {
-    const std::vector<MachineBasicBlock *> &SccNext = *It;
-    for (std::vector<MachineBasicBlock *>::const_iterator
-         blockIter = SccNext.begin(), blockEnd = SccNext.end();
-         blockIter != blockEnd; ++blockIter) {
-      MBB = *blockIter;
-      OrderedBlks.push_back(MBB);
-      recordSccnum(MBB, SccNum);
-    }
-  }
-
-  // walk through all the block in func to check for unreachable
-  for (auto *MBB : nodes(MF)) {
-    SccNum = getSCCNum(MBB);
-    if (SccNum == INVALIDSCCNUM)
-      dbgs() << "unreachable block BB" << MBB->getNumber() << "\n";
-  }
-}
-
-int AMDGPUCFGStructurizer::patternMatch(MachineBasicBlock *MBB) {
-  int NumMatch = 0;
-  int CurMatch;
-
-  LLVM_DEBUG(dbgs() << "Begin patternMatch BB" << MBB->getNumber() << "\n";);
-
-  while ((CurMatch = patternMatchGroup(MBB)) > 0)
-    NumMatch += CurMatch;
-
-  LLVM_DEBUG(dbgs() << "End patternMatch BB" << MBB->getNumber()
-                    << ", numMatch = " << NumMatch << "\n";);
-
-  return NumMatch;
-}
-
-int AMDGPUCFGStructurizer::patternMatchGroup(MachineBasicBlock *MBB) {
-  int NumMatch = 0;
-  NumMatch += loopendPatternMatch();
-  NumMatch += serialPatternMatch(MBB);
-  NumMatch += ifPatternMatch(MBB);
-  return NumMatch;
-}
-
-int AMDGPUCFGStructurizer::serialPatternMatch(MachineBasicBlock *MBB) {
-  if (MBB->succ_size() != 1)
-    return 0;
-
-  MachineBasicBlock *childBlk = *MBB->succ_begin();
-  if (childBlk->pred_size() != 1 || isActiveLoophead(childBlk))
-    return 0;
-
-  mergeSerialBlock(MBB, childBlk);
-  ++numSerialPatternMatch;
-  return 1;
-}
-
-int AMDGPUCFGStructurizer::ifPatternMatch(MachineBasicBlock *MBB) {
-  //two edges
-  if (MBB->succ_size() != 2)
-    return 0;
-  if (hasBackEdge(MBB))
-    return 0;
-  MachineInstr *BranchMI = getNormalBlockBranchInstr(MBB);
-  if (!BranchMI)
-    return 0;
-
-  assert(isCondBranch(BranchMI));
-  int NumMatch = 0;
-
-  MachineBasicBlock *TrueMBB = getTrueBranch(BranchMI);
-  NumMatch += serialPatternMatch(TrueMBB);
-  NumMatch += ifPatternMatch(TrueMBB);
-  MachineBasicBlock *FalseMBB = getFalseBranch(MBB, BranchMI);
-  NumMatch += serialPatternMatch(FalseMBB);
-  NumMatch += ifPatternMatch(FalseMBB);
-  MachineBasicBlock *LandBlk;
-  int Cloned = 0;
-
-  assert (!TrueMBB->succ_empty() || !FalseMBB->succ_empty());
-  // TODO: Simplify
-  if (TrueMBB->succ_size() == 1 && FalseMBB->succ_size() == 1
-    && *TrueMBB->succ_begin() == *FalseMBB->succ_begin()) {
-    // Diamond pattern
-    LandBlk = *TrueMBB->succ_begin();
-  } else if (TrueMBB->succ_size() == 1 && *TrueMBB->succ_begin() == FalseMBB) {
-    // Triangle pattern, false is empty
-    LandBlk = FalseMBB;
-    FalseMBB = nullptr;
-  } else if (FalseMBB->succ_size() == 1
-             && *FalseMBB->succ_begin() == TrueMBB) {
-    // Triangle pattern, true is empty
-    // We reverse the predicate to make a triangle, empty false pattern;
-    std::swap(TrueMBB, FalseMBB);
-    reversePredicateSetter(MBB->end(), *MBB);
-    LandBlk = FalseMBB;
-    FalseMBB = nullptr;
-  } else if (FalseMBB->succ_size() == 1
-             && isSameloopDetachedContbreak(TrueMBB, FalseMBB)) {
-    LandBlk = *FalseMBB->succ_begin();
-  } else if (TrueMBB->succ_size() == 1
-    && isSameloopDetachedContbreak(FalseMBB, TrueMBB)) {
-    LandBlk = *TrueMBB->succ_begin();
-  } else {
-    return NumMatch + handleJumpintoIf(MBB, TrueMBB, FalseMBB);
-  }
-
-  // improveSimpleJumpinfoIf can handle the case where landBlk == NULL but the
-  // new BB created for landBlk==NULL may introduce new challenge to the
-  // reduction process.
-  if (LandBlk &&
-      ((TrueMBB && TrueMBB->pred_size() > 1)
-      || (FalseMBB && FalseMBB->pred_size() > 1))) {
-     Cloned += improveSimpleJumpintoIf(MBB, TrueMBB, FalseMBB, &LandBlk);
-  }
-
-  if (TrueMBB && TrueMBB->pred_size() > 1) {
-    TrueMBB = cloneBlockForPredecessor(TrueMBB, MBB);
-    ++Cloned;
-  }
-
-  if (FalseMBB && FalseMBB->pred_size() > 1) {
-    FalseMBB = cloneBlockForPredecessor(FalseMBB, MBB);
-    ++Cloned;
-  }
-
-  mergeIfthenelseBlock(BranchMI, MBB, TrueMBB, FalseMBB, LandBlk);
-
-  ++numIfPatternMatch;
-
-  numClonedBlock += Cloned;
-
-  return 1 + Cloned + NumMatch;
-}
-
-int AMDGPUCFGStructurizer::loopendPatternMatch() {
-  std::deque<MachineLoop *> NestedLoops;
-  for (auto &It: *MLI)
-    for (MachineLoop *ML : depth_first(It))
-      NestedLoops.push_front(ML);
-
-  if (NestedLoops.empty())
-    return 0;
-
-  // Process nested loop outside->inside (we did push_front),
-  // so "continue" to a outside loop won't be mistaken as "break"
-  // of the current loop.
-  int Num = 0;
-  for (MachineLoop *ExaminedLoop : NestedLoops) {
-    if (ExaminedLoop->getNumBlocks() == 0 || Visited[ExaminedLoop])
-      continue;
-    LLVM_DEBUG(dbgs() << "Processing:\n"; ExaminedLoop->dump(););
-    int NumBreak = mergeLoop(ExaminedLoop);
-    if (NumBreak == -1)
-      break;
-    Num += NumBreak;
-  }
-  return Num;
-}
-
-int AMDGPUCFGStructurizer::mergeLoop(MachineLoop *LoopRep) {
-  MachineBasicBlock *LoopHeader = LoopRep->getHeader();
-  MBBVector ExitingMBBs;
-  LoopRep->getExitingBlocks(ExitingMBBs);
-  assert(!ExitingMBBs.empty() && "Infinite Loop not supported");
-  LLVM_DEBUG(dbgs() << "Loop has " << ExitingMBBs.size()
-                    << " exiting blocks\n";);
-  // We assume a single ExitBlk
-  MBBVector ExitBlks;
-  LoopRep->getExitBlocks(ExitBlks);
-  SmallPtrSet<MachineBasicBlock *, 2> ExitBlkSet;
-  for (unsigned i = 0, e = ExitBlks.size(); i < e; ++i)
-    ExitBlkSet.insert(ExitBlks[i]);
-  assert(ExitBlkSet.size() == 1);
-  MachineBasicBlock *ExitBlk = *ExitBlks.begin();
-  assert(ExitBlk && "Loop has several exit block");
-  MBBVector LatchBlks;
-  for (auto *LB : inverse_children<MachineBasicBlock*>(LoopHeader))
-    if (LoopRep->contains(LB))
-      LatchBlks.push_back(LB);
-
-  for (unsigned i = 0, e = ExitingMBBs.size(); i < e; ++i)
-    mergeLoopbreakBlock(ExitingMBBs[i], ExitBlk);
-  for (unsigned i = 0, e = LatchBlks.size(); i < e; ++i)
-    settleLoopcontBlock(LatchBlks[i], LoopHeader);
-  int Match = 0;
-  do {
-    Match = 0;
-    Match += serialPatternMatch(LoopHeader);
-    Match += ifPatternMatch(LoopHeader);
-  } while (Match > 0);
-  mergeLooplandBlock(LoopHeader, ExitBlk);
-  MachineLoop *ParentLoop = LoopRep->getParentLoop();
-  if (ParentLoop)
-    MLI->changeLoopFor(LoopHeader, ParentLoop);
-  else
-    MLI->removeBlock(LoopHeader);
-  Visited[LoopRep] = true;
-  return 1;
-}
-
-bool AMDGPUCFGStructurizer::isSameloopDetachedContbreak(
-    MachineBasicBlock *Src1MBB, MachineBasicBlock *Src2MBB) {
-  if (Src1MBB->succ_size() == 0) {
-    MachineLoop *LoopRep = MLI->getLoopFor(Src1MBB);
-    if (LoopRep&& LoopRep == MLI->getLoopFor(Src2MBB)) {
-      MachineBasicBlock *&TheEntry = LLInfoMap[LoopRep];
-      if (TheEntry) {
-        LLVM_DEBUG(dbgs() << "isLoopContBreakBlock yes src1 = BB"
-                          << Src1MBB->getNumber() << " src2 = BB"
-                          << Src2MBB->getNumber() << "\n";);
-        return true;
-      }
-    }
-  }
-  return false;
-}
-
-int AMDGPUCFGStructurizer::handleJumpintoIf(MachineBasicBlock *HeadMBB,
-    MachineBasicBlock *TrueMBB, MachineBasicBlock *FalseMBB) {
-  int Num = handleJumpintoIfImp(HeadMBB, TrueMBB, FalseMBB);
-  if (Num == 0) {
-    LLVM_DEBUG(dbgs() << "handleJumpintoIf swap trueBlk and FalseBlk"
-                      << "\n";);
-    Num = handleJumpintoIfImp(HeadMBB, FalseMBB, TrueMBB);
-  }
-  return Num;
-}
-
-int AMDGPUCFGStructurizer::handleJumpintoIfImp(MachineBasicBlock *HeadMBB,
-    MachineBasicBlock *TrueMBB, MachineBasicBlock *FalseMBB) {
-  int Num = 0;
-  MachineBasicBlock *DownBlk;
-
-  //trueBlk could be the common post dominator
-  DownBlk = TrueMBB;
-
-  LLVM_DEBUG(dbgs() << "handleJumpintoIfImp head = BB" << HeadMBB->getNumber()
-                    << " true = BB" << TrueMBB->getNumber()
-                    << ", numSucc=" << TrueMBB->succ_size() << " false = BB"
-                    << FalseMBB->getNumber() << "\n";);
-
-  while (DownBlk) {
-    LLVM_DEBUG(dbgs() << "check down = BB" << DownBlk->getNumber(););
-
-    if (singlePathTo(FalseMBB, DownBlk) == SinglePath_InPath) {
-      LLVM_DEBUG(dbgs() << " working\n";);
-
-      Num += cloneOnSideEntryTo(HeadMBB, TrueMBB, DownBlk);
-      Num += cloneOnSideEntryTo(HeadMBB, FalseMBB, DownBlk);
-
-      numClonedBlock += Num;
-      Num += serialPatternMatch(*HeadMBB->succ_begin());
-      Num += serialPatternMatch(*std::next(HeadMBB->succ_begin()));
-      Num += ifPatternMatch(HeadMBB);
-      assert(Num > 0);
-
-      break;
-    }
-    LLVM_DEBUG(dbgs() << " not working\n";);
-    DownBlk = (DownBlk->succ_size() == 1) ? (*DownBlk->succ_begin()) : nullptr;
-  } // walk down the postDomTree
-
-  return Num;
-}
-
-#ifndef NDEBUG
-void AMDGPUCFGStructurizer::showImproveSimpleJumpintoIf(
-    MachineBasicBlock *HeadMBB, MachineBasicBlock *TrueMBB,
-    MachineBasicBlock *FalseMBB, MachineBasicBlock *LandMBB, bool Detail) {
-  dbgs() << "head = BB" << HeadMBB->getNumber()
-         << " size = " << HeadMBB->size();
-  if (Detail) {
-    dbgs() << "\n";
-    HeadMBB->print(dbgs());
-    dbgs() << "\n";
-  }
-
-  if (TrueMBB) {
-    dbgs() << ", true = BB" << TrueMBB->getNumber() << " size = "
-           << TrueMBB->size() << " numPred = " << TrueMBB->pred_size();
-    if (Detail) {
-      dbgs() << "\n";
-      TrueMBB->print(dbgs());
-      dbgs() << "\n";
-    }
-  }
-  if (FalseMBB) {
-    dbgs() << ", false = BB" << FalseMBB->getNumber() << " size = "
-           << FalseMBB->size() << " numPred = " << FalseMBB->pred_size();
-    if (Detail) {
-      dbgs() << "\n";
-      FalseMBB->print(dbgs());
-      dbgs() << "\n";
-    }
-  }
-  if (LandMBB) {
-    dbgs() << ", land = BB" << LandMBB->getNumber() << " size = "
-           << LandMBB->size() << " numPred = " << LandMBB->pred_size();
-    if (Detail) {
-      dbgs() << "\n";
-      LandMBB->print(dbgs());
-      dbgs() << "\n";
-    }
-  }
-
-  dbgs() << "\n";
-}
-#endif
-
-int AMDGPUCFGStructurizer::improveSimpleJumpintoIf(MachineBasicBlock *HeadMBB,
-    MachineBasicBlock *TrueMBB, MachineBasicBlock *FalseMBB,
-    MachineBasicBlock **LandMBBPtr) {
-  bool MigrateTrue = false;
-  bool MigrateFalse = false;
-
-  MachineBasicBlock *LandBlk = *LandMBBPtr;
-
-  assert((!TrueMBB || TrueMBB->succ_size() <= 1)
-         && (!FalseMBB || FalseMBB->succ_size() <= 1));
-
-  if (TrueMBB == FalseMBB)
-    return 0;
-
-  MigrateTrue = needMigrateBlock(TrueMBB);
-  MigrateFalse = needMigrateBlock(FalseMBB);
-
-  if (!MigrateTrue && !MigrateFalse)
-    return 0;
-
-  // If we need to migrate either trueBlk and falseBlk, migrate the rest that
-  // have more than one predecessors.  without doing this, its predecessor
-  // rather than headBlk will have undefined value in initReg.
-  if (!MigrateTrue && TrueMBB && TrueMBB->pred_size() > 1)
-    MigrateTrue = true;
-  if (!MigrateFalse && FalseMBB && FalseMBB->pred_size() > 1)
-    MigrateFalse = true;
-
-  LLVM_DEBUG(
-      dbgs() << "before improveSimpleJumpintoIf: ";
-      showImproveSimpleJumpintoIf(HeadMBB, TrueMBB, FalseMBB, LandBlk, 0););
-
-  // org: headBlk => if () {trueBlk} else {falseBlk} => landBlk
-  //
-  // new: headBlk => if () {initReg = 1; org trueBlk branch} else
-  //      {initReg = 0; org falseBlk branch }
-  //      => landBlk => if (initReg) {org trueBlk} else {org falseBlk}
-  //      => org landBlk
-  //      if landBlk->pred_size() > 2, put the about if-else inside
-  //      if (initReg !=2) {...}
-  //
-  // add initReg = initVal to headBlk
-
-  const TargetRegisterClass * I32RC = TRI->getCFGStructurizerRegClass(MVT::i32);
-  if (!MigrateTrue || !MigrateFalse) {
-    // XXX: We have an opportunity here to optimize the "branch into if" case
-    // here.  Branch into if looks like this:
-    //                        entry
-    //                       /     |
-    //           diamond_head       branch_from
-    //             /      \           |
-    // diamond_false        diamond_true
-    //             \      /
-    //               done
-    //
-    // The diamond_head block begins the "if" and the diamond_true block
-    // is the block being "branched into".
-    //
-    // If MigrateTrue is true, then TrueBB is the block being "branched into"
-    // and if MigrateFalse is true, then FalseBB is the block being
-    // "branched into"
-    //
-    // Here is the pseudo code for how I think the optimization should work:
-    // 1. Insert MOV GPR0, 0 before the branch instruction in diamond_head.
-    // 2. Insert MOV GPR0, 1 before the branch instruction in branch_from.
-    // 3. Move the branch instruction from diamond_head into its own basic
-    //    block (new_block).
-    // 4. Add an unconditional branch from diamond_head to new_block
-    // 5. Replace the branch instruction in branch_from with an unconditional
-    //    branch to new_block.  If branch_from has multiple predecessors, then
-    //    we need to replace the True/False block in the branch
-    //    instruction instead of replacing it.
-    // 6. Change the condition of the branch instruction in new_block from
-    //    COND to (COND || GPR0)
-    //
-    // In order insert these MOV instruction, we will need to use the
-    // RegisterScavenger.  Usually liveness stops being tracked during
-    // the late machine optimization passes, however if we implement
-    // bool TargetRegisterInfo::requiresRegisterScavenging(
-    //                                                const MachineFunction &MF)
-    // and have it return true, liveness will be tracked correctly
-    // by generic optimization passes.  We will also need to make sure that
-    // all of our target-specific passes that run after regalloc and before
-    // the CFGStructurizer track liveness and we will need to modify this pass
-    // to correctly track liveness.
-    //
-    // After the above changes, the new CFG should look like this:
-    //                        entry
-    //                       /     |
-    //           diamond_head       branch_from
-    //                       \     /
-    //                      new_block
-    //                      /      |
-    //         diamond_false        diamond_true
-    //                      \      /
-    //                        done
-    //
-    // Without this optimization, we are forced to duplicate the diamond_true
-    // block and we will end up with a CFG like this:
-    //
-    //                        entry
-    //                       /     |
-    //           diamond_head       branch_from
-    //             /      \                   |
-    // diamond_false        diamond_true      diamond_true (duplicate)
-    //             \      /                   |
-    //               done --------------------|
-    //
-    // Duplicating diamond_true can be very costly especially if it has a
-    // lot of instructions.
-    return 0;
-  }
-
-  int NumNewBlk = 0;
-
-  bool LandBlkHasOtherPred = (LandBlk->pred_size() > 2);
-
-  //insert R600::ENDIF to avoid special case "input landBlk == NULL"
-  MachineBasicBlock::iterator I = insertInstrBefore(LandBlk, R600::ENDIF);
-
-  if (LandBlkHasOtherPred) {
-    report_fatal_error("Extra register needed to handle CFG");
-    Register CmpResReg =
-        HeadMBB->getParent()->getRegInfo().createVirtualRegister(I32RC);
-    report_fatal_error("Extra compare instruction needed to handle CFG");
-    insertCondBranchBefore(LandBlk, I, R600::IF_PREDICATE_SET,
-        CmpResReg, DebugLoc());
-  }
-
-  // XXX: We are running this after RA, so creating virtual registers will
-  // cause an assertion failure in the PostRA scheduling pass.
-  Register InitReg =
-      HeadMBB->getParent()->getRegInfo().createVirtualRegister(I32RC);
-  insertCondBranchBefore(LandBlk, I, R600::IF_PREDICATE_SET, InitReg,
-      DebugLoc());
-
-  if (MigrateTrue) {
-    migrateInstruction(TrueMBB, LandBlk, I);
-    // need to uncondionally insert the assignment to ensure a path from its
-    // predecessor rather than headBlk has valid value in initReg if
-    // (initVal != 1).
-    report_fatal_error("Extra register needed to handle CFG");
-  }
-  insertInstrBefore(I, R600::ELSE);
-
-  if (MigrateFalse) {
-    migrateInstruction(FalseMBB, LandBlk, I);
-    // need to uncondionally insert the assignment to ensure a path from its
-    // predecessor rather than headBlk has valid value in initReg if
-    // (initVal != 0)
-    report_fatal_error("Extra register needed to handle CFG");
-  }
-
-  if (LandBlkHasOtherPred) {
-    // add endif
-    insertInstrBefore(I, R600::ENDIF);
-
-    // put initReg = 2 to other predecessors of landBlk
-    for (MachineBasicBlock::pred_iterator PI = LandBlk->pred_begin(),
-         PE = LandBlk->pred_end(); PI != PE; ++PI) {
-      MachineBasicBlock *MBB = *PI;
-      if (MBB != TrueMBB && MBB != FalseMBB)
-        report_fatal_error("Extra register needed to handle CFG");
-    }
-  }
-  LLVM_DEBUG(
-      dbgs() << "result from improveSimpleJumpintoIf: ";
-      showImproveSimpleJumpintoIf(HeadMBB, TrueMBB, FalseMBB, LandBlk, 0););
-
-  // update landBlk
-  *LandMBBPtr = LandBlk;
-
-  return NumNewBlk;
-}
-
-void AMDGPUCFGStructurizer::mergeSerialBlock(MachineBasicBlock *DstMBB,
-    MachineBasicBlock *SrcMBB) {
-  LLVM_DEBUG(dbgs() << "serialPattern BB" << DstMBB->getNumber() << " <= BB"
-                    << SrcMBB->getNumber() << "\n";);
-  DstMBB->splice(DstMBB->end(), SrcMBB, SrcMBB->begin(), SrcMBB->end());
-
-  DstMBB->removeSuccessor(SrcMBB, true);
-  cloneSuccessorList(DstMBB, SrcMBB);
-
-  removeSuccessor(SrcMBB);
-  MLI->removeBlock(SrcMBB);
-  retireBlock(SrcMBB);
-}
-
-void AMDGPUCFGStructurizer::mergeIfthenelseBlock(MachineInstr *BranchMI,
-    MachineBasicBlock *MBB, MachineBasicBlock *TrueMBB,
-    MachineBasicBlock *FalseMBB, MachineBasicBlock *LandMBB) {
-  assert (TrueMBB);
-  LLVM_DEBUG(dbgs() << "ifPattern BB" << MBB->getNumber(); dbgs() << "{  ";
-             if (TrueMBB) { dbgs() << "BB" << TrueMBB->getNumber(); } dbgs()
-             << "  } else ";
-             dbgs() << "{  "; if (FalseMBB) {
-               dbgs() << "BB" << FalseMBB->getNumber();
-             } dbgs() << "  }\n ";
-             dbgs() << "landBlock: "; if (!LandMBB) { dbgs() << "NULL"; } else {
-               dbgs() << "BB" << LandMBB->getNumber();
-             } dbgs() << "\n";);
-
-  int OldOpcode = BranchMI->getOpcode();
-  DebugLoc BranchDL = BranchMI->getDebugLoc();
-
-//    transform to
-//    if cond
-//       trueBlk
-//    else
-//       falseBlk
-//    endif
-//    landBlk
-
-  MachineBasicBlock::iterator I = BranchMI;
-  insertCondBranchBefore(I, getBranchNzeroOpcode(OldOpcode),
-      BranchDL);
-
-  if (TrueMBB) {
-    MBB->splice(I, TrueMBB, TrueMBB->begin(), TrueMBB->end());
-    MBB->removeSuccessor(TrueMBB, true);
-    if (LandMBB && TrueMBB->succ_size()!=0)
-      TrueMBB->removeSuccessor(LandMBB, true);
-    retireBlock(TrueMBB);
-    MLI->removeBlock(TrueMBB);
-  }
-
-  if (FalseMBB) {
-    insertInstrBefore(I, R600::ELSE);
-    MBB->splice(I, FalseMBB, FalseMBB->begin(),
-                   FalseMBB->end());
-    MBB->removeSuccessor(FalseMBB, true);
-    if (LandMBB && FalseMBB->succ_size() != 0)
-      FalseMBB->removeSuccessor(LandMBB, true);
-    retireBlock(FalseMBB);
-    MLI->removeBlock(FalseMBB);
-  }
-  insertInstrBefore(I, R600::ENDIF);
-
-  BranchMI->eraseFromParent();
-
-  if (LandMBB && TrueMBB && FalseMBB)
-    MBB->addSuccessor(LandMBB);
-}
-
-void AMDGPUCFGStructurizer::mergeLooplandBlock(MachineBasicBlock *DstBlk,
-    MachineBasicBlock *LandMBB) {
-  LLVM_DEBUG(dbgs() << "loopPattern header = BB" << DstBlk->getNumber()
-                    << " land = BB" << LandMBB->getNumber() << "\n";);
-
-  insertInstrBefore(DstBlk, R600::WHILELOOP, DebugLoc());
-  insertInstrEnd(DstBlk, R600::ENDLOOP, DebugLoc());
-  DstBlk->replaceSuccessor(DstBlk, LandMBB);
-}
-
-void AMDGPUCFGStructurizer::mergeLoopbreakBlock(MachineBasicBlock *ExitingMBB,
-    MachineBasicBlock *LandMBB) {
-  LLVM_DEBUG(dbgs() << "loopbreakPattern exiting = BB"
-                    << ExitingMBB->getNumber() << " land = BB"
-                    << LandMBB->getNumber() << "\n";);
-  MachineInstr *BranchMI = getLoopendBlockBranchInstr(ExitingMBB);
-  assert(BranchMI && isCondBranch(BranchMI));
-  DebugLoc DL = BranchMI->getDebugLoc();
-  MachineBasicBlock *TrueBranch = getTrueBranch(BranchMI);
-  MachineBasicBlock::iterator I = BranchMI;
-  if (TrueBranch != LandMBB)
-    reversePredicateSetter(I, *I->getParent());
-  insertCondBranchBefore(ExitingMBB, I, R600::IF_PREDICATE_SET, R600::PREDICATE_BIT, DL);
-  insertInstrBefore(I, R600::BREAK);
-  insertInstrBefore(I, R600::ENDIF);
-  //now branchInst can be erase safely
-  BranchMI->eraseFromParent();
-  //now take care of successors, retire blocks
-  ExitingMBB->removeSuccessor(LandMBB, true);
-}
-
-void AMDGPUCFGStructurizer::settleLoopcontBlock(MachineBasicBlock *ContingMBB,
-    MachineBasicBlock *ContMBB) {
-  LLVM_DEBUG(dbgs() << "settleLoopcontBlock conting = BB"
-                    << ContingMBB->getNumber() << ", cont = BB"
-                    << ContMBB->getNumber() << "\n";);
-
-  MachineInstr *MI = getLoopendBlockBranchInstr(ContingMBB);
-  if (MI) {
-    assert(isCondBranch(MI));
-    MachineBasicBlock::iterator I = MI;
-    MachineBasicBlock *TrueBranch = getTrueBranch(MI);
-    int OldOpcode = MI->getOpcode();
-    DebugLoc DL = MI->getDebugLoc();
-
-    bool UseContinueLogical = ((&*ContingMBB->rbegin()) == MI);
-
-    if (!UseContinueLogical) {
-      int BranchOpcode =
-          TrueBranch == ContMBB ? getBranchNzeroOpcode(OldOpcode) :
-          getBranchZeroOpcode(OldOpcode);
-      insertCondBranchBefore(I, BranchOpcode, DL);
-      // insertEnd to ensure phi-moves, if exist, go before the continue-instr.
-      insertInstrEnd(ContingMBB, R600::CONTINUE, DL);
-      insertInstrEnd(ContingMBB, R600::ENDIF, DL);
-    } else {
-      int BranchOpcode =
-          TrueBranch == ContMBB ? getContinueNzeroOpcode(OldOpcode) :
-          getContinueZeroOpcode(OldOpcode);
-      insertCondBranchBefore(I, BranchOpcode, DL);
-    }
-
-    MI->eraseFromParent();
-  } else {
-    // if we've arrived here then we've already erased the branch instruction
-    // travel back up the basic block to see the last reference of our debug
-    // location we've just inserted that reference here so it should be
-    // representative insertEnd to ensure phi-moves, if exist, go before the
-    // continue-instr.
-    insertInstrEnd(ContingMBB, R600::CONTINUE,
-        getLastDebugLocInBB(ContingMBB));
-  }
-}
-
-int AMDGPUCFGStructurizer::cloneOnSideEntryTo(MachineBasicBlock *PreMBB,
-    MachineBasicBlock *SrcMBB, MachineBasicBlock *DstMBB) {
-  int Cloned = 0;
-  assert(PreMBB->isSuccessor(SrcMBB));
-  while (SrcMBB && SrcMBB != DstMBB) {
-    assert(SrcMBB->succ_size() == 1);
-    if (SrcMBB->pred_size() > 1) {
-      SrcMBB = cloneBlockForPredecessor(SrcMBB, PreMBB);
-      ++Cloned;
-    }
-
-    PreMBB = SrcMBB;
-    SrcMBB = *SrcMBB->succ_begin();
-  }
-
-  return Cloned;
-}
-
-MachineBasicBlock *
-AMDGPUCFGStructurizer::cloneBlockForPredecessor(MachineBasicBlock *MBB,
-    MachineBasicBlock *PredMBB) {
-  assert(PredMBB->isSuccessor(MBB) &&
-         "succBlk is not a prececessor of curBlk");
-
-  MachineBasicBlock *CloneMBB = clone(MBB);  //clone instructions
-  replaceInstrUseOfBlockWith(PredMBB, MBB, CloneMBB);
-  //srcBlk, oldBlk, newBlk
-
-  PredMBB->replaceSuccessor(MBB, CloneMBB);
-
-  // add all successor to cloneBlk
-  cloneSuccessorList(CloneMBB, MBB);
-
-  numClonedInstr += MBB->size();
-
-  LLVM_DEBUG(dbgs() << "Cloned block: "
-                    << "BB" << MBB->getNumber() << "size " << MBB->size()
-                    << "\n";);
-
-  SHOWNEWBLK(CloneMBB, "result of Cloned block: ");
-
-  return CloneMBB;
-}
-
-void AMDGPUCFGStructurizer::migrateInstruction(MachineBasicBlock *SrcMBB,
-    MachineBasicBlock *DstMBB, MachineBasicBlock::iterator I) {
-  MachineBasicBlock::iterator SpliceEnd;
-  //look for the input branchinstr, not the AMDGPU branchinstr
-  MachineInstr *BranchMI = getNormalBlockBranchInstr(SrcMBB);
-  if (!BranchMI) {
-    LLVM_DEBUG(dbgs() << "migrateInstruction don't see branch instr\n";);
-    SpliceEnd = SrcMBB->end();
-  } else {
-    LLVM_DEBUG(dbgs() << "migrateInstruction see branch instr: " << *BranchMI);
-    SpliceEnd = BranchMI;
-  }
-  LLVM_DEBUG(dbgs() << "migrateInstruction before splice dstSize = "
-                    << DstMBB->size() << "srcSize = " << SrcMBB->size()
-                    << "\n";);
-
-  //splice insert before insertPos
-  DstMBB->splice(I, SrcMBB, SrcMBB->begin(), SpliceEnd);
-
-  LLVM_DEBUG(dbgs() << "migrateInstruction after splice dstSize = "
-                    << DstMBB->size() << "srcSize = " << SrcMBB->size()
-                    << '\n';);
-}
-
-MachineBasicBlock *
-AMDGPUCFGStructurizer::normalizeInfiniteLoopExit(MachineLoop* LoopRep) {
-  MachineBasicBlock *LoopHeader = LoopRep->getHeader();
-  MachineBasicBlock *LoopLatch = LoopRep->getLoopLatch();
-
-  if (!LoopHeader || !LoopLatch)
-    return nullptr;
-  MachineInstr *BranchMI = getLoopendBlockBranchInstr(LoopLatch);
-  // Is LoopRep an infinite loop ?
-  if (!BranchMI || !isUncondBranch(BranchMI))
-    return nullptr;
-
-  MachineBasicBlock *DummyExitBlk = FuncRep->CreateMachineBasicBlock();
-  FuncRep->push_back(DummyExitBlk);  //insert to function
-  SHOWNEWBLK(DummyExitBlk, "DummyExitBlock to normalize infiniteLoop: ");
-  LLVM_DEBUG(dbgs() << "Old branch instr: " << *BranchMI << "\n";);
-  LLVMContext &Ctx = LoopHeader->getParent()->getFunction().getContext();
-  Ctx.emitError("Extra register needed to handle CFG");
-  return nullptr;
-}
-
-void AMDGPUCFGStructurizer::removeUnconditionalBranch(MachineBasicBlock *MBB) {
-  MachineInstr *BranchMI;
-
-  // I saw two unconditional branch in one basic block in example
-  // test_fc_do_while_or.c need to fix the upstream on this to remove the loop.
-  while ((BranchMI = getLoopendBlockBranchInstr(MBB))
-          && isUncondBranch(BranchMI)) {
-    LLVM_DEBUG(dbgs() << "Removing uncond branch instr: " << *BranchMI);
-    BranchMI->eraseFromParent();
-  }
-}
-
-void AMDGPUCFGStructurizer::removeRedundantConditionalBranch(
-    MachineBasicBlock *MBB) {
-  if (MBB->succ_size() != 2)
-    return;
-  MachineBasicBlock *MBB1 = *MBB->succ_begin();
-  MachineBasicBlock *MBB2 = *std::next(MBB->succ_begin());
-  if (MBB1 != MBB2)
-    return;
-
-  MachineInstr *BranchMI = getNormalBlockBranchInstr(MBB);
-  assert(BranchMI && isCondBranch(BranchMI));
-  LLVM_DEBUG(dbgs() << "Removing unneeded cond branch instr: " << *BranchMI);
-  BranchMI->eraseFromParent();
-  SHOWNEWBLK(MBB1, "Removing redundant successor");
-  MBB->removeSuccessor(MBB1, true);
-}
-
-void AMDGPUCFGStructurizer::addDummyExitBlock(
-    SmallVectorImpl<MachineBasicBlock*> &RetMBB) {
-  MachineBasicBlock *DummyExitBlk = FuncRep->CreateMachineBasicBlock();
-  FuncRep->push_back(DummyExitBlk);  //insert to function
-  insertInstrEnd(DummyExitBlk, R600::RETURN);
-
-  for (SmallVectorImpl<MachineBasicBlock *>::iterator It = RetMBB.begin(),
-       E = RetMBB.end(); It != E; ++It) {
-    MachineBasicBlock *MBB = *It;
-    MachineInstr *MI = getReturnInstr(MBB);
-    if (MI)
-      MI->eraseFromParent();
-    MBB->addSuccessor(DummyExitBlk);
-    LLVM_DEBUG(dbgs() << "Add dummyExitBlock to BB" << MBB->getNumber()
-                      << " successors\n";);
-  }
-  SHOWNEWBLK(DummyExitBlk, "DummyExitBlock: ");
-}
-
-void AMDGPUCFGStructurizer::removeSuccessor(MachineBasicBlock *MBB) {
-  while (MBB->succ_size())
-    MBB->removeSuccessor(*MBB->succ_begin());
-}
-
-void AMDGPUCFGStructurizer::recordSccnum(MachineBasicBlock *MBB,
-    int SccNum) {
-  BlockInformation *&srcBlkInfo = BlockInfoMap[MBB];
-  if (!srcBlkInfo)
-    srcBlkInfo = new BlockInformation();
-  srcBlkInfo->SccNum = SccNum;
-}
-
-void AMDGPUCFGStructurizer::retireBlock(MachineBasicBlock *MBB) {
-  LLVM_DEBUG(dbgs() << "Retiring BB" << MBB->getNumber() << "\n";);
-
-  BlockInformation *&SrcBlkInfo = BlockInfoMap[MBB];
-
-  if (!SrcBlkInfo)
-    SrcBlkInfo = new BlockInformation();
-
-  SrcBlkInfo->IsRetired = true;
-  assert(MBB->succ_size() == 0 && MBB->pred_size() == 0
-         && "can't retire block yet");
-}
-
-INITIALIZE_PASS_BEGIN(AMDGPUCFGStructurizer, "amdgpustructurizer",
-                      "AMDGPU CFG Structurizer", false, false)
-INITIALIZE_PASS_DEPENDENCY(MachineDominatorTree)
-INITIALIZE_PASS_DEPENDENCY(MachinePostDominatorTree)
-INITIALIZE_PASS_DEPENDENCY(MachineLoopInfo)
-INITIALIZE_PASS_END(AMDGPUCFGStructurizer, "amdgpustructurizer",
-                      "AMDGPU CFG Structurizer", false, false)
-
-FunctionPass *llvm::createAMDGPUCFGStructurizerPass() {
-  return new AMDGPUCFGStructurizer();
-}
diff --git a/gnu/llvm/llvm/lib/Target/AMDGPU/Utils/AMDGPULDSUtils.cpp b/gnu/llvm/llvm/lib/Target/AMDGPU/Utils/AMDGPULDSUtils.cpp
deleted file mode 100644
index da8fcf3900b..00000000000
--- a/gnu/llvm/llvm/lib/Target/AMDGPU/Utils/AMDGPULDSUtils.cpp
+++ /dev/null
@@ -1,355 +0,0 @@
-//===- AMDGPULDSUtils.cpp -------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// AMDGPU LDS related helper utility functions.
-//
-//===----------------------------------------------------------------------===//
-
-#include "AMDGPULDSUtils.h"
-#include "Utils/AMDGPUBaseInfo.h"
-#include "llvm/ADT/DepthFirstIterator.h"
-#include "llvm/ADT/SetVector.h"
-#include "llvm/Analysis/CallGraph.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/ReplaceConstant.h"
-
-using namespace llvm;
-
-namespace llvm {
-
-namespace AMDGPU {
-
-// An helper class for collecting all reachable callees for each kernel defined
-// within the module.
-class CollectReachableCallees {
-  Module &M;
-  CallGraph CG;
-  SmallPtrSet<CallGraphNode *, 8> AddressTakenFunctions;
-
-  // Collect all address taken functions within the module.
-  void collectAddressTakenFunctions() {
-    auto *ECNode = CG.getExternalCallingNode();
-
-    for (auto GI = ECNode->begin(), GE = ECNode->end(); GI != GE; ++GI) {
-      auto *CGN = GI->second;
-      auto *F = CGN->getFunction();
-      if (!F || F->isDeclaration() || AMDGPU::isKernelCC(F))
-        continue;
-      AddressTakenFunctions.insert(CGN);
-    }
-  }
-
-  // For given kernel, collect all its reachable non-kernel functions.
-  SmallPtrSet<Function *, 8> collectReachableCallees(Function *K) {
-    SmallPtrSet<Function *, 8> ReachableCallees;
-
-    // Call graph node which represents this kernel.
-    auto *KCGN = CG[K];
-
-    // Go through all call graph nodes reachable from the node representing this
-    // kernel, visit all their call sites, if the call site is direct, add
-    // corresponding callee to reachable callee set, if it is indirect, resolve
-    // the indirect call site to potential reachable callees, add them to
-    // reachable callee set, and repeat the process for the newly added
-    // potential callee nodes.
-    //
-    // FIXME: Need to handle bit-casted function pointers.
-    //
-    SmallVector<CallGraphNode *, 8> CGNStack(df_begin(KCGN), df_end(KCGN));
-    SmallPtrSet<CallGraphNode *, 8> VisitedCGNodes;
-    while (!CGNStack.empty()) {
-      auto *CGN = CGNStack.pop_back_val();
-
-      if (!VisitedCGNodes.insert(CGN).second)
-        continue;
-
-      for (auto GI = CGN->begin(), GE = CGN->end(); GI != GE; ++GI) {
-        auto *RCB = cast<CallBase>(GI->first.getValue());
-        auto *RCGN = GI->second;
-
-        if (auto *DCallee = RCGN->getFunction()) {
-          ReachableCallees.insert(DCallee);
-        } else if (RCB->isIndirectCall()) {
-          auto *RCBFTy = RCB->getFunctionType();
-          for (auto *ACGN : AddressTakenFunctions) {
-            auto *ACallee = ACGN->getFunction();
-            if (ACallee->getFunctionType() == RCBFTy) {
-              ReachableCallees.insert(ACallee);
-              CGNStack.append(df_begin(ACGN), df_end(ACGN));
-            }
-          }
-        }
-      }
-    }
-
-    return ReachableCallees;
-  }
-
-public:
-  explicit CollectReachableCallees(Module &M) : M(M), CG(CallGraph(M)) {
-    // Collect address taken functions.
-    collectAddressTakenFunctions();
-  }
-
-  void collectReachableCallees(
-      DenseMap<Function *, SmallPtrSet<Function *, 8>> &KernelToCallees) {
-    // Collect reachable callee set for each kernel defined in the module.
-    for (Function &F : M.functions()) {
-      if (!AMDGPU::isKernelCC(&F))
-        continue;
-      Function *K = &F;
-      KernelToCallees[K] = collectReachableCallees(K);
-    }
-  }
-};
-
-void collectReachableCallees(
-    Module &M,
-    DenseMap<Function *, SmallPtrSet<Function *, 8>> &KernelToCallees) {
-  CollectReachableCallees CRC{M};
-  CRC.collectReachableCallees(KernelToCallees);
-}
-
-SmallPtrSet<Function *, 8> collectNonKernelAccessorsOfLDS(GlobalVariable *GV) {
-  SmallPtrSet<Function *, 8> LDSAccessors;
-  SmallVector<User *, 8> UserStack(GV->users());
-  SmallPtrSet<User *, 8> VisitedUsers;
-
-  while (!UserStack.empty()) {
-    auto *U = UserStack.pop_back_val();
-
-    // `U` is already visited? continue to next one.
-    if (!VisitedUsers.insert(U).second)
-      continue;
-
-    // `U` is a global variable which is initialized with LDS. Ignore LDS.
-    if (isa<GlobalValue>(U))
-      return SmallPtrSet<Function *, 8>();
-
-    // Recursively explore constant users.
-    if (isa<Constant>(U)) {
-      append_range(UserStack, U->users());
-      continue;
-    }
-
-    // `U` should be an instruction, if it belongs to a non-kernel function F,
-    // then collect F.
-    Function *F = cast<Instruction>(U)->getFunction();
-    if (!AMDGPU::isKernelCC(F))
-      LDSAccessors.insert(F);
-  }
-
-  return LDSAccessors;
-}
-
-DenseMap<Function *, SmallPtrSet<Instruction *, 8>>
-getFunctionToInstsMap(User *U, bool CollectKernelInsts) {
-  DenseMap<Function *, SmallPtrSet<Instruction *, 8>> FunctionToInsts;
-  SmallVector<User *, 8> UserStack;
-  SmallPtrSet<User *, 8> VisitedUsers;
-
-  UserStack.push_back(U);
-
-  while (!UserStack.empty()) {
-    auto *UU = UserStack.pop_back_val();
-
-    if (!VisitedUsers.insert(UU).second)
-      continue;
-
-    if (isa<GlobalValue>(UU))
-      continue;
-
-    if (isa<Constant>(UU)) {
-      append_range(UserStack, UU->users());
-      continue;
-    }
-
-    auto *I = cast<Instruction>(UU);
-    Function *F = I->getFunction();
-    if (CollectKernelInsts) {
-      if (!AMDGPU::isKernelCC(F)) {
-        continue;
-      }
-    } else {
-      if (AMDGPU::isKernelCC(F)) {
-        continue;
-      }
-    }
-
-    FunctionToInsts.insert(std::make_pair(F, SmallPtrSet<Instruction *, 8>()));
-    FunctionToInsts[F].insert(I);
-  }
-
-  return FunctionToInsts;
-}
-
-bool isKernelCC(const Function *Func) {
-  return AMDGPU::isModuleEntryFunctionCC(Func->getCallingConv());
-}
-
-Align getAlign(DataLayout const &DL, const GlobalVariable *GV) {
-  return DL.getValueOrABITypeAlignment(GV->getPointerAlignment(DL),
-                                       GV->getValueType());
-}
-
-static void collectFunctionUses(User *U, const Function *F,
-                                SetVector<Instruction *> &InstUsers) {
-  SmallVector<User *> Stack{U};
-
-  while (!Stack.empty()) {
-    U = Stack.pop_back_val();
-
-    if (auto *I = dyn_cast<Instruction>(U)) {
-      if (I->getFunction() == F)
-        InstUsers.insert(I);
-      continue;
-    }
-
-    if (!isa<ConstantExpr>(U))
-      continue;
-
-    append_range(Stack, U->users());
-  }
-}
-
-void replaceConstantUsesInFunction(ConstantExpr *C, const Function *F) {
-  SetVector<Instruction *> InstUsers;
-
-  collectFunctionUses(C, F, InstUsers);
-  for (Instruction *I : InstUsers) {
-    convertConstantExprsToInstructions(I, C);
-  }
-}
-
-bool hasUserInstruction(const GlobalValue *GV) {
-  SmallPtrSet<const User *, 8> Visited;
-  SmallVector<const User *, 16> Stack(GV->users());
-
-  while (!Stack.empty()) {
-    const User *U = Stack.pop_back_val();
-
-    if (!Visited.insert(U).second)
-      continue;
-
-    if (isa<Instruction>(U))
-      return true;
-
-    append_range(Stack, U->users());
-  }
-
-  return false;
-}
-
-bool shouldLowerLDSToStruct(const GlobalVariable &GV, const Function *F) {
-  // We are not interested in kernel LDS lowering for module LDS itself.
-  if (F && GV.getName() == "llvm.amdgcn.module.lds")
-    return false;
-
-  bool Ret = false;
-  SmallPtrSet<const User *, 8> Visited;
-  SmallVector<const User *, 16> Stack(GV.users());
-  SmallPtrSet<const GlobalValue *, 8> GlobalUsers;
-
-  assert(!F || isKernelCC(F));
-
-  while (!Stack.empty()) {
-    const User *V = Stack.pop_back_val();
-    Visited.insert(V);
-
-    if (auto *G = dyn_cast<GlobalValue>(V)) {
-      StringRef GName = G->getName();
-      if (F && GName != "llvm.used" && GName != "llvm.compiler.used") {
-        // For kernel LDS lowering, if G is not a compiler.used list, then we
-        // cannot lower the lds GV since we cannot replace the use of GV within
-        // G.
-        return false;
-      }
-      GlobalUsers.insert(G);
-      continue;
-    }
-
-    if (auto *I = dyn_cast<Instruction>(V)) {
-      const Function *UF = I->getFunction();
-      if (UF == F) {
-        // Used from this kernel, we want to put it into the structure.
-        Ret = true;
-      } else if (!F) {
-        // For module LDS lowering, lowering is required if the user instruction
-        // is from non-kernel function.
-        Ret |= !isKernelCC(UF);
-      }
-      continue;
-    }
-
-    // User V should be a constant, recursively visit users of V.
-    assert(isa<Constant>(V) && "Expected a constant.");
-    append_range(Stack, V->users());
-  }
-
-  if (!F && !Ret) {
-    // For module LDS lowering, we have not yet decided if we should lower GV or
-    // not. Explore all global users of GV, and check if atleast one of these
-    // global users appear as an use within an instruction (possibly nested use
-    // via constant expression), if so, then conservately lower LDS.
-    for (auto *G : GlobalUsers)
-      Ret |= hasUserInstruction(G);
-  }
-
-  return Ret;
-}
-
-std::vector<GlobalVariable *> findVariablesToLower(Module &M,
-                                                   const Function *F) {
-  std::vector<llvm::GlobalVariable *> LocalVars;
-  for (auto &GV : M.globals()) {
-    if (GV.getType()->getPointerAddressSpace() != AMDGPUAS::LOCAL_ADDRESS) {
-      continue;
-    }
-    if (!GV.hasInitializer()) {
-      // addrspace(3) without initializer implies cuda/hip extern __shared__
-      // the semantics for such a variable appears to be that all extern
-      // __shared__ variables alias one another, in which case this transform
-      // is not required
-      continue;
-    }
-    if (!isa<UndefValue>(GV.getInitializer())) {
-      // Initializers are unimplemented for local address space.
-      // Leave such variables in place for consistent error reporting.
-      continue;
-    }
-    if (GV.isConstant()) {
-      // A constant undef variable can't be written to, and any load is
-      // undef, so it should be eliminated by the optimizer. It could be
-      // dropped by the back end if not. This pass skips over it.
-      continue;
-    }
-    if (!shouldLowerLDSToStruct(GV, F)) {
-      continue;
-    }
-    LocalVars.push_back(&GV);
-  }
-  return LocalVars;
-}
-
-SmallPtrSet<GlobalValue *, 32> getUsedList(Module &M) {
-  SmallPtrSet<GlobalValue *, 32> UsedList;
-
-  SmallVector<GlobalValue *, 32> TmpVec;
-  collectUsedGlobalVariables(M, TmpVec, true);
-  UsedList.insert(TmpVec.begin(), TmpVec.end());
-
-  TmpVec.clear();
-  collectUsedGlobalVariables(M, TmpVec, false);
-  UsedList.insert(TmpVec.begin(), TmpVec.end());
-
-  return UsedList;
-}
-
-} // end namespace AMDGPU
-
-} // end namespace llvm
diff --git a/gnu/llvm/llvm/lib/Target/AMDGPU/Utils/AMDGPULDSUtils.h b/gnu/llvm/llvm/lib/Target/AMDGPU/Utils/AMDGPULDSUtils.h
deleted file mode 100644
index ffcafb9b76c..00000000000
--- a/gnu/llvm/llvm/lib/Target/AMDGPU/Utils/AMDGPULDSUtils.h
+++ /dev/null
@@ -1,70 +0,0 @@
-//===- AMDGPULDSUtils.h - LDS related helper functions -*- C++ -*----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// AMDGPU LDS related helper utility functions.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_LIB_TARGET_AMDGPU_UTILS_AMDGPULDSUTILS_H
-#define LLVM_LIB_TARGET_AMDGPU_UTILS_AMDGPULDSUTILS_H
-
-#include "AMDGPU.h"
-#include "llvm/ADT/DenseMap.h"
-#include "llvm/IR/Constants.h"
-
-namespace llvm {
-
-class ConstantExpr;
-
-namespace AMDGPU {
-
-/// Collect reachable callees for each kernel defined in the module \p M and
-/// return collected callees at \p KernelToCallees.
-void collectReachableCallees(
-    Module &M,
-    DenseMap<Function *, SmallPtrSet<Function *, 8>> &KernelToCallees);
-
-/// For the given LDS global \p GV, visit all its users and collect all
-/// non-kernel functions within which \p GV is used and return collected list of
-/// such non-kernel functions.
-SmallPtrSet<Function *, 8> collectNonKernelAccessorsOfLDS(GlobalVariable *GV);
-
-/// Collect all the instructions where user \p U belongs to. \p U could be
-/// instruction itself or it could be a constant expression which is used within
-/// an instruction. If \p CollectKernelInsts is true, collect instructions only
-/// from kernels, otherwise collect instructions only from non-kernel functions.
-DenseMap<Function *, SmallPtrSet<Instruction *, 8>>
-getFunctionToInstsMap(User *U, bool CollectKernelInsts);
-
-bool isKernelCC(const Function *Func);
-
-Align getAlign(DataLayout const &DL, const GlobalVariable *GV);
-
-/// \returns true if a given global variable \p GV (or its global users) appear
-/// as an use within some instruction (either from kernel or from non-kernel).
-bool hasUserInstruction(const GlobalValue *GV);
-
-/// \returns true if an LDS global requres lowering to a module LDS structure
-/// if \p F is not given. If \p F is given it must be a kernel and function
-/// \returns true if an LDS global is directly used from that kernel and it
-/// is safe to replace its uses with a kernel LDS structure member.
-bool shouldLowerLDSToStruct(const GlobalVariable &GV,
-                            const Function *F = nullptr);
-
-std::vector<GlobalVariable *> findVariablesToLower(Module &M,
-                                                   const Function *F = nullptr);
-
-SmallPtrSet<GlobalValue *, 32> getUsedList(Module &M);
-
-/// Replace all uses of constant \p C with instructions in \p F.
-void replaceConstantUsesInFunction(ConstantExpr *C, const Function *F);
-} // end namespace AMDGPU
-
-} // end namespace llvm
-
-#endif // LLVM_LIB_TARGET_AMDGPU_UTILS_AMDGPULDSUTILS_H
diff --git a/gnu/llvm/llvm/lib/Target/AVR/AVRRelaxMemOperations.cpp b/gnu/llvm/llvm/lib/Target/AVR/AVRRelaxMemOperations.cpp
deleted file mode 100644
index 7d2d19de757..00000000000
--- a/gnu/llvm/llvm/lib/Target/AVR/AVRRelaxMemOperations.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-//===-- AVRRelaxMemOperations.cpp - Relax out of range loads/stores -------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file contains a pass which relaxes out of range memory operations into
-// equivalent operations which handle bigger addresses.
-//
-//===----------------------------------------------------------------------===//
-
-#include "AVR.h"
-#include "AVRInstrInfo.h"
-#include "AVRTargetMachine.h"
-#include "MCTargetDesc/AVRMCTargetDesc.h"
-
-#include "llvm/CodeGen/MachineFunctionPass.h"
-#include "llvm/CodeGen/MachineInstrBuilder.h"
-#include "llvm/CodeGen/MachineRegisterInfo.h"
-#include "llvm/CodeGen/TargetRegisterInfo.h"
-
-using namespace llvm;
-
-#define AVR_RELAX_MEM_OPS_NAME "AVR memory operation relaxation pass"
-
-namespace {
-
-class AVRRelaxMem : public MachineFunctionPass {
-public:
-  static char ID;
-
-  AVRRelaxMem() : MachineFunctionPass(ID) {
-    initializeAVRRelaxMemPass(*PassRegistry::getPassRegistry());
-  }
-
-  bool runOnMachineFunction(MachineFunction &MF) override;
-
-  StringRef getPassName() const override { return AVR_RELAX_MEM_OPS_NAME; }
-
-private:
-  typedef MachineBasicBlock Block;
-  typedef Block::iterator BlockIt;
-
-  const TargetInstrInfo *TII;
-
-  template <unsigned OP> bool relax(Block &MBB, BlockIt MBBI);
-
-  bool runOnBasicBlock(Block &MBB);
-  bool runOnInstruction(Block &MBB, BlockIt MBBI);
-
-  MachineInstrBuilder buildMI(Block &MBB, BlockIt MBBI, unsigned Opcode) {
-    return BuildMI(MBB, MBBI, MBBI->getDebugLoc(), TII->get(Opcode));
-  }
-};
-
-char AVRRelaxMem::ID = 0;
-
-bool AVRRelaxMem::runOnMachineFunction(MachineFunction &MF) {
-  bool Modified = false;
-
-  const AVRSubtarget &STI = MF.getSubtarget<AVRSubtarget>();
-  TII = STI.getInstrInfo();
-
-  for (Block &MBB : MF) {
-    bool BlockModified = runOnBasicBlock(MBB);
-    Modified |= BlockModified;
-  }
-
-  return Modified;
-}
-
-bool AVRRelaxMem::runOnBasicBlock(Block &MBB) {
-  bool Modified = false;
-
-  BlockIt MBBI = MBB.begin(), E = MBB.end();
-  while (MBBI != E) {
-    BlockIt NMBBI = std::next(MBBI);
-    Modified |= runOnInstruction(MBB, MBBI);
-    MBBI = NMBBI;
-  }
-
-  return Modified;
-}
-
-template <>
-bool AVRRelaxMem::relax<AVR::STDWPtrQRr>(Block &MBB, BlockIt MBBI) {
-  MachineInstr &MI = *MBBI;
-
-  MachineOperand &Ptr = MI.getOperand(0);
-  MachineOperand &Src = MI.getOperand(2);
-  int64_t Imm = MI.getOperand(1).getImm();
-
-  // We can definitely optimise this better.
-  if (Imm > 63) {
-    // Push the previous state of the pointer register.
-    // This instruction must preserve the value.
-    buildMI(MBB, MBBI, AVR::PUSHWRr)
-      .addReg(Ptr.getReg());
-
-    // Add the immediate to the pointer register.
-    buildMI(MBB, MBBI, AVR::SBCIWRdK)
-      .addReg(Ptr.getReg(), RegState::Define)
-      .addReg(Ptr.getReg())
-      .addImm(-Imm);
-
-    // Store the value in the source register to the address
-    // pointed to by the pointer register.
-    buildMI(MBB, MBBI, AVR::STWPtrRr)
-      .addReg(Ptr.getReg())
-      .addReg(Src.getReg(), getKillRegState(Src.isKill()));
-
-    // Pop the original state of the pointer register.
-    buildMI(MBB, MBBI, AVR::POPWRd)
-      .addDef(Ptr.getReg(), getKillRegState(Ptr.isKill()));
-
-    MI.removeFromParent();
-  }
-
-  return false;
-}
-
-bool AVRRelaxMem::runOnInstruction(Block &MBB, BlockIt MBBI) {
-  MachineInstr &MI = *MBBI;
-  int Opcode = MBBI->getOpcode();
-
-#define RELAX(Op)                \
-  case Op:                       \
-    return relax<Op>(MBB, MI)
-
-  switch (Opcode) {
-    RELAX(AVR::STDWPtrQRr);
-  }
-#undef RELAX
-  return false;
-}
-
-} // end of anonymous namespace
-
-INITIALIZE_PASS(AVRRelaxMem, "avr-relax-mem",
-                AVR_RELAX_MEM_OPS_NAME, false, false)
-
-namespace llvm {
-
-FunctionPass *createAVRRelaxMemPass() { return new AVRRelaxMem(); }
-
-} // end of namespace llvm
diff --git a/gnu/llvm/llvm/lib/Target/Hexagon/HexagonArch.h b/gnu/llvm/llvm/lib/Target/Hexagon/HexagonArch.h
deleted file mode 100644
index e5d528390c5..00000000000
--- a/gnu/llvm/llvm/lib/Target/Hexagon/HexagonArch.h
+++ /dev/null
@@ -1,37 +0,0 @@
-//===- HexagonArch.h ------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_LIB_TARGET_HEXAGON_HEXAGONARCH_H
-#define LLVM_LIB_TARGET_HEXAGON_HEXAGONARCH_H
-
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/Optional.h"
-#include "llvm/ADT/StringRef.h"
-#include "HexagonDepArch.h"
-#include <algorithm>
-
-namespace llvm {
-namespace Hexagon {
-
-template <class ArchCont, typename Val>
-bool ValidArch(ArchCont const &ArchList, Val HexArch) {
-  return std::any_of(std::begin(ArchList), std::end(ArchList),
-                     [HexArch](Val V) { return V == HexArch; });
-}
-
-template <class ArchCont, typename Val>
-llvm::Optional<ArchEnum> GetCpu(ArchCont const &ArchList, Val CPUString) {
-  llvm::Optional<ArchEnum> Res;
-  auto Entry = ArchList.find(CPUString);
-  if (Entry != ArchList.end())
-    Res = Entry->second;
-  return Res;
-}
-} // namespace Hexagon
-} // namespace llvm
-#endif  // LLVM_LIB_TARGET_HEXAGON_HEXAGONARCH_H
diff --git a/gnu/llvm/llvm/lib/Target/M68k/GlSel/M68kCallLowering.cpp b/gnu/llvm/llvm/lib/Target/M68k/GlSel/M68kCallLowering.cpp
deleted file mode 100644
index c5931cbfe04..00000000000
--- a/gnu/llvm/llvm/lib/Target/M68k/GlSel/M68kCallLowering.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-//===-- M68kCallLowering.cpp - Call lowering -------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-/// \file
-/// This file implements the lowering of LLVM calls to machine code calls for
-/// GlobalISel.
-//
-//===----------------------------------------------------------------------===//
-
-#include "M68kCallLowering.h"
-#include "M68kISelLowering.h"
-#include "M68kInstrInfo.h"
-#include "M68kSubtarget.h"
-#include "M68kTargetMachine.h"
-#include "llvm/CodeGen/CallingConvLower.h"
-#include "llvm/CodeGen/GlobalISel/CallLowering.h"
-#include "llvm/CodeGen/GlobalISel/MachineIRBuilder.h"
-#include "llvm/CodeGen/TargetCallingConv.h"
-
-using namespace llvm;
-
-M68kCallLowering::M68kCallLowering(const M68kTargetLowering &TLI)
-    : CallLowering(&TLI) {}
-
-struct OutgoingArgHandler : public CallLowering::OutgoingValueHandler {
-  OutgoingArgHandler(MachineIRBuilder &MIRBuilder, MachineRegisterInfo &MRI,
-                     MachineInstrBuilder MIB)
-      : OutgoingValueHandler(MIRBuilder, MRI), MIB(MIB) {}
-
-  void assignValueToReg(Register ValVReg, Register PhysReg,
-                        CCValAssign &VA) override {
-    MIB.addUse(PhysReg, RegState::Implicit);
-    Register ExtReg = extendRegister(ValVReg, VA);
-    MIRBuilder.buildCopy(PhysReg, ExtReg);
-  }
-
-  void assignValueToAddress(Register ValVReg, Register Addr, LLT MemTy,
-                            MachinePointerInfo &MPO, CCValAssign &VA) override {
-    llvm_unreachable("unimplemented");
-  }
-
-  Register getStackAddress(uint64_t Size, int64_t Offset,
-                           MachinePointerInfo &MPO,
-                           ISD::ArgFlagsTy Flags) override {
-    llvm_unreachable("unimplemented");
-  }
-
-  MachineInstrBuilder MIB;
-};
-bool M68kCallLowering::lowerReturn(MachineIRBuilder &MIRBuilder,
-                                   const Value *Val, ArrayRef<Register> VRegs,
-                                   FunctionLoweringInfo &FLI,
-                                   Register SwiftErrorVReg) const {
-
-  auto MIB = MIRBuilder.buildInstrNoInsert(M68k::RTS);
-  bool Success = true;
-  MachineFunction &MF = MIRBuilder.getMF();
-  const Function &F = MF.getFunction();
-  MachineRegisterInfo &MRI = MF.getRegInfo();
-  const M68kTargetLowering &TLI = *getTLI<M68kTargetLowering>();
-  CCAssignFn *AssignFn =
-      TLI.getCCAssignFn(F.getCallingConv(), true, F.isVarArg());
-  auto &DL = F.getParent()->getDataLayout();
-  if (!VRegs.empty()) {
-    SmallVector<ArgInfo, 8> SplitArgs;
-    ArgInfo OrigArg{VRegs, Val->getType(), 0};
-    setArgFlags(OrigArg, AttributeList::ReturnIndex, DL, F);
-    splitToValueTypes(OrigArg, SplitArgs, DL, F.getCallingConv());
-    OutgoingValueAssigner ArgAssigner(AssignFn);
-    OutgoingArgHandler ArgHandler(MIRBuilder, MRI, MIB);
-    Success = determineAndHandleAssignments(ArgHandler, ArgAssigner, SplitArgs,
-                                            MIRBuilder, F.getCallingConv(),
-                                            F.isVarArg());
-  }
-  MIRBuilder.insertInstr(MIB);
-  return Success;
-}
-
-bool M68kCallLowering::lowerFormalArguments(MachineIRBuilder &MIRBuilder,
-                                            const Function &F,
-                                            ArrayRef<ArrayRef<Register>> VRegs,
-                                            FunctionLoweringInfo &FLI) const {
-  MachineFunction &MF = MIRBuilder.getMF();
-  MachineRegisterInfo &MRI = MF.getRegInfo();
-  const auto &DL = F.getParent()->getDataLayout();
-  auto &TLI = *getTLI<M68kTargetLowering>();
-
-  SmallVector<ArgInfo, 8> SplitArgs;
-  unsigned I = 0;
-  for (const auto &Arg : F.args()) {
-    ArgInfo OrigArg{VRegs[I], Arg.getType(), I};
-    setArgFlags(OrigArg, I + AttributeList::FirstArgIndex, DL, F);
-    splitToValueTypes(OrigArg, SplitArgs, DL, F.getCallingConv());
-    ++I;
-  }
-
-  CCAssignFn *AssignFn =
-      TLI.getCCAssignFn(F.getCallingConv(), false, F.isVarArg());
-  IncomingValueAssigner ArgAssigner(AssignFn);
-  FormalArgHandler ArgHandler(MIRBuilder, MRI);
-  return determineAndHandleAssignments(ArgHandler, ArgAssigner, SplitArgs,
-                                       MIRBuilder, F.getCallingConv(),
-                                       F.isVarArg());
-}
-
-void M68kIncomingValueHandler::assignValueToReg(Register ValVReg,
-                                                Register PhysReg,
-                                                CCValAssign &VA) {
-  MIRBuilder.getMRI()->addLiveIn(PhysReg);
-  MIRBuilder.getMBB().addLiveIn(PhysReg);
-  IncomingValueHandler::assignValueToReg(ValVReg, PhysReg, VA);
-}
-
-void M68kIncomingValueHandler::assignValueToAddress(Register ValVReg,
-                                                    Register Addr,
-                                                    LLT MemTy,
-                                                    MachinePointerInfo &MPO,
-                                                    CCValAssign &VA) {
-  MachineFunction &MF = MIRBuilder.getMF();
-  auto *MMO = MF.getMachineMemOperand(MPO, MachineMemOperand::MOLoad, MemTy,
-                                      inferAlignFromPtrInfo(MF, MPO));
-  MIRBuilder.buildLoad(ValVReg, Addr, *MMO);
-}
-
-Register M68kIncomingValueHandler::getStackAddress(uint64_t Size,
-                                                   int64_t Offset,
-                                                   MachinePointerInfo &MPO,
-                                                   ISD::ArgFlagsTy Flags) {
-  auto &MFI = MIRBuilder.getMF().getFrameInfo();
-  const bool IsImmutable = !Flags.isByVal();
-  int FI = MFI.CreateFixedObject(Size, Offset, IsImmutable);
-  MPO = MachinePointerInfo::getFixedStack(MIRBuilder.getMF(), FI);
-
-  // Build Frame Index
-  llvm::LLT FramePtr = LLT::pointer(
-      0, MIRBuilder.getMF().getDataLayout().getPointerSizeInBits());
-  MachineInstrBuilder AddrReg = MIRBuilder.buildFrameIndex(FramePtr, FI);
-  StackUsed = std::max(StackUsed, Size + Offset);
-  return AddrReg.getReg(0);
-}
-
-bool M68kCallLowering::lowerCall(MachineIRBuilder &MIRBuilder,
-                                 CallLoweringInfo &Info) const {
-  return false;
-}
-
-bool M68kCallLowering::enableBigEndian() const { return true; }
diff --git a/gnu/llvm/llvm/lib/Target/M68k/GlSel/M68kCallLowering.h b/gnu/llvm/llvm/lib/Target/M68k/GlSel/M68kCallLowering.h
deleted file mode 100644
index 9e0d462db67..00000000000
--- a/gnu/llvm/llvm/lib/Target/M68k/GlSel/M68kCallLowering.h
+++ /dev/null
@@ -1,72 +0,0 @@
-//===-- M68kCallLowering.h - Call lowering -------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-/// \file
-/// This file implements the lowering of LLVM calls to machine code calls for
-/// GlobalISel.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_LIB_TARGET_M68K_GLSEL_M68KCALLLOWERING_H
-#define LLVM_LIB_TARGET_M68K_GLSEL_M68KCALLLOWERING_H
-
-#include "llvm/CodeGen/CallingConvLower.h"
-#include "llvm/CodeGen/GlobalISel/CallLowering.h"
-#include "llvm/CodeGen/ValueTypes.h"
-
-namespace llvm {
-
-class M68kTargetLowering;
-
-class M68kCallLowering : public CallLowering {
-  // TODO: We are only supporting return instruction with no value at this time
-  // point
-
-public:
-  M68kCallLowering(const M68kTargetLowering &TLI);
-
-  bool lowerReturn(MachineIRBuilder &MIRBuilder, const Value *Val,
-                   ArrayRef<Register> VRegs, FunctionLoweringInfo &FLI,
-                   Register SwiftErrorVReg) const override;
-
-  bool lowerFormalArguments(MachineIRBuilder &MIRBuilder, const Function &F,
-                            ArrayRef<ArrayRef<Register>> VRegs,
-                            FunctionLoweringInfo &FLI) const override;
-
-  bool lowerCall(MachineIRBuilder &MIRBuilder,
-                 CallLoweringInfo &Info) const override;
-
-  bool enableBigEndian() const override;
-};
-struct M68kIncomingValueHandler : public CallLowering::IncomingValueHandler {
-  M68kIncomingValueHandler(MachineIRBuilder &MIRBuilder,
-                           MachineRegisterInfo &MRI)
-      : CallLowering::IncomingValueHandler(MIRBuilder, MRI) {}
-
-  uint64_t StackUsed;
-
-private:
-  void assignValueToReg(Register ValVReg, Register PhysReg,
-                        CCValAssign &VA) override;
-
-  void assignValueToAddress(Register ValVReg, Register Addr, LLT MemTy,
-                            MachinePointerInfo &MPO, CCValAssign &VA) override;
-
-  Register getStackAddress(uint64_t Size, int64_t Offset,
-                           MachinePointerInfo &MPO,
-                           ISD::ArgFlagsTy Flags) override;
-};
-
-struct FormalArgHandler : public M68kIncomingValueHandler {
-  FormalArgHandler(MachineIRBuilder &MIRBuilder, MachineRegisterInfo &MRI)
-      : M68kIncomingValueHandler(MIRBuilder, MRI) {}
-};
-
-} // end namespace llvm
-
-#endif // LLVM_LIB_TARGET_M68K_GLSEL_M68KCALLLOWERING_H
diff --git a/gnu/llvm/llvm/lib/Target/M68k/GlSel/M68kInstructionSelector.cpp b/gnu/llvm/llvm/lib/Target/M68k/GlSel/M68kInstructionSelector.cpp
deleted file mode 100644
index 9ac4ab9a5ba..00000000000
--- a/gnu/llvm/llvm/lib/Target/M68k/GlSel/M68kInstructionSelector.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-//===- M68kInstructionSelector.cpp ------------------------------*- C++ -*-===//
-//===----------------------------------------------------------------------===//
-/// \file
-/// This file implements the targeting of the InstructionSelector class for
-/// M68k.
-/// \todo This should be generated by TableGen.
-//===----------------------------------------------------------------------===//
-
-#include "M68kRegisterBankInfo.h"
-#include "M68kSubtarget.h"
-#include "M68kTargetMachine.h"
-#include "llvm/CodeGen/GlobalISel/InstructionSelector.h"
-#include "llvm/CodeGen/GlobalISel/InstructionSelectorImpl.h"
-#include "llvm/Support/Debug.h"
-
-#define DEBUG_TYPE "m68k-isel"
-
-using namespace llvm;
-
-#define GET_GLOBALISEL_PREDICATE_BITSET
-#include "M68kGenGlobalISel.inc"
-#undef GET_GLOBALISEL_PREDICATE_BITSET
-
-namespace {
-
-class M68kInstructionSelector : public InstructionSelector {
-public:
-  M68kInstructionSelector(const M68kTargetMachine &TM, const M68kSubtarget &STI,
-                          const M68kRegisterBankInfo &RBI);
-
-  bool select(MachineInstr &I) override;
-  static const char *getName() { return DEBUG_TYPE; }
-
-private:
-  bool selectImpl(MachineInstr &I, CodeGenCoverage &CoverageInfo) const;
-
-  const M68kTargetMachine &TM;
-  const M68kInstrInfo &TII;
-  const M68kRegisterInfo &TRI;
-  const M68kRegisterBankInfo &RBI;
-
-#define GET_GLOBALISEL_PREDICATES_DECL
-#include "M68kGenGlobalISel.inc"
-#undef GET_GLOBALISEL_PREDICATES_DECL
-
-#define GET_GLOBALISEL_TEMPORARIES_DECL
-#include "M68kGenGlobalISel.inc"
-#undef GET_GLOBALISEL_TEMPORARIES_DECL
-};
-
-} // end anonymous namespace
-
-#define GET_GLOBALISEL_IMPL
-#include "M68kGenGlobalISel.inc"
-#undef GET_GLOBALISEL_IMPL
-
-M68kInstructionSelector::M68kInstructionSelector(
-    const M68kTargetMachine &TM, const M68kSubtarget &STI,
-    const M68kRegisterBankInfo &RBI)
-    : InstructionSelector(), TM(TM), TII(*STI.getInstrInfo()),
-      TRI(*STI.getRegisterInfo()), RBI(RBI),
-
-#define GET_GLOBALISEL_PREDICATES_INIT
-#include "M68kGenGlobalISel.inc"
-#undef GET_GLOBALISEL_PREDICATES_INIT
-#define GET_GLOBALISEL_TEMPORARIES_INIT
-#include "M68kGenGlobalISel.inc"
-#undef GET_GLOBALISEL_TEMPORARIES_INIT
-{
-}
-
-bool M68kInstructionSelector::select(MachineInstr &I) {
-  // Certain non-generic instructions also need some special handling.
-  if (!isPreISelGenericOpcode(I.getOpcode()))
-    return true;
-
-  if (selectImpl(I, *CoverageInfo))
-    return true;
-
-  return false;
-}
-
-namespace llvm {
-InstructionSelector *
-createM68kInstructionSelector(const M68kTargetMachine &TM,
-                              const M68kSubtarget &Subtarget,
-                              const M68kRegisterBankInfo &RBI) {
-  return new M68kInstructionSelector(TM, Subtarget, RBI);
-}
-} // end namespace llvm
diff --git a/gnu/llvm/llvm/lib/Target/M68k/GlSel/M68kLegalizerInfo.cpp b/gnu/llvm/llvm/lib/Target/M68k/GlSel/M68kLegalizerInfo.cpp
deleted file mode 100644
index bcbe62816be..00000000000
--- a/gnu/llvm/llvm/lib/Target/M68k/GlSel/M68kLegalizerInfo.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-//===-- M68kLegalizerInfo.cpp ----------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-/// \file
-/// This file implements the targeting of the Machinelegalizer class for M68k.
-//===----------------------------------------------------------------------===//
-
-#include "M68kLegalizerInfo.h"
-#include "llvm/CodeGen/GlobalISel/LegalizerHelper.h"
-#include "llvm/CodeGen/GlobalISel/LegalizerInfo.h"
-#include "llvm/CodeGen/TargetOpcodes.h"
-#include "llvm/CodeGen/ValueTypes.h"
-#include "llvm/IR/DerivedTypes.h"
-#include "llvm/IR/Type.h"
-
-using namespace llvm;
-
-M68kLegalizerInfo::M68kLegalizerInfo(const M68kSubtarget &ST) {
-  using namespace TargetOpcode;
-  const LLT S32 = LLT::scalar(32);
-  const LLT P0 = LLT::pointer(0, 32);
-  getActionDefinitionsBuilder(G_LOAD).legalFor({S32});
-  getActionDefinitionsBuilder(G_FRAME_INDEX).legalFor({P0});
-  getActionDefinitionsBuilder(G_ADD).legalFor({S32});
-  getActionDefinitionsBuilder(G_SUB).legalFor({S32});
-  getActionDefinitionsBuilder(G_MUL).legalFor({S32});
-  getActionDefinitionsBuilder(G_UDIV).legalFor({S32});
-  getLegacyLegalizerInfo().computeTables();
-}
diff --git a/gnu/llvm/llvm/lib/Target/M68k/GlSel/M68kLegalizerInfo.h b/gnu/llvm/llvm/lib/Target/M68k/GlSel/M68kLegalizerInfo.h
deleted file mode 100644
index 205aa81aedc..00000000000
--- a/gnu/llvm/llvm/lib/Target/M68k/GlSel/M68kLegalizerInfo.h
+++ /dev/null
@@ -1,29 +0,0 @@
-//===- M68kLegalizerInfo --------------------------------------*- C++ -*-==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-/// \file
-/// This file declares the targeting of the MachineLegalizer class for
-/// M68k.
-/// \todo This should be generated by TableGen.
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_LIB_TARGET_M68K_GLSEL_M68KLEGALIZERINFO_H
-#define LLVM_LIB_TARGET_M68K_GLSEL_M68KLEGALIZERINFO_H
-
-#include "llvm/CodeGen/GlobalISel/LegalizerInfo.h"
-
-namespace llvm {
-
-class M68kSubtarget;
-
-/// This struct provides the information for the target register banks.
-struct M68kLegalizerInfo : public LegalizerInfo {
-public:
-  M68kLegalizerInfo(const M68kSubtarget &ST);
-};
-} // end namespace llvm
-#endif // LLVM_LIB_TARGET_M68K_GLSEL_M68KLEGALIZERINFO_H
diff --git a/gnu/llvm/llvm/lib/Target/M68k/GlSel/M68kRegisterBankInfo.cpp b/gnu/llvm/llvm/lib/Target/M68k/GlSel/M68kRegisterBankInfo.cpp
deleted file mode 100644
index d1247862465..00000000000
--- a/gnu/llvm/llvm/lib/Target/M68k/GlSel/M68kRegisterBankInfo.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-//===-- M68kRegisterBankInfo.cpp -------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-/// \file
-/// This file implements the targeting of the RegisterBankInfo class for M68k.
-/// \todo This should be generated by TableGen.
-//===----------------------------------------------------------------------===//
-
-#include "M68kRegisterBankInfo.h"
-#include "MCTargetDesc/M68kMCTargetDesc.h"
-#include "llvm/CodeGen/GlobalISel/RegisterBank.h"
-#include "llvm/CodeGen/GlobalISel/RegisterBankInfo.h"
-#include "llvm/CodeGen/MachineRegisterInfo.h"
-#include "llvm/CodeGen/TargetRegisterInfo.h"
-
-#define GET_TARGET_REGBANK_IMPL
-#include "M68kGenRegisterBank.inc"
-#undef GET_TARGET_REGBANK_IMPL
-
-using namespace llvm;
-
-M68kRegisterBankInfo::M68kRegisterBankInfo(const TargetRegisterInfo &TRI)
-    : M68kGenRegisterBankInfo() {}
diff --git a/gnu/llvm/llvm/lib/Target/M68k/GlSel/M68kRegisterBankInfo.h b/gnu/llvm/llvm/lib/Target/M68k/GlSel/M68kRegisterBankInfo.h
deleted file mode 100644
index 9b97cc4a6dd..00000000000
--- a/gnu/llvm/llvm/lib/Target/M68k/GlSel/M68kRegisterBankInfo.h
+++ /dev/null
@@ -1,39 +0,0 @@
-//===-- M68kRegisterBankInfo.h ---------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-/// \file
-/// This file declares the targeting of the RegisterBankInfo class for M68k.
-/// \todo This should be generated by TableGen.
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_LIB_TARGET_M68K_GLSEL_M68KREGISTERBANKINFO_H
-#define LLVM_LIB_TARGET_M68K_GLSEL_M68KREGISTERBANKINFO_H
-
-#include "llvm/CodeGen/GlobalISel/RegisterBankInfo.h"
-
-#define GET_REGBANK_DECLARATIONS
-#include "M68kGenRegisterBank.inc"
-#undef GET_REGBANK_DECLARATIONS
-
-namespace llvm {
-
-class TargetRegisterInfo;
-
-class M68kGenRegisterBankInfo : public RegisterBankInfo {
-protected:
-#define GET_TARGET_REGBANK_CLASS
-#include "M68kGenRegisterBank.inc"
-#undef GET_TARGET_REGBANK_CLASS
-};
-
-/// This class provides the information for the target register banks.
-class M68kRegisterBankInfo final : public M68kGenRegisterBankInfo {
-public:
-  M68kRegisterBankInfo(const TargetRegisterInfo &TRI);
-};
-} // end namespace llvm
-#endif
diff --git a/gnu/llvm/llvm/lib/Target/M68k/GlSel/M68kRegisterBanks.td b/gnu/llvm/llvm/lib/Target/M68k/GlSel/M68kRegisterBanks.td
deleted file mode 100644
index 2d1e74f7848..00000000000
--- a/gnu/llvm/llvm/lib/Target/M68k/GlSel/M68kRegisterBanks.td
+++ /dev/null
@@ -1,15 +0,0 @@
-//===-- M68kRegisterBanks.td - Describe the M68k Banks -------*- tablegen -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-///
-/// \file
-/// Define the M68k register banks used for GlobalISel.
-///
-//===----------------------------------------------------------------------===//
-
-/// General Purpose Registers. Here we define a register bank with name AnyGPR
-def GPRRegBank : RegisterBank<"AnyGPR", [DR8]>;
diff --git a/gnu/llvm/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp b/gnu/llvm/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
index bdcb729ef13..265880f7714 100644
--- a/gnu/llvm/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
+++ b/gnu/llvm/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
@@ -25,6 +25,7 @@
 #include "llvm/MC/MCExpr.h"
 #include "llvm/MC/MCInst.h"
 #include "llvm/MC/MCInstrDesc.h"
+#include "llvm/MC/MCInstrInfo.h"
 #include "llvm/MC/MCObjectFileInfo.h"
 #include "llvm/MC/MCParser/MCAsmLexer.h"
 #include "llvm/MC/MCParser/MCAsmParser.h"
@@ -39,6 +40,7 @@
 #include "llvm/MC/MCSymbolELF.h"
 #include "llvm/MC/MCValue.h"
 #include "llvm/MC/SubtargetFeature.h"
+#include "llvm/MC/TargetRegistry.h"
 #include "llvm/Support/Alignment.h"
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/CommandLine.h"
@@ -48,7 +50,6 @@
 #include "llvm/Support/MathExtras.h"
 #include "llvm/Support/SMLoc.h"
 #include "llvm/Support/SourceMgr.h"
-#include "llvm/Support/TargetRegistry.h"
 #include "llvm/Support/raw_ostream.h"
 #include <algorithm>
 #include <cassert>
@@ -179,8 +180,9 @@ class MipsAsmParser : public MCTargetAsmParser {
                                bool MatchingInlineAsm) override;
 
   /// Parse a register as used in CFI directives
-  bool ParseRegister(unsigned &RegNo, SMLoc &StartLoc, SMLoc &EndLoc) override;
-  OperandMatchResultTy tryParseRegister(unsigned &RegNo, SMLoc &StartLoc,
+  bool parseRegister(MCRegister &RegNo, SMLoc &StartLoc,
+                     SMLoc &EndLoc) override;
+  OperandMatchResultTy tryParseRegister(MCRegister &RegNo, SMLoc &StartLoc,
                                         SMLoc &EndLoc) override;
 
   bool parseParenSuffix(StringRef Name, OperandVector &Operands);
@@ -793,6 +795,9 @@ public:
       return MipsMCExpr::create(MipsMCExpr::MEK_TPREL_LO, E, Ctx);
     }
   }
+
+  bool areEqualRegs(const MCParsedAsmOperand &Op1,
+                    const MCParsedAsmOperand &Op2) const override;
 };
 
 /// MipsOperand - Instances of this class represent a parsed Mips machine
@@ -831,8 +836,7 @@ private:
   } Kind;
 
 public:
-  MipsOperand(KindTy K, MipsAsmParser &Parser)
-      : MCParsedAsmOperand(), Kind(K), AsmParser(Parser) {}
+  MipsOperand(KindTy K, MipsAsmParser &Parser) : Kind(K), AsmParser(Parser) {}
 
   ~MipsOperand() override {
     switch (Kind) {
@@ -1749,16 +1753,6 @@ public:
 
 } // end anonymous namespace
 
-namespace llvm {
-
-extern const MCInstrDesc MipsInsts[];
-
-} // end namespace llvm
-
-static const MCInstrDesc &getInstDesc(unsigned Opcode) {
-  return MipsInsts[Opcode];
-}
-
 static bool hasShortDelaySlot(MCInst &Inst) {
   switch (Inst.getOpcode()) {
     case Mips::BEQ_MM:
@@ -1839,14 +1833,12 @@ static bool isEvaluated(const MCExpr *Expr) {
   return false;
 }
 
-static bool needsExpandMemInst(MCInst &Inst) {
-  const MCInstrDesc &MCID = getInstDesc(Inst.getOpcode());
-
+static bool needsExpandMemInst(MCInst &Inst, const MCInstrDesc &MCID) {
   unsigned NumOp = MCID.getNumOperands();
   if (NumOp != 3 && NumOp != 4)
     return false;
 
-  const MCOperandInfo &OpInfo = MCID.OpInfo[NumOp - 1];
+  const MCOperandInfo &OpInfo = MCID.operands()[NumOp - 1];
   if (OpInfo.OperandType != MCOI::OPERAND_MEMORY &&
       OpInfo.OperandType != MCOI::OPERAND_UNKNOWN &&
       OpInfo.OperandType != MipsII::OPERAND_MEM_SIMM9)
@@ -1878,7 +1870,7 @@ bool MipsAsmParser::processInstruction(MCInst &Inst, SMLoc IDLoc,
                                        const MCSubtargetInfo *STI) {
   MipsTargetStreamer &TOut = getTargetStreamer();
   const unsigned Opcode = Inst.getOpcode();
-  const MCInstrDesc &MCID = getInstDesc(Opcode);
+  const MCInstrDesc &MCID = MII.get(Opcode);
   bool ExpandedJalSym = false;
 
   Inst.setLoc(IDLoc);
@@ -1894,7 +1886,7 @@ bool MipsAsmParser::processInstruction(MCInst &Inst, SMLoc IDLoc,
     case Mips::BBIT1:
     case Mips::BBIT132:
       assert(hasCnMips() && "instruction only valid for octeon cpus");
-      LLVM_FALLTHROUGH;
+      [[fallthrough]];
 
     case Mips::BEQ:
     case Mips::BNE:
@@ -2076,7 +2068,7 @@ bool MipsAsmParser::processInstruction(MCInst &Inst, SMLoc IDLoc,
   case Mips::SDIV_MM:
     FirstOp = 0;
     SecondOp = 1;
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case Mips::SDivMacro:
   case Mips::DSDivMacro:
   case Mips::UDivMacro:
@@ -2173,9 +2165,8 @@ bool MipsAsmParser::processInstruction(MCInst &Inst, SMLoc IDLoc,
   if (MCID.mayLoad() || MCID.mayStore()) {
     // Check the offset of memory operand, if it is a symbol
     // reference or immediate we may have to expand instructions.
-    if (needsExpandMemInst(Inst)) {
-      const MCInstrDesc &MCID = getInstDesc(Inst.getOpcode());
-      switch (MCID.OpInfo[MCID.getNumOperands() - 1].OperandType) {
+    if (needsExpandMemInst(Inst, MCID)) {
+      switch (MCID.operands()[MCID.getNumOperands() - 1].OperandType) {
       case MipsII::OPERAND_MEM_SIMM9:
         expandMem9Inst(Inst, IDLoc, Out, STI, MCID.mayLoad());
         break;
@@ -2191,7 +2182,7 @@ bool MipsAsmParser::processInstruction(MCInst &Inst, SMLoc IDLoc,
     if (MCID.mayLoad() && Opcode != Mips::LWP_MM) {
       // Try to create 16-bit GP relative load instruction.
       for (unsigned i = 0; i < MCID.getNumOperands(); i++) {
-        const MCOperandInfo &OpInfo = MCID.OpInfo[i];
+        const MCOperandInfo &OpInfo = MCID.operands()[i];
         if ((OpInfo.OperandType == MCOI::OPERAND_MEMORY) ||
             (OpInfo.OperandType == MCOI::OPERAND_UNKNOWN)) {
           MCOperand &Op = Inst.getOperand(i);
@@ -2688,7 +2679,7 @@ bool MipsAsmParser::expandJalWithRegs(MCInst &Inst, SMLoc IDLoc,
 
   // If .set reorder is active and branch instruction has a delay slot,
   // emit a NOP after it.
-  const MCInstrDesc &MCID = getInstDesc(JalrInst.getOpcode());
+  const MCInstrDesc &MCID = MII.get(JalrInst.getOpcode());
   if (MCID.hasDelaySlot() && AssemblerOptions.back()->isReorder())
     TOut.emitEmptyDelaySlot(hasShortDelaySlot(JalrInst), IDLoc,
                             STI);
@@ -3464,10 +3455,10 @@ bool MipsAsmParser::expandLoadSingleImmToFPR(MCInst &Inst, SMLoc IDLoc,
   const MipsMCExpr *LoExpr =
       MipsMCExpr::create(MipsMCExpr::MEK_LO, LoSym, getContext());
 
-  getStreamer().SwitchSection(ReadOnlySection);
+  getStreamer().switchSection(ReadOnlySection);
   getStreamer().emitLabel(Sym, IDLoc);
   getStreamer().emitInt32(ImmOp32);
-  getStreamer().SwitchSection(CS);
+  getStreamer().switchSection(CS);
 
   if (emitPartialAddress(TOut, IDLoc, Sym))
     return true;
@@ -3516,11 +3507,11 @@ bool MipsAsmParser::expandLoadDoubleImmToGPR(MCInst &Inst, SMLoc IDLoc,
   const MipsMCExpr *LoExpr =
       MipsMCExpr::create(MipsMCExpr::MEK_LO, LoSym, getContext());
 
-  getStreamer().SwitchSection(ReadOnlySection);
+  getStreamer().switchSection(ReadOnlySection);
   getStreamer().emitLabel(Sym, IDLoc);
-  getStreamer().emitValueToAlignment(8);
+  getStreamer().emitValueToAlignment(Align(8));
   getStreamer().emitIntValue(ImmOp64, 8);
-  getStreamer().SwitchSection(CS);
+  getStreamer().switchSection(CS);
 
   unsigned TmpReg = getATReg(IDLoc);
   if (!TmpReg)
@@ -3599,11 +3590,11 @@ bool MipsAsmParser::expandLoadDoubleImmToFPR(MCInst &Inst, bool Is64FPU,
   const MipsMCExpr *LoExpr =
       MipsMCExpr::create(MipsMCExpr::MEK_LO, LoSym, getContext());
 
-  getStreamer().SwitchSection(ReadOnlySection);
+  getStreamer().switchSection(ReadOnlySection);
   getStreamer().emitLabel(Sym, IDLoc);
-  getStreamer().emitValueToAlignment(8);
+  getStreamer().emitValueToAlignment(Align(8));
   getStreamer().emitIntValue(ImmOp64, 8);
-  getStreamer().SwitchSection(CS);
+  getStreamer().switchSection(CS);
 
   if (emitPartialAddress(TOut, IDLoc, Sym))
     return true;
@@ -3619,7 +3610,7 @@ bool MipsAsmParser::expandUncondBranchMMPseudo(MCInst &Inst, SMLoc IDLoc,
                                                const MCSubtargetInfo *STI) {
   MipsTargetStreamer &TOut = getTargetStreamer();
 
-  assert(getInstDesc(Inst.getOpcode()).getNumOperands() == 1 &&
+  assert(MII.get(Inst.getOpcode()).getNumOperands() == 1 &&
          "unexpected number of operands");
 
   MCOperand Offset = Inst.getOperand(0);
@@ -3652,7 +3643,7 @@ bool MipsAsmParser::expandUncondBranchMMPseudo(MCInst &Inst, SMLoc IDLoc,
 
   // If .set reorder is active and branch instruction has a delay slot,
   // emit a NOP after it.
-  const MCInstrDesc &MCID = getInstDesc(Inst.getOpcode());
+  const MCInstrDesc &MCID = MII.get(Inst.getOpcode());
   if (MCID.hasDelaySlot() && AssemblerOptions.back()->isReorder())
     TOut.emitEmptyDelaySlot(true, IDLoc, STI);
 
@@ -3743,8 +3734,8 @@ void MipsAsmParser::expandMem16Inst(MCInst &Inst, SMLoc IDLoc, MCStreamer &Out,
   unsigned BaseReg = BaseRegOp.getReg();
   unsigned TmpReg = DstReg;
 
-  const MCInstrDesc &Desc = getInstDesc(OpCode);
-  int16_t DstRegClass = Desc.OpInfo[StartOp].RegClass;
+  const MCInstrDesc &Desc = MII.get(OpCode);
+  int16_t DstRegClass = Desc.operands()[StartOp].RegClass;
   unsigned DstRegClassID =
       getContext().getRegisterInfo()->getRegClass(DstRegClass).getID();
   bool IsGPR = (DstRegClassID == Mips::GPR32RegClassID) ||
@@ -3870,8 +3861,8 @@ void MipsAsmParser::expandMem9Inst(MCInst &Inst, SMLoc IDLoc, MCStreamer &Out,
   unsigned BaseReg = BaseRegOp.getReg();
   unsigned TmpReg = DstReg;
 
-  const MCInstrDesc &Desc = getInstDesc(OpCode);
-  int16_t DstRegClass = Desc.OpInfo[StartOp].RegClass;
+  const MCInstrDesc &Desc = MII.get(OpCode);
+  int16_t DstRegClass = Desc.operands()[StartOp].RegClass;
   unsigned DstRegClassID =
       getContext().getRegisterInfo()->getRegClass(DstRegClass).getID();
   bool IsGPR = (DstRegClassID == Mips::GPR32RegClassID) ||
@@ -5715,7 +5706,7 @@ bool MipsAsmParser::expandMXTRAlias(MCInst &Inst, SMLoc IDLoc, MCStreamer &Out,
   switch (Inst.getOpcode()) {
     case Mips::MFTC0:
       IsMFTR = true;
-      LLVM_FALLTHROUGH;
+      [[fallthrough]];
     case Mips::MTTC0:
       u = 0;
       rd = getRegisterForMxtrC0(Inst, IsMFTR);
@@ -5723,7 +5714,7 @@ bool MipsAsmParser::expandMXTRAlias(MCInst &Inst, SMLoc IDLoc, MCStreamer &Out,
       break;
     case Mips::MFTGPR:
       IsMFTR = true;
-      LLVM_FALLTHROUGH;
+      [[fallthrough]];
     case Mips::MTTGPR:
       rd = Inst.getOperand(IsMFTR ? 1 : 0).getReg();
       break;
@@ -5732,7 +5723,7 @@ bool MipsAsmParser::expandMXTRAlias(MCInst &Inst, SMLoc IDLoc, MCStreamer &Out,
     case Mips::MFTACX:
     case Mips::MFTDSP:
       IsMFTR = true;
-      LLVM_FALLTHROUGH;
+      [[fallthrough]];
     case Mips::MTTLO:
     case Mips::MTTHI:
     case Mips::MTTACX:
@@ -5742,7 +5733,7 @@ bool MipsAsmParser::expandMXTRAlias(MCInst &Inst, SMLoc IDLoc, MCStreamer &Out,
       break;
     case Mips::MFTHC1:
       h = 1;
-      LLVM_FALLTHROUGH;
+      [[fallthrough]];
     case Mips::MFTC1:
       IsMFTR = true;
       rd = getRegisterForMxtrFP(Inst, IsMFTR);
@@ -5750,14 +5741,14 @@ bool MipsAsmParser::expandMXTRAlias(MCInst &Inst, SMLoc IDLoc, MCStreamer &Out,
       break;
     case Mips::MTTHC1:
       h = 1;
-      LLVM_FALLTHROUGH;
+      [[fallthrough]];
     case Mips::MTTC1:
       rd = getRegisterForMxtrFP(Inst, IsMFTR);
       sel = 2;
       break;
     case Mips::CFTC1:
       IsMFTR = true;
-      LLVM_FALLTHROUGH;
+      [[fallthrough]];
     case Mips::CTTC1:
       rd = getRegisterForMxtrFP(Inst, IsMFTR);
       sel = 3;
@@ -5953,7 +5944,7 @@ unsigned MipsAsmParser::checkTargetMatchPredicate(MCInst &Inst) {
     return Match_Success;
   }
 
-  uint64_t TSFlags = getInstDesc(Inst.getOpcode()).TSFlags;
+  uint64_t TSFlags = MII.get(Inst.getOpcode()).TSFlags;
   if ((TSFlags & MipsII::HasFCCRegOperand) &&
       (Inst.getOperand(0).getReg() != Mips::FCC0) && !hasEightFccRegisters())
     return Match_NoFCCRegisterForCurrentISA;
@@ -5990,6 +5981,9 @@ bool MipsAsmParser::MatchAndEmitInstruction(SMLoc IDLoc, unsigned &Opcode,
   case Match_MissingFeature:
     Error(IDLoc, "instruction requires a CPU feature not currently enabled");
     return true;
+  case Match_InvalidTiedOperand:
+    Error(IDLoc, "operand must match destination register");
+    return true;
   case Match_InvalidOperand: {
     SMLoc ErrorLoc = IDLoc;
     if (ErrorInfo != ~0ULL) {
@@ -6443,12 +6437,12 @@ bool MipsAsmParser::parseOperand(OperandVector &Operands, StringRef Mnemonic) {
   return true;
 }
 
-bool MipsAsmParser::ParseRegister(unsigned &RegNo, SMLoc &StartLoc,
+bool MipsAsmParser::parseRegister(MCRegister &RegNo, SMLoc &StartLoc,
                                   SMLoc &EndLoc) {
   return tryParseRegister(RegNo, StartLoc, EndLoc) != MatchOperand_Success;
 }
 
-OperandMatchResultTy MipsAsmParser::tryParseRegister(unsigned &RegNo,
+OperandMatchResultTy MipsAsmParser::tryParseRegister(MCRegister &RegNo,
                                                      SMLoc &StartLoc,
                                                      SMLoc &EndLoc) {
   SmallVector<std::unique_ptr<MCParsedAsmOperand>, 1> Operands;
@@ -6979,6 +6973,19 @@ bool MipsAsmParser::parseBracketSuffix(StringRef Name,
 static std::string MipsMnemonicSpellCheck(StringRef S, const FeatureBitset &FBS,
                                           unsigned VariantID = 0);
 
+bool MipsAsmParser::areEqualRegs(const MCParsedAsmOperand &Op1,
+                                 const MCParsedAsmOperand &Op2) const {
+  // This target-overriden function exists to maintain current behaviour for
+  // e.g.
+  //   dahi    $3, $3, 0x5678
+  // as tested in test/MC/Mips/mips64r6/valid.s.
+  // FIXME: Should this test actually fail with an error? If so, then remove
+  // this overloaded method.
+  if (!Op1.isReg() || !Op2.isReg())
+    return true;
+  return Op1.getReg() == Op2.getReg();
+}
+
 bool MipsAsmParser::ParseInstruction(ParseInstructionInfo &Info, StringRef Name,
                                      SMLoc NameLoc, OperandVector &Operands) {
   MCAsmParser &Parser = getParser();
@@ -8231,7 +8238,7 @@ bool MipsAsmParser::parseRSectionDirective(StringRef Section) {
 
   MCSection *ELFSection = getContext().getELFSection(
       Section, ELF::SHT_PROGBITS, ELF::SHF_ALLOC);
-  getParser().getStreamer().SwitchSection(ELFSection);
+  getParser().getStreamer().switchSection(ELFSection);
 
   getParser().Lex(); // Eat EndOfStatement token.
   return false;
@@ -8249,7 +8256,7 @@ bool MipsAsmParser::parseSSectionDirective(StringRef Section, unsigned Type) {
 
   MCSection *ELFSection = getContext().getELFSection(
       Section, Type, ELF::SHF_WRITE | ELF::SHF_ALLOC | ELF::SHF_MIPS_GPREL);
-  getParser().getStreamer().SwitchSection(ELFSection);
+  getParser().getStreamer().switchSection(ELFSection);
 
   getParser().Lex(); // Eat EndOfStatement token.
   return false;
diff --git a/gnu/llvm/llvm/lib/Target/Mips/CMakeLists.txt b/gnu/llvm/llvm/lib/Target/Mips/CMakeLists.txt
index 90e024f1631..30da982f4a6 100644
--- a/gnu/llvm/llvm/lib/Target/Mips/CMakeLists.txt
+++ b/gnu/llvm/llvm/lib/Target/Mips/CMakeLists.txt
@@ -9,6 +9,8 @@ tablegen(LLVM MipsGenDAGISel.inc -gen-dag-isel)
 tablegen(LLVM MipsGenDisassemblerTables.inc -gen-disassembler)
 tablegen(LLVM MipsGenFastISel.inc -gen-fast-isel)
 tablegen(LLVM MipsGenGlobalISel.inc -gen-global-isel)
+tablegen(LLVM MipsGenPostLegalizeGICombiner.inc -gen-global-isel-combiner
+              -combiners="MipsPostLegalizerCombinerHelper")
 tablegen(LLVM MipsGenInstrInfo.inc -gen-instr-info)
 tablegen(LLVM MipsGenMCCodeEmitter.inc -gen-emitter)
 tablegen(LLVM MipsGenMCPseudoLowering.inc -gen-pseudo-lowering)
@@ -49,6 +51,7 @@ add_llvm_target(MipsCodeGen
   MipsOptimizePICCall.cpp
   MipsOs16.cpp
   MipsPreLegalizerCombiner.cpp
+  MipsPostLegalizerCombiner.cpp
   MipsRegisterBankInfo.cpp
   MipsRegisterInfo.cpp
   MipsReturnProtectorLowering.cpp
@@ -60,7 +63,9 @@ add_llvm_target(MipsCodeGen
   MipsSubtarget.cpp
   MipsTargetMachine.cpp
   MipsTargetObjectFile.cpp
+  MipsTargetTransformInfo.cpp
   MicroMipsSizeReduction.cpp
+  MipsMulMulBugPass.cpp
 
   LINK_COMPONENTS
   Analysis
@@ -73,6 +78,7 @@ add_llvm_target(MipsCodeGen
   SelectionDAG
   Support
   Target
+  TargetParser
   GlobalISel
 
   ADD_TO_COMPONENT
diff --git a/gnu/llvm/llvm/lib/Target/Mips/MCTargetDesc/MipsABIInfo.cpp b/gnu/llvm/llvm/lib/Target/Mips/MCTargetDesc/MipsABIInfo.cpp
index 8b9826e6703..abd78d08970 100644
--- a/gnu/llvm/llvm/lib/Target/Mips/MCTargetDesc/MipsABIInfo.cpp
+++ b/gnu/llvm/llvm/lib/Target/Mips/MCTargetDesc/MipsABIInfo.cpp
@@ -9,8 +9,10 @@
 #include "MipsABIInfo.h"
 #include "MipsRegisterInfo.h"
 #include "llvm/ADT/StringRef.h"
+#include "llvm/CodeGen/MachineMemOperand.h"
 #include "llvm/MC/MCTargetOptions.h"
 #include "llvm/Support/CommandLine.h"
+#include "llvm/Support/LowLevelTypeImpl.h"
 
 using namespace llvm;
 
@@ -36,17 +38,17 @@ static const MCPhysReg Mips64IntRegs[8] = {
 
 ArrayRef<MCPhysReg> MipsABIInfo::GetByValArgRegs() const {
   if (IsO32())
-    return makeArrayRef(O32IntRegs);
+    return ArrayRef(O32IntRegs);
   if (IsN32() || IsN64())
-    return makeArrayRef(Mips64IntRegs);
+    return ArrayRef(Mips64IntRegs);
   llvm_unreachable("Unhandled ABI");
 }
 
 ArrayRef<MCPhysReg> MipsABIInfo::GetVarArgRegs() const {
   if (IsO32())
-    return makeArrayRef(O32IntRegs);
+    return ArrayRef(O32IntRegs);
   if (IsN32() || IsN64())
-    return makeArrayRef(Mips64IntRegs);
+    return ArrayRef(Mips64IntRegs);
   llvm_unreachable("Unhandled ABI");
 }
 
diff --git a/gnu/llvm/llvm/lib/Target/Mips/Mips.h b/gnu/llvm/llvm/lib/Target/Mips/Mips.h
index 3729a328159..4648d26d0ec 100644
--- a/gnu/llvm/llvm/lib/Target/Mips/Mips.h
+++ b/gnu/llvm/llvm/lib/Target/Mips/Mips.h
@@ -18,37 +18,42 @@
 #include "llvm/Target/TargetMachine.h"
 
 namespace llvm {
-  class MipsTargetMachine;
-  class ModulePass;
-  class FunctionPass;
-  class MipsRegisterBankInfo;
-  class MipsSubtarget;
-  class MipsTargetMachine;
-  class InstructionSelector;
-  class PassRegistry;
-
-  ModulePass *createMipsOs16Pass();
-  ModulePass *createMips16HardFloatPass();
-
-  FunctionPass *createMipsModuleISelDagPass();
-  FunctionPass *createMipsOptimizePICCallPass();
-  FunctionPass *createMipsDelaySlotFillerPass();
-  FunctionPass *createMipsBranchExpansion();
-  FunctionPass *createMipsConstantIslandPass();
-  FunctionPass *createMicroMipsSizeReducePass();
-  FunctionPass *createMipsExpandPseudoPass();
-  FunctionPass *createMipsPreLegalizeCombiner();
-  FunctionPass *createMipsLoongson2FBTBFix();
-
-  InstructionSelector *createMipsInstructionSelector(const MipsTargetMachine &,
-                                                     MipsSubtarget &,
-                                                     MipsRegisterBankInfo &);
-
-  void initializeMipsDelaySlotFillerPass(PassRegistry &);
-  void initializeMipsBranchExpansionPass(PassRegistry &);
-  void initializeMicroMipsSizeReducePass(PassRegistry &);
-  void initializeMipsPreLegalizerCombinerPass(PassRegistry&);
-  void initializeMipsLoongson2FBTBFixPass(PassRegistry &);
-} // end namespace llvm;
+class FunctionPass;
+class InstructionSelector;
+class MipsRegisterBankInfo;
+class MipsSubtarget;
+class MipsTargetMachine;
+class MipsTargetMachine;
+class ModulePass;
+class PassRegistry;
+
+ModulePass *createMipsOs16Pass();
+ModulePass *createMips16HardFloatPass();
+
+FunctionPass *createMipsLoongson2FBTBFix();
+FunctionPass *createMipsModuleISelDagPass();
+FunctionPass *createMipsOptimizePICCallPass();
+FunctionPass *createMipsDelaySlotFillerPass();
+FunctionPass *createMipsBranchExpansion();
+FunctionPass *createMipsConstantIslandPass();
+FunctionPass *createMicroMipsSizeReducePass();
+FunctionPass *createMipsExpandPseudoPass();
+FunctionPass *createMipsPreLegalizeCombiner();
+FunctionPass *createMipsPostLegalizeCombiner(bool IsOptNone);
+FunctionPass *createMipsMulMulBugPass();
+
+InstructionSelector *createMipsInstructionSelector(const MipsTargetMachine &,
+                                                   MipsSubtarget &,
+                                                   MipsRegisterBankInfo &);
+
+void initializeMipsLoongson2FBTBFixPass(PassRegistry &);
+void initializeMicroMipsSizeReducePass(PassRegistry &);
+void initializeMipsBranchExpansionPass(PassRegistry &);
+void initializeMipsDAGToDAGISelPass(PassRegistry &);
+void initializeMipsDelaySlotFillerPass(PassRegistry &);
+void initializeMipsMulMulBugFixPass(PassRegistry &);
+void initializeMipsPostLegalizerCombinerPass(PassRegistry &);
+void initializeMipsPreLegalizerCombinerPass(PassRegistry &);
+} // namespace llvm
 
 #endif
diff --git a/gnu/llvm/llvm/lib/Target/Mips/MipsAsmPrinter.cpp b/gnu/llvm/llvm/lib/Target/Mips/MipsAsmPrinter.cpp
index 305ba567737..d319e253ebe 100644
--- a/gnu/llvm/llvm/lib/Target/Mips/MipsAsmPrinter.cpp
+++ b/gnu/llvm/llvm/lib/Target/Mips/MipsAsmPrinter.cpp
@@ -52,9 +52,9 @@
 #include "llvm/MC/MCSectionELF.h"
 #include "llvm/MC/MCSymbol.h"
 #include "llvm/MC/MCSymbolELF.h"
+#include "llvm/MC/TargetRegistry.h"
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/ErrorHandling.h"
-#include "llvm/Support/TargetRegistry.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Target/TargetLoweringObjectFile.h"
 #include "llvm/Target/TargetMachine.h"
@@ -80,13 +80,9 @@ bool MipsAsmPrinter::runOnMachineFunction(MachineFunction &MF) {
 
   MipsFI = MF.getInfo<MipsFunctionInfo>();
   if (Subtarget->inMips16Mode())
-    for (std::map<
-             const char *,
-             const Mips16HardFloatInfo::FuncSignature *>::const_iterator
-             it = MipsFI->StubsNeeded.begin();
-         it != MipsFI->StubsNeeded.end(); ++it) {
-      const char *Symbol = it->first;
-      const Mips16HardFloatInfo::FuncSignature *Signature = it->second;
+    for (const auto &I : MipsFI->StubsNeeded) {
+      const char *Symbol = I.first;
+      const Mips16HardFloatInfo::FuncSignature *Signature = I.second;
       if (StubsNeeded.find(Symbol) == StubsNeeded.end())
         StubsNeeded[Symbol] = Signature;
     }
@@ -163,9 +159,8 @@ static void emitDirectiveRelocJalr(const MachineInstr &MI,
                                    TargetMachine &TM,
                                    MCStreamer &OutStreamer,
                                    const MipsSubtarget &Subtarget) {
-  for (unsigned int I = MI.getDesc().getNumOperands(), E = MI.getNumOperands();
-       I < E; ++I) {
-    MachineOperand MO = MI.getOperand(I);
+  for (const MachineOperand &MO :
+       llvm::drop_begin(MI.operands(), MI.getDesc().getNumOperands())) {
     if (MO.isMCSymbol() && (MO.getTargetFlags() & MipsII::MO_JALR)) {
       MCSymbol *Callee = MO.getMCSymbol();
       if (Callee && !Callee->getName().empty()) {
@@ -186,6 +181,10 @@ static void emitDirectiveRelocJalr(const MachineInstr &MI,
 }
 
 void MipsAsmPrinter::emitInstruction(const MachineInstr *MI) {
+  // FIXME: Enable feature predicate checks once all the test pass.
+  // Mips_MC::verifyInstructionPredicates(MI->getOpcode(),
+  //                                      getSubtargetInfo().getFeatureBits());
+
   MipsTargetStreamer &TS = getTargetStreamer();
   unsigned Opc = MI->getOpcode();
   TS.forbidModuleDirective();
@@ -419,7 +418,7 @@ void MipsAsmPrinter::printSavedRegsBitmask() {
   unsigned CSFPRegsSize = 0;
 
   for (const auto &I : CSI) {
-    unsigned Reg = I.getReg();
+    Register Reg = I.getReg();
     unsigned RegNum = TRI->getEncodingValue(Reg);
 
     // If it's a floating point register, set the FPU Bitmask.
@@ -604,27 +603,27 @@ bool MipsAsmPrinter::PrintAsmOperand(const MachineInstr *MI, unsigned OpNum,
       // See if this is a generic print operand
       return AsmPrinter::PrintAsmOperand(MI, OpNum, ExtraCode, O);
     case 'X': // hex const int
-      if ((MO.getType()) != MachineOperand::MO_Immediate)
+      if (!MO.isImm())
         return true;
       O << "0x" << Twine::utohexstr(MO.getImm());
       return false;
     case 'x': // hex const int (low 16 bits)
-      if ((MO.getType()) != MachineOperand::MO_Immediate)
+      if (!MO.isImm())
         return true;
       O << "0x" << Twine::utohexstr(MO.getImm() & 0xffff);
       return false;
     case 'd': // decimal const int
-      if ((MO.getType()) != MachineOperand::MO_Immediate)
+      if (!MO.isImm())
         return true;
       O << MO.getImm();
       return false;
     case 'm': // decimal const int minus 1
-      if ((MO.getType()) != MachineOperand::MO_Immediate)
+      if (!MO.isImm())
         return true;
       O << MO.getImm() - 1;
       return false;
     case 'y': // exact log2
-      if ((MO.getType()) != MachineOperand::MO_Immediate)
+      if (!MO.isImm())
         return true;
       if (!isPowerOf2_64(MO.getImm()))
         return true;
@@ -632,7 +631,7 @@ bool MipsAsmPrinter::PrintAsmOperand(const MachineInstr *MI, unsigned OpNum,
       return false;
     case 'z':
       // $0 if zero, regular printing otherwise
-      if (MO.getType() == MachineOperand::MO_Immediate && MO.getImm() == 0) {
+      if (MO.isImm() && MO.getImm() == 0) {
         O << "$0";
         return false;
       }
@@ -864,7 +863,7 @@ void MipsAsmPrinter::emitStartOfAsmFile(Module &M) {
   StringRef CPU = MIPS_MC::selectMipsCPU(TT, TM.getTargetCPU());
   StringRef FS = TM.getTargetFeatureString();
   const MipsTargetMachine &MTM = static_cast<const MipsTargetMachine &>(TM);
-  const MipsSubtarget STI(TT, CPU, FS, MTM.isLittleEndian(), MTM, None);
+  const MipsSubtarget STI(TT, CPU, FS, MTM.isLittleEndian(), MTM, std::nullopt);
 
   bool IsABICalls = STI.isABICalls();
   const MipsABIInfo &ABI = MTM.getABI();
@@ -880,7 +879,7 @@ void MipsAsmPrinter::emitStartOfAsmFile(Module &M) {
 
   // Tell the assembler which ABI we are using
   std::string SectionName = std::string(".mdebug.") + getCurrentABIString();
-  OutStreamer->SwitchSection(
+  OutStreamer->switchSection(
       OutContext.getELFSection(SectionName, ELF::SHT_PROGBITS, 0));
 
   // NaN: At the moment we only support:
@@ -907,7 +906,7 @@ void MipsAsmPrinter::emitStartOfAsmFile(Module &M) {
     TS.emitDirectiveModuleOddSPReg();
 
   // Switch to the .text section.
-  OutStreamer->SwitchSection(getObjFileLowering().getTextSection());
+  OutStreamer->switchSection(getObjFileLowering().getTextSection());
 }
 
 void MipsAsmPrinter::emitInlineAsmStart() const {
@@ -923,12 +922,12 @@ void MipsAsmPrinter::emitInlineAsmStart() const {
   TS.emitDirectiveSetAt();
   TS.emitDirectiveSetMacro();
   TS.emitDirectiveSetReorder();
-  OutStreamer->AddBlankLine();
+  OutStreamer->addBlankLine();
 }
 
 void MipsAsmPrinter::emitInlineAsmEnd(const MCSubtargetInfo &StartInfo,
                                       const MCSubtargetInfo *EndInfo) const {
-  OutStreamer->AddBlankLine();
+  OutStreamer->addBlankLine();
   getTargetStreamer().emitDirectiveSetPop();
 }
 
@@ -1120,18 +1119,18 @@ void MipsAsmPrinter::EmitFPCallStub(
   //
   // probably not necessary but we save and restore the current section state
   //
-  OutStreamer->PushSection();
+  OutStreamer->pushSection();
   //
   // .section mips16.call.fpxxxx,"ax",@progbits
   //
   MCSectionELF *M = OutContext.getELFSection(
       ".mips16.call.fp." + std::string(Symbol), ELF::SHT_PROGBITS,
       ELF::SHF_ALLOC | ELF::SHF_EXECINSTR);
-  OutStreamer->SwitchSection(M, nullptr);
+  OutStreamer->switchSection(M, nullptr);
   //
   // .align 2
   //
-  OutStreamer->emitValueToAlignment(4);
+  OutStreamer->emitValueToAlignment(Align(4));
   MipsTargetStreamer &TS = getTargetStreamer();
   //
   // .set nomips16
@@ -1196,7 +1195,7 @@ void MipsAsmPrinter::EmitFPCallStub(
   const MCExpr *T_min_E = MCBinaryExpr::createSub(T, E, OutContext);
   OutStreamer->emitELFSize(Stub, T_min_E);
   TS.emitDirectiveEnd(x);
-  OutStreamer->PopSection();
+  OutStreamer->popSection();
 }
 
 void MipsAsmPrinter::emitEndOfAsmFile(Module &M) {
@@ -1212,7 +1211,7 @@ void MipsAsmPrinter::emitEndOfAsmFile(Module &M) {
     EmitFPCallStub(Symbol, Signature);
   }
   // return to the text section
-  OutStreamer->SwitchSection(OutContext.getObjectFileInfo()->getTextSection());
+  OutStreamer->switchSection(OutContext.getObjectFileInfo()->getTextSection());
 }
 
 void MipsAsmPrinter::EmitSled(const MachineInstr &MI, SledKind Kind) {
@@ -1280,7 +1279,7 @@ void MipsAsmPrinter::EmitSled(const MachineInstr &MI, SledKind Kind) {
   //   LD       RA, 8(SP)
   //   DADDIU   SP, SP, 16
   //
-  OutStreamer->emitCodeAlignment(4);
+  OutStreamer->emitCodeAlignment(Align(4), &getSubtargetInfo());
   auto CurSled = OutContext.createTempSymbol("xray_sled_", true);
   OutStreamer->emitLabel(CurSled);
   auto Target = OutContext.createTempSymbol();
@@ -1357,11 +1356,11 @@ void MipsAsmPrinter::NaClAlignIndirectJumpTargets(MachineFunction &MF) {
   // Align all blocks that are jumped to through jump table.
   if (MachineJumpTableInfo *JtInfo = MF.getJumpTableInfo()) {
     const std::vector<MachineJumpTableEntry> &JT = JtInfo->getJumpTables();
-    for (unsigned I = 0; I < JT.size(); ++I) {
-      const std::vector<MachineBasicBlock*> &MBBs = JT[I].MBBs;
+    for (const auto &I : JT) {
+      const std::vector<MachineBasicBlock *> &MBBs = I.MBBs;
 
-      for (unsigned J = 0; J < MBBs.size(); ++J)
-        MBBs[J]->setAlignment(MIPS_NACL_BUNDLE_ALIGN);
+      for (MachineBasicBlock *MBB : MBBs)
+        MBB->setAlignment(MIPS_NACL_BUNDLE_ALIGN);
     }
   }
 
diff --git a/gnu/llvm/llvm/lib/Target/Mips/MipsFrameLowering.h b/gnu/llvm/llvm/lib/Target/Mips/MipsFrameLowering.h
index 3c2aff0cf46..8adec0ffdbf 100644
--- a/gnu/llvm/llvm/lib/Target/Mips/MipsFrameLowering.h
+++ b/gnu/llvm/llvm/lib/Target/Mips/MipsFrameLowering.h
@@ -38,7 +38,10 @@ public:
 
   bool hasBP(const MachineFunction &MF) const;
 
-  bool isFPCloseToIncomingSP() const override { return false; }
+  bool allocateScavengingFrameIndexesNearIncomingSP(
+    const MachineFunction &MF) const override {
+    return false;
+  }
 
   bool enableShrinkWrapping(const MachineFunction &MF) const override {
     return true;
diff --git a/gnu/llvm/llvm/lib/Target/Mips/MipsISelLowering.cpp b/gnu/llvm/llvm/lib/Target/Mips/MipsISelLowering.cpp
index a811a5b55f6..fae52b435b0 100644
--- a/gnu/llvm/llvm/lib/Target/Mips/MipsISelLowering.cpp
+++ b/gnu/llvm/llvm/lib/Target/Mips/MipsISelLowering.cpp
@@ -94,18 +94,6 @@ static const MCPhysReg Mips64DPRegs[8] = {
   Mips::D16_64, Mips::D17_64, Mips::D18_64, Mips::D19_64
 };
 
-// If I is a shifted mask, set the size (Size) and the first bit of the
-// mask (Pos), and return true.
-// For example, if I is 0x003ff800, (Pos, Size) = (11, 11).
-static bool isShiftedMask(uint64_t I, uint64_t &Pos, uint64_t &Size) {
-  if (!isShiftedMask_64(I))
-    return false;
-
-  Size = countPopulation(I);
-  Pos = countTrailingZeros(I);
-  return true;
-}
-
 // The MIPS MSA ABI passes vector arguments in the integer register set.
 // The number of integer registers used is dependant on the ABI used.
 MVT MipsTargetLowering::getRegisterTypeForCallingConv(LLVMContext &Context,
@@ -192,6 +180,7 @@ const char *MipsTargetLowering::getTargetNodeName(unsigned Opcode) const {
   case MipsISD::Ret:               return "MipsISD::Ret";
   case MipsISD::ERet:              return "MipsISD::ERet";
   case MipsISD::EH_RETURN:         return "MipsISD::EH_RETURN";
+  case MipsISD::FAbs:              return "MipsISD::FAbs";
   case MipsISD::FMS:               return "MipsISD::FMS";
   case MipsISD::FPBrcond:          return "MipsISD::FPBrcond";
   case MipsISD::FPCmp:             return "MipsISD::FPCmp";
@@ -353,15 +342,12 @@ MipsTargetLowering::MipsTargetLowering(const MipsTargetMachine &TM,
   setOperationAction(ISD::SETCC,              MVT::f32,   Custom);
   setOperationAction(ISD::SETCC,              MVT::f64,   Custom);
   setOperationAction(ISD::BRCOND,             MVT::Other, Custom);
+  setOperationAction(ISD::FABS,               MVT::f32,   Custom);
+  setOperationAction(ISD::FABS,               MVT::f64,   Custom);
   setOperationAction(ISD::FCOPYSIGN,          MVT::f32,   Custom);
   setOperationAction(ISD::FCOPYSIGN,          MVT::f64,   Custom);
   setOperationAction(ISD::FP_TO_SINT,         MVT::i32,   Custom);
 
-  if (!(TM.Options.NoNaNsFPMath || Subtarget.inAbs2008Mode())) {
-    setOperationAction(ISD::FABS, MVT::f32, Custom);
-    setOperationAction(ISD::FABS, MVT::f64, Custom);
-  }
-
   if (Subtarget.isGP64bit()) {
     setOperationAction(ISD::GlobalAddress,      MVT::i64,   Custom);
     setOperationAction(ISD::BlockAddress,       MVT::i64,   Custom);
@@ -494,21 +480,17 @@ MipsTargetLowering::MipsTargetLowering(const MipsTargetMachine &TM,
 
   setOperationAction(ISD::TRAP, MVT::Other, Legal);
 
-  setTargetDAGCombine(ISD::SDIVREM);
-  setTargetDAGCombine(ISD::UDIVREM);
-  setTargetDAGCombine(ISD::SELECT);
-  setTargetDAGCombine(ISD::AND);
-  setTargetDAGCombine(ISD::OR);
-  setTargetDAGCombine(ISD::ADD);
-  setTargetDAGCombine(ISD::SUB);
-  setTargetDAGCombine(ISD::AssertZext);
-  setTargetDAGCombine(ISD::SHL);
+  setTargetDAGCombine({ISD::SDIVREM, ISD::UDIVREM, ISD::SELECT, ISD::AND,
+                       ISD::OR, ISD::ADD, ISD::SUB, ISD::AssertZext, ISD::SHL});
 
   if (ABI.IsO32()) {
     // These libcalls are not available in 32-bit.
     setLibcallName(RTLIB::SHL_I128, nullptr);
     setLibcallName(RTLIB::SRL_I128, nullptr);
     setLibcallName(RTLIB::SRA_I128, nullptr);
+    setLibcallName(RTLIB::MUL_I128, nullptr);
+    setLibcallName(RTLIB::MULO_I64, nullptr);
+    setLibcallName(RTLIB::MULO_I128, nullptr);
   }
 
   setMinFunctionAlignment(Subtarget.isGP64bit() ? Align(8) : Align(4));
@@ -791,14 +773,15 @@ static SDValue performANDCombine(SDNode *N, SelectionDAG &DAG,
   EVT ValTy = N->getValueType(0);
   SDLoc DL(N);
 
-  uint64_t Pos = 0, SMPos, SMSize;
+  uint64_t Pos = 0;
+  unsigned SMPos, SMSize;
   ConstantSDNode *CN;
   SDValue NewOperand;
   unsigned Opc;
 
   // Op's second operand must be a shifted mask.
   if (!(CN = dyn_cast<ConstantSDNode>(Mask)) ||
-      !isShiftedMask(CN->getZExtValue(), SMPos, SMSize))
+      !isShiftedMask_64(CN->getZExtValue(), SMPos, SMSize))
     return SDValue();
 
   if (FirstOperandOpc == ISD::SRA || FirstOperandOpc == ISD::SRL) {
@@ -872,7 +855,7 @@ static SDValue performORCombine(SDNode *N, SelectionDAG &DAG,
     return SDValue();
 
   SDValue And0 = N->getOperand(0), And1 = N->getOperand(1);
-  uint64_t SMPos0, SMSize0, SMPos1, SMSize1;
+  unsigned SMPos0, SMSize0, SMPos1, SMSize1;
   ConstantSDNode *CN, *CN1;
 
   // See if Op's first operand matches (and $src1 , mask0).
@@ -880,7 +863,7 @@ static SDValue performORCombine(SDNode *N, SelectionDAG &DAG,
     return SDValue();
 
   if (!(CN = dyn_cast<ConstantSDNode>(And0.getOperand(1))) ||
-      !isShiftedMask(~CN->getSExtValue(), SMPos0, SMSize0))
+      !isShiftedMask_64(~CN->getSExtValue(), SMPos0, SMSize0))
     return SDValue();
 
   // See if Op's second operand matches (and (shl $src, pos), mask1).
@@ -888,7 +871,7 @@ static SDValue performORCombine(SDNode *N, SelectionDAG &DAG,
       And1.getOperand(0).getOpcode() == ISD::SHL) {
 
     if (!(CN = dyn_cast<ConstantSDNode>(And1.getOperand(1))) ||
-        !isShiftedMask(CN->getZExtValue(), SMPos1, SMSize1))
+        !isShiftedMask_64(CN->getZExtValue(), SMPos1, SMSize1))
       return SDValue();
 
     // The shift masks must have the same position and size.
@@ -967,6 +950,14 @@ static SDValue performMADD_MSUBCombine(SDNode *ROOTNode, SelectionDAG &CurDAG,
       ROOTNode->getOperand(1).getOpcode() != ISD::MUL)
     return SDValue();
 
+  // In the case where we have a multiplication as the left operand of
+  // of a subtraction, we can't combine into a MipsISD::MSub node as the
+  // the instruction definition of msub(u) places the multiplication on
+  // on the right.
+  if (ROOTNode->getOpcode() == ISD::SUB &&
+      ROOTNode->getOperand(0).getOpcode() == ISD::MUL)
+    return SDValue();
+
   // We don't handle vector types here.
   if (ROOTNode->getValueType(0).isVector())
     return SDValue();
@@ -1115,7 +1106,8 @@ static SDValue performSHLCombine(SDNode *N, SelectionDAG &DAG,
   EVT ValTy = N->getValueType(0);
   SDLoc DL(N);
 
-  uint64_t Pos = 0, SMPos, SMSize;
+  uint64_t Pos = 0;
+  unsigned SMPos, SMSize;
   ConstantSDNode *CN;
   SDValue NewOperand;
 
@@ -1133,7 +1125,7 @@ static SDValue performSHLCombine(SDNode *N, SelectionDAG &DAG,
 
   // AND's second operand must be a shifted mask.
   if (!(CN = dyn_cast<ConstantSDNode>(FirstOperand.getOperand(1))) ||
-      !isShiftedMask(CN->getZExtValue(), SMPos, SMSize))
+      !isShiftedMask_64(CN->getZExtValue(), SMPos, SMSize))
     return SDValue();
 
   // Return if the shifted mask does not start at bit 0 or the sum of its size
@@ -1180,16 +1172,32 @@ SDValue  MipsTargetLowering::PerformDAGCombine(SDNode *N, DAGCombinerInfo &DCI)
   return SDValue();
 }
 
-bool MipsTargetLowering::isCheapToSpeculateCttz() const {
+bool MipsTargetLowering::isCheapToSpeculateCttz(Type *Ty) const {
   return Subtarget.hasMips32();
 }
 
-bool MipsTargetLowering::isCheapToSpeculateCtlz() const {
+bool MipsTargetLowering::isCheapToSpeculateCtlz(Type *Ty) const {
   return Subtarget.hasMips32();
 }
 
+bool MipsTargetLowering::hasBitTest(SDValue X, SDValue Y) const {
+  // We can use ANDI+SLTIU as a bit test. Y contains the bit position.
+  // For MIPSR2 or later, we may be able to use the `ext` instruction or its'
+  // double-word variants.
+  if (auto *C = dyn_cast<ConstantSDNode>(Y))
+    return C->getAPIntValue().ule(15);
+
+  return false;
+}
+
 bool MipsTargetLowering::shouldFoldConstantShiftPairToMask(
     const SDNode *N, CombineLevel Level) const {
+  assert(((N->getOpcode() == ISD::SHL &&
+           N->getOperand(0).getOpcode() == ISD::SRL) ||
+          (N->getOpcode() == ISD::SRL &&
+           N->getOperand(0).getOpcode() == ISD::SHL)) &&
+         "Expected shift-shift mask");
+
   if (N->getOperand(0).getValueType().isVector())
     return false;
   return true;
@@ -2073,7 +2081,7 @@ SDValue MipsTargetLowering::lowerGlobalAddress(SDValue Op,
     const MipsTargetObjectFile *TLOF =
         static_cast<const MipsTargetObjectFile *>(
             getTargetMachine().getObjFileLowering());
-    const GlobalObject *GO = GV->getBaseObject();
+    const GlobalObject *GO = GV->getAliaseeObject();
     if (GO && TLOF->IsGlobalInSmallSection(GO, getTargetMachine()))
       // %gp_rel relocation
       return getAddrGPRel(N, SDLoc(N), Ty, DAG, ABI.IsN64());
@@ -2418,11 +2426,14 @@ MipsTargetLowering::lowerFCOPYSIGN(SDValue Op, SelectionDAG &DAG) const {
   return lowerFCOPYSIGN32(Op, DAG, Subtarget.hasExtractInsert());
 }
 
-static SDValue lowerFABS32(SDValue Op, SelectionDAG &DAG,
-                           bool HasExtractInsert) {
+SDValue MipsTargetLowering::lowerFABS32(SDValue Op, SelectionDAG &DAG,
+                                        bool HasExtractInsert) const {
   SDLoc DL(Op);
   SDValue Res, Const1 = DAG.getConstant(1, DL, MVT::i32);
 
+  if (DAG.getTarget().Options.NoNaNsFPMath || Subtarget.inAbs2008Mode())
+    return DAG.getNode(MipsISD::FAbs, DL, Op.getValueType(), Op.getOperand(0));
+
   // If operand is of type f64, extract the upper 32-bit. Otherwise, bitcast it
   // to i32.
   SDValue X = (Op.getValueType() == MVT::f32)
@@ -2455,11 +2466,14 @@ static SDValue lowerFABS32(SDValue Op, SelectionDAG &DAG,
   return DAG.getNode(MipsISD::BuildPairF64, DL, MVT::f64, LowX, Res);
 }
 
-static SDValue lowerFABS64(SDValue Op, SelectionDAG &DAG,
-                           bool HasExtractInsert) {
+SDValue MipsTargetLowering::lowerFABS64(SDValue Op, SelectionDAG &DAG,
+                                        bool HasExtractInsert) const {
   SDLoc DL(Op);
   SDValue Res, Const1 = DAG.getConstant(1, DL, MVT::i32);
 
+  if (DAG.getTarget().Options.NoNaNsFPMath || Subtarget.inAbs2008Mode())
+    return DAG.getNode(MipsISD::FAbs, DL, Op.getValueType(), Op.getOperand(0));
+
   // Bitcast to integer node.
   SDValue X = DAG.getNode(ISD::BITCAST, DL, MVT::i64, Op.getOperand(0));
 
@@ -2520,7 +2534,7 @@ SDValue MipsTargetLowering::lowerRETURNADDR(SDValue Op,
   MFI.setReturnAddressIsTaken(true);
 
   // Return RA, which contains the return address. Mark it an implicit live-in.
-  unsigned Reg = MF.addLiveIn(RA, getRegClassFor(VT));
+  Register Reg = MF.addLiveIn(RA, getRegClassFor(VT));
   return DAG.getCopyFromReg(DAG.getEntryNode(), SDLoc(Op), Reg, VT);
 }
 
@@ -2670,7 +2684,7 @@ SDValue MipsTargetLowering::lowerLOAD(SDValue Op, SelectionDAG &DAG) const {
     return Op;
 
   // Return if load is aligned or if MemVT is neither i32 nor i64.
-  if ((LD->getAlignment() >= MemVT.getSizeInBits() / 8) ||
+  if ((LD->getAlign().value() >= (MemVT.getSizeInBits() / 8)) ||
       ((MemVT != MVT::i32) && (MemVT != MVT::i64)))
     return SDValue();
 
@@ -2784,7 +2798,7 @@ static SDValue lowerFP_TO_SINT_STORE(StoreSDNode *SD, SelectionDAG &DAG,
   SDValue Tr = DAG.getNode(MipsISD::TruncIntFP, SDLoc(Val), FPTy,
                            Val.getOperand(0));
   return DAG.getStore(SD->getChain(), SDLoc(SD), Tr, SD->getBasePtr(),
-                      SD->getPointerInfo(), SD->getAlignment(),
+                      SD->getPointerInfo(), SD->getAlign(),
                       SD->getMemOperand()->getFlags());
 }
 
@@ -2794,7 +2808,7 @@ SDValue MipsTargetLowering::lowerSTORE(SDValue Op, SelectionDAG &DAG) const {
 
   // Lower unaligned integer stores.
   if (!Subtarget.systemSupportsUnalignedAccess() &&
-      (SD->getAlignment() < MemVT.getSizeInBits() / 8) &&
+      (SD->getAlign().value() < (MemVT.getSizeInBits() / 8)) &&
       ((MemVT == MVT::i32) || (MemVT == MVT::i64)))
     return lowerUnalignedIntStore(SD, DAG, Subtarget.isLittle());
 
@@ -3048,17 +3062,15 @@ getOpndList(SmallVectorImpl<SDValue> &Ops,
   // stuck together.
   SDValue InFlag;
 
-  for (unsigned i = 0, e = RegsToPass.size(); i != e; ++i) {
-    Chain = CLI.DAG.getCopyToReg(Chain, CLI.DL, RegsToPass[i].first,
-                                 RegsToPass[i].second, InFlag);
+  for (auto &R : RegsToPass) {
+    Chain = CLI.DAG.getCopyToReg(Chain, CLI.DL, R.first, R.second, InFlag);
     InFlag = Chain.getValue(1);
   }
 
   // Add argument registers to the end of the list so that they are
   // known live into the call.
-  for (unsigned i = 0, e = RegsToPass.size(); i != e; ++i)
-    Ops.push_back(CLI.DAG.getRegister(RegsToPass[i].first,
-                                      RegsToPass[i].second.getValueType()));
+  for (auto &R : RegsToPass)
+    Ops.push_back(CLI.DAG.getRegister(R.first, R.second.getValueType()));
 
   // Add a register mask operand representing the call-preserved registers.
   const TargetRegisterInfo *TRI = Subtarget.getRegisterInfo();
@@ -3238,7 +3250,6 @@ MipsTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
   // byval arguments to the stack.
   unsigned StackAlignment = TFL->getStackAlignment();
   NextStackOffset = alignTo(NextStackOffset, StackAlignment);
-  SDValue NextStackOffsetVal = DAG.getIntPtrConstant(NextStackOffset, DL, true);
 
   if (!(IsTailCall || MemcpyInByVal))
     Chain = DAG.getCALLSEQ_START(Chain, NextStackOffset, 0, DL);
@@ -3311,19 +3322,19 @@ MipsTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
       break;
     case CCValAssign::SExtUpper:
       UseUpperBits = true;
-      LLVM_FALLTHROUGH;
+      [[fallthrough]];
     case CCValAssign::SExt:
       Arg = DAG.getNode(ISD::SIGN_EXTEND, DL, LocVT, Arg);
       break;
     case CCValAssign::ZExtUpper:
       UseUpperBits = true;
-      LLVM_FALLTHROUGH;
+      [[fallthrough]];
     case CCValAssign::ZExt:
       Arg = DAG.getNode(ISD::ZERO_EXTEND, DL, LocVT, Arg);
       break;
     case CCValAssign::AExtUpper:
       UseUpperBits = true;
-      LLVM_FALLTHROUGH;
+      [[fallthrough]];
     case CCValAssign::AExt:
       Arg = DAG.getNode(ISD::ANY_EXTEND, DL, LocVT, Arg);
       break;
@@ -3469,8 +3480,7 @@ MipsTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
   // Create the CALLSEQ_END node in the case of where it is not a call to
   // memcpy.
   if (!(MemcpyInByVal)) {
-    Chain = DAG.getCALLSEQ_END(Chain, NextStackOffsetVal,
-                               DAG.getIntPtrConstant(0, DL, true), InFlag, DL);
+    Chain = DAG.getCALLSEQ_END(Chain, NextStackOffset, 0, InFlag, DL);
     InFlag = Chain.getValue(1);
   }
 
@@ -3714,7 +3724,7 @@ SDValue MipsTargetLowering::LowerFormalArguments(
           LocVT = VA.getValVT();
       }
 
-      // sanity check
+      // Only arguments pased on the stack should make it here. 
       assert(VA.isMemLoc());
 
       // The stack pointer offset is relative to the caller stack frame.
@@ -3842,19 +3852,19 @@ MipsTargetLowering::LowerReturn(SDValue Chain, CallingConv::ID CallConv,
       break;
     case CCValAssign::AExtUpper:
       UseUpperBits = true;
-      LLVM_FALLTHROUGH;
+      [[fallthrough]];
     case CCValAssign::AExt:
       Val = DAG.getNode(ISD::ANY_EXTEND, DL, VA.getLocVT(), Val);
       break;
     case CCValAssign::ZExtUpper:
       UseUpperBits = true;
-      LLVM_FALLTHROUGH;
+      [[fallthrough]];
     case CCValAssign::ZExt:
       Val = DAG.getNode(ISD::ZERO_EXTEND, DL, VA.getLocVT(), Val);
       break;
     case CCValAssign::SExtUpper:
       UseUpperBits = true;
-      LLVM_FALLTHROUGH;
+      [[fallthrough]];
     case CCValAssign::SExt:
       Val = DAG.getNode(ISD::SIGN_EXTEND, DL, VA.getLocVT(), Val);
       break;
@@ -3975,7 +3985,7 @@ MipsTargetLowering::getSingleConstraintMatchWeight(
     break;
   case 'f': // FPU or MSA register
     if (Subtarget.hasMSA() && type->isVectorTy() &&
-        type->getPrimitiveSizeInBits().getFixedSize() == 128)
+        type->getPrimitiveSizeInBits().getFixedValue() == 128)
       weight = CW_Register;
     else if (type->isFloatTy())
       weight = CW_Register;
@@ -4121,7 +4131,7 @@ MipsTargetLowering::getRegForInlineAsmConstraint(const TargetRegisterInfo *TRI,
     case 'd': // Address register. Same as 'r' unless generating MIPS16 code.
     case 'y': // Same as 'r'. Exists for compatibility.
     case 'r':
-      if (VT == MVT::i32 || VT == MVT::i16 || VT == MVT::i8) {
+      if (VT == MVT::i32 || VT == MVT::i16 || VT == MVT::i8 || VT == MVT::i1) {
         if (Subtarget.inMips16Mode())
           return std::make_pair(0U, &Mips::CPU16RegsRegClass);
         return std::make_pair(0U, &Mips::GPR32RegClass);
@@ -4739,18 +4749,19 @@ MipsTargetLowering::emitPseudoD_SELECT(MachineInstr &MI,
 Register
 MipsTargetLowering::getRegisterByName(const char *RegName, LLT VT,
                                       const MachineFunction &MF) const {
-  // Named registers is expected to be fairly rare. For now, just support $28
-  // since the linux kernel uses it.
+  // The Linux kernel uses $28 and sp.
   if (Subtarget.isGP64bit()) {
     Register Reg = StringSwitch<Register>(RegName)
-                         .Case("$28", Mips::GP_64)
-                         .Default(Register());
+                       .Case("$28", Mips::GP_64)
+                       .Case("sp", Mips::SP_64)
+                       .Default(Register());
     if (Reg)
       return Reg;
   } else {
     Register Reg = StringSwitch<Register>(RegName)
-                         .Case("$28", Mips::GP)
-                         .Default(Register());
+                       .Case("$28", Mips::GP)
+                       .Case("sp", Mips::SP)
+                       .Default(Register());
     if (Reg)
       return Reg;
   }
diff --git a/gnu/llvm/llvm/lib/Target/Mips/MipsInstrInfo.td b/gnu/llvm/llvm/lib/Target/Mips/MipsInstrInfo.td
index 13d33ad2385..43611508389 100644
--- a/gnu/llvm/llvm/lib/Target/Mips/MipsInstrInfo.td
+++ b/gnu/llvm/llvm/lib/Target/Mips/MipsInstrInfo.td
@@ -833,22 +833,26 @@ def MipsJumpTargetAsmOperand : AsmOperandClass {
 def jmptarget   : Operand<OtherVT> {
   let EncoderMethod = "getJumpTargetOpValue";
   let ParserMatchClass = MipsJumpTargetAsmOperand;
+  let PrintMethod = "printJumpOperand";
 }
 def brtarget    : Operand<OtherVT> {
   let EncoderMethod = "getBranchTargetOpValue";
   let OperandType = "OPERAND_PCREL";
   let DecoderMethod = "DecodeBranchTarget";
   let ParserMatchClass = MipsJumpTargetAsmOperand;
+  let PrintMethod = "printBranchOperand";
 }
 def brtarget1SImm16 : Operand<OtherVT> {
   let EncoderMethod = "getBranchTargetOpValue1SImm16";
   let OperandType = "OPERAND_PCREL";
   let DecoderMethod = "DecodeBranchTarget1SImm16";
   let ParserMatchClass = MipsJumpTargetAsmOperand;
+  let PrintMethod = "printBranchOperand";
 }
 def calltarget  : Operand<iPTR> {
   let EncoderMethod = "getJumpTargetOpValue";
   let ParserMatchClass = MipsJumpTargetAsmOperand;
+  let PrintMethod = "printJumpOperand";
 }
 
 def imm64: Operand<i64>;
diff --git a/gnu/llvm/llvm/lib/Target/Mips/MipsTargetMachine.cpp b/gnu/llvm/llvm/lib/Target/Mips/MipsTargetMachine.cpp
index 4fd3028546d..2c05837c93d 100644
--- a/gnu/llvm/llvm/lib/Target/Mips/MipsTargetMachine.cpp
+++ b/gnu/llvm/llvm/lib/Target/Mips/MipsTargetMachine.cpp
@@ -15,15 +15,17 @@
 #include "MCTargetDesc/MipsMCTargetDesc.h"
 #include "Mips.h"
 #include "Mips16ISelDAGToDAG.h"
+#include "MipsMachineFunction.h"
 #include "MipsSEISelDAGToDAG.h"
 #include "MipsSubtarget.h"
 #include "MipsTargetObjectFile.h"
+#include "MipsTargetTransformInfo.h"
 #include "TargetInfo/MipsTargetInfo.h"
-#include "llvm/ADT/Optional.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Analysis/TargetTransformInfo.h"
 #include "llvm/CodeGen/BasicTTIImpl.h"
+#include "llvm/CodeGen/GlobalISel/CSEInfo.h"
 #include "llvm/CodeGen/GlobalISel/IRTranslator.h"
 #include "llvm/CodeGen/GlobalISel/InstructionSelect.h"
 #include "llvm/CodeGen/GlobalISel/Legalizer.h"
@@ -34,11 +36,12 @@
 #include "llvm/IR/Attributes.h"
 #include "llvm/IR/Function.h"
 #include "llvm/InitializePasses.h"
+#include "llvm/MC/TargetRegistry.h"
 #include "llvm/Support/CodeGen.h"
 #include "llvm/Support/Debug.h"
-#include "llvm/Support/TargetRegistry.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Target/TargetOptions.h"
+#include <optional>
 #include <string>
 
 using namespace llvm;
@@ -46,6 +49,9 @@ using namespace llvm;
 #define DEBUG_TYPE "mips"
 
 extern cl::opt<bool> FixLoongson2FBTB;
+static cl::opt<bool>
+    EnableMulMulFix("mfix4300", cl::init(false),
+                    cl::desc("Enable the VR4300 mulmul bug fix."), cl::Hidden);
 
 extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeMipsTarget() {
   // Register the target.
@@ -60,6 +66,9 @@ extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeMipsTarget() {
   initializeMipsBranchExpansionPass(*PR);
   initializeMicroMipsSizeReducePass(*PR);
   initializeMipsPreLegalizerCombinerPass(*PR);
+  initializeMipsPostLegalizerCombinerPass(*PR);
+  initializeMipsMulMulBugFixPass(*PR);
+  initializeMipsDAGToDAGISelPass(*PR);
 }
 
 static std::string computeDataLayout(const Triple &TT, StringRef CPU,
@@ -99,8 +108,8 @@ static std::string computeDataLayout(const Triple &TT, StringRef CPU,
 }
 
 static Reloc::Model getEffectiveRelocModel(bool JIT,
-                                           Optional<Reloc::Model> RM) {
-  if (!RM.hasValue() || JIT)
+                                           std::optional<Reloc::Model> RM) {
+  if (!RM || JIT)
     return Reloc::Static;
   return *RM;
 }
@@ -113,8 +122,8 @@ static Reloc::Model getEffectiveRelocModel(bool JIT,
 MipsTargetMachine::MipsTargetMachine(const Target &T, const Triple &TT,
                                      StringRef CPU, StringRef FS,
                                      const TargetOptions &Options,
-                                     Optional<Reloc::Model> RM,
-                                     Optional<CodeModel::Model> CM,
+                                     std::optional<Reloc::Model> RM,
+                                     std::optional<CodeModel::Model> CM,
                                      CodeGenOpt::Level OL, bool JIT,
                                      bool isLittle)
     : LLVMTargetMachine(T, computeDataLayout(TT, CPU, Options, isLittle), TT,
@@ -122,11 +131,12 @@ MipsTargetMachine::MipsTargetMachine(const Target &T, const Triple &TT,
                         getEffectiveCodeModel(CM, CodeModel::Small), OL),
       isLittle(isLittle), TLOF(std::make_unique<MipsTargetObjectFile>()),
       ABI(MipsABIInfo::computeTargetABI(TT, CPU, Options.MCOptions)),
-      Subtarget(nullptr), DefaultSubtarget(TT, CPU, FS, isLittle, *this, None),
+      Subtarget(nullptr),
+      DefaultSubtarget(TT, CPU, FS, isLittle, *this, std::nullopt),
       NoMips16Subtarget(TT, CPU, FS.empty() ? "-mips16" : FS.str() + ",-mips16",
-                        isLittle, *this, None),
+                        isLittle, *this, std::nullopt),
       Mips16Subtarget(TT, CPU, FS.empty() ? "+mips16" : FS.str() + ",+mips16",
-                      isLittle, *this, None) {
+                      isLittle, *this, std::nullopt) {
   Subtarget = &DefaultSubtarget;
   initAsmInfo();
 
@@ -141,8 +151,8 @@ void MipsebTargetMachine::anchor() {}
 MipsebTargetMachine::MipsebTargetMachine(const Target &T, const Triple &TT,
                                          StringRef CPU, StringRef FS,
                                          const TargetOptions &Options,
-                                         Optional<Reloc::Model> RM,
-                                         Optional<CodeModel::Model> CM,
+                                         std::optional<Reloc::Model> RM,
+                                         std::optional<CodeModel::Model> CM,
                                          CodeGenOpt::Level OL, bool JIT)
     : MipsTargetMachine(T, TT, CPU, FS, Options, RM, CM, OL, JIT, false) {}
 
@@ -151,8 +161,8 @@ void MipselTargetMachine::anchor() {}
 MipselTargetMachine::MipselTargetMachine(const Target &T, const Triple &TT,
                                          StringRef CPU, StringRef FS,
                                          const TargetOptions &Options,
-                                         Optional<Reloc::Model> RM,
-                                         Optional<CodeModel::Model> CM,
+                                         std::optional<Reloc::Model> RM,
+                                         std::optional<CodeModel::Model> CM,
                                          CodeGenOpt::Level OL, bool JIT)
     : MipsTargetMachine(T, TT, CPU, FS, Options, RM, CM, OL, JIT, true) {}
 
@@ -235,6 +245,7 @@ public:
   bool addIRTranslator() override;
   void addPreLegalizeMachineIR() override;
   bool addLegalizeMachineIR() override;
+  void addPreRegBankSelect() override;
   bool addRegBankSelect() override;
   bool addGlobalInstructionSelect() override;
 
@@ -276,7 +287,7 @@ void MipsPassConfig::addPreRegAlloc() {
 }
 
 TargetTransformInfo
-MipsTargetMachine::getTargetTransformInfo(const Function &F) {
+MipsTargetMachine::getTargetTransformInfo(const Function &F) const {
   if (Subtarget->allowMixed16_32()) {
     LLVM_DEBUG(errs() << "No Target Transform Info Pass Added\n");
     // FIXME: This is no longer necessary as the TTI returned is per-function.
@@ -284,7 +295,13 @@ MipsTargetMachine::getTargetTransformInfo(const Function &F) {
   }
 
   LLVM_DEBUG(errs() << "Target Transform Info Pass Added\n");
-  return TargetTransformInfo(BasicTTIImpl(this, F));
+  return TargetTransformInfo(MipsTTIImpl(this, F));
+}
+
+MachineFunctionInfo *MipsTargetMachine::createMachineFunctionInfo(
+    BumpPtrAllocator &Allocator, const Function &F,
+    const TargetSubtargetInfo *STI) const {
+  return MipsFunctionInfo::create<MipsFunctionInfo>(Allocator, F, STI);
 }
 
 // Implemented by targets that want to run passes immediately before
@@ -297,6 +314,11 @@ void MipsPassConfig::addPreEmitPass() {
   // instructions which can be remapped to a 16 bit instruction.
   addPass(createMicroMipsSizeReducePass());
 
+  // This pass inserts a nop instruction between two back-to-back multiplication
+  // instructions when the "mfix4300" flag is passed.
+  if (EnableMulMulFix)
+    addPass(createMipsMulMulBugPass());
+
   // The delay slot filler pass can potientially create forbidden slot hazards
   // for MIPSR6 and therefore it should go before MipsBranchExpansion pass.
   addPass(createMipsDelaySlotFillerPass());
@@ -328,6 +350,11 @@ bool MipsPassConfig::addLegalizeMachineIR() {
   return false;
 }
 
+void MipsPassConfig::addPreRegBankSelect() {
+  bool IsOptNone = getOptLevel() == CodeGenOpt::None;
+  addPass(createMipsPostLegalizeCombiner(IsOptNone));
+}
+
 bool MipsPassConfig::addRegBankSelect() {
   addPass(new RegBankSelect());
   return false;
diff --git a/gnu/llvm/llvm/lib/Target/NVPTX/ManagedStringPool.h b/gnu/llvm/llvm/lib/Target/NVPTX/ManagedStringPool.h
deleted file mode 100644
index fb838d1fcd7..00000000000
--- a/gnu/llvm/llvm/lib/Target/NVPTX/ManagedStringPool.h
+++ /dev/null
@@ -1,48 +0,0 @@
-//===-- ManagedStringPool.h - Managed String Pool ---------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// The strings allocated from a managed string pool are owned by the string
-// pool and will be deleted together with the managed string pool.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_LIB_TARGET_NVPTX_MANAGEDSTRINGPOOL_H
-#define LLVM_LIB_TARGET_NVPTX_MANAGEDSTRINGPOOL_H
-
-#include "llvm/ADT/SmallVector.h"
-#include <string>
-
-namespace llvm {
-
-/// ManagedStringPool - The strings allocated from a managed string pool are
-/// owned by the string pool and will be deleted together with the managed
-/// string pool.
-class ManagedStringPool {
-  SmallVector<std::string *, 8> Pool;
-
-public:
-  ManagedStringPool() = default;
-
-  ~ManagedStringPool() {
-    SmallVectorImpl<std::string *>::iterator Current = Pool.begin();
-    while (Current != Pool.end()) {
-      delete *Current;
-      ++Current;
-    }
-  }
-
-  std::string *getManagedString(const char *S) {
-    std::string *Str = new std::string(S);
-    Pool.push_back(Str);
-    return Str;
-  }
-};
-
-} // end namespace llvm
-
-#endif // LLVM_LIB_TARGET_NVPTX_MANAGEDSTRINGPOOL_H
diff --git a/gnu/llvm/llvm/lib/Target/PowerPC/CMakeLists.txt b/gnu/llvm/llvm/lib/Target/PowerPC/CMakeLists.txt
index bd17bf33de8..e9c91eabd59 100644
--- a/gnu/llvm/llvm/lib/Target/PowerPC/CMakeLists.txt
+++ b/gnu/llvm/llvm/lib/Target/PowerPC/CMakeLists.txt
@@ -27,6 +27,7 @@ add_llvm_target(PowerPCCodeGen
   PPCCallingConv.cpp
   PPCCCState.cpp
   PPCCTRLoops.cpp
+  PPCCTRLoopsVerify.cpp
   PPCExpandAtomicPseudoInsts.cpp
   PPCHazardRecognizers.cpp
   PPCInstrInfo.cpp
@@ -56,6 +57,7 @@ add_llvm_target(PowerPCCodeGen
   PPCExpandISEL.cpp
   PPCPreEmitPeephole.cpp
   PPCLowerMASSVEntries.cpp
+  PPCGenScalarMASSEntries.cpp
   GISel/PPCCallLowering.cpp
   GISel/PPCRegisterBankInfo.cpp
   GISel/PPCLegalizerInfo.cpp
@@ -73,6 +75,7 @@ add_llvm_target(PowerPCCodeGen
   SelectionDAG
   Support
   Target
+  TargetParser
   TransformUtils
   GlobalISel
 
diff --git a/gnu/llvm/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp b/gnu/llvm/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
index 7ee0000df0d..2d93ad91638 100644
--- a/gnu/llvm/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
+++ b/gnu/llvm/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
@@ -34,6 +34,7 @@
 #include "llvm/BinaryFormat/ELF.h"
 #include "llvm/CodeGen/AsmPrinter.h"
 #include "llvm/CodeGen/MachineBasicBlock.h"
+#include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/CodeGen/MachineModuleInfoImpls.h"
@@ -58,13 +59,13 @@
 #include "llvm/MC/MCSymbolELF.h"
 #include "llvm/MC/MCSymbolXCOFF.h"
 #include "llvm/MC/SectionKind.h"
+#include "llvm/MC/TargetRegistry.h"
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/CodeGen.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/Process.h"
-#include "llvm/Support/TargetRegistry.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Transforms/Utils/ModuleUtils.h"
@@ -109,6 +110,23 @@ struct DenseMapInfo<std::pair<const MCSymbol *, MCSymbolRefExpr::VariantKind>> {
 
 namespace {
 
+enum {
+  // GNU attribute tags for PowerPC ABI
+  Tag_GNU_Power_ABI_FP = 4,
+  Tag_GNU_Power_ABI_Vector = 8,
+  Tag_GNU_Power_ABI_Struct_Return = 12,
+
+  // GNU attribute values for PowerPC float ABI, as combination of two parts
+  Val_GNU_Power_ABI_NoFloat = 0b00,
+  Val_GNU_Power_ABI_HardFloat_DP = 0b01,
+  Val_GNU_Power_ABI_SoftFloat_DP = 0b10,
+  Val_GNU_Power_ABI_HardFloat_SP = 0b11,
+
+  Val_GNU_Power_ABI_LDBL_IBM128 = 0b0100,
+  Val_GNU_Power_ABI_LDBL_64 = 0b1000,
+  Val_GNU_Power_ABI_LDBL_IEEE128 = 0b1100,
+};
+
 class PPCAsmPrinter : public AsmPrinter {
 protected:
   // For TLS on AIX, we need to be able to identify TOC entries of specific
@@ -122,12 +140,11 @@ protected:
             MCSymbol *>
       TOC;
   const PPCSubtarget *Subtarget = nullptr;
-  StackMaps SM;
 
 public:
   explicit PPCAsmPrinter(TargetMachine &TM,
                          std::unique_ptr<MCStreamer> Streamer)
-      : AsmPrinter(TM, std::move(Streamer)), SM(*this) {}
+      : AsmPrinter(TM, std::move(Streamer)) {}
 
   StringRef getPassName() const override { return "PowerPC Assembly Printer"; }
 
@@ -154,8 +171,6 @@ public:
   bool PrintAsmMemoryOperand(const MachineInstr *MI, unsigned OpNo,
                              const char *ExtraCode, raw_ostream &O) override;
 
-  void emitEndOfAsmFile(Module &M) override;
-
   void LowerSTACKMAP(StackMaps &SM, const MachineInstr &MI);
   void LowerPATCHPOINT(StackMaps &SM, const MachineInstr &MI);
   void EmitTlsCall(const MachineInstr *MI, MCSymbolRefExpr::VariantKind VK);
@@ -178,6 +193,8 @@ public:
     return "Linux PPC Assembly Printer";
   }
 
+  void emitGNUAttributes(Module &M);
+
   void emitStartOfAsmFile(Module &M) override;
   void emitEndOfAsmFile(Module &) override;
 
@@ -210,6 +227,9 @@ private:
 
   void emitGlobalVariableHelper(const GlobalVariable *);
 
+  // Get the offset of an alias based on its AliaseeObject.
+  uint64_t getAliasOffset(const Constant *C);
+
 public:
   PPCAIXAsmPrinter(TargetMachine &TM, std::unique_ptr<MCStreamer> Streamer)
       : PPCAsmPrinter(TM, std::move(Streamer)) {
@@ -235,6 +255,8 @@ public:
 
   void emitFunctionBodyEnd() override;
 
+  void emitPGORefs();
+
   void emitEndOfAsmFile(Module &) override;
 
   void emitLinkage(const GlobalValue *GV, MCSymbol *GVSym) const override;
@@ -347,7 +369,6 @@ bool PPCAsmPrinter::PrintAsmOperand(const MachineInstr *MI, unsigned OpNo,
 // At the moment, all inline asm memory operands are a single register.
 // In any case, the output of this routine should always be just one
 // assembler operand.
-
 bool PPCAsmPrinter::PrintAsmMemoryOperand(const MachineInstr *MI, unsigned OpNo,
                                           const char *ExtraCode,
                                           raw_ostream &O) {
@@ -403,10 +424,6 @@ PPCAsmPrinter::lookUpOrCreateTOCEntry(const MCSymbol *Sym,
   return TOCEntry;
 }
 
-void PPCAsmPrinter::emitEndOfAsmFile(Module &M) {
-  emitStackMaps(SM);
-}
-
 void PPCAsmPrinter::LowerSTACKMAP(StackMaps &SM, const MachineInstr &MI) {
   unsigned NumNOPBytes = MI.getOperand(1).getImm();
   
@@ -635,6 +652,9 @@ static MCSymbol *getMCSymbolForTOCPseudoMO(const MachineOperand &MO,
 /// the current output stream.
 ///
 void PPCAsmPrinter::emitInstruction(const MachineInstr *MI) {
+  PPC_MC::verifyInstructionPredicates(MI->getOpcode(),
+                                      getSubtargetInfo().getFeatureBits());
+
   MCInst TmpInst;
   const bool IsPPC64 = Subtarget->isPPC64();
   const bool IsAIX = Subtarget->isAIXABI();
@@ -940,7 +960,7 @@ void PPCAsmPrinter::emitInstruction(const MachineInstr *MI) {
 
       // Print MO for better readability
       if (isVerbose())
-        OutStreamer->GetCommentOS() << MO << '\n';
+        OutStreamer->getCommentOS() << MO << '\n';
       EmitToStreamer(*OutStreamer, TmpInst);
       return;
     }
@@ -954,18 +974,19 @@ void PPCAsmPrinter::emitInstruction(const MachineInstr *MI) {
     EmitToStreamer(*OutStreamer, TmpInst);
     return;
   }
-  case PPC::ADDItoc: {
+  case PPC::ADDItoc:
+  case PPC::ADDItoc8: {
     assert(IsAIX && TM.getCodeModel() == CodeModel::Small &&
-           "Operand only valid in AIX 32 bit mode");
+           "PseudoOp only valid for small code model AIX");
 
-    // Transform %rN = ADDItoc @op1, %r2.
+    // Transform %rN = ADDItoc/8 @op1, %r2.
     LowerPPCMachineInstrToMCInst(MI, TmpInst, *this);
 
     // Change the opcode to load address.
-    TmpInst.setOpcode(PPC::LA);
+    TmpInst.setOpcode((!IsPPC64) ? (PPC::LA) : (PPC::LA8));
 
     const MachineOperand &MO = MI->getOperand(1);
-    assert(MO.isGlobal() && "Invalid operand for ADDItoc.");
+    assert(MO.isGlobal() && "Invalid operand for ADDItoc[8].");
 
     // Map the operand to its corresponding MCSymbol.
     const MCSymbol *const MOSymbol = getMCSymbolForTOCPseudoMO(MO, *this);
@@ -1010,7 +1031,7 @@ void PPCAsmPrinter::emitInstruction(const MachineInstr *MI) {
 
     // Print MO for better readability
     if (isVerbose() && IsAIX)
-      OutStreamer->GetCommentOS() << MO << '\n';
+      OutStreamer->getCommentOS() << MO << '\n';
     EmitToStreamer(*OutStreamer, TmpInst);
     return;
   }
@@ -1467,6 +1488,28 @@ void PPCAsmPrinter::emitInstruction(const MachineInstr *MI) {
   EmitToStreamer(*OutStreamer, TmpInst);
 }
 
+void PPCLinuxAsmPrinter::emitGNUAttributes(Module &M) {
+  // Emit float ABI into GNU attribute
+  Metadata *MD = M.getModuleFlag("float-abi");
+  MDString *FloatABI = dyn_cast_or_null<MDString>(MD);
+  if (!FloatABI)
+    return;
+  StringRef flt = FloatABI->getString();
+  // TODO: Support emitting soft-fp and hard double/single attributes.
+  if (flt == "doubledouble")
+    OutStreamer->emitGNUAttribute(Tag_GNU_Power_ABI_FP,
+                                  Val_GNU_Power_ABI_HardFloat_DP |
+                                      Val_GNU_Power_ABI_LDBL_IBM128);
+  else if (flt == "ieeequad")
+    OutStreamer->emitGNUAttribute(Tag_GNU_Power_ABI_FP,
+                                  Val_GNU_Power_ABI_HardFloat_DP |
+                                      Val_GNU_Power_ABI_LDBL_IEEE128);
+  else if (flt == "ieeedouble")
+    OutStreamer->emitGNUAttribute(Tag_GNU_Power_ABI_FP,
+                                  Val_GNU_Power_ABI_HardFloat_DP |
+                                      Val_GNU_Power_ABI_LDBL_64);
+}
+
 void PPCLinuxAsmPrinter::emitInstruction(const MachineInstr *MI) {
   if (!Subtarget->isPPC64())
     return PPCAsmPrinter::emitInstruction(MI);
@@ -1573,7 +1616,7 @@ void PPCLinuxAsmPrinter::emitInstruction(const MachineInstr *MI) {
     //
     // Update compiler-rt/lib/xray/xray_powerpc64.cc accordingly when number
     // of instructions change.
-    OutStreamer->emitCodeAlignment(8);
+    OutStreamer->emitCodeAlignment(Align(8), &getSubtargetInfo());
     MCSymbol *BeginOfSled = OutContext.createTempSymbol();
     OutStreamer->emitLabel(BeginOfSled);
     EmitToStreamer(*OutStreamer, RetInst);
@@ -1608,9 +1651,7 @@ void PPCLinuxAsmPrinter::emitStartOfAsmFile(Module &M) {
   if (static_cast<const PPCTargetMachine &>(TM).isELFv2ABI()) {
     PPCTargetStreamer *TS =
       static_cast<PPCTargetStreamer *>(OutStreamer->getTargetStreamer());
-
-    if (TS)
-      TS->emitAbiVersion(2);
+    TS->emitAbiVersion(2);
   }
 
   if (static_cast<const PPCTargetMachine &>(TM).isPPC64() ||
@@ -1620,7 +1661,7 @@ void PPCLinuxAsmPrinter::emitStartOfAsmFile(Module &M) {
   if (M.getPICLevel() == PICLevel::SmallPIC)
     return AsmPrinter::emitStartOfAsmFile(M);
 
-  OutStreamer->SwitchSection(OutContext.getELFSection(
+  OutStreamer->switchSection(OutContext.getELFSection(
       ".got2", ELF::SHT_PROGBITS, ELF::SHF_WRITE | ELF::SHF_ALLOC));
 
   MCSymbol *TOCSym = OutContext.getOrCreateSymbol(Twine(".LTOC"));
@@ -1637,7 +1678,7 @@ void PPCLinuxAsmPrinter::emitStartOfAsmFile(Module &M) {
 
   OutStreamer->emitAssignment(TOCSym, tocExpr);
 
-  OutStreamer->SwitchSection(getObjFileLowering().getTextSection());
+  OutStreamer->switchSection(getObjFileLowering().getTextSection());
 }
 
 void PPCLinuxAsmPrinter::emitFunctionEntryLabel() {
@@ -1695,9 +1736,9 @@ void PPCLinuxAsmPrinter::emitFunctionEntryLabel() {
   MCSectionSubPair Current = OutStreamer->getCurrentSection();
   MCSectionELF *Section = OutStreamer->getContext().getELFSection(
       ".opd", ELF::SHT_PROGBITS, ELF::SHF_WRITE | ELF::SHF_ALLOC);
-  OutStreamer->SwitchSection(Section);
+  OutStreamer->switchSection(Section);
   OutStreamer->emitLabel(CurrentFnSym);
-  OutStreamer->emitValueToAlignment(8);
+  OutStreamer->emitValueToAlignment(Align(8));
   MCSymbol *Symbol1 = CurrentFnSymForSize;
   // Generates a R_PPC64_ADDR64 (from FK_DATA_8) relocation for the function
   // entry point.
@@ -1710,7 +1751,7 @@ void PPCLinuxAsmPrinter::emitFunctionEntryLabel() {
     8/*size*/);
   // Emit a null environment pointer.
   OutStreamer->emitIntValue(0, 8 /* size */);
-  OutStreamer->SwitchSection(Current.first, Current.second);
+  OutStreamer->switchSection(Current.first, Current.second);
 }
 
 void PPCLinuxAsmPrinter::emitEndOfAsmFile(Module &M) {
@@ -1721,20 +1762,22 @@ void PPCLinuxAsmPrinter::emitEndOfAsmFile(Module &M) {
   PPCTargetStreamer *TS =
       static_cast<PPCTargetStreamer *>(OutStreamer->getTargetStreamer());
 
+  emitGNUAttributes(M);
+
   if (!TOC.empty()) {
     const char *Name = isPPC64 ? ".toc" : ".got2";
     MCSectionELF *Section = OutContext.getELFSection(
         Name, ELF::SHT_PROGBITS, ELF::SHF_WRITE | ELF::SHF_ALLOC);
-    OutStreamer->SwitchSection(Section);
+    OutStreamer->switchSection(Section);
     if (!isPPC64)
-      OutStreamer->emitValueToAlignment(4);
+      OutStreamer->emitValueToAlignment(Align(4));
 
     for (const auto &TOCMapPair : TOC) {
       const MCSymbol *const TOCEntryTarget = TOCMapPair.first.first;
       MCSymbol *const TOCEntryLabel = TOCMapPair.second;
 
       OutStreamer->emitLabel(TOCEntryLabel);
-      if (isPPC64 && TS != nullptr)
+      if (isPPC64)
         TS->emitTCEntry(*TOCEntryTarget, TOCMapPair.first.second);
       else
         OutStreamer->emitSymbolValue(TOCEntryTarget, 4);
@@ -1840,9 +1883,7 @@ void PPCLinuxAsmPrinter::emitFunctionBodyStart() {
 
     PPCTargetStreamer *TS =
       static_cast<PPCTargetStreamer *>(OutStreamer->getTargetStreamer());
-
-    if (TS)
-      TS->emitLocalEntry(cast<MCSymbolELF>(CurrentFnSym), LocalOffsetExp);
+    TS->emitLocalEntry(cast<MCSymbolELF>(CurrentFnSym), LocalOffsetExp);
   } else if (Subtarget->isUsingPCRelativeCalls()) {
     // When generating the entry point for a function we have a few scenarios
     // based on whether or not that function uses R2 and whether or not that
@@ -1869,9 +1910,8 @@ void PPCLinuxAsmPrinter::emitFunctionBodyStart() {
         MF->hasInlineAsm() || (!PPCFI->usesTOCBasePtr() && UsesX2OrR2)) {
       PPCTargetStreamer *TS =
           static_cast<PPCTargetStreamer *>(OutStreamer->getTargetStreamer());
-      if (TS)
-        TS->emitLocalEntry(cast<MCSymbolELF>(CurrentFnSym),
-                           MCConstantExpr::create(1, OutContext));
+      TS->emitLocalEntry(cast<MCSymbolELF>(CurrentFnSym),
+                         MCConstantExpr::create(1, OutContext));
     }
   }
 }
@@ -1931,10 +1971,15 @@ void PPCAIXAsmPrinter::emitLinkage(const GlobalValue *GV,
 
   MCSymbolAttr VisibilityAttr = MCSA_Invalid;
   if (!TM.getIgnoreXCOFFVisibility()) {
+    if (GV->hasDLLExportStorageClass() && !GV->hasDefaultVisibility())
+      report_fatal_error(
+          "Cannot not be both dllexport and non-default visibility");
     switch (GV->getVisibility()) {
 
-    // TODO: "exported" and "internal" Visibility needs to go here.
+    // TODO: "internal" Visibility needs to go here.
     case GlobalValue::DefaultVisibility:
+      if (GV->hasDLLExportStorageClass())
+        VisibilityAttr = MAI->getExportedVisibilityAttr();
       break;
     case GlobalValue::HiddenVisibility:
       VisibilityAttr = MAI->getHiddenVisibilityAttr();
@@ -1992,7 +2037,7 @@ void PPCAIXAsmPrinter::emitFunctionBodyEnd() {
   if (!TargetLoweringObjectFileXCOFF::ShouldEmitEHBlock(MF) &&
       (getNumberOfVRSaved() > 0)) {
     // Emit dummy EH Info Table.
-    OutStreamer->SwitchSection(getObjFileLowering().getCompactUnwindSection());
+    OutStreamer->switchSection(getObjFileLowering().getCompactUnwindSection());
     MCSymbol *EHInfoLabel =
         TargetLoweringObjectFileXCOFF::getEHInfoTableSymbol(MF);
     OutStreamer->emitLabel(EHInfoLabel);
@@ -2003,11 +2048,11 @@ void PPCAIXAsmPrinter::emitFunctionBodyEnd() {
     const DataLayout &DL = MMI->getModule()->getDataLayout();
     const unsigned PointerSize = DL.getPointerSize();
     // Add necessary paddings in 64 bit mode.
-    OutStreamer->emitValueToAlignment(PointerSize);
+    OutStreamer->emitValueToAlignment(Align(PointerSize));
 
     OutStreamer->emitIntValue(0, PointerSize);
     OutStreamer->emitIntValue(0, PointerSize);
-    OutStreamer->SwitchSection(MF->getSection());
+    OutStreamer->switchSection(MF->getSection());
   }
 }
 
@@ -2102,9 +2147,10 @@ void PPCAIXAsmPrinter::emitTracebackTable() {
   // Set the 4th byte of the mandatory field.
   FirstHalfOfMandatoryField |= TracebackTable::IsFunctionNamePresentMask;
 
-  static_assert(XCOFF::AllocRegNo == 31, "Unexpected register usage!");
-  if (MRI.isPhysRegUsed(Subtarget->isPPC64() ? PPC::X31 : PPC::R31,
-                        /* SkipRegMaskTest */ true))
+  const PPCRegisterInfo *RegInfo =
+      static_cast<const PPCRegisterInfo *>(Subtarget->getRegisterInfo());
+  Register FrameReg = RegInfo->getFrameRegister(*MF);
+  if (FrameReg == (Subtarget->isPPC64() ? PPC::X31 : PPC::R31))
     FirstHalfOfMandatoryField |= TracebackTable::IsAllocaUsedMask;
 
   const SmallVectorImpl<Register> &MustSaveCRs = FI->getMustSaveCRs();
@@ -2353,7 +2399,7 @@ void PPCAIXAsmPrinter::emitTracebackTable() {
                                 MCSymbolRefExpr::create(TOCBaseSym, Ctx), Ctx);
 
     const DataLayout &DL = getDataLayout();
-    OutStreamer->emitValueToAlignment(4);
+    OutStreamer->emitValueToAlignment(Align(4));
     OutStreamer->AddComment("EHInfo Table");
     OutStreamer->emitValue(Exp, DL.getPointerSize());
   }
@@ -2379,6 +2425,24 @@ static bool isSpecialLLVMGlobalArrayForStaticInit(const GlobalVariable *GV) {
       .Default(false);
 }
 
+uint64_t PPCAIXAsmPrinter::getAliasOffset(const Constant *C) {
+  if (auto *GA = dyn_cast<GlobalAlias>(C))
+    return getAliasOffset(GA->getAliasee());
+  if (auto *CE = dyn_cast<ConstantExpr>(C)) {
+    const MCExpr *LowC = lowerConstant(CE);
+    const MCBinaryExpr *CBE = dyn_cast<MCBinaryExpr>(LowC);
+    if (!CBE)
+      return 0;
+    if (CBE->getOpcode() != MCBinaryExpr::Add)
+      report_fatal_error("Only adding an offset is supported now.");
+    auto *RHS = dyn_cast<MCConstantExpr>(CBE->getRHS());
+    if (!RHS)
+      report_fatal_error("Unable to get the offset of alias.");
+    return RHS->getValue();
+  }
+  return 0;
+}
+
 void PPCAIXAsmPrinter::emitGlobalVariable(const GlobalVariable *GV) {
   // Special LLVM global arrays have been handled at the initialization.
   if (isSpecialLLVMGlobalArrayToSkip(GV) || isSpecialLLVMGlobalArrayForStaticInit(GV))
@@ -2417,9 +2481,9 @@ void PPCAIXAsmPrinter::emitGlobalVariableHelper(const GlobalVariable *GV) {
   // Print GV in verbose mode
   if (isVerbose()) {
     if (GV->hasInitializer()) {
-      GV->printAsOperand(OutStreamer->GetCommentOS(),
+      GV->printAsOperand(OutStreamer->getCommentOS(),
                          /*PrintType=*/false, GV->getParent());
-      OutStreamer->GetCommentOS() << '\n';
+      OutStreamer->getCommentOS() << '\n';
     }
   }
 
@@ -2427,14 +2491,14 @@ void PPCAIXAsmPrinter::emitGlobalVariableHelper(const GlobalVariable *GV) {
       getObjFileLowering().SectionForGlobal(GV, GVKind, TM));
 
   // Switch to the containing csect.
-  OutStreamer->SwitchSection(Csect);
+  OutStreamer->switchSection(Csect);
 
   const DataLayout &DL = GV->getParent()->getDataLayout();
 
   // Handle common and zero-initialized local symbols.
   if (GV->hasCommonLinkage() || GVKind.isBSSLocal() ||
       GVKind.isThreadBSSLocal()) {
-    Align Alignment = GV->getAlign().getValueOr(DL.getPreferredAlign(GV));
+    Align Alignment = GV->getAlign().value_or(DL.getPreferredAlign(GV));
     uint64_t Size = DL.getTypeAllocSize(GV->getValueType());
     GVSym->setStorageClass(
         TargetLoweringObjectFileXCOFF::getStorageClassForGlobal(GV));
@@ -2442,28 +2506,41 @@ void PPCAIXAsmPrinter::emitGlobalVariableHelper(const GlobalVariable *GV) {
     if (GVKind.isBSSLocal() || GVKind.isThreadBSSLocal())
       OutStreamer->emitXCOFFLocalCommonSymbol(
           OutContext.getOrCreateSymbol(GVSym->getSymbolTableName()), Size,
-          GVSym, Alignment.value());
+          GVSym, Alignment);
     else
-      OutStreamer->emitCommonSymbol(GVSym, Size, Alignment.value());
+      OutStreamer->emitCommonSymbol(GVSym, Size, Alignment);
     return;
   }
 
   MCSymbol *EmittedInitSym = GVSym;
+
+  // Emit linkage for the global variable and its aliases.
   emitLinkage(GV, EmittedInitSym);
+  for (const GlobalAlias *GA : GOAliasMap[GV])
+    emitLinkage(GA, getSymbol(GA));
+
   emitAlignment(getGVAlignment(GV, DL), GV);
 
   // When -fdata-sections is enabled, every GlobalVariable will
   // be put into its own csect; therefore, label is not necessary here.
-  if (!TM.getDataSections() || GV->hasSection()) {
+  if (!TM.getDataSections() || GV->hasSection())
     OutStreamer->emitLabel(EmittedInitSym);
+
+  // No alias to emit.
+  if (!GOAliasMap[GV].size()) {
+    emitGlobalConstant(GV->getParent()->getDataLayout(), GV->getInitializer());
+    return;
   }
 
-  // Emit aliasing label for global variable.
-  llvm::for_each(GOAliasMap[GV], [this](const GlobalAlias *Alias) {
-    OutStreamer->emitLabel(getSymbol(Alias));
-  });
+  // Aliases with the same offset should be aligned. Record the list of aliases
+  // associated with the offset.
+  AliasMapTy AliasList;
+  for (const GlobalAlias *GA : GOAliasMap[GV])
+    AliasList[getAliasOffset(GA->getAliasee())].push_back(GA);
 
-  emitGlobalConstant(GV->getParent()->getDataLayout(), GV->getInitializer());
+  // Emit alias label and element value for global variable.
+  emitGlobalConstant(GV->getParent()->getDataLayout(), GV->getInitializer(),
+                     &AliasList);
 }
 
 void PPCAIXAsmPrinter::emitFunctionDescriptor() {
@@ -2472,14 +2549,12 @@ void PPCAIXAsmPrinter::emitFunctionDescriptor() {
 
   MCSectionSubPair Current = OutStreamer->getCurrentSection();
   // Emit function descriptor.
-  OutStreamer->SwitchSection(
+  OutStreamer->switchSection(
       cast<MCSymbolXCOFF>(CurrentFnDescSym)->getRepresentedCsect());
 
   // Emit aliasing label for function descriptor csect.
-  llvm::for_each(GOAliasMap[&MF->getFunction()],
-                 [this](const GlobalAlias *Alias) {
-                   OutStreamer->emitLabel(getSymbol(Alias));
-                 });
+  for (const GlobalAlias *Alias : GOAliasMap[&MF->getFunction()])
+    OutStreamer->emitLabel(getSymbol(Alias));
 
   // Emit function entry point address.
   OutStreamer->emitValue(MCSymbolRefExpr::create(CurrentFnSym, OutContext),
@@ -2493,7 +2568,7 @@ void PPCAIXAsmPrinter::emitFunctionDescriptor() {
   // Emit a null environment pointer.
   OutStreamer->emitIntValue(0, PointerSize);
 
-  OutStreamer->SwitchSection(Current.first, Current.second);
+  OutStreamer->switchSection(Current.first, Current.second);
 }
 
 void PPCAIXAsmPrinter::emitFunctionEntryLabel() {
@@ -2503,11 +2578,34 @@ void PPCAIXAsmPrinter::emitFunctionEntryLabel() {
     PPCAsmPrinter::emitFunctionEntryLabel();
 
   // Emit aliasing label for function entry point label.
-  llvm::for_each(
-      GOAliasMap[&MF->getFunction()], [this](const GlobalAlias *Alias) {
-        OutStreamer->emitLabel(
-            getObjFileLowering().getFunctionEntryPointSymbol(Alias, TM));
-      });
+  for (const GlobalAlias *Alias : GOAliasMap[&MF->getFunction()])
+    OutStreamer->emitLabel(
+        getObjFileLowering().getFunctionEntryPointSymbol(Alias, TM));
+}
+
+void PPCAIXAsmPrinter::emitPGORefs() {
+  if (OutContext.hasXCOFFSection(
+          "__llvm_prf_cnts",
+          XCOFF::CsectProperties(XCOFF::XMC_RW, XCOFF::XTY_SD))) {
+    MCSection *CntsSection = OutContext.getXCOFFSection(
+        "__llvm_prf_cnts", SectionKind::getData(),
+        XCOFF::CsectProperties(XCOFF::XMC_RW, XCOFF::XTY_SD),
+        /*MultiSymbolsAllowed*/ true);
+
+    OutStreamer->switchSection(CntsSection);
+    if (OutContext.hasXCOFFSection(
+            "__llvm_prf_data",
+            XCOFF::CsectProperties(XCOFF::XMC_RW, XCOFF::XTY_SD)))
+      OutStreamer->emitXCOFFRefDirective("__llvm_prf_data[RW]");
+    if (OutContext.hasXCOFFSection(
+            "__llvm_prf_names",
+            XCOFF::CsectProperties(XCOFF::XMC_RO, XCOFF::XTY_SD)))
+      OutStreamer->emitXCOFFRefDirective("__llvm_prf_names[RO]");
+    if (OutContext.hasXCOFFSection(
+            "__llvm_prf_vnds",
+            XCOFF::CsectProperties(XCOFF::XMC_RW, XCOFF::XTY_SD)))
+      OutStreamer->emitXCOFFRefDirective("__llvm_prf_vnds[RW]");
+  }
 }
 
 void PPCAIXAsmPrinter::emitEndOfAsmFile(Module &M) {
@@ -2516,8 +2614,10 @@ void PPCAIXAsmPrinter::emitEndOfAsmFile(Module &M) {
   if (M.empty() && TOCDataGlobalVars.empty())
     return;
 
+  emitPGORefs();
+
   // Switch to section to emit TOC base.
-  OutStreamer->SwitchSection(getObjFileLowering().getTOCBaseSection());
+  OutStreamer->switchSection(getObjFileLowering().getTOCBaseSection());
 
   PPCTargetStreamer *TS =
       static_cast<PPCTargetStreamer *>(OutStreamer->getTargetStreamer());
@@ -2531,7 +2631,7 @@ void PPCAIXAsmPrinter::emitEndOfAsmFile(Module &M) {
       SmallString<128> Name;
       StringRef Prefix = ".";
       Name += Prefix;
-      Name += I.first.first->getName();
+      Name += cast<MCSymbolXCOFF>(I.first.first)->getSymbolTableName();
       MCSymbol *S = OutContext.getOrCreateSymbol(Name);
       TCEntry = cast<MCSectionXCOFF>(
           getObjFileLowering().getSectionForTOCEntry(S, TM));
@@ -2539,11 +2639,10 @@ void PPCAIXAsmPrinter::emitEndOfAsmFile(Module &M) {
       TCEntry = cast<MCSectionXCOFF>(
           getObjFileLowering().getSectionForTOCEntry(I.first.first, TM));
     }
-    OutStreamer->SwitchSection(TCEntry);
+    OutStreamer->switchSection(TCEntry);
 
     OutStreamer->emitLabel(I.second);
-    if (TS != nullptr)
-      TS->emitTCEntry(*I.first.first, I.first.second);
+    TS->emitTCEntry(*I.first.first, I.first.second);
   }
 
   for (const auto *GV : TOCDataGlobalVars)
@@ -2563,8 +2662,7 @@ bool PPCAIXAsmPrinter::doInitialization(Module &M) {
         getObjFileLowering().SectionForGlobal(GO, GOKind, TM));
 
     Align GOAlign = getGVAlignment(GO, GO->getParent()->getDataLayout());
-    if (GOAlign > Csect->getAlignment())
-      Csect->setAlignment(GOAlign);
+    Csect->ensureMinAlignment(GOAlign);
   };
 
   // We need to know, up front, the alignment of csects for the assembly path,
@@ -2606,7 +2704,7 @@ bool PPCAIXAsmPrinter::doInitialization(Module &M) {
 
   // Construct an aliasing list for each GlobalObject.
   for (const auto &Alias : M.aliases()) {
-    const GlobalObject *Base = Alias.getBaseObject();
+    const GlobalObject *Base = Alias.getAliaseeObject();
     if (!Base)
       report_fatal_error(
           "alias without a base object is not yet supported on AIX");
@@ -2620,6 +2718,25 @@ void PPCAIXAsmPrinter::emitInstruction(const MachineInstr *MI) {
   switch (MI->getOpcode()) {
   default:
     break;
+  case PPC::TW:
+  case PPC::TWI:
+  case PPC::TD:
+  case PPC::TDI: {
+    if (MI->getNumOperands() < 5)
+      break; 
+    const MachineOperand &LangMO = MI->getOperand(3);
+    const MachineOperand &ReasonMO = MI->getOperand(4);
+    if (!LangMO.isImm() || !ReasonMO.isImm())
+      break;
+    MCSymbol *TempSym = OutContext.createNamedTempSymbol();
+    OutStreamer->emitLabel(TempSym);
+    OutStreamer->emitXCOFFExceptDirective(CurrentFnSym, TempSym,
+                 LangMO.getImm(), ReasonMO.getImm(),
+                 Subtarget->isPPC64() ? MI->getMF()->getInstructionCount() * 8 :
+                 MI->getMF()->getInstructionCount() * 4,
+		 MMI->hasDebugInfo());
+    break;
+  }
   case PPC::GETtlsADDR64AIX:
   case PPC::GETtlsADDR32AIX: {
     // The reference to .__tls_get_addr is unknown to the assembler
diff --git a/gnu/llvm/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp b/gnu/llvm/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp
index 3339d1a9950..bb6a46b50fa 100644
--- a/gnu/llvm/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp
+++ b/gnu/llvm/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "MCTargetDesc/PPCPredicates.h"
 #include "PPCFrameLowering.h"
+#include "MCTargetDesc/PPCPredicates.h"
 #include "PPCInstrBuilder.h"
 #include "PPCInstrInfo.h"
 #include "PPCMachineFunctionInfo.h"
@@ -19,6 +19,7 @@
 #include "PPCSubtarget.h"
 #include "PPCTargetMachine.h"
 #include "llvm/ADT/Statistic.h"
+#include "llvm/CodeGen/LivePhysRegs.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
@@ -229,23 +230,23 @@ const PPCFrameLowering::SpillSlot *PPCFrameLowering::getCalleeSavedSpillSlots(
       CALLEE_SAVED_FPRS, CALLEE_SAVED_GPRS64, CALLEE_SAVED_VRS};
 
   if (Subtarget.is64BitELFABI()) {
-    NumEntries = array_lengthof(ELFOffsets64);
+    NumEntries = std::size(ELFOffsets64);
     return ELFOffsets64;
   }
 
   if (Subtarget.is32BitELFABI()) {
-    NumEntries = array_lengthof(ELFOffsets32);
+    NumEntries = std::size(ELFOffsets32);
     return ELFOffsets32;
   }
 
   assert(Subtarget.isAIXABI() && "Unexpected ABI.");
 
   if (Subtarget.isPPC64()) {
-    NumEntries = array_lengthof(AIXOffsets64);
+    NumEntries = std::size(AIXOffsets64);
     return AIXOffsets64;
   }
 
-  NumEntries = array_lengthof(AIXOffsets32);
+  NumEntries = std::size(AIXOffsets32);
   return AIXOffsets32;
 }
 
@@ -280,11 +281,11 @@ static bool MustSaveLR(const MachineFunction &MF, unsigned LR) {
 
 /// determineFrameLayoutAndUpdate - Determine the size of the frame and maximum
 /// call frame size. Update the MachineFunction object with the stack size.
-unsigned
+uint64_t
 PPCFrameLowering::determineFrameLayoutAndUpdate(MachineFunction &MF,
                                                 bool UseEstimate) const {
   unsigned NewMaxCallFrameSize = 0;
-  unsigned FrameSize = determineFrameLayout(MF, UseEstimate,
+  uint64_t FrameSize = determineFrameLayout(MF, UseEstimate,
                                             &NewMaxCallFrameSize);
   MF.getFrameInfo().setStackSize(FrameSize);
   MF.getFrameInfo().setMaxCallFrameSize(NewMaxCallFrameSize);
@@ -293,7 +294,7 @@ PPCFrameLowering::determineFrameLayoutAndUpdate(MachineFunction &MF,
 
 /// determineFrameLayout - Determine the size of the frame and maximum call
 /// frame size.
-unsigned
+uint64_t
 PPCFrameLowering::determineFrameLayout(const MachineFunction &MF,
                                        bool UseEstimate,
                                        unsigned *NewMaxCallFrameSize) const {
@@ -301,7 +302,7 @@ PPCFrameLowering::determineFrameLayout(const MachineFunction &MF,
   const PPCFunctionInfo *FI = MF.getInfo<PPCFunctionInfo>();
 
   // Get the number of bytes to allocate from the FrameInfo
-  unsigned FrameSize =
+  uint64_t FrameSize =
     UseEstimate ? MFI.estimateStackSize(MF) : MFI.getStackSize();
 
   // Get stack alignments. The frame must be aligned to the greatest of these:
@@ -392,9 +393,8 @@ void PPCFrameLowering::replaceFPWithRealFP(MachineFunction &MF) const {
   unsigned BPReg  = HasBP ? (unsigned) RegInfo->getBaseRegister(MF) : FPReg;
   unsigned BP8Reg = HasBP ? (unsigned) PPC::X30 : FP8Reg;
 
-  for (MachineFunction::iterator BI = MF.begin(), BE = MF.end();
-       BI != BE; ++BI)
-    for (MachineBasicBlock::iterator MBBI = BI->end(); MBBI != BI->begin(); ) {
+  for (MachineBasicBlock &MBB : MF)
+    for (MachineBasicBlock::iterator MBBI = MBB.end(); MBBI != MBB.begin();) {
       --MBBI;
       for (unsigned I = 0, E = MBBI->getNumOperands(); I != E; ++I) {
         MachineOperand &MO = MBBI->getOperand(I);
@@ -617,6 +617,8 @@ void PPCFrameLowering::emitPrologue(MachineFunction &MF,
   // AIX assembler does not support cfi directives.
   const bool needsCFI = MF.needsFrameMoves() && !Subtarget.isAIXABI();
 
+  const bool HasFastMFLR = Subtarget.hasFastMFLR();
+
   // Get processor type.
   bool isPPC64 = Subtarget.isPPC64();
   // Get the ABI.
@@ -625,9 +627,9 @@ void PPCFrameLowering::emitPrologue(MachineFunction &MF,
   assert((isSVR4ABI || Subtarget.isAIXABI()) && "Unsupported PPC ABI.");
 
   // Work out frame sizes.
-  unsigned FrameSize = determineFrameLayoutAndUpdate(MF);
-  int NegFrameSize = -FrameSize;
-  if (!isInt<32>(NegFrameSize))
+  uint64_t FrameSize = determineFrameLayoutAndUpdate(MF);
+  int64_t NegFrameSize = -FrameSize;
+  if (!isPPC64 && (!isInt<32>(FrameSize) || !isInt<32>(NegFrameSize)))
     llvm_unreachable("Unhandled stack size!");
 
   if (MFI.isFrameAddressTaken())
@@ -662,10 +664,6 @@ void PPCFrameLowering::emitPrologue(MachineFunction &MF,
                                                      : PPC::STWU );
   const MCInstrDesc& StoreUpdtIdxInst = TII.get(isPPC64 ? PPC::STDUX
                                                         : PPC::STWUX);
-  const MCInstrDesc& LoadImmShiftedInst = TII.get(isPPC64 ? PPC::LIS8
-                                                          : PPC::LIS );
-  const MCInstrDesc& OrImmInst = TII.get(isPPC64 ? PPC::ORI8
-                                                 : PPC::ORI );
   const MCInstrDesc& OrInst = TII.get(isPPC64 ? PPC::OR8
                                               : PPC::OR );
   const MCInstrDesc& SubtractCarryingInst = TII.get(isPPC64 ? PPC::SUBFC8
@@ -676,7 +674,8 @@ void PPCFrameLowering::emitPrologue(MachineFunction &MF,
                                                            : PPC::MFCR);
   const MCInstrDesc &StoreWordInst = TII.get(isPPC64 ? PPC::STW8 : PPC::STW);
   const MCInstrDesc &HashST =
-      TII.get(HasPrivileged ? PPC::HASHSTP : PPC::HASHST);
+      TII.get(isPPC64 ? (HasPrivileged ? PPC::HASHSTP8 : PPC::HASHST8)
+                      : (HasPrivileged ? PPC::HASHSTP : PPC::HASHST));
 
   // Regarding this assert: Even though LR is saved in the caller's frame (i.e.,
   // LROffset is positive), that slot is callee-owned. Because PPC32 SVR4 has no
@@ -693,9 +692,9 @@ void PPCFrameLowering::emitPrologue(MachineFunction &MF,
 
   SingleScratchReg = ScratchReg == TempReg;
 
-  int LROffset = getReturnSaveOffset();
+  int64_t LROffset = getReturnSaveOffset();
 
-  int FPOffset = 0;
+  int64_t FPOffset = 0;
   if (HasFP) {
     MachineFrameInfo &MFI = MF.getFrameInfo();
     int FPIndex = FI->getFramePointerSaveIndex();
@@ -703,7 +702,7 @@ void PPCFrameLowering::emitPrologue(MachineFunction &MF,
     FPOffset = MFI.getObjectOffset(FPIndex);
   }
 
-  int BPOffset = 0;
+  int64_t BPOffset = 0;
   if (HasBP) {
     MachineFrameInfo &MFI = MF.getFrameInfo();
     int BPIndex = FI->getBasePointerSaveIndex();
@@ -711,7 +710,7 @@ void PPCFrameLowering::emitPrologue(MachineFunction &MF,
     BPOffset = MFI.getObjectOffset(BPIndex);
   }
 
-  int PBPOffset = 0;
+  int64_t PBPOffset = 0;
   if (FI->usesPICBase()) {
     MachineFrameInfo &MFI = MF.getFrameInfo();
     int PBPIndex = FI->getPICBasePointerSaveIndex();
@@ -841,10 +840,11 @@ void PPCFrameLowering::emitPrologue(MachineFunction &MF,
   // Generate the instruction to store the LR. In the case where ROP protection
   // is required the register holding the LR should not be killed as it will be
   // used by the hash store instruction.
-  if (MustSaveLR) {
+  auto SaveLR = [&](int64_t Offset) {
+    assert(MustSaveLR && "LR is not required to be saved!");
     BuildMI(MBB, StackUpdateLoc, dl, StoreInst)
         .addReg(ScratchReg, getKillRegState(!HasROPProtect))
-        .addImm(LROffset)
+        .addImm(Offset)
         .addReg(SPReg);
 
     // Add the ROP protection Hash Store instruction.
@@ -855,7 +855,7 @@ void PPCFrameLowering::emitPrologue(MachineFunction &MF,
     // ABI.
     if (HasROPProtect) {
       const int SaveIndex = FI->getROPProtectionHashSaveIndex();
-      const int ImmOffset = MFI.getObjectOffset(SaveIndex);
+      const int64_t ImmOffset = MFI.getObjectOffset(SaveIndex);
       assert((ImmOffset <= -8 && ImmOffset >= -512) &&
              "ROP hash save offset out of range.");
       assert(((ImmOffset & 0x7) == 0) &&
@@ -865,7 +865,10 @@ void PPCFrameLowering::emitPrologue(MachineFunction &MF,
           .addImm(ImmOffset)
           .addReg(SPReg);
     }
-  }
+  };
+
+  if (MustSaveLR && HasFastMFLR)
+      SaveLR(LROffset);
 
   if (MustSaveCR &&
       !(SingleScratchReg && MustSaveLR)) {
@@ -877,8 +880,11 @@ void PPCFrameLowering::emitPrologue(MachineFunction &MF,
   }
 
   // Skip the rest if this is a leaf function & all spills fit in the Red Zone.
-  if (!FrameSize)
+  if (!FrameSize) {
+    if (MustSaveLR && !HasFastMFLR)
+      SaveLR(LROffset);
     return;
+  }
 
   // Adjust stack pointer: r1 += NegFrameSize.
   // If there is a preferred stack alignment, align R1 now
@@ -892,7 +898,18 @@ void PPCFrameLowering::emitPrologue(MachineFunction &MF,
 
   // Have we generated a STUX instruction to claim stack frame? If so,
   // the negated frame size will be placed in ScratchReg.
-  bool HasSTUX = false;
+  bool HasSTUX =
+      (TLI.hasInlineStackProbe(MF) && FrameSize > TLI.getStackProbeSize(MF)) ||
+      (HasBP && MaxAlign > 1) || isLargeFrame;
+
+  // If we use STUX to update the stack pointer, we need the two scratch
+  // registers TempReg and ScratchReg, we have to save LR here which is stored
+  // in ScratchReg.
+  // If the offset can not be encoded into the store instruction, we also have
+  // to save LR here.
+  if (MustSaveLR && !HasFastMFLR &&
+      (HasSTUX || !isInt<16>(FrameSize + LROffset)))
+    SaveLR(LROffset);
 
   // If FrameSize <= TLI.getStackProbeSize(MF), as POWER ABI requires backchain
   // pointer is always stored at SP, we will get a free probe due to an essential
@@ -913,7 +930,6 @@ void PPCFrameLowering::emitPrologue(MachineFunction &MF,
       BuildMI(MBB, MBBI, dl, TII.get(PPC::SUBF), ScratchReg)
           .addReg(ScratchReg)
           .addReg(SPReg);
-      HasSTUX = true;
     }
   } else {
     // This condition must be kept in sync with canUseAsPrologue.
@@ -935,11 +951,7 @@ void PPCFrameLowering::emitPrologue(MachineFunction &MF,
             .addImm(NegFrameSize);
       } else {
         assert(!SingleScratchReg && "Only a single scratch reg available");
-        BuildMI(MBB, MBBI, dl, LoadImmShiftedInst, TempReg)
-            .addImm(NegFrameSize >> 16);
-        BuildMI(MBB, MBBI, dl, OrImmInst, TempReg)
-            .addReg(TempReg, RegState::Kill)
-            .addImm(NegFrameSize & 0xFFFF);
+        TII.materializeImmPostRA(MBB, MBBI, dl, TempReg, NegFrameSize);
         BuildMI(MBB, MBBI, dl, SubtractCarryingInst, ScratchReg)
             .addReg(ScratchReg, RegState::Kill)
             .addReg(TempReg, RegState::Kill);
@@ -949,25 +961,17 @@ void PPCFrameLowering::emitPrologue(MachineFunction &MF,
           .addReg(SPReg, RegState::Kill)
           .addReg(SPReg)
           .addReg(ScratchReg);
-      HasSTUX = true;
-
     } else if (!isLargeFrame) {
       BuildMI(MBB, StackUpdateLoc, dl, StoreUpdtInst, SPReg)
           .addReg(SPReg)
           .addImm(NegFrameSize)
           .addReg(SPReg);
-
     } else {
-      BuildMI(MBB, MBBI, dl, LoadImmShiftedInst, ScratchReg)
-          .addImm(NegFrameSize >> 16);
-      BuildMI(MBB, MBBI, dl, OrImmInst, ScratchReg)
-          .addReg(ScratchReg, RegState::Kill)
-          .addImm(NegFrameSize & 0xFFFF);
+      TII.materializeImmPostRA(MBB, MBBI, dl, ScratchReg, NegFrameSize);
       BuildMI(MBB, MBBI, dl, StoreUpdtIdxInst, SPReg)
           .addReg(SPReg, RegState::Kill)
           .addReg(SPReg)
           .addReg(ScratchReg);
-      HasSTUX = true;
     }
   }
 
@@ -1094,6 +1098,10 @@ void PPCFrameLowering::emitPrologue(MachineFunction &MF,
     }
   }
 
+  // Save the LR now.
+  if (!HasSTUX && MustSaveLR && !HasFastMFLR && isInt<16>(FrameSize + LROffset))
+    SaveLR(LROffset + FrameSize);
+
   // Add Call Frame Information for the instructions we generated above.
   if (needsCFI) {
     unsigned CFIIndex;
@@ -1173,8 +1181,8 @@ void PPCFrameLowering::emitPrologue(MachineFunction &MF,
     // Describe where callee saved registers were saved, at fixed offsets from
     // CFA.
     const std::vector<CalleeSavedInfo> &CSI = MFI.getCalleeSavedInfo();
-    for (unsigned I = 0, E = CSI.size(); I != E; ++I) {
-      unsigned Reg = CSI[I].getReg();
+    for (const CalleeSavedInfo &I : CSI) {
+      Register Reg = I.getReg();
       if (Reg == PPC::LR || Reg == PPC::LR8 || Reg == PPC::RM) continue;
 
       // This is a bit of a hack: CR2LT, CR2GT, CR2EQ and CR2UN are just
@@ -1197,7 +1205,7 @@ void PPCFrameLowering::emitPrologue(MachineFunction &MF,
         // In the ELFv1 ABI, only CR2 is noted in CFI and stands in for
         // the whole CR word.  In the ELFv2 ABI, every CR that was
         // actually saved gets its own CFI record.
-        unsigned CRReg = isELFv2ABI? Reg : (unsigned) PPC::CR2;
+        Register CRReg = isELFv2ABI? Reg : PPC::CR2;
         unsigned CFIIndex = MF.addFrameInst(MCCFIInstruction::createOffset(
             nullptr, MRI->getDwarfRegNum(CRReg, true), CRSaveOffset));
         BuildMI(MBB, MBBI, dl, TII.get(TargetOpcode::CFI_INSTRUCTION))
@@ -1205,15 +1213,15 @@ void PPCFrameLowering::emitPrologue(MachineFunction &MF,
         continue;
       }
 
-      if (CSI[I].isSpilledToReg()) {
-        unsigned SpilledReg = CSI[I].getDstReg();
+      if (I.isSpilledToReg()) {
+        unsigned SpilledReg = I.getDstReg();
         unsigned CFIRegister = MF.addFrameInst(MCCFIInstruction::createRegister(
             nullptr, MRI->getDwarfRegNum(Reg, true),
             MRI->getDwarfRegNum(SpilledReg, true)));
         BuildMI(MBB, MBBI, dl, TII.get(TargetOpcode::CFI_INSTRUCTION))
           .addCFIIndex(CFIRegister);
       } else {
-        int Offset = MFI.getObjectOffset(CSI[I].getFrameIdx());
+        int64_t Offset = MFI.getObjectOffset(I.getFrameIdx());
         // We have changed the object offset above but we do not want to change
         // the actual offsets in the CFI instruction so we have to undo the
         // offset change here.
@@ -1551,7 +1559,7 @@ void PPCFrameLowering::emitEpilogue(MachineFunction &MF,
   const MachineFrameInfo &MFI = MF.getFrameInfo();
 
   // Get the number of bytes allocated from the FrameInfo.
-  int FrameSize = MFI.getStackSize();
+  int64_t FrameSize = MFI.getStackSize();
 
   // Get processor type.
   bool isPPC64 = Subtarget.isPPC64();
@@ -1592,10 +1600,11 @@ void PPCFrameLowering::emitEpilogue(MachineFunction &MF,
   const MCInstrDesc& MoveToCRInst = TII.get( isPPC64 ? PPC::MTOCRF8
                                                      : PPC::MTOCRF);
   const MCInstrDesc &HashChk =
-      TII.get(HasPrivileged ? PPC::HASHCHKP : PPC::HASHCHK);
-  int LROffset = getReturnSaveOffset();
+      TII.get(isPPC64 ? (HasPrivileged ? PPC::HASHCHKP8 : PPC::HASHCHK8)
+                      : (HasPrivileged ? PPC::HASHCHKP : PPC::HASHCHK));
+  int64_t LROffset = getReturnSaveOffset();
 
-  int FPOffset = 0;
+  int64_t FPOffset = 0;
 
   // Using the same bool variable as below to suppress compiler warnings.
   bool SingleScratchReg = findScratchRegister(&MBB, true, false, &ScratchReg,
@@ -1611,14 +1620,14 @@ void PPCFrameLowering::emitEpilogue(MachineFunction &MF,
     FPOffset = MFI.getObjectOffset(FPIndex);
   }
 
-  int BPOffset = 0;
+  int64_t BPOffset = 0;
   if (HasBP) {
       int BPIndex = FI->getBasePointerSaveIndex();
       assert(BPIndex && "No Base Pointer Save Slot!");
       BPOffset = MFI.getObjectOffset(BPIndex);
   }
 
-  int PBPOffset = 0;
+  int64_t PBPOffset = 0;
   if (FI->usesPICBase()) {
     int PBPIndex = FI->getPICBasePointerSaveIndex();
     assert(PBPIndex && "No PIC Base Pointer Save Slot!");
@@ -1668,7 +1677,7 @@ void PPCFrameLowering::emitEpilogue(MachineFunction &MF,
   // values from the stack, and set SPAdd to the value that needs to be added
   // to the SP at the end. The default values are as if red zone was present.
   unsigned RBReg = SPReg;
-  unsigned SPAdd = 0;
+  uint64_t SPAdd = 0;
 
   // Check if we can move the stack update instruction up the epilogue
   // past the callee saves. This will allow the move to LR instruction
@@ -1726,11 +1735,7 @@ void PPCFrameLowering::emitEpilogue(MachineFunction &MF,
         BuildMI(MBB, MBBI, dl, AddImmInst, RBReg)
           .addReg(FPReg).addImm(FrameSize);
       } else {
-        BuildMI(MBB, MBBI, dl, LoadImmShiftedInst, ScratchReg)
-          .addImm(FrameSize >> 16);
-        BuildMI(MBB, MBBI, dl, OrImmInst, ScratchReg)
-          .addReg(ScratchReg, RegState::Kill)
-          .addImm(FrameSize & 0xFFFF);
+        TII.materializeImmPostRA(MBB, MBBI, dl, ScratchReg, FrameSize);
         BuildMI(MBB, MBBI, dl, AddInst)
           .addReg(RBReg)
           .addReg(FPReg)
@@ -1866,7 +1871,7 @@ void PPCFrameLowering::emitEpilogue(MachineFunction &MF,
     // hash and then compare it to the hash stored in the prologue.
     if (HasROPProtect) {
       const int SaveIndex = FI->getROPProtectionHashSaveIndex();
-      const int ImmOffset = MFI.getObjectOffset(SaveIndex);
+      const int64_t ImmOffset = MFI.getObjectOffset(SaveIndex);
       assert((ImmOffset <= -8 && ImmOffset >= -512) &&
              "ROP hash check location offset out of range.");
       assert(((ImmOffset & 0x7) == 0) &&
@@ -1974,6 +1979,15 @@ void PPCFrameLowering::determineCalleeSaves(MachineFunction &MF,
 
   const PPCRegisterInfo *RegInfo = Subtarget.getRegisterInfo();
 
+  // Do not explicitly save the callee saved VSRp registers.
+  // The individual VSR subregisters will be saved instead.
+  SavedRegs.reset(PPC::VSRp26);
+  SavedRegs.reset(PPC::VSRp27);
+  SavedRegs.reset(PPC::VSRp28);
+  SavedRegs.reset(PPC::VSRp29);
+  SavedRegs.reset(PPC::VSRp30);
+  SavedRegs.reset(PPC::VSRp31);
+
   //  Save and clear the LR state.
   PPCFunctionInfo *FI = MF.getInfo<PPCFunctionInfo>();
   unsigned LR = RegInfo->getRARegister();
@@ -2086,15 +2100,15 @@ void PPCFrameLowering::processFunctionBeforeFrameFinalized(MachineFunction &MF,
   SmallVector<CalleeSavedInfo, 18> FPRegs;
   SmallVector<CalleeSavedInfo, 18> VRegs;
 
-  for (unsigned i = 0, e = CSI.size(); i != e; ++i) {
-    unsigned Reg = CSI[i].getReg();
+  for (const CalleeSavedInfo &I : CSI) {
+    Register Reg = I.getReg();
     assert((!MF.getInfo<PPCFunctionInfo>()->mustSaveTOC() ||
             (Reg != PPC::X2 && Reg != PPC::R2)) &&
            "Not expecting to try to spill R2 in a function that must save TOC");
     if (PPC::GPRCRegClass.contains(Reg)) {
       HasGPSaveArea = true;
 
-      GPRegs.push_back(CSI[i]);
+      GPRegs.push_back(I);
 
       if (Reg < MinGPR) {
         MinGPR = Reg;
@@ -2102,7 +2116,7 @@ void PPCFrameLowering::processFunctionBeforeFrameFinalized(MachineFunction &MF,
     } else if (PPC::G8RCRegClass.contains(Reg)) {
       HasG8SaveArea = true;
 
-      G8Regs.push_back(CSI[i]);
+      G8Regs.push_back(I);
 
       if (Reg < MinG8R) {
         MinG8R = Reg;
@@ -2110,7 +2124,7 @@ void PPCFrameLowering::processFunctionBeforeFrameFinalized(MachineFunction &MF,
     } else if (PPC::F8RCRegClass.contains(Reg)) {
       HasFPSaveArea = true;
 
-      FPRegs.push_back(CSI[i]);
+      FPRegs.push_back(I);
 
       if (Reg < MinFPR) {
         MinFPR = Reg;
@@ -2124,7 +2138,7 @@ void PPCFrameLowering::processFunctionBeforeFrameFinalized(MachineFunction &MF,
       // alignment requirements, so overload the save area for both cases.
       HasVRSaveArea = true;
 
-      VRegs.push_back(CSI[i]);
+      VRegs.push_back(I);
 
       if (Reg < MinVR) {
         MinVR = Reg;
@@ -2339,7 +2353,7 @@ bool PPCFrameLowering::assignCalleeSavedSpillSlots(
     if (BVAllocatable.none())
       return false;
 
-    unsigned Reg = CS.getReg();
+    Register Reg = CS.getReg();
 
     if (!PPC::G8RCRegClass.contains(Reg)) {
       AllSpilledToReg = false;
@@ -2383,7 +2397,7 @@ bool PPCFrameLowering::spillCalleeSavedRegisters(
 
   // Map each VSR to GPRs to be spilled with into it. Single VSR can contain one
   // or two GPRs, so we need table to record information for later save/restore.
-  llvm::for_each(CSI, [&](const CalleeSavedInfo &Info) {
+  for (const CalleeSavedInfo &Info : CSI) {
     if (Info.isSpilledToReg()) {
       auto &SpilledVSR =
           VSRContainingGPRs.FindAndConstruct(Info.getDstReg()).second;
@@ -2394,10 +2408,10 @@ bool PPCFrameLowering::spillCalleeSavedRegisters(
       else
         SpilledVSR.second = Info.getReg();
     }
-  });
+  }
 
-  for (unsigned i = 0, e = CSI.size(); i != e; ++i) {
-    unsigned Reg = CSI[i].getReg();
+  for (const CalleeSavedInfo &I : CSI) {
+    Register Reg = I.getReg();
 
     // CR2 through CR4 are the nonvolatile CR fields.
     bool IsCRField = PPC::CR2 <= Reg && Reg <= PPC::CR4;
@@ -2440,11 +2454,11 @@ bool PPCFrameLowering::spillCalleeSavedRegisters(
         MBB.insert(MI, addFrameReference(BuildMI(*MF, DL, TII.get(PPC::STW))
                                          .addReg(PPC::R12,
                                                  getKillRegState(true)),
-                                         CSI[i].getFrameIdx()));
+                                         I.getFrameIdx()));
       }
     } else {
-      if (CSI[i].isSpilledToReg()) {
-        unsigned Dst = CSI[i].getDstReg();
+      if (I.isSpilledToReg()) {
+        unsigned Dst = I.getDstReg();
 
         if (Spilled[Dst])
           continue;
@@ -2479,10 +2493,10 @@ bool PPCFrameLowering::spillCalleeSavedRegisters(
         if (Subtarget.needsSwapsForVSXMemOps() &&
             !MF->getFunction().hasFnAttribute(Attribute::NoUnwind))
           TII.storeRegToStackSlotNoUpd(MBB, MI, Reg, !IsLiveIn,
-                                       CSI[i].getFrameIdx(), RC, TRI);
+                                       I.getFrameIdx(), RC, TRI);
         else
-          TII.storeRegToStackSlot(MBB, MI, Reg, !IsLiveIn, CSI[i].getFrameIdx(),
-                                  RC, TRI);
+          TII.storeRegToStackSlot(MBB, MI, Reg, !IsLiveIn, I.getFrameIdx(), RC,
+                                  TRI, Register());
       }
     }
   }
@@ -2583,7 +2597,7 @@ bool PPCFrameLowering::restoreCalleeSavedRegisters(
     --BeforeI;
 
   for (unsigned i = 0, e = CSI.size(); i != e; ++i) {
-    unsigned Reg = CSI[i].getReg();
+    Register Reg = CSI[i].getReg();
 
     if ((Reg == PPC::X2 || Reg == PPC::R2) && MustSaveTOC)
       continue;
@@ -2654,7 +2668,8 @@ bool PPCFrameLowering::restoreCalleeSavedRegisters(
           TII.loadRegFromStackSlotNoUpd(MBB, I, Reg, CSI[i].getFrameIdx(), RC,
                                         TRI);
         else
-          TII.loadRegFromStackSlot(MBB, I, Reg, CSI[i].getFrameIdx(), RC, TRI);
+          TII.loadRegFromStackSlot(MBB, I, Reg, CSI[i].getFrameIdx(), RC, TRI,
+                                   Register());
 
         assert(I != MBB.begin() &&
                "loadRegFromStackSlot didn't insert any code!");
@@ -2681,15 +2696,15 @@ bool PPCFrameLowering::restoreCalleeSavedRegisters(
   return true;
 }
 
-unsigned PPCFrameLowering::getTOCSaveOffset() const {
+uint64_t PPCFrameLowering::getTOCSaveOffset() const {
   return TOCSaveOffset;
 }
 
-unsigned PPCFrameLowering::getFramePointerSaveOffset() const {
+uint64_t PPCFrameLowering::getFramePointerSaveOffset() const {
   return FramePointerSaveOffset;
 }
 
-unsigned PPCFrameLowering::getBasePointerSaveOffset() const {
+uint64_t PPCFrameLowering::getBasePointerSaveOffset() const {
   return BasePointerSaveOffset;
 }
 
diff --git a/gnu/llvm/llvm/lib/Target/PowerPC/PPCFrameLowering.h b/gnu/llvm/llvm/lib/Target/PowerPC/PPCFrameLowering.h
index ef69d90769e..767b0891e4f 100644
--- a/gnu/llvm/llvm/lib/Target/PowerPC/PPCFrameLowering.h
+++ b/gnu/llvm/llvm/lib/Target/PowerPC/PPCFrameLowering.h
@@ -22,12 +22,12 @@ class PPCSubtarget;
 
 class PPCFrameLowering: public TargetFrameLowering {
   const PPCSubtarget &Subtarget;
-  const unsigned ReturnSaveOffset;
-  const unsigned TOCSaveOffset;
-  const unsigned FramePointerSaveOffset;
+  const uint64_t ReturnSaveOffset;
+  const uint64_t TOCSaveOffset;
+  const uint64_t FramePointerSaveOffset;
   const unsigned LinkageSize;
-  const unsigned BasePointerSaveOffset;
-  const unsigned CRSaveOffset;
+  const uint64_t BasePointerSaveOffset;
+  const uint64_t CRSaveOffset;
 
   // Map each group of one or two GPRs to corresponding VSR for spilling.
   // TODO: Use local table in methods to avoid this mutable member.
@@ -89,7 +89,7 @@ public:
   /**
    * Determine the frame layout and update the machine function.
    */
-  unsigned determineFrameLayoutAndUpdate(MachineFunction &MF,
+  uint64_t determineFrameLayoutAndUpdate(MachineFunction &MF,
                                          bool UseEstimate = false) const;
 
   /**
@@ -97,7 +97,7 @@ public:
    * The MachineFunction object can be const in this case as it is not
    * modified.
    */
-  unsigned determineFrameLayout(const MachineFunction &MF,
+  uint64_t determineFrameLayout(const MachineFunction &MF,
                                 bool UseEstimate = false,
                                 unsigned *NewMaxCallFrameSize = nullptr) const;
 
@@ -147,19 +147,19 @@ public:
 
   /// getReturnSaveOffset - Return the previous frame offset to save the
   /// return address.
-  unsigned getReturnSaveOffset() const { return ReturnSaveOffset; }
+  uint64_t getReturnSaveOffset() const { return ReturnSaveOffset; }
 
   /// getTOCSaveOffset - Return the previous frame offset to save the
   /// TOC register -- 64-bit SVR4 ABI only.
-  unsigned getTOCSaveOffset() const;
+  uint64_t getTOCSaveOffset() const;
 
   /// getFramePointerSaveOffset - Return the previous frame offset to save the
   /// frame pointer.
-  unsigned getFramePointerSaveOffset() const;
+  uint64_t getFramePointerSaveOffset() const;
 
   /// getBasePointerSaveOffset - Return the previous frame offset to save the
   /// base pointer.
-  unsigned getBasePointerSaveOffset() const;
+  uint64_t getBasePointerSaveOffset() const;
 
   /// getLinkageSize - Return the size of the PowerPC ABI linkage area.
   ///
diff --git a/gnu/llvm/llvm/lib/Target/PowerPC/PPCISelLowering.cpp b/gnu/llvm/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
index 37358176f35..77630cf027f 100644
--- a/gnu/llvm/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
+++ b/gnu/llvm/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
@@ -26,7 +26,6 @@
 #include "llvm/ADT/APInt.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/DenseMap.h"
-#include "llvm/ADT/None.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/ADT/SmallSet.h"
@@ -96,6 +95,7 @@
 #include <cstdint>
 #include <iterator>
 #include <list>
+#include <optional>
 #include <utility>
 #include <vector>
 
@@ -126,9 +126,20 @@ static cl::opt<bool> EnableQuadwordAtomics(
     cl::desc("enable quadword lock-free atomic operations"), cl::init(false),
     cl::Hidden);
 
+static cl::opt<bool>
+    DisablePerfectShuffle("ppc-disable-perfect-shuffle",
+                          cl::desc("disable vector permute decomposition"),
+                          cl::init(true), cl::Hidden);
+
+cl::opt<bool> DisableAutoPairedVecSt(
+    "disable-auto-paired-vec-st",
+    cl::desc("disable automatically generated 32byte paired vector stores"),
+    cl::init(true), cl::Hidden);
+
 STATISTIC(NumTailCalls, "Number of tail calls");
 STATISTIC(NumSiblingCalls, "Number of sibling calls");
-STATISTIC(ShufflesHandledWithVPERM, "Number of shuffles lowered to a VPERM");
+STATISTIC(ShufflesHandledWithVPERM,
+          "Number of shuffles lowered to a VPERM or XXPERM");
 STATISTIC(NumDynamicAllocaProbed, "Number of dynamic stack allocation probed");
 
 static bool isNByteElemShuffleMask(ShuffleVectorSDNode *, unsigned, int);
@@ -379,6 +390,24 @@ PPCTargetLowering::PPCTargetLowering(const PPCTargetMachine &TM,
   setOperationAction(ISD::FSINCOS, MVT::f32, Expand);
   setOperationAction(ISD::FREM , MVT::f32, Expand);
   setOperationAction(ISD::FPOW , MVT::f32, Expand);
+
+  // MASS transformation for LLVM intrinsics with replicating fast-math flag
+  // to be consistent to PPCGenScalarMASSEntries pass
+  if (TM.getOptLevel() == CodeGenOpt::Aggressive) {
+    setOperationAction(ISD::FSIN , MVT::f64, Custom);
+    setOperationAction(ISD::FCOS , MVT::f64, Custom);
+    setOperationAction(ISD::FPOW , MVT::f64, Custom);
+    setOperationAction(ISD::FLOG, MVT::f64, Custom);
+    setOperationAction(ISD::FLOG10, MVT::f64, Custom);
+    setOperationAction(ISD::FEXP, MVT::f64, Custom);
+    setOperationAction(ISD::FSIN , MVT::f32, Custom);
+    setOperationAction(ISD::FCOS , MVT::f32, Custom);
+    setOperationAction(ISD::FPOW , MVT::f32, Custom);
+    setOperationAction(ISD::FLOG, MVT::f32, Custom);
+    setOperationAction(ISD::FLOG10, MVT::f32, Custom);
+    setOperationAction(ISD::FEXP, MVT::f32, Custom);
+  }
+
   if (Subtarget.hasSPE()) {
     setOperationAction(ISD::FMA  , MVT::f64, Expand);
     setOperationAction(ISD::FMA  , MVT::f32, Expand);
@@ -390,7 +419,7 @@ PPCTargetLowering::PPCTargetLowering(const PPCTargetMachine &TM,
   if (Subtarget.hasSPE())
     setLoadExtAction(ISD::EXTLOAD, MVT::f64, MVT::f32, Expand);
 
-  setOperationAction(ISD::FLT_ROUNDS_, MVT::i32, Custom);
+  setOperationAction(ISD::GET_ROUNDING, MVT::i32, Custom);
 
   // If we're enabling GP optimizations, use hardware square root
   if (!Subtarget.hasFSQRT() &&
@@ -423,14 +452,19 @@ PPCTargetLowering::PPCTargetLowering(const PPCTargetMachine &TM,
     setOperationAction(ISD::FROUND, MVT::f32, Legal);
   }
 
-  // PowerPC does not have BSWAP, but we can use vector BSWAP instruction xxbrd
-  // to speed up scalar BSWAP64.
+  // Prior to P10, PowerPC does not have BSWAP, but we can use vector BSWAP
+  // instruction xxbrd to speed up scalar BSWAP64.
+  if (Subtarget.isISA3_1()) {
+    setOperationAction(ISD::BSWAP, MVT::i32, Legal);
+    setOperationAction(ISD::BSWAP, MVT::i64, Legal);
+  } else {
+    setOperationAction(ISD::BSWAP, MVT::i32, Expand);
+    setOperationAction(
+        ISD::BSWAP, MVT::i64,
+        (Subtarget.hasP9Vector() && Subtarget.isPPC64()) ? Custom : Expand);
+  }
+
   // CTPOP or CTTZ were introduced in P8/P9 respectively
-  setOperationAction(ISD::BSWAP, MVT::i32  , Expand);
-  if (Subtarget.hasP9Vector() && Subtarget.isPPC64())
-    setOperationAction(ISD::BSWAP, MVT::i64  , Custom);
-  else
-    setOperationAction(ISD::BSWAP, MVT::i64  , Expand);
   if (Subtarget.isISA3_0()) {
     setOperationAction(ISD::CTTZ , MVT::i32  , Legal);
     setOperationAction(ISD::CTTZ , MVT::i64  , Legal);
@@ -601,6 +635,10 @@ PPCTargetLowering::PPCTargetLowering(const PPCTargetMachine &TM,
 
   // We want to custom lower some of our intrinsics.
   setOperationAction(ISD::INTRINSIC_WO_CHAIN, MVT::Other, Custom);
+  setOperationAction(ISD::INTRINSIC_WO_CHAIN, MVT::f64, Custom);
+  setOperationAction(ISD::INTRINSIC_WO_CHAIN, MVT::ppcf128, Custom);
+  setOperationAction(ISD::INTRINSIC_WO_CHAIN, MVT::v4f32, Custom);
+  setOperationAction(ISD::INTRINSIC_WO_CHAIN, MVT::v2f64, Custom);
 
   // To handle counter-based loop conditions.
   setOperationAction(ISD::INTRINSIC_W_CHAIN, MVT::i1, Custom);
@@ -998,7 +1036,7 @@ PPCTargetLowering::PPCTargetLowering(const PPCTargetMachine &TM,
       setOperationAction(ISD::LOAD, MVT::v2f64, Legal);
       setOperationAction(ISD::STORE, MVT::v2f64, Legal);
 
-      setOperationAction(ISD::VECTOR_SHUFFLE, MVT::v2f64, Legal);
+      setOperationAction(ISD::VECTOR_SHUFFLE, MVT::v2f64, Custom);
 
       if (Subtarget.hasP8Vector())
         addRegisterClass(MVT::f32, &PPC::VSSRCRegClass);
@@ -1046,7 +1084,7 @@ PPCTargetLowering::PPCTargetLowering(const PPCTargetMachine &TM,
       setOperationAction(ISD::STORE, MVT::v2i64, Promote);
       AddPromotedToType (ISD::STORE, MVT::v2i64, MVT::v2f64);
 
-      setOperationAction(ISD::VECTOR_SHUFFLE, MVT::v2i64, Legal);
+      setOperationAction(ISD::VECTOR_SHUFFLE, MVT::v2i64, Custom);
 
       setOperationAction(ISD::STRICT_SINT_TO_FP, MVT::v2i64, Legal);
       setOperationAction(ISD::STRICT_UINT_TO_FP, MVT::v2i64, Legal);
@@ -1245,9 +1283,15 @@ PPCTargetLowering::PPCTargetLowering(const PPCTargetMachine &TM,
     }
 
     if (Subtarget.hasP9Altivec()) {
-      setOperationAction(ISD::INSERT_VECTOR_ELT, MVT::v8i16, Custom);
-      setOperationAction(ISD::INSERT_VECTOR_ELT, MVT::v16i8, Custom);
-
+      if (Subtarget.isISA3_1()) {
+        setOperationAction(ISD::INSERT_VECTOR_ELT, MVT::v2i64, Legal);
+        setOperationAction(ISD::INSERT_VECTOR_ELT, MVT::v8i16, Legal);
+        setOperationAction(ISD::INSERT_VECTOR_ELT, MVT::v16i8, Legal);
+        setOperationAction(ISD::INSERT_VECTOR_ELT, MVT::v4i32, Legal);
+      } else {
+        setOperationAction(ISD::INSERT_VECTOR_ELT, MVT::v8i16, Custom);
+        setOperationAction(ISD::INSERT_VECTOR_ELT, MVT::v16i8, Custom);
+      }
       setOperationAction(ISD::SIGN_EXTEND_INREG, MVT::v4i8,  Legal);
       setOperationAction(ISD::SIGN_EXTEND_INREG, MVT::v4i16, Legal);
       setOperationAction(ISD::SIGN_EXTEND_INREG, MVT::v4i32, Legal);
@@ -1257,8 +1301,9 @@ PPCTargetLowering::PPCTargetLowering(const PPCTargetMachine &TM,
       setOperationAction(ISD::SIGN_EXTEND_INREG, MVT::v2i64, Legal);
     }
 
-    if (Subtarget.isISA3_1())
-      setOperationAction(ISD::INSERT_VECTOR_ELT, MVT::v2i64, Custom);
+    if (Subtarget.hasP10Vector()) {
+      setOperationAction(ISD::SELECT_CC, MVT::f128, Custom);
+    }
   }
 
   if (Subtarget.pairedVectorMemops()) {
@@ -1267,7 +1312,10 @@ PPCTargetLowering::PPCTargetLowering(const PPCTargetMachine &TM,
     setOperationAction(ISD::STORE, MVT::v256i1, Custom);
   }
   if (Subtarget.hasMMA()) {
-    addRegisterClass(MVT::v512i1, &PPC::UACCRCRegClass);
+    if (Subtarget.isISAFuture())
+      addRegisterClass(MVT::v512i1, &PPC::WACCRCRegClass);
+    else
+      addRegisterClass(MVT::v512i1, &PPC::UACCRCRegClass);
     setOperationAction(ISD::LOAD, MVT::v512i1, Custom);
     setOperationAction(ISD::STORE, MVT::v512i1, Custom);
     setOperationAction(ISD::BUILD_VECTOR, MVT::v512i1, Custom);
@@ -1286,8 +1334,11 @@ PPCTargetLowering::PPCTargetLowering(const PPCTargetMachine &TM,
     setOperationAction(ISD::ATOMIC_STORE, MVT::i64, Expand);
   }
 
-  if (EnableQuadwordAtomics && Subtarget.hasQuadwordAtomics())
-    setMaxAtomicSizeInBitsSupported(128);
+  if (shouldInlineQuadwordAtomics()) {
+    setOperationAction(ISD::ATOMIC_LOAD, MVT::i128, Custom);
+    setOperationAction(ISD::ATOMIC_STORE, MVT::i128, Custom);
+    setOperationAction(ISD::INTRINSIC_VOID, MVT::i128, Custom);
+  }
 
   setBooleanContents(ZeroOrOneBooleanContent);
 
@@ -1296,56 +1347,46 @@ PPCTargetLowering::PPCTargetLowering(const PPCTargetMachine &TM,
     setBooleanVectorContents(ZeroOrNegativeOneBooleanContent);
   }
 
+  setLibcallName(RTLIB::MULO_I128, nullptr);
   if (!isPPC64) {
     // These libcalls are not available in 32-bit.
     setLibcallName(RTLIB::SHL_I128, nullptr);
     setLibcallName(RTLIB::SRL_I128, nullptr);
     setLibcallName(RTLIB::SRA_I128, nullptr);
+    setLibcallName(RTLIB::MUL_I128, nullptr);
+    setLibcallName(RTLIB::MULO_I64, nullptr);
   }
 
   if (!isPPC64)
     setMaxAtomicSizeInBitsSupported(32);
+  else if (shouldInlineQuadwordAtomics())
+    setMaxAtomicSizeInBitsSupported(128);
+  else
+    setMaxAtomicSizeInBitsSupported(64);
 
   setStackPointerRegisterToSaveRestore(isPPC64 ? PPC::X1 : PPC::R1);
 
   // We have target-specific dag combine patterns for the following nodes:
-  setTargetDAGCombine(ISD::ADD);
-  setTargetDAGCombine(ISD::SHL);
-  setTargetDAGCombine(ISD::SRA);
-  setTargetDAGCombine(ISD::SRL);
-  setTargetDAGCombine(ISD::MUL);
-  setTargetDAGCombine(ISD::FMA);
-  setTargetDAGCombine(ISD::SINT_TO_FP);
-  setTargetDAGCombine(ISD::BUILD_VECTOR);
+  setTargetDAGCombine({ISD::ADD, ISD::SHL, ISD::SRA, ISD::SRL, ISD::MUL,
+                       ISD::FMA, ISD::SINT_TO_FP, ISD::BUILD_VECTOR});
   if (Subtarget.hasFPCVT())
     setTargetDAGCombine(ISD::UINT_TO_FP);
-  setTargetDAGCombine(ISD::LOAD);
-  setTargetDAGCombine(ISD::STORE);
-  setTargetDAGCombine(ISD::BR_CC);
+  setTargetDAGCombine({ISD::LOAD, ISD::STORE, ISD::BR_CC});
   if (Subtarget.useCRBits())
     setTargetDAGCombine(ISD::BRCOND);
-  setTargetDAGCombine(ISD::BSWAP);
-  setTargetDAGCombine(ISD::INTRINSIC_WO_CHAIN);
-  setTargetDAGCombine(ISD::INTRINSIC_W_CHAIN);
-  setTargetDAGCombine(ISD::INTRINSIC_VOID);
-
-  setTargetDAGCombine(ISD::SIGN_EXTEND);
-  setTargetDAGCombine(ISD::ZERO_EXTEND);
-  setTargetDAGCombine(ISD::ANY_EXTEND);
+  setTargetDAGCombine({ISD::BSWAP, ISD::INTRINSIC_WO_CHAIN,
+                       ISD::INTRINSIC_W_CHAIN, ISD::INTRINSIC_VOID});
 
-  setTargetDAGCombine(ISD::TRUNCATE);
-  setTargetDAGCombine(ISD::VECTOR_SHUFFLE);
+  setTargetDAGCombine({ISD::SIGN_EXTEND, ISD::ZERO_EXTEND, ISD::ANY_EXTEND});
 
+  setTargetDAGCombine({ISD::TRUNCATE, ISD::VECTOR_SHUFFLE});
 
   if (Subtarget.useCRBits()) {
-    setTargetDAGCombine(ISD::TRUNCATE);
-    setTargetDAGCombine(ISD::SETCC);
-    setTargetDAGCombine(ISD::SELECT_CC);
+    setTargetDAGCombine({ISD::TRUNCATE, ISD::SETCC, ISD::SELECT_CC});
   }
 
   if (Subtarget.hasP9Altivec()) {
-    setTargetDAGCombine(ISD::ABS);
-    setTargetDAGCombine(ISD::VSELECT);
+    setTargetDAGCombine({ISD::ABS, ISD::VSELECT});
   }
 
   setLibcallName(RTLIB::LOG_F128, "logf128");
@@ -1513,10 +1554,10 @@ void PPCTargetLowering::initializeAddrModeMap() {
       PPC::MOF_RPlusSImm16Mult16 | PPC::MOF_Vector | PPC::MOF_SubtargetP9,
       PPC::MOF_NotAddNorCst | PPC::MOF_Vector | PPC::MOF_SubtargetP9,
       PPC::MOF_AddrIsSImm32 | PPC::MOF_Vector | PPC::MOF_SubtargetP9,
-      PPC::MOF_RPlusSImm16Mult16 | PPC::MOF_Vector256 | PPC::MOF_SubtargetP10,
-      PPC::MOF_NotAddNorCst | PPC::MOF_Vector256 | PPC::MOF_SubtargetP10,
-      PPC::MOF_AddrIsSImm32 | PPC::MOF_Vector256 | PPC::MOF_SubtargetP10,
   };
+  AddrModesMap[PPC::AM_PrefixDForm] = {PPC::MOF_RPlusSImm34 |
+                                       PPC::MOF_SubtargetP10};
+  // TODO: Add mapping for quadword load/store.
 }
 
 /// getMaxByValAlign - Helper for getByValTypeAlignment to determine
@@ -1526,9 +1567,9 @@ static void getMaxByValAlign(Type *Ty, Align &MaxAlign, Align MaxMaxAlign) {
     return;
   if (VectorType *VTy = dyn_cast<VectorType>(Ty)) {
     if (MaxMaxAlign >= 32 &&
-        VTy->getPrimitiveSizeInBits().getFixedSize() >= 256)
+        VTy->getPrimitiveSizeInBits().getFixedValue() >= 256)
       MaxAlign = Align(32);
-    else if (VTy->getPrimitiveSizeInBits().getFixedSize() >= 128 &&
+    else if (VTy->getPrimitiveSizeInBits().getFixedValue() >= 128 &&
              MaxAlign < 16)
       MaxAlign = Align(16);
   } else if (ArrayType *ATy = dyn_cast<ArrayType>(Ty)) {
@@ -1550,7 +1591,7 @@ static void getMaxByValAlign(Type *Ty, Align &MaxAlign, Align MaxMaxAlign) {
 
 /// getByValTypeAlignment - Return the desired alignment for ByVal aggregate
 /// function arguments in the caller parameter area.
-unsigned PPCTargetLowering::getByValTypeAlignment(Type *Ty,
+uint64_t PPCTargetLowering::getByValTypeAlignment(Type *Ty,
                                                   const DataLayout &DL) const {
   // 16byte and wider vectors are passed on 16byte boundary.
   // The rest is 8 on PPC64 and 4 on PPC32 boundary.
@@ -1576,8 +1617,8 @@ const char *PPCTargetLowering::getTargetNodeName(unsigned Opcode) const {
   switch ((PPCISD::NodeType)Opcode) {
   case PPCISD::FIRST_NUMBER:    break;
   case PPCISD::FSEL:            return "PPCISD::FSEL";
-  case PPCISD::XSMAXCDP:        return "PPCISD::XSMAXCDP";
-  case PPCISD::XSMINCDP:        return "PPCISD::XSMINCDP";
+  case PPCISD::XSMAXC:          return "PPCISD::XSMAXC";
+  case PPCISD::XSMINC:          return "PPCISD::XSMINC";
   case PPCISD::FCFID:           return "PPCISD::FCFID";
   case PPCISD::FCFIDU:          return "PPCISD::FCFIDU";
   case PPCISD::FCFIDS:          return "PPCISD::FCFIDS";
@@ -1605,6 +1646,8 @@ const char *PPCTargetLowering::getTargetNodeName(unsigned Opcode) const {
     return "PPCISD::XXSPLTI32DX";
   case PPCISD::VECINSERT:       return "PPCISD::VECINSERT";
   case PPCISD::XXPERMDI:        return "PPCISD::XXPERMDI";
+  case PPCISD::XXPERM:
+    return "PPCISD::XXPERM";
   case PPCISD::VECSHL:          return "PPCISD::VECSHL";
   case PPCISD::CMPB:            return "PPCISD::CMPB";
   case PPCISD::Hi:              return "PPCISD::Hi";
@@ -1623,9 +1666,19 @@ const char *PPCTargetLowering::getTargetNodeName(unsigned Opcode) const {
   case PPCISD::CALL:            return "PPCISD::CALL";
   case PPCISD::CALL_NOP:        return "PPCISD::CALL_NOP";
   case PPCISD::CALL_NOTOC:      return "PPCISD::CALL_NOTOC";
+  case PPCISD::CALL_RM:
+    return "PPCISD::CALL_RM";
+  case PPCISD::CALL_NOP_RM:
+    return "PPCISD::CALL_NOP_RM";
+  case PPCISD::CALL_NOTOC_RM:
+    return "PPCISD::CALL_NOTOC_RM";
   case PPCISD::MTCTR:           return "PPCISD::MTCTR";
   case PPCISD::BCTRL:           return "PPCISD::BCTRL";
   case PPCISD::BCTRL_LOAD_TOC:  return "PPCISD::BCTRL_LOAD_TOC";
+  case PPCISD::BCTRL_RM:
+    return "PPCISD::BCTRL_RM";
+  case PPCISD::BCTRL_LOAD_TOC_RM:
+    return "PPCISD::BCTRL_LOAD_TOC_RM";
   case PPCISD::RET_FLAG:        return "PPCISD::RET_FLAG";
   case PPCISD::READ_TIME_BASE:  return "PPCISD::READ_TIME_BASE";
   case PPCISD::EH_SJLJ_SETJMP:  return "PPCISD::EH_SJLJ_SETJMP";
@@ -1707,6 +1760,8 @@ const char *PPCTargetLowering::getTargetNodeName(unsigned Opcode) const {
   case PPCISD::EXTRACT_VSX_REG: return "PPCISD::EXTRACT_VSX_REG";
   case PPCISD::XXMFACC:         return "PPCISD::XXMFACC";
   case PPCISD::LD_SPLAT:        return "PPCISD::LD_SPLAT";
+  case PPCISD::ZEXT_LD_SPLAT:   return "PPCISD::ZEXT_LD_SPLAT";
+  case PPCISD::SEXT_LD_SPLAT:   return "PPCISD::SEXT_LD_SPLAT";
   case PPCISD::FNMSUB:          return "PPCISD::FNMSUB";
   case PPCISD::STRICT_FADDRTZ:
     return "PPCISD::STRICT_FADDRTZ";
@@ -1727,6 +1782,8 @@ const char *PPCTargetLowering::getTargetNodeName(unsigned Opcode) const {
   case PPCISD::STRICT_FCFIDUS:
     return "PPCISD::STRICT_FCFIDUS";
   case PPCISD::LXVRZX:          return "PPCISD::LXVRZX";
+  case PPCISD::STORE_COND:
+    return "PPCISD::STORE_COND";
   }
   return nullptr;
 }
@@ -1843,8 +1900,7 @@ bool PPC::isVPKUWUMShuffleMask(ShuffleVectorSDNode *N, unsigned ShuffleKind,
 /// For the latter, the input operands are swapped (see PPCInstrAltivec.td).
 bool PPC::isVPKUDUMShuffleMask(ShuffleVectorSDNode *N, unsigned ShuffleKind,
                                SelectionDAG &DAG) {
-  const PPCSubtarget& Subtarget =
-      static_cast<const PPCSubtarget&>(DAG.getSubtarget());
+  const PPCSubtarget &Subtarget = DAG.getSubtarget<PPCSubtarget>();
   if (!Subtarget.hasP8Vector())
     return false;
 
@@ -2098,7 +2154,11 @@ int PPC::isVSLDOIShuffleMask(SDNode *N, unsigned ShuffleKind,
 /// specifies a splat of a single element that is suitable for input to
 /// one of the splat operations (VSPLTB/VSPLTH/VSPLTW/XXSPLTW/LXVDSX/etc.).
 bool PPC::isSplatShuffleMask(ShuffleVectorSDNode *N, unsigned EltSize) {
-  assert(N->getValueType(0) == MVT::v16i8 && isPowerOf2_32(EltSize) &&
+  EVT VT = N->getValueType(0);
+  if (VT == MVT::v2i64 || VT == MVT::v2f64)
+    return EltSize == 8 && N->getMaskElt(0) == N->getMaskElt(1);
+
+  assert(VT == MVT::v16i8 && isPowerOf2_32(EltSize) &&
          EltSize <= 8 && "Can only handle 1,2,4,8 byte element sizes");
 
   // The consecutive indices need to specify an element, not part of two
@@ -2399,6 +2459,12 @@ unsigned PPC::getSplatIdxForPPCMnemonics(SDNode *N, unsigned EltSize,
                                          SelectionDAG &DAG) {
   ShuffleVectorSDNode *SVOp = cast<ShuffleVectorSDNode>(N);
   assert(isSplatShuffleMask(SVOp, EltSize));
+  EVT VT = SVOp->getValueType(0);
+
+  if (VT == MVT::v2i64 || VT == MVT::v2f64)
+    return DAG.getDataLayout().isLittleEndian() ? 1 - SVOp->getMaskElt(0)
+                                                : SVOp->getMaskElt(0);
+
   if (DAG.getDataLayout().isLittleEndian())
     return (16 / EltSize) - 1 - (SVOp->getMaskElt(0) / EltSize);
   else
@@ -2410,7 +2476,7 @@ unsigned PPC::getSplatIdxForPPCMnemonics(SDNode *N, unsigned EltSize,
 /// the constant being splatted.  The ByteSize field indicates the number of
 /// bytes of each element [124] -> [bhw].
 SDValue PPC::get_VSPLTI_elt(SDNode *N, unsigned ByteSize, SelectionDAG &DAG) {
-  SDValue OpVal(nullptr, 0);
+  SDValue OpVal;
 
   // If ByteSize of the splat is bigger than the element size of the
   // build_vector, then we have a case where we are checking for a splat where
@@ -2551,9 +2617,8 @@ static bool provablyDisjointOr(SelectionDAG &DAG, const SDValue &N) {
 bool PPCTargetLowering::SelectAddressEVXRegReg(SDValue N, SDValue &Base,
                                                SDValue &Index,
                                                SelectionDAG &DAG) const {
-  for (SDNode::use_iterator UI = N->use_begin(), E = N->use_end();
-      UI != E; ++UI) {
-    if (MemSDNode *Memop = dyn_cast<MemSDNode>(*UI)) {
+  for (SDNode *U : N->uses()) {
+    if (MemSDNode *Memop = dyn_cast<MemSDNode>(U)) {
       if (Memop->getMemoryVT() == MVT::f64) {
           Base = N.getOperand(0);
           Index = N.getOperand(1);
@@ -2936,15 +3001,15 @@ bool PPCTargetLowering::getPreIndexedAddressParts(SDNode *N, SDValue &Base,
   bool isLoad = true;
   SDValue Ptr;
   EVT VT;
-  unsigned Alignment;
+  Align Alignment;
   if (LoadSDNode *LD = dyn_cast<LoadSDNode>(N)) {
     Ptr = LD->getBasePtr();
     VT = LD->getMemoryVT();
-    Alignment = LD->getAlignment();
+    Alignment = LD->getAlign();
   } else if (StoreSDNode *ST = dyn_cast<StoreSDNode>(N)) {
     Ptr = ST->getBasePtr();
     VT  = ST->getMemoryVT();
-    Alignment = ST->getAlignment();
+    Alignment = ST->getAlign();
     isLoad = false;
   } else
     return false;
@@ -2984,11 +3049,11 @@ bool PPCTargetLowering::getPreIndexedAddressParts(SDNode *N, SDValue &Base,
 
   // LDU/STU can only handle immediates that are a multiple of 4.
   if (VT != MVT::i64) {
-    if (!SelectAddressRegImm(Ptr, Offset, Base, DAG, None))
+    if (!SelectAddressRegImm(Ptr, Offset, Base, DAG, std::nullopt))
       return false;
   } else {
     // LDU/STU need an address with at least 4-byte alignment.
-    if (Alignment < 4)
+    if (Alignment < Align(4))
       return false;
 
     if (!SelectAddressRegImm(Ptr, Offset, Base, DAG, Align(4)))
@@ -3066,7 +3131,7 @@ SDValue PPCTargetLowering::getTOCEntry(SelectionDAG &DAG, const SDLoc &dl,
   SDValue Ops[] = { GA, Reg };
   return DAG.getMemIntrinsicNode(
       PPCISD::TOC_ENTRY, dl, DAG.getVTList(VT, MVT::Other), Ops, VT,
-      MachinePointerInfo::getGOT(DAG.getMachineFunction()), None,
+      MachinePointerInfo::getGOT(DAG.getMachineFunction()), std::nullopt,
       MachineMemOperand::MOLoad);
 }
 
@@ -3478,15 +3543,17 @@ SDValue PPCTargetLowering::LowerSETCC(SDValue Op, SelectionDAG &DAG) const {
     if (LHS.getValueType() == MVT::v2i64) {
       // Equality can be handled by casting to the legal type for Altivec
       // comparisons, everything else needs to be expanded.
-      if (CC == ISD::SETEQ || CC == ISD::SETNE) {
-        return DAG.getNode(
-            ISD::BITCAST, dl, MVT::v2i64,
-            DAG.getSetCC(dl, MVT::v4i32,
-                         DAG.getNode(ISD::BITCAST, dl, MVT::v4i32, LHS),
-                         DAG.getNode(ISD::BITCAST, dl, MVT::v4i32, RHS), CC));
-      }
-
-      return SDValue();
+      if (CC != ISD::SETEQ && CC != ISD::SETNE)
+        return SDValue();
+      SDValue SetCC32 = DAG.getSetCC(
+          dl, MVT::v4i32, DAG.getNode(ISD::BITCAST, dl, MVT::v4i32, LHS),
+          DAG.getNode(ISD::BITCAST, dl, MVT::v4i32, RHS), CC);
+      int ShuffV[] = {1, 0, 3, 2};
+      SDValue Shuff =
+          DAG.getVectorShuffle(MVT::v4i32, dl, SetCC32, SetCC32, ShuffV);
+      return DAG.getBitcast(MVT::v2i64,
+                            DAG.getNode(CC == ISD::SETEQ ? ISD::AND : ISD::OR,
+                                        dl, MVT::v4i32, Shuff, SetCC32));
     }
 
     // We handle most of these in the usual way.
@@ -3503,7 +3570,7 @@ SDValue PPCTargetLowering::LowerSETCC(SDValue Op, SelectionDAG &DAG) const {
     // Leave comparisons against 0 and -1 alone for now, since they're usually
     // optimized.  FIXME: revisit this when we can custom lower all setcc
     // optimizations.
-    if (C->isAllOnesValue() || C->isNullValue())
+    if (C->isAllOnes() || C->isZero())
       return SDValue();
   }
 
@@ -4055,8 +4122,8 @@ SDValue PPCTargetLowering::LowerFormalArguments_32SVR4(
       // virtual ones.
       if (VA.getLocVT() == MVT::f64 && Subtarget.hasSPE()) {
         assert(i + 1 < e && "No second half of double precision argument");
-        unsigned RegLo = MF.addLiveIn(VA.getLocReg(), RC);
-        unsigned RegHi = MF.addLiveIn(ArgLocs[++i].getLocReg(), RC);
+        Register RegLo = MF.addLiveIn(VA.getLocReg(), RC);
+        Register RegHi = MF.addLiveIn(ArgLocs[++i].getLocReg(), RC);
         SDValue ArgValueLo = DAG.getCopyFromReg(Chain, dl, RegLo, MVT::i32);
         SDValue ArgValueHi = DAG.getCopyFromReg(Chain, dl, RegHi, MVT::i32);
         if (!Subtarget.isLittleEndian())
@@ -4064,7 +4131,7 @@ SDValue PPCTargetLowering::LowerFormalArguments_32SVR4(
         ArgValue = DAG.getNode(PPCISD::BUILD_SPE64, dl, MVT::f64, ArgValueLo,
                                ArgValueHi);
       } else {
-        unsigned Reg = MF.addLiveIn(VA.getLocReg(), RC);
+        Register Reg = MF.addLiveIn(VA.getLocReg(), RC);
         ArgValue = DAG.getCopyFromReg(Chain, dl, Reg,
                                       ValVT == MVT::i1 ? MVT::i32 : ValVT);
         if (ValVT == MVT::i1)
@@ -4125,13 +4192,13 @@ SDValue PPCTargetLowering::LowerFormalArguments_32SVR4(
       PPC::R3, PPC::R4, PPC::R5, PPC::R6,
       PPC::R7, PPC::R8, PPC::R9, PPC::R10,
     };
-    const unsigned NumGPArgRegs = array_lengthof(GPArgRegs);
+    const unsigned NumGPArgRegs = std::size(GPArgRegs);
 
     static const MCPhysReg FPArgRegs[] = {
       PPC::F1, PPC::F2, PPC::F3, PPC::F4, PPC::F5, PPC::F6, PPC::F7,
       PPC::F8
     };
-    unsigned NumFPArgRegs = array_lengthof(FPArgRegs);
+    unsigned NumFPArgRegs = std::size(FPArgRegs);
 
     if (useSoftFloat() || hasSPE())
        NumFPArgRegs = 0;
@@ -4156,7 +4223,7 @@ SDValue PPCTargetLowering::LowerFormalArguments_32SVR4(
     // dereferencing the result of va_next.
     for (unsigned GPRIndex = 0; GPRIndex != NumGPArgRegs; ++GPRIndex) {
       // Get an existing live-in vreg, or add a new one.
-      unsigned VReg = MF.getRegInfo().getLiveInVirtReg(GPArgRegs[GPRIndex]);
+      Register VReg = MF.getRegInfo().getLiveInVirtReg(GPArgRegs[GPRIndex]);
       if (!VReg)
         VReg = MF.addLiveIn(GPArgRegs[GPRIndex], &PPC::GPRCRegClass);
 
@@ -4175,7 +4242,7 @@ SDValue PPCTargetLowering::LowerFormalArguments_32SVR4(
     // on the stack.
     for (unsigned FPRIndex = 0; FPRIndex != NumFPArgRegs; ++FPRIndex) {
       // Get an existing live-in vreg, or add a new one.
-      unsigned VReg = MF.getRegInfo().getLiveInVirtReg(FPArgRegs[FPRIndex]);
+      Register VReg = MF.getRegInfo().getLiveInVirtReg(FPArgRegs[FPRIndex]);
       if (!VReg)
         VReg = MF.addLiveIn(FPArgRegs[FPRIndex], &PPC::F8RCRegClass);
 
@@ -4243,9 +4310,9 @@ SDValue PPCTargetLowering::LowerFormalArguments_64SVR4(
     PPC::V9, PPC::V10, PPC::V11, PPC::V12, PPC::V13
   };
 
-  const unsigned Num_GPR_Regs = array_lengthof(GPR);
+  const unsigned Num_GPR_Regs = std::size(GPR);
   const unsigned Num_FPR_Regs = useSoftFloat() ? 0 : 13;
-  const unsigned Num_VR_Regs  = array_lengthof(VR);
+  const unsigned Num_VR_Regs = std::size(VR);
 
   // Do a first pass over the arguments to determine whether the ABI
   // guarantees that our caller has allocated the parameter save area
@@ -4361,24 +4428,13 @@ SDValue PPCTargetLowering::LowerFormalArguments_64SVR4(
         InVals.push_back(Arg);
 
         if (GPR_idx != Num_GPR_Regs) {
-          unsigned VReg = MF.addLiveIn(GPR[GPR_idx++], &PPC::G8RCRegClass);
+          Register VReg = MF.addLiveIn(GPR[GPR_idx++], &PPC::G8RCRegClass);
           FuncInfo->addLiveInAttr(VReg, Flags);
           SDValue Val = DAG.getCopyFromReg(Chain, dl, VReg, PtrVT);
-          SDValue Store;
-
-          if (ObjSize==1 || ObjSize==2 || ObjSize==4) {
-            EVT ObjType = (ObjSize == 1 ? MVT::i8 :
-                           (ObjSize == 2 ? MVT::i16 : MVT::i32));
-            Store = DAG.getTruncStore(Val.getValue(1), dl, Val, Arg,
-                                      MachinePointerInfo(&*FuncArg), ObjType);
-          } else {
-            // For sizes that don't fit a truncating store (3, 5, 6, 7),
-            // store the whole register as-is to the parameter save area
-            // slot.
-            Store = DAG.getStore(Val.getValue(1), dl, Val, FIN,
-                                 MachinePointerInfo(&*FuncArg));
-          }
-
+          EVT ObjType = EVT::getIntegerVT(*DAG.getContext(), ObjSize * 8);
+          SDValue Store =
+              DAG.getTruncStore(Val.getValue(1), dl, Val, Arg,
+                                MachinePointerInfo(&*FuncArg), ObjType);
           MemOps.push_back(Store);
         }
         // Whether we copied from a register or not, advance the offset
@@ -4396,7 +4452,7 @@ SDValue PPCTargetLowering::LowerFormalArguments_64SVR4(
         if (GPR_idx == Num_GPR_Regs)
           break;
 
-        unsigned VReg = MF.addLiveIn(GPR[GPR_idx], &PPC::G8RCRegClass);
+        Register VReg = MF.addLiveIn(GPR[GPR_idx], &PPC::G8RCRegClass);
         FuncInfo->addLiveInAttr(VReg, Flags);
         SDValue Val = DAG.getCopyFromReg(Chain, dl, VReg, PtrVT);
         SDValue Addr = FIN;
@@ -4404,8 +4460,11 @@ SDValue PPCTargetLowering::LowerFormalArguments_64SVR4(
           SDValue Off = DAG.getConstant(j, dl, PtrVT);
           Addr = DAG.getNode(ISD::ADD, dl, Off.getValueType(), Addr, Off);
         }
-        SDValue Store = DAG.getStore(Val.getValue(1), dl, Val, Addr,
-                                     MachinePointerInfo(&*FuncArg, j));
+        unsigned StoreSizeInBits = std::min(PtrByteSize, (ObjSize - j)) * 8;
+        EVT ObjType = EVT::getIntegerVT(*DAG.getContext(), StoreSizeInBits);
+        SDValue Store =
+            DAG.getTruncStore(Val.getValue(1), dl, Val, Addr,
+                              MachinePointerInfo(&*FuncArg, j), ObjType);
         MemOps.push_back(Store);
         ++GPR_idx;
       }
@@ -4420,7 +4479,7 @@ SDValue PPCTargetLowering::LowerFormalArguments_64SVR4(
     case MVT::i64:
       if (Flags.isNest()) {
         // The 'nest' parameter, if any, is passed in R11.
-        unsigned VReg = MF.addLiveIn(PPC::X11, &PPC::G8RCRegClass);
+        Register VReg = MF.addLiveIn(PPC::X11, &PPC::G8RCRegClass);
         ArgVal = DAG.getCopyFromReg(Chain, dl, VReg, MVT::i64);
 
         if (ObjectVT == MVT::i32 || ObjectVT == MVT::i1)
@@ -4433,7 +4492,7 @@ SDValue PPCTargetLowering::LowerFormalArguments_64SVR4(
       // passed directly.  Clang may use those instead of "byval" aggregate
       // types to avoid forcing arguments to memory unnecessarily.
       if (GPR_idx != Num_GPR_Regs) {
-        unsigned VReg = MF.addLiveIn(GPR[GPR_idx++], &PPC::G8RCRegClass);
+        Register VReg = MF.addLiveIn(GPR[GPR_idx++], &PPC::G8RCRegClass);
         FuncInfo->addLiveInAttr(VReg, Flags);
         ArgVal = DAG.getCopyFromReg(Chain, dl, VReg, MVT::i64);
 
@@ -4479,7 +4538,7 @@ SDValue PPCTargetLowering::LowerFormalArguments_64SVR4(
         // This can only ever happen in the presence of f32 array types,
         // since otherwise we never run out of FPRs before running out
         // of GPRs.
-        unsigned VReg = MF.addLiveIn(GPR[GPR_idx++], &PPC::G8RCRegClass);
+        Register VReg = MF.addLiveIn(GPR[GPR_idx++], &PPC::G8RCRegClass);
         FuncInfo->addLiveInAttr(VReg, Flags);
         ArgVal = DAG.getCopyFromReg(Chain, dl, VReg, MVT::i64);
 
@@ -4520,7 +4579,7 @@ SDValue PPCTargetLowering::LowerFormalArguments_64SVR4(
       // passed directly.  The latter are used to implement ELFv2 homogenous
       // vector aggregates.
       if (VR_idx != Num_VR_Regs) {
-        unsigned VReg = MF.addLiveIn(VR[VR_idx], &PPC::VRRCRegClass);
+        Register VReg = MF.addLiveIn(VR[VR_idx], &PPC::VRRCRegClass);
         ArgVal = DAG.getCopyFromReg(Chain, dl, VReg, ObjectVT);
         ++VR_idx;
       } else {
@@ -4579,7 +4638,7 @@ SDValue PPCTargetLowering::LowerFormalArguments_64SVR4(
     // the result of va_next.
     for (GPR_idx = (ArgOffset - LinkageSize) / PtrByteSize;
          GPR_idx < Num_GPR_Regs; ++GPR_idx) {
-      unsigned VReg = MF.addLiveIn(GPR[GPR_idx], &PPC::G8RCRegClass);
+      Register VReg = MF.addLiveIn(GPR[GPR_idx], &PPC::G8RCRegClass);
       SDValue Val = DAG.getCopyFromReg(Chain, dl, VReg, PtrVT);
       SDValue Store =
           DAG.getStore(Val.getValue(1), dl, Val, FIN, MachinePointerInfo());
@@ -4649,7 +4708,7 @@ static bool callsShareTOCBase(const Function *Caller, SDValue Callee,
 
   // If we have an Alias we can try to get the function from there.
   if (Alias) {
-    const GlobalObject *GlobalObj = Alias->getBaseObject();
+    const GlobalObject *GlobalObj = Alias->getAliaseeObject();
     F = dyn_cast<Function>(GlobalObj);
   }
 
@@ -4711,9 +4770,9 @@ needStackSlotPassParameters(const PPCSubtarget &Subtarget,
     PPC::V9, PPC::V10, PPC::V11, PPC::V12, PPC::V13
   };
 
-  const unsigned NumGPRs = array_lengthof(GPR);
+  const unsigned NumGPRs = std::size(GPR);
   const unsigned NumFPRs = 13;
-  const unsigned NumVRs = array_lengthof(VR);
+  const unsigned NumVRs = std::size(VR);
   const unsigned ParamAreaSize = NumGPRs * PtrByteSize;
 
   unsigned NumBytes = LinkageSize;
@@ -5063,8 +5122,7 @@ PrepareTailCall(SelectionDAG &DAG, SDValue &InFlag, SDValue &Chain,
   Chain = EmitTailCallStoreFPAndRetAddr(DAG, Chain, LROp, FPOp, SPDiff, dl);
 
   // Emit callseq_end just before tailcall node.
-  Chain = DAG.getCALLSEQ_END(Chain, DAG.getIntPtrConstant(NumBytes, dl, true),
-                             DAG.getIntPtrConstant(0, dl, true), InFlag, dl);
+  Chain = DAG.getCALLSEQ_END(Chain, NumBytes, 0, InFlag, dl);
   InFlag = Chain.getValue(1);
 }
 
@@ -5174,13 +5232,14 @@ static inline bool isTOCSaveRestoreRequired(const PPCSubtarget &Subtarget) {
 }
 
 static unsigned getCallOpcode(PPCTargetLowering::CallFlags CFlags,
-                              const Function &Caller,
-                              const SDValue &Callee,
+                              const Function &Caller, const SDValue &Callee,
                               const PPCSubtarget &Subtarget,
-                              const TargetMachine &TM) {
+                              const TargetMachine &TM,
+                              bool IsStrictFPCall = false) {
   if (CFlags.IsTailCall)
     return PPCISD::TC_RETURN;
 
+  unsigned RetOpc = 0;
   // This is a call through a function pointer.
   if (CFlags.IsIndirect) {
     // AIX and the 64-bit ELF ABIs need to maintain the TOC pointer accross
@@ -5191,28 +5250,46 @@ static unsigned getCallOpcode(PPCTargetLowering::CallFlags CFlags,
     // immediately followed by a load of the TOC pointer from the the stack save
     // slot into gpr2. For 64-bit ELFv2 ABI with PCRel, do not restore the TOC
     // as it is not saved or used.
-    return isTOCSaveRestoreRequired(Subtarget) ? PPCISD::BCTRL_LOAD_TOC
-                                               : PPCISD::BCTRL;
-  }
-
-  if (Subtarget.isUsingPCRelativeCalls()) {
+    RetOpc = isTOCSaveRestoreRequired(Subtarget) ? PPCISD::BCTRL_LOAD_TOC
+                                                 : PPCISD::BCTRL;
+  } else if (Subtarget.isUsingPCRelativeCalls()) {
     assert(Subtarget.is64BitELFABI() && "PC Relative is only on ELF ABI.");
-    return PPCISD::CALL_NOTOC;
+    RetOpc = PPCISD::CALL_NOTOC;
+  } else if (Subtarget.isAIXABI() || Subtarget.is64BitELFABI())
+    // The ABIs that maintain a TOC pointer accross calls need to have a nop
+    // immediately following the call instruction if the caller and callee may
+    // have different TOC bases. At link time if the linker determines the calls
+    // may not share a TOC base, the call is redirected to a trampoline inserted
+    // by the linker. The trampoline will (among other things) save the callers
+    // TOC pointer at an ABI designated offset in the linkage area and the
+    // linker will rewrite the nop to be a load of the TOC pointer from the
+    // linkage area into gpr2.
+    RetOpc = callsShareTOCBase(&Caller, Callee, TM) ? PPCISD::CALL
+                                                    : PPCISD::CALL_NOP;
+  else
+    RetOpc = PPCISD::CALL;
+  if (IsStrictFPCall) {
+    switch (RetOpc) {
+    default:
+      llvm_unreachable("Unknown call opcode");
+    case PPCISD::BCTRL_LOAD_TOC:
+      RetOpc = PPCISD::BCTRL_LOAD_TOC_RM;
+      break;
+    case PPCISD::BCTRL:
+      RetOpc = PPCISD::BCTRL_RM;
+      break;
+    case PPCISD::CALL_NOTOC:
+      RetOpc = PPCISD::CALL_NOTOC_RM;
+      break;
+    case PPCISD::CALL:
+      RetOpc = PPCISD::CALL_RM;
+      break;
+    case PPCISD::CALL_NOP:
+      RetOpc = PPCISD::CALL_NOP_RM;
+      break;
+    }
   }
-
-  // The ABIs that maintain a TOC pointer accross calls need to have a nop
-  // immediately following the call instruction if the caller and callee may
-  // have different TOC bases. At link time if the linker determines the calls
-  // may not share a TOC base, the call is redirected to a trampoline inserted
-  // by the linker. The trampoline will (among other things) save the callers
-  // TOC pointer at an ABI designated offset in the linkage area and the linker
-  // will rewrite the nop to be a load of the TOC pointer from the linkage area
-  // into gpr2.
-  if (Subtarget.isAIXABI() || Subtarget.is64BitELFABI())
-    return callsShareTOCBase(&Caller, Callee, TM) ? PPCISD::CALL
-                                                  : PPCISD::CALL_NOP;
-
-  return PPCISD::CALL;
+  return RetOpc;
 }
 
 static SDValue transformCallee(const SDValue &Callee, SelectionDAG &DAG,
@@ -5228,7 +5305,7 @@ static SDValue transformCallee(const SDValue &Callee, SelectionDAG &DAG,
     const GlobalValue *GV = G ? G->getGlobal() : nullptr;
 
     return DAG.getTarget().shouldAssumeDSOLocal(*Mod, GV) &&
-           !dyn_cast_or_null<GlobalIFunc>(GV);
+           !isa_and_nonnull<GlobalIFunc>(GV);
   };
 
   // The PLT is only used in 32-bit ELF PIC mode.  Attempting to use the PLT in
@@ -5314,8 +5391,8 @@ static void prepareIndirectCall(SelectionDAG &DAG, SDValue &Callee,
                                 const SDLoc &dl) {
   SDValue MTCTROps[] = {Chain, Callee, Glue};
   EVT ReturnTypes[] = {MVT::Other, MVT::Glue};
-  Chain = DAG.getNode(PPCISD::MTCTR, dl, makeArrayRef(ReturnTypes, 2),
-                      makeArrayRef(MTCTROps, Glue.getNode() ? 3 : 2));
+  Chain = DAG.getNode(PPCISD::MTCTR, dl, ArrayRef(ReturnTypes, 2),
+                      ArrayRef(MTCTROps, Glue.getNode() ? 3 : 2));
   // The glue is the second value produced.
   Glue = Chain.getValue(1);
 }
@@ -5370,7 +5447,7 @@ static void prepareDescriptorIndirectCall(SelectionDAG &DAG, SDValue &Callee,
   const unsigned EnvPtrOffset = Subtarget.descriptorEnvironmentPointerOffset();
 
   const MVT RegVT = Subtarget.isPPC64() ? MVT::i64 : MVT::i32;
-  const unsigned Alignment = Subtarget.isPPC64() ? 8 : 4;
+  const Align Alignment = Subtarget.isPPC64() ? Align(8) : Align(4);
 
   // One load for the functions entry point address.
   SDValue LoadFuncPtr = DAG.getLoad(RegVT, dl, LDChain, Callee, MPI,
@@ -5508,7 +5585,7 @@ SDValue PPCTargetLowering::FinishCall(
 
   unsigned CallOpc =
       getCallOpcode(CFlags, DAG.getMachineFunction().getFunction(), Callee,
-                    Subtarget, DAG.getTarget());
+                    Subtarget, DAG.getTarget(), CB ? CB->isStrictFP() : false);
 
   if (!CFlags.IsIndirect)
     Callee = transformCallee(Callee, DAG, dl, Subtarget);
@@ -5556,9 +5633,7 @@ SDValue PPCTargetLowering::FinishCall(
                             ? NumBytes
                             : 0;
 
-  Chain = DAG.getCALLSEQ_END(Chain, DAG.getIntPtrConstant(NumBytes, dl, true),
-                             DAG.getIntPtrConstant(BytesCalleePops, dl, true),
-                             Glue, dl);
+  Chain = DAG.getCALLSEQ_END(Chain, NumBytes, BytesCalleePops, Glue, dl);
   Glue = Chain.getValue(1);
 
   return LowerCallResult(Chain, Glue, CFlags.CallConv, CFlags.IsVarArg, Ins, dl,
@@ -5865,8 +5940,8 @@ SDValue PPCTargetLowering::LowerCall_32SVR4(
     SDVTList VTs = DAG.getVTList(MVT::Other, MVT::Glue);
     SDValue Ops[] = { Chain, InFlag };
 
-    Chain = DAG.getNode(seenFloatArg ? PPCISD::CR6SET : PPCISD::CR6UNSET,
-                        dl, VTs, makeArrayRef(Ops, InFlag.getNode() ? 2 : 1));
+    Chain = DAG.getNode(seenFloatArg ? PPCISD::CR6SET : PPCISD::CR6UNSET, dl,
+                        VTs, ArrayRef(Ops, InFlag.getNode() ? 2 : 1));
 
     InFlag = Chain.getValue(1);
   }
@@ -5945,9 +6020,9 @@ SDValue PPCTargetLowering::LowerCall_64SVR4(
     PPC::V9, PPC::V10, PPC::V11, PPC::V12, PPC::V13
   };
 
-  const unsigned NumGPRs = array_lengthof(GPR);
+  const unsigned NumGPRs = std::size(GPR);
   const unsigned NumFPRs = useSoftFloat() ? 0 : 13;
-  const unsigned NumVRs  = array_lengthof(VR);
+  const unsigned NumVRs = std::size(VR);
 
   // On ELFv2, we can avoid allocating the parameter area if all the arguments
   // can be passed to the callee in registers.
@@ -6176,20 +6251,13 @@ SDValue PPCTargetLowering::LowerCall_64SVR4(
         ArgOffset += PtrByteSize;
         continue;
       }
-      // Copy entire object into memory.  There are cases where gcc-generated
-      // code assumes it is there, even if it could be put entirely into
-      // registers.  (This is not what the doc says.)
-
-      // FIXME: The above statement is likely due to a misunderstanding of the
-      // documents.  All arguments must be copied into the parameter area BY
-      // THE CALLEE in the event that the callee takes the address of any
-      // formal argument.  That has not yet been implemented.  However, it is
-      // reasonable to use the stack area as a staging area for the register
-      // load.
-
-      // Skip this for small aggregates, as we will use the same slot for a
-      // right-justified copy, below.
-      if (Size >= 8)
+      // Copy the object to parameter save area if it can not be entirely passed 
+      // by registers.
+      // FIXME: we only need to copy the parts which need to be passed in
+      // parameter save area. For the parts passed by registers, we don't need
+      // to copy them to the stack although we need to allocate space for them
+      // in parameter save area.
+      if ((NumGPRs - GPR_idx) * PtrByteSize < Size)
         Chain = CallSeqStart = createMemcpyOutsideCallSeq(Arg, PtrOff,
                                                           CallSeqStart,
                                                           Flags, DAG, dl);
@@ -6230,8 +6298,11 @@ SDValue PPCTargetLowering::LowerCall_64SVR4(
         SDValue Const = DAG.getConstant(j, dl, PtrOff.getValueType());
         SDValue AddArg = DAG.getNode(ISD::ADD, dl, PtrVT, Arg, Const);
         if (GPR_idx != NumGPRs) {
-          SDValue Load =
-              DAG.getLoad(PtrVT, dl, Chain, AddArg, MachinePointerInfo());
+          unsigned LoadSizeInBits = std::min(PtrByteSize, (Size - j)) * 8;
+          EVT ObjType = EVT::getIntegerVT(*DAG.getContext(), LoadSizeInBits);
+          SDValue Load = DAG.getExtLoad(ISD::EXTLOAD, dl, PtrVT, Chain, AddArg,
+                                        MachinePointerInfo(), ObjType);
+
           MemOpChains.push_back(Load.getValue(1));
           RegsToPass.push_back(std::make_pair(GPR[GPR_idx++], Load));
           ArgOffset += PtrByteSize;
@@ -6585,7 +6656,7 @@ static bool CC_AIX(unsigned ValNo, MVT ValVT, MVT LocVT,
   case MVT::i64:
     // i64 arguments should have been split to i32 for PPC32.
     assert(IsPPC64 && "PPC32 should have split i64 values.");
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case MVT::i1:
   case MVT::i32: {
     const unsigned Offset = State.AllocateStack(PtrAlign.value(), PtrAlign);
@@ -6864,8 +6935,7 @@ SDValue PPCTargetLowering::LowerFormalArguments_AIX(
   if (useSoftFloat())
     report_fatal_error("Soft float support is unimplemented on AIX.");
 
-  const PPCSubtarget &Subtarget =
-      static_cast<const PPCSubtarget &>(DAG.getSubtarget());
+  const PPCSubtarget &Subtarget = DAG.getSubtarget<PPCSubtarget>();
 
   const bool IsPPC64 = Subtarget.isPPC64();
   const unsigned PtrByteSize = IsPPC64 ? 8 : 4;
@@ -7035,7 +7105,7 @@ SDValue PPCTargetLowering::LowerFormalArguments_AIX(
 
       auto HandleRegLoc = [&, RegClass, LocVT](const MCPhysReg PhysReg,
                                                unsigned Offset) {
-        const unsigned VReg = MF.addLiveIn(PhysReg, RegClass);
+        const Register VReg = MF.addLiveIn(PhysReg, RegClass);
         // Since the callers side has left justified the aggregate in the
         // register, we can simply store the entire register into the stack
         // slot.
@@ -7123,7 +7193,7 @@ SDValue PPCTargetLowering::LowerFormalArguments_AIX(
 
     static const MCPhysReg GPR_64[] = {PPC::X3, PPC::X4, PPC::X5, PPC::X6,
                                        PPC::X7, PPC::X8, PPC::X9, PPC::X10};
-    const unsigned NumGPArgRegs = array_lengthof(IsPPC64 ? GPR_64 : GPR_32);
+    const unsigned NumGPArgRegs = std::size(IsPPC64 ? GPR_64 : GPR_32);
 
     // The fixed integer arguments of a variadic function are stored to the
     // VarArgsFrameIndex on the stack so that they may be loaded by
@@ -7132,7 +7202,7 @@ SDValue PPCTargetLowering::LowerFormalArguments_AIX(
              (CCInfo.getNextStackOffset() - LinkageSize) / PtrByteSize;
          GPRIndex < NumGPArgRegs; ++GPRIndex) {
 
-      const unsigned VReg =
+      const Register VReg =
           IsPPC64 ? MF.addLiveIn(GPR_64[GPRIndex], &PPC::G8RCRegClass)
                   : MF.addLiveIn(GPR_32[GPRIndex], &PPC::GPRCRegClass);
 
@@ -7170,8 +7240,7 @@ SDValue PPCTargetLowering::LowerCall_AIX(
   if (CFlags.IsPatchPoint)
     report_fatal_error("This call type is unimplemented on AIX.");
 
-  const PPCSubtarget& Subtarget =
-      static_cast<const PPCSubtarget&>(DAG.getSubtarget());
+  const PPCSubtarget &Subtarget = DAG.getSubtarget<PPCSubtarget>();
 
   MachineFunction &MF = DAG.getMachineFunction();
   SmallVector<CCValAssign, 16> ArgLocs;
@@ -7855,7 +7924,7 @@ SDValue PPCTargetLowering::LowerSELECT_CC(SDValue Op, SelectionDAG &DAG) const {
 
   SDNodeFlags Flags = Op.getNode()->getFlags();
 
-  // We have xsmaxcdp/xsmincdp which are OK to emit even in the
+  // We have xsmaxc[dq]p/xsminc[dq]p which are OK to emit even in the
   // presence of infinities.
   if (Subtarget.hasP9Vector() && LHS == TV && RHS == FV) {
     switch (CC) {
@@ -7863,10 +7932,10 @@ SDValue PPCTargetLowering::LowerSELECT_CC(SDValue Op, SelectionDAG &DAG) const {
       break;
     case ISD::SETOGT:
     case ISD::SETGT:
-      return DAG.getNode(PPCISD::XSMAXCDP, dl, Op.getValueType(), LHS, RHS);
+      return DAG.getNode(PPCISD::XSMAXC, dl, Op.getValueType(), LHS, RHS);
     case ISD::SETOLT:
     case ISD::SETLT:
-      return DAG.getNode(PPCISD::XSMINCDP, dl, Op.getValueType(), LHS, RHS);
+      return DAG.getNode(PPCISD::XSMINC, dl, Op.getValueType(), LHS, RHS);
     }
   }
 
@@ -7886,7 +7955,7 @@ SDValue PPCTargetLowering::LowerSELECT_CC(SDValue Op, SelectionDAG &DAG) const {
     default: break;       // SETUO etc aren't handled by fsel.
     case ISD::SETNE:
       std::swap(TV, FV);
-      LLVM_FALLTHROUGH;
+      [[fallthrough]];
     case ISD::SETEQ:
       if (LHS.getValueType() == MVT::f32)   // Comparison is always 64-bits
         LHS = DAG.getNode(ISD::FP_EXTEND, dl, MVT::f64, LHS);
@@ -7898,7 +7967,7 @@ SDValue PPCTargetLowering::LowerSELECT_CC(SDValue Op, SelectionDAG &DAG) const {
     case ISD::SETULT:
     case ISD::SETLT:
       std::swap(TV, FV);  // fsel is natively setge, swap operands for setlt
-      LLVM_FALLTHROUGH;
+      [[fallthrough]];
     case ISD::SETOGE:
     case ISD::SETGE:
       if (LHS.getValueType() == MVT::f32)   // Comparison is always 64-bits
@@ -7907,7 +7976,7 @@ SDValue PPCTargetLowering::LowerSELECT_CC(SDValue Op, SelectionDAG &DAG) const {
     case ISD::SETUGT:
     case ISD::SETGT:
       std::swap(TV, FV);  // fsel is natively setge, swap operands for setlt
-      LLVM_FALLTHROUGH;
+      [[fallthrough]];
     case ISD::SETOLE:
     case ISD::SETLE:
       if (LHS.getValueType() == MVT::f32)   // Comparison is always 64-bits
@@ -7921,7 +7990,7 @@ SDValue PPCTargetLowering::LowerSELECT_CC(SDValue Op, SelectionDAG &DAG) const {
   default: break;       // SETUO etc aren't handled by fsel.
   case ISD::SETNE:
     std::swap(TV, FV);
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case ISD::SETEQ:
     Cmp = DAG.getNode(ISD::FSUB, dl, CmpVT, LHS, RHS, Flags);
     if (Cmp.getValueType() == MVT::f32)   // Comparison is always 64-bits
@@ -8276,7 +8345,7 @@ void PPCTargetLowering::spliceIntoChain(SDValue ResChain,
 /// prefer float load to int load plus direct move
 /// when there is no integer use of int load
 bool PPCTargetLowering::directMoveIsProfitable(const SDValue &Op) const {
-  SDNode *Origin = Op.getOperand(0).getNode();
+  SDNode *Origin = Op.getOperand(Op->isStrictFPOpcode() ? 1 : 0).getNode();
   if (Origin->getOpcode() != ISD::LOAD)
     return true;
 
@@ -8602,7 +8671,7 @@ SDValue PPCTargetLowering::LowerINT_TO_FP(SDValue Op,
                          {Chain, FP, DAG.getIntPtrConstant(0, dl)}, Flags);
       else
         FP = DAG.getNode(ISD::FP_ROUND, dl, MVT::f32, FP,
-                         DAG.getIntPtrConstant(0, dl));
+                         DAG.getIntPtrConstant(0, dl, /*isTarget=*/true));
     }
     return FP;
   }
@@ -8683,13 +8752,13 @@ SDValue PPCTargetLowering::LowerINT_TO_FP(SDValue Op,
                        {Chain, FP, DAG.getIntPtrConstant(0, dl)}, Flags);
     else
       FP = DAG.getNode(ISD::FP_ROUND, dl, MVT::f32, FP,
-                       DAG.getIntPtrConstant(0, dl));
+                       DAG.getIntPtrConstant(0, dl, /*isTarget=*/true));
   }
   return FP;
 }
 
-SDValue PPCTargetLowering::LowerFLT_ROUNDS_(SDValue Op,
-                                            SelectionDAG &DAG) const {
+SDValue PPCTargetLowering::LowerGET_ROUNDING(SDValue Op,
+                                             SelectionDAG &DAG) const {
   SDLoc dl(Op);
   /*
    The rounding mode is in bits 30:31 of FPSR, and has the following
@@ -8699,7 +8768,7 @@ SDValue PPCTargetLowering::LowerFLT_ROUNDS_(SDValue Op,
      10 Round to +inf
      11 Round to -inf
 
-  FLT_ROUNDS, on the other hand, expects the following:
+  GET_ROUNDING, on the other hand, expects the following:
     -1 Undefined
      0 Round to 0
      1 Round to nearest
@@ -9013,7 +9082,7 @@ SDValue PPCTargetLowering::LowerBITCAST(SDValue Op, SelectionDAG &DAG) const {
 
 static const SDValue *getNormalLoadInput(const SDValue &Op, bool &IsPermuted) {
   const SDValue *InputLoad = &Op;
-  if (InputLoad->getOpcode() == ISD::BITCAST)
+  while (InputLoad->getOpcode() == ISD::BITCAST)
     InputLoad = &InputLoad->getOperand(0);
   if (InputLoad->getOpcode() == ISD::SCALAR_TO_VECTOR ||
       InputLoad->getOpcode() == PPCISD::SCALAR_TO_VECTOR_PERMUTED) {
@@ -9066,6 +9135,42 @@ bool llvm::checkConvertToNonDenormSingle(APFloat &ArgAPFloat) {
   return (!LosesInfo && !APFloatToConvert.isDenormal());
 }
 
+static bool isValidSplatLoad(const PPCSubtarget &Subtarget, const SDValue &Op,
+                             unsigned &Opcode) {
+  LoadSDNode *InputNode = dyn_cast<LoadSDNode>(Op.getOperand(0));
+  if (!InputNode || !Subtarget.hasVSX() || !ISD::isUNINDEXEDLoad(InputNode))
+    return false;
+
+  EVT Ty = Op->getValueType(0);
+  // For v2f64, v4f32 and v4i32 types, we require the load to be non-extending
+  // as we cannot handle extending loads for these types.
+  if ((Ty == MVT::v2f64 || Ty == MVT::v4f32 || Ty == MVT::v4i32) &&
+      ISD::isNON_EXTLoad(InputNode))
+    return true;
+
+  EVT MemVT = InputNode->getMemoryVT();
+  // For v8i16 and v16i8 types, extending loads can be handled as long as the
+  // memory VT is the same vector element VT type.
+  // The loads feeding into the v8i16 and v16i8 types will be extending because
+  // scalar i8/i16 are not legal types.
+  if ((Ty == MVT::v8i16 || Ty == MVT::v16i8) && ISD::isEXTLoad(InputNode) &&
+      (MemVT == Ty.getVectorElementType()))
+    return true;
+
+  if (Ty == MVT::v2i64) {
+    // Check the extend type, when the input type is i32, and the output vector
+    // type is v2i64.
+    if (MemVT == MVT::i32) {
+      if (ISD::isZEXTLoad(InputNode))
+        Opcode = PPCISD::ZEXT_LD_SPLAT;
+      if (ISD::isSEXTLoad(InputNode))
+        Opcode = PPCISD::SEXT_LD_SPLAT;
+    }
+    return true;
+  }
+  return false;
+}
+
 // If this is a case we can't handle, return null and let the default
 // expansion code take care of it.  If we CAN select this case, and if it
 // selects to a single instruction, return Op.  Otherwise, if we can codegen
@@ -9129,17 +9234,26 @@ SDValue PPCTargetLowering::LowerBUILD_VECTOR(SDValue Op,
   }
 
   if (!BVNIsConstantSplat || SplatBitSize > 32) {
+    unsigned NewOpcode = PPCISD::LD_SPLAT;
 
-    bool IsPermutedLoad = false;
-    const SDValue *InputLoad =
-        getNormalLoadInput(Op.getOperand(0), IsPermutedLoad);
     // Handle load-and-splat patterns as we have instructions that will do this
     // in one go.
-    if (InputLoad && DAG.isSplatValue(Op, true)) {
+    if (DAG.isSplatValue(Op, true) &&
+        isValidSplatLoad(Subtarget, Op, NewOpcode)) {
+      const SDValue *InputLoad = &Op.getOperand(0);
       LoadSDNode *LD = cast<LoadSDNode>(*InputLoad);
 
-      // We have handling for 4 and 8 byte elements.
-      unsigned ElementSize = LD->getMemoryVT().getScalarSizeInBits();
+      // If the input load is an extending load, it will be an i32 -> i64
+      // extending load and isValidSplatLoad() will update NewOpcode.
+      unsigned MemorySize = LD->getMemoryVT().getScalarSizeInBits();
+      unsigned ElementSize =
+          MemorySize * ((NewOpcode == PPCISD::LD_SPLAT) ? 1 : 2);
+
+      assert(((ElementSize == 2 * MemorySize)
+                  ? (NewOpcode == PPCISD::ZEXT_LD_SPLAT ||
+                     NewOpcode == PPCISD::SEXT_LD_SPLAT)
+                  : (NewOpcode == PPCISD::LD_SPLAT)) &&
+             "Unmatched element size and opcode!\n");
 
       // Checking for a single use of this load, we have to check for vector
       // width (128 bits) / ElementSize uses (since each operand of the
@@ -9148,18 +9262,45 @@ SDValue PPCTargetLowering::LowerBUILD_VECTOR(SDValue Op,
       for (SDValue BVInOp : Op->ops())
         if (BVInOp.isUndef())
           NumUsesOfInputLD--;
+
+      // Exclude somes case where LD_SPLAT is worse than scalar_to_vector:
+      // Below cases should also happen for "lfiwzx/lfiwax + LE target + index
+      // 1" and "lxvrhx + BE target + index 7" and "lxvrbx + BE target + index
+      // 15", but funciton IsValidSplatLoad() now will only return true when
+      // the data at index 0 is not nullptr. So we will not get into trouble for
+      // these cases.
+      //
+      // case 1 - lfiwzx/lfiwax
+      // 1.1: load result is i32 and is sign/zero extend to i64;
+      // 1.2: build a v2i64 vector type with above loaded value;
+      // 1.3: the vector has only one value at index 0, others are all undef;
+      // 1.4: on BE target, so that lfiwzx/lfiwax does not need any permute.
+      if (NumUsesOfInputLD == 1 &&
+          (Op->getValueType(0) == MVT::v2i64 && NewOpcode != PPCISD::LD_SPLAT &&
+           !Subtarget.isLittleEndian() && Subtarget.hasVSX() &&
+           Subtarget.hasLFIWAX()))
+        return SDValue();
+
+      // case 2 - lxvr[hb]x
+      // 2.1: load result is at most i16;
+      // 2.2: build a vector with above loaded value;
+      // 2.3: the vector has only one value at index 0, others are all undef;
+      // 2.4: on LE target, so that lxvr[hb]x does not need any permute.
+      if (NumUsesOfInputLD == 1 && Subtarget.isLittleEndian() &&
+          Subtarget.isISA3_1() && ElementSize <= 16)
+        return SDValue();
+
       assert(NumUsesOfInputLD > 0 && "No uses of input LD of a build_vector?");
       if (InputLoad->getNode()->hasNUsesOfValue(NumUsesOfInputLD, 0) &&
-          ((Subtarget.hasVSX() && ElementSize == 64) ||
-           (Subtarget.hasP9Vector() && ElementSize == 32))) {
+          Subtarget.hasVSX()) {
         SDValue Ops[] = {
           LD->getChain(),    // Chain
           LD->getBasePtr(),  // Ptr
           DAG.getValueType(Op.getValueType()) // VT
         };
         SDValue LdSplt = DAG.getMemIntrinsicNode(
-            PPCISD::LD_SPLAT, dl, DAG.getVTList(Op.getValueType(), MVT::Other),
-            Ops, LD->getMemoryVT(), LD->getMemOperand());
+            NewOpcode, dl, DAG.getVTList(Op.getValueType(), MVT::Other), Ops,
+            LD->getMemoryVT(), LD->getMemOperand());
         // Replace all uses of the output chain of the original load with the
         // output chain of the new load.
         DAG.ReplaceAllUsesOfValueWith(InputLoad->getValue(1),
@@ -9265,7 +9406,7 @@ SDValue PPCTargetLowering::LowerBUILD_VECTOR(SDValue Op,
     -8, 8, -9, 9, -10, 10, -11, 11, -12, 12, -13, 13, 14, -14, 15, -15, -16
   };
 
-  for (unsigned idx = 0; idx < array_lengthof(SplatCsts); ++idx) {
+  for (unsigned idx = 0; idx < std::size(SplatCsts); ++idx) {
     // Indirect through the SplatCsts array so that we favor 'vsplti -1' for
     // cases which are ambiguous (e.g. formation of 0x8000_0000).  'vsplti -1'
     int i = SplatCsts[idx];
@@ -9642,8 +9783,11 @@ SDValue PPCTargetLowering::lowerToXXSPLTI32DX(ShuffleVectorSDNode *SVN,
   // Canonicalize the RHS being a BUILD_VECTOR when lowering to xxsplti32dx.
   if (RHS->getOpcode() != ISD::BUILD_VECTOR) {
     std::swap(LHS, RHS);
-    VecShuffle = DAG.getCommutedVectorShuffle(*SVN);
-    ShuffleMask = cast<ShuffleVectorSDNode>(VecShuffle)->getMask();
+    VecShuffle = peekThroughBitcasts(DAG.getCommutedVectorShuffle(*SVN));
+    ShuffleVectorSDNode *CommutedSV = dyn_cast<ShuffleVectorSDNode>(VecShuffle);
+    if (!CommutedSV)
+      return SDValue();
+    ShuffleMask = CommutedSV->getMask();
   }
 
   // Ensure that the RHS is a vector of constants.
@@ -9705,7 +9849,7 @@ SDValue PPCTargetLowering::LowerROTL(SDValue Op, SelectionDAG &DAG) const {
   SDValue N1 = peekThroughBitcasts(Op.getOperand(1));
   unsigned SHLAmt = N1.getConstantOperandVal(0);
   if (SHLAmt % 8 == 0) {
-    SmallVector<int, 16> Mask(16, 0);
+    std::array<int, 16> Mask;
     std::iota(Mask.begin(), Mask.end(), 0);
     std::rotate(Mask.begin(), Mask.begin() + SHLAmt / 8, Mask.end());
     if (SDValue Shuffle =
@@ -9807,6 +9951,11 @@ SDValue PPCTargetLowering::LowerVECTOR_SHUFFLE(SDValue Op,
       return LdSplt;
     }
   }
+
+  // All v2i64 and v2f64 shuffles are legal
+  if (VT == MVT::v2i64 || VT == MVT::v2f64)
+    return Op;
+
   if (Subtarget.hasP9Vector() &&
       PPC::isXXINSERTWMask(SVOp, ShiftElts, InsertAtByte, Swap,
                            isLittleEndian)) {
@@ -9952,98 +10101,196 @@ SDValue PPCTargetLowering::LowerVECTOR_SHUFFLE(SDValue Op,
   // perfect shuffle table to emit an optimal matching sequence.
   ArrayRef<int> PermMask = SVOp->getMask();
 
-  unsigned PFIndexes[4];
-  bool isFourElementShuffle = true;
-  for (unsigned i = 0; i != 4 && isFourElementShuffle; ++i) { // Element number
-    unsigned EltNo = 8;   // Start out undef.
-    for (unsigned j = 0; j != 4; ++j) {  // Intra-element byte.
-      if (PermMask[i*4+j] < 0)
-        continue;   // Undef, ignore it.
-
-      unsigned ByteSource = PermMask[i*4+j];
-      if ((ByteSource & 3) != j) {
-        isFourElementShuffle = false;
-        break;
-      }
+  if (!DisablePerfectShuffle && !isLittleEndian) {
+    unsigned PFIndexes[4];
+    bool isFourElementShuffle = true;
+    for (unsigned i = 0; i != 4 && isFourElementShuffle;
+         ++i) {                           // Element number
+      unsigned EltNo = 8;                 // Start out undef.
+      for (unsigned j = 0; j != 4; ++j) { // Intra-element byte.
+        if (PermMask[i * 4 + j] < 0)
+          continue; // Undef, ignore it.
+
+        unsigned ByteSource = PermMask[i * 4 + j];
+        if ((ByteSource & 3) != j) {
+          isFourElementShuffle = false;
+          break;
+        }
 
-      if (EltNo == 8) {
-        EltNo = ByteSource/4;
-      } else if (EltNo != ByteSource/4) {
-        isFourElementShuffle = false;
-        break;
+        if (EltNo == 8) {
+          EltNo = ByteSource / 4;
+        } else if (EltNo != ByteSource / 4) {
+          isFourElementShuffle = false;
+          break;
+        }
       }
+      PFIndexes[i] = EltNo;
+    }
+
+    // If this shuffle can be expressed as a shuffle of 4-byte elements, use the
+    // perfect shuffle vector to determine if it is cost effective to do this as
+    // discrete instructions, or whether we should use a vperm.
+    // For now, we skip this for little endian until such time as we have a
+    // little-endian perfect shuffle table.
+    if (isFourElementShuffle) {
+      // Compute the index in the perfect shuffle table.
+      unsigned PFTableIndex = PFIndexes[0] * 9 * 9 * 9 + PFIndexes[1] * 9 * 9 +
+                              PFIndexes[2] * 9 + PFIndexes[3];
+
+      unsigned PFEntry = PerfectShuffleTable[PFTableIndex];
+      unsigned Cost = (PFEntry >> 30);
+
+      // Determining when to avoid vperm is tricky.  Many things affect the cost
+      // of vperm, particularly how many times the perm mask needs to be
+      // computed. For example, if the perm mask can be hoisted out of a loop or
+      // is already used (perhaps because there are multiple permutes with the
+      // same shuffle mask?) the vperm has a cost of 1.  OTOH, hoisting the
+      // permute mask out of the loop requires an extra register.
+      //
+      // As a compromise, we only emit discrete instructions if the shuffle can
+      // be generated in 3 or fewer operations.  When we have loop information
+      // available, if this block is within a loop, we should avoid using vperm
+      // for 3-operation perms and use a constant pool load instead.
+      if (Cost < 3)
+        return GeneratePerfectShuffle(PFEntry, V1, V2, DAG, dl);
     }
-    PFIndexes[i] = EltNo;
-  }
-
-  // If this shuffle can be expressed as a shuffle of 4-byte elements, use the
-  // perfect shuffle vector to determine if it is cost effective to do this as
-  // discrete instructions, or whether we should use a vperm.
-  // For now, we skip this for little endian until such time as we have a
-  // little-endian perfect shuffle table.
-  if (isFourElementShuffle && !isLittleEndian) {
-    // Compute the index in the perfect shuffle table.
-    unsigned PFTableIndex =
-      PFIndexes[0]*9*9*9+PFIndexes[1]*9*9+PFIndexes[2]*9+PFIndexes[3];
-
-    unsigned PFEntry = PerfectShuffleTable[PFTableIndex];
-    unsigned Cost  = (PFEntry >> 30);
-
-    // Determining when to avoid vperm is tricky.  Many things affect the cost
-    // of vperm, particularly how many times the perm mask needs to be computed.
-    // For example, if the perm mask can be hoisted out of a loop or is already
-    // used (perhaps because there are multiple permutes with the same shuffle
-    // mask?) the vperm has a cost of 1.  OTOH, hoisting the permute mask out of
-    // the loop requires an extra register.
-    //
-    // As a compromise, we only emit discrete instructions if the shuffle can be
-    // generated in 3 or fewer operations.  When we have loop information
-    // available, if this block is within a loop, we should avoid using vperm
-    // for 3-operation perms and use a constant pool load instead.
-    if (Cost < 3)
-      return GeneratePerfectShuffle(PFEntry, V1, V2, DAG, dl);
   }
 
   // Lower this to a VPERM(V1, V2, V3) expression, where V3 is a constant
   // vector that will get spilled to the constant pool.
   if (V2.isUndef()) V2 = V1;
 
+  return LowerVPERM(Op, DAG, PermMask, VT, V1, V2);
+}
+
+SDValue PPCTargetLowering::LowerVPERM(SDValue Op, SelectionDAG &DAG,
+                                      ArrayRef<int> PermMask, EVT VT,
+                                      SDValue V1, SDValue V2) const {
+  unsigned Opcode = PPCISD::VPERM;
+  EVT ValType = V1.getValueType();
+  SDLoc dl(Op);
+  bool NeedSwap = false;
+  bool isLittleEndian = Subtarget.isLittleEndian();
+  bool isPPC64 = Subtarget.isPPC64();
+
+  // Only need to place items backwards in LE,
+  // the mask will be properly calculated.
+  if (isLittleEndian)
+    std::swap(V1, V2);
+
+  if (Subtarget.isISA3_0() && (V1->hasOneUse() || V2->hasOneUse())) {
+    LLVM_DEBUG(dbgs() << "At least one of two input vectors are dead - using "
+                         "XXPERM instead\n");
+    Opcode = PPCISD::XXPERM;
+
+    // if V2 is dead, then we swap V1 and V2 so we can
+    // use V2 as the destination instead.
+    if (!V1->hasOneUse() && V2->hasOneUse()) {
+      std::swap(V1, V2);
+      NeedSwap = !NeedSwap;
+    }
+  }
+
   // The SHUFFLE_VECTOR mask is almost exactly what we want for vperm, except
   // that it is in input element units, not in bytes.  Convert now.
 
   // For little endian, the order of the input vectors is reversed, and
   // the permutation mask is complemented with respect to 31.  This is
-  // necessary to produce proper semantics with the big-endian-biased vperm
+  // necessary to produce proper semantics with the big-endian-based vperm
   // instruction.
   EVT EltVT = V1.getValueType().getVectorElementType();
-  unsigned BytesPerElement = EltVT.getSizeInBits()/8;
+  unsigned BytesPerElement = EltVT.getSizeInBits() / 8;
+
+  bool V1HasXXSWAPD = V1->getOperand(0)->getOpcode() == PPCISD::XXSWAPD;
+  bool V2HasXXSWAPD = V2->getOperand(0)->getOpcode() == PPCISD::XXSWAPD;
+
+  /*
+  Vectors will be appended like so: [ V1 | v2 ]
+  XXSWAPD on V1:
+  [   A   |   B   |   C   |   D   ] -> [   C   |   D   |   A   |   B   ]
+     0-3     4-7     8-11   12-15         0-3     4-7     8-11   12-15
+  i.e.  index of A, B += 8, and index of C, D -= 8.
+  XXSWAPD on V2:
+  [   E   |   F   |   G   |   H   ] -> [   G   |   H   |   E   |   F   ]
+    16-19   20-23   24-27   28-31        16-19   20-23   24-27   28-31
+  i.e.  index of E, F += 8, index of G, H -= 8
+  Swap V1 and V2:
+  [   V1   |   V2  ] -> [   V2   |   V1   ]
+     0-15     16-31        0-15     16-31
+  i.e.  index of V1 += 16, index of V2 -= 16
+  */
 
   SmallVector<SDValue, 16> ResultMask;
   for (unsigned i = 0, e = VT.getVectorNumElements(); i != e; ++i) {
     unsigned SrcElt = PermMask[i] < 0 ? 0 : PermMask[i];
 
+    if (Opcode == PPCISD::XXPERM) {
+      if (V1HasXXSWAPD) {
+        if (SrcElt < 8)
+          SrcElt += 8;
+        else if (SrcElt < 16)
+          SrcElt -= 8;
+      }
+      if (V2HasXXSWAPD) {
+        if (SrcElt > 23)
+          SrcElt -= 8;
+        else if (SrcElt > 15)
+          SrcElt += 8;
+      }
+      if (NeedSwap) {
+        if (SrcElt < 16)
+          SrcElt += 16;
+        else
+          SrcElt -= 16;
+      }
+    }
+
     for (unsigned j = 0; j != BytesPerElement; ++j)
       if (isLittleEndian)
-        ResultMask.push_back(DAG.getConstant(31 - (SrcElt*BytesPerElement + j),
-                                             dl, MVT::i32));
+        ResultMask.push_back(
+            DAG.getConstant(31 - (SrcElt * BytesPerElement + j), dl, MVT::i32));
       else
-        ResultMask.push_back(DAG.getConstant(SrcElt*BytesPerElement + j, dl,
-                                             MVT::i32));
+        ResultMask.push_back(
+            DAG.getConstant(SrcElt * BytesPerElement + j, dl, MVT::i32));
+  }
+
+  if (Opcode == PPCISD::XXPERM && (V1HasXXSWAPD || V2HasXXSWAPD)) {
+    if (V1HasXXSWAPD) {
+      dl = SDLoc(V1->getOperand(0));
+      V1 = V1->getOperand(0)->getOperand(1);
+    }
+    if (V2HasXXSWAPD) {
+      dl = SDLoc(V2->getOperand(0));
+      V2 = V2->getOperand(0)->getOperand(1);
+    }
+    if (isPPC64 && ValType != MVT::v2f64)
+      V1 = DAG.getBitcast(MVT::v2f64, V1);
+    if (isPPC64 && V2.getValueType() != MVT::v2f64)
+      V2 = DAG.getBitcast(MVT::v2f64, V2);
   }
 
   ShufflesHandledWithVPERM++;
   SDValue VPermMask = DAG.getBuildVector(MVT::v16i8, dl, ResultMask);
-  LLVM_DEBUG(dbgs() << "Emitting a VPERM for the following shuffle:\n");
-  LLVM_DEBUG(SVOp->dump());
-  LLVM_DEBUG(dbgs() << "With the following permute control vector:\n");
-  LLVM_DEBUG(VPermMask.dump());
+  LLVM_DEBUG({
+    ShuffleVectorSDNode *SVOp = cast<ShuffleVectorSDNode>(Op);
+    if (Opcode == PPCISD::XXPERM) {
+      dbgs() << "Emitting a XXPERM for the following shuffle:\n";
+    } else {
+      dbgs() << "Emitting a VPERM for the following shuffle:\n";
+    }
+    SVOp->dump();
+    dbgs() << "With the following permute control vector:\n";
+    VPermMask.dump();
+  });
 
-  if (isLittleEndian)
-    return DAG.getNode(PPCISD::VPERM, dl, V1.getValueType(),
-                       V2, V1, VPermMask);
-  else
-    return DAG.getNode(PPCISD::VPERM, dl, V1.getValueType(),
-                       V1, V2, VPermMask);
+  if (Opcode == PPCISD::XXPERM)
+    VPermMask = DAG.getBitcast(MVT::v4i32, VPermMask);
+
+  SDValue VPERMNode =
+      DAG.getNode(Opcode, dl, V1.getValueType(), V1, V2, VPermMask);
+
+  VPERMNode = DAG.getBitcast(ValType, VPERMNode);
+  return VPERMNode;
 }
 
 /// getVectorCompareInfo - Given an intrinsic, return false if it is not a
@@ -10349,7 +10596,46 @@ SDValue PPCTargetLowering::LowerINTRINSIC_WO_CHAIN(SDValue Op,
       return DAG.getRegister(PPC::X13, MVT::i64);
     return DAG.getRegister(PPC::R2, MVT::i32);
 
-  case Intrinsic::ppc_mma_disassemble_acc:
+  case Intrinsic::ppc_mma_disassemble_acc: {
+    if (Subtarget.isISAFuture()) {
+      EVT ReturnTypes[] = {MVT::v256i1, MVT::v256i1};
+      SDValue WideVec = SDValue(DAG.getMachineNode(PPC::DMXXEXTFDMR512, dl,
+                                                   ArrayRef(ReturnTypes, 2),
+                                                   Op.getOperand(1)),
+                                0);
+      SmallVector<SDValue, 4> RetOps;
+      SDValue Value = SDValue(WideVec.getNode(), 0);
+      SDValue Value2 = SDValue(WideVec.getNode(), 1);
+
+      SDValue Extract;
+      Extract = DAG.getNode(
+          PPCISD::EXTRACT_VSX_REG, dl, MVT::v16i8,
+          Subtarget.isLittleEndian() ? Value2 : Value,
+          DAG.getConstant(Subtarget.isLittleEndian() ? 1 : 0,
+                          dl, getPointerTy(DAG.getDataLayout())));
+      RetOps.push_back(Extract);
+      Extract = DAG.getNode(
+          PPCISD::EXTRACT_VSX_REG, dl, MVT::v16i8,
+          Subtarget.isLittleEndian() ? Value2 : Value,
+          DAG.getConstant(Subtarget.isLittleEndian() ? 0 : 1,
+                          dl, getPointerTy(DAG.getDataLayout())));
+      RetOps.push_back(Extract);
+      Extract = DAG.getNode(
+          PPCISD::EXTRACT_VSX_REG, dl, MVT::v16i8,
+          Subtarget.isLittleEndian() ? Value : Value2,
+          DAG.getConstant(Subtarget.isLittleEndian() ? 1 : 0,
+                          dl, getPointerTy(DAG.getDataLayout())));
+      RetOps.push_back(Extract);
+      Extract = DAG.getNode(
+          PPCISD::EXTRACT_VSX_REG, dl, MVT::v16i8,
+          Subtarget.isLittleEndian() ? Value : Value2,
+          DAG.getConstant(Subtarget.isLittleEndian() ? 0 : 1,
+                          dl, getPointerTy(DAG.getDataLayout())));
+      RetOps.push_back(Extract);
+      return DAG.getMergeValues(RetOps, dl);
+    }
+    LLVM_FALLTHROUGH;
+  }
   case Intrinsic::ppc_vsx_disassemble_pair: {
     int NumVecs = 2;
     SDValue WideVec = Op.getOperand(1);
@@ -10368,6 +10654,106 @@ SDValue PPCTargetLowering::LowerINTRINSIC_WO_CHAIN(SDValue Op,
     }
     return DAG.getMergeValues(RetOps, dl);
   }
+
+  case Intrinsic::ppc_unpack_longdouble: {
+    auto *Idx = dyn_cast<ConstantSDNode>(Op.getOperand(2));
+    assert(Idx && (Idx->getSExtValue() == 0 || Idx->getSExtValue() == 1) &&
+           "Argument of long double unpack must be 0 or 1!");
+    return DAG.getNode(ISD::EXTRACT_ELEMENT, dl, MVT::f64, Op.getOperand(1),
+                       DAG.getConstant(!!(Idx->getSExtValue()), dl,
+                                       Idx->getValueType(0)));
+  }
+
+  case Intrinsic::ppc_compare_exp_lt:
+  case Intrinsic::ppc_compare_exp_gt:
+  case Intrinsic::ppc_compare_exp_eq:
+  case Intrinsic::ppc_compare_exp_uo: {
+    unsigned Pred;
+    switch (IntrinsicID) {
+    case Intrinsic::ppc_compare_exp_lt:
+      Pred = PPC::PRED_LT;
+      break;
+    case Intrinsic::ppc_compare_exp_gt:
+      Pred = PPC::PRED_GT;
+      break;
+    case Intrinsic::ppc_compare_exp_eq:
+      Pred = PPC::PRED_EQ;
+      break;
+    case Intrinsic::ppc_compare_exp_uo:
+      Pred = PPC::PRED_UN;
+      break;
+    }
+    return SDValue(
+        DAG.getMachineNode(
+            PPC::SELECT_CC_I4, dl, MVT::i32,
+            {SDValue(DAG.getMachineNode(PPC::XSCMPEXPDP, dl, MVT::i32,
+                                        Op.getOperand(1), Op.getOperand(2)),
+                     0),
+             DAG.getConstant(1, dl, MVT::i32), DAG.getConstant(0, dl, MVT::i32),
+             DAG.getTargetConstant(Pred, dl, MVT::i32)}),
+        0);
+  }
+  case Intrinsic::ppc_test_data_class: {
+    EVT OpVT = Op.getOperand(1).getValueType();
+    unsigned CmprOpc = OpVT == MVT::f128 ? PPC::XSTSTDCQP
+                                         : (OpVT == MVT::f64 ? PPC::XSTSTDCDP
+                                                             : PPC::XSTSTDCSP);
+    return SDValue(
+        DAG.getMachineNode(
+            PPC::SELECT_CC_I4, dl, MVT::i32,
+            {SDValue(DAG.getMachineNode(CmprOpc, dl, MVT::i32, Op.getOperand(2),
+                                        Op.getOperand(1)),
+                     0),
+             DAG.getConstant(1, dl, MVT::i32), DAG.getConstant(0, dl, MVT::i32),
+             DAG.getTargetConstant(PPC::PRED_EQ, dl, MVT::i32)}),
+        0);
+  }
+  case Intrinsic::ppc_fnmsub: {
+    EVT VT = Op.getOperand(1).getValueType();
+    if (!Subtarget.hasVSX() || (!Subtarget.hasFloat128() && VT == MVT::f128))
+      return DAG.getNode(
+          ISD::FNEG, dl, VT,
+          DAG.getNode(ISD::FMA, dl, VT, Op.getOperand(1), Op.getOperand(2),
+                      DAG.getNode(ISD::FNEG, dl, VT, Op.getOperand(3))));
+    return DAG.getNode(PPCISD::FNMSUB, dl, VT, Op.getOperand(1),
+                       Op.getOperand(2), Op.getOperand(3));
+  }
+  case Intrinsic::ppc_convert_f128_to_ppcf128:
+  case Intrinsic::ppc_convert_ppcf128_to_f128: {
+    RTLIB::Libcall LC = IntrinsicID == Intrinsic::ppc_convert_ppcf128_to_f128
+                            ? RTLIB::CONVERT_PPCF128_F128
+                            : RTLIB::CONVERT_F128_PPCF128;
+    MakeLibCallOptions CallOptions;
+    std::pair<SDValue, SDValue> Result =
+        makeLibCall(DAG, LC, Op.getValueType(), Op.getOperand(1), CallOptions,
+                    dl, SDValue());
+    return Result.first;
+  }
+  case Intrinsic::ppc_maxfe:
+  case Intrinsic::ppc_maxfl:
+  case Intrinsic::ppc_maxfs:
+  case Intrinsic::ppc_minfe:
+  case Intrinsic::ppc_minfl:
+  case Intrinsic::ppc_minfs: {
+    EVT VT = Op.getValueType();
+    assert(
+        all_of(Op->ops().drop_front(4),
+               [VT](const SDUse &Use) { return Use.getValueType() == VT; }) &&
+        "ppc_[max|min]f[e|l|s] must have uniform type arguments");
+    (void)VT;
+    ISD::CondCode CC = ISD::SETGT;
+    if (IntrinsicID == Intrinsic::ppc_minfe ||
+        IntrinsicID == Intrinsic::ppc_minfl ||
+        IntrinsicID == Intrinsic::ppc_minfs)
+      CC = ISD::SETLT;
+    unsigned I = Op.getNumOperands() - 2, Cnt = I;
+    SDValue Res = Op.getOperand(I);
+    for (--I; Cnt != 0; --Cnt, I = (--I == 0 ? (Op.getNumOperands() - 1) : I)) {
+      Res =
+          DAG.getSelectCC(dl, Res, Op.getOperand(I), Res, Op.getOperand(I), CC);
+    }
+    return Res;
+  }
   }
 
   // If this is a lowered altivec predicate compare, CompareOpc is set to the
@@ -10443,11 +10829,18 @@ SDValue PPCTargetLowering::LowerINTRINSIC_VOID(SDValue Op,
   case Intrinsic::ppc_cfence: {
     assert(ArgStart == 1 && "llvm.ppc.cfence must carry a chain argument.");
     assert(Subtarget.isPPC64() && "Only 64-bit is supported for now.");
-    return SDValue(DAG.getMachineNode(PPC::CFENCE8, DL, MVT::Other,
-                                      DAG.getNode(ISD::ANY_EXTEND, DL, MVT::i64,
-                                                  Op.getOperand(ArgStart + 1)),
-                                      Op.getOperand(0)),
-                   0);
+    SDValue Val = Op.getOperand(ArgStart + 1);
+    EVT Ty = Val.getValueType();
+    if (Ty == MVT::i128) {
+      // FIXME: Testing one of two paired registers is sufficient to guarantee
+      // ordering?
+      Val = DAG.getNode(ISD::TRUNCATE, DL, MVT::i64, Val);
+    }
+    return SDValue(
+        DAG.getMachineNode(PPC::CFENCE8, DL, MVT::Other,
+                           DAG.getNode(ISD::ANY_EXTEND, DL, MVT::i64, Val),
+                           Op.getOperand(0)),
+        0);
   }
   default:
     break;
@@ -10510,6 +10903,59 @@ SDValue PPCTargetLowering::LowerATOMIC_CMP_SWAP(SDValue Op,
   return DAG.getMemIntrinsicNode(NodeTy, dl, Tys, Ops, MemVT, MMO);
 }
 
+SDValue PPCTargetLowering::LowerATOMIC_LOAD_STORE(SDValue Op,
+                                                  SelectionDAG &DAG) const {
+  AtomicSDNode *N = cast<AtomicSDNode>(Op.getNode());
+  EVT MemVT = N->getMemoryVT();
+  assert(MemVT.getSimpleVT() == MVT::i128 &&
+         "Expect quadword atomic operations");
+  SDLoc dl(N);
+  unsigned Opc = N->getOpcode();
+  switch (Opc) {
+  case ISD::ATOMIC_LOAD: {
+    // Lower quadword atomic load to int_ppc_atomic_load_i128 which will be
+    // lowered to ppc instructions by pattern matching instruction selector.
+    SDVTList Tys = DAG.getVTList(MVT::i64, MVT::i64, MVT::Other);
+    SmallVector<SDValue, 4> Ops{
+        N->getOperand(0),
+        DAG.getConstant(Intrinsic::ppc_atomic_load_i128, dl, MVT::i32)};
+    for (int I = 1, E = N->getNumOperands(); I < E; ++I)
+      Ops.push_back(N->getOperand(I));
+    SDValue LoadedVal = DAG.getMemIntrinsicNode(ISD::INTRINSIC_W_CHAIN, dl, Tys,
+                                                Ops, MemVT, N->getMemOperand());
+    SDValue ValLo = DAG.getNode(ISD::ZERO_EXTEND, dl, MVT::i128, LoadedVal);
+    SDValue ValHi =
+        DAG.getNode(ISD::ZERO_EXTEND, dl, MVT::i128, LoadedVal.getValue(1));
+    ValHi = DAG.getNode(ISD::SHL, dl, MVT::i128, ValHi,
+                        DAG.getConstant(64, dl, MVT::i32));
+    SDValue Val =
+        DAG.getNode(ISD::OR, dl, {MVT::i128, MVT::Other}, {ValLo, ValHi});
+    return DAG.getNode(ISD::MERGE_VALUES, dl, {MVT::i128, MVT::Other},
+                       {Val, LoadedVal.getValue(2)});
+  }
+  case ISD::ATOMIC_STORE: {
+    // Lower quadword atomic store to int_ppc_atomic_store_i128 which will be
+    // lowered to ppc instructions by pattern matching instruction selector.
+    SDVTList Tys = DAG.getVTList(MVT::Other);
+    SmallVector<SDValue, 4> Ops{
+        N->getOperand(0),
+        DAG.getConstant(Intrinsic::ppc_atomic_store_i128, dl, MVT::i32)};
+    SDValue Val = N->getOperand(2);
+    SDValue ValLo = DAG.getNode(ISD::TRUNCATE, dl, MVT::i64, Val);
+    SDValue ValHi = DAG.getNode(ISD::SRL, dl, MVT::i128, Val,
+                                DAG.getConstant(64, dl, MVT::i32));
+    ValHi = DAG.getNode(ISD::TRUNCATE, dl, MVT::i64, ValHi);
+    Ops.push_back(ValLo);
+    Ops.push_back(ValHi);
+    Ops.push_back(N->getOperand(1));
+    return DAG.getMemIntrinsicNode(ISD::INTRINSIC_VOID, dl, Tys, Ops, MemVT,
+                                   N->getMemOperand());
+  }
+  default:
+    llvm_unreachable("Unexpected atomic opcode");
+  }
+}
+
 SDValue PPCTargetLowering::LowerSCALAR_TO_VECTOR(SDValue Op,
                                                  SelectionDAG &DAG) const {
   SDLoc dl(Op);
@@ -10537,27 +10983,38 @@ SDValue PPCTargetLowering::LowerINSERT_VECTOR_ELT(SDValue Op,
   SDLoc dl(Op);
   SDValue V1 = Op.getOperand(0);
   SDValue V2 = Op.getOperand(1);
-  SDValue V3 = Op.getOperand(2);
 
   if (VT == MVT::v2f64 && C)
     return Op;
 
+  if (Subtarget.hasP9Vector()) {
+    // A f32 load feeding into a v4f32 insert_vector_elt is handled in this way
+    // because on P10, it allows this specific insert_vector_elt load pattern to
+    // utilize the refactored load and store infrastructure in order to exploit
+    // prefixed loads.
+    // On targets with inexpensive direct moves (Power9 and up), a
+    // (insert_vector_elt v4f32:$vec, (f32 load)) is always better as an integer
+    // load since a single precision load will involve conversion to double
+    // precision on the load followed by another conversion to single precision.
+    if ((VT == MVT::v4f32) && (V2.getValueType() == MVT::f32) &&
+        (isa<LoadSDNode>(V2))) {
+      SDValue BitcastVector = DAG.getBitcast(MVT::v4i32, V1);
+      SDValue BitcastLoad = DAG.getBitcast(MVT::i32, V2);
+      SDValue InsVecElt =
+          DAG.getNode(ISD::INSERT_VECTOR_ELT, dl, MVT::v4i32, BitcastVector,
+                      BitcastLoad, Op.getOperand(2));
+      return DAG.getBitcast(MVT::v4f32, InsVecElt);
+    }
+  }
+
   if (Subtarget.isISA3_1()) {
     if ((VT == MVT::v2i64 || VT == MVT::v2f64) && !Subtarget.isPPC64())
       return SDValue();
     // On P10, we have legal lowering for constant and variable indices for
-    // integer vectors.
+    // all vectors.
     if (VT == MVT::v16i8 || VT == MVT::v8i16 || VT == MVT::v4i32 ||
-        VT == MVT::v2i64)
-      return DAG.getNode(PPCISD::VECINSERT, dl, VT, V1, V2, V3);
-    // For f32 and f64 vectors, we have legal lowering for variable indices.
-    // For f32 we also have legal lowering when the element is loaded from
-    // memory.
-    if (VT == MVT::v4f32 || VT == MVT::v2f64) {
-      if (!C || (VT == MVT::v4f32 && dyn_cast<LoadSDNode>(V2)))
-        return DAG.getNode(PPCISD::VECINSERT, dl, VT, V1, V2, V3);
+        VT == MVT::v2i64 || VT == MVT::v4f32 || VT == MVT::v2f64)
       return Op;
-    }
   }
 
   // Before P10, we have legal lowering for constant indices but not for
@@ -10632,6 +11089,7 @@ SDValue PPCTargetLowering::LowerVectorStore(SDValue Op,
   SDValue StoreChain = SN->getChain();
   SDValue BasePtr = SN->getBasePtr();
   SDValue Value = SN->getValue();
+  SDValue Value2 = SN->getValue();
   EVT StoreVT = Value.getValueType();
 
   if (StoreVT != MVT::v256i1 && StoreVT != MVT::v512i1)
@@ -10648,13 +11106,29 @@ SDValue PPCTargetLowering::LowerVectorStore(SDValue Op,
   SmallVector<SDValue, 4> Stores;
   unsigned NumVecs = 2;
   if (StoreVT == MVT::v512i1) {
-    Value = DAG.getNode(PPCISD::XXMFACC, dl, MVT::v512i1, Value);
+    if (Subtarget.isISAFuture()) {
+      EVT ReturnTypes[] = {MVT::v256i1, MVT::v256i1};
+      MachineSDNode *ExtNode = DAG.getMachineNode(
+          PPC::DMXXEXTFDMR512, dl, ArrayRef(ReturnTypes, 2), Op.getOperand(1));
+
+      Value = SDValue(ExtNode, 0);
+      Value2 = SDValue(ExtNode, 1);
+    } else
+      Value = DAG.getNode(PPCISD::XXMFACC, dl, MVT::v512i1, Value);
     NumVecs = 4;
   }
   for (unsigned Idx = 0; Idx < NumVecs; ++Idx) {
     unsigned VecNum = Subtarget.isLittleEndian() ? NumVecs - 1 - Idx : Idx;
-    SDValue Elt = DAG.getNode(PPCISD::EXTRACT_VSX_REG, dl, MVT::v16i8, Value,
-                              DAG.getConstant(VecNum, dl, getPointerTy(DAG.getDataLayout())));
+    SDValue Elt;
+    if (Subtarget.isISAFuture()) {
+      VecNum = Subtarget.isLittleEndian() ? 1 - (Idx % 2) : (Idx % 2);
+      Elt = DAG.getNode(PPCISD::EXTRACT_VSX_REG, dl, MVT::v16i8,
+                        Idx > 1 ? Value2 : Value,
+                        DAG.getConstant(VecNum, dl, getPointerTy(DAG.getDataLayout())));
+    } else
+      Elt = DAG.getNode(PPCISD::EXTRACT_VSX_REG, dl, MVT::v16i8, Value,
+                        DAG.getConstant(VecNum, dl, getPointerTy(DAG.getDataLayout())));
+
     SDValue Store =
         DAG.getStore(StoreChain, dl, Elt, BasePtr,
                      SN->getPointerInfo().getWithOffset(Idx * 16),
@@ -10823,6 +11297,12 @@ SDValue PPCTargetLowering::LowerFP_EXTEND(SDValue Op, SelectionDAG &DAG) const {
 SDValue PPCTargetLowering::LowerOperation(SDValue Op, SelectionDAG &DAG) const {
   switch (Op.getOpcode()) {
   default: llvm_unreachable("Wasn't expecting to be able to lower this!");
+  case ISD::FPOW:               return lowerPow(Op, DAG);
+  case ISD::FSIN:               return lowerSin(Op, DAG);
+  case ISD::FCOS:               return lowerCos(Op, DAG);
+  case ISD::FLOG:               return lowerLog(Op, DAG);
+  case ISD::FLOG10:             return lowerLog10(Op, DAG);
+  case ISD::FEXP:               return lowerExp(Op, DAG);
   case ISD::ConstantPool:       return LowerConstantPool(Op, DAG);
   case ISD::BlockAddress:       return LowerBlockAddress(Op, DAG);
   case ISD::GlobalAddress:      return LowerGlobalAddress(Op, DAG);
@@ -10863,7 +11343,7 @@ SDValue PPCTargetLowering::LowerOperation(SDValue Op, SelectionDAG &DAG) const {
   case ISD::STRICT_SINT_TO_FP:
   case ISD::UINT_TO_FP:
   case ISD::SINT_TO_FP:         return LowerINT_TO_FP(Op, DAG);
-  case ISD::FLT_ROUNDS_:        return LowerFLT_ROUNDS_(Op, DAG);
+  case ISD::GET_ROUNDING:       return LowerGET_ROUNDING(Op, DAG);
 
   // Lower 64-bit shifts.
   case ISD::SHL_PARTS:          return LowerSHL_PARTS(Op, DAG);
@@ -10901,6 +11381,8 @@ SDValue PPCTargetLowering::LowerOperation(SDValue Op, SelectionDAG &DAG) const {
     return LowerBSWAP(Op, DAG);
   case ISD::ATOMIC_CMP_SWAP:
     return LowerATOMIC_CMP_SWAP(Op, DAG);
+  case ISD::ATOMIC_STORE:
+    return LowerATOMIC_LOAD_STORE(Op, DAG);
   }
 }
 
@@ -10911,6 +11393,12 @@ void PPCTargetLowering::ReplaceNodeResults(SDNode *N,
   switch (N->getOpcode()) {
   default:
     llvm_unreachable("Do not know how to custom type legalize this operation!");
+  case ISD::ATOMIC_LOAD: {
+    SDValue Res = LowerATOMIC_LOAD_STORE(SDValue(N, 0), DAG);
+    Results.push_back(Res);
+    Results.push_back(Res.getValue(1));
+    break;
+  }
   case ISD::READCYCLECOUNTER: {
     SDVTList VTs = DAG.getVTList(MVT::i32, MVT::i32, MVT::Other);
     SDValue RTB = DAG.getNode(PPCISD::READ_TIME_BASE, dl, VTs, N->getOperand(0));
@@ -10937,6 +11425,21 @@ void PPCTargetLowering::ReplaceNodeResults(SDNode *N,
     Results.push_back(NewInt.getValue(1));
     break;
   }
+  case ISD::INTRINSIC_WO_CHAIN: {
+    switch (cast<ConstantSDNode>(N->getOperand(0))->getZExtValue()) {
+    case Intrinsic::ppc_pack_longdouble:
+      Results.push_back(DAG.getNode(ISD::BUILD_PAIR, dl, MVT::ppcf128,
+                                    N->getOperand(2), N->getOperand(1)));
+      break;
+    case Intrinsic::ppc_maxfe:
+    case Intrinsic::ppc_minfe:
+    case Intrinsic::ppc_fnmsub:
+    case Intrinsic::ppc_convert_f128_to_ppcf128:
+      Results.push_back(LowerINTRINSIC_WO_CHAIN(SDValue(N, 0), DAG));
+      break;
+    }
+    break;
+  }
   case ISD::VAARG: {
     if (!Subtarget.isSVR4ABI() || Subtarget.isPPC64())
       return;
@@ -10954,13 +11457,17 @@ void PPCTargetLowering::ReplaceNodeResults(SDNode *N,
   case ISD::STRICT_FP_TO_SINT:
   case ISD::STRICT_FP_TO_UINT:
   case ISD::FP_TO_SINT:
-  case ISD::FP_TO_UINT:
+  case ISD::FP_TO_UINT: {
     // LowerFP_TO_INT() can only handle f32 and f64.
     if (N->getOperand(N->isStrictFPOpcode() ? 1 : 0).getValueType() ==
         MVT::ppcf128)
       return;
-    Results.push_back(LowerFP_TO_INT(SDValue(N, 0), DAG, dl));
+    SDValue LoweredValue = LowerFP_TO_INT(SDValue(N, 0), DAG, dl);
+    Results.push_back(LoweredValue);
+    if (N->isStrictFPOpcode())
+      Results.push_back(LoweredValue.getValue(1));
     return;
+  }
   case ISD::TRUNCATE: {
     if (!N->getValueType(0).isVector())
       return;
@@ -11101,7 +11608,7 @@ PPCTargetLowering::EmitAtomicBinary(MachineInstr &MI, MachineBasicBlock *BB,
   // For max/min...
   //  loopMBB:
   //   l[wd]arx dest, ptr
-  //   cmpl?[wd] incr, dest
+  //   cmpl?[wd] dest, incr
   //   bgt exitMBB
   //  loop2MBB:
   //   st[wd]cx. dest, ptr
@@ -11114,19 +11621,20 @@ PPCTargetLowering::EmitAtomicBinary(MachineInstr &MI, MachineBasicBlock *BB,
   if (BinOpcode)
     BuildMI(BB, dl, TII->get(BinOpcode), TmpReg).addReg(incr).addReg(dest);
   if (CmpOpcode) {
+    Register CrReg = RegInfo.createVirtualRegister(&PPC::CRRCRegClass);
     // Signed comparisons of byte or halfword values must be sign-extended.
     if (CmpOpcode == PPC::CMPW && AtomicSize < 4) {
       Register ExtReg = RegInfo.createVirtualRegister(&PPC::GPRCRegClass);
       BuildMI(BB, dl, TII->get(AtomicSize == 1 ? PPC::EXTSB : PPC::EXTSH),
               ExtReg).addReg(dest);
-      BuildMI(BB, dl, TII->get(CmpOpcode), PPC::CR0)
-        .addReg(incr).addReg(ExtReg);
+      BuildMI(BB, dl, TII->get(CmpOpcode), CrReg).addReg(ExtReg).addReg(incr);
     } else
-      BuildMI(BB, dl, TII->get(CmpOpcode), PPC::CR0)
-        .addReg(incr).addReg(dest);
+      BuildMI(BB, dl, TII->get(CmpOpcode), CrReg).addReg(dest).addReg(incr);
 
     BuildMI(BB, dl, TII->get(PPC::BCC))
-      .addImm(CmpPred).addReg(PPC::CR0).addMBB(exitMBB);
+        .addImm(CmpPred)
+        .addReg(CrReg)
+        .addMBB(exitMBB);
     BB->addSuccessor(loop2MBB);
     BB->addSuccessor(exitMBB);
     BB = loop2MBB;
@@ -11149,7 +11657,8 @@ static bool isSignExtended(MachineInstr &MI, const PPCInstrInfo *TII) {
   default:
     return false;
   case PPC::COPY:
-    return TII->isSignExtended(MI);
+    return TII->isSignExtended(MI.getOperand(1).getReg(),
+                               &MI.getMF()->getRegInfo());
   case PPC::LHA:
   case PPC::LHA8:
   case PPC::LHAU:
@@ -11212,8 +11721,8 @@ MachineBasicBlock *PPCTargetLowering::EmitPartwordAtomicBinary(
   MachineFunction *F = BB->getParent();
   MachineRegisterInfo &RegInfo = F->getRegInfo();
   Register incr = MI.getOperand(3).getReg();
-  bool IsSignExtended = Register::isVirtualRegister(incr) &&
-    isSignExtended(*RegInfo.getVRegDef(incr), TII);
+  bool IsSignExtended =
+      incr.isVirtual() && isSignExtended(*RegInfo.getVRegDef(incr), TII);
 
   if (CmpOpcode == PPC::CMPW && !IsSignExtended) {
     Register ValueReg = RegInfo.createVirtualRegister(&PPC::GPRCRegClass);
@@ -11358,6 +11867,7 @@ MachineBasicBlock *PPCTargetLowering::EmitPartwordAtomicBinary(
     // For unsigned comparisons, we can directly compare the shifted values.
     // For signed comparisons we shift and sign extend.
     Register SReg = RegInfo.createVirtualRegister(GPRC);
+    Register CrReg = RegInfo.createVirtualRegister(&PPC::CRRCRegClass);
     BuildMI(BB, dl, TII->get(PPC::AND), SReg)
         .addReg(TmpDestReg)
         .addReg(MaskReg);
@@ -11374,12 +11884,10 @@ MachineBasicBlock *PPCTargetLowering::EmitPartwordAtomicBinary(
       ValueReg = ValueSReg;
       CmpReg = incr;
     }
-    BuildMI(BB, dl, TII->get(CmpOpcode), PPC::CR0)
-        .addReg(CmpReg)
-        .addReg(ValueReg);
+    BuildMI(BB, dl, TII->get(CmpOpcode), CrReg).addReg(ValueReg).addReg(CmpReg);
     BuildMI(BB, dl, TII->get(PPC::BCC))
         .addImm(CmpPred)
-        .addReg(PPC::CR0)
+        .addReg(CrReg)
         .addMBB(exitMBB);
     BB->addSuccessor(loop2MBB);
     BB->addSuccessor(exitMBB);
@@ -11657,7 +12165,7 @@ PPCTargetLowering::emitEHSjLjLongJmp(MachineInstr &MI,
   return MBB;
 }
 
-bool PPCTargetLowering::hasInlineStackProbe(MachineFunction &MF) const {
+bool PPCTargetLowering::hasInlineStackProbe(const MachineFunction &MF) const {
   // If the function specifically requests inline stack probes, emit them.
   if (MF.getFunction().hasFnAttribute("probe-stack"))
     return MF.getFunction().getFnAttribute("probe-stack").getValueAsString() ==
@@ -11665,19 +12173,16 @@ bool PPCTargetLowering::hasInlineStackProbe(MachineFunction &MF) const {
   return false;
 }
 
-unsigned PPCTargetLowering::getStackProbeSize(MachineFunction &MF) const {
+unsigned PPCTargetLowering::getStackProbeSize(const MachineFunction &MF) const {
   const TargetFrameLowering *TFI = Subtarget.getFrameLowering();
   unsigned StackAlign = TFI->getStackAlignment();
   assert(StackAlign >= 1 && isPowerOf2_32(StackAlign) &&
          "Unexpected stack alignment");
   // The default stack probe size is 4096 if the function has no
   // stack-probe-size attribute.
-  unsigned StackProbeSize = 4096;
   const Function &Fn = MF.getFunction();
-  if (Fn.hasFnAttribute("stack-probe-size"))
-    Fn.getFnAttribute("stack-probe-size")
-        .getValueAsString()
-        .getAsInteger(0, StackProbeSize);
+  unsigned StackProbeSize =
+      Fn.getFnAttributeAsParsedInteger("stack-probe-size", 4096);
   // Round down to the stack alignment.
   StackProbeSize &= ~(StackAlign - 1);
   return StackProbeSize ? StackProbeSize : StackAlign;
@@ -11886,6 +12391,7 @@ PPCTargetLowering::EmitInstrWithCustomInserter(MachineInstr &MI,
   MachineFunction::iterator It = ++BB->getIterator();
 
   MachineFunction *F = BB->getParent();
+  MachineRegisterInfo &MRI = F->getRegInfo();
 
   if (MI.getOpcode() == PPC::SELECT_CC_I4 ||
       MI.getOpcode() == PPC::SELECT_CC_I8 || MI.getOpcode() == PPC::SELECT_I4 ||
@@ -12085,40 +12591,40 @@ PPCTargetLowering::EmitInstrWithCustomInserter(MachineInstr &MI,
     BB = EmitAtomicBinary(MI, BB, 8, PPC::SUBF8);
 
   else if (MI.getOpcode() == PPC::ATOMIC_LOAD_MIN_I8)
-    BB = EmitPartwordAtomicBinary(MI, BB, true, 0, PPC::CMPW, PPC::PRED_GE);
+    BB = EmitPartwordAtomicBinary(MI, BB, true, 0, PPC::CMPW, PPC::PRED_LT);
   else if (MI.getOpcode() == PPC::ATOMIC_LOAD_MIN_I16)
-    BB = EmitPartwordAtomicBinary(MI, BB, false, 0, PPC::CMPW, PPC::PRED_GE);
+    BB = EmitPartwordAtomicBinary(MI, BB, false, 0, PPC::CMPW, PPC::PRED_LT);
   else if (MI.getOpcode() == PPC::ATOMIC_LOAD_MIN_I32)
-    BB = EmitAtomicBinary(MI, BB, 4, 0, PPC::CMPW, PPC::PRED_GE);
+    BB = EmitAtomicBinary(MI, BB, 4, 0, PPC::CMPW, PPC::PRED_LT);
   else if (MI.getOpcode() == PPC::ATOMIC_LOAD_MIN_I64)
-    BB = EmitAtomicBinary(MI, BB, 8, 0, PPC::CMPD, PPC::PRED_GE);
+    BB = EmitAtomicBinary(MI, BB, 8, 0, PPC::CMPD, PPC::PRED_LT);
 
   else if (MI.getOpcode() == PPC::ATOMIC_LOAD_MAX_I8)
-    BB = EmitPartwordAtomicBinary(MI, BB, true, 0, PPC::CMPW, PPC::PRED_LE);
+    BB = EmitPartwordAtomicBinary(MI, BB, true, 0, PPC::CMPW, PPC::PRED_GT);
   else if (MI.getOpcode() == PPC::ATOMIC_LOAD_MAX_I16)
-    BB = EmitPartwordAtomicBinary(MI, BB, false, 0, PPC::CMPW, PPC::PRED_LE);
+    BB = EmitPartwordAtomicBinary(MI, BB, false, 0, PPC::CMPW, PPC::PRED_GT);
   else if (MI.getOpcode() == PPC::ATOMIC_LOAD_MAX_I32)
-    BB = EmitAtomicBinary(MI, BB, 4, 0, PPC::CMPW, PPC::PRED_LE);
+    BB = EmitAtomicBinary(MI, BB, 4, 0, PPC::CMPW, PPC::PRED_GT);
   else if (MI.getOpcode() == PPC::ATOMIC_LOAD_MAX_I64)
-    BB = EmitAtomicBinary(MI, BB, 8, 0, PPC::CMPD, PPC::PRED_LE);
+    BB = EmitAtomicBinary(MI, BB, 8, 0, PPC::CMPD, PPC::PRED_GT);
 
   else if (MI.getOpcode() == PPC::ATOMIC_LOAD_UMIN_I8)
-    BB = EmitPartwordAtomicBinary(MI, BB, true, 0, PPC::CMPLW, PPC::PRED_GE);
+    BB = EmitPartwordAtomicBinary(MI, BB, true, 0, PPC::CMPLW, PPC::PRED_LT);
   else if (MI.getOpcode() == PPC::ATOMIC_LOAD_UMIN_I16)
-    BB = EmitPartwordAtomicBinary(MI, BB, false, 0, PPC::CMPLW, PPC::PRED_GE);
+    BB = EmitPartwordAtomicBinary(MI, BB, false, 0, PPC::CMPLW, PPC::PRED_LT);
   else if (MI.getOpcode() == PPC::ATOMIC_LOAD_UMIN_I32)
-    BB = EmitAtomicBinary(MI, BB, 4, 0, PPC::CMPLW, PPC::PRED_GE);
+    BB = EmitAtomicBinary(MI, BB, 4, 0, PPC::CMPLW, PPC::PRED_LT);
   else if (MI.getOpcode() == PPC::ATOMIC_LOAD_UMIN_I64)
-    BB = EmitAtomicBinary(MI, BB, 8, 0, PPC::CMPLD, PPC::PRED_GE);
+    BB = EmitAtomicBinary(MI, BB, 8, 0, PPC::CMPLD, PPC::PRED_LT);
 
   else if (MI.getOpcode() == PPC::ATOMIC_LOAD_UMAX_I8)
-    BB = EmitPartwordAtomicBinary(MI, BB, true, 0, PPC::CMPLW, PPC::PRED_LE);
+    BB = EmitPartwordAtomicBinary(MI, BB, true, 0, PPC::CMPLW, PPC::PRED_GT);
   else if (MI.getOpcode() == PPC::ATOMIC_LOAD_UMAX_I16)
-    BB = EmitPartwordAtomicBinary(MI, BB, false, 0, PPC::CMPLW, PPC::PRED_LE);
+    BB = EmitPartwordAtomicBinary(MI, BB, false, 0, PPC::CMPLW, PPC::PRED_GT);
   else if (MI.getOpcode() == PPC::ATOMIC_LOAD_UMAX_I32)
-    BB = EmitAtomicBinary(MI, BB, 4, 0, PPC::CMPLW, PPC::PRED_LE);
+    BB = EmitAtomicBinary(MI, BB, 4, 0, PPC::CMPLW, PPC::PRED_GT);
   else if (MI.getOpcode() == PPC::ATOMIC_LOAD_UMAX_I64)
-    BB = EmitAtomicBinary(MI, BB, 8, 0, PPC::CMPLD, PPC::PRED_LE);
+    BB = EmitAtomicBinary(MI, BB, 8, 0, PPC::CMPLD, PPC::PRED_GT);
 
   else if (MI.getOpcode() == PPC::ATOMIC_SWAP_I8)
     BB = EmitPartwordAtomicBinary(MI, BB, true, 0);
@@ -12160,20 +12666,20 @@ PPCTargetLowering::EmitInstrWithCustomInserter(MachineInstr &MI,
       StoreMnemonic = PPC::STDCX;
       break;
     }
+    MachineRegisterInfo &RegInfo = F->getRegInfo();
     Register dest = MI.getOperand(0).getReg();
     Register ptrA = MI.getOperand(1).getReg();
     Register ptrB = MI.getOperand(2).getReg();
+    Register CrReg = RegInfo.createVirtualRegister(&PPC::CRRCRegClass);
     Register oldval = MI.getOperand(3).getReg();
     Register newval = MI.getOperand(4).getReg();
     DebugLoc dl = MI.getDebugLoc();
 
     MachineBasicBlock *loop1MBB = F->CreateMachineBasicBlock(LLVM_BB);
     MachineBasicBlock *loop2MBB = F->CreateMachineBasicBlock(LLVM_BB);
-    MachineBasicBlock *midMBB = F->CreateMachineBasicBlock(LLVM_BB);
     MachineBasicBlock *exitMBB = F->CreateMachineBasicBlock(LLVM_BB);
     F->insert(It, loop1MBB);
     F->insert(It, loop2MBB);
-    F->insert(It, midMBB);
     F->insert(It, exitMBB);
     exitMBB->splice(exitMBB->begin(), BB,
                     std::next(MachineBasicBlock::iterator(MI)), BB->end());
@@ -12187,25 +12693,23 @@ PPCTargetLowering::EmitInstrWithCustomInserter(MachineInstr &MI,
     // loop1MBB:
     //   l[bhwd]arx dest, ptr
     //   cmp[wd] dest, oldval
-    //   bne- midMBB
+    //   bne- exitBB
     // loop2MBB:
     //   st[bhwd]cx. newval, ptr
     //   bne- loopMBB
     //   b exitBB
-    // midMBB:
-    //   st[bhwd]cx. dest, ptr
     // exitBB:
     BB = loop1MBB;
     BuildMI(BB, dl, TII->get(LoadMnemonic), dest).addReg(ptrA).addReg(ptrB);
-    BuildMI(BB, dl, TII->get(is64bit ? PPC::CMPD : PPC::CMPW), PPC::CR0)
-        .addReg(oldval)
-        .addReg(dest);
+    BuildMI(BB, dl, TII->get(is64bit ? PPC::CMPD : PPC::CMPW), CrReg)
+        .addReg(dest)
+        .addReg(oldval);
     BuildMI(BB, dl, TII->get(PPC::BCC))
         .addImm(PPC::PRED_NE)
-        .addReg(PPC::CR0)
-        .addMBB(midMBB);
+        .addReg(CrReg)
+        .addMBB(exitMBB);
     BB->addSuccessor(loop2MBB);
-    BB->addSuccessor(midMBB);
+    BB->addSuccessor(exitMBB);
 
     BB = loop2MBB;
     BuildMI(BB, dl, TII->get(StoreMnemonic))
@@ -12220,13 +12724,6 @@ PPCTargetLowering::EmitInstrWithCustomInserter(MachineInstr &MI,
     BB->addSuccessor(loop1MBB);
     BB->addSuccessor(exitMBB);
 
-    BB = midMBB;
-    BuildMI(BB, dl, TII->get(StoreMnemonic))
-        .addReg(dest)
-        .addReg(ptrA)
-        .addReg(ptrB);
-    BB->addSuccessor(exitMBB);
-
     //  exitMBB:
     //   ...
     BB = exitMBB;
@@ -12248,11 +12745,9 @@ PPCTargetLowering::EmitInstrWithCustomInserter(MachineInstr &MI,
 
     MachineBasicBlock *loop1MBB = F->CreateMachineBasicBlock(LLVM_BB);
     MachineBasicBlock *loop2MBB = F->CreateMachineBasicBlock(LLVM_BB);
-    MachineBasicBlock *midMBB = F->CreateMachineBasicBlock(LLVM_BB);
     MachineBasicBlock *exitMBB = F->CreateMachineBasicBlock(LLVM_BB);
     F->insert(It, loop1MBB);
     F->insert(It, loop2MBB);
-    F->insert(It, midMBB);
     F->insert(It, exitMBB);
     exitMBB->splice(exitMBB->begin(), BB,
                     std::next(MachineBasicBlock::iterator(MI)), BB->end());
@@ -12280,6 +12775,7 @@ PPCTargetLowering::EmitInstrWithCustomInserter(MachineInstr &MI,
     Register Ptr1Reg;
     Register TmpReg = RegInfo.createVirtualRegister(GPRC);
     Register ZeroReg = is64bit ? PPC::ZERO8 : PPC::ZERO;
+    Register CrReg = RegInfo.createVirtualRegister(&PPC::CRRCRegClass);
     //  thisMBB:
     //   ...
     //   fallthrough --> loopMBB
@@ -12301,15 +12797,13 @@ PPCTargetLowering::EmitInstrWithCustomInserter(MachineInstr &MI,
     //   lwarx tmpDest, ptr
     //   and tmp, tmpDest, mask
     //   cmpw tmp, oldval3
-    //   bne- midMBB
+    //   bne- exitBB
     // loop2MBB:
     //   andc tmp2, tmpDest, mask
     //   or tmp4, tmp2, newval3
     //   stwcx. tmp4, ptr
     //   bne- loop1MBB
     //   b exitBB
-    // midMBB:
-    //   stwcx. tmpDest, ptr
     // exitBB:
     //   srw dest, tmpDest, shift
     if (ptrA != ZeroReg) {
@@ -12374,15 +12868,15 @@ PPCTargetLowering::EmitInstrWithCustomInserter(MachineInstr &MI,
     BuildMI(BB, dl, TII->get(PPC::AND), TmpReg)
         .addReg(TmpDestReg)
         .addReg(MaskReg);
-    BuildMI(BB, dl, TII->get(PPC::CMPW), PPC::CR0)
+    BuildMI(BB, dl, TII->get(PPC::CMPW), CrReg)
         .addReg(TmpReg)
         .addReg(OldVal3Reg);
     BuildMI(BB, dl, TII->get(PPC::BCC))
         .addImm(PPC::PRED_NE)
-        .addReg(PPC::CR0)
-        .addMBB(midMBB);
+        .addReg(CrReg)
+        .addMBB(exitMBB);
     BB->addSuccessor(loop2MBB);
-    BB->addSuccessor(midMBB);
+    BB->addSuccessor(exitMBB);
 
     BB = loop2MBB;
     BuildMI(BB, dl, TII->get(PPC::ANDC), Tmp2Reg)
@@ -12403,13 +12897,6 @@ PPCTargetLowering::EmitInstrWithCustomInserter(MachineInstr &MI,
     BB->addSuccessor(loop1MBB);
     BB->addSuccessor(exitMBB);
 
-    BB = midMBB;
-    BuildMI(BB, dl, TII->get(PPC::STWCX))
-        .addReg(TmpDestReg)
-        .addReg(ZeroReg)
-        .addReg(PtrReg);
-    BB->addSuccessor(exitMBB);
-
     //  exitMBB:
     //   ...
     BB = exitMBB;
@@ -12491,7 +12978,10 @@ PPCTargetLowering::EmitInstrWithCustomInserter(MachineInstr &MI,
     Register OldFPSCRReg = MI.getOperand(0).getReg();
 
     // Save FPSCR value.
-    BuildMI(*BB, MI, dl, TII->get(PPC::MFFS), OldFPSCRReg);
+    if (MRI.use_empty(OldFPSCRReg))
+      BuildMI(*BB, MI, dl, TII->get(TargetOpcode::IMPLICIT_DEF), OldFPSCRReg);
+    else
+      BuildMI(*BB, MI, dl, TII->get(PPC::MFFS), OldFPSCRReg);
 
     // The floating point rounding mode is in the bits 62:63 of FPCSR, and has
     // the following settings:
@@ -12624,7 +13114,10 @@ PPCTargetLowering::EmitInstrWithCustomInserter(MachineInstr &MI,
 
     // Result of setflm is previous FPSCR content, so we need to save it first.
     Register OldFPSCRReg = MI.getOperand(0).getReg();
-    BuildMI(*BB, MI, Dl, TII->get(PPC::MFFS), OldFPSCRReg);
+    if (MRI.use_empty(OldFPSCRReg))
+      BuildMI(*BB, MI, Dl, TII->get(TargetOpcode::IMPLICIT_DEF), OldFPSCRReg);
+    else
+      BuildMI(*BB, MI, Dl, TII->get(PPC::MFFS), OldFPSCRReg);
 
     // Put bits in 32:63 to FPSCR.
     Register NewFPSCRReg = MI.getOperand(1).getReg();
@@ -12647,6 +13140,24 @@ PPCTargetLowering::EmitInstrWithCustomInserter(MachineInstr &MI,
     BuildMI(*BB, MI, DL, TII->get(TargetOpcode::COPY))
         .addDef(Hi)
         .addUse(Src, 0, PPC::sub_gp8_x0);
+  } else if (MI.getOpcode() == PPC::LQX_PSEUDO ||
+             MI.getOpcode() == PPC::STQX_PSEUDO) {
+    DebugLoc DL = MI.getDebugLoc();
+    // Ptr is used as the ptr_rc_no_r0 part
+    // of LQ/STQ's memory operand and adding result of RA and RB,
+    // so it has to be g8rc_and_g8rc_nox0.
+    Register Ptr =
+        F->getRegInfo().createVirtualRegister(&PPC::G8RC_and_G8RC_NOX0RegClass);
+    Register Val = MI.getOperand(0).getReg();
+    Register RA = MI.getOperand(1).getReg();
+    Register RB = MI.getOperand(2).getReg();
+    BuildMI(*BB, MI, DL, TII->get(PPC::ADD8), Ptr).addReg(RA).addReg(RB);
+    BuildMI(*BB, MI, DL,
+            MI.getOpcode() == PPC::LQX_PSEUDO ? TII->get(PPC::LQ)
+                                              : TII->get(PPC::STQ))
+        .addReg(Val, MI.getOpcode() == PPC::LQX_PSEUDO ? RegState::Define : 0)
+        .addImm(0)
+        .addReg(Ptr);
   } else {
     llvm_unreachable("Unexpected instr type to insert");
   }
@@ -12938,9 +13449,8 @@ static bool findConsecutiveLoad(LoadSDNode *LD, SelectionDAG &DAG) {
   Visited.clear();
   Queue.clear();
 
-  for (SmallSet<SDNode *, 16>::iterator I = LoadRoots.begin(),
-       IE = LoadRoots.end(); I != IE; ++I) {
-    Queue.push_back(*I);
+  for (SDNode *I : LoadRoots) {
+    Queue.push_back(I);
 
     while (!Queue.empty()) {
       SDNode *LoadRoot = Queue.pop_back_val();
@@ -12951,12 +13461,12 @@ static bool findConsecutiveLoad(LoadSDNode *LD, SelectionDAG &DAG) {
         if (isConsecutiveLS(ChainLD, LD, VT.getStoreSize(), 1, DAG))
           return true;
 
-      for (SDNode::use_iterator UI = LoadRoot->use_begin(),
-           UE = LoadRoot->use_end(); UI != UE; ++UI)
-        if (((isa<MemSDNode>(*UI) &&
-            cast<MemSDNode>(*UI)->getChain().getNode() == LoadRoot) ||
-            UI->getOpcode() == ISD::TokenFactor) && !Visited.count(*UI))
-          Queue.push_back(*UI);
+      for (SDNode *U : LoadRoot->uses())
+        if (((isa<MemSDNode>(U) &&
+              cast<MemSDNode>(U)->getChain().getNode() == LoadRoot) ||
+             U->getOpcode() == ISD::TokenFactor) &&
+            !Visited.count(U))
+          Queue.push_back(U);
     }
   }
 
@@ -13013,11 +13523,9 @@ SDValue PPCTargetLowering::ConvertSETCCToSubtract(SDNode *N,
 
   // If all users of SETCC extend its value to a legal integer type
   // then we replace SETCC with a subtraction
-  for (SDNode::use_iterator UI = N->use_begin(),
-       UE = N->use_end(); UI != UE; ++UI) {
-    if (UI->getOpcode() != ISD::ZERO_EXTEND)
+  for (const SDNode *U : N->uses())
+    if (U->getOpcode() != ISD::ZERO_EXTEND)
       return SDValue();
-  }
 
   ISD::CondCode CC = cast<CondCodeSDNode>(N->getOperand(2))->get();
   auto OpSize = N->getOperand(0).getValueSizeInBits();
@@ -13194,10 +13702,7 @@ SDValue PPCTargetLowering::DAGCombineTruncBoolExt(SDNode *N,
     if (isa<ConstantSDNode>(Inputs[i]))
       continue;
 
-    for (SDNode::use_iterator UI = Inputs[i].getNode()->use_begin(),
-                              UE = Inputs[i].getNode()->use_end();
-         UI != UE; ++UI) {
-      SDNode *User = *UI;
+    for (const SDNode *User : Inputs[i].getNode()->uses()) {
       if (User != N && !Visited.count(User))
         return SDValue();
 
@@ -13218,10 +13723,7 @@ SDValue PPCTargetLowering::DAGCombineTruncBoolExt(SDNode *N,
   }
 
   for (unsigned i = 0, ie = PromOps.size(); i != ie; ++i) {
-    for (SDNode::use_iterator UI = PromOps[i].getNode()->use_begin(),
-                              UE = PromOps[i].getNode()->use_end();
-         UI != UE; ++UI) {
-      SDNode *User = *UI;
+    for (const SDNode *User : PromOps[i].getNode()->uses()) {
       if (User != N && !Visited.count(User))
         return SDValue();
 
@@ -13406,10 +13908,7 @@ SDValue PPCTargetLowering::DAGCombineExtBoolTrunc(SDNode *N,
     if (isa<ConstantSDNode>(Inputs[i]))
       continue;
 
-    for (SDNode::use_iterator UI = Inputs[i].getNode()->use_begin(),
-                              UE = Inputs[i].getNode()->use_end();
-         UI != UE; ++UI) {
-      SDNode *User = *UI;
+    for (SDNode *User : Inputs[i].getNode()->uses()) {
       if (User != N && !Visited.count(User))
         return SDValue();
 
@@ -13431,10 +13930,7 @@ SDValue PPCTargetLowering::DAGCombineExtBoolTrunc(SDNode *N,
   }
 
   for (unsigned i = 0, ie = PromOps.size(); i != ie; ++i) {
-    for (SDNode::use_iterator UI = PromOps[i].getNode()->use_begin(),
-                              UE = PromOps[i].getNode()->use_end();
-         UI != UE; ++UI) {
-      SDNode *User = *UI;
+    for (SDNode *User : PromOps[i].getNode()->uses()) {
       if (User != N && !Visited.count(User))
         return SDValue();
 
@@ -13709,9 +14205,9 @@ combineElementTruncationToVectorTruncation(SDNode *N,
         if (In.isUndef())
           Ops.push_back(DAG.getUNDEF(SrcVT));
         else {
-          SDValue Trunc = DAG.getNode(ISD::FP_ROUND, dl,
-                                      MVT::f32, In.getOperand(0),
-                                      DAG.getIntPtrConstant(1, dl));
+          SDValue Trunc =
+              DAG.getNode(ISD::FP_ROUND, dl, MVT::f32, In.getOperand(0),
+                          DAG.getIntPtrConstant(1, dl, /*isTarget=*/true));
           Ops.push_back(Trunc);
         }
       } else
@@ -13753,17 +14249,23 @@ static SDValue combineBVOfConsecutiveLoads(SDNode *N, SelectionDAG &DAG) {
   unsigned ElemSize = N->getValueType(0).getScalarType().getStoreSize();
   SDValue FirstInput = N->getOperand(0);
   bool IsRoundOfExtLoad = false;
+  LoadSDNode *FirstLoad = nullptr;
 
   if (FirstInput.getOpcode() == ISD::FP_ROUND &&
       FirstInput.getOperand(0).getOpcode() == ISD::LOAD) {
-    LoadSDNode *LD = dyn_cast<LoadSDNode>(FirstInput.getOperand(0));
-    IsRoundOfExtLoad = LD->getExtensionType() == ISD::EXTLOAD;
+    FirstLoad = cast<LoadSDNode>(FirstInput.getOperand(0));
+    IsRoundOfExtLoad = FirstLoad->getExtensionType() == ISD::EXTLOAD;
   }
   // Not a build vector of (possibly fp_rounded) loads.
   if ((!IsRoundOfExtLoad && FirstInput.getOpcode() != ISD::LOAD) ||
       N->getNumOperands() == 1)
     return SDValue();
 
+  if (!IsRoundOfExtLoad)
+    FirstLoad = cast<LoadSDNode>(FirstInput);
+
+  SmallVector<LoadSDNode *, 4> InputLoads;
+  InputLoads.push_back(FirstLoad);
   for (int i = 1, e = N->getNumOperands(); i < e; ++i) {
     // If any inputs are fp_round(extload), they all must be.
     if (IsRoundOfExtLoad && N->getOperand(i).getOpcode() != ISD::FP_ROUND)
@@ -13776,53 +14278,55 @@ static SDValue combineBVOfConsecutiveLoads(SDNode *N, SelectionDAG &DAG) {
 
     SDValue PreviousInput =
       IsRoundOfExtLoad ? N->getOperand(i-1).getOperand(0) : N->getOperand(i-1);
-    LoadSDNode *LD1 = dyn_cast<LoadSDNode>(PreviousInput);
-    LoadSDNode *LD2 = dyn_cast<LoadSDNode>(NextInput);
+    LoadSDNode *LD1 = cast<LoadSDNode>(PreviousInput);
+    LoadSDNode *LD2 = cast<LoadSDNode>(NextInput);
 
     // If any inputs are fp_round(extload), they all must be.
     if (IsRoundOfExtLoad && LD2->getExtensionType() != ISD::EXTLOAD)
       return SDValue();
 
-    if (!isConsecutiveLS(LD2, LD1, ElemSize, 1, DAG))
+    // We only care about regular loads. The PPC-specific load intrinsics
+    // will not lead to a merge opportunity.
+    if (!DAG.areNonVolatileConsecutiveLoads(LD2, LD1, ElemSize, 1))
       InputsAreConsecutiveLoads = false;
-    if (!isConsecutiveLS(LD1, LD2, ElemSize, 1, DAG))
+    if (!DAG.areNonVolatileConsecutiveLoads(LD1, LD2, ElemSize, 1))
       InputsAreReverseConsecutive = false;
 
     // Exit early if the loads are neither consecutive nor reverse consecutive.
     if (!InputsAreConsecutiveLoads && !InputsAreReverseConsecutive)
       return SDValue();
+    InputLoads.push_back(LD2);
   }
 
   assert(!(InputsAreConsecutiveLoads && InputsAreReverseConsecutive) &&
          "The loads cannot be both consecutive and reverse consecutive.");
 
-  SDValue FirstLoadOp =
-    IsRoundOfExtLoad ? FirstInput.getOperand(0) : FirstInput;
-  SDValue LastLoadOp =
-    IsRoundOfExtLoad ? N->getOperand(N->getNumOperands()-1).getOperand(0) :
-                       N->getOperand(N->getNumOperands()-1);
-
-  LoadSDNode *LD1 = dyn_cast<LoadSDNode>(FirstLoadOp);
-  LoadSDNode *LDL = dyn_cast<LoadSDNode>(LastLoadOp);
+  SDValue WideLoad;
+  SDValue ReturnSDVal;
   if (InputsAreConsecutiveLoads) {
-    assert(LD1 && "Input needs to be a LoadSDNode.");
-    return DAG.getLoad(N->getValueType(0), dl, LD1->getChain(),
-                       LD1->getBasePtr(), LD1->getPointerInfo(),
-                       LD1->getAlignment());
-  }
-  if (InputsAreReverseConsecutive) {
-    assert(LDL && "Input needs to be a LoadSDNode.");
-    SDValue Load = DAG.getLoad(N->getValueType(0), dl, LDL->getChain(),
-                               LDL->getBasePtr(), LDL->getPointerInfo(),
-                               LDL->getAlignment());
+    assert(FirstLoad && "Input needs to be a LoadSDNode.");
+    WideLoad = DAG.getLoad(N->getValueType(0), dl, FirstLoad->getChain(),
+                           FirstLoad->getBasePtr(), FirstLoad->getPointerInfo(),
+                           FirstLoad->getAlign());
+    ReturnSDVal = WideLoad;
+  } else if (InputsAreReverseConsecutive) {
+    LoadSDNode *LastLoad = InputLoads.back();
+    assert(LastLoad && "Input needs to be a LoadSDNode.");
+    WideLoad = DAG.getLoad(N->getValueType(0), dl, LastLoad->getChain(),
+                           LastLoad->getBasePtr(), LastLoad->getPointerInfo(),
+                           LastLoad->getAlign());
     SmallVector<int, 16> Ops;
     for (int i = N->getNumOperands() - 1; i >= 0; i--)
       Ops.push_back(i);
 
-    return DAG.getVectorShuffle(N->getValueType(0), dl, Load,
-                                DAG.getUNDEF(N->getValueType(0)), Ops);
-  }
-  return SDValue();
+    ReturnSDVal = DAG.getVectorShuffle(N->getValueType(0), dl, WideLoad,
+                                       DAG.getUNDEF(N->getValueType(0)), Ops);
+  } else
+    return SDValue();
+
+  for (auto *LD : InputLoads)
+    DAG.makeEquivalentMemoryOrdering(LD, WideLoad);
+  return ReturnSDVal;
 }
 
 // This function adds the required vector_shuffle needed to get
@@ -14187,8 +14691,8 @@ SDValue PPCTargetLowering::combineFPToIntToFP(SDNode *N,
     SDValue FP = DAG.getNode(FCFOp, dl, FCFTy, Tmp);
 
     if (Op.getValueType() == MVT::f32 && !Subtarget.hasFPCVT()) {
-      FP = DAG.getNode(ISD::FP_ROUND, dl,
-                       MVT::f32, FP, DAG.getIntPtrConstant(0, dl));
+      FP = DAG.getNode(ISD::FP_ROUND, dl, MVT::f32, FP,
+                       DAG.getIntPtrConstant(0, dl, /*isTarget=*/true));
       DCI.AddToWorklist(FP.getNode());
     }
 
@@ -14202,6 +14706,11 @@ SDValue PPCTargetLowering::combineFPToIntToFP(SDNode *N,
 // builtins) into loads with swaps.
 SDValue PPCTargetLowering::expandVSXLoadForLE(SDNode *N,
                                               DAGCombinerInfo &DCI) const {
+  // Delay VSX load for LE combine until after LegalizeOps to prioritize other
+  // load combines.
+  if (DCI.isBeforeLegalizeOps())
+    return SDValue();
+
   SelectionDAG &DAG = DCI.DAG;
   SDLoc dl(N);
   SDValue Chain;
@@ -14236,13 +14745,6 @@ SDValue PPCTargetLowering::expandVSXLoadForLE(SDNode *N,
 
   MVT VecTy = N->getValueType(0).getSimpleVT();
 
-  // Do not expand to PPCISD::LXVD2X + PPCISD::XXSWAPD when the load is
-  // aligned and the type is a vector with elements up to 4 bytes
-  if (Subtarget.needsSwapsForVSXMemOps() && MMO->getAlign() >= Align(16) &&
-      VecTy.getScalarSizeInBits() <= 32) {
-    return SDValue();
-  }
-
   SDValue LoadOps[] = { Chain, Base };
   SDValue Load = DAG.getMemIntrinsicNode(PPCISD::LXVD2X, dl,
                                          DAG.getVTList(MVT::v2f64, MVT::Other),
@@ -14270,6 +14772,11 @@ SDValue PPCTargetLowering::expandVSXLoadForLE(SDNode *N,
 // builtins) into stores with swaps.
 SDValue PPCTargetLowering::expandVSXStoreForLE(SDNode *N,
                                                DAGCombinerInfo &DCI) const {
+  // Delay VSX store for LE combine until after LegalizeOps to prioritize other
+  // store combines.
+  if (DCI.isBeforeLegalizeOps())
+    return SDValue();
+
   SelectionDAG &DAG = DCI.DAG;
   SDLoc dl(N);
   SDValue Chain;
@@ -14307,13 +14814,6 @@ SDValue PPCTargetLowering::expandVSXStoreForLE(SDNode *N,
   SDValue Src = N->getOperand(SrcOpnd);
   MVT VecTy = Src.getValueType().getSimpleVT();
 
-  // Do not expand to PPCISD::XXSWAPD and PPCISD::STXVD2X when the load is
-  // aligned and the type is a vector with elements up to 4 bytes
-  if (Subtarget.needsSwapsForVSXMemOps() && MMO->getAlign() >= Align(16) &&
-      VecTy.getScalarSizeInBits() <= 32) {
-    return SDValue();
-  }
-
   // All stores are done as v2f64 and possible bit cast.
   if (VecTy != MVT::v2f64) {
     Src = DAG.getNode(ISD::BITCAST, dl, MVT::v2f64, Src);
@@ -14535,10 +15035,21 @@ SDValue PPCTargetLowering::combineVectorShuffle(ShuffleVectorSDNode *SVN,
   // Adjust the shuffle mask if either input vector comes from a
   // SCALAR_TO_VECTOR and keep the respective input vector in permuted
   // form (to prevent the need for a swap).
-  SmallVector<int, 16> ShuffV(Mask.begin(), Mask.end());
+  SmallVector<int, 16> ShuffV(Mask);
   SDValue SToVLHS = isScalarToVec(LHS);
   SDValue SToVRHS = isScalarToVec(RHS);
   if (SToVLHS || SToVRHS) {
+    // FIXME: If both LHS and RHS are SCALAR_TO_VECTOR, but are not the
+    // same type and have differing element sizes, then do not perform
+    // the following transformation. The current transformation for
+    // SCALAR_TO_VECTOR assumes that both input vectors have the same
+    // element size. This will be updated in the future to account for
+    // differing sizes of the LHS and RHS.
+    if (SToVLHS && SToVRHS &&
+        (SToVLHS.getValueType().getScalarSizeInBits() !=
+         SToVRHS.getValueType().getScalarSizeInBits()))
+      return Res;
+
     int NumEltsIn = SToVLHS ? SToVLHS.getValueType().getVectorNumElements()
                             : SToVRHS.getValueType().getVectorNumElements();
     int NumEltsOut = ShuffV.size();
@@ -14622,24 +15133,36 @@ SDValue PPCTargetLowering::combineVectorShuffle(ShuffleVectorSDNode *SVN,
     // Example (even elements from first vector):
     // vector_shuffle<0,16,1,17,2,18,3,19,4,20,5,21,6,22,7,23> t1, <zero>
     if (Mask[0] < NumElts)
-      for (int i = 1, e = Mask.size(); i < e; i += 2)
+      for (int i = 1, e = Mask.size(); i < e; i += 2) {
+        if (ShuffV[i] < 0)
+          continue;
         ShuffV[i] = (ShuffV[i - 1] + NumElts);
+      }
     // Example (odd elements from first vector):
     // vector_shuffle<16,0,17,1,18,2,19,3,20,4,21,5,22,6,23,7> t1, <zero>
     else
-      for (int i = 0, e = Mask.size(); i < e; i += 2)
+      for (int i = 0, e = Mask.size(); i < e; i += 2) {
+        if (ShuffV[i] < 0)
+          continue;
         ShuffV[i] = (ShuffV[i + 1] + NumElts);
+      }
   } else {
     // Example (even elements from first vector):
     // vector_shuffle<0,16,1,17,2,18,3,19,4,20,5,21,6,22,7,23> <zero>, t1
     if (Mask[0] < NumElts)
-      for (int i = 0, e = Mask.size(); i < e; i += 2)
+      for (int i = 0, e = Mask.size(); i < e; i += 2) {
+        if (ShuffV[i] < 0)
+          continue;
         ShuffV[i] = ShuffV[i + 1] - NumElts;
+      }
     // Example (odd elements from first vector):
     // vector_shuffle<16,0,17,1,18,2,19,3,20,4,21,5,22,6,23,7> <zero>, t1
     else
-      for (int i = 1, e = Mask.size(); i < e; i += 2)
+      for (int i = 1, e = Mask.size(); i < e; i += 2) {
+        if (ShuffV[i] < 0)
+          continue;
         ShuffV[i] = ShuffV[i - 1] - NumElts;
+      }
   }
 
   // If the RHS has undefs, we need to remove them since we may have created
@@ -14724,6 +15247,22 @@ SDValue PPCTargetLowering::combineVReverseMemOP(ShuffleVectorSDNode *SVN,
   llvm_unreachable("Expected a load or store node here");
 }
 
+static bool isStoreConditional(SDValue Intrin, unsigned &StoreWidth) {
+  unsigned IntrinsicID =
+      cast<ConstantSDNode>(Intrin.getOperand(1))->getZExtValue();
+  if (IntrinsicID == Intrinsic::ppc_stdcx)
+    StoreWidth = 8;
+  else if (IntrinsicID == Intrinsic::ppc_stwcx)
+    StoreWidth = 4;
+  else if (IntrinsicID == Intrinsic::ppc_sthcx)
+    StoreWidth = 2;
+  else if (IntrinsicID == Intrinsic::ppc_stbcx)
+    StoreWidth = 1;
+  else
+    return false;
+  return true;
+}
+
 SDValue PPCTargetLowering::PerformDAGCombine(SDNode *N,
                                              DAGCombinerInfo &DCI) const {
   SelectionDAG &DAG = DCI.DAG;
@@ -14753,8 +15292,8 @@ SDValue PPCTargetLowering::PerformDAGCombine(SDNode *N,
     break;
   case PPCISD::SRA:
     if (ConstantSDNode *C = dyn_cast<ConstantSDNode>(N->getOperand(0))) {
-      if (C->isNullValue() ||   //  0 >>s V -> 0.
-          C->isAllOnesValue())    // -1 >>s V -> -1.
+      if (C->isZero() ||  //  0 >>s V -> 0.
+          C->isAllOnes()) // -1 >>s V -> -1.
         return N->getOperand(0);
     }
     break;
@@ -14767,7 +15306,7 @@ SDValue PPCTargetLowering::PerformDAGCombine(SDNode *N,
   case ISD::SETCC:
     if (SDValue CSCC = combineSetCC(N, DCI))
       return CSCC;
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case ISD::SELECT_CC:
     return DAGCombineTruncBoolExt(N, DCI);
   case ISD::SINT_TO_FP:
@@ -14956,7 +15495,7 @@ SDValue PPCTargetLowering::PerformDAGCombine(SDNode *N,
       auto MMOFlags =
           LD->getMemOperand()->getFlags() & ~MachineMemOperand::MOVolatile;
       SDValue FloatLoad = DAG.getLoad(MVT::f32, dl, LD->getChain(), BasePtr,
-                                      LD->getPointerInfo(), LD->getAlignment(),
+                                      LD->getPointerInfo(), LD->getAlign(),
                                       MMOFlags, LD->getAAInfo());
       SDValue AddPtr =
         DAG.getNode(ISD::ADD, dl, BasePtr.getValueType(),
@@ -14964,7 +15503,7 @@ SDValue PPCTargetLowering::PerformDAGCombine(SDNode *N,
       SDValue FloatLoad2 = DAG.getLoad(
           MVT::f32, dl, SDValue(FloatLoad.getNode(), 1), AddPtr,
           LD->getPointerInfo().getWithOffset(4),
-          MinAlign(LD->getAlignment(), 4), MMOFlags, LD->getAAInfo());
+          commonAlignment(LD->getAlign(), 4), MMOFlags, LD->getAAInfo());
 
       if (LD->isIndexed()) {
         // Note that DAGCombine should re-form any pre-increment load(s) from
@@ -15042,7 +15581,7 @@ SDValue PPCTargetLowering::PerformDAGCombine(SDNode *N,
       MachineFunction &MF = DAG.getMachineFunction();
       MachineMemOperand *BaseMMO =
         MF.getMachineMemOperand(LD->getMemOperand(),
-                                -(long)MemVT.getStoreSize()+1,
+                                -(int64_t)MemVT.getStoreSize()+1,
                                 2*MemVT.getStoreSize()-1);
 
       // Create the new base load.
@@ -15126,39 +15665,36 @@ SDValue PPCTargetLowering::PerformDAGCombine(SDNode *N,
         int Bits = 4 /* 16 byte alignment */;
 
         if (DAG.MaskedValueIsZero(Add->getOperand(1),
-                                  APInt::getAllOnesValue(Bits /* alignment */)
+                                  APInt::getAllOnes(Bits /* alignment */)
                                       .zext(Add.getScalarValueSizeInBits()))) {
           SDNode *BasePtr = Add->getOperand(0).getNode();
-          for (SDNode::use_iterator UI = BasePtr->use_begin(),
-                                    UE = BasePtr->use_end();
-               UI != UE; ++UI) {
-            if (UI->getOpcode() == ISD::INTRINSIC_WO_CHAIN &&
-                cast<ConstantSDNode>(UI->getOperand(0))->getZExtValue() ==
-                    IID) {
+          for (SDNode *U : BasePtr->uses()) {
+            if (U->getOpcode() == ISD::INTRINSIC_WO_CHAIN &&
+                cast<ConstantSDNode>(U->getOperand(0))->getZExtValue() == IID) {
               // We've found another LVSL/LVSR, and this address is an aligned
               // multiple of that one. The results will be the same, so use the
               // one we've just found instead.
 
-              return SDValue(*UI, 0);
+              return SDValue(U, 0);
             }
           }
         }
 
         if (isa<ConstantSDNode>(Add->getOperand(1))) {
           SDNode *BasePtr = Add->getOperand(0).getNode();
-          for (SDNode::use_iterator UI = BasePtr->use_begin(),
-               UE = BasePtr->use_end(); UI != UE; ++UI) {
-            if (UI->getOpcode() == ISD::ADD &&
-                isa<ConstantSDNode>(UI->getOperand(1)) &&
+          for (SDNode *U : BasePtr->uses()) {
+            if (U->getOpcode() == ISD::ADD &&
+                isa<ConstantSDNode>(U->getOperand(1)) &&
                 (cast<ConstantSDNode>(Add->getOperand(1))->getZExtValue() -
-                 cast<ConstantSDNode>(UI->getOperand(1))->getZExtValue()) %
-                (1ULL << Bits) == 0) {
-              SDNode *OtherAdd = *UI;
-              for (SDNode::use_iterator VI = OtherAdd->use_begin(),
-                   VE = OtherAdd->use_end(); VI != VE; ++VI) {
-                if (VI->getOpcode() == ISD::INTRINSIC_WO_CHAIN &&
-                    cast<ConstantSDNode>(VI->getOperand(0))->getZExtValue() == IID) {
-                  return SDValue(*VI, 0);
+                 cast<ConstantSDNode>(U->getOperand(1))->getZExtValue()) %
+                        (1ULL << Bits) ==
+                    0) {
+              SDNode *OtherAdd = U;
+              for (SDNode *V : OtherAdd->uses()) {
+                if (V->getOpcode() == ISD::INTRINSIC_WO_CHAIN &&
+                    cast<ConstantSDNode>(V->getOperand(0))->getZExtValue() ==
+                        IID) {
+                  return SDValue(V, 0);
                 }
               }
             }
@@ -15280,7 +15816,7 @@ SDValue PPCTargetLowering::PerformDAGCombine(SDNode *N,
       return SDValue();
     SDValue BasePtr = LD->getBasePtr();
     SDValue Lo = DAG.getLoad(MVT::i32, dl, LD->getChain(), BasePtr,
-                             LD->getPointerInfo(), LD->getAlignment());
+                             LD->getPointerInfo(), LD->getAlign());
     Lo = DAG.getNode(ISD::BSWAP, dl, MVT::i32, Lo);
     BasePtr = DAG.getNode(ISD::ADD, dl, BasePtr.getValueType(), BasePtr,
                           DAG.getIntPtrConstant(4, dl));
@@ -15349,75 +15885,33 @@ SDValue PPCTargetLowering::PerformDAGCombine(SDNode *N,
         return SDValue(VCMPrecNode, 0);
     }
     break;
-  case ISD::BRCOND: {
-    SDValue Cond = N->getOperand(1);
-    SDValue Target = N->getOperand(2);
-
-    if (Cond.getOpcode() == ISD::INTRINSIC_W_CHAIN &&
-        cast<ConstantSDNode>(Cond.getOperand(1))->getZExtValue() ==
-          Intrinsic::loop_decrement) {
-
-      // We now need to make the intrinsic dead (it cannot be instruction
-      // selected).
-      DAG.ReplaceAllUsesOfValueWith(Cond.getValue(1), Cond.getOperand(0));
-      assert(Cond.getNode()->hasOneUse() &&
-             "Counter decrement has more than one use");
-
-      return DAG.getNode(PPCISD::BDNZ, dl, MVT::Other,
-                         N->getOperand(0), Target);
-    }
-  }
-  break;
   case ISD::BR_CC: {
     // If this is a branch on an altivec predicate comparison, lower this so
     // that we don't have to do a MFOCRF: instead, branch directly on CR6.  This
     // lowering is done pre-legalize, because the legalizer lowers the predicate
     // compare down to code that is difficult to reassemble.
+    // This code also handles branches that depend on the result of a store
+    // conditional.
     ISD::CondCode CC = cast<CondCodeSDNode>(N->getOperand(1))->get();
     SDValue LHS = N->getOperand(2), RHS = N->getOperand(3);
 
-    // Sometimes the promoted value of the intrinsic is ANDed by some non-zero
-    // value. If so, pass-through the AND to get to the intrinsic.
-    if (LHS.getOpcode() == ISD::AND &&
-        LHS.getOperand(0).getOpcode() == ISD::INTRINSIC_W_CHAIN &&
-        cast<ConstantSDNode>(LHS.getOperand(0).getOperand(1))->getZExtValue() ==
-          Intrinsic::loop_decrement &&
-        isa<ConstantSDNode>(LHS.getOperand(1)) &&
-        !isNullConstant(LHS.getOperand(1)))
-      LHS = LHS.getOperand(0);
-
-    if (LHS.getOpcode() == ISD::INTRINSIC_W_CHAIN &&
-        cast<ConstantSDNode>(LHS.getOperand(1))->getZExtValue() ==
-          Intrinsic::loop_decrement &&
-        isa<ConstantSDNode>(RHS)) {
-      assert((CC == ISD::SETEQ || CC == ISD::SETNE) &&
-             "Counter decrement comparison is not EQ or NE");
-
-      unsigned Val = cast<ConstantSDNode>(RHS)->getZExtValue();
-      bool isBDNZ = (CC == ISD::SETEQ && Val) ||
-                    (CC == ISD::SETNE && !Val);
-
-      // We now need to make the intrinsic dead (it cannot be instruction
-      // selected).
-      DAG.ReplaceAllUsesOfValueWith(LHS.getValue(1), LHS.getOperand(0));
-      assert(LHS.getNode()->hasOneUse() &&
-             "Counter decrement has more than one use");
-
-      return DAG.getNode(isBDNZ ? PPCISD::BDNZ : PPCISD::BDZ, dl, MVT::Other,
-                         N->getOperand(0), N->getOperand(4));
-    }
-
     int CompareOpc;
     bool isDot;
 
-    if (LHS.getOpcode() == ISD::INTRINSIC_WO_CHAIN &&
-        isa<ConstantSDNode>(RHS) && (CC == ISD::SETEQ || CC == ISD::SETNE) &&
-        getVectorCompareInfo(LHS, CompareOpc, isDot, Subtarget)) {
-      assert(isDot && "Can't compare against a vector result!");
+    if (!isa<ConstantSDNode>(RHS) || (CC != ISD::SETEQ && CC != ISD::SETNE))
+      break;
 
+    // Since we are doing this pre-legalize, the RHS can be a constant of
+    // arbitrary bitwidth which may cause issues when trying to get the value
+    // from the underlying APInt.
+    auto RHSAPInt = cast<ConstantSDNode>(RHS)->getAPIntValue();
+    if (!RHSAPInt.isIntN(64))
+      break;
+
+    unsigned Val = RHSAPInt.getZExtValue();
+    auto isImpossibleCompare = [&]() {
       // If this is a comparison against something other than 0/1, then we know
       // that the condition is never/always true.
-      unsigned Val = cast<ConstantSDNode>(RHS)->getZExtValue();
       if (Val != 0 && Val != 1) {
         if (CC == ISD::SETEQ)      // Cond never true, remove branch.
           return N->getOperand(0);
@@ -15425,9 +15919,59 @@ SDValue PPCTargetLowering::PerformDAGCombine(SDNode *N,
         return DAG.getNode(ISD::BR, dl, MVT::Other,
                            N->getOperand(0), N->getOperand(4));
       }
+      return SDValue();
+    };
+    // Combine branches fed by store conditional instructions (st[bhwd]cx).
+    unsigned StoreWidth = 0;
+    if (LHS.getOpcode() == ISD::INTRINSIC_W_CHAIN &&
+        isStoreConditional(LHS, StoreWidth)) {
+      if (SDValue Impossible = isImpossibleCompare())
+        return Impossible;
+      PPC::Predicate CompOpc;
+      // eq 0 => ne
+      // ne 0 => eq
+      // eq 1 => eq
+      // ne 1 => ne
+      if (Val == 0)
+        CompOpc = CC == ISD::SETEQ ? PPC::PRED_NE : PPC::PRED_EQ;
+      else
+        CompOpc = CC == ISD::SETEQ ? PPC::PRED_EQ : PPC::PRED_NE;
+
+      SDValue Ops[] = {LHS.getOperand(0), LHS.getOperand(2), LHS.getOperand(3),
+                       DAG.getConstant(StoreWidth, dl, MVT::i32)};
+      auto *MemNode = cast<MemSDNode>(LHS);
+      SDValue ConstSt = DAG.getMemIntrinsicNode(
+          PPCISD::STORE_COND, dl,
+          DAG.getVTList(MVT::i32, MVT::Other, MVT::Glue), Ops,
+          MemNode->getMemoryVT(), MemNode->getMemOperand());
+
+      SDValue InChain;
+      // Unchain the branch from the original store conditional.
+      if (N->getOperand(0) == LHS.getValue(1))
+        InChain = LHS.getOperand(0);
+      else if (N->getOperand(0).getOpcode() == ISD::TokenFactor) {
+        SmallVector<SDValue, 4> InChains;
+        SDValue InTF = N->getOperand(0);
+        for (int i = 0, e = InTF.getNumOperands(); i < e; i++)
+          if (InTF.getOperand(i) != LHS.getValue(1))
+            InChains.push_back(InTF.getOperand(i));
+        InChain = DAG.getNode(ISD::TokenFactor, dl, MVT::Other, InChains);
+      }
 
-      bool BranchOnWhenPredTrue = (CC == ISD::SETEQ) ^ (Val == 0);
+      return DAG.getNode(PPCISD::COND_BRANCH, dl, MVT::Other, InChain,
+                         DAG.getConstant(CompOpc, dl, MVT::i32),
+                         DAG.getRegister(PPC::CR0, MVT::i32), N->getOperand(4),
+                         ConstSt.getValue(2));
+    }
+
+    if (LHS.getOpcode() == ISD::INTRINSIC_WO_CHAIN &&
+        getVectorCompareInfo(LHS, CompareOpc, isDot, Subtarget)) {
+      assert(isDot && "Can't compare against a vector result!");
 
+      if (SDValue Impossible = isImpossibleCompare())
+        return Impossible;
+
+      bool BranchOnWhenPredTrue = (CC == ISD::SETEQ) ^ (Val == 0);
       // Create the PPCISD altivec 'dot' comparison node.
       SDValue Ops[] = {
         LHS.getOperand(2),  // LHS of compare
@@ -15482,13 +16026,13 @@ PPCTargetLowering::BuildSDIVPow2(SDNode *N, const APInt &Divisor,
   if (VT == MVT::i64 && !Subtarget.isPPC64())
     return SDValue();
   if ((VT != MVT::i32 && VT != MVT::i64) ||
-      !(Divisor.isPowerOf2() || (-Divisor).isPowerOf2()))
+      !(Divisor.isPowerOf2() || Divisor.isNegatedPowerOf2()))
     return SDValue();
 
   SDLoc DL(N);
   SDValue N0 = N->getOperand(0);
 
-  bool IsNegPow2 = (-Divisor).isPowerOf2();
+  bool IsNegPow2 = Divisor.isNegatedPowerOf2();
   unsigned Lg2 = (IsNegPow2 ? -Divisor : Divisor).countTrailingZeros();
   SDValue ShiftAmt = DAG.getConstant(Lg2, DL, VT);
 
@@ -15546,6 +16090,18 @@ void PPCTargetLowering::computeKnownBitsForTargetNode(const SDValue Op,
       Known.Zero = ~1U;  // All bits but the low one are known to be zero.
       break;
     }
+    break;
+  }
+  case ISD::INTRINSIC_W_CHAIN: {
+    switch (cast<ConstantSDNode>(Op.getOperand(1))->getZExtValue()) {
+    default:
+      break;
+    case Intrinsic::ppc_load2r:
+      // Top bits are cleared for load2r (which is the same as lhbrx).
+      Known.Zero = 0xFFFF0000;
+      break;
+    }
+    break;
   }
   }
 }
@@ -15582,8 +16138,8 @@ Align PPCTargetLowering::getPrefLoopAlignment(MachineLoop *ML) const {
     // boundary so that the entire loop fits in one instruction-cache line.
     uint64_t LoopSize = 0;
     for (auto I = ML->block_begin(), IE = ML->block_end(); I != IE; ++I)
-      for (auto J = (*I)->begin(), JE = (*I)->end(); J != JE; ++J) {
-        LoopSize += TII->getInstSizeInBytes(*J);
+      for (const MachineInstr &J : **I) {
+        LoopSize += TII->getInstSizeInBytes(J);
         if (LoopSize > 32)
           break;
       }
@@ -15723,8 +16279,11 @@ PPCTargetLowering::getRegForInlineAsmConstraint(const TargetRegisterInfo *TRI,
       }
       break;
     case 'v':
-      if (Subtarget.hasAltivec())
+      if (Subtarget.hasAltivec() && VT.isVector())
         return std::make_pair(0U, &PPC::VRRCRegClass);
+      else if (Subtarget.hasVSX())
+        // Scalars in Altivec registers only make sense with VSX.
+        return std::make_pair(0U, &PPC::VFRCRegClass);
       break;
     case 'y':   // crrc
       return std::make_pair(0U, &PPC::CRRCRegClass);
@@ -15895,6 +16454,24 @@ void PPCTargetLowering::LowerAsmOperandForConstraint(SDValue Op,
   TargetLowering::LowerAsmOperandForConstraint(Op, Constraint, Ops, DAG);
 }
 
+void PPCTargetLowering::CollectTargetIntrinsicOperands(const CallInst &I,
+                                              SmallVectorImpl<SDValue> &Ops,
+                                              SelectionDAG &DAG) const {
+  if (I.getNumOperands() <= 1)
+    return;
+  if (!isa<ConstantSDNode>(Ops[1].getNode()))
+    return;
+  auto IntrinsicID = cast<ConstantSDNode>(Ops[1].getNode())->getZExtValue();
+  if (IntrinsicID != Intrinsic::ppc_tdw && IntrinsicID != Intrinsic::ppc_tw &&
+      IntrinsicID != Intrinsic::ppc_trapd && IntrinsicID != Intrinsic::ppc_trap)
+    return;
+
+  if (I.hasMetadata("annotation")) {
+    MDNode *MDN = I.getMetadata("annotation");
+    Ops.push_back(DAG.getMDNode(MDN));
+  }
+}
+
 // isLegalAddressingMode - Return true if the addressing mode represented
 // by AM is legal for this target, for a load/store of the specified type.
 bool PPCTargetLowering::isLegalAddressingMode(const DataLayout &DL,
@@ -15960,7 +16537,12 @@ SDValue PPCTargetLowering::LowerRETURNADDR(SDValue Op,
   auto PtrVT = getPointerTy(MF.getDataLayout());
 
   if (Depth > 0) {
-    SDValue FrameAddr = LowerFRAMEADDR(Op, DAG);
+    // The link register (return address) is saved in the caller's frame
+    // not the callee's stack frame. So we must get the caller's frame
+    // address and load the return address at the LR offset from there.
+    SDValue FrameAddr =
+        DAG.getLoad(Op.getValueType(), dl, DAG.getEntryNode(),
+                    LowerFRAMEADDR(Op, DAG), MachinePointerInfo());
     SDValue Offset =
         DAG.getConstant(Subtarget.getFrameLowering()->getReturnSaveOffset(), dl,
                         isPPC64 ? MVT::i64 : MVT::i32);
@@ -16077,6 +16659,22 @@ bool PPCTargetLowering::getTgtMemIntrinsic(IntrinsicInfo &Info,
     Info.flags = MachineMemOperand::MOLoad | MachineMemOperand::MOStore |
                  MachineMemOperand::MOVolatile;
     return true;
+  case Intrinsic::ppc_atomic_load_i128:
+    Info.opc = ISD::INTRINSIC_W_CHAIN;
+    Info.memVT = MVT::i128;
+    Info.ptrVal = I.getArgOperand(0);
+    Info.offset = 0;
+    Info.align = Align(16);
+    Info.flags = MachineMemOperand::MOLoad | MachineMemOperand::MOVolatile;
+    return true;
+  case Intrinsic::ppc_atomic_store_i128:
+    Info.opc = ISD::INTRINSIC_VOID;
+    Info.memVT = MVT::i128;
+    Info.ptrVal = I.getArgOperand(2);
+    Info.offset = 0;
+    Info.align = Align(16);
+    Info.flags = MachineMemOperand::MOStore | MachineMemOperand::MOVolatile;
+    return true;
   case Intrinsic::ppc_altivec_lvx:
   case Intrinsic::ppc_altivec_lvxl:
   case Intrinsic::ppc_altivec_lvebx:
@@ -16157,6 +16755,37 @@ bool PPCTargetLowering::getTgtMemIntrinsic(IntrinsicInfo &Info,
     Info.flags = MachineMemOperand::MOStore;
     return true;
   }
+  case Intrinsic::ppc_stdcx:
+  case Intrinsic::ppc_stwcx:
+  case Intrinsic::ppc_sthcx:
+  case Intrinsic::ppc_stbcx: {
+    EVT VT;
+    auto Alignment = Align(8);
+    switch (Intrinsic) {
+    case Intrinsic::ppc_stdcx:
+      VT = MVT::i64;
+      break;
+    case Intrinsic::ppc_stwcx:
+      VT = MVT::i32;
+      Alignment = Align(4);
+      break;
+    case Intrinsic::ppc_sthcx:
+      VT = MVT::i16;
+      Alignment = Align(2);
+      break;
+    case Intrinsic::ppc_stbcx:
+      VT = MVT::i8;
+      Alignment = Align(1);
+      break;
+    }
+    Info.opc = ISD::INTRINSIC_W_CHAIN;
+    Info.memVT = VT;
+    Info.ptrVal = I.getArgOperand(0);
+    Info.offset = 0;
+    Info.align = Alignment;
+    Info.flags = MachineMemOperand::MOStore | MachineMemOperand::MOVolatile;
+    return true;
+  }
   default:
     break;
   }
@@ -16249,7 +16878,7 @@ bool PPCTargetLowering::isLegalAddImmediate(int64_t Imm) const {
 
 bool PPCTargetLowering::allowsMisalignedMemoryAccesses(EVT VT, unsigned, Align,
                                                        MachineMemOperand::Flags,
-                                                       bool *Fast) const {
+                                                       unsigned *Fast) const {
   if (DisablePPCUnaligned)
     return false;
 
@@ -16280,7 +16909,7 @@ bool PPCTargetLowering::allowsMisalignedMemoryAccesses(EVT VT, unsigned, Align,
     return false;
 
   if (Fast)
-    *Fast = true;
+    *Fast = 1;
 
   return true;
 }
@@ -16320,6 +16949,8 @@ bool PPCTargetLowering::isFMAFasterThanFMulAndFAdd(const MachineFunction &MF,
 
 bool PPCTargetLowering::isFMAFasterThanFMulAndFAdd(const Function &F,
                                                    Type *Ty) const {
+  if (Subtarget.hasSPE())
+    return false;
   switch (Ty->getScalarType()->getTypeID()) {
   case Type::FloatTyID:
   case Type::DoubleTyID:
@@ -16546,12 +17177,21 @@ bool PPCTargetLowering::isFPImmLegal(const APFloat &Imm, EVT VT,
     // false. Examples: f16, f80.
     return false;
   case MVT::f32:
-  case MVT::f64:
+  case MVT::f64: {
     if (Subtarget.hasPrefixInstrs()) {
       // we can materialize all immediatess via XXSPLTI32DX and XXSPLTIDP.
       return true;
     }
-    LLVM_FALLTHROUGH;
+    bool IsExact;
+    APSInt IntResult(16, false);
+    // The rounding mode doesn't really matter because we only care about floats
+    // that can be converted to integers exactly.
+    Imm.convertToInteger(IntResult, APFloat::rmTowardZero, &IsExact);
+    // For exact values in the range [-16, 15] we can materialize the float.
+    if (IsExact && IntResult <= 15 && IntResult >= -16)
+      return true;
+    return Imm.isZero();
+  }
   case MVT::ppcf128:
     return Imm.isPosZero();
   }
@@ -17146,6 +17786,9 @@ PPC::AddrMode PPCTargetLowering::getAddrModeForFlags(unsigned Flags) const {
   for (auto FlagSet : AddrModesMap.at(PPC::AM_DQForm))
     if ((Flags & FlagSet) == FlagSet)
       return PPC::AM_DQForm;
+  for (auto FlagSet : AddrModesMap.at(PPC::AM_PrefixDForm))
+    if ((Flags & FlagSet) == FlagSet)
+      return PPC::AM_PrefixDForm;
   // If no other forms are selected, return an X-Form as it is the most
   // general addressing mode.
   return PPC::AM_XForm;
@@ -17236,6 +17879,14 @@ static void computeFlagsForAddressComputation(SDValue N, unsigned &FlagSet,
   }
 }
 
+static bool isPCRelNode(SDValue N) {
+  return (N.getOpcode() == PPCISD::MAT_PCREL_ADDR ||
+      isValidPCRelNode<ConstantPoolSDNode>(N) ||
+      isValidPCRelNode<GlobalAddressSDNode>(N) ||
+      isValidPCRelNode<JumpTableSDNode>(N) ||
+      isValidPCRelNode<BlockAddressSDNode>(N));
+}
+
 /// computeMOFlags - Given a node N and it's Parent (a MemSDNode), compute
 /// the address flags of the load/store instruction that is to be matched.
 unsigned PPCTargetLowering::computeMOFlags(const SDNode *Parent, SDValue N,
@@ -17253,6 +17904,26 @@ unsigned PPCTargetLowering::computeMOFlags(const SDNode *Parent, SDValue N,
   if (Subtarget.hasSPE())
     FlagSet |= PPC::MOF_SubtargetSPE;
 
+  // Check if we have a PCRel node and return early.
+  if ((FlagSet & PPC::MOF_SubtargetP10) && isPCRelNode(N))
+    return FlagSet;
+
+  // If the node is the paired load/store intrinsics, compute flags for
+  // address computation and return early.
+  unsigned ParentOp = Parent->getOpcode();
+  if (Subtarget.isISA3_1() && ((ParentOp == ISD::INTRINSIC_W_CHAIN) ||
+                               (ParentOp == ISD::INTRINSIC_VOID))) {
+    unsigned ID = cast<ConstantSDNode>(Parent->getOperand(1))->getZExtValue();
+    if ((ID == Intrinsic::ppc_vsx_lxvp) || (ID == Intrinsic::ppc_vsx_stxvp)) {
+      SDValue IntrinOp = (ID == Intrinsic::ppc_vsx_lxvp)
+                             ? Parent->getOperand(2)
+                             : Parent->getOperand(3);
+      computeFlagsForAddressComputation(IntrinOp, FlagSet, DAG);
+      FlagSet |= PPC::MOF_Vector;
+      return FlagSet;
+    }
+  }
+
   // Mark this as something we don't want to handle here if it is atomic
   // or pre-increment instruction.
   if (const LSBaseSDNode *LSB = dyn_cast<LSBaseSDNode>(Parent))
@@ -17266,7 +17937,8 @@ unsigned PPCTargetLowering::computeMOFlags(const SDNode *Parent, SDValue N,
   EVT MemVT = MN->getMemoryVT();
   unsigned Size = MemVT.getSizeInBits();
   if (MemVT.isScalarInteger()) {
-    assert(Size <= 64 && "Not expecting scalar integers larger than 8 bytes!");
+    assert(Size <= 128 &&
+           "Not expecting scalar integers larger than 16 bytes!");
     if (Size < 32)
       FlagSet |= PPC::MOF_SubWordInt;
     else if (Size == 32)
@@ -17276,9 +17948,12 @@ unsigned PPCTargetLowering::computeMOFlags(const SDNode *Parent, SDValue N,
   } else if (MemVT.isVector() && !MemVT.isFloatingPoint()) { // Integer vectors.
     if (Size == 128)
       FlagSet |= PPC::MOF_Vector;
-    else if (Size == 256)
-      FlagSet |= PPC::MOF_Vector256;
-    else
+    else if (Size == 256) {
+      assert(Subtarget.pairedVectorMemops() &&
+             "256-bit vectors are only available when paired vector memops is "
+             "enabled!");
+      FlagSet |= PPC::MOF_Vector;
+    } else
       llvm_unreachable("Not expecting illegal vectors!");
   } else { // Floating point type: can be scalar, f128 or vector types.
     if (Size == 32 || Size == 64)
@@ -17365,6 +18040,136 @@ PPC::AddrMode PPCTargetLowering::SelectForceXFormMode(SDValue N, SDValue &Disp,
   return Mode;
 }
 
+bool PPCTargetLowering::splitValueIntoRegisterParts(
+    SelectionDAG &DAG, const SDLoc &DL, SDValue Val, SDValue *Parts,
+    unsigned NumParts, MVT PartVT, std::optional<CallingConv::ID> CC) const {
+  EVT ValVT = Val.getValueType();
+  // If we are splitting a scalar integer into f64 parts (i.e. so they
+  // can be placed into VFRC registers), we need to zero extend and
+  // bitcast the values. This will ensure the value is placed into a
+  // VSR using direct moves or stack operations as needed.
+  if (PartVT == MVT::f64 &&
+      (ValVT == MVT::i32 || ValVT == MVT::i16 || ValVT == MVT::i8)) {
+    Val = DAG.getNode(ISD::ZERO_EXTEND, DL, MVT::i64, Val);
+    Val = DAG.getNode(ISD::BITCAST, DL, MVT::f64, Val);
+    Parts[0] = Val;
+    return true;
+  }
+  return false;
+}
+
+SDValue PPCTargetLowering::lowerToLibCall(const char *LibCallName, SDValue Op,
+                                          SelectionDAG &DAG) const {
+  const TargetLowering &TLI = DAG.getTargetLoweringInfo();
+  TargetLowering::CallLoweringInfo CLI(DAG);
+  EVT RetVT = Op.getValueType();
+  Type *RetTy = RetVT.getTypeForEVT(*DAG.getContext());
+  SDValue Callee =
+      DAG.getExternalSymbol(LibCallName, TLI.getPointerTy(DAG.getDataLayout()));
+  bool SignExtend = TLI.shouldSignExtendTypeInLibCall(RetVT, false);
+  TargetLowering::ArgListTy Args;
+  TargetLowering::ArgListEntry Entry;
+  for (const SDValue &N : Op->op_values()) {
+    EVT ArgVT = N.getValueType();
+    Type *ArgTy = ArgVT.getTypeForEVT(*DAG.getContext());
+    Entry.Node = N;
+    Entry.Ty = ArgTy;
+    Entry.IsSExt = TLI.shouldSignExtendTypeInLibCall(ArgVT, SignExtend);
+    Entry.IsZExt = !Entry.IsSExt;
+    Args.push_back(Entry);
+  }
+
+  SDValue InChain = DAG.getEntryNode();
+  SDValue TCChain = InChain;
+  const Function &F = DAG.getMachineFunction().getFunction();
+  bool isTailCall =
+      TLI.isInTailCallPosition(DAG, Op.getNode(), TCChain) &&
+      (RetTy == F.getReturnType() || F.getReturnType()->isVoidTy());
+  if (isTailCall)
+    InChain = TCChain;
+  CLI.setDebugLoc(SDLoc(Op))
+      .setChain(InChain)
+      .setLibCallee(CallingConv::C, RetTy, Callee, std::move(Args))
+      .setTailCall(isTailCall)
+      .setSExtResult(SignExtend)
+      .setZExtResult(!SignExtend)
+      .setIsPostTypeLegalization(true);
+  return TLI.LowerCallTo(CLI).first;
+}
+
+SDValue PPCTargetLowering::lowerLibCallBasedOnType(
+    const char *LibCallFloatName, const char *LibCallDoubleName, SDValue Op,
+    SelectionDAG &DAG) const {
+  if (Op.getValueType() == MVT::f32)
+    return lowerToLibCall(LibCallFloatName, Op, DAG);
+
+  if (Op.getValueType() == MVT::f64)
+    return lowerToLibCall(LibCallDoubleName, Op, DAG);
+
+  return SDValue();
+}
+
+bool PPCTargetLowering::isLowringToMASSFiniteSafe(SDValue Op) const {
+  SDNodeFlags Flags = Op.getNode()->getFlags();
+  return isLowringToMASSSafe(Op) && Flags.hasNoSignedZeros() &&
+         Flags.hasNoNaNs() && Flags.hasNoInfs();
+}
+
+bool PPCTargetLowering::isLowringToMASSSafe(SDValue Op) const {
+  return Op.getNode()->getFlags().hasApproximateFuncs();
+}
+
+bool PPCTargetLowering::isScalarMASSConversionEnabled() const {
+  return getTargetMachine().Options.PPCGenScalarMASSEntries;
+}
+
+SDValue PPCTargetLowering::lowerLibCallBase(const char *LibCallDoubleName,
+                                            const char *LibCallFloatName,
+                                            const char *LibCallDoubleNameFinite,
+                                            const char *LibCallFloatNameFinite,
+                                            SDValue Op,
+                                            SelectionDAG &DAG) const {
+  if (!isScalarMASSConversionEnabled() || !isLowringToMASSSafe(Op))
+    return SDValue();
+
+  if (!isLowringToMASSFiniteSafe(Op))
+    return lowerLibCallBasedOnType(LibCallFloatName, LibCallDoubleName, Op,
+                                   DAG);
+
+  return lowerLibCallBasedOnType(LibCallFloatNameFinite,
+                                 LibCallDoubleNameFinite, Op, DAG);
+}
+
+SDValue PPCTargetLowering::lowerPow(SDValue Op, SelectionDAG &DAG) const {
+  return lowerLibCallBase("__xl_pow", "__xl_powf", "__xl_pow_finite",
+                          "__xl_powf_finite", Op, DAG);
+}
+
+SDValue PPCTargetLowering::lowerSin(SDValue Op, SelectionDAG &DAG) const {
+  return lowerLibCallBase("__xl_sin", "__xl_sinf", "__xl_sin_finite",
+                          "__xl_sinf_finite", Op, DAG);
+}
+
+SDValue PPCTargetLowering::lowerCos(SDValue Op, SelectionDAG &DAG) const {
+  return lowerLibCallBase("__xl_cos", "__xl_cosf", "__xl_cos_finite",
+                          "__xl_cosf_finite", Op, DAG);
+}
+
+SDValue PPCTargetLowering::lowerLog(SDValue Op, SelectionDAG &DAG) const {
+  return lowerLibCallBase("__xl_log", "__xl_logf", "__xl_log_finite",
+                          "__xl_logf_finite", Op, DAG);
+}
+
+SDValue PPCTargetLowering::lowerLog10(SDValue Op, SelectionDAG &DAG) const {
+  return lowerLibCallBase("__xl_log10", "__xl_log10f", "__xl_log10_finite",
+                          "__xl_log10f_finite", Op, DAG);
+}
+
+SDValue PPCTargetLowering::lowerExp(SDValue Op, SelectionDAG &DAG) const {
+  return lowerLibCallBase("__xl_exp", "__xl_expf", "__xl_exp_finite",
+                          "__xl_expf_finite", Op, DAG);
+}
+
 // If we happen to match to an aligned D-Form, check if the Frame Index is
 // adequately aligned. If it is not, reset the mode to match to X-Form.
 static void setXFormForUnalignedFI(SDValue N, unsigned Flags,
@@ -17396,6 +18201,14 @@ PPC::AddrMode PPCTargetLowering::SelectOptimalAddrMode(const SDNode *Parent,
   // Select an X-Form load if it is not.
   setXFormForUnalignedFI(N, Flags, Mode);
 
+  // Set the mode to PC-Relative addressing mode if we have a valid PC-Rel node.
+  if ((Mode == PPC::AM_XForm) && isPCRelNode(N)) {
+    assert(Subtarget.isUsingPCRelativeCalls() &&
+           "Must be using PC-Relative calls when a valid PC-Relative node is "
+           "present!");
+    Mode = PPC::AM_PCRel;
+  }
+
   // Set Base and Disp accordingly depending on the address mode.
   switch (Mode) {
   case PPC::AM_DForm:
@@ -17467,6 +18280,30 @@ PPC::AddrMode PPCTargetLowering::SelectOptimalAddrMode(const SDNode *Parent,
       Base = N;
     break;
   }
+  case PPC::AM_PrefixDForm: {
+    int64_t Imm34 = 0;
+    unsigned Opcode = N.getOpcode();
+    if (((Opcode == ISD::ADD) || (Opcode == ISD::OR)) &&
+        (isIntS34Immediate(N.getOperand(1), Imm34))) {
+      // N is an Add/OR Node, and it's operand is a 34-bit signed immediate.
+      Disp = DAG.getTargetConstant(Imm34, DL, N.getValueType());
+      if (FrameIndexSDNode *FI = dyn_cast<FrameIndexSDNode>(N.getOperand(0)))
+        Base = DAG.getTargetFrameIndex(FI->getIndex(), N.getValueType());
+      else
+        Base = N.getOperand(0);
+    } else if (isIntS34Immediate(N, Imm34)) {
+      // The address is a 34-bit signed immediate.
+      Disp = DAG.getTargetConstant(Imm34, DL, N.getValueType());
+      Base = DAG.getRegister(PPC::ZERO8, N.getValueType());
+    }
+    break;
+  }
+  case PPC::AM_PCRel: {
+    // When selecting PC-Relative instructions, "Base" is not utilized as
+    // we select the address as [PC+imm].
+    Disp = N;
+    break;
+  }
   case PPC::AM_None:
     break;
   default: { // By default, X-Form is always available to be selected.
@@ -17493,21 +18330,35 @@ CCAssignFn *PPCTargetLowering::ccAssignFnForCall(CallingConv::ID CC,
   }
 }
 
+bool PPCTargetLowering::shouldInlineQuadwordAtomics() const {
+  // TODO: 16-byte atomic type support for AIX is in progress; we should be able
+  // to inline 16-byte atomic ops on AIX too in the future.
+  return Subtarget.isPPC64() &&
+         (EnableQuadwordAtomics || !Subtarget.getTargetTriple().isOSAIX()) &&
+         Subtarget.hasQuadwordAtomics();
+}
+
 TargetLowering::AtomicExpansionKind
 PPCTargetLowering::shouldExpandAtomicRMWInIR(AtomicRMWInst *AI) const {
   unsigned Size = AI->getType()->getPrimitiveSizeInBits();
-  if (EnableQuadwordAtomics && Subtarget.hasQuadwordAtomics() && Size == 128)
+  if (shouldInlineQuadwordAtomics() && Size == 128)
     return AtomicExpansionKind::MaskedIntrinsic;
-  return TargetLowering::shouldExpandAtomicRMWInIR(AI);
+
+  switch (AI->getOperation()) {
+  case AtomicRMWInst::UIncWrap:
+  case AtomicRMWInst::UDecWrap:
+    return AtomicExpansionKind::CmpXChg;
+  default:
+    return TargetLowering::shouldExpandAtomicRMWInIR(AI);
+  }
+
+  llvm_unreachable("unreachable atomicrmw operation");
 }
 
 TargetLowering::AtomicExpansionKind
 PPCTargetLowering::shouldExpandAtomicCmpXchgInIR(AtomicCmpXchgInst *AI) const {
-  unsigned Size = AI->getPointerOperand()
-                      ->getType()
-                      ->getPointerElementType()
-                      ->getPrimitiveSizeInBits();
-  if (EnableQuadwordAtomics && Subtarget.hasQuadwordAtomics() && Size == 128)
+  unsigned Size = AI->getNewValOperand()->getType()->getPrimitiveSizeInBits();
+  if (shouldInlineQuadwordAtomics() && Size == 128)
     return AtomicExpansionKind::MaskedIntrinsic;
   return TargetLowering::shouldExpandAtomicCmpXchgInIR(AI);
 }
@@ -17537,10 +18388,9 @@ getIntrinsicForAtomicRMWBinOp128(AtomicRMWInst::BinOp BinOp) {
 Value *PPCTargetLowering::emitMaskedAtomicRMWIntrinsic(
     IRBuilderBase &Builder, AtomicRMWInst *AI, Value *AlignedAddr, Value *Incr,
     Value *Mask, Value *ShiftAmt, AtomicOrdering Ord) const {
-  assert(EnableQuadwordAtomics && Subtarget.hasQuadwordAtomics() &&
-         "Only support quadword now");
+  assert(shouldInlineQuadwordAtomics() && "Only support quadword now");
   Module *M = Builder.GetInsertBlock()->getParent()->getParent();
-  Type *ValTy = cast<PointerType>(AlignedAddr->getType())->getElementType();
+  Type *ValTy = Incr->getType();
   assert(ValTy->getPrimitiveSizeInBits() == 128);
   Function *RMW = Intrinsic::getDeclaration(
       M, getIntrinsicForAtomicRMWBinOp128(AI->getOperation()));
@@ -17562,10 +18412,9 @@ Value *PPCTargetLowering::emitMaskedAtomicRMWIntrinsic(
 Value *PPCTargetLowering::emitMaskedAtomicCmpXchgIntrinsic(
     IRBuilderBase &Builder, AtomicCmpXchgInst *CI, Value *AlignedAddr,
     Value *CmpVal, Value *NewVal, Value *Mask, AtomicOrdering Ord) const {
-  assert(EnableQuadwordAtomics && Subtarget.hasQuadwordAtomics() &&
-         "Only support quadword now");
+  assert(shouldInlineQuadwordAtomics() && "Only support quadword now");
   Module *M = Builder.GetInsertBlock()->getParent()->getParent();
-  Type *ValTy = cast<PointerType>(AlignedAddr->getType())->getElementType();
+  Type *ValTy = CmpVal->getType();
   assert(ValTy->getPrimitiveSizeInBits() == 128);
   Function *IntCmpXchg =
       Intrinsic::getDeclaration(M, Intrinsic::ppc_cmpxchg_i128);
diff --git a/gnu/llvm/llvm/lib/Target/PowerPC/PPCInstrInfo.td b/gnu/llvm/llvm/lib/Target/PowerPC/PPCInstrInfo.td
index a2294fcddbd..85349466bbb 100644
--- a/gnu/llvm/llvm/lib/Target/PowerPC/PPCInstrInfo.td
+++ b/gnu/llvm/llvm/lib/Target/PowerPC/PPCInstrInfo.td
@@ -83,6 +83,9 @@ def SDT_PPClbrx : SDTypeProfile<1, 2, [
 def SDT_PPCstbrx : SDTypeProfile<0, 3, [
   SDTCisInt<0>, SDTCisPtrTy<1>, SDTCisVT<2, OtherVT>
 ]>;
+def SDT_StoreCond : SDTypeProfile<0, 3, [
+  SDTCisPtrTy<0>, SDTCisInt<1>, SDTCisPtrTy<2>
+]>;
 
 def SDT_PPCTC_ret : SDTypeProfile<0, 2, [
   SDTCisPtrTy<0>, SDTCisVT<1, i32>
@@ -198,8 +201,8 @@ def PPCfsel   : SDNode<"PPCISD::FSEL",
    // Type constraint for fsel.
    SDTypeProfile<1, 3, [SDTCisSameAs<0, 2>, SDTCisSameAs<0, 3>,
                         SDTCisFP<0>, SDTCisVT<1, f64>]>, []>;
-def PPCxsmaxc : SDNode<"PPCISD::XSMAXCDP", SDT_PPCFPMinMax, []>;
-def PPCxsminc : SDNode<"PPCISD::XSMINCDP", SDT_PPCFPMinMax, []>;
+def PPCxsmaxc : SDNode<"PPCISD::XSMAXC", SDT_PPCFPMinMax, []>;
+def PPCxsminc : SDNode<"PPCISD::XSMINC", SDT_PPCFPMinMax, []>;
 def PPChi       : SDNode<"PPCISD::Hi", SDTIntBinOp, []>;
 def PPClo       : SDNode<"PPCISD::Lo", SDTIntBinOp, []>;
 def PPCtoc_entry: SDNode<"PPCISD::TOC_ENTRY", SDTIntBinOp,
@@ -316,6 +319,24 @@ def PPCbctrl_load_toc : SDNode<"PPCISD::BCTRL_LOAD_TOC",
                                [SDNPHasChain, SDNPOptInGlue, SDNPOutGlue,
                                 SDNPVariadic]>;
 
+// Call nodes for strictfp calls (that define RM).
+def PPCcall_rm  : SDNode<"PPCISD::CALL_RM", SDT_PPCCall,
+                         [SDNPHasChain, SDNPOptInGlue, SDNPOutGlue,
+                          SDNPVariadic]>;
+def PPCcall_nop_rm  : SDNode<"PPCISD::CALL_NOP_RM", SDT_PPCCall,
+                             [SDNPHasChain, SDNPOptInGlue, SDNPOutGlue,
+                              SDNPVariadic]>;
+def PPCcall_notoc_rm : SDNode<"PPCISD::CALL_NOTOC_RM", SDT_PPCCall,
+                              [SDNPHasChain, SDNPOptInGlue, SDNPOutGlue,
+                               SDNPVariadic]>;
+def PPCbctrl_rm : SDNode<"PPCISD::BCTRL_RM", SDTNone,
+                         [SDNPHasChain, SDNPOptInGlue, SDNPOutGlue,
+                          SDNPVariadic]>;
+def PPCbctrl_load_toc_rm : SDNode<"PPCISD::BCTRL_LOAD_TOC_RM",
+                                  SDTypeProfile<0, 1, []>,
+                                  [SDNPHasChain, SDNPOptInGlue, SDNPOutGlue,
+                                   SDNPVariadic]>;
+
 def retflag       : SDNode<"PPCISD::RET_FLAG", SDTNone,
                            [SDNPHasChain, SDNPOptInGlue, SDNPVariadic]>;
 
@@ -357,6 +378,9 @@ def PPClbrx       : SDNode<"PPCISD::LBRX", SDT_PPClbrx,
                            [SDNPHasChain, SDNPMayLoad, SDNPMemOperand]>;
 def PPCstbrx      : SDNode<"PPCISD::STBRX", SDT_PPCstbrx,
                            [SDNPHasChain, SDNPMayStore]>;
+def PPCStoreCond  : SDNode<"PPCISD::STORE_COND", SDT_StoreCond,
+                           [SDNPHasChain, SDNPMayStore,
+                            SDNPMemOperand, SDNPOutGlue]>;
 
 // Instructions to set/unset CR bit 6 for SVR4 vararg calls
 def PPCcr6set   : SDNode<"PPCISD::CR6SET", SDTNone,
@@ -390,6 +414,24 @@ def nzFPImmAsi32 : PatLeaf<(fpimm), [{
   return convertToNonDenormSingle(APFloatOfN) && !N->isExactlyValue(+0.0);
 }]>;
 
+// A floating point immediate that is exactly an integer (for example 3.0, -5.0)
+// and can be represented in 5 bits (range of [-16, 15]).
+def nzFPImmExactInti5 : PatLeaf<(fpimm), [{
+  APFloat FloatValue = N->getValueAPF();
+  bool IsExact;
+  APSInt IntResult(16, false);
+  FloatValue.convertToInteger(IntResult, APFloat::rmTowardZero, &IsExact);
+  return IsExact && IntResult <= 15 && IntResult >= -16 && !FloatValue.isZero();
+}]>;
+
+def getFPAs5BitExactInt : SDNodeXForm<fpimm, [{
+  APFloat FloatValue = N->getValueAPF();
+  bool IsExact;
+  APSInt IntResult(32, false);
+  FloatValue.convertToInteger(IntResult, APFloat::rmTowardZero, &IsExact);
+  return CurDAG->getTargetConstant(IntResult, SDLoc(N), MVT::i32);
+}]>;
+
 // Convert the floating point immediate into a 32 bit floating point immediate
 // and get a i32 with the resulting bits.
 def getFPAs32BitInt : SDNodeXForm<fpimm, [{
@@ -460,7 +502,7 @@ def HI16 : SDNodeXForm<imm, [{
 
 def HA16 : SDNodeXForm<imm, [{
   // Transformation function: shift the immediate value down into the low bits.
-  long Val = N->getZExtValue();
+  int64_t Val = N->getZExtValue();
   return getI32Imm((Val - (signed short)Val) >> 16, SDLoc(N));
 }]>;
 def MB : SDNodeXForm<imm, [{
@@ -545,30 +587,30 @@ def imm64ZExt32  : Operand<i64>, ImmLeaf<i64, [{
 // an alignment check into the relevant patterns.
 
 def DSFormLoad : PatFrag<(ops node:$ptr), (load node:$ptr), [{
-  return isOffsetMultipleOf(N, 4) || cast<LoadSDNode>(N)->getAlignment() >= 4;
+  return isOffsetMultipleOf(N, 4) || cast<LoadSDNode>(N)->getAlign() >= 4;
 }]>;
 def DSFormStore : PatFrag<(ops node:$val, node:$ptr),
                             (store node:$val, node:$ptr), [{
-  return isOffsetMultipleOf(N, 4) || cast<StoreSDNode>(N)->getAlignment() >= 4;
+  return isOffsetMultipleOf(N, 4) || cast<StoreSDNode>(N)->getAlign() >= 4;
 }]>;
 def DSFormSextLoadi32 : PatFrag<(ops node:$ptr), (sextloadi32 node:$ptr), [{
-  return isOffsetMultipleOf(N, 4) || cast<LoadSDNode>(N)->getAlignment() >= 4;
+  return isOffsetMultipleOf(N, 4) || cast<LoadSDNode>(N)->getAlign() >= 4;
 }]>;
 def DSFormPreStore : PatFrag<
                           (ops node:$val, node:$base, node:$offset),
                           (pre_store node:$val, node:$base, node:$offset), [{
-  return isOffsetMultipleOf(N, 4) || cast<StoreSDNode>(N)->getAlignment() >= 4;
+  return isOffsetMultipleOf(N, 4) || cast<StoreSDNode>(N)->getAlign() >= 4;
 }]>;
 
 def NonDSFormLoad : PatFrag<(ops node:$ptr), (load node:$ptr), [{
-  return cast<LoadSDNode>(N)->getAlignment() < 4 && !isOffsetMultipleOf(N, 4);
+  return cast<LoadSDNode>(N)->getAlign() < 4 && !isOffsetMultipleOf(N, 4);
 }]>;
 def NonDSFormStore : PatFrag<(ops node:$val, node:$ptr),
                               (store node:$val, node:$ptr), [{
-  return cast<StoreSDNode>(N)->getAlignment() < 4 && !isOffsetMultipleOf(N, 4);
+  return cast<StoreSDNode>(N)->getAlign() < 4 && !isOffsetMultipleOf(N, 4);
 }]>;
 def NonDSFormSextLoadi32 : PatFrag<(ops node:$ptr), (sextloadi32 node:$ptr), [{
-  return cast<LoadSDNode>(N)->getAlignment() < 4 && !isOffsetMultipleOf(N, 4);
+  return cast<LoadSDNode>(N)->getAlign() < 4 && !isOffsetMultipleOf(N, 4);
 }]>;
 
 // This is a somewhat weaker condition than actually checking for 16-byte
@@ -615,514 +657,6 @@ class NoEncode<string E> {
 }
 
 
-//===----------------------------------------------------------------------===//
-// PowerPC Operand Definitions.
-
-// In the default PowerPC assembler syntax, registers are specified simply
-// by number, so they cannot be distinguished from immediate values (without
-// looking at the opcode).  This means that the default operand matching logic
-// for the asm parser does not work, and we need to specify custom matchers.
-// Since those can only be specified with RegisterOperand classes and not
-// directly on the RegisterClass, all instructions patterns used by the asm
-// parser need to use a RegisterOperand (instead of a RegisterClass) for
-// all their register operands.
-// For this purpose, we define one RegisterOperand for each RegisterClass,
-// using the same name as the class, just in lower case.
-
-def PPCRegGPRCAsmOperand : AsmOperandClass {
-  let Name = "RegGPRC"; let PredicateMethod = "isRegNumber";
-}
-def gprc : RegisterOperand<GPRC> {
-  let ParserMatchClass = PPCRegGPRCAsmOperand;
-}
-def PPCRegG8RCAsmOperand : AsmOperandClass {
-  let Name = "RegG8RC"; let PredicateMethod = "isRegNumber";
-}
-def g8rc : RegisterOperand<G8RC> {
-  let ParserMatchClass = PPCRegG8RCAsmOperand;
-}
-def PPCRegG8pRCAsmOperand : AsmOperandClass {
-  let Name = "RegG8pRC"; let PredicateMethod = "isEvenRegNumber";
-}
-def g8prc : RegisterOperand<G8pRC> {
-  let ParserMatchClass = PPCRegG8pRCAsmOperand;
-}
-def PPCRegGPRCNoR0AsmOperand : AsmOperandClass {
-  let Name = "RegGPRCNoR0"; let PredicateMethod = "isRegNumber";
-}
-def gprc_nor0 : RegisterOperand<GPRC_NOR0> {
-  let ParserMatchClass = PPCRegGPRCNoR0AsmOperand;
-}
-def PPCRegG8RCNoX0AsmOperand : AsmOperandClass {
-  let Name = "RegG8RCNoX0"; let PredicateMethod = "isRegNumber";
-}
-def g8rc_nox0 : RegisterOperand<G8RC_NOX0> {
-  let ParserMatchClass = PPCRegG8RCNoX0AsmOperand;
-}
-def PPCRegF8RCAsmOperand : AsmOperandClass {
-  let Name = "RegF8RC"; let PredicateMethod = "isRegNumber";
-}
-def f8rc : RegisterOperand<F8RC> {
-  let ParserMatchClass = PPCRegF8RCAsmOperand;
-}
-def PPCRegF4RCAsmOperand : AsmOperandClass {
-  let Name = "RegF4RC"; let PredicateMethod = "isRegNumber";
-}
-def f4rc : RegisterOperand<F4RC> {
-  let ParserMatchClass = PPCRegF4RCAsmOperand;
-}
-def PPCRegVRRCAsmOperand : AsmOperandClass {
-  let Name = "RegVRRC"; let PredicateMethod = "isRegNumber";
-}
-def vrrc : RegisterOperand<VRRC> {
-  let ParserMatchClass = PPCRegVRRCAsmOperand;
-}
-def PPCRegVFRCAsmOperand : AsmOperandClass {
-  let Name = "RegVFRC"; let PredicateMethod = "isRegNumber";
-}
-def vfrc : RegisterOperand<VFRC> {
-  let ParserMatchClass = PPCRegVFRCAsmOperand;
-}
-def PPCRegCRBITRCAsmOperand : AsmOperandClass {
-  let Name = "RegCRBITRC"; let PredicateMethod = "isCRBitNumber";
-}
-def crbitrc : RegisterOperand<CRBITRC> {
-  let ParserMatchClass = PPCRegCRBITRCAsmOperand;
-}
-def PPCRegCRRCAsmOperand : AsmOperandClass {
-  let Name = "RegCRRC"; let PredicateMethod = "isCCRegNumber";
-}
-def crrc : RegisterOperand<CRRC> {
-  let ParserMatchClass = PPCRegCRRCAsmOperand;
-}
-def PPCRegSPERCAsmOperand : AsmOperandClass {
-  let Name = "RegSPERC"; let PredicateMethod = "isRegNumber";
-}
-def sperc : RegisterOperand<SPERC> {
-  let ParserMatchClass = PPCRegSPERCAsmOperand;
-}
-def PPCRegSPE4RCAsmOperand : AsmOperandClass {
-  let Name = "RegSPE4RC"; let PredicateMethod = "isRegNumber";
-}
-def spe4rc : RegisterOperand<GPRC> {
-  let ParserMatchClass = PPCRegSPE4RCAsmOperand;
-}
-
-def PPCU1ImmAsmOperand : AsmOperandClass {
-  let Name = "U1Imm"; let PredicateMethod = "isU1Imm";
-  let RenderMethod = "addImmOperands";
-}
-def u1imm   : Operand<i32> {
-  let PrintMethod = "printU1ImmOperand";
-  let ParserMatchClass = PPCU1ImmAsmOperand;
-  let OperandType = "OPERAND_IMMEDIATE";
-}
-
-def PPCU2ImmAsmOperand : AsmOperandClass {
-  let Name = "U2Imm"; let PredicateMethod = "isU2Imm";
-  let RenderMethod = "addImmOperands";
-}
-def u2imm   : Operand<i32> {
-  let PrintMethod = "printU2ImmOperand";
-  let ParserMatchClass = PPCU2ImmAsmOperand;
-  let OperandType = "OPERAND_IMMEDIATE";
-}
-
-def PPCATBitsAsHintAsmOperand : AsmOperandClass {
-  let Name = "ATBitsAsHint"; let PredicateMethod = "isATBitsAsHint";
-  let RenderMethod = "addImmOperands"; // Irrelevant, predicate always fails.
-}
-def atimm   : Operand<i32> {
-  let PrintMethod = "printATBitsAsHint";
-  let ParserMatchClass = PPCATBitsAsHintAsmOperand;
-  let OperandType = "OPERAND_IMMEDIATE";
-}
-
-def PPCU3ImmAsmOperand : AsmOperandClass {
-  let Name = "U3Imm"; let PredicateMethod = "isU3Imm";
-  let RenderMethod = "addImmOperands";
-}
-def u3imm   : Operand<i32> {
-  let PrintMethod = "printU3ImmOperand";
-  let ParserMatchClass = PPCU3ImmAsmOperand;
-  let OperandType = "OPERAND_IMMEDIATE";
-}
-
-def PPCU4ImmAsmOperand : AsmOperandClass {
-  let Name = "U4Imm"; let PredicateMethod = "isU4Imm";
-  let RenderMethod = "addImmOperands";
-}
-def u4imm   : Operand<i32> {
-  let PrintMethod = "printU4ImmOperand";
-  let ParserMatchClass = PPCU4ImmAsmOperand;
-  let OperandType = "OPERAND_IMMEDIATE";
-}
-def PPCS5ImmAsmOperand : AsmOperandClass {
-  let Name = "S5Imm"; let PredicateMethod = "isS5Imm";
-  let RenderMethod = "addImmOperands";
-}
-def s5imm   : Operand<i32> {
-  let PrintMethod = "printS5ImmOperand";
-  let ParserMatchClass = PPCS5ImmAsmOperand;
-  let DecoderMethod = "decodeSImmOperand<5>";
-  let OperandType = "OPERAND_IMMEDIATE";
-}
-def PPCU5ImmAsmOperand : AsmOperandClass {
-  let Name = "U5Imm"; let PredicateMethod = "isU5Imm";
-  let RenderMethod = "addImmOperands";
-}
-def u5imm   : Operand<i32> {
-  let PrintMethod = "printU5ImmOperand";
-  let ParserMatchClass = PPCU5ImmAsmOperand;
-  let DecoderMethod = "decodeUImmOperand<5>";
-  let OperandType = "OPERAND_IMMEDIATE";
-}
-def PPCU6ImmAsmOperand : AsmOperandClass {
-  let Name = "U6Imm"; let PredicateMethod = "isU6Imm";
-  let RenderMethod = "addImmOperands";
-}
-def u6imm   : Operand<i32> {
-  let PrintMethod = "printU6ImmOperand";
-  let ParserMatchClass = PPCU6ImmAsmOperand;
-  let DecoderMethod = "decodeUImmOperand<6>";
-  let OperandType = "OPERAND_IMMEDIATE";
-}
-def PPCU7ImmAsmOperand : AsmOperandClass {
-  let Name = "U7Imm"; let PredicateMethod = "isU7Imm";
-  let RenderMethod = "addImmOperands";
-}
-def u7imm   : Operand<i32> {
-  let PrintMethod = "printU7ImmOperand";
-  let ParserMatchClass = PPCU7ImmAsmOperand;
-  let DecoderMethod = "decodeUImmOperand<7>";
-  let OperandType = "OPERAND_IMMEDIATE";
-}
-def PPCU8ImmAsmOperand : AsmOperandClass {
-  let Name = "U8Imm"; let PredicateMethod = "isU8Imm";
-  let RenderMethod = "addImmOperands";
-}
-def u8imm   : Operand<i32> {
-  let PrintMethod = "printU8ImmOperand";
-  let ParserMatchClass = PPCU8ImmAsmOperand;
-  let DecoderMethod = "decodeUImmOperand<8>";
-  let OperandType = "OPERAND_IMMEDIATE";
-}
-def PPCU10ImmAsmOperand : AsmOperandClass {
-  let Name = "U10Imm"; let PredicateMethod = "isU10Imm";
-  let RenderMethod = "addImmOperands";
-}
-def u10imm  : Operand<i32> {
-  let PrintMethod = "printU10ImmOperand";
-  let ParserMatchClass = PPCU10ImmAsmOperand;
-  let DecoderMethod = "decodeUImmOperand<10>";
-  let OperandType = "OPERAND_IMMEDIATE";
-}
-def PPCU12ImmAsmOperand : AsmOperandClass {
-  let Name = "U12Imm"; let PredicateMethod = "isU12Imm";
-  let RenderMethod = "addImmOperands";
-}
-def u12imm  : Operand<i32> {
-  let PrintMethod = "printU12ImmOperand";
-  let ParserMatchClass = PPCU12ImmAsmOperand;
-  let DecoderMethod = "decodeUImmOperand<12>";
-  let OperandType = "OPERAND_IMMEDIATE";
-}
-def PPCS16ImmAsmOperand : AsmOperandClass {
-  let Name = "S16Imm"; let PredicateMethod = "isS16Imm";
-  let RenderMethod = "addS16ImmOperands";
-}
-def s16imm  : Operand<i32> {
-  let PrintMethod = "printS16ImmOperand";
-  let EncoderMethod = "getImm16Encoding";
-  let ParserMatchClass = PPCS16ImmAsmOperand;
-  let DecoderMethod = "decodeSImmOperand<16>";
-  let OperandType = "OPERAND_IMMEDIATE";
-}
-def PPCU16ImmAsmOperand : AsmOperandClass {
-  let Name = "U16Imm"; let PredicateMethod = "isU16Imm";
-  let RenderMethod = "addU16ImmOperands";
-}
-def u16imm  : Operand<i32> {
-  let PrintMethod = "printU16ImmOperand";
-  let EncoderMethod = "getImm16Encoding";
-  let ParserMatchClass = PPCU16ImmAsmOperand;
-  let DecoderMethod = "decodeUImmOperand<16>";
-  let OperandType = "OPERAND_IMMEDIATE";
-}
-def PPCS17ImmAsmOperand : AsmOperandClass {
-  let Name = "S17Imm"; let PredicateMethod = "isS17Imm";
-  let RenderMethod = "addS16ImmOperands";
-}
-def s17imm  : Operand<i32> {
-  // This operand type is used for addis/lis to allow the assembler parser
-  // to accept immediates in the range -65536..65535 for compatibility with
-  // the GNU assembler.  The operand is treated as 16-bit otherwise.
-  let PrintMethod = "printS16ImmOperand";
-  let EncoderMethod = "getImm16Encoding";
-  let ParserMatchClass = PPCS17ImmAsmOperand;
-  let DecoderMethod = "decodeSImmOperand<16>";
-  let OperandType = "OPERAND_IMMEDIATE";
-}
-def PPCS34ImmAsmOperand : AsmOperandClass {
-  let Name = "S34Imm";
-  let PredicateMethod = "isS34Imm";
-  let RenderMethod = "addImmOperands";
-}
-def s34imm : Operand<i64> {
-  let PrintMethod = "printS34ImmOperand";
-  let EncoderMethod = "getImm34EncodingNoPCRel";
-  let ParserMatchClass = PPCS34ImmAsmOperand;
-  let DecoderMethod = "decodeSImmOperand<34>";
-  let OperandType = "OPERAND_IMMEDIATE";
-}
-def s34imm_pcrel : Operand<i64> {
-  let PrintMethod = "printS34ImmOperand";
-  let EncoderMethod = "getImm34EncodingPCRel";
-  let ParserMatchClass = PPCS34ImmAsmOperand;
-  let DecoderMethod = "decodeSImmOperand<34>";
-  let OperandType = "OPERAND_IMMEDIATE";
-}
-def PPCImmZeroAsmOperand : AsmOperandClass {
-  let Name = "ImmZero";
-  let PredicateMethod = "isImmZero";
-  let RenderMethod = "addImmOperands";
-}
-def immZero : Operand<i32> {
-  let PrintMethod = "printImmZeroOperand";
-  let ParserMatchClass = PPCImmZeroAsmOperand;
-  let DecoderMethod = "decodeImmZeroOperand";
-  let OperandType = "OPERAND_IMMEDIATE";
-}
-
-def fpimm0 : PatLeaf<(fpimm), [{ return N->isExactlyValue(+0.0); }]>;
-
-def PPCDirectBrAsmOperand : AsmOperandClass {
-  let Name = "DirectBr"; let PredicateMethod = "isDirectBr";
-  let RenderMethod = "addBranchTargetOperands";
-}
-def directbrtarget : Operand<OtherVT> {
-  let PrintMethod = "printBranchOperand";
-  let EncoderMethod = "getDirectBrEncoding";
-  let DecoderMethod = "decodeDirectBrTarget";
-  let ParserMatchClass = PPCDirectBrAsmOperand;
-  let OperandType = "OPERAND_PCREL";
-}
-def absdirectbrtarget : Operand<OtherVT> {
-  let PrintMethod = "printAbsBranchOperand";
-  let EncoderMethod = "getAbsDirectBrEncoding";
-  let ParserMatchClass = PPCDirectBrAsmOperand;
-}
-def PPCCondBrAsmOperand : AsmOperandClass {
-  let Name = "CondBr"; let PredicateMethod = "isCondBr";
-  let RenderMethod = "addBranchTargetOperands";
-}
-def condbrtarget : Operand<OtherVT> {
-  let PrintMethod = "printBranchOperand";
-  let EncoderMethod = "getCondBrEncoding";
-  let DecoderMethod = "decodeCondBrTarget";
-  let ParserMatchClass = PPCCondBrAsmOperand;
-  let OperandType = "OPERAND_PCREL";
-}
-def abscondbrtarget : Operand<OtherVT> {
-  let PrintMethod = "printAbsBranchOperand";
-  let EncoderMethod = "getAbsCondBrEncoding";
-  let ParserMatchClass = PPCCondBrAsmOperand;
-}
-def calltarget : Operand<iPTR> {
-  let PrintMethod = "printBranchOperand";
-  let EncoderMethod = "getDirectBrEncoding";
-  let DecoderMethod = "decodeDirectBrTarget";
-  let ParserMatchClass = PPCDirectBrAsmOperand;
-  let OperandType = "OPERAND_PCREL";
-}
-def abscalltarget : Operand<iPTR> {
-  let PrintMethod = "printAbsBranchOperand";
-  let EncoderMethod = "getAbsDirectBrEncoding";
-  let ParserMatchClass = PPCDirectBrAsmOperand;
-}
-def PPCCRBitMaskOperand : AsmOperandClass {
- let Name = "CRBitMask"; let PredicateMethod = "isCRBitMask";
-}
-def crbitm: Operand<i8> {
-  let PrintMethod = "printcrbitm";
-  let EncoderMethod = "get_crbitm_encoding";
-  let DecoderMethod = "decodeCRBitMOperand";
-  let ParserMatchClass = PPCCRBitMaskOperand;
-}
-// Address operands
-// A version of ptr_rc which excludes R0 (or X0 in 64-bit mode).
-def PPCRegGxRCNoR0Operand : AsmOperandClass {
-  let Name = "RegGxRCNoR0"; let PredicateMethod = "isRegNumber";
-}
-def ptr_rc_nor0 : Operand<iPTR>, PointerLikeRegClass<1> {
-  let ParserMatchClass = PPCRegGxRCNoR0Operand;
-}
-
-// New addressing modes with 34 bit immediates.
-def PPCDispRI34Operand : AsmOperandClass {
-  let Name = "DispRI34"; let PredicateMethod = "isS34Imm";
-  let RenderMethod = "addImmOperands";
-}
-def dispRI34 : Operand<iPTR> {
-  let ParserMatchClass = PPCDispRI34Operand;
-}
-def memri34 : Operand<iPTR> { // memri, imm is a 34-bit value.
-  let PrintMethod = "printMemRegImm34";
-  let MIOperandInfo = (ops dispRI34:$imm, ptr_rc_nor0:$reg);
-  let EncoderMethod = "getMemRI34Encoding";
-  let DecoderMethod = "decodeMemRI34Operands";
-}
-// memri, imm is a 34-bit value for pc-relative instructions where
-// base register is set to zero.
-def memri34_pcrel : Operand<iPTR> { // memri, imm is a 34-bit value.
-  let PrintMethod = "printMemRegImm34PCRel";
-  let MIOperandInfo = (ops dispRI34:$imm, immZero:$reg);
-  let EncoderMethod = "getMemRI34PCRelEncoding";
-  let DecoderMethod = "decodeMemRI34PCRelOperands";
-}
-
-// A version of ptr_rc usable with the asm parser.
-def PPCRegGxRCOperand : AsmOperandClass {
-  let Name = "RegGxRC"; let PredicateMethod = "isRegNumber";
-}
-def ptr_rc_idx : Operand<iPTR>, PointerLikeRegClass<0> {
-  let ParserMatchClass = PPCRegGxRCOperand;
-}
-
-def PPCDispRIOperand : AsmOperandClass {
- let Name = "DispRI"; let PredicateMethod = "isS16Imm";
- let RenderMethod = "addS16ImmOperands";
-}
-def dispRI : Operand<iPTR> {
-  let ParserMatchClass = PPCDispRIOperand;
-}
-def PPCDispRIXOperand : AsmOperandClass {
- let Name = "DispRIX"; let PredicateMethod = "isS16ImmX4";
- let RenderMethod = "addImmOperands";
-}
-def dispRIX : Operand<iPTR> {
-  let ParserMatchClass = PPCDispRIXOperand;
-}
-def PPCDispRIHashOperand : AsmOperandClass {
-  let Name = "DispRIHash"; let PredicateMethod = "isHashImmX8";
-  let RenderMethod = "addImmOperands";
-}
-def dispRIHash : Operand<iPTR> {
-  let ParserMatchClass = PPCDispRIHashOperand;
-}
-def PPCDispRIX16Operand : AsmOperandClass {
- let Name = "DispRIX16"; let PredicateMethod = "isS16ImmX16";
- let RenderMethod = "addImmOperands";
-}
-def dispRIX16 : Operand<iPTR> {
-  let ParserMatchClass = PPCDispRIX16Operand;
-}
-def PPCDispSPE8Operand : AsmOperandClass {
- let Name = "DispSPE8"; let PredicateMethod = "isU8ImmX8";
- let RenderMethod = "addImmOperands";
-}
-def dispSPE8 : Operand<iPTR> {
-  let ParserMatchClass = PPCDispSPE8Operand;
-}
-def PPCDispSPE4Operand : AsmOperandClass {
- let Name = "DispSPE4"; let PredicateMethod = "isU7ImmX4";
- let RenderMethod = "addImmOperands";
-}
-def dispSPE4 : Operand<iPTR> {
-  let ParserMatchClass = PPCDispSPE4Operand;
-}
-def PPCDispSPE2Operand : AsmOperandClass {
- let Name = "DispSPE2"; let PredicateMethod = "isU6ImmX2";
- let RenderMethod = "addImmOperands";
-}
-def dispSPE2 : Operand<iPTR> {
-  let ParserMatchClass = PPCDispSPE2Operand;
-}
-
-def memri : Operand<iPTR> {
-  let PrintMethod = "printMemRegImm";
-  let MIOperandInfo = (ops dispRI:$imm, ptr_rc_nor0:$reg);
-  let EncoderMethod = "getMemRIEncoding";
-  let DecoderMethod = "decodeMemRIOperands";
-  let OperandType = "OPERAND_MEMORY";
-}
-def memrr : Operand<iPTR> {
-  let PrintMethod = "printMemRegReg";
-  let MIOperandInfo = (ops ptr_rc_nor0:$ptrreg, ptr_rc_idx:$offreg);
-  let OperandType = "OPERAND_MEMORY";
-}
-def memrix : Operand<iPTR> {   // memri where the imm is 4-aligned.
-  let PrintMethod = "printMemRegImm";
-  let MIOperandInfo = (ops dispRIX:$imm, ptr_rc_nor0:$reg);
-  let EncoderMethod = "getMemRIXEncoding";
-  let DecoderMethod = "decodeMemRIXOperands";
-  let OperandType = "OPERAND_MEMORY";
-}
-def memrihash : Operand<iPTR> {
-  // memrihash 8-aligned for ROP Protection Instructions.
-  let PrintMethod = "printMemRegImmHash";
-  let MIOperandInfo = (ops dispRIHash:$imm, ptr_rc_nor0:$reg);
-  let EncoderMethod = "getMemRIHashEncoding";
-  let DecoderMethod = "decodeMemRIHashOperands";
-  let OperandType = "OPERAND_MEMORY";
-}
-def memrix16 : Operand<iPTR> { // memri, imm is 16-aligned, 12-bit, Inst{16:27}
-  let PrintMethod = "printMemRegImm";
-  let MIOperandInfo = (ops dispRIX16:$imm, ptr_rc_nor0:$reg);
-  let EncoderMethod = "getMemRIX16Encoding";
-  let DecoderMethod = "decodeMemRIX16Operands";
-  let OperandType = "OPERAND_MEMORY";
-}
-def spe8dis : Operand<iPTR> {   // SPE displacement where the imm is 8-aligned.
-  let PrintMethod = "printMemRegImm";
-  let MIOperandInfo = (ops dispSPE8:$imm, ptr_rc_nor0:$reg);
-  let EncoderMethod = "getSPE8DisEncoding";
-  let DecoderMethod = "decodeSPE8Operands";
-  let OperandType = "OPERAND_MEMORY";
-}
-def spe4dis : Operand<iPTR> {   // SPE displacement where the imm is 4-aligned.
-  let PrintMethod = "printMemRegImm";
-  let MIOperandInfo = (ops dispSPE4:$imm, ptr_rc_nor0:$reg);
-  let EncoderMethod = "getSPE4DisEncoding";
-  let DecoderMethod = "decodeSPE4Operands";
-  let OperandType = "OPERAND_MEMORY";
-}
-def spe2dis : Operand<iPTR> {   // SPE displacement where the imm is 2-aligned.
-  let PrintMethod = "printMemRegImm";
-  let MIOperandInfo = (ops dispSPE2:$imm, ptr_rc_nor0:$reg);
-  let EncoderMethod = "getSPE2DisEncoding";
-  let DecoderMethod = "decodeSPE2Operands";
-  let OperandType = "OPERAND_MEMORY";
-}
-
-// A single-register address. This is used with the SjLj
-// pseudo-instructions which translates to LD/LWZ.  These instructions requires
-// G8RC_NOX0 registers.
-def memr : Operand<iPTR> {
-  let MIOperandInfo = (ops ptr_rc_nor0:$ptrreg);
-  let OperandType = "OPERAND_MEMORY";
-}
-def PPCTLSRegOperand : AsmOperandClass {
-  let Name = "TLSReg"; let PredicateMethod = "isTLSReg";
-  let RenderMethod = "addTLSRegOperands";
-}
-def tlsreg32 : Operand<i32> {
-  let EncoderMethod = "getTLSRegEncoding";
-  let ParserMatchClass = PPCTLSRegOperand;
-}
-def tlsgd32 : Operand<i32> {}
-def tlscall32 : Operand<i32> {
-  let PrintMethod = "printTLSCall";
-  let MIOperandInfo = (ops calltarget:$func, tlsgd32:$sym);
-  let EncoderMethod = "getTLSCallEncoding";
-}
-
-// PowerPC Predicate operand.
-def pred : Operand<OtherVT> {
-  let PrintMethod = "printPredicateOperand";
-  let MIOperandInfo = (ops i32imm:$bibo, crrc:$reg);
-}
-
 // Define PowerPC specific addressing mode.
 
 // d-form
@@ -1152,15 +686,14 @@ def addr   : ComplexPattern<iPTR, 1, "SelectAddr",[], []>;
 /// This is just the offset part of iaddr, used for preinc.
 def iaddroff : ComplexPattern<iPTR, 1, "SelectAddrImmOffs", [], []>;
 
-// PC Relative Address
-def pcreladdr : ComplexPattern<iPTR, 1, "SelectAddrPCRel", [], []>;
-
 // Load and Store Instruction Selection addressing modes.
 def DForm  : ComplexPattern<iPTR, 2, "SelectDForm",    [], [SDNPWantParent]>;
 def DSForm : ComplexPattern<iPTR, 2, "SelectDSForm",   [], [SDNPWantParent]>;
 def DQForm : ComplexPattern<iPTR, 2, "SelectDQForm",   [], [SDNPWantParent]>;
 def XForm  : ComplexPattern<iPTR, 2, "SelectXForm",    [], [SDNPWantParent]>;
 def ForceXForm : ComplexPattern<iPTR, 2, "SelectForceXForm", [], [SDNPWantParent]>;
+def PCRelForm : ComplexPattern<iPTR, 2, "SelectPCRelForm", [], [SDNPWantParent]>;
+def PDForm : ComplexPattern<iPTR, 2, "SelectPDForm",   [], [SDNPWantParent]>;
 
 //===----------------------------------------------------------------------===//
 // PowerPC Instruction Predicate Definitions.
@@ -1183,6 +716,7 @@ def NaNsFPMath
     : Predicate<"!Subtarget->getTargetMachine().Options.NoNaNsFPMath">;
 def HasBPERMD : Predicate<"Subtarget->hasBPERMD()">;
 def HasExtDiv : Predicate<"Subtarget->hasExtDiv()">;
+def IsISA2_06 : Predicate<"Subtarget->isISA2_06()">;
 def IsISA2_07 : Predicate<"Subtarget->isISA2_07()">;
 def IsISA3_0 : Predicate<"Subtarget->isISA3_0()">;
 def HasFPU : Predicate<"Subtarget->hasFPU()">;
@@ -1194,6 +728,8 @@ def ModernAs: Predicate<"!Subtarget->isAIXABI() || Subtarget->HasModernAIXAs">,
                  AssemblerPredicate<(any_of (not AIXOS), FeatureModernAIXAs)>;
 def IsAIX : Predicate<"Subtarget->isAIXABI()">;
 def NotAIX : Predicate<"!Subtarget->isAIXABI()">;
+def IsISAFuture : Predicate<"Subtarget->isISAFuture()">;
+def IsNotISAFuture : Predicate<"!Subtarget->isISAFuture()">;
 
 //===----------------------------------------------------------------------===//
 // PowerPC Multiclass Definitions.
@@ -1272,7 +808,7 @@ multiclass XOForm_1r<bits<6> opcode, bits<9> xo, bit oe, dag OOL, dag IOL,
 
 // Multiclass for instructions which have a record overflow form as well
 // as a record form but no carry (i.e. mulld, mulldo, subf, subfo, etc.)
-multiclass XOForm_1rx<bits<6> opcode, bits<9> xo, bit oe, dag OOL, dag IOL,
+multiclass XOForm_1rx<bits<6> opcode, bits<9> xo, dag OOL, dag IOL,
                       string asmbase, string asmstr, InstrItinClass itin,
                       list<dag> pattern> {
   let BaseName = asmbase in {
@@ -1649,7 +1185,7 @@ def RESTORE_CRBIT : PPCEmitTimePseudo<(outs crbitrc:$cond), (ins memri:$F),
                            "#RESTORE_CRBIT", []>;
 }
 
-let isTerminator = 1, isBarrier = 1, PPC970_Unit = 7 in {
+let isTerminator = 1, isBarrier = 1, PPC970_Unit = 7, hasSideEffects = 0 in {
   let isPredicable = 1, isReturn = 1, Uses = [LR, RM] in
     def BLR : XLForm_2_ext<19, 16, 20, 0, 0, (outs), (ins), "blr", IIC_BrB,
                            [(retflag)]>, Requires<[In32BitMode]>;
@@ -1715,7 +1251,8 @@ def RETGUARD_LOAD_COOKIE : PPCEmitTimePseudo<(outs gprc:$dest),
                         (ins calltarget:$sym), "RGLoadCookie", []>;
 }
 
-let isBranch = 1, isTerminator = 1, hasCtrlDep = 1, PPC970_Unit = 7 in {
+let isBranch = 1, isTerminator = 1, hasCtrlDep = 1, PPC970_Unit = 7,
+    hasSideEffects = 0 in {
   let isBarrier = 1 in {
     let isPredicable = 1 in
       def B : IForm<18, 0, 0, (outs), (ins directbrtarget:$dst),
@@ -1807,7 +1344,8 @@ let isBranch = 1, isTerminator = 1, hasCtrlDep = 1, PPC970_Unit = 7 in {
 }
 
 // The unconditional BCL used by the SjLj setjmp code.
-let isCall = 1, hasCtrlDep = 1, isCodeGenOnly = 1, PPC970_Unit = 7 in {
+let isCall = 1, hasCtrlDep = 1, isCodeGenOnly = 1, PPC970_Unit = 7,
+    hasSideEffects = 0 in {
   let Defs = [LR], Uses = [RM] in {
     def BCLalways  : BForm_2<16, 20, 31, 0, 1, (outs), (ins condbrtarget:$dst),
                             "bcl 20, 31, $dst">;
@@ -1915,6 +1453,26 @@ let isCall = 1, PPC970_Unit = 7, Defs = [LR] in {
   }
 }
 
+let isCall = 1, PPC970_Unit = 7, Defs = [LR, RM], isCodeGenOnly = 1 in {
+  // Convenient aliases for call instructions
+  let Uses = [RM] in {
+    def BL_RM  : IForm<18, 0, 1, (outs), (ins calltarget:$func),
+                       "bl $func", IIC_BrB, []>;  // See Pat patterns below.
+    def BLA_RM : IForm<18, 1, 1, (outs), (ins abscalltarget:$func),
+                       "bla $func", IIC_BrB, [(PPCcall_rm (i32 imm:$func))]>;
+
+    def BL_NOP_RM  : IForm_and_DForm_4_zero<18, 0, 1, 24,
+                                            (outs), (ins calltarget:$func),
+                                            "bl $func\n\tnop", IIC_BrB, []>;
+  }
+  let Uses = [CTR, RM] in {
+    let isPredicable = 1 in
+      def BCTRL_RM : XLForm_2_ext<19, 528, 20, 0, 1, (outs), (ins),
+                                  "bctrl", IIC_BrB, [(PPCbctrl_rm)]>,
+                  Requires<[In32BitMode]>;
+  }
+}
+
 let isCall = 1, isTerminator = 1, isReturn = 1, isBarrier = 1, Uses = [RM] in
 def TCRETURNdi :PPCEmitTimePseudo< (outs),
                         (ins calltarget:$dst, i32imm:$offset),
@@ -1941,8 +1499,16 @@ let isCall = 1, PPC970_Unit = 7, isCodeGenOnly = 1,
 
 }
 
+let isCall = 1, PPC970_Unit = 7, isCodeGenOnly = 1,
+    Defs = [LR, R2, RM], Uses = [CTR, RM], RST = 2 in {
+  def BCTRL_LWZinto_toc_RM:
+    XLForm_2_ext_and_DForm_1<19, 528, 20, 0, 1, 32, (outs),
+     (ins memri:$src), "bctrl\n\tlwz 2, $src", IIC_BrB,
+     [(PPCbctrl_load_toc_rm iaddr:$src)]>, Requires<[In32BitMode]>;
 
-let isCodeGenOnly = 1 in {
+}
+
+let isCodeGenOnly = 1, hasSideEffects = 0 in {
 
 let isTerminator = 1, isBarrier = 1, PPC970_Unit = 7, isBranch = 1,
     isIndirectBranch = 1, isCall = 1, isReturn = 1, Uses = [CTR, RM]  in
@@ -2254,13 +1820,13 @@ def STWAT : X_RD5_RS5_IM5<31, 710, (outs), (ins gprc:$rS, gprc:$rA, u5imm:$FC),
 let isTerminator = 1, isBarrier = 1, hasCtrlDep = 1 in
 def TRAP  : XForm_24<31, 4, (outs), (ins), "trap", IIC_LdStLoad, [(trap)]>;
 
-def TWI : DForm_base<3, (outs), (ins u5imm:$to, gprc:$rA, s16imm:$imm),
+def TWI : DForm_base<3, (outs), (ins u5imm:$to, gprc:$rA, s16imm:$imm, variable_ops),
                      "twi $to, $rA, $imm", IIC_IntTrapW, []>;
-def TW : XForm_1<31, 4, (outs), (ins u5imm:$to, gprc:$rA, gprc:$rB),
+def TW : XForm_1<31, 4, (outs), (ins u5imm:$to, gprc:$rA, gprc:$rB, variable_ops),
                  "tw $to, $rA, $rB", IIC_IntTrapW, []>;
-def TDI : DForm_base<2, (outs), (ins u5imm:$to, g8rc:$rA, s16imm:$imm),
+def TDI : DForm_base<2, (outs), (ins u5imm:$to, g8rc:$rA, s16imm:$imm, variable_ops),
                      "tdi $to, $rA, $imm", IIC_IntTrapD, []>;
-def TD : XForm_1<31, 68, (outs), (ins u5imm:$to, g8rc:$rA, g8rc:$rB),
+def TD : XForm_1<31, 68, (outs), (ins u5imm:$to, g8rc:$rA, g8rc:$rB, variable_ops),
                  "td $to, $rA, $rB", IIC_IntTrapD, []>;
 
 def POPCNTB : XForm_11<31, 122, (outs gprc:$rA), (ins gprc:$rS),
@@ -2275,17 +1841,19 @@ def POPCNTB : XForm_11<31, 122, (outs gprc:$rA), (ins gprc:$rS),
 let PPC970_Unit = 2 in {
 def LBZ : DForm_1<34, (outs gprc:$rD), (ins memri:$src),
                   "lbz $rD, $src", IIC_LdStLoad,
-                  [(set i32:$rD, (zextloadi8 DForm:$src))]>;
+                  [(set i32:$rD, (zextloadi8 DForm:$src))]>, ZExt32To64,
+                  SExt32To64;
 def LHA : DForm_1<42, (outs gprc:$rD), (ins memri:$src),
                   "lha $rD, $src", IIC_LdStLHA,
                   [(set i32:$rD, (sextloadi16 DForm:$src))]>,
-                  PPC970_DGroup_Cracked;
+                  PPC970_DGroup_Cracked, SExt32To64;
 def LHZ : DForm_1<40, (outs gprc:$rD), (ins memri:$src),
                   "lhz $rD, $src", IIC_LdStLoad,
-                  [(set i32:$rD, (zextloadi16 DForm:$src))]>;
+                  [(set i32:$rD, (zextloadi16 DForm:$src))]>, ZExt32To64,
+                  SExt32To64;
 def LWZ : DForm_1<32, (outs gprc:$rD), (ins memri:$src),
                   "lwz $rD, $src", IIC_LdStLoad,
-                  [(set i32:$rD, (load DForm:$src))]>;
+                  [(set i32:$rD, (load DForm:$src))]>, ZExt32To64;
 
 let Predicates = [HasFPU] in {
 def LFS : DForm_1<48, (outs f4rc:$rD), (ins memri:$src),
@@ -2378,23 +1946,25 @@ def LFDUX : XForm_1_memOp<31, 631, (outs f8rc:$rD, ptr_rc_nor0:$ea_result),
 let PPC970_Unit = 2, mayLoad = 1, mayStore = 0 in {
 def LBZX : XForm_1_memOp<31,  87, (outs gprc:$rD), (ins memrr:$src),
                    "lbzx $rD, $src", IIC_LdStLoad,
-                   [(set i32:$rD, (zextloadi8 XForm:$src))]>;
+                   [(set i32:$rD, (zextloadi8 XForm:$src))]>, ZExt32To64,
+                   SExt32To64;
 def LHAX : XForm_1_memOp<31, 343, (outs gprc:$rD), (ins memrr:$src),
                    "lhax $rD, $src", IIC_LdStLHA,
                    [(set i32:$rD, (sextloadi16 XForm:$src))]>,
-                   PPC970_DGroup_Cracked;
+                   PPC970_DGroup_Cracked, SExt32To64;
 def LHZX : XForm_1_memOp<31, 279, (outs gprc:$rD), (ins memrr:$src),
                    "lhzx $rD, $src", IIC_LdStLoad,
-                   [(set i32:$rD, (zextloadi16 XForm:$src))]>;
+                   [(set i32:$rD, (zextloadi16 XForm:$src))]>, ZExt32To64,
+                   SExt32To64;
 def LWZX : XForm_1_memOp<31,  23, (outs gprc:$rD), (ins memrr:$src),
                    "lwzx $rD, $src", IIC_LdStLoad,
-                   [(set i32:$rD, (load XForm:$src))]>;
+                   [(set i32:$rD, (load XForm:$src))]>, ZExt32To64;
 def LHBRX : XForm_1_memOp<31, 790, (outs gprc:$rD), (ins memrr:$src),
                    "lhbrx $rD, $src", IIC_LdStLoad,
-                   [(set i32:$rD, (PPClbrx ForceXForm:$src, i16))]>;
+                   [(set i32:$rD, (PPClbrx ForceXForm:$src, i16))]>, ZExt32To64;
 def LWBRX : XForm_1_memOp<31,  534, (outs gprc:$rD), (ins memrr:$src),
                    "lwbrx $rD, $src", IIC_LdStLoad,
-                   [(set i32:$rD, (PPClbrx ForceXForm:$src, i32))]>;
+                   [(set i32:$rD, (PPClbrx ForceXForm:$src, i32))]>, ZExt32To64;
 
 let Predicates = [HasFPU] in {
 def LFSX   : XForm_25_memOp<31, 535, (outs f4rc:$frD), (ins memrr:$src),
@@ -2639,10 +2209,10 @@ def SUBFIC : DForm_2< 8, (outs gprc:$rD), (ins gprc:$rA, s16imm:$imm),
 let isReMaterializable = 1, isAsCheapAsAMove = 1, isMoveImm = 1 in {
   def LI  : DForm_2_r0<14, (outs gprc:$rD), (ins s16imm:$imm),
                        "li $rD, $imm", IIC_IntSimple,
-                       [(set i32:$rD, imm32SExt16:$imm)]>;
+                       [(set i32:$rD, imm32SExt16:$imm)]>, SExt32To64;
   def LIS : DForm_2_r0<15, (outs gprc:$rD), (ins s17imm:$imm),
                        "lis $rD, $imm", IIC_IntSimple,
-                       [(set i32:$rD, imm16ShiftedSExt:$imm)]>;
+                       [(set i32:$rD, imm16ShiftedSExt:$imm)]>, SExt32To64;
 }
 }
 
@@ -2654,11 +2224,11 @@ let Defs = [CR0] in {
 def ANDI_rec : DForm_4<28, (outs gprc:$dst), (ins gprc:$src1, u16imm:$src2),
                     "andi. $dst, $src1, $src2", IIC_IntGeneral,
                     [(set i32:$dst, (and i32:$src1, immZExt16:$src2))]>,
-                    isRecordForm;
+                    isRecordForm, ZExt32To64, SExt32To64;
 def ANDIS_rec : DForm_4<29, (outs gprc:$dst), (ins gprc:$src1, u16imm:$src2),
                     "andis. $dst, $src1, $src2", IIC_IntGeneral,
                     [(set i32:$dst, (and i32:$src1, imm16ShiftedZExt:$src2))]>,
-                    isRecordForm;
+                    isRecordForm, ZExt32To64;
 }
 def ORI   : DForm_4<24, (outs gprc:$dst), (ins gprc:$src1, u16imm:$src2),
                     "ori $dst, $src1, $src2", IIC_IntSimple,
@@ -2728,13 +2298,13 @@ defm XOR  : XForm_6r<31, 316, (outs gprc:$rA), (ins gprc:$rS, gprc:$rB),
 } // isCommutable
 defm SLW  : XForm_6r<31,  24, (outs gprc:$rA), (ins gprc:$rS, gprc:$rB),
                      "slw", "$rA, $rS, $rB", IIC_IntGeneral,
-                     [(set i32:$rA, (PPCshl i32:$rS, i32:$rB))]>;
+                     [(set i32:$rA, (PPCshl i32:$rS, i32:$rB))]>, ZExt32To64;
 defm SRW  : XForm_6r<31, 536, (outs gprc:$rA), (ins gprc:$rS, gprc:$rB),
                      "srw", "$rA, $rS, $rB", IIC_IntGeneral,
-                     [(set i32:$rA, (PPCsrl i32:$rS, i32:$rB))]>;
+                     [(set i32:$rA, (PPCsrl i32:$rS, i32:$rB))]>, ZExt32To64;
 defm SRAW : XForm_6rc<31, 792, (outs gprc:$rA), (ins gprc:$rS, gprc:$rB),
                       "sraw", "$rA, $rS, $rB", IIC_IntShift,
-                      [(set i32:$rA, (PPCsra i32:$rS, i32:$rB))]>;
+                      [(set i32:$rA, (PPCsra i32:$rS, i32:$rB))]>, SExt32To64;
 }
 
 def : InstAlias<"mr $rA, $rB", (OR gprc:$rA, gprc:$rB, gprc:$rB)>;
@@ -2749,19 +2319,21 @@ let PPC970_Unit = 1 in {  // FXU Operations.
 let hasSideEffects = 0 in {
 defm SRAWI : XForm_10rc<31, 824, (outs gprc:$rA), (ins gprc:$rS, u5imm:$SH),
                         "srawi", "$rA, $rS, $SH", IIC_IntShift,
-                        [(set i32:$rA, (sra i32:$rS, (i32 imm:$SH)))]>;
+                        [(set i32:$rA, (sra i32:$rS, (i32 imm:$SH)))]>,
+                        SExt32To64;
 defm CNTLZW : XForm_11r<31,  26, (outs gprc:$rA), (ins gprc:$rS),
                         "cntlzw", "$rA, $rS", IIC_IntGeneral,
-                        [(set i32:$rA, (ctlz i32:$rS))]>;
+                        [(set i32:$rA, (ctlz i32:$rS))]>, ZExt32To64;
 defm CNTTZW : XForm_11r<31, 538, (outs gprc:$rA), (ins gprc:$rS),
                         "cnttzw", "$rA, $rS", IIC_IntGeneral,
-                        [(set i32:$rA, (cttz i32:$rS))]>, Requires<[IsISA3_0]>;
+                        [(set i32:$rA, (cttz i32:$rS))]>, Requires<[IsISA3_0]>,
+                        ZExt32To64;
 defm EXTSB  : XForm_11r<31, 954, (outs gprc:$rA), (ins gprc:$rS),
                         "extsb", "$rA, $rS", IIC_IntSimple,
-                        [(set i32:$rA, (sext_inreg i32:$rS, i8))]>;
+                        [(set i32:$rA, (sext_inreg i32:$rS, i8))]>, SExt32To64;
 defm EXTSH  : XForm_11r<31, 922, (outs gprc:$rA), (ins gprc:$rS),
                         "extsh", "$rA, $rS", IIC_IntSimple,
-                        [(set i32:$rA, (sext_inreg i32:$rS, i16))]>;
+                        [(set i32:$rA, (sext_inreg i32:$rS, i16))]>, SExt32To64;
 
 let isCommutable = 1 in
 def CMPB : XForm_6<31, 508, (outs gprc:$rA), (ins gprc:$rS, gprc:$rB),
@@ -2953,13 +2525,17 @@ def CRNOR  : XLForm_1<19, 33, (outs crbitrc:$CRD),
                               (ins crbitrc:$CRA, crbitrc:$CRB),
                       "crnor $CRD, $CRA, $CRB", IIC_BrCR,
                       [(set i1:$CRD, (not (or i1:$CRA, i1:$CRB)))]>;
-
 def CREQV  : XLForm_1<19, 289, (outs crbitrc:$CRD),
                                (ins crbitrc:$CRA, crbitrc:$CRB),
                       "creqv $CRD, $CRA, $CRB", IIC_BrCR,
                       [(set i1:$CRD, (not (xor i1:$CRA, i1:$CRB)))]>;
 } // isCommutable
 
+let isCodeGenOnly = 1 in
+def CRNOT  : XLForm_1s<19, 33, (outs crbitrc:$CRD), (ins crbitrc:$CRA),
+                       "crnot $CRD, $CRA", IIC_BrCR,
+                       [(set i1:$CRD, (not i1:$CRA))]>;
+
 def CRANDC : XLForm_1<19, 129, (outs crbitrc:$CRD),
                                (ins crbitrc:$CRA, crbitrc:$CRB),
                       "crandc $CRD, $CRA, $CRB", IIC_BrCR,
@@ -3026,13 +2602,17 @@ def MTCTR : XFXForm_7_ext<31, 467, 9, (outs), (ins gprc:$rS),
                           "mtctr $rS", IIC_SprMTSPR>,
             PPC970_DGroup_First, PPC970_Unit_FXU;
 }
-let hasSideEffects = 1, isCodeGenOnly = 1, Defs = [CTR] in {
+let hasSideEffects = 1, isCodeGenOnly = 1, isNotDuplicable = 1, Defs = [CTR] in {
 let Pattern = [(int_set_loop_iterations i32:$rS)] in
 def MTCTRloop : XFXForm_7_ext<31, 467, 9, (outs), (ins gprc:$rS),
                               "mtctr $rS", IIC_SprMTSPR>,
                 PPC970_DGroup_First, PPC970_Unit_FXU;
 }
 
+let hasSideEffects = 1, hasNoSchedulingInfo = 1, isNotDuplicable = 1, Uses = [CTR], Defs = [CTR] in
+def DecreaseCTRloop : PPCEmitTimePseudo<(outs crbitrc:$rT), (ins i32imm:$stride),
+                                       "#DecreaseCTRloop", [(set i1:$rT, (int_loop_decrement (i32 imm:$stride)))]>;
+
 let hasSideEffects = 0 in {
 let Defs = [LR] in {
 def MTLR  : XFXForm_7_ext<31, 467, 8, (outs), (ins gprc:$rS),
@@ -3046,6 +2626,22 @@ def MFLR  : XFXForm_1_ext<31, 339, 8, (outs gprc:$rT), (ins),
 }
 }
 
+let hasSideEffects = 1 in {
+  def MTUDSCR : XFXForm_7_ext<31, 467, 3, (outs), (ins gprc:$rX),
+                              "mtspr 3, $rX", IIC_SprMTSPR>,
+                PPC970_DGroup_Single, PPC970_Unit_FXU;
+  def MFUDSCR : XFXForm_1_ext<31, 339, 3, (outs gprc:$rX), (ins),
+                              "mfspr $rX, 3", IIC_SprMFSPR>,
+                PPC970_DGroup_First, PPC970_Unit_FXU;
+}
+
+// Disable these alias on AIX since they are not supported.
+let Predicates = [ModernAs] in {
+// Aliases for moving to/from dscr to mtspr/mfspr
+def : InstAlias<"mtudscr $Rx", (MTUDSCR gprc:$Rx)>;
+def : InstAlias<"mfudscr $Rx", (MFUDSCR gprc:$Rx)>;
+}
+
 let isCodeGenOnly = 1 in {
   // Move to/from VRSAVE: despite being a SPR, the VRSAVE register is renamed
   // like a GPR on the PPC970.  As such, copies in and out have the same
@@ -3131,14 +2727,14 @@ def MTFSB1 : XForm_43<63, 38, (outs), (ins u5imm:$FM),
              PPC970_DGroup_Single, PPC970_Unit_FPU;
 }
 
-let Defs = [RM] in {
+let Defs = [RM], hasSideEffects = 1 in {
   let isCodeGenOnly = 1 in
   def MTFSFb  : XFLForm<63, 711, (outs), (ins i32imm:$FM, f8rc:$rT),
                         "mtfsf $FM, $rT", IIC_IntMTFSB0,
                         [(int_ppc_mtfsf timm:$FM, f64:$rT)]>,
                 PPC970_DGroup_Single, PPC970_Unit_FPU;
 }
-let Uses = [RM] in {
+let Uses = [RM], hasSideEffects = 1 in {
   def MFFS   : XForm_42<63, 583, (outs f8rc:$rT), (ins),
                          "mffs $rT", IIC_IntMFFS,
                          [(set f64:$rT, (PPCmffs))]>,
@@ -3195,7 +2791,7 @@ def ADDEX : Z23Form_RTAB5_CY2<31, 170, (outs gprc:$rT),
 let PPC970_Unit = 1, hasSideEffects = 0 in {  // FXU Operations.
 // XO-Form instructions.  Arithmetic instructions that can set overflow bit
 let isCommutable = 1 in
-defm ADD4  : XOForm_1rx<31, 266, 0, (outs gprc:$rT), (ins gprc:$rA, gprc:$rB),
+defm ADD4  : XOForm_1rx<31, 266, (outs gprc:$rT), (ins gprc:$rA, gprc:$rB),
                         "add", "$rT, $rA, $rB", IIC_IntSimple,
                         [(set i32:$rT, (add i32:$rA, i32:$rB))]>;
 let isCodeGenOnly = 1 in
@@ -3229,11 +2825,11 @@ defm MULHW : XOForm_1r<31, 75, 0, (outs gprc:$rT), (ins gprc:$rA, gprc:$rB),
 defm MULHWU : XOForm_1r<31, 11, 0, (outs gprc:$rT), (ins gprc:$rA, gprc:$rB),
                        "mulhwu", "$rT, $rA, $rB", IIC_IntMulHWU,
                        [(set i32:$rT, (mulhu i32:$rA, i32:$rB))]>;
-defm MULLW : XOForm_1rx<31, 235, 0, (outs gprc:$rT), (ins gprc:$rA, gprc:$rB),
+defm MULLW : XOForm_1rx<31, 235, (outs gprc:$rT), (ins gprc:$rA, gprc:$rB),
                         "mullw", "$rT, $rA, $rB", IIC_IntMulHW,
                         [(set i32:$rT, (mul i32:$rA, i32:$rB))]>;
 } // isCommutable
-defm SUBF  : XOForm_1rx<31, 40, 0, (outs gprc:$rT), (ins gprc:$rA, gprc:$rB),
+defm SUBF  : XOForm_1rx<31, 40, (outs gprc:$rT), (ins gprc:$rA, gprc:$rB),
                         "subf", "$rT, $rA, $rB", IIC_IntGeneral,
                         [(set i32:$rT, (sub i32:$rB, i32:$rA))]>;
 defm SUBFC : XOForm_1rc<31, 8, 0, (outs gprc:$rT), (ins gprc:$rA, gprc:$rB),
@@ -3458,6 +3054,12 @@ def : Pat<(PPCcall (i32 tglobaladdr:$dst)),
 def : Pat<(PPCcall (i32 texternalsym:$dst)),
           (BL texternalsym:$dst)>;
 
+def : Pat<(PPCcall_rm (i32 tglobaladdr:$dst)),
+          (BL_RM tglobaladdr:$dst)>;
+
+def : Pat<(PPCcall_rm (i32 texternalsym:$dst)),
+          (BL_RM texternalsym:$dst)>;
+
 // Calls for AIX only
 def : Pat<(PPCcall (i32 mcsym:$dst)),
           (BL mcsym:$dst)>;
@@ -3468,6 +3070,15 @@ def : Pat<(PPCcall_nop (i32 mcsym:$dst)),
 def : Pat<(PPCcall_nop (i32 texternalsym:$dst)),
           (BL_NOP texternalsym:$dst)>;
 
+def : Pat<(PPCcall_rm (i32 mcsym:$dst)),
+          (BL_RM mcsym:$dst)>;
+
+def : Pat<(PPCcall_nop_rm (i32 mcsym:$dst)),
+          (BL_NOP_RM mcsym:$dst)>;
+
+def : Pat<(PPCcall_nop_rm (i32 texternalsym:$dst)),
+          (BL_NOP_RM texternalsym:$dst)>;
+
 def : Pat<(PPCtc_return (i32 tglobaladdr:$dst),  imm:$imm),
           (TCRETURNdi tglobaladdr:$dst, imm:$imm)>;
 
@@ -3690,12 +3301,12 @@ def : Pat<(fcopysign f32:$frB, f64:$frA),
 // XL Compat intrinsics.
 def : Pat<(int_ppc_fmsub f64:$A, f64:$B, f64:$C), (FMSUB $A, $B, $C)>;
 def : Pat<(int_ppc_fmsubs f32:$A, f32:$B, f32:$C), (FMSUBS $A, $B, $C)>;
-def : Pat<(int_ppc_fnmsub f64:$A, f64:$B, f64:$C), (FNMSUB $A, $B, $C)>;
-def : Pat<(int_ppc_fnmsubs f32:$A, f32:$B, f32:$C), (FNMSUBS $A, $B, $C)>;
 def : Pat<(int_ppc_fnmadd f64:$A, f64:$B, f64:$C), (FNMADD $A, $B, $C)>;
 def : Pat<(int_ppc_fnmadds f32:$A, f32:$B, f32:$C), (FNMADDS $A, $B, $C)>;
 def : Pat<(int_ppc_fre f64:$A), (FRE $A)>;
 def : Pat<(int_ppc_fres f32:$A), (FRES $A)>;
+def : Pat<(int_ppc_fnabs f64:$A), (FNABSD $A)>;
+def : Pat<(int_ppc_fnabss f32:$A), (FNABSS $A)>;
 
 include "PPCInstrAltivec.td"
 include "PPCInstrSPE.td"
@@ -3704,13 +3315,16 @@ include "PPCInstrVSX.td"
 include "PPCInstrHTM.td"
 
 def crnot : OutPatFrag<(ops node:$in),
-                       (CRNOR $in, $in)>;
+                       (CRNOT $in)>;
 def       : Pat<(not i1:$in),
                 (crnot $in)>;
 
 // Prefixed instructions may require access to the above defs at a later
 // time so we include this after the def.
-include "PPCInstrPrefix.td"
+include "PPCInstrP10.td"
+include "PPCInstrFutureMMA.td"
+include "PPCInstrFuture.td"
+include "PPCInstrMMA.td"
 
 // Patterns for arithmetic i1 operations.
 def : Pat<(add i1:$a, i1:$b),
@@ -3738,9 +3352,9 @@ def : Pat<(i64 (sext i1:$in)),
 // FIXME: We should choose either a zext or a sext based on other constants
 // already around.
 def : Pat<(i32 (anyext i1:$in)),
-          (SELECT_I4 $in, (LI 1), (LI 0))>;
+          (SELECT_I4 crbitrc:$in, (LI 1), (LI 0))>;
 def : Pat<(i64 (anyext i1:$in)),
-          (SELECT_I8 $in, (LI8 1), (LI8 0))>;
+          (SELECT_I8 crbitrc:$in, (LI8 1), (LI8 0))>;
 
 // match setcc on i1 variables.
 // CRANDC is:
@@ -4146,34 +3760,34 @@ defm : CRNotPat<(i1 (setcc i64:$s1, i64:$s2, SETNE)),
 
 multiclass FSetCCPat<SDPatternOperator SetCC, ValueType Ty, I FCmp> {
   defm : CRNotPat<(i1 (SetCC Ty:$s1, Ty:$s2, SETUGE)),
-                  (EXTRACT_SUBREG (FCmp $s1, $s2), sub_lt)>;
+                  (EXTRACT_SUBREG (FCmp Ty:$s1, Ty:$s2), sub_lt)>;
   defm : CRNotPat<(i1 (SetCC Ty:$s1, Ty:$s2, SETGE)),
-                  (EXTRACT_SUBREG (FCmp $s1, $s2), sub_lt)>;
+                  (EXTRACT_SUBREG (FCmp Ty:$s1, Ty:$s2), sub_lt)>;
   defm : CRNotPat<(i1 (SetCC Ty:$s1, Ty:$s2, SETULE)),
-                  (EXTRACT_SUBREG (FCmp $s1, $s2), sub_gt)>;
+                  (EXTRACT_SUBREG (FCmp Ty:$s1, Ty:$s2), sub_gt)>;
   defm : CRNotPat<(i1 (SetCC Ty:$s1, Ty:$s2, SETLE)),
-                  (EXTRACT_SUBREG (FCmp $s1, $s2), sub_gt)>;
+                  (EXTRACT_SUBREG (FCmp Ty:$s1, Ty:$s2), sub_gt)>;
   defm : CRNotPat<(i1 (SetCC Ty:$s1, Ty:$s2, SETUNE)),
-                  (EXTRACT_SUBREG (FCmp $s1, $s2), sub_eq)>;
+                  (EXTRACT_SUBREG (FCmp Ty:$s1, Ty:$s2), sub_eq)>;
   defm : CRNotPat<(i1 (SetCC Ty:$s1, Ty:$s2, SETNE)),
-                  (EXTRACT_SUBREG (FCmp $s1, $s2), sub_eq)>;
+                  (EXTRACT_SUBREG (FCmp Ty:$s1, Ty:$s2), sub_eq)>;
   defm : CRNotPat<(i1 (SetCC Ty:$s1, Ty:$s2, SETO)),
-                  (EXTRACT_SUBREG (FCmp $s1, $s2), sub_un)>;
+                  (EXTRACT_SUBREG (FCmp Ty:$s1, Ty:$s2), sub_un)>;
 
   def : Pat<(i1 (SetCC Ty:$s1, Ty:$s2, SETOLT)),
-            (EXTRACT_SUBREG (FCmp $s1, $s2), sub_lt)>;
+            (EXTRACT_SUBREG (FCmp Ty:$s1, Ty:$s2), sub_lt)>;
   def : Pat<(i1 (SetCC Ty:$s1, Ty:$s2, SETLT)),
-            (EXTRACT_SUBREG (FCmp $s1, $s2), sub_lt)>;
+            (EXTRACT_SUBREG (FCmp Ty:$s1, Ty:$s2), sub_lt)>;
   def : Pat<(i1 (SetCC Ty:$s1, Ty:$s2, SETOGT)),
-            (EXTRACT_SUBREG (FCmp $s1, $s2), sub_gt)>;
+            (EXTRACT_SUBREG (FCmp Ty:$s1, Ty:$s2), sub_gt)>;
   def : Pat<(i1 (SetCC Ty:$s1, Ty:$s2, SETGT)),
-            (EXTRACT_SUBREG (FCmp $s1, $s2), sub_gt)>;
+            (EXTRACT_SUBREG (FCmp Ty:$s1, Ty:$s2), sub_gt)>;
   def : Pat<(i1 (SetCC Ty:$s1, Ty:$s2, SETOEQ)),
-            (EXTRACT_SUBREG (FCmp $s1, $s2), sub_eq)>;
+            (EXTRACT_SUBREG (FCmp Ty:$s1, Ty:$s2), sub_eq)>;
   def : Pat<(i1 (SetCC Ty:$s1, Ty:$s2, SETEQ)),
-            (EXTRACT_SUBREG (FCmp $s1, $s2), sub_eq)>;
+            (EXTRACT_SUBREG (FCmp Ty:$s1, Ty:$s2), sub_eq)>;
   def : Pat<(i1 (SetCC Ty:$s1, Ty:$s2, SETUO)),
-            (EXTRACT_SUBREG (FCmp $s1, $s2), sub_un)>;
+            (EXTRACT_SUBREG (FCmp Ty:$s1, Ty:$s2), sub_un)>;
 }
 
 let Predicates = [HasFPU] in {
@@ -4526,7 +4140,7 @@ def MCRFS : XLForm_3<63, 64, (outs crrc:$BF), (ins crrc:$BFA),
 // All MTFSF variants may change the rounding mode so conservatively set it
 // as an implicit def for all of them.
 let Predicates = [HasFPU] in {
-let Defs = [RM] in {
+let Defs = [RM], hasSideEffects = 1 in {
 let isCodeGenOnly = 1,
     Pattern = [(int_ppc_mtfsfi timm:$BF, timm:$U)], W = 0 in
 def MTFSFIb : XLForm_4<63, 134, (outs), (ins u3imm:$BF, u4imm:$U),
@@ -4742,6 +4356,7 @@ class PPCAsmPseudo<string asm, dag iops>
 def : InstAlias<"sc", (SC 0)>;
 
 def : InstAlias<"sync", (SYNC 0)>, Requires<[HasSYNC]>;
+def : InstAlias<"hwsync", (SYNC 0), 0>, Requires<[HasSYNC]>;
 def : InstAlias<"msync", (SYNC 0), 0>, Requires<[HasSYNC]>;
 def : InstAlias<"lwsync", (SYNC 1)>, Requires<[HasSYNC]>;
 def : InstAlias<"ptesync", (SYNC 2)>, Requires<[HasSYNC]>;
@@ -4967,9 +4582,11 @@ def SUBIC_rec : PPCAsmPseudo<"subic. $rA, $rB, $imm",
                           (ins gprc:$rA, gprc:$rB, s16imm:$imm)>;
 
 def EXTLWI : PPCAsmPseudo<"extlwi $rA, $rS, $n, $b",
-                          (ins gprc:$rA, gprc:$rS, u5imm:$n, u5imm:$b)>;
+                          (ins gprc:$rA, gprc:$rS, u5imm:$n, u5imm:$b)>,
+                          ZExt32To64;
 def EXTLWI_rec : PPCAsmPseudo<"extlwi. $rA, $rS, $n, $b",
-                           (ins gprc:$rA, gprc:$rS, u5imm:$n, u5imm:$b)>;
+                           (ins gprc:$rA, gprc:$rS, u5imm:$n, u5imm:$b)>,
+                           ZExt32To64;
 def EXTRWI : PPCAsmPseudo<"extrwi $rA, $rS, $n, $b",
                           (ins gprc:$rA, gprc:$rS, u5imm:$n, u5imm:$b)>;
 def EXTRWI_rec : PPCAsmPseudo<"extrwi. $rA, $rS, $n, $b",
@@ -4983,17 +4600,17 @@ def INSRWI : PPCAsmPseudo<"insrwi $rA, $rS, $n, $b",
 def INSRWI_rec : PPCAsmPseudo<"insrwi. $rA, $rS, $n, $b",
                            (ins gprc:$rA, gprc:$rS, u5imm:$n, u5imm:$b)>;
 def ROTRWI : PPCAsmPseudo<"rotrwi $rA, $rS, $n",
-                          (ins gprc:$rA, gprc:$rS, u5imm:$n)>;
+                          (ins gprc:$rA, gprc:$rS, u5imm:$n)>, ZExt32To64;
 def ROTRWI_rec : PPCAsmPseudo<"rotrwi. $rA, $rS, $n",
-                           (ins gprc:$rA, gprc:$rS, u5imm:$n)>;
+                           (ins gprc:$rA, gprc:$rS, u5imm:$n)>, ZExt32To64;
 def SLWI : PPCAsmPseudo<"slwi $rA, $rS, $n",
-                        (ins gprc:$rA, gprc:$rS, u5imm:$n)>;
+                        (ins gprc:$rA, gprc:$rS, u5imm:$n)>, ZExt32To64;
 def SLWI_rec : PPCAsmPseudo<"slwi. $rA, $rS, $n",
-                         (ins gprc:$rA, gprc:$rS, u5imm:$n)>;
+                         (ins gprc:$rA, gprc:$rS, u5imm:$n)>, ZExt32To64;
 def SRWI : PPCAsmPseudo<"srwi $rA, $rS, $n",
-                        (ins gprc:$rA, gprc:$rS, u5imm:$n)>;
+                        (ins gprc:$rA, gprc:$rS, u5imm:$n)>, ZExt32To64;
 def SRWI_rec : PPCAsmPseudo<"srwi. $rA, $rS, $n",
-                         (ins gprc:$rA, gprc:$rS, u5imm:$n)>;
+                         (ins gprc:$rA, gprc:$rS, u5imm:$n)>, ZExt32To64;
 def CLRRWI : PPCAsmPseudo<"clrrwi $rA, $rS, $n",
                           (ins gprc:$rA, gprc:$rS, u5imm:$n)>;
 def CLRRWI_rec : PPCAsmPseudo<"clrrwi. $rA, $rS, $n",
@@ -5084,7 +4701,7 @@ def RLWNMbm_rec : PPCAsmPseudo<"rlwnm. $rA, $rS, $n, $b",
 
 // These generic branch instruction forms are used for the assembler parser only.
 // Defs and Uses are conservative, since we don't know the BO value.
-let PPC970_Unit = 7, isBranch = 1 in {
+let PPC970_Unit = 7, isBranch = 1, hasSideEffects = 0 in {
   let Defs = [CTR], Uses = [CTR, RM] in {
     def gBC : BForm_3<16, 0, 0, (outs),
                       (ins u5imm:$bo, crbitrc:$bi, condbrtarget:$dst),
@@ -5319,7 +4936,7 @@ def MSGSYNC : XForm_0<31, 886, (outs), (ins), "msgsync", IIC_SprMSGSYNC, []>;
 def STOP : XForm_0<19, 370, (outs), (ins), "stop", IIC_SprSTOP, []>;
 
 def SETB : XForm_44<31, 128, (outs gprc:$RT), (ins crrc:$BFA),
-                       "setb $RT, $BFA", IIC_IntGeneral>;
+                       "setb $RT, $BFA", IIC_IntGeneral>, SExt32To64;
 } // IsISA3_0
 
 let Predicates = [IsISA3_0] in {
@@ -5491,6 +5108,30 @@ def DWBytes3210 {
     (i64 (INSERT_SUBREG (i64 (IMPLICIT_DEF)), Word, sub_32));
 }
 
+// These instructions store a hash computed from the value of the link register
+// and the value of the stack pointer.
+let mayStore = 1 in {
+def HASHST : XForm_XD6_RA5_RB5<31, 722, (outs),
+                               (ins gprc:$RB, memrihash:$D_RA_XD),
+                               "hashst $RB, $D_RA_XD", IIC_IntGeneral, []>;
+def HASHSTP : XForm_XD6_RA5_RB5<31, 658, (outs),
+                                (ins gprc:$RB, memrihash:$D_RA_XD),
+                                "hashstp $RB, $D_RA_XD", IIC_IntGeneral, []>;
+}
+
+// These instructions check a hash computed from the value of the link register
+// and the value of the stack pointer. The hasSideEffects flag is needed as the
+// instruction may TRAP if the hash does not match the hash stored at the
+// specified address.
+let mayLoad = 1, hasSideEffects = 1 in {
+def HASHCHK : XForm_XD6_RA5_RB5<31, 754, (outs),
+                                (ins gprc:$RB, memrihash:$D_RA_XD),
+                                "hashchk $RB, $D_RA_XD", IIC_IntGeneral, []>;
+def HASHCHKP : XForm_XD6_RA5_RB5<31, 690, (outs),
+                                 (ins gprc:$RB, memrihash:$D_RA_XD),
+                                 "hashchkp $RB, $D_RA_XD", IIC_IntGeneral, []>;
+}
+
 // Now both high word and low word are reversed, next
 // swap the high word and low word.
 def : Pat<(i64 (bitreverse i64:$A)),
@@ -5498,12 +5139,12 @@ def : Pat<(i64 (bitreverse i64:$A)),
 
 def : Pat<(int_ppc_stwcx ForceXForm:$dst, gprc:$A),
           (STWCX gprc:$A, ForceXForm:$dst)>;
+def : Pat<(PPCStoreCond ForceXForm:$dst, gprc:$A, 4),
+          (STWCX gprc:$A, ForceXForm:$dst)>;
 def : Pat<(int_ppc_stbcx ForceXForm:$dst, gprc:$A),
           (STBCX gprc:$A, ForceXForm:$dst)>;
-def : Pat<(int_ppc_tw gprc:$A, gprc:$B, i32:$IMM),
-          (TW $IMM, $A, $B)>;
-def : Pat<(int_ppc_trap gprc:$A),
-          (TWI 24, $A, 0)>;
+def : Pat<(PPCStoreCond ForceXForm:$dst, gprc:$A, 1),
+          (STBCX gprc:$A, ForceXForm:$dst)>;
 
 def : Pat<(int_ppc_fcfid f64:$A),
         (XSCVSXDDP $A)>;
@@ -5533,7 +5174,9 @@ def : Pat<(int_ppc_mtmsr gprc:$RS),
 
 let Predicates = [IsISA2_07] in {
   def : Pat<(int_ppc_sthcx ForceXForm:$dst, gprc:$A),
-          (STHCX gprc:$A, ForceXForm:$dst)>;
+            (STHCX gprc:$A, ForceXForm:$dst)>;
+  def : Pat<(PPCStoreCond ForceXForm:$dst, gprc:$A, 2),
+            (STHCX gprc:$A, ForceXForm:$dst)>;
 }
 def : Pat<(int_ppc_dcbtstt ForceXForm:$dst),
           (DCBTST 16, ForceXForm:$dst)>;
diff --git a/gnu/llvm/llvm/lib/Target/PowerPC/PPCInstrPrefix.td b/gnu/llvm/llvm/lib/Target/PowerPC/PPCInstrPrefix.td
deleted file mode 100644
index b183dbd4b3b..00000000000
--- a/gnu/llvm/llvm/lib/Target/PowerPC/PPCInstrPrefix.td
+++ /dev/null
@@ -1,2838 +0,0 @@
-//-------------------------- Predicate definitions ---------------------------//
-def IsPPC32 : Predicate<"!Subtarget->isPPC64()">;
-
-// Mask immediates for MMA instructions (2, 4 and 8 bits).
-def Msk2Imm : ImmLeaf<i32, [{ return isUInt<2>(Imm); }]>;
-def Msk4Imm : ImmLeaf<i32, [{ return isUInt<4>(Imm); }]>;
-def Msk8Imm : ImmLeaf<i32, [{ return isUInt<8>(Imm); }]>;
-
-//===----------------------------------------------------------------------===//
-// PowerPC ISA 3.1 specific type constraints.
-//
-
-def SDT_PPCSplat32 : SDTypeProfile<1, 3, [ SDTCisVT<0, v2i64>,
-  SDTCisVec<1>, SDTCisInt<2>, SDTCisInt<3>
-]>;
-def SDT_PPCAccBuild : SDTypeProfile<1, 4, [
-  SDTCisVT<0, v512i1>, SDTCisVT<1, v4i32>, SDTCisVT<2, v4i32>,
-                       SDTCisVT<3, v4i32>, SDTCisVT<4, v4i32>
-]>;
-def SDT_PPCPairBuild : SDTypeProfile<1, 2, [
-  SDTCisVT<0, v256i1>, SDTCisVT<1, v4i32>, SDTCisVT<2, v4i32>
-]>;
-def SDT_PPCAccExtractVsx : SDTypeProfile<1, 2, [
-  SDTCisVT<0, v4i32>, SDTCisVT<1, v512i1>, SDTCisPtrTy<2>
-]>;
-def SDT_PPCPairExtractVsx : SDTypeProfile<1, 2, [
-  SDTCisVT<0, v4i32>, SDTCisVT<1, v256i1>, SDTCisPtrTy<2>
-]>;
-def SDT_PPCxxmfacc : SDTypeProfile<1, 1, [
-  SDTCisVT<0, v512i1>, SDTCisVT<1, v512i1>
-]>;
-def SDT_PPCVecInsertElt : SDTypeProfile<1, 3, [
-  SDTCisVec<0>, SDTCisVec<1>, SDTCisInt<3>
-]>;
-
-//===----------------------------------------------------------------------===//
-// ISA 3.1 specific PPCISD nodes.
-//
-
-def PPCxxsplti32dx : SDNode<"PPCISD::XXSPLTI32DX", SDT_PPCSplat32, []>;
-def PPCAccBuild : SDNode<"PPCISD::ACC_BUILD", SDT_PPCAccBuild, []>;
-def PPCPairBuild : SDNode<"PPCISD::PAIR_BUILD", SDT_PPCPairBuild, []>;
-def PPCAccExtractVsx : SDNode<"PPCISD::EXTRACT_VSX_REG", SDT_PPCAccExtractVsx,
-                       []>;
-def PPCPairExtractVsx : SDNode<"PPCISD::EXTRACT_VSX_REG", SDT_PPCPairExtractVsx,
-                        []>;
-def PPCxxmfacc : SDNode<"PPCISD::XXMFACC", SDT_PPCxxmfacc, []>;
-def PPCvecinsertelt : SDNode<"PPCISD::VECINSERT", SDT_PPCVecInsertElt, []>;
-
-//===----------------------------------------------------------------------===//
-
-// PC Relative flag (for instructions that use the address of the prefix for
-// address computations).
-class isPCRel { bit PCRel = 1; }
-
-// PowerPC specific type constraints.
-def SDT_PPCLXVRZX : SDTypeProfile<1, 2, [
-  SDTCisVT<0, v1i128>, SDTCisPtrTy<1>, SDTCisPtrTy<2>
-]>;
-
-// PPC Specific DAG Nodes.
-def PPClxvrzx : SDNode<"PPCISD::LXVRZX", SDT_PPCLXVRZX,
-                       [SDNPHasChain, SDNPMayLoad]>;
-
-// Top-level class for prefixed instructions.
-class PI<bits<6> pref, bits<6> opcode, dag OOL, dag IOL, string asmstr,
-         InstrItinClass itin> : Instruction {
-  field bits<64> Inst;
-  field bits<64> SoftFail = 0;
-  bit PCRel = 0; // Default value, set by isPCRel.
-  let Size = 8;
-
-  let Namespace = "PPC";
-  let OutOperandList = OOL;
-  let InOperandList = IOL;
-  let AsmString = asmstr;
-  let Itinerary = itin;
-  let Inst{0-5} = pref;
-  let Inst{32-37} = opcode;
-
-  bits<1> PPC970_First = 0;
-  bits<1> PPC970_Single = 0;
-  bits<1> PPC970_Cracked = 0;
-  bits<3> PPC970_Unit = 0;
-
-  /// These fields correspond to the fields in PPCInstrInfo.h.  Any changes to
-  /// these must be reflected there!  See comments there for what these are.
-  let TSFlags{0}   = PPC970_First;
-  let TSFlags{1}   = PPC970_Single;
-  let TSFlags{2}   = PPC970_Cracked;
-  let TSFlags{5-3} = PPC970_Unit;
-
-  bits<1> Prefixed = 1;  // This is a prefixed instruction.
-  let TSFlags{7}  = Prefixed;
-
-  // For cases where multiple instruction definitions really represent the
-  // same underlying instruction but with one definition for 64-bit arguments
-  // and one for 32-bit arguments, this bit breaks the degeneracy between
-  // the two forms and allows TableGen to generate mapping tables.
-  bit Interpretation64Bit = 0;
-
-  // Fields used for relation models.
-  string BaseName = "";
-}
-
-// VX-Form: [ PO VT R VB RC XO ]
-class VXForm_VTB5_RC<bits<10> xo, bits<5> R, dag OOL, dag IOL, string asmstr,
-                      InstrItinClass itin, list<dag> pattern>
-  : I<4, OOL, IOL, asmstr, itin> {
-  bits<5> VT;
-  bits<5> VB;
-  bit RC = 0;
-
-  let Pattern = pattern;
-
-  let Inst{6-10} = VT;
-  let Inst{11-15} = R;
-  let Inst{16-20} = VB;
-  let Inst{21} = RC;
-  let Inst{22-31} = xo;
-}
-
-// Multiclass definition to account for record and non-record form
-// instructions of VXRForm.
-multiclass VXForm_VTB5_RCr<bits<10> xo, bits<5> R, dag OOL, dag IOL,
-                            string asmbase, string asmstr,
-                            InstrItinClass itin, list<dag> pattern> {
-  let BaseName = asmbase in {
-    def NAME : VXForm_VTB5_RC<xo, R, OOL, IOL,
-                               !strconcat(asmbase, !strconcat(" ", asmstr)),
-                               itin, pattern>, RecFormRel;
-    let Defs = [CR6] in
-    def _rec : VXForm_VTB5_RC<xo, R, OOL, IOL,
-                               !strconcat(asmbase, !strconcat(". ", asmstr)),
-                               itin, []>, isRecordForm, RecFormRel;
-  }
-}
-
-class MLS_DForm_R_SI34_RTA5_MEM<bits<6> opcode, dag OOL, dag IOL, string asmstr,
-                                InstrItinClass itin, list<dag> pattern>
-  : PI<1, opcode, OOL, IOL, asmstr, itin> {
-  bits<5> FRS;
-  bits<39> D_RA;
-
-  let Pattern = pattern;
-
-  // The prefix.
-  let Inst{6-7} = 2;
-  let Inst{8-10} = 0;
-  let Inst{11} = PCRel;
-  let Inst{12-13} = 0;
-  let Inst{14-31} = D_RA{33-16}; // d0
-
-  // The instruction.
-  let Inst{38-42} = FRS{4-0};
-  let Inst{43-47} = D_RA{38-34}; // RA
-  let Inst{48-63} = D_RA{15-0}; // d1
-}
-
-class MLS_DForm_R_SI34_RTA5<bits<6> opcode, dag OOL, dag IOL, string asmstr,
-                            InstrItinClass itin, list<dag> pattern>
-  : PI<1, opcode, OOL, IOL, asmstr, itin> {
-  bits<5> RT;
-  bits<5> RA;
-  bits<34> SI;
-
-  let Pattern = pattern;
-
-  // The prefix.
-  let Inst{6-7} = 2;
-  let Inst{8-10} = 0;
-  let Inst{11} = PCRel;
-  let Inst{12-13} = 0;
-  let Inst{14-31} = SI{33-16};
-
-  // The instruction.
-  let Inst{38-42} = RT;
-  let Inst{43-47} = RA;
-  let Inst{48-63} = SI{15-0};
-}
-
-class MLS_DForm_SI34_RT5<bits<6> opcode, dag OOL, dag IOL, string asmstr,
-                         InstrItinClass itin, list<dag> pattern>
-  : PI<1, opcode, OOL, IOL, asmstr, itin> {
-  bits<5> RT;
-  bits<34> SI;
-
-  let Pattern = pattern;
-
-  // The prefix.
-  let Inst{6-7} = 2;
-  let Inst{8-10} = 0;
-  let Inst{11} = 0;
-  let Inst{12-13} = 0;
-  let Inst{14-31} = SI{33-16};
-
-  // The instruction.
-  let Inst{38-42} = RT;
-  let Inst{43-47} = 0;
-  let Inst{48-63} = SI{15-0};
-}
-
-multiclass MLS_DForm_R_SI34_RTA5_p<bits<6> opcode, dag OOL, dag IOL,
-                                   dag PCRel_IOL, string asmstr,
-                                   InstrItinClass itin> {
-  def NAME : MLS_DForm_R_SI34_RTA5<opcode, OOL, IOL,
-                                   !strconcat(asmstr, ", 0"), itin, []>;
-  def pc : MLS_DForm_R_SI34_RTA5<opcode, OOL, PCRel_IOL,
-                                 !strconcat(asmstr, ", 1"), itin, []>, isPCRel;
-}
-
-class 8LS_DForm_R_SI34_RTA5<bits<6> opcode, dag OOL, dag IOL, string asmstr,
-                            InstrItinClass itin, list<dag> pattern>
-  : PI<1, opcode, OOL, IOL, asmstr, itin> {
-  bits<5> RT;
-  bits<39> D_RA;
-
-  let Pattern = pattern;
-
-  // The prefix.
-  let Inst{6-10} = 0;
-  let Inst{11} = PCRel;
-  let Inst{12-13} = 0;
-  let Inst{14-31} = D_RA{33-16}; // d0
-
-  // The instruction.
-  let Inst{38-42} = RT{4-0};
-  let Inst{43-47} = D_RA{38-34}; // RA
-  let Inst{48-63} = D_RA{15-0}; // d1
-}
-
-// 8LS:D-Form: [ 1 0 0 // R // d0
-//               PO TX T RA d1 ]
-class 8LS_DForm_R_SI34_XT6_RA5<bits<5> opcode, dag OOL, dag IOL, string asmstr,
-                               InstrItinClass itin, list<dag> pattern>
-  : PI<1, { opcode, ? }, OOL, IOL, asmstr, itin> {
-  bits<6> XT;
-  bits<39> D_RA;
-
-  let Pattern = pattern;
-
-  // The prefix.
-  let Inst{6-7} = 0;
-  let Inst{8} = 0;
-  let Inst{9-10} = 0; // reserved
-  let Inst{11} = PCRel;
-  let Inst{12-13} = 0; // reserved
-  let Inst{14-31} = D_RA{33-16}; // d0
-
-  // The instruction.
-  let Inst{37} = XT{5};
-  let Inst{38-42} = XT{4-0};
-  let Inst{43-47} = D_RA{38-34}; // RA
-  let Inst{48-63} = D_RA{15-0}; // d1
-}
-
-// X-Form: [PO T IMM VRB XO TX]
-class XForm_XT6_IMM5_VB5<bits<6> opcode, bits<10> xo, dag OOL, dag IOL,
-                         string asmstr, InstrItinClass itin, list<dag> pattern>
-  : I<opcode, OOL, IOL, asmstr, itin> {
-  bits<6> XT;
-  bits<5> VRB;
-  bits<5> IMM;
-
-  let Pattern = pattern;
-  let Inst{6-10} = XT{4-0};
-  let Inst{11-15} = IMM;
-  let Inst{16-20} = VRB;
-  let Inst{21-30} = xo;
-  let Inst{31} = XT{5};
-}
-
-class 8RR_XX4Form_IMM8_XTAB6<bits<6> opcode, bits<2> xo,
-                             dag OOL, dag IOL, string asmstr,
-                             InstrItinClass itin, list<dag> pattern>
-  : PI<1, opcode, OOL, IOL, asmstr, itin> {
-    bits<6> XT;
-    bits<6> XA;
-    bits<6> XB;
-    bits<6> XC;
-    bits<8> IMM;
-
-    let Pattern = pattern;
-
-    // The prefix.
-    let Inst{6-7} = 1;
-    let Inst{8} = 0;
-    let Inst{9-11} = 0;
-    let Inst{12-13} = 0;
-    let Inst{14-23} = 0;
-    let Inst{24-31} = IMM;
-
-    // The instruction.
-    let Inst{38-42} = XT{4-0};
-    let Inst{43-47} = XA{4-0};
-    let Inst{48-52} = XB{4-0};
-    let Inst{53-57} = XC{4-0};
-    let Inst{58-59} = xo;
-    let Inst{60} = XC{5};
-    let Inst{61} = XA{5};
-    let Inst{62} = XB{5};
-    let Inst{63} = XT{5};
-}
-
-class VXForm_RD5_N3_VB5<bits<11> xo, dag OOL, dag IOL, string asmstr,
-                        InstrItinClass itin, list<dag> pattern>
-  : I<4, OOL, IOL, asmstr, itin> {
-  bits<5> RD;
-  bits<5> VB;
-  bits<3> N;
-
-  let Pattern = pattern;
-
-  let Inst{6-10}  = RD;
-  let Inst{11-12} = 0;
-  let Inst{13-15} = N;
-  let Inst{16-20} = VB;
-  let Inst{21-31} = xo;
-}
-
-
-// VX-Form: [PO VRT RA VRB XO].
-// Destructive (insert) forms are suffixed with _ins.
-class VXForm_VTB5_RA5_ins<bits<11> xo, string opc, list<dag> pattern>
-  : VXForm_1<xo, (outs vrrc:$vD), (ins vrrc:$vDi, gprc:$rA, vrrc:$vB),
-             !strconcat(opc, " $vD, $rA, $vB"), IIC_VecGeneral, pattern>,
-             RegConstraint<"$vDi = $vD">, NoEncode<"$vDi">;
-
-// VX-Form: [PO VRT RA RB XO].
-// Destructive (insert) forms are suffixed with _ins.
-class VXForm_VRT5_RAB5_ins<bits<11> xo, string opc, list<dag> pattern>
-  : VXForm_1<xo, (outs vrrc:$vD), (ins vrrc:$vDi, gprc:$rA, gprc:$rB),
-             !strconcat(opc, " $vD, $rA, $rB"), IIC_VecGeneral, pattern>,
-             RegConstraint<"$vDi = $vD">, NoEncode<"$vDi">;
-
-// VX-Form: [ PO BF // VRA VRB XO ]
-class VXForm_BF3_VAB5<bits<11> xo, dag OOL, dag IOL, string asmstr,
-                      InstrItinClass itin, list<dag> pattern>
-  : I<4, OOL, IOL, asmstr, itin> {
-  bits<3> BF;
-  bits<5> VA;
-  bits<5> VB;
-
-  let Pattern = pattern;
-
-  let Inst{6-8} = BF;
-  let Inst{9-10} = 0;
-  let Inst{11-15} = VA;
-  let Inst{16-20} = VB;
-  let Inst{21-31} = xo;
-}
-
-// VN-Form: [PO VRT VRA VRB PS SD XO]
-// SD is "Shift Direction"
-class VNForm_VTAB5_SD3<bits<6> xo, bits<2> ps, dag OOL, dag IOL, string asmstr,
-                       InstrItinClass itin, list<dag> pattern>
-    : I<4, OOL, IOL, asmstr, itin> {
-  bits<5> VRT;
-  bits<5> VRA;
-  bits<5> VRB;
-  bits<3> SD;
-
-  let Pattern = pattern;
-
-  let Inst{6-10}  = VRT;
-  let Inst{11-15} = VRA;
-  let Inst{16-20} = VRB;
-  let Inst{21-22} = ps;
-  let Inst{23-25} = SD;
-  let Inst{26-31} = xo;
-}
-
-class VXForm_RD5_MP_VB5<bits<11> xo, bits<4> eo, dag OOL, dag IOL,
-                        string asmstr, InstrItinClass itin, list<dag> pattern>
-  : I<4, OOL, IOL, asmstr, itin> {
-  bits<5> RD;
-  bits<5> VB;
-  bit MP;
-
-  let Pattern = pattern;
-
-  let Inst{6-10}  = RD;
-  let Inst{11-14} = eo;
-  let Inst{15} = MP;
-  let Inst{16-20} = VB;
-  let Inst{21-31} = xo;
-}
-
-// 8RR:D-Form: [ 1 1 0 // // imm0
-//               PO T XO TX imm1 ].
-class 8RR_DForm_IMM32_XT6<bits<6> opcode, bits<4> xo, dag OOL, dag IOL,
-                          string asmstr, InstrItinClass itin,
-                          list<dag> pattern>
-  : PI<1, opcode, OOL, IOL, asmstr, itin> {
-  bits<6> XT;
-  bits<32> IMM32;
-
-  let Pattern = pattern;
-
-  // The prefix.
-  let Inst{6-7} = 1;
-  let Inst{8-11} = 0;
-  let Inst{12-13} = 0; // reserved
-  let Inst{14-15} = 0; // reserved
-  let Inst{16-31} = IMM32{31-16};
-
-  // The instruction.
-  let Inst{38-42} = XT{4-0};
-  let Inst{43-46} = xo;
-  let Inst{47} = XT{5};
-  let Inst{48-63} = IMM32{15-0};
-}
-
-// 8RR:D-Form: [ 1 1 0 // // imm0
-//               PO T XO IX TX imm1 ].
-class 8RR_DForm_IMM32_XT6_IX<bits<6> opcode, bits<3> xo, dag OOL, dag IOL,
-                             string asmstr, InstrItinClass itin,
-                             list<dag> pattern>
-  : PI<1, opcode, OOL, IOL, asmstr, itin> {
-  bits<6> XT;
-  bit IX;
-  bits<32> IMM32;
-
-  let Pattern = pattern;
-
-  // The prefix.
-  let Inst{6-7} = 1;
-  let Inst{8-11} = 0;
-  let Inst{12-13} = 0; // reserved
-  let Inst{14-15} = 0; // reserved
-  let Inst{16-31} = IMM32{31-16};
-
-  // The instruction.
-  let Inst{38-42} = XT{4-0};
-  let Inst{43-45} = xo;
-  let Inst{46} = IX;
-  let Inst{47} = XT{5};
-  let Inst{48-63} = IMM32{15-0};
-}
-
-class 8RR_XX4Form_XTABC6<bits<6> opcode, bits<2> xo, dag OOL, dag IOL,
-                         string asmstr, InstrItinClass itin, list<dag> pattern>
-  : PI<1, opcode, OOL, IOL, asmstr, itin> {
-  bits<6> XT;
-  bits<6> XA;
-  bits<6> XB;
-  bits<6> XC;
-
-  let Pattern = pattern;
-
-  // The prefix.
-  let Inst{6-7} = 1;
-  let Inst{8-11} = 0;
-  let Inst{12-13} = 0;
-  let Inst{14-31} = 0;
-
-  // The instruction.
-  let Inst{38-42} = XT{4-0};
-  let Inst{43-47} = XA{4-0};
-  let Inst{48-52} = XB{4-0};
-  let Inst{53-57} = XC{4-0};
-  let Inst{58-59} = xo;
-  let Inst{60} = XC{5};
-  let Inst{61} = XA{5};
-  let Inst{62} = XB{5};
-  let Inst{63} = XT{5};
-}
-
-class 8RR_XX4Form_IMM3_XTABC6<bits<6> opcode, bits<2> xo, dag OOL, dag IOL,
-                              string asmstr, InstrItinClass itin,
-                              list<dag> pattern>
-  : PI<1, opcode, OOL, IOL, asmstr, itin> {
-  bits<6> XT;
-  bits<6> XA;
-  bits<6> XB;
-  bits<6> XC;
-  bits<3> IMM;
-
-  let Pattern = pattern;
-
-  // The prefix.
-  let Inst{6-7} = 1;
-  let Inst{8-11} = 0;
-  let Inst{12-13} = 0;
-  let Inst{14-28} = 0;
-  let Inst{29-31} = IMM;
-
-  // The instruction.
-  let Inst{38-42} = XT{4-0};
-  let Inst{43-47} = XA{4-0};
-  let Inst{48-52} = XB{4-0};
-  let Inst{53-57} = XC{4-0};
-  let Inst{58-59} = xo;
-  let Inst{60} = XC{5};
-  let Inst{61} = XA{5};
-  let Inst{62} = XB{5};
-  let Inst{63} = XT{5};
-}
-
-// [PO BF / XO2 B XO BX /]
-class XX2_BF3_XO5_XB6_XO9<bits<6> opcode, bits<5> xo2, bits<9> xo, dag OOL,
-                          dag IOL, string asmstr, InstrItinClass itin,
-                          list<dag> pattern>
-  : I<opcode, OOL, IOL, asmstr, itin> {
-  bits<3> BF;
-  bits<6> XB;
-
-  let Pattern = pattern;
-
-  let Inst{6-8}   = BF;
-  let Inst{9-10}  = 0;
-  let Inst{11-15} = xo2;
-  let Inst{16-20} = XB{4-0};
-  let Inst{21-29} = xo;
-  let Inst{30}    = XB{5};
-  let Inst{31}    = 0;
-}
-
-// X-Form: [ PO RT BI /// XO / ]
-class XForm_XT5_BI5<bits<6> opcode, bits<10> xo, dag OOL, dag IOL,
-                    string asmstr, InstrItinClass itin, list<dag> pattern>
-  : XForm_base_r3xo<opcode, xo, OOL, IOL, asmstr, itin, pattern> {
-  let B = 0;
-}
-
-multiclass MLS_DForm_R_SI34_RTA5_MEM_p<bits<6> opcode, dag OOL, dag IOL,
-                                       dag PCRel_IOL, string asmstr,
-                                       InstrItinClass itin> {
-  def NAME : MLS_DForm_R_SI34_RTA5_MEM<opcode, OOL, IOL,
-                                       !strconcat(asmstr, ", 0"), itin, []>;
-  def pc : MLS_DForm_R_SI34_RTA5_MEM<opcode, OOL, PCRel_IOL,
-                                     !strconcat(asmstr, ", 1"), itin, []>,
-                                     isPCRel;
-}
-
-multiclass 8LS_DForm_R_SI34_RTA5_p<bits<6> opcode, dag OOL, dag IOL,
-                                   dag PCRel_IOL, string asmstr,
-                                   InstrItinClass itin> {
-  def NAME : 8LS_DForm_R_SI34_RTA5<opcode, OOL, IOL,
-                                   !strconcat(asmstr, ", 0"), itin, []>;
-  def pc : 8LS_DForm_R_SI34_RTA5<opcode, OOL, PCRel_IOL,
-                                 !strconcat(asmstr, ", 1"), itin, []>, isPCRel;
-}
-
-multiclass 8LS_DForm_R_SI34_XT6_RA5_p<bits<5> opcode, dag OOL, dag IOL,
-                                      dag PCRel_IOL, string asmstr,
-                                      InstrItinClass itin> {
-  def NAME : 8LS_DForm_R_SI34_XT6_RA5<opcode, OOL, IOL,
-                                      !strconcat(asmstr, ", 0"), itin, []>;
-  def pc : 8LS_DForm_R_SI34_XT6_RA5<opcode, OOL, PCRel_IOL,
-                                    !strconcat(asmstr, ", 1"), itin, []>,
-                                    isPCRel;
-}
-
-def PPCRegVSRpRCAsmOperand : AsmOperandClass {
-  let Name = "RegVSRpRC"; let PredicateMethod = "isVSRpEvenRegNumber";
-}
-
-def vsrprc : RegisterOperand<VSRpRC> {
-  let ParserMatchClass = PPCRegVSRpRCAsmOperand;
-}
-
-def PPCRegVSRpEvenRCAsmOperand : AsmOperandClass {
-  let Name = "RegVSRpEvenRC"; let PredicateMethod = "isVSRpEvenRegNumber";
-}
-
-def vsrpevenrc : RegisterOperand<VSRpRC> {
-  let ParserMatchClass = PPCRegVSRpEvenRCAsmOperand;
-  let EncoderMethod = "getVSRpEvenEncoding";
-  let DecoderMethod = "decodeVSRpEvenOperands";
-}
-
-class DQForm_XTp5_RA17_MEM<bits<6> opcode, bits<4> xo, dag OOL, dag IOL,
-                           string asmstr, InstrItinClass itin, list<dag> pattern>
-  : I<opcode, OOL, IOL, asmstr, itin> {
-  bits<5> XTp;
-  bits<17> DQ_RA;
-  let Pattern = pattern;
-
-  let Inst{6-9} = XTp{3-0};
-  let Inst{10} = XTp{4};
-  let Inst{11-15} = DQ_RA{16-12};  // Register #
-  let Inst{16-27} = DQ_RA{11-0};   // Displacement.
-  let Inst{28-31} = xo;
-}
-
-class XForm_XTp5_XAB5<bits<6> opcode, bits<10> xo, dag OOL, dag IOL,
-                      string asmstr, InstrItinClass itin, list<dag> pattern>
-  : I<opcode, OOL, IOL, asmstr, itin>, XFormMemOp {
-  bits<5> XTp;
-  bits<5> A;
-  bits<5> B;
-
-  let Pattern = pattern;
-  let Inst{6-9} = XTp{3-0};
-  let Inst{10} = XTp{4};
-  let Inst{11-15} = A;
-  let Inst{16-20} = B;
-  let Inst{21-30} = xo;
-  let Inst{31} = 0;
-}
-
-class 8LS_DForm_R_XTp5_SI34_MEM<bits<6> opcode, dag OOL, dag IOL, string asmstr,
-                                InstrItinClass itin, list<dag> pattern>
-  : PI<1, opcode, OOL, IOL, asmstr, itin> {
-  bits<5> XTp;
-  bits<39> D_RA;
-
-  let Pattern = pattern;
-
-  // The prefix.
-  let Inst{6-10} = 0;
-  let Inst{11} = PCRel;
-  let Inst{12-13} = 0;
-  let Inst{14-31} = D_RA{33-16}; // Imm18
-
-  // The instruction.
-  let Inst{38-41} = XTp{3-0};
-  let Inst{42}    = XTp{4};
-  let Inst{43-47} = D_RA{38-34};   // Register #
-  let Inst{48-63} = D_RA{15-0};    // D
-}
-
-multiclass 8LS_DForm_R_XTp5_SI34_MEM_p<bits<6> pref, bits<6> opcode, dag OOL,
-                                       dag IOL, dag PCRel_IOL,
-                                       string asmstr, InstrItinClass itin> {
-  def NAME : 8LS_DForm_R_XTp5_SI34_MEM<opcode, OOL, IOL,
-                                       !strconcat(asmstr, ", 0"), itin, []>;
-  def pc : 8LS_DForm_R_XTp5_SI34_MEM<opcode, OOL, PCRel_IOL,
-                                     !strconcat(asmstr, ", 1"), itin, []>,
-                                     isPCRel;
-}
-
-def PPCRegACCRCAsmOperand : AsmOperandClass {
-  let Name = "RegACCRC"; let PredicateMethod = "isACCRegNumber";
-}
-
-def acc : RegisterOperand<ACCRC> {
-  let ParserMatchClass = PPCRegACCRCAsmOperand;
-}
-
-def uacc : RegisterOperand<UACCRC> {
-  let ParserMatchClass = PPCRegACCRCAsmOperand;
-}
-
-// [PO AS XO2 XO]
-class XForm_AT3<bits<6> opcode, bits<5> xo2, bits<10> xo, dag OOL, dag IOL,
-                    string asmstr, InstrItinClass itin, list<dag> pattern>
-  : I<opcode, OOL, IOL, asmstr, itin> {
-  bits<3> AT;
-
-  let Pattern = pattern;
-
-  let Inst{6-8}  = AT;
-  let Inst{9-10}  = 0;
-  let Inst{11-15} = xo2;
-  let Inst{16-20} = 0;
-  let Inst{21-30} = xo;
-  let Inst{31} = 0;
-}
-
-class XX3Form_AT3_XAB6<bits<6> opcode, bits<8> xo, dag OOL, dag IOL,
-                           string asmstr, InstrItinClass itin,
-                           list<dag> pattern>
-  : I<opcode, OOL, IOL, asmstr, itin> {
-  bits<3> AT;
-  bits<6> XA;
-  bits<6> XB;
-
-  let Pattern = pattern;
-
-  let Inst{6-8} = AT;
-  let Inst{9-10} = 0;
-  let Inst{11-15} = XA{4-0};
-  let Inst{16-20} = XB{4-0};
-  let Inst{21-28} = xo;
-  let Inst{29}    = XA{5};
-  let Inst{30}    = XB{5};
-  let Inst{31} = 0;
-}
-
-class MMIRR_XX3Form_XY4P2_XAB6<bits<6> opcode, bits<8> xo, dag OOL, dag IOL,
-                               string asmstr, InstrItinClass itin,
-                               list<dag> pattern>
-  : PI<1, opcode, OOL, IOL, asmstr, itin> {
-  bits<3> AT;
-  bits<6> XA;
-  bits<6> XB;
-  bits<4> XMSK;
-  bits<4> YMSK;
-  bits<2> PMSK;
-
-  let Pattern = pattern;
-
-  // The prefix.
-  let Inst{6-7} = 3;
-  let Inst{8-11} = 9;
-  let Inst{12-15} = 0;
-  let Inst{16-17} = PMSK;
-  let Inst{18-23} = 0;
-  let Inst{24-27} = XMSK;
-  let Inst{28-31} = YMSK;
-
-  // The instruction.
-  let Inst{38-40} = AT;
-  let Inst{41-42} = 0;
-  let Inst{43-47} = XA{4-0};
-  let Inst{48-52} = XB{4-0};
-  let Inst{53-60} = xo;
-  let Inst{61} = XA{5};
-  let Inst{62} = XB{5};
-  let Inst{63} = 0;
-}
-
-class MMIRR_XX3Form_XY4_XAB6<bits<6> opcode, bits<8> xo, dag OOL, dag IOL,
-                             string asmstr, InstrItinClass itin,
-                             list<dag> pattern>
-  : PI<1, opcode, OOL, IOL, asmstr, itin> {
-  bits<3> AT;
-  bits<6> XA;
-  bits<6> XB;
-  bits<4> XMSK;
-  bits<4> YMSK;
-
-  let Pattern = pattern;
-
-  // The prefix.
-  let Inst{6-7} = 3;
-  let Inst{8-11} = 9;
-  let Inst{12-23} = 0;
-  let Inst{24-27} = XMSK;
-  let Inst{28-31} = YMSK;
-
-  // The instruction.
-  let Inst{38-40} = AT;
-  let Inst{41-42} = 0;
-  let Inst{43-47} = XA{4-0};
-  let Inst{48-52} = XB{4-0};
-  let Inst{53-60} = xo;
-  let Inst{61} = XA{5};
-  let Inst{62} = XB{5};
-  let Inst{63} = 0;
-}
-
-class MMIRR_XX3Form_X4Y2_XAB6<bits<6> opcode, bits<8> xo, dag OOL, dag IOL,
-                              string asmstr, InstrItinClass itin,
-                              list<dag> pattern>
-  : PI<1, opcode, OOL, IOL, asmstr, itin> {
-  bits<3> AT;
-  bits<6> XA;
-  bits<6> XB;
-  bits<4> XMSK;
-  bits<2> YMSK;
-
-  let Pattern = pattern;
-
-  // The prefix.
-  let Inst{6-7} = 3;
-  let Inst{8-11} = 9;
-  let Inst{12-23} = 0;
-  let Inst{24-27} = XMSK;
-  let Inst{28-29} = YMSK;
-  let Inst{30-31} = 0;
-
-  // The instruction.
-  let Inst{38-40} = AT;
-  let Inst{41-42} = 0;
-  let Inst{43-47} = XA{4-0};
-  let Inst{48-52} = XB{4-0};
-  let Inst{53-60} = xo;
-  let Inst{61} = XA{5};
-  let Inst{62} = XB{5};
-  let Inst{63} = 0;
-}
-
-class MMIRR_XX3Form_XY4P8_XAB6<bits<6> opcode, bits<8> xo, dag OOL, dag IOL,
-                               string asmstr, InstrItinClass itin,
-                               list<dag> pattern>
-  : PI<1, opcode, OOL, IOL, asmstr, itin> {
-  bits<3> AT;
-  bits<6> XA;
-  bits<6> XB;
-  bits<4> XMSK;
-  bits<4> YMSK;
-  bits<8> PMSK;
-
-  let Pattern = pattern;
-
-  // The prefix.
-  let Inst{6-7} = 3;
-  let Inst{8-11} = 9;
-  let Inst{12-15} = 0;
-  let Inst{16-23} = PMSK;
-  let Inst{24-27} = XMSK;
-  let Inst{28-31} = YMSK;
-
-  // The instruction.
-  let Inst{38-40} = AT;
-  let Inst{41-42} = 0;
-  let Inst{43-47} = XA{4-0};
-  let Inst{48-52} = XB{4-0};
-  let Inst{53-60} = xo;
-  let Inst{61} = XA{5};
-  let Inst{62} = XB{5};
-  let Inst{63} = 0;
-}
-
-class MMIRR_XX3Form_XYP4_XAB6<bits<6> opcode, bits<8> xo, dag OOL, dag IOL,
-                              string asmstr, InstrItinClass itin,
-                              list<dag> pattern>
-  : PI<1, opcode, OOL, IOL, asmstr, itin> {
-  bits<3> AT;
-  bits<6> XA;
-  bits<6> XB;
-  bits<4> XMSK;
-  bits<4> YMSK;
-  bits<4> PMSK;
-
-  let Pattern = pattern;
-
-  // The prefix.
-  let Inst{6-7} = 3;
-  let Inst{8-11} = 9;
-  let Inst{12-15} = 0;
-  let Inst{16-19} = PMSK;
-  let Inst{20-23} = 0;
-  let Inst{24-27} = XMSK;
-  let Inst{28-31} = YMSK;
-
-  // The instruction.
-  let Inst{38-40} = AT;
-  let Inst{41-42} = 0;
-  let Inst{43-47} = XA{4-0};
-  let Inst{48-52} = XB{4-0};
-  let Inst{53-60} = xo;
-  let Inst{61} = XA{5};
-  let Inst{62} = XB{5};
-  let Inst{63} = 0;
-}
-
-def PrefixInstrs : Predicate<"Subtarget->hasPrefixInstrs()">;
-def IsISA3_1 : Predicate<"Subtarget->isISA3_1()">;
-def PairedVectorMemops : Predicate<"Subtarget->pairedVectorMemops()">;
-def MMA : Predicate<"Subtarget->hasMMA()">;
-
-def RCCp {
-  dag AToVSRC = (COPY_TO_REGCLASS $XA, VSRC);
-  dag BToVSRC = (COPY_TO_REGCLASS $XB, VSRC);
-}
-
-let Predicates = [PrefixInstrs] in {
-  let Interpretation64Bit = 1, isCodeGenOnly = 1 in {
-    defm PADDI8 :
-      MLS_DForm_R_SI34_RTA5_p<14, (outs g8rc:$RT), (ins g8rc:$RA, s34imm:$SI),
-                              (ins immZero:$RA, s34imm_pcrel:$SI),
-                              "paddi $RT, $RA, $SI", IIC_LdStLFD>;
-    let isReMaterializable = 1, isAsCheapAsAMove = 1, isMoveImm = 1 in {
-      def PLI8 : MLS_DForm_SI34_RT5<14, (outs g8rc:$RT),
-                                    (ins s34imm:$SI),
-                                    "pli $RT, $SI", IIC_IntSimple, []>;
-    }
-  }
-  defm PADDI :
-    MLS_DForm_R_SI34_RTA5_p<14, (outs gprc:$RT), (ins gprc:$RA, s34imm:$SI),
-                            (ins immZero:$RA, s34imm_pcrel:$SI),
-                            "paddi $RT, $RA, $SI", IIC_LdStLFD>;
-  let isReMaterializable = 1, isAsCheapAsAMove = 1, isMoveImm = 1 in {
-    def PLI : MLS_DForm_SI34_RT5<14, (outs gprc:$RT),
-                                 (ins s34imm:$SI),
-                                 "pli $RT, $SI", IIC_IntSimple, []>;
-  }
-
-  let mayLoad = 1, mayStore = 0 in {
-    defm PLXV :
-      8LS_DForm_R_SI34_XT6_RA5_p<25, (outs vsrc:$XT), (ins memri34:$D_RA),
-                                 (ins memri34_pcrel:$D_RA), "plxv $XT, $D_RA",
-                                 IIC_LdStLFD>;
-    defm PLFS :
-      MLS_DForm_R_SI34_RTA5_MEM_p<48, (outs f4rc:$FRT), (ins memri34:$D_RA),
-                                  (ins memri34_pcrel:$D_RA), "plfs $FRT, $D_RA",
-                                  IIC_LdStLFD>;
-    defm PLFD :
-      MLS_DForm_R_SI34_RTA5_MEM_p<50, (outs f8rc:$FRT), (ins memri34:$D_RA),
-                                  (ins  memri34_pcrel:$D_RA), "plfd $FRT, $D_RA",
-                                  IIC_LdStLFD>;
-    defm PLXSSP :
-      8LS_DForm_R_SI34_RTA5_p<43, (outs vfrc:$VRT), (ins memri34:$D_RA),
-                              (ins memri34_pcrel:$D_RA), "plxssp $VRT, $D_RA",
-                              IIC_LdStLFD>;
-    defm PLXSD :
-      8LS_DForm_R_SI34_RTA5_p<42, (outs vfrc:$VRT), (ins memri34:$D_RA),
-                              (ins memri34_pcrel:$D_RA), "plxsd $VRT, $D_RA",
-                              IIC_LdStLFD>;
-    let Interpretation64Bit = 1, isCodeGenOnly = 1 in {
-      defm PLBZ8 :
-        MLS_DForm_R_SI34_RTA5_MEM_p<34, (outs g8rc:$RT), (ins memri34:$D_RA),
-                                    (ins memri34_pcrel:$D_RA), "plbz $RT, $D_RA",
-                                    IIC_LdStLFD>;
-      defm PLHZ8 :
-        MLS_DForm_R_SI34_RTA5_MEM_p<40, (outs g8rc:$RT), (ins memri34:$D_RA),
-                                    (ins memri34_pcrel:$D_RA), "plhz $RT, $D_RA",
-                                    IIC_LdStLFD>;
-      defm PLHA8 :
-        MLS_DForm_R_SI34_RTA5_MEM_p<42, (outs g8rc:$RT), (ins memri34:$D_RA),
-                                    (ins memri34_pcrel:$D_RA), "plha $RT, $D_RA",
-                                    IIC_LdStLFD>;
-      defm PLWA8 :
-        8LS_DForm_R_SI34_RTA5_p<41, (outs g8rc:$RT), (ins memri34:$D_RA),
-                                (ins memri34_pcrel:$D_RA), "plwa $RT, $D_RA",
-                                IIC_LdStLFD>;
-      defm PLWZ8 :
-        MLS_DForm_R_SI34_RTA5_MEM_p<32, (outs g8rc:$RT), (ins memri34:$D_RA),
-                                    (ins memri34_pcrel:$D_RA), "plwz $RT, $D_RA",
-                                    IIC_LdStLFD>;
-    }
-    defm PLBZ :
-      MLS_DForm_R_SI34_RTA5_MEM_p<34, (outs gprc:$RT), (ins memri34:$D_RA),
-                                  (ins memri34_pcrel:$D_RA), "plbz $RT, $D_RA",
-                                  IIC_LdStLFD>;
-    defm PLHZ :
-      MLS_DForm_R_SI34_RTA5_MEM_p<40, (outs gprc:$RT), (ins memri34:$D_RA),
-                                  (ins memri34_pcrel:$D_RA), "plhz $RT, $D_RA",
-                                  IIC_LdStLFD>;
-    defm PLHA :
-      MLS_DForm_R_SI34_RTA5_MEM_p<42, (outs gprc:$RT), (ins memri34:$D_RA),
-                                  (ins memri34_pcrel:$D_RA), "plha $RT, $D_RA",
-                                  IIC_LdStLFD>;
-    defm PLWZ :
-      MLS_DForm_R_SI34_RTA5_MEM_p<32, (outs gprc:$RT), (ins memri34:$D_RA),
-                                  (ins memri34_pcrel:$D_RA), "plwz $RT, $D_RA",
-                                  IIC_LdStLFD>;
-    defm PLWA :
-      8LS_DForm_R_SI34_RTA5_p<41, (outs gprc:$RT), (ins memri34:$D_RA),
-                              (ins memri34_pcrel:$D_RA), "plwa $RT, $D_RA",
-                              IIC_LdStLFD>;
-    defm PLD :
-      8LS_DForm_R_SI34_RTA5_p<57, (outs g8rc:$RT), (ins memri34:$D_RA),
-                              (ins memri34_pcrel:$D_RA), "pld $RT, $D_RA",
-                              IIC_LdStLFD>;
-  }
-
-  let mayStore = 1, mayLoad = 0 in {
-    defm PSTXV :
-      8LS_DForm_R_SI34_XT6_RA5_p<27, (outs), (ins vsrc:$XS, memri34:$D_RA),
-                                 (ins vsrc:$XS, memri34_pcrel:$D_RA),
-                                 "pstxv $XS, $D_RA", IIC_LdStLFD>;
-    defm PSTFS :
-      MLS_DForm_R_SI34_RTA5_MEM_p<52, (outs), (ins f4rc:$FRS, memri34:$D_RA),
-                                  (ins f4rc:$FRS, memri34_pcrel:$D_RA),
-                                  "pstfs $FRS, $D_RA", IIC_LdStLFD>;
-    defm PSTFD :
-      MLS_DForm_R_SI34_RTA5_MEM_p<54, (outs), (ins f8rc:$FRS, memri34:$D_RA),
-                                  (ins f8rc:$FRS, memri34_pcrel:$D_RA),
-                                  "pstfd $FRS, $D_RA", IIC_LdStLFD>;
-    defm PSTXSSP :
-      8LS_DForm_R_SI34_RTA5_p<47, (outs), (ins vfrc:$VRS, memri34:$D_RA),
-                              (ins vfrc:$VRS, memri34_pcrel:$D_RA),
-                              "pstxssp $VRS, $D_RA", IIC_LdStLFD>;
-    defm PSTXSD :
-      8LS_DForm_R_SI34_RTA5_p<46, (outs), (ins vfrc:$VRS, memri34:$D_RA),
-                              (ins vfrc:$VRS, memri34_pcrel:$D_RA),
-                              "pstxsd $VRS, $D_RA", IIC_LdStLFD>;
-    let Interpretation64Bit = 1, isCodeGenOnly = 1 in {
-      defm PSTB8 :
-        MLS_DForm_R_SI34_RTA5_MEM_p<38, (outs), (ins g8rc:$RS, memri34:$D_RA),
-                                    (ins g8rc:$RS, memri34_pcrel:$D_RA),
-                                    "pstb $RS, $D_RA", IIC_LdStLFD>;
-      defm PSTH8 :
-        MLS_DForm_R_SI34_RTA5_MEM_p<44, (outs), (ins g8rc:$RS, memri34:$D_RA),
-                                    (ins g8rc:$RS, memri34_pcrel:$D_RA),
-                                    "psth $RS, $D_RA", IIC_LdStLFD>;
-      defm PSTW8 :
-        MLS_DForm_R_SI34_RTA5_MEM_p<36, (outs), (ins g8rc:$RS, memri34:$D_RA),
-                                    (ins g8rc:$RS, memri34_pcrel:$D_RA),
-                                    "pstw $RS, $D_RA", IIC_LdStLFD>;
-    }
-    defm PSTB :
-      MLS_DForm_R_SI34_RTA5_MEM_p<38, (outs), (ins gprc:$RS, memri34:$D_RA),
-                                  (ins gprc:$RS, memri34_pcrel:$D_RA),
-                                  "pstb $RS, $D_RA", IIC_LdStLFD>;
-    defm PSTH :
-      MLS_DForm_R_SI34_RTA5_MEM_p<44, (outs), (ins gprc:$RS, memri34:$D_RA),
-                                  (ins gprc:$RS, memri34_pcrel:$D_RA),
-                                  "psth $RS, $D_RA", IIC_LdStLFD>;
-    defm PSTW :
-      MLS_DForm_R_SI34_RTA5_MEM_p<36, (outs), (ins gprc:$RS, memri34:$D_RA),
-                                  (ins gprc:$RS, memri34_pcrel:$D_RA),
-                                  "pstw $RS, $D_RA", IIC_LdStLFD>;
-    defm PSTD :
-      8LS_DForm_R_SI34_RTA5_p<61, (outs), (ins g8rc:$RS, memri34:$D_RA),
-                              (ins g8rc:$RS, memri34_pcrel:$D_RA),
-                              "pstd $RS, $D_RA", IIC_LdStLFD>;
-  }
-}
-
-// Multiclass definitions for MMA accumulator instructions.
-// ----------------------------------------------------------------------------
-
-// Defines 2 unmasked instructions where the xo field for acc/non-acc version
-// is even/odd.
-multiclass ACC_UM_XOEO<bits<6> opcode, bits<8> xo, dag IOL, string asmbase,
-                       string asmstr> {
-  let Predicates = [MMA] in {
-  def NAME :
-    XX3Form_AT3_XAB6<opcode, !or(xo, 0x01), (outs acc:$AT), IOL,
-                     !strconcat(asmbase#" ", asmstr), IIC_VecFP, []>,
-    RegConstraint<"@earlyclobber $AT">;
-  def PP :
-    XX3Form_AT3_XAB6<opcode, xo, (outs acc:$AT), !con((ins acc:$ATi), IOL),
-                     !strconcat(asmbase#"pp ", asmstr), IIC_VecFP, []>,
-    RegConstraint<"$ATi = $AT">, NoEncode<"$ATi">;
-  }
-}
-
-// Defines 4 instructions, masked/unmasked with masks 8, 4, 4 bits.
-// The XO field for acc/non-acc version is even/odd.
-multiclass ACC_UM_M844_XOEO<bits<6> opcode, bits<8> xo, dag IOL, string asmbase,
-                            string asmstr> {
-  defm NAME : ACC_UM_XOEO<opcode, xo, IOL, asmbase, asmstr>;
-  let Predicates = [MMA, PrefixInstrs] in {
-  def PM#NAME :
-    MMIRR_XX3Form_XY4P8_XAB6<
-      opcode, !or(xo, 0x01), (outs acc:$AT),
-      !con(IOL, (ins u4imm:$XMSK, u4imm:$YMSK, u8imm:$PMSK)),
-      !strconcat("pm"#asmbase#" ", asmstr#", $XMSK, $YMSK, $PMSK"),
-      IIC_VecFP, []>,
-    RegConstraint<"@earlyclobber $AT">;
-  def PM#NAME#PP :
-    MMIRR_XX3Form_XY4P8_XAB6<
-      opcode, xo, (outs acc:$AT),
-      !con((ins acc:$ATi),
-           !con(IOL, (ins u4imm:$XMSK, u4imm:$YMSK, u8imm:$PMSK))),
-      !strconcat("pm"#asmbase#"pp ", asmstr#", $XMSK, $YMSK, $PMSK"),
-      IIC_VecFP, []>,
-    RegConstraint<"$ATi = $AT">, NoEncode<"$ATi">;
-  }
-}
-
-// Defines 4 instructions, masked/unmasked with masks 4, 4, 4 bits.
-// The XO field for acc/non-acc version is even/odd.
-multiclass ACC_UM_M444_XOEO<bits<6> opcode, bits<8> xo, dag IOL, string asmbase,
-                            string asmstr> {
-  defm NAME : ACC_UM_XOEO<opcode, xo, IOL, asmbase, asmstr>;
-  let Predicates = [MMA, PrefixInstrs] in {
-  def PM#NAME :
-    MMIRR_XX3Form_XYP4_XAB6<
-      opcode, !or(xo, 0x01), (outs acc:$AT),
-      !con(IOL, (ins u4imm:$XMSK, u4imm:$YMSK, u4imm:$PMSK)),
-      !strconcat("pm"#asmbase#" ", asmstr#", $XMSK, $YMSK, $PMSK"),
-      IIC_VecFP, []>,
-    RegConstraint<"@earlyclobber $AT">;
-  def PM#NAME#PP :
-    MMIRR_XX3Form_XYP4_XAB6<
-      opcode, xo, (outs acc:$AT),
-      !con((ins acc:$ATi),
-           !con(IOL, (ins u4imm:$XMSK, u4imm:$YMSK, u4imm:$PMSK))),
-      !strconcat("pm"#asmbase#"pp ", asmstr#", $XMSK, $YMSK, $PMSK"),
-      IIC_VecFP, []>,
-    RegConstraint<"$ATi = $AT">, NoEncode<"$ATi">;
-  }
-}
-
-// Defines 4 instructions, masked/unmasked with masks 2, 4, 4 bits.
-// The XO field for acc/non-acc version is even/odd.
-multiclass ACC_UM_M244_XOEO<bits<6> opcode, bits<8> xo, dag IOL, string asmbase,
-                            string asmstr> {
-  defm NAME : ACC_UM_XOEO<opcode, xo, IOL, asmbase, asmstr>;
-  let Predicates = [MMA, PrefixInstrs] in {
-  def PM#NAME :
-    MMIRR_XX3Form_XY4P2_XAB6<
-      opcode, !or(xo, 0x01), (outs acc:$AT),
-      !con(IOL, (ins u4imm:$XMSK, u4imm:$YMSK, u2imm:$PMSK)),
-      !strconcat("pm"#asmbase#" ", asmstr#", $XMSK, $YMSK, $PMSK"),
-      IIC_VecFP, []>,
-    RegConstraint<"@earlyclobber $AT">;
-  def PM#NAME#PP :
-    MMIRR_XX3Form_XY4P2_XAB6<
-      opcode, xo, (outs acc:$AT),
-      !con((ins acc:$ATi), !con(IOL, (ins u4imm:$XMSK, u4imm:$YMSK, u2imm:$PMSK))),
-      !strconcat("pm"#asmbase#"pp ", asmstr#", $XMSK, $YMSK, $PMSK"),
-      IIC_VecFP, []>,
-    RegConstraint<"$ATi = $AT">, NoEncode<"$ATi">;
-  }
-}
-
-// Defines 4 instructions, masked/unmasked with masks 2, 4, 4 bits.
-// Upper nibble of XO field for acc/non-acc version is 0x4/0x6.
-multiclass ACC_UM_M244_XO46<bits<6> opcode, bits<8> xo, dag IOL, string asmbase,
-                            string asmstr> {
-  let Predicates = [MMA] in {
-  def NAME :
-    XX3Form_AT3_XAB6<opcode, xo, (outs acc:$AT), IOL,
-                     !strconcat(asmbase#" ", asmstr), IIC_VecFP, []>,
-    RegConstraint<"@earlyclobber $AT">;
-  def PP :
-    XX3Form_AT3_XAB6<
-      opcode, !or(xo, 0x20), (outs acc:$AT), !con((ins acc:$ATi), IOL),
-      !strconcat(asmbase#"pp ", asmstr), IIC_VecFP, []>,
-    RegConstraint<"$ATi = $AT">, NoEncode<"$ATi">;
-  }
-  let Predicates = [MMA, PrefixInstrs] in {
-  def PM#NAME :
-    MMIRR_XX3Form_XY4P2_XAB6<
-      opcode, xo, (outs acc:$AT),
-      !con(IOL, (ins u4imm:$XMSK, u4imm:$YMSK, u2imm:$PMSK)),
-      !strconcat("pm"#asmbase#" ", asmstr#", $XMSK, $YMSK, $PMSK"),
-      IIC_VecFP, []>,
-    RegConstraint<"@earlyclobber $AT">;
-  def PM#NAME#PP :
-    MMIRR_XX3Form_XY4P2_XAB6<
-      opcode, !or(xo, 0x20), (outs acc:$AT),
-      !con((ins acc:$ATi),
-           !con(IOL, (ins u4imm:$XMSK, u4imm:$YMSK, u2imm:$PMSK))),
-      !strconcat("pm"#asmbase#"pp ", asmstr#", $XMSK, $YMSK, $PMSK"),
-      IIC_VecFP, []>,
-    RegConstraint<"$ATi = $AT">, NoEncode<"$ATi">;
-  }
-}
-
-// Defines 10 instructions, operand negating, unmasked, masked with 2, 4, 4
-// bits. Upper nibble are masked with 0x8, 0x4, 0xC for negating operands.
-multiclass ACC_NEG_UM_M244_XOM84C<bits<6> opcode, bits<8> xo, dag IOL,
-                                  string asmbase, string asmstr> {
-  defm NAME : ACC_UM_M244_XOEO<opcode, xo, IOL, asmbase, asmstr>;
-  let Predicates = [MMA] in {
-  def PN : XX3Form_AT3_XAB6<
-             opcode, !or(xo, 0x80), (outs acc:$AT), !con((ins acc:$ATi), IOL),
-             !strconcat(asmbase#"pn ", asmstr), IIC_VecFP, []>,
-           RegConstraint<"$ATi = $AT">, NoEncode<"$ATi">;
-  def NP : XX3Form_AT3_XAB6<
-             opcode, !or(xo, 0x40), (outs acc:$AT), !con((ins acc:$ATi), IOL),
-             !strconcat(asmbase#"np ", asmstr), IIC_VecFP, []>,
-           RegConstraint<"$ATi = $AT">, NoEncode<"$ATi">;
-  def NN : XX3Form_AT3_XAB6<
-             opcode, !or(xo, 0xC0), (outs acc:$AT), !con((ins acc:$ATi), IOL),
-             !strconcat(asmbase#"nn ", asmstr), IIC_VecFP, []>,
-           RegConstraint<"$ATi = $AT">, NoEncode<"$ATi">;
-  }
-  let Predicates = [MMA, PrefixInstrs] in {
-  def PM#NAME#PN :
-    MMIRR_XX3Form_XY4P2_XAB6<
-      opcode, !or(xo, 0x80), (outs acc:$AT),
-      !con((ins acc:$ATi), !con(IOL, (ins u4imm:$XMSK, u4imm:$YMSK, u2imm:$PMSK))),
-      !strconcat("pm"#asmbase#"pn ", asmstr#", $XMSK, $YMSK, $PMSK"),
-      IIC_VecFP, []>,
-    RegConstraint<"$ATi = $AT">, NoEncode<"$ATi">;
-  def PM#NAME#NP :
-    MMIRR_XX3Form_XY4P2_XAB6<
-      opcode, !or(xo, 0x40), (outs acc:$AT),
-      !con((ins acc:$ATi), !con(IOL, (ins u4imm:$XMSK, u4imm:$YMSK, u2imm:$PMSK))),
-      !strconcat("pm"#asmbase#"np ", asmstr#", $XMSK, $YMSK, $PMSK"),
-      IIC_VecFP, []>,
-    RegConstraint<"$ATi = $AT">, NoEncode<"$ATi">;
-  def PM#NAME#NN :
-    MMIRR_XX3Form_XY4P2_XAB6<
-      opcode, !or(xo, 0xC0), (outs acc:$AT),
-      !con((ins acc:$ATi), !con(IOL, (ins u4imm:$XMSK, u4imm:$YMSK, u2imm:$PMSK))),
-      !strconcat("pm"#asmbase#"nn ", asmstr#", $XMSK, $YMSK, $PMSK"),
-      IIC_VecFP, []>,
-    RegConstraint<"$ATi = $AT">, NoEncode<"$ATi">;
-  }
-}
-
-// Defines 5 instructions, unmasked, operand negating.
-// Upper nibble are masked with 0x8, 0x4, 0xC for negating operands.
-multiclass ACC_NEG_UM_XOM84C<bits<6> opcode, bits<8> xo, dag IOL,
-                             string asmbase, string asmstr> {
-  defm NAME : ACC_UM_XOEO<opcode, xo, IOL, asmbase, asmstr>;
-  let Predicates = [MMA] in {
-  def PN : XX3Form_AT3_XAB6<opcode, !or(xo, 0x80), (outs acc:$AT),
-                            !con((ins acc:$ATi), IOL),
-                            !strconcat(asmbase#"pn ", asmstr), IIC_VecFP, []>,
-           RegConstraint<"$ATi = $AT">, NoEncode<"$ATi">;
-  def NP : XX3Form_AT3_XAB6<opcode, !or(xo, 0x40), (outs acc:$AT),
-                            !con((ins acc:$ATi), IOL),
-                            !strconcat(asmbase#"np ", asmstr), IIC_VecFP, []>,
-           RegConstraint<"$ATi = $AT">, NoEncode<"$ATi">;
-  def NN : XX3Form_AT3_XAB6<opcode, !or(xo, 0xC0), (outs acc:$AT),
-                            !con((ins acc:$ATi), IOL),
-                            !strconcat(asmbase#"nn ", asmstr), IIC_VecFP, []>,
-           RegConstraint<"$ATi = $AT">, NoEncode<"$ATi">;
-  }
-}
-
-// Defines 10 instructions, operand negating, unmasked, masked with 4, 4 bits.
-// Upper nibble are masked with 0x8, 0x4, 0xC for negating operands.
-multiclass ACC_NEG_UM_M44_XOM84C<bits<6> opcode, bits<8> xo, dag IOL,
-                                 string asmbase, string asmstr> {
-  defm NAME : ACC_NEG_UM_XOM84C<opcode, xo, IOL, asmbase, asmstr>;
-  let Predicates = [MMA, PrefixInstrs] in {
-  def PM#NAME :
-    MMIRR_XX3Form_XY4_XAB6<
-      opcode, !or(xo, 0x01), (outs acc:$AT),
-      !con(IOL, (ins u4imm:$XMSK, u4imm:$YMSK)),
-      !strconcat("pm"#asmbase#" ", asmstr#", $XMSK, $YMSK"),
-      IIC_VecFP, []>,
-    RegConstraint<"@earlyclobber $AT">;
-  def PM#NAME#PP :
-    MMIRR_XX3Form_XY4_XAB6<
-      opcode, xo, (outs acc:$AT),
-      !con((ins acc:$ATi), !con(IOL, (ins u4imm:$XMSK, u4imm:$YMSK))),
-      !strconcat("pm"#asmbase#"pp ", asmstr#", $XMSK, $YMSK"),
-      IIC_VecFP, []>,
-    RegConstraint<"$ATi = $AT">, NoEncode<"$ATi">;
-  def PM#NAME#PN :
-    MMIRR_XX3Form_XY4_XAB6<
-      opcode, !or(xo, 0x80), (outs acc:$AT),
-      !con((ins acc:$ATi), !con(IOL, (ins u4imm:$XMSK, u4imm:$YMSK))),
-      !strconcat("pm"#asmbase#"pn ", asmstr#", $XMSK, $YMSK"),
-      IIC_VecFP, []>,
-    RegConstraint<"$ATi = $AT">, NoEncode<"$ATi">;
-  def PM#NAME#NP :
-    MMIRR_XX3Form_XY4_XAB6<
-      opcode, !or(xo, 0x40), (outs acc:$AT),
-      !con((ins acc:$ATi), !con(IOL, (ins u4imm:$XMSK, u4imm:$YMSK))),
-      !strconcat("pm"#asmbase#"np ", asmstr#", $XMSK, $YMSK"),
-      IIC_VecFP, []>,
-    RegConstraint<"$ATi = $AT">, NoEncode<"$ATi">;
-  def PM#NAME#NN :
-    MMIRR_XX3Form_XY4_XAB6<
-      opcode, !or(xo, 0xC0), (outs acc:$AT),
-      !con((ins acc:$ATi), !con(IOL, (ins u4imm:$XMSK, u4imm:$YMSK))),
-      !strconcat("pm"#asmbase#"nn ", asmstr#", $XMSK, $YMSK"),
-      IIC_VecFP, []>,
-    RegConstraint<"$ATi = $AT">, NoEncode<"$ATi">;
-  }
-}
-
-// Defines 10 instructions, operand negating, unmasked, masked with 4, 2 bits.
-// Upper nibble are masked with 0x8, 0x4, 0xC for negating operands.
-multiclass ACC_NEG_UM_M42_XOM84C<bits<6> opcode, bits<8> xo, dag IOL,
-                                 string asmbase, string asmstr> {
-  defm NAME : ACC_NEG_UM_XOM84C<opcode, xo, IOL, asmbase, asmstr>;
-  let Predicates = [MMA, PrefixInstrs] in {
-  def PM#NAME :
-    MMIRR_XX3Form_X4Y2_XAB6<
-      opcode, !or(xo, 0x01), (outs acc:$AT),
-      !con(IOL, (ins u4imm:$XMSK, u2imm:$YMSK)),
-      !strconcat("pm"#asmbase#" ", asmstr#", $XMSK, $YMSK"),
-      IIC_VecFP, []>,
-    RegConstraint<"@earlyclobber $AT">;
-  def PM#NAME#PP :
-    MMIRR_XX3Form_X4Y2_XAB6<
-      opcode, xo, (outs acc:$AT),
-      !con((ins acc:$ATi), !con(IOL, (ins u4imm:$XMSK, u2imm:$YMSK))),
-      !strconcat("pm"#asmbase#"pp ", asmstr#", $XMSK, $YMSK"),
-      IIC_VecFP, []>,
-    RegConstraint<"$ATi = $AT">, NoEncode<"$ATi">;
-  def PM#NAME#PN :
-    MMIRR_XX3Form_X4Y2_XAB6<
-      opcode, !or(xo, 0x80), (outs acc:$AT),
-      !con((ins acc:$ATi), !con(IOL, (ins u4imm:$XMSK, u2imm:$YMSK))),
-      !strconcat("pm"#asmbase#"pn ", asmstr#", $XMSK, $YMSK"),
-      IIC_VecFP, []>,
-    RegConstraint<"$ATi = $AT">, NoEncode<"$ATi">;
-  def PM#NAME#NP :
-    MMIRR_XX3Form_X4Y2_XAB6<
-      opcode, !or(xo, 0x40), (outs acc:$AT),
-      !con((ins acc:$ATi), !con(IOL, (ins u4imm:$XMSK, u2imm:$YMSK))),
-      !strconcat("pm"#asmbase#"np ", asmstr#", $XMSK, $YMSK"),
-      IIC_VecFP, []>,
-    RegConstraint<"$ATi = $AT">, NoEncode<"$ATi">;
-  def PM#NAME#NN :
-    MMIRR_XX3Form_X4Y2_XAB6<
-      opcode, !or(xo, 0xC0), (outs acc:$AT),
-      !con((ins acc:$ATi), !con(IOL, (ins u4imm:$XMSK, u2imm:$YMSK))),
-      !strconcat("pm"#asmbase#"nn ", asmstr#", $XMSK, $YMSK"),
-      IIC_VecFP, []>,
-    RegConstraint<"$ATi = $AT">, NoEncode<"$ATi">;
-  }
-}
-
-// End of class definitions.
-//-----------------------------------------------------------------------------
-
-let Predicates = [MMA] in {
-  def XXMFACC :
-    XForm_AT3<31, 0, 177, (outs acc:$ASo), (ins acc:$AS), "xxmfacc $AS",
-              IIC_VecGeneral,
-              [(set v512i1:$ASo, (int_ppc_mma_xxmfacc v512i1:$AS))]>,
-              RegConstraint<"$ASo = $AS">, NoEncode<"$ASo">;
-  def XXMTACC :
-    XForm_AT3<31, 1, 177, (outs acc:$AT), (ins acc:$ATi), "xxmtacc $AT",
-              IIC_VecGeneral,
-              [(set v512i1:$AT, (int_ppc_mma_xxmtacc v512i1:$ATi))]>,
-              RegConstraint<"$ATi = $AT">, NoEncode<"$ATi">;
-  def KILL_PAIR : PPCPostRAExpPseudo<(outs vsrprc:$XTp), (ins vsrprc:$XSp),
-                                      "#KILL_PAIR", []>,
-                                      RegConstraint<"$XTp = $XSp">;
-  def BUILD_UACC : PPCPostRAExpPseudo<(outs acc:$AT), (ins uacc:$AS),
-                                      "#BUILD_UACC $AT, $AS", []>;
-  // We define XXSETACCZ as rematerializable to undo CSE of that intrinsic in
-  // the backend. We avoid CSE here because it generates a copy of the acc
-  // register and this copy is more expensive than calling the intrinsic again.
-  let isAsCheapAsAMove = 1, isReMaterializable = 1 in {
-    def XXSETACCZ :
-      XForm_AT3<31, 3, 177, (outs acc:$AT), (ins), "xxsetaccz $AT", IIC_VecGeneral,
-                [(set v512i1:$AT, (int_ppc_mma_xxsetaccz))]>;
-  }
-  def XVI8GER4SPP :
-    XX3Form_AT3_XAB6<59, 99, (outs acc:$AT), (ins acc:$ATi, vsrc:$XA, vsrc:$XB),
-                     "xvi8ger4spp $AT, $XA, $XB", IIC_VecGeneral, []>,
-    RegConstraint<"$ATi = $AT">, NoEncode<"$ATi">;
-  let mayStore = 1 in {
-    def SPILL_ACC: PPCEmitTimePseudo<(outs), (ins acc:$AT, memrix16:$dst),
-                                     "#SPILL_ACC", []>;
-    def SPILL_UACC: PPCEmitTimePseudo<(outs), (ins uacc:$AT, memrix16:$dst),
-                                     "#SPILL_UACC", []>;
-  }
-  let mayLoad = 1, hasSideEffects = 0 in {
-    def RESTORE_ACC: PPCEmitTimePseudo<(outs acc:$AT), (ins memrix16:$src),
-                                       "#RESTORE_ACC", []>;
-    def RESTORE_UACC: PPCEmitTimePseudo<(outs uacc:$AT), (ins memrix16:$src),
-                                       "#RESTORE_UACC", []>;
-  }
-}
-
-let Predicates = [MMA, PrefixInstrs] in {
-  def PMXVI8GER4SPP :
-    MMIRR_XX3Form_XYP4_XAB6<59, 99, (outs acc:$AT),
-                            (ins acc:$ATi, vsrc:$XA,vsrc:$XB, u4imm:$XMSK,
-                             u4imm:$YMSK, u4imm:$PMSK),
-                            "pmxvi8ger4spp $AT, $XA, $XB, $XMSK, $YMSK, $PMSK",
-                            IIC_VecGeneral, []>,
-    RegConstraint<"$ATi = $AT">, NoEncode<"$ATi">;
-}
-
-// MMA accumulating/non-accumulating instructions.
-//------------------------------------------------------------------------------
-
-// XVBF16GER2, XVBF16GER2PP, XVBF16GER2PN, XVBF16GER2NP, XVBF16GER2NN
-// PMXVBF16GER2, PMXVBF16GER2PP, PMXVBF16GER2PN, PMXVBF16GER2NP, PMXVBF16GER2NN
-defm XVBF16GER2 : ACC_NEG_UM_M244_XOM84C<59, 50, (ins vsrc:$XA, vsrc:$XB),
-                                         "xvbf16ger2", "$AT, $XA, $XB">;
-
-// XVI4GER8, XVI4GER8PP, PMXVI4GER8,  PMXVI4GER8PP
-defm XVI4GER8 : ACC_UM_M844_XOEO<59, 34, (ins vsrc:$XA, vsrc:$XB),
-                                 "xvi4ger8", "$AT, $XA, $XB">;
-
-// XVI8GER4, XVI8GER4PP, PMXVI8GER4, PMXVI8GER4PP
-defm XVI8GER4 : ACC_UM_M444_XOEO<59, 2, (ins vsrc:$XA, vsrc:$XB),
-                                 "xvi8ger4", "$AT, $XA, $XB">;
-
-// XVI16GER2, XVI16GER2PP, PMXVI16GER2, PMXVI16GER2PP
-defm XVI16GER2 : ACC_UM_M244_XO46<59, 75, (ins vsrc:$XA, vsrc:$XB),
-                                  "xvi16ger2", "$AT, $XA, $XB">;
-
-// XVI16GER2S, XVI16GER2SPP, PMXVI16GER2S, PMXVI16GER2SPP
-defm XVI16GER2S : ACC_UM_M244_XOEO<59, 42, (ins vsrc:$XA, vsrc:$XB),
-                                   "xvi16ger2s", "$AT, $XA, $XB">;
-
-// XVF16GER2, XVF16GER2PP, XVF16GER2PN, XVF16GER2NP, XVF16GER2NN
-// PMXVF16GER2, PMXVF16GER2PP, PMXVF16GER2PN, PMXVF16GER2NP, PMXVF16GER2NN
-defm XVF16GER2 : ACC_NEG_UM_M244_XOM84C<59, 18, (ins vsrc:$XA, vsrc:$XB),
-                                        "xvf16ger2", "$AT, $XA, $XB">;
-
-// XVF32GER, XVF32GERPP, XVF32GERPN, XVF32GERNP, XVF32GERPP
-// PMXVF32GER, PMXVF32GERPP, PMXVF32GERPN, PMXVF32GERNP, PMXVF32GERPP
-defm XVF32GER : ACC_NEG_UM_M44_XOM84C<59, 26, (ins vsrc:$XA, vsrc:$XB),
-                                      "xvf32ger", "$AT, $XA, $XB">;
-
-// XVF64GER, XVF64GERPP, XVF64GERPN, XVF64GERNP, XVF64GERNN
-// PMXVF64GER, PMXVF64GERPP, PMXVF64GERPN, PMXVF64GERNP, PMXVF64GERNN
-defm XVF64GER : ACC_NEG_UM_M42_XOM84C<59, 58, (ins vsrpevenrc:$XA, vsrc:$XB),
-                                      "xvf64ger", "$AT, $XA, $XB">;
-//------------------------------------------------------------------------------
-
-// MMA Intrinsics
-let Predicates = [MMA] in {
-  def : Pat<(v512i1 (int_ppc_mma_xvi4ger8 v16i8:$XA, v16i8:$XB)),
-            (XVI4GER8 RCCp.AToVSRC, RCCp.BToVSRC)>;
-  def : Pat<(v512i1 (int_ppc_mma_xvi4ger8pp v512i1:$ATi, v16i8:$XA, v16i8:$XB)),
-            (XVI4GER8PP $ATi, RCCp.AToVSRC, RCCp.BToVSRC)>;
-
-  def : Pat<(v512i1 (int_ppc_mma_xvi8ger4 v16i8:$XA, v16i8:$XB)),
-            (XVI8GER4 RCCp.AToVSRC, RCCp.BToVSRC)>;
-  def : Pat<(v512i1 (int_ppc_mma_xvi8ger4pp v512i1:$ATi, v16i8:$XA, v16i8:$XB)),
-            (XVI8GER4PP $ATi, RCCp.AToVSRC, RCCp.BToVSRC)>;
-
-  def : Pat<(v512i1 (int_ppc_mma_xvi16ger2s v16i8:$XA, v16i8:$XB)),
-            (XVI16GER2S RCCp.AToVSRC, RCCp.BToVSRC)>;
-  def : Pat<(v512i1 (int_ppc_mma_xvi16ger2spp v512i1:$ATi, v16i8:$XA, v16i8:$XB)),
-            (XVI16GER2SPP $ATi, RCCp.AToVSRC, RCCp.BToVSRC)>;
-
-  def : Pat<(v512i1 (int_ppc_mma_xvf16ger2 v16i8:$XA, v16i8:$XB)),
-            (XVF16GER2 RCCp.AToVSRC, RCCp.BToVSRC)>;
-  def : Pat<(v512i1 (int_ppc_mma_xvf16ger2pp v512i1:$ATi, v16i8:$XA, v16i8:$XB)),
-            (XVF16GER2PP $ATi, RCCp.AToVSRC, RCCp.BToVSRC)>;
-  def : Pat<(v512i1 (int_ppc_mma_xvf16ger2pn v512i1:$ATi, v16i8:$XA, v16i8:$XB)),
-            (XVF16GER2PN $ATi, RCCp.AToVSRC, RCCp.BToVSRC)>;
-  def : Pat<(v512i1 (int_ppc_mma_xvf16ger2np v512i1:$ATi, v16i8:$XA, v16i8:$XB)),
-            (XVF16GER2NP $ATi, RCCp.AToVSRC, RCCp.BToVSRC)>;
-  def : Pat<(v512i1 (int_ppc_mma_xvf16ger2nn v512i1:$ATi, v16i8:$XA, v16i8:$XB)),
-            (XVF16GER2NN $ATi, RCCp.AToVSRC, RCCp.BToVSRC)>;
-
-  def : Pat<(v512i1 (int_ppc_mma_xvf32ger v16i8:$XA, v16i8:$XB)),
-            (XVF32GER RCCp.AToVSRC, RCCp.BToVSRC)>;
-  def : Pat<(v512i1 (int_ppc_mma_xvf32gerpp v512i1:$ATi, v16i8:$XA, v16i8:$XB)),
-            (XVF32GERPP $ATi, RCCp.AToVSRC, RCCp.BToVSRC)>;
-  def : Pat<(v512i1 (int_ppc_mma_xvf32gerpn v512i1:$ATi, v16i8:$XA, v16i8:$XB)),
-            (XVF32GERPN $ATi, RCCp.AToVSRC, RCCp.BToVSRC)>;
-  def : Pat<(v512i1 (int_ppc_mma_xvf32gernp v512i1:$ATi, v16i8:$XA, v16i8:$XB)),
-            (XVF32GERNP $ATi, RCCp.AToVSRC, RCCp.BToVSRC)>;
-  def : Pat<(v512i1 (int_ppc_mma_xvf32gernn v512i1:$ATi, v16i8:$XA, v16i8:$XB)),
-            (XVF32GERNN $ATi, RCCp.AToVSRC, RCCp.BToVSRC)>;
-  def : Pat<(v512i1 (int_ppc_mma_xvf64ger v256i1:$XA, v16i8:$XB)),
-            (XVF64GER $XA, RCCp.BToVSRC)>;
-  def : Pat<(v512i1 (int_ppc_mma_xvf64gerpp v512i1:$ATi, v256i1:$XA, v16i8:$XB)),
-            (XVF64GERPP $ATi, $XA, RCCp.BToVSRC)>;
-  def : Pat<(v512i1 (int_ppc_mma_xvf64gerpn v512i1:$ATi, v256i1:$XA, v16i8:$XB)),
-            (XVF64GERPN $ATi, $XA, RCCp.BToVSRC)>;
-  def : Pat<(v512i1 (int_ppc_mma_xvf64gernp v512i1:$ATi, v256i1:$XA, v16i8:$XB)),
-            (XVF64GERNP $ATi, $XA, RCCp.BToVSRC)>;
-  def : Pat<(v512i1 (int_ppc_mma_xvf64gernn v512i1:$ATi, v256i1:$XA, v16i8:$XB)),
-            (XVF64GERNN $ATi, $XA, RCCp.BToVSRC)>;
-
-  def : Pat<(v512i1 (int_ppc_mma_xvbf16ger2 v16i8:$XA, v16i8:$XB)),
-            (XVBF16GER2 RCCp.AToVSRC, RCCp.BToVSRC)>;
-  def : Pat<(v512i1 (int_ppc_mma_xvbf16ger2pp v512i1:$ATi, v16i8:$XA, v16i8:$XB)),
-            (XVBF16GER2PP $ATi, RCCp.AToVSRC, RCCp.BToVSRC)>;
-  def : Pat<(v512i1 (int_ppc_mma_xvbf16ger2pn v512i1:$ATi, v16i8:$XA, v16i8:$XB)),
-            (XVBF16GER2PN $ATi, RCCp.AToVSRC, RCCp.BToVSRC)>;
-  def : Pat<(v512i1 (int_ppc_mma_xvbf16ger2np v512i1:$ATi, v16i8:$XA, v16i8:$XB)),
-            (XVBF16GER2NP $ATi, RCCp.AToVSRC, RCCp.BToVSRC)>;
-  def : Pat<(v512i1 (int_ppc_mma_xvbf16ger2nn v512i1:$ATi, v16i8:$XA, v16i8:$XB)),
-            (XVBF16GER2NN $ATi, RCCp.AToVSRC, RCCp.BToVSRC)>;
-  def : Pat<(v512i1 (int_ppc_mma_xvi16ger2 v16i8:$XA, v16i8:$XB)),
-            (XVI16GER2 RCCp.AToVSRC, RCCp.BToVSRC)>;
-  def : Pat<(v512i1 (int_ppc_mma_xvi16ger2pp v512i1:$ATi, v16i8:$XA, v16i8:$XB)),
-            (XVI16GER2PP $ATi, RCCp.AToVSRC, RCCp.BToVSRC)>;
-  def : Pat<(v512i1 (int_ppc_mma_xvi8ger4spp v512i1:$ATi, v16i8:$XA, v16i8:$XB)),
-            (XVI8GER4SPP $ATi, RCCp.AToVSRC, RCCp.BToVSRC)>;
-}
-
-// MMA Intrinsics
-let Predicates = [MMA, PrefixInstrs] in {
-  def : Pat<(v512i1 (int_ppc_mma_pmxvi4ger8 v16i8:$XA, v16i8:$XB, Msk4Imm:$XMSK,
-                                            Msk4Imm:$YMSK, Msk8Imm:$PMSK)),
-            (PMXVI4GER8 RCCp.AToVSRC, RCCp.BToVSRC, Msk4Imm:$XMSK,
-                        Msk4Imm:$YMSK, Msk8Imm:$PMSK)>;
-  def : Pat<(v512i1 (int_ppc_mma_pmxvi4ger8pp v512i1:$ATi, v16i8:$XA, v16i8:$XB,
-                                              Msk4Imm:$XMSK, Msk4Imm:$YMSK,
-                                              Msk8Imm:$PMSK)),
-            (PMXVI4GER8PP $ATi, RCCp.AToVSRC, RCCp.BToVSRC, Msk4Imm:$XMSK,
-                          Msk4Imm:$YMSK, Msk8Imm:$PMSK)>;
-
-  def : Pat<(v512i1 (int_ppc_mma_pmxvi8ger4 v16i8:$XA, v16i8:$XB, Msk4Imm:$XMSK,
-                                            Msk4Imm:$YMSK, Msk4Imm:$PMSK)),
-            (PMXVI8GER4 RCCp.AToVSRC, RCCp.BToVSRC, Msk4Imm:$XMSK,
-                        Msk4Imm:$YMSK, Msk4Imm:$PMSK)>;
-  def : Pat<(v512i1 (int_ppc_mma_pmxvi8ger4pp v512i1:$ATi, v16i8:$XA, v16i8:$XB,
-                                              Msk4Imm:$XMSK, Msk4Imm:$YMSK,
-                                              Msk4Imm:$PMSK)),
-            (PMXVI8GER4PP $ATi, RCCp.AToVSRC, RCCp.BToVSRC, Msk4Imm:$XMSK,
-                          Msk4Imm:$YMSK, Msk4Imm:$PMSK)>;
-
-  def : Pat<(v512i1 (int_ppc_mma_pmxvi16ger2s v16i8:$XA, v16i8:$XB, Msk4Imm:$XMSK,
-                                              Msk4Imm:$YMSK, Msk2Imm:$PMSK)),
-            (PMXVI16GER2S RCCp.AToVSRC, RCCp.BToVSRC, Msk4Imm:$XMSK,
-                          Msk4Imm:$YMSK, Msk2Imm:$PMSK)>;
-  def : Pat<(v512i1 (int_ppc_mma_pmxvi16ger2spp v512i1:$ATi, v16i8:$XA, v16i8:$XB,
-                                                Msk4Imm:$XMSK, Msk4Imm:$YMSK,
-                                                Msk2Imm:$PMSK)),
-            (PMXVI16GER2SPP $ATi, RCCp.AToVSRC, RCCp.BToVSRC, Msk4Imm:$XMSK,
-                            Msk4Imm:$YMSK, Msk2Imm:$PMSK)>;
-  def : Pat<(v512i1 (int_ppc_mma_pmxvf16ger2 v16i8:$XA, v16i8:$XB, Msk4Imm:$XMSK,
-                                             Msk4Imm:$YMSK, Msk2Imm:$PMSK)),
-            (PMXVF16GER2 RCCp.AToVSRC, RCCp.BToVSRC, Msk4Imm:$XMSK,
-                         Msk4Imm:$YMSK, Msk2Imm:$PMSK)>;
-  def : Pat<(v512i1 (int_ppc_mma_pmxvf16ger2pp v512i1:$ATi, v16i8:$XA, v16i8:$XB,
-                                               Msk4Imm:$XMSK, Msk4Imm:$YMSK,
-                                               Msk2Imm:$PMSK)),
-            (PMXVF16GER2PP $ATi, RCCp.AToVSRC, RCCp.BToVSRC, Msk4Imm:$XMSK,
-                           Msk4Imm:$YMSK, Msk2Imm:$PMSK)>;
-  def : Pat<(v512i1 (int_ppc_mma_pmxvf16ger2pn v512i1:$ATi, v16i8:$XA, v16i8:$XB,
-                                               Msk4Imm:$XMSK, Msk4Imm:$YMSK,
-                                               Msk2Imm:$PMSK)),
-            (PMXVF16GER2PN $ATi, RCCp.AToVSRC, RCCp.BToVSRC, Msk4Imm:$XMSK,
-                           Msk4Imm:$YMSK, Msk2Imm:$PMSK)>;
-  def : Pat<(v512i1 (int_ppc_mma_pmxvf16ger2np v512i1:$ATi, v16i8:$XA, v16i8:$XB,
-                                               Msk4Imm:$XMSK, Msk4Imm:$YMSK,
-                                               Msk2Imm:$PMSK)),
-            (PMXVF16GER2NP $ATi, RCCp.AToVSRC, RCCp.BToVSRC, Msk4Imm:$XMSK,
-                           Msk4Imm:$YMSK, Msk2Imm:$PMSK)>;
-  def : Pat<(v512i1 (int_ppc_mma_pmxvf16ger2pn v512i1:$ATi, v16i8:$XA, v16i8:$XB,
-                                               Msk4Imm:$XMSK, Msk4Imm:$YMSK,
-                                               Msk2Imm:$PMSK)),
-            (PMXVF16GER2PN $ATi, RCCp.AToVSRC, RCCp.BToVSRC, Msk4Imm:$XMSK,
-                           Msk4Imm:$YMSK, Msk2Imm:$PMSK)>;
-  def : Pat<(v512i1 (int_ppc_mma_pmxvf16ger2np v512i1:$ATi, v16i8:$XA, v16i8:$XB,
-                                               Msk4Imm:$XMSK, Msk4Imm:$YMSK,
-                                               Msk2Imm:$PMSK)),
-            (PMXVF16GER2NP $ATi, RCCp.AToVSRC, RCCp.BToVSRC, Msk4Imm:$XMSK,
-                           Msk4Imm:$YMSK, Msk2Imm:$PMSK)>;
-  def : Pat<(v512i1 (int_ppc_mma_pmxvf16ger2nn v512i1:$ATi, v16i8:$XA, v16i8:$XB,
-                                               Msk4Imm:$XMSK, Msk4Imm:$YMSK,
-                                               Msk2Imm:$PMSK)),
-            (PMXVF16GER2NN $ATi, RCCp.AToVSRC, RCCp.BToVSRC, Msk4Imm:$XMSK,
-                           Msk4Imm:$YMSK, Msk2Imm:$PMSK)>;
-
-  def : Pat<(v512i1 (int_ppc_mma_pmxvf32ger v16i8:$XA, v16i8:$XB, Msk4Imm:$XMSK,
-                                            Msk4Imm:$YMSK)),
-            (PMXVF32GER RCCp.AToVSRC, RCCp.BToVSRC, Msk4Imm:$XMSK,
-                        Msk4Imm:$YMSK)>;
-  def : Pat<(v512i1 (int_ppc_mma_pmxvf32gerpp v512i1:$ATi, v16i8:$XA, v16i8:$XB,
-                                              Msk4Imm:$XMSK, Msk4Imm:$YMSK)),
-            (PMXVF32GERPP $ATi, RCCp.AToVSRC, RCCp.BToVSRC, Msk4Imm:$XMSK,
-                          Msk4Imm:$YMSK)>;
-  def : Pat<(v512i1 (int_ppc_mma_pmxvf32gerpn v512i1:$ATi, v16i8:$XA, v16i8:$XB,
-                                              Msk4Imm:$XMSK, Msk4Imm:$YMSK)),
-            (PMXVF32GERPN $ATi, RCCp.AToVSRC, RCCp.BToVSRC, Msk4Imm:$XMSK,
-                          Msk4Imm:$YMSK)>;
-  def : Pat<(v512i1 (int_ppc_mma_pmxvf32gernp v512i1:$ATi, v16i8:$XA, v16i8:$XB,
-                                              Msk4Imm:$XMSK, Msk4Imm:$YMSK)),
-            (PMXVF32GERNP $ATi, RCCp.AToVSRC, RCCp.BToVSRC, Msk4Imm:$XMSK,
-                          Msk4Imm:$YMSK)>;
-  def : Pat<(v512i1 (int_ppc_mma_pmxvf32gernn v512i1:$ATi, v16i8:$XA, v16i8:$XB,
-                                              Msk4Imm:$XMSK, Msk4Imm:$YMSK)),
-            (PMXVF32GERNN $ATi, RCCp.AToVSRC, RCCp.BToVSRC, Msk4Imm:$XMSK,
-                          Msk4Imm:$YMSK)>;
-
-  def : Pat<(v512i1 (int_ppc_mma_pmxvf64ger v256i1:$XA, v16i8:$XB, Msk4Imm:$XMSK,
-                                            Msk2Imm:$YMSK)),
-            (PMXVF64GER $XA, RCCp.BToVSRC, Msk4Imm:$XMSK, Msk2Imm:$YMSK)>;
-  def : Pat<(v512i1 (int_ppc_mma_pmxvf64gerpp v512i1:$ATi, v256i1:$XA, v16i8:$XB,
-                                              Msk4Imm:$XMSK, Msk2Imm:$YMSK)),
-            (PMXVF64GERPP $ATi, $XA, RCCp.BToVSRC, Msk4Imm:$XMSK,
-                          Msk2Imm:$YMSK)>;
-  def : Pat<(v512i1 (int_ppc_mma_pmxvf64gerpn v512i1:$ATi, v256i1:$XA, v16i8:$XB,
-                                              Msk4Imm:$XMSK, Msk2Imm:$YMSK)),
-            (PMXVF64GERPN $ATi, $XA, RCCp.BToVSRC, Msk4Imm:$XMSK,
-                          Msk2Imm:$YMSK)>;
-  def : Pat<(v512i1 (int_ppc_mma_pmxvf64gernp v512i1:$ATi, v256i1:$XA, v16i8:$XB,
-                                              Msk4Imm:$XMSK, Msk2Imm:$YMSK)),
-            (PMXVF64GERNP $ATi, $XA, RCCp.BToVSRC, Msk4Imm:$XMSK,
-                          Msk2Imm:$YMSK)>;
-  def : Pat<(v512i1 (int_ppc_mma_pmxvf64gernn v512i1:$ATi, v256i1:$XA, v16i8:$XB,
-                                              Msk4Imm:$XMSK, Msk2Imm:$YMSK)),
-            (PMXVF64GERNN $ATi, $XA, RCCp.BToVSRC, Msk4Imm:$XMSK,
-                          Msk2Imm:$YMSK)>;
-
-  def : Pat<(v512i1 (int_ppc_mma_pmxvbf16ger2 v16i8:$XA, v16i8:$XB, Msk4Imm:$XMSK,
-                                              Msk4Imm:$YMSK, Msk2Imm:$PMSK)),
-            (PMXVBF16GER2 RCCp.AToVSRC, RCCp.BToVSRC, Msk4Imm:$XMSK,
-                          Msk4Imm:$YMSK, Msk2Imm:$PMSK)>;
-  def : Pat<(v512i1 (int_ppc_mma_pmxvbf16ger2pp v512i1:$ATi, v16i8:$XA, v16i8:$XB,
-                                                Msk4Imm:$XMSK, Msk4Imm:$YMSK,
-                                                Msk2Imm:$PMSK)),
-            (PMXVBF16GER2PP $ATi, RCCp.AToVSRC, RCCp.BToVSRC, Msk4Imm:$XMSK,
-                            Msk4Imm:$YMSK, Msk2Imm:$PMSK)>;
-  def : Pat<(v512i1 (int_ppc_mma_pmxvbf16ger2pn v512i1:$ATi, v16i8:$XA, v16i8:$XB,
-                                                Msk4Imm:$XMSK, Msk4Imm:$YMSK,
-                                                Msk2Imm:$PMSK)),
-            (PMXVBF16GER2PN $ATi, RCCp.AToVSRC, RCCp.BToVSRC, Msk4Imm:$XMSK,
-                            Msk4Imm:$YMSK, Msk2Imm:$PMSK)>;
-  def : Pat<(v512i1 (int_ppc_mma_pmxvbf16ger2np v512i1:$ATi, v16i8:$XA, v16i8:$XB,
-                                                Msk4Imm:$XMSK, Msk4Imm:$YMSK,
-                                                Msk2Imm:$PMSK)),
-            (PMXVBF16GER2NP $ATi, RCCp.AToVSRC, RCCp.BToVSRC, Msk4Imm:$XMSK,
-                            Msk4Imm:$YMSK, Msk2Imm:$PMSK)>;
-  def : Pat<(v512i1 (int_ppc_mma_pmxvbf16ger2nn v512i1:$ATi, v16i8:$XA, v16i8:$XB,
-                                                Msk4Imm:$XMSK, Msk4Imm:$YMSK,
-                                                Msk2Imm:$PMSK)),
-            (PMXVBF16GER2NN $ATi, RCCp.AToVSRC, RCCp.BToVSRC, Msk4Imm:$XMSK,
-                            Msk4Imm:$YMSK, Msk2Imm:$PMSK)>;
-  def : Pat<(v512i1 (int_ppc_mma_pmxvi16ger2 v16i8:$XA, v16i8:$XB, Msk4Imm:$XMSK,
-                                             Msk4Imm:$YMSK, Msk2Imm:$PMSK)),
-            (PMXVI16GER2 RCCp.AToVSRC, RCCp.BToVSRC, Msk4Imm:$XMSK,
-                         Msk4Imm:$YMSK, Msk2Imm:$PMSK)>;
-  def : Pat<(v512i1 (int_ppc_mma_pmxvi8ger4spp v512i1:$ATi, v16i8:$XA, v16i8:$XB,
-                                               Msk4Imm:$XMSK, Msk4Imm:$YMSK,
-                                               Msk2Imm:$PMSK)),
-            (PMXVI8GER4SPP $ATi, RCCp.AToVSRC, RCCp.BToVSRC, Msk4Imm:$XMSK,
-                           Msk4Imm:$YMSK, Msk2Imm:$PMSK)>;
-  def : Pat<(v512i1 (int_ppc_mma_pmxvi16ger2pp v512i1:$ATi, v16i8:$XA, v16i8:$XB,
-                                               Msk4Imm:$XMSK, Msk4Imm:$YMSK,
-                                               Msk2Imm:$PMSK)),
-            (PMXVI16GER2PP $ATi, RCCp.AToVSRC, RCCp.BToVSRC, Msk4Imm:$XMSK,
-                           Msk4Imm:$YMSK, Msk2Imm:$PMSK)>;
-}
-
-def Concats {
-  dag VecsToVecPair0 =
-    (v256i1 (INSERT_SUBREG
-      (INSERT_SUBREG (IMPLICIT_DEF), $vs0, sub_vsx1),
-      $vs1, sub_vsx0));
-  dag VecsToVecPair1 =
-    (v256i1 (INSERT_SUBREG
-      (INSERT_SUBREG (IMPLICIT_DEF), $vs2, sub_vsx1),
-      $vs3, sub_vsx0));
-  dag VecsToVecQuad =
-    (BUILD_UACC (INSERT_SUBREG
-                  (INSERT_SUBREG (v512i1 (IMPLICIT_DEF)),
-                                 (KILL_PAIR VecsToVecPair0), sub_pair0),
-                  (KILL_PAIR VecsToVecPair1), sub_pair1));
-}
-
-def Extracts {
-  dag Pair0 = (v256i1 (EXTRACT_SUBREG $v, sub_pair0));
-  dag Pair1 = (v256i1 (EXTRACT_SUBREG $v, sub_pair1));
-  dag Vec0 = (v4i32 (EXTRACT_SUBREG Pair0, sub_vsx0));
-  dag Vec1 = (v4i32 (EXTRACT_SUBREG Pair0, sub_vsx1));
-  dag Vec2 = (v4i32 (EXTRACT_SUBREG Pair1, sub_vsx0));
-  dag Vec3 = (v4i32 (EXTRACT_SUBREG Pair1, sub_vsx1));
-}
-
-let Predicates = [MMA] in {
-  def : Pat<(v512i1 (PPCAccBuild v4i32:$vs1, v4i32:$vs0, v4i32:$vs3, v4i32:$vs2)),
-            (XXMTACC Concats.VecsToVecQuad)>;
-  def : Pat<(v512i1 (int_ppc_mma_assemble_acc v16i8:$vs1, v16i8:$vs0,
-                                              v16i8:$vs3, v16i8:$vs2)),
-            (XXMTACC Concats.VecsToVecQuad)>;
-  def : Pat<(v512i1 (PPCxxmfacc v512i1:$AS)), (XXMFACC acc:$AS)>;
-  def : Pat<(v4i32 (PPCAccExtractVsx acc:$v, 0)),
-            Extracts.Vec0>;
-  def : Pat<(v4i32 (PPCAccExtractVsx acc:$v, 1)),
-            Extracts.Vec1>;
-  def : Pat<(v4i32 (PPCAccExtractVsx acc:$v, 2)),
-            Extracts.Vec2>;
-  def : Pat<(v4i32 (PPCAccExtractVsx acc:$v, 3)),
-            Extracts.Vec3>;
-}
-
-let Predicates = [PairedVectorMemops] in {
-  def : Pat<(v256i1 (PPCPairBuild v4i32:$vs1, v4i32:$vs0)),
-            Concats.VecsToVecPair0>;
-  def : Pat<(v256i1 (int_ppc_vsx_assemble_pair v16i8:$vs1, v16i8:$vs0)),
-            Concats.VecsToVecPair0>;
-  def : Pat<(v4i32 (PPCPairExtractVsx vsrpevenrc:$v, 0)),
-            (v4i32 (EXTRACT_SUBREG $v, sub_vsx0))>;
-  def : Pat<(v4i32 (PPCPairExtractVsx vsrpevenrc:$v, 1)),
-            (v4i32 (EXTRACT_SUBREG $v, sub_vsx1))>;
-}
-
-let mayLoad = 1, mayStore = 0, Predicates = [PairedVectorMemops] in {
-  def LXVP : DQForm_XTp5_RA17_MEM<6, 0, (outs vsrprc:$XTp),
-                                  (ins memrix16:$DQ_RA), "lxvp $XTp, $DQ_RA",
-                                  IIC_LdStLFD, []>;
-  def LXVPX : XForm_XTp5_XAB5<31, 333, (outs vsrprc:$XTp), (ins memrr:$src),
-                              "lxvpx $XTp, $src", IIC_LdStLFD,
-                              []>;
-}
-
-let mayLoad = 0, mayStore = 1, Predicates = [PairedVectorMemops] in {
-  def STXVP : DQForm_XTp5_RA17_MEM<6, 1, (outs), (ins vsrprc:$XTp,
-                                   memrix16:$DQ_RA), "stxvp $XTp, $DQ_RA",
-                                   IIC_LdStLFD, []>;
-  def STXVPX : XForm_XTp5_XAB5<31, 461, (outs), (ins vsrprc:$XTp, memrr:$dst),
-                               "stxvpx $XTp, $dst", IIC_LdStLFD,
-                               []>;
-}
-
-let mayLoad = 1, mayStore = 0, Predicates = [PairedVectorMemops, PrefixInstrs] in {
-  defm PLXVP :
-    8LS_DForm_R_XTp5_SI34_MEM_p<1, 58, (outs vsrprc:$XTp), (ins memri34:$D_RA),
-                                (ins memri34_pcrel:$D_RA), "plxvp $XTp, $D_RA",
-                                IIC_LdStLFD>;
-}
-
-let mayLoad = 0, mayStore = 1, Predicates = [PairedVectorMemops, PrefixInstrs] in {
-  defm PSTXVP :
-    8LS_DForm_R_XTp5_SI34_MEM_p<1, 62, (outs), (ins vsrprc:$XTp, memri34:$D_RA),
-                                (ins vsrprc:$XTp, memri34_pcrel:$D_RA),
-                                "pstxvp $XTp, $D_RA", IIC_LdStLFD>;
-}
-
-let Predicates = [PairedVectorMemops] in {
-  // Intrinsics for Paired Vector Loads.
-  def : Pat<(v256i1 (int_ppc_vsx_lxvp iaddrX16:$src)), (LXVP memrix16:$src)>;
-  def : Pat<(v256i1 (int_ppc_vsx_lxvp xaddrX16:$src)), (LXVPX xaddrX16:$src)>;
-  let Predicates = [PairedVectorMemops, PrefixInstrs] in {
-    def : Pat<(v256i1 (int_ppc_vsx_lxvp iaddrX34:$src)), (PLXVP memri34:$src)>;
-  }
-  // Intrinsics for Paired Vector Stores.
-  def : Pat<(int_ppc_vsx_stxvp v256i1:$XSp, iaddrX16:$dst),
-            (STXVP $XSp, memrix16:$dst)>;
-  def : Pat<(int_ppc_vsx_stxvp v256i1:$XSp, xaddrX16:$dst),
-            (STXVPX $XSp, xaddrX16:$dst)>;
-  let Predicates = [PairedVectorMemops, PrefixInstrs] in {
-    def : Pat<(int_ppc_vsx_stxvp v256i1:$XSp, iaddrX34:$dst),
-              (PSTXVP $XSp, memri34:$dst)>;
-  }
-}
-
-// TODO: We have an added complexity of 500 here. This is only a temporary
-// solution to have tablegen consider these patterns first. The way we do
-// addressing for PowerPC is complex depending on available D form, X form, or
-// aligned D form loads/stores like DS and DQ forms. The prefixed
-// instructions in this file also add additional PC Relative loads/stores
-// and D form loads/stores with 34 bit immediates. It is very difficult to force
-// instruction selection to consistently pick these first without the current
-// added complexity. Once pc-relative implementation is complete, a set of
-// follow-up patches will address this refactoring and the AddedComplexity will
-// be removed.
-let Predicates = [PCRelativeMemops], AddedComplexity = 500 in {
-  // Load i32
-  def : Pat<(i32 (zextloadi1  (PPCmatpcreladdr pcreladdr:$ga))),
-            (PLBZpc $ga, 0)>;
-  def : Pat<(i32 (extloadi1  (PPCmatpcreladdr pcreladdr:$ga))),
-            (PLBZpc $ga, 0)>;
-  def : Pat<(i32 (zextloadi8  (PPCmatpcreladdr pcreladdr:$ga))),
-            (PLBZpc $ga, 0)>;
-  def : Pat<(i32 (extloadi8   (PPCmatpcreladdr pcreladdr:$ga))),
-            (PLBZpc $ga, 0)>;
-  def : Pat<(i32 (sextloadi16 (PPCmatpcreladdr pcreladdr:$ga))),
-            (PLHApc $ga, 0)>;
-  def : Pat<(i32 (zextloadi16 (PPCmatpcreladdr pcreladdr:$ga))),
-            (PLHZpc $ga, 0)>;
-  def : Pat<(i32 (extloadi16 (PPCmatpcreladdr pcreladdr:$ga))),
-            (PLHZpc $ga, 0)>;
-  def : Pat<(i32 (load (PPCmatpcreladdr pcreladdr:$ga))), (PLWZpc $ga, 0)>;
-
-  // Store i32
-  def : Pat<(truncstorei8 i32:$RS, (PPCmatpcreladdr pcreladdr:$ga)),
-            (PSTBpc $RS, $ga, 0)>;
-  def : Pat<(truncstorei16 i32:$RS, (PPCmatpcreladdr pcreladdr:$ga)),
-            (PSTHpc $RS, $ga, 0)>;
-  def : Pat<(store i32:$RS, (PPCmatpcreladdr pcreladdr:$ga)),
-            (PSTWpc $RS, $ga, 0)>;
-
-  // Load i64
-  def : Pat<(i64 (zextloadi1  (PPCmatpcreladdr pcreladdr:$ga))),
-            (PLBZ8pc $ga, 0)>;
-  def : Pat<(i64 (extloadi1  (PPCmatpcreladdr pcreladdr:$ga))),
-            (PLBZ8pc $ga, 0)>;
-  def : Pat<(i64 (zextloadi8  (PPCmatpcreladdr pcreladdr:$ga))),
-            (PLBZ8pc $ga, 0)>;
-  def : Pat<(i64 (extloadi8   (PPCmatpcreladdr pcreladdr:$ga))),
-            (PLBZ8pc $ga, 0)>;
-  def : Pat<(i64 (sextloadi16 (PPCmatpcreladdr pcreladdr:$ga))),
-            (PLHA8pc $ga, 0)>;
-  def : Pat<(i64 (zextloadi16 (PPCmatpcreladdr pcreladdr:$ga))),
-            (PLHZ8pc $ga, 0)>;
-  def : Pat<(i64 (extloadi16 (PPCmatpcreladdr pcreladdr:$ga))),
-            (PLHZ8pc $ga, 0)>;
-  def : Pat<(i64 (zextloadi32 (PPCmatpcreladdr pcreladdr:$ga))),
-            (PLWZ8pc $ga, 0)>;
-  def : Pat<(i64 (sextloadi32 (PPCmatpcreladdr pcreladdr:$ga))),
-            (PLWA8pc $ga, 0)>;
-  def : Pat<(i64 (extloadi32 (PPCmatpcreladdr pcreladdr:$ga))),
-            (PLWZ8pc $ga, 0)>;
-  def : Pat<(i64 (load (PPCmatpcreladdr pcreladdr:$ga))), (PLDpc $ga, 0)>;
-
-  // Store i64
-  def : Pat<(truncstorei8 i64:$RS, (PPCmatpcreladdr pcreladdr:$ga)),
-            (PSTB8pc $RS, $ga, 0)>;
-  def : Pat<(truncstorei16 i64:$RS, (PPCmatpcreladdr pcreladdr:$ga)),
-            (PSTH8pc $RS, $ga, 0)>;
-  def : Pat<(truncstorei32 i64:$RS, (PPCmatpcreladdr pcreladdr:$ga)),
-            (PSTW8pc $RS, $ga, 0)>;
-  def : Pat<(store i64:$RS, (PPCmatpcreladdr pcreladdr:$ga)),
-            (PSTDpc $RS, $ga, 0)>;
-
-  // Load f32
-  def : Pat<(f32 (load (PPCmatpcreladdr pcreladdr:$addr))), (PLFSpc $addr, 0)>;
-
-  // Store f32
-  def : Pat<(store f32:$FRS, (PPCmatpcreladdr pcreladdr:$ga)),
-            (PSTFSpc $FRS, $ga, 0)>;
-
-  // Load f64
-  def : Pat<(f64 (extloadf32 (PPCmatpcreladdr pcreladdr:$addr))),
-            (COPY_TO_REGCLASS (PLFSpc $addr, 0), VSFRC)>;
-  def : Pat<(f64 (load (PPCmatpcreladdr pcreladdr:$addr))), (PLFDpc $addr, 0)>;
-
-  // Store f64
-  def : Pat<(store f64:$FRS, (PPCmatpcreladdr pcreladdr:$ga)),
-            (PSTFDpc $FRS, $ga, 0)>;
-
-  // Load f128
-  def : Pat<(f128 (load (PPCmatpcreladdr pcreladdr:$addr))),
-            (COPY_TO_REGCLASS (PLXVpc $addr, 0), VRRC)>;
-
-  // Store f128
-  def : Pat<(store f128:$XS, (PPCmatpcreladdr pcreladdr:$ga)),
-            (PSTXVpc (COPY_TO_REGCLASS $XS, VSRC), $ga, 0)>;
-
-  // Load v4i32
-  def : Pat<(v4i32 (load (PPCmatpcreladdr pcreladdr:$addr))), (PLXVpc $addr, 0)>;
-
-  // Store v4i32
-  def : Pat<(store v4i32:$XS, (PPCmatpcreladdr pcreladdr:$ga)),
-            (PSTXVpc $XS, $ga, 0)>;
-
-  // Load v2i64
-  def : Pat<(v2i64 (load (PPCmatpcreladdr pcreladdr:$addr))), (PLXVpc $addr, 0)>;
-
-  // Store v2i64
-  def : Pat<(store v2i64:$XS, (PPCmatpcreladdr pcreladdr:$ga)),
-            (PSTXVpc $XS, $ga, 0)>;
-
-  // Load v4f32
-  def : Pat<(v4f32 (load (PPCmatpcreladdr pcreladdr:$addr))), (PLXVpc $addr, 0)>;
-
-  // Store v4f32
-  def : Pat<(store v4f32:$XS, (PPCmatpcreladdr pcreladdr:$ga)),
-            (PSTXVpc $XS, $ga, 0)>;
-
-  // Load v2f64
-  def : Pat<(v2f64 (load (PPCmatpcreladdr pcreladdr:$addr))), (PLXVpc $addr, 0)>;
-
-  // Store v2f64
-  def : Pat<(store v2f64:$XS, (PPCmatpcreladdr pcreladdr:$ga)),
-            (PSTXVpc $XS, $ga, 0)>;
-
-  // Atomic Load
-  def : Pat<(atomic_load_8 (PPCmatpcreladdr pcreladdr:$ga)),
-            (PLBZpc $ga, 0)>;
-  def : Pat<(atomic_load_16 (PPCmatpcreladdr pcreladdr:$ga)),
-            (PLHZpc $ga, 0)>;
-  def : Pat<(atomic_load_32 (PPCmatpcreladdr pcreladdr:$ga)),
-            (PLWZpc $ga, 0)>;
-  def : Pat<(atomic_load_64 (PPCmatpcreladdr pcreladdr:$ga)),
-            (PLDpc $ga, 0)>;
-
-  // Atomic Store
-  def : Pat<(atomic_store_8 (PPCmatpcreladdr pcreladdr:$ga), i32:$RS),
-            (PSTBpc $RS, $ga, 0)>;
-  def : Pat<(atomic_store_16 (PPCmatpcreladdr pcreladdr:$ga), i32:$RS),
-            (PSTHpc $RS, $ga, 0)>;
-  def : Pat<(atomic_store_32 (PPCmatpcreladdr pcreladdr:$ga), i32:$RS),
-            (PSTWpc $RS, $ga, 0)>;
-  def : Pat<(atomic_store_8 (PPCmatpcreladdr pcreladdr:$ga), i64:$RS),
-            (PSTB8pc $RS, $ga, 0)>;
-  def : Pat<(atomic_store_16 (PPCmatpcreladdr pcreladdr:$ga), i64:$RS),
-            (PSTH8pc $RS, $ga, 0)>;
-  def : Pat<(atomic_store_32 (PPCmatpcreladdr pcreladdr:$ga), i64:$RS),
-            (PSTW8pc $RS, $ga, 0)>;
-  def : Pat<(atomic_store_64 (PPCmatpcreladdr pcreladdr:$ga), i64:$RS),
-            (PSTDpc $RS, $ga, 0)>;
-
-  // Special Cases For PPCstore_scal_int_from_vsr
-  def : Pat<(PPCstore_scal_int_from_vsr
-              (f64 (PPCcv_fp_to_sint_in_vsr f64:$src)),
-              (PPCmatpcreladdr pcreladdr:$dst), 8),
-            (PSTXSDpc (XSCVDPSXDS f64:$src), $dst, 0)>;
-  def : Pat<(PPCstore_scal_int_from_vsr
-              (f64 (PPCcv_fp_to_sint_in_vsr f128:$src)),
-              (PPCmatpcreladdr pcreladdr:$dst), 8),
-            (PSTXSDpc (COPY_TO_REGCLASS (XSCVQPSDZ f128:$src), VFRC), $dst, 0)>;
-
-  def : Pat<(PPCstore_scal_int_from_vsr
-              (f64 (PPCcv_fp_to_uint_in_vsr f64:$src)),
-              (PPCmatpcreladdr pcreladdr:$dst), 8),
-            (PSTXSDpc (XSCVDPUXDS f64:$src), $dst, 0)>;
-  def : Pat<(PPCstore_scal_int_from_vsr
-              (f64 (PPCcv_fp_to_uint_in_vsr f128:$src)),
-              (PPCmatpcreladdr pcreladdr:$dst), 8),
-            (PSTXSDpc (COPY_TO_REGCLASS (XSCVQPUDZ f128:$src), VFRC), $dst, 0)>;
-
-  // If the PPCmatpcreladdr node is not caught by any other pattern it should be
-  // caught here and turned into a paddi instruction to materialize the address.
-  def : Pat<(PPCmatpcreladdr pcreladdr:$addr), (PADDI8pc 0, $addr)>;
-  // PPCtlsdynamatpcreladdr node is used for TLS dynamic models to materialize
-  // tls global address with paddi instruction.
-  def : Pat<(PPCtlsdynamatpcreladdr pcreladdr:$addr), (PADDI8pc 0, $addr)>;
-  // PPCtlslocalexecmataddr node is used for TLS local exec models to
-  // materialize tls global address with paddi instruction.
-  def : Pat<(PPCaddTls i64:$in, (PPCtlslocalexecmataddr tglobaltlsaddr:$addr)),
-            (PADDI8 $in, $addr)>;
-}
-
-let Predicates = [PrefixInstrs] in {
-  def XXSPLTIW : 8RR_DForm_IMM32_XT6<32, 3, (outs vsrc:$XT),
-                                     (ins i32imm:$IMM32),
-                                     "xxspltiw $XT, $IMM32", IIC_VecGeneral,
-                                     []>;
-  def XXSPLTIDP : 8RR_DForm_IMM32_XT6<32, 2, (outs vsrc:$XT),
-                                      (ins i32imm:$IMM32),
-                                      "xxspltidp $XT, $IMM32", IIC_VecGeneral,
-                                      [(set v2f64:$XT,
-                                            (PPCxxspltidp i32:$IMM32))]>;
-  def XXPERMX :
-    8RR_XX4Form_IMM3_XTABC6<34, 0, (outs vsrc:$XT), (ins vsrc:$XA, vsrc:$XB,
-                            vsrc:$XC, u3imm:$UIM),
-                            "xxpermx $XT, $XA, $XB, $XC, $UIM",
-                            IIC_VecPerm, []>;
-  def XXBLENDVB :
-    8RR_XX4Form_XTABC6<33, 0, (outs vsrc:$XT), (ins vsrc:$XA, vsrc:$XB,
-                       vsrc:$XC), "xxblendvb $XT, $XA, $XB, $XC",
-                       IIC_VecGeneral, []>;
-  def XXBLENDVH :
-    8RR_XX4Form_XTABC6<33, 1, (outs vsrc:$XT), (ins vsrc:$XA, vsrc:$XB,
-                       vsrc:$XC), "xxblendvh $XT, $XA, $XB, $XC",
-                       IIC_VecGeneral, []>;
-  def XXBLENDVW :
-    8RR_XX4Form_XTABC6<33, 2, (outs vsrc:$XT), (ins vsrc:$XA, vsrc:$XB,
-                       vsrc:$XC), "xxblendvw $XT, $XA, $XB, $XC",
-                       IIC_VecGeneral, []>;
-  def XXBLENDVD :
-    8RR_XX4Form_XTABC6<33, 3, (outs vsrc:$XT), (ins vsrc:$XA, vsrc:$XB,
-                       vsrc:$XC), "xxblendvd $XT, $XA, $XB, $XC",
-                       IIC_VecGeneral, []>;
-}
-
-// XXSPLI32DX needs extra flags to make sure the compiler does not attempt
-// to spill part of the instruction when the values are similar.
-let isReMaterializable = 1, isMoveImm = 1, Predicates = [PrefixInstrs] in {
-  def XXSPLTI32DX :
-      8RR_DForm_IMM32_XT6_IX<32, 0, (outs vsrc:$XT),
-                             (ins vsrc:$XTi, u1imm:$IX, i32imm:$IMM32),
-                             "xxsplti32dx $XT, $IX, $IMM32", IIC_VecGeneral,
-                             [(set v2i64:$XT,
-                                   (PPCxxsplti32dx v2i64:$XTi, i32:$IX,
-                                                   i32:$IMM32))]>,
-                             RegConstraint<"$XTi = $XT">, NoEncode<"$XTi">;
-}
-
-let Predicates = [IsISA3_1] in {
-  def SETBC : XForm_XT5_BI5<31, 384, (outs gprc:$RT), (ins crbitrc:$BI),
-                            "setbc $RT, $BI", IIC_IntCompare, []>;
-  def SETBCR : XForm_XT5_BI5<31, 416, (outs gprc:$RT), (ins crbitrc:$BI),
-                             "setbcr $RT, $BI", IIC_IntCompare, []>;
-  def SETNBC : XForm_XT5_BI5<31, 448, (outs gprc:$RT), (ins crbitrc:$BI),
-                             "setnbc $RT, $BI", IIC_IntCompare, []>;
-  def SETNBCR : XForm_XT5_BI5<31, 480, (outs gprc:$RT), (ins crbitrc:$BI),
-                              "setnbcr $RT, $BI", IIC_IntCompare, []>;
-
-  let Interpretation64Bit = 1, isCodeGenOnly = 1 in {
-    def SETBC8 : XForm_XT5_BI5<31, 384, (outs g8rc:$RT), (ins crbitrc:$BI),
-                               "setbc $RT, $BI", IIC_IntCompare, []>;
-    def SETBCR8 : XForm_XT5_BI5<31, 416, (outs g8rc:$RT), (ins crbitrc:$BI),
-                                "setbcr $RT, $BI", IIC_IntCompare, []>;
-    def SETNBC8 : XForm_XT5_BI5<31, 448, (outs g8rc:$RT), (ins crbitrc:$BI),
-                                "setnbc $RT, $BI", IIC_IntCompare, []>;
-    def SETNBCR8 : XForm_XT5_BI5<31, 480, (outs g8rc:$RT), (ins crbitrc:$BI),
-                                 "setnbcr $RT, $BI", IIC_IntCompare, []>;
-  }
-
-  def VSLDBI : VNForm_VTAB5_SD3<22, 0, (outs vrrc:$VRT),
-                                (ins vrrc:$VRA, vrrc:$VRB, u3imm:$SH),
-                                "vsldbi $VRT, $VRA, $VRB, $SH",
-                                IIC_VecGeneral, 
-                                [(set v16i8:$VRT,
-                                      (int_ppc_altivec_vsldbi v16i8:$VRA,
-                                                              v16i8:$VRB,
-                                                              i32:$SH))]>;
-  def VSRDBI : VNForm_VTAB5_SD3<22, 1, (outs vrrc:$VRT),
-                                (ins vrrc:$VRA, vrrc:$VRB, u3imm:$SH),
-                                "vsrdbi $VRT, $VRA, $VRB, $SH",
-                                IIC_VecGeneral,
-                                [(set v16i8:$VRT,
-                                      (int_ppc_altivec_vsrdbi v16i8:$VRA,
-                                                              v16i8:$VRB, 
-                                                              i32:$SH))]>;
-  defm VSTRIBR : VXForm_VTB5_RCr<13, 1, (outs vrrc:$vT), (ins vrrc:$vB),
-                                 "vstribr", "$vT, $vB", IIC_VecGeneral,
-				 [(set v16i8:$vT,
-                                       (int_ppc_altivec_vstribr v16i8:$vB))]>;
-  defm VSTRIBL : VXForm_VTB5_RCr<13, 0, (outs vrrc:$vT), (ins vrrc:$vB),
-                                 "vstribl", "$vT, $vB", IIC_VecGeneral,
-                                 [(set v16i8:$vT,
-                                       (int_ppc_altivec_vstribl v16i8:$vB))]>;
-  defm VSTRIHR : VXForm_VTB5_RCr<13, 3, (outs vrrc:$vT), (ins vrrc:$vB),
-                                 "vstrihr", "$vT, $vB", IIC_VecGeneral,
-                                 [(set v8i16:$vT,
-                                       (int_ppc_altivec_vstrihr v8i16:$vB))]>;
-  defm VSTRIHL : VXForm_VTB5_RCr<13, 2, (outs vrrc:$vT), (ins vrrc:$vB),
-                                 "vstrihl", "$vT, $vB", IIC_VecGeneral,
-                                 [(set v8i16:$vT,
-                                       (int_ppc_altivec_vstrihl v8i16:$vB))]>;
-  def VINSW :
-    VXForm_1<207, (outs vrrc:$vD), (ins vrrc:$vDi, u4imm:$UIM, gprc:$rB),
-             "vinsw $vD, $rB, $UIM", IIC_VecGeneral,
-             [(set v4i32:$vD,
-                   (int_ppc_altivec_vinsw v4i32:$vDi, i32:$rB, timm:$UIM))]>,
-             RegConstraint<"$vDi = $vD">, NoEncode<"$vDi">;
-  def VINSD :
-    VXForm_1<463, (outs vrrc:$vD), (ins vrrc:$vDi, u4imm:$UIM, g8rc:$rB),
-             "vinsd $vD, $rB, $UIM", IIC_VecGeneral,
-             [(set v2i64:$vD,
-                   (int_ppc_altivec_vinsd v2i64:$vDi, i64:$rB, timm:$UIM))]>,
-             RegConstraint<"$vDi = $vD">, NoEncode<"$vDi">;
-  def VINSBVLX :
-    VXForm_VTB5_RA5_ins<15, "vinsbvlx",
-                        [(set v16i8:$vD,
-                              (int_ppc_altivec_vinsbvlx v16i8:$vDi, i32:$rA,
-                                                        v16i8:$vB))]>;
-  def VINSBVRX :
-    VXForm_VTB5_RA5_ins<271, "vinsbvrx",
-                        [(set v16i8:$vD,
-                              (int_ppc_altivec_vinsbvrx v16i8:$vDi, i32:$rA,
-                                                        v16i8:$vB))]>;
-  def VINSHVLX :
-    VXForm_VTB5_RA5_ins<79, "vinshvlx",
-                        [(set v8i16:$vD,
-                              (int_ppc_altivec_vinshvlx v8i16:$vDi, i32:$rA,
-                                                        v8i16:$vB))]>;
-  def VINSHVRX :
-    VXForm_VTB5_RA5_ins<335, "vinshvrx",
-                        [(set v8i16:$vD,
-                              (int_ppc_altivec_vinshvrx v8i16:$vDi, i32:$rA,
-                                                        v8i16:$vB))]>;
-  def VINSWVLX :
-    VXForm_VTB5_RA5_ins<143, "vinswvlx",
-                        [(set v4i32:$vD,
-                              (int_ppc_altivec_vinswvlx v4i32:$vDi, i32:$rA,
-                                                        v4i32:$vB))]>;
-  def VINSWVRX :
-    VXForm_VTB5_RA5_ins<399, "vinswvrx",
-                        [(set v4i32:$vD,
-                              (int_ppc_altivec_vinswvrx v4i32:$vDi, i32:$rA,
-                                                        v4i32:$vB))]>;
-  def VINSBLX :
-    VXForm_VRT5_RAB5_ins<527, "vinsblx",
-                         [(set v16i8:$vD,
-                               (int_ppc_altivec_vinsblx v16i8:$vDi, i32:$rA,
-                                                        i32:$rB))]>;
-  def VINSBRX :
-    VXForm_VRT5_RAB5_ins<783, "vinsbrx",
-                         [(set v16i8:$vD,
-                               (int_ppc_altivec_vinsbrx v16i8:$vDi, i32:$rA,
-                                                        i32:$rB))]>;
-  def VINSHLX :
-    VXForm_VRT5_RAB5_ins<591, "vinshlx",
-                         [(set v8i16:$vD,
-                               (int_ppc_altivec_vinshlx v8i16:$vDi, i32:$rA,
-                                                        i32:$rB))]>;
-  def VINSHRX :
-    VXForm_VRT5_RAB5_ins<847, "vinshrx",
-                         [(set v8i16:$vD,
-                               (int_ppc_altivec_vinshrx v8i16:$vDi, i32:$rA,
-                                                        i32:$rB))]>;
-  def VINSWLX :
-    VXForm_VRT5_RAB5_ins<655, "vinswlx",
-                         [(set v4i32:$vD,
-                               (int_ppc_altivec_vinswlx v4i32:$vDi, i32:$rA,
-                                                        i32:$rB))]>;
-  def VINSWRX :
-    VXForm_VRT5_RAB5_ins<911, "vinswrx",
-                         [(set v4i32:$vD,
-                               (int_ppc_altivec_vinswrx v4i32:$vDi, i32:$rA,
-                                                        i32:$rB))]>;
-  def VINSDLX :
-    VXForm_1<719, (outs vrrc:$vD), (ins vrrc:$vDi, g8rc:$rA, g8rc:$rB),
-             "vinsdlx $vD, $rA, $rB", IIC_VecGeneral,
-              [(set v2i64:$vD,
-                    (int_ppc_altivec_vinsdlx v2i64:$vDi, i64:$rA, i64:$rB))]>,
-              RegConstraint<"$vDi = $vD">, NoEncode<"$vDi">;
-  def VINSDRX :
-    VXForm_1<975, (outs vrrc:$vD), (ins vrrc:$vDi, g8rc:$rA, g8rc:$rB),
-             "vinsdrx $vD, $rA, $rB", IIC_VecGeneral,
-              [(set v2i64:$vD,
-                    (int_ppc_altivec_vinsdrx v2i64:$vDi, i64:$rA, i64:$rB))]>,
-              RegConstraint<"$vDi = $vD">, NoEncode<"$vDi">;
-  def VEXTRACTBM : VXForm_RD5_XO5_RS5<1602, 8, (outs gprc:$rD), (ins vrrc:$vB),
-                                      "vextractbm $rD, $vB", IIC_VecGeneral,
-                                      [(set i32:$rD,
-                                      (int_ppc_altivec_vextractbm v16i8:$vB))]>;
-  def VEXTRACTHM : VXForm_RD5_XO5_RS5<1602, 9, (outs gprc:$rD), (ins vrrc:$vB),
-                                      "vextracthm $rD, $vB", IIC_VecGeneral,
-                                      [(set i32:$rD,
-                                      (int_ppc_altivec_vextracthm v8i16:$vB))]>;
-  def VEXTRACTWM : VXForm_RD5_XO5_RS5<1602, 10, (outs gprc:$rD), (ins vrrc:$vB),
-                                      "vextractwm $rD, $vB", IIC_VecGeneral,
-                                      [(set i32:$rD,
-                                      (int_ppc_altivec_vextractwm v4i32:$vB))]>;
-  def VEXTRACTDM : VXForm_RD5_XO5_RS5<1602, 11, (outs gprc:$rD), (ins vrrc:$vB),
-                                      "vextractdm $rD, $vB", IIC_VecGeneral,
-                                      [(set i32:$rD,
-                                      (int_ppc_altivec_vextractdm v2i64:$vB))]>;
-  def VEXTRACTQM : VXForm_RD5_XO5_RS5<1602, 12, (outs gprc:$rD), (ins vrrc:$vB),
-                                      "vextractqm $rD, $vB", IIC_VecGeneral,
-                                      [(set i32:$rD,
-                                      (int_ppc_altivec_vextractqm v1i128:$vB))]>;
-  def VEXPANDBM : VXForm_RD5_XO5_RS5<1602, 0, (outs vrrc:$vD), (ins vrrc:$vB),
-                                     "vexpandbm $vD, $vB", IIC_VecGeneral,
-                                     [(set v16i8:$vD, (int_ppc_altivec_vexpandbm
-                                           v16i8:$vB))]>;
-  def VEXPANDHM : VXForm_RD5_XO5_RS5<1602, 1, (outs vrrc:$vD), (ins vrrc:$vB),
-                                     "vexpandhm $vD, $vB", IIC_VecGeneral,
-                                     [(set v8i16:$vD, (int_ppc_altivec_vexpandhm
-                                           v8i16:$vB))]>;
-  def VEXPANDWM : VXForm_RD5_XO5_RS5<1602, 2, (outs vrrc:$vD), (ins vrrc:$vB),
-                                     "vexpandwm $vD, $vB", IIC_VecGeneral,
-                                     [(set v4i32:$vD, (int_ppc_altivec_vexpandwm
-                                           v4i32:$vB))]>;
-  def VEXPANDDM : VXForm_RD5_XO5_RS5<1602, 3, (outs vrrc:$vD), (ins vrrc:$vB),
-                                     "vexpanddm $vD, $vB", IIC_VecGeneral,
-                                     [(set v2i64:$vD, (int_ppc_altivec_vexpanddm
-                                           v2i64:$vB))]>;
-  def VEXPANDQM : VXForm_RD5_XO5_RS5<1602, 4, (outs vrrc:$vD), (ins vrrc:$vB),
-                                     "vexpandqm $vD, $vB", IIC_VecGeneral,
-                                     [(set v1i128:$vD, (int_ppc_altivec_vexpandqm
-                                           v1i128:$vB))]>;
-  def MTVSRBM : VXForm_RD5_XO5_RS5<1602, 16, (outs vrrc:$vD), (ins g8rc:$rB),
-                                   "mtvsrbm $vD, $rB", IIC_VecGeneral,
-                                   [(set v16i8:$vD,
-                                         (int_ppc_altivec_mtvsrbm i64:$rB))]>;
-  def MTVSRHM : VXForm_RD5_XO5_RS5<1602, 17, (outs vrrc:$vD), (ins g8rc:$rB),
-                                   "mtvsrhm $vD, $rB", IIC_VecGeneral,
-                                   [(set v8i16:$vD,
-                                         (int_ppc_altivec_mtvsrhm i64:$rB))]>;
-  def MTVSRWM : VXForm_RD5_XO5_RS5<1602, 18, (outs vrrc:$vD), (ins g8rc:$rB),
-                                   "mtvsrwm $vD, $rB", IIC_VecGeneral,
-                                   [(set v4i32:$vD,
-                                         (int_ppc_altivec_mtvsrwm i64:$rB))]>;
-  def MTVSRDM : VXForm_RD5_XO5_RS5<1602, 19, (outs vrrc:$vD), (ins g8rc:$rB),
-                                   "mtvsrdm $vD, $rB", IIC_VecGeneral,
-                                   [(set v2i64:$vD,
-                                         (int_ppc_altivec_mtvsrdm i64:$rB))]>;
-  def MTVSRQM : VXForm_RD5_XO5_RS5<1602, 20, (outs vrrc:$vD), (ins g8rc:$rB),
-                                   "mtvsrqm $vD, $rB", IIC_VecGeneral,
-                                   [(set v1i128:$vD,
-                                         (int_ppc_altivec_mtvsrqm i64:$rB))]>;
-  def MTVSRBMI : DXForm<4, 10, (outs vrrc:$vD), (ins u16imm64:$D),
-                        "mtvsrbmi $vD, $D", IIC_VecGeneral,
-                        [(set v16i8:$vD,
-                              (int_ppc_altivec_mtvsrbm imm:$D))]>;
-  def VCNTMBB : VXForm_RD5_MP_VB5<1602, 12, (outs g8rc:$rD),
-                                  (ins vrrc:$vB, u1imm:$MP),
-                                  "vcntmbb $rD, $vB, $MP", IIC_VecGeneral,
-                                  [(set i64:$rD, (int_ppc_altivec_vcntmbb
-                                        v16i8:$vB, timm:$MP))]>;
-  def VCNTMBH : VXForm_RD5_MP_VB5<1602, 13, (outs g8rc:$rD),
-                                  (ins vrrc:$vB, u1imm:$MP),
-                                  "vcntmbh $rD, $vB, $MP", IIC_VecGeneral,
-                                  [(set i64:$rD, (int_ppc_altivec_vcntmbh
-                                        v8i16:$vB, timm:$MP))]>;
-  def VCNTMBW : VXForm_RD5_MP_VB5<1602, 14, (outs g8rc:$rD),
-                                  (ins vrrc:$vB, u1imm:$MP),
-                                  "vcntmbw $rD, $vB, $MP", IIC_VecGeneral,
-                                  [(set i64:$rD, (int_ppc_altivec_vcntmbw
-                                        v4i32:$vB, timm:$MP))]>;
-  def VCNTMBD : VXForm_RD5_MP_VB5<1602, 15, (outs g8rc:$rD),
-                                  (ins vrrc:$vB, u1imm:$MP),
-                                  "vcntmbd $rD, $vB, $MP", IIC_VecGeneral,
-                                  [(set i64:$rD, (int_ppc_altivec_vcntmbd
-                                        v2i64:$vB, timm:$MP))]>;
-  def VEXTDUBVLX : VAForm_1a<24, (outs vrrc:$vD),
-                             (ins vrrc:$vA, vrrc:$vB, gprc:$rC),
-                             "vextdubvlx $vD, $vA, $vB, $rC",
-                             IIC_VecGeneral,
-                             [(set v2i64:$vD,
-                                   (int_ppc_altivec_vextdubvlx v16i8:$vA,
-                                                               v16i8:$vB,
-                                                               i32:$rC))]>;
-  def VEXTDUBVRX : VAForm_1a<25, (outs vrrc:$vD),
-                             (ins vrrc:$vA, vrrc:$vB, gprc:$rC),
-                             "vextdubvrx $vD, $vA, $vB, $rC",
-                             IIC_VecGeneral,
-                             [(set v2i64:$vD,
-                                   (int_ppc_altivec_vextdubvrx v16i8:$vA,
-                                                               v16i8:$vB,
-                                                               i32:$rC))]>;
-  def VEXTDUHVLX : VAForm_1a<26, (outs vrrc:$vD),
-                             (ins vrrc:$vA, vrrc:$vB, gprc:$rC),
-                             "vextduhvlx $vD, $vA, $vB, $rC",
-                             IIC_VecGeneral,
-                             [(set v2i64:$vD,
-                                   (int_ppc_altivec_vextduhvlx v8i16:$vA,
-                                                               v8i16:$vB,
-                                                               i32:$rC))]>;
-  def VEXTDUHVRX : VAForm_1a<27, (outs vrrc:$vD),
-                             (ins vrrc:$vA, vrrc:$vB, gprc:$rC),
-                             "vextduhvrx $vD, $vA, $vB, $rC",
-                             IIC_VecGeneral,
-                             [(set v2i64:$vD,
-                                   (int_ppc_altivec_vextduhvrx v8i16:$vA,
-                                                               v8i16:$vB,
-                                                               i32:$rC))]>;
-  def VEXTDUWVLX : VAForm_1a<28, (outs vrrc:$vD),
-                             (ins vrrc:$vA, vrrc:$vB, gprc:$rC),
-                             "vextduwvlx $vD, $vA, $vB, $rC",
-                             IIC_VecGeneral,
-                             [(set v2i64:$vD,
-                                   (int_ppc_altivec_vextduwvlx v4i32:$vA,
-                                                               v4i32:$vB,
-                                                               i32:$rC))]>;
-  def VEXTDUWVRX : VAForm_1a<29, (outs vrrc:$vD),
-                             (ins vrrc:$vA, vrrc:$vB, gprc:$rC),
-                             "vextduwvrx $vD, $vA, $vB, $rC",
-                             IIC_VecGeneral,
-                             [(set v2i64:$vD,
-                                   (int_ppc_altivec_vextduwvrx v4i32:$vA,
-                                                               v4i32:$vB,
-                                                               i32:$rC))]>;
-  def VEXTDDVLX : VAForm_1a<30, (outs vrrc:$vD),
-                            (ins vrrc:$vA, vrrc:$vB, gprc:$rC),
-                            "vextddvlx $vD, $vA, $vB, $rC",
-                            IIC_VecGeneral,
-                            [(set v2i64:$vD,
-                                  (int_ppc_altivec_vextddvlx v2i64:$vA,
-                                                             v2i64:$vB,
-                                                             i32:$rC))]>;
-  def VEXTDDVRX : VAForm_1a<31, (outs vrrc:$vD),
-                            (ins vrrc:$vA, vrrc:$vB, gprc:$rC),
-                            "vextddvrx $vD, $vA, $vB, $rC",
-                            IIC_VecGeneral,
-                            [(set v2i64:$vD,
-                                  (int_ppc_altivec_vextddvrx v2i64:$vA,
-                                                             v2i64:$vB,
-                                                             i32:$rC))]>;
-   def VPDEPD : VXForm_1<1485, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),
-                         "vpdepd $vD, $vA, $vB", IIC_VecGeneral,
-                         [(set v2i64:$vD,
-                         (int_ppc_altivec_vpdepd v2i64:$vA, v2i64:$vB))]>;
-   def VPEXTD : VXForm_1<1421, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),
-                         "vpextd $vD, $vA, $vB", IIC_VecGeneral,
-                         [(set v2i64:$vD,
-                         (int_ppc_altivec_vpextd v2i64:$vA, v2i64:$vB))]>;
-   def PDEPD : XForm_6<31, 156, (outs g8rc:$rA), (ins g8rc:$rS, g8rc:$rB),
-                       "pdepd $rA, $rS, $rB", IIC_IntGeneral,
-                       [(set i64:$rA, (int_ppc_pdepd i64:$rS, i64:$rB))]>;
-   def PEXTD : XForm_6<31, 188, (outs g8rc:$rA), (ins g8rc:$rS, g8rc:$rB),
-                       "pextd $rA, $rS, $rB", IIC_IntGeneral,
-                       [(set i64:$rA, (int_ppc_pextd i64:$rS, i64:$rB))]>;
-   def VCFUGED : VXForm_1<1357, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),
-                          "vcfuged $vD, $vA, $vB", IIC_VecGeneral,
-                          [(set v2i64:$vD,
-                          (int_ppc_altivec_vcfuged v2i64:$vA, v2i64:$vB))]>;
-   def VGNB : VXForm_RD5_N3_VB5<1228, (outs g8rc:$rD), (ins vrrc:$vB, u3imm:$N),
-                                "vgnb $rD, $vB, $N", IIC_VecGeneral,
-                                [(set i64:$rD,
-                                (int_ppc_altivec_vgnb v1i128:$vB, timm:$N))]>;
-   def CFUGED : XForm_6<31, 220, (outs g8rc:$rA), (ins g8rc:$rS, g8rc:$rB),
-                        "cfuged $rA, $rS, $rB", IIC_IntGeneral,
-                        [(set i64:$rA, (int_ppc_cfuged i64:$rS, i64:$rB))]>;
-   def XXEVAL :
-     8RR_XX4Form_IMM8_XTAB6<34, 1, (outs vsrc:$XT), (ins vsrc:$XA, vsrc:$XB,
-                            vsrc:$XC, u8imm:$IMM),
-                            "xxeval $XT, $XA, $XB, $XC, $IMM", IIC_VecGeneral,
-                            [(set v2i64:$XT, (int_ppc_vsx_xxeval v2i64:$XA,
-                                  v2i64:$XB, v2i64:$XC, timm:$IMM))]>;
-   def VCLZDM : VXForm_1<1924, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),
-                         "vclzdm $vD, $vA, $vB", IIC_VecGeneral,
-                         [(set v2i64:$vD,
-                         (int_ppc_altivec_vclzdm v2i64:$vA, v2i64:$vB))]>;
-   def VCTZDM : VXForm_1<1988, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),
-                         "vctzdm $vD, $vA, $vB", IIC_VecGeneral,
-                         [(set v2i64:$vD,
-                         (int_ppc_altivec_vctzdm v2i64:$vA, v2i64:$vB))]>;
-   def CNTLZDM : XForm_6<31, 59, (outs g8rc:$rA), (ins g8rc:$rS, g8rc:$rB),
-                         "cntlzdm $rA, $rS, $rB", IIC_IntGeneral,
-                         [(set i64:$rA,
-                         (int_ppc_cntlzdm i64:$rS, i64:$rB))]>;
-   def CNTTZDM : XForm_6<31, 571, (outs g8rc:$rA), (ins g8rc:$rS, g8rc:$rB),
-                         "cnttzdm $rA, $rS, $rB", IIC_IntGeneral,
-                         [(set i64:$rA,
-                         (int_ppc_cnttzdm i64:$rS, i64:$rB))]>;
-   def XXGENPCVBM :
-     XForm_XT6_IMM5_VB5<60, 916, (outs vsrc:$XT), (ins vrrc:$VRB, s5imm:$IMM),
-                        "xxgenpcvbm $XT, $VRB, $IMM", IIC_VecGeneral, []>;
-   def XXGENPCVHM :
-     XForm_XT6_IMM5_VB5<60, 917, (outs vsrc:$XT), (ins vrrc:$VRB, s5imm:$IMM),
-                        "xxgenpcvhm $XT, $VRB, $IMM", IIC_VecGeneral, []>;
-   def XXGENPCVWM :
-     XForm_XT6_IMM5_VB5<60, 948, (outs vsrc:$XT), (ins vrrc:$VRB, s5imm:$IMM),
-                        "xxgenpcvwm $XT, $VRB, $IMM", IIC_VecGeneral, []>;
-   def XXGENPCVDM :
-     XForm_XT6_IMM5_VB5<60, 949, (outs vsrc:$XT), (ins vrrc:$VRB, s5imm:$IMM),
-                        "xxgenpcvdm $XT, $VRB, $IMM", IIC_VecGeneral, []>;
-   def VCLRLB : VXForm_1<397, (outs vrrc:$vD), (ins vrrc:$vA, gprc:$rB),
-                         "vclrlb $vD, $vA, $rB", IIC_VecGeneral,
-                         [(set v16i8:$vD,
-                               (int_ppc_altivec_vclrlb v16i8:$vA, i32:$rB))]>;
-   def VCLRRB : VXForm_1<461, (outs vrrc:$vD), (ins vrrc:$vA, gprc:$rB),
-                         "vclrrb $vD, $vA, $rB", IIC_VecGeneral,
-                         [(set v16i8:$vD,
-                               (int_ppc_altivec_vclrrb v16i8:$vA, i32:$rB))]>;
-  def VMULLD : VXForm_1<457, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),
-                        "vmulld $vD, $vA, $vB", IIC_VecGeneral,
-                        [(set v2i64:$vD, (mul v2i64:$vA, v2i64:$vB))]>;
-  def VMULHSW : VXForm_1<905, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),
-                         "vmulhsw $vD, $vA, $vB", IIC_VecGeneral,
-                         [(set v4i32:$vD, (mulhs v4i32:$vA, v4i32:$vB))]>;
-  def VMULHUW : VXForm_1<649, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),
-                         "vmulhuw $vD, $vA, $vB", IIC_VecGeneral,
-                         [(set v4i32:$vD, (mulhu v4i32:$vA, v4i32:$vB))]>;
-  def VMULHSD : VXForm_1<969, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),
-                         "vmulhsd $vD, $vA, $vB", IIC_VecGeneral,
-                         [(set v2i64:$vD, (mulhs v2i64:$vA, v2i64:$vB))]>;
-  def VMULHUD : VXForm_1<713, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),
-                         "vmulhud $vD, $vA, $vB", IIC_VecGeneral,
-                         [(set v2i64:$vD, (mulhu v2i64:$vA, v2i64:$vB))]>;
-  def VMODSW : VXForm_1<1931, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),
-                        "vmodsw $vD, $vA, $vB", IIC_VecGeneral,
-                        [(set v4i32:$vD, (srem v4i32:$vA, v4i32:$vB))]>;
-  def VMODUW : VXForm_1<1675, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),
-                        "vmoduw $vD, $vA, $vB", IIC_VecGeneral,
-                        [(set v4i32:$vD, (urem v4i32:$vA, v4i32:$vB))]>;
-  def VMODSD : VXForm_1<1995, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),
-                        "vmodsd $vD, $vA, $vB", IIC_VecGeneral,
-                        [(set v2i64:$vD, (srem v2i64:$vA, v2i64:$vB))]>;
-  def VMODUD : VXForm_1<1739, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),
-                        "vmodud $vD, $vA, $vB", IIC_VecGeneral,
-                        [(set v2i64:$vD, (urem v2i64:$vA, v2i64:$vB))]>;
-  def VDIVSW : VXForm_1<395, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),
-                        "vdivsw $vD, $vA, $vB", IIC_VecGeneral,
-                        [(set v4i32:$vD, (sdiv v4i32:$vA, v4i32:$vB))]>;
-  def VDIVUW : VXForm_1<139, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),
-                        "vdivuw $vD, $vA, $vB", IIC_VecGeneral,
-                        [(set v4i32:$vD, (udiv v4i32:$vA, v4i32:$vB))]>;
-  def VDIVSD : VXForm_1<459, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),
-                        "vdivsd $vD, $vA, $vB", IIC_VecGeneral,
-                        [(set v2i64:$vD, (sdiv v2i64:$vA, v2i64:$vB))]>;
-  def VDIVUD : VXForm_1<203, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),
-                        "vdivud $vD, $vA, $vB", IIC_VecGeneral,
-                        [(set v2i64:$vD, (udiv v2i64:$vA, v2i64:$vB))]>;
-  def VDIVESW : VXForm_1<907, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),
-                         "vdivesw $vD, $vA, $vB", IIC_VecGeneral,
-                         [(set v4i32:$vD, (int_ppc_altivec_vdivesw v4i32:$vA,
-                               v4i32:$vB))]>;
-  def VDIVEUW : VXForm_1<651, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),
-                         "vdiveuw $vD, $vA, $vB", IIC_VecGeneral,
-                         [(set v4i32:$vD, (int_ppc_altivec_vdiveuw v4i32:$vA,
-                               v4i32:$vB))]>;
-  def VDIVESD : VXForm_1<971, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),
-                         "vdivesd $vD, $vA, $vB", IIC_VecGeneral,
-                         [(set v2i64:$vD, (int_ppc_altivec_vdivesd v2i64:$vA,
-                               v2i64:$vB))]>;
-  def VDIVEUD : VXForm_1<715, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),
-                         "vdiveud $vD, $vA, $vB", IIC_VecGeneral,
-                         [(set v2i64:$vD, (int_ppc_altivec_vdiveud v2i64:$vA,
-                               v2i64:$vB))]>;
-  def XVTLSBB : XX2_BF3_XO5_XB6_XO9<60, 2, 475, (outs crrc:$BF), (ins vsrc:$XB),
-                                    "xvtlsbb $BF, $XB", IIC_VecGeneral, []>;
-
-  // The XFormMemOp flag for the following 8 instructions is set on
-  // the instruction format.
-  let mayLoad = 1, mayStore = 0 in {
-    def LXVRBX : X_XT6_RA5_RB5<31, 13, "lxvrbx", vsrc, []>;
-    def LXVRHX : X_XT6_RA5_RB5<31, 45, "lxvrhx", vsrc, []>;
-    def LXVRWX : X_XT6_RA5_RB5<31, 77, "lxvrwx", vsrc, []>;
-    def LXVRDX : X_XT6_RA5_RB5<31, 109, "lxvrdx", vsrc, []>;
-  }
-
-  let mayLoad = 0, mayStore = 1 in {
-    def STXVRBX : X_XS6_RA5_RB5<31, 141, "stxvrbx", vsrc, []>;
-    def STXVRHX : X_XS6_RA5_RB5<31, 173, "stxvrhx", vsrc, []>;
-    def STXVRWX : X_XS6_RA5_RB5<31, 205, "stxvrwx", vsrc, []>;
-    def STXVRDX : X_XS6_RA5_RB5<31, 237, "stxvrdx", vsrc, []>;
-  }
-
-  def VMULESD : VXForm_1<968, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),
-                         "vmulesd $vD, $vA, $vB", IIC_VecGeneral,
-                         [(set v1i128:$vD, (int_ppc_altivec_vmulesd v2i64:$vA,
-                               v2i64:$vB))]>;
-  def VMULEUD : VXForm_1<712, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),
-                         "vmuleud $vD, $vA, $vB", IIC_VecGeneral,
-                         [(set v1i128:$vD, (int_ppc_altivec_vmuleud v2i64:$vA,
-                               v2i64:$vB))]>;
-  def VMULOSD : VXForm_1<456, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),
-                         "vmulosd $vD, $vA, $vB", IIC_VecGeneral,
-                         [(set v1i128:$vD, (int_ppc_altivec_vmulosd v2i64:$vA,
-                               v2i64:$vB))]>;
-  def VMULOUD : VXForm_1<200, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),
-                         "vmuloud $vD, $vA, $vB", IIC_VecGeneral,
-                         [(set v1i128:$vD, (int_ppc_altivec_vmuloud v2i64:$vA,
-                               v2i64:$vB))]>;
-  def VMSUMCUD : VAForm_1a<23, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB, vrrc:$vC),
-                           "vmsumcud $vD, $vA, $vB, $vC", IIC_VecGeneral,
-                           [(set v1i128:$vD, (int_ppc_altivec_vmsumcud
-                                 v2i64:$vA, v2i64:$vB, v1i128:$vC))]>;
-  def VDIVSQ : VXForm_1<267, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),
-                        "vdivsq $vD, $vA, $vB", IIC_VecGeneral,
-                        [(set v1i128:$vD, (sdiv v1i128:$vA, v1i128:$vB))]>;
-  def VDIVUQ : VXForm_1<11, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),
-                        "vdivuq $vD, $vA, $vB", IIC_VecGeneral,
-                        [(set v1i128:$vD, (udiv v1i128:$vA, v1i128:$vB))]>;
-  def VDIVESQ : VXForm_1<779, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),
-                         "vdivesq $vD, $vA, $vB", IIC_VecGeneral,
-                         [(set v1i128:$vD, (int_ppc_altivec_vdivesq v1i128:$vA,
-			       v1i128:$vB))]>;
-  def VDIVEUQ : VXForm_1<523, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),
-                         "vdiveuq $vD, $vA, $vB", IIC_VecGeneral,
-                         [(set v1i128:$vD, (int_ppc_altivec_vdiveuq v1i128:$vA,
-			       v1i128:$vB))]>;
-  def VCMPEQUQ : VCMP <455, "vcmpequq $vD, $vA, $vB" , v1i128>;
-  def VCMPGTSQ : VCMP <903, "vcmpgtsq $vD, $vA, $vB" , v1i128>;
-  def VCMPGTUQ : VCMP <647, "vcmpgtuq $vD, $vA, $vB" , v1i128>;
-  def VCMPEQUQ_rec : VCMP_rec <455, "vcmpequq. $vD, $vA, $vB" , v1i128>;
-  def VCMPGTSQ_rec : VCMP_rec <903, "vcmpgtsq. $vD, $vA, $vB" , v1i128>;
-  def VCMPGTUQ_rec : VCMP_rec <647, "vcmpgtuq. $vD, $vA, $vB" , v1i128>;
-  def VMODSQ : VXForm_1<1803, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),
-                        "vmodsq $vD, $vA, $vB", IIC_VecGeneral,
-                        [(set v1i128:$vD, (srem v1i128:$vA, v1i128:$vB))]>;
-  def VMODUQ : VXForm_1<1547, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),
-                        "vmoduq $vD, $vA, $vB", IIC_VecGeneral,
-                        [(set v1i128:$vD, (urem v1i128:$vA, v1i128:$vB))]>;
-  def VEXTSD2Q : VXForm_RD5_XO5_RS5<1538, 27, (outs vrrc:$vD), (ins vrrc:$vB),
-                               "vextsd2q $vD, $vB", IIC_VecGeneral,
-                               [(set v1i128:$vD, (int_ppc_altivec_vextsd2q v2i64:$vB))]>;
-  def VCMPUQ : VXForm_BF3_VAB5<257, (outs crrc:$BF), (ins vrrc:$vA, vrrc:$vB),
-                               "vcmpuq $BF, $vA, $vB", IIC_VecGeneral, []>;
-  def VCMPSQ : VXForm_BF3_VAB5<321, (outs crrc:$BF), (ins vrrc:$vA, vrrc:$vB),
-                               "vcmpsq $BF, $vA, $vB", IIC_VecGeneral, []>;
-  def VRLQNM : VX1_VT5_VA5_VB5<325, "vrlqnm",
-                               [(set v1i128:$vD,
-                                   (int_ppc_altivec_vrlqnm v1i128:$vA,
-                                                           v1i128:$vB))]>;
-  def VRLQMI : VXForm_1<69, (outs vrrc:$vD),
-                        (ins vrrc:$vA, vrrc:$vB, vrrc:$vDi),
-                        "vrlqmi $vD, $vA, $vB", IIC_VecFP,
-                        [(set v1i128:$vD,
-                          (int_ppc_altivec_vrlqmi v1i128:$vA, v1i128:$vB,
-                                                  v1i128:$vDi))]>,
-                        RegConstraint<"$vDi = $vD">, NoEncode<"$vDi">;
-  def VSLQ : VX1_VT5_VA5_VB5<261, "vslq", []>;
-  def VSRAQ : VX1_VT5_VA5_VB5<773, "vsraq", []>;
-  def VSRQ : VX1_VT5_VA5_VB5<517, "vsrq", []>;
-  def VRLQ : VX1_VT5_VA5_VB5<5, "vrlq", []>;
-  def XSCVQPUQZ : X_VT5_XO5_VB5<63, 0, 836, "xscvqpuqz", []>;
-  def XSCVQPSQZ : X_VT5_XO5_VB5<63, 8, 836, "xscvqpsqz", []>;
-  def XSCVUQQP : X_VT5_XO5_VB5<63, 3, 836, "xscvuqqp", []>;
-  def XSCVSQQP : X_VT5_XO5_VB5<63, 11, 836, "xscvsqqp", []>;
-}
-
-let Predicates = [IsISA3_1, HasVSX] in {
-  def XVCVSPBF16 : XX2_XT6_XO5_XB6<60, 17, 475, "xvcvspbf16", vsrc, []>;
-  def XVCVBF16SPN : XX2_XT6_XO5_XB6<60, 16, 475, "xvcvbf16spn", vsrc, []>;
-}
-
-// Multiclass defining patterns for Set Boolean Extension Reverse Instructions.
-// This is analogous to the CRNotPat multiclass but specifically for Power10
-// and newer subtargets since the extended forms use Set Boolean instructions.
-// The first two anonymous patterns defined are actually a duplicate of those
-// in CRNotPat, but it is preferable to define both multiclasses as complete
-// ones rather than pulling that small common section out.
-multiclass P10ReverseSetBool<dag pattern, dag result> {
-  def : Pat<pattern, (crnot result)>;
-  def : Pat<(not pattern), result>;
-
-  def : Pat<(i32 (zext pattern)),
-            (SETBCR result)>;
-  def : Pat<(i64 (zext pattern)),
-            (SETBCR8 result)>;
-
-  def : Pat<(i32 (sext pattern)),
-            (SETNBCR result)>;
-  def : Pat<(i64 (sext pattern)),
-            (SETNBCR8 result)>;
-
-  def : Pat<(i32 (anyext pattern)),
-            (SETBCR result)>;
-  def : Pat<(i64 (anyext pattern)),
-            (SETBCR8 result)>;
-}
-
-multiclass IntSetP10RevSetBool<SDNode SetCC, ValueType Ty, PatLeaf ZExtTy,
-                               ImmLeaf SExtTy, I Cmpi, I Cmpli,
-                               I Cmp, I Cmpl> {
-  defm : P10ReverseSetBool<(i1 (SetCC Ty:$s1, Ty:$s2, SETUGE)),
-                           (EXTRACT_SUBREG (Cmpl $s1, $s2), sub_lt)>;
-  defm : P10ReverseSetBool<(i1 (SetCC Ty:$s1, Ty:$s2, SETGE)),
-                           (EXTRACT_SUBREG (Cmp $s1, $s2), sub_lt)>;
-  defm : P10ReverseSetBool<(i1 (SetCC Ty:$s1, Ty:$s2, SETULE)),
-                           (EXTRACT_SUBREG (Cmpl $s1, $s2), sub_gt)>;
-  defm : P10ReverseSetBool<(i1 (SetCC Ty:$s1, Ty:$s2, SETLE)),
-                           (EXTRACT_SUBREG (Cmp $s1, $s2), sub_gt)>;
-  defm : P10ReverseSetBool<(i1 (SetCC Ty:$s1, Ty:$s2, SETNE)),
-                           (EXTRACT_SUBREG (Cmp $s1, $s2), sub_eq)>;
-
-  defm : P10ReverseSetBool<(i1 (SetCC Ty:$s1, ZExtTy:$imm, SETUGE)),
-                           (EXTRACT_SUBREG (Cmpli $s1, imm:$imm), sub_lt)>;
-  defm : P10ReverseSetBool<(i1 (SetCC Ty:$s1, SExtTy:$imm, SETGE)),
-                           (EXTRACT_SUBREG (Cmpi $s1, imm:$imm), sub_lt)>;
-  defm : P10ReverseSetBool<(i1 (SetCC Ty:$s1, ZExtTy:$imm, SETULE)),
-                           (EXTRACT_SUBREG (Cmpli $s1, imm:$imm), sub_gt)>;
-  defm : P10ReverseSetBool<(i1 (SetCC Ty:$s1, SExtTy:$imm, SETLE)),
-                           (EXTRACT_SUBREG (Cmpi $s1, imm:$imm), sub_gt)>;
-  defm : P10ReverseSetBool<(i1 (SetCC Ty:$s1, SExtTy:$imm, SETNE)),
-                           (EXTRACT_SUBREG (Cmpi $s1, imm:$imm), sub_eq)>;
-  defm : P10ReverseSetBool<(i1 (SetCC Ty:$s1, ZExtTy:$imm, SETNE)),
-                           (EXTRACT_SUBREG (Cmpli $s1, imm:$imm), sub_eq)>;
-}
-
-multiclass FSetP10RevSetBool<SDNode SetCC, ValueType Ty, I FCmp> {
-  defm : P10ReverseSetBool<(i1 (SetCC Ty:$s1, Ty:$s2, SETUGE)),
-                           (EXTRACT_SUBREG (FCmp $s1, $s2), sub_lt)>;
-  defm : P10ReverseSetBool<(i1 (SetCC Ty:$s1, Ty:$s2, SETGE)),
-                           (EXTRACT_SUBREG (FCmp $s1, $s2), sub_lt)>;
-  defm : P10ReverseSetBool<(i1 (SetCC Ty:$s1, Ty:$s2, SETULE)),
-                           (EXTRACT_SUBREG (FCmp $s1, $s2), sub_gt)>;
-  defm : P10ReverseSetBool<(i1 (SetCC Ty:$s1, Ty:$s2, SETLE)),
-                           (EXTRACT_SUBREG (FCmp $s1, $s2), sub_gt)>;
-  defm : P10ReverseSetBool<(i1 (SetCC Ty:$s1, Ty:$s2, SETUNE)),
-                           (EXTRACT_SUBREG (FCmp $s1, $s2), sub_eq)>;
-  defm : P10ReverseSetBool<(i1 (SetCC Ty:$s1, Ty:$s2, SETNE)),
-                           (EXTRACT_SUBREG (FCmp $s1, $s2), sub_eq)>;
-  defm : P10ReverseSetBool<(i1 (SetCC Ty:$s1, Ty:$s2, SETO)),
-                           (EXTRACT_SUBREG (FCmp $s1, $s2), sub_un)>;
-}
-
-let Predicates = [IsISA3_1] in {
-  def : Pat<(i32 (zext i1:$in)),
-            (SETBC $in)>;
-  def : Pat<(i64 (zext i1:$in)),
-            (SETBC8 $in)>;
-  def : Pat<(i32 (sext i1:$in)),
-            (SETNBC $in)>;
-  def : Pat<(i64 (sext i1:$in)),
-            (SETNBC8 $in)>;
-  def : Pat<(i32 (anyext i1:$in)),
-            (SETBC $in)>;
-  def : Pat<(i64 (anyext i1:$in)),
-            (SETBC8 $in)>;
-
-  // Instantiation of the set boolean reverse patterns for 32-bit integers.
-  defm : IntSetP10RevSetBool<setcc, i32, immZExt16, imm32SExt16,
-                             CMPWI, CMPLWI, CMPW, CMPLW>;
-  defm : P10ReverseSetBool<(i1 (setcc i32:$s1, imm:$imm, SETNE)),
-                           (EXTRACT_SUBREG (CMPLWI (XORIS $s1, (HI16 imm:$imm)),
-                                           (LO16 imm:$imm)), sub_eq)>;
-
-  // Instantiation of the set boolean reverse patterns for 64-bit integers.
-  defm : IntSetP10RevSetBool<setcc, i64, immZExt16, imm64SExt16,
-                             CMPDI, CMPLDI, CMPD, CMPLD>;
-  defm : P10ReverseSetBool<(i1 (setcc i64:$s1, imm64ZExt32:$imm, SETNE)),
-                           (EXTRACT_SUBREG (CMPLDI (XORIS8 $s1, (HI16 imm:$imm)),
-                                           (LO16 imm:$imm)), sub_eq)>;
-}
-
-// Instantiation of the set boolean reverse patterns for f32, f64, f128.
-let Predicates = [IsISA3_1, HasFPU] in {
-  defm : FSetP10RevSetBool<setcc, f32, FCMPUS>;
-  defm : FSetP10RevSetBool<setcc, f64, FCMPUD>;
-  defm : FSetP10RevSetBool<setcc, f128, XSCMPUQP>;
-}
-
-//---------------------------- Anonymous Patterns ----------------------------//
-let Predicates = [IsISA3_1] in {
-  // Exploit the vector multiply high instructions using intrinsics.
-  def : Pat<(v4i32 (int_ppc_altivec_vmulhsw v4i32:$vA, v4i32:$vB)),
-            (v4i32 (VMULHSW $vA, $vB))>;
-  def : Pat<(v4i32 (int_ppc_altivec_vmulhuw v4i32:$vA, v4i32:$vB)),
-            (v4i32 (VMULHUW $vA, $vB))>;
-  def : Pat<(v2i64 (int_ppc_altivec_vmulhsd v2i64:$vA, v2i64:$vB)),
-            (v2i64 (VMULHSD $vA, $vB))>;
-  def : Pat<(v2i64 (int_ppc_altivec_vmulhud v2i64:$vA, v2i64:$vB)),
-            (v2i64 (VMULHUD $vA, $vB))>;
-  def : Pat<(v16i8 (int_ppc_vsx_xxgenpcvbm v16i8:$VRB, imm:$IMM)),
-            (v16i8 (COPY_TO_REGCLASS (XXGENPCVBM $VRB, imm:$IMM), VRRC))>;
-  def : Pat<(v8i16 (int_ppc_vsx_xxgenpcvhm v8i16:$VRB, imm:$IMM)),
-            (v8i16 (COPY_TO_REGCLASS (XXGENPCVHM $VRB, imm:$IMM), VRRC))>;
-  def : Pat<(v4i32 (int_ppc_vsx_xxgenpcvwm v4i32:$VRB, imm:$IMM)),
-            (v4i32 (COPY_TO_REGCLASS (XXGENPCVWM $VRB, imm:$IMM), VRRC))>;
-  def : Pat<(v2i64 (int_ppc_vsx_xxgenpcvdm v2i64:$VRB, imm:$IMM)),
-            (v2i64 (COPY_TO_REGCLASS (XXGENPCVDM $VRB, imm:$IMM), VRRC))>;
-  def : Pat<(i32 (int_ppc_vsx_xvtlsbb v16i8:$XB, 1)),
-            (EXTRACT_SUBREG (XVTLSBB (COPY_TO_REGCLASS $XB, VSRC)), sub_lt)>;
-  def : Pat<(i32 (int_ppc_vsx_xvtlsbb v16i8:$XB, 0)),
-            (EXTRACT_SUBREG (XVTLSBB (COPY_TO_REGCLASS $XB, VSRC)), sub_eq)>;
-
-  def : Pat <(v1i128 (PPClxvrzx ForceXForm:$src, 8)),
-             (v1i128 (COPY_TO_REGCLASS (LXVRBX ForceXForm:$src), VRRC))>;
-  def : Pat <(v1i128 (PPClxvrzx ForceXForm:$src, 16)),
-             (v1i128 (COPY_TO_REGCLASS (LXVRHX ForceXForm:$src), VRRC))>;
-  def : Pat <(v1i128 (PPClxvrzx ForceXForm:$src, 32)),
-             (v1i128 (COPY_TO_REGCLASS (LXVRWX ForceXForm:$src), VRRC))>;
-  def : Pat <(v1i128 (PPClxvrzx ForceXForm:$src, 64)),
-             (v1i128 (COPY_TO_REGCLASS (LXVRDX ForceXForm:$src), VRRC))>;
-
-  def : Pat<(v1i128 (rotl v1i128:$vA, v1i128:$vB)),
-            (v1i128 (VRLQ v1i128:$vA, v1i128:$vB))>;
-
-  def : Pat <(v2i64 (PPCxxsplti32dx v2i64:$XT, i32:$XI, i32:$IMM32)),
-             (v2i64 (XXSPLTI32DX v2i64:$XT, i32:$XI, i32:$IMM32))>;
-}
-
-let Predicates = [IsISA3_1, HasVSX] in {
-  def : Pat<(v16i8 (int_ppc_vsx_xvcvspbf16 v16i8:$XA)),
-            (COPY_TO_REGCLASS (XVCVSPBF16 RCCp.AToVSRC), VRRC)>;
-  def : Pat<(v16i8 (int_ppc_vsx_xvcvbf16spn v16i8:$XA)),
-            (COPY_TO_REGCLASS (XVCVBF16SPN RCCp.AToVSRC), VRRC)>;
-}
-
-let AddedComplexity = 400, Predicates = [IsISA3_1, IsLittleEndian] in {
-  // Store element 0 of a VSX register to memory
-  def : Pat<(truncstorei8 (i32 (vector_extract v16i8:$src, 0)), ForceXForm:$dst),
-            (STXVRBX (COPY_TO_REGCLASS v16i8:$src, VSRC), ForceXForm:$dst)>;
-  def : Pat<(truncstorei16 (i32 (vector_extract v8i16:$src, 0)), ForceXForm:$dst),
-            (STXVRHX (COPY_TO_REGCLASS v8i16:$src, VSRC), ForceXForm:$dst)>;
-  def : Pat<(store (i32 (extractelt v4i32:$src, 0)), ForceXForm:$dst),
-            (STXVRWX $src, ForceXForm:$dst)>;
-  def : Pat<(store (f32 (extractelt v4f32:$src, 0)), ForceXForm:$dst),
-            (STXVRWX $src, ForceXForm:$dst)>;
-  def : Pat<(store (i64 (extractelt v2i64:$src, 0)), ForceXForm:$dst),
-            (STXVRDX $src, ForceXForm:$dst)>;
-  def : Pat<(store (f64 (extractelt v2f64:$src, 0)), ForceXForm:$dst),
-            (STXVRDX $src, ForceXForm:$dst)>;
-  // Load element 0 of a VSX register to memory
-  def : Pat<(v8i16 (scalar_to_vector (i32 (extloadi16 ForceXForm:$src)))),
-            (v8i16 (COPY_TO_REGCLASS (LXVRHX ForceXForm:$src), VSRC))>;
-  def : Pat<(v16i8 (scalar_to_vector (i32 (extloadi8 ForceXForm:$src)))),
-            (v16i8 (COPY_TO_REGCLASS (LXVRBX ForceXForm:$src), VSRC))>;
- }
-
-// FIXME: The swap is overkill when the shift amount is a constant.
-// We should just fix the constant in the DAG.
-let AddedComplexity = 400, Predicates = [IsISA3_1, HasVSX] in {
-  def : Pat<(v1i128 (shl v1i128:$VRA, v1i128:$VRB)),
-            (v1i128 (VSLQ v1i128:$VRA,
-                     (XXPERMDI (COPY_TO_REGCLASS $VRB, VSRC),
-                               (COPY_TO_REGCLASS $VRB, VSRC), 2)))>;
-  def : Pat<(v1i128 (PPCshl v1i128:$VRA, v1i128:$VRB)),
-            (v1i128 (VSLQ v1i128:$VRA,
-                     (XXPERMDI (COPY_TO_REGCLASS $VRB, VSRC),
-                               (COPY_TO_REGCLASS $VRB, VSRC), 2)))>;
-  def : Pat<(v1i128 (srl v1i128:$VRA, v1i128:$VRB)),
-            (v1i128 (VSRQ v1i128:$VRA,
-                     (XXPERMDI (COPY_TO_REGCLASS $VRB, VSRC),
-                               (COPY_TO_REGCLASS $VRB, VSRC), 2)))>;
-  def : Pat<(v1i128 (PPCsrl v1i128:$VRA, v1i128:$VRB)),
-            (v1i128 (VSRQ v1i128:$VRA,
-                     (XXPERMDI (COPY_TO_REGCLASS $VRB, VSRC),
-                               (COPY_TO_REGCLASS $VRB, VSRC), 2)))>;
-  def : Pat<(v1i128 (sra v1i128:$VRA, v1i128:$VRB)),
-            (v1i128 (VSRAQ v1i128:$VRA,
-                     (XXPERMDI (COPY_TO_REGCLASS $VRB, VSRC),
-                               (COPY_TO_REGCLASS $VRB, VSRC), 2)))>;
-  def : Pat<(v1i128 (PPCsra v1i128:$VRA, v1i128:$VRB)),
-            (v1i128 (VSRAQ v1i128:$VRA,
-                     (XXPERMDI (COPY_TO_REGCLASS $VRB, VSRC),
-                               (COPY_TO_REGCLASS $VRB, VSRC), 2)))>;
-}
-
-class xxevalPattern <dag pattern, bits<8> imm> :
-  Pat<(v4i32 pattern), (XXEVAL $vA, $vB, $vC, imm)> {}
-
-let AddedComplexity = 400, Predicates = [PrefixInstrs] in {
- def : Pat<(v4i32 (build_vector i32immNonAllOneNonZero:$A,
-                                i32immNonAllOneNonZero:$A,
-                                i32immNonAllOneNonZero:$A,
-                                i32immNonAllOneNonZero:$A)),
-           (v4i32 (XXSPLTIW imm:$A))>;
- def : Pat<(f32 nzFPImmAsi32:$A),
-           (COPY_TO_REGCLASS (XXSPLTIDP (getFPAs32BitInt fpimm:$A)),
-                             VSFRC)>;
- def : Pat<(f64 nzFPImmAsi32:$A),
-           (COPY_TO_REGCLASS (XXSPLTIDP (getFPAs32BitInt fpimm:$A)),
-                             VSFRC)>;
-
-// To replace constant pool with XXSPLTI32DX for scalars.
-def : Pat<(f32 nzFPImmAsi64:$A),
-          (COPY_TO_REGCLASS (XXSPLTI32DX (XXSPLTI32DX(IMPLICIT_DEF), 0,
-                                        (getFPAs64BitIntHi $A)),
-                                        1, (getFPAs64BitIntLo $A)),
-                            VSSRC)>;
-
-def : Pat<(f64 nzFPImmAsi64:$A),
-          (COPY_TO_REGCLASS (XXSPLTI32DX (XXSPLTI32DX (IMPLICIT_DEF), 0,
-                                        (getFPAs64BitIntHi $A)),
-                                        1, (getFPAs64BitIntLo $A)),
-                            VSFRC)>;
-
-  // Anonymous patterns for XXEVAL
-  // AND
-  // and(A, B, C)
-  def : xxevalPattern<(and v4i32:$vA, (and v4i32:$vB, v4i32:$vC)), 1>;
-  // and(A, xor(B, C))
-  def : xxevalPattern<(and v4i32:$vA, (xor v4i32:$vB, v4i32:$vC)), 6>;
-  // and(A, or(B, C))
-  def : xxevalPattern<(and v4i32:$vA, (or v4i32:$vB, v4i32:$vC)), 7>;
-  // and(A, nor(B, C))
-  def : xxevalPattern<(and v4i32:$vA, (vnot (or v4i32:$vB, v4i32:$vC))), 8>;
-  // and(A, eqv(B, C))
-  def : xxevalPattern<(and v4i32:$vA, (vnot (xor v4i32:$vB, v4i32:$vC))), 9>;
-  // and(A, nand(B, C))
-  def : xxevalPattern<(and v4i32:$vA, (vnot (and v4i32:$vB, v4i32:$vC))), 14>;
-
-  // NAND
-  // nand(A, B, C)
-  def : xxevalPattern<(vnot (and v4i32:$vA, (and v4i32:$vB, v4i32:$vC))),
-                       !sub(255, 1)>;
-  // nand(A, xor(B, C))
-  def : xxevalPattern<(vnot (and v4i32:$vA, (xor v4i32:$vB, v4i32:$vC))),
-                       !sub(255, 6)>;
-  // nand(A, or(B, C))
-  def : xxevalPattern<(vnot (and v4i32:$vA, (or v4i32:$vB, v4i32:$vC))),
-                       !sub(255, 7)>;
-  // nand(A, nor(B, C))
-  def : xxevalPattern<(or (vnot v4i32:$vA), (or v4i32:$vB, v4i32:$vC)),
-                       !sub(255, 8)>;
-  // nand(A, eqv(B, C))
-  def : xxevalPattern<(or (vnot v4i32:$vA), (xor v4i32:$vB, v4i32:$vC)),
-                       !sub(255, 9)>;
-  // nand(A, nand(B, C))
-  def : xxevalPattern<(or (vnot v4i32:$vA), (and v4i32:$vB, v4i32:$vC)),
-                       !sub(255, 14)>;
-}
-
-let Predicates = [PrefixInstrs] in {
-  def : Pat<(i32 imm34:$imm), (PLI (getImmAs64BitInt imm:$imm))>;
-  def : Pat<(i64 imm34:$imm), (PLI8 (getImmAs64BitInt imm:$imm))>;
-  def : Pat<(v16i8 (int_ppc_vsx_xxpermx v16i8:$A, v16i8:$B, v16i8:$C, timm:$D)),
-            (COPY_TO_REGCLASS (XXPERMX (COPY_TO_REGCLASS $A, VSRC),
-                                       (COPY_TO_REGCLASS $B, VSRC),
-                                       (COPY_TO_REGCLASS $C, VSRC), $D), VSRC)>;
-  def : Pat<(v16i8 (int_ppc_vsx_xxblendvb v16i8:$A, v16i8:$B, v16i8:$C)),
-            (COPY_TO_REGCLASS
-                   (XXBLENDVB (COPY_TO_REGCLASS $A, VSRC),
-                              (COPY_TO_REGCLASS $B, VSRC),
-                              (COPY_TO_REGCLASS $C, VSRC)), VSRC)>;
-  def : Pat<(v8i16 (int_ppc_vsx_xxblendvh v8i16:$A, v8i16:$B, v8i16:$C)),
-            (COPY_TO_REGCLASS
-                   (XXBLENDVH (COPY_TO_REGCLASS $A, VSRC),
-                              (COPY_TO_REGCLASS $B, VSRC),
-                              (COPY_TO_REGCLASS $C, VSRC)), VSRC)>;
-  def : Pat<(int_ppc_vsx_xxblendvw v4i32:$A, v4i32:$B, v4i32:$C),
-            (XXBLENDVW $A, $B, $C)>;
-  def : Pat<(int_ppc_vsx_xxblendvd v2i64:$A, v2i64:$B, v2i64:$C),
-            (XXBLENDVD $A, $B, $C)>;
-}
-
-def InsertEltShift {
-  dag Sub32Left0 = (EXTRACT_SUBREG $rB, sub_32);
-  dag Sub32Left1 = (RLWINM (EXTRACT_SUBREG $rB, sub_32), 1, 0, 30);
-  dag Sub32Left2 = (RLWINM (EXTRACT_SUBREG $rB, sub_32), 2, 0, 29);
-  dag Left3 = (RLWINM8 $rB, 3, 0, 28);
-}
-
-let Predicates = [IsISA3_1, HasVSX, IsLittleEndian] in {
-  // Indexed vector insert element
-  def : Pat<(v16i8 (PPCvecinsertelt v16i8:$vDi, i32:$rA, i64:$rB)),
-            (VINSBRX $vDi, InsertEltShift.Sub32Left0, $rA)>;
-  def : Pat<(v8i16 (PPCvecinsertelt v8i16:$vDi, i32:$rA, i64:$rB)),
-            (VINSHRX $vDi, InsertEltShift.Sub32Left1, $rA)>;
-  def : Pat<(v4i32 (PPCvecinsertelt v4i32:$vDi, i32:$rA, i64:$rB)),
-            (VINSWRX $vDi, InsertEltShift.Sub32Left2, $rA)>;
-  def : Pat<(v2i64 (PPCvecinsertelt v2i64:$vDi, i64:$rA, i64:$rB)),
-            (VINSDRX $vDi, InsertEltShift.Left3, $rA)>;
-
-  def : Pat<(v4f32 (PPCvecinsertelt v4f32:$vDi,  f32:$A, i64:$rB)),
-            (VINSWRX $vDi, InsertEltShift.Sub32Left2, Bitcast.FltToInt)>;
-  def : Pat<(v4f32 (PPCvecinsertelt v4f32:$vDi, (f32 (load iaddr:$rA)), i64:$rB)),
-            (VINSWRX $vDi, InsertEltShift.Sub32Left2, (LWZ memri:$rA))>;
-  def : Pat<(v4f32 (PPCvecinsertelt v4f32:$vDi, (f32 (load iaddrX34:$rA)), i64:$rB)),
-            (VINSWRX $vDi, InsertEltShift.Sub32Left2, (PLWZ memri34:$rA))>;
-  def : Pat<(v4f32 (PPCvecinsertelt v4f32:$vDi, (f32 (load xaddr:$rA)), i64:$rB)),
-            (VINSWRX $vDi, InsertEltShift.Sub32Left2, (LWZX memrr:$rA))>;
-
-  def : Pat<(v2f64 (PPCvecinsertelt v2f64:$vDi,  f64:$A, i64:$rB)),
-            (VINSDRX $vDi, InsertEltShift.Left3, Bitcast.DblToLong)>;
-  def : Pat<(v2f64 (PPCvecinsertelt v2f64:$vDi, (f64 (load iaddrX4:$rA)), i64:$rB)),
-            (VINSDRX $vDi, InsertEltShift.Left3, (LD memrix:$rA))>;
-  def : Pat<(v2f64 (PPCvecinsertelt v2f64:$vDi, (f64 (load iaddrX34:$rA)), i64:$rB)),
-            (VINSDRX $vDi, InsertEltShift.Left3, (PLD memri34:$rA))>;
-  def : Pat<(v2f64 (PPCvecinsertelt v2f64:$vDi, (f64 (load xaddrX4:$rA)), i64:$rB)),
-            (VINSDRX $vDi, InsertEltShift.Left3, (LDX memrr:$rA))>;
-
-  // Immediate vector insert element
-  foreach i = [0, 1, 2, 3] in {
-    def : Pat<(v4i32 (PPCvecinsertelt v4i32:$vDi, i32:$rA, (i64 i))),
-              (VINSW $vDi, !mul(!sub(3, i), 4), $rA)>;
-    def : Pat<(v4f32 (PPCvecinsertelt v4f32:$vDi, (f32 (load iaddr:$rA)), (i64 i))),
-              (VINSW $vDi, !mul(!sub(3, i), 4), (LWZ memri:$rA))>;
-    def : Pat<(v4f32 (PPCvecinsertelt v4f32:$vDi, (f32 (load iaddrX34:$rA)), (i64 i))),
-              (VINSW $vDi, !mul(!sub(3, i), 4), (PLWZ memri34:$rA))>;
-    def : Pat<(v4f32 (PPCvecinsertelt v4f32:$vDi, (f32 (load xaddr:$rA)), (i64 i))),
-              (VINSW $vDi, !mul(!sub(3, i), 4), (LWZX memrr:$rA))>;
-  }
-  foreach i = [0, 1] in
-    def : Pat<(v2i64 (PPCvecinsertelt v2i64:$vDi, i64:$rA, (i64 i))),
-              (VINSD $vDi, !mul(!sub(1, i), 8), $rA)>;
-}
-
-let Predicates = [IsISA3_1, HasVSX, IsBigEndian, IsPPC32] in {
-  // Indexed vector insert element
-  def : Pat<(v16i8 (PPCvecinsertelt v16i8:$vDi, i32:$rA, i32:$rB)),
-            (VINSBLX $vDi, $rB, $rA)>;
-  def : Pat<(v8i16 (PPCvecinsertelt v8i16:$vDi, i32:$rA, i32:$rB)),
-            (VINSHLX $vDi, $rB, $rA)>;
-  def : Pat<(v4i32 (PPCvecinsertelt v4i32:$vDi, i32:$rA, i32:$rB)),
-            (VINSWLX $vDi, $rB, $rA)>;
-
-  def : Pat<(v4f32 (PPCvecinsertelt v4f32:$vDi,  f32:$A, i32:$rB)),
-            (VINSWLX $vDi, $rB, Bitcast.FltToInt)>;
-  def : Pat<(v4f32 (PPCvecinsertelt v4f32:$vDi, (f32 (load iaddr:$rA)),
-                                    i32:$rB)),
-            (VINSWLX $vDi, $rB, (LWZ memri:$rA))>;
-  def : Pat<(v4f32 (PPCvecinsertelt v4f32:$vDi, (f32 (load iaddrX34:$rA)),
-                                    i32:$rB)),
-            (VINSWLX $vDi, $rB, (PLWZ memri34:$rA))>;
-  def : Pat<(v4f32 (PPCvecinsertelt v4f32:$vDi, (f32 (load xaddr:$rA)),
-                                    i32:$rB)),
-            (VINSWLX $vDi, $rB, (LWZX memrr:$rA))>;
-
-  // Immediate vector insert element
-  foreach i = [0, 1, 2, 3] in {
-    def : Pat<(v4i32 (PPCvecinsertelt v4i32:$vDi, i32:$rA, (i32 i))),
-              (VINSW $vDi, !mul(i, 4), $rA)>;
-    def : Pat<(v4f32 (PPCvecinsertelt v4f32:$vDi, (f32 (load iaddr:$rA)),
-                                     (i32 i))),
-              (VINSW $vDi, !mul(i, 4), (LWZ memri:$rA))>;
-    def : Pat<(v4f32 (PPCvecinsertelt v4f32:$vDi, (f32 (load iaddrX34:$rA)),
-                                     (i32 i))),
-              (VINSW $vDi, !mul(i, 4), (PLWZ memri34:$rA))>;
-    def : Pat<(v4f32 (PPCvecinsertelt v4f32:$vDi, (f32 (load xaddr:$rA)),
-                                     (i32 i))),
-              (VINSW $vDi, !mul(i, 4), (LWZX memrr:$rA))>;
-  }
-}
-
-let Predicates = [IsISA3_1, HasVSX, IsBigEndian, IsPPC64] in {
-  // Indexed vector insert element
-  def : Pat<(v16i8 (PPCvecinsertelt v16i8:$vDi, i32:$rA, i64:$rB)),
-            (VINSBLX $vDi, InsertEltShift.Sub32Left0, $rA)>;
-  def : Pat<(v8i16 (PPCvecinsertelt v8i16:$vDi, i32:$rA, i64:$rB)),
-            (VINSHLX $vDi, InsertEltShift.Sub32Left1, $rA)>;
-  def : Pat<(v4i32 (PPCvecinsertelt v4i32:$vDi, i32:$rA, i64:$rB)),
-            (VINSWLX $vDi, InsertEltShift.Sub32Left2, $rA)>;
-  def : Pat<(v2i64 (PPCvecinsertelt v2i64:$vDi, i64:$rA, i64:$rB)),
-            (VINSDLX $vDi, InsertEltShift.Left3, $rA)>;
-
-  def : Pat<(v4f32 (PPCvecinsertelt v4f32:$vDi,  f32:$A, i64:$rB)),
-            (VINSWLX $vDi, InsertEltShift.Sub32Left2, Bitcast.FltToInt)>;
-  def : Pat<(v4f32 (PPCvecinsertelt v4f32:$vDi, (f32 (load iaddr:$rA)), i64:$rB)),
-            (VINSWLX $vDi, InsertEltShift.Sub32Left2, (LWZ memri:$rA))>;
-  def : Pat<(v4f32 (PPCvecinsertelt v4f32:$vDi, (f32 (load iaddrX34:$rA)), i64:$rB)),
-            (VINSWLX $vDi, InsertEltShift.Sub32Left2, (PLWZ memri34:$rA))>;
-  def : Pat<(v4f32 (PPCvecinsertelt v4f32:$vDi, (f32 (load xaddr:$rA)), i64:$rB)),
-            (VINSWLX $vDi, InsertEltShift.Sub32Left2, (LWZX memrr:$rA))>;
-
-  def : Pat<(v2f64 (PPCvecinsertelt v2f64:$vDi,  f64:$A, i64:$rB)),
-            (VINSDLX $vDi, InsertEltShift.Left3, Bitcast.DblToLong)>;
-  def : Pat<(v2f64 (PPCvecinsertelt v2f64:$vDi, (f64 (load iaddrX4:$rA)), i64:$rB)),
-            (VINSDLX $vDi, InsertEltShift.Left3, (LD memrix:$rA))>;
-  def : Pat<(v2f64 (PPCvecinsertelt v2f64:$vDi, (f64 (load iaddrX34:$rA)), i64:$rB)),
-            (VINSDLX $vDi, InsertEltShift.Left3, (PLD memri34:$rA))>;
-  def : Pat<(v2f64 (PPCvecinsertelt v2f64:$vDi, (f64 (load xaddrX4:$rA)), i64:$rB)),
-            (VINSDLX $vDi, InsertEltShift.Left3, (LDX memrr:$rA))>;
-
-  // Immediate vector insert element
-  foreach i = [0, 1, 2, 3] in {
-    def : Pat<(v4i32 (PPCvecinsertelt v4i32:$vDi, i32:$rA, (i64 i))),
-              (VINSW $vDi, !mul(i, 4), $rA)>;
-    def : Pat<(v4f32 (PPCvecinsertelt v4f32:$vDi, (f32 (load iaddr:$rA)), (i64 i))),
-              (VINSW $vDi, !mul(i, 4), (LWZ memri:$rA))>;
-    def : Pat<(v4f32 (PPCvecinsertelt v4f32:$vDi, (f32 (load iaddrX34:$rA)), (i64 i))),
-              (VINSW $vDi, !mul(i, 4), (PLWZ memri34:$rA))>;
-    def : Pat<(v4f32 (PPCvecinsertelt v4f32:$vDi, (f32 (load xaddr:$rA)), (i64 i))),
-              (VINSW $vDi, !mul(i, 4), (LWZX memrr:$rA))>;
-  }
-  foreach i = [0, 1] in
-    def : Pat<(v2i64 (PPCvecinsertelt v2i64:$vDi, i64:$rA, (i64 i))),
-              (VINSD $vDi, !mul(i, 8), $rA)>;
-}
diff --git a/gnu/llvm/llvm/lib/Target/PowerPC/PPCSubtarget.h b/gnu/llvm/llvm/lib/Target/PowerPC/PPCSubtarget.h
index e916b0c0200..05ab0d4d719 100644
--- a/gnu/llvm/llvm/lib/Target/PowerPC/PPCSubtarget.h
+++ b/gnu/llvm/llvm/lib/Target/PowerPC/PPCSubtarget.h
@@ -19,7 +19,7 @@
 #include "llvm/ADT/Triple.h"
 #include "llvm/CodeGen/GlobalISel/CallLowering.h"
 #include "llvm/CodeGen/GlobalISel/LegalizerInfo.h"
-#include "llvm/CodeGen/GlobalISel/RegisterBankInfo.h"
+#include "llvm/CodeGen/RegisterBankInfo.h"
 #include "llvm/CodeGen/SelectionDAGTargetInfo.h"
 #include "llvm/CodeGen/TargetSubtargetInfo.h"
 #include "llvm/IR/DataLayout.h"
@@ -87,78 +87,16 @@ protected:
   /// Selected instruction itineraries (one entry per itinerary class.)
   InstrItineraryData InstrItins;
 
+// Bool members corresponding to the SubtargetFeatures defined in tablegen.
+#define GET_SUBTARGETINFO_MACRO(ATTRIBUTE, DEFAULT, GETTER)                    \
+  bool ATTRIBUTE = DEFAULT;
+#include "PPCGenSubtargetInfo.inc"
+
   /// Which cpu directive was used.
   unsigned CPUDirective;
 
-  /// Used by the ISel to turn in optimizations for POWER4-derived architectures
-  bool HasMFOCRF;
-  bool Has64BitSupport;
-  bool Use64BitRegs;
-  bool UseCRBits;
-  bool HasHardFloat;
   bool IsPPC64;
-  bool HasAltivec;
-  bool HasFPU;
-  bool HasSPE;
-  bool HasEFPU2;
-  bool HasVSX;
-  bool NeedsTwoConstNR;
-  bool HasP8Vector;
-  bool HasP8Altivec;
-  bool HasP8Crypto;
-  bool HasP9Vector;
-  bool HasP9Altivec;
-  bool HasP10Vector;
-  bool HasPrefixInstrs;
-  bool HasPCRelativeMemops;
-  bool HasMMA;
-  bool HasROPProtect;
-  bool HasPrivileged;
-  bool HasFCPSGN;
-  bool HasFSQRT;
-  bool HasFRE, HasFRES, HasFRSQRTE, HasFRSQRTES;
-  bool HasRecipPrec;
-  bool HasSTFIWX;
-  bool HasLFIWAX;
-  bool HasFPRND;
-  bool HasFPCVT;
-  bool HasISEL;
-  bool HasBPERMD;
-  bool HasExtDiv;
-  bool HasCMPB;
-  bool HasLDBRX;
-  bool IsBookE;
-  bool HasOnlyMSYNC;
-  bool IsE500;
-  bool IsPPC4xx;
-  bool IsPPC6xx;
-  bool FeatureMFTB;
-  bool AllowsUnalignedFPAccess;
-  bool DeprecatedDST;
   bool IsLittleEndian;
-  bool HasICBT;
-  bool HasInvariantFunctionDescriptors;
-  bool HasPartwordAtomics;
-  bool HasQuadwordAtomics;
-  bool HasDirectMove;
-  bool HasHTM;
-  bool HasFloat128;
-  bool HasFusion;
-  bool HasStoreFusion;
-  bool HasAddiLoadFusion;
-  bool HasAddisLoadFusion;
-  bool IsISA2_07;
-  bool IsISA3_0;
-  bool IsISA3_1;
-  bool UseLongCalls;
-  bool SecurePlt;
-  bool VectorsUseTwoUnits;
-  bool UsePPCPreRASchedStrategy;
-  bool UsePPCPostRASchedStrategy;
-  bool PairedVectorMemops;
-  bool PredictableSelectIsExpensive;
-  bool HasModernAIXAs;
-  bool IsAIX;
 
   POPCNTDKind HasPOPCNTD;
 
@@ -178,7 +116,8 @@ public:
   /// This constructor initializes the data members to match that
   /// of the specified triple.
   ///
-  PPCSubtarget(const Triple &TT, const std::string &CPU, const std::string &FS,
+  PPCSubtarget(const Triple &TT, const std::string &CPU,
+               const std::string &TuneCPU, const std::string &FS,
                const PPCTargetMachine &TM);
 
   /// ParseSubtargetFeatures - Parses features string setting specified
@@ -215,22 +154,22 @@ public:
   }
   const PPCTargetMachine &getTargetMachine() const { return TM; }
 
-  /// initializeSubtargetDependencies - Initializes using a CPU and feature string
-  /// so that we can use initializer lists for subtarget initialization.
-  PPCSubtarget &initializeSubtargetDependencies(StringRef CPU, StringRef FS);
+  /// initializeSubtargetDependencies - Initializes using a CPU, a TuneCPU,  and
+  /// feature string so that we can use initializer lists for subtarget
+  /// initialization.
+  PPCSubtarget &initializeSubtargetDependencies(StringRef CPU,
+                                                StringRef TuneCPU,
+                                                StringRef FS);
 
 private:
   void initializeEnvironment();
-  void initSubtargetFeatures(StringRef CPU, StringRef FS);
+  void initSubtargetFeatures(StringRef CPU, StringRef TuneCPU, StringRef FS);
 
 public:
   /// isPPC64 - Return true if we are generating code for 64-bit pointer mode.
   ///
   bool isPPC64() const;
 
-  /// has64BitSupport - Return true if the selected CPU supports 64-bit
-  /// instructions, regardless of whether we are in 32-bit or 64-bit mode.
-  bool has64BitSupport() const { return Has64BitSupport; }
   // useSoftFloat - Return true if soft-float option is turned on.
   bool useSoftFloat() const {
     if (isAIXABI() && !HasHardFloat)
@@ -238,73 +177,13 @@ public:
     return !HasHardFloat;
   }
 
-  /// use64BitRegs - Return true if in 64-bit mode or if we should use 64-bit
-  /// registers in 32-bit mode when possible.  This can only true if
-  /// has64BitSupport() returns true.
-  bool use64BitRegs() const { return Use64BitRegs; }
-
-  /// useCRBits - Return true if we should store and manipulate i1 values in
-  /// the individual condition register bits.
-  bool useCRBits() const { return UseCRBits; }
-
   // isLittleEndian - True if generating little-endian code
   bool isLittleEndian() const { return IsLittleEndian; }
 
-  // Specific obvious features.
-  bool hasFCPSGN() const { return HasFCPSGN; }
-  bool hasFSQRT() const { return HasFSQRT; }
-  bool hasFRE() const { return HasFRE; }
-  bool hasFRES() const { return HasFRES; }
-  bool hasFRSQRTE() const { return HasFRSQRTE; }
-  bool hasFRSQRTES() const { return HasFRSQRTES; }
-  bool hasRecipPrec() const { return HasRecipPrec; }
-  bool hasSTFIWX() const { return HasSTFIWX; }
-  bool hasLFIWAX() const { return HasLFIWAX; }
-  bool hasFPRND() const { return HasFPRND; }
-  bool hasFPCVT() const { return HasFPCVT; }
-  bool hasAltivec() const { return HasAltivec; }
-  bool hasSPE() const { return HasSPE; }
-  bool hasEFPU2() const { return HasEFPU2; }
-  bool hasFPU() const { return HasFPU; }
-  bool hasVSX() const { return HasVSX; }
-  bool needsTwoConstNR() const { return NeedsTwoConstNR; }
-  bool hasP8Vector() const { return HasP8Vector; }
-  bool hasP8Altivec() const { return HasP8Altivec; }
-  bool hasP8Crypto() const { return HasP8Crypto; }
-  bool hasP9Vector() const { return HasP9Vector; }
-  bool hasP9Altivec() const { return HasP9Altivec; }
-  bool hasP10Vector() const { return HasP10Vector; }
-  bool hasPrefixInstrs() const { return HasPrefixInstrs; }
-  bool hasPCRelativeMemops() const { return HasPCRelativeMemops; }
-  bool hasMMA() const { return HasMMA; }
-  bool hasROPProtect() const { return HasROPProtect; }
-  bool hasPrivileged() const { return HasPrivileged; }
-  bool pairedVectorMemops() const { return PairedVectorMemops; }
-  bool hasMFOCRF() const { return HasMFOCRF; }
-  bool hasISEL() const { return HasISEL; }
-  bool hasBPERMD() const { return HasBPERMD; }
-  bool hasExtDiv() const { return HasExtDiv; }
-  bool hasCMPB() const { return HasCMPB; }
-  bool hasLDBRX() const { return HasLDBRX; }
-  bool isBookE() const { return IsBookE; }
-  bool hasOnlyMSYNC() const { return HasOnlyMSYNC; }
-  bool isPPC4xx() const { return IsPPC4xx; }
-  bool isPPC6xx() const { return IsPPC6xx; }
-  bool isSecurePlt() const {return SecurePlt; }
-  bool vectorsUseTwoUnits() const {return VectorsUseTwoUnits; }
-  bool isE500() const { return IsE500; }
-  bool isFeatureMFTB() const { return FeatureMFTB; }
-  bool allowsUnalignedFPAccess() const { return AllowsUnalignedFPAccess; }
-  bool isDeprecatedDST() const { return DeprecatedDST; }
-  bool hasICBT() const { return HasICBT; }
-  bool hasInvariantFunctionDescriptors() const {
-    return HasInvariantFunctionDescriptors;
-  }
-  bool usePPCPreRASchedStrategy() const { return UsePPCPreRASchedStrategy; }
-  bool usePPCPostRASchedStrategy() const { return UsePPCPostRASchedStrategy; }
-  bool hasPartwordAtomics() const { return HasPartwordAtomics; }
-  bool hasQuadwordAtomics() const { return HasQuadwordAtomics; }
-  bool hasDirectMove() const { return HasDirectMove; }
+// Getters for SubtargetFeatures defined in tablegen.
+#define GET_SUBTARGETINFO_MACRO(ATTRIBUTE, DEFAULT, GETTER)                    \
+  bool GETTER() const { return ATTRIBUTE; }
+#include "PPCGenSubtargetInfo.inc"
 
   Align getPlatformStackAlignment() const {
     return Align(16);
@@ -320,16 +199,6 @@ public:
     return isAIXABI() ? 220 : 0;
   }
 
-  bool hasHTM() const { return HasHTM; }
-  bool hasFloat128() const { return HasFloat128; }
-  bool isISA2_07() const { return IsISA2_07; }
-  bool isISA3_0() const { return IsISA3_0; }
-  bool isISA3_1() const { return IsISA3_1; }
-  bool useLongCalls() const { return UseLongCalls; }
-  bool hasFusion() const { return HasFusion; }
-  bool hasStoreFusion() const { return HasStoreFusion; }
-  bool hasAddiLoadFusion() const { return HasAddiLoadFusion; }
-  bool hasAddisLoadFusion() const { return HasAddisLoadFusion; }
   bool needsSwapsForVSXMemOps() const {
     return hasVSX() && isLittleEndian() && !hasP9Vector();
   }
diff --git a/gnu/llvm/llvm/lib/Target/PowerPC/PPCTargetMachine.cpp b/gnu/llvm/llvm/lib/Target/PowerPC/PPCTargetMachine.cpp
index ac40d20c21a..b17e2766a7a 100644
--- a/gnu/llvm/llvm/lib/Target/PowerPC/PPCTargetMachine.cpp
+++ b/gnu/llvm/llvm/lib/Target/PowerPC/PPCTargetMachine.cpp
@@ -13,19 +13,20 @@
 #include "PPCTargetMachine.h"
 #include "MCTargetDesc/PPCMCTargetDesc.h"
 #include "PPC.h"
+#include "PPCMachineFunctionInfo.h"
 #include "PPCMachineScheduler.h"
 #include "PPCMacroFusion.h"
 #include "PPCSubtarget.h"
 #include "PPCTargetObjectFile.h"
 #include "PPCTargetTransformInfo.h"
 #include "TargetInfo/PowerPCTargetInfo.h"
-#include "llvm/ADT/Optional.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/Triple.h"
 #include "llvm/Analysis/TargetTransformInfo.h"
 #include "llvm/CodeGen/GlobalISel/IRTranslator.h"
 #include "llvm/CodeGen/GlobalISel/InstructionSelect.h"
+#include "llvm/CodeGen/GlobalISel/InstructionSelector.h"
 #include "llvm/CodeGen/GlobalISel/Legalizer.h"
 #include "llvm/CodeGen/GlobalISel/Localizer.h"
 #include "llvm/CodeGen/GlobalISel/RegBankSelect.h"
@@ -36,15 +37,16 @@
 #include "llvm/IR/DataLayout.h"
 #include "llvm/IR/Function.h"
 #include "llvm/InitializePasses.h"
+#include "llvm/MC/TargetRegistry.h"
 #include "llvm/Pass.h"
 #include "llvm/Support/CodeGen.h"
 #include "llvm/Support/CommandLine.h"
-#include "llvm/Support/TargetRegistry.h"
 #include "llvm/Target/TargetLoweringObjectFile.h"
 #include "llvm/Target/TargetOptions.h"
 #include "llvm/Transforms/Scalar.h"
 #include <cassert>
 #include <memory>
+#include <optional>
 #include <string>
 
 using namespace llvm;
@@ -97,6 +99,13 @@ static cl::opt<bool>
   ReduceCRLogical("ppc-reduce-cr-logicals",
                   cl::desc("Expand eligible cr-logical binary ops to branches"),
                   cl::init(true), cl::Hidden);
+
+static cl::opt<bool> EnablePPCGenScalarMASSEntries(
+    "enable-ppc-gen-scalar-mass", cl::init(false),
+    cl::desc("Enable lowering math functions to their corresponding MASS "
+             "(scalar) entries"),
+    cl::Hidden);
+
 extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializePowerPCTarget() {
   // Register the targets
   RegisterTargetMachine<PPCTargetMachine> A(getThePPC32Target());
@@ -123,8 +132,11 @@ extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializePowerPCTarget() {
   initializePPCTLSDynamicCallPass(PR);
   initializePPCMIPeepholePass(PR);
   initializePPCLowerMASSVEntriesPass(PR);
+  initializePPCGenScalarMASSEntriesPass(PR);
   initializePPCExpandAtomicPseudoPass(PR);
   initializeGlobalISel(PR);
+  initializePPCCTRLoopsPass(PR);
+  initializePPCDAGToDAGISelPass(PR);
 }
 
 static bool isLittleEndianTriple(const Triple &T) {
@@ -221,27 +233,25 @@ static PPCTargetMachine::PPCABI computeTargetABI(const Triple &TT,
   assert(Options.MCOptions.getABIName().empty() &&
          "Unknown target-abi option!");
 
-  if (TT.isMacOSX())
-    return PPCTargetMachine::PPC_ABI_UNKNOWN;
-
   switch (TT.getArch()) {
   case Triple::ppc64le:
     return PPCTargetMachine::PPC_ABI_ELFv2;
   case Triple::ppc64:
-    if (TT.isOSOpenBSD())
+    if (TT.isPPC64ELFv2ABI())
       return PPCTargetMachine::PPC_ABI_ELFv2;
-    return PPCTargetMachine::PPC_ABI_ELFv1;
+    else
+      return PPCTargetMachine::PPC_ABI_ELFv1;
   default:
     return PPCTargetMachine::PPC_ABI_UNKNOWN;
   }
 }
 
 static Reloc::Model getEffectiveRelocModel(const Triple &TT,
-                                           Optional<Reloc::Model> RM) {
-  assert((!TT.isOSAIX() || !RM.hasValue() || *RM == Reloc::PIC_) &&
+                                           std::optional<Reloc::Model> RM) {
+  assert((!TT.isOSAIX() || !RM || *RM == Reloc::PIC_) &&
          "Invalid relocation model for AIX.");
 
-  if (RM.hasValue())
+  if (RM)
     return *RM;
 
   // Big Endian PPC and AIX default to PIC.
@@ -252,9 +262,9 @@ static Reloc::Model getEffectiveRelocModel(const Triple &TT,
   return Reloc::Static;
 }
 
-static CodeModel::Model getEffectivePPCCodeModel(const Triple &TT,
-                                                 Optional<CodeModel::Model> CM,
-                                                 bool JIT) {
+static CodeModel::Model
+getEffectivePPCCodeModel(const Triple &TT, std::optional<CodeModel::Model> CM,
+                         bool JIT) {
   if (CM) {
     if (*CM == CodeModel::Tiny)
       report_fatal_error("Target does not support the tiny CodeModel", false);
@@ -316,8 +326,8 @@ static ScheduleDAGInstrs *createPPCPostMachineScheduler(
 PPCTargetMachine::PPCTargetMachine(const Target &T, const Triple &TT,
                                    StringRef CPU, StringRef FS,
                                    const TargetOptions &Options,
-                                   Optional<Reloc::Model> RM,
-                                   Optional<CodeModel::Model> CM,
+                                   std::optional<Reloc::Model> RM,
+                                   std::optional<CodeModel::Model> CM,
                                    CodeGenOpt::Level OL, bool JIT)
     : LLVMTargetMachine(T, getDataLayoutString(TT), TT, CPU,
                         computeFSAdditions(FS, OL, TT), Options,
@@ -334,10 +344,13 @@ PPCTargetMachine::~PPCTargetMachine() = default;
 const PPCSubtarget *
 PPCTargetMachine::getSubtargetImpl(const Function &F) const {
   Attribute CPUAttr = F.getFnAttribute("target-cpu");
+  Attribute TuneAttr = F.getFnAttribute("tune-cpu");
   Attribute FSAttr = F.getFnAttribute("target-features");
 
   std::string CPU =
       CPUAttr.isValid() ? CPUAttr.getValueAsString().str() : TargetCPU;
+  std::string TuneCPU =
+      TuneAttr.isValid() ? TuneAttr.getValueAsString().str() : CPU;
   std::string FS =
       FSAttr.isValid() ? FSAttr.getValueAsString().str() : TargetFS;
 
@@ -352,14 +365,14 @@ PPCTargetMachine::getSubtargetImpl(const Function &F) const {
   if (SoftFloat)
     FS += FS.empty() ? "-hard-float" : ",-hard-float";
 
-  auto &I = SubtargetMap[CPU + FS];
+  auto &I = SubtargetMap[CPU + TuneCPU + FS];
   if (!I) {
     // This needs to be done before we create a new subtarget since any
     // creation will depend on the TM and the code generation flags on the
     // function that reside in TargetOptions.
     resetTargetOptions(F);
     I = std::make_unique<PPCSubtarget>(
-        TargetTriple, CPU,
+        TargetTriple, CPU, TuneCPU,
         // FIXME: It would be good to have the subtarget additions here
         // not necessary. Anything that turns them on/off (overrides) ends
         // up being put at the end of the feature string, but the defaults
@@ -431,6 +444,14 @@ void PPCPassConfig::addIRPasses() {
   // Lower generic MASSV routines to PowerPC subtarget-specific entries.
   addPass(createPPCLowerMASSVEntriesPass());
 
+  // Generate PowerPC target-specific entries for scalar math functions
+  // that are available in IBM MASS (scalar) library.
+  if (TM->getOptLevel() == CodeGenOpt::Aggressive &&
+      EnablePPCGenScalarMASSEntries) {
+    TM->Options.PPCGenScalarMASSEntries = EnablePPCGenScalarMASSEntries;
+    addPass(createPPCGenScalarMASSEntriesPass());
+  }
+
   // If explicitly requested, add explicit data prefetch intrinsics.
   if (EnablePrefetch.getNumOccurrences() > 0)
     addPass(createLoopDataPrefetchPass());
@@ -484,6 +505,11 @@ bool PPCPassConfig::addInstSelector() {
 }
 
 void PPCPassConfig::addMachineSSAOptimization() {
+  // Run CTR loops pass before any cfg modification pass to prevent the
+  // canonical form of hardware loop from being destroied.
+  if (!DisableCTRLoops && getOptLevel() != CodeGenOpt::None)
+    addPass(createPPCCTRLoopsPass());
+
   // PPCBranchCoalescingPass need to be done before machine sinking
   // since it merges empty blocks.
   if (EnableBranchCoalescing && getOptLevel() != CodeGenOpt::None)
@@ -551,7 +577,7 @@ void PPCPassConfig::addPreEmitPass2() {
 }
 
 TargetTransformInfo
-PPCTargetMachine::getTargetTransformInfo(const Function &F) {
+PPCTargetMachine::getTargetTransformInfo(const Function &F) const {
   return TargetTransformInfo(PPCTTIImpl(this, F));
 }
 
@@ -561,6 +587,12 @@ bool PPCTargetMachine::isLittleEndian() const {
   return Endianness == Endian::LITTLE;
 }
 
+MachineFunctionInfo *PPCTargetMachine::createMachineFunctionInfo(
+    BumpPtrAllocator &Allocator, const Function &F,
+    const TargetSubtargetInfo *STI) const {
+  return PPCFunctionInfo::create<PPCFunctionInfo>(Allocator, F, STI);
+}
+
 static MachineSchedRegistry
 PPCPreRASchedRegistry("ppc-prera",
                       "Run PowerPC PreRA specific scheduler",
diff --git a/gnu/llvm/llvm/lib/Target/RISCV/RISCVCallLowering.cpp b/gnu/llvm/llvm/lib/Target/RISCV/RISCVCallLowering.cpp
deleted file mode 100644
index d265f3a12b7..00000000000
--- a/gnu/llvm/llvm/lib/Target/RISCV/RISCVCallLowering.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-//===-- RISCVCallLowering.cpp - Call lowering -------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-/// \file
-/// This file implements the lowering of LLVM calls to machine code calls for
-/// GlobalISel.
-//
-//===----------------------------------------------------------------------===//
-
-#include "RISCVCallLowering.h"
-#include "RISCVISelLowering.h"
-#include "llvm/CodeGen/GlobalISel/MachineIRBuilder.h"
-
-using namespace llvm;
-
-RISCVCallLowering::RISCVCallLowering(const RISCVTargetLowering &TLI)
-    : CallLowering(&TLI) {}
-
-bool RISCVCallLowering::lowerReturn(MachineIRBuilder &MIRBuilder,
-                                    const Value *Val, ArrayRef<Register> VRegs,
-                                    FunctionLoweringInfo &FLI) const {
-
-  MachineInstrBuilder Ret = MIRBuilder.buildInstrNoInsert(RISCV::PseudoRET);
-
-  if (Val != nullptr) {
-    return false;
-  }
-  MIRBuilder.insertInstr(Ret);
-  return true;
-}
-
-bool RISCVCallLowering::lowerFormalArguments(MachineIRBuilder &MIRBuilder,
-                                             const Function &F,
-                                             ArrayRef<ArrayRef<Register>> VRegs,
-                                             FunctionLoweringInfo &FLI) const {
-
-  if (F.arg_empty())
-    return true;
-
-  return false;
-}
-
-bool RISCVCallLowering::lowerCall(MachineIRBuilder &MIRBuilder,
-                                  CallLoweringInfo &Info) const {
-  return false;
-}
diff --git a/gnu/llvm/llvm/lib/Target/RISCV/RISCVCallLowering.h b/gnu/llvm/llvm/lib/Target/RISCV/RISCVCallLowering.h
deleted file mode 100644
index cd7fc4c7612..00000000000
--- a/gnu/llvm/llvm/lib/Target/RISCV/RISCVCallLowering.h
+++ /dev/null
@@ -1,44 +0,0 @@
-//===-- RISCVCallLowering.h - Call lowering ---------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-/// \file
-/// This file describes how to lower LLVM calls to machine code calls.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_LIB_TARGET_RISCV_RISCVCALLLOWERING_H
-#define LLVM_LIB_TARGET_RISCV_RISCVCALLLOWERING_H
-
-#include "llvm/CodeGen/CallingConvLower.h"
-#include "llvm/CodeGen/GlobalISel/CallLowering.h"
-#include "llvm/CodeGen/ValueTypes.h"
-
-namespace llvm {
-
-class RISCVTargetLowering;
-
-class RISCVCallLowering : public CallLowering {
-
-public:
-  RISCVCallLowering(const RISCVTargetLowering &TLI);
-
-  bool lowerReturn(MachineIRBuilder &MIRBuiler, const Value *Val,
-                   ArrayRef<Register> VRegs,
-                   FunctionLoweringInfo &FLI) const override;
-
-  bool lowerFormalArguments(MachineIRBuilder &MIRBuilder, const Function &F,
-                            ArrayRef<ArrayRef<Register>> VRegs,
-                            FunctionLoweringInfo &FLI) const override;
-
-  bool lowerCall(MachineIRBuilder &MIRBuilder,
-                 CallLoweringInfo &Info) const override;
-};
-
-} // end namespace llvm
-
-#endif // LLVM_LIB_TARGET_RISCV_RISCVCALLLOWERING_H
diff --git a/gnu/llvm/llvm/lib/Target/RISCV/RISCVISelLowering.cpp b/gnu/llvm/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
index 8a72ed4cd1c..24a61b0b8db 100644
--- a/gnu/llvm/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
+++ b/gnu/llvm/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
@@ -20,21 +20,26 @@
 #include "RISCVTargetMachine.h"
 #include "llvm/ADT/SmallSet.h"
 #include "llvm/ADT/Statistic.h"
+#include "llvm/Analysis/MemoryLocation.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
+#include "llvm/CodeGen/MachineJumpTableInfo.h"
 #include "llvm/CodeGen/MachineRegisterInfo.h"
 #include "llvm/CodeGen/TargetLoweringObjectFileImpl.h"
 #include "llvm/CodeGen/ValueTypes.h"
 #include "llvm/IR/DiagnosticInfo.h"
 #include "llvm/IR/DiagnosticPrinter.h"
-#include "llvm/IR/IntrinsicsRISCV.h"
 #include "llvm/IR/IRBuilder.h"
+#include "llvm/IR/IntrinsicsRISCV.h"
+#include "llvm/IR/PatternMatch.h"
+#include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/KnownBits.h"
 #include "llvm/Support/MathExtras.h"
 #include "llvm/Support/raw_ostream.h"
+#include <optional>
 
 using namespace llvm;
 
@@ -42,6 +47,24 @@ using namespace llvm;
 
 STATISTIC(NumTailCalls, "Number of tail calls");
 
+static cl::opt<unsigned> ExtensionMaxWebSize(
+    DEBUG_TYPE "-ext-max-web-size", cl::Hidden,
+    cl::desc("Give the maximum size (in number of nodes) of the web of "
+             "instructions that we will consider for VW expansion"),
+    cl::init(18));
+
+static cl::opt<bool>
+    AllowSplatInVW_W(DEBUG_TYPE "-form-vw-w-with-splat", cl::Hidden,
+                     cl::desc("Allow the formation of VW_W operations (e.g., "
+                              "VWADD_W) with splat constants"),
+                     cl::init(false));
+
+static cl::opt<unsigned> NumRepeatedDivisors(
+    DEBUG_TYPE "-fp-repeated-divisors", cl::Hidden,
+    cl::desc("Set the minimum number of repetitions of a divisor to allow "
+             "transformation to multiplications by the reciprocal"),
+    cl::init(2));
+
 RISCVTargetLowering::RISCVTargetLowering(const TargetMachine &TM,
                                          const RISCVSubtarget &STI)
     : TargetLowering(TM), Subtarget(STI) {
@@ -83,7 +106,7 @@ RISCVTargetLowering::RISCVTargetLowering(const TargetMachine &TM,
   // Set up the register classes.
   addRegisterClass(XLenVT, &RISCV::GPRRegClass);
 
-  if (Subtarget.hasStdExtZfh())
+  if (Subtarget.hasStdExtZfhOrZfhmin())
     addRegisterClass(MVT::f16, &RISCV::FPR16RegClass);
   if (Subtarget.hasStdExtF())
     addRegisterClass(MVT::f32, &RISCV::FPR32RegClass);
@@ -107,37 +130,48 @@ RISCVTargetLowering::RISCVTargetLowering(const TargetMachine &TM,
   static const MVT::SimpleValueType F64VecVTs[] = {
       MVT::nxv1f64, MVT::nxv2f64, MVT::nxv4f64, MVT::nxv8f64};
 
-  if (Subtarget.hasStdExtV()) {
+  if (Subtarget.hasVInstructions()) {
     auto addRegClassForRVV = [this](MVT VT) {
+      // Disable the smallest fractional LMUL types if ELEN is less than
+      // RVVBitsPerBlock.
+      unsigned MinElts = RISCV::RVVBitsPerBlock / Subtarget.getELEN();
+      if (VT.getVectorMinNumElements() < MinElts)
+        return;
+
       unsigned Size = VT.getSizeInBits().getKnownMinValue();
-      assert(Size <= 512 && isPowerOf2_32(Size));
       const TargetRegisterClass *RC;
-      if (Size <= 64)
+      if (Size <= RISCV::RVVBitsPerBlock)
         RC = &RISCV::VRRegClass;
-      else if (Size == 128)
+      else if (Size == 2 * RISCV::RVVBitsPerBlock)
         RC = &RISCV::VRM2RegClass;
-      else if (Size == 256)
+      else if (Size == 4 * RISCV::RVVBitsPerBlock)
         RC = &RISCV::VRM4RegClass;
-      else
+      else if (Size == 8 * RISCV::RVVBitsPerBlock)
         RC = &RISCV::VRM8RegClass;
+      else
+        llvm_unreachable("Unexpected size");
 
       addRegisterClass(VT, RC);
     };
 
     for (MVT VT : BoolVecVTs)
       addRegClassForRVV(VT);
-    for (MVT VT : IntVecVTs)
+    for (MVT VT : IntVecVTs) {
+      if (VT.getVectorElementType() == MVT::i64 &&
+          !Subtarget.hasVInstructionsI64())
+        continue;
       addRegClassForRVV(VT);
+    }
 
-    if (Subtarget.hasStdExtZfh())
+    if (Subtarget.hasVInstructionsF16())
       for (MVT VT : F16VecVTs)
         addRegClassForRVV(VT);
 
-    if (Subtarget.hasStdExtF())
+    if (Subtarget.hasVInstructionsF32())
       for (MVT VT : F32VecVTs)
         addRegClassForRVV(VT);
 
-    if (Subtarget.hasStdExtD())
+    if (Subtarget.hasVInstructionsF64())
       for (MVT VT : F64VecVTs)
         addRegClassForRVV(VT);
 
@@ -163,8 +197,11 @@ RISCVTargetLowering::RISCVTargetLowering(const TargetMachine &TM,
 
   setStackPointerRegisterToSaveRestore(RISCV::X2);
 
-  for (auto N : {ISD::EXTLOAD, ISD::SEXTLOAD, ISD::ZEXTLOAD})
-    setLoadExtAction(N, XLenVT, MVT::i1, Promote);
+  setLoadExtAction({ISD::EXTLOAD, ISD::SEXTLOAD, ISD::ZEXTLOAD}, XLenVT,
+                   MVT::i1, Promote);
+  // DAGCombiner can call isLoadExtLegal for types that aren't legal.
+  setLoadExtAction({ISD::EXTLOAD, ISD::SEXTLOAD, ISD::ZEXTLOAD}, MVT::i32,
+                   MVT::i1, Promote);
 
   // TODO: add all necessary setOperationAction calls.
   setOperationAction(ISD::DYNAMIC_STACKALLOC, XLenVT, Expand);
@@ -174,173 +211,186 @@ RISCVTargetLowering::RISCVTargetLowering(const TargetMachine &TM,
   setOperationAction(ISD::BRCOND, MVT::Other, Custom);
   setOperationAction(ISD::SELECT_CC, XLenVT, Expand);
 
-  setOperationAction(ISD::STACKSAVE, MVT::Other, Expand);
-  setOperationAction(ISD::STACKRESTORE, MVT::Other, Expand);
+  setCondCodeAction(ISD::SETLE, XLenVT, Expand);
+  setCondCodeAction(ISD::SETGT, XLenVT, Custom);
+  setCondCodeAction(ISD::SETGE, XLenVT, Expand);
+  setCondCodeAction(ISD::SETULE, XLenVT, Expand);
+  setCondCodeAction(ISD::SETUGT, XLenVT, Custom);
+  setCondCodeAction(ISD::SETUGE, XLenVT, Expand);
+
+  setOperationAction({ISD::STACKSAVE, ISD::STACKRESTORE}, MVT::Other, Expand);
 
   setOperationAction(ISD::VASTART, MVT::Other, Custom);
-  setOperationAction(ISD::VAARG, MVT::Other, Expand);
-  setOperationAction(ISD::VACOPY, MVT::Other, Expand);
-  setOperationAction(ISD::VAEND, MVT::Other, Expand);
+  setOperationAction({ISD::VAARG, ISD::VACOPY, ISD::VAEND}, MVT::Other, Expand);
 
   setOperationAction(ISD::SIGN_EXTEND_INREG, MVT::i1, Expand);
-  if (!Subtarget.hasStdExtZbb()) {
-    setOperationAction(ISD::SIGN_EXTEND_INREG, MVT::i8, Expand);
-    setOperationAction(ISD::SIGN_EXTEND_INREG, MVT::i16, Expand);
-  }
+
+  setOperationAction(ISD::EH_DWARF_CFA, MVT::i32, Custom);
+
+  if (!Subtarget.hasStdExtZbb())
+    setOperationAction(ISD::SIGN_EXTEND_INREG, {MVT::i8, MVT::i16}, Expand);
 
   if (Subtarget.is64Bit()) {
-    setOperationAction(ISD::ADD, MVT::i32, Custom);
-    setOperationAction(ISD::SUB, MVT::i32, Custom);
-    setOperationAction(ISD::SHL, MVT::i32, Custom);
-    setOperationAction(ISD::SRA, MVT::i32, Custom);
-    setOperationAction(ISD::SRL, MVT::i32, Custom);
+    setOperationAction(ISD::EH_DWARF_CFA, MVT::i64, Custom);
 
-    setOperationAction(ISD::UADDO, MVT::i32, Custom);
-    setOperationAction(ISD::USUBO, MVT::i32, Custom);
-    setOperationAction(ISD::UADDSAT, MVT::i32, Custom);
-    setOperationAction(ISD::USUBSAT, MVT::i32, Custom);
+    setOperationAction(ISD::LOAD, MVT::i32, Custom);
+
+    setOperationAction({ISD::ADD, ISD::SUB, ISD::SHL, ISD::SRA, ISD::SRL},
+                       MVT::i32, Custom);
+
+    setOperationAction({ISD::UADDO, ISD::USUBO, ISD::UADDSAT, ISD::USUBSAT},
+                       MVT::i32, Custom);
+  } else {
+    setLibcallName(
+        {RTLIB::SHL_I128, RTLIB::SRL_I128, RTLIB::SRA_I128, RTLIB::MUL_I128},
+        nullptr);
+    setLibcallName(RTLIB::MULO_I64, nullptr);
   }
 
-  if (!Subtarget.hasStdExtM()) {
-    setOperationAction(ISD::MUL, XLenVT, Expand);
-    setOperationAction(ISD::MULHS, XLenVT, Expand);
-    setOperationAction(ISD::MULHU, XLenVT, Expand);
-    setOperationAction(ISD::SDIV, XLenVT, Expand);
-    setOperationAction(ISD::UDIV, XLenVT, Expand);
-    setOperationAction(ISD::SREM, XLenVT, Expand);
-    setOperationAction(ISD::UREM, XLenVT, Expand);
+  if (!Subtarget.hasStdExtM() && !Subtarget.hasStdExtZmmul()) {
+    setOperationAction({ISD::MUL, ISD::MULHS, ISD::MULHU}, XLenVT, Expand);
   } else {
     if (Subtarget.is64Bit()) {
-      setOperationAction(ISD::MUL, MVT::i32, Custom);
-      setOperationAction(ISD::MUL, MVT::i128, Custom);
-
-      setOperationAction(ISD::SDIV, MVT::i8, Custom);
-      setOperationAction(ISD::UDIV, MVT::i8, Custom);
-      setOperationAction(ISD::UREM, MVT::i8, Custom);
-      setOperationAction(ISD::SDIV, MVT::i16, Custom);
-      setOperationAction(ISD::UDIV, MVT::i16, Custom);
-      setOperationAction(ISD::UREM, MVT::i16, Custom);
-      setOperationAction(ISD::SDIV, MVT::i32, Custom);
-      setOperationAction(ISD::UDIV, MVT::i32, Custom);
-      setOperationAction(ISD::UREM, MVT::i32, Custom);
+      setOperationAction(ISD::MUL, {MVT::i32, MVT::i128}, Custom);
     } else {
       setOperationAction(ISD::MUL, MVT::i64, Custom);
     }
   }
 
-  setOperationAction(ISD::SDIVREM, XLenVT, Expand);
-  setOperationAction(ISD::UDIVREM, XLenVT, Expand);
-  setOperationAction(ISD::SMUL_LOHI, XLenVT, Expand);
-  setOperationAction(ISD::UMUL_LOHI, XLenVT, Expand);
-
-  setOperationAction(ISD::SHL_PARTS, XLenVT, Custom);
-  setOperationAction(ISD::SRL_PARTS, XLenVT, Custom);
-  setOperationAction(ISD::SRA_PARTS, XLenVT, Custom);
-
-  if (Subtarget.hasStdExtZbb() || Subtarget.hasStdExtZbp()) {
+  if (!Subtarget.hasStdExtM()) {
+    setOperationAction({ISD::SDIV, ISD::UDIV, ISD::SREM, ISD::UREM},
+                       XLenVT, Expand);
+  } else {
     if (Subtarget.is64Bit()) {
-      setOperationAction(ISD::ROTL, MVT::i32, Custom);
-      setOperationAction(ISD::ROTR, MVT::i32, Custom);
+      setOperationAction({ISD::SDIV, ISD::UDIV, ISD::UREM},
+                          {MVT::i8, MVT::i16, MVT::i32}, Custom);
     }
-  } else {
-    setOperationAction(ISD::ROTL, XLenVT, Expand);
-    setOperationAction(ISD::ROTR, XLenVT, Expand);
   }
 
-  if (Subtarget.hasStdExtZbp()) {
-    // Custom lower bswap/bitreverse so we can convert them to GREVI to enable
-    // more combining.
-    setOperationAction(ISD::BITREVERSE, XLenVT,   Custom);
-    setOperationAction(ISD::BSWAP,      XLenVT,   Custom);
-    setOperationAction(ISD::BITREVERSE, MVT::i8,  Custom);
-    // BSWAP i8 doesn't exist.
-    setOperationAction(ISD::BITREVERSE, MVT::i16, Custom);
-    setOperationAction(ISD::BSWAP,      MVT::i16, Custom);
+  setOperationAction(
+      {ISD::SDIVREM, ISD::UDIVREM, ISD::SMUL_LOHI, ISD::UMUL_LOHI}, XLenVT,
+      Expand);
 
-    if (Subtarget.is64Bit()) {
-      setOperationAction(ISD::BITREVERSE, MVT::i32, Custom);
-      setOperationAction(ISD::BSWAP,      MVT::i32, Custom);
-    }
+  setOperationAction({ISD::SHL_PARTS, ISD::SRL_PARTS, ISD::SRA_PARTS}, XLenVT,
+                     Custom);
+
+  if (Subtarget.hasStdExtZbb() || Subtarget.hasStdExtZbkb()) {
+    if (Subtarget.is64Bit())
+      setOperationAction({ISD::ROTL, ISD::ROTR}, MVT::i32, Custom);
   } else {
-    // With Zbb we have an XLen rev8 instruction, but not GREVI. So we'll
-    // pattern match it directly in isel.
-    setOperationAction(ISD::BSWAP, XLenVT,
-                       Subtarget.hasStdExtZbb() ? Legal : Expand);
+    setOperationAction({ISD::ROTL, ISD::ROTR}, XLenVT, Expand);
   }
 
+  // With Zbb we have an XLen rev8 instruction, but not GREVI. So we'll
+  // pattern match it directly in isel.
+  setOperationAction(ISD::BSWAP, XLenVT,
+                     (Subtarget.hasStdExtZbb() || Subtarget.hasStdExtZbkb())
+                         ? Legal
+                         : Expand);
+  // Zbkb can use rev8+brev8 to implement bitreverse.
+  setOperationAction(ISD::BITREVERSE, XLenVT,
+                     Subtarget.hasStdExtZbkb() ? Custom : Expand);
+
   if (Subtarget.hasStdExtZbb()) {
-    setOperationAction(ISD::SMIN, XLenVT, Legal);
-    setOperationAction(ISD::SMAX, XLenVT, Legal);
-    setOperationAction(ISD::UMIN, XLenVT, Legal);
-    setOperationAction(ISD::UMAX, XLenVT, Legal);
+    setOperationAction({ISD::SMIN, ISD::SMAX, ISD::UMIN, ISD::UMAX}, XLenVT,
+                       Legal);
 
-    if (Subtarget.is64Bit()) {
-      setOperationAction(ISD::CTTZ, MVT::i32, Custom);
-      setOperationAction(ISD::CTTZ_ZERO_UNDEF, MVT::i32, Custom);
-      setOperationAction(ISD::CTLZ, MVT::i32, Custom);
-      setOperationAction(ISD::CTLZ_ZERO_UNDEF, MVT::i32, Custom);
-    }
+    if (Subtarget.is64Bit())
+      setOperationAction(
+          {ISD::CTTZ, ISD::CTTZ_ZERO_UNDEF, ISD::CTLZ, ISD::CTLZ_ZERO_UNDEF},
+          MVT::i32, Custom);
   } else {
-    setOperationAction(ISD::CTTZ, XLenVT, Expand);
-    setOperationAction(ISD::CTLZ, XLenVT, Expand);
-    setOperationAction(ISD::CTPOP, XLenVT, Expand);
+    setOperationAction({ISD::CTTZ, ISD::CTLZ, ISD::CTPOP}, XLenVT, Expand);
   }
 
-  if (Subtarget.hasStdExtZbt()) {
-    setOperationAction(ISD::FSHL, XLenVT, Custom);
-    setOperationAction(ISD::FSHR, XLenVT, Custom);
-    setOperationAction(ISD::SELECT, XLenVT, Legal);
+  if (Subtarget.is64Bit())
+    setOperationAction(ISD::ABS, MVT::i32, Custom);
 
-    if (Subtarget.is64Bit()) {
-      setOperationAction(ISD::FSHL, MVT::i32, Custom);
-      setOperationAction(ISD::FSHR, MVT::i32, Custom);
-    }
-  } else {
+  if (!Subtarget.hasVendorXVentanaCondOps())
     setOperationAction(ISD::SELECT, XLenVT, Custom);
-  }
 
-  ISD::CondCode FPCCToExpand[] = {
+  static const unsigned FPLegalNodeTypes[] = {
+      ISD::FMINNUM,        ISD::FMAXNUM,       ISD::LRINT,
+      ISD::LLRINT,         ISD::LROUND,        ISD::LLROUND,
+      ISD::STRICT_LRINT,   ISD::STRICT_LLRINT, ISD::STRICT_LROUND,
+      ISD::STRICT_LLROUND, ISD::STRICT_FMA,    ISD::STRICT_FADD,
+      ISD::STRICT_FSUB,    ISD::STRICT_FMUL,   ISD::STRICT_FDIV,
+      ISD::STRICT_FSQRT,   ISD::STRICT_FSETCC, ISD::STRICT_FSETCCS};
+
+  static const ISD::CondCode FPCCToExpand[] = {
       ISD::SETOGT, ISD::SETOGE, ISD::SETONE, ISD::SETUEQ, ISD::SETUGT,
       ISD::SETUGE, ISD::SETULT, ISD::SETULE, ISD::SETUNE, ISD::SETGT,
       ISD::SETGE,  ISD::SETNE,  ISD::SETO,   ISD::SETUO};
 
-  ISD::NodeType FPOpToExpand[] = {
-      ISD::FSIN, ISD::FCOS, ISD::FSINCOS, ISD::FPOW, ISD::FREM, ISD::FP16_TO_FP,
-      ISD::FP_TO_FP16};
+  static const unsigned FPOpToExpand[] = {
+      ISD::FSIN, ISD::FCOS,       ISD::FSINCOS,   ISD::FPOW,
+      ISD::FREM, ISD::FP16_TO_FP, ISD::FP_TO_FP16};
+
+  static const unsigned FPRndMode[] = {
+      ISD::FCEIL, ISD::FFLOOR, ISD::FTRUNC, ISD::FRINT, ISD::FROUND,
+      ISD::FROUNDEVEN};
 
-  if (Subtarget.hasStdExtZfh())
+  if (Subtarget.hasStdExtZfhOrZfhmin())
     setOperationAction(ISD::BITCAST, MVT::i16, Custom);
 
-  if (Subtarget.hasStdExtZfh()) {
-    setOperationAction(ISD::FMINNUM, MVT::f16, Legal);
-    setOperationAction(ISD::FMAXNUM, MVT::f16, Legal);
-    setOperationAction(ISD::LRINT, MVT::f16, Legal);
-    setOperationAction(ISD::LLRINT, MVT::f16, Legal);
-    setOperationAction(ISD::LROUND, MVT::f16, Legal);
-    setOperationAction(ISD::LLROUND, MVT::f16, Legal);
-    for (auto CC : FPCCToExpand)
-      setCondCodeAction(CC, MVT::f16, Expand);
+  if (Subtarget.hasStdExtZfhOrZfhmin()) {
+    if (Subtarget.hasStdExtZfh()) {
+      setOperationAction(FPLegalNodeTypes, MVT::f16, Legal);
+      setOperationAction(FPRndMode, MVT::f16, Custom);
+      setOperationAction(ISD::SELECT, MVT::f16, Custom);
+    } else {
+      static const unsigned ZfhminPromoteOps[] = {
+          ISD::FMINNUM,      ISD::FMAXNUM,       ISD::FADD,
+          ISD::FSUB,         ISD::FMUL,          ISD::FMA,
+          ISD::FDIV,         ISD::FSQRT,         ISD::FABS,
+          ISD::FNEG,         ISD::STRICT_FMA,    ISD::STRICT_FADD,
+          ISD::STRICT_FSUB,  ISD::STRICT_FMUL,   ISD::STRICT_FDIV,
+          ISD::STRICT_FSQRT, ISD::STRICT_FSETCC, ISD::STRICT_FSETCCS,
+          ISD::SETCC,        ISD::FCEIL,         ISD::FFLOOR,
+          ISD::FTRUNC,       ISD::FRINT,         ISD::FROUND,
+          ISD::FROUNDEVEN,   ISD::SELECT};
+
+      setOperationAction(ZfhminPromoteOps, MVT::f16, Promote);
+      setOperationAction({ISD::STRICT_LRINT, ISD::STRICT_LLRINT,
+                          ISD::STRICT_LROUND, ISD::STRICT_LLROUND},
+                         MVT::f16, Legal);
+      // FIXME: Need to promote f16 FCOPYSIGN to f32, but the
+      // DAGCombiner::visitFP_ROUND probably needs improvements first.
+      setOperationAction(ISD::FCOPYSIGN, MVT::f16, Expand);
+    }
+
+    setOperationAction(ISD::STRICT_FP_ROUND, MVT::f16, Legal);
+    setOperationAction(ISD::STRICT_FP_EXTEND, MVT::f32, Legal);
+    setCondCodeAction(FPCCToExpand, MVT::f16, Expand);
     setOperationAction(ISD::SELECT_CC, MVT::f16, Expand);
-    setOperationAction(ISD::SELECT, MVT::f16, Custom);
     setOperationAction(ISD::BR_CC, MVT::f16, Expand);
-    for (auto Op : FPOpToExpand)
-      setOperationAction(Op, MVT::f16, Expand);
+
+    setOperationAction({ISD::FREM, ISD::FNEARBYINT, ISD::FPOW, ISD::FPOWI,
+                        ISD::FCOS, ISD::FSIN, ISD::FSINCOS, ISD::FEXP,
+                        ISD::FEXP2, ISD::FLOG, ISD::FLOG2, ISD::FLOG10},
+                       MVT::f16, Promote);
+
+    // FIXME: Need to promote f16 STRICT_* to f32 libcalls, but we don't have
+    // complete support for all operations in LegalizeDAG.
+    setOperationAction({ISD::STRICT_FCEIL, ISD::STRICT_FFLOOR,
+                        ISD::STRICT_FNEARBYINT, ISD::STRICT_FRINT,
+                        ISD::STRICT_FROUND, ISD::STRICT_FROUNDEVEN,
+                        ISD::STRICT_FTRUNC},
+                       MVT::f16, Promote);
+
+    // We need to custom promote this.
+    if (Subtarget.is64Bit())
+      setOperationAction(ISD::FPOWI, MVT::i32, Custom);
   }
 
   if (Subtarget.hasStdExtF()) {
-    setOperationAction(ISD::FMINNUM, MVT::f32, Legal);
-    setOperationAction(ISD::FMAXNUM, MVT::f32, Legal);
-    setOperationAction(ISD::LRINT, MVT::f32, Legal);
-    setOperationAction(ISD::LLRINT, MVT::f32, Legal);
-    setOperationAction(ISD::LROUND, MVT::f32, Legal);
-    setOperationAction(ISD::LLROUND, MVT::f32, Legal);
-    for (auto CC : FPCCToExpand)
-      setCondCodeAction(CC, MVT::f32, Expand);
+    setOperationAction(FPLegalNodeTypes, MVT::f32, Legal);
+    setOperationAction(FPRndMode, MVT::f32, Custom);
+    setCondCodeAction(FPCCToExpand, MVT::f32, Expand);
     setOperationAction(ISD::SELECT_CC, MVT::f32, Expand);
     setOperationAction(ISD::SELECT, MVT::f32, Custom);
     setOperationAction(ISD::BR_CC, MVT::f32, Expand);
-    for (auto Op : FPOpToExpand)
-      setOperationAction(Op, MVT::f32, Expand);
+    setOperationAction(FPOpToExpand, MVT::f32, Expand);
     setLoadExtAction(ISD::EXTLOAD, MVT::f32, MVT::f16, Expand);
     setTruncStoreAction(MVT::f32, MVT::f16, Expand);
   }
@@ -349,51 +399,55 @@ RISCVTargetLowering::RISCVTargetLowering(const TargetMachine &TM,
     setOperationAction(ISD::BITCAST, MVT::i32, Custom);
 
   if (Subtarget.hasStdExtD()) {
-    setOperationAction(ISD::FMINNUM, MVT::f64, Legal);
-    setOperationAction(ISD::FMAXNUM, MVT::f64, Legal);
-    setOperationAction(ISD::LRINT, MVT::f64, Legal);
-    setOperationAction(ISD::LLRINT, MVT::f64, Legal);
-    setOperationAction(ISD::LROUND, MVT::f64, Legal);
-    setOperationAction(ISD::LLROUND, MVT::f64, Legal);
-    for (auto CC : FPCCToExpand)
-      setCondCodeAction(CC, MVT::f64, Expand);
+    setOperationAction(FPLegalNodeTypes, MVT::f64, Legal);
+    if (Subtarget.is64Bit()) {
+      setOperationAction(FPRndMode, MVT::f64, Custom);
+    }
+    setOperationAction(ISD::STRICT_FP_ROUND, MVT::f32, Legal);
+    setOperationAction(ISD::STRICT_FP_EXTEND, MVT::f64, Legal);
+    setCondCodeAction(FPCCToExpand, MVT::f64, Expand);
     setOperationAction(ISD::SELECT_CC, MVT::f64, Expand);
     setOperationAction(ISD::SELECT, MVT::f64, Custom);
     setOperationAction(ISD::BR_CC, MVT::f64, Expand);
     setLoadExtAction(ISD::EXTLOAD, MVT::f64, MVT::f32, Expand);
     setTruncStoreAction(MVT::f64, MVT::f32, Expand);
-    for (auto Op : FPOpToExpand)
-      setOperationAction(Op, MVT::f64, Expand);
+    setOperationAction(FPOpToExpand, MVT::f64, Expand);
     setLoadExtAction(ISD::EXTLOAD, MVT::f64, MVT::f16, Expand);
     setTruncStoreAction(MVT::f64, MVT::f16, Expand);
   }
 
-  if (Subtarget.is64Bit()) {
-    setOperationAction(ISD::FP_TO_UINT, MVT::i32, Custom);
-    setOperationAction(ISD::FP_TO_SINT, MVT::i32, Custom);
-    setOperationAction(ISD::STRICT_FP_TO_UINT, MVT::i32, Custom);
-    setOperationAction(ISD::STRICT_FP_TO_SINT, MVT::i32, Custom);
-  }
+  if (Subtarget.is64Bit())
+    setOperationAction({ISD::FP_TO_UINT, ISD::FP_TO_SINT,
+                        ISD::STRICT_FP_TO_UINT, ISD::STRICT_FP_TO_SINT},
+                       MVT::i32, Custom);
 
   if (Subtarget.hasStdExtF()) {
-    setOperationAction(ISD::FLT_ROUNDS_, XLenVT, Custom);
+    setOperationAction({ISD::FP_TO_UINT_SAT, ISD::FP_TO_SINT_SAT}, XLenVT,
+                       Custom);
+
+    setOperationAction({ISD::STRICT_FP_TO_UINT, ISD::STRICT_FP_TO_SINT,
+                        ISD::STRICT_UINT_TO_FP, ISD::STRICT_SINT_TO_FP},
+                       XLenVT, Legal);
+
+    setOperationAction(ISD::GET_ROUNDING, XLenVT, Custom);
     setOperationAction(ISD::SET_ROUNDING, MVT::Other, Custom);
   }
 
-  setOperationAction(ISD::GlobalAddress, XLenVT, Custom);
-  setOperationAction(ISD::BlockAddress, XLenVT, Custom);
-  setOperationAction(ISD::ConstantPool, XLenVT, Custom);
-  setOperationAction(ISD::JumpTable, XLenVT, Custom);
+  setOperationAction({ISD::GlobalAddress, ISD::BlockAddress, ISD::ConstantPool,
+                      ISD::JumpTable},
+                     XLenVT, Custom);
 
   setOperationAction(ISD::GlobalTLSAddress, XLenVT, Custom);
 
+  if (Subtarget.is64Bit())
+    setOperationAction(ISD::Constant, MVT::i64, Custom);
+
   // TODO: On M-mode only targets, the cycle[h] CSR may not be present.
   // Unfortunately this can't be determined just from the ISA naming string.
   setOperationAction(ISD::READCYCLECOUNTER, MVT::i64,
                      Subtarget.is64Bit() ? Legal : Custom);
 
-  setOperationAction(ISD::TRAP, MVT::Other, Legal);
-  setOperationAction(ISD::DEBUGTRAP, MVT::Other, Legal);
+  setOperationAction({ISD::TRAP, ISD::DEBUGTRAP}, MVT::Other, Legal);
   setOperationAction(ISD::INTRINSIC_WO_CHAIN, MVT::Other, Custom);
   if (Subtarget.is64Bit())
     setOperationAction(ISD::INTRINSIC_WO_CHAIN, MVT::i32, Custom);
@@ -401,171 +455,235 @@ RISCVTargetLowering::RISCVTargetLowering(const TargetMachine &TM,
   if (Subtarget.hasStdExtA()) {
     setMaxAtomicSizeInBitsSupported(Subtarget.getXLen());
     setMinCmpXchgSizeInBits(32);
+  } else if (Subtarget.hasForcedAtomics()) {
+    setMaxAtomicSizeInBitsSupported(Subtarget.getXLen());
   } else {
     setMaxAtomicSizeInBitsSupported(0);
   }
 
+  setOperationAction(ISD::ATOMIC_FENCE, MVT::Other, Custom);
+
   setBooleanContents(ZeroOrOneBooleanContent);
 
-  if (Subtarget.hasStdExtV()) {
+  if (Subtarget.hasVInstructions()) {
     setBooleanVectorContents(ZeroOrOneBooleanContent);
 
     setOperationAction(ISD::VSCALE, XLenVT, Custom);
 
     // RVV intrinsics may have illegal operands.
     // We also need to custom legalize vmv.x.s.
-    setOperationAction(ISD::INTRINSIC_WO_CHAIN, MVT::i8, Custom);
-    setOperationAction(ISD::INTRINSIC_WO_CHAIN, MVT::i16, Custom);
-    setOperationAction(ISD::INTRINSIC_W_CHAIN, MVT::i8, Custom);
-    setOperationAction(ISD::INTRINSIC_W_CHAIN, MVT::i16, Custom);
-    if (Subtarget.is64Bit()) {
+    setOperationAction({ISD::INTRINSIC_WO_CHAIN, ISD::INTRINSIC_W_CHAIN},
+                       {MVT::i8, MVT::i16}, Custom);
+    if (Subtarget.is64Bit())
       setOperationAction(ISD::INTRINSIC_W_CHAIN, MVT::i32, Custom);
-    } else {
-      setOperationAction(ISD::INTRINSIC_WO_CHAIN, MVT::i64, Custom);
-      setOperationAction(ISD::INTRINSIC_W_CHAIN, MVT::i64, Custom);
-    }
-
-    setOperationAction(ISD::INTRINSIC_W_CHAIN, MVT::Other, Custom);
-
-    static unsigned IntegerVPOps[] = {
-        ISD::VP_ADD,  ISD::VP_SUB,  ISD::VP_MUL, ISD::VP_SDIV, ISD::VP_UDIV,
-        ISD::VP_SREM, ISD::VP_UREM, ISD::VP_AND, ISD::VP_OR,   ISD::VP_XOR,
-        ISD::VP_ASHR, ISD::VP_LSHR, ISD::VP_SHL};
-
-    static unsigned FloatingPointVPOps[] = {ISD::VP_FADD, ISD::VP_FSUB,
-                                            ISD::VP_FMUL, ISD::VP_FDIV};
+    else
+      setOperationAction({ISD::INTRINSIC_WO_CHAIN, ISD::INTRINSIC_W_CHAIN},
+                         MVT::i64, Custom);
+
+    setOperationAction({ISD::INTRINSIC_W_CHAIN, ISD::INTRINSIC_VOID},
+                       MVT::Other, Custom);
+
+    static const unsigned IntegerVPOps[] = {
+        ISD::VP_ADD,         ISD::VP_SUB,         ISD::VP_MUL,
+        ISD::VP_SDIV,        ISD::VP_UDIV,        ISD::VP_SREM,
+        ISD::VP_UREM,        ISD::VP_AND,         ISD::VP_OR,
+        ISD::VP_XOR,         ISD::VP_ASHR,        ISD::VP_LSHR,
+        ISD::VP_SHL,         ISD::VP_REDUCE_ADD,  ISD::VP_REDUCE_AND,
+        ISD::VP_REDUCE_OR,   ISD::VP_REDUCE_XOR,  ISD::VP_REDUCE_SMAX,
+        ISD::VP_REDUCE_SMIN, ISD::VP_REDUCE_UMAX, ISD::VP_REDUCE_UMIN,
+        ISD::VP_MERGE,       ISD::VP_SELECT,      ISD::VP_FP_TO_SINT,
+        ISD::VP_FP_TO_UINT,  ISD::VP_SETCC,       ISD::VP_SIGN_EXTEND,
+        ISD::VP_ZERO_EXTEND, ISD::VP_TRUNCATE,    ISD::VP_SMIN,
+        ISD::VP_SMAX,        ISD::VP_UMIN,        ISD::VP_UMAX,
+        ISD::VP_ABS};
+
+    static const unsigned FloatingPointVPOps[] = {
+        ISD::VP_FADD,        ISD::VP_FSUB,        ISD::VP_FMUL,
+        ISD::VP_FDIV,        ISD::VP_FNEG,        ISD::VP_FABS,
+        ISD::VP_FMA,         ISD::VP_REDUCE_FADD, ISD::VP_REDUCE_SEQ_FADD,
+        ISD::VP_REDUCE_FMIN, ISD::VP_REDUCE_FMAX, ISD::VP_MERGE,
+        ISD::VP_SELECT,      ISD::VP_SINT_TO_FP,  ISD::VP_UINT_TO_FP,
+        ISD::VP_SETCC,       ISD::VP_FP_ROUND,    ISD::VP_FP_EXTEND,
+        ISD::VP_SQRT,        ISD::VP_FMINNUM,     ISD::VP_FMAXNUM,
+        ISD::VP_FCEIL,       ISD::VP_FFLOOR,      ISD::VP_FROUND,
+        ISD::VP_FROUNDEVEN,  ISD::VP_FCOPYSIGN,   ISD::VP_FROUNDTOZERO,
+        ISD::VP_FRINT,       ISD::VP_FNEARBYINT};
+
+    static const unsigned IntegerVecReduceOps[] = {
+        ISD::VECREDUCE_ADD,  ISD::VECREDUCE_AND,  ISD::VECREDUCE_OR,
+        ISD::VECREDUCE_XOR,  ISD::VECREDUCE_SMAX, ISD::VECREDUCE_SMIN,
+        ISD::VECREDUCE_UMAX, ISD::VECREDUCE_UMIN};
+
+    static const unsigned FloatingPointVecReduceOps[] = {
+        ISD::VECREDUCE_FADD, ISD::VECREDUCE_SEQ_FADD, ISD::VECREDUCE_FMIN,
+        ISD::VECREDUCE_FMAX};
 
     if (!Subtarget.is64Bit()) {
       // We must custom-lower certain vXi64 operations on RV32 due to the vector
       // element type being illegal.
-      setOperationAction(ISD::INSERT_VECTOR_ELT, MVT::i64, Custom);
-      setOperationAction(ISD::EXTRACT_VECTOR_ELT, MVT::i64, Custom);
+      setOperationAction({ISD::INSERT_VECTOR_ELT, ISD::EXTRACT_VECTOR_ELT},
+                         MVT::i64, Custom);
 
-      setOperationAction(ISD::VECREDUCE_ADD, MVT::i64, Custom);
-      setOperationAction(ISD::VECREDUCE_AND, MVT::i64, Custom);
-      setOperationAction(ISD::VECREDUCE_OR, MVT::i64, Custom);
-      setOperationAction(ISD::VECREDUCE_XOR, MVT::i64, Custom);
-      setOperationAction(ISD::VECREDUCE_SMAX, MVT::i64, Custom);
-      setOperationAction(ISD::VECREDUCE_SMIN, MVT::i64, Custom);
-      setOperationAction(ISD::VECREDUCE_UMAX, MVT::i64, Custom);
-      setOperationAction(ISD::VECREDUCE_UMIN, MVT::i64, Custom);
+      setOperationAction(IntegerVecReduceOps, MVT::i64, Custom);
+
+      setOperationAction({ISD::VP_REDUCE_ADD, ISD::VP_REDUCE_AND,
+                          ISD::VP_REDUCE_OR, ISD::VP_REDUCE_XOR,
+                          ISD::VP_REDUCE_SMAX, ISD::VP_REDUCE_SMIN,
+                          ISD::VP_REDUCE_UMAX, ISD::VP_REDUCE_UMIN},
+                         MVT::i64, Custom);
     }
 
     for (MVT VT : BoolVecVTs) {
+      if (!isTypeLegal(VT))
+        continue;
+
       setOperationAction(ISD::SPLAT_VECTOR, VT, Custom);
 
       // Mask VTs are custom-expanded into a series of standard nodes
-      setOperationAction(ISD::TRUNCATE, VT, Custom);
-      setOperationAction(ISD::CONCAT_VECTORS, VT, Custom);
-      setOperationAction(ISD::INSERT_SUBVECTOR, VT, Custom);
-      setOperationAction(ISD::EXTRACT_SUBVECTOR, VT, Custom);
+      setOperationAction({ISD::TRUNCATE, ISD::CONCAT_VECTORS,
+                          ISD::INSERT_SUBVECTOR, ISD::EXTRACT_SUBVECTOR},
+                         VT, Custom);
 
-      setOperationAction(ISD::INSERT_VECTOR_ELT, VT, Custom);
-      setOperationAction(ISD::EXTRACT_VECTOR_ELT, VT, Custom);
+      setOperationAction({ISD::INSERT_VECTOR_ELT, ISD::EXTRACT_VECTOR_ELT}, VT,
+                         Custom);
 
       setOperationAction(ISD::SELECT, VT, Custom);
-      setOperationAction(ISD::SELECT_CC, VT, Expand);
-      setOperationAction(ISD::VSELECT, VT, Expand);
+      setOperationAction(
+          {ISD::SELECT_CC, ISD::VSELECT, ISD::VP_MERGE, ISD::VP_SELECT}, VT,
+          Expand);
+
+      setOperationAction({ISD::VP_AND, ISD::VP_OR, ISD::VP_XOR}, VT, Custom);
 
-      setOperationAction(ISD::VECREDUCE_AND, VT, Custom);
-      setOperationAction(ISD::VECREDUCE_OR, VT, Custom);
-      setOperationAction(ISD::VECREDUCE_XOR, VT, Custom);
+      setOperationAction(
+          {ISD::VECREDUCE_AND, ISD::VECREDUCE_OR, ISD::VECREDUCE_XOR}, VT,
+          Custom);
+
+      setOperationAction(
+          {ISD::VP_REDUCE_AND, ISD::VP_REDUCE_OR, ISD::VP_REDUCE_XOR}, VT,
+          Custom);
 
       // RVV has native int->float & float->int conversions where the
       // element type sizes are within one power-of-two of each other. Any
       // wider distances between type sizes have to be lowered as sequences
       // which progressively narrow the gap in stages.
-      setOperationAction(ISD::SINT_TO_FP, VT, Custom);
-      setOperationAction(ISD::UINT_TO_FP, VT, Custom);
-      setOperationAction(ISD::FP_TO_SINT, VT, Custom);
-      setOperationAction(ISD::FP_TO_UINT, VT, Custom);
+      setOperationAction(
+          {ISD::SINT_TO_FP, ISD::UINT_TO_FP, ISD::FP_TO_SINT, ISD::FP_TO_UINT},
+          VT, Custom);
+      setOperationAction({ISD::FP_TO_SINT_SAT, ISD::FP_TO_UINT_SAT}, VT,
+                         Custom);
 
       // Expand all extending loads to types larger than this, and truncating
       // stores from types larger than this.
       for (MVT OtherVT : MVT::integer_scalable_vector_valuetypes()) {
         setTruncStoreAction(OtherVT, VT, Expand);
-        setLoadExtAction(ISD::EXTLOAD, OtherVT, VT, Expand);
-        setLoadExtAction(ISD::SEXTLOAD, OtherVT, VT, Expand);
-        setLoadExtAction(ISD::ZEXTLOAD, OtherVT, VT, Expand);
+        setLoadExtAction({ISD::EXTLOAD, ISD::SEXTLOAD, ISD::ZEXTLOAD}, OtherVT,
+                         VT, Expand);
       }
+
+      setOperationAction({ISD::VP_FP_TO_SINT, ISD::VP_FP_TO_UINT,
+                          ISD::VP_TRUNCATE, ISD::VP_SETCC},
+                         VT, Custom);
+      setOperationAction(ISD::VECTOR_REVERSE, VT, Custom);
+
+      setOperationPromotedToType(
+          ISD::VECTOR_SPLICE, VT,
+          MVT::getVectorVT(MVT::i8, VT.getVectorElementCount()));
     }
 
     for (MVT VT : IntVecVTs) {
+      if (!isTypeLegal(VT))
+        continue;
+
       setOperationAction(ISD::SPLAT_VECTOR, VT, Legal);
       setOperationAction(ISD::SPLAT_VECTOR_PARTS, VT, Custom);
 
-      setOperationAction(ISD::SMIN, VT, Legal);
-      setOperationAction(ISD::SMAX, VT, Legal);
-      setOperationAction(ISD::UMIN, VT, Legal);
-      setOperationAction(ISD::UMAX, VT, Legal);
+      // Vectors implement MULHS/MULHU.
+      setOperationAction({ISD::SMUL_LOHI, ISD::UMUL_LOHI}, VT, Expand);
 
-      setOperationAction(ISD::ROTL, VT, Expand);
-      setOperationAction(ISD::ROTR, VT, Expand);
+      // nxvXi64 MULHS/MULHU requires the V extension instead of Zve64*.
+      if (VT.getVectorElementType() == MVT::i64 && !Subtarget.hasStdExtV())
+        setOperationAction({ISD::MULHU, ISD::MULHS}, VT, Expand);
+
+      setOperationAction({ISD::SMIN, ISD::SMAX, ISD::UMIN, ISD::UMAX}, VT,
+                         Legal);
+
+      setOperationAction({ISD::ROTL, ISD::ROTR}, VT, Expand);
+
+      setOperationAction({ISD::CTTZ, ISD::CTLZ, ISD::CTPOP}, VT, Expand);
+
+      setOperationAction(ISD::BSWAP, VT, Expand);
+      setOperationAction({ISD::VP_BSWAP, ISD::VP_BITREVERSE}, VT, Expand);
+      setOperationAction({ISD::VP_FSHL, ISD::VP_FSHR}, VT, Expand);
+      setOperationAction({ISD::VP_CTLZ, ISD::VP_CTLZ_ZERO_UNDEF, ISD::VP_CTTZ,
+                          ISD::VP_CTTZ_ZERO_UNDEF, ISD::VP_CTPOP},
+                         VT, Expand);
 
       // Custom-lower extensions and truncations from/to mask types.
-      setOperationAction(ISD::ANY_EXTEND, VT, Custom);
-      setOperationAction(ISD::SIGN_EXTEND, VT, Custom);
-      setOperationAction(ISD::ZERO_EXTEND, VT, Custom);
+      setOperationAction({ISD::ANY_EXTEND, ISD::SIGN_EXTEND, ISD::ZERO_EXTEND},
+                         VT, Custom);
 
       // RVV has native int->float & float->int conversions where the
       // element type sizes are within one power-of-two of each other. Any
       // wider distances between type sizes have to be lowered as sequences
       // which progressively narrow the gap in stages.
-      setOperationAction(ISD::SINT_TO_FP, VT, Custom);
-      setOperationAction(ISD::UINT_TO_FP, VT, Custom);
-      setOperationAction(ISD::FP_TO_SINT, VT, Custom);
-      setOperationAction(ISD::FP_TO_UINT, VT, Custom);
+      setOperationAction(
+          {ISD::SINT_TO_FP, ISD::UINT_TO_FP, ISD::FP_TO_SINT, ISD::FP_TO_UINT},
+          VT, Custom);
+      setOperationAction({ISD::FP_TO_SINT_SAT, ISD::FP_TO_UINT_SAT}, VT,
+                         Custom);
 
-      setOperationAction(ISD::SADDSAT, VT, Legal);
-      setOperationAction(ISD::UADDSAT, VT, Legal);
-      setOperationAction(ISD::SSUBSAT, VT, Legal);
-      setOperationAction(ISD::USUBSAT, VT, Legal);
+      setOperationAction(
+          {ISD::SADDSAT, ISD::UADDSAT, ISD::SSUBSAT, ISD::USUBSAT}, VT, Legal);
 
       // Integer VTs are lowered as a series of "RISCVISD::TRUNCATE_VECTOR_VL"
       // nodes which truncate by one power of two at a time.
       setOperationAction(ISD::TRUNCATE, VT, Custom);
 
       // Custom-lower insert/extract operations to simplify patterns.
-      setOperationAction(ISD::INSERT_VECTOR_ELT, VT, Custom);
-      setOperationAction(ISD::EXTRACT_VECTOR_ELT, VT, Custom);
+      setOperationAction({ISD::INSERT_VECTOR_ELT, ISD::EXTRACT_VECTOR_ELT}, VT,
+                         Custom);
 
       // Custom-lower reduction operations to set up the corresponding custom
       // nodes' operands.
-      setOperationAction(ISD::VECREDUCE_ADD, VT, Custom);
-      setOperationAction(ISD::VECREDUCE_AND, VT, Custom);
-      setOperationAction(ISD::VECREDUCE_OR, VT, Custom);
-      setOperationAction(ISD::VECREDUCE_XOR, VT, Custom);
-      setOperationAction(ISD::VECREDUCE_SMAX, VT, Custom);
-      setOperationAction(ISD::VECREDUCE_SMIN, VT, Custom);
-      setOperationAction(ISD::VECREDUCE_UMAX, VT, Custom);
-      setOperationAction(ISD::VECREDUCE_UMIN, VT, Custom);
-
-      for (unsigned VPOpc : IntegerVPOps)
-        setOperationAction(VPOpc, VT, Custom);
-
-      setOperationAction(ISD::LOAD, VT, Custom);
-      setOperationAction(ISD::STORE, VT, Custom);
-
-      setOperationAction(ISD::MLOAD, VT, Custom);
-      setOperationAction(ISD::MSTORE, VT, Custom);
-      setOperationAction(ISD::MGATHER, VT, Custom);
-      setOperationAction(ISD::MSCATTER, VT, Custom);
-
-      setOperationAction(ISD::CONCAT_VECTORS, VT, Custom);
-      setOperationAction(ISD::INSERT_SUBVECTOR, VT, Custom);
-      setOperationAction(ISD::EXTRACT_SUBVECTOR, VT, Custom);
+      setOperationAction(IntegerVecReduceOps, VT, Custom);
+
+      setOperationAction(IntegerVPOps, VT, Custom);
+
+      setOperationAction({ISD::LOAD, ISD::STORE}, VT, Custom);
+
+      setOperationAction({ISD::MLOAD, ISD::MSTORE, ISD::MGATHER, ISD::MSCATTER},
+                         VT, Custom);
+
+      setOperationAction(
+          {ISD::VP_LOAD, ISD::VP_STORE, ISD::EXPERIMENTAL_VP_STRIDED_LOAD,
+           ISD::EXPERIMENTAL_VP_STRIDED_STORE, ISD::VP_GATHER, ISD::VP_SCATTER},
+          VT, Custom);
+
+      setOperationAction(
+          {ISD::CONCAT_VECTORS, ISD::INSERT_SUBVECTOR, ISD::EXTRACT_SUBVECTOR},
+          VT, Custom);
 
       setOperationAction(ISD::SELECT, VT, Custom);
       setOperationAction(ISD::SELECT_CC, VT, Expand);
 
-      setOperationAction(ISD::STEP_VECTOR, VT, Custom);
-      setOperationAction(ISD::VECTOR_REVERSE, VT, Custom);
+      setOperationAction({ISD::STEP_VECTOR, ISD::VECTOR_REVERSE}, VT, Custom);
 
       for (MVT OtherVT : MVT::integer_scalable_vector_valuetypes()) {
         setTruncStoreAction(VT, OtherVT, Expand);
-        setLoadExtAction(ISD::EXTLOAD, OtherVT, VT, Expand);
-        setLoadExtAction(ISD::SEXTLOAD, OtherVT, VT, Expand);
-        setLoadExtAction(ISD::ZEXTLOAD, OtherVT, VT, Expand);
+        setLoadExtAction({ISD::EXTLOAD, ISD::SEXTLOAD, ISD::ZEXTLOAD}, OtherVT,
+                         VT, Expand);
+      }
+
+      // Splice
+      setOperationAction(ISD::VECTOR_SPLICE, VT, Custom);
+
+      // Lower CTLZ_ZERO_UNDEF and CTTZ_ZERO_UNDEF if element of VT in the range
+      // of f32.
+      EVT FloatVT = MVT::getVectorVT(MVT::f32, VT.getVectorElementCount());
+      if (isTypeLegal(FloatVT)) {
+        setOperationAction(
+            {ISD::CTLZ, ISD::CTLZ_ZERO_UNDEF, ISD::CTTZ_ZERO_UNDEF}, VT,
+            Custom);
       }
     }
 
@@ -576,7 +694,7 @@ RISCVTargetLowering::RISCVTargetLowering(const TargetMachine &TM,
     // and we pattern-match those back to the "original", swapping operands once
     // more. This way we catch both operations and both "vf" and "fv" forms with
     // fewer patterns.
-    ISD::CondCode VFPCCToExpand[] = {
+    static const ISD::CondCode VFPCCToExpand[] = {
         ISD::SETO,   ISD::SETONE, ISD::SETUEQ, ISD::SETUGT,
         ISD::SETUGE, ISD::SETULT, ISD::SETULE, ISD::SETUO,
         ISD::SETGT,  ISD::SETOGT, ISD::SETGE,  ISD::SETOGE,
@@ -589,43 +707,57 @@ RISCVTargetLowering::RISCVTargetLowering(const TargetMachine &TM,
       // sizes are within one power-of-two of each other. Therefore conversions
       // between vXf16 and vXf64 must be lowered as sequences which convert via
       // vXf32.
-      setOperationAction(ISD::FP_ROUND, VT, Custom);
-      setOperationAction(ISD::FP_EXTEND, VT, Custom);
+      setOperationAction({ISD::FP_ROUND, ISD::FP_EXTEND}, VT, Custom);
       // Custom-lower insert/extract operations to simplify patterns.
-      setOperationAction(ISD::INSERT_VECTOR_ELT, VT, Custom);
-      setOperationAction(ISD::EXTRACT_VECTOR_ELT, VT, Custom);
+      setOperationAction({ISD::INSERT_VECTOR_ELT, ISD::EXTRACT_VECTOR_ELT}, VT,
+                         Custom);
       // Expand various condition codes (explained above).
-      for (auto CC : VFPCCToExpand)
-        setCondCodeAction(CC, VT, Expand);
-
-      setOperationAction(ISD::FMINNUM, VT, Legal);
-      setOperationAction(ISD::FMAXNUM, VT, Legal);
+      setCondCodeAction(VFPCCToExpand, VT, Expand);
+
+      setOperationAction({ISD::FMINNUM, ISD::FMAXNUM}, VT, Legal);
+
+      setOperationAction(
+          {ISD::FTRUNC, ISD::FCEIL, ISD::FFLOOR, ISD::FROUND, ISD::FROUNDEVEN},
+          VT, Custom);
+
+      setOperationAction(FloatingPointVecReduceOps, VT, Custom);
+
+      // Expand FP operations that need libcalls.
+      setOperationAction(ISD::FREM, VT, Expand);
+      setOperationAction(ISD::FPOW, VT, Expand);
+      setOperationAction(ISD::FCOS, VT, Expand);
+      setOperationAction(ISD::FSIN, VT, Expand);
+      setOperationAction(ISD::FSINCOS, VT, Expand);
+      setOperationAction(ISD::FEXP, VT, Expand);
+      setOperationAction(ISD::FEXP2, VT, Expand);
+      setOperationAction(ISD::FLOG, VT, Expand);
+      setOperationAction(ISD::FLOG2, VT, Expand);
+      setOperationAction(ISD::FLOG10, VT, Expand);
+      setOperationAction(ISD::FRINT, VT, Expand);
+      setOperationAction(ISD::FNEARBYINT, VT, Expand);
 
-      setOperationAction(ISD::VECREDUCE_FADD, VT, Custom);
-      setOperationAction(ISD::VECREDUCE_SEQ_FADD, VT, Custom);
-      setOperationAction(ISD::VECREDUCE_FMIN, VT, Custom);
-      setOperationAction(ISD::VECREDUCE_FMAX, VT, Custom);
       setOperationAction(ISD::FCOPYSIGN, VT, Legal);
 
-      setOperationAction(ISD::LOAD, VT, Custom);
-      setOperationAction(ISD::STORE, VT, Custom);
+      setOperationAction({ISD::LOAD, ISD::STORE}, VT, Custom);
 
-      setOperationAction(ISD::MLOAD, VT, Custom);
-      setOperationAction(ISD::MSTORE, VT, Custom);
-      setOperationAction(ISD::MGATHER, VT, Custom);
-      setOperationAction(ISD::MSCATTER, VT, Custom);
+      setOperationAction({ISD::MLOAD, ISD::MSTORE, ISD::MGATHER, ISD::MSCATTER},
+                         VT, Custom);
+
+      setOperationAction(
+          {ISD::VP_LOAD, ISD::VP_STORE, ISD::EXPERIMENTAL_VP_STRIDED_LOAD,
+           ISD::EXPERIMENTAL_VP_STRIDED_STORE, ISD::VP_GATHER, ISD::VP_SCATTER},
+          VT, Custom);
 
       setOperationAction(ISD::SELECT, VT, Custom);
       setOperationAction(ISD::SELECT_CC, VT, Expand);
 
-      setOperationAction(ISD::CONCAT_VECTORS, VT, Custom);
-      setOperationAction(ISD::INSERT_SUBVECTOR, VT, Custom);
-      setOperationAction(ISD::EXTRACT_SUBVECTOR, VT, Custom);
+      setOperationAction(
+          {ISD::CONCAT_VECTORS, ISD::INSERT_SUBVECTOR, ISD::EXTRACT_SUBVECTOR},
+          VT, Custom);
 
-      setOperationAction(ISD::VECTOR_REVERSE, VT, Custom);
+      setOperationAction({ISD::VECTOR_REVERSE, ISD::VECTOR_SPLICE}, VT, Custom);
 
-      for (unsigned VPOpc : FloatingPointVPOps)
-        setOperationAction(VPOpc, VT, Custom);
+      setOperationAction(FloatingPointVPOps, VT, Custom);
     };
 
     // Sets common extload/truncstore actions on RVV floating-point vector
@@ -638,21 +770,31 @@ RISCVTargetLowering::RISCVTargetLowering(const TargetMachine &TM,
           }
         };
 
-    if (Subtarget.hasStdExtZfh())
-      for (MVT VT : F16VecVTs)
+    if (Subtarget.hasVInstructionsF16()) {
+      for (MVT VT : F16VecVTs) {
+        if (!isTypeLegal(VT))
+          continue;
         SetCommonVFPActions(VT);
+      }
+    }
 
-    for (MVT VT : F32VecVTs) {
-      if (Subtarget.hasStdExtF())
+    if (Subtarget.hasVInstructionsF32()) {
+      for (MVT VT : F32VecVTs) {
+        if (!isTypeLegal(VT))
+          continue;
         SetCommonVFPActions(VT);
-      SetCommonVFPExtLoadTruncStoreActions(VT, F16VecVTs);
+        SetCommonVFPExtLoadTruncStoreActions(VT, F16VecVTs);
+      }
     }
 
-    for (MVT VT : F64VecVTs) {
-      if (Subtarget.hasStdExtD())
+    if (Subtarget.hasVInstructionsF64()) {
+      for (MVT VT : F64VecVTs) {
+        if (!isTypeLegal(VT))
+          continue;
         SetCommonVFPActions(VT);
-      SetCommonVFPExtLoadTruncStoreActions(VT, F16VecVTs);
-      SetCommonVFPExtLoadTruncStoreActions(VT, F32VecVTs);
+        SetCommonVFPExtLoadTruncStoreActions(VT, F16VecVTs);
+        SetCommonVFPExtLoadTruncStoreActions(VT, F32VecVTs);
+      }
     }
 
     if (Subtarget.useRVVForFixedLengthVectors()) {
@@ -665,23 +807,21 @@ RISCVTargetLowering::RISCVTargetLowering(const TargetMachine &TM,
           setOperationAction(Op, VT, Expand);
         for (MVT OtherVT : MVT::integer_fixedlen_vector_valuetypes()) {
           setTruncStoreAction(VT, OtherVT, Expand);
-          setLoadExtAction(ISD::EXTLOAD, OtherVT, VT, Expand);
-          setLoadExtAction(ISD::SEXTLOAD, OtherVT, VT, Expand);
-          setLoadExtAction(ISD::ZEXTLOAD, OtherVT, VT, Expand);
+          setLoadExtAction({ISD::EXTLOAD, ISD::SEXTLOAD, ISD::ZEXTLOAD},
+                           OtherVT, VT, Expand);
         }
 
         // We use EXTRACT_SUBVECTOR as a "cast" from scalable to fixed.
-        setOperationAction(ISD::INSERT_SUBVECTOR, VT, Custom);
-        setOperationAction(ISD::EXTRACT_SUBVECTOR, VT, Custom);
+        setOperationAction({ISD::INSERT_SUBVECTOR, ISD::EXTRACT_SUBVECTOR}, VT,
+                           Custom);
 
-        setOperationAction(ISD::BUILD_VECTOR, VT, Custom);
-        setOperationAction(ISD::CONCAT_VECTORS, VT, Custom);
+        setOperationAction({ISD::BUILD_VECTOR, ISD::CONCAT_VECTORS}, VT,
+                           Custom);
 
-        setOperationAction(ISD::INSERT_VECTOR_ELT, VT, Custom);
-        setOperationAction(ISD::EXTRACT_VECTOR_ELT, VT, Custom);
+        setOperationAction({ISD::INSERT_VECTOR_ELT, ISD::EXTRACT_VECTOR_ELT},
+                           VT, Custom);
 
-        setOperationAction(ISD::LOAD, VT, Custom);
-        setOperationAction(ISD::STORE, VT, Custom);
+        setOperationAction({ISD::LOAD, ISD::STORE}, VT, Custom);
 
         setOperationAction(ISD::SETCC, VT, Custom);
 
@@ -691,84 +831,91 @@ RISCVTargetLowering::RISCVTargetLowering(const TargetMachine &TM,
 
         setOperationAction(ISD::BITCAST, VT, Custom);
 
-        setOperationAction(ISD::VECREDUCE_AND, VT, Custom);
-        setOperationAction(ISD::VECREDUCE_OR, VT, Custom);
-        setOperationAction(ISD::VECREDUCE_XOR, VT, Custom);
+        setOperationAction(
+            {ISD::VECREDUCE_AND, ISD::VECREDUCE_OR, ISD::VECREDUCE_XOR}, VT,
+            Custom);
+
+        setOperationAction(
+            {ISD::VP_REDUCE_AND, ISD::VP_REDUCE_OR, ISD::VP_REDUCE_XOR}, VT,
+            Custom);
 
-        setOperationAction(ISD::SINT_TO_FP, VT, Custom);
-        setOperationAction(ISD::UINT_TO_FP, VT, Custom);
-        setOperationAction(ISD::FP_TO_SINT, VT, Custom);
-        setOperationAction(ISD::FP_TO_UINT, VT, Custom);
+        setOperationAction({ISD::SINT_TO_FP, ISD::UINT_TO_FP, ISD::FP_TO_SINT,
+                            ISD::FP_TO_UINT},
+                           VT, Custom);
+        setOperationAction({ISD::FP_TO_SINT_SAT, ISD::FP_TO_UINT_SAT}, VT,
+                           Custom);
 
         // Operations below are different for between masks and other vectors.
         if (VT.getVectorElementType() == MVT::i1) {
-          setOperationAction(ISD::AND, VT, Custom);
-          setOperationAction(ISD::OR, VT, Custom);
-          setOperationAction(ISD::XOR, VT, Custom);
+          setOperationAction({ISD::VP_AND, ISD::VP_OR, ISD::VP_XOR, ISD::AND,
+                              ISD::OR, ISD::XOR},
+                             VT, Custom);
+
+          setOperationAction({ISD::VP_FP_TO_SINT, ISD::VP_FP_TO_UINT,
+                              ISD::VP_SETCC, ISD::VP_TRUNCATE},
+                             VT, Custom);
           continue;
         }
 
-        // Use SPLAT_VECTOR to prevent type legalization from destroying the
-        // splats when type legalizing i64 scalar on RV32.
+        // Make SPLAT_VECTOR Legal so DAGCombine will convert splat vectors to
+        // it before type legalization for i64 vectors on RV32. It will then be
+        // type legalized to SPLAT_VECTOR_PARTS which we need to Custom handle.
         // FIXME: Use SPLAT_VECTOR for all types? DAGCombine probably needs
         // improvements first.
         if (!Subtarget.is64Bit() && VT.getVectorElementType() == MVT::i64) {
-          setOperationAction(ISD::SPLAT_VECTOR, VT, Custom);
+          setOperationAction(ISD::SPLAT_VECTOR, VT, Legal);
           setOperationAction(ISD::SPLAT_VECTOR_PARTS, VT, Custom);
         }
 
         setOperationAction(ISD::VECTOR_SHUFFLE, VT, Custom);
-        setOperationAction(ISD::INSERT_VECTOR_ELT, VT, Custom);
-
-        setOperationAction(ISD::MLOAD, VT, Custom);
-        setOperationAction(ISD::MSTORE, VT, Custom);
-        setOperationAction(ISD::MGATHER, VT, Custom);
-        setOperationAction(ISD::MSCATTER, VT, Custom);
-        setOperationAction(ISD::ADD, VT, Custom);
-        setOperationAction(ISD::MUL, VT, Custom);
-        setOperationAction(ISD::SUB, VT, Custom);
-        setOperationAction(ISD::AND, VT, Custom);
-        setOperationAction(ISD::OR, VT, Custom);
-        setOperationAction(ISD::XOR, VT, Custom);
-        setOperationAction(ISD::SDIV, VT, Custom);
-        setOperationAction(ISD::SREM, VT, Custom);
-        setOperationAction(ISD::UDIV, VT, Custom);
-        setOperationAction(ISD::UREM, VT, Custom);
-        setOperationAction(ISD::SHL, VT, Custom);
-        setOperationAction(ISD::SRA, VT, Custom);
-        setOperationAction(ISD::SRL, VT, Custom);
-
-        setOperationAction(ISD::SMIN, VT, Custom);
-        setOperationAction(ISD::SMAX, VT, Custom);
-        setOperationAction(ISD::UMIN, VT, Custom);
-        setOperationAction(ISD::UMAX, VT, Custom);
-        setOperationAction(ISD::ABS,  VT, Custom);
-
-        setOperationAction(ISD::MULHS, VT, Custom);
-        setOperationAction(ISD::MULHU, VT, Custom);
-
-        setOperationAction(ISD::SADDSAT, VT, Custom);
-        setOperationAction(ISD::UADDSAT, VT, Custom);
-        setOperationAction(ISD::SSUBSAT, VT, Custom);
-        setOperationAction(ISD::USUBSAT, VT, Custom);
+
+        setOperationAction(
+            {ISD::MLOAD, ISD::MSTORE, ISD::MGATHER, ISD::MSCATTER}, VT, Custom);
+
+        setOperationAction({ISD::VP_LOAD, ISD::VP_STORE,
+                            ISD::EXPERIMENTAL_VP_STRIDED_LOAD,
+                            ISD::EXPERIMENTAL_VP_STRIDED_STORE, ISD::VP_GATHER,
+                            ISD::VP_SCATTER},
+                           VT, Custom);
+
+        setOperationAction({ISD::ADD, ISD::MUL, ISD::SUB, ISD::AND, ISD::OR,
+                            ISD::XOR, ISD::SDIV, ISD::SREM, ISD::UDIV,
+                            ISD::UREM, ISD::SHL, ISD::SRA, ISD::SRL},
+                           VT, Custom);
+
+        setOperationAction(
+            {ISD::SMIN, ISD::SMAX, ISD::UMIN, ISD::UMAX, ISD::ABS}, VT, Custom);
+
+        // vXi64 MULHS/MULHU requires the V extension instead of Zve64*.
+        if (VT.getVectorElementType() != MVT::i64 || Subtarget.hasStdExtV())
+          setOperationAction({ISD::MULHS, ISD::MULHU}, VT, Custom);
+
+        setOperationAction(
+            {ISD::SADDSAT, ISD::UADDSAT, ISD::SSUBSAT, ISD::USUBSAT}, VT,
+            Custom);
 
         setOperationAction(ISD::VSELECT, VT, Custom);
         setOperationAction(ISD::SELECT_CC, VT, Expand);
 
-        setOperationAction(ISD::ANY_EXTEND, VT, Custom);
-        setOperationAction(ISD::SIGN_EXTEND, VT, Custom);
-        setOperationAction(ISD::ZERO_EXTEND, VT, Custom);
+        setOperationAction(
+            {ISD::ANY_EXTEND, ISD::SIGN_EXTEND, ISD::ZERO_EXTEND}, VT, Custom);
 
         // Custom-lower reduction operations to set up the corresponding custom
         // nodes' operands.
-        setOperationAction(ISD::VECREDUCE_ADD, VT, Custom);
-        setOperationAction(ISD::VECREDUCE_SMAX, VT, Custom);
-        setOperationAction(ISD::VECREDUCE_SMIN, VT, Custom);
-        setOperationAction(ISD::VECREDUCE_UMAX, VT, Custom);
-        setOperationAction(ISD::VECREDUCE_UMIN, VT, Custom);
-
-        for (unsigned VPOpc : IntegerVPOps)
-          setOperationAction(VPOpc, VT, Custom);
+        setOperationAction({ISD::VECREDUCE_ADD, ISD::VECREDUCE_SMAX,
+                            ISD::VECREDUCE_SMIN, ISD::VECREDUCE_UMAX,
+                            ISD::VECREDUCE_UMIN},
+                           VT, Custom);
+
+        setOperationAction(IntegerVPOps, VT, Custom);
+
+        // Lower CTLZ_ZERO_UNDEF and CTTZ_ZERO_UNDEF if element of VT in the
+        // range of f32.
+        EVT FloatVT = MVT::getVectorVT(MVT::f32, VT.getVectorElementCount());
+        if (isTypeLegal(FloatVT))
+          setOperationAction(
+              {ISD::CTLZ, ISD::CTLZ_ZERO_UNDEF, ISD::CTTZ_ZERO_UNDEF}, VT,
+              Custom);
       }
 
       for (MVT VT : MVT::fp_fixedlen_vector_valuetypes()) {
@@ -784,66 +931,71 @@ RISCVTargetLowering::RISCVTargetLowering(const TargetMachine &TM,
         }
 
         // We use EXTRACT_SUBVECTOR as a "cast" from scalable to fixed.
-        setOperationAction(ISD::INSERT_SUBVECTOR, VT, Custom);
-        setOperationAction(ISD::EXTRACT_SUBVECTOR, VT, Custom);
+        setOperationAction({ISD::INSERT_SUBVECTOR, ISD::EXTRACT_SUBVECTOR}, VT,
+                           Custom);
 
-        setOperationAction(ISD::BUILD_VECTOR, VT, Custom);
-        setOperationAction(ISD::VECTOR_SHUFFLE, VT, Custom);
-        setOperationAction(ISD::INSERT_VECTOR_ELT, VT, Custom);
-        setOperationAction(ISD::EXTRACT_VECTOR_ELT, VT, Custom);
-
-        setOperationAction(ISD::LOAD, VT, Custom);
-        setOperationAction(ISD::STORE, VT, Custom);
-        setOperationAction(ISD::MLOAD, VT, Custom);
-        setOperationAction(ISD::MSTORE, VT, Custom);
-        setOperationAction(ISD::MGATHER, VT, Custom);
-        setOperationAction(ISD::MSCATTER, VT, Custom);
-        setOperationAction(ISD::FADD, VT, Custom);
-        setOperationAction(ISD::FSUB, VT, Custom);
-        setOperationAction(ISD::FMUL, VT, Custom);
-        setOperationAction(ISD::FDIV, VT, Custom);
-        setOperationAction(ISD::FNEG, VT, Custom);
-        setOperationAction(ISD::FABS, VT, Custom);
-        setOperationAction(ISD::FCOPYSIGN, VT, Custom);
-        setOperationAction(ISD::FSQRT, VT, Custom);
-        setOperationAction(ISD::FMA, VT, Custom);
-        setOperationAction(ISD::FMINNUM, VT, Custom);
-        setOperationAction(ISD::FMAXNUM, VT, Custom);
-
-        setOperationAction(ISD::FP_ROUND, VT, Custom);
-        setOperationAction(ISD::FP_EXTEND, VT, Custom);
-
-        for (auto CC : VFPCCToExpand)
-          setCondCodeAction(CC, VT, Expand);
+        setOperationAction({ISD::BUILD_VECTOR, ISD::CONCAT_VECTORS,
+                            ISD::VECTOR_SHUFFLE, ISD::INSERT_VECTOR_ELT,
+                            ISD::EXTRACT_VECTOR_ELT},
+                           VT, Custom);
 
-        setOperationAction(ISD::VSELECT, VT, Custom);
-        setOperationAction(ISD::SELECT, VT, Custom);
+        setOperationAction({ISD::LOAD, ISD::STORE, ISD::MLOAD, ISD::MSTORE,
+                            ISD::MGATHER, ISD::MSCATTER},
+                           VT, Custom);
+
+        setOperationAction({ISD::VP_LOAD, ISD::VP_STORE,
+                            ISD::EXPERIMENTAL_VP_STRIDED_LOAD,
+                            ISD::EXPERIMENTAL_VP_STRIDED_STORE, ISD::VP_GATHER,
+                            ISD::VP_SCATTER},
+                           VT, Custom);
+
+        setOperationAction({ISD::FADD, ISD::FSUB, ISD::FMUL, ISD::FDIV,
+                            ISD::FNEG, ISD::FABS, ISD::FCOPYSIGN, ISD::FSQRT,
+                            ISD::FMA, ISD::FMINNUM, ISD::FMAXNUM},
+                           VT, Custom);
+
+        setOperationAction({ISD::FP_ROUND, ISD::FP_EXTEND}, VT, Custom);
+
+        setOperationAction({ISD::FTRUNC, ISD::FCEIL, ISD::FFLOOR, ISD::FROUND,
+                            ISD::FROUNDEVEN},
+                           VT, Custom);
+
+        setCondCodeAction(VFPCCToExpand, VT, Expand);
+
+        setOperationAction({ISD::VSELECT, ISD::SELECT}, VT, Custom);
         setOperationAction(ISD::SELECT_CC, VT, Expand);
 
         setOperationAction(ISD::BITCAST, VT, Custom);
 
-        setOperationAction(ISD::VECREDUCE_FADD, VT, Custom);
-        setOperationAction(ISD::VECREDUCE_SEQ_FADD, VT, Custom);
-        setOperationAction(ISD::VECREDUCE_FMIN, VT, Custom);
-        setOperationAction(ISD::VECREDUCE_FMAX, VT, Custom);
+        setOperationAction(FloatingPointVecReduceOps, VT, Custom);
 
-        for (unsigned VPOpc : FloatingPointVPOps)
-          setOperationAction(VPOpc, VT, Custom);
+        setOperationAction(FloatingPointVPOps, VT, Custom);
       }
 
       // Custom-legalize bitcasts from fixed-length vectors to scalar types.
-      setOperationAction(ISD::BITCAST, MVT::i8, Custom);
-      setOperationAction(ISD::BITCAST, MVT::i16, Custom);
-      setOperationAction(ISD::BITCAST, MVT::i32, Custom);
-      setOperationAction(ISD::BITCAST, MVT::i64, Custom);
-      setOperationAction(ISD::BITCAST, MVT::f16, Custom);
-      setOperationAction(ISD::BITCAST, MVT::f32, Custom);
-      setOperationAction(ISD::BITCAST, MVT::f64, Custom);
+      setOperationAction(ISD::BITCAST, {MVT::i8, MVT::i16, MVT::i32, MVT::i64},
+                         Custom);
+      if (Subtarget.hasStdExtZfhOrZfhmin())
+        setOperationAction(ISD::BITCAST, MVT::f16, Custom);
+      if (Subtarget.hasStdExtF())
+        setOperationAction(ISD::BITCAST, MVT::f32, Custom);
+      if (Subtarget.hasStdExtD())
+        setOperationAction(ISD::BITCAST, MVT::f64, Custom);
     }
   }
 
+  if (Subtarget.hasForcedAtomics()) {
+    // Set atomic rmw/cas operations to expand to force __sync libcalls.
+    setOperationAction(
+        {ISD::ATOMIC_CMP_SWAP, ISD::ATOMIC_SWAP, ISD::ATOMIC_LOAD_ADD,
+         ISD::ATOMIC_LOAD_SUB, ISD::ATOMIC_LOAD_AND, ISD::ATOMIC_LOAD_OR,
+         ISD::ATOMIC_LOAD_XOR, ISD::ATOMIC_LOAD_NAND, ISD::ATOMIC_LOAD_MIN,
+         ISD::ATOMIC_LOAD_MAX, ISD::ATOMIC_LOAD_UMIN, ISD::ATOMIC_LOAD_UMAX},
+        XLenVT, Expand);
+  }
+
   // Function alignments.
-  const Align FunctionAlignment(Subtarget.hasStdExtC() ? 2 : 4);
+  const Align FunctionAlignment(Subtarget.hasStdExtCOrZca() ? 2 : 4);
   setMinFunctionAlignment(FunctionAlignment);
   setPrefFunctionAlignment(FunctionAlignment);
 
@@ -852,22 +1004,36 @@ RISCVTargetLowering::RISCVTargetLowering(const TargetMachine &TM,
   // Jumps are expensive, compared to logic
   setJumpIsExpensive();
 
-  // We can use any register for comparisons
-  setHasMultipleConditionRegisters();
-
-  setTargetDAGCombine(ISD::AND);
-  setTargetDAGCombine(ISD::OR);
-  setTargetDAGCombine(ISD::XOR);
-  setTargetDAGCombine(ISD::ANY_EXTEND);
-  setTargetDAGCombine(ISD::ZERO_EXTEND);
-  if (Subtarget.hasStdExtV()) {
-    setTargetDAGCombine(ISD::FCOPYSIGN);
-    setTargetDAGCombine(ISD::MGATHER);
-    setTargetDAGCombine(ISD::MSCATTER);
+  setTargetDAGCombine({ISD::INTRINSIC_WO_CHAIN, ISD::ADD, ISD::SUB, ISD::AND,
+                       ISD::OR, ISD::XOR, ISD::SETCC, ISD::SELECT});
+  if (Subtarget.is64Bit())
     setTargetDAGCombine(ISD::SRA);
-    setTargetDAGCombine(ISD::SRL);
-    setTargetDAGCombine(ISD::SHL);
-  }
+
+  if (Subtarget.hasStdExtF())
+    setTargetDAGCombine({ISD::FADD, ISD::FMAXNUM, ISD::FMINNUM});
+
+  if (Subtarget.hasStdExtZbb())
+    setTargetDAGCombine({ISD::UMAX, ISD::UMIN, ISD::SMAX, ISD::SMIN});
+
+  if (Subtarget.hasStdExtZbs() && Subtarget.is64Bit())
+    setTargetDAGCombine(ISD::TRUNCATE);
+
+  if (Subtarget.hasStdExtZbkb())
+    setTargetDAGCombine(ISD::BITREVERSE);
+  if (Subtarget.hasStdExtZfhOrZfhmin())
+    setTargetDAGCombine(ISD::SIGN_EXTEND_INREG);
+  if (Subtarget.hasStdExtF())
+    setTargetDAGCombine({ISD::ZERO_EXTEND, ISD::FP_TO_SINT, ISD::FP_TO_UINT,
+                         ISD::FP_TO_SINT_SAT, ISD::FP_TO_UINT_SAT});
+  if (Subtarget.hasVInstructions())
+    setTargetDAGCombine({ISD::FCOPYSIGN, ISD::MGATHER, ISD::MSCATTER,
+                         ISD::VP_GATHER, ISD::VP_SCATTER, ISD::SRA, ISD::SRL,
+                         ISD::SHL, ISD::STORE, ISD::SPLAT_VECTOR});
+  if (Subtarget.useRVVForFixedLengthVectors())
+    setTargetDAGCombine(ISD::BITCAST);
+
+  setLibcallName(RTLIB::FPEXT_F16_F32, "__extendhfsf2");
+  setLibcallName(RTLIB::FPROUND_F32_F16, "__truncsfhf2");
 }
 
 EVT RISCVTargetLowering::getSetCCResultType(const DataLayout &DL,
@@ -875,7 +1041,7 @@ EVT RISCVTargetLowering::getSetCCResultType(const DataLayout &DL,
                                             EVT VT) const {
   if (!VT.isVector())
     return getPointerTy(DL);
-  if (Subtarget.hasStdExtV() &&
+  if (Subtarget.hasVInstructions() &&
       (VT.isScalableVector() || Subtarget.useRVVForFixedLengthVectors()))
     return EVT::getVectorVT(Context, MVT::i1, VT.getVectorElementCount());
   return VT.changeVectorElementTypeToInteger();
@@ -889,6 +1055,7 @@ bool RISCVTargetLowering::getTgtMemIntrinsic(IntrinsicInfo &Info,
                                              const CallInst &I,
                                              MachineFunction &MF,
                                              unsigned Intrinsic) const {
+  auto &DL = I.getModule()->getDataLayout();
   switch (Intrinsic) {
   default:
     return false;
@@ -900,17 +1067,52 @@ bool RISCVTargetLowering::getTgtMemIntrinsic(IntrinsicInfo &Info,
   case Intrinsic::riscv_masked_atomicrmw_min_i32:
   case Intrinsic::riscv_masked_atomicrmw_umax_i32:
   case Intrinsic::riscv_masked_atomicrmw_umin_i32:
-  case Intrinsic::riscv_masked_cmpxchg_i32: {
-    PointerType *PtrTy = cast<PointerType>(I.getArgOperand(0)->getType());
+  case Intrinsic::riscv_masked_cmpxchg_i32:
     Info.opc = ISD::INTRINSIC_W_CHAIN;
-    Info.memVT = MVT::getVT(PtrTy->getElementType());
+    Info.memVT = MVT::i32;
     Info.ptrVal = I.getArgOperand(0);
     Info.offset = 0;
     Info.align = Align(4);
     Info.flags = MachineMemOperand::MOLoad | MachineMemOperand::MOStore |
                  MachineMemOperand::MOVolatile;
     return true;
-  }
+  case Intrinsic::riscv_masked_strided_load:
+    Info.opc = ISD::INTRINSIC_W_CHAIN;
+    Info.ptrVal = I.getArgOperand(1);
+    Info.memVT = getValueType(DL, I.getType()->getScalarType());
+    Info.align = Align(DL.getTypeSizeInBits(I.getType()->getScalarType()) / 8);
+    Info.size = MemoryLocation::UnknownSize;
+    Info.flags |= MachineMemOperand::MOLoad;
+    return true;
+  case Intrinsic::riscv_masked_strided_store:
+    Info.opc = ISD::INTRINSIC_VOID;
+    Info.ptrVal = I.getArgOperand(1);
+    Info.memVT =
+        getValueType(DL, I.getArgOperand(0)->getType()->getScalarType());
+    Info.align = Align(
+        DL.getTypeSizeInBits(I.getArgOperand(0)->getType()->getScalarType()) /
+        8);
+    Info.size = MemoryLocation::UnknownSize;
+    Info.flags |= MachineMemOperand::MOStore;
+    return true;
+  case Intrinsic::riscv_seg2_load:
+  case Intrinsic::riscv_seg3_load:
+  case Intrinsic::riscv_seg4_load:
+  case Intrinsic::riscv_seg5_load:
+  case Intrinsic::riscv_seg6_load:
+  case Intrinsic::riscv_seg7_load:
+  case Intrinsic::riscv_seg8_load:
+    Info.opc = ISD::INTRINSIC_W_CHAIN;
+    Info.ptrVal = I.getArgOperand(0);
+    Info.memVT =
+        getValueType(DL, I.getType()->getStructElementType(0)->getScalarType());
+    Info.align =
+        Align(DL.getTypeSizeInBits(
+                  I.getType()->getStructElementType(0)->getScalarType()) /
+              8);
+    Info.size = MemoryLocation::UnknownSize;
+    Info.flags |= MachineMemOperand::MOLoad;
+    return true;
   }
 }
 
@@ -922,6 +1124,10 @@ bool RISCVTargetLowering::isLegalAddressingMode(const DataLayout &DL,
   if (AM.BaseGV)
     return false;
 
+  // RVV instructions only support register addressing.
+  if (Subtarget.hasVInstructions() && isa<VectorType>(Ty))
+    return AM.HasBaseReg && AM.Scale == 0 && !AM.BaseOffs;
+
   // Require a 12-bit signed offset.
   if (!isInt<12>(AM.BaseOffs))
     return false;
@@ -951,6 +1157,8 @@ bool RISCVTargetLowering::isLegalAddImmediate(int64_t Imm) const {
 // On RV32, 64-bit integers are split into their high and low parts and held
 // in two different registers, so the trunc is free since the low register can
 // just be used.
+// FIXME: Should we consider i64->i32 free on RV64 to match the EVT version of
+// isTruncateFree?
 bool RISCVTargetLowering::isTruncateFree(Type *SrcTy, Type *DstTy) const {
   if (Subtarget.is64Bit() || !SrcTy->isIntegerTy() || !DstTy->isIntegerTy())
     return false;
@@ -960,8 +1168,10 @@ bool RISCVTargetLowering::isTruncateFree(Type *SrcTy, Type *DstTy) const {
 }
 
 bool RISCVTargetLowering::isTruncateFree(EVT SrcVT, EVT DstVT) const {
-  if (Subtarget.is64Bit() || SrcVT.isVector() || DstVT.isVector() ||
-      !SrcVT.isInteger() || !DstVT.isInteger())
+  // We consider i64->i32 free on RV64 since we have good selection of W
+  // instructions that make promoting operations back to i64 free in many cases.
+  if (SrcVT.isVector() || DstVT.isVector() || !SrcVT.isInteger() ||
+      !DstVT.isInteger())
     return false;
   unsigned SrcBits = SrcVT.getSizeInBits();
   unsigned DestBits = DstVT.getSizeInBits();
@@ -970,10 +1180,11 @@ bool RISCVTargetLowering::isTruncateFree(EVT SrcVT, EVT DstVT) const {
 
 bool RISCVTargetLowering::isZExtFree(SDValue Val, EVT VT2) const {
   // Zexts are free if they can be combined with a load.
+  // Don't advertise i32->i64 zextload as being free for RV64. It interacts
+  // poorly with type legalization of compares preferring sext.
   if (auto *LD = dyn_cast<LoadSDNode>(Val)) {
     EVT MemVT = LD->getMemoryVT();
-    if ((MemVT == MVT::i8 || MemVT == MVT::i16 ||
-         (Subtarget.is64Bit() && MemVT == MVT::i32)) &&
+    if ((MemVT == MVT::i8 || MemVT == MVT::i16) &&
         (LD->getExtensionType() == ISD::NON_EXTLOAD ||
          LD->getExtensionType() == ISD::ZEXTLOAD))
       return true;
@@ -986,29 +1197,303 @@ bool RISCVTargetLowering::isSExtCheaperThanZExt(EVT SrcVT, EVT DstVT) const {
   return Subtarget.is64Bit() && SrcVT == MVT::i32 && DstVT == MVT::i64;
 }
 
-bool RISCVTargetLowering::isCheapToSpeculateCttz() const {
+bool RISCVTargetLowering::signExtendConstant(const ConstantInt *CI) const {
+  return Subtarget.is64Bit() && CI->getType()->isIntegerTy(32);
+}
+
+bool RISCVTargetLowering::isCheapToSpeculateCttz(Type *Ty) const {
   return Subtarget.hasStdExtZbb();
 }
 
-bool RISCVTargetLowering::isCheapToSpeculateCtlz() const {
+bool RISCVTargetLowering::isCheapToSpeculateCtlz(Type *Ty) const {
   return Subtarget.hasStdExtZbb();
 }
 
+bool RISCVTargetLowering::isMaskAndCmp0FoldingBeneficial(
+    const Instruction &AndI) const {
+  // We expect to be able to match a bit extraction instruction if the Zbs
+  // extension is supported and the mask is a power of two. However, we
+  // conservatively return false if the mask would fit in an ANDI instruction,
+  // on the basis that it's possible the sinking+duplication of the AND in
+  // CodeGenPrepare triggered by this hook wouldn't decrease the instruction
+  // count and would increase code size (e.g. ANDI+BNEZ => BEXTI+BNEZ).
+  if (!Subtarget.hasStdExtZbs())
+    return false;
+  ConstantInt *Mask = dyn_cast<ConstantInt>(AndI.getOperand(1));
+  if (!Mask)
+    return false;
+  return !Mask->getValue().isSignedIntN(12) && Mask->getValue().isPowerOf2();
+}
+
+bool RISCVTargetLowering::hasAndNotCompare(SDValue Y) const {
+  EVT VT = Y.getValueType();
+
+  // FIXME: Support vectors once we have tests.
+  if (VT.isVector())
+    return false;
+
+  return (Subtarget.hasStdExtZbb() || Subtarget.hasStdExtZbkb()) &&
+         !isa<ConstantSDNode>(Y);
+}
+
+bool RISCVTargetLowering::hasBitTest(SDValue X, SDValue Y) const {
+  // Zbs provides BEXT[_I], which can be used with SEQZ/SNEZ as a bit test.
+  if (Subtarget.hasStdExtZbs())
+    return X.getValueType().isScalarInteger();
+  // We can use ANDI+SEQZ/SNEZ as a bit test. Y contains the bit position.
+  auto *C = dyn_cast<ConstantSDNode>(Y);
+  return C && C->getAPIntValue().ule(10);
+}
+
+bool RISCVTargetLowering::shouldFoldSelectWithIdentityConstant(unsigned Opcode,
+                                                               EVT VT) const {
+  // Only enable for rvv.
+  if (!VT.isVector() || !Subtarget.hasVInstructions())
+    return false;
+
+  if (VT.isFixedLengthVector() && !isTypeLegal(VT))
+    return false;
+
+  return true;
+}
+
+bool RISCVTargetLowering::shouldConvertConstantLoadToIntImm(const APInt &Imm,
+                                                            Type *Ty) const {
+  assert(Ty->isIntegerTy());
+
+  unsigned BitSize = Ty->getIntegerBitWidth();
+  if (BitSize > Subtarget.getXLen())
+    return false;
+
+  // Fast path, assume 32-bit immediates are cheap.
+  int64_t Val = Imm.getSExtValue();
+  if (isInt<32>(Val))
+    return true;
+
+  // A constant pool entry may be more aligned thant he load we're trying to
+  // replace. If we don't support unaligned scalar mem, prefer the constant
+  // pool.
+  // TODO: Can the caller pass down the alignment?
+  if (!Subtarget.enableUnalignedScalarMem())
+    return true;
+
+  // Prefer to keep the load if it would require many instructions.
+  // This uses the same threshold we use for constant pools but doesn't
+  // check useConstantPoolForLargeInts.
+  // TODO: Should we keep the load only when we're definitely going to emit a
+  // constant pool?
+
+  RISCVMatInt::InstSeq Seq =
+      RISCVMatInt::generateInstSeq(Val, Subtarget.getFeatureBits());
+  return Seq.size() <= Subtarget.getMaxBuildIntsCost();
+}
+
+bool RISCVTargetLowering::
+    shouldProduceAndByConstByHoistingConstFromShiftsLHSOfAnd(
+        SDValue X, ConstantSDNode *XC, ConstantSDNode *CC, SDValue Y,
+        unsigned OldShiftOpcode, unsigned NewShiftOpcode,
+        SelectionDAG &DAG) const {
+  // One interesting pattern that we'd want to form is 'bit extract':
+  //   ((1 >> Y) & 1) ==/!= 0
+  // But we also need to be careful not to try to reverse that fold.
+
+  // Is this '((1 >> Y) & 1)'?
+  if (XC && OldShiftOpcode == ISD::SRL && XC->isOne())
+    return false; // Keep the 'bit extract' pattern.
+
+  // Will this be '((1 >> Y) & 1)' after the transform?
+  if (NewShiftOpcode == ISD::SRL && CC->isOne())
+    return true; // Do form the 'bit extract' pattern.
+
+  // If 'X' is a constant, and we transform, then we will immediately
+  // try to undo the fold, thus causing endless combine loop.
+  // So only do the transform if X is not a constant. This matches the default
+  // implementation of this function.
+  return !XC;
+}
+
+bool RISCVTargetLowering::canSplatOperand(unsigned Opcode, int Operand) const {
+  switch (Opcode) {
+  case Instruction::Add:
+  case Instruction::Sub:
+  case Instruction::Mul:
+  case Instruction::And:
+  case Instruction::Or:
+  case Instruction::Xor:
+  case Instruction::FAdd:
+  case Instruction::FSub:
+  case Instruction::FMul:
+  case Instruction::FDiv:
+  case Instruction::ICmp:
+  case Instruction::FCmp:
+    return true;
+  case Instruction::Shl:
+  case Instruction::LShr:
+  case Instruction::AShr:
+  case Instruction::UDiv:
+  case Instruction::SDiv:
+  case Instruction::URem:
+  case Instruction::SRem:
+    return Operand == 1;
+  default:
+    return false;
+  }
+}
+
+
+bool RISCVTargetLowering::canSplatOperand(Instruction *I, int Operand) const {
+  if (!I->getType()->isVectorTy() || !Subtarget.hasVInstructions())
+    return false;
+
+  if (canSplatOperand(I->getOpcode(), Operand))
+    return true;
+
+  auto *II = dyn_cast<IntrinsicInst>(I);
+  if (!II)
+    return false;
+
+  switch (II->getIntrinsicID()) {
+  case Intrinsic::fma:
+  case Intrinsic::vp_fma:
+    return Operand == 0 || Operand == 1;
+  case Intrinsic::vp_shl:
+  case Intrinsic::vp_lshr:
+  case Intrinsic::vp_ashr:
+  case Intrinsic::vp_udiv:
+  case Intrinsic::vp_sdiv:
+  case Intrinsic::vp_urem:
+  case Intrinsic::vp_srem:
+    return Operand == 1;
+    // These intrinsics are commutative.
+  case Intrinsic::vp_add:
+  case Intrinsic::vp_mul:
+  case Intrinsic::vp_and:
+  case Intrinsic::vp_or:
+  case Intrinsic::vp_xor:
+  case Intrinsic::vp_fadd:
+  case Intrinsic::vp_fmul:
+    // These intrinsics have 'vr' versions.
+  case Intrinsic::vp_sub:
+  case Intrinsic::vp_fsub:
+  case Intrinsic::vp_fdiv:
+    return Operand == 0 || Operand == 1;
+  default:
+    return false;
+  }
+}
+
+/// Check if sinking \p I's operands to I's basic block is profitable, because
+/// the operands can be folded into a target instruction, e.g.
+/// splats of scalars can fold into vector instructions.
+bool RISCVTargetLowering::shouldSinkOperands(
+    Instruction *I, SmallVectorImpl<Use *> &Ops) const {
+  using namespace llvm::PatternMatch;
+
+  if (!I->getType()->isVectorTy() || !Subtarget.hasVInstructions())
+    return false;
+
+  for (auto OpIdx : enumerate(I->operands())) {
+    if (!canSplatOperand(I, OpIdx.index()))
+      continue;
+
+    Instruction *Op = dyn_cast<Instruction>(OpIdx.value().get());
+    // Make sure we are not already sinking this operand
+    if (!Op || any_of(Ops, [&](Use *U) { return U->get() == Op; }))
+      continue;
+
+    // We are looking for a splat that can be sunk.
+    if (!match(Op, m_Shuffle(m_InsertElt(m_Undef(), m_Value(), m_ZeroInt()),
+                             m_Undef(), m_ZeroMask())))
+      continue;
+
+    // All uses of the shuffle should be sunk to avoid duplicating it across gpr
+    // and vector registers
+    for (Use &U : Op->uses()) {
+      Instruction *Insn = cast<Instruction>(U.getUser());
+      if (!canSplatOperand(Insn, U.getOperandNo()))
+        return false;
+    }
+
+    Ops.push_back(&Op->getOperandUse(0));
+    Ops.push_back(&OpIdx.value());
+  }
+  return true;
+}
+
+bool RISCVTargetLowering::shouldScalarizeBinop(SDValue VecOp) const {
+  unsigned Opc = VecOp.getOpcode();
+
+  // Assume target opcodes can't be scalarized.
+  // TODO - do we have any exceptions?
+  if (Opc >= ISD::BUILTIN_OP_END)
+    return false;
+
+  // If the vector op is not supported, try to convert to scalar.
+  EVT VecVT = VecOp.getValueType();
+  if (!isOperationLegalOrCustomOrPromote(Opc, VecVT))
+    return true;
+
+  // If the vector op is supported, but the scalar op is not, the transform may
+  // not be worthwhile.
+  EVT ScalarVT = VecVT.getScalarType();
+  return isOperationLegalOrCustomOrPromote(Opc, ScalarVT);
+}
+
+bool RISCVTargetLowering::isOffsetFoldingLegal(
+    const GlobalAddressSDNode *GA) const {
+  // In order to maximise the opportunity for common subexpression elimination,
+  // keep a separate ADD node for the global address offset instead of folding
+  // it in the global address node. Later peephole optimisations may choose to
+  // fold it back in when profitable.
+  return false;
+}
+
 bool RISCVTargetLowering::isFPImmLegal(const APFloat &Imm, EVT VT,
                                        bool ForCodeSize) const {
-  if (VT == MVT::f16 && !Subtarget.hasStdExtZfh())
+  if (VT == MVT::f16 && !Subtarget.hasStdExtZfhOrZfhmin())
     return false;
   if (VT == MVT::f32 && !Subtarget.hasStdExtF())
     return false;
   if (VT == MVT::f64 && !Subtarget.hasStdExtD())
     return false;
-  if (Imm.isNegZero())
-    return false;
   return Imm.isZero();
 }
 
+// TODO: This is very conservative.
+bool RISCVTargetLowering::isExtractSubvectorCheap(EVT ResVT, EVT SrcVT,
+                                                  unsigned Index) const {
+  if (!isOperationLegalOrCustom(ISD::EXTRACT_SUBVECTOR, ResVT))
+    return false;
+
+  // Only support extracting a fixed from a fixed vector for now.
+  if (ResVT.isScalableVector() || SrcVT.isScalableVector())
+    return false;
+
+  unsigned ResElts = ResVT.getVectorNumElements();
+  unsigned SrcElts = SrcVT.getVectorNumElements();
+
+  // Convervatively only handle extracting half of a vector.
+  // TODO: Relax this.
+  if ((ResElts * 2) != SrcElts)
+    return false;
+
+  // The smallest type we can slide is i8.
+  // TODO: We can extract index 0 from a mask vector without a slide.
+  if (ResVT.getVectorElementType() == MVT::i1)
+    return false;
+
+  // Slide can support arbitrary index, but we only treat vslidedown.vi as
+  // cheap.
+  if (Index >= 32)
+    return false;
+
+  // TODO: We can do arbitrary slidedowns, but for now only support extracting
+  // the upper half of a vector until we have more test coverage.
+  return Index == 0 || Index == ResElts;
+}
+
 bool RISCVTargetLowering::hasBitPreservingFPLogic(EVT VT) const {
-  return (VT == MVT::f16 && Subtarget.hasStdExtZfh()) ||
+  return (VT == MVT::f16 && Subtarget.hasStdExtZfhOrZfhmin()) ||
          (VT == MVT::f32 && Subtarget.hasStdExtF()) ||
          (VT == MVT::f64 && Subtarget.hasStdExtD());
 }
@@ -1016,9 +1501,10 @@ bool RISCVTargetLowering::hasBitPreservingFPLogic(EVT VT) const {
 MVT RISCVTargetLowering::getRegisterTypeForCallingConv(LLVMContext &Context,
                                                       CallingConv::ID CC,
                                                       EVT VT) const {
-  // Use f32 to pass f16 if it is legal and Zfh is not enabled. We might still
-  // end up using a GPR but that will be decided based on ABI.
-  if (VT == MVT::f16 && Subtarget.hasStdExtF() && !Subtarget.hasStdExtZfh())
+  // Use f32 to pass f16 if it is legal and Zfh/Zfhmin is not enabled.
+  // We might still end up using a GPR but that will be decided based on ABI.
+  if (VT == MVT::f16 && Subtarget.hasStdExtF() &&
+      !Subtarget.hasStdExtZfhOrZfhmin())
     return MVT::f32;
 
   return TargetLowering::getRegisterTypeForCallingConv(Context, CC, VT);
@@ -1027,9 +1513,10 @@ MVT RISCVTargetLowering::getRegisterTypeForCallingConv(LLVMContext &Context,
 unsigned RISCVTargetLowering::getNumRegistersForCallingConv(LLVMContext &Context,
                                                            CallingConv::ID CC,
                                                            EVT VT) const {
-  // Use f32 to pass f16 if it is legal and Zfh is not enabled. We might still
-  // end up using a GPR but that will be decided based on ABI.
-  if (VT == MVT::f16 && Subtarget.hasStdExtF() && !Subtarget.hasStdExtZfh())
+  // Use f32 to pass f16 if it is legal and Zfh/Zfhmin is not enabled.
+  // We might still end up using a GPR but that will be decided based on ABI.
+  if (VT == MVT::f16 && Subtarget.hasStdExtF() &&
+      !Subtarget.hasStdExtZfhOrZfhmin())
     return 1;
 
   return TargetLowering::getNumRegistersForCallingConv(Context, CC, VT);
@@ -1041,18 +1528,51 @@ unsigned RISCVTargetLowering::getNumRegistersForCallingConv(LLVMContext &Context
 // with 1/-1.
 static void translateSetCCForBranch(const SDLoc &DL, SDValue &LHS, SDValue &RHS,
                                     ISD::CondCode &CC, SelectionDAG &DAG) {
-  // Convert X > -1 to X >= 0.
-  if (CC == ISD::SETGT && isAllOnesConstant(RHS)) {
-    RHS = DAG.getConstant(0, DL, RHS.getValueType());
-    CC = ISD::SETGE;
-    return;
+  // If this is a single bit test that can't be handled by ANDI, shift the
+  // bit to be tested to the MSB and perform a signed compare with 0.
+  if (isIntEqualitySetCC(CC) && isNullConstant(RHS) &&
+      LHS.getOpcode() == ISD::AND && LHS.hasOneUse() &&
+      isa<ConstantSDNode>(LHS.getOperand(1))) {
+    uint64_t Mask = LHS.getConstantOperandVal(1);
+    if ((isPowerOf2_64(Mask) || isMask_64(Mask)) && !isInt<12>(Mask)) {
+      unsigned ShAmt = 0;
+      if (isPowerOf2_64(Mask)) {
+        CC = CC == ISD::SETEQ ? ISD::SETGE : ISD::SETLT;
+        ShAmt = LHS.getValueSizeInBits() - 1 - Log2_64(Mask);
+      } else {
+        ShAmt = LHS.getValueSizeInBits() - llvm::bit_width(Mask);
+      }
+
+      LHS = LHS.getOperand(0);
+      if (ShAmt != 0)
+        LHS = DAG.getNode(ISD::SHL, DL, LHS.getValueType(), LHS,
+                          DAG.getConstant(ShAmt, DL, LHS.getValueType()));
+      return;
+    }
   }
-  // Convert X < 1 to 0 >= X.
-  if (CC == ISD::SETLT && isOneConstant(RHS)) {
-    RHS = LHS;
-    LHS = DAG.getConstant(0, DL, RHS.getValueType());
-    CC = ISD::SETGE;
-    return;
+
+  if (auto *RHSC = dyn_cast<ConstantSDNode>(RHS)) {
+    int64_t C = RHSC->getSExtValue();
+    switch (CC) {
+    default: break;
+    case ISD::SETGT:
+      // Convert X > -1 to X >= 0.
+      if (C == -1) {
+        RHS = DAG.getConstant(0, DL, RHS.getValueType());
+        CC = ISD::SETGE;
+        return;
+      }
+      break;
+    case ISD::SETLT:
+      // Convert X < 1 to 0 <= X.
+      if (C == 1) {
+        RHS = LHS;
+        LHS = DAG.getConstant(0, DL, RHS.getValueType());
+        CC = ISD::SETGE;
+        return;
+      }
+      break;
+    }
   }
 
   switch (CC) {
@@ -1068,28 +1588,6 @@ static void translateSetCCForBranch(const SDLoc &DL, SDValue &LHS, SDValue &RHS,
   }
 }
 
-// Return the RISC-V branch opcode that matches the given DAG integer
-// condition code. The CondCode must be one of those supported by the RISC-V
-// ISA (see translateSetCCForBranch).
-static unsigned getBranchOpcodeForIntCondCode(ISD::CondCode CC) {
-  switch (CC) {
-  default:
-    llvm_unreachable("Unsupported CondCode");
-  case ISD::SETEQ:
-    return RISCV::BEQ;
-  case ISD::SETNE:
-    return RISCV::BNE;
-  case ISD::SETLT:
-    return RISCV::BLT;
-  case ISD::SETGE:
-    return RISCV::BGE;
-  case ISD::SETULT:
-    return RISCV::BLTU;
-  case ISD::SETUGE:
-    return RISCV::BGEU;
-  }
-}
-
 RISCVII::VLMUL RISCVTargetLowering::getLMUL(MVT VT) {
   assert(VT.isScalableVector() && "Expecting a scalable vector type");
   unsigned KnownSize = VT.getSizeInBits().getKnownMinValue();
@@ -1206,6 +1704,44 @@ bool RISCVTargetLowering::mergeStoresAfterLegalization(EVT VT) const {
          (VT.isFixedLengthVector() && VT.getVectorElementType() == MVT::i1);
 }
 
+bool RISCVTargetLowering::isLegalElementTypeForRVV(Type *ScalarTy) const {
+  if (ScalarTy->isPointerTy())
+    return true;
+
+  if (ScalarTy->isIntegerTy(8) || ScalarTy->isIntegerTy(16) ||
+      ScalarTy->isIntegerTy(32))
+    return true;
+
+  if (ScalarTy->isIntegerTy(64))
+    return Subtarget.hasVInstructionsI64();
+
+  if (ScalarTy->isHalfTy())
+    return Subtarget.hasVInstructionsF16();
+  if (ScalarTy->isFloatTy())
+    return Subtarget.hasVInstructionsF32();
+  if (ScalarTy->isDoubleTy())
+    return Subtarget.hasVInstructionsF64();
+
+  return false;
+}
+
+unsigned RISCVTargetLowering::combineRepeatedFPDivisors() const {
+  return NumRepeatedDivisors;
+}
+
+static SDValue getVLOperand(SDValue Op) {
+  assert((Op.getOpcode() == ISD::INTRINSIC_WO_CHAIN ||
+          Op.getOpcode() == ISD::INTRINSIC_W_CHAIN) &&
+         "Unexpected opcode");
+  bool HasChain = Op.getOpcode() == ISD::INTRINSIC_W_CHAIN;
+  unsigned IntNo = Op.getConstantOperandVal(HasChain ? 1 : 0);
+  const RISCVVIntrinsicsTable::RISCVVIntrinsicInfo *II =
+      RISCVVIntrinsicsTable::getRISCVVIntrinsicInfo(IntNo);
+  if (!II)
+    return SDValue();
+  return Op.getOperand(II->VLOperand + 1 + HasChain);
+}
+
 static bool useRVVForFixedLengthVectorVT(MVT VT,
                                          const RISCVSubtarget &Subtarget) {
   assert(VT.isFixedLengthVector() && "Expected a fixed length vector type!");
@@ -1219,10 +1755,12 @@ static bool useRVVForFixedLengthVectorVT(MVT VT,
   if (VT.getFixedSizeInBits() > 1024 * 8)
     return false;
 
-  unsigned MinVLen = Subtarget.getMinRVVVectorSizeInBits();
+  unsigned MinVLen = Subtarget.getRealMinVLen();
+
+  MVT EltVT = VT.getVectorElementType();
 
   // Don't use RVV for vectors we cannot scalarize if required.
-  switch (VT.getVectorElementType().SimpleTy) {
+  switch (EltVT.SimpleTy) {
   // i1 is supported but has different rules.
   default:
     return false;
@@ -1235,22 +1773,29 @@ static bool useRVVForFixedLengthVectorVT(MVT VT,
   case MVT::i8:
   case MVT::i16:
   case MVT::i32:
+    break;
   case MVT::i64:
+    if (!Subtarget.hasVInstructionsI64())
+      return false;
     break;
   case MVT::f16:
-    if (!Subtarget.hasStdExtZfh())
+    if (!Subtarget.hasVInstructionsF16())
       return false;
     break;
   case MVT::f32:
-    if (!Subtarget.hasStdExtF())
+    if (!Subtarget.hasVInstructionsF32())
       return false;
     break;
   case MVT::f64:
-    if (!Subtarget.hasStdExtD())
+    if (!Subtarget.hasVInstructionsF64())
       return false;
     break;
   }
 
+  // Reject elements larger than ELEN.
+  if (EltVT.getSizeInBits() > Subtarget.getELEN())
+    return false;
+
   unsigned LMul = divideCeil(VT.getSizeInBits(), MinVLen);
   // Don't use RVV for types that don't fit.
   if (LMul > Subtarget.getMaxLMULForFixedLengthVectors())
@@ -1276,7 +1821,8 @@ static MVT getContainerForFixedLengthVector(const TargetLowering &TLI, MVT VT,
           useRVVForFixedLengthVectorVT(VT, Subtarget)) &&
          "Expected legal fixed length vector!");
 
-  unsigned MinVLen = Subtarget.getMinRVVVectorSizeInBits();
+  unsigned MinVLen = Subtarget.getRealMinVLen();
+  unsigned MaxELen = Subtarget.getELEN();
 
   MVT EltVT = VT.getVectorElementType();
   switch (EltVT.SimpleTy) {
@@ -1291,10 +1837,12 @@ static MVT getContainerForFixedLengthVector(const TargetLowering &TLI, MVT VT,
   case MVT::f32:
   case MVT::f64: {
     // We prefer to use LMUL=1 for VLEN sized types. Use fractional lmuls for
-    // narrower types, but we can't have a fractional LMUL with demoninator less
-    // than 64/SEW.
+    // narrower types. The smallest fractional LMUL we support is 8/ELEN. Within
+    // each fractional LMUL we support SEW between 8 and LMUL*ELEN.
     unsigned NumElts =
-        divideCeil(VT.getVectorNumElements(), MinVLen / RISCV::RVVBitsPerBlock);
+        (VT.getVectorNumElements() * RISCV::RVVBitsPerBlock) / MinVLen;
+    NumElts = std::max(NumElts, RISCV::RVVBitsPerBlock / MaxELen);
+    assert(isPowerOf2_32(NumElts) && "Expected power of 2 NumElts");
     return MVT::getScalableVectorVT(EltVT, NumElts);
   }
   }
@@ -1334,19 +1882,51 @@ static SDValue convertFromScalableVector(EVT VT, SDValue V, SelectionDAG &DAG,
   return DAG.getNode(ISD::EXTRACT_SUBVECTOR, DL, VT, V, Zero);
 }
 
+/// Return the type of the mask type suitable for masking the provided
+/// vector type.  This is simply an i1 element type vector of the same
+/// (possibly scalable) length.
+static MVT getMaskTypeFor(MVT VecVT) {
+  assert(VecVT.isVector());
+  ElementCount EC = VecVT.getVectorElementCount();
+  return MVT::getVectorVT(MVT::i1, EC);
+}
+
+/// Creates an all ones mask suitable for masking a vector of type VecTy with
+/// vector length VL.  .
+static SDValue getAllOnesMask(MVT VecVT, SDValue VL, SDLoc DL,
+                              SelectionDAG &DAG) {
+  MVT MaskVT = getMaskTypeFor(VecVT);
+  return DAG.getNode(RISCVISD::VMSET_VL, DL, MaskVT, VL);
+}
+
+static SDValue getVLOp(uint64_t NumElts, SDLoc DL, SelectionDAG &DAG,
+                       const RISCVSubtarget &Subtarget) {
+  return DAG.getConstant(NumElts, DL, Subtarget.getXLenVT());
+}
+
+static std::pair<SDValue, SDValue>
+getDefaultVLOps(uint64_t NumElts, MVT ContainerVT, SDLoc DL, SelectionDAG &DAG,
+                const RISCVSubtarget &Subtarget) {
+  assert(ContainerVT.isScalableVector() && "Expecting scalable container type");
+  SDValue VL = getVLOp(NumElts, DL, DAG, Subtarget);
+  SDValue Mask = getAllOnesMask(ContainerVT, VL, DL, DAG);
+  return {Mask, VL};
+}
+
 // Gets the two common "VL" operands: an all-ones mask and the vector length.
 // VecVT is a vector type, either fixed-length or scalable, and ContainerVT is
-// the vector type that it is contained in.
+// the vector type that the fixed-length vector is contained in. Otherwise if
+// VecVT is scalable, then ContainerVT should be the same as VecVT.
 static std::pair<SDValue, SDValue>
 getDefaultVLOps(MVT VecVT, MVT ContainerVT, SDLoc DL, SelectionDAG &DAG,
                 const RISCVSubtarget &Subtarget) {
+  if (VecVT.isFixedLengthVector())
+    return getDefaultVLOps(VecVT.getVectorNumElements(), ContainerVT, DL, DAG,
+                           Subtarget);
   assert(ContainerVT.isScalableVector() && "Expecting scalable container type");
   MVT XLenVT = Subtarget.getXLenVT();
-  SDValue VL = VecVT.isFixedLengthVector()
-                   ? DAG.getConstant(VecVT.getVectorNumElements(), DL, XLenVT)
-                   : DAG.getRegister(RISCV::X0, XLenVT);
-  MVT MaskVT = MVT::getVectorVT(MVT::i1, ContainerVT.getVectorElementCount());
-  SDValue Mask = DAG.getNode(RISCVISD::VMSET_VL, DL, MaskVT, VL);
+  SDValue VL = DAG.getRegister(RISCV::X0, XLenVT);
+  SDValue Mask = getAllOnesMask(ContainerVT, VL, DL, DAG);
   return {Mask, VL};
 }
 
@@ -1371,101 +1951,433 @@ bool RISCVTargetLowering::shouldExpandBuildVectorWithShuffles(
   return false;
 }
 
-bool RISCVTargetLowering::isShuffleMaskLegal(ArrayRef<int> M, EVT VT) const {
-  // Only splats are currently supported.
-  if (ShuffleVectorSDNode::isSplatMask(M.data(), VT))
-    return true;
+static SDValue lowerFP_TO_INT_SAT(SDValue Op, SelectionDAG &DAG,
+                                  const RISCVSubtarget &Subtarget) {
+  // RISCV FP-to-int conversions saturate to the destination register size, but
+  // don't produce 0 for nan. We can use a conversion instruction and fix the
+  // nan case with a compare and a select.
+  SDValue Src = Op.getOperand(0);
 
-  return false;
+  MVT DstVT = Op.getSimpleValueType();
+  EVT SatVT = cast<VTSDNode>(Op.getOperand(1))->getVT();
+
+  bool IsSigned = Op.getOpcode() == ISD::FP_TO_SINT_SAT;
+
+  if (!DstVT.isVector()) {
+    // In absense of Zfh, promote f16 to f32, then saturate the result.
+    if (Src.getSimpleValueType() == MVT::f16 && !Subtarget.hasStdExtZfh()) {
+      Src = DAG.getNode(ISD::FP_EXTEND, SDLoc(Op), MVT::f32, Src);
+    }
+
+    unsigned Opc;
+    if (SatVT == DstVT)
+      Opc = IsSigned ? RISCVISD::FCVT_X : RISCVISD::FCVT_XU;
+    else if (DstVT == MVT::i64 && SatVT == MVT::i32)
+      Opc = IsSigned ? RISCVISD::FCVT_W_RV64 : RISCVISD::FCVT_WU_RV64;
+    else
+      return SDValue();
+    // FIXME: Support other SatVTs by clamping before or after the conversion.
+
+    SDLoc DL(Op);
+    SDValue FpToInt = DAG.getNode(
+        Opc, DL, DstVT, Src,
+        DAG.getTargetConstant(RISCVFPRndMode::RTZ, DL, Subtarget.getXLenVT()));
+
+    if (Opc == RISCVISD::FCVT_WU_RV64)
+      FpToInt = DAG.getZeroExtendInReg(FpToInt, DL, MVT::i32);
+
+    SDValue ZeroInt = DAG.getConstant(0, DL, DstVT);
+    return DAG.getSelectCC(DL, Src, Src, ZeroInt, FpToInt,
+                           ISD::CondCode::SETUO);
+  }
+
+  // Vectors.
+
+  MVT DstEltVT = DstVT.getVectorElementType();
+  MVT SrcVT = Src.getSimpleValueType();
+  MVT SrcEltVT = SrcVT.getVectorElementType();
+  unsigned SrcEltSize = SrcEltVT.getSizeInBits();
+  unsigned DstEltSize = DstEltVT.getSizeInBits();
+
+  // Only handle saturating to the destination type.
+  if (SatVT != DstEltVT)
+    return SDValue();
+
+  // FIXME: Don't support narrowing by more than 1 steps for now.
+  if (SrcEltSize > (2 * DstEltSize))
+    return SDValue();
+
+  MVT DstContainerVT = DstVT;
+  MVT SrcContainerVT = SrcVT;
+  if (DstVT.isFixedLengthVector()) {
+    DstContainerVT = getContainerForFixedLengthVector(DAG, DstVT, Subtarget);
+    SrcContainerVT = getContainerForFixedLengthVector(DAG, SrcVT, Subtarget);
+    assert(DstContainerVT.getVectorElementCount() ==
+               SrcContainerVT.getVectorElementCount() &&
+           "Expected same element count");
+    Src = convertToScalableVector(SrcContainerVT, Src, DAG, Subtarget);
+  }
+
+  SDLoc DL(Op);
+
+  auto [Mask, VL] = getDefaultVLOps(DstVT, DstContainerVT, DL, DAG, Subtarget);
+
+  SDValue IsNan = DAG.getNode(RISCVISD::SETCC_VL, DL, Mask.getValueType(),
+                              {Src, Src, DAG.getCondCode(ISD::SETNE),
+                               DAG.getUNDEF(Mask.getValueType()), Mask, VL});
+
+  // Need to widen by more than 1 step, promote the FP type, then do a widening
+  // convert.
+  if (DstEltSize > (2 * SrcEltSize)) {
+    assert(SrcContainerVT.getVectorElementType() == MVT::f16 && "Unexpected VT!");
+    MVT InterVT = SrcContainerVT.changeVectorElementType(MVT::f32);
+    Src = DAG.getNode(RISCVISD::FP_EXTEND_VL, DL, InterVT, Src, Mask, VL);
+  }
+
+  unsigned RVVOpc =
+      IsSigned ? RISCVISD::VFCVT_RTZ_X_F_VL : RISCVISD::VFCVT_RTZ_XU_F_VL;
+  SDValue Res = DAG.getNode(RVVOpc, DL, DstContainerVT, Src, Mask, VL);
+
+  SDValue SplatZero = DAG.getNode(
+      RISCVISD::VMV_V_X_VL, DL, DstContainerVT, DAG.getUNDEF(DstContainerVT),
+      DAG.getConstant(0, DL, Subtarget.getXLenVT()), VL);
+  Res = DAG.getNode(RISCVISD::VSELECT_VL, DL, DstContainerVT, IsNan, SplatZero,
+                    Res, VL);
+
+  if (DstVT.isFixedLengthVector())
+    Res = convertFromScalableVector(DstVT, Res, DAG, Subtarget);
+
+  return Res;
 }
 
-static SDValue lowerSPLAT_VECTOR(SDValue Op, SelectionDAG &DAG,
-                                 const RISCVSubtarget &Subtarget) {
+static RISCVFPRndMode::RoundingMode matchRoundingOp(unsigned Opc) {
+  switch (Opc) {
+  case ISD::FROUNDEVEN:
+  case ISD::VP_FROUNDEVEN:
+    return RISCVFPRndMode::RNE;
+  case ISD::FTRUNC:
+  case ISD::VP_FROUNDTOZERO:
+    return RISCVFPRndMode::RTZ;
+  case ISD::FFLOOR:
+  case ISD::VP_FFLOOR:
+    return RISCVFPRndMode::RDN;
+  case ISD::FCEIL:
+  case ISD::VP_FCEIL:
+    return RISCVFPRndMode::RUP;
+  case ISD::FROUND:
+  case ISD::VP_FROUND:
+    return RISCVFPRndMode::RMM;
+  case ISD::FRINT:
+    return RISCVFPRndMode::DYN;
+  }
+
+  return RISCVFPRndMode::Invalid;
+}
+
+// Expand vector FTRUNC, FCEIL, FFLOOR, FROUND, VP_FCEIL, VP_FFLOOR, VP_FROUND
+// VP_FROUNDEVEN, VP_FROUNDTOZERO, VP_FRINT and VP_FNEARBYINT by converting to
+// the integer domain and back. Taking care to avoid converting values that are
+// nan or already correct.
+static SDValue
+lowerVectorFTRUNC_FCEIL_FFLOOR_FROUND(SDValue Op, SelectionDAG &DAG,
+                                      const RISCVSubtarget &Subtarget) {
   MVT VT = Op.getSimpleValueType();
-  assert(VT.isFixedLengthVector() && "Unexpected vector!");
-
-  MVT ContainerVT = getContainerForFixedLengthVector(DAG, VT, Subtarget);
+  assert(VT.isVector() && "Unexpected type");
 
   SDLoc DL(Op);
+
+  SDValue Src = Op.getOperand(0);
+
+  MVT ContainerVT = VT;
+  if (VT.isFixedLengthVector()) {
+    ContainerVT = getContainerForFixedLengthVector(DAG, VT, Subtarget);
+    Src = convertToScalableVector(ContainerVT, Src, DAG, Subtarget);
+  }
+
   SDValue Mask, VL;
-  std::tie(Mask, VL) = getDefaultVLOps(VT, ContainerVT, DL, DAG, Subtarget);
+  if (Op->isVPOpcode()) {
+    Mask = Op.getOperand(1);
+    VL = Op.getOperand(2);
+  } else {
+    std::tie(Mask, VL) = getDefaultVLOps(VT, ContainerVT, DL, DAG, Subtarget);
+  }
+
+  // Freeze the source since we are increasing the number of uses.
+  Src = DAG.getFreeze(Src);
+
+  // We do the conversion on the absolute value and fix the sign at the end.
+  SDValue Abs = DAG.getNode(RISCVISD::FABS_VL, DL, ContainerVT, Src, Mask, VL);
+
+  // Determine the largest integer that can be represented exactly. This and
+  // values larger than it don't have any fractional bits so don't need to
+  // be converted.
+  const fltSemantics &FltSem = DAG.EVTToAPFloatSemantics(ContainerVT);
+  unsigned Precision = APFloat::semanticsPrecision(FltSem);
+  APFloat MaxVal = APFloat(FltSem);
+  MaxVal.convertFromAPInt(APInt::getOneBitSet(Precision, Precision - 1),
+                          /*IsSigned*/ false, APFloat::rmNearestTiesToEven);
+  SDValue MaxValNode =
+      DAG.getConstantFP(MaxVal, DL, ContainerVT.getVectorElementType());
+  SDValue MaxValSplat = DAG.getNode(RISCVISD::VFMV_V_F_VL, DL, ContainerVT,
+                                    DAG.getUNDEF(ContainerVT), MaxValNode, VL);
+
+  // If abs(Src) was larger than MaxVal or nan, keep it.
+  MVT SetccVT = MVT::getVectorVT(MVT::i1, ContainerVT.getVectorElementCount());
+  Mask =
+      DAG.getNode(RISCVISD::SETCC_VL, DL, SetccVT,
+                  {Abs, MaxValSplat, DAG.getCondCode(ISD::SETOLT),
+                   Mask, Mask, VL});
+
+  // Truncate to integer and convert back to FP.
+  MVT IntVT = ContainerVT.changeVectorElementTypeToInteger();
+  MVT XLenVT = Subtarget.getXLenVT();
+  SDValue Truncated;
 
-  unsigned Opc =
-      VT.isFloatingPoint() ? RISCVISD::VFMV_V_F_VL : RISCVISD::VMV_V_X_VL;
-  SDValue Splat = DAG.getNode(Opc, DL, ContainerVT, Op.getOperand(0), VL);
-  return convertFromScalableVector(VT, Splat, DAG, Subtarget);
+  switch (Op.getOpcode()) {
+  default:
+    llvm_unreachable("Unexpected opcode");
+  case ISD::FCEIL:
+  case ISD::VP_FCEIL:
+  case ISD::FFLOOR:
+  case ISD::VP_FFLOOR:
+  case ISD::FROUND:
+  case ISD::FROUNDEVEN:
+  case ISD::VP_FROUND:
+  case ISD::VP_FROUNDEVEN:
+  case ISD::VP_FROUNDTOZERO: {
+    RISCVFPRndMode::RoundingMode FRM = matchRoundingOp(Op.getOpcode());
+    assert(FRM != RISCVFPRndMode::Invalid);
+    Truncated = DAG.getNode(RISCVISD::VFCVT_RM_X_F_VL, DL, IntVT, Src, Mask,
+                            DAG.getTargetConstant(FRM, DL, XLenVT), VL);
+    break;
+  }
+  case ISD::FTRUNC:
+    Truncated = DAG.getNode(RISCVISD::VFCVT_RTZ_X_F_VL, DL, IntVT, Src,
+                            Mask, VL);
+    break;
+  case ISD::VP_FRINT:
+    Truncated = DAG.getNode(RISCVISD::VFCVT_X_F_VL, DL, IntVT, Src, Mask, VL);
+    break;
+  case ISD::VP_FNEARBYINT:
+    Truncated = DAG.getNode(RISCVISD::VFROUND_NOEXCEPT_VL, DL, ContainerVT, Src,
+                            Mask, VL);
+    break;
+  }
+
+  // VFROUND_NOEXCEPT_VL includes SINT_TO_FP_VL.
+  if (Op.getOpcode() != ISD::VP_FNEARBYINT)
+    Truncated = DAG.getNode(RISCVISD::SINT_TO_FP_VL, DL, ContainerVT, Truncated,
+                            Mask, VL);
+
+  // Restore the original sign so that -0.0 is preserved.
+  Truncated = DAG.getNode(RISCVISD::FCOPYSIGN_VL, DL, ContainerVT, Truncated,
+                          Src, Src, Mask, VL);
+
+  if (!VT.isFixedLengthVector())
+    return Truncated;
+
+  return convertFromScalableVector(VT, Truncated, DAG, Subtarget);
+}
+
+static SDValue
+lowerFTRUNC_FCEIL_FFLOOR_FROUND(SDValue Op, SelectionDAG &DAG,
+                                const RISCVSubtarget &Subtarget) {
+  MVT VT = Op.getSimpleValueType();
+  if (VT.isVector())
+    return lowerVectorFTRUNC_FCEIL_FFLOOR_FROUND(Op, DAG, Subtarget);
+
+  if (DAG.shouldOptForSize())
+    return SDValue();
+
+  SDLoc DL(Op);
+  SDValue Src = Op.getOperand(0);
+
+  // Create an integer the size of the mantissa with the MSB set. This and all
+  // values larger than it don't have any fractional bits so don't need to be
+  // converted.
+  const fltSemantics &FltSem = DAG.EVTToAPFloatSemantics(VT);
+  unsigned Precision = APFloat::semanticsPrecision(FltSem);
+  APFloat MaxVal = APFloat(FltSem);
+  MaxVal.convertFromAPInt(APInt::getOneBitSet(Precision, Precision - 1),
+                          /*IsSigned*/ false, APFloat::rmNearestTiesToEven);
+  SDValue MaxValNode = DAG.getConstantFP(MaxVal, DL, VT);
+
+  RISCVFPRndMode::RoundingMode FRM = matchRoundingOp(Op.getOpcode());
+  return DAG.getNode(RISCVISD::FROUND, DL, VT, Src, MaxValNode,
+                     DAG.getTargetConstant(FRM, DL, Subtarget.getXLenVT()));
 }
 
 struct VIDSequence {
-  int64_t Step;
+  int64_t StepNumerator;
+  unsigned StepDenominator;
   int64_t Addend;
 };
 
+static std::optional<uint64_t> getExactInteger(const APFloat &APF,
+                                               uint32_t BitWidth) {
+  APSInt ValInt(BitWidth, !APF.isNegative());
+  // We use an arbitrary rounding mode here. If a floating-point is an exact
+  // integer (e.g., 1.0), the rounding mode does not affect the output value. If
+  // the rounding mode changes the output value, then it is not an exact
+  // integer.
+  RoundingMode ArbitraryRM = RoundingMode::TowardZero;
+  bool IsExact;
+  // If it is out of signed integer range, it will return an invalid operation.
+  // If it is not an exact integer, IsExact is false.
+  if ((APF.convertToInteger(ValInt, ArbitraryRM, &IsExact) ==
+       APFloatBase::opInvalidOp) ||
+      !IsExact)
+    return std::nullopt;
+  return ValInt.extractBitsAsZExtValue(BitWidth, 0);
+}
+
 // Try to match an arithmetic-sequence BUILD_VECTOR [X,X+S,X+2*S,...,X+(N-1)*S]
 // to the (non-zero) step S and start value X. This can be then lowered as the
 // RVV sequence (VID * S) + X, for example.
+// The step S is represented as an integer numerator divided by a positive
+// denominator. Note that the implementation currently only identifies
+// sequences in which either the numerator is +/- 1 or the denominator is 1. It
+// cannot detect 2/3, for example.
 // Note that this method will also match potentially unappealing index
 // sequences, like <i32 0, i32 50939494>, however it is left to the caller to
 // determine whether this is worth generating code for.
-static Optional<VIDSequence> isSimpleVIDSequence(SDValue Op) {
+static std::optional<VIDSequence> isSimpleVIDSequence(SDValue Op) {
   unsigned NumElts = Op.getNumOperands();
   assert(Op.getOpcode() == ISD::BUILD_VECTOR && "Unexpected BUILD_VECTOR");
-  if (!Op.getValueType().isInteger())
-    return None;
+  bool IsInteger = Op.getValueType().isInteger();
 
-  Optional<int64_t> SeqStep, SeqAddend;
-  Optional<std::pair<uint64_t, unsigned>> PrevElt;
+  std::optional<unsigned> SeqStepDenom;
+  std::optional<int64_t> SeqStepNum, SeqAddend;
+  std::optional<std::pair<uint64_t, unsigned>> PrevElt;
   unsigned EltSizeInBits = Op.getValueType().getScalarSizeInBits();
   for (unsigned Idx = 0; Idx < NumElts; Idx++) {
     // Assume undef elements match the sequence; we just have to be careful
     // when interpolating across them.
     if (Op.getOperand(Idx).isUndef())
       continue;
-    // The BUILD_VECTOR must be all constants.
-    if (!isa<ConstantSDNode>(Op.getOperand(Idx)))
-      return None;
 
-    uint64_t Val = Op.getConstantOperandVal(Idx) &
-                   maskTrailingOnes<uint64_t>(EltSizeInBits);
+    uint64_t Val;
+    if (IsInteger) {
+      // The BUILD_VECTOR must be all constants.
+      if (!isa<ConstantSDNode>(Op.getOperand(Idx)))
+        return std::nullopt;
+      Val = Op.getConstantOperandVal(Idx) &
+            maskTrailingOnes<uint64_t>(EltSizeInBits);
+    } else {
+      // The BUILD_VECTOR must be all constants.
+      if (!isa<ConstantFPSDNode>(Op.getOperand(Idx)))
+        return std::nullopt;
+      if (auto ExactInteger = getExactInteger(
+              cast<ConstantFPSDNode>(Op.getOperand(Idx))->getValueAPF(),
+              EltSizeInBits))
+        Val = *ExactInteger;
+      else
+        return std::nullopt;
+    }
 
     if (PrevElt) {
       // Calculate the step since the last non-undef element, and ensure
       // it's consistent across the entire sequence.
-      int64_t Diff = SignExtend64(Val - PrevElt->first, EltSizeInBits);
-      // The difference must cleanly divide the element span.
-      if (Diff % (Idx - PrevElt->second) != 0)
-        return None;
-      int64_t Step = Diff / (Idx - PrevElt->second);
-      // A zero step indicates we're either a not an index sequence, or we
-      // have a fractional step. This must be handled by a more complex
-      // pattern recognition (undefs complicate things here).
-      if (Step == 0)
-        return None;
-      if (!SeqStep)
-        SeqStep = Step;
-      else if (Step != SeqStep)
-        return None;
-    }
-
-    // Record and/or check any addend.
-    if (SeqStep) {
-      int64_t Addend =
-          SignExtend64(Val - (Idx * (uint64_t)*SeqStep), EltSizeInBits);
-      if (!SeqAddend)
-        SeqAddend = Addend;
-      else if (SeqAddend != Addend)
-        return None;
+      unsigned IdxDiff = Idx - PrevElt->second;
+      int64_t ValDiff = SignExtend64(Val - PrevElt->first, EltSizeInBits);
+
+      // A zero-value value difference means that we're somewhere in the middle
+      // of a fractional step, e.g. <0,0,0*,0,1,1,1,1>. Wait until we notice a
+      // step change before evaluating the sequence.
+      if (ValDiff == 0)
+        continue;
+
+      int64_t Remainder = ValDiff % IdxDiff;
+      // Normalize the step if it's greater than 1.
+      if (Remainder != ValDiff) {
+        // The difference must cleanly divide the element span.
+        if (Remainder != 0)
+          return std::nullopt;
+        ValDiff /= IdxDiff;
+        IdxDiff = 1;
+      }
+
+      if (!SeqStepNum)
+        SeqStepNum = ValDiff;
+      else if (ValDiff != SeqStepNum)
+        return std::nullopt;
+
+      if (!SeqStepDenom)
+        SeqStepDenom = IdxDiff;
+      else if (IdxDiff != *SeqStepDenom)
+        return std::nullopt;
     }
 
     // Record this non-undef element for later.
-    PrevElt = std::make_pair(Val, Idx);
+    if (!PrevElt || PrevElt->first != Val)
+      PrevElt = std::make_pair(Val, Idx);
+  }
+
+  // We need to have logged a step for this to count as a legal index sequence.
+  if (!SeqStepNum || !SeqStepDenom)
+    return std::nullopt;
+
+  // Loop back through the sequence and validate elements we might have skipped
+  // while waiting for a valid step. While doing this, log any sequence addend.
+  for (unsigned Idx = 0; Idx < NumElts; Idx++) {
+    if (Op.getOperand(Idx).isUndef())
+      continue;
+    uint64_t Val;
+    if (IsInteger) {
+      Val = Op.getConstantOperandVal(Idx) &
+            maskTrailingOnes<uint64_t>(EltSizeInBits);
+    } else {
+      Val = *getExactInteger(
+          cast<ConstantFPSDNode>(Op.getOperand(Idx))->getValueAPF(),
+          EltSizeInBits);
+    }
+    uint64_t ExpectedVal =
+        (int64_t)(Idx * (uint64_t)*SeqStepNum) / *SeqStepDenom;
+    int64_t Addend = SignExtend64(Val - ExpectedVal, EltSizeInBits);
+    if (!SeqAddend)
+      SeqAddend = Addend;
+    else if (Addend != SeqAddend)
+      return std::nullopt;
+  }
+
+  assert(SeqAddend && "Must have an addend if we have a step");
+
+  return VIDSequence{*SeqStepNum, *SeqStepDenom, *SeqAddend};
+}
+
+// Match a splatted value (SPLAT_VECTOR/BUILD_VECTOR) of an EXTRACT_VECTOR_ELT
+// and lower it as a VRGATHER_VX_VL from the source vector.
+static SDValue matchSplatAsGather(SDValue SplatVal, MVT VT, const SDLoc &DL,
+                                  SelectionDAG &DAG,
+                                  const RISCVSubtarget &Subtarget) {
+  if (SplatVal.getOpcode() != ISD::EXTRACT_VECTOR_ELT)
+    return SDValue();
+  SDValue Vec = SplatVal.getOperand(0);
+  // Only perform this optimization on vectors of the same size for simplicity.
+  // Don't perform this optimization for i1 vectors.
+  // FIXME: Support i1 vectors, maybe by promoting to i8?
+  if (Vec.getValueType() != VT || VT.getVectorElementType() == MVT::i1)
+    return SDValue();
+  SDValue Idx = SplatVal.getOperand(1);
+  // The index must be a legal type.
+  if (Idx.getValueType() != Subtarget.getXLenVT())
+    return SDValue();
+
+  MVT ContainerVT = VT;
+  if (VT.isFixedLengthVector()) {
+    ContainerVT = getContainerForFixedLengthVector(DAG, VT, Subtarget);
+    Vec = convertToScalableVector(ContainerVT, Vec, DAG, Subtarget);
   }
-  // We need to have logged both a step and an addend for this to count as
-  // a legal index sequence.
-  if (!SeqStep || !SeqAddend)
-    return None;
 
-  return VIDSequence{*SeqStep, *SeqAddend};
+  auto [Mask, VL] = getDefaultVLOps(VT, ContainerVT, DL, DAG, Subtarget);
+
+  SDValue Gather = DAG.getNode(RISCVISD::VRGATHER_VX_VL, DL, ContainerVT, Vec,
+                               Idx, DAG.getUNDEF(ContainerVT), Mask, VL);
+
+  if (!VT.isFixedLengthVector())
+    return Gather;
+
+  return convertFromScalableVector(VT, Gather, DAG, Subtarget);
 }
 
 static SDValue lowerBUILD_VECTOR(SDValue Op, SelectionDAG &DAG,
@@ -1476,8 +2388,7 @@ static SDValue lowerBUILD_VECTOR(SDValue Op, SelectionDAG &DAG,
   MVT ContainerVT = getContainerForFixedLengthVector(DAG, VT, Subtarget);
 
   SDLoc DL(Op);
-  SDValue Mask, VL;
-  std::tie(Mask, VL) = getDefaultVLOps(VT, ContainerVT, DL, DAG, Subtarget);
+  auto [Mask, VL] = getDefaultVLOps(VT, ContainerVT, DL, DAG, Subtarget);
 
   MVT XLenVT = Subtarget.getXLenVT();
   unsigned NumElts = Op.getNumOperands();
@@ -1503,6 +2414,7 @@ static SDValue lowerBUILD_VECTOR(SDValue Op, SelectionDAG &DAG,
     // codegen across RV32 and RV64.
     unsigned NumViaIntegerBits =
         std::min(std::max(NumElts, 8u), Subtarget.getXLen());
+    NumViaIntegerBits = std::min(NumViaIntegerBits, Subtarget.getELEN());
     if (ISD::isBuildVectorOfConstantSDNodes(Op.getNode())) {
       // If we have to use more than one INSERT_VECTOR_ELT then this
       // optimization is likely to increase code size; avoid peforming it in
@@ -1524,7 +2436,7 @@ static SDValue lowerBUILD_VECTOR(SDValue Op, SelectionDAG &DAG,
         // our vector and clear our accumulated data.
         if (I != 0 && I % NumViaIntegerBits == 0) {
           if (NumViaIntegerBits <= 32)
-            Bits = SignExtend64(Bits, 32);
+            Bits = SignExtend64<32>(Bits);
           SDValue Elt = DAG.getConstant(Bits, DL, XLenVT);
           Vec = DAG.getNode(ISD::INSERT_VECTOR_ELT, DL, IntegerViaVecVT, Vec,
                             Elt, DAG.getConstant(IntegerEltIdx, DL, XLenVT));
@@ -1540,7 +2452,7 @@ static SDValue lowerBUILD_VECTOR(SDValue Op, SelectionDAG &DAG,
       // Insert the (remaining) scalar value into position in our integer
       // vector type.
       if (NumViaIntegerBits <= 32)
-        Bits = SignExtend64(Bits, 32);
+        Bits = SignExtend64<32>(Bits);
       SDValue Elt = DAG.getConstant(Bits, DL, XLenVT);
       Vec = DAG.getNode(ISD::INSERT_VECTOR_ELT, DL, IntegerViaVecVT, Vec, Elt,
                         DAG.getConstant(IntegerEltIdx, DL, XLenVT));
@@ -1589,9 +2501,12 @@ static SDValue lowerBUILD_VECTOR(SDValue Op, SelectionDAG &DAG,
   }
 
   if (SDValue Splat = cast<BuildVectorSDNode>(Op)->getSplatValue()) {
+    if (auto Gather = matchSplatAsGather(Splat, VT, DL, DAG, Subtarget))
+      return Gather;
     unsigned Opc = VT.isFloatingPoint() ? RISCVISD::VFMV_V_F_VL
                                         : RISCVISD::VMV_V_X_VL;
-    Splat = DAG.getNode(Opc, DL, ContainerVT, Splat, VL);
+    Splat =
+        DAG.getNode(Opc, DL, ContainerVT, DAG.getUNDEF(ContainerVT), Splat, VL);
     return convertFromScalableVector(VT, Splat, DAG, Subtarget);
   }
 
@@ -1599,35 +2514,60 @@ static SDValue lowerBUILD_VECTOR(SDValue Op, SelectionDAG &DAG,
   // with optional modifications. An all-undef vector is matched by
   // getSplatValue, above.
   if (auto SimpleVID = isSimpleVIDSequence(Op)) {
-    int64_t Step = SimpleVID->Step;
+    int64_t StepNumerator = SimpleVID->StepNumerator;
+    unsigned StepDenominator = SimpleVID->StepDenominator;
     int64_t Addend = SimpleVID->Addend;
+
+    assert(StepNumerator != 0 && "Invalid step");
+    bool Negate = false;
+    int64_t SplatStepVal = StepNumerator;
+    unsigned StepOpcode = ISD::MUL;
+    if (StepNumerator != 1) {
+      if (isPowerOf2_64(std::abs(StepNumerator))) {
+        Negate = StepNumerator < 0;
+        StepOpcode = ISD::SHL;
+        SplatStepVal = Log2_64(std::abs(StepNumerator));
+      }
+    }
+
     // Only emit VIDs with suitably-small steps/addends. We use imm5 is a
     // threshold since it's the immediate value many RVV instructions accept.
-    if (isInt<5>(Step) && isInt<5>(Addend)) {
-      SDValue VID = DAG.getNode(RISCVISD::VID_VL, DL, ContainerVT, Mask, VL);
+    // There is no vmul.vi instruction so ensure multiply constant can fit in
+    // a single addi instruction.
+    if (((StepOpcode == ISD::MUL && isInt<12>(SplatStepVal)) ||
+         (StepOpcode == ISD::SHL && isUInt<5>(SplatStepVal))) &&
+        isPowerOf2_32(StepDenominator) &&
+        (SplatStepVal >= 0 || StepDenominator == 1) && isInt<5>(Addend)) {
+      MVT VIDVT =
+          VT.isFloatingPoint() ? VT.changeVectorElementTypeToInteger() : VT;
+      MVT VIDContainerVT =
+          getContainerForFixedLengthVector(DAG, VIDVT, Subtarget);
+      SDValue VID = DAG.getNode(RISCVISD::VID_VL, DL, VIDContainerVT, Mask, VL);
       // Convert right out of the scalable type so we can use standard ISD
       // nodes for the rest of the computation. If we used scalable types with
       // these, we'd lose the fixed-length vector info and generate worse
       // vsetvli code.
-      VID = convertFromScalableVector(VT, VID, DAG, Subtarget);
-      assert(Step != 0 && "Invalid step");
-      bool Negate = false;
-      if (Step != 1) {
-        int64_t SplatStepVal = Step;
-        unsigned Opcode = ISD::MUL;
-        if (isPowerOf2_64(std::abs(Step))) {
-          Negate = Step < 0;
-          Opcode = ISD::SHL;
-          SplatStepVal = Log2_64(std::abs(Step));
-        }
-        SDValue SplatStep = DAG.getSplatVector(
-            VT, DL, DAG.getConstant(SplatStepVal, DL, XLenVT));
-        VID = DAG.getNode(Opcode, DL, VT, VID, SplatStep);
+      VID = convertFromScalableVector(VIDVT, VID, DAG, Subtarget);
+      if ((StepOpcode == ISD::MUL && SplatStepVal != 1) ||
+          (StepOpcode == ISD::SHL && SplatStepVal != 0)) {
+        SDValue SplatStep = DAG.getSplatBuildVector(
+            VIDVT, DL, DAG.getConstant(SplatStepVal, DL, XLenVT));
+        VID = DAG.getNode(StepOpcode, DL, VIDVT, VID, SplatStep);
+      }
+      if (StepDenominator != 1) {
+        SDValue SplatStep = DAG.getSplatBuildVector(
+            VIDVT, DL, DAG.getConstant(Log2_64(StepDenominator), DL, XLenVT));
+        VID = DAG.getNode(ISD::SRL, DL, VIDVT, VID, SplatStep);
       }
       if (Addend != 0 || Negate) {
-        SDValue SplatAddend =
-            DAG.getSplatVector(VT, DL, DAG.getConstant(Addend, DL, XLenVT));
-        VID = DAG.getNode(Negate ? ISD::SUB : ISD::ADD, DL, VT, SplatAddend, VID);
+        SDValue SplatAddend = DAG.getSplatBuildVector(
+            VIDVT, DL, DAG.getConstant(Addend, DL, XLenVT));
+        VID = DAG.getNode(Negate ? ISD::SUB : ISD::ADD, DL, VIDVT, SplatAddend,
+                          VID);
+      }
+      if (VT.isFloatingPoint()) {
+        // TODO: Use vfwcvt to reduce register pressure.
+        VID = DAG.getNode(ISD::SINT_TO_FP, DL, VT, VID);
       }
       return VID;
     }
@@ -1669,7 +2609,7 @@ static SDValue lowerBUILD_VECTOR(SDValue Op, SelectionDAG &DAG,
     // On RV64, sign-extend from 32 to 64 bits where possible in order to
     // achieve better constant materializion.
     if (Subtarget.is64Bit() && ViaIntVT == MVT::i32)
-      SplatValue = SignExtend64(SplatValue, 32);
+      SplatValue = SignExtend64<32>(SplatValue);
 
     // Since we can't introduce illegal i64 types at this stage, we can only
     // perform an i64 splat on RV32 if it is its own sign-extended value. That
@@ -1684,6 +2624,7 @@ static SDValue lowerBUILD_VECTOR(SDValue Op, SelectionDAG &DAG,
           getContainerForFixedLengthVector(DAG, ViaVecVT, Subtarget);
       SDValue Splat =
           DAG.getNode(RISCVISD::VMV_V_X_VL, DL, ViaContainerVT,
+                      DAG.getUNDEF(ViaContainerVT),
                       DAG.getConstant(SplatValue, DL, XLenVT), ViaVL);
       Splat = convertFromScalableVector(ViaVecVT, Splat, DAG, Subtarget);
       return DAG.getBitcast(VT, Splat);
@@ -1704,6 +2645,13 @@ static SDValue lowerBUILD_VECTOR(SDValue Op, SelectionDAG &DAG,
   unsigned NumUndefElts =
       count_if(Op->op_values(), [](const SDValue &V) { return V.isUndef(); });
 
+  // Track the number of scalar loads we know we'd be inserting, estimated as
+  // any non-zero floating-point constant. Other kinds of element are either
+  // already in registers or are materialized on demand. The threshold at which
+  // a vector load is more desirable than several scalar materializion and
+  // vector-insertion instructions is not known.
+  unsigned NumScalarLoads = 0;
+
   for (SDValue V : Op->op_values()) {
     if (V.isUndef())
       continue;
@@ -1711,6 +2659,9 @@ static SDValue lowerBUILD_VECTOR(SDValue Op, SelectionDAG &DAG,
     ValueCounts.insert(std::make_pair(V, 0));
     unsigned &Count = ValueCounts[V];
 
+    if (auto *CFP = dyn_cast<ConstantFPSDNode>(V))
+      NumScalarLoads += !CFP->isExactlyValue(+0.0);
+
     // Is this value dominant? In case of a tie, prefer the highest element as
     // it's cheaper to insert near the beginning of a vector than it is at the
     // end.
@@ -1726,7 +2677,7 @@ static SDValue lowerBUILD_VECTOR(SDValue Op, SelectionDAG &DAG,
 
   // Don't perform this optimization when optimizing for size, since
   // materializing elements and inserting them tends to cause code bloat.
-  if (!DAG.shouldOptForSize() &&
+  if (!DAG.shouldOptForSize() && NumScalarLoads < NumElts &&
       ((MostCommonCount > DominantValueCountThreshold) ||
        (ValueCounts.size() <= Log2_32(NumDefElts)))) {
     // Start by splatting the most common element.
@@ -1761,42 +2712,67 @@ static SDValue lowerBUILD_VECTOR(SDValue Op, SelectionDAG &DAG,
   return SDValue();
 }
 
-static SDValue splatPartsI64WithVL(const SDLoc &DL, MVT VT, SDValue Lo,
-                                   SDValue Hi, SDValue VL, SelectionDAG &DAG) {
+static SDValue splatPartsI64WithVL(const SDLoc &DL, MVT VT, SDValue Passthru,
+                                   SDValue Lo, SDValue Hi, SDValue VL,
+                                   SelectionDAG &DAG) {
+  if (!Passthru)
+    Passthru = DAG.getUNDEF(VT);
   if (isa<ConstantSDNode>(Lo) && isa<ConstantSDNode>(Hi)) {
     int32_t LoC = cast<ConstantSDNode>(Lo)->getSExtValue();
     int32_t HiC = cast<ConstantSDNode>(Hi)->getSExtValue();
     // If Hi constant is all the same sign bit as Lo, lower this as a custom
     // node in order to try and match RVV vector/scalar instructions.
     if ((LoC >> 31) == HiC)
-      return DAG.getNode(RISCVISD::VMV_V_X_VL, DL, VT, Lo, VL);
+      return DAG.getNode(RISCVISD::VMV_V_X_VL, DL, VT, Passthru, Lo, VL);
+
+    // If vl is equal to XLEN_MAX and Hi constant is equal to Lo, we could use
+    // vmv.v.x whose EEW = 32 to lower it.
+    auto *Const = dyn_cast<ConstantSDNode>(VL);
+    if (LoC == HiC && Const && Const->isAllOnesValue()) {
+      MVT InterVT = MVT::getVectorVT(MVT::i32, VT.getVectorElementCount() * 2);
+      // TODO: if vl <= min(VLMAX), we can also do this. But we could not
+      // access the subtarget here now.
+      auto InterVec = DAG.getNode(
+          RISCVISD::VMV_V_X_VL, DL, InterVT, DAG.getUNDEF(InterVT), Lo,
+                                  DAG.getRegister(RISCV::X0, MVT::i32));
+      return DAG.getNode(ISD::BITCAST, DL, VT, InterVec);
+    }
   }
 
   // Fall back to a stack store and stride x0 vector load.
-  return DAG.getNode(RISCVISD::SPLAT_VECTOR_SPLIT_I64_VL, DL, VT, Lo, Hi, VL);
+  return DAG.getNode(RISCVISD::SPLAT_VECTOR_SPLIT_I64_VL, DL, VT, Passthru, Lo,
+                     Hi, VL);
 }
 
 // Called by type legalization to handle splat of i64 on RV32.
 // FIXME: We can optimize this when the type has sign or zero bits in one
 // of the halves.
-static SDValue splatSplitI64WithVL(const SDLoc &DL, MVT VT, SDValue Scalar,
-                                   SDValue VL, SelectionDAG &DAG) {
+static SDValue splatSplitI64WithVL(const SDLoc &DL, MVT VT, SDValue Passthru,
+                                   SDValue Scalar, SDValue VL,
+                                   SelectionDAG &DAG) {
   assert(Scalar.getValueType() == MVT::i64 && "Unexpected VT!");
   SDValue Lo = DAG.getNode(ISD::EXTRACT_ELEMENT, DL, MVT::i32, Scalar,
                            DAG.getConstant(0, DL, MVT::i32));
   SDValue Hi = DAG.getNode(ISD::EXTRACT_ELEMENT, DL, MVT::i32, Scalar,
                            DAG.getConstant(1, DL, MVT::i32));
-  return splatPartsI64WithVL(DL, VT, Lo, Hi, VL, DAG);
+  return splatPartsI64WithVL(DL, VT, Passthru, Lo, Hi, VL, DAG);
 }
 
 // This function lowers a splat of a scalar operand Splat with the vector
 // length VL. It ensures the final sequence is type legal, which is useful when
 // lowering a splat after type legalization.
-static SDValue lowerScalarSplat(SDValue Scalar, SDValue VL, MVT VT, SDLoc DL,
-                                SelectionDAG &DAG,
+static SDValue lowerScalarSplat(SDValue Passthru, SDValue Scalar, SDValue VL,
+                                MVT VT, SDLoc DL, SelectionDAG &DAG,
                                 const RISCVSubtarget &Subtarget) {
-  if (VT.isFloatingPoint())
-    return DAG.getNode(RISCVISD::VFMV_V_F_VL, DL, VT, Scalar, VL);
+  bool HasPassthru = Passthru && !Passthru.isUndef();
+  if (!HasPassthru && !Passthru)
+    Passthru = DAG.getUNDEF(VT);
+  if (VT.isFloatingPoint()) {
+    // If VL is 1, we could use vfmv.s.f.
+    if (isOneConstant(VL))
+      return DAG.getNode(RISCVISD::VFMV_S_F_VL, DL, VT, Passthru, Scalar, VL);
+    return DAG.getNode(RISCVISD::VFMV_V_F_VL, DL, VT, Passthru, Scalar, VL);
+  }
 
   MVT XLenVT = Subtarget.getXLenVT();
 
@@ -1809,14 +2785,388 @@ static SDValue lowerScalarSplat(SDValue Scalar, SDValue VL, MVT VT, SDLoc DL,
     unsigned ExtOpc =
         isa<ConstantSDNode>(Scalar) ? ISD::SIGN_EXTEND : ISD::ANY_EXTEND;
     Scalar = DAG.getNode(ExtOpc, DL, XLenVT, Scalar);
-    return DAG.getNode(RISCVISD::VMV_V_X_VL, DL, VT, Scalar, VL);
+    ConstantSDNode *Const = dyn_cast<ConstantSDNode>(Scalar);
+    // If VL is 1 and the scalar value won't benefit from immediate, we could
+    // use vmv.s.x.
+    if (isOneConstant(VL) &&
+        (!Const || isNullConstant(Scalar) || !isInt<5>(Const->getSExtValue())))
+      return DAG.getNode(RISCVISD::VMV_S_X_VL, DL, VT, Passthru, Scalar, VL);
+    return DAG.getNode(RISCVISD::VMV_V_X_VL, DL, VT, Passthru, Scalar, VL);
   }
 
   assert(XLenVT == MVT::i32 && Scalar.getValueType() == MVT::i64 &&
          "Unexpected scalar for splat lowering!");
 
+  if (isOneConstant(VL) && isNullConstant(Scalar))
+    return DAG.getNode(RISCVISD::VMV_S_X_VL, DL, VT, Passthru,
+                       DAG.getConstant(0, DL, XLenVT), VL);
+
   // Otherwise use the more complicated splatting algorithm.
-  return splatSplitI64WithVL(DL, VT, Scalar, VL, DAG);
+  return splatSplitI64WithVL(DL, VT, Passthru, Scalar, VL, DAG);
+}
+
+static MVT getLMUL1VT(MVT VT) {
+  assert(VT.getVectorElementType().getSizeInBits() <= 64 &&
+         "Unexpected vector MVT");
+  return MVT::getScalableVectorVT(
+      VT.getVectorElementType(),
+      RISCV::RVVBitsPerBlock / VT.getVectorElementType().getSizeInBits());
+}
+
+// This function lowers an insert of a scalar operand Scalar into lane
+// 0 of the vector regardless of the value of VL.  The contents of the
+// remaining lanes of the result vector are unspecified.  VL is assumed
+// to be non-zero.
+static SDValue lowerScalarInsert(SDValue Scalar, SDValue VL,
+                                 MVT VT, SDLoc DL, SelectionDAG &DAG,
+                                 const RISCVSubtarget &Subtarget) {
+  const MVT XLenVT = Subtarget.getXLenVT();
+
+  SDValue Passthru = DAG.getUNDEF(VT);
+  if (VT.isFloatingPoint()) {
+    // TODO: Use vmv.v.i for appropriate constants
+    // Use M1 or smaller to avoid over constraining register allocation
+    const MVT M1VT = getLMUL1VT(VT);
+    auto InnerVT = VT.bitsLE(M1VT) ? VT : M1VT;
+    SDValue Result = DAG.getNode(RISCVISD::VFMV_S_F_VL, DL, InnerVT,
+                                 DAG.getUNDEF(InnerVT), Scalar, VL);
+    if (VT != InnerVT)
+      Result = DAG.getNode(ISD::INSERT_SUBVECTOR, DL, VT,
+                           DAG.getUNDEF(VT),
+                           Result, DAG.getConstant(0, DL, XLenVT));
+    return Result;
+  }
+
+
+  // Avoid the tricky legalization cases by falling back to using the
+  // splat code which already handles it gracefully.
+  if (!Scalar.getValueType().bitsLE(XLenVT))
+    return lowerScalarSplat(DAG.getUNDEF(VT), Scalar,
+                            DAG.getConstant(1, DL, XLenVT),
+                            VT, DL, DAG, Subtarget);
+
+  // If the operand is a constant, sign extend to increase our chances
+  // of being able to use a .vi instruction. ANY_EXTEND would become a
+  // a zero extend and the simm5 check in isel would fail.
+  // FIXME: Should we ignore the upper bits in isel instead?
+  unsigned ExtOpc =
+    isa<ConstantSDNode>(Scalar) ? ISD::SIGN_EXTEND : ISD::ANY_EXTEND;
+  Scalar = DAG.getNode(ExtOpc, DL, XLenVT, Scalar);
+  // We use a vmv.v.i if possible.  We limit this to LMUL1.  LMUL2 or
+  // higher would involve overly constraining the register allocator for
+  // no purpose.
+  if (ConstantSDNode *Const = dyn_cast<ConstantSDNode>(Scalar)) {
+    if (!isNullConstant(Scalar) && isInt<5>(Const->getSExtValue()) &&
+        VT.bitsLE(getLMUL1VT(VT)))
+      return DAG.getNode(RISCVISD::VMV_V_X_VL, DL, VT, Passthru, Scalar, VL);
+  }
+  // Use M1 or smaller to avoid over constraining register allocation
+  const MVT M1VT = getLMUL1VT(VT);
+  auto InnerVT = VT.bitsLE(M1VT) ? VT : M1VT;
+  SDValue Result = DAG.getNode(RISCVISD::VMV_S_X_VL, DL, InnerVT,
+                               DAG.getUNDEF(InnerVT), Scalar, VL);
+  if (VT != InnerVT)
+    Result = DAG.getNode(ISD::INSERT_SUBVECTOR, DL, VT,
+                         DAG.getUNDEF(VT),
+                         Result, DAG.getConstant(0, DL, XLenVT));
+  return Result;
+
+}
+
+static bool isInterleaveShuffle(ArrayRef<int> Mask, MVT VT, bool &SwapSources,
+                                const RISCVSubtarget &Subtarget) {
+  // We need to be able to widen elements to the next larger integer type.
+  if (VT.getScalarSizeInBits() >= Subtarget.getELEN())
+    return false;
+
+  int Size = Mask.size();
+  assert(Size == (int)VT.getVectorNumElements() && "Unexpected mask size");
+
+  int Srcs[] = {-1, -1};
+  for (int i = 0; i != Size; ++i) {
+    // Ignore undef elements.
+    if (Mask[i] < 0)
+      continue;
+
+    // Is this an even or odd element.
+    int Pol = i % 2;
+
+    // Ensure we consistently use the same source for this element polarity.
+    int Src = Mask[i] / Size;
+    if (Srcs[Pol] < 0)
+      Srcs[Pol] = Src;
+    if (Srcs[Pol] != Src)
+      return false;
+
+    // Make sure the element within the source is appropriate for this element
+    // in the destination.
+    int Elt = Mask[i] % Size;
+    if (Elt != i / 2)
+      return false;
+  }
+
+  // We need to find a source for each polarity and they can't be the same.
+  if (Srcs[0] < 0 || Srcs[1] < 0 || Srcs[0] == Srcs[1])
+    return false;
+
+  // Swap the sources if the second source was in the even polarity.
+  SwapSources = Srcs[0] > Srcs[1];
+
+  return true;
+}
+
+/// Match shuffles that concatenate two vectors, rotate the concatenation,
+/// and then extract the original number of elements from the rotated result.
+/// This is equivalent to vector.splice or X86's PALIGNR instruction. The
+/// returned rotation amount is for a rotate right, where elements move from
+/// higher elements to lower elements. \p LoSrc indicates the first source
+/// vector of the rotate or -1 for undef. \p HiSrc indicates the second vector
+/// of the rotate or -1 for undef. At least one of \p LoSrc and \p HiSrc will be
+/// 0 or 1 if a rotation is found.
+///
+/// NOTE: We talk about rotate to the right which matches how bit shift and
+/// rotate instructions are described where LSBs are on the right, but LLVM IR
+/// and the table below write vectors with the lowest elements on the left.
+static int isElementRotate(int &LoSrc, int &HiSrc, ArrayRef<int> Mask) {
+  int Size = Mask.size();
+
+  // We need to detect various ways of spelling a rotation:
+  //   [11, 12, 13, 14, 15,  0,  1,  2]
+  //   [-1, 12, 13, 14, -1, -1,  1, -1]
+  //   [-1, -1, -1, -1, -1, -1,  1,  2]
+  //   [ 3,  4,  5,  6,  7,  8,  9, 10]
+  //   [-1,  4,  5,  6, -1, -1,  9, -1]
+  //   [-1,  4,  5,  6, -1, -1, -1, -1]
+  int Rotation = 0;
+  LoSrc = -1;
+  HiSrc = -1;
+  for (int i = 0; i != Size; ++i) {
+    int M = Mask[i];
+    if (M < 0)
+      continue;
+
+    // Determine where a rotate vector would have started.
+    int StartIdx = i - (M % Size);
+    // The identity rotation isn't interesting, stop.
+    if (StartIdx == 0)
+      return -1;
+
+    // If we found the tail of a vector the rotation must be the missing
+    // front. If we found the head of a vector, it must be how much of the
+    // head.
+    int CandidateRotation = StartIdx < 0 ? -StartIdx : Size - StartIdx;
+
+    if (Rotation == 0)
+      Rotation = CandidateRotation;
+    else if (Rotation != CandidateRotation)
+      // The rotations don't match, so we can't match this mask.
+      return -1;
+
+    // Compute which value this mask is pointing at.
+    int MaskSrc = M < Size ? 0 : 1;
+
+    // Compute which of the two target values this index should be assigned to.
+    // This reflects whether the high elements are remaining or the low elemnts
+    // are remaining.
+    int &TargetSrc = StartIdx < 0 ? HiSrc : LoSrc;
+
+    // Either set up this value if we've not encountered it before, or check
+    // that it remains consistent.
+    if (TargetSrc < 0)
+      TargetSrc = MaskSrc;
+    else if (TargetSrc != MaskSrc)
+      // This may be a rotation, but it pulls from the inputs in some
+      // unsupported interleaving.
+      return -1;
+  }
+
+  // Check that we successfully analyzed the mask, and normalize the results.
+  assert(Rotation != 0 && "Failed to locate a viable rotation!");
+  assert((LoSrc >= 0 || HiSrc >= 0) &&
+         "Failed to find a rotated input vector!");
+
+  return Rotation;
+}
+
+// Lower the following shuffles to vnsrl.
+// t34: v8i8 = extract_subvector t11, Constant:i64<0>
+// t33: v8i8 = extract_subvector t11, Constant:i64<8>
+// a) t35: v8i8 = vector_shuffle<0,2,4,6,8,10,12,14> t34, t33
+// b) t35: v8i8 = vector_shuffle<1,3,5,7,9,11,13,15> t34, t33
+static SDValue lowerVECTOR_SHUFFLEAsVNSRL(const SDLoc &DL, MVT VT,
+                                          MVT ContainerVT, SDValue V1,
+                                          SDValue V2, SDValue TrueMask,
+                                          SDValue VL, ArrayRef<int> Mask,
+                                          const RISCVSubtarget &Subtarget,
+                                          SelectionDAG &DAG) {
+  // Need to be able to widen the vector.
+  if (VT.getScalarSizeInBits() >= Subtarget.getELEN())
+    return SDValue();
+
+  // Both input must be extracts.
+  if (V1.getOpcode() != ISD::EXTRACT_SUBVECTOR ||
+      V2.getOpcode() != ISD::EXTRACT_SUBVECTOR)
+    return SDValue();
+
+  // Extracting from the same source.
+  SDValue Src = V1.getOperand(0);
+  if (Src != V2.getOperand(0))
+    return SDValue();
+
+  // Src needs to have twice the number of elements.
+  if (Src.getValueType().getVectorNumElements() != (Mask.size() * 2))
+    return SDValue();
+
+  // The extracts must extract the two halves of the source.
+  if (V1.getConstantOperandVal(1) != 0 ||
+      V2.getConstantOperandVal(1) != Mask.size())
+    return SDValue();
+
+  // First index must be the first even or odd element from V1.
+  if (Mask[0] != 0 && Mask[0] != 1)
+    return SDValue();
+
+  // The others must increase by 2 each time.
+  // TODO: Support undef elements?
+  for (unsigned i = 1; i != Mask.size(); ++i)
+    if (Mask[i] != Mask[i - 1] + 2)
+      return SDValue();
+
+  // Convert the source using a container type with twice the elements. Since
+  // source VT is legal and twice this VT, we know VT isn't LMUL=8 so it is
+  // safe to double.
+  MVT DoubleContainerVT =
+      MVT::getVectorVT(ContainerVT.getVectorElementType(),
+                       ContainerVT.getVectorElementCount() * 2);
+  Src = convertToScalableVector(DoubleContainerVT, Src, DAG, Subtarget);
+
+  // Convert the vector to a wider integer type with the original element
+  // count. This also converts FP to int.
+  unsigned EltBits = ContainerVT.getScalarSizeInBits();
+  MVT WideIntEltVT = MVT::getIntegerVT(EltBits * 2);
+  MVT WideIntContainerVT =
+      MVT::getVectorVT(WideIntEltVT, ContainerVT.getVectorElementCount());
+  Src = DAG.getBitcast(WideIntContainerVT, Src);
+
+  // Convert to the integer version of the container type.
+  MVT IntEltVT = MVT::getIntegerVT(EltBits);
+  MVT IntContainerVT =
+      MVT::getVectorVT(IntEltVT, ContainerVT.getVectorElementCount());
+
+  // If we want even elements, then the shift amount is 0. Otherwise, shift by
+  // the original element size.
+  unsigned Shift = Mask[0] == 0 ? 0 : EltBits;
+  SDValue SplatShift = DAG.getNode(
+      RISCVISD::VMV_V_X_VL, DL, IntContainerVT, DAG.getUNDEF(ContainerVT),
+      DAG.getConstant(Shift, DL, Subtarget.getXLenVT()), VL);
+  SDValue Res =
+      DAG.getNode(RISCVISD::VNSRL_VL, DL, IntContainerVT, Src, SplatShift,
+                  DAG.getUNDEF(IntContainerVT), TrueMask, VL);
+  // Cast back to FP if needed.
+  Res = DAG.getBitcast(ContainerVT, Res);
+
+  return convertFromScalableVector(VT, Res, DAG, Subtarget);
+}
+
+static SDValue
+getVSlidedown(SelectionDAG &DAG, const RISCVSubtarget &Subtarget, SDLoc DL,
+              EVT VT, SDValue Merge, SDValue Op, SDValue Offset, SDValue Mask,
+              SDValue VL,
+              unsigned Policy = RISCVII::TAIL_UNDISTURBED_MASK_UNDISTURBED) {
+  if (Merge.isUndef())
+    Policy = RISCVII::TAIL_AGNOSTIC | RISCVII::MASK_AGNOSTIC;
+  SDValue PolicyOp = DAG.getTargetConstant(Policy, DL, Subtarget.getXLenVT());
+  SDValue Ops[] = {Merge, Op, Offset, Mask, VL, PolicyOp};
+  return DAG.getNode(RISCVISD::VSLIDEDOWN_VL, DL, VT, Ops);
+}
+
+static SDValue
+getVSlideup(SelectionDAG &DAG, const RISCVSubtarget &Subtarget, SDLoc DL,
+            EVT VT, SDValue Merge, SDValue Op, SDValue Offset, SDValue Mask,
+            SDValue VL,
+            unsigned Policy = RISCVII::TAIL_UNDISTURBED_MASK_UNDISTURBED) {
+  if (Merge.isUndef())
+    Policy = RISCVII::TAIL_AGNOSTIC | RISCVII::MASK_AGNOSTIC;
+  SDValue PolicyOp = DAG.getTargetConstant(Policy, DL, Subtarget.getXLenVT());
+  SDValue Ops[] = {Merge, Op, Offset, Mask, VL, PolicyOp};
+  return DAG.getNode(RISCVISD::VSLIDEUP_VL, DL, VT, Ops);
+}
+
+// Lower the following shuffle to vslidedown.
+// a)
+// t49: v8i8 = extract_subvector t13, Constant:i64<0>
+// t109: v8i8 = extract_subvector t13, Constant:i64<8>
+// t108: v8i8 = vector_shuffle<1,2,3,4,5,6,7,8> t49, t106
+// b)
+// t69: v16i16 = extract_subvector t68, Constant:i64<0>
+// t23: v8i16 = extract_subvector t69, Constant:i64<0>
+// t29: v4i16 = extract_subvector t23, Constant:i64<4>
+// t26: v8i16 = extract_subvector t69, Constant:i64<8>
+// t30: v4i16 = extract_subvector t26, Constant:i64<0>
+// t54: v4i16 = vector_shuffle<1,2,3,4> t29, t30
+static SDValue lowerVECTOR_SHUFFLEAsVSlidedown(const SDLoc &DL, MVT VT,
+                                               SDValue V1, SDValue V2,
+                                               ArrayRef<int> Mask,
+                                               const RISCVSubtarget &Subtarget,
+                                               SelectionDAG &DAG) {
+  auto findNonEXTRACT_SUBVECTORParent =
+      [](SDValue Parent) -> std::pair<SDValue, uint64_t> {
+    uint64_t Offset = 0;
+    while (Parent.getOpcode() == ISD::EXTRACT_SUBVECTOR &&
+           // EXTRACT_SUBVECTOR can be used to extract a fixed-width vector from
+           // a scalable vector. But we don't want to match the case.
+           Parent.getOperand(0).getSimpleValueType().isFixedLengthVector()) {
+      Offset += Parent.getConstantOperandVal(1);
+      Parent = Parent.getOperand(0);
+    }
+    return std::make_pair(Parent, Offset);
+  };
+
+  auto [V1Src, V1IndexOffset] = findNonEXTRACT_SUBVECTORParent(V1);
+  auto [V2Src, V2IndexOffset] = findNonEXTRACT_SUBVECTORParent(V2);
+
+  // Extracting from the same source.
+  SDValue Src = V1Src;
+  if (Src != V2Src)
+    return SDValue();
+
+  // Rebuild mask because Src may be from multiple EXTRACT_SUBVECTORs.
+  SmallVector<int, 16> NewMask(Mask);
+  for (size_t i = 0; i != NewMask.size(); ++i) {
+    if (NewMask[i] == -1)
+      continue;
+
+    if (static_cast<size_t>(NewMask[i]) < NewMask.size()) {
+      NewMask[i] = NewMask[i] + V1IndexOffset;
+    } else {
+      // Minus NewMask.size() is needed. Otherwise, the b case would be
+      // <5,6,7,12> instead of <5,6,7,8>.
+      NewMask[i] = NewMask[i] - NewMask.size() + V2IndexOffset;
+    }
+  }
+
+  // First index must be known and non-zero. It will be used as the slidedown
+  // amount.
+  if (NewMask[0] <= 0)
+    return SDValue();
+
+  // NewMask is also continuous.
+  for (unsigned i = 1; i != NewMask.size(); ++i)
+    if (NewMask[i - 1] + 1 != NewMask[i])
+      return SDValue();
+
+  MVT XLenVT = Subtarget.getXLenVT();
+  MVT SrcVT = Src.getSimpleValueType();
+  MVT ContainerVT = getContainerForFixedLengthVector(DAG, SrcVT, Subtarget);
+  auto [TrueMask, VL] = getDefaultVLOps(SrcVT, ContainerVT, DL, DAG, Subtarget);
+  SDValue Slidedown =
+      getVSlidedown(DAG, Subtarget, DL, ContainerVT, DAG.getUNDEF(ContainerVT),
+                    convertToScalableVector(ContainerVT, Src, DAG, Subtarget),
+                    DAG.getConstant(NewMask[0], DL, XLenVT), TrueMask, VL);
+  return DAG.getNode(
+      ISD::EXTRACT_SUBVECTOR, DL, VT,
+      convertFromScalableVector(SrcVT, Slidedown, DAG, Subtarget),
+      DAG.getConstant(0, DL, XLenVT));
 }
 
 static SDValue lowerVECTOR_SHUFFLE(SDValue Op, SelectionDAG &DAG,
@@ -1831,8 +3181,7 @@ static SDValue lowerVECTOR_SHUFFLE(SDValue Op, SelectionDAG &DAG,
 
   MVT ContainerVT = getContainerForFixedLengthVector(DAG, VT, Subtarget);
 
-  SDValue TrueMask, VL;
-  std::tie(TrueMask, VL) = getDefaultVLOps(VT, ContainerVT, DL, DAG, Subtarget);
+  auto [TrueMask, VL] = getDefaultVLOps(VT, ContainerVT, DL, DAG, Subtarget);
 
   if (SVN->isSplat()) {
     const int Lane = SVN->getSplatIndex();
@@ -1864,8 +3213,12 @@ static SDValue lowerVECTOR_SHUFFLE(SDValue Op, SelectionDAG &DAG,
           SDVTList VTs = DAG.getVTList({ContainerVT, MVT::Other});
           SDValue IntID =
               DAG.getTargetConstant(Intrinsic::riscv_vlse, DL, XLenVT);
-          SDValue Ops[] = {Ld->getChain(), IntID, NewAddr,
-                           DAG.getRegister(RISCV::X0, XLenVT), VL};
+          SDValue Ops[] = {Ld->getChain(),
+                           IntID,
+                           DAG.getUNDEF(ContainerVT),
+                           NewAddr,
+                           DAG.getRegister(RISCV::X0, XLenVT),
+                           VL};
           SDValue NewLoad = DAG.getMemIntrinsicNode(
               ISD::INTRINSIC_W_CHAIN, DL, VTs, Ops, SVT,
               DAG.getMachineFunction().getMachineMemOperand(
@@ -1891,23 +3244,146 @@ static SDValue lowerVECTOR_SHUFFLE(SDValue Op, SelectionDAG &DAG,
 
         unsigned Opc =
             VT.isFloatingPoint() ? RISCVISD::VFMV_V_F_VL : RISCVISD::VMV_V_X_VL;
-        SDValue Splat = DAG.getNode(Opc, DL, ContainerVT, V, VL);
+        SDValue Splat =
+            DAG.getNode(Opc, DL, ContainerVT, DAG.getUNDEF(ContainerVT), V, VL);
         return convertFromScalableVector(VT, Splat, DAG, Subtarget);
       }
 
       V1 = convertToScalableVector(ContainerVT, V1, DAG, Subtarget);
       assert(Lane < (int)NumElts && "Unexpected lane!");
-      SDValue Gather =
-          DAG.getNode(RISCVISD::VRGATHER_VX_VL, DL, ContainerVT, V1,
-                      DAG.getConstant(Lane, DL, XLenVT), TrueMask, VL);
+      SDValue Gather = DAG.getNode(RISCVISD::VRGATHER_VX_VL, DL, ContainerVT,
+                                   V1, DAG.getConstant(Lane, DL, XLenVT),
+                                   DAG.getUNDEF(ContainerVT), TrueMask, VL);
       return convertFromScalableVector(VT, Gather, DAG, Subtarget);
     }
   }
 
+  ArrayRef<int> Mask = SVN->getMask();
+
+  if (SDValue V =
+          lowerVECTOR_SHUFFLEAsVSlidedown(DL, VT, V1, V2, Mask, Subtarget, DAG))
+    return V;
+
+  // Lower rotations to a SLIDEDOWN and a SLIDEUP. One of the source vectors may
+  // be undef which can be handled with a single SLIDEDOWN/UP.
+  int LoSrc, HiSrc;
+  int Rotation = isElementRotate(LoSrc, HiSrc, Mask);
+  if (Rotation > 0) {
+    SDValue LoV, HiV;
+    if (LoSrc >= 0) {
+      LoV = LoSrc == 0 ? V1 : V2;
+      LoV = convertToScalableVector(ContainerVT, LoV, DAG, Subtarget);
+    }
+    if (HiSrc >= 0) {
+      HiV = HiSrc == 0 ? V1 : V2;
+      HiV = convertToScalableVector(ContainerVT, HiV, DAG, Subtarget);
+    }
+
+    // We found a rotation. We need to slide HiV down by Rotation. Then we need
+    // to slide LoV up by (NumElts - Rotation).
+    unsigned InvRotate = NumElts - Rotation;
+
+    SDValue Res = DAG.getUNDEF(ContainerVT);
+    if (HiV) {
+      // If we are doing a SLIDEDOWN+SLIDEUP, reduce the VL for the SLIDEDOWN.
+      // FIXME: If we are only doing a SLIDEDOWN, don't reduce the VL as it
+      // causes multiple vsetvlis in some test cases such as lowering
+      // reduce.mul
+      SDValue DownVL = VL;
+      if (LoV)
+        DownVL = DAG.getConstant(InvRotate, DL, XLenVT);
+      Res = getVSlidedown(DAG, Subtarget, DL, ContainerVT, Res, HiV,
+                          DAG.getConstant(Rotation, DL, XLenVT), TrueMask,
+                          DownVL);
+    }
+    if (LoV)
+      Res = getVSlideup(DAG, Subtarget, DL, ContainerVT, Res, LoV,
+                        DAG.getConstant(InvRotate, DL, XLenVT), TrueMask, VL,
+                        RISCVII::TAIL_AGNOSTIC);
+
+    return convertFromScalableVector(VT, Res, DAG, Subtarget);
+  }
+
+  if (SDValue V = lowerVECTOR_SHUFFLEAsVNSRL(
+          DL, VT, ContainerVT, V1, V2, TrueMask, VL, Mask, Subtarget, DAG))
+    return V;
+
+  // Detect an interleave shuffle and lower to
+  // (vmaccu.vx (vwaddu.vx lohalf(V1), lohalf(V2)), lohalf(V2), (2^eltbits - 1))
+  bool SwapSources;
+  if (isInterleaveShuffle(Mask, VT, SwapSources, Subtarget)) {
+    // Swap sources if needed.
+    if (SwapSources)
+      std::swap(V1, V2);
+
+    // Extract the lower half of the vectors.
+    MVT HalfVT = VT.getHalfNumVectorElementsVT();
+    V1 = DAG.getNode(ISD::EXTRACT_SUBVECTOR, DL, HalfVT, V1,
+                     DAG.getConstant(0, DL, XLenVT));
+    V2 = DAG.getNode(ISD::EXTRACT_SUBVECTOR, DL, HalfVT, V2,
+                     DAG.getConstant(0, DL, XLenVT));
+
+    // Double the element width and halve the number of elements in an int type.
+    unsigned EltBits = VT.getScalarSizeInBits();
+    MVT WideIntEltVT = MVT::getIntegerVT(EltBits * 2);
+    MVT WideIntVT =
+        MVT::getVectorVT(WideIntEltVT, VT.getVectorNumElements() / 2);
+    // Convert this to a scalable vector. We need to base this on the
+    // destination size to ensure there's always a type with a smaller LMUL.
+    MVT WideIntContainerVT =
+        getContainerForFixedLengthVector(DAG, WideIntVT, Subtarget);
+
+    // Convert sources to scalable vectors with the same element count as the
+    // larger type.
+    MVT HalfContainerVT = MVT::getVectorVT(
+        VT.getVectorElementType(), WideIntContainerVT.getVectorElementCount());
+    V1 = convertToScalableVector(HalfContainerVT, V1, DAG, Subtarget);
+    V2 = convertToScalableVector(HalfContainerVT, V2, DAG, Subtarget);
+
+    // Cast sources to integer.
+    MVT IntEltVT = MVT::getIntegerVT(EltBits);
+    MVT IntHalfVT =
+        MVT::getVectorVT(IntEltVT, HalfContainerVT.getVectorElementCount());
+    V1 = DAG.getBitcast(IntHalfVT, V1);
+    V2 = DAG.getBitcast(IntHalfVT, V2);
+
+    // Freeze V2 since we use it twice and we need to be sure that the add and
+    // multiply see the same value.
+    V2 = DAG.getFreeze(V2);
+
+    // Recreate TrueMask using the widened type's element count.
+    TrueMask = getAllOnesMask(HalfContainerVT, VL, DL, DAG);
+
+    // Widen V1 and V2 with 0s and add one copy of V2 to V1.
+    SDValue Add =
+        DAG.getNode(RISCVISD::VWADDU_VL, DL, WideIntContainerVT, V1, V2,
+                    DAG.getUNDEF(WideIntContainerVT), TrueMask, VL);
+    // Create 2^eltbits - 1 copies of V2 by multiplying by the largest integer.
+    SDValue Multiplier = DAG.getNode(RISCVISD::VMV_V_X_VL, DL, IntHalfVT,
+                                     DAG.getUNDEF(IntHalfVT),
+                                     DAG.getAllOnesConstant(DL, XLenVT), VL);
+    SDValue WidenMul =
+        DAG.getNode(RISCVISD::VWMULU_VL, DL, WideIntContainerVT, V2, Multiplier,
+                    DAG.getUNDEF(WideIntContainerVT), TrueMask, VL);
+    // Add the new copies to our previous addition giving us 2^eltbits copies of
+    // V2. This is equivalent to shifting V2 left by eltbits. This should
+    // combine with the vwmulu.vv above to form vwmaccu.vv.
+    Add = DAG.getNode(RISCVISD::ADD_VL, DL, WideIntContainerVT, Add, WidenMul,
+                      DAG.getUNDEF(WideIntContainerVT), TrueMask, VL);
+    // Cast back to ContainerVT. We need to re-create a new ContainerVT in case
+    // WideIntContainerVT is a larger fractional LMUL than implied by the fixed
+    // vector VT.
+    ContainerVT =
+        MVT::getVectorVT(VT.getVectorElementType(),
+                         WideIntContainerVT.getVectorElementCount() * 2);
+    Add = DAG.getBitcast(ContainerVT, Add);
+    return convertFromScalableVector(VT, Add, DAG, Subtarget);
+  }
+
   // Detect shuffles which can be re-expressed as vector selects; these are
   // shuffles in which each element in the destination is taken from an element
   // at the corresponding index in either source vectors.
-  bool IsSelect = all_of(enumerate(SVN->getMask()), [&](const auto &MaskIdx) {
+  bool IsSelect = all_of(enumerate(Mask), [&](const auto &MaskIdx) {
     int MaskIndex = MaskIdx.value();
     return MaskIndex < 0 || MaskIdx.index() == (unsigned)MaskIndex % NumElts;
   });
@@ -1926,10 +3402,14 @@ static SDValue lowerVECTOR_SHUFFLE(SDValue Op, SelectionDAG &DAG,
   bool SwapOps = DAG.isSplatValue(V2) && !DAG.isSplatValue(V1);
   bool InvertMask = IsSelect == SwapOps;
 
+  // Keep a track of which non-undef indices are used by each LHS/RHS shuffle
+  // half.
+  DenseMap<int, unsigned> LHSIndexCounts, RHSIndexCounts;
+
   // Now construct the mask that will be used by the vselect or blended
   // vrgather operation. For vrgathers, construct the appropriate indices into
   // each vector.
-  for (int MaskIndex : SVN->getMask()) {
+  for (int MaskIndex : Mask) {
     bool SelectMaskVal = (MaskIndex < (int)NumElts) ^ InvertMask;
     MaskVals.push_back(DAG.getConstant(SelectMaskVal, DL, XLenVT));
     if (!IsSelect) {
@@ -1940,6 +3420,10 @@ static SDValue lowerVECTOR_SHUFFLE(SDValue Op, SelectionDAG &DAG,
       GatherIndicesRHS.push_back(
           IsLHSOrUndefIndex ? DAG.getUNDEF(XLenVT)
                             : DAG.getConstant(MaskIndex - NumElts, DL, XLenVT));
+      if (IsLHSOrUndefIndex && MaskIndex >= 0)
+        ++LHSIndexCounts[MaskIndex];
+      if (!IsLHSOrUndefIndex)
+        ++RHSIndexCounts[MaskIndex - NumElts];
     }
   }
 
@@ -1963,13 +3447,14 @@ static SDValue lowerVECTOR_SHUFFLE(SDValue Op, SelectionDAG &DAG,
     return SDValue();
   }
 
-  unsigned GatherOpc = RISCVISD::VRGATHER_VV_VL;
+  unsigned GatherVXOpc = RISCVISD::VRGATHER_VX_VL;
+  unsigned GatherVVOpc = RISCVISD::VRGATHER_VV_VL;
   MVT IndexVT = VT.changeTypeToInteger();
   // Since we can't introduce illegal index types at this stage, use i16 and
   // vrgatherei16 if the corresponding index type for plain vrgather is greater
   // than XLenVT.
   if (IndexVT.getScalarType().bitsGT(XLenVT)) {
-    GatherOpc = RISCVISD::VRGATHEREI16_VV_VL;
+    GatherVVOpc = RISCVISD::VRGATHEREI16_VV_VL;
     IndexVT = IndexVT.changeVectorElementType(MVT::i16);
   }
 
@@ -1980,50 +3465,156 @@ static SDValue lowerVECTOR_SHUFFLE(SDValue Op, SelectionDAG &DAG,
   // TODO: This doesn't trigger for i64 vectors on RV32, since there we
   // encounter a bitcasted BUILD_VECTOR with low/high i32 values.
   if (SDValue SplatValue = DAG.getSplatValue(V1, /*LegalTypes*/ true)) {
-    Gather = lowerScalarSplat(SplatValue, VL, ContainerVT, DL, DAG, Subtarget);
+    Gather = lowerScalarSplat(SDValue(), SplatValue, VL, ContainerVT, DL, DAG,
+                              Subtarget);
   } else {
-    SDValue LHSIndices = DAG.getBuildVector(IndexVT, DL, GatherIndicesLHS);
-    LHSIndices =
-        convertToScalableVector(IndexContainerVT, LHSIndices, DAG, Subtarget);
-
     V1 = convertToScalableVector(ContainerVT, V1, DAG, Subtarget);
-    Gather =
-        DAG.getNode(GatherOpc, DL, ContainerVT, V1, LHSIndices, TrueMask, VL);
+    // If only one index is used, we can use a "splat" vrgather.
+    // TODO: We can splat the most-common index and fix-up any stragglers, if
+    // that's beneficial.
+    if (LHSIndexCounts.size() == 1) {
+      int SplatIndex = LHSIndexCounts.begin()->getFirst();
+      Gather = DAG.getNode(GatherVXOpc, DL, ContainerVT, V1,
+                           DAG.getConstant(SplatIndex, DL, XLenVT),
+                           DAG.getUNDEF(ContainerVT), TrueMask, VL);
+    } else {
+      SDValue LHSIndices = DAG.getBuildVector(IndexVT, DL, GatherIndicesLHS);
+      LHSIndices =
+          convertToScalableVector(IndexContainerVT, LHSIndices, DAG, Subtarget);
+
+      Gather = DAG.getNode(GatherVVOpc, DL, ContainerVT, V1, LHSIndices,
+                           DAG.getUNDEF(ContainerVT), TrueMask, VL);
+    }
   }
 
   // If a second vector operand is used by this shuffle, blend it in with an
   // additional vrgather.
   if (!V2.isUndef()) {
-    MVT MaskContainerVT = ContainerVT.changeVectorElementType(MVT::i1);
+    V2 = convertToScalableVector(ContainerVT, V2, DAG, Subtarget);
+
+    MVT MaskContainerVT = ContainerVT.changeVectorElementType(MVT::i1);
     SelectMask =
         convertToScalableVector(MaskContainerVT, SelectMask, DAG, Subtarget);
 
-    SDValue RHSIndices = DAG.getBuildVector(IndexVT, DL, GatherIndicesRHS);
-    RHSIndices =
-        convertToScalableVector(IndexContainerVT, RHSIndices, DAG, Subtarget);
-
-    V2 = convertToScalableVector(ContainerVT, V2, DAG, Subtarget);
-    V2 = DAG.getNode(GatherOpc, DL, ContainerVT, V2, RHSIndices, TrueMask, VL);
-    Gather = DAG.getNode(RISCVISD::VSELECT_VL, DL, ContainerVT, SelectMask, V2,
-                         Gather, VL);
+    // If only one index is used, we can use a "splat" vrgather.
+    // TODO: We can splat the most-common index and fix-up any stragglers, if
+    // that's beneficial.
+    if (RHSIndexCounts.size() == 1) {
+      int SplatIndex = RHSIndexCounts.begin()->getFirst();
+      Gather = DAG.getNode(GatherVXOpc, DL, ContainerVT, V2,
+                           DAG.getConstant(SplatIndex, DL, XLenVT), Gather,
+                           SelectMask, VL);
+    } else {
+      SDValue RHSIndices = DAG.getBuildVector(IndexVT, DL, GatherIndicesRHS);
+      RHSIndices =
+          convertToScalableVector(IndexContainerVT, RHSIndices, DAG, Subtarget);
+      Gather = DAG.getNode(GatherVVOpc, DL, ContainerVT, V2, RHSIndices, Gather,
+                           SelectMask, VL);
+    }
   }
 
   return convertFromScalableVector(VT, Gather, DAG, Subtarget);
 }
 
-static SDValue getRVVFPExtendOrRound(SDValue Op, MVT VT, MVT ContainerVT,
-                                     SDLoc DL, SelectionDAG &DAG,
-                                     const RISCVSubtarget &Subtarget) {
-  if (VT.isScalableVector())
-    return DAG.getFPExtendOrRound(Op, DL, VT);
-  assert(VT.isFixedLengthVector() &&
-         "Unexpected value type for RVV FP extend/round lowering");
-  SDValue Mask, VL;
-  std::tie(Mask, VL) = getDefaultVLOps(VT, ContainerVT, DL, DAG, Subtarget);
-  unsigned RVVOpc = ContainerVT.bitsGT(Op.getSimpleValueType())
-                        ? RISCVISD::FP_EXTEND_VL
-                        : RISCVISD::FP_ROUND_VL;
-  return DAG.getNode(RVVOpc, DL, ContainerVT, Op, Mask, VL);
+bool RISCVTargetLowering::isShuffleMaskLegal(ArrayRef<int> M, EVT VT) const {
+  // Support splats for any type. These should type legalize well.
+  if (ShuffleVectorSDNode::isSplatMask(M.data(), VT))
+    return true;
+
+  // Only support legal VTs for other shuffles for now.
+  if (!isTypeLegal(VT))
+    return false;
+
+  MVT SVT = VT.getSimpleVT();
+
+  bool SwapSources;
+  int LoSrc, HiSrc;
+  return (isElementRotate(LoSrc, HiSrc, M) > 0) ||
+         isInterleaveShuffle(M, SVT, SwapSources, Subtarget);
+}
+
+// Lower CTLZ_ZERO_UNDEF or CTTZ_ZERO_UNDEF by converting to FP and extracting
+// the exponent.
+SDValue
+RISCVTargetLowering::lowerCTLZ_CTTZ_ZERO_UNDEF(SDValue Op,
+                                               SelectionDAG &DAG) const {
+  MVT VT = Op.getSimpleValueType();
+  unsigned EltSize = VT.getScalarSizeInBits();
+  SDValue Src = Op.getOperand(0);
+  SDLoc DL(Op);
+
+  // We choose FP type that can represent the value if possible. Otherwise, we
+  // use rounding to zero conversion for correct exponent of the result.
+  // TODO: Use f16 for i8 when possible?
+  MVT FloatEltVT = (EltSize >= 32) ? MVT::f64 : MVT::f32;
+  if (!isTypeLegal(MVT::getVectorVT(FloatEltVT, VT.getVectorElementCount())))
+    FloatEltVT = MVT::f32;
+  MVT FloatVT = MVT::getVectorVT(FloatEltVT, VT.getVectorElementCount());
+
+  // Legal types should have been checked in the RISCVTargetLowering
+  // constructor.
+  // TODO: Splitting may make sense in some cases.
+  assert(DAG.getTargetLoweringInfo().isTypeLegal(FloatVT) &&
+         "Expected legal float type!");
+
+  // For CTTZ_ZERO_UNDEF, we need to extract the lowest set bit using X & -X.
+  // The trailing zero count is equal to log2 of this single bit value.
+  if (Op.getOpcode() == ISD::CTTZ_ZERO_UNDEF) {
+    SDValue Neg = DAG.getNegative(Src, DL, VT);
+    Src = DAG.getNode(ISD::AND, DL, VT, Src, Neg);
+  }
+
+  // We have a legal FP type, convert to it.
+  SDValue FloatVal;
+  if (FloatVT.bitsGT(VT)) {
+    FloatVal = DAG.getNode(ISD::UINT_TO_FP, DL, FloatVT, Src);
+  } else {
+    // Use RTZ to avoid rounding influencing exponent of FloatVal.
+    MVT ContainerVT = VT;
+    if (VT.isFixedLengthVector()) {
+      ContainerVT = getContainerForFixedLengthVector(VT);
+      Src = convertToScalableVector(ContainerVT, Src, DAG, Subtarget);
+    }
+
+    auto [Mask, VL] = getDefaultVLOps(VT, ContainerVT, DL, DAG, Subtarget);
+    SDValue RTZRM =
+        DAG.getTargetConstant(RISCVFPRndMode::RTZ, DL, Subtarget.getXLenVT());
+    MVT ContainerFloatVT =
+        MVT::getVectorVT(FloatEltVT, ContainerVT.getVectorElementCount());
+    FloatVal = DAG.getNode(RISCVISD::VFCVT_RM_F_XU_VL, DL, ContainerFloatVT,
+                           Src, Mask, RTZRM, VL);
+    if (VT.isFixedLengthVector())
+      FloatVal = convertFromScalableVector(FloatVT, FloatVal, DAG, Subtarget);
+  }
+  // Bitcast to integer and shift the exponent to the LSB.
+  EVT IntVT = FloatVT.changeVectorElementTypeToInteger();
+  SDValue Bitcast = DAG.getBitcast(IntVT, FloatVal);
+  unsigned ShiftAmt = FloatEltVT == MVT::f64 ? 52 : 23;
+  SDValue Exp = DAG.getNode(ISD::SRL, DL, IntVT, Bitcast,
+                            DAG.getConstant(ShiftAmt, DL, IntVT));
+  // Restore back to original type. Truncation after SRL is to generate vnsrl.
+  if (IntVT.bitsLT(VT))
+    Exp = DAG.getNode(ISD::ZERO_EXTEND, DL, VT, Exp);
+  else if (IntVT.bitsGT(VT))
+    Exp = DAG.getNode(ISD::TRUNCATE, DL, VT, Exp);
+  // The exponent contains log2 of the value in biased form.
+  unsigned ExponentBias = FloatEltVT == MVT::f64 ? 1023 : 127;
+
+  // For trailing zeros, we just need to subtract the bias.
+  if (Op.getOpcode() == ISD::CTTZ_ZERO_UNDEF)
+    return DAG.getNode(ISD::SUB, DL, VT, Exp,
+                       DAG.getConstant(ExponentBias, DL, VT));
+
+  // For leading zeros, we need to remove the bias and convert from log2 to
+  // leading zeros. We can do this by subtracting from (Bias + (EltSize - 1)).
+  unsigned Adjust = ExponentBias + (EltSize - 1);
+  SDValue Res =
+      DAG.getNode(ISD::SUB, DL, VT, DAG.getConstant(Adjust, DL, VT), Exp);
+  // The above result with zero input equals to Adjust which is greater than
+  // EltSize. Hence, we can do min(Res, EltSize) for CTLZ.
+  if (Op.getOpcode() == ISD::CTLZ)
+    Res = DAG.getNode(ISD::UMIN, DL, VT, Res, DAG.getConstant(EltSize, DL, VT));
+  return Res;
 }
 
 // While RVV has alignment restrictions, we should always be able to load as a
@@ -2086,11 +3677,54 @@ SDValue RISCVTargetLowering::expandUnalignedRVVStore(SDValue Op,
                       Store->getMemOperand()->getFlags());
 }
 
+static SDValue lowerConstant(SDValue Op, SelectionDAG &DAG,
+                             const RISCVSubtarget &Subtarget) {
+  assert(Op.getValueType() == MVT::i64 && "Unexpected VT");
+
+  int64_t Imm = cast<ConstantSDNode>(Op)->getSExtValue();
+
+  // All simm32 constants should be handled by isel.
+  // NOTE: The getMaxBuildIntsCost call below should return a value >= 2 making
+  // this check redundant, but small immediates are common so this check
+  // should have better compile time.
+  if (isInt<32>(Imm))
+    return Op;
+
+  // We only need to cost the immediate, if constant pool lowering is enabled.
+  if (!Subtarget.useConstantPoolForLargeInts())
+    return Op;
+
+  RISCVMatInt::InstSeq Seq =
+      RISCVMatInt::generateInstSeq(Imm, Subtarget.getFeatureBits());
+  if (Seq.size() <= Subtarget.getMaxBuildIntsCost())
+    return Op;
+
+  // Expand to a constant pool using the default expansion code.
+  return SDValue();
+}
+
+static SDValue LowerATOMIC_FENCE(SDValue Op, SelectionDAG &DAG) {
+  SDLoc dl(Op);
+  SyncScope::ID FenceSSID =
+      static_cast<SyncScope::ID>(Op.getConstantOperandVal(2));
+
+  // singlethread fences only synchronize with signal handlers on the same
+  // thread and thus only need to preserve instruction order, not actually
+  // enforce memory ordering.
+  if (FenceSSID == SyncScope::SingleThread)
+    // MEMBARRIER is a compiler barrier; it codegens to a no-op.
+    return DAG.getNode(ISD::MEMBARRIER, dl, MVT::Other, Op.getOperand(0));
+
+  return Op;
+}
+
 SDValue RISCVTargetLowering::LowerOperation(SDValue Op,
                                             SelectionDAG &DAG) const {
   switch (Op.getOpcode()) {
   default:
     report_fatal_error("unimplemented operand");
+  case ISD::ATOMIC_FENCE:
+    return LowerATOMIC_FENCE(Op, DAG);
   case ISD::GlobalAddress:
     return lowerGlobalAddress(Op, DAG);
   case ISD::BlockAddress:
@@ -2101,6 +3735,8 @@ SDValue RISCVTargetLowering::LowerOperation(SDValue Op,
     return lowerJumpTable(Op, DAG);
   case ISD::GlobalTLSAddress:
     return lowerGlobalTLSAddress(Op, DAG);
+  case ISD::Constant:
+    return lowerConstant(Op, DAG, Subtarget);
   case ISD::SELECT:
     return lowerSELECT(Op, DAG);
   case ISD::BRCOND:
@@ -2123,6 +3759,31 @@ SDValue RISCVTargetLowering::LowerOperation(SDValue Op,
     SDValue Op0 = Op.getOperand(0);
     EVT Op0VT = Op0.getValueType();
     MVT XLenVT = Subtarget.getXLenVT();
+    if (VT == MVT::f16 && Op0VT == MVT::i16 &&
+        Subtarget.hasStdExtZfhOrZfhmin()) {
+      SDValue NewOp0 = DAG.getNode(ISD::ANY_EXTEND, DL, XLenVT, Op0);
+      SDValue FPConv = DAG.getNode(RISCVISD::FMV_H_X, DL, MVT::f16, NewOp0);
+      return FPConv;
+    }
+    if (VT == MVT::f32 && Op0VT == MVT::i32 && Subtarget.is64Bit() &&
+        Subtarget.hasStdExtF()) {
+      SDValue NewOp0 = DAG.getNode(ISD::ANY_EXTEND, DL, MVT::i64, Op0);
+      SDValue FPConv =
+          DAG.getNode(RISCVISD::FMV_W_X_RV64, DL, MVT::f32, NewOp0);
+      return FPConv;
+    }
+
+    // Consider other scalar<->scalar casts as legal if the types are legal.
+    // Otherwise expand them.
+    if (!VT.isVector() && !Op0VT.isVector()) {
+      if (isTypeLegal(VT) && isTypeLegal(Op0VT))
+        return Op;
+      return SDValue();
+    }
+
+    assert(!VT.isScalableVector() && !Op0VT.isScalableVector() &&
+           "Unexpected types");
+
     if (VT.isFixedLengthVector()) {
       // We can handle fixed length vector bitcasts with a simple replacement
       // in isel.
@@ -2132,7 +3793,9 @@ SDValue RISCVTargetLowering::LowerOperation(SDValue Op,
       // into a one-element vector of the result type, and perform a vector
       // bitcast.
       if (!Op0VT.isVector()) {
-        auto BVT = EVT::getVectorVT(*DAG.getContext(), Op0VT, 1);
+        EVT BVT = EVT::getVectorVT(*DAG.getContext(), Op0VT, 1);
+        if (!isTypeLegal(BVT))
+          return SDValue();
         return DAG.getBitcast(VT, DAG.getNode(ISD::INSERT_VECTOR_ELT, DL, BVT,
                                               DAG.getUNDEF(BVT), Op0,
                                               DAG.getConstant(0, DL, XLenVT)));
@@ -2143,107 +3806,35 @@ SDValue RISCVTargetLowering::LowerOperation(SDValue Op,
     // thus: bitcast the vector to a one-element vector type whose element type
     // is the same as the result type, and extract the first element.
     if (!VT.isVector() && Op0VT.isFixedLengthVector()) {
-      LLVMContext &Context = *DAG.getContext();
-      SDValue BVec = DAG.getBitcast(EVT::getVectorVT(Context, VT, 1), Op0);
+      EVT BVT = EVT::getVectorVT(*DAG.getContext(), VT, 1);
+      if (!isTypeLegal(BVT))
+        return SDValue();
+      SDValue BVec = DAG.getBitcast(BVT, Op0);
       return DAG.getNode(ISD::EXTRACT_VECTOR_ELT, DL, VT, BVec,
                          DAG.getConstant(0, DL, XLenVT));
     }
-    if (VT == MVT::f16 && Op0VT == MVT::i16 && Subtarget.hasStdExtZfh()) {
-      SDValue NewOp0 = DAG.getNode(ISD::ANY_EXTEND, DL, XLenVT, Op0);
-      SDValue FPConv = DAG.getNode(RISCVISD::FMV_H_X, DL, MVT::f16, NewOp0);
-      return FPConv;
-    }
-    if (VT == MVT::f32 && Op0VT == MVT::i32 && Subtarget.is64Bit() &&
-        Subtarget.hasStdExtF()) {
-      SDValue NewOp0 = DAG.getNode(ISD::ANY_EXTEND, DL, MVT::i64, Op0);
-      SDValue FPConv =
-          DAG.getNode(RISCVISD::FMV_W_X_RV64, DL, MVT::f32, NewOp0);
-      return FPConv;
-    }
     return SDValue();
   }
   case ISD::INTRINSIC_WO_CHAIN:
     return LowerINTRINSIC_WO_CHAIN(Op, DAG);
   case ISD::INTRINSIC_W_CHAIN:
     return LowerINTRINSIC_W_CHAIN(Op, DAG);
-  case ISD::BSWAP:
+  case ISD::INTRINSIC_VOID:
+    return LowerINTRINSIC_VOID(Op, DAG);
   case ISD::BITREVERSE: {
-    // Convert BSWAP/BITREVERSE to GREVI to enable GREVI combinining.
-    assert(Subtarget.hasStdExtZbp() && "Unexpected custom legalisation");
-    MVT VT = Op.getSimpleValueType();
-    SDLoc DL(Op);
-    // Start with the maximum immediate value which is the bitwidth - 1.
-    unsigned Imm = VT.getSizeInBits() - 1;
-    // If this is BSWAP rather than BITREVERSE, clear the lower 3 bits.
-    if (Op.getOpcode() == ISD::BSWAP)
-      Imm &= ~0x7U;
-    return DAG.getNode(RISCVISD::GREV, DL, VT, Op.getOperand(0),
-                       DAG.getConstant(Imm, DL, VT));
-  }
-  case ISD::FSHL:
-  case ISD::FSHR: {
     MVT VT = Op.getSimpleValueType();
-    assert(VT == Subtarget.getXLenVT() && "Unexpected custom legalization");
-    SDLoc DL(Op);
-    if (Op.getOperand(2).getOpcode() == ISD::Constant)
-      return Op;
-    // FSL/FSR take a log2(XLen)+1 bit shift amount but XLenVT FSHL/FSHR only
-    // use log(XLen) bits. Mask the shift amount accordingly.
-    unsigned ShAmtWidth = Subtarget.getXLen() - 1;
-    SDValue ShAmt = DAG.getNode(ISD::AND, DL, VT, Op.getOperand(2),
-                                DAG.getConstant(ShAmtWidth, DL, VT));
-    unsigned Opc = Op.getOpcode() == ISD::FSHL ? RISCVISD::FSL : RISCVISD::FSR;
-    return DAG.getNode(Opc, DL, VT, Op.getOperand(0), Op.getOperand(1), ShAmt);
-  }
-  case ISD::TRUNCATE: {
     SDLoc DL(Op);
-    MVT VT = Op.getSimpleValueType();
+    assert(Subtarget.hasStdExtZbkb() && "Unexpected custom legalization");
+    assert(Op.getOpcode() == ISD::BITREVERSE && "Unexpected opcode");
+    // Expand bitreverse to a bswap(rev8) followed by brev8.
+    SDValue BSwap = DAG.getNode(ISD::BSWAP, DL, VT, Op.getOperand(0));
+    return DAG.getNode(RISCVISD::BREV8, DL, VT, BSwap);
+  }
+  case ISD::TRUNCATE:
     // Only custom-lower vector truncates
-    if (!VT.isVector())
+    if (!Op.getSimpleValueType().isVector())
       return Op;
-
-    // Truncates to mask types are handled differently
-    if (VT.getVectorElementType() == MVT::i1)
-      return lowerVectorMaskTrunc(Op, DAG);
-
-    // RVV only has truncates which operate from SEW*2->SEW, so lower arbitrary
-    // truncates as a series of "RISCVISD::TRUNCATE_VECTOR_VL" nodes which
-    // truncate by one power of two at a time.
-    MVT DstEltVT = VT.getVectorElementType();
-
-    SDValue Src = Op.getOperand(0);
-    MVT SrcVT = Src.getSimpleValueType();
-    MVT SrcEltVT = SrcVT.getVectorElementType();
-
-    assert(DstEltVT.bitsLT(SrcEltVT) &&
-           isPowerOf2_64(DstEltVT.getSizeInBits()) &&
-           isPowerOf2_64(SrcEltVT.getSizeInBits()) &&
-           "Unexpected vector truncate lowering");
-
-    MVT ContainerVT = SrcVT;
-    if (SrcVT.isFixedLengthVector()) {
-      ContainerVT = getContainerForFixedLengthVector(SrcVT);
-      Src = convertToScalableVector(ContainerVT, Src, DAG, Subtarget);
-    }
-
-    SDValue Result = Src;
-    SDValue Mask, VL;
-    std::tie(Mask, VL) =
-        getDefaultVLOps(SrcVT, ContainerVT, DL, DAG, Subtarget);
-    LLVMContext &Context = *DAG.getContext();
-    const ElementCount Count = ContainerVT.getVectorElementCount();
-    do {
-      SrcEltVT = MVT::getIntegerVT(SrcEltVT.getSizeInBits() / 2);
-      EVT ResultVT = EVT::getVectorVT(Context, SrcEltVT, Count);
-      Result = DAG.getNode(RISCVISD::TRUNCATE_VECTOR_VL, DL, ResultVT, Result,
-                           Mask, VL);
-    } while (SrcEltVT != DstEltVT);
-
-    if (SrcVT.isFixedLengthVector())
-      Result = convertFromScalableVector(VT, Result, DAG, Subtarget);
-
-    return Result;
-  }
+    return lowerVectorTruncLike(Op, DAG);
   case ISD::ANY_EXTEND:
   case ISD::ZERO_EXTEND:
     if (Op.getOperand(0).getValueType().isVector() &&
@@ -2268,114 +3859,51 @@ SDValue RISCVTargetLowering::LowerOperation(SDValue Op,
     // We define our scalable vector types for lmul=1 to use a 64 bit known
     // minimum size. e.g. <vscale x 2 x i32>. VLENB is in bytes so we calculate
     // vscale as VLENB / 8.
-    assert(RISCV::RVVBitsPerBlock == 64 && "Unexpected bits per block!");
-    if (isa<ConstantSDNode>(Op.getOperand(0))) {
-      // We assume VLENB is a multiple of 8. We manually choose the best shift
-      // here because SimplifyDemandedBits isn't always able to simplify it.
-      uint64_t Val = Op.getConstantOperandVal(0);
-      if (isPowerOf2_64(Val)) {
-        uint64_t Log2 = Log2_64(Val);
-        if (Log2 < 3)
-          return DAG.getNode(ISD::SRL, DL, VT, VLENB,
-                             DAG.getConstant(3 - Log2, DL, VT));
-        if (Log2 > 3)
-          return DAG.getNode(ISD::SHL, DL, VT, VLENB,
-                             DAG.getConstant(Log2 - 3, DL, VT));
-        return VLENB;
-      }
-      // If the multiplier is a multiple of 8, scale it down to avoid needing
-      // to shift the VLENB value.
-      if ((Val % 8) == 0)
-        return DAG.getNode(ISD::MUL, DL, VT, VLENB,
-                           DAG.getConstant(Val / 8, DL, VT));
-    }
+    static_assert(RISCV::RVVBitsPerBlock == 64, "Unexpected bits per block!");
+    if (Subtarget.getRealMinVLen() < RISCV::RVVBitsPerBlock)
+      report_fatal_error("Support for VLEN==32 is incomplete.");
+    // We assume VLENB is a multiple of 8. We manually choose the best shift
+    // here because SimplifyDemandedBits isn't always able to simplify it.
+    uint64_t Val = Op.getConstantOperandVal(0);
+    if (isPowerOf2_64(Val)) {
+      uint64_t Log2 = Log2_64(Val);
+      if (Log2 < 3)
+        return DAG.getNode(ISD::SRL, DL, VT, VLENB,
+                           DAG.getConstant(3 - Log2, DL, VT));
+      if (Log2 > 3)
+        return DAG.getNode(ISD::SHL, DL, VT, VLENB,
+                           DAG.getConstant(Log2 - 3, DL, VT));
+      return VLENB;
+    }
+    // If the multiplier is a multiple of 8, scale it down to avoid needing
+    // to shift the VLENB value.
+    if ((Val % 8) == 0)
+      return DAG.getNode(ISD::MUL, DL, VT, VLENB,
+                         DAG.getConstant(Val / 8, DL, VT));
 
     SDValue VScale = DAG.getNode(ISD::SRL, DL, VT, VLENB,
                                  DAG.getConstant(3, DL, VT));
     return DAG.getNode(ISD::MUL, DL, VT, VScale, Op.getOperand(0));
   }
-  case ISD::FP_EXTEND: {
-    // RVV can only do fp_extend to types double the size as the source. We
-    // custom-lower f16->f64 extensions to two hops of ISD::FP_EXTEND, going
-    // via f32.
-    SDLoc DL(Op);
-    MVT VT = Op.getSimpleValueType();
-    SDValue Src = Op.getOperand(0);
-    MVT SrcVT = Src.getSimpleValueType();
-
-    // Prepare any fixed-length vector operands.
-    MVT ContainerVT = VT;
-    if (SrcVT.isFixedLengthVector()) {
-      ContainerVT = getContainerForFixedLengthVector(VT);
-      MVT SrcContainerVT =
-          ContainerVT.changeVectorElementType(SrcVT.getVectorElementType());
-      Src = convertToScalableVector(SrcContainerVT, Src, DAG, Subtarget);
-    }
-
-    if (!VT.isVector() || VT.getVectorElementType() != MVT::f64 ||
-        SrcVT.getVectorElementType() != MVT::f16) {
-      // For scalable vectors, we only need to close the gap between
-      // vXf16->vXf64.
-      if (!VT.isFixedLengthVector())
-        return Op;
-      // For fixed-length vectors, lower the FP_EXTEND to a custom "VL" version.
-      Src = getRVVFPExtendOrRound(Src, VT, ContainerVT, DL, DAG, Subtarget);
-      return convertFromScalableVector(VT, Src, DAG, Subtarget);
-    }
-
-    MVT InterVT = VT.changeVectorElementType(MVT::f32);
-    MVT InterContainerVT = ContainerVT.changeVectorElementType(MVT::f32);
-    SDValue IntermediateExtend = getRVVFPExtendOrRound(
-        Src, InterVT, InterContainerVT, DL, DAG, Subtarget);
-
-    SDValue Extend = getRVVFPExtendOrRound(IntermediateExtend, VT, ContainerVT,
-                                           DL, DAG, Subtarget);
-    if (VT.isFixedLengthVector())
-      return convertFromScalableVector(VT, Extend, DAG, Subtarget);
-    return Extend;
-  }
-  case ISD::FP_ROUND: {
-    // RVV can only do fp_round to types half the size as the source. We
-    // custom-lower f64->f16 rounds via RVV's round-to-odd float
-    // conversion instruction.
-    SDLoc DL(Op);
-    MVT VT = Op.getSimpleValueType();
-    SDValue Src = Op.getOperand(0);
-    MVT SrcVT = Src.getSimpleValueType();
-
-    // Prepare any fixed-length vector operands.
-    MVT ContainerVT = VT;
-    if (VT.isFixedLengthVector()) {
-      MVT SrcContainerVT = getContainerForFixedLengthVector(SrcVT);
-      ContainerVT =
-          SrcContainerVT.changeVectorElementType(VT.getVectorElementType());
-      Src = convertToScalableVector(SrcContainerVT, Src, DAG, Subtarget);
-    }
-
-    if (!VT.isVector() || VT.getVectorElementType() != MVT::f16 ||
-        SrcVT.getVectorElementType() != MVT::f64) {
-      // For scalable vectors, we only need to close the gap between
-      // vXf64<->vXf16.
-      if (!VT.isFixedLengthVector())
-        return Op;
-      // For fixed-length vectors, lower the FP_ROUND to a custom "VL" version.
-      Src = getRVVFPExtendOrRound(Src, VT, ContainerVT, DL, DAG, Subtarget);
-      return convertFromScalableVector(VT, Src, DAG, Subtarget);
+  case ISD::FPOWI: {
+    // Custom promote f16 powi with illegal i32 integer type on RV64. Once
+    // promoted this will be legalized into a libcall by LegalizeIntegerTypes.
+    if (Op.getValueType() == MVT::f16 && Subtarget.is64Bit() &&
+        Op.getOperand(1).getValueType() == MVT::i32) {
+      SDLoc DL(Op);
+      SDValue Op0 = DAG.getNode(ISD::FP_EXTEND, DL, MVT::f32, Op.getOperand(0));
+      SDValue Powi =
+          DAG.getNode(ISD::FPOWI, DL, MVT::f32, Op0, Op.getOperand(1));
+      return DAG.getNode(ISD::FP_ROUND, DL, MVT::f16, Powi,
+                         DAG.getIntPtrConstant(0, DL, /*isTarget=*/true));
     }
-
-    SDValue Mask, VL;
-    std::tie(Mask, VL) = getDefaultVLOps(VT, ContainerVT, DL, DAG, Subtarget);
-
-    MVT InterVT = ContainerVT.changeVectorElementType(MVT::f32);
-    SDValue IntermediateRound =
-        DAG.getNode(RISCVISD::VFNCVT_ROD_VL, DL, InterVT, Src, Mask, VL);
-    SDValue Round = getRVVFPExtendOrRound(IntermediateRound, VT, ContainerVT,
-                                          DL, DAG, Subtarget);
-
-    if (VT.isFixedLengthVector())
-      return convertFromScalableVector(VT, Round, DAG, Subtarget);
-    return Round;
+    return SDValue();
   }
+  case ISD::FP_EXTEND:
+  case ISD::FP_ROUND:
+    if (!Op.getValueType().isVector())
+      return Op;
+    return lowerVectorFPExtendOrRoundLike(Op, DAG);
   case ISD::FP_TO_SINT:
   case ISD::FP_TO_UINT:
   case ISD::SINT_TO_FP:
@@ -2398,10 +3926,10 @@ SDValue RISCVTargetLowering::LowerOperation(SDValue Op,
 
     bool IsInt2FP = SrcEltVT.isInteger();
     // Widening conversions
-    if (EltSize > SrcEltSize && (EltSize / SrcEltSize >= 4)) {
+    if (EltSize > (2 * SrcEltSize)) {
       if (IsInt2FP) {
         // Do a regular integer sign/zero extension then convert to float.
-        MVT IVecVT = MVT::getVectorVT(MVT::getIntegerVT(EltVT.getSizeInBits()),
+        MVT IVecVT = MVT::getVectorVT(MVT::getIntegerVT(EltSize / 2),
                                       VT.getVectorElementCount());
         unsigned ExtOpcode = Op.getOpcode() == ISD::UINT_TO_FP
                                  ? ISD::ZERO_EXTEND
@@ -2419,7 +3947,7 @@ SDValue RISCVTargetLowering::LowerOperation(SDValue Op,
     }
 
     // Narrowing conversions
-    if (SrcEltSize > EltSize && (SrcEltSize / EltSize >= 4)) {
+    if (SrcEltSize > (2 * EltSize)) {
       if (IsInt2FP) {
         // One narrowing int_to_fp, then an fp_round.
         assert(EltVT == MVT::f16 && "Unexpected [US]_TO_FP lowering");
@@ -2430,9 +3958,8 @@ SDValue RISCVTargetLowering::LowerOperation(SDValue Op,
       // FP2Int
       // One narrowing fp_to_int, then truncate the integer. If the float isn't
       // representable by the integer, the result is poison.
-      MVT IVecVT =
-          MVT::getVectorVT(MVT::getIntegerVT(SrcEltVT.getSizeInBits() / 2),
-                           VT.getVectorElementCount());
+      MVT IVecVT = MVT::getVectorVT(MVT::getIntegerVT(SrcEltSize / 2),
+                                    VT.getVectorElementCount());
       SDValue FP2Int = DAG.getNode(Op.getOpcode(), DL, IVecVT, Src);
       return DAG.getNode(ISD::TRUNCATE, DL, VT, FP2Int);
     }
@@ -2448,10 +3975,10 @@ SDValue RISCVTargetLowering::LowerOperation(SDValue Op,
     default:
       llvm_unreachable("Impossible opcode");
     case ISD::FP_TO_SINT:
-      RVVOpc = RISCVISD::FP_TO_SINT_VL;
+      RVVOpc = RISCVISD::VFCVT_RTZ_X_F_VL;
       break;
     case ISD::FP_TO_UINT:
-      RVVOpc = RISCVISD::FP_TO_UINT_VL;
+      RVVOpc = RISCVISD::VFCVT_RTZ_XU_F_VL;
       break;
     case ISD::SINT_TO_FP:
       RVVOpc = RISCVISD::SINT_TO_FP_VL;
@@ -2461,24 +3988,27 @@ SDValue RISCVTargetLowering::LowerOperation(SDValue Op,
       break;
     }
 
-    MVT ContainerVT, SrcContainerVT;
-    // Derive the reference container type from the larger vector type.
-    if (SrcEltSize > EltSize) {
-      SrcContainerVT = getContainerForFixedLengthVector(SrcVT);
-      ContainerVT =
-          SrcContainerVT.changeVectorElementType(VT.getVectorElementType());
-    } else {
-      ContainerVT = getContainerForFixedLengthVector(VT);
-      SrcContainerVT = ContainerVT.changeVectorElementType(SrcEltVT);
-    }
+    MVT ContainerVT = getContainerForFixedLengthVector(VT);
+    MVT SrcContainerVT = getContainerForFixedLengthVector(SrcVT);
+    assert(ContainerVT.getVectorElementCount() == SrcContainerVT.getVectorElementCount() &&
+           "Expected same element count");
 
-    SDValue Mask, VL;
-    std::tie(Mask, VL) = getDefaultVLOps(VT, ContainerVT, DL, DAG, Subtarget);
+    auto [Mask, VL] = getDefaultVLOps(VT, ContainerVT, DL, DAG, Subtarget);
 
     Src = convertToScalableVector(SrcContainerVT, Src, DAG, Subtarget);
     Src = DAG.getNode(RVVOpc, DL, ContainerVT, Src, Mask, VL);
     return convertFromScalableVector(VT, Src, DAG, Subtarget);
   }
+  case ISD::FP_TO_SINT_SAT:
+  case ISD::FP_TO_UINT_SAT:
+    return lowerFP_TO_INT_SAT(Op, DAG, Subtarget);
+  case ISD::FTRUNC:
+  case ISD::FCEIL:
+  case ISD::FFLOOR:
+  case ISD::FRINT:
+  case ISD::FROUND:
+  case ISD::FROUNDEVEN:
+    return lowerFTRUNC_FCEIL_FFLOOR_FROUND(Op, DAG, Subtarget);
   case ISD::VECREDUCE_ADD:
   case ISD::VECREDUCE_UMAX:
   case ISD::VECREDUCE_SMAX:
@@ -2489,13 +4019,29 @@ SDValue RISCVTargetLowering::LowerOperation(SDValue Op,
   case ISD::VECREDUCE_OR:
   case ISD::VECREDUCE_XOR:
     if (Op.getOperand(0).getValueType().getVectorElementType() == MVT::i1)
-      return lowerVectorMaskVECREDUCE(Op, DAG);
+      return lowerVectorMaskVecReduction(Op, DAG, /*IsVP*/ false);
     return lowerVECREDUCE(Op, DAG);
   case ISD::VECREDUCE_FADD:
   case ISD::VECREDUCE_SEQ_FADD:
   case ISD::VECREDUCE_FMIN:
   case ISD::VECREDUCE_FMAX:
     return lowerFPVECREDUCE(Op, DAG);
+  case ISD::VP_REDUCE_ADD:
+  case ISD::VP_REDUCE_UMAX:
+  case ISD::VP_REDUCE_SMAX:
+  case ISD::VP_REDUCE_UMIN:
+  case ISD::VP_REDUCE_SMIN:
+  case ISD::VP_REDUCE_FADD:
+  case ISD::VP_REDUCE_SEQ_FADD:
+  case ISD::VP_REDUCE_FMIN:
+  case ISD::VP_REDUCE_FMAX:
+    return lowerVPREDUCE(Op, DAG);
+  case ISD::VP_REDUCE_AND:
+  case ISD::VP_REDUCE_OR:
+  case ISD::VP_REDUCE_XOR:
+    if (Op.getOperand(1).getValueType().getVectorElementType() == MVT::i1)
+      return lowerVectorMaskVecReduction(Op, DAG, /*IsVP*/ true);
+    return lowerVPREDUCE(Op, DAG);
   case ISD::INSERT_SUBVECTOR:
     return lowerINSERT_SUBVECTOR(Op, DAG);
   case ISD::EXTRACT_SUBVECTOR:
@@ -2504,12 +4050,14 @@ SDValue RISCVTargetLowering::LowerOperation(SDValue Op,
     return lowerSTEP_VECTOR(Op, DAG);
   case ISD::VECTOR_REVERSE:
     return lowerVECTOR_REVERSE(Op, DAG);
+  case ISD::VECTOR_SPLICE:
+    return lowerVECTOR_SPLICE(Op, DAG);
   case ISD::BUILD_VECTOR:
     return lowerBUILD_VECTOR(Op, DAG, Subtarget);
   case ISD::SPLAT_VECTOR:
     if (Op.getValueType().getVectorElementType() == MVT::i1)
       return lowerVectorMaskSplat(Op, DAG);
-    return lowerSPLAT_VECTOR(Op, DAG, Subtarget);
+    return SDValue();
   case ISD::VECTOR_SHUFFLE:
     return lowerVECTOR_SHUFFLE(Op, DAG, Subtarget);
   case ISD::CONCAT_VECTORS: {
@@ -2520,9 +4068,14 @@ SDValue RISCVTargetLowering::LowerOperation(SDValue Op,
     unsigned NumOpElts =
         Op.getOperand(0).getSimpleValueType().getVectorMinNumElements();
     SDValue Vec = DAG.getUNDEF(VT);
-    for (const auto &OpIdx : enumerate(Op->ops()))
-      Vec = DAG.getNode(ISD::INSERT_SUBVECTOR, DL, VT, Vec, OpIdx.value(),
+    for (const auto &OpIdx : enumerate(Op->ops())) {
+      SDValue SubVec = OpIdx.value();
+      // Don't insert undef subvectors.
+      if (SubVec.isUndef())
+        continue;
+      Vec = DAG.getNode(ISD::INSERT_SUBVECTOR, DL, VT, Vec, SubVec,
                         DAG.getIntPtrConstant(OpIdx.index() * NumOpElts, DL));
+    }
     return Vec;
   }
   case ISD::LOAD:
@@ -2538,21 +4091,77 @@ SDValue RISCVTargetLowering::LowerOperation(SDValue Op,
       return lowerFixedLengthVectorStoreToRVV(Op, DAG);
     return Op;
   case ISD::MLOAD:
-    return lowerMLOAD(Op, DAG);
+  case ISD::VP_LOAD:
+    return lowerMaskedLoad(Op, DAG);
   case ISD::MSTORE:
-    return lowerMSTORE(Op, DAG);
-  case ISD::SETCC:
+  case ISD::VP_STORE:
+    return lowerMaskedStore(Op, DAG);
+  case ISD::SELECT_CC: {
+    // This occurs because we custom legalize SETGT and SETUGT for setcc. That
+    // causes LegalizeDAG to think we need to custom legalize select_cc. Expand
+    // into separate SETCC+SELECT_CC just like LegalizeDAG.
+    SDValue Tmp1 = Op.getOperand(0);
+    SDValue Tmp2 = Op.getOperand(1);
+    SDValue True = Op.getOperand(2);
+    SDValue False = Op.getOperand(3);
+    EVT VT = Op.getValueType();
+    SDValue CC = Op.getOperand(4);
+    EVT CmpVT = Tmp1.getValueType();
+    EVT CCVT =
+        getSetCCResultType(DAG.getDataLayout(), *DAG.getContext(), CmpVT);
+    SDLoc DL(Op);
+    SDValue Cond =
+        DAG.getNode(ISD::SETCC, DL, CCVT, Tmp1, Tmp2, CC, Op->getFlags());
+    return DAG.getSelect(DL, VT, Cond, True, False);
+  }
+  case ISD::SETCC: {
+    MVT OpVT = Op.getOperand(0).getSimpleValueType();
+    if (OpVT.isScalarInteger()) {
+      MVT VT = Op.getSimpleValueType();
+      SDValue LHS = Op.getOperand(0);
+      SDValue RHS = Op.getOperand(1);
+      ISD::CondCode CCVal = cast<CondCodeSDNode>(Op.getOperand(2))->get();
+      assert((CCVal == ISD::SETGT || CCVal == ISD::SETUGT) &&
+             "Unexpected CondCode");
+
+      SDLoc DL(Op);
+
+      // If the RHS is a constant in the range [-2049, 0) or (0, 2046], we can
+      // convert this to the equivalent of (set(u)ge X, C+1) by using
+      // (xori (slti(u) X, C+1), 1). This avoids materializing a small constant
+      // in a register.
+      if (isa<ConstantSDNode>(RHS)) {
+        int64_t Imm = cast<ConstantSDNode>(RHS)->getSExtValue();
+        if (Imm != 0 && isInt<12>((uint64_t)Imm + 1)) {
+          // X > -1 should have been replaced with false.
+          assert((CCVal != ISD::SETUGT || Imm != -1) &&
+                 "Missing canonicalization");
+          // Using getSetCCSwappedOperands will convert SET(U)GT->SET(U)LT.
+          CCVal = ISD::getSetCCSwappedOperands(CCVal);
+          SDValue SetCC = DAG.getSetCC(
+              DL, VT, LHS, DAG.getConstant(Imm + 1, DL, OpVT), CCVal);
+          return DAG.getLogicalNOT(DL, SetCC, VT);
+        }
+      }
+
+      // Not a constant we could handle, swap the operands and condition code to
+      // SETLT/SETULT.
+      CCVal = ISD::getSetCCSwappedOperands(CCVal);
+      return DAG.getSetCC(DL, VT, RHS, LHS, CCVal);
+    }
+
     return lowerFixedLengthVectorSetccToRVV(Op, DAG);
+  }
   case ISD::ADD:
-    return lowerToScalableOp(Op, DAG, RISCVISD::ADD_VL);
+    return lowerToScalableOp(Op, DAG, RISCVISD::ADD_VL, /*HasMergeOp*/ true);
   case ISD::SUB:
-    return lowerToScalableOp(Op, DAG, RISCVISD::SUB_VL);
+    return lowerToScalableOp(Op, DAG, RISCVISD::SUB_VL, /*HasMergeOp*/ true);
   case ISD::MUL:
-    return lowerToScalableOp(Op, DAG, RISCVISD::MUL_VL);
+    return lowerToScalableOp(Op, DAG, RISCVISD::MUL_VL, /*HasMergeOp*/ true);
   case ISD::MULHS:
-    return lowerToScalableOp(Op, DAG, RISCVISD::MULHS_VL);
+    return lowerToScalableOp(Op, DAG, RISCVISD::MULHS_VL, /*HasMergeOp*/ true);
   case ISD::MULHU:
-    return lowerToScalableOp(Op, DAG, RISCVISD::MULHU_VL);
+    return lowerToScalableOp(Op, DAG, RISCVISD::MULHU_VL, /*HasMergeOp*/ true);
   case ISD::AND:
     return lowerFixedLengthVectorLogicOpToRVV(Op, DAG, RISCVISD::VMAND_VL,
                                               RISCVISD::AND_VL);
@@ -2563,13 +4172,13 @@ SDValue RISCVTargetLowering::LowerOperation(SDValue Op,
     return lowerFixedLengthVectorLogicOpToRVV(Op, DAG, RISCVISD::VMXOR_VL,
                                               RISCVISD::XOR_VL);
   case ISD::SDIV:
-    return lowerToScalableOp(Op, DAG, RISCVISD::SDIV_VL);
+    return lowerToScalableOp(Op, DAG, RISCVISD::SDIV_VL, /*HasMergeOp*/ true);
   case ISD::SREM:
-    return lowerToScalableOp(Op, DAG, RISCVISD::SREM_VL);
+    return lowerToScalableOp(Op, DAG, RISCVISD::SREM_VL, /*HasMergeOp*/ true);
   case ISD::UDIV:
-    return lowerToScalableOp(Op, DAG, RISCVISD::UDIV_VL);
+    return lowerToScalableOp(Op, DAG, RISCVISD::UDIV_VL, /*HasMergeOp*/ true);
   case ISD::UREM:
-    return lowerToScalableOp(Op, DAG, RISCVISD::UREM_VL);
+    return lowerToScalableOp(Op, DAG, RISCVISD::UREM_VL, /*HasMergeOp*/ true);
   case ISD::SHL:
   case ISD::SRA:
   case ISD::SRL:
@@ -2580,21 +4189,25 @@ SDValue RISCVTargetLowering::LowerOperation(SDValue Op,
            "Unexpected custom legalisation");
     return SDValue();
   case ISD::SADDSAT:
-    return lowerToScalableOp(Op, DAG, RISCVISD::SADDSAT_VL);
+    return lowerToScalableOp(Op, DAG, RISCVISD::SADDSAT_VL,
+                             /*HasMergeOp*/ true);
   case ISD::UADDSAT:
-    return lowerToScalableOp(Op, DAG, RISCVISD::UADDSAT_VL);
+    return lowerToScalableOp(Op, DAG, RISCVISD::UADDSAT_VL,
+                             /*HasMergeOp*/ true);
   case ISD::SSUBSAT:
-    return lowerToScalableOp(Op, DAG, RISCVISD::SSUBSAT_VL);
+    return lowerToScalableOp(Op, DAG, RISCVISD::SSUBSAT_VL,
+                             /*HasMergeOp*/ true);
   case ISD::USUBSAT:
-    return lowerToScalableOp(Op, DAG, RISCVISD::USUBSAT_VL);
+    return lowerToScalableOp(Op, DAG, RISCVISD::USUBSAT_VL,
+                             /*HasMergeOp*/ true);
   case ISD::FADD:
-    return lowerToScalableOp(Op, DAG, RISCVISD::FADD_VL);
+    return lowerToScalableOp(Op, DAG, RISCVISD::FADD_VL, /*HasMergeOp*/ true);
   case ISD::FSUB:
-    return lowerToScalableOp(Op, DAG, RISCVISD::FSUB_VL);
+    return lowerToScalableOp(Op, DAG, RISCVISD::FSUB_VL, /*HasMergeOp*/ true);
   case ISD::FMUL:
-    return lowerToScalableOp(Op, DAG, RISCVISD::FMUL_VL);
+    return lowerToScalableOp(Op, DAG, RISCVISD::FMUL_VL, /*HasMergeOp*/ true);
   case ISD::FDIV:
-    return lowerToScalableOp(Op, DAG, RISCVISD::FDIV_VL);
+    return lowerToScalableOp(Op, DAG, RISCVISD::FDIV_VL, /*HasMergeOp*/ true);
   case ISD::FNEG:
     return lowerToScalableOp(Op, DAG, RISCVISD::FNEG_VL);
   case ISD::FABS:
@@ -2602,67 +4215,141 @@ SDValue RISCVTargetLowering::LowerOperation(SDValue Op,
   case ISD::FSQRT:
     return lowerToScalableOp(Op, DAG, RISCVISD::FSQRT_VL);
   case ISD::FMA:
-    return lowerToScalableOp(Op, DAG, RISCVISD::FMA_VL);
+    return lowerToScalableOp(Op, DAG, RISCVISD::VFMADD_VL);
   case ISD::SMIN:
-    return lowerToScalableOp(Op, DAG, RISCVISD::SMIN_VL);
+    return lowerToScalableOp(Op, DAG, RISCVISD::SMIN_VL, /*HasMergeOp*/ true);
   case ISD::SMAX:
-    return lowerToScalableOp(Op, DAG, RISCVISD::SMAX_VL);
+    return lowerToScalableOp(Op, DAG, RISCVISD::SMAX_VL, /*HasMergeOp*/ true);
   case ISD::UMIN:
-    return lowerToScalableOp(Op, DAG, RISCVISD::UMIN_VL);
+    return lowerToScalableOp(Op, DAG, RISCVISD::UMIN_VL, /*HasMergeOp*/ true);
   case ISD::UMAX:
-    return lowerToScalableOp(Op, DAG, RISCVISD::UMAX_VL);
+    return lowerToScalableOp(Op, DAG, RISCVISD::UMAX_VL, /*HasMergeOp*/ true);
   case ISD::FMINNUM:
-    return lowerToScalableOp(Op, DAG, RISCVISD::FMINNUM_VL);
+    return lowerToScalableOp(Op, DAG, RISCVISD::FMINNUM_VL,
+                             /*HasMergeOp*/ true);
   case ISD::FMAXNUM:
-    return lowerToScalableOp(Op, DAG, RISCVISD::FMAXNUM_VL);
+    return lowerToScalableOp(Op, DAG, RISCVISD::FMAXNUM_VL,
+                             /*HasMergeOp*/ true);
   case ISD::ABS:
+  case ISD::VP_ABS:
     return lowerABS(Op, DAG);
+  case ISD::CTLZ:
+  case ISD::CTLZ_ZERO_UNDEF:
+  case ISD::CTTZ_ZERO_UNDEF:
+    return lowerCTLZ_CTTZ_ZERO_UNDEF(Op, DAG);
   case ISD::VSELECT:
     return lowerFixedLengthVectorSelectToRVV(Op, DAG);
   case ISD::FCOPYSIGN:
     return lowerFixedLengthVectorFCOPYSIGNToRVV(Op, DAG);
   case ISD::MGATHER:
-    return lowerMGATHER(Op, DAG);
+  case ISD::VP_GATHER:
+    return lowerMaskedGather(Op, DAG);
   case ISD::MSCATTER:
-    return lowerMSCATTER(Op, DAG);
-  case ISD::FLT_ROUNDS_:
+  case ISD::VP_SCATTER:
+    return lowerMaskedScatter(Op, DAG);
+  case ISD::GET_ROUNDING:
     return lowerGET_ROUNDING(Op, DAG);
   case ISD::SET_ROUNDING:
     return lowerSET_ROUNDING(Op, DAG);
+  case ISD::EH_DWARF_CFA:
+    return lowerEH_DWARF_CFA(Op, DAG);
+  case ISD::VP_SELECT:
+    return lowerVPOp(Op, DAG, RISCVISD::VSELECT_VL);
+  case ISD::VP_MERGE:
+    return lowerVPOp(Op, DAG, RISCVISD::VP_MERGE_VL);
   case ISD::VP_ADD:
-    return lowerVPOp(Op, DAG, RISCVISD::ADD_VL);
+    return lowerVPOp(Op, DAG, RISCVISD::ADD_VL, /*HasMergeOp*/ true);
   case ISD::VP_SUB:
-    return lowerVPOp(Op, DAG, RISCVISD::SUB_VL);
+    return lowerVPOp(Op, DAG, RISCVISD::SUB_VL, /*HasMergeOp*/ true);
   case ISD::VP_MUL:
-    return lowerVPOp(Op, DAG, RISCVISD::MUL_VL);
+    return lowerVPOp(Op, DAG, RISCVISD::MUL_VL, /*HasMergeOp*/ true);
   case ISD::VP_SDIV:
-    return lowerVPOp(Op, DAG, RISCVISD::SDIV_VL);
+    return lowerVPOp(Op, DAG, RISCVISD::SDIV_VL, /*HasMergeOp*/ true);
   case ISD::VP_UDIV:
-    return lowerVPOp(Op, DAG, RISCVISD::UDIV_VL);
+    return lowerVPOp(Op, DAG, RISCVISD::UDIV_VL, /*HasMergeOp*/ true);
   case ISD::VP_SREM:
-    return lowerVPOp(Op, DAG, RISCVISD::SREM_VL);
+    return lowerVPOp(Op, DAG, RISCVISD::SREM_VL, /*HasMergeOp*/ true);
   case ISD::VP_UREM:
-    return lowerVPOp(Op, DAG, RISCVISD::UREM_VL);
+    return lowerVPOp(Op, DAG, RISCVISD::UREM_VL, /*HasMergeOp*/ true);
   case ISD::VP_AND:
-    return lowerVPOp(Op, DAG, RISCVISD::AND_VL);
+    return lowerLogicVPOp(Op, DAG, RISCVISD::VMAND_VL, RISCVISD::AND_VL);
   case ISD::VP_OR:
-    return lowerVPOp(Op, DAG, RISCVISD::OR_VL);
+    return lowerLogicVPOp(Op, DAG, RISCVISD::VMOR_VL, RISCVISD::OR_VL);
   case ISD::VP_XOR:
-    return lowerVPOp(Op, DAG, RISCVISD::XOR_VL);
+    return lowerLogicVPOp(Op, DAG, RISCVISD::VMXOR_VL, RISCVISD::XOR_VL);
   case ISD::VP_ASHR:
-    return lowerVPOp(Op, DAG, RISCVISD::SRA_VL);
+    return lowerVPOp(Op, DAG, RISCVISD::SRA_VL, /*HasMergeOp*/ true);
   case ISD::VP_LSHR:
-    return lowerVPOp(Op, DAG, RISCVISD::SRL_VL);
+    return lowerVPOp(Op, DAG, RISCVISD::SRL_VL, /*HasMergeOp*/ true);
   case ISD::VP_SHL:
-    return lowerVPOp(Op, DAG, RISCVISD::SHL_VL);
+    return lowerVPOp(Op, DAG, RISCVISD::SHL_VL, /*HasMergeOp*/ true);
   case ISD::VP_FADD:
-    return lowerVPOp(Op, DAG, RISCVISD::FADD_VL);
+    return lowerVPOp(Op, DAG, RISCVISD::FADD_VL, /*HasMergeOp*/ true);
   case ISD::VP_FSUB:
-    return lowerVPOp(Op, DAG, RISCVISD::FSUB_VL);
+    return lowerVPOp(Op, DAG, RISCVISD::FSUB_VL, /*HasMergeOp*/ true);
   case ISD::VP_FMUL:
-    return lowerVPOp(Op, DAG, RISCVISD::FMUL_VL);
+    return lowerVPOp(Op, DAG, RISCVISD::FMUL_VL, /*HasMergeOp*/ true);
   case ISD::VP_FDIV:
-    return lowerVPOp(Op, DAG, RISCVISD::FDIV_VL);
+    return lowerVPOp(Op, DAG, RISCVISD::FDIV_VL, /*HasMergeOp*/ true);
+  case ISD::VP_FNEG:
+    return lowerVPOp(Op, DAG, RISCVISD::FNEG_VL);
+  case ISD::VP_FABS:
+    return lowerVPOp(Op, DAG, RISCVISD::FABS_VL);
+  case ISD::VP_SQRT:
+    return lowerVPOp(Op, DAG, RISCVISD::FSQRT_VL);
+  case ISD::VP_FMA:
+    return lowerVPOp(Op, DAG, RISCVISD::VFMADD_VL);
+  case ISD::VP_FMINNUM:
+    return lowerVPOp(Op, DAG, RISCVISD::FMINNUM_VL, /*HasMergeOp*/ true);
+  case ISD::VP_FMAXNUM:
+    return lowerVPOp(Op, DAG, RISCVISD::FMAXNUM_VL, /*HasMergeOp*/ true);
+  case ISD::VP_FCOPYSIGN:
+    return lowerVPOp(Op, DAG, RISCVISD::FCOPYSIGN_VL, /*HasMergeOp*/ true);
+  case ISD::VP_SIGN_EXTEND:
+  case ISD::VP_ZERO_EXTEND:
+    if (Op.getOperand(0).getSimpleValueType().getVectorElementType() == MVT::i1)
+      return lowerVPExtMaskOp(Op, DAG);
+    return lowerVPOp(Op, DAG,
+                     Op.getOpcode() == ISD::VP_SIGN_EXTEND
+                         ? RISCVISD::VSEXT_VL
+                         : RISCVISD::VZEXT_VL);
+  case ISD::VP_TRUNCATE:
+    return lowerVectorTruncLike(Op, DAG);
+  case ISD::VP_FP_EXTEND:
+  case ISD::VP_FP_ROUND:
+    return lowerVectorFPExtendOrRoundLike(Op, DAG);
+  case ISD::VP_FP_TO_SINT:
+    return lowerVPFPIntConvOp(Op, DAG, RISCVISD::VFCVT_RTZ_X_F_VL);
+  case ISD::VP_FP_TO_UINT:
+    return lowerVPFPIntConvOp(Op, DAG, RISCVISD::VFCVT_RTZ_XU_F_VL);
+  case ISD::VP_SINT_TO_FP:
+    return lowerVPFPIntConvOp(Op, DAG, RISCVISD::SINT_TO_FP_VL);
+  case ISD::VP_UINT_TO_FP:
+    return lowerVPFPIntConvOp(Op, DAG, RISCVISD::UINT_TO_FP_VL);
+  case ISD::VP_SETCC:
+    if (Op.getOperand(0).getSimpleValueType().getVectorElementType() == MVT::i1)
+      return lowerVPSetCCMaskOp(Op, DAG);
+    return lowerVPOp(Op, DAG, RISCVISD::SETCC_VL, /*HasMergeOp*/ true);
+  case ISD::VP_SMIN:
+    return lowerVPOp(Op, DAG, RISCVISD::SMIN_VL, /*HasMergeOp*/ true);
+  case ISD::VP_SMAX:
+    return lowerVPOp(Op, DAG, RISCVISD::SMAX_VL, /*HasMergeOp*/ true);
+  case ISD::VP_UMIN:
+    return lowerVPOp(Op, DAG, RISCVISD::UMIN_VL, /*HasMergeOp*/ true);
+  case ISD::VP_UMAX:
+    return lowerVPOp(Op, DAG, RISCVISD::UMAX_VL, /*HasMergeOp*/ true);
+  case ISD::EXPERIMENTAL_VP_STRIDED_LOAD:
+    return lowerVPStridedLoad(Op, DAG);
+  case ISD::EXPERIMENTAL_VP_STRIDED_STORE:
+    return lowerVPStridedStore(Op, DAG);
+  case ISD::VP_FCEIL:
+  case ISD::VP_FFLOOR:
+  case ISD::VP_FRINT:
+  case ISD::VP_FNEARBYINT:
+  case ISD::VP_FROUND:
+  case ISD::VP_FROUNDEVEN:
+  case ISD::VP_FROUNDTOZERO:
+    return lowerVectorFTRUNC_FCEIL_FFLOOR_FROUND(Op, DAG, Subtarget);
   }
 }
 
@@ -2694,18 +4381,31 @@ SDValue RISCVTargetLowering::getAddr(NodeTy *N, SelectionDAG &DAG,
   SDLoc DL(N);
   EVT Ty = getPointerTy(DAG.getDataLayout());
 
-  if (isPositionIndependent()) {
+  // When HWASAN is used and tagging of global variables is enabled
+  // they should be accessed via the GOT, since the tagged address of a global
+  // is incompatible with existing code models. This also applies to non-pic
+  // mode.
+  if (isPositionIndependent() || Subtarget.allowTaggedGlobals()) {
     SDValue Addr = getTargetNode(N, DL, Ty, DAG, 0);
-    if (IsLocal)
+    if (IsLocal && !Subtarget.allowTaggedGlobals())
       // Use PC-relative addressing to access the symbol. This generates the
       // pattern (PseudoLLA sym), which expands to (addi (auipc %pcrel_hi(sym))
       // %pcrel_lo(auipc)).
-      return SDValue(DAG.getMachineNode(RISCV::PseudoLLA, DL, Ty, Addr), 0);
+      return DAG.getNode(RISCVISD::LLA, DL, Ty, Addr);
 
     // Use PC-relative addressing to access the GOT for this symbol, then load
     // the address from the GOT. This generates the pattern (PseudoLA sym),
     // which expands to (ld (addi (auipc %got_pcrel_hi(sym)) %pcrel_lo(auipc))).
-    return SDValue(DAG.getMachineNode(RISCV::PseudoLA, DL, Ty, Addr), 0);
+    MachineFunction &MF = DAG.getMachineFunction();
+    MachineMemOperand *MemOp = MF.getMachineMemOperand(
+        MachinePointerInfo::getGOT(MF),
+        MachineMemOperand::MOLoad | MachineMemOperand::MODereferenceable |
+            MachineMemOperand::MOInvariant,
+        LLT(Ty.getSimpleVT()), Align(Ty.getFixedSizeInBits() / 8));
+    SDValue Load =
+        DAG.getMemIntrinsicNode(RISCVISD::LA, DL, DAG.getVTList(Ty, MVT::Other),
+                                {DAG.getEntryNode(), Addr}, Ty, MemOp);
+    return Load;
   }
 
   switch (getTargetMachine().getCodeModel()) {
@@ -2716,39 +4416,24 @@ SDValue RISCVTargetLowering::getAddr(NodeTy *N, SelectionDAG &DAG,
     // address space. This generates the pattern (addi (lui %hi(sym)) %lo(sym)).
     SDValue AddrHi = getTargetNode(N, DL, Ty, DAG, RISCVII::MO_HI);
     SDValue AddrLo = getTargetNode(N, DL, Ty, DAG, RISCVII::MO_LO);
-    SDValue MNHi = SDValue(DAG.getMachineNode(RISCV::LUI, DL, Ty, AddrHi), 0);
-    return SDValue(DAG.getMachineNode(RISCV::ADDI, DL, Ty, MNHi, AddrLo), 0);
+    SDValue MNHi = DAG.getNode(RISCVISD::HI, DL, Ty, AddrHi);
+    return DAG.getNode(RISCVISD::ADD_LO, DL, Ty, MNHi, AddrLo);
   }
   case CodeModel::Medium: {
     // Generate a sequence for accessing addresses within any 2GiB range within
     // the address space. This generates the pattern (PseudoLLA sym), which
     // expands to (addi (auipc %pcrel_hi(sym)) %pcrel_lo(auipc)).
     SDValue Addr = getTargetNode(N, DL, Ty, DAG, 0);
-    return SDValue(DAG.getMachineNode(RISCV::PseudoLLA, DL, Ty, Addr), 0);
+    return DAG.getNode(RISCVISD::LLA, DL, Ty, Addr);
   }
   }
 }
 
 SDValue RISCVTargetLowering::lowerGlobalAddress(SDValue Op,
                                                 SelectionDAG &DAG) const {
-  SDLoc DL(Op);
-  EVT Ty = Op.getValueType();
   GlobalAddressSDNode *N = cast<GlobalAddressSDNode>(Op);
-  int64_t Offset = N->getOffset();
-  MVT XLenVT = Subtarget.getXLenVT();
-
-  const GlobalValue *GV = N->getGlobal();
-  bool IsLocal = getTargetMachine().shouldAssumeDSOLocal(*GV->getParent(), GV);
-  SDValue Addr = getAddr(N, DAG, IsLocal);
-
-  // In order to maximise the opportunity for common subexpression elimination,
-  // emit a separate ADD node for the global address offset instead of folding
-  // it in the global address node. Later peephole optimisations may choose to
-  // fold it back in when profitable.
-  if (Offset != 0)
-    return DAG.getNode(ISD::ADD, DL, Ty, Addr,
-                       DAG.getConstant(Offset, DL, XLenVT));
-  return Addr;
+  assert(N->getOffset() == 0 && "unexpected offset in global node");
+  return getAddr(N, DAG, N->getGlobal()->isDSOLocal());
 }
 
 SDValue RISCVTargetLowering::lowerBlockAddress(SDValue Op,
@@ -2786,8 +4471,15 @@ SDValue RISCVTargetLowering::getStaticTLSAddr(GlobalAddressSDNode *N,
     // the pattern (PseudoLA_TLS_IE sym), which expands to
     // (ld (auipc %tls_ie_pcrel_hi(sym)) %pcrel_lo(auipc)).
     SDValue Addr = DAG.getTargetGlobalAddress(GV, DL, Ty, 0, 0);
-    SDValue Load =
-        SDValue(DAG.getMachineNode(RISCV::PseudoLA_TLS_IE, DL, Ty, Addr), 0);
+    MachineFunction &MF = DAG.getMachineFunction();
+    MachineMemOperand *MemOp = MF.getMachineMemOperand(
+        MachinePointerInfo::getGOT(MF),
+        MachineMemOperand::MOLoad | MachineMemOperand::MODereferenceable |
+            MachineMemOperand::MOInvariant,
+        LLT(Ty.getSimpleVT()), Align(Ty.getFixedSizeInBits() / 8));
+    SDValue Load = DAG.getMemIntrinsicNode(
+        RISCVISD::LA_TLS_IE, DL, DAG.getVTList(Ty, MVT::Other),
+        {DAG.getEntryNode(), Addr}, Ty, MemOp);
 
     // Add the thread pointer.
     SDValue TPReg = DAG.getRegister(RISCV::X4, XLenVT);
@@ -2805,12 +4497,11 @@ SDValue RISCVTargetLowering::getStaticTLSAddr(GlobalAddressSDNode *N,
   SDValue AddrLo =
       DAG.getTargetGlobalAddress(GV, DL, Ty, 0, RISCVII::MO_TPREL_LO);
 
-  SDValue MNHi = SDValue(DAG.getMachineNode(RISCV::LUI, DL, Ty, AddrHi), 0);
+  SDValue MNHi = DAG.getNode(RISCVISD::HI, DL, Ty, AddrHi);
   SDValue TPReg = DAG.getRegister(RISCV::X4, XLenVT);
-  SDValue MNAdd = SDValue(
-      DAG.getMachineNode(RISCV::PseudoAddTPRel, DL, Ty, MNHi, TPReg, AddrAdd),
-      0);
-  return SDValue(DAG.getMachineNode(RISCV::ADDI, DL, Ty, MNAdd, AddrLo), 0);
+  SDValue MNAdd =
+      DAG.getNode(RISCVISD::ADD_TPREL, DL, Ty, MNHi, TPReg, AddrAdd);
+  return DAG.getNode(RISCVISD::ADD_LO, DL, Ty, MNAdd, AddrLo);
 }
 
 SDValue RISCVTargetLowering::getDynamicTLSAddr(GlobalAddressSDNode *N,
@@ -2824,8 +4515,7 @@ SDValue RISCVTargetLowering::getDynamicTLSAddr(GlobalAddressSDNode *N,
   // This generates the pattern (PseudoLA_TLS_GD sym), which expands to
   // (addi (auipc %tls_gd_pcrel_hi(sym)) %pcrel_lo(auipc)).
   SDValue Addr = DAG.getTargetGlobalAddress(GV, DL, Ty, 0, 0);
-  SDValue Load =
-      SDValue(DAG.getMachineNode(RISCV::PseudoLA_TLS_GD, DL, Ty, Addr), 0);
+  SDValue Load = DAG.getNode(RISCVISD::LA_TLS_GD, DL, Ty, Addr);
 
   // Prepare argument list to generate call.
   ArgListTy Args;
@@ -2851,11 +4541,11 @@ SDValue RISCVTargetLowering::lowerGlobalTLSAddress(SDValue Op,
   if (DAG.getTarget().useEmulatedTLS())
     return LowerToTLSEmulatedModel(GA, DAG);
 
-  SDLoc DL(Op);
-  EVT Ty = Op.getValueType();
   GlobalAddressSDNode *N = cast<GlobalAddressSDNode>(Op);
-  int64_t Offset = N->getOffset();
-  MVT XLenVT = Subtarget.getXLenVT();
+  assert(N->getOffset() == 0 && "unexpected offset in global node");
+
+  if (DAG.getTarget().useEmulatedTLS())
+    return LowerToTLSEmulatedModel(N, DAG);
 
   TLSModel::Model Model = getTargetMachine().getTLSModel(N->getGlobal());
 
@@ -2877,13 +4567,6 @@ SDValue RISCVTargetLowering::lowerGlobalTLSAddress(SDValue Op,
     break;
   }
 
-  // In order to maximise the opportunity for common subexpression elimination,
-  // emit a separate ADD node for the global address offset instead of folding
-  // it in the global address node. Later peephole optimisations may choose to
-  // fold it back in when profitable.
-  if (Offset != 0)
-    return DAG.getNode(ISD::ADD, DL, Ty, Addr,
-                       DAG.getConstant(Offset, DL, XLenVT));
   return Addr;
 }
 
@@ -2898,58 +4581,105 @@ SDValue RISCVTargetLowering::lowerSELECT(SDValue Op, SelectionDAG &DAG) const {
   // Lower vector SELECTs to VSELECTs by splatting the condition.
   if (VT.isVector()) {
     MVT SplatCondVT = VT.changeVectorElementType(MVT::i1);
-    SDValue CondSplat = VT.isScalableVector()
-                            ? DAG.getSplatVector(SplatCondVT, DL, CondV)
-                            : DAG.getSplatBuildVector(SplatCondVT, DL, CondV);
+    SDValue CondSplat = DAG.getSplat(SplatCondVT, DL, CondV);
     return DAG.getNode(ISD::VSELECT, DL, VT, CondSplat, TrueV, FalseV);
   }
 
-  // If the result type is XLenVT and CondV is the output of a SETCC node
-  // which also operated on XLenVT inputs, then merge the SETCC node into the
-  // lowered RISCVISD::SELECT_CC to take advantage of the integer
-  // compare+branch instructions. i.e.:
-  // (select (setcc lhs, rhs, cc), truev, falsev)
-  // -> (riscvisd::select_cc lhs, rhs, cc, truev, falsev)
-  if (VT == XLenVT && CondV.getOpcode() == ISD::SETCC &&
-      CondV.getOperand(0).getSimpleValueType() == XLenVT) {
-    SDValue LHS = CondV.getOperand(0);
-    SDValue RHS = CondV.getOperand(1);
-    const auto *CC = cast<CondCodeSDNode>(CondV.getOperand(2));
-    ISD::CondCode CCVal = CC->get();
-
-    // Special case for a select of 2 constants that have a diffence of 1.
-    // Normally this is done by DAGCombine, but if the select is introduced by
-    // type legalization or op legalization, we miss it. Restricting to SETLT
-    // case for now because that is what signed saturating add/sub need.
-    // FIXME: We don't need the condition to be SETLT or even a SETCC,
-    // but we would probably want to swap the true/false values if the condition
-    // is SETGE/SETLE to avoid an XORI.
-    if (isa<ConstantSDNode>(TrueV) && isa<ConstantSDNode>(FalseV) &&
-        CCVal == ISD::SETLT) {
-      const APInt &TrueVal = cast<ConstantSDNode>(TrueV)->getAPIntValue();
-      const APInt &FalseVal = cast<ConstantSDNode>(FalseV)->getAPIntValue();
-      if (TrueVal - 1 == FalseVal)
-        return DAG.getNode(ISD::ADD, DL, Op.getValueType(), CondV, FalseV);
-      if (TrueVal + 1 == FalseVal)
-        return DAG.getNode(ISD::SUB, DL, Op.getValueType(), FalseV, CondV);
+  if (!Subtarget.hasShortForwardBranchOpt()) {
+    // (select c, -1, y) -> -c | y
+    if (isAllOnesConstant(TrueV)) {
+      SDValue Neg = DAG.getNegative(CondV, DL, VT);
+      return DAG.getNode(ISD::OR, DL, VT, Neg, FalseV);
+    }
+    // (select c, y, -1) -> (c-1) | y
+    if (isAllOnesConstant(FalseV)) {
+      SDValue Neg = DAG.getNode(ISD::ADD, DL, VT, CondV,
+                                DAG.getAllOnesConstant(DL, VT));
+      return DAG.getNode(ISD::OR, DL, VT, Neg, TrueV);
     }
 
-    translateSetCCForBranch(DL, LHS, RHS, CCVal, DAG);
-
-    SDValue TargetCC = DAG.getTargetConstant(CCVal, DL, XLenVT);
-    SDValue Ops[] = {LHS, RHS, TargetCC, TrueV, FalseV};
-    return DAG.getNode(RISCVISD::SELECT_CC, DL, Op.getValueType(), Ops);
+    // (select c, 0, y) -> (c-1) & y
+    if (isNullConstant(TrueV)) {
+      SDValue Neg = DAG.getNode(ISD::ADD, DL, VT, CondV,
+                                DAG.getAllOnesConstant(DL, VT));
+      return DAG.getNode(ISD::AND, DL, VT, Neg, FalseV);
+    }
+    // (select c, y, 0) -> -c & y
+    if (isNullConstant(FalseV)) {
+      SDValue Neg = DAG.getNegative(CondV, DL, VT);
+      return DAG.getNode(ISD::AND, DL, VT, Neg, TrueV);
+    }
   }
 
-  // Otherwise:
+  // If the condition is not an integer SETCC which operates on XLenVT, we need
+  // to emit a RISCVISD::SELECT_CC comparing the condition to zero. i.e.:
   // (select condv, truev, falsev)
   // -> (riscvisd::select_cc condv, zero, setne, truev, falsev)
-  SDValue Zero = DAG.getConstant(0, DL, XLenVT);
-  SDValue SetNE = DAG.getTargetConstant(ISD::SETNE, DL, XLenVT);
+  if (CondV.getOpcode() != ISD::SETCC ||
+      CondV.getOperand(0).getSimpleValueType() != XLenVT) {
+    SDValue Zero = DAG.getConstant(0, DL, XLenVT);
+    SDValue SetNE = DAG.getCondCode(ISD::SETNE);
+
+    SDValue Ops[] = {CondV, Zero, SetNE, TrueV, FalseV};
+
+    return DAG.getNode(RISCVISD::SELECT_CC, DL, VT, Ops);
+  }
+
+  // If the CondV is the output of a SETCC node which operates on XLenVT inputs,
+  // then merge the SETCC node into the lowered RISCVISD::SELECT_CC to take
+  // advantage of the integer compare+branch instructions. i.e.:
+  // (select (setcc lhs, rhs, cc), truev, falsev)
+  // -> (riscvisd::select_cc lhs, rhs, cc, truev, falsev)
+  SDValue LHS = CondV.getOperand(0);
+  SDValue RHS = CondV.getOperand(1);
+  ISD::CondCode CCVal = cast<CondCodeSDNode>(CondV.getOperand(2))->get();
+
+  // Special case for a select of 2 constants that have a diffence of 1.
+  // Normally this is done by DAGCombine, but if the select is introduced by
+  // type legalization or op legalization, we miss it. Restricting to SETLT
+  // case for now because that is what signed saturating add/sub need.
+  // FIXME: We don't need the condition to be SETLT or even a SETCC,
+  // but we would probably want to swap the true/false values if the condition
+  // is SETGE/SETLE to avoid an XORI.
+  if (isa<ConstantSDNode>(TrueV) && isa<ConstantSDNode>(FalseV) &&
+      CCVal == ISD::SETLT) {
+    const APInt &TrueVal = cast<ConstantSDNode>(TrueV)->getAPIntValue();
+    const APInt &FalseVal = cast<ConstantSDNode>(FalseV)->getAPIntValue();
+    if (TrueVal - 1 == FalseVal)
+      return DAG.getNode(ISD::ADD, DL, VT, CondV, FalseV);
+    if (TrueVal + 1 == FalseVal)
+      return DAG.getNode(ISD::SUB, DL, VT, FalseV, CondV);
+  }
+
+  translateSetCCForBranch(DL, LHS, RHS, CCVal, DAG);
+  // 1 < x ? x : 1 -> 0 < x ? x : 1
+  if (isOneConstant(LHS) && (CCVal == ISD::SETLT || CCVal == ISD::SETULT) &&
+      RHS == TrueV && LHS == FalseV) {
+    LHS = DAG.getConstant(0, DL, VT);
+    // 0 <u x is the same as x != 0.
+    if (CCVal == ISD::SETULT) {
+      std::swap(LHS, RHS);
+      CCVal = ISD::SETNE;
+    }
+  }
 
-  SDValue Ops[] = {CondV, Zero, SetNE, TrueV, FalseV};
+  // x <s -1 ? x : -1 -> x <s 0 ? x : -1
+  if (isAllOnesConstant(RHS) && CCVal == ISD::SETLT && LHS == TrueV &&
+      RHS == FalseV) {
+    RHS = DAG.getConstant(0, DL, VT);
+  }
+
+  SDValue TargetCC = DAG.getCondCode(CCVal);
+
+  if (isa<ConstantSDNode>(TrueV) && !isa<ConstantSDNode>(FalseV)) {
+    // (select (setcc lhs, rhs, CC), constant, falsev)
+    // -> (select (setcc lhs, rhs, InverseCC), falsev, constant)
+    std::swap(TrueV, FalseV);
+    TargetCC = DAG.getCondCode(ISD::getSetCCInverse(CCVal, LHS.getValueType()));
+  }
 
-  return DAG.getNode(RISCVISD::SELECT_CC, DL, Op.getValueType(), Ops);
+  SDValue Ops[] = {LHS, RHS, TargetCC, TrueV, FalseV};
+  return DAG.getNode(RISCVISD::SELECT_CC, DL, VT, Ops);
 }
 
 SDValue RISCVTargetLowering::lowerBRCOND(SDValue Op, SelectionDAG &DAG) const {
@@ -3053,7 +4783,7 @@ SDValue RISCVTargetLowering::lowerShiftLeftParts(SDValue Op,
 
   // if Shamt-XLEN < 0: // Shamt < XLEN
   //   Lo = Lo << Shamt
-  //   Hi = (Hi << Shamt) | ((Lo >>u 1) >>u (XLEN-1 - Shamt))
+  //   Hi = (Hi << Shamt) | ((Lo >>u 1) >>u (XLEN-1 ^ Shamt))
   // else:
   //   Lo = 0
   //   Hi = Lo << (Shamt-XLEN)
@@ -3092,7 +4822,7 @@ SDValue RISCVTargetLowering::lowerShiftRightParts(SDValue Op, SelectionDAG &DAG,
 
   // SRA expansion:
   //   if Shamt-XLEN < 0: // Shamt < XLEN
-  //     Lo = (Lo >>u Shamt) | ((Hi << 1) << (XLEN-1 - Shamt))
+  //     Lo = (Lo >>u Shamt) | ((Hi << 1) << (ShAmt ^ XLEN-1))
   //     Hi = Hi >>s Shamt
   //   else:
   //     Lo = Hi >>s (Shamt-XLEN);
@@ -3100,7 +4830,7 @@ SDValue RISCVTargetLowering::lowerShiftRightParts(SDValue Op, SelectionDAG &DAG,
   //
   // SRL expansion:
   //   if Shamt-XLEN < 0: // Shamt < XLEN
-  //     Lo = (Lo >>u Shamt) | ((Hi << 1) << (XLEN-1 - Shamt))
+  //     Lo = (Lo >>u Shamt) | ((Hi << 1) << (ShAmt ^ XLEN-1))
   //     Hi = Hi >>u Shamt
   //   else:
   //     Lo = Hi >>u (Shamt-XLEN);
@@ -3164,7 +4894,7 @@ SDValue RISCVTargetLowering::lowerVectorMaskSplat(SDValue Op,
 // Custom-lower a SPLAT_VECTOR_PARTS where XLEN<SEW, as the SEW element type is
 // illegal (currently only vXi64 RV32).
 // FIXME: We could also catch non-constant sign-extended i32 values and lower
-// them to SPLAT_VECTOR_I64
+// them to VMV_V_X_VL.
 SDValue RISCVTargetLowering::lowerSPLAT_VECTOR_PARTS(SDValue Op,
                                                      SelectionDAG &DAG) const {
   SDLoc DL(Op);
@@ -3179,11 +4909,10 @@ SDValue RISCVTargetLowering::lowerSPLAT_VECTOR_PARTS(SDValue Op,
   if (VecVT.isFixedLengthVector()) {
     MVT ContainerVT = getContainerForFixedLengthVector(VecVT);
     SDLoc DL(Op);
-    SDValue Mask, VL;
-    std::tie(Mask, VL) =
-        getDefaultVLOps(VecVT, ContainerVT, DL, DAG, Subtarget);
+    auto VL = getDefaultVLOps(VecVT, ContainerVT, DL, DAG, Subtarget).second;
 
-    SDValue Res = splatPartsI64WithVL(DL, ContainerVT, Lo, Hi, VL, DAG);
+    SDValue Res =
+        splatPartsI64WithVL(DL, ContainerVT, SDValue(), Lo, Hi, VL, DAG);
     return convertFromScalableVector(VecVT, Res, DAG, Subtarget);
   }
 
@@ -3193,18 +4922,21 @@ SDValue RISCVTargetLowering::lowerSPLAT_VECTOR_PARTS(SDValue Op,
     // If Hi constant is all the same sign bit as Lo, lower this as a custom
     // node in order to try and match RVV vector/scalar instructions.
     if ((LoC >> 31) == HiC)
-      return DAG.getNode(RISCVISD::SPLAT_VECTOR_I64, DL, VecVT, Lo);
+      return DAG.getNode(RISCVISD::VMV_V_X_VL, DL, VecVT, DAG.getUNDEF(VecVT),
+                         Lo, DAG.getRegister(RISCV::X0, MVT::i32));
   }
 
   // Detect cases where Hi is (SRA Lo, 31) which means Hi is Lo sign extended.
   if (Hi.getOpcode() == ISD::SRA && Hi.getOperand(0) == Lo &&
       isa<ConstantSDNode>(Hi.getOperand(1)) &&
       Hi.getConstantOperandVal(1) == 31)
-    return DAG.getNode(RISCVISD::SPLAT_VECTOR_I64, DL, VecVT, Lo);
+    return DAG.getNode(RISCVISD::VMV_V_X_VL, DL, VecVT, DAG.getUNDEF(VecVT), Lo,
+                       DAG.getRegister(RISCV::X0, MVT::i32));
 
   // Fall back to use a stack store and stride x0 vector load. Use X0 as VL.
-  return DAG.getNode(RISCVISD::SPLAT_VECTOR_SPLIT_I64_VL, DL, VecVT, Lo, Hi,
-                     DAG.getRegister(RISCV::X0, MVT::i64));
+  return DAG.getNode(RISCVISD::SPLAT_VECTOR_SPLIT_I64_VL, DL, VecVT,
+                     DAG.getUNDEF(VecVT), Lo, Hi,
+                     DAG.getRegister(RISCV::X0, MVT::i32));
 }
 
 // Custom-lower extensions from mask vectors by using a vselect either with 1
@@ -3220,27 +4952,9 @@ SDValue RISCVTargetLowering::lowerVectorMaskExt(SDValue Op, SelectionDAG &DAG,
   assert(Src.getValueType().isVector() &&
          Src.getValueType().getVectorElementType() == MVT::i1);
 
-  MVT XLenVT = Subtarget.getXLenVT();
-  SDValue SplatZero = DAG.getConstant(0, DL, XLenVT);
-  SDValue SplatTrueVal = DAG.getConstant(ExtTrueVal, DL, XLenVT);
-
   if (VecVT.isScalableVector()) {
-    // Be careful not to introduce illegal scalar types at this stage, and be
-    // careful also about splatting constants as on RV32, vXi64 SPLAT_VECTOR is
-    // illegal and must be expanded. Since we know that the constants are
-    // sign-extended 32-bit values, we use SPLAT_VECTOR_I64 directly.
-    bool IsRV32E64 =
-        !Subtarget.is64Bit() && VecVT.getVectorElementType() == MVT::i64;
-
-    if (!IsRV32E64) {
-      SplatZero = DAG.getSplatVector(VecVT, DL, SplatZero);
-      SplatTrueVal = DAG.getSplatVector(VecVT, DL, SplatTrueVal);
-    } else {
-      SplatZero = DAG.getNode(RISCVISD::SPLAT_VECTOR_I64, DL, VecVT, SplatZero);
-      SplatTrueVal =
-          DAG.getNode(RISCVISD::SPLAT_VECTOR_I64, DL, VecVT, SplatTrueVal);
-    }
-
+    SDValue SplatZero = DAG.getConstant(0, DL, VecVT);
+    SDValue SplatTrueVal = DAG.getConstant(ExtTrueVal, DL, VecVT);
     return DAG.getNode(ISD::VSELECT, DL, VecVT, Src, SplatTrueVal, SplatZero);
   }
 
@@ -3250,12 +4964,16 @@ SDValue RISCVTargetLowering::lowerVectorMaskExt(SDValue Op, SelectionDAG &DAG,
 
   SDValue CC = convertToScalableVector(I1ContainerVT, Src, DAG, Subtarget);
 
-  SDValue Mask, VL;
-  std::tie(Mask, VL) = getDefaultVLOps(VecVT, ContainerVT, DL, DAG, Subtarget);
+  SDValue VL = getDefaultVLOps(VecVT, ContainerVT, DL, DAG, Subtarget).second;
+
+  MVT XLenVT = Subtarget.getXLenVT();
+  SDValue SplatZero = DAG.getConstant(0, DL, XLenVT);
+  SDValue SplatTrueVal = DAG.getConstant(ExtTrueVal, DL, XLenVT);
 
-  SplatZero = DAG.getNode(RISCVISD::VMV_V_X_VL, DL, ContainerVT, SplatZero, VL);
-  SplatTrueVal =
-      DAG.getNode(RISCVISD::VMV_V_X_VL, DL, ContainerVT, SplatTrueVal, VL);
+  SplatZero = DAG.getNode(RISCVISD::VMV_V_X_VL, DL, ContainerVT,
+                          DAG.getUNDEF(ContainerVT), SplatZero, VL);
+  SplatTrueVal = DAG.getNode(RISCVISD::VMV_V_X_VL, DL, ContainerVT,
+                             DAG.getUNDEF(ContainerVT), SplatTrueVal, VL);
   SDValue Select = DAG.getNode(RISCVISD::VSELECT_VL, DL, ContainerVT, CC,
                                SplatTrueVal, SplatZero, VL);
 
@@ -3282,8 +5000,7 @@ SDValue RISCVTargetLowering::lowerFixedLengthVectorExtendToRVV(
       convertToScalableVector(ContainerVT, Op.getOperand(0), DAG, Subtarget);
 
   SDLoc DL(Op);
-  SDValue Mask, VL;
-  std::tie(Mask, VL) = getDefaultVLOps(VT, ContainerVT, DL, DAG, Subtarget);
+  auto [Mask, VL] = getDefaultVLOps(VT, ContainerVT, DL, DAG, Subtarget);
 
   SDValue Ext = DAG.getNode(ExtendOpc, DL, ContainerExtVT, Op1, Mask, VL);
 
@@ -3293,8 +5010,9 @@ SDValue RISCVTargetLowering::lowerFixedLengthVectorExtendToRVV(
 // Custom-lower truncations from vectors to mask vectors by using a mask and a
 // setcc operation:
 //   (vXi1 = trunc vXiN vec) -> (vXi1 = setcc (and vec, 1), 0, ne)
-SDValue RISCVTargetLowering::lowerVectorMaskTrunc(SDValue Op,
-                                                  SelectionDAG &DAG) const {
+SDValue RISCVTargetLowering::lowerVectorMaskTruncLike(SDValue Op,
+                                                      SelectionDAG &DAG) const {
+  bool IsVPTrunc = Op.getOpcode() == ISD::VP_TRUNCATE;
   SDLoc DL(Op);
   EVT MaskVT = Op.getValueType();
   // Only expect to custom-lower truncations to mask types
@@ -3302,53 +5020,196 @@ SDValue RISCVTargetLowering::lowerVectorMaskTrunc(SDValue Op,
          "Unexpected type for vector mask lowering");
   SDValue Src = Op.getOperand(0);
   MVT VecVT = Src.getSimpleValueType();
-
+  SDValue Mask, VL;
+  if (IsVPTrunc) {
+    Mask = Op.getOperand(1);
+    VL = Op.getOperand(2);
+  }
   // If this is a fixed vector, we need to convert it to a scalable vector.
   MVT ContainerVT = VecVT;
+
   if (VecVT.isFixedLengthVector()) {
     ContainerVT = getContainerForFixedLengthVector(VecVT);
     Src = convertToScalableVector(ContainerVT, Src, DAG, Subtarget);
+    if (IsVPTrunc) {
+      MVT MaskContainerVT =
+          getContainerForFixedLengthVector(Mask.getSimpleValueType());
+      Mask = convertToScalableVector(MaskContainerVT, Mask, DAG, Subtarget);
+    }
+  }
+
+  if (!IsVPTrunc) {
+    std::tie(Mask, VL) =
+        getDefaultVLOps(VecVT, ContainerVT, DL, DAG, Subtarget);
   }
 
   SDValue SplatOne = DAG.getConstant(1, DL, Subtarget.getXLenVT());
   SDValue SplatZero = DAG.getConstant(0, DL, Subtarget.getXLenVT());
 
-  SplatOne = DAG.getNode(RISCVISD::VMV_V_X_VL, DL, ContainerVT, SplatOne);
-  SplatZero = DAG.getNode(RISCVISD::VMV_V_X_VL, DL, ContainerVT, SplatZero);
-
-  if (VecVT.isScalableVector()) {
-    SDValue Trunc = DAG.getNode(ISD::AND, DL, VecVT, Src, SplatOne);
-    return DAG.getSetCC(DL, MaskVT, Trunc, SplatZero, ISD::SETNE);
-  }
-
-  SDValue Mask, VL;
-  std::tie(Mask, VL) = getDefaultVLOps(VecVT, ContainerVT, DL, DAG, Subtarget);
+  SplatOne = DAG.getNode(RISCVISD::VMV_V_X_VL, DL, ContainerVT,
+                         DAG.getUNDEF(ContainerVT), SplatOne, VL);
+  SplatZero = DAG.getNode(RISCVISD::VMV_V_X_VL, DL, ContainerVT,
+                          DAG.getUNDEF(ContainerVT), SplatZero, VL);
 
   MVT MaskContainerVT = ContainerVT.changeVectorElementType(MVT::i1);
-  SDValue Trunc =
-      DAG.getNode(RISCVISD::AND_VL, DL, ContainerVT, Src, SplatOne, Mask, VL);
-  Trunc = DAG.getNode(RISCVISD::SETCC_VL, DL, MaskContainerVT, Trunc, SplatZero,
-                      DAG.getCondCode(ISD::SETNE), Mask, VL);
-  return convertFromScalableVector(MaskVT, Trunc, DAG, Subtarget);
+  SDValue Trunc = DAG.getNode(RISCVISD::AND_VL, DL, ContainerVT, Src, SplatOne,
+                              DAG.getUNDEF(ContainerVT), Mask, VL);
+  Trunc = DAG.getNode(RISCVISD::SETCC_VL, DL, MaskContainerVT,
+                      {Trunc, SplatZero, DAG.getCondCode(ISD::SETNE),
+                       DAG.getUNDEF(MaskContainerVT), Mask, VL});
+  if (MaskVT.isFixedLengthVector())
+    Trunc = convertFromScalableVector(MaskVT, Trunc, DAG, Subtarget);
+  return Trunc;
 }
 
-// Custom-legalize INSERT_VECTOR_ELT so that the value is inserted into the
-// first position of a vector, and that vector is slid up to the insert index.
-// By limiting the active vector length to index+1 and merging with the
-// original vector (with an undisturbed tail policy for elements >= VL), we
-// achieve the desired result of leaving all elements untouched except the one
-// at VL-1, which is replaced with the desired value.
-SDValue RISCVTargetLowering::lowerINSERT_VECTOR_ELT(SDValue Op,
-                                                    SelectionDAG &DAG) const {
+SDValue RISCVTargetLowering::lowerVectorTruncLike(SDValue Op,
+                                                  SelectionDAG &DAG) const {
+  bool IsVPTrunc = Op.getOpcode() == ISD::VP_TRUNCATE;
   SDLoc DL(Op);
-  MVT VecVT = Op.getSimpleValueType();
-  SDValue Vec = Op.getOperand(0);
-  SDValue Val = Op.getOperand(1);
-  SDValue Idx = Op.getOperand(2);
 
-  if (VecVT.getVectorElementType() == MVT::i1) {
-    // FIXME: For now we just promote to an i8 vector and insert into that,
-    // but this is probably not optimal.
+  MVT VT = Op.getSimpleValueType();
+  // Only custom-lower vector truncates
+  assert(VT.isVector() && "Unexpected type for vector truncate lowering");
+
+  // Truncates to mask types are handled differently
+  if (VT.getVectorElementType() == MVT::i1)
+    return lowerVectorMaskTruncLike(Op, DAG);
+
+  // RVV only has truncates which operate from SEW*2->SEW, so lower arbitrary
+  // truncates as a series of "RISCVISD::TRUNCATE_VECTOR_VL" nodes which
+  // truncate by one power of two at a time.
+  MVT DstEltVT = VT.getVectorElementType();
+
+  SDValue Src = Op.getOperand(0);
+  MVT SrcVT = Src.getSimpleValueType();
+  MVT SrcEltVT = SrcVT.getVectorElementType();
+
+  assert(DstEltVT.bitsLT(SrcEltVT) && isPowerOf2_64(DstEltVT.getSizeInBits()) &&
+         isPowerOf2_64(SrcEltVT.getSizeInBits()) &&
+         "Unexpected vector truncate lowering");
+
+  MVT ContainerVT = SrcVT;
+  SDValue Mask, VL;
+  if (IsVPTrunc) {
+    Mask = Op.getOperand(1);
+    VL = Op.getOperand(2);
+  }
+  if (SrcVT.isFixedLengthVector()) {
+    ContainerVT = getContainerForFixedLengthVector(SrcVT);
+    Src = convertToScalableVector(ContainerVT, Src, DAG, Subtarget);
+    if (IsVPTrunc) {
+      MVT MaskVT = getMaskTypeFor(ContainerVT);
+      Mask = convertToScalableVector(MaskVT, Mask, DAG, Subtarget);
+    }
+  }
+
+  SDValue Result = Src;
+  if (!IsVPTrunc) {
+    std::tie(Mask, VL) =
+        getDefaultVLOps(SrcVT, ContainerVT, DL, DAG, Subtarget);
+  }
+
+  LLVMContext &Context = *DAG.getContext();
+  const ElementCount Count = ContainerVT.getVectorElementCount();
+  do {
+    SrcEltVT = MVT::getIntegerVT(SrcEltVT.getSizeInBits() / 2);
+    EVT ResultVT = EVT::getVectorVT(Context, SrcEltVT, Count);
+    Result = DAG.getNode(RISCVISD::TRUNCATE_VECTOR_VL, DL, ResultVT, Result,
+                         Mask, VL);
+  } while (SrcEltVT != DstEltVT);
+
+  if (SrcVT.isFixedLengthVector())
+    Result = convertFromScalableVector(VT, Result, DAG, Subtarget);
+
+  return Result;
+}
+
+SDValue
+RISCVTargetLowering::lowerVectorFPExtendOrRoundLike(SDValue Op,
+                                                    SelectionDAG &DAG) const {
+  bool IsVP =
+      Op.getOpcode() == ISD::VP_FP_ROUND || Op.getOpcode() == ISD::VP_FP_EXTEND;
+  bool IsExtend =
+      Op.getOpcode() == ISD::VP_FP_EXTEND || Op.getOpcode() == ISD::FP_EXTEND;
+  // RVV can only do truncate fp to types half the size as the source. We
+  // custom-lower f64->f16 rounds via RVV's round-to-odd float
+  // conversion instruction.
+  SDLoc DL(Op);
+  MVT VT = Op.getSimpleValueType();
+
+  assert(VT.isVector() && "Unexpected type for vector truncate lowering");
+
+  SDValue Src = Op.getOperand(0);
+  MVT SrcVT = Src.getSimpleValueType();
+
+  bool IsDirectExtend = IsExtend && (VT.getVectorElementType() != MVT::f64 ||
+                                     SrcVT.getVectorElementType() != MVT::f16);
+  bool IsDirectTrunc = !IsExtend && (VT.getVectorElementType() != MVT::f16 ||
+                                     SrcVT.getVectorElementType() != MVT::f64);
+
+  bool IsDirectConv = IsDirectExtend || IsDirectTrunc;
+
+  // Prepare any fixed-length vector operands.
+  MVT ContainerVT = VT;
+  SDValue Mask, VL;
+  if (IsVP) {
+    Mask = Op.getOperand(1);
+    VL = Op.getOperand(2);
+  }
+  if (VT.isFixedLengthVector()) {
+    MVT SrcContainerVT = getContainerForFixedLengthVector(SrcVT);
+    ContainerVT =
+        SrcContainerVT.changeVectorElementType(VT.getVectorElementType());
+    Src = convertToScalableVector(SrcContainerVT, Src, DAG, Subtarget);
+    if (IsVP) {
+      MVT MaskVT = getMaskTypeFor(ContainerVT);
+      Mask = convertToScalableVector(MaskVT, Mask, DAG, Subtarget);
+    }
+  }
+
+  if (!IsVP)
+    std::tie(Mask, VL) =
+        getDefaultVLOps(SrcVT, ContainerVT, DL, DAG, Subtarget);
+
+  unsigned ConvOpc = IsExtend ? RISCVISD::FP_EXTEND_VL : RISCVISD::FP_ROUND_VL;
+
+  if (IsDirectConv) {
+    Src = DAG.getNode(ConvOpc, DL, ContainerVT, Src, Mask, VL);
+    if (VT.isFixedLengthVector())
+      Src = convertFromScalableVector(VT, Src, DAG, Subtarget);
+    return Src;
+  }
+
+  unsigned InterConvOpc =
+      IsExtend ? RISCVISD::FP_EXTEND_VL : RISCVISD::VFNCVT_ROD_VL;
+
+  MVT InterVT = ContainerVT.changeVectorElementType(MVT::f32);
+  SDValue IntermediateConv =
+      DAG.getNode(InterConvOpc, DL, InterVT, Src, Mask, VL);
+  SDValue Result =
+      DAG.getNode(ConvOpc, DL, ContainerVT, IntermediateConv, Mask, VL);
+  if (VT.isFixedLengthVector())
+    return convertFromScalableVector(VT, Result, DAG, Subtarget);
+  return Result;
+}
+
+// Custom-legalize INSERT_VECTOR_ELT so that the value is inserted into the
+// first position of a vector, and that vector is slid up to the insert index.
+// By limiting the active vector length to index+1 and merging with the
+// original vector (with an undisturbed tail policy for elements >= VL), we
+// achieve the desired result of leaving all elements untouched except the one
+// at VL-1, which is replaced with the desired value.
+SDValue RISCVTargetLowering::lowerINSERT_VECTOR_ELT(SDValue Op,
+                                                    SelectionDAG &DAG) const {
+  SDLoc DL(Op);
+  MVT VecVT = Op.getSimpleValueType();
+  SDValue Vec = Op.getOperand(0);
+  SDValue Val = Op.getOperand(1);
+  SDValue Idx = Op.getOperand(2);
+
+  if (VecVT.getVectorElementType() == MVT::i1) {
+    // FIXME: For now we just promote to an i8 vector and insert into that,
+    // but this is probably not optimal.
     MVT WideVT = MVT::getVectorVT(MVT::i8, VecVT.getVectorElementCount());
     Vec = DAG.getNode(ISD::ZERO_EXTEND, DL, WideVT, Vec);
     Vec = DAG.getNode(ISD::INSERT_VECTOR_ELT, DL, WideVT, Vec, Val, Idx);
@@ -3378,8 +5239,7 @@ SDValue RISCVTargetLowering::lowerINSERT_VECTOR_ELT(SDValue Op,
     }
   }
 
-  SDValue Mask, VL;
-  std::tie(Mask, VL) = getDefaultVLOps(VecVT, ContainerVT, DL, DAG, Subtarget);
+  auto [Mask, VL] = getDefaultVLOps(VecVT, ContainerVT, DL, DAG, Subtarget);
 
   SDValue ValInVec;
 
@@ -3392,11 +5252,10 @@ SDValue RISCVTargetLowering::lowerINSERT_VECTOR_ELT(SDValue Op,
         return Vec;
       return convertFromScalableVector(VecVT, Vec, DAG, Subtarget);
     }
-    ValInVec =
-        DAG.getNode(Opc, DL, ContainerVT, DAG.getUNDEF(ContainerVT), Val, VL);
+    ValInVec = lowerScalarInsert(Val, VL, ContainerVT, DL, DAG, Subtarget);
   } else {
     // On RV32, i64-element vectors must be specially handled to place the
-    // value at element 0, by using two vslide1up instructions in sequence on
+    // value at element 0, by using two vslide1down instructions in sequence on
     // the i32 split lo/hi value. Use an equivalently-sized i32 vector for
     // this.
     SDValue One = DAG.getConstant(1, DL, XLenVT);
@@ -3408,15 +5267,34 @@ SDValue RISCVTargetLowering::lowerINSERT_VECTOR_ELT(SDValue Op,
         getDefaultScalableVLOps(I32ContainerVT, DL, DAG, Subtarget).first;
     // Limit the active VL to two.
     SDValue InsertI64VL = DAG.getConstant(2, DL, XLenVT);
-    // Note: We can't pass a UNDEF to the first VSLIDE1UP_VL since an untied
-    // undef doesn't obey the earlyclobber constraint. Just splat a zero value.
-    ValInVec = DAG.getNode(RISCVISD::VMV_V_X_VL, DL, I32ContainerVT, Zero,
-                           InsertI64VL);
-    // First slide in the hi value, then the lo in underneath it.
-    ValInVec = DAG.getNode(RISCVISD::VSLIDE1UP_VL, DL, I32ContainerVT, ValInVec,
-                           ValHi, I32Mask, InsertI64VL);
-    ValInVec = DAG.getNode(RISCVISD::VSLIDE1UP_VL, DL, I32ContainerVT, ValInVec,
-                           ValLo, I32Mask, InsertI64VL);
+    // If the Idx is 0 we can insert directly into the vector.
+    if (isNullConstant(Idx)) {
+      // First slide in the lo value, then the hi in above it. We use slide1down
+      // to avoid the register group overlap constraint of vslide1up.
+      ValInVec = DAG.getNode(RISCVISD::VSLIDE1DOWN_VL, DL, I32ContainerVT,
+                             Vec, Vec, ValLo, I32Mask, InsertI64VL);
+      // If the source vector is undef don't pass along the tail elements from
+      // the previous slide1down.
+      SDValue Tail = Vec.isUndef() ? Vec : ValInVec;
+      ValInVec = DAG.getNode(RISCVISD::VSLIDE1DOWN_VL, DL, I32ContainerVT,
+                             Tail, ValInVec, ValHi, I32Mask, InsertI64VL);
+      // Bitcast back to the right container type.
+      ValInVec = DAG.getBitcast(ContainerVT, ValInVec);
+
+      if (!VecVT.isFixedLengthVector())
+        return ValInVec;
+      return convertFromScalableVector(VecVT, ValInVec, DAG, Subtarget);
+    }
+
+    // First slide in the lo value, then the hi in above it. We use slide1down
+    // to avoid the register group overlap constraint of vslide1up.
+    ValInVec = DAG.getNode(RISCVISD::VSLIDE1DOWN_VL, DL, I32ContainerVT,
+                           DAG.getUNDEF(I32ContainerVT),
+                           DAG.getUNDEF(I32ContainerVT), ValLo,
+                           I32Mask, InsertI64VL);
+    ValInVec = DAG.getNode(RISCVISD::VSLIDE1DOWN_VL, DL, I32ContainerVT,
+                           DAG.getUNDEF(I32ContainerVT), ValInVec, ValHi,
+                           I32Mask, InsertI64VL);
     // Bitcast back to the right container type.
     ValInVec = DAG.getBitcast(ContainerVT, ValInVec);
   }
@@ -3424,8 +5302,15 @@ SDValue RISCVTargetLowering::lowerINSERT_VECTOR_ELT(SDValue Op,
   // Now that the value is in a vector, slide it into position.
   SDValue InsertVL =
       DAG.getNode(ISD::ADD, DL, XLenVT, Idx, DAG.getConstant(1, DL, XLenVT));
-  SDValue Slideup = DAG.getNode(RISCVISD::VSLIDEUP_VL, DL, ContainerVT, Vec,
-                                ValInVec, Idx, Mask, InsertVL);
+
+  // Use tail agnostic policy if Idx is the last index of Vec.
+  unsigned Policy = RISCVII::TAIL_UNDISTURBED_MASK_UNDISTURBED;
+  if (VecVT.isFixedLengthVector() && isa<ConstantSDNode>(Idx) &&
+      cast<ConstantSDNode>(Idx)->getZExtValue() + 1 ==
+          VecVT.getVectorNumElements())
+    Policy = RISCVII::TAIL_AGNOSTIC;
+  SDValue Slideup = getVSlideup(DAG, Subtarget, DL, ContainerVT, Vec, ValInVec,
+                                Idx, Mask, InsertVL, Policy);
   if (!VecVT.isFixedLengthVector())
     return Slideup;
   return convertFromScalableVector(VecVT, Slideup, DAG, Subtarget);
@@ -3445,8 +5330,60 @@ SDValue RISCVTargetLowering::lowerEXTRACT_VECTOR_ELT(SDValue Op,
   MVT XLenVT = Subtarget.getXLenVT();
 
   if (VecVT.getVectorElementType() == MVT::i1) {
-    // FIXME: For now we just promote to an i8 vector and extract from that,
-    // but this is probably not optimal.
+    // Use vfirst.m to extract the first bit.
+    if (isNullConstant(Idx)) {
+      MVT ContainerVT = VecVT;
+      if (VecVT.isFixedLengthVector()) {
+        ContainerVT = getContainerForFixedLengthVector(VecVT);
+        Vec = convertToScalableVector(ContainerVT, Vec, DAG, Subtarget);
+      }
+      auto [Mask, VL] = getDefaultVLOps(VecVT, ContainerVT, DL, DAG, Subtarget);
+      SDValue Vfirst =
+          DAG.getNode(RISCVISD::VFIRST_VL, DL, XLenVT, Vec, Mask, VL);
+      return DAG.getSetCC(DL, XLenVT, Vfirst, DAG.getConstant(0, DL, XLenVT),
+                          ISD::SETEQ);
+    }
+    if (VecVT.isFixedLengthVector()) {
+      unsigned NumElts = VecVT.getVectorNumElements();
+      if (NumElts >= 8) {
+        MVT WideEltVT;
+        unsigned WidenVecLen;
+        SDValue ExtractElementIdx;
+        SDValue ExtractBitIdx;
+        unsigned MaxEEW = Subtarget.getELEN();
+        MVT LargestEltVT = MVT::getIntegerVT(
+            std::min(MaxEEW, unsigned(XLenVT.getSizeInBits())));
+        if (NumElts <= LargestEltVT.getSizeInBits()) {
+          assert(isPowerOf2_32(NumElts) &&
+                 "the number of elements should be power of 2");
+          WideEltVT = MVT::getIntegerVT(NumElts);
+          WidenVecLen = 1;
+          ExtractElementIdx = DAG.getConstant(0, DL, XLenVT);
+          ExtractBitIdx = Idx;
+        } else {
+          WideEltVT = LargestEltVT;
+          WidenVecLen = NumElts / WideEltVT.getSizeInBits();
+          // extract element index = index / element width
+          ExtractElementIdx = DAG.getNode(
+              ISD::SRL, DL, XLenVT, Idx,
+              DAG.getConstant(Log2_64(WideEltVT.getSizeInBits()), DL, XLenVT));
+          // mask bit index = index % element width
+          ExtractBitIdx = DAG.getNode(
+              ISD::AND, DL, XLenVT, Idx,
+              DAG.getConstant(WideEltVT.getSizeInBits() - 1, DL, XLenVT));
+        }
+        MVT WideVT = MVT::getVectorVT(WideEltVT, WidenVecLen);
+        Vec = DAG.getNode(ISD::BITCAST, DL, WideVT, Vec);
+        SDValue ExtractElt = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, DL, XLenVT,
+                                         Vec, ExtractElementIdx);
+        // Extract the bit from GPR.
+        SDValue ShiftRight =
+            DAG.getNode(ISD::SRL, DL, XLenVT, ExtractElt, ExtractBitIdx);
+        return DAG.getNode(ISD::AND, DL, XLenVT, ShiftRight,
+                           DAG.getConstant(1, DL, XLenVT));
+      }
+    }
+    // Otherwise, promote to an i8 vector and extract from that.
     MVT WideVT = MVT::getVectorVT(MVT::i8, VecVT.getVectorElementCount());
     Vec = DAG.getNode(ISD::ZERO_EXTEND, DL, WideVT, Vec);
     return DAG.getNode(ISD::EXTRACT_VECTOR_ELT, DL, EltVT, Vec, Idx);
@@ -3462,11 +5399,9 @@ SDValue RISCVTargetLowering::lowerEXTRACT_VECTOR_ELT(SDValue Op,
   // If the index is 0, the vector is already in the right position.
   if (!isNullConstant(Idx)) {
     // Use a VL of 1 to avoid processing more elements than we need.
-    SDValue VL = DAG.getConstant(1, DL, XLenVT);
-    MVT MaskVT = MVT::getVectorVT(MVT::i1, ContainerVT.getVectorElementCount());
-    SDValue Mask = DAG.getNode(RISCVISD::VMSET_VL, DL, MaskVT, VL);
-    Vec = DAG.getNode(RISCVISD::VSLIDEDOWN_VL, DL, ContainerVT,
-                      DAG.getUNDEF(ContainerVT), Vec, Idx, Mask, VL);
+    auto [Mask, VL] = getDefaultVLOps(1, ContainerVT, DL, DAG, Subtarget);
+    Vec = getVSlidedown(DAG, Subtarget, DL, ContainerVT,
+                        DAG.getUNDEF(ContainerVT), Vec, Idx, Mask, VL);
   }
 
   if (!EltVT.isInteger()) {
@@ -3481,13 +5416,13 @@ SDValue RISCVTargetLowering::lowerEXTRACT_VECTOR_ELT(SDValue Op,
 
 // Some RVV intrinsics may claim that they want an integer operand to be
 // promoted or expanded.
-static SDValue lowerVectorIntrinsicSplats(SDValue Op, SelectionDAG &DAG,
-                                          const RISCVSubtarget &Subtarget) {
+static SDValue lowerVectorIntrinsicScalars(SDValue Op, SelectionDAG &DAG,
+                                           const RISCVSubtarget &Subtarget) {
   assert((Op.getOpcode() == ISD::INTRINSIC_WO_CHAIN ||
           Op.getOpcode() == ISD::INTRINSIC_W_CHAIN) &&
          "Unexpected opcode");
 
-  if (!Subtarget.hasStdExtV())
+  if (!Subtarget.hasVInstructions())
     return SDValue();
 
   bool HasChain = Op.getOpcode() == ISD::INTRINSIC_W_CHAIN;
@@ -3496,10 +5431,10 @@ static SDValue lowerVectorIntrinsicSplats(SDValue Op, SelectionDAG &DAG,
 
   const RISCVVIntrinsicsTable::RISCVVIntrinsicInfo *II =
       RISCVVIntrinsicsTable::getRISCVVIntrinsicInfo(IntNo);
-  if (!II || !II->SplatOperand)
+  if (!II || !II->hasScalarOperand())
     return SDValue();
 
-  unsigned SplatOp = II->SplatOperand + HasChain;
+  unsigned SplatOp = II->ScalarOperand + 1 + HasChain;
   assert(SplatOp < Op.getNumOperands());
 
   SmallVector<SDValue, 8> Operands(Op->op_begin(), Op->op_end());
@@ -3529,29 +5464,141 @@ static SDValue lowerVectorIntrinsicSplats(SDValue Op, SelectionDAG &DAG,
   // that a widening operation never uses SEW=64.
   // NOTE: If this fails the below assert, we can probably just find the
   // element count from any operand or result and use it to construct the VT.
-  assert(II->SplatOperand > 1 && "Unexpected splat operand!");
+  assert(II->ScalarOperand > 0 && "Unexpected splat operand!");
   MVT VT = Op.getOperand(SplatOp - 1).getSimpleValueType();
 
   // The more complex case is when the scalar is larger than XLenVT.
   assert(XLenVT == MVT::i32 && OpVT == MVT::i64 &&
          VT.getVectorElementType() == MVT::i64 && "Unexpected VTs!");
 
-  // If this is a sign-extended 32-bit constant, we can truncate it and rely
-  // on the instruction to sign-extend since SEW>XLEN.
-  if (auto *CVal = dyn_cast<ConstantSDNode>(ScalarOp)) {
-    if (isInt<32>(CVal->getSExtValue())) {
-      ScalarOp = DAG.getConstant(CVal->getSExtValue(), DL, MVT::i32);
-      return DAG.getNode(Op->getOpcode(), DL, Op->getVTList(), Operands);
+  // If this is a sign-extended 32-bit value, we can truncate it and rely on the
+  // instruction to sign-extend since SEW>XLEN.
+  if (DAG.ComputeNumSignBits(ScalarOp) > 32) {
+    ScalarOp = DAG.getNode(ISD::TRUNCATE, DL, MVT::i32, ScalarOp);
+    return DAG.getNode(Op->getOpcode(), DL, Op->getVTList(), Operands);
+  }
+
+  switch (IntNo) {
+  case Intrinsic::riscv_vslide1up:
+  case Intrinsic::riscv_vslide1down:
+  case Intrinsic::riscv_vslide1up_mask:
+  case Intrinsic::riscv_vslide1down_mask: {
+    // We need to special case these when the scalar is larger than XLen.
+    unsigned NumOps = Op.getNumOperands();
+    bool IsMasked = NumOps == 7;
+
+    // Convert the vector source to the equivalent nxvXi32 vector.
+    MVT I32VT = MVT::getVectorVT(MVT::i32, VT.getVectorElementCount() * 2);
+    SDValue Vec = DAG.getBitcast(I32VT, Operands[2]);
+
+    SDValue ScalarLo = DAG.getNode(ISD::EXTRACT_ELEMENT, DL, MVT::i32, ScalarOp,
+                                   DAG.getConstant(0, DL, XLenVT));
+    SDValue ScalarHi = DAG.getNode(ISD::EXTRACT_ELEMENT, DL, MVT::i32, ScalarOp,
+                                   DAG.getConstant(1, DL, XLenVT));
+
+    // Double the VL since we halved SEW.
+    SDValue AVL = getVLOperand(Op);
+    SDValue I32VL;
+
+    // Optimize for constant AVL
+    if (isa<ConstantSDNode>(AVL)) {
+      unsigned EltSize = VT.getScalarSizeInBits();
+      unsigned MinSize = VT.getSizeInBits().getKnownMinValue();
+
+      unsigned VectorBitsMax = Subtarget.getRealMaxVLen();
+      unsigned MaxVLMAX =
+          RISCVTargetLowering::computeVLMAX(VectorBitsMax, EltSize, MinSize);
+
+      unsigned VectorBitsMin = Subtarget.getRealMinVLen();
+      unsigned MinVLMAX =
+          RISCVTargetLowering::computeVLMAX(VectorBitsMin, EltSize, MinSize);
+
+      uint64_t AVLInt = cast<ConstantSDNode>(AVL)->getZExtValue();
+      if (AVLInt <= MinVLMAX) {
+        I32VL = DAG.getConstant(2 * AVLInt, DL, XLenVT);
+      } else if (AVLInt >= 2 * MaxVLMAX) {
+        // Just set vl to VLMAX in this situation
+        RISCVII::VLMUL Lmul = RISCVTargetLowering::getLMUL(I32VT);
+        SDValue LMUL = DAG.getConstant(Lmul, DL, XLenVT);
+        unsigned Sew = RISCVVType::encodeSEW(I32VT.getScalarSizeInBits());
+        SDValue SEW = DAG.getConstant(Sew, DL, XLenVT);
+        SDValue SETVLMAX = DAG.getTargetConstant(
+            Intrinsic::riscv_vsetvlimax_opt, DL, MVT::i32);
+        I32VL = DAG.getNode(ISD::INTRINSIC_WO_CHAIN, DL, XLenVT, SETVLMAX, SEW,
+                            LMUL);
+      } else {
+        // For AVL between (MinVLMAX, 2 * MaxVLMAX), the actual working vl
+        // is related to the hardware implementation.
+        // So let the following code handle
+      }
+    }
+    if (!I32VL) {
+      RISCVII::VLMUL Lmul = RISCVTargetLowering::getLMUL(VT);
+      SDValue LMUL = DAG.getConstant(Lmul, DL, XLenVT);
+      unsigned Sew = RISCVVType::encodeSEW(VT.getScalarSizeInBits());
+      SDValue SEW = DAG.getConstant(Sew, DL, XLenVT);
+      SDValue SETVL =
+          DAG.getTargetConstant(Intrinsic::riscv_vsetvli_opt, DL, MVT::i32);
+      // Using vsetvli instruction to get actually used length which related to
+      // the hardware implementation
+      SDValue VL = DAG.getNode(ISD::INTRINSIC_WO_CHAIN, DL, XLenVT, SETVL, AVL,
+                               SEW, LMUL);
+      I32VL =
+          DAG.getNode(ISD::SHL, DL, XLenVT, VL, DAG.getConstant(1, DL, XLenVT));
+    }
+
+    SDValue I32Mask = getAllOnesMask(I32VT, I32VL, DL, DAG);
+
+    // Shift the two scalar parts in using SEW=32 slide1up/slide1down
+    // instructions.
+    SDValue Passthru;
+    if (IsMasked)
+      Passthru = DAG.getUNDEF(I32VT);
+    else
+      Passthru = DAG.getBitcast(I32VT, Operands[1]);
+
+    if (IntNo == Intrinsic::riscv_vslide1up ||
+        IntNo == Intrinsic::riscv_vslide1up_mask) {
+      Vec = DAG.getNode(RISCVISD::VSLIDE1UP_VL, DL, I32VT, Passthru, Vec,
+                        ScalarHi, I32Mask, I32VL);
+      Vec = DAG.getNode(RISCVISD::VSLIDE1UP_VL, DL, I32VT, Passthru, Vec,
+                        ScalarLo, I32Mask, I32VL);
+    } else {
+      Vec = DAG.getNode(RISCVISD::VSLIDE1DOWN_VL, DL, I32VT, Passthru, Vec,
+                        ScalarLo, I32Mask, I32VL);
+      Vec = DAG.getNode(RISCVISD::VSLIDE1DOWN_VL, DL, I32VT, Passthru, Vec,
+                        ScalarHi, I32Mask, I32VL);
     }
+
+    // Convert back to nxvXi64.
+    Vec = DAG.getBitcast(VT, Vec);
+
+    if (!IsMasked)
+      return Vec;
+    // Apply mask after the operation.
+    SDValue Mask = Operands[NumOps - 3];
+    SDValue MaskedOff = Operands[1];
+    // Assume Policy operand is the last operand.
+    uint64_t Policy =
+        cast<ConstantSDNode>(Operands[NumOps - 1])->getZExtValue();
+    // We don't need to select maskedoff if it's undef.
+    if (MaskedOff.isUndef())
+      return Vec;
+    // TAMU
+    if (Policy == RISCVII::TAIL_AGNOSTIC)
+      return DAG.getNode(RISCVISD::VSELECT_VL, DL, VT, Mask, Vec, MaskedOff,
+                         AVL);
+    // TUMA or TUMU: Currently we always emit tumu policy regardless of tuma.
+    // It's fine because vmerge does not care mask policy.
+    return DAG.getNode(RISCVISD::VP_MERGE_VL, DL, VT, Mask, Vec, MaskedOff,
+                       AVL);
+  }
   }
 
   // We need to convert the scalar to a splat vector.
-  // FIXME: Can we implicitly truncate the scalar if it is known to
-  // be sign extended?
-  // VL should be the last operand.
-  SDValue VL = Op.getOperand(Op.getNumOperands() - 1);
+  SDValue VL = getVLOperand(Op);
   assert(VL.getValueType() == XLenVT);
-  ScalarOp = splatSplitI64WithVL(DL, VT, ScalarOp, VL, DAG);
+  ScalarOp = splatSplitI64WithVL(DL, VT, SDValue(), ScalarOp, VL, DAG);
   return DAG.getNode(Op->getOpcode(), DL, Op->getVTList(), Operands);
 }
 
@@ -3569,37 +5616,31 @@ SDValue RISCVTargetLowering::LowerINTRINSIC_WO_CHAIN(SDValue Op,
     return DAG.getRegister(RISCV::X4, PtrVT);
   }
   case Intrinsic::riscv_orc_b:
-    // Lower to the GORCI encoding for orc.b.
-    return DAG.getNode(RISCVISD::GORC, DL, XLenVT, Op.getOperand(1),
-                       DAG.getConstant(7, DL, XLenVT));
-  case Intrinsic::riscv_grev:
-  case Intrinsic::riscv_gorc: {
+  case Intrinsic::riscv_brev8: {
     unsigned Opc =
-        IntNo == Intrinsic::riscv_grev ? RISCVISD::GREV : RISCVISD::GORC;
-    return DAG.getNode(Opc, DL, XLenVT, Op.getOperand(1), Op.getOperand(2));
+        IntNo == Intrinsic::riscv_brev8 ? RISCVISD::BREV8 : RISCVISD::ORC_B;
+    return DAG.getNode(Opc, DL, XLenVT, Op.getOperand(1));
   }
-  case Intrinsic::riscv_shfl:
-  case Intrinsic::riscv_unshfl: {
+  case Intrinsic::riscv_zip:
+  case Intrinsic::riscv_unzip: {
     unsigned Opc =
-        IntNo == Intrinsic::riscv_shfl ? RISCVISD::SHFL : RISCVISD::UNSHFL;
-    return DAG.getNode(Opc, DL, XLenVT, Op.getOperand(1), Op.getOperand(2));
-  }
-  case Intrinsic::riscv_bcompress:
-  case Intrinsic::riscv_bdecompress: {
-    unsigned Opc = IntNo == Intrinsic::riscv_bcompress ? RISCVISD::BCOMPRESS
-                                                       : RISCVISD::BDECOMPRESS;
-    return DAG.getNode(Opc, DL, XLenVT, Op.getOperand(1), Op.getOperand(2));
+        IntNo == Intrinsic::riscv_zip ? RISCVISD::ZIP : RISCVISD::UNZIP;
+    return DAG.getNode(Opc, DL, XLenVT, Op.getOperand(1));
   }
   case Intrinsic::riscv_vmv_x_s:
     assert(Op.getValueType() == XLenVT && "Unexpected VT!");
     return DAG.getNode(RISCVISD::VMV_X_S, DL, Op.getValueType(),
                        Op.getOperand(1));
+  case Intrinsic::riscv_vfmv_f_s:
+    return DAG.getNode(ISD::EXTRACT_VECTOR_ELT, DL, Op.getValueType(),
+                       Op.getOperand(1), DAG.getConstant(0, DL, XLenVT));
   case Intrinsic::riscv_vmv_v_x:
     return lowerScalarSplat(Op.getOperand(1), Op.getOperand(2),
-                            Op.getSimpleValueType(), DL, DAG, Subtarget);
+                            Op.getOperand(3), Op.getSimpleValueType(), DL, DAG,
+                            Subtarget);
   case Intrinsic::riscv_vfmv_v_f:
     return DAG.getNode(RISCVISD::VFMV_V_F_VL, DL, Op.getValueType(),
-                       Op.getOperand(1), Op.getOperand(2));
+                       Op.getOperand(1), Op.getOperand(2), Op.getOperand(3));
   case Intrinsic::riscv_vmv_s_x: {
     SDValue Scalar = Op.getOperand(2);
 
@@ -3613,7 +5654,7 @@ SDValue RISCVTargetLowering::LowerINTRINSIC_WO_CHAIN(SDValue Op,
 
     // This is an i64 value that lives in two scalar registers. We have to
     // insert this in a convoluted way. First we build vXi64 splat containing
-    // the/ two values that we assemble using some bit math. Next we'll use
+    // the two values that we assemble using some bit math. Next we'll use
     // vid.v and vmseq to build a mask with bit 0 set. Then we'll use that mask
     // to merge element 0 from our splat into the source vector.
     // FIXME: This is probably not the best way to do this, but it is
@@ -3628,101 +5669,200 @@ SDValue RISCVTargetLowering::LowerINTRINSIC_WO_CHAIN(SDValue Op,
     //   vmerge.vvm vDest, vSrc, vVal, mMask
     MVT VT = Op.getSimpleValueType();
     SDValue Vec = Op.getOperand(1);
-    SDValue VL = Op.getOperand(3);
+    SDValue VL = getVLOperand(Op);
 
-    SDValue SplattedVal = splatSplitI64WithVL(DL, VT, Scalar, VL, DAG);
-    SDValue SplattedIdx = DAG.getNode(RISCVISD::VMV_V_X_VL, DL, VT,
-                                      DAG.getConstant(0, DL, MVT::i32), VL);
+    SDValue SplattedVal = splatSplitI64WithVL(DL, VT, SDValue(), Scalar, VL, DAG);
+    if (Op.getOperand(1).isUndef())
+      return SplattedVal;
+    SDValue SplattedIdx =
+        DAG.getNode(RISCVISD::VMV_V_X_VL, DL, VT, DAG.getUNDEF(VT),
+                    DAG.getConstant(0, DL, MVT::i32), VL);
 
-    MVT MaskVT = MVT::getVectorVT(MVT::i1, VT.getVectorElementCount());
-    SDValue Mask = DAG.getNode(RISCVISD::VMSET_VL, DL, MaskVT, VL);
+    MVT MaskVT = getMaskTypeFor(VT);
+    SDValue Mask = getAllOnesMask(VT, VL, DL, DAG);
     SDValue VID = DAG.getNode(RISCVISD::VID_VL, DL, VT, Mask, VL);
     SDValue SelectCond =
-        DAG.getNode(RISCVISD::SETCC_VL, DL, MaskVT, VID, SplattedIdx,
-                    DAG.getCondCode(ISD::SETEQ), Mask, VL);
+        DAG.getNode(RISCVISD::SETCC_VL, DL, MaskVT,
+                    {VID, SplattedIdx, DAG.getCondCode(ISD::SETEQ),
+                     DAG.getUNDEF(MaskVT), Mask, VL});
     return DAG.getNode(RISCVISD::VSELECT_VL, DL, VT, SelectCond, SplattedVal,
                        Vec, VL);
   }
-  case Intrinsic::riscv_vslide1up:
-  case Intrinsic::riscv_vslide1down:
-  case Intrinsic::riscv_vslide1up_mask:
-  case Intrinsic::riscv_vslide1down_mask: {
-    // We need to special case these when the scalar is larger than XLen.
-    unsigned NumOps = Op.getNumOperands();
-    bool IsMasked = NumOps == 6;
-    unsigned OpOffset = IsMasked ? 1 : 0;
-    SDValue Scalar = Op.getOperand(2 + OpOffset);
-    if (Scalar.getValueType().bitsLE(XLenVT))
-      break;
-
-    // Splatting a sign extended constant is fine.
-    if (auto *CVal = dyn_cast<ConstantSDNode>(Scalar))
-      if (isInt<32>(CVal->getSExtValue()))
-        break;
+  }
 
-    MVT VT = Op.getSimpleValueType();
-    assert(VT.getVectorElementType() == MVT::i64 &&
-           Scalar.getValueType() == MVT::i64 && "Unexpected VTs");
+  return lowerVectorIntrinsicScalars(Op, DAG, Subtarget);
+}
 
-    // Convert the vector source to the equivalent nxvXi32 vector.
-    MVT I32VT = MVT::getVectorVT(MVT::i32, VT.getVectorElementCount() * 2);
-    SDValue Vec = DAG.getBitcast(I32VT, Op.getOperand(1 + OpOffset));
+SDValue RISCVTargetLowering::LowerINTRINSIC_W_CHAIN(SDValue Op,
+                                                    SelectionDAG &DAG) const {
+  unsigned IntNo = Op.getConstantOperandVal(1);
+  switch (IntNo) {
+  default:
+    break;
+  case Intrinsic::riscv_masked_strided_load: {
+    SDLoc DL(Op);
+    MVT XLenVT = Subtarget.getXLenVT();
 
-    SDValue ScalarLo = DAG.getNode(ISD::EXTRACT_ELEMENT, DL, MVT::i32, Scalar,
-                                   DAG.getConstant(0, DL, XLenVT));
-    SDValue ScalarHi = DAG.getNode(ISD::EXTRACT_ELEMENT, DL, MVT::i32, Scalar,
-                                   DAG.getConstant(1, DL, XLenVT));
+    // If the mask is known to be all ones, optimize to an unmasked intrinsic;
+    // the selection of the masked intrinsics doesn't do this for us.
+    SDValue Mask = Op.getOperand(5);
+    bool IsUnmasked = ISD::isConstantSplatVectorAllOnes(Mask.getNode());
 
-    // Double the VL since we halved SEW.
-    SDValue VL = Op.getOperand(NumOps - 1);
-    SDValue I32VL =
-        DAG.getNode(ISD::SHL, DL, XLenVT, VL, DAG.getConstant(1, DL, XLenVT));
+    MVT VT = Op->getSimpleValueType(0);
+    MVT ContainerVT = VT;
+    if (VT.isFixedLengthVector())
+      ContainerVT = getContainerForFixedLengthVector(VT);
 
-    MVT I32MaskVT = MVT::getVectorVT(MVT::i1, I32VT.getVectorElementCount());
-    SDValue I32Mask = DAG.getNode(RISCVISD::VMSET_VL, DL, I32MaskVT, VL);
+    SDValue PassThru = Op.getOperand(2);
+    if (!IsUnmasked) {
+      MVT MaskVT = getMaskTypeFor(ContainerVT);
+      if (VT.isFixedLengthVector()) {
+        Mask = convertToScalableVector(MaskVT, Mask, DAG, Subtarget);
+        PassThru = convertToScalableVector(ContainerVT, PassThru, DAG, Subtarget);
+      }
+    }
 
-    // Shift the two scalar parts in using SEW=32 slide1up/slide1down
-    // instructions.
-    if (IntNo == Intrinsic::riscv_vslide1up ||
-        IntNo == Intrinsic::riscv_vslide1up_mask) {
-      Vec = DAG.getNode(RISCVISD::VSLIDE1UP_VL, DL, I32VT, Vec, ScalarHi,
-                        I32Mask, I32VL);
-      Vec = DAG.getNode(RISCVISD::VSLIDE1UP_VL, DL, I32VT, Vec, ScalarLo,
-                        I32Mask, I32VL);
+    auto *Load = cast<MemIntrinsicSDNode>(Op);
+    SDValue VL = getDefaultVLOps(VT, ContainerVT, DL, DAG, Subtarget).second;
+    SDValue Ptr = Op.getOperand(3);
+    SDValue Stride = Op.getOperand(4);
+    SDValue Result, Chain;
+
+    // TODO: We restrict this to unmasked loads currently in consideration of
+    // the complexity of hanlding all falses masks.
+    if (IsUnmasked && isNullConstant(Stride)) {
+      MVT ScalarVT = ContainerVT.getVectorElementType();
+      SDValue ScalarLoad =
+          DAG.getExtLoad(ISD::ZEXTLOAD, DL, XLenVT, Load->getChain(), Ptr,
+                         ScalarVT, Load->getMemOperand());
+      Chain = ScalarLoad.getValue(1);
+      Result = lowerScalarSplat(SDValue(), ScalarLoad, VL, ContainerVT, DL, DAG,
+                                Subtarget);
     } else {
-      Vec = DAG.getNode(RISCVISD::VSLIDE1DOWN_VL, DL, I32VT, Vec, ScalarLo,
-                        I32Mask, I32VL);
-      Vec = DAG.getNode(RISCVISD::VSLIDE1DOWN_VL, DL, I32VT, Vec, ScalarHi,
-                        I32Mask, I32VL);
+      SDValue IntID = DAG.getTargetConstant(
+          IsUnmasked ? Intrinsic::riscv_vlse : Intrinsic::riscv_vlse_mask, DL,
+          XLenVT);
+
+      SmallVector<SDValue, 8> Ops{Load->getChain(), IntID};
+      if (IsUnmasked)
+        Ops.push_back(DAG.getUNDEF(ContainerVT));
+      else
+        Ops.push_back(PassThru);
+      Ops.push_back(Ptr);
+      Ops.push_back(Stride);
+      if (!IsUnmasked)
+        Ops.push_back(Mask);
+      Ops.push_back(VL);
+      if (!IsUnmasked) {
+        SDValue Policy =
+            DAG.getTargetConstant(RISCVII::TAIL_AGNOSTIC, DL, XLenVT);
+        Ops.push_back(Policy);
+      }
+
+      SDVTList VTs = DAG.getVTList({ContainerVT, MVT::Other});
+      Result =
+          DAG.getMemIntrinsicNode(ISD::INTRINSIC_W_CHAIN, DL, VTs, Ops,
+                                  Load->getMemoryVT(), Load->getMemOperand());
+      Chain = Result.getValue(1);
     }
+    if (VT.isFixedLengthVector())
+      Result = convertFromScalableVector(VT, Result, DAG, Subtarget);
+    return DAG.getMergeValues({Result, Chain}, DL);
+  }
+  case Intrinsic::riscv_seg2_load:
+  case Intrinsic::riscv_seg3_load:
+  case Intrinsic::riscv_seg4_load:
+  case Intrinsic::riscv_seg5_load:
+  case Intrinsic::riscv_seg6_load:
+  case Intrinsic::riscv_seg7_load:
+  case Intrinsic::riscv_seg8_load: {
+    SDLoc DL(Op);
+    static const Intrinsic::ID VlsegInts[7] = {
+        Intrinsic::riscv_vlseg2, Intrinsic::riscv_vlseg3,
+        Intrinsic::riscv_vlseg4, Intrinsic::riscv_vlseg5,
+        Intrinsic::riscv_vlseg6, Intrinsic::riscv_vlseg7,
+        Intrinsic::riscv_vlseg8};
+    unsigned NF = Op->getNumValues() - 1;
+    assert(NF >= 2 && NF <= 8 && "Unexpected seg number");
+    MVT XLenVT = Subtarget.getXLenVT();
+    MVT VT = Op->getSimpleValueType(0);
+    MVT ContainerVT = getContainerForFixedLengthVector(VT);
+
+    SDValue VL = getVLOp(VT.getVectorNumElements(), DL, DAG, Subtarget);
+    SDValue IntID = DAG.getTargetConstant(VlsegInts[NF - 2], DL, XLenVT);
+    auto *Load = cast<MemIntrinsicSDNode>(Op);
+    SmallVector<EVT, 9> ContainerVTs(NF, ContainerVT);
+    ContainerVTs.push_back(MVT::Other);
+    SDVTList VTs = DAG.getVTList(ContainerVTs);
+    SmallVector<SDValue, 12> Ops = {Load->getChain(), IntID};
+    Ops.insert(Ops.end(), NF, DAG.getUNDEF(ContainerVT));
+    Ops.push_back(Op.getOperand(2));
+    Ops.push_back(VL);
+    SDValue Result =
+        DAG.getMemIntrinsicNode(ISD::INTRINSIC_W_CHAIN, DL, VTs, Ops,
+                                Load->getMemoryVT(), Load->getMemOperand());
+    SmallVector<SDValue, 9> Results;
+    for (unsigned int RetIdx = 0; RetIdx < NF; RetIdx++)
+      Results.push_back(convertFromScalableVector(VT, Result.getValue(RetIdx),
+                                                  DAG, Subtarget));
+    Results.push_back(Result.getValue(NF));
+    return DAG.getMergeValues(Results, DL);
+  }
+  }
+
+  return lowerVectorIntrinsicScalars(Op, DAG, Subtarget);
+}
+
+SDValue RISCVTargetLowering::LowerINTRINSIC_VOID(SDValue Op,
+                                                 SelectionDAG &DAG) const {
+  unsigned IntNo = Op.getConstantOperandVal(1);
+  switch (IntNo) {
+  default:
+    break;
+  case Intrinsic::riscv_masked_strided_store: {
+    SDLoc DL(Op);
+    MVT XLenVT = Subtarget.getXLenVT();
 
-    // Convert back to nxvXi64.
-    Vec = DAG.getBitcast(VT, Vec);
+    // If the mask is known to be all ones, optimize to an unmasked intrinsic;
+    // the selection of the masked intrinsics doesn't do this for us.
+    SDValue Mask = Op.getOperand(5);
+    bool IsUnmasked = ISD::isConstantSplatVectorAllOnes(Mask.getNode());
 
-    if (!IsMasked)
-      return Vec;
+    SDValue Val = Op.getOperand(2);
+    MVT VT = Val.getSimpleValueType();
+    MVT ContainerVT = VT;
+    if (VT.isFixedLengthVector()) {
+      ContainerVT = getContainerForFixedLengthVector(VT);
+      Val = convertToScalableVector(ContainerVT, Val, DAG, Subtarget);
+    }
+    if (!IsUnmasked) {
+      MVT MaskVT = getMaskTypeFor(ContainerVT);
+      if (VT.isFixedLengthVector())
+        Mask = convertToScalableVector(MaskVT, Mask, DAG, Subtarget);
+    }
 
-    // Apply mask after the operation.
-    SDValue Mask = Op.getOperand(NumOps - 2);
-    SDValue MaskedOff = Op.getOperand(1);
-    return DAG.getNode(RISCVISD::VSELECT_VL, DL, VT, Mask, Vec, MaskedOff, VL);
-  }
-  }
+    SDValue VL = getDefaultVLOps(VT, ContainerVT, DL, DAG, Subtarget).second;
 
-  return lowerVectorIntrinsicSplats(Op, DAG, Subtarget);
-}
+    SDValue IntID = DAG.getTargetConstant(
+        IsUnmasked ? Intrinsic::riscv_vsse : Intrinsic::riscv_vsse_mask, DL,
+        XLenVT);
 
-SDValue RISCVTargetLowering::LowerINTRINSIC_W_CHAIN(SDValue Op,
-                                                    SelectionDAG &DAG) const {
-  return lowerVectorIntrinsicSplats(Op, DAG, Subtarget);
-}
+    auto *Store = cast<MemIntrinsicSDNode>(Op);
+    SmallVector<SDValue, 8> Ops{Store->getChain(), IntID};
+    Ops.push_back(Val);
+    Ops.push_back(Op.getOperand(3)); // Ptr
+    Ops.push_back(Op.getOperand(4)); // Stride
+    if (!IsUnmasked)
+      Ops.push_back(Mask);
+    Ops.push_back(VL);
 
-static MVT getLMUL1VT(MVT VT) {
-  assert(VT.getVectorElementType().getSizeInBits() <= 64 &&
-         "Unexpected vector MVT");
-  return MVT::getScalableVectorVT(
-      VT.getVectorElementType(),
-      RISCV::RVVBitsPerBlock / VT.getVectorElementType().getSizeInBits());
+    return DAG.getMemIntrinsicNode(ISD::INTRINSIC_VOID, DL, Store->getVTList(),
+                                   Ops, Store->getMemoryVT(),
+                                   Store->getMemOperand());
+  }
+  }
+
+  return SDValue();
 }
 
 static unsigned getRVVReductionOp(unsigned ISDOpcode) {
@@ -3748,14 +5888,18 @@ static unsigned getRVVReductionOp(unsigned ISDOpcode) {
   }
 }
 
-SDValue RISCVTargetLowering::lowerVectorMaskVECREDUCE(SDValue Op,
-                                                      SelectionDAG &DAG) const {
+SDValue RISCVTargetLowering::lowerVectorMaskVecReduction(SDValue Op,
+                                                         SelectionDAG &DAG,
+                                                         bool IsVP) const {
   SDLoc DL(Op);
-  SDValue Vec = Op.getOperand(0);
+  SDValue Vec = Op.getOperand(IsVP ? 1 : 0);
   MVT VecVT = Vec.getSimpleValueType();
   assert((Op.getOpcode() == ISD::VECREDUCE_AND ||
           Op.getOpcode() == ISD::VECREDUCE_OR ||
-          Op.getOpcode() == ISD::VECREDUCE_XOR) &&
+          Op.getOpcode() == ISD::VECREDUCE_XOR ||
+          Op.getOpcode() == ISD::VP_REDUCE_AND ||
+          Op.getOpcode() == ISD::VP_REDUCE_OR ||
+          Op.getOpcode() == ISD::VP_REDUCE_XOR) &&
          "Unexpected reduction lowering");
 
   MVT XLenVT = Subtarget.getXLenVT();
@@ -3769,29 +5913,100 @@ SDValue RISCVTargetLowering::lowerVectorMaskVECREDUCE(SDValue Op,
   }
 
   SDValue Mask, VL;
-  std::tie(Mask, VL) = getDefaultVLOps(VecVT, ContainerVT, DL, DAG, Subtarget);
+  if (IsVP) {
+    Mask = Op.getOperand(2);
+    VL = Op.getOperand(3);
+  } else {
+    std::tie(Mask, VL) =
+        getDefaultVLOps(VecVT, ContainerVT, DL, DAG, Subtarget);
+  }
+
+  unsigned BaseOpc;
+  ISD::CondCode CC;
   SDValue Zero = DAG.getConstant(0, DL, XLenVT);
 
   switch (Op.getOpcode()) {
   default:
     llvm_unreachable("Unhandled reduction");
   case ISD::VECREDUCE_AND:
-    // vpopc ~x == 0
-    Vec = DAG.getNode(RISCVISD::VMXOR_VL, DL, ContainerVT, Vec, Mask, VL);
-    Vec = DAG.getNode(RISCVISD::VPOPC_VL, DL, XLenVT, Vec, Mask, VL);
-    return DAG.getSetCC(DL, XLenVT, Vec, Zero, ISD::SETEQ);
+  case ISD::VP_REDUCE_AND: {
+    // vcpop ~x == 0
+    SDValue TrueMask = DAG.getNode(RISCVISD::VMSET_VL, DL, ContainerVT, VL);
+    Vec = DAG.getNode(RISCVISD::VMXOR_VL, DL, ContainerVT, Vec, TrueMask, VL);
+    Vec = DAG.getNode(RISCVISD::VCPOP_VL, DL, XLenVT, Vec, Mask, VL);
+    CC = ISD::SETEQ;
+    BaseOpc = ISD::AND;
+    break;
+  }
   case ISD::VECREDUCE_OR:
-    // vpopc x != 0
-    Vec = DAG.getNode(RISCVISD::VPOPC_VL, DL, XLenVT, Vec, Mask, VL);
-    return DAG.getSetCC(DL, XLenVT, Vec, Zero, ISD::SETNE);
-  case ISD::VECREDUCE_XOR: {
-    // ((vpopc x) & 1) != 0
+  case ISD::VP_REDUCE_OR:
+    // vcpop x != 0
+    Vec = DAG.getNode(RISCVISD::VCPOP_VL, DL, XLenVT, Vec, Mask, VL);
+    CC = ISD::SETNE;
+    BaseOpc = ISD::OR;
+    break;
+  case ISD::VECREDUCE_XOR:
+  case ISD::VP_REDUCE_XOR: {
+    // ((vcpop x) & 1) != 0
     SDValue One = DAG.getConstant(1, DL, XLenVT);
-    Vec = DAG.getNode(RISCVISD::VPOPC_VL, DL, XLenVT, Vec, Mask, VL);
+    Vec = DAG.getNode(RISCVISD::VCPOP_VL, DL, XLenVT, Vec, Mask, VL);
     Vec = DAG.getNode(ISD::AND, DL, XLenVT, Vec, One);
-    return DAG.getSetCC(DL, XLenVT, Vec, Zero, ISD::SETNE);
+    CC = ISD::SETNE;
+    BaseOpc = ISD::XOR;
+    break;
   }
   }
+
+  SDValue SetCC = DAG.getSetCC(DL, XLenVT, Vec, Zero, CC);
+
+  if (!IsVP)
+    return SetCC;
+
+  // Now include the start value in the operation.
+  // Note that we must return the start value when no elements are operated
+  // upon. The vcpop instructions we've emitted in each case above will return
+  // 0 for an inactive vector, and so we've already received the neutral value:
+  // AND gives us (0 == 0) -> 1 and OR/XOR give us (0 != 0) -> 0. Therefore we
+  // can simply include the start value.
+  return DAG.getNode(BaseOpc, DL, XLenVT, SetCC, Op.getOperand(0));
+}
+
+static bool hasNonZeroAVL(SDValue AVL) {
+  auto *RegisterAVL = dyn_cast<RegisterSDNode>(AVL);
+  auto *ImmAVL = dyn_cast<ConstantSDNode>(AVL);
+  return (RegisterAVL && RegisterAVL->getReg() == RISCV::X0) ||
+         (ImmAVL && ImmAVL->getZExtValue() >= 1);
+}
+
+/// Helper to lower a reduction sequence of the form:
+/// scalar = reduce_op vec, scalar_start
+static SDValue lowerReductionSeq(unsigned RVVOpcode, MVT ResVT,
+                                 SDValue StartValue, SDValue Vec, SDValue Mask,
+                                 SDValue VL, SDLoc DL, SelectionDAG &DAG,
+                                 const RISCVSubtarget &Subtarget) {
+  const MVT VecVT = Vec.getSimpleValueType();
+  const MVT M1VT = getLMUL1VT(VecVT);
+  const MVT XLenVT = Subtarget.getXLenVT();
+  const bool NonZeroAVL = hasNonZeroAVL(VL);
+
+  // The reduction needs an LMUL1 input; do the splat at either LMUL1
+  // or the original VT if fractional.
+  auto InnerVT = VecVT.bitsLE(M1VT) ? VecVT : M1VT;
+  // We reuse the VL of the reduction to reduce vsetvli toggles if we can
+  // prove it is non-zero.  For the AVL=0 case, we need the scalar to
+  // be the result of the reduction operation.
+  auto InnerVL = NonZeroAVL ? VL : DAG.getConstant(1, DL, XLenVT);
+  SDValue InitialValue = lowerScalarInsert(StartValue, InnerVL, InnerVT, DL,
+                                           DAG, Subtarget);
+  if (M1VT != InnerVT)
+    InitialValue = DAG.getNode(ISD::INSERT_SUBVECTOR, DL, M1VT,
+                               DAG.getUNDEF(M1VT),
+                               InitialValue, DAG.getConstant(0, DL, XLenVT));
+  SDValue PassThru = NonZeroAVL ? DAG.getUNDEF(M1VT) : InitialValue;
+  SDValue Reduction = DAG.getNode(RVVOpcode, DL, M1VT, PassThru, Vec,
+                                  InitialValue, Mask, VL);
+  return DAG.getNode(ISD::EXTRACT_VECTOR_ELT, DL, ResVT, Reduction,
+                     DAG.getConstant(0, DL, XLenVT));
 }
 
 SDValue RISCVTargetLowering::lowerVECREDUCE(SDValue Op,
@@ -3806,8 +6021,7 @@ SDValue RISCVTargetLowering::lowerVECREDUCE(SDValue Op,
   // be split. Do that manually so we can get down to a legal type.
   while (getTypeAction(*DAG.getContext(), VecEVT) ==
          TargetLowering::TypeSplitVector) {
-    SDValue Lo, Hi;
-    std::tie(Lo, Hi) = DAG.SplitVector(Vec, DL);
+    auto [Lo, Hi] = DAG.SplitVector(Vec, DL);
     VecEVT = Lo.getValueType();
     Vec = DAG.getNode(BaseOpc, DL, VecEVT, Lo, Hi);
   }
@@ -3827,21 +6041,12 @@ SDValue RISCVTargetLowering::lowerVECREDUCE(SDValue Op,
     Vec = convertToScalableVector(ContainerVT, Vec, DAG, Subtarget);
   }
 
-  MVT M1VT = getLMUL1VT(ContainerVT);
-
-  SDValue Mask, VL;
-  std::tie(Mask, VL) = getDefaultVLOps(VecVT, ContainerVT, DL, DAG, Subtarget);
+  auto [Mask, VL] = getDefaultVLOps(VecVT, ContainerVT, DL, DAG, Subtarget);
 
-  // FIXME: This is a VLMAX splat which might be too large and can prevent
-  // vsetvli removal.
   SDValue NeutralElem =
       DAG.getNeutralElement(BaseOpc, DL, VecEltVT, SDNodeFlags());
-  SDValue IdentitySplat = DAG.getSplatVector(M1VT, DL, NeutralElem);
-  SDValue Reduction =
-      DAG.getNode(RVVOpcode, DL, M1VT, Vec, IdentitySplat, Mask, VL);
-  SDValue Elt0 = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, DL, VecEltVT, Reduction,
-                             DAG.getConstant(0, DL, Subtarget.getXLenVT()));
-  return DAG.getSExtOrTrunc(Elt0, DL, Op.getValueType());
+  return lowerReductionSeq(RVVOpcode, Op.getSimpleValueType(), NeutralElem, Vec,
+                           Mask, VL, DL, DAG, Subtarget);
 }
 
 // Given a reduction op, this function returns the matching reduction opcode,
@@ -3856,9 +6061,12 @@ getRVVFPReductionOpAndOperands(SDValue Op, SelectionDAG &DAG, EVT EltVT) {
   switch (Opcode) {
   default:
     llvm_unreachable("Unhandled reduction");
-  case ISD::VECREDUCE_FADD:
-    return std::make_tuple(RISCVISD::VECREDUCE_FADD_VL, Op.getOperand(0),
-                           DAG.getNeutralElement(BaseOpcode, DL, EltVT, Flags));
+  case ISD::VECREDUCE_FADD: {
+    // Use positive zero if we can. It is cheaper to materialize.
+    SDValue Zero =
+        DAG.getConstantFP(Flags.hasNoSignedZeros() ? 0.0 : -0.0, DL, EltVT);
+    return std::make_tuple(RISCVISD::VECREDUCE_FADD_VL, Op.getOperand(0), Zero);
+  }
   case ISD::VECREDUCE_SEQ_FADD:
     return std::make_tuple(RISCVISD::VECREDUCE_SEQ_FADD_VL, Op.getOperand(1),
                            Op.getOperand(0));
@@ -3888,29 +6096,76 @@ SDValue RISCVTargetLowering::lowerFPVECREDUCE(SDValue Op,
     VectorVal = convertToScalableVector(ContainerVT, VectorVal, DAG, Subtarget);
   }
 
-  MVT M1VT = getLMUL1VT(VectorVal.getSimpleValueType());
-
-  SDValue Mask, VL;
-  std::tie(Mask, VL) = getDefaultVLOps(VecVT, ContainerVT, DL, DAG, Subtarget);
-
-  // FIXME: This is a VLMAX splat which might be too large and can prevent
-  // vsetvli removal.
-  SDValue ScalarSplat = DAG.getSplatVector(M1VT, DL, ScalarVal);
-  SDValue Reduction =
-      DAG.getNode(RVVOpcode, DL, M1VT, VectorVal, ScalarSplat, Mask, VL);
-  return DAG.getNode(ISD::EXTRACT_VECTOR_ELT, DL, VecEltVT, Reduction,
-                     DAG.getConstant(0, DL, Subtarget.getXLenVT()));
+  auto [Mask, VL] = getDefaultVLOps(VecVT, ContainerVT, DL, DAG, Subtarget);
+  return lowerReductionSeq(RVVOpcode, Op.getSimpleValueType(), ScalarVal,
+                           VectorVal, Mask, VL, DL, DAG, Subtarget);
 }
 
-SDValue RISCVTargetLowering::lowerINSERT_SUBVECTOR(SDValue Op,
-                                                   SelectionDAG &DAG) const {
-  SDValue Vec = Op.getOperand(0);
-  SDValue SubVec = Op.getOperand(1);
-  MVT VecVT = Vec.getSimpleValueType();
-  MVT SubVecVT = SubVec.getSimpleValueType();
+static unsigned getRVVVPReductionOp(unsigned ISDOpcode) {
+  switch (ISDOpcode) {
+  default:
+    llvm_unreachable("Unhandled reduction");
+  case ISD::VP_REDUCE_ADD:
+    return RISCVISD::VECREDUCE_ADD_VL;
+  case ISD::VP_REDUCE_UMAX:
+    return RISCVISD::VECREDUCE_UMAX_VL;
+  case ISD::VP_REDUCE_SMAX:
+    return RISCVISD::VECREDUCE_SMAX_VL;
+  case ISD::VP_REDUCE_UMIN:
+    return RISCVISD::VECREDUCE_UMIN_VL;
+  case ISD::VP_REDUCE_SMIN:
+    return RISCVISD::VECREDUCE_SMIN_VL;
+  case ISD::VP_REDUCE_AND:
+    return RISCVISD::VECREDUCE_AND_VL;
+  case ISD::VP_REDUCE_OR:
+    return RISCVISD::VECREDUCE_OR_VL;
+  case ISD::VP_REDUCE_XOR:
+    return RISCVISD::VECREDUCE_XOR_VL;
+  case ISD::VP_REDUCE_FADD:
+    return RISCVISD::VECREDUCE_FADD_VL;
+  case ISD::VP_REDUCE_SEQ_FADD:
+    return RISCVISD::VECREDUCE_SEQ_FADD_VL;
+  case ISD::VP_REDUCE_FMAX:
+    return RISCVISD::VECREDUCE_FMAX_VL;
+  case ISD::VP_REDUCE_FMIN:
+    return RISCVISD::VECREDUCE_FMIN_VL;
+  }
+}
 
+SDValue RISCVTargetLowering::lowerVPREDUCE(SDValue Op,
+                                           SelectionDAG &DAG) const {
   SDLoc DL(Op);
-  MVT XLenVT = Subtarget.getXLenVT();
+  SDValue Vec = Op.getOperand(1);
+  EVT VecEVT = Vec.getValueType();
+
+  // TODO: The type may need to be widened rather than split. Or widened before
+  // it can be split.
+  if (!isTypeLegal(VecEVT))
+    return SDValue();
+
+  MVT VecVT = VecEVT.getSimpleVT();
+  unsigned RVVOpcode = getRVVVPReductionOp(Op.getOpcode());
+
+  if (VecVT.isFixedLengthVector()) {
+    auto ContainerVT = getContainerForFixedLengthVector(VecVT);
+    Vec = convertToScalableVector(ContainerVT, Vec, DAG, Subtarget);
+  }
+
+  SDValue VL = Op.getOperand(3);
+  SDValue Mask = Op.getOperand(2);
+  return lowerReductionSeq(RVVOpcode, Op.getSimpleValueType(), Op.getOperand(0),
+                           Vec, Mask, VL, DL, DAG, Subtarget);
+}
+
+SDValue RISCVTargetLowering::lowerINSERT_SUBVECTOR(SDValue Op,
+                                                   SelectionDAG &DAG) const {
+  SDValue Vec = Op.getOperand(0);
+  SDValue SubVec = Op.getOperand(1);
+  MVT VecVT = Vec.getSimpleValueType();
+  MVT SubVecVT = SubVec.getSimpleValueType();
+
+  SDLoc DL(Op);
+  MVT XLenVT = Subtarget.getXLenVT();
   unsigned OrigIdx = Op.getConstantOperandVal(2);
   const RISCVRegisterInfo *TRI = Subtarget.getRegisterInfo();
 
@@ -3957,7 +6212,7 @@ SDValue RISCVTargetLowering::lowerINSERT_SUBVECTOR(SDValue Op,
   // register size. Therefore we must slide the vector group up the full
   // amount.
   if (SubVecVT.isFixedLengthVector()) {
-    if (OrigIdx == 0 && Vec.isUndef())
+    if (OrigIdx == 0 && Vec.isUndef() && !VecVT.isFixedLengthVector())
       return Op;
     MVT ContainerVT = VecVT;
     if (VecVT.isFixedLengthVector()) {
@@ -3967,15 +6222,25 @@ SDValue RISCVTargetLowering::lowerINSERT_SUBVECTOR(SDValue Op,
     SubVec = DAG.getNode(ISD::INSERT_SUBVECTOR, DL, ContainerVT,
                          DAG.getUNDEF(ContainerVT), SubVec,
                          DAG.getConstant(0, DL, XLenVT));
+    if (OrigIdx == 0 && Vec.isUndef() && VecVT.isFixedLengthVector()) {
+      SubVec = convertFromScalableVector(VecVT, SubVec, DAG, Subtarget);
+      return DAG.getBitcast(Op.getValueType(), SubVec);
+    }
     SDValue Mask =
         getDefaultVLOps(VecVT, ContainerVT, DL, DAG, Subtarget).first;
     // Set the vector length to only the number of elements we care about. Note
     // that for slideup this includes the offset.
     SDValue VL =
-        DAG.getConstant(OrigIdx + SubVecVT.getVectorNumElements(), DL, XLenVT);
+        getVLOp(OrigIdx + SubVecVT.getVectorNumElements(), DL, DAG, Subtarget);
     SDValue SlideupAmt = DAG.getConstant(OrigIdx, DL, XLenVT);
-    SDValue Slideup = DAG.getNode(RISCVISD::VSLIDEUP_VL, DL, ContainerVT, Vec,
-                                  SubVec, SlideupAmt, Mask, VL);
+
+    // Use tail agnostic policy if OrigIdx is the last index of Vec.
+    unsigned Policy = RISCVII::TAIL_UNDISTURBED_MASK_UNDISTURBED;
+    if (VecVT.isFixedLengthVector() &&
+        OrigIdx + 1 == VecVT.getVectorNumElements())
+      Policy = RISCVII::TAIL_AGNOSTIC;
+    SDValue Slideup = getVSlideup(DAG, Subtarget, DL, ContainerVT, Vec, SubVec,
+                                  SlideupAmt, Mask, VL, Policy);
     if (VecVT.isFixedLengthVector())
       Slideup = convertFromScalableVector(VecVT, Slideup, DAG, Subtarget);
     return DAG.getBitcast(Op.getValueType(), Slideup);
@@ -4026,8 +6291,7 @@ SDValue RISCVTargetLowering::lowerINSERT_SUBVECTOR(SDValue Op,
   // For scalable vectors this must be further multiplied by vscale.
   SlideupAmt = DAG.getNode(ISD::VSCALE, DL, XLenVT, SlideupAmt);
 
-  SDValue Mask, VL;
-  std::tie(Mask, VL) = getDefaultScalableVLOps(VecVT, DL, DAG, Subtarget);
+  auto [Mask, VL] = getDefaultScalableVLOps(VecVT, DL, DAG, Subtarget);
 
   // Construct the vector length corresponding to RemIdx + length(SubVecVT).
   VL = DAG.getConstant(SubVecVT.getVectorMinNumElements(), DL, XLenVT);
@@ -4038,8 +6302,8 @@ SDValue RISCVTargetLowering::lowerINSERT_SUBVECTOR(SDValue Op,
                        DAG.getUNDEF(InterSubVT), SubVec,
                        DAG.getConstant(0, DL, XLenVT));
 
-  SDValue Slideup = DAG.getNode(RISCVISD::VSLIDEUP_VL, DL, InterSubVT,
-                                AlignedExtract, SubVec, SlideupAmt, Mask, VL);
+  SDValue Slideup = getVSlideup(DAG, Subtarget, DL, InterSubVT, AlignedExtract,
+                                SubVec, SlideupAmt, Mask, VL);
 
   // If required, insert this subvector back into the correct vector register.
   // This should resolve to an INSERT_SUBREG instruction.
@@ -4119,11 +6383,11 @@ SDValue RISCVTargetLowering::lowerEXTRACT_SUBVECTOR(SDValue Op,
         getDefaultVLOps(VecVT, ContainerVT, DL, DAG, Subtarget).first;
     // Set the vector length to only the number of elements we care about. This
     // avoids sliding down elements we're going to discard straight away.
-    SDValue VL = DAG.getConstant(SubVecVT.getVectorNumElements(), DL, XLenVT);
+    SDValue VL = getVLOp(SubVecVT.getVectorNumElements(), DL, DAG, Subtarget);
     SDValue SlidedownAmt = DAG.getConstant(OrigIdx, DL, XLenVT);
     SDValue Slidedown =
-        DAG.getNode(RISCVISD::VSLIDEDOWN_VL, DL, ContainerVT,
-                    DAG.getUNDEF(ContainerVT), Vec, SlidedownAmt, Mask, VL);
+        getVSlidedown(DAG, Subtarget, DL, ContainerVT,
+                      DAG.getUNDEF(ContainerVT), Vec, SlidedownAmt, Mask, VL);
     // Now we can use a cast-like subvector extract to get the result.
     Slidedown = DAG.getNode(ISD::EXTRACT_SUBVECTOR, DL, SubVecVT, Slidedown,
                             DAG.getConstant(0, DL, XLenVT));
@@ -4160,11 +6424,10 @@ SDValue RISCVTargetLowering::lowerEXTRACT_SUBVECTOR(SDValue Op,
   // For scalable vectors this must be further multiplied by vscale.
   SlidedownAmt = DAG.getNode(ISD::VSCALE, DL, XLenVT, SlidedownAmt);
 
-  SDValue Mask, VL;
-  std::tie(Mask, VL) = getDefaultScalableVLOps(InterSubVT, DL, DAG, Subtarget);
+  auto [Mask, VL] = getDefaultScalableVLOps(InterSubVT, DL, DAG, Subtarget);
   SDValue Slidedown =
-      DAG.getNode(RISCVISD::VSLIDEDOWN_VL, DL, InterSubVT,
-                  DAG.getUNDEF(InterSubVT), Vec, SlidedownAmt, Mask, VL);
+      getVSlidedown(DAG, Subtarget, DL, InterSubVT, DAG.getUNDEF(InterSubVT),
+                    Vec, SlidedownAmt, Mask, VL);
 
   // Now the vector is in the right position, extract our final subvector. This
   // should resolve to a COPY.
@@ -4182,21 +6445,21 @@ SDValue RISCVTargetLowering::lowerSTEP_VECTOR(SDValue Op,
                                               SelectionDAG &DAG) const {
   SDLoc DL(Op);
   MVT VT = Op.getSimpleValueType();
+  assert(VT.isScalableVector() && "Expected scalable vector");
   MVT XLenVT = Subtarget.getXLenVT();
-  SDValue Mask, VL;
-  std::tie(Mask, VL) = getDefaultScalableVLOps(VT, DL, DAG, Subtarget);
+  auto [Mask, VL] = getDefaultScalableVLOps(VT, DL, DAG, Subtarget);
   SDValue StepVec = DAG.getNode(RISCVISD::VID_VL, DL, VT, Mask, VL);
   uint64_t StepValImm = Op.getConstantOperandVal(0);
   if (StepValImm != 1) {
     if (isPowerOf2_64(StepValImm)) {
       SDValue StepVal =
-          DAG.getNode(RISCVISD::VMV_V_X_VL, DL, VT,
-                      DAG.getConstant(Log2_64(StepValImm), DL, XLenVT));
+          DAG.getNode(RISCVISD::VMV_V_X_VL, DL, VT, DAG.getUNDEF(VT),
+                      DAG.getConstant(Log2_64(StepValImm), DL, XLenVT), VL);
       StepVec = DAG.getNode(ISD::SHL, DL, VT, StepVec, StepVal);
     } else {
       SDValue StepVal = lowerScalarSplat(
-          DAG.getConstant(StepValImm, DL, VT.getVectorElementType()), VL, VT,
-          DL, DAG, Subtarget);
+          SDValue(), DAG.getConstant(StepValImm, DL, VT.getVectorElementType()),
+          VL, VT, DL, DAG, Subtarget);
       StepVec = DAG.getNode(ISD::MUL, DL, VT, StepVec, StepVal);
     }
   }
@@ -4212,31 +6475,33 @@ SDValue RISCVTargetLowering::lowerVECTOR_REVERSE(SDValue Op,
                                                  SelectionDAG &DAG) const {
   SDLoc DL(Op);
   MVT VecVT = Op.getSimpleValueType();
+  if (VecVT.getVectorElementType() == MVT::i1) {
+    MVT WidenVT = MVT::getVectorVT(MVT::i8, VecVT.getVectorElementCount());
+    SDValue Op1 = DAG.getNode(ISD::ZERO_EXTEND, DL, WidenVT, Op.getOperand(0));
+    SDValue Op2 = DAG.getNode(ISD::VECTOR_REVERSE, DL, WidenVT, Op1);
+    return DAG.getNode(ISD::TRUNCATE, DL, VecVT, Op2);
+  }
   unsigned EltSize = VecVT.getScalarSizeInBits();
   unsigned MinSize = VecVT.getSizeInBits().getKnownMinValue();
-
-  unsigned MaxVLMAX = 0;
-  unsigned VectorBitsMax = Subtarget.getMaxRVVVectorSizeInBits();
-  if (VectorBitsMax != 0)
-    MaxVLMAX = ((VectorBitsMax / EltSize) * MinSize) / RISCV::RVVBitsPerBlock;
+  unsigned VectorBitsMax = Subtarget.getRealMaxVLen();
+  unsigned MaxVLMAX =
+    RISCVTargetLowering::computeVLMAX(VectorBitsMax, EltSize, MinSize);
 
   unsigned GatherOpc = RISCVISD::VRGATHER_VV_VL;
   MVT IntVT = VecVT.changeVectorElementTypeToInteger();
 
-  // If this is SEW=8 and VLMAX is unknown or more than 256, we need
+  // If this is SEW=8 and VLMAX is potentially more than 256, we need
   // to use vrgatherei16.vv.
   // TODO: It's also possible to use vrgatherei16.vv for other types to
   // decrease register width for the index calculation.
-  if ((MaxVLMAX == 0 || MaxVLMAX > 256) && EltSize == 8) {
+  if (MaxVLMAX > 256 && EltSize == 8) {
     // If this is LMUL=8, we have to split before can use vrgatherei16.vv.
     // Reverse each half, then reassemble them in reverse order.
     // NOTE: It's also possible that after splitting that VLMAX no longer
     // requires vrgatherei16.vv.
     if (MinSize == (8 * RISCV::RVVBitsPerBlock)) {
-      SDValue Lo, Hi;
-      std::tie(Lo, Hi) = DAG.SplitVectorOperand(Op.getNode(), 0);
-      EVT LoVT, HiVT;
-      std::tie(LoVT, HiVT) = DAG.GetSplitDestVTs(VecVT);
+      auto [Lo, Hi] = DAG.SplitVectorOperand(Op.getNode(), 0);
+      auto [LoVT, HiVT] = DAG.GetSplitDestVTs(VecVT);
       Lo = DAG.getNode(ISD::VECTOR_REVERSE, DL, LoVT, Lo);
       Hi = DAG.getNode(ISD::VECTOR_REVERSE, DL, HiVT, Hi);
       // Reassemble the low and high pieces reversed.
@@ -4255,13 +6520,12 @@ SDValue RISCVTargetLowering::lowerVECTOR_REVERSE(SDValue Op,
   }
 
   MVT XLenVT = Subtarget.getXLenVT();
-  SDValue Mask, VL;
-  std::tie(Mask, VL) = getDefaultScalableVLOps(VecVT, DL, DAG, Subtarget);
+  auto [Mask, VL] = getDefaultScalableVLOps(VecVT, DL, DAG, Subtarget);
 
   // Calculate VLMAX-1 for the desired SEW.
   unsigned MinElts = VecVT.getVectorMinNumElements();
   SDValue VLMax = DAG.getNode(ISD::VSCALE, DL, XLenVT,
-                              DAG.getConstant(MinElts, DL, XLenVT));
+                              getVLOp(MinElts, DL, DAG, Subtarget));
   SDValue VLMinus1 =
       DAG.getNode(ISD::SUB, DL, XLenVT, VLMax, DAG.getConstant(1, DL, XLenVT));
 
@@ -4272,13 +6536,51 @@ SDValue RISCVTargetLowering::lowerVECTOR_REVERSE(SDValue Op,
   if (!IsRV32E64)
     SplatVL = DAG.getSplatVector(IntVT, DL, VLMinus1);
   else
-    SplatVL = DAG.getNode(RISCVISD::SPLAT_VECTOR_I64, DL, IntVT, VLMinus1);
+    SplatVL = DAG.getNode(RISCVISD::VMV_V_X_VL, DL, IntVT, DAG.getUNDEF(IntVT),
+                          VLMinus1, DAG.getRegister(RISCV::X0, XLenVT));
 
   SDValue VID = DAG.getNode(RISCVISD::VID_VL, DL, IntVT, Mask, VL);
-  SDValue Indices =
-      DAG.getNode(RISCVISD::SUB_VL, DL, IntVT, SplatVL, VID, Mask, VL);
+  SDValue Indices = DAG.getNode(RISCVISD::SUB_VL, DL, IntVT, SplatVL, VID,
+                                DAG.getUNDEF(IntVT), Mask, VL);
+
+  return DAG.getNode(GatherOpc, DL, VecVT, Op.getOperand(0), Indices,
+                     DAG.getUNDEF(VecVT), Mask, VL);
+}
+
+SDValue RISCVTargetLowering::lowerVECTOR_SPLICE(SDValue Op,
+                                                SelectionDAG &DAG) const {
+  SDLoc DL(Op);
+  SDValue V1 = Op.getOperand(0);
+  SDValue V2 = Op.getOperand(1);
+  MVT XLenVT = Subtarget.getXLenVT();
+  MVT VecVT = Op.getSimpleValueType();
+
+  unsigned MinElts = VecVT.getVectorMinNumElements();
+  SDValue VLMax = DAG.getNode(ISD::VSCALE, DL, XLenVT,
+                              getVLOp(MinElts, DL, DAG, Subtarget));
+
+  int64_t ImmValue = cast<ConstantSDNode>(Op.getOperand(2))->getSExtValue();
+  SDValue DownOffset, UpOffset;
+  if (ImmValue >= 0) {
+    // The operand is a TargetConstant, we need to rebuild it as a regular
+    // constant.
+    DownOffset = DAG.getConstant(ImmValue, DL, XLenVT);
+    UpOffset = DAG.getNode(ISD::SUB, DL, XLenVT, VLMax, DownOffset);
+  } else {
+    // The operand is a TargetConstant, we need to rebuild it as a regular
+    // constant rather than negating the original operand.
+    UpOffset = DAG.getConstant(-ImmValue, DL, XLenVT);
+    DownOffset = DAG.getNode(ISD::SUB, DL, XLenVT, VLMax, UpOffset);
+  }
+
+  SDValue TrueMask = getAllOnesMask(VecVT, VLMax, DL, DAG);
 
-  return DAG.getNode(GatherOpc, DL, VecVT, Op.getOperand(0), Indices, Mask, VL);
+  SDValue SlideDown =
+      getVSlidedown(DAG, Subtarget, DL, VecVT, DAG.getUNDEF(VecVT), V1,
+                    DownOffset, TrueMask, UpOffset);
+  return getVSlideup(DAG, Subtarget, DL, VecVT, SlideDown, V2, UpOffset,
+                     TrueMask, DAG.getRegister(RISCV::X0, XLenVT),
+                     RISCVII::TAIL_AGNOSTIC);
 }
 
 SDValue
@@ -4293,18 +6595,26 @@ RISCVTargetLowering::lowerFixedLengthVectorLoadToRVV(SDValue Op,
          "Expecting a correctly-aligned load");
 
   MVT VT = Op.getSimpleValueType();
+  MVT XLenVT = Subtarget.getXLenVT();
   MVT ContainerVT = getContainerForFixedLengthVector(VT);
 
-  SDValue VL =
-      DAG.getConstant(VT.getVectorNumElements(), DL, Subtarget.getXLenVT());
+  SDValue VL = getVLOp(VT.getVectorNumElements(), DL, DAG, Subtarget);
 
+  bool IsMaskOp = VT.getVectorElementType() == MVT::i1;
+  SDValue IntID = DAG.getTargetConstant(
+      IsMaskOp ? Intrinsic::riscv_vlm : Intrinsic::riscv_vle, DL, XLenVT);
+  SmallVector<SDValue, 4> Ops{Load->getChain(), IntID};
+  if (!IsMaskOp)
+    Ops.push_back(DAG.getUNDEF(ContainerVT));
+  Ops.push_back(Load->getBasePtr());
+  Ops.push_back(VL);
   SDVTList VTs = DAG.getVTList({ContainerVT, MVT::Other});
-  SDValue NewLoad = DAG.getMemIntrinsicNode(
-      RISCVISD::VLE_VL, DL, VTs, {Load->getChain(), Load->getBasePtr(), VL},
-      Load->getMemoryVT(), Load->getMemOperand());
+  SDValue NewLoad =
+      DAG.getMemIntrinsicNode(ISD::INTRINSIC_W_CHAIN, DL, VTs, Ops,
+                              Load->getMemoryVT(), Load->getMemOperand());
 
   SDValue Result = convertFromScalableVector(VT, NewLoad, DAG, Subtarget);
-  return DAG.getMergeValues({Result, Load->getChain()}, DL);
+  return DAG.getMergeValues({Result, NewLoad.getValue(1)}, DL);
 }
 
 SDValue
@@ -4320,6 +6630,7 @@ RISCVTargetLowering::lowerFixedLengthVectorStoreToRVV(SDValue Op,
 
   SDValue StoreVal = Store->getValue();
   MVT VT = StoreVal.getSimpleValueType();
+  MVT XLenVT = Subtarget.getXLenVT();
 
   // If the size less than a byte, we need to pad with zeros to make a byte.
   if (VT.getVectorElementType() == MVT::i1 && VT.getVectorNumElements() < 8) {
@@ -4331,47 +6642,78 @@ RISCVTargetLowering::lowerFixedLengthVectorStoreToRVV(SDValue Op,
 
   MVT ContainerVT = getContainerForFixedLengthVector(VT);
 
-  SDValue VL =
-      DAG.getConstant(VT.getVectorNumElements(), DL, Subtarget.getXLenVT());
+  SDValue VL = getVLOp(VT.getVectorNumElements(), DL, DAG, Subtarget);
 
   SDValue NewValue =
       convertToScalableVector(ContainerVT, StoreVal, DAG, Subtarget);
+
+  bool IsMaskOp = VT.getVectorElementType() == MVT::i1;
+  SDValue IntID = DAG.getTargetConstant(
+      IsMaskOp ? Intrinsic::riscv_vsm : Intrinsic::riscv_vse, DL, XLenVT);
   return DAG.getMemIntrinsicNode(
-      RISCVISD::VSE_VL, DL, DAG.getVTList(MVT::Other),
-      {Store->getChain(), NewValue, Store->getBasePtr(), VL},
+      ISD::INTRINSIC_VOID, DL, DAG.getVTList(MVT::Other),
+      {Store->getChain(), IntID, NewValue, Store->getBasePtr(), VL},
       Store->getMemoryVT(), Store->getMemOperand());
 }
 
-SDValue RISCVTargetLowering::lowerMLOAD(SDValue Op, SelectionDAG &DAG) const {
-  auto *Load = cast<MaskedLoadSDNode>(Op);
-
+SDValue RISCVTargetLowering::lowerMaskedLoad(SDValue Op,
+                                             SelectionDAG &DAG) const {
   SDLoc DL(Op);
   MVT VT = Op.getSimpleValueType();
-  MVT XLenVT = Subtarget.getXLenVT();
 
-  SDValue Mask = Load->getMask();
-  SDValue PassThru = Load->getPassThru();
-  SDValue VL;
+  const auto *MemSD = cast<MemSDNode>(Op);
+  EVT MemVT = MemSD->getMemoryVT();
+  MachineMemOperand *MMO = MemSD->getMemOperand();
+  SDValue Chain = MemSD->getChain();
+  SDValue BasePtr = MemSD->getBasePtr();
+
+  SDValue Mask, PassThru, VL;
+  if (const auto *VPLoad = dyn_cast<VPLoadSDNode>(Op)) {
+    Mask = VPLoad->getMask();
+    PassThru = DAG.getUNDEF(VT);
+    VL = VPLoad->getVectorLength();
+  } else {
+    const auto *MLoad = cast<MaskedLoadSDNode>(Op);
+    Mask = MLoad->getMask();
+    PassThru = MLoad->getPassThru();
+  }
+
+  bool IsUnmasked = ISD::isConstantSplatVectorAllOnes(Mask.getNode());
+
+  MVT XLenVT = Subtarget.getXLenVT();
 
   MVT ContainerVT = VT;
   if (VT.isFixedLengthVector()) {
     ContainerVT = getContainerForFixedLengthVector(VT);
-    MVT MaskVT = MVT::getVectorVT(MVT::i1, ContainerVT.getVectorElementCount());
-
-    Mask = convertToScalableVector(MaskVT, Mask, DAG, Subtarget);
     PassThru = convertToScalableVector(ContainerVT, PassThru, DAG, Subtarget);
-    VL = DAG.getConstant(VT.getVectorNumElements(), DL, XLenVT);
-  } else
-    VL = DAG.getRegister(RISCV::X0, XLenVT);
+    if (!IsUnmasked) {
+      MVT MaskVT = getMaskTypeFor(ContainerVT);
+      Mask = convertToScalableVector(MaskVT, Mask, DAG, Subtarget);
+    }
+  }
+
+  if (!VL)
+    VL = getDefaultVLOps(VT, ContainerVT, DL, DAG, Subtarget).second;
+
+  unsigned IntID =
+      IsUnmasked ? Intrinsic::riscv_vle : Intrinsic::riscv_vle_mask;
+  SmallVector<SDValue, 8> Ops{Chain, DAG.getTargetConstant(IntID, DL, XLenVT)};
+  if (IsUnmasked)
+    Ops.push_back(DAG.getUNDEF(ContainerVT));
+  else
+    Ops.push_back(PassThru);
+  Ops.push_back(BasePtr);
+  if (!IsUnmasked)
+    Ops.push_back(Mask);
+  Ops.push_back(VL);
+  if (!IsUnmasked)
+    Ops.push_back(DAG.getTargetConstant(RISCVII::TAIL_AGNOSTIC, DL, XLenVT));
 
   SDVTList VTs = DAG.getVTList({ContainerVT, MVT::Other});
-  SDValue IntID = DAG.getTargetConstant(Intrinsic::riscv_vle_mask, DL, XLenVT);
-  SDValue Ops[] = {Load->getChain(),   IntID, PassThru,
-                   Load->getBasePtr(), Mask,  VL};
+
   SDValue Result =
-      DAG.getMemIntrinsicNode(ISD::INTRINSIC_W_CHAIN, DL, VTs, Ops,
-                              Load->getMemoryVT(), Load->getMemOperand());
-  SDValue Chain = Result.getValue(1);
+      DAG.getMemIntrinsicNode(ISD::INTRINSIC_W_CHAIN, DL, VTs, Ops, MemVT, MMO);
+  Chain = Result.getValue(1);
 
   if (VT.isFixedLengthVector())
     Result = convertFromScalableVector(VT, Result, DAG, Subtarget);
@@ -4379,32 +6721,57 @@ SDValue RISCVTargetLowering::lowerMLOAD(SDValue Op, SelectionDAG &DAG) const {
   return DAG.getMergeValues({Result, Chain}, DL);
 }
 
-SDValue RISCVTargetLowering::lowerMSTORE(SDValue Op, SelectionDAG &DAG) const {
-  auto *Store = cast<MaskedStoreSDNode>(Op);
-
+SDValue RISCVTargetLowering::lowerMaskedStore(SDValue Op,
+                                              SelectionDAG &DAG) const {
   SDLoc DL(Op);
-  SDValue Val = Store->getValue();
-  SDValue Mask = Store->getMask();
+
+  const auto *MemSD = cast<MemSDNode>(Op);
+  EVT MemVT = MemSD->getMemoryVT();
+  MachineMemOperand *MMO = MemSD->getMemOperand();
+  SDValue Chain = MemSD->getChain();
+  SDValue BasePtr = MemSD->getBasePtr();
+  SDValue Val, Mask, VL;
+
+  if (const auto *VPStore = dyn_cast<VPStoreSDNode>(Op)) {
+    Val = VPStore->getValue();
+    Mask = VPStore->getMask();
+    VL = VPStore->getVectorLength();
+  } else {
+    const auto *MStore = cast<MaskedStoreSDNode>(Op);
+    Val = MStore->getValue();
+    Mask = MStore->getMask();
+  }
+
+  bool IsUnmasked = ISD::isConstantSplatVectorAllOnes(Mask.getNode());
+
   MVT VT = Val.getSimpleValueType();
   MVT XLenVT = Subtarget.getXLenVT();
-  SDValue VL;
 
   MVT ContainerVT = VT;
   if (VT.isFixedLengthVector()) {
     ContainerVT = getContainerForFixedLengthVector(VT);
-    MVT MaskVT = MVT::getVectorVT(MVT::i1, ContainerVT.getVectorElementCount());
 
     Val = convertToScalableVector(ContainerVT, Val, DAG, Subtarget);
-    Mask = convertToScalableVector(MaskVT, Mask, DAG, Subtarget);
-    VL = DAG.getConstant(VT.getVectorNumElements(), DL, XLenVT);
-  } else
-    VL = DAG.getRegister(RISCV::X0, XLenVT);
+    if (!IsUnmasked) {
+      MVT MaskVT = getMaskTypeFor(ContainerVT);
+      Mask = convertToScalableVector(MaskVT, Mask, DAG, Subtarget);
+    }
+  }
 
-  SDValue IntID = DAG.getTargetConstant(Intrinsic::riscv_vse_mask, DL, XLenVT);
-  return DAG.getMemIntrinsicNode(
-      ISD::INTRINSIC_VOID, DL, DAG.getVTList(MVT::Other),
-      {Store->getChain(), IntID, Val, Store->getBasePtr(), Mask, VL},
-      Store->getMemoryVT(), Store->getMemOperand());
+  if (!VL)
+    VL = getDefaultVLOps(VT, ContainerVT, DL, DAG, Subtarget).second;
+
+  unsigned IntID =
+      IsUnmasked ? Intrinsic::riscv_vse : Intrinsic::riscv_vse_mask;
+  SmallVector<SDValue, 8> Ops{Chain, DAG.getTargetConstant(IntID, DL, XLenVT)};
+  Ops.push_back(Val);
+  Ops.push_back(BasePtr);
+  if (!IsUnmasked)
+    Ops.push_back(Mask);
+  Ops.push_back(VL);
+
+  return DAG.getMemIntrinsicNode(ISD::INTRINSIC_VOID, DL,
+                                 DAG.getVTList(MVT::Other), Ops, MemVT, MMO);
 }
 
 SDValue
@@ -4421,14 +6788,13 @@ RISCVTargetLowering::lowerFixedLengthVectorSetccToRVV(SDValue Op,
       convertToScalableVector(ContainerVT, Op.getOperand(1), DAG, Subtarget);
 
   SDLoc DL(Op);
-  SDValue VL =
-      DAG.getConstant(VT.getVectorNumElements(), DL, Subtarget.getXLenVT());
+  auto [Mask, VL] = getDefaultVLOps(VT.getVectorNumElements(), ContainerVT, DL,
+                                    DAG, Subtarget);
+  MVT MaskVT = getMaskTypeFor(ContainerVT);
 
-  MVT MaskVT = MVT::getVectorVT(MVT::i1, ContainerVT.getVectorElementCount());
-  SDValue Mask = DAG.getNode(RISCVISD::VMSET_VL, DL, MaskVT, VL);
-
-  SDValue Cmp = DAG.getNode(RISCVISD::SETCC_VL, DL, MaskVT, Op1, Op2,
-                            Op.getOperand(2), Mask, VL);
+  SDValue Cmp =
+      DAG.getNode(RISCVISD::SETCC_VL, DL, MaskVT,
+                  {Op1, Op2, Op.getOperand(2), DAG.getUNDEF(MaskVT), Mask, VL});
 
   return convertFromScalableVector(VT, Cmp, DAG, Subtarget);
 }
@@ -4438,9 +6804,10 @@ SDValue RISCVTargetLowering::lowerFixedLengthVectorLogicOpToRVV(
   MVT VT = Op.getSimpleValueType();
 
   if (VT.getVectorElementType() == MVT::i1)
-    return lowerToScalableOp(Op, DAG, MaskOpc, /*HasMask*/ false);
+    return lowerToScalableOp(Op, DAG, MaskOpc, /*HasMergeOp*/ false,
+                             /*HasMask*/ false);
 
-  return lowerToScalableOp(Op, DAG, VecOpc, /*HasMask*/ true);
+  return lowerToScalableOp(Op, DAG, VecOpc, /*HasMergeOp*/ true);
 }
 
 SDValue
@@ -4454,7 +6821,7 @@ RISCVTargetLowering::lowerFixedLengthVectorShiftToRVV(SDValue Op,
   case ISD::SRL: Opc = RISCVISD::SRL_VL; break;
   }
 
-  return lowerToScalableOp(Op, DAG, Opc);
+  return lowerToScalableOp(Op, DAG, Opc, /*HasMergeOp*/ true);
 }
 
 // Lower vector ABS to smax(X, sub(0, X)).
@@ -4463,23 +6830,33 @@ SDValue RISCVTargetLowering::lowerABS(SDValue Op, SelectionDAG &DAG) const {
   MVT VT = Op.getSimpleValueType();
   SDValue X = Op.getOperand(0);
 
-  assert(VT.isFixedLengthVector() && "Unexpected type");
+  assert((Op.getOpcode() == ISD::VP_ABS || VT.isFixedLengthVector()) &&
+         "Unexpected type for ISD::ABS");
 
-  MVT ContainerVT = getContainerForFixedLengthVector(VT);
-  X = convertToScalableVector(ContainerVT, X, DAG, Subtarget);
+  MVT ContainerVT = VT;
+  if (VT.isFixedLengthVector()) {
+    ContainerVT = getContainerForFixedLengthVector(VT);
+    X = convertToScalableVector(ContainerVT, X, DAG, Subtarget);
+  }
 
   SDValue Mask, VL;
-  std::tie(Mask, VL) = getDefaultVLOps(VT, ContainerVT, DL, DAG, Subtarget);
+  if (Op->getOpcode() == ISD::VP_ABS) {
+    Mask = Op->getOperand(1);
+    VL = Op->getOperand(2);
+  } else
+    std::tie(Mask, VL) = getDefaultVLOps(VT, ContainerVT, DL, DAG, Subtarget);
 
-  SDValue SplatZero =
-      DAG.getNode(RISCVISD::VMV_V_X_VL, DL, ContainerVT,
-                  DAG.getConstant(0, DL, Subtarget.getXLenVT()));
-  SDValue NegX =
-      DAG.getNode(RISCVISD::SUB_VL, DL, ContainerVT, SplatZero, X, Mask, VL);
-  SDValue Max =
-      DAG.getNode(RISCVISD::SMAX_VL, DL, ContainerVT, X, NegX, Mask, VL);
+  SDValue SplatZero = DAG.getNode(
+      RISCVISD::VMV_V_X_VL, DL, ContainerVT, DAG.getUNDEF(ContainerVT),
+      DAG.getConstant(0, DL, Subtarget.getXLenVT()), VL);
+  SDValue NegX = DAG.getNode(RISCVISD::SUB_VL, DL, ContainerVT, SplatZero, X,
+                             DAG.getUNDEF(ContainerVT), Mask, VL);
+  SDValue Max = DAG.getNode(RISCVISD::SMAX_VL, DL, ContainerVT, X, NegX,
+                            DAG.getUNDEF(ContainerVT), Mask, VL);
 
-  return convertFromScalableVector(VT, Max, DAG, Subtarget);
+  if (VT.isFixedLengthVector())
+    Max = convertFromScalableVector(VT, Max, DAG, Subtarget);
+  return Max;
 }
 
 SDValue RISCVTargetLowering::lowerFixedLengthVectorFCOPYSIGNToRVV(
@@ -4495,11 +6872,10 @@ SDValue RISCVTargetLowering::lowerFixedLengthVectorFCOPYSIGNToRVV(
   Mag = convertToScalableVector(ContainerVT, Mag, DAG, Subtarget);
   Sign = convertToScalableVector(ContainerVT, Sign, DAG, Subtarget);
 
-  SDValue Mask, VL;
-  std::tie(Mask, VL) = getDefaultVLOps(VT, ContainerVT, DL, DAG, Subtarget);
+  auto [Mask, VL] = getDefaultVLOps(VT, ContainerVT, DL, DAG, Subtarget);
 
-  SDValue CopySign =
-      DAG.getNode(RISCVISD::FCOPYSIGN_VL, DL, ContainerVT, Mag, Sign, Mask, VL);
+  SDValue CopySign = DAG.getNode(RISCVISD::FCOPYSIGN_VL, DL, ContainerVT, Mag,
+                                 Sign, DAG.getUNDEF(ContainerVT), Mask, VL);
 
   return convertFromScalableVector(VT, CopySign, DAG, Subtarget);
 }
@@ -4520,8 +6896,7 @@ SDValue RISCVTargetLowering::lowerFixedLengthVectorSelectToRVV(
       convertToScalableVector(ContainerVT, Op.getOperand(2), DAG, Subtarget);
 
   SDLoc DL(Op);
-  SDValue Mask, VL;
-  std::tie(Mask, VL) = getDefaultVLOps(VT, ContainerVT, DL, DAG, Subtarget);
+  SDValue VL = getDefaultVLOps(VT, ContainerVT, DL, DAG, Subtarget).second;
 
   SDValue Select =
       DAG.getNode(RISCVISD::VSELECT_VL, DL, ContainerVT, CC, Op1, Op2, VL);
@@ -4530,7 +6905,7 @@ SDValue RISCVTargetLowering::lowerFixedLengthVectorSelectToRVV(
 }
 
 SDValue RISCVTargetLowering::lowerToScalableOp(SDValue Op, SelectionDAG &DAG,
-                                               unsigned NewOpc,
+                                               unsigned NewOpc, bool HasMergeOp,
                                                bool HasMask) const {
   MVT VT = Op.getSimpleValueType();
   MVT ContainerVT = getContainerForFixedLengthVector(VT);
@@ -4553,13 +6928,15 @@ SDValue RISCVTargetLowering::lowerToScalableOp(SDValue Op, SelectionDAG &DAG,
   }
 
   SDLoc DL(Op);
-  SDValue Mask, VL;
-  std::tie(Mask, VL) = getDefaultVLOps(VT, ContainerVT, DL, DAG, Subtarget);
+  auto [Mask, VL] = getDefaultVLOps(VT, ContainerVT, DL, DAG, Subtarget);
+  if (HasMergeOp)
+    Ops.push_back(DAG.getUNDEF(ContainerVT));
   if (HasMask)
     Ops.push_back(Mask);
   Ops.push_back(VL);
 
-  SDValue ScalableRes = DAG.getNode(NewOpc, DL, ContainerVT, Ops);
+  SDValue ScalableRes =
+      DAG.getNode(NewOpc, DL, ContainerVT, Ops, Op->getFlags());
   return convertFromScalableVector(VT, ScalableRes, DAG, Subtarget);
 }
 
@@ -4569,14 +6946,22 @@ SDValue RISCVTargetLowering::lowerToScalableOp(SDValue Op, SelectionDAG &DAG,
 // * Fixed-length vectors are converted to their scalable-vector container
 //   types.
 SDValue RISCVTargetLowering::lowerVPOp(SDValue Op, SelectionDAG &DAG,
-                                       unsigned RISCVISDOpc) const {
+                                       unsigned RISCVISDOpc,
+                                       bool HasMergeOp) const {
   SDLoc DL(Op);
   MVT VT = Op.getSimpleValueType();
   SmallVector<SDValue, 4> Ops;
 
+  MVT ContainerVT = VT;
+  if (VT.isFixedLengthVector())
+    ContainerVT = getContainerForFixedLengthVector(VT);
+
   for (const auto &OpIdx : enumerate(Op->ops())) {
     SDValue V = OpIdx.value();
     assert(!isa<VTSDNode>(V) && "Unexpected VTSDNode node!");
+    // Add dummy merge value before the mask.
+    if (HasMergeOp && *ISD::getVPMaskIdx(Op.getOpcode()) == OpIdx.index())
+      Ops.push_back(DAG.getUNDEF(ContainerVT));
     // Pass through operands which aren't fixed-length vectors.
     if (!V.getValueType().isFixedLengthVector()) {
       Ops.push_back(V);
@@ -4591,88 +6976,323 @@ SDValue RISCVTargetLowering::lowerVPOp(SDValue Op, SelectionDAG &DAG,
   }
 
   if (!VT.isFixedLengthVector())
-    return DAG.getNode(RISCVISDOpc, DL, VT, Ops);
-
-  MVT ContainerVT = getContainerForFixedLengthVector(VT);
+    return DAG.getNode(RISCVISDOpc, DL, VT, Ops, Op->getFlags());
 
-  SDValue VPOp = DAG.getNode(RISCVISDOpc, DL, ContainerVT, Ops);
+  SDValue VPOp = DAG.getNode(RISCVISDOpc, DL, ContainerVT, Ops, Op->getFlags());
 
   return convertFromScalableVector(VT, VPOp, DAG, Subtarget);
 }
 
-// Custom lower MGATHER to a legalized form for RVV. It will then be matched to
-// a RVV indexed load. The RVV indexed load instructions only support the
-// "unsigned unscaled" addressing mode; indices are implicitly zero-extended or
-// truncated to XLEN and are treated as byte offsets. Any signed or scaled
-// indexing is extended to the XLEN value type and scaled accordingly.
-SDValue RISCVTargetLowering::lowerMGATHER(SDValue Op, SelectionDAG &DAG) const {
-  auto *MGN = cast<MaskedGatherSDNode>(Op.getNode());
+SDValue RISCVTargetLowering::lowerVPExtMaskOp(SDValue Op,
+                                              SelectionDAG &DAG) const {
   SDLoc DL(Op);
+  MVT VT = Op.getSimpleValueType();
 
-  SDValue Index = MGN->getIndex();
-  SDValue Mask = MGN->getMask();
-  SDValue PassThru = MGN->getPassThru();
+  SDValue Src = Op.getOperand(0);
+  // NOTE: Mask is dropped.
+  SDValue VL = Op.getOperand(2);
+
+  MVT ContainerVT = VT;
+  if (VT.isFixedLengthVector()) {
+    ContainerVT = getContainerForFixedLengthVector(VT);
+    MVT SrcVT = MVT::getVectorVT(MVT::i1, ContainerVT.getVectorElementCount());
+    Src = convertToScalableVector(SrcVT, Src, DAG, Subtarget);
+  }
 
-  MVT VT = Op.getSimpleValueType();
-  MVT IndexVT = Index.getSimpleValueType();
   MVT XLenVT = Subtarget.getXLenVT();
+  SDValue Zero = DAG.getConstant(0, DL, XLenVT);
+  SDValue ZeroSplat = DAG.getNode(RISCVISD::VMV_V_X_VL, DL, ContainerVT,
+                                  DAG.getUNDEF(ContainerVT), Zero, VL);
 
-  assert(VT.getVectorElementCount() == IndexVT.getVectorElementCount() &&
-         "Unexpected VTs!");
-  assert(MGN->getBasePtr().getSimpleValueType() == XLenVT &&
-         "Unexpected pointer type");
-  // Targets have to explicitly opt-in for extending vector loads.
-  assert(MGN->getExtensionType() == ISD::NON_EXTLOAD &&
-         "Unexpected extending MGATHER");
+  SDValue SplatValue = DAG.getConstant(
+      Op.getOpcode() == ISD::VP_ZERO_EXTEND ? 1 : -1, DL, XLenVT);
+  SDValue Splat = DAG.getNode(RISCVISD::VMV_V_X_VL, DL, ContainerVT,
+                              DAG.getUNDEF(ContainerVT), SplatValue, VL);
 
-  // If the mask is known to be all ones, optimize to an unmasked intrinsic;
-  // the selection of the masked intrinsics doesn't do this for us.
-  bool IsUnmasked = ISD::isConstantSplatVectorAllOnes(Mask.getNode());
+  SDValue Result = DAG.getNode(RISCVISD::VSELECT_VL, DL, ContainerVT, Src,
+                               Splat, ZeroSplat, VL);
+  if (!VT.isFixedLengthVector())
+    return Result;
+  return convertFromScalableVector(VT, Result, DAG, Subtarget);
+}
+
+SDValue RISCVTargetLowering::lowerVPSetCCMaskOp(SDValue Op,
+                                                SelectionDAG &DAG) const {
+  SDLoc DL(Op);
+  MVT VT = Op.getSimpleValueType();
+
+  SDValue Op1 = Op.getOperand(0);
+  SDValue Op2 = Op.getOperand(1);
+  ISD::CondCode Condition = cast<CondCodeSDNode>(Op.getOperand(2))->get();
+  // NOTE: Mask is dropped.
+  SDValue VL = Op.getOperand(4);
 
-  SDValue VL;
   MVT ContainerVT = VT;
   if (VT.isFixedLengthVector()) {
-    // We need to use the larger of the result and index type to determine the
-    // scalable type to use so we don't increase LMUL for any operand/result.
-    if (VT.bitsGE(IndexVT)) {
-      ContainerVT = getContainerForFixedLengthVector(VT);
-      IndexVT = MVT::getVectorVT(IndexVT.getVectorElementType(),
-                                 ContainerVT.getVectorElementCount());
+    ContainerVT = getContainerForFixedLengthVector(VT);
+    Op1 = convertToScalableVector(ContainerVT, Op1, DAG, Subtarget);
+    Op2 = convertToScalableVector(ContainerVT, Op2, DAG, Subtarget);
+  }
+
+  SDValue Result;
+  SDValue AllOneMask = DAG.getNode(RISCVISD::VMSET_VL, DL, ContainerVT, VL);
+
+  switch (Condition) {
+  default:
+    break;
+  // X != Y  --> (X^Y)
+  case ISD::SETNE:
+    Result = DAG.getNode(RISCVISD::VMXOR_VL, DL, ContainerVT, Op1, Op2, VL);
+    break;
+  // X == Y  --> ~(X^Y)
+  case ISD::SETEQ: {
+    SDValue Temp =
+        DAG.getNode(RISCVISD::VMXOR_VL, DL, ContainerVT, Op1, Op2, VL);
+    Result =
+        DAG.getNode(RISCVISD::VMXOR_VL, DL, ContainerVT, Temp, AllOneMask, VL);
+    break;
+  }
+  // X >s Y   -->  X == 0 & Y == 1  -->  ~X & Y
+  // X <u Y   -->  X == 0 & Y == 1  -->  ~X & Y
+  case ISD::SETGT:
+  case ISD::SETULT: {
+    SDValue Temp =
+        DAG.getNode(RISCVISD::VMXOR_VL, DL, ContainerVT, Op1, AllOneMask, VL);
+    Result = DAG.getNode(RISCVISD::VMAND_VL, DL, ContainerVT, Temp, Op2, VL);
+    break;
+  }
+  // X <s Y   --> X == 1 & Y == 0  -->  ~Y & X
+  // X >u Y   --> X == 1 & Y == 0  -->  ~Y & X
+  case ISD::SETLT:
+  case ISD::SETUGT: {
+    SDValue Temp =
+        DAG.getNode(RISCVISD::VMXOR_VL, DL, ContainerVT, Op2, AllOneMask, VL);
+    Result = DAG.getNode(RISCVISD::VMAND_VL, DL, ContainerVT, Op1, Temp, VL);
+    break;
+  }
+  // X >=s Y  --> X == 0 | Y == 1  -->  ~X | Y
+  // X <=u Y  --> X == 0 | Y == 1  -->  ~X | Y
+  case ISD::SETGE:
+  case ISD::SETULE: {
+    SDValue Temp =
+        DAG.getNode(RISCVISD::VMXOR_VL, DL, ContainerVT, Op1, AllOneMask, VL);
+    Result = DAG.getNode(RISCVISD::VMXOR_VL, DL, ContainerVT, Temp, Op2, VL);
+    break;
+  }
+  // X <=s Y  --> X == 1 | Y == 0  -->  ~Y | X
+  // X >=u Y  --> X == 1 | Y == 0  -->  ~Y | X
+  case ISD::SETLE:
+  case ISD::SETUGE: {
+    SDValue Temp =
+        DAG.getNode(RISCVISD::VMXOR_VL, DL, ContainerVT, Op2, AllOneMask, VL);
+    Result = DAG.getNode(RISCVISD::VMXOR_VL, DL, ContainerVT, Temp, Op1, VL);
+    break;
+  }
+  }
+
+  if (!VT.isFixedLengthVector())
+    return Result;
+  return convertFromScalableVector(VT, Result, DAG, Subtarget);
+}
+
+// Lower Floating-Point/Integer Type-Convert VP SDNodes
+SDValue RISCVTargetLowering::lowerVPFPIntConvOp(SDValue Op, SelectionDAG &DAG,
+                                                unsigned RISCVISDOpc) const {
+  SDLoc DL(Op);
+
+  SDValue Src = Op.getOperand(0);
+  SDValue Mask = Op.getOperand(1);
+  SDValue VL = Op.getOperand(2);
+
+  MVT DstVT = Op.getSimpleValueType();
+  MVT SrcVT = Src.getSimpleValueType();
+  if (DstVT.isFixedLengthVector()) {
+    DstVT = getContainerForFixedLengthVector(DstVT);
+    SrcVT = getContainerForFixedLengthVector(SrcVT);
+    Src = convertToScalableVector(SrcVT, Src, DAG, Subtarget);
+    MVT MaskVT = getMaskTypeFor(DstVT);
+    Mask = convertToScalableVector(MaskVT, Mask, DAG, Subtarget);
+  }
+
+  unsigned DstEltSize = DstVT.getScalarSizeInBits();
+  unsigned SrcEltSize = SrcVT.getScalarSizeInBits();
+
+  SDValue Result;
+  if (DstEltSize >= SrcEltSize) { // Single-width and widening conversion.
+    if (SrcVT.isInteger()) {
+      assert(DstVT.isFloatingPoint() && "Wrong input/output vector types");
+
+      unsigned RISCVISDExtOpc = RISCVISDOpc == RISCVISD::SINT_TO_FP_VL
+                                    ? RISCVISD::VSEXT_VL
+                                    : RISCVISD::VZEXT_VL;
+
+      // Do we need to do any pre-widening before converting?
+      if (SrcEltSize == 1) {
+        MVT IntVT = DstVT.changeVectorElementTypeToInteger();
+        MVT XLenVT = Subtarget.getXLenVT();
+        SDValue Zero = DAG.getConstant(0, DL, XLenVT);
+        SDValue ZeroSplat = DAG.getNode(RISCVISD::VMV_V_X_VL, DL, IntVT,
+                                        DAG.getUNDEF(IntVT), Zero, VL);
+        SDValue One = DAG.getConstant(
+            RISCVISDExtOpc == RISCVISD::VZEXT_VL ? 1 : -1, DL, XLenVT);
+        SDValue OneSplat = DAG.getNode(RISCVISD::VMV_V_X_VL, DL, IntVT,
+                                       DAG.getUNDEF(IntVT), One, VL);
+        Src = DAG.getNode(RISCVISD::VSELECT_VL, DL, IntVT, Src, OneSplat,
+                          ZeroSplat, VL);
+      } else if (DstEltSize > (2 * SrcEltSize)) {
+        // Widen before converting.
+        MVT IntVT = MVT::getVectorVT(MVT::getIntegerVT(DstEltSize / 2),
+                                     DstVT.getVectorElementCount());
+        Src = DAG.getNode(RISCVISDExtOpc, DL, IntVT, Src, Mask, VL);
+      }
+
+      Result = DAG.getNode(RISCVISDOpc, DL, DstVT, Src, Mask, VL);
     } else {
-      IndexVT = getContainerForFixedLengthVector(IndexVT);
-      ContainerVT = MVT::getVectorVT(ContainerVT.getVectorElementType(),
-                                     IndexVT.getVectorElementCount());
+      assert(SrcVT.isFloatingPoint() && DstVT.isInteger() &&
+             "Wrong input/output vector types");
+
+      // Convert f16 to f32 then convert f32 to i64.
+      if (DstEltSize > (2 * SrcEltSize)) {
+        assert(SrcVT.getVectorElementType() == MVT::f16 && "Unexpected type!");
+        MVT InterimFVT =
+            MVT::getVectorVT(MVT::f32, DstVT.getVectorElementCount());
+        Src =
+            DAG.getNode(RISCVISD::FP_EXTEND_VL, DL, InterimFVT, Src, Mask, VL);
+      }
+
+      Result = DAG.getNode(RISCVISDOpc, DL, DstVT, Src, Mask, VL);
     }
+  } else { // Narrowing + Conversion
+    if (SrcVT.isInteger()) {
+      assert(DstVT.isFloatingPoint() && "Wrong input/output vector types");
+      // First do a narrowing convert to an FP type half the size, then round
+      // the FP type to a small FP type if needed.
 
-    Index = convertToScalableVector(IndexVT, Index, DAG, Subtarget);
+      MVT InterimFVT = DstVT;
+      if (SrcEltSize > (2 * DstEltSize)) {
+        assert(SrcEltSize == (4 * DstEltSize) && "Unexpected types!");
+        assert(DstVT.getVectorElementType() == MVT::f16 && "Unexpected type!");
+        InterimFVT = MVT::getVectorVT(MVT::f32, DstVT.getVectorElementCount());
+      }
 
-    if (!IsUnmasked) {
-      MVT MaskVT =
-          MVT::getVectorVT(MVT::i1, ContainerVT.getVectorElementCount());
-      Mask = convertToScalableVector(MaskVT, Mask, DAG, Subtarget);
-      PassThru = convertToScalableVector(ContainerVT, PassThru, DAG, Subtarget);
+      Result = DAG.getNode(RISCVISDOpc, DL, InterimFVT, Src, Mask, VL);
+
+      if (InterimFVT != DstVT) {
+        Src = Result;
+        Result = DAG.getNode(RISCVISD::FP_ROUND_VL, DL, DstVT, Src, Mask, VL);
+      }
+    } else {
+      assert(SrcVT.isFloatingPoint() && DstVT.isInteger() &&
+             "Wrong input/output vector types");
+      // First do a narrowing conversion to an integer half the size, then
+      // truncate if needed.
+
+      if (DstEltSize == 1) {
+        // First convert to the same size integer, then convert to mask using
+        // setcc.
+        assert(SrcEltSize >= 16 && "Unexpected FP type!");
+        MVT InterimIVT = MVT::getVectorVT(MVT::getIntegerVT(SrcEltSize),
+                                          DstVT.getVectorElementCount());
+        Result = DAG.getNode(RISCVISDOpc, DL, InterimIVT, Src, Mask, VL);
+
+        // Compare the integer result to 0. The integer should be 0 or 1/-1,
+        // otherwise the conversion was undefined.
+        MVT XLenVT = Subtarget.getXLenVT();
+        SDValue SplatZero = DAG.getConstant(0, DL, XLenVT);
+        SplatZero = DAG.getNode(RISCVISD::VMV_V_X_VL, DL, InterimIVT,
+                                DAG.getUNDEF(InterimIVT), SplatZero, VL);
+        Result = DAG.getNode(RISCVISD::SETCC_VL, DL, DstVT,
+                             {Result, SplatZero, DAG.getCondCode(ISD::SETNE),
+                              DAG.getUNDEF(DstVT), Mask, VL});
+      } else {
+        MVT InterimIVT = MVT::getVectorVT(MVT::getIntegerVT(SrcEltSize / 2),
+                                          DstVT.getVectorElementCount());
+
+        Result = DAG.getNode(RISCVISDOpc, DL, InterimIVT, Src, Mask, VL);
+
+        while (InterimIVT != DstVT) {
+          SrcEltSize /= 2;
+          Src = Result;
+          InterimIVT = MVT::getVectorVT(MVT::getIntegerVT(SrcEltSize / 2),
+                                        DstVT.getVectorElementCount());
+          Result = DAG.getNode(RISCVISD::TRUNCATE_VECTOR_VL, DL, InterimIVT,
+                               Src, Mask, VL);
+        }
+      }
     }
+  }
 
-    VL = DAG.getConstant(VT.getVectorNumElements(), DL, XLenVT);
-  } else
-    VL = DAG.getRegister(RISCV::X0, XLenVT);
+  MVT VT = Op.getSimpleValueType();
+  if (!VT.isFixedLengthVector())
+    return Result;
+  return convertFromScalableVector(VT, Result, DAG, Subtarget);
+}
 
-  unsigned IntID =
-      IsUnmasked ? Intrinsic::riscv_vluxei : Intrinsic::riscv_vluxei_mask;
-  SmallVector<SDValue, 8> Ops{MGN->getChain(),
-                              DAG.getTargetConstant(IntID, DL, XLenVT)};
-  if (!IsUnmasked)
-    Ops.push_back(PassThru);
-  Ops.push_back(MGN->getBasePtr());
-  Ops.push_back(Index);
-  if (!IsUnmasked)
-    Ops.push_back(Mask);
-  Ops.push_back(VL);
+SDValue RISCVTargetLowering::lowerLogicVPOp(SDValue Op, SelectionDAG &DAG,
+                                            unsigned MaskOpc,
+                                            unsigned VecOpc) const {
+  MVT VT = Op.getSimpleValueType();
+  if (VT.getVectorElementType() != MVT::i1)
+    return lowerVPOp(Op, DAG, VecOpc, true);
+
+  // It is safe to drop mask parameter as masked-off elements are undef.
+  SDValue Op1 = Op->getOperand(0);
+  SDValue Op2 = Op->getOperand(1);
+  SDValue VL = Op->getOperand(3);
+
+  MVT ContainerVT = VT;
+  const bool IsFixed = VT.isFixedLengthVector();
+  if (IsFixed) {
+    ContainerVT = getContainerForFixedLengthVector(VT);
+    Op1 = convertToScalableVector(ContainerVT, Op1, DAG, Subtarget);
+    Op2 = convertToScalableVector(ContainerVT, Op2, DAG, Subtarget);
+  }
+
+  SDLoc DL(Op);
+  SDValue Val = DAG.getNode(MaskOpc, DL, ContainerVT, Op1, Op2, VL);
+  if (!IsFixed)
+    return Val;
+  return convertFromScalableVector(VT, Val, DAG, Subtarget);
+}
+
+SDValue RISCVTargetLowering::lowerVPStridedLoad(SDValue Op,
+                                                SelectionDAG &DAG) const {
+  SDLoc DL(Op);
+  MVT XLenVT = Subtarget.getXLenVT();
+  MVT VT = Op.getSimpleValueType();
+  MVT ContainerVT = VT;
+  if (VT.isFixedLengthVector())
+    ContainerVT = getContainerForFixedLengthVector(VT);
 
   SDVTList VTs = DAG.getVTList({ContainerVT, MVT::Other});
+
+  auto *VPNode = cast<VPStridedLoadSDNode>(Op);
+  // Check if the mask is known to be all ones
+  SDValue Mask = VPNode->getMask();
+  bool IsUnmasked = ISD::isConstantSplatVectorAllOnes(Mask.getNode());
+
+  SDValue IntID = DAG.getTargetConstant(IsUnmasked ? Intrinsic::riscv_vlse
+                                                   : Intrinsic::riscv_vlse_mask,
+                                        DL, XLenVT);
+  SmallVector<SDValue, 8> Ops{VPNode->getChain(), IntID,
+                              DAG.getUNDEF(ContainerVT), VPNode->getBasePtr(),
+                              VPNode->getStride()};
+  if (!IsUnmasked) {
+    if (VT.isFixedLengthVector()) {
+      MVT MaskVT = ContainerVT.changeVectorElementType(MVT::i1);
+      Mask = convertToScalableVector(MaskVT, Mask, DAG, Subtarget);
+    }
+    Ops.push_back(Mask);
+  }
+  Ops.push_back(VPNode->getVectorLength());
+  if (!IsUnmasked) {
+    SDValue Policy = DAG.getTargetConstant(RISCVII::TAIL_AGNOSTIC, DL, XLenVT);
+    Ops.push_back(Policy);
+  }
+
   SDValue Result =
       DAG.getMemIntrinsicNode(ISD::INTRINSIC_W_CHAIN, DL, VTs, Ops,
-                              MGN->getMemoryVT(), MGN->getMemOperand());
+                              VPNode->getMemoryVT(), VPNode->getMemOperand());
   SDValue Chain = Result.getValue(1);
 
   if (VT.isFixedLengthVector())
@@ -4681,76 +7301,234 @@ SDValue RISCVTargetLowering::lowerMGATHER(SDValue Op, SelectionDAG &DAG) const {
   return DAG.getMergeValues({Result, Chain}, DL);
 }
 
-// Custom lower MSCATTER to a legalized form for RVV. It will then be matched to
-// a RVV indexed store. The RVV indexed store instructions only support the
-// "unsigned unscaled" addressing mode; indices are implicitly zero-extended or
-// truncated to XLEN and are treated as byte offsets. Any signed or scaled
-// indexing is extended to the XLEN value type and scaled accordingly.
-SDValue RISCVTargetLowering::lowerMSCATTER(SDValue Op,
-                                           SelectionDAG &DAG) const {
-  auto *MSN = cast<MaskedScatterSDNode>(Op.getNode());
+SDValue RISCVTargetLowering::lowerVPStridedStore(SDValue Op,
+                                                 SelectionDAG &DAG) const {
   SDLoc DL(Op);
-  SDValue Index = MSN->getIndex();
-  SDValue Mask = MSN->getMask();
-  SDValue Val = MSN->getValue();
+  MVT XLenVT = Subtarget.getXLenVT();
 
-  MVT VT = Val.getSimpleValueType();
+  auto *VPNode = cast<VPStridedStoreSDNode>(Op);
+  SDValue StoreVal = VPNode->getValue();
+  MVT VT = StoreVal.getSimpleValueType();
+  MVT ContainerVT = VT;
+  if (VT.isFixedLengthVector()) {
+    ContainerVT = getContainerForFixedLengthVector(VT);
+    StoreVal = convertToScalableVector(ContainerVT, StoreVal, DAG, Subtarget);
+  }
+
+  // Check if the mask is known to be all ones
+  SDValue Mask = VPNode->getMask();
+  bool IsUnmasked = ISD::isConstantSplatVectorAllOnes(Mask.getNode());
+
+  SDValue IntID = DAG.getTargetConstant(IsUnmasked ? Intrinsic::riscv_vsse
+                                                   : Intrinsic::riscv_vsse_mask,
+                                        DL, XLenVT);
+  SmallVector<SDValue, 8> Ops{VPNode->getChain(), IntID, StoreVal,
+                              VPNode->getBasePtr(), VPNode->getStride()};
+  if (!IsUnmasked) {
+    if (VT.isFixedLengthVector()) {
+      MVT MaskVT = ContainerVT.changeVectorElementType(MVT::i1);
+      Mask = convertToScalableVector(MaskVT, Mask, DAG, Subtarget);
+    }
+    Ops.push_back(Mask);
+  }
+  Ops.push_back(VPNode->getVectorLength());
+
+  return DAG.getMemIntrinsicNode(ISD::INTRINSIC_VOID, DL, VPNode->getVTList(),
+                                 Ops, VPNode->getMemoryVT(),
+                                 VPNode->getMemOperand());
+}
+
+// Custom lower MGATHER/VP_GATHER to a legalized form for RVV. It will then be
+// matched to a RVV indexed load. The RVV indexed load instructions only
+// support the "unsigned unscaled" addressing mode; indices are implicitly
+// zero-extended or truncated to XLEN and are treated as byte offsets. Any
+// signed or scaled indexing is extended to the XLEN value type and scaled
+// accordingly.
+SDValue RISCVTargetLowering::lowerMaskedGather(SDValue Op,
+                                               SelectionDAG &DAG) const {
+  SDLoc DL(Op);
+  MVT VT = Op.getSimpleValueType();
+
+  const auto *MemSD = cast<MemSDNode>(Op.getNode());
+  EVT MemVT = MemSD->getMemoryVT();
+  MachineMemOperand *MMO = MemSD->getMemOperand();
+  SDValue Chain = MemSD->getChain();
+  SDValue BasePtr = MemSD->getBasePtr();
+
+  ISD::LoadExtType LoadExtType;
+  SDValue Index, Mask, PassThru, VL;
+
+  if (auto *VPGN = dyn_cast<VPGatherSDNode>(Op.getNode())) {
+    Index = VPGN->getIndex();
+    Mask = VPGN->getMask();
+    PassThru = DAG.getUNDEF(VT);
+    VL = VPGN->getVectorLength();
+    // VP doesn't support extending loads.
+    LoadExtType = ISD::NON_EXTLOAD;
+  } else {
+    // Else it must be a MGATHER.
+    auto *MGN = cast<MaskedGatherSDNode>(Op.getNode());
+    Index = MGN->getIndex();
+    Mask = MGN->getMask();
+    PassThru = MGN->getPassThru();
+    LoadExtType = MGN->getExtensionType();
+  }
+
+  MVT IndexVT = Index.getSimpleValueType();
+  MVT XLenVT = Subtarget.getXLenVT();
+
+  assert(VT.getVectorElementCount() == IndexVT.getVectorElementCount() &&
+         "Unexpected VTs!");
+  assert(BasePtr.getSimpleValueType() == XLenVT && "Unexpected pointer type");
+  // Targets have to explicitly opt-in for extending vector loads.
+  assert(LoadExtType == ISD::NON_EXTLOAD &&
+         "Unexpected extending MGATHER/VP_GATHER");
+  (void)LoadExtType;
+
+  // If the mask is known to be all ones, optimize to an unmasked intrinsic;
+  // the selection of the masked intrinsics doesn't do this for us.
+  bool IsUnmasked = ISD::isConstantSplatVectorAllOnes(Mask.getNode());
+
+  MVT ContainerVT = VT;
+  if (VT.isFixedLengthVector()) {
+    ContainerVT = getContainerForFixedLengthVector(VT);
+    IndexVT = MVT::getVectorVT(IndexVT.getVectorElementType(),
+                               ContainerVT.getVectorElementCount());
+
+    Index = convertToScalableVector(IndexVT, Index, DAG, Subtarget);
+
+    if (!IsUnmasked) {
+      MVT MaskVT = getMaskTypeFor(ContainerVT);
+      Mask = convertToScalableVector(MaskVT, Mask, DAG, Subtarget);
+      PassThru = convertToScalableVector(ContainerVT, PassThru, DAG, Subtarget);
+    }
+  }
+
+  if (!VL)
+    VL = getDefaultVLOps(VT, ContainerVT, DL, DAG, Subtarget).second;
+
+  if (XLenVT == MVT::i32 && IndexVT.getVectorElementType().bitsGT(XLenVT)) {
+    IndexVT = IndexVT.changeVectorElementType(XLenVT);
+    SDValue TrueMask = DAG.getNode(RISCVISD::VMSET_VL, DL, Mask.getValueType(),
+                                   VL);
+    Index = DAG.getNode(RISCVISD::TRUNCATE_VECTOR_VL, DL, IndexVT, Index,
+                        TrueMask, VL);
+  }
+
+  unsigned IntID =
+      IsUnmasked ? Intrinsic::riscv_vluxei : Intrinsic::riscv_vluxei_mask;
+  SmallVector<SDValue, 8> Ops{Chain, DAG.getTargetConstant(IntID, DL, XLenVT)};
+  if (IsUnmasked)
+    Ops.push_back(DAG.getUNDEF(ContainerVT));
+  else
+    Ops.push_back(PassThru);
+  Ops.push_back(BasePtr);
+  Ops.push_back(Index);
+  if (!IsUnmasked)
+    Ops.push_back(Mask);
+  Ops.push_back(VL);
+  if (!IsUnmasked)
+    Ops.push_back(DAG.getTargetConstant(RISCVII::TAIL_AGNOSTIC, DL, XLenVT));
+
+  SDVTList VTs = DAG.getVTList({ContainerVT, MVT::Other});
+  SDValue Result =
+      DAG.getMemIntrinsicNode(ISD::INTRINSIC_W_CHAIN, DL, VTs, Ops, MemVT, MMO);
+  Chain = Result.getValue(1);
+
+  if (VT.isFixedLengthVector())
+    Result = convertFromScalableVector(VT, Result, DAG, Subtarget);
+
+  return DAG.getMergeValues({Result, Chain}, DL);
+}
+
+// Custom lower MSCATTER/VP_SCATTER to a legalized form for RVV. It will then be
+// matched to a RVV indexed store. The RVV indexed store instructions only
+// support the "unsigned unscaled" addressing mode; indices are implicitly
+// zero-extended or truncated to XLEN and are treated as byte offsets. Any
+// signed or scaled indexing is extended to the XLEN value type and scaled
+// accordingly.
+SDValue RISCVTargetLowering::lowerMaskedScatter(SDValue Op,
+                                                SelectionDAG &DAG) const {
+  SDLoc DL(Op);
+  const auto *MemSD = cast<MemSDNode>(Op.getNode());
+  EVT MemVT = MemSD->getMemoryVT();
+  MachineMemOperand *MMO = MemSD->getMemOperand();
+  SDValue Chain = MemSD->getChain();
+  SDValue BasePtr = MemSD->getBasePtr();
+
+  bool IsTruncatingStore = false;
+  SDValue Index, Mask, Val, VL;
+
+  if (auto *VPSN = dyn_cast<VPScatterSDNode>(Op.getNode())) {
+    Index = VPSN->getIndex();
+    Mask = VPSN->getMask();
+    Val = VPSN->getValue();
+    VL = VPSN->getVectorLength();
+    // VP doesn't support truncating stores.
+    IsTruncatingStore = false;
+  } else {
+    // Else it must be a MSCATTER.
+    auto *MSN = cast<MaskedScatterSDNode>(Op.getNode());
+    Index = MSN->getIndex();
+    Mask = MSN->getMask();
+    Val = MSN->getValue();
+    IsTruncatingStore = MSN->isTruncatingStore();
+  }
+
+  MVT VT = Val.getSimpleValueType();
   MVT IndexVT = Index.getSimpleValueType();
   MVT XLenVT = Subtarget.getXLenVT();
 
   assert(VT.getVectorElementCount() == IndexVT.getVectorElementCount() &&
          "Unexpected VTs!");
-  assert(MSN->getBasePtr().getSimpleValueType() == XLenVT &&
-         "Unexpected pointer type");
+  assert(BasePtr.getSimpleValueType() == XLenVT && "Unexpected pointer type");
   // Targets have to explicitly opt-in for extending vector loads and
   // truncating vector stores.
-  assert(!MSN->isTruncatingStore() && "Unexpected extending MSCATTER");
+  assert(!IsTruncatingStore && "Unexpected truncating MSCATTER/VP_SCATTER");
+  (void)IsTruncatingStore;
 
   // If the mask is known to be all ones, optimize to an unmasked intrinsic;
   // the selection of the masked intrinsics doesn't do this for us.
   bool IsUnmasked = ISD::isConstantSplatVectorAllOnes(Mask.getNode());
 
-  SDValue VL;
+  MVT ContainerVT = VT;
   if (VT.isFixedLengthVector()) {
-    // We need to use the larger of the value and index type to determine the
-    // scalable type to use so we don't increase LMUL for any operand/result.
-    MVT ContainerVT;
-    if (VT.bitsGE(IndexVT)) {
-      ContainerVT = getContainerForFixedLengthVector(VT);
-      IndexVT = MVT::getVectorVT(IndexVT.getVectorElementType(),
-                                 ContainerVT.getVectorElementCount());
-    } else {
-      IndexVT = getContainerForFixedLengthVector(IndexVT);
-      ContainerVT = MVT::getVectorVT(VT.getVectorElementType(),
-                                     IndexVT.getVectorElementCount());
-    }
+    ContainerVT = getContainerForFixedLengthVector(VT);
+    IndexVT = MVT::getVectorVT(IndexVT.getVectorElementType(),
+                               ContainerVT.getVectorElementCount());
 
     Index = convertToScalableVector(IndexVT, Index, DAG, Subtarget);
     Val = convertToScalableVector(ContainerVT, Val, DAG, Subtarget);
 
     if (!IsUnmasked) {
-      MVT MaskVT =
-          MVT::getVectorVT(MVT::i1, ContainerVT.getVectorElementCount());
+      MVT MaskVT = getMaskTypeFor(ContainerVT);
       Mask = convertToScalableVector(MaskVT, Mask, DAG, Subtarget);
     }
+  }
 
-    VL = DAG.getConstant(VT.getVectorNumElements(), DL, XLenVT);
-  } else
-    VL = DAG.getRegister(RISCV::X0, XLenVT);
+  if (!VL)
+    VL = getDefaultVLOps(VT, ContainerVT, DL, DAG, Subtarget).second;
+
+  if (XLenVT == MVT::i32 && IndexVT.getVectorElementType().bitsGT(XLenVT)) {
+    IndexVT = IndexVT.changeVectorElementType(XLenVT);
+    SDValue TrueMask = DAG.getNode(RISCVISD::VMSET_VL, DL, Mask.getValueType(),
+                                   VL);
+    Index = DAG.getNode(RISCVISD::TRUNCATE_VECTOR_VL, DL, IndexVT, Index,
+                        TrueMask, VL);
+  }
 
   unsigned IntID =
       IsUnmasked ? Intrinsic::riscv_vsoxei : Intrinsic::riscv_vsoxei_mask;
-  SmallVector<SDValue, 8> Ops{MSN->getChain(),
-                              DAG.getTargetConstant(IntID, DL, XLenVT)};
+  SmallVector<SDValue, 8> Ops{Chain, DAG.getTargetConstant(IntID, DL, XLenVT)};
   Ops.push_back(Val);
-  Ops.push_back(MSN->getBasePtr());
+  Ops.push_back(BasePtr);
   Ops.push_back(Index);
   if (!IsUnmasked)
     Ops.push_back(Mask);
   Ops.push_back(VL);
 
-  return DAG.getMemIntrinsicNode(ISD::INTRINSIC_VOID, DL, MSN->getVTList(), Ops,
-                                 MSN->getMemoryVT(), MSN->getMemOperand());
+  return DAG.getMemIntrinsicNode(ISD::INTRINSIC_VOID, DL,
+                                 DAG.getVTList(MVT::Other), Ops, MemVT, MMO);
 }
 
 SDValue RISCVTargetLowering::lowerGET_ROUNDING(SDValue Op,
@@ -4758,7 +7536,7 @@ SDValue RISCVTargetLowering::lowerGET_ROUNDING(SDValue Op,
   const MVT XLenVT = Subtarget.getXLenVT();
   SDLoc DL(Op);
   SDValue Chain = Op->getOperand(0);
-  SDValue SysRegNo = DAG.getConstant(
+  SDValue SysRegNo = DAG.getTargetConstant(
       RISCVSysReg::lookupSysRegByName("FRM")->Encoding, DL, XLenVT);
   SDVTList VTs = DAG.getVTList(XLenVT, MVT::Other);
   SDValue RM = DAG.getNode(RISCVISD::READ_CSR, DL, VTs, Chain, SysRegNo);
@@ -4790,7 +7568,7 @@ SDValue RISCVTargetLowering::lowerSET_ROUNDING(SDValue Op,
   SDLoc DL(Op);
   SDValue Chain = Op->getOperand(0);
   SDValue RMValue = Op->getOperand(1);
-  SDValue SysRegNo = DAG.getConstant(
+  SDValue SysRegNo = DAG.getTargetConstant(
       RISCVSysReg::lookupSysRegByName("FRM")->Encoding, DL, XLenVT);
 
   // Encoding used for rounding mode in RISCV differs from that used in
@@ -4814,6 +7592,17 @@ SDValue RISCVTargetLowering::lowerSET_ROUNDING(SDValue Op,
                      RMValue);
 }
 
+SDValue RISCVTargetLowering::lowerEH_DWARF_CFA(SDValue Op,
+                                               SelectionDAG &DAG) const {
+  MachineFunction &MF = DAG.getMachineFunction();
+
+  bool isRISCV64 = Subtarget.is64Bit();
+  EVT PtrVT = getPointerTy(DAG.getDataLayout());
+
+  int FI = MF.getFrameInfo().CreateFixedObject(isRISCV64 ? 8 : 4, 0, false);
+  return DAG.getFrameIndex(FI, PtrVT);
+}
+
 // Returns the opcode of the target-specific SDNode that implements the 32-bit
 // form of the given Opcode.
 static RISCVISD::NodeType getRISCVWOpcode(unsigned Opcode) {
@@ -4836,10 +7625,6 @@ static RISCVISD::NodeType getRISCVWOpcode(unsigned Opcode) {
     return RISCVISD::ROLW;
   case ISD::ROTR:
     return RISCVISD::RORW;
-  case RISCVISD::GREV:
-    return RISCVISD::GREVW;
-  case RISCVISD::GORC:
-    return RISCVISD::GORCW;
   }
 }
 
@@ -4890,13 +7675,34 @@ void RISCVTargetLowering::ReplaceNodeResults(SDNode *N,
     SDValue Op0 = IsStrict ? N->getOperand(1) : N->getOperand(0);
     if (getTypeAction(*DAG.getContext(), Op0.getValueType()) !=
         TargetLowering::TypeSoftenFloat) {
-      // FIXME: Support strict FP.
-      if (IsStrict)
-        return;
       if (!isTypeLegal(Op0.getValueType()))
         return;
+      if (IsStrict) {
+        SDValue Chain = N->getOperand(0);
+        // In absense of Zfh, promote f16 to f32, then convert.
+        if (Op0.getValueType() == MVT::f16 && !Subtarget.hasStdExtZfh()) {
+          Op0 = DAG.getNode(ISD::STRICT_FP_EXTEND, DL, {MVT::f32, MVT::Other},
+                            {Chain, Op0});
+          Chain = Op0.getValue(1);
+        }
+        unsigned Opc = IsSigned ? RISCVISD::STRICT_FCVT_W_RV64
+                                : RISCVISD::STRICT_FCVT_WU_RV64;
+        SDVTList VTs = DAG.getVTList(MVT::i64, MVT::Other);
+        SDValue Res = DAG.getNode(
+            Opc, DL, VTs, Chain, Op0,
+            DAG.getTargetConstant(RISCVFPRndMode::RTZ, DL, MVT::i64));
+        Results.push_back(DAG.getNode(ISD::TRUNCATE, DL, MVT::i32, Res));
+        Results.push_back(Res.getValue(1));
+        return;
+      }
+      // In absense of Zfh, promote f16 to f32, then convert.
+      if (Op0.getValueType() == MVT::f16 && !Subtarget.hasStdExtZfh())
+        Op0 = DAG.getNode(ISD::FP_EXTEND, DL, MVT::f32, Op0);
+
       unsigned Opc = IsSigned ? RISCVISD::FCVT_W_RV64 : RISCVISD::FCVT_WU_RV64;
-      SDValue Res = DAG.getNode(Opc, DL, MVT::i64, Op0);
+      SDValue Res =
+          DAG.getNode(Opc, DL, MVT::i64, Op0,
+                      DAG.getTargetConstant(RISCVFPRndMode::RTZ, DL, MVT::i64));
       Results.push_back(DAG.getNode(ISD::TRUNCATE, DL, MVT::i32, Res));
       return;
     }
@@ -4934,6 +7740,22 @@ void RISCVTargetLowering::ReplaceNodeResults(SDNode *N,
     Results.push_back(RCW.getValue(2));
     break;
   }
+  case ISD::LOAD: {
+    if (!ISD::isNON_EXTLoad(N))
+      return;
+
+    // Use a SEXTLOAD instead of the default EXTLOAD. Similar to the
+    // sext_inreg we emit for ADD/SUB/MUL/SLLI.
+    LoadSDNode *Ld = cast<LoadSDNode>(N);
+
+    SDLoc dl(N);
+    SDValue Res = DAG.getExtLoad(ISD::SEXTLOAD, dl, MVT::i64, Ld->getChain(),
+                                 Ld->getBasePtr(), Ld->getMemoryVT(),
+                                 Ld->getMemOperand());
+    Results.push_back(DAG.getNode(ISD::TRUNCATE, dl, MVT::i32, Res));
+    Results.push_back(Res.getValue(1));
+    return;
+  }
   case ISD::MUL: {
     unsigned Size = N->getSimpleValueType(0).getSizeInBits();
     unsigned XLen = Subtarget.getXLen();
@@ -4971,14 +7793,12 @@ void RISCVTargetLowering::ReplaceNodeResults(SDNode *N,
 
       return;
     }
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   }
   case ISD::ADD:
   case ISD::SUB:
     assert(N->getValueType(0) == MVT::i32 && Subtarget.is64Bit() &&
            "Unexpected custom legalisation");
-    if (N->getOperand(1).getOpcode() == ISD::Constant)
-      return;
     Results.push_back(customLegalizeToWOpWithSExt(N, DAG));
     break;
   case ISD::SHL:
@@ -4986,9 +7806,30 @@ void RISCVTargetLowering::ReplaceNodeResults(SDNode *N,
   case ISD::SRL:
     assert(N->getValueType(0) == MVT::i32 && Subtarget.is64Bit() &&
            "Unexpected custom legalisation");
-    if (N->getOperand(1).getOpcode() == ISD::Constant)
-      return;
-    Results.push_back(customLegalizeToWOp(N, DAG));
+    if (N->getOperand(1).getOpcode() != ISD::Constant) {
+      // If we can use a BSET instruction, allow default promotion to apply.
+      if (N->getOpcode() == ISD::SHL && Subtarget.hasStdExtZbs() &&
+          isOneConstant(N->getOperand(0)))
+        break;
+      Results.push_back(customLegalizeToWOp(N, DAG));
+      break;
+    }
+
+    // Custom legalize ISD::SHL by placing a SIGN_EXTEND_INREG after. This is
+    // similar to customLegalizeToWOpWithSExt, but we must zero_extend the
+    // shift amount.
+    if (N->getOpcode() == ISD::SHL) {
+      SDLoc DL(N);
+      SDValue NewOp0 =
+          DAG.getNode(ISD::ANY_EXTEND, DL, MVT::i64, N->getOperand(0));
+      SDValue NewOp1 =
+          DAG.getNode(ISD::ZERO_EXTEND, DL, MVT::i64, N->getOperand(1));
+      SDValue NewWOp = DAG.getNode(ISD::SHL, DL, MVT::i64, NewOp0, NewOp1);
+      SDValue NewRes = DAG.getNode(ISD::SIGN_EXTEND_INREG, DL, MVT::i64, NewWOp,
+                                   DAG.getValueType(MVT::i32));
+      Results.push_back(DAG.getNode(ISD::TRUNCATE, DL, MVT::i32, NewRes));
+    }
+
     break;
   case ISD::ROTL:
   case ISD::ROTR:
@@ -5021,8 +7862,9 @@ void RISCVTargetLowering::ReplaceNodeResults(SDNode *N,
            "Unexpected custom legalisation");
     // Don't promote division/remainder by constant since we should expand those
     // to multiply by magic constant.
-    // FIXME: What if the expansion is disabled for minsize.
-    if (N->getOperand(1).getOpcode() == ISD::Constant)
+    AttributeList Attr = DAG.getMachineFunction().getFunction().getAttributes();
+    if (N->getOperand(1).getOpcode() == ISD::Constant &&
+        !isIntDivCheap(N->getValueType(0), Attr))
       return;
 
     // If the input is i32, use ANY_EXTEND since the W instructions don't read
@@ -5049,12 +7891,23 @@ void RISCVTargetLowering::ReplaceNodeResults(SDNode *N,
     Res = DAG.getNode(ISD::SIGN_EXTEND_INREG, DL, MVT::i64, Res,
                       DAG.getValueType(MVT::i32));
 
-    // Sign extend the LHS and perform an unsigned compare with the ADDW result.
-    // Since the inputs are sign extended from i32, this is equivalent to
-    // comparing the lower 32 bits.
-    LHS = DAG.getNode(ISD::SIGN_EXTEND, DL, MVT::i64, N->getOperand(0));
-    SDValue Overflow = DAG.getSetCC(DL, N->getValueType(1), Res, LHS,
-                                    IsAdd ? ISD::SETULT : ISD::SETUGT);
+    SDValue Overflow;
+    if (IsAdd && isOneConstant(RHS)) {
+      // Special case uaddo X, 1 overflowed if the addition result is 0.
+      // The general case (X + C) < C is not necessarily beneficial. Although we
+      // reduce the live range of X, we may introduce the materialization of
+      // constant C, especially when the setcc result is used by branch. We have
+      // no compare with constant and branch instructions.
+      Overflow = DAG.getSetCC(DL, N->getValueType(1), Res,
+                              DAG.getConstant(0, DL, MVT::i64), ISD::SETEQ);
+    } else {
+      // Sign extend the LHS and perform an unsigned compare with the ADDW
+      // result. Since the inputs are sign extended from i32, this is equivalent
+      // to comparing the lower 32 bits.
+      LHS = DAG.getNode(ISD::SIGN_EXTEND, DL, MVT::i64, N->getOperand(0));
+      Overflow = DAG.getSetCC(DL, N->getValueType(1), Res, LHS,
+                              IsAdd ? ISD::SETULT : ISD::SETUGT);
+    }
 
     Results.push_back(DAG.getNode(ISD::TRUNCATE, DL, MVT::i32, Res));
     Results.push_back(Overflow);
@@ -5082,13 +7935,51 @@ void RISCVTargetLowering::ReplaceNodeResults(SDNode *N,
     Results.push_back(expandAddSubSat(N, DAG));
     return;
   }
+  case ISD::ABS: {
+    assert(N->getValueType(0) == MVT::i32 && Subtarget.is64Bit() &&
+           "Unexpected custom legalisation");
+
+    if (Subtarget.hasStdExtZbb()) {
+      // Emit a special ABSW node that will be expanded to NEGW+MAX at isel.
+      // This allows us to remember that the result is sign extended. Expanding
+      // to NEGW+MAX here requires a Freeze which breaks ComputeNumSignBits.
+      SDValue Src = DAG.getNode(ISD::SIGN_EXTEND, DL, MVT::i64,
+                                N->getOperand(0));
+      SDValue Abs = DAG.getNode(RISCVISD::ABSW, DL, MVT::i64, Src);
+      Results.push_back(DAG.getNode(ISD::TRUNCATE, DL, MVT::i32, Abs));
+      return;
+    }
+
+    // Expand abs to Y = (sraiw X, 31); subw(xor(X, Y), Y)
+    SDValue Src = DAG.getNode(ISD::ANY_EXTEND, DL, MVT::i64, N->getOperand(0));
+
+    // Freeze the source so we can increase it's use count.
+    Src = DAG.getFreeze(Src);
+
+    // Copy sign bit to all bits using the sraiw pattern.
+    SDValue SignFill = DAG.getNode(ISD::SIGN_EXTEND_INREG, DL, MVT::i64, Src,
+                                   DAG.getValueType(MVT::i32));
+    SignFill = DAG.getNode(ISD::SRA, DL, MVT::i64, SignFill,
+                           DAG.getConstant(31, DL, MVT::i64));
+
+    SDValue NewRes = DAG.getNode(ISD::XOR, DL, MVT::i64, Src, SignFill);
+    NewRes = DAG.getNode(ISD::SUB, DL, MVT::i64, NewRes, SignFill);
+
+    // NOTE: The result is only required to be anyextended, but sext is
+    // consistent with type legalization of sub.
+    NewRes = DAG.getNode(ISD::SIGN_EXTEND_INREG, DL, MVT::i64, NewRes,
+                         DAG.getValueType(MVT::i32));
+    Results.push_back(DAG.getNode(ISD::TRUNCATE, DL, MVT::i32, NewRes));
+    return;
+  }
   case ISD::BITCAST: {
     EVT VT = N->getValueType(0);
     assert(VT.isInteger() && !VT.isVector() && "Unexpected VT!");
     SDValue Op0 = N->getOperand(0);
     EVT Op0VT = Op0.getValueType();
     MVT XLenVT = Subtarget.getXLenVT();
-    if (VT == MVT::i16 && Op0VT == MVT::f16 && Subtarget.hasStdExtZfh()) {
+    if (VT == MVT::i16 && Op0VT == MVT::f16 &&
+        Subtarget.hasStdExtZfhOrZfhmin()) {
       SDValue FPConv = DAG.getNode(RISCVISD::FMV_X_ANYEXTH, DL, XLenVT, Op0);
       Results.push_back(DAG.getNode(ISD::TRUNCATE, DL, MVT::i16, FPConv));
     } else if (VT == MVT::i32 && Op0VT == MVT::f32 && Subtarget.is64Bit() &&
@@ -5102,85 +7993,26 @@ void RISCVTargetLowering::ReplaceNodeResults(SDNode *N,
       // scalar types in order to improve codegen. Bitcast the vector to a
       // one-element vector type whose element type is the same as the result
       // type, and extract the first element.
-      LLVMContext &Context = *DAG.getContext();
-      SDValue BVec = DAG.getBitcast(EVT::getVectorVT(Context, VT, 1), Op0);
-      Results.push_back(DAG.getNode(ISD::EXTRACT_VECTOR_ELT, DL, VT, BVec,
-                                    DAG.getConstant(0, DL, XLenVT)));
+      EVT BVT = EVT::getVectorVT(*DAG.getContext(), VT, 1);
+      if (isTypeLegal(BVT)) {
+        SDValue BVec = DAG.getBitcast(BVT, Op0);
+        Results.push_back(DAG.getNode(ISD::EXTRACT_VECTOR_ELT, DL, VT, BVec,
+                                      DAG.getConstant(0, DL, XLenVT)));
+      }
     }
     break;
   }
-  case RISCVISD::GREV:
-  case RISCVISD::GORC: {
-    assert(N->getValueType(0) == MVT::i32 && Subtarget.is64Bit() &&
-           "Unexpected custom legalisation");
-    assert(isa<ConstantSDNode>(N->getOperand(1)) && "Expected constant");
-    // This is similar to customLegalizeToWOp, except that we pass the second
-    // operand (a TargetConstant) straight through: it is already of type
-    // XLenVT.
-    RISCVISD::NodeType WOpcode = getRISCVWOpcode(N->getOpcode());
-    SDValue NewOp0 =
-        DAG.getNode(ISD::ANY_EXTEND, DL, MVT::i64, N->getOperand(0));
-    SDValue NewOp1 =
-        DAG.getNode(ISD::ANY_EXTEND, DL, MVT::i64, N->getOperand(1));
-    SDValue NewRes = DAG.getNode(WOpcode, DL, MVT::i64, NewOp0, NewOp1);
-    // ReplaceNodeResults requires we maintain the same type for the return
-    // value.
-    Results.push_back(DAG.getNode(ISD::TRUNCATE, DL, MVT::i32, NewRes));
-    break;
-  }
-  case RISCVISD::SHFL: {
-    // There is no SHFLIW instruction, but we can just promote the operation.
-    assert(N->getValueType(0) == MVT::i32 && Subtarget.is64Bit() &&
-           "Unexpected custom legalisation");
-    assert(isa<ConstantSDNode>(N->getOperand(1)) && "Expected constant");
-    SDValue NewOp0 =
-        DAG.getNode(ISD::ANY_EXTEND, DL, MVT::i64, N->getOperand(0));
-    SDValue NewOp1 =
-        DAG.getNode(ISD::ANY_EXTEND, DL, MVT::i64, N->getOperand(1));
-    SDValue NewRes = DAG.getNode(RISCVISD::SHFL, DL, MVT::i64, NewOp0, NewOp1);
-    // ReplaceNodeResults requires we maintain the same type for the return
-    // value.
-    Results.push_back(DAG.getNode(ISD::TRUNCATE, DL, MVT::i32, NewRes));
-    break;
-  }
-  case ISD::BSWAP:
-  case ISD::BITREVERSE: {
+  case RISCVISD::BREV8: {
     MVT VT = N->getSimpleValueType(0);
     MVT XLenVT = Subtarget.getXLenVT();
-    assert((VT == MVT::i8 || VT == MVT::i16 ||
-            (VT == MVT::i32 && Subtarget.is64Bit())) &&
-           Subtarget.hasStdExtZbp() && "Unexpected custom legalisation");
-    SDValue NewOp0 = DAG.getNode(ISD::ANY_EXTEND, DL, XLenVT, N->getOperand(0));
-    unsigned Imm = VT.getSizeInBits() - 1;
-    // If this is BSWAP rather than BITREVERSE, clear the lower 3 bits.
-    if (N->getOpcode() == ISD::BSWAP)
-      Imm &= ~0x7U;
-    unsigned Opc = Subtarget.is64Bit() ? RISCVISD::GREVW : RISCVISD::GREV;
-    SDValue GREVI =
-        DAG.getNode(Opc, DL, XLenVT, NewOp0, DAG.getConstant(Imm, DL, XLenVT));
+    assert((VT == MVT::i16 || (VT == MVT::i32 && Subtarget.is64Bit())) &&
+           "Unexpected custom legalisation");
+    assert(Subtarget.hasStdExtZbkb() && "Unexpected extension");
+    SDValue NewOp = DAG.getNode(ISD::ANY_EXTEND, DL, XLenVT, N->getOperand(0));
+    SDValue NewRes = DAG.getNode(N->getOpcode(), DL, XLenVT, NewOp);
     // ReplaceNodeResults requires we maintain the same type for the return
     // value.
-    Results.push_back(DAG.getNode(ISD::TRUNCATE, DL, VT, GREVI));
-    break;
-  }
-  case ISD::FSHL:
-  case ISD::FSHR: {
-    assert(N->getValueType(0) == MVT::i32 && Subtarget.is64Bit() &&
-           Subtarget.hasStdExtZbt() && "Unexpected custom legalisation");
-    SDValue NewOp0 =
-        DAG.getNode(ISD::ANY_EXTEND, DL, MVT::i64, N->getOperand(0));
-    SDValue NewOp1 =
-        DAG.getNode(ISD::ANY_EXTEND, DL, MVT::i64, N->getOperand(1));
-    SDValue NewOp2 =
-        DAG.getNode(ISD::ANY_EXTEND, DL, MVT::i64, N->getOperand(2));
-    // FSLW/FSRW take a 6 bit shift amount but i32 FSHL/FSHR only use 5 bits.
-    // Mask the shift amount to 5 bits.
-    NewOp2 = DAG.getNode(ISD::AND, DL, MVT::i64, NewOp2,
-                         DAG.getConstant(0x1f, DL, MVT::i64));
-    unsigned Opc =
-        N->getOpcode() == ISD::FSHL ? RISCVISD::FSLW : RISCVISD::FSRW;
-    SDValue NewOp = DAG.getNode(Opc, DL, MVT::i64, NewOp0, NewOp1, NewOp2);
-    Results.push_back(DAG.getNode(ISD::TRUNCATE, DL, MVT::i32, NewOp));
+    Results.push_back(DAG.getNode(ISD::TRUNCATE, DL, VT, NewRes));
     break;
   }
   case ISD::EXTRACT_VECTOR_ELT: {
@@ -5215,15 +8047,13 @@ void RISCVTargetLowering::ReplaceNodeResults(SDNode *N,
     MVT XLenVT = Subtarget.getXLenVT();
 
     // Use a VL of 1 to avoid processing more elements than we need.
-    MVT MaskVT = MVT::getVectorVT(MVT::i1, VecVT.getVectorElementCount());
-    SDValue VL = DAG.getConstant(1, DL, XLenVT);
-    SDValue Mask = DAG.getNode(RISCVISD::VMSET_VL, DL, MaskVT, VL);
+    auto [Mask, VL] = getDefaultVLOps(1, ContainerVT, DL, DAG, Subtarget);
 
     // Unless the index is known to be 0, we must slide the vector down to get
     // the desired element into index 0.
     if (!isNullConstant(Idx)) {
-      Vec = DAG.getNode(RISCVISD::VSLIDEDOWN_VL, DL, ContainerVT,
-                        DAG.getUNDEF(ContainerVT), Vec, Idx, Mask, VL);
+      Vec = getVSlidedown(DAG, Subtarget, DL, ContainerVT,
+                          DAG.getUNDEF(ContainerVT), Vec, Idx, Mask, VL);
     }
 
     // Extract the lower XLEN bits of the correct vector element.
@@ -5232,9 +8062,11 @@ void RISCVTargetLowering::ReplaceNodeResults(SDNode *N,
     // To extract the upper XLEN bits of the vector element, shift the first
     // element right by 32 bits and re-extract the lower XLEN bits.
     SDValue ThirtyTwoV = DAG.getNode(RISCVISD::VMV_V_X_VL, DL, ContainerVT,
+                                     DAG.getUNDEF(ContainerVT),
                                      DAG.getConstant(32, DL, XLenVT), VL);
-    SDValue LShr32 = DAG.getNode(RISCVISD::SRL_VL, DL, ContainerVT, Vec,
-                                 ThirtyTwoV, Mask, VL);
+    SDValue LShr32 =
+        DAG.getNode(RISCVISD::SRL_VL, DL, ContainerVT, Vec, ThirtyTwoV,
+                    DAG.getUNDEF(ContainerVT), Mask, VL);
 
     SDValue EltHi = DAG.getNode(RISCVISD::VMV_X_S, DL, XLenVT, LShr32);
 
@@ -5248,66 +8080,12 @@ void RISCVTargetLowering::ReplaceNodeResults(SDNode *N,
       llvm_unreachable(
           "Don't know how to custom type legalize this intrinsic!");
     case Intrinsic::riscv_orc_b: {
-      // Lower to the GORCI encoding for orc.b with the operand extended.
       SDValue NewOp =
           DAG.getNode(ISD::ANY_EXTEND, DL, MVT::i64, N->getOperand(1));
-      // If Zbp is enabled, use GORCIW which will sign extend the result.
-      unsigned Opc =
-          Subtarget.hasStdExtZbp() ? RISCVISD::GORCW : RISCVISD::GORC;
-      SDValue Res = DAG.getNode(Opc, DL, MVT::i64, NewOp,
-                                DAG.getConstant(7, DL, MVT::i64));
+      SDValue Res = DAG.getNode(RISCVISD::ORC_B, DL, MVT::i64, NewOp);
       Results.push_back(DAG.getNode(ISD::TRUNCATE, DL, MVT::i32, Res));
       return;
     }
-    case Intrinsic::riscv_grev:
-    case Intrinsic::riscv_gorc: {
-      assert(N->getValueType(0) == MVT::i32 && Subtarget.is64Bit() &&
-             "Unexpected custom legalisation");
-      SDValue NewOp1 =
-          DAG.getNode(ISD::ANY_EXTEND, DL, MVT::i64, N->getOperand(1));
-      SDValue NewOp2 =
-          DAG.getNode(ISD::ANY_EXTEND, DL, MVT::i64, N->getOperand(2));
-      unsigned Opc =
-          IntNo == Intrinsic::riscv_grev ? RISCVISD::GREVW : RISCVISD::GORCW;
-      SDValue Res = DAG.getNode(Opc, DL, MVT::i64, NewOp1, NewOp2);
-      Results.push_back(DAG.getNode(ISD::TRUNCATE, DL, MVT::i32, Res));
-      break;
-    }
-    case Intrinsic::riscv_shfl:
-    case Intrinsic::riscv_unshfl: {
-      assert(N->getValueType(0) == MVT::i32 && Subtarget.is64Bit() &&
-             "Unexpected custom legalisation");
-      SDValue NewOp1 =
-          DAG.getNode(ISD::ANY_EXTEND, DL, MVT::i64, N->getOperand(1));
-      SDValue NewOp2 =
-          DAG.getNode(ISD::ANY_EXTEND, DL, MVT::i64, N->getOperand(2));
-      unsigned Opc =
-          IntNo == Intrinsic::riscv_shfl ? RISCVISD::SHFLW : RISCVISD::UNSHFLW;
-      if (isa<ConstantSDNode>(N->getOperand(2))) {
-        NewOp2 = DAG.getNode(ISD::AND, DL, MVT::i64, NewOp2,
-                             DAG.getConstant(0xf, DL, MVT::i64));
-        Opc =
-            IntNo == Intrinsic::riscv_shfl ? RISCVISD::SHFL : RISCVISD::UNSHFL;
-      }
-      SDValue Res = DAG.getNode(Opc, DL, MVT::i64, NewOp1, NewOp2);
-      Results.push_back(DAG.getNode(ISD::TRUNCATE, DL, MVT::i32, Res));
-      break;
-    }
-    case Intrinsic::riscv_bcompress:
-    case Intrinsic::riscv_bdecompress: {
-      assert(N->getValueType(0) == MVT::i32 && Subtarget.is64Bit() &&
-             "Unexpected custom legalisation");
-      SDValue NewOp1 =
-          DAG.getNode(ISD::ANY_EXTEND, DL, MVT::i64, N->getOperand(1));
-      SDValue NewOp2 =
-          DAG.getNode(ISD::ANY_EXTEND, DL, MVT::i64, N->getOperand(2));
-      unsigned Opc = IntNo == Intrinsic::riscv_bcompress
-                         ? RISCVISD::BCOMPRESSW
-                         : RISCVISD::BDECOMPRESSW;
-      SDValue Res = DAG.getNode(Opc, DL, MVT::i64, NewOp1, NewOp2);
-      Results.push_back(DAG.getNode(ISD::TRUNCATE, DL, MVT::i32, Res));
-      break;
-    }
     case Intrinsic::riscv_vmv_x_s: {
       EVT VT = N->getValueType(0);
       MVT XLenVT = Subtarget.getXLenVT();
@@ -5331,13 +8109,13 @@ void RISCVTargetLowering::ReplaceNodeResults(SDNode *N,
 
       // To extract the upper XLEN bits of the vector element, shift the first
       // element right by 32 bits and re-extract the lower XLEN bits.
-      SDValue VL = DAG.getConstant(1, DL, XLenVT);
-      MVT MaskVT = MVT::getVectorVT(MVT::i1, VecVT.getVectorElementCount());
-      SDValue Mask = DAG.getNode(RISCVISD::VMSET_VL, DL, MaskVT, VL);
-      SDValue ThirtyTwoV = DAG.getNode(RISCVISD::VMV_V_X_VL, DL, VecVT,
-                                       DAG.getConstant(32, DL, XLenVT), VL);
-      SDValue LShr32 =
-          DAG.getNode(RISCVISD::SRL_VL, DL, VecVT, Vec, ThirtyTwoV, Mask, VL);
+      auto [Mask, VL] = getDefaultVLOps(1, VecVT, DL, DAG, Subtarget);
+
+      SDValue ThirtyTwoV =
+          DAG.getNode(RISCVISD::VMV_V_X_VL, DL, VecVT, DAG.getUNDEF(VecVT),
+                      DAG.getConstant(32, DL, XLenVT), VL);
+      SDValue LShr32 = DAG.getNode(RISCVISD::SRL_VL, DL, VecVT, Vec, ThirtyTwoV,
+                                   DAG.getUNDEF(VecVT), Mask, VL);
       SDValue EltHi = DAG.getNode(RISCVISD::VMV_X_S, DL, XLenVT, LShr32);
 
       Results.push_back(
@@ -5358,9 +8136,20 @@ void RISCVTargetLowering::ReplaceNodeResults(SDNode *N,
     if (SDValue V = lowerVECREDUCE(SDValue(N, 0), DAG))
       Results.push_back(V);
     break;
-  case ISD::FLT_ROUNDS_: {
+  case ISD::VP_REDUCE_ADD:
+  case ISD::VP_REDUCE_AND:
+  case ISD::VP_REDUCE_OR:
+  case ISD::VP_REDUCE_XOR:
+  case ISD::VP_REDUCE_SMAX:
+  case ISD::VP_REDUCE_UMAX:
+  case ISD::VP_REDUCE_SMIN:
+  case ISD::VP_REDUCE_UMIN:
+    if (SDValue V = lowerVPREDUCE(SDValue(N, 0), DAG))
+      Results.push_back(V);
+    break;
+  case ISD::GET_ROUNDING: {
     SDVTList VTs = DAG.getVTList(Subtarget.getXLenVT(), MVT::Other);
-    SDValue Res = DAG.getNode(ISD::FLT_ROUNDS_, DL, VTs, N->getOperand(0));
+    SDValue Res = DAG.getNode(ISD::GET_ROUNDING, DL, VTs, N->getOperand(0));
     Results.push_back(Res.getValue(0));
     Results.push_back(Res.getValue(1));
     break;
@@ -5368,512 +8157,1947 @@ void RISCVTargetLowering::ReplaceNodeResults(SDNode *N,
   }
 }
 
-// A structure to hold one of the bit-manipulation patterns below. Together, a
-// SHL and non-SHL pattern may form a bit-manipulation pair on a single source:
-//   (or (and (shl x, 1), 0xAAAAAAAA),
-//       (and (srl x, 1), 0x55555555))
-struct RISCVBitmanipPat {
-  SDValue Op;
-  unsigned ShAmt;
-  bool IsSHL;
-
-  bool formsPairWith(const RISCVBitmanipPat &Other) const {
-    return Op == Other.Op && ShAmt == Other.ShAmt && IsSHL != Other.IsSHL;
-  }
-};
-
-// Matches patterns of the form
-//   (and (shl x, C2), (C1 << C2))
-//   (and (srl x, C2), C1)
-//   (shl (and x, C1), C2)
-//   (srl (and x, (C1 << C2)), C2)
-// Where C2 is a power of 2 and C1 has at least that many leading zeroes.
-// The expected masks for each shift amount are specified in BitmanipMasks where
-// BitmanipMasks[log2(C2)] specifies the expected C1 value.
-// The max allowed shift amount is either XLen/2 or XLen/4 determined by whether
-// BitmanipMasks contains 6 or 5 entries assuming that the maximum possible
-// XLen is 64.
-static Optional<RISCVBitmanipPat>
-matchRISCVBitmanipPat(SDValue Op, ArrayRef<uint64_t> BitmanipMasks) {
-  assert((BitmanipMasks.size() == 5 || BitmanipMasks.size() == 6) &&
-         "Unexpected number of masks");
-  Optional<uint64_t> Mask;
-  // Optionally consume a mask around the shift operation.
-  if (Op.getOpcode() == ISD::AND && isa<ConstantSDNode>(Op.getOperand(1))) {
-    Mask = Op.getConstantOperandVal(1);
-    Op = Op.getOperand(0);
-  }
-  if (Op.getOpcode() != ISD::SHL && Op.getOpcode() != ISD::SRL)
-    return None;
-  bool IsSHL = Op.getOpcode() == ISD::SHL;
-
-  if (!isa<ConstantSDNode>(Op.getOperand(1)))
-    return None;
-  uint64_t ShAmt = Op.getConstantOperandVal(1);
-
-  unsigned Width = Op.getValueType() == MVT::i64 ? 64 : 32;
-  if (ShAmt >= Width || !isPowerOf2_64(ShAmt))
-    return None;
-  // If we don't have enough masks for 64 bit, then we must be trying to
-  // match SHFL so we're only allowed to shift 1/4 of the width.
-  if (BitmanipMasks.size() == 5 && ShAmt >= (Width / 2))
-    return None;
-
-  SDValue Src = Op.getOperand(0);
-
-  // The expected mask is shifted left when the AND is found around SHL
-  // patterns.
-  //   ((x >> 1) & 0x55555555)
-  //   ((x << 1) & 0xAAAAAAAA)
-  bool SHLExpMask = IsSHL;
-
-  if (!Mask) {
-    // Sometimes LLVM keeps the mask as an operand of the shift, typically when
-    // the mask is all ones: consume that now.
-    if (Src.getOpcode() == ISD::AND && isa<ConstantSDNode>(Src.getOperand(1))) {
-      Mask = Src.getConstantOperandVal(1);
-      Src = Src.getOperand(0);
-      // The expected mask is now in fact shifted left for SRL, so reverse the
-      // decision.
-      //   ((x & 0xAAAAAAAA) >> 1)
-      //   ((x & 0x55555555) << 1)
-      SHLExpMask = !SHLExpMask;
-    } else {
-      // Use a default shifted mask of all-ones if there's no AND, truncated
-      // down to the expected width. This simplifies the logic later on.
-      Mask = maskTrailingOnes<uint64_t>(Width);
-      *Mask &= (IsSHL ? *Mask << ShAmt : *Mask >> ShAmt);
-    }
-  }
-
-  unsigned MaskIdx = Log2_32(ShAmt);
-  uint64_t ExpMask = BitmanipMasks[MaskIdx] & maskTrailingOnes<uint64_t>(Width);
-
-  if (SHLExpMask)
-    ExpMask <<= ShAmt;
-
-  if (Mask != ExpMask)
-    return None;
-
-  return RISCVBitmanipPat{Src, (unsigned)ShAmt, IsSHL};
-}
-
-// Matches any of the following bit-manipulation patterns:
-//   (and (shl x, 1), (0x55555555 << 1))
-//   (and (srl x, 1), 0x55555555)
-//   (shl (and x, 0x55555555), 1)
-//   (srl (and x, (0x55555555 << 1)), 1)
-// where the shift amount and mask may vary thus:
-//   [1]  = 0x55555555 / 0xAAAAAAAA
-//   [2]  = 0x33333333 / 0xCCCCCCCC
-//   [4]  = 0x0F0F0F0F / 0xF0F0F0F0
-//   [8]  = 0x00FF00FF / 0xFF00FF00
-//   [16] = 0x0000FFFF / 0xFFFFFFFF
-//   [32] = 0x00000000FFFFFFFF / 0xFFFFFFFF00000000 (for RV64)
-static Optional<RISCVBitmanipPat> matchGREVIPat(SDValue Op) {
-  // These are the unshifted masks which we use to match bit-manipulation
-  // patterns. They may be shifted left in certain circumstances.
-  static const uint64_t BitmanipMasks[] = {
-      0x5555555555555555ULL, 0x3333333333333333ULL, 0x0F0F0F0F0F0F0F0FULL,
-      0x00FF00FF00FF00FFULL, 0x0000FFFF0000FFFFULL, 0x00000000FFFFFFFFULL};
-
-  return matchRISCVBitmanipPat(Op, BitmanipMasks);
-}
-
-// Match the following pattern as a GREVI(W) operation
-//   (or (BITMANIP_SHL x), (BITMANIP_SRL x))
-static SDValue combineORToGREV(SDValue Op, SelectionDAG &DAG,
-                               const RISCVSubtarget &Subtarget) {
-  assert(Subtarget.hasStdExtZbp() && "Expected Zbp extenson");
-  EVT VT = Op.getValueType();
-
-  if (VT == Subtarget.getXLenVT() || (Subtarget.is64Bit() && VT == MVT::i32)) {
-    auto LHS = matchGREVIPat(Op.getOperand(0));
-    auto RHS = matchGREVIPat(Op.getOperand(1));
-    if (LHS && RHS && LHS->formsPairWith(*RHS)) {
-      SDLoc DL(Op);
-      return DAG.getNode(RISCVISD::GREV, DL, VT, LHS->Op,
-                         DAG.getConstant(LHS->ShAmt, DL, VT));
+// Try to fold (<bop> x, (reduction.<bop> vec, start))
+static SDValue combineBinOpToReduce(SDNode *N, SelectionDAG &DAG,
+                                    const RISCVSubtarget &Subtarget) {
+  auto BinOpToRVVReduce = [](unsigned Opc) {
+    switch (Opc) {
+    default:
+      llvm_unreachable("Unhandled binary to transfrom reduction");
+    case ISD::ADD:
+      return RISCVISD::VECREDUCE_ADD_VL;
+    case ISD::UMAX:
+      return RISCVISD::VECREDUCE_UMAX_VL;
+    case ISD::SMAX:
+      return RISCVISD::VECREDUCE_SMAX_VL;
+    case ISD::UMIN:
+      return RISCVISD::VECREDUCE_UMIN_VL;
+    case ISD::SMIN:
+      return RISCVISD::VECREDUCE_SMIN_VL;
+    case ISD::AND:
+      return RISCVISD::VECREDUCE_AND_VL;
+    case ISD::OR:
+      return RISCVISD::VECREDUCE_OR_VL;
+    case ISD::XOR:
+      return RISCVISD::VECREDUCE_XOR_VL;
+    case ISD::FADD:
+      return RISCVISD::VECREDUCE_FADD_VL;
+    case ISD::FMAXNUM:
+      return RISCVISD::VECREDUCE_FMAX_VL;
+    case ISD::FMINNUM:
+      return RISCVISD::VECREDUCE_FMIN_VL;
     }
-  }
-  return SDValue();
-}
-
-// Matches any the following pattern as a GORCI(W) operation
-// 1.  (or (GREVI x, shamt), x) if shamt is a power of 2
-// 2.  (or x, (GREVI x, shamt)) if shamt is a power of 2
-// 3.  (or (or (BITMANIP_SHL x), x), (BITMANIP_SRL x))
-// Note that with the variant of 3.,
-//     (or (or (BITMANIP_SHL x), (BITMANIP_SRL x)), x)
-// the inner pattern will first be matched as GREVI and then the outer
-// pattern will be matched to GORC via the first rule above.
-// 4.  (or (rotl/rotr x, bitwidth/2), x)
-static SDValue combineORToGORC(SDValue Op, SelectionDAG &DAG,
-                               const RISCVSubtarget &Subtarget) {
-  assert(Subtarget.hasStdExtZbp() && "Expected Zbp extenson");
-  EVT VT = Op.getValueType();
-
-  if (VT == Subtarget.getXLenVT() || (Subtarget.is64Bit() && VT == MVT::i32)) {
-    SDLoc DL(Op);
-    SDValue Op0 = Op.getOperand(0);
-    SDValue Op1 = Op.getOperand(1);
-
-    auto MatchOROfReverse = [&](SDValue Reverse, SDValue X) {
-      if (Reverse.getOpcode() == RISCVISD::GREV && Reverse.getOperand(0) == X &&
-          isa<ConstantSDNode>(Reverse.getOperand(1)) &&
-          isPowerOf2_32(Reverse.getConstantOperandVal(1)))
-        return DAG.getNode(RISCVISD::GORC, DL, VT, X, Reverse.getOperand(1));
-      // We can also form GORCI from ROTL/ROTR by half the bitwidth.
-      if ((Reverse.getOpcode() == ISD::ROTL ||
-           Reverse.getOpcode() == ISD::ROTR) &&
-          Reverse.getOperand(0) == X &&
-          isa<ConstantSDNode>(Reverse.getOperand(1))) {
-        uint64_t RotAmt = Reverse.getConstantOperandVal(1);
-        if (RotAmt == (VT.getSizeInBits() / 2))
-          return DAG.getNode(RISCVISD::GORC, DL, VT, X,
-                             DAG.getConstant(RotAmt, DL, VT));
-      }
-      return SDValue();
-    };
+  };
 
-    // Check for either commutable permutation of (or (GREVI x, shamt), x)
-    if (SDValue V = MatchOROfReverse(Op0, Op1))
-      return V;
-    if (SDValue V = MatchOROfReverse(Op1, Op0))
-      return V;
+  auto IsReduction = [&BinOpToRVVReduce](SDValue V, unsigned Opc) {
+    return V.getOpcode() == ISD::EXTRACT_VECTOR_ELT &&
+           isNullConstant(V.getOperand(1)) &&
+           V.getOperand(0).getOpcode() == BinOpToRVVReduce(Opc);
+  };
 
-    // OR is commutable so canonicalize its OR operand to the left
-    if (Op0.getOpcode() != ISD::OR && Op1.getOpcode() == ISD::OR)
-      std::swap(Op0, Op1);
-    if (Op0.getOpcode() != ISD::OR)
-      return SDValue();
-    SDValue OrOp0 = Op0.getOperand(0);
-    SDValue OrOp1 = Op0.getOperand(1);
-    auto LHS = matchGREVIPat(OrOp0);
-    // OR is commutable so swap the operands and try again: x might have been
-    // on the left
-    if (!LHS) {
-      std::swap(OrOp0, OrOp1);
-      LHS = matchGREVIPat(OrOp0);
-    }
-    auto RHS = matchGREVIPat(Op1);
-    if (LHS && RHS && LHS->formsPairWith(*RHS) && LHS->Op == OrOp1) {
-      return DAG.getNode(RISCVISD::GORC, DL, VT, LHS->Op,
-                         DAG.getConstant(LHS->ShAmt, DL, VT));
-    }
-  }
-  return SDValue();
-}
+  unsigned Opc = N->getOpcode();
+  unsigned ReduceIdx;
+  if (IsReduction(N->getOperand(0), Opc))
+    ReduceIdx = 0;
+  else if (IsReduction(N->getOperand(1), Opc))
+    ReduceIdx = 1;
+  else
+    return SDValue();
 
-// Matches any of the following bit-manipulation patterns:
-//   (and (shl x, 1), (0x22222222 << 1))
-//   (and (srl x, 1), 0x22222222)
-//   (shl (and x, 0x22222222), 1)
-//   (srl (and x, (0x22222222 << 1)), 1)
-// where the shift amount and mask may vary thus:
-//   [1]  = 0x22222222 / 0x44444444
-//   [2]  = 0x0C0C0C0C / 0x3C3C3C3C
-//   [4]  = 0x00F000F0 / 0x0F000F00
-//   [8]  = 0x0000FF00 / 0x00FF0000
-//   [16] = 0x00000000FFFF0000 / 0x0000FFFF00000000 (for RV64)
-static Optional<RISCVBitmanipPat> matchSHFLPat(SDValue Op) {
-  // These are the unshifted masks which we use to match bit-manipulation
-  // patterns. They may be shifted left in certain circumstances.
-  static const uint64_t BitmanipMasks[] = {
-      0x2222222222222222ULL, 0x0C0C0C0C0C0C0C0CULL, 0x00F000F000F000F0ULL,
-      0x0000FF000000FF00ULL, 0x00000000FFFF0000ULL};
-
-  return matchRISCVBitmanipPat(Op, BitmanipMasks);
-}
-
-// Match (or (or (SHFL_SHL x), (SHFL_SHR x)), (SHFL_AND x)
-static SDValue combineORToSHFL(SDValue Op, SelectionDAG &DAG,
-                               const RISCVSubtarget &Subtarget) {
-  assert(Subtarget.hasStdExtZbp() && "Expected Zbp extenson");
-  EVT VT = Op.getValueType();
+  // Skip if FADD disallows reassociation but the combiner needs.
+  if (Opc == ISD::FADD && !N->getFlags().hasAllowReassociation())
+    return SDValue();
 
-  if (VT != MVT::i32 && VT != Subtarget.getXLenVT())
+  SDValue Extract = N->getOperand(ReduceIdx);
+  SDValue Reduce = Extract.getOperand(0);
+  if (!Reduce.hasOneUse())
     return SDValue();
 
-  SDValue Op0 = Op.getOperand(0);
-  SDValue Op1 = Op.getOperand(1);
+  SDValue ScalarV = Reduce.getOperand(2);
+  EVT ScalarVT = ScalarV.getValueType();
+  if (ScalarV.getOpcode() == ISD::INSERT_SUBVECTOR &&
+      ScalarV.getOperand(0)->isUndef())
+    ScalarV = ScalarV.getOperand(1);
 
-  // Or is commutable so canonicalize the second OR to the LHS.
-  if (Op0.getOpcode() != ISD::OR)
-    std::swap(Op0, Op1);
-  if (Op0.getOpcode() != ISD::OR)
+  // Make sure that ScalarV is a splat with VL=1.
+  if (ScalarV.getOpcode() != RISCVISD::VFMV_S_F_VL &&
+      ScalarV.getOpcode() != RISCVISD::VMV_S_X_VL &&
+      ScalarV.getOpcode() != RISCVISD::VMV_V_X_VL)
     return SDValue();
 
-  // We found an inner OR, so our operands are the operands of the inner OR
-  // and the other operand of the outer OR.
-  SDValue A = Op0.getOperand(0);
-  SDValue B = Op0.getOperand(1);
-  SDValue C = Op1;
+  if (!hasNonZeroAVL(ScalarV.getOperand(2)))
+    return SDValue();
 
-  auto Match1 = matchSHFLPat(A);
-  auto Match2 = matchSHFLPat(B);
+  // Check the scalar of ScalarV is neutral element
+  // TODO: Deal with value other than neutral element.
+  if (!isNeutralConstant(N->getOpcode(), N->getFlags(), ScalarV.getOperand(1),
+                         0))
+    return SDValue();
 
-  // If neither matched, we failed.
-  if (!Match1 && !Match2)
+  if (!ScalarV.hasOneUse())
     return SDValue();
 
-  // We had at least one match. if one failed, try the remaining C operand.
-  if (!Match1) {
-    std::swap(A, C);
-    Match1 = matchSHFLPat(A);
-    if (!Match1)
-      return SDValue();
-  } else if (!Match2) {
-    std::swap(B, C);
-    Match2 = matchSHFLPat(B);
-    if (!Match2)
-      return SDValue();
-  }
-  assert(Match1 && Match2);
+  SDValue NewStart = N->getOperand(1 - ReduceIdx);
 
-  // Make sure our matches pair up.
-  if (!Match1->formsPairWith(*Match2))
+  SDLoc DL(N);
+  SDValue NewScalarV =
+      lowerScalarInsert(NewStart, ScalarV.getOperand(2),
+                        ScalarV.getSimpleValueType(), DL, DAG, Subtarget);
+
+  // If we looked through an INSERT_SUBVECTOR we need to restore it.
+  if (ScalarVT != ScalarV.getValueType())
+    NewScalarV =
+        DAG.getNode(ISD::INSERT_SUBVECTOR, DL, ScalarVT, DAG.getUNDEF(ScalarVT),
+                    NewScalarV, DAG.getConstant(0, DL, Subtarget.getXLenVT()));
+
+  SDValue NewReduce =
+      DAG.getNode(Reduce.getOpcode(), DL, Reduce.getValueType(),
+                  Reduce.getOperand(0), Reduce.getOperand(1), NewScalarV,
+                  Reduce.getOperand(3), Reduce.getOperand(4));
+  return DAG.getNode(Extract.getOpcode(), DL, Extract.getValueType(), NewReduce,
+                     Extract.getOperand(1));
+}
+
+// Optimize (add (shl x, c0), (shl y, c1)) ->
+//          (SLLI (SH*ADD x, y), c0), if c1-c0 equals to [1|2|3].
+static SDValue transformAddShlImm(SDNode *N, SelectionDAG &DAG,
+                                  const RISCVSubtarget &Subtarget) {
+  // Perform this optimization only in the zba extension.
+  if (!Subtarget.hasStdExtZba())
     return SDValue();
 
-  // All the remains is to make sure C is an AND with the same input, that masks
-  // out the bits that are being shuffled.
-  if (C.getOpcode() != ISD::AND || !isa<ConstantSDNode>(C.getOperand(1)) ||
-      C.getOperand(0) != Match1->Op)
+  // Skip for vector types and larger types.
+  EVT VT = N->getValueType(0);
+  if (VT.isVector() || VT.getSizeInBits() > Subtarget.getXLen())
     return SDValue();
 
-  uint64_t Mask = C.getConstantOperandVal(1);
-
-  static const uint64_t BitmanipMasks[] = {
-      0x9999999999999999ULL, 0xC3C3C3C3C3C3C3C3ULL, 0xF00FF00FF00FF00FULL,
-      0xFF0000FFFF0000FFULL, 0xFFFF00000000FFFFULL,
-  };
+  // The two operand nodes must be SHL and have no other use.
+  SDValue N0 = N->getOperand(0);
+  SDValue N1 = N->getOperand(1);
+  if (N0->getOpcode() != ISD::SHL || N1->getOpcode() != ISD::SHL ||
+      !N0->hasOneUse() || !N1->hasOneUse())
+    return SDValue();
 
-  unsigned Width = Op.getValueType() == MVT::i64 ? 64 : 32;
-  unsigned MaskIdx = Log2_32(Match1->ShAmt);
-  uint64_t ExpMask = BitmanipMasks[MaskIdx] & maskTrailingOnes<uint64_t>(Width);
+  // Check c0 and c1.
+  auto *N0C = dyn_cast<ConstantSDNode>(N0->getOperand(1));
+  auto *N1C = dyn_cast<ConstantSDNode>(N1->getOperand(1));
+  if (!N0C || !N1C)
+    return SDValue();
+  int64_t C0 = N0C->getSExtValue();
+  int64_t C1 = N1C->getSExtValue();
+  if (C0 <= 0 || C1 <= 0)
+    return SDValue();
 
-  if (Mask != ExpMask)
+  // Skip if SH1ADD/SH2ADD/SH3ADD are not applicable.
+  int64_t Bits = std::min(C0, C1);
+  int64_t Diff = std::abs(C0 - C1);
+  if (Diff != 1 && Diff != 2 && Diff != 3)
     return SDValue();
 
-  SDLoc DL(Op);
-  return DAG.getNode(RISCVISD::SHFL, DL, VT, Match1->Op,
-                     DAG.getConstant(Match1->ShAmt, DL, VT));
+  // Build nodes.
+  SDLoc DL(N);
+  SDValue NS = (C0 < C1) ? N0->getOperand(0) : N1->getOperand(0);
+  SDValue NL = (C0 > C1) ? N0->getOperand(0) : N1->getOperand(0);
+  SDValue NA0 =
+      DAG.getNode(ISD::SHL, DL, VT, NL, DAG.getConstant(Diff, DL, VT));
+  SDValue NA1 = DAG.getNode(ISD::ADD, DL, VT, NA0, NS);
+  return DAG.getNode(ISD::SHL, DL, VT, NA1, DAG.getConstant(Bits, DL, VT));
 }
 
-// Combine (GREVI (GREVI x, C2), C1) -> (GREVI x, C1^C2) when C1^C2 is
-// non-zero, and to x when it is. Any repeated GREVI stage undoes itself.
-// Combine (GORCI (GORCI x, C2), C1) -> (GORCI x, C1|C2). Repeated stage does
-// not undo itself, but they are redundant.
-static SDValue combineGREVI_GORCI(SDNode *N, SelectionDAG &DAG) {
-  SDValue Src = N->getOperand(0);
+// Combine a constant select operand into its use:
+//
+// (and (select cond, -1, c), x)
+//   -> (select cond, x, (and x, c))  [AllOnes=1]
+// (or  (select cond, 0, c), x)
+//   -> (select cond, x, (or x, c))  [AllOnes=0]
+// (xor (select cond, 0, c), x)
+//   -> (select cond, x, (xor x, c))  [AllOnes=0]
+// (add (select cond, 0, c), x)
+//   -> (select cond, x, (add x, c))  [AllOnes=0]
+// (sub x, (select cond, 0, c))
+//   -> (select cond, x, (sub x, c))  [AllOnes=0]
+static SDValue combineSelectAndUse(SDNode *N, SDValue Slct, SDValue OtherOp,
+                                   SelectionDAG &DAG, bool AllOnes,
+                                   const RISCVSubtarget &Subtarget) {
+  EVT VT = N->getValueType(0);
 
-  if (Src.getOpcode() != N->getOpcode())
+  // Skip vectors.
+  if (VT.isVector())
     return SDValue();
 
-  if (!isa<ConstantSDNode>(N->getOperand(1)) ||
-      !isa<ConstantSDNode>(Src.getOperand(1)))
+  if (!Subtarget.hasShortForwardBranchOpt() ||
+      (Slct.getOpcode() != ISD::SELECT &&
+       Slct.getOpcode() != RISCVISD::SELECT_CC) ||
+      !Slct.hasOneUse())
     return SDValue();
 
-  unsigned ShAmt1 = N->getConstantOperandVal(1);
-  unsigned ShAmt2 = Src.getConstantOperandVal(1);
-  Src = Src.getOperand(0);
+  auto isZeroOrAllOnes = [](SDValue N, bool AllOnes) {
+    return AllOnes ? isAllOnesConstant(N) : isNullConstant(N);
+  };
 
-  unsigned CombinedShAmt;
-  if (N->getOpcode() == RISCVISD::GORC || N->getOpcode() == RISCVISD::GORCW)
-    CombinedShAmt = ShAmt1 | ShAmt2;
+  bool SwapSelectOps;
+  unsigned OpOffset = Slct.getOpcode() == RISCVISD::SELECT_CC ? 2 : 0;
+  SDValue TrueVal = Slct.getOperand(1 + OpOffset);
+  SDValue FalseVal = Slct.getOperand(2 + OpOffset);
+  SDValue NonConstantVal;
+  if (isZeroOrAllOnes(TrueVal, AllOnes)) {
+    SwapSelectOps = false;
+    NonConstantVal = FalseVal;
+  } else if (isZeroOrAllOnes(FalseVal, AllOnes)) {
+    SwapSelectOps = true;
+    NonConstantVal = TrueVal;
+  } else
+    return SDValue();
+
+  // Slct is now know to be the desired identity constant when CC is true.
+  TrueVal = OtherOp;
+  FalseVal = DAG.getNode(N->getOpcode(), SDLoc(N), VT, OtherOp, NonConstantVal);
+  // Unless SwapSelectOps says the condition should be false.
+  if (SwapSelectOps)
+    std::swap(TrueVal, FalseVal);
+
+  if (Slct.getOpcode() == RISCVISD::SELECT_CC)
+    return DAG.getNode(RISCVISD::SELECT_CC, SDLoc(N), VT,
+                       {Slct.getOperand(0), Slct.getOperand(1),
+                        Slct.getOperand(2), TrueVal, FalseVal});
+
+  return DAG.getNode(ISD::SELECT, SDLoc(N), VT,
+                     {Slct.getOperand(0), TrueVal, FalseVal});
+}
+
+// Attempt combineSelectAndUse on each operand of a commutative operator N.
+static SDValue combineSelectAndUseCommutative(SDNode *N, SelectionDAG &DAG,
+                                              bool AllOnes,
+                                              const RISCVSubtarget &Subtarget) {
+  SDValue N0 = N->getOperand(0);
+  SDValue N1 = N->getOperand(1);
+  if (SDValue Result = combineSelectAndUse(N, N0, N1, DAG, AllOnes, Subtarget))
+    return Result;
+  if (SDValue Result = combineSelectAndUse(N, N1, N0, DAG, AllOnes, Subtarget))
+    return Result;
+  return SDValue();
+}
+
+// Transform (add (mul x, c0), c1) ->
+//           (add (mul (add x, c1/c0), c0), c1%c0).
+// if c1/c0 and c1%c0 are simm12, while c1 is not. A special corner case
+// that should be excluded is when c0*(c1/c0) is simm12, which will lead
+// to an infinite loop in DAGCombine if transformed.
+// Or transform (add (mul x, c0), c1) ->
+//              (add (mul (add x, c1/c0+1), c0), c1%c0-c0),
+// if c1/c0+1 and c1%c0-c0 are simm12, while c1 is not. A special corner
+// case that should be excluded is when c0*(c1/c0+1) is simm12, which will
+// lead to an infinite loop in DAGCombine if transformed.
+// Or transform (add (mul x, c0), c1) ->
+//              (add (mul (add x, c1/c0-1), c0), c1%c0+c0),
+// if c1/c0-1 and c1%c0+c0 are simm12, while c1 is not. A special corner
+// case that should be excluded is when c0*(c1/c0-1) is simm12, which will
+// lead to an infinite loop in DAGCombine if transformed.
+// Or transform (add (mul x, c0), c1) ->
+//              (mul (add x, c1/c0), c0).
+// if c1%c0 is zero, and c1/c0 is simm12 while c1 is not.
+static SDValue transformAddImmMulImm(SDNode *N, SelectionDAG &DAG,
+                                     const RISCVSubtarget &Subtarget) {
+  // Skip for vector types and larger types.
+  EVT VT = N->getValueType(0);
+  if (VT.isVector() || VT.getSizeInBits() > Subtarget.getXLen())
+    return SDValue();
+  // The first operand node must be a MUL and has no other use.
+  SDValue N0 = N->getOperand(0);
+  if (!N0->hasOneUse() || N0->getOpcode() != ISD::MUL)
+    return SDValue();
+  // Check if c0 and c1 match above conditions.
+  auto *N0C = dyn_cast<ConstantSDNode>(N0->getOperand(1));
+  auto *N1C = dyn_cast<ConstantSDNode>(N->getOperand(1));
+  if (!N0C || !N1C)
+    return SDValue();
+  // If N0C has multiple uses it's possible one of the cases in
+  // DAGCombiner::isMulAddWithConstProfitable will be true, which would result
+  // in an infinite loop.
+  if (!N0C->hasOneUse())
+    return SDValue();
+  int64_t C0 = N0C->getSExtValue();
+  int64_t C1 = N1C->getSExtValue();
+  int64_t CA, CB;
+  if (C0 == -1 || C0 == 0 || C0 == 1 || isInt<12>(C1))
+    return SDValue();
+  // Search for proper CA (non-zero) and CB that both are simm12.
+  if ((C1 / C0) != 0 && isInt<12>(C1 / C0) && isInt<12>(C1 % C0) &&
+      !isInt<12>(C0 * (C1 / C0))) {
+    CA = C1 / C0;
+    CB = C1 % C0;
+  } else if ((C1 / C0 + 1) != 0 && isInt<12>(C1 / C0 + 1) &&
+             isInt<12>(C1 % C0 - C0) && !isInt<12>(C0 * (C1 / C0 + 1))) {
+    CA = C1 / C0 + 1;
+    CB = C1 % C0 - C0;
+  } else if ((C1 / C0 - 1) != 0 && isInt<12>(C1 / C0 - 1) &&
+             isInt<12>(C1 % C0 + C0) && !isInt<12>(C0 * (C1 / C0 - 1))) {
+    CA = C1 / C0 - 1;
+    CB = C1 % C0 + C0;
+  } else
+    return SDValue();
+  // Build new nodes (add (mul (add x, c1/c0), c0), c1%c0).
+  SDLoc DL(N);
+  SDValue New0 = DAG.getNode(ISD::ADD, DL, VT, N0->getOperand(0),
+                             DAG.getConstant(CA, DL, VT));
+  SDValue New1 =
+      DAG.getNode(ISD::MUL, DL, VT, New0, DAG.getConstant(C0, DL, VT));
+  return DAG.getNode(ISD::ADD, DL, VT, New1, DAG.getConstant(CB, DL, VT));
+}
+
+static SDValue performADDCombine(SDNode *N, SelectionDAG &DAG,
+                                 const RISCVSubtarget &Subtarget) {
+  if (SDValue V = transformAddImmMulImm(N, DAG, Subtarget))
+    return V;
+  if (SDValue V = transformAddShlImm(N, DAG, Subtarget))
+    return V;
+  if (SDValue V = combineBinOpToReduce(N, DAG, Subtarget))
+    return V;
+  // fold (add (select lhs, rhs, cc, 0, y), x) ->
+  //      (select lhs, rhs, cc, x, (add x, y))
+  return combineSelectAndUseCommutative(N, DAG, /*AllOnes*/ false, Subtarget);
+}
+
+// Try to turn a sub boolean RHS and constant LHS into an addi.
+static SDValue combineSubOfBoolean(SDNode *N, SelectionDAG &DAG) {
+  SDValue N0 = N->getOperand(0);
+  SDValue N1 = N->getOperand(1);
+  EVT VT = N->getValueType(0);
+  SDLoc DL(N);
+
+  // Require a constant LHS.
+  auto *N0C = dyn_cast<ConstantSDNode>(N0);
+  if (!N0C)
+    return SDValue();
+
+  // All our optimizations involve subtracting 1 from the immediate and forming
+  // an ADDI. Make sure the new immediate is valid for an ADDI.
+  APInt ImmValMinus1 = N0C->getAPIntValue() - 1;
+  if (!ImmValMinus1.isSignedIntN(12))
+    return SDValue();
+
+  SDValue NewLHS;
+  if (N1.getOpcode() == ISD::SETCC && N1.hasOneUse()) {
+    // (sub constant, (setcc x, y, eq/neq)) ->
+    // (add (setcc x, y, neq/eq), constant - 1)
+    ISD::CondCode CCVal = cast<CondCodeSDNode>(N1.getOperand(2))->get();
+    EVT SetCCOpVT = N1.getOperand(0).getValueType();
+    if (!isIntEqualitySetCC(CCVal) || !SetCCOpVT.isInteger())
+      return SDValue();
+    CCVal = ISD::getSetCCInverse(CCVal, SetCCOpVT);
+    NewLHS =
+        DAG.getSetCC(SDLoc(N1), VT, N1.getOperand(0), N1.getOperand(1), CCVal);
+  } else if (N1.getOpcode() == ISD::XOR && isOneConstant(N1.getOperand(1)) &&
+             N1.getOperand(0).getOpcode() == ISD::SETCC) {
+    // (sub C, (xor (setcc), 1)) -> (add (setcc), C-1).
+    // Since setcc returns a bool the xor is equivalent to 1-setcc.
+    NewLHS = N1.getOperand(0);
+  } else
+    return SDValue();
+
+  SDValue NewRHS = DAG.getConstant(ImmValMinus1, DL, VT);
+  return DAG.getNode(ISD::ADD, DL, VT, NewLHS, NewRHS);
+}
+
+static SDValue performSUBCombine(SDNode *N, SelectionDAG &DAG,
+                                 const RISCVSubtarget &Subtarget) {
+  if (SDValue V = combineSubOfBoolean(N, DAG))
+    return V;
+
+  // fold (sub x, (select lhs, rhs, cc, 0, y)) ->
+  //      (select lhs, rhs, cc, x, (sub x, y))
+  SDValue N0 = N->getOperand(0);
+  SDValue N1 = N->getOperand(1);
+  return combineSelectAndUse(N, N1, N0, DAG, /*AllOnes*/ false, Subtarget);
+}
+
+// Apply DeMorgan's law to (and/or (xor X, 1), (xor Y, 1)) if X and Y are 0/1.
+// Legalizing setcc can introduce xors like this. Doing this transform reduces
+// the number of xors and may allow the xor to fold into a branch condition.
+static SDValue combineDeMorganOfBoolean(SDNode *N, SelectionDAG &DAG) {
+  SDValue N0 = N->getOperand(0);
+  SDValue N1 = N->getOperand(1);
+  bool IsAnd = N->getOpcode() == ISD::AND;
+
+  if (N0.getOpcode() != ISD::XOR || N1.getOpcode() != ISD::XOR)
+    return SDValue();
+
+  if (!N0.hasOneUse() || !N1.hasOneUse())
+    return SDValue();
+
+  SDValue N01 = N0.getOperand(1);
+  SDValue N11 = N1.getOperand(1);
+
+  // For AND, SimplifyDemandedBits may have turned one of the (xor X, 1) into
+  // (xor X, -1) based on the upper bits of the other operand being 0. If the
+  // operation is And, allow one of the Xors to use -1.
+  if (isOneConstant(N01)) {
+    if (!isOneConstant(N11) && !(IsAnd && isAllOnesConstant(N11)))
+      return SDValue();
+  } else if (isOneConstant(N11)) {
+    // N01 and N11 being 1 was already handled. Handle N11==1 and N01==-1.
+    if (!(IsAnd && isAllOnesConstant(N01)))
+      return SDValue();
+  } else
+    return SDValue();
+
+  EVT VT = N->getValueType(0);
+
+  SDValue N00 = N0.getOperand(0);
+  SDValue N10 = N1.getOperand(0);
+
+  // The LHS of the xors needs to be 0/1.
+  APInt Mask = APInt::getBitsSetFrom(VT.getSizeInBits(), 1);
+  if (!DAG.MaskedValueIsZero(N00, Mask) || !DAG.MaskedValueIsZero(N10, Mask))
+    return SDValue();
+
+  // Invert the opcode and insert a new xor.
+  SDLoc DL(N);
+  unsigned Opc = IsAnd ? ISD::OR : ISD::AND;
+  SDValue Logic = DAG.getNode(Opc, DL, VT, N00, N10);
+  return DAG.getNode(ISD::XOR, DL, VT, Logic, DAG.getConstant(1, DL, VT));
+}
+
+static SDValue performTRUNCATECombine(SDNode *N, SelectionDAG &DAG,
+                                      const RISCVSubtarget &Subtarget) {
+  SDValue N0 = N->getOperand(0);
+  EVT VT = N->getValueType(0);
+
+  // Pre-promote (i1 (truncate (srl X, Y))) on RV64 with Zbs without zero
+  // extending X. This is safe since we only need the LSB after the shift and
+  // shift amounts larger than 31 would produce poison. If we wait until
+  // type legalization, we'll create RISCVISD::SRLW and we can't recover it
+  // to use a BEXT instruction.
+  if (Subtarget.is64Bit() && Subtarget.hasStdExtZbs() && VT == MVT::i1 &&
+      N0.getValueType() == MVT::i32 && N0.getOpcode() == ISD::SRL &&
+      !isa<ConstantSDNode>(N0.getOperand(1)) && N0.hasOneUse()) {
+    SDLoc DL(N0);
+    SDValue Op0 = DAG.getNode(ISD::ANY_EXTEND, DL, MVT::i64, N0.getOperand(0));
+    SDValue Op1 = DAG.getNode(ISD::ZERO_EXTEND, DL, MVT::i64, N0.getOperand(1));
+    SDValue Srl = DAG.getNode(ISD::SRL, DL, MVT::i64, Op0, Op1);
+    return DAG.getNode(ISD::TRUNCATE, SDLoc(N), VT, Srl);
+  }
+
+  return SDValue();
+}
+
+namespace {
+// Helper class contains information about comparison operation.
+// The first two operands of this operation are compared values and the
+// last one is the operation.
+// Compared values are stored in Ops.
+// Comparison operation is stored in CCode.
+class CmpOpInfo {
+  static unsigned constexpr Size = 2u;
+
+  // Type for storing operands of compare operation.
+  using OpsArray = std::array<SDValue, Size>;
+  OpsArray Ops;
+
+  using const_iterator = OpsArray::const_iterator;
+  const_iterator begin() const { return Ops.begin(); }
+  const_iterator end() const { return Ops.end(); }
+
+  ISD::CondCode CCode;
+
+  unsigned CommonPos{Size};
+  unsigned DifferPos{Size};
+
+  // Sets CommonPos and DifferPos based on incoming position
+  // of common operand CPos.
+  void setPositions(const_iterator CPos) {
+    assert(CPos != Ops.end() && "Common operand has to be in OpsArray.\n");
+    CommonPos = CPos == Ops.begin() ? 0 : 1;
+    DifferPos = 1 - CommonPos;
+    assert((DifferPos == 0 || DifferPos == 1) &&
+           "Positions can be only 0 or 1.");
+  }
+
+  // Private constructor of comparison info based on comparison operator.
+  // It is private because CmpOpInfo only reasonable relative to other
+  // comparison operator. Therefore, infos about comparison operation
+  // have to be collected simultaneously via CmpOpInfo::getInfoAbout().
+  CmpOpInfo(const SDValue &CmpOp)
+      : Ops{CmpOp.getOperand(0), CmpOp.getOperand(1)},
+        CCode{cast<CondCodeSDNode>(CmpOp.getOperand(2))->get()} {}
+
+  // Finds common operand of Op1 and Op2 and finishes filling CmpOpInfos.
+  // Returns true if common operand is found. Otherwise - false.
+  static bool establishCorrespondence(CmpOpInfo &Op1, CmpOpInfo &Op2) {
+    const auto CommonOpIt1 =
+        std::find_first_of(Op1.begin(), Op1.end(), Op2.begin(), Op2.end());
+    if (CommonOpIt1 == Op1.end())
+      return false;
+
+    const auto CommonOpIt2 = std::find(Op2.begin(), Op2.end(), *CommonOpIt1);
+    assert(CommonOpIt2 != Op2.end() &&
+           "Cannot find common operand in the second comparison operation.");
+
+    Op1.setPositions(CommonOpIt1);
+    Op2.setPositions(CommonOpIt2);
+
+    return true;
+  }
+
+public:
+  CmpOpInfo(const CmpOpInfo &) = default;
+  CmpOpInfo(CmpOpInfo &&) = default;
+
+  SDValue const &operator[](unsigned Pos) const {
+    assert(Pos < Size && "Out of range\n");
+    return Ops[Pos];
+  }
+
+  // Creates infos about comparison operations CmpOp0 and CmpOp1.
+  // If there is no common operand returns None. Otherwise, returns
+  // correspondence info about comparison operations.
+  static std::optional<std::pair<CmpOpInfo, CmpOpInfo>>
+  getInfoAbout(SDValue const &CmpOp0, SDValue const &CmpOp1) {
+    CmpOpInfo Op0{CmpOp0};
+    CmpOpInfo Op1{CmpOp1};
+    if (!establishCorrespondence(Op0, Op1))
+      return std::nullopt;
+    return std::make_pair(Op0, Op1);
+  }
+
+  // Returns position of common operand.
+  unsigned getCPos() const { return CommonPos; }
+
+  // Returns position of differ operand.
+  unsigned getDPos() const { return DifferPos; }
+
+  // Returns common operand.
+  SDValue const &getCOp() const { return operator[](CommonPos); }
+
+  // Returns differ operand.
+  SDValue const &getDOp() const { return operator[](DifferPos); }
+
+  // Returns consition code of comparison operation.
+  ISD::CondCode getCondCode() const { return CCode; }
+};
+} // namespace
+
+// Verifies conditions to apply an optimization.
+// Returns Reference comparison code and three operands A, B, C.
+// Conditions for optimization:
+//   One operand of the compasions has to be common.
+//   This operand is written to C.
+//   Two others operands are differend. They are written to A and B.
+//   Comparisons has to be similar with respect to common operand C.
+//     e.g. A < C; C > B are similar
+//      but A < C; B > C are not.
+//   Reference comparison code is the comparison code if
+//   common operand is right placed.
+//     e.g. C > A will be swapped to A < C.
+static std::optional<std::tuple<ISD::CondCode, SDValue, SDValue, SDValue>>
+verifyCompareConds(SDNode *N, SelectionDAG &DAG) {
+  LLVM_DEBUG(
+      dbgs() << "Checking conditions for comparison operation combining.\n";);
+
+  SDValue V0 = N->getOperand(0);
+  SDValue V1 = N->getOperand(1);
+  assert(V0.getValueType() == V1.getValueType() &&
+         "Operations must have the same value type.");
+
+  // Condition 1. Operations have to be used only in logic operation.
+  if (!V0.hasOneUse() || !V1.hasOneUse())
+    return std::nullopt;
+
+  // Condition 2. Operands have to be comparison operations.
+  if (V0.getOpcode() != ISD::SETCC || V1.getOpcode() != ISD::SETCC)
+    return std::nullopt;
+
+  // Condition 3.1. Operations only with integers.
+  if (!V0.getOperand(0).getValueType().isInteger())
+    return std::nullopt;
+
+  const auto ComparisonInfo = CmpOpInfo::getInfoAbout(V0, V1);
+  // Condition 3.2. Common operand has to be in comparison.
+  if (!ComparisonInfo)
+    return std::nullopt;
+
+  const auto [Op0, Op1] = ComparisonInfo.value();
+
+  LLVM_DEBUG(dbgs() << "Shared operands are on positions: " << Op0.getCPos()
+                    << " and " << Op1.getCPos() << '\n';);
+  // If common operand at the first position then swap operation to convert to
+  // strict pattern. Common operand has to be right hand side.
+  ISD::CondCode RefCond = Op0.getCondCode();
+  ISD::CondCode AssistCode = Op1.getCondCode();
+  if (!Op0.getCPos())
+    RefCond = ISD::getSetCCSwappedOperands(RefCond);
+  if (!Op1.getCPos())
+    AssistCode = ISD::getSetCCSwappedOperands(AssistCode);
+  LLVM_DEBUG(dbgs() << "Reference condition is: " << RefCond << '\n';);
+  // If there are different comparison operations then do not perform an
+  // optimization. a < c; c < b -> will be changed to b > c.
+  if (RefCond != AssistCode)
+    return std::nullopt;
+
+  // Conditions can be only similar to Less or Greater. (>, >=, <, <=)
+  // Applying this mask to the operation will determine Less and Greater
+  // operations.
+  const unsigned CmpMask = 0b110;
+  const unsigned MaskedOpcode = CmpMask & RefCond;
+  // If masking gave 0b110, then this is an operation NE, O or TRUE.
+  if (MaskedOpcode == CmpMask)
+    return std::nullopt;
+  // If masking gave 00000, then this is an operation E, O or FALSE.
+  if (MaskedOpcode == 0)
+    return std::nullopt;
+  // Everything else is similar to Less or Greater.
+
+  SDValue A = Op0.getDOp();
+  SDValue B = Op1.getDOp();
+  SDValue C = Op0.getCOp();
+
+  LLVM_DEBUG(
+      dbgs() << "The conditions for combining comparisons are satisfied.\n";);
+  return std::make_tuple(RefCond, A, B, C);
+}
+
+static ISD::NodeType getSelectionCode(bool IsUnsigned, bool IsAnd,
+                                      bool IsGreaterOp) {
+  // Codes of selection operation. The first index selects signed or unsigned,
+  // the second index selects MIN/MAX.
+  static constexpr ISD::NodeType SelectionCodes[2][2] = {
+      {ISD::SMIN, ISD::SMAX}, {ISD::UMIN, ISD::UMAX}};
+  const bool ChooseSelCode = IsAnd ^ IsGreaterOp;
+  return SelectionCodes[IsUnsigned][ChooseSelCode];
+}
+
+// Combines two comparison operation and logic operation to one selection
+// operation(min, max) and logic operation. Returns new constructed Node if
+// conditions for optimization are satisfied.
+static SDValue combineCmpOp(SDNode *N, SelectionDAG &DAG,
+                            const RISCVSubtarget &Subtarget) {
+  if (!Subtarget.hasStdExtZbb())
+    return SDValue();
+
+  const unsigned BitOpcode = N->getOpcode();
+  assert((BitOpcode == ISD::AND || BitOpcode == ISD::OR) &&
+         "This optimization can be used only with AND/OR operations");
+
+  const auto Props = verifyCompareConds(N, DAG);
+  // If conditions are invalidated then do not perform an optimization.
+  if (!Props)
+    return SDValue();
+
+  const auto [RefOpcode, A, B, C] = Props.value();
+  const EVT CmpOpVT = A.getValueType();
+
+  const bool IsGreaterOp = RefOpcode & 0b10;
+  const bool IsUnsigned = ISD::isUnsignedIntSetCC(RefOpcode);
+  assert((IsUnsigned || ISD::isSignedIntSetCC(RefOpcode)) &&
+         "Operation neither with signed or unsigned integers.");
+
+  const bool IsAnd = BitOpcode == ISD::AND;
+  const ISD::NodeType PickCode =
+      getSelectionCode(IsUnsigned, IsAnd, IsGreaterOp);
+
+  SDLoc DL(N);
+  SDValue Pick = DAG.getNode(PickCode, DL, CmpOpVT, A, B);
+  SDValue Cmp =
+      DAG.getSetCC(DL, N->getOperand(0).getValueType(), Pick, C, RefOpcode);
+
+  return Cmp;
+}
+
+static SDValue performANDCombine(SDNode *N,
+                                 TargetLowering::DAGCombinerInfo &DCI,
+                                 const RISCVSubtarget &Subtarget) {
+  SelectionDAG &DAG = DCI.DAG;
+
+  SDValue N0 = N->getOperand(0);
+  // Pre-promote (i32 (and (srl X, Y), 1)) on RV64 with Zbs without zero
+  // extending X. This is safe since we only need the LSB after the shift and
+  // shift amounts larger than 31 would produce poison. If we wait until
+  // type legalization, we'll create RISCVISD::SRLW and we can't recover it
+  // to use a BEXT instruction.
+  if (Subtarget.is64Bit() && Subtarget.hasStdExtZbs() &&
+      N->getValueType(0) == MVT::i32 && isOneConstant(N->getOperand(1)) &&
+      N0.getOpcode() == ISD::SRL && !isa<ConstantSDNode>(N0.getOperand(1)) &&
+      N0.hasOneUse()) {
+    SDLoc DL(N);
+    SDValue Op0 = DAG.getNode(ISD::ANY_EXTEND, DL, MVT::i64, N0.getOperand(0));
+    SDValue Op1 = DAG.getNode(ISD::ZERO_EXTEND, DL, MVT::i64, N0.getOperand(1));
+    SDValue Srl = DAG.getNode(ISD::SRL, DL, MVT::i64, Op0, Op1);
+    SDValue And = DAG.getNode(ISD::AND, DL, MVT::i64, Srl,
+                              DAG.getConstant(1, DL, MVT::i64));
+    return DAG.getNode(ISD::TRUNCATE, DL, MVT::i32, And);
+  }
+
+  if (SDValue V = combineCmpOp(N, DAG, Subtarget))
+    return V;
+
+  if (SDValue V = combineBinOpToReduce(N, DAG, Subtarget))
+    return V;
+
+  if (DCI.isAfterLegalizeDAG())
+    if (SDValue V = combineDeMorganOfBoolean(N, DAG))
+      return V;
+
+  // fold (and (select lhs, rhs, cc, -1, y), x) ->
+  //      (select lhs, rhs, cc, x, (and x, y))
+  return combineSelectAndUseCommutative(N, DAG, /*AllOnes*/ true, Subtarget);
+}
+
+static SDValue performORCombine(SDNode *N, TargetLowering::DAGCombinerInfo &DCI,
+                                const RISCVSubtarget &Subtarget) {
+  SelectionDAG &DAG = DCI.DAG;
+
+  if (SDValue V = combineCmpOp(N, DAG, Subtarget))
+    return V;
+
+  if (SDValue V = combineBinOpToReduce(N, DAG, Subtarget))
+    return V;
+
+  if (DCI.isAfterLegalizeDAG())
+    if (SDValue V = combineDeMorganOfBoolean(N, DAG))
+      return V;
+
+  // fold (or (select cond, 0, y), x) ->
+  //      (select cond, x, (or x, y))
+  return combineSelectAndUseCommutative(N, DAG, /*AllOnes*/ false, Subtarget);
+}
+
+static SDValue performXORCombine(SDNode *N, SelectionDAG &DAG,
+                                 const RISCVSubtarget &Subtarget) {
+  SDValue N0 = N->getOperand(0);
+  SDValue N1 = N->getOperand(1);
+
+  // fold (xor (sllw 1, x), -1) -> (rolw ~1, x)
+  // NOTE: Assumes ROL being legal means ROLW is legal.
+  const TargetLowering &TLI = DAG.getTargetLoweringInfo();
+  if (N0.getOpcode() == RISCVISD::SLLW &&
+      isAllOnesConstant(N1) && isOneConstant(N0.getOperand(0)) &&
+      TLI.isOperationLegal(ISD::ROTL, MVT::i64)) {
+    SDLoc DL(N);
+    return DAG.getNode(RISCVISD::ROLW, DL, MVT::i64,
+                       DAG.getConstant(~1, DL, MVT::i64), N0.getOperand(1));
+  }
+
+  if (SDValue V = combineBinOpToReduce(N, DAG, Subtarget))
+    return V;
+  // fold (xor (select cond, 0, y), x) ->
+  //      (select cond, x, (xor x, y))
+  return combineSelectAndUseCommutative(N, DAG, /*AllOnes*/ false, Subtarget);
+}
+
+// Replace (seteq (i64 (and X, 0xffffffff)), C1) with
+// (seteq (i64 (sext_inreg (X, i32)), C1')) where C1' is C1 sign extended from
+// bit 31. Same for setne. C1' may be cheaper to materialize and the sext_inreg
+// can become a sext.w instead of a shift pair.
+static SDValue performSETCCCombine(SDNode *N, SelectionDAG &DAG,
+                                   const RISCVSubtarget &Subtarget) {
+  SDValue N0 = N->getOperand(0);
+  SDValue N1 = N->getOperand(1);
+  EVT VT = N->getValueType(0);
+  EVT OpVT = N0.getValueType();
+
+  if (OpVT != MVT::i64 || !Subtarget.is64Bit())
+    return SDValue();
+
+  // RHS needs to be a constant.
+  auto *N1C = dyn_cast<ConstantSDNode>(N1);
+  if (!N1C)
+    return SDValue();
+
+  // LHS needs to be (and X, 0xffffffff).
+  if (N0.getOpcode() != ISD::AND || !N0.hasOneUse() ||
+      !isa<ConstantSDNode>(N0.getOperand(1)) ||
+      N0.getConstantOperandVal(1) != UINT64_C(0xffffffff))
+    return SDValue();
+
+  // Looking for an equality compare.
+  ISD::CondCode Cond = cast<CondCodeSDNode>(N->getOperand(2))->get();
+  if (!isIntEqualitySetCC(Cond))
+    return SDValue();
+
+  // Don't do this if the sign bit is provably zero, it will be turned back into
+  // an AND.
+  APInt SignMask = APInt::getOneBitSet(64, 31);
+  if (DAG.MaskedValueIsZero(N0.getOperand(0), SignMask))
+    return SDValue();
+
+  const APInt &C1 = N1C->getAPIntValue();
+
+  SDLoc dl(N);
+  // If the constant is larger than 2^32 - 1 it is impossible for both sides
+  // to be equal.
+  if (C1.getActiveBits() > 32)
+    return DAG.getBoolConstant(Cond == ISD::SETNE, dl, VT, OpVT);
+
+  SDValue SExtOp = DAG.getNode(ISD::SIGN_EXTEND_INREG, N, OpVT,
+                               N0.getOperand(0), DAG.getValueType(MVT::i32));
+  return DAG.getSetCC(dl, VT, SExtOp, DAG.getConstant(C1.trunc(32).sext(64),
+                                                      dl, OpVT), Cond);
+}
+
+static SDValue
+performSIGN_EXTEND_INREGCombine(SDNode *N, SelectionDAG &DAG,
+                                const RISCVSubtarget &Subtarget) {
+  SDValue Src = N->getOperand(0);
+  EVT VT = N->getValueType(0);
+
+  // Fold (sext_inreg (fmv_x_anyexth X), i16) -> (fmv_x_signexth X)
+  if (Src.getOpcode() == RISCVISD::FMV_X_ANYEXTH &&
+      cast<VTSDNode>(N->getOperand(1))->getVT().bitsGE(MVT::i16))
+    return DAG.getNode(RISCVISD::FMV_X_SIGNEXTH, SDLoc(N), VT,
+                       Src.getOperand(0));
+
+  return SDValue();
+}
+
+namespace {
+// Forward declaration of the structure holding the necessary information to
+// apply a combine.
+struct CombineResult;
+
+/// Helper class for folding sign/zero extensions.
+/// In particular, this class is used for the following combines:
+/// add_vl -> vwadd(u) | vwadd(u)_w
+/// sub_vl -> vwsub(u) | vwsub(u)_w
+/// mul_vl -> vwmul(u) | vwmul_su
+///
+/// An object of this class represents an operand of the operation we want to
+/// combine.
+/// E.g., when trying to combine `mul_vl a, b`, we will have one instance of
+/// NodeExtensionHelper for `a` and one for `b`.
+///
+/// This class abstracts away how the extension is materialized and
+/// how its Mask, VL, number of users affect the combines.
+///
+/// In particular:
+/// - VWADD_W is conceptually == add(op0, sext(op1))
+/// - VWADDU_W == add(op0, zext(op1))
+/// - VWSUB_W == sub(op0, sext(op1))
+/// - VWSUBU_W == sub(op0, zext(op1))
+///
+/// And VMV_V_X_VL, depending on the value, is conceptually equivalent to
+/// zext|sext(smaller_value).
+struct NodeExtensionHelper {
+  /// Records if this operand is like being zero extended.
+  bool SupportsZExt;
+  /// Records if this operand is like being sign extended.
+  /// Note: SupportsZExt and SupportsSExt are not mutually exclusive. For
+  /// instance, a splat constant (e.g., 3), would support being both sign and
+  /// zero extended.
+  bool SupportsSExt;
+  /// This boolean captures whether we care if this operand would still be
+  /// around after the folding happens.
+  bool EnforceOneUse;
+  /// Records if this operand's mask needs to match the mask of the operation
+  /// that it will fold into.
+  bool CheckMask;
+  /// Value of the Mask for this operand.
+  /// It may be SDValue().
+  SDValue Mask;
+  /// Value of the vector length operand.
+  /// It may be SDValue().
+  SDValue VL;
+  /// Original value that this NodeExtensionHelper represents.
+  SDValue OrigOperand;
+
+  /// Get the value feeding the extension or the value itself.
+  /// E.g., for zext(a), this would return a.
+  SDValue getSource() const {
+    switch (OrigOperand.getOpcode()) {
+    case RISCVISD::VSEXT_VL:
+    case RISCVISD::VZEXT_VL:
+      return OrigOperand.getOperand(0);
+    default:
+      return OrigOperand;
+    }
+  }
+
+  /// Check if this instance represents a splat.
+  bool isSplat() const {
+    return OrigOperand.getOpcode() == RISCVISD::VMV_V_X_VL;
+  }
+
+  /// Get or create a value that can feed \p Root with the given extension \p
+  /// SExt. If \p SExt is None, this returns the source of this operand.
+  /// \see ::getSource().
+  SDValue getOrCreateExtendedOp(const SDNode *Root, SelectionDAG &DAG,
+                                std::optional<bool> SExt) const {
+    if (!SExt.has_value())
+      return OrigOperand;
+
+    MVT NarrowVT = getNarrowType(Root);
+
+    SDValue Source = getSource();
+    if (Source.getValueType() == NarrowVT)
+      return Source;
+
+    unsigned ExtOpc = *SExt ? RISCVISD::VSEXT_VL : RISCVISD::VZEXT_VL;
+
+    // If we need an extension, we should be changing the type.
+    SDLoc DL(Root);
+    auto [Mask, VL] = getMaskAndVL(Root);
+    switch (OrigOperand.getOpcode()) {
+    case RISCVISD::VSEXT_VL:
+    case RISCVISD::VZEXT_VL:
+      return DAG.getNode(ExtOpc, DL, NarrowVT, Source, Mask, VL);
+    case RISCVISD::VMV_V_X_VL:
+      return DAG.getNode(RISCVISD::VMV_V_X_VL, DL, NarrowVT,
+                         DAG.getUNDEF(NarrowVT), Source.getOperand(1), VL);
+    default:
+      // Other opcodes can only come from the original LHS of VW(ADD|SUB)_W_VL
+      // and that operand should already have the right NarrowVT so no
+      // extension should be required at this point.
+      llvm_unreachable("Unsupported opcode");
+    }
+  }
+
+  /// Helper function to get the narrow type for \p Root.
+  /// The narrow type is the type of \p Root where we divided the size of each
+  /// element by 2. E.g., if Root's type <2xi16> -> narrow type <2xi8>.
+  /// \pre The size of the type of the elements of Root must be a multiple of 2
+  /// and be greater than 16.
+  static MVT getNarrowType(const SDNode *Root) {
+    MVT VT = Root->getSimpleValueType(0);
+
+    // Determine the narrow size.
+    unsigned NarrowSize = VT.getScalarSizeInBits() / 2;
+    assert(NarrowSize >= 8 && "Trying to extend something we can't represent");
+    MVT NarrowVT = MVT::getVectorVT(MVT::getIntegerVT(NarrowSize),
+                                    VT.getVectorElementCount());
+    return NarrowVT;
+  }
+
+  /// Return the opcode required to materialize the folding of the sign
+  /// extensions (\p IsSExt == true) or zero extensions (IsSExt == false) for
+  /// both operands for \p Opcode.
+  /// Put differently, get the opcode to materialize:
+  /// - ISExt == true: \p Opcode(sext(a), sext(b)) -> newOpcode(a, b)
+  /// - ISExt == false: \p Opcode(zext(a), zext(b)) -> newOpcode(a, b)
+  /// \pre \p Opcode represents a supported root (\see ::isSupportedRoot()).
+  static unsigned getSameExtensionOpcode(unsigned Opcode, bool IsSExt) {
+    switch (Opcode) {
+    case RISCVISD::ADD_VL:
+    case RISCVISD::VWADD_W_VL:
+    case RISCVISD::VWADDU_W_VL:
+      return IsSExt ? RISCVISD::VWADD_VL : RISCVISD::VWADDU_VL;
+    case RISCVISD::MUL_VL:
+      return IsSExt ? RISCVISD::VWMUL_VL : RISCVISD::VWMULU_VL;
+    case RISCVISD::SUB_VL:
+    case RISCVISD::VWSUB_W_VL:
+    case RISCVISD::VWSUBU_W_VL:
+      return IsSExt ? RISCVISD::VWSUB_VL : RISCVISD::VWSUBU_VL;
+    default:
+      llvm_unreachable("Unexpected opcode");
+    }
+  }
+
+  /// Get the opcode to materialize \p Opcode(sext(a), zext(b)) ->
+  /// newOpcode(a, b).
+  static unsigned getSUOpcode(unsigned Opcode) {
+    assert(Opcode == RISCVISD::MUL_VL && "SU is only supported for MUL");
+    return RISCVISD::VWMULSU_VL;
+  }
+
+  /// Get the opcode to materialize \p Opcode(a, s|zext(b)) ->
+  /// newOpcode(a, b).
+  static unsigned getWOpcode(unsigned Opcode, bool IsSExt) {
+    switch (Opcode) {
+    case RISCVISD::ADD_VL:
+      return IsSExt ? RISCVISD::VWADD_W_VL : RISCVISD::VWADDU_W_VL;
+    case RISCVISD::SUB_VL:
+      return IsSExt ? RISCVISD::VWSUB_W_VL : RISCVISD::VWSUBU_W_VL;
+    default:
+      llvm_unreachable("Unexpected opcode");
+    }
+  }
+
+  using CombineToTry = std::function<std::optional<CombineResult>(
+      SDNode * /*Root*/, const NodeExtensionHelper & /*LHS*/,
+      const NodeExtensionHelper & /*RHS*/)>;
+
+  /// Check if this node needs to be fully folded or extended for all users.
+  bool needToPromoteOtherUsers() const { return EnforceOneUse; }
+
+  /// Helper method to set the various fields of this struct based on the
+  /// type of \p Root.
+  void fillUpExtensionSupport(SDNode *Root, SelectionDAG &DAG) {
+    SupportsZExt = false;
+    SupportsSExt = false;
+    EnforceOneUse = true;
+    CheckMask = true;
+    switch (OrigOperand.getOpcode()) {
+    case RISCVISD::VZEXT_VL:
+      SupportsZExt = true;
+      Mask = OrigOperand.getOperand(1);
+      VL = OrigOperand.getOperand(2);
+      break;
+    case RISCVISD::VSEXT_VL:
+      SupportsSExt = true;
+      Mask = OrigOperand.getOperand(1);
+      VL = OrigOperand.getOperand(2);
+      break;
+    case RISCVISD::VMV_V_X_VL: {
+      // Historically, we didn't care about splat values not disappearing during
+      // combines.
+      EnforceOneUse = false;
+      CheckMask = false;
+      VL = OrigOperand.getOperand(2);
+
+      // The operand is a splat of a scalar.
+
+      // The pasthru must be undef for tail agnostic.
+      if (!OrigOperand.getOperand(0).isUndef())
+        break;
+
+      // Get the scalar value.
+      SDValue Op = OrigOperand.getOperand(1);
+
+      // See if we have enough sign bits or zero bits in the scalar to use a
+      // widening opcode by splatting to smaller element size.
+      MVT VT = Root->getSimpleValueType(0);
+      unsigned EltBits = VT.getScalarSizeInBits();
+      unsigned ScalarBits = Op.getValueSizeInBits();
+      // Make sure we're getting all element bits from the scalar register.
+      // FIXME: Support implicit sign extension of vmv.v.x?
+      if (ScalarBits < EltBits)
+        break;
+
+      unsigned NarrowSize = VT.getScalarSizeInBits() / 2;
+      // If the narrow type cannot be expressed with a legal VMV,
+      // this is not a valid candidate.
+      if (NarrowSize < 8)
+        break;
+
+      if (DAG.ComputeMaxSignificantBits(Op) <= NarrowSize)
+        SupportsSExt = true;
+      if (DAG.MaskedValueIsZero(Op,
+                                APInt::getBitsSetFrom(ScalarBits, NarrowSize)))
+        SupportsZExt = true;
+      break;
+    }
+    default:
+      break;
+    }
+  }
+
+  /// Check if \p Root supports any extension folding combines.
+  static bool isSupportedRoot(const SDNode *Root) {
+    switch (Root->getOpcode()) {
+    case RISCVISD::ADD_VL:
+    case RISCVISD::MUL_VL:
+    case RISCVISD::VWADD_W_VL:
+    case RISCVISD::VWADDU_W_VL:
+    case RISCVISD::SUB_VL:
+    case RISCVISD::VWSUB_W_VL:
+    case RISCVISD::VWSUBU_W_VL:
+      return true;
+    default:
+      return false;
+    }
+  }
+
+  /// Build a NodeExtensionHelper for \p Root.getOperand(\p OperandIdx).
+  NodeExtensionHelper(SDNode *Root, unsigned OperandIdx, SelectionDAG &DAG) {
+    assert(isSupportedRoot(Root) && "Trying to build an helper with an "
+                                    "unsupported root");
+    assert(OperandIdx < 2 && "Requesting something else than LHS or RHS");
+    OrigOperand = Root->getOperand(OperandIdx);
+
+    unsigned Opc = Root->getOpcode();
+    switch (Opc) {
+    // We consider VW<ADD|SUB>(U)_W(LHS, RHS) as if they were
+    // <ADD|SUB>(LHS, S|ZEXT(RHS))
+    case RISCVISD::VWADD_W_VL:
+    case RISCVISD::VWADDU_W_VL:
+    case RISCVISD::VWSUB_W_VL:
+    case RISCVISD::VWSUBU_W_VL:
+      if (OperandIdx == 1) {
+        SupportsZExt =
+            Opc == RISCVISD::VWADDU_W_VL || Opc == RISCVISD::VWSUBU_W_VL;
+        SupportsSExt = !SupportsZExt;
+        std::tie(Mask, VL) = getMaskAndVL(Root);
+        CheckMask = true;
+        // There's no existing extension here, so we don't have to worry about
+        // making sure it gets removed.
+        EnforceOneUse = false;
+        break;
+      }
+      [[fallthrough]];
+    default:
+      fillUpExtensionSupport(Root, DAG);
+      break;
+    }
+  }
+
+  /// Check if this operand is compatible with the given vector length \p VL.
+  bool isVLCompatible(SDValue VL) const {
+    return this->VL != SDValue() && this->VL == VL;
+  }
+
+  /// Check if this operand is compatible with the given \p Mask.
+  bool isMaskCompatible(SDValue Mask) const {
+    return !CheckMask || (this->Mask != SDValue() && this->Mask == Mask);
+  }
+
+  /// Helper function to get the Mask and VL from \p Root.
+  static std::pair<SDValue, SDValue> getMaskAndVL(const SDNode *Root) {
+    assert(isSupportedRoot(Root) && "Unexpected root");
+    return std::make_pair(Root->getOperand(3), Root->getOperand(4));
+  }
+
+  /// Check if the Mask and VL of this operand are compatible with \p Root.
+  bool areVLAndMaskCompatible(const SDNode *Root) const {
+    auto [Mask, VL] = getMaskAndVL(Root);
+    return isMaskCompatible(Mask) && isVLCompatible(VL);
+  }
+
+  /// Helper function to check if \p N is commutative with respect to the
+  /// foldings that are supported by this class.
+  static bool isCommutative(const SDNode *N) {
+    switch (N->getOpcode()) {
+    case RISCVISD::ADD_VL:
+    case RISCVISD::MUL_VL:
+    case RISCVISD::VWADD_W_VL:
+    case RISCVISD::VWADDU_W_VL:
+      return true;
+    case RISCVISD::SUB_VL:
+    case RISCVISD::VWSUB_W_VL:
+    case RISCVISD::VWSUBU_W_VL:
+      return false;
+    default:
+      llvm_unreachable("Unexpected opcode");
+    }
+  }
+
+  /// Get a list of combine to try for folding extensions in \p Root.
+  /// Note that each returned CombineToTry function doesn't actually modify
+  /// anything. Instead they produce an optional CombineResult that if not None,
+  /// need to be materialized for the combine to be applied.
+  /// \see CombineResult::materialize.
+  /// If the related CombineToTry function returns std::nullopt, that means the
+  /// combine didn't match.
+  static SmallVector<CombineToTry> getSupportedFoldings(const SDNode *Root);
+};
+
+/// Helper structure that holds all the necessary information to materialize a
+/// combine that does some extension folding.
+struct CombineResult {
+  /// Opcode to be generated when materializing the combine.
+  unsigned TargetOpcode;
+  // No value means no extension is needed. If extension is needed, the value
+  // indicates if it needs to be sign extended.
+  std::optional<bool> SExtLHS;
+  std::optional<bool> SExtRHS;
+  /// Root of the combine.
+  SDNode *Root;
+  /// LHS of the TargetOpcode.
+  NodeExtensionHelper LHS;
+  /// RHS of the TargetOpcode.
+  NodeExtensionHelper RHS;
+
+  CombineResult(unsigned TargetOpcode, SDNode *Root,
+                const NodeExtensionHelper &LHS, std::optional<bool> SExtLHS,
+                const NodeExtensionHelper &RHS, std::optional<bool> SExtRHS)
+      : TargetOpcode(TargetOpcode), SExtLHS(SExtLHS), SExtRHS(SExtRHS),
+        Root(Root), LHS(LHS), RHS(RHS) {}
+
+  /// Return a value that uses TargetOpcode and that can be used to replace
+  /// Root.
+  /// The actual replacement is *not* done in that method.
+  SDValue materialize(SelectionDAG &DAG) const {
+    SDValue Mask, VL, Merge;
+    std::tie(Mask, VL) = NodeExtensionHelper::getMaskAndVL(Root);
+    Merge = Root->getOperand(2);
+    return DAG.getNode(TargetOpcode, SDLoc(Root), Root->getValueType(0),
+                       LHS.getOrCreateExtendedOp(Root, DAG, SExtLHS),
+                       RHS.getOrCreateExtendedOp(Root, DAG, SExtRHS), Merge,
+                       Mask, VL);
+  }
+};
+
+/// Check if \p Root follows a pattern Root(ext(LHS), ext(RHS))
+/// where `ext` is the same for both LHS and RHS (i.e., both are sext or both
+/// are zext) and LHS and RHS can be folded into Root.
+/// AllowSExt and AllozZExt define which form `ext` can take in this pattern.
+///
+/// \note If the pattern can match with both zext and sext, the returned
+/// CombineResult will feature the zext result.
+///
+/// \returns std::nullopt if the pattern doesn't match or a CombineResult that
+/// can be used to apply the pattern.
+static std::optional<CombineResult>
+canFoldToVWWithSameExtensionImpl(SDNode *Root, const NodeExtensionHelper &LHS,
+                                 const NodeExtensionHelper &RHS, bool AllowSExt,
+                                 bool AllowZExt) {
+  assert((AllowSExt || AllowZExt) && "Forgot to set what you want?");
+  if (!LHS.areVLAndMaskCompatible(Root) || !RHS.areVLAndMaskCompatible(Root))
+    return std::nullopt;
+  if (AllowZExt && LHS.SupportsZExt && RHS.SupportsZExt)
+    return CombineResult(NodeExtensionHelper::getSameExtensionOpcode(
+                             Root->getOpcode(), /*IsSExt=*/false),
+                         Root, LHS, /*SExtLHS=*/false, RHS,
+                         /*SExtRHS=*/false);
+  if (AllowSExt && LHS.SupportsSExt && RHS.SupportsSExt)
+    return CombineResult(NodeExtensionHelper::getSameExtensionOpcode(
+                             Root->getOpcode(), /*IsSExt=*/true),
+                         Root, LHS, /*SExtLHS=*/true, RHS,
+                         /*SExtRHS=*/true);
+  return std::nullopt;
+}
+
+/// Check if \p Root follows a pattern Root(ext(LHS), ext(RHS))
+/// where `ext` is the same for both LHS and RHS (i.e., both are sext or both
+/// are zext) and LHS and RHS can be folded into Root.
+///
+/// \returns std::nullopt if the pattern doesn't match or a CombineResult that
+/// can be used to apply the pattern.
+static std::optional<CombineResult>
+canFoldToVWWithSameExtension(SDNode *Root, const NodeExtensionHelper &LHS,
+                             const NodeExtensionHelper &RHS) {
+  return canFoldToVWWithSameExtensionImpl(Root, LHS, RHS, /*AllowSExt=*/true,
+                                          /*AllowZExt=*/true);
+}
+
+/// Check if \p Root follows a pattern Root(LHS, ext(RHS))
+///
+/// \returns std::nullopt if the pattern doesn't match or a CombineResult that
+/// can be used to apply the pattern.
+static std::optional<CombineResult>
+canFoldToVW_W(SDNode *Root, const NodeExtensionHelper &LHS,
+              const NodeExtensionHelper &RHS) {
+  if (!RHS.areVLAndMaskCompatible(Root))
+    return std::nullopt;
+
+  // FIXME: Is it useful to form a vwadd.wx or vwsub.wx if it removes a scalar
+  // sext/zext?
+  // Control this behavior behind an option (AllowSplatInVW_W) for testing
+  // purposes.
+  if (RHS.SupportsZExt && (!RHS.isSplat() || AllowSplatInVW_W))
+    return CombineResult(
+        NodeExtensionHelper::getWOpcode(Root->getOpcode(), /*IsSExt=*/false),
+        Root, LHS, /*SExtLHS=*/std::nullopt, RHS, /*SExtRHS=*/false);
+  if (RHS.SupportsSExt && (!RHS.isSplat() || AllowSplatInVW_W))
+    return CombineResult(
+        NodeExtensionHelper::getWOpcode(Root->getOpcode(), /*IsSExt=*/true),
+        Root, LHS, /*SExtLHS=*/std::nullopt, RHS, /*SExtRHS=*/true);
+  return std::nullopt;
+}
+
+/// Check if \p Root follows a pattern Root(sext(LHS), sext(RHS))
+///
+/// \returns std::nullopt if the pattern doesn't match or a CombineResult that
+/// can be used to apply the pattern.
+static std::optional<CombineResult>
+canFoldToVWWithSEXT(SDNode *Root, const NodeExtensionHelper &LHS,
+                    const NodeExtensionHelper &RHS) {
+  return canFoldToVWWithSameExtensionImpl(Root, LHS, RHS, /*AllowSExt=*/true,
+                                          /*AllowZExt=*/false);
+}
+
+/// Check if \p Root follows a pattern Root(zext(LHS), zext(RHS))
+///
+/// \returns std::nullopt if the pattern doesn't match or a CombineResult that
+/// can be used to apply the pattern.
+static std::optional<CombineResult>
+canFoldToVWWithZEXT(SDNode *Root, const NodeExtensionHelper &LHS,
+                    const NodeExtensionHelper &RHS) {
+  return canFoldToVWWithSameExtensionImpl(Root, LHS, RHS, /*AllowSExt=*/false,
+                                          /*AllowZExt=*/true);
+}
+
+/// Check if \p Root follows a pattern Root(sext(LHS), zext(RHS))
+///
+/// \returns std::nullopt if the pattern doesn't match or a CombineResult that
+/// can be used to apply the pattern.
+static std::optional<CombineResult>
+canFoldToVW_SU(SDNode *Root, const NodeExtensionHelper &LHS,
+               const NodeExtensionHelper &RHS) {
+  if (!LHS.SupportsSExt || !RHS.SupportsZExt)
+    return std::nullopt;
+  if (!LHS.areVLAndMaskCompatible(Root) || !RHS.areVLAndMaskCompatible(Root))
+    return std::nullopt;
+  return CombineResult(NodeExtensionHelper::getSUOpcode(Root->getOpcode()),
+                       Root, LHS, /*SExtLHS=*/true, RHS, /*SExtRHS=*/false);
+}
+
+SmallVector<NodeExtensionHelper::CombineToTry>
+NodeExtensionHelper::getSupportedFoldings(const SDNode *Root) {
+  SmallVector<CombineToTry> Strategies;
+  switch (Root->getOpcode()) {
+  case RISCVISD::ADD_VL:
+  case RISCVISD::SUB_VL:
+    // add|sub -> vwadd(u)|vwsub(u)
+    Strategies.push_back(canFoldToVWWithSameExtension);
+    // add|sub -> vwadd(u)_w|vwsub(u)_w
+    Strategies.push_back(canFoldToVW_W);
+    break;
+  case RISCVISD::MUL_VL:
+    // mul -> vwmul(u)
+    Strategies.push_back(canFoldToVWWithSameExtension);
+    // mul -> vwmulsu
+    Strategies.push_back(canFoldToVW_SU);
+    break;
+  case RISCVISD::VWADD_W_VL:
+  case RISCVISD::VWSUB_W_VL:
+    // vwadd_w|vwsub_w -> vwadd|vwsub
+    Strategies.push_back(canFoldToVWWithSEXT);
+    break;
+  case RISCVISD::VWADDU_W_VL:
+  case RISCVISD::VWSUBU_W_VL:
+    // vwaddu_w|vwsubu_w -> vwaddu|vwsubu
+    Strategies.push_back(canFoldToVWWithZEXT);
+    break;
+  default:
+    llvm_unreachable("Unexpected opcode");
+  }
+  return Strategies;
+}
+} // End anonymous namespace.
+
+/// Combine a binary operation to its equivalent VW or VW_W form.
+/// The supported combines are:
+/// add_vl -> vwadd(u) | vwadd(u)_w
+/// sub_vl -> vwsub(u) | vwsub(u)_w
+/// mul_vl -> vwmul(u) | vwmul_su
+/// vwadd_w(u) -> vwadd(u)
+/// vwub_w(u) -> vwadd(u)
+static SDValue
+combineBinOp_VLToVWBinOp_VL(SDNode *N, TargetLowering::DAGCombinerInfo &DCI) {
+  SelectionDAG &DAG = DCI.DAG;
+
+  assert(NodeExtensionHelper::isSupportedRoot(N) &&
+         "Shouldn't have called this method");
+  SmallVector<SDNode *> Worklist;
+  SmallSet<SDNode *, 8> Inserted;
+  Worklist.push_back(N);
+  Inserted.insert(N);
+  SmallVector<CombineResult> CombinesToApply;
+
+  while (!Worklist.empty()) {
+    SDNode *Root = Worklist.pop_back_val();
+    if (!NodeExtensionHelper::isSupportedRoot(Root))
+      return SDValue();
+
+    NodeExtensionHelper LHS(N, 0, DAG);
+    NodeExtensionHelper RHS(N, 1, DAG);
+    auto AppendUsersIfNeeded = [&Worklist,
+                                &Inserted](const NodeExtensionHelper &Op) {
+      if (Op.needToPromoteOtherUsers()) {
+        for (SDNode *TheUse : Op.OrigOperand->uses()) {
+          if (Inserted.insert(TheUse).second)
+            Worklist.push_back(TheUse);
+        }
+      }
+    };
+
+    // Control the compile time by limiting the number of node we look at in
+    // total.
+    if (Inserted.size() > ExtensionMaxWebSize)
+      return SDValue();
+
+    SmallVector<NodeExtensionHelper::CombineToTry> FoldingStrategies =
+        NodeExtensionHelper::getSupportedFoldings(N);
+
+    assert(!FoldingStrategies.empty() && "Nothing to be folded");
+    bool Matched = false;
+    for (int Attempt = 0;
+         (Attempt != 1 + NodeExtensionHelper::isCommutative(N)) && !Matched;
+         ++Attempt) {
+
+      for (NodeExtensionHelper::CombineToTry FoldingStrategy :
+           FoldingStrategies) {
+        std::optional<CombineResult> Res = FoldingStrategy(N, LHS, RHS);
+        if (Res) {
+          Matched = true;
+          CombinesToApply.push_back(*Res);
+          // All the inputs that are extended need to be folded, otherwise
+          // we would be leaving the old input (since it is may still be used),
+          // and the new one.
+          if (Res->SExtLHS.has_value())
+            AppendUsersIfNeeded(LHS);
+          if (Res->SExtRHS.has_value())
+            AppendUsersIfNeeded(RHS);
+          break;
+        }
+      }
+      std::swap(LHS, RHS);
+    }
+    // Right now we do an all or nothing approach.
+    if (!Matched)
+      return SDValue();
+  }
+  // Store the value for the replacement of the input node separately.
+  SDValue InputRootReplacement;
+  // We do the RAUW after we materialize all the combines, because some replaced
+  // nodes may be feeding some of the yet-to-be-replaced nodes. Put differently,
+  // some of these nodes may appear in the NodeExtensionHelpers of some of the
+  // yet-to-be-visited CombinesToApply roots.
+  SmallVector<std::pair<SDValue, SDValue>> ValuesToReplace;
+  ValuesToReplace.reserve(CombinesToApply.size());
+  for (CombineResult Res : CombinesToApply) {
+    SDValue NewValue = Res.materialize(DAG);
+    if (!InputRootReplacement) {
+      assert(Res.Root == N &&
+             "First element is expected to be the current node");
+      InputRootReplacement = NewValue;
+    } else {
+      ValuesToReplace.emplace_back(SDValue(Res.Root, 0), NewValue);
+    }
+  }
+  for (std::pair<SDValue, SDValue> OldNewValues : ValuesToReplace) {
+    DAG.ReplaceAllUsesOfValueWith(OldNewValues.first, OldNewValues.second);
+    DCI.AddToWorklist(OldNewValues.second.getNode());
+  }
+  return InputRootReplacement;
+}
+
+// Fold
+//   (fp_to_int (froundeven X)) -> fcvt X, rne
+//   (fp_to_int (ftrunc X))     -> fcvt X, rtz
+//   (fp_to_int (ffloor X))     -> fcvt X, rdn
+//   (fp_to_int (fceil X))      -> fcvt X, rup
+//   (fp_to_int (fround X))     -> fcvt X, rmm
+static SDValue performFP_TO_INTCombine(SDNode *N,
+                                       TargetLowering::DAGCombinerInfo &DCI,
+                                       const RISCVSubtarget &Subtarget) {
+  SelectionDAG &DAG = DCI.DAG;
+  const TargetLowering &TLI = DAG.getTargetLoweringInfo();
+  MVT XLenVT = Subtarget.getXLenVT();
+
+  SDValue Src = N->getOperand(0);
+
+  // Ensure the FP type is legal.
+  if (!TLI.isTypeLegal(Src.getValueType()))
+    return SDValue();
+
+  // Don't do this for f16 with Zfhmin and not Zfh.
+  if (Src.getValueType() == MVT::f16 && !Subtarget.hasStdExtZfh())
+    return SDValue();
+
+  RISCVFPRndMode::RoundingMode FRM = matchRoundingOp(Src.getOpcode());
+  if (FRM == RISCVFPRndMode::Invalid)
+    return SDValue();
+
+  SDLoc DL(N);
+  bool IsSigned = N->getOpcode() == ISD::FP_TO_SINT;
+  EVT VT = N->getValueType(0);
+
+  if (VT.isVector() && TLI.isTypeLegal(VT)) {
+    MVT SrcVT = Src.getSimpleValueType();
+    MVT SrcContainerVT = SrcVT;
+    MVT ContainerVT = VT.getSimpleVT();
+    SDValue XVal = Src.getOperand(0);
+
+    // For widening and narrowing conversions we just combine it into a
+    // VFCVT_..._VL node, as there are no specific VFWCVT/VFNCVT VL nodes. They
+    // end up getting lowered to their appropriate pseudo instructions based on
+    // their operand types
+    if (VT.getScalarSizeInBits() > SrcVT.getScalarSizeInBits() * 2 ||
+        VT.getScalarSizeInBits() * 2 < SrcVT.getScalarSizeInBits())
+      return SDValue();
+
+    // Make fixed-length vectors scalable first
+    if (SrcVT.isFixedLengthVector()) {
+      SrcContainerVT = getContainerForFixedLengthVector(DAG, SrcVT, Subtarget);
+      XVal = convertToScalableVector(SrcContainerVT, XVal, DAG, Subtarget);
+      ContainerVT =
+          getContainerForFixedLengthVector(DAG, ContainerVT, Subtarget);
+    }
+
+    auto [Mask, VL] =
+        getDefaultVLOps(SrcVT, SrcContainerVT, DL, DAG, Subtarget);
+
+    SDValue FpToInt;
+    if (FRM == RISCVFPRndMode::RTZ) {
+      // Use the dedicated trunc static rounding mode if we're truncating so we
+      // don't need to generate calls to fsrmi/fsrm
+      unsigned Opc =
+          IsSigned ? RISCVISD::VFCVT_RTZ_X_F_VL : RISCVISD::VFCVT_RTZ_XU_F_VL;
+      FpToInt = DAG.getNode(Opc, DL, ContainerVT, XVal, Mask, VL);
+    } else {
+      unsigned Opc =
+          IsSigned ? RISCVISD::VFCVT_RM_X_F_VL : RISCVISD::VFCVT_RM_XU_F_VL;
+      FpToInt = DAG.getNode(Opc, DL, ContainerVT, XVal, Mask,
+                            DAG.getTargetConstant(FRM, DL, XLenVT), VL);
+    }
+
+    // If converted from fixed-length to scalable, convert back
+    if (VT.isFixedLengthVector())
+      FpToInt = convertFromScalableVector(VT, FpToInt, DAG, Subtarget);
+
+    return FpToInt;
+  }
+
+  // Only handle XLen or i32 types. Other types narrower than XLen will
+  // eventually be legalized to XLenVT.
+  if (VT != MVT::i32 && VT != XLenVT)
+    return SDValue();
+
+  unsigned Opc;
+  if (VT == XLenVT)
+    Opc = IsSigned ? RISCVISD::FCVT_X : RISCVISD::FCVT_XU;
   else
-    CombinedShAmt = ShAmt1 ^ ShAmt2;
+    Opc = IsSigned ? RISCVISD::FCVT_W_RV64 : RISCVISD::FCVT_WU_RV64;
 
-  if (CombinedShAmt == 0)
-    return Src;
+  SDValue FpToInt = DAG.getNode(Opc, DL, XLenVT, Src.getOperand(0),
+                                DAG.getTargetConstant(FRM, DL, XLenVT));
+  return DAG.getNode(ISD::TRUNCATE, DL, VT, FpToInt);
+}
+
+// Fold
+//   (fp_to_int_sat (froundeven X)) -> (select X == nan, 0, (fcvt X, rne))
+//   (fp_to_int_sat (ftrunc X))     -> (select X == nan, 0, (fcvt X, rtz))
+//   (fp_to_int_sat (ffloor X))     -> (select X == nan, 0, (fcvt X, rdn))
+//   (fp_to_int_sat (fceil X))      -> (select X == nan, 0, (fcvt X, rup))
+//   (fp_to_int_sat (fround X))     -> (select X == nan, 0, (fcvt X, rmm))
+static SDValue performFP_TO_INT_SATCombine(SDNode *N,
+                                       TargetLowering::DAGCombinerInfo &DCI,
+                                       const RISCVSubtarget &Subtarget) {
+  SelectionDAG &DAG = DCI.DAG;
+  const TargetLowering &TLI = DAG.getTargetLoweringInfo();
+  MVT XLenVT = Subtarget.getXLenVT();
+
+  // Only handle XLen types. Other types narrower than XLen will eventually be
+  // legalized to XLenVT.
+  EVT DstVT = N->getValueType(0);
+  if (DstVT != XLenVT)
+    return SDValue();
+
+  SDValue Src = N->getOperand(0);
+
+  // Ensure the FP type is also legal.
+  if (!TLI.isTypeLegal(Src.getValueType()))
+    return SDValue();
+
+  // Don't do this for f16 with Zfhmin and not Zfh.
+  if (Src.getValueType() == MVT::f16 && !Subtarget.hasStdExtZfh())
+    return SDValue();
+
+  EVT SatVT = cast<VTSDNode>(N->getOperand(1))->getVT();
+
+  RISCVFPRndMode::RoundingMode FRM = matchRoundingOp(Src.getOpcode());
+  if (FRM == RISCVFPRndMode::Invalid)
+    return SDValue();
+
+  bool IsSigned = N->getOpcode() == ISD::FP_TO_SINT_SAT;
+
+  unsigned Opc;
+  if (SatVT == DstVT)
+    Opc = IsSigned ? RISCVISD::FCVT_X : RISCVISD::FCVT_XU;
+  else if (DstVT == MVT::i64 && SatVT == MVT::i32)
+    Opc = IsSigned ? RISCVISD::FCVT_W_RV64 : RISCVISD::FCVT_WU_RV64;
+  else
+    return SDValue();
+  // FIXME: Support other SatVTs by clamping before or after the conversion.
+
+  Src = Src.getOperand(0);
+
+  SDLoc DL(N);
+  SDValue FpToInt = DAG.getNode(Opc, DL, XLenVT, Src,
+                                DAG.getTargetConstant(FRM, DL, XLenVT));
+
+  // fcvt.wu.* sign extends bit 31 on RV64. FP_TO_UINT_SAT expects to zero
+  // extend.
+  if (Opc == RISCVISD::FCVT_WU_RV64)
+    FpToInt = DAG.getZeroExtendInReg(FpToInt, DL, MVT::i32);
+
+  // RISCV FP-to-int conversions saturate to the destination register size, but
+  // don't produce 0 for nan.
+  SDValue ZeroInt = DAG.getConstant(0, DL, DstVT);
+  return DAG.getSelectCC(DL, Src, Src, ZeroInt, FpToInt, ISD::CondCode::SETUO);
+}
+
+// Combine (bitreverse (bswap X)) to the BREV8 GREVI encoding if the type is
+// smaller than XLenVT.
+static SDValue performBITREVERSECombine(SDNode *N, SelectionDAG &DAG,
+                                        const RISCVSubtarget &Subtarget) {
+  assert(Subtarget.hasStdExtZbkb() && "Unexpected extension");
+
+  SDValue Src = N->getOperand(0);
+  if (Src.getOpcode() != ISD::BSWAP)
+    return SDValue();
+
+  EVT VT = N->getValueType(0);
+  if (!VT.isScalarInteger() || VT.getSizeInBits() >= Subtarget.getXLen() ||
+      !isPowerOf2_32(VT.getSizeInBits()))
+    return SDValue();
+
+  SDLoc DL(N);
+  return DAG.getNode(RISCVISD::BREV8, DL, VT, Src.getOperand(0));
+}
+
+// Convert from one FMA opcode to another based on whether we are negating the
+// multiply result and/or the accumulator.
+// NOTE: Only supports RVV operations with VL.
+static unsigned negateFMAOpcode(unsigned Opcode, bool NegMul, bool NegAcc) {
+  assert((NegMul || NegAcc) && "Not negating anything?");
+
+  // Negating the multiply result changes ADD<->SUB and toggles 'N'.
+  if (NegMul) {
+    // clang-format off
+    switch (Opcode) {
+    default: llvm_unreachable("Unexpected opcode");
+    case RISCVISD::VFMADD_VL:  Opcode = RISCVISD::VFNMSUB_VL; break;
+    case RISCVISD::VFNMSUB_VL: Opcode = RISCVISD::VFMADD_VL;  break;
+    case RISCVISD::VFNMADD_VL: Opcode = RISCVISD::VFMSUB_VL;  break;
+    case RISCVISD::VFMSUB_VL:  Opcode = RISCVISD::VFNMADD_VL; break;
+    }
+    // clang-format on
+  }
+
+  // Negating the accumulator changes ADD<->SUB.
+  if (NegAcc) {
+    // clang-format off
+    switch (Opcode) {
+    default: llvm_unreachable("Unexpected opcode");
+    case RISCVISD::VFMADD_VL:  Opcode = RISCVISD::VFMSUB_VL;  break;
+    case RISCVISD::VFMSUB_VL:  Opcode = RISCVISD::VFMADD_VL;  break;
+    case RISCVISD::VFNMADD_VL: Opcode = RISCVISD::VFNMSUB_VL; break;
+    case RISCVISD::VFNMSUB_VL: Opcode = RISCVISD::VFNMADD_VL; break;
+    }
+    // clang-format on
+  }
+
+  return Opcode;
+}
+
+static SDValue performSRACombine(SDNode *N, SelectionDAG &DAG,
+                                 const RISCVSubtarget &Subtarget) {
+  assert(N->getOpcode() == ISD::SRA && "Unexpected opcode");
+
+  if (N->getValueType(0) != MVT::i64 || !Subtarget.is64Bit())
+    return SDValue();
+
+  if (!isa<ConstantSDNode>(N->getOperand(1)))
+    return SDValue();
+  uint64_t ShAmt = N->getConstantOperandVal(1);
+  if (ShAmt > 32)
+    return SDValue();
+
+  SDValue N0 = N->getOperand(0);
+
+  // Combine (sra (sext_inreg (shl X, C1), i32), C2) ->
+  // (sra (shl X, C1+32), C2+32) so it gets selected as SLLI+SRAI instead of
+  // SLLIW+SRAIW. SLLI+SRAI have compressed forms.
+  if (ShAmt < 32 &&
+      N0.getOpcode() == ISD::SIGN_EXTEND_INREG && N0.hasOneUse() &&
+      cast<VTSDNode>(N0.getOperand(1))->getVT() == MVT::i32 &&
+      N0.getOperand(0).getOpcode() == ISD::SHL && N0.getOperand(0).hasOneUse() &&
+      isa<ConstantSDNode>(N0.getOperand(0).getOperand(1))) {
+    uint64_t LShAmt = N0.getOperand(0).getConstantOperandVal(1);
+    if (LShAmt < 32) {
+      SDLoc ShlDL(N0.getOperand(0));
+      SDValue Shl = DAG.getNode(ISD::SHL, ShlDL, MVT::i64,
+                                N0.getOperand(0).getOperand(0),
+                                DAG.getConstant(LShAmt + 32, ShlDL, MVT::i64));
+      SDLoc DL(N);
+      return DAG.getNode(ISD::SRA, DL, MVT::i64, Shl,
+                         DAG.getConstant(ShAmt + 32, DL, MVT::i64));
+    }
+  }
+
+  // Combine (sra (shl X, 32), 32 - C) -> (shl (sext_inreg X, i32), C)
+  // FIXME: Should this be a generic combine? There's a similar combine on X86.
+  //
+  // Also try these folds where an add or sub is in the middle.
+  // (sra (add (shl X, 32), C1), 32 - C) -> (shl (sext_inreg (add X, C1), C)
+  // (sra (sub C1, (shl X, 32)), 32 - C) -> (shl (sext_inreg (sub C1, X), C)
+  SDValue Shl;
+  ConstantSDNode *AddC = nullptr;
+
+  // We might have an ADD or SUB between the SRA and SHL.
+  bool IsAdd = N0.getOpcode() == ISD::ADD;
+  if ((IsAdd || N0.getOpcode() == ISD::SUB)) {
+    // Other operand needs to be a constant we can modify.
+    AddC = dyn_cast<ConstantSDNode>(N0.getOperand(IsAdd ? 1 : 0));
+    if (!AddC)
+      return SDValue();
+
+    // AddC needs to have at least 32 trailing zeros.
+    if (AddC->getAPIntValue().countTrailingZeros() < 32)
+      return SDValue();
+
+    // All users should be a shift by constant less than or equal to 32. This
+    // ensures we'll do this optimization for each of them to produce an
+    // add/sub+sext_inreg they can all share.
+    for (SDNode *U : N0->uses()) {
+      if (U->getOpcode() != ISD::SRA ||
+          !isa<ConstantSDNode>(U->getOperand(1)) ||
+          cast<ConstantSDNode>(U->getOperand(1))->getZExtValue() > 32)
+        return SDValue();
+    }
+
+    Shl = N0.getOperand(IsAdd ? 0 : 1);
+  } else {
+    // Not an ADD or SUB.
+    Shl = N0;
+  }
+
+  // Look for a shift left by 32.
+  if (Shl.getOpcode() != ISD::SHL || !isa<ConstantSDNode>(Shl.getOperand(1)) ||
+      Shl.getConstantOperandVal(1) != 32)
+    return SDValue();
+
+  // We if we didn't look through an add/sub, then the shl should have one use.
+  // If we did look through an add/sub, the sext_inreg we create is free so
+  // we're only creating 2 new instructions. It's enough to only remove the
+  // original sra+add/sub.
+  if (!AddC && !Shl.hasOneUse())
+    return SDValue();
+
+  SDLoc DL(N);
+  SDValue In = Shl.getOperand(0);
+
+  // If we looked through an ADD or SUB, we need to rebuild it with the shifted
+  // constant.
+  if (AddC) {
+    SDValue ShiftedAddC =
+        DAG.getConstant(AddC->getAPIntValue().lshr(32), DL, MVT::i64);
+    if (IsAdd)
+      In = DAG.getNode(ISD::ADD, DL, MVT::i64, In, ShiftedAddC);
+    else
+      In = DAG.getNode(ISD::SUB, DL, MVT::i64, ShiftedAddC, In);
+  }
+
+  SDValue SExt = DAG.getNode(ISD::SIGN_EXTEND_INREG, DL, MVT::i64, In,
+                             DAG.getValueType(MVT::i32));
+  if (ShAmt == 32)
+    return SExt;
 
-  SDLoc DL(N);
   return DAG.getNode(
-      N->getOpcode(), DL, N->getValueType(0), Src,
-      DAG.getConstant(CombinedShAmt, DL, N->getOperand(1).getValueType()));
+      ISD::SHL, DL, MVT::i64, SExt,
+      DAG.getConstant(32 - ShAmt, DL, MVT::i64));
 }
 
-// Combine a constant select operand into its use:
-//
-// (and (select_cc lhs, rhs, cc, -1, c), x)
-//   -> (select_cc lhs, rhs, cc, x, (and, x, c))  [AllOnes=1]
-// (or  (select_cc lhs, rhs, cc, 0, c), x)
-//   -> (select_cc lhs, rhs, cc, x, (or, x, c))  [AllOnes=0]
-// (xor (select_cc lhs, rhs, cc, 0, c), x)
-//   -> (select_cc lhs, rhs, cc, x, (xor, x, c))  [AllOnes=0]
-static SDValue combineSelectCCAndUse(SDNode *N, SDValue Slct, SDValue OtherOp,
-                                     SelectionDAG &DAG, bool AllOnes) {
-  EVT VT = N->getValueType(0);
+// Invert (and/or (set cc X, Y), (xor Z, 1)) to (or/and (set !cc X, Y)), Z) if
+// the result is used as the conditon of a br_cc or select_cc we can invert,
+// inverting the setcc is free, and Z is 0/1. Caller will invert the
+// br_cc/select_cc.
+static SDValue tryDemorganOfBooleanCondition(SDValue Cond, SelectionDAG &DAG) {
+  bool IsAnd = Cond.getOpcode() == ISD::AND;
+  if (!IsAnd && Cond.getOpcode() != ISD::OR)
+    return SDValue();
 
-  if (Slct.getOpcode() != RISCVISD::SELECT_CC || !Slct.hasOneUse())
+  if (!Cond.hasOneUse())
     return SDValue();
 
-  auto isZeroOrAllOnes = [](SDValue N, bool AllOnes) {
-    return AllOnes ? isAllOnesConstant(N) : isNullConstant(N);
-  };
+  SDValue Setcc = Cond.getOperand(0);
+  SDValue Xor = Cond.getOperand(1);
+  // Canonicalize setcc to LHS.
+  if (Setcc.getOpcode() != ISD::SETCC)
+    std::swap(Setcc, Xor);
+  // LHS should be a setcc and RHS should be an xor.
+  if (Setcc.getOpcode() != ISD::SETCC || !Setcc.hasOneUse() ||
+      Xor.getOpcode() != ISD::XOR || !Xor.hasOneUse())
+    return SDValue();
 
-  bool SwapSelectOps;
-  SDValue TrueVal = Slct.getOperand(3);
-  SDValue FalseVal = Slct.getOperand(4);
-  SDValue NonConstantVal;
-  if (isZeroOrAllOnes(TrueVal, AllOnes)) {
-    SwapSelectOps = false;
-    NonConstantVal = FalseVal;
-  } else if (isZeroOrAllOnes(FalseVal, AllOnes)) {
-    SwapSelectOps = true;
-    NonConstantVal = TrueVal;
-  } else
+  // If the condition is an And, SimplifyDemandedBits may have changed
+  // (xor Z, 1) to (not Z).
+  SDValue Xor1 = Xor.getOperand(1);
+  if (!isOneConstant(Xor1) && !(IsAnd && isAllOnesConstant(Xor1)))
     return SDValue();
 
-  // Slct is now know to be the desired identity constant when CC is true.
-  TrueVal = OtherOp;
-  FalseVal = DAG.getNode(N->getOpcode(), SDLoc(N), VT, OtherOp, NonConstantVal);
-  // Unless SwapSelectOps says CC should be false.
-  if (SwapSelectOps)
-    std::swap(TrueVal, FalseVal);
+  EVT VT = Cond.getValueType();
+  SDValue Xor0 = Xor.getOperand(0);
 
-  return DAG.getNode(RISCVISD::SELECT_CC, SDLoc(N), VT,
-                     {Slct.getOperand(0), Slct.getOperand(1),
-                      Slct.getOperand(2), TrueVal, FalseVal});
-}
+  // The LHS of the xor needs to be 0/1.
+  APInt Mask = APInt::getBitsSetFrom(VT.getSizeInBits(), 1);
+  if (!DAG.MaskedValueIsZero(Xor0, Mask))
+    return SDValue();
 
-// Attempt combineSelectAndUse on each operand of a commutative operator N.
-static SDValue combineSelectCCAndUseCommutative(SDNode *N, SelectionDAG &DAG,
-                                                bool AllOnes) {
-  SDValue N0 = N->getOperand(0);
-  SDValue N1 = N->getOperand(1);
-  if (SDValue Result = combineSelectCCAndUse(N, N0, N1, DAG, AllOnes))
-    return Result;
-  if (SDValue Result = combineSelectCCAndUse(N, N1, N0, DAG, AllOnes))
-    return Result;
-  return SDValue();
-}
+  // We can only invert integer setccs.
+  EVT SetCCOpVT = Setcc.getOperand(0).getValueType();
+  if (!SetCCOpVT.isScalarInteger())
+    return SDValue();
 
-static SDValue performANDCombine(SDNode *N,
-                                 TargetLowering::DAGCombinerInfo &DCI,
-                                 const RISCVSubtarget &Subtarget) {
-  SelectionDAG &DAG = DCI.DAG;
+  ISD::CondCode CCVal = cast<CondCodeSDNode>(Setcc.getOperand(2))->get();
+  if (ISD::isIntEqualitySetCC(CCVal)) {
+    CCVal = ISD::getSetCCInverse(CCVal, SetCCOpVT);
+    Setcc = DAG.getSetCC(SDLoc(Setcc), VT, Setcc.getOperand(0),
+                         Setcc.getOperand(1), CCVal);
+  } else if (CCVal == ISD::SETLT && isNullConstant(Setcc.getOperand(0))) {
+    // Invert (setlt 0, X) by converting to (setlt X, 1).
+    Setcc = DAG.getSetCC(SDLoc(Setcc), VT, Setcc.getOperand(1),
+                         DAG.getConstant(1, SDLoc(Setcc), VT), CCVal);
+  } else if (CCVal == ISD::SETLT && isOneConstant(Setcc.getOperand(1))) {
+    // (setlt X, 1) by converting to (setlt 0, X).
+    Setcc = DAG.getSetCC(SDLoc(Setcc), VT,
+                         DAG.getConstant(0, SDLoc(Setcc), VT),
+                         Setcc.getOperand(0), CCVal);
+  } else
+    return SDValue();
 
-  // fold (and (select_cc lhs, rhs, cc, -1, y), x) ->
-  //      (select lhs, rhs, cc, x, (and x, y))
-  return combineSelectCCAndUseCommutative(N, DAG, true);
+  unsigned Opc = IsAnd ? ISD::OR : ISD::AND;
+  return DAG.getNode(Opc, SDLoc(Cond), VT, Setcc, Xor.getOperand(0));
 }
 
-static SDValue performORCombine(SDNode *N, TargetLowering::DAGCombinerInfo &DCI,
-                                const RISCVSubtarget &Subtarget) {
-  SelectionDAG &DAG = DCI.DAG;
-  if (Subtarget.hasStdExtZbp()) {
-    if (auto GREV = combineORToGREV(SDValue(N, 0), DAG, Subtarget))
-      return GREV;
-    if (auto GORC = combineORToGORC(SDValue(N, 0), DAG, Subtarget))
-      return GORC;
-    if (auto SHFL = combineORToSHFL(SDValue(N, 0), DAG, Subtarget))
-      return SHFL;
+// Perform common combines for BR_CC and SELECT_CC condtions.
+static bool combine_CC(SDValue &LHS, SDValue &RHS, SDValue &CC, const SDLoc &DL,
+                       SelectionDAG &DAG, const RISCVSubtarget &Subtarget) {
+  ISD::CondCode CCVal = cast<CondCodeSDNode>(CC)->get();
+
+  // As far as arithmetic right shift always saves the sign,
+  // shift can be omitted.
+  // Fold setlt (sra X, N), 0 -> setlt X, 0 and
+  // setge (sra X, N), 0 -> setge X, 0
+  if (auto *RHSConst = dyn_cast<ConstantSDNode>(RHS.getNode())) {
+    if ((CCVal == ISD::SETGE || CCVal == ISD::SETLT) &&
+        LHS.getOpcode() == ISD::SRA && RHSConst->isZero()) {
+      LHS = LHS.getOperand(0);
+      return true;
+    }
   }
 
-  // fold (or (select_cc lhs, rhs, cc, 0, y), x) ->
-  //      (select lhs, rhs, cc, x, (or x, y))
-  return combineSelectCCAndUseCommutative(N, DAG, false);
-}
+  if (!ISD::isIntEqualitySetCC(CCVal))
+    return false;
 
-static SDValue performXORCombine(SDNode *N,
-                                 TargetLowering::DAGCombinerInfo &DCI,
-                                 const RISCVSubtarget &Subtarget) {
-  SelectionDAG &DAG = DCI.DAG;
+  // Fold ((setlt X, Y), 0, ne) -> (X, Y, lt)
+  // Sometimes the setcc is introduced after br_cc/select_cc has been formed.
+  if (LHS.getOpcode() == ISD::SETCC && isNullConstant(RHS) &&
+      LHS.getOperand(0).getValueType() == Subtarget.getXLenVT()) {
+    // If we're looking for eq 0 instead of ne 0, we need to invert the
+    // condition.
+    bool Invert = CCVal == ISD::SETEQ;
+    CCVal = cast<CondCodeSDNode>(LHS.getOperand(2))->get();
+    if (Invert)
+      CCVal = ISD::getSetCCInverse(CCVal, LHS.getValueType());
 
-  // fold (xor (select_cc lhs, rhs, cc, 0, y), x) ->
-  //      (select lhs, rhs, cc, x, (xor x, y))
-  return combineSelectCCAndUseCommutative(N, DAG, false);
-}
+    RHS = LHS.getOperand(1);
+    LHS = LHS.getOperand(0);
+    translateSetCCForBranch(DL, LHS, RHS, CCVal, DAG);
 
-// Attempt to turn ANY_EXTEND into SIGN_EXTEND if the input to the ANY_EXTEND
-// has users that require SIGN_EXTEND and the SIGN_EXTEND can be done for free
-// by an instruction like ADDW/SUBW/MULW. Without this the ANY_EXTEND would be
-// removed during type legalization leaving an ADD/SUB/MUL use that won't use
-// ADDW/SUBW/MULW.
-static SDValue performANY_EXTENDCombine(SDNode *N,
-                                        TargetLowering::DAGCombinerInfo &DCI,
-                                        const RISCVSubtarget &Subtarget) {
-  if (!Subtarget.is64Bit())
-    return SDValue();
+    CC = DAG.getCondCode(CCVal);
+    return true;
+  }
 
-  SelectionDAG &DAG = DCI.DAG;
+  // Fold ((xor X, Y), 0, eq/ne) -> (X, Y, eq/ne)
+  if (LHS.getOpcode() == ISD::XOR && isNullConstant(RHS)) {
+    RHS = LHS.getOperand(1);
+    LHS = LHS.getOperand(0);
+    return true;
+  }
 
-  SDValue Src = N->getOperand(0);
-  EVT VT = N->getValueType(0);
-  if (VT != MVT::i64 || Src.getValueType() != MVT::i32)
-    return SDValue();
+  // Fold ((srl (and X, 1<<C), C), 0, eq/ne) -> ((shl X, XLen-1-C), 0, ge/lt)
+  if (isNullConstant(RHS) && LHS.getOpcode() == ISD::SRL && LHS.hasOneUse() &&
+      LHS.getOperand(1).getOpcode() == ISD::Constant) {
+    SDValue LHS0 = LHS.getOperand(0);
+    if (LHS0.getOpcode() == ISD::AND &&
+        LHS0.getOperand(1).getOpcode() == ISD::Constant) {
+      uint64_t Mask = LHS0.getConstantOperandVal(1);
+      uint64_t ShAmt = LHS.getConstantOperandVal(1);
+      if (isPowerOf2_64(Mask) && Log2_64(Mask) == ShAmt) {
+        CCVal = CCVal == ISD::SETEQ ? ISD::SETGE : ISD::SETLT;
+        CC = DAG.getCondCode(CCVal);
+
+        ShAmt = LHS.getValueSizeInBits() - 1 - ShAmt;
+        LHS = LHS0.getOperand(0);
+        if (ShAmt != 0)
+          LHS =
+              DAG.getNode(ISD::SHL, DL, LHS.getValueType(), LHS0.getOperand(0),
+                          DAG.getConstant(ShAmt, DL, LHS.getValueType()));
+        return true;
+      }
+    }
+  }
+
+  // (X, 1, setne) -> // (X, 0, seteq) if we can prove X is 0/1.
+  // This can occur when legalizing some floating point comparisons.
+  APInt Mask = APInt::getBitsSetFrom(LHS.getValueSizeInBits(), 1);
+  if (isOneConstant(RHS) && DAG.MaskedValueIsZero(LHS, Mask)) {
+    CCVal = ISD::getSetCCInverse(CCVal, LHS.getValueType());
+    CC = DAG.getCondCode(CCVal);
+    RHS = DAG.getConstant(0, DL, LHS.getValueType());
+    return true;
+  }
+
+  if (isNullConstant(RHS)) {
+    if (SDValue NewCond = tryDemorganOfBooleanCondition(LHS, DAG)) {
+      CCVal = ISD::getSetCCInverse(CCVal, LHS.getValueType());
+      CC = DAG.getCondCode(CCVal);
+      LHS = NewCond;
+      return true;
+    }
+  }
+
+  return false;
+}
 
-  // The opcode must be one that can implicitly sign_extend.
-  // FIXME: Additional opcodes.
-  switch (Src.getOpcode()) {
+// Fold
+// (select C, (add Y, X), Y) -> (add Y, (select C, X, 0)).
+// (select C, (sub Y, X), Y) -> (sub Y, (select C, X, 0)).
+// (select C, (or Y, X), Y)  -> (or Y, (select C, X, 0)).
+// (select C, (xor Y, X), Y) -> (xor Y, (select C, X, 0)).
+static SDValue tryFoldSelectIntoOp(SDNode *N, SelectionDAG &DAG,
+                                   SDValue TrueVal, SDValue FalseVal,
+                                   bool Swapped) {
+  bool Commutative = true;
+  switch (TrueVal.getOpcode()) {
   default:
     return SDValue();
-  case ISD::MUL:
-    if (!Subtarget.hasStdExtM())
-      return SDValue();
-    LLVM_FALLTHROUGH;
-  case ISD::ADD:
   case ISD::SUB:
+    Commutative = false;
+    break;
+  case ISD::ADD:
+  case ISD::OR:
+  case ISD::XOR:
     break;
   }
 
-  // Only handle cases where the result is used by a CopyToReg that likely
-  // means the value is a liveout of the basic block. This helps prevent
-  // infinite combine loops like PR51206.
-  if (none_of(N->uses(),
-              [](SDNode *User) { return User->getOpcode() == ISD::CopyToReg; }))
+  if (!TrueVal.hasOneUse() || isa<ConstantSDNode>(FalseVal))
     return SDValue();
 
-  SmallVector<SDNode *, 4> SetCCs;
-  for (SDNode::use_iterator UI = Src.getNode()->use_begin(),
-                            UE = Src.getNode()->use_end();
-       UI != UE; ++UI) {
-    SDNode *User = *UI;
-    if (User == N)
-      continue;
-    if (UI.getUse().getResNo() != Src.getResNo())
-      continue;
-    // All i32 setccs are legalized by sign extending operands.
-    if (User->getOpcode() == ISD::SETCC) {
-      SetCCs.push_back(User);
-      continue;
-    }
-    // We don't know if we can extend this user.
-    break;
-  }
-
-  // If we don't have any SetCCs, this isn't worthwhile.
-  if (SetCCs.empty())
+  unsigned OpToFold;
+  if (FalseVal == TrueVal.getOperand(0))
+    OpToFold = 0;
+  else if (Commutative && FalseVal == TrueVal.getOperand(1))
+    OpToFold = 1;
+  else
     return SDValue();
 
+  EVT VT = N->getValueType(0);
   SDLoc DL(N);
-  SDValue SExt = DAG.getNode(ISD::SIGN_EXTEND, DL, MVT::i64, Src);
-  DCI.CombineTo(N, SExt);
+  SDValue Zero = DAG.getConstant(0, DL, VT);
+  SDValue OtherOp = TrueVal.getOperand(1 - OpToFold);
 
-  // Promote all the setccs.
-  for (SDNode *SetCC : SetCCs) {
-    SmallVector<SDValue, 4> Ops;
+  if (Swapped)
+    std::swap(OtherOp, Zero);
+  SDValue NewSel = DAG.getSelect(DL, VT, N->getOperand(0), OtherOp, Zero);
+  return DAG.getNode(TrueVal.getOpcode(), DL, VT, FalseVal, NewSel);
+}
 
-    for (unsigned j = 0; j != 2; ++j) {
-      SDValue SOp = SetCC->getOperand(j);
-      if (SOp == Src)
-        Ops.push_back(SExt);
-      else
-        Ops.push_back(DAG.getNode(ISD::SIGN_EXTEND, DL, MVT::i64, SOp));
-    }
+static SDValue performSELECTCombine(SDNode *N, SelectionDAG &DAG,
+                                    const RISCVSubtarget &Subtarget) {
+  if (Subtarget.hasShortForwardBranchOpt())
+    return SDValue();
 
-    Ops.push_back(SetCC->getOperand(2));
-    DCI.CombineTo(SetCC,
-                  DAG.getNode(ISD::SETCC, DL, SetCC->getValueType(0), Ops));
-  }
-  return SDValue(N, 0);
+  // Only support XLenVT.
+  if (N->getValueType(0) != Subtarget.getXLenVT())
+    return SDValue();
+
+  SDValue TrueVal = N->getOperand(1);
+  SDValue FalseVal = N->getOperand(2);
+  if (SDValue V = tryFoldSelectIntoOp(N, DAG, TrueVal, FalseVal, /*Swapped*/false))
+    return V;
+  return tryFoldSelectIntoOp(N, DAG, FalseVal, TrueVal, /*Swapped*/true);
 }
 
 SDValue RISCVTargetLowering::PerformDAGCombine(SDNode *N,
                                                DAGCombinerInfo &DCI) const {
   SelectionDAG &DAG = DCI.DAG;
 
+  // Helper to call SimplifyDemandedBits on an operand of N where only some low
+  // bits are demanded. N will be added to the Worklist if it was not deleted.
+  // Caller should return SDValue(N, 0) if this returns true.
+  auto SimplifyDemandedLowBitsHelper = [&](unsigned OpNo, unsigned LowBits) {
+    SDValue Op = N->getOperand(OpNo);
+    APInt Mask = APInt::getLowBitsSet(Op.getValueSizeInBits(), LowBits);
+    if (!SimplifyDemandedBits(Op, Mask, DCI))
+      return false;
+
+    if (N->getOpcode() != ISD::DELETED_NODE)
+      DCI.AddToWorklist(N);
+    return true;
+  };
+
   switch (N->getOpcode()) {
   default:
     break;
@@ -5884,6 +10108,12 @@ SDValue RISCVTargetLowering::PerformDAGCombine(SDNode *N,
     if (Op0->getOpcode() == RISCVISD::BuildPairF64)
       return DCI.CombineTo(N, Op0.getOperand(0), Op0.getOperand(1));
 
+    if (Op0->isUndef()) {
+      SDValue Lo = DAG.getUNDEF(MVT::i32);
+      SDValue Hi = DAG.getUNDEF(MVT::i32);
+      return DCI.CombineTo(N, Lo, Hi);
+    }
+
     SDLoc DL(N);
 
     // It's cheaper to materialise two 32-bit integers than to load a double
@@ -5922,150 +10152,35 @@ SDValue RISCVTargetLowering::PerformDAGCombine(SDNode *N,
   case RISCVISD::SLLW:
   case RISCVISD::SRAW:
   case RISCVISD::SRLW:
-  case RISCVISD::ROLW:
-  case RISCVISD::RORW: {
+  case RISCVISD::RORW:
+  case RISCVISD::ROLW: {
     // Only the lower 32 bits of LHS and lower 5 bits of RHS are read.
-    SDValue LHS = N->getOperand(0);
-    SDValue RHS = N->getOperand(1);
-    APInt LHSMask = APInt::getLowBitsSet(LHS.getValueSizeInBits(), 32);
-    APInt RHSMask = APInt::getLowBitsSet(RHS.getValueSizeInBits(), 5);
-    if (SimplifyDemandedBits(N->getOperand(0), LHSMask, DCI) ||
-        SimplifyDemandedBits(N->getOperand(1), RHSMask, DCI)) {
-      if (N->getOpcode() != ISD::DELETED_NODE)
-        DCI.AddToWorklist(N);
+    if (SimplifyDemandedLowBitsHelper(0, 32) ||
+        SimplifyDemandedLowBitsHelper(1, 5))
       return SDValue(N, 0);
-    }
+
     break;
   }
   case RISCVISD::CLZW:
   case RISCVISD::CTZW: {
     // Only the lower 32 bits of the first operand are read
-    SDValue Op0 = N->getOperand(0);
-    APInt Mask = APInt::getLowBitsSet(Op0.getValueSizeInBits(), 32);
-    if (SimplifyDemandedBits(Op0, Mask, DCI)) {
-      if (N->getOpcode() != ISD::DELETED_NODE)
-        DCI.AddToWorklist(N);
-      return SDValue(N, 0);
-    }
-    break;
-  }
-  case RISCVISD::FSL:
-  case RISCVISD::FSR: {
-    // Only the lower log2(Bitwidth)+1 bits of the the shift amount are read.
-    SDValue ShAmt = N->getOperand(2);
-    unsigned BitWidth = ShAmt.getValueSizeInBits();
-    assert(isPowerOf2_32(BitWidth) && "Unexpected bit width");
-    APInt ShAmtMask(BitWidth, (BitWidth * 2) - 1);
-    if (SimplifyDemandedBits(ShAmt, ShAmtMask, DCI)) {
-      if (N->getOpcode() != ISD::DELETED_NODE)
-        DCI.AddToWorklist(N);
-      return SDValue(N, 0);
-    }
-    break;
-  }
-  case RISCVISD::FSLW:
-  case RISCVISD::FSRW: {
-    // Only the lower 32 bits of Values and lower 6 bits of shift amount are
-    // read.
-    SDValue Op0 = N->getOperand(0);
-    SDValue Op1 = N->getOperand(1);
-    SDValue ShAmt = N->getOperand(2);
-    APInt OpMask = APInt::getLowBitsSet(Op0.getValueSizeInBits(), 32);
-    APInt ShAmtMask = APInt::getLowBitsSet(ShAmt.getValueSizeInBits(), 6);
-    if (SimplifyDemandedBits(Op0, OpMask, DCI) ||
-        SimplifyDemandedBits(Op1, OpMask, DCI) ||
-        SimplifyDemandedBits(ShAmt, ShAmtMask, DCI)) {
-      if (N->getOpcode() != ISD::DELETED_NODE)
-        DCI.AddToWorklist(N);
+    if (SimplifyDemandedLowBitsHelper(0, 32))
       return SDValue(N, 0);
-    }
-    break;
-  }
-  case RISCVISD::GREV:
-  case RISCVISD::GORC: {
-    // Only the lower log2(Bitwidth) bits of the the shift amount are read.
-    SDValue ShAmt = N->getOperand(1);
-    unsigned BitWidth = ShAmt.getValueSizeInBits();
-    assert(isPowerOf2_32(BitWidth) && "Unexpected bit width");
-    APInt ShAmtMask(BitWidth, BitWidth - 1);
-    if (SimplifyDemandedBits(ShAmt, ShAmtMask, DCI)) {
-      if (N->getOpcode() != ISD::DELETED_NODE)
-        DCI.AddToWorklist(N);
-      return SDValue(N, 0);
-    }
-
-    return combineGREVI_GORCI(N, DCI.DAG);
-  }
-  case RISCVISD::GREVW:
-  case RISCVISD::GORCW: {
-    // Only the lower 32 bits of LHS and lower 5 bits of RHS are read.
-    SDValue LHS = N->getOperand(0);
-    SDValue RHS = N->getOperand(1);
-    APInt LHSMask = APInt::getLowBitsSet(LHS.getValueSizeInBits(), 32);
-    APInt RHSMask = APInt::getLowBitsSet(RHS.getValueSizeInBits(), 5);
-    if (SimplifyDemandedBits(LHS, LHSMask, DCI) ||
-        SimplifyDemandedBits(RHS, RHSMask, DCI)) {
-      if (N->getOpcode() != ISD::DELETED_NODE)
-        DCI.AddToWorklist(N);
-      return SDValue(N, 0);
-    }
-
-    return combineGREVI_GORCI(N, DCI.DAG);
-  }
-  case RISCVISD::SHFL:
-  case RISCVISD::UNSHFL: {
-    // Only the lower log2(Bitwidth) bits of the the shift amount are read.
-    SDValue ShAmt = N->getOperand(1);
-    unsigned BitWidth = ShAmt.getValueSizeInBits();
-    assert(isPowerOf2_32(BitWidth) && "Unexpected bit width");
-    APInt ShAmtMask(BitWidth, (BitWidth / 2) - 1);
-    if (SimplifyDemandedBits(ShAmt, ShAmtMask, DCI)) {
-      if (N->getOpcode() != ISD::DELETED_NODE)
-        DCI.AddToWorklist(N);
-      return SDValue(N, 0);
-    }
-
-    break;
-  }
-  case RISCVISD::SHFLW:
-  case RISCVISD::UNSHFLW: {
-    // Only the lower 32 bits of LHS and lower 5 bits of RHS are read.
-    SDValue LHS = N->getOperand(0);
-    SDValue RHS = N->getOperand(1);
-    APInt LHSMask = APInt::getLowBitsSet(LHS.getValueSizeInBits(), 32);
-    APInt RHSMask = APInt::getLowBitsSet(RHS.getValueSizeInBits(), 4);
-    if (SimplifyDemandedBits(LHS, LHSMask, DCI) ||
-        SimplifyDemandedBits(RHS, RHSMask, DCI)) {
-      if (N->getOpcode() != ISD::DELETED_NODE)
-        DCI.AddToWorklist(N);
-      return SDValue(N, 0);
-    }
-
-    break;
-  }
-  case RISCVISD::BCOMPRESSW:
-  case RISCVISD::BDECOMPRESSW: {
-    // Only the lower 32 bits of LHS and RHS are read.
-    SDValue LHS = N->getOperand(0);
-    SDValue RHS = N->getOperand(1);
-    APInt Mask = APInt::getLowBitsSet(LHS.getValueSizeInBits(), 32);
-    if (SimplifyDemandedBits(LHS, Mask, DCI) ||
-        SimplifyDemandedBits(RHS, Mask, DCI)) {
-      if (N->getOpcode() != ISD::DELETED_NODE)
-        DCI.AddToWorklist(N);
-      return SDValue(N, 0);
-    }
-
     break;
   }
+  case RISCVISD::FMV_X_ANYEXTH:
   case RISCVISD::FMV_X_ANYEXTW_RV64: {
     SDLoc DL(N);
     SDValue Op0 = N->getOperand(0);
+    MVT VT = N->getSimpleValueType(0);
     // If the input to FMV_X_ANYEXTW_RV64 is just FMV_W_X_RV64 then the
-    // conversion is unnecessary and can be replaced with an ANY_EXTEND
-    // of the FMV_W_X_RV64 operand.
-    if (Op0->getOpcode() == RISCVISD::FMV_W_X_RV64) {
-      assert(Op0.getOperand(0).getValueType() == MVT::i64 &&
+    // conversion is unnecessary and can be replaced with the FMV_W_X_RV64
+    // operand. Similar for FMV_X_ANYEXTH and FMV_H_X.
+    if ((N->getOpcode() == RISCVISD::FMV_X_ANYEXTW_RV64 &&
+         Op0->getOpcode() == RISCVISD::FMV_W_X_RV64) ||
+        (N->getOpcode() == RISCVISD::FMV_X_ANYEXTH &&
+         Op0->getOpcode() == RISCVISD::FMV_H_X)) {
+      assert(Op0.getOperand(0).getValueType() == VT &&
              "Unexpected value type!");
       return Op0.getOperand(0);
     }
@@ -6077,142 +10192,163 @@ SDValue RISCVTargetLowering::PerformDAGCombine(SDNode *N,
     if (!(Op0.getOpcode() == ISD::FNEG || Op0.getOpcode() == ISD::FABS) ||
         !Op0.getNode()->hasOneUse())
       break;
-    SDValue NewFMV = DAG.getNode(RISCVISD::FMV_X_ANYEXTW_RV64, DL, MVT::i64,
-                                 Op0.getOperand(0));
-    APInt SignBit = APInt::getSignMask(32).sext(64);
+    SDValue NewFMV = DAG.getNode(N->getOpcode(), DL, VT, Op0.getOperand(0));
+    unsigned FPBits = N->getOpcode() == RISCVISD::FMV_X_ANYEXTW_RV64 ? 32 : 16;
+    APInt SignBit = APInt::getSignMask(FPBits).sext(VT.getSizeInBits());
     if (Op0.getOpcode() == ISD::FNEG)
-      return DAG.getNode(ISD::XOR, DL, MVT::i64, NewFMV,
-                         DAG.getConstant(SignBit, DL, MVT::i64));
+      return DAG.getNode(ISD::XOR, DL, VT, NewFMV,
+                         DAG.getConstant(SignBit, DL, VT));
 
     assert(Op0.getOpcode() == ISD::FABS);
-    return DAG.getNode(ISD::AND, DL, MVT::i64, NewFMV,
-                       DAG.getConstant(~SignBit, DL, MVT::i64));
+    return DAG.getNode(ISD::AND, DL, VT, NewFMV,
+                       DAG.getConstant(~SignBit, DL, VT));
   }
+  case ISD::ADD:
+    return performADDCombine(N, DAG, Subtarget);
+  case ISD::SUB:
+    return performSUBCombine(N, DAG, Subtarget);
   case ISD::AND:
     return performANDCombine(N, DCI, Subtarget);
   case ISD::OR:
     return performORCombine(N, DCI, Subtarget);
   case ISD::XOR:
-    return performXORCombine(N, DCI, Subtarget);
-  case ISD::ANY_EXTEND:
-    return performANY_EXTENDCombine(N, DCI, Subtarget);
+    return performXORCombine(N, DAG, Subtarget);
+  case ISD::FADD:
+  case ISD::UMAX:
+  case ISD::UMIN:
+  case ISD::SMAX:
+  case ISD::SMIN:
+  case ISD::FMAXNUM:
+  case ISD::FMINNUM:
+    return combineBinOpToReduce(N, DAG, Subtarget);
+  case ISD::SETCC:
+    return performSETCCCombine(N, DAG, Subtarget);
+  case ISD::SIGN_EXTEND_INREG:
+    return performSIGN_EXTEND_INREGCombine(N, DAG, Subtarget);
   case ISD::ZERO_EXTEND:
     // Fold (zero_extend (fp_to_uint X)) to prevent forming fcvt+zexti32 during
     // type legalization. This is safe because fp_to_uint produces poison if
     // it overflows.
-    if (N->getValueType(0) == MVT::i64 && Subtarget.is64Bit() &&
-        N->getOperand(0).getOpcode() == ISD::FP_TO_UINT &&
-        isTypeLegal(N->getOperand(0).getOperand(0).getValueType()))
-      return DAG.getNode(ISD::FP_TO_UINT, SDLoc(N), MVT::i64,
-                         N->getOperand(0).getOperand(0));
+    if (N->getValueType(0) == MVT::i64 && Subtarget.is64Bit()) {
+      SDValue Src = N->getOperand(0);
+      if (Src.getOpcode() == ISD::FP_TO_UINT &&
+          isTypeLegal(Src.getOperand(0).getValueType()))
+        return DAG.getNode(ISD::FP_TO_UINT, SDLoc(N), MVT::i64,
+                           Src.getOperand(0));
+      if (Src.getOpcode() == ISD::STRICT_FP_TO_UINT && Src.hasOneUse() &&
+          isTypeLegal(Src.getOperand(1).getValueType())) {
+        SDVTList VTs = DAG.getVTList(MVT::i64, MVT::Other);
+        SDValue Res = DAG.getNode(ISD::STRICT_FP_TO_UINT, SDLoc(N), VTs,
+                                  Src.getOperand(0), Src.getOperand(1));
+        DCI.CombineTo(N, Res);
+        DAG.ReplaceAllUsesOfValueWith(Src.getValue(1), Res.getValue(1));
+        DCI.recursivelyDeleteUnusedNodes(Src.getNode());
+        return SDValue(N, 0); // Return N so it doesn't get rechecked.
+      }
+    }
     return SDValue();
+  case ISD::TRUNCATE:
+    return performTRUNCATECombine(N, DAG, Subtarget);
+  case ISD::SELECT:
+    return performSELECTCombine(N, DAG, Subtarget);
   case RISCVISD::SELECT_CC: {
     // Transform
     SDValue LHS = N->getOperand(0);
     SDValue RHS = N->getOperand(1);
-    auto CCVal = static_cast<ISD::CondCode>(N->getConstantOperandVal(2));
-    if (!ISD::isIntEqualitySetCC(CCVal))
-      break;
+    SDValue CC = N->getOperand(2);
+    ISD::CondCode CCVal = cast<CondCodeSDNode>(CC)->get();
+    SDValue TrueV = N->getOperand(3);
+    SDValue FalseV = N->getOperand(4);
+    SDLoc DL(N);
+    EVT VT = N->getValueType(0);
 
-    // Fold (select_cc (setlt X, Y), 0, ne, trueV, falseV) ->
-    //      (select_cc X, Y, lt, trueV, falseV)
-    // Sometimes the setcc is introduced after select_cc has been formed.
-    if (LHS.getOpcode() == ISD::SETCC && isNullConstant(RHS) &&
-        LHS.getOperand(0).getValueType() == Subtarget.getXLenVT()) {
-      // If we're looking for eq 0 instead of ne 0, we need to invert the
-      // condition.
-      bool Invert = CCVal == ISD::SETEQ;
-      CCVal = cast<CondCodeSDNode>(LHS.getOperand(2))->get();
-      if (Invert)
-        CCVal = ISD::getSetCCInverse(CCVal, LHS.getValueType());
+    // If the True and False values are the same, we don't need a select_cc.
+    if (TrueV == FalseV)
+      return TrueV;
+
+    // (select (x < 0), y, z)  -> x >> (XLEN - 1) & (y - z) + z
+    // (select (x >= 0), y, z) -> x >> (XLEN - 1) & (z - y) + y
+    if (!Subtarget.hasShortForwardBranchOpt() && isa<ConstantSDNode>(TrueV) &&
+        isa<ConstantSDNode>(FalseV) && isNullConstant(RHS) &&
+        (CCVal == ISD::CondCode::SETLT || CCVal == ISD::CondCode::SETGE)) {
+      if (CCVal == ISD::CondCode::SETGE)
+        std::swap(TrueV, FalseV);
+
+      int64_t TrueSImm = cast<ConstantSDNode>(TrueV)->getSExtValue();
+      int64_t FalseSImm = cast<ConstantSDNode>(FalseV)->getSExtValue();
+      // Only handle simm12, if it is not in this range, it can be considered as
+      // register.
+      if (isInt<12>(TrueSImm) && isInt<12>(FalseSImm) &&
+          isInt<12>(TrueSImm - FalseSImm)) {
+        SDValue SRA =
+            DAG.getNode(ISD::SRA, DL, VT, LHS,
+                        DAG.getConstant(Subtarget.getXLen() - 1, DL, VT));
+        SDValue AND =
+            DAG.getNode(ISD::AND, DL, VT, SRA,
+                        DAG.getConstant(TrueSImm - FalseSImm, DL, VT));
+        return DAG.getNode(ISD::ADD, DL, VT, AND, FalseV);
+      }
 
-      SDLoc DL(N);
-      RHS = LHS.getOperand(1);
-      LHS = LHS.getOperand(0);
-      translateSetCCForBranch(DL, LHS, RHS, CCVal, DAG);
+      if (CCVal == ISD::CondCode::SETGE)
+        std::swap(TrueV, FalseV);
+    }
 
-      SDValue TargetCC =
-          DAG.getTargetConstant(CCVal, DL, Subtarget.getXLenVT());
-      return DAG.getNode(
-          RISCVISD::SELECT_CC, DL, N->getValueType(0),
-          {LHS, RHS, TargetCC, N->getOperand(3), N->getOperand(4)});
-    }
-
-    // Fold (select_cc (xor X, Y), 0, eq/ne, trueV, falseV) ->
-    //      (select_cc X, Y, eq/ne, trueV, falseV)
-    if (LHS.getOpcode() == ISD::XOR && isNullConstant(RHS))
-      return DAG.getNode(RISCVISD::SELECT_CC, SDLoc(N), N->getValueType(0),
-                         {LHS.getOperand(0), LHS.getOperand(1),
-                          N->getOperand(2), N->getOperand(3),
-                          N->getOperand(4)});
-    // (select_cc X, 1, setne, trueV, falseV) ->
-    // (select_cc X, 0, seteq, trueV, falseV) if we can prove X is 0/1.
-    // This can occur when legalizing some floating point comparisons.
-    APInt Mask = APInt::getBitsSetFrom(LHS.getValueSizeInBits(), 1);
-    if (isOneConstant(RHS) && DAG.MaskedValueIsZero(LHS, Mask)) {
-      SDLoc DL(N);
-      CCVal = ISD::getSetCCInverse(CCVal, LHS.getValueType());
-      SDValue TargetCC =
-          DAG.getTargetConstant(CCVal, DL, Subtarget.getXLenVT());
-      RHS = DAG.getConstant(0, DL, LHS.getValueType());
-      return DAG.getNode(
-          RISCVISD::SELECT_CC, DL, N->getValueType(0),
-          {LHS, RHS, TargetCC, N->getOperand(3), N->getOperand(4)});
+    if (combine_CC(LHS, RHS, CC, DL, DAG, Subtarget))
+      return DAG.getNode(RISCVISD::SELECT_CC, DL, N->getValueType(0),
+                         {LHS, RHS, CC, TrueV, FalseV});
+
+    if (!Subtarget.hasShortForwardBranchOpt()) {
+      // (select c, -1, y) -> -c | y
+      if (isAllOnesConstant(TrueV)) {
+        SDValue C = DAG.getSetCC(DL, VT, LHS, RHS, CCVal);
+        SDValue Neg = DAG.getNegative(C, DL, VT);
+        return DAG.getNode(ISD::OR, DL, VT, Neg, FalseV);
+      }
+      // (select c, y, -1) -> -!c | y
+      if (isAllOnesConstant(FalseV)) {
+        SDValue C =
+            DAG.getSetCC(DL, VT, LHS, RHS, ISD::getSetCCInverse(CCVal, VT));
+        SDValue Neg = DAG.getNegative(C, DL, VT);
+        return DAG.getNode(ISD::OR, DL, VT, Neg, TrueV);
+      }
+
+      // (select c, 0, y) -> -!c & y
+      if (isNullConstant(TrueV)) {
+        SDValue C =
+            DAG.getSetCC(DL, VT, LHS, RHS, ISD::getSetCCInverse(CCVal, VT));
+        SDValue Neg = DAG.getNegative(C, DL, VT);
+        return DAG.getNode(ISD::AND, DL, VT, Neg, FalseV);
+      }
+      // (select c, y, 0) -> -c & y
+      if (isNullConstant(FalseV)) {
+        SDValue C = DAG.getSetCC(DL, VT, LHS, RHS, CCVal);
+        SDValue Neg = DAG.getNegative(C, DL, VT);
+        return DAG.getNode(ISD::AND, DL, VT, Neg, TrueV);
+      }
     }
 
-    break;
+    return SDValue();
   }
   case RISCVISD::BR_CC: {
     SDValue LHS = N->getOperand(1);
     SDValue RHS = N->getOperand(2);
-    ISD::CondCode CCVal = cast<CondCodeSDNode>(N->getOperand(3))->get();
-    if (!ISD::isIntEqualitySetCC(CCVal))
-      break;
-
-    // Fold (br_cc (setlt X, Y), 0, ne, dest) ->
-    //      (br_cc X, Y, lt, dest)
-    // Sometimes the setcc is introduced after br_cc has been formed.
-    if (LHS.getOpcode() == ISD::SETCC && isNullConstant(RHS) &&
-        LHS.getOperand(0).getValueType() == Subtarget.getXLenVT()) {
-      // If we're looking for eq 0 instead of ne 0, we need to invert the
-      // condition.
-      bool Invert = CCVal == ISD::SETEQ;
-      CCVal = cast<CondCodeSDNode>(LHS.getOperand(2))->get();
-      if (Invert)
-        CCVal = ISD::getSetCCInverse(CCVal, LHS.getValueType());
-
-      SDLoc DL(N);
-      RHS = LHS.getOperand(1);
-      LHS = LHS.getOperand(0);
-      translateSetCCForBranch(DL, LHS, RHS, CCVal, DAG);
+    SDValue CC = N->getOperand(3);
+    SDLoc DL(N);
 
+    if (combine_CC(LHS, RHS, CC, DL, DAG, Subtarget))
       return DAG.getNode(RISCVISD::BR_CC, DL, N->getValueType(0),
-                         N->getOperand(0), LHS, RHS, DAG.getCondCode(CCVal),
-                         N->getOperand(4));
-    }
-
-    // Fold (br_cc (xor X, Y), 0, eq/ne, dest) ->
-    //      (br_cc X, Y, eq/ne, trueV, falseV)
-    if (LHS.getOpcode() == ISD::XOR && isNullConstant(RHS))
-      return DAG.getNode(RISCVISD::BR_CC, SDLoc(N), N->getValueType(0),
-                         N->getOperand(0), LHS.getOperand(0), LHS.getOperand(1),
-                         N->getOperand(3), N->getOperand(4));
-
-    // (br_cc X, 1, setne, br_cc) ->
-    // (br_cc X, 0, seteq, br_cc) if we can prove X is 0/1.
-    // This can occur when legalizing some floating point comparisons.
-    APInt Mask = APInt::getBitsSetFrom(LHS.getValueSizeInBits(), 1);
-    if (isOneConstant(RHS) && DAG.MaskedValueIsZero(LHS, Mask)) {
-      SDLoc DL(N);
-      CCVal = ISD::getSetCCInverse(CCVal, LHS.getValueType());
-      SDValue TargetCC = DAG.getCondCode(CCVal);
-      RHS = DAG.getConstant(0, DL, LHS.getValueType());
-      return DAG.getNode(RISCVISD::BR_CC, DL, N->getValueType(0),
-                         N->getOperand(0), LHS, RHS, TargetCC,
-                         N->getOperand(4));
-    }
-    break;
+                         N->getOperand(0), LHS, RHS, CC, N->getOperand(4));
+
+    return SDValue();
   }
+  case ISD::BITREVERSE:
+    return performBITREVERSECombine(N, DAG, Subtarget);
+  case ISD::FP_TO_SINT:
+  case ISD::FP_TO_UINT:
+    return performFP_TO_INTCombine(N, DCI, Subtarget);
+  case ISD::FP_TO_SINT_SAT:
+  case ISD::FP_TO_UINT_SAT:
+    return performFP_TO_INT_SATCombine(N, DCI, Subtarget);
   case ISD::FCOPYSIGN: {
     EVT VT = N->getValueType(0);
     if (!VT.isVector())
@@ -6238,18 +10374,34 @@ SDValue RISCVTargetLowering::PerformDAGCombine(SDNode *N,
                        DAG.getNode(ISD::FNEG, DL, VT, NewFPExtRound));
   }
   case ISD::MGATHER:
-  case ISD::MSCATTER: {
+  case ISD::MSCATTER:
+  case ISD::VP_GATHER:
+  case ISD::VP_SCATTER: {
     if (!DCI.isBeforeLegalize())
       break;
-    MaskedGatherScatterSDNode *MGSN = cast<MaskedGatherScatterSDNode>(N);
-    SDValue Index = MGSN->getIndex();
+    SDValue Index, ScaleOp;
+    bool IsIndexSigned = false;
+    if (const auto *VPGSN = dyn_cast<VPGatherScatterSDNode>(N)) {
+      Index = VPGSN->getIndex();
+      ScaleOp = VPGSN->getScale();
+      IsIndexSigned = VPGSN->isIndexSigned();
+      assert(!VPGSN->isIndexScaled() &&
+             "Scaled gather/scatter should not be formed");
+    } else {
+      const auto *MGSN = cast<MaskedGatherScatterSDNode>(N);
+      Index = MGSN->getIndex();
+      ScaleOp = MGSN->getScale();
+      IsIndexSigned = MGSN->isIndexSigned();
+      assert(!MGSN->isIndexScaled() &&
+             "Scaled gather/scatter should not be formed");
+
+    }
     EVT IndexVT = Index.getValueType();
     MVT XLenVT = Subtarget.getXLenVT();
     // RISCV indexed loads only support the "unsigned unscaled" addressing
     // mode, so anything else must be manually legalized.
-    bool NeedsIdxLegalization = MGSN->isIndexScaled() ||
-                                (MGSN->isIndexSigned() &&
-                                 IndexVT.getVectorElementType().bitsLT(XLenVT));
+    bool NeedsIdxLegalization =
+        (IsIndexSigned && IndexVT.getVectorElementType().bitsLT(XLenVT));
     if (!NeedsIdxLegalization)
       break;
 
@@ -6258,36 +10410,38 @@ SDValue RISCVTargetLowering::PerformDAGCombine(SDNode *N,
     // Any index legalization should first promote to XLenVT, so we don't lose
     // bits when scaling. This may create an illegal index type so we let
     // LLVM's legalization take care of the splitting.
+    // FIXME: LLVM can't split VP_GATHER or VP_SCATTER yet.
     if (IndexVT.getVectorElementType().bitsLT(XLenVT)) {
       IndexVT = IndexVT.changeVectorElementType(XLenVT);
-      Index = DAG.getNode(MGSN->isIndexSigned() ? ISD::SIGN_EXTEND
-                                                : ISD::ZERO_EXTEND,
+      Index = DAG.getNode(IsIndexSigned ? ISD::SIGN_EXTEND : ISD::ZERO_EXTEND,
                           DL, IndexVT, Index);
     }
 
-    unsigned Scale = N->getConstantOperandVal(5);
-    if (MGSN->isIndexScaled() && Scale != 1) {
-      // Manually scale the indices by the element size.
-      // TODO: Sanitize the scale operand here?
-      assert(isPowerOf2_32(Scale) && "Expecting power-of-two types");
-      SDValue SplatScale = DAG.getConstant(Log2_32(Scale), DL, IndexVT);
-      Index = DAG.getNode(ISD::SHL, DL, IndexVT, Index, SplatScale);
-    }
-
-    ISD::MemIndexType NewIndexTy = ISD::UNSIGNED_UNSCALED;
-    if (const auto *MGN = dyn_cast<MaskedGatherSDNode>(N)) {
+    ISD::MemIndexType NewIndexTy = ISD::UNSIGNED_SCALED;
+    if (const auto *VPGN = dyn_cast<VPGatherSDNode>(N))
+      return DAG.getGatherVP(N->getVTList(), VPGN->getMemoryVT(), DL,
+                             {VPGN->getChain(), VPGN->getBasePtr(), Index,
+                              ScaleOp, VPGN->getMask(),
+                              VPGN->getVectorLength()},
+                             VPGN->getMemOperand(), NewIndexTy);
+    if (const auto *VPSN = dyn_cast<VPScatterSDNode>(N))
+      return DAG.getScatterVP(N->getVTList(), VPSN->getMemoryVT(), DL,
+                              {VPSN->getChain(), VPSN->getValue(),
+                               VPSN->getBasePtr(), Index, ScaleOp,
+                               VPSN->getMask(), VPSN->getVectorLength()},
+                              VPSN->getMemOperand(), NewIndexTy);
+    if (const auto *MGN = dyn_cast<MaskedGatherSDNode>(N))
       return DAG.getMaskedGather(
-          N->getVTList(), MGSN->getMemoryVT(), DL,
-          {MGSN->getChain(), MGN->getPassThru(), MGSN->getMask(),
-           MGSN->getBasePtr(), Index, MGN->getScale()},
+          N->getVTList(), MGN->getMemoryVT(), DL,
+          {MGN->getChain(), MGN->getPassThru(), MGN->getMask(),
+           MGN->getBasePtr(), Index, ScaleOp},
           MGN->getMemOperand(), NewIndexTy, MGN->getExtensionType());
-    }
     const auto *MSN = cast<MaskedScatterSDNode>(N);
     return DAG.getMaskedScatter(
-        N->getVTList(), MGSN->getMemoryVT(), DL,
-        {MGSN->getChain(), MSN->getValue(), MGSN->getMask(), MGSN->getBasePtr(),
-         Index, MGSN->getScale()},
-        MGSN->getMemOperand(), NewIndexTy, MSN->isTruncatingStore());
+        N->getVTList(), MSN->getMemoryVT(), DL,
+        {MSN->getChain(), MSN->getValue(), MSN->getMask(), MSN->getBasePtr(),
+         Index, ScaleOp},
+        MSN->getMemOperand(), NewIndexTy, MSN->isTruncatingStore());
   }
   case RISCVISD::SRA_VL:
   case RISCVISD::SRL_VL:
@@ -6298,67 +10452,187 @@ SDValue RISCVTargetLowering::PerformDAGCombine(SDNode *N,
       SDLoc DL(N);
       SDValue VL = N->getOperand(3);
       EVT VT = N->getValueType(0);
-      ShAmt =
-          DAG.getNode(RISCVISD::VMV_V_X_VL, DL, VT, ShAmt.getOperand(0), VL);
-      return DAG.getNode(N->getOpcode(), DL, VT, N->getOperand(0), ShAmt,
-                         N->getOperand(2), N->getOperand(3));
+      ShAmt = DAG.getNode(RISCVISD::VMV_V_X_VL, DL, VT, DAG.getUNDEF(VT),
+                          ShAmt.getOperand(1), VL);
+      return DAG.getNode(N->getOpcode(), DL, VT, N->getOperand(0), ShAmt,
+                         N->getOperand(2), N->getOperand(3), N->getOperand(4));
+    }
+    break;
+  }
+  case ISD::SRA:
+    if (SDValue V = performSRACombine(N, DAG, Subtarget))
+      return V;
+    [[fallthrough]];
+  case ISD::SRL:
+  case ISD::SHL: {
+    SDValue ShAmt = N->getOperand(1);
+    if (ShAmt.getOpcode() == RISCVISD::SPLAT_VECTOR_SPLIT_I64_VL) {
+      // We don't need the upper 32 bits of a 64-bit element for a shift amount.
+      SDLoc DL(N);
+      EVT VT = N->getValueType(0);
+      ShAmt = DAG.getNode(RISCVISD::VMV_V_X_VL, DL, VT, DAG.getUNDEF(VT),
+                          ShAmt.getOperand(1),
+                          DAG.getRegister(RISCV::X0, Subtarget.getXLenVT()));
+      return DAG.getNode(N->getOpcode(), DL, VT, N->getOperand(0), ShAmt);
+    }
+    break;
+  }
+  case RISCVISD::ADD_VL:
+  case RISCVISD::SUB_VL:
+  case RISCVISD::VWADD_W_VL:
+  case RISCVISD::VWADDU_W_VL:
+  case RISCVISD::VWSUB_W_VL:
+  case RISCVISD::VWSUBU_W_VL:
+  case RISCVISD::MUL_VL:
+    return combineBinOp_VLToVWBinOp_VL(N, DCI);
+  case RISCVISD::VFMADD_VL:
+  case RISCVISD::VFNMADD_VL:
+  case RISCVISD::VFMSUB_VL:
+  case RISCVISD::VFNMSUB_VL: {
+    // Fold FNEG_VL into FMA opcodes.
+    SDValue A = N->getOperand(0);
+    SDValue B = N->getOperand(1);
+    SDValue C = N->getOperand(2);
+    SDValue Mask = N->getOperand(3);
+    SDValue VL = N->getOperand(4);
+
+    auto invertIfNegative = [&Mask, &VL](SDValue &V) {
+      if (V.getOpcode() == RISCVISD::FNEG_VL && V.getOperand(1) == Mask &&
+          V.getOperand(2) == VL) {
+        // Return the negated input.
+        V = V.getOperand(0);
+        return true;
+      }
+
+      return false;
+    };
+
+    bool NegA = invertIfNegative(A);
+    bool NegB = invertIfNegative(B);
+    bool NegC = invertIfNegative(C);
+
+    // If no operands are negated, we're done.
+    if (!NegA && !NegB && !NegC)
+      return SDValue();
+
+    unsigned NewOpcode = negateFMAOpcode(N->getOpcode(), NegA != NegB, NegC);
+    return DAG.getNode(NewOpcode, SDLoc(N), N->getValueType(0), A, B, C, Mask,
+                       VL);
+  }
+  case ISD::STORE: {
+    auto *Store = cast<StoreSDNode>(N);
+    SDValue Val = Store->getValue();
+    // Combine store of vmv.x.s/vfmv.f.s to vse with VL of 1.
+    // vfmv.f.s is represented as extract element from 0. Match it late to avoid
+    // any illegal types.
+    if (Val.getOpcode() == RISCVISD::VMV_X_S ||
+        (DCI.isAfterLegalizeDAG() &&
+         Val.getOpcode() == ISD::EXTRACT_VECTOR_ELT &&
+         isNullConstant(Val.getOperand(1)))) {
+      SDValue Src = Val.getOperand(0);
+      MVT VecVT = Src.getSimpleValueType();
+      EVT MemVT = Store->getMemoryVT();
+      // VecVT should be scalable and memory VT should match the element type.
+      if (VecVT.isScalableVector() &&
+          MemVT == VecVT.getVectorElementType()) {
+        SDLoc DL(N);
+        MVT MaskVT = getMaskTypeFor(VecVT);
+        return DAG.getStoreVP(
+            Store->getChain(), DL, Src, Store->getBasePtr(), Store->getOffset(),
+            DAG.getConstant(1, DL, MaskVT),
+            DAG.getConstant(1, DL, Subtarget.getXLenVT()), MemVT,
+            Store->getMemOperand(), Store->getAddressingMode(),
+            Store->isTruncatingStore(), /*IsCompress*/ false);
+      }
+    }
+
+    break;
+  }
+  case ISD::SPLAT_VECTOR: {
+    EVT VT = N->getValueType(0);
+    // Only perform this combine on legal MVT types.
+    if (!isTypeLegal(VT))
+      break;
+    if (auto Gather = matchSplatAsGather(N->getOperand(0), VT.getSimpleVT(), N,
+                                         DAG, Subtarget))
+      return Gather;
+    break;
+  }
+  case RISCVISD::VMV_V_X_VL: {
+    // Tail agnostic VMV.V.X only demands the vector element bitwidth from the
+    // scalar input.
+    unsigned ScalarSize = N->getOperand(1).getValueSizeInBits();
+    unsigned EltWidth = N->getValueType(0).getScalarSizeInBits();
+    if (ScalarSize > EltWidth && N->getOperand(0).isUndef())
+      if (SimplifyDemandedLowBitsHelper(1, EltWidth))
+        return SDValue(N, 0);
+
+    break;
+  }
+  case RISCVISD::VFMV_S_F_VL: {
+    SDValue Src = N->getOperand(1);
+    // Try to remove vector->scalar->vector if the scalar->vector is inserting
+    // into an undef vector.
+    // TODO: Could use a vslide or vmv.v.v for non-undef.
+    if (N->getOperand(0).isUndef() &&
+        Src.getOpcode() == ISD::EXTRACT_VECTOR_ELT &&
+        isNullConstant(Src.getOperand(1)) &&
+        Src.getOperand(0).getValueType().isScalableVector()) {
+      EVT VT = N->getValueType(0);
+      EVT SrcVT = Src.getOperand(0).getValueType();
+      assert(SrcVT.getVectorElementType() == VT.getVectorElementType());
+      // Widths match, just return the original vector.
+      if (SrcVT == VT)
+        return Src.getOperand(0);
+      // TODO: Use insert_subvector/extract_subvector to change widen/narrow?
     }
     break;
   }
-  case ISD::SRA:
-  case ISD::SRL:
-  case ISD::SHL: {
-    SDValue ShAmt = N->getOperand(1);
-    if (ShAmt.getOpcode() == RISCVISD::SPLAT_VECTOR_SPLIT_I64_VL) {
-      // We don't need the upper 32 bits of a 64-bit element for a shift amount.
+  case ISD::INTRINSIC_WO_CHAIN: {
+    unsigned IntNo = N->getConstantOperandVal(0);
+    switch (IntNo) {
+      // By default we do not combine any intrinsic.
+    default:
+      return SDValue();
+    case Intrinsic::riscv_vcpop:
+    case Intrinsic::riscv_vcpop_mask:
+    case Intrinsic::riscv_vfirst:
+    case Intrinsic::riscv_vfirst_mask: {
+      SDValue VL = N->getOperand(2);
+      if (IntNo == Intrinsic::riscv_vcpop_mask ||
+          IntNo == Intrinsic::riscv_vfirst_mask)
+        VL = N->getOperand(3);
+      if (!isNullConstant(VL))
+        return SDValue();
+      // If VL is 0, vcpop -> li 0, vfirst -> li -1.
       SDLoc DL(N);
       EVT VT = N->getValueType(0);
-      ShAmt =
-          DAG.getNode(RISCVISD::SPLAT_VECTOR_I64, DL, VT, ShAmt.getOperand(0));
-      return DAG.getNode(N->getOpcode(), DL, VT, N->getOperand(0), ShAmt);
+      if (IntNo == Intrinsic::riscv_vfirst ||
+          IntNo == Intrinsic::riscv_vfirst_mask)
+        return DAG.getConstant(-1, DL, VT);
+      return DAG.getConstant(0, DL, VT);
+    }
     }
-    break;
   }
-  case RISCVISD::MUL_VL: {
-    // Try to form VWMUL or VWMULU.
-    // FIXME: Look for splat of extended scalar as well.
-    // FIXME: Support VWMULSU.
-    SDValue Op0 = N->getOperand(0);
-    SDValue Op1 = N->getOperand(1);
-    bool IsSignExt = Op0.getOpcode() == RISCVISD::VSEXT_VL;
-    bool IsZeroExt = Op0.getOpcode() == RISCVISD::VZEXT_VL;
-    if ((!IsSignExt && !IsZeroExt) || Op0.getOpcode() != Op1.getOpcode())
-      return SDValue();
-
-    // Make sure the extends have a single use.
-    if (!Op0.hasOneUse() || !Op1.hasOneUse())
-      return SDValue();
-
-    SDValue Mask = N->getOperand(2);
-    SDValue VL = N->getOperand(3);
-    if (Op0.getOperand(1) != Mask || Op1.getOperand(1) != Mask ||
-        Op0.getOperand(2) != VL || Op1.getOperand(2) != VL)
-      return SDValue();
-
-    Op0 = Op0.getOperand(0);
-    Op1 = Op1.getOperand(0);
-
-    MVT VT = N->getSimpleValueType(0);
-    MVT NarrowVT =
-        MVT::getVectorVT(MVT::getIntegerVT(VT.getScalarSizeInBits() / 2),
-                         VT.getVectorElementCount());
-
-    SDLoc DL(N);
-
-    // Re-introduce narrower extends if needed.
-    unsigned ExtOpc = IsSignExt ? RISCVISD::VSEXT_VL : RISCVISD::VZEXT_VL;
-    if (Op0.getValueType() != NarrowVT)
-      Op0 = DAG.getNode(ExtOpc, DL, NarrowVT, Op0, Mask, VL);
-    if (Op1.getValueType() != NarrowVT)
-      Op1 = DAG.getNode(ExtOpc, DL, NarrowVT, Op1, Mask, VL);
+  case ISD::BITCAST: {
+    assert(Subtarget.useRVVForFixedLengthVectors());
+    SDValue N0 = N->getOperand(0);
+    EVT VT = N->getValueType(0);
+    EVT SrcVT = N0.getValueType();
+    // If this is a bitcast between a MVT::v4i1/v2i1/v1i1 and an illegal integer
+    // type, widen both sides to avoid a trip through memory.
+    if ((SrcVT == MVT::v1i1 || SrcVT == MVT::v2i1 || SrcVT == MVT::v4i1) &&
+        VT.isScalarInteger()) {
+      unsigned NumConcats = 8 / SrcVT.getVectorNumElements();
+      SmallVector<SDValue, 4> Ops(NumConcats, DAG.getUNDEF(SrcVT));
+      Ops[0] = N0;
+      SDLoc DL(N);
+      N0 = DAG.getNode(ISD::CONCAT_VECTORS, DL, MVT::v8i1, Ops);
+      N0 = DAG.getBitcast(MVT::i8, N0);
+      return DAG.getNode(ISD::TRUNCATE, DL, VT, N0);
+    }
 
-    unsigned WMulOpc = IsSignExt ? RISCVISD::VWMUL_VL : RISCVISD::VWMULU_VL;
-    return DAG.getNode(WMulOpc, DL, VT, Op0, Op1, Mask, VL);
+    return SDValue();
   }
   }
 
@@ -6367,6 +10641,10 @@ SDValue RISCVTargetLowering::PerformDAGCombine(SDNode *N,
 
 bool RISCVTargetLowering::isDesirableToCommuteWithShift(
     const SDNode *N, CombineLevel Level) const {
+  assert((N->getOpcode() == ISD::SHL || N->getOpcode() == ISD::SRA ||
+          N->getOpcode() == ISD::SRL) &&
+         "Expected shift op");
+
   // The following folds are only desirable if `(OP _, c1 << c2)` can be
   // materialised in fewer instructions than `(OP _, c1)`:
   //
@@ -6424,8 +10702,8 @@ bool RISCVTargetLowering::targetShrinkDemandedConstant(
   if (VT.isVector())
     return false;
 
-  // Only handle AND for now.
-  if (Op.getOpcode() != ISD::AND)
+  unsigned Opcode = Op.getOpcode();
+  if (Opcode != ISD::AND && Opcode != ISD::OR && Opcode != ISD::XOR)
     return false;
 
   ConstantSDNode *C = dyn_cast<ConstantSDNode>(Op.getOperand(1));
@@ -6444,12 +10722,13 @@ bool RISCVTargetLowering::targetShrinkDemandedConstant(
   auto IsLegalMask = [ShrunkMask, ExpandedMask](const APInt &Mask) -> bool {
     return ShrunkMask.isSubsetOf(Mask) && Mask.isSubsetOf(ExpandedMask);
   };
-  auto UseMask = [Mask, Op, VT, &TLO](const APInt &NewMask) -> bool {
+  auto UseMask = [Mask, Op, &TLO](const APInt &NewMask) -> bool {
     if (NewMask == Mask)
       return true;
     SDLoc DL(Op);
-    SDValue NewC = TLO.DAG.getConstant(NewMask, DL, VT);
-    SDValue NewOp = TLO.DAG.getNode(ISD::AND, DL, VT, Op.getOperand(0), NewC);
+    SDValue NewC = TLO.DAG.getConstant(NewMask, DL, Op.getValueType());
+    SDValue NewOp = TLO.DAG.getNode(Op.getOpcode(), DL, Op.getValueType(),
+                                    Op.getOperand(0), NewC);
     return TLO.CombineTo(Op, NewOp);
   };
 
@@ -6458,18 +10737,20 @@ bool RISCVTargetLowering::targetShrinkDemandedConstant(
   if (ShrunkMask.isSignedIntN(12))
     return false;
 
-  // Preserve (and X, 0xffff) when zext.h is supported.
-  if (Subtarget.hasStdExtZbb() || Subtarget.hasStdExtZbp()) {
+  // And has a few special cases for zext.
+  if (Opcode == ISD::AND) {
+    // Preserve (and X, 0xffff), if zext.h exists use zext.h,
+    // otherwise use SLLI + SRLI.
     APInt NewMask = APInt(Mask.getBitWidth(), 0xffff);
     if (IsLegalMask(NewMask))
       return UseMask(NewMask);
-  }
 
-  // Try to preserve (and X, 0xffffffff), the (zext_inreg X, i32) pattern.
-  if (VT == MVT::i64) {
-    APInt NewMask = APInt(64, 0xffffffff);
-    if (IsLegalMask(NewMask))
-      return UseMask(NewMask);
+    // Try to preserve (and X, 0xffffffff), the (zext_inreg X, i32) pattern.
+    if (VT == MVT::i64) {
+      APInt NewMask = APInt(64, 0xffffffff);
+      if (IsLegalMask(NewMask))
+        return UseMask(NewMask);
+    }
   }
 
   // For the remaining optimizations, we need to be able to make a negative
@@ -6482,35 +10763,37 @@ bool RISCVTargetLowering::targetShrinkDemandedConstant(
 
   // Try to make a 12 bit negative immediate. If that fails try to make a 32
   // bit negative immediate unless the shrunk immediate already fits in 32 bits.
+  // If we can't create a simm12, we shouldn't change opaque constants.
   APInt NewMask = ShrunkMask;
   if (MinSignedBits <= 12)
     NewMask.setBitsFrom(11);
-  else if (MinSignedBits <= 32 && !ShrunkMask.isSignedIntN(32))
+  else if (!C->isOpaque() && MinSignedBits <= 32 && !ShrunkMask.isSignedIntN(32))
     NewMask.setBitsFrom(31);
   else
     return false;
 
-  // Sanity check that our new mask is a subset of the demanded mask.
+  // Check that our new mask is a subset of the demanded mask.
   assert(IsLegalMask(NewMask));
   return UseMask(NewMask);
 }
 
-static void computeGREV(APInt &Src, unsigned ShAmt) {
-  ShAmt &= Src.getBitWidth() - 1;
-  uint64_t x = Src.getZExtValue();
-  if (ShAmt & 1)
-    x = ((x & 0x5555555555555555LL) << 1) | ((x & 0xAAAAAAAAAAAAAAAALL) >> 1);
-  if (ShAmt & 2)
-    x = ((x & 0x3333333333333333LL) << 2) | ((x & 0xCCCCCCCCCCCCCCCCLL) >> 2);
-  if (ShAmt & 4)
-    x = ((x & 0x0F0F0F0F0F0F0F0FLL) << 4) | ((x & 0xF0F0F0F0F0F0F0F0LL) >> 4);
-  if (ShAmt & 8)
-    x = ((x & 0x00FF00FF00FF00FFLL) << 8) | ((x & 0xFF00FF00FF00FF00LL) >> 8);
-  if (ShAmt & 16)
-    x = ((x & 0x0000FFFF0000FFFFLL) << 16) | ((x & 0xFFFF0000FFFF0000LL) >> 16);
-  if (ShAmt & 32)
-    x = ((x & 0x00000000FFFFFFFFLL) << 32) | ((x & 0xFFFFFFFF00000000LL) >> 32);
-  Src = x;
+static uint64_t computeGREVOrGORC(uint64_t x, unsigned ShAmt, bool IsGORC) {
+  static const uint64_t GREVMasks[] = {
+      0x5555555555555555ULL, 0x3333333333333333ULL, 0x0F0F0F0F0F0F0F0FULL,
+      0x00FF00FF00FF00FFULL, 0x0000FFFF0000FFFFULL, 0x00000000FFFFFFFFULL};
+
+  for (unsigned Stage = 0; Stage != 6; ++Stage) {
+    unsigned Shift = 1 << Stage;
+    if (ShAmt & Shift) {
+      uint64_t Mask = GREVMasks[Stage];
+      uint64_t Res = ((x & Mask) << Shift) | ((x >> Shift) & Mask);
+      if (IsGORC)
+        Res |= x;
+      x = Res;
+    }
+  }
+
+  return x;
 }
 
 void RISCVTargetLowering::computeKnownBitsForTargetNode(const SDValue Op,
@@ -6564,45 +10847,53 @@ void RISCVTargetLowering::computeKnownBitsForTargetNode(const SDValue Op,
   case RISCVISD::CTZW: {
     KnownBits Known2 = DAG.computeKnownBits(Op.getOperand(0), Depth + 1);
     unsigned PossibleTZ = Known2.trunc(32).countMaxTrailingZeros();
-    unsigned LowBits = Log2_32(PossibleTZ) + 1;
+    unsigned LowBits = llvm::bit_width(PossibleTZ);
     Known.Zero.setBitsFrom(LowBits);
     break;
   }
   case RISCVISD::CLZW: {
     KnownBits Known2 = DAG.computeKnownBits(Op.getOperand(0), Depth + 1);
     unsigned PossibleLZ = Known2.trunc(32).countMaxLeadingZeros();
-    unsigned LowBits = Log2_32(PossibleLZ) + 1;
+    unsigned LowBits = llvm::bit_width(PossibleLZ);
     Known.Zero.setBitsFrom(LowBits);
     break;
   }
-  case RISCVISD::GREV:
-  case RISCVISD::GREVW: {
-    if (auto *C = dyn_cast<ConstantSDNode>(Op.getOperand(1))) {
-      Known = DAG.computeKnownBits(Op.getOperand(0), Depth + 1);
-      if (Opc == RISCVISD::GREVW)
-        Known = Known.trunc(32);
-      unsigned ShAmt = C->getZExtValue();
-      computeGREV(Known.Zero, ShAmt);
-      computeGREV(Known.One, ShAmt);
-      if (Opc == RISCVISD::GREVW)
-        Known = Known.sext(BitWidth);
-    }
+  case RISCVISD::BREV8:
+  case RISCVISD::ORC_B: {
+    // FIXME: This is based on the non-ratified Zbp GREV and GORC where a
+    // control value of 7 is equivalent to brev8 and orc.b.
+    Known = DAG.computeKnownBits(Op.getOperand(0), Depth + 1);
+    bool IsGORC = Op.getOpcode() == RISCVISD::ORC_B;
+    // To compute zeros, we need to invert the value and invert it back after.
+    Known.Zero =
+        ~computeGREVOrGORC(~Known.Zero.getZExtValue(), 7, IsGORC);
+    Known.One = computeGREVOrGORC(Known.One.getZExtValue(), 7, IsGORC);
     break;
   }
-  case RISCVISD::READ_VLENB:
-    // We assume VLENB is at least 16 bytes.
-    Known.Zero.setLowBits(4);
-    // We assume VLENB is no more than 65536 / 8 bytes.
-    Known.Zero.setBitsFrom(14);
+  case RISCVISD::READ_VLENB: {
+    // We can use the minimum and maximum VLEN values to bound VLENB.  We
+    // know VLEN must be a power of two.
+    const unsigned MinVLenB = Subtarget.getRealMinVLen() / 8;
+    const unsigned MaxVLenB = Subtarget.getRealMaxVLen() / 8;
+    assert(MinVLenB > 0 && "READ_VLENB without vector extension enabled?");
+    Known.Zero.setLowBits(Log2_32(MinVLenB));
+    Known.Zero.setBitsFrom(Log2_32(MaxVLenB)+1);
+    if (MaxVLenB == MinVLenB)
+      Known.One.setBit(Log2_32(MinVLenB));
     break;
-  case ISD::INTRINSIC_W_CHAIN: {
-    unsigned IntNo = Op.getConstantOperandVal(1);
+  }
+  case ISD::INTRINSIC_W_CHAIN:
+  case ISD::INTRINSIC_WO_CHAIN: {
+    unsigned IntNo =
+        Op.getConstantOperandVal(Opc == ISD::INTRINSIC_WO_CHAIN ? 0 : 1);
     switch (IntNo) {
     default:
       // We can't do anything for most intrinsics.
       break;
     case Intrinsic::riscv_vsetvli:
     case Intrinsic::riscv_vsetvlimax:
+    case Intrinsic::riscv_vsetvli_opt:
+    case Intrinsic::riscv_vsetvlimax_opt:
       // Assume that VL output is positive and would fit in an int32_t.
       // TODO: VLEN might be capped at 16 bits in a future V spec update.
       if (BitWidth >= 32)
@@ -6620,6 +10911,22 @@ unsigned RISCVTargetLowering::ComputeNumSignBitsForTargetNode(
   switch (Op.getOpcode()) {
   default:
     break;
+  case RISCVISD::SELECT_CC: {
+    unsigned Tmp =
+        DAG.ComputeNumSignBits(Op.getOperand(3), DemandedElts, Depth + 1);
+    if (Tmp == 1) return 1;  // Early out.
+    unsigned Tmp2 =
+        DAG.ComputeNumSignBits(Op.getOperand(4), DemandedElts, Depth + 1);
+    return std::min(Tmp, Tmp2);
+  }
+  case RISCVISD::ABSW: {
+    // We expand this at isel to negw+max. The result will have 33 sign bits
+    // if the input has at least 33 sign bits.
+    unsigned Tmp =
+        DAG.ComputeNumSignBits(Op.getOperand(0), DemandedElts, Depth + 1);
+    if (Tmp < 33) return 1;
+    return 33;
+  }
   case RISCVISD::SLLW:
   case RISCVISD::SRAW:
   case RISCVISD::SRLW:
@@ -6628,49 +10935,101 @@ unsigned RISCVTargetLowering::ComputeNumSignBitsForTargetNode(
   case RISCVISD::REMUW:
   case RISCVISD::ROLW:
   case RISCVISD::RORW:
-  case RISCVISD::GREVW:
-  case RISCVISD::GORCW:
-  case RISCVISD::FSLW:
-  case RISCVISD::FSRW:
-  case RISCVISD::SHFLW:
-  case RISCVISD::UNSHFLW:
-  case RISCVISD::BCOMPRESSW:
-  case RISCVISD::BDECOMPRESSW:
   case RISCVISD::FCVT_W_RV64:
   case RISCVISD::FCVT_WU_RV64:
+  case RISCVISD::STRICT_FCVT_W_RV64:
+  case RISCVISD::STRICT_FCVT_WU_RV64:
     // TODO: As the result is sign-extended, this is conservatively correct. A
     // more precise answer could be calculated for SRAW depending on known
     // bits in the shift amount.
     return 33;
-  case RISCVISD::SHFL:
-  case RISCVISD::UNSHFL: {
-    // There is no SHFLIW, but a i64 SHFLI with bit 4 of the control word
-    // cleared doesn't affect bit 31. The upper 32 bits will be shuffled, but
-    // will stay within the upper 32 bits. If there were more than 32 sign bits
-    // before there will be at least 33 sign bits after.
-    if (Op.getValueType() == MVT::i64 &&
-        isa<ConstantSDNode>(Op.getOperand(1)) &&
-        (Op.getConstantOperandVal(1) & 0x10) == 0) {
-      unsigned Tmp = DAG.ComputeNumSignBits(Op.getOperand(0), Depth + 1);
-      if (Tmp > 32)
-        return 33;
-    }
-    break;
-  }
-  case RISCVISD::VMV_X_S:
+  case RISCVISD::VMV_X_S: {
     // The number of sign bits of the scalar result is computed by obtaining the
     // element type of the input vector operand, subtracting its width from the
     // XLEN, and then adding one (sign bit within the element type). If the
     // element type is wider than XLen, the least-significant XLEN bits are
     // taken.
-    if (Op.getOperand(0).getScalarValueSizeInBits() > Subtarget.getXLen())
-      return 1;
-    return Subtarget.getXLen() - Op.getOperand(0).getScalarValueSizeInBits() + 1;
+    unsigned XLen = Subtarget.getXLen();
+    unsigned EltBits = Op.getOperand(0).getScalarValueSizeInBits();
+    if (EltBits <= XLen)
+      return XLen - EltBits + 1;
+    break;
+  }
+  case ISD::INTRINSIC_W_CHAIN: {
+    unsigned IntNo = Op.getConstantOperandVal(1);
+    switch (IntNo) {
+    default:
+      break;
+    case Intrinsic::riscv_masked_atomicrmw_xchg_i64:
+    case Intrinsic::riscv_masked_atomicrmw_add_i64:
+    case Intrinsic::riscv_masked_atomicrmw_sub_i64:
+    case Intrinsic::riscv_masked_atomicrmw_nand_i64:
+    case Intrinsic::riscv_masked_atomicrmw_max_i64:
+    case Intrinsic::riscv_masked_atomicrmw_min_i64:
+    case Intrinsic::riscv_masked_atomicrmw_umax_i64:
+    case Intrinsic::riscv_masked_atomicrmw_umin_i64:
+    case Intrinsic::riscv_masked_cmpxchg_i64:
+      // riscv_masked_{atomicrmw_*,cmpxchg} intrinsics represent an emulated
+      // narrow atomic operation. These are implemented using atomic
+      // operations at the minimum supported atomicrmw/cmpxchg width whose
+      // result is then sign extended to XLEN. With +A, the minimum width is
+      // 32 for both 64 and 32.
+      assert(Subtarget.getXLen() == 64);
+      assert(getMinCmpXchgSizeInBits() == 32);
+      assert(Subtarget.hasStdExtA());
+      return 33;
+    }
+  }
   }
 
   return 1;
 }
 
+const Constant *
+RISCVTargetLowering::getTargetConstantFromLoad(LoadSDNode *Ld) const {
+  assert(Ld && "Unexpected null LoadSDNode");
+  if (!ISD::isNormalLoad(Ld))
+    return nullptr;
+
+  SDValue Ptr = Ld->getBasePtr();
+
+  // Only constant pools with no offset are supported.
+  auto GetSupportedConstantPool = [](SDValue Ptr) -> ConstantPoolSDNode * {
+    auto *CNode = dyn_cast<ConstantPoolSDNode>(Ptr);
+    if (!CNode || CNode->isMachineConstantPoolEntry() ||
+        CNode->getOffset() != 0)
+      return nullptr;
+
+    return CNode;
+  };
+
+  // Simple case, LLA.
+  if (Ptr.getOpcode() == RISCVISD::LLA) {
+    auto *CNode = GetSupportedConstantPool(Ptr);
+    if (!CNode || CNode->getTargetFlags() != 0)
+      return nullptr;
+
+    return CNode->getConstVal();
+  }
+
+  // Look for a HI and ADD_LO pair.
+  if (Ptr.getOpcode() != RISCVISD::ADD_LO ||
+      Ptr.getOperand(0).getOpcode() != RISCVISD::HI)
+    return nullptr;
+
+  auto *CNodeLo = GetSupportedConstantPool(Ptr.getOperand(1));
+  auto *CNodeHi = GetSupportedConstantPool(Ptr.getOperand(0).getOperand(0));
+
+  if (!CNodeLo || CNodeLo->getTargetFlags() != RISCVII::MO_LO ||
+      !CNodeHi || CNodeHi->getTargetFlags() != RISCVII::MO_HI)
+    return nullptr;
+
+  if (CNodeLo->getConstVal() != CNodeHi->getConstVal())
+    return nullptr;
+
+  return CNodeLo->getConstVal();
+}
+
 static MachineBasicBlock *emitReadCycleWidePseudo(MachineInstr &MI,
                                                   MachineBasicBlock *BB) {
   assert(MI.getOpcode() == RISCV::ReadCycleWide && "Unexpected instruction");
@@ -6748,7 +11107,7 @@ static MachineBasicBlock *emitSplitF64Pseudo(MachineInstr &MI,
   int FI = MF.getInfo<RISCVMachineFunctionInfo>()->getMoveF64FrameIndex(MF);
 
   TII.storeRegToStackSlot(*BB, MI, SrcReg, MI.getOperand(2).isKill(), FI, SrcRC,
-                          RI);
+                          RI, Register());
   MachinePointerInfo MPI = MachinePointerInfo::getFixedStack(MF, FI);
   MachineMemOperand *MMOLo =
       MF.getMachineMemOperand(MPI, MachineMemOperand::MOLoad, 4, Align(8));
@@ -6796,7 +11155,7 @@ static MachineBasicBlock *emitBuildPairF64Pseudo(MachineInstr &MI,
       .addFrameIndex(FI)
       .addImm(4)
       .addMemOperand(MMOHi);
-  TII.loadRegFromStackSlot(*BB, MI, DstReg, FI, DstRC, RI);
+  TII.loadRegFromStackSlot(*BB, MI, DstReg, FI, DstRC, RI, Register());
   MI.eraseFromParent(); // The pseudo instruction is gone now.
   return BB;
 }
@@ -6813,8 +11172,148 @@ static bool isSelectPseudo(MachineInstr &MI) {
   }
 }
 
+static MachineBasicBlock *emitQuietFCMP(MachineInstr &MI, MachineBasicBlock *BB,
+                                        unsigned RelOpcode, unsigned EqOpcode,
+                                        const RISCVSubtarget &Subtarget) {
+  DebugLoc DL = MI.getDebugLoc();
+  Register DstReg = MI.getOperand(0).getReg();
+  Register Src1Reg = MI.getOperand(1).getReg();
+  Register Src2Reg = MI.getOperand(2).getReg();
+  MachineRegisterInfo &MRI = BB->getParent()->getRegInfo();
+  Register SavedFFlags = MRI.createVirtualRegister(&RISCV::GPRRegClass);
+  const TargetInstrInfo &TII = *BB->getParent()->getSubtarget().getInstrInfo();
+
+  // Save the current FFLAGS.
+  BuildMI(*BB, MI, DL, TII.get(RISCV::ReadFFLAGS), SavedFFlags);
+
+  auto MIB = BuildMI(*BB, MI, DL, TII.get(RelOpcode), DstReg)
+                 .addReg(Src1Reg)
+                 .addReg(Src2Reg);
+  if (MI.getFlag(MachineInstr::MIFlag::NoFPExcept))
+    MIB->setFlag(MachineInstr::MIFlag::NoFPExcept);
+
+  // Restore the FFLAGS.
+  BuildMI(*BB, MI, DL, TII.get(RISCV::WriteFFLAGS))
+      .addReg(SavedFFlags, RegState::Kill);
+
+  // Issue a dummy FEQ opcode to raise exception for signaling NaNs.
+  auto MIB2 = BuildMI(*BB, MI, DL, TII.get(EqOpcode), RISCV::X0)
+                  .addReg(Src1Reg, getKillRegState(MI.getOperand(1).isKill()))
+                  .addReg(Src2Reg, getKillRegState(MI.getOperand(2).isKill()));
+  if (MI.getFlag(MachineInstr::MIFlag::NoFPExcept))
+    MIB2->setFlag(MachineInstr::MIFlag::NoFPExcept);
+
+  // Erase the pseudoinstruction.
+  MI.eraseFromParent();
+  return BB;
+}
+
+static MachineBasicBlock *
+EmitLoweredCascadedSelect(MachineInstr &First, MachineInstr &Second,
+                          MachineBasicBlock *ThisMBB,
+                          const RISCVSubtarget &Subtarget) {
+  // Select_FPRX_ (rs1, rs2, imm, rs4, (Select_FPRX_ rs1, rs2, imm, rs4, rs5)
+  // Without this, custom-inserter would have generated:
+  //
+  //   A
+  //   | \
+  //   |  B
+  //   | /
+  //   C
+  //   | \
+  //   |  D
+  //   | /
+  //   E
+  //
+  // A: X = ...; Y = ...
+  // B: empty
+  // C: Z = PHI [X, A], [Y, B]
+  // D: empty
+  // E: PHI [X, C], [Z, D]
+  //
+  // If we lower both Select_FPRX_ in a single step, we can instead generate:
+  //
+  //   A
+  //   | \
+  //   |  C
+  //   | /|
+  //   |/ |
+  //   |  |
+  //   |  D
+  //   | /
+  //   E
+  //
+  // A: X = ...; Y = ...
+  // D: empty
+  // E: PHI [X, A], [X, C], [Y, D]
+
+  const RISCVInstrInfo &TII = *Subtarget.getInstrInfo();
+  const DebugLoc &DL = First.getDebugLoc();
+  const BasicBlock *LLVM_BB = ThisMBB->getBasicBlock();
+  MachineFunction *F = ThisMBB->getParent();
+  MachineBasicBlock *FirstMBB = F->CreateMachineBasicBlock(LLVM_BB);
+  MachineBasicBlock *SecondMBB = F->CreateMachineBasicBlock(LLVM_BB);
+  MachineBasicBlock *SinkMBB = F->CreateMachineBasicBlock(LLVM_BB);
+  MachineFunction::iterator It = ++ThisMBB->getIterator();
+  F->insert(It, FirstMBB);
+  F->insert(It, SecondMBB);
+  F->insert(It, SinkMBB);
+
+  // Transfer the remainder of ThisMBB and its successor edges to SinkMBB.
+  SinkMBB->splice(SinkMBB->begin(), ThisMBB,
+                  std::next(MachineBasicBlock::iterator(First)),
+                  ThisMBB->end());
+  SinkMBB->transferSuccessorsAndUpdatePHIs(ThisMBB);
+
+  // Fallthrough block for ThisMBB.
+  ThisMBB->addSuccessor(FirstMBB);
+  // Fallthrough block for FirstMBB.
+  FirstMBB->addSuccessor(SecondMBB);
+  ThisMBB->addSuccessor(SinkMBB);
+  FirstMBB->addSuccessor(SinkMBB);
+  // This is fallthrough.
+  SecondMBB->addSuccessor(SinkMBB);
+
+  auto FirstCC = static_cast<RISCVCC::CondCode>(First.getOperand(3).getImm());
+  Register FLHS = First.getOperand(1).getReg();
+  Register FRHS = First.getOperand(2).getReg();
+  // Insert appropriate branch.
+  BuildMI(FirstMBB, DL, TII.getBrCond(FirstCC))
+      .addReg(FLHS)
+      .addReg(FRHS)
+      .addMBB(SinkMBB);
+
+  Register SLHS = Second.getOperand(1).getReg();
+  Register SRHS = Second.getOperand(2).getReg();
+  Register Op1Reg4 = First.getOperand(4).getReg();
+  Register Op1Reg5 = First.getOperand(5).getReg();
+
+  auto SecondCC = static_cast<RISCVCC::CondCode>(Second.getOperand(3).getImm());
+  // Insert appropriate branch.
+  BuildMI(ThisMBB, DL, TII.getBrCond(SecondCC))
+      .addReg(SLHS)
+      .addReg(SRHS)
+      .addMBB(SinkMBB);
+
+  Register DestReg = Second.getOperand(0).getReg();
+  Register Op2Reg4 = Second.getOperand(4).getReg();
+  BuildMI(*SinkMBB, SinkMBB->begin(), DL, TII.get(RISCV::PHI), DestReg)
+      .addReg(Op2Reg4)
+      .addMBB(ThisMBB)
+      .addReg(Op1Reg4)
+      .addMBB(FirstMBB)
+      .addReg(Op1Reg5)
+      .addMBB(SecondMBB);
+
+  // Now remove the Select_FPRX_s.
+  First.eraseFromParent();
+  Second.eraseFromParent();
+  return SinkMBB;
+}
+
 static MachineBasicBlock *emitSelectPseudo(MachineInstr &MI,
-                                           MachineBasicBlock *BB) {
+                                           MachineBasicBlock *BB,
+                                           const RISCVSubtarget &Subtarget) {
   // To "insert" Select_* instructions, we actually have to insert the triangle
   // control-flow pattern.  The incoming instructions know the destination vreg
   // to set, the condition code register to branch on, the true/false values to
@@ -6832,6 +11331,7 @@ static MachineBasicBlock *emitSelectPseudo(MachineInstr &MI,
   // multiple selects with the exact same condition (same LHS, RHS and CC).
   // The selects may be interleaved with other instructions if the other
   // instructions meet some requirements we deem safe:
+  // - They are not pseudo instructions.
   // - They are debug instructions. Otherwise,
   // - They do not have side-effects, do not access memory and their inputs do
   //   not depend on the results of the select pseudo-instructions.
@@ -6839,21 +11339,32 @@ static MachineBasicBlock *emitSelectPseudo(MachineInstr &MI,
   // previous selects in the sequence.
   // These conditions could be further relaxed. See the X86 target for a
   // related approach and more information.
+  //
+  // Select_FPRX_ (rs1, rs2, imm, rs4, (Select_FPRX_ rs1, rs2, imm, rs4, rs5))
+  // is checked here and handled by a separate function -
+  // EmitLoweredCascadedSelect.
   Register LHS = MI.getOperand(1).getReg();
   Register RHS = MI.getOperand(2).getReg();
-  auto CC = static_cast<ISD::CondCode>(MI.getOperand(3).getImm());
+  auto CC = static_cast<RISCVCC::CondCode>(MI.getOperand(3).getImm());
 
   SmallVector<MachineInstr *, 4> SelectDebugValues;
   SmallSet<Register, 4> SelectDests;
   SelectDests.insert(MI.getOperand(0).getReg());
 
   MachineInstr *LastSelectPseudo = &MI;
+  auto Next = next_nodbg(MI.getIterator(), BB->instr_end());
+  if (MI.getOpcode() != RISCV::Select_GPR_Using_CC_GPR && Next != BB->end() &&
+      Next->getOpcode() == MI.getOpcode() &&
+      Next->getOperand(5).getReg() == MI.getOperand(0).getReg() &&
+      Next->getOperand(5).isKill()) {
+    return EmitLoweredCascadedSelect(MI, *Next, BB, Subtarget);
+  }
 
   for (auto E = BB->end(), SequenceMBBI = MachineBasicBlock::iterator(MI);
        SequenceMBBI != E; ++SequenceMBBI) {
     if (SequenceMBBI->isDebugInstr())
       continue;
-    else if (isSelectPseudo(*SequenceMBBI)) {
+    if (isSelectPseudo(*SequenceMBBI)) {
       if (SequenceMBBI->getOperand(1).getReg() != LHS ||
           SequenceMBBI->getOperand(2).getReg() != RHS ||
           SequenceMBBI->getOperand(3).getImm() != CC ||
@@ -6863,18 +11374,19 @@ static MachineBasicBlock *emitSelectPseudo(MachineInstr &MI,
       LastSelectPseudo = &*SequenceMBBI;
       SequenceMBBI->collectDebugValues(SelectDebugValues);
       SelectDests.insert(SequenceMBBI->getOperand(0).getReg());
-    } else {
-      if (SequenceMBBI->hasUnmodeledSideEffects() ||
-          SequenceMBBI->mayLoadOrStore())
-        break;
-      if (llvm::any_of(SequenceMBBI->operands(), [&](MachineOperand &MO) {
-            return MO.isReg() && MO.isUse() && SelectDests.count(MO.getReg());
-          }))
-        break;
+      continue;
     }
+    if (SequenceMBBI->hasUnmodeledSideEffects() ||
+        SequenceMBBI->mayLoadOrStore() ||
+        SequenceMBBI->usesCustomInsertionHook())
+      break;
+    if (llvm::any_of(SequenceMBBI->operands(), [&](MachineOperand &MO) {
+          return MO.isReg() && MO.isUse() && SelectDests.count(MO.getReg());
+        }))
+      break;
   }
 
-  const TargetInstrInfo &TII = *BB->getParent()->getSubtarget().getInstrInfo();
+  const RISCVInstrInfo &TII = *Subtarget.getInstrInfo();
   const BasicBlock *LLVM_BB = BB->getBasicBlock();
   DebugLoc DL = MI.getDebugLoc();
   MachineFunction::iterator I = ++BB->getIterator();
@@ -6903,9 +11415,7 @@ static MachineBasicBlock *emitSelectPseudo(MachineInstr &MI,
   HeadMBB->addSuccessor(TailMBB);
 
   // Insert appropriate branch.
-  unsigned Opcode = getBranchOpcodeForIntCondCode(CC);
-
-  BuildMI(HeadMBB, DL, TII.get(Opcode))
+  BuildMI(HeadMBB, DL, TII.getBrCond(CC))
     .addReg(LHS)
     .addReg(RHS)
     .addMBB(TailMBB);
@@ -6936,6 +11446,196 @@ static MachineBasicBlock *emitSelectPseudo(MachineInstr &MI,
   return TailMBB;
 }
 
+static MachineBasicBlock *
+emitVFCVT_RM_MASK(MachineInstr &MI, MachineBasicBlock *BB, unsigned Opcode) {
+  DebugLoc DL = MI.getDebugLoc();
+
+  const TargetInstrInfo &TII = *BB->getParent()->getSubtarget().getInstrInfo();
+
+  MachineRegisterInfo &MRI = BB->getParent()->getRegInfo();
+  Register SavedFRM = MRI.createVirtualRegister(&RISCV::GPRRegClass);
+
+  // Update FRM and save the old value.
+  BuildMI(*BB, MI, DL, TII.get(RISCV::SwapFRMImm), SavedFRM)
+      .addImm(MI.getOperand(4).getImm());
+
+  // Emit an VFCVT without the FRM operand.
+  assert(MI.getNumOperands() == 8);
+  auto MIB = BuildMI(*BB, MI, DL, TII.get(Opcode))
+                 .add(MI.getOperand(0))
+                 .add(MI.getOperand(1))
+                 .add(MI.getOperand(2))
+                 .add(MI.getOperand(3))
+                 .add(MI.getOperand(5))
+                 .add(MI.getOperand(6))
+                 .add(MI.getOperand(7));
+  if (MI.getFlag(MachineInstr::MIFlag::NoFPExcept))
+    MIB->setFlag(MachineInstr::MIFlag::NoFPExcept);
+
+  // Restore FRM.
+  BuildMI(*BB, MI, DL, TII.get(RISCV::WriteFRM))
+      .addReg(SavedFRM, RegState::Kill);
+
+  // Erase the pseudoinstruction.
+  MI.eraseFromParent();
+  return BB;
+}
+
+static MachineBasicBlock *emitVFROUND_NOEXCEPT_MASK(MachineInstr &MI,
+                                                    MachineBasicBlock *BB,
+                                                    unsigned CVTXOpc,
+                                                    unsigned CVTFOpc) {
+  DebugLoc DL = MI.getDebugLoc();
+
+  const TargetInstrInfo &TII = *BB->getParent()->getSubtarget().getInstrInfo();
+
+  MachineRegisterInfo &MRI = BB->getParent()->getRegInfo();
+  Register SavedFFLAGS = MRI.createVirtualRegister(&RISCV::GPRRegClass);
+
+  // Save the old value of FFLAGS.
+  BuildMI(*BB, MI, DL, TII.get(RISCV::ReadFFLAGS), SavedFFLAGS);
+
+  assert(MI.getNumOperands() == 7);
+
+  // Emit a VFCVT_X_F
+  const TargetRegisterInfo *TRI =
+      BB->getParent()->getSubtarget().getRegisterInfo();
+  const TargetRegisterClass *RC = MI.getRegClassConstraint(0, &TII, TRI);
+  Register Tmp = MRI.createVirtualRegister(RC);
+  BuildMI(*BB, MI, DL, TII.get(CVTXOpc), Tmp)
+      .add(MI.getOperand(1))
+      .add(MI.getOperand(2))
+      .add(MI.getOperand(3))
+      .add(MI.getOperand(4))
+      .add(MI.getOperand(5))
+      .add(MI.getOperand(6));
+
+  // Emit a VFCVT_F_X
+  BuildMI(*BB, MI, DL, TII.get(CVTFOpc))
+      .add(MI.getOperand(0))
+      .add(MI.getOperand(1))
+      .addReg(Tmp)
+      .add(MI.getOperand(3))
+      .add(MI.getOperand(4))
+      .add(MI.getOperand(5))
+      .add(MI.getOperand(6));
+
+  // Restore FFLAGS.
+  BuildMI(*BB, MI, DL, TII.get(RISCV::WriteFFLAGS))
+      .addReg(SavedFFLAGS, RegState::Kill);
+
+  // Erase the pseudoinstruction.
+  MI.eraseFromParent();
+  return BB;
+}
+
+static MachineBasicBlock *emitFROUND(MachineInstr &MI, MachineBasicBlock *MBB,
+                                     const RISCVSubtarget &Subtarget) {
+  unsigned CmpOpc, F2IOpc, I2FOpc, FSGNJOpc, FSGNJXOpc;
+  const TargetRegisterClass *RC;
+  switch (MI.getOpcode()) {
+  default:
+    llvm_unreachable("Unexpected opcode");
+  case RISCV::PseudoFROUND_H:
+    CmpOpc = RISCV::FLT_H;
+    F2IOpc = RISCV::FCVT_W_H;
+    I2FOpc = RISCV::FCVT_H_W;
+    FSGNJOpc = RISCV::FSGNJ_H;
+    FSGNJXOpc = RISCV::FSGNJX_H;
+    RC = &RISCV::FPR16RegClass;
+    break;
+  case RISCV::PseudoFROUND_S:
+    CmpOpc = RISCV::FLT_S;
+    F2IOpc = RISCV::FCVT_W_S;
+    I2FOpc = RISCV::FCVT_S_W;
+    FSGNJOpc = RISCV::FSGNJ_S;
+    FSGNJXOpc = RISCV::FSGNJX_S;
+    RC = &RISCV::FPR32RegClass;
+    break;
+  case RISCV::PseudoFROUND_D:
+    assert(Subtarget.is64Bit() && "Expected 64-bit GPR.");
+    CmpOpc = RISCV::FLT_D;
+    F2IOpc = RISCV::FCVT_L_D;
+    I2FOpc = RISCV::FCVT_D_L;
+    FSGNJOpc = RISCV::FSGNJ_D;
+    FSGNJXOpc = RISCV::FSGNJX_D;
+    RC = &RISCV::FPR64RegClass;
+    break;
+  }
+
+  const BasicBlock *BB = MBB->getBasicBlock();
+  DebugLoc DL = MI.getDebugLoc();
+  MachineFunction::iterator I = ++MBB->getIterator();
+
+  MachineFunction *F = MBB->getParent();
+  MachineBasicBlock *CvtMBB = F->CreateMachineBasicBlock(BB);
+  MachineBasicBlock *DoneMBB = F->CreateMachineBasicBlock(BB);
+
+  F->insert(I, CvtMBB);
+  F->insert(I, DoneMBB);
+  // Move all instructions after the sequence to DoneMBB.
+  DoneMBB->splice(DoneMBB->end(), MBB, MachineBasicBlock::iterator(MI),
+                  MBB->end());
+  // Update machine-CFG edges by transferring all successors of the current
+  // block to the new block which will contain the Phi nodes for the selects.
+  DoneMBB->transferSuccessorsAndUpdatePHIs(MBB);
+  // Set the successors for MBB.
+  MBB->addSuccessor(CvtMBB);
+  MBB->addSuccessor(DoneMBB);
+
+  Register DstReg = MI.getOperand(0).getReg();
+  Register SrcReg = MI.getOperand(1).getReg();
+  Register MaxReg = MI.getOperand(2).getReg();
+  int64_t FRM = MI.getOperand(3).getImm();
+
+  const RISCVInstrInfo &TII = *Subtarget.getInstrInfo();
+  MachineRegisterInfo &MRI = MBB->getParent()->getRegInfo();
+
+  Register FabsReg = MRI.createVirtualRegister(RC);
+  BuildMI(MBB, DL, TII.get(FSGNJXOpc), FabsReg).addReg(SrcReg).addReg(SrcReg);
+
+  // Compare the FP value to the max value.
+  Register CmpReg = MRI.createVirtualRegister(&RISCV::GPRRegClass);
+  auto MIB =
+      BuildMI(MBB, DL, TII.get(CmpOpc), CmpReg).addReg(FabsReg).addReg(MaxReg);
+  if (MI.getFlag(MachineInstr::MIFlag::NoFPExcept))
+    MIB->setFlag(MachineInstr::MIFlag::NoFPExcept);
+
+  // Insert branch.
+  BuildMI(MBB, DL, TII.get(RISCV::BEQ))
+      .addReg(CmpReg)
+      .addReg(RISCV::X0)
+      .addMBB(DoneMBB);
+
+  CvtMBB->addSuccessor(DoneMBB);
+
+  // Convert to integer.
+  Register F2IReg = MRI.createVirtualRegister(&RISCV::GPRRegClass);
+  MIB = BuildMI(CvtMBB, DL, TII.get(F2IOpc), F2IReg).addReg(SrcReg).addImm(FRM);
+  if (MI.getFlag(MachineInstr::MIFlag::NoFPExcept))
+    MIB->setFlag(MachineInstr::MIFlag::NoFPExcept);
+
+  // Convert back to FP.
+  Register I2FReg = MRI.createVirtualRegister(RC);
+  MIB = BuildMI(CvtMBB, DL, TII.get(I2FOpc), I2FReg).addReg(F2IReg).addImm(FRM);
+  if (MI.getFlag(MachineInstr::MIFlag::NoFPExcept))
+    MIB->setFlag(MachineInstr::MIFlag::NoFPExcept);
+
+  // Restore the sign bit.
+  Register CvtReg = MRI.createVirtualRegister(RC);
+  BuildMI(CvtMBB, DL, TII.get(FSGNJOpc), CvtReg).addReg(I2FReg).addReg(SrcReg);
+
+  // Merge the results.
+  BuildMI(*DoneMBB, DoneMBB->begin(), DL, TII.get(RISCV::PHI), DstReg)
+      .addReg(SrcReg)
+      .addMBB(MBB)
+      .addReg(CvtReg)
+      .addMBB(CvtMBB);
+
+  MI.eraseFromParent();
+  return DoneMBB;
+}
+
 MachineBasicBlock *
 RISCVTargetLowering::EmitInstrWithCustomInserter(MachineInstr &MI,
                                                  MachineBasicBlock *BB) const {
@@ -6950,12 +11650,223 @@ RISCVTargetLowering::EmitInstrWithCustomInserter(MachineInstr &MI,
   case RISCV::Select_FPR16_Using_CC_GPR:
   case RISCV::Select_FPR32_Using_CC_GPR:
   case RISCV::Select_FPR64_Using_CC_GPR:
-    return emitSelectPseudo(MI, BB);
+    return emitSelectPseudo(MI, BB, Subtarget);
   case RISCV::BuildPairF64Pseudo:
     return emitBuildPairF64Pseudo(MI, BB);
   case RISCV::SplitF64Pseudo:
     return emitSplitF64Pseudo(MI, BB);
-  }
+  case RISCV::PseudoQuietFLE_H:
+    return emitQuietFCMP(MI, BB, RISCV::FLE_H, RISCV::FEQ_H, Subtarget);
+  case RISCV::PseudoQuietFLT_H:
+    return emitQuietFCMP(MI, BB, RISCV::FLT_H, RISCV::FEQ_H, Subtarget);
+  case RISCV::PseudoQuietFLE_S:
+    return emitQuietFCMP(MI, BB, RISCV::FLE_S, RISCV::FEQ_S, Subtarget);
+  case RISCV::PseudoQuietFLT_S:
+    return emitQuietFCMP(MI, BB, RISCV::FLT_S, RISCV::FEQ_S, Subtarget);
+  case RISCV::PseudoQuietFLE_D:
+    return emitQuietFCMP(MI, BB, RISCV::FLE_D, RISCV::FEQ_D, Subtarget);
+  case RISCV::PseudoQuietFLT_D:
+    return emitQuietFCMP(MI, BB, RISCV::FLT_D, RISCV::FEQ_D, Subtarget);
+
+    // =========================================================================
+    // VFCVT
+    // =========================================================================
+
+  case RISCV::PseudoVFCVT_RM_X_F_V_M1_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFCVT_X_F_V_M1_MASK);
+  case RISCV::PseudoVFCVT_RM_X_F_V_M2_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFCVT_X_F_V_M2_MASK);
+  case RISCV::PseudoVFCVT_RM_X_F_V_M4_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFCVT_X_F_V_M4_MASK);
+  case RISCV::PseudoVFCVT_RM_X_F_V_M8_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFCVT_X_F_V_M8_MASK);
+  case RISCV::PseudoVFCVT_RM_X_F_V_MF2_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFCVT_X_F_V_MF2_MASK);
+  case RISCV::PseudoVFCVT_RM_X_F_V_MF4_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFCVT_X_F_V_MF4_MASK);
+
+  case RISCV::PseudoVFCVT_RM_XU_F_V_M1_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFCVT_XU_F_V_M1_MASK);
+  case RISCV::PseudoVFCVT_RM_XU_F_V_M2_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFCVT_XU_F_V_M2_MASK);
+  case RISCV::PseudoVFCVT_RM_XU_F_V_M4_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFCVT_XU_F_V_M4_MASK);
+  case RISCV::PseudoVFCVT_RM_XU_F_V_M8_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFCVT_XU_F_V_M8_MASK);
+  case RISCV::PseudoVFCVT_RM_XU_F_V_MF2_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFCVT_XU_F_V_MF2_MASK);
+  case RISCV::PseudoVFCVT_RM_XU_F_V_MF4_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFCVT_XU_F_V_MF4_MASK);
+
+  case RISCV::PseudoVFCVT_RM_F_XU_V_M1_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFCVT_F_XU_V_M1_MASK);
+  case RISCV::PseudoVFCVT_RM_F_XU_V_M2_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFCVT_F_XU_V_M2_MASK);
+  case RISCV::PseudoVFCVT_RM_F_XU_V_M4_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFCVT_F_XU_V_M4_MASK);
+  case RISCV::PseudoVFCVT_RM_F_XU_V_M8_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFCVT_F_XU_V_M8_MASK);
+  case RISCV::PseudoVFCVT_RM_F_XU_V_MF2_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFCVT_F_XU_V_MF2_MASK);
+  case RISCV::PseudoVFCVT_RM_F_XU_V_MF4_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFCVT_F_XU_V_MF4_MASK);
+
+  case RISCV::PseudoVFCVT_RM_F_X_V_M1_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFCVT_F_X_V_M1_MASK);
+  case RISCV::PseudoVFCVT_RM_F_X_V_M2_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFCVT_F_X_V_M2_MASK);
+  case RISCV::PseudoVFCVT_RM_F_X_V_M4_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFCVT_F_X_V_M4_MASK);
+  case RISCV::PseudoVFCVT_RM_F_X_V_M8_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFCVT_F_X_V_M8_MASK);
+  case RISCV::PseudoVFCVT_RM_F_X_V_MF2_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFCVT_F_X_V_MF2_MASK);
+  case RISCV::PseudoVFCVT_RM_F_X_V_MF4_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFCVT_F_X_V_MF4_MASK);
+
+    // =========================================================================
+    // VFWCVT
+    // =========================================================================
+
+  case RISCV::PseudoVFWCVT_RM_XU_F_V_M1_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFWCVT_X_F_V_M1_MASK);
+  case RISCV::PseudoVFWCVT_RM_XU_F_V_M2_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFWCVT_X_F_V_M2_MASK);
+  case RISCV::PseudoVFWCVT_RM_XU_F_V_M4_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFWCVT_X_F_V_M4_MASK);
+  case RISCV::PseudoVFWCVT_RM_XU_F_V_MF2_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFWCVT_X_F_V_MF2_MASK);
+  case RISCV::PseudoVFWCVT_RM_XU_F_V_MF4_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFWCVT_X_F_V_MF4_MASK);
+
+  case RISCV::PseudoVFWCVT_RM_X_F_V_M1_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFWCVT_X_F_V_M1_MASK);
+  case RISCV::PseudoVFWCVT_RM_X_F_V_M2_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFWCVT_X_F_V_M2_MASK);
+  case RISCV::PseudoVFWCVT_RM_X_F_V_M4_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFWCVT_X_F_V_M4_MASK);
+  case RISCV::PseudoVFWCVT_RM_X_F_V_MF2_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFWCVT_X_F_V_MF2_MASK);
+  case RISCV::PseudoVFWCVT_RM_X_F_V_MF4_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFWCVT_X_F_V_MF4_MASK);
+
+  case RISCV::PseudoVFWCVT_RM_F_XU_V_M1_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFWCVT_F_XU_V_M1_MASK);
+  case RISCV::PseudoVFWCVT_RM_F_XU_V_M2_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFWCVT_F_XU_V_M2_MASK);
+  case RISCV::PseudoVFWCVT_RM_F_XU_V_M4_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFWCVT_F_XU_V_M4_MASK);
+  case RISCV::PseudoVFWCVT_RM_F_XU_V_MF2_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFWCVT_F_XU_V_MF2_MASK);
+  case RISCV::PseudoVFWCVT_RM_F_XU_V_MF4_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFWCVT_F_XU_V_MF4_MASK);
+  case RISCV::PseudoVFWCVT_RM_F_XU_V_MF8_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFWCVT_F_XU_V_MF8_MASK);
+
+  case RISCV::PseudoVFWCVT_RM_F_X_V_M1_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFWCVT_F_XU_V_M1_MASK);
+  case RISCV::PseudoVFWCVT_RM_F_X_V_M2_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFWCVT_F_XU_V_M2_MASK);
+  case RISCV::PseudoVFWCVT_RM_F_X_V_M4_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFWCVT_F_XU_V_M4_MASK);
+  case RISCV::PseudoVFWCVT_RM_F_X_V_MF2_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFWCVT_F_XU_V_MF2_MASK);
+  case RISCV::PseudoVFWCVT_RM_F_X_V_MF4_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFWCVT_F_XU_V_MF4_MASK);
+  case RISCV::PseudoVFWCVT_RM_F_X_V_MF8_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFWCVT_F_XU_V_MF8_MASK);
+
+    // =========================================================================
+    // VFNCVT
+    // =========================================================================
+
+  case RISCV::PseudoVFNCVT_RM_XU_F_W_M1_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFNCVT_X_F_W_M1_MASK);
+  case RISCV::PseudoVFNCVT_RM_XU_F_W_M2_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFNCVT_X_F_W_M2_MASK);
+  case RISCV::PseudoVFNCVT_RM_XU_F_W_M4_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFNCVT_X_F_W_M4_MASK);
+  case RISCV::PseudoVFNCVT_RM_XU_F_W_MF2_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFNCVT_X_F_W_MF2_MASK);
+  case RISCV::PseudoVFNCVT_RM_XU_F_W_MF4_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFNCVT_X_F_W_MF4_MASK);
+  case RISCV::PseudoVFNCVT_RM_XU_F_W_MF8_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFNCVT_XU_F_W_MF8_MASK);
+
+  case RISCV::PseudoVFNCVT_RM_X_F_W_M1_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFNCVT_X_F_W_M1_MASK);
+  case RISCV::PseudoVFNCVT_RM_X_F_W_M2_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFNCVT_X_F_W_M2_MASK);
+  case RISCV::PseudoVFNCVT_RM_X_F_W_M4_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFNCVT_X_F_W_M4_MASK);
+  case RISCV::PseudoVFNCVT_RM_X_F_W_MF2_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFNCVT_X_F_W_MF2_MASK);
+  case RISCV::PseudoVFNCVT_RM_X_F_W_MF4_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFNCVT_X_F_W_MF4_MASK);
+  case RISCV::PseudoVFNCVT_RM_X_F_W_MF8_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFNCVT_X_F_W_MF8_MASK);
+
+  case RISCV::PseudoVFNCVT_RM_F_XU_W_M1_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFNCVT_F_XU_W_M1_MASK);
+  case RISCV::PseudoVFNCVT_RM_F_XU_W_M2_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFNCVT_F_XU_W_M2_MASK);
+  case RISCV::PseudoVFNCVT_RM_F_XU_W_M4_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFNCVT_F_XU_W_M4_MASK);
+  case RISCV::PseudoVFNCVT_RM_F_XU_W_MF2_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFNCVT_F_XU_W_MF2_MASK);
+  case RISCV::PseudoVFNCVT_RM_F_XU_W_MF4_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFNCVT_F_XU_W_MF4_MASK);
+
+  case RISCV::PseudoVFNCVT_RM_F_X_W_M1_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFNCVT_F_XU_W_M1_MASK);
+  case RISCV::PseudoVFNCVT_RM_F_X_W_M2_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFNCVT_F_XU_W_M2_MASK);
+  case RISCV::PseudoVFNCVT_RM_F_X_W_M4_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFNCVT_F_XU_W_M4_MASK);
+  case RISCV::PseudoVFNCVT_RM_F_X_W_MF2_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFNCVT_F_XU_W_MF2_MASK);
+  case RISCV::PseudoVFNCVT_RM_F_X_W_MF4_MASK:
+    return emitVFCVT_RM_MASK(MI, BB, RISCV::PseudoVFNCVT_F_XU_W_MF4_MASK);
+
+  case RISCV::PseudoVFROUND_NOEXCEPT_V_M1_MASK:
+    return emitVFROUND_NOEXCEPT_MASK(MI, BB, RISCV::PseudoVFCVT_X_F_V_M1_MASK,
+                                     RISCV::PseudoVFCVT_F_X_V_M1_MASK);
+  case RISCV::PseudoVFROUND_NOEXCEPT_V_M2_MASK:
+    return emitVFROUND_NOEXCEPT_MASK(MI, BB, RISCV::PseudoVFCVT_X_F_V_M2_MASK,
+                                     RISCV::PseudoVFCVT_F_X_V_M2_MASK);
+  case RISCV::PseudoVFROUND_NOEXCEPT_V_M4_MASK:
+    return emitVFROUND_NOEXCEPT_MASK(MI, BB, RISCV::PseudoVFCVT_X_F_V_M4_MASK,
+                                     RISCV::PseudoVFCVT_F_X_V_M4_MASK);
+  case RISCV::PseudoVFROUND_NOEXCEPT_V_M8_MASK:
+    return emitVFROUND_NOEXCEPT_MASK(MI, BB, RISCV::PseudoVFCVT_X_F_V_M8_MASK,
+                                     RISCV::PseudoVFCVT_F_X_V_M8_MASK);
+  case RISCV::PseudoVFROUND_NOEXCEPT_V_MF2_MASK:
+    return emitVFROUND_NOEXCEPT_MASK(MI, BB, RISCV::PseudoVFCVT_X_F_V_MF2_MASK,
+                                     RISCV::PseudoVFCVT_F_X_V_MF2_MASK);
+  case RISCV::PseudoVFROUND_NOEXCEPT_V_MF4_MASK:
+    return emitVFROUND_NOEXCEPT_MASK(MI, BB, RISCV::PseudoVFCVT_X_F_V_MF4_MASK,
+                                     RISCV::PseudoVFCVT_F_X_V_MF4_MASK);
+  case RISCV::PseudoFROUND_H:
+  case RISCV::PseudoFROUND_S:
+  case RISCV::PseudoFROUND_D:
+    return emitFROUND(MI, BB, Subtarget);
+  }
+}
+
+void RISCVTargetLowering::AdjustInstrPostInstrSelection(MachineInstr &MI,
+                                                        SDNode *Node) const {
+  // Add FRM dependency to any instructions with dynamic rounding mode.
+  unsigned Opc = MI.getOpcode();
+  auto Idx = RISCV::getNamedOperandIdx(Opc, RISCV::OpName::frm);
+  if (Idx < 0)
+    return;
+  if (MI.getOperand(Idx).getImm() != RISCVFPRndMode::DYN)
+    return;
+  // If the instruction already reads FRM, don't add another read.
+  if (MI.readsRegister(RISCV::FRM))
+    return;
+  MI.addOperand(
+      MachineOperand::CreateReg(RISCV::FRM, /*isDef*/ false, /*isImp*/ true));
 }
 
 // Calling Convention Implementation.
@@ -7051,14 +11962,14 @@ static bool CC_RISCVAssign2XLen(unsigned XLen, CCState &State, CCValAssign VA1,
 }
 
 static unsigned allocateRVVReg(MVT ValVT, unsigned ValNo,
-                               Optional<unsigned> FirstMaskArgument,
+                               std::optional<unsigned> FirstMaskArgument,
                                CCState &State, const RISCVTargetLowering &TLI) {
   const TargetRegisterClass *RC = TLI.getRegClassFor(ValVT);
   if (RC == &RISCV::VRRegClass) {
     // Assign the first mask argument to V0.
     // This is an interim calling convention and it may be changed in the
     // future.
-    if (FirstMaskArgument.hasValue() && ValNo == FirstMaskArgument.getValue())
+    if (FirstMaskArgument && ValNo == *FirstMaskArgument)
       return State.AllocateReg(RISCV::V0);
     return State.AllocateReg(ArgVRs);
   }
@@ -7076,11 +11987,20 @@ static bool CC_RISCV(const DataLayout &DL, RISCVABI::ABI ABI, unsigned ValNo,
                      MVT ValVT, MVT LocVT, CCValAssign::LocInfo LocInfo,
                      ISD::ArgFlagsTy ArgFlags, CCState &State, bool IsFixed,
                      bool IsRet, Type *OrigTy, const RISCVTargetLowering &TLI,
-                     Optional<unsigned> FirstMaskArgument) {
+                     std::optional<unsigned> FirstMaskArgument) {
   unsigned XLen = DL.getLargestLegalIntTypeSizeInBits();
   assert(XLen == 32 || XLen == 64);
   MVT XLenVT = XLen == 32 ? MVT::i32 : MVT::i64;
 
+  // Static chain parameter must not be passed in normal argument registers,
+  // so we assign t2 for it as done in GCC's __builtin_call_with_static_chain
+  if (ArgFlags.isNest()) {
+    if (unsigned Reg = State.AllocateReg(RISCV::X7)) {
+      State.addLoc(CCValAssign::getReg(ValNo, ValVT, Reg, LocVT, LocInfo));
+      return false;
+    }
+  }
+
   // Any return value split in to more than two values can't be returned
   // directly. Vectors are returned via the available vector registers.
   if (!LocVT.isVector() && IsRet && ValNo > 1)
@@ -7111,7 +12031,7 @@ static bool CC_RISCV(const DataLayout &DL, RISCVABI::ABI ABI, unsigned ValNo,
   }
 
   // FPR16, FPR32, and FPR64 alias each other.
-  if (State.getFirstUnallocated(ArgFPR32s) == array_lengthof(ArgFPR32s)) {
+  if (State.getFirstUnallocated(ArgFPR32s) == std::size(ArgFPR32s)) {
     UseGPRForF16_F32 = true;
     UseGPRForF64 = true;
   }
@@ -7140,7 +12060,7 @@ static bool CC_RISCV(const DataLayout &DL, RISCVABI::ABI ABI, unsigned ValNo,
       DL.getTypeAllocSize(OrigTy) == TwoXLenInBytes) {
     unsigned RegIdx = State.getFirstUnallocated(ArgGPRs);
     // Skip 'odd' register if necessary.
-    if (RegIdx != array_lengthof(ArgGPRs) && RegIdx % 2 == 1)
+    if (RegIdx != std::size(ArgGPRs) && RegIdx % 2 == 1)
       State.AllocateReg(ArgGPRs);
   }
 
@@ -7233,7 +12153,8 @@ static bool CC_RISCV(const DataLayout &DL, RISCVABI::ABI ABI, unsigned ValNo,
         LocVT = XLenVT;
         LocInfo = CCValAssign::Indirect;
       } else if (ValVT.isScalableVector()) {
-        report_fatal_error("Unable to pass scalable vector types on the stack");
+        LocVT = XLenVT;
+        LocInfo = CCValAssign::Indirect;
       } else {
         // Pass fixed-length vectors on the stack.
         LocVT = ValVT;
@@ -7269,7 +12190,7 @@ static bool CC_RISCV(const DataLayout &DL, RISCVABI::ABI ABI, unsigned ValNo,
   }
 
   assert((!UseGPRForF16_F32 || !UseGPRForF64 || LocVT == XLenVT ||
-          (TLI.getSubtarget().hasStdExtV() && ValVT.isVector())) &&
+          (TLI.getSubtarget().hasVInstructions() && ValVT.isVector())) &&
          "Expected an XLenVT or vector types at this stage");
 
   if (Reg) {
@@ -7288,13 +12209,13 @@ static bool CC_RISCV(const DataLayout &DL, RISCVABI::ABI ABI, unsigned ValNo,
 }
 
 template <typename ArgTy>
-static Optional<unsigned> preAssignMask(const ArgTy &Args) {
+static std::optional<unsigned> preAssignMask(const ArgTy &Args) {
   for (const auto &ArgIdx : enumerate(Args)) {
     MVT ArgVT = ArgIdx.value().VT;
     if (ArgVT.isVector() && ArgVT.getVectorElementType() == MVT::i1)
       return ArgIdx.index();
   }
-  return None;
+  return std::nullopt;
 }
 
 void RISCVTargetLowering::analyzeInputArgs(
@@ -7304,8 +12225,8 @@ void RISCVTargetLowering::analyzeInputArgs(
   unsigned NumArgs = Ins.size();
   FunctionType *FType = MF.getFunction().getFunctionType();
 
-  Optional<unsigned> FirstMaskArgument;
-  if (Subtarget.hasStdExtV())
+  std::optional<unsigned> FirstMaskArgument;
+  if (Subtarget.hasVInstructions())
     FirstMaskArgument = preAssignMask(Ins);
 
   for (unsigned i = 0; i != NumArgs; ++i) {
@@ -7335,8 +12256,8 @@ void RISCVTargetLowering::analyzeOutputArgs(
     CallLoweringInfo *CLI, RISCVCCAssignFn Fn) const {
   unsigned NumArgs = Outs.size();
 
-  Optional<unsigned> FirstMaskArgument;
-  if (Subtarget.hasStdExtV())
+  std::optional<unsigned> FirstMaskArgument;
+  if (Subtarget.hasVInstructions())
     FirstMaskArgument = preAssignMask(Outs);
 
   for (unsigned i = 0; i != NumArgs; i++) {
@@ -7383,6 +12304,7 @@ static SDValue convertLocVTToValVT(SelectionDAG &DAG, SDValue Val,
 // passed with CCValAssign::Indirect.
 static SDValue unpackFromRegLoc(SelectionDAG &DAG, SDValue Chain,
                                 const CCValAssign &VA, const SDLoc &DL,
+                                const ISD::InputArg &In,
                                 const RISCVTargetLowering &TLI) {
   MachineFunction &MF = DAG.getMachineFunction();
   MachineRegisterInfo &RegInfo = MF.getRegInfo();
@@ -7393,6 +12315,20 @@ static SDValue unpackFromRegLoc(SelectionDAG &DAG, SDValue Chain,
   RegInfo.addLiveIn(VA.getLocReg(), VReg);
   Val = DAG.getCopyFromReg(Chain, DL, VReg, LocVT);
 
+  // If input is sign extended from 32 bits, note it for the SExtWRemoval pass.
+  if (In.isOrigArg()) {
+    Argument *OrigArg = MF.getFunction().getArg(In.getOrigArgIndex());
+    if (OrigArg->getType()->isIntegerTy()) {
+      unsigned BitWidth = OrigArg->getType()->getIntegerBitWidth();
+      // An input zero extended from i31 can also be considered sign extended.
+      if ((BitWidth <= 32 && In.Flags.isSExt()) ||
+          (BitWidth < 32 && In.Flags.isZExt())) {
+        RISCVMachineFunctionInfo *RVFI = MF.getInfo<RISCVMachineFunctionInfo>();
+        RVFI->addSExt32Register(VReg);
+      }
+    }
+  }
+
   if (VA.getLocInfo() == CCValAssign::Indirect)
     return Val;
 
@@ -7432,8 +12368,14 @@ static SDValue unpackFromMemLoc(SelectionDAG &DAG, SDValue Chain,
   EVT LocVT = VA.getLocVT();
   EVT ValVT = VA.getValVT();
   EVT PtrVT = MVT::getIntegerVT(DAG.getDataLayout().getPointerSizeInBits(0));
+  if (ValVT.isScalableVector()) {
+    // When the value is a scalable vector, we save the pointer which points to
+    // the scalable vector value in the stack. The ValVT will be the pointer
+    // type, instead of the scalable vector type.
+    ValVT = LocVT;
+  }
   int FI = MFI.CreateFixedObject(ValVT.getStoreSize(), VA.getLocMemOffset(),
-                                 /*Immutable=*/true);
+                                 /*IsImmutable=*/true);
   SDValue FIN = DAG.getFrameIndex(FI, PtrVT);
   SDValue Val;
 
@@ -7463,7 +12405,8 @@ static SDValue unpackF64OnRV32DSoftABI(SelectionDAG &DAG, SDValue Chain,
 
   if (VA.isMemLoc()) {
     // f64 is passed on the stack.
-    int FI = MFI.CreateFixedObject(8, VA.getLocMemOffset(), /*Immutable=*/true);
+    int FI =
+        MFI.CreateFixedObject(8, VA.getLocMemOffset(), /*IsImmutable=*/true);
     SDValue FIN = DAG.getFrameIndex(FI, MVT::i32);
     return DAG.getLoad(MVT::f64, DL, Chain, FIN,
                        MachinePointerInfo::getFixedStack(MF, FI));
@@ -7477,7 +12420,7 @@ static SDValue unpackF64OnRV32DSoftABI(SelectionDAG &DAG, SDValue Chain,
   SDValue Hi;
   if (VA.getLocReg() == RISCV::X17) {
     // Second half of f64 is passed on the stack.
-    int FI = MFI.CreateFixedObject(4, 0, /*Immutable=*/true);
+    int FI = MFI.CreateFixedObject(4, 0, /*IsImmutable=*/true);
     SDValue FIN = DAG.getFrameIndex(FI, MVT::i32);
     Hi = DAG.getLoad(MVT::i32, DL, Chain, FIN,
                      MachinePointerInfo::getFixedStack(MF, FI));
@@ -7498,7 +12441,7 @@ static bool CC_RISCV_FastCC(const DataLayout &DL, RISCVABI::ABI ABI,
                             ISD::ArgFlagsTy ArgFlags, CCState &State,
                             bool IsFixed, bool IsRet, Type *OrigTy,
                             const RISCVTargetLowering &TLI,
-                            Optional<unsigned> FirstMaskArgument) {
+                            std::optional<unsigned> FirstMaskArgument) {
 
   // X5 and X6 might be used for save-restore libcall.
   static const MCPhysReg GPRList[] = {
@@ -7598,6 +12541,11 @@ static bool CC_RISCV_GHC(unsigned ValNo, MVT ValVT, MVT LocVT,
                          CCValAssign::LocInfo LocInfo,
                          ISD::ArgFlagsTy ArgFlags, CCState &State) {
 
+  if (ArgFlags.isNest()) {
+    report_fatal_error(
+        "Attribute 'nest' is not supported in GHC calling convention");
+  }
+
   if (LocVT == MVT::i32 || LocVT == MVT::i64) {
     // Pass in STG registers: Base, Sp, Hp, R1, R2, R3, R4, R5, R6, R7, SpLim
     //                        s1    s2  s3  s4  s5  s6  s7  s8  s9  s10 s11
@@ -7698,7 +12646,7 @@ SDValue RISCVTargetLowering::LowerFormalArguments(
     if (VA.getLocVT() == MVT::i32 && VA.getValVT() == MVT::f64)
       ArgValue = unpackF64OnRV32DSoftABI(DAG, Chain, VA, DL);
     else if (VA.isRegLoc())
-      ArgValue = unpackFromRegLoc(DAG, Chain, VA, DL, *this);
+      ArgValue = unpackFromRegLoc(DAG, Chain, VA, DL, Ins[i], *this);
     else
       ArgValue = unpackFromMemLoc(DAG, Chain, VA, DL);
 
@@ -7729,8 +12677,12 @@ SDValue RISCVTargetLowering::LowerFormalArguments(
     InVals.push_back(ArgValue);
   }
 
+  if (any_of(ArgLocs,
+             [](CCValAssign &VA) { return VA.getLocVT().isScalableVector(); }))
+    MF.getInfo<RISCVMachineFunctionInfo>()->setIsVectorCall();
+
   if (IsVarArg) {
-    ArrayRef<MCPhysReg> ArgRegs = makeArrayRef(ArgGPRs);
+    ArrayRef<MCPhysReg> ArgRegs = ArrayRef(ArgGPRs);
     unsigned Idx = CCInfo.getFirstUnallocated(ArgRegs);
     const TargetRegisterClass *RC = &RISCV::GPRRegClass;
     MachineFrameInfo &MFI = MF.getFrameInfo();
@@ -8136,10 +13088,7 @@ SDValue RISCVTargetLowering::LowerCall(CallLoweringInfo &CLI,
   Glue = Chain.getValue(1);
 
   // Mark the end of the call, which is glued to the call itself.
-  Chain = DAG.getCALLSEQ_END(Chain,
-                             DAG.getConstant(NumBytes, DL, PtrVT, true),
-                             DAG.getConstant(0, DL, PtrVT, true),
-                             Glue, DL);
+  Chain = DAG.getCALLSEQ_END(Chain, NumBytes, 0, Glue, DL);
   Glue = Chain.getValue(1);
 
   // Assign locations to each value returned by this call.
@@ -8180,8 +13129,8 @@ bool RISCVTargetLowering::CanLowerReturn(
   SmallVector<CCValAssign, 16> RVLocs;
   CCState CCInfo(CallConv, IsVarArg, MF, RVLocs, Context);
 
-  Optional<unsigned> FirstMaskArgument;
-  if (Subtarget.hasStdExtV())
+  std::optional<unsigned> FirstMaskArgument;
+  if (Subtarget.hasVInstructions())
     FirstMaskArgument = preAssignMask(Outs);
 
   for (unsigned i = 0, e = Outs.size(); i != e; ++i) {
@@ -8202,7 +13151,7 @@ RISCVTargetLowering::LowerReturn(SDValue Chain, CallingConv::ID CallConv,
                                  const SmallVectorImpl<ISD::OutputArg> &Outs,
                                  const SmallVectorImpl<SDValue> &OutVals,
                                  const SDLoc &DL, SelectionDAG &DAG) const {
-  const MachineFunction &MF = DAG.getMachineFunction();
+  MachineFunction &MF = DAG.getMachineFunction();
   const RISCVSubtarget &STI = MF.getSubtarget<RISCVSubtarget>();
 
   // Stores the assignment of the return value to a location.
@@ -8273,6 +13222,10 @@ RISCVTargetLowering::LowerReturn(SDValue Chain, CallingConv::ID CallConv,
     RetOps.push_back(Glue);
   }
 
+  if (any_of(RVLocs,
+             [](CCValAssign &VA) { return VA.getLocVT().isScalableVector(); }))
+    MF.getInfo<RISCVMachineFunctionInfo>()->setIsVectorCall();
+
   unsigned RetOpc = RISCVISD::RET_FLAG;
   // Interrupt service routines use different return instructions.
   const Function &Func = DAG.getMachineFunction().getFunction();
@@ -8309,6 +13262,40 @@ void RISCVTargetLowering::validateCCReservedRegs(
         F, "Argument register required, but has been reserved."});
 }
 
+// Check if the result of the node is only used as a return value, as
+// otherwise we can't perform a tail-call.
+bool RISCVTargetLowering::isUsedByReturnOnly(SDNode *N, SDValue &Chain) const {
+  if (N->getNumValues() != 1)
+    return false;
+  if (!N->hasNUsesOfValue(1, 0))
+    return false;
+
+  SDNode *Copy = *N->use_begin();
+  // TODO: Handle additional opcodes in order to support tail-calling libcalls
+  // with soft float ABIs.
+  if (Copy->getOpcode() != ISD::CopyToReg) {
+    return false;
+  }
+
+  // If the ISD::CopyToReg has a glue operand, we conservatively assume it
+  // isn't safe to perform a tail call.
+  if (Copy->getOperand(Copy->getNumOperands() - 1).getValueType() == MVT::Glue)
+    return false;
+
+  // The copy must be used by a RISCVISD::RET_FLAG, and nothing else.
+  bool HasRet = false;
+  for (SDNode *Node : Copy->uses()) {
+    if (Node->getOpcode() != RISCVISD::RET_FLAG)
+      return false;
+    HasRet = true;
+  }
+  if (!HasRet)
+    return false;
+
+  Chain = Copy->getOperand(0);
+  return true;
+}
+
 bool RISCVTargetLowering::mayBeEmittedAsTailCall(const CallInst *CI) const {
   return CI->isTailCall();
 }
@@ -8331,6 +13318,13 @@ const char *RISCVTargetLowering::getTargetNodeName(unsigned Opcode) const {
   NODE_NAME_CASE(BuildPairF64)
   NODE_NAME_CASE(SplitF64)
   NODE_NAME_CASE(TAIL)
+  NODE_NAME_CASE(ADD_LO)
+  NODE_NAME_CASE(HI)
+  NODE_NAME_CASE(LLA)
+  NODE_NAME_CASE(ADD_TPREL)
+  NODE_NAME_CASE(LA)
+  NODE_NAME_CASE(LA_TLS_IE)
+  NODE_NAME_CASE(LA_TLS_GD)
   NODE_NAME_CASE(MULHSU)
   NODE_NAME_CASE(SLLW)
   NODE_NAME_CASE(SRAW)
@@ -8342,35 +13336,29 @@ const char *RISCVTargetLowering::getTargetNodeName(unsigned Opcode) const {
   NODE_NAME_CASE(RORW)
   NODE_NAME_CASE(CLZW)
   NODE_NAME_CASE(CTZW)
-  NODE_NAME_CASE(FSLW)
-  NODE_NAME_CASE(FSRW)
-  NODE_NAME_CASE(FSL)
-  NODE_NAME_CASE(FSR)
+  NODE_NAME_CASE(ABSW)
   NODE_NAME_CASE(FMV_H_X)
   NODE_NAME_CASE(FMV_X_ANYEXTH)
+  NODE_NAME_CASE(FMV_X_SIGNEXTH)
   NODE_NAME_CASE(FMV_W_X_RV64)
   NODE_NAME_CASE(FMV_X_ANYEXTW_RV64)
+  NODE_NAME_CASE(FCVT_X)
+  NODE_NAME_CASE(FCVT_XU)
   NODE_NAME_CASE(FCVT_W_RV64)
   NODE_NAME_CASE(FCVT_WU_RV64)
+  NODE_NAME_CASE(STRICT_FCVT_W_RV64)
+  NODE_NAME_CASE(STRICT_FCVT_WU_RV64)
+  NODE_NAME_CASE(FROUND)
   NODE_NAME_CASE(READ_CYCLE_WIDE)
-  NODE_NAME_CASE(GREV)
-  NODE_NAME_CASE(GREVW)
-  NODE_NAME_CASE(GORC)
-  NODE_NAME_CASE(GORCW)
-  NODE_NAME_CASE(SHFL)
-  NODE_NAME_CASE(SHFLW)
-  NODE_NAME_CASE(UNSHFL)
-  NODE_NAME_CASE(UNSHFLW)
-  NODE_NAME_CASE(BCOMPRESS)
-  NODE_NAME_CASE(BCOMPRESSW)
-  NODE_NAME_CASE(BDECOMPRESS)
-  NODE_NAME_CASE(BDECOMPRESSW)
+  NODE_NAME_CASE(BREV8)
+  NODE_NAME_CASE(ORC_B)
+  NODE_NAME_CASE(ZIP)
+  NODE_NAME_CASE(UNZIP)
   NODE_NAME_CASE(VMV_V_X_VL)
   NODE_NAME_CASE(VFMV_V_F_VL)
   NODE_NAME_CASE(VMV_X_S)
   NODE_NAME_CASE(VMV_S_X_VL)
   NODE_NAME_CASE(VFMV_S_F_VL)
-  NODE_NAME_CASE(SPLAT_VECTOR_I64)
   NODE_NAME_CASE(SPLAT_VECTOR_SPLIT_I64_VL)
   NODE_NAME_CASE(READ_VLENB)
   NODE_NAME_CASE(TRUNCATE_VECTOR_VL)
@@ -8416,7 +13404,10 @@ const char *RISCVTargetLowering::getTargetNodeName(unsigned Opcode) const {
   NODE_NAME_CASE(FNEG_VL)
   NODE_NAME_CASE(FABS_VL)
   NODE_NAME_CASE(FSQRT_VL)
-  NODE_NAME_CASE(FMA_VL)
+  NODE_NAME_CASE(VFMADD_VL)
+  NODE_NAME_CASE(VFNMADD_VL)
+  NODE_NAME_CASE(VFMSUB_VL)
+  NODE_NAME_CASE(VFNMSUB_VL)
   NODE_NAME_CASE(FCOPYSIGN_VL)
   NODE_NAME_CASE(SMIN_VL)
   NODE_NAME_CASE(SMAX_VL)
@@ -8426,16 +13417,34 @@ const char *RISCVTargetLowering::getTargetNodeName(unsigned Opcode) const {
   NODE_NAME_CASE(FMAXNUM_VL)
   NODE_NAME_CASE(MULHS_VL)
   NODE_NAME_CASE(MULHU_VL)
-  NODE_NAME_CASE(FP_TO_SINT_VL)
-  NODE_NAME_CASE(FP_TO_UINT_VL)
+  NODE_NAME_CASE(VFCVT_RTZ_X_F_VL)
+  NODE_NAME_CASE(VFCVT_RTZ_XU_F_VL)
+  NODE_NAME_CASE(VFCVT_RM_X_F_VL)
+  NODE_NAME_CASE(VFCVT_RM_XU_F_VL)
+  NODE_NAME_CASE(VFCVT_X_F_VL)
+  NODE_NAME_CASE(VFCVT_XU_F_VL)
+  NODE_NAME_CASE(VFROUND_NOEXCEPT_VL)
   NODE_NAME_CASE(SINT_TO_FP_VL)
   NODE_NAME_CASE(UINT_TO_FP_VL)
+  NODE_NAME_CASE(VFCVT_RM_F_XU_VL)
+  NODE_NAME_CASE(VFCVT_RM_F_X_VL)
   NODE_NAME_CASE(FP_EXTEND_VL)
   NODE_NAME_CASE(FP_ROUND_VL)
   NODE_NAME_CASE(VWMUL_VL)
   NODE_NAME_CASE(VWMULU_VL)
+  NODE_NAME_CASE(VWMULSU_VL)
+  NODE_NAME_CASE(VWADD_VL)
+  NODE_NAME_CASE(VWADDU_VL)
+  NODE_NAME_CASE(VWSUB_VL)
+  NODE_NAME_CASE(VWSUBU_VL)
+  NODE_NAME_CASE(VWADD_W_VL)
+  NODE_NAME_CASE(VWADDU_W_VL)
+  NODE_NAME_CASE(VWSUB_W_VL)
+  NODE_NAME_CASE(VWSUBU_W_VL)
+  NODE_NAME_CASE(VNSRL_VL)
   NODE_NAME_CASE(SETCC_VL)
   NODE_NAME_CASE(VSELECT_VL)
+  NODE_NAME_CASE(VP_MERGE_VL)
   NODE_NAME_CASE(VMAND_VL)
   NODE_NAME_CASE(VMOR_VL)
   NODE_NAME_CASE(VMXOR_VL)
@@ -8446,9 +13455,8 @@ const char *RISCVTargetLowering::getTargetNodeName(unsigned Opcode) const {
   NODE_NAME_CASE(VRGATHEREI16_VV_VL)
   NODE_NAME_CASE(VSEXT_VL)
   NODE_NAME_CASE(VZEXT_VL)
-  NODE_NAME_CASE(VPOPC_VL)
-  NODE_NAME_CASE(VLE_VL)
-  NODE_NAME_CASE(VSE_VL)
+  NODE_NAME_CASE(VCPOP_VL)
+  NODE_NAME_CASE(VFIRST_VL)
   NODE_NAME_CASE(READ_CSR)
   NODE_NAME_CASE(WRITE_CSR)
   NODE_NAME_CASE(SWAP_CSR)
@@ -8467,7 +13475,6 @@ RISCVTargetLowering::getConstraintType(StringRef Constraint) const {
     default:
       break;
     case 'f':
-    case 'v':
       return C_RegisterClass;
     case 'I':
     case 'J':
@@ -8478,6 +13485,9 @@ RISCVTargetLowering::getConstraintType(StringRef Constraint) const {
     case 'S': // A symbolic address
       return C_Other;
     }
+  } else {
+    if (Constraint == "vr" || Constraint == "vm")
+      return C_RegisterClass;
   }
   return TargetLowering::getConstraintType(Constraint);
 }
@@ -8491,26 +13501,30 @@ RISCVTargetLowering::getRegForInlineAsmConstraint(const TargetRegisterInfo *TRI,
   if (Constraint.size() == 1) {
     switch (Constraint[0]) {
     case 'r':
+      // TODO: Support fixed vectors up to XLen for P extension?
+      if (VT.isVector())
+        break;
       return std::make_pair(0U, &RISCV::GPRRegClass);
     case 'f':
-      if (Subtarget.hasStdExtZfh() && VT == MVT::f16)
+      if (Subtarget.hasStdExtZfhOrZfhmin() && VT == MVT::f16)
         return std::make_pair(0U, &RISCV::FPR16RegClass);
       if (Subtarget.hasStdExtF() && VT == MVT::f32)
         return std::make_pair(0U, &RISCV::FPR32RegClass);
       if (Subtarget.hasStdExtD() && VT == MVT::f64)
         return std::make_pair(0U, &RISCV::FPR64RegClass);
       break;
-    case 'v':
-      for (const auto *RC :
-           {&RISCV::VMRegClass, &RISCV::VRRegClass, &RISCV::VRM2RegClass,
-            &RISCV::VRM4RegClass, &RISCV::VRM8RegClass}) {
-        if (TRI->isTypeLegalForClass(*RC, VT.SimpleTy))
-          return std::make_pair(0U, RC);
-      }
-      break;
     default:
       break;
     }
+  } else if (Constraint == "vr") {
+    for (const auto *RC : {&RISCV::VRRegClass, &RISCV::VRM2RegClass,
+                           &RISCV::VRM4RegClass, &RISCV::VRM8RegClass}) {
+      if (TRI->isTypeLegalForClass(*RC, VT.SimpleTy))
+        return std::make_pair(0U, RC);
+    }
+  } else if (Constraint == "vm") {
+    if (TRI->isTypeLegalForClass(RISCV::VMV0RegClass, VT.SimpleTy))
+      return std::make_pair(0U, &RISCV::VMV0RegClass);
   }
 
   // Clang will correctly decode the usage of register name aliases into their
@@ -8598,16 +13612,22 @@ RISCVTargetLowering::getRegForInlineAsmConstraint(const TargetRegisterInfo *TRI,
                         .Default(RISCV::NoRegister);
     if (FReg != RISCV::NoRegister) {
       assert(RISCV::F0_F <= FReg && FReg <= RISCV::F31_F && "Unknown fp-reg");
-      if (Subtarget.hasStdExtD()) {
+      if (Subtarget.hasStdExtD() && (VT == MVT::f64 || VT == MVT::Other)) {
         unsigned RegNo = FReg - RISCV::F0_F;
         unsigned DReg = RISCV::F0_D + RegNo;
         return std::make_pair(DReg, &RISCV::FPR64RegClass);
       }
-      return std::make_pair(FReg, &RISCV::FPR32RegClass);
+      if (VT == MVT::f32 || VT == MVT::Other)
+        return std::make_pair(FReg, &RISCV::FPR32RegClass);
+      if (Subtarget.hasStdExtZfhOrZfhmin() && VT == MVT::f16) {
+        unsigned RegNo = FReg - RISCV::F0_F;
+        unsigned HReg = RISCV::F0_H + RegNo;
+        return std::make_pair(HReg, &RISCV::FPR16RegClass);
+      }
     }
   }
 
-  if (Subtarget.hasStdExtV()) {
+  if (Subtarget.hasVInstructions()) {
     Register VReg = StringSwitch<Register>(Constraint.lower())
                         .Case("{v0}", RISCV::V0)
                         .Case("{v1}", RISCV::V1)
@@ -8657,7 +13677,18 @@ RISCVTargetLowering::getRegForInlineAsmConstraint(const TargetRegisterInfo *TRI,
     }
   }
 
-  return TargetLowering::getRegForInlineAsmConstraint(TRI, Constraint, VT);
+  std::pair<Register, const TargetRegisterClass *> Res =
+      TargetLowering::getRegForInlineAsmConstraint(TRI, Constraint, VT);
+
+  // If we picked one of the Zfinx register classes, remap it to the GPR class.
+  // FIXME: When Zfinx is supported in CodeGen this will need to take the
+  // Subtarget into account.
+  if (Res.second == &RISCV::GPRF16RegClass ||
+      Res.second == &RISCV::GPRF32RegClass ||
+      Res.second == &RISCV::GPRF64RegClass)
+    return std::make_pair(Res.first, &RISCV::GPRRegClass);
+
+  return Res;
 }
 
 unsigned
@@ -8745,9 +13776,15 @@ RISCVTargetLowering::shouldExpandAtomicRMWInIR(AtomicRMWInst *AI) const {
   // atomicrmw {fadd,fsub} must be expanded to use compare-exchange, as floating
   // point operations can't be used in an lr/sc sequence without breaking the
   // forward-progress guarantee.
-  if (AI->isFloatingPointOperation())
+  if (AI->isFloatingPointOperation() ||
+      AI->getOperation() == AtomicRMWInst::UIncWrap ||
+      AI->getOperation() == AtomicRMWInst::UDecWrap)
     return AtomicExpansionKind::CmpXChg;
 
+  // Don't expand forced atomics, we want to have __sync libcalls instead.
+  if (Subtarget.hasForcedAtomics())
+    return AtomicExpansionKind::None;
+
   unsigned Size = AI->getType()->getPrimitiveSizeInBits();
   if (Size == 8 || Size == 16)
     return AtomicExpansionKind::MaskedIntrinsic;
@@ -8851,6 +13888,10 @@ Value *RISCVTargetLowering::emitMaskedAtomicRMWIntrinsic(
 TargetLowering::AtomicExpansionKind
 RISCVTargetLowering::shouldExpandAtomicCmpXchgInIR(
     AtomicCmpXchgInst *CI) const {
+  // Don't expand forced atomics, we want to have __sync libcalls instead.
+  if (Subtarget.hasForcedAtomics())
+    return AtomicExpansionKind::None;
+
   unsigned Size = CI->getCompareOperand()->getType()->getPrimitiveSizeInBits();
   if (Size == 8 || Size == 16)
     return AtomicExpansionKind::MaskedIntrinsic;
@@ -8879,20 +13920,69 @@ Value *RISCVTargetLowering::emitMaskedAtomicCmpXchgIntrinsic(
   return Result;
 }
 
-bool RISCVTargetLowering::shouldRemoveExtendFromGSIndex(EVT VT) const {
+bool RISCVTargetLowering::shouldRemoveExtendFromGSIndex(EVT IndexVT,
+                                                        EVT DataVT) const {
   return false;
 }
 
+bool RISCVTargetLowering::shouldConvertFpToSat(unsigned Op, EVT FPVT,
+                                               EVT VT) const {
+  if (!isOperationLegalOrCustom(Op, VT) || !FPVT.isSimple())
+    return false;
+
+  switch (FPVT.getSimpleVT().SimpleTy) {
+  case MVT::f16:
+    return Subtarget.hasStdExtZfhOrZfhmin();
+  case MVT::f32:
+    return Subtarget.hasStdExtF();
+  case MVT::f64:
+    return Subtarget.hasStdExtD();
+  default:
+    return false;
+  }
+}
+
+unsigned RISCVTargetLowering::getJumpTableEncoding() const {
+  // If we are using the small code model, we can reduce size of jump table
+  // entry to 4 bytes.
+  if (Subtarget.is64Bit() && !isPositionIndependent() &&
+      getTargetMachine().getCodeModel() == CodeModel::Small) {
+    return MachineJumpTableInfo::EK_Custom32;
+  }
+  return TargetLowering::getJumpTableEncoding();
+}
+
+const MCExpr *RISCVTargetLowering::LowerCustomJumpTableEntry(
+    const MachineJumpTableInfo *MJTI, const MachineBasicBlock *MBB,
+    unsigned uid, MCContext &Ctx) const {
+  assert(Subtarget.is64Bit() && !isPositionIndependent() &&
+         getTargetMachine().getCodeModel() == CodeModel::Small);
+  return MCSymbolRefExpr::create(MBB->getSymbol(), Ctx);
+}
+
+bool RISCVTargetLowering::isVScaleKnownToBeAPowerOfTwo() const {
+  // We define vscale to be VLEN/RVVBitsPerBlock.  VLEN is always a power
+  // of two >= 64, and RVVBitsPerBlock is 64.  Thus, vscale must be
+  // a power of two as well.
+  // FIXME: This doesn't work for zve32, but that's already broken
+  // elsewhere for the same reason.
+  assert(Subtarget.getRealMinVLen() >= 64 && "zve32* unsupported");
+  static_assert(RISCV::RVVBitsPerBlock == 64,
+                "RVVBitsPerBlock changed, audit needed");
+  return true;
+}
+
 bool RISCVTargetLowering::isFMAFasterThanFMulAndFAdd(const MachineFunction &MF,
                                                      EVT VT) const {
-  VT = VT.getScalarType();
+  EVT SVT = VT.getScalarType();
 
-  if (!VT.isSimple())
+  if (!SVT.isSimple())
     return false;
 
-  switch (VT.getSimpleVT().SimpleTy) {
+  switch (SVT.getSimpleVT().SimpleTy) {
   case MVT::f16:
-    return Subtarget.hasStdExtZfh();
+    return VT.isVector() ? Subtarget.hasVInstructionsF16()
+                         : Subtarget.hasStdExtZfh();
   case MVT::f32:
     return Subtarget.hasStdExtF();
   case MVT::f64:
@@ -8934,10 +14024,12 @@ bool RISCVTargetLowering::shouldSignExtendTypeInLibCall(EVT Type, bool IsSigned)
 bool RISCVTargetLowering::decomposeMulByConstant(LLVMContext &Context, EVT VT,
                                                  SDValue C) const {
   // Check integral scalar types.
+  const bool HasExtMOrZmmul =
+      Subtarget.hasStdExtM() || Subtarget.hasStdExtZmmul();
   if (VT.isScalarInteger()) {
     // Omit the optimization if the sub target has the M extension and the data
     // size exceeds XLen.
-    if (Subtarget.hasStdExtM() && VT.getSizeInBits() > Subtarget.getXLen())
+    if (HasExtMOrZmmul && VT.getSizeInBits() > Subtarget.getXLen())
       return false;
     if (auto *ConstNode = dyn_cast<ConstantSDNode>(C.getNode())) {
       // Break the MUL to a SLLI and an ADD/SUB.
@@ -8945,9 +14037,14 @@ bool RISCVTargetLowering::decomposeMulByConstant(LLVMContext &Context, EVT VT,
       if ((Imm + 1).isPowerOf2() || (Imm - 1).isPowerOf2() ||
           (1 - Imm).isPowerOf2() || (-1 - Imm).isPowerOf2())
         return true;
+      // Optimize the MUL to (SH*ADD x, (SLLI x, bits)) if Imm is not simm12.
+      if (Subtarget.hasStdExtZba() && !Imm.isSignedIntN(12) &&
+          ((Imm - 2).isPowerOf2() || (Imm - 4).isPowerOf2() ||
+           (Imm - 8).isPowerOf2()))
+        return true;
       // Omit the following optimization if the sub target has the M extension
       // and the data size >= XLen.
-      if (Subtarget.hasStdExtM() && VT.getSizeInBits() >= Subtarget.getXLen())
+      if (HasExtMOrZmmul && VT.getSizeInBits() >= Subtarget.getXLen())
         return false;
       // Break the MUL to two SLLI instructions and an ADD/SUB, if Imm needs
       // a pair of LUI/ADDI.
@@ -8955,7 +14052,7 @@ bool RISCVTargetLowering::decomposeMulByConstant(LLVMContext &Context, EVT VT,
         APInt ImmS = Imm.ashr(Imm.countTrailingZeros());
         if ((ImmS + 1).isPowerOf2() || (ImmS - 1).isPowerOf2() ||
             (1 - ImmS).isPowerOf2())
-        return true;
+          return true;
       }
     }
   }
@@ -8963,16 +14060,43 @@ bool RISCVTargetLowering::decomposeMulByConstant(LLVMContext &Context, EVT VT,
   return false;
 }
 
+bool RISCVTargetLowering::isMulAddWithConstProfitable(SDValue AddNode,
+                                                      SDValue ConstNode) const {
+  // Let the DAGCombiner decide for vectors.
+  EVT VT = AddNode.getValueType();
+  if (VT.isVector())
+    return true;
+
+  // Let the DAGCombiner decide for larger types.
+  if (VT.getScalarSizeInBits() > Subtarget.getXLen())
+    return true;
+
+  // It is worse if c1 is simm12 while c1*c2 is not.
+  ConstantSDNode *C1Node = cast<ConstantSDNode>(AddNode.getOperand(1));
+  ConstantSDNode *C2Node = cast<ConstantSDNode>(ConstNode);
+  const APInt &C1 = C1Node->getAPIntValue();
+  const APInt &C2 = C2Node->getAPIntValue();
+  if (C1.isSignedIntN(12) && !(C1 * C2).isSignedIntN(12))
+    return false;
+
+  // Default to true and let the DAGCombiner decide.
+  return true;
+}
+
 bool RISCVTargetLowering::allowsMisalignedMemoryAccesses(
     EVT VT, unsigned AddrSpace, Align Alignment, MachineMemOperand::Flags Flags,
-    bool *Fast) const {
-  if (!VT.isVector())
-    return false;
+    unsigned *Fast) const {
+  if (!VT.isVector()) {
+    if (Fast)
+      *Fast = 0;
+    return Subtarget.enableUnalignedScalarMem();
+  }
 
+  // All vector implementations must support element alignment
   EVT ElemVT = VT.getVectorElementType();
   if (Alignment >= ElemVT.getStoreSize()) {
     if (Fast)
-      *Fast = true;
+      *Fast = 1;
     return true;
   }
 
@@ -8981,8 +14105,8 @@ bool RISCVTargetLowering::allowsMisalignedMemoryAccesses(
 
 bool RISCVTargetLowering::splitValueIntoRegisterParts(
     SelectionDAG &DAG, const SDLoc &DL, SDValue Val, SDValue *Parts,
-    unsigned NumParts, MVT PartVT, Optional<CallingConv::ID> CC) const {
-  bool IsABIRegCopy = CC.hasValue();
+    unsigned NumParts, MVT PartVT, std::optional<CallingConv::ID> CC) const {
+  bool IsABIRegCopy = CC.has_value();
   EVT ValueVT = Val.getValueType();
   if (IsABIRegCopy && ValueVT == MVT::f16 && PartVT == MVT::f32) {
     // Cast the f16 to i16, extend to i32, pad with ones to make a float nan,
@@ -9000,20 +14124,32 @@ bool RISCVTargetLowering::splitValueIntoRegisterParts(
     LLVMContext &Context = *DAG.getContext();
     EVT ValueEltVT = ValueVT.getVectorElementType();
     EVT PartEltVT = PartVT.getVectorElementType();
-    unsigned ValueVTBitSize = ValueVT.getSizeInBits().getKnownMinSize();
-    unsigned PartVTBitSize = PartVT.getSizeInBits().getKnownMinSize();
+    unsigned ValueVTBitSize = ValueVT.getSizeInBits().getKnownMinValue();
+    unsigned PartVTBitSize = PartVT.getSizeInBits().getKnownMinValue();
     if (PartVTBitSize % ValueVTBitSize == 0) {
+      assert(PartVTBitSize >= ValueVTBitSize);
       // If the element types are different, bitcast to the same element type of
       // PartVT first.
+      // Give an example here, we want copy a <vscale x 1 x i8> value to
+      // <vscale x 4 x i16>.
+      // We need to convert <vscale x 1 x i8> to <vscale x 8 x i8> by insert
+      // subvector, then we can bitcast to <vscale x 4 x i16>.
       if (ValueEltVT != PartEltVT) {
-        unsigned Count = ValueVTBitSize / PartEltVT.getSizeInBits();
-        assert(Count != 0 && "The number of element should not be zero.");
-        EVT SameEltTypeVT =
-            EVT::getVectorVT(Context, PartEltVT, Count, /*IsScalable=*/true);
-        Val = DAG.getNode(ISD::BITCAST, DL, SameEltTypeVT, Val);
+        if (PartVTBitSize > ValueVTBitSize) {
+          unsigned Count = PartVTBitSize / ValueEltVT.getFixedSizeInBits();
+          assert(Count != 0 && "The number of element should not be zero.");
+          EVT SameEltTypeVT =
+              EVT::getVectorVT(Context, ValueEltVT, Count, /*IsScalable=*/true);
+          Val = DAG.getNode(ISD::INSERT_SUBVECTOR, DL, SameEltTypeVT,
+                            DAG.getUNDEF(SameEltTypeVT), Val,
+                            DAG.getVectorIdxConstant(0, DL));
+        }
+        Val = DAG.getNode(ISD::BITCAST, DL, PartVT, Val);
+      } else {
+        Val =
+            DAG.getNode(ISD::INSERT_SUBVECTOR, DL, PartVT, DAG.getUNDEF(PartVT),
+                        Val, DAG.getVectorIdxConstant(0, DL));
       }
-      Val = DAG.getNode(ISD::INSERT_SUBVECTOR, DL, PartVT, DAG.getUNDEF(PartVT),
-                        Val, DAG.getConstant(0, DL, Subtarget.getXLenVT()));
       Parts[0] = Val;
       return true;
     }
@@ -9023,8 +14159,8 @@ bool RISCVTargetLowering::splitValueIntoRegisterParts(
 
 SDValue RISCVTargetLowering::joinRegisterPartsIntoValue(
     SelectionDAG &DAG, const SDLoc &DL, const SDValue *Parts, unsigned NumParts,
-    MVT PartVT, EVT ValueVT, Optional<CallingConv::ID> CC) const {
-  bool IsABIRegCopy = CC.hasValue();
+    MVT PartVT, EVT ValueVT, std::optional<CallingConv::ID> CC) const {
+  bool IsABIRegCopy = CC.has_value();
   if (IsABIRegCopy && ValueVT == MVT::f16 && PartVT == MVT::f32) {
     SDValue Val = Parts[0];
 
@@ -9040,28 +14176,67 @@ SDValue RISCVTargetLowering::joinRegisterPartsIntoValue(
     SDValue Val = Parts[0];
     EVT ValueEltVT = ValueVT.getVectorElementType();
     EVT PartEltVT = PartVT.getVectorElementType();
-    unsigned ValueVTBitSize = ValueVT.getSizeInBits().getKnownMinSize();
-    unsigned PartVTBitSize = PartVT.getSizeInBits().getKnownMinSize();
+    unsigned ValueVTBitSize = ValueVT.getSizeInBits().getKnownMinValue();
+    unsigned PartVTBitSize = PartVT.getSizeInBits().getKnownMinValue();
     if (PartVTBitSize % ValueVTBitSize == 0) {
+      assert(PartVTBitSize >= ValueVTBitSize);
       EVT SameEltTypeVT = ValueVT;
       // If the element types are different, convert it to the same element type
       // of PartVT.
+      // Give an example here, we want copy a <vscale x 1 x i8> value from
+      // <vscale x 4 x i16>.
+      // We need to convert <vscale x 4 x i16> to <vscale x 8 x i8> first,
+      // then we can extract <vscale x 1 x i8>.
       if (ValueEltVT != PartEltVT) {
-        unsigned Count = ValueVTBitSize / PartEltVT.getSizeInBits();
+        unsigned Count = PartVTBitSize / ValueEltVT.getFixedSizeInBits();
         assert(Count != 0 && "The number of element should not be zero.");
         SameEltTypeVT =
-            EVT::getVectorVT(Context, PartEltVT, Count, /*IsScalable=*/true);
+            EVT::getVectorVT(Context, ValueEltVT, Count, /*IsScalable=*/true);
+        Val = DAG.getNode(ISD::BITCAST, DL, SameEltTypeVT, Val);
       }
-      Val = DAG.getNode(ISD::EXTRACT_SUBVECTOR, DL, SameEltTypeVT, Val,
-                        DAG.getConstant(0, DL, Subtarget.getXLenVT()));
-      if (ValueEltVT != PartEltVT)
-        Val = DAG.getNode(ISD::BITCAST, DL, ValueVT, Val);
+      Val = DAG.getNode(ISD::EXTRACT_SUBVECTOR, DL, ValueVT, Val,
+                        DAG.getVectorIdxConstant(0, DL));
       return Val;
     }
   }
   return SDValue();
 }
 
+bool RISCVTargetLowering::isIntDivCheap(EVT VT, AttributeList Attr) const {
+  // When aggressively optimizing for code size, we prefer to use a div
+  // instruction, as it is usually smaller than the alternative sequence.
+  // TODO: Add vector division?
+  bool OptSize = Attr.hasFnAttr(Attribute::MinSize);
+  return OptSize && !VT.isVector();
+}
+
+bool RISCVTargetLowering::preferScalarizeSplat(unsigned Opc) const {
+  // Scalarize zero_ext and sign_ext might stop match to widening instruction in
+  // some situation.
+  if (Opc == ISD::ZERO_EXTEND || Opc == ISD::SIGN_EXTEND)
+    return false;
+  return true;
+}
+
+static Value *useTpOffset(IRBuilderBase &IRB, unsigned Offset) {
+  Module *M = IRB.GetInsertBlock()->getParent()->getParent();
+  Function *ThreadPointerFunc =
+      Intrinsic::getDeclaration(M, Intrinsic::thread_pointer);
+  return IRB.CreatePointerCast(
+      IRB.CreateConstGEP1_32(IRB.getInt8Ty(),
+                             IRB.CreateCall(ThreadPointerFunc), Offset),
+      IRB.getInt8PtrTy()->getPointerTo(0));
+}
+
+Value *RISCVTargetLowering::getIRStackGuard(IRBuilderBase &IRB) const {
+  // Fuchsia provides a fixed TLS slot for the stack cookie.
+  // <zircon/tls.h> defines ZX_TLS_STACK_GUARD_OFFSET with this value.
+  if (Subtarget.isTargetFuchsia())
+    return useTpOffset(IRB, -0x10);
+
+  return TargetLowering::getIRStackGuard(IRB);
+}
+
 #define GET_REGISTER_MATCHER
 #include "RISCVGenAsmMatcher.inc"
 
@@ -9081,12 +14256,9 @@ RISCVTargetLowering::getRegisterByName(const char *RegName, LLT VT,
   return Reg;
 }
 
-namespace llvm {
-namespace RISCVVIntrinsicsTable {
+namespace llvm::RISCVVIntrinsicsTable {
 
 #define GET_RISCVVIntrinsicsTable_IMPL
 #include "RISCVGenSearchableTables.inc"
 
-} // namespace RISCVVIntrinsicsTable
-
-} // namespace llvm
+} // namespace llvm::RISCVVIntrinsicsTable
diff --git a/gnu/llvm/llvm/lib/Target/RISCV/RISCVInstrInfoB.td b/gnu/llvm/llvm/lib/Target/RISCV/RISCVInstrInfoB.td
deleted file mode 100644
index 7359e567a58..00000000000
--- a/gnu/llvm/llvm/lib/Target/RISCV/RISCVInstrInfoB.td
+++ /dev/null
@@ -1,1121 +0,0 @@
-//===-- RISCVInstrInfoB.td - RISC-V 'B' instructions -------*- tablegen -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file describes the RISC-V instructions from the standard 'B' Bitmanip
-// extension, version 0.93.
-// This version is still experimental as the 'B' extension hasn't been
-// ratified yet.
-//
-//===----------------------------------------------------------------------===//
-
-//===----------------------------------------------------------------------===//
-// Operand and SDNode transformation definitions.
-//===----------------------------------------------------------------------===//
-
-def riscv_clzw   : SDNode<"RISCVISD::CLZW",   SDT_RISCVIntUnaryOpW>;
-def riscv_ctzw   : SDNode<"RISCVISD::CTZW",   SDT_RISCVIntUnaryOpW>;
-def riscv_rolw   : SDNode<"RISCVISD::ROLW",   SDT_RISCVIntBinOpW>;
-def riscv_rorw   : SDNode<"RISCVISD::RORW",   SDT_RISCVIntBinOpW>;
-def riscv_fslw   : SDNode<"RISCVISD::FSLW",   SDT_RISCVIntShiftDOpW>;
-def riscv_fsrw   : SDNode<"RISCVISD::FSRW",   SDT_RISCVIntShiftDOpW>;
-def riscv_fsl    : SDNode<"RISCVISD::FSL",    SDTIntShiftDOp>;
-def riscv_fsr    : SDNode<"RISCVISD::FSR",    SDTIntShiftDOp>;
-def riscv_grev   : SDNode<"RISCVISD::GREV",   SDTIntBinOp>;
-def riscv_grevw  : SDNode<"RISCVISD::GREVW",  SDT_RISCVIntBinOpW>;
-def riscv_gorc   : SDNode<"RISCVISD::GORC",   SDTIntBinOp>;
-def riscv_gorcw  : SDNode<"RISCVISD::GORCW",  SDT_RISCVIntBinOpW>;
-def riscv_shfl   : SDNode<"RISCVISD::SHFL",   SDTIntBinOp>;
-def riscv_shflw  : SDNode<"RISCVISD::SHFLW",  SDT_RISCVIntBinOpW>;
-def riscv_unshfl : SDNode<"RISCVISD::UNSHFL", SDTIntBinOp>;
-def riscv_unshflw: SDNode<"RISCVISD::UNSHFLW",SDT_RISCVIntBinOpW>;
-def riscv_bcompress    : SDNode<"RISCVISD::BCOMPRESS",   SDTIntBinOp>;
-def riscv_bcompressw   : SDNode<"RISCVISD::BCOMPRESSW",  SDT_RISCVIntBinOpW>;
-def riscv_bdecompress  : SDNode<"RISCVISD::BDECOMPRESS", SDTIntBinOp>;
-def riscv_bdecompressw : SDNode<"RISCVISD::BDECOMPRESSW",SDT_RISCVIntBinOpW>;
-
-def UImmLog2XLenHalfAsmOperand : AsmOperandClass {
-  let Name = "UImmLog2XLenHalf";
-  let RenderMethod = "addImmOperands";
-  let DiagnosticType = "InvalidUImmLog2XLenHalf";
-}
-
-def shfl_uimm : Operand<XLenVT>, ImmLeaf<XLenVT, [{
-  if (Subtarget->is64Bit())
-    return isUInt<5>(Imm);
-  return isUInt<4>(Imm);
-}]> {
-  let ParserMatchClass = UImmLog2XLenHalfAsmOperand;
-  let DecoderMethod = "decodeUImmOperand<5>";
-  let MCOperandPredicate = [{
-    int64_t Imm;
-    if (!MCOp.evaluateAsConstantImm(Imm))
-      return false;
-    if (STI.getTargetTriple().isArch64Bit())
-      return  isUInt<5>(Imm);
-    return isUInt<4>(Imm);
-  }];
-}
-
-def BCLRXForm : SDNodeXForm<imm, [{
-  // Find the lowest 0.
-  return CurDAG->getTargetConstant(N->getAPIntValue().countTrailingOnes(),
-                                   SDLoc(N), N->getValueType(0));
-}]>;
-
-def BSETINVXForm : SDNodeXForm<imm, [{
-  // Find the lowest 1.
-  return CurDAG->getTargetConstant(N->getAPIntValue().countTrailingZeros(),
-                                   SDLoc(N), N->getValueType(0));
-}]>;
-
-// Checks if this mask has a single 0 bit and cannot be used with ANDI.
-def BCLRMask : ImmLeaf<XLenVT, [{
-  if (Subtarget->is64Bit())
-    return !isInt<12>(Imm) && isPowerOf2_64(~Imm);
-  return !isInt<12>(Imm) && isPowerOf2_32(~Imm);
-}], BCLRXForm>;
-
-// Checks if this mask has a single 1 bit and cannot be used with ORI/XORI.
-def BSETINVMask : ImmLeaf<XLenVT, [{
-  if (Subtarget->is64Bit())
-    return !isInt<12>(Imm) && isPowerOf2_64(Imm);
-  return !isInt<12>(Imm) && isPowerOf2_32(Imm);
-}], BSETINVXForm>;
-
-// Check if (or r, i) can be optimized to (BSETI (BSETI r, i0), i1),
-// in which i = (1 << i0) | (1 << i1).
-def BSETINVTwoBitsMask : PatLeaf<(imm), [{
-  if (!N->hasOneUse())
-    return false;
-  // The immediate should not be a simm12.
-  if (isInt<12>(N->getSExtValue()))
-    return false;
-  // The immediate must have exactly two bits set.
-  return countPopulation(N->getZExtValue()) == 2;
-}]>;
-
-def TrailingZerosXForm : SDNodeXForm<imm, [{
-  uint64_t I = N->getZExtValue();
-  return CurDAG->getTargetConstant(countTrailingZeros(I), SDLoc(N),
-                                   N->getValueType(0));
-}]>;
-
-def BSETINVTwoBitsMaskHigh : SDNodeXForm<imm, [{
-  uint64_t I = N->getZExtValue();
-  return CurDAG->getTargetConstant(63 - countLeadingZeros(I), SDLoc(N),
-                                   N->getValueType(0));
-}]>;
-
-// Check if (or r, imm) can be optimized to (BSETI (ORI r, i0), i1),
-// in which imm = i0 | (1 << i1).
-def BSETINVORIMask : PatLeaf<(imm), [{
-  if (!N->hasOneUse())
-    return false;
-  // The immediate should not be a simm12.
-  if (isInt<12>(N->getSExtValue()))
-    return false;
-  // There should be only one set bit from bit 11 to the top.
-  return isPowerOf2_64(N->getZExtValue() & ~0x7ff);
-}]>;
-
-def BSETINVORIMaskLow : SDNodeXForm<imm, [{
-  return CurDAG->getTargetConstant(N->getZExtValue() & 0x7ff,
-                                   SDLoc(N), N->getValueType(0));
-}]>;
-
-// Check if (and r, i) can be optimized to (BCLRI (BCLRI r, i0), i1),
-// in which i = ~((1<<i0) | (1<<i1)).
-def BCLRITwoBitsMask : PatLeaf<(imm), [{
-  if (!N->hasOneUse())
-    return false;
-  // The immediate should not be a simm12.
-  if (isInt<12>(N->getSExtValue()))
-    return false;
-  // The immediate must have exactly two bits clear.
-  return countPopulation(N->getZExtValue()) == Subtarget->getXLen() - 2;
-}]>;
-
-def BCLRITwoBitsMaskLow : SDNodeXForm<imm, [{
-  return CurDAG->getTargetConstant(countTrailingZeros(~N->getZExtValue()),
-                                   SDLoc(N), N->getValueType(0));
-}]>;
-
-def BCLRITwoBitsMaskHigh : SDNodeXForm<imm, [{
-  uint64_t I = N->getSExtValue();
-  if (!Subtarget->is64Bit())
-    I |= 0xffffffffull << 32;
-  return CurDAG->getTargetConstant(63 - countLeadingZeros(~I), SDLoc(N),
-                                   N->getValueType(0));
-}]>;
-
-// Check if (and r, i) can be optimized to (BCLRI (ANDI r, i0), i1),
-// in which i = i0 & ~(1<<i1).
-def BCLRIANDIMask : PatLeaf<(imm), [{
-  if (!N->hasOneUse())
-    return false;
-  // The immediate should not be a simm12.
-  if (isInt<12>(N->getSExtValue()))
-    return false;
-  // There should be only one clear bit from bit 11 to the top.
-  uint64_t I = N->getZExtValue() | 0x7ff;
-  return Subtarget->is64Bit() ? isPowerOf2_64(~I) : isPowerOf2_32(~I);
-}]>;
-
-def BCLRIANDIMaskLow : SDNodeXForm<imm, [{
-  return CurDAG->getTargetConstant((N->getZExtValue() & 0x7ff) | ~0x7ffull,
-                                   SDLoc(N), N->getValueType(0));
-}]>;
-
-def C3LeftShift : PatLeaf<(imm), [{
-  uint64_t C = N->getZExtValue();
-  return C > 3 && ((C % 3) == 0) && isPowerOf2_64(C / 3);
-}]>;
-
-def C5LeftShift : PatLeaf<(imm), [{
-  uint64_t C = N->getZExtValue();
-  return C > 5 && ((C % 5) == 0) && isPowerOf2_64(C / 5);
-}]>;
-
-def C9LeftShift : PatLeaf<(imm), [{
-  uint64_t C = N->getZExtValue();
-  return C > 9 && ((C % 9) == 0) && isPowerOf2_64(C / 9);
-}]>;
-
-//===----------------------------------------------------------------------===//
-// Instruction class templates
-//===----------------------------------------------------------------------===//
-
-// Some of these templates should be moved to RISCVInstrFormats.td once the B
-// extension has been ratified.
-
-let hasSideEffects = 0, mayLoad = 0, mayStore = 0 in
-class RVBUnary<bits<7> funct7, bits<5> funct5, bits<3> funct3,
-               RISCVOpcode opcode, string opcodestr>
-    : RVInstR<funct7, funct3, opcode, (outs GPR:$rd), (ins GPR:$rs1),
-              opcodestr, "$rd, $rs1"> {
-  let rs2 = funct5;
-}
-
-let hasSideEffects = 0, mayLoad = 0, mayStore = 0 in
-class RVBShift_ri<bits<5> imm11_7, bits<3> funct3, RISCVOpcode opcode,
-                  string opcodestr>
-    : RVInstIShift<imm11_7, funct3, opcode, (outs GPR:$rd),
-                   (ins GPR:$rs1, uimmlog2xlen:$shamt), opcodestr,
-                   "$rd, $rs1, $shamt">;
-
-let hasSideEffects = 0, mayLoad = 0, mayStore = 0 in
-class RVBShiftW_ri<bits<7> imm11_5, bits<3> funct3, RISCVOpcode opcode,
-                   string opcodestr>
-    : RVInstIShiftW<imm11_5, funct3, opcode, (outs GPR:$rd),
-                    (ins GPR:$rs1, uimm5:$shamt), opcodestr,
-                    "$rd, $rs1, $shamt">;
-
-// Using RVInstIShiftW since it allocates 5 bits instead of 6 to shamt.
-let hasSideEffects = 0, mayLoad = 0, mayStore = 0 in
-class RVBShfl_ri<bits<7> imm11_5, bits<3> funct3, RISCVOpcode opcode,
-                 string opcodestr>
-    : RVInstIShiftW<imm11_5, funct3, opcode, (outs GPR:$rd),
-                    (ins GPR:$rs1, shfl_uimm:$shamt), opcodestr,
-                    "$rd, $rs1, $shamt">;
-
-let hasSideEffects = 0, mayLoad = 0, mayStore = 0 in
-class RVBTernaryR<bits<2> funct2, bits<3> funct3, RISCVOpcode opcode,
-                  string opcodestr, string argstr>
-    : RVInstR4<funct2, funct3, opcode, (outs GPR:$rd),
-               (ins GPR:$rs1, GPR:$rs2, GPR:$rs3), opcodestr, argstr>;
-
-// Currently used by FSRI only
-let hasSideEffects = 0, mayLoad = 0, mayStore = 0 in
-class RVBTernaryImm6<bits<3> funct3, RISCVOpcode opcode,
-                     string opcodestr, string argstr>
-    : RVInst<(outs GPR:$rd), (ins GPR:$rs1, GPR:$rs3, uimmlog2xlen:$shamt),
-             opcodestr, argstr, [], InstFormatR4> {
-  bits<5> rs3;
-  bits<6> shamt;
-  bits<5> rs1;
-  bits<5> rd;
-
-  let Inst{31-27} = rs3;
-  let Inst{26} = 1;
-  let Inst{25-20} = shamt;
-  let Inst{19-15} = rs1;
-  let Inst{14-12} = funct3;
-  let Inst{11-7} = rd;
-  let Opcode = opcode.Value;
-}
-
-// Currently used by FSRIW only
-let hasSideEffects = 0, mayLoad = 0, mayStore = 0 in
-class RVBTernaryImm5<bits<2> funct2, bits<3> funct3, RISCVOpcode opcode,
-                     string opcodestr, string argstr>
-    : RVInst<(outs GPR:$rd), (ins GPR:$rs1, GPR:$rs3, uimm5:$shamt),
-             opcodestr, argstr, [], InstFormatR4> {
-  bits<5> rs3;
-  bits<5> shamt;
-  bits<5> rs1;
-  bits<5> rd;
-
-  let Inst{31-27} = rs3;
-  let Inst{26-25} = funct2;
-  let Inst{24-20} = shamt;
-  let Inst{19-15} = rs1;
-  let Inst{14-12} = funct3;
-  let Inst{11-7} = rd;
-  let Opcode = opcode.Value;
-}
-
-//===----------------------------------------------------------------------===//
-// Instructions
-//===----------------------------------------------------------------------===//
-
-let Predicates = [HasStdExtZbbOrZbp] in {
-def ANDN  : ALU_rr<0b0100000, 0b111, "andn">,
-            Sched<[WriteIALU, ReadIALU, ReadIALU]>;
-def ORN   : ALU_rr<0b0100000, 0b110, "orn">,
-            Sched<[WriteIALU, ReadIALU, ReadIALU]>;
-def XNOR  : ALU_rr<0b0100000, 0b100, "xnor">,
-            Sched<[WriteIALU, ReadIALU, ReadIALU]>;
-} // Predicates = [HasStdExtZbbOrZbp]
-
-let Predicates = [HasStdExtZba] in {
-def SH1ADD : ALU_rr<0b0010000, 0b010, "sh1add">,
-             Sched<[WriteSHXADD, ReadSHXADD, ReadSHXADD]>;
-def SH2ADD : ALU_rr<0b0010000, 0b100, "sh2add">,
-             Sched<[WriteSHXADD, ReadSHXADD, ReadSHXADD]>;
-def SH3ADD : ALU_rr<0b0010000, 0b110, "sh3add">,
-             Sched<[WriteSHXADD, ReadSHXADD, ReadSHXADD]>;
-} // Predicates = [HasStdExtZba]
-
-let Predicates = [HasStdExtZbbOrZbp] in {
-def ROL   : ALU_rr<0b0110000, 0b001, "rol">,
-            Sched<[WriteRotateReg, ReadRotateReg, ReadRotateReg]>;
-def ROR   : ALU_rr<0b0110000, 0b101, "ror">,
-            Sched<[WriteRotateReg, ReadRotateReg, ReadRotateReg]>;
-} // Predicates = [HasStdExtZbbOrZbp]
-
-let Predicates = [HasStdExtZbs] in {
-def BCLR : ALU_rr<0b0100100, 0b001, "bclr">, Sched<[]>;
-def BSET : ALU_rr<0b0010100, 0b001, "bset">, Sched<[]>;
-def BINV : ALU_rr<0b0110100, 0b001, "binv">, Sched<[]>;
-def BEXT : ALU_rr<0b0100100, 0b101, "bext">, Sched<[]>;
-} // Predicates = [HasStdExtZbs]
-
-let Predicates = [HasStdExtZbp] in {
-def GORC : ALU_rr<0b0010100, 0b101, "gorc">, Sched<[]>;
-def GREV : ALU_rr<0b0110100, 0b101, "grev">, Sched<[]>;
-} // Predicates = [HasStdExtZbp]
-
-let Predicates = [HasStdExtZbp] in {
-def XPERMN : ALU_rr<0b0010100, 0b010, "xperm.n">, Sched<[]>;
-def XPERMB : ALU_rr<0b0010100, 0b100, "xperm.b">, Sched<[]>;
-def XPERMH : ALU_rr<0b0010100, 0b110, "xperm.h">, Sched<[]>;
-} // Predicates = [HasStdExtZbp]
-
-let Predicates = [HasStdExtZbbOrZbp] in
-def RORI  : RVBShift_ri<0b01100, 0b101, OPC_OP_IMM, "rori">,
-            Sched<[WriteRotateImm, ReadRotateImm]>;
-
-let Predicates = [HasStdExtZbs] in {
-def BCLRI : RVBShift_ri<0b01001, 0b001, OPC_OP_IMM, "bclri">, Sched<[]>;
-def BSETI : RVBShift_ri<0b00101, 0b001, OPC_OP_IMM, "bseti">, Sched<[]>;
-def BINVI : RVBShift_ri<0b01101, 0b001, OPC_OP_IMM, "binvi">, Sched<[]>;
-def BEXTI : RVBShift_ri<0b01001, 0b101, OPC_OP_IMM, "bexti">, Sched<[]>;
-} // Predicates = [HasStdExtZbs]
-
-let Predicates = [HasStdExtZbp] in {
-def GREVI : RVBShift_ri<0b01101, 0b101, OPC_OP_IMM, "grevi">, Sched<[]>;
-def GORCI : RVBShift_ri<0b00101, 0b101, OPC_OP_IMM, "gorci">, Sched<[]>;
-} // Predicates = [HasStdExtZbp]
-
-let Predicates = [HasStdExtZbt] in {
-def CMIX : RVBTernaryR<0b11, 0b001, OPC_OP, "cmix", "$rd, $rs2, $rs1, $rs3">,
-           Sched<[]>;
-def CMOV : RVBTernaryR<0b11, 0b101, OPC_OP, "cmov", "$rd, $rs2, $rs1, $rs3">,
-           Sched<[]>;
-def FSL  : RVBTernaryR<0b10, 0b001, OPC_OP, "fsl", "$rd, $rs1, $rs3, $rs2">,
-           Sched<[]>;
-def FSR  : RVBTernaryR<0b10, 0b101, OPC_OP, "fsr", "$rd, $rs1, $rs3, $rs2">,
-           Sched<[]>;
-def FSRI : RVBTernaryImm6<0b101, OPC_OP_IMM, "fsri",
-                          "$rd, $rs1, $rs3, $shamt">, Sched<[]>;
-} // Predicates = [HasStdExtZbt]
-
-let Predicates = [HasStdExtZbb] in {
-def CLZ  : RVBUnary<0b0110000, 0b00000, 0b001, RISCVOpcode<0b0010011>, "clz">,
-           Sched<[WriteCLZ, ReadCLZ]>;
-def CTZ  : RVBUnary<0b0110000, 0b00001, 0b001, RISCVOpcode<0b0010011>, "ctz">,
-           Sched<[WriteCTZ, ReadCTZ]>;
-def CPOP : RVBUnary<0b0110000, 0b00010, 0b001, RISCVOpcode<0b0010011>, "cpop">,
-           Sched<[WriteCPOP, ReadCPOP]>;
-} // Predicates = [HasStdExtZbb]
-
-let Predicates = [HasStdExtZbm, IsRV64] in
-def BMATFLIP : RVBUnary<0b0110000, 0b00011, 0b001, RISCVOpcode<0b0010011>,
-                        "bmatflip">, Sched<[]>;
-
-let Predicates = [HasStdExtZbb] in {
-def SEXTB : RVBUnary<0b0110000, 0b00100, 0b001, RISCVOpcode<0b0010011>,
-                     "sext.b">, Sched<[WriteIALU, ReadIALU]>;
-def SEXTH : RVBUnary<0b0110000, 0b00101, 0b001, RISCVOpcode<0b0010011>,
-                     "sext.h">, Sched<[WriteIALU, ReadIALU]>;
-} // Predicates = [HasStdExtZbb]
-
-let Predicates = [HasStdExtZbr] in {
-def CRC32B : RVBUnary<0b0110000, 0b10000, 0b001, RISCVOpcode<0b0010011>,
-                      "crc32.b">, Sched<[]>;
-def CRC32H : RVBUnary<0b0110000, 0b10001, 0b001, RISCVOpcode<0b0010011>,
-                      "crc32.h">, Sched<[]>;
-def CRC32W : RVBUnary<0b0110000, 0b10010, 0b001, RISCVOpcode<0b0010011>,
-                      "crc32.w">, Sched<[]>;
-} // Predicates = [HasStdExtZbr]
-
-let Predicates = [HasStdExtZbr, IsRV64] in
-def CRC32D  : RVBUnary<0b0110000, 0b10011, 0b001, RISCVOpcode<0b0010011>,
-                       "crc32.d">, Sched<[]>;
-
-let Predicates = [HasStdExtZbr] in {
-def CRC32CB : RVBUnary<0b0110000, 0b11000, 0b001, RISCVOpcode<0b0010011>,
-                       "crc32c.b">, Sched<[]>;
-def CRC32CH : RVBUnary<0b0110000, 0b11001, 0b001, RISCVOpcode<0b0010011>,
-                       "crc32c.h">, Sched<[]>;
-def CRC32CW : RVBUnary<0b0110000, 0b11010, 0b001, RISCVOpcode<0b0010011>,
-                       "crc32c.w">, Sched<[]>;
-} // Predicates = [HasStdExtZbr]
-
-let Predicates = [HasStdExtZbr, IsRV64] in
-def CRC32CD : RVBUnary<0b0110000, 0b11011, 0b001, RISCVOpcode<0b0010011>,
-                       "crc32c.d">, Sched<[]>;
-
-let Predicates = [HasStdExtZbc] in {
-def CLMUL  : ALU_rr<0b0000101, 0b001, "clmul">, Sched<[]>;
-def CLMULR : ALU_rr<0b0000101, 0b010, "clmulr">, Sched<[]>;
-def CLMULH : ALU_rr<0b0000101, 0b011, "clmulh">, Sched<[]>;
-} // Predicates = [HasStdExtZbc]
-
-let Predicates = [HasStdExtZbb] in {
-def MIN  : ALU_rr<0b0000101, 0b100, "min">,
-           Sched<[WriteIALU, ReadIALU, ReadIALU]>;
-def MINU : ALU_rr<0b0000101, 0b101, "minu">,
-           Sched<[WriteIALU, ReadIALU, ReadIALU]>;
-def MAX  : ALU_rr<0b0000101, 0b110, "max">,
-           Sched<[WriteIALU, ReadIALU, ReadIALU]>;
-def MAXU : ALU_rr<0b0000101, 0b111, "maxu">,
-           Sched<[WriteIALU, ReadIALU, ReadIALU]>;
-} // Predicates = [HasStdExtZbb]
-
-let Predicates = [HasStdExtZbp] in {
-def SHFL   : ALU_rr<0b0000100, 0b001, "shfl">, Sched<[]>;
-def UNSHFL : ALU_rr<0b0000100, 0b101, "unshfl">, Sched<[]>;
-} // Predicates = [HasStdExtZbp]
-
-let Predicates = [HasStdExtZbe] in {
-// NOTE: These mnemonics are from the 0.94 spec. There is a name conflict with
-// bext in the 0.93 spec.
-def BDECOMPRESS : ALU_rr<0b0100100, 0b110, "bdecompress">, Sched<[]>;
-def BCOMPRESS   : ALU_rr<0b0000100, 0b110, "bcompress">, Sched<[]>;
-} // Predicates = [HasStdExtZbe]
-
-let Predicates = [HasStdExtZbp] in {
-def PACK  : ALU_rr<0b0000100, 0b100, "pack">, Sched<[]>;
-def PACKU : ALU_rr<0b0100100, 0b100, "packu">, Sched<[]>;
-def PACKH : ALU_rr<0b0000100, 0b111, "packh">, Sched<[]>;
-} // Predicates = [HasStdExtZbp]
-
-let Predicates = [HasStdExtZbm, IsRV64] in {
-def BMATOR   : ALU_rr<0b0000100, 0b011, "bmator">, Sched<[]>;
-def BMATXOR  : ALU_rr<0b0100100, 0b011, "bmatxor">, Sched<[]>;
-} // Predicates = [HasStdExtZbm, IsRV64]
-
-let Predicates = [HasStdExtZbf] in
-def BFP : ALU_rr<0b0100100, 0b111, "bfp">, Sched<[]>;
-
-let Predicates = [HasStdExtZbp] in {
-def SHFLI   : RVBShfl_ri<0b0000100, 0b001, OPC_OP_IMM, "shfli">, Sched<[]>;
-def UNSHFLI : RVBShfl_ri<0b0000100, 0b101, OPC_OP_IMM, "unshfli">, Sched<[]>;
-} // Predicates = [HasStdExtZbp]
-
-let Predicates = [HasStdExtZba, IsRV64] in {
-def SLLIUW : RVBShift_ri<0b00001, 0b001, OPC_OP_IMM_32, "slli.uw">,
-             Sched<[WriteShiftImm32, ReadShiftImm32]>;
-def ADDUW : ALUW_rr<0b0000100, 0b000, "add.uw">,
-            Sched<[WriteIALU32, ReadIALU32, ReadIALU32]>;
-def SH1ADDUW : ALUW_rr<0b0010000, 0b010, "sh1add.uw">,
-               Sched<[WriteSHXADD32, ReadSHXADD32, ReadSHXADD32]>;
-def SH2ADDUW : ALUW_rr<0b0010000, 0b100, "sh2add.uw">,
-               Sched<[WriteSHXADD32, ReadSHXADD32, ReadSHXADD32]>;
-def SH3ADDUW : ALUW_rr<0b0010000, 0b110, "sh3add.uw">,
-               Sched<[WriteSHXADD32, ReadSHXADD32, ReadSHXADD32]>;
-} // Predicates = [HasStdExtZbb, IsRV64]
-
-let Predicates = [HasStdExtZbbOrZbp, IsRV64] in {
-def ROLW  : ALUW_rr<0b0110000, 0b001, "rolw">,
-            Sched<[WriteRotateReg32, ReadRotateReg32, ReadRotateReg32]>;
-def RORW  : ALUW_rr<0b0110000, 0b101, "rorw">,
-            Sched<[WriteRotateReg32, ReadRotateReg32, ReadRotateReg32]>;
-} // Predicates = [HasStdExtZbbOrZbp, IsRV64]
-
-let Predicates = [HasStdExtZbs, IsRV64] in {
-// NOTE: These instructions have been removed from the 0.94 spec. As a result
-// we have no isel patterns for them.
-def BCLRW : ALUW_rr<0b0100100, 0b001, "bclrw">, Sched<[]>;
-def BSETW : ALUW_rr<0b0010100, 0b001, "bsetw">, Sched<[]>;
-def BINVW : ALUW_rr<0b0110100, 0b001, "binvw">, Sched<[]>;
-def BEXTW : ALUW_rr<0b0100100, 0b101, "bextw">, Sched<[]>;
-} // Predicates = [HasStdExtZbs, IsRV64]
-
-let Predicates = [HasStdExtZbp, IsRV64] in {
-def GORCW  : ALUW_rr<0b0010100, 0b101, "gorcw">, Sched<[]>;
-def GREVW  : ALUW_rr<0b0110100, 0b101, "grevw">, Sched<[]>;
-} // Predicates = [HasStdExtZbp, IsRV64]
-
-let Predicates = [HasStdExtZbp, IsRV64] in {
-def XPERMW : ALU_rr<0b0010100, 0b000, "xperm.w">, Sched<[]>;
-} // Predicates = [HasStdExtZbp, IsRV64]
-
-let Predicates = [HasStdExtZbbOrZbp, IsRV64] in
-def RORIW : RVBShiftW_ri<0b0110000, 0b101, OPC_OP_IMM_32, "roriw">,
-            Sched<[WriteRotateImm32, ReadRotateImm32]>;
-
-let Predicates = [HasStdExtZbs, IsRV64] in {
-// NOTE: These instructions have been removed from the 0.94 spec. As a result
-// we have no isel patterns for them.
-def BCLRIW : RVBShiftW_ri<0b0100100, 0b001, OPC_OP_IMM_32, "bclriw">,
-              Sched<[]>;
-def BSETIW : RVBShiftW_ri<0b0010100, 0b001, OPC_OP_IMM_32, "bsetiw">,
-              Sched<[]>;
-def BINVIW : RVBShiftW_ri<0b0110100, 0b001, OPC_OP_IMM_32, "binviw">,
-              Sched<[]>;
-} // Predicates = [HasStdExtZbs, IsRV64]
-
-let Predicates = [HasStdExtZbp, IsRV64] in {
-def GORCIW : RVBShiftW_ri<0b0010100, 0b101, OPC_OP_IMM_32, "gorciw">, Sched<[]>;
-def GREVIW : RVBShiftW_ri<0b0110100, 0b101, OPC_OP_IMM_32, "greviw">, Sched<[]>;
-} // Predicates = [HasStdExtZbp, IsRV64]
-
-let Predicates = [HasStdExtZbt, IsRV64] in {
-def FSLW  : RVBTernaryR<0b10, 0b001, OPC_OP_32,
-                        "fslw", "$rd, $rs1, $rs3, $rs2">, Sched<[]>;
-def FSRW  : RVBTernaryR<0b10, 0b101, OPC_OP_32, "fsrw",
-                        "$rd, $rs1, $rs3, $rs2">, Sched<[]>;
-def FSRIW : RVBTernaryImm5<0b10, 0b101, OPC_OP_IMM_32,
-                           "fsriw", "$rd, $rs1, $rs3, $shamt">, Sched<[]>;
-} // Predicates = [HasStdExtZbt, IsRV64]
-
-let Predicates = [HasStdExtZbb, IsRV64] in {
-def CLZW   : RVBUnary<0b0110000, 0b00000, 0b001, RISCVOpcode<0b0011011>,
-                      "clzw">, Sched<[WriteCLZ32, ReadCLZ32]>;
-def CTZW   : RVBUnary<0b0110000, 0b00001, 0b001, RISCVOpcode<0b0011011>,
-                      "ctzw">, Sched<[WriteCTZ32, ReadCTZ32]>;
-def CPOPW  : RVBUnary<0b0110000, 0b00010, 0b001, RISCVOpcode<0b0011011>,
-                      "cpopw">, Sched<[WriteCPOP32, ReadCPOP32]>;
-} // Predicates = [HasStdExtZbb, IsRV64]
-
-let Predicates = [HasStdExtZbp, IsRV64] in {
-def SHFLW   : ALUW_rr<0b0000100, 0b001, "shflw">, Sched<[]>;
-def UNSHFLW : ALUW_rr<0b0000100, 0b101, "unshflw">, Sched<[]>;
-} // Predicates = [HasStdExtZbp, IsRV64]
-
-let Predicates = [HasStdExtZbe, IsRV64] in {
-// NOTE: These mnemonics are from the 0.94 spec. There is a name conflict with
-// bextw in the 0.93 spec.
-def BDECOMPRESSW : ALUW_rr<0b0100100, 0b110, "bdecompressw">, Sched<[]>;
-def BCOMPRESSW   : ALUW_rr<0b0000100, 0b110, "bcompressw">, Sched<[]>;
-} // Predicates = [HasStdExtZbe, IsRV64]
-
-let Predicates = [HasStdExtZbp, IsRV64] in {
-def PACKW  : ALUW_rr<0b0000100, 0b100, "packw">, Sched<[]>;
-def PACKUW : ALUW_rr<0b0100100, 0b100, "packuw">, Sched<[]>;
-} // Predicates = [HasStdExtZbp, IsRV64]
-
-let Predicates = [HasStdExtZbf, IsRV64] in
-def BFPW : ALUW_rr<0b0100100, 0b111, "bfpw">, Sched<[]>;
-
-let Predicates = [HasStdExtZbbOrZbp, IsRV32] in {
-let hasSideEffects = 0, mayLoad = 0, mayStore = 0 in
-def ZEXTH_RV32 : RVInstR<0b0000100, 0b100, OPC_OP, (outs GPR:$rd),
-                         (ins GPR:$rs1), "zext.h", "$rd, $rs1">,
-                 Sched<[WriteIALU, ReadIALU]> {
-  let rs2 = 0b00000;
-}
-} // Predicates = [HasStdExtZbbOrZbp, IsRV32]
-
-let Predicates = [HasStdExtZbbOrZbp, IsRV64] in {
-let hasSideEffects = 0, mayLoad = 0, mayStore = 0 in
-def ZEXTH_RV64 : RVInstR<0b0000100, 0b100, OPC_OP_32, (outs GPR:$rd),
-                         (ins GPR:$rs1), "zext.h", "$rd, $rs1">,
-                 Sched<[WriteIALU, ReadIALU]> {
-  let rs2 = 0b00000;
-}
-} // Predicates = [HasStdExtZbbOrZbp, IsRV64]
-
-// We treat rev8 and orc.b as standalone instructions even though they use a
-// portion of the encodings for grevi and gorci. This allows us to support only
-// those encodings when only Zbb is enabled. We do this even when grevi and
-// gorci are available with Zbp. Trying to use 'HasStdExtZbb, NotHasStdExtZbp'
-// causes diagnostics to suggest that Zbp rather than Zbb is required for rev8
-// or gorci. Since Zbb is closer to being finalized than Zbp this will be
-// misleading to users.
-let Predicates = [HasStdExtZbbOrZbp, IsRV32] in {
-let hasSideEffects = 0, mayLoad = 0, mayStore = 0 in
-def REV8_RV32 : RVInstI<0b101, OPC_OP_IMM, (outs GPR:$rd), (ins GPR:$rs1),
-                        "rev8", "$rd, $rs1">, Sched<[WriteREV8, ReadREV8]> {
-  let imm12 = { 0b01101, 0b0011000 };
-}
-} // Predicates = [HasStdExtZbbOrZbp, IsRV32]
-
-let Predicates = [HasStdExtZbbOrZbp, IsRV64] in {
-let hasSideEffects = 0, mayLoad = 0, mayStore = 0 in
-def REV8_RV64 : RVInstI<0b101, OPC_OP_IMM, (outs GPR:$rd), (ins GPR:$rs1),
-                        "rev8", "$rd, $rs1">, Sched<[WriteREV8, ReadREV8]> {
-  let imm12 = { 0b01101, 0b0111000 };
-}
-} // Predicates = [HasStdExtZbbOrZbp, IsRV64]
-
-let Predicates = [HasStdExtZbbOrZbp] in {
-let hasSideEffects = 0, mayLoad = 0, mayStore = 0 in
-def ORCB : RVInstI<0b101, OPC_OP_IMM, (outs GPR:$rd), (ins GPR:$rs1),
-                   "orc.b", "$rd, $rs1">, Sched<[WriteORCB, ReadORCB]> {
-  let imm12 = { 0b00101, 0b0000111 };
-}
-} // Predicates = [HasStdExtZbbOrZbp]
-
-//===----------------------------------------------------------------------===//
-// Future compressed instructions
-//===----------------------------------------------------------------------===//
-
-// The presence of these instructions in the B extension is purely experimental
-// and they should be moved to the C extension as soon as they are ratified.
-
-let hasSideEffects = 0, mayLoad = 0, mayStore = 0 in
-class RVBInstC<bits<2> funct2, string opcodestr>
-    : RVInst16<(outs GPRC:$rs_wb), (ins GPRC:$rs), opcodestr, "$rs", [],
-               InstFormatCR> {
-  bits<3> rs;
-  let Constraints = "$rs = $rs_wb";
-
-  let Inst{15-12} = 0b0110;
-  let Inst{11-10} = funct2;
-  let Inst{9-7} = rs;
-  let Inst{6-0} = 0b0000001;
-}
-
-// The namespace RVBC exists to avoid encoding conflicts with the compressed
-// instructions c.addi16sp and c.lui already implemented in the C extension.
-
-let DecoderNamespace = "RVBC", Predicates = [HasStdExtZbproposedc, HasStdExtC] in {
-def C_NOT : RVBInstC<0b00, "c.not">, Sched<[]>;
-def C_NEG : RVBInstC<0b01, "c.neg">, Sched<[]>;
-} // DecoderNamespace = "RVBC", Predicates = [HasStdExtZbproposedc, HasStdExtC]
-
-let DecoderNamespace = "RVBC", Predicates = [HasStdExtZbproposedc, HasStdExtZba, HasStdExtC, IsRV64] in
-def C_ZEXTW : RVBInstC<0b10, "c.zext.w">, Sched<[]>;
-
-//===----------------------------------------------------------------------===//
-// Pseudo Instructions
-//===----------------------------------------------------------------------===//
-
-let Predicates = [HasStdExtZba, IsRV64] in {
-// NOTE: The 0.93 spec shows zext.w as an alias of pack/packw. It has been
-// changed to add.uw in a draft after 0.94.
-def : InstAlias<"zext.w $rd, $rs", (ADDUW GPR:$rd, GPR:$rs, X0)>;
-}
-
-let Predicates = [HasStdExtZbp] in {
-def : InstAlias<"rev.p $rd, $rs",  (GREVI GPR:$rd, GPR:$rs, 0b00001)>;
-def : InstAlias<"rev2.n $rd, $rs", (GREVI GPR:$rd, GPR:$rs, 0b00010)>;
-def : InstAlias<"rev.n $rd, $rs",  (GREVI GPR:$rd, GPR:$rs, 0b00011)>;
-def : InstAlias<"rev4.b $rd, $rs", (GREVI GPR:$rd, GPR:$rs, 0b00100)>;
-def : InstAlias<"rev2.b $rd, $rs", (GREVI GPR:$rd, GPR:$rs, 0b00110)>;
-def : InstAlias<"rev.b $rd, $rs",  (GREVI GPR:$rd, GPR:$rs, 0b00111)>;
-def : InstAlias<"rev8.h $rd, $rs", (GREVI GPR:$rd, GPR:$rs, 0b01000)>;
-def : InstAlias<"rev4.h $rd, $rs", (GREVI GPR:$rd, GPR:$rs, 0b01100)>;
-def : InstAlias<"rev2.h $rd, $rs", (GREVI GPR:$rd, GPR:$rs, 0b01110)>;
-def : InstAlias<"rev.h $rd, $rs",  (GREVI GPR:$rd, GPR:$rs, 0b01111)>;
-
-def : InstAlias<"zip.n $rd, $rs",    (SHFLI   GPR:$rd, GPR:$rs, 0b0001)>;
-def : InstAlias<"unzip.n $rd, $rs",  (UNSHFLI GPR:$rd, GPR:$rs, 0b0001)>;
-def : InstAlias<"zip2.b $rd, $rs",   (SHFLI   GPR:$rd, GPR:$rs, 0b0010)>;
-def : InstAlias<"unzip2.b $rd, $rs", (UNSHFLI GPR:$rd, GPR:$rs, 0b0010)>;
-def : InstAlias<"zip.b $rd, $rs",    (SHFLI   GPR:$rd, GPR:$rs, 0b0011)>;
-def : InstAlias<"unzip.b $rd, $rs",  (UNSHFLI GPR:$rd, GPR:$rs, 0b0011)>;
-def : InstAlias<"zip4.h $rd, $rs",   (SHFLI   GPR:$rd, GPR:$rs, 0b0100)>;
-def : InstAlias<"unzip4.h $rd, $rs", (UNSHFLI GPR:$rd, GPR:$rs, 0b0100)>;
-def : InstAlias<"zip2.h $rd, $rs",   (SHFLI   GPR:$rd, GPR:$rs, 0b0110)>;
-def : InstAlias<"unzip2.h $rd, $rs", (UNSHFLI GPR:$rd, GPR:$rs, 0b0110)>;
-def : InstAlias<"zip.h $rd, $rs",    (SHFLI   GPR:$rd, GPR:$rs, 0b0111)>;
-def : InstAlias<"unzip.h $rd, $rs",  (UNSHFLI GPR:$rd, GPR:$rs, 0b0111)>;
-
-def : InstAlias<"orc.p $rd, $rs",  (GORCI GPR:$rd, GPR:$rs, 0b00001)>;
-def : InstAlias<"orc2.n $rd, $rs", (GORCI GPR:$rd, GPR:$rs, 0b00010)>;
-def : InstAlias<"orc.n $rd, $rs",  (GORCI GPR:$rd, GPR:$rs, 0b00011)>;
-def : InstAlias<"orc4.b $rd, $rs", (GORCI GPR:$rd, GPR:$rs, 0b00100)>;
-def : InstAlias<"orc2.b $rd, $rs", (GORCI GPR:$rd, GPR:$rs, 0b00110)>;
-// orc.b is considered an instruction rather than an alias.
-def : InstAlias<"orc8.h $rd, $rs", (GORCI GPR:$rd, GPR:$rs, 0b01000)>;
-def : InstAlias<"orc4.h $rd, $rs", (GORCI GPR:$rd, GPR:$rs, 0b01100)>;
-def : InstAlias<"orc2.h $rd, $rs", (GORCI GPR:$rd, GPR:$rs, 0b01110)>;
-def : InstAlias<"orc.h $rd, $rs",  (GORCI GPR:$rd, GPR:$rs, 0b01111)>;
-} // Predicates = [HasStdExtZbp]
-
-let Predicates = [HasStdExtZbp, IsRV32] in {
-def : InstAlias<"rev16 $rd, $rs", (GREVI GPR:$rd, GPR:$rs, 0b10000)>;
-// rev8 is considered an instruction rather than an alias.
-def : InstAlias<"rev4 $rd, $rs",  (GREVI GPR:$rd, GPR:$rs, 0b11100)>;
-def : InstAlias<"rev2 $rd, $rs",  (GREVI GPR:$rd, GPR:$rs, 0b11110)>;
-def : InstAlias<"rev $rd, $rs",   (GREVI GPR:$rd, GPR:$rs, 0b11111)>;
-
-def : InstAlias<"zip8 $rd, $rs",   (SHFLI   GPR:$rd, GPR:$rs, 0b1000)>;
-def : InstAlias<"unzip8 $rd, $rs", (UNSHFLI GPR:$rd, GPR:$rs, 0b1000)>;
-def : InstAlias<"zip4 $rd, $rs",   (SHFLI   GPR:$rd, GPR:$rs, 0b1100)>;
-def : InstAlias<"unzip4 $rd, $rs", (UNSHFLI GPR:$rd, GPR:$rs, 0b1100)>;
-def : InstAlias<"zip2 $rd, $rs",   (SHFLI   GPR:$rd, GPR:$rs, 0b1110)>;
-def : InstAlias<"unzip2 $rd, $rs", (UNSHFLI GPR:$rd, GPR:$rs, 0b1110)>;
-def : InstAlias<"zip $rd, $rs",    (SHFLI   GPR:$rd, GPR:$rs, 0b1111)>;
-def : InstAlias<"unzip $rd, $rs",  (UNSHFLI GPR:$rd, GPR:$rs, 0b1111)>;
-
-def : InstAlias<"orc16 $rd, $rs", (GORCI GPR:$rd, GPR:$rs, 0b10000)>;
-def : InstAlias<"orc8 $rd, $rs",  (GORCI GPR:$rd, GPR:$rs, 0b11000)>;
-def : InstAlias<"orc4 $rd, $rs",  (GORCI GPR:$rd, GPR:$rs, 0b11100)>;
-def : InstAlias<"orc2 $rd, $rs",  (GORCI GPR:$rd, GPR:$rs, 0b11110)>;
-def : InstAlias<"orc $rd, $rs",   (GORCI GPR:$rd, GPR:$rs, 0b11111)>;
-} // Predicates = [HasStdExtZbp, IsRV32]
-
-let Predicates = [HasStdExtZbp, IsRV64] in {
-def : InstAlias<"rev16.w $rd, $rs", (GREVI GPR:$rd, GPR:$rs, 0b010000)>;
-def : InstAlias<"rev8.w $rd, $rs",  (GREVI GPR:$rd, GPR:$rs, 0b011000)>;
-def : InstAlias<"rev4.w $rd, $rs",  (GREVI GPR:$rd, GPR:$rs, 0b011100)>;
-def : InstAlias<"rev2.w $rd, $rs",  (GREVI GPR:$rd, GPR:$rs, 0b011110)>;
-def : InstAlias<"rev.w $rd, $rs",   (GREVI GPR:$rd, GPR:$rs, 0b011111)>;
-def : InstAlias<"rev32 $rd, $rs",   (GREVI GPR:$rd, GPR:$rs, 0b100000)>;
-def : InstAlias<"rev16 $rd, $rs",   (GREVI GPR:$rd, GPR:$rs, 0b110000)>;
-// rev8 is considered an instruction rather than an alias.
-def : InstAlias<"rev4 $rd, $rs",    (GREVI GPR:$rd, GPR:$rs, 0b111100)>;
-def : InstAlias<"rev2 $rd, $rs",    (GREVI GPR:$rd, GPR:$rs, 0b111110)>;
-def : InstAlias<"rev $rd, $rs",     (GREVI GPR:$rd, GPR:$rs, 0b111111)>;
-
-def : InstAlias<"zip8.w $rd, $rs",   (SHFLI   GPR:$rd, GPR:$rs, 0b01000)>;
-def : InstAlias<"unzip8.w $rd, $rs", (UNSHFLI GPR:$rd, GPR:$rs, 0b01000)>;
-def : InstAlias<"zip4.w $rd, $rs",   (SHFLI   GPR:$rd, GPR:$rs, 0b01100)>;
-def : InstAlias<"unzip4.w $rd, $rs", (UNSHFLI GPR:$rd, GPR:$rs, 0b01100)>;
-def : InstAlias<"zip2.w $rd, $rs",   (SHFLI   GPR:$rd, GPR:$rs, 0b01110)>;
-def : InstAlias<"unzip2.w $rd, $rs", (UNSHFLI GPR:$rd, GPR:$rs, 0b01110)>;
-def : InstAlias<"zip.w $rd, $rs",    (SHFLI   GPR:$rd, GPR:$rs, 0b01111)>;
-def : InstAlias<"unzip.w $rd, $rs",  (UNSHFLI GPR:$rd, GPR:$rs, 0b01111)>;
-def : InstAlias<"zip16 $rd, $rs",    (SHFLI   GPR:$rd, GPR:$rs, 0b10000)>;
-def : InstAlias<"unzip16 $rd, $rs",  (UNSHFLI GPR:$rd, GPR:$rs, 0b10000)>;
-def : InstAlias<"zip8 $rd, $rs",     (SHFLI   GPR:$rd, GPR:$rs, 0b11000)>;
-def : InstAlias<"unzip8 $rd, $rs",   (UNSHFLI GPR:$rd, GPR:$rs, 0b11000)>;
-def : InstAlias<"zip4 $rd, $rs",     (SHFLI   GPR:$rd, GPR:$rs, 0b11100)>;
-def : InstAlias<"unzip4 $rd, $rs",   (UNSHFLI GPR:$rd, GPR:$rs, 0b11100)>;
-def : InstAlias<"zip2 $rd, $rs",     (SHFLI   GPR:$rd, GPR:$rs, 0b11110)>;
-def : InstAlias<"unzip2 $rd, $rs",   (UNSHFLI GPR:$rd, GPR:$rs, 0b11110)>;
-def : InstAlias<"zip $rd, $rs",      (SHFLI   GPR:$rd, GPR:$rs, 0b11111)>;
-def : InstAlias<"unzip $rd, $rs",    (UNSHFLI GPR:$rd, GPR:$rs, 0b11111)>;
-
-def : InstAlias<"orc16.w $rd, $rs", (GORCI GPR:$rd, GPR:$rs, 0b010000)>;
-def : InstAlias<"orc8.w $rd, $rs",  (GORCI GPR:$rd, GPR:$rs, 0b011000)>;
-def : InstAlias<"orc4.w $rd, $rs",  (GORCI GPR:$rd, GPR:$rs, 0b011100)>;
-def : InstAlias<"orc2.w $rd, $rs",  (GORCI GPR:$rd, GPR:$rs, 0b011110)>;
-def : InstAlias<"orc.w $rd, $rs",   (GORCI GPR:$rd, GPR:$rs, 0b011111)>;
-def : InstAlias<"orc32 $rd, $rs",   (GORCI GPR:$rd, GPR:$rs, 0b100000)>;
-def : InstAlias<"orc16 $rd, $rs",   (GORCI GPR:$rd, GPR:$rs, 0b110000)>;
-def : InstAlias<"orc8 $rd, $rs",    (GORCI GPR:$rd, GPR:$rs, 0b111000)>;
-def : InstAlias<"orc4 $rd, $rs",    (GORCI GPR:$rd, GPR:$rs, 0b111100)>;
-def : InstAlias<"orc2 $rd, $rs",    (GORCI GPR:$rd, GPR:$rs, 0b111110)>;
-def : InstAlias<"orc $rd, $rs",     (GORCI GPR:$rd, GPR:$rs, 0b111111)>;
-} // Predicates = [HasStdExtZbp, IsRV64]
-
-let Predicates = [HasStdExtZbbOrZbp] in {
-def : InstAlias<"ror $rd, $rs1, $shamt",
-                (RORI  GPR:$rd, GPR:$rs1, uimmlog2xlen:$shamt), 0>;
-} // Predicates = [HasStdExtZbbOrZbp]
-
-let Predicates = [HasStdExtZbbOrZbp, IsRV64] in {
-def : InstAlias<"rorw $rd, $rs1, $shamt",
-                (RORIW  GPR:$rd, GPR:$rs1, uimm5:$shamt), 0>;
-} // Predicates = [HasStdExtZbbOrZbp, IsRV64]
-
-let Predicates = [HasStdExtZbp] in {
-def : InstAlias<"grev $rd, $rs1, $shamt",
-                (GREVI  GPR:$rd, GPR:$rs1, uimmlog2xlen:$shamt), 0>;
-def : InstAlias<"gorc $rd, $rs1, $shamt",
-                (GORCI  GPR:$rd, GPR:$rs1, uimmlog2xlen:$shamt), 0>;
-def : InstAlias<"shfl $rd, $rs1, $shamt",
-                (SHFLI  GPR:$rd, GPR:$rs1, shfl_uimm:$shamt), 0>;
-def : InstAlias<"unshfl $rd, $rs1, $shamt",
-                (UNSHFLI  GPR:$rd, GPR:$rs1, shfl_uimm:$shamt), 0>;
-} // Predicates = [HasStdExtZbp]
-
-let Predicates = [HasStdExtZbp, IsRV64] in {
-def : InstAlias<"grevw $rd, $rs1, $shamt",
-                (GREVIW  GPR:$rd, GPR:$rs1, uimm5:$shamt), 0>;
-def : InstAlias<"gorcw $rd, $rs1, $shamt",
-                (GORCIW  GPR:$rd, GPR:$rs1, uimm5:$shamt), 0>;
-} // Predicates = [HasStdExtZbp, IsRV64]
-
-let Predicates = [HasStdExtZbs] in {
-def : InstAlias<"bset $rd, $rs1, $shamt",
-                (BSETI  GPR:$rd, GPR:$rs1, uimmlog2xlen:$shamt), 0>;
-def : InstAlias<"bclr $rd, $rs1, $shamt",
-                (BCLRI GPR:$rd, GPR:$rs1, uimmlog2xlen:$shamt), 0>;
-def : InstAlias<"binv $rd, $rs1, $shamt",
-                (BINVI GPR:$rd, GPR:$rs1, uimmlog2xlen:$shamt), 0>;
-def : InstAlias<"bext $rd, $rs1, $shamt",
-                (BEXTI GPR:$rd, GPR:$rs1, uimmlog2xlen:$shamt), 0>;
-} // Predicates = [HasStdExtZbs]
-
-//===----------------------------------------------------------------------===//
-// Compressed Instruction patterns
-//===----------------------------------------------------------------------===//
-let Predicates = [HasStdExtZbproposedc, HasStdExtC] in {
-def : CompressPat<(XORI GPRC:$rs1, GPRC:$rs1, -1),
-                  (C_NOT GPRC:$rs1)>;
-def : CompressPat<(SUB GPRC:$rs1, X0, GPRC:$rs1),
-                  (C_NEG GPRC:$rs1)>;
-} // Predicates = [HasStdExtZbproposedc, HasStdExtC]
-
-let Predicates = [HasStdExtZbproposedc, HasStdExtZba, HasStdExtC, IsRV64] in {
-def : CompressPat<(ADDUW GPRC:$rs1, GPRC:$rs1, X0),
-                  (C_ZEXTW GPRC:$rs1)>;
-} // Predicates = [HasStdExtZbproposedc, HasStdExtC, IsRV64]
-
-//===----------------------------------------------------------------------===//
-// Codegen patterns
-//===----------------------------------------------------------------------===//
-
-let Predicates = [HasStdExtZbbOrZbp] in {
-def : Pat<(and GPR:$rs1, (not GPR:$rs2)), (ANDN GPR:$rs1, GPR:$rs2)>;
-def : Pat<(or  GPR:$rs1, (not GPR:$rs2)), (ORN  GPR:$rs1, GPR:$rs2)>;
-def : Pat<(xor GPR:$rs1, (not GPR:$rs2)), (XNOR GPR:$rs1, GPR:$rs2)>;
-} // Predicates = [HasStdExtZbbOrZbp]
-
-let Predicates = [HasStdExtZbbOrZbp] in {
-def : PatGprGpr<rotl, ROL>;
-def : PatGprGpr<rotr, ROR>;
-} // Predicates = [HasStdExtZbbOrZbp]
-
-let Predicates = [HasStdExtZbs] in {
-def : Pat<(and (not (shiftop<shl> 1, GPR:$rs2)), GPR:$rs1),
-          (BCLR GPR:$rs1, GPR:$rs2)>;
-def : Pat<(and (rotl -2, GPR:$rs2), GPR:$rs1), (BCLR GPR:$rs1, GPR:$rs2)>;
-def : Pat<(or (shiftop<shl> 1, GPR:$rs2), GPR:$rs1),
-          (BSET GPR:$rs1, GPR:$rs2)>;
-def : Pat<(xor (shiftop<shl> 1, GPR:$rs2), GPR:$rs1),
-          (BINV GPR:$rs1, GPR:$rs2)>;
-def : Pat<(and (shiftop<srl> GPR:$rs1, GPR:$rs2), 1),
-          (BEXT GPR:$rs1, GPR:$rs2)>;
-
-def : Pat<(shiftop<shl> 1, GPR:$rs2),
-          (BSET X0, GPR:$rs2)>;
-
-def : Pat<(and GPR:$rs1, BCLRMask:$mask),
-          (BCLRI GPR:$rs1, BCLRMask:$mask)>;
-def : Pat<(or GPR:$rs1, BSETINVMask:$mask),
-          (BSETI GPR:$rs1, BSETINVMask:$mask)>;
-def : Pat<(xor GPR:$rs1, BSETINVMask:$mask),
-          (BINVI GPR:$rs1, BSETINVMask:$mask)>;
-
-def : Pat<(and (srl GPR:$rs1, uimmlog2xlen:$shamt), (XLenVT 1)),
-          (BEXTI GPR:$rs1, uimmlog2xlen:$shamt)>;
-
-def : Pat<(or GPR:$r, BSETINVTwoBitsMask:$i),
-          (BSETI (BSETI GPR:$r, (TrailingZerosXForm BSETINVTwoBitsMask:$i)),
-                 (BSETINVTwoBitsMaskHigh BSETINVTwoBitsMask:$i))>;
-def : Pat<(xor GPR:$r, BSETINVTwoBitsMask:$i),
-          (BINVI (BINVI GPR:$r, (TrailingZerosXForm BSETINVTwoBitsMask:$i)),
-                 (BSETINVTwoBitsMaskHigh BSETINVTwoBitsMask:$i))>;
-def : Pat<(or GPR:$r, BSETINVORIMask:$i),
-          (BSETI (ORI GPR:$r, (BSETINVORIMaskLow BSETINVORIMask:$i)),
-                 (BSETINVTwoBitsMaskHigh BSETINVORIMask:$i))>;
-def : Pat<(xor GPR:$r, BSETINVORIMask:$i),
-          (BINVI (XORI GPR:$r, (BSETINVORIMaskLow BSETINVORIMask:$i)),
-                 (BSETINVTwoBitsMaskHigh BSETINVORIMask:$i))>;
-def : Pat<(and GPR:$r, BCLRITwoBitsMask:$i),
-          (BCLRI (BCLRI GPR:$r, (BCLRITwoBitsMaskLow BCLRITwoBitsMask:$i)),
-                 (BCLRITwoBitsMaskHigh BCLRITwoBitsMask:$i))>;
-def : Pat<(and GPR:$r, BCLRIANDIMask:$i),
-          (BCLRI (ANDI GPR:$r, (BCLRIANDIMaskLow BCLRIANDIMask:$i)),
-                 (BCLRITwoBitsMaskHigh BCLRIANDIMask:$i))>;
-}
-
-// There's no encoding for roli in the the 'B' extension as it can be
-// implemented with rori by negating the immediate.
-let Predicates = [HasStdExtZbbOrZbp] in {
-def : PatGprImm<rotr, RORI, uimmlog2xlen>;
-def : Pat<(rotl GPR:$rs1, uimmlog2xlen:$shamt),
-          (RORI GPR:$rs1, (ImmSubFromXLen uimmlog2xlen:$shamt))>;
-
-// We treat orc.b as a separate instruction, so match it directly. We also
-// lower the Zbb orc.b intrinsic to this.
-def : Pat<(riscv_gorc GPR:$rs1, 7), (ORCB GPR:$rs1)>;
-}
-
-let Predicates = [HasStdExtZbp] in {
-def : PatGprGpr<riscv_grev, GREV>;
-def : PatGprGpr<riscv_gorc, GORC>;
-def : PatGprGpr<riscv_shfl, SHFL>;
-def : PatGprGpr<riscv_unshfl, UNSHFL>;
-def : PatGprGpr<int_riscv_xperm_n, XPERMN>;
-def : PatGprGpr<int_riscv_xperm_b, XPERMB>;
-def : PatGprGpr<int_riscv_xperm_h, XPERMH>;
-def : PatGprGpr<int_riscv_xperm_w, XPERMW>;
-def : PatGprImm<riscv_shfl, SHFLI, shfl_uimm>;
-def : PatGprImm<riscv_unshfl, UNSHFLI, shfl_uimm>;
-def : PatGprImm<riscv_grev, GREVI, uimmlog2xlen>;
-def : PatGprImm<riscv_gorc, GORCI, uimmlog2xlen>;
-} // Predicates = [HasStdExtZbp]
-
-let Predicates = [HasStdExtZbp, IsRV32] in {
-def : Pat<(i32 (rotr (riscv_grev GPR:$rs1, 24), (i32 16))), (GREVI GPR:$rs1, 8)>;
-def : Pat<(i32 (rotl (riscv_grev GPR:$rs1, 24), (i32 16))), (GREVI GPR:$rs1, 8)>;
-
-// We treat rev8 as a separate instruction, so match it directly.
-def : Pat<(i32 (riscv_grev GPR:$rs1, 24)), (REV8_RV32 GPR:$rs1)>;
-} // Predicates = [HasStdExtZbp, IsRV32]
-
-let Predicates = [HasStdExtZbp, IsRV64] in {
-// We treat rev8 as a separate instruction, so match it directly.
-def : Pat<(i64 (riscv_grev GPR:$rs1, 56)), (REV8_RV64 GPR:$rs1)>;
-} // Predicates = [HasStdExtZbp, IsRV64]
-
-let Predicates = [HasStdExtZbt] in {
-def : Pat<(or (and (not GPR:$rs2), GPR:$rs3), (and GPR:$rs2, GPR:$rs1)),
-          (CMIX GPR:$rs1, GPR:$rs2, GPR:$rs3)>;
-
-def : Pat<(select (XLenVT (setne GPR:$rs2, 0)), GPR:$rs1, GPR:$rs3),
-          (CMOV GPR:$rs1, GPR:$rs2, GPR:$rs3)>;
-def : Pat<(select (XLenVT (seteq GPR:$rs2, 0)), GPR:$rs3, GPR:$rs1),
-          (CMOV GPR:$rs1, GPR:$rs2, GPR:$rs3)>;
-def : Pat<(select (XLenVT (setne GPR:$x, simm12_plus1:$y)), GPR:$rs1, GPR:$rs3),
-          (CMOV GPR:$rs1, (ADDI GPR:$x, (NegImm simm12_plus1:$y)), GPR:$rs3)>;
-def : Pat<(select (XLenVT (seteq GPR:$x, simm12_plus1:$y)), GPR:$rs3, GPR:$rs1),
-          (CMOV GPR:$rs1, (ADDI GPR:$x, (NegImm simm12_plus1:$y)), GPR:$rs3)>;
-def : Pat<(select (XLenVT (setne GPR:$x, GPR:$y)), GPR:$rs1, GPR:$rs3),
-          (CMOV GPR:$rs1, (XOR GPR:$x, GPR:$y), GPR:$rs3)>;
-def : Pat<(select (XLenVT (seteq GPR:$x, GPR:$y)), GPR:$rs3, GPR:$rs1),
-          (CMOV GPR:$rs1, (XOR GPR:$x, GPR:$y), GPR:$rs3)>;
-def : Pat<(select (XLenVT (setuge GPR:$x, GPR:$y)), GPR:$rs3, GPR:$rs1),
-          (CMOV GPR:$rs1, (SLTU GPR:$x, GPR:$y), GPR:$rs3)>;
-def : Pat<(select (XLenVT (setule GPR:$y, GPR:$x)), GPR:$rs3, GPR:$rs1),
-          (CMOV GPR:$rs1, (SLTU GPR:$x, GPR:$y), GPR:$rs3)>;
-def : Pat<(select (XLenVT (setge GPR:$x, GPR:$y)), GPR:$rs3, GPR:$rs1),
-          (CMOV GPR:$rs1, (SLT GPR:$x, GPR:$y), GPR:$rs3)>;
-def : Pat<(select (XLenVT (setle GPR:$y, GPR:$x)), GPR:$rs3, GPR:$rs1),
-          (CMOV GPR:$rs1, (SLT GPR:$x, GPR:$y), GPR:$rs3)>;
-def : Pat<(select GPR:$rs2, GPR:$rs1, GPR:$rs3),
-          (CMOV GPR:$rs1, GPR:$rs2, GPR:$rs3)>;
-} // Predicates = [HasStdExtZbt]
-
-// fshl and fshr concatenate their operands in the same order. fsr and fsl
-// instruction use different orders. fshl will return its first operand for
-// shift of zero, fshr will return its second operand. fsl and fsr both return
-// $rs1 so the patterns need to have different operand orders.
-let Predicates = [HasStdExtZbt] in {
-def : Pat<(riscv_fsl GPR:$rs1, GPR:$rs3, GPR:$rs2),
-          (FSL GPR:$rs1, GPR:$rs2, GPR:$rs3)>;
-def : Pat<(riscv_fsr GPR:$rs3, GPR:$rs1, GPR:$rs2),
-          (FSR GPR:$rs1, GPR:$rs2, GPR:$rs3)>;
-
-def : Pat<(fshr GPR:$rs3, GPR:$rs1, uimmlog2xlen:$shamt),
-          (FSRI GPR:$rs1, GPR:$rs3, uimmlog2xlen:$shamt)>;
-// We can use FSRI for fshl by immediate if we subtract the immediate from
-// XLen and swap the operands.
-def : Pat<(fshl GPR:$rs3, GPR:$rs1, uimmlog2xlen:$shamt),
-          (FSRI GPR:$rs1, GPR:$rs3, (ImmSubFromXLen uimmlog2xlen:$shamt))>;
-} // Predicates = [HasStdExtZbt]
-
-let Predicates = [HasStdExtZbb] in {
-def : PatGpr<ctlz, CLZ>;
-def : PatGpr<cttz, CTZ>;
-def : PatGpr<ctpop, CPOP>;
-} // Predicates = [HasStdExtZbb]
-
-let Predicates = [HasStdExtZbb] in {
-def : Pat<(sext_inreg GPR:$rs1, i8), (SEXTB GPR:$rs1)>;
-def : Pat<(sext_inreg GPR:$rs1, i16), (SEXTH GPR:$rs1)>;
-}
-
-let Predicates = [HasStdExtZbb] in {
-def : PatGprGpr<smin, MIN>;
-def : PatGprGpr<smax, MAX>;
-def : PatGprGpr<umin, MINU>;
-def : PatGprGpr<umax, MAXU>;
-} // Predicates = [HasStdExtZbb]
-
-let Predicates = [HasStdExtZbb, IsRV32] in {
-def : Pat<(i32 (bswap GPR:$rs1)), (REV8_RV32 GPR:$rs1)>;
-} // Predicates = [HasStdExtZbb, IsRV32]
-
-let Predicates = [HasStdExtZbb, IsRV64] in {
-def : Pat<(i64 (bswap GPR:$rs1)), (REV8_RV64 GPR:$rs1)>;
-} // Predicates = [HasStdExtZbb, IsRV64]
-
-let Predicates = [HasStdExtZbp, IsRV32] in {
-def : Pat<(i32 (or (and GPR:$rs1, 0x0000FFFF), (shl GPR:$rs2, (i32 16)))),
-          (PACK GPR:$rs1, GPR:$rs2)>;
-def : Pat<(i32 (or (and GPR:$rs2, 0xFFFF0000), (srl GPR:$rs1, (i32 16)))),
-          (PACKU GPR:$rs1, GPR:$rs2)>;
-
-}
-let Predicates = [HasStdExtZbp, IsRV64] in {
-def : Pat<(i64 (or (and GPR:$rs1, 0x00000000FFFFFFFF), (shl GPR:$rs2, (i64 32)))),
-          (PACK GPR:$rs1, GPR:$rs2)>;
-def : Pat<(i64 (or (and GPR:$rs2, 0xFFFFFFFF00000000), (srl GPR:$rs1, (i64 32)))),
-          (PACKU GPR:$rs1, GPR:$rs2)>;
-}
-let Predicates = [HasStdExtZbp] in
-def : Pat<(or (and (shl GPR:$rs2, (XLenVT 8)), 0xFFFF),
-              (and GPR:$rs1, 0x00FF)),
-          (PACKH GPR:$rs1, GPR:$rs2)>;
-
-let Predicates = [HasStdExtZbbOrZbp, IsRV32] in
-def : Pat<(i32 (and GPR:$rs, 0xFFFF)), (ZEXTH_RV32 GPR:$rs)>;
-let Predicates = [HasStdExtZbbOrZbp, IsRV64] in
-def : Pat<(i64 (and GPR:$rs, 0xFFFF)), (ZEXTH_RV64 GPR:$rs)>;
-
-// Pattern to exclude simm12 immediates from matching.
-def non_imm12 : PatLeaf<(XLenVT GPR:$a), [{
-  auto *C = dyn_cast<ConstantSDNode>(N);
-  return !C || !isInt<12>(C->getSExtValue());
-}]>;
-
-let Predicates = [HasStdExtZba] in {
-def : Pat<(add (shl GPR:$rs1, (XLenVT 1)), non_imm12:$rs2),
-          (SH1ADD GPR:$rs1, GPR:$rs2)>;
-def : Pat<(add (shl GPR:$rs1, (XLenVT 2)), non_imm12:$rs2),
-          (SH2ADD GPR:$rs1, GPR:$rs2)>;
-def : Pat<(add (shl GPR:$rs1, (XLenVT 3)), non_imm12:$rs2),
-          (SH3ADD GPR:$rs1, GPR:$rs2)>;
-
-def : Pat<(add (mul_oneuse GPR:$rs1, (XLenVT 6)), GPR:$rs2),
-          (SH1ADD (SH1ADD GPR:$rs1, GPR:$rs1), GPR:$rs2)>;
-def : Pat<(add (mul_oneuse GPR:$rs1, (XLenVT 10)), GPR:$rs2),
-          (SH1ADD (SH2ADD GPR:$rs1, GPR:$rs1), GPR:$rs2)>;
-def : Pat<(add (mul_oneuse GPR:$rs1, (XLenVT 18)), GPR:$rs2),
-          (SH1ADD (SH3ADD GPR:$rs1, GPR:$rs1), GPR:$rs2)>;
-def : Pat<(add (mul_oneuse GPR:$rs1, (XLenVT 12)), GPR:$rs2),
-          (SH2ADD (SH1ADD GPR:$rs1, GPR:$rs1), GPR:$rs2)>;
-def : Pat<(add (mul_oneuse GPR:$rs1, (XLenVT 20)), GPR:$rs2),
-          (SH2ADD (SH2ADD GPR:$rs1, GPR:$rs1), GPR:$rs2)>;
-def : Pat<(add (mul_oneuse GPR:$rs1, (XLenVT 36)), GPR:$rs2),
-          (SH2ADD (SH3ADD GPR:$rs1, GPR:$rs1), GPR:$rs2)>;
-def : Pat<(add (mul_oneuse GPR:$rs1, (XLenVT 24)), GPR:$rs2),
-          (SH3ADD (SH1ADD GPR:$rs1, GPR:$rs1), GPR:$rs2)>;
-def : Pat<(add (mul_oneuse GPR:$rs1, (XLenVT 40)), GPR:$rs2),
-          (SH3ADD (SH2ADD GPR:$rs1, GPR:$rs1), GPR:$rs2)>;
-def : Pat<(add (mul_oneuse GPR:$rs1, (XLenVT 72)), GPR:$rs2),
-          (SH3ADD (SH3ADD GPR:$rs1, GPR:$rs1), GPR:$rs2)>;
-
-def : Pat<(mul GPR:$r, C3LeftShift:$i),
-          (SLLI (SH1ADD GPR:$r, GPR:$r),
-                (TrailingZerosXForm C3LeftShift:$i))>;
-def : Pat<(mul GPR:$r, C5LeftShift:$i),
-          (SLLI (SH2ADD GPR:$r, GPR:$r),
-                (TrailingZerosXForm C5LeftShift:$i))>;
-def : Pat<(mul GPR:$r, C9LeftShift:$i),
-          (SLLI (SH3ADD GPR:$r, GPR:$r),
-                (TrailingZerosXForm C9LeftShift:$i))>;
-} // Predicates = [HasStdExtZba]
-
-let Predicates = [HasStdExtZba, IsRV64] in {
-def : Pat<(i64 (shl (and GPR:$rs1, 0xFFFFFFFF), uimm5:$shamt)),
-          (SLLIUW GPR:$rs1, uimm5:$shamt)>;
-def : Pat<(i64 (add (and GPR:$rs1, 0xFFFFFFFF), non_imm12:$rs2)),
-          (ADDUW GPR:$rs1, GPR:$rs2)>;
-def : Pat<(i64 (and GPR:$rs, 0xFFFFFFFF)), (ADDUW GPR:$rs, X0)>;
-
-def : Pat<(i64 (add (shl (and GPR:$rs1, 0xFFFFFFFF), (i64 1)), non_imm12:$rs2)),
-          (SH1ADDUW GPR:$rs1, GPR:$rs2)>;
-def : Pat<(i64 (add (shl (and GPR:$rs1, 0xFFFFFFFF), (i64 2)), non_imm12:$rs2)),
-          (SH2ADDUW GPR:$rs1, GPR:$rs2)>;
-def : Pat<(i64 (add (shl (and GPR:$rs1, 0xFFFFFFFF), (i64 3)), non_imm12:$rs2)),
-          (SH3ADDUW GPR:$rs1, GPR:$rs2)>;
-
-def : Pat<(i64 (add (and (shl GPR:$rs1, (i64 1)), 0x1FFFFFFFF), non_imm12:$rs2)),
-          (SH1ADDUW GPR:$rs1, GPR:$rs2)>;
-def : Pat<(i64 (add (and (shl GPR:$rs1, (i64 2)), 0x3FFFFFFFF), non_imm12:$rs2)),
-          (SH2ADDUW GPR:$rs1, GPR:$rs2)>;
-def : Pat<(i64 (add (and (shl GPR:$rs1, (i64 3)), 0x7FFFFFFFF), non_imm12:$rs2)),
-          (SH3ADDUW GPR:$rs1, GPR:$rs2)>;
-} // Predicates = [HasStdExtZba, IsRV64]
-
-let Predicates = [HasStdExtZbbOrZbp, IsRV64] in {
-def : PatGprGpr<riscv_rolw, ROLW>;
-def : PatGprGpr<riscv_rorw, RORW>;
-def : PatGprImm<riscv_rorw, RORIW, uimm5>;
-def : Pat<(riscv_rolw GPR:$rs1, uimm5:$rs2),
-          (RORIW GPR:$rs1, (ImmSubFrom32 uimm5:$rs2))>;
-} // Predicates = [HasStdExtZbbOrZbp, IsRV64]
-
-let Predicates = [HasStdExtZbp, IsRV64] in {
-def : Pat<(riscv_rorw (riscv_grevw GPR:$rs1, 24), 16), (GREVIW GPR:$rs1, 8)>;
-def : Pat<(riscv_rolw (riscv_grevw GPR:$rs1, 24), 16), (GREVIW GPR:$rs1, 8)>;
-def : PatGprGpr<riscv_grevw, GREVW>;
-def : PatGprGpr<riscv_gorcw, GORCW>;
-def : PatGprGpr<riscv_shflw, SHFLW>;
-def : PatGprGpr<riscv_unshflw, UNSHFLW>;
-def : PatGprImm<riscv_grevw, GREVIW, uimm5>;
-def : PatGprImm<riscv_gorcw, GORCIW, uimm5>;
-} // Predicates = [HasStdExtZbp, IsRV64]
-
-let Predicates = [HasStdExtZbt, IsRV64] in {
-def : Pat<(riscv_fslw GPR:$rs1, GPR:$rs3, GPR:$rs2),
-          (FSLW GPR:$rs1, GPR:$rs2, GPR:$rs3)>;
-def : Pat<(riscv_fsrw GPR:$rs3, GPR:$rs1, GPR:$rs2),
-          (FSRW GPR:$rs1, GPR:$rs2, GPR:$rs3)>;
-def : Pat<(riscv_fsrw GPR:$rs3, GPR:$rs1, uimm5:$shamt),
-          (FSRIW GPR:$rs1, GPR:$rs3, uimm5:$shamt)>;
-def : Pat<(riscv_fslw GPR:$rs3, GPR:$rs1, uimm5:$shamt),
-          (FSRIW GPR:$rs1, GPR:$rs3, (ImmSubFrom32 uimm5:$shamt))>;
-} // Predicates = [HasStdExtZbt, IsRV64]
-
-let Predicates = [HasStdExtZbb, IsRV64] in {
-def : PatGpr<riscv_clzw, CLZW>;
-def : PatGpr<riscv_ctzw, CTZW>;
-def : Pat<(i64 (ctpop (i64 (zexti32 (i64 GPR:$rs1))))), (CPOPW GPR:$rs1)>;
-} // Predicates = [HasStdExtZbb, IsRV64]
-
-let Predicates = [HasStdExtZbp, IsRV64] in {
-def : Pat<(i64 (sext_inreg (or (shl GPR:$rs2, (i64 16)),
-                               (and GPR:$rs1, 0x000000000000FFFF)),
-                           i32)),
-          (PACKW GPR:$rs1, GPR:$rs2)>;
-def : Pat<(i64 (or (and (assertsexti32 GPR:$rs2), 0xFFFFFFFFFFFF0000),
-                   (srl (and GPR:$rs1, 0xFFFFFFFF), (i64 16)))),
-          (PACKUW GPR:$rs1, GPR:$rs2)>;
-} // Predicates = [HasStdExtZbp, IsRV64]
-
-let Predicates = [HasStdExtZbc] in {
-def : PatGprGpr<int_riscv_clmul, CLMUL>;
-def : PatGprGpr<int_riscv_clmulh, CLMULH>;
-def : PatGprGpr<int_riscv_clmulr, CLMULR>;
-} // Predicates = [HasStdExtZbc]
-
-let Predicates = [HasStdExtZbe] in {
-def : PatGprGpr<riscv_bcompress, BCOMPRESS>;
-def : PatGprGpr<riscv_bdecompress, BDECOMPRESS>;
-} // Predicates = [HasStdExtZbe]
-
-let Predicates = [HasStdExtZbe, IsRV64] in {
-def : PatGprGpr<riscv_bcompressw, BCOMPRESSW>;
-def : PatGprGpr<riscv_bdecompressw, BDECOMPRESSW>;
-} // Predicates = [HasStdExtZbe, IsRV64]
-
-let Predicates = [HasStdExtZbr] in {
-def : PatGpr<int_riscv_crc32_b, CRC32B>;
-def : PatGpr<int_riscv_crc32_h, CRC32H>;
-def : PatGpr<int_riscv_crc32_w, CRC32W>;
-def : PatGpr<int_riscv_crc32c_b, CRC32CB>;
-def : PatGpr<int_riscv_crc32c_h, CRC32CH>;
-def : PatGpr<int_riscv_crc32c_w, CRC32CW>;
-} // Predicates = [HasStdExtZbr]
-
-let Predicates = [HasStdExtZbr, IsRV64] in {
-def : PatGpr<int_riscv_crc32_d, CRC32D>;
-def : PatGpr<int_riscv_crc32c_d, CRC32CD>;
-} // Predicates = [HasStdExtZbr, IsRV64]
diff --git a/gnu/llvm/llvm/lib/Target/RISCV/RISCVInstructionSelector.cpp b/gnu/llvm/llvm/lib/Target/RISCV/RISCVInstructionSelector.cpp
deleted file mode 100644
index 4d1f47da209..00000000000
--- a/gnu/llvm/llvm/lib/Target/RISCV/RISCVInstructionSelector.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-//===-- RISCVInstructionSelector.cpp -----------------------------*- C++ -*-==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-/// \file
-/// This file implements the targeting of the InstructionSelector class for
-/// RISCV.
-/// \todo This should be generated by TableGen.
-//===----------------------------------------------------------------------===//
-
-#include "RISCVRegisterBankInfo.h"
-#include "RISCVSubtarget.h"
-#include "RISCVTargetMachine.h"
-#include "llvm/CodeGen/GlobalISel/InstructionSelector.h"
-#include "llvm/CodeGen/GlobalISel/InstructionSelectorImpl.h"
-#include "llvm/IR/IntrinsicsRISCV.h"
-#include "llvm/Support/Debug.h"
-
-#define DEBUG_TYPE "riscv-isel"
-
-using namespace llvm;
-
-#define GET_GLOBALISEL_PREDICATE_BITSET
-#include "RISCVGenGlobalISel.inc"
-#undef GET_GLOBALISEL_PREDICATE_BITSET
-
-namespace {
-
-class RISCVInstructionSelector : public InstructionSelector {
-public:
-  RISCVInstructionSelector(const RISCVTargetMachine &TM,
-                           const RISCVSubtarget &STI,
-                           const RISCVRegisterBankInfo &RBI);
-
-  bool select(MachineInstr &I) override;
-  static const char *getName() { return DEBUG_TYPE; }
-
-private:
-  bool selectImpl(MachineInstr &I, CodeGenCoverage &CoverageInfo) const;
-
-  const RISCVSubtarget &STI;
-  const RISCVInstrInfo &TII;
-  const RISCVRegisterInfo &TRI;
-  const RISCVRegisterBankInfo &RBI;
-
-  // FIXME: This is necessary because DAGISel uses "Subtarget->" and GlobalISel
-  // uses "STI." in the code generated by TableGen. We need to unify the name of
-  // Subtarget variable.
-  const RISCVSubtarget *Subtarget = &STI;
-
-#define GET_GLOBALISEL_PREDICATES_DECL
-#include "RISCVGenGlobalISel.inc"
-#undef GET_GLOBALISEL_PREDICATES_DECL
-
-#define GET_GLOBALISEL_TEMPORARIES_DECL
-#include "RISCVGenGlobalISel.inc"
-#undef GET_GLOBALISEL_TEMPORARIES_DECL
-};
-
-} // end anonymous namespace
-
-#define GET_GLOBALISEL_IMPL
-#include "RISCVGenGlobalISel.inc"
-#undef GET_GLOBALISEL_IMPL
-
-RISCVInstructionSelector::RISCVInstructionSelector(
-    const RISCVTargetMachine &TM, const RISCVSubtarget &STI,
-    const RISCVRegisterBankInfo &RBI)
-    : InstructionSelector(), STI(STI), TII(*STI.getInstrInfo()),
-      TRI(*STI.getRegisterInfo()), RBI(RBI),
-
-#define GET_GLOBALISEL_PREDICATES_INIT
-#include "RISCVGenGlobalISel.inc"
-#undef GET_GLOBALISEL_PREDICATES_INIT
-#define GET_GLOBALISEL_TEMPORARIES_INIT
-#include "RISCVGenGlobalISel.inc"
-#undef GET_GLOBALISEL_TEMPORARIES_INIT
-{
-}
-
-bool RISCVInstructionSelector::select(MachineInstr &I) {
-
-  if (!isPreISelGenericOpcode(I.getOpcode())) {
-    // Certain non-generic instructions also need some special handling.
-    return true;
-  }
-
-  if (selectImpl(I, *CoverageInfo))
-    return true;
-
-  return false;
-}
-
-namespace llvm {
-InstructionSelector *
-createRISCVInstructionSelector(const RISCVTargetMachine &TM,
-                               RISCVSubtarget &Subtarget,
-                               RISCVRegisterBankInfo &RBI) {
-  return new RISCVInstructionSelector(TM, Subtarget, RBI);
-}
-} // end namespace llvm
diff --git a/gnu/llvm/llvm/lib/Target/RISCV/RISCVLegalizerInfo.cpp b/gnu/llvm/llvm/lib/Target/RISCV/RISCVLegalizerInfo.cpp
deleted file mode 100644
index f6256defe5d..00000000000
--- a/gnu/llvm/llvm/lib/Target/RISCV/RISCVLegalizerInfo.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-//===-- RISCVLegalizerInfo.cpp ----------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-/// \file
-/// This file implements the targeting of the Machinelegalizer class for RISCV.
-/// \todo This should be generated by TableGen.
-//===----------------------------------------------------------------------===//
-
-#include "RISCVLegalizerInfo.h"
-#include "llvm/CodeGen/TargetOpcodes.h"
-#include "llvm/CodeGen/ValueTypes.h"
-#include "llvm/IR/DerivedTypes.h"
-#include "llvm/IR/Type.h"
-
-using namespace llvm;
-
-RISCVLegalizerInfo::RISCVLegalizerInfo(const RISCVSubtarget &ST) {
-  getLegacyLegalizerInfo().computeTables();
-}
diff --git a/gnu/llvm/llvm/lib/Target/RISCV/RISCVLegalizerInfo.h b/gnu/llvm/llvm/lib/Target/RISCV/RISCVLegalizerInfo.h
deleted file mode 100644
index f2c2b9a3fd4..00000000000
--- a/gnu/llvm/llvm/lib/Target/RISCV/RISCVLegalizerInfo.h
+++ /dev/null
@@ -1,28 +0,0 @@
-//===-- RISCVLegalizerInfo.h ------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-/// \file
-/// This file declares the targeting of the Machinelegalizer class for RISCV.
-/// \todo This should be generated by TableGen.
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_LIB_TARGET_RISCV_RISCVMACHINELEGALIZER_H
-#define LLVM_LIB_TARGET_RISCV_RISCVMACHINELEGALIZER_H
-
-#include "llvm/CodeGen/GlobalISel/LegalizerInfo.h"
-
-namespace llvm {
-
-class RISCVSubtarget;
-
-/// This class provides the information for the target register banks.
-class RISCVLegalizerInfo : public LegalizerInfo {
-public:
-  RISCVLegalizerInfo(const RISCVSubtarget &ST);
-};
-} // end namespace llvm
-#endif
diff --git a/gnu/llvm/llvm/lib/Target/RISCV/RISCVRegisterBankInfo.cpp b/gnu/llvm/llvm/lib/Target/RISCV/RISCVRegisterBankInfo.cpp
deleted file mode 100644
index bd3b95a98b9..00000000000
--- a/gnu/llvm/llvm/lib/Target/RISCV/RISCVRegisterBankInfo.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-//===-- RISCVRegisterBankInfo.cpp -------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-/// \file
-/// This file implements the targeting of the RegisterBankInfo class for RISCV.
-/// \todo This should be generated by TableGen.
-//===----------------------------------------------------------------------===//
-
-#include "RISCVRegisterBankInfo.h"
-#include "MCTargetDesc/RISCVMCTargetDesc.h"
-#include "llvm/CodeGen/GlobalISel/RegisterBank.h"
-#include "llvm/CodeGen/GlobalISel/RegisterBankInfo.h"
-#include "llvm/CodeGen/MachineRegisterInfo.h"
-#include "llvm/CodeGen/TargetRegisterInfo.h"
-
-#define GET_TARGET_REGBANK_IMPL
-#include "RISCVGenRegisterBank.inc"
-
-using namespace llvm;
-
-RISCVRegisterBankInfo::RISCVRegisterBankInfo(const TargetRegisterInfo &TRI)
-    : RISCVGenRegisterBankInfo() {}
diff --git a/gnu/llvm/llvm/lib/Target/RISCV/RISCVRegisterBankInfo.h b/gnu/llvm/llvm/lib/Target/RISCV/RISCVRegisterBankInfo.h
deleted file mode 100644
index 05fac992734..00000000000
--- a/gnu/llvm/llvm/lib/Target/RISCV/RISCVRegisterBankInfo.h
+++ /dev/null
@@ -1,37 +0,0 @@
-//===-- RISCVRegisterBankInfo.h ---------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-/// \file
-/// This file declares the targeting of the RegisterBankInfo class for RISCV.
-/// \todo This should be generated by TableGen.
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_LIB_TARGET_RISCV_RISCVREGISTERBANKINFO_H
-#define LLVM_LIB_TARGET_RISCV_RISCVREGISTERBANKINFO_H
-
-#include "llvm/CodeGen/GlobalISel/RegisterBankInfo.h"
-
-#define GET_REGBANK_DECLARATIONS
-#include "RISCVGenRegisterBank.inc"
-
-namespace llvm {
-
-class TargetRegisterInfo;
-
-class RISCVGenRegisterBankInfo : public RegisterBankInfo {
-protected:
-#define GET_TARGET_REGBANK_CLASS
-#include "RISCVGenRegisterBank.inc"
-};
-
-/// This class provides the information for the target register banks.
-class RISCVRegisterBankInfo final : public RISCVGenRegisterBankInfo {
-public:
-  RISCVRegisterBankInfo(const TargetRegisterInfo &TRI);
-};
-} // end namespace llvm
-#endif
diff --git a/gnu/llvm/llvm/lib/Target/RISCV/RISCVRegisterBanks.td b/gnu/llvm/llvm/lib/Target/RISCV/RISCVRegisterBanks.td
deleted file mode 100644
index 400b65a1bf9..00000000000
--- a/gnu/llvm/llvm/lib/Target/RISCV/RISCVRegisterBanks.td
+++ /dev/null
@@ -1,13 +0,0 @@
-//=-- RISCVRegisterBank.td - Describe the RISCV Banks --------*- tablegen -*-=//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-//
-//===----------------------------------------------------------------------===//
-
-/// General Purpose Registers: X.
-def GPRRegBank : RegisterBank<"GPRB", [GPR]>;
diff --git a/gnu/llvm/llvm/lib/Target/RISCV/RISCVScheduleB.td b/gnu/llvm/llvm/lib/Target/RISCV/RISCVScheduleB.td
deleted file mode 100644
index b668b0acd71..00000000000
--- a/gnu/llvm/llvm/lib/Target/RISCV/RISCVScheduleB.td
+++ /dev/null
@@ -1,89 +0,0 @@
-//===-- RISCVScheduleB.td - RISCV Scheduling Definitions B -*- tablegen -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-/// Define scheduler resources associated with def operands.
-
-// Zba extension
-def WriteSHXADD      : SchedWrite; // sh1add/sh2add/sh3add
-def WriteSHXADD32    : SchedWrite; // sh1add.uw/sh2add.uw/sh3add.uw
-
-// Zbb extension
-def WriteRotateImm   : SchedWrite;
-def WriteRotateImm32 : SchedWrite;
-def WriteRotateReg   : SchedWrite;
-def WriteRotateReg32 : SchedWrite;
-def WriteCLZ         : SchedWrite;
-def WriteCLZ32       : SchedWrite;
-def WriteCTZ         : SchedWrite;
-def WriteCTZ32       : SchedWrite;
-def WriteCPOP        : SchedWrite;
-def WriteCPOP32      : SchedWrite;
-def WriteREV8        : SchedWrite;
-def WriteORCB        : SchedWrite;
-
-/// Define scheduler resources associated with use operands.
-
-// Zba extension
-def ReadSHXADD      : SchedRead; // sh1add/sh2add/sh3add
-def ReadSHXADD32    : SchedRead; // sh1add.uw/sh2add.uw/sh3add.uw
-
-// Zbb extension
-def ReadRotateImm   : SchedRead;
-def ReadRotateImm32 : SchedRead;
-def ReadRotateReg   : SchedRead;
-def ReadRotateReg32 : SchedRead;
-def ReadCLZ         : SchedRead;
-def ReadCLZ32       : SchedRead;
-def ReadCTZ         : SchedRead;
-def ReadCTZ32       : SchedRead;
-def ReadCPOP        : SchedRead;
-def ReadCPOP32      : SchedRead;
-def ReadREV8        : SchedRead;
-def ReadORCB        : SchedRead;
-
-/// Define default scheduler resources for B.
-
-multiclass UnsupportedSchedZba {
-let Unsupported = true in {
-def : WriteRes<WriteSHXADD, []>;
-def : WriteRes<WriteSHXADD32, []>;
-
-def : ReadAdvance<ReadSHXADD, 0>;
-def : ReadAdvance<ReadSHXADD32, 0>;
-}
-}
-
-multiclass UnsupportedSchedZbb {
-let Unsupported = true in {
-def : WriteRes<WriteRotateImm, []>;
-def : WriteRes<WriteRotateImm32, []>;
-def : WriteRes<WriteRotateReg, []>;
-def : WriteRes<WriteRotateReg32, []>;
-def : WriteRes<WriteCLZ, []>;
-def : WriteRes<WriteCLZ32, []>;
-def : WriteRes<WriteCTZ, []>;
-def : WriteRes<WriteCTZ32, []>;
-def : WriteRes<WriteCPOP, []>;
-def : WriteRes<WriteCPOP32, []>;
-def : WriteRes<WriteREV8, []>;
-def : WriteRes<WriteORCB, []>;
-
-def : ReadAdvance<ReadRotateImm, 0>;
-def : ReadAdvance<ReadRotateImm32, 0>;
-def : ReadAdvance<ReadRotateReg, 0>;
-def : ReadAdvance<ReadRotateReg32, 0>;
-def : ReadAdvance<ReadCLZ, 0>;
-def : ReadAdvance<ReadCLZ32, 0>;
-def : ReadAdvance<ReadCTZ, 0>;
-def : ReadAdvance<ReadCTZ32, 0>;
-def : ReadAdvance<ReadCPOP, 0>;
-def : ReadAdvance<ReadCPOP32, 0>;
-def : ReadAdvance<ReadREV8, 0>;
-def : ReadAdvance<ReadORCB, 0>;
-}
-}
diff --git a/gnu/llvm/llvm/lib/Target/Sparc/SparcISelLowering.cpp b/gnu/llvm/llvm/lib/Target/Sparc/SparcISelLowering.cpp
index 747f1b568a7..913f133465b 100644
--- a/gnu/llvm/llvm/lib/Target/Sparc/SparcISelLowering.cpp
+++ b/gnu/llvm/llvm/lib/Target/Sparc/SparcISelLowering.cpp
@@ -25,6 +25,7 @@
 #include "llvm/CodeGen/MachineInstrBuilder.h"
 #include "llvm/CodeGen/MachineRegisterInfo.h"
 #include "llvm/CodeGen/SelectionDAG.h"
+#include "llvm/CodeGen/SelectionDAGNodes.h"
 #include "llvm/CodeGen/TargetLoweringObjectFileImpl.h"
 #include "llvm/IR/DerivedTypes.h"
 #include "llvm/IR/Function.h"
@@ -101,9 +102,9 @@ static bool CC_Sparc_Assign_Ret_Split_64(unsigned &ValNo, MVT &ValVT,
 }
 
 // Allocate a full-sized argument for the 64-bit ABI.
-static bool CC_Sparc64_Full(unsigned &ValNo, MVT &ValVT,
-                            MVT &LocVT, CCValAssign::LocInfo &LocInfo,
-                            ISD::ArgFlagsTy &ArgFlags, CCState &State) {
+static bool Analyze_CC_Sparc64_Full(bool IsReturn, unsigned &ValNo, MVT &ValVT,
+                                    MVT &LocVT, CCValAssign::LocInfo &LocInfo,
+                                    ISD::ArgFlagsTy &ArgFlags, CCState &State) {
   assert((LocVT == MVT::f32 || LocVT == MVT::f128
           || LocVT.getSizeInBits() == 64) &&
          "Can't handle non-64 bits locations");
@@ -133,6 +134,11 @@ static bool CC_Sparc64_Full(unsigned &ValNo, MVT &ValVT,
     return true;
   }
 
+  // Bail out if this is a return CC and we run out of registers to place
+  // values into.
+  if (IsReturn)
+    return false;
+
   // This argument goes on the stack in an 8-byte slot.
   // When passing floats, LocVT is smaller than 8 bytes. Adjust the offset to
   // the right-aligned float. The first 4 bytes of the stack slot are undefined.
@@ -146,9 +152,9 @@ static bool CC_Sparc64_Full(unsigned &ValNo, MVT &ValVT,
 // Allocate a half-sized argument for the 64-bit ABI.
 //
 // This is used when passing { float, int } structs by value in registers.
-static bool CC_Sparc64_Half(unsigned &ValNo, MVT &ValVT,
-                            MVT &LocVT, CCValAssign::LocInfo &LocInfo,
-                            ISD::ArgFlagsTy &ArgFlags, CCState &State) {
+static bool Analyze_CC_Sparc64_Half(bool IsReturn, unsigned &ValNo, MVT &ValVT,
+                                    MVT &LocVT, CCValAssign::LocInfo &LocInfo,
+                                    ISD::ArgFlagsTy &ArgFlags, CCState &State) {
   assert(LocVT.getSizeInBits() == 32 && "Can't handle non-32 bits locations");
   unsigned Offset = State.AllocateStack(4, Align(4));
 
@@ -174,10 +180,43 @@ static bool CC_Sparc64_Half(unsigned &ValNo, MVT &ValVT,
     return true;
   }
 
+  // Bail out if this is a return CC and we run out of registers to place
+  // values into.
+  if (IsReturn)
+    return false;
+
   State.addLoc(CCValAssign::getMem(ValNo, ValVT, Offset, LocVT, LocInfo));
   return true;
 }
 
+static bool CC_Sparc64_Full(unsigned &ValNo, MVT &ValVT, MVT &LocVT,
+                            CCValAssign::LocInfo &LocInfo,
+                            ISD::ArgFlagsTy &ArgFlags, CCState &State) {
+  return Analyze_CC_Sparc64_Full(false, ValNo, ValVT, LocVT, LocInfo, ArgFlags,
+                                 State);
+}
+
+static bool CC_Sparc64_Half(unsigned &ValNo, MVT &ValVT, MVT &LocVT,
+                            CCValAssign::LocInfo &LocInfo,
+                            ISD::ArgFlagsTy &ArgFlags, CCState &State) {
+  return Analyze_CC_Sparc64_Half(false, ValNo, ValVT, LocVT, LocInfo, ArgFlags,
+                                 State);
+}
+
+static bool RetCC_Sparc64_Full(unsigned &ValNo, MVT &ValVT, MVT &LocVT,
+                               CCValAssign::LocInfo &LocInfo,
+                               ISD::ArgFlagsTy &ArgFlags, CCState &State) {
+  return Analyze_CC_Sparc64_Full(true, ValNo, ValVT, LocVT, LocInfo, ArgFlags,
+                                 State);
+}
+
+static bool RetCC_Sparc64_Half(unsigned &ValNo, MVT &ValVT, MVT &LocVT,
+                               CCValAssign::LocInfo &LocInfo,
+                               ISD::ArgFlagsTy &ArgFlags, CCState &State) {
+  return Analyze_CC_Sparc64_Half(true, ValNo, ValVT, LocVT, LocInfo, ArgFlags,
+                                 State);
+}
+
 #include "SparcGenCallingConv.inc"
 
 // The calling conventions in SparcCallingConv.td are described in terms of the
@@ -191,6 +230,15 @@ static unsigned toCallerWindow(unsigned Reg) {
   return Reg;
 }
 
+bool SparcTargetLowering::CanLowerReturn(
+    CallingConv::ID CallConv, MachineFunction &MF, bool isVarArg,
+    const SmallVectorImpl<ISD::OutputArg> &Outs, LLVMContext &Context) const {
+  SmallVector<CCValAssign, 16> RVLocs;
+  CCState CCInfo(CallConv, isVarArg, MF, RVLocs, Context);
+  return CCInfo.CheckReturn(Outs, Subtarget->is64Bit() ? RetCC_Sparc64
+                                                       : RetCC_Sparc32);
+}
+
 SDValue
 SparcTargetLowering::LowerReturn(SDValue Chain, CallingConv::ID CallConv,
                                  bool IsVarArg,
@@ -710,6 +758,39 @@ static bool hasReturnsTwiceAttr(SelectionDAG &DAG, SDValue Callee,
   return CalleeFn->hasFnAttribute(Attribute::ReturnsTwice);
 }
 
+/// IsEligibleForTailCallOptimization - Check whether the call is eligible
+/// for tail call optimization.
+bool SparcTargetLowering::IsEligibleForTailCallOptimization(
+    CCState &CCInfo, CallLoweringInfo &CLI, MachineFunction &MF) const {
+
+  auto &Outs = CLI.Outs;
+  auto &Caller = MF.getFunction();
+
+  // Do not tail call opt functions with "disable-tail-calls" attribute.
+  if (Caller.getFnAttribute("disable-tail-calls").getValueAsString() == "true")
+    return false;
+
+  // Do not tail call opt if the stack is used to pass parameters.
+  // 64-bit targets have a slightly higher limit since the ABI requires
+  // to allocate some space even when all the parameters fit inside registers.
+  unsigned StackOffsetLimit = Subtarget->is64Bit() ? 48 : 0;
+  if (CCInfo.getNextStackOffset() > StackOffsetLimit)
+    return false;
+
+  // Do not tail call opt if either the callee or caller returns
+  // a struct and the other does not.
+  if (!Outs.empty() && Caller.hasStructRetAttr() != Outs[0].Flags.isSRet())
+    return false;
+
+  // Byval parameters hand the function a pointer directly into the stack area
+  // we want to reuse during a tail call.
+  for (auto &Arg : Outs)
+    if (Arg.Flags.isByVal())
+      return false;
+
+  return true;
+}
+
 // Lower a call for the 32-bit ABI.
 SDValue
 SparcTargetLowering::LowerCall_32(TargetLowering::CallLoweringInfo &CLI,
@@ -725,15 +806,15 @@ SparcTargetLowering::LowerCall_32(TargetLowering::CallLoweringInfo &CLI,
   CallingConv::ID CallConv              = CLI.CallConv;
   bool isVarArg                         = CLI.IsVarArg;
 
-  // Sparc target does not yet support tail call optimization.
-  isTailCall = false;
-
   // Analyze operands of the call, assigning locations to each operand.
   SmallVector<CCValAssign, 16> ArgLocs;
   CCState CCInfo(CallConv, isVarArg, DAG.getMachineFunction(), ArgLocs,
                  *DAG.getContext());
   CCInfo.AnalyzeCallOperands(Outs, CC_Sparc32);
 
+  isTailCall = isTailCall && IsEligibleForTailCallOptimization(
+                                 CCInfo, CLI, DAG.getMachineFunction());
+
   // Get the size of the outgoing arguments stack space requirement.
   unsigned ArgsSize = CCInfo.getNextStackOffset();
 
@@ -771,7 +852,10 @@ SparcTargetLowering::LowerCall_32(TargetLowering::CallLoweringInfo &CLI,
     }
   }
 
-  Chain = DAG.getCALLSEQ_START(Chain, ArgsSize, 0, dl);
+  assert(!isTailCall || ArgsSize == 0);
+
+  if (!isTailCall)
+    Chain = DAG.getCALLSEQ_START(Chain, ArgsSize, 0, dl);
 
   SmallVector<std::pair<unsigned, SDValue>, 8> RegsToPass;
   SmallVector<SDValue, 8> MemOpChains;
@@ -816,6 +900,10 @@ SparcTargetLowering::LowerCall_32(TargetLowering::CallLoweringInfo &CLI,
 
     if (Flags.isSRet()) {
       assert(VA.needsCustom());
+
+      if (isTailCall)
+        continue;
+
       // store SRet argument in %sp+64
       SDValue StackPtr = DAG.getRegister(SP::O6, MVT::i32);
       SDValue PtrOff = DAG.getIntPtrConstant(64, dl);
@@ -825,9 +913,8 @@ SparcTargetLowering::LowerCall_32(TargetLowering::CallLoweringInfo &CLI,
       hasStructRetAttr = true;
       // sret only allowed on first argument
       assert(Outs[realArgIdx].OrigArgIndex == 0);
-      PointerType *Ty = cast<PointerType>(CLI.getArgs()[0].Ty);
-      Type *ElementTy = Ty->getElementType();
-      SRetArgSize = DAG.getDataLayout().getTypeAllocSize(ElementTy);
+      SRetArgSize =
+          DAG.getDataLayout().getTypeAllocSize(CLI.getArgs()[0].IndirectType);
       continue;
     }
 
@@ -929,7 +1016,9 @@ SparcTargetLowering::LowerCall_32(TargetLowering::CallLoweringInfo &CLI,
   // stuck together.
   SDValue InFlag;
   for (unsigned i = 0, e = RegsToPass.size(); i != e; ++i) {
-    Register Reg = toCallerWindow(RegsToPass[i].first);
+    Register Reg = RegsToPass[i].first;
+    if (!isTailCall)
+      Reg = toCallerWindow(Reg);
     Chain = DAG.getCopyToReg(Chain, dl, Reg, RegsToPass[i].second, InFlag);
     InFlag = Chain.getValue(1);
   }
@@ -953,9 +1042,12 @@ SparcTargetLowering::LowerCall_32(TargetLowering::CallLoweringInfo &CLI,
   Ops.push_back(Callee);
   if (hasStructRetAttr)
     Ops.push_back(DAG.getTargetConstant(SRetArgSize, dl, MVT::i32));
-  for (unsigned i = 0, e = RegsToPass.size(); i != e; ++i)
-    Ops.push_back(DAG.getRegister(toCallerWindow(RegsToPass[i].first),
-                                  RegsToPass[i].second.getValueType()));
+  for (unsigned i = 0, e = RegsToPass.size(); i != e; ++i) {
+    Register Reg = RegsToPass[i].first;
+    if (!isTailCall)
+      Reg = toCallerWindow(Reg);
+    Ops.push_back(DAG.getRegister(Reg, RegsToPass[i].second.getValueType()));
+  }
 
   // Add a register mask operand representing the call-preserved registers.
   const SparcRegisterInfo *TRI = Subtarget->getRegisterInfo();
@@ -969,11 +1061,15 @@ SparcTargetLowering::LowerCall_32(TargetLowering::CallLoweringInfo &CLI,
   if (InFlag.getNode())
     Ops.push_back(InFlag);
 
+  if (isTailCall) {
+    DAG.getMachineFunction().getFrameInfo().setHasTailCall();
+    return DAG.getNode(SPISD::TAIL_CALL, dl, MVT::Other, Ops);
+  }
+
   Chain = DAG.getNode(SPISD::CALL, dl, NodeTys, Ops);
   InFlag = Chain.getValue(1);
 
-  Chain = DAG.getCALLSEQ_END(Chain, DAG.getIntPtrConstant(ArgsSize, dl, true),
-                             DAG.getIntPtrConstant(0, dl, true), InFlag, dl);
+  Chain = DAG.getCALLSEQ_END(Chain, ArgsSize, 0, InFlag, dl);
   InFlag = Chain.getValue(1);
 
   // Assign locations to each value returned by this call.
@@ -985,6 +1081,7 @@ SparcTargetLowering::LowerCall_32(TargetLowering::CallLoweringInfo &CLI,
 
   // Copy all of the result registers out of their specified physreg.
   for (unsigned i = 0; i != RVLocs.size(); ++i) {
+    assert(RVLocs[i].isRegLoc() && "Can only return in registers!");
     if (RVLocs[i].getLocVT() == MVT::v2i32) {
       SDValue Vec = DAG.getNode(ISD::UNDEF, dl, MVT::v2i32);
       SDValue Lo = DAG.getCopyFromReg(
@@ -1045,7 +1142,7 @@ Register SparcTargetLowering::getRegisterByName(const char* RegName, LLT VT,
 static void fixupVariableFloatArgs(SmallVectorImpl<CCValAssign> &ArgLocs,
                                    ArrayRef<ISD::OutputArg> Outs) {
   for (unsigned i = 0, e = ArgLocs.size(); i != e; ++i) {
-    const CCValAssign &VA = ArgLocs[i];
+    CCValAssign &VA = ArgLocs[i];
     MVT ValTy = VA.getLocVT();
     // FIXME: What about f32 arguments? C promotes them to f64 when calling
     // varargs functions.
@@ -1056,8 +1153,6 @@ static void fixupVariableFloatArgs(SmallVectorImpl<CCValAssign> &ArgLocs,
       continue;
 
     // This floating point argument should be reassigned.
-    CCValAssign NewVA;
-
     // Determine the offset into the argument array.
     Register firstReg = (ValTy == MVT::f64) ? SP::D0 : SP::Q0;
     unsigned argSize  = (ValTy == MVT::f64) ? 8 : 16;
@@ -1069,21 +1164,20 @@ static void fixupVariableFloatArgs(SmallVectorImpl<CCValAssign> &ArgLocs,
       unsigned IReg = SP::I0 + Offset/8;
       if (ValTy == MVT::f64)
         // Full register, just bitconvert into i64.
-        NewVA = CCValAssign::getReg(VA.getValNo(), VA.getValVT(),
-                                    IReg, MVT::i64, CCValAssign::BCvt);
+        VA = CCValAssign::getReg(VA.getValNo(), VA.getValVT(), IReg, MVT::i64,
+                                 CCValAssign::BCvt);
       else {
         assert(ValTy == MVT::f128 && "Unexpected type!");
         // Full register, just bitconvert into i128 -- We will lower this into
         // two i64s in LowerCall_64.
-        NewVA = CCValAssign::getCustomReg(VA.getValNo(), VA.getValVT(),
-                                          IReg, MVT::i128, CCValAssign::BCvt);
+        VA = CCValAssign::getCustomReg(VA.getValNo(), VA.getValVT(), IReg,
+                                       MVT::i128, CCValAssign::BCvt);
       }
     } else {
       // This needs to go to memory, we're out of integer registers.
-      NewVA = CCValAssign::getMem(VA.getValNo(), VA.getValVT(),
-                                  Offset, VA.getLocVT(), VA.getLocInfo());
+      VA = CCValAssign::getMem(VA.getValNo(), VA.getValVT(), Offset,
+                               VA.getLocVT(), VA.getLocInfo());
     }
-    ArgLocs[i] = NewVA;
   }
 }
 
@@ -1096,20 +1190,21 @@ SparcTargetLowering::LowerCall_64(TargetLowering::CallLoweringInfo &CLI,
   SDValue Chain = CLI.Chain;
   auto PtrVT = getPointerTy(DAG.getDataLayout());
 
-  // Sparc target does not yet support tail call optimization.
-  CLI.IsTailCall = false;
-
   // Analyze operands of the call, assigning locations to each operand.
   SmallVector<CCValAssign, 16> ArgLocs;
   CCState CCInfo(CLI.CallConv, CLI.IsVarArg, DAG.getMachineFunction(), ArgLocs,
                  *DAG.getContext());
   CCInfo.AnalyzeCallOperands(CLI.Outs, CC_Sparc64);
 
+  CLI.IsTailCall = CLI.IsTailCall && IsEligibleForTailCallOptimization(
+                                         CCInfo, CLI, DAG.getMachineFunction());
+
   // Get the size of the outgoing arguments stack space requirement.
   // The stack offset computed by CC_Sparc64 includes all arguments.
   // Called functions expect 6 argument words to exist in the stack frame, used
   // or not.
-  unsigned ArgsSize = std::max(6*8u, CCInfo.getNextStackOffset());
+  unsigned StackReserved = 6 * 8u;
+  unsigned ArgsSize = std::max(StackReserved, CCInfo.getNextStackOffset());
 
   // Keep stack frames 16-byte aligned.
   ArgsSize = alignTo(ArgsSize, 16);
@@ -1118,10 +1213,13 @@ SparcTargetLowering::LowerCall_64(TargetLowering::CallLoweringInfo &CLI,
   if (CLI.IsVarArg)
     fixupVariableFloatArgs(ArgLocs, CLI.Outs);
 
+  assert(!CLI.IsTailCall || ArgsSize == StackReserved);
+
   // Adjust the stack pointer to make room for the arguments.
   // FIXME: Use hasReservedCallFrame to avoid %sp adjustments around all calls
   // with more than 6 arguments.
-  Chain = DAG.getCALLSEQ_START(Chain, ArgsSize, 0, DL);
+  if (!CLI.IsTailCall)
+    Chain = DAG.getCALLSEQ_START(Chain, ArgsSize, 0, DL);
 
   // Collect the set of registers to pass to the function and their values.
   // This will be emitted as a sequence of CopyToReg nodes glued to the call
@@ -1181,10 +1279,16 @@ SparcTargetLowering::LowerCall_64(TargetLowering::CallLoweringInfo &CLI,
             DAG.getLoad(MVT::i64, DL, Store, HiPtrOff, MachinePointerInfo());
         SDValue Lo64 =
             DAG.getLoad(MVT::i64, DL, Store, LoPtrOff, MachinePointerInfo());
-        RegsToPass.push_back(std::make_pair(toCallerWindow(VA.getLocReg()),
-                                            Hi64));
-        RegsToPass.push_back(std::make_pair(toCallerWindow(VA.getLocReg()+1),
-                                            Lo64));
+
+        Register HiReg = VA.getLocReg();
+        Register LoReg = VA.getLocReg() + 1;
+        if (!CLI.IsTailCall) {
+          HiReg = toCallerWindow(HiReg);
+          LoReg = toCallerWindow(LoReg);
+        }
+
+        RegsToPass.push_back(std::make_pair(HiReg, Hi64));
+        RegsToPass.push_back(std::make_pair(LoReg, Lo64));
         continue;
       }
 
@@ -1205,7 +1309,11 @@ SparcTargetLowering::LowerCall_64(TargetLowering::CallLoweringInfo &CLI,
           ++i;
         }
       }
-      RegsToPass.push_back(std::make_pair(toCallerWindow(VA.getLocReg()), Arg));
+
+      Register Reg = VA.getLocReg();
+      if (!CLI.IsTailCall)
+        Reg = toCallerWindow(Reg);
+      RegsToPass.push_back(std::make_pair(Reg, Arg));
       continue;
     }
 
@@ -1273,13 +1381,16 @@ SparcTargetLowering::LowerCall_64(TargetLowering::CallLoweringInfo &CLI,
     Ops.push_back(InGlue);
 
   // Now the call itself.
+  if (CLI.IsTailCall) {
+    DAG.getMachineFunction().getFrameInfo().setHasTailCall();
+    return DAG.getNode(SPISD::TAIL_CALL, DL, MVT::Other, Ops);
+  }
   SDVTList NodeTys = DAG.getVTList(MVT::Other, MVT::Glue);
   Chain = DAG.getNode(SPISD::CALL, DL, NodeTys, Ops);
   InGlue = Chain.getValue(1);
 
   // Revert the stack pointer immediately after the call.
-  Chain = DAG.getCALLSEQ_END(Chain, DAG.getIntPtrConstant(ArgsSize, DL, true),
-                             DAG.getIntPtrConstant(0, DL, true), InGlue, DL);
+  Chain = DAG.getCALLSEQ_END(Chain, ArgsSize, 0, InGlue, DL);
   InGlue = Chain.getValue(1);
 
   // Now extract the return values. This is more or less the same as
@@ -1300,6 +1411,7 @@ SparcTargetLowering::LowerCall_64(TargetLowering::CallLoweringInfo &CLI,
   // Copy all of the result registers out of their specified physreg.
   for (unsigned i = 0; i != RVLocs.size(); ++i) {
     CCValAssign &VA = RVLocs[i];
+    assert(VA.isRegLoc() && "Can only return in registers!");
     unsigned Reg = toCallerWindow(VA.getLocReg());
 
     // When returning 'inreg {i32, i32 }', two consecutive i32 arguments can
@@ -1359,6 +1471,27 @@ TargetLowering::AtomicExpansionKind SparcTargetLowering::shouldExpandAtomicRMWIn
   return AtomicExpansionKind::CmpXChg;
 }
 
+/// intCondCCodeToRcond - Convert a DAG integer condition code to a SPARC
+/// rcond condition.
+static SPCC::CondCodes intCondCCodeToRcond(ISD::CondCode CC) {
+  switch (CC) {
+  default:
+    llvm_unreachable("Unknown/unsigned integer condition code!");
+  case ISD::SETEQ:
+    return SPCC::REG_Z;
+  case ISD::SETNE:
+    return SPCC::REG_NZ;
+  case ISD::SETLT:
+    return SPCC::REG_LZ;
+  case ISD::SETGT:
+    return SPCC::REG_GZ;
+  case ISD::SETLE:
+    return SPCC::REG_LEZ;
+  case ISD::SETGE:
+    return SPCC::REG_GEZ;
+  }
+}
+
 /// IntCondCCodeToICC - Convert a DAG integer condition code to a SPARC ICC
 /// condition.
 static SPCC::CondCodes IntCondCCodeToICC(ISD::CondCode CC) {
@@ -1408,7 +1541,7 @@ static SPCC::CondCodes FPCondCCodeToFCC(ISD::CondCode CC) {
 SparcTargetLowering::SparcTargetLowering(const TargetMachine &TM,
                                          const SparcSubtarget &STI)
     : TargetLowering(TM), Subtarget(&STI) {
-  MVT PtrVT = MVT::getIntegerVT(8 * TM.getPointerSize(0));
+  MVT PtrVT = MVT::getIntegerVT(TM.getPointerSizeInBits(0));
 
   // Instructions which use registers as conditionals examine all the
   // bits (as does the pseudo SELECT_CC expansion). I don't think it
@@ -1614,11 +1747,14 @@ SparcTargetLowering::SparcTargetLowering(const TargetMachine &TM,
 
   if (!Subtarget->is64Bit()) {
     // These libcalls are not available in 32-bit.
+    setLibcallName(RTLIB::MULO_I64, nullptr);
     setLibcallName(RTLIB::SHL_I128, nullptr);
     setLibcallName(RTLIB::SRL_I128, nullptr);
     setLibcallName(RTLIB::SRA_I128, nullptr);
   }
 
+  setLibcallName(RTLIB::MULO_I128, nullptr);
+
   if (!Subtarget->isV9()) {
     // SparcV8 does not have FNEGD and FABSD.
     setOperationAction(ISD::FNEG, MVT::f64, Custom);
@@ -1831,12 +1967,21 @@ const char *SparcTargetLowering::getTargetNodeName(unsigned Opcode) const {
   case SPISD::FIRST_NUMBER:    break;
   case SPISD::CMPICC:          return "SPISD::CMPICC";
   case SPISD::CMPFCC:          return "SPISD::CMPFCC";
+  case SPISD::CMPFCC_V9:
+    return "SPISD::CMPFCC_V9";
   case SPISD::BRICC:           return "SPISD::BRICC";
-  case SPISD::BRXCC:           return "SPISD::BRXCC";
+  case SPISD::BPICC:
+    return "SPISD::BPICC";
+  case SPISD::BPXCC:
+    return "SPISD::BPXCC";
   case SPISD::BRFCC:           return "SPISD::BRFCC";
+  case SPISD::BRFCC_V9:
+    return "SPISD::BRFCC_V9";
   case SPISD::SELECT_ICC:      return "SPISD::SELECT_ICC";
   case SPISD::SELECT_XCC:      return "SPISD::SELECT_XCC";
   case SPISD::SELECT_FCC:      return "SPISD::SELECT_FCC";
+  case SPISD::SELECT_REG:
+    return "SPISD::SELECT_REG";
   case SPISD::Hi:              return "SPISD::Hi";
   case SPISD::Lo:              return "SPISD::Lo";
   case SPISD::FTOI:            return "SPISD::FTOI";
@@ -1850,6 +1995,8 @@ const char *SparcTargetLowering::getTargetNodeName(unsigned Opcode) const {
   case SPISD::TLS_ADD:         return "SPISD::TLS_ADD";
   case SPISD::TLS_LD:          return "SPISD::TLS_LD";
   case SPISD::TLS_CALL:        return "SPISD::TLS_CALL";
+  case SPISD::TAIL_CALL:       return "SPISD::TAIL_CALL";
+  case SPISD::LOAD_GDOP:       return "SPISD::LOAD_GDOP";
   }
   return nullptr;
 }
@@ -1891,15 +2038,14 @@ void SparcTargetLowering::computeKnownBitsForTargetNode
 // set LHS/RHS and SPCC to the LHS/RHS of the setcc and SPCC to the condition.
 static void LookThroughSetCC(SDValue &LHS, SDValue &RHS,
                              ISD::CondCode CC, unsigned &SPCC) {
-  if (isNullConstant(RHS) &&
-      CC == ISD::SETNE &&
+  if (isNullConstant(RHS) && CC == ISD::SETNE &&
       (((LHS.getOpcode() == SPISD::SELECT_ICC ||
          LHS.getOpcode() == SPISD::SELECT_XCC) &&
         LHS.getOperand(3).getOpcode() == SPISD::CMPICC) ||
        (LHS.getOpcode() == SPISD::SELECT_FCC &&
-        LHS.getOperand(3).getOpcode() == SPISD::CMPFCC)) &&
-      isOneConstant(LHS.getOperand(0)) &&
-      isNullConstant(LHS.getOperand(1))) {
+        (LHS.getOperand(3).getOpcode() == SPISD::CMPFCC ||
+         LHS.getOperand(3).getOpcode() == SPISD::CMPFCC_V9))) &&
+      isOneConstant(LHS.getOperand(0)) && isNullConstant(LHS.getOperand(1))) {
     SDValue CMPCC = LHS.getOperand(3);
     SPCC = cast<ConstantSDNode>(LHS.getOperand(2))->getZExtValue();
     LHS = CMPCC.getOperand(0);
@@ -2074,8 +2220,7 @@ SDValue SparcTargetLowering::LowerGlobalTLSAddress(SDValue Op,
                      InFlag};
     Chain = DAG.getNode(SPISD::TLS_CALL, DL, NodeTys, Ops);
     InFlag = Chain.getValue(1);
-    Chain = DAG.getCALLSEQ_END(Chain, DAG.getIntPtrConstant(1, DL, true),
-                               DAG.getIntPtrConstant(0, DL, true), InFlag, DL);
+    Chain = DAG.getCALLSEQ_END(Chain, 1, 0, InFlag, DL);
     InFlag = Chain.getValue(1);
     SDValue Ret = DAG.getCopyFromReg(Chain, DL, SP::O0, PtrVT, InFlag);
 
@@ -2175,8 +2320,10 @@ SparcTargetLowering::LowerF128Op(SDValue Op, SelectionDAG &DAG,
     RetPtr = DAG.getFrameIndex(RetFI, PtrVT);
     Entry.Node = RetPtr;
     Entry.Ty   = PointerType::getUnqual(RetTy);
-    if (!Subtarget->is64Bit())
+    if (!Subtarget->is64Bit()) {
       Entry.IsSRet = true;
+      Entry.IndirectType = RetTy;
+    }
     Entry.IsReturned = false;
     Args.push_back(Entry);
     RetTyABI = Type::getVoidTy(*DAG.getContext());
@@ -2434,8 +2581,8 @@ static SDValue LowerUINT_TO_FP(SDValue Op, SelectionDAG &DAG,
 }
 
 static SDValue LowerBR_CC(SDValue Op, SelectionDAG &DAG,
-                          const SparcTargetLowering &TLI,
-                          bool hasHardQuad) {
+                          const SparcTargetLowering &TLI, bool hasHardQuad,
+                          bool isV9) {
   SDValue Chain = Op.getOperand(0);
   ISD::CondCode CC = cast<CondCodeSDNode>(Op.getOperand(1))->get();
   SDValue LHS = Op.getOperand(2);
@@ -2447,23 +2594,29 @@ static SDValue LowerBR_CC(SDValue Op, SelectionDAG &DAG,
   // If this is a br_cc of a "setcc", and if the setcc got lowered into
   // an CMP[IF]CC/SELECT_[IF]CC pair, find the original compared values.
   LookThroughSetCC(LHS, RHS, CC, SPCC);
+  assert(LHS.getValueType() == RHS.getValueType());
 
   // Get the condition flag.
   SDValue CompareFlag;
   if (LHS.getValueType().isInteger()) {
     CompareFlag = DAG.getNode(SPISD::CMPICC, dl, MVT::Glue, LHS, RHS);
     if (SPCC == ~0U) SPCC = IntCondCCodeToICC(CC);
-    // 32-bit compares use the icc flags, 64-bit uses the xcc flags.
-    Opc = LHS.getValueType() == MVT::i32 ? SPISD::BRICC : SPISD::BRXCC;
+    if (isV9)
+      // 32-bit compares use the icc flags, 64-bit uses the xcc flags.
+      Opc = LHS.getValueType() == MVT::i32 ? SPISD::BPICC : SPISD::BPXCC;
+    else
+      // Non-v9 targets don't have xcc.
+      Opc = SPISD::BRICC;
   } else {
     if (!hasHardQuad && LHS.getValueType() == MVT::f128) {
       if (SPCC == ~0U) SPCC = FPCondCCodeToFCC(CC);
       CompareFlag = TLI.LowerF128Compare(LHS, RHS, SPCC, dl, DAG);
-      Opc = SPISD::BRICC;
+      Opc = isV9 ? SPISD::BPICC : SPISD::BRICC;
     } else {
-      CompareFlag = DAG.getNode(SPISD::CMPFCC, dl, MVT::Glue, LHS, RHS);
+      unsigned CmpOpc = isV9 ? SPISD::CMPFCC_V9 : SPISD::CMPFCC;
+      CompareFlag = DAG.getNode(CmpOpc, dl, MVT::Glue, LHS, RHS);
       if (SPCC == ~0U) SPCC = FPCondCCodeToFCC(CC);
-      Opc = SPISD::BRFCC;
+      Opc = isV9 ? SPISD::BRFCC_V9 : SPISD::BRFCC;
     }
   }
   return DAG.getNode(Opc, dl, MVT::Other, Chain, Dest,
@@ -2471,8 +2624,8 @@ static SDValue LowerBR_CC(SDValue Op, SelectionDAG &DAG,
 }
 
 static SDValue LowerSELECT_CC(SDValue Op, SelectionDAG &DAG,
-                              const SparcTargetLowering &TLI,
-                              bool hasHardQuad) {
+                              const SparcTargetLowering &TLI, bool hasHardQuad,
+                              bool isV9, bool is64Bit) {
   SDValue LHS = Op.getOperand(0);
   SDValue RHS = Op.getOperand(1);
   ISD::CondCode CC = cast<CondCodeSDNode>(Op.getOperand(4))->get();
@@ -2484,9 +2637,26 @@ static SDValue LowerSELECT_CC(SDValue Op, SelectionDAG &DAG,
   // If this is a select_cc of a "setcc", and if the setcc got lowered into
   // an CMP[IF]CC/SELECT_[IF]CC pair, find the original compared values.
   LookThroughSetCC(LHS, RHS, CC, SPCC);
+  assert(LHS.getValueType() == RHS.getValueType());
 
   SDValue CompareFlag;
   if (LHS.getValueType().isInteger()) {
+    // On V9 processors running in 64-bit mode, if CC compares two `i64`s
+    // and the RHS is zero we might be able to use a specialized select.
+    // All SELECT_CC between any two scalar integer types are eligible for
+    // lowering to specialized instructions. Additionally, f32 and f64 types
+    // are also eligible, but for f128 we can only use the specialized
+    // instruction when we have hardquad.
+    EVT ValType = TrueVal.getValueType();
+    bool IsEligibleType = ValType.isScalarInteger() || ValType == MVT::f32 ||
+                          ValType == MVT::f64 ||
+                          (ValType == MVT::f128 && hasHardQuad);
+    if (is64Bit && isV9 && LHS.getValueType() == MVT::i64 &&
+        isNullConstant(RHS) && !ISD::isUnsignedIntSetCC(CC) && IsEligibleType)
+      return DAG.getNode(
+          SPISD::SELECT_REG, dl, TrueVal.getValueType(), TrueVal, FalseVal,
+          DAG.getConstant(intCondCCodeToRcond(CC), dl, MVT::i32), LHS);
+
     CompareFlag = DAG.getNode(SPISD::CMPICC, dl, MVT::Glue, LHS, RHS);
     Opc = LHS.getValueType() == MVT::i32 ?
           SPISD::SELECT_ICC : SPISD::SELECT_XCC;
@@ -2497,7 +2667,8 @@ static SDValue LowerSELECT_CC(SDValue Op, SelectionDAG &DAG,
       CompareFlag = TLI.LowerF128Compare(LHS, RHS, SPCC, dl, DAG);
       Opc = SPISD::SELECT_ICC;
     } else {
-      CompareFlag = DAG.getNode(SPISD::CMPFCC, dl, MVT::Glue, LHS, RHS);
+      unsigned CmpOpc = isV9 ? SPISD::CMPFCC_V9 : SPISD::CMPFCC;
+      CompareFlag = DAG.getNode(CmpOpc, dl, MVT::Glue, LHS, RHS);
       Opc = SPISD::SELECT_FCC;
       if (SPCC == ~0U) SPCC = FPCondCCodeToFCC(CC);
     }
@@ -2547,7 +2718,7 @@ static SDValue LowerVAARG(SDValue Op, SelectionDAG &DAG) {
   // We can't count on greater alignment than the word size.
   return DAG.getLoad(
       VT, DL, InChain, VAList, MachinePointerInfo(),
-      std::min(PtrVT.getFixedSizeInBits(), VT.getFixedSizeInBits()) / 8);
+      Align(std::min(PtrVT.getFixedSizeInBits(), VT.getFixedSizeInBits()) / 8));
 }
 
 static SDValue LowerDYNAMIC_STACKALLOC(SDValue Op, SelectionDAG &DAG,
@@ -2681,7 +2852,7 @@ static SDValue LowerRETURNADDR(SDValue Op, SelectionDAG &DAG,
   SDValue RetAddr;
   if (depth == 0) {
     auto PtrVT = TLI.getPointerTy(DAG.getDataLayout());
-    unsigned RetReg = MF.addLiveIn(SP::I7, TLI.getRegClassFor(PtrVT));
+    Register RetReg = MF.addLiveIn(SP::I7, TLI.getRegClassFor(PtrVT));
     RetAddr = DAG.getCopyFromReg(DAG.getEntryNode(), dl, RetReg, VT);
     return RetAddr;
   }
@@ -2957,8 +3128,15 @@ static SDValue LowerUMULO_SMULO(SDValue Op, SelectionDAG &DAG,
   SDValue ShiftAmt = DAG.getConstant(63, dl, VT);
 
   SDValue RHS = Op.getOperand(1);
-  SDValue HiLHS = DAG.getNode(ISD::SRA, dl, VT, LHS, ShiftAmt);
-  SDValue HiRHS = DAG.getNode(ISD::SRA, dl, MVT::i64, RHS, ShiftAmt);
+  SDValue HiLHS, HiRHS;
+  if (isSigned) {
+    HiLHS = DAG.getNode(ISD::SRA, dl, VT, LHS, ShiftAmt);
+    HiRHS = DAG.getNode(ISD::SRA, dl, MVT::i64, RHS, ShiftAmt);
+  } else {
+    HiLHS = DAG.getConstant(0, dl, VT);
+    HiRHS = DAG.getConstant(0, dl, MVT::i64);
+  }
+
   SDValue Args[] = { HiLHS, LHS, HiRHS, RHS };
 
   TargetLowering::MakeLibCallOptions CallOptions;
@@ -3015,6 +3193,7 @@ LowerOperation(SDValue Op, SelectionDAG &DAG) const {
 
   bool hasHardQuad = Subtarget->hasHardQuad();
   bool isV9        = Subtarget->isV9();
+  bool is64Bit = Subtarget->is64Bit();
 
   switch (Op.getOpcode()) {
   default: llvm_unreachable("Should not custom lower this!");
@@ -3035,10 +3214,10 @@ LowerOperation(SDValue Op, SelectionDAG &DAG) const {
                                                        hasHardQuad);
   case ISD::UINT_TO_FP:         return LowerUINT_TO_FP(Op, DAG, *this,
                                                        hasHardQuad);
-  case ISD::BR_CC:              return LowerBR_CC(Op, DAG, *this,
-                                                  hasHardQuad);
-  case ISD::SELECT_CC:          return LowerSELECT_CC(Op, DAG, *this,
-                                                      hasHardQuad);
+  case ISD::BR_CC:
+    return LowerBR_CC(Op, DAG, *this, hasHardQuad, isV9);
+  case ISD::SELECT_CC:
+    return LowerSELECT_CC(Op, DAG, *this, hasHardQuad, isV9, is64Bit);
   case ISD::VASTART:            return LowerVASTART(Op, DAG, *this);
   case ISD::VAARG:              return LowerVAARG(Op, DAG);
   case ISD::DYNAMIC_STACKALLOC: return LowerDYNAMIC_STACKALLOC(Op, DAG,
@@ -3115,6 +3294,8 @@ SparcTargetLowering::EmitInstrWithCustomInserter(MachineInstr &MI,
   case SP::SELECT_CC_FP_ICC:
   case SP::SELECT_CC_DFP_ICC:
   case SP::SELECT_CC_QFP_ICC:
+    if (Subtarget->isV9())
+      return expandSelectCC(MI, BB, SP::BPICC);
     return expandSelectCC(MI, BB, SP::BCOND);
   case SP::SELECT_CC_Int_XCC:
   case SP::SELECT_CC_FP_XCC:
@@ -3125,6 +3306,8 @@ SparcTargetLowering::EmitInstrWithCustomInserter(MachineInstr &MI,
   case SP::SELECT_CC_FP_FCC:
   case SP::SELECT_CC_DFP_FCC:
   case SP::SELECT_CC_QFP_FCC:
+    if (Subtarget->isV9())
+      return expandSelectCC(MI, BB, SP::FBCOND_V9);
     return expandSelectCC(MI, BB, SP::FBCOND);
   }
 }
@@ -3240,7 +3423,7 @@ LowerAsmOperandForConstraint(SDValue Op,
                              std::string &Constraint,
                              std::vector<SDValue> &Ops,
                              SelectionDAG &DAG) const {
-  SDValue Result(nullptr, 0);
+  SDValue Result;
 
   // Only support length 1 constraints for now.
   if (Constraint.length() > 1)
@@ -3271,6 +3454,9 @@ std::pair<unsigned, const TargetRegisterClass *>
 SparcTargetLowering::getRegForInlineAsmConstraint(const TargetRegisterInfo *TRI,
                                                   StringRef Constraint,
                                                   MVT VT) const {
+  if (Constraint.empty())
+    return std::make_pair(0U, nullptr);
+
   if (Constraint.size() == 1) {
     switch (Constraint[0]) {
     case 'r':
@@ -3299,46 +3485,60 @@ SparcTargetLowering::getRegForInlineAsmConstraint(const TargetRegisterInfo *TRI,
       // This will generate an error message
       return std::make_pair(0U, nullptr);
     }
-  } else if (!Constraint.empty() && Constraint.size() <= 5
-              && Constraint[0] == '{' && *(Constraint.end()-1) == '}') {
-    // constraint = '{r<d>}'
-    // Remove the braces from around the name.
-    StringRef name(Constraint.data()+1, Constraint.size()-2);
-    // Handle register aliases:
-    //       r0-r7   -> g0-g7
-    //       r8-r15  -> o0-o7
-    //       r16-r23 -> l0-l7
-    //       r24-r31 -> i0-i7
-    uint64_t intVal = 0;
-    if (name.substr(0, 1).equals("r")
-        && !name.substr(1).getAsInteger(10, intVal) && intVal <= 31) {
-      const char regTypes[] = { 'g', 'o', 'l', 'i' };
-      char regType = regTypes[intVal/8];
-      char regIdx = '0' + (intVal % 8);
-      char tmp[] = { '{', regType, regIdx, '}', 0 };
-      std::string newConstraint = std::string(tmp);
-      return TargetLowering::getRegForInlineAsmConstraint(TRI, newConstraint,
-                                                          VT);
-    }
-    if (name.substr(0, 1).equals("f") &&
-        !name.substr(1).getAsInteger(10, intVal) && intVal <= 63) {
-      std::string newConstraint;
-
-      if (VT == MVT::f32 || VT == MVT::Other) {
-        newConstraint = "{f" + utostr(intVal) + "}";
-      } else if (VT == MVT::f64 && (intVal % 2 == 0)) {
-        newConstraint = "{d" + utostr(intVal / 2) + "}";
-      } else if (VT == MVT::f128 && (intVal % 4 == 0)) {
-        newConstraint = "{q" + utostr(intVal / 4) + "}";
-      } else {
-        return std::make_pair(0U, nullptr);
-      }
-      return TargetLowering::getRegForInlineAsmConstraint(TRI, newConstraint,
-                                                          VT);
+  }
+
+  if (Constraint.front() != '{')
+    return std::make_pair(0U, nullptr);
+
+  assert(Constraint.back() == '}' && "Not a brace enclosed constraint?");
+  StringRef RegName(Constraint.data() + 1, Constraint.size() - 2);
+  if (RegName.empty())
+    return std::make_pair(0U, nullptr);
+
+  unsigned long long RegNo;
+  // Handle numbered register aliases.
+  if (RegName[0] == 'r' &&
+      getAsUnsignedInteger(RegName.begin() + 1, 10, RegNo)) {
+    // r0-r7   -> g0-g7
+    // r8-r15  -> o0-o7
+    // r16-r23 -> l0-l7
+    // r24-r31 -> i0-i7
+    if (RegNo > 31)
+      return std::make_pair(0U, nullptr);
+    const char RegTypes[] = {'g', 'o', 'l', 'i'};
+    char RegType = RegTypes[RegNo / 8];
+    char RegIndex = '0' + (RegNo % 8);
+    char Tmp[] = {'{', RegType, RegIndex, '}', 0};
+    return getRegForInlineAsmConstraint(TRI, Tmp, VT);
+  }
+
+  // Rewrite the fN constraint according to the value type if needed.
+  if (VT != MVT::f32 && VT != MVT::Other && RegName[0] == 'f' &&
+      getAsUnsignedInteger(RegName.begin() + 1, 10, RegNo)) {
+    if (VT == MVT::f64 && (RegNo % 2 == 0)) {
+      return getRegForInlineAsmConstraint(
+          TRI, StringRef("{d" + utostr(RegNo / 2) + "}"), VT);
+    } else if (VT == MVT::f128 && (RegNo % 4 == 0)) {
+      return getRegForInlineAsmConstraint(
+          TRI, StringRef("{q" + utostr(RegNo / 4) + "}"), VT);
+    } else {
+      return std::make_pair(0U, nullptr);
     }
   }
 
-  return TargetLowering::getRegForInlineAsmConstraint(TRI, Constraint, VT);
+  auto ResultPair =
+      TargetLowering::getRegForInlineAsmConstraint(TRI, Constraint, VT);
+  if (!ResultPair.second)
+    return std::make_pair(0U, nullptr);
+
+  // Force the use of I64Regs over IntRegs for 64-bit values.
+  if (Subtarget->is64Bit() && VT == MVT::i64) {
+    assert(ResultPair.second == &SP::IntRegsRegClass &&
+           "Unexpected register class");
+    return std::make_pair(ResultPair.first, &SP::I64RegsRegClass);
+  }
+
+  return ResultPair;
 }
 
 bool
diff --git a/gnu/llvm/llvm/lib/Target/Sparc/SparcInstr64Bit.td b/gnu/llvm/llvm/lib/Target/Sparc/SparcInstr64Bit.td
index dc60f563ae8..77f203fd0d6 100644
--- a/gnu/llvm/llvm/lib/Target/Sparc/SparcInstr64Bit.td
+++ b/gnu/llvm/llvm/lib/Target/Sparc/SparcInstr64Bit.td
@@ -60,6 +60,10 @@ defm SRAX : F3_S<"srax", 0b100111, 1, sra, i64, shift_imm6, I64Regs>;
 
 // Single-instruction patterns.
 
+// Zero immediate.
+def : Pat<(i64 0), (COPY (i64 G0))>,
+  Requires<[Is64Bit]>;
+
 // The ALU instructions want their simm13 operands as i32 immediates.
 def as_i32imm : SDNodeXForm<imm, [{
   return CurDAG->getTargetConstant(N->getSExtValue(), SDLoc(N), MVT::i32);
@@ -147,32 +151,32 @@ defm ORX     : F3_12<"or",  0b000010, or,  I64Regs, i64, i64imm>;
 defm XORX    : F3_12<"xor", 0b000011, xor, I64Regs, i64, i64imm>;
 
 def ANDXNrr  : F3_1<2, 0b000101,
-                 (outs I64Regs:$dst), (ins I64Regs:$b, I64Regs:$c),
-                 "andn $b, $c, $dst",
-                 [(set i64:$dst, (and i64:$b, (not i64:$c)))]>;
+                 (outs I64Regs:$rd), (ins I64Regs:$rs1, I64Regs:$rs2),
+                 "andn $rs1, $rs2, $rd",
+                 [(set i64:$rd, (and i64:$rs1, (not i64:$rs2)))]>;
 def ORXNrr   : F3_1<2, 0b000110,
-                 (outs I64Regs:$dst), (ins I64Regs:$b, I64Regs:$c),
-                 "orn $b, $c, $dst",
-                 [(set i64:$dst, (or i64:$b, (not i64:$c)))]>;
+                 (outs I64Regs:$rd), (ins I64Regs:$rs1, I64Regs:$rs2),
+                 "orn $rs1, $rs2, $rd",
+                 [(set i64:$rd, (or i64:$rs1, (not i64:$rs2)))]>;
 def XNORXrr  : F3_1<2, 0b000111,
-                   (outs I64Regs:$dst), (ins I64Regs:$b, I64Regs:$c),
-                   "xnor $b, $c, $dst",
-                   [(set i64:$dst, (not (xor i64:$b, i64:$c)))]>;
+                   (outs I64Regs:$rd), (ins I64Regs:$rs1, I64Regs:$rs2),
+                   "xnor $rs1, $rs2, $rd",
+                   [(set i64:$rd, (not (xor i64:$rs1, i64:$rs2)))]>;
 
 defm ADDX    : F3_12<"add", 0b000000, add, I64Regs, i64, i64imm>;
 defm SUBX    : F3_12<"sub", 0b000100, sub, I64Regs, i64, i64imm>;
 
 def TLS_ADDXrr : F3_1<2, 0b000000, (outs I64Regs:$rd),
-                   (ins I64Regs:$rs1, I64Regs:$rs2, TLSSym:$sym),
+                   (ins I64Regs:$rs1, I64Regs:$rs2, TailRelocSymTLSAdd:$sym),
                    "add $rs1, $rs2, $rd, $sym",
                    [(set i64:$rd,
                        (tlsadd i64:$rs1, i64:$rs2, tglobaltlsaddr:$sym))]>;
 
 // "LEA" form of add
 def LEAX_ADDri : F3_2<2, 0b000000,
-                     (outs I64Regs:$dst), (ins MEMri:$addr),
-                     "add ${addr:arith}, $dst",
-                     [(set iPTR:$dst, ADDRri:$addr)]>;
+                     (outs I64Regs:$rd), (ins (MEMri $rs1, $simm13):$addr),
+                     "add ${addr:arith}, $rd",
+                     [(set iPTR:$rd, ADDRri:$addr)]>;
 }
 
 def : Pat<(SPcmpicc i64:$a, i64:$b), (CMPrr $a, $b)>;
@@ -235,15 +239,22 @@ def UDIVXri : F3_2<2, 0b001101,
 let Predicates = [Is64Bit] in {
 
 // 64-bit loads.
-let DecoderMethod = "DecodeLoadInt" in
-  defm LDX   : Load<"ldx", 0b001011, load, I64Regs, i64>;
+defm LDX   : Load<"ldx", 0b001011, load, I64Regs, i64>;
 
-let mayLoad = 1, isAsmParserOnly = 1 in
+let mayLoad = 1, isAsmParserOnly = 1 in {
   def TLS_LDXrr : F3_1<3, 0b001011,
-                       (outs IntRegs:$dst), (ins MEMrr:$addr, TLSSym:$sym),
-                       "ldx [$addr], $dst, $sym",
-                       [(set i64:$dst,
+                       (outs IntRegs:$rd),
+                       (ins (MEMrr $rs1, $rs2):$addr, TailRelocSymTLSLoad:$sym),
+                       "ldx [$addr], $rd, $sym",
+                       [(set i64:$rd,
                            (tlsld ADDRrr:$addr, tglobaltlsaddr:$sym))]>;
+  def GDOP_LDXrr : F3_1<3, 0b001011,
+                       (outs I64Regs:$rd),
+                       (ins (MEMrr $rs1, $rs2):$addr, TailRelocSymGOTLoad:$sym),
+                       "ldx [$addr], $rd, $sym",
+                       [(set i64:$rd,
+                           (load_gdop ADDRrr:$addr, tglobaladdr:$sym))]>;
+}
 
 // Extending loads to i64.
 def : Pat<(i64 (zextloadi1 ADDRrr:$addr)), (LDUBrr ADDRrr:$addr)>;
@@ -271,12 +282,10 @@ def : Pat<(i64 (extloadi32 ADDRrr:$addr)),  (LDrr ADDRrr:$addr)>;
 def : Pat<(i64 (extloadi32 ADDRri:$addr)),  (LDri ADDRri:$addr)>;
 
 // Sign-extending load of i32 into i64 is a new SPARC v9 instruction.
-let DecoderMethod = "DecodeLoadInt" in
-  defm LDSW   : Load<"ldsw", 0b001000, sextloadi32, I64Regs, i64>;
+defm LDSW   : Load<"ldsw", 0b001000, sextloadi32, I64Regs, i64>;
 
 // 64-bit stores.
-let DecoderMethod = "DecodeStoreInt" in
-  defm STX    : Store<"stx", 0b001110, store,  I64Regs, i64>;
+defm STX    : Store<"stx", 0b001110, store,  I64Regs, i64>;
 
 // Truncating stores from i64 are identical to the i32 stores.
 def : Pat<(truncstorei8  i64:$src, ADDRrr:$addr), (STBrr ADDRrr:$addr, $src)>;
@@ -302,13 +311,13 @@ def : Pat<(store (i64 0), ADDRri:$dst), (STXri ADDRri:$dst, (i64 G0))>;
 // The icc flags correspond to the 32-bit result, and the xcc are for the
 // full 64-bit result.
 //
-// We reuse CMPICC SDNodes for compares, but use new BRXCC branch nodes for
+// We reuse CMPICC SDNodes for compares, but use new BPXCC branch nodes for
 // 64-bit compares. See LowerBR_CC.
 
 let Predicates = [Is64Bit] in {
 
 let Uses = [ICC], cc = 0b10 in
-  defm BPX : IPredBranch<"%xcc", [(SPbrxcc bb:$imm19, imm:$cond)]>;
+  defm BPX : IPredBranch<"%xcc", [(SPbpxcc bb:$imm19, imm:$cond)]>;
 
 // Conditional moves on %xcc.
 let Uses = [ICC], Constraints = "$f = $rd" in {
@@ -380,47 +389,33 @@ defm : bpr_alias<"brgz",  BPGZnapt,  BPGZapt >;
 defm : bpr_alias<"brgez", BPGEZnapt, BPGEZapt>;
 
 // Move integer register on register condition (MOVr).
-multiclass MOVR< bits<3> rcond,  string OpcStr> {
-  def rr : F4_4r<0b101111, 0b00000, rcond, (outs I64Regs:$rd),
-                   (ins I64Regs:$rs1, IntRegs:$rs2),
-                   !strconcat(OpcStr, " $rs1, $rs2, $rd"), []>;
-
-  def ri : F4_4i<0b101111, rcond, (outs I64Regs:$rd),
-                   (ins I64Regs:$rs1, i64imm:$simm10),
-                   !strconcat(OpcStr, " $rs1, $simm10, $rd"), []>;
+let Predicates = [Is64Bit], Constraints = "$f = $rd" in {
+  def MOVRrr : F4_4r<0b101111, 0b00000, (outs IntRegs:$rd),
+                   (ins I64Regs:$rs1, IntRegs:$rs2, IntRegs:$f, RegCCOp:$rcond),
+                   "movr$rcond $rs1, $rs2, $rd",
+                   [(set i32:$rd, (SPselectreg i32:$rs2, i32:$f, imm:$rcond, i64:$rs1))]>;
+
+  def MOVRri : F4_4i<0b101111, (outs IntRegs:$rd),
+                   (ins I64Regs:$rs1, i32imm:$simm10, IntRegs:$f, RegCCOp:$rcond),
+                   "movr$rcond $rs1, $simm10, $rd",
+                   [(set i32:$rd, (SPselectreg simm10:$simm10, i32:$f, imm:$rcond, i64:$rs1))]>;
 }
 
-defm MOVRRZ  : MOVR<0b001, "movrz">;
-defm MOVRLEZ : MOVR<0b010, "movrlez">;
-defm MOVRLZ  : MOVR<0b011, "movrlz">;
-defm MOVRNZ  : MOVR<0b101, "movrnz">;
-defm MOVRGZ  : MOVR<0b110, "movrgz">;
-defm MOVRGEZ : MOVR<0b111, "movrgez">;
-
 // Move FP register on integer register condition (FMOVr).
-multiclass FMOVR<bits<3> rcond, string OpcStr> {
-
-  def S : F4_4r<0b110101, 0b00101, rcond,
-                (outs FPRegs:$rd), (ins I64Regs:$rs1, FPRegs:$rs2),
-                !strconcat(!strconcat("fmovrs", OpcStr)," $rs1, $rs2, $rd"),
-                []>;
-  def D : F4_4r<0b110101, 0b00110, rcond,
-                (outs FPRegs:$rd), (ins I64Regs:$rs1, FPRegs:$rs2),
-                !strconcat(!strconcat("fmovrd", OpcStr)," $rs1, $rs2, $rd"),
-                []>;
-  def Q : F4_4r<0b110101, 0b00111, rcond,
-                (outs FPRegs:$rd), (ins I64Regs:$rs1, FPRegs:$rs2),
-                !strconcat(!strconcat("fmovrq", OpcStr)," $rs1, $rs2, $rd"),
-                []>, Requires<[HasHardQuad]>;
-}
-
-let Predicates = [HasV9] in {
-  defm FMOVRZ   : FMOVR<0b001, "z">;
-  defm FMOVRLEZ : FMOVR<0b010, "lez">;
-  defm FMOVRLZ  : FMOVR<0b011, "lz">;
-  defm FMOVRNZ  : FMOVR<0b101, "nz">;
-  defm FMOVRGZ  : FMOVR<0b110, "gz">;
-  defm FMOVRGEZ : FMOVR<0b111, "gez">;
+let Predicates = [Is64Bit], Constraints = "$f = $rd" in {
+  def FMOVRS : F4_4r<0b110101, 0b00101,
+                (outs FPRegs:$rd), (ins I64Regs:$rs1, FPRegs:$rs2, FPRegs:$f,  RegCCOp:$rcond),
+                "fmovrs$rcond $rs1, $rs2, $rd",
+                [(set f32:$rd, (SPselectreg f32:$rs2, f32:$f, imm:$rcond, i64:$rs1))]>;
+  def FMOVRD : F4_4r<0b110101, 0b00110,
+                (outs DFPRegs:$rd), (ins I64Regs:$rs1, DFPRegs:$rs2, DFPRegs:$f, RegCCOp:$rcond),
+                "fmovrd$rcond $rs1, $rs2, $rd",
+                [(set f64:$rd, (SPselectreg f64:$rs2, f64:$f, imm:$rcond, i64:$rs1))]>;
+  let Predicates = [HasHardQuad] in
+  def FMOVRQ : F4_4r<0b110101, 0b00111,
+                (outs QFPRegs:$rd), (ins I64Regs:$rs1, QFPRegs:$rs2, QFPRegs:$f, RegCCOp:$rcond),
+                "fmovrq$rcond $rs1, $rs2, $rd",
+                [(set f128:$rd, (SPselectreg f128:$rs2, f128:$f, imm:$rcond, i64:$rs1))]>;
 }
 
 //===----------------------------------------------------------------------===//
@@ -474,6 +469,11 @@ def : Pat<(SPselectfcc i64:$t, i64:$f, imm:$cond),
 def : Pat<(SPselectfcc (i64 simm11:$t), i64:$f, imm:$cond),
           (MOVFCCri (as_i32imm $t), $f, imm:$cond)>;
 
+def : Pat<(SPselectreg i64:$t, i64:$f, imm:$rcond, i64:$rs1),
+          (MOVRrr $rs1, $t, $f, imm:$rcond)>;
+def : Pat<(SPselectreg (i64 simm10:$t), i64:$f, imm:$rcond, i64:$rs1),
+          (MOVRri $rs1, (as_i32imm $t), $f, imm:$rcond)>;
+
 } // Predicates = [Is64Bit]
 
 
diff --git a/gnu/llvm/llvm/lib/Target/Sparc/SparcInstrInfo.td b/gnu/llvm/llvm/lib/Target/Sparc/SparcInstrInfo.td
index 9662327e44f..2e95bc10337 100644
--- a/gnu/llvm/llvm/lib/Target/Sparc/SparcInstrInfo.td
+++ b/gnu/llvm/llvm/lib/Target/Sparc/SparcInstrInfo.td
@@ -78,6 +78,8 @@ def UseDeprecatedInsts : Predicate<"Subtarget->useDeprecatedV8Instructions()">;
 // Instruction Pattern Stuff
 //===----------------------------------------------------------------------===//
 
+def simm10  : PatLeaf<(imm), [{ return isInt<10>(N->getSExtValue()); }]>;
+
 def simm11  : PatLeaf<(imm), [{ return isInt<11>(N->getSExtValue()); }]>;
 
 def simm13  : PatLeaf<(imm), [{ return isInt<13>(N->getSExtValue()); }]>;
@@ -147,7 +149,29 @@ def MEMri : Operand<iPTR> {
   let ParserMatchClass = SparcMEMriAsmOperand;
 }
 
-def TLSSym : Operand<iPTR>;
+// Represents a tail relocation operand for instructions such as add, ld, call.
+class SparcTailRelocSymAsmOperand<string Kind> : AsmOperandClass {
+  let Name = "TailRelocSym" # Kind;
+  let RenderMethod = "addTailRelocSymOperands";
+  let PredicateMethod = "isTailRelocSym";
+  let ParserMethod = "parseTailRelocSym<TailRelocKind::" # Kind # ">";
+}
+
+def TailRelocSymGOTLoad : Operand<iPTR> {
+  let ParserMatchClass = SparcTailRelocSymAsmOperand<"Load_GOT">;
+}
+
+def TailRelocSymTLSAdd : Operand<iPTR> {
+  let ParserMatchClass = SparcTailRelocSymAsmOperand<"Add_TLS">;
+}
+
+def TailRelocSymTLSLoad : Operand<iPTR> {
+  let ParserMatchClass = SparcTailRelocSymAsmOperand<"Load_TLS">;
+}
+
+def TailRelocSymTLSCall : Operand<iPTR> {
+  let ParserMatchClass = SparcTailRelocSymAsmOperand<"Call_TLS">;
+}
 
 def SparcMembarTagAsmOperand : AsmOperandClass {
   let Name = "MembarTag";
@@ -189,8 +213,10 @@ def simm13Op : Operand<i32> {
 }
 
 // Operand for printing out a condition code.
-let PrintMethod = "printCCOperand" in
+let PrintMethod = "printCCOperand" in {
   def CCOp : Operand<i32>;
+  def RegCCOp : Operand<i32>;
+}
 
 def SDTSPcmpicc :
 SDTypeProfile<0, 2, [SDTCisInt<0>, SDTCisSameAs<0, 1>]>;
@@ -200,6 +226,8 @@ def SDTSPbrcc :
 SDTypeProfile<0, 2, [SDTCisVT<0, OtherVT>, SDTCisVT<1, i32>]>;
 def SDTSPselectcc :
 SDTypeProfile<1, 3, [SDTCisSameAs<0, 1>, SDTCisSameAs<1, 2>, SDTCisVT<3, i32>]>;
+def SDTSPselectreg :
+SDTypeProfile<1, 4, [SDTCisSameAs<0, 1>, SDTCisSameAs<1, 2>, SDTCisVT<3, i32>, SDTCisVT<4, i64>]>;
 def SDTSPFTOI :
 SDTypeProfile<1, 1, [SDTCisVT<0, f32>, SDTCisFP<1>]>;
 def SDTSPITOF :
@@ -214,11 +242,17 @@ SDTypeProfile<1, 3, [SDTCisInt<0>, SDTCisSameAs<0, 1>, SDTCisPtrTy<2>]>;
 def SDTSPtlsld :
 SDTypeProfile<1, 2, [SDTCisPtrTy<0>, SDTCisPtrTy<1>]>;
 
+def SDTSPloadgdop :
+SDTypeProfile<1, 2, [SDTCisPtrTy<0>, SDTCisPtrTy<1>]>;
+
 def SPcmpicc : SDNode<"SPISD::CMPICC", SDTSPcmpicc, [SDNPOutGlue]>;
 def SPcmpfcc : SDNode<"SPISD::CMPFCC", SDTSPcmpfcc, [SDNPOutGlue]>;
+def SPcmpfccv9 : SDNode<"SPISD::CMPFCC_V9", SDTSPcmpfcc, [SDNPOutGlue]>;
 def SPbricc : SDNode<"SPISD::BRICC", SDTSPbrcc, [SDNPHasChain, SDNPInGlue]>;
-def SPbrxcc : SDNode<"SPISD::BRXCC", SDTSPbrcc, [SDNPHasChain, SDNPInGlue]>;
+def SPbpicc : SDNode<"SPISD::BPICC", SDTSPbrcc, [SDNPHasChain, SDNPInGlue]>;
+def SPbpxcc : SDNode<"SPISD::BPXCC", SDTSPbrcc, [SDNPHasChain, SDNPInGlue]>;
 def SPbrfcc : SDNode<"SPISD::BRFCC", SDTSPbrcc, [SDNPHasChain, SDNPInGlue]>;
+def SPbrfccv9 : SDNode<"SPISD::BRFCC_V9", SDTSPbrcc, [SDNPHasChain, SDNPInGlue]>;
 
 def SPhi    : SDNode<"SPISD::Hi", SDTIntUnaryOp>;
 def SPlo    : SDNode<"SPISD::Lo", SDTIntUnaryOp>;
@@ -231,6 +265,7 @@ def SPxtof  : SDNode<"SPISD::XTOF", SDTSPXTOF>;
 def SPselecticc : SDNode<"SPISD::SELECT_ICC", SDTSPselectcc, [SDNPInGlue]>;
 def SPselectxcc : SDNode<"SPISD::SELECT_XCC", SDTSPselectcc, [SDNPInGlue]>;
 def SPselectfcc : SDNode<"SPISD::SELECT_FCC", SDTSPselectcc, [SDNPInGlue]>;
+def SPselectreg : SDNode<"SPISD::SELECT_REG", SDTSPselectreg, [SDNPInGlue]>;
 
 //  These are target-independent nodes, but have target-specific formats.
 def SDT_SPCallSeqStart : SDCallSeqStart<[ SDTCisVT<0, i32>,
@@ -248,6 +283,10 @@ def call          : SDNode<"SPISD::CALL", SDT_SPCall,
                            [SDNPHasChain, SDNPOptInGlue, SDNPOutGlue,
                             SDNPVariadic]>;
 
+def tailcall      : SDNode<"SPISD::TAIL_CALL", SDT_SPCall,
+                           [SDNPHasChain, SDNPOptInGlue, SDNPOutGlue,
+                            SDNPVariadic]>;
+
 def SDT_SPRet     : SDTypeProfile<0, 1, [SDTCisVT<0, i32>]>;
 def retflag       : SDNode<"SPISD::RET_FLAG", SDT_SPRet,
                            [SDNPHasChain, SDNPOptInGlue, SDNPVariadic]>;
@@ -261,6 +300,8 @@ def tlscall       : SDNode<"SPISD::TLS_CALL", SDT_SPCall,
                             [SDNPHasChain, SDNPOptInGlue, SDNPOutGlue,
                              SDNPVariadic]>;
 
+def load_gdop : SDNode<"SPISD::LOAD_GDOP",  SDTSPloadgdop>;
+
 def getPCX        : Operand<iPTR> {
   let PrintMethod = "printGetPCX";
 }
@@ -319,6 +360,14 @@ def CPCC_01  : CPCC_VAL<45>;  // 0 or 1
 def CPCC_013 : CPCC_VAL<46>;  // 0 or 1 or 3
 def CPCC_012 : CPCC_VAL<47>;  // 0 or 1 or 2
 
+class RegCC_VAL<int N> : PatLeaf<(i32 N)>;
+def RegCC_Z   : RegCC_VAL<49>;  // Zero
+def RegCC_LEZ : RegCC_VAL<50>;  // Lees or equal than zero
+def RegCC_LZ  : RegCC_VAL<51>;  // Less than zero
+def RegCC_NZ  : RegCC_VAL<53>;  // Not zero
+def RegCC_GZ  : RegCC_VAL<54>;  // Greater than zero
+def RegCC_GEZ : RegCC_VAL<55>;  // Greater or equal to zero
+
 //===----------------------------------------------------------------------===//
 // Instruction Class Templates
 //===----------------------------------------------------------------------===//
@@ -356,23 +405,22 @@ multiclass F3_12np<string OpcStr, bits<6> Op3Val, InstrItinClass itin = IIC_iu_i
 multiclass Load<string OpcStr, bits<6> Op3Val, SDPatternOperator OpNode,
            RegisterClass RC, ValueType Ty, InstrItinClass itin = IIC_iu_instr> {
   def rr  : F3_1<3, Op3Val,
-                 (outs RC:$dst), (ins MEMrr:$addr),
-                 !strconcat(OpcStr, " [$addr], $dst"),
-                 [(set Ty:$dst, (OpNode ADDRrr:$addr))],
+                 (outs RC:$rd), (ins (MEMrr $rs1, $rs2):$addr),
+                 !strconcat(OpcStr, " [$addr], $rd"),
+                 [(set Ty:$rd, (OpNode ADDRrr:$addr))],
                  itin>;
   def ri  : F3_2<3, Op3Val,
-                 (outs RC:$dst), (ins MEMri:$addr),
-                 !strconcat(OpcStr, " [$addr], $dst"),
-                 [(set Ty:$dst, (OpNode ADDRri:$addr))],
+                 (outs RC:$rd), (ins (MEMri $rs1, $simm13):$addr),
+                 !strconcat(OpcStr, " [$addr], $rd"),
+                 [(set Ty:$rd, (OpNode ADDRri:$addr))],
                  itin>;
 }
 
 // TODO: Instructions of the LoadASI class are currently asm only; hooking up
 // CodeGen's address spaces to use these is a future task.
-class LoadASI<string OpcStr, bits<6> Op3Val, SDPatternOperator OpNode,
-              RegisterClass RC, ValueType Ty, InstrItinClass itin = NoItinerary> :
-  F3_1_asi<3, Op3Val, (outs RC:$dst), (ins MEMrr:$addr, i8imm:$asi),
-                !strconcat(OpcStr, "a [$addr] $asi, $dst"),
+class LoadASI<string OpcStr, bits<6> Op3Val, RegisterClass RC> :
+  F3_1_asi<3, Op3Val, (outs RC:$rd), (ins (MEMrr $rs1, $rs2):$addr, i8imm:$asi),
+                !strconcat(OpcStr, "a [$addr] $asi, $rd"),
                 []>;
 
 // LoadA multiclass - As above, but also define alternate address space variant
@@ -380,30 +428,30 @@ multiclass LoadA<string OpcStr, bits<6> Op3Val, bits<6> LoadAOp3Val,
                  SDPatternOperator OpNode, RegisterClass RC, ValueType Ty,
                  InstrItinClass itin = NoItinerary> :
              Load<OpcStr, Op3Val, OpNode, RC, Ty, itin> {
-  def Arr  : LoadASI<OpcStr, LoadAOp3Val, OpNode, RC, Ty>;
+  def Arr  : LoadASI<OpcStr, LoadAOp3Val, RC>;
 }
 
 // The LDSTUB instruction is supported for asm only.
 // It is unlikely that general-purpose code could make use of it.
 // CAS is preferred for sparc v9.
-def LDSTUBrr : F3_1<3, 0b001101, (outs IntRegs:$dst), (ins MEMrr:$addr),
-                    "ldstub [$addr], $dst", []>;
-def LDSTUBri : F3_2<3, 0b001101, (outs IntRegs:$dst), (ins MEMri:$addr),
-                    "ldstub [$addr], $dst", []>;
-def LDSTUBArr : F3_1_asi<3, 0b011101, (outs IntRegs:$dst),
-                         (ins MEMrr:$addr, i8imm:$asi),
-                         "ldstuba [$addr] $asi, $dst", []>;
+def LDSTUBrr : F3_1<3, 0b001101, (outs IntRegs:$rd), (ins (MEMrr $rs1, $rs2):$addr),
+                    "ldstub [$addr], $rd", []>;
+def LDSTUBri : F3_2<3, 0b001101, (outs IntRegs:$rd), (ins (MEMri $rs1, $simm13):$addr),
+                    "ldstub [$addr], $rd", []>;
+def LDSTUBArr : F3_1_asi<3, 0b011101, (outs IntRegs:$rd),
+                         (ins (MEMrr $rs1, $rs2):$addr, i8imm:$asi),
+                         "ldstuba [$addr] $asi, $rd", []>;
 
 // Store multiclass - Define both Reg+Reg/Reg+Imm patterns in one shot.
 multiclass Store<string OpcStr, bits<6> Op3Val, SDPatternOperator OpNode,
            RegisterClass RC, ValueType Ty, InstrItinClass itin = IIC_st> {
   def rr  : F3_1<3, Op3Val,
-                 (outs), (ins MEMrr:$addr, RC:$rd),
+                 (outs), (ins (MEMrr $rs1, $rs2):$addr, RC:$rd),
                  !strconcat(OpcStr, " $rd, [$addr]"),
                  [(OpNode Ty:$rd, ADDRrr:$addr)],
                  itin>;
   def ri  : F3_2<3, Op3Val,
-                 (outs), (ins MEMri:$addr, RC:$rd),
+                 (outs), (ins (MEMri $rs1, $simm13):$addr, RC:$rd),
                  !strconcat(OpcStr, " $rd, [$addr]"),
                  [(OpNode Ty:$rd, ADDRri:$addr)],
                  itin>;
@@ -411,19 +459,17 @@ multiclass Store<string OpcStr, bits<6> Op3Val, SDPatternOperator OpNode,
 
 // TODO: Instructions of the StoreASI class are currently asm only; hooking up
 // CodeGen's address spaces to use these is a future task.
-class StoreASI<string OpcStr, bits<6> Op3Val,
-               SDPatternOperator OpNode, RegisterClass RC, ValueType Ty,
+class StoreASI<string OpcStr, bits<6> Op3Val, RegisterClass RC,
                InstrItinClass itin = IIC_st> :
-  F3_1_asi<3, Op3Val, (outs), (ins MEMrr:$addr, RC:$rd, i8imm:$asi),
+  F3_1_asi<3, Op3Val, (outs), (ins (MEMrr $rs1, $rs2):$addr, RC:$rd, i8imm:$asi),
            !strconcat(OpcStr, "a $rd, [$addr] $asi"),
            [],
            itin>;
 
 multiclass StoreA<string OpcStr, bits<6> Op3Val, bits<6> StoreAOp3Val,
-                  SDPatternOperator OpNode, RegisterClass RC, ValueType Ty,
-                  InstrItinClass itin = IIC_st> :
+                  SDPatternOperator OpNode, RegisterClass RC, ValueType Ty> :
              Store<OpcStr, Op3Val, OpNode, RC, Ty> {
-  def Arr : StoreASI<OpcStr, StoreAOp3Val, OpNode, RC, Ty, itin>;
+  def Arr : StoreASI<OpcStr, StoreAOp3Val, RC>;
 }
 
 //===----------------------------------------------------------------------===//
@@ -530,145 +576,129 @@ let usesCustomInserter = 1, Uses = [FCC0] in {
 }
 
 // Section B.1 - Load Integer Instructions, p. 90
-let DecoderMethod = "DecodeLoadInt" in {
-  defm LDSB : LoadA<"ldsb", 0b001001, 0b011001, sextloadi8,  IntRegs, i32>;
-  defm LDSH : LoadA<"ldsh", 0b001010, 0b011010, sextloadi16, IntRegs, i32>;
-  defm LDUB : LoadA<"ldub", 0b000001, 0b010001, zextloadi8,  IntRegs, i32>;
-  defm LDUH : LoadA<"lduh", 0b000010, 0b010010, zextloadi16, IntRegs, i32>;
-  defm LD   : LoadA<"ld",   0b000000, 0b010000, load,        IntRegs, i32>;
-}
-
-let DecoderMethod = "DecodeLoadIntPair" in
-  defm LDD : LoadA<"ldd", 0b000011, 0b010011, load, IntPair, v2i32, IIC_ldd>;
+defm LDSB : LoadA<"ldsb", 0b001001, 0b011001, sextloadi8,  IntRegs, i32>;
+defm LDSH : LoadA<"ldsh", 0b001010, 0b011010, sextloadi16, IntRegs, i32>;
+defm LDUB : LoadA<"ldub", 0b000001, 0b010001, zextloadi8,  IntRegs, i32>;
+defm LDUH : LoadA<"lduh", 0b000010, 0b010010, zextloadi16, IntRegs, i32>;
+defm LD   : LoadA<"ld",   0b000000, 0b010000, load,        IntRegs, i32>;
+defm LDD : LoadA<"ldd", 0b000011, 0b010011, load, IntPair, v2i32, IIC_ldd>;
 
 // Section B.2 - Load Floating-point Instructions, p. 92
-let DecoderMethod = "DecodeLoadFP" in {
-  defm LDF   : Load<"ld",  0b100000, load,    FPRegs,  f32, IIC_iu_or_fpu_instr>;
-  def LDFArr : LoadASI<"ld",  0b110000, load, FPRegs,  f32, IIC_iu_or_fpu_instr>,
-                Requires<[HasV9]>;
-}
-let DecoderMethod = "DecodeLoadDFP" in {
-  defm LDDF   : Load<"ldd", 0b100011, load,    DFPRegs, f64, IIC_ldd>;
-  def LDDFArr : LoadASI<"ldd", 0b110011, load, DFPRegs, f64>,
-                 Requires<[HasV9]>;
-}
-let DecoderMethod = "DecodeLoadQFP" in
-  defm LDQF  : LoadA<"ldq", 0b100010, 0b110010, load, QFPRegs, f128>,
-               Requires<[HasV9, HasHardQuad]>;
-
-let DecoderMethod = "DecodeLoadCP" in
-  defm LDC   : Load<"ld", 0b110000, load, CoprocRegs, i32>;
-let DecoderMethod = "DecodeLoadCPPair" in
-  defm LDDC   : Load<"ldd", 0b110011, load, CoprocPair, v2i32, IIC_ldd>;
-
-let DecoderMethod = "DecodeLoadCP", Defs = [CPSR] in {
+defm LDF   : Load<"ld",  0b100000, load,    FPRegs,  f32, IIC_iu_or_fpu_instr>;
+def LDFArr : LoadASI<"ld",  0b110000, FPRegs>,
+             Requires<[HasV9]>;
+
+defm LDDF   : Load<"ldd", 0b100011, load,    DFPRegs, f64, IIC_ldd>;
+def LDDFArr : LoadASI<"ldd", 0b110011, DFPRegs>,
+              Requires<[HasV9]>;
+defm LDQF  : LoadA<"ldq", 0b100010, 0b110010, load, QFPRegs, f128>,
+             Requires<[HasV9, HasHardQuad]>;
+
+defm LDC   : Load<"ld", 0b110000, load, CoprocRegs, i32>;
+defm LDDC   : Load<"ldd", 0b110011, load, CoprocPair, v2i32, IIC_ldd>;
+
+let Defs = [CPSR] in {
   let rd = 0 in {
-    def LDCSRrr : F3_1<3, 0b110001, (outs), (ins MEMrr:$addr),
+    def LDCSRrr : F3_1<3, 0b110001, (outs), (ins (MEMrr $rs1, $rs2):$addr),
                        "ld [$addr], %csr", []>;
-    def LDCSRri : F3_2<3, 0b110001, (outs), (ins MEMri:$addr),
+    def LDCSRri : F3_2<3, 0b110001, (outs), (ins (MEMri $rs1, $simm13):$addr),
                        "ld [$addr], %csr", []>;
   }
 }
 
-let DecoderMethod = "DecodeLoadFP" in
-  let Defs = [FSR] in {
-    let rd = 0 in {
-      def LDFSRrr : F3_1<3, 0b100001, (outs), (ins MEMrr:$addr),
-                     "ld [$addr], %fsr", [], IIC_iu_or_fpu_instr>;
-      def LDFSRri : F3_2<3, 0b100001, (outs), (ins MEMri:$addr),
-                     "ld [$addr], %fsr", [], IIC_iu_or_fpu_instr>;
-    }
-    let rd = 1 in {
-      def LDXFSRrr : F3_1<3, 0b100001, (outs), (ins MEMrr:$addr),
-                     "ldx [$addr], %fsr", []>, Requires<[HasV9]>;
-      def LDXFSRri : F3_2<3, 0b100001, (outs), (ins MEMri:$addr),
-                     "ldx [$addr], %fsr", []>, Requires<[HasV9]>;
-    }
+let Defs = [FSR] in {
+  let rd = 0 in {
+    def LDFSRrr : F3_1<3, 0b100001, (outs), (ins (MEMrr $rs1, $rs2):$addr),
+		   "ld [$addr], %fsr", [], IIC_iu_or_fpu_instr>;
+    def LDFSRri : F3_2<3, 0b100001, (outs), (ins (MEMri $rs1, $simm13):$addr),
+		   "ld [$addr], %fsr", [], IIC_iu_or_fpu_instr>;
+  }
+  let rd = 1 in {
+    def LDXFSRrr : F3_1<3, 0b100001, (outs), (ins (MEMrr $rs1, $rs2):$addr),
+		   "ldx [$addr], %fsr", []>, Requires<[HasV9]>;
+    def LDXFSRri : F3_2<3, 0b100001, (outs), (ins (MEMri $rs1, $simm13):$addr),
+		   "ldx [$addr], %fsr", []>, Requires<[HasV9]>;
   }
-
-// Section B.4 - Store Integer Instructions, p. 95
-let DecoderMethod = "DecodeStoreInt" in {
-  defm STB   : StoreA<"stb", 0b000101, 0b010101, truncstorei8,  IntRegs, i32>;
-  defm STH   : StoreA<"sth", 0b000110, 0b010110, truncstorei16, IntRegs, i32>;
-  defm ST    : StoreA<"st",  0b000100, 0b010100, store,         IntRegs, i32>;
 }
 
-let DecoderMethod = "DecodeStoreIntPair" in
-  defm STD   : StoreA<"std", 0b000111, 0b010111, store, IntPair, v2i32, IIC_std>;
-
-// Section B.5 - Store Floating-point Instructions, p. 97
-let DecoderMethod = "DecodeStoreFP" in {
-  defm STF   : Store<"st",  0b100100, store,         FPRegs,  f32>;
-  def STFArr : StoreASI<"st",  0b110100, store,      FPRegs,  f32>,
-               Requires<[HasV9]>;
-}
-let DecoderMethod = "DecodeStoreDFP" in {
-  defm STDF   : Store<"std", 0b100111, store,         DFPRegs, f64, IIC_std>;
-  def STDFArr : StoreASI<"std", 0b110111, store,      DFPRegs, f64>,
-                Requires<[HasV9]>;
+let mayLoad = 1, isAsmParserOnly = 1 in {
+  def GDOP_LDrr : F3_1<3, 0b000000,
+                      (outs IntRegs:$rd),
+                      (ins (MEMrr $rs1, $rs2):$addr, TailRelocSymGOTLoad:$sym),
+                      "ld [$addr], $rd, $sym",
+                      [(set i32:$rd,
+                          (load_gdop ADDRrr:$addr, tglobaladdr:$sym))]>;
 }
-let DecoderMethod = "DecodeStoreQFP" in
-  defm STQF  : StoreA<"stq", 0b100110, 0b110110, store, QFPRegs, f128>,
-               Requires<[HasV9, HasHardQuad]>;
 
-let DecoderMethod = "DecodeStoreCP" in
-  defm STC   : Store<"st", 0b110100, store, CoprocRegs, i32>;
+// Section B.4 - Store Integer Instructions, p. 95
+defm STB   : StoreA<"stb", 0b000101, 0b010101, truncstorei8,  IntRegs, i32>;
+defm STH   : StoreA<"sth", 0b000110, 0b010110, truncstorei16, IntRegs, i32>;
+defm ST    : StoreA<"st",  0b000100, 0b010100, store,         IntRegs, i32>;
+defm STD   : StoreA<"std", 0b000111, 0b010111, store, IntPair, v2i32>;
 
-let DecoderMethod = "DecodeStoreCPPair" in
-  defm STDC   : Store<"std", 0b110111, store, CoprocPair, v2i32, IIC_std>;
+// Section B.5 - Store Floating-point Instructions, p. 97
+defm STF    : Store<"st",  0b100100, store,         FPRegs,  f32>;
+def STFArr  : StoreASI<"st",  0b110100, FPRegs>,
+              Requires<[HasV9]>;
+defm STDF   : Store<"std", 0b100111, store,         DFPRegs, f64, IIC_std>;
+def STDFArr : StoreASI<"std", 0b110111, DFPRegs>,
+              Requires<[HasV9]>;
+defm STQF   : StoreA<"stq", 0b100110, 0b110110, store, QFPRegs, f128>,
+              Requires<[HasV9, HasHardQuad]>;
+
+defm STC   : Store<"st", 0b110100, store, CoprocRegs, i32>;
+defm STDC   : Store<"std", 0b110111, store, CoprocPair, v2i32, IIC_std>;
 
-let DecoderMethod = "DecodeStoreCP", rd = 0 in {
+let rd = 0 in {
   let Defs = [CPSR] in {
-    def STCSRrr : F3_1<3, 0b110101, (outs MEMrr:$addr), (ins),
+    def STCSRrr : F3_1<3, 0b110101, (outs (MEMrr $rs1, $rs2):$addr), (ins),
                        "st %csr, [$addr]", [], IIC_st>;
-    def STCSRri : F3_2<3, 0b110101, (outs MEMri:$addr), (ins),
+    def STCSRri : F3_2<3, 0b110101, (outs (MEMri $rs1, $simm13):$addr), (ins),
                        "st %csr, [$addr]", [], IIC_st>;
   }
   let Defs = [CPQ] in {
-    def STDCQrr : F3_1<3, 0b110110, (outs MEMrr:$addr), (ins),
+    def STDCQrr : F3_1<3, 0b110110, (outs (MEMrr $rs1, $rs2):$addr), (ins),
                        "std %cq, [$addr]", [], IIC_std>;
-    def STDCQri : F3_2<3, 0b110110, (outs MEMri:$addr), (ins),
+    def STDCQri : F3_2<3, 0b110110, (outs (MEMri $rs1, $simm13):$addr), (ins),
                        "std %cq, [$addr]", [], IIC_std>;
   }
 }
 
-let DecoderMethod = "DecodeStoreFP" in {
-  let rd = 0 in {
-    let Defs = [FSR] in {
-      def STFSRrr : F3_1<3, 0b100101, (outs MEMrr:$addr), (ins),
-                     "st %fsr, [$addr]", [], IIC_st>;
-      def STFSRri : F3_2<3, 0b100101, (outs MEMri:$addr), (ins),
-                     "st %fsr, [$addr]", [], IIC_st>;
-    }
-    let Defs = [FQ] in {
-      def STDFQrr : F3_1<3, 0b100110, (outs MEMrr:$addr), (ins),
-                     "std %fq, [$addr]", [], IIC_std>;
-      def STDFQri : F3_2<3, 0b100110, (outs MEMri:$addr), (ins),
-                     "std %fq, [$addr]", [], IIC_std>;
-    }
+let rd = 0 in {
+  let Defs = [FSR] in {
+    def STFSRrr : F3_1<3, 0b100101, (outs (MEMrr $rs1, $rs2):$addr), (ins),
+		   "st %fsr, [$addr]", [], IIC_st>;
+    def STFSRri : F3_2<3, 0b100101, (outs (MEMri $rs1, $simm13):$addr), (ins),
+		   "st %fsr, [$addr]", [], IIC_st>;
   }
-  let rd = 1, Defs = [FSR] in {
-    def STXFSRrr : F3_1<3, 0b100101, (outs MEMrr:$addr), (ins),
-                   "stx %fsr, [$addr]", []>, Requires<[HasV9]>;
-    def STXFSRri : F3_2<3, 0b100101, (outs MEMri:$addr), (ins),
-                   "stx %fsr, [$addr]", []>, Requires<[HasV9]>;
+  let Defs = [FQ] in {
+    def STDFQrr : F3_1<3, 0b100110, (outs (MEMrr $rs1, $rs2):$addr), (ins),
+		   "std %fq, [$addr]", [], IIC_std>;
+    def STDFQri : F3_2<3, 0b100110, (outs (MEMri $rs1, $simm13):$addr), (ins),
+		   "std %fq, [$addr]", [], IIC_std>;
   }
 }
+let rd = 1, Defs = [FSR] in {
+  def STXFSRrr : F3_1<3, 0b100101, (outs (MEMrr $rs1, $rs2):$addr), (ins),
+		 "stx %fsr, [$addr]", []>, Requires<[HasV9]>;
+  def STXFSRri : F3_2<3, 0b100101, (outs (MEMri $rs1, $simm13):$addr), (ins),
+		 "stx %fsr, [$addr]", []>, Requires<[HasV9]>;
+}
 
 // Section B.8 - SWAP Register with Memory Instruction
 // (Atomic swap)
-let Constraints = "$val = $dst", DecoderMethod = "DecodeSWAP" in {
+let Constraints = "$val = $rd" in {
   def SWAPrr : F3_1<3, 0b001111,
-                 (outs IntRegs:$dst), (ins MEMrr:$addr, IntRegs:$val),
-                 "swap [$addr], $dst",
-                 [(set i32:$dst, (atomic_swap_32 ADDRrr:$addr, i32:$val))]>;
+                 (outs IntRegs:$rd), (ins (MEMrr $rs1, $rs2):$addr, IntRegs:$val),
+                 "swap [$addr], $rd",
+                 [(set i32:$rd, (atomic_swap_32 ADDRrr:$addr, i32:$val))]>;
   def SWAPri : F3_2<3, 0b001111,
-                 (outs IntRegs:$dst), (ins MEMri:$addr, IntRegs:$val),
-                 "swap [$addr], $dst",
-                 [(set i32:$dst, (atomic_swap_32 ADDRri:$addr, i32:$val))]>;
+                 (outs IntRegs:$rd), (ins (MEMri $rs1, $simm13):$addr, IntRegs:$val),
+                 "swap [$addr], $rd",
+                 [(set i32:$rd, (atomic_swap_32 ADDRri:$addr, i32:$val))]>;
   def SWAPArr : F3_1_asi<3, 0b011111,
-                 (outs IntRegs:$dst), (ins MEMrr:$addr, i8imm:$asi, IntRegs:$val),
-                 "swapa [$addr] $asi, $dst",
+                 (outs IntRegs:$rd), (ins (MEMrr $rs1, $rs2):$addr, i8imm:$asi, IntRegs:$val),
+                 "swapa [$addr] $asi, $rd",
                  [/*FIXME: pattern?*/]>;
 }
 
@@ -741,9 +771,9 @@ defm ADD   : F3_12<"add", 0b000000, add, IntRegs, i32, simm13Op>;
 // "LEA" forms of add (patterns to make tblgen happy)
 let Predicates = [Is32Bit], isCodeGenOnly = 1 in
   def LEA_ADDri   : F3_2<2, 0b000000,
-                     (outs IntRegs:$dst), (ins MEMri:$addr),
-                     "add ${addr:arith}, $dst",
-                     [(set iPTR:$dst, ADDRri:$addr)]>;
+                     (outs IntRegs:$rd), (ins (MEMri $rs1, $simm13):$addr),
+                     "add ${addr:arith}, $rd",
+                     [(set iPTR:$rd, ADDRri:$addr)]>;
 
 let Defs = [ICC] in
   defm ADDCC  : F3_12<"addcc", 0b010000, addc, IntRegs, i32, simm13Op>;
@@ -808,20 +838,21 @@ defm SAVE    : F3_12np<"save"   , 0b111100>;
 defm RESTORE : F3_12np<"restore", 0b111101>;
 
 // Section B.21 - Branch on Integer Condition Codes Instructions, p. 119
+// Section A.7 - Branch on Integer Condition Codes with Prediction (SPARC v9)
 
+let isBranch = 1, isTerminator = 1, hasDelaySlot = 1, isBarrier = 1 in {
 // unconditional branch class.
 class BranchAlways<dag ins, string asmstr, list<dag> pattern>
-  : F2_2<0b010, 0, (outs), ins, asmstr, pattern> {
-  let isBranch     = 1;
-  let isTerminator = 1;
-  let hasDelaySlot = 1;
-  let isBarrier    = 1;
+  : F2_2<0b010, 0, (outs), ins, asmstr, pattern>;
+
+// Same as BranchAlways but uses the new v9 encoding
+class BranchPredictAlways<dag ins, string asmstr, list<dag> pattern>
+  : F2_3<0b001, 0, 1, (outs), ins, asmstr, pattern>;
 }
 
 let cond = 8 in
   def BA : BranchAlways<(ins brtarget:$imm22), "ba $imm22", [(br bb:$imm22)]>;
 
-
 let isBranch = 1, isTerminator = 1, hasDelaySlot = 1 in {
 
 // conditional branch class:
@@ -859,13 +890,13 @@ multiclass IPredBranch<string regstr, list<dag> CCPattern> {
 let isTerminator = 1, isBarrier = 1,  hasDelaySlot = 1, isBranch =1,
      isIndirectBranch = 1, rd = 0, isCodeGenOnly = 1 in {
   def BINDrr  : F3_1<2, 0b111000,
-                   (outs), (ins MEMrr:$ptr),
-                   "jmp $ptr",
-                   [(brind ADDRrr:$ptr)]>;
+                   (outs), (ins (MEMrr $rs1, $rs2):$addr),
+                   "jmp $addr",
+                   [(brind ADDRrr:$addr)]>;
   def BINDri  : F3_2<2, 0b111000,
-                   (outs), (ins MEMri:$ptr),
-                   "jmp $ptr",
-                   [(brind ADDRri:$ptr)]>;
+                   (outs), (ins (MEMri $rs1, $simm13):$addr),
+                   "jmp $addr",
+                   [(brind ADDRri:$addr)]>;
 }
 
 let Uses = [ICC] in {
@@ -876,7 +907,7 @@ let Uses = [ICC] in {
                          "b$cond,a $imm22", []>;
 
   let Predicates = [HasV9], cc = 0b00 in
-    defm BPI : IPredBranch<"%icc", []>;
+    defm BPI : IPredBranch<"%icc", [(SPbpicc bb:$imm19, imm:$cond)]>;
 }
 
 // Section B.22 - Branch on Floating-point Condition Codes Instructions, p. 121
@@ -916,6 +947,19 @@ let Uses = [FCC0] in {
                              "fb$cond,a $imm22", []>;
 }
 
+// Variants of FBCOND that uses V9 opcode
+let Predicates = [HasV9], Uses = [FCC0], cc = 0,
+    isBranch = 1, isTerminator = 1, hasDelaySlot = 1 in {
+  def FBCOND_V9  : F2_3<0b101, 0, 1, (outs),
+                    (ins bprtarget:$imm19, CCOp:$cond),
+                    "fb$cond %fcc0, $imm19",
+                    [(SPbrfccv9 bb:$imm19, imm:$cond)], IIC_fpu_normal_instr>;
+  def FBCONDA_V9 : F2_3<0b101, 1, 1, (outs),
+                    (ins bprtarget:$imm19, CCOp:$cond),
+                    "fb$cond,a %fcc0, $imm19",
+                    [(SPbrfccv9 bb:$imm19, imm:$cond)], IIC_fpu_normal_instr>;
+}
+
 let Predicates = [HasV9] in
   defm BPF : FPredBranch;
 
@@ -954,14 +998,14 @@ let Uses = [O6],
   // indirect calls: special cases of JMPL.
   let isCodeGenOnly = 1, rd = 15 in {
     def CALLrr : F3_1<2, 0b111000,
-                      (outs), (ins MEMrr:$ptr, variable_ops),
-                      "call $ptr",
-                      [(call ADDRrr:$ptr)],
+                      (outs), (ins (MEMrr $rs1, $rs2):$addr, variable_ops),
+                      "call $addr",
+                      [(call ADDRrr:$addr)],
                       IIC_jmp_or_call>;
     def CALLri : F3_2<2, 0b111000,
-                      (outs), (ins MEMri:$ptr, variable_ops),
-                      "call $ptr",
-                      [(call ADDRri:$ptr)],
+                      (outs), (ins (MEMri $rs1, $simm13):$addr, variable_ops),
+                      "call $addr",
+                      [(call ADDRri:$addr)],
                       IIC_jmp_or_call>;
   }
 }
@@ -969,16 +1013,15 @@ let Uses = [O6],
 // Section B.25 - Jump and Link Instruction
 
 // JMPL Instruction.
-let isTerminator = 1, hasDelaySlot = 1, isBarrier = 1,
-    DecoderMethod = "DecodeJMPL" in {
+let isTerminator = 1, hasDelaySlot = 1, isBarrier = 1 in {
   def JMPLrr: F3_1<2, 0b111000,
-                   (outs IntRegs:$dst), (ins MEMrr:$addr),
-                   "jmpl $addr, $dst",
+                   (outs IntRegs:$rd), (ins (MEMrr $rs1, $rs2):$addr),
+                   "jmpl $addr, $rd",
                    [],
                    IIC_jmp_or_call>;
   def JMPLri: F3_2<2, 0b111000,
-                   (outs IntRegs:$dst), (ins MEMri:$addr),
-                   "jmpl $addr, $dst",
+                   (outs IntRegs:$rd), (ins (MEMri $rs1, $simm13):$addr),
+                   "jmpl $addr, $rd",
                    [],
                    IIC_jmp_or_call>;
 }
@@ -989,29 +1032,29 @@ let isReturn = 1, isTerminator = 1, hasDelaySlot = 1, isBarrier = 1,
     isCodeGenOnly = 1 in {
   let rd = 0, rs1 = 15 in
     def RETL: F3_2<2, 0b111000,
-                   (outs), (ins i32imm:$val),
-                   "jmp %o7+$val",
-                   [(retflag simm13:$val)],
+                   (outs), (ins i32imm:$simm13),
+                   "jmp %o7+$simm13",
+                   [(retflag simm13:$simm13)],
                    IIC_jmp_or_call>;
 
   let rd = 0, rs1 = 31 in
     def RET: F3_2<2, 0b111000,
-                  (outs), (ins i32imm:$val),
-                  "jmp %i7+$val",
+                  (outs), (ins i32imm:$simm13),
+                  "jmp %i7+$simm13",
                   [],
                   IIC_jmp_or_call>;
 }
 
 // Section B.26 - Return from Trap Instruction
 let isReturn = 1, isTerminator = 1, hasDelaySlot = 1,
-     isBarrier = 1, rd = 0, DecoderMethod = "DecodeReturn" in {
+     isBarrier = 1, rd = 0 in {
   def RETTrr : F3_1<2, 0b111001,
-                   (outs), (ins MEMrr:$addr),
+                   (outs), (ins (MEMrr $rs1, $rs2):$addr),
                    "rett $addr",
                    [],
                    IIC_jmp_or_call>;
   def RETTri : F3_2<2, 0b111001,
-                    (outs), (ins MEMri:$addr),
+                    (outs), (ins (MEMri $rs1, $simm13):$addr),
                     "rett $addr",
                     [],
                     IIC_jmp_or_call>;
@@ -1020,7 +1063,7 @@ let isReturn = 1, isTerminator = 1, hasDelaySlot = 1,
 
 // Section B.27 - Trap on Integer Condition Codes Instruction
 // conditional branch class:
-let DecoderNamespace = "SparcV8", DecoderMethod = "DecodeTRAP", hasSideEffects = 1, Uses = [ICC], cc = 0b00 in
+let DecoderNamespace = "SparcV8", hasSideEffects = 1, Uses = [ICC], cc = 0b00 in
 {
   def TRAPrr : TRAPSPrr<0b111010,
                         (outs), (ins IntRegs:$rs1, IntRegs:$rs2, CCOp:$cond),
@@ -1043,7 +1086,7 @@ multiclass TRAP<string regStr> {
                     []>;
 }
 
-let DecoderNamespace = "SparcV9", DecoderMethod = "DecodeTRAP", Predicates = [HasV9], hasSideEffects = 1, Uses = [ICC], cc = 0b00 in
+let DecoderNamespace = "SparcV9", Predicates = [HasV9], hasSideEffects = 1, Uses = [ICC], cc = 0b00 in
   defm TICC : TRAP<"%icc">;
 
 
@@ -1135,9 +1178,9 @@ let rd = 0 in
 
 // Section B.32 - Flush Instruction Memory
 let rd = 0 in {
-  def FLUSHrr : F3_1<2, 0b111011, (outs), (ins MEMrr:$addr),
+  def FLUSHrr : F3_1<2, 0b111011, (outs), (ins (MEMrr $rs1, $rs2):$addr),
                        "flush $addr", []>;
-  def FLUSHri : F3_2<2, 0b111011, (outs), (ins MEMri:$addr),
+  def FLUSHri : F3_2<2, 0b111011, (outs), (ins (MEMri $rs1, $simm13):$addr),
                        "flush $addr", []>;
 
   // The no-arg FLUSH is only here for the benefit of the InstAlias
@@ -1362,27 +1405,55 @@ let Defs = [FCC0], rd = 0, isCodeGenOnly = 1 in {
                    Requires<[HasHardQuad]>;
 }
 
+// A.13 Floating-Point Compare (SPARC v9)
+// Note that these always write to %fcc0 instead of having its destination
+// allocated automatically.
+// This avoids complications with the scheduler sometimes wanting to spill
+// the contents of an FCC, since SPARC v9 doesn't have facilities to spill
+// an individual FCC.
+
+let Predicates = [HasV9], Defs = [FCC0], rd = 0, isCodeGenOnly = 1 in {
+  def FCMPS_V9  : F3_3c<2, 0b110101, 0b001010001,
+                   (outs), (ins FPRegs:$rs1, FPRegs:$rs2),
+                   "fcmps %fcc0, $rs1, $rs2",
+                   [(SPcmpfccv9 f32:$rs1, f32:$rs2)],
+                   IIC_fpu_fast_instr>;
+  def FCMPD_V9  : F3_3c<2, 0b110101, 0b001010010,
+                   (outs), (ins DFPRegs:$rs1, DFPRegs:$rs2),
+                   "fcmpd %fcc0, $rs1, $rs2",
+                   [(SPcmpfccv9 f64:$rs1, f64:$rs2)],
+                   IIC_fpu_fast_instr>;
+  def FCMPQ_V9  : F3_3c<2, 0b110101, 0b001010011,
+                   (outs), (ins QFPRegs:$rs1, QFPRegs:$rs2),
+                   "fcmpq %fcc0, $rs1, $rs2",
+                   [(SPcmpfccv9 f128:$rs1, f128:$rs2)]>,
+                   Requires<[HasHardQuad]>;
+}
+
 //===----------------------------------------------------------------------===//
 // Instructions for Thread Local Storage(TLS).
 //===----------------------------------------------------------------------===//
 let isAsmParserOnly = 1 in {
 def TLS_ADDrr : F3_1<2, 0b000000,
                     (outs IntRegs:$rd),
-                    (ins IntRegs:$rs1, IntRegs:$rs2, TLSSym:$sym),
+                    (ins IntRegs:$rs1, IntRegs:$rs2, TailRelocSymTLSAdd:$sym),
                     "add $rs1, $rs2, $rd, $sym",
                     [(set i32:$rd,
                         (tlsadd i32:$rs1, i32:$rs2, tglobaltlsaddr:$sym))]>;
 
-let mayLoad = 1 in
+let mayLoad = 1 in {
   def TLS_LDrr : F3_1<3, 0b000000,
-                      (outs IntRegs:$dst), (ins MEMrr:$addr, TLSSym:$sym),
-                      "ld [$addr], $dst, $sym",
-                      [(set i32:$dst,
+                      (outs IntRegs:$rd),
+                      (ins (MEMrr $rs1, $rs2):$addr, TailRelocSymTLSLoad:$sym),
+                      "ld [$addr], $rd, $sym",
+                      [(set i32:$rd,
                           (tlsld ADDRrr:$addr, tglobaltlsaddr:$sym))]>;
+}
 
 let Uses = [O6], isCall = 1, hasDelaySlot = 1 in
   def TLS_CALL : InstSP<(outs),
-                        (ins calltarget:$disp, TLSSym:$sym, variable_ops),
+                        (ins calltarget:$disp, TailRelocSymTLSCall:$sym,
+                         variable_ops),
                         "call $disp, $sym",
                         [(tlscall texternalsym:$disp, tglobaltlsaddr:$sym)],
                         IIC_jmp_or_call> {
@@ -1392,6 +1463,31 @@ let Uses = [O6], isCall = 1, hasDelaySlot = 1 in
 }
 }
 
+//===----------------------------------------------------------------------===//
+// Instructions for tail calls.
+//===----------------------------------------------------------------------===//
+let isCodeGenOnly = 1, isReturn = 1,  hasDelaySlot = 1,
+    isTerminator = 1, isBarrier = 1 in {
+  def TAIL_CALL : InstSP<(outs), (ins calltarget:$disp, variable_ops),
+                         "call $disp",
+                         [(tailcall tglobaladdr:$disp)]> {
+  bits<30> disp;
+  let op = 1;
+  let Inst{29-0} = disp;
+  }
+}
+
+def : Pat<(tailcall (iPTR texternalsym:$dst)),
+          (TAIL_CALL texternalsym:$dst)>;
+
+let isCodeGenOnly = 1, isReturn = 1,  hasDelaySlot = 1,  isTerminator = 1,
+    isBarrier = 1, rd = 0 in {
+  def TAIL_CALLri : F3_2<2, 0b111000,
+                         (outs), (ins (MEMri $rs1, $simm13):$addr, variable_ops),
+                         "jmp $addr",
+                         [(tailcall ADDRri:$addr)]>;
+}
+
 //===----------------------------------------------------------------------===//
 // V9 Instructions
 //===----------------------------------------------------------------------===//
@@ -1644,6 +1740,17 @@ let hasSideEffects = 1 in {
 }
 }
 
+// Section A.42 - Prefetch Data
+let Predicates = [HasV9] in {
+  def PREFETCHr : F3_1<3, 0b101101,
+                   (outs), (ins (MEMrr $rs1, $rs2):$addr, shift_imm5:$rd),
+                   "prefetch [$addr], $rd", []>;
+  def PREFETCHi : F3_2<3, 0b101101,
+                   (outs), (ins (MEMri $rs1, $simm13):$addr, shift_imm5:$rd),
+                   "prefetch [$addr], $rd", []>;
+}
+
+
 
 // Section A.43 - Read Privileged Register Instructions
 let Predicates = [HasV9] in {
@@ -1668,8 +1775,7 @@ let Predicates = [HasV9] in {
 //===----------------------------------------------------------------------===//
 
 // Zero immediate.
-def : Pat<(i32 0),
-          (ORrr (i32 G0), (i32 G0))>;
+def : Pat<(i32 0), (COPY (i32 G0))>;
 // Small immediates.
 def : Pat<(i32 simm13:$val),
           (ORri (i32 G0), imm:$val)>;
@@ -1750,6 +1856,16 @@ def : Pat<(atomic_store_16 ADDRri:$dst, i32:$val), (STHri ADDRri:$dst, $val)>;
 def : Pat<(atomic_store_32 ADDRrr:$dst, i32:$val), (STrr ADDRrr:$dst, $val)>;
 def : Pat<(atomic_store_32 ADDRri:$dst, i32:$val), (STri ADDRri:$dst, $val)>;
 
+// A register pair with zero upper half.
+// The upper part is done with ORrr instead of `COPY G0`
+// or a normal register copy, since `COPY G0`s in that place
+// will be converted into `COPY G0_G1` later on, which is not
+// what we want in this case.
+def : Pat<(build_vector (i32 0), (i32 IntRegs:$a2)),
+          (INSERT_SUBREG (INSERT_SUBREG (v2i32 (IMPLICIT_DEF)),
+            (ORrr (i32 G0), (i32 G0)), sub_even),
+            (i32 IntRegs:$a2), sub_odd)>;
+
 // extract_vector
 def : Pat<(extractelt (v2i32 IntPair:$Rn), 0),
           (i32 (EXTRACT_SUBREG IntPair:$Rn, sub_even))>;
diff --git a/gnu/llvm/llvm/lib/Target/WebAssembly/WebAssemblyLowerGlobalDtors.cpp b/gnu/llvm/llvm/lib/Target/WebAssembly/WebAssemblyLowerGlobalDtors.cpp
deleted file mode 100644
index 9ccbee819c3..00000000000
--- a/gnu/llvm/llvm/lib/Target/WebAssembly/WebAssemblyLowerGlobalDtors.cpp
+++ /dev/null
@@ -1,208 +0,0 @@
-//===-- WebAssemblyLowerGlobalDtors.cpp - Lower @llvm.global_dtors --------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-///
-/// \file
-/// Lower @llvm.global_dtors.
-///
-/// WebAssembly doesn't have a builtin way to invoke static destructors.
-/// Implement @llvm.global_dtors by creating wrapper functions that are
-/// registered in @llvm.global_ctors and which contain a call to
-/// `__cxa_atexit` to register their destructor functions.
-///
-//===----------------------------------------------------------------------===//
-
-#include "WebAssembly.h"
-#include "llvm/ADT/MapVector.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/Intrinsics.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Pass.h"
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/Transforms/Utils/ModuleUtils.h"
-using namespace llvm;
-
-#define DEBUG_TYPE "wasm-lower-global-dtors"
-
-namespace {
-class LowerGlobalDtors final : public ModulePass {
-  StringRef getPassName() const override {
-    return "WebAssembly Lower @llvm.global_dtors";
-  }
-
-  void getAnalysisUsage(AnalysisUsage &AU) const override {
-    AU.setPreservesCFG();
-    ModulePass::getAnalysisUsage(AU);
-  }
-
-  bool runOnModule(Module &M) override;
-
-public:
-  static char ID;
-  LowerGlobalDtors() : ModulePass(ID) {}
-};
-} // End anonymous namespace
-
-char LowerGlobalDtors::ID = 0;
-INITIALIZE_PASS(LowerGlobalDtors, DEBUG_TYPE,
-                "Lower @llvm.global_dtors for WebAssembly", false, false)
-
-ModulePass *llvm::createWebAssemblyLowerGlobalDtors() {
-  return new LowerGlobalDtors();
-}
-
-bool LowerGlobalDtors::runOnModule(Module &M) {
-  LLVM_DEBUG(dbgs() << "********** Lower Global Destructors **********\n");
-
-  GlobalVariable *GV = M.getGlobalVariable("llvm.global_dtors");
-  if (!GV || !GV->hasInitializer())
-    return false;
-
-  const ConstantArray *InitList = dyn_cast<ConstantArray>(GV->getInitializer());
-  if (!InitList)
-    return false;
-
-  // Sanity-check @llvm.global_dtor's type.
-  auto *ETy = dyn_cast<StructType>(InitList->getType()->getElementType());
-  if (!ETy || ETy->getNumElements() != 3 ||
-      !ETy->getTypeAtIndex(0U)->isIntegerTy() ||
-      !ETy->getTypeAtIndex(1U)->isPointerTy() ||
-      !ETy->getTypeAtIndex(2U)->isPointerTy())
-    return false; // Not (int, ptr, ptr).
-
-  // Collect the contents of @llvm.global_dtors, ordered by priority. Within a
-  // priority, sequences of destructors with the same associated object are
-  // recorded so that we can register them as a group.
-  std::map<
-      uint16_t,
-      std::vector<std::pair<Constant *, std::vector<Constant *>>>
-  > DtorFuncs;
-  for (Value *O : InitList->operands()) {
-    auto *CS = dyn_cast<ConstantStruct>(O);
-    if (!CS)
-      continue; // Malformed.
-
-    auto *Priority = dyn_cast<ConstantInt>(CS->getOperand(0));
-    if (!Priority)
-      continue; // Malformed.
-    uint16_t PriorityValue = Priority->getLimitedValue(UINT16_MAX);
-
-    Constant *DtorFunc = CS->getOperand(1);
-    if (DtorFunc->isNullValue())
-      break; // Found a null terminator, skip the rest.
-
-    Constant *Associated = CS->getOperand(2);
-    Associated = cast<Constant>(Associated->stripPointerCasts());
-
-    auto &AtThisPriority = DtorFuncs[PriorityValue];
-    if (AtThisPriority.empty() || AtThisPriority.back().first != Associated) {
-        std::vector<Constant *> NewList;
-        NewList.push_back(DtorFunc);
-        AtThisPriority.push_back(std::make_pair(Associated, NewList));
-    } else {
-        AtThisPriority.back().second.push_back(DtorFunc);
-    }
-  }
-  if (DtorFuncs.empty())
-    return false;
-
-  // extern "C" int __cxa_atexit(void (*f)(void *), void *p, void *d);
-  LLVMContext &C = M.getContext();
-  PointerType *VoidStar = Type::getInt8PtrTy(C);
-  Type *AtExitFuncArgs[] = {VoidStar};
-  FunctionType *AtExitFuncTy =
-      FunctionType::get(Type::getVoidTy(C), AtExitFuncArgs,
-                        /*isVarArg=*/false);
-
-  FunctionCallee AtExit = M.getOrInsertFunction(
-      "__cxa_atexit",
-      FunctionType::get(Type::getInt32Ty(C),
-                        {PointerType::get(AtExitFuncTy, 0), VoidStar, VoidStar},
-                        /*isVarArg=*/false));
-
-  // Declare __dso_local.
-  Constant *DsoHandle = M.getNamedValue("__dso_handle");
-  if (!DsoHandle) {
-    Type *DsoHandleTy = Type::getInt8Ty(C);
-    GlobalVariable *Handle = new GlobalVariable(
-        M, DsoHandleTy, /*isConstant=*/true,
-        GlobalVariable::ExternalWeakLinkage, nullptr, "__dso_handle");
-    Handle->setVisibility(GlobalVariable::HiddenVisibility);
-    DsoHandle = Handle;
-  }
-
-  // For each unique priority level and associated symbol, generate a function
-  // to call all the destructors at that level, and a function to register the
-  // first function with __cxa_atexit.
-  for (auto &PriorityAndMore : DtorFuncs) {
-    uint16_t Priority = PriorityAndMore.first;
-    uint64_t Id = 0;
-    auto &AtThisPriority = PriorityAndMore.second;
-    for (auto &AssociatedAndMore : AtThisPriority) {
-      Constant *Associated = AssociatedAndMore.first;
-      auto ThisId = Id++;
-
-      Function *CallDtors = Function::Create(
-          AtExitFuncTy, Function::PrivateLinkage,
-          "call_dtors" +
-              (Priority != UINT16_MAX ? (Twine(".") + Twine(Priority))
-                                      : Twine()) +
-              (AtThisPriority.size() > 1 ? Twine("$") + Twine(ThisId)
-                                         : Twine()) +
-              (!Associated->isNullValue() ? (Twine(".") + Associated->getName())
-                                          : Twine()),
-          &M);
-      BasicBlock *BB = BasicBlock::Create(C, "body", CallDtors);
-      FunctionType *VoidVoid = FunctionType::get(Type::getVoidTy(C),
-                                                 /*isVarArg=*/false);
-
-      for (auto Dtor : reverse(AssociatedAndMore.second))
-        CallInst::Create(VoidVoid, Dtor, "", BB);
-      ReturnInst::Create(C, BB);
-
-      Function *RegisterCallDtors = Function::Create(
-          VoidVoid, Function::PrivateLinkage,
-          "register_call_dtors" +
-              (Priority != UINT16_MAX ? (Twine(".") + Twine(Priority))
-                                      : Twine()) +
-              (AtThisPriority.size() > 1 ? Twine("$") + Twine(ThisId)
-                                         : Twine()) +
-              (!Associated->isNullValue() ? (Twine(".") + Associated->getName())
-                                          : Twine()),
-          &M);
-      BasicBlock *EntryBB = BasicBlock::Create(C, "entry", RegisterCallDtors);
-      BasicBlock *FailBB = BasicBlock::Create(C, "fail", RegisterCallDtors);
-      BasicBlock *RetBB = BasicBlock::Create(C, "return", RegisterCallDtors);
-
-      Value *Null = ConstantPointerNull::get(VoidStar);
-      Value *Args[] = {CallDtors, Null, DsoHandle};
-      Value *Res = CallInst::Create(AtExit, Args, "call", EntryBB);
-      Value *Cmp = new ICmpInst(*EntryBB, ICmpInst::ICMP_NE, Res,
-                                Constant::getNullValue(Res->getType()));
-      BranchInst::Create(FailBB, RetBB, Cmp, EntryBB);
-
-      // If `__cxa_atexit` hits out-of-memory, trap, so that we don't misbehave.
-      // This should be very rare, because if the process is running out of
-      // memory before main has even started, something is wrong.
-      CallInst::Create(Intrinsic::getDeclaration(&M, Intrinsic::trap), "",
-                       FailBB);
-      new UnreachableInst(C, FailBB);
-
-      ReturnInst::Create(C, RetBB);
-
-      // Now register the registration function with @llvm.global_ctors.
-      appendToGlobalCtors(M, RegisterCallDtors, Priority, Associated);
-    }
-  }
-
-  // Now that we've lowered everything, remove @llvm.global_dtors.
-  GV->eraseFromParent();
-
-  return true;
-}
diff --git a/gnu/llvm/llvm/lib/Target/WebAssembly/WebAssemblyPrepareForLiveIntervals.cpp b/gnu/llvm/llvm/lib/Target/WebAssembly/WebAssemblyPrepareForLiveIntervals.cpp
deleted file mode 100644
index ed5f7ccc854..00000000000
--- a/gnu/llvm/llvm/lib/Target/WebAssembly/WebAssemblyPrepareForLiveIntervals.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//===- WebAssemblyPrepareForLiveIntervals.cpp - Prepare for LiveIntervals -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-///
-/// \file
-/// Fix up code to meet LiveInterval's requirements.
-///
-/// Some CodeGen passes don't preserve LiveInterval's requirements, because
-/// they run after register allocation and it isn't important. However,
-/// WebAssembly runs LiveIntervals in a late pass. This pass transforms code
-/// to meet LiveIntervals' requirements; primarily, it ensures that all
-/// virtual register uses have definitions (IMPLICIT_DEF definitions if
-/// nothing else).
-///
-//===----------------------------------------------------------------------===//
-
-#include "MCTargetDesc/WebAssemblyMCTargetDesc.h"
-#include "Utils/WebAssemblyUtilities.h"
-#include "WebAssembly.h"
-#include "WebAssemblyMachineFunctionInfo.h"
-#include "WebAssemblySubtarget.h"
-#include "llvm/CodeGen/MachineFunctionPass.h"
-#include "llvm/CodeGen/MachineInstrBuilder.h"
-#include "llvm/CodeGen/MachineRegisterInfo.h"
-#include "llvm/CodeGen/Passes.h"
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/raw_ostream.h"
-using namespace llvm;
-
-#define DEBUG_TYPE "wasm-prepare-for-live-intervals"
-
-namespace {
-class WebAssemblyPrepareForLiveIntervals final : public MachineFunctionPass {
-public:
-  static char ID; // Pass identification, replacement for typeid
-  WebAssemblyPrepareForLiveIntervals() : MachineFunctionPass(ID) {}
-
-private:
-  StringRef getPassName() const override {
-    return "WebAssembly Prepare For LiveIntervals";
-  }
-
-  void getAnalysisUsage(AnalysisUsage &AU) const override {
-    AU.setPreservesCFG();
-    MachineFunctionPass::getAnalysisUsage(AU);
-  }
-
-  bool runOnMachineFunction(MachineFunction &MF) override;
-};
-} // end anonymous namespace
-
-char WebAssemblyPrepareForLiveIntervals::ID = 0;
-INITIALIZE_PASS(WebAssemblyPrepareForLiveIntervals, DEBUG_TYPE,
-                "Fix up code for LiveIntervals", false, false)
-
-FunctionPass *llvm::createWebAssemblyPrepareForLiveIntervals() {
-  return new WebAssemblyPrepareForLiveIntervals();
-}
-
-// Test whether the given register has an ARGUMENT def.
-static bool hasArgumentDef(unsigned Reg, const MachineRegisterInfo &MRI) {
-  for (const auto &Def : MRI.def_instructions(Reg))
-    if (WebAssembly::isArgument(Def.getOpcode()))
-      return true;
-  return false;
-}
-
-bool WebAssemblyPrepareForLiveIntervals::runOnMachineFunction(
-    MachineFunction &MF) {
-  LLVM_DEBUG({
-    dbgs() << "********** Prepare For LiveIntervals **********\n"
-           << "********** Function: " << MF.getName() << '\n';
-  });
-
-  bool Changed = false;
-  MachineRegisterInfo &MRI = MF.getRegInfo();
-  const auto &TII = *MF.getSubtarget<WebAssemblySubtarget>().getInstrInfo();
-  MachineBasicBlock &Entry = *MF.begin();
-
-  assert(!mustPreserveAnalysisID(LiveIntervalsID) &&
-         "LiveIntervals shouldn't be active yet!");
-
-  // We don't preserve SSA form.
-  MRI.leaveSSA();
-
-  // BranchFolding and perhaps other passes don't preserve IMPLICIT_DEF
-  // instructions. LiveIntervals requires that all paths to virtual register
-  // uses provide a definition. Insert IMPLICIT_DEFs in the entry block to
-  // conservatively satisfy this.
-  //
-  // TODO: This is fairly heavy-handed; find a better approach.
-  //
-  for (unsigned I = 0, E = MRI.getNumVirtRegs(); I < E; ++I) {
-    unsigned Reg = Register::index2VirtReg(I);
-
-    // Skip unused registers.
-    if (MRI.use_nodbg_empty(Reg))
-      continue;
-
-    // Skip registers that have an ARGUMENT definition.
-    if (hasArgumentDef(Reg, MRI))
-      continue;
-
-    BuildMI(Entry, Entry.begin(), DebugLoc(),
-            TII.get(WebAssembly::IMPLICIT_DEF), Reg);
-    Changed = true;
-  }
-
-  // Move ARGUMENT_* instructions to the top of the entry block, so that their
-  // liveness reflects the fact that these really are live-in values.
-  for (auto MII = Entry.begin(), MIE = Entry.end(); MII != MIE;) {
-    MachineInstr &MI = *MII++;
-    if (WebAssembly::isArgument(MI.getOpcode())) {
-      MI.removeFromParent();
-      Entry.insert(Entry.begin(), &MI);
-    }
-  }
-
-  // Ok, we're now ready to run the LiveIntervals analysis again.
-  MF.getProperties().set(MachineFunctionProperties::Property::TracksLiveness);
-
-  return Changed;
-}
diff --git a/gnu/llvm/llvm/lib/Target/X86/CMakeLists.txt b/gnu/llvm/llvm/lib/Target/X86/CMakeLists.txt
index 2731e62a1fc..38b0ef8caf1 100644
--- a/gnu/llvm/llvm/lib/Target/X86/CMakeLists.txt
+++ b/gnu/llvm/llvm/lib/Target/X86/CMakeLists.txt
@@ -12,13 +12,15 @@ tablegen(LLVM X86GenEVEX2VEXTables.inc -gen-x86-EVEX2VEX-tables)
 tablegen(LLVM X86GenExegesis.inc -gen-exegesis)
 tablegen(LLVM X86GenFastISel.inc -gen-fast-isel)
 tablegen(LLVM X86GenGlobalISel.inc -gen-global-isel)
-tablegen(LLVM X86GenInstrInfo.inc -gen-instr-info)
+tablegen(LLVM X86GenInstrInfo.inc -gen-instr-info
+                                  -instr-info-expand-mi-operand-info=0)
+tablegen(LLVM X86GenMnemonicTables.inc -gen-x86-mnemonic-tables -asmwriternum=1)
 tablegen(LLVM X86GenRegisterBank.inc -gen-register-bank)
 tablegen(LLVM X86GenRegisterInfo.inc -gen-register-info)
 tablegen(LLVM X86GenSubtargetInfo.inc -gen-subtarget)
 
 if (X86_GEN_FOLD_TABLES)
-  tablegen(LLVM X86GenFoldTables.inc -gen-x86-fold-tables)
+  tablegen(LLVM X86GenFoldTables.inc -gen-x86-fold-tables -asmwriternum=1)
 endif()
 
 add_public_tablegen_target(X86CommonTableGen)
@@ -37,6 +39,7 @@ set(sources
   X86PreAMXConfig.cpp
   X86LowerAMXIntrinsics.cpp
   X86TileConfig.cpp
+  X86FastPreTileConfig.cpp
   X86FastTileConfig.cpp
   X86PreTileConfig.cpp
   X86ExpandPseudo.cpp
@@ -45,6 +48,7 @@ set(sources
   X86FixupGadgets.cpp
   X86FixupLEAs.cpp
   X86AvoidStoreForwardingBlocks.cpp
+  X86DynAllocaExpander.cpp
   X86FixupSetCC.cpp
   X86FlagsCopyLowering.cpp
   X86FloatingPoint.cpp
@@ -61,6 +65,7 @@ set(sources
   X86InstrFoldTables.cpp
   X86InstrInfo.cpp
   X86EvexToVex.cpp
+  X86KCFI.cpp
   X86LegalizerInfo.cpp
   X86LoadValueInjectionLoadHardening.cpp
   X86LoadValueInjectionRetHardening.cpp
@@ -73,6 +78,7 @@ set(sources
   X86RegisterBankInfo.cpp
   X86RegisterInfo.cpp
   X86ReturnProtectorLowering.cpp
+  X86ReturnThunks.cpp
   X86SelectionDAGInfo.cpp
   X86ShuffleDecodeConstantPool.cpp
   X86SpeculativeLoadHardening.cpp
@@ -82,7 +88,6 @@ set(sources
   X86TargetObjectFile.cpp
   X86TargetTransformInfo.cpp
   X86VZeroUpper.cpp
-  X86WinAllocaExpander.cpp
   X86WinEHState.cpp
   X86InsertWait.cpp
   )
@@ -93,10 +98,12 @@ add_llvm_target(X86CodeGen ${sources}
   AsmPrinter
   CodeGen
   Core
+  Instrumentation
   MC
   SelectionDAG
   Support
   Target
+  TargetParser
   TransformUtils
   X86Desc
   X86Info
@@ -110,5 +117,6 @@ add_llvm_target(X86CodeGen ${sources}
 
 add_subdirectory(AsmParser)
 add_subdirectory(Disassembler)
+add_subdirectory(MCA)
 add_subdirectory(MCTargetDesc)
 add_subdirectory(TargetInfo)
diff --git a/gnu/llvm/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp b/gnu/llvm/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
index dbf751ddfa3..13770226bfe 100644
--- a/gnu/llvm/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
+++ b/gnu/llvm/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
@@ -8,6 +8,7 @@
 
 #include "MCTargetDesc/X86BaseInfo.h"
 #include "MCTargetDesc/X86FixupKinds.h"
+#include "MCTargetDesc/X86InstrRelaxTables.h"
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/BinaryFormat/ELF.h"
 #include "llvm/BinaryFormat/MachO.h"
@@ -29,9 +30,9 @@
 #include "llvm/MC/MCSectionMachO.h"
 #include "llvm/MC/MCSubtargetInfo.h"
 #include "llvm/MC/MCValue.h"
+#include "llvm/MC/TargetRegistry.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/ErrorHandling.h"
-#include "llvm/Support/TargetRegistry.h"
 #include "llvm/Support/raw_ostream.h"
 
 using namespace llvm;
@@ -116,13 +117,6 @@ cl::opt<bool> X86PadForBranchAlign(
     "x86-pad-for-branch-align", cl::init(true), cl::Hidden,
     cl::desc("Pad previous instructions to implement branch alignment"));
 
-class X86ELFObjectWriter : public MCELFObjectTargetWriter {
-public:
-  X86ELFObjectWriter(bool is64Bit, uint8_t OSABI, uint16_t EMachine,
-                     bool HasRelocationAddend, bool foobar)
-    : MCELFObjectTargetWriter(is64Bit, OSABI, EMachine, HasRelocationAddend) {}
-};
-
 class X86AsmBackend : public MCAsmBackend {
   const MCSubtargetInfo &STI;
   std::unique_ptr<const MCInstrInfo> MCII;
@@ -155,7 +149,7 @@ public:
       AlignBranchType.addKind(X86::AlignBranchJcc);
       AlignBranchType.addKind(X86::AlignBranchJmp);
     }
-    // Allow overriding defaults set by master flag
+    // Allow overriding defaults set by main flag
     if (X86AlignBranchBoundary.getNumOccurrences())
       AlignBoundary = assumeAligned(X86AlignBranchBoundary);
     if (X86AlignBranch.getNumOccurrences())
@@ -166,14 +160,15 @@ public:
 
   bool allowAutoPadding() const override;
   bool allowEnhancedRelaxation() const override;
-  void emitInstructionBegin(MCObjectStreamer &OS, const MCInst &Inst) override;
+  void emitInstructionBegin(MCObjectStreamer &OS, const MCInst &Inst,
+                            const MCSubtargetInfo &STI) override;
   void emitInstructionEnd(MCObjectStreamer &OS, const MCInst &Inst) override;
 
   unsigned getNumFixupKinds() const override {
     return X86::NumTargetFixupKinds;
   }
 
-  Optional<MCFixupKind> getFixupKind(StringRef Name) const override;
+  std::optional<MCFixupKind> getFixupKind(StringRef Name) const override;
 
   const MCFixupKindInfo &getFixupKindInfo(MCFixupKind Kind) const override;
 
@@ -207,9 +202,10 @@ public:
 
   void finishLayout(MCAssembler const &Asm, MCAsmLayout &Layout) const override;
 
-  unsigned getMaximumNopSize() const override;
+  unsigned getMaximumNopSize(const MCSubtargetInfo &STI) const override;
 
-  bool writeNopData(raw_ostream &OS, uint64_t Count) const override;
+  bool writeNopData(raw_ostream &OS, uint64_t Count,
+                    const MCSubtargetInfo *STI) const override;
 };
 } // end anonymous namespace
 
@@ -227,87 +223,7 @@ static unsigned getRelaxedOpcodeBranch(const MCInst &Inst, bool Is16BitMode) {
 
 static unsigned getRelaxedOpcodeArith(const MCInst &Inst) {
   unsigned Op = Inst.getOpcode();
-  switch (Op) {
-  default:
-    return Op;
-
-    // IMUL
-  case X86::IMUL16rri8: return X86::IMUL16rri;
-  case X86::IMUL16rmi8: return X86::IMUL16rmi;
-  case X86::IMUL32rri8: return X86::IMUL32rri;
-  case X86::IMUL32rmi8: return X86::IMUL32rmi;
-  case X86::IMUL64rri8: return X86::IMUL64rri32;
-  case X86::IMUL64rmi8: return X86::IMUL64rmi32;
-
-    // AND
-  case X86::AND16ri8: return X86::AND16ri;
-  case X86::AND16mi8: return X86::AND16mi;
-  case X86::AND32ri8: return X86::AND32ri;
-  case X86::AND32mi8: return X86::AND32mi;
-  case X86::AND64ri8: return X86::AND64ri32;
-  case X86::AND64mi8: return X86::AND64mi32;
-
-    // OR
-  case X86::OR16ri8: return X86::OR16ri;
-  case X86::OR16mi8: return X86::OR16mi;
-  case X86::OR32ri8: return X86::OR32ri;
-  case X86::OR32mi8: return X86::OR32mi;
-  case X86::OR64ri8: return X86::OR64ri32;
-  case X86::OR64mi8: return X86::OR64mi32;
-
-    // XOR
-  case X86::XOR16ri8: return X86::XOR16ri;
-  case X86::XOR16mi8: return X86::XOR16mi;
-  case X86::XOR32ri8: return X86::XOR32ri;
-  case X86::XOR32mi8: return X86::XOR32mi;
-  case X86::XOR64ri8: return X86::XOR64ri32;
-  case X86::XOR64mi8: return X86::XOR64mi32;
-
-    // ADD
-  case X86::ADD16ri8: return X86::ADD16ri;
-  case X86::ADD16mi8: return X86::ADD16mi;
-  case X86::ADD32ri8: return X86::ADD32ri;
-  case X86::ADD32mi8: return X86::ADD32mi;
-  case X86::ADD64ri8: return X86::ADD64ri32;
-  case X86::ADD64mi8: return X86::ADD64mi32;
-
-   // ADC
-  case X86::ADC16ri8: return X86::ADC16ri;
-  case X86::ADC16mi8: return X86::ADC16mi;
-  case X86::ADC32ri8: return X86::ADC32ri;
-  case X86::ADC32mi8: return X86::ADC32mi;
-  case X86::ADC64ri8: return X86::ADC64ri32;
-  case X86::ADC64mi8: return X86::ADC64mi32;
-
-    // SUB
-  case X86::SUB16ri8: return X86::SUB16ri;
-  case X86::SUB16mi8: return X86::SUB16mi;
-  case X86::SUB32ri8: return X86::SUB32ri;
-  case X86::SUB32mi8: return X86::SUB32mi;
-  case X86::SUB64ri8: return X86::SUB64ri32;
-  case X86::SUB64mi8: return X86::SUB64mi32;
-
-   // SBB
-  case X86::SBB16ri8: return X86::SBB16ri;
-  case X86::SBB16mi8: return X86::SBB16mi;
-  case X86::SBB32ri8: return X86::SBB32ri;
-  case X86::SBB32mi8: return X86::SBB32mi;
-  case X86::SBB64ri8: return X86::SBB64ri32;
-  case X86::SBB64mi8: return X86::SBB64mi32;
-
-    // CMP
-  case X86::CMP16ri8: return X86::CMP16ri;
-  case X86::CMP16mi8: return X86::CMP16mi;
-  case X86::CMP32ri8: return X86::CMP32ri;
-  case X86::CMP32mi8: return X86::CMP32mi;
-  case X86::CMP64ri8: return X86::CMP64ri32;
-  case X86::CMP64mi8: return X86::CMP64mi32;
-
-    // PUSH
-  case X86::PUSH32i8:  return X86::PUSHi32;
-  case X86::PUSH16i8:  return X86::PUSHi16;
-  case X86::PUSH64i8:  return X86::PUSH64i32;
-  }
+  return X86::getRelaxedOpcodeArith(Op);
 }
 
 static unsigned getRelaxedOpcode(const MCInst &Inst, bool Is16BitMode) {
@@ -377,7 +293,7 @@ static bool isFirstMacroFusibleInst(const MCInst &Inst,
 ///   - If the instruction has a ESP/EBP base register, use SS.
 ///   - Otherwise use DS.
 uint8_t X86AsmBackend::determinePaddingPrefix(const MCInst &Inst) const {
-  assert((STI.hasFeature(X86::Mode32Bit) || STI.hasFeature(X86::Mode64Bit)) &&
+  assert((STI.hasFeature(X86::Is32Bit) || STI.hasFeature(X86::Is64Bit)) &&
          "Prefixes can be added only in 32-bit or 64-bit mode.");
   const MCInstrDesc &Desc = MCII->get(Inst.getOpcode());
   uint64_t TSFlags = Desc.TSFlags;
@@ -418,7 +334,7 @@ uint8_t X86AsmBackend::determinePaddingPrefix(const MCInst &Inst) const {
   if (SegmentReg != 0)
     return X86::getSegmentOverridePrefixForReg(SegmentReg);
 
-  if (STI.hasFeature(X86::Mode64Bit))
+  if (STI.hasFeature(X86::Is64Bit))
     return X86::CS_Encoding;
 
   if (MemoryOperand >= 0) {
@@ -577,7 +493,7 @@ bool X86AsmBackend::canPadBranches(MCObjectStreamer &OS) const {
     return false;
 
   // Branches only need to be aligned in 32-bit or 64-bit mode.
-  if (!(STI.hasFeature(X86::Mode64Bit) || STI.hasFeature(X86::Mode32Bit)))
+  if (!(STI.hasFeature(X86::Is64Bit) || STI.hasFeature(X86::Is32Bit)))
     return false;
 
   return true;
@@ -598,7 +514,7 @@ bool X86AsmBackend::needAlign(const MCInst &Inst) const {
 
 /// Insert BoundaryAlignFragment before instructions to align branches.
 void X86AsmBackend::emitInstructionBegin(MCObjectStreamer &OS,
-                                         const MCInst &Inst) {
+                                         const MCInst &Inst, const MCSubtargetInfo &STI) {
   CanPadInst = canPadInst(Inst, OS);
 
   if (!canPadBranches(OS))
@@ -637,7 +553,7 @@ void X86AsmBackend::emitInstructionBegin(MCObjectStreamer &OS,
                           isFirstMacroFusibleInst(Inst, *MCII))) {
     // If we meet a unfused branch or the first instuction in a fusiable pair,
     // insert a BoundaryAlign fragment.
-    OS.insert(PendingBA = new MCBoundaryAlignFragment(AlignBoundary));
+    OS.insert(PendingBA = new MCBoundaryAlignFragment(AlignBoundary, STI));
   }
 }
 
@@ -668,11 +584,10 @@ void X86AsmBackend::emitInstructionEnd(MCObjectStreamer &OS, const MCInst &Inst)
 
   // Update the maximum alignment on the current section if necessary.
   MCSection *Sec = OS.getCurrentSectionOnly();
-  if (AlignBoundary.value() > Sec->getAlignment())
-    Sec->setAlignment(AlignBoundary);
+  Sec->ensureMinAlignment(AlignBoundary);
 }
 
-Optional<MCFixupKind> X86AsmBackend::getFixupKind(StringRef Name) const {
+std::optional<MCFixupKind> X86AsmBackend::getFixupKind(StringRef Name) const {
   if (STI.getTargetTriple().isOSBinFormatELF()) {
     unsigned Type;
     if (STI.getTargetTriple().getArch() == Triple::x86_64) {
@@ -698,7 +613,7 @@ Optional<MCFixupKind> X86AsmBackend::getFixupKind(StringRef Name) const {
                  .Default(-1u);
     }
     if (Type == -1u)
-      return None;
+      return std::nullopt;
     return static_cast<MCFixupKind>(FirstLiteralRelocationKind + Type);
   }
   return MCAsmBackend::getFixupKind(Name);
@@ -839,7 +754,7 @@ bool X86AsmBackend::fixupNeedsRelaxation(const MCFixup &Fixup,
 void X86AsmBackend::relaxInstruction(MCInst &Inst,
                                      const MCSubtargetInfo &STI) const {
   // The only relaxations X86 does is from a 1byte pcrel to a 4byte pcrel.
-  bool Is16BitMode = STI.getFeatureBits()[X86::Mode16Bit];
+  bool Is16BitMode = STI.getFeatureBits()[X86::Is16Bit];
   unsigned RelaxedOp = getRelaxedOpcode(Inst, Is16BitMode);
 
   if (RelaxedOp == Inst.getOpcode()) {
@@ -858,7 +773,7 @@ void X86AsmBackend::relaxInstruction(MCInst &Inst,
 static bool isFullyRelaxed(const MCRelaxableFragment &RF) {
   auto &Inst = RF.getInst();
   auto &STI = *RF.getSubtargetInfo();
-  bool Is16BitMode = STI.getFeatureBits()[X86::Mode16Bit];
+  bool Is16BitMode = STI.getFeatureBits()[X86::Is16Bit];
   return getRelaxedOpcode(Inst, Is16BitMode) == Inst.getOpcode();
 }
 
@@ -1081,16 +996,16 @@ void X86AsmBackend::finishLayout(MCAssembler const &Asm,
   }
 }
 
-unsigned X86AsmBackend::getMaximumNopSize() const {
-  if (STI.hasFeature(X86::Mode16Bit))
+unsigned X86AsmBackend::getMaximumNopSize(const MCSubtargetInfo &STI) const {
+  if (STI.hasFeature(X86::Is16Bit))
     return 4;
-  if (!STI.hasFeature(X86::FeatureNOPL) && !STI.hasFeature(X86::Mode64Bit))
+  if (!STI.hasFeature(X86::FeatureNOPL) && !STI.hasFeature(X86::Is64Bit))
     return 1;
-  if (STI.getFeatureBits()[X86::FeatureFast7ByteNOP])
+  if (STI.getFeatureBits()[X86::TuningFast7ByteNOP])
     return 7;
-  if (STI.getFeatureBits()[X86::FeatureFast15ByteNOP])
+  if (STI.getFeatureBits()[X86::TuningFast15ByteNOP])
     return 15;
-  if (STI.getFeatureBits()[X86::FeatureFast11ByteNOP])
+  if (STI.getFeatureBits()[X86::TuningFast11ByteNOP])
     return 11;
   // FIXME: handle 32-bit mode
   // 15-bytes is the longest single NOP instruction, but 10-bytes is
@@ -1101,7 +1016,8 @@ unsigned X86AsmBackend::getMaximumNopSize() const {
 /// Write a sequence of optimal nops to the output, covering \p Count
 /// bytes.
 /// \return - true on success, false on failure
-bool X86AsmBackend::writeNopData(raw_ostream &OS, uint64_t Count) const {
+bool X86AsmBackend::writeNopData(raw_ostream &OS, uint64_t Count,
+                                 const MCSubtargetInfo *STI) const {
 
   // Write 1 or 2 byte NOP sequences, or a longer trapsled, until
   // we have written Count bytes
@@ -1196,8 +1112,8 @@ public:
     , Is64Bit(is64Bit) {
   }
 
-  Optional<MCFixupKind> getFixupKind(StringRef Name) const override {
-    return StringSwitch<Optional<MCFixupKind>>(Name)
+  std::optional<MCFixupKind> getFixupKind(StringRef Name) const override {
+    return StringSwitch<std::optional<MCFixupKind>>(Name)
         .Case("dir32", FK_Data_4)
         .Case("secrel32", FK_SecRel_4)
         .Case("secidx", FK_SecRel_2)
@@ -1420,17 +1336,14 @@ public:
     unsigned InstrOffset = 0;
     unsigned StackAdjust = 0;
     unsigned StackSize = 0;
-    unsigned NumDefCFAOffsets = 0;
     int MinAbsOffset = std::numeric_limits<int>::max();
 
-    for (unsigned i = 0, e = Instrs.size(); i != e; ++i) {
-      const MCCFIInstruction &Inst = Instrs[i];
-
+    for (const MCCFIInstruction &Inst : Instrs) {
       switch (Inst.getOperation()) {
       default:
         // Any other CFI directives indicate a frame that we aren't prepared
         // to represent via compact unwind, so just bail out.
-        return 0;
+        return CU::UNWIND_MODE_DWARF;
       case MCCFIInstruction::OpDefCfaRegister: {
         // Defines a frame pointer. E.g.
         //
@@ -1444,7 +1357,7 @@ public:
         // generate a compact unwinding representation, so bail out.
         if (*MRI.getLLVMRegNum(Inst.getRegister(), true) !=
             (Is64Bit ? X86::RBP : X86::EBP))
-          return 0;
+          return CU::UNWIND_MODE_DWARF;
 
         // Reset the counts.
         memset(SavedRegs, 0, sizeof(SavedRegs));
@@ -1470,7 +1383,6 @@ public:
         //     .cfi_def_cfa_offset 80
         //
         StackSize = Inst.getOffset() / StackDivide;
-        ++NumDefCFAOffsets;
         break;
       }
       case MCCFIInstruction::OpOffset: {
diff --git a/gnu/llvm/llvm/lib/Target/X86/X86.h b/gnu/llvm/llvm/lib/Target/X86/X86.h
index 43f39e62efd..3d0eef8d8ac 100644
--- a/gnu/llvm/llvm/lib/Target/X86/X86.h
+++ b/gnu/llvm/llvm/lib/Target/X86/X86.h
@@ -51,6 +51,9 @@ FunctionPass *createX86IssueVZeroUpperPass();
 /// destinations as part of CET IBT mechanism.
 FunctionPass *createX86IndirectBranchTrackingPass();
 
+/// This pass inserts KCFI checks before indirect calls.
+FunctionPass *createX86KCFIPass();
+
 /// Return a pass that pads short functions with NOOPs.
 /// This will prevent a stall when returning on the Atom.
 FunctionPass *createX86PadShortFunctions();
@@ -73,12 +76,15 @@ FunctionPass *createX86AvoidStoreForwardingBlocks();
 /// Return a pass that lowers EFLAGS copy pseudo instructions.
 FunctionPass *createX86FlagsCopyLoweringPass();
 
-/// Return a pass that expands WinAlloca pseudo-instructions.
-FunctionPass *createX86WinAllocaExpander();
+/// Return a pass that expands DynAlloca pseudo-instructions.
+FunctionPass *createX86DynAllocaExpander();
 
 /// Return a pass that config the tile registers.
 FunctionPass *createX86TileConfigPass();
 
+/// Return a pass that preconfig the tile registers before fast reg allocation.
+FunctionPass *createX86FastPreTileConfigPass();
+
 /// Return a pass that config the tile registers after fast reg allocation.
 FunctionPass *createX86FastTileConfigPass();
 
@@ -133,6 +139,9 @@ FunctionPass *createX86EvexToVexInsts();
 /// This pass creates the thunks for the retpoline feature.
 FunctionPass *createX86IndirectThunksPass();
 
+/// This pass replaces ret instructions with jmp's to __x86_return thunk.
+FunctionPass *createX86ReturnThunksPass();
+
 /// This pass ensures instructions featuring a memory operand
 /// have distinctive <LineNumber, Discriminator> (with respect to eachother)
 FunctionPass *createX86DiscriminateMemOpsPass();
@@ -159,32 +168,36 @@ FunctionPass *createX86SpeculativeLoadHardeningPass();
 FunctionPass *createX86SpeculativeExecutionSideEffectSuppression();
 
 void initializeEvexToVexInstPassPass(PassRegistry &);
+void initializeFPSPass(PassRegistry &);
 void initializeFixupBWInstPassPass(PassRegistry &);
 void initializeFixupLEAPassPass(PassRegistry &);
-void initializeFPSPass(PassRegistry &);
 void initializeWinEHStatePassPass(PassRegistry &);
 void initializeX86AvoidSFBPassPass(PassRegistry &);
 void initializeX86AvoidTrailingCallPassPass(PassRegistry &);
 void initializeX86CallFrameOptimizationPass(PassRegistry &);
 void initializeX86CmovConverterPassPass(PassRegistry &);
+void initializeX86DAGToDAGISelPass(PassRegistry &);
 void initializeX86DomainReassignmentPass(PassRegistry &);
 void initializeX86ExecutionDomainFixPass(PassRegistry &);
 void initializeX86ExpandPseudoPass(PassRegistry &);
+void initializeX86FastPreTileConfigPass(PassRegistry &);
+void initializeX86FastTileConfigPass(PassRegistry &);
 void initializeX86FixupSetCCPassPass(PassRegistry &);
 void initializeX86FlagsCopyLoweringPassPass(PassRegistry &);
+void initializeX86KCFIPass(PassRegistry &);
 void initializeX86LoadValueInjectionLoadHardeningPassPass(PassRegistry &);
 void initializeX86LoadValueInjectionRetHardeningPassPass(PassRegistry &);
+void initializeX86LowerAMXIntrinsicsLegacyPassPass(PassRegistry &);
+void initializeX86LowerAMXTypeLegacyPassPass(PassRegistry &);
+void initializeX86LowerTileCopyPass(PassRegistry &);
 void initializeX86OptimizeLEAPassPass(PassRegistry &);
 void initializeX86PartialReductionPass(PassRegistry &);
-void initializeX86SpeculativeLoadHardeningPassPass(PassRegistry &);
-void initializeX86SpeculativeExecutionSideEffectSuppressionPass(PassRegistry &);
+void initializeX86PreAMXConfigPassPass(PassRegistry &);
 void initializeX86PreTileConfigPass(PassRegistry &);
-void initializeX86FastTileConfigPass(PassRegistry &);
+void initializeX86ReturnThunksPass(PassRegistry &);
+void initializeX86SpeculativeExecutionSideEffectSuppressionPass(PassRegistry &);
+void initializeX86SpeculativeLoadHardeningPassPass(PassRegistry &);
 void initializeX86TileConfigPass(PassRegistry &);
-void initializeX86LowerAMXTypeLegacyPassPass(PassRegistry &);
-void initializeX86PreAMXConfigPassPass(PassRegistry &);
-void initializeX86LowerTileCopyPass(PassRegistry &);
-void initializeX86LowerAMXIntrinsicsLegacyPassPass(PassRegistry &);
 
 namespace X86AS {
 enum : unsigned {
diff --git a/gnu/llvm/llvm/lib/Target/X86/X86.td b/gnu/llvm/llvm/lib/Target/X86/X86.td
index 52917dea510..783c573953e 100644
--- a/gnu/llvm/llvm/lib/Target/X86/X86.td
+++ b/gnu/llvm/llvm/lib/Target/X86/X86.td
@@ -18,29 +18,32 @@ include "llvm/Target/Target.td"
 //===----------------------------------------------------------------------===//
 // X86 Subtarget state
 //
-
-def Mode64Bit : SubtargetFeature<"64bit-mode", "In64BitMode", "true",
-                                  "64-bit mode (x86_64)">;
-def Mode32Bit : SubtargetFeature<"32bit-mode", "In32BitMode", "true",
-                                  "32-bit mode (80386)">;
-def Mode16Bit : SubtargetFeature<"16bit-mode", "In16BitMode", "true",
-                                  "16-bit mode (i8086)">;
+// disregarding specific ABI / programming model
+def Is64Bit : SubtargetFeature<"64bit-mode", "Is64Bit", "true",
+                               "64-bit mode (x86_64)">;
+def Is32Bit : SubtargetFeature<"32bit-mode", "Is32Bit", "true",
+                               "32-bit mode (80386)">;
+def Is16Bit : SubtargetFeature<"16bit-mode", "Is16Bit", "true",
+                               "16-bit mode (i8086)">;
 
 //===----------------------------------------------------------------------===//
-// X86 Subtarget features
+// X86 Subtarget ISA features
 //===----------------------------------------------------------------------===//
 
 def FeatureX87     : SubtargetFeature<"x87","HasX87", "true",
                                       "Enable X87 float instructions">;
 
 def FeatureNOPL    : SubtargetFeature<"nopl", "HasNOPL", "true",
-                                      "Enable NOPL instruction">;
+                                      "Enable NOPL instruction (generally pentium pro+)">;
 
-def FeatureCMOV    : SubtargetFeature<"cmov","HasCMov", "true",
+def FeatureCMOV    : SubtargetFeature<"cmov","HasCMOV", "true",
                                       "Enable conditional move instructions">;
 
-def FeatureCMPXCHG8B : SubtargetFeature<"cx8", "HasCmpxchg8b", "true",
-                                        "Support CMPXCHG8B instructions">;
+def FeatureCX8     : SubtargetFeature<"cx8", "HasCX8", "true",
+                                      "Support CMPXCHG8B instructions">;
+
+def FeatureCRC32   : SubtargetFeature<"crc32", "HasCRC32", "true",
+                                      "Enable SSE 4.2 CRC32 instruction (used when SSE4.2 is supported but function is GPR only)">;
 
 def FeaturePOPCNT   : SubtargetFeature<"popcnt", "HasPOPCNT", "true",
                                        "Support POPCNT instruction">;
@@ -95,25 +98,11 @@ def Feature3DNowA  : SubtargetFeature<"3dnowa", "X863DNowLevel", "ThreeDNowA",
 // feature, because SSE2 can be disabled (e.g. for compiling OS kernels)
 // without disabling 64-bit mode. Nothing should imply this feature bit. It
 // is used to enforce that only 64-bit capable CPUs are used in 64-bit mode.
-def Feature64Bit   : SubtargetFeature<"64bit", "HasX86_64", "true",
+def FeatureX86_64   : SubtargetFeature<"64bit", "HasX86_64", "true",
                                       "Support 64-bit instructions">;
-def FeatureCMPXCHG16B : SubtargetFeature<"cx16", "HasCmpxchg16b", "true",
-                                      "64-bit with cmpxchg16b",
-                                      [FeatureCMPXCHG8B]>;
-def FeatureSlowSHLD : SubtargetFeature<"slow-shld", "IsSHLDSlow", "true",
-                                       "SHLD instruction is slow">;
-def FeatureSlowPMULLD : SubtargetFeature<"slow-pmulld", "IsPMULLDSlow", "true",
-                                        "PMULLD instruction is slow">;
-def FeatureSlowPMADDWD : SubtargetFeature<"slow-pmaddwd", "IsPMADDWDSlow",
-                                          "true",
-                                          "PMADDWD is slower than PMULLD">;
-// FIXME: This should not apply to CPUs that do not have SSE.
-def FeatureSlowUAMem16 : SubtargetFeature<"slow-unaligned-mem-16",
-                                "IsUAMem16Slow", "true",
-                                "Slow unaligned 16-byte memory access">;
-def FeatureSlowUAMem32 : SubtargetFeature<"slow-unaligned-mem-32",
-                                "IsUAMem32Slow", "true",
-                                "Slow unaligned 32-byte memory access">;
+def FeatureCX16     : SubtargetFeature<"cx16", "HasCX16", "true",
+                                       "64-bit with cmpxchg16b (this is true for most x86-64 chips, but not the first AMD chips)",
+                                       [FeatureCX8]>;
 def FeatureSSE4A   : SubtargetFeature<"sse4a", "HasSSE4A", "true",
                                       "Support SSE 4a instructions",
                                       [FeatureSSE3]>;
@@ -130,7 +119,7 @@ def FeatureFMA     : SubtargetFeature<"fma", "HasFMA", "true",
 def FeatureF16C    : SubtargetFeature<"f16c", "HasF16C", "true",
                        "Support 16-bit floating point conversion instructions",
                        [FeatureAVX]>;
-def FeatureAVX512   : SubtargetFeature<"avx512f", "X86SSELevel", "AVX512F",
+def FeatureAVX512   : SubtargetFeature<"avx512f", "X86SSELevel", "AVX512",
                                       "Enable AVX-512 instructions",
                                       [FeatureAVX2, FeatureFMA, FeatureF16C]>;
 def FeatureERI      : SubtargetFeature<"avx512er", "HasERI", "true",
@@ -145,6 +134,9 @@ def FeatureVPOPCNTDQ : SubtargetFeature<"avx512vpopcntdq", "HasVPOPCNTDQ",
 def FeaturePFI      : SubtargetFeature<"avx512pf", "HasPFI", "true",
                       "Enable AVX-512 PreFetch Instructions",
                                       [FeatureAVX512]>;
+def FeaturePREFETCHI  : SubtargetFeature<"prefetchi", "HasPREFETCHI",
+                                   "true",
+                                   "Prefetch instruction with T0 or T1 Hint">;
 def FeaturePREFETCHWT1  : SubtargetFeature<"prefetchwt1", "HasPREFETCHWT1",
                                    "true",
                                    "Prefetch with Intent to Write and T1 Hint">;
@@ -163,6 +155,9 @@ def FeatureVBMI     : SubtargetFeature<"avx512vbmi", "HasVBMI", "true",
 def FeatureVBMI2    : SubtargetFeature<"avx512vbmi2", "HasVBMI2", "true",
                       "Enable AVX-512 further Vector Byte Manipulation Instructions",
                                       [FeatureBWI]>;
+def FeatureAVXIFMA    : SubtargetFeature<"avxifma", "HasAVXIFMA", "true",
+                           "Enable AVX-IFMA",
+                           [FeatureAVX2]>;
 def FeatureIFMA     : SubtargetFeature<"avx512ifma", "HasIFMA", "true",
                       "Enable AVX-512 Integer Fused Multiple-Add",
                                       [FeatureAVX512]>;
@@ -184,6 +179,18 @@ def FeatureVP2INTERSECT  : SubtargetFeature<"avx512vp2intersect",
                                             "HasVP2INTERSECT", "true",
                                             "Enable AVX-512 vp2intersect",
                                             [FeatureAVX512]>;
+// FIXME: FP16 scalar intrinsics use the type v8f16, which is supposed to be
+// guarded under condition hasVLX. So we imply it in FeatureFP16 currently.
+// FIXME: FP16 conversion between f16 and i64 customize type v8i64, which is
+// supposed to be guarded under condition hasDQI. So we imply it in FeatureFP16
+// currently.
+def FeatureFP16    : SubtargetFeature<"avx512fp16", "HasFP16", "true",
+                           "Support 16-bit floating point",
+                           [FeatureBWI, FeatureVLX, FeatureDQI]>;
+def FeatureAVXVNNIINT8  : SubtargetFeature<"avxvnniint8",
+                             "HasAVXVNNIINT8", "true",
+                             "Enable AVX-VNNI-INT8",
+                             [FeatureAVX2]>;
 def FeaturePCLMUL  : SubtargetFeature<"pclmul", "HasPCLMUL", "true",
                          "Enable packed carry-less multiplication instructions",
                                [FeatureSSE2]>;
@@ -201,7 +208,7 @@ def FeatureXOP     : SubtargetFeature<"xop", "HasXOP", "true",
                                       [FeatureFMA4]>;
 def FeatureSSEUnalignedMem : SubtargetFeature<"sse-unaligned-mem",
                                           "HasSSEUnalignedMem", "true",
-                      "Allow unaligned memory operands with SSE instructions">;
+                      "Allow unaligned memory operands with SSE instructions (this may require setting a configuration bit in the processor)">;
 def FeatureAES     : SubtargetFeature<"aes", "HasAES", "true",
                                       "Enable AES instructions",
                                       [FeatureSSE2]>;
@@ -231,20 +238,22 @@ def FeatureADX     : SubtargetFeature<"adx", "HasADX", "true",
 def FeatureSHA     : SubtargetFeature<"sha", "HasSHA", "true",
                                       "Enable SHA instructions",
                                       [FeatureSSE2]>;
+// Processor supports CET SHSTK - Control-Flow Enforcement Technology
+// using Shadow Stack
 def FeatureSHSTK   : SubtargetFeature<"shstk", "HasSHSTK", "true",
                        "Support CET Shadow-Stack instructions">;
 def FeaturePRFCHW  : SubtargetFeature<"prfchw", "HasPRFCHW", "true",
                                       "Support PRFCHW instructions">;
 def FeatureRDSEED  : SubtargetFeature<"rdseed", "HasRDSEED", "true",
                                       "Support RDSEED instruction">;
-def FeatureLAHFSAHF : SubtargetFeature<"sahf", "HasLAHFSAHF64", "true",
+def FeatureLAHFSAHF64 : SubtargetFeature<"sahf", "HasLAHFSAHF64", "true",
                            "Support LAHF and SAHF instructions in 64-bit mode">;
 def FeatureMWAITX  : SubtargetFeature<"mwaitx", "HasMWAITX", "true",
                                       "Enable MONITORX/MWAITX timer functionality">;
 def FeatureCLZERO  : SubtargetFeature<"clzero", "HasCLZERO", "true",
                                       "Enable Cache Line Zero">;
 def FeatureCLDEMOTE  : SubtargetFeature<"cldemote", "HasCLDEMOTE", "true",
-                                      "Enable Cache Demote">;
+                                      "Enable Cache Line Demote">;
 def FeaturePTWRITE  : SubtargetFeature<"ptwrite", "HasPTWRITE", "true",
                                       "Support ptwrite instruction">;
 def FeatureAMXTILE     : SubtargetFeature<"amx-tile", "HasAMXTILE", "true",
@@ -255,17 +264,17 @@ def FeatureAMXINT8     : SubtargetFeature<"amx-int8", "HasAMXINT8", "true",
 def FeatureAMXBF16     : SubtargetFeature<"amx-bf16", "HasAMXBF16", "true",
                                       "Support AMX-BF16 instructions",
                                       [FeatureAMXTILE]>;
-def FeatureLEAForSP : SubtargetFeature<"lea-sp", "UseLeaForSP", "true",
-                                     "Use LEA for adjusting the stack pointer">;
-def FeatureSlowDivide32 : SubtargetFeature<"idivl-to-divb",
-                                     "HasSlowDivide32", "true",
-                                     "Use 8-bit divide for positive values less than 256">;
-def FeatureSlowDivide64 : SubtargetFeature<"idivq-to-divl",
-                                     "HasSlowDivide64", "true",
-                                     "Use 32-bit divide for positive values less than 2^32">;
-def FeaturePadShortFunctions : SubtargetFeature<"pad-short-functions",
-                                     "PadShortFunctions", "true",
-                                     "Pad short functions">;
+def FeatureAMXFP16     : SubtargetFeature<"amx-fp16", "HasAMXFP16", "true",
+                                      "Support AMX amx-fp16 instructions",
+                                      [FeatureAMXTILE]>;
+def FeatureCMPCCXADD : SubtargetFeature<"cmpccxadd", "HasCMPCCXADD", "true",
+                                        "Support CMPCCXADD instructions">;
+def FeatureRAOINT : SubtargetFeature<"raoint", "HasRAOINT", "true",
+                                     "Support RAO-INT instructions",
+                                     []>;
+def FeatureAVXNECONVERT : SubtargetFeature<"avxneconvert", "HasAVXNECONVERT", "true",
+                                           "Support AVX-NE-CONVERT instructions",
+                                           [FeatureAVX2]>;
 def FeatureINVPCID : SubtargetFeature<"invpcid", "HasINVPCID", "true",
                                       "Invalidate Process-Context Identifier">;
 def FeatureSGX     : SubtargetFeature<"sgx", "HasSGX", "true",
@@ -278,6 +287,8 @@ def FeatureWBNOINVD    : SubtargetFeature<"wbnoinvd", "HasWBNOINVD", "true",
                                       "Write Back No Invalidate">;
 def FeatureRDPID : SubtargetFeature<"rdpid", "HasRDPID", "true",
                                     "Support RDPID instructions">;
+def FeatureRDPRU : SubtargetFeature<"rdpru", "HasRDPRU", "true",
+                                    "Support RDPRU instructions">;
 def FeatureWAITPKG  : SubtargetFeature<"waitpkg", "HasWAITPKG", "true",
                                       "Wait and pause enhancements">;
 def FeatureENQCMD : SubtargetFeature<"enqcmd", "HasENQCMD", "true",
@@ -296,119 +307,299 @@ def FeatureTSXLDTRK : SubtargetFeature<"tsxldtrk", "HasTSXLDTRK", "true",
                                        "Support TSXLDTRK instructions">;
 def FeatureUINTR : SubtargetFeature<"uintr", "HasUINTR", "true",
                                     "Has UINTR Instructions">;
+def FeaturePCONFIG : SubtargetFeature<"pconfig", "HasPCONFIG", "true",
+                                      "platform configuration instruction">;
+def FeatureMOVDIRI  : SubtargetFeature<"movdiri", "HasMOVDIRI", "true",
+                                       "Support movdiri instruction (direct store integer)">;
+def FeatureMOVDIR64B : SubtargetFeature<"movdir64b", "HasMOVDIR64B", "true",
+                                        "Support movdir64b instruction (direct store 64 bytes)">;
+
+// Ivy Bridge and newer processors have enhanced REP MOVSB and STOSB (aka
+// "string operations"). See "REP String Enhancement" in the Intel Software
+// Development Manual. This feature essentially means that REP MOVSB will copy
+// using the largest available size instead of copying bytes one by one, making
+// it at least as fast as REPMOVS{W,D,Q}.
+def FeatureERMSB
+    : SubtargetFeature<
+          "ermsb", "HasERMSB", "true",
+          "REP MOVS/STOS are fast">;
+
+// Icelake and newer processors have Fast Short REP MOV.
+def FeatureFSRM
+    : SubtargetFeature<
+          "fsrm", "HasFSRM", "true",
+          "REP MOVSB of short lengths is faster">;
+
+def FeatureSoftFloat
+    : SubtargetFeature<"soft-float", "UseSoftFloat", "true",
+                       "Use software floating point features">;
+
+//===----------------------------------------------------------------------===//
+// X86 Subtarget Security Mitigation features
+//===----------------------------------------------------------------------===//
+
+// Lower indirect calls using a special construct called a `retpoline` to
+// mitigate potential Spectre v2 attacks against them.
+def FeatureRetpolineIndirectCalls
+    : SubtargetFeature<
+          "retpoline-indirect-calls", "UseRetpolineIndirectCalls", "true",
+          "Remove speculation of indirect calls from the generated code">;
+
+// Lower indirect branches and switches either using conditional branch trees
+// or using a special construct called a `retpoline` to mitigate potential
+// Spectre v2 attacks against them.
+def FeatureRetpolineIndirectBranches
+    : SubtargetFeature<
+          "retpoline-indirect-branches", "UseRetpolineIndirectBranches", "true",
+          "Remove speculation of indirect branches from the generated code">;
+
+// Deprecated umbrella feature for enabling both `retpoline-indirect-calls` and
+// `retpoline-indirect-branches` above.
+def FeatureRetpoline
+    : SubtargetFeature<"retpoline", "DeprecatedUseRetpoline", "true",
+                       "Remove speculation of indirect branches from the "
+                       "generated code, either by avoiding them entirely or "
+                       "lowering them with a speculation blocking construct",
+                       [FeatureRetpolineIndirectCalls,
+                        FeatureRetpolineIndirectBranches]>;
+
+// Rely on external thunks for the emitted retpoline calls. This allows users
+// to provide their own custom thunk definitions in highly specialized
+// environments such as a kernel that does boot-time hot patching.
+def FeatureRetpolineExternalThunk
+    : SubtargetFeature<
+          "retpoline-external-thunk", "UseRetpolineExternalThunk", "true",
+          "When lowering an indirect call or branch using a `retpoline`, rely "
+          "on the specified user provided thunk rather than emitting one "
+          "ourselves. Only has effect when combined with some other retpoline "
+          "feature", [FeatureRetpolineIndirectCalls]>;
+
+// Mitigate LVI attacks against indirect calls/branches and call returns
+def FeatureLVIControlFlowIntegrity
+    : SubtargetFeature<
+          "lvi-cfi", "UseLVIControlFlowIntegrity", "true",
+          "Prevent indirect calls/branches from using a memory operand, and "
+          "precede all indirect calls/branches from a register with an "
+          "LFENCE instruction to serialize control flow. Also decompose RET "
+          "instructions into a POP+LFENCE+JMP sequence.">;
+
+// Enable SESES to mitigate speculative execution attacks
+def FeatureSpeculativeExecutionSideEffectSuppression
+    : SubtargetFeature<
+          "seses", "UseSpeculativeExecutionSideEffectSuppression", "true",
+          "Prevent speculative execution side channel timing attacks by "
+          "inserting a speculation barrier before memory reads, memory writes, "
+          "and conditional branches. Implies LVI Control Flow integrity.",
+          [FeatureLVIControlFlowIntegrity]>;
+
+// Mitigate LVI attacks against data loads
+def FeatureLVILoadHardening
+    : SubtargetFeature<
+          "lvi-load-hardening", "UseLVILoadHardening", "true",
+          "Insert LFENCE instructions to prevent data speculatively injected "
+          "into loads from being used maliciously.">;
+
+def FeatureTaggedGlobals
+    : SubtargetFeature<
+          "tagged-globals", "AllowTaggedGlobals", "true",
+          "Use an instruction sequence for taking the address of a global "
+          "that allows a memory tag in the upper address bits.">;
+
+// Control codegen mitigation against Straight Line Speculation vulnerability.
+def FeatureHardenSlsRet
+    : SubtargetFeature<
+          "harden-sls-ret", "HardenSlsRet", "true",
+          "Harden against straight line speculation across RET instructions.">;
+
+def FeatureHardenSlsIJmp
+    : SubtargetFeature<
+          "harden-sls-ijmp", "HardenSlsIJmp", "true",
+          "Harden against straight line speculation across indirect JMP instructions.">;
+
+//===----------------------------------------------------------------------===//
+// X86 Subtarget Tuning features
+//===----------------------------------------------------------------------===//
+
+def TuningSlowSHLD : SubtargetFeature<"slow-shld", "IsSHLDSlow", "true",
+                                       "SHLD instruction is slow">;
+
+def TuningSlowPMULLD : SubtargetFeature<"slow-pmulld", "IsPMULLDSlow", "true",
+                                        "PMULLD instruction is slow (compared to PMULLW/PMULHW and PMULUDQ)">;
+
+def TuningSlowPMADDWD : SubtargetFeature<"slow-pmaddwd", "IsPMADDWDSlow",
+                                          "true",
+                                          "PMADDWD is slower than PMULLD">;
+
+// FIXME: This should not apply to CPUs that do not have SSE.
+def TuningSlowUAMem16 : SubtargetFeature<"slow-unaligned-mem-16",
+                                "IsUnalignedMem16Slow", "true",
+                                "Slow unaligned 16-byte memory access">;
+
+def TuningSlowUAMem32 : SubtargetFeature<"slow-unaligned-mem-32",
+                                "IsUnalignedMem32Slow", "true",
+                                "Slow unaligned 32-byte memory access">;
+
+def TuningLEAForSP : SubtargetFeature<"lea-sp", "UseLeaForSP", "true",
+                                     "Use LEA for adjusting the stack pointer (this is an optimization for Intel Atom processors)">;
+
+// True if 8-bit divisions are significantly faster than
+// 32-bit divisions and should be used when possible.
+def TuningSlowDivide32 : SubtargetFeature<"idivl-to-divb",
+                                     "HasSlowDivide32", "true",
+                                     "Use 8-bit divide for positive values less than 256">;
+
+// True if 32-bit divides are significantly faster than
+// 64-bit divisions and should be used when possible.
+def TuningSlowDivide64 : SubtargetFeature<"idivq-to-divl",
+                                     "HasSlowDivide64", "true",
+                                     "Use 32-bit divide for positive values less than 2^32">;
+
+def TuningPadShortFunctions : SubtargetFeature<"pad-short-functions",
+                                     "PadShortFunctions", "true",
+                                     "Pad short functions (to prevent a stall when returning too early)">;
+
 // On some processors, instructions that implicitly take two memory operands are
 // slow. In practice, this means that CALL, PUSH, and POP with memory operands
 // should be avoided in favor of a MOV + register CALL/PUSH/POP.
-def FeatureSlowTwoMemOps : SubtargetFeature<"slow-two-mem-ops",
+def TuningSlowTwoMemOps : SubtargetFeature<"slow-two-mem-ops",
                                      "SlowTwoMemOps", "true",
                                      "Two memory operand instructions are slow">;
-def FeatureLEAUsesAG : SubtargetFeature<"lea-uses-ag", "LEAUsesAG", "true",
+
+// True if the LEA instruction inputs have to be ready at address generation
+// (AG) time.
+def TuningLEAUsesAG : SubtargetFeature<"lea-uses-ag", "LeaUsesAG", "true",
                                    "LEA instruction needs inputs at AG stage">;
-def FeatureSlowLEA : SubtargetFeature<"slow-lea", "SlowLEA", "true",
+
+def TuningSlowLEA : SubtargetFeature<"slow-lea", "SlowLEA", "true",
                                    "LEA instruction with certain arguments is slow">;
-def FeatureSlow3OpsLEA : SubtargetFeature<"slow-3ops-lea", "Slow3OpsLEA", "true",
+
+// True if the LEA instruction has all three source operands: base, index,
+// and offset or if the LEA instruction uses base and index registers where
+// the base is EBP, RBP,or R13
+def TuningSlow3OpsLEA : SubtargetFeature<"slow-3ops-lea", "Slow3OpsLEA", "true",
                                    "LEA instruction with 3 ops or certain registers is slow">;
-def FeatureSlowIncDec : SubtargetFeature<"slow-incdec", "SlowIncDec", "true",
+
+// True if INC and DEC instructions are slow when writing to flags
+def TuningSlowIncDec : SubtargetFeature<"slow-incdec", "SlowIncDec", "true",
                                    "INC and DEC instructions are slower than ADD and SUB">;
-def FeatureSoftFloat
-    : SubtargetFeature<"soft-float", "UseSoftFloat", "true",
-                       "Use software floating point features">;
-def FeaturePOPCNTFalseDeps : SubtargetFeature<"false-deps-popcnt",
+
+def TuningPOPCNTFalseDeps : SubtargetFeature<"false-deps-popcnt",
                                      "HasPOPCNTFalseDeps", "true",
                                      "POPCNT has a false dependency on dest register">;
-def FeatureLZCNTFalseDeps : SubtargetFeature<"false-deps-lzcnt-tzcnt",
+
+def TuningLZCNTFalseDeps : SubtargetFeature<"false-deps-lzcnt-tzcnt",
                                      "HasLZCNTFalseDeps", "true",
                                      "LZCNT/TZCNT have a false dependency on dest register">;
-def FeaturePCONFIG : SubtargetFeature<"pconfig", "HasPCONFIG", "true",
-                                      "platform configuration instruction">;
+
 def FeatureSaveArgs
     : SubtargetFeature<"save-args", "SaveArgs", "true",
                        "Save register arguments on the stack.">;
+
+def TuningMULCFalseDeps : SubtargetFeature<"false-deps-mulc",
+                               "HasMULCFalseDeps", "true",
+                               "VF[C]MULCPH/SH has a false dependency on dest register">;
+
+def TuningPERMFalseDeps : SubtargetFeature<"false-deps-perm",
+                               "HasPERMFalseDeps", "true",
+                               "VPERMD/Q/PS/PD has a false dependency on dest register">;
+
+def TuningRANGEFalseDeps : SubtargetFeature<"false-deps-range",
+                               "HasRANGEFalseDeps", "true",
+                               "VRANGEPD/PS/SD/SS has a false dependency on dest register">;
+
+def TuningGETMANTFalseDeps : SubtargetFeature<"false-deps-getmant",
+                               "HasGETMANTFalseDeps", "true",
+                               "VGETMANTSS/SD/SH and VGETMANDPS/PD(memory version) has a"
+                               " false dependency on dest register">;
+
+def TuningMULLQFalseDeps : SubtargetFeature<"false-deps-mullq",
+                               "HasMULLQFalseDeps", "true",
+                               "VPMULLQ has a false dependency on dest register">;
+
+def TuningSBBDepBreaking : SubtargetFeature<"sbb-dep-breaking",
+                                     "HasSBBDepBreaking", "true",
+                                     "SBB with same register has no source dependency">;
+
 // On recent X86 (port bound) processors, its preferable to combine to a single shuffle
 // using a variable mask over multiple fixed shuffles.
-def FeatureFastVariableCrossLaneShuffle
+def TuningFastVariableCrossLaneShuffle
     : SubtargetFeature<"fast-variable-crosslane-shuffle",
                        "HasFastVariableCrossLaneShuffle",
                        "true", "Cross-lane shuffles with variable masks are fast">;
-def FeatureFastVariablePerLaneShuffle
+def TuningFastVariablePerLaneShuffle
     : SubtargetFeature<"fast-variable-perlane-shuffle",
                        "HasFastVariablePerLaneShuffle",
                        "true", "Per-lane shuffles with variable masks are fast">;
 
 // On some X86 processors, a vzeroupper instruction should be inserted after
 // using ymm/zmm registers before executing code that may use SSE instructions.
-def FeatureInsertVZEROUPPER
+def TuningInsertVZEROUPPER
     : SubtargetFeature<"vzeroupper",
                        "InsertVZEROUPPER",
                        "true", "Should insert vzeroupper instructions">;
-// FeatureFastScalarFSQRT should be enabled if scalar FSQRT has shorter latency
-// than the corresponding NR code. FeatureFastVectorFSQRT should be enabled if
+
+// TuningFastScalarFSQRT should be enabled if scalar FSQRT has shorter latency
+// than the corresponding NR code. TuningFastVectorFSQRT should be enabled if
 // vector FSQRT has higher throughput than the corresponding NR code.
 // The idea is that throughput bound code is likely to be vectorized, so for
 // vectorized code we should care about the throughput of SQRT operations.
 // But if the code is scalar that probably means that the code has some kind of
 // dependency and we should care more about reducing the latency.
-def FeatureFastScalarFSQRT
+
+// True if hardware SQRTSS instruction is at least as fast (latency) as
+// RSQRTSS followed by a Newton-Raphson iteration.
+def TuningFastScalarFSQRT
     : SubtargetFeature<"fast-scalar-fsqrt", "HasFastScalarFSQRT",
                        "true", "Scalar SQRT is fast (disable Newton-Raphson)">;
-def FeatureFastVectorFSQRT
+// True if hardware SQRTPS/VSQRTPS instructions are at least as fast
+// (throughput) as RSQRTPS/VRSQRTPS followed by a Newton-Raphson iteration.
+def TuningFastVectorFSQRT
     : SubtargetFeature<"fast-vector-fsqrt", "HasFastVectorFSQRT",
                        "true", "Vector SQRT is fast (disable Newton-Raphson)">;
+
 // If lzcnt has equivalent latency/throughput to most simple integer ops, it can
 // be used to replace test/set sequences.
-def FeatureFastLZCNT
+def TuningFastLZCNT
     : SubtargetFeature<
           "fast-lzcnt", "HasFastLZCNT", "true",
           "LZCNT instructions are as fast as most simple integer ops">;
+
 // If the target can efficiently decode NOPs upto 7-bytes in length.
-def FeatureFast7ByteNOP
+def TuningFast7ByteNOP
     : SubtargetFeature<
           "fast-7bytenop", "HasFast7ByteNOP", "true",
           "Target can quickly decode up to 7 byte NOPs">;
+
 // If the target can efficiently decode NOPs upto 11-bytes in length.
-def FeatureFast11ByteNOP
+def TuningFast11ByteNOP
     : SubtargetFeature<
           "fast-11bytenop", "HasFast11ByteNOP", "true",
           "Target can quickly decode up to 11 byte NOPs">;
+
 // If the target can efficiently decode NOPs upto 15-bytes in length.
-def FeatureFast15ByteNOP
+def TuningFast15ByteNOP
     : SubtargetFeature<
           "fast-15bytenop", "HasFast15ByteNOP", "true",
           "Target can quickly decode up to 15 byte NOPs">;
+
 // Sandy Bridge and newer processors can use SHLD with the same source on both
 // inputs to implement rotate to avoid the partial flag update of the normal
 // rotate instructions.
-def FeatureFastSHLDRotate
+def TuningFastSHLDRotate
     : SubtargetFeature<
           "fast-shld-rotate", "HasFastSHLDRotate", "true",
           "SHLD can be used as a faster rotate">;
 
-// Ivy Bridge and newer processors have enhanced REP MOVSB and STOSB (aka
-// "string operations"). See "REP String Enhancement" in the Intel Software
-// Development Manual. This feature essentially means that REP MOVSB will copy
-// using the largest available size instead of copying bytes one by one, making
-// it at least as fast as REPMOVS{W,D,Q}.
-def FeatureERMSB
-    : SubtargetFeature<
-          "ermsb", "HasERMSB", "true",
-          "REP MOVS/STOS are fast">;
-
-// Icelake and newer processors have Fast Short REP MOV.
-def FeatureFSRM
-    : SubtargetFeature<
-          "fsrm", "HasFSRM", "true",
-          "REP MOVSB of short lengths is faster">;
-
 // Bulldozer and newer processors can merge CMP/TEST (but not other
 // instructions) with conditional branches.
-def FeatureBranchFusion
+def TuningBranchFusion
     : SubtargetFeature<"branchfusion", "HasBranchFusion", "true",
                  "CMP/TEST can be fused with conditional branches">;
 
 // Sandy Bridge and newer processors have many instructions that can be
 // fused with conditional branches and pass through the CPU as a single
 // operation.
-def FeatureMacroFusion
+def TuningMacroFusion
     : SubtargetFeature<"macrofusion", "HasMacroFusion", "true",
                  "Various instructions can be fused with conditional branches">;
 
@@ -416,128 +607,68 @@ def FeatureMacroFusion
 // generate Gathers on all AVX2 processors. But the overhead on HSW is high.
 // Skylake Client processor has faster Gathers than HSW and performance is
 // similar to Skylake Server (AVX-512).
-def FeatureHasFastGather
+def TuningFastGather
     : SubtargetFeature<"fast-gather", "HasFastGather", "true",
-                       "Indicates if gather is reasonably fast">;
+                       "Indicates if gather is reasonably fast (this is true for Skylake client and all AVX-512 CPUs)">;
 
-def FeaturePrefer128Bit
+def TuningPrefer128Bit
     : SubtargetFeature<"prefer-128-bit", "Prefer128Bit", "true",
                        "Prefer 128-bit AVX instructions">;
 
-def FeaturePrefer256Bit
+def TuningPrefer256Bit
     : SubtargetFeature<"prefer-256-bit", "Prefer256Bit", "true",
                        "Prefer 256-bit AVX instructions">;
 
-def FeaturePreferMaskRegisters
+def TuningAllowLight256Bit
+    : SubtargetFeature<"allow-light-256-bit", "AllowLight256Bit", "true",
+                       "Enable generation of 256-bit load/stores even if we prefer 128-bit">;
+
+def TuningPreferMaskRegisters
     : SubtargetFeature<"prefer-mask-registers", "PreferMaskRegisters", "true",
                        "Prefer AVX512 mask registers over PTEST/MOVMSK">;
 
-// Lower indirect calls using a special construct called a `retpoline` to
-// mitigate potential Spectre v2 attacks against them.
-def FeatureRetpolineIndirectCalls
-    : SubtargetFeature<
-          "retpoline-indirect-calls", "UseRetpolineIndirectCalls", "true",
-          "Remove speculation of indirect calls from the generated code">;
-
-// Lower indirect branches and switches either using conditional branch trees
-// or using a special construct called a `retpoline` to mitigate potential
-// Spectre v2 attacks against them.
-def FeatureRetpolineIndirectBranches
-    : SubtargetFeature<
-          "retpoline-indirect-branches", "UseRetpolineIndirectBranches", "true",
-          "Remove speculation of indirect branches from the generated code">;
-
-// Deprecated umbrella feature for enabling both `retpoline-indirect-calls` and
-// `retpoline-indirect-branches` above.
-def FeatureRetpoline
-    : SubtargetFeature<"retpoline", "DeprecatedUseRetpoline", "true",
-                       "Remove speculation of indirect branches from the "
-                       "generated code, either by avoiding them entirely or "
-                       "lowering them with a speculation blocking construct",
-                       [FeatureRetpolineIndirectCalls,
-                        FeatureRetpolineIndirectBranches]>;
-
-// Rely on external thunks for the emitted retpoline calls. This allows users
-// to provide their own custom thunk definitions in highly specialized
-// environments such as a kernel that does boot-time hot patching.
-def FeatureRetpolineExternalThunk
-    : SubtargetFeature<
-          "retpoline-external-thunk", "UseRetpolineExternalThunk", "true",
-          "When lowering an indirect call or branch using a `retpoline`, rely "
-          "on the specified user provided thunk rather than emitting one "
-          "ourselves. Only has effect when combined with some other retpoline "
-          "feature", [FeatureRetpolineIndirectCalls]>;
-
-// Mitigate LVI attacks against indirect calls/branches and call returns
-def FeatureLVIControlFlowIntegrity
-    : SubtargetFeature<
-          "lvi-cfi", "UseLVIControlFlowIntegrity", "true",
-          "Prevent indirect calls/branches from using a memory operand, and "
-          "precede all indirect calls/branches from a register with an "
-          "LFENCE instruction to serialize control flow. Also decompose RET "
-          "instructions into a POP+LFENCE+JMP sequence.">;
-
-// Enable SESES to mitigate speculative execution attacks
-def FeatureSpeculativeExecutionSideEffectSuppression
-    : SubtargetFeature<
-          "seses", "UseSpeculativeExecutionSideEffectSuppression", "true",
-          "Prevent speculative execution side channel timing attacks by "
-          "inserting a speculation barrier before memory reads, memory writes, "
-          "and conditional branches. Implies LVI Control Flow integrity.",
-          [FeatureLVIControlFlowIntegrity]>;
-
-// Mitigate LVI attacks against data loads
-def FeatureLVILoadHardening
-    : SubtargetFeature<
-          "lvi-load-hardening", "UseLVILoadHardening", "true",
-          "Insert LFENCE instructions to prevent data speculatively injected "
-          "into loads from being used maliciously.">;
-
-// Direct Move instructions.
-def FeatureMOVDIRI  : SubtargetFeature<"movdiri", "HasMOVDIRI", "true",
-                                       "Support movdiri instruction">;
-def FeatureMOVDIR64B : SubtargetFeature<"movdir64b", "HasMOVDIR64B", "true",
-                                        "Support movdir64b instruction">;
-
-def FeatureFastBEXTR : SubtargetFeature<"fast-bextr", "HasFastBEXTR", "true",
+def TuningFastBEXTR : SubtargetFeature<"fast-bextr", "HasFastBEXTR", "true",
           "Indicates that the BEXTR instruction is implemented as a single uop "
           "with good throughput">;
 
 // Combine vector math operations with shuffles into horizontal math
 // instructions if a CPU implements horizontal operations (introduced with
 // SSE3) with better latency/throughput than the alternative sequence.
-def FeatureFastHorizontalOps
+def TuningFastHorizontalOps
     : SubtargetFeature<
         "fast-hops", "HasFastHorizontalOps", "true",
         "Prefer horizontal vector math instructions (haddp, phsub, etc.) over "
         "normal vector instructions with shuffles">;
 
-def FeatureFastScalarShiftMasks
+def TuningFastScalarShiftMasks
     : SubtargetFeature<
         "fast-scalar-shift-masks", "HasFastScalarShiftMasks", "true",
         "Prefer a left/right scalar logical shift pair over a shift+and pair">;
 
-def FeatureFastVectorShiftMasks
+def TuningFastVectorShiftMasks
     : SubtargetFeature<
         "fast-vector-shift-masks", "HasFastVectorShiftMasks", "true",
         "Prefer a left/right vector logical shift pair over a shift+and pair">;
 
-def FeatureFastMOVBE
+def TuningFastMOVBE
     : SubtargetFeature<"fast-movbe", "HasFastMOVBE", "true",
     "Prefer a movbe over a single-use load + bswap / single-use bswap + store">;
 
-def FeatureUseGLMDivSqrtCosts
+def TuningUseSLMArithCosts
+    : SubtargetFeature<"use-slm-arith-costs", "UseSLMArithCosts", "true",
+        "Use Silvermont specific arithmetic costs">;
+
+def TuningUseGLMDivSqrtCosts
     : SubtargetFeature<"use-glm-div-sqrt-costs", "UseGLMDivSqrtCosts", "true",
         "Use Goldmont specific floating point div/sqrt costs">;
 
-// Enable use of alias analysis during code generation.
-def FeatureUseAA : SubtargetFeature<"use-aa", "UseAA", "true",
-                                    "Use alias analysis during codegen">;
+//===----------------------------------------------------------------------===//
+// X86 CPU Families
+// TODO: Remove these - use general tuning features to determine codegen.
+//===----------------------------------------------------------------------===//
 
 // Bonnell
-def ProcIntelAtom : SubtargetFeature<"", "X86ProcFamily", "IntelAtom", "">;
-// Silvermont
-def ProcIntelSLM  : SubtargetFeature<"", "X86ProcFamily", "IntelSLM", "">;
+def ProcIntelAtom : SubtargetFeature<"", "IsAtom", "true", "Is Intel Atom processor">;
 
 //===----------------------------------------------------------------------===//
 // Register File Description
@@ -568,10 +699,13 @@ include "X86ScheduleSLM.td"
 include "X86ScheduleZnver1.td"
 include "X86ScheduleZnver2.td"
 include "X86ScheduleZnver3.td"
+include "X86ScheduleZnver4.td"
 include "X86ScheduleBdVer2.td"
 include "X86ScheduleBtVer2.td"
 include "X86SchedSkylakeClient.td"
 include "X86SchedSkylakeServer.td"
+include "X86SchedIceLake.td"
+include "X86SchedAlderlakeP.td"
 
 //===----------------------------------------------------------------------===//
 // X86 Processor Feature Lists
@@ -580,12 +714,13 @@ include "X86SchedSkylakeServer.td"
 def ProcessorFeatures {
   // x86-64 and x86-64-v[234]
   list<SubtargetFeature> X86_64V1Features = [
-    FeatureX87, FeatureCMPXCHG8B, FeatureCMOV, FeatureMMX, FeatureSSE2,
-    FeatureFXSR, FeatureNOPL, Feature64Bit
+    FeatureX87, FeatureCX8, FeatureCMOV, FeatureMMX, FeatureSSE2,
+    FeatureFXSR, FeatureNOPL, FeatureX86_64,
   ];
-  list<SubtargetFeature> X86_64V2Features = !listconcat(
-      X86_64V1Features,
-      [FeatureCMPXCHG16B, FeatureLAHFSAHF, FeaturePOPCNT, FeatureSSE42]);
+  list<SubtargetFeature> X86_64V2Features = !listconcat(X86_64V1Features, [
+    FeatureCX16, FeatureLAHFSAHF64, FeatureCRC32, FeaturePOPCNT,
+    FeatureSSE42
+  ]);
   list<SubtargetFeature> X86_64V3Features = !listconcat(X86_64V2Features, [
     FeatureAVX2, FeatureBMI, FeatureBMI2, FeatureF16C, FeatureFMA, FeatureLZCNT,
     FeatureMOVBE, FeatureXSAVE
@@ -599,8 +734,8 @@ def ProcessorFeatures {
 
   // Nehalem
   list<SubtargetFeature> NHMFeatures = X86_64V2Features;
-  list<SubtargetFeature> NHMTuning = [FeatureMacroFusion,
-                                      FeatureInsertVZEROUPPER];
+  list<SubtargetFeature> NHMTuning = [TuningMacroFusion,
+                                      TuningInsertVZEROUPPER];
 
   // Westmere
   list<SubtargetFeature> WSMAdditionalFeatures = [FeaturePCLMUL];
@@ -612,15 +747,15 @@ def ProcessorFeatures {
   list<SubtargetFeature> SNBAdditionalFeatures = [FeatureAVX,
                                                   FeatureXSAVE,
                                                   FeatureXSAVEOPT];
-  list<SubtargetFeature> SNBTuning = [FeatureMacroFusion,
-                                      FeatureSlow3OpsLEA,
-                                      FeatureSlowDivide64,
-                                      FeatureSlowUAMem32,
-                                      FeatureFastScalarFSQRT,
-                                      FeatureFastSHLDRotate,
-                                      FeatureFast15ByteNOP,
-                                      FeaturePOPCNTFalseDeps,
-                                      FeatureInsertVZEROUPPER];
+  list<SubtargetFeature> SNBTuning = [TuningMacroFusion,
+                                      TuningSlow3OpsLEA,
+                                      TuningSlowDivide64,
+                                      TuningSlowUAMem32,
+                                      TuningFastScalarFSQRT,
+                                      TuningFastSHLDRotate,
+                                      TuningFast15ByteNOP,
+                                      TuningPOPCNTFalseDeps,
+                                      TuningInsertVZEROUPPER];
   list<SubtargetFeature> SNBFeatures =
     !listconcat(WSMFeatures, SNBAdditionalFeatures);
 
@@ -641,17 +776,18 @@ def ProcessorFeatures {
                                                   FeatureINVPCID,
                                                   FeatureLZCNT,
                                                   FeatureMOVBE];
-  list<SubtargetFeature> HSWTuning = [FeatureMacroFusion,
-                                      FeatureSlow3OpsLEA,
-                                      FeatureSlowDivide64,
-                                      FeatureFastScalarFSQRT,
-                                      FeatureFastSHLDRotate,
-                                      FeatureFast15ByteNOP,
-                                      FeatureFastVariableCrossLaneShuffle,
-                                      FeatureFastVariablePerLaneShuffle,
-                                      FeaturePOPCNTFalseDeps,
-                                      FeatureLZCNTFalseDeps,
-                                      FeatureInsertVZEROUPPER];
+  list<SubtargetFeature> HSWTuning = [TuningMacroFusion,
+                                      TuningSlow3OpsLEA,
+                                      TuningSlowDivide64,
+                                      TuningFastScalarFSQRT,
+                                      TuningFastSHLDRotate,
+                                      TuningFast15ByteNOP,
+                                      TuningFastVariableCrossLaneShuffle,
+                                      TuningFastVariablePerLaneShuffle,
+                                      TuningPOPCNTFalseDeps,
+                                      TuningLZCNTFalseDeps,
+                                      TuningInsertVZEROUPPER,
+                                      TuningAllowLight256Bit];
   list<SubtargetFeature> HSWFeatures =
     !listconcat(IVBFeatures, HSWAdditionalFeatures);
 
@@ -668,18 +804,19 @@ def ProcessorFeatures {
                                                   FeatureXSAVEC,
                                                   FeatureXSAVES,
                                                   FeatureCLFLUSHOPT];
-  list<SubtargetFeature> SKLTuning = [FeatureHasFastGather,
-                                      FeatureMacroFusion,
-                                      FeatureSlow3OpsLEA,
-                                      FeatureSlowDivide64,
-                                      FeatureFastScalarFSQRT,
-                                      FeatureFastVectorFSQRT,
-                                      FeatureFastSHLDRotate,
-                                      FeatureFast15ByteNOP,
-                                      FeatureFastVariableCrossLaneShuffle,
-                                      FeatureFastVariablePerLaneShuffle,
-                                      FeaturePOPCNTFalseDeps,
-                                      FeatureInsertVZEROUPPER];
+  list<SubtargetFeature> SKLTuning = [TuningFastGather,
+                                      TuningMacroFusion,
+                                      TuningSlow3OpsLEA,
+                                      TuningSlowDivide64,
+                                      TuningFastScalarFSQRT,
+                                      TuningFastVectorFSQRT,
+                                      TuningFastSHLDRotate,
+                                      TuningFast15ByteNOP,
+                                      TuningFastVariableCrossLaneShuffle,
+                                      TuningFastVariablePerLaneShuffle,
+                                      TuningPOPCNTFalseDeps,
+                                      TuningInsertVZEROUPPER,
+                                      TuningAllowLight256Bit];
   list<SubtargetFeature> SKLFeatures =
     !listconcat(BDWFeatures, SKLAdditionalFeatures);
 
@@ -695,19 +832,20 @@ def ProcessorFeatures {
                                                   FeatureVLX,
                                                   FeaturePKU,
                                                   FeatureCLWB];
-  list<SubtargetFeature> SKXTuning = [FeatureHasFastGather,
-                                      FeatureMacroFusion,
-                                      FeatureSlow3OpsLEA,
-                                      FeatureSlowDivide64,
-                                      FeatureFastScalarFSQRT,
-                                      FeatureFastVectorFSQRT,
-                                      FeatureFastSHLDRotate,
-                                      FeatureFast15ByteNOP,
-                                      FeatureFastVariableCrossLaneShuffle,
-                                      FeatureFastVariablePerLaneShuffle,
-                                      FeaturePrefer256Bit,
-                                      FeaturePOPCNTFalseDeps,
-                                      FeatureInsertVZEROUPPER];
+  list<SubtargetFeature> SKXTuning = [TuningFastGather,
+                                      TuningMacroFusion,
+                                      TuningSlow3OpsLEA,
+                                      TuningSlowDivide64,
+                                      TuningFastScalarFSQRT,
+                                      TuningFastVectorFSQRT,
+                                      TuningFastSHLDRotate,
+                                      TuningFast15ByteNOP,
+                                      TuningFastVariableCrossLaneShuffle,
+                                      TuningFastVariablePerLaneShuffle,
+                                      TuningPrefer256Bit,
+                                      TuningPOPCNTFalseDeps,
+                                      TuningInsertVZEROUPPER,
+                                      TuningAllowLight256Bit];
   list<SubtargetFeature> SKXFeatures =
     !listconcat(BDWFeatures, SKXAdditionalFeatures);
 
@@ -733,18 +871,19 @@ def ProcessorFeatures {
                                                   FeatureVBMI,
                                                   FeatureIFMA,
                                                   FeatureSHA];
-  list<SubtargetFeature> CNLTuning = [FeatureHasFastGather,
-                                      FeatureMacroFusion,
-                                      FeatureSlow3OpsLEA,
-                                      FeatureSlowDivide64,
-                                      FeatureFastScalarFSQRT,
-                                      FeatureFastVectorFSQRT,
-                                      FeatureFastSHLDRotate,
-                                      FeatureFast15ByteNOP,
-                                      FeatureFastVariableCrossLaneShuffle,
-                                      FeatureFastVariablePerLaneShuffle,
-                                      FeaturePrefer256Bit,
-                                      FeatureInsertVZEROUPPER];
+  list<SubtargetFeature> CNLTuning = [TuningFastGather,
+                                      TuningMacroFusion,
+                                      TuningSlow3OpsLEA,
+                                      TuningSlowDivide64,
+                                      TuningFastScalarFSQRT,
+                                      TuningFastVectorFSQRT,
+                                      TuningFastSHLDRotate,
+                                      TuningFast15ByteNOP,
+                                      TuningFastVariableCrossLaneShuffle,
+                                      TuningFastVariablePerLaneShuffle,
+                                      TuningPrefer256Bit,
+                                      TuningInsertVZEROUPPER,
+                                      TuningAllowLight256Bit];
   list<SubtargetFeature> CNLFeatures =
     !listconcat(SKLFeatures, CNLAdditionalFeatures);
 
@@ -758,7 +897,18 @@ def ProcessorFeatures {
                                                   FeatureGFNI,
                                                   FeatureRDPID,
                                                   FeatureFSRM];
-  list<SubtargetFeature> ICLTuning = CNLTuning;
+  list<SubtargetFeature> ICLTuning = [TuningFastGather,
+                                      TuningMacroFusion,
+                                      TuningSlowDivide64,
+                                      TuningFastScalarFSQRT,
+                                      TuningFastVectorFSQRT,
+                                      TuningFastSHLDRotate,
+                                      TuningFast15ByteNOP,
+                                      TuningFastVariableCrossLaneShuffle,
+                                      TuningFastVariablePerLaneShuffle,
+                                      TuningPrefer256Bit,
+                                      TuningInsertVZEROUPPER,
+                                      TuningAllowLight256Bit];
   list<SubtargetFeature> ICLFeatures =
     !listconcat(CNLFeatures, ICLAdditionalFeatures);
 
@@ -766,7 +916,7 @@ def ProcessorFeatures {
   list<SubtargetFeature> ICXAdditionalFeatures = [FeaturePCONFIG,
                                                   FeatureCLWB,
                                                   FeatureWBNOINVD];
-  list<SubtargetFeature> ICXTuning = CNLTuning;
+  list<SubtargetFeature> ICXTuning = ICLTuning;
   list<SubtargetFeature> ICXFeatures =
     !listconcat(ICLFeatures, ICXAdditionalFeatures);
 
@@ -776,7 +926,7 @@ def ProcessorFeatures {
                                                   FeatureMOVDIRI,
                                                   FeatureMOVDIR64B,
                                                   FeatureSHSTK];
-  list<SubtargetFeature> TGLTuning = CNLTuning;
+  list<SubtargetFeature> TGLTuning = ICLTuning;
   list<SubtargetFeature> TGLFeatures =
     !listconcat(ICLFeatures, TGLAdditionalFeatures );
 
@@ -789,56 +939,68 @@ def ProcessorFeatures {
                                                   FeatureCLDEMOTE,
                                                   FeatureWAITPKG,
                                                   FeaturePTWRITE,
+                                                  FeatureFP16,
                                                   FeatureAVXVNNI,
                                                   FeatureTSXLDTRK,
                                                   FeatureENQCMD,
                                                   FeatureSHSTK,
-                                                  FeatureVP2INTERSECT,
                                                   FeatureMOVDIRI,
                                                   FeatureMOVDIR64B,
                                                   FeatureUINTR];
-  list<SubtargetFeature> SPRTuning = ICXTuning;
+  list<SubtargetFeature> SPRAdditionalTuning = [TuningMULCFalseDeps,
+                                                TuningPERMFalseDeps,
+                                                TuningRANGEFalseDeps,
+                                                TuningGETMANTFalseDeps,
+                                                TuningMULLQFalseDeps];
+  list<SubtargetFeature> SPRTuning = !listconcat(ICXTuning, SPRAdditionalTuning);
   list<SubtargetFeature> SPRFeatures =
     !listconcat(ICXFeatures, SPRAdditionalFeatures);
 
+  // Graniterapids
+  list<SubtargetFeature> GNRAdditionalFeatures = [FeatureAMXFP16,
+                                                  FeaturePREFETCHI];
+  list<SubtargetFeature> GNRFeatures =
+    !listconcat(SPRFeatures, GNRAdditionalFeatures);
+
   // Atom
   list<SubtargetFeature> AtomFeatures = [FeatureX87,
-                                         FeatureCMPXCHG8B,
+                                         FeatureCX8,
                                          FeatureCMOV,
                                          FeatureMMX,
                                          FeatureSSSE3,
                                          FeatureFXSR,
                                          FeatureNOPL,
-                                         Feature64Bit,
-                                         FeatureCMPXCHG16B,
+                                         FeatureX86_64,
+                                         FeatureCX16,
                                          FeatureMOVBE,
-                                         FeatureLAHFSAHF];
+                                         FeatureLAHFSAHF64];
   list<SubtargetFeature> AtomTuning = [ProcIntelAtom,
-                                       FeatureSlowUAMem16,
-                                       FeatureLEAForSP,
-                                       FeatureSlowDivide32,
-                                       FeatureSlowDivide64,
-                                       FeatureSlowTwoMemOps,
-                                       FeatureLEAUsesAG,
-                                       FeaturePadShortFunctions,
-                                       FeatureInsertVZEROUPPER];
+                                       TuningSlowUAMem16,
+                                       TuningLEAForSP,
+                                       TuningSlowDivide32,
+                                       TuningSlowDivide64,
+                                       TuningSlowTwoMemOps,
+                                       TuningLEAUsesAG,
+                                       TuningPadShortFunctions,
+                                       TuningInsertVZEROUPPER];
 
   // Silvermont
   list<SubtargetFeature> SLMAdditionalFeatures = [FeatureSSE42,
+                                                  FeatureCRC32,
                                                   FeaturePOPCNT,
                                                   FeaturePCLMUL,
                                                   FeaturePRFCHW,
                                                   FeatureRDRAND];
-  list<SubtargetFeature> SLMTuning = [ProcIntelSLM,
-                                      FeatureSlowTwoMemOps,
-                                      FeatureSlowLEA,
-                                      FeatureSlowIncDec,
-                                      FeatureSlowDivide64,
-                                      FeatureSlowPMULLD,
-                                      FeatureFast7ByteNOP,
-                                      FeatureFastMOVBE,
-                                      FeaturePOPCNTFalseDeps,
-                                      FeatureInsertVZEROUPPER];
+  list<SubtargetFeature> SLMTuning = [TuningUseSLMArithCosts,
+                                      TuningSlowTwoMemOps,
+                                      TuningSlowLEA,
+                                      TuningSlowIncDec,
+                                      TuningSlowDivide64,
+                                      TuningSlowPMULLD,
+                                      TuningFast7ByteNOP,
+                                      TuningFastMOVBE,
+                                      TuningPOPCNTFalseDeps,
+                                      TuningInsertVZEROUPPER];
   list<SubtargetFeature> SLMFeatures =
     !listconcat(AtomFeatures, SLMAdditionalFeatures);
 
@@ -852,25 +1014,25 @@ def ProcessorFeatures {
                                                   FeatureXSAVES,
                                                   FeatureCLFLUSHOPT,
                                                   FeatureFSGSBase];
-  list<SubtargetFeature> GLMTuning = [FeatureUseGLMDivSqrtCosts,
-                                      FeatureSlowTwoMemOps,
-                                      FeatureSlowLEA,
-                                      FeatureSlowIncDec,
-                                      FeatureFastMOVBE,
-                                      FeaturePOPCNTFalseDeps,
-                                      FeatureInsertVZEROUPPER];
+  list<SubtargetFeature> GLMTuning = [TuningUseGLMDivSqrtCosts,
+                                      TuningSlowTwoMemOps,
+                                      TuningSlowLEA,
+                                      TuningSlowIncDec,
+                                      TuningFastMOVBE,
+                                      TuningPOPCNTFalseDeps,
+                                      TuningInsertVZEROUPPER];
   list<SubtargetFeature> GLMFeatures =
     !listconcat(SLMFeatures, GLMAdditionalFeatures);
 
   // Goldmont Plus
   list<SubtargetFeature> GLPAdditionalFeatures = [FeaturePTWRITE,
                                                   FeatureRDPID];
-  list<SubtargetFeature> GLPTuning = [FeatureUseGLMDivSqrtCosts,
-                                      FeatureSlowTwoMemOps,
-                                      FeatureSlowLEA,
-                                      FeatureSlowIncDec,
-                                      FeatureFastMOVBE,
-                                      FeatureInsertVZEROUPPER];
+  list<SubtargetFeature> GLPTuning = [TuningUseGLMDivSqrtCosts,
+                                      TuningSlowTwoMemOps,
+                                      TuningSlowLEA,
+                                      TuningSlowIncDec,
+                                      TuningFastMOVBE,
+                                      TuningInsertVZEROUPPER];
   list<SubtargetFeature> GLPFeatures =
     !listconcat(GLMFeatures, GLPAdditionalFeatures);
 
@@ -902,24 +1064,39 @@ def ProcessorFeatures {
                                                   FeatureMOVDIRI,
                                                   FeatureMOVDIR64B,
                                                   FeatureWAITPKG];
-  list<SubtargetFeature> ADLTuning = SKLTuning;
+  list<SubtargetFeature> ADLAdditionalTuning = [TuningPERMFalseDeps];
+  list<SubtargetFeature> ADLTuning = !listconcat(SKLTuning, ADLAdditionalTuning);
   list<SubtargetFeature> ADLFeatures =
     !listconcat(TRMFeatures, ADLAdditionalFeatures);
 
+  // Sierraforest
+  list<SubtargetFeature> SRFAdditionalFeatures = [FeatureCMPCCXADD,
+                                                  FeatureAVXIFMA,
+                                                  FeatureAVXNECONVERT,
+                                                  FeatureAVXVNNIINT8];
+  list<SubtargetFeature> SRFFeatures =
+    !listconcat(ADLFeatures, SRFAdditionalFeatures);
+
+  // Grandridge
+  list<SubtargetFeature> GRRAdditionalFeatures = [FeatureRAOINT];
+  list<SubtargetFeature> GRRFeatures =
+    !listconcat(SRFFeatures, GRRAdditionalFeatures);
+
   // Knights Landing
   list<SubtargetFeature> KNLFeatures = [FeatureX87,
-                                        FeatureCMPXCHG8B,
+                                        FeatureCX8,
                                         FeatureCMOV,
                                         FeatureMMX,
                                         FeatureFXSR,
                                         FeatureNOPL,
-                                        Feature64Bit,
-                                        FeatureCMPXCHG16B,
+                                        FeatureX86_64,
+                                        FeatureCX16,
+                                        FeatureCRC32,
                                         FeaturePOPCNT,
                                         FeaturePCLMUL,
                                         FeatureXSAVE,
                                         FeatureXSAVEOPT,
-                                        FeatureLAHFSAHF,
+                                        FeatureLAHFSAHF64,
                                         FeatureAES,
                                         FeatureRDRAND,
                                         FeatureF16C,
@@ -937,85 +1114,90 @@ def ProcessorFeatures {
                                         FeatureBMI2,
                                         FeatureFMA,
                                         FeaturePRFCHW];
-  list<SubtargetFeature> KNLTuning = [FeatureSlowDivide64,
-                                      FeatureSlow3OpsLEA,
-                                      FeatureSlowIncDec,
-                                      FeatureSlowTwoMemOps,
-                                      FeaturePreferMaskRegisters,
-                                      FeatureHasFastGather,
-                                      FeatureFastMOVBE,
-                                      FeatureSlowPMADDWD];
+  list<SubtargetFeature> KNLTuning = [TuningSlowDivide64,
+                                      TuningSlow3OpsLEA,
+                                      TuningSlowIncDec,
+                                      TuningSlowTwoMemOps,
+                                      TuningPreferMaskRegisters,
+                                      TuningFastGather,
+                                      TuningFastMOVBE,
+                                      TuningSlowPMADDWD];
   // TODO Add AVX5124FMAPS/AVX5124VNNIW features
   list<SubtargetFeature> KNMFeatures =
     !listconcat(KNLFeatures, [FeatureVPOPCNTDQ]);
 
   // Barcelona
   list<SubtargetFeature> BarcelonaFeatures = [FeatureX87,
-                                              FeatureCMPXCHG8B,
+                                              FeatureCX8,
                                               FeatureSSE4A,
                                               Feature3DNowA,
                                               FeatureFXSR,
                                               FeatureNOPL,
-                                              FeatureCMPXCHG16B,
+                                              FeatureCX16,
                                               FeaturePRFCHW,
                                               FeatureLZCNT,
                                               FeaturePOPCNT,
-                                              FeatureLAHFSAHF,
+                                              FeatureLAHFSAHF64,
                                               FeatureCMOV,
-                                              Feature64Bit];
-  list<SubtargetFeature> BarcelonaTuning = [FeatureFastScalarShiftMasks,
-                                            FeatureSlowSHLD,
-                                            FeatureInsertVZEROUPPER];
+                                              FeatureX86_64];
+  list<SubtargetFeature> BarcelonaTuning = [TuningFastScalarShiftMasks,
+                                            TuningSlowSHLD,
+                                            TuningSBBDepBreaking,
+                                            TuningInsertVZEROUPPER];
 
   // Bobcat
   list<SubtargetFeature> BtVer1Features = [FeatureX87,
-                                           FeatureCMPXCHG8B,
+                                           FeatureCX8,
                                            FeatureCMOV,
                                            FeatureMMX,
                                            FeatureSSSE3,
                                            FeatureSSE4A,
                                            FeatureFXSR,
                                            FeatureNOPL,
-                                           Feature64Bit,
-                                           FeatureCMPXCHG16B,
+                                           FeatureX86_64,
+                                           FeatureCX16,
                                            FeaturePRFCHW,
                                            FeatureLZCNT,
                                            FeaturePOPCNT,
-                                           FeatureLAHFSAHF];
-  list<SubtargetFeature> BtVer1Tuning = [FeatureFast15ByteNOP,
-                                         FeatureFastScalarShiftMasks,
-                                         FeatureFastVectorShiftMasks,
-                                         FeatureSlowSHLD,
-                                         FeatureInsertVZEROUPPER];
+                                           FeatureLAHFSAHF64];
+  list<SubtargetFeature> BtVer1Tuning = [TuningFast15ByteNOP,
+                                         TuningFastScalarShiftMasks,
+                                         TuningFastVectorShiftMasks,
+                                         TuningSlowSHLD,
+                                         TuningSBBDepBreaking,
+                                         TuningInsertVZEROUPPER];
 
   // Jaguar
   list<SubtargetFeature> BtVer2AdditionalFeatures = [FeatureAVX,
                                                      FeatureAES,
+                                                     FeatureCRC32,
                                                      FeaturePCLMUL,
                                                      FeatureBMI,
                                                      FeatureF16C,
                                                      FeatureMOVBE,
                                                      FeatureXSAVE,
                                                      FeatureXSAVEOPT];
-  list<SubtargetFeature> BtVer2Tuning = [FeatureFastLZCNT,
-                                         FeatureFastBEXTR,
-                                         FeatureFastHorizontalOps,
-                                         FeatureFast15ByteNOP,
-                                         FeatureFastScalarShiftMasks,
-                                         FeatureFastVectorShiftMasks,
-                                         FeatureFastMOVBE,
-                                         FeatureSlowSHLD];
+  list<SubtargetFeature> BtVer2Tuning = [TuningFastLZCNT,
+                                         TuningFastBEXTR,
+                                         TuningFastHorizontalOps,
+                                         TuningFast15ByteNOP,
+                                         TuningFastScalarShiftMasks,
+                                         TuningFastVectorShiftMasks,
+                                         TuningFastMOVBE,
+                                         TuningSBBDepBreaking,
+                                         TuningSlowSHLD];
   list<SubtargetFeature> BtVer2Features =
     !listconcat(BtVer1Features, BtVer2AdditionalFeatures);
 
   // Bulldozer
   list<SubtargetFeature> BdVer1Features = [FeatureX87,
-                                           FeatureCMPXCHG8B,
+                                           FeatureCX8,
                                            FeatureCMOV,
                                            FeatureXOP,
-                                           Feature64Bit,
-                                           FeatureCMPXCHG16B,
+                                           FeatureX86_64,
+                                           FeatureCX16,
                                            FeatureAES,
+                                           FeatureCRC32,
                                            FeaturePRFCHW,
                                            FeaturePCLMUL,
                                            FeatureMMX,
@@ -1025,20 +1207,21 @@ def ProcessorFeatures {
                                            FeaturePOPCNT,
                                            FeatureXSAVE,
                                            FeatureLWP,
-                                           FeatureLAHFSAHF];
-  list<SubtargetFeature> BdVer1Tuning = [FeatureSlowSHLD,
-                                         FeatureFast11ByteNOP,
-                                         FeatureFastScalarShiftMasks,
-                                         FeatureBranchFusion,
-                                         FeatureInsertVZEROUPPER];
+                                           FeatureLAHFSAHF64];
+  list<SubtargetFeature> BdVer1Tuning = [TuningSlowSHLD,
+                                         TuningFast11ByteNOP,
+                                         TuningFastScalarShiftMasks,
+                                         TuningBranchFusion,
+                                         TuningSBBDepBreaking,
+                                         TuningInsertVZEROUPPER];
 
   // PileDriver
   list<SubtargetFeature> BdVer2AdditionalFeatures = [FeatureF16C,
                                                      FeatureBMI,
                                                      FeatureTBM,
-                                                     FeatureFMA,
-                                                     FeatureFastBEXTR];
-  list<SubtargetFeature> BdVer2AdditionalTuning = [FeatureFastMOVBE];
+                                                     FeatureFMA];
+  list<SubtargetFeature> BdVer2AdditionalTuning = [TuningFastBEXTR,
+                                                   TuningFastMOVBE];
   list<SubtargetFeature> BdVer2Tuning =
     !listconcat(BdVer1Tuning, BdVer2AdditionalTuning);
   list<SubtargetFeature> BdVer2Features =
@@ -1071,14 +1254,15 @@ def ProcessorFeatures {
                                        FeatureCLFLUSHOPT,
                                        FeatureCLZERO,
                                        FeatureCMOV,
-                                       Feature64Bit,
-                                       FeatureCMPXCHG16B,
+                                       FeatureX86_64,
+                                       FeatureCX16,
+                                       FeatureCRC32,
                                        FeatureF16C,
                                        FeatureFMA,
                                        FeatureFSGSBase,
                                        FeatureFXSR,
                                        FeatureNOPL,
-                                       FeatureLAHFSAHF,
+                                       FeatureLAHFSAHF64,
                                        FeatureLZCNT,
                                        FeatureMMX,
                                        FeatureMOVBE,
@@ -1095,16 +1279,22 @@ def ProcessorFeatures {
                                        FeatureXSAVEC,
                                        FeatureXSAVEOPT,
                                        FeatureXSAVES];
-  list<SubtargetFeature> ZNTuning = [FeatureFastLZCNT,
-                                     FeatureFastBEXTR,
-                                     FeatureFast15ByteNOP,
-                                     FeatureBranchFusion,
-                                     FeatureFastScalarShiftMasks,
-                                     FeatureFastMOVBE,
-                                     FeatureSlowSHLD,
-                                     FeatureInsertVZEROUPPER];
+  list<SubtargetFeature> ZNTuning = [TuningFastLZCNT,
+                                     TuningFastBEXTR,
+                                     TuningFast15ByteNOP,
+                                     TuningBranchFusion,
+                                     TuningFastScalarFSQRT,
+                                     TuningFastVectorFSQRT,
+                                     TuningFastScalarShiftMasks,
+                                     TuningFastVariablePerLaneShuffle,
+                                     TuningFastMOVBE,
+                                     TuningSlowSHLD,
+                                     TuningSBBDepBreaking,
+                                     TuningInsertVZEROUPPER,
+                                     TuningAllowLight256Bit];
   list<SubtargetFeature> ZN2AdditionalFeatures = [FeatureCLWB,
                                                   FeatureRDPID,
+                                                  FeatureRDPRU,
                                                   FeatureWBNOINVD];
   list<SubtargetFeature> ZN2Tuning = ZNTuning;
   list<SubtargetFeature> ZN2Features =
@@ -1114,13 +1304,28 @@ def ProcessorFeatures {
                                                   FeaturePKU,
                                                   FeatureVAES,
                                                   FeatureVPCLMULQDQ];
-  list<SubtargetFeature> ZN3AdditionalTuning =
-    [FeatureMacroFusion,
-     FeatureFastVariablePerLaneShuffle];
+  list<SubtargetFeature> ZN3AdditionalTuning = [TuningMacroFusion];
   list<SubtargetFeature> ZN3Tuning =
-    !listconcat(ZNTuning, ZN3AdditionalTuning);
+    !listconcat(ZN2Tuning, ZN3AdditionalTuning);
   list<SubtargetFeature> ZN3Features =
     !listconcat(ZN2Features, ZN3AdditionalFeatures);
+  list<SubtargetFeature> ZN4Tuning = ZN3Tuning;
+  list<SubtargetFeature> ZN4AdditionalFeatures = [FeatureAVX512,
+                                                  FeatureCDI,
+                                                  FeatureDQI,
+                                                  FeatureBWI,
+                                                  FeatureVLX,
+                                                  FeatureVBMI,
+                                                  FeatureVBMI2,
+                                                  FeatureIFMA,
+                                                  FeatureVNNI,
+                                                  FeatureBITALG,
+                                                  FeatureGFNI,
+                                                  FeatureBF16,
+                                                  FeatureSHSTK,
+                                                  FeatureVPOPCNTDQ];
+  list<SubtargetFeature> ZN4Features =
+    !listconcat(ZN3Features, ZN4AdditionalFeatures);
 }
 
 //===----------------------------------------------------------------------===//
@@ -1139,41 +1344,45 @@ class ProcModel<string Name, SchedMachineModel Model,
 // NOTE: CMPXCHG8B is here for legacy compatibility so that it is only disabled
 // if i386/i486 is specifically requested.
 // NOTE: 64Bit is here as "generic" is the default llc CPU. The X86Subtarget
-// constructor checks that any CPU used in 64-bit mode has Feature64Bit enabled.
-// It has no effect on code generation.
+// constructor checks that any CPU used in 64-bit mode has FeatureX86_64
+// enabled. It has no effect on code generation.
+// NOTE: As a default tuning, "generic" aims to produce code optimized for the
+// most common X86 processors. The tunings might be changed over time. It is
+// recommended to use "tune-cpu"="x86-64" in function attribute for consistency.
 def : ProcModel<"generic", SandyBridgeModel,
-                [FeatureX87, FeatureCMPXCHG8B, Feature64Bit],
-                [FeatureSlow3OpsLEA,
-                 FeatureSlowDivide64,
-                 FeatureSlowIncDec,
-                 FeatureMacroFusion,
-                 FeatureInsertVZEROUPPER]>;
+                [FeatureX87, FeatureCX8, FeatureX86_64],
+                [TuningSlow3OpsLEA,
+                 TuningSlowDivide64,
+                 TuningMacroFusion,
+                 TuningFastScalarFSQRT,
+                 TuningFast15ByteNOP,
+                 TuningInsertVZEROUPPER]>;
 
 def : Proc<"i386",            [FeatureX87],
-                              [FeatureSlowUAMem16, FeatureInsertVZEROUPPER]>;
+                              [TuningSlowUAMem16, TuningInsertVZEROUPPER]>;
 def : Proc<"i486",            [FeatureX87],
-                              [FeatureSlowUAMem16, FeatureInsertVZEROUPPER]>;
-def : Proc<"i586",            [FeatureX87, FeatureCMPXCHG8B],
-                              [FeatureSlowUAMem16, FeatureInsertVZEROUPPER]>;
-def : Proc<"pentium",         [FeatureX87, FeatureCMPXCHG8B],
-                              [FeatureSlowUAMem16, FeatureInsertVZEROUPPER]>;
-def : Proc<"pentium-mmx",     [FeatureX87, FeatureCMPXCHG8B, FeatureMMX],
-                              [FeatureSlowUAMem16, FeatureInsertVZEROUPPER]>;
-
-def : Proc<"i686", [FeatureX87, FeatureCMPXCHG8B, FeatureCMOV],
-                   [FeatureSlowUAMem16, FeatureInsertVZEROUPPER]>;
-def : Proc<"pentiumpro", [FeatureX87, FeatureCMPXCHG8B, FeatureCMOV,
+                              [TuningSlowUAMem16, TuningInsertVZEROUPPER]>;
+def : Proc<"i586",            [FeatureX87, FeatureCX8],
+                              [TuningSlowUAMem16, TuningInsertVZEROUPPER]>;
+def : Proc<"pentium",         [FeatureX87, FeatureCX8],
+                              [TuningSlowUAMem16, TuningInsertVZEROUPPER]>;
+def : Proc<"pentium-mmx",     [FeatureX87, FeatureCX8, FeatureMMX],
+                              [TuningSlowUAMem16, TuningInsertVZEROUPPER]>;
+
+def : Proc<"i686", [FeatureX87, FeatureCX8, FeatureCMOV],
+                   [TuningSlowUAMem16, TuningInsertVZEROUPPER]>;
+def : Proc<"pentiumpro", [FeatureX87, FeatureCX8, FeatureCMOV,
                           FeatureNOPL],
-                         [FeatureSlowUAMem16, FeatureInsertVZEROUPPER]>;
+                         [TuningSlowUAMem16, TuningInsertVZEROUPPER]>;
 
-def : Proc<"pentium2", [FeatureX87, FeatureCMPXCHG8B, FeatureMMX, FeatureCMOV,
+def : Proc<"pentium2", [FeatureX87, FeatureCX8, FeatureMMX, FeatureCMOV,
                         FeatureFXSR, FeatureNOPL],
-                       [FeatureSlowUAMem16, FeatureInsertVZEROUPPER]>;
+                       [TuningSlowUAMem16, TuningInsertVZEROUPPER]>;
 
 foreach P = ["pentium3", "pentium3m"] in {
-  def : Proc<P, [FeatureX87, FeatureCMPXCHG8B, FeatureMMX,
+  def : Proc<P, [FeatureX87, FeatureCX8, FeatureMMX,
                  FeatureSSE1, FeatureFXSR, FeatureNOPL, FeatureCMOV],
-                [FeatureSlowUAMem16, FeatureInsertVZEROUPPER]>;
+                [TuningSlowUAMem16, TuningInsertVZEROUPPER]>;
 }
 
 // Enable the PostRAScheduler for SSE2 and SSE3 class cpus.
@@ -1187,82 +1396,82 @@ foreach P = ["pentium3", "pentium3m"] in {
 // changes slightly.
 
 def : ProcModel<"pentium-m", GenericPostRAModel,
-                [FeatureX87, FeatureCMPXCHG8B, FeatureMMX, FeatureSSE2,
+                [FeatureX87, FeatureCX8, FeatureMMX, FeatureSSE2,
                 FeatureFXSR, FeatureNOPL, FeatureCMOV],
-                [FeatureSlowUAMem16, FeatureInsertVZEROUPPER]>;
+                [TuningSlowUAMem16, TuningInsertVZEROUPPER]>;
 
 foreach P = ["pentium4", "pentium4m"] in {
   def : ProcModel<P, GenericPostRAModel,
-                  [FeatureX87, FeatureCMPXCHG8B, FeatureMMX, FeatureSSE2,
+                  [FeatureX87, FeatureCX8, FeatureMMX, FeatureSSE2,
                    FeatureFXSR, FeatureNOPL, FeatureCMOV],
-                  [FeatureSlowUAMem16, FeatureInsertVZEROUPPER]>;
+                  [TuningSlowUAMem16, TuningInsertVZEROUPPER]>;
 }
 
 // Intel Quark.
-def : Proc<"lakemont", [FeatureCMPXCHG8B],
-                       [FeatureSlowUAMem16, FeatureInsertVZEROUPPER]>;
+def : Proc<"lakemont", [FeatureCX8],
+                       [TuningSlowUAMem16, TuningInsertVZEROUPPER]>;
 
 // Intel Core Duo.
 def : ProcModel<"yonah", SandyBridgeModel,
-                [FeatureX87, FeatureCMPXCHG8B, FeatureMMX, FeatureSSE3,
+                [FeatureX87, FeatureCX8, FeatureMMX, FeatureSSE3,
                  FeatureFXSR, FeatureNOPL, FeatureCMOV],
-                [FeatureSlowUAMem16, FeatureInsertVZEROUPPER]>;
+                [TuningSlowUAMem16, TuningInsertVZEROUPPER]>;
 
 // NetBurst.
 def : ProcModel<"prescott", GenericPostRAModel,
-                [FeatureX87, FeatureCMPXCHG8B, FeatureMMX, FeatureSSE3,
+                [FeatureX87, FeatureCX8, FeatureMMX, FeatureSSE3,
                  FeatureFXSR, FeatureNOPL, FeatureCMOV],
-                [FeatureSlowUAMem16, FeatureInsertVZEROUPPER]>;
+                [TuningSlowUAMem16, TuningInsertVZEROUPPER]>;
 def : ProcModel<"nocona", GenericPostRAModel, [
   FeatureX87,
-  FeatureCMPXCHG8B,
+  FeatureCX8,
   FeatureCMOV,
   FeatureMMX,
   FeatureSSE3,
   FeatureFXSR,
   FeatureNOPL,
-  Feature64Bit,
-  FeatureCMPXCHG16B,
+  FeatureX86_64,
+  FeatureCX16,
 ],
 [
-  FeatureSlowUAMem16,
-  FeatureInsertVZEROUPPER
+  TuningSlowUAMem16,
+  TuningInsertVZEROUPPER
 ]>;
 
 // Intel Core 2 Solo/Duo.
 def : ProcModel<"core2", SandyBridgeModel, [
   FeatureX87,
-  FeatureCMPXCHG8B,
+  FeatureCX8,
   FeatureCMOV,
   FeatureMMX,
   FeatureSSSE3,
   FeatureFXSR,
   FeatureNOPL,
-  Feature64Bit,
-  FeatureCMPXCHG16B,
-  FeatureLAHFSAHF
+  FeatureX86_64,
+  FeatureCX16,
+  FeatureLAHFSAHF64
 ],
 [
-  FeatureMacroFusion,
-  FeatureSlowUAMem16,
-  FeatureInsertVZEROUPPER
+  TuningMacroFusion,
+  TuningSlowUAMem16,
+  TuningInsertVZEROUPPER
 ]>;
 def : ProcModel<"penryn", SandyBridgeModel, [
   FeatureX87,
-  FeatureCMPXCHG8B,
+  FeatureCX8,
   FeatureCMOV,
   FeatureMMX,
   FeatureSSE41,
   FeatureFXSR,
   FeatureNOPL,
-  Feature64Bit,
-  FeatureCMPXCHG16B,
-  FeatureLAHFSAHF
+  FeatureX86_64,
+  FeatureCX16,
+  FeatureLAHFSAHF64
 ],
 [
-  FeatureMacroFusion,
-  FeatureSlowUAMem16,
-  FeatureInsertVZEROUPPER
+  TuningMacroFusion,
+  TuningSlowUAMem16,
+  TuningInsertVZEROUPPER
 ]>;
 
 // Atom CPUs.
@@ -1282,6 +1491,10 @@ def : ProcModel<"goldmont-plus", SLMModel, ProcessorFeatures.GLPFeatures,
                 ProcessorFeatures.GLPTuning>;
 def : ProcModel<"tremont", SLMModel, ProcessorFeatures.TRMFeatures,
                 ProcessorFeatures.TRMTuning>;
+def : ProcModel<"sierraforest", AlderlakePModel, ProcessorFeatures.SRFFeatures,
+                ProcessorFeatures.TRMTuning>;
+def : ProcModel<"grandridge", AlderlakePModel, ProcessorFeatures.GRRFeatures,
+                ProcessorFeatures.TRMTuning>;
 
 // "Arrandale" along with corei3 and corei5
 foreach P = ["nehalem", "corei7"] in {
@@ -1331,53 +1544,61 @@ def : ProcModel<"cooperlake", SkylakeServerModel,
                 ProcessorFeatures.CPXFeatures, ProcessorFeatures.CPXTuning>;
 def : ProcModel<"cannonlake", SkylakeServerModel,
                 ProcessorFeatures.CNLFeatures, ProcessorFeatures.CNLTuning>;
-def : ProcModel<"icelake-client", SkylakeServerModel,
+def : ProcModel<"icelake-client", IceLakeModel,
                 ProcessorFeatures.ICLFeatures, ProcessorFeatures.ICLTuning>;
-def : ProcModel<"rocketlake", SkylakeServerModel,
+def : ProcModel<"rocketlake", IceLakeModel,
                 ProcessorFeatures.ICLFeatures, ProcessorFeatures.ICLTuning>;
-def : ProcModel<"icelake-server", SkylakeServerModel,
+def : ProcModel<"icelake-server", IceLakeModel,
                 ProcessorFeatures.ICXFeatures, ProcessorFeatures.ICXTuning>;
-def : ProcModel<"tigerlake", SkylakeServerModel,
+def : ProcModel<"tigerlake", IceLakeModel,
                 ProcessorFeatures.TGLFeatures, ProcessorFeatures.TGLTuning>;
 def : ProcModel<"sapphirerapids", SkylakeServerModel,
                 ProcessorFeatures.SPRFeatures, ProcessorFeatures.SPRTuning>;
-def : ProcModel<"alderlake", SkylakeClientModel,
+def : ProcModel<"alderlake", AlderlakePModel,
+                ProcessorFeatures.ADLFeatures, ProcessorFeatures.ADLTuning>;
+def : ProcModel<"raptorlake", AlderlakePModel,
                 ProcessorFeatures.ADLFeatures, ProcessorFeatures.ADLTuning>;
+def : ProcModel<"meteorlake", AlderlakePModel,
+                ProcessorFeatures.ADLFeatures, ProcessorFeatures.ADLTuning>;
+def : ProcModel<"graniterapids", SkylakeServerModel,
+                ProcessorFeatures.GNRFeatures, ProcessorFeatures.SPRTuning>;
+def : ProcModel<"emeraldrapids", SkylakeServerModel,
+                ProcessorFeatures.SPRFeatures, ProcessorFeatures.SPRTuning>;
 
 // AMD CPUs.
 
-def : Proc<"k6",   [FeatureX87, FeatureCMPXCHG8B, FeatureMMX],
-                   [FeatureSlowUAMem16, FeatureInsertVZEROUPPER]>;
-def : Proc<"k6-2", [FeatureX87, FeatureCMPXCHG8B, Feature3DNow],
-                   [FeatureSlowUAMem16, FeatureInsertVZEROUPPER]>;
-def : Proc<"k6-3", [FeatureX87, FeatureCMPXCHG8B, Feature3DNow],
-                   [FeatureSlowUAMem16, FeatureInsertVZEROUPPER]>;
+def : Proc<"k6",   [FeatureX87, FeatureCX8, FeatureMMX],
+                   [TuningSlowUAMem16, TuningInsertVZEROUPPER]>;
+def : Proc<"k6-2", [FeatureX87, FeatureCX8, Feature3DNow],
+                   [TuningSlowUAMem16, TuningInsertVZEROUPPER]>;
+def : Proc<"k6-3", [FeatureX87, FeatureCX8, Feature3DNow],
+                   [TuningSlowUAMem16, TuningInsertVZEROUPPER]>;
 
 foreach P = ["athlon", "athlon-tbird"] in {
-  def : Proc<P, [FeatureX87, FeatureCMPXCHG8B, FeatureCMOV, Feature3DNowA,
+  def : Proc<P, [FeatureX87, FeatureCX8, FeatureCMOV, Feature3DNowA,
                  FeatureNOPL],
-                [FeatureSlowSHLD, FeatureSlowUAMem16, FeatureInsertVZEROUPPER]>;
+                [TuningSlowSHLD, TuningSlowUAMem16, TuningInsertVZEROUPPER]>;
 }
 
 foreach P = ["athlon-4", "athlon-xp", "athlon-mp"] in {
-  def : Proc<P, [FeatureX87, FeatureCMPXCHG8B, FeatureCMOV,
+  def : Proc<P, [FeatureX87, FeatureCX8, FeatureCMOV,
                  FeatureSSE1, Feature3DNowA, FeatureFXSR, FeatureNOPL],
-                [FeatureSlowSHLD, FeatureSlowUAMem16, FeatureInsertVZEROUPPER]>;
+                [TuningSlowSHLD, TuningSlowUAMem16, TuningInsertVZEROUPPER]>;
 }
 
 foreach P = ["k8", "opteron", "athlon64", "athlon-fx"] in {
-  def : Proc<P, [FeatureX87, FeatureCMPXCHG8B, FeatureSSE2, Feature3DNowA,
-                 FeatureFXSR, FeatureNOPL, Feature64Bit, FeatureCMOV],
-                [FeatureFastScalarShiftMasks, FeatureSlowSHLD, FeatureSlowUAMem16,
-                 FeatureInsertVZEROUPPER]>;
+  def : Proc<P, [FeatureX87, FeatureCX8, FeatureSSE2, Feature3DNowA,
+                 FeatureFXSR, FeatureNOPL, FeatureX86_64, FeatureCMOV],
+                [TuningFastScalarShiftMasks, TuningSlowSHLD, TuningSlowUAMem16,
+                 TuningSBBDepBreaking, TuningInsertVZEROUPPER]>;
 }
 
 foreach P = ["k8-sse3", "opteron-sse3", "athlon64-sse3"] in {
-  def : Proc<P, [FeatureX87, FeatureCMPXCHG8B, FeatureSSE3, Feature3DNowA,
-                 FeatureFXSR, FeatureNOPL, FeatureCMPXCHG16B, FeatureCMOV,
-                 Feature64Bit],
-                [FeatureFastScalarShiftMasks, FeatureSlowSHLD, FeatureSlowUAMem16,
-                 FeatureInsertVZEROUPPER]>;
+  def : Proc<P, [FeatureX87, FeatureCX8, FeatureSSE3, Feature3DNowA,
+                 FeatureFXSR, FeatureNOPL, FeatureCX16, FeatureCMOV,
+                 FeatureX86_64],
+                [TuningFastScalarShiftMasks, TuningSlowSHLD, TuningSlowUAMem16,
+                 TuningSBBDepBreaking, TuningInsertVZEROUPPER]>;
 }
 
 foreach P = ["amdfam10", "barcelona"] in {
@@ -1411,19 +1632,21 @@ def : ProcModel<"znver2", Znver2Model, ProcessorFeatures.ZN2Features,
                 ProcessorFeatures.ZN2Tuning>;
 def : ProcModel<"znver3", Znver3Model, ProcessorFeatures.ZN3Features,
                 ProcessorFeatures.ZN3Tuning>;
+def : ProcModel<"znver4", Znver4Model, ProcessorFeatures.ZN4Features,
+           ProcessorFeatures.ZN4Tuning>;
 
-def : Proc<"geode",           [FeatureX87, FeatureCMPXCHG8B, Feature3DNowA],
-                              [FeatureSlowUAMem16, FeatureInsertVZEROUPPER]>;
+def : Proc<"geode",           [FeatureX87, FeatureCX8, Feature3DNowA],
+                              [TuningSlowUAMem16, TuningInsertVZEROUPPER]>;
 
 def : Proc<"winchip-c6",      [FeatureX87, FeatureMMX],
-                              [FeatureSlowUAMem16, FeatureInsertVZEROUPPER]>;
+                              [TuningSlowUAMem16, TuningInsertVZEROUPPER]>;
 def : Proc<"winchip2",        [FeatureX87, Feature3DNow],
-                              [FeatureSlowUAMem16, FeatureInsertVZEROUPPER]>;
+                              [TuningSlowUAMem16, TuningInsertVZEROUPPER]>;
 def : Proc<"c3",              [FeatureX87, Feature3DNow],
-                              [FeatureSlowUAMem16, FeatureInsertVZEROUPPER]>;
-def : Proc<"c3-2",            [FeatureX87, FeatureCMPXCHG8B, FeatureMMX,
+                              [TuningSlowUAMem16, TuningInsertVZEROUPPER]>;
+def : Proc<"c3-2",            [FeatureX87, FeatureCX8, FeatureMMX,
                                FeatureSSE1, FeatureFXSR, FeatureCMOV],
-                              [FeatureSlowUAMem16, FeatureInsertVZEROUPPER]>;
+                              [TuningSlowUAMem16, TuningInsertVZEROUPPER]>;
 
 // We also provide a generic 64-bit specific x86 processor model which tries to
 // be good for modern chips without enabling instruction set encodings past the
@@ -1437,11 +1660,11 @@ def : Proc<"c3-2",            [FeatureX87, FeatureCMPXCHG8B, FeatureMMX,
 // forming a common base for them.
 def : ProcModel<"x86-64", SandyBridgeModel, ProcessorFeatures.X86_64V1Features,
 [
-  FeatureSlow3OpsLEA,
-  FeatureSlowDivide64,
-  FeatureSlowIncDec,
-  FeatureMacroFusion,
-  FeatureInsertVZEROUPPER
+  TuningSlow3OpsLEA,
+  TuningSlowDivide64,
+  TuningSlowIncDec,
+  TuningMacroFusion,
+  TuningInsertVZEROUPPER
 ]>;
 
 // x86-64 micro-architecture levels.
diff --git a/gnu/llvm/llvm/lib/Target/X86/X86AsmPrinter.h b/gnu/llvm/llvm/lib/Target/X86/X86AsmPrinter.h
index 4786b0cd574..13d1a1f9166 100644
--- a/gnu/llvm/llvm/lib/Target/X86/X86AsmPrinter.h
+++ b/gnu/llvm/llvm/lib/Target/X86/X86AsmPrinter.h
@@ -26,11 +26,11 @@ class TargetMachine;
 
 class LLVM_LIBRARY_VISIBILITY X86AsmPrinter : public AsmPrinter {
   const X86Subtarget *Subtarget = nullptr;
-  StackMaps SM;
   FaultMaps FM;
   std::unique_ptr<MCCodeEmitter> CodeEmitter;
   bool EmitFPOData = false;
-  bool NeedsRetpoline = false;
+  bool ShouldEmitWeakSwiftAsyncExtendedFramePointerFlags = false;
+  bool IndCSPrefix = false;
 
   // This utility class tracks the length of a stackmap instruction's 'shadow'.
   // It is used by the X86AsmPrinter to ensure that the stackmap shadow
@@ -98,6 +98,14 @@ class LLVM_LIBRARY_VISIBILITY X86AsmPrinter : public AsmPrinter {
 
   void LowerFENTRY_CALL(const MachineInstr &MI, X86MCInstLower &MCIL);
 
+  // KCFI specific lowering for X86.
+  uint32_t MaskKCFIType(uint32_t Value);
+  void EmitKCFITypePadding(const MachineFunction &MF, bool HasType = true);
+  void LowerKCFI_CHECK(const MachineInstr &MI);
+
+  // Address sanitizer specific lowering for X86.
+  void LowerASAN_CHECK_MEMACCESS(const MachineInstr &MI);
+
   // Choose between emitting .seh_ directives and .cv_fpo_ directives.
   void EmitSEHInstruction(const MachineInstr *MI);
 
@@ -130,10 +138,7 @@ public:
 
   void emitTrapToAlignment(Align Alignment) const override;
 
-  void emitBasicBlockEnd(const MachineBasicBlock &MBB) override {
-    AsmPrinter::emitBasicBlockEnd(MBB);
-    SMShadowTracker.emitShadowPadding(*OutStreamer, getSubtargetInfo());
-  }
+  void emitBasicBlockEnd(const MachineBasicBlock &MBB) override;
 
   bool PrintAsmOperand(const MachineInstr *MI, unsigned OpNo,
                        const char *ExtraCode, raw_ostream &O) override;
@@ -150,6 +155,11 @@ public:
   bool runOnMachineFunction(MachineFunction &MF) override;
   void emitFunctionBodyStart() override;
   void emitFunctionBodyEnd() override;
+  void emitKCFITypeId(const MachineFunction &MF) override;
+
+  bool shouldEmitWeakSwiftAsyncExtendedFramePointerFlags() const override {
+    return ShouldEmitWeakSwiftAsyncExtendedFramePointerFlags;
+  }
 };
 
 } // end namespace llvm
diff --git a/gnu/llvm/llvm/lib/Target/X86/X86FixupGadgets.cpp b/gnu/llvm/llvm/lib/Target/X86/X86FixupGadgets.cpp
index 6610d425b83..bd4ad77eb72 100644
--- a/gnu/llvm/llvm/lib/Target/X86/X86FixupGadgets.cpp
+++ b/gnu/llvm/llvm/lib/Target/X86/X86FixupGadgets.cpp
@@ -542,23 +542,19 @@ bool FixupGadgetsPass::hasImplicitUseOrDef(const MachineInstr &MI,
 
   const MCInstrDesc &Desc = MI.getDesc();
 
-  const MCPhysReg *ImpDefs = Desc.getImplicitDefs();
-  if (ImpDefs) {
-    for (; *ImpDefs; ++ImpDefs) {
-      unsigned w = getWidestRegForReg(*ImpDefs);
-      if (w == Reg1 || w == Reg2) {
-        return true;
-      }
+  const ArrayRef<MCPhysReg> ImpDefs = Desc.implicit_defs();
+  for (MCPhysReg ImpDef : ImpDefs) {
+    unsigned w = getWidestRegForReg(ImpDef);
+    if (w == Reg1 || w == Reg2) {
+      return true;
     }
   }
 
-  const MCPhysReg *ImpUses = Desc.getImplicitUses();
-  if (ImpUses) {
-    for (; *ImpUses; ++ImpUses) {
-      unsigned w = getWidestRegForReg(*ImpUses);
-      if (w == Reg1 || w == Reg2) {
-        return true;
-      }
+  const ArrayRef<MCPhysReg> ImpUses = Desc.implicit_uses();
+  for (MCPhysReg ImpUse : ImpUses) {
+    unsigned w = getWidestRegForReg(ImpUse);
+    if (w == Reg1 || w == Reg2) {
+      return true;
     }
   }
   return false;
diff --git a/gnu/llvm/llvm/lib/Target/X86/X86FrameLowering.cpp b/gnu/llvm/llvm/lib/Target/X86/X86FrameLowering.cpp
index a01983eb557..d089c2ef46d 100644
--- a/gnu/llvm/llvm/lib/Target/X86/X86FrameLowering.cpp
+++ b/gnu/llvm/llvm/lib/Target/X86/X86FrameLowering.cpp
@@ -11,6 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "X86FrameLowering.h"
+#include "MCTargetDesc/X86MCTargetDesc.h"
 #include "X86InstrBuilder.h"
 #include "X86InstrInfo.h"
 #include "X86MachineFunctionInfo.h"
@@ -20,6 +21,7 @@
 #include "llvm/ADT/SmallSet.h"
 #include "llvm/ADT/Statistic.h"
 #include "llvm/Analysis/EHPersonalities.h"
+#include "llvm/CodeGen/LivePhysRegs.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
@@ -101,7 +103,7 @@ bool X86FrameLowering::hasFP(const MachineFunction &MF) const {
           MF.getInfo<X86MachineFunctionInfo>()->hasPreallocatedCall() ||
           MF.callsUnwindInit() || MF.hasEHFunclets() || MF.callsEHReturn() ||
           MFI.hasStackMap() || MFI.hasPatchPoint() ||
-          MFI.hasCopyImplyingStackAdjustment() ||
+          (isWin64Prologue(MF) && MFI.hasCopyImplyingStackAdjustment()) ||
           SaveArgs);
 }
 
@@ -152,6 +154,17 @@ static unsigned getLEArOpcode(bool IsLP64) {
   return IsLP64 ? X86::LEA64r : X86::LEA32r;
 }
 
+static unsigned getMOVriOpcode(bool Use64BitReg, int64_t Imm) {
+  if (Use64BitReg) {
+    if (isUInt<32>(Imm))
+      return X86::MOV32ri64;
+    if (isInt<32>(Imm))
+      return X86::MOV64ri32;
+    return X86::MOV64ri;
+  }
+  return X86::MOV32ri;
+}
+
 static bool isEAXLiveIn(MachineBasicBlock &MBB) {
   for (MachineBasicBlock::RegisterMaskPair RegMask : MBB.liveins()) {
     unsigned Reg = RegMask.PhysReg;
@@ -240,11 +253,10 @@ void X86FrameLowering::emitSPUpdate(MachineBasicBlock &MBB,
     else
       Reg = TRI->findDeadCallerSavedReg(MBB, MBBI);
 
-    unsigned MovRIOpc = Is64Bit ? X86::MOV64ri : X86::MOV32ri;
     unsigned AddSubRROpc =
         isSub ? getSUBrrOpcode(Is64Bit) : getADDrrOpcode(Is64Bit);
     if (Reg) {
-      BuildMI(MBB, MBBI, DL, TII.get(MovRIOpc), Reg)
+      BuildMI(MBB, MBBI, DL, TII.get(getMOVriOpcode(Is64Bit, Offset)), Reg)
           .addImm(Offset)
           .setMIFlag(Flag);
       MachineInstr *MI = BuildMI(MBB, MBBI, DL, TII.get(AddSubRROpc), StackPtr)
@@ -270,7 +282,7 @@ void X86FrameLowering::emitSPUpdate(MachineBasicBlock &MBB,
         Offset = -(Offset - SlotSize);
       else
         Offset = Offset + SlotSize;
-      BuildMI(MBB, MBBI, DL, TII.get(MovRIOpc), Rax)
+      BuildMI(MBB, MBBI, DL, TII.get(getMOVriOpcode(Is64Bit, Offset)), Rax)
           .addImm(Offset)
           .setMIFlag(Flag);
       MachineInstr *MI = BuildMI(MBB, MBBI, DL, TII.get(X86::ADD64rr), Rax)
@@ -428,16 +440,18 @@ int X86FrameLowering::mergeSPUpdates(MachineBasicBlock &MBB,
 void X86FrameLowering::BuildCFI(MachineBasicBlock &MBB,
                                 MachineBasicBlock::iterator MBBI,
                                 const DebugLoc &DL,
-                                const MCCFIInstruction &CFIInst) const {
+                                const MCCFIInstruction &CFIInst,
+                                MachineInstr::MIFlag Flag) const {
   MachineFunction &MF = *MBB.getParent();
   unsigned CFIIndex = MF.addFrameInst(CFIInst);
   BuildMI(MBB, MBBI, DL, TII.get(TargetOpcode::CFI_INSTRUCTION))
-      .addCFIIndex(CFIIndex);
+      .addCFIIndex(CFIIndex)
+      .setMIFlag(Flag);
 }
 
 /// Emits Dwarf Info specifying offsets of callee saved registers and
 /// frame pointer. This is called only when basic block sections are enabled.
-void X86FrameLowering::emitCalleeSavedFrameMoves(
+void X86FrameLowering::emitCalleeSavedFrameMovesFullCFA(
     MachineBasicBlock &MBB, MachineBasicBlock::iterator MBBI) const {
   MachineFunction &MF = *MBB.getParent();
   if (!hasFP(MF)) {
@@ -468,13 +482,11 @@ void X86FrameLowering::emitCalleeSavedFrameMoves(
 
   // Add callee saved registers to move list.
   const std::vector<CalleeSavedInfo> &CSI = MFI.getCalleeSavedInfo();
-  if (CSI.empty()) return;
 
   // Calculate offsets.
-  for (std::vector<CalleeSavedInfo>::const_iterator
-         I = CSI.begin(), E = CSI.end(); I != E; ++I) {
-    int64_t Offset = MFI.getObjectOffset(I->getFrameIdx());
-    unsigned Reg = I->getReg();
+  for (const CalleeSavedInfo &I : CSI) {
+    int64_t Offset = MFI.getObjectOffset(I.getFrameIdx());
+    Register Reg = I.getReg();
     unsigned DwarfReg = MRI->getDwarfRegNum(Reg, true);
 
     if (IsPrologue) {
@@ -487,10 +499,91 @@ void X86FrameLowering::emitCalleeSavedFrameMoves(
   }
 }
 
-void X86FrameLowering::emitStackProbe(MachineFunction &MF,
-                                      MachineBasicBlock &MBB,
-                                      MachineBasicBlock::iterator MBBI,
-                                      const DebugLoc &DL, bool InProlog) const {
+void X86FrameLowering::emitZeroCallUsedRegs(BitVector RegsToZero,
+                                            MachineBasicBlock &MBB) const {
+  const MachineFunction &MF = *MBB.getParent();
+
+  // Insertion point.
+  MachineBasicBlock::iterator MBBI = MBB.getFirstTerminator();
+
+  // Fake a debug loc.
+  DebugLoc DL;
+  if (MBBI != MBB.end())
+    DL = MBBI->getDebugLoc();
+
+  // Zero out FP stack if referenced. Do this outside of the loop below so that
+  // it's done only once.
+  const X86Subtarget &ST = MF.getSubtarget<X86Subtarget>();
+  for (MCRegister Reg : RegsToZero.set_bits()) {
+    if (!X86::RFP80RegClass.contains(Reg))
+      continue;
+
+    unsigned NumFPRegs = ST.is64Bit() ? 8 : 7;
+    for (unsigned i = 0; i != NumFPRegs; ++i)
+      BuildMI(MBB, MBBI, DL, TII.get(X86::LD_F0));
+
+    for (unsigned i = 0; i != NumFPRegs; ++i)
+      BuildMI(MBB, MBBI, DL, TII.get(X86::ST_FPrr)).addReg(X86::ST0);
+    break;
+  }
+
+  // For GPRs, we only care to clear out the 32-bit register.
+  BitVector GPRsToZero(TRI->getNumRegs());
+  for (MCRegister Reg : RegsToZero.set_bits())
+    if (TRI->isGeneralPurposeRegister(MF, Reg)) {
+      GPRsToZero.set(getX86SubSuperRegisterOrZero(Reg, 32));
+      RegsToZero.reset(Reg);
+    }
+
+  for (MCRegister Reg : GPRsToZero.set_bits())
+    BuildMI(MBB, MBBI, DL, TII.get(X86::XOR32rr), Reg)
+        .addReg(Reg, RegState::Undef)
+        .addReg(Reg, RegState::Undef);
+
+  // Zero out registers.
+  for (MCRegister Reg : RegsToZero.set_bits()) {
+    if (ST.hasMMX() && X86::VR64RegClass.contains(Reg))
+      // FIXME: Ignore MMX registers?
+      continue;
+
+    unsigned XorOp;
+    if (X86::VR128RegClass.contains(Reg)) {
+      // XMM#
+      if (!ST.hasSSE1())
+        continue;
+      XorOp = X86::PXORrr;
+    } else if (X86::VR256RegClass.contains(Reg)) {
+      // YMM#
+      if (!ST.hasAVX())
+        continue;
+      XorOp = X86::VPXORrr;
+    } else if (X86::VR512RegClass.contains(Reg)) {
+      // ZMM#
+      if (!ST.hasAVX512())
+        continue;
+      XorOp = X86::VPXORYrr;
+    } else if (X86::VK1RegClass.contains(Reg) ||
+               X86::VK2RegClass.contains(Reg) ||
+               X86::VK4RegClass.contains(Reg) ||
+               X86::VK8RegClass.contains(Reg) ||
+               X86::VK16RegClass.contains(Reg)) {
+      if (!ST.hasVLX())
+        continue;
+      XorOp = ST.hasBWI() ? X86::KXORQrr : X86::KXORWrr;
+    } else {
+      continue;
+    }
+
+    BuildMI(MBB, MBBI, DL, TII.get(XorOp), Reg)
+      .addReg(Reg, RegState::Undef)
+      .addReg(Reg, RegState::Undef);
+  }
+}
+
+void X86FrameLowering::emitStackProbe(
+    MachineFunction &MF, MachineBasicBlock &MBB,
+    MachineBasicBlock::iterator MBBI, const DebugLoc &DL, bool InProlog,
+    std::optional<MachineFunction::DebugInstrOperandPair> InstrNum) const {
   const X86Subtarget &STI = MF.getSubtarget<X86Subtarget>();
   if (STI.isTargetWindowsCoreCLR()) {
     if (InProlog) {
@@ -500,10 +593,14 @@ void X86FrameLowering::emitStackProbe(MachineFunction &MF,
       emitStackProbeInline(MF, MBB, MBBI, DL, false);
     }
   } else {
-    emitStackProbeCall(MF, MBB, MBBI, DL, InProlog);
+    emitStackProbeCall(MF, MBB, MBBI, DL, InProlog, InstrNum);
   }
 }
 
+bool X86FrameLowering::stackProbeFunctionModifiesSP() const {
+  return STI.isOSWindows() && !STI.isTargetWin64();
+}
+
 void X86FrameLowering::inlineStackProbe(MachineFunction &MF,
                                         MachineBasicBlock &PrologMBB) const {
   auto Where = llvm::find_if(PrologMBB, [](MachineInstr &MI) {
@@ -566,7 +663,6 @@ void X86FrameLowering::emitStackProbeInlineGenericBlock(
   const bool HasFP = hasFP(MF);
   const X86Subtarget &STI = MF.getSubtarget<X86Subtarget>();
   const X86TargetLowering &TLI = *STI.getTargetLowering();
-  const unsigned Opc = getSUBriOpcode(Uses64BitFramePtr, Offset);
   const unsigned MovMIOpc = Is64Bit ? X86::MOV64mi32 : X86::MOV32mi;
   const uint64_t StackProbeSize = TLI.getStackProbeSize(MF);
 
@@ -577,16 +673,14 @@ void X86FrameLowering::emitStackProbeInlineGenericBlock(
   // If the offset is so small it fits within a page, there's nothing to do.
   if (StackProbeSize < Offset + AlignOffset) {
 
-    MachineInstr *MI = BuildMI(MBB, MBBI, DL, TII.get(Opc), StackPtr)
-                           .addReg(StackPtr)
-                           .addImm(StackProbeSize - AlignOffset)
-                           .setMIFlag(MachineInstr::FrameSetup);
+    uint64_t StackAdjustment = StackProbeSize - AlignOffset;
+    BuildStackAdjustment(MBB, MBBI, DL, -StackAdjustment, /*InEpilogue=*/false)
+        .setMIFlag(MachineInstr::FrameSetup);
     if (!HasFP && NeedsDwarfCFI) {
-      BuildCFI(MBB, MBBI, DL,
-               MCCFIInstruction::createAdjustCfaOffset(
-                   nullptr, StackProbeSize - AlignOffset));
+      BuildCFI(
+          MBB, MBBI, DL,
+          MCCFIInstruction::createAdjustCfaOffset(nullptr, StackAdjustment));
     }
-    MI->getOperand(3).setIsDead(); // The EFLAGS implicit def is dead.
 
     addRegOffset(BuildMI(MBB, MBBI, DL, TII.get(MovMIOpc))
                      .setMIFlag(MachineInstr::FrameSetup),
@@ -601,11 +695,8 @@ void X86FrameLowering::emitStackProbeInlineGenericBlock(
   // natural probes but it implies much more logic and there was very few
   // interesting natural probes to interleave.
   while (CurrentOffset + StackProbeSize < Offset) {
-    MachineInstr *MI = BuildMI(MBB, MBBI, DL, TII.get(Opc), StackPtr)
-                           .addReg(StackPtr)
-                           .addImm(StackProbeSize)
-                           .setMIFlag(MachineInstr::FrameSetup);
-    MI->getOperand(3).setIsDead(); // The EFLAGS implicit def is dead.
+    BuildStackAdjustment(MBB, MBBI, DL, -StackProbeSize, /*InEpilogue=*/false)
+        .setMIFlag(MachineInstr::FrameSetup);
 
     if (!HasFP && NeedsDwarfCFI) {
       BuildCFI(
@@ -623,13 +714,20 @@ void X86FrameLowering::emitStackProbeInlineGenericBlock(
 
   // No need to probe the tail, it is smaller than a Page.
   uint64_t ChunkSize = Offset - CurrentOffset;
-  MachineInstr *MI = BuildMI(MBB, MBBI, DL, TII.get(Opc), StackPtr)
-                         .addReg(StackPtr)
-                         .addImm(ChunkSize)
-                         .setMIFlag(MachineInstr::FrameSetup);
+  if (ChunkSize == SlotSize) {
+    // Use push for slot sized adjustments as a size optimization,
+    // like emitSPUpdate does when not probing.
+    unsigned Reg = Is64Bit ? X86::RAX : X86::EAX;
+    unsigned Opc = Is64Bit ? X86::PUSH64r : X86::PUSH32r;
+    BuildMI(MBB, MBBI, DL, TII.get(Opc))
+        .addReg(Reg, RegState::Undef)
+        .setMIFlag(MachineInstr::FrameSetup);
+  } else {
+    BuildStackAdjustment(MBB, MBBI, DL, -ChunkSize, /*InEpilogue=*/false)
+        .setMIFlag(MachineInstr::FrameSetup);
+  }
   // No need to adjust Dwarf CFA offset here, the last position of the stack has
   // been defined
-  MI->getOperand(3).setIsDead(); // The EFLAGS implicit def is dead.
 }
 
 void X86FrameLowering::emitStackProbeInlineGenericLoop(
@@ -638,6 +736,12 @@ void X86FrameLowering::emitStackProbeInlineGenericLoop(
     uint64_t AlignOffset) const {
   assert(Offset && "null offset");
 
+  assert(MBB.computeRegisterLiveness(TRI, X86::EFLAGS, MBBI) !=
+             MachineBasicBlock::LQR_Live &&
+         "Inline stack probe loop will clobber live EFLAGS.");
+
+  const bool NeedsDwarfCFI = needsDwarfCFI(MF);
+  const bool HasFP = hasFP(MF);
   const X86Subtarget &STI = MF.getSubtarget<X86Subtarget>();
   const X86TargetLowering &TLI = *STI.getTargetLowering();
   const unsigned MovMIOpc = Is64Bit ? X86::MOV64mi32 : X86::MOV32mi;
@@ -646,12 +750,8 @@ void X86FrameLowering::emitStackProbeInlineGenericLoop(
   if (AlignOffset) {
     if (AlignOffset < StackProbeSize) {
       // Perform a first smaller allocation followed by a probe.
-      const unsigned SUBOpc = getSUBriOpcode(Uses64BitFramePtr, AlignOffset);
-      MachineInstr *MI = BuildMI(MBB, MBBI, DL, TII.get(SUBOpc), StackPtr)
-                             .addReg(StackPtr)
-                             .addImm(AlignOffset)
-                             .setMIFlag(MachineInstr::FrameSetup);
-      MI->getOperand(3).setIsDead(); // The EFLAGS implicit def is dead.
+      BuildStackAdjustment(MBB, MBBI, DL, -AlignOffset, /*InEpilogue=*/false)
+          .setMIFlag(MachineInstr::FrameSetup);
 
       addRegOffset(BuildMI(MBB, MBBI, DL, TII.get(MovMIOpc))
                        .setMIFlag(MachineInstr::FrameSetup),
@@ -677,27 +777,42 @@ void X86FrameLowering::emitStackProbeInlineGenericLoop(
   Register FinalStackProbed = Uses64BitFramePtr ? X86::R11
                               : Is64Bit         ? X86::R11D
                                                 : X86::EAX;
+
   BuildMI(MBB, MBBI, DL, TII.get(TargetOpcode::COPY), FinalStackProbed)
       .addReg(StackPtr)
       .setMIFlag(MachineInstr::FrameSetup);
 
   // save loop bound
   {
-    const unsigned SUBOpc = getSUBriOpcode(Uses64BitFramePtr, Offset);
+    const unsigned BoundOffset = alignDown(Offset, StackProbeSize);
+    const unsigned SUBOpc = getSUBriOpcode(Uses64BitFramePtr, BoundOffset);
     BuildMI(MBB, MBBI, DL, TII.get(SUBOpc), FinalStackProbed)
         .addReg(FinalStackProbed)
-        .addImm(Offset / StackProbeSize * StackProbeSize)
+        .addImm(BoundOffset)
         .setMIFlag(MachineInstr::FrameSetup);
+
+    // while in the loop, use loop-invariant reg for CFI,
+    // instead of the stack pointer, which changes during the loop
+    if (!HasFP && NeedsDwarfCFI) {
+      // x32 uses the same DWARF register numbers as x86-64,
+      // so there isn't a register number for r11d, we must use r11 instead
+      const Register DwarfFinalStackProbed =
+          STI.isTarget64BitILP32()
+              ? Register(getX86SubSuperRegister(FinalStackProbed, 64))
+              : FinalStackProbed;
+
+      BuildCFI(MBB, MBBI, DL,
+               MCCFIInstruction::createDefCfaRegister(
+                   nullptr, TRI->getDwarfRegNum(DwarfFinalStackProbed, true)));
+      BuildCFI(MBB, MBBI, DL,
+               MCCFIInstruction::createAdjustCfaOffset(nullptr, BoundOffset));
+    }
   }
 
   // allocate a page
-  {
-    const unsigned SUBOpc = getSUBriOpcode(Uses64BitFramePtr, StackProbeSize);
-    BuildMI(testMBB, DL, TII.get(SUBOpc), StackPtr)
-        .addReg(StackPtr)
-        .addImm(StackProbeSize)
-        .setMIFlag(MachineInstr::FrameSetup);
-  }
+  BuildStackAdjustment(*testMBB, testMBB->end(), DL, -StackProbeSize,
+                       /*InEpilogue=*/false)
+      .setMIFlag(MachineInstr::FrameSetup);
 
   // touch the page
   addRegOffset(BuildMI(testMBB, DL, TII.get(MovMIOpc))
@@ -726,15 +841,28 @@ void X86FrameLowering::emitStackProbeInlineGenericLoop(
   MBB.addSuccessor(testMBB);
 
   // handle tail
-  unsigned TailOffset = Offset % StackProbeSize;
+  const uint64_t TailOffset = Offset % StackProbeSize;
+  MachineBasicBlock::iterator TailMBBIter = tailMBB->begin();
   if (TailOffset) {
-    const unsigned Opc = getSUBriOpcode(Uses64BitFramePtr, TailOffset);
-    BuildMI(*tailMBB, tailMBB->begin(), DL, TII.get(Opc), StackPtr)
-        .addReg(StackPtr)
-        .addImm(TailOffset)
+    BuildStackAdjustment(*tailMBB, TailMBBIter, DL, -TailOffset,
+                         /*InEpilogue=*/false)
         .setMIFlag(MachineInstr::FrameSetup);
   }
 
+  // after the loop, switch back to stack pointer for CFI
+  if (!HasFP && NeedsDwarfCFI) {
+    // x32 uses the same DWARF register numbers as x86-64,
+    // so there isn't a register number for esp, we must use rsp instead
+    const Register DwarfStackPtr =
+        STI.isTarget64BitILP32()
+            ? Register(getX86SubSuperRegister(StackPtr, 64))
+            : Register(StackPtr);
+
+    BuildCFI(*tailMBB, TailMBBIter, DL,
+             MCCFIInstruction::createDefCfaRegister(
+                 nullptr, TRI->getDwarfRegNum(DwarfStackPtr, true)));
+  }
+
   // Update Live In information
   recomputeLiveIns(*testMBB);
   recomputeLiveIns(*tailMBB);
@@ -749,6 +877,10 @@ void X86FrameLowering::emitStackProbeInlineWindowsCoreCLR64(
   const TargetInstrInfo &TII = *STI.getInstrInfo();
   const BasicBlock *LLVM_BB = MBB.getBasicBlock();
 
+  assert(MBB.computeRegisterLiveness(TRI, X86::EFLAGS, MBBI) !=
+             MachineBasicBlock::LQR_Live &&
+         "Inline stack probe loop will clobber live EFLAGS.");
+
   // RAX contains the number of bytes of desired stack adjustment.
   // The handling here assumes this value has already been updated so as to
   // maintain stack alignment.
@@ -967,18 +1099,17 @@ void X86FrameLowering::emitStackProbeInlineWindowsCoreCLR64(
     for (MachineInstr &MI : *LoopMBB) {
       MI.setFlag(MachineInstr::FrameSetup);
     }
-    for (MachineBasicBlock::iterator CMBBI = ContinueMBB->begin();
-         CMBBI != ContinueMBBI; ++CMBBI) {
-      CMBBI->setFlag(MachineInstr::FrameSetup);
+    for (MachineInstr &MI :
+         llvm::make_range(ContinueMBB->begin(), ContinueMBBI)) {
+      MI.setFlag(MachineInstr::FrameSetup);
     }
   }
 }
 
-void X86FrameLowering::emitStackProbeCall(MachineFunction &MF,
-                                          MachineBasicBlock &MBB,
-                                          MachineBasicBlock::iterator MBBI,
-                                          const DebugLoc &DL,
-                                          bool InProlog) const {
+void X86FrameLowering::emitStackProbeCall(
+    MachineFunction &MF, MachineBasicBlock &MBB,
+    MachineBasicBlock::iterator MBBI, const DebugLoc &DL, bool InProlog,
+    std::optional<MachineFunction::DebugInstrOperandPair> InstrNum) const {
   bool IsLargeCodeModel = MF.getTarget().getCodeModel() == CodeModel::Large;
 
   // FIXME: Add indirect thunk support and remove this.
@@ -986,6 +1117,10 @@ void X86FrameLowering::emitStackProbeCall(MachineFunction &MF,
     report_fatal_error("Emitting stack probe calls on 64-bit with the large "
                        "code model and indirect thunks not yet implemented.");
 
+  assert(MBB.computeRegisterLiveness(TRI, X86::EFLAGS, MBBI) !=
+             MachineBasicBlock::LQR_Live &&
+         "Stack probe calls will clobber live EFLAGS.");
+
   unsigned CallOp;
   if (Is64Bit)
     CallOp = IsLargeCodeModel ? X86::CALL64r : X86::CALL64pcrel32;
@@ -1018,6 +1153,7 @@ void X86FrameLowering::emitStackProbeCall(MachineFunction &MF,
       .addReg(SP, RegState::Define | RegState::Implicit)
       .addReg(X86::EFLAGS, RegState::Define | RegState::Implicit);
 
+  MachineInstr *ModInst = CI;
   if (STI.isTargetWin64() || !STI.isOSWindows()) {
     // MSVC x32's _chkstk and cygwin/mingw's _alloca adjust %esp themselves.
     // MSVC x64's __chkstk and cygwin/mingw's ___chkstk_ms do not adjust %rsp
@@ -1025,9 +1161,27 @@ void X86FrameLowering::emitStackProbeCall(MachineFunction &MF,
     // adjusting %rsp.
     // All other platforms do not specify a particular ABI for the stack probe
     // function, so we arbitrarily define it to not adjust %esp/%rsp itself.
-    BuildMI(MBB, MBBI, DL, TII.get(getSUBrrOpcode(Uses64BitFramePtr)), SP)
-        .addReg(SP)
-        .addReg(AX);
+    ModInst =
+        BuildMI(MBB, MBBI, DL, TII.get(getSUBrrOpcode(Uses64BitFramePtr)), SP)
+            .addReg(SP)
+            .addReg(AX);
+  }
+
+  // DebugInfo variable locations -- if there's an instruction number for the
+  // allocation (i.e., DYN_ALLOC_*), substitute it for the instruction that
+  // modifies SP.
+  if (InstrNum) {
+    if (STI.isTargetWin64() || !STI.isOSWindows()) {
+      // Label destination operand of the subtract.
+      MF.makeDebugValueSubstitution(*InstrNum,
+                                    {ModInst->getDebugInstrNum(), 0});
+    } else {
+      // Label the call. The operand number is the penultimate operand, zero
+      // based.
+      unsigned SPDefOperand = ModInst->getNumOperands() - 2;
+      MF.makeDebugValueSubstitution(
+          *InstrNum, {ModInst->getDebugInstrNum(), SPDefOperand});
+    }
   }
 
   if (InProlog) {
@@ -1142,11 +1296,11 @@ void X86FrameLowering::BuildStackAlignAND(MachineBasicBlock &MBB,
 
         BuildMI(headMBB, DL,
                 TII.get(Uses64BitFramePtr ? X86::CMP64rr : X86::CMP32rr))
-            .addReg(FinalStackProbed)
             .addReg(StackPtr)
+            .addReg(FinalStackProbed)
             .setMIFlag(MachineInstr::FrameSetup);
 
-        // jump
+        // jump to the footer if StackPtr < FinalStackProbed
         BuildMI(headMBB, DL, TII.get(X86::JCC_1))
             .addMBB(footMBB)
             .addImm(X86::COND_B)
@@ -1178,7 +1332,7 @@ void X86FrameLowering::BuildStackAlignAND(MachineBasicBlock &MBB,
             .addReg(StackPtr)
             .setMIFlag(MachineInstr::FrameSetup);
 
-        // jump
+        // jump back while FinalStackProbed < StackPtr
         BuildMI(bodyMBB, DL, TII.get(X86::JCC_1))
             .addMBB(bodyMBB)
             .addImm(X86::COND_B)
@@ -1244,6 +1398,9 @@ bool X86FrameLowering::has128ByteRedZone(const MachineFunction& MF) const {
   return Is64Bit && !IsWin64CC && !Fn.hasFnAttribute(Attribute::NoRedZone);
 }
 
+/// Return true if we need to use the restricted Windows x64 prologue and
+/// epilogue code patterns that can be described with WinCFI (.seh_*
+/// directives).
 bool X86FrameLowering::isWin64Prologue(const MachineFunction &MF) const {
   return MF.getTarget().getMCAsmInfo()->usesWindowsCFI();
 }
@@ -1374,25 +1531,44 @@ void X86FrameLowering::emitPrologue(MachineFunction &MF,
   // to determine the end of the prologue.
   DebugLoc DL;
 
-  // Add RETADDR move area to callee saved frame size.
-  int TailCallReturnAddrDelta = X86FI->getTCReturnAddrDelta();
-  if (TailCallReturnAddrDelta && IsWin64Prologue)
+  // Space reserved for stack-based arguments when making a (ABI-guaranteed)
+  // tail call.
+  unsigned TailCallArgReserveSize = -X86FI->getTCReturnAddrDelta();
+  if (TailCallArgReserveSize  && IsWin64Prologue)
     report_fatal_error("Can't handle guaranteed tail call under win64 yet");
 
-  if (TailCallReturnAddrDelta < 0)
-    X86FI->setCalleeSavedFrameSize(
-      X86FI->getCalleeSavedFrameSize() - TailCallReturnAddrDelta);
-
   const bool EmitStackProbeCall =
       STI.getTargetLowering()->hasStackProbeSymbol(MF);
   unsigned StackProbeSize = STI.getTargetLowering()->getStackProbeSize(MF);
 
   if (HasFP && X86FI->hasSwiftAsyncContext()) {
-    BuildMI(MBB, MBBI, DL, TII.get(X86::BTS64ri8),
-            MachineFramePtr)
-        .addUse(MachineFramePtr)
-        .addImm(60)
-        .setMIFlag(MachineInstr::FrameSetup);
+    switch (MF.getTarget().Options.SwiftAsyncFramePointer) {
+    case SwiftAsyncFramePointerMode::DeploymentBased:
+      if (STI.swiftAsyncContextIsDynamicallySet()) {
+        // The special symbol below is absolute and has a *value* suitable to be
+        // combined with the frame pointer directly.
+        BuildMI(MBB, MBBI, DL, TII.get(X86::OR64rm), MachineFramePtr)
+            .addUse(MachineFramePtr)
+            .addUse(X86::RIP)
+            .addImm(1)
+            .addUse(X86::NoRegister)
+            .addExternalSymbol("swift_async_extendedFramePointerFlags",
+                               X86II::MO_GOTPCREL)
+            .addUse(X86::NoRegister);
+        break;
+      }
+      [[fallthrough]];
+
+    case SwiftAsyncFramePointerMode::Always:
+      BuildMI(MBB, MBBI, DL, TII.get(X86::BTS64ri8), MachineFramePtr)
+          .addUse(MachineFramePtr)
+          .addImm(60)
+          .setMIFlag(MachineInstr::FrameSetup);
+      break;
+
+    case SwiftAsyncFramePointerMode::Never:
+      break;
+    }
   }
 
   // Re-align the stack on 64-bit if the x86-interrupt calling convention is
@@ -1402,7 +1578,19 @@ void X86FrameLowering::emitPrologue(MachineFunction &MF,
       Fn.arg_size() == 2) {
     StackSize += 8;
     MFI.setStackSize(StackSize);
-    emitSPUpdate(MBB, MBBI, DL, -8, /*InEpilogue=*/false);
+
+    // Update the stack pointer by pushing a register. This is the instruction
+    // emitted that would be end up being emitted by a call to `emitSPUpdate`.
+    // Hard-coding the update to a push avoids emitting a second
+    // `STACKALLOC_W_PROBING` instruction in the save block: We know that stack
+    // probing isn't needed anyways for an 8-byte update.
+    // Pushing a register leaves us in a similar situation to a regular
+    // function call where we know that the address at (rsp-8) is writeable.
+    // That way we avoid any off-by-ones with stack probing for additional
+    // stack pointer updates later on.
+    BuildMI(MBB, MBBI, DL, TII.get(X86::PUSH64r))
+        .addReg(X86::RAX, RegState::Undef)
+        .setMIFlag(MachineInstr::FrameSetup);
   }
 
   // If this is x86-64 and the Red Zone is not disabled, if we are a leaf
@@ -1416,7 +1604,8 @@ void X86FrameLowering::emitPrologue(MachineFunction &MF,
       !EmitStackProbeCall &&                   // No stack probes.
       !MFI.hasCopyImplyingStackAdjustment() && // Don't push and pop.
       !MF.shouldSplitStack()) {                // Regular stack
-    uint64_t MinSize = X86FI->getCalleeSavedFrameSize();
+    uint64_t MinSize =
+        X86FI->getCalleeSavedFrameSize() - X86FI->getTCReturnAddrDelta();
     if (HasFP) MinSize += SlotSize;
     X86FI->setUsesRedZone(MinSize > 0 || StackSize > 0);
     StackSize = std::max(MinSize, StackSize > 128 ? StackSize - 128 : 0);
@@ -1426,8 +1615,8 @@ void X86FrameLowering::emitPrologue(MachineFunction &MF,
   // Insert stack pointer adjustment for later moving of return addr.  Only
   // applies to tail call optimized functions where the callee argument stack
   // size is bigger than the callers.
-  if (TailCallReturnAddrDelta < 0) {
-    BuildStackAdjustment(MBB, MBBI, DL, TailCallReturnAddrDelta,
+  if (TailCallArgReserveSize != 0) {
+    BuildStackAdjustment(MBB, MBBI, DL, -(int)TailCallArgReserveSize,
                          /*InEpilogue=*/false)
         .setMIFlag(MachineInstr::FrameSetup);
   }
@@ -1476,7 +1665,8 @@ void X86FrameLowering::emitPrologue(MachineFunction &MF,
     if (X86FI->getRestoreBasePointer())
       FrameSize += SlotSize;
 
-    NumBytes = FrameSize - X86FI->getCalleeSavedFrameSize();
+    NumBytes = FrameSize -
+               (X86FI->getCalleeSavedFrameSize() + TailCallArgReserveSize);
 
     // Callee-saved registers are pushed on stack before the stack is realigned.
     if (TRI->hasStackRealignment(MF) && !IsWin64Prologue)
@@ -1492,12 +1682,15 @@ void X86FrameLowering::emitPrologue(MachineFunction &MF,
       // Define the current CFA rule to use the provided offset.
       assert(StackSize);
       BuildCFI(MBB, MBBI, DL,
-               MCCFIInstruction::cfiDefCfaOffset(nullptr, -2 * stackGrowth));
+               MCCFIInstruction::cfiDefCfaOffset(nullptr, -2 * stackGrowth),
+               MachineInstr::FrameSetup);
 
       // Change the rule for the FramePtr to be an "offset" rule.
       unsigned DwarfFramePtr = TRI->getDwarfRegNum(MachineFramePtr, true);
-      BuildCFI(MBB, MBBI, DL, MCCFIInstruction::createOffset(
-                                  nullptr, DwarfFramePtr, 2 * stackGrowth));
+      BuildCFI(MBB, MBBI, DL,
+               MCCFIInstruction::createOffset(nullptr, DwarfFramePtr,
+                                              2 * stackGrowth),
+               MachineInstr::FrameSetup);
     }
 
     if (NeedsWinCFI) {
@@ -1601,7 +1794,8 @@ void X86FrameLowering::emitPrologue(MachineFunction &MF,
           unsigned DwarfFramePtr = TRI->getDwarfRegNum(MachineFramePtr, true);
           BuildCFI(
               MBB, MBBI, DL,
-              MCCFIInstruction::createDefCfaRegister(nullptr, DwarfFramePtr));
+              MCCFIInstruction::createDefCfaRegister(nullptr, DwarfFramePtr),
+              MachineInstr::FrameSetup);
         }
 
         if (NeedsWinFPO) {
@@ -1616,7 +1810,8 @@ void X86FrameLowering::emitPrologue(MachineFunction &MF,
     }
   } else {
     assert(!IsFunclet && "funclets without FPs not yet implemented");
-    NumBytes = StackSize - X86FI->getCalleeSavedFrameSize();
+    NumBytes = StackSize -
+               (X86FI->getCalleeSavedFrameSize() + TailCallArgReserveSize);
   }
 
   // Update the offset adjustment, which is mainly used by codeview to translate
@@ -1651,7 +1846,8 @@ void X86FrameLowering::emitPrologue(MachineFunction &MF,
       // Define the current CFA rule to use the provided offset.
       assert(StackSize);
       BuildCFI(MBB, MBBI, DL,
-               MCCFIInstruction::cfiDefCfaOffset(nullptr, -StackOffset));
+               MCCFIInstruction::cfiDefCfaOffset(nullptr, -StackOffset),
+               MachineInstr::FrameSetup);
       StackOffset += stackGrowth;
     }
 
@@ -1721,19 +1917,9 @@ void X86FrameLowering::emitPrologue(MachineFunction &MF,
       // Handle the 64-bit Windows ABI case where we need to call __chkstk.
       // Function prologue is responsible for adjusting the stack pointer.
       int64_t Alloc = isEAXAlive ? NumBytes - 8 : NumBytes;
-      if (isUInt<32>(Alloc)) {
-        BuildMI(MBB, MBBI, DL, TII.get(X86::MOV32ri), X86::EAX)
-            .addImm(Alloc)
-            .setMIFlag(MachineInstr::FrameSetup);
-      } else if (isInt<32>(Alloc)) {
-        BuildMI(MBB, MBBI, DL, TII.get(X86::MOV64ri32), X86::RAX)
-            .addImm(Alloc)
-            .setMIFlag(MachineInstr::FrameSetup);
-      } else {
-        BuildMI(MBB, MBBI, DL, TII.get(X86::MOV64ri), X86::RAX)
-            .addImm(Alloc)
-            .setMIFlag(MachineInstr::FrameSetup);
-      }
+      BuildMI(MBB, MBBI, DL, TII.get(getMOVriOpcode(Is64Bit, Alloc)), X86::RAX)
+          .addImm(Alloc)
+          .setMIFlag(MachineInstr::FrameSetup);
     } else {
       // Allocate NumBytes-4 bytes on stack in case of isEAXAlive.
       // We'll also use 4 already allocated bytes for EAX.
@@ -1942,7 +2128,8 @@ void X86FrameLowering::emitPrologue(MachineFunction &MF,
       assert(StackSize);
       BuildCFI(
           MBB, MBBI, DL,
-          MCCFIInstruction::cfiDefCfaOffset(nullptr, StackSize - stackGrowth));
+          MCCFIInstruction::cfiDefCfaOffset(nullptr, StackSize - stackGrowth),
+          MachineInstr::FrameSetup);
     }
 
     // Emit DWARF info specifying the offsets of the callee-saved registers.
@@ -2073,6 +2260,7 @@ void X86FrameLowering::emitEpilogue(MachineFunction &MF,
   uint64_t StackSize = MFI.getStackSize();
   uint64_t MaxAlign = calculateMaxStackAlign(MF);
   unsigned CSSize = X86FI->getCalleeSavedFrameSize();
+  unsigned TailCallArgReserveSize = -X86FI->getTCReturnAddrDelta();
   bool HasFP = hasFP(MF);
   uint64_t NumBytes = 0;
 
@@ -2086,14 +2274,14 @@ void X86FrameLowering::emitEpilogue(MachineFunction &MF,
   } else if (HasFP) {
     // Calculate required stack adjustment.
     uint64_t FrameSize = StackSize - SlotSize;
-    NumBytes = FrameSize - CSSize;
+    NumBytes = FrameSize - CSSize - TailCallArgReserveSize;
 
     // Callee-saved registers were pushed on stack before the stack was
     // realigned.
     if (TRI->hasStackRealignment(MF) && !IsWin64Prologue)
       NumBytes = alignTo(FrameSize, MaxAlign);
   } else {
-    NumBytes = StackSize - CSSize;
+    NumBytes = StackSize - CSSize - TailCallArgReserveSize;
   }
   uint64_t SEHStackAllocAmt = NumBytes;
 
@@ -2131,11 +2319,13 @@ void X86FrameLowering::emitEpilogue(MachineFunction &MF,
       unsigned DwarfStackPtr =
           TRI->getDwarfRegNum(Is64Bit ? X86::RSP : X86::ESP, true);
       BuildCFI(MBB, MBBI, DL,
-               MCCFIInstruction::cfiDefCfa(nullptr, DwarfStackPtr, SlotSize));
+               MCCFIInstruction::cfiDefCfa(nullptr, DwarfStackPtr, SlotSize),
+               MachineInstr::FrameDestroy);
       if (!MBB.succ_empty() && !MBB.isReturnBlock()) {
         unsigned DwarfFramePtr = TRI->getDwarfRegNum(MachineFramePtr, true);
         BuildCFI(MBB, AfterPop, DL,
-                 MCCFIInstruction::createRestore(nullptr, DwarfFramePtr));
+                 MCCFIInstruction::createRestore(nullptr, DwarfFramePtr),
+                 MachineInstr::FrameDestroy);
         --MBBI;
         --AfterPop;
       }
@@ -2168,7 +2358,6 @@ void X86FrameLowering::emitEpilogue(MachineFunction &MF,
 
   if (MBBI != MBB.end())
     DL = MBBI->getDebugLoc();
-
   // If there is an ADD32ri or SUB32ri of ESP immediately before this
   // instruction, merge the two instructions.
   if (NumBytes || MFI.hasVarSizedObjects())
@@ -2210,10 +2399,12 @@ void X86FrameLowering::emitEpilogue(MachineFunction &MF,
   } else if (NumBytes) {
     // Adjust stack pointer back: ESP += numbytes.
     emitSPUpdate(MBB, MBBI, DL, NumBytes, /*InEpilogue=*/true);
-    if (!hasFP(MF) && NeedsDwarfCFI) {
+    if (!HasFP && NeedsDwarfCFI) {
       // Define the current CFA rule to use the provided offset.
       BuildCFI(MBB, MBBI, DL,
-               MCCFIInstruction::cfiDefCfaOffset(nullptr, CSSize + SlotSize));
+               MCCFIInstruction::cfiDefCfaOffset(
+                   nullptr, CSSize + TailCallArgReserveSize + SlotSize),
+               MachineInstr::FrameDestroy);
     }
     --MBBI;
   }
@@ -2227,7 +2418,7 @@ void X86FrameLowering::emitEpilogue(MachineFunction &MF,
   if (NeedsWin64CFI && MF.hasWinCFI())
     BuildMI(MBB, MBBI, DL, TII.get(X86::SEH_Epilogue));
 
-  if (!hasFP(MF) && NeedsDwarfCFI) {
+  if (!HasFP && NeedsDwarfCFI) {
     MBBI = FirstCSPop;
     int64_t Offset = -CSSize - SlotSize;
     // Mark callee-saved pop instruction.
@@ -2239,7 +2430,8 @@ void X86FrameLowering::emitEpilogue(MachineFunction &MF,
       if (Opc == X86::POP32r || Opc == X86::POP64r) {
         Offset += SlotSize;
         BuildCFI(MBB, MBBI, DL,
-                 MCCFIInstruction::cfiDefCfaOffset(nullptr, -Offset));
+                 MCCFIInstruction::cfiDefCfaOffset(nullptr, -Offset),
+                 MachineInstr::FrameDestroy);
       }
     }
   }
@@ -2247,9 +2439,8 @@ void X86FrameLowering::emitEpilogue(MachineFunction &MF,
   // Emit DWARF info specifying the restores of the callee-saved registers.
   // For epilogue with return inside or being other block without successor,
   // no need to generate .cfi_restore for callee-saved registers.
-  if (NeedsDwarfCFI && !MBB.succ_empty() && !MBB.isReturnBlock()) {
+  if (NeedsDwarfCFI && !MBB.succ_empty())
     emitCalleeSavedFrameMoves(MBB, AfterPop, DL, false);
-  }
 
   if (Terminator == MBB.end() || !isTailCallOpcode(Terminator->getOpcode())) {
     // Add the return addr area delta back since we are not tail calling.
@@ -2263,13 +2454,8 @@ void X86FrameLowering::emitEpilogue(MachineFunction &MF,
   }
 
   // Emit tilerelease for AMX kernel.
-  const MachineRegisterInfo &MRI = MF.getRegInfo();
-  const TargetRegisterClass *RC = TRI->getRegClass(X86::TILERegClassID);
-  for (unsigned I = 0; I < RC->getNumRegs(); I++)
-    if (!MRI.reg_nodbg_empty(X86::TMM0 + I)) {
-      BuildMI(MBB, Terminator, DL, TII.get(X86::TILERELEASE));
-      break;
-    }
+  if (X86FI->hasVirtualTileReg())
+    BuildMI(MBB, Terminator, DL, TII.get(X86::TILERELEASE));
 }
 
 StackOffset X86FrameLowering::getFrameIndexReference(const MachineFunction &MF,
@@ -2296,7 +2482,6 @@ StackOffset X86FrameLowering::getFrameIndexReference(const MachineFunction &MF,
   const X86MachineFunctionInfo *X86FI = MF.getInfo<X86MachineFunctionInfo>();
   unsigned CSSize = X86FI->getCalleeSavedFrameSize();
   uint64_t StackSize = MFI.getStackSize();
-  bool HasFP = hasFP(MF);
   bool IsWin64Prologue = MF.getTarget().getMCAsmInfo()->usesWindowsCFI();
   int64_t FPDelta = 0;
 
@@ -2335,38 +2520,27 @@ StackOffset X86FrameLowering::getFrameIndexReference(const MachineFunction &MF,
   if (FI >= 0)
     Offset -= X86FI->getSaveArgSize();
 
-  if (TRI->hasBasePointer(MF)) {
-    assert(HasFP && "VLAs and dynamic stack realign, but no FP?!");
-    if (FI < 0) {
-      // Skip the saved EBP.
-      return StackOffset::getFixed(Offset + SlotSize + FPDelta);
-    } else {
-      assert(isAligned(MFI.getObjectAlign(FI), -(Offset + StackSize)));
-      return StackOffset::getFixed(Offset + StackSize);
-    }
-  } else if (TRI->hasStackRealignment(MF)) {
-    if (FI < 0) {
-      // Skip the saved EBP.
-      return StackOffset::getFixed(Offset + SlotSize + FPDelta);
-    } else {
-      assert(isAligned(MFI.getObjectAlign(FI), -(Offset + StackSize)));
-      return StackOffset::getFixed(Offset + StackSize);
-    }
-    // FIXME: Support tail calls
-  } else {
-    if (!HasFP)
-      return StackOffset::getFixed(Offset + StackSize);
-
-    // Skip the saved EBP.
+  if (FrameReg == TRI->getFramePtr()) {
+    // Skip saved EBP/RBP
     Offset += SlotSize;
 
+    // Account for restricted Windows prologue.
+    Offset += FPDelta;
+
     // Skip the RETADDR move area
     int TailCallReturnAddrDelta = X86FI->getTCReturnAddrDelta();
     if (TailCallReturnAddrDelta < 0)
       Offset -= TailCallReturnAddrDelta;
+
+    return StackOffset::getFixed(Offset);
   }
 
-  return StackOffset::getFixed(Offset + FPDelta);
+  // FrameReg is either the stack pointer or a base pointer. But the base is
+  // located at the end of the statically known StackSize so the distinction
+  // doesn't really matter.
+  if (TRI->hasStackRealignment(MF) || TRI->hasBasePointer(MF))
+    assert(isAligned(MFI.getObjectAlign(FI), -(Offset + StackSize)));
+  return StackOffset::getFixed(Offset + StackSize);
 }
 
 int X86FrameLowering::getWin64EHFrameIndexRef(const MachineFunction &MF, int FI,
@@ -2540,8 +2714,8 @@ bool X86FrameLowering::assignCalleeSavedSpillSlots(
   }
 
   // Assign slots for GPRs. It increases frame size.
-  for (unsigned i = CSI.size(); i != 0; --i) {
-    unsigned Reg = CSI[i - 1].getReg();
+  for (CalleeSavedInfo &I : llvm::reverse(CSI)) {
+    Register Reg = I.getReg();
 
     if (!X86::GR64RegClass.contains(Reg) && !X86::GR32RegClass.contains(Reg))
       continue;
@@ -2550,15 +2724,15 @@ bool X86FrameLowering::assignCalleeSavedSpillSlots(
     CalleeSavedFrameSize += SlotSize;
 
     int SlotIndex = MFI.CreateFixedSpillStackObject(SlotSize, SpillSlotOffset);
-    CSI[i - 1].setFrameIdx(SlotIndex);
+    I.setFrameIdx(SlotIndex);
   }
 
   X86FI->setCalleeSavedFrameSize(CalleeSavedFrameSize);
   MFI.setCVBytesOfCalleeSavedRegisters(CalleeSavedFrameSize);
 
   // Assign slots for XMMs.
-  for (unsigned i = CSI.size(); i != 0; --i) {
-    unsigned Reg = CSI[i - 1].getReg();
+  for (CalleeSavedInfo &I : llvm::reverse(CSI)) {
+    Register Reg = I.getReg();
     if (X86::GR64RegClass.contains(Reg) || X86::GR32RegClass.contains(Reg))
       continue;
 
@@ -2577,7 +2751,7 @@ bool X86FrameLowering::assignCalleeSavedSpillSlots(
     // spill into slot
     SpillSlotOffset -= Size;
     int SlotIndex = MFI.CreateFixedSpillStackObject(Size, SpillSlotOffset);
-    CSI[i - 1].setFrameIdx(SlotIndex);
+    I.setFrameIdx(SlotIndex);
     MFI.ensureMaxAlignment(Alignment);
 
     // Save the start offset and size of XMM in stack frame for funclets.
@@ -2603,8 +2777,8 @@ bool X86FrameLowering::spillCalleeSavedRegisters(
   // Push GPRs. It increases frame size.
   const MachineFunction &MF = *MBB.getParent();
   unsigned Opc = STI.is64Bit() ? X86::PUSH64r : X86::PUSH32r;
-  for (unsigned i = CSI.size(); i != 0; --i) {
-    unsigned Reg = CSI[i - 1].getReg();
+  for (const CalleeSavedInfo &I : llvm::reverse(CSI)) {
+    Register Reg = I.getReg();
 
     if (!X86::GR64RegClass.contains(Reg) && !X86::GR32RegClass.contains(Reg))
       continue;
@@ -2637,8 +2811,8 @@ bool X86FrameLowering::spillCalleeSavedRegisters(
 
   // Make XMM regs spilled. X86 does not have ability of push/pop XMM.
   // It can be done by spilling XMMs to stack frame.
-  for (unsigned i = CSI.size(); i != 0; --i) {
-    unsigned Reg = CSI[i-1].getReg();
+  for (const CalleeSavedInfo &I : llvm::reverse(CSI)) {
+    Register Reg = I.getReg();
     if (X86::GR64RegClass.contains(Reg) || X86::GR32RegClass.contains(Reg))
       continue;
 
@@ -2651,8 +2825,8 @@ bool X86FrameLowering::spillCalleeSavedRegisters(
     MBB.addLiveIn(Reg);
     const TargetRegisterClass *RC = TRI->getMinimalPhysRegClass(Reg, VT);
 
-    TII.storeRegToStackSlot(MBB, MI, Reg, true, CSI[i - 1].getFrameIdx(), RC,
-                            TRI);
+    TII.storeRegToStackSlot(MBB, MI, Reg, true, I.getFrameIdx(), RC, TRI,
+                            Register());
     --MI;
     MI->setFlag(MachineInstr::FrameSetup);
     ++MI;
@@ -2688,7 +2862,7 @@ void X86FrameLowering::emitCatchRetReturnValue(MachineBasicBlock &MBB,
 
   // Record that we've taken the address of CatchRetTarget and no longer just
   // reference it in a terminator.
-  CatchRetTarget->setHasAddressTaken();
+  CatchRetTarget->setMachineBlockAddressTaken();
 }
 
 bool X86FrameLowering::restoreCalleeSavedRegisters(
@@ -2716,8 +2890,8 @@ bool X86FrameLowering::restoreCalleeSavedRegisters(
   DebugLoc DL = MBB.findDebugLoc(MI);
 
   // Reload XMMs from stack frame.
-  for (unsigned i = 0, e = CSI.size(); i != e; ++i) {
-    unsigned Reg = CSI[i].getReg();
+  for (const CalleeSavedInfo &I : CSI) {
+    Register Reg = I.getReg();
     if (X86::GR64RegClass.contains(Reg) ||
         X86::GR32RegClass.contains(Reg))
       continue;
@@ -2728,13 +2902,14 @@ bool X86FrameLowering::restoreCalleeSavedRegisters(
       VT = STI.hasBWI() ? MVT::v64i1 : MVT::v16i1;
 
     const TargetRegisterClass *RC = TRI->getMinimalPhysRegClass(Reg, VT);
-    TII.loadRegFromStackSlot(MBB, MI, Reg, CSI[i].getFrameIdx(), RC, TRI);
+    TII.loadRegFromStackSlot(MBB, MI, Reg, I.getFrameIdx(), RC, TRI,
+                             Register());
   }
 
   // POP GPRs.
   unsigned Opc = STI.is64Bit() ? X86::POP64r : X86::POP32r;
-  for (unsigned i = 0, e = CSI.size(); i != e; ++i) {
-    unsigned Reg = CSI[i].getReg();
+  for (const CalleeSavedInfo &I : CSI) {
+    Register Reg = I.getReg();
     if (!X86::GR64RegClass.contains(Reg) &&
         !X86::GR32RegClass.contains(Reg))
       continue;
@@ -2839,17 +3014,8 @@ void X86FrameLowering::adjustForSegmentedStacks(
   // prologue.
   StackSize = MFI.getStackSize();
 
-  // Do not generate a prologue for leaf functions with a stack of size zero.
-  // For non-leaf functions we have to allow for the possibility that the
-  // callis to a non-split function, as in PR37807. This function could also
-  // take the address of a non-split function. When the linker tries to adjust
-  // its non-existent prologue, it would fail with an error. Mark the object
-  // file so that such failures are not errors. See this Go language bug-report
-  // https://go-review.googlesource.com/c/go/+/148819/
-  if (StackSize == 0 && !MFI.hasTailCall()) {
-    MF.getMMI().setHasNosplitStack(true);
+  if (!MFI.needsSplitStackProlog())
     return;
-  }
 
   MachineBasicBlock *allocMBB = MF.CreateMachineBasicBlock();
   MachineBasicBlock *checkMBB = MF.CreateMachineBasicBlock();
@@ -2989,15 +3155,16 @@ void X86FrameLowering::adjustForSegmentedStacks(
     const unsigned Reg10 = IsLP64 ? X86::R10 : X86::R10D;
     const unsigned Reg11 = IsLP64 ? X86::R11 : X86::R11D;
     const unsigned MOVrr = IsLP64 ? X86::MOV64rr : X86::MOV32rr;
-    const unsigned MOVri = IsLP64 ? X86::MOV64ri : X86::MOV32ri;
 
     if (IsNested)
       BuildMI(allocMBB, DL, TII.get(MOVrr), RegAX).addReg(Reg10);
 
-    BuildMI(allocMBB, DL, TII.get(MOVri), Reg10)
-      .addImm(StackSize);
-    BuildMI(allocMBB, DL, TII.get(MOVri), Reg11)
-      .addImm(X86FI->getArgumentStackSize());
+    BuildMI(allocMBB, DL, TII.get(getMOVriOpcode(IsLP64, StackSize)), Reg10)
+        .addImm(StackSize);
+    BuildMI(allocMBB, DL,
+            TII.get(getMOVriOpcode(IsLP64, X86FI->getArgumentStackSize())),
+            Reg11)
+        .addImm(X86FI->getArgumentStackSize());
   } else {
     BuildMI(allocMBB, DL, TII.get(X86::PUSHi32))
       .addImm(X86FI->getArgumentStackSize());
@@ -3031,7 +3198,6 @@ void X86FrameLowering::adjustForSegmentedStacks(
         .addReg(0)
         .addExternalSymbol("__morestack_addr")
         .addReg(0);
-    MF.getMMI().setUsesMorestackAddr(true);
   } else {
     if (Is64Bit)
       BuildMI(allocMBB, DL, TII.get(X86::CALL64pcrel32))
@@ -3163,8 +3329,7 @@ void X86FrameLowering::adjustForHiPEPrologue(
         // having a ".", such as a simple <Module>.<Function>.<Arity>, or an
         // "_", such as the BIF "suspend_0") as they are executed on another
         // stack.
-        if (F->getName().find("erlang.") != StringRef::npos ||
-            F->getName().find("bif_") != StringRef::npos ||
+        if (F->getName().contains("erlang.") || F->getName().contains("bif_") ||
             F->getName().find_first_of("._") == StringRef::npos)
           continue;
 
@@ -3430,6 +3595,13 @@ bool X86FrameLowering::canUseAsPrologue(const MachineBasicBlock &MBB) const {
   if (!MBB.isLiveIn(X86::EFLAGS))
     return true;
 
+  // If stack probes have to loop inline or call, that will clobber EFLAGS.
+  // FIXME: we could allow cases that will use emitStackProbeInlineGenericBlock.
+  const X86Subtarget &STI = MF.getSubtarget<X86Subtarget>();
+  const X86TargetLowering &TLI = *STI.getTargetLowering();
+  if (TLI.hasInlineStackProbe(MF) || TLI.hasStackProbeSymbol(MF))
+    return false;
+
   const X86MachineFunctionInfo *X86FI = MF.getInfo<X86MachineFunctionInfo>();
   return !TRI->hasStackRealignment(MF) && !X86FI->hasSwiftAsyncContext();
 }
diff --git a/gnu/llvm/llvm/lib/Target/X86/X86FrameLowering.h b/gnu/llvm/llvm/lib/Target/X86/X86FrameLowering.h
index 8730618160e..b74d6562625 100644
--- a/gnu/llvm/llvm/lib/Target/X86/X86FrameLowering.h
+++ b/gnu/llvm/llvm/lib/Target/X86/X86FrameLowering.h
@@ -14,6 +14,7 @@
 #define LLVM_LIB_TARGET_X86_X86FRAMELOWERING_H
 
 #include "X86ReturnProtectorLowering.h"
+#include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/TargetFrameLowering.h"
 #include "llvm/Support/TypeSize.h"
 
@@ -56,17 +57,22 @@ public:
   /// Emit target stack probe code. This is required for all
   /// large stack allocations on Windows. The caller is required to materialize
   /// the number of bytes to probe in RAX/EAX.
+  /// \p InstrNum optionally contains a debug-info instruction number for the
+  ///    new stack pointer.
   void emitStackProbe(MachineFunction &MF, MachineBasicBlock &MBB,
                       MachineBasicBlock::iterator MBBI, const DebugLoc &DL,
-                      bool InProlog) const;
+                      bool InProlog,
+                      std::optional<MachineFunction::DebugInstrOperandPair>
+                          InstrNum = std::nullopt) const;
+
+  bool stackProbeFunctionModifiesSP() const override;
 
   /// Replace a StackProbe inline-stub with the actual probe code inline.
   void inlineStackProbe(MachineFunction &MF,
                         MachineBasicBlock &PrologMBB) const override;
 
-  void
-  emitCalleeSavedFrameMoves(MachineBasicBlock &MBB,
-                            MachineBasicBlock::iterator MBBI) const override;
+  void emitCalleeSavedFrameMovesFullCFA(
+      MachineBasicBlock &MBB, MachineBasicBlock::iterator MBBI) const override;
 
   void emitCalleeSavedFrameMoves(MachineBasicBlock &MBB,
                                  MachineBasicBlock::iterator MBBI,
@@ -178,7 +184,8 @@ public:
 
   /// Wraps up getting a CFI index and building a MachineInstr for it.
   void BuildCFI(MachineBasicBlock &MBB, MachineBasicBlock::iterator MBBI,
-                const DebugLoc &DL, const MCCFIInstruction &CFIInst) const;
+                const DebugLoc &DL, const MCCFIInstruction &CFIInst,
+                MachineInstr::MIFlag Flag = MachineInstr::NoFlags) const;
 
   /// Sets up EBP and optionally ESI based on the incoming EBP value.  Only
   /// needed for 32-bit. Used in funclet prologues and at catchret destinations.
@@ -205,9 +212,10 @@ private:
   uint64_t calculateMaxStackAlign(const MachineFunction &MF) const;
 
   /// Emit target stack probe as a call to a helper function
-  void emitStackProbeCall(MachineFunction &MF, MachineBasicBlock &MBB,
-                          MachineBasicBlock::iterator MBBI, const DebugLoc &DL,
-                          bool InProlog) const;
+  void emitStackProbeCall(
+      MachineFunction &MF, MachineBasicBlock &MBB,
+      MachineBasicBlock::iterator MBBI, const DebugLoc &DL, bool InProlog,
+      std::optional<MachineFunction::DebugInstrOperandPair> InstrNum) const;
 
   /// Emit target stack probe as an inline sequence.
   void emitStackProbeInline(MachineFunction &MF, MachineBasicBlock &MBB,
@@ -234,6 +242,10 @@ private:
                                        const DebugLoc &DL, uint64_t Offset,
                                        uint64_t Align) const;
 
+  /// Emit target zero call-used regs.
+  void emitZeroCallUsedRegs(BitVector RegsToZero,
+                            MachineBasicBlock &MBB) const override;
+
   void adjustFrameForMsvcCxxEh(MachineFunction &MF) const;
 
   /// Aligns the stack pointer by ANDing it with -MaxAlign.
diff --git a/gnu/llvm/llvm/lib/Target/X86/X86IndirectThunks.cpp b/gnu/llvm/llvm/lib/Target/X86/X86IndirectThunks.cpp
index 20cbc85c365..a6f3f45db72 100644
--- a/gnu/llvm/llvm/lib/Target/X86/X86IndirectThunks.cpp
+++ b/gnu/llvm/llvm/lib/Target/X86/X86IndirectThunks.cpp
@@ -31,6 +31,7 @@
 #include "X86Subtarget.h"
 #include "llvm/CodeGen/IndirectThunks.h"
 #include "llvm/CodeGen/MachineFunction.h"
+#include "llvm/CodeGen/MachineFunctionPass.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
 #include "llvm/CodeGen/MachineModuleInfo.h"
 #include "llvm/CodeGen/Passes.h"
@@ -60,23 +61,28 @@ static const char R11LVIThunkName[] = "__llvm_lvi_thunk_r11";
 namespace {
 struct RetpolineThunkInserter : ThunkInserter<RetpolineThunkInserter> {
   const char *getThunkPrefix() { return RetpolineNamePrefix; }
-  bool mayUseThunk(const MachineFunction &MF) {
+  bool mayUseThunk(const MachineFunction &MF, bool InsertedThunks) {
+    if (InsertedThunks)
+      return false;
     const auto &STI = MF.getSubtarget<X86Subtarget>();
     return (STI.useRetpolineIndirectCalls() ||
             STI.useRetpolineIndirectBranches()) &&
            !STI.useRetpolineExternalThunk();
   }
-  void insertThunks(MachineModuleInfo &MMI);
+  bool insertThunks(MachineModuleInfo &MMI, MachineFunction &MF);
   void populateThunk(MachineFunction &MF);
 };
 
 struct LVIThunkInserter : ThunkInserter<LVIThunkInserter> {
   const char *getThunkPrefix() { return LVIThunkNamePrefix; }
-  bool mayUseThunk(const MachineFunction &MF) {
+  bool mayUseThunk(const MachineFunction &MF, bool InsertedThunks) {
+    if (InsertedThunks)
+      return false;
     return MF.getSubtarget<X86Subtarget>().useLVIControlFlowIntegrity();
   }
-  void insertThunks(MachineModuleInfo &MMI) {
+  bool insertThunks(MachineModuleInfo &MMI, MachineFunction &MF) {
     createThunkFunction(MMI, R11LVIThunkName);
+    return true;
   }
   void populateThunk(MachineFunction &MF) {
     assert (MF.size() == 1);
@@ -131,13 +137,15 @@ private:
 
 } // end anonymous namespace
 
-void RetpolineThunkInserter::insertThunks(MachineModuleInfo &MMI) {
+bool RetpolineThunkInserter::insertThunks(MachineModuleInfo &MMI,
+                                          MachineFunction &MF) {
   if (MMI.getTarget().getTargetTriple().getArch() == Triple::x86_64)
     createThunkFunction(MMI, R11RetpolineName);
   else
     for (StringRef Name : {EAXRetpolineName, ECXRetpolineName, EDXRetpolineName,
                            EDIRetpolineName})
       createThunkFunction(MMI, Name);
+  return true;
 }
 
 void RetpolineThunkInserter::populateThunk(MachineFunction &MF) {
@@ -212,7 +220,7 @@ void RetpolineThunkInserter::populateThunk(MachineFunction &MF) {
   MF.push_back(CallTarget);
 
   const unsigned CallOpc = Is64Bit ? X86::CALL64pcrel32 : X86::CALLpcrel32;
-  const unsigned RetOpc = Is64Bit ? X86::RETQ : X86::RETL;
+  const unsigned RetOpc = Is64Bit ? X86::RET64 : X86::RET32;
 
   Entry->addLiveIn(ThunkReg);
   BuildMI(Entry, DebugLoc(), TII->get(CallOpc)).addSym(TargetSym);
@@ -233,11 +241,11 @@ void RetpolineThunkInserter::populateThunk(MachineFunction &MF) {
   BuildMI(CaptureSpec, DebugLoc(), TII->get(X86::PAUSE));
   BuildMI(CaptureSpec, DebugLoc(), TII->get(X86::LFENCE));
   BuildMI(CaptureSpec, DebugLoc(), TII->get(X86::JMP_1)).addMBB(CaptureSpec);
-  CaptureSpec->setHasAddressTaken();
+  CaptureSpec->setMachineBlockAddressTaken();
   CaptureSpec->addSuccessor(CaptureSpec);
 
   CallTarget->addLiveIn(ThunkReg);
-  CallTarget->setHasAddressTaken();
+  CallTarget->setMachineBlockAddressTaken();
   CallTarget->setAlignment(Align(16));
 
   // Insert return address clobber
diff --git a/gnu/llvm/llvm/lib/Target/X86/X86InstrCompiler.td b/gnu/llvm/llvm/lib/Target/X86/X86InstrCompiler.td
index 2dc6ffa45d6..bab512cd86a 100644
--- a/gnu/llvm/llvm/lib/Target/X86/X86InstrCompiler.td
+++ b/gnu/llvm/llvm/lib/Target/X86/X86InstrCompiler.td
@@ -69,16 +69,12 @@ def : Pat<(X86callseq_start timm:$amt1, timm:$amt2),
 let SchedRW = [WriteSystem] in {
 
 // x86-64 va_start lowering magic.
-let hasSideEffects = 1, Defs = [EFLAGS] in {
+let hasSideEffects = 1, mayStore = 1, Defs = [EFLAGS] in {
 def VASTART_SAVE_XMM_REGS : I<0, Pseudo,
                               (outs),
-                              (ins GR8:$al,
-                                   i32imm:$regsavefi, i32imm:$offset,
-                                   variable_ops),
-                              "#VASTART_SAVE_XMM_REGS $al, $regsavefi, $offset",
-                              [(X86vastart_save_xmm_regs GR8:$al,
-                                                         timm:$regsavefi,
-                                                         timm:$offset),
+                              (ins GR8:$al, i8mem:$regsavefi, variable_ops),
+                              "#VASTART_SAVE_XMM_REGS $al, $regsavefi",
+                              [(X86vastart_save_xmm_regs GR8:$al, addr:$regsavefi),
                                (implicit EFLAGS)]>;
 }
 
@@ -153,15 +149,15 @@ def STACKALLOC_W_PROBING : I<0, Pseudo, (outs), (ins i64imm:$stacksize),
 // (compared to ordinary calls) like stack pointer change.
 
 let Defs = [EAX, ESP, EFLAGS], Uses = [ESP] in
-def WIN_ALLOCA_32 : I<0, Pseudo, (outs), (ins GR32:$size),
+def DYN_ALLOCA_32 : I<0, Pseudo, (outs), (ins GR32:$size),
                      "# dynamic stack allocation",
-                     [(X86WinAlloca GR32:$size)]>,
+                     [(X86DynAlloca GR32:$size)]>,
                      Requires<[NotLP64]>;
 
 let Defs = [RAX, RSP, EFLAGS], Uses = [RSP] in
-def WIN_ALLOCA_64 : I<0, Pseudo, (outs), (ins GR64:$size),
+def DYN_ALLOCA_64 : I<0, Pseudo, (outs), (ins GR64:$size),
                      "# dynamic stack allocation",
-                     [(X86WinAlloca GR64:$size)]>,
+                     [(X86DynAlloca GR64:$size)]>,
                      Requires<[In64BitMode]>;
 } // SchedRW
 
@@ -260,6 +256,26 @@ let isPseudo = 1, SchedRW = [WriteSystem] in {
                             "#SEH_Epilogue", []>;
 }
 
+//===----------------------------------------------------------------------===//
+// Pseudo instructions used by KCFI.
+//===----------------------------------------------------------------------===//
+let
+  Defs = [R10, R11, EFLAGS] in {
+def KCFI_CHECK : PseudoI<
+  (outs), (ins GR64:$ptr, i32imm:$type), []>, Sched<[]>;
+}
+
+//===----------------------------------------------------------------------===//
+// Pseudo instructions used by address sanitizer.
+//===----------------------------------------------------------------------===//
+let
+  Defs = [R10, R11, EFLAGS] in {
+def ASAN_CHECK_MEMACCESS : PseudoI<
+  (outs), (ins GR64PLTSafe:$addr, i32imm:$accessinfo),
+  [(int_asan_check_memaccess GR64PLTSafe:$addr, (i32 timm:$accessinfo))]>,
+  Sched<[]>;
+}
+
 //===----------------------------------------------------------------------===//
 // Pseudo instructions used by segmented stacks.
 //
@@ -556,10 +572,10 @@ let usesCustomInserter = 1, hasNoSchedulingInfo = 1, Uses = [EFLAGS] in {
   // i8 register pressure.
   defm _GR8 : CMOVrr_PSEUDO<GR8, i8>;
 
-  let Predicates = [NoCMov] in {
+  let Predicates = [NoCMOV] in {
     defm _GR32 : CMOVrr_PSEUDO<GR32, i32>;
     defm _GR16 : CMOVrr_PSEUDO<GR16, i16>;
-  } // Predicates = [NoCMov]
+  } // Predicates = [NoCMOV]
 
   // fcmov doesn't handle all possible EFLAGS, provide a fallback if there is no
   // SSE1/SSE2.
@@ -576,9 +592,12 @@ let usesCustomInserter = 1, hasNoSchedulingInfo = 1, Uses = [EFLAGS] in {
 
   let Predicates = [HasSSE1,NoAVX512] in
     defm _FR32   : CMOVrr_PSEUDO<FR32, f32>;
-  let Predicates = [HasSSE2,NoAVX512] in
+  let Predicates = [HasSSE2,NoAVX512] in {
+    defm _FR16   : CMOVrr_PSEUDO<FR16, f16>;
     defm _FR64   : CMOVrr_PSEUDO<FR64, f64>;
+  }
   let Predicates = [HasAVX512] in {
+    defm _FR16X  : CMOVrr_PSEUDO<FR16X, f16>;
     defm _FR32X  : CMOVrr_PSEUDO<FR32X, f32>;
     defm _FR64X  : CMOVrr_PSEUDO<FR64X, f64>;
   }
@@ -631,6 +650,8 @@ let Predicates = [HasVLX] in {
             (CMOV_VR128X VR128X:$t, VR128X:$f, timm:$cond)>;
   def : Pat<(v8i16 (X86cmov VR128X:$t, VR128X:$f, timm:$cond, EFLAGS)),
             (CMOV_VR128X VR128X:$t, VR128X:$f, timm:$cond)>;
+  def : Pat<(v8f16 (X86cmov VR128X:$t, VR128X:$f, timm:$cond, EFLAGS)),
+            (CMOV_VR128X VR128X:$t, VR128X:$f, timm:$cond)>;
   def : Pat<(v4i32 (X86cmov VR128X:$t, VR128X:$f, timm:$cond, EFLAGS)),
             (CMOV_VR128X VR128X:$t, VR128X:$f, timm:$cond)>;
   def : Pat<(v4f32 (X86cmov VR128X:$t, VR128X:$f, timm:$cond, EFLAGS)),
@@ -642,6 +663,8 @@ let Predicates = [HasVLX] in {
             (CMOV_VR256X VR256X:$t, VR256X:$f, timm:$cond)>;
   def : Pat<(v16i16 (X86cmov VR256X:$t, VR256X:$f, timm:$cond, EFLAGS)),
             (CMOV_VR256X VR256X:$t, VR256X:$f, timm:$cond)>;
+  def : Pat<(v16f16 (X86cmov VR256X:$t, VR256X:$f, timm:$cond, EFLAGS)),
+            (CMOV_VR256X VR256X:$t, VR256X:$f, timm:$cond)>;
   def : Pat<(v8i32 (X86cmov VR256X:$t, VR256X:$f, timm:$cond, EFLAGS)),
             (CMOV_VR256X VR256X:$t, VR256X:$f, timm:$cond)>;
   def : Pat<(v8f32 (X86cmov VR256X:$t, VR256X:$f, timm:$cond, EFLAGS)),
@@ -654,6 +677,8 @@ def : Pat<(v64i8 (X86cmov VR512:$t, VR512:$f, timm:$cond, EFLAGS)),
           (CMOV_VR512 VR512:$t, VR512:$f, timm:$cond)>;
 def : Pat<(v32i16 (X86cmov VR512:$t, VR512:$f, timm:$cond, EFLAGS)),
           (CMOV_VR512 VR512:$t, VR512:$f, timm:$cond)>;
+def : Pat<(v32f16 (X86cmov VR512:$t, VR512:$f, timm:$cond, EFLAGS)),
+          (CMOV_VR512 VR512:$t, VR512:$f, timm:$cond)>;
 def : Pat<(v16i32 (X86cmov VR512:$t, VR512:$f, timm:$cond, EFLAGS)),
           (CMOV_VR512 VR512:$t, VR512:$f, timm:$cond)>;
 def : Pat<(v16f32 (X86cmov VR512:$t, VR512:$f, timm:$cond, EFLAGS)),
@@ -675,11 +700,6 @@ def OR32mi8Locked  : Ii8<0x83, MRM1m, (outs), (ins i32mem:$dst, i32i8imm:$zero),
                          Requires<[Not64BitMode]>, OpSize32, LOCK,
                          Sched<[WriteALURMW]>;
 
-let hasSideEffects = 1 in
-def Int_MemBarrier : I<0, Pseudo, (outs), (ins),
-                     "#MEMBARRIER",
-                     [(X86MemBarrier)]>, Sched<[WriteLoad]>;
-
 // RegOpc corresponds to the mr version of the instruction
 // ImmOpc corresponds to the mi version of the instruction
 // ImmOpc8 corresponds to the mi8 version of the instruction
@@ -795,9 +815,9 @@ def X86lock_sub_nocf : PatFrag<(ops node:$lhs, node:$rhs),
   return hasNoCarryFlagUses(SDValue(N, 0));
 }]>;
 
-let Predicates = [UseIncDec] in {
-  let Defs = [EFLAGS], mayLoad = 1, mayStore = 1, isCodeGenOnly = 1,
-      SchedRW = [WriteALURMW]  in {
+let Defs = [EFLAGS], mayLoad = 1, mayStore = 1, isCodeGenOnly = 1,
+    SchedRW = [WriteALURMW]  in {
+  let Predicates = [UseIncDec] in {
     def LOCK_INC8m  : I<0xFE, MRM0m, (outs), (ins i8mem :$dst),
                         "inc{b}\t$dst",
                         [(set EFLAGS, (X86lock_add_nocf addr:$dst, (i8 1)))]>,
@@ -810,10 +830,6 @@ let Predicates = [UseIncDec] in {
                         "inc{l}\t$dst",
                         [(set EFLAGS, (X86lock_add_nocf addr:$dst, (i32 1)))]>,
                         OpSize32, LOCK;
-    def LOCK_INC64m : RI<0xFF, MRM0m, (outs), (ins i64mem:$dst),
-                         "inc{q}\t$dst",
-                         [(set EFLAGS, (X86lock_add_nocf addr:$dst, (i64 1)))]>,
-                         LOCK;
 
     def LOCK_DEC8m  : I<0xFE, MRM1m, (outs), (ins i8mem :$dst),
                         "dec{b}\t$dst",
@@ -827,23 +843,102 @@ let Predicates = [UseIncDec] in {
                         "dec{l}\t$dst",
                         [(set EFLAGS, (X86lock_sub_nocf addr:$dst, (i32 1)))]>,
                         OpSize32, LOCK;
+  }
+
+  let Predicates = [UseIncDec, In64BitMode] in {
+    def LOCK_INC64m : RI<0xFF, MRM0m, (outs), (ins i64mem:$dst),
+                         "inc{q}\t$dst",
+                         [(set EFLAGS, (X86lock_add_nocf addr:$dst, (i64 1)))]>,
+                         LOCK;
     def LOCK_DEC64m : RI<0xFF, MRM1m, (outs), (ins i64mem:$dst),
                          "dec{q}\t$dst",
                          [(set EFLAGS, (X86lock_sub_nocf addr:$dst, (i64 1)))]>,
                          LOCK;
   }
+}
 
+let Predicates = [UseIncDec] in {
   // Additional patterns for -1 constant.
   def : Pat<(X86lock_add addr:$dst, (i8  -1)), (LOCK_DEC8m  addr:$dst)>;
   def : Pat<(X86lock_add addr:$dst, (i16 -1)), (LOCK_DEC16m addr:$dst)>;
   def : Pat<(X86lock_add addr:$dst, (i32 -1)), (LOCK_DEC32m addr:$dst)>;
-  def : Pat<(X86lock_add addr:$dst, (i64 -1)), (LOCK_DEC64m addr:$dst)>;
   def : Pat<(X86lock_sub addr:$dst, (i8  -1)), (LOCK_INC8m  addr:$dst)>;
   def : Pat<(X86lock_sub addr:$dst, (i16 -1)), (LOCK_INC16m addr:$dst)>;
   def : Pat<(X86lock_sub addr:$dst, (i32 -1)), (LOCK_INC32m addr:$dst)>;
+}
+
+let Predicates = [UseIncDec, In64BitMode] in {
+  // Additional patterns for -1 constant.
+  def : Pat<(X86lock_add addr:$dst, (i64 -1)), (LOCK_DEC64m addr:$dst)>;
   def : Pat<(X86lock_sub addr:$dst, (i64 -1)), (LOCK_INC64m addr:$dst)>;
 }
 
+// Atomic bit test.
+def X86LBTest : SDTypeProfile<1, 3, [SDTCisVT<0, i32>, SDTCisPtrTy<1>,
+                                     SDTCisVT<2, i8>, SDTCisVT<3, i32>]>;
+def x86bts : SDNode<"X86ISD::LBTS", X86LBTest,
+                    [SDNPHasChain, SDNPMayLoad, SDNPMayStore, SDNPMemOperand]>;
+def x86btc : SDNode<"X86ISD::LBTC", X86LBTest,
+                    [SDNPHasChain, SDNPMayLoad, SDNPMayStore, SDNPMemOperand]>;
+def x86btr : SDNode<"X86ISD::LBTR", X86LBTest,
+                    [SDNPHasChain, SDNPMayLoad, SDNPMayStore, SDNPMemOperand]>;
+
+def X86LBTestRM : SDTypeProfile<1, 2, [SDTCisVT<0, i32>, SDTCisPtrTy<1>,
+                                       SDTCisInt<2>]>;
+
+def x86_rm_bts : SDNode<"X86ISD::LBTS_RM", X86LBTestRM,
+                        [SDNPHasChain, SDNPMayLoad, SDNPMayStore, SDNPMemOperand]>;
+def x86_rm_btc : SDNode<"X86ISD::LBTC_RM", X86LBTestRM,
+                        [SDNPHasChain, SDNPMayLoad, SDNPMayStore, SDNPMemOperand]>;
+def x86_rm_btr : SDNode<"X86ISD::LBTR_RM", X86LBTestRM,
+                        [SDNPHasChain, SDNPMayLoad, SDNPMayStore, SDNPMemOperand]>;
+
+
+multiclass ATOMIC_LOGIC_OP<Format Form, string s> {
+  let Defs = [EFLAGS], mayLoad = 1, mayStore = 1, isCodeGenOnly = 1,
+      SchedRW = [WriteBitTestSetRegRMW]  in {
+    def 16m : Ii8<0xBA, Form, (outs), (ins i16mem:$src1, i8imm:$src2),
+                  !strconcat(s, "{w}\t{$src2, $src1|$src1, $src2}"),
+                  [(set EFLAGS, (!cast<SDNode>("x86" # s) addr:$src1, timm:$src2, (i32 16)))]>,
+              OpSize16, TB, LOCK;
+    def 32m : Ii8<0xBA, Form, (outs), (ins i32mem:$src1, i8imm:$src2),
+                  !strconcat(s, "{l}\t{$src2, $src1|$src1, $src2}"),
+                  [(set EFLAGS, (!cast<SDNode>("x86" # s) addr:$src1, timm:$src2, (i32 32)))]>,
+              OpSize32, TB, LOCK;
+    def 64m : RIi8<0xBA, Form, (outs), (ins i64mem:$src1, i8imm:$src2),
+                   !strconcat(s, "{q}\t{$src2, $src1|$src1, $src2}"),
+                   [(set EFLAGS, (!cast<SDNode>("x86" # s) addr:$src1, timm:$src2, (i32 64)))]>,
+              TB, LOCK;
+  }
+}
+
+multiclass ATOMIC_LOGIC_OP_RM<bits<8> Opc8, string s> {
+  let Defs = [EFLAGS], mayLoad = 1, mayStore = 1, isCodeGenOnly = 1,
+      SchedRW = [WriteBitTestSetRegRMW]  in {
+    def 16rm : I<Opc8, MRMDestMem, (outs), (ins i16mem:$src1, GR16:$src2),
+                  !strconcat(s, "{w}\t{$src2, $src1|$src1, $src2}"),
+                  [(set EFLAGS, (!cast<SDNode>("x86_rm_" # s) addr:$src1, GR16:$src2))]>,
+               OpSize16, TB, LOCK;
+    def 32rm : I<Opc8, MRMDestMem, (outs), (ins i32mem:$src1, GR32:$src2),
+                  !strconcat(s, "{l}\t{$src2, $src1|$src1, $src2}"),
+                  [(set EFLAGS, (!cast<SDNode>("x86_rm_" # s) addr:$src1, GR32:$src2))]>,
+               OpSize32, TB, LOCK;
+    def 64rm : RI<Opc8, MRMDestMem, (outs), (ins i64mem:$src1, GR64:$src2),
+                   !strconcat(s, "{q}\t{$src2, $src1|$src1, $src2}"),
+                   [(set EFLAGS, (!cast<SDNode>("x86_rm_" # s) addr:$src1, GR64:$src2))]>,
+               TB, LOCK;
+  }
+}
+
+
+defm LOCK_BTS : ATOMIC_LOGIC_OP<MRM5m, "bts">;
+defm LOCK_BTC : ATOMIC_LOGIC_OP<MRM7m, "btc">;
+defm LOCK_BTR : ATOMIC_LOGIC_OP<MRM6m, "btr">;
+
+defm LOCK_BTS_RM : ATOMIC_LOGIC_OP_RM<0xAB, "bts">;
+defm LOCK_BTC_RM : ATOMIC_LOGIC_OP_RM<0xBB, "btc">;
+defm LOCK_BTR_RM : ATOMIC_LOGIC_OP_RM<0xB3, "btr">;
+
 // Atomic compare and swap.
 multiclass LCMPXCHG_BinOp<bits<8> Opc8, bits<8> Opc, Format Form,
                           string mnemonic, SDPatternOperator frag> {
@@ -868,7 +963,7 @@ let isCodeGenOnly = 1, SchedRW = [WriteCMPXCHGRMW] in {
 }
 
 let Defs = [EAX, EDX, EFLAGS], Uses = [EAX, EBX, ECX, EDX],
-    Predicates = [HasCmpxchg8b], SchedRW = [WriteCMPXCHGRMW],
+    Predicates = [HasCX8], SchedRW = [WriteCMPXCHGRMW],
     isCodeGenOnly = 1, usesCustomInserter = 1 in {
 def LCMPXCHG8B : I<0xC7, MRM1m, (outs), (ins i64mem:$ptr),
                    "cmpxchg8b\t$ptr",
@@ -876,7 +971,7 @@ def LCMPXCHG8B : I<0xC7, MRM1m, (outs), (ins i64mem:$ptr),
 }
 
 let Defs = [RAX, RDX, EFLAGS], Uses = [RAX, RBX, RCX, RDX],
-    Predicates = [HasCmpxchg16b,In64BitMode], SchedRW = [WriteCMPXCHGRMW],
+    Predicates = [HasCX16,In64BitMode], SchedRW = [WriteCMPXCHGRMW],
     isCodeGenOnly = 1, mayLoad = 1, mayStore = 1, hasSideEffects = 0 in {
 def LCMPXCHG16B : RI<0xC7, MRM1m, (outs), (ins i128mem:$ptr),
                      "cmpxchg16b\t$ptr",
@@ -903,7 +998,7 @@ def LCMPXCHG16B : RI<0xC7, MRM1m, (outs), (ins i128mem:$ptr),
 // the instruction and we are sure we will have a valid register to restore
 // the value of RBX.
 let Defs = [RAX, RDX, RBX, EFLAGS], Uses = [RAX, RCX, RDX],
-    Predicates = [HasCmpxchg16b,In64BitMode], SchedRW = [WriteCMPXCHGRMW],
+    Predicates = [HasCX16,In64BitMode], SchedRW = [WriteCMPXCHGRMW],
     isCodeGenOnly = 1, isPseudo = 1,
     mayLoad = 1, mayStore = 1, hasSideEffects = 0,
     Constraints = "$rbx_save = $dst" in {
@@ -915,7 +1010,7 @@ def LCMPXCHG16B_SAVE_RBX :
 // Pseudo instruction that doesn't read/write RBX. Will be turned into either
 // LCMPXCHG16B_SAVE_RBX or LCMPXCHG16B via a custom inserter.
 let Defs = [RAX, RDX, EFLAGS], Uses = [RAX, RCX, RDX],
-    Predicates = [HasCmpxchg16b,In64BitMode], SchedRW = [WriteCMPXCHGRMW],
+    Predicates = [HasCX16,In64BitMode], SchedRW = [WriteCMPXCHGRMW],
     isCodeGenOnly = 1, isPseudo = 1,
     mayLoad = 1, mayStore = 1, hasSideEffects = 0,
     usesCustomInserter = 1 in {
@@ -972,7 +1067,7 @@ multiclass ATOMIC_RMW_BINOP<bits<8> opc8, bits<8> opc, string mnemonic,
                     !strconcat(mnemonic, "{l}\t{$val, $ptr|$ptr, $val}"),
                     [(set
                        GR32:$dst,
-                       (!cast<PatFrag>(frag # "_32") addr:$ptr, GR32:$val))]>, 
+                       (!cast<PatFrag>(frag # "_32") addr:$ptr, GR32:$val))]>,
                     OpSize32;
     def NAME#64 : RI<opc, MRMSrcMem, (outs GR64:$dst),
                      (ins GR64:$val, i64mem:$ptr),
@@ -1216,10 +1311,10 @@ def : Pat<(X86call (i64 tglobaladdr:$dst)),
 def : Pat<(X86call (i64 texternalsym:$dst)),
           (CALL64pcrel32 texternalsym:$dst)>;
 
-def : Pat<(X86call_rvmarker (timm:$sel), (i64 texternalsym:$dst)),
-          (CALL64pcrel32_RVMARKER timm:$sel, texternalsym:$dst)>;
-def : Pat<(X86call_rvmarker (timm:$sel), (i64 tglobaladdr:$dst)),
-          (CALL64pcrel32_RVMARKER timm:$sel, tglobaladdr:$dst)>;
+def : Pat<(X86call_rvmarker (i64 tglobaladdr:$rvfunc), (i64 texternalsym:$dst)),
+          (CALL64pcrel32_RVMARKER tglobaladdr:$rvfunc, texternalsym:$dst)>;
+def : Pat<(X86call_rvmarker (i64 tglobaladdr:$rvfunc), (i64 tglobaladdr:$dst)),
+          (CALL64pcrel32_RVMARKER tglobaladdr:$rvfunc, tglobaladdr:$dst)>;
 
 
 // Tailcall stuff. The TCRETURN instructions execute after the epilog, so they
@@ -1240,6 +1335,21 @@ def X86tcret_6regs : PatFrag<(ops node:$ptr, node:$off),
   return true;
 }]>;
 
+def X86tcret_1reg : PatFrag<(ops node:$ptr, node:$off),
+                             (X86tcret node:$ptr, node:$off), [{
+  // X86tcret args: (*chain, ptr, imm, regs..., glue)
+  unsigned NumRegs = 1;
+  const SDValue& BasePtr = cast<LoadSDNode>(N->getOperand(1))->getBasePtr();
+  if (isa<FrameIndexSDNode>(BasePtr))
+    NumRegs = 3;
+  else if (BasePtr->getNumOperands() && isa<GlobalAddressSDNode>(BasePtr->getOperand(0)))
+    NumRegs = 3;
+  for (unsigned i = 3, e = N->getNumOperands(); i != e; ++i)
+    if (isa<RegisterSDNode>(N->getOperand(i)) && ( NumRegs-- == 0))
+      return false;
+  return true;
+}]>;
+
 def : Pat<(X86tcret ptr_rc_tailcall:$dst, timm:$off),
           (TCRETURNri ptr_rc_tailcall:$dst, timm:$off)>,
           Requires<[Not64BitMode, NotUseIndirectThunkCalls]>;
@@ -1247,7 +1357,8 @@ def : Pat<(X86tcret ptr_rc_tailcall:$dst, timm:$off),
 // FIXME: This is disabled for 32-bit PIC mode because the global base
 // register which is part of the address mode may be assigned a
 // callee-saved register.
-def : Pat<(X86tcret (load addr:$dst), timm:$off),
+// Similar to X86tcret_6regs, here we only have 1 register left
+def : Pat<(X86tcret_1reg (load addr:$dst), timm:$off),
           (TCRETURNmi addr:$dst, timm:$off)>,
           Requires<[Not64BitMode, IsNotPIC, NotUseIndirectThunkCalls]>;
 
@@ -1472,41 +1583,18 @@ def ADD64ri32_DB : I<0, Pseudo,
 } // AddedComplexity, SchedRW
 
 //===----------------------------------------------------------------------===//
-// Pattern match SUB as XOR
+// Pattern match XOR as ADD
 //===----------------------------------------------------------------------===//
 
-// An immediate in the LHS of a subtract can't be encoded in the instruction.
-// If there is no possibility of a borrow we can use an XOR instead of a SUB
-// to enable the immediate to be folded.
-// TODO: Move this to a DAG combine?
-
-def sub_is_xor : PatFrag<(ops node:$lhs, node:$rhs), (sub node:$lhs, node:$rhs),[{
-  if (ConstantSDNode *CN = dyn_cast<ConstantSDNode>(N->getOperand(0))) {
-    KnownBits Known = CurDAG->computeKnownBits(N->getOperand(1));
-
-    // If all possible ones in the RHS are set in the LHS then there can't be
-    // a borrow and we can use xor.
-    return (~Known.Zero).isSubsetOf(CN->getAPIntValue());
-  }
-
-  return false;
-}]>;
-
+// Prefer to pattern match XOR with min_signed_value as ADD at isel time.
+// ADD can be 3-addressified into an LEA instruction to avoid copies.
 let AddedComplexity = 5 in {
-def : Pat<(sub_is_xor imm:$src2, GR8:$src1),
-          (XOR8ri GR8:$src1, imm:$src2)>;
-def : Pat<(sub_is_xor i16immSExt8:$src2, GR16:$src1),
-          (XOR16ri8 GR16:$src1, i16immSExt8:$src2)>;
-def : Pat<(sub_is_xor imm:$src2, GR16:$src1),
-          (XOR16ri GR16:$src1, imm:$src2)>;
-def : Pat<(sub_is_xor i32immSExt8:$src2, GR32:$src1),
-          (XOR32ri8 GR32:$src1, i32immSExt8:$src2)>;
-def : Pat<(sub_is_xor imm:$src2, GR32:$src1),
-          (XOR32ri GR32:$src1, imm:$src2)>;
-def : Pat<(sub_is_xor i64immSExt8:$src2, GR64:$src1),
-          (XOR64ri8 GR64:$src1, i64immSExt8:$src2)>;
-def : Pat<(sub_is_xor i64immSExt32:$src2, GR64:$src1),
-          (XOR64ri32 GR64:$src1, i64immSExt32:$src2)>;
+def : Pat<(xor GR8:$src1, -128),
+          (ADD8ri GR8:$src1, -128)>;
+def : Pat<(xor GR16:$src1, -32768),
+          (ADD16ri GR16:$src1, -32768)>;
+def : Pat<(xor GR32:$src1, -2147483648),
+          (ADD32ri GR32:$src1, -2147483648)>;
 }
 
 //===----------------------------------------------------------------------===//
diff --git a/gnu/llvm/llvm/lib/Target/X86/X86InstrMPX.td b/gnu/llvm/llvm/lib/Target/X86/X86InstrMPX.td
deleted file mode 100644
index 44ba071947c..00000000000
--- a/gnu/llvm/llvm/lib/Target/X86/X86InstrMPX.td
+++ /dev/null
@@ -1,77 +0,0 @@
-//===-- X86InstrMPX.td - MPX Instruction Set ---------*- tablegen -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file describes the X86 MPX instruction set, defining the
-// instructions, and properties of the instructions which are needed for code
-// generation, machine code emission, and analysis.
-//
-//===----------------------------------------------------------------------===//
-
-// FIXME: Investigate a better scheduler class if MPX is ever used inside LLVM.
-let SchedRW = [WriteSystem] in {
-
-multiclass mpx_bound_make<bits<8> opc, string OpcodeStr> {
-  def 32rm: I<opc, MRMSrcMem, (outs BNDR:$dst), (ins anymem:$src),
-              OpcodeStr#"\t{$src, $dst|$dst, $src}", []>,
-              Requires<[Not64BitMode]>;
-  def 64rm: I<opc, MRMSrcMem, (outs BNDR:$dst), (ins anymem:$src),
-              OpcodeStr#"\t{$src, $dst|$dst, $src}", []>,
-              Requires<[In64BitMode]>;
-}
-
-defm BNDMK : mpx_bound_make<0x1B, "bndmk">, XS;
-
-multiclass mpx_bound_check<bits<8> opc, string OpcodeStr> {
-  def 32rm: I<opc, MRMSrcMem, (outs), (ins  BNDR:$src1, anymem:$src2),
-              OpcodeStr#"\t{$src2, $src1|$src1, $src2}", []>,
-              Requires<[Not64BitMode]>;
-  def 64rm: I<opc, MRMSrcMem, (outs), (ins  BNDR:$src1, anymem:$src2),
-              OpcodeStr#"\t{$src2, $src1|$src1, $src2}", []>,
-              Requires<[In64BitMode]>;
-
-  def 32rr: I<opc, MRMSrcReg, (outs), (ins  BNDR:$src1, GR32:$src2),
-              OpcodeStr#"\t{$src2, $src1|$src1, $src2}", []>,
-              Requires<[Not64BitMode]>;
-  def 64rr: I<opc, MRMSrcReg, (outs), (ins  BNDR:$src1, GR64:$src2),
-              OpcodeStr#"\t{$src2, $src1|$src1, $src2}", []>,
-              Requires<[In64BitMode]>;
-}
-defm BNDCL : mpx_bound_check<0x1A, "bndcl">, XS, NotMemoryFoldable;
-defm BNDCU : mpx_bound_check<0x1A, "bndcu">, XD, NotMemoryFoldable;
-defm BNDCN : mpx_bound_check<0x1B, "bndcn">, XD, NotMemoryFoldable;
-
-def BNDMOVrr   : I<0x1A, MRMSrcReg, (outs BNDR:$dst), (ins BNDR:$src),
-                  "bndmov\t{$src, $dst|$dst, $src}", []>, PD,
-                  NotMemoryFoldable;
-let mayLoad = 1 in {
-def BNDMOV32rm : I<0x1A, MRMSrcMem, (outs BNDR:$dst), (ins i64mem:$src),
-                  "bndmov\t{$src, $dst|$dst, $src}", []>, PD,
-                  Requires<[Not64BitMode]>, NotMemoryFoldable;
-def BNDMOV64rm : I<0x1A, MRMSrcMem, (outs BNDR:$dst), (ins i128mem:$src),
-                  "bndmov\t{$src, $dst|$dst, $src}", []>, PD,
-                  Requires<[In64BitMode]>, NotMemoryFoldable;
-}
-let isCodeGenOnly = 1, ForceDisassemble = 1 in
-def BNDMOVrr_REV   : I<0x1B, MRMDestReg, (outs BNDR:$dst), (ins BNDR:$src),
-                       "bndmov\t{$src, $dst|$dst, $src}", []>, PD,
-                       NotMemoryFoldable;
-let mayStore = 1 in {
-def BNDMOV32mr : I<0x1B, MRMDestMem, (outs), (ins i64mem:$dst, BNDR:$src),
-                  "bndmov\t{$src, $dst|$dst, $src}", []>, PD,
-                  Requires<[Not64BitMode]>, NotMemoryFoldable;
-def BNDMOV64mr : I<0x1B, MRMDestMem, (outs), (ins i128mem:$dst, BNDR:$src),
-                  "bndmov\t{$src, $dst|$dst, $src}", []>, PD,
-                  Requires<[In64BitMode]>, NotMemoryFoldable;
-
-def BNDSTXmr:      I<0x1B, MRMDestMem, (outs), (ins anymem:$dst, BNDR:$src),
-                    "bndstx\t{$src, $dst|$dst, $src}", []>, PS;
-}
-let mayLoad = 1 in
-def BNDLDXrm:      I<0x1A, MRMSrcMem, (outs BNDR:$dst), (ins anymem:$src),
-                    "bndldx\t{$src, $dst|$dst, $src}", []>, PS;
-} // SchedRW
diff --git a/gnu/llvm/llvm/lib/Target/X86/X86MCInstLower.cpp b/gnu/llvm/llvm/lib/Target/X86/X86MCInstLower.cpp
index 7b0b9b5f1b9..cf09bddb7b5 100644
--- a/gnu/llvm/llvm/lib/Target/X86/X86MCInstLower.cpp
+++ b/gnu/llvm/llvm/lib/Target/X86/X86MCInstLower.cpp
@@ -20,7 +20,6 @@
 #include "X86RegisterInfo.h"
 #include "X86ShuffleDecodeConstantPool.h"
 #include "X86Subtarget.h"
-#include "llvm/ADT/Optional.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/iterator_range.h"
 #include "llvm/CodeGen/MachineConstantPool.h"
@@ -43,8 +42,12 @@
 #include "llvm/MC/MCStreamer.h"
 #include "llvm/MC/MCSymbol.h"
 #include "llvm/MC/MCSymbolELF.h"
+#include "llvm/MC/TargetRegistry.h"
 #include "llvm/Target/TargetLoweringObjectFile.h"
 #include "llvm/Target/TargetMachine.h"
+#include "llvm/Transforms/Instrumentation/AddressSanitizer.h"
+#include "llvm/Transforms/Instrumentation/AddressSanitizerCommon.h"
+#include <string>
 
 using namespace llvm;
 
@@ -61,8 +64,8 @@ class X86MCInstLower {
 public:
   X86MCInstLower(const MachineFunction &MF, X86AsmPrinter &asmprinter);
 
-  Optional<MCOperand> LowerMachineOperand(const MachineInstr *MI,
-                                          const MachineOperand &MO) const;
+  std::optional<MCOperand> LowerMachineOperand(const MachineInstr *MI,
+                                               const MachineOperand &MO) const;
   void Lower(const MachineInstr *MI, MCInst &OutMI) const;
 
   MCSymbol *GetSymbolFromOperand(const MachineOperand &MO) const;
@@ -274,6 +277,9 @@ MCOperand X86MCInstLower::LowerSymbolOperand(const MachineOperand &MO,
   case X86II::MO_GOTPCREL:
     RefKind = MCSymbolRefExpr::VK_GOTPCREL;
     break;
+  case X86II::MO_GOTPCREL_NORELAX:
+    RefKind = MCSymbolRefExpr::VK_GOTPCREL_NORELAX;
+    break;
   case X86II::MO_GOT:
     RefKind = MCSymbolRefExpr::VK_GOT;
     break;
@@ -418,10 +424,10 @@ static void SimplifyShortMoveForm(X86AsmPrinter &Printer, MCInst &Inst,
 }
 
 static unsigned getRetOpcode(const X86Subtarget &Subtarget) {
-  return Subtarget.is64Bit() ? X86::RETQ : X86::RETL;
+  return Subtarget.is64Bit() ? X86::RET64 : X86::RET32;
 }
 
-Optional<MCOperand>
+std::optional<MCOperand>
 X86MCInstLower::LowerMachineOperand(const MachineInstr *MI,
                                     const MachineOperand &MO) const {
   switch (MO.getType()) {
@@ -431,7 +437,7 @@ X86MCInstLower::LowerMachineOperand(const MachineInstr *MI,
   case MachineOperand::MO_Register:
     // Ignore all implicit register operands.
     if (MO.isImplicit())
-      return None;
+      return std::nullopt;
     return MCOperand::createReg(MO.getReg());
   case MachineOperand::MO_Immediate:
     return MCOperand::createImm(MO.getImm());
@@ -450,7 +456,7 @@ X86MCInstLower::LowerMachineOperand(const MachineInstr *MI,
         MO, AsmPrinter.GetBlockAddressSymbol(MO.getBlockAddress()));
   case MachineOperand::MO_RegisterMask:
     // Ignore call clobbers.
-    return None;
+    return std::nullopt;
   }
 }
 
@@ -494,7 +500,7 @@ void X86MCInstLower::Lower(const MachineInstr *MI, MCInst &OutMI) const {
 
   for (const MachineOperand &MO : MI->operands())
     if (auto MaybeMCOp = LowerMachineOperand(MI, MO))
-      OutMI.addOperand(MaybeMCOp.getValue());
+      OutMI.addOperand(*MaybeMCOp);
 
   // Handle a few special cases to eliminate operand modifiers.
   switch (OutMI.getOpcode()) {
@@ -955,6 +961,12 @@ void X86MCInstLower::Lower(const MachineInstr *MI, MCInst &OutMI) const {
     // These are not truly commutable so hide them from the default case.
     break;
 
+  case X86::MASKMOVDQU:
+  case X86::VMASKMOVDQU:
+    if (AsmPrinter.getSubtarget().is64Bit())
+      OutMI.setFlags(X86::IP_HAS_AD_SIZE);
+    break;
+
   default: {
     // If the instruction is a commutable arithmetic instruction we might be
     // able to commute the operands to get a 2 byte VEX prefix.
@@ -969,6 +981,15 @@ void X86MCInstLower::Lower(const MachineInstr *MI, MCInst &OutMI) const {
           X86II::isX86_64ExtendedReg(OutMI.getOperand(2).getReg()))
         std::swap(OutMI.getOperand(1), OutMI.getOperand(2));
     }
+    // Add an REP prefix to BSF instructions so that new processors can
+    // recognize as TZCNT, which has better performance than BSF.
+    if (X86::isBSF(OutMI.getOpcode()) && !MF.getFunction().hasOptSize()) {
+      // BSF and TZCNT have different interpretations on ZF bit. So make sure
+      // it won't be used later.
+      const MachineOperand *FlagDef = MI->findRegisterDefOperand(X86::EFLAGS);
+      if (FlagDef && FlagDef->isDead())
+        OutMI.setFlags(X86::IP_HAS_REPEAT);
+    }
     break;
   }
   }
@@ -1094,11 +1115,11 @@ static unsigned emitNop(MCStreamer &OS, unsigned NumBytes,
   if (Subtarget->is64Bit()) {
     // FIXME: We can use NOOPL on 32-bit targets with FeatureNOPL, but the
     // IndexReg/BaseReg below need to be updated.
-    if (Subtarget->hasFeature(X86::FeatureFast7ByteNOP))
+    if (Subtarget->hasFeature(X86::TuningFast7ByteNOP))
       MaxNopLength = 7;
-    else if (Subtarget->hasFeature(X86::FeatureFast15ByteNOP))
+    else if (Subtarget->hasFeature(X86::TuningFast15ByteNOP))
       MaxNopLength = 15;
-    else if (Subtarget->hasFeature(X86::FeatureFast11ByteNOP))
+    else if (Subtarget->hasFeature(X86::TuningFast11ByteNOP))
       MaxNopLength = 11;
     else
       MaxNopLength = 10;
@@ -1300,11 +1321,10 @@ void X86AsmPrinter::LowerFAULTING_OP(const MachineInstr &FaultingMI,
   if (DefRegister != X86::NoRegister)
     MI.addOperand(MCOperand::createReg(DefRegister));
 
-  for (auto I = FaultingMI.operands_begin() + OperandsBeginIdx,
-            E = FaultingMI.operands_end();
-       I != E; ++I)
-    if (auto MaybeOperand = MCIL.LowerMachineOperand(&FaultingMI, *I))
-      MI.addOperand(MaybeOperand.getValue());
+  for (const MachineOperand &MO :
+       llvm::drop_begin(FaultingMI.operands(), OperandsBeginIdx))
+    if (auto MaybeOperand = MCIL.LowerMachineOperand(&FaultingMI, MO))
+      MI.addOperand(*MaybeOperand);
 
   OutStreamer->AddComment("on-fault: " + HandlerLabel->getName());
   OutStreamer->emitInstruction(MI, getSubtargetInfo());
@@ -1323,6 +1343,88 @@ void X86AsmPrinter::LowerFENTRY_CALL(const MachineInstr &MI,
           .addExpr(Op));
 }
 
+void X86AsmPrinter::LowerKCFI_CHECK(const MachineInstr &MI) {
+  assert(std::next(MI.getIterator())->isCall() &&
+         "KCFI_CHECK not followed by a call instruction");
+
+  // Adjust the offset for patchable-function-prefix. X86InstrInfo::getNop()
+  // returns a 1-byte X86::NOOP, which means the offset is the same in
+  // bytes.  This assumes that patchable-function-prefix is the same for all
+  // functions.
+  const MachineFunction &MF = *MI.getMF();
+  int64_t PrefixNops = 0;
+  (void)MF.getFunction()
+      .getFnAttribute("patchable-function-prefix")
+      .getValueAsString()
+      .getAsInteger(10, PrefixNops);
+
+  // KCFI allows indirect calls to any location that's preceded by a valid
+  // type identifier. To avoid encoding the full constant into an instruction,
+  // and thus emitting potential call target gadgets at each indirect call
+  // site, load a negated constant to a register and compare that to the
+  // expected value at the call target.
+  const Register AddrReg = MI.getOperand(0).getReg();
+  const uint32_t Type = MI.getOperand(1).getImm();
+  // The check is immediately before the call. If the call target is in R10,
+  // we can clobber R11 for the check instead.
+  unsigned TempReg = AddrReg == X86::R10 ? X86::R11D : X86::R10D;
+  EmitAndCountInstruction(
+      MCInstBuilder(X86::MOV32ri).addReg(TempReg).addImm(-MaskKCFIType(Type)));
+  EmitAndCountInstruction(MCInstBuilder(X86::ADD32rm)
+                              .addReg(X86::NoRegister)
+                              .addReg(TempReg)
+                              .addReg(AddrReg)
+                              .addImm(1)
+                              .addReg(X86::NoRegister)
+                              .addImm(-(PrefixNops + 4))
+                              .addReg(X86::NoRegister));
+
+  MCSymbol *Pass = OutContext.createTempSymbol();
+  EmitAndCountInstruction(
+      MCInstBuilder(X86::JCC_1)
+          .addExpr(MCSymbolRefExpr::create(Pass, OutContext))
+          .addImm(X86::COND_E));
+
+  MCSymbol *Trap = OutContext.createTempSymbol();
+  OutStreamer->emitLabel(Trap);
+  EmitAndCountInstruction(MCInstBuilder(X86::TRAP));
+  emitKCFITrapEntry(MF, Trap);
+  OutStreamer->emitLabel(Pass);
+}
+
+void X86AsmPrinter::LowerASAN_CHECK_MEMACCESS(const MachineInstr &MI) {
+  // FIXME: Make this work on non-ELF.
+  if (!TM.getTargetTriple().isOSBinFormatELF()) {
+    report_fatal_error("llvm.asan.check.memaccess only supported on ELF");
+    return;
+  }
+
+  const auto &Reg = MI.getOperand(0).getReg();
+  ASanAccessInfo AccessInfo(MI.getOperand(1).getImm());
+
+  uint64_t ShadowBase;
+  int MappingScale;
+  bool OrShadowOffset;
+  getAddressSanitizerParams(Triple(TM.getTargetTriple()), 64,
+                            AccessInfo.CompileKernel, &ShadowBase,
+                            &MappingScale, &OrShadowOffset);
+
+  StringRef Name = AccessInfo.IsWrite ? "store" : "load";
+  StringRef Op = OrShadowOffset ? "or" : "add";
+  std::string SymName = ("__asan_check_" + Name + "_" + Op + "_" +
+                         Twine(1ULL << AccessInfo.AccessSizeIndex) + "_" +
+                         TM.getMCRegisterInfo()->getName(Reg.asMCReg()))
+                            .str();
+  if (OrShadowOffset)
+    report_fatal_error(
+        "OrShadowOffset is not supported with optimized callbacks");
+
+  EmitAndCountInstruction(
+      MCInstBuilder(X86::CALL64pcrel32)
+          .addExpr(MCSymbolRefExpr::create(
+              OutContext.getOrCreateSymbol(SymName), OutContext)));
+}
+
 void X86AsmPrinter::LowerPATCHABLE_OP(const MachineInstr &MI,
                                       X86MCInstLower &MCIL) {
   // PATCHABLE_OP minsize, opcode, operands
@@ -1331,23 +1433,28 @@ void X86AsmPrinter::LowerPATCHABLE_OP(const MachineInstr &MI,
 
   unsigned MinSize = MI.getOperand(0).getImm();
   unsigned Opcode = MI.getOperand(1).getImm();
+  // Opcode PATCHABLE_OP is a special case: there is no instruction to wrap,
+  // simply emit a nop of size MinSize.
+  bool EmptyInst = (Opcode == TargetOpcode::PATCHABLE_OP);
 
   MCInst MCI;
   MCI.setOpcode(Opcode);
   for (auto &MO : drop_begin(MI.operands(), 2))
     if (auto MaybeOperand = MCIL.LowerMachineOperand(&MI, MO))
-      MCI.addOperand(MaybeOperand.getValue());
+      MCI.addOperand(*MaybeOperand);
 
   SmallString<256> Code;
-  SmallVector<MCFixup, 4> Fixups;
-  raw_svector_ostream VecOS(Code);
-  CodeEmitter->encodeInstruction(MCI, VecOS, Fixups, getSubtargetInfo());
+  if (!EmptyInst) {
+    SmallVector<MCFixup, 4> Fixups;
+    raw_svector_ostream VecOS(Code);
+    CodeEmitter->encodeInstruction(MCI, VecOS, Fixups, getSubtargetInfo());
+  }
 
   if (Code.size() < MinSize) {
     if (MinSize == 2 && Subtarget->is32Bit() &&
         Subtarget->isTargetWindowsMSVC() &&
         (Subtarget->getCPU().empty() || Subtarget->getCPU() == "pentium3")) {
-      // For compatibilty reasons, when targetting MSVC, is is important to
+      // For compatibility reasons, when targetting MSVC, is is important to
       // generate a 'legacy' NOP in the form of a 8B FF MOV EDI, EDI. Some tools
       // rely specifically on this pattern to be able to patch a function.
       // This is only for 32-bit targets, when using /arch:IA32 or /arch:SSE.
@@ -1367,8 +1474,8 @@ void X86AsmPrinter::LowerPATCHABLE_OP(const MachineInstr &MI,
       (void)NopSize;
     }
   }
-
-  OutStreamer->emitInstruction(MCI, getSubtargetInfo());
+  if (!EmptyInst)
+    OutStreamer->emitInstruction(MCI, getSubtargetInfo());
 }
 
 // Lower a stackmap of the form:
@@ -1477,7 +1584,7 @@ void X86AsmPrinter::LowerPATCHABLE_EVENT_CALL(const MachineInstr &MI,
   // First we emit the label and the jump.
   auto CurSled = OutContext.createTempSymbol("xray_event_sled_", true);
   OutStreamer->AddComment("# XRay Custom Event Log");
-  OutStreamer->emitCodeAlignment(2);
+  OutStreamer->emitCodeAlignment(Align(2), &getSubtargetInfo());
   OutStreamer->emitLabel(CurSled);
 
   // Use a two-byte `jmp`. This version of JMP takes an 8-bit relative offset as
@@ -1573,7 +1680,7 @@ void X86AsmPrinter::LowerPATCHABLE_TYPED_EVENT_CALL(const MachineInstr &MI,
   // First we emit the label and the jump.
   auto CurSled = OutContext.createTempSymbol("xray_typed_event_sled_", true);
   OutStreamer->AddComment("# XRay Typed Event Log");
-  OutStreamer->emitCodeAlignment(2);
+  OutStreamer->emitCodeAlignment(Align(2), &getSubtargetInfo());
   OutStreamer->emitLabel(CurSled);
 
   // Use a two-byte `jmp`. This version of JMP takes an 8-bit relative offset as
@@ -1675,7 +1782,7 @@ void X86AsmPrinter::LowerPATCHABLE_FUNCTION_ENTER(const MachineInstr &MI,
   //   call <relative offset, 32-bits>   // 5 bytes
   //
   auto CurSled = OutContext.createTempSymbol("xray_sled_", true);
-  OutStreamer->emitCodeAlignment(2);
+  OutStreamer->emitCodeAlignment(Align(2), &getSubtargetInfo());
   OutStreamer->emitLabel(CurSled);
 
   // Use a two-byte `jmp`. This version of JMP takes an 8-bit relative offset as
@@ -1705,14 +1812,14 @@ void X86AsmPrinter::LowerPATCHABLE_RET(const MachineInstr &MI,
   //
   // This just makes sure that the alignment for the next instruction is 2.
   auto CurSled = OutContext.createTempSymbol("xray_sled_", true);
-  OutStreamer->emitCodeAlignment(2);
+  OutStreamer->emitCodeAlignment(Align(2), &getSubtargetInfo());
   OutStreamer->emitLabel(CurSled);
   unsigned OpCode = MI.getOperand(0).getImm();
   MCInst Ret;
   Ret.setOpcode(OpCode);
   for (auto &MO : drop_begin(MI.operands()))
     if (auto MaybeOperand = MCIL.LowerMachineOperand(&MI, MO))
-      Ret.addOperand(MaybeOperand.getValue());
+      Ret.addOperand(*MaybeOperand);
   OutStreamer->emitInstruction(Ret, getSubtargetInfo());
   emitX86Nops(*OutStreamer, 10, Subtarget);
   recordSled(CurSled, MI, SledKind::FUNCTION_EXIT, 2);
@@ -1729,7 +1836,7 @@ void X86AsmPrinter::LowerPATCHABLE_TAIL_CALL(const MachineInstr &MI,
   // the PATCHABLE_FUNCTION_ENTER case, followed by the lowering of the actual
   // tail call much like how we have it in PATCHABLE_RET.
   auto CurSled = OutContext.createTempSymbol("xray_sled_", true);
-  OutStreamer->emitCodeAlignment(2);
+  OutStreamer->emitCodeAlignment(Align(2), &getSubtargetInfo());
   OutStreamer->emitLabel(CurSled);
   auto Target = OutContext.createTempSymbol();
 
@@ -1751,7 +1858,7 @@ void X86AsmPrinter::LowerPATCHABLE_TAIL_CALL(const MachineInstr &MI,
   OutStreamer->AddComment("TAILCALL");
   for (auto &MO : drop_begin(MI.operands()))
     if (auto MaybeOperand = MCIL.LowerMachineOperand(&MI, MO))
-      TC.addOperand(MaybeOperand.getValue());
+      TC.addOperand(*MaybeOperand);
   OutStreamer->emitInstruction(TC, getSubtargetInfo());
 }
 
@@ -1796,8 +1903,8 @@ static std::string getShuffleComment(const MachineInstr *MI, unsigned SrcOp1Idx,
   // names. Fortunately most people use the ATT style (outside of Windows)
   // and they actually agree on register naming here. Ultimately, this is
   // a comment, and so its OK if it isn't perfect.
-  auto GetRegisterName = [](unsigned RegNum) -> StringRef {
-    return X86ATTInstPrinter::getRegisterName(RegNum);
+  auto GetRegisterName = [](MCRegister Reg) -> StringRef {
+    return X86ATTInstPrinter::getRegisterName(Reg);
   };
 
   const MachineOperand &DstOp = MI->getOperand(0);
@@ -1811,7 +1918,7 @@ static std::string getShuffleComment(const MachineInstr *MI, unsigned SrcOp1Idx,
       SrcOp2.isReg() ? GetRegisterName(SrcOp2.getReg()) : "mem";
 
   // One source operand, fix the mask to print all elements in one span.
-  SmallVector<int, 8> ShuffleMask(Mask.begin(), Mask.end());
+  SmallVector<int, 8> ShuffleMask(Mask);
   if (Src1Name == Src2Name)
     for (int i = 0, e = ShuffleMask.size(); i != e; ++i)
       if (ShuffleMask[i] >= e)
@@ -1946,34 +2053,34 @@ void X86AsmPrinter::EmitSEHInstruction(const MachineInstr *MI) {
   // Otherwise, use the .seh_ directives for all other Windows platforms.
   switch (MI->getOpcode()) {
   case X86::SEH_PushReg:
-    OutStreamer->EmitWinCFIPushReg(MI->getOperand(0).getImm());
+    OutStreamer->emitWinCFIPushReg(MI->getOperand(0).getImm());
     break;
 
   case X86::SEH_SaveReg:
-    OutStreamer->EmitWinCFISaveReg(MI->getOperand(0).getImm(),
+    OutStreamer->emitWinCFISaveReg(MI->getOperand(0).getImm(),
                                    MI->getOperand(1).getImm());
     break;
 
   case X86::SEH_SaveXMM:
-    OutStreamer->EmitWinCFISaveXMM(MI->getOperand(0).getImm(),
+    OutStreamer->emitWinCFISaveXMM(MI->getOperand(0).getImm(),
                                    MI->getOperand(1).getImm());
     break;
 
   case X86::SEH_StackAlloc:
-    OutStreamer->EmitWinCFIAllocStack(MI->getOperand(0).getImm());
+    OutStreamer->emitWinCFIAllocStack(MI->getOperand(0).getImm());
     break;
 
   case X86::SEH_SetFrame:
-    OutStreamer->EmitWinCFISetFrame(MI->getOperand(0).getImm(),
+    OutStreamer->emitWinCFISetFrame(MI->getOperand(0).getImm(),
                                     MI->getOperand(1).getImm());
     break;
 
   case X86::SEH_PushFrame:
-    OutStreamer->EmitWinCFIPushFrame(MI->getOperand(0).getImm());
+    OutStreamer->emitWinCFIPushFrame(MI->getOperand(0).getImm());
     break;
 
   case X86::SEH_EndPrologue:
-    OutStreamer->EmitWinCFIEndProlog();
+    OutStreamer->emitWinCFIEndProlog();
     break;
 
   default:
@@ -2027,7 +2134,7 @@ static void addConstantComments(const MachineInstr *MI,
 
     const MachineOperand &MaskOp = MI->getOperand(MaskIdx);
     if (auto *C = getConstantFromPool(*MI, MaskOp)) {
-      unsigned Width = getRegisterWidth(MI->getDesc().OpInfo[0]);
+      unsigned Width = getRegisterWidth(MI->getDesc().operands()[0]);
       SmallVector<int, 64> Mask;
       DecodePSHUFBMask(C, Width, Mask);
       if (!Mask.empty())
@@ -2105,7 +2212,7 @@ static void addConstantComments(const MachineInstr *MI,
 
     const MachineOperand &MaskOp = MI->getOperand(MaskIdx);
     if (auto *C = getConstantFromPool(*MI, MaskOp)) {
-      unsigned Width = getRegisterWidth(MI->getDesc().OpInfo[0]);
+      unsigned Width = getRegisterWidth(MI->getDesc().operands()[0]);
       SmallVector<int, 16> Mask;
       DecodeVPERMILPMask(C, ElSize, Width, Mask);
       if (!Mask.empty())
@@ -2134,7 +2241,7 @@ static void addConstantComments(const MachineInstr *MI,
 
     const MachineOperand &MaskOp = MI->getOperand(3 + X86::AddrDisp);
     if (auto *C = getConstantFromPool(*MI, MaskOp)) {
-      unsigned Width = getRegisterWidth(MI->getDesc().OpInfo[0]);
+      unsigned Width = getRegisterWidth(MI->getDesc().operands()[0]);
       SmallVector<int, 16> Mask;
       DecodeVPERMIL2PMask(C, (unsigned)CtrlOp.getImm(), ElSize, Width, Mask);
       if (!Mask.empty())
@@ -2149,7 +2256,7 @@ static void addConstantComments(const MachineInstr *MI,
 
     const MachineOperand &MaskOp = MI->getOperand(3 + X86::AddrDisp);
     if (auto *C = getConstantFromPool(*MI, MaskOp)) {
-      unsigned Width = getRegisterWidth(MI->getDesc().OpInfo[0]);
+      unsigned Width = getRegisterWidth(MI->getDesc().operands()[0]);
       SmallVector<int, 16> Mask;
       DecodeVPPERMMask(C, Width, Mask);
       if (!Mask.empty())
@@ -2367,10 +2474,23 @@ static void addConstantComments(const MachineInstr *MI,
 }
 
 void X86AsmPrinter::emitInstruction(const MachineInstr *MI) {
+  // FIXME: Enable feature predicate checks once all the test pass.
+  // X86_MC::verifyInstructionPredicates(MI->getOpcode(),
+  //                                     Subtarget->getFeatureBits());
+
   X86MCInstLower MCInstLowering(*MF, *this);
   const X86RegisterInfo *RI =
       MF->getSubtarget<X86Subtarget>().getRegisterInfo();
 
+  if (MI->getOpcode() == X86::OR64rm) {
+    for (auto &Opd : MI->operands()) {
+      if (Opd.isSymbol() && StringRef(Opd.getSymbolName()) ==
+                                "swift_async_extendedFramePointerFlags") {
+        ShouldEmitWeakSwiftAsyncExtendedFramePointerFlags = true;
+      }
+    }
+  }
+
   // Add a comment about EVEX-2-VEX compression for AVX-512 instrs that
   // are compressed from EVEX encoding to VEX encoding.
   if (TM.Options.MCOptions.ShowMCEncoding) {
@@ -2386,11 +2506,6 @@ void X86AsmPrinter::emitInstruction(const MachineInstr *MI) {
   case TargetOpcode::DBG_VALUE:
     llvm_unreachable("Should be handled target independently");
 
-  // Emit nothing here but a comment if we can.
-  case X86::Int_MemBarrier:
-    OutStreamer->emitRawComment("MEMBARRIER");
-    return;
-
   case X86::EH_RETURN:
   case X86::EH_RETURN64: {
     // Lower these as normal, but add some comments.
@@ -2430,13 +2545,16 @@ void X86AsmPrinter::emitInstruction(const MachineInstr *MI) {
     break;
   }
 
+  case X86::TAILJMPd64:
+    if (IndCSPrefix && MI->hasRegisterImplicitUseOperand(X86::R11))
+      EmitAndCountInstruction(MCInstBuilder(X86::CS_PREFIX));
+    [[fallthrough]];
   case X86::TAILJMPr:
   case X86::TAILJMPm:
   case X86::TAILJMPd:
   case X86::TAILJMPd_CC:
   case X86::TAILJMPr64:
   case X86::TAILJMPm64:
-  case X86::TAILJMPd64:
   case X86::TAILJMPd64_CC:
   case X86::TAILJMPr64_REX:
   case X86::TAILJMPm64_REX:
@@ -2563,6 +2681,12 @@ void X86AsmPrinter::emitInstruction(const MachineInstr *MI) {
     EmitAndCountInstruction(MCInstBuilder(getRetOpcode(*Subtarget)));
     return;
 
+  case X86::KCFI_CHECK:
+    return LowerKCFI_CHECK(*MI);
+
+  case X86::ASAN_CHECK_MEMACCESS:
+    return LowerASAN_CHECK_MEMACCESS(*MI);
+
   case X86::MORESTACK_RET_RESTORE_R10:
     // Return, then restore R10.
     EmitAndCountInstruction(MCInstBuilder(getRetOpcode(*Subtarget)));
@@ -2609,7 +2733,7 @@ void X86AsmPrinter::emitInstruction(const MachineInstr *MI) {
     EmitAndCountInstruction(MCInstBuilder(X86::JMP_1).addExpr(RGSuccExpr));
     EmitAndCountInstruction(MCInstBuilder(X86::INT3));
     EmitAndCountInstruction(MCInstBuilder(X86::INT3));
-    OutStreamer->emitValueToAlignment(8, 0xCC, 1);
+    OutStreamer->emitValueToAlignment(Align(8), 0xCC, 1);
     OutStreamer->emitLabel(RGSuccSym);
     return;
   }
@@ -2651,6 +2775,10 @@ void X86AsmPrinter::emitInstruction(const MachineInstr *MI) {
                                 .addImm(MI->getOperand(0).getImm())
                                 .addReg(X86::NoRegister));
     return;
+  case X86::CALL64pcrel32:
+    if (IndCSPrefix && MI->hasRegisterImplicitUseOperand(X86::R11))
+      EmitAndCountInstruction(MCInstBuilder(X86::CS_PREFIX));
+    break;
   }
 
   MCInst TmpInst;
@@ -2677,5 +2805,5 @@ void X86AsmPrinter::emitInstruction(const MachineInstr *MI) {
 /// Emit Trap bytes to the specified power of two alignment
 void X86AsmPrinter::emitTrapToAlignment(Align Alignment) const {
   if (Alignment == Align(1)) return;
-  OutStreamer->emitValueToAlignment(Alignment.value(), 0xCC, 1);
+  OutStreamer->emitValueToAlignment(Alignment, 0xCC, 1);
 }
diff --git a/gnu/llvm/llvm/lib/Target/X86/X86MachineFunctionInfo.h b/gnu/llvm/llvm/lib/Target/X86/X86MachineFunctionInfo.h
index b724edbeca1..4a614511acc 100644
--- a/gnu/llvm/llvm/lib/Target/X86/X86MachineFunctionInfo.h
+++ b/gnu/llvm/llvm/lib/Target/X86/X86MachineFunctionInfo.h
@@ -105,8 +105,8 @@ class X86MachineFunctionInfo : public MachineFunctionInfo {
   /// True if this function uses the red zone.
   bool UsesRedZone = false;
 
-  /// True if this function has WIN_ALLOCA instructions.
-  bool HasWinAlloca = false;
+  /// True if this function has DYN_ALLOCA instructions.
+  bool HasDynAlloca = false;
 
   /// True if this function has any preallocated calls.
   bool HasPreallocatedCall = false;
@@ -116,9 +116,15 @@ class X86MachineFunctionInfo : public MachineFunctionInfo {
   /// other tools to detect the extended record.
   bool HasSwiftAsyncContext = false;
 
-  Optional<int> SwiftAsyncContextFrameIdx;
+  /// True if this function has tile virtual register. This is used to
+  /// determine if we should insert tilerelease in frame lowering.
+  bool HasVirtualTileReg = false;
 
-  ValueMap<const Value *, size_t> PreallocatedIds;
+  std::optional<int> SwiftAsyncContextFrameIdx;
+
+  // Preallocated fields are only used during isel.
+  // FIXME: Can we find somewhere else to store these?
+  DenseMap<const Value *, size_t> PreallocatedIds;
   SmallVector<size_t, 0> PreallocatedStackSizes;
   SmallVector<SmallVector<size_t, 4>, 0> PreallocatedArgOffsets;
 
@@ -129,8 +135,14 @@ private:
 
 public:
   X86MachineFunctionInfo() = default;
+  X86MachineFunctionInfo(const Function &F, const TargetSubtargetInfo *STI) {}
+
+  X86MachineFunctionInfo(const X86MachineFunctionInfo &) = default;
 
-  explicit X86MachineFunctionInfo(MachineFunction &MF) {}
+  MachineFunctionInfo *
+  clone(BumpPtrAllocator &Allocator, MachineFunction &DestMF,
+        const DenseMap<MachineBasicBlock *, MachineBasicBlock *> &Src2DstMBB)
+      const override;
 
   bool getForceFramePointer() const { return ForceFramePointer;}
   void setForceFramePointer(bool forceFP) { ForceFramePointer = forceFP; }
@@ -204,8 +216,8 @@ public:
   bool getUsesRedZone() const { return UsesRedZone; }
   void setUsesRedZone(bool V) { UsesRedZone = V; }
 
-  bool hasWinAlloca() const { return HasWinAlloca; }
-  void setHasWinAlloca(bool v) { HasWinAlloca = v; }
+  bool hasDynAlloca() const { return HasDynAlloca; }
+  void setHasDynAlloca(bool v) { HasDynAlloca = v; }
 
   bool hasPreallocatedCall() const { return HasPreallocatedCall; }
   void setHasPreallocatedCall(bool v) { HasPreallocatedCall = v; }
@@ -213,7 +225,10 @@ public:
   bool hasSwiftAsyncContext() const { return HasSwiftAsyncContext; }
   void setHasSwiftAsyncContext(bool v) { HasSwiftAsyncContext = v; }
 
-  Optional<int> getSwiftAsyncContextFrameIdx() const {
+  bool hasVirtualTileReg() const { return HasVirtualTileReg; }
+  void setHasVirtualTileReg(bool v) { HasVirtualTileReg = v; }
+
+  std::optional<int> getSwiftAsyncContextFrameIdx() const {
     return SwiftAsyncContextFrameIdx;
   }
   void setSwiftAsyncContextFrameIdx(int v) { SwiftAsyncContextFrameIdx = v; }
diff --git a/gnu/llvm/llvm/lib/Target/X86/X86RegisterInfo.td b/gnu/llvm/llvm/lib/Target/X86/X86RegisterInfo.td
index cccac67061a..f78f4c7654b 100644
--- a/gnu/llvm/llvm/lib/Target/X86/X86RegisterInfo.td
+++ b/gnu/llvm/llvm/lib/Target/X86/X86RegisterInfo.td
@@ -61,7 +61,6 @@ def CH : X86Reg<"ch", 5>;
 def BH : X86Reg<"bh", 7>;
 
 // X86-64 only, requires REX.
-let CostPerUse = [1] in {
 def SIL  : X86Reg<"sil",   6>;
 def DIL  : X86Reg<"dil",   7>;
 def BPL  : X86Reg<"bpl",   5>;
@@ -74,7 +73,6 @@ def R12B : X86Reg<"r12b", 12>;
 def R13B : X86Reg<"r13b", 13>;
 def R14B : X86Reg<"r14b", 14>;
 def R15B : X86Reg<"r15b", 15>;
-}
 
 let isArtificial = 1 in {
 // High byte of the low 16 bits of the super-register:
@@ -126,8 +124,7 @@ def SP : X86Reg<"sp", 4, [SPL,SPH]>;
 def IP : X86Reg<"ip", 0>;
 
 // X86-64 only, requires REX.
-let SubRegIndices = [sub_8bit, sub_8bit_hi_phony], CostPerUse = [1],
-    CoveredBySubRegs = 1 in {
+let SubRegIndices = [sub_8bit, sub_8bit_hi_phony], CoveredBySubRegs = 1 in {
 def R8W  : X86Reg<"r8w",   8, [R8B,R8BH]>;
 def R9W  : X86Reg<"r9w",   9, [R9B,R9BH]>;
 def R10W : X86Reg<"r10w", 10, [R10B,R10BH]>;
@@ -152,8 +149,7 @@ def EIP : X86Reg<"eip", 0, [IP, HIP]>, DwarfRegNum<[-2, 8, 8]>;
 }
 
 // X86-64 only, requires REX
-let SubRegIndices = [sub_16bit, sub_16bit_hi], CostPerUse = [1],
-    CoveredBySubRegs = 1 in {
+let SubRegIndices = [sub_16bit, sub_16bit_hi], CoveredBySubRegs = 1 in {
 def R8D  : X86Reg<"r8d",   8, [R8W,R8WH]>;
 def R9D  : X86Reg<"r9d",   9, [R9W,R9WH]>;
 def R10D : X86Reg<"r10d", 10, [R10W,R10WH]>;
@@ -176,7 +172,6 @@ def RBP : X86Reg<"rbp", 5, [EBP]>, DwarfRegNum<[6, -2, -2]>;
 def RSP : X86Reg<"rsp", 4, [ESP]>, DwarfRegNum<[7, -2, -2]>;
 
 // These also require REX.
-let CostPerUse = [1] in {
 def R8  : X86Reg<"r8",   8, [R8D]>,  DwarfRegNum<[ 8, -2, -2]>;
 def R9  : X86Reg<"r9",   9, [R9D]>,  DwarfRegNum<[ 9, -2, -2]>;
 def R10 : X86Reg<"r10", 10, [R10D]>, DwarfRegNum<[10, -2, -2]>;
@@ -186,7 +181,7 @@ def R13 : X86Reg<"r13", 13, [R13D]>, DwarfRegNum<[13, -2, -2]>;
 def R14 : X86Reg<"r14", 14, [R14D]>, DwarfRegNum<[14, -2, -2]>;
 def R15 : X86Reg<"r15", 15, [R15D]>, DwarfRegNum<[15, -2, -2]>;
 def RIP : X86Reg<"rip",  0, [EIP]>,  DwarfRegNum<[16, -2, -2]>;
-}}
+}
 
 // MMX Registers. These are actually aliased to ST0 .. ST7
 def MM0 : X86Reg<"mm0", 0>, DwarfRegNum<[41, 29, 29]>;
@@ -219,7 +214,6 @@ def XMM6: X86Reg<"xmm6", 6>, DwarfRegNum<[23, 27, 27]>;
 def XMM7: X86Reg<"xmm7", 7>, DwarfRegNum<[24, 28, 28]>;
 
 // X86-64 only
-let CostPerUse = [1] in {
 def XMM8:  X86Reg<"xmm8",   8>, DwarfRegNum<[25, -2, -2]>;
 def XMM9:  X86Reg<"xmm9",   9>, DwarfRegNum<[26, -2, -2]>;
 def XMM10: X86Reg<"xmm10", 10>, DwarfRegNum<[27, -2, -2]>;
@@ -246,8 +240,6 @@ def XMM29:  X86Reg<"xmm29", 29>, DwarfRegNum<[80, -2, -2]>;
 def XMM30:  X86Reg<"xmm30", 30>, DwarfRegNum<[81, -2, -2]>;
 def XMM31:  X86Reg<"xmm31", 31>, DwarfRegNum<[82, -2, -2]>;
 
-} // CostPerUse
-
 // YMM0-15 registers, used by AVX instructions and
 // YMM16-31 registers, used by AVX-512 instructions.
 let SubRegIndices = [sub_xmm] in {
@@ -319,7 +311,9 @@ def MXCSR : X86Reg<"mxcsr", 0>;
 // reading and updating those flags independently of all the others. We don't
 // want to create false dependencies between these instructions and so we use
 // a separate register to model them.
-def EFLAGS : X86Reg<"flags", 0>;
+def EFLAGS : X86Reg<"flags", 0>, DwarfRegNum<[49, 9, 9]>;
+def _EFLAGS : X86Reg<"eflags", 0>, DwarfRegAlias<EFLAGS>;
+def RFLAGS : X86Reg<"rflags", 0>, DwarfRegNum<[49, -2, -2]>;
 
 // The direction flag.
 def DF : X86Reg<"dirflag", 0>;
@@ -333,6 +327,9 @@ def ES : X86Reg<"es", 0>;
 def FS : X86Reg<"fs", 4>;
 def GS : X86Reg<"gs", 5>;
 
+def FS_BASE : X86Reg<"fs.base", 0>, DwarfRegNum<[58, -2, -2]>;
+def GS_BASE : X86Reg<"gs.base", 0>, DwarfRegNum<[59, -2, -2]>;
+
 // Debug registers
 def DR0  : X86Reg<"dr0",   0>;
 def DR1  : X86Reg<"dr1",   1>;
@@ -373,12 +370,6 @@ def CR15 : X86Reg<"cr15", 15>;
 def EIZ : X86Reg<"eiz", 4>;
 def RIZ : X86Reg<"riz", 4>;
 
-// Bound registers, used in MPX instructions
-def BND0 : X86Reg<"bnd0",   0>;
-def BND1 : X86Reg<"bnd1",   1>;
-def BND2 : X86Reg<"bnd2",   2>;
-def BND3 : X86Reg<"bnd3",   3>;
-
 // CET registers - Shadow Stack Pointer
 def SSP : X86Reg<"ssp", 0>;
 
@@ -436,6 +427,12 @@ def GR64 : RegisterClass<"X86", [i64], 64,
                          (add RAX, RCX, RDX, RSI, RDI, R8, R9, R10, R11,
                               R14, R15, R12, R13, RBX, RBP, RSP, RIP)>;
 
+// GR64PLTSafe - 64-bit GPRs without R10, R11, RSP and RIP. Could be used when
+// emitting code for intrinsics, which use implict input registers.
+def GR64PLTSafe : RegisterClass<"X86", [i64], 64,
+                              (add RAX, RCX, RDX, RSI, RDI, R8, R9,
+                                   RBX, R14, R15, R12, R13, RBP)>;
+
 // Segment registers for use by MOV instructions (and others) that have a
 //   segment register as one operand.  Always contain a 16-bit segment
 //   descriptor.
@@ -537,6 +534,8 @@ def FR32 : RegisterClass<"X86", [f32], 32, (sequence "XMM%u", 0, 15)>;
 
 def FR64 : RegisterClass<"X86", [f64], 64, (add FR32)>;
 
+def FR16 : RegisterClass<"X86", [f16], 16, (add FR32)> {let Size = 32;}
+
 
 // FIXME: This sets up the floating point register files as though they are f64
 // values, though they really are f80 values.  This will cause us to spill
@@ -567,9 +566,9 @@ def RSTi : RegisterOperand<RST, "printSTiRegOperand">;
 // Generic vector registers: VR64 and VR128.
 // Ensure that float types are declared first - only float is legal on SSE1.
 def VR64: RegisterClass<"X86", [x86mmx], 64, (sequence "MM%u", 0, 7)>;
-def VR128 : RegisterClass<"X86", [v4f32, v2f64, v16i8, v8i16, v4i32, v2i64, f128],
+def VR128 : RegisterClass<"X86", [v4f32, v2f64, v8f16, v8bf16, v16i8, v8i16, v4i32, v2i64, f128],
                           128, (add FR32)>;
-def VR256 : RegisterClass<"X86", [v8f32, v4f64, v32i8, v16i16, v8i32, v4i64],
+def VR256 : RegisterClass<"X86", [v8f32, v4f64, v16f16, v16bf16, v32i8, v16i16, v8i32, v4i64],
                           256, (sequence "YMM%u", 0, 15)>;
 
 // Status flags registers.
@@ -587,7 +586,7 @@ def DFCCR : RegisterClass<"X86", [i32], 32, (add DF)> {
 }
 
 // AVX-512 vector/mask registers.
-def VR512 : RegisterClass<"X86", [v16f32, v8f64, v64i8, v32i16, v16i32, v8i64],
+def VR512 : RegisterClass<"X86", [v16f32, v8f64, v32f16, v32bf16, v64i8, v32i16, v16i32, v8i64],
                           512, (sequence "ZMM%u", 0, 31)>;
 
 // Represents the lower 16 registers that have VEX/legacy encodable subregs.
@@ -599,10 +598,12 @@ def FR32X : RegisterClass<"X86", [f32], 32, (sequence "XMM%u", 0, 31)>;
 
 def FR64X : RegisterClass<"X86", [f64], 64, (add FR32X)>;
 
+def FR16X : RegisterClass<"X86", [f16], 16, (add FR32X)> {let Size = 32;}
+
 // Extended VR128 and VR256 for AVX-512 instructions
-def VR128X : RegisterClass<"X86", [v4f32, v2f64, v16i8, v8i16, v4i32, v2i64, f128],
+def VR128X : RegisterClass<"X86", [v4f32, v2f64, v8f16, v8bf16, v16i8, v8i16, v4i32, v2i64, f128],
                            128, (add FR32X)>;
-def VR256X : RegisterClass<"X86", [v8f32, v4f64, v32i8, v16i16, v8i32, v4i64],
+def VR256X : RegisterClass<"X86", [v8f32, v4f64, v16f16, v16bf16, v32i8, v16i16, v8i32, v4i64],
                            256, (sequence "YMM%u", 0, 31)>;
 
 // Mask registers
@@ -632,10 +633,18 @@ def VK16WM  : RegisterClass<"X86", [v16i1], 16, (add VK8WM)>   {let Size = 16;}
 def VK32WM  : RegisterClass<"X86", [v32i1], 32, (add VK16WM)> {let Size = 32;}
 def VK64WM  : RegisterClass<"X86", [v64i1], 64, (add VK32WM)> {let Size = 64;}
 
-// Bound registers
-def BNDR : RegisterClass<"X86", [v2i64], 128, (sequence "BND%u", 0, 3)>;
-
 // Tiles
 let CopyCost = -1 in // Don't allow copying of tile registers
 def TILE : RegisterClass<"X86", [x86amx], 8192,
                          (sequence "TMM%u", 0, 7)> {let Size = 8192;}
+
+//===----------------------------------------------------------------------===//
+// Register categories.
+//
+
+// The TILE and VK*PAIR registers may not be "fixed", but we don't want them
+// anyway.
+def FixedRegisters : RegisterCategory<[DEBUG_REG, CONTROL_REG, CCR, FPCCR,
+                                       DFCCR, TILE, VK1PAIR, VK2PAIR, VK4PAIR,
+                                       VK8PAIR, VK16PAIR]>;
+def GeneralPurposeRegisters : RegisterCategory<[GR64, GR32, GR16, GR8]>;
diff --git a/gnu/llvm/llvm/lib/Target/X86/X86ReturnProtectorLowering.cpp b/gnu/llvm/llvm/lib/Target/X86/X86ReturnProtectorLowering.cpp
index 2eea9ac11fb..e96be2ef817 100644
--- a/gnu/llvm/llvm/lib/Target/X86/X86ReturnProtectorLowering.cpp
+++ b/gnu/llvm/llvm/lib/Target/X86/X86ReturnProtectorLowering.cpp
@@ -71,18 +71,18 @@ void X86ReturnProtectorLowering::insertReturnProtectorEpilogue(
 bool X86ReturnProtectorLowering::opcodeIsReturn(unsigned opcode) const {
   switch (opcode) {
   case X86::RET:
-  case X86::RETL:
-  case X86::RETQ:
-  case X86::RETW:
-  case X86::RETIL:
-  case X86::RETIQ:
-  case X86::RETIW:
-  case X86::LRETL:
-  case X86::LRETQ:
-  case X86::LRETW:
-  case X86::LRETIL:
-  case X86::LRETIQ:
-  case X86::LRETIW:
+  case X86::RET16:
+  case X86::RET32:
+  case X86::RET64:
+  case X86::RETI16:
+  case X86::RETI32:
+  case X86::RETI64:
+  case X86::LRET16:
+  case X86::LRET32:
+  case X86::LRET64:
+  case X86::LRETI16:
+  case X86::LRETI32:
+  case X86::LRETI64:
     return true;
   default:
     return false;
diff --git a/gnu/llvm/llvm/lib/Target/X86/X86Subtarget.h b/gnu/llvm/llvm/lib/Target/X86/X86Subtarget.h
index ddf65be075a..58ea25df365 100644
--- a/gnu/llvm/llvm/lib/Target/X86/X86Subtarget.h
+++ b/gnu/llvm/llvm/lib/Target/X86/X86Subtarget.h
@@ -50,25 +50,14 @@ enum class Style {
 } // end namespace PICStyles
 
 class X86Subtarget final : public X86GenSubtargetInfo {
-  // NOTE: Do not add anything new to this list. Coarse, CPU name based flags
-  // are not a good idea. We should be migrating away from these.
-  enum X86ProcFamilyEnum {
-    Others,
-    IntelAtom,
-    IntelSLM
-  };
-
   enum X86SSEEnum {
-    NoSSE, SSE1, SSE2, SSE3, SSSE3, SSE41, SSE42, AVX, AVX2, AVX512F
+    NoSSE, SSE1, SSE2, SSE3, SSSE3, SSE41, SSE42, AVX, AVX2, AVX512
   };
 
   enum X863DNowEnum {
     NoThreeDNow, MMX, ThreeDNow, ThreeDNowA
   };
 
-  /// X86 processor family: Intel Atom, and others
-  X86ProcFamilyEnum X86ProcFamily = Others;
-
   /// Which PIC style to use
   PICStyles::Style PICStyle;
 
@@ -80,427 +69,20 @@ class X86Subtarget final : public X86GenSubtargetInfo {
   /// MMX, 3DNow, 3DNow Athlon, or none supported.
   X863DNowEnum X863DNowLevel = NoThreeDNow;
 
-  /// True if the processor supports X87 instructions.
-  bool HasX87 = false;
-
-  /// True if the processor supports CMPXCHG8B.
-  bool HasCmpxchg8b = false;
-
-  /// True if this processor has NOPL instruction
-  /// (generally pentium pro+).
-  bool HasNOPL = false;
-
-  /// True if this processor has conditional move instructions
-  /// (generally pentium pro+).
-  bool HasCMov = false;
-
-  /// True if the processor supports X86-64 instructions.
-  bool HasX86_64 = false;
-
-  /// True if the processor supports POPCNT.
-  bool HasPOPCNT = false;
-
-  /// True if the processor supports SSE4A instructions.
-  bool HasSSE4A = false;
-
-  /// Target has AES instructions
-  bool HasAES = false;
-  bool HasVAES = false;
-
-  /// Target has FXSAVE/FXRESTOR instructions
-  bool HasFXSR = false;
-
-  /// Target has XSAVE instructions
-  bool HasXSAVE = false;
-
-  /// Target has XSAVEOPT instructions
-  bool HasXSAVEOPT = false;
-
-  /// Target has XSAVEC instructions
-  bool HasXSAVEC = false;
-
-  /// Target has XSAVES instructions
-  bool HasXSAVES = false;
-
-  /// Target has carry-less multiplication
-  bool HasPCLMUL = false;
-  bool HasVPCLMULQDQ = false;
-
-  /// Target has Galois Field Arithmetic instructions
-  bool HasGFNI = false;
-
-  /// Target has 3-operand fused multiply-add
-  bool HasFMA = false;
-
-  /// Target has 4-operand fused multiply-add
-  bool HasFMA4 = false;
-
-  /// Target has XOP instructions
-  bool HasXOP = false;
-
-  /// Target has TBM instructions.
-  bool HasTBM = false;
-
-  /// Target has LWP instructions
-  bool HasLWP = false;
-
-  /// True if the processor has the MOVBE instruction.
-  bool HasMOVBE = false;
-
-  /// True if the processor has the RDRAND instruction.
-  bool HasRDRAND = false;
-
-  /// Processor has 16-bit floating point conversion instructions.
-  bool HasF16C = false;
-
-  /// Processor has FS/GS base insturctions.
-  bool HasFSGSBase = false;
-
-  /// Processor has LZCNT instruction.
-  bool HasLZCNT = false;
-
-  /// Processor has BMI1 instructions.
-  bool HasBMI = false;
-
-  /// Processor has BMI2 instructions.
-  bool HasBMI2 = false;
-
-  /// Processor has VBMI instructions.
-  bool HasVBMI = false;
-
-  /// Processor has VBMI2 instructions.
-  bool HasVBMI2 = false;
-
-  /// Processor has Integer Fused Multiply Add
-  bool HasIFMA = false;
-
-  /// Processor has RTM instructions.
-  bool HasRTM = false;
-
-  /// Processor has ADX instructions.
-  bool HasADX = false;
-
-  /// Processor has SHA instructions.
-  bool HasSHA = false;
-
-  /// Processor has PRFCHW instructions.
-  bool HasPRFCHW = false;
-
-  /// Processor has RDSEED instructions.
-  bool HasRDSEED = false;
-
-  /// Processor has LAHF/SAHF instructions in 64-bit mode.
-  bool HasLAHFSAHF64 = false;
-
-  /// Processor has MONITORX/MWAITX instructions.
-  bool HasMWAITX = false;
-
-  /// Processor has Cache Line Zero instruction
-  bool HasCLZERO = false;
-
-  /// Processor has Cache Line Demote instruction
-  bool HasCLDEMOTE = false;
-
-  /// Processor has MOVDIRI instruction (direct store integer).
-  bool HasMOVDIRI = false;
-
-  /// Processor has MOVDIR64B instruction (direct store 64 bytes).
-  bool HasMOVDIR64B = false;
-
-  /// Processor has ptwrite instruction.
-  bool HasPTWRITE = false;
-
-  /// Processor has Prefetch with intent to Write instruction
-  bool HasPREFETCHWT1 = false;
-
-  /// True if SHLD instructions are slow.
-  bool IsSHLDSlow = false;
-
-  /// True if the PMULLD instruction is slow compared to PMULLW/PMULHW and
-  //  PMULUDQ.
-  bool IsPMULLDSlow = false;
-
-  /// True if the PMADDWD instruction is slow compared to PMULLD.
-  bool IsPMADDWDSlow = false;
-
-  /// True if unaligned memory accesses of 16-bytes are slow.
-  bool IsUAMem16Slow = false;
-
-  /// True if unaligned memory accesses of 32-bytes are slow.
-  bool IsUAMem32Slow = false;
-
-  /// True if SSE operations can have unaligned memory operands.
-  /// This may require setting a configuration bit in the processor.
-  bool HasSSEUnalignedMem = false;
-
-  /// True if this processor has the CMPXCHG16B instruction;
-  /// this is true for most x86-64 chips, but not the first AMD chips.
-  bool HasCmpxchg16b = false;
-
-  /// True if the LEA instruction should be used for adjusting
-  /// the stack pointer. This is an optimization for Intel Atom processors.
-  bool UseLeaForSP = false;
-
-  /// True if POPCNT instruction has a false dependency on the destination register.
-  bool HasPOPCNTFalseDeps = false;
-
-  /// True if LZCNT/TZCNT instructions have a false dependency on the destination register.
-  bool HasLZCNTFalseDeps = false;
-
-  /// True if its preferable to combine to a single cross-lane shuffle
-  /// using a variable mask over multiple fixed shuffles.
-  bool HasFastVariableCrossLaneShuffle = false;
-
-  /// True if its preferable to combine to a single per-lane shuffle
-  /// using a variable mask over multiple fixed shuffles.
-  bool HasFastVariablePerLaneShuffle = false;
-
-  /// True if vzeroupper instructions should be inserted after code that uses
-  /// ymm or zmm registers.
-  bool InsertVZEROUPPER = false;
-
-  /// True if there is no performance penalty for writing NOPs with up to
-  /// 7 bytes.
-  bool HasFast7ByteNOP = false;
-
-  /// True if there is no performance penalty for writing NOPs with up to
-  /// 11 bytes.
-  bool HasFast11ByteNOP = false;
-
-  /// True if there is no performance penalty for writing NOPs with up to
-  /// 15 bytes.
-  bool HasFast15ByteNOP = false;
-
-  /// True if gather is reasonably fast. This is true for Skylake client and
-  /// all AVX-512 CPUs.
-  bool HasFastGather = false;
-
-  /// True if hardware SQRTSS instruction is at least as fast (latency) as
-  /// RSQRTSS followed by a Newton-Raphson iteration.
-  bool HasFastScalarFSQRT = false;
-
-  /// True if hardware SQRTPS/VSQRTPS instructions are at least as fast
-  /// (throughput) as RSQRTPS/VRSQRTPS followed by a Newton-Raphson iteration.
-  bool HasFastVectorFSQRT = false;
-
-  /// True if 8-bit divisions are significantly faster than
-  /// 32-bit divisions and should be used when possible.
-  bool HasSlowDivide32 = false;
-
-  /// True if 32-bit divides are significantly faster than
-  /// 64-bit divisions and should be used when possible.
-  bool HasSlowDivide64 = false;
-
-  /// True if LZCNT instruction is fast.
-  bool HasFastLZCNT = false;
-
-  /// True if SHLD based rotate is fast.
-  bool HasFastSHLDRotate = false;
-
-  /// True if the processor supports macrofusion.
-  bool HasMacroFusion = false;
-
-  /// True if the processor supports branch fusion.
-  bool HasBranchFusion = false;
-
-  /// True if the processor has enhanced REP MOVSB/STOSB.
-  bool HasERMSB = false;
-
-  /// True if the processor has fast short REP MOV.
-  bool HasFSRM = false;
-
-  /// True if the short functions should be padded to prevent
-  /// a stall when returning too early.
-  bool PadShortFunctions = false;
-
-  /// True if two memory operand instructions should use a temporary register
-  /// instead.
-  bool SlowTwoMemOps = false;
-
-  /// True if the LEA instruction inputs have to be ready at address generation
-  /// (AG) time.
-  bool LEAUsesAG = false;
-
-  /// True if the LEA instruction with certain arguments is slow
-  bool SlowLEA = false;
-
-  /// True if the LEA instruction has all three source operands: base, index,
-  /// and offset or if the LEA instruction uses base and index registers where
-  /// the base is EBP, RBP,or R13
-  bool Slow3OpsLEA = false;
-
-  /// True if INC and DEC instructions are slow when writing to flags
-  bool SlowIncDec = false;
-
-  /// Processor has AVX-512 PreFetch Instructions
-  bool HasPFI = false;
-
-  /// Processor has AVX-512 Exponential and Reciprocal Instructions
-  bool HasERI = false;
-
-  /// Processor has AVX-512 Conflict Detection Instructions
-  bool HasCDI = false;
-
-  /// Processor has AVX-512 population count Instructions
-  bool HasVPOPCNTDQ = false;
-
-  /// Processor has AVX-512 Doubleword and Quadword instructions
-  bool HasDQI = false;
-
-  /// Processor has AVX-512 Byte and Word instructions
-  bool HasBWI = false;
-
-  /// Processor has AVX-512 Vector Length eXtenstions
-  bool HasVLX = false;
-
-  /// Processor has PKU extenstions
-  bool HasPKU = false;
-
-  /// Processor has AVX-512 Vector Neural Network Instructions
-  bool HasVNNI = false;
-
-  /// Processor has AVX Vector Neural Network Instructions
-  bool HasAVXVNNI = false;
-
-  /// Processor has AVX-512 bfloat16 floating-point extensions
-  bool HasBF16 = false;
-
-  /// Processor supports ENQCMD instructions
-  bool HasENQCMD = false;
-
-  /// Processor has AVX-512 Bit Algorithms instructions
-  bool HasBITALG = false;
-
-  /// Processor has AVX-512 vp2intersect instructions
-  bool HasVP2INTERSECT = false;
-
-  /// Processor supports CET SHSTK - Control-Flow Enforcement Technology
-  /// using Shadow Stack
-  bool HasSHSTK = false;
-
-  /// Processor supports Invalidate Process-Context Identifier
-  bool HasINVPCID = false;
-
-  /// Processor has Software Guard Extensions
-  bool HasSGX = false;
-
-  /// Processor supports Flush Cache Line instruction
-  bool HasCLFLUSHOPT = false;
-
-  /// Processor supports Cache Line Write Back instruction
-  bool HasCLWB = false;
-
-  /// Processor supports Write Back No Invalidate instruction
-  bool HasWBNOINVD = false;
-
-  /// Processor support RDPID instruction
-  bool HasRDPID = false;
-
-  /// Processor supports WaitPKG instructions
-  bool HasWAITPKG = false;
-
-  /// Processor supports PCONFIG instruction
-  bool HasPCONFIG = false;
-
-  /// Processor support key locker instructions
-  bool HasKL = false;
-
-  /// Processor support key locker wide instructions
-  bool HasWIDEKL = false;
-
-  /// Processor supports HRESET instruction
-  bool HasHRESET = false;
-
-  /// Processor supports SERIALIZE instruction
-  bool HasSERIALIZE = false;
-
-  /// Processor supports TSXLDTRK instruction
-  bool HasTSXLDTRK = false;
-
-  /// Processor has AMX support
-  bool HasAMXTILE = false;
-  bool HasAMXBF16 = false;
-  bool HasAMXINT8 = false;
-
-  /// Processor supports User Level Interrupt instructions
-  bool HasUINTR = false;
-
-  /// Processor has a single uop BEXTR implementation.
-  bool HasFastBEXTR = false;
-
-  /// Try harder to combine to horizontal vector ops if they are fast.
-  bool HasFastHorizontalOps = false;
-
-  /// Prefer a left/right scalar logical shifts pair over a shift+and pair.
-  bool HasFastScalarShiftMasks = false;
-
-  /// Prefer a left/right vector logical shifts pair over a shift+and pair.
-  bool HasFastVectorShiftMasks = false;
-
-  /// Prefer a movbe over a single-use load + bswap / single-use bswap + store.
-  bool HasFastMOVBE = false;
-
-  /// Use a retpoline thunk rather than indirect calls to block speculative
-  /// execution.
-  bool UseRetpolineIndirectCalls = false;
-
-  /// Use a retpoline thunk or remove any indirect branch to block speculative
-  /// execution.
-  bool UseRetpolineIndirectBranches = false;
-
-  /// Deprecated flag, query `UseRetpolineIndirectCalls` and
-  /// `UseRetpolineIndirectBranches` instead.
-  bool DeprecatedUseRetpoline = false;
-
-  /// When using a retpoline thunk, call an externally provided thunk rather
-  /// than emitting one inside the compiler.
-  bool UseRetpolineExternalThunk = false;
-
-  /// Prevent generation of indirect call/branch instructions from memory,
-  /// and force all indirect call/branch instructions from a register to be
-  /// preceded by an LFENCE. Also decompose RET instructions into a
-  /// POP+LFENCE+JMP sequence.
-  bool UseLVIControlFlowIntegrity = false;
-
-  /// Enable Speculative Execution Side Effect Suppression
-  bool UseSpeculativeExecutionSideEffectSuppression = false;
-
-  /// Insert LFENCE instructions to prevent data speculatively injected into
-  /// loads from being used maliciously.
-  bool UseLVILoadHardening = false;
-
-  /// Use software floating point for code generation.
-  bool UseSoftFloat = false;
-
-  /// Use alias analysis during code generation.
-  bool UseAA = false;
-
+#define GET_SUBTARGETINFO_MACRO(ATTRIBUTE, DEFAULT, GETTER)                    \
+  bool ATTRIBUTE = DEFAULT;
+#include "X86GenSubtargetInfo.inc"
   /// The minimum alignment known to hold of the stack frame on
   /// entry to the function and which must be maintained by every function.
   Align stackAlignment = Align(4);
 
   Align TileConfigAlignment = Align(4);
 
-  /// Whether function prologues should save register arguments on the stack.
-  bool SaveArgs = false;
-
   /// Max. memset / memcpy size that is turned into rep/movs, rep/stos ops.
   ///
   // FIXME: this is a known good value for Yonah. How about others?
   unsigned MaxInlineSizeThreshold = 128;
 
-  /// Indicates target prefers 128 bit instructions.
-  bool Prefer128Bit = false;
-
-  /// Indicates target prefers 256 bit instructions.
-  bool Prefer256Bit = false;
-
-  /// Indicates target prefers AVX512 mask registers.
-  bool PreferMaskRegisters = false;
-
-  /// Use Goldmont specific floating point div/sqrt costs.
-  bool UseGLMDivSqrtCosts = false;
-
   /// What processor and OS we're targeting.
   Triple TargetTriple;
 
@@ -510,7 +92,6 @@ class X86Subtarget final : public X86GenSubtargetInfo {
   std::unique_ptr<RegisterBankInfo> RegBankInfo;
   std::unique_ptr<InstructionSelector> InstSelector;
 
-private:
   /// Override the stack alignment.
   MaybeAlign StackAlignOverride;
 
@@ -524,15 +105,6 @@ private:
   /// Required vector width from function attribute.
   unsigned RequiredVectorWidth;
 
-  /// True if compiling for 64-bit, false for 16-bit or 32-bit.
-  bool In64BitMode = false;
-
-  /// True if compiling for 32-bit, false for 16-bit or 64-bit.
-  bool In32BitMode = false;
-
-  /// True if compiling for 16-bit, false for 32-bit or 64-bit.
-  bool In16BitMode = false;
-
   X86SelectionDAGInfo TSInfo;
   // Ordering here is important. X86InstrInfo initializes X86RegisterInfo which
   // X86TargetLowering needs.
@@ -600,38 +172,32 @@ private:
   void initSubtargetFeatures(StringRef CPU, StringRef TuneCPU, StringRef FS);
 
 public:
-  /// Is this x86_64? (disregarding specific ABI / programming model)
-  bool is64Bit() const {
-    return In64BitMode;
-  }
-
-  bool is32Bit() const {
-    return In32BitMode;
-  }
 
-  bool is16Bit() const {
-    return In16BitMode;
-  }
+#define GET_SUBTARGETINFO_MACRO(ATTRIBUTE, DEFAULT, GETTER)                    \
+  bool GETTER() const { return ATTRIBUTE; }
+#include "X86GenSubtargetInfo.inc"
 
   /// Is this x86_64 with the ILP32 programming model (x32 ABI)?
   bool isTarget64BitILP32() const {
-    return In64BitMode && (TargetTriple.isX32() || TargetTriple.isOSNaCl());
+    return Is64Bit && (TargetTriple.isX32() || TargetTriple.isOSNaCl());
   }
 
   /// Is this x86_64 with the LP64 programming model (standard AMD64, no x32)?
   bool isTarget64BitLP64() const {
-    return In64BitMode && (!TargetTriple.isX32() && !TargetTriple.isOSNaCl());
+    return Is64Bit && (!TargetTriple.isX32() && !TargetTriple.isOSNaCl());
   }
 
   PICStyles::Style getPICStyle() const { return PICStyle; }
   void setPICStyle(PICStyles::Style Style)  { PICStyle = Style; }
 
-  bool hasX87() const { return HasX87; }
-  bool hasCmpxchg8b() const { return HasCmpxchg8b; }
-  bool hasNOPL() const { return HasNOPL; }
+  bool canUseCMPXCHG8B() const { return hasCX8(); }
+  bool canUseCMPXCHG16B() const {
+    // CX16 is just the CPUID bit, instruction requires 64-bit mode too.
+    return hasCX16() && is64Bit();
+  }
   // SSE codegen depends on cmovs, and all SSE1+ processors support them.
   // All 64-bit processors support cmov.
-  bool hasCMov() const { return HasCMov || X86SSELevel >= SSE1 || is64Bit(); }
+  bool canUseCMOV() const { return hasCMOV() || hasSSE1() || is64Bit(); }
   bool hasSSE1() const { return X86SSELevel >= SSE1; }
   bool hasSSE2() const { return X86SSELevel >= SSE2; }
   bool hasSSE3() const { return X86SSELevel >= SSE3; }
@@ -640,144 +206,27 @@ public:
   bool hasSSE42() const { return X86SSELevel >= SSE42; }
   bool hasAVX() const { return X86SSELevel >= AVX; }
   bool hasAVX2() const { return X86SSELevel >= AVX2; }
-  bool hasAVX512() const { return X86SSELevel >= AVX512F; }
+  bool hasAVX512() const { return X86SSELevel >= AVX512; }
   bool hasInt256() const { return hasAVX2(); }
-  bool hasSSE4A() const { return HasSSE4A; }
   bool hasMMX() const { return X863DNowLevel >= MMX; }
-  bool has3DNow() const { return X863DNowLevel >= ThreeDNow; }
-  bool has3DNowA() const { return X863DNowLevel >= ThreeDNowA; }
-  bool hasPOPCNT() const { return HasPOPCNT; }
-  bool hasAES() const { return HasAES; }
-  bool hasVAES() const { return HasVAES; }
-  bool hasFXSR() const { return HasFXSR; }
-  bool hasXSAVE() const { return HasXSAVE; }
-  bool hasXSAVEOPT() const { return HasXSAVEOPT; }
-  bool hasXSAVEC() const { return HasXSAVEC; }
-  bool hasXSAVES() const { return HasXSAVES; }
-  bool hasPCLMUL() const { return HasPCLMUL; }
-  bool hasVPCLMULQDQ() const { return HasVPCLMULQDQ; }
-  bool hasGFNI() const { return HasGFNI; }
-  // Prefer FMA4 to FMA - its better for commutation/memory folding and
-  // has equal or better performance on all supported targets.
-  bool hasFMA() const { return HasFMA; }
-  bool hasFMA4() const { return HasFMA4; }
+  bool hasThreeDNow() const { return X863DNowLevel >= ThreeDNow; }
+  bool hasThreeDNowA() const { return X863DNowLevel >= ThreeDNowA; }
   bool hasAnyFMA() const { return hasFMA() || hasFMA4(); }
-  bool hasXOP() const { return HasXOP; }
-  bool hasTBM() const { return HasTBM; }
-  bool hasLWP() const { return HasLWP; }
-  bool hasMOVBE() const { return HasMOVBE; }
-  bool hasRDRAND() const { return HasRDRAND; }
-  bool hasF16C() const { return HasF16C; }
-  bool hasFSGSBase() const { return HasFSGSBase; }
-  bool hasLZCNT() const { return HasLZCNT; }
-  bool hasBMI() const { return HasBMI; }
-  bool hasBMI2() const { return HasBMI2; }
-  bool hasVBMI() const { return HasVBMI; }
-  bool hasVBMI2() const { return HasVBMI2; }
-  bool hasIFMA() const { return HasIFMA; }
-  bool hasRTM() const { return HasRTM; }
-  bool hasADX() const { return HasADX; }
-  bool hasSHA() const { return HasSHA; }
-  bool hasPRFCHW() const { return HasPRFCHW; }
-  bool hasPREFETCHWT1() const { return HasPREFETCHWT1; }
   bool hasPrefetchW() const {
     // The PREFETCHW instruction was added with 3DNow but later CPUs gave it
     // its own CPUID bit as part of deprecating 3DNow. Intel eventually added
     // it and KNL has another that prefetches to L2 cache. We assume the
     // L1 version exists if the L2 version does.
-    return has3DNow() || hasPRFCHW() || hasPREFETCHWT1();
+    return hasThreeDNow() || hasPRFCHW() || hasPREFETCHWT1();
   }
   bool hasSSEPrefetch() const {
     // We implicitly enable these when we have a write prefix supporting cache
     // level OR if we have prfchw, but don't already have a read prefetch from
     // 3dnow.
-    return hasSSE1() || (hasPRFCHW() && !has3DNow()) || hasPREFETCHWT1();
-  }
-  bool hasRDSEED() const { return HasRDSEED; }
-  bool hasLAHFSAHF() const { return HasLAHFSAHF64 || !is64Bit(); }
-  bool hasMWAITX() const { return HasMWAITX; }
-  bool hasCLZERO() const { return HasCLZERO; }
-  bool hasCLDEMOTE() const { return HasCLDEMOTE; }
-  bool hasMOVDIRI() const { return HasMOVDIRI; }
-  bool hasMOVDIR64B() const { return HasMOVDIR64B; }
-  bool hasPTWRITE() const { return HasPTWRITE; }
-  bool isSHLDSlow() const { return IsSHLDSlow; }
-  bool isPMULLDSlow() const { return IsPMULLDSlow; }
-  bool isPMADDWDSlow() const { return IsPMADDWDSlow; }
-  bool isUnalignedMem16Slow() const { return IsUAMem16Slow; }
-  bool isUnalignedMem32Slow() const { return IsUAMem32Slow; }
-  bool hasSSEUnalignedMem() const { return HasSSEUnalignedMem; }
-  bool hasCmpxchg16b() const { return HasCmpxchg16b && is64Bit(); }
-  bool useLeaForSP() const { return UseLeaForSP; }
-  bool hasPOPCNTFalseDeps() const { return HasPOPCNTFalseDeps; }
-  bool hasLZCNTFalseDeps() const { return HasLZCNTFalseDeps; }
-  bool hasFastVariableCrossLaneShuffle() const {
-    return HasFastVariableCrossLaneShuffle;
-  }
-  bool hasFastVariablePerLaneShuffle() const {
-    return HasFastVariablePerLaneShuffle;
+    return hasSSE1() || (hasPRFCHW() && !hasThreeDNow()) || hasPREFETCHWT1() ||
+           hasPREFETCHI();
   }
-  bool insertVZEROUPPER() const { return InsertVZEROUPPER; }
-  bool hasFastGather() const { return HasFastGather; }
-  bool hasFastScalarFSQRT() const { return HasFastScalarFSQRT; }
-  bool hasFastVectorFSQRT() const { return HasFastVectorFSQRT; }
-  bool hasFastLZCNT() const { return HasFastLZCNT; }
-  bool hasFastSHLDRotate() const { return HasFastSHLDRotate; }
-  bool hasFastBEXTR() const { return HasFastBEXTR; }
-  bool hasFastHorizontalOps() const { return HasFastHorizontalOps; }
-  bool hasFastScalarShiftMasks() const { return HasFastScalarShiftMasks; }
-  bool hasFastVectorShiftMasks() const { return HasFastVectorShiftMasks; }
-  bool hasFastMOVBE() const { return HasFastMOVBE; }
-  bool hasMacroFusion() const { return HasMacroFusion; }
-  bool hasBranchFusion() const { return HasBranchFusion; }
-  bool hasERMSB() const { return HasERMSB; }
-  bool hasFSRM() const { return HasFSRM; }
-  bool hasSlowDivide32() const { return HasSlowDivide32; }
-  bool hasSlowDivide64() const { return HasSlowDivide64; }
-  bool padShortFunctions() const { return PadShortFunctions; }
-  bool slowTwoMemOps() const { return SlowTwoMemOps; }
-  bool LEAusesAG() const { return LEAUsesAG; }
-  bool slowLEA() const { return SlowLEA; }
-  bool slow3OpsLEA() const { return Slow3OpsLEA; }
-  bool slowIncDec() const { return SlowIncDec; }
-  bool hasCDI() const { return HasCDI; }
-  bool hasVPOPCNTDQ() const { return HasVPOPCNTDQ; }
-  bool hasPFI() const { return HasPFI; }
-  bool hasERI() const { return HasERI; }
-  bool hasDQI() const { return HasDQI; }
-  bool hasBWI() const { return HasBWI; }
-  bool hasVLX() const { return HasVLX; }
-  bool hasPKU() const { return HasPKU; }
-  bool hasVNNI() const { return HasVNNI; }
-  bool hasBF16() const { return HasBF16; }
-  bool hasVP2INTERSECT() const { return HasVP2INTERSECT; }
-  bool hasBITALG() const { return HasBITALG; }
-  bool hasSHSTK() const { return HasSHSTK; }
-  bool hasCLFLUSHOPT() const { return HasCLFLUSHOPT; }
-  bool hasCLWB() const { return HasCLWB; }
-  bool hasWBNOINVD() const { return HasWBNOINVD; }
-  bool hasRDPID() const { return HasRDPID; }
-  bool hasWAITPKG() const { return HasWAITPKG; }
-  bool hasPCONFIG() const { return HasPCONFIG; }
-  bool hasSGX() const { return HasSGX; }
-  bool hasINVPCID() const { return HasINVPCID; }
-  bool hasENQCMD() const { return HasENQCMD; }
-  bool hasKL() const { return HasKL; }
-  bool hasWIDEKL() const { return HasWIDEKL; }
-  bool hasHRESET() const { return HasHRESET; }
-  bool hasSERIALIZE() const { return HasSERIALIZE; }
-  bool hasTSXLDTRK() const { return HasTSXLDTRK; }
-  bool hasUINTR() const { return HasUINTR; }
-  bool useRetpolineIndirectCalls() const { return UseRetpolineIndirectCalls; }
-  bool useRetpolineIndirectBranches() const {
-    return UseRetpolineIndirectBranches;
-  }
-  bool hasAVXVNNI() const { return HasAVXVNNI; }
-  bool hasAMXTILE() const { return HasAMXTILE; }
-  bool hasAMXBF16() const { return HasAMXBF16; }
-  bool hasAMXINT8() const { return HasAMXINT8; }
-  bool useRetpolineExternalThunk() const { return UseRetpolineExternalThunk; }
-
+  bool canUseLAHFSAHF() const { return hasLAHFSAHF64() || !is64Bit(); }
   // These are generic getters that OR together all of the thunk types
   // supported by the subtarget. Therefore useIndirectThunk*() will return true
   // if any respective thunk feature is enabled.
@@ -788,14 +237,6 @@ public:
     return useRetpolineIndirectBranches() || useLVIControlFlowIntegrity();
   }
 
-  bool preferMaskRegisters() const { return PreferMaskRegisters; }
-  bool useGLMDivSqrtCosts() const { return UseGLMDivSqrtCosts; }
-  bool useLVIControlFlowIntegrity() const { return UseLVIControlFlowIntegrity; }
-  bool useLVILoadHardening() const { return UseLVILoadHardening; }
-  bool useSpeculativeExecutionSideEffectSuppression() const {
-    return UseSpeculativeExecutionSideEffectSuppression;
-  }
-
   unsigned getPreferVectorWidth() const { return PreferVectorWidth; }
   unsigned getRequiredVectorWidth() const { return RequiredVectorWidth; }
 
@@ -816,17 +257,20 @@ public:
     return hasAVX512() && (canExtendTo512DQ() || RequiredVectorWidth > 256);
   }
 
+  bool useLight256BitInstructions() const {
+    return getPreferVectorWidth() >= 256 || AllowLight256Bit;
+  }
+
   bool useBWIRegs() const {
     return hasBWI() && useAVX512Regs();
   }
 
   bool isXRaySupported() const override { return is64Bit(); }
 
-  /// TODO: to be removed later and replaced with suitable properties
-  bool isAtom() const { return X86ProcFamily == IntelAtom; }
-  bool isSLM() const { return X86ProcFamily == IntelSLM; }
-  bool useSoftFloat() const { return UseSoftFloat; }
-  bool useAA() const override { return UseAA; }
+  /// Use clflush if we have SSE2 or we're on x86-64 (even if we asked for
+  /// no-sse2). There isn't any reason to disable it if the target processor
+  /// supports it.
+  bool hasCLFLUSH() const { return hasSSE2() || is64Bit(); }
 
   /// Use mfence if we have SSE2 or we're on x86-64 (even if we asked for
   /// no-sse2). There isn't any reason to disable it if the target processor
@@ -840,7 +284,7 @@ public:
   bool isTargetOpenBSD() const { return TargetTriple.isOSOpenBSD(); }
   bool isTargetDragonFly() const { return TargetTriple.isOSDragonFly(); }
   bool isTargetSolaris() const { return TargetTriple.isOSSolaris(); }
-  bool isTargetPS4() const { return TargetTriple.isPS4CPU(); }
+  bool isTargetPS() const { return TargetTriple.isPS(); }
 
   bool isTargetELF() const { return TargetTriple.isOSBinFormatELF(); }
   bool isTargetCOFF() const { return TargetTriple.isOSBinFormatCOFF(); }
@@ -880,9 +324,9 @@ public:
 
   bool isOSWindows() const { return TargetTriple.isOSWindows(); }
 
-  bool isTargetWin64() const { return In64BitMode && isOSWindows(); }
+  bool isTargetWin64() const { return Is64Bit && isOSWindows(); }
 
-  bool isTargetWin32() const { return !In64BitMode && isOSWindows(); }
+  bool isTargetWin32() const { return !Is64Bit && isOSWindows(); }
 
   bool isPICStyleGOT() const { return PICStyle == PICStyles::Style::GOT; }
   bool isPICStyleRIPRel() const { return PICStyle == PICStyles::Style::RIPRel; }
@@ -930,7 +374,8 @@ public:
   /// Classify a global function reference for the current subtarget.
   unsigned char classifyGlobalFunctionReference(const GlobalValue *GV,
                                                 const Module &M) const;
-  unsigned char classifyGlobalFunctionReference(const GlobalValue *GV) const;
+  unsigned char
+  classifyGlobalFunctionReference(const GlobalValue *GV) const override;
 
   /// Classify a blockaddress reference for the current subtarget according to
   /// how we should reference it in a non-pcrel context.
@@ -939,6 +384,30 @@ public:
   /// Return true if the subtarget allows calls to immediate address.
   bool isLegalToCallImmediateAddr() const;
 
+  /// Return whether FrameLowering should always set the "extended frame
+  /// present" bit in FP, or set it based on a symbol in the runtime.
+  bool swiftAsyncContextIsDynamicallySet() const {
+    // Older OS versions (particularly system unwinders) are confused by the
+    // Swift extended frame, so when building code that might be run on them we
+    // must dynamically query the concurrency library to determine whether
+    // extended frames should be flagged as present.
+    const Triple &TT = getTargetTriple();
+
+    unsigned Major = TT.getOSVersion().getMajor();
+    switch(TT.getOS()) {
+    default:
+      return false;
+    case Triple::IOS:
+    case Triple::TvOS:
+      return Major < 15;
+    case Triple::WatchOS:
+      return Major < 8;
+    case Triple::MacOSX:
+    case Triple::Darwin:
+      return Major < 12;
+    }
+  }
+
   /// If we are using indirect thunks, we need to expand indirectbr to avoid it
   /// lowering to an actual indirect jump.
   bool enableIndirectBrExpand() const override {
@@ -956,8 +425,6 @@ public:
   AntiDepBreakMode getAntiDepBreakMode() const override {
     return TargetSubtargetInfo::ANTIDEP_CRITICAL;
   }
-
-  bool enableAdvancedRASplitCost() const override { return false; }
 };
 
 } // end namespace llvm
diff --git a/gnu/llvm/llvm/lib/Target/X86/X86TargetMachine.cpp b/gnu/llvm/llvm/lib/Target/X86/X86TargetMachine.cpp
index dad5ddf2606..306a53e94fd 100644
--- a/gnu/llvm/llvm/lib/Target/X86/X86TargetMachine.cpp
+++ b/gnu/llvm/llvm/lib/Target/X86/X86TargetMachine.cpp
@@ -16,38 +16,42 @@
 #include "X86.h"
 #include "X86CallLowering.h"
 #include "X86LegalizerInfo.h"
+#include "X86MachineFunctionInfo.h"
 #include "X86MacroFusion.h"
 #include "X86Subtarget.h"
 #include "X86TargetObjectFile.h"
 #include "X86TargetTransformInfo.h"
-#include "llvm/ADT/Optional.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/Triple.h"
 #include "llvm/Analysis/TargetTransformInfo.h"
 #include "llvm/CodeGen/ExecutionDomainFix.h"
+#include "llvm/CodeGen/GlobalISel/CSEInfo.h"
 #include "llvm/CodeGen/GlobalISel/CallLowering.h"
 #include "llvm/CodeGen/GlobalISel/IRTranslator.h"
 #include "llvm/CodeGen/GlobalISel/InstructionSelect.h"
+#include "llvm/CodeGen/GlobalISel/InstructionSelector.h"
 #include "llvm/CodeGen/GlobalISel/Legalizer.h"
 #include "llvm/CodeGen/GlobalISel/RegBankSelect.h"
 #include "llvm/CodeGen/MachineScheduler.h"
 #include "llvm/CodeGen/Passes.h"
+#include "llvm/CodeGen/RegAllocRegistry.h"
 #include "llvm/CodeGen/TargetPassConfig.h"
 #include "llvm/IR/Attributes.h"
 #include "llvm/IR/DataLayout.h"
 #include "llvm/IR/Function.h"
 #include "llvm/MC/MCAsmInfo.h"
+#include "llvm/MC/TargetRegistry.h"
 #include "llvm/Pass.h"
 #include "llvm/Support/CodeGen.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/ErrorHandling.h"
-#include "llvm/Support/TargetRegistry.h"
 #include "llvm/Target/TargetLoweringObjectFile.h"
 #include "llvm/Target/TargetOptions.h"
 #include "llvm/Transforms/CFGuard.h"
 #include <memory>
+#include <optional>
 #include <string>
 
 using namespace llvm;
@@ -56,6 +60,11 @@ static cl::opt<bool> EnableMachineCombinerPass("x86-machine-combiner",
                                cl::desc("Enable the machine combiner pass"),
                                cl::init(true), cl::Hidden);
 
+static cl::opt<bool>
+    EnableTileRAPass("x86-tile-ra",
+                     cl::desc("Enable the tile register allocation pass"),
+                     cl::init(true), cl::Hidden);
+
 extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeX86Target() {
   // Register the target.
   RegisterTargetMachine<X86TargetMachine> X(getTheX86_32Target());
@@ -65,6 +74,7 @@ extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeX86Target() {
   initializeX86LowerAMXIntrinsicsLegacyPassPass(PR);
   initializeX86LowerAMXTypeLegacyPassPass(PR);
   initializeX86PreAMXConfigPassPass(PR);
+  initializeX86PreTileConfigPass(PR);
   initializeGlobalISel(PR);
   initializeWinEHStatePassPass(PR);
   initializeFixupBWInstPassPass(PR);
@@ -75,7 +85,9 @@ extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeX86Target() {
   initializeX86CallFrameOptimizationPass(PR);
   initializeX86CmovConverterPassPass(PR);
   initializeX86TileConfigPass(PR);
+  initializeX86FastPreTileConfigPass(PR);
   initializeX86FastTileConfigPass(PR);
+  initializeX86KCFIPass(PR);
   initializeX86LowerTileCopyPass(PR);
   initializeX86ExpandPseudoPass(PR);
   initializeX86ExecutionDomainFixPass(PR);
@@ -90,6 +102,8 @@ extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeX86Target() {
   initializeX86OptimizeLEAPassPass(PR);
   initializeX86PartialReductionPass(PR);
   initializePseudoProbeInserterPass(PR);
+  initializeX86ReturnThunksPass(PR);
+  initializeX86DAGToDAGISelPass(PR);
 }
 
 static std::unique_ptr<TargetLoweringObjectFile> createTLOF(const Triple &TT) {
@@ -127,7 +141,7 @@ static std::string computeDataLayout(const Triple &TT) {
   // Some ABIs align long double to 128 bits, others to 32.
   if (TT.isOSNaCl() || TT.isOSIAMCU())
     ; // No f80
-  else if (TT.isArch64Bit() || TT.isOSDarwin())
+  else if (TT.isArch64Bit() || TT.isOSDarwin() || TT.isWindowsMSVCEnvironment())
     Ret += "-f80:128";
   else
     Ret += "-f80:32";
@@ -150,11 +164,10 @@ static std::string computeDataLayout(const Triple &TT) {
   return Ret;
 }
 
-static Reloc::Model getEffectiveRelocModel(const Triple &TT,
-                                           bool JIT,
-                                           Optional<Reloc::Model> RM) {
+static Reloc::Model getEffectiveRelocModel(const Triple &TT, bool JIT,
+                                           std::optional<Reloc::Model> RM) {
   bool is64Bit = TT.getArch() == Triple::x86_64;
-  if (!RM.hasValue()) {
+  if (!RM) {
     // JIT codegen should use static relocations by default, since it's
     // typically executed in process and not relocatable.
     if (JIT)
@@ -192,8 +205,9 @@ static Reloc::Model getEffectiveRelocModel(const Triple &TT,
   return *RM;
 }
 
-static CodeModel::Model getEffectiveX86CodeModel(Optional<CodeModel::Model> CM,
-                                                 bool JIT, bool Is64Bit) {
+static CodeModel::Model
+getEffectiveX86CodeModel(std::optional<CodeModel::Model> CM, bool JIT,
+                         bool Is64Bit) {
   if (CM) {
     if (*CM == CodeModel::Tiny)
       report_fatal_error("Target does not support the tiny CodeModel", false);
@@ -209,8 +223,8 @@ static CodeModel::Model getEffectiveX86CodeModel(Optional<CodeModel::Model> CM,
 X86TargetMachine::X86TargetMachine(const Target &T, const Triple &TT,
                                    StringRef CPU, StringRef FS,
                                    const TargetOptions &Options,
-                                   Optional<Reloc::Model> RM,
-                                   Optional<CodeModel::Model> CM,
+                                   std::optional<Reloc::Model> RM,
+                                   std::optional<CodeModel::Model> CM,
                                    CodeGenOpt::Level OL, bool JIT)
     : LLVMTargetMachine(
           T, computeDataLayout(TT), TT, CPU, FS, Options,
@@ -218,9 +232,9 @@ X86TargetMachine::X86TargetMachine(const Target &T, const Triple &TT,
           getEffectiveX86CodeModel(CM, JIT, TT.getArch() == Triple::x86_64),
           OL),
       TLOF(createTLOF(getTargetTriple())), IsJIT(JIT) {
-  // On PS4, the "return address" of a 'noreturn' call must still be within
+  // On PS4/PS5, the "return address" of a 'noreturn' call must still be within
   // the calling function, and TrapUnreachable is an easy way to get that.
-  if (TT.isPS4() || TT.isOSBinFormatMachO()) {
+  if (TT.isPS() || TT.isOSBinFormatMachO()) {
     this->Options.TrapUnreachable = true;
     this->Options.NoTrapAfterNoreturn = TT.isOSBinFormatMachO();
   }
@@ -243,8 +257,12 @@ X86TargetMachine::getSubtargetImpl(const Function &F) const {
 
   StringRef CPU =
       CPUAttr.isValid() ? CPUAttr.getValueAsString() : (StringRef)TargetCPU;
-  StringRef TuneCPU =
-      TuneAttr.isValid() ? TuneAttr.getValueAsString() : (StringRef)CPU;
+  // "x86-64" is a default target setting for many front ends. In these cases,
+  // they actually request for "generic" tuning unless the "tune-cpu" was
+  // specified.
+  StringRef TuneCPU = TuneAttr.isValid() ? TuneAttr.getValueAsString()
+                      : CPU == "x86-64"  ? "generic"
+                                         : (StringRef)CPU;
   StringRef FS =
       FSAttr.isValid() ? FSAttr.getValueAsString() : (StringRef)TargetFS;
 
@@ -333,7 +351,7 @@ bool X86TargetMachine::isNoopAddrSpaceCast(unsigned SrcAS,
 //===----------------------------------------------------------------------===//
 
 TargetTransformInfo
-X86TargetMachine::getTargetTransformInfo(const Function &F) {
+X86TargetMachine::getTargetTransformInfo(const Function &F) const {
   return TargetTransformInfo(X86TTIImpl(this, F));
 }
 
@@ -382,7 +400,7 @@ public:
   void addPreEmitPass() override;
   void addPreEmitPass2() override;
   void addPreSched2() override;
-  bool addPreRewrite() override;
+  bool addRegAssignAndRewriteOptimized() override;
 
   std::unique_ptr<CSEConfigBase> getCSEConfig() const override;
 };
@@ -409,6 +427,13 @@ TargetPassConfig *X86TargetMachine::createPassConfig(PassManagerBase &PM) {
   return new X86PassConfig(*this, PM);
 }
 
+MachineFunctionInfo *X86TargetMachine::createMachineFunctionInfo(
+    BumpPtrAllocator &Allocator, const Function &F,
+    const TargetSubtargetInfo *STI) const {
+  return X86MachineFunctionInfo::create<X86MachineFunctionInfo>(Allocator, F,
+                                                                STI);
+}
+
 void X86PassConfig::addIRPasses() {
   addPass(createAtomicExpandPass());
 
@@ -417,9 +442,6 @@ void X86PassConfig::addIRPasses() {
   addPass(createX86LowerAMXIntrinsicsPass());
   addPass(createX86LowerAMXTypePass());
 
-  if (TM->getOptLevel() == CodeGenOpt::None)
-    addPass(createX86PreAMXConfigPass());
-
   TargetPassConfig::addIRPasses();
 
   if (TM->getOptLevel() != CodeGenOpt::None) {
@@ -441,6 +463,9 @@ void X86PassConfig::addIRPasses() {
       addPass(createCFGuardCheckPass());
     }
   }
+
+  if (TM->Options.JMCInstrument)
+    addPass(createJMCInstrumenterPass());
 }
 
 bool X86PassConfig::addInstSelector() {
@@ -503,11 +528,12 @@ void X86PassConfig::addPreRegAlloc() {
 
   addPass(createX86SpeculativeLoadHardeningPass());
   addPass(createX86FlagsCopyLoweringPass());
-  addPass(createX86WinAllocaExpander());
+  addPass(createX86DynAllocaExpander());
 
-  if (getOptLevel() != CodeGenOpt::None) {
+  if (getOptLevel() != CodeGenOpt::None)
     addPass(createX86PreTileConfigPass());
-  }
+  else
+    addPass(createX86FastPreTileConfigPass());
 }
 
 void X86PassConfig::addMachineSSAOptimization() {
@@ -526,7 +552,10 @@ void X86PassConfig::addPostRegAlloc() {
     addPass(createX86LoadValueInjectionLoadHardeningPass());
 }
 
-void X86PassConfig::addPreSched2() { addPass(createX86ExpandPseudoPass()); }
+void X86PassConfig::addPreSched2() {
+  addPass(createX86ExpandPseudoPass());
+  addPass(createX86KCFIPass());
+}
 
 void X86PassConfig::addPreEmitPass() {
   if (getOptLevel() != CodeGenOpt::None) {
@@ -565,6 +594,7 @@ void X86PassConfig::addPreEmitPass2() {
   // hand inspection of the codegen output.
   addPass(createX86SpeculativeExecutionSideEffectSuppression());
   addPass(createX86IndirectThunksPass());
+  addPass(createX86ReturnThunksPass());
 
   // Insert extra int3 instructions after trailing call instructions to avoid
   // issues in the unwinder.
@@ -586,6 +616,22 @@ void X86PassConfig::addPreEmitPass2() {
     addPass(createEHContGuardCatchretPass());
   }
   addPass(createX86LoadValueInjectionRetHardeningPass());
+
+  // Insert pseudo probe annotation for callsite profiling
+  addPass(createPseudoProbeInserter());
+
+  // KCFI indirect call checks are lowered to a bundle, and on Darwin platforms,
+  // also CALL_RVMARKER.
+  addPass(createUnpackMachineBundles([&TT](const MachineFunction &MF) {
+    // Only run bundle expansion if the module uses kcfi, or there are relevant
+    // ObjC runtime functions present in the module.
+    const Function &F = MF.getFunction();
+    const Module *M = F.getParent();
+    return M->getModuleFlag("kcfi") ||
+           (TT.isOSDarwin() &&
+            (M->getFunction("objc_retainAutoreleasedReturnValue") ||
+             M->getFunction("objc_unsafeClaimAutoreleasedReturnValue")));
+  }));
 }
 
 bool X86PassConfig::addPostFastRegAllocRewrite() {
@@ -593,11 +639,21 @@ bool X86PassConfig::addPostFastRegAllocRewrite() {
   return true;
 }
 
-bool X86PassConfig::addPreRewrite() {
-  addPass(createX86TileConfigPass());
-  return true;
-}
-
 std::unique_ptr<CSEConfigBase> X86PassConfig::getCSEConfig() const {
   return getStandardCSEConfigForOpt(TM->getOptLevel());
 }
+
+static bool onlyAllocateTileRegisters(const TargetRegisterInfo &TRI,
+                                      const TargetRegisterClass &RC) {
+  return static_cast<const X86RegisterInfo &>(TRI).isTileRegisterClass(&RC);
+}
+
+bool X86PassConfig::addRegAssignAndRewriteOptimized() {
+  // Don't support tile RA when RA is specified by command line "-regalloc".
+  if (!isCustomizedRegAlloc() && EnableTileRAPass) {
+    // Allocate tile register first.
+    addPass(createGreedyRegisterAllocator(onlyAllocateTileRegisters));
+    addPass(createX86TileConfigPass());
+  }
+  return TargetPassConfig::addRegAssignAndRewriteOptimized();
+}
diff --git a/gnu/llvm/llvm/lib/Target/X86/X86WinAllocaExpander.cpp b/gnu/llvm/llvm/lib/Target/X86/X86WinAllocaExpander.cpp
deleted file mode 100644
index 9ada0a8dd41..00000000000
--- a/gnu/llvm/llvm/lib/Target/X86/X86WinAllocaExpander.cpp
+++ /dev/null
@@ -1,302 +0,0 @@
-//===----- X86WinAllocaExpander.cpp - Expand WinAlloca pseudo instruction -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines a pass that expands WinAlloca pseudo-instructions.
-//
-// It performs a conservative analysis to determine whether each allocation
-// falls within a region of the stack that is safe to use, or whether stack
-// probes must be emitted.
-//
-//===----------------------------------------------------------------------===//
-
-#include "X86.h"
-#include "X86InstrBuilder.h"
-#include "X86InstrInfo.h"
-#include "X86MachineFunctionInfo.h"
-#include "X86Subtarget.h"
-#include "llvm/ADT/MapVector.h"
-#include "llvm/ADT/PostOrderIterator.h"
-#include "llvm/CodeGen/MachineFunctionPass.h"
-#include "llvm/CodeGen/MachineInstrBuilder.h"
-#include "llvm/CodeGen/MachineRegisterInfo.h"
-#include "llvm/CodeGen/Passes.h"
-#include "llvm/CodeGen/TargetInstrInfo.h"
-#include "llvm/IR/Function.h"
-#include "llvm/Support/raw_ostream.h"
-
-using namespace llvm;
-
-namespace {
-
-class X86WinAllocaExpander : public MachineFunctionPass {
-public:
-  X86WinAllocaExpander() : MachineFunctionPass(ID) {}
-
-  bool runOnMachineFunction(MachineFunction &MF) override;
-
-private:
-  /// Strategies for lowering a WinAlloca.
-  enum Lowering { TouchAndSub, Sub, Probe };
-
-  /// Deterministic-order map from WinAlloca instruction to desired lowering.
-  typedef MapVector<MachineInstr*, Lowering> LoweringMap;
-
-  /// Compute which lowering to use for each WinAlloca instruction.
-  void computeLowerings(MachineFunction &MF, LoweringMap& Lowerings);
-
-  /// Get the appropriate lowering based on current offset and amount.
-  Lowering getLowering(int64_t CurrentOffset, int64_t AllocaAmount);
-
-  /// Lower a WinAlloca instruction.
-  void lower(MachineInstr* MI, Lowering L);
-
-  MachineRegisterInfo *MRI = nullptr;
-  const X86Subtarget *STI = nullptr;
-  const TargetInstrInfo *TII = nullptr;
-  const X86RegisterInfo *TRI = nullptr;
-  unsigned StackPtr = 0;
-  unsigned SlotSize = 0;
-  int64_t StackProbeSize = 0;
-  bool NoStackArgProbe = false;
-
-  StringRef getPassName() const override { return "X86 WinAlloca Expander"; }
-  static char ID;
-};
-
-char X86WinAllocaExpander::ID = 0;
-
-} // end anonymous namespace
-
-FunctionPass *llvm::createX86WinAllocaExpander() {
-  return new X86WinAllocaExpander();
-}
-
-/// Return the allocation amount for a WinAlloca instruction, or -1 if unknown.
-static int64_t getWinAllocaAmount(MachineInstr *MI, MachineRegisterInfo *MRI) {
-  assert(MI->getOpcode() == X86::WIN_ALLOCA_32 ||
-         MI->getOpcode() == X86::WIN_ALLOCA_64);
-  assert(MI->getOperand(0).isReg());
-
-  Register AmountReg = MI->getOperand(0).getReg();
-  MachineInstr *Def = MRI->getUniqueVRegDef(AmountReg);
-
-  if (!Def ||
-      (Def->getOpcode() != X86::MOV32ri && Def->getOpcode() != X86::MOV64ri) ||
-      !Def->getOperand(1).isImm())
-    return -1;
-
-  return Def->getOperand(1).getImm();
-}
-
-X86WinAllocaExpander::Lowering
-X86WinAllocaExpander::getLowering(int64_t CurrentOffset,
-                                  int64_t AllocaAmount) {
-  // For a non-constant amount or a large amount, we have to probe.
-  if (AllocaAmount < 0 || AllocaAmount > StackProbeSize)
-    return Probe;
-
-  // If it fits within the safe region of the stack, just subtract.
-  if (CurrentOffset + AllocaAmount <= StackProbeSize)
-    return Sub;
-
-  // Otherwise, touch the current tip of the stack, then subtract.
-  return TouchAndSub;
-}
-
-static bool isPushPop(const MachineInstr &MI) {
-  switch (MI.getOpcode()) {
-  case X86::PUSH32i8:
-  case X86::PUSH32r:
-  case X86::PUSH32rmm:
-  case X86::PUSH32rmr:
-  case X86::PUSHi32:
-  case X86::PUSH64i8:
-  case X86::PUSH64r:
-  case X86::PUSH64rmm:
-  case X86::PUSH64rmr:
-  case X86::PUSH64i32:
-  case X86::POP32r:
-  case X86::POP64r:
-    return true;
-  default:
-    return false;
-  }
-}
-
-void X86WinAllocaExpander::computeLowerings(MachineFunction &MF,
-                                            LoweringMap &Lowerings) {
-  // Do a one-pass reverse post-order walk of the CFG to conservatively estimate
-  // the offset between the stack pointer and the lowest touched part of the
-  // stack, and use that to decide how to lower each WinAlloca instruction.
-
-  // Initialize OutOffset[B], the stack offset at exit from B, to something big.
-  DenseMap<MachineBasicBlock *, int64_t> OutOffset;
-  for (MachineBasicBlock &MBB : MF)
-    OutOffset[&MBB] = INT32_MAX;
-
-  // Note: we don't know the offset at the start of the entry block since the
-  // prologue hasn't been inserted yet, and how much that will adjust the stack
-  // pointer depends on register spills, which have not been computed yet.
-
-  // Compute the reverse post-order.
-  ReversePostOrderTraversal<MachineFunction*> RPO(&MF);
-
-  for (MachineBasicBlock *MBB : RPO) {
-    int64_t Offset = -1;
-    for (MachineBasicBlock *Pred : MBB->predecessors())
-      Offset = std::max(Offset, OutOffset[Pred]);
-    if (Offset == -1) Offset = INT32_MAX;
-
-    for (MachineInstr &MI : *MBB) {
-      if (MI.getOpcode() == X86::WIN_ALLOCA_32 ||
-          MI.getOpcode() == X86::WIN_ALLOCA_64) {
-        // A WinAlloca moves StackPtr, and potentially touches it.
-        int64_t Amount = getWinAllocaAmount(&MI, MRI);
-        Lowering L = getLowering(Offset, Amount);
-        Lowerings[&MI] = L;
-        switch (L) {
-        case Sub:
-          Offset += Amount;
-          break;
-        case TouchAndSub:
-          Offset = Amount;
-          break;
-        case Probe:
-          Offset = 0;
-          break;
-        }
-      } else if (MI.isCall() || isPushPop(MI)) {
-        // Calls, pushes and pops touch the tip of the stack.
-        Offset = 0;
-      } else if (MI.getOpcode() == X86::ADJCALLSTACKUP32 ||
-                 MI.getOpcode() == X86::ADJCALLSTACKUP64) {
-        Offset -= MI.getOperand(0).getImm();
-      } else if (MI.getOpcode() == X86::ADJCALLSTACKDOWN32 ||
-                 MI.getOpcode() == X86::ADJCALLSTACKDOWN64) {
-        Offset += MI.getOperand(0).getImm();
-      } else if (MI.modifiesRegister(StackPtr, TRI)) {
-        // Any other modification of SP means we've lost track of it.
-        Offset = INT32_MAX;
-      }
-    }
-
-    OutOffset[MBB] = Offset;
-  }
-}
-
-static unsigned getSubOpcode(bool Is64Bit, int64_t Amount) {
-  if (Is64Bit)
-    return isInt<8>(Amount) ? X86::SUB64ri8 : X86::SUB64ri32;
-  return isInt<8>(Amount) ? X86::SUB32ri8 : X86::SUB32ri;
-}
-
-void X86WinAllocaExpander::lower(MachineInstr* MI, Lowering L) {
-  const DebugLoc &DL = MI->getDebugLoc();
-  MachineBasicBlock *MBB = MI->getParent();
-  MachineBasicBlock::iterator I = *MI;
-
-  int64_t Amount = getWinAllocaAmount(MI, MRI);
-  if (Amount == 0) {
-    MI->eraseFromParent();
-    return;
-  }
-
-  // These two variables differ on x32, which is a 64-bit target with a
-  // 32-bit alloca.
-  bool Is64Bit = STI->is64Bit();
-  bool Is64BitAlloca = MI->getOpcode() == X86::WIN_ALLOCA_64;
-  assert(SlotSize == 4 || SlotSize == 8);
-
-  switch (L) {
-  case TouchAndSub: {
-    assert(Amount >= SlotSize);
-
-    // Use a push to touch the top of the stack.
-    unsigned RegA = Is64Bit ? X86::RAX : X86::EAX;
-    BuildMI(*MBB, I, DL, TII->get(Is64Bit ? X86::PUSH64r : X86::PUSH32r))
-        .addReg(RegA, RegState::Undef);
-    Amount -= SlotSize;
-    if (!Amount)
-      break;
-
-    // Fall through to make any remaining adjustment.
-    LLVM_FALLTHROUGH;
-  }
-  case Sub:
-    assert(Amount > 0);
-    if (Amount == SlotSize) {
-      // Use push to save size.
-      unsigned RegA = Is64Bit ? X86::RAX : X86::EAX;
-      BuildMI(*MBB, I, DL, TII->get(Is64Bit ? X86::PUSH64r : X86::PUSH32r))
-          .addReg(RegA, RegState::Undef);
-    } else {
-      // Sub.
-      BuildMI(*MBB, I, DL,
-              TII->get(getSubOpcode(Is64BitAlloca, Amount)), StackPtr)
-          .addReg(StackPtr)
-          .addImm(Amount);
-    }
-    break;
-  case Probe:
-    if (!NoStackArgProbe) {
-      // The probe lowering expects the amount in RAX/EAX.
-      unsigned RegA = Is64BitAlloca ? X86::RAX : X86::EAX;
-      BuildMI(*MBB, MI, DL, TII->get(TargetOpcode::COPY), RegA)
-          .addReg(MI->getOperand(0).getReg());
-
-      // Do the probe.
-      STI->getFrameLowering()->emitStackProbe(*MBB->getParent(), *MBB, MI, DL,
-                                              /*InProlog=*/false);
-    } else {
-      // Sub
-      BuildMI(*MBB, I, DL,
-              TII->get(Is64BitAlloca ? X86::SUB64rr : X86::SUB32rr), StackPtr)
-          .addReg(StackPtr)
-          .addReg(MI->getOperand(0).getReg());
-    }
-    break;
-  }
-
-  Register AmountReg = MI->getOperand(0).getReg();
-  MI->eraseFromParent();
-
-  // Delete the definition of AmountReg.
-  if (MRI->use_empty(AmountReg))
-    if (MachineInstr *AmountDef = MRI->getUniqueVRegDef(AmountReg))
-      AmountDef->eraseFromParent();
-}
-
-bool X86WinAllocaExpander::runOnMachineFunction(MachineFunction &MF) {
-  if (!MF.getInfo<X86MachineFunctionInfo>()->hasWinAlloca())
-    return false;
-
-  MRI = &MF.getRegInfo();
-  STI = &MF.getSubtarget<X86Subtarget>();
-  TII = STI->getInstrInfo();
-  TRI = STI->getRegisterInfo();
-  StackPtr = TRI->getStackRegister();
-  SlotSize = TRI->getSlotSize();
-
-  StackProbeSize = 4096;
-  if (MF.getFunction().hasFnAttribute("stack-probe-size")) {
-    MF.getFunction()
-        .getFnAttribute("stack-probe-size")
-        .getValueAsString()
-        .getAsInteger(0, StackProbeSize);
-  }
-  NoStackArgProbe = MF.getFunction().hasFnAttribute("no-stack-arg-probe");
-  if (NoStackArgProbe)
-    StackProbeSize = INT64_MAX;
-
-  LoweringMap Lowerings;
-  computeLowerings(MF, Lowerings);
-  for (auto &P : Lowerings)
-    lower(P.first, P.second);
-
-  return true;
-}
diff --git a/gnu/llvm/llvm/lib/Testing/Support/Annotations.cpp b/gnu/llvm/llvm/lib/Testing/Support/Annotations.cpp
deleted file mode 100644
index 44d3acccfdb..00000000000
--- a/gnu/llvm/llvm/lib/Testing/Support/Annotations.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-//===--- Annotations.cpp - Annotated source code for unit tests --*- C++-*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Testing/Support/Annotations.h"
-
-#include "llvm/ADT/StringExtras.h"
-#include "llvm/Support/FormatVariadic.h"
-#include "llvm/Support/raw_ostream.h"
-
-using namespace llvm;
-
-// Crash if the assertion fails, printing the message and testcase.
-// More elegant error handling isn't needed for unit tests.
-static void require(bool Assertion, const char *Msg, llvm::StringRef Code) {
-  if (!Assertion) {
-    llvm::errs() << "Annotated testcase: " << Msg << "\n" << Code << "\n";
-    llvm_unreachable("Annotated testcase assertion failed!");
-  }
-}
-
-Annotations::Annotations(llvm::StringRef Text) {
-  auto Require = [Text](bool Assertion, const char *Msg) {
-    require(Assertion, Msg, Text);
-  };
-  llvm::Optional<llvm::StringRef> Name;
-  llvm::SmallVector<std::pair<llvm::StringRef, size_t>, 8> OpenRanges;
-
-  Code.reserve(Text.size());
-  while (!Text.empty()) {
-    if (Text.consume_front("^")) {
-      Points[Name.getValueOr("")].push_back(Code.size());
-      Name = llvm::None;
-      continue;
-    }
-    if (Text.consume_front("[[")) {
-      OpenRanges.emplace_back(Name.getValueOr(""), Code.size());
-      Name = llvm::None;
-      continue;
-    }
-    Require(!Name, "$name should be followed by ^ or [[");
-    if (Text.consume_front("]]")) {
-      Require(!OpenRanges.empty(), "unmatched ]]");
-      Range R;
-      R.Begin = OpenRanges.back().second;
-      R.End = Code.size();
-      Ranges[OpenRanges.back().first].push_back(R);
-      OpenRanges.pop_back();
-      continue;
-    }
-    if (Text.consume_front("$")) {
-      Name =
-          Text.take_while([](char C) { return llvm::isAlnum(C) || C == '_'; });
-      Text = Text.drop_front(Name->size());
-      continue;
-    }
-    Code.push_back(Text.front());
-    Text = Text.drop_front();
-  }
-  Require(!Name, "unterminated $name");
-  Require(OpenRanges.empty(), "unmatched [[");
-}
-
-size_t Annotations::point(llvm::StringRef Name) const {
-  auto I = Points.find(Name);
-  require(I != Points.end() && I->getValue().size() == 1,
-          "expected exactly one point", Code);
-  return I->getValue()[0];
-}
-
-std::vector<size_t> Annotations::points(llvm::StringRef Name) const {
-  auto I = Points.find(Name);
-  if (I == Points.end())
-    return {};
-  return {I->getValue().begin(), I->getValue().end()};
-}
-
-Annotations::Range Annotations::range(llvm::StringRef Name) const {
-  auto I = Ranges.find(Name);
-  require(I != Ranges.end() && I->getValue().size() == 1,
-          "expected exactly one range", Code);
-  return I->getValue()[0];
-}
-
-std::vector<Annotations::Range>
-Annotations::ranges(llvm::StringRef Name) const {
-  auto I = Ranges.find(Name);
-  if (I == Ranges.end())
-    return {};
-  return {I->getValue().begin(), I->getValue().end()};
-}
-
-llvm::raw_ostream &llvm::operator<<(llvm::raw_ostream &O,
-                                    const llvm::Annotations::Range &R) {
-  return O << llvm::formatv("[{0}, {1})", R.Begin, R.End);
-}
diff --git a/gnu/llvm/llvm/lib/Transforms/IPO/PruneEH.cpp b/gnu/llvm/llvm/lib/Transforms/IPO/PruneEH.cpp
deleted file mode 100644
index 39de19ca9e9..00000000000
--- a/gnu/llvm/llvm/lib/Transforms/IPO/PruneEH.cpp
+++ /dev/null
@@ -1,264 +0,0 @@
-//===- PruneEH.cpp - Pass which deletes unused exception handlers ---------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements a simple interprocedural pass which walks the
-// call-graph, turning invoke instructions into calls, iff the callee cannot
-// throw an exception, and marking functions 'nounwind' if they cannot throw.
-// It implements this as a bottom-up traversal of the call-graph.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/SetVector.h"
-#include "llvm/ADT/SmallPtrSet.h"
-#include "llvm/ADT/Statistic.h"
-#include "llvm/Analysis/CallGraph.h"
-#include "llvm/Analysis/CallGraphSCCPass.h"
-#include "llvm/Analysis/EHPersonalities.h"
-#include "llvm/IR/CFG.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/InlineAsm.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/InitializePasses.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/Transforms/IPO.h"
-#include "llvm/Transforms/Utils/CallGraphUpdater.h"
-#include "llvm/Transforms/Utils/Local.h"
-#include <algorithm>
-
-using namespace llvm;
-
-#define DEBUG_TYPE "prune-eh"
-
-STATISTIC(NumRemoved, "Number of invokes removed");
-STATISTIC(NumUnreach, "Number of noreturn calls optimized");
-
-namespace {
-  struct PruneEH : public CallGraphSCCPass {
-    static char ID; // Pass identification, replacement for typeid
-    PruneEH() : CallGraphSCCPass(ID) {
-      initializePruneEHPass(*PassRegistry::getPassRegistry());
-    }
-
-    // runOnSCC - Analyze the SCC, performing the transformation if possible.
-    bool runOnSCC(CallGraphSCC &SCC) override;
-  };
-}
-static bool SimplifyFunction(Function *F, CallGraphUpdater &CGU);
-static void DeleteBasicBlock(BasicBlock *BB, CallGraphUpdater &CGU);
-
-char PruneEH::ID = 0;
-INITIALIZE_PASS_BEGIN(PruneEH, "prune-eh",
-                "Remove unused exception handling info", false, false)
-INITIALIZE_PASS_DEPENDENCY(CallGraphWrapperPass)
-INITIALIZE_PASS_END(PruneEH, "prune-eh",
-                "Remove unused exception handling info", false, false)
-
-Pass *llvm::createPruneEHPass() { return new PruneEH(); }
-
-static bool runImpl(CallGraphUpdater &CGU, SetVector<Function *> &Functions) {
-#ifndef NDEBUG
-  for (auto *F : Functions)
-    assert(F && "null Function");
-#endif
-  bool MadeChange = false;
-
-  // First pass, scan all of the functions in the SCC, simplifying them
-  // according to what we know.
-  for (Function *F : Functions)
-    MadeChange |= SimplifyFunction(F, CGU);
-
-  // Next, check to see if any callees might throw or if there are any external
-  // functions in this SCC: if so, we cannot prune any functions in this SCC.
-  // Definitions that are weak and not declared non-throwing might be
-  // overridden at linktime with something that throws, so assume that.
-  // If this SCC includes the unwind instruction, we KNOW it throws, so
-  // obviously the SCC might throw.
-  //
-  bool SCCMightUnwind = false, SCCMightReturn = false;
-  for (Function *F : Functions) {
-    if (!F->hasExactDefinition()) {
-      SCCMightUnwind |= !F->doesNotThrow();
-      SCCMightReturn |= !F->doesNotReturn();
-    } else {
-      bool CheckUnwind = !SCCMightUnwind && !F->doesNotThrow();
-      bool CheckReturn = !SCCMightReturn && !F->doesNotReturn();
-      // Determine if we should scan for InlineAsm in a naked function as it
-      // is the only way to return without a ReturnInst.  Only do this for
-      // no-inline functions as functions which may be inlined cannot
-      // meaningfully return via assembly.
-      bool CheckReturnViaAsm = CheckReturn &&
-                               F->hasFnAttribute(Attribute::Naked) &&
-                               F->hasFnAttribute(Attribute::NoInline);
-
-      if (!CheckUnwind && !CheckReturn)
-        continue;
-
-      for (const BasicBlock &BB : *F) {
-        const Instruction *TI = BB.getTerminator();
-        if (CheckUnwind && TI->mayThrow()) {
-          SCCMightUnwind = true;
-        } else if (CheckReturn && isa<ReturnInst>(TI)) {
-          SCCMightReturn = true;
-        }
-
-        for (const Instruction &I : BB) {
-          if ((!CheckUnwind || SCCMightUnwind) &&
-              (!CheckReturnViaAsm || SCCMightReturn))
-            break;
-
-          // Check to see if this function performs an unwind or calls an
-          // unwinding function.
-          if (CheckUnwind && !SCCMightUnwind && I.mayThrow()) {
-            bool InstMightUnwind = true;
-            if (const auto *CI = dyn_cast<CallInst>(&I)) {
-              if (Function *Callee = CI->getCalledFunction()) {
-                // If the callee is outside our current SCC then we may throw
-                // because it might.  If it is inside, do nothing.
-                if (Functions.contains(Callee))
-                  InstMightUnwind = false;
-              }
-            }
-            SCCMightUnwind |= InstMightUnwind;
-          }
-          if (CheckReturnViaAsm && !SCCMightReturn)
-            if (const auto *CB = dyn_cast<CallBase>(&I))
-              if (const auto *IA = dyn_cast<InlineAsm>(CB->getCalledOperand()))
-                if (IA->hasSideEffects())
-                  SCCMightReturn = true;
-        }
-      }
-        if (SCCMightUnwind && SCCMightReturn)
-          break;
-    }
-  }
-
-  // If the SCC doesn't unwind or doesn't throw, note this fact.
-  if (!SCCMightUnwind || !SCCMightReturn)
-    for (Function *F : Functions) {
-      if (!SCCMightUnwind && !F->hasFnAttribute(Attribute::NoUnwind)) {
-        F->addFnAttr(Attribute::NoUnwind);
-        MadeChange = true;
-      }
-
-      if (!SCCMightReturn && !F->hasFnAttribute(Attribute::NoReturn)) {
-        F->addFnAttr(Attribute::NoReturn);
-        MadeChange = true;
-      }
-    }
-
-  for (Function *F : Functions) {
-    // Convert any invoke instructions to non-throwing functions in this node
-    // into call instructions with a branch.  This makes the exception blocks
-    // dead.
-    MadeChange |= SimplifyFunction(F, CGU);
-  }
-
-  return MadeChange;
-}
-
-bool PruneEH::runOnSCC(CallGraphSCC &SCC) {
-  if (skipSCC(SCC))
-    return false;
-  SetVector<Function *> Functions;
-  for (auto &N : SCC) {
-    if (auto *F = N->getFunction())
-      Functions.insert(F);
-  }
-  CallGraph &CG = getAnalysis<CallGraphWrapperPass>().getCallGraph();
-  CallGraphUpdater CGU;
-  CGU.initialize(CG, SCC);
-  return runImpl(CGU, Functions);
-}
-
-
-// SimplifyFunction - Given information about callees, simplify the specified
-// function if we have invokes to non-unwinding functions or code after calls to
-// no-return functions.
-static bool SimplifyFunction(Function *F, CallGraphUpdater &CGU) {
-  bool MadeChange = false;
-  for (Function::iterator BB = F->begin(), E = F->end(); BB != E; ++BB) {
-    if (InvokeInst *II = dyn_cast<InvokeInst>(BB->getTerminator()))
-      if (II->doesNotThrow() && canSimplifyInvokeNoUnwind(F)) {
-        BasicBlock *UnwindBlock = II->getUnwindDest();
-        removeUnwindEdge(&*BB);
-
-        // If the unwind block is now dead, nuke it.
-        if (pred_empty(UnwindBlock))
-          DeleteBasicBlock(UnwindBlock, CGU); // Delete the new BB.
-
-        ++NumRemoved;
-        MadeChange = true;
-      }
-
-    for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E; )
-      if (CallInst *CI = dyn_cast<CallInst>(I++))
-        if (CI->doesNotReturn() && !CI->isMustTailCall() &&
-            !isa<UnreachableInst>(I)) {
-          // This call calls a function that cannot return.  Insert an
-          // unreachable instruction after it and simplify the code.  Do this
-          // by splitting the BB, adding the unreachable, then deleting the
-          // new BB.
-          BasicBlock *New = BB->splitBasicBlock(I);
-
-          // Remove the uncond branch and add an unreachable.
-          BB->getInstList().pop_back();
-          new UnreachableInst(BB->getContext(), &*BB);
-
-          DeleteBasicBlock(New, CGU); // Delete the new BB.
-          MadeChange = true;
-          ++NumUnreach;
-          break;
-        }
-  }
-
-  return MadeChange;
-}
-
-/// DeleteBasicBlock - remove the specified basic block from the program,
-/// updating the callgraph to reflect any now-obsolete edges due to calls that
-/// exist in the BB.
-static void DeleteBasicBlock(BasicBlock *BB, CallGraphUpdater &CGU) {
-  assert(pred_empty(BB) && "BB is not dead!");
-
-  Instruction *TokenInst = nullptr;
-
-  for (BasicBlock::iterator I = BB->end(), E = BB->begin(); I != E; ) {
-    --I;
-
-    if (I->getType()->isTokenTy()) {
-      TokenInst = &*I;
-      break;
-    }
-
-    if (auto *Call = dyn_cast<CallBase>(&*I)) {
-      const Function *Callee = Call->getCalledFunction();
-      if (!Callee || !Intrinsic::isLeaf(Callee->getIntrinsicID()))
-        CGU.removeCallSite(*Call);
-      else if (!Callee->isIntrinsic())
-        CGU.removeCallSite(*Call);
-    }
-
-    if (!I->use_empty())
-      I->replaceAllUsesWith(UndefValue::get(I->getType()));
-  }
-
-  if (TokenInst) {
-    if (!TokenInst->isTerminator())
-      changeToUnreachable(TokenInst->getNextNode());
-  } else {
-    // Get the list of successors of this block.
-    std::vector<BasicBlock *> Succs(succ_begin(BB), succ_end(BB));
-
-    for (unsigned i = 0, e = Succs.size(); i != e; ++i)
-      Succs[i]->removePredecessor(BB);
-
-    BB->eraseFromParent();
-  }
-}
diff --git a/gnu/llvm/llvm/lib/Transforms/Instrumentation/MaximumSpanningTree.h b/gnu/llvm/llvm/lib/Transforms/Instrumentation/MaximumSpanningTree.h
deleted file mode 100644
index 892a6a26da9..00000000000
--- a/gnu/llvm/llvm/lib/Transforms/Instrumentation/MaximumSpanningTree.h
+++ /dev/null
@@ -1,109 +0,0 @@
-//===- llvm/Analysis/MaximumSpanningTree.h - Interface ----------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This module provides means for calculating a maximum spanning tree for a
-// given set of weighted edges. The type parameter T is the type of a node.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_LIB_TRANSFORMS_INSTRUMENTATION_MAXIMUMSPANNINGTREE_H
-#define LLVM_LIB_TRANSFORMS_INSTRUMENTATION_MAXIMUMSPANNINGTREE_H
-
-#include "llvm/ADT/EquivalenceClasses.h"
-#include "llvm/IR/BasicBlock.h"
-#include <algorithm>
-#include <vector>
-
-namespace llvm {
-
-  /// MaximumSpanningTree - A MST implementation.
-  /// The type parameter T determines the type of the nodes of the graph.
-  template <typename T>
-  class MaximumSpanningTree {
-  public:
-    typedef std::pair<const T*, const T*> Edge;
-    typedef std::pair<Edge, double> EdgeWeight;
-    typedef std::vector<EdgeWeight> EdgeWeights;
-  protected:
-    typedef std::vector<Edge> MaxSpanTree;
-
-    MaxSpanTree MST;
-
-  private:
-    // A comparing class for comparing weighted edges.
-    struct EdgeWeightCompare {
-      static bool getBlockSize(const T *X) {
-        const BasicBlock *BB = dyn_cast_or_null<BasicBlock>(X);
-        return BB ? BB->size() : 0;
-      }
-
-      bool operator()(EdgeWeight X, EdgeWeight Y) const {
-        if (X.second > Y.second) return true;
-        if (X.second < Y.second) return false;
-
-        // Equal edge weights: break ties by comparing block sizes.
-        size_t XSizeA = getBlockSize(X.first.first);
-        size_t YSizeA = getBlockSize(Y.first.first);
-        if (XSizeA > YSizeA) return true;
-        if (XSizeA < YSizeA) return false;
-
-        size_t XSizeB = getBlockSize(X.first.second);
-        size_t YSizeB = getBlockSize(Y.first.second);
-        if (XSizeB > YSizeB) return true;
-        if (XSizeB < YSizeB) return false;
-
-        return false;
-      }
-    };
-
-  public:
-    static char ID; // Class identification, replacement for typeinfo
-
-    /// MaximumSpanningTree() - Takes a vector of weighted edges and returns a
-    /// spanning tree.
-    MaximumSpanningTree(EdgeWeights &EdgeVector) {
-      llvm::stable_sort(EdgeVector, EdgeWeightCompare());
-
-      // Create spanning tree, Forest contains a special data structure
-      // that makes checking if two nodes are already in a common (sub-)tree
-      // fast and cheap.
-      EquivalenceClasses<const T*> Forest;
-      for (typename EdgeWeights::iterator EWi = EdgeVector.begin(),
-           EWe = EdgeVector.end(); EWi != EWe; ++EWi) {
-        Edge e = (*EWi).first;
-
-        Forest.insert(e.first);
-        Forest.insert(e.second);
-      }
-
-      // Iterate over the sorted edges, biggest first.
-      for (typename EdgeWeights::iterator EWi = EdgeVector.begin(),
-           EWe = EdgeVector.end(); EWi != EWe; ++EWi) {
-        Edge e = (*EWi).first;
-
-        if (Forest.findLeader(e.first) != Forest.findLeader(e.second)) {
-          Forest.unionSets(e.first, e.second);
-          // So we know now that the edge is not already in a subtree, so we push
-          // the edge to the MST.
-          MST.push_back(e);
-        }
-      }
-    }
-
-    typename MaxSpanTree::iterator begin() {
-      return MST.begin();
-    }
-
-    typename MaxSpanTree::iterator end() {
-      return MST.end();
-    }
-  };
-
-} // End llvm namespace
-
-#endif // LLVM_LIB_TRANSFORMS_INSTRUMENTATION_MAXIMUMSPANNINGTREE_H
diff --git a/gnu/llvm/llvm/lib/Transforms/Scalar/LoopIdiomRecognize.cpp b/gnu/llvm/llvm/lib/Transforms/Scalar/LoopIdiomRecognize.cpp
index c748de8ad38..bf2d5511e34 100644
--- a/gnu/llvm/llvm/lib/Transforms/Scalar/LoopIdiomRecognize.cpp
+++ b/gnu/llvm/llvm/lib/Transforms/Scalar/LoopIdiomRecognize.cpp
@@ -61,7 +61,6 @@
 #include "llvm/Analysis/TargetLibraryInfo.h"
 #include "llvm/Analysis/TargetTransformInfo.h"
 #include "llvm/Analysis/ValueTracking.h"
-#include "llvm/IR/Attributes.h"
 #include "llvm/IR/BasicBlock.h"
 #include "llvm/IR/Constant.h"
 #include "llvm/IR/Constants.h"
@@ -217,15 +216,15 @@ private:
   bool processLoopMemCpy(MemCpyInst *MCI, const SCEV *BECount);
   bool processLoopMemSet(MemSetInst *MSI, const SCEV *BECount);
 
-  bool processLoopStridedStore(Value *DestPtr, unsigned StoreSize,
+  bool processLoopStridedStore(Value *DestPtr, const SCEV *StoreSizeSCEV,
                                MaybeAlign StoreAlignment, Value *StoredVal,
                                Instruction *TheStore,
                                SmallPtrSetImpl<Instruction *> &Stores,
                                const SCEVAddRecExpr *Ev, const SCEV *BECount,
-                               bool NegStride, bool IsLoopMemset = false);
+                               bool IsNegStride, bool IsLoopMemset = false);
   bool processLoopStoreOfLoopLoad(StoreInst *SI, const SCEV *BECount);
   bool processLoopStoreOfLoopLoad(Value *DestPtr, Value *SourcePtr,
-                                  unsigned StoreSize, MaybeAlign StoreAlign,
+                                  const SCEV *StoreSize, MaybeAlign StoreAlign,
                                   MaybeAlign LoadAlign, Instruction *TheStore,
                                   Instruction *TheLoad,
                                   const SCEVAddRecExpr *StoreEv,
@@ -346,7 +345,7 @@ INITIALIZE_PASS_END(LoopIdiomRecognizeLegacyPass, "loop-idiom",
 Pass *llvm::createLoopIdiomPass() { return new LoopIdiomRecognizeLegacyPass(); }
 
 static void deleteDeadInstruction(Instruction *I) {
-  I->replaceAllUsesWith(UndefValue::get(I->getType()));
+  I->replaceAllUsesWith(PoisonValue::get(I->getType()));
   I->eraseFromParent();
 }
 
@@ -444,7 +443,7 @@ static Constant *getMemSetPatternValue(Value *V, const DataLayout *DL) {
   // array.  We could theoretically do a store to an alloca or something, but
   // that doesn't seem worthwhile.
   Constant *C = dyn_cast<Constant>(V);
-  if (!C)
+  if (!C || isa<ConstantExpr>(C))
     return nullptr;
 
   // Only handle simple values that are a power of two bytes in size.
@@ -499,8 +498,8 @@ LoopIdiomRecognize::isLegalStore(StoreInst *SI) {
   // When storing out scalable vectors we bail out for now, since the code
   // below currently only works for constant strides.
   TypeSize SizeInBits = DL->getTypeSizeInBits(StoredVal->getType());
-  if (SizeInBits.isScalable() || (SizeInBits.getFixedSize() & 7) ||
-      (SizeInBits.getFixedSize() >> 32) != 0)
+  if (SizeInBits.isScalable() || (SizeInBits.getFixedValue() & 7) ||
+      (SizeInBits.getFixedValue() >> 32) != 0)
     return LegalStoreKind::None;
 
   // See if the pointer expression is an AddRec like {base,+,1} on the current
@@ -627,8 +626,8 @@ bool LoopIdiomRecognize::runOnLoopBlock(
   // We can only promote stores in this block if they are unconditionally
   // executed in the loop.  For a block to be unconditionally executed, it has
   // to dominate all the exit blocks of the loop.  Verify this now.
-  for (unsigned i = 0, e = ExitBlocks.size(); i != e; ++i)
-    if (!DT->dominates(BB, ExitBlocks[i]))
+  for (BasicBlock *ExitBlock : ExitBlocks)
+    if (!DT->dominates(BB, ExitBlock))
       return false;
 
   bool MadeChange = false;
@@ -752,16 +751,13 @@ bool LoopIdiomRecognize::processLoopStores(SmallVectorImpl<StoreInst *> &SL,
   bool Changed = false;
 
   // For stores that start but don't end a link in the chain:
-  for (SetVector<StoreInst *>::iterator it = Heads.begin(), e = Heads.end();
-       it != e; ++it) {
-    if (Tails.count(*it))
+  for (StoreInst *I : Heads) {
+    if (Tails.count(I))
       continue;
 
     // We found a store instr that starts a chain. Now follow the chain and try
     // to transform it.
     SmallPtrSet<Instruction *, 8> AdjacentStores;
-    StoreInst *I = *it;
-
     StoreInst *HeadStore = I;
     unsigned StoreSize = 0;
 
@@ -786,12 +782,14 @@ bool LoopIdiomRecognize::processLoopStores(SmallVectorImpl<StoreInst *> &SL,
     if (StoreSize != Stride && StoreSize != -Stride)
       continue;
 
-    bool NegStride = StoreSize == -Stride;
+    bool IsNegStride = StoreSize == -Stride;
 
-    if (processLoopStridedStore(StorePtr, StoreSize,
-                                MaybeAlign(HeadStore->getAlignment()),
-                                StoredVal, HeadStore, AdjacentStores, StoreEv,
-                                BECount, NegStride)) {
+    Type *IntIdxTy = DL->getIndexType(StorePtr->getType());
+    const SCEV *StoreSizeSCEV = SE->getConstant(IntIdxTy, StoreSize);
+    if (processLoopStridedStore(StorePtr, StoreSizeSCEV,
+                                MaybeAlign(HeadStore->getAlign()), StoredVal,
+                                HeadStore, AdjacentStores, StoreEv, BECount,
+                                IsNegStride)) {
       TransformedStores.insert(AdjacentStores.begin(), AdjacentStores.end());
       Changed = true;
     }
@@ -801,7 +799,7 @@ bool LoopIdiomRecognize::processLoopStores(SmallVectorImpl<StoreInst *> &SL,
 }
 
 /// processLoopMemIntrinsic - Template function for calling different processor
-/// functions based on mem instrinsic type.
+/// functions based on mem intrinsic type.
 template <typename MemInst>
 bool LoopIdiomRecognize::processLoopMemIntrinsic(
     BasicBlock *BB,
@@ -859,15 +857,15 @@ bool LoopIdiomRecognize::processLoopMemCpy(MemCpyInst *MCI,
 
   // Check if the stride matches the size of the memcpy. If so, then we know
   // that every byte is touched in the loop.
-  const SCEVConstant *StoreStride =
+  const SCEVConstant *ConstStoreStride =
       dyn_cast<SCEVConstant>(StoreEv->getOperand(1));
-  const SCEVConstant *LoadStride =
+  const SCEVConstant *ConstLoadStride =
       dyn_cast<SCEVConstant>(LoadEv->getOperand(1));
-  if (!StoreStride || !LoadStride)
+  if (!ConstStoreStride || !ConstLoadStride)
     return false;
 
-  APInt StoreStrideValue = StoreStride->getAPInt();
-  APInt LoadStrideValue = LoadStride->getAPInt();
+  APInt StoreStrideValue = ConstStoreStride->getAPInt();
+  APInt LoadStrideValue = ConstLoadStride->getAPInt();
   // Huge stride value - give up
   if (StoreStrideValue.getBitWidth() > 64 || LoadStrideValue.getBitWidth() > 64)
     return false;
@@ -877,7 +875,7 @@ bool LoopIdiomRecognize::processLoopMemCpy(MemCpyInst *MCI,
       return OptimizationRemarkMissed(DEBUG_TYPE, "SizeStrideUnequal", MCI)
              << ore::NV("Inst", "memcpy") << " in "
              << ore::NV("Function", MCI->getFunction())
-             << " function will not be hoised: "
+             << " function will not be hoisted: "
              << ore::NV("Reason", "memcpy size is not equal to stride");
     });
     return false;
@@ -889,16 +887,17 @@ bool LoopIdiomRecognize::processLoopMemCpy(MemCpyInst *MCI,
   if (StoreStrideInt != LoadStrideInt)
     return false;
 
-  return processLoopStoreOfLoopLoad(Dest, Source, (unsigned)SizeInBytes,
-                                    MCI->getDestAlign(), MCI->getSourceAlign(),
-                                    MCI, MCI, StoreEv, LoadEv, BECount);
+  return processLoopStoreOfLoopLoad(
+      Dest, Source, SE->getConstant(Dest->getType(), SizeInBytes),
+      MCI->getDestAlign(), MCI->getSourceAlign(), MCI, MCI, StoreEv, LoadEv,
+      BECount);
 }
 
 /// processLoopMemSet - See if this memset can be promoted to a large memset.
 bool LoopIdiomRecognize::processLoopMemSet(MemSetInst *MSI,
                                            const SCEV *BECount) {
-  // We can only handle non-volatile memsets with a constant size.
-  if (MSI->isVolatile() || !isa<ConstantInt>(MSI->getLength()))
+  // We can only handle non-volatile memsets.
+  if (MSI->isVolatile())
     return false;
 
   // If we're not allowed to hack on memset, we fail.
@@ -911,23 +910,82 @@ bool LoopIdiomRecognize::processLoopMemSet(MemSetInst *MSI,
   // loop, which indicates a strided store.  If we have something else, it's a
   // random store we can't handle.
   const SCEVAddRecExpr *Ev = dyn_cast<SCEVAddRecExpr>(SE->getSCEV(Pointer));
-  if (!Ev || Ev->getLoop() != CurLoop || !Ev->isAffine())
+  if (!Ev || Ev->getLoop() != CurLoop)
     return false;
-
-  // Reject memsets that are so large that they overflow an unsigned.
-  uint64_t SizeInBytes = cast<ConstantInt>(MSI->getLength())->getZExtValue();
-  if ((SizeInBytes >> 32) != 0)
+  if (!Ev->isAffine()) {
+    LLVM_DEBUG(dbgs() << "  Pointer is not affine, abort\n");
     return false;
+  }
 
-  // Check to see if the stride matches the size of the memset.  If so, then we
-  // know that every byte is touched in the loop.
-  const SCEVConstant *ConstStride = dyn_cast<SCEVConstant>(Ev->getOperand(1));
-  if (!ConstStride)
+  const SCEV *PointerStrideSCEV = Ev->getOperand(1);
+  const SCEV *MemsetSizeSCEV = SE->getSCEV(MSI->getLength());
+  if (!PointerStrideSCEV || !MemsetSizeSCEV)
     return false;
 
-  APInt Stride = ConstStride->getAPInt();
-  if (SizeInBytes != Stride && SizeInBytes != -Stride)
-    return false;
+  bool IsNegStride = false;
+  const bool IsConstantSize = isa<ConstantInt>(MSI->getLength());
+
+  if (IsConstantSize) {
+    // Memset size is constant.
+    // Check if the pointer stride matches the memset size. If so, then
+    // we know that every byte is touched in the loop.
+    LLVM_DEBUG(dbgs() << "  memset size is constant\n");
+    uint64_t SizeInBytes = cast<ConstantInt>(MSI->getLength())->getZExtValue();
+    const SCEVConstant *ConstStride = dyn_cast<SCEVConstant>(Ev->getOperand(1));
+    if (!ConstStride)
+      return false;
+
+    APInt Stride = ConstStride->getAPInt();
+    if (SizeInBytes != Stride && SizeInBytes != -Stride)
+      return false;
+
+    IsNegStride = SizeInBytes == -Stride;
+  } else {
+    // Memset size is non-constant.
+    // Check if the pointer stride matches the memset size.
+    // To be conservative, the pass would not promote pointers that aren't in
+    // address space zero. Also, the pass only handles memset length and stride
+    // that are invariant for the top level loop.
+    LLVM_DEBUG(dbgs() << "  memset size is non-constant\n");
+    if (Pointer->getType()->getPointerAddressSpace() != 0) {
+      LLVM_DEBUG(dbgs() << "  pointer is not in address space zero, "
+                        << "abort\n");
+      return false;
+    }
+    if (!SE->isLoopInvariant(MemsetSizeSCEV, CurLoop)) {
+      LLVM_DEBUG(dbgs() << "  memset size is not a loop-invariant, "
+                        << "abort\n");
+      return false;
+    }
+
+    // Compare positive direction PointerStrideSCEV with MemsetSizeSCEV
+    IsNegStride = PointerStrideSCEV->isNonConstantNegative();
+    const SCEV *PositiveStrideSCEV =
+        IsNegStride ? SE->getNegativeSCEV(PointerStrideSCEV)
+                    : PointerStrideSCEV;
+    LLVM_DEBUG(dbgs() << "  MemsetSizeSCEV: " << *MemsetSizeSCEV << "\n"
+                      << "  PositiveStrideSCEV: " << *PositiveStrideSCEV
+                      << "\n");
+
+    if (PositiveStrideSCEV != MemsetSizeSCEV) {
+      // If an expression is covered by the loop guard, compare again and
+      // proceed with optimization if equal.
+      const SCEV *FoldedPositiveStride =
+          SE->applyLoopGuards(PositiveStrideSCEV, CurLoop);
+      const SCEV *FoldedMemsetSize =
+          SE->applyLoopGuards(MemsetSizeSCEV, CurLoop);
+
+      LLVM_DEBUG(dbgs() << "  Try to fold SCEV based on loop guard\n"
+                        << "    FoldedMemsetSize: " << *FoldedMemsetSize << "\n"
+                        << "    FoldedPositiveStride: " << *FoldedPositiveStride
+                        << "\n");
+
+      if (FoldedPositiveStride != FoldedMemsetSize) {
+        LLVM_DEBUG(dbgs() << "  SCEV don't match, abort\n");
+        return false;
+      }
+    }
+  }
 
   // Verify that the memset value is loop invariant.  If not, we can't promote
   // the memset.
@@ -937,10 +995,9 @@ bool LoopIdiomRecognize::processLoopMemSet(MemSetInst *MSI,
 
   SmallPtrSet<Instruction *, 1> MSIs;
   MSIs.insert(MSI);
-  bool NegStride = SizeInBytes == -Stride;
-  return processLoopStridedStore(
-      Pointer, (unsigned)SizeInBytes, MaybeAlign(MSI->getDestAlignment()),
-      SplatValue, MSI, MSIs, Ev, BECount, NegStride, /*IsLoopMemset=*/true);
+  return processLoopStridedStore(Pointer, SE->getSCEV(MSI->getLength()),
+                                 MSI->getDestAlign(), SplatValue, MSI, MSIs, Ev,
+                                 BECount, IsNegStride, /*IsLoopMemset=*/true);
 }
 
 /// mayLoopAccessLocation - Return true if the specified loop might access the
@@ -948,9 +1005,9 @@ bool LoopIdiomRecognize::processLoopMemSet(MemSetInst *MSI,
 /// argument specifies what the verboten forms of access are (read or write).
 static bool
 mayLoopAccessLocation(Value *Ptr, ModRefInfo Access, Loop *L,
-                      const SCEV *BECount, unsigned StoreSize,
+                      const SCEV *BECount, const SCEV *StoreSizeSCEV,
                       AliasAnalysis &AA,
-                      SmallPtrSetImpl<Instruction *> &IgnoredStores) {
+                      SmallPtrSetImpl<Instruction *> &IgnoredInsts) {
   // Get the location that may be stored across the loop.  Since the access is
   // strided positively through memory, we say that the modified location starts
   // at the pointer and has infinite size.
@@ -958,9 +1015,11 @@ mayLoopAccessLocation(Value *Ptr, ModRefInfo Access, Loop *L,
 
   // If the loop iterates a fixed number of times, we can refine the access size
   // to be exactly the size of the memset, which is (BECount+1)*StoreSize
-  if (const SCEVConstant *BECst = dyn_cast<SCEVConstant>(BECount))
+  const SCEVConstant *BECst = dyn_cast<SCEVConstant>(BECount);
+  const SCEVConstant *ConstSize = dyn_cast<SCEVConstant>(StoreSizeSCEV);
+  if (BECst && ConstSize)
     AccessSize = LocationSize::precise((BECst->getValue()->getZExtValue() + 1) *
-                                       StoreSize);
+                                       ConstSize->getValue()->getZExtValue());
 
   // TODO: For this to be really effective, we have to dive into the pointer
   // operand in the store.  Store to &A[i] of 100 will always return may alias
@@ -968,14 +1027,11 @@ mayLoopAccessLocation(Value *Ptr, ModRefInfo Access, Loop *L,
   // which will then no-alias a store to &A[100].
   MemoryLocation StoreLoc(Ptr, AccessSize);
 
-  for (Loop::block_iterator BI = L->block_begin(), E = L->block_end(); BI != E;
-       ++BI)
-    for (Instruction &I : **BI)
-      if (IgnoredStores.count(&I) == 0 &&
-          isModOrRefSet(
-              intersectModRef(AA.getModRefInfo(&I, StoreLoc), Access)))
+  for (BasicBlock *B : L->blocks())
+    for (Instruction &I : *B)
+      if (!IgnoredInsts.contains(&I) &&
+          isModOrRefSet(AA.getModRefInfo(&I, StoreLoc) & Access))
         return true;
-
   return false;
 }
 
@@ -983,57 +1039,68 @@ mayLoopAccessLocation(Value *Ptr, ModRefInfo Access, Loop *L,
 // we're trying to memset.  Therefore, we need to recompute the base pointer,
 // which is just Start - BECount*Size.
 static const SCEV *getStartForNegStride(const SCEV *Start, const SCEV *BECount,
-                                        Type *IntPtr, unsigned StoreSize,
+                                        Type *IntPtr, const SCEV *StoreSizeSCEV,
                                         ScalarEvolution *SE) {
   const SCEV *Index = SE->getTruncateOrZeroExtend(BECount, IntPtr);
-  if (StoreSize != 1)
-    Index = SE->getMulExpr(Index, SE->getConstant(IntPtr, StoreSize),
+  if (!StoreSizeSCEV->isOne()) {
+    // index = back edge count * store size
+    Index = SE->getMulExpr(Index,
+                           SE->getTruncateOrZeroExtend(StoreSizeSCEV, IntPtr),
                            SCEV::FlagNUW);
+  }
+  // base pointer = start - index * store size
   return SE->getMinusSCEV(Start, Index);
 }
 
-/// Compute the number of bytes as a SCEV from the backedge taken count.
-///
-/// This also maps the SCEV into the provided type and tries to handle the
-/// computation in a way that will fold cleanly.
-static const SCEV *getNumBytes(const SCEV *BECount, Type *IntPtr,
-                               unsigned StoreSize, Loop *CurLoop,
-                               const DataLayout *DL, ScalarEvolution *SE) {
-  const SCEV *NumBytesS;
-  // The # stored bytes is (BECount+1)*Size.  Expand the trip count out to
+/// Compute trip count from the backedge taken count.
+static const SCEV *getTripCount(const SCEV *BECount, Type *IntPtr,
+                                Loop *CurLoop, const DataLayout *DL,
+                                ScalarEvolution *SE) {
+  const SCEV *TripCountS = nullptr;
+  // The # stored bytes is (BECount+1).  Expand the trip count out to
   // pointer size if it isn't already.
   //
   // If we're going to need to zero extend the BE count, check if we can add
   // one to it prior to zero extending without overflow. Provided this is safe,
   // it allows better simplification of the +1.
-  if (DL->getTypeSizeInBits(BECount->getType()).getFixedSize() <
-          DL->getTypeSizeInBits(IntPtr).getFixedSize() &&
+  if (DL->getTypeSizeInBits(BECount->getType()) <
+          DL->getTypeSizeInBits(IntPtr) &&
       SE->isLoopEntryGuardedByCond(
           CurLoop, ICmpInst::ICMP_NE, BECount,
           SE->getNegativeSCEV(SE->getOne(BECount->getType())))) {
-    NumBytesS = SE->getZeroExtendExpr(
+    TripCountS = SE->getZeroExtendExpr(
         SE->getAddExpr(BECount, SE->getOne(BECount->getType()), SCEV::FlagNUW),
         IntPtr);
   } else {
-    NumBytesS = SE->getAddExpr(SE->getTruncateOrZeroExtend(BECount, IntPtr),
-                               SE->getOne(IntPtr), SCEV::FlagNUW);
+    TripCountS = SE->getAddExpr(SE->getTruncateOrZeroExtend(BECount, IntPtr),
+                                SE->getOne(IntPtr), SCEV::FlagNUW);
   }
 
-  // And scale it based on the store size.
-  if (StoreSize != 1) {
-    NumBytesS = SE->getMulExpr(NumBytesS, SE->getConstant(IntPtr, StoreSize),
-                               SCEV::FlagNUW);
-  }
-  return NumBytesS;
+  return TripCountS;
+}
+
+/// Compute the number of bytes as a SCEV from the backedge taken count.
+///
+/// This also maps the SCEV into the provided type and tries to handle the
+/// computation in a way that will fold cleanly.
+static const SCEV *getNumBytes(const SCEV *BECount, Type *IntPtr,
+                               const SCEV *StoreSizeSCEV, Loop *CurLoop,
+                               const DataLayout *DL, ScalarEvolution *SE) {
+  const SCEV *TripCountSCEV = getTripCount(BECount, IntPtr, CurLoop, DL, SE);
+
+  return SE->getMulExpr(TripCountSCEV,
+                        SE->getTruncateOrZeroExtend(StoreSizeSCEV, IntPtr),
+                        SCEV::FlagNUW);
 }
 
 /// processLoopStridedStore - We see a strided store of some value.  If we can
 /// transform this into a memset or memset_pattern in the loop preheader, do so.
 bool LoopIdiomRecognize::processLoopStridedStore(
-    Value *DestPtr, unsigned StoreSize, MaybeAlign StoreAlignment,
+    Value *DestPtr, const SCEV *StoreSizeSCEV, MaybeAlign StoreAlignment,
     Value *StoredVal, Instruction *TheStore,
     SmallPtrSetImpl<Instruction *> &Stores, const SCEVAddRecExpr *Ev,
-    const SCEV *BECount, bool NegStride, bool IsLoopMemset) {
+    const SCEV *BECount, bool IsNegStride, bool IsLoopMemset) {
+  Module *M = TheStore->getModule();
   Value *SplatValue = isBytewiseValue(StoredVal, *DL);
   Constant *PatternValue = nullptr;
 
@@ -1050,7 +1117,7 @@ bool LoopIdiomRecognize::processLoopStridedStore(
   BasicBlock *Preheader = CurLoop->getLoopPreheader();
   IRBuilder<> Builder(Preheader->getTerminator());
   SCEVExpander Expander(*SE, *DL, "loop-idiom");
-  SCEVExpanderCleaner ExpCleaner(Expander, *DT);
+  SCEVExpanderCleaner ExpCleaner(Expander);
 
   Type *DestInt8PtrTy = Builder.getInt8PtrTy(DestAS);
   Type *IntIdxTy = DL->getIndexType(DestPtr->getType());
@@ -1058,12 +1125,12 @@ bool LoopIdiomRecognize::processLoopStridedStore(
   bool Changed = false;
   const SCEV *Start = Ev->getStart();
   // Handle negative strided loops.
-  if (NegStride)
-    Start = getStartForNegStride(Start, BECount, IntIdxTy, StoreSize, SE);
+  if (IsNegStride)
+    Start = getStartForNegStride(Start, BECount, IntIdxTy, StoreSizeSCEV, SE);
 
   // TODO: ideally we should still be able to generate memset if SCEV expander
   // is taught to generate the dependencies at the latest point.
-  if (!isSafeToExpand(Start, *SE))
+  if (!Expander.isSafeToExpand(Start))
     return Changed;
 
   // Okay, we have a strided store "p[i]" of a splattable value.  We can turn
@@ -1084,7 +1151,7 @@ bool LoopIdiomRecognize::processLoopStridedStore(
   Changed = true;
 
   if (mayLoopAccessLocation(BasePtr, ModRefInfo::ModRef, CurLoop, BECount,
-                            StoreSize, *AA, Stores))
+                            StoreSizeSCEV, *AA, Stores))
     return Changed;
 
   if (avoidLIRForMultiBlockLoop(/*IsMemset=*/true, IsLoopMemset))
@@ -1093,11 +1160,11 @@ bool LoopIdiomRecognize::processLoopStridedStore(
   // Okay, everything looks good, insert the memset.
 
   const SCEV *NumBytesS =
-      getNumBytes(BECount, IntIdxTy, StoreSize, CurLoop, DL, SE);
+      getNumBytes(BECount, IntIdxTy, StoreSizeSCEV, CurLoop, DL, SE);
 
   // TODO: ideally we should still be able to generate memset if SCEV expander
   // is taught to generate the dependencies at the latest point.
-  if (!isSafeToExpand(NumBytesS, *SE))
+  if (!Expander.isSafeToExpand(NumBytesS))
     return Changed;
 
   Value *NumBytes =
@@ -1105,17 +1172,25 @@ bool LoopIdiomRecognize::processLoopStridedStore(
 
   CallInst *NewCall;
   if (SplatValue) {
-    NewCall = Builder.CreateMemSet(BasePtr, SplatValue, NumBytes,
-                                   MaybeAlign(StoreAlignment));
-  } else {
+    AAMDNodes AATags = TheStore->getAAMetadata();
+    for (Instruction *Store : Stores)
+      AATags = AATags.merge(Store->getAAMetadata());
+    if (auto CI = dyn_cast<ConstantInt>(NumBytes))
+      AATags = AATags.extendTo(CI->getZExtValue());
+    else
+      AATags = AATags.extendTo(-1);
+
+    NewCall = Builder.CreateMemSet(
+        BasePtr, SplatValue, NumBytes, MaybeAlign(StoreAlignment),
+        /*isVolatile=*/false, AATags.TBAA, AATags.Scope, AATags.NoAlias);
+  } else if (isLibFuncEmittable(M, TLI, LibFunc_memset_pattern16)) {
     // Everything is emitted in default address space
     Type *Int8PtrTy = DestInt8PtrTy;
 
-    Module *M = TheStore->getModule();
     StringRef FuncName = "memset_pattern16";
-    FunctionCallee MSP = M->getOrInsertFunction(FuncName, Builder.getVoidTy(),
-                                                Int8PtrTy, Int8PtrTy, IntIdxTy);
-    inferLibFuncAttributes(M, FuncName, *TLI);
+    FunctionCallee MSP = getOrInsertLibFunc(M, *TLI, LibFunc_memset_pattern16,
+                            Builder.getVoidTy(), Int8PtrTy, Int8PtrTy, IntIdxTy);
+    inferNonMandatoryLibFuncAttrs(M, FuncName, *TLI);
 
     // Otherwise we should form a memset_pattern16.  PatternValue is known to be
     // an constant array of 16-bytes.  Plop the value into a mergable global.
@@ -1126,7 +1201,9 @@ bool LoopIdiomRecognize::processLoopStridedStore(
     GV->setAlignment(Align(16));
     Value *PatternPtr = ConstantExpr::getBitCast(GV, Int8PtrTy);
     NewCall = Builder.CreateCall(MSP, {BasePtr, PatternPtr, NumBytes});
-  }
+  } else
+    return Changed;
+
   NewCall->setDebugLoc(TheStore->getDebugLoc());
 
   if (MSSAU) {
@@ -1140,13 +1217,20 @@ bool LoopIdiomRecognize::processLoopStridedStore(
                     << "\n");
 
   ORE.emit([&]() {
-    return OptimizationRemark(DEBUG_TYPE, "ProcessLoopStridedStore",
-                              NewCall->getDebugLoc(), Preheader)
-           << "Transformed loop-strided store in "
-           << ore::NV("Function", TheStore->getFunction())
-           << " function into a call to "
-           << ore::NV("NewFunction", NewCall->getCalledFunction())
-           << "() intrinsic";
+    OptimizationRemark R(DEBUG_TYPE, "ProcessLoopStridedStore",
+                         NewCall->getDebugLoc(), Preheader);
+    R << "Transformed loop-strided store in "
+      << ore::NV("Function", TheStore->getFunction())
+      << " function into a call to "
+      << ore::NV("NewFunction", NewCall->getCalledFunction())
+      << "() intrinsic";
+    if (!Stores.empty())
+      R << ore::setExtraArgs();
+    for (auto *I : Stores) {
+      R << ore::NV("FromBlock", I->getParent()->getName())
+        << ore::NV("ToBlock", Preheader->getName());
+    }
+    return R;
   });
 
   // Okay, the memset has been formed.  Zap the original store and anything that
@@ -1183,16 +1267,64 @@ bool LoopIdiomRecognize::processLoopStoreOfLoopLoad(StoreInst *SI,
   // random load we can't handle.
   Value *LoadPtr = LI->getPointerOperand();
   const SCEVAddRecExpr *LoadEv = cast<SCEVAddRecExpr>(SE->getSCEV(LoadPtr));
-  return processLoopStoreOfLoopLoad(StorePtr, LoadPtr, StoreSize,
+
+  const SCEV *StoreSizeSCEV = SE->getConstant(StorePtr->getType(), StoreSize);
+  return processLoopStoreOfLoopLoad(StorePtr, LoadPtr, StoreSizeSCEV,
                                     SI->getAlign(), LI->getAlign(), SI, LI,
                                     StoreEv, LoadEv, BECount);
 }
 
+namespace {
+class MemmoveVerifier {
+public:
+  explicit MemmoveVerifier(const Value &LoadBasePtr, const Value &StoreBasePtr,
+                           const DataLayout &DL)
+      : DL(DL), BP1(llvm::GetPointerBaseWithConstantOffset(
+                    LoadBasePtr.stripPointerCasts(), LoadOff, DL)),
+        BP2(llvm::GetPointerBaseWithConstantOffset(
+            StoreBasePtr.stripPointerCasts(), StoreOff, DL)),
+        IsSameObject(BP1 == BP2) {}
+
+  bool loadAndStoreMayFormMemmove(unsigned StoreSize, bool IsNegStride,
+                                  const Instruction &TheLoad,
+                                  bool IsMemCpy) const {
+    if (IsMemCpy) {
+      // Ensure that LoadBasePtr is after StoreBasePtr or before StoreBasePtr
+      // for negative stride.
+      if ((!IsNegStride && LoadOff <= StoreOff) ||
+          (IsNegStride && LoadOff >= StoreOff))
+        return false;
+    } else {
+      // Ensure that LoadBasePtr is after StoreBasePtr or before StoreBasePtr
+      // for negative stride. LoadBasePtr shouldn't overlap with StoreBasePtr.
+      int64_t LoadSize =
+          DL.getTypeSizeInBits(TheLoad.getType()).getFixedValue() / 8;
+      if (BP1 != BP2 || LoadSize != int64_t(StoreSize))
+        return false;
+      if ((!IsNegStride && LoadOff < StoreOff + int64_t(StoreSize)) ||
+          (IsNegStride && LoadOff + LoadSize > StoreOff))
+        return false;
+    }
+    return true;
+  }
+
+private:
+  const DataLayout &DL;
+  int64_t LoadOff = 0;
+  int64_t StoreOff = 0;
+  const Value *BP1;
+  const Value *BP2;
+
+public:
+  const bool IsSameObject;
+};
+} // namespace
+
 bool LoopIdiomRecognize::processLoopStoreOfLoopLoad(
-    Value *DestPtr, Value *SourcePtr, unsigned StoreSize, MaybeAlign StoreAlign,
-    MaybeAlign LoadAlign, Instruction *TheStore, Instruction *TheLoad,
-    const SCEVAddRecExpr *StoreEv, const SCEVAddRecExpr *LoadEv,
-    const SCEV *BECount) {
+    Value *DestPtr, Value *SourcePtr, const SCEV *StoreSizeSCEV,
+    MaybeAlign StoreAlign, MaybeAlign LoadAlign, Instruction *TheStore,
+    Instruction *TheLoad, const SCEVAddRecExpr *StoreEv,
+    const SCEVAddRecExpr *LoadEv, const SCEV *BECount) {
 
   // FIXME: until llvm.memcpy.inline supports dynamic sizes, we need to
   // conservatively bail here, since otherwise we may have to transform
@@ -1207,7 +1339,7 @@ bool LoopIdiomRecognize::processLoopStoreOfLoopLoad(
   IRBuilder<> Builder(Preheader->getTerminator());
   SCEVExpander Expander(*SE, *DL, "loop-idiom");
 
-  SCEVExpanderCleaner ExpCleaner(Expander, *DT);
+  SCEVExpanderCleaner ExpCleaner(Expander);
 
   bool Changed = false;
   const SCEV *StrStart = StoreEv->getStart();
@@ -1215,11 +1347,18 @@ bool LoopIdiomRecognize::processLoopStoreOfLoopLoad(
   Type *IntIdxTy = Builder.getIntNTy(DL->getIndexSizeInBits(StrAS));
 
   APInt Stride = getStoreStride(StoreEv);
-  bool NegStride = StoreSize == -Stride;
+  const SCEVConstant *ConstStoreSize = dyn_cast<SCEVConstant>(StoreSizeSCEV);
+
+  // TODO: Deal with non-constant size; Currently expect constant store size
+  assert(ConstStoreSize && "store size is expected to be a constant");
+
+  int64_t StoreSize = ConstStoreSize->getValue()->getZExtValue();
+  bool IsNegStride = StoreSize == -Stride;
 
   // Handle negative strided loops.
-  if (NegStride)
-    StrStart = getStartForNegStride(StrStart, BECount, IntIdxTy, StoreSize, SE);
+  if (IsNegStride)
+    StrStart =
+        getStartForNegStride(StrStart, BECount, IntIdxTy, StoreSizeSCEV, SE);
 
   // Okay, we have a strided store "p[i]" of a loaded value.  We can turn
   // this into a memcpy in the loop preheader now if we want.  However, this
@@ -1239,24 +1378,24 @@ bool LoopIdiomRecognize::processLoopStoreOfLoopLoad(
   // the return value will read this comment, and leave them alone.
   Changed = true;
 
-  SmallPtrSet<Instruction *, 2> Stores;
-  Stores.insert(TheStore);
+  SmallPtrSet<Instruction *, 2> IgnoredInsts;
+  IgnoredInsts.insert(TheStore);
 
   bool IsMemCpy = isa<MemCpyInst>(TheStore);
   const StringRef InstRemark = IsMemCpy ? "memcpy" : "load and store";
 
-  bool UseMemMove =
+  bool LoopAccessStore =
       mayLoopAccessLocation(StoreBasePtr, ModRefInfo::ModRef, CurLoop, BECount,
-                            StoreSize, *AA, Stores);
-  if (UseMemMove) {
+                            StoreSizeSCEV, *AA, IgnoredInsts);
+  if (LoopAccessStore) {
     // For memmove case it's not enough to guarantee that loop doesn't access
     // TheStore and TheLoad. Additionally we need to make sure that TheStore is
     // the only user of TheLoad.
     if (!TheLoad->hasOneUse())
       return Changed;
-    Stores.insert(TheLoad);
+    IgnoredInsts.insert(TheLoad);
     if (mayLoopAccessLocation(StoreBasePtr, ModRefInfo::ModRef, CurLoop,
-                              BECount, StoreSize, *AA, Stores)) {
+                              BECount, StoreSizeSCEV, *AA, IgnoredInsts)) {
       ORE.emit([&]() {
         return OptimizationRemarkMissed(DEBUG_TYPE, "LoopMayAccessStore",
                                         TheStore)
@@ -1267,15 +1406,16 @@ bool LoopIdiomRecognize::processLoopStoreOfLoopLoad(
       });
       return Changed;
     }
-    Stores.erase(TheLoad);
+    IgnoredInsts.erase(TheLoad);
   }
 
   const SCEV *LdStart = LoadEv->getStart();
   unsigned LdAS = SourcePtr->getType()->getPointerAddressSpace();
 
   // Handle negative strided loops.
-  if (NegStride)
-    LdStart = getStartForNegStride(LdStart, BECount, IntIdxTy, StoreSize, SE);
+  if (IsNegStride)
+    LdStart =
+        getStartForNegStride(LdStart, BECount, IntIdxTy, StoreSizeSCEV, SE);
 
   // For a memcpy, we have to make sure that the input array is not being
   // mutated by the loop.
@@ -1284,10 +1424,11 @@ bool LoopIdiomRecognize::processLoopStoreOfLoopLoad(
 
   // If the store is a memcpy instruction, we must check if it will write to
   // the load memory locations. So remove it from the ignored stores.
-  if (IsMemCpy)
-    Stores.erase(TheStore);
+  MemmoveVerifier Verifier(*LoadBasePtr, *StoreBasePtr, *DL);
+  if (IsMemCpy && !Verifier.IsSameObject)
+    IgnoredInsts.erase(TheStore);
   if (mayLoopAccessLocation(LoadBasePtr, ModRefInfo::Mod, CurLoop, BECount,
-                            StoreSize, *AA, Stores)) {
+                            StoreSizeSCEV, *AA, IgnoredInsts)) {
     ORE.emit([&]() {
       return OptimizationRemarkMissed(DEBUG_TYPE, "LoopMayAccessLoad", TheLoad)
              << ore::NV("Inst", InstRemark) << " in "
@@ -1297,22 +1438,12 @@ bool LoopIdiomRecognize::processLoopStoreOfLoopLoad(
     });
     return Changed;
   }
-  if (UseMemMove) {
-    // Ensure that LoadBasePtr is after StoreBasePtr or before StoreBasePtr for
-    // negative stride. LoadBasePtr shouldn't overlap with StoreBasePtr.
-    int64_t LoadOff = 0, StoreOff = 0;
-    const Value *BP1 = llvm::GetPointerBaseWithConstantOffset(
-        LoadBasePtr->stripPointerCasts(), LoadOff, *DL);
-    const Value *BP2 = llvm::GetPointerBaseWithConstantOffset(
-        StoreBasePtr->stripPointerCasts(), StoreOff, *DL);
-    int64_t LoadSize =
-        DL->getTypeSizeInBits(TheLoad->getType()).getFixedSize() / 8;
-    if (BP1 != BP2 || LoadSize != int64_t(StoreSize))
-      return Changed;
-    if ((!NegStride && LoadOff < StoreOff + int64_t(StoreSize)) ||
-        (NegStride && LoadOff + LoadSize > StoreOff))
+
+  bool UseMemMove = IsMemCpy ? Verifier.IsSameObject : LoopAccessStore;
+  if (UseMemMove)
+    if (!Verifier.loadAndStoreMayFormMemmove(StoreSize, IsNegStride, *TheLoad,
+                                             IsMemCpy))
       return Changed;
-  }
 
   if (avoidLIRForMultiBlockLoop())
     return Changed;
@@ -1320,31 +1451,42 @@ bool LoopIdiomRecognize::processLoopStoreOfLoopLoad(
   // Okay, everything is safe, we can transform this!
 
   const SCEV *NumBytesS =
-      getNumBytes(BECount, IntIdxTy, StoreSize, CurLoop, DL, SE);
+      getNumBytes(BECount, IntIdxTy, StoreSizeSCEV, CurLoop, DL, SE);
 
   Value *NumBytes =
       Expander.expandCodeFor(NumBytesS, IntIdxTy, Preheader->getTerminator());
 
+  AAMDNodes AATags = TheLoad->getAAMetadata();
+  AAMDNodes StoreAATags = TheStore->getAAMetadata();
+  AATags = AATags.merge(StoreAATags);
+  if (auto CI = dyn_cast<ConstantInt>(NumBytes))
+    AATags = AATags.extendTo(CI->getZExtValue());
+  else
+    AATags = AATags.extendTo(-1);
+
   CallInst *NewCall = nullptr;
   // Check whether to generate an unordered atomic memcpy:
   //  If the load or store are atomic, then they must necessarily be unordered
   //  by previous checks.
   if (!TheStore->isAtomic() && !TheLoad->isAtomic()) {
     if (UseMemMove)
-      NewCall = Builder.CreateMemMove(StoreBasePtr, StoreAlign, LoadBasePtr,
-                                      LoadAlign, NumBytes);
+      NewCall = Builder.CreateMemMove(
+          StoreBasePtr, StoreAlign, LoadBasePtr, LoadAlign, NumBytes,
+          /*isVolatile=*/false, AATags.TBAA, AATags.Scope, AATags.NoAlias);
     else
-      NewCall = Builder.CreateMemCpy(StoreBasePtr, StoreAlign, LoadBasePtr,
-                                     LoadAlign, NumBytes);
+      NewCall =
+          Builder.CreateMemCpy(StoreBasePtr, StoreAlign, LoadBasePtr, LoadAlign,
+                               NumBytes, /*isVolatile=*/false, AATags.TBAA,
+                               AATags.TBAAStruct, AATags.Scope, AATags.NoAlias);
   } else {
     // For now don't support unordered atomic memmove.
     if (UseMemMove)
       return Changed;
     // We cannot allow unaligned ops for unordered load/store, so reject
     // anything where the alignment isn't at least the element size.
-    assert((StoreAlign.hasValue() && LoadAlign.hasValue()) &&
+    assert((StoreAlign && LoadAlign) &&
            "Expect unordered load/store to have align.");
-    if (StoreAlign.getValue() < StoreSize || LoadAlign.getValue() < StoreSize)
+    if (*StoreAlign < StoreSize || *LoadAlign < StoreSize)
       return Changed;
 
     // If the element.atomic memcpy is not lowered into explicit
@@ -1358,8 +1500,8 @@ bool LoopIdiomRecognize::processLoopStoreOfLoopLoad(
     // Note that unordered atomic loads/stores are *required* by the spec to
     // have an alignment but non-atomic loads/stores may not.
     NewCall = Builder.CreateElementUnorderedAtomicMemCpy(
-        StoreBasePtr, StoreAlign.getValue(), LoadBasePtr, LoadAlign.getValue(),
-        NumBytes, StoreSize);
+        StoreBasePtr, *StoreAlign, LoadBasePtr, *LoadAlign, NumBytes, StoreSize,
+        AATags.TBAA, AATags.TBAAStruct, AATags.Scope, AATags.NoAlias);
   }
   NewCall->setDebugLoc(TheStore->getDebugLoc());
 
@@ -1382,11 +1524,14 @@ bool LoopIdiomRecognize::processLoopStoreOfLoopLoad(
            << ore::NV("NewFunction", NewCall->getCalledFunction())
            << "() intrinsic from " << ore::NV("Inst", InstRemark)
            << " instruction in " << ore::NV("Function", TheStore->getFunction())
-           << " function";
+           << " function"
+           << ore::setExtraArgs()
+           << ore::NV("FromBlock", TheStore->getParent()->getName())
+           << ore::NV("ToBlock", Preheader->getName());
   });
 
-  // Okay, the memcpy has been formed.  Zap the original store and anything that
-  // feeds into it.
+  // Okay, a new call to memcpy/memmove has been formed.  Zap the original store
+  // and anything that feeds into it.
   if (MSSAU)
     MSSAU->removeMemoryAccess(TheStore, true);
   deleteDeadInstruction(TheStore);
@@ -1551,24 +1696,22 @@ static bool detectPopcountIdiom(Loop *CurLoop, BasicBlock *PreCondBB,
   // step 4: Find the instruction which count the population: cnt2 = cnt1 + 1
   {
     CountInst = nullptr;
-    for (BasicBlock::iterator Iter = LoopEntry->getFirstNonPHI()->getIterator(),
-                              IterE = LoopEntry->end();
-         Iter != IterE; Iter++) {
-      Instruction *Inst = &*Iter;
-      if (Inst->getOpcode() != Instruction::Add)
+    for (Instruction &Inst : llvm::make_range(
+             LoopEntry->getFirstNonPHI()->getIterator(), LoopEntry->end())) {
+      if (Inst.getOpcode() != Instruction::Add)
         continue;
 
-      ConstantInt *Inc = dyn_cast<ConstantInt>(Inst->getOperand(1));
+      ConstantInt *Inc = dyn_cast<ConstantInt>(Inst.getOperand(1));
       if (!Inc || !Inc->isOne())
         continue;
 
-      PHINode *Phi = getRecurrenceVar(Inst->getOperand(0), Inst, LoopEntry);
+      PHINode *Phi = getRecurrenceVar(Inst.getOperand(0), &Inst, LoopEntry);
       if (!Phi)
         continue;
 
       // Check if the result of the instruction is live of the loop.
       bool LiveOutLoop = false;
-      for (User *U : Inst->users()) {
+      for (User *U : Inst.users()) {
         if ((cast<Instruction>(U))->getParent() != LoopEntry) {
           LiveOutLoop = true;
           break;
@@ -1576,7 +1719,7 @@ static bool detectPopcountIdiom(Loop *CurLoop, BasicBlock *PreCondBB,
       }
 
       if (LiveOutLoop) {
-        CountInst = Inst;
+        CountInst = &Inst;
         CountPhi = Phi;
         break;
       }
@@ -1677,22 +1820,20 @@ static bool detectShiftUntilZeroIdiom(Loop *CurLoop, const DataLayout &DL,
   //       plus "cnt0". Currently it is not optimized.
   //       This step could be used to detect POPCNT instruction:
   //       cnt.next = cnt + (x.next & 1)
-  for (BasicBlock::iterator Iter = LoopEntry->getFirstNonPHI()->getIterator(),
-                            IterE = LoopEntry->end();
-       Iter != IterE; Iter++) {
-    Instruction *Inst = &*Iter;
-    if (Inst->getOpcode() != Instruction::Add)
+  for (Instruction &Inst : llvm::make_range(
+           LoopEntry->getFirstNonPHI()->getIterator(), LoopEntry->end())) {
+    if (Inst.getOpcode() != Instruction::Add)
       continue;
 
-    ConstantInt *Inc = dyn_cast<ConstantInt>(Inst->getOperand(1));
+    ConstantInt *Inc = dyn_cast<ConstantInt>(Inst.getOperand(1));
     if (!Inc || (!Inc->isOne() && !Inc->isMinusOne()))
       continue;
 
-    PHINode *Phi = getRecurrenceVar(Inst->getOperand(0), Inst, LoopEntry);
+    PHINode *Phi = getRecurrenceVar(Inst.getOperand(0), &Inst, LoopEntry);
     if (!Phi)
       continue;
 
-    CntInst = Inst;
+    CntInst = &Inst;
     CntPhi = Phi;
     break;
   }
diff --git a/gnu/llvm/llvm/lib/Transforms/Scalar/LoopUnswitch.cpp b/gnu/llvm/llvm/lib/Transforms/Scalar/LoopUnswitch.cpp
deleted file mode 100644
index 9a854ff8024..00000000000
--- a/gnu/llvm/llvm/lib/Transforms/Scalar/LoopUnswitch.cpp
+++ /dev/null
@@ -1,1780 +0,0 @@
-//===- LoopUnswitch.cpp - Hoist loop-invariant conditionals in loop -------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This pass transforms loops that contain branches on loop-invariant conditions
-// to multiple loops.  For example, it turns the left into the right code:
-//
-//  for (...)                  if (lic)
-//    A                          for (...)
-//    if (lic)                     A; B; C
-//      B                      else
-//    C                          for (...)
-//                                 A; C
-//
-// This can increase the size of the code exponentially (doubling it every time
-// a loop is unswitched) so we only unswitch if the resultant code will be
-// smaller than a threshold.
-//
-// This pass expects LICM to be run before it to hoist invariant conditions out
-// of the loop, to make the unswitching opportunity obvious.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/DenseMap.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/SmallPtrSet.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/Statistic.h"
-#include "llvm/Analysis/AssumptionCache.h"
-#include "llvm/Analysis/CodeMetrics.h"
-#include "llvm/Analysis/InstructionSimplify.h"
-#include "llvm/Analysis/LazyBlockFrequencyInfo.h"
-#include "llvm/Analysis/LegacyDivergenceAnalysis.h"
-#include "llvm/Analysis/LoopInfo.h"
-#include "llvm/Analysis/LoopIterator.h"
-#include "llvm/Analysis/LoopPass.h"
-#include "llvm/Analysis/MemorySSA.h"
-#include "llvm/Analysis/MemorySSAUpdater.h"
-#include "llvm/Analysis/MustExecute.h"
-#include "llvm/Analysis/ScalarEvolution.h"
-#include "llvm/Analysis/TargetTransformInfo.h"
-#include "llvm/IR/Attributes.h"
-#include "llvm/IR/BasicBlock.h"
-#include "llvm/IR/Constant.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/DerivedTypes.h"
-#include "llvm/IR/Dominators.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/InstrTypes.h"
-#include "llvm/IR/Instruction.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/IntrinsicInst.h"
-#include "llvm/IR/Intrinsics.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/Type.h"
-#include "llvm/IR/User.h"
-#include "llvm/IR/Value.h"
-#include "llvm/IR/ValueHandle.h"
-#include "llvm/InitializePasses.h"
-#include "llvm/Pass.h"
-#include "llvm/Support/Casting.h"
-#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/Transforms/Scalar.h"
-#include "llvm/Transforms/Scalar/LoopPassManager.h"
-#include "llvm/Transforms/Utils/BasicBlockUtils.h"
-#include "llvm/Transforms/Utils/Cloning.h"
-#include "llvm/Transforms/Utils/Local.h"
-#include "llvm/Transforms/Utils/LoopUtils.h"
-#include "llvm/Transforms/Utils/ValueMapper.h"
-#include <algorithm>
-#include <cassert>
-#include <map>
-#include <set>
-#include <tuple>
-#include <utility>
-#include <vector>
-
-using namespace llvm;
-
-#define DEBUG_TYPE "loop-unswitch"
-
-STATISTIC(NumBranches, "Number of branches unswitched");
-STATISTIC(NumSwitches, "Number of switches unswitched");
-STATISTIC(NumGuards,   "Number of guards unswitched");
-STATISTIC(NumSelects , "Number of selects unswitched");
-STATISTIC(NumTrivial , "Number of unswitches that are trivial");
-STATISTIC(NumSimplify, "Number of simplifications of unswitched code");
-STATISTIC(TotalInsts,  "Total number of instructions analyzed");
-
-// The specific value of 100 here was chosen based only on intuition and a
-// few specific examples.
-static cl::opt<unsigned>
-Threshold("loop-unswitch-threshold", cl::desc("Max loop size to unswitch"),
-          cl::init(100), cl::Hidden);
-
-static cl::opt<unsigned>
-    MSSAThreshold("loop-unswitch-memoryssa-threshold",
-                  cl::desc("Max number of memory uses to explore during "
-                           "partial unswitching analysis"),
-                  cl::init(100), cl::Hidden);
-
-namespace {
-
-  class LUAnalysisCache {
-    using UnswitchedValsMap =
-        DenseMap<const SwitchInst *, SmallPtrSet<const Value *, 8>>;
-    using UnswitchedValsIt = UnswitchedValsMap::iterator;
-
-    struct LoopProperties {
-      unsigned CanBeUnswitchedCount;
-      unsigned WasUnswitchedCount;
-      unsigned SizeEstimation;
-      UnswitchedValsMap UnswitchedVals;
-    };
-
-    // Here we use std::map instead of DenseMap, since we need to keep valid
-    // LoopProperties pointer for current loop for better performance.
-    using LoopPropsMap = std::map<const Loop *, LoopProperties>;
-    using LoopPropsMapIt = LoopPropsMap::iterator;
-
-    LoopPropsMap LoopsProperties;
-    UnswitchedValsMap *CurLoopInstructions = nullptr;
-    LoopProperties *CurrentLoopProperties = nullptr;
-
-    // A loop unswitching with an estimated cost above this threshold
-    // is not performed. MaxSize is turned into unswitching quota for
-    // the current loop, and reduced correspondingly, though note that
-    // the quota is returned by releaseMemory() when the loop has been
-    // processed, so that MaxSize will return to its previous
-    // value. So in most cases MaxSize will equal the Threshold flag
-    // when a new loop is processed. An exception to that is that
-    // MaxSize will have a smaller value while processing nested loops
-    // that were introduced due to loop unswitching of an outer loop.
-    //
-    // FIXME: The way that MaxSize works is subtle and depends on the
-    // pass manager processing loops and calling releaseMemory() in a
-    // specific order. It would be good to find a more straightforward
-    // way of doing what MaxSize does.
-    unsigned MaxSize;
-
-  public:
-    LUAnalysisCache() : MaxSize(Threshold) {}
-
-    // Analyze loop. Check its size, calculate is it possible to unswitch
-    // it. Returns true if we can unswitch this loop.
-    bool countLoop(const Loop *L, const TargetTransformInfo &TTI,
-                   AssumptionCache *AC);
-
-    // Clean all data related to given loop.
-    void forgetLoop(const Loop *L);
-
-    // Mark case value as unswitched.
-    // Since SI instruction can be partly unswitched, in order to avoid
-    // extra unswitching in cloned loops keep track all unswitched values.
-    void setUnswitched(const SwitchInst *SI, const Value *V);
-
-    // Check was this case value unswitched before or not.
-    bool isUnswitched(const SwitchInst *SI, const Value *V);
-
-    // Returns true if another unswitching could be done within the cost
-    // threshold.
-    bool costAllowsUnswitching();
-
-    // Clone all loop-unswitch related loop properties.
-    // Redistribute unswitching quotas.
-    // Note, that new loop data is stored inside the VMap.
-    void cloneData(const Loop *NewLoop, const Loop *OldLoop,
-                   const ValueToValueMapTy &VMap);
-  };
-
-  class LoopUnswitch : public LoopPass {
-    LoopInfo *LI;  // Loop information
-    LPPassManager *LPM;
-    AssumptionCache *AC;
-
-    // Used to check if second loop needs processing after
-    // rewriteLoopBodyWithConditionConstant rewrites first loop.
-    std::vector<Loop*> LoopProcessWorklist;
-
-    LUAnalysisCache BranchesInfo;
-
-    bool OptimizeForSize;
-    bool RedoLoop = false;
-
-    Loop *CurrentLoop = nullptr;
-    DominatorTree *DT = nullptr;
-    MemorySSA *MSSA = nullptr;
-    AAResults *AA = nullptr;
-    std::unique_ptr<MemorySSAUpdater> MSSAU;
-    BasicBlock *LoopHeader = nullptr;
-    BasicBlock *LoopPreheader = nullptr;
-
-    bool SanitizeMemory;
-    SimpleLoopSafetyInfo SafetyInfo;
-
-    // LoopBlocks contains all of the basic blocks of the loop, including the
-    // preheader of the loop, the body of the loop, and the exit blocks of the
-    // loop, in that order.
-    std::vector<BasicBlock*> LoopBlocks;
-    // NewBlocks contained cloned copy of basic blocks from LoopBlocks.
-    std::vector<BasicBlock*> NewBlocks;
-
-    bool HasBranchDivergence;
-
-  public:
-    static char ID; // Pass ID, replacement for typeid
-
-    explicit LoopUnswitch(bool Os = false, bool HasBranchDivergence = false)
-        : LoopPass(ID), OptimizeForSize(Os),
-          HasBranchDivergence(HasBranchDivergence) {
-      initializeLoopUnswitchPass(*PassRegistry::getPassRegistry());
-    }
-
-    bool runOnLoop(Loop *L, LPPassManager &LPM) override;
-    bool processCurrentLoop();
-    bool isUnreachableDueToPreviousUnswitching(BasicBlock *);
-
-    /// This transformation requires natural loop information & requires that
-    /// loop preheaders be inserted into the CFG.
-    ///
-    void getAnalysisUsage(AnalysisUsage &AU) const override {
-      // Lazy BFI and BPI are marked as preserved here so Loop Unswitching
-      // can remain part of the same loop pass as LICM
-      AU.addPreserved<LazyBlockFrequencyInfoPass>();
-      AU.addPreserved<LazyBranchProbabilityInfoPass>();
-      AU.addRequired<AssumptionCacheTracker>();
-      AU.addRequired<TargetTransformInfoWrapperPass>();
-      if (EnableMSSALoopDependency) {
-        AU.addRequired<MemorySSAWrapperPass>();
-        AU.addPreserved<MemorySSAWrapperPass>();
-      }
-      if (HasBranchDivergence)
-        AU.addRequired<LegacyDivergenceAnalysis>();
-      getLoopAnalysisUsage(AU);
-    }
-
-  private:
-    void releaseMemory() override { BranchesInfo.forgetLoop(CurrentLoop); }
-
-    void initLoopData() {
-      LoopHeader = CurrentLoop->getHeader();
-      LoopPreheader = CurrentLoop->getLoopPreheader();
-    }
-
-    /// Split all of the edges from inside the loop to their exit blocks.
-    /// Update the appropriate Phi nodes as we do so.
-    void splitExitEdges(Loop *L,
-                        const SmallVectorImpl<BasicBlock *> &ExitBlocks);
-
-    bool tryTrivialLoopUnswitch(bool &Changed);
-
-    bool unswitchIfProfitable(Value *LoopCond, Constant *Val,
-                              Instruction *TI = nullptr,
-                              ArrayRef<Instruction *> ToDuplicate = {});
-    void unswitchTrivialCondition(Loop *L, Value *Cond, Constant *Val,
-                                  BasicBlock *ExitBlock, Instruction *TI);
-    void unswitchNontrivialCondition(Value *LIC, Constant *OnVal, Loop *L,
-                                     Instruction *TI,
-                                     ArrayRef<Instruction *> ToDuplicate = {});
-
-    void rewriteLoopBodyWithConditionConstant(Loop *L, Value *LIC,
-                                              Constant *Val, bool IsEqual);
-
-    void
-    emitPreheaderBranchOnCondition(Value *LIC, Constant *Val,
-                                   BasicBlock *TrueDest, BasicBlock *FalseDest,
-                                   BranchInst *OldBranch, Instruction *TI,
-                                   ArrayRef<Instruction *> ToDuplicate = {});
-
-    void simplifyCode(std::vector<Instruction *> &Worklist, Loop *L);
-
-    /// Given that the Invariant is not equal to Val. Simplify instructions
-    /// in the loop.
-    Value *simplifyInstructionWithNotEqual(Instruction *Inst, Value *Invariant,
-                                           Constant *Val);
-  };
-
-} // end anonymous namespace
-
-// Analyze loop. Check its size, calculate is it possible to unswitch
-// it. Returns true if we can unswitch this loop.
-bool LUAnalysisCache::countLoop(const Loop *L, const TargetTransformInfo &TTI,
-                                AssumptionCache *AC) {
-  LoopPropsMapIt PropsIt;
-  bool Inserted;
-  std::tie(PropsIt, Inserted) =
-      LoopsProperties.insert(std::make_pair(L, LoopProperties()));
-
-  LoopProperties &Props = PropsIt->second;
-
-  if (Inserted) {
-    // New loop.
-
-    // Limit the number of instructions to avoid causing significant code
-    // expansion, and the number of basic blocks, to avoid loops with
-    // large numbers of branches which cause loop unswitching to go crazy.
-    // This is a very ad-hoc heuristic.
-
-    SmallPtrSet<const Value *, 32> EphValues;
-    CodeMetrics::collectEphemeralValues(L, AC, EphValues);
-
-    // FIXME: This is overly conservative because it does not take into
-    // consideration code simplification opportunities and code that can
-    // be shared by the resultant unswitched loops.
-    CodeMetrics Metrics;
-    for (BasicBlock *BB : L->blocks())
-      Metrics.analyzeBasicBlock(BB, TTI, EphValues);
-
-    Props.SizeEstimation = Metrics.NumInsts;
-    Props.CanBeUnswitchedCount = MaxSize / (Props.SizeEstimation);
-    Props.WasUnswitchedCount = 0;
-    MaxSize -= Props.SizeEstimation * Props.CanBeUnswitchedCount;
-
-    if (Metrics.notDuplicatable) {
-      LLVM_DEBUG(dbgs() << "NOT unswitching loop %" << L->getHeader()->getName()
-                        << ", contents cannot be "
-                        << "duplicated!\n");
-      return false;
-    }
-  }
-
-  // Be careful. This links are good only before new loop addition.
-  CurrentLoopProperties = &Props;
-  CurLoopInstructions = &Props.UnswitchedVals;
-
-  return true;
-}
-
-// Clean all data related to given loop.
-void LUAnalysisCache::forgetLoop(const Loop *L) {
-  LoopPropsMapIt LIt = LoopsProperties.find(L);
-
-  if (LIt != LoopsProperties.end()) {
-    LoopProperties &Props = LIt->second;
-    MaxSize += (Props.CanBeUnswitchedCount + Props.WasUnswitchedCount) *
-               Props.SizeEstimation;
-    LoopsProperties.erase(LIt);
-  }
-
-  CurrentLoopProperties = nullptr;
-  CurLoopInstructions = nullptr;
-}
-
-// Mark case value as unswitched.
-// Since SI instruction can be partly unswitched, in order to avoid
-// extra unswitching in cloned loops keep track all unswitched values.
-void LUAnalysisCache::setUnswitched(const SwitchInst *SI, const Value *V) {
-  (*CurLoopInstructions)[SI].insert(V);
-}
-
-// Check was this case value unswitched before or not.
-bool LUAnalysisCache::isUnswitched(const SwitchInst *SI, const Value *V) {
-  return (*CurLoopInstructions)[SI].count(V);
-}
-
-bool LUAnalysisCache::costAllowsUnswitching() {
-  return CurrentLoopProperties->CanBeUnswitchedCount > 0;
-}
-
-// Clone all loop-unswitch related loop properties.
-// Redistribute unswitching quotas.
-// Note, that new loop data is stored inside the VMap.
-void LUAnalysisCache::cloneData(const Loop *NewLoop, const Loop *OldLoop,
-                                const ValueToValueMapTy &VMap) {
-  LoopProperties &NewLoopProps = LoopsProperties[NewLoop];
-  LoopProperties &OldLoopProps = *CurrentLoopProperties;
-  UnswitchedValsMap &Insts = OldLoopProps.UnswitchedVals;
-
-  // Reallocate "can-be-unswitched quota"
-
-  --OldLoopProps.CanBeUnswitchedCount;
-  ++OldLoopProps.WasUnswitchedCount;
-  NewLoopProps.WasUnswitchedCount = 0;
-  unsigned Quota = OldLoopProps.CanBeUnswitchedCount;
-  NewLoopProps.CanBeUnswitchedCount = Quota / 2;
-  OldLoopProps.CanBeUnswitchedCount = Quota - Quota / 2;
-
-  NewLoopProps.SizeEstimation = OldLoopProps.SizeEstimation;
-
-  // Clone unswitched values info:
-  // for new loop switches we clone info about values that was
-  // already unswitched and has redundant successors.
-  for (const auto &I : Insts) {
-    const SwitchInst *OldInst = I.first;
-    Value *NewI = VMap.lookup(OldInst);
-    const SwitchInst *NewInst = cast_or_null<SwitchInst>(NewI);
-    assert(NewInst && "All instructions that are in SrcBB must be in VMap.");
-
-    NewLoopProps.UnswitchedVals[NewInst] = OldLoopProps.UnswitchedVals[OldInst];
-  }
-}
-
-char LoopUnswitch::ID = 0;
-
-INITIALIZE_PASS_BEGIN(LoopUnswitch, "loop-unswitch", "Unswitch loops",
-                      false, false)
-INITIALIZE_PASS_DEPENDENCY(AssumptionCacheTracker)
-INITIALIZE_PASS_DEPENDENCY(LoopPass)
-INITIALIZE_PASS_DEPENDENCY(TargetTransformInfoWrapperPass)
-INITIALIZE_PASS_DEPENDENCY(LegacyDivergenceAnalysis)
-INITIALIZE_PASS_DEPENDENCY(MemorySSAWrapperPass)
-INITIALIZE_PASS_END(LoopUnswitch, "loop-unswitch", "Unswitch loops",
-                      false, false)
-
-Pass *llvm::createLoopUnswitchPass(bool Os, bool HasBranchDivergence) {
-  return new LoopUnswitch(Os, HasBranchDivergence);
-}
-
-/// Operator chain lattice.
-enum OperatorChain {
-  OC_OpChainNone,    ///< There is no operator.
-  OC_OpChainOr,      ///< There are only ORs.
-  OC_OpChainAnd,     ///< There are only ANDs.
-  OC_OpChainMixed    ///< There are ANDs and ORs.
-};
-
-/// Cond is a condition that occurs in L. If it is invariant in the loop, or has
-/// an invariant piece, return the invariant. Otherwise, return null.
-//
-/// NOTE: findLIVLoopCondition will not return a partial LIV by walking up a
-/// mixed operator chain, as we can not reliably find a value which will
-/// simplify the operator chain. If the chain is AND-only or OR-only, we can use
-/// 0 or ~0 to simplify the chain.
-///
-/// NOTE: In case a partial LIV and a mixed operator chain, we may be able to
-/// simplify the condition itself to a loop variant condition, but at the
-/// cost of creating an entirely new loop.
-static Value *findLIVLoopCondition(Value *Cond, Loop *L, bool &Changed,
-                                   OperatorChain &ParentChain,
-                                   DenseMap<Value *, Value *> &Cache,
-                                   MemorySSAUpdater *MSSAU) {
-  auto CacheIt = Cache.find(Cond);
-  if (CacheIt != Cache.end())
-    return CacheIt->second;
-
-  // We started analyze new instruction, increment scanned instructions counter.
-  ++TotalInsts;
-
-  // We can never unswitch on vector conditions.
-  if (Cond->getType()->isVectorTy())
-    return nullptr;
-
-  // Constants should be folded, not unswitched on!
-  if (isa<Constant>(Cond)) return nullptr;
-
-  // TODO: Handle: br (VARIANT|INVARIANT).
-
-  // Hoist simple values out.
-  if (L->makeLoopInvariant(Cond, Changed, nullptr, MSSAU)) {
-    Cache[Cond] = Cond;
-    return Cond;
-  }
-
-  // Walk up the operator chain to find partial invariant conditions.
-  if (BinaryOperator *BO = dyn_cast<BinaryOperator>(Cond))
-    if (BO->getOpcode() == Instruction::And ||
-        BO->getOpcode() == Instruction::Or) {
-      // Given the previous operator, compute the current operator chain status.
-      OperatorChain NewChain;
-      switch (ParentChain) {
-      case OC_OpChainNone:
-        NewChain = BO->getOpcode() == Instruction::And ? OC_OpChainAnd :
-                                      OC_OpChainOr;
-        break;
-      case OC_OpChainOr:
-        NewChain = BO->getOpcode() == Instruction::Or ? OC_OpChainOr :
-                                      OC_OpChainMixed;
-        break;
-      case OC_OpChainAnd:
-        NewChain = BO->getOpcode() == Instruction::And ? OC_OpChainAnd :
-                                      OC_OpChainMixed;
-        break;
-      case OC_OpChainMixed:
-        NewChain = OC_OpChainMixed;
-        break;
-      }
-
-      // If we reach a Mixed state, we do not want to keep walking up as we can not
-      // reliably find a value that will simplify the chain. With this check, we
-      // will return null on the first sight of mixed chain and the caller will
-      // either backtrack to find partial LIV in other operand or return null.
-      if (NewChain != OC_OpChainMixed) {
-        // Update the current operator chain type before we search up the chain.
-        ParentChain = NewChain;
-        // If either the left or right side is invariant, we can unswitch on this,
-        // which will cause the branch to go away in one loop and the condition to
-        // simplify in the other one.
-        if (Value *LHS = findLIVLoopCondition(BO->getOperand(0), L, Changed,
-                                              ParentChain, Cache, MSSAU)) {
-          Cache[Cond] = LHS;
-          return LHS;
-        }
-        // We did not manage to find a partial LIV in operand(0). Backtrack and try
-        // operand(1).
-        ParentChain = NewChain;
-        if (Value *RHS = findLIVLoopCondition(BO->getOperand(1), L, Changed,
-                                              ParentChain, Cache, MSSAU)) {
-          Cache[Cond] = RHS;
-          return RHS;
-        }
-      }
-    }
-
-  Cache[Cond] = nullptr;
-  return nullptr;
-}
-
-/// Cond is a condition that occurs in L. If it is invariant in the loop, or has
-/// an invariant piece, return the invariant along with the operator chain type.
-/// Otherwise, return null.
-static std::pair<Value *, OperatorChain>
-findLIVLoopCondition(Value *Cond, Loop *L, bool &Changed,
-                     MemorySSAUpdater *MSSAU) {
-  DenseMap<Value *, Value *> Cache;
-  OperatorChain OpChain = OC_OpChainNone;
-  Value *FCond = findLIVLoopCondition(Cond, L, Changed, OpChain, Cache, MSSAU);
-
-  // In case we do find a LIV, it can not be obtained by walking up a mixed
-  // operator chain.
-  assert((!FCond || OpChain != OC_OpChainMixed) &&
-        "Do not expect a partial LIV with mixed operator chain");
-  return {FCond, OpChain};
-}
-
-bool LoopUnswitch::runOnLoop(Loop *L, LPPassManager &LPMRef) {
-  if (skipLoop(L))
-    return false;
-
-  AC = &getAnalysis<AssumptionCacheTracker>().getAssumptionCache(
-      *L->getHeader()->getParent());
-  LI = &getAnalysis<LoopInfoWrapperPass>().getLoopInfo();
-  LPM = &LPMRef;
-  DT = &getAnalysis<DominatorTreeWrapperPass>().getDomTree();
-  AA = &getAnalysis<AAResultsWrapperPass>().getAAResults();
-  if (EnableMSSALoopDependency) {
-    MSSA = &getAnalysis<MemorySSAWrapperPass>().getMSSA();
-    MSSAU = std::make_unique<MemorySSAUpdater>(MSSA);
-    assert(DT && "Cannot update MemorySSA without a valid DomTree.");
-  }
-  CurrentLoop = L;
-  Function *F = CurrentLoop->getHeader()->getParent();
-
-  SanitizeMemory = F->hasFnAttribute(Attribute::SanitizeMemory);
-  if (SanitizeMemory)
-    SafetyInfo.computeLoopSafetyInfo(L);
-
-  if (MSSA && VerifyMemorySSA)
-    MSSA->verifyMemorySSA();
-
-  bool Changed = false;
-  do {
-    assert(CurrentLoop->isLCSSAForm(*DT));
-    if (MSSA && VerifyMemorySSA)
-      MSSA->verifyMemorySSA();
-    RedoLoop = false;
-    Changed |= processCurrentLoop();
-  } while (RedoLoop);
-
-  if (MSSA && VerifyMemorySSA)
-    MSSA->verifyMemorySSA();
-
-  return Changed;
-}
-
-// Return true if the BasicBlock BB is unreachable from the loop header.
-// Return false, otherwise.
-bool LoopUnswitch::isUnreachableDueToPreviousUnswitching(BasicBlock *BB) {
-  auto *Node = DT->getNode(BB)->getIDom();
-  BasicBlock *DomBB = Node->getBlock();
-  while (CurrentLoop->contains(DomBB)) {
-    BranchInst *BInst = dyn_cast<BranchInst>(DomBB->getTerminator());
-
-    Node = DT->getNode(DomBB)->getIDom();
-    DomBB = Node->getBlock();
-
-    if (!BInst || !BInst->isConditional())
-      continue;
-
-    Value *Cond = BInst->getCondition();
-    if (!isa<ConstantInt>(Cond))
-      continue;
-
-    BasicBlock *UnreachableSucc =
-        Cond == ConstantInt::getTrue(Cond->getContext())
-            ? BInst->getSuccessor(1)
-            : BInst->getSuccessor(0);
-
-    if (DT->dominates(UnreachableSucc, BB))
-      return true;
-  }
-  return false;
-}
-
-/// FIXME: Remove this workaround when freeze related patches are done.
-/// LoopUnswitch and Equality propagation in GVN have discrepancy about
-/// whether branch on undef/poison has undefine behavior. Here it is to
-/// rule out some common cases that we found such discrepancy already
-/// causing problems. Detail could be found in PR31652. Note if the
-/// func returns true, it is unsafe. But if it is false, it doesn't mean
-/// it is necessarily safe.
-static bool equalityPropUnSafe(Value &LoopCond) {
-  ICmpInst *CI = dyn_cast<ICmpInst>(&LoopCond);
-  if (!CI || !CI->isEquality())
-    return false;
-
-  Value *LHS = CI->getOperand(0);
-  Value *RHS = CI->getOperand(1);
-  if (isa<UndefValue>(LHS) || isa<UndefValue>(RHS))
-    return true;
-
-  auto HasUndefInPHI = [](PHINode &PN) {
-    for (Value *Opd : PN.incoming_values()) {
-      if (isa<UndefValue>(Opd))
-        return true;
-    }
-    return false;
-  };
-  PHINode *LPHI = dyn_cast<PHINode>(LHS);
-  PHINode *RPHI = dyn_cast<PHINode>(RHS);
-  if ((LPHI && HasUndefInPHI(*LPHI)) || (RPHI && HasUndefInPHI(*RPHI)))
-    return true;
-
-  auto HasUndefInSelect = [](SelectInst &SI) {
-    if (isa<UndefValue>(SI.getTrueValue()) ||
-        isa<UndefValue>(SI.getFalseValue()))
-      return true;
-    return false;
-  };
-  SelectInst *LSI = dyn_cast<SelectInst>(LHS);
-  SelectInst *RSI = dyn_cast<SelectInst>(RHS);
-  if ((LSI && HasUndefInSelect(*LSI)) || (RSI && HasUndefInSelect(*RSI)))
-    return true;
-  return false;
-}
-
-/// Do actual work and unswitch loop if possible and profitable.
-bool LoopUnswitch::processCurrentLoop() {
-  bool Changed = false;
-
-  initLoopData();
-
-  // If LoopSimplify was unable to form a preheader, don't do any unswitching.
-  if (!LoopPreheader)
-    return false;
-
-  // Loops with indirectbr cannot be cloned.
-  if (!CurrentLoop->isSafeToClone())
-    return false;
-
-  // Without dedicated exits, splitting the exit edge may fail.
-  if (!CurrentLoop->hasDedicatedExits())
-    return false;
-
-  LLVMContext &Context = LoopHeader->getContext();
-
-  // Analyze loop cost, and stop unswitching if loop content can not be duplicated.
-  if (!BranchesInfo.countLoop(
-          CurrentLoop,
-          getAnalysis<TargetTransformInfoWrapperPass>().getTTI(
-              *CurrentLoop->getHeader()->getParent()),
-          AC))
-    return false;
-
-  // Try trivial unswitch first before loop over other basic blocks in the loop.
-  if (tryTrivialLoopUnswitch(Changed)) {
-    return true;
-  }
-
-  // Do not do non-trivial unswitch while optimizing for size.
-  // FIXME: Use Function::hasOptSize().
-  if (OptimizeForSize ||
-      LoopHeader->getParent()->hasFnAttribute(Attribute::OptimizeForSize))
-    return Changed;
-
-  // Run through the instructions in the loop, keeping track of three things:
-  //
-  //  - That we do not unswitch loops containing convergent operations, as we
-  //    might be making them control dependent on the unswitch value when they
-  //    were not before.
-  //    FIXME: This could be refined to only bail if the convergent operation is
-  //    not already control-dependent on the unswitch value.
-  //
-  //  - That basic blocks in the loop contain invokes whose predecessor edges we
-  //    cannot split.
-  //
-  //  - The set of guard intrinsics encountered (these are non terminator
-  //    instructions that are also profitable to be unswitched).
-
-  SmallVector<IntrinsicInst *, 4> Guards;
-
-  for (const auto BB : CurrentLoop->blocks()) {
-    for (auto &I : *BB) {
-      auto *CB = dyn_cast<CallBase>(&I);
-      if (!CB)
-        continue;
-      if (CB->isConvergent())
-        return Changed;
-      if (auto *II = dyn_cast<InvokeInst>(&I))
-        if (!II->getUnwindDest()->canSplitPredecessors())
-          return Changed;
-      if (auto *II = dyn_cast<IntrinsicInst>(&I))
-        if (II->getIntrinsicID() == Intrinsic::experimental_guard)
-          Guards.push_back(II);
-    }
-  }
-
-  for (IntrinsicInst *Guard : Guards) {
-    Value *LoopCond = findLIVLoopCondition(Guard->getOperand(0), CurrentLoop,
-                                           Changed, MSSAU.get())
-                          .first;
-    if (LoopCond &&
-        unswitchIfProfitable(LoopCond, ConstantInt::getTrue(Context))) {
-      // NB! Unswitching (if successful) could have erased some of the
-      // instructions in Guards leaving dangling pointers there.  This is fine
-      // because we're returning now, and won't look at Guards again.
-      ++NumGuards;
-      return true;
-    }
-  }
-
-  // Loop over all of the basic blocks in the loop.  If we find an interior
-  // block that is branching on a loop-invariant condition, we can unswitch this
-  // loop.
-  for (Loop::block_iterator I = CurrentLoop->block_begin(),
-                            E = CurrentLoop->block_end();
-       I != E; ++I) {
-    Instruction *TI = (*I)->getTerminator();
-
-    // Unswitching on a potentially uninitialized predicate is not
-    // MSan-friendly. Limit this to the cases when the original predicate is
-    // guaranteed to execute, to avoid creating a use-of-uninitialized-value
-    // in the code that did not have one.
-    // This is a workaround for the discrepancy between LLVM IR and MSan
-    // semantics. See PR28054 for more details.
-    if (SanitizeMemory &&
-        !SafetyInfo.isGuaranteedToExecute(*TI, DT, CurrentLoop))
-      continue;
-
-    if (BranchInst *BI = dyn_cast<BranchInst>(TI)) {
-      // Some branches may be rendered unreachable because of previous
-      // unswitching.
-      // Unswitch only those branches that are reachable.
-      if (isUnreachableDueToPreviousUnswitching(*I))
-        continue;
-
-      // If this isn't branching on an invariant condition, we can't unswitch
-      // it.
-      if (BI->isConditional()) {
-        // See if this, or some part of it, is loop invariant.  If so, we can
-        // unswitch on it if we desire.
-        Value *LoopCond = findLIVLoopCondition(BI->getCondition(), CurrentLoop,
-                                               Changed, MSSAU.get())
-                              .first;
-        if (LoopCond && !equalityPropUnSafe(*LoopCond) &&
-            unswitchIfProfitable(LoopCond, ConstantInt::getTrue(Context), TI)) {
-          ++NumBranches;
-          return true;
-        }
-      }
-    } else if (SwitchInst *SI = dyn_cast<SwitchInst>(TI)) {
-      Value *SC = SI->getCondition();
-      Value *LoopCond;
-      OperatorChain OpChain;
-      std::tie(LoopCond, OpChain) =
-          findLIVLoopCondition(SC, CurrentLoop, Changed, MSSAU.get());
-
-      unsigned NumCases = SI->getNumCases();
-      if (LoopCond && NumCases) {
-        // Find a value to unswitch on:
-        // FIXME: this should chose the most expensive case!
-        // FIXME: scan for a case with a non-critical edge?
-        Constant *UnswitchVal = nullptr;
-        // Find a case value such that at least one case value is unswitched
-        // out.
-        if (OpChain == OC_OpChainAnd) {
-          // If the chain only has ANDs and the switch has a case value of 0.
-          // Dropping in a 0 to the chain will unswitch out the 0-casevalue.
-          auto *AllZero = cast<ConstantInt>(Constant::getNullValue(SC->getType()));
-          if (BranchesInfo.isUnswitched(SI, AllZero))
-            continue;
-          // We are unswitching 0 out.
-          UnswitchVal = AllZero;
-        } else if (OpChain == OC_OpChainOr) {
-          // If the chain only has ORs and the switch has a case value of ~0.
-          // Dropping in a ~0 to the chain will unswitch out the ~0-casevalue.
-          auto *AllOne = cast<ConstantInt>(Constant::getAllOnesValue(SC->getType()));
-          if (BranchesInfo.isUnswitched(SI, AllOne))
-            continue;
-          // We are unswitching ~0 out.
-          UnswitchVal = AllOne;
-        } else {
-          assert(OpChain == OC_OpChainNone &&
-                 "Expect to unswitch on trivial chain");
-          // Do not process same value again and again.
-          // At this point we have some cases already unswitched and
-          // some not yet unswitched. Let's find the first not yet unswitched one.
-          for (auto Case : SI->cases()) {
-            Constant *UnswitchValCandidate = Case.getCaseValue();
-            if (!BranchesInfo.isUnswitched(SI, UnswitchValCandidate)) {
-              UnswitchVal = UnswitchValCandidate;
-              break;
-            }
-          }
-        }
-
-        if (!UnswitchVal)
-          continue;
-
-        if (unswitchIfProfitable(LoopCond, UnswitchVal)) {
-          ++NumSwitches;
-          // In case of a full LIV, UnswitchVal is the value we unswitched out.
-          // In case of a partial LIV, we only unswitch when its an AND-chain
-          // or OR-chain. In both cases switch input value simplifies to
-          // UnswitchVal.
-          BranchesInfo.setUnswitched(SI, UnswitchVal);
-          return true;
-        }
-      }
-    }
-
-    // Scan the instructions to check for unswitchable values.
-    for (BasicBlock::iterator BBI = (*I)->begin(), E = (*I)->end();
-         BBI != E; ++BBI)
-      if (SelectInst *SI = dyn_cast<SelectInst>(BBI)) {
-        Value *LoopCond = findLIVLoopCondition(SI->getCondition(), CurrentLoop,
-                                               Changed, MSSAU.get())
-                              .first;
-        if (LoopCond &&
-            unswitchIfProfitable(LoopCond, ConstantInt::getTrue(Context))) {
-          ++NumSelects;
-          return true;
-        }
-      }
-  }
-
-  // Check if there is a header condition that is invariant along the patch from
-  // either the true or false successors to the header. This allows unswitching
-  // conditions depending on memory accesses, if there's a path not clobbering
-  // the memory locations. Check if this transform has been disabled using
-  // metadata, to avoid unswitching the same loop multiple times.
-  if (MSSA &&
-      !findOptionMDForLoop(CurrentLoop, "llvm.loop.unswitch.partial.disable")) {
-    if (auto Info =
-            hasPartialIVCondition(*CurrentLoop, MSSAThreshold, *MSSA, *AA)) {
-      assert(!Info->InstToDuplicate.empty() &&
-             "need at least a partially invariant condition");
-      LLVM_DEBUG(dbgs() << "loop-unswitch: Found partially invariant condition "
-                        << *Info->InstToDuplicate[0] << "\n");
-
-      Instruction *TI = CurrentLoop->getHeader()->getTerminator();
-      Value *LoopCond = Info->InstToDuplicate[0];
-
-      // If the partially unswitched path is a no-op and has a single exit
-      // block, we do not need to do full unswitching. Instead, we can directly
-      // branch to the exit.
-      // TODO: Instead of duplicating the checks, we could also just directly
-      // branch to the exit from the conditional branch in the loop.
-      if (Info->PathIsNoop) {
-        if (HasBranchDivergence &&
-            getAnalysis<LegacyDivergenceAnalysis>().isDivergent(LoopCond)) {
-          LLVM_DEBUG(dbgs() << "NOT unswitching loop %"
-                            << CurrentLoop->getHeader()->getName()
-                            << " at non-trivial condition '"
-                            << *Info->KnownValue << "' == " << *LoopCond << "\n"
-                            << ". Condition is divergent.\n");
-          return false;
-        }
-
-        ++NumBranches;
-
-        BasicBlock *TrueDest = LoopHeader;
-        BasicBlock *FalseDest = Info->ExitForPath;
-        if (Info->KnownValue->isOneValue())
-          std::swap(TrueDest, FalseDest);
-
-        auto *OldBr =
-            cast<BranchInst>(CurrentLoop->getLoopPreheader()->getTerminator());
-        emitPreheaderBranchOnCondition(LoopCond, Info->KnownValue, TrueDest,
-                                       FalseDest, OldBr, TI,
-                                       Info->InstToDuplicate);
-        delete OldBr;
-        RedoLoop = false;
-        return true;
-      }
-
-      // Otherwise, the path is not a no-op. Run regular unswitching.
-      if (unswitchIfProfitable(LoopCond, Info->KnownValue,
-                               CurrentLoop->getHeader()->getTerminator(),
-                               Info->InstToDuplicate)) {
-        ++NumBranches;
-        RedoLoop = false;
-        return true;
-      }
-    }
-  }
-
-  return Changed;
-}
-
-/// Check to see if all paths from BB exit the loop with no side effects
-/// (including infinite loops).
-///
-/// If true, we return true and set ExitBB to the block we
-/// exit through.
-///
-static bool isTrivialLoopExitBlockHelper(Loop *L, BasicBlock *BB,
-                                         BasicBlock *&ExitBB,
-                                         std::set<BasicBlock*> &Visited) {
-  if (!Visited.insert(BB).second) {
-    // Already visited. Without more analysis, this could indicate an infinite
-    // loop.
-    return false;
-  }
-  if (!L->contains(BB)) {
-    // Otherwise, this is a loop exit, this is fine so long as this is the
-    // first exit.
-    if (ExitBB) return false;
-    ExitBB = BB;
-    return true;
-  }
-
-  // Otherwise, this is an unvisited intra-loop node.  Check all successors.
-  for (BasicBlock *Succ : successors(BB)) {
-    // Check to see if the successor is a trivial loop exit.
-    if (!isTrivialLoopExitBlockHelper(L, Succ, ExitBB, Visited))
-      return false;
-  }
-
-  // Okay, everything after this looks good, check to make sure that this block
-  // doesn't include any side effects.
-  for (Instruction &I : *BB)
-    if (I.mayHaveSideEffects())
-      return false;
-
-  return true;
-}
-
-/// Return true if the specified block unconditionally leads to an exit from
-/// the specified loop, and has no side-effects in the process. If so, return
-/// the block that is exited to, otherwise return null.
-static BasicBlock *isTrivialLoopExitBlock(Loop *L, BasicBlock *BB) {
-  std::set<BasicBlock*> Visited;
-  Visited.insert(L->getHeader());  // Branches to header make infinite loops.
-  BasicBlock *ExitBB = nullptr;
-  if (isTrivialLoopExitBlockHelper(L, BB, ExitBB, Visited))
-    return ExitBB;
-  return nullptr;
-}
-
-/// We have found that we can unswitch CurrentLoop when LoopCond == Val to
-/// simplify the loop.  If we decide that this is profitable,
-/// unswitch the loop, reprocess the pieces, then return true.
-bool LoopUnswitch::unswitchIfProfitable(Value *LoopCond, Constant *Val,
-                                        Instruction *TI,
-                                        ArrayRef<Instruction *> ToDuplicate) {
-  // Check to see if it would be profitable to unswitch current loop.
-  if (!BranchesInfo.costAllowsUnswitching()) {
-    LLVM_DEBUG(dbgs() << "NOT unswitching loop %"
-                      << CurrentLoop->getHeader()->getName()
-                      << " at non-trivial condition '" << *Val
-                      << "' == " << *LoopCond << "\n"
-                      << ". Cost too high.\n");
-    return false;
-  }
-  if (HasBranchDivergence &&
-      getAnalysis<LegacyDivergenceAnalysis>().isDivergent(LoopCond)) {
-    LLVM_DEBUG(dbgs() << "NOT unswitching loop %"
-                      << CurrentLoop->getHeader()->getName()
-                      << " at non-trivial condition '" << *Val
-                      << "' == " << *LoopCond << "\n"
-                      << ". Condition is divergent.\n");
-    return false;
-  }
-
-  unswitchNontrivialCondition(LoopCond, Val, CurrentLoop, TI, ToDuplicate);
-  return true;
-}
-
-/// Emit a conditional branch on two values if LIC == Val, branch to TrueDst,
-/// otherwise branch to FalseDest. Insert the code immediately before OldBranch
-/// and remove (but not erase!) it from the function.
-void LoopUnswitch::emitPreheaderBranchOnCondition(
-    Value *LIC, Constant *Val, BasicBlock *TrueDest, BasicBlock *FalseDest,
-    BranchInst *OldBranch, Instruction *TI,
-    ArrayRef<Instruction *> ToDuplicate) {
-  assert(OldBranch->isUnconditional() && "Preheader is not split correctly");
-  assert(TrueDest != FalseDest && "Branch targets should be different");
-
-  // Insert a conditional branch on LIC to the two preheaders.  The original
-  // code is the true version and the new code is the false version.
-  Value *BranchVal = LIC;
-  bool Swapped = false;
-
-  if (!ToDuplicate.empty()) {
-    ValueToValueMapTy Old2New;
-    for (Instruction *I : reverse(ToDuplicate)) {
-      auto *New = I->clone();
-      New->insertBefore(OldBranch);
-      RemapInstruction(New, Old2New,
-                       RF_NoModuleLevelChanges | RF_IgnoreMissingLocals);
-      Old2New[I] = New;
-
-      if (MSSAU) {
-        MemorySSA *MSSA = MSSAU->getMemorySSA();
-        auto *MemA = dyn_cast_or_null<MemoryUse>(MSSA->getMemoryAccess(I));
-        if (!MemA)
-          continue;
-
-        Loop *L = LI->getLoopFor(I->getParent());
-        auto *DefiningAccess = MemA->getDefiningAccess();
-        // Get the first defining access before the loop.
-        while (L->contains(DefiningAccess->getBlock())) {
-          // If the defining access is a MemoryPhi, get the incoming
-          // value for the pre-header as defining access.
-          if (auto *MemPhi = dyn_cast<MemoryPhi>(DefiningAccess)) {
-            DefiningAccess =
-                MemPhi->getIncomingValueForBlock(L->getLoopPreheader());
-          } else {
-            DefiningAccess =
-                cast<MemoryDef>(DefiningAccess)->getDefiningAccess();
-          }
-        }
-        MSSAU->createMemoryAccessInBB(New, DefiningAccess, New->getParent(),
-                                      MemorySSA::BeforeTerminator);
-      }
-    }
-    BranchVal = Old2New[ToDuplicate[0]];
-  } else {
-
-    if (!isa<ConstantInt>(Val) ||
-        Val->getType() != Type::getInt1Ty(LIC->getContext()))
-      BranchVal = new ICmpInst(OldBranch, ICmpInst::ICMP_EQ, LIC, Val);
-    else if (Val != ConstantInt::getTrue(Val->getContext())) {
-      // We want to enter the new loop when the condition is true.
-      std::swap(TrueDest, FalseDest);
-      Swapped = true;
-    }
-  }
-
-  // Old branch will be removed, so save its parent and successor to update the
-  // DomTree.
-  auto *OldBranchSucc = OldBranch->getSuccessor(0);
-  auto *OldBranchParent = OldBranch->getParent();
-
-  // Insert the new branch.
-  BranchInst *BI =
-      IRBuilder<>(OldBranch).CreateCondBr(BranchVal, TrueDest, FalseDest, TI);
-  if (Swapped)
-    BI->swapProfMetadata();
-
-  // Remove the old branch so there is only one branch at the end. This is
-  // needed to perform DomTree's internal DFS walk on the function's CFG.
-  OldBranch->removeFromParent();
-
-  // Inform the DT about the new branch.
-  if (DT) {
-    // First, add both successors.
-    SmallVector<DominatorTree::UpdateType, 3> Updates;
-    if (TrueDest != OldBranchSucc)
-      Updates.push_back({DominatorTree::Insert, OldBranchParent, TrueDest});
-    if (FalseDest != OldBranchSucc)
-      Updates.push_back({DominatorTree::Insert, OldBranchParent, FalseDest});
-    // If both of the new successors are different from the old one, inform the
-    // DT that the edge was deleted.
-    if (OldBranchSucc != TrueDest && OldBranchSucc != FalseDest) {
-      Updates.push_back({DominatorTree::Delete, OldBranchParent, OldBranchSucc});
-    }
-
-    if (MSSAU)
-      MSSAU->applyUpdates(Updates, *DT, /*UpdateDT=*/true);
-    else
-      DT->applyUpdates(Updates);
-  }
-
-  // If either edge is critical, split it. This helps preserve LoopSimplify
-  // form for enclosing loops.
-  auto Options =
-      CriticalEdgeSplittingOptions(DT, LI, MSSAU.get()).setPreserveLCSSA();
-  SplitCriticalEdge(BI, 0, Options);
-  SplitCriticalEdge(BI, 1, Options);
-}
-
-/// Given a loop that has a trivial unswitchable condition in it (a cond branch
-/// from its header block to its latch block, where the path through the loop
-/// that doesn't execute its body has no side-effects), unswitch it. This
-/// doesn't involve any code duplication, just moving the conditional branch
-/// outside of the loop and updating loop info.
-void LoopUnswitch::unswitchTrivialCondition(Loop *L, Value *Cond, Constant *Val,
-                                            BasicBlock *ExitBlock,
-                                            Instruction *TI) {
-  LLVM_DEBUG(dbgs() << "loop-unswitch: Trivial-Unswitch loop %"
-                    << LoopHeader->getName() << " [" << L->getBlocks().size()
-                    << " blocks] in Function "
-                    << L->getHeader()->getParent()->getName()
-                    << " on cond: " << *Val << " == " << *Cond << "\n");
-  // We are going to make essential changes to CFG. This may invalidate cached
-  // information for L or one of its parent loops in SCEV.
-  if (auto *SEWP = getAnalysisIfAvailable<ScalarEvolutionWrapperPass>())
-    SEWP->getSE().forgetTopmostLoop(L);
-
-  // First step, split the preheader, so that we know that there is a safe place
-  // to insert the conditional branch.  We will change LoopPreheader to have a
-  // conditional branch on Cond.
-  BasicBlock *NewPH = SplitEdge(LoopPreheader, LoopHeader, DT, LI, MSSAU.get());
-
-  // Now that we have a place to insert the conditional branch, create a place
-  // to branch to: this is the exit block out of the loop that we should
-  // short-circuit to.
-
-  // Split this block now, so that the loop maintains its exit block, and so
-  // that the jump from the preheader can execute the contents of the exit block
-  // without actually branching to it (the exit block should be dominated by the
-  // loop header, not the preheader).
-  assert(!L->contains(ExitBlock) && "Exit block is in the loop?");
-  BasicBlock *NewExit =
-      SplitBlock(ExitBlock, &ExitBlock->front(), DT, LI, MSSAU.get());
-
-  // Okay, now we have a position to branch from and a position to branch to,
-  // insert the new conditional branch.
-  auto *OldBranch = dyn_cast<BranchInst>(LoopPreheader->getTerminator());
-  assert(OldBranch && "Failed to split the preheader");
-  emitPreheaderBranchOnCondition(Cond, Val, NewExit, NewPH, OldBranch, TI);
-
-  // emitPreheaderBranchOnCondition removed the OldBranch from the function.
-  // Delete it, as it is no longer needed.
-  delete OldBranch;
-
-  // We need to reprocess this loop, it could be unswitched again.
-  RedoLoop = true;
-
-  // Now that we know that the loop is never entered when this condition is a
-  // particular value, rewrite the loop with this info.  We know that this will
-  // at least eliminate the old branch.
-  rewriteLoopBodyWithConditionConstant(L, Cond, Val, /*IsEqual=*/false);
-
-  ++NumTrivial;
-}
-
-/// Check if the first non-constant condition starting from the loop header is
-/// a trivial unswitch condition: that is, a condition controls whether or not
-/// the loop does anything at all. If it is a trivial condition, unswitching
-/// produces no code duplications (equivalently, it produces a simpler loop and
-/// a new empty loop, which gets deleted). Therefore always unswitch trivial
-/// condition.
-bool LoopUnswitch::tryTrivialLoopUnswitch(bool &Changed) {
-  BasicBlock *CurrentBB = CurrentLoop->getHeader();
-  Instruction *CurrentTerm = CurrentBB->getTerminator();
-  LLVMContext &Context = CurrentBB->getContext();
-
-  // If loop header has only one reachable successor (currently via an
-  // unconditional branch or constant foldable conditional branch, but
-  // should also consider adding constant foldable switch instruction in
-  // future), we should keep looking for trivial condition candidates in
-  // the successor as well. An alternative is to constant fold conditions
-  // and merge successors into loop header (then we only need to check header's
-  // terminator). The reason for not doing this in LoopUnswitch pass is that
-  // it could potentially break LoopPassManager's invariants. Folding dead
-  // branches could either eliminate the current loop or make other loops
-  // unreachable. LCSSA form might also not be preserved after deleting
-  // branches. The following code keeps traversing loop header's successors
-  // until it finds the trivial condition candidate (condition that is not a
-  // constant). Since unswitching generates branches with constant conditions,
-  // this scenario could be very common in practice.
-  SmallPtrSet<BasicBlock*, 8> Visited;
-
-  while (true) {
-    // If we exit loop or reach a previous visited block, then
-    // we can not reach any trivial condition candidates (unfoldable
-    // branch instructions or switch instructions) and no unswitch
-    // can happen. Exit and return false.
-    if (!CurrentLoop->contains(CurrentBB) || !Visited.insert(CurrentBB).second)
-      return false;
-
-    // Check if this loop will execute any side-effecting instructions (e.g.
-    // stores, calls, volatile loads) in the part of the loop that the code
-    // *would* execute. Check the header first.
-    for (Instruction &I : *CurrentBB)
-      if (I.mayHaveSideEffects())
-        return false;
-
-    if (BranchInst *BI = dyn_cast<BranchInst>(CurrentTerm)) {
-      if (BI->isUnconditional()) {
-        CurrentBB = BI->getSuccessor(0);
-      } else if (BI->getCondition() == ConstantInt::getTrue(Context)) {
-        CurrentBB = BI->getSuccessor(0);
-      } else if (BI->getCondition() == ConstantInt::getFalse(Context)) {
-        CurrentBB = BI->getSuccessor(1);
-      } else {
-        // Found a trivial condition candidate: non-foldable conditional branch.
-        break;
-      }
-    } else if (SwitchInst *SI = dyn_cast<SwitchInst>(CurrentTerm)) {
-      // At this point, any constant-foldable instructions should have probably
-      // been folded.
-      ConstantInt *Cond = dyn_cast<ConstantInt>(SI->getCondition());
-      if (!Cond)
-        break;
-      // Find the target block we are definitely going to.
-      CurrentBB = SI->findCaseValue(Cond)->getCaseSuccessor();
-    } else {
-      // We do not understand these terminator instructions.
-      break;
-    }
-
-    CurrentTerm = CurrentBB->getTerminator();
-  }
-
-  // CondVal is the condition that controls the trivial condition.
-  // LoopExitBB is the BasicBlock that loop exits when meets trivial condition.
-  Constant *CondVal = nullptr;
-  BasicBlock *LoopExitBB = nullptr;
-
-  if (BranchInst *BI = dyn_cast<BranchInst>(CurrentTerm)) {
-    // If this isn't branching on an invariant condition, we can't unswitch it.
-    if (!BI->isConditional())
-      return false;
-
-    Value *LoopCond = findLIVLoopCondition(BI->getCondition(), CurrentLoop,
-                                           Changed, MSSAU.get())
-                          .first;
-
-    // Unswitch only if the trivial condition itself is an LIV (not
-    // partial LIV which could occur in and/or)
-    if (!LoopCond || LoopCond != BI->getCondition())
-      return false;
-
-    // Check to see if a successor of the branch is guaranteed to
-    // exit through a unique exit block without having any
-    // side-effects.  If so, determine the value of Cond that causes
-    // it to do this.
-    if ((LoopExitBB =
-             isTrivialLoopExitBlock(CurrentLoop, BI->getSuccessor(0)))) {
-      CondVal = ConstantInt::getTrue(Context);
-    } else if ((LoopExitBB =
-                    isTrivialLoopExitBlock(CurrentLoop, BI->getSuccessor(1)))) {
-      CondVal = ConstantInt::getFalse(Context);
-    }
-
-    // If we didn't find a single unique LoopExit block, or if the loop exit
-    // block contains phi nodes, this isn't trivial.
-    if (!LoopExitBB || isa<PHINode>(LoopExitBB->begin()))
-      return false;   // Can't handle this.
-
-    if (equalityPropUnSafe(*LoopCond))
-      return false;
-
-    unswitchTrivialCondition(CurrentLoop, LoopCond, CondVal, LoopExitBB,
-                             CurrentTerm);
-    ++NumBranches;
-    return true;
-  } else if (SwitchInst *SI = dyn_cast<SwitchInst>(CurrentTerm)) {
-    // If this isn't switching on an invariant condition, we can't unswitch it.
-    Value *LoopCond = findLIVLoopCondition(SI->getCondition(), CurrentLoop,
-                                           Changed, MSSAU.get())
-                          .first;
-
-    // Unswitch only if the trivial condition itself is an LIV (not
-    // partial LIV which could occur in and/or)
-    if (!LoopCond || LoopCond != SI->getCondition())
-      return false;
-
-    // Check to see if a successor of the switch is guaranteed to go to the
-    // latch block or exit through a one exit block without having any
-    // side-effects.  If so, determine the value of Cond that causes it to do
-    // this.
-    // Note that we can't trivially unswitch on the default case or
-    // on already unswitched cases.
-    for (auto Case : SI->cases()) {
-      BasicBlock *LoopExitCandidate;
-      if ((LoopExitCandidate =
-               isTrivialLoopExitBlock(CurrentLoop, Case.getCaseSuccessor()))) {
-        // Okay, we found a trivial case, remember the value that is trivial.
-        ConstantInt *CaseVal = Case.getCaseValue();
-
-        // Check that it was not unswitched before, since already unswitched
-        // trivial vals are looks trivial too.
-        if (BranchesInfo.isUnswitched(SI, CaseVal))
-          continue;
-        LoopExitBB = LoopExitCandidate;
-        CondVal = CaseVal;
-        break;
-      }
-    }
-
-    // If we didn't find a single unique LoopExit block, or if the loop exit
-    // block contains phi nodes, this isn't trivial.
-    if (!LoopExitBB || isa<PHINode>(LoopExitBB->begin()))
-      return false;   // Can't handle this.
-
-    unswitchTrivialCondition(CurrentLoop, LoopCond, CondVal, LoopExitBB,
-                             nullptr);
-
-    // We are only unswitching full LIV.
-    BranchesInfo.setUnswitched(SI, CondVal);
-    ++NumSwitches;
-    return true;
-  }
-  return false;
-}
-
-/// Split all of the edges from inside the loop to their exit blocks.
-/// Update the appropriate Phi nodes as we do so.
-void LoopUnswitch::splitExitEdges(
-    Loop *L, const SmallVectorImpl<BasicBlock *> &ExitBlocks) {
-
-  for (unsigned I = 0, E = ExitBlocks.size(); I != E; ++I) {
-    BasicBlock *ExitBlock = ExitBlocks[I];
-    SmallVector<BasicBlock *, 4> Preds(pred_begin(ExitBlock),
-                                       pred_end(ExitBlock));
-
-    // Although SplitBlockPredecessors doesn't preserve loop-simplify in
-    // general, if we call it on all predecessors of all exits then it does.
-    SplitBlockPredecessors(ExitBlock, Preds, ".us-lcssa", DT, LI, MSSAU.get(),
-                           /*PreserveLCSSA*/ true);
-  }
-}
-
-/// We determined that the loop is profitable to unswitch when LIC equal Val.
-/// Split it into loop versions and test the condition outside of either loop.
-/// Return the loops created as Out1/Out2.
-void LoopUnswitch::unswitchNontrivialCondition(
-    Value *LIC, Constant *Val, Loop *L, Instruction *TI,
-    ArrayRef<Instruction *> ToDuplicate) {
-  Function *F = LoopHeader->getParent();
-  LLVM_DEBUG(dbgs() << "loop-unswitch: Unswitching loop %"
-                    << LoopHeader->getName() << " [" << L->getBlocks().size()
-                    << " blocks] in Function " << F->getName() << " when '"
-                    << *Val << "' == " << *LIC << "\n");
-
-  // We are going to make essential changes to CFG. This may invalidate cached
-  // information for L or one of its parent loops in SCEV.
-  if (auto *SEWP = getAnalysisIfAvailable<ScalarEvolutionWrapperPass>())
-    SEWP->getSE().forgetTopmostLoop(L);
-
-  LoopBlocks.clear();
-  NewBlocks.clear();
-
-  if (MSSAU && VerifyMemorySSA)
-    MSSA->verifyMemorySSA();
-
-  // First step, split the preheader and exit blocks, and add these blocks to
-  // the LoopBlocks list.
-  BasicBlock *NewPreheader =
-      SplitEdge(LoopPreheader, LoopHeader, DT, LI, MSSAU.get());
-  LoopBlocks.push_back(NewPreheader);
-
-  // We want the loop to come after the preheader, but before the exit blocks.
-  llvm::append_range(LoopBlocks, L->blocks());
-
-  SmallVector<BasicBlock*, 8> ExitBlocks;
-  L->getUniqueExitBlocks(ExitBlocks);
-
-  // Split all of the edges from inside the loop to their exit blocks.  Update
-  // the appropriate Phi nodes as we do so.
-  splitExitEdges(L, ExitBlocks);
-
-  // The exit blocks may have been changed due to edge splitting, recompute.
-  ExitBlocks.clear();
-  L->getUniqueExitBlocks(ExitBlocks);
-
-  // Add exit blocks to the loop blocks.
-  llvm::append_range(LoopBlocks, ExitBlocks);
-
-  // Next step, clone all of the basic blocks that make up the loop (including
-  // the loop preheader and exit blocks), keeping track of the mapping between
-  // the instructions and blocks.
-  NewBlocks.reserve(LoopBlocks.size());
-  ValueToValueMapTy VMap;
-  for (unsigned I = 0, E = LoopBlocks.size(); I != E; ++I) {
-    BasicBlock *NewBB = CloneBasicBlock(LoopBlocks[I], VMap, ".us", F);
-
-    NewBlocks.push_back(NewBB);
-    VMap[LoopBlocks[I]] = NewBB; // Keep the BB mapping.
-  }
-
-  // Splice the newly inserted blocks into the function right before the
-  // original preheader.
-  F->getBasicBlockList().splice(NewPreheader->getIterator(),
-                                F->getBasicBlockList(),
-                                NewBlocks[0]->getIterator(), F->end());
-
-  // Now we create the new Loop object for the versioned loop.
-  Loop *NewLoop = cloneLoop(L, L->getParentLoop(), VMap, LI, LPM);
-
-  // Recalculate unswitching quota, inherit simplified switches info for NewBB,
-  // Probably clone more loop-unswitch related loop properties.
-  BranchesInfo.cloneData(NewLoop, L, VMap);
-
-  Loop *ParentLoop = L->getParentLoop();
-  if (ParentLoop) {
-    // Make sure to add the cloned preheader and exit blocks to the parent loop
-    // as well.
-    ParentLoop->addBasicBlockToLoop(NewBlocks[0], *LI);
-  }
-
-  for (unsigned EBI = 0, EBE = ExitBlocks.size(); EBI != EBE; ++EBI) {
-    BasicBlock *NewExit = cast<BasicBlock>(VMap[ExitBlocks[EBI]]);
-    // The new exit block should be in the same loop as the old one.
-    if (Loop *ExitBBLoop = LI->getLoopFor(ExitBlocks[EBI]))
-      ExitBBLoop->addBasicBlockToLoop(NewExit, *LI);
-
-    assert(NewExit->getTerminator()->getNumSuccessors() == 1 &&
-           "Exit block should have been split to have one successor!");
-    BasicBlock *ExitSucc = NewExit->getTerminator()->getSuccessor(0);
-
-    // If the successor of the exit block had PHI nodes, add an entry for
-    // NewExit.
-    for (PHINode &PN : ExitSucc->phis()) {
-      Value *V = PN.getIncomingValueForBlock(ExitBlocks[EBI]);
-      ValueToValueMapTy::iterator It = VMap.find(V);
-      if (It != VMap.end()) V = It->second;
-      PN.addIncoming(V, NewExit);
-    }
-
-    if (LandingPadInst *LPad = NewExit->getLandingPadInst()) {
-      PHINode *PN = PHINode::Create(LPad->getType(), 0, "",
-                                    &*ExitSucc->getFirstInsertionPt());
-
-      for (BasicBlock *BB : predecessors(ExitSucc)) {
-        LandingPadInst *LPI = BB->getLandingPadInst();
-        LPI->replaceAllUsesWith(PN);
-        PN->addIncoming(LPI, BB);
-      }
-    }
-  }
-
-  // Rewrite the code to refer to itself.
-  for (unsigned NBI = 0, NBE = NewBlocks.size(); NBI != NBE; ++NBI) {
-    for (Instruction &I : *NewBlocks[NBI]) {
-      RemapInstruction(&I, VMap,
-                       RF_NoModuleLevelChanges | RF_IgnoreMissingLocals);
-      if (auto *II = dyn_cast<AssumeInst>(&I))
-        AC->registerAssumption(II);
-    }
-  }
-
-  // Rewrite the original preheader to select between versions of the loop.
-  BranchInst *OldBR = cast<BranchInst>(LoopPreheader->getTerminator());
-  assert(OldBR->isUnconditional() && OldBR->getSuccessor(0) == LoopBlocks[0] &&
-         "Preheader splitting did not work correctly!");
-
-  if (MSSAU) {
-    // Update MemorySSA after cloning, and before splitting to unreachables,
-    // since that invalidates the 1:1 mapping of clones in VMap.
-    LoopBlocksRPO LBRPO(L);
-    LBRPO.perform(LI);
-    MSSAU->updateForClonedLoop(LBRPO, ExitBlocks, VMap);
-  }
-
-  // Emit the new branch that selects between the two versions of this loop.
-  emitPreheaderBranchOnCondition(LIC, Val, NewBlocks[0], LoopBlocks[0], OldBR,
-                                 TI, ToDuplicate);
-  if (MSSAU) {
-    // Update MemoryPhis in Exit blocks.
-    MSSAU->updateExitBlocksForClonedLoop(ExitBlocks, VMap, *DT);
-    if (VerifyMemorySSA)
-      MSSA->verifyMemorySSA();
-  }
-
-  // The OldBr was replaced by a new one and removed (but not erased) by
-  // emitPreheaderBranchOnCondition. It is no longer needed, so delete it.
-  delete OldBR;
-
-  LoopProcessWorklist.push_back(NewLoop);
-  RedoLoop = true;
-
-  // Keep a WeakTrackingVH holding onto LIC.  If the first call to
-  // RewriteLoopBody
-  // deletes the instruction (for example by simplifying a PHI that feeds into
-  // the condition that we're unswitching on), we don't rewrite the second
-  // iteration.
-  WeakTrackingVH LICHandle(LIC);
-
-  if (ToDuplicate.empty()) {
-    // Now we rewrite the original code to know that the condition is true and
-    // the new code to know that the condition is false.
-    rewriteLoopBodyWithConditionConstant(L, LIC, Val, /*IsEqual=*/false);
-
-    // It's possible that simplifying one loop could cause the other to be
-    // changed to another value or a constant.  If its a constant, don't
-    // simplify it.
-    if (!LoopProcessWorklist.empty() && LoopProcessWorklist.back() == NewLoop &&
-        LICHandle && !isa<Constant>(LICHandle))
-      rewriteLoopBodyWithConditionConstant(NewLoop, LICHandle, Val,
-                                           /*IsEqual=*/true);
-  } else {
-    // Partial unswitching. Update the condition in the right loop with the
-    // constant.
-    auto *CC = cast<ConstantInt>(Val);
-    if (CC->isOneValue()) {
-      rewriteLoopBodyWithConditionConstant(NewLoop, VMap[LIC], Val,
-                                           /*IsEqual=*/true);
-    } else
-      rewriteLoopBodyWithConditionConstant(L, LIC, Val, /*IsEqual=*/true);
-
-    // Mark the new loop as partially unswitched, to avoid unswitching on the
-    // same condition again.
-    auto &Context = NewLoop->getHeader()->getContext();
-    MDNode *DisableUnswitchMD = MDNode::get(
-        Context, MDString::get(Context, "llvm.loop.unswitch.partial.disable"));
-    MDNode *NewLoopID = makePostTransformationMetadata(
-        Context, L->getLoopID(), {"llvm.loop.unswitch.partial"},
-        {DisableUnswitchMD});
-    NewLoop->setLoopID(NewLoopID);
-  }
-
-  if (MSSA && VerifyMemorySSA)
-    MSSA->verifyMemorySSA();
-}
-
-/// Remove all instances of I from the worklist vector specified.
-static void removeFromWorklist(Instruction *I,
-                               std::vector<Instruction *> &Worklist) {
-  llvm::erase_value(Worklist, I);
-}
-
-/// When we find that I really equals V, remove I from the
-/// program, replacing all uses with V and update the worklist.
-static void replaceUsesOfWith(Instruction *I, Value *V,
-                              std::vector<Instruction *> &Worklist, Loop *L,
-                              LPPassManager *LPM, MemorySSAUpdater *MSSAU) {
-  LLVM_DEBUG(dbgs() << "Replace with '" << *V << "': " << *I << "\n");
-
-  // Add uses to the worklist, which may be dead now.
-  for (unsigned i = 0, e = I->getNumOperands(); i != e; ++i)
-    if (Instruction *Use = dyn_cast<Instruction>(I->getOperand(i)))
-      Worklist.push_back(Use);
-
-  // Add users to the worklist which may be simplified now.
-  for (User *U : I->users())
-    Worklist.push_back(cast<Instruction>(U));
-  removeFromWorklist(I, Worklist);
-  I->replaceAllUsesWith(V);
-  if (!I->mayHaveSideEffects()) {
-    if (MSSAU)
-      MSSAU->removeMemoryAccess(I);
-    I->eraseFromParent();
-  }
-  ++NumSimplify;
-}
-
-/// We know either that the value LIC has the value specified by Val in the
-/// specified loop, or we know it does NOT have that value.
-/// Rewrite any uses of LIC or of properties correlated to it.
-void LoopUnswitch::rewriteLoopBodyWithConditionConstant(Loop *L, Value *LIC,
-                                                        Constant *Val,
-                                                        bool IsEqual) {
-  assert(!isa<Constant>(LIC) && "Why are we unswitching on a constant?");
-
-  // FIXME: Support correlated properties, like:
-  //  for (...)
-  //    if (li1 < li2)
-  //      ...
-  //    if (li1 > li2)
-  //      ...
-
-  // FOLD boolean conditions (X|LIC), (X&LIC).  Fold conditional branches,
-  // selects, switches.
-  std::vector<Instruction*> Worklist;
-  LLVMContext &Context = Val->getContext();
-
-  // If we know that LIC == Val, or that LIC == NotVal, just replace uses of LIC
-  // in the loop with the appropriate one directly.
-  if (IsEqual || (isa<ConstantInt>(Val) &&
-      Val->getType()->isIntegerTy(1))) {
-    Value *Replacement;
-    if (IsEqual)
-      Replacement = Val;
-    else
-      Replacement = ConstantInt::get(Type::getInt1Ty(Val->getContext()),
-                                     !cast<ConstantInt>(Val)->getZExtValue());
-
-    for (User *U : LIC->users()) {
-      Instruction *UI = dyn_cast<Instruction>(U);
-      if (!UI || !L->contains(UI))
-        continue;
-      Worklist.push_back(UI);
-    }
-
-    for (Instruction *UI : Worklist)
-      UI->replaceUsesOfWith(LIC, Replacement);
-
-    simplifyCode(Worklist, L);
-    return;
-  }
-
-  // Otherwise, we don't know the precise value of LIC, but we do know that it
-  // is certainly NOT "Val".  As such, simplify any uses in the loop that we
-  // can.  This case occurs when we unswitch switch statements.
-  for (User *U : LIC->users()) {
-    Instruction *UI = dyn_cast<Instruction>(U);
-    if (!UI || !L->contains(UI))
-      continue;
-
-    // At this point, we know LIC is definitely not Val. Try to use some simple
-    // logic to simplify the user w.r.t. to the context.
-    if (Value *Replacement = simplifyInstructionWithNotEqual(UI, LIC, Val)) {
-      if (LI->replacementPreservesLCSSAForm(UI, Replacement)) {
-        // This in-loop instruction has been simplified w.r.t. its context,
-        // i.e. LIC != Val, make sure we propagate its replacement value to
-        // all its users.
-        //
-        // We can not yet delete UI, the LIC user, yet, because that would invalidate
-        // the LIC->users() iterator !. However, we can make this instruction
-        // dead by replacing all its users and push it onto the worklist so that
-        // it can be properly deleted and its operands simplified.
-        UI->replaceAllUsesWith(Replacement);
-      }
-    }
-
-    // This is a LIC user, push it into the worklist so that simplifyCode can
-    // attempt to simplify it.
-    Worklist.push_back(UI);
-
-    // If we know that LIC is not Val, use this info to simplify code.
-    SwitchInst *SI = dyn_cast<SwitchInst>(UI);
-    if (!SI || !isa<ConstantInt>(Val)) continue;
-
-    // NOTE: if a case value for the switch is unswitched out, we record it
-    // after the unswitch finishes. We can not record it here as the switch
-    // is not a direct user of the partial LIV.
-    SwitchInst::CaseHandle DeadCase =
-        *SI->findCaseValue(cast<ConstantInt>(Val));
-    // Default case is live for multiple values.
-    if (DeadCase == *SI->case_default())
-      continue;
-
-    // Found a dead case value.  Don't remove PHI nodes in the
-    // successor if they become single-entry, those PHI nodes may
-    // be in the Users list.
-
-    BasicBlock *Switch = SI->getParent();
-    BasicBlock *SISucc = DeadCase.getCaseSuccessor();
-    BasicBlock *Latch = L->getLoopLatch();
-
-    if (!SI->findCaseDest(SISucc)) continue;  // Edge is critical.
-    // If the DeadCase successor dominates the loop latch, then the
-    // transformation isn't safe since it will delete the sole predecessor edge
-    // to the latch.
-    if (Latch && DT->dominates(SISucc, Latch))
-      continue;
-
-    // FIXME: This is a hack.  We need to keep the successor around
-    // and hooked up so as to preserve the loop structure, because
-    // trying to update it is complicated.  So instead we preserve the
-    // loop structure and put the block on a dead code path.
-    SplitEdge(Switch, SISucc, DT, LI, MSSAU.get());
-    // Compute the successors instead of relying on the return value
-    // of SplitEdge, since it may have split the switch successor
-    // after PHI nodes.
-    BasicBlock *NewSISucc = DeadCase.getCaseSuccessor();
-    BasicBlock *OldSISucc = *succ_begin(NewSISucc);
-    // Create an "unreachable" destination.
-    BasicBlock *Abort = BasicBlock::Create(Context, "us-unreachable",
-                                           Switch->getParent(),
-                                           OldSISucc);
-    new UnreachableInst(Context, Abort);
-    // Force the new case destination to branch to the "unreachable"
-    // block while maintaining a (dead) CFG edge to the old block.
-    NewSISucc->getTerminator()->eraseFromParent();
-    BranchInst::Create(Abort, OldSISucc,
-                       ConstantInt::getTrue(Context), NewSISucc);
-    // Release the PHI operands for this edge.
-    for (PHINode &PN : NewSISucc->phis())
-      PN.setIncomingValueForBlock(Switch, UndefValue::get(PN.getType()));
-    // Tell the domtree about the new block. We don't fully update the
-    // domtree here -- instead we force it to do a full recomputation
-    // after the pass is complete -- but we do need to inform it of
-    // new blocks.
-    DT->addNewBlock(Abort, NewSISucc);
-  }
-
-  simplifyCode(Worklist, L);
-}
-
-/// Now that we have simplified some instructions in the loop, walk over it and
-/// constant prop, dce, and fold control flow where possible. Note that this is
-/// effectively a very simple loop-structure-aware optimizer. During processing
-/// of this loop, L could very well be deleted, so it must not be used.
-///
-/// FIXME: When the loop optimizer is more mature, separate this out to a new
-/// pass.
-///
-void LoopUnswitch::simplifyCode(std::vector<Instruction *> &Worklist, Loop *L) {
-  const DataLayout &DL = L->getHeader()->getModule()->getDataLayout();
-  while (!Worklist.empty()) {
-    Instruction *I = Worklist.back();
-    Worklist.pop_back();
-
-    // Simple DCE.
-    if (isInstructionTriviallyDead(I)) {
-      LLVM_DEBUG(dbgs() << "Remove dead instruction '" << *I << "\n");
-
-      // Add uses to the worklist, which may be dead now.
-      for (unsigned i = 0, e = I->getNumOperands(); i != e; ++i)
-        if (Instruction *Use = dyn_cast<Instruction>(I->getOperand(i)))
-          Worklist.push_back(Use);
-      removeFromWorklist(I, Worklist);
-      if (MSSAU)
-        MSSAU->removeMemoryAccess(I);
-      I->eraseFromParent();
-      ++NumSimplify;
-      continue;
-    }
-
-    // See if instruction simplification can hack this up.  This is common for
-    // things like "select false, X, Y" after unswitching made the condition be
-    // 'false'.  TODO: update the domtree properly so we can pass it here.
-    if (Value *V = SimplifyInstruction(I, DL))
-      if (LI->replacementPreservesLCSSAForm(I, V)) {
-        replaceUsesOfWith(I, V, Worklist, L, LPM, MSSAU.get());
-        continue;
-      }
-
-    // Special case hacks that appear commonly in unswitched code.
-    if (BranchInst *BI = dyn_cast<BranchInst>(I)) {
-      if (BI->isUnconditional()) {
-        // If BI's parent is the only pred of the successor, fold the two blocks
-        // together.
-        BasicBlock *Pred = BI->getParent();
-        (void)Pred;
-        BasicBlock *Succ = BI->getSuccessor(0);
-        BasicBlock *SinglePred = Succ->getSinglePredecessor();
-        if (!SinglePred) continue;  // Nothing to do.
-        assert(SinglePred == Pred && "CFG broken");
-
-        // Make the LPM and Worklist updates specific to LoopUnswitch.
-        removeFromWorklist(BI, Worklist);
-        auto SuccIt = Succ->begin();
-        while (PHINode *PN = dyn_cast<PHINode>(SuccIt++)) {
-          for (unsigned It = 0, E = PN->getNumOperands(); It != E; ++It)
-            if (Instruction *Use = dyn_cast<Instruction>(PN->getOperand(It)))
-              Worklist.push_back(Use);
-          for (User *U : PN->users())
-            Worklist.push_back(cast<Instruction>(U));
-          removeFromWorklist(PN, Worklist);
-          ++NumSimplify;
-        }
-        // Merge the block and make the remaining analyses updates.
-        DomTreeUpdater DTU(DT, DomTreeUpdater::UpdateStrategy::Eager);
-        MergeBlockIntoPredecessor(Succ, &DTU, LI, MSSAU.get());
-        ++NumSimplify;
-        continue;
-      }
-
-      continue;
-    }
-  }
-}
-
-/// Simple simplifications we can do given the information that Cond is
-/// definitely not equal to Val.
-Value *LoopUnswitch::simplifyInstructionWithNotEqual(Instruction *Inst,
-                                                     Value *Invariant,
-                                                     Constant *Val) {
-  // icmp eq cond, val -> false
-  ICmpInst *CI = dyn_cast<ICmpInst>(Inst);
-  if (CI && CI->isEquality()) {
-    Value *Op0 = CI->getOperand(0);
-    Value *Op1 = CI->getOperand(1);
-    if ((Op0 == Invariant && Op1 == Val) || (Op0 == Val && Op1 == Invariant)) {
-      LLVMContext &Ctx = Inst->getContext();
-      if (CI->getPredicate() == CmpInst::ICMP_EQ)
-        return ConstantInt::getFalse(Ctx);
-      else
-        return ConstantInt::getTrue(Ctx);
-     }
-  }
-
-  // FIXME: there may be other opportunities, e.g. comparison with floating
-  // point, or Invariant - Val != 0, etc.
-  return nullptr;
-}
diff --git a/gnu/llvm/llvm/lib/Transforms/Scalar/LowerAtomic.cpp b/gnu/llvm/llvm/lib/Transforms/Scalar/LowerAtomic.cpp
deleted file mode 100644
index 4063e4fe047..00000000000
--- a/gnu/llvm/llvm/lib/Transforms/Scalar/LowerAtomic.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-//===- LowerAtomic.cpp - Lower atomic intrinsics --------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This pass lowers atomic intrinsics to non-atomic form for use in a known
-// non-preemptible environment.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Transforms/Scalar/LowerAtomic.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/InitializePasses.h"
-#include "llvm/Pass.h"
-#include "llvm/Transforms/Scalar.h"
-using namespace llvm;
-
-#define DEBUG_TYPE "loweratomic"
-
-static bool LowerAtomicCmpXchgInst(AtomicCmpXchgInst *CXI) {
-  IRBuilder<> Builder(CXI);
-  Value *Ptr = CXI->getPointerOperand();
-  Value *Cmp = CXI->getCompareOperand();
-  Value *Val = CXI->getNewValOperand();
-
-  LoadInst *Orig = Builder.CreateLoad(Val->getType(), Ptr);
-  Value *Equal = Builder.CreateICmpEQ(Orig, Cmp);
-  Value *Res = Builder.CreateSelect(Equal, Val, Orig);
-  Builder.CreateStore(Res, Ptr);
-
-  Res = Builder.CreateInsertValue(UndefValue::get(CXI->getType()), Orig, 0);
-  Res = Builder.CreateInsertValue(Res, Equal, 1);
-
-  CXI->replaceAllUsesWith(Res);
-  CXI->eraseFromParent();
-  return true;
-}
-
-bool llvm::lowerAtomicRMWInst(AtomicRMWInst *RMWI) {
-  IRBuilder<> Builder(RMWI);
-  Value *Ptr = RMWI->getPointerOperand();
-  Value *Val = RMWI->getValOperand();
-
-  LoadInst *Orig = Builder.CreateLoad(Val->getType(), Ptr);
-  Value *Res = nullptr;
-
-  switch (RMWI->getOperation()) {
-  default: llvm_unreachable("Unexpected RMW operation");
-  case AtomicRMWInst::Xchg:
-    Res = Val;
-    break;
-  case AtomicRMWInst::Add:
-    Res = Builder.CreateAdd(Orig, Val);
-    break;
-  case AtomicRMWInst::Sub:
-    Res = Builder.CreateSub(Orig, Val);
-    break;
-  case AtomicRMWInst::And:
-    Res = Builder.CreateAnd(Orig, Val);
-    break;
-  case AtomicRMWInst::Nand:
-    Res = Builder.CreateNot(Builder.CreateAnd(Orig, Val));
-    break;
-  case AtomicRMWInst::Or:
-    Res = Builder.CreateOr(Orig, Val);
-    break;
-  case AtomicRMWInst::Xor:
-    Res = Builder.CreateXor(Orig, Val);
-    break;
-  case AtomicRMWInst::Max:
-    Res = Builder.CreateSelect(Builder.CreateICmpSLT(Orig, Val),
-                               Val, Orig);
-    break;
-  case AtomicRMWInst::Min:
-    Res = Builder.CreateSelect(Builder.CreateICmpSLT(Orig, Val),
-                               Orig, Val);
-    break;
-  case AtomicRMWInst::UMax:
-    Res = Builder.CreateSelect(Builder.CreateICmpULT(Orig, Val),
-                               Val, Orig);
-    break;
-  case AtomicRMWInst::UMin:
-    Res = Builder.CreateSelect(Builder.CreateICmpULT(Orig, Val),
-                               Orig, Val);
-    break;
-  case AtomicRMWInst::FAdd:
-    Res = Builder.CreateFAdd(Orig, Val);
-    break;
-  case AtomicRMWInst::FSub:
-    Res = Builder.CreateFSub(Orig, Val);
-    break;
-  }
-  Builder.CreateStore(Res, Ptr);
-  RMWI->replaceAllUsesWith(Orig);
-  RMWI->eraseFromParent();
-  return true;
-}
-
-static bool LowerFenceInst(FenceInst *FI) {
-  FI->eraseFromParent();
-  return true;
-}
-
-static bool LowerLoadInst(LoadInst *LI) {
-  LI->setAtomic(AtomicOrdering::NotAtomic);
-  return true;
-}
-
-static bool LowerStoreInst(StoreInst *SI) {
-  SI->setAtomic(AtomicOrdering::NotAtomic);
-  return true;
-}
-
-static bool runOnBasicBlock(BasicBlock &BB) {
-  bool Changed = false;
-  for (Instruction &Inst : make_early_inc_range(BB)) {
-    if (FenceInst *FI = dyn_cast<FenceInst>(&Inst))
-      Changed |= LowerFenceInst(FI);
-    else if (AtomicCmpXchgInst *CXI = dyn_cast<AtomicCmpXchgInst>(&Inst))
-      Changed |= LowerAtomicCmpXchgInst(CXI);
-    else if (AtomicRMWInst *RMWI = dyn_cast<AtomicRMWInst>(&Inst))
-      Changed |= lowerAtomicRMWInst(RMWI);
-    else if (LoadInst *LI = dyn_cast<LoadInst>(&Inst)) {
-      if (LI->isAtomic())
-        LowerLoadInst(LI);
-    } else if (StoreInst *SI = dyn_cast<StoreInst>(&Inst)) {
-      if (SI->isAtomic())
-        LowerStoreInst(SI);
-    }
-  }
-  return Changed;
-}
-
-static bool lowerAtomics(Function &F) {
-  bool Changed = false;
-  for (BasicBlock &BB : F) {
-    Changed |= runOnBasicBlock(BB);
-  }
-  return Changed;
-}
-
-PreservedAnalyses LowerAtomicPass::run(Function &F, FunctionAnalysisManager &) {
-  if (lowerAtomics(F))
-    return PreservedAnalyses::none();
-  return PreservedAnalyses::all();
-}
-
-namespace {
-class LowerAtomicLegacyPass : public FunctionPass {
-public:
-  static char ID;
-
-  LowerAtomicLegacyPass() : FunctionPass(ID) {
-    initializeLowerAtomicLegacyPassPass(*PassRegistry::getPassRegistry());
-  }
-
-  bool runOnFunction(Function &F) override {
-    // Don't skip optnone functions; atomics still need to be lowered.
-    FunctionAnalysisManager DummyFAM;
-    auto PA = Impl.run(F, DummyFAM);
-    return !PA.areAllPreserved();
-  }
-
-private:
-  LowerAtomicPass Impl;
-  };
-}
-
-char LowerAtomicLegacyPass::ID = 0;
-INITIALIZE_PASS(LowerAtomicLegacyPass, "loweratomic",
-                "Lower atomic intrinsics to non-atomic form", false, false)
-
-Pass *llvm::createLowerAtomicPass() { return new LowerAtomicLegacyPass(); }
diff --git a/gnu/llvm/llvm/lib/Transforms/Scalar/SCCP.cpp b/gnu/llvm/llvm/lib/Transforms/Scalar/SCCP.cpp
index b09f896d015..7b396c6ee07 100644
--- a/gnu/llvm/llvm/lib/Transforms/Scalar/SCCP.cpp
+++ b/gnu/llvm/llvm/lib/Transforms/Scalar/SCCP.cpp
@@ -17,32 +17,22 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Transforms/Scalar/SCCP.h"
-#include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/DenseMap.h"
-#include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/MapVector.h"
-#include "llvm/ADT/PointerIntPair.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SetVector.h"
 #include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/Statistic.h"
-#include "llvm/Analysis/ConstantFolding.h"
 #include "llvm/Analysis/DomTreeUpdater.h"
 #include "llvm/Analysis/GlobalsModRef.h"
-#include "llvm/Analysis/InstructionSimplify.h"
 #include "llvm/Analysis/TargetLibraryInfo.h"
-#include "llvm/Analysis/ValueLattice.h"
-#include "llvm/Analysis/ValueLatticeUtils.h"
 #include "llvm/Analysis/ValueTracking.h"
 #include "llvm/IR/BasicBlock.h"
 #include "llvm/IR/Constant.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/DataLayout.h"
 #include "llvm/IR/DerivedTypes.h"
 #include "llvm/IR/Function.h"
 #include "llvm/IR/GlobalVariable.h"
-#include "llvm/IR/InstVisitor.h"
 #include "llvm/IR/InstrTypes.h"
 #include "llvm/IR/Instruction.h"
 #include "llvm/IR/Instructions.h"
@@ -59,7 +49,7 @@
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/Transforms/Utils/Local.h"
-#include "llvm/Transforms/Utils/PredicateInfo.h"
+#include "llvm/Transforms/Utils/SCCPSolver.h"
 #include <cassert>
 #include <utility>
 #include <vector>
@@ -73,120 +63,10 @@ STATISTIC(NumDeadBlocks , "Number of basic blocks unreachable");
 STATISTIC(NumInstReplaced,
           "Number of instructions replaced with (simpler) instruction");
 
-STATISTIC(IPNumInstRemoved, "Number of instructions removed by IPSCCP");
-STATISTIC(IPNumArgsElimed ,"Number of arguments constant propagated by IPSCCP");
-STATISTIC(IPNumGlobalConst, "Number of globals found to be constant by IPSCCP");
-STATISTIC(
-    IPNumInstReplaced,
-    "Number of instructions replaced with (simpler) instruction by IPSCCP");
-
-// Helper to check if \p LV is either a constant or a constant
-// range with a single element. This should cover exactly the same cases as the
-// old ValueLatticeElement::isConstant() and is intended to be used in the
-// transition to ValueLatticeElement.
-static bool isConstant(const ValueLatticeElement &LV) {
-  return LV.isConstant() ||
-         (LV.isConstantRange() && LV.getConstantRange().isSingleElement());
-}
-
-// Helper to check if \p LV is either overdefined or a constant range with more
-// than a single element. This should cover exactly the same cases as the old
-// ValueLatticeElement::isOverdefined() and is intended to be used in the
-// transition to ValueLatticeElement.
-static bool isOverdefined(const ValueLatticeElement &LV) {
-  return !LV.isUnknownOrUndef() && !isConstant(LV);
-}
-
-static bool tryToReplaceWithConstant(SCCPSolver &Solver, Value *V) {
-  Constant *Const = nullptr;
-  if (V->getType()->isStructTy()) {
-    std::vector<ValueLatticeElement> IVs = Solver.getStructLatticeValueFor(V);
-    if (any_of(IVs,
-               [](const ValueLatticeElement &LV) { return isOverdefined(LV); }))
-      return false;
-    std::vector<Constant *> ConstVals;
-    auto *ST = cast<StructType>(V->getType());
-    for (unsigned i = 0, e = ST->getNumElements(); i != e; ++i) {
-      ValueLatticeElement V = IVs[i];
-      ConstVals.push_back(isConstant(V)
-                              ? Solver.getConstant(V)
-                              : UndefValue::get(ST->getElementType(i)));
-    }
-    Const = ConstantStruct::get(ST, ConstVals);
-  } else {
-    const ValueLatticeElement &IV = Solver.getLatticeValueFor(V);
-    if (isOverdefined(IV))
-      return false;
-
-    Const =
-        isConstant(IV) ? Solver.getConstant(IV) : UndefValue::get(V->getType());
-  }
-  assert(Const && "Constant is nullptr here!");
-
-  // Replacing `musttail` instructions with constant breaks `musttail` invariant
-  // unless the call itself can be removed.
-  // Calls with "clang.arc.attachedcall" implicitly use the return value and
-  // those uses cannot be updated with a constant.
-  CallBase *CB = dyn_cast<CallBase>(V);
-  if (CB && ((CB->isMustTailCall() && !CB->isSafeToRemove()) ||
-             CB->getOperandBundle(LLVMContext::OB_clang_arc_attachedcall))) {
-    Function *F = CB->getCalledFunction();
-
-    // Don't zap returns of the callee
-    if (F)
-      Solver.addToMustPreserveReturnsInFunctions(F);
-
-    LLVM_DEBUG(dbgs() << "  Can\'t treat the result of call " << *CB
-                      << " as a constant\n");
-    return false;
-  }
-
-  LLVM_DEBUG(dbgs() << "  Constant: " << *Const << " = " << *V << '\n');
-
-  // Replaces all of the uses of a variable with uses of the constant.
-  V->replaceAllUsesWith(Const);
-  return true;
-}
-
-static bool simplifyInstsInBlock(SCCPSolver &Solver, BasicBlock &BB,
-                                 SmallPtrSetImpl<Value *> &InsertedValues,
-                                 Statistic &InstRemovedStat,
-                                 Statistic &InstReplacedStat) {
-  bool MadeChanges = false;
-  for (Instruction &Inst : make_early_inc_range(BB)) {
-    if (Inst.getType()->isVoidTy())
-      continue;
-    if (tryToReplaceWithConstant(Solver, &Inst)) {
-      if (Inst.isSafeToRemove())
-        Inst.eraseFromParent();
-
-      MadeChanges = true;
-      ++InstRemovedStat;
-    } else if (isa<SExtInst>(&Inst)) {
-      Value *ExtOp = Inst.getOperand(0);
-      if (isa<Constant>(ExtOp) || InsertedValues.count(ExtOp))
-        continue;
-      const ValueLatticeElement &IV = Solver.getLatticeValueFor(ExtOp);
-      if (!IV.isConstantRange(/*UndefAllowed=*/false))
-        continue;
-      if (IV.getConstantRange().isAllNonNegative()) {
-        auto *ZExt = new ZExtInst(ExtOp, Inst.getType(), "", &Inst);
-        InsertedValues.insert(ZExt);
-        Inst.replaceAllUsesWith(ZExt);
-        Solver.removeLatticeValueFor(&Inst);
-        Inst.eraseFromParent();
-        InstReplacedStat++;
-        MadeChanges = true;
-      }
-    }
-  }
-  return MadeChanges;
-}
-
 // runSCCP() - Run the Sparse Conditional Constant Propagation algorithm,
 // and return true if the function was modified.
 static bool runSCCP(Function &F, const DataLayout &DL,
-                    const TargetLibraryInfo *TLI) {
+                    const TargetLibraryInfo *TLI, DomTreeUpdater &DTU) {
   LLVM_DEBUG(dbgs() << "SCCP on function '" << F.getName() << "'\n");
   SCCPSolver Solver(
       DL, [TLI](Function &F) -> const TargetLibraryInfo & { return *TLI; },
@@ -214,32 +94,46 @@ static bool runSCCP(Function &F, const DataLayout &DL,
   // as we cannot modify the CFG of the function.
 
   SmallPtrSet<Value *, 32> InsertedValues;
+  SmallVector<BasicBlock *, 8> BlocksToErase;
   for (BasicBlock &BB : F) {
     if (!Solver.isBlockExecutable(&BB)) {
       LLVM_DEBUG(dbgs() << "  BasicBlock Dead:" << BB);
-
       ++NumDeadBlocks;
-      NumInstRemoved += removeAllNonTerminatorAndEHPadInstructions(&BB).first;
-
+      BlocksToErase.push_back(&BB);
       MadeChanges = true;
       continue;
     }
 
-    MadeChanges |= simplifyInstsInBlock(Solver, BB, InsertedValues,
-                                        NumInstRemoved, NumInstReplaced);
+    MadeChanges |= Solver.simplifyInstsInBlock(BB, InsertedValues,
+                                               NumInstRemoved, NumInstReplaced);
   }
 
+  // Remove unreachable blocks and non-feasible edges.
+  for (BasicBlock *DeadBB : BlocksToErase)
+    NumInstRemoved += changeToUnreachable(DeadBB->getFirstNonPHI(),
+                                          /*PreserveLCSSA=*/false, &DTU);
+
+  BasicBlock *NewUnreachableBB = nullptr;
+  for (BasicBlock &BB : F)
+    MadeChanges |= Solver.removeNonFeasibleEdges(&BB, DTU, NewUnreachableBB);
+
+  for (BasicBlock *DeadBB : BlocksToErase)
+    if (!DeadBB->hasAddressTaken())
+      DTU.deleteBB(DeadBB);
+
   return MadeChanges;
 }
 
 PreservedAnalyses SCCPPass::run(Function &F, FunctionAnalysisManager &AM) {
   const DataLayout &DL = F.getParent()->getDataLayout();
   auto &TLI = AM.getResult<TargetLibraryAnalysis>(F);
-  if (!runSCCP(F, DL, &TLI))
+  auto *DT = AM.getCachedResult<DominatorTreeAnalysis>(F);
+  DomTreeUpdater DTU(DT, DomTreeUpdater::UpdateStrategy::Lazy);
+  if (!runSCCP(F, DL, &TLI, DTU))
     return PreservedAnalyses::all();
 
   auto PA = PreservedAnalyses();
-  PA.preserveSet<CFGAnalyses>();
+  PA.preserve<DominatorTreeAnalysis>();
   return PA;
 }
 
@@ -262,7 +156,7 @@ public:
   void getAnalysisUsage(AnalysisUsage &AU) const override {
     AU.addRequired<TargetLibraryInfoWrapperPass>();
     AU.addPreserved<GlobalsAAWrapperPass>();
-    AU.setPreservesCFG();
+    AU.addPreserved<DominatorTreeWrapperPass>();
   }
 
   // runOnFunction - Run the Sparse Conditional Constant Propagation
@@ -273,7 +167,10 @@ public:
     const DataLayout &DL = F.getParent()->getDataLayout();
     const TargetLibraryInfo *TLI =
         &getAnalysis<TargetLibraryInfoWrapperPass>().getTLI(F);
-    return runSCCP(F, DL, TLI);
+    auto *DTWP = getAnalysisIfAvailable<DominatorTreeWrapperPass>();
+    DomTreeUpdater DTU(DTWP ? &DTWP->getDomTree() : nullptr,
+                       DomTreeUpdater::UpdateStrategy::Lazy);
+    return runSCCP(F, DL, TLI, DTU);
   }
 };
 
@@ -290,376 +187,3 @@ INITIALIZE_PASS_END(SCCPLegacyPass, "sccp",
 // createSCCPPass - This is the public interface to this file.
 FunctionPass *llvm::createSCCPPass() { return new SCCPLegacyPass(); }
 
-static void findReturnsToZap(Function &F,
-                             SmallVector<ReturnInst *, 8> &ReturnsToZap,
-                             SCCPSolver &Solver) {
-  // We can only do this if we know that nothing else can call the function.
-  if (!Solver.isArgumentTrackedFunction(&F))
-    return;
-
-  if (Solver.mustPreserveReturn(&F)) {
-    LLVM_DEBUG(
-        dbgs()
-        << "Can't zap returns of the function : " << F.getName()
-        << " due to present musttail or \"clang.arc.attachedcall\" call of "
-           "it\n");
-    return;
-  }
-
-  assert(
-      all_of(F.users(),
-             [&Solver](User *U) {
-               if (isa<Instruction>(U) &&
-                   !Solver.isBlockExecutable(cast<Instruction>(U)->getParent()))
-                 return true;
-               // Non-callsite uses are not impacted by zapping. Also, constant
-               // uses (like blockaddresses) could stuck around, without being
-               // used in the underlying IR, meaning we do not have lattice
-               // values for them.
-               if (!isa<CallBase>(U))
-                 return true;
-               if (U->getType()->isStructTy()) {
-                 return all_of(Solver.getStructLatticeValueFor(U),
-                               [](const ValueLatticeElement &LV) {
-                                 return !isOverdefined(LV);
-                               });
-               }
-               return !isOverdefined(Solver.getLatticeValueFor(U));
-             }) &&
-      "We can only zap functions where all live users have a concrete value");
-
-  for (BasicBlock &BB : F) {
-    if (CallInst *CI = BB.getTerminatingMustTailCall()) {
-      LLVM_DEBUG(dbgs() << "Can't zap return of the block due to present "
-                        << "musttail call : " << *CI << "\n");
-      (void)CI;
-      return;
-    }
-
-    if (auto *RI = dyn_cast<ReturnInst>(BB.getTerminator()))
-      if (!isa<UndefValue>(RI->getOperand(0)))
-        ReturnsToZap.push_back(RI);
-  }
-}
-
-static bool removeNonFeasibleEdges(const SCCPSolver &Solver, BasicBlock *BB,
-                                   DomTreeUpdater &DTU) {
-  SmallPtrSet<BasicBlock *, 8> FeasibleSuccessors;
-  bool HasNonFeasibleEdges = false;
-  for (BasicBlock *Succ : successors(BB)) {
-    if (Solver.isEdgeFeasible(BB, Succ))
-      FeasibleSuccessors.insert(Succ);
-    else
-      HasNonFeasibleEdges = true;
-  }
-
-  // All edges feasible, nothing to do.
-  if (!HasNonFeasibleEdges)
-    return false;
-
-  // SCCP can only determine non-feasible edges for br, switch and indirectbr.
-  Instruction *TI = BB->getTerminator();
-  assert((isa<BranchInst>(TI) || isa<SwitchInst>(TI) ||
-          isa<IndirectBrInst>(TI)) &&
-         "Terminator must be a br, switch or indirectbr");
-
-  if (FeasibleSuccessors.size() == 1) {
-    // Replace with an unconditional branch to the only feasible successor.
-    BasicBlock *OnlyFeasibleSuccessor = *FeasibleSuccessors.begin();
-    SmallVector<DominatorTree::UpdateType, 8> Updates;
-    bool HaveSeenOnlyFeasibleSuccessor = false;
-    for (BasicBlock *Succ : successors(BB)) {
-      if (Succ == OnlyFeasibleSuccessor && !HaveSeenOnlyFeasibleSuccessor) {
-        // Don't remove the edge to the only feasible successor the first time
-        // we see it. We still do need to remove any multi-edges to it though.
-        HaveSeenOnlyFeasibleSuccessor = true;
-        continue;
-      }
-
-      Succ->removePredecessor(BB);
-      Updates.push_back({DominatorTree::Delete, BB, Succ});
-    }
-
-    BranchInst::Create(OnlyFeasibleSuccessor, BB);
-    TI->eraseFromParent();
-    DTU.applyUpdatesPermissive(Updates);
-  } else if (FeasibleSuccessors.size() > 1) {
-    SwitchInstProfUpdateWrapper SI(*cast<SwitchInst>(TI));
-    SmallVector<DominatorTree::UpdateType, 8> Updates;
-    for (auto CI = SI->case_begin(); CI != SI->case_end();) {
-      if (FeasibleSuccessors.contains(CI->getCaseSuccessor())) {
-        ++CI;
-        continue;
-      }
-
-      BasicBlock *Succ = CI->getCaseSuccessor();
-      Succ->removePredecessor(BB);
-      Updates.push_back({DominatorTree::Delete, BB, Succ});
-      SI.removeCase(CI);
-      // Don't increment CI, as we removed a case.
-    }
-
-    DTU.applyUpdatesPermissive(Updates);
-  } else {
-    llvm_unreachable("Must have at least one feasible successor");
-  }
-  return true;
-}
-
-bool llvm::runIPSCCP(
-    Module &M, const DataLayout &DL,
-    std::function<const TargetLibraryInfo &(Function &)> GetTLI,
-    function_ref<AnalysisResultsForFn(Function &)> getAnalysis) {
-  SCCPSolver Solver(DL, GetTLI, M.getContext());
-
-  // Loop over all functions, marking arguments to those with their addresses
-  // taken or that are external as overdefined.
-  for (Function &F : M) {
-    if (F.isDeclaration())
-      continue;
-
-    Solver.addAnalysis(F, getAnalysis(F));
-
-    // Determine if we can track the function's return values. If so, add the
-    // function to the solver's set of return-tracked functions.
-    if (canTrackReturnsInterprocedurally(&F))
-      Solver.addTrackedFunction(&F);
-
-    // Determine if we can track the function's arguments. If so, add the
-    // function to the solver's set of argument-tracked functions.
-    if (canTrackArgumentsInterprocedurally(&F)) {
-      Solver.addArgumentTrackedFunction(&F);
-      continue;
-    }
-
-    // Assume the function is called.
-    Solver.markBlockExecutable(&F.front());
-
-    // Assume nothing about the incoming arguments.
-    for (Argument &AI : F.args())
-      Solver.markOverdefined(&AI);
-  }
-
-  // Determine if we can track any of the module's global variables. If so, add
-  // the global variables we can track to the solver's set of tracked global
-  // variables.
-  for (GlobalVariable &G : M.globals()) {
-    G.removeDeadConstantUsers();
-    if (canTrackGlobalVariableInterprocedurally(&G))
-      Solver.trackValueOfGlobalVariable(&G);
-  }
-
-  // Solve for constants.
-  bool ResolvedUndefs = true;
-  Solver.solve();
-  while (ResolvedUndefs) {
-    LLVM_DEBUG(dbgs() << "RESOLVING UNDEFS\n");
-    ResolvedUndefs = false;
-    for (Function &F : M) {
-      if (Solver.resolvedUndefsIn(F))
-        ResolvedUndefs = true;
-    }
-    if (ResolvedUndefs)
-      Solver.solve();
-  }
-
-  bool MadeChanges = false;
-
-  // Iterate over all of the instructions in the module, replacing them with
-  // constants if we have found them to be of constant values.
-
-  for (Function &F : M) {
-    if (F.isDeclaration())
-      continue;
-
-    SmallVector<BasicBlock *, 512> BlocksToErase;
-
-    if (Solver.isBlockExecutable(&F.front())) {
-      bool ReplacedPointerArg = false;
-      for (Argument &Arg : F.args()) {
-        if (!Arg.use_empty() && tryToReplaceWithConstant(Solver, &Arg)) {
-          ReplacedPointerArg |= Arg.getType()->isPointerTy();
-          ++IPNumArgsElimed;
-        }
-      }
-
-      // If we replaced an argument, the argmemonly and
-      // inaccessiblemem_or_argmemonly attributes do not hold any longer. Remove
-      // them from both the function and callsites.
-      if (ReplacedPointerArg) {
-        AttrBuilder AttributesToRemove;
-        AttributesToRemove.addAttribute(Attribute::ArgMemOnly);
-        AttributesToRemove.addAttribute(Attribute::InaccessibleMemOrArgMemOnly);
-        F.removeAttributes(AttributeList::FunctionIndex, AttributesToRemove);
-
-        for (User *U : F.users()) {
-          auto *CB = dyn_cast<CallBase>(U);
-          if (!CB || CB->getCalledFunction() != &F)
-            continue;
-
-          CB->removeAttributes(AttributeList::FunctionIndex,
-                               AttributesToRemove);
-        }
-      }
-    }
-
-    SmallPtrSet<Value *, 32> InsertedValues;
-    for (BasicBlock &BB : F) {
-      if (!Solver.isBlockExecutable(&BB)) {
-        LLVM_DEBUG(dbgs() << "  BasicBlock Dead:" << BB);
-        ++NumDeadBlocks;
-
-        MadeChanges = true;
-
-        if (&BB != &F.front())
-          BlocksToErase.push_back(&BB);
-        continue;
-      }
-
-      MadeChanges |= simplifyInstsInBlock(Solver, BB, InsertedValues,
-                                          IPNumInstRemoved, IPNumInstReplaced);
-    }
-
-    DomTreeUpdater DTU = Solver.getDTU(F);
-    // Change dead blocks to unreachable. We do it after replacing constants
-    // in all executable blocks, because changeToUnreachable may remove PHI
-    // nodes in executable blocks we found values for. The function's entry
-    // block is not part of BlocksToErase, so we have to handle it separately.
-    for (BasicBlock *BB : BlocksToErase) {
-      NumInstRemoved += changeToUnreachable(BB->getFirstNonPHI(),
-                                            /*PreserveLCSSA=*/false, &DTU);
-    }
-    if (!Solver.isBlockExecutable(&F.front()))
-      NumInstRemoved += changeToUnreachable(F.front().getFirstNonPHI(),
-                                            /*PreserveLCSSA=*/false, &DTU);
-
-    for (BasicBlock &BB : F)
-      MadeChanges |= removeNonFeasibleEdges(Solver, &BB, DTU);
-
-    for (BasicBlock *DeadBB : BlocksToErase)
-      DTU.deleteBB(DeadBB);
-
-    for (BasicBlock &BB : F) {
-      for (BasicBlock::iterator BI = BB.begin(), E = BB.end(); BI != E;) {
-        Instruction *Inst = &*BI++;
-        if (Solver.getPredicateInfoFor(Inst)) {
-          if (auto *II = dyn_cast<IntrinsicInst>(Inst)) {
-            if (II->getIntrinsicID() == Intrinsic::ssa_copy) {
-              Value *Op = II->getOperand(0);
-              Inst->replaceAllUsesWith(Op);
-              Inst->eraseFromParent();
-            }
-          }
-        }
-      }
-    }
-  }
-
-  // If we inferred constant or undef return values for a function, we replaced
-  // all call uses with the inferred value.  This means we don't need to bother
-  // actually returning anything from the function.  Replace all return
-  // instructions with return undef.
-  //
-  // Do this in two stages: first identify the functions we should process, then
-  // actually zap their returns.  This is important because we can only do this
-  // if the address of the function isn't taken.  In cases where a return is the
-  // last use of a function, the order of processing functions would affect
-  // whether other functions are optimizable.
-  SmallVector<ReturnInst*, 8> ReturnsToZap;
-
-  for (const auto &I : Solver.getTrackedRetVals()) {
-    Function *F = I.first;
-    const ValueLatticeElement &ReturnValue = I.second;
-
-    // If there is a known constant range for the return value, add !range
-    // metadata to the function's call sites.
-    if (ReturnValue.isConstantRange() &&
-        !ReturnValue.getConstantRange().isSingleElement()) {
-      // Do not add range metadata if the return value may include undef.
-      if (ReturnValue.isConstantRangeIncludingUndef())
-        continue;
-
-      auto &CR = ReturnValue.getConstantRange();
-      for (User *User : F->users()) {
-        auto *CB = dyn_cast<CallBase>(User);
-        if (!CB || CB->getCalledFunction() != F)
-          continue;
-
-        // Limit to cases where the return value is guaranteed to be neither
-        // poison nor undef. Poison will be outside any range and currently
-        // values outside of the specified range cause immediate undefined
-        // behavior.
-        if (!isGuaranteedNotToBeUndefOrPoison(CB, nullptr, CB))
-          continue;
-
-        // Do not touch existing metadata for now.
-        // TODO: We should be able to take the intersection of the existing
-        // metadata and the inferred range.
-        if (CB->getMetadata(LLVMContext::MD_range))
-          continue;
-
-        LLVMContext &Context = CB->getParent()->getContext();
-        Metadata *RangeMD[] = {
-            ConstantAsMetadata::get(ConstantInt::get(Context, CR.getLower())),
-            ConstantAsMetadata::get(ConstantInt::get(Context, CR.getUpper()))};
-        CB->setMetadata(LLVMContext::MD_range, MDNode::get(Context, RangeMD));
-      }
-      continue;
-    }
-    if (F->getReturnType()->isVoidTy())
-      continue;
-    if (isConstant(ReturnValue) || ReturnValue.isUnknownOrUndef())
-      findReturnsToZap(*F, ReturnsToZap, Solver);
-  }
-
-  for (auto F : Solver.getMRVFunctionsTracked()) {
-    assert(F->getReturnType()->isStructTy() &&
-           "The return type should be a struct");
-    StructType *STy = cast<StructType>(F->getReturnType());
-    if (Solver.isStructLatticeConstant(F, STy))
-      findReturnsToZap(*F, ReturnsToZap, Solver);
-  }
-
-  // Zap all returns which we've identified as zap to change.
-  SmallSetVector<Function *, 8> FuncZappedReturn;
-  for (unsigned i = 0, e = ReturnsToZap.size(); i != e; ++i) {
-    Function *F = ReturnsToZap[i]->getParent()->getParent();
-    ReturnsToZap[i]->setOperand(0, UndefValue::get(F->getReturnType()));
-    // Record all functions that are zapped.
-    FuncZappedReturn.insert(F);
-  }
-
-  // Remove the returned attribute for zapped functions and the
-  // corresponding call sites.
-  for (Function *F : FuncZappedReturn) {
-    for (Argument &A : F->args())
-      F->removeParamAttr(A.getArgNo(), Attribute::Returned);
-    for (Use &U : F->uses()) {
-      // Skip over blockaddr users.
-      if (isa<BlockAddress>(U.getUser()))
-        continue;
-      CallBase *CB = cast<CallBase>(U.getUser());
-      for (Use &Arg : CB->args())
-        CB->removeParamAttr(CB->getArgOperandNo(&Arg), Attribute::Returned);
-    }
-  }
-
-  // If we inferred constant or undef values for globals variables, we can
-  // delete the global and any stores that remain to it.
-  for (auto &I : make_early_inc_range(Solver.getTrackedGlobals())) {
-    GlobalVariable *GV = I.first;
-    if (isOverdefined(I.second))
-      continue;
-    LLVM_DEBUG(dbgs() << "Found that GV '" << GV->getName()
-                      << "' is constant!\n");
-    while (!GV->use_empty()) {
-      StoreInst *SI = cast<StoreInst>(GV->user_back());
-      SI->eraseFromParent();
-      MadeChanges = true;
-    }
-    M.getGlobalList().erase(GV);
-    ++IPNumGlobalConst;
-  }
-
-  return MadeChanges;
-}
diff --git a/gnu/llvm/llvm/lib/Transforms/Utils/MisExpect.cpp b/gnu/llvm/llvm/lib/Transforms/Utils/MisExpect.cpp
new file mode 100644
index 00000000000..6f5a25a2682
--- /dev/null
+++ b/gnu/llvm/llvm/lib/Transforms/Utils/MisExpect.cpp
@@ -0,0 +1,214 @@
+//===--- MisExpect.cpp - Check the use of llvm.expect with PGO data -------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This contains code to emit warnings for potentially incorrect usage of the
+// llvm.expect intrinsic. This utility extracts the threshold values from
+// metadata associated with the instrumented Branch or Switch instruction. The
+// threshold values are then used to determine if a warning should be emmited.
+//
+// MisExpect's implementation relies on two assumptions about how branch weights
+// are managed in LLVM.
+//
+// 1) Frontend profiling weights are always in place before llvm.expect is
+// lowered in LowerExpectIntrinsic.cpp. Frontend based instrumentation therefore
+// needs to extract the branch weights and then compare them to the weights
+// being added by the llvm.expect intrinsic lowering.
+//
+// 2) Sampling and IR based profiles will *only* have branch weight metadata
+// before profiling data is consulted if they are from a lowered llvm.expect
+// intrinsic. These profiles thus always extract the expected weights and then
+// compare them to the weights collected during profiling to determine if a
+// diagnostic message is warranted.
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/Transforms/Utils/MisExpect.h"
+#include "llvm/ADT/Twine.h"
+#include "llvm/Analysis/OptimizationRemarkEmitter.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/DiagnosticInfo.h"
+#include "llvm/IR/Instruction.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/LLVMContext.h"
+#include "llvm/IR/ProfDataUtils.h"
+#include "llvm/Support/BranchProbability.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/Support/FormatVariadic.h"
+#include <algorithm>
+#include <cstdint>
+#include <functional>
+#include <numeric>
+
+#define DEBUG_TYPE "misexpect"
+
+using namespace llvm;
+using namespace misexpect;
+
+namespace llvm {
+
+// Command line option to enable/disable the warning when profile data suggests
+// a mismatch with the use of the llvm.expect intrinsic
+static cl::opt<bool> PGOWarnMisExpect(
+    "pgo-warn-misexpect", cl::init(false), cl::Hidden,
+    cl::desc("Use this option to turn on/off "
+             "warnings about incorrect usage of llvm.expect intrinsics."));
+
+static cl::opt<uint32_t> MisExpectTolerance(
+    "misexpect-tolerance", cl::init(0),
+    cl::desc("Prevents emiting diagnostics when profile counts are "
+             "within N% of the threshold.."));
+
+} // namespace llvm
+
+namespace {
+
+bool isMisExpectDiagEnabled(LLVMContext &Ctx) {
+  return PGOWarnMisExpect || Ctx.getMisExpectWarningRequested();
+}
+
+uint32_t getMisExpectTolerance(LLVMContext &Ctx) {
+  return std::max(static_cast<uint32_t>(MisExpectTolerance),
+                  Ctx.getDiagnosticsMisExpectTolerance());
+}
+
+Instruction *getInstCondition(Instruction *I) {
+  assert(I != nullptr && "MisExpect target Instruction cannot be nullptr");
+  Instruction *Ret = nullptr;
+  if (auto *B = dyn_cast<BranchInst>(I)) {
+    Ret = dyn_cast<Instruction>(B->getCondition());
+  }
+  // TODO: Find a way to resolve condition location for switches
+  // Using the condition of the switch seems to often resolve to an earlier
+  // point in the program, i.e. the calculation of the switch condition, rather
+  // than the switch's location in the source code. Thus, we should use the
+  // instruction to get source code locations rather than the condition to
+  // improve diagnostic output, such as the caret. If the same problem exists
+  // for branch instructions, then we should remove this function and directly
+  // use the instruction
+  //
+  else if (auto *S = dyn_cast<SwitchInst>(I)) {
+    Ret = dyn_cast<Instruction>(S->getCondition());
+  }
+  return Ret ? Ret : I;
+}
+
+void emitMisexpectDiagnostic(Instruction *I, LLVMContext &Ctx,
+                             uint64_t ProfCount, uint64_t TotalCount) {
+  double PercentageCorrect = (double)ProfCount / TotalCount;
+  auto PerString =
+      formatv("{0:P} ({1} / {2})", PercentageCorrect, ProfCount, TotalCount);
+  auto RemStr = formatv(
+      "Potential performance regression from use of the llvm.expect intrinsic: "
+      "Annotation was correct on {0} of profiled executions.",
+      PerString);
+  Twine Msg(PerString);
+  Instruction *Cond = getInstCondition(I);
+  if (isMisExpectDiagEnabled(Ctx))
+    Ctx.diagnose(DiagnosticInfoMisExpect(Cond, Msg));
+  OptimizationRemarkEmitter ORE(I->getParent()->getParent());
+  ORE.emit(OptimizationRemark(DEBUG_TYPE, "misexpect", Cond) << RemStr.str());
+}
+
+} // namespace
+
+namespace llvm {
+namespace misexpect {
+
+void verifyMisExpect(Instruction &I, ArrayRef<uint32_t> RealWeights,
+                     ArrayRef<uint32_t> ExpectedWeights) {
+  // To determine if we emit a diagnostic, we need to compare the branch weights
+  // from the profile to those added by the llvm.expect intrinsic.
+  // So first, we extract the "likely" and "unlikely" weights from
+  // ExpectedWeights And determine the correct weight in the profile to compare
+  // against.
+  uint64_t LikelyBranchWeight = 0,
+           UnlikelyBranchWeight = std::numeric_limits<uint32_t>::max();
+  size_t MaxIndex = 0;
+  for (size_t Idx = 0, End = ExpectedWeights.size(); Idx < End; Idx++) {
+    uint32_t V = ExpectedWeights[Idx];
+    if (LikelyBranchWeight < V) {
+      LikelyBranchWeight = V;
+      MaxIndex = Idx;
+    }
+    if (UnlikelyBranchWeight > V) {
+      UnlikelyBranchWeight = V;
+    }
+  }
+
+  const uint64_t ProfiledWeight = RealWeights[MaxIndex];
+  const uint64_t RealWeightsTotal =
+      std::accumulate(RealWeights.begin(), RealWeights.end(), (uint64_t)0,
+                      std::plus<uint64_t>());
+  const uint64_t NumUnlikelyTargets = RealWeights.size() - 1;
+
+  uint64_t TotalBranchWeight =
+      LikelyBranchWeight + (UnlikelyBranchWeight * NumUnlikelyTargets);
+
+  // FIXME: When we've addressed sample profiling, restore the assertion
+  //
+  // We cannot calculate branch probability if either of these invariants aren't
+  // met. However, MisExpect diagnostics should not prevent code from compiling,
+  // so we simply forgo emitting diagnostics here, and return early.
+  // assert((TotalBranchWeight >= LikelyBranchWeight) && (TotalBranchWeight > 0)
+  //              && "TotalBranchWeight is less than the Likely branch weight");
+  if ((TotalBranchWeight == 0) || (TotalBranchWeight <= LikelyBranchWeight))
+    return;
+
+  // To determine our threshold value we need to obtain the branch probability
+  // for the weights added by llvm.expect and use that proportion to calculate
+  // our threshold based on the collected profile data.
+  auto LikelyProbablilty = BranchProbability::getBranchProbability(
+      LikelyBranchWeight, TotalBranchWeight);
+
+  uint64_t ScaledThreshold = LikelyProbablilty.scale(RealWeightsTotal);
+
+  // clamp tolerance range to [0, 100)
+  auto Tolerance = getMisExpectTolerance(I.getContext());
+  Tolerance = std::clamp(Tolerance, 0u, 99u);
+
+  // Allow users to relax checking by N%  i.e., if they use a 5% tolerance,
+  // then we check against 0.95*ScaledThreshold
+  if (Tolerance > 0)
+    ScaledThreshold *= (1.0 - Tolerance / 100.0);
+
+  // When the profile weight is below the threshold, we emit the diagnostic
+  if (ProfiledWeight < ScaledThreshold)
+    emitMisexpectDiagnostic(&I, I.getContext(), ProfiledWeight,
+                            RealWeightsTotal);
+}
+
+void checkBackendInstrumentation(Instruction &I,
+                                 const ArrayRef<uint32_t> RealWeights) {
+  SmallVector<uint32_t> ExpectedWeights;
+  if (!extractBranchWeights(I, ExpectedWeights))
+    return;
+  verifyMisExpect(I, RealWeights, ExpectedWeights);
+}
+
+void checkFrontendInstrumentation(Instruction &I,
+                                  const ArrayRef<uint32_t> ExpectedWeights) {
+  SmallVector<uint32_t> RealWeights;
+  if (!extractBranchWeights(I, RealWeights))
+    return;
+  verifyMisExpect(I, RealWeights, ExpectedWeights);
+}
+
+void checkExpectAnnotations(Instruction &I,
+                            const ArrayRef<uint32_t> ExistingWeights,
+                            bool IsFrontend) {
+  if (IsFrontend) {
+    checkFrontendInstrumentation(I, ExistingWeights);
+  } else {
+    checkBackendInstrumentation(I, ExistingWeights);
+  }
+}
+
+} // namespace misexpect
+} // namespace llvm
+#undef DEBUG_TYPE
diff --git a/gnu/llvm/llvm/lib/Transforms/Vectorize/VPlanLoopInfo.h b/gnu/llvm/llvm/lib/Transforms/Vectorize/VPlanLoopInfo.h
deleted file mode 100644
index 5208f2d58e2..00000000000
--- a/gnu/llvm/llvm/lib/Transforms/Vectorize/VPlanLoopInfo.h
+++ /dev/null
@@ -1,44 +0,0 @@
-//===-- VPLoopInfo.h --------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-///
-/// \file
-/// This file defines VPLoopInfo analysis and VPLoop class. VPLoopInfo is a
-/// specialization of LoopInfoBase for VPBlockBase. VPLoops is a specialization
-/// of LoopBase that is used to hold loop metadata from VPLoopInfo. Further
-/// information can be found in VectorizationPlanner.rst.
-///
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TRANSFORMS_VECTORIZE_VPLOOPINFO_H
-#define LLVM_TRANSFORMS_VECTORIZE_VPLOOPINFO_H
-
-#include "llvm/Analysis/LoopInfoImpl.h"
-
-namespace llvm {
-class VPBlockBase;
-
-/// Hold analysis information for every loop detected by VPLoopInfo. It is an
-/// instantiation of LoopBase.
-class VPLoop : public LoopBase<VPBlockBase, VPLoop> {
-private:
-  friend class LoopInfoBase<VPBlockBase, VPLoop>;
-  explicit VPLoop(VPBlockBase *VPB) : LoopBase<VPBlockBase, VPLoop>(VPB) {}
-};
-
-/// VPLoopInfo provides analysis of natural loop for VPBlockBase-based
-/// Hierarchical CFG. It is a specialization of LoopInfoBase class.
-// TODO: VPLoopInfo is initially computed on top of the VPlan plain CFG, which
-// is the same as the incoming IR CFG. If it's more efficient than running the
-// whole loop detection algorithm, we may want to create a mechanism to
-// translate LoopInfo into VPLoopInfo. However, that would require significant
-// changes in LoopInfoBase class.
-typedef LoopInfoBase<VPBlockBase, VPLoop> VPLoopInfo;
-
-} // namespace llvm
-
-#endif // LLVM_TRANSFORMS_VECTORIZE_VPLOOPINFO_H
diff --git a/gnu/llvm/llvm/lib/Transforms/Vectorize/VPlanPredicator.cpp b/gnu/llvm/llvm/lib/Transforms/Vectorize/VPlanPredicator.cpp
deleted file mode 100644
index ac3b3505dc3..00000000000
--- a/gnu/llvm/llvm/lib/Transforms/Vectorize/VPlanPredicator.cpp
+++ /dev/null
@@ -1,248 +0,0 @@
-//===-- VPlanPredicator.cpp -------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-///
-/// \file
-/// This file implements the VPlanPredicator class which contains the public
-/// interfaces to predicate and linearize the VPlan region.
-///
-//===----------------------------------------------------------------------===//
-
-#include "VPlanPredicator.h"
-#include "VPlan.h"
-#include "llvm/ADT/DepthFirstIterator.h"
-#include "llvm/ADT/GraphTraits.h"
-#include "llvm/ADT/PostOrderIterator.h"
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/raw_ostream.h"
-
-#define DEBUG_TYPE "VPlanPredicator"
-
-using namespace llvm;
-
-// Generate VPInstructions at the beginning of CurrBB that calculate the
-// predicate being propagated from PredBB to CurrBB depending on the edge type
-// between them. For example if:
-//  i.  PredBB is controlled by predicate %BP, and
-//  ii. The edge PredBB->CurrBB is the false edge, controlled by the condition
-//  bit value %CBV then this function will generate the following two
-//  VPInstructions at the start of CurrBB:
-//   %IntermediateVal = not %CBV
-//   %FinalVal        = and %BP %IntermediateVal
-// It returns %FinalVal.
-VPValue *VPlanPredicator::getOrCreateNotPredicate(VPBasicBlock *PredBB,
-                                                  VPBasicBlock *CurrBB) {
-  VPValue *CBV = PredBB->getCondBit();
-
-  // Set the intermediate value - this is either 'CBV', or 'not CBV'
-  // depending on the edge type.
-  EdgeType ET = getEdgeTypeBetween(PredBB, CurrBB);
-  VPValue *IntermediateVal = nullptr;
-  switch (ET) {
-  case EdgeType::TRUE_EDGE:
-    // CurrBB is the true successor of PredBB - nothing to do here.
-    IntermediateVal = CBV;
-    break;
-
-  case EdgeType::FALSE_EDGE:
-    // CurrBB is the False successor of PredBB - compute not of CBV.
-    IntermediateVal = Builder.createNot(CBV);
-    break;
-  }
-
-  // Now AND intermediate value with PredBB's block predicate if it has one.
-  VPValue *BP = PredBB->getPredicate();
-  if (BP)
-    return Builder.createAnd(BP, IntermediateVal);
-  else
-    return IntermediateVal;
-}
-
-// Generate a tree of ORs for all IncomingPredicates in  WorkList.
-// Note: This function destroys the original Worklist.
-//
-// P1 P2 P3 P4 P5
-//  \ /   \ /  /
-//  OR1   OR2 /
-//    \    | /
-//     \   +/-+
-//      \  /  |
-//       OR3  |
-//         \  |
-//          OR4 <- Returns this
-//           |
-//
-// The algorithm uses a worklist of predicates as its main data structure.
-// We pop a pair of values from the front (e.g. P1 and P2), generate an OR
-// (in this example OR1), and push it back. In this example the worklist
-// contains {P3, P4, P5, OR1}.
-// The process iterates until we have only one element in the Worklist (OR4).
-// The last element is the root predicate which is returned.
-VPValue *VPlanPredicator::genPredicateTree(std::list<VPValue *> &Worklist) {
-  if (Worklist.empty())
-    return nullptr;
-
-  // The worklist initially contains all the leaf nodes. Initialize the tree
-  // using them.
-  while (Worklist.size() >= 2) {
-    // Pop a pair of values from the front.
-    VPValue *LHS = Worklist.front();
-    Worklist.pop_front();
-    VPValue *RHS = Worklist.front();
-    Worklist.pop_front();
-
-    // Create an OR of these values.
-    VPValue *Or = Builder.createOr(LHS, RHS);
-
-    // Push OR to the back of the worklist.
-    Worklist.push_back(Or);
-  }
-
-  assert(Worklist.size() == 1 && "Expected 1 item in worklist");
-
-  // The root is the last node in the worklist.
-  VPValue *Root = Worklist.front();
-
-  // This root needs to replace the existing block predicate. This is done in
-  // the caller function.
-  return Root;
-}
-
-// Return whether the edge FromBlock -> ToBlock is a TRUE_EDGE or FALSE_EDGE
-VPlanPredicator::EdgeType
-VPlanPredicator::getEdgeTypeBetween(VPBlockBase *FromBlock,
-                                    VPBlockBase *ToBlock) {
-  unsigned Count = 0;
-  for (VPBlockBase *SuccBlock : FromBlock->getSuccessors()) {
-    if (SuccBlock == ToBlock) {
-      assert(Count < 2 && "Switch not supported currently");
-      return (Count == 0) ? EdgeType::TRUE_EDGE : EdgeType::FALSE_EDGE;
-    }
-    Count++;
-  }
-
-  llvm_unreachable("Broken getEdgeTypeBetween");
-}
-
-// Generate all predicates needed for CurrBlock by going through its immediate
-// predecessor blocks.
-void VPlanPredicator::createOrPropagatePredicates(VPBlockBase *CurrBlock,
-                                                  VPRegionBlock *Region) {
-  // Blocks that dominate region exit inherit the predicate from the region.
-  // Return after setting the predicate.
-  if (VPDomTree.dominates(CurrBlock, Region->getExit())) {
-    VPValue *RegionBP = Region->getPredicate();
-    CurrBlock->setPredicate(RegionBP);
-    return;
-  }
-
-  // Collect all incoming predicates in a worklist.
-  std::list<VPValue *> IncomingPredicates;
-
-  // Set the builder's insertion point to the top of the current BB
-  VPBasicBlock *CurrBB = cast<VPBasicBlock>(CurrBlock->getEntryBasicBlock());
-  Builder.setInsertPoint(CurrBB, CurrBB->begin());
-
-  // For each predecessor, generate the VPInstructions required for
-  // computing 'BP AND (not) CBV" at the top of CurrBB.
-  // Collect the outcome of this calculation for all predecessors
-  // into IncomingPredicates.
-  for (VPBlockBase *PredBlock : CurrBlock->getPredecessors()) {
-    // Skip back-edges
-    if (VPBlockUtils::isBackEdge(PredBlock, CurrBlock, VPLI))
-      continue;
-
-    VPValue *IncomingPredicate = nullptr;
-    unsigned NumPredSuccsNoBE =
-        VPBlockUtils::countSuccessorsNoBE(PredBlock, VPLI);
-
-    // If there is an unconditional branch to the currBB, then we don't create
-    // edge predicates. We use the predecessor's block predicate instead.
-    if (NumPredSuccsNoBE == 1)
-      IncomingPredicate = PredBlock->getPredicate();
-    else if (NumPredSuccsNoBE == 2) {
-      // Emit recipes into CurrBlock if required
-      assert(isa<VPBasicBlock>(PredBlock) && "Only BBs have multiple exits");
-      IncomingPredicate =
-          getOrCreateNotPredicate(cast<VPBasicBlock>(PredBlock), CurrBB);
-    } else
-      llvm_unreachable("FIXME: switch statement ?");
-
-    if (IncomingPredicate)
-      IncomingPredicates.push_back(IncomingPredicate);
-  }
-
-  // Logically OR all incoming predicates by building the Predicate Tree.
-  VPValue *Predicate = genPredicateTree(IncomingPredicates);
-
-  // Now update the block's predicate with the new one.
-  CurrBlock->setPredicate(Predicate);
-}
-
-// Generate all predicates needed for Region.
-void VPlanPredicator::predicateRegionRec(VPRegionBlock *Region) {
-  VPBasicBlock *EntryBlock = cast<VPBasicBlock>(Region->getEntry());
-  ReversePostOrderTraversal<VPBlockBase *> RPOT(EntryBlock);
-
-  // Generate edge predicates and append them to the block predicate. RPO is
-  // necessary since the predecessor blocks' block predicate needs to be set
-  // before the current block's block predicate can be computed.
-  for (VPBlockBase *Block : RPOT) {
-    // TODO: Handle nested regions once we start generating the same.
-    assert(!isa<VPRegionBlock>(Block) && "Nested region not expected");
-    createOrPropagatePredicates(Block, Region);
-  }
-}
-
-// Linearize the CFG within Region.
-// TODO: Predication and linearization need RPOT for every region.
-// This traversal is expensive. Since predication is not adding new
-// blocks, we should be able to compute RPOT once in predication and
-// reuse it here. This becomes even more important once we have nested
-// regions.
-void VPlanPredicator::linearizeRegionRec(VPRegionBlock *Region) {
-  ReversePostOrderTraversal<VPBlockBase *> RPOT(Region->getEntry());
-  VPBlockBase *PrevBlock = nullptr;
-
-  for (VPBlockBase *CurrBlock : RPOT) {
-    // TODO: Handle nested regions once we start generating the same.
-    assert(!isa<VPRegionBlock>(CurrBlock) && "Nested region not expected");
-
-    // Linearize control flow by adding an unconditional edge between PrevBlock
-    // and CurrBlock skipping loop headers and latches to keep intact loop
-    // header predecessors and loop latch successors.
-    if (PrevBlock && !VPLI->isLoopHeader(CurrBlock) &&
-        !VPBlockUtils::blockIsLoopLatch(PrevBlock, VPLI)) {
-
-      LLVM_DEBUG(dbgs() << "Linearizing: " << PrevBlock->getName() << "->"
-                        << CurrBlock->getName() << "\n");
-
-      PrevBlock->clearSuccessors();
-      CurrBlock->clearPredecessors();
-      VPBlockUtils::connectBlocks(PrevBlock, CurrBlock);
-    }
-
-    PrevBlock = CurrBlock;
-  }
-}
-
-// Entry point. The driver function for the predicator.
-void VPlanPredicator::predicate(void) {
-  // Predicate the blocks within Region.
-  predicateRegionRec(cast<VPRegionBlock>(Plan.getEntry()));
-
-  // Linearlize the blocks with Region.
-  linearizeRegionRec(cast<VPRegionBlock>(Plan.getEntry()));
-}
-
-VPlanPredicator::VPlanPredicator(VPlan &Plan)
-    : Plan(Plan), VPLI(&(Plan.getVPLoopInfo())) {
-  // FIXME: Predicator is currently computing the dominator information for the
-  // top region. Once we start storing dominator information in a VPRegionBlock,
-  // we can avoid this recalculation.
-  VPDomTree.recalculate(*(cast<VPRegionBlock>(Plan.getEntry())));
-}
diff --git a/gnu/llvm/llvm/lib/Transforms/Vectorize/VPlanPredicator.h b/gnu/llvm/llvm/lib/Transforms/Vectorize/VPlanPredicator.h
deleted file mode 100644
index 692afd2978d..00000000000
--- a/gnu/llvm/llvm/lib/Transforms/Vectorize/VPlanPredicator.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//===-- VPlanPredicator.h ---------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-///
-/// \file
-/// This file defines the VPlanPredicator class which contains the public
-/// interfaces to predicate and linearize the VPlan region.
-///
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TRANSFORMS_VECTORIZE_VPLAN_PREDICATOR_H
-#define LLVM_TRANSFORMS_VECTORIZE_VPLAN_PREDICATOR_H
-
-#include "LoopVectorizationPlanner.h"
-#include "VPlan.h"
-#include "VPlanDominatorTree.h"
-
-namespace llvm {
-
-class VPlanPredicator {
-private:
-  enum class EdgeType {
-    TRUE_EDGE,
-    FALSE_EDGE,
-  };
-
-  // VPlan being predicated.
-  VPlan &Plan;
-
-  // VPLoopInfo for Plan's HCFG.
-  VPLoopInfo *VPLI;
-
-  // Dominator tree for Plan's HCFG.
-  VPDominatorTree VPDomTree;
-
-  // VPlan builder used to generate VPInstructions for block predicates.
-  VPBuilder Builder;
-
-  /// Get the type of edge from \p FromBlock to \p ToBlock. Returns TRUE_EDGE if
-  /// \p ToBlock is either the unconditional successor or the conditional true
-  /// successor of \p FromBlock and FALSE_EDGE otherwise.
-  EdgeType getEdgeTypeBetween(VPBlockBase *FromBlock, VPBlockBase *ToBlock);
-
-  /// Create and return VPValue corresponding to the predicate for the edge from
-  /// \p PredBB to \p CurrentBlock.
-  VPValue *getOrCreateNotPredicate(VPBasicBlock *PredBB, VPBasicBlock *CurrBB);
-
-  /// Generate and return the result of ORing all the predicate VPValues in \p
-  /// Worklist.
-  VPValue *genPredicateTree(std::list<VPValue *> &Worklist);
-
-  /// Create or propagate predicate for \p CurrBlock in region \p Region using
-  /// predicate(s) of its predecessor(s)
-  void createOrPropagatePredicates(VPBlockBase *CurrBlock,
-                                   VPRegionBlock *Region);
-
-  /// Predicate the CFG within \p Region.
-  void predicateRegionRec(VPRegionBlock *Region);
-
-  /// Linearize the CFG within \p Region.
-  void linearizeRegionRec(VPRegionBlock *Region);
-
-public:
-  VPlanPredicator(VPlan &Plan);
-
-  /// Predicate Plan's HCFG.
-  void predicate(void);
-};
-} // end namespace llvm
-#endif // LLVM_TRANSFORMS_VECTORIZE_VPLAN_PREDICATOR_H
diff --git a/gnu/llvm/llvm/tools/lli/RemoteJITUtils.h b/gnu/llvm/llvm/tools/lli/RemoteJITUtils.h
deleted file mode 100644
index cc8d034f62a..00000000000
--- a/gnu/llvm/llvm/tools/lli/RemoteJITUtils.h
+++ /dev/null
@@ -1,125 +0,0 @@
-//===-- RemoteJITUtils.h - Utilities for remote-JITing with LLI -*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Utilities for remote-JITing with LLI.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_LLI_REMOTEJITUTILS_H
-#define LLVM_TOOLS_LLI_REMOTEJITUTILS_H
-
-#include "llvm/ExecutionEngine/Orc/Shared/FDRawByteChannel.h"
-#include "llvm/ExecutionEngine/RTDyldMemoryManager.h"
-#include <mutex>
-
-#if !defined(_MSC_VER) && !defined(__MINGW32__)
-#include <unistd.h>
-#else
-#include <io.h>
-#endif
-
-// launch the remote process (see lli.cpp) and return a channel to it.
-std::unique_ptr<llvm::orc::shared::FDRawByteChannel> launchRemote();
-
-namespace llvm {
-
-// ForwardingMM - Adapter to connect MCJIT to Orc's Remote
-// memory manager.
-class ForwardingMemoryManager : public llvm::RTDyldMemoryManager {
-public:
-  void setMemMgr(std::unique_ptr<RuntimeDyld::MemoryManager> MemMgr) {
-    this->MemMgr = std::move(MemMgr);
-  }
-
-  void setResolver(std::shared_ptr<LegacyJITSymbolResolver> Resolver) {
-    this->Resolver = std::move(Resolver);
-  }
-
-  uint8_t *allocateCodeSection(uintptr_t Size, unsigned Alignment,
-                               unsigned SectionID,
-                               StringRef SectionName) override {
-    return MemMgr->allocateCodeSection(Size, Alignment, SectionID, SectionName);
-  }
-
-  uint8_t *allocateDataSection(uintptr_t Size, unsigned Alignment,
-                               unsigned SectionID, StringRef SectionName,
-                               bool IsReadOnly) override {
-    return MemMgr->allocateDataSection(Size, Alignment, SectionID, SectionName,
-                                       IsReadOnly);
-  }
-
-  void reserveAllocationSpace(uintptr_t CodeSize, uint32_t CodeAlign,
-                              uintptr_t RODataSize, uint32_t RODataAlign,
-                              uintptr_t RWDataSize,
-                              uint32_t RWDataAlign) override {
-    MemMgr->reserveAllocationSpace(CodeSize, CodeAlign, RODataSize, RODataAlign,
-                                   RWDataSize, RWDataAlign);
-  }
-
-  bool needsToReserveAllocationSpace() override {
-    return MemMgr->needsToReserveAllocationSpace();
-  }
-
-  void registerEHFrames(uint8_t *Addr, uint64_t LoadAddr,
-                        size_t Size) override {
-    MemMgr->registerEHFrames(Addr, LoadAddr, Size);
-  }
-
-  void deregisterEHFrames() override {
-    MemMgr->deregisterEHFrames();
-  }
-
-  bool finalizeMemory(std::string *ErrMsg = nullptr) override {
-    return MemMgr->finalizeMemory(ErrMsg);
-  }
-
-  void notifyObjectLoaded(RuntimeDyld &RTDyld,
-                          const object::ObjectFile &Obj) override {
-    MemMgr->notifyObjectLoaded(RTDyld, Obj);
-  }
-
-  // Don't hide the sibling notifyObjectLoaded from RTDyldMemoryManager.
-  using RTDyldMemoryManager::notifyObjectLoaded;
-
-  JITSymbol findSymbol(const std::string &Name) override {
-    return Resolver->findSymbol(Name);
-  }
-
-  JITSymbol
-  findSymbolInLogicalDylib(const std::string &Name) override {
-    return Resolver->findSymbolInLogicalDylib(Name);
-  }
-
-private:
-  std::unique_ptr<RuntimeDyld::MemoryManager> MemMgr;
-  std::shared_ptr<LegacyJITSymbolResolver> Resolver;
-};
-
-template <typename RemoteT>
-class RemoteResolver : public LegacyJITSymbolResolver {
-public:
-
-  RemoteResolver(RemoteT &R) : R(R) {}
-
-  JITSymbol findSymbol(const std::string &Name) override {
-    if (auto Addr = R.getSymbolAddress(Name))
-      return JITSymbol(*Addr, JITSymbolFlags::Exported);
-    else
-      return Addr.takeError();
-  }
-
-  JITSymbol findSymbolInLogicalDylib(const std::string &Name) override {
-    return nullptr;
-  }
-
-public:
-  RemoteT &R;
-};
-}
-
-#endif
diff --git a/gnu/llvm/llvm/tools/llvm-ar/llvm-ar.cpp b/gnu/llvm/llvm/tools/llvm-ar/llvm-ar.cpp
index f9c8b8baf91..c48f0d9e423 100644
--- a/gnu/llvm/llvm/tools/llvm-ar/llvm-ar.cpp
+++ b/gnu/llvm/llvm/tools/llvm-ar/llvm-ar.cpp
@@ -18,10 +18,15 @@
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/Object/Archive.h"
 #include "llvm/Object/ArchiveWriter.h"
+#include "llvm/Object/COFFImportFile.h"
+#include "llvm/Object/ELFObjectFile.h"
 #include "llvm/Object/IRObjectFile.h"
 #include "llvm/Object/MachO.h"
 #include "llvm/Object/ObjectFile.h"
 #include "llvm/Object/SymbolicFile.h"
+#include "llvm/Object/TapiFile.h"
+#include "llvm/Object/Wasm.h"
+#include "llvm/Object/XCOFFObjectFile.h"
 #include "llvm/Support/Chrono.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/ConvertUTF.h"
@@ -54,6 +59,7 @@
 #endif
 
 using namespace llvm;
+using namespace llvm::object;
 
 // The name this program was invoked as.
 static StringRef ToolName;
@@ -61,46 +67,46 @@ static StringRef ToolName;
 // The basename of this program.
 static StringRef Stem;
 
-const char RanlibHelp[] = R"(OVERVIEW: LLVM Ranlib (llvm-ranlib)
-
-  Generate an index for archives
-
-USAGE: llvm-ranlib archive...
-
-OPTIONS:
-  -h --help             - Display available options
-  -v --version          - Display the version of this program
-  -D                    - Use zero for timestamps and uids/gids (default)
-  -U                    - Use actual timestamps and uids/gids
-)";
-
-const char ArHelp[] = R"(OVERVIEW: LLVM Archiver
-
-USAGE: llvm-ar [options] [-]<operation>[modifiers] [relpos] [count] <archive> [files]
-       llvm-ar -M [<mri-script]
+static void printRanLibHelp(StringRef ToolName) {
+  outs() << "OVERVIEW: LLVM ranlib\n\n"
+         << "Generate an index for archives\n\n"
+         << "USAGE: " + ToolName + " archive...\n\n"
+         << "OPTIONS:\n"
+         << "  -h --help             - Display available options\n"
+         << "  -v --version          - Display the version of this program\n"
+         << "  -D                    - Use zero for timestamps and uids/gids "
+            "(default)\n"
+         << "  -U                    - Use actual timestamps and uids/gids\n";
+}
 
-OPTIONS:
+static void printArHelp(StringRef ToolName) {
+  const char ArOptions[] =
+      R"(OPTIONS:
   --format              - archive format to create
     =default            -   default
     =gnu                -   gnu
     =darwin             -   darwin
     =bsd                -   bsd
+    =bigarchive         -   big archive (AIX OS)
   --plugin=<string>     - ignored for compatibility
   -h --help             - display this help and exit
+  --output              - the directory to extract archive members to
   --rsp-quoting         - quoting style for response files
     =posix              -   posix
     =windows            -   windows
+  --thin                - create a thin archive
   --version             - print the version and exit
+  -X{32|64|32_64|any}   - object mode (only for AIX OS)
   @<file>               - read options from <file>
 
 OPERATIONS:
   d - delete [files] from the archive
   m - move [files] in the archive
-  p - print [files] found in the archive
+  p - print contents of [files] found in the archive
   q - quick append [files] to the archive
   r - replace or insert [files] into the archive
   s - act as ranlib
-  t - display contents of archive
+  t - display list of files in archive
   x - extract [files] from the archive
 
 MODIFIERS:
@@ -118,32 +124,41 @@ MODIFIERS:
   [P] - use full names when matching (implied for thin archives)
   [s] - create an archive index (cf. ranlib)
   [S] - do not build a symbol table
-  [T] - create a thin archive
+  [T] - deprecated, use --thin instead
   [u] - update only [files] newer than archive contents
   [U] - use actual timestamps and uids/gids
   [v] - be verbose about actions taken
   [V] - display the version and exit
 )";
 
+  outs() << "OVERVIEW: LLVM Archiver\n\n"
+         << "USAGE: " + ToolName +
+                " [options] [-]<operation>[modifiers] [relpos] "
+                "[count] <archive> [files]\n"
+         << "       " + ToolName + " -M [<mri-script]\n\n";
+
+  outs() << ArOptions;
+}
+
 static void printHelpMessage() {
   if (Stem.contains_insensitive("ranlib"))
-    outs() << RanlibHelp;
+    printRanLibHelp(Stem);
   else if (Stem.contains_insensitive("ar"))
-    outs() << ArHelp;
+    printArHelp(Stem);
 }
 
 static unsigned MRILineNumber;
 static bool ParsingMRIScript;
 
 // Show the error plus the usage message, and exit.
-LLVM_ATTRIBUTE_NORETURN static void badUsage(Twine Error) {
+[[noreturn]] static void badUsage(Twine Error) {
   WithColor::error(errs(), ToolName) << Error << "\n";
   printHelpMessage();
   exit(1);
 }
 
 // Show the error message and exit.
-LLVM_ATTRIBUTE_NORETURN static void fail(Twine Error) {
+[[noreturn]] static void fail(Twine Error) {
   if (ParsingMRIScript) {
     WithColor::error(errs(), ToolName)
         << "script line " << MRILineNumber << ": " << Error << "\n";
@@ -175,12 +190,16 @@ static void failIfError(Error E, Twine Context = "") {
   });
 }
 
+static void warn(Twine Message) {
+  WithColor::warning(errs(), ToolName) << Message << "\n";
+}
+
 static SmallVector<const char *, 256> PositionalArgs;
 
 static bool MRI;
 
 namespace {
-enum Format { Default, GNU, BSD, DARWIN, Unknown };
+enum Format { Default, GNU, BSD, DARWIN, BIGARCHIVE, Unknown };
 }
 
 static Format FormatType = Default;
@@ -200,6 +219,10 @@ enum ArchiveOperation {
   CreateSymTab     ///< Create a symbol table in an existing archive
 };
 
+enum class BitModeTy { Bit32, Bit64, Bit32_64, Any, Unknown };
+
+static BitModeTy BitMode = BitModeTy::Bit32;
+
 // Modifiers to follow operation to vary behavior
 static bool AddAfter = false;             ///< 'a' modifier
 static bool AddBefore = false;            ///< 'b' modifier
@@ -229,6 +252,9 @@ static int CountParam = 0;
 // command line.
 static std::string ArchiveName;
 
+// Output directory specified by --output.
+static std::string OutputDir;
+
 static std::vector<std::unique_ptr<MemoryBuffer>> ArchiveBuffers;
 static std::vector<std::unique_ptr<object::Archive>> Archives;
 
@@ -390,8 +416,6 @@ static ArchiveOperation parseCommandLine() {
       break;
     case 'T':
       Thin = true;
-      // Thin archives store path names, so P should be forced.
-      CompareFullPath = true;
       break;
     case 'L':
       AddLibrary = true;
@@ -407,6 +431,10 @@ static ArchiveOperation parseCommandLine() {
     }
   }
 
+  // Thin archives store path names, so P should be forced.
+  if (Thin)
+    CompareFullPath = true;
+
   // At this point, the next thing on the command line must be
   // the archive name.
   getArchive();
@@ -444,6 +472,19 @@ static ArchiveOperation parseCommandLine() {
   if (AddLibrary && Operation != QuickAppend)
     badUsage("the 'L' modifier is only applicable to the 'q' operation");
 
+  if (!OutputDir.empty()) {
+    if (Operation != Extract)
+      badUsage("--output is only applicable to the 'x' operation");
+    bool IsDir = false;
+    // If OutputDir is not a directory, create_directories may still succeed if
+    // all components of the path prefix are directories. Test is_directory as
+    // well.
+    if (!sys::fs::create_directories(OutputDir))
+      sys::fs::is_directory(OutputDir, IsDir);
+    if (!IsDir)
+      fail("'" + OutputDir + "' is not a directory");
+  }
+
   // Return the parsed operation to the caller
   return Operation;
 }
@@ -544,7 +585,15 @@ static void doExtract(StringRef Name, const object::Archive::Child &C) {
   failIfError(ModeOrErr.takeError());
   sys::fs::perms Mode = ModeOrErr.get();
 
-  llvm::StringRef outputFilePath = sys::path::filename(Name);
+  StringRef outputFilePath;
+  SmallString<128> path;
+  if (OutputDir.empty()) {
+    outputFilePath = sys::path::filename(Name);
+  } else {
+    sys::path::append(path, OutputDir, sys::path::filename(Name));
+    outputFilePath = path.str();
+  }
+
   if (Verbose)
     outs() << "x - " << outputFilePath << '\n';
 
@@ -597,6 +646,71 @@ static bool shouldCreateArchive(ArchiveOperation Op) {
   llvm_unreachable("Missing entry in covered switch.");
 }
 
+static bool is64BitSymbolicFile(SymbolicFile &Obj) {
+  if (auto *IRObj = dyn_cast<IRObjectFile>(&Obj))
+    return Triple(IRObj->getTargetTriple()).isArch64Bit();
+  if (isa<COFFObjectFile>(Obj) || isa<COFFImportFile>(Obj))
+    return false;
+  if (XCOFFObjectFile *XCOFFObj = dyn_cast<XCOFFObjectFile>(&Obj))
+    return XCOFFObj->is64Bit();
+  if (isa<WasmObjectFile>(Obj))
+    return false;
+  if (TapiFile *Tapi = dyn_cast<TapiFile>(&Obj))
+    return Tapi->is64Bit();
+  if (MachOObjectFile *MachO = dyn_cast<MachOObjectFile>(&Obj))
+    return MachO->is64Bit();
+  if (ELFObjectFileBase *ElfO = dyn_cast<ELFObjectFileBase>(&Obj))
+    return ElfO->getBytesInAddress() == 8;
+
+  fail("unsupported file format");
+}
+
+static bool isValidInBitMode(Binary &Bin) {
+  if (BitMode == BitModeTy::Bit32_64 || BitMode == BitModeTy::Any)
+    return true;
+
+  if (SymbolicFile *SymFile = dyn_cast<SymbolicFile>(&Bin)) {
+    bool Is64Bit = is64BitSymbolicFile(*SymFile);
+    if ((Is64Bit && (BitMode == BitModeTy::Bit32)) ||
+        (!Is64Bit && (BitMode == BitModeTy::Bit64)))
+      return false;
+  }
+  // In AIX "ar", non-object files are always considered to have a valid bit
+  // mode.
+  return true;
+}
+
+Expected<std::unique_ptr<Binary>> getAsBinary(const NewArchiveMember &NM,
+                                              LLVMContext *Context) {
+  auto BinaryOrErr = createBinary(NM.Buf->getMemBufferRef(), Context);
+  if (BinaryOrErr)
+    return std::move(*BinaryOrErr);
+  return BinaryOrErr.takeError();
+}
+
+Expected<std::unique_ptr<Binary>> getAsBinary(const Archive::Child &C,
+                                              LLVMContext *Context) {
+  return C.getAsBinary(Context);
+}
+
+template <class A> static bool isValidInBitMode(const A &Member) {
+  if (object::Archive::getDefaultKindForHost() != object::Archive::K_AIXBIG)
+    return true;
+  LLVMContext Context;
+  Expected<std::unique_ptr<Binary>> BinOrErr = getAsBinary(Member, &Context);
+  // In AIX "ar", if there is a non-object file member, it is never ignored due
+  // to the bit mode setting.
+  if (!BinOrErr) {
+    consumeError(BinOrErr.takeError());
+    return true;
+  }
+  return isValidInBitMode(*BinOrErr.get());
+}
+
+static void warnInvalidObjectForFileMode(Twine Name) {
+  warn("'" + Name + "' is not valid with the current object file mode");
+}
+
 static void performReadOperation(ArchiveOperation Operation,
                                  object::Archive *OldArchive) {
   if (Operation == Extract && OldArchive->isThin())
@@ -611,6 +725,10 @@ static void performReadOperation(ArchiveOperation Operation,
       failIfError(NameOrErr.takeError());
       StringRef Name = NameOrErr.get();
 
+      // Check whether to ignore this object due to its bitness.
+      if (!isValidInBitMode(C))
+        continue;
+
       if (Filter) {
         auto I = find_if(Members, [Name](StringRef Path) {
           return comparePaths(Name, Path);
@@ -649,8 +767,6 @@ static void performReadOperation(ArchiveOperation Operation,
 static void addChildMember(std::vector<NewArchiveMember> &Members,
                            const object::Archive::Child &M,
                            bool FlattenArchive = false) {
-  if (Thin && !M.getParent()->isThin())
-    fail("cannot convert a regular archive to a thin one");
   Expected<NewArchiveMember> NMOrErr =
       NewArchiveMember::getOldMember(M, Deterministic);
   failIfError(NMOrErr.takeError());
@@ -689,8 +805,7 @@ static void addChildMember(std::vector<NewArchiveMember> &Members,
   Members.push_back(std::move(*NMOrErr));
 }
 
-static void addMember(std::vector<NewArchiveMember> &Members,
-                      StringRef FileName, bool FlattenArchive = false) {
+static NewArchiveMember getArchiveMember(StringRef FileName) {
   Expected<NewArchiveMember> NMOrErr =
       NewArchiveMember::getFile(FileName, Deterministic);
   failIfError(NMOrErr.takeError(), FileName);
@@ -710,9 +825,24 @@ static void addMember(std::vector<NewArchiveMember> &Members,
           PathOrErr ? *PathOrErr : sys::path::convert_to_slash(FileName));
     }
   }
+  return std::move(*NMOrErr);
+}
+
+static void addMember(std::vector<NewArchiveMember> &Members,
+                      NewArchiveMember &NM) {
+  Members.push_back(std::move(NM));
+}
+
+static void addMember(std::vector<NewArchiveMember> &Members,
+                      StringRef FileName, bool FlattenArchive = false) {
+  NewArchiveMember NM = getArchiveMember(FileName);
+  if (!isValidInBitMode(NM)) {
+    warnInvalidObjectForFileMode(FileName);
+    return;
+  }
 
   if (FlattenArchive &&
-      identify_magic(NMOrErr->Buf->getBuffer()) == file_magic::archive) {
+      identify_magic(NM.Buf->getBuffer()) == file_magic::archive) {
     object::Archive &Lib = readLibrary(FileName);
     // When creating thin archives, only flatten if the member is also thin.
     if (!Thin || Lib.isThin()) {
@@ -724,7 +854,7 @@ static void addMember(std::vector<NewArchiveMember> &Members,
       return;
     }
   }
-  Members.push_back(std::move(*NMOrErr));
+  Members.push_back(std::move(NM));
 }
 
 enum InsertAction {
@@ -740,10 +870,21 @@ static InsertAction computeInsertAction(ArchiveOperation Operation,
                                         StringRef Name,
                                         std::vector<StringRef>::iterator &Pos,
                                         StringMap<int> &MemberCount) {
+  if (!isValidInBitMode(Member))
+    return IA_AddOldMember;
+
   if (Operation == QuickAppend || Members.empty())
     return IA_AddOldMember;
-  auto MI = find_if(
-      Members, [Name](StringRef Path) { return comparePaths(Name, Path); });
+
+  auto MI = find_if(Members, [Name](StringRef Path) {
+    if (Thin && !sys::path::is_absolute(Path)) {
+      Expected<std::string> PathOrErr =
+          computeArchiveRelativePath(ArchiveName, Path);
+      return comparePaths(Name, PathOrErr ? *PathOrErr : Path);
+    } else {
+      return comparePaths(Name, Path);
+    }
+  });
 
   if (MI == Members.end())
     return IA_AddOldMember;
@@ -801,7 +942,7 @@ computeNewArchiveMembers(ArchiveOperation Operation,
       Expected<StringRef> NameOrErr = Child.getName();
       failIfError(NameOrErr.takeError());
       std::string Name = std::string(NameOrErr.get());
-      if (comparePaths(Name, RelPos)) {
+      if (comparePaths(Name, RelPos) && isValidInBitMode(Child)) {
         assert(AddAfter || AddBefore);
         if (AddBefore)
           InsertPos = Pos;
@@ -812,12 +953,25 @@ computeNewArchiveMembers(ArchiveOperation Operation,
       std::vector<StringRef>::iterator MemberI = Members.end();
       InsertAction Action =
           computeInsertAction(Operation, Child, Name, MemberI, MemberCount);
+
+      auto HandleNewMember = [](auto Member, auto &Members, auto &Child) {
+        NewArchiveMember NM = getArchiveMember(*Member);
+        if (isValidInBitMode(NM))
+          addMember(Members, NM);
+        else {
+          // If a new member is not a valid object for the bit mode, add
+          // the old member back.
+          warnInvalidObjectForFileMode(*Member);
+          addChildMember(Members, Child, /*FlattenArchive=*/Thin);
+        }
+      };
+
       switch (Action) {
       case IA_AddOldMember:
         addChildMember(Ret, Child, /*FlattenArchive=*/Thin);
         break;
       case IA_AddNewMember:
-        addMember(Ret, *MemberI);
+        HandleNewMember(MemberI, Ret, Child);
         break;
       case IA_Delete:
         break;
@@ -825,7 +979,7 @@ computeNewArchiveMembers(ArchiveOperation Operation,
         addChildMember(Moved, Child, /*FlattenArchive=*/Thin);
         break;
       case IA_MoveNewMember:
-        addMember(Moved, *MemberI);
+        HandleNewMember(MemberI, Moved, Child);
         break;
       }
       // When processing elements with the count param, we need to preserve the
@@ -872,48 +1026,18 @@ computeNewArchiveMembers(ArchiveOperation Operation,
   return Ret;
 }
 
-static object::Archive::Kind getDefaultForHost() {
-  return Triple(sys::getProcessTriple()).isOSDarwin()
-             ? object::Archive::K_DARWIN
-             : object::Archive::K_GNU;
-}
-
-static object::Archive::Kind getKindFromMember(const NewArchiveMember &Member) {
-  auto MemBufferRef = Member.Buf->getMemBufferRef();
-  Expected<std::unique_ptr<object::ObjectFile>> OptionalObject =
-      object::ObjectFile::createObjectFile(MemBufferRef);
-
-  if (OptionalObject)
-    return isa<object::MachOObjectFile>(**OptionalObject)
-               ? object::Archive::K_DARWIN
-               : object::Archive::K_GNU;
-
-  // squelch the error in case we had a non-object file
-  consumeError(OptionalObject.takeError());
-
-  // If we're adding a bitcode file to the archive, detect the Archive kind
-  // based on the target triple.
-  LLVMContext Context;
-  if (identify_magic(MemBufferRef.getBuffer()) == file_magic::bitcode) {
-    if (auto ObjOrErr = object::SymbolicFile::createSymbolicFile(
-            MemBufferRef, file_magic::bitcode, &Context)) {
-      auto &IRObject = cast<object::IRObjectFile>(**ObjOrErr);
-      return Triple(IRObject.getTargetTriple()).isOSDarwin()
-                 ? object::Archive::K_DARWIN
-                 : object::Archive::K_GNU;
-    } else {
-      // Squelch the error in case this was not a SymbolicFile.
-      consumeError(ObjOrErr.takeError());
-    }
-  }
-
-  return getDefaultForHost();
-}
-
 static void performWriteOperation(ArchiveOperation Operation,
                                   object::Archive *OldArchive,
                                   std::unique_ptr<MemoryBuffer> OldArchiveBuf,
                                   std::vector<NewArchiveMember> *NewMembersP) {
+  if (OldArchive) {
+    if (Thin && !OldArchive->isThin())
+      fail("cannot convert a regular archive to a thin one");
+
+    if (OldArchive->isThin())
+      Thin = true;
+  }
+
   std::vector<NewArchiveMember> NewMembers;
   if (!NewMembersP)
     NewMembers = computeNewArchiveMembers(Operation, OldArchive);
@@ -923,14 +1047,23 @@ static void performWriteOperation(ArchiveOperation Operation,
   case Default:
     if (Thin)
       Kind = object::Archive::K_GNU;
-    else if (OldArchive)
+    else if (OldArchive) {
       Kind = OldArchive->kind();
-    else if (NewMembersP)
-      Kind = !NewMembersP->empty() ? getKindFromMember(NewMembersP->front())
-                                   : getDefaultForHost();
+      if (Kind == object::Archive::K_BSD) {
+        auto InferredKind = object::Archive::K_BSD;
+        if (NewMembersP && !NewMembersP->empty())
+          InferredKind = NewMembersP->front().detectKindFromObject();
+        else if (!NewMembers.empty())
+          InferredKind = NewMembers.front().detectKindFromObject();
+        if (InferredKind == object::Archive::K_DARWIN)
+          Kind = object::Archive::K_DARWIN;
+      }
+    } else if (NewMembersP)
+      Kind = !NewMembersP->empty() ? NewMembersP->front().detectKindFromObject()
+                                   : object::Archive::getDefaultKindForHost();
     else
-      Kind = !NewMembers.empty() ? getKindFromMember(NewMembers.front())
-                                 : getDefaultForHost();
+      Kind = !NewMembers.empty() ? NewMembers.front().detectKindFromObject()
+                                 : object::Archive::getDefaultKindForHost();
     break;
   case GNU:
     Kind = object::Archive::K_GNU;
@@ -945,6 +1078,11 @@ static void performWriteOperation(ArchiveOperation Operation,
       fail("only the gnu format has a thin mode");
     Kind = object::Archive::K_DARWIN;
     break;
+  case BIGARCHIVE:
+    if (Thin)
+      fail("only the gnu format has a thin mode");
+    Kind = object::Archive::K_AIXBIG;
+    break;
   case Unknown:
     llvm_unreachable("");
   }
@@ -965,6 +1103,8 @@ static void createSymbolTable(object::Archive *OldArchive) {
   if (OldArchive->hasSymbolTable())
     return;
 
+  if (OldArchive->isThin())
+    Thin = true;
   performWriteOperation(CreateSymTab, OldArchive, nullptr, nullptr);
 }
 
@@ -993,8 +1133,7 @@ static void performOperation(ArchiveOperation Operation,
   llvm_unreachable("Unknown operation.");
 }
 
-static int performOperation(ArchiveOperation Operation,
-                            std::vector<NewArchiveMember> *NewMembers) {
+static int performOperation(ArchiveOperation Operation) {
   // Create or open the archive object.
   ErrorOr<std::unique_ptr<MemoryBuffer>> Buf = MemoryBuffer::getFile(
       ArchiveName, /*IsText=*/false, /*RequiresNullTerminator=*/false);
@@ -1003,12 +1142,17 @@ static int performOperation(ArchiveOperation Operation,
     fail("unable to open '" + ArchiveName + "': " + EC.message());
 
   if (!EC) {
-    Error Err = Error::success();
-    object::Archive Archive(Buf.get()->getMemBufferRef(), Err);
-    failIfError(std::move(Err), "unable to load '" + ArchiveName + "'");
-    if (Archive.isThin())
+    Expected<std::unique_ptr<object::Archive>> ArchiveOrError =
+        object::Archive::create(Buf.get()->getMemBufferRef());
+    if (!ArchiveOrError)
+      failIfError(ArchiveOrError.takeError(),
+                  "unable to load '" + ArchiveName + "'");
+
+    std::unique_ptr<object::Archive> Archive = std::move(ArchiveOrError.get());
+    if (Archive->isThin())
       CompareFullPath = true;
-    performOperation(Operation, &Archive, std::move(Buf.get()), NewMembers);
+    performOperation(Operation, Archive.get(), std::move(Buf.get()),
+                     /*NewMembers=*/nullptr);
     return 0;
   }
 
@@ -1019,12 +1163,11 @@ static int performOperation(ArchiveOperation Operation,
   } else {
     if (!Create) {
       // Produce a warning if we should and we're creating the archive
-      WithColor::warning(errs(), ToolName)
-          << "creating " << ArchiveName << "\n";
+      warn("creating " + ArchiveName);
     }
   }
 
-  performOperation(Operation, nullptr, nullptr, NewMembers);
+  performOperation(Operation, nullptr, nullptr, /*NewMembers=*/nullptr);
   return 0;
 }
 
@@ -1063,8 +1206,12 @@ static void runMRIScript() {
 
     switch (Command) {
     case MRICommand::AddLib: {
+      if (!Create)
+        fail("no output archive has been opened");
       object::Archive &Lib = readLibrary(Rest);
       {
+        if (Thin && !Lib.isThin())
+          fail("cannot add a regular archive's contents to a thin archive");
         Error Err = Error::success();
         for (auto &Member : Lib.children(Err))
           addChildMember(NewMembers, Member, /*FlattenArchive=*/Thin);
@@ -1073,11 +1220,13 @@ static void runMRIScript() {
       break;
     }
     case MRICommand::AddMod:
+      if (!Create)
+        fail("no output archive has been opened");
       addMember(NewMembers, Rest);
       break;
     case MRICommand::CreateThin:
       Thin = true;
-      LLVM_FALLTHROUGH;
+      [[fallthrough]];
     case MRICommand::Create:
       Create = true;
       if (!ArchiveName.empty())
@@ -1085,6 +1234,8 @@ static void runMRIScript() {
       if (Saved)
         fail("file already saved");
       ArchiveName = std::string(Rest);
+      if (ArchiveName.empty())
+        fail("missing archive name");
       break;
     case MRICommand::Delete: {
       llvm::erase_if(NewMembers, [=](NewArchiveMember &M) {
@@ -1106,22 +1257,32 @@ static void runMRIScript() {
 
   // Nothing to do if not saved.
   if (Saved)
-    performOperation(ReplaceOrInsert, &NewMembers);
+    performOperation(ReplaceOrInsert, /*OldArchive=*/nullptr,
+                     /*OldArchiveBuf=*/nullptr, &NewMembers);
   exit(0);
 }
 
 static bool handleGenericOption(StringRef arg) {
-  if (arg == "-help" || arg == "--help" || arg == "-h") {
+  if (arg == "--help" || arg == "-h") {
     printHelpMessage();
     return true;
   }
-  if (arg == "-version" || arg == "--version") {
+  if (arg == "--version") {
     cl::PrintVersionMessage();
     return true;
   }
   return false;
 }
 
+static BitModeTy getBitMode(const char *RawBitMode) {
+  return StringSwitch<BitModeTy>(RawBitMode)
+      .Case("32", BitModeTy::Bit32)
+      .Case("64", BitModeTy::Bit64)
+      .Case("32_64", BitModeTy::Bit32_64)
+      .Case("any", BitModeTy::Any)
+      .Default(BitModeTy::Unknown);
+}
+
 static const char *matchFlagWithArg(StringRef Expected,
                                     ArrayRef<const char *>::iterator &ArgIt,
                                     ArrayRef<const char *> Args) {
@@ -1129,8 +1290,6 @@ static const char *matchFlagWithArg(StringRef Expected,
 
   if (Arg.startswith("--"))
     Arg = Arg.substr(2);
-  else if (Arg.startswith("-"))
-    Arg = Arg.substr(1);
 
   size_t len = Expected.size();
   if (Arg == Expected) {
@@ -1171,7 +1330,15 @@ static int ar_main(int argc, char **argv) {
   SmallVector<const char *, 0> Argv(argv + 1, argv + argc);
   StringSaver Saver(Alloc);
 
-  cl::ExpandResponseFiles(Saver, getRspQuoting(makeArrayRef(argv, argc)), Argv);
+  cl::ExpandResponseFiles(Saver, getRspQuoting(ArrayRef(argv, argc)), Argv);
+
+  // Get BitMode from enviorment variable "OBJECT_MODE" for AIX OS, if
+  // specified.
+  if (object::Archive::getDefaultKindForHost() == object::Archive::K_AIXBIG) {
+    BitMode = getBitMode(getenv("OBJECT_MODE"));
+    if (BitMode == BitModeTy::Unknown)
+      BitMode = BitModeTy::Bit32;
+  }
 
   for (ArrayRef<const char *>::iterator ArgIt = Argv.begin();
        ArgIt != Argv.end(); ++ArgIt) {
@@ -1199,6 +1366,11 @@ static int ar_main(int argc, char **argv) {
       continue;
     }
 
+    if (strcmp(*ArgIt, "--thin") == 0) {
+      Thin = true;
+      continue;
+    }
+
     Match = matchFlagWithArg("format", ArgIt, Argv);
     if (Match) {
       FormatType = StringSwitch<Format>(Match)
@@ -1206,21 +1378,39 @@ static int ar_main(int argc, char **argv) {
                        .Case("gnu", GNU)
                        .Case("darwin", DARWIN)
                        .Case("bsd", BSD)
+                       .Case("bigarchive", BIGARCHIVE)
                        .Default(Unknown);
       if (FormatType == Unknown)
         fail(std::string("Invalid format ") + Match);
       continue;
     }
 
+    if ((Match = matchFlagWithArg("output", ArgIt, Argv))) {
+      OutputDir = Match;
+      continue;
+    }
+
     if (matchFlagWithArg("plugin", ArgIt, Argv) ||
         matchFlagWithArg("rsp-quoting", ArgIt, Argv))
       continue;
 
+    if (strncmp(*ArgIt, "-X", 2) == 0) {
+      if (object::Archive::getDefaultKindForHost() ==
+          object::Archive::K_AIXBIG) {
+        Match = *(*ArgIt + 2) != '\0' ? *ArgIt + 2 : *(++ArgIt);
+        BitMode = getBitMode(Match);
+        if (BitMode == BitModeTy::Unknown)
+          fail(Twine("invalid bit mode: ") + Match);
+        continue;
+      } else {
+        fail(Twine(*ArgIt) + " option not supported on non AIX OS");
+      }
+    }
+
     Options += *ArgIt + 1;
   }
 
-  ArchiveOperation Operation = parseCommandLine();
-  return performOperation(Operation, nullptr);
+  return performOperation(parseCommandLine());
 }
 
 static int ranlib_main(int argc, char **argv) {
@@ -1256,16 +1446,17 @@ static int ranlib_main(int argc, char **argv) {
       Archives.push_back(arg);
     }
   }
+
   for (StringRef Archive : Archives) {
     ArchiveName = Archive.str();
-    performOperation(CreateSymTab, nullptr);
+    performOperation(CreateSymTab);
   }
   if (Archives.empty())
     badUsage("an archive name must be specified");
   return 0;
 }
 
-int main(int argc, char **argv) {
+int llvm_ar_main(int argc, char **argv) {
   InitLLVM X(argc, argv);
   ToolName = argv[0];
 
@@ -1286,11 +1477,11 @@ int main(int argc, char **argv) {
   };
 
   if (Is("dlltool"))
-    return dlltoolDriverMain(makeArrayRef(argv, argc));
+    return dlltoolDriverMain(ArrayRef(argv, argc));
   if (Is("ranlib"))
     return ranlib_main(argc, argv);
   if (Is("lib"))
-    return libDriverMain(makeArrayRef(argv, argc));
+    return libDriverMain(ArrayRef(argv, argc));
   if (Is("ar"))
     return ar_main(argc, argv);
 
diff --git a/gnu/llvm/llvm/tools/llvm-config/llvm-config.cpp b/gnu/llvm/llvm/tools/llvm-config/llvm-config.cpp
index bca29290f4b..e4da30cd8ae 100644
--- a/gnu/llvm/llvm/tools/llvm-config/llvm-config.cpp
+++ b/gnu/llvm/llvm/tools/llvm-config/llvm-config.cpp
@@ -170,10 +170,8 @@ static std::vector<std::string> ComputeLibsForComponents(
 
   // Build a map of component names to information.
   StringMap<AvailableComponent *> ComponentMap;
-  for (unsigned i = 0; i != array_lengthof(AvailableComponents); ++i) {
-    AvailableComponent *AC = &AvailableComponents[i];
-    ComponentMap[AC->Name] = AC;
-  }
+  for (auto &AC : AvailableComponents)
+    ComponentMap[AC.Name] = &AC;
 
   // Visit the components.
   for (unsigned i = 0, e = Components.size(); i != e; ++i) {
@@ -201,7 +199,7 @@ static std::vector<std::string> ComputeLibsForComponents(
 
 /* *** */
 
-static void usage() {
+static void usage(bool ExitWithFailure = true) {
   errs() << "\
 usage: llvm-config <OPTION>... [<COMPONENT>...]\n\
 \n\
@@ -212,37 +210,38 @@ LLVM.  Typically called from 'configure' scripts.  Examples:\n\
   llvm-config --libs engine bcreader scalaropts\n\
 \n\
 Options:\n\
-  --version         Print LLVM version.\n\
-  --prefix          Print the installation prefix.\n\
-  --src-root        Print the source root LLVM was built from.\n\
-  --obj-root        Print the object root used to build LLVM.\n\
+  --assertion-mode  Print assertion mode of LLVM tree (ON or OFF).\n\
   --bindir          Directory containing LLVM executables.\n\
-  --includedir      Directory containing LLVM headers.\n\
-  --libdir          Directory containing LLVM libraries.\n\
-  --cmakedir        Directory containing LLVM cmake modules.\n\
-  --cppflags        C preprocessor flags for files that include LLVM headers.\n\
+  --build-mode      Print build mode of LLVM tree (e.g. Debug or Release).\n\
+  --build-system    Print the build system used to build LLVM (e.g. `cmake` or `gn`).\n\
   --cflags          C compiler flags for files that include LLVM headers.\n\
+  --cmakedir        Directory containing LLVM CMake modules.\n\
+  --components      List of all possible components.\n\
+  --cppflags        C preprocessor flags for files that include LLVM headers.\n\
   --cxxflags        C++ compiler flags for files that include LLVM headers.\n\
+  --has-rtti        Print whether or not LLVM was built with rtti (YES or NO).\n\
+  --help            Print a summary of llvm-config arguments.\n\
+  --host-target     Target triple used to configure LLVM.\n\
+  --ignore-libllvm  Ignore libLLVM and link component libraries instead.\n\
+  --includedir      Directory containing LLVM headers.\n\
   --ldflags         Print Linker flags.\n\
-  --system-libs     System Libraries needed to link against LLVM components.\n\
-  --libs            Libraries needed to link against LLVM components.\n\
-  --libnames        Bare library names for in-tree builds.\n\
+  --libdir          Directory containing LLVM libraries.\n\
   --libfiles        Fully qualified library filenames for makefile depends.\n\
-  --components      List of all possible components.\n\
-  --targets-built   List of all targets currently built.\n\
-  --host-target     Target triple used to configure LLVM.\n\
-  --build-mode      Print build mode of LLVM tree (e.g. Debug or Release).\n\
-  --assertion-mode  Print assertion mode of LLVM tree (ON or OFF).\n\
-  --build-system    Print the build system used to build LLVM (always cmake).\n\
-  --has-rtti        Print whether or not LLVM was built with rtti (YES or NO).\n\
-  --shared-mode     Print how the provided components can be collectively linked (`shared` or `static`).\n\
+  --libnames        Bare library names for in-tree builds.\n\
+  --libs            Libraries needed to link against LLVM components.\n\
   --link-shared     Link the components as shared libraries.\n\
   --link-static     Link the component libraries statically.\n\
-  --ignore-libllvm  Ignore libLLVM and link component libraries instead.\n\
+  --obj-root        Print the object root used to build LLVM.\n\
+  --prefix          Print the installation prefix.\n\
+  --shared-mode     Print how the provided components can be collectively linked (`shared` or `static`).\n\
+  --system-libs     System Libraries needed to link against LLVM components.\n\
+  --targets-built   List of all targets currently built.\n\
+  --version         Print LLVM version.\n\
 Typical components:\n\
   all               All LLVM libraries (default).\n\
   engine            Either a native JIT or a bitcode interpreter.\n";
-  exit(1);
+  if (ExitWithFailure)
+    exit(1);
 }
 
 /// Compute the path to the main executable.
@@ -357,12 +356,22 @@ int main(int argc, char **argv) {
         ("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include");
   } else {
     ActivePrefix = CurrentExecPrefix;
-    ActiveIncludeDir = ActivePrefix + "/include";
-    SmallString<256> path(StringRef(LLVM_TOOLS_INSTALL_DIR));
-    sys::fs::make_absolute(ActivePrefix, path);
-    ActiveBinDir = std::string(path.str());
+    {
+      SmallString<256> Path(LLVM_INSTALL_INCLUDEDIR);
+      sys::fs::make_absolute(ActivePrefix, Path);
+      ActiveIncludeDir = std::string(Path.str());
+    }
+    {
+      SmallString<256> Path(LLVM_TOOLS_INSTALL_DIR);
+      sys::fs::make_absolute(ActivePrefix, Path);
+      ActiveBinDir = std::string(Path.str());
+    }
     ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX;
-    ActiveCMakeDir = ActiveLibDir + "/cmake/llvm";
+    {
+      SmallString<256> Path(LLVM_INSTALL_PACKAGE_DIR);
+      sys::fs::make_absolute(ActivePrefix, Path);
+      ActiveCMakeDir = std::string(Path.str());
+    }
     ActiveIncludeOption = "-I" + ActiveIncludeDir;
   }
 
@@ -545,15 +554,14 @@ int main(int argc, char **argv) {
         /// built, print LLVM_DYLIB_COMPONENTS instead of everything
         /// in the manifest.
         std::vector<std::string> Components;
-        for (unsigned j = 0; j != array_lengthof(AvailableComponents); ++j) {
+        for (const auto &AC : AvailableComponents) {
           // Only include non-installed components when in a development tree.
-          if (!AvailableComponents[j].IsInstalled && !IsInDevelopmentTree)
+          if (!AC.IsInstalled && !IsInDevelopmentTree)
             continue;
 
-          Components.push_back(AvailableComponents[j].Name);
-          if (AvailableComponents[j].Library && !IsInDevelopmentTree) {
-            std::string path(
-                GetComponentLibraryPath(AvailableComponents[j].Library, false));
+          Components.push_back(AC.Name);
+          if (AC.Library && !IsInDevelopmentTree) {
+            std::string path(GetComponentLibraryPath(AC.Library, false));
             if (DirSep == "\\") {
               std::replace(path.begin(), path.end(), '/', '\\');
             }
@@ -594,8 +602,6 @@ int main(int argc, char **argv) {
         PrintSharedMode = true;
       } else if (Arg == "--obj-root") {
         OS << ActivePrefix << '\n';
-      } else if (Arg == "--src-root") {
-        OS << LLVM_SRC_ROOT << '\n';
       } else if (Arg == "--ignore-libllvm") {
         LinkDyLib = false;
         LinkMode = BuiltSharedLibs ? LinkModeShared : LinkModeAuto;
@@ -603,6 +609,8 @@ int main(int argc, char **argv) {
         LinkMode = LinkModeShared;
       } else if (Arg == "--link-static") {
         LinkMode = LinkModeStatic;
+      } else if (Arg == "--help") {
+        usage(false);
       } else {
         usage();
       }
@@ -657,7 +665,7 @@ int main(int argc, char **argv) {
         }
         WithColor::error(errs(), "llvm-config")
             << "component libraries and shared library\n\n";
-        LLVM_FALLTHROUGH;
+        [[fallthrough]];
       case LinkModeStatic:
         for (auto &Lib : MissingLibs)
           WithColor::error(errs(), "llvm-config") << "missing: " << Lib << "\n";
diff --git a/gnu/llvm/llvm/tools/llvm-diff/DiffConsumer.cpp b/gnu/llvm/llvm/tools/llvm-diff/DiffConsumer.cpp
deleted file mode 100644
index a703f42f14c..00000000000
--- a/gnu/llvm/llvm/tools/llvm-diff/DiffConsumer.cpp
+++ /dev/null
@@ -1,212 +0,0 @@
-//===-- DiffConsumer.cpp - Difference Consumer ------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This files implements the LLVM difference Consumer
-//
-//===----------------------------------------------------------------------===//
-
-#include "DiffConsumer.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/ErrorHandling.h"
-
-using namespace llvm;
-
-static void ComputeNumbering(const Function *F,
-                             DenseMap<const Value *, unsigned> &Numbering) {
-  unsigned IN = 0;
-
-  // Arguments get the first numbers.
-  for (const auto &Arg : F->args())
-    if (!Arg.hasName())
-      Numbering[&Arg] = IN++;
-
-  // Walk the basic blocks in order.
-  for (const auto &Func : *F) {
-    if (!Func.hasName())
-      Numbering[&Func] = IN++;
-
-    // Walk the instructions in order.
-    for (const auto &BB : Func)
-      // void instructions don't get numbers.
-      if (!BB.hasName() && !BB.getType()->isVoidTy())
-        Numbering[&BB] = IN++;
-  }
-
-  assert(!Numbering.empty() && "asked for numbering but numbering was no-op");
-}
-
-void Consumer::anchor() { }
-
-void DiffConsumer::printValue(const Value *V, bool isL) {
-  if (V->hasName()) {
-    out << (isa<GlobalValue>(V) ? '@' : '%') << V->getName();
-    return;
-  }
-  if (V->getType()->isVoidTy()) {
-    if (auto *SI = dyn_cast<StoreInst>(V)) {
-      out << "store to ";
-      printValue(SI->getPointerOperand(), isL);
-    } else if (auto *CI = dyn_cast<CallInst>(V)) {
-      out << "call to ";
-      printValue(CI->getCalledOperand(), isL);
-    } else if (auto *II = dyn_cast<InvokeInst>(V)) {
-      out << "invoke to ";
-      printValue(II->getCalledOperand(), isL);
-    } else {
-      out << *V;
-    }
-    return;
-  }
-  if (isa<Constant>(V)) {
-    out << *V;
-    return;
-  }
-
-  unsigned N = contexts.size();
-  while (N > 0) {
-    --N;
-    DiffContext &ctxt = contexts[N];
-    if (!ctxt.IsFunction) continue;
-    if (isL) {
-      if (ctxt.LNumbering.empty())
-        ComputeNumbering(cast<Function>(ctxt.L), ctxt.LNumbering);
-      out << '%' << ctxt.LNumbering[V];
-      return;
-    } else {
-      if (ctxt.RNumbering.empty())
-        ComputeNumbering(cast<Function>(ctxt.R), ctxt.RNumbering);
-      out << '%' << ctxt.RNumbering[V];
-      return;
-    }
-  }
-
-  out << "<anonymous>";
-}
-
-void DiffConsumer::header() {
-  if (contexts.empty()) return;
-  for (SmallVectorImpl<DiffContext>::iterator
-         I = contexts.begin(), E = contexts.end(); I != E; ++I) {
-    if (I->Differences) continue;
-    if (isa<Function>(I->L)) {
-      // Extra newline between functions.
-      if (Differences) out << "\n";
-
-      const Function *L = cast<Function>(I->L);
-      const Function *R = cast<Function>(I->R);
-      if (L->getName() != R->getName())
-        out << "in function " << L->getName()
-            << " / " << R->getName() << ":\n";
-      else
-        out << "in function " << L->getName() << ":\n";
-    } else if (isa<BasicBlock>(I->L)) {
-      const BasicBlock *L = cast<BasicBlock>(I->L);
-      const BasicBlock *R = cast<BasicBlock>(I->R);
-      if (L->hasName() && R->hasName() && L->getName() == R->getName())
-        out << "  in block %" << L->getName() << ":\n";
-      else {
-        out << "  in block ";
-        printValue(L, true);
-        out << " / ";
-        printValue(R, false);
-        out << ":\n";
-      }
-    } else if (isa<Instruction>(I->L)) {
-      out << "    in instruction ";
-      printValue(I->L, true);
-      out << " / ";
-      printValue(I->R, false);
-      out << ":\n";
-    }
-
-    I->Differences = true;
-  }
-}
-
-void DiffConsumer::indent() {
-  unsigned N = Indent;
-  while (N--) out << ' ';
-}
-
-bool DiffConsumer::hadDifferences() const {
-  return Differences;
-}
-
-void DiffConsumer::enterContext(const Value *L, const Value *R) {
-  contexts.push_back(DiffContext(L, R));
-  Indent += 2;
-}
-
-void DiffConsumer::exitContext() {
-  Differences |= contexts.back().Differences;
-  contexts.pop_back();
-  Indent -= 2;
-}
-
-void DiffConsumer::log(StringRef text) {
-  header();
-  indent();
-  out << text << '\n';
-}
-
-void DiffConsumer::logf(const LogBuilder &Log) {
-  header();
-  indent();
-
-  unsigned arg = 0;
-
-  StringRef format = Log.getFormat();
-  while (true) {
-    size_t percent = format.find('%');
-    if (percent == StringRef::npos) {
-      out << format;
-      break;
-    }
-    assert(format[percent] == '%');
-
-    if (percent > 0) out << format.substr(0, percent);
-
-    switch (format[percent+1]) {
-    case '%': out << '%'; break;
-    case 'l': printValue(Log.getArgument(arg++), true); break;
-    case 'r': printValue(Log.getArgument(arg++), false); break;
-    default: llvm_unreachable("unknown format character");
-    }
-
-    format = format.substr(percent+2);
-  }
-
-  out << '\n';
-}
-
-void DiffConsumer::logd(const DiffLogBuilder &Log) {
-  header();
-
-  for (unsigned I = 0, E = Log.getNumLines(); I != E; ++I) {
-    indent();
-    switch (Log.getLineKind(I)) {
-    case DC_match:
-      out << "  ";
-      Log.getLeft(I)->print(dbgs()); dbgs() << '\n';
-      //printValue(Log.getLeft(I), true);
-      break;
-    case DC_left:
-      out << "< ";
-      Log.getLeft(I)->print(dbgs()); dbgs() << '\n';
-      //printValue(Log.getLeft(I), true);
-      break;
-    case DC_right:
-      out << "> ";
-      Log.getRight(I)->print(dbgs()); dbgs() << '\n';
-      //printValue(Log.getRight(I), false);
-      break;
-    }
-    //out << "\n";
-  }
-}
diff --git a/gnu/llvm/llvm/tools/llvm-diff/DiffConsumer.h b/gnu/llvm/llvm/tools/llvm-diff/DiffConsumer.h
deleted file mode 100644
index f7b2f2450ee..00000000000
--- a/gnu/llvm/llvm/tools/llvm-diff/DiffConsumer.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//===-- DiffConsumer.h - Difference Consumer --------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This header defines the interface to the LLVM difference Consumer
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_LLVM_DIFF_DIFFCONSUMER_H
-#define LLVM_TOOLS_LLVM_DIFF_DIFFCONSUMER_H
-
-#include "DiffLog.h"
-#include "llvm/ADT/DenseMap.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/IR/Value.h"
-#include "llvm/Support/Casting.h"
-#include "llvm/Support/raw_ostream.h"
-
-namespace llvm {
-class StringRef;
-  class Module;
-  class Value;
-  class Function;
-
-  /// The interface for consumers of difference data.
-  class Consumer {
-    virtual void anchor();
-  public:
-    /// Record that a local context has been entered.  Left and
-    /// Right are IR "containers" of some sort which are being
-    /// considered for structural equivalence: global variables,
-    /// functions, blocks, instructions, etc.
-    virtual void enterContext(const Value *Left, const Value *Right) = 0;
-
-    /// Record that a local context has been exited.
-    virtual void exitContext() = 0;
-
-    /// Record a difference within the current context.
-    virtual void log(StringRef Text) = 0;
-
-    /// Record a formatted difference within the current context.
-    virtual void logf(const LogBuilder &Log) = 0;
-
-    /// Record a line-by-line instruction diff.
-    virtual void logd(const DiffLogBuilder &Log) = 0;
-
-  protected:
-    virtual ~Consumer() {}
-  };
-
-  class DiffConsumer : public Consumer {
-  private:
-    struct DiffContext {
-      DiffContext(const Value *L, const Value *R)
-          : L(L), R(R), Differences(false), IsFunction(isa<Function>(L)) {}
-      const Value *L;
-      const Value *R;
-      bool Differences;
-      bool IsFunction;
-      DenseMap<const Value *, unsigned> LNumbering;
-      DenseMap<const Value *, unsigned> RNumbering;
-    };
-
-    raw_ostream &out;
-    SmallVector<DiffContext, 5> contexts;
-    bool Differences;
-    unsigned Indent;
-
-    void printValue(const Value *V, bool isL);
-    void header();
-    void indent();
-
-  public:
-    DiffConsumer()
-      : out(errs()), Differences(false), Indent(0) {}
-
-    bool hadDifferences() const;
-    void enterContext(const Value *L, const Value *R) override;
-    void exitContext() override;
-    void log(StringRef text) override;
-    void logf(const LogBuilder &Log) override;
-    void logd(const DiffLogBuilder &Log) override;
-  };
-}
-
-#endif
diff --git a/gnu/llvm/llvm/tools/llvm-diff/DiffLog.cpp b/gnu/llvm/llvm/tools/llvm-diff/DiffLog.cpp
deleted file mode 100644
index d31a345d255..00000000000
--- a/gnu/llvm/llvm/tools/llvm-diff/DiffLog.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-//===-- DiffLog.h - Difference Log Builder and accessories ------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This header defines the interface to the LLVM difference log builder.
-//
-//===----------------------------------------------------------------------===//
-
-#include "DiffLog.h"
-#include "DiffConsumer.h"
-#include "llvm/ADT/StringRef.h"
-
-using namespace llvm;
-
-LogBuilder::~LogBuilder() {
-  if (consumer)
-    consumer->logf(*this);
-}
-
-StringRef LogBuilder::getFormat() const { return Format; }
-
-unsigned LogBuilder::getNumArguments() const { return Arguments.size(); }
-const Value *LogBuilder::getArgument(unsigned I) const { return Arguments[I]; }
-
-DiffLogBuilder::~DiffLogBuilder() { consumer.logd(*this); }
-
-void DiffLogBuilder::addMatch(const Instruction *L, const Instruction *R) {
-  Diff.push_back(DiffRecord(L, R));
-}
-void DiffLogBuilder::addLeft(const Instruction *L) {
-  // HACK: VS 2010 has a bug in the stdlib that requires this.
-  Diff.push_back(DiffRecord(L, DiffRecord::second_type(nullptr)));
-}
-void DiffLogBuilder::addRight(const Instruction *R) {
-  // HACK: VS 2010 has a bug in the stdlib that requires this.
-  Diff.push_back(DiffRecord(DiffRecord::first_type(nullptr), R));
-}
-
-unsigned DiffLogBuilder::getNumLines() const { return Diff.size(); }
-
-DiffChange DiffLogBuilder::getLineKind(unsigned I) const {
-  return (Diff[I].first ? (Diff[I].second ? DC_match : DC_left)
-                        : DC_right);
-}
-const Instruction *DiffLogBuilder::getLeft(unsigned I) const {
-  return Diff[I].first;
-}
-const Instruction *DiffLogBuilder::getRight(unsigned I) const {
-  return Diff[I].second;
-}
diff --git a/gnu/llvm/llvm/tools/llvm-diff/DiffLog.h b/gnu/llvm/llvm/tools/llvm-diff/DiffLog.h
deleted file mode 100644
index d8b07b97119..00000000000
--- a/gnu/llvm/llvm/tools/llvm-diff/DiffLog.h
+++ /dev/null
@@ -1,83 +0,0 @@
-//===-- DiffLog.h - Difference Log Builder and accessories ------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This header defines the interface to the LLVM difference log builder.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_LLVM_DIFF_DIFFLOG_H
-#define LLVM_TOOLS_LLVM_DIFF_DIFFLOG_H
-
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/StringRef.h"
-
-namespace llvm {
-  class Instruction;
-  class Value;
-  class Consumer;
-
-  /// Trichotomy assumption
-  enum DiffChange { DC_match, DC_left, DC_right };
-
-  /// A temporary-object class for building up log messages.
-  class LogBuilder {
-    Consumer *consumer;
-
-    /// The use of a stored StringRef here is okay because
-    /// LogBuilder should be used only as a temporary, and as a
-    /// temporary it will be destructed before whatever temporary
-    /// might be initializing this format.
-    StringRef Format;
-
-    SmallVector<const Value *, 4> Arguments;
-
-  public:
-    LogBuilder(Consumer &c, StringRef Format) : consumer(&c), Format(Format) {}
-    LogBuilder(LogBuilder &&L)
-        : consumer(L.consumer), Format(L.Format),
-          Arguments(std::move(L.Arguments)) {
-      L.consumer = nullptr;
-    }
-
-    LogBuilder &operator<<(const Value *V) {
-      Arguments.push_back(V);
-      return *this;
-    }
-
-    ~LogBuilder();
-
-    StringRef getFormat() const;
-    unsigned getNumArguments() const;
-    const Value *getArgument(unsigned I) const;
-  };
-
-  /// A temporary-object class for building up diff messages.
-  class DiffLogBuilder {
-    typedef std::pair<const Instruction *, const Instruction *> DiffRecord;
-    SmallVector<DiffRecord, 20> Diff;
-
-    Consumer &consumer;
-
-  public:
-    DiffLogBuilder(Consumer &c) : consumer(c) {}
-    ~DiffLogBuilder();
-
-    void addMatch(const Instruction *L, const Instruction *R);
-    // HACK: VS 2010 has a bug in the stdlib that requires this.
-    void addLeft(const Instruction *L);
-    void addRight(const Instruction *R);
-
-    unsigned getNumLines() const;
-    DiffChange getLineKind(unsigned I) const;
-    const Instruction *getLeft(unsigned I) const;
-    const Instruction *getRight(unsigned I) const;
-  };
-
-}
-
-#endif
diff --git a/gnu/llvm/llvm/tools/llvm-diff/DifferenceEngine.cpp b/gnu/llvm/llvm/tools/llvm-diff/DifferenceEngine.cpp
deleted file mode 100644
index eb746cd2a86..00000000000
--- a/gnu/llvm/llvm/tools/llvm-diff/DifferenceEngine.cpp
+++ /dev/null
@@ -1,854 +0,0 @@
-//===-- DifferenceEngine.cpp - Structural function/module comparison ------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This header defines the implementation of the LLVM difference
-// engine, which structurally compares global values within a module.
-//
-//===----------------------------------------------------------------------===//
-
-#include "DifferenceEngine.h"
-#include "llvm/ADT/DenseMap.h"
-#include "llvm/ADT/DenseSet.h"
-#include "llvm/ADT/SmallString.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/StringSet.h"
-#include "llvm/IR/CFG.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Support/ErrorHandling.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/Support/type_traits.h"
-#include <utility>
-
-using namespace llvm;
-
-namespace {
-
-/// A priority queue, implemented as a heap.
-template <class T, class Sorter, unsigned InlineCapacity>
-class PriorityQueue {
-  Sorter Precedes;
-  llvm::SmallVector<T, InlineCapacity> Storage;
-
-public:
-  PriorityQueue(const Sorter &Precedes) : Precedes(Precedes) {}
-
-  /// Checks whether the heap is empty.
-  bool empty() const { return Storage.empty(); }
-
-  /// Insert a new value on the heap.
-  void insert(const T &V) {
-    unsigned Index = Storage.size();
-    Storage.push_back(V);
-    if (Index == 0) return;
-
-    T *data = Storage.data();
-    while (true) {
-      unsigned Target = (Index + 1) / 2 - 1;
-      if (!Precedes(data[Index], data[Target])) return;
-      std::swap(data[Index], data[Target]);
-      if (Target == 0) return;
-      Index = Target;
-    }
-  }
-
-  /// Remove the minimum value in the heap.  Only valid on a non-empty heap.
-  T remove_min() {
-    assert(!empty());
-    T tmp = Storage[0];
-    
-    unsigned NewSize = Storage.size() - 1;
-    if (NewSize) {
-      // Move the slot at the end to the beginning.
-      if (std::is_trivially_copyable<T>::value)
-        Storage[0] = Storage[NewSize];
-      else
-        std::swap(Storage[0], Storage[NewSize]);
-
-      // Bubble the root up as necessary.
-      unsigned Index = 0;
-      while (true) {
-        // With a 1-based index, the children would be Index*2 and Index*2+1.
-        unsigned R = (Index + 1) * 2;
-        unsigned L = R - 1;
-
-        // If R is out of bounds, we're done after this in any case.
-        if (R >= NewSize) {
-          // If L is also out of bounds, we're done immediately.
-          if (L >= NewSize) break;
-
-          // Otherwise, test whether we should swap L and Index.
-          if (Precedes(Storage[L], Storage[Index]))
-            std::swap(Storage[L], Storage[Index]);
-          break;
-        }
-
-        // Otherwise, we need to compare with the smaller of L and R.
-        // Prefer R because it's closer to the end of the array.
-        unsigned IndexToTest = (Precedes(Storage[L], Storage[R]) ? L : R);
-
-        // If Index is >= the min of L and R, then heap ordering is restored.
-        if (!Precedes(Storage[IndexToTest], Storage[Index]))
-          break;
-
-        // Otherwise, keep bubbling up.
-        std::swap(Storage[IndexToTest], Storage[Index]);
-        Index = IndexToTest;
-      }
-    }
-    Storage.pop_back();
-
-    return tmp;
-  }
-};
-
-/// A function-scope difference engine.
-class FunctionDifferenceEngine {
-  DifferenceEngine &Engine;
-
-  // Some initializers may reference the variable we're currently checking. This
-  // can cause an infinite loop. The Saved[LR]HS ivars can be checked to prevent
-  // recursing.
-  const Value *SavedLHS;
-  const Value *SavedRHS;
-
-  /// The current mapping from old local values to new local values.
-  DenseMap<const Value *, const Value *> Values;
-
-  /// The current mapping from old blocks to new blocks.
-  DenseMap<const BasicBlock *, const BasicBlock *> Blocks;
-
-  DenseSet<std::pair<const Value *, const Value *>> TentativeValues;
-
-  unsigned getUnprocPredCount(const BasicBlock *Block) const {
-    unsigned Count = 0;
-    for (const_pred_iterator I = pred_begin(Block), E = pred_end(Block); I != E;
-         ++I)
-      if (!Blocks.count(*I)) Count++;
-    return Count;
-  }
-
-  typedef std::pair<const BasicBlock *, const BasicBlock *> BlockPair;
-
-  /// A type which sorts a priority queue by the number of unprocessed
-  /// predecessor blocks it has remaining.
-  ///
-  /// This is actually really expensive to calculate.
-  struct QueueSorter {
-    const FunctionDifferenceEngine &fde;
-    explicit QueueSorter(const FunctionDifferenceEngine &fde) : fde(fde) {}
-
-    bool operator()(BlockPair &Old, BlockPair &New) {
-      return fde.getUnprocPredCount(Old.first)
-           < fde.getUnprocPredCount(New.first);
-    }
-  };
-
-  /// A queue of unified blocks to process.
-  PriorityQueue<BlockPair, QueueSorter, 20> Queue;
-
-  /// Try to unify the given two blocks.  Enqueues them for processing
-  /// if they haven't already been processed.
-  ///
-  /// Returns true if there was a problem unifying them.
-  bool tryUnify(const BasicBlock *L, const BasicBlock *R) {
-    const BasicBlock *&Ref = Blocks[L];
-
-    if (Ref) {
-      if (Ref == R) return false;
-
-      Engine.logf("successor %l cannot be equivalent to %r; "
-                  "it's already equivalent to %r")
-        << L << R << Ref;
-      return true;
-    }
-
-    Ref = R;
-    Queue.insert(BlockPair(L, R));
-    return false;
-  }
-
-  /// Unifies two instructions, given that they're known not to have
-  /// structural differences.
-  void unify(const Instruction *L, const Instruction *R) {
-    DifferenceEngine::Context C(Engine, L, R);
-
-    bool Result = diff(L, R, true, true);
-    assert(!Result && "structural differences second time around?");
-    (void) Result;
-    if (!L->use_empty())
-      Values[L] = R;
-  }
-
-  void processQueue() {
-    while (!Queue.empty()) {
-      BlockPair Pair = Queue.remove_min();
-      diff(Pair.first, Pair.second);
-    }
-  }
-
-  void diff(const BasicBlock *L, const BasicBlock *R) {
-    DifferenceEngine::Context C(Engine, L, R);
-
-    BasicBlock::const_iterator LI = L->begin(), LE = L->end();
-    BasicBlock::const_iterator RI = R->begin();
-
-    do {
-      assert(LI != LE && RI != R->end());
-      const Instruction *LeftI = &*LI, *RightI = &*RI;
-
-      // If the instructions differ, start the more sophisticated diff
-      // algorithm at the start of the block.
-      if (diff(LeftI, RightI, false, false)) {
-        TentativeValues.clear();
-        return runBlockDiff(L->begin(), R->begin());
-      }
-
-      // Otherwise, tentatively unify them.
-      if (!LeftI->use_empty())
-        TentativeValues.insert(std::make_pair(LeftI, RightI));
-
-      ++LI;
-      ++RI;
-    } while (LI != LE); // This is sufficient: we can't get equality of
-                        // terminators if there are residual instructions.
-
-    // Unify everything in the block, non-tentatively this time.
-    TentativeValues.clear();
-    for (LI = L->begin(), RI = R->begin(); LI != LE; ++LI, ++RI)
-      unify(&*LI, &*RI);
-  }
-
-  bool matchForBlockDiff(const Instruction *L, const Instruction *R);
-  void runBlockDiff(BasicBlock::const_iterator LI,
-                    BasicBlock::const_iterator RI);
-
-  bool diffCallSites(const CallBase &L, const CallBase &R, bool Complain) {
-    // FIXME: call attributes
-    if (!equivalentAsOperands(L.getCalledOperand(), R.getCalledOperand())) {
-      if (Complain) Engine.log("called functions differ");
-      return true;
-    }
-    if (L.arg_size() != R.arg_size()) {
-      if (Complain) Engine.log("argument counts differ");
-      return true;
-    }
-    for (unsigned I = 0, E = L.arg_size(); I != E; ++I)
-      if (!equivalentAsOperands(L.getArgOperand(I), R.getArgOperand(I))) {
-        if (Complain)
-          Engine.logf("arguments %l and %r differ")
-              << L.getArgOperand(I) << R.getArgOperand(I);
-        return true;
-      }
-    return false;
-  }
-
-  bool diff(const Instruction *L, const Instruction *R, bool Complain,
-            bool TryUnify) {
-    // FIXME: metadata (if Complain is set)
-
-    // Different opcodes always imply different operations.
-    if (L->getOpcode() != R->getOpcode()) {
-      if (Complain) Engine.log("different instruction types");
-      return true;
-    }
-
-    if (isa<CmpInst>(L)) {
-      if (cast<CmpInst>(L)->getPredicate()
-            != cast<CmpInst>(R)->getPredicate()) {
-        if (Complain) Engine.log("different predicates");
-        return true;
-      }
-    } else if (isa<CallInst>(L)) {
-      return diffCallSites(cast<CallInst>(*L), cast<CallInst>(*R), Complain);
-    } else if (isa<PHINode>(L)) {
-      // FIXME: implement.
-
-      // This is really weird;  type uniquing is broken?
-      if (L->getType() != R->getType()) {
-        if (!L->getType()->isPointerTy() || !R->getType()->isPointerTy()) {
-          if (Complain) Engine.log("different phi types");
-          return true;
-        }
-      }
-      return false;
-
-    // Terminators.
-    } else if (isa<InvokeInst>(L)) {
-      const InvokeInst &LI = cast<InvokeInst>(*L);
-      const InvokeInst &RI = cast<InvokeInst>(*R);
-      if (diffCallSites(LI, RI, Complain))
-        return true;
-
-      if (TryUnify) {
-        tryUnify(LI.getNormalDest(), RI.getNormalDest());
-        tryUnify(LI.getUnwindDest(), RI.getUnwindDest());
-      }
-      return false;
-
-    } else if (isa<CallBrInst>(L)) {
-      const CallBrInst &LI = cast<CallBrInst>(*L);
-      const CallBrInst &RI = cast<CallBrInst>(*R);
-      if (LI.getNumIndirectDests() != RI.getNumIndirectDests()) {
-        if (Complain)
-          Engine.log("callbr # of indirect destinations differ");
-        return true;
-      }
-
-      // Perform the "try unify" step so that we can equate the indirect
-      // destinations before checking the call site.
-      for (unsigned I = 0; I < LI.getNumIndirectDests(); I++)
-        tryUnify(LI.getIndirectDest(I), RI.getIndirectDest(I));
-
-      if (diffCallSites(LI, RI, Complain))
-        return true;
-
-      if (TryUnify)
-        tryUnify(LI.getDefaultDest(), RI.getDefaultDest());
-      return false;
-
-    } else if (isa<BranchInst>(L)) {
-      const BranchInst *LI = cast<BranchInst>(L);
-      const BranchInst *RI = cast<BranchInst>(R);
-      if (LI->isConditional() != RI->isConditional()) {
-        if (Complain) Engine.log("branch conditionality differs");
-        return true;
-      }
-
-      if (LI->isConditional()) {
-        if (!equivalentAsOperands(LI->getCondition(), RI->getCondition())) {
-          if (Complain) Engine.log("branch conditions differ");
-          return true;
-        }
-        if (TryUnify) tryUnify(LI->getSuccessor(1), RI->getSuccessor(1));
-      }
-      if (TryUnify) tryUnify(LI->getSuccessor(0), RI->getSuccessor(0));
-      return false;
-
-    } else if (isa<IndirectBrInst>(L)) {
-      const IndirectBrInst *LI = cast<IndirectBrInst>(L);
-      const IndirectBrInst *RI = cast<IndirectBrInst>(R);
-      if (LI->getNumDestinations() != RI->getNumDestinations()) {
-        if (Complain) Engine.log("indirectbr # of destinations differ");
-        return true;
-      }
-
-      if (!equivalentAsOperands(LI->getAddress(), RI->getAddress())) {
-        if (Complain) Engine.log("indirectbr addresses differ");
-        return true;
-      }
-
-      if (TryUnify) {
-        for (unsigned i = 0; i < LI->getNumDestinations(); i++) {
-          tryUnify(LI->getDestination(i), RI->getDestination(i));
-        }
-      }
-      return false;
-
-    } else if (isa<SwitchInst>(L)) {
-      const SwitchInst *LI = cast<SwitchInst>(L);
-      const SwitchInst *RI = cast<SwitchInst>(R);
-      if (!equivalentAsOperands(LI->getCondition(), RI->getCondition())) {
-        if (Complain) Engine.log("switch conditions differ");
-        return true;
-      }
-      if (TryUnify) tryUnify(LI->getDefaultDest(), RI->getDefaultDest());
-
-      bool Difference = false;
-
-      DenseMap<const ConstantInt *, const BasicBlock *> LCases;
-      for (auto Case : LI->cases())
-        LCases[Case.getCaseValue()] = Case.getCaseSuccessor();
-
-      for (auto Case : RI->cases()) {
-        const ConstantInt *CaseValue = Case.getCaseValue();
-        const BasicBlock *LCase = LCases[CaseValue];
-        if (LCase) {
-          if (TryUnify)
-            tryUnify(LCase, Case.getCaseSuccessor());
-          LCases.erase(CaseValue);
-        } else if (Complain || !Difference) {
-          if (Complain)
-            Engine.logf("right switch has extra case %r") << CaseValue;
-          Difference = true;
-        }
-      }
-      if (!Difference)
-        for (DenseMap<const ConstantInt *, const BasicBlock *>::iterator
-                 I = LCases.begin(),
-                 E = LCases.end();
-             I != E; ++I) {
-          if (Complain)
-            Engine.logf("left switch has extra case %l") << I->first;
-          Difference = true;
-        }
-      return Difference;
-    } else if (isa<UnreachableInst>(L)) {
-      return false;
-    }
-
-    if (L->getNumOperands() != R->getNumOperands()) {
-      if (Complain) Engine.log("instructions have different operand counts");
-      return true;
-    }
-
-    for (unsigned I = 0, E = L->getNumOperands(); I != E; ++I) {
-      Value *LO = L->getOperand(I), *RO = R->getOperand(I);
-      if (!equivalentAsOperands(LO, RO)) {
-        if (Complain) Engine.logf("operands %l and %r differ") << LO << RO;
-        return true;
-      }
-    }
-
-    return false;
-  }
-
-public:
-  bool equivalentAsOperands(const Constant *L, const Constant *R) {
-    // Use equality as a preliminary filter.
-    if (L == R)
-      return true;
-
-    if (L->getValueID() != R->getValueID())
-      return false;
-
-    // Ask the engine about global values.
-    if (isa<GlobalValue>(L))
-      return Engine.equivalentAsOperands(cast<GlobalValue>(L),
-                                         cast<GlobalValue>(R));
-
-    // Compare constant expressions structurally.
-    if (isa<ConstantExpr>(L))
-      return equivalentAsOperands(cast<ConstantExpr>(L),
-                                  cast<ConstantExpr>(R));
-
-    // Constants of the "same type" don't always actually have the same
-    // type; I don't know why.  Just white-list them.
-    if (isa<ConstantPointerNull>(L) || isa<UndefValue>(L) || isa<ConstantAggregateZero>(L))
-      return true;
-
-    // Block addresses only match if we've already encountered the
-    // block.  FIXME: tentative matches?
-    if (isa<BlockAddress>(L))
-      return Blocks[cast<BlockAddress>(L)->getBasicBlock()]
-                 == cast<BlockAddress>(R)->getBasicBlock();
-
-    // If L and R are ConstantVectors, compare each element
-    if (isa<ConstantVector>(L)) {
-      const ConstantVector *CVL = cast<ConstantVector>(L);
-      const ConstantVector *CVR = cast<ConstantVector>(R);
-      if (CVL->getType()->getNumElements() != CVR->getType()->getNumElements())
-        return false;
-      for (unsigned i = 0; i < CVL->getType()->getNumElements(); i++) {
-        if (!equivalentAsOperands(CVL->getOperand(i), CVR->getOperand(i)))
-          return false;
-      }
-      return true;
-    }
-
-    // If L and R are ConstantArrays, compare the element count and types.
-    if (isa<ConstantArray>(L)) {
-      const ConstantArray *CAL = cast<ConstantArray>(L);
-      const ConstantArray *CAR = cast<ConstantArray>(R);
-      // Sometimes a type may be equivalent, but not uniquified---e.g. it may
-      // contain a GEP instruction. Do a deeper comparison of the types.
-      if (CAL->getType()->getNumElements() != CAR->getType()->getNumElements())
-        return false;
-
-      for (unsigned I = 0; I < CAL->getType()->getNumElements(); ++I) {
-        if (!equivalentAsOperands(CAL->getAggregateElement(I),
-                                  CAR->getAggregateElement(I)))
-          return false;
-      }
-
-      return true;
-    }
-
-    // If L and R are ConstantStructs, compare each field and type.
-    if (isa<ConstantStruct>(L)) {
-      const ConstantStruct *CSL = cast<ConstantStruct>(L);
-      const ConstantStruct *CSR = cast<ConstantStruct>(R);
-
-      const StructType *LTy = cast<StructType>(CSL->getType());
-      const StructType *RTy = cast<StructType>(CSR->getType());
-
-      // The StructTypes should have the same attributes. Don't use
-      // isLayoutIdentical(), because that just checks the element pointers,
-      // which may not work here.
-      if (LTy->getNumElements() != RTy->getNumElements() ||
-          LTy->isPacked() != RTy->isPacked())
-        return false;
-
-      for (unsigned I = 0; I < LTy->getNumElements(); I++) {
-        const Value *LAgg = CSL->getAggregateElement(I);
-        const Value *RAgg = CSR->getAggregateElement(I);
-
-        if (LAgg == SavedLHS || RAgg == SavedRHS) {
-          if (LAgg != SavedLHS || RAgg != SavedRHS)
-            // If the left and right operands aren't both re-analyzing the
-            // variable, then the initialiers don't match, so report "false".
-            // Otherwise, we skip these operands..
-            return false;
-
-          continue;
-        }
-
-        if (!equivalentAsOperands(LAgg, RAgg)) {
-          return false;
-        }
-      }
-
-      return true;
-    }
-
-    return false;
-  }
-
-  bool equivalentAsOperands(const ConstantExpr *L, const ConstantExpr *R) {
-    if (L == R)
-      return true;
-
-    if (L->getOpcode() != R->getOpcode())
-      return false;
-
-    switch (L->getOpcode()) {
-    case Instruction::ICmp:
-    case Instruction::FCmp:
-      if (L->getPredicate() != R->getPredicate())
-        return false;
-      break;
-
-    case Instruction::GetElementPtr:
-      // FIXME: inbounds?
-      break;
-
-    default:
-      break;
-    }
-
-    if (L->getNumOperands() != R->getNumOperands())
-      return false;
-
-    for (unsigned I = 0, E = L->getNumOperands(); I != E; ++I) {
-      const auto *LOp = L->getOperand(I);
-      const auto *ROp = R->getOperand(I);
-
-      if (LOp == SavedLHS || ROp == SavedRHS) {
-        if (LOp != SavedLHS || ROp != SavedRHS)
-          // If the left and right operands aren't both re-analyzing the
-          // variable, then the initialiers don't match, so report "false".
-          // Otherwise, we skip these operands..
-          return false;
-
-        continue;
-      }
-
-      if (!equivalentAsOperands(LOp, ROp))
-        return false;
-    }
-
-    return true;
-  }
-
-  bool equivalentAsOperands(const Value *L, const Value *R) {
-    // Fall out if the values have different kind.
-    // This possibly shouldn't take priority over oracles.
-    if (L->getValueID() != R->getValueID())
-      return false;
-
-    // Value subtypes:  Argument, Constant, Instruction, BasicBlock,
-    //                  InlineAsm, MDNode, MDString, PseudoSourceValue
-
-    if (isa<Constant>(L))
-      return equivalentAsOperands(cast<Constant>(L), cast<Constant>(R));
-
-    if (isa<Instruction>(L))
-      return Values[L] == R || TentativeValues.count(std::make_pair(L, R));
-
-    if (isa<Argument>(L))
-      return Values[L] == R;
-
-    if (isa<BasicBlock>(L))
-      return Blocks[cast<BasicBlock>(L)] != R;
-
-    // Pretend everything else is identical.
-    return true;
-  }
-
-  // Avoid a gcc warning about accessing 'this' in an initializer.
-  FunctionDifferenceEngine *this_() { return this; }
-
-public:
-  FunctionDifferenceEngine(DifferenceEngine &Engine,
-                           const Value *SavedLHS = nullptr,
-                           const Value *SavedRHS = nullptr)
-      : Engine(Engine), SavedLHS(SavedLHS), SavedRHS(SavedRHS),
-        Queue(QueueSorter(*this_())) {}
-
-  void diff(const Function *L, const Function *R) {
-    if (L->arg_size() != R->arg_size())
-      Engine.log("different argument counts");
-
-    // Map the arguments.
-    for (Function::const_arg_iterator LI = L->arg_begin(), LE = L->arg_end(),
-                                      RI = R->arg_begin(), RE = R->arg_end();
-         LI != LE && RI != RE; ++LI, ++RI)
-      Values[&*LI] = &*RI;
-
-    tryUnify(&*L->begin(), &*R->begin());
-    processQueue();
-  }
-};
-
-struct DiffEntry {
-  DiffEntry() : Cost(0) {}
-
-  unsigned Cost;
-  llvm::SmallVector<char, 8> Path; // actually of DifferenceEngine::DiffChange
-};
-
-bool FunctionDifferenceEngine::matchForBlockDiff(const Instruction *L,
-                                                 const Instruction *R) {
-  return !diff(L, R, false, false);
-}
-
-void FunctionDifferenceEngine::runBlockDiff(BasicBlock::const_iterator LStart,
-                                            BasicBlock::const_iterator RStart) {
-  BasicBlock::const_iterator LE = LStart->getParent()->end();
-  BasicBlock::const_iterator RE = RStart->getParent()->end();
-
-  unsigned NL = std::distance(LStart, LE);
-
-  SmallVector<DiffEntry, 20> Paths1(NL+1);
-  SmallVector<DiffEntry, 20> Paths2(NL+1);
-
-  DiffEntry *Cur = Paths1.data();
-  DiffEntry *Next = Paths2.data();
-
-  const unsigned LeftCost = 2;
-  const unsigned RightCost = 2;
-  const unsigned MatchCost = 0;
-
-  assert(TentativeValues.empty());
-
-  // Initialize the first column.
-  for (unsigned I = 0; I != NL+1; ++I) {
-    Cur[I].Cost = I * LeftCost;
-    for (unsigned J = 0; J != I; ++J)
-      Cur[I].Path.push_back(DC_left);
-  }
-
-  for (BasicBlock::const_iterator RI = RStart; RI != RE; ++RI) {
-    // Initialize the first row.
-    Next[0] = Cur[0];
-    Next[0].Cost += RightCost;
-    Next[0].Path.push_back(DC_right);
-
-    unsigned Index = 1;
-    for (BasicBlock::const_iterator LI = LStart; LI != LE; ++LI, ++Index) {
-      if (matchForBlockDiff(&*LI, &*RI)) {
-        Next[Index] = Cur[Index-1];
-        Next[Index].Cost += MatchCost;
-        Next[Index].Path.push_back(DC_match);
-        TentativeValues.insert(std::make_pair(&*LI, &*RI));
-      } else if (Next[Index-1].Cost <= Cur[Index].Cost) {
-        Next[Index] = Next[Index-1];
-        Next[Index].Cost += LeftCost;
-        Next[Index].Path.push_back(DC_left);
-      } else {
-        Next[Index] = Cur[Index];
-        Next[Index].Cost += RightCost;
-        Next[Index].Path.push_back(DC_right);
-      }
-    }
-
-    std::swap(Cur, Next);
-  }
-
-  // We don't need the tentative values anymore; everything from here
-  // on out should be non-tentative.
-  TentativeValues.clear();
-
-  SmallVectorImpl<char> &Path = Cur[NL].Path;
-  BasicBlock::const_iterator LI = LStart, RI = RStart;
-
-  DiffLogBuilder Diff(Engine.getConsumer());
-
-  // Drop trailing matches.
-  while (Path.size() && Path.back() == DC_match)
-    Path.pop_back();
-
-  // Skip leading matches.
-  SmallVectorImpl<char>::iterator
-    PI = Path.begin(), PE = Path.end();
-  while (PI != PE && *PI == DC_match) {
-    unify(&*LI, &*RI);
-    ++PI;
-    ++LI;
-    ++RI;
-  }
-
-  for (; PI != PE; ++PI) {
-    switch (static_cast<DiffChange>(*PI)) {
-    case DC_match:
-      assert(LI != LE && RI != RE);
-      {
-        const Instruction *L = &*LI, *R = &*RI;
-        unify(L, R);
-        Diff.addMatch(L, R);
-      }
-      ++LI; ++RI;
-      break;
-
-    case DC_left:
-      assert(LI != LE);
-      Diff.addLeft(&*LI);
-      ++LI;
-      break;
-
-    case DC_right:
-      assert(RI != RE);
-      Diff.addRight(&*RI);
-      ++RI;
-      break;
-    }
-  }
-
-  // Finishing unifying and complaining about the tails of the block,
-  // which should be matches all the way through.
-  while (LI != LE) {
-    assert(RI != RE);
-    unify(&*LI, &*RI);
-    ++LI;
-    ++RI;
-  }
-
-  // If the terminators have different kinds, but one is an invoke and the
-  // other is an unconditional branch immediately following a call, unify
-  // the results and the destinations.
-  const Instruction *LTerm = LStart->getParent()->getTerminator();
-  const Instruction *RTerm = RStart->getParent()->getTerminator();
-  if (isa<BranchInst>(LTerm) && isa<InvokeInst>(RTerm)) {
-    if (cast<BranchInst>(LTerm)->isConditional()) return;
-    BasicBlock::const_iterator I = LTerm->getIterator();
-    if (I == LStart->getParent()->begin()) return;
-    --I;
-    if (!isa<CallInst>(*I)) return;
-    const CallInst *LCall = cast<CallInst>(&*I);
-    const InvokeInst *RInvoke = cast<InvokeInst>(RTerm);
-    if (!equivalentAsOperands(LCall->getCalledOperand(),
-                              RInvoke->getCalledOperand()))
-      return;
-    if (!LCall->use_empty())
-      Values[LCall] = RInvoke;
-    tryUnify(LTerm->getSuccessor(0), RInvoke->getNormalDest());
-  } else if (isa<InvokeInst>(LTerm) && isa<BranchInst>(RTerm)) {
-    if (cast<BranchInst>(RTerm)->isConditional()) return;
-    BasicBlock::const_iterator I = RTerm->getIterator();
-    if (I == RStart->getParent()->begin()) return;
-    --I;
-    if (!isa<CallInst>(*I)) return;
-    const CallInst *RCall = cast<CallInst>(I);
-    const InvokeInst *LInvoke = cast<InvokeInst>(LTerm);
-    if (!equivalentAsOperands(LInvoke->getCalledOperand(),
-                              RCall->getCalledOperand()))
-      return;
-    if (!LInvoke->use_empty())
-      Values[LInvoke] = RCall;
-    tryUnify(LInvoke->getNormalDest(), RTerm->getSuccessor(0));
-  }
-}
-}
-
-void DifferenceEngine::Oracle::anchor() { }
-
-void DifferenceEngine::diff(const Function *L, const Function *R) {
-  Context C(*this, L, R);
-
-  // FIXME: types
-  // FIXME: attributes and CC
-  // FIXME: parameter attributes
-  
-  // If both are declarations, we're done.
-  if (L->empty() && R->empty())
-    return;
-  else if (L->empty())
-    log("left function is declaration, right function is definition");
-  else if (R->empty())
-    log("right function is declaration, left function is definition");
-  else
-    FunctionDifferenceEngine(*this).diff(L, R);
-}
-
-void DifferenceEngine::diff(const Module *L, const Module *R) {
-  StringSet<> LNames;
-  SmallVector<std::pair<const Function *, const Function *>, 20> Queue;
-
-  unsigned LeftAnonCount = 0;
-  unsigned RightAnonCount = 0;
-
-  for (Module::const_iterator I = L->begin(), E = L->end(); I != E; ++I) {
-    const Function *LFn = &*I;
-    StringRef Name = LFn->getName();
-    if (Name.empty()) {
-      ++LeftAnonCount;
-      continue;
-    }
-
-    LNames.insert(Name);
-
-    if (Function *RFn = R->getFunction(LFn->getName()))
-      Queue.push_back(std::make_pair(LFn, RFn));
-    else
-      logf("function %l exists only in left module") << LFn;
-  }
-
-  for (Module::const_iterator I = R->begin(), E = R->end(); I != E; ++I) {
-    const Function *RFn = &*I;
-    StringRef Name = RFn->getName();
-    if (Name.empty()) {
-      ++RightAnonCount;
-      continue;
-    }
-
-    if (!LNames.count(Name))
-      logf("function %r exists only in right module") << RFn;
-  }
-
-  if (LeftAnonCount != 0 || RightAnonCount != 0) {
-    SmallString<32> Tmp;
-    logf(("not comparing " + Twine(LeftAnonCount) +
-          " anonymous functions in the left module and " +
-          Twine(RightAnonCount) + " in the right module")
-             .toStringRef(Tmp));
-  }
-
-  for (SmallVectorImpl<std::pair<const Function *, const Function *>>::iterator
-           I = Queue.begin(),
-           E = Queue.end();
-       I != E; ++I)
-    diff(I->first, I->second);
-}
-
-bool DifferenceEngine::equivalentAsOperands(const GlobalValue *L,
-                                            const GlobalValue *R) {
-  if (globalValueOracle) return (*globalValueOracle)(L, R);
-
-  if (isa<GlobalVariable>(L) && isa<GlobalVariable>(R)) {
-    const GlobalVariable *GVL = cast<GlobalVariable>(L);
-    const GlobalVariable *GVR = cast<GlobalVariable>(R);
-    if (GVL->hasLocalLinkage() && GVL->hasUniqueInitializer() &&
-        GVR->hasLocalLinkage() && GVR->hasUniqueInitializer())
-      return FunctionDifferenceEngine(*this, GVL, GVR)
-          .equivalentAsOperands(GVL->getInitializer(), GVR->getInitializer());
-  }
-
-  return L->getName() == R->getName();
-}
diff --git a/gnu/llvm/llvm/tools/llvm-diff/DifferenceEngine.h b/gnu/llvm/llvm/tools/llvm-diff/DifferenceEngine.h
deleted file mode 100644
index 436a3556636..00000000000
--- a/gnu/llvm/llvm/tools/llvm-diff/DifferenceEngine.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//===-- DifferenceEngine.h - Module comparator ------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This header defines the interface to the LLVM difference engine,
-// which structurally compares functions within a module.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_LLVM_DIFF_DIFFERENCEENGINE_H
-#define LLVM_TOOLS_LLVM_DIFF_DIFFERENCEENGINE_H
-
-#include "DiffConsumer.h"
-#include "DiffLog.h"
-#include "llvm/ADT/StringRef.h"
-#include <utility>
-
-namespace llvm {
-  class Function;
-  class GlobalValue;
-  class Instruction;
-  class LLVMContext;
-  class Module;
-  class Twine;
-  class Value;
-
-  /// A class for performing structural comparisons of LLVM assembly.
-  class DifferenceEngine {
-  public:
-    /// A RAII object for recording the current context.
-    struct Context {
-      Context(DifferenceEngine &Engine, const Value *L, const Value *R)
-          : Engine(Engine) {
-        Engine.consumer.enterContext(L, R);
-      }
-
-      ~Context() {
-        Engine.consumer.exitContext();
-      }
-
-    private:
-      DifferenceEngine &Engine;
-    };
-
-    /// An oracle for answering whether two values are equivalent as
-    /// operands.
-    class Oracle {
-      virtual void anchor();
-    public:
-      virtual bool operator()(const Value *L, const Value *R) = 0;
-
-    protected:
-      virtual ~Oracle() {}
-    };
-
-    DifferenceEngine(Consumer &consumer)
-      : consumer(consumer), globalValueOracle(nullptr) {}
-
-    void diff(const Module *L, const Module *R);
-    void diff(const Function *L, const Function *R);
-    void log(StringRef text) {
-      consumer.log(text);
-    }
-    LogBuilder logf(StringRef text) {
-      return LogBuilder(consumer, text);
-    }
-    Consumer& getConsumer() const { return consumer; }
-
-    /// Installs an oracle to decide whether two global values are
-    /// equivalent as operands.  Without an oracle, global values are
-    /// considered equivalent as operands precisely when they have the
-    /// same name.
-    void setGlobalValueOracle(Oracle *oracle) {
-      globalValueOracle = oracle;
-    }
-
-    /// Determines whether two global values are equivalent.
-    bool equivalentAsOperands(const GlobalValue *L, const GlobalValue *R);
-
-  private:
-    Consumer &consumer;
-    Oracle *globalValueOracle;
-  };
-}
-
-#endif
diff --git a/gnu/llvm/llvm/tools/llvm-go/CMakeLists.txt b/gnu/llvm/llvm/tools/llvm-go/CMakeLists.txt
deleted file mode 100644
index 20393f728f8..00000000000
--- a/gnu/llvm/llvm/tools/llvm-go/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-if(LLVM_BINDINGS MATCHES "go")
-  set(binpath ${CMAKE_BINARY_DIR}/bin/llvm-go${CMAKE_EXECUTABLE_SUFFIX})
-  add_custom_command(OUTPUT ${binpath}
-    COMMAND ${GO_EXECUTABLE} build -o ${binpath} llvm-go.go
-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/llvm-go.go
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    COMMENT "Building Go executable llvm-go")
-  add_custom_target(llvm-go ALL DEPENDS ${binpath})
-endif()
diff --git a/gnu/llvm/llvm/tools/llvm-go/llvm-go.go b/gnu/llvm/llvm/tools/llvm-go/llvm-go.go
deleted file mode 100644
index a0561dd5fd8..00000000000
--- a/gnu/llvm/llvm/tools/llvm-go/llvm-go.go
+++ /dev/null
@@ -1,311 +0,0 @@
-//===-- llvm-go.go - go tool wrapper for LLVM -----------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This tool lets us build LLVM components within the tree by setting up a
-// $GOPATH that resembles a tree fetched in the normal way with "go get".
-//
-//===----------------------------------------------------------------------===//
-
-package main
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"strings"
-)
-
-const (
-	linkmodeComponentLibs = "component-libs"
-	linkmodeDylib         = "dylib"
-)
-
-type pkg struct {
-	llvmpath, pkgpath string
-}
-
-var packages = []pkg{
-	{"bindings/go/llvm", "llvm.org/llvm/bindings/go/llvm"},
-}
-
-type compilerFlags struct {
-	cpp, cxx, ld string
-}
-
-var components = []string{
-	"all-targets",
-	"analysis",
-	"asmparser",
-	"asmprinter",
-	"bitreader",
-	"bitwriter",
-	"codegen",
-	"core",
-	"coroutines",
-	"debuginfodwarf",
-	"executionengine",
-	"instrumentation",
-	"interpreter",
-	"ipo",
-	"irreader",
-	"linker",
-	"mc",
-	"mcjit",
-	"objcarcopts",
-	"option",
-	"profiledata",
-	"scalaropts",
-	"support",
-	"target",
-}
-
-func llvmConfig(args ...string) string {
-	configpath := os.Getenv("LLVM_CONFIG")
-	if configpath == "" {
-		bin, _ := filepath.Split(os.Args[0])
-		configpath = filepath.Join(bin, "llvm-config")
-	}
-
-	cmd := exec.Command(configpath, args...)
-	cmd.Stderr = os.Stderr
-	out, err := cmd.Output()
-	if err != nil {
-		panic(err.Error())
-	}
-
-	outstr := string(out)
-	outstr = strings.TrimSuffix(outstr, "\n")
-	outstr = strings.Replace(outstr, "\n", " ", -1)
-	return outstr
-}
-
-func llvmFlags() compilerFlags {
-	args := append([]string{"--ldflags", "--libs", "--system-libs"}, components...)
-	ldflags := llvmConfig(args...)
-	stdLibOption := ""
-	if strings.Contains(llvmConfig("--cxxflags"), "-stdlib=libc++") {
-		// If libc++ is used to build LLVM libraries, -stdlib=libc++ is
-		// needed to resolve dependent symbols
-		stdLibOption = "-stdlib=libc++"
-	}
-	if runtime.GOOS != "darwin" {
-		// OS X doesn't like -rpath with cgo. See:
-		// https://github.com/golang/go/issues/7293
-		ldflags = "-Wl,-rpath," + llvmConfig("--libdir") + " " + ldflags
-	}
-	return compilerFlags{
-		cpp: llvmConfig("--cppflags"),
-		cxx: "-std=c++14" + " " + stdLibOption,
-		ld:  ldflags,
-	}
-}
-
-func addTag(args []string, tag string) []string {
-	args = append([]string{}, args...)
-	addedTag := false
-	for i, a := range args {
-		if strings.HasPrefix(a, "-tags=") {
-			args[i] = a + " " + tag
-			addedTag = true
-		} else if a == "-tags" && i+1 < len(args) {
-			args[i+1] = args[i+1] + " " + tag
-			addedTag = true
-		}
-	}
-	if !addedTag {
-		args = append([]string{args[0], "-tags", tag}, args[1:]...)
-	}
-	return args
-}
-
-func printComponents() {
-	fmt.Println(strings.Join(components, " "))
-}
-
-func printConfig() {
-	flags := llvmFlags()
-
-	fmt.Printf(`// +build !byollvm
-
-// This file is generated by llvm-go, do not edit.
-
-package llvm
-
-/*
-#cgo CPPFLAGS: %s
-#cgo CXXFLAGS: %s
-#cgo LDFLAGS: %s
-*/
-import "C"
-
-type (run_build_sh int)
-`, flags.cpp, flags.cxx, flags.ld)
-}
-
-func runGoWithLLVMEnv(args []string, cc, cxx, gocmd, llgo, cppflags, cxxflags, ldflags string, packages []pkg) {
-	args = addTag(args, "byollvm")
-
-	srcdir := llvmConfig("--src-root")
-
-	tmpgopath, err := ioutil.TempDir("", "gopath")
-	if err != nil {
-		panic(err.Error())
-	}
-
-	for _, p := range packages {
-		path := filepath.Join(tmpgopath, "src", p.pkgpath)
-		err := os.MkdirAll(filepath.Dir(path), os.ModePerm)
-		if err != nil {
-			panic(err.Error())
-		}
-
-		abspath := p.llvmpath
-		if !filepath.IsAbs(abspath) {
-			abspath = filepath.Join(srcdir, abspath)
-		}
-
-		err = os.Symlink(abspath, path)
-		if err != nil {
-			panic(err.Error())
-		}
-	}
-
-	newpath := os.Getenv("PATH")
-
-	newgopathlist := []string{tmpgopath}
-	newgopathlist = append(newgopathlist, filepath.SplitList(os.Getenv("GOPATH"))...)
-	newgopath := strings.Join(newgopathlist, string(filepath.ListSeparator))
-
-	flags := llvmFlags()
-
-	newenv := []string{
-		"CC=" + cc,
-		"CXX=" + cxx,
-		"CGO_CPPFLAGS=" + flags.cpp + " " + cppflags,
-		"CGO_CXXFLAGS=" + flags.cxx + " " + cxxflags,
-		"CGO_LDFLAGS=" + flags.ld + " " + ldflags,
-		"GOPATH=" + newgopath,
-		"PATH=" + newpath,
-	}
-	if llgo != "" {
-		newenv = append(newenv, "GCCGO="+llgo)
-	}
-
-	for _, v := range os.Environ() {
-		if !strings.HasPrefix(v, "CC=") &&
-			!strings.HasPrefix(v, "CXX=") &&
-			!strings.HasPrefix(v, "CGO_CPPFLAGS=") &&
-			!strings.HasPrefix(v, "CGO_CXXFLAGS=") &&
-			!strings.HasPrefix(v, "CGO_LDFLAGS=") &&
-			!strings.HasPrefix(v, "GCCGO=") &&
-			!strings.HasPrefix(v, "GOPATH=") &&
-			!strings.HasPrefix(v, "PATH=") {
-			newenv = append(newenv, v)
-		}
-	}
-
-	gocmdpath, err := exec.LookPath(gocmd)
-	if err != nil {
-		panic(err.Error())
-	}
-
-	proc, err := os.StartProcess(gocmdpath, append([]string{gocmd}, args...),
-		&os.ProcAttr{
-			Env:   newenv,
-			Files: []*os.File{os.Stdin, os.Stdout, os.Stderr},
-		})
-	if err != nil {
-		panic(err.Error())
-	}
-	ps, err := proc.Wait()
-	if err != nil {
-		panic(err.Error())
-	}
-
-	os.RemoveAll(tmpgopath)
-
-	if !ps.Success() {
-		os.Exit(1)
-	}
-}
-
-func usage() {
-	fmt.Println(`Usage: llvm-go subcommand [flags]
-
-Available subcommands: build get install run test print-components print-config`)
-	os.Exit(0)
-}
-
-func main() {
-	cc := os.Getenv("CC")
-	cxx := os.Getenv("CXX")
-	cppflags := os.Getenv("CGO_CPPFLAGS")
-	cxxflags := os.Getenv("CGO_CXXFLAGS")
-	ldflags := os.Getenv("CGO_LDFLAGS")
-	gocmd := "go"
-	llgo := ""
-	packagesString := ""
-
-	flags := []struct {
-		name string
-		dest *string
-	}{
-		{"cc", &cc},
-		{"cxx", &cxx},
-		{"go", &gocmd},
-		{"llgo", &llgo},
-		{"cppflags", &cppflags},
-		{"ldflags", &ldflags},
-		{"packages", &packagesString},
-	}
-
-	args := os.Args[1:]
-LOOP:
-	for {
-		if len(args) == 0 {
-			usage()
-		}
-		for _, flag := range flags {
-			if strings.HasPrefix(args[0], flag.name+"=") {
-				*flag.dest = args[0][len(flag.name)+1:]
-				args = args[1:]
-				continue LOOP
-			}
-		}
-		break
-	}
-
-	packages := packages
-	if packagesString != "" {
-		for _, field := range strings.Fields(packagesString) {
-			pos := strings.IndexRune(field, '=')
-			if pos == -1 {
-				fmt.Fprintf(os.Stderr, "invalid packages value %q, expected 'pkgpath=llvmpath [pkgpath=llvmpath ...]'\n", packagesString)
-				os.Exit(1)
-			}
-			packages = append(packages, pkg{
-				pkgpath:  field[:pos],
-				llvmpath: field[pos+1:],
-			})
-		}
-	}
-
-	switch args[0] {
-	case "build", "get", "install", "run", "test":
-		runGoWithLLVMEnv(args, cc, cxx, gocmd, llgo, cppflags, cxxflags, ldflags, packages)
-	case "print-components":
-		printComponents()
-	case "print-config":
-		printConfig()
-	default:
-		usage()
-	}
-}
diff --git a/gnu/llvm/llvm/tools/llvm-mca/Views/View.cpp b/gnu/llvm/llvm/tools/llvm-mca/Views/View.cpp
deleted file mode 100644
index 09d08d3ae00..00000000000
--- a/gnu/llvm/llvm/tools/llvm-mca/Views/View.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-//===----------------------- View.cpp ---------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-/// \file
-///
-/// This file defines the virtual anchor method in View.h to pin the vtable.
-///
-//===----------------------------------------------------------------------===//
-
-#include "Views/View.h"
-#include "llvm/MC/MCInst.h"
-#include "llvm/MC/MCSubtargetInfo.h"
-
-namespace llvm {
-namespace mca {
-
-void View::anchor() {}
-
-} // namespace mca
-} // namespace llvm
diff --git a/gnu/llvm/llvm/tools/llvm-mca/Views/View.h b/gnu/llvm/llvm/tools/llvm-mca/Views/View.h
deleted file mode 100644
index c604733d4ec..00000000000
--- a/gnu/llvm/llvm/tools/llvm-mca/Views/View.h
+++ /dev/null
@@ -1,41 +0,0 @@
-//===----------------------- View.h -----------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-/// \file
-///
-/// This file defines the main interface for Views. Each view contributes a
-/// portion of the final report generated by the tool.
-///
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_LLVM_MCA_VIEW_H
-#define LLVM_TOOLS_LLVM_MCA_VIEW_H
-
-#include "llvm/MC/MCInstPrinter.h"
-#include "llvm/MCA/HWEventListener.h"
-#include "llvm/Support/JSON.h"
-#include "llvm/Support/raw_ostream.h"
-
-namespace llvm {
-namespace mca {
-
-class View : public HWEventListener {
-public:
-  virtual ~View() = default;
-
-  virtual void printView(llvm::raw_ostream &OS) const = 0;
-  virtual StringRef getNameAsString() const = 0;
-
-  virtual json::Value toJSON() const { return "not implemented"; }
-  virtual bool isSerializable() const { return true; }
-
-  void anchor() override;
-};
-} // namespace mca
-} // namespace llvm
-
-#endif
diff --git a/gnu/llvm/llvm/tools/llvm-mca/lib/AMDGPU/AMDGPUCustomBehaviour.cpp b/gnu/llvm/llvm/tools/llvm-mca/lib/AMDGPU/AMDGPUCustomBehaviour.cpp
deleted file mode 100644
index a655f3faf1b..00000000000
--- a/gnu/llvm/llvm/tools/llvm-mca/lib/AMDGPU/AMDGPUCustomBehaviour.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-//===------------------ AMDGPUCustomBehaviour.cpp ---------------*-C++ -* -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-/// \file
-///
-/// This file implements methods from the AMDGPUCustomBehaviour class.
-///
-//===----------------------------------------------------------------------===//
-
-#include "AMDGPUCustomBehaviour.h"
-#include "MCTargetDesc/AMDGPUMCTargetDesc.h"
-#include "SIInstrInfo.h"
-#include "llvm/Support/WithColor.h"
-
-namespace llvm {
-namespace mca {
-
-AMDGPUCustomBehaviour::AMDGPUCustomBehaviour(const MCSubtargetInfo &STI,
-                                             const SourceMgr &SrcMgr,
-                                             const MCInstrInfo &MCII)
-    : CustomBehaviour(STI, SrcMgr, MCII) {}
-
-unsigned AMDGPUCustomBehaviour::checkCustomHazard(ArrayRef<InstRef> IssuedInst,
-                                                  const InstRef &IR) {
-  return 0;
-}
-
-} // namespace mca
-} // namespace llvm
diff --git a/gnu/llvm/llvm/tools/llvm-mca/lib/AMDGPU/AMDGPUCustomBehaviour.h b/gnu/llvm/llvm/tools/llvm-mca/lib/AMDGPU/AMDGPUCustomBehaviour.h
deleted file mode 100644
index 0dd21c7b4c4..00000000000
--- a/gnu/llvm/llvm/tools/llvm-mca/lib/AMDGPU/AMDGPUCustomBehaviour.h
+++ /dev/null
@@ -1,57 +0,0 @@
-//===------------------- AMDGPUCustomBehaviour.h ----------------*-C++ -* -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-/// \file
-///
-/// This file defines the AMDGPUCustomBehaviour class which inherits from
-/// CustomBehaviour.
-///
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_LLVM_MCA_LIB_AMDGPU_AMDGPUCUSTOMBEHAVIOUR_H
-#define LLVM_TOOLS_LLVM_MCA_LIB_AMDGPU_AMDGPUCUSTOMBEHAVIOUR_H
-
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/MCA/CustomBehaviour.h"
-#include "llvm/Support/TargetParser.h"
-
-namespace llvm {
-namespace mca {
-
-class AMDGPUInstrPostProcess : public InstrPostProcess {
-public:
-  AMDGPUInstrPostProcess(const MCSubtargetInfo &STI, const MCInstrInfo &MCII)
-      : InstrPostProcess(STI, MCII) {}
-
-  ~AMDGPUInstrPostProcess() {}
-
-  void postProcessInstruction(std::unique_ptr<Instruction> &Inst,
-                              const MCInst &MCI) override {}
-};
-
-class AMDGPUCustomBehaviour : public CustomBehaviour {
-public:
-  AMDGPUCustomBehaviour(const MCSubtargetInfo &STI, const SourceMgr &SrcMgr,
-                        const MCInstrInfo &MCII);
-
-  ~AMDGPUCustomBehaviour() {}
-
-  /// This method is used to determine if an instruction
-  /// should be allowed to be dispatched. The return value is
-  /// how many cycles until the instruction can be dispatched.
-  /// This method is called after MCA has already checked for
-  /// register and hardware dependencies so this method should only
-  /// implement custom behaviour and dependencies that are not picked up
-  /// by MCA naturally.
-  unsigned checkCustomHazard(ArrayRef<InstRef> IssuedInst,
-                             const InstRef &IR) override;
-};
-
-} // namespace mca
-} // namespace llvm
-
-#endif /* LLVM_TOOLS_LLVM_MCA_LIB_AMDGPU_AMDGPUCUSTOMBEHAVIOUR_H */
diff --git a/gnu/llvm/llvm/tools/llvm-mca/lib/AMDGPU/CMakeLists.txt b/gnu/llvm/llvm/tools/llvm-mca/lib/AMDGPU/CMakeLists.txt
deleted file mode 100644
index cd6e171ac83..00000000000
--- a/gnu/llvm/llvm/tools/llvm-mca/lib/AMDGPU/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-include_directories(
-  ${LLVM_MAIN_SRC_DIR}/lib/Target/AMDGPU
-  ${LLVM_BINARY_DIR}/lib/Target/AMDGPU
-  )
-
-set(LLVM_LINK_COMPONENTS
-  AMDGPU
-  Core
-  MCA
-  Support
-  )
-
-add_llvm_library(LLVMMCACustomBehaviourAMDGPU
-  AMDGPUCustomBehaviour.cpp
-
-  DEPENDS
-  AMDGPUCommonTableGen
-  )
diff --git a/gnu/llvm/llvm/tools/llvm-mca/lib/CMakeLists.txt b/gnu/llvm/llvm/tools/llvm-mca/lib/CMakeLists.txt
deleted file mode 100644
index 57057dce64c..00000000000
--- a/gnu/llvm/llvm/tools/llvm-mca/lib/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-set(TARGETS_TO_APPEND "")
-set(MACROS_TO_APPEND "")
-
-if (LLVM_TARGETS_TO_BUILD MATCHES "AMDGPU")
-  add_subdirectory(AMDGPU)
-  list(APPEND TARGETS_TO_APPEND LLVMMCACustomBehaviourAMDGPU)
-  list(APPEND MACROS_TO_APPEND -DHAS_AMDGPU)
-endif()
-
-set(LLVM_MCA_CUSTOMBEHAVIOUR_TARGETS ${TARGETS_TO_APPEND} PARENT_SCOPE)
-set(LLVM_MCA_MACROS_TO_DEFINE ${MACROS_TO_APPEND} PARENT_SCOPE)
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/COFF/COFFConfig.h b/gnu/llvm/llvm/tools/llvm-objcopy/COFF/COFFConfig.h
deleted file mode 100644
index 3897ff47724..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/COFF/COFFConfig.h
+++ /dev/null
@@ -1,21 +0,0 @@
-//===- COFFConfig.h ---------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_LLVM_OBJCOPY_COFF_COFFCONFIG_H
-#define LLVM_TOOLS_LLVM_OBJCOPY_COFF_COFFCONFIG_H
-
-namespace llvm {
-namespace objcopy {
-
-// Coff specific configuration for copying/stripping a single file.
-struct COFFConfig {};
-
-} // namespace objcopy
-} // namespace llvm
-
-#endif // LLVM_TOOLS_LLVM_OBJCOPY_COFF_COFFCONFIG_H
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp b/gnu/llvm/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp
deleted file mode 100644
index e50ac2e12e2..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp
+++ /dev/null
@@ -1,273 +0,0 @@
-//===- COFFObjcopy.cpp ----------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "COFFObjcopy.h"
-#include "COFFConfig.h"
-#include "CommonConfig.h"
-#include "Object.h"
-#include "Reader.h"
-#include "Writer.h"
-
-#include "llvm/Object/Binary.h"
-#include "llvm/Object/COFF.h"
-#include "llvm/Support/CRC.h"
-#include "llvm/Support/Errc.h"
-#include "llvm/Support/Path.h"
-#include <cassert>
-
-namespace llvm {
-namespace objcopy {
-namespace coff {
-
-using namespace object;
-using namespace COFF;
-
-static bool isDebugSection(const Section &Sec) {
-  return Sec.Name.startswith(".debug");
-}
-
-static uint64_t getNextRVA(const Object &Obj) {
-  if (Obj.getSections().empty())
-    return 0;
-  const Section &Last = Obj.getSections().back();
-  return alignTo(Last.Header.VirtualAddress + Last.Header.VirtualSize,
-                 Obj.IsPE ? Obj.PeHeader.SectionAlignment : 1);
-}
-
-static Expected<std::vector<uint8_t>>
-createGnuDebugLinkSectionContents(StringRef File) {
-  ErrorOr<std::unique_ptr<MemoryBuffer>> LinkTargetOrErr =
-      MemoryBuffer::getFile(File);
-  if (!LinkTargetOrErr)
-    return createFileError(File, LinkTargetOrErr.getError());
-  auto LinkTarget = std::move(*LinkTargetOrErr);
-  uint32_t CRC32 = llvm::crc32(arrayRefFromStringRef(LinkTarget->getBuffer()));
-
-  StringRef FileName = sys::path::filename(File);
-  size_t CRCPos = alignTo(FileName.size() + 1, 4);
-  std::vector<uint8_t> Data(CRCPos + 4);
-  memcpy(Data.data(), FileName.data(), FileName.size());
-  support::endian::write32le(Data.data() + CRCPos, CRC32);
-  return Data;
-}
-
-// Adds named section with given contents to the object.
-static void addSection(Object &Obj, StringRef Name, ArrayRef<uint8_t> Contents,
-                       uint32_t Characteristics) {
-  bool NeedVA = Characteristics & (IMAGE_SCN_MEM_EXECUTE | IMAGE_SCN_MEM_READ |
-                                   IMAGE_SCN_MEM_WRITE);
-
-  Section Sec;
-  Sec.setOwnedContents(Contents);
-  Sec.Name = Name;
-  Sec.Header.VirtualSize = NeedVA ? Sec.getContents().size() : 0u;
-  Sec.Header.VirtualAddress = NeedVA ? getNextRVA(Obj) : 0u;
-  Sec.Header.SizeOfRawData =
-      NeedVA ? alignTo(Sec.Header.VirtualSize,
-                       Obj.IsPE ? Obj.PeHeader.FileAlignment : 1)
-             : Sec.getContents().size();
-  // Sec.Header.PointerToRawData is filled in by the writer.
-  Sec.Header.PointerToRelocations = 0;
-  Sec.Header.PointerToLinenumbers = 0;
-  // Sec.Header.NumberOfRelocations is filled in by the writer.
-  Sec.Header.NumberOfLinenumbers = 0;
-  Sec.Header.Characteristics = Characteristics;
-
-  Obj.addSections(Sec);
-}
-
-static Error addGnuDebugLink(Object &Obj, StringRef DebugLinkFile) {
-  Expected<std::vector<uint8_t>> Contents =
-      createGnuDebugLinkSectionContents(DebugLinkFile);
-  if (!Contents)
-    return Contents.takeError();
-
-  addSection(Obj, ".gnu_debuglink", *Contents,
-             IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ |
-                 IMAGE_SCN_MEM_DISCARDABLE);
-
-  return Error::success();
-}
-
-static void setSectionFlags(Section &Sec, SectionFlag AllFlags) {
-  // Need to preserve alignment flags.
-  const uint32_t PreserveMask =
-      IMAGE_SCN_ALIGN_1BYTES | IMAGE_SCN_ALIGN_2BYTES | IMAGE_SCN_ALIGN_4BYTES |
-      IMAGE_SCN_ALIGN_8BYTES | IMAGE_SCN_ALIGN_16BYTES |
-      IMAGE_SCN_ALIGN_32BYTES | IMAGE_SCN_ALIGN_64BYTES |
-      IMAGE_SCN_ALIGN_128BYTES | IMAGE_SCN_ALIGN_256BYTES |
-      IMAGE_SCN_ALIGN_512BYTES | IMAGE_SCN_ALIGN_1024BYTES |
-      IMAGE_SCN_ALIGN_2048BYTES | IMAGE_SCN_ALIGN_4096BYTES |
-      IMAGE_SCN_ALIGN_8192BYTES;
-
-  // Setup new section characteristics based on the flags provided in command
-  // line.
-  uint32_t NewCharacteristics =
-      (Sec.Header.Characteristics & PreserveMask) | IMAGE_SCN_MEM_READ;
-
-  if ((AllFlags & SectionFlag::SecAlloc) && !(AllFlags & SectionFlag::SecLoad))
-    NewCharacteristics |= IMAGE_SCN_CNT_UNINITIALIZED_DATA;
-  if (AllFlags & SectionFlag::SecNoload)
-    NewCharacteristics |= IMAGE_SCN_LNK_REMOVE;
-  if (!(AllFlags & SectionFlag::SecReadonly))
-    NewCharacteristics |= IMAGE_SCN_MEM_WRITE;
-  if (AllFlags & SectionFlag::SecDebug)
-    NewCharacteristics |=
-        IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_DISCARDABLE;
-  if (AllFlags & SectionFlag::SecCode)
-    NewCharacteristics |= IMAGE_SCN_CNT_CODE | IMAGE_SCN_MEM_EXECUTE;
-  if (AllFlags & SectionFlag::SecData)
-    NewCharacteristics |= IMAGE_SCN_CNT_INITIALIZED_DATA;
-  if (AllFlags & SectionFlag::SecShare)
-    NewCharacteristics |= IMAGE_SCN_MEM_SHARED;
-  if (AllFlags & SectionFlag::SecExclude)
-    NewCharacteristics |= IMAGE_SCN_LNK_REMOVE;
-
-  Sec.Header.Characteristics = NewCharacteristics;
-}
-
-static Error handleArgs(const CommonConfig &Config, Object &Obj) {
-  // Perform the actual section removals.
-  Obj.removeSections([&Config](const Section &Sec) {
-    // Contrary to --only-keep-debug, --only-section fully removes sections that
-    // aren't mentioned.
-    if (!Config.OnlySection.empty() && !Config.OnlySection.matches(Sec.Name))
-      return true;
-
-    if (Config.StripDebug || Config.StripAll || Config.StripAllGNU ||
-        Config.DiscardMode == DiscardType::All || Config.StripUnneeded) {
-      if (isDebugSection(Sec) &&
-          (Sec.Header.Characteristics & IMAGE_SCN_MEM_DISCARDABLE) != 0)
-        return true;
-    }
-
-    if (Config.ToRemove.matches(Sec.Name))
-      return true;
-
-    return false;
-  });
-
-  if (Config.OnlyKeepDebug) {
-    // For --only-keep-debug, we keep all other sections, but remove their
-    // content. The VirtualSize field in the section header is kept intact.
-    Obj.truncateSections([](const Section &Sec) {
-      return !isDebugSection(Sec) && Sec.Name != ".buildid" &&
-             ((Sec.Header.Characteristics &
-               (IMAGE_SCN_CNT_CODE | IMAGE_SCN_CNT_INITIALIZED_DATA)) != 0);
-    });
-  }
-
-  // StripAll removes all symbols and thus also removes all relocations.
-  if (Config.StripAll || Config.StripAllGNU)
-    for (Section &Sec : Obj.getMutableSections())
-      Sec.Relocs.clear();
-
-  // If we need to do per-symbol removals, initialize the Referenced field.
-  if (Config.StripUnneeded || Config.DiscardMode == DiscardType::All ||
-      !Config.SymbolsToRemove.empty())
-    if (Error E = Obj.markSymbols())
-      return E;
-
-  for (Symbol &Sym : Obj.getMutableSymbols()) {
-    auto I = Config.SymbolsToRename.find(Sym.Name);
-    if (I != Config.SymbolsToRename.end())
-      Sym.Name = I->getValue();
-  }
-
-  auto ToRemove = [&](const Symbol &Sym) -> Expected<bool> {
-    // For StripAll, all relocations have been stripped and we remove all
-    // symbols.
-    if (Config.StripAll || Config.StripAllGNU)
-      return true;
-
-    if (Config.SymbolsToRemove.matches(Sym.Name)) {
-      // Explicitly removing a referenced symbol is an error.
-      if (Sym.Referenced)
-        return createStringError(
-            llvm::errc::invalid_argument,
-            "'" + Config.OutputFilename + "': not stripping symbol '" +
-                Sym.Name.str() + "' because it is named in a relocation");
-      return true;
-    }
-
-    if (!Sym.Referenced) {
-      // With --strip-unneeded, GNU objcopy removes all unreferenced local
-      // symbols, and any unreferenced undefined external.
-      // With --strip-unneeded-symbol we strip only specific unreferenced
-      // local symbol instead of removing all of such.
-      if (Sym.Sym.StorageClass == IMAGE_SYM_CLASS_STATIC ||
-          Sym.Sym.SectionNumber == 0)
-        if (Config.StripUnneeded ||
-            Config.UnneededSymbolsToRemove.matches(Sym.Name))
-          return true;
-
-      // GNU objcopy keeps referenced local symbols and external symbols
-      // if --discard-all is set, similar to what --strip-unneeded does,
-      // but undefined local symbols are kept when --discard-all is set.
-      if (Config.DiscardMode == DiscardType::All &&
-          Sym.Sym.StorageClass == IMAGE_SYM_CLASS_STATIC &&
-          Sym.Sym.SectionNumber != 0)
-        return true;
-    }
-
-    return false;
-  };
-
-  // Actually do removals of symbols.
-  if (Error Err = Obj.removeSymbols(ToRemove))
-    return Err;
-
-  if (!Config.SetSectionFlags.empty())
-    for (Section &Sec : Obj.getMutableSections()) {
-      const auto It = Config.SetSectionFlags.find(Sec.Name);
-      if (It != Config.SetSectionFlags.end())
-        setSectionFlags(Sec, It->second.NewFlags);
-    }
-
-  for (const auto &Flag : Config.AddSection) {
-    StringRef SecName, FileName;
-    std::tie(SecName, FileName) = Flag.split("=");
-
-    auto BufOrErr = MemoryBuffer::getFile(FileName);
-    if (!BufOrErr)
-      return createFileError(FileName, errorCodeToError(BufOrErr.getError()));
-    auto Buf = std::move(*BufOrErr);
-
-    addSection(
-        Obj, SecName,
-        makeArrayRef(reinterpret_cast<const uint8_t *>(Buf->getBufferStart()),
-                     Buf->getBufferSize()),
-        IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_ALIGN_1BYTES);
-  }
-
-  if (!Config.AddGnuDebugLink.empty())
-    if (Error E = addGnuDebugLink(Obj, Config.AddGnuDebugLink))
-      return E;
-
-  return Error::success();
-}
-
-Error executeObjcopyOnBinary(const CommonConfig &Config, const COFFConfig &,
-                             COFFObjectFile &In, raw_ostream &Out) {
-  COFFReader Reader(In);
-  Expected<std::unique_ptr<Object>> ObjOrErr = Reader.create();
-  if (!ObjOrErr)
-    return createFileError(Config.InputFilename, ObjOrErr.takeError());
-  Object *Obj = ObjOrErr->get();
-  assert(Obj && "Unable to deserialize COFF object");
-  if (Error E = handleArgs(Config, *Obj))
-    return createFileError(Config.InputFilename, std::move(E));
-  COFFWriter Writer(*Obj, Out);
-  if (Error E = Writer.write())
-    return createFileError(Config.OutputFilename, std::move(E));
-  return Error::success();
-}
-
-} // end namespace coff
-} // end namespace objcopy
-} // end namespace llvm
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.h b/gnu/llvm/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.h
deleted file mode 100644
index 2c7ccd34653..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.h
+++ /dev/null
@@ -1,33 +0,0 @@
-//===- COFFObjcopy.h --------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_OBJCOPY_COFFOBJCOPY_H
-#define LLVM_TOOLS_OBJCOPY_COFFOBJCOPY_H
-
-namespace llvm {
-class Error;
-class raw_ostream;
-
-namespace object {
-class COFFObjectFile;
-} // end namespace object
-
-namespace objcopy {
-struct CommonConfig;
-struct COFFConfig;
-
-namespace coff {
-
-Error executeObjcopyOnBinary(const CommonConfig &Config, const COFFConfig &,
-                             object::COFFObjectFile &In, raw_ostream &Out);
-
-} // end namespace coff
-} // end namespace objcopy
-} // end namespace llvm
-
-#endif // LLVM_TOOLS_OBJCOPY_COFFOBJCOPY_H
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/COFF/Object.cpp b/gnu/llvm/llvm/tools/llvm-objcopy/COFF/Object.cpp
deleted file mode 100644
index 1c17b8408ee..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/COFF/Object.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-//===- Object.cpp ---------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "Object.h"
-#include "llvm/ADT/DenseSet.h"
-#include <algorithm>
-
-namespace llvm {
-namespace objcopy {
-namespace coff {
-
-using namespace object;
-
-void Object::addSymbols(ArrayRef<Symbol> NewSymbols) {
-  for (Symbol S : NewSymbols) {
-    S.UniqueId = NextSymbolUniqueId++;
-    Symbols.emplace_back(S);
-  }
-  updateSymbols();
-}
-
-void Object::updateSymbols() {
-  SymbolMap = DenseMap<size_t, Symbol *>(Symbols.size());
-  for (Symbol &Sym : Symbols)
-    SymbolMap[Sym.UniqueId] = &Sym;
-}
-
-const Symbol *Object::findSymbol(size_t UniqueId) const {
-  return SymbolMap.lookup(UniqueId);
-}
-
-Error Object::removeSymbols(
-    function_ref<Expected<bool>(const Symbol &)> ToRemove) {
-  Error Errs = Error::success();
-  llvm::erase_if(Symbols, [ToRemove, &Errs](const Symbol &Sym) {
-    Expected<bool> ShouldRemove = ToRemove(Sym);
-    if (!ShouldRemove) {
-      Errs = joinErrors(std::move(Errs), ShouldRemove.takeError());
-      return false;
-    }
-    return *ShouldRemove;
-  });
-
-  updateSymbols();
-  return Errs;
-}
-
-Error Object::markSymbols() {
-  for (Symbol &Sym : Symbols)
-    Sym.Referenced = false;
-  for (const Section &Sec : Sections) {
-    for (const Relocation &R : Sec.Relocs) {
-      auto It = SymbolMap.find(R.Target);
-      if (It == SymbolMap.end())
-        return createStringError(object_error::invalid_symbol_index,
-                                 "relocation target %zu not found", R.Target);
-      It->second->Referenced = true;
-    }
-  }
-  return Error::success();
-}
-
-void Object::addSections(ArrayRef<Section> NewSections) {
-  for (Section S : NewSections) {
-    S.UniqueId = NextSectionUniqueId++;
-    Sections.emplace_back(S);
-  }
-  updateSections();
-}
-
-void Object::updateSections() {
-  SectionMap = DenseMap<ssize_t, Section *>(Sections.size());
-  size_t Index = 1;
-  for (Section &S : Sections) {
-    SectionMap[S.UniqueId] = &S;
-    S.Index = Index++;
-  }
-}
-
-const Section *Object::findSection(ssize_t UniqueId) const {
-  return SectionMap.lookup(UniqueId);
-}
-
-void Object::removeSections(function_ref<bool(const Section &)> ToRemove) {
-  DenseSet<ssize_t> AssociatedSections;
-  auto RemoveAssociated = [&AssociatedSections](const Section &Sec) {
-    return AssociatedSections.contains(Sec.UniqueId);
-  };
-  do {
-    DenseSet<ssize_t> RemovedSections;
-    llvm::erase_if(Sections, [ToRemove, &RemovedSections](const Section &Sec) {
-      bool Remove = ToRemove(Sec);
-      if (Remove)
-        RemovedSections.insert(Sec.UniqueId);
-      return Remove;
-    });
-    // Remove all symbols referring to the removed sections.
-    AssociatedSections.clear();
-    llvm::erase_if(
-        Symbols, [&RemovedSections, &AssociatedSections](const Symbol &Sym) {
-          // If there are sections that are associative to a removed
-          // section,
-          // remove those as well as nothing will include them (and we can't
-          // leave them dangling).
-          if (RemovedSections.count(Sym.AssociativeComdatTargetSectionId) == 1)
-            AssociatedSections.insert(Sym.TargetSectionId);
-          return RemovedSections.contains(Sym.TargetSectionId);
-        });
-    ToRemove = RemoveAssociated;
-  } while (!AssociatedSections.empty());
-  updateSections();
-  updateSymbols();
-}
-
-void Object::truncateSections(function_ref<bool(const Section &)> ToTruncate) {
-  for (Section &Sec : Sections) {
-    if (ToTruncate(Sec)) {
-      Sec.clearContents();
-      Sec.Relocs.clear();
-      Sec.Header.SizeOfRawData = 0;
-    }
-  }
-}
-
-} // end namespace coff
-} // end namespace objcopy
-} // end namespace llvm
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/COFF/Object.h b/gnu/llvm/llvm/tools/llvm-objcopy/COFF/Object.h
deleted file mode 100644
index 0e854b58cbd..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/COFF/Object.h
+++ /dev/null
@@ -1,211 +0,0 @@
-//===- Object.h -------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_OBJCOPY_COFF_OBJECT_H
-#define LLVM_TOOLS_OBJCOPY_COFF_OBJECT_H
-
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/DenseMap.h"
-#include "llvm/ADT/Optional.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/ADT/iterator_range.h"
-#include "llvm/BinaryFormat/COFF.h"
-#include "llvm/Object/COFF.h"
-#include <cstddef>
-#include <cstdint>
-#include <vector>
-
-namespace llvm {
-namespace objcopy {
-namespace coff {
-
-struct Relocation {
-  Relocation() = default;
-  Relocation(const object::coff_relocation &R) : Reloc(R) {}
-
-  object::coff_relocation Reloc;
-  size_t Target = 0;
-  StringRef TargetName; // Used for diagnostics only
-};
-
-struct Section {
-  object::coff_section Header;
-  std::vector<Relocation> Relocs;
-  StringRef Name;
-  ssize_t UniqueId;
-  size_t Index;
-
-  ArrayRef<uint8_t> getContents() const {
-    if (!OwnedContents.empty())
-      return OwnedContents;
-    return ContentsRef;
-  }
-
-  void setContentsRef(ArrayRef<uint8_t> Data) {
-    OwnedContents.clear();
-    ContentsRef = Data;
-  }
-
-  void setOwnedContents(std::vector<uint8_t> &&Data) {
-    ContentsRef = ArrayRef<uint8_t>();
-    OwnedContents = std::move(Data);
-  }
-
-  void clearContents() {
-    ContentsRef = ArrayRef<uint8_t>();
-    OwnedContents.clear();
-  }
-
-private:
-  ArrayRef<uint8_t> ContentsRef;
-  std::vector<uint8_t> OwnedContents;
-};
-
-struct AuxSymbol {
-  AuxSymbol(ArrayRef<uint8_t> In) {
-    assert(In.size() == sizeof(Opaque));
-    std::copy(In.begin(), In.end(), Opaque);
-  }
-
-  ArrayRef<uint8_t> getRef() const {
-    return ArrayRef<uint8_t>(Opaque, sizeof(Opaque));
-  }
-
-  uint8_t Opaque[sizeof(object::coff_symbol16)];
-};
-
-struct Symbol {
-  object::coff_symbol32 Sym;
-  StringRef Name;
-  std::vector<AuxSymbol> AuxData;
-  StringRef AuxFile;
-  ssize_t TargetSectionId;
-  ssize_t AssociativeComdatTargetSectionId = 0;
-  Optional<size_t> WeakTargetSymbolId;
-  size_t UniqueId;
-  size_t RawIndex;
-  bool Referenced;
-};
-
-struct Object {
-  bool IsPE = false;
-
-  object::dos_header DosHeader;
-  ArrayRef<uint8_t> DosStub;
-
-  object::coff_file_header CoffFileHeader;
-
-  bool Is64 = false;
-  object::pe32plus_header PeHeader;
-  uint32_t BaseOfData = 0; // pe32plus_header lacks this field.
-
-  std::vector<object::data_directory> DataDirectories;
-
-  ArrayRef<Symbol> getSymbols() const { return Symbols; }
-  // This allows mutating individual Symbols, but not mutating the list
-  // of symbols itself.
-  iterator_range<std::vector<Symbol>::iterator> getMutableSymbols() {
-    return make_range(Symbols.begin(), Symbols.end());
-  }
-
-  const Symbol *findSymbol(size_t UniqueId) const;
-
-  void addSymbols(ArrayRef<Symbol> NewSymbols);
-  Error removeSymbols(function_ref<Expected<bool>(const Symbol &)> ToRemove);
-
-  // Set the Referenced field on all Symbols, based on relocations in
-  // all sections.
-  Error markSymbols();
-
-  ArrayRef<Section> getSections() const { return Sections; }
-  // This allows mutating individual Sections, but not mutating the list
-  // of sections itself.
-  iterator_range<std::vector<Section>::iterator> getMutableSections() {
-    return make_range(Sections.begin(), Sections.end());
-  }
-
-  const Section *findSection(ssize_t UniqueId) const;
-
-  void addSections(ArrayRef<Section> NewSections);
-  void removeSections(function_ref<bool(const Section &)> ToRemove);
-  void truncateSections(function_ref<bool(const Section &)> ToTruncate);
-
-private:
-  std::vector<Symbol> Symbols;
-  DenseMap<size_t, Symbol *> SymbolMap;
-
-  size_t NextSymbolUniqueId = 0;
-
-  std::vector<Section> Sections;
-  DenseMap<ssize_t, Section *> SectionMap;
-
-  ssize_t NextSectionUniqueId = 1; // Allow a UniqueId 0 to mean undefined.
-
-  // Update SymbolMap.
-  void updateSymbols();
-
-  // Update SectionMap and Index in each Section.
-  void updateSections();
-};
-
-// Copy between coff_symbol16 and coff_symbol32.
-// The source and destination files can use either coff_symbol16 or
-// coff_symbol32, while we always store them as coff_symbol32 in the
-// intermediate data structure.
-template <class Symbol1Ty, class Symbol2Ty>
-void copySymbol(Symbol1Ty &Dest, const Symbol2Ty &Src) {
-  static_assert(sizeof(Dest.Name.ShortName) == sizeof(Src.Name.ShortName),
-                "Mismatched name sizes");
-  memcpy(Dest.Name.ShortName, Src.Name.ShortName, sizeof(Dest.Name.ShortName));
-  Dest.Value = Src.Value;
-  Dest.SectionNumber = Src.SectionNumber;
-  Dest.Type = Src.Type;
-  Dest.StorageClass = Src.StorageClass;
-  Dest.NumberOfAuxSymbols = Src.NumberOfAuxSymbols;
-}
-
-// Copy between pe32_header and pe32plus_header.
-// We store the intermediate state in a pe32plus_header.
-template <class PeHeader1Ty, class PeHeader2Ty>
-void copyPeHeader(PeHeader1Ty &Dest, const PeHeader2Ty &Src) {
-  Dest.Magic = Src.Magic;
-  Dest.MajorLinkerVersion = Src.MajorLinkerVersion;
-  Dest.MinorLinkerVersion = Src.MinorLinkerVersion;
-  Dest.SizeOfCode = Src.SizeOfCode;
-  Dest.SizeOfInitializedData = Src.SizeOfInitializedData;
-  Dest.SizeOfUninitializedData = Src.SizeOfUninitializedData;
-  Dest.AddressOfEntryPoint = Src.AddressOfEntryPoint;
-  Dest.BaseOfCode = Src.BaseOfCode;
-  Dest.ImageBase = Src.ImageBase;
-  Dest.SectionAlignment = Src.SectionAlignment;
-  Dest.FileAlignment = Src.FileAlignment;
-  Dest.MajorOperatingSystemVersion = Src.MajorOperatingSystemVersion;
-  Dest.MinorOperatingSystemVersion = Src.MinorOperatingSystemVersion;
-  Dest.MajorImageVersion = Src.MajorImageVersion;
-  Dest.MinorImageVersion = Src.MinorImageVersion;
-  Dest.MajorSubsystemVersion = Src.MajorSubsystemVersion;
-  Dest.MinorSubsystemVersion = Src.MinorSubsystemVersion;
-  Dest.Win32VersionValue = Src.Win32VersionValue;
-  Dest.SizeOfImage = Src.SizeOfImage;
-  Dest.SizeOfHeaders = Src.SizeOfHeaders;
-  Dest.CheckSum = Src.CheckSum;
-  Dest.Subsystem = Src.Subsystem;
-  Dest.DLLCharacteristics = Src.DLLCharacteristics;
-  Dest.SizeOfStackReserve = Src.SizeOfStackReserve;
-  Dest.SizeOfStackCommit = Src.SizeOfStackCommit;
-  Dest.SizeOfHeapReserve = Src.SizeOfHeapReserve;
-  Dest.SizeOfHeapCommit = Src.SizeOfHeapCommit;
-  Dest.LoaderFlags = Src.LoaderFlags;
-  Dest.NumberOfRvaAndSize = Src.NumberOfRvaAndSize;
-}
-
-} // end namespace coff
-} // end namespace objcopy
-} // end namespace llvm
-
-#endif // LLVM_TOOLS_OBJCOPY_COFF_OBJECT_H
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/COFF/Reader.cpp b/gnu/llvm/llvm/tools/llvm-objcopy/COFF/Reader.cpp
deleted file mode 100644
index d1beacb3bd6..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/COFF/Reader.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-//===- Reader.cpp ---------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "Reader.h"
-#include "Object.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/BinaryFormat/COFF.h"
-#include "llvm/Object/COFF.h"
-#include "llvm/Support/ErrorHandling.h"
-#include <cstddef>
-#include <cstdint>
-
-namespace llvm {
-namespace objcopy {
-namespace coff {
-
-using namespace object;
-using namespace COFF;
-
-Error COFFReader::readExecutableHeaders(Object &Obj) const {
-  const dos_header *DH = COFFObj.getDOSHeader();
-  Obj.Is64 = COFFObj.is64();
-  if (!DH)
-    return Error::success();
-
-  Obj.IsPE = true;
-  Obj.DosHeader = *DH;
-  if (DH->AddressOfNewExeHeader > sizeof(*DH))
-    Obj.DosStub = ArrayRef<uint8_t>(reinterpret_cast<const uint8_t *>(&DH[1]),
-                                    DH->AddressOfNewExeHeader - sizeof(*DH));
-
-  if (COFFObj.is64()) {
-    Obj.PeHeader = *COFFObj.getPE32PlusHeader();
-  } else {
-    const pe32_header *PE32 = COFFObj.getPE32Header();
-    copyPeHeader(Obj.PeHeader, *PE32);
-    // The pe32plus_header (stored in Object) lacks the BaseOfData field.
-    Obj.BaseOfData = PE32->BaseOfData;
-  }
-
-  for (size_t I = 0; I < Obj.PeHeader.NumberOfRvaAndSize; I++) {
-    const data_directory *Dir = COFFObj.getDataDirectory(I);
-    if (!Dir)
-      return errorCodeToError(object_error::parse_failed);
-    Obj.DataDirectories.emplace_back(*Dir);
-  }
-  return Error::success();
-}
-
-Error COFFReader::readSections(Object &Obj) const {
-  std::vector<Section> Sections;
-  // Section indexing starts from 1.
-  for (size_t I = 1, E = COFFObj.getNumberOfSections(); I <= E; I++) {
-    Expected<const coff_section *> SecOrErr = COFFObj.getSection(I);
-    if (!SecOrErr)
-      return SecOrErr.takeError();
-    const coff_section *Sec = *SecOrErr;
-    Sections.push_back(Section());
-    Section &S = Sections.back();
-    S.Header = *Sec;
-    S.Header.Characteristics &= ~COFF::IMAGE_SCN_LNK_NRELOC_OVFL;
-    ArrayRef<uint8_t> Contents;
-    if (Error E = COFFObj.getSectionContents(Sec, Contents))
-      return E;
-    S.setContentsRef(Contents);
-    ArrayRef<coff_relocation> Relocs = COFFObj.getRelocations(Sec);
-    for (const coff_relocation &R : Relocs)
-      S.Relocs.push_back(R);
-    if (Expected<StringRef> NameOrErr = COFFObj.getSectionName(Sec))
-      S.Name = *NameOrErr;
-    else
-      return NameOrErr.takeError();
-  }
-  Obj.addSections(Sections);
-  return Error::success();
-}
-
-Error COFFReader::readSymbols(Object &Obj, bool IsBigObj) const {
-  std::vector<Symbol> Symbols;
-  Symbols.reserve(COFFObj.getRawNumberOfSymbols());
-  ArrayRef<Section> Sections = Obj.getSections();
-  for (uint32_t I = 0, E = COFFObj.getRawNumberOfSymbols(); I < E;) {
-    Expected<COFFSymbolRef> SymOrErr = COFFObj.getSymbol(I);
-    if (!SymOrErr)
-      return SymOrErr.takeError();
-    COFFSymbolRef SymRef = *SymOrErr;
-
-    Symbols.push_back(Symbol());
-    Symbol &Sym = Symbols.back();
-    // Copy symbols from the original form into an intermediate coff_symbol32.
-    if (IsBigObj)
-      copySymbol(Sym.Sym,
-                 *reinterpret_cast<const coff_symbol32 *>(SymRef.getRawPtr()));
-    else
-      copySymbol(Sym.Sym,
-                 *reinterpret_cast<const coff_symbol16 *>(SymRef.getRawPtr()));
-    auto NameOrErr = COFFObj.getSymbolName(SymRef);
-    if (!NameOrErr)
-      return NameOrErr.takeError();
-    Sym.Name = *NameOrErr;
-
-    ArrayRef<uint8_t> AuxData = COFFObj.getSymbolAuxData(SymRef);
-    size_t SymSize = IsBigObj ? sizeof(coff_symbol32) : sizeof(coff_symbol16);
-    assert(AuxData.size() == SymSize * SymRef.getNumberOfAuxSymbols());
-    // The auxillary symbols are structs of sizeof(coff_symbol16) each.
-    // In the big object format (where symbols are coff_symbol32), each
-    // auxillary symbol is padded with 2 bytes at the end. Copy each
-    // auxillary symbol to the Sym.AuxData vector. For file symbols,
-    // the whole range of aux symbols are interpreted as one null padded
-    // string instead.
-    if (SymRef.isFileRecord())
-      Sym.AuxFile = StringRef(reinterpret_cast<const char *>(AuxData.data()),
-                              AuxData.size())
-                        .rtrim('\0');
-    else
-      for (size_t I = 0; I < SymRef.getNumberOfAuxSymbols(); I++)
-        Sym.AuxData.push_back(AuxData.slice(I * SymSize, sizeof(AuxSymbol)));
-
-    // Find the unique id of the section
-    if (SymRef.getSectionNumber() <=
-        0) // Special symbol (undefined/absolute/debug)
-      Sym.TargetSectionId = SymRef.getSectionNumber();
-    else if (static_cast<uint32_t>(SymRef.getSectionNumber() - 1) <
-             Sections.size())
-      Sym.TargetSectionId = Sections[SymRef.getSectionNumber() - 1].UniqueId;
-    else
-      return createStringError(object_error::parse_failed,
-                               "section number out of range");
-    // For section definitions, check if it is comdat associative, and if
-    // it is, find the target section unique id.
-    const coff_aux_section_definition *SD = SymRef.getSectionDefinition();
-    const coff_aux_weak_external *WE = SymRef.getWeakExternal();
-    if (SD && SD->Selection == IMAGE_COMDAT_SELECT_ASSOCIATIVE) {
-      int32_t Index = SD->getNumber(IsBigObj);
-      if (Index <= 0 || static_cast<uint32_t>(Index - 1) >= Sections.size())
-        return createStringError(object_error::parse_failed,
-                                 "unexpected associative section index");
-      Sym.AssociativeComdatTargetSectionId = Sections[Index - 1].UniqueId;
-    } else if (WE) {
-      // This is a raw symbol index for now, but store it in the Symbol
-      // until we've added them to the Object, which assigns the final
-      // unique ids.
-      Sym.WeakTargetSymbolId = WE->TagIndex;
-    }
-    I += 1 + SymRef.getNumberOfAuxSymbols();
-  }
-  Obj.addSymbols(Symbols);
-  return Error::success();
-}
-
-Error COFFReader::setSymbolTargets(Object &Obj) const {
-  std::vector<const Symbol *> RawSymbolTable;
-  for (const Symbol &Sym : Obj.getSymbols()) {
-    RawSymbolTable.push_back(&Sym);
-    for (size_t I = 0; I < Sym.Sym.NumberOfAuxSymbols; I++)
-      RawSymbolTable.push_back(nullptr);
-  }
-  for (Symbol &Sym : Obj.getMutableSymbols()) {
-    // Convert WeakTargetSymbolId from the original raw symbol index to
-    // a proper unique id.
-    if (Sym.WeakTargetSymbolId) {
-      if (*Sym.WeakTargetSymbolId >= RawSymbolTable.size())
-        return createStringError(object_error::parse_failed,
-                                 "weak external reference out of range");
-      const Symbol *Target = RawSymbolTable[*Sym.WeakTargetSymbolId];
-      if (Target == nullptr)
-        return createStringError(object_error::parse_failed,
-                                 "invalid SymbolTableIndex");
-      Sym.WeakTargetSymbolId = Target->UniqueId;
-    }
-  }
-  for (Section &Sec : Obj.getMutableSections()) {
-    for (Relocation &R : Sec.Relocs) {
-      if (R.Reloc.SymbolTableIndex >= RawSymbolTable.size())
-        return createStringError(object_error::parse_failed,
-                                 "SymbolTableIndex out of range");
-      const Symbol *Sym = RawSymbolTable[R.Reloc.SymbolTableIndex];
-      if (Sym == nullptr)
-        return createStringError(object_error::parse_failed,
-                                 "invalid SymbolTableIndex");
-      R.Target = Sym->UniqueId;
-      R.TargetName = Sym->Name;
-    }
-  }
-  return Error::success();
-}
-
-Expected<std::unique_ptr<Object>> COFFReader::create() const {
-  auto Obj = std::make_unique<Object>();
-
-  bool IsBigObj = false;
-  if (const coff_file_header *CFH = COFFObj.getCOFFHeader()) {
-    Obj->CoffFileHeader = *CFH;
-  } else {
-    const coff_bigobj_file_header *CBFH = COFFObj.getCOFFBigObjHeader();
-    if (!CBFH)
-      return createStringError(object_error::parse_failed,
-                               "no COFF file header returned");
-    // Only copying the few fields from the bigobj header that we need
-    // and won't recreate in the end.
-    Obj->CoffFileHeader.Machine = CBFH->Machine;
-    Obj->CoffFileHeader.TimeDateStamp = CBFH->TimeDateStamp;
-    IsBigObj = true;
-  }
-
-  if (Error E = readExecutableHeaders(*Obj))
-    return std::move(E);
-  if (Error E = readSections(*Obj))
-    return std::move(E);
-  if (Error E = readSymbols(*Obj, IsBigObj))
-    return std::move(E);
-  if (Error E = setSymbolTargets(*Obj))
-    return std::move(E);
-
-  return std::move(Obj);
-}
-
-} // end namespace coff
-} // end namespace objcopy
-} // end namespace llvm
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/COFF/Reader.h b/gnu/llvm/llvm/tools/llvm-objcopy/COFF/Reader.h
deleted file mode 100644
index 48c050b6ea1..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/COFF/Reader.h
+++ /dev/null
@@ -1,41 +0,0 @@
-//===- Reader.h -------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_OBJCOPY_COFF_READER_H
-#define LLVM_TOOLS_OBJCOPY_COFF_READER_H
-
-#include "llvm/BinaryFormat/COFF.h"
-#include "llvm/Object/COFF.h"
-#include "llvm/Support/Error.h"
-
-namespace llvm {
-namespace objcopy {
-namespace coff {
-
-struct Object;
-
-using object::COFFObjectFile;
-
-class COFFReader {
-  const COFFObjectFile &COFFObj;
-
-  Error readExecutableHeaders(Object &Obj) const;
-  Error readSections(Object &Obj) const;
-  Error readSymbols(Object &Obj, bool IsBigObj) const;
-  Error setSymbolTargets(Object &Obj) const;
-
-public:
-  explicit COFFReader(const COFFObjectFile &O) : COFFObj(O) {}
-  Expected<std::unique_ptr<Object>> create() const;
-};
-
-} // end namespace coff
-} // end namespace objcopy
-} // end namespace llvm
-
-#endif // LLVM_TOOLS_OBJCOPY_COFF_READER_H
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/COFF/Writer.cpp b/gnu/llvm/llvm/tools/llvm-objcopy/COFF/Writer.cpp
deleted file mode 100644
index e7be64faab6..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/COFF/Writer.cpp
+++ /dev/null
@@ -1,459 +0,0 @@
-//===- Writer.cpp ---------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "Writer.h"
-#include "Object.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/BinaryFormat/COFF.h"
-#include "llvm/Object/COFF.h"
-#include "llvm/Support/Errc.h"
-#include "llvm/Support/ErrorHandling.h"
-#include <cstddef>
-#include <cstdint>
-
-namespace llvm {
-namespace objcopy {
-namespace coff {
-
-using namespace object;
-using namespace COFF;
-
-Error COFFWriter::finalizeRelocTargets() {
-  for (Section &Sec : Obj.getMutableSections()) {
-    for (Relocation &R : Sec.Relocs) {
-      const Symbol *Sym = Obj.findSymbol(R.Target);
-      if (Sym == nullptr)
-        return createStringError(object_error::invalid_symbol_index,
-                                 "relocation target '%s' (%zu) not found",
-                                 R.TargetName.str().c_str(), R.Target);
-      R.Reloc.SymbolTableIndex = Sym->RawIndex;
-    }
-  }
-  return Error::success();
-}
-
-Error COFFWriter::finalizeSymbolContents() {
-  for (Symbol &Sym : Obj.getMutableSymbols()) {
-    if (Sym.TargetSectionId <= 0) {
-      // Undefined, or a special kind of symbol. These negative values
-      // are stored in the SectionNumber field which is unsigned.
-      Sym.Sym.SectionNumber = static_cast<uint32_t>(Sym.TargetSectionId);
-    } else {
-      const Section *Sec = Obj.findSection(Sym.TargetSectionId);
-      if (Sec == nullptr)
-        return createStringError(object_error::invalid_symbol_index,
-                                 "symbol '%s' points to a removed section",
-                                 Sym.Name.str().c_str());
-      Sym.Sym.SectionNumber = Sec->Index;
-
-      if (Sym.Sym.NumberOfAuxSymbols == 1 &&
-          Sym.Sym.StorageClass == IMAGE_SYM_CLASS_STATIC) {
-        coff_aux_section_definition *SD =
-            reinterpret_cast<coff_aux_section_definition *>(
-                Sym.AuxData[0].Opaque);
-        uint32_t SDSectionNumber;
-        if (Sym.AssociativeComdatTargetSectionId == 0) {
-          // Not a comdat associative section; just set the Number field to
-          // the number of the section itself.
-          SDSectionNumber = Sec->Index;
-        } else {
-          Sec = Obj.findSection(Sym.AssociativeComdatTargetSectionId);
-          if (Sec == nullptr)
-            return createStringError(
-                object_error::invalid_symbol_index,
-                "symbol '%s' is associative to a removed section",
-                Sym.Name.str().c_str());
-          SDSectionNumber = Sec->Index;
-        }
-        // Update the section definition with the new section number.
-        SD->NumberLowPart = static_cast<uint16_t>(SDSectionNumber);
-        SD->NumberHighPart = static_cast<uint16_t>(SDSectionNumber >> 16);
-      }
-    }
-    // Check that we actually have got AuxData to match the weak symbol target
-    // we want to set. Only >= 1 would be required, but only == 1 makes sense.
-    if (Sym.WeakTargetSymbolId && Sym.Sym.NumberOfAuxSymbols == 1) {
-      coff_aux_weak_external *WE =
-          reinterpret_cast<coff_aux_weak_external *>(Sym.AuxData[0].Opaque);
-      const Symbol *Target = Obj.findSymbol(*Sym.WeakTargetSymbolId);
-      if (Target == nullptr)
-        return createStringError(object_error::invalid_symbol_index,
-                                 "symbol '%s' is missing its weak target",
-                                 Sym.Name.str().c_str());
-      WE->TagIndex = Target->RawIndex;
-    }
-  }
-  return Error::success();
-}
-
-void COFFWriter::layoutSections() {
-  for (auto &S : Obj.getMutableSections()) {
-    if (S.Header.SizeOfRawData > 0)
-      S.Header.PointerToRawData = FileSize;
-    FileSize += S.Header.SizeOfRawData; // For executables, this is already
-                                        // aligned to FileAlignment.
-    if (S.Relocs.size() >= 0xffff) {
-      S.Header.Characteristics |= COFF::IMAGE_SCN_LNK_NRELOC_OVFL;
-      S.Header.NumberOfRelocations = 0xffff;
-      S.Header.PointerToRelocations = FileSize;
-      FileSize += sizeof(coff_relocation);
-    } else {
-      S.Header.NumberOfRelocations = S.Relocs.size();
-      S.Header.PointerToRelocations = S.Relocs.size() ? FileSize : 0;
-    }
-
-    FileSize += S.Relocs.size() * sizeof(coff_relocation);
-    FileSize = alignTo(FileSize, FileAlignment);
-
-    if (S.Header.Characteristics & IMAGE_SCN_CNT_INITIALIZED_DATA)
-      SizeOfInitializedData += S.Header.SizeOfRawData;
-  }
-}
-
-size_t COFFWriter::finalizeStringTable() {
-  for (const auto &S : Obj.getSections())
-    if (S.Name.size() > COFF::NameSize)
-      StrTabBuilder.add(S.Name);
-
-  for (const auto &S : Obj.getSymbols())
-    if (S.Name.size() > COFF::NameSize)
-      StrTabBuilder.add(S.Name);
-
-  StrTabBuilder.finalize();
-
-  for (auto &S : Obj.getMutableSections()) {
-    memset(S.Header.Name, 0, sizeof(S.Header.Name));
-    if (S.Name.size() > COFF::NameSize) {
-      snprintf(S.Header.Name, sizeof(S.Header.Name), "/%d",
-               (int)StrTabBuilder.getOffset(S.Name));
-    } else {
-      memcpy(S.Header.Name, S.Name.data(), S.Name.size());
-    }
-  }
-  for (auto &S : Obj.getMutableSymbols()) {
-    if (S.Name.size() > COFF::NameSize) {
-      S.Sym.Name.Offset.Zeroes = 0;
-      S.Sym.Name.Offset.Offset = StrTabBuilder.getOffset(S.Name);
-    } else {
-      strncpy(S.Sym.Name.ShortName, S.Name.data(), COFF::NameSize);
-    }
-  }
-  return StrTabBuilder.getSize();
-}
-
-template <class SymbolTy>
-std::pair<size_t, size_t> COFFWriter::finalizeSymbolTable() {
-  size_t RawSymIndex = 0;
-  for (auto &S : Obj.getMutableSymbols()) {
-    // Symbols normally have NumberOfAuxSymbols set correctly all the time.
-    // For file symbols, we need to know the output file's symbol size to be
-    // able to calculate the number of slots it occupies.
-    if (!S.AuxFile.empty())
-      S.Sym.NumberOfAuxSymbols =
-          alignTo(S.AuxFile.size(), sizeof(SymbolTy)) / sizeof(SymbolTy);
-    S.RawIndex = RawSymIndex;
-    RawSymIndex += 1 + S.Sym.NumberOfAuxSymbols;
-  }
-  return std::make_pair(RawSymIndex * sizeof(SymbolTy), sizeof(SymbolTy));
-}
-
-Error COFFWriter::finalize(bool IsBigObj) {
-  size_t SymTabSize, SymbolSize;
-  std::tie(SymTabSize, SymbolSize) = IsBigObj
-                                         ? finalizeSymbolTable<coff_symbol32>()
-                                         : finalizeSymbolTable<coff_symbol16>();
-
-  if (Error E = finalizeRelocTargets())
-    return E;
-  if (Error E = finalizeSymbolContents())
-    return E;
-
-  size_t SizeOfHeaders = 0;
-  FileAlignment = 1;
-  size_t PeHeaderSize = 0;
-  if (Obj.IsPE) {
-    Obj.DosHeader.AddressOfNewExeHeader =
-        sizeof(Obj.DosHeader) + Obj.DosStub.size();
-    SizeOfHeaders += Obj.DosHeader.AddressOfNewExeHeader + sizeof(PEMagic);
-
-    FileAlignment = Obj.PeHeader.FileAlignment;
-    Obj.PeHeader.NumberOfRvaAndSize = Obj.DataDirectories.size();
-
-    PeHeaderSize = Obj.Is64 ? sizeof(pe32plus_header) : sizeof(pe32_header);
-    SizeOfHeaders +=
-        PeHeaderSize + sizeof(data_directory) * Obj.DataDirectories.size();
-  }
-  Obj.CoffFileHeader.NumberOfSections = Obj.getSections().size();
-  SizeOfHeaders +=
-      IsBigObj ? sizeof(coff_bigobj_file_header) : sizeof(coff_file_header);
-  SizeOfHeaders += sizeof(coff_section) * Obj.getSections().size();
-  SizeOfHeaders = alignTo(SizeOfHeaders, FileAlignment);
-
-  Obj.CoffFileHeader.SizeOfOptionalHeader =
-      PeHeaderSize + sizeof(data_directory) * Obj.DataDirectories.size();
-
-  FileSize = SizeOfHeaders;
-  SizeOfInitializedData = 0;
-
-  layoutSections();
-
-  if (Obj.IsPE) {
-    Obj.PeHeader.SizeOfHeaders = SizeOfHeaders;
-    Obj.PeHeader.SizeOfInitializedData = SizeOfInitializedData;
-
-    if (!Obj.getSections().empty()) {
-      const Section &S = Obj.getSections().back();
-      Obj.PeHeader.SizeOfImage =
-          alignTo(S.Header.VirtualAddress + S.Header.VirtualSize,
-                  Obj.PeHeader.SectionAlignment);
-    }
-
-    // If the PE header had a checksum, clear it, since it isn't valid
-    // any longer. (We don't calculate a new one.)
-    Obj.PeHeader.CheckSum = 0;
-  }
-
-  size_t StrTabSize = finalizeStringTable();
-
-  size_t PointerToSymbolTable = FileSize;
-  // StrTabSize <= 4 is the size of an empty string table, only consisting
-  // of the length field.
-  if (SymTabSize == 0 && StrTabSize <= 4 && Obj.IsPE) {
-    // For executables, don't point to the symbol table and skip writing
-    // the length field, if both the symbol and string tables are empty.
-    PointerToSymbolTable = 0;
-    StrTabSize = 0;
-  }
-
-  size_t NumRawSymbols = SymTabSize / SymbolSize;
-  Obj.CoffFileHeader.PointerToSymbolTable = PointerToSymbolTable;
-  Obj.CoffFileHeader.NumberOfSymbols = NumRawSymbols;
-  FileSize += SymTabSize + StrTabSize;
-  FileSize = alignTo(FileSize, FileAlignment);
-
-  return Error::success();
-}
-
-void COFFWriter::writeHeaders(bool IsBigObj) {
-  uint8_t *Ptr = reinterpret_cast<uint8_t *>(Buf->getBufferStart());
-  if (Obj.IsPE) {
-    memcpy(Ptr, &Obj.DosHeader, sizeof(Obj.DosHeader));
-    Ptr += sizeof(Obj.DosHeader);
-    memcpy(Ptr, Obj.DosStub.data(), Obj.DosStub.size());
-    Ptr += Obj.DosStub.size();
-    memcpy(Ptr, PEMagic, sizeof(PEMagic));
-    Ptr += sizeof(PEMagic);
-  }
-  if (!IsBigObj) {
-    memcpy(Ptr, &Obj.CoffFileHeader, sizeof(Obj.CoffFileHeader));
-    Ptr += sizeof(Obj.CoffFileHeader);
-  } else {
-    // Generate a coff_bigobj_file_header, filling it in with the values
-    // from Obj.CoffFileHeader. All extra fields that don't exist in
-    // coff_file_header can be set to hardcoded values.
-    coff_bigobj_file_header BigObjHeader;
-    BigObjHeader.Sig1 = IMAGE_FILE_MACHINE_UNKNOWN;
-    BigObjHeader.Sig2 = 0xffff;
-    BigObjHeader.Version = BigObjHeader::MinBigObjectVersion;
-    BigObjHeader.Machine = Obj.CoffFileHeader.Machine;
-    BigObjHeader.TimeDateStamp = Obj.CoffFileHeader.TimeDateStamp;
-    memcpy(BigObjHeader.UUID, BigObjMagic, sizeof(BigObjMagic));
-    BigObjHeader.unused1 = 0;
-    BigObjHeader.unused2 = 0;
-    BigObjHeader.unused3 = 0;
-    BigObjHeader.unused4 = 0;
-    // The value in Obj.CoffFileHeader.NumberOfSections is truncated, thus
-    // get the original one instead.
-    BigObjHeader.NumberOfSections = Obj.getSections().size();
-    BigObjHeader.PointerToSymbolTable = Obj.CoffFileHeader.PointerToSymbolTable;
-    BigObjHeader.NumberOfSymbols = Obj.CoffFileHeader.NumberOfSymbols;
-
-    memcpy(Ptr, &BigObjHeader, sizeof(BigObjHeader));
-    Ptr += sizeof(BigObjHeader);
-  }
-  if (Obj.IsPE) {
-    if (Obj.Is64) {
-      memcpy(Ptr, &Obj.PeHeader, sizeof(Obj.PeHeader));
-      Ptr += sizeof(Obj.PeHeader);
-    } else {
-      pe32_header PeHeader;
-      copyPeHeader(PeHeader, Obj.PeHeader);
-      // The pe32plus_header (stored in Object) lacks the BaseOfData field.
-      PeHeader.BaseOfData = Obj.BaseOfData;
-
-      memcpy(Ptr, &PeHeader, sizeof(PeHeader));
-      Ptr += sizeof(PeHeader);
-    }
-    for (const auto &DD : Obj.DataDirectories) {
-      memcpy(Ptr, &DD, sizeof(DD));
-      Ptr += sizeof(DD);
-    }
-  }
-  for (const auto &S : Obj.getSections()) {
-    memcpy(Ptr, &S.Header, sizeof(S.Header));
-    Ptr += sizeof(S.Header);
-  }
-}
-
-void COFFWriter::writeSections() {
-  for (const auto &S : Obj.getSections()) {
-    uint8_t *Ptr = reinterpret_cast<uint8_t *>(Buf->getBufferStart()) +
-                   S.Header.PointerToRawData;
-    ArrayRef<uint8_t> Contents = S.getContents();
-    std::copy(Contents.begin(), Contents.end(), Ptr);
-
-    // For executable sections, pad the remainder of the raw data size with
-    // 0xcc, which is int3 on x86.
-    if ((S.Header.Characteristics & IMAGE_SCN_CNT_CODE) &&
-        S.Header.SizeOfRawData > Contents.size())
-      memset(Ptr + Contents.size(), 0xcc,
-             S.Header.SizeOfRawData - Contents.size());
-
-    Ptr += S.Header.SizeOfRawData;
-
-    if (S.Relocs.size() >= 0xffff) {
-      object::coff_relocation R;
-      R.VirtualAddress = S.Relocs.size() + 1;
-      R.SymbolTableIndex = 0;
-      R.Type = 0;
-      memcpy(Ptr, &R, sizeof(R));
-      Ptr += sizeof(R);
-    }
-    for (const auto &R : S.Relocs) {
-      memcpy(Ptr, &R.Reloc, sizeof(R.Reloc));
-      Ptr += sizeof(R.Reloc);
-    }
-  }
-}
-
-template <class SymbolTy> void COFFWriter::writeSymbolStringTables() {
-  uint8_t *Ptr = reinterpret_cast<uint8_t *>(Buf->getBufferStart()) +
-                 Obj.CoffFileHeader.PointerToSymbolTable;
-  for (const auto &S : Obj.getSymbols()) {
-    // Convert symbols back to the right size, from coff_symbol32.
-    copySymbol<SymbolTy, coff_symbol32>(*reinterpret_cast<SymbolTy *>(Ptr),
-                                        S.Sym);
-    Ptr += sizeof(SymbolTy);
-    if (!S.AuxFile.empty()) {
-      // For file symbols, just write the string into the aux symbol slots,
-      // assuming that the unwritten parts are initialized to zero in the memory
-      // mapped file.
-      std::copy(S.AuxFile.begin(), S.AuxFile.end(), Ptr);
-      Ptr += S.Sym.NumberOfAuxSymbols * sizeof(SymbolTy);
-    } else {
-      // For other auxillary symbols, write their opaque payload into one symbol
-      // table slot each. For big object files, the symbols are larger than the
-      // opaque auxillary symbol struct and we leave padding at the end of each
-      // entry.
-      for (const AuxSymbol &AuxSym : S.AuxData) {
-        ArrayRef<uint8_t> Ref = AuxSym.getRef();
-        std::copy(Ref.begin(), Ref.end(), Ptr);
-        Ptr += sizeof(SymbolTy);
-      }
-    }
-  }
-  if (StrTabBuilder.getSize() > 4 || !Obj.IsPE) {
-    // Always write a string table in object files, even an empty one.
-    StrTabBuilder.write(Ptr);
-    Ptr += StrTabBuilder.getSize();
-  }
-}
-
-Error COFFWriter::write(bool IsBigObj) {
-  if (Error E = finalize(IsBigObj))
-    return E;
-
-  Buf = WritableMemoryBuffer::getNewMemBuffer(FileSize);
-  if (!Buf)
-    return createStringError(llvm::errc::not_enough_memory,
-                             "failed to allocate memory buffer of " +
-                                 Twine::utohexstr(FileSize) + " bytes.");
-
-  writeHeaders(IsBigObj);
-  writeSections();
-  if (IsBigObj)
-    writeSymbolStringTables<coff_symbol32>();
-  else
-    writeSymbolStringTables<coff_symbol16>();
-
-  if (Obj.IsPE)
-    if (Error E = patchDebugDirectory())
-      return E;
-
-  // TODO: Implement direct writing to the output stream (without intermediate
-  // memory buffer Buf).
-  Out.write(Buf->getBufferStart(), Buf->getBufferSize());
-  return Error::success();
-}
-
-Expected<uint32_t> COFFWriter::virtualAddressToFileAddress(uint32_t RVA) {
-  for (const auto &S : Obj.getSections()) {
-    if (RVA >= S.Header.VirtualAddress &&
-        RVA < S.Header.VirtualAddress + S.Header.SizeOfRawData)
-      return S.Header.PointerToRawData + RVA - S.Header.VirtualAddress;
-  }
-  return createStringError(object_error::parse_failed,
-                           "debug directory payload not found");
-}
-
-// Locate which sections contain the debug directories, iterate over all
-// the debug_directory structs in there, and set the PointerToRawData field
-// in all of them, according to their new physical location in the file.
-Error COFFWriter::patchDebugDirectory() {
-  if (Obj.DataDirectories.size() < DEBUG_DIRECTORY)
-    return Error::success();
-  const data_directory *Dir = &Obj.DataDirectories[DEBUG_DIRECTORY];
-  if (Dir->Size <= 0)
-    return Error::success();
-  for (const auto &S : Obj.getSections()) {
-    if (Dir->RelativeVirtualAddress >= S.Header.VirtualAddress &&
-        Dir->RelativeVirtualAddress <
-            S.Header.VirtualAddress + S.Header.SizeOfRawData) {
-      if (Dir->RelativeVirtualAddress + Dir->Size >
-          S.Header.VirtualAddress + S.Header.SizeOfRawData)
-        return createStringError(object_error::parse_failed,
-                                 "debug directory extends past end of section");
-
-      size_t Offset = Dir->RelativeVirtualAddress - S.Header.VirtualAddress;
-      uint8_t *Ptr = reinterpret_cast<uint8_t *>(Buf->getBufferStart()) +
-                     S.Header.PointerToRawData + Offset;
-      uint8_t *End = Ptr + Dir->Size;
-      while (Ptr < End) {
-        debug_directory *Debug = reinterpret_cast<debug_directory *>(Ptr);
-        if (!Debug->AddressOfRawData)
-          return createStringError(object_error::parse_failed,
-                                   "debug directory payload outside of "
-                                   "mapped sections not supported");
-        if (Expected<uint32_t> FilePosOrErr =
-                virtualAddressToFileAddress(Debug->AddressOfRawData))
-          Debug->PointerToRawData = *FilePosOrErr;
-        else
-          return FilePosOrErr.takeError();
-        Ptr += sizeof(debug_directory);
-        Offset += sizeof(debug_directory);
-      }
-      // Debug directory found and patched, all done.
-      return Error::success();
-    }
-  }
-  return createStringError(object_error::parse_failed,
-                           "debug directory not found");
-}
-
-Error COFFWriter::write() {
-  bool IsBigObj = Obj.getSections().size() > MaxNumberOfSections16;
-  if (IsBigObj && Obj.IsPE)
-    return createStringError(object_error::parse_failed,
-                             "too many sections for executable");
-  return write(IsBigObj);
-}
-
-} // end namespace coff
-} // end namespace objcopy
-} // end namespace llvm
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/COFF/Writer.h b/gnu/llvm/llvm/tools/llvm-objcopy/COFF/Writer.h
deleted file mode 100644
index eed43b3e581..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/COFF/Writer.h
+++ /dev/null
@@ -1,63 +0,0 @@
-//===- Writer.h -------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_OBJCOPY_COFF_WRITER_H
-#define LLVM_TOOLS_OBJCOPY_COFF_WRITER_H
-
-#include "llvm/MC/StringTableBuilder.h"
-#include "llvm/Support/Error.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include <cstddef>
-#include <utility>
-
-namespace llvm {
-namespace objcopy {
-namespace coff {
-
-struct Object;
-
-class COFFWriter {
-  Object &Obj;
-  std::unique_ptr<WritableMemoryBuffer> Buf;
-  raw_ostream &Out;
-
-  size_t FileSize;
-  size_t FileAlignment;
-  size_t SizeOfInitializedData;
-  StringTableBuilder StrTabBuilder;
-
-  template <class SymbolTy> std::pair<size_t, size_t> finalizeSymbolTable();
-  Error finalizeRelocTargets();
-  Error finalizeSymbolContents();
-  void layoutSections();
-  size_t finalizeStringTable();
-
-  Error finalize(bool IsBigObj);
-
-  void writeHeaders(bool IsBigObj);
-  void writeSections();
-  template <class SymbolTy> void writeSymbolStringTables();
-
-  Error write(bool IsBigObj);
-
-  Error patchDebugDirectory();
-  Expected<uint32_t> virtualAddressToFileAddress(uint32_t RVA);
-
-public:
-  virtual ~COFFWriter() {}
-  Error write();
-
-  COFFWriter(Object &Obj, raw_ostream &Out)
-      : Obj(Obj), Out(Out), StrTabBuilder(StringTableBuilder::WinCOFF) {}
-};
-
-} // end namespace coff
-} // end namespace objcopy
-} // end namespace llvm
-
-#endif // LLVM_TOOLS_OBJCOPY_COFF_WRITER_H
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/CommonConfig.h b/gnu/llvm/llvm/tools/llvm-objcopy/CommonConfig.h
deleted file mode 100644
index 131ce5c5911..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/CommonConfig.h
+++ /dev/null
@@ -1,280 +0,0 @@
-//===- CommonConfig.h -------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_LLVM_OBJCOPY_COMMONCONFIG_H
-#define LLVM_TOOLS_LLVM_OBJCOPY_COMMONCONFIG_H
-
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/CachedHashString.h"
-#include "llvm/ADT/DenseSet.h"
-#include "llvm/ADT/Optional.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/StringMap.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Object/ELFTypes.h"
-#include "llvm/Support/GlobPattern.h"
-#include "llvm/Support/Regex.h"
-// Necessary for llvm::DebugCompressionType::None
-#include "llvm/Target/TargetOptions.h"
-#include <vector>
-
-namespace llvm {
-namespace objcopy {
-
-enum class FileFormat {
-  Unspecified,
-  ELF,
-  Binary,
-  IHex,
-};
-
-// This type keeps track of the machine info for various architectures. This
-// lets us map architecture names to ELF types and the e_machine value of the
-// ELF file.
-struct MachineInfo {
-  MachineInfo(uint16_t EM, uint8_t ABI, bool Is64, bool IsLittle)
-      : EMachine(EM), OSABI(ABI), Is64Bit(Is64), IsLittleEndian(IsLittle) {}
-  // Alternative constructor that defaults to NONE for OSABI.
-  MachineInfo(uint16_t EM, bool Is64, bool IsLittle)
-      : MachineInfo(EM, ELF::ELFOSABI_NONE, Is64, IsLittle) {}
-  // Default constructor for unset fields.
-  MachineInfo() : MachineInfo(0, 0, false, false) {}
-  uint16_t EMachine;
-  uint8_t OSABI;
-  bool Is64Bit;
-  bool IsLittleEndian;
-};
-
-// Flags set by --set-section-flags or --rename-section. Interpretation of these
-// is format-specific and not all flags are meaningful for all object file
-// formats. This is a bitmask; many section flags may be set.
-enum SectionFlag {
-  SecNone = 0,
-  SecAlloc = 1 << 0,
-  SecLoad = 1 << 1,
-  SecNoload = 1 << 2,
-  SecReadonly = 1 << 3,
-  SecDebug = 1 << 4,
-  SecCode = 1 << 5,
-  SecData = 1 << 6,
-  SecRom = 1 << 7,
-  SecMerge = 1 << 8,
-  SecStrings = 1 << 9,
-  SecContents = 1 << 10,
-  SecShare = 1 << 11,
-  SecExclude = 1 << 12,
-  LLVM_MARK_AS_BITMASK_ENUM(/*LargestValue=*/SecExclude)
-};
-
-struct SectionRename {
-  StringRef OriginalName;
-  StringRef NewName;
-  Optional<SectionFlag> NewFlags;
-};
-
-struct SectionFlagsUpdate {
-  StringRef Name;
-  SectionFlag NewFlags;
-};
-
-enum class DiscardType {
-  None,   // Default
-  All,    // --discard-all (-x)
-  Locals, // --discard-locals (-X)
-};
-
-enum class MatchStyle {
-  Literal,  // Default for symbols.
-  Wildcard, // Default for sections, or enabled with --wildcard (-w).
-  Regex,    // Enabled with --regex.
-};
-
-class NameOrPattern {
-  StringRef Name;
-  // Regex is shared between multiple CommonConfig instances.
-  std::shared_ptr<Regex> R;
-  std::shared_ptr<GlobPattern> G;
-  bool IsPositiveMatch = true;
-
-  NameOrPattern(StringRef N) : Name(N) {}
-  NameOrPattern(std::shared_ptr<Regex> R) : R(R) {}
-  NameOrPattern(std::shared_ptr<GlobPattern> G, bool IsPositiveMatch)
-      : G(G), IsPositiveMatch(IsPositiveMatch) {}
-
-public:
-  // ErrorCallback is used to handle recoverable errors. An Error returned
-  // by the callback aborts the parsing and is then returned by this function.
-  static Expected<NameOrPattern>
-  create(StringRef Pattern, MatchStyle MS,
-         llvm::function_ref<Error(Error)> ErrorCallback);
-
-  bool isPositiveMatch() const { return IsPositiveMatch; }
-  Optional<StringRef> getName() const {
-    if (!R && !G)
-      return Name;
-    return None;
-  }
-  bool operator==(StringRef S) const {
-    return R ? R->match(S) : G ? G->match(S) : Name == S;
-  }
-  bool operator!=(StringRef S) const { return !operator==(S); }
-};
-
-// Matcher that checks symbol or section names against the command line flags
-// provided for that option.
-class NameMatcher {
-  DenseSet<CachedHashStringRef> PosNames;
-  std::vector<NameOrPattern> PosPatterns;
-  std::vector<NameOrPattern> NegMatchers;
-
-public:
-  Error addMatcher(Expected<NameOrPattern> Matcher) {
-    if (!Matcher)
-      return Matcher.takeError();
-    if (Matcher->isPositiveMatch()) {
-      if (Optional<StringRef> MaybeName = Matcher->getName())
-        PosNames.insert(CachedHashStringRef(*MaybeName));
-      else
-        PosPatterns.push_back(std::move(*Matcher));
-    } else {
-      NegMatchers.push_back(std::move(*Matcher));
-    }
-    return Error::success();
-  }
-  bool matches(StringRef S) const {
-    return (PosNames.contains(CachedHashStringRef(S)) ||
-            is_contained(PosPatterns, S)) &&
-           !is_contained(NegMatchers, S);
-  }
-  bool empty() const {
-    return PosNames.empty() && PosPatterns.empty() && NegMatchers.empty();
-  }
-};
-
-enum class SymbolFlag {
-  Global,
-  Local,
-  Weak,
-  Default,
-  Hidden,
-  Protected,
-  File,
-  Section,
-  Object,
-  Function,
-  IndirectFunction,
-  Debug,
-  Constructor,
-  Warning,
-  Indirect,
-  Synthetic,
-  UniqueObject,
-};
-
-// Symbol info specified by --add-symbol option. Symbol flags not supported
-// by a concrete format should be ignored.
-struct NewSymbolInfo {
-  StringRef SymbolName;
-  StringRef SectionName;
-  uint64_t Value = 0;
-  std::vector<SymbolFlag> Flags;
-  std::vector<StringRef> BeforeSyms;
-};
-
-// Configuration for copying/stripping a single file.
-struct CommonConfig {
-  // Main input/output options
-  StringRef InputFilename;
-  FileFormat InputFormat = FileFormat::Unspecified;
-  StringRef OutputFilename;
-  FileFormat OutputFormat = FileFormat::Unspecified;
-
-  // Only applicable when --output-format!=binary (e.g. elf64-x86-64).
-  Optional<MachineInfo> OutputArch;
-
-  // Advanced options
-  StringRef AddGnuDebugLink;
-  // Cached gnu_debuglink's target CRC
-  uint32_t GnuDebugLinkCRC32;
-  Optional<StringRef> ExtractPartition;
-  StringRef SplitDWO;
-  StringRef SymbolsPrefix;
-  StringRef AllocSectionsPrefix;
-  DiscardType DiscardMode = DiscardType::None;
-
-  // Repeated options
-  std::vector<StringRef> AddSection;
-  std::vector<StringRef> DumpSection;
-  std::vector<StringRef> RPathToAdd;
-  std::vector<StringRef> RPathToPrepend;
-  DenseMap<StringRef, StringRef> RPathsToUpdate;
-  DenseMap<StringRef, StringRef> InstallNamesToUpdate;
-  DenseSet<StringRef> RPathsToRemove;
-
-  // install-name-tool's id option
-  Optional<StringRef> SharedLibId;
-
-  // Section matchers
-  NameMatcher KeepSection;
-  NameMatcher OnlySection;
-  NameMatcher ToRemove;
-
-  // Symbol matchers
-  NameMatcher SymbolsToGlobalize;
-  NameMatcher SymbolsToKeep;
-  NameMatcher SymbolsToLocalize;
-  NameMatcher SymbolsToRemove;
-  NameMatcher UnneededSymbolsToRemove;
-  NameMatcher SymbolsToWeaken;
-  NameMatcher SymbolsToKeepGlobal;
-
-  // Map options
-  StringMap<SectionRename> SectionsToRename;
-  StringMap<uint64_t> SetSectionAlignment;
-  StringMap<SectionFlagsUpdate> SetSectionFlags;
-  StringMap<StringRef> SymbolsToRename;
-
-  // ELF entry point address expression. The input parameter is an entry point
-  // address in the input ELF file. The entry address in the output file is
-  // calculated with EntryExpr(input_address), when either --set-start or
-  // --change-start is used.
-  std::function<uint64_t(uint64_t)> EntryExpr;
-
-  // Symbol info specified by --add-symbol option.
-  std::vector<NewSymbolInfo> SymbolsToAdd;
-
-  // Boolean options
-  bool AllowBrokenLinks = false;
-  bool DeterministicArchives = true;
-  bool ExtractDWO = false;
-  bool ExtractMainPartition = false;
-  bool KeepFileSymbols = false;
-  bool KeepUndefined = false;
-  bool LocalizeHidden = false;
-  bool OnlyKeepDebug = false;
-  bool PreserveDates = false;
-  bool StripAll = false;
-  bool StripAllGNU = false;
-  bool StripDWO = false;
-  bool StripDebug = false;
-  bool StripNonAlloc = false;
-  bool StripSections = false;
-  bool StripSwiftSymbols = false;
-  bool StripUnneeded = false;
-  bool Weaken = false;
-  bool DecompressDebugSections = false;
-  // install-name-tool's --delete_all_rpaths
-  bool RemoveAllRpaths = false;
-
-  DebugCompressionType CompressionType = DebugCompressionType::None;
-};
-
-} // namespace objcopy
-} // namespace llvm
-
-#endif // LLVM_TOOLS_LLVM_OBJCOPY_COMMONCONFIG_H
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/ConfigManager.cpp b/gnu/llvm/llvm/tools/llvm-objcopy/ConfigManager.cpp
deleted file mode 100644
index 9f7d06b9941..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/ConfigManager.cpp
+++ /dev/null
@@ -1,1382 +0,0 @@
-//===- ConfigManager.cpp --------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "ConfigManager.h"
-#include "llvm/ADT/Optional.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/ADT/StringSet.h"
-#include "llvm/Option/Arg.h"
-#include "llvm/Option/ArgList.h"
-#include "llvm/Support/CRC.h"
-#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/Compression.h"
-#include "llvm/Support/Errc.h"
-#include "llvm/Support/Error.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/StringSaver.h"
-#include <memory>
-
-using namespace llvm;
-using namespace llvm::objcopy;
-
-namespace {
-enum ObjcopyID {
-  OBJCOPY_INVALID = 0, // This is not an option ID.
-#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM,  \
-               HELPTEXT, METAVAR, VALUES)                                      \
-  OBJCOPY_##ID,
-#include "ObjcopyOpts.inc"
-#undef OPTION
-};
-
-#define PREFIX(NAME, VALUE) const char *const OBJCOPY_##NAME[] = VALUE;
-#include "ObjcopyOpts.inc"
-#undef PREFIX
-
-static const opt::OptTable::Info ObjcopyInfoTable[] = {
-#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM,  \
-               HELPTEXT, METAVAR, VALUES)                                      \
-  {OBJCOPY_##PREFIX,                                                           \
-   NAME,                                                                       \
-   HELPTEXT,                                                                   \
-   METAVAR,                                                                    \
-   OBJCOPY_##ID,                                                               \
-   opt::Option::KIND##Class,                                                   \
-   PARAM,                                                                      \
-   FLAGS,                                                                      \
-   OBJCOPY_##GROUP,                                                            \
-   OBJCOPY_##ALIAS,                                                            \
-   ALIASARGS,                                                                  \
-   VALUES},
-#include "ObjcopyOpts.inc"
-#undef OPTION
-};
-
-class ObjcopyOptTable : public opt::OptTable {
-public:
-  ObjcopyOptTable() : OptTable(ObjcopyInfoTable) {
-    setGroupedShortOptions(true);
-  }
-};
-
-enum InstallNameToolID {
-  INSTALL_NAME_TOOL_INVALID = 0, // This is not an option ID.
-#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM,  \
-               HELPTEXT, METAVAR, VALUES)                                      \
-  INSTALL_NAME_TOOL_##ID,
-#include "InstallNameToolOpts.inc"
-#undef OPTION
-};
-
-#define PREFIX(NAME, VALUE)                                                    \
-  const char *const INSTALL_NAME_TOOL_##NAME[] = VALUE;
-#include "InstallNameToolOpts.inc"
-#undef PREFIX
-
-static const opt::OptTable::Info InstallNameToolInfoTable[] = {
-#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM,  \
-               HELPTEXT, METAVAR, VALUES)                                      \
-  {INSTALL_NAME_TOOL_##PREFIX,                                                 \
-   NAME,                                                                       \
-   HELPTEXT,                                                                   \
-   METAVAR,                                                                    \
-   INSTALL_NAME_TOOL_##ID,                                                     \
-   opt::Option::KIND##Class,                                                   \
-   PARAM,                                                                      \
-   FLAGS,                                                                      \
-   INSTALL_NAME_TOOL_##GROUP,                                                  \
-   INSTALL_NAME_TOOL_##ALIAS,                                                  \
-   ALIASARGS,                                                                  \
-   VALUES},
-#include "InstallNameToolOpts.inc"
-#undef OPTION
-};
-
-class InstallNameToolOptTable : public opt::OptTable {
-public:
-  InstallNameToolOptTable() : OptTable(InstallNameToolInfoTable) {}
-};
-
-enum BitcodeStripID {
-  BITCODE_STRIP_INVALID = 0, // This is not an option ID.
-#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM,  \
-               HELPTEXT, METAVAR, VALUES)                                      \
-  BITCODE_STRIP_##ID,
-#include "BitcodeStripOpts.inc"
-#undef OPTION
-};
-
-#define PREFIX(NAME, VALUE) const char *const BITCODE_STRIP_##NAME[] = VALUE;
-#include "BitcodeStripOpts.inc"
-#undef PREFIX
-
-static const opt::OptTable::Info BitcodeStripInfoTable[] = {
-#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM,  \
-               HELPTEXT, METAVAR, VALUES)                                      \
-  {BITCODE_STRIP_##PREFIX,                                                     \
-   NAME,                                                                       \
-   HELPTEXT,                                                                   \
-   METAVAR,                                                                    \
-   BITCODE_STRIP_##ID,                                                         \
-   opt::Option::KIND##Class,                                                   \
-   PARAM,                                                                      \
-   FLAGS,                                                                      \
-   BITCODE_STRIP_##GROUP,                                                      \
-   BITCODE_STRIP_##ALIAS,                                                      \
-   ALIASARGS,                                                                  \
-   VALUES},
-#include "BitcodeStripOpts.inc"
-#undef OPTION
-};
-
-class BitcodeStripOptTable : public opt::OptTable {
-public:
-  BitcodeStripOptTable() : OptTable(BitcodeStripInfoTable) {}
-};
-
-enum StripID {
-  STRIP_INVALID = 0, // This is not an option ID.
-#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM,  \
-               HELPTEXT, METAVAR, VALUES)                                      \
-  STRIP_##ID,
-#include "StripOpts.inc"
-#undef OPTION
-};
-
-#define PREFIX(NAME, VALUE) const char *const STRIP_##NAME[] = VALUE;
-#include "StripOpts.inc"
-#undef PREFIX
-
-static const opt::OptTable::Info StripInfoTable[] = {
-#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM,  \
-               HELPTEXT, METAVAR, VALUES)                                      \
-  {STRIP_##PREFIX, NAME,       HELPTEXT,                                       \
-   METAVAR,        STRIP_##ID, opt::Option::KIND##Class,                       \
-   PARAM,          FLAGS,      STRIP_##GROUP,                                  \
-   STRIP_##ALIAS,  ALIASARGS,  VALUES},
-#include "StripOpts.inc"
-#undef OPTION
-};
-
-class StripOptTable : public opt::OptTable {
-public:
-  StripOptTable() : OptTable(StripInfoTable) { setGroupedShortOptions(true); }
-};
-
-} // namespace
-
-static SectionFlag parseSectionRenameFlag(StringRef SectionName) {
-  return llvm::StringSwitch<SectionFlag>(SectionName)
-      .CaseLower("alloc", SectionFlag::SecAlloc)
-      .CaseLower("load", SectionFlag::SecLoad)
-      .CaseLower("noload", SectionFlag::SecNoload)
-      .CaseLower("readonly", SectionFlag::SecReadonly)
-      .CaseLower("debug", SectionFlag::SecDebug)
-      .CaseLower("code", SectionFlag::SecCode)
-      .CaseLower("data", SectionFlag::SecData)
-      .CaseLower("rom", SectionFlag::SecRom)
-      .CaseLower("merge", SectionFlag::SecMerge)
-      .CaseLower("strings", SectionFlag::SecStrings)
-      .CaseLower("contents", SectionFlag::SecContents)
-      .CaseLower("share", SectionFlag::SecShare)
-      .CaseLower("exclude", SectionFlag::SecExclude)
-      .Default(SectionFlag::SecNone);
-}
-
-static Expected<SectionFlag>
-parseSectionFlagSet(ArrayRef<StringRef> SectionFlags) {
-  SectionFlag ParsedFlags = SectionFlag::SecNone;
-  for (StringRef Flag : SectionFlags) {
-    SectionFlag ParsedFlag = parseSectionRenameFlag(Flag);
-    if (ParsedFlag == SectionFlag::SecNone)
-      return createStringError(
-          errc::invalid_argument,
-          "unrecognized section flag '%s'. Flags supported for GNU "
-          "compatibility: alloc, load, noload, readonly, exclude, debug, "
-          "code, data, rom, share, contents, merge, strings",
-          Flag.str().c_str());
-    ParsedFlags |= ParsedFlag;
-  }
-
-  return ParsedFlags;
-}
-
-static Expected<SectionRename> parseRenameSectionValue(StringRef FlagValue) {
-  if (!FlagValue.contains('='))
-    return createStringError(errc::invalid_argument,
-                             "bad format for --rename-section: missing '='");
-
-  // Initial split: ".foo" = ".bar,f1,f2,..."
-  auto Old2New = FlagValue.split('=');
-  SectionRename SR;
-  SR.OriginalName = Old2New.first;
-
-  // Flags split: ".bar" "f1" "f2" ...
-  SmallVector<StringRef, 6> NameAndFlags;
-  Old2New.second.split(NameAndFlags, ',');
-  SR.NewName = NameAndFlags[0];
-
-  if (NameAndFlags.size() > 1) {
-    Expected<SectionFlag> ParsedFlagSet =
-        parseSectionFlagSet(makeArrayRef(NameAndFlags).drop_front());
-    if (!ParsedFlagSet)
-      return ParsedFlagSet.takeError();
-    SR.NewFlags = *ParsedFlagSet;
-  }
-
-  return SR;
-}
-
-static Expected<std::pair<StringRef, uint64_t>>
-parseSetSectionAlignment(StringRef FlagValue) {
-  if (!FlagValue.contains('='))
-    return createStringError(
-        errc::invalid_argument,
-        "bad format for --set-section-alignment: missing '='");
-  auto Split = StringRef(FlagValue).split('=');
-  if (Split.first.empty())
-    return createStringError(
-        errc::invalid_argument,
-        "bad format for --set-section-alignment: missing section name");
-  uint64_t NewAlign;
-  if (Split.second.getAsInteger(0, NewAlign))
-    return createStringError(
-        errc::invalid_argument,
-        "invalid alignment for --set-section-alignment: '%s'",
-        Split.second.str().c_str());
-  return std::make_pair(Split.first, NewAlign);
-}
-
-static Expected<SectionFlagsUpdate>
-parseSetSectionFlagValue(StringRef FlagValue) {
-  if (!StringRef(FlagValue).contains('='))
-    return createStringError(errc::invalid_argument,
-                             "bad format for --set-section-flags: missing '='");
-
-  // Initial split: ".foo" = "f1,f2,..."
-  auto Section2Flags = StringRef(FlagValue).split('=');
-  SectionFlagsUpdate SFU;
-  SFU.Name = Section2Flags.first;
-
-  // Flags split: "f1" "f2" ...
-  SmallVector<StringRef, 6> SectionFlags;
-  Section2Flags.second.split(SectionFlags, ',');
-  Expected<SectionFlag> ParsedFlagSet = parseSectionFlagSet(SectionFlags);
-  if (!ParsedFlagSet)
-    return ParsedFlagSet.takeError();
-  SFU.NewFlags = *ParsedFlagSet;
-
-  return SFU;
-}
-
-namespace {
-struct TargetInfo {
-  FileFormat Format;
-  MachineInfo Machine;
-};
-} // namespace
-
-// FIXME: consolidate with the bfd parsing used by lld.
-static const StringMap<MachineInfo> TargetMap{
-    // Name, {EMachine, 64bit, LittleEndian}
-    // x86
-    {"elf32-i386", {ELF::EM_386, false, true}},
-    {"elf32-x86-64", {ELF::EM_X86_64, false, true}},
-    {"elf64-x86-64", {ELF::EM_X86_64, true, true}},
-    // Intel MCU
-    {"elf32-iamcu", {ELF::EM_IAMCU, false, true}},
-    // ARM
-    {"elf32-littlearm", {ELF::EM_ARM, false, true}},
-    // ARM AArch64
-    {"elf64-aarch64", {ELF::EM_AARCH64, true, true}},
-    {"elf64-littleaarch64", {ELF::EM_AARCH64, true, true}},
-    // RISC-V
-    {"elf32-littleriscv", {ELF::EM_RISCV, false, true}},
-    {"elf64-littleriscv", {ELF::EM_RISCV, true, true}},
-    // PowerPC
-    {"elf32-powerpc", {ELF::EM_PPC, false, false}},
-    {"elf32-powerpcle", {ELF::EM_PPC, false, true}},
-    {"elf64-powerpc", {ELF::EM_PPC64, true, false}},
-    {"elf64-powerpcle", {ELF::EM_PPC64, true, true}},
-    // MIPS
-    {"elf32-bigmips", {ELF::EM_MIPS, false, false}},
-    {"elf32-ntradbigmips", {ELF::EM_MIPS, false, false}},
-    {"elf32-ntradlittlemips", {ELF::EM_MIPS, false, true}},
-    {"elf32-tradbigmips", {ELF::EM_MIPS, false, false}},
-    {"elf32-tradlittlemips", {ELF::EM_MIPS, false, true}},
-    {"elf64-tradbigmips", {ELF::EM_MIPS, true, false}},
-    {"elf64-tradlittlemips", {ELF::EM_MIPS, true, true}},
-    // SPARC
-    {"elf32-sparc", {ELF::EM_SPARC, false, false}},
-    {"elf32-sparcel", {ELF::EM_SPARC, false, true}},
-    {"elf32-hexagon", {ELF::EM_HEXAGON, false, true}},
-};
-
-static Expected<TargetInfo>
-getOutputTargetInfoByTargetName(StringRef TargetName) {
-  StringRef OriginalTargetName = TargetName;
-  bool IsFreeBSD = TargetName.consume_back("-freebsd");
-  auto Iter = TargetMap.find(TargetName);
-  if (Iter == std::end(TargetMap))
-    return createStringError(errc::invalid_argument,
-                             "invalid output format: '%s'",
-                             OriginalTargetName.str().c_str());
-  MachineInfo MI = Iter->getValue();
-  if (IsFreeBSD)
-    MI.OSABI = ELF::ELFOSABI_FREEBSD;
-
-  FileFormat Format;
-  if (TargetName.startswith("elf"))
-    Format = FileFormat::ELF;
-  else
-    // This should never happen because `TargetName` is valid (it certainly
-    // exists in the TargetMap).
-    llvm_unreachable("unknown target prefix");
-
-  return {TargetInfo{Format, MI}};
-}
-
-static Error addSymbolsFromFile(NameMatcher &Symbols, BumpPtrAllocator &Alloc,
-                                StringRef Filename, MatchStyle MS,
-                                function_ref<Error(Error)> ErrorCallback) {
-  StringSaver Saver(Alloc);
-  SmallVector<StringRef, 16> Lines;
-  auto BufOrErr = MemoryBuffer::getFile(Filename);
-  if (!BufOrErr)
-    return createFileError(Filename, BufOrErr.getError());
-
-  BufOrErr.get()->getBuffer().split(Lines, '\n');
-  for (StringRef Line : Lines) {
-    // Ignore everything after '#', trim whitespace, and only add the symbol if
-    // it's not empty.
-    auto TrimmedLine = Line.split('#').first.trim();
-    if (!TrimmedLine.empty())
-      if (Error E = Symbols.addMatcher(NameOrPattern::create(
-              Saver.save(TrimmedLine), MS, ErrorCallback)))
-        return E;
-  }
-
-  return Error::success();
-}
-
-Expected<NameOrPattern>
-NameOrPattern::create(StringRef Pattern, MatchStyle MS,
-                      function_ref<Error(Error)> ErrorCallback) {
-  switch (MS) {
-  case MatchStyle::Literal:
-    return NameOrPattern(Pattern);
-  case MatchStyle::Wildcard: {
-    SmallVector<char, 32> Data;
-    bool IsPositiveMatch = true;
-    if (Pattern[0] == '!') {
-      IsPositiveMatch = false;
-      Pattern = Pattern.drop_front();
-    }
-    Expected<GlobPattern> GlobOrErr = GlobPattern::create(Pattern);
-
-    // If we couldn't create it as a glob, report the error, but try again with
-    // a literal if the error reporting is non-fatal.
-    if (!GlobOrErr) {
-      if (Error E = ErrorCallback(GlobOrErr.takeError()))
-        return std::move(E);
-      return create(Pattern, MatchStyle::Literal, ErrorCallback);
-    }
-
-    return NameOrPattern(std::make_shared<GlobPattern>(*GlobOrErr),
-                         IsPositiveMatch);
-  }
-  case MatchStyle::Regex: {
-    SmallVector<char, 32> Data;
-    return NameOrPattern(std::make_shared<Regex>(
-        ("^" + Pattern.ltrim('^').rtrim('$') + "$").toStringRef(Data)));
-  }
-  }
-  llvm_unreachable("Unhandled llvm.objcopy.MatchStyle enum");
-}
-
-static Error addSymbolsToRenameFromFile(StringMap<StringRef> &SymbolsToRename,
-                                        BumpPtrAllocator &Alloc,
-                                        StringRef Filename) {
-  StringSaver Saver(Alloc);
-  SmallVector<StringRef, 16> Lines;
-  auto BufOrErr = MemoryBuffer::getFile(Filename);
-  if (!BufOrErr)
-    return createFileError(Filename, BufOrErr.getError());
-
-  BufOrErr.get()->getBuffer().split(Lines, '\n');
-  size_t NumLines = Lines.size();
-  for (size_t LineNo = 0; LineNo < NumLines; ++LineNo) {
-    StringRef TrimmedLine = Lines[LineNo].split('#').first.trim();
-    if (TrimmedLine.empty())
-      continue;
-
-    std::pair<StringRef, StringRef> Pair = Saver.save(TrimmedLine).split(' ');
-    StringRef NewName = Pair.second.trim();
-    if (NewName.empty())
-      return createStringError(errc::invalid_argument,
-                               "%s:%zu: missing new symbol name",
-                               Filename.str().c_str(), LineNo + 1);
-    SymbolsToRename.insert({Pair.first, NewName});
-  }
-  return Error::success();
-}
-
-template <class T> static ErrorOr<T> getAsInteger(StringRef Val) {
-  T Result;
-  if (Val.getAsInteger(0, Result))
-    return errc::invalid_argument;
-  return Result;
-}
-
-namespace {
-
-enum class ToolType { Objcopy, Strip, InstallNameTool, BitcodeStrip };
-
-} // anonymous namespace
-
-static void printHelp(const opt::OptTable &OptTable, raw_ostream &OS,
-                      ToolType Tool) {
-  StringRef HelpText, ToolName;
-  switch (Tool) {
-  case ToolType::Objcopy:
-    ToolName = "llvm-objcopy";
-    HelpText = " [options] input [output]";
-    break;
-  case ToolType::Strip:
-    ToolName = "llvm-strip";
-    HelpText = " [options] inputs...";
-    break;
-  case ToolType::InstallNameTool:
-    ToolName = "llvm-install-name-tool";
-    HelpText = " [options] input";
-    break;
-  case ToolType::BitcodeStrip:
-    ToolName = "llvm-bitcode-strip";
-    HelpText = " [options] input";
-    break;
-  }
-  OptTable.printHelp(OS, (ToolName + HelpText).str().c_str(),
-                     (ToolName + " tool").str().c_str());
-  // TODO: Replace this with libOption call once it adds extrahelp support.
-  // The CommandLine library has a cl::extrahelp class to support this,
-  // but libOption does not have that yet.
-  OS << "\nPass @FILE as argument to read options from FILE.\n";
-}
-
-static Expected<NewSymbolInfo> parseNewSymbolInfo(StringRef FlagValue) {
-  // Parse value given with --add-symbol option and create the
-  // new symbol if possible. The value format for --add-symbol is:
-  //
-  // <name>=[<section>:]<value>[,<flags>]
-  //
-  // where:
-  // <name> - symbol name, can be empty string
-  // <section> - optional section name. If not given ABS symbol is created
-  // <value> - symbol value, can be decimal or hexadecimal number prefixed
-  //           with 0x.
-  // <flags> - optional flags affecting symbol type, binding or visibility.
-  NewSymbolInfo SI;
-  StringRef Value;
-  std::tie(SI.SymbolName, Value) = FlagValue.split('=');
-  if (Value.empty())
-    return createStringError(
-        errc::invalid_argument,
-        "bad format for --add-symbol, missing '=' after '%s'",
-        SI.SymbolName.str().c_str());
-
-  if (Value.contains(':')) {
-    std::tie(SI.SectionName, Value) = Value.split(':');
-    if (SI.SectionName.empty() || Value.empty())
-      return createStringError(
-          errc::invalid_argument,
-          "bad format for --add-symbol, missing section name or symbol value");
-  }
-
-  SmallVector<StringRef, 6> Flags;
-  Value.split(Flags, ',');
-  if (Flags[0].getAsInteger(0, SI.Value))
-    return createStringError(errc::invalid_argument, "bad symbol value: '%s'",
-                             Flags[0].str().c_str());
-
-  using Functor = std::function<void()>;
-  SmallVector<StringRef, 6> UnsupportedFlags;
-  for (size_t I = 1, NumFlags = Flags.size(); I < NumFlags; ++I)
-    static_cast<Functor>(
-        StringSwitch<Functor>(Flags[I])
-            .CaseLower("global",
-                       [&] { SI.Flags.push_back(SymbolFlag::Global); })
-            .CaseLower("local", [&] { SI.Flags.push_back(SymbolFlag::Local); })
-            .CaseLower("weak", [&] { SI.Flags.push_back(SymbolFlag::Weak); })
-            .CaseLower("default",
-                       [&] { SI.Flags.push_back(SymbolFlag::Default); })
-            .CaseLower("hidden",
-                       [&] { SI.Flags.push_back(SymbolFlag::Hidden); })
-            .CaseLower("protected",
-                       [&] { SI.Flags.push_back(SymbolFlag::Protected); })
-            .CaseLower("file", [&] { SI.Flags.push_back(SymbolFlag::File); })
-            .CaseLower("section",
-                       [&] { SI.Flags.push_back(SymbolFlag::Section); })
-            .CaseLower("object",
-                       [&] { SI.Flags.push_back(SymbolFlag::Object); })
-            .CaseLower("function",
-                       [&] { SI.Flags.push_back(SymbolFlag::Function); })
-            .CaseLower(
-                "indirect-function",
-                [&] { SI.Flags.push_back(SymbolFlag::IndirectFunction); })
-            .CaseLower("debug", [&] { SI.Flags.push_back(SymbolFlag::Debug); })
-            .CaseLower("constructor",
-                       [&] { SI.Flags.push_back(SymbolFlag::Constructor); })
-            .CaseLower("warning",
-                       [&] { SI.Flags.push_back(SymbolFlag::Warning); })
-            .CaseLower("indirect",
-                       [&] { SI.Flags.push_back(SymbolFlag::Indirect); })
-            .CaseLower("synthetic",
-                       [&] { SI.Flags.push_back(SymbolFlag::Synthetic); })
-            .CaseLower("unique-object",
-                       [&] { SI.Flags.push_back(SymbolFlag::UniqueObject); })
-            .StartsWithLower("before=",
-                             [&] {
-                               StringRef SymNamePart =
-                                   Flags[I].split('=').second;
-
-                               if (!SymNamePart.empty())
-                                 SI.BeforeSyms.push_back(SymNamePart);
-                             })
-            .Default([&] { UnsupportedFlags.push_back(Flags[I]); }))();
-  if (!UnsupportedFlags.empty())
-    return createStringError(errc::invalid_argument,
-                             "unsupported flag%s for --add-symbol: '%s'",
-                             UnsupportedFlags.size() > 1 ? "s" : "",
-                             join(UnsupportedFlags, "', '").c_str());
-
-  return SI;
-}
-
-Expected<const ELFConfig &> ConfigManager::getELFConfig() const {
-  if (Common.StripSwiftSymbols || Common.KeepUndefined)
-    return createStringError(llvm::errc::invalid_argument,
-                             "option not supported by llvm-objcopy for ELF");
-
-  return ELF;
-}
-
-Expected<const COFFConfig &> ConfigManager::getCOFFConfig() const {
-  if (Common.AllowBrokenLinks || !Common.SplitDWO.empty() ||
-      !Common.SymbolsPrefix.empty() || !Common.AllocSectionsPrefix.empty() ||
-      !Common.DumpSection.empty() || !Common.KeepSection.empty() ||
-      ELF.NewSymbolVisibility || !Common.SymbolsToGlobalize.empty() ||
-      !Common.SymbolsToKeep.empty() || !Common.SymbolsToLocalize.empty() ||
-      !Common.SymbolsToWeaken.empty() || !Common.SymbolsToKeepGlobal.empty() ||
-      !Common.SectionsToRename.empty() || !Common.SetSectionAlignment.empty() ||
-      Common.ExtractDWO || Common.LocalizeHidden || Common.PreserveDates ||
-      Common.StripDWO || Common.StripNonAlloc || Common.StripSections ||
-      Common.StripSwiftSymbols || Common.KeepUndefined || Common.Weaken ||
-      Common.DecompressDebugSections ||
-      Common.DiscardMode == DiscardType::Locals ||
-      !Common.SymbolsToAdd.empty() || Common.EntryExpr) {
-    return createStringError(llvm::errc::invalid_argument,
-                             "option not supported by llvm-objcopy for COFF");
-  }
-
-  return COFF;
-}
-
-Expected<const MachOConfig &> ConfigManager::getMachOConfig() const {
-  if (Common.AllowBrokenLinks || !Common.SplitDWO.empty() ||
-      !Common.SymbolsPrefix.empty() || !Common.AllocSectionsPrefix.empty() ||
-      !Common.KeepSection.empty() || ELF.NewSymbolVisibility ||
-      !Common.SymbolsToGlobalize.empty() || !Common.SymbolsToKeep.empty() ||
-      !Common.SymbolsToLocalize.empty() || !Common.SymbolsToWeaken.empty() ||
-      !Common.SymbolsToKeepGlobal.empty() || !Common.SectionsToRename.empty() ||
-      !Common.UnneededSymbolsToRemove.empty() ||
-      !Common.SetSectionAlignment.empty() || !Common.SetSectionFlags.empty() ||
-      Common.ExtractDWO || Common.LocalizeHidden || Common.PreserveDates ||
-      Common.StripAllGNU || Common.StripDWO || Common.StripNonAlloc ||
-      Common.StripSections || Common.Weaken || Common.DecompressDebugSections ||
-      Common.StripUnneeded || Common.DiscardMode == DiscardType::Locals ||
-      !Common.SymbolsToAdd.empty() || Common.EntryExpr) {
-    return createStringError(llvm::errc::invalid_argument,
-                             "option not supported by llvm-objcopy for MachO");
-  }
-
-  return MachO;
-}
-
-Expected<const WasmConfig &> ConfigManager::getWasmConfig() const {
-  if (!Common.AddGnuDebugLink.empty() || Common.ExtractPartition ||
-      !Common.SplitDWO.empty() || !Common.SymbolsPrefix.empty() ||
-      !Common.AllocSectionsPrefix.empty() ||
-      Common.DiscardMode != DiscardType::None || ELF.NewSymbolVisibility ||
-      !Common.SymbolsToAdd.empty() || !Common.RPathToAdd.empty() ||
-      !Common.SymbolsToGlobalize.empty() || !Common.SymbolsToLocalize.empty() ||
-      !Common.SymbolsToKeep.empty() || !Common.SymbolsToRemove.empty() ||
-      !Common.UnneededSymbolsToRemove.empty() ||
-      !Common.SymbolsToWeaken.empty() || !Common.SymbolsToKeepGlobal.empty() ||
-      !Common.SectionsToRename.empty() || !Common.SetSectionAlignment.empty() ||
-      !Common.SetSectionFlags.empty() || !Common.SymbolsToRename.empty()) {
-    return createStringError(
-        llvm::errc::invalid_argument,
-        "only flags for section dumping, removal, and addition are supported");
-  }
-
-  return Wasm;
-}
-
-// ParseObjcopyOptions returns the config and sets the input arguments. If a
-// help flag is set then ParseObjcopyOptions will print the help messege and
-// exit.
-Expected<DriverConfig>
-objcopy::parseObjcopyOptions(ArrayRef<const char *> RawArgsArr,
-                             function_ref<Error(Error)> ErrorCallback) {
-  DriverConfig DC;
-  ObjcopyOptTable T;
-
-  const char *const *DashDash =
-      std::find_if(RawArgsArr.begin(), RawArgsArr.end(),
-                   [](StringRef Str) { return Str == "--"; });
-  ArrayRef<const char *> ArgsArr = makeArrayRef(RawArgsArr.begin(), DashDash);
-  if (DashDash != RawArgsArr.end())
-    DashDash = std::next(DashDash);
-
-  unsigned MissingArgumentIndex, MissingArgumentCount;
-  llvm::opt::InputArgList InputArgs =
-      T.ParseArgs(ArgsArr, MissingArgumentIndex, MissingArgumentCount);
-
-  if (InputArgs.size() == 0 && DashDash == RawArgsArr.end()) {
-    printHelp(T, errs(), ToolType::Objcopy);
-    exit(1);
-  }
-
-  if (InputArgs.hasArg(OBJCOPY_help)) {
-    printHelp(T, outs(), ToolType::Objcopy);
-    exit(0);
-  }
-
-  if (InputArgs.hasArg(OBJCOPY_version)) {
-    outs() << "llvm-objcopy, compatible with GNU objcopy\n";
-    cl::PrintVersionMessage();
-    exit(0);
-  }
-
-  SmallVector<const char *, 2> Positional;
-
-  for (auto Arg : InputArgs.filtered(OBJCOPY_UNKNOWN))
-    return createStringError(errc::invalid_argument, "unknown argument '%s'",
-                             Arg->getAsString(InputArgs).c_str());
-
-  for (auto Arg : InputArgs.filtered(OBJCOPY_INPUT))
-    Positional.push_back(Arg->getValue());
-  std::copy(DashDash, RawArgsArr.end(), std::back_inserter(Positional));
-
-  if (Positional.empty())
-    return createStringError(errc::invalid_argument, "no input file specified");
-
-  if (Positional.size() > 2)
-    return createStringError(errc::invalid_argument,
-                             "too many positional arguments");
-
-  ConfigManager ConfigMgr;
-  CommonConfig &Config = ConfigMgr.Common;
-  ELFConfig &ELFConfig = ConfigMgr.ELF;
-  Config.InputFilename = Positional[0];
-  Config.OutputFilename = Positional[Positional.size() == 1 ? 0 : 1];
-  if (InputArgs.hasArg(OBJCOPY_target) &&
-      (InputArgs.hasArg(OBJCOPY_input_target) ||
-       InputArgs.hasArg(OBJCOPY_output_target)))
-    return createStringError(
-        errc::invalid_argument,
-        "--target cannot be used with --input-target or --output-target");
-
-  if (InputArgs.hasArg(OBJCOPY_regex) && InputArgs.hasArg(OBJCOPY_wildcard))
-    return createStringError(errc::invalid_argument,
-                             "--regex and --wildcard are incompatible");
-
-  MatchStyle SectionMatchStyle = InputArgs.hasArg(OBJCOPY_regex)
-                                     ? MatchStyle::Regex
-                                     : MatchStyle::Wildcard;
-  MatchStyle SymbolMatchStyle = InputArgs.hasArg(OBJCOPY_regex)
-                                    ? MatchStyle::Regex
-                                    : InputArgs.hasArg(OBJCOPY_wildcard)
-                                          ? MatchStyle::Wildcard
-                                          : MatchStyle::Literal;
-  StringRef InputFormat, OutputFormat;
-  if (InputArgs.hasArg(OBJCOPY_target)) {
-    InputFormat = InputArgs.getLastArgValue(OBJCOPY_target);
-    OutputFormat = InputArgs.getLastArgValue(OBJCOPY_target);
-  } else {
-    InputFormat = InputArgs.getLastArgValue(OBJCOPY_input_target);
-    OutputFormat = InputArgs.getLastArgValue(OBJCOPY_output_target);
-  }
-
-  // FIXME:  Currently, we ignore the target for non-binary/ihex formats
-  // explicitly specified by -I option (e.g. -Ielf32-x86-64) and guess the
-  // format by llvm::object::createBinary regardless of the option value.
-  Config.InputFormat = StringSwitch<FileFormat>(InputFormat)
-                           .Case("binary", FileFormat::Binary)
-                           .Case("ihex", FileFormat::IHex)
-                           .Default(FileFormat::Unspecified);
-
-  if (InputArgs.hasArg(OBJCOPY_new_symbol_visibility)) {
-    const uint8_t Invalid = 0xff;
-    StringRef VisibilityStr =
-        InputArgs.getLastArgValue(OBJCOPY_new_symbol_visibility);
-
-    ELFConfig.NewSymbolVisibility = StringSwitch<uint8_t>(VisibilityStr)
-                                        .Case("default", ELF::STV_DEFAULT)
-                                        .Case("hidden", ELF::STV_HIDDEN)
-                                        .Case("internal", ELF::STV_INTERNAL)
-                                        .Case("protected", ELF::STV_PROTECTED)
-                                        .Default(Invalid);
-
-    if (ELFConfig.NewSymbolVisibility == Invalid)
-      return createStringError(errc::invalid_argument,
-                               "'%s' is not a valid symbol visibility",
-                               VisibilityStr.str().c_str());
-  }
-
-  Config.OutputFormat = StringSwitch<FileFormat>(OutputFormat)
-                            .Case("binary", FileFormat::Binary)
-                            .Case("ihex", FileFormat::IHex)
-                            .Default(FileFormat::Unspecified);
-  if (Config.OutputFormat == FileFormat::Unspecified) {
-    if (OutputFormat.empty()) {
-      Config.OutputFormat = Config.InputFormat;
-    } else {
-      Expected<TargetInfo> Target =
-          getOutputTargetInfoByTargetName(OutputFormat);
-      if (!Target)
-        return Target.takeError();
-      Config.OutputFormat = Target->Format;
-      Config.OutputArch = Target->Machine;
-    }
-  }
-
-  if (auto Arg = InputArgs.getLastArg(OBJCOPY_compress_debug_sections,
-                                      OBJCOPY_compress_debug_sections_eq)) {
-    Config.CompressionType = DebugCompressionType::Z;
-
-    if (Arg->getOption().getID() == OBJCOPY_compress_debug_sections_eq) {
-      Config.CompressionType =
-          StringSwitch<DebugCompressionType>(
-              InputArgs.getLastArgValue(OBJCOPY_compress_debug_sections_eq))
-              .Case("zlib-gnu", DebugCompressionType::GNU)
-              .Case("zlib", DebugCompressionType::Z)
-              .Default(DebugCompressionType::None);
-      if (Config.CompressionType == DebugCompressionType::None)
-        return createStringError(
-            errc::invalid_argument,
-            "invalid or unsupported --compress-debug-sections format: %s",
-            InputArgs.getLastArgValue(OBJCOPY_compress_debug_sections_eq)
-                .str()
-                .c_str());
-    }
-    if (!zlib::isAvailable())
-      return createStringError(
-          errc::invalid_argument,
-          "LLVM was not compiled with LLVM_ENABLE_ZLIB: can not compress");
-  }
-
-  Config.AddGnuDebugLink = InputArgs.getLastArgValue(OBJCOPY_add_gnu_debuglink);
-  // The gnu_debuglink's target is expected to not change or else its CRC would
-  // become invalidated and get rejected. We can avoid recalculating the
-  // checksum for every target file inside an archive by precomputing the CRC
-  // here. This prevents a significant amount of I/O.
-  if (!Config.AddGnuDebugLink.empty()) {
-    auto DebugOrErr = MemoryBuffer::getFile(Config.AddGnuDebugLink);
-    if (!DebugOrErr)
-      return createFileError(Config.AddGnuDebugLink, DebugOrErr.getError());
-    auto Debug = std::move(*DebugOrErr);
-    Config.GnuDebugLinkCRC32 =
-        llvm::crc32(arrayRefFromStringRef(Debug->getBuffer()));
-  }
-  Config.SplitDWO = InputArgs.getLastArgValue(OBJCOPY_split_dwo);
-  Config.SymbolsPrefix = InputArgs.getLastArgValue(OBJCOPY_prefix_symbols);
-  Config.AllocSectionsPrefix =
-      InputArgs.getLastArgValue(OBJCOPY_prefix_alloc_sections);
-  if (auto Arg = InputArgs.getLastArg(OBJCOPY_extract_partition))
-    Config.ExtractPartition = Arg->getValue();
-
-  for (auto Arg : InputArgs.filtered(OBJCOPY_redefine_symbol)) {
-    if (!StringRef(Arg->getValue()).contains('='))
-      return createStringError(errc::invalid_argument,
-                               "bad format for --redefine-sym");
-    auto Old2New = StringRef(Arg->getValue()).split('=');
-    if (!Config.SymbolsToRename.insert(Old2New).second)
-      return createStringError(errc::invalid_argument,
-                               "multiple redefinition of symbol '%s'",
-                               Old2New.first.str().c_str());
-  }
-
-  for (auto Arg : InputArgs.filtered(OBJCOPY_redefine_symbols))
-    if (Error E = addSymbolsToRenameFromFile(Config.SymbolsToRename, DC.Alloc,
-                                             Arg->getValue()))
-      return std::move(E);
-
-  for (auto Arg : InputArgs.filtered(OBJCOPY_rename_section)) {
-    Expected<SectionRename> SR =
-        parseRenameSectionValue(StringRef(Arg->getValue()));
-    if (!SR)
-      return SR.takeError();
-    if (!Config.SectionsToRename.try_emplace(SR->OriginalName, *SR).second)
-      return createStringError(errc::invalid_argument,
-                               "multiple renames of section '%s'",
-                               SR->OriginalName.str().c_str());
-  }
-  for (auto Arg : InputArgs.filtered(OBJCOPY_set_section_alignment)) {
-    Expected<std::pair<StringRef, uint64_t>> NameAndAlign =
-        parseSetSectionAlignment(Arg->getValue());
-    if (!NameAndAlign)
-      return NameAndAlign.takeError();
-    Config.SetSectionAlignment[NameAndAlign->first] = NameAndAlign->second;
-  }
-  for (auto Arg : InputArgs.filtered(OBJCOPY_set_section_flags)) {
-    Expected<SectionFlagsUpdate> SFU =
-        parseSetSectionFlagValue(Arg->getValue());
-    if (!SFU)
-      return SFU.takeError();
-    if (!Config.SetSectionFlags.try_emplace(SFU->Name, *SFU).second)
-      return createStringError(
-          errc::invalid_argument,
-          "--set-section-flags set multiple times for section '%s'",
-          SFU->Name.str().c_str());
-  }
-  // Prohibit combinations of --set-section-flags when the section name is used
-  // by --rename-section, either as a source or a destination.
-  for (const auto &E : Config.SectionsToRename) {
-    const SectionRename &SR = E.second;
-    if (Config.SetSectionFlags.count(SR.OriginalName))
-      return createStringError(
-          errc::invalid_argument,
-          "--set-section-flags=%s conflicts with --rename-section=%s=%s",
-          SR.OriginalName.str().c_str(), SR.OriginalName.str().c_str(),
-          SR.NewName.str().c_str());
-    if (Config.SetSectionFlags.count(SR.NewName))
-      return createStringError(
-          errc::invalid_argument,
-          "--set-section-flags=%s conflicts with --rename-section=%s=%s",
-          SR.NewName.str().c_str(), SR.OriginalName.str().c_str(),
-          SR.NewName.str().c_str());
-  }
-
-  for (auto Arg : InputArgs.filtered(OBJCOPY_remove_section))
-    if (Error E = Config.ToRemove.addMatcher(NameOrPattern::create(
-            Arg->getValue(), SectionMatchStyle, ErrorCallback)))
-      return std::move(E);
-  for (auto Arg : InputArgs.filtered(OBJCOPY_keep_section))
-    if (Error E = Config.KeepSection.addMatcher(NameOrPattern::create(
-            Arg->getValue(), SectionMatchStyle, ErrorCallback)))
-      return std::move(E);
-  for (auto Arg : InputArgs.filtered(OBJCOPY_only_section))
-    if (Error E = Config.OnlySection.addMatcher(NameOrPattern::create(
-            Arg->getValue(), SectionMatchStyle, ErrorCallback)))
-      return std::move(E);
-  for (auto Arg : InputArgs.filtered(OBJCOPY_add_section)) {
-    StringRef ArgValue(Arg->getValue());
-    if (!ArgValue.contains('='))
-      return createStringError(errc::invalid_argument,
-                               "bad format for --add-section: missing '='");
-    if (ArgValue.split("=").second.empty())
-      return createStringError(
-          errc::invalid_argument,
-          "bad format for --add-section: missing file name");
-    Config.AddSection.push_back(ArgValue);
-  }
-  for (auto *Arg : InputArgs.filtered(OBJCOPY_dump_section)) {
-    StringRef Value(Arg->getValue());
-    if (Value.split('=').second.empty())
-      return createStringError(
-          errc::invalid_argument,
-          "bad format for --dump-section, expected section=file");
-    Config.DumpSection.push_back(Value);
-  }
-  Config.StripAll = InputArgs.hasArg(OBJCOPY_strip_all);
-  Config.StripAllGNU = InputArgs.hasArg(OBJCOPY_strip_all_gnu);
-  Config.StripDebug = InputArgs.hasArg(OBJCOPY_strip_debug);
-  Config.StripDWO = InputArgs.hasArg(OBJCOPY_strip_dwo);
-  Config.StripSections = InputArgs.hasArg(OBJCOPY_strip_sections);
-  Config.StripNonAlloc = InputArgs.hasArg(OBJCOPY_strip_non_alloc);
-  Config.StripUnneeded = InputArgs.hasArg(OBJCOPY_strip_unneeded);
-  Config.ExtractDWO = InputArgs.hasArg(OBJCOPY_extract_dwo);
-  Config.ExtractMainPartition =
-      InputArgs.hasArg(OBJCOPY_extract_main_partition);
-  Config.LocalizeHidden = InputArgs.hasArg(OBJCOPY_localize_hidden);
-  Config.Weaken = InputArgs.hasArg(OBJCOPY_weaken);
-  if (InputArgs.hasArg(OBJCOPY_discard_all, OBJCOPY_discard_locals))
-    Config.DiscardMode =
-        InputArgs.hasFlag(OBJCOPY_discard_all, OBJCOPY_discard_locals)
-            ? DiscardType::All
-            : DiscardType::Locals;
-  Config.OnlyKeepDebug = InputArgs.hasArg(OBJCOPY_only_keep_debug);
-  Config.KeepFileSymbols = InputArgs.hasArg(OBJCOPY_keep_file_symbols);
-  Config.KeepUndefined = InputArgs.hasArg(OBJCOPY_keep_undefined);
-  Config.DecompressDebugSections =
-      InputArgs.hasArg(OBJCOPY_decompress_debug_sections);
-  if (Config.DiscardMode == DiscardType::All) {
-    Config.StripDebug = true;
-    Config.KeepFileSymbols = true;
-  }
-  for (auto Arg : InputArgs.filtered(OBJCOPY_localize_symbol))
-    if (Error E = Config.SymbolsToLocalize.addMatcher(NameOrPattern::create(
-            Arg->getValue(), SymbolMatchStyle, ErrorCallback)))
-      return std::move(E);
-  for (auto Arg : InputArgs.filtered(OBJCOPY_localize_symbols))
-    if (Error E = addSymbolsFromFile(Config.SymbolsToLocalize, DC.Alloc,
-                                     Arg->getValue(), SymbolMatchStyle,
-                                     ErrorCallback))
-      return std::move(E);
-  for (auto Arg : InputArgs.filtered(OBJCOPY_keep_global_symbol))
-    if (Error E = Config.SymbolsToKeepGlobal.addMatcher(NameOrPattern::create(
-            Arg->getValue(), SymbolMatchStyle, ErrorCallback)))
-      return std::move(E);
-  for (auto Arg : InputArgs.filtered(OBJCOPY_keep_global_symbols))
-    if (Error E = addSymbolsFromFile(Config.SymbolsToKeepGlobal, DC.Alloc,
-                                     Arg->getValue(), SymbolMatchStyle,
-                                     ErrorCallback))
-      return std::move(E);
-  for (auto Arg : InputArgs.filtered(OBJCOPY_globalize_symbol))
-    if (Error E = Config.SymbolsToGlobalize.addMatcher(NameOrPattern::create(
-            Arg->getValue(), SymbolMatchStyle, ErrorCallback)))
-      return std::move(E);
-  for (auto Arg : InputArgs.filtered(OBJCOPY_globalize_symbols))
-    if (Error E = addSymbolsFromFile(Config.SymbolsToGlobalize, DC.Alloc,
-                                     Arg->getValue(), SymbolMatchStyle,
-                                     ErrorCallback))
-      return std::move(E);
-  for (auto Arg : InputArgs.filtered(OBJCOPY_weaken_symbol))
-    if (Error E = Config.SymbolsToWeaken.addMatcher(NameOrPattern::create(
-            Arg->getValue(), SymbolMatchStyle, ErrorCallback)))
-      return std::move(E);
-  for (auto Arg : InputArgs.filtered(OBJCOPY_weaken_symbols))
-    if (Error E = addSymbolsFromFile(Config.SymbolsToWeaken, DC.Alloc,
-                                     Arg->getValue(), SymbolMatchStyle,
-                                     ErrorCallback))
-      return std::move(E);
-  for (auto Arg : InputArgs.filtered(OBJCOPY_strip_symbol))
-    if (Error E = Config.SymbolsToRemove.addMatcher(NameOrPattern::create(
-            Arg->getValue(), SymbolMatchStyle, ErrorCallback)))
-      return std::move(E);
-  for (auto Arg : InputArgs.filtered(OBJCOPY_strip_symbols))
-    if (Error E = addSymbolsFromFile(Config.SymbolsToRemove, DC.Alloc,
-                                     Arg->getValue(), SymbolMatchStyle,
-                                     ErrorCallback))
-      return std::move(E);
-  for (auto Arg : InputArgs.filtered(OBJCOPY_strip_unneeded_symbol))
-    if (Error E =
-            Config.UnneededSymbolsToRemove.addMatcher(NameOrPattern::create(
-                Arg->getValue(), SymbolMatchStyle, ErrorCallback)))
-      return std::move(E);
-  for (auto Arg : InputArgs.filtered(OBJCOPY_strip_unneeded_symbols))
-    if (Error E = addSymbolsFromFile(Config.UnneededSymbolsToRemove, DC.Alloc,
-                                     Arg->getValue(), SymbolMatchStyle,
-                                     ErrorCallback))
-      return std::move(E);
-  for (auto Arg : InputArgs.filtered(OBJCOPY_keep_symbol))
-    if (Error E = Config.SymbolsToKeep.addMatcher(NameOrPattern::create(
-            Arg->getValue(), SymbolMatchStyle, ErrorCallback)))
-      return std::move(E);
-  for (auto Arg : InputArgs.filtered(OBJCOPY_keep_symbols))
-    if (Error E =
-            addSymbolsFromFile(Config.SymbolsToKeep, DC.Alloc, Arg->getValue(),
-                               SymbolMatchStyle, ErrorCallback))
-      return std::move(E);
-  for (auto *Arg : InputArgs.filtered(OBJCOPY_add_symbol)) {
-    Expected<NewSymbolInfo> SymInfo = parseNewSymbolInfo(Arg->getValue());
-    if (!SymInfo)
-      return SymInfo.takeError();
-
-    Config.SymbolsToAdd.push_back(*SymInfo);
-  }
-
-  Config.AllowBrokenLinks = InputArgs.hasArg(OBJCOPY_allow_broken_links);
-
-  Config.DeterministicArchives = InputArgs.hasFlag(
-      OBJCOPY_enable_deterministic_archives,
-      OBJCOPY_disable_deterministic_archives, /*default=*/true);
-
-  Config.PreserveDates = InputArgs.hasArg(OBJCOPY_preserve_dates);
-
-  if (Config.PreserveDates &&
-      (Config.OutputFilename == "-" || Config.InputFilename == "-"))
-    return createStringError(errc::invalid_argument,
-                             "--preserve-dates requires a file");
-
-  for (auto Arg : InputArgs)
-    if (Arg->getOption().matches(OBJCOPY_set_start)) {
-      auto EAddr = getAsInteger<uint64_t>(Arg->getValue());
-      if (!EAddr)
-        return createStringError(
-            EAddr.getError(), "bad entry point address: '%s'", Arg->getValue());
-
-      Config.EntryExpr = [EAddr](uint64_t) { return *EAddr; };
-    } else if (Arg->getOption().matches(OBJCOPY_change_start)) {
-      auto EIncr = getAsInteger<int64_t>(Arg->getValue());
-      if (!EIncr)
-        return createStringError(EIncr.getError(),
-                                 "bad entry point increment: '%s'",
-                                 Arg->getValue());
-      auto Expr = Config.EntryExpr ? std::move(Config.EntryExpr)
-                                   : [](uint64_t A) { return A; };
-      Config.EntryExpr = [Expr, EIncr](uint64_t EAddr) {
-        return Expr(EAddr) + *EIncr;
-      };
-    }
-
-  if (Config.DecompressDebugSections &&
-      Config.CompressionType != DebugCompressionType::None) {
-    return createStringError(
-        errc::invalid_argument,
-        "cannot specify both --compress-debug-sections and "
-        "--decompress-debug-sections");
-  }
-
-  if (Config.DecompressDebugSections && !zlib::isAvailable())
-    return createStringError(
-        errc::invalid_argument,
-        "LLVM was not compiled with LLVM_ENABLE_ZLIB: cannot decompress");
-
-  if (Config.ExtractPartition && Config.ExtractMainPartition)
-    return createStringError(errc::invalid_argument,
-                             "cannot specify --extract-partition together with "
-                             "--extract-main-partition");
-
-  DC.CopyConfigs.push_back(std::move(ConfigMgr));
-  return std::move(DC);
-}
-
-// ParseInstallNameToolOptions returns the config and sets the input arguments.
-// If a help flag is set then ParseInstallNameToolOptions will print the help
-// messege and exit.
-Expected<DriverConfig>
-objcopy::parseInstallNameToolOptions(ArrayRef<const char *> ArgsArr) {
-  DriverConfig DC;
-  ConfigManager ConfigMgr;
-  CommonConfig &Config = ConfigMgr.Common;
-  InstallNameToolOptTable T;
-  unsigned MissingArgumentIndex, MissingArgumentCount;
-  llvm::opt::InputArgList InputArgs =
-      T.ParseArgs(ArgsArr, MissingArgumentIndex, MissingArgumentCount);
-
-  if (MissingArgumentCount)
-    return createStringError(
-        errc::invalid_argument,
-        "missing argument to " +
-            StringRef(InputArgs.getArgString(MissingArgumentIndex)) +
-            " option");
-
-  if (InputArgs.size() == 0) {
-    printHelp(T, errs(), ToolType::InstallNameTool);
-    exit(1);
-  }
-
-  if (InputArgs.hasArg(INSTALL_NAME_TOOL_help)) {
-    printHelp(T, outs(), ToolType::InstallNameTool);
-    exit(0);
-  }
-
-  if (InputArgs.hasArg(INSTALL_NAME_TOOL_version)) {
-    outs() << "llvm-install-name-tool, compatible with cctools "
-              "install_name_tool\n";
-    cl::PrintVersionMessage();
-    exit(0);
-  }
-
-  for (auto Arg : InputArgs.filtered(INSTALL_NAME_TOOL_add_rpath))
-    Config.RPathToAdd.push_back(Arg->getValue());
-
-  for (auto *Arg : InputArgs.filtered(INSTALL_NAME_TOOL_prepend_rpath))
-    Config.RPathToPrepend.push_back(Arg->getValue());
-
-  for (auto Arg : InputArgs.filtered(INSTALL_NAME_TOOL_delete_rpath)) {
-    StringRef RPath = Arg->getValue();
-
-    // Cannot add and delete the same rpath at the same time.
-    if (is_contained(Config.RPathToAdd, RPath))
-      return createStringError(
-          errc::invalid_argument,
-          "cannot specify both -add_rpath '%s' and -delete_rpath '%s'",
-          RPath.str().c_str(), RPath.str().c_str());
-    if (is_contained(Config.RPathToPrepend, RPath))
-      return createStringError(
-          errc::invalid_argument,
-          "cannot specify both -prepend_rpath '%s' and -delete_rpath '%s'",
-          RPath.str().c_str(), RPath.str().c_str());
-
-    Config.RPathsToRemove.insert(RPath);
-  }
-
-  for (auto *Arg : InputArgs.filtered(INSTALL_NAME_TOOL_rpath)) {
-    StringRef Old = Arg->getValue(0);
-    StringRef New = Arg->getValue(1);
-
-    auto Match = [=](StringRef RPath) { return RPath == Old || RPath == New; };
-
-    // Cannot specify duplicate -rpath entries
-    auto It1 = find_if(
-        Config.RPathsToUpdate,
-        [&Match](const DenseMap<StringRef, StringRef>::value_type &OldNew) {
-          return Match(OldNew.getFirst()) || Match(OldNew.getSecond());
-        });
-    if (It1 != Config.RPathsToUpdate.end())
-      return createStringError(errc::invalid_argument,
-                               "cannot specify both -rpath '" +
-                                   It1->getFirst() + "' '" + It1->getSecond() +
-                                   "' and -rpath '" + Old + "' '" + New + "'");
-
-    // Cannot specify the same rpath under both -delete_rpath and -rpath
-    auto It2 = find_if(Config.RPathsToRemove, Match);
-    if (It2 != Config.RPathsToRemove.end())
-      return createStringError(errc::invalid_argument,
-                               "cannot specify both -delete_rpath '" + *It2 +
-                                   "' and -rpath '" + Old + "' '" + New + "'");
-
-    // Cannot specify the same rpath under both -add_rpath and -rpath
-    auto It3 = find_if(Config.RPathToAdd, Match);
-    if (It3 != Config.RPathToAdd.end())
-      return createStringError(errc::invalid_argument,
-                               "cannot specify both -add_rpath '" + *It3 +
-                                   "' and -rpath '" + Old + "' '" + New + "'");
-
-    // Cannot specify the same rpath under both -prepend_rpath and -rpath.
-    auto It4 = find_if(Config.RPathToPrepend, Match);
-    if (It4 != Config.RPathToPrepend.end())
-      return createStringError(errc::invalid_argument,
-                               "cannot specify both -prepend_rpath '" + *It4 +
-                                   "' and -rpath '" + Old + "' '" + New + "'");
-
-    Config.RPathsToUpdate.insert({Old, New});
-  }
-
-  if (auto *Arg = InputArgs.getLastArg(INSTALL_NAME_TOOL_id)) {
-    Config.SharedLibId = Arg->getValue();
-    if (Config.SharedLibId->empty())
-      return createStringError(errc::invalid_argument,
-                               "cannot specify an empty id");
-  }
-
-  for (auto *Arg : InputArgs.filtered(INSTALL_NAME_TOOL_change))
-    Config.InstallNamesToUpdate.insert({Arg->getValue(0), Arg->getValue(1)});
-
-  Config.RemoveAllRpaths =
-      InputArgs.hasArg(INSTALL_NAME_TOOL_delete_all_rpaths);
-
-  SmallVector<StringRef, 2> Positional;
-  for (auto Arg : InputArgs.filtered(INSTALL_NAME_TOOL_UNKNOWN))
-    return createStringError(errc::invalid_argument, "unknown argument '%s'",
-                             Arg->getAsString(InputArgs).c_str());
-  for (auto Arg : InputArgs.filtered(INSTALL_NAME_TOOL_INPUT))
-    Positional.push_back(Arg->getValue());
-  if (Positional.empty())
-    return createStringError(errc::invalid_argument, "no input file specified");
-  if (Positional.size() > 1)
-    return createStringError(
-        errc::invalid_argument,
-        "llvm-install-name-tool expects a single input file");
-  Config.InputFilename = Positional[0];
-  Config.OutputFilename = Positional[0];
-
-  DC.CopyConfigs.push_back(std::move(ConfigMgr));
-  return std::move(DC);
-}
-
-Expected<DriverConfig>
-objcopy::parseBitcodeStripOptions(ArrayRef<const char *> ArgsArr) {
-  DriverConfig DC;
-  ConfigManager ConfigMgr;
-  CommonConfig &Config = ConfigMgr.Common;
-  BitcodeStripOptTable T;
-  unsigned MissingArgumentIndex, MissingArgumentCount;
-  opt::InputArgList InputArgs =
-      T.ParseArgs(ArgsArr, MissingArgumentIndex, MissingArgumentCount);
-
-  if (InputArgs.size() == 0) {
-    printHelp(T, errs(), ToolType::BitcodeStrip);
-    exit(1);
-  }
-
-  if (InputArgs.hasArg(BITCODE_STRIP_help)) {
-    printHelp(T, outs(), ToolType::BitcodeStrip);
-    exit(0);
-  }
-
-  if (InputArgs.hasArg(BITCODE_STRIP_version)) {
-    outs() << "llvm-bitcode-strip, compatible with cctools "
-              "bitcode_strip\n";
-    cl::PrintVersionMessage();
-    exit(0);
-  }
-
-  for (auto *Arg : InputArgs.filtered(BITCODE_STRIP_UNKNOWN))
-    return createStringError(errc::invalid_argument, "unknown argument '%s'",
-                             Arg->getAsString(InputArgs).c_str());
-
-  SmallVector<StringRef, 2> Positional;
-  for (auto *Arg : InputArgs.filtered(BITCODE_STRIP_INPUT))
-    Positional.push_back(Arg->getValue());
-  if (Positional.size() > 1)
-    return createStringError(errc::invalid_argument,
-                             "llvm-bitcode-strip expects a single input file");
-  assert(!Positional.empty());
-  Config.InputFilename = Positional[0];
-  Config.OutputFilename = Positional[0];
-
-  DC.CopyConfigs.push_back(std::move(ConfigMgr));
-  return std::move(DC);
-}
-
-// ParseStripOptions returns the config and sets the input arguments. If a
-// help flag is set then ParseStripOptions will print the help messege and
-// exit.
-Expected<DriverConfig>
-objcopy::parseStripOptions(ArrayRef<const char *> RawArgsArr,
-                           function_ref<Error(Error)> ErrorCallback) {
-  const char *const *DashDash =
-      std::find_if(RawArgsArr.begin(), RawArgsArr.end(),
-                   [](StringRef Str) { return Str == "--"; });
-  ArrayRef<const char *> ArgsArr = makeArrayRef(RawArgsArr.begin(), DashDash);
-  if (DashDash != RawArgsArr.end())
-    DashDash = std::next(DashDash);
-
-  StripOptTable T;
-  unsigned MissingArgumentIndex, MissingArgumentCount;
-  llvm::opt::InputArgList InputArgs =
-      T.ParseArgs(ArgsArr, MissingArgumentIndex, MissingArgumentCount);
-
-  if (InputArgs.size() == 0 && DashDash == RawArgsArr.end()) {
-    printHelp(T, errs(), ToolType::Strip);
-    exit(1);
-  }
-
-  if (InputArgs.hasArg(STRIP_help)) {
-    printHelp(T, outs(), ToolType::Strip);
-    exit(0);
-  }
-
-  if (InputArgs.hasArg(STRIP_version)) {
-    outs() << "llvm-strip, compatible with GNU strip\n";
-    cl::PrintVersionMessage();
-    exit(0);
-  }
-
-  SmallVector<StringRef, 2> Positional;
-  for (auto Arg : InputArgs.filtered(STRIP_UNKNOWN))
-    return createStringError(errc::invalid_argument, "unknown argument '%s'",
-                             Arg->getAsString(InputArgs).c_str());
-  for (auto Arg : InputArgs.filtered(STRIP_INPUT))
-    Positional.push_back(Arg->getValue());
-  std::copy(DashDash, RawArgsArr.end(), std::back_inserter(Positional));
-
-  if (Positional.empty())
-    return createStringError(errc::invalid_argument, "no input file specified");
-
-  if (Positional.size() > 1 && InputArgs.hasArg(STRIP_output))
-    return createStringError(
-        errc::invalid_argument,
-        "multiple input files cannot be used in combination with -o");
-
-  ConfigManager ConfigMgr;
-  CommonConfig &Config = ConfigMgr.Common;
-
-  if (InputArgs.hasArg(STRIP_regex) && InputArgs.hasArg(STRIP_wildcard))
-    return createStringError(errc::invalid_argument,
-                             "--regex and --wildcard are incompatible");
-  MatchStyle SectionMatchStyle =
-      InputArgs.hasArg(STRIP_regex) ? MatchStyle::Regex : MatchStyle::Wildcard;
-  MatchStyle SymbolMatchStyle = InputArgs.hasArg(STRIP_regex)
-                                    ? MatchStyle::Regex
-                                    : InputArgs.hasArg(STRIP_wildcard)
-                                          ? MatchStyle::Wildcard
-                                          : MatchStyle::Literal;
-  Config.AllowBrokenLinks = InputArgs.hasArg(STRIP_allow_broken_links);
-  Config.StripDebug = InputArgs.hasArg(STRIP_strip_debug);
-
-  if (InputArgs.hasArg(STRIP_discard_all, STRIP_discard_locals))
-    Config.DiscardMode =
-        InputArgs.hasFlag(STRIP_discard_all, STRIP_discard_locals)
-            ? DiscardType::All
-            : DiscardType::Locals;
-  Config.StripSections = InputArgs.hasArg(STRIP_strip_sections);
-  Config.StripUnneeded = InputArgs.hasArg(STRIP_strip_unneeded);
-  if (auto Arg = InputArgs.getLastArg(STRIP_strip_all, STRIP_no_strip_all))
-    Config.StripAll = Arg->getOption().getID() == STRIP_strip_all;
-  Config.StripAllGNU = InputArgs.hasArg(STRIP_strip_all_gnu);
-  Config.StripSwiftSymbols = InputArgs.hasArg(STRIP_strip_swift_symbols);
-  Config.OnlyKeepDebug = InputArgs.hasArg(STRIP_only_keep_debug);
-  Config.KeepFileSymbols = InputArgs.hasArg(STRIP_keep_file_symbols);
-  Config.KeepUndefined = InputArgs.hasArg(STRIP_keep_undefined);
-
-  for (auto Arg : InputArgs.filtered(STRIP_keep_section))
-    if (Error E = Config.KeepSection.addMatcher(NameOrPattern::create(
-            Arg->getValue(), SectionMatchStyle, ErrorCallback)))
-      return std::move(E);
-
-  for (auto Arg : InputArgs.filtered(STRIP_remove_section))
-    if (Error E = Config.ToRemove.addMatcher(NameOrPattern::create(
-            Arg->getValue(), SectionMatchStyle, ErrorCallback)))
-      return std::move(E);
-
-  for (auto Arg : InputArgs.filtered(STRIP_strip_symbol))
-    if (Error E = Config.SymbolsToRemove.addMatcher(NameOrPattern::create(
-            Arg->getValue(), SymbolMatchStyle, ErrorCallback)))
-      return std::move(E);
-
-  for (auto Arg : InputArgs.filtered(STRIP_keep_symbol))
-    if (Error E = Config.SymbolsToKeep.addMatcher(NameOrPattern::create(
-            Arg->getValue(), SymbolMatchStyle, ErrorCallback)))
-      return std::move(E);
-
-  if (!InputArgs.hasArg(STRIP_no_strip_all) && !Config.StripDebug &&
-      !Config.StripUnneeded && Config.DiscardMode == DiscardType::None &&
-      !Config.StripAllGNU && Config.SymbolsToRemove.empty())
-    Config.StripAll = true;
-
-  if (Config.DiscardMode == DiscardType::All) {
-    Config.StripDebug = true;
-    Config.KeepFileSymbols = true;
-  }
-
-  Config.DeterministicArchives =
-      InputArgs.hasFlag(STRIP_enable_deterministic_archives,
-                        STRIP_disable_deterministic_archives, /*default=*/true);
-
-  Config.PreserveDates = InputArgs.hasArg(STRIP_preserve_dates);
-  Config.InputFormat = FileFormat::Unspecified;
-  Config.OutputFormat = FileFormat::Unspecified;
-
-  DriverConfig DC;
-  if (Positional.size() == 1) {
-    Config.InputFilename = Positional[0];
-    Config.OutputFilename =
-        InputArgs.getLastArgValue(STRIP_output, Positional[0]);
-    DC.CopyConfigs.push_back(std::move(ConfigMgr));
-  } else {
-    StringMap<unsigned> InputFiles;
-    for (StringRef Filename : Positional) {
-      if (InputFiles[Filename]++ == 1) {
-        if (Filename == "-")
-          return createStringError(
-              errc::invalid_argument,
-              "cannot specify '-' as an input file more than once");
-        if (Error E = ErrorCallback(createStringError(
-                errc::invalid_argument, "'%s' was already specified",
-                Filename.str().c_str())))
-          return std::move(E);
-      }
-      Config.InputFilename = Filename;
-      Config.OutputFilename = Filename;
-      DC.CopyConfigs.push_back(ConfigMgr);
-    }
-  }
-
-  if (Config.PreserveDates && (is_contained(Positional, "-") ||
-                               InputArgs.getLastArgValue(STRIP_output) == "-"))
-    return createStringError(errc::invalid_argument,
-                             "--preserve-dates requires a file");
-
-  return std::move(DC);
-}
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/ConfigManager.h b/gnu/llvm/llvm/tools/llvm-objcopy/ConfigManager.h
deleted file mode 100644
index c0d0e8bbc72..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/ConfigManager.h
+++ /dev/null
@@ -1,80 +0,0 @@
-//===- ConfigManager.h ----------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_LLVM_OBJCOPY_CONFIGMANAGER_H
-#define LLVM_TOOLS_LLVM_OBJCOPY_CONFIGMANAGER_H
-
-#include "COFF/COFFConfig.h"
-#include "CommonConfig.h"
-#include "ELF/ELFConfig.h"
-#include "MachO/MachOConfig.h"
-#include "MultiFormatConfig.h"
-#include "wasm/WasmConfig.h"
-#include "llvm/Support/Allocator.h"
-#include <vector>
-
-namespace llvm {
-namespace objcopy {
-
-// ConfigManager keeps all configurations and prepare
-// format-specific options.
-struct ConfigManager : public MultiFormatConfig {
-  virtual ~ConfigManager() {}
-
-  const CommonConfig &getCommonConfig() const override { return Common; }
-  Expected<const ELFConfig &> getELFConfig() const override;
-  Expected<const COFFConfig &> getCOFFConfig() const override;
-  Expected<const MachOConfig &> getMachOConfig() const override;
-  Expected<const WasmConfig &> getWasmConfig() const override;
-
-  // All configs.
-  CommonConfig Common;
-  ELFConfig ELF;
-  COFFConfig COFF;
-  MachOConfig MachO;
-  WasmConfig Wasm;
-};
-
-// Configuration for the overall invocation of this tool. When invoked as
-// objcopy, will always contain exactly one CopyConfig. When invoked as strip,
-// will contain one or more CopyConfigs.
-struct DriverConfig {
-  SmallVector<ConfigManager, 1> CopyConfigs;
-  BumpPtrAllocator Alloc;
-};
-
-// ParseObjcopyOptions returns the config and sets the input arguments. If a
-// help flag is set then ParseObjcopyOptions will print the help messege and
-// exit. ErrorCallback is used to handle recoverable errors. An Error returned
-// by the callback aborts the parsing and is then returned by this function.
-Expected<DriverConfig>
-parseObjcopyOptions(ArrayRef<const char *> ArgsArr,
-                    llvm::function_ref<Error(Error)> ErrorCallback);
-
-// ParseInstallNameToolOptions returns the config and sets the input arguments.
-// If a help flag is set then ParseInstallNameToolOptions will print the help
-// messege and exit.
-Expected<DriverConfig>
-parseInstallNameToolOptions(ArrayRef<const char *> ArgsArr);
-
-// ParseBitcodeStripOptions returns the config and sets the input arguments.
-// If a help flag is set then ParseBitcodeStripOptions will print the help
-// messege and exit.
-Expected<DriverConfig> parseBitcodeStripOptions(ArrayRef<const char *> ArgsArr);
-
-// ParseStripOptions returns the config and sets the input arguments. If a
-// help flag is set then ParseStripOptions will print the help messege and
-// exit. ErrorCallback is used to handle recoverable errors. An Error returned
-// by the callback aborts the parsing and is then returned by this function.
-Expected<DriverConfig>
-parseStripOptions(ArrayRef<const char *> ArgsArr,
-                  llvm::function_ref<Error(Error)> ErrorCallback);
-} // namespace objcopy
-} // namespace llvm
-
-#endif // LLVM_TOOLS_LLVM_OBJCOPY_CONFIGMANAGER_H
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/ELF/ELFConfig.h b/gnu/llvm/llvm/tools/llvm-objcopy/ELF/ELFConfig.h
deleted file mode 100644
index 42d407da17f..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/ELF/ELFConfig.h
+++ /dev/null
@@ -1,28 +0,0 @@
-//===- ELFConfig.h ----------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_LLVM_OBJCOPY_ELF_ELFCONFIG_H
-#define LLVM_TOOLS_LLVM_OBJCOPY_ELF_ELFCONFIG_H
-
-#include "llvm/ADT/Optional.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Object/ELFTypes.h"
-#include <vector>
-
-namespace llvm {
-namespace objcopy {
-
-// ELF specific configuration for copying/stripping a single file.
-struct ELFConfig {
-  uint8_t NewSymbolVisibility = (uint8_t)ELF::STV_DEFAULT;
-};
-
-} // namespace objcopy
-} // namespace llvm
-
-#endif // LLVM_TOOLS_LLVM_OBJCOPY_ELF_ELFCONFIG_H
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/ELF/ELFObjcopy.cpp b/gnu/llvm/llvm/tools/llvm-objcopy/ELF/ELFObjcopy.cpp
deleted file mode 100644
index 986eeca6256..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/ELF/ELFObjcopy.cpp
+++ /dev/null
@@ -1,776 +0,0 @@
-//===- ELFObjcopy.cpp -----------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "ELFObjcopy.h"
-#include "CommonConfig.h"
-#include "ELFConfig.h"
-#include "Object.h"
-#include "llvm-objcopy.h"
-#include "llvm/ADT/BitmaskEnum.h"
-#include "llvm/ADT/DenseSet.h"
-#include "llvm/ADT/Optional.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/ADT/Twine.h"
-#include "llvm/BinaryFormat/ELF.h"
-#include "llvm/MC/MCTargetOptions.h"
-#include "llvm/Object/Binary.h"
-#include "llvm/Object/ELFObjectFile.h"
-#include "llvm/Object/ELFTypes.h"
-#include "llvm/Object/Error.h"
-#include "llvm/Option/Option.h"
-#include "llvm/Support/Casting.h"
-#include "llvm/Support/Compression.h"
-#include "llvm/Support/Errc.h"
-#include "llvm/Support/Error.h"
-#include "llvm/Support/ErrorHandling.h"
-#include "llvm/Support/ErrorOr.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/Memory.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Support/raw_ostream.h"
-#include <algorithm>
-#include <cassert>
-#include <cstdlib>
-#include <functional>
-#include <iterator>
-#include <memory>
-#include <string>
-#include <system_error>
-#include <utility>
-
-using namespace llvm;
-using namespace llvm::ELF;
-using namespace llvm::objcopy;
-using namespace llvm::objcopy::elf;
-using namespace llvm::object;
-
-using SectionPred = std::function<bool(const SectionBase &Sec)>;
-
-static bool isDebugSection(const SectionBase &Sec) {
-  return StringRef(Sec.Name).startswith(".debug") ||
-         StringRef(Sec.Name).startswith(".zdebug") || Sec.Name == ".gdb_index";
-}
-
-static bool isDWOSection(const SectionBase &Sec) {
-  return StringRef(Sec.Name).endswith(".dwo");
-}
-
-static bool onlyKeepDWOPred(const Object &Obj, const SectionBase &Sec) {
-  // We can't remove the section header string table.
-  if (&Sec == Obj.SectionNames)
-    return false;
-  // Short of keeping the string table we want to keep everything that is a DWO
-  // section and remove everything else.
-  return !isDWOSection(Sec);
-}
-
-static uint64_t getNewShfFlags(SectionFlag AllFlags) {
-  uint64_t NewFlags = 0;
-  if (AllFlags & SectionFlag::SecAlloc)
-    NewFlags |= ELF::SHF_ALLOC;
-  if (!(AllFlags & SectionFlag::SecReadonly))
-    NewFlags |= ELF::SHF_WRITE;
-  if (AllFlags & SectionFlag::SecCode)
-    NewFlags |= ELF::SHF_EXECINSTR;
-  if (AllFlags & SectionFlag::SecMerge)
-    NewFlags |= ELF::SHF_MERGE;
-  if (AllFlags & SectionFlag::SecStrings)
-    NewFlags |= ELF::SHF_STRINGS;
-  if (AllFlags & SectionFlag::SecExclude)
-    NewFlags |= ELF::SHF_EXCLUDE;
-  return NewFlags;
-}
-
-static uint64_t getSectionFlagsPreserveMask(uint64_t OldFlags,
-                                            uint64_t NewFlags) {
-  // Preserve some flags which should not be dropped when setting flags.
-  // Also, preserve anything OS/processor dependant.
-  const uint64_t PreserveMask =
-      (ELF::SHF_COMPRESSED | ELF::SHF_GROUP | ELF::SHF_LINK_ORDER |
-       ELF::SHF_MASKOS | ELF::SHF_MASKPROC | ELF::SHF_TLS |
-       ELF::SHF_INFO_LINK) &
-      ~ELF::SHF_EXCLUDE;
-  return (OldFlags & PreserveMask) | (NewFlags & ~PreserveMask);
-}
-
-static void setSectionFlagsAndType(SectionBase &Sec, SectionFlag Flags) {
-  Sec.Flags = getSectionFlagsPreserveMask(Sec.Flags, getNewShfFlags(Flags));
-
-  // In GNU objcopy, certain flags promote SHT_NOBITS to SHT_PROGBITS. This rule
-  // may promote more non-ALLOC sections than GNU objcopy, but it is fine as
-  // non-ALLOC SHT_NOBITS sections do not make much sense.
-  if (Sec.Type == SHT_NOBITS &&
-      (!(Sec.Flags & ELF::SHF_ALLOC) ||
-       Flags & (SectionFlag::SecContents | SectionFlag::SecLoad)))
-    Sec.Type = SHT_PROGBITS;
-}
-
-static ElfType getOutputElfType(const Binary &Bin) {
-  // Infer output ELF type from the input ELF object
-  if (isa<ELFObjectFile<ELF32LE>>(Bin))
-    return ELFT_ELF32LE;
-  if (isa<ELFObjectFile<ELF64LE>>(Bin))
-    return ELFT_ELF64LE;
-  if (isa<ELFObjectFile<ELF32BE>>(Bin))
-    return ELFT_ELF32BE;
-  if (isa<ELFObjectFile<ELF64BE>>(Bin))
-    return ELFT_ELF64BE;
-  llvm_unreachable("Invalid ELFType");
-}
-
-static ElfType getOutputElfType(const MachineInfo &MI) {
-  // Infer output ELF type from the binary arch specified
-  if (MI.Is64Bit)
-    return MI.IsLittleEndian ? ELFT_ELF64LE : ELFT_ELF64BE;
-  else
-    return MI.IsLittleEndian ? ELFT_ELF32LE : ELFT_ELF32BE;
-}
-
-static std::unique_ptr<Writer> createELFWriter(const CommonConfig &Config,
-                                               Object &Obj, raw_ostream &Out,
-                                               ElfType OutputElfType) {
-  // Depending on the initial ELFT and OutputFormat we need a different Writer.
-  switch (OutputElfType) {
-  case ELFT_ELF32LE:
-    return std::make_unique<ELFWriter<ELF32LE>>(Obj, Out, !Config.StripSections,
-                                                Config.OnlyKeepDebug);
-  case ELFT_ELF64LE:
-    return std::make_unique<ELFWriter<ELF64LE>>(Obj, Out, !Config.StripSections,
-                                                Config.OnlyKeepDebug);
-  case ELFT_ELF32BE:
-    return std::make_unique<ELFWriter<ELF32BE>>(Obj, Out, !Config.StripSections,
-                                                Config.OnlyKeepDebug);
-  case ELFT_ELF64BE:
-    return std::make_unique<ELFWriter<ELF64BE>>(Obj, Out, !Config.StripSections,
-                                                Config.OnlyKeepDebug);
-  }
-  llvm_unreachable("Invalid output format");
-}
-
-static std::unique_ptr<Writer> createWriter(const CommonConfig &Config,
-                                            Object &Obj, raw_ostream &Out,
-                                            ElfType OutputElfType) {
-  switch (Config.OutputFormat) {
-  case FileFormat::Binary:
-    return std::make_unique<BinaryWriter>(Obj, Out);
-  case FileFormat::IHex:
-    return std::make_unique<IHexWriter>(Obj, Out);
-  default:
-    return createELFWriter(Config, Obj, Out, OutputElfType);
-  }
-}
-
-template <class... Ts>
-static Error makeStringError(std::error_code EC, const Twine &Msg,
-                             Ts &&... Args) {
-  std::string FullMsg = (EC.message() + ": " + Msg).str();
-  return createStringError(EC, FullMsg.c_str(), std::forward<Ts>(Args)...);
-}
-
-static Error dumpSectionToFile(StringRef SecName, StringRef Filename,
-                               Object &Obj) {
-  for (auto &Sec : Obj.sections()) {
-    if (Sec.Name == SecName) {
-      if (Sec.Type == SHT_NOBITS)
-        return createStringError(object_error::parse_failed,
-                                 "cannot dump section '%s': it has no contents",
-                                 SecName.str().c_str());
-      Expected<std::unique_ptr<FileOutputBuffer>> BufferOrErr =
-          FileOutputBuffer::create(Filename, Sec.OriginalData.size());
-      if (!BufferOrErr)
-        return BufferOrErr.takeError();
-      std::unique_ptr<FileOutputBuffer> Buf = std::move(*BufferOrErr);
-      std::copy(Sec.OriginalData.begin(), Sec.OriginalData.end(),
-                Buf->getBufferStart());
-      if (Error E = Buf->commit())
-        return E;
-      return Error::success();
-    }
-  }
-  return createStringError(object_error::parse_failed, "section '%s' not found",
-                           SecName.str().c_str());
-}
-
-static bool isCompressable(const SectionBase &Sec) {
-  return !(Sec.Flags & ELF::SHF_COMPRESSED) &&
-         StringRef(Sec.Name).startswith(".debug");
-}
-
-static Error replaceDebugSections(
-    Object &Obj, SectionPred &RemovePred,
-    function_ref<bool(const SectionBase &)> ShouldReplace,
-    function_ref<Expected<SectionBase *>(const SectionBase *)> AddSection) {
-  // Build a list of the debug sections we are going to replace.
-  // We can't call `AddSection` while iterating over sections,
-  // because it would mutate the sections array.
-  SmallVector<SectionBase *, 13> ToReplace;
-  for (auto &Sec : Obj.sections())
-    if (ShouldReplace(Sec))
-      ToReplace.push_back(&Sec);
-
-  // Build a mapping from original section to a new one.
-  DenseMap<SectionBase *, SectionBase *> FromTo;
-  for (SectionBase *S : ToReplace) {
-    Expected<SectionBase *> NewSection = AddSection(S);
-    if (!NewSection)
-      return NewSection.takeError();
-
-    FromTo[S] = *NewSection;
-  }
-
-  // Now we want to update the target sections of relocation
-  // sections. Also we will update the relocations themselves
-  // to update the symbol references.
-  for (auto &Sec : Obj.sections())
-    Sec.replaceSectionReferences(FromTo);
-
-  RemovePred = [ShouldReplace, RemovePred](const SectionBase &Sec) {
-    return ShouldReplace(Sec) || RemovePred(Sec);
-  };
-
-  return Error::success();
-}
-
-static bool isUnneededSymbol(const Symbol &Sym) {
-  return !Sym.Referenced &&
-         (Sym.Binding == STB_LOCAL || Sym.getShndx() == SHN_UNDEF) &&
-         Sym.Type != STT_SECTION;
-}
-
-static Error updateAndRemoveSymbols(const CommonConfig &Config, Object &Obj) {
-  // TODO: update or remove symbols only if there is an option that affects
-  // them.
-  if (!Obj.SymbolTable)
-    return Error::success();
-
-  Obj.SymbolTable->updateSymbols([&](Symbol &Sym) {
-    // Common and undefined symbols don't make sense as local symbols, and can
-    // even cause crashes if we localize those, so skip them.
-    if (!Sym.isCommon() && Sym.getShndx() != SHN_UNDEF &&
-        ((Config.LocalizeHidden &&
-          (Sym.Visibility == STV_HIDDEN || Sym.Visibility == STV_INTERNAL)) ||
-         Config.SymbolsToLocalize.matches(Sym.Name)))
-      Sym.Binding = STB_LOCAL;
-
-    // Note: these two globalize flags have very similar names but different
-    // meanings:
-    //
-    // --globalize-symbol: promote a symbol to global
-    // --keep-global-symbol: all symbols except for these should be made local
-    //
-    // If --globalize-symbol is specified for a given symbol, it will be
-    // global in the output file even if it is not included via
-    // --keep-global-symbol. Because of that, make sure to check
-    // --globalize-symbol second.
-    if (!Config.SymbolsToKeepGlobal.empty() &&
-        !Config.SymbolsToKeepGlobal.matches(Sym.Name) &&
-        Sym.getShndx() != SHN_UNDEF)
-      Sym.Binding = STB_LOCAL;
-
-    if (Config.SymbolsToGlobalize.matches(Sym.Name) &&
-        Sym.getShndx() != SHN_UNDEF)
-      Sym.Binding = STB_GLOBAL;
-
-    if (Config.SymbolsToWeaken.matches(Sym.Name) && Sym.Binding == STB_GLOBAL)
-      Sym.Binding = STB_WEAK;
-
-    if (Config.Weaken && Sym.Binding == STB_GLOBAL &&
-        Sym.getShndx() != SHN_UNDEF)
-      Sym.Binding = STB_WEAK;
-
-    const auto I = Config.SymbolsToRename.find(Sym.Name);
-    if (I != Config.SymbolsToRename.end())
-      Sym.Name = std::string(I->getValue());
-
-    if (!Config.SymbolsPrefix.empty() && Sym.Type != STT_SECTION)
-      Sym.Name = (Config.SymbolsPrefix + Sym.Name).str();
-  });
-
-  // The purpose of this loop is to mark symbols referenced by sections
-  // (like GroupSection or RelocationSection). This way, we know which
-  // symbols are still 'needed' and which are not.
-  if (Config.StripUnneeded || !Config.UnneededSymbolsToRemove.empty() ||
-      !Config.OnlySection.empty()) {
-    for (SectionBase &Sec : Obj.sections())
-      Sec.markSymbols();
-  }
-
-  auto RemoveSymbolsPred = [&](const Symbol &Sym) {
-    if (Config.SymbolsToKeep.matches(Sym.Name) ||
-        (Config.KeepFileSymbols && Sym.Type == STT_FILE))
-      return false;
-
-    if ((Config.DiscardMode == DiscardType::All ||
-         (Config.DiscardMode == DiscardType::Locals &&
-          StringRef(Sym.Name).startswith(".L"))) &&
-        Sym.Binding == STB_LOCAL && Sym.getShndx() != SHN_UNDEF &&
-        Sym.Type != STT_FILE && Sym.Type != STT_SECTION)
-      return true;
-
-    if (Config.StripAll || Config.StripAllGNU)
-      return true;
-
-    if (Config.StripDebug && Sym.Type == STT_FILE)
-      return true;
-
-    if (Config.SymbolsToRemove.matches(Sym.Name))
-      return true;
-
-    if ((Config.StripUnneeded ||
-         Config.UnneededSymbolsToRemove.matches(Sym.Name)) &&
-        (!Obj.isRelocatable() || isUnneededSymbol(Sym)))
-      return true;
-
-    // We want to remove undefined symbols if all references have been stripped.
-    if (!Config.OnlySection.empty() && !Sym.Referenced &&
-        Sym.getShndx() == SHN_UNDEF)
-      return true;
-
-    return false;
-  };
-
-  return Obj.removeSymbols(RemoveSymbolsPred);
-}
-
-static Error replaceAndRemoveSections(const CommonConfig &Config, Object &Obj) {
-  SectionPred RemovePred = [](const SectionBase &) { return false; };
-
-  // Removes:
-  if (!Config.ToRemove.empty()) {
-    RemovePred = [&Config](const SectionBase &Sec) {
-      return Config.ToRemove.matches(Sec.Name);
-    };
-  }
-
-  if (Config.StripDWO)
-    RemovePred = [RemovePred](const SectionBase &Sec) {
-      return isDWOSection(Sec) || RemovePred(Sec);
-    };
-
-  if (Config.ExtractDWO)
-    RemovePred = [RemovePred, &Obj](const SectionBase &Sec) {
-      return onlyKeepDWOPred(Obj, Sec) || RemovePred(Sec);
-    };
-
-  if (Config.StripAllGNU)
-    RemovePred = [RemovePred, &Obj](const SectionBase &Sec) {
-      if (RemovePred(Sec))
-        return true;
-      if ((Sec.Flags & SHF_ALLOC) != 0)
-        return false;
-      if (&Sec == Obj.SectionNames)
-        return false;
-      switch (Sec.Type) {
-      case SHT_SYMTAB:
-      case SHT_REL:
-      case SHT_RELA:
-      case SHT_STRTAB:
-        return true;
-      }
-      return isDebugSection(Sec);
-    };
-
-  if (Config.StripSections) {
-    RemovePred = [RemovePred](const SectionBase &Sec) {
-      return RemovePred(Sec) || Sec.ParentSegment == nullptr;
-    };
-  }
-
-  if (Config.StripDebug || Config.StripUnneeded) {
-    RemovePred = [RemovePred](const SectionBase &Sec) {
-      return RemovePred(Sec) || isDebugSection(Sec);
-    };
-  }
-
-  if (Config.StripNonAlloc)
-    RemovePred = [RemovePred, &Obj](const SectionBase &Sec) {
-      if (RemovePred(Sec))
-        return true;
-      if (&Sec == Obj.SectionNames)
-        return false;
-      return (Sec.Flags & SHF_ALLOC) == 0 && Sec.ParentSegment == nullptr;
-    };
-
-  if (Config.StripAll)
-    RemovePred = [RemovePred, &Obj](const SectionBase &Sec) {
-      if (RemovePred(Sec))
-        return true;
-      if (&Sec == Obj.SectionNames)
-        return false;
-      if (StringRef(Sec.Name).startswith(".gnu.warning"))
-        return false;
-      // We keep the .ARM.attribute section to maintain compatibility
-      // with Debian derived distributions. This is a bug in their
-      // patchset as documented here:
-      // https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=943798
-      if (Sec.Type == SHT_ARM_ATTRIBUTES)
-        return false;
-      if (Sec.ParentSegment != nullptr)
-        return false;
-      return (Sec.Flags & SHF_ALLOC) == 0;
-    };
-
-  if (Config.ExtractPartition || Config.ExtractMainPartition) {
-    RemovePred = [RemovePred](const SectionBase &Sec) {
-      if (RemovePred(Sec))
-        return true;
-      if (Sec.Type == SHT_LLVM_PART_EHDR || Sec.Type == SHT_LLVM_PART_PHDR)
-        return true;
-      return (Sec.Flags & SHF_ALLOC) != 0 && !Sec.ParentSegment;
-    };
-  }
-
-  // Explicit copies:
-  if (!Config.OnlySection.empty()) {
-    RemovePred = [&Config, RemovePred, &Obj](const SectionBase &Sec) {
-      // Explicitly keep these sections regardless of previous removes.
-      if (Config.OnlySection.matches(Sec.Name))
-        return false;
-
-      // Allow all implicit removes.
-      if (RemovePred(Sec))
-        return true;
-
-      // Keep special sections.
-      if (Obj.SectionNames == &Sec)
-        return false;
-      if (Obj.SymbolTable == &Sec ||
-          (Obj.SymbolTable && Obj.SymbolTable->getStrTab() == &Sec))
-        return false;
-
-      // Remove everything else.
-      return true;
-    };
-  }
-
-  if (!Config.KeepSection.empty()) {
-    RemovePred = [&Config, RemovePred](const SectionBase &Sec) {
-      // Explicitly keep these sections regardless of previous removes.
-      if (Config.KeepSection.matches(Sec.Name))
-        return false;
-      // Otherwise defer to RemovePred.
-      return RemovePred(Sec);
-    };
-  }
-
-  // This has to be the last predicate assignment.
-  // If the option --keep-symbol has been specified
-  // and at least one of those symbols is present
-  // (equivalently, the updated symbol table is not empty)
-  // the symbol table and the string table should not be removed.
-  if ((!Config.SymbolsToKeep.empty() || Config.KeepFileSymbols) &&
-      Obj.SymbolTable && !Obj.SymbolTable->empty()) {
-    RemovePred = [&Obj, RemovePred](const SectionBase &Sec) {
-      if (&Sec == Obj.SymbolTable || &Sec == Obj.SymbolTable->getStrTab())
-        return false;
-      return RemovePred(Sec);
-    };
-  }
-
-  if (Config.CompressionType != DebugCompressionType::None) {
-    if (Error Err = replaceDebugSections(
-            Obj, RemovePred, isCompressable,
-            [&Config, &Obj](const SectionBase *S) -> Expected<SectionBase *> {
-              Expected<CompressedSection> NewSection =
-                  CompressedSection::create(*S, Config.CompressionType);
-              if (!NewSection)
-                return NewSection.takeError();
-
-              return &Obj.addSection<CompressedSection>(std::move(*NewSection));
-            }))
-      return Err;
-  } else if (Config.DecompressDebugSections) {
-    if (Error Err = replaceDebugSections(
-            Obj, RemovePred,
-            [](const SectionBase &S) { return isa<CompressedSection>(&S); },
-            [&Obj](const SectionBase *S) {
-              const CompressedSection *CS = cast<CompressedSection>(S);
-              return &Obj.addSection<DecompressedSection>(*CS);
-            }))
-      return Err;
-  }
-
-  return Obj.removeSections(Config.AllowBrokenLinks, RemovePred);
-}
-
-// Add symbol to the Object symbol table with the specified properties.
-static void addSymbol(Object &Obj, const NewSymbolInfo &SymInfo,
-                      uint8_t DefaultVisibility) {
-  SectionBase *Sec = Obj.findSection(SymInfo.SectionName);
-  uint64_t Value = Sec ? Sec->Addr + SymInfo.Value : SymInfo.Value;
-
-  uint8_t Bind = ELF::STB_GLOBAL;
-  uint8_t Type = ELF::STT_NOTYPE;
-  uint8_t Visibility = DefaultVisibility;
-
-  for (SymbolFlag FlagValue : SymInfo.Flags)
-    switch (FlagValue) {
-    case SymbolFlag::Global:
-      Bind = ELF::STB_GLOBAL;
-      break;
-    case SymbolFlag::Local:
-      Bind = ELF::STB_LOCAL;
-      break;
-    case SymbolFlag::Weak:
-      Bind = ELF::STB_WEAK;
-      break;
-    case SymbolFlag::Default:
-      Visibility = ELF::STV_DEFAULT;
-      break;
-    case SymbolFlag::Hidden:
-      Visibility = ELF::STV_HIDDEN;
-      break;
-    case SymbolFlag::Protected:
-      Visibility = ELF::STV_PROTECTED;
-      break;
-    case SymbolFlag::File:
-      Type = ELF::STT_FILE;
-      break;
-    case SymbolFlag::Section:
-      Type = ELF::STT_SECTION;
-      break;
-    case SymbolFlag::Object:
-      Type = ELF::STT_OBJECT;
-      break;
-    case SymbolFlag::Function:
-      Type = ELF::STT_FUNC;
-      break;
-    case SymbolFlag::IndirectFunction:
-      Type = ELF::STT_GNU_IFUNC;
-      break;
-    default: /* Other flag values are ignored for ELF. */
-      break;
-    };
-
-  Obj.SymbolTable->addSymbol(
-      SymInfo.SymbolName, Bind, Type, Sec, Value, Visibility,
-      Sec ? (uint16_t)SYMBOL_SIMPLE_INDEX : (uint16_t)SHN_ABS, 0);
-}
-
-// This function handles the high level operations of GNU objcopy including
-// handling command line options. It's important to outline certain properties
-// we expect to hold of the command line operations. Any operation that "keeps"
-// should keep regardless of a remove. Additionally any removal should respect
-// any previous removals. Lastly whether or not something is removed shouldn't
-// depend a) on the order the options occur in or b) on some opaque priority
-// system. The only priority is that keeps/copies overrule removes.
-static Error handleArgs(const CommonConfig &Config, const ELFConfig &ELFConfig,
-                        Object &Obj) {
-  if (Config.OutputArch) {
-    Obj.Machine = Config.OutputArch.getValue().EMachine;
-    Obj.OSABI = Config.OutputArch.getValue().OSABI;
-  }
-
-  if (!Config.SplitDWO.empty() && Config.ExtractDWO) {
-    return Obj.removeSections(
-        Config.AllowBrokenLinks,
-        [&Obj](const SectionBase &Sec) { return onlyKeepDWOPred(Obj, Sec); });
-  }
-
-  // Dump sections before add/remove for compatibility with GNU objcopy.
-  for (StringRef Flag : Config.DumpSection) {
-    StringRef SectionName;
-    StringRef FileName;
-    std::tie(SectionName, FileName) = Flag.split('=');
-    if (Error E = dumpSectionToFile(SectionName, FileName, Obj))
-      return E;
-  }
-
-  // It is important to remove the sections first. For example, we want to
-  // remove the relocation sections before removing the symbols. That allows
-  // us to avoid reporting the inappropriate errors about removing symbols
-  // named in relocations.
-  if (Error E = replaceAndRemoveSections(Config, Obj))
-    return E;
-
-  if (Error E = updateAndRemoveSymbols(Config, Obj))
-    return E;
-
-  if (!Config.SectionsToRename.empty()) {
-    for (SectionBase &Sec : Obj.sections()) {
-      const auto Iter = Config.SectionsToRename.find(Sec.Name);
-      if (Iter != Config.SectionsToRename.end()) {
-        const SectionRename &SR = Iter->second;
-        Sec.Name = std::string(SR.NewName);
-        if (SR.NewFlags.hasValue())
-          setSectionFlagsAndType(Sec, SR.NewFlags.getValue());
-      }
-    }
-  }
-
-  // Add a prefix to allocated sections and their relocation sections. This
-  // should be done after renaming the section by Config.SectionToRename to
-  // imitate the GNU objcopy behavior.
-  if (!Config.AllocSectionsPrefix.empty()) {
-    DenseSet<SectionBase *> PrefixedSections;
-    for (SectionBase &Sec : Obj.sections()) {
-      if (Sec.Flags & SHF_ALLOC) {
-        Sec.Name = (Config.AllocSectionsPrefix + Sec.Name).str();
-        PrefixedSections.insert(&Sec);
-      } else if (auto *RelocSec = dyn_cast<RelocationSectionBase>(&Sec)) {
-        // Rename relocation sections associated to the allocated sections.
-        // For example, if we rename .text to .prefix.text, we also rename
-        // .rel.text to .rel.prefix.text.
-        //
-        // Dynamic relocation sections (SHT_REL[A] with SHF_ALLOC) are handled
-        // above, e.g., .rela.plt is renamed to .prefix.rela.plt, not
-        // .rela.prefix.plt since GNU objcopy does so.
-        const SectionBase *TargetSec = RelocSec->getSection();
-        if (TargetSec && (TargetSec->Flags & SHF_ALLOC)) {
-          StringRef prefix;
-          switch (Sec.Type) {
-          case SHT_REL:
-            prefix = ".rel";
-            break;
-          case SHT_RELA:
-            prefix = ".rela";
-            break;
-          default:
-            llvm_unreachable("not a relocation section");
-          }
-
-          // If the relocation section comes *after* the target section, we
-          // don't add Config.AllocSectionsPrefix because we've already added
-          // the prefix to TargetSec->Name. Otherwise, if the relocation
-          // section comes *before* the target section, we add the prefix.
-          if (PrefixedSections.count(TargetSec))
-            Sec.Name = (prefix + TargetSec->Name).str();
-          else
-            Sec.Name =
-                (prefix + Config.AllocSectionsPrefix + TargetSec->Name).str();
-        }
-      }
-    }
-  }
-
-  if (!Config.SetSectionAlignment.empty()) {
-    for (SectionBase &Sec : Obj.sections()) {
-      auto I = Config.SetSectionAlignment.find(Sec.Name);
-      if (I != Config.SetSectionAlignment.end())
-        Sec.Align = I->second;
-    }
-  }
-
-  if (Config.OnlyKeepDebug)
-    for (auto &Sec : Obj.sections())
-      if (Sec.Flags & SHF_ALLOC && Sec.Type != SHT_NOTE)
-        Sec.Type = SHT_NOBITS;
-
-  for (const auto &Flag : Config.AddSection) {
-    std::pair<StringRef, StringRef> SecPair = Flag.split("=");
-    StringRef SecName = SecPair.first;
-    StringRef File = SecPair.second;
-    ErrorOr<std::unique_ptr<MemoryBuffer>> BufOrErr =
-        MemoryBuffer::getFile(File);
-    if (!BufOrErr)
-      return createFileError(File, errorCodeToError(BufOrErr.getError()));
-    std::unique_ptr<MemoryBuffer> Buf = std::move(*BufOrErr);
-    ArrayRef<uint8_t> Data(
-        reinterpret_cast<const uint8_t *>(Buf->getBufferStart()),
-        Buf->getBufferSize());
-    OwnedDataSection &NewSection =
-        Obj.addSection<OwnedDataSection>(SecName, Data);
-    if (SecName.startswith(".note") && SecName != ".note.GNU-stack")
-      NewSection.Type = SHT_NOTE;
-  }
-
-  if (!Config.AddGnuDebugLink.empty())
-    Obj.addSection<GnuDebugLinkSection>(Config.AddGnuDebugLink,
-                                        Config.GnuDebugLinkCRC32);
-
-  // If the symbol table was previously removed, we need to create a new one
-  // before adding new symbols.
-  if (!Obj.SymbolTable && !Config.SymbolsToAdd.empty())
-    if (Error E = Obj.addNewSymbolTable())
-      return E;
-
-  for (const NewSymbolInfo &SI : Config.SymbolsToAdd)
-    addSymbol(Obj, SI, ELFConfig.NewSymbolVisibility);
-
-  // --set-section-flags works with sections added by --add-section.
-  if (!Config.SetSectionFlags.empty()) {
-    for (auto &Sec : Obj.sections()) {
-      const auto Iter = Config.SetSectionFlags.find(Sec.Name);
-      if (Iter != Config.SetSectionFlags.end()) {
-        const SectionFlagsUpdate &SFU = Iter->second;
-        setSectionFlagsAndType(Sec, SFU.NewFlags);
-      }
-    }
-  }
-
-  if (Config.EntryExpr)
-    Obj.Entry = Config.EntryExpr(Obj.Entry);
-  return Error::success();
-}
-
-static Error writeOutput(const CommonConfig &Config, Object &Obj,
-                         raw_ostream &Out, ElfType OutputElfType) {
-  std::unique_ptr<Writer> Writer =
-      createWriter(Config, Obj, Out, OutputElfType);
-  if (Error E = Writer->finalize())
-    return E;
-  return Writer->write();
-}
-
-Error objcopy::elf::executeObjcopyOnIHex(const CommonConfig &Config,
-                                         const ELFConfig &ELFConfig,
-                                         MemoryBuffer &In, raw_ostream &Out) {
-  IHexReader Reader(&In);
-  Expected<std::unique_ptr<Object>> Obj = Reader.create(true);
-  if (!Obj)
-    return Obj.takeError();
-
-  const ElfType OutputElfType =
-      getOutputElfType(Config.OutputArch.getValueOr(MachineInfo()));
-  if (Error E = handleArgs(Config, ELFConfig, **Obj))
-    return E;
-  return writeOutput(Config, **Obj, Out, OutputElfType);
-}
-
-Error objcopy::elf::executeObjcopyOnRawBinary(const CommonConfig &Config,
-                                              const ELFConfig &ELFConfig,
-                                              MemoryBuffer &In,
-                                              raw_ostream &Out) {
-  BinaryReader Reader(&In, ELFConfig.NewSymbolVisibility);
-  Expected<std::unique_ptr<Object>> Obj = Reader.create(true);
-  if (!Obj)
-    return Obj.takeError();
-
-  // Prefer OutputArch (-O<format>) if set, otherwise fallback to BinaryArch
-  // (-B<arch>).
-  const ElfType OutputElfType =
-      getOutputElfType(Config.OutputArch.getValueOr(MachineInfo()));
-  if (Error E = handleArgs(Config, ELFConfig, **Obj))
-    return E;
-  return writeOutput(Config, **Obj, Out, OutputElfType);
-}
-
-Error objcopy::elf::executeObjcopyOnBinary(const CommonConfig &Config,
-                                           const ELFConfig &ELFConfig,
-                                           object::ELFObjectFileBase &In,
-                                           raw_ostream &Out) {
-  ELFReader Reader(&In, Config.ExtractPartition);
-  Expected<std::unique_ptr<Object>> Obj =
-      Reader.create(!Config.SymbolsToAdd.empty());
-  if (!Obj)
-    return Obj.takeError();
-  // Prefer OutputArch (-O<format>) if set, otherwise infer it from the input.
-  const ElfType OutputElfType =
-      Config.OutputArch ? getOutputElfType(Config.OutputArch.getValue())
-                        : getOutputElfType(In);
-
-  if (Error E = handleArgs(Config, ELFConfig, **Obj))
-    return createFileError(Config.InputFilename, std::move(E));
-
-  if (Error E = writeOutput(Config, **Obj, Out, OutputElfType))
-    return createFileError(Config.InputFilename, std::move(E));
-
-  return Error::success();
-}
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/ELF/ELFObjcopy.h b/gnu/llvm/llvm/tools/llvm-objcopy/ELF/ELFObjcopy.h
deleted file mode 100644
index 852661e68f3..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/ELF/ELFObjcopy.h
+++ /dev/null
@@ -1,40 +0,0 @@
-//===- ELFObjcopy.h ---------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_OBJCOPY_ELFOBJCOPY_H
-#define LLVM_TOOLS_OBJCOPY_ELFOBJCOPY_H
-
-namespace llvm {
-class Error;
-class MemoryBuffer;
-class raw_ostream;
-
-namespace object {
-class ELFObjectFileBase;
-} // end namespace object
-
-namespace objcopy {
-struct CommonConfig;
-struct ELFConfig;
-
-namespace elf {
-Error executeObjcopyOnIHex(const CommonConfig &Config,
-                           const ELFConfig &ELFConfig, MemoryBuffer &In,
-                           raw_ostream &Out);
-Error executeObjcopyOnRawBinary(const CommonConfig &Config,
-                                const ELFConfig &ELFConfig, MemoryBuffer &In,
-                                raw_ostream &Out);
-Error executeObjcopyOnBinary(const CommonConfig &Config,
-                             const ELFConfig &ELFConfig,
-                             object::ELFObjectFileBase &In, raw_ostream &Out);
-
-} // end namespace elf
-} // end namespace objcopy
-} // end namespace llvm
-
-#endif // LLVM_TOOLS_OBJCOPY_ELFOBJCOPY_H
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/ELF/Object.cpp b/gnu/llvm/llvm/tools/llvm-objcopy/ELF/Object.cpp
deleted file mode 100644
index ba91d08e554..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/ELF/Object.cpp
+++ /dev/null
@@ -1,2730 +0,0 @@
-//===- Object.cpp ---------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "Object.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/ADT/Twine.h"
-#include "llvm/ADT/iterator_range.h"
-#include "llvm/BinaryFormat/ELF.h"
-#include "llvm/MC/MCTargetOptions.h"
-#include "llvm/Object/ELF.h"
-#include "llvm/Object/ELFObjectFile.h"
-#include "llvm/Support/Compression.h"
-#include "llvm/Support/Endian.h"
-#include "llvm/Support/ErrorHandling.h"
-#include "llvm/Support/FileOutputBuffer.h"
-#include "llvm/Support/Path.h"
-#include <algorithm>
-#include <cstddef>
-#include <cstdint>
-#include <iterator>
-#include <unordered_set>
-#include <utility>
-#include <vector>
-
-using namespace llvm;
-using namespace llvm::ELF;
-using namespace llvm::objcopy::elf;
-using namespace llvm::object;
-
-template <class ELFT> void ELFWriter<ELFT>::writePhdr(const Segment &Seg) {
-  uint8_t *B = reinterpret_cast<uint8_t *>(Buf->getBufferStart()) +
-               Obj.ProgramHdrSegment.Offset + Seg.Index * sizeof(Elf_Phdr);
-  Elf_Phdr &Phdr = *reinterpret_cast<Elf_Phdr *>(B);
-  Phdr.p_type = Seg.Type;
-  Phdr.p_flags = Seg.Flags;
-  Phdr.p_offset = Seg.Offset;
-  Phdr.p_vaddr = Seg.VAddr;
-  Phdr.p_paddr = Seg.PAddr;
-  Phdr.p_filesz = Seg.FileSize;
-  Phdr.p_memsz = Seg.MemSize;
-  Phdr.p_align = Seg.Align;
-}
-
-Error SectionBase::removeSectionReferences(
-    bool, function_ref<bool(const SectionBase *)>) {
-  return Error::success();
-}
-
-Error SectionBase::removeSymbols(function_ref<bool(const Symbol &)>) {
-  return Error::success();
-}
-
-Error SectionBase::initialize(SectionTableRef) { return Error::success(); }
-void SectionBase::finalize() {}
-void SectionBase::markSymbols() {}
-void SectionBase::replaceSectionReferences(
-    const DenseMap<SectionBase *, SectionBase *> &) {}
-void SectionBase::onRemove() {}
-
-template <class ELFT> void ELFWriter<ELFT>::writeShdr(const SectionBase &Sec) {
-  uint8_t *B =
-      reinterpret_cast<uint8_t *>(Buf->getBufferStart()) + Sec.HeaderOffset;
-  Elf_Shdr &Shdr = *reinterpret_cast<Elf_Shdr *>(B);
-  Shdr.sh_name = Sec.NameIndex;
-  Shdr.sh_type = Sec.Type;
-  Shdr.sh_flags = Sec.Flags;
-  Shdr.sh_addr = Sec.Addr;
-  Shdr.sh_offset = Sec.Offset;
-  Shdr.sh_size = Sec.Size;
-  Shdr.sh_link = Sec.Link;
-  Shdr.sh_info = Sec.Info;
-  Shdr.sh_addralign = Sec.Align;
-  Shdr.sh_entsize = Sec.EntrySize;
-}
-
-template <class ELFT> Error ELFSectionSizer<ELFT>::visit(Section &) {
-  return Error::success();
-}
-
-template <class ELFT> Error ELFSectionSizer<ELFT>::visit(OwnedDataSection &) {
-  return Error::success();
-}
-
-template <class ELFT> Error ELFSectionSizer<ELFT>::visit(StringTableSection &) {
-  return Error::success();
-}
-
-template <class ELFT>
-Error ELFSectionSizer<ELFT>::visit(DynamicRelocationSection &) {
-  return Error::success();
-}
-
-template <class ELFT>
-Error ELFSectionSizer<ELFT>::visit(SymbolTableSection &Sec) {
-  Sec.EntrySize = sizeof(Elf_Sym);
-  Sec.Size = Sec.Symbols.size() * Sec.EntrySize;
-  // Align to the largest field in Elf_Sym.
-  Sec.Align = ELFT::Is64Bits ? sizeof(Elf_Xword) : sizeof(Elf_Word);
-  return Error::success();
-}
-
-template <class ELFT>
-Error ELFSectionSizer<ELFT>::visit(RelocationSection &Sec) {
-  Sec.EntrySize = Sec.Type == SHT_REL ? sizeof(Elf_Rel) : sizeof(Elf_Rela);
-  Sec.Size = Sec.Relocations.size() * Sec.EntrySize;
-  // Align to the largest field in Elf_Rel(a).
-  Sec.Align = ELFT::Is64Bits ? sizeof(Elf_Xword) : sizeof(Elf_Word);
-  return Error::success();
-}
-
-template <class ELFT>
-Error ELFSectionSizer<ELFT>::visit(GnuDebugLinkSection &) {
-  return Error::success();
-}
-
-template <class ELFT> Error ELFSectionSizer<ELFT>::visit(GroupSection &Sec) {
-  Sec.Size = sizeof(Elf_Word) + Sec.GroupMembers.size() * sizeof(Elf_Word);
-  return Error::success();
-}
-
-template <class ELFT>
-Error ELFSectionSizer<ELFT>::visit(SectionIndexSection &) {
-  return Error::success();
-}
-
-template <class ELFT> Error ELFSectionSizer<ELFT>::visit(CompressedSection &) {
-  return Error::success();
-}
-
-template <class ELFT>
-Error ELFSectionSizer<ELFT>::visit(DecompressedSection &) {
-  return Error::success();
-}
-
-Error BinarySectionWriter::visit(const SectionIndexSection &Sec) {
-  return createStringError(errc::operation_not_permitted,
-                           "cannot write symbol section index table '" +
-                               Sec.Name + "' ");
-}
-
-Error BinarySectionWriter::visit(const SymbolTableSection &Sec) {
-  return createStringError(errc::operation_not_permitted,
-                           "cannot write symbol table '" + Sec.Name +
-                               "' out to binary");
-}
-
-Error BinarySectionWriter::visit(const RelocationSection &Sec) {
-  return createStringError(errc::operation_not_permitted,
-                           "cannot write relocation section '" + Sec.Name +
-                               "' out to binary");
-}
-
-Error BinarySectionWriter::visit(const GnuDebugLinkSection &Sec) {
-  return createStringError(errc::operation_not_permitted,
-                           "cannot write '" + Sec.Name + "' out to binary");
-}
-
-Error BinarySectionWriter::visit(const GroupSection &Sec) {
-  return createStringError(errc::operation_not_permitted,
-                           "cannot write '" + Sec.Name + "' out to binary");
-}
-
-Error SectionWriter::visit(const Section &Sec) {
-  if (Sec.Type != SHT_NOBITS)
-    llvm::copy(Sec.Contents, Out.getBufferStart() + Sec.Offset);
-
-  return Error::success();
-}
-
-static bool addressOverflows32bit(uint64_t Addr) {
-  // Sign extended 32 bit addresses (e.g 0xFFFFFFFF80000000) are ok
-  return Addr > UINT32_MAX && Addr + 0x80000000 > UINT32_MAX;
-}
-
-template <class T> static T checkedGetHex(StringRef S) {
-  T Value;
-  bool Fail = S.getAsInteger(16, Value);
-  assert(!Fail);
-  (void)Fail;
-  return Value;
-}
-
-// Fills exactly Len bytes of buffer with hexadecimal characters
-// representing value 'X'
-template <class T, class Iterator>
-static Iterator toHexStr(T X, Iterator It, size_t Len) {
-  // Fill range with '0'
-  std::fill(It, It + Len, '0');
-
-  for (long I = Len - 1; I >= 0; --I) {
-    unsigned char Mod = static_cast<unsigned char>(X) & 15;
-    *(It + I) = hexdigit(Mod, false);
-    X >>= 4;
-  }
-  assert(X == 0);
-  return It + Len;
-}
-
-uint8_t IHexRecord::getChecksum(StringRef S) {
-  assert((S.size() & 1) == 0);
-  uint8_t Checksum = 0;
-  while (!S.empty()) {
-    Checksum += checkedGetHex<uint8_t>(S.take_front(2));
-    S = S.drop_front(2);
-  }
-  return -Checksum;
-}
-
-IHexLineData IHexRecord::getLine(uint8_t Type, uint16_t Addr,
-                                 ArrayRef<uint8_t> Data) {
-  IHexLineData Line(getLineLength(Data.size()));
-  assert(Line.size());
-  auto Iter = Line.begin();
-  *Iter++ = ':';
-  Iter = toHexStr(Data.size(), Iter, 2);
-  Iter = toHexStr(Addr, Iter, 4);
-  Iter = toHexStr(Type, Iter, 2);
-  for (uint8_t X : Data)
-    Iter = toHexStr(X, Iter, 2);
-  StringRef S(Line.data() + 1, std::distance(Line.begin() + 1, Iter));
-  Iter = toHexStr(getChecksum(S), Iter, 2);
-  *Iter++ = '\r';
-  *Iter++ = '\n';
-  assert(Iter == Line.end());
-  return Line;
-}
-
-static Error checkRecord(const IHexRecord &R) {
-  switch (R.Type) {
-  case IHexRecord::Data:
-    if (R.HexData.size() == 0)
-      return createStringError(
-          errc::invalid_argument,
-          "zero data length is not allowed for data records");
-    break;
-  case IHexRecord::EndOfFile:
-    break;
-  case IHexRecord::SegmentAddr:
-    // 20-bit segment address. Data length must be 2 bytes
-    // (4 bytes in hex)
-    if (R.HexData.size() != 4)
-      return createStringError(
-          errc::invalid_argument,
-          "segment address data should be 2 bytes in size");
-    break;
-  case IHexRecord::StartAddr80x86:
-  case IHexRecord::StartAddr:
-    if (R.HexData.size() != 8)
-      return createStringError(errc::invalid_argument,
-                               "start address data should be 4 bytes in size");
-    // According to Intel HEX specification '03' record
-    // only specifies the code address within the 20-bit
-    // segmented address space of the 8086/80186. This
-    // means 12 high order bits should be zeroes.
-    if (R.Type == IHexRecord::StartAddr80x86 &&
-        R.HexData.take_front(3) != "000")
-      return createStringError(errc::invalid_argument,
-                               "start address exceeds 20 bit for 80x86");
-    break;
-  case IHexRecord::ExtendedAddr:
-    // 16-31 bits of linear base address
-    if (R.HexData.size() != 4)
-      return createStringError(
-          errc::invalid_argument,
-          "extended address data should be 2 bytes in size");
-    break;
-  default:
-    // Unknown record type
-    return createStringError(errc::invalid_argument, "unknown record type: %u",
-                             static_cast<unsigned>(R.Type));
-  }
-  return Error::success();
-}
-
-// Checks that IHEX line contains valid characters.
-// This allows converting hexadecimal data to integers
-// without extra verification.
-static Error checkChars(StringRef Line) {
-  assert(!Line.empty());
-  if (Line[0] != ':')
-    return createStringError(errc::invalid_argument,
-                             "missing ':' in the beginning of line.");
-
-  for (size_t Pos = 1; Pos < Line.size(); ++Pos)
-    if (hexDigitValue(Line[Pos]) == -1U)
-      return createStringError(errc::invalid_argument,
-                               "invalid character at position %zu.", Pos + 1);
-  return Error::success();
-}
-
-Expected<IHexRecord> IHexRecord::parse(StringRef Line) {
-  assert(!Line.empty());
-
-  // ':' + Length + Address + Type + Checksum with empty data ':LLAAAATTCC'
-  if (Line.size() < 11)
-    return createStringError(errc::invalid_argument,
-                             "line is too short: %zu chars.", Line.size());
-
-  if (Error E = checkChars(Line))
-    return std::move(E);
-
-  IHexRecord Rec;
-  size_t DataLen = checkedGetHex<uint8_t>(Line.substr(1, 2));
-  if (Line.size() != getLength(DataLen))
-    return createStringError(errc::invalid_argument,
-                             "invalid line length %zu (should be %zu)",
-                             Line.size(), getLength(DataLen));
-
-  Rec.Addr = checkedGetHex<uint16_t>(Line.substr(3, 4));
-  Rec.Type = checkedGetHex<uint8_t>(Line.substr(7, 2));
-  Rec.HexData = Line.substr(9, DataLen * 2);
-
-  if (getChecksum(Line.drop_front(1)) != 0)
-    return createStringError(errc::invalid_argument, "incorrect checksum.");
-  if (Error E = checkRecord(Rec))
-    return std::move(E);
-  return Rec;
-}
-
-static uint64_t sectionPhysicalAddr(const SectionBase *Sec) {
-  Segment *Seg = Sec->ParentSegment;
-  if (Seg && Seg->Type != ELF::PT_LOAD)
-    Seg = nullptr;
-  return Seg ? Seg->PAddr + Sec->OriginalOffset - Seg->OriginalOffset
-             : Sec->Addr;
-}
-
-void IHexSectionWriterBase::writeSection(const SectionBase *Sec,
-                                         ArrayRef<uint8_t> Data) {
-  assert(Data.size() == Sec->Size);
-  const uint32_t ChunkSize = 16;
-  uint32_t Addr = sectionPhysicalAddr(Sec) & 0xFFFFFFFFU;
-  while (!Data.empty()) {
-    uint64_t DataSize = std::min<uint64_t>(Data.size(), ChunkSize);
-    if (Addr > SegmentAddr + BaseAddr + 0xFFFFU) {
-      if (Addr > 0xFFFFFU) {
-        // Write extended address record, zeroing segment address
-        // if needed.
-        if (SegmentAddr != 0)
-          SegmentAddr = writeSegmentAddr(0U);
-        BaseAddr = writeBaseAddr(Addr);
-      } else {
-        // We can still remain 16-bit
-        SegmentAddr = writeSegmentAddr(Addr);
-      }
-    }
-    uint64_t SegOffset = Addr - BaseAddr - SegmentAddr;
-    assert(SegOffset <= 0xFFFFU);
-    DataSize = std::min(DataSize, 0x10000U - SegOffset);
-    writeData(0, SegOffset, Data.take_front(DataSize));
-    Addr += DataSize;
-    Data = Data.drop_front(DataSize);
-  }
-}
-
-uint64_t IHexSectionWriterBase::writeSegmentAddr(uint64_t Addr) {
-  assert(Addr <= 0xFFFFFU);
-  uint8_t Data[] = {static_cast<uint8_t>((Addr & 0xF0000U) >> 12), 0};
-  writeData(2, 0, Data);
-  return Addr & 0xF0000U;
-}
-
-uint64_t IHexSectionWriterBase::writeBaseAddr(uint64_t Addr) {
-  assert(Addr <= 0xFFFFFFFFU);
-  uint64_t Base = Addr & 0xFFFF0000U;
-  uint8_t Data[] = {static_cast<uint8_t>(Base >> 24),
-                    static_cast<uint8_t>((Base >> 16) & 0xFF)};
-  writeData(4, 0, Data);
-  return Base;
-}
-
-void IHexSectionWriterBase::writeData(uint8_t, uint16_t,
-                                      ArrayRef<uint8_t> Data) {
-  Offset += IHexRecord::getLineLength(Data.size());
-}
-
-Error IHexSectionWriterBase::visit(const Section &Sec) {
-  writeSection(&Sec, Sec.Contents);
-  return Error::success();
-}
-
-Error IHexSectionWriterBase::visit(const OwnedDataSection &Sec) {
-  writeSection(&Sec, Sec.Data);
-  return Error::success();
-}
-
-Error IHexSectionWriterBase::visit(const StringTableSection &Sec) {
-  // Check that sizer has already done its work
-  assert(Sec.Size == Sec.StrTabBuilder.getSize());
-  // We are free to pass an invalid pointer to writeSection as long
-  // as we don't actually write any data. The real writer class has
-  // to override this method .
-  writeSection(&Sec, {nullptr, static_cast<size_t>(Sec.Size)});
-  return Error::success();
-}
-
-Error IHexSectionWriterBase::visit(const DynamicRelocationSection &Sec) {
-  writeSection(&Sec, Sec.Contents);
-  return Error::success();
-}
-
-void IHexSectionWriter::writeData(uint8_t Type, uint16_t Addr,
-                                  ArrayRef<uint8_t> Data) {
-  IHexLineData HexData = IHexRecord::getLine(Type, Addr, Data);
-  memcpy(Out.getBufferStart() + Offset, HexData.data(), HexData.size());
-  Offset += HexData.size();
-}
-
-Error IHexSectionWriter::visit(const StringTableSection &Sec) {
-  assert(Sec.Size == Sec.StrTabBuilder.getSize());
-  std::vector<uint8_t> Data(Sec.Size);
-  Sec.StrTabBuilder.write(Data.data());
-  writeSection(&Sec, Data);
-  return Error::success();
-}
-
-Error Section::accept(SectionVisitor &Visitor) const {
-  return Visitor.visit(*this);
-}
-
-Error Section::accept(MutableSectionVisitor &Visitor) {
-  return Visitor.visit(*this);
-}
-
-Error SectionWriter::visit(const OwnedDataSection &Sec) {
-  llvm::copy(Sec.Data, Out.getBufferStart() + Sec.Offset);
-  return Error::success();
-}
-
-static constexpr std::array<uint8_t, 4> ZlibGnuMagic = {{'Z', 'L', 'I', 'B'}};
-
-static bool isDataGnuCompressed(ArrayRef<uint8_t> Data) {
-  return Data.size() > ZlibGnuMagic.size() &&
-         std::equal(ZlibGnuMagic.begin(), ZlibGnuMagic.end(), Data.data());
-}
-
-template <class ELFT>
-static std::tuple<uint64_t, uint64_t>
-getDecompressedSizeAndAlignment(ArrayRef<uint8_t> Data) {
-  const bool IsGnuDebug = isDataGnuCompressed(Data);
-  const uint64_t DecompressedSize =
-      IsGnuDebug
-          ? support::endian::read64be(Data.data() + ZlibGnuMagic.size())
-          : reinterpret_cast<const Elf_Chdr_Impl<ELFT> *>(Data.data())->ch_size;
-  const uint64_t DecompressedAlign =
-      IsGnuDebug ? 1
-                 : reinterpret_cast<const Elf_Chdr_Impl<ELFT> *>(Data.data())
-                       ->ch_addralign;
-
-  return std::make_tuple(DecompressedSize, DecompressedAlign);
-}
-
-template <class ELFT>
-Error ELFSectionWriter<ELFT>::visit(const DecompressedSection &Sec) {
-  const size_t DataOffset = isDataGnuCompressed(Sec.OriginalData)
-                                ? (ZlibGnuMagic.size() + sizeof(Sec.Size))
-                                : sizeof(Elf_Chdr_Impl<ELFT>);
-
-  StringRef CompressedContent(
-      reinterpret_cast<const char *>(Sec.OriginalData.data()) + DataOffset,
-      Sec.OriginalData.size() - DataOffset);
-
-  SmallVector<char, 128> DecompressedContent;
-  if (Error Err = zlib::uncompress(CompressedContent, DecompressedContent,
-                                   static_cast<size_t>(Sec.Size)))
-    return createStringError(errc::invalid_argument,
-                             "'" + Sec.Name + "': " + toString(std::move(Err)));
-
-  uint8_t *Buf = reinterpret_cast<uint8_t *>(Out.getBufferStart()) + Sec.Offset;
-  std::copy(DecompressedContent.begin(), DecompressedContent.end(), Buf);
-
-  return Error::success();
-}
-
-Error BinarySectionWriter::visit(const DecompressedSection &Sec) {
-  return createStringError(errc::operation_not_permitted,
-                           "cannot write compressed section '" + Sec.Name +
-                               "' ");
-}
-
-Error DecompressedSection::accept(SectionVisitor &Visitor) const {
-  return Visitor.visit(*this);
-}
-
-Error DecompressedSection::accept(MutableSectionVisitor &Visitor) {
-  return Visitor.visit(*this);
-}
-
-Error OwnedDataSection::accept(SectionVisitor &Visitor) const {
-  return Visitor.visit(*this);
-}
-
-Error OwnedDataSection::accept(MutableSectionVisitor &Visitor) {
-  return Visitor.visit(*this);
-}
-
-void OwnedDataSection::appendHexData(StringRef HexData) {
-  assert((HexData.size() & 1) == 0);
-  while (!HexData.empty()) {
-    Data.push_back(checkedGetHex<uint8_t>(HexData.take_front(2)));
-    HexData = HexData.drop_front(2);
-  }
-  Size = Data.size();
-}
-
-Error BinarySectionWriter::visit(const CompressedSection &Sec) {
-  return createStringError(errc::operation_not_permitted,
-                           "cannot write compressed section '" + Sec.Name +
-                               "' ");
-}
-
-template <class ELFT>
-Error ELFSectionWriter<ELFT>::visit(const CompressedSection &Sec) {
-  uint8_t *Buf = reinterpret_cast<uint8_t *>(Out.getBufferStart()) + Sec.Offset;
-  if (Sec.CompressionType == DebugCompressionType::None) {
-    std::copy(Sec.OriginalData.begin(), Sec.OriginalData.end(), Buf);
-    return Error::success();
-  }
-
-  if (Sec.CompressionType == DebugCompressionType::GNU) {
-    const char *Magic = "ZLIB";
-    memcpy(Buf, Magic, strlen(Magic));
-    Buf += strlen(Magic);
-    const uint64_t DecompressedSize =
-        support::endian::read64be(&Sec.DecompressedSize);
-    memcpy(Buf, &DecompressedSize, sizeof(DecompressedSize));
-    Buf += sizeof(DecompressedSize);
-  } else {
-    Elf_Chdr_Impl<ELFT> Chdr;
-    Chdr.ch_type = ELF::ELFCOMPRESS_ZLIB;
-    Chdr.ch_size = Sec.DecompressedSize;
-    Chdr.ch_addralign = Sec.DecompressedAlign;
-    memcpy(Buf, &Chdr, sizeof(Chdr));
-    Buf += sizeof(Chdr);
-  }
-
-  std::copy(Sec.CompressedData.begin(), Sec.CompressedData.end(), Buf);
-  return Error::success();
-}
-
-Expected<CompressedSection>
-CompressedSection::create(const SectionBase &Sec,
-                          DebugCompressionType CompressionType) {
-  Error Err = Error::success();
-  CompressedSection Section(Sec, CompressionType, Err);
-
-  if (Err)
-    return std::move(Err);
-
-  return Section;
-}
-Expected<CompressedSection>
-CompressedSection::create(ArrayRef<uint8_t> CompressedData,
-                          uint64_t DecompressedSize,
-                          uint64_t DecompressedAlign) {
-  return CompressedSection(CompressedData, DecompressedSize, DecompressedAlign);
-}
-
-CompressedSection::CompressedSection(const SectionBase &Sec,
-                                     DebugCompressionType CompressionType,
-                                     Error &OutErr)
-    : SectionBase(Sec), CompressionType(CompressionType),
-      DecompressedSize(Sec.OriginalData.size()), DecompressedAlign(Sec.Align) {
-  ErrorAsOutParameter EAO(&OutErr);
-
-  if (Error Err = zlib::compress(
-          StringRef(reinterpret_cast<const char *>(OriginalData.data()),
-                    OriginalData.size()),
-          CompressedData)) {
-    OutErr = createStringError(llvm::errc::invalid_argument,
-                               "'" + Name + "': " + toString(std::move(Err)));
-    return;
-  }
-
-  size_t ChdrSize;
-  if (CompressionType == DebugCompressionType::GNU) {
-    Name = ".z" + Sec.Name.substr(1);
-    ChdrSize = sizeof("ZLIB") - 1 + sizeof(uint64_t);
-  } else {
-    Flags |= ELF::SHF_COMPRESSED;
-    ChdrSize =
-        std::max(std::max(sizeof(object::Elf_Chdr_Impl<object::ELF64LE>),
-                          sizeof(object::Elf_Chdr_Impl<object::ELF64BE>)),
-                 std::max(sizeof(object::Elf_Chdr_Impl<object::ELF32LE>),
-                          sizeof(object::Elf_Chdr_Impl<object::ELF32BE>)));
-  }
-  Size = ChdrSize + CompressedData.size();
-  Align = 8;
-}
-
-CompressedSection::CompressedSection(ArrayRef<uint8_t> CompressedData,
-                                     uint64_t DecompressedSize,
-                                     uint64_t DecompressedAlign)
-    : CompressionType(DebugCompressionType::None),
-      DecompressedSize(DecompressedSize), DecompressedAlign(DecompressedAlign) {
-  OriginalData = CompressedData;
-}
-
-Error CompressedSection::accept(SectionVisitor &Visitor) const {
-  return Visitor.visit(*this);
-}
-
-Error CompressedSection::accept(MutableSectionVisitor &Visitor) {
-  return Visitor.visit(*this);
-}
-
-void StringTableSection::addString(StringRef Name) { StrTabBuilder.add(Name); }
-
-uint32_t StringTableSection::findIndex(StringRef Name) const {
-  return StrTabBuilder.getOffset(Name);
-}
-
-void StringTableSection::prepareForLayout() {
-  StrTabBuilder.finalize();
-  Size = StrTabBuilder.getSize();
-}
-
-Error SectionWriter::visit(const StringTableSection &Sec) {
-  Sec.StrTabBuilder.write(reinterpret_cast<uint8_t *>(Out.getBufferStart()) +
-                          Sec.Offset);
-  return Error::success();
-}
-
-Error StringTableSection::accept(SectionVisitor &Visitor) const {
-  return Visitor.visit(*this);
-}
-
-Error StringTableSection::accept(MutableSectionVisitor &Visitor) {
-  return Visitor.visit(*this);
-}
-
-template <class ELFT>
-Error ELFSectionWriter<ELFT>::visit(const SectionIndexSection &Sec) {
-  uint8_t *Buf = reinterpret_cast<uint8_t *>(Out.getBufferStart()) + Sec.Offset;
-  llvm::copy(Sec.Indexes, reinterpret_cast<Elf_Word *>(Buf));
-  return Error::success();
-}
-
-Error SectionIndexSection::initialize(SectionTableRef SecTable) {
-  Size = 0;
-  Expected<SymbolTableSection *> Sec =
-      SecTable.getSectionOfType<SymbolTableSection>(
-          Link,
-          "Link field value " + Twine(Link) + " in section " + Name +
-              " is invalid",
-          "Link field value " + Twine(Link) + " in section " + Name +
-              " is not a symbol table");
-  if (!Sec)
-    return Sec.takeError();
-
-  setSymTab(*Sec);
-  Symbols->setShndxTable(this);
-  return Error::success();
-}
-
-void SectionIndexSection::finalize() { Link = Symbols->Index; }
-
-Error SectionIndexSection::accept(SectionVisitor &Visitor) const {
-  return Visitor.visit(*this);
-}
-
-Error SectionIndexSection::accept(MutableSectionVisitor &Visitor) {
-  return Visitor.visit(*this);
-}
-
-static bool isValidReservedSectionIndex(uint16_t Index, uint16_t Machine) {
-  switch (Index) {
-  case SHN_ABS:
-  case SHN_COMMON:
-    return true;
-  }
-
-  if (Machine == EM_AMDGPU) {
-    return Index == SHN_AMDGPU_LDS;
-  }
-
-  if (Machine == EM_HEXAGON) {
-    switch (Index) {
-    case SHN_HEXAGON_SCOMMON:
-    case SHN_HEXAGON_SCOMMON_1:
-    case SHN_HEXAGON_SCOMMON_2:
-    case SHN_HEXAGON_SCOMMON_4:
-    case SHN_HEXAGON_SCOMMON_8:
-      return true;
-    }
-  }
-  return false;
-}
-
-// Large indexes force us to clarify exactly what this function should do. This
-// function should return the value that will appear in st_shndx when written
-// out.
-uint16_t Symbol::getShndx() const {
-  if (DefinedIn != nullptr) {
-    if (DefinedIn->Index >= SHN_LORESERVE)
-      return SHN_XINDEX;
-    return DefinedIn->Index;
-  }
-
-  if (ShndxType == SYMBOL_SIMPLE_INDEX) {
-    // This means that we don't have a defined section but we do need to
-    // output a legitimate section index.
-    return SHN_UNDEF;
-  }
-
-  assert(ShndxType == SYMBOL_ABS || ShndxType == SYMBOL_COMMON ||
-         (ShndxType >= SYMBOL_LOPROC && ShndxType <= SYMBOL_HIPROC) ||
-         (ShndxType >= SYMBOL_LOOS && ShndxType <= SYMBOL_HIOS));
-  return static_cast<uint16_t>(ShndxType);
-}
-
-bool Symbol::isCommon() const { return getShndx() == SHN_COMMON; }
-
-void SymbolTableSection::assignIndices() {
-  uint32_t Index = 0;
-  for (auto &Sym : Symbols)
-    Sym->Index = Index++;
-}
-
-void SymbolTableSection::addSymbol(Twine Name, uint8_t Bind, uint8_t Type,
-                                   SectionBase *DefinedIn, uint64_t Value,
-                                   uint8_t Visibility, uint16_t Shndx,
-                                   uint64_t SymbolSize) {
-  Symbol Sym;
-  Sym.Name = Name.str();
-  Sym.Binding = Bind;
-  Sym.Type = Type;
-  Sym.DefinedIn = DefinedIn;
-  if (DefinedIn != nullptr)
-    DefinedIn->HasSymbol = true;
-  if (DefinedIn == nullptr) {
-    if (Shndx >= SHN_LORESERVE)
-      Sym.ShndxType = static_cast<SymbolShndxType>(Shndx);
-    else
-      Sym.ShndxType = SYMBOL_SIMPLE_INDEX;
-  }
-  Sym.Value = Value;
-  Sym.Visibility = Visibility;
-  Sym.Size = SymbolSize;
-  Sym.Index = Symbols.size();
-  Symbols.emplace_back(std::make_unique<Symbol>(Sym));
-  Size += this->EntrySize;
-}
-
-Error SymbolTableSection::removeSectionReferences(
-    bool AllowBrokenLinks, function_ref<bool(const SectionBase *)> ToRemove) {
-  if (ToRemove(SectionIndexTable))
-    SectionIndexTable = nullptr;
-  if (ToRemove(SymbolNames)) {
-    if (!AllowBrokenLinks)
-      return createStringError(
-          llvm::errc::invalid_argument,
-          "string table '%s' cannot be removed because it is "
-          "referenced by the symbol table '%s'",
-          SymbolNames->Name.data(), this->Name.data());
-    SymbolNames = nullptr;
-  }
-  return removeSymbols(
-      [ToRemove](const Symbol &Sym) { return ToRemove(Sym.DefinedIn); });
-}
-
-void SymbolTableSection::updateSymbols(function_ref<void(Symbol &)> Callable) {
-  std::for_each(std::begin(Symbols) + 1, std::end(Symbols),
-                [Callable](SymPtr &Sym) { Callable(*Sym); });
-  std::stable_partition(
-      std::begin(Symbols), std::end(Symbols),
-      [](const SymPtr &Sym) { return Sym->Binding == STB_LOCAL; });
-  assignIndices();
-}
-
-Error SymbolTableSection::removeSymbols(
-    function_ref<bool(const Symbol &)> ToRemove) {
-  Symbols.erase(
-      std::remove_if(std::begin(Symbols) + 1, std::end(Symbols),
-                     [ToRemove](const SymPtr &Sym) { return ToRemove(*Sym); }),
-      std::end(Symbols));
-  Size = Symbols.size() * EntrySize;
-  assignIndices();
-  return Error::success();
-}
-
-void SymbolTableSection::replaceSectionReferences(
-    const DenseMap<SectionBase *, SectionBase *> &FromTo) {
-  for (std::unique_ptr<Symbol> &Sym : Symbols)
-    if (SectionBase *To = FromTo.lookup(Sym->DefinedIn))
-      Sym->DefinedIn = To;
-}
-
-Error SymbolTableSection::initialize(SectionTableRef SecTable) {
-  Size = 0;
-  Expected<StringTableSection *> Sec =
-      SecTable.getSectionOfType<StringTableSection>(
-          Link,
-          "Symbol table has link index of " + Twine(Link) +
-              " which is not a valid index",
-          "Symbol table has link index of " + Twine(Link) +
-              " which is not a string table");
-  if (!Sec)
-    return Sec.takeError();
-
-  setStrTab(*Sec);
-  return Error::success();
-}
-
-void SymbolTableSection::finalize() {
-  uint32_t MaxLocalIndex = 0;
-  for (std::unique_ptr<Symbol> &Sym : Symbols) {
-    Sym->NameIndex =
-        SymbolNames == nullptr ? 0 : SymbolNames->findIndex(Sym->Name);
-    if (Sym->Binding == STB_LOCAL)
-      MaxLocalIndex = std::max(MaxLocalIndex, Sym->Index);
-  }
-  // Now we need to set the Link and Info fields.
-  Link = SymbolNames == nullptr ? 0 : SymbolNames->Index;
-  Info = MaxLocalIndex + 1;
-}
-
-void SymbolTableSection::prepareForLayout() {
-  // Reserve proper amount of space in section index table, so we can
-  // layout sections correctly. We will fill the table with correct
-  // indexes later in fillShdnxTable.
-  if (SectionIndexTable)
-    SectionIndexTable->reserve(Symbols.size());
-
-  // Add all of our strings to SymbolNames so that SymbolNames has the right
-  // size before layout is decided.
-  // If the symbol names section has been removed, don't try to add strings to
-  // the table.
-  if (SymbolNames != nullptr)
-    for (std::unique_ptr<Symbol> &Sym : Symbols)
-      SymbolNames->addString(Sym->Name);
-}
-
-void SymbolTableSection::fillShndxTable() {
-  if (SectionIndexTable == nullptr)
-    return;
-  // Fill section index table with real section indexes. This function must
-  // be called after assignOffsets.
-  for (const std::unique_ptr<Symbol> &Sym : Symbols) {
-    if (Sym->DefinedIn != nullptr && Sym->DefinedIn->Index >= SHN_LORESERVE)
-      SectionIndexTable->addIndex(Sym->DefinedIn->Index);
-    else
-      SectionIndexTable->addIndex(SHN_UNDEF);
-  }
-}
-
-Expected<const Symbol *>
-SymbolTableSection::getSymbolByIndex(uint32_t Index) const {
-  if (Symbols.size() <= Index)
-    return createStringError(errc::invalid_argument,
-                             "invalid symbol index: " + Twine(Index));
-  return Symbols[Index].get();
-}
-
-Expected<Symbol *> SymbolTableSection::getSymbolByIndex(uint32_t Index) {
-  Expected<const Symbol *> Sym =
-      static_cast<const SymbolTableSection *>(this)->getSymbolByIndex(Index);
-  if (!Sym)
-    return Sym.takeError();
-
-  return const_cast<Symbol *>(*Sym);
-}
-
-template <class ELFT>
-Error ELFSectionWriter<ELFT>::visit(const SymbolTableSection &Sec) {
-  Elf_Sym *Sym = reinterpret_cast<Elf_Sym *>(Out.getBufferStart() + Sec.Offset);
-  // Loop though symbols setting each entry of the symbol table.
-  for (const std::unique_ptr<Symbol> &Symbol : Sec.Symbols) {
-    Sym->st_name = Symbol->NameIndex;
-    Sym->st_value = Symbol->Value;
-    Sym->st_size = Symbol->Size;
-    Sym->st_other = Symbol->Visibility;
-    Sym->setBinding(Symbol->Binding);
-    Sym->setType(Symbol->Type);
-    Sym->st_shndx = Symbol->getShndx();
-    ++Sym;
-  }
-  return Error::success();
-}
-
-Error SymbolTableSection::accept(SectionVisitor &Visitor) const {
-  return Visitor.visit(*this);
-}
-
-Error SymbolTableSection::accept(MutableSectionVisitor &Visitor) {
-  return Visitor.visit(*this);
-}
-
-Error RelocationSection::removeSectionReferences(
-    bool AllowBrokenLinks, function_ref<bool(const SectionBase *)> ToRemove) {
-  if (ToRemove(Symbols)) {
-    if (!AllowBrokenLinks)
-      return createStringError(
-          llvm::errc::invalid_argument,
-          "symbol table '%s' cannot be removed because it is "
-          "referenced by the relocation section '%s'",
-          Symbols->Name.data(), this->Name.data());
-    Symbols = nullptr;
-  }
-
-  for (const Relocation &R : Relocations) {
-    if (!R.RelocSymbol || !R.RelocSymbol->DefinedIn ||
-        !ToRemove(R.RelocSymbol->DefinedIn))
-      continue;
-    return createStringError(llvm::errc::invalid_argument,
-                             "section '%s' cannot be removed: (%s+0x%" PRIx64
-                             ") has relocation against symbol '%s'",
-                             R.RelocSymbol->DefinedIn->Name.data(),
-                             SecToApplyRel->Name.data(), R.Offset,
-                             R.RelocSymbol->Name.c_str());
-  }
-
-  return Error::success();
-}
-
-template <class SymTabType>
-Error RelocSectionWithSymtabBase<SymTabType>::initialize(
-    SectionTableRef SecTable) {
-  if (Link != SHN_UNDEF) {
-    Expected<SymTabType *> Sec = SecTable.getSectionOfType<SymTabType>(
-        Link,
-        "Link field value " + Twine(Link) + " in section " + Name +
-            " is invalid",
-        "Link field value " + Twine(Link) + " in section " + Name +
-            " is not a symbol table");
-    if (!Sec)
-      return Sec.takeError();
-
-    setSymTab(*Sec);
-  }
-
-  if (Info != SHN_UNDEF) {
-    Expected<SectionBase *> Sec =
-        SecTable.getSection(Info, "Info field value " + Twine(Info) +
-                                      " in section " + Name + " is invalid");
-    if (!Sec)
-      return Sec.takeError();
-
-    setSection(*Sec);
-  } else
-    setSection(nullptr);
-
-  return Error::success();
-}
-
-template <class SymTabType>
-void RelocSectionWithSymtabBase<SymTabType>::finalize() {
-  this->Link = Symbols ? Symbols->Index : 0;
-
-  if (SecToApplyRel != nullptr)
-    this->Info = SecToApplyRel->Index;
-}
-
-template <class ELFT>
-static void setAddend(Elf_Rel_Impl<ELFT, false> &, uint64_t) {}
-
-template <class ELFT>
-static void setAddend(Elf_Rel_Impl<ELFT, true> &Rela, uint64_t Addend) {
-  Rela.r_addend = Addend;
-}
-
-template <class RelRange, class T>
-static void writeRel(const RelRange &Relocations, T *Buf) {
-  for (const auto &Reloc : Relocations) {
-    Buf->r_offset = Reloc.Offset;
-    setAddend(*Buf, Reloc.Addend);
-    Buf->setSymbolAndType(Reloc.RelocSymbol ? Reloc.RelocSymbol->Index : 0,
-                          Reloc.Type, false);
-    ++Buf;
-  }
-}
-
-template <class ELFT>
-Error ELFSectionWriter<ELFT>::visit(const RelocationSection &Sec) {
-  uint8_t *Buf = reinterpret_cast<uint8_t *>(Out.getBufferStart()) + Sec.Offset;
-  if (Sec.Type == SHT_REL)
-    writeRel(Sec.Relocations, reinterpret_cast<Elf_Rel *>(Buf));
-  else
-    writeRel(Sec.Relocations, reinterpret_cast<Elf_Rela *>(Buf));
-  return Error::success();
-}
-
-Error RelocationSection::accept(SectionVisitor &Visitor) const {
-  return Visitor.visit(*this);
-}
-
-Error RelocationSection::accept(MutableSectionVisitor &Visitor) {
-  return Visitor.visit(*this);
-}
-
-Error RelocationSection::removeSymbols(
-    function_ref<bool(const Symbol &)> ToRemove) {
-  for (const Relocation &Reloc : Relocations)
-    if (Reloc.RelocSymbol && ToRemove(*Reloc.RelocSymbol))
-      return createStringError(
-          llvm::errc::invalid_argument,
-          "not stripping symbol '%s' because it is named in a relocation",
-          Reloc.RelocSymbol->Name.data());
-  return Error::success();
-}
-
-void RelocationSection::markSymbols() {
-  for (const Relocation &Reloc : Relocations)
-    if (Reloc.RelocSymbol)
-      Reloc.RelocSymbol->Referenced = true;
-}
-
-void RelocationSection::replaceSectionReferences(
-    const DenseMap<SectionBase *, SectionBase *> &FromTo) {
-  // Update the target section if it was replaced.
-  if (SectionBase *To = FromTo.lookup(SecToApplyRel))
-    SecToApplyRel = To;
-}
-
-Error SectionWriter::visit(const DynamicRelocationSection &Sec) {
-  llvm::copy(Sec.Contents, Out.getBufferStart() + Sec.Offset);
-  return Error::success();
-}
-
-Error DynamicRelocationSection::accept(SectionVisitor &Visitor) const {
-  return Visitor.visit(*this);
-}
-
-Error DynamicRelocationSection::accept(MutableSectionVisitor &Visitor) {
-  return Visitor.visit(*this);
-}
-
-Error DynamicRelocationSection::removeSectionReferences(
-    bool AllowBrokenLinks, function_ref<bool(const SectionBase *)> ToRemove) {
-  if (ToRemove(Symbols)) {
-    if (!AllowBrokenLinks)
-      return createStringError(
-          llvm::errc::invalid_argument,
-          "symbol table '%s' cannot be removed because it is "
-          "referenced by the relocation section '%s'",
-          Symbols->Name.data(), this->Name.data());
-    Symbols = nullptr;
-  }
-
-  // SecToApplyRel contains a section referenced by sh_info field. It keeps
-  // a section to which the relocation section applies. When we remove any
-  // sections we also remove their relocation sections. Since we do that much
-  // earlier, this assert should never be triggered.
-  assert(!SecToApplyRel || !ToRemove(SecToApplyRel));
-  return Error::success();
-}
-
-Error Section::removeSectionReferences(
-    bool AllowBrokenDependency,
-    function_ref<bool(const SectionBase *)> ToRemove) {
-  if (ToRemove(LinkSection)) {
-    if (!AllowBrokenDependency)
-      return createStringError(llvm::errc::invalid_argument,
-                               "section '%s' cannot be removed because it is "
-                               "referenced by the section '%s'",
-                               LinkSection->Name.data(), this->Name.data());
-    LinkSection = nullptr;
-  }
-  return Error::success();
-}
-
-void GroupSection::finalize() {
-  this->Info = Sym ? Sym->Index : 0;
-  this->Link = SymTab ? SymTab->Index : 0;
-  // Linker deduplication for GRP_COMDAT is based on Sym->Name. The local/global
-  // status is not part of the equation. If Sym is localized, the intention is
-  // likely to make the group fully localized. Drop GRP_COMDAT to suppress
-  // deduplication. See https://groups.google.com/g/generic-abi/c/2X6mR-s2zoc
-  if ((FlagWord & GRP_COMDAT) && Sym && Sym->Binding == STB_LOCAL)
-    this->FlagWord &= ~GRP_COMDAT;
-}
-
-Error GroupSection::removeSectionReferences(
-    bool AllowBrokenLinks, function_ref<bool(const SectionBase *)> ToRemove) {
-  if (ToRemove(SymTab)) {
-    if (!AllowBrokenLinks)
-      return createStringError(
-          llvm::errc::invalid_argument,
-          "section '.symtab' cannot be removed because it is "
-          "referenced by the group section '%s'",
-          this->Name.data());
-    SymTab = nullptr;
-    Sym = nullptr;
-  }
-  llvm::erase_if(GroupMembers, ToRemove);
-  return Error::success();
-}
-
-Error GroupSection::removeSymbols(function_ref<bool(const Symbol &)> ToRemove) {
-  if (ToRemove(*Sym))
-    return createStringError(llvm::errc::invalid_argument,
-                             "symbol '%s' cannot be removed because it is "
-                             "referenced by the section '%s[%d]'",
-                             Sym->Name.data(), this->Name.data(), this->Index);
-  return Error::success();
-}
-
-void GroupSection::markSymbols() {
-  if (Sym)
-    Sym->Referenced = true;
-}
-
-void GroupSection::replaceSectionReferences(
-    const DenseMap<SectionBase *, SectionBase *> &FromTo) {
-  for (SectionBase *&Sec : GroupMembers)
-    if (SectionBase *To = FromTo.lookup(Sec))
-      Sec = To;
-}
-
-void GroupSection::onRemove() {
-  // As the header section of the group is removed, drop the Group flag in its
-  // former members.
-  for (SectionBase *Sec : GroupMembers)
-    Sec->Flags &= ~SHF_GROUP;
-}
-
-Error Section::initialize(SectionTableRef SecTable) {
-  if (Link == ELF::SHN_UNDEF)
-    return Error::success();
-
-  Expected<SectionBase *> Sec =
-      SecTable.getSection(Link, "Link field value " + Twine(Link) +
-                                    " in section " + Name + " is invalid");
-  if (!Sec)
-    return Sec.takeError();
-
-  LinkSection = *Sec;
-
-  if (LinkSection->Type == ELF::SHT_SYMTAB)
-    LinkSection = nullptr;
-
-  return Error::success();
-}
-
-void Section::finalize() { this->Link = LinkSection ? LinkSection->Index : 0; }
-
-void GnuDebugLinkSection::init(StringRef File) {
-  FileName = sys::path::filename(File);
-  // The format for the .gnu_debuglink starts with the file name and is
-  // followed by a null terminator and then the CRC32 of the file. The CRC32
-  // should be 4 byte aligned. So we add the FileName size, a 1 for the null
-  // byte, and then finally push the size to alignment and add 4.
-  Size = alignTo(FileName.size() + 1, 4) + 4;
-  // The CRC32 will only be aligned if we align the whole section.
-  Align = 4;
-  Type = OriginalType = ELF::SHT_PROGBITS;
-  Name = ".gnu_debuglink";
-  // For sections not found in segments, OriginalOffset is only used to
-  // establish the order that sections should go in. By using the maximum
-  // possible offset we cause this section to wind up at the end.
-  OriginalOffset = std::numeric_limits<uint64_t>::max();
-}
-
-GnuDebugLinkSection::GnuDebugLinkSection(StringRef File,
-                                         uint32_t PrecomputedCRC)
-    : FileName(File), CRC32(PrecomputedCRC) {
-  init(File);
-}
-
-template <class ELFT>
-Error ELFSectionWriter<ELFT>::visit(const GnuDebugLinkSection &Sec) {
-  unsigned char *Buf =
-      reinterpret_cast<uint8_t *>(Out.getBufferStart()) + Sec.Offset;
-  Elf_Word *CRC =
-      reinterpret_cast<Elf_Word *>(Buf + Sec.Size - sizeof(Elf_Word));
-  *CRC = Sec.CRC32;
-  llvm::copy(Sec.FileName, Buf);
-  return Error::success();
-}
-
-Error GnuDebugLinkSection::accept(SectionVisitor &Visitor) const {
-  return Visitor.visit(*this);
-}
-
-Error GnuDebugLinkSection::accept(MutableSectionVisitor &Visitor) {
-  return Visitor.visit(*this);
-}
-
-template <class ELFT>
-Error ELFSectionWriter<ELFT>::visit(const GroupSection &Sec) {
-  ELF::Elf32_Word *Buf =
-      reinterpret_cast<ELF::Elf32_Word *>(Out.getBufferStart() + Sec.Offset);
-  support::endian::write32<ELFT::TargetEndianness>(Buf++, Sec.FlagWord);
-  for (SectionBase *S : Sec.GroupMembers)
-    support::endian::write32<ELFT::TargetEndianness>(Buf++, S->Index);
-  return Error::success();
-}
-
-Error GroupSection::accept(SectionVisitor &Visitor) const {
-  return Visitor.visit(*this);
-}
-
-Error GroupSection::accept(MutableSectionVisitor &Visitor) {
-  return Visitor.visit(*this);
-}
-
-// Returns true IFF a section is wholly inside the range of a segment
-static bool sectionWithinSegment(const SectionBase &Sec, const Segment &Seg) {
-  // If a section is empty it should be treated like it has a size of 1. This is
-  // to clarify the case when an empty section lies on a boundary between two
-  // segments and ensures that the section "belongs" to the second segment and
-  // not the first.
-  uint64_t SecSize = Sec.Size ? Sec.Size : 1;
-
-  // Ignore just added sections.
-  if (Sec.OriginalOffset == std::numeric_limits<uint64_t>::max())
-    return false;
-
-  if (Sec.Type == SHT_NOBITS) {
-    if (!(Sec.Flags & SHF_ALLOC))
-      return false;
-
-    bool SectionIsTLS = Sec.Flags & SHF_TLS;
-    bool SegmentIsTLS = Seg.Type == PT_TLS;
-    if (SectionIsTLS != SegmentIsTLS)
-      return false;
-
-    return Seg.VAddr <= Sec.Addr &&
-           Seg.VAddr + Seg.MemSize >= Sec.Addr + SecSize;
-  }
-
-  return Seg.Offset <= Sec.OriginalOffset &&
-         Seg.Offset + Seg.FileSize >= Sec.OriginalOffset + SecSize;
-}
-
-// Returns true IFF a segment's original offset is inside of another segment's
-// range.
-static bool segmentOverlapsSegment(const Segment &Child,
-                                   const Segment &Parent) {
-
-  return Parent.OriginalOffset <= Child.OriginalOffset &&
-         Parent.OriginalOffset + Parent.FileSize > Child.OriginalOffset;
-}
-
-static bool compareSegmentsByOffset(const Segment *A, const Segment *B) {
-  // Any segment without a parent segment should come before a segment
-  // that has a parent segment.
-  if (A->OriginalOffset < B->OriginalOffset)
-    return true;
-  if (A->OriginalOffset > B->OriginalOffset)
-    return false;
-  return A->Index < B->Index;
-}
-
-void BasicELFBuilder::initFileHeader() {
-  Obj->Flags = 0x0;
-  Obj->Type = ET_REL;
-  Obj->OSABI = ELFOSABI_NONE;
-  Obj->ABIVersion = 0;
-  Obj->Entry = 0x0;
-  Obj->Machine = EM_NONE;
-  Obj->Version = 1;
-}
-
-void BasicELFBuilder::initHeaderSegment() { Obj->ElfHdrSegment.Index = 0; }
-
-StringTableSection *BasicELFBuilder::addStrTab() {
-  auto &StrTab = Obj->addSection<StringTableSection>();
-  StrTab.Name = ".strtab";
-
-  Obj->SectionNames = &StrTab;
-  return &StrTab;
-}
-
-SymbolTableSection *BasicELFBuilder::addSymTab(StringTableSection *StrTab) {
-  auto &SymTab = Obj->addSection<SymbolTableSection>();
-
-  SymTab.Name = ".symtab";
-  SymTab.Link = StrTab->Index;
-
-  // The symbol table always needs a null symbol
-  SymTab.addSymbol("", 0, 0, nullptr, 0, 0, 0, 0);
-
-  Obj->SymbolTable = &SymTab;
-  return &SymTab;
-}
-
-Error BasicELFBuilder::initSections() {
-  for (SectionBase &Sec : Obj->sections())
-    if (Error Err = Sec.initialize(Obj->sections()))
-      return Err;
-
-  return Error::success();
-}
-
-void BinaryELFBuilder::addData(SymbolTableSection *SymTab) {
-  auto Data = ArrayRef<uint8_t>(
-      reinterpret_cast<const uint8_t *>(MemBuf->getBufferStart()),
-      MemBuf->getBufferSize());
-  auto &DataSection = Obj->addSection<Section>(Data);
-  DataSection.Name = ".data";
-  DataSection.Type = ELF::SHT_PROGBITS;
-  DataSection.Size = Data.size();
-  DataSection.Flags = ELF::SHF_ALLOC | ELF::SHF_WRITE;
-
-  std::string SanitizedFilename = MemBuf->getBufferIdentifier().str();
-  std::replace_if(
-      std::begin(SanitizedFilename), std::end(SanitizedFilename),
-      [](char C) { return !isAlnum(C); }, '_');
-  Twine Prefix = Twine("_binary_") + SanitizedFilename;
-
-  SymTab->addSymbol(Prefix + "_start", STB_GLOBAL, STT_NOTYPE, &DataSection,
-                    /*Value=*/0, NewSymbolVisibility, 0, 0);
-  SymTab->addSymbol(Prefix + "_end", STB_GLOBAL, STT_NOTYPE, &DataSection,
-                    /*Value=*/DataSection.Size, NewSymbolVisibility, 0, 0);
-  SymTab->addSymbol(Prefix + "_size", STB_GLOBAL, STT_NOTYPE, nullptr,
-                    /*Value=*/DataSection.Size, NewSymbolVisibility, SHN_ABS,
-                    0);
-}
-
-Expected<std::unique_ptr<Object>> BinaryELFBuilder::build() {
-  initFileHeader();
-  initHeaderSegment();
-
-  SymbolTableSection *SymTab = addSymTab(addStrTab());
-  if (Error Err = initSections())
-    return std::move(Err);
-  addData(SymTab);
-
-  return std::move(Obj);
-}
-
-// Adds sections from IHEX data file. Data should have been
-// fully validated by this time.
-void IHexELFBuilder::addDataSections() {
-  OwnedDataSection *Section = nullptr;
-  uint64_t SegmentAddr = 0, BaseAddr = 0;
-  uint32_t SecNo = 1;
-
-  for (const IHexRecord &R : Records) {
-    uint64_t RecAddr;
-    switch (R.Type) {
-    case IHexRecord::Data:
-      // Ignore empty data records
-      if (R.HexData.empty())
-        continue;
-      RecAddr = R.Addr + SegmentAddr + BaseAddr;
-      if (!Section || Section->Addr + Section->Size != RecAddr)
-        // OriginalOffset field is only used to sort section properly, so
-        // instead of keeping track of real offset in IHEX file, we use
-        // section number.
-        Section = &Obj->addSection<OwnedDataSection>(
-            ".sec" + std::to_string(SecNo++), RecAddr,
-            ELF::SHF_ALLOC | ELF::SHF_WRITE, SecNo);
-      Section->appendHexData(R.HexData);
-      break;
-    case IHexRecord::EndOfFile:
-      break;
-    case IHexRecord::SegmentAddr:
-      // 20-bit segment address.
-      SegmentAddr = checkedGetHex<uint16_t>(R.HexData) << 4;
-      break;
-    case IHexRecord::StartAddr80x86:
-    case IHexRecord::StartAddr:
-      Obj->Entry = checkedGetHex<uint32_t>(R.HexData);
-      assert(Obj->Entry <= 0xFFFFFU);
-      break;
-    case IHexRecord::ExtendedAddr:
-      // 16-31 bits of linear base address
-      BaseAddr = checkedGetHex<uint16_t>(R.HexData) << 16;
-      break;
-    default:
-      llvm_unreachable("unknown record type");
-    }
-  }
-}
-
-Expected<std::unique_ptr<Object>> IHexELFBuilder::build() {
-  initFileHeader();
-  initHeaderSegment();
-  StringTableSection *StrTab = addStrTab();
-  addSymTab(StrTab);
-  if (Error Err = initSections())
-    return std::move(Err);
-  addDataSections();
-
-  return std::move(Obj);
-}
-
-template <class ELFT> void ELFBuilder<ELFT>::setParentSegment(Segment &Child) {
-  for (Segment &Parent : Obj.segments()) {
-    // Every segment will overlap with itself but we don't want a segment to
-    // be its own parent so we avoid that situation.
-    if (&Child != &Parent && segmentOverlapsSegment(Child, Parent)) {
-      // We want a canonical "most parental" segment but this requires
-      // inspecting the ParentSegment.
-      if (compareSegmentsByOffset(&Parent, &Child))
-        if (Child.ParentSegment == nullptr ||
-            compareSegmentsByOffset(&Parent, Child.ParentSegment)) {
-          Child.ParentSegment = &Parent;
-        }
-    }
-  }
-}
-
-template <class ELFT> Error ELFBuilder<ELFT>::findEhdrOffset() {
-  if (!ExtractPartition)
-    return Error::success();
-
-  for (const SectionBase &Sec : Obj.sections()) {
-    if (Sec.Type == SHT_LLVM_PART_EHDR && Sec.Name == *ExtractPartition) {
-      EhdrOffset = Sec.Offset;
-      return Error::success();
-    }
-  }
-  return createStringError(errc::invalid_argument,
-                           "could not find partition named '" +
-                               *ExtractPartition + "'");
-}
-
-template <class ELFT>
-Error ELFBuilder<ELFT>::readProgramHeaders(const ELFFile<ELFT> &HeadersFile) {
-  uint32_t Index = 0;
-
-  Expected<typename ELFFile<ELFT>::Elf_Phdr_Range> Headers =
-      HeadersFile.program_headers();
-  if (!Headers)
-    return Headers.takeError();
-
-  for (const typename ELFFile<ELFT>::Elf_Phdr &Phdr : *Headers) {
-    if (Phdr.p_offset + Phdr.p_filesz > HeadersFile.getBufSize())
-      return createStringError(
-          errc::invalid_argument,
-          "program header with offset 0x" + Twine::utohexstr(Phdr.p_offset) +
-              " and file size 0x" + Twine::utohexstr(Phdr.p_filesz) +
-              " goes past the end of the file");
-
-    ArrayRef<uint8_t> Data{HeadersFile.base() + Phdr.p_offset,
-                           (size_t)Phdr.p_filesz};
-    Segment &Seg = Obj.addSegment(Data);
-    Seg.Type = Phdr.p_type;
-    Seg.Flags = Phdr.p_flags;
-    Seg.OriginalOffset = Phdr.p_offset + EhdrOffset;
-    Seg.Offset = Phdr.p_offset + EhdrOffset;
-    Seg.VAddr = Phdr.p_vaddr;
-    Seg.PAddr = Phdr.p_paddr;
-    Seg.FileSize = Phdr.p_filesz;
-    Seg.MemSize = Phdr.p_memsz;
-    Seg.Align = Phdr.p_align;
-    Seg.Index = Index++;
-    for (SectionBase &Sec : Obj.sections())
-      if (sectionWithinSegment(Sec, Seg)) {
-        Seg.addSection(&Sec);
-        if (!Sec.ParentSegment || Sec.ParentSegment->Offset > Seg.Offset)
-          Sec.ParentSegment = &Seg;
-      }
-  }
-
-  auto &ElfHdr = Obj.ElfHdrSegment;
-  ElfHdr.Index = Index++;
-  ElfHdr.OriginalOffset = ElfHdr.Offset = EhdrOffset;
-
-  const typename ELFT::Ehdr &Ehdr = HeadersFile.getHeader();
-  auto &PrHdr = Obj.ProgramHdrSegment;
-  PrHdr.Type = PT_PHDR;
-  PrHdr.Flags = 0;
-  // The spec requires us to have p_vaddr % p_align == p_offset % p_align.
-  // Whereas this works automatically for ElfHdr, here OriginalOffset is
-  // always non-zero and to ensure the equation we assign the same value to
-  // VAddr as well.
-  PrHdr.OriginalOffset = PrHdr.Offset = PrHdr.VAddr = EhdrOffset + Ehdr.e_phoff;
-  PrHdr.PAddr = 0;
-  PrHdr.FileSize = PrHdr.MemSize = Ehdr.e_phentsize * Ehdr.e_phnum;
-  // The spec requires us to naturally align all the fields.
-  PrHdr.Align = sizeof(Elf_Addr);
-  PrHdr.Index = Index++;
-
-  // Now we do an O(n^2) loop through the segments in order to match up
-  // segments.
-  for (Segment &Child : Obj.segments())
-    setParentSegment(Child);
-  setParentSegment(ElfHdr);
-  setParentSegment(PrHdr);
-
-  return Error::success();
-}
-
-template <class ELFT>
-Error ELFBuilder<ELFT>::initGroupSection(GroupSection *GroupSec) {
-  if (GroupSec->Align % sizeof(ELF::Elf32_Word) != 0)
-    return createStringError(errc::invalid_argument,
-                             "invalid alignment " + Twine(GroupSec->Align) +
-                                 " of group section '" + GroupSec->Name + "'");
-  SectionTableRef SecTable = Obj.sections();
-  if (GroupSec->Link != SHN_UNDEF) {
-    auto SymTab = SecTable.template getSectionOfType<SymbolTableSection>(
-        GroupSec->Link,
-        "link field value '" + Twine(GroupSec->Link) + "' in section '" +
-            GroupSec->Name + "' is invalid",
-        "link field value '" + Twine(GroupSec->Link) + "' in section '" +
-            GroupSec->Name + "' is not a symbol table");
-    if (!SymTab)
-      return SymTab.takeError();
-
-    Expected<Symbol *> Sym = (*SymTab)->getSymbolByIndex(GroupSec->Info);
-    if (!Sym)
-      return createStringError(errc::invalid_argument,
-                               "info field value '" + Twine(GroupSec->Info) +
-                                   "' in section '" + GroupSec->Name +
-                                   "' is not a valid symbol index");
-    GroupSec->setSymTab(*SymTab);
-    GroupSec->setSymbol(*Sym);
-  }
-  if (GroupSec->Contents.size() % sizeof(ELF::Elf32_Word) ||
-      GroupSec->Contents.empty())
-    return createStringError(errc::invalid_argument,
-                             "the content of the section " + GroupSec->Name +
-                                 " is malformed");
-  const ELF::Elf32_Word *Word =
-      reinterpret_cast<const ELF::Elf32_Word *>(GroupSec->Contents.data());
-  const ELF::Elf32_Word *End =
-      Word + GroupSec->Contents.size() / sizeof(ELF::Elf32_Word);
-  GroupSec->setFlagWord(
-      support::endian::read32<ELFT::TargetEndianness>(Word++));
-  for (; Word != End; ++Word) {
-    uint32_t Index = support::endian::read32<ELFT::TargetEndianness>(Word);
-    Expected<SectionBase *> Sec = SecTable.getSection(
-        Index, "group member index " + Twine(Index) + " in section '" +
-                   GroupSec->Name + "' is invalid");
-    if (!Sec)
-      return Sec.takeError();
-
-    GroupSec->addMember(*Sec);
-  }
-
-  return Error::success();
-}
-
-template <class ELFT>
-Error ELFBuilder<ELFT>::initSymbolTable(SymbolTableSection *SymTab) {
-  Expected<const Elf_Shdr *> Shdr = ElfFile.getSection(SymTab->Index);
-  if (!Shdr)
-    return Shdr.takeError();
-
-  Expected<StringRef> StrTabData = ElfFile.getStringTableForSymtab(**Shdr);
-  if (!StrTabData)
-    return StrTabData.takeError();
-
-  ArrayRef<Elf_Word> ShndxData;
-
-  Expected<typename ELFFile<ELFT>::Elf_Sym_Range> Symbols =
-      ElfFile.symbols(*Shdr);
-  if (!Symbols)
-    return Symbols.takeError();
-
-  for (const typename ELFFile<ELFT>::Elf_Sym &Sym : *Symbols) {
-    SectionBase *DefSection = nullptr;
-
-    Expected<StringRef> Name = Sym.getName(*StrTabData);
-    if (!Name)
-      return Name.takeError();
-
-    if (Sym.st_shndx == SHN_XINDEX) {
-      if (SymTab->getShndxTable() == nullptr)
-        return createStringError(errc::invalid_argument,
-                                 "symbol '" + *Name +
-                                     "' has index SHN_XINDEX but no "
-                                     "SHT_SYMTAB_SHNDX section exists");
-      if (ShndxData.data() == nullptr) {
-        Expected<const Elf_Shdr *> ShndxSec =
-            ElfFile.getSection(SymTab->getShndxTable()->Index);
-        if (!ShndxSec)
-          return ShndxSec.takeError();
-
-        Expected<ArrayRef<Elf_Word>> Data =
-            ElfFile.template getSectionContentsAsArray<Elf_Word>(**ShndxSec);
-        if (!Data)
-          return Data.takeError();
-
-        ShndxData = *Data;
-        if (ShndxData.size() != Symbols->size())
-          return createStringError(
-              errc::invalid_argument,
-              "symbol section index table does not have the same number of "
-              "entries as the symbol table");
-      }
-      Elf_Word Index = ShndxData[&Sym - Symbols->begin()];
-      Expected<SectionBase *> Sec = Obj.sections().getSection(
-          Index,
-          "symbol '" + *Name + "' has invalid section index " + Twine(Index));
-      if (!Sec)
-        return Sec.takeError();
-
-      DefSection = *Sec;
-    } else if (Sym.st_shndx >= SHN_LORESERVE) {
-      if (!isValidReservedSectionIndex(Sym.st_shndx, Obj.Machine)) {
-        return createStringError(
-            errc::invalid_argument,
-            "symbol '" + *Name +
-                "' has unsupported value greater than or equal "
-                "to SHN_LORESERVE: " +
-                Twine(Sym.st_shndx));
-      }
-    } else if (Sym.st_shndx != SHN_UNDEF) {
-      Expected<SectionBase *> Sec = Obj.sections().getSection(
-          Sym.st_shndx, "symbol '" + *Name +
-                            "' is defined has invalid section index " +
-                            Twine(Sym.st_shndx));
-      if (!Sec)
-        return Sec.takeError();
-
-      DefSection = *Sec;
-    }
-
-    SymTab->addSymbol(*Name, Sym.getBinding(), Sym.getType(), DefSection,
-                      Sym.getValue(), Sym.st_other, Sym.st_shndx, Sym.st_size);
-  }
-
-  return Error::success();
-}
-
-template <class ELFT>
-static void getAddend(uint64_t &, const Elf_Rel_Impl<ELFT, false> &) {}
-
-template <class ELFT>
-static void getAddend(uint64_t &ToSet, const Elf_Rel_Impl<ELFT, true> &Rela) {
-  ToSet = Rela.r_addend;
-}
-
-template <class T>
-static Error initRelocations(RelocationSection *Relocs,
-                             SymbolTableSection *SymbolTable, T RelRange) {
-  for (const auto &Rel : RelRange) {
-    Relocation ToAdd;
-    ToAdd.Offset = Rel.r_offset;
-    getAddend(ToAdd.Addend, Rel);
-    ToAdd.Type = Rel.getType(false);
-
-    if (uint32_t Sym = Rel.getSymbol(false)) {
-      if (!SymbolTable)
-        return createStringError(
-            errc::invalid_argument,
-            "'" + Relocs->Name + "': relocation references symbol with index " +
-                Twine(Sym) + ", but there is no symbol table");
-      Expected<Symbol *> SymByIndex = SymbolTable->getSymbolByIndex(Sym);
-      if (!SymByIndex)
-        return SymByIndex.takeError();
-
-      ToAdd.RelocSymbol = *SymByIndex;
-    }
-
-    Relocs->addRelocation(ToAdd);
-  }
-
-  return Error::success();
-}
-
-Expected<SectionBase *> SectionTableRef::getSection(uint32_t Index,
-                                                    Twine ErrMsg) {
-  if (Index == SHN_UNDEF || Index > Sections.size())
-    return createStringError(errc::invalid_argument, ErrMsg);
-  return Sections[Index - 1].get();
-}
-
-template <class T>
-Expected<T *> SectionTableRef::getSectionOfType(uint32_t Index,
-                                                Twine IndexErrMsg,
-                                                Twine TypeErrMsg) {
-  Expected<SectionBase *> BaseSec = getSection(Index, IndexErrMsg);
-  if (!BaseSec)
-    return BaseSec.takeError();
-
-  if (T *Sec = dyn_cast<T>(*BaseSec))
-    return Sec;
-
-  return createStringError(errc::invalid_argument, TypeErrMsg);
-}
-
-template <class ELFT>
-Expected<SectionBase &> ELFBuilder<ELFT>::makeSection(const Elf_Shdr &Shdr) {
-  switch (Shdr.sh_type) {
-  case SHT_REL:
-  case SHT_RELA:
-    if (Shdr.sh_flags & SHF_ALLOC) {
-      if (Expected<ArrayRef<uint8_t>> Data = ElfFile.getSectionContents(Shdr))
-        return Obj.addSection<DynamicRelocationSection>(*Data);
-      else
-        return Data.takeError();
-    }
-    return Obj.addSection<RelocationSection>();
-  case SHT_STRTAB:
-    // If a string table is allocated we don't want to mess with it. That would
-    // mean altering the memory image. There are no special link types or
-    // anything so we can just use a Section.
-    if (Shdr.sh_flags & SHF_ALLOC) {
-      if (Expected<ArrayRef<uint8_t>> Data = ElfFile.getSectionContents(Shdr))
-        return Obj.addSection<Section>(*Data);
-      else
-        return Data.takeError();
-    }
-    return Obj.addSection<StringTableSection>();
-  case SHT_HASH:
-  case SHT_GNU_HASH:
-    // Hash tables should refer to SHT_DYNSYM which we're not going to change.
-    // Because of this we don't need to mess with the hash tables either.
-    if (Expected<ArrayRef<uint8_t>> Data = ElfFile.getSectionContents(Shdr))
-      return Obj.addSection<Section>(*Data);
-    else
-      return Data.takeError();
-  case SHT_GROUP:
-    if (Expected<ArrayRef<uint8_t>> Data = ElfFile.getSectionContents(Shdr))
-      return Obj.addSection<GroupSection>(*Data);
-    else
-      return Data.takeError();
-  case SHT_DYNSYM:
-    if (Expected<ArrayRef<uint8_t>> Data = ElfFile.getSectionContents(Shdr))
-      return Obj.addSection<DynamicSymbolTableSection>(*Data);
-    else
-      return Data.takeError();
-  case SHT_DYNAMIC:
-    if (Expected<ArrayRef<uint8_t>> Data = ElfFile.getSectionContents(Shdr))
-      return Obj.addSection<DynamicSection>(*Data);
-    else
-      return Data.takeError();
-  case SHT_SYMTAB: {
-    auto &SymTab = Obj.addSection<SymbolTableSection>();
-    Obj.SymbolTable = &SymTab;
-    return SymTab;
-  }
-  case SHT_SYMTAB_SHNDX: {
-    auto &ShndxSection = Obj.addSection<SectionIndexSection>();
-    Obj.SectionIndexTable = &ShndxSection;
-    return ShndxSection;
-  }
-  case SHT_NOBITS:
-    return Obj.addSection<Section>(ArrayRef<uint8_t>());
-  default: {
-    Expected<ArrayRef<uint8_t>> Data = ElfFile.getSectionContents(Shdr);
-    if (!Data)
-      return Data.takeError();
-
-    Expected<StringRef> Name = ElfFile.getSectionName(Shdr);
-    if (!Name)
-      return Name.takeError();
-
-    if (Name->startswith(".zdebug") || (Shdr.sh_flags & ELF::SHF_COMPRESSED)) {
-      uint64_t DecompressedSize, DecompressedAlign;
-      std::tie(DecompressedSize, DecompressedAlign) =
-          getDecompressedSizeAndAlignment<ELFT>(*Data);
-      Expected<CompressedSection> NewSection =
-          CompressedSection::create(*Data, DecompressedSize, DecompressedAlign);
-      if (!NewSection)
-        return NewSection.takeError();
-
-      return Obj.addSection<CompressedSection>(std::move(*NewSection));
-    }
-
-    return Obj.addSection<Section>(*Data);
-  }
-  }
-}
-
-template <class ELFT> Error ELFBuilder<ELFT>::readSectionHeaders() {
-  uint32_t Index = 0;
-  Expected<typename ELFFile<ELFT>::Elf_Shdr_Range> Sections =
-      ElfFile.sections();
-  if (!Sections)
-    return Sections.takeError();
-
-  for (const typename ELFFile<ELFT>::Elf_Shdr &Shdr : *Sections) {
-    if (Index == 0) {
-      ++Index;
-      continue;
-    }
-    Expected<SectionBase &> Sec = makeSection(Shdr);
-    if (!Sec)
-      return Sec.takeError();
-
-    Expected<StringRef> SecName = ElfFile.getSectionName(Shdr);
-    if (!SecName)
-      return SecName.takeError();
-    Sec->Name = SecName->str();
-    Sec->Type = Sec->OriginalType = Shdr.sh_type;
-    Sec->Flags = Sec->OriginalFlags = Shdr.sh_flags;
-    Sec->Addr = Shdr.sh_addr;
-    Sec->Offset = Shdr.sh_offset;
-    Sec->OriginalOffset = Shdr.sh_offset;
-    Sec->Size = Shdr.sh_size;
-    Sec->Link = Shdr.sh_link;
-    Sec->Info = Shdr.sh_info;
-    Sec->Align = Shdr.sh_addralign;
-    Sec->EntrySize = Shdr.sh_entsize;
-    Sec->Index = Index++;
-    Sec->OriginalIndex = Sec->Index;
-    Sec->OriginalData =
-        ArrayRef<uint8_t>(ElfFile.base() + Shdr.sh_offset,
-                          (Shdr.sh_type == SHT_NOBITS) ? (size_t)0 : Shdr.sh_size);
-  }
-
-  return Error::success();
-}
-
-template <class ELFT> Error ELFBuilder<ELFT>::readSections(bool EnsureSymtab) {
-  uint32_t ShstrIndex = ElfFile.getHeader().e_shstrndx;
-  if (ShstrIndex == SHN_XINDEX) {
-    Expected<const Elf_Shdr *> Sec = ElfFile.getSection(0);
-    if (!Sec)
-      return Sec.takeError();
-
-    ShstrIndex = (*Sec)->sh_link;
-  }
-
-  if (ShstrIndex == SHN_UNDEF)
-    Obj.HadShdrs = false;
-  else {
-    Expected<StringTableSection *> Sec =
-        Obj.sections().template getSectionOfType<StringTableSection>(
-            ShstrIndex,
-            "e_shstrndx field value " + Twine(ShstrIndex) + " in elf header " +
-                " is invalid",
-            "e_shstrndx field value " + Twine(ShstrIndex) + " in elf header " +
-                " does not reference a string table");
-    if (!Sec)
-      return Sec.takeError();
-
-    Obj.SectionNames = *Sec;
-  }
-
-  // If a section index table exists we'll need to initialize it before we
-  // initialize the symbol table because the symbol table might need to
-  // reference it.
-  if (Obj.SectionIndexTable)
-    if (Error Err = Obj.SectionIndexTable->initialize(Obj.sections()))
-      return Err;
-
-  // Now that all of the sections have been added we can fill out some extra
-  // details about symbol tables. We need the symbol table filled out before
-  // any relocations.
-  if (Obj.SymbolTable) {
-    if (Error Err = Obj.SymbolTable->initialize(Obj.sections()))
-      return Err;
-    if (Error Err = initSymbolTable(Obj.SymbolTable))
-      return Err;
-  } else if (EnsureSymtab) {
-    if (Error Err = Obj.addNewSymbolTable())
-      return Err;
-  }
-
-  // Now that all sections and symbols have been added we can add
-  // relocations that reference symbols and set the link and info fields for
-  // relocation sections.
-  for (SectionBase &Sec : Obj.sections()) {
-    if (&Sec == Obj.SymbolTable)
-      continue;
-    if (Error Err = Sec.initialize(Obj.sections()))
-      return Err;
-    if (auto RelSec = dyn_cast<RelocationSection>(&Sec)) {
-      Expected<typename ELFFile<ELFT>::Elf_Shdr_Range> Sections =
-          ElfFile.sections();
-      if (!Sections)
-        return Sections.takeError();
-
-      const typename ELFFile<ELFT>::Elf_Shdr *Shdr =
-          Sections->begin() + RelSec->Index;
-      if (RelSec->Type == SHT_REL) {
-        Expected<typename ELFFile<ELFT>::Elf_Rel_Range> Rels =
-            ElfFile.rels(*Shdr);
-        if (!Rels)
-          return Rels.takeError();
-
-        if (Error Err = initRelocations(RelSec, Obj.SymbolTable, *Rels))
-          return Err;
-      } else {
-        Expected<typename ELFFile<ELFT>::Elf_Rela_Range> Relas =
-            ElfFile.relas(*Shdr);
-        if (!Relas)
-          return Relas.takeError();
-
-        if (Error Err = initRelocations(RelSec, Obj.SymbolTable, *Relas))
-          return Err;
-      }
-    } else if (auto GroupSec = dyn_cast<GroupSection>(&Sec)) {
-      if (Error Err = initGroupSection(GroupSec))
-        return Err;
-    }
-  }
-
-  return Error::success();
-}
-
-template <class ELFT> Error ELFBuilder<ELFT>::build(bool EnsureSymtab) {
-  if (Error E = readSectionHeaders())
-    return E;
-  if (Error E = findEhdrOffset())
-    return E;
-
-  // The ELFFile whose ELF headers and program headers are copied into the
-  // output file. Normally the same as ElfFile, but if we're extracting a
-  // loadable partition it will point to the partition's headers.
-  Expected<ELFFile<ELFT>> HeadersFile = ELFFile<ELFT>::create(toStringRef(
-      {ElfFile.base() + EhdrOffset, ElfFile.getBufSize() - EhdrOffset}));
-  if (!HeadersFile)
-    return HeadersFile.takeError();
-
-  const typename ELFFile<ELFT>::Elf_Ehdr &Ehdr = HeadersFile->getHeader();
-  Obj.OSABI = Ehdr.e_ident[EI_OSABI];
-  Obj.ABIVersion = Ehdr.e_ident[EI_ABIVERSION];
-  Obj.Type = Ehdr.e_type;
-  Obj.Machine = Ehdr.e_machine;
-  Obj.Version = Ehdr.e_version;
-  Obj.Entry = Ehdr.e_entry;
-  Obj.Flags = Ehdr.e_flags;
-
-  if (Error E = readSections(EnsureSymtab))
-    return E;
-  return readProgramHeaders(*HeadersFile);
-}
-
-Writer::~Writer() {}
-
-Reader::~Reader() {}
-
-Expected<std::unique_ptr<Object>>
-BinaryReader::create(bool /*EnsureSymtab*/) const {
-  return BinaryELFBuilder(MemBuf, NewSymbolVisibility).build();
-}
-
-Expected<std::vector<IHexRecord>> IHexReader::parse() const {
-  SmallVector<StringRef, 16> Lines;
-  std::vector<IHexRecord> Records;
-  bool HasSections = false;
-
-  MemBuf->getBuffer().split(Lines, '\n');
-  Records.reserve(Lines.size());
-  for (size_t LineNo = 1; LineNo <= Lines.size(); ++LineNo) {
-    StringRef Line = Lines[LineNo - 1].trim();
-    if (Line.empty())
-      continue;
-
-    Expected<IHexRecord> R = IHexRecord::parse(Line);
-    if (!R)
-      return parseError(LineNo, R.takeError());
-    if (R->Type == IHexRecord::EndOfFile)
-      break;
-    HasSections |= (R->Type == IHexRecord::Data);
-    Records.push_back(*R);
-  }
-  if (!HasSections)
-    return parseError(-1U, "no sections");
-
-  return std::move(Records);
-}
-
-Expected<std::unique_ptr<Object>>
-IHexReader::create(bool /*EnsureSymtab*/) const {
-  Expected<std::vector<IHexRecord>> Records = parse();
-  if (!Records)
-    return Records.takeError();
-
-  return IHexELFBuilder(*Records).build();
-}
-
-Expected<std::unique_ptr<Object>> ELFReader::create(bool EnsureSymtab) const {
-  auto Obj = std::make_unique<Object>();
-  if (auto *O = dyn_cast<ELFObjectFile<ELF32LE>>(Bin)) {
-    ELFBuilder<ELF32LE> Builder(*O, *Obj, ExtractPartition);
-    if (Error Err = Builder.build(EnsureSymtab))
-      return std::move(Err);
-    return std::move(Obj);
-  } else if (auto *O = dyn_cast<ELFObjectFile<ELF64LE>>(Bin)) {
-    ELFBuilder<ELF64LE> Builder(*O, *Obj, ExtractPartition);
-    if (Error Err = Builder.build(EnsureSymtab))
-      return std::move(Err);
-    return std::move(Obj);
-  } else if (auto *O = dyn_cast<ELFObjectFile<ELF32BE>>(Bin)) {
-    ELFBuilder<ELF32BE> Builder(*O, *Obj, ExtractPartition);
-    if (Error Err = Builder.build(EnsureSymtab))
-      return std::move(Err);
-    return std::move(Obj);
-  } else if (auto *O = dyn_cast<ELFObjectFile<ELF64BE>>(Bin)) {
-    ELFBuilder<ELF64BE> Builder(*O, *Obj, ExtractPartition);
-    if (Error Err = Builder.build(EnsureSymtab))
-      return std::move(Err);
-    return std::move(Obj);
-  }
-  return createStringError(errc::invalid_argument, "invalid file type");
-}
-
-template <class ELFT> void ELFWriter<ELFT>::writeEhdr() {
-  Elf_Ehdr &Ehdr = *reinterpret_cast<Elf_Ehdr *>(Buf->getBufferStart());
-  std::fill(Ehdr.e_ident, Ehdr.e_ident + 16, 0);
-  Ehdr.e_ident[EI_MAG0] = 0x7f;
-  Ehdr.e_ident[EI_MAG1] = 'E';
-  Ehdr.e_ident[EI_MAG2] = 'L';
-  Ehdr.e_ident[EI_MAG3] = 'F';
-  Ehdr.e_ident[EI_CLASS] = ELFT::Is64Bits ? ELFCLASS64 : ELFCLASS32;
-  Ehdr.e_ident[EI_DATA] =
-      ELFT::TargetEndianness == support::big ? ELFDATA2MSB : ELFDATA2LSB;
-  Ehdr.e_ident[EI_VERSION] = EV_CURRENT;
-  Ehdr.e_ident[EI_OSABI] = Obj.OSABI;
-  Ehdr.e_ident[EI_ABIVERSION] = Obj.ABIVersion;
-
-  Ehdr.e_type = Obj.Type;
-  Ehdr.e_machine = Obj.Machine;
-  Ehdr.e_version = Obj.Version;
-  Ehdr.e_entry = Obj.Entry;
-  // We have to use the fully-qualified name llvm::size
-  // since some compilers complain on ambiguous resolution.
-  Ehdr.e_phnum = llvm::size(Obj.segments());
-  Ehdr.e_phoff = (Ehdr.e_phnum != 0) ? Obj.ProgramHdrSegment.Offset : 0;
-  Ehdr.e_phentsize = (Ehdr.e_phnum != 0) ? sizeof(Elf_Phdr) : 0;
-  Ehdr.e_flags = Obj.Flags;
-  Ehdr.e_ehsize = sizeof(Elf_Ehdr);
-  if (WriteSectionHeaders && Obj.sections().size() != 0) {
-    Ehdr.e_shentsize = sizeof(Elf_Shdr);
-    Ehdr.e_shoff = Obj.SHOff;
-    // """
-    // If the number of sections is greater than or equal to
-    // SHN_LORESERVE (0xff00), this member has the value zero and the actual
-    // number of section header table entries is contained in the sh_size field
-    // of the section header at index 0.
-    // """
-    auto Shnum = Obj.sections().size() + 1;
-    if (Shnum >= SHN_LORESERVE)
-      Ehdr.e_shnum = 0;
-    else
-      Ehdr.e_shnum = Shnum;
-    // """
-    // If the section name string table section index is greater than or equal
-    // to SHN_LORESERVE (0xff00), this member has the value SHN_XINDEX (0xffff)
-    // and the actual index of the section name string table section is
-    // contained in the sh_link field of the section header at index 0.
-    // """
-    if (Obj.SectionNames->Index >= SHN_LORESERVE)
-      Ehdr.e_shstrndx = SHN_XINDEX;
-    else
-      Ehdr.e_shstrndx = Obj.SectionNames->Index;
-  } else {
-    Ehdr.e_shentsize = 0;
-    Ehdr.e_shoff = 0;
-    Ehdr.e_shnum = 0;
-    Ehdr.e_shstrndx = 0;
-  }
-}
-
-template <class ELFT> void ELFWriter<ELFT>::writePhdrs() {
-  for (auto &Seg : Obj.segments())
-    writePhdr(Seg);
-}
-
-template <class ELFT> void ELFWriter<ELFT>::writeShdrs() {
-  // This reference serves to write the dummy section header at the begining
-  // of the file. It is not used for anything else
-  Elf_Shdr &Shdr =
-      *reinterpret_cast<Elf_Shdr *>(Buf->getBufferStart() + Obj.SHOff);
-  Shdr.sh_name = 0;
-  Shdr.sh_type = SHT_NULL;
-  Shdr.sh_flags = 0;
-  Shdr.sh_addr = 0;
-  Shdr.sh_offset = 0;
-  // See writeEhdr for why we do this.
-  uint64_t Shnum = Obj.sections().size() + 1;
-  if (Shnum >= SHN_LORESERVE)
-    Shdr.sh_size = Shnum;
-  else
-    Shdr.sh_size = 0;
-  // See writeEhdr for why we do this.
-  if (Obj.SectionNames != nullptr && Obj.SectionNames->Index >= SHN_LORESERVE)
-    Shdr.sh_link = Obj.SectionNames->Index;
-  else
-    Shdr.sh_link = 0;
-  Shdr.sh_info = 0;
-  Shdr.sh_addralign = 0;
-  Shdr.sh_entsize = 0;
-
-  for (SectionBase &Sec : Obj.sections())
-    writeShdr(Sec);
-}
-
-template <class ELFT> Error ELFWriter<ELFT>::writeSectionData() {
-  for (SectionBase &Sec : Obj.sections())
-    // Segments are responsible for writing their contents, so only write the
-    // section data if the section is not in a segment. Note that this renders
-    // sections in segments effectively immutable.
-    if (Sec.ParentSegment == nullptr)
-      if (Error Err = Sec.accept(*SecWriter))
-        return Err;
-
-  return Error::success();
-}
-
-template <class ELFT> void ELFWriter<ELFT>::writeSegmentData() {
-  for (Segment &Seg : Obj.segments()) {
-    size_t Size = std::min<size_t>(Seg.FileSize, Seg.getContents().size());
-    std::memcpy(Buf->getBufferStart() + Seg.Offset, Seg.getContents().data(),
-                Size);
-  }
-
-  // Iterate over removed sections and overwrite their old data with zeroes.
-  for (auto &Sec : Obj.removedSections()) {
-    Segment *Parent = Sec.ParentSegment;
-    if (Parent == nullptr || Sec.Type == SHT_NOBITS || Sec.Size == 0)
-      continue;
-    uint64_t Offset =
-        Sec.OriginalOffset - Parent->OriginalOffset + Parent->Offset;
-    std::memset(Buf->getBufferStart() + Offset, 0, Sec.Size);
-  }
-}
-
-template <class ELFT>
-ELFWriter<ELFT>::ELFWriter(Object &Obj, raw_ostream &Buf, bool WSH,
-                           bool OnlyKeepDebug)
-    : Writer(Obj, Buf), WriteSectionHeaders(WSH && Obj.HadShdrs),
-      OnlyKeepDebug(OnlyKeepDebug) {}
-
-Error Object::removeSections(
-    bool AllowBrokenLinks, std::function<bool(const SectionBase &)> ToRemove) {
-
-  auto Iter = std::stable_partition(
-      std::begin(Sections), std::end(Sections), [=](const SecPtr &Sec) {
-        if (ToRemove(*Sec))
-          return false;
-        if (auto RelSec = dyn_cast<RelocationSectionBase>(Sec.get())) {
-          if (auto ToRelSec = RelSec->getSection())
-            return !ToRemove(*ToRelSec);
-        }
-        return true;
-      });
-  if (SymbolTable != nullptr && ToRemove(*SymbolTable))
-    SymbolTable = nullptr;
-  if (SectionNames != nullptr && ToRemove(*SectionNames))
-    SectionNames = nullptr;
-  if (SectionIndexTable != nullptr && ToRemove(*SectionIndexTable))
-    SectionIndexTable = nullptr;
-  // Now make sure there are no remaining references to the sections that will
-  // be removed. Sometimes it is impossible to remove a reference so we emit
-  // an error here instead.
-  std::unordered_set<const SectionBase *> RemoveSections;
-  RemoveSections.reserve(std::distance(Iter, std::end(Sections)));
-  for (auto &RemoveSec : make_range(Iter, std::end(Sections))) {
-    for (auto &Segment : Segments)
-      Segment->removeSection(RemoveSec.get());
-    RemoveSec->onRemove();
-    RemoveSections.insert(RemoveSec.get());
-  }
-
-  // For each section that remains alive, we want to remove the dead references.
-  // This either might update the content of the section (e.g. remove symbols
-  // from symbol table that belongs to removed section) or trigger an error if
-  // a live section critically depends on a section being removed somehow
-  // (e.g. the removed section is referenced by a relocation).
-  for (auto &KeepSec : make_range(std::begin(Sections), Iter)) {
-    if (Error E = KeepSec->removeSectionReferences(
-            AllowBrokenLinks, [&RemoveSections](const SectionBase *Sec) {
-              return RemoveSections.find(Sec) != RemoveSections.end();
-            }))
-      return E;
-  }
-
-  // Transfer removed sections into the Object RemovedSections container for use
-  // later.
-  std::move(Iter, Sections.end(), std::back_inserter(RemovedSections));
-  // Now finally get rid of them all together.
-  Sections.erase(Iter, std::end(Sections));
-  return Error::success();
-}
-
-Error Object::removeSymbols(function_ref<bool(const Symbol &)> ToRemove) {
-  if (SymbolTable)
-    for (const SecPtr &Sec : Sections)
-      if (Error E = Sec->removeSymbols(ToRemove))
-        return E;
-  return Error::success();
-}
-
-Error Object::addNewSymbolTable() {
-  assert(!SymbolTable && "Object must not has a SymbolTable.");
-
-  // Reuse an existing SHT_STRTAB section if it exists.
-  StringTableSection *StrTab = nullptr;
-  for (SectionBase &Sec : sections()) {
-    if (Sec.Type == ELF::SHT_STRTAB && !(Sec.Flags & SHF_ALLOC)) {
-      StrTab = static_cast<StringTableSection *>(&Sec);
-
-      // Prefer a string table that is not the section header string table, if
-      // such a table exists.
-      if (SectionNames != &Sec)
-        break;
-    }
-  }
-  if (!StrTab)
-    StrTab = &addSection<StringTableSection>();
-
-  SymbolTableSection &SymTab = addSection<SymbolTableSection>();
-  SymTab.Name = ".symtab";
-  SymTab.Link = StrTab->Index;
-  if (Error Err = SymTab.initialize(sections()))
-    return Err;
-  SymTab.addSymbol("", 0, 0, nullptr, 0, 0, 0, 0);
-
-  SymbolTable = &SymTab;
-
-  return Error::success();
-}
-
-void Object::sortSections() {
-  // Use stable_sort to maintain the original ordering as closely as possible.
-  llvm::stable_sort(Sections, [](const SecPtr &A, const SecPtr &B) {
-    // Put SHT_GROUP sections first, since group section headers must come
-    // before the sections they contain. This also matches what GNU objcopy
-    // does.
-    if (A->Type != B->Type &&
-        (A->Type == ELF::SHT_GROUP || B->Type == ELF::SHT_GROUP))
-      return A->Type == ELF::SHT_GROUP;
-    // For all other sections, sort by offset order.
-    return A->OriginalOffset < B->OriginalOffset;
-  });
-}
-
-// Orders segments such that if x = y->ParentSegment then y comes before x.
-static void orderSegments(std::vector<Segment *> &Segments) {
-  llvm::stable_sort(Segments, compareSegmentsByOffset);
-}
-
-// This function finds a consistent layout for a list of segments starting from
-// an Offset. It assumes that Segments have been sorted by orderSegments and
-// returns an Offset one past the end of the last segment.
-static uint64_t layoutSegments(std::vector<Segment *> &Segments,
-                               uint64_t Offset) {
-  assert(llvm::is_sorted(Segments, compareSegmentsByOffset));
-  // The only way a segment should move is if a section was between two
-  // segments and that section was removed. If that section isn't in a segment
-  // then it's acceptable, but not ideal, to simply move it to after the
-  // segments. So we can simply layout segments one after the other accounting
-  // for alignment.
-  for (Segment *Seg : Segments) {
-    // We assume that segments have been ordered by OriginalOffset and Index
-    // such that a parent segment will always come before a child segment in
-    // OrderedSegments. This means that the Offset of the ParentSegment should
-    // already be set and we can set our offset relative to it.
-    if (Seg->ParentSegment != nullptr) {
-      Segment *Parent = Seg->ParentSegment;
-      Seg->Offset =
-          Parent->Offset + Seg->OriginalOffset - Parent->OriginalOffset;
-    } else {
-      Seg->Offset =
-          alignTo(Offset, std::max<uint64_t>(Seg->Align, 1), Seg->VAddr);
-    }
-    Offset = std::max(Offset, Seg->Offset + Seg->FileSize);
-  }
-  return Offset;
-}
-
-// This function finds a consistent layout for a list of sections. It assumes
-// that the ->ParentSegment of each section has already been laid out. The
-// supplied starting Offset is used for the starting offset of any section that
-// does not have a ParentSegment. It returns either the offset given if all
-// sections had a ParentSegment or an offset one past the last section if there
-// was a section that didn't have a ParentSegment.
-template <class Range>
-static uint64_t layoutSections(Range Sections, uint64_t Offset) {
-  // Now the offset of every segment has been set we can assign the offsets
-  // of each section. For sections that are covered by a segment we should use
-  // the segment's original offset and the section's original offset to compute
-  // the offset from the start of the segment. Using the offset from the start
-  // of the segment we can assign a new offset to the section. For sections not
-  // covered by segments we can just bump Offset to the next valid location.
-  uint32_t Index = 1;
-  for (auto &Sec : Sections) {
-    Sec.Index = Index++;
-    if (Sec.ParentSegment != nullptr) {
-      auto Segment = *Sec.ParentSegment;
-      Sec.Offset =
-          Segment.Offset + (Sec.OriginalOffset - Segment.OriginalOffset);
-    } else {
-      Offset = alignTo(Offset, Sec.Align == 0 ? 1 : Sec.Align);
-      Sec.Offset = Offset;
-      if (Sec.Type != SHT_NOBITS)
-        Offset += Sec.Size;
-    }
-  }
-  return Offset;
-}
-
-// Rewrite sh_offset after some sections are changed to SHT_NOBITS and thus
-// occupy no space in the file.
-static uint64_t layoutSectionsForOnlyKeepDebug(Object &Obj, uint64_t Off) {
-  uint32_t Index = 1;
-  for (auto &Sec : Obj.sections()) {
-    Sec.Index = Index++;
-
-    auto *FirstSec = Sec.ParentSegment && Sec.ParentSegment->Type == PT_LOAD
-                         ? Sec.ParentSegment->firstSection()
-                         : nullptr;
-
-    // The first section in a PT_LOAD has to have congruent offset and address
-    // modulo the alignment, which usually equals the maximum page size.
-    if (FirstSec && FirstSec == &Sec)
-      Off = alignTo(Off, Sec.ParentSegment->Align, Sec.Addr);
-
-    // sh_offset is not significant for SHT_NOBITS sections, but the congruence
-    // rule must be followed if it is the first section in a PT_LOAD. Do not
-    // advance Off.
-    if (Sec.Type == SHT_NOBITS) {
-      Sec.Offset = Off;
-      continue;
-    }
-
-    if (!FirstSec) {
-      // FirstSec being nullptr generally means that Sec does not have the
-      // SHF_ALLOC flag.
-      Off = Sec.Align ? alignTo(Off, Sec.Align) : Off;
-    } else if (FirstSec != &Sec) {
-      // The offset is relative to the first section in the PT_LOAD segment. Use
-      // sh_offset for non-SHF_ALLOC sections.
-      Off = Sec.OriginalOffset - FirstSec->OriginalOffset + FirstSec->Offset;
-    }
-    Sec.Offset = Off;
-    Off += Sec.Size;
-  }
-  return Off;
-}
-
-// Rewrite p_offset and p_filesz of non-PT_PHDR segments after sh_offset values
-// have been updated.
-static uint64_t layoutSegmentsForOnlyKeepDebug(std::vector<Segment *> &Segments,
-                                               uint64_t HdrEnd) {
-  uint64_t MaxOffset = 0;
-  for (Segment *Seg : Segments) {
-    if (Seg->Type == PT_PHDR)
-      continue;
-
-    // The segment offset is generally the offset of the first section.
-    //
-    // For a segment containing no section (see sectionWithinSegment), if it has
-    // a parent segment, copy the parent segment's offset field. This works for
-    // empty PT_TLS. If no parent segment, use 0: the segment is not useful for
-    // debugging anyway.
-    const SectionBase *FirstSec = Seg->firstSection();
-    uint64_t Offset =
-        FirstSec ? FirstSec->Offset
-                 : (Seg->ParentSegment ? Seg->ParentSegment->Offset : 0);
-    uint64_t FileSize = 0;
-    for (const SectionBase *Sec : Seg->Sections) {
-      uint64_t Size = Sec->Type == SHT_NOBITS ? 0 : Sec->Size;
-      if (Sec->Offset + Size > Offset)
-        FileSize = std::max(FileSize, Sec->Offset + Size - Offset);
-    }
-
-    // If the segment includes EHDR and program headers, don't make it smaller
-    // than the headers.
-    if (Seg->Offset < HdrEnd && HdrEnd <= Seg->Offset + Seg->FileSize) {
-      FileSize += Offset - Seg->Offset;
-      Offset = Seg->Offset;
-      FileSize = std::max(FileSize, HdrEnd - Offset);
-    }
-
-    Seg->Offset = Offset;
-    Seg->FileSize = FileSize;
-    MaxOffset = std::max(MaxOffset, Offset + FileSize);
-  }
-  return MaxOffset;
-}
-
-template <class ELFT> void ELFWriter<ELFT>::initEhdrSegment() {
-  Segment &ElfHdr = Obj.ElfHdrSegment;
-  ElfHdr.Type = PT_PHDR;
-  ElfHdr.Flags = 0;
-  ElfHdr.VAddr = 0;
-  ElfHdr.PAddr = 0;
-  ElfHdr.FileSize = ElfHdr.MemSize = sizeof(Elf_Ehdr);
-  ElfHdr.Align = 0;
-}
-
-template <class ELFT> void ELFWriter<ELFT>::assignOffsets() {
-  // We need a temporary list of segments that has a special order to it
-  // so that we know that anytime ->ParentSegment is set that segment has
-  // already had its offset properly set.
-  std::vector<Segment *> OrderedSegments;
-  for (Segment &Segment : Obj.segments())
-    OrderedSegments.push_back(&Segment);
-  OrderedSegments.push_back(&Obj.ElfHdrSegment);
-  OrderedSegments.push_back(&Obj.ProgramHdrSegment);
-  orderSegments(OrderedSegments);
-
-  uint64_t Offset;
-  if (OnlyKeepDebug) {
-    // For --only-keep-debug, the sections that did not preserve contents were
-    // changed to SHT_NOBITS. We now rewrite sh_offset fields of sections, and
-    // then rewrite p_offset/p_filesz of program headers.
-    uint64_t HdrEnd =
-        sizeof(Elf_Ehdr) + llvm::size(Obj.segments()) * sizeof(Elf_Phdr);
-    Offset = layoutSectionsForOnlyKeepDebug(Obj, HdrEnd);
-    Offset = std::max(Offset,
-                      layoutSegmentsForOnlyKeepDebug(OrderedSegments, HdrEnd));
-  } else {
-    // Offset is used as the start offset of the first segment to be laid out.
-    // Since the ELF Header (ElfHdrSegment) must be at the start of the file,
-    // we start at offset 0.
-    Offset = layoutSegments(OrderedSegments, 0);
-    Offset = layoutSections(Obj.sections(), Offset);
-  }
-  // If we need to write the section header table out then we need to align the
-  // Offset so that SHOffset is valid.
-  if (WriteSectionHeaders)
-    Offset = alignTo(Offset, sizeof(Elf_Addr));
-  Obj.SHOff = Offset;
-}
-
-template <class ELFT> size_t ELFWriter<ELFT>::totalSize() const {
-  // We already have the section header offset so we can calculate the total
-  // size by just adding up the size of each section header.
-  if (!WriteSectionHeaders)
-    return Obj.SHOff;
-  size_t ShdrCount = Obj.sections().size() + 1; // Includes null shdr.
-  return Obj.SHOff + ShdrCount * sizeof(Elf_Shdr);
-}
-
-template <class ELFT> Error ELFWriter<ELFT>::write() {
-  // Segment data must be written first, so that the ELF header and program
-  // header tables can overwrite it, if covered by a segment.
-  writeSegmentData();
-  writeEhdr();
-  writePhdrs();
-  if (Error E = writeSectionData())
-    return E;
-  if (WriteSectionHeaders)
-    writeShdrs();
-
-  // TODO: Implement direct writing to the output stream (without intermediate
-  // memory buffer Buf).
-  Out.write(Buf->getBufferStart(), Buf->getBufferSize());
-  return Error::success();
-}
-
-static Error removeUnneededSections(Object &Obj) {
-  // We can remove an empty symbol table from non-relocatable objects.
-  // Relocatable objects typically have relocation sections whose
-  // sh_link field points to .symtab, so we can't remove .symtab
-  // even if it is empty.
-  if (Obj.isRelocatable() || Obj.SymbolTable == nullptr ||
-      !Obj.SymbolTable->empty())
-    return Error::success();
-
-  // .strtab can be used for section names. In such a case we shouldn't
-  // remove it.
-  auto *StrTab = Obj.SymbolTable->getStrTab() == Obj.SectionNames
-                     ? nullptr
-                     : Obj.SymbolTable->getStrTab();
-  return Obj.removeSections(false, [&](const SectionBase &Sec) {
-    return &Sec == Obj.SymbolTable || &Sec == StrTab;
-  });
-}
-
-template <class ELFT> Error ELFWriter<ELFT>::finalize() {
-  // It could happen that SectionNames has been removed and yet the user wants
-  // a section header table output. We need to throw an error if a user tries
-  // to do that.
-  if (Obj.SectionNames == nullptr && WriteSectionHeaders)
-    return createStringError(llvm::errc::invalid_argument,
-                             "cannot write section header table because "
-                             "section header string table was removed");
-
-  if (Error E = removeUnneededSections(Obj))
-    return E;
-  Obj.sortSections();
-
-  // We need to assign indexes before we perform layout because we need to know
-  // if we need large indexes or not. We can assign indexes first and check as
-  // we go to see if we will actully need large indexes.
-  bool NeedsLargeIndexes = false;
-  if (Obj.sections().size() >= SHN_LORESERVE) {
-    SectionTableRef Sections = Obj.sections();
-    // Sections doesn't include the null section header, so account for this
-    // when skipping the first N sections.
-    NeedsLargeIndexes =
-        any_of(drop_begin(Sections, SHN_LORESERVE - 1),
-               [](const SectionBase &Sec) { return Sec.HasSymbol; });
-    // TODO: handle case where only one section needs the large index table but
-    // only needs it because the large index table hasn't been removed yet.
-  }
-
-  if (NeedsLargeIndexes) {
-    // This means we definitely need to have a section index table but if we
-    // already have one then we should use it instead of making a new one.
-    if (Obj.SymbolTable != nullptr && Obj.SectionIndexTable == nullptr) {
-      // Addition of a section to the end does not invalidate the indexes of
-      // other sections and assigns the correct index to the new section.
-      auto &Shndx = Obj.addSection<SectionIndexSection>();
-      Obj.SymbolTable->setShndxTable(&Shndx);
-      Shndx.setSymTab(Obj.SymbolTable);
-    }
-  } else {
-    // Since we don't need SectionIndexTable we should remove it and all
-    // references to it.
-    if (Obj.SectionIndexTable != nullptr) {
-      // We do not support sections referring to the section index table.
-      if (Error E = Obj.removeSections(false /*AllowBrokenLinks*/,
-                                       [this](const SectionBase &Sec) {
-                                         return &Sec == Obj.SectionIndexTable;
-                                       }))
-        return E;
-    }
-  }
-
-  // Make sure we add the names of all the sections. Importantly this must be
-  // done after we decide to add or remove SectionIndexes.
-  if (Obj.SectionNames != nullptr)
-    for (const SectionBase &Sec : Obj.sections())
-      Obj.SectionNames->addString(Sec.Name);
-
-  initEhdrSegment();
-
-  // Before we can prepare for layout the indexes need to be finalized.
-  // Also, the output arch may not be the same as the input arch, so fix up
-  // size-related fields before doing layout calculations.
-  uint64_t Index = 0;
-  auto SecSizer = std::make_unique<ELFSectionSizer<ELFT>>();
-  for (SectionBase &Sec : Obj.sections()) {
-    Sec.Index = Index++;
-    if (Error Err = Sec.accept(*SecSizer))
-      return Err;
-  }
-
-  // The symbol table does not update all other sections on update. For
-  // instance, symbol names are not added as new symbols are added. This means
-  // that some sections, like .strtab, don't yet have their final size.
-  if (Obj.SymbolTable != nullptr)
-    Obj.SymbolTable->prepareForLayout();
-
-  // Now that all strings are added we want to finalize string table builders,
-  // because that affects section sizes which in turn affects section offsets.
-  for (SectionBase &Sec : Obj.sections())
-    if (auto StrTab = dyn_cast<StringTableSection>(&Sec))
-      StrTab->prepareForLayout();
-
-  assignOffsets();
-
-  // layoutSections could have modified section indexes, so we need
-  // to fill the index table after assignOffsets.
-  if (Obj.SymbolTable != nullptr)
-    Obj.SymbolTable->fillShndxTable();
-
-  // Finally now that all offsets and indexes have been set we can finalize any
-  // remaining issues.
-  uint64_t Offset = Obj.SHOff + sizeof(Elf_Shdr);
-  for (SectionBase &Sec : Obj.sections()) {
-    Sec.HeaderOffset = Offset;
-    Offset += sizeof(Elf_Shdr);
-    if (WriteSectionHeaders)
-      Sec.NameIndex = Obj.SectionNames->findIndex(Sec.Name);
-    Sec.finalize();
-  }
-
-  size_t TotalSize = totalSize();
-  Buf = WritableMemoryBuffer::getNewMemBuffer(TotalSize);
-  if (!Buf)
-    return createStringError(errc::not_enough_memory,
-                             "failed to allocate memory buffer of " +
-                                 Twine::utohexstr(TotalSize) + " bytes");
-
-  SecWriter = std::make_unique<ELFSectionWriter<ELFT>>(*Buf);
-  return Error::success();
-}
-
-Error BinaryWriter::write() {
-  for (const SectionBase &Sec : Obj.allocSections())
-    if (Error Err = Sec.accept(*SecWriter))
-      return Err;
-
-  // TODO: Implement direct writing to the output stream (without intermediate
-  // memory buffer Buf).
-  Out.write(Buf->getBufferStart(), Buf->getBufferSize());
-  return Error::success();
-}
-
-Error BinaryWriter::finalize() {
-  // Compute the section LMA based on its sh_offset and the containing segment's
-  // p_offset and p_paddr. Also compute the minimum LMA of all non-empty
-  // sections as MinAddr. In the output, the contents between address 0 and
-  // MinAddr will be skipped.
-  uint64_t MinAddr = UINT64_MAX;
-  for (SectionBase &Sec : Obj.allocSections()) {
-    if (Sec.ParentSegment != nullptr)
-      Sec.Addr =
-          Sec.Offset - Sec.ParentSegment->Offset + Sec.ParentSegment->PAddr;
-    if (Sec.Type != SHT_NOBITS && Sec.Size > 0)
-      MinAddr = std::min(MinAddr, Sec.Addr);
-  }
-
-  // Now that every section has been laid out we just need to compute the total
-  // file size. This might not be the same as the offset returned by
-  // layoutSections, because we want to truncate the last segment to the end of
-  // its last non-empty section, to match GNU objcopy's behaviour.
-  TotalSize = 0;
-  for (SectionBase &Sec : Obj.allocSections())
-    if (Sec.Type != SHT_NOBITS && Sec.Size > 0) {
-      Sec.Offset = Sec.Addr - MinAddr;
-      TotalSize = std::max(TotalSize, Sec.Offset + Sec.Size);
-    }
-
-  Buf = WritableMemoryBuffer::getNewMemBuffer(TotalSize);
-  if (!Buf)
-    return createStringError(errc::not_enough_memory,
-                             "failed to allocate memory buffer of " +
-                                 Twine::utohexstr(TotalSize) + " bytes");
-  SecWriter = std::make_unique<BinarySectionWriter>(*Buf);
-  return Error::success();
-}
-
-bool IHexWriter::SectionCompare::operator()(const SectionBase *Lhs,
-                                            const SectionBase *Rhs) const {
-  return (sectionPhysicalAddr(Lhs) & 0xFFFFFFFFU) <
-         (sectionPhysicalAddr(Rhs) & 0xFFFFFFFFU);
-}
-
-uint64_t IHexWriter::writeEntryPointRecord(uint8_t *Buf) {
-  IHexLineData HexData;
-  uint8_t Data[4] = {};
-  // We don't write entry point record if entry is zero.
-  if (Obj.Entry == 0)
-    return 0;
-
-  if (Obj.Entry <= 0xFFFFFU) {
-    Data[0] = ((Obj.Entry & 0xF0000U) >> 12) & 0xFF;
-    support::endian::write(&Data[2], static_cast<uint16_t>(Obj.Entry),
-                           support::big);
-    HexData = IHexRecord::getLine(IHexRecord::StartAddr80x86, 0, Data);
-  } else {
-    support::endian::write(Data, static_cast<uint32_t>(Obj.Entry),
-                           support::big);
-    HexData = IHexRecord::getLine(IHexRecord::StartAddr, 0, Data);
-  }
-  memcpy(Buf, HexData.data(), HexData.size());
-  return HexData.size();
-}
-
-uint64_t IHexWriter::writeEndOfFileRecord(uint8_t *Buf) {
-  IHexLineData HexData = IHexRecord::getLine(IHexRecord::EndOfFile, 0, {});
-  memcpy(Buf, HexData.data(), HexData.size());
-  return HexData.size();
-}
-
-Error IHexWriter::write() {
-  IHexSectionWriter Writer(*Buf);
-  // Write sections.
-  for (const SectionBase *Sec : Sections)
-    if (Error Err = Sec->accept(Writer))
-      return Err;
-
-  uint64_t Offset = Writer.getBufferOffset();
-  // Write entry point address.
-  Offset += writeEntryPointRecord(
-      reinterpret_cast<uint8_t *>(Buf->getBufferStart()) + Offset);
-  // Write EOF.
-  Offset += writeEndOfFileRecord(
-      reinterpret_cast<uint8_t *>(Buf->getBufferStart()) + Offset);
-  assert(Offset == TotalSize);
-
-  // TODO: Implement direct writing to the output stream (without intermediate
-  // memory buffer Buf).
-  Out.write(Buf->getBufferStart(), Buf->getBufferSize());
-  return Error::success();
-}
-
-Error IHexWriter::checkSection(const SectionBase &Sec) {
-  uint64_t Addr = sectionPhysicalAddr(&Sec);
-  if (addressOverflows32bit(Addr) || addressOverflows32bit(Addr + Sec.Size - 1))
-    return createStringError(
-        errc::invalid_argument,
-        "Section '%s' address range [0x%llx, 0x%llx] is not 32 bit",
-        Sec.Name.c_str(), Addr, Addr + Sec.Size - 1);
-  return Error::success();
-}
-
-Error IHexWriter::finalize() {
-  // We can't write 64-bit addresses.
-  if (addressOverflows32bit(Obj.Entry))
-    return createStringError(errc::invalid_argument,
-                             "Entry point address 0x%llx overflows 32 bits",
-                             Obj.Entry);
-
-  for (const SectionBase &Sec : Obj.sections())
-    if ((Sec.Flags & ELF::SHF_ALLOC) && Sec.Type != ELF::SHT_NOBITS &&
-        Sec.Size > 0) {
-      if (Error E = checkSection(Sec))
-        return E;
-      Sections.insert(&Sec);
-    }
-
-  std::unique_ptr<WritableMemoryBuffer> EmptyBuffer =
-      WritableMemoryBuffer::getNewMemBuffer(0);
-  if (!EmptyBuffer)
-    return createStringError(errc::not_enough_memory,
-                             "failed to allocate memory buffer of 0 bytes");
-
-  IHexSectionWriterBase LengthCalc(*EmptyBuffer);
-  for (const SectionBase *Sec : Sections)
-    if (Error Err = Sec->accept(LengthCalc))
-      return Err;
-
-  // We need space to write section records + StartAddress record
-  // (if start adress is not zero) + EndOfFile record.
-  TotalSize = LengthCalc.getBufferOffset() +
-              (Obj.Entry ? IHexRecord::getLineLength(4) : 0) +
-              IHexRecord::getLineLength(0);
-
-  Buf = WritableMemoryBuffer::getNewMemBuffer(TotalSize);
-  if (!Buf)
-    return createStringError(errc::not_enough_memory,
-                             "failed to allocate memory buffer of " +
-                                 Twine::utohexstr(TotalSize) + " bytes");
-
-  return Error::success();
-}
-
-namespace llvm {
-namespace objcopy {
-namespace elf {
-
-template class ELFBuilder<ELF64LE>;
-template class ELFBuilder<ELF64BE>;
-template class ELFBuilder<ELF32LE>;
-template class ELFBuilder<ELF32BE>;
-
-template class ELFWriter<ELF64LE>;
-template class ELFWriter<ELF64BE>;
-template class ELFWriter<ELF32LE>;
-template class ELFWriter<ELF32BE>;
-
-} // end namespace elf
-} // end namespace objcopy
-} // end namespace llvm
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/ELF/Object.h b/gnu/llvm/llvm/tools/llvm-objcopy/ELF/Object.h
deleted file mode 100644
index 6fd26afa3ca..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/ELF/Object.h
+++ /dev/null
@@ -1,1104 +0,0 @@
-//===- Object.h -------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_OBJCOPY_OBJECT_H
-#define LLVM_TOOLS_OBJCOPY_OBJECT_H
-
-#include "CommonConfig.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/ADT/Twine.h"
-#include "llvm/BinaryFormat/ELF.h"
-#include "llvm/MC/StringTableBuilder.h"
-#include "llvm/Object/ELFObjectFile.h"
-#include "llvm/Support/Errc.h"
-#include "llvm/Support/FileOutputBuffer.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include <cstddef>
-#include <cstdint>
-#include <functional>
-#include <memory>
-#include <set>
-#include <vector>
-
-namespace llvm {
-enum class DebugCompressionType;
-namespace objcopy {
-namespace elf {
-
-class SectionBase;
-class Section;
-class OwnedDataSection;
-class StringTableSection;
-class SymbolTableSection;
-class RelocationSection;
-class DynamicRelocationSection;
-class GnuDebugLinkSection;
-class GroupSection;
-class SectionIndexSection;
-class CompressedSection;
-class DecompressedSection;
-class Segment;
-class Object;
-struct Symbol;
-
-class SectionTableRef {
-  MutableArrayRef<std::unique_ptr<SectionBase>> Sections;
-
-public:
-  using iterator = pointee_iterator<std::unique_ptr<SectionBase> *>;
-
-  explicit SectionTableRef(MutableArrayRef<std::unique_ptr<SectionBase>> Secs)
-      : Sections(Secs) {}
-  SectionTableRef(const SectionTableRef &) = default;
-
-  iterator begin() const { return iterator(Sections.data()); }
-  iterator end() const { return iterator(Sections.data() + Sections.size()); }
-  size_t size() const { return Sections.size(); }
-
-  Expected<SectionBase *> getSection(uint32_t Index, Twine ErrMsg);
-
-  template <class T>
-  Expected<T *> getSectionOfType(uint32_t Index, Twine IndexErrMsg,
-                                 Twine TypeErrMsg);
-};
-
-enum ElfType { ELFT_ELF32LE, ELFT_ELF64LE, ELFT_ELF32BE, ELFT_ELF64BE };
-
-class SectionVisitor {
-public:
-  virtual ~SectionVisitor() = default;
-
-  virtual Error visit(const Section &Sec) = 0;
-  virtual Error visit(const OwnedDataSection &Sec) = 0;
-  virtual Error visit(const StringTableSection &Sec) = 0;
-  virtual Error visit(const SymbolTableSection &Sec) = 0;
-  virtual Error visit(const RelocationSection &Sec) = 0;
-  virtual Error visit(const DynamicRelocationSection &Sec) = 0;
-  virtual Error visit(const GnuDebugLinkSection &Sec) = 0;
-  virtual Error visit(const GroupSection &Sec) = 0;
-  virtual Error visit(const SectionIndexSection &Sec) = 0;
-  virtual Error visit(const CompressedSection &Sec) = 0;
-  virtual Error visit(const DecompressedSection &Sec) = 0;
-};
-
-class MutableSectionVisitor {
-public:
-  virtual ~MutableSectionVisitor() = default;
-
-  virtual Error visit(Section &Sec) = 0;
-  virtual Error visit(OwnedDataSection &Sec) = 0;
-  virtual Error visit(StringTableSection &Sec) = 0;
-  virtual Error visit(SymbolTableSection &Sec) = 0;
-  virtual Error visit(RelocationSection &Sec) = 0;
-  virtual Error visit(DynamicRelocationSection &Sec) = 0;
-  virtual Error visit(GnuDebugLinkSection &Sec) = 0;
-  virtual Error visit(GroupSection &Sec) = 0;
-  virtual Error visit(SectionIndexSection &Sec) = 0;
-  virtual Error visit(CompressedSection &Sec) = 0;
-  virtual Error visit(DecompressedSection &Sec) = 0;
-};
-
-class SectionWriter : public SectionVisitor {
-protected:
-  WritableMemoryBuffer &Out;
-
-public:
-  virtual ~SectionWriter() = default;
-
-  Error visit(const Section &Sec) override;
-  Error visit(const OwnedDataSection &Sec) override;
-  Error visit(const StringTableSection &Sec) override;
-  Error visit(const DynamicRelocationSection &Sec) override;
-  virtual Error visit(const SymbolTableSection &Sec) override = 0;
-  virtual Error visit(const RelocationSection &Sec) override = 0;
-  virtual Error visit(const GnuDebugLinkSection &Sec) override = 0;
-  virtual Error visit(const GroupSection &Sec) override = 0;
-  virtual Error visit(const SectionIndexSection &Sec) override = 0;
-  virtual Error visit(const CompressedSection &Sec) override = 0;
-  virtual Error visit(const DecompressedSection &Sec) override = 0;
-
-  explicit SectionWriter(WritableMemoryBuffer &Buf) : Out(Buf) {}
-};
-
-template <class ELFT> class ELFSectionWriter : public SectionWriter {
-private:
-  using Elf_Word = typename ELFT::Word;
-  using Elf_Rel = typename ELFT::Rel;
-  using Elf_Rela = typename ELFT::Rela;
-  using Elf_Sym = typename ELFT::Sym;
-
-public:
-  virtual ~ELFSectionWriter() {}
-  Error visit(const SymbolTableSection &Sec) override;
-  Error visit(const RelocationSection &Sec) override;
-  Error visit(const GnuDebugLinkSection &Sec) override;
-  Error visit(const GroupSection &Sec) override;
-  Error visit(const SectionIndexSection &Sec) override;
-  Error visit(const CompressedSection &Sec) override;
-  Error visit(const DecompressedSection &Sec) override;
-
-  explicit ELFSectionWriter(WritableMemoryBuffer &Buf) : SectionWriter(Buf) {}
-};
-
-template <class ELFT> class ELFSectionSizer : public MutableSectionVisitor {
-private:
-  using Elf_Rel = typename ELFT::Rel;
-  using Elf_Rela = typename ELFT::Rela;
-  using Elf_Sym = typename ELFT::Sym;
-  using Elf_Word = typename ELFT::Word;
-  using Elf_Xword = typename ELFT::Xword;
-
-public:
-  Error visit(Section &Sec) override;
-  Error visit(OwnedDataSection &Sec) override;
-  Error visit(StringTableSection &Sec) override;
-  Error visit(DynamicRelocationSection &Sec) override;
-  Error visit(SymbolTableSection &Sec) override;
-  Error visit(RelocationSection &Sec) override;
-  Error visit(GnuDebugLinkSection &Sec) override;
-  Error visit(GroupSection &Sec) override;
-  Error visit(SectionIndexSection &Sec) override;
-  Error visit(CompressedSection &Sec) override;
-  Error visit(DecompressedSection &Sec) override;
-};
-
-#define MAKE_SEC_WRITER_FRIEND                                                 \
-  friend class SectionWriter;                                                  \
-  friend class IHexSectionWriterBase;                                          \
-  friend class IHexSectionWriter;                                              \
-  template <class ELFT> friend class ELFSectionWriter;                         \
-  template <class ELFT> friend class ELFSectionSizer;
-
-class BinarySectionWriter : public SectionWriter {
-public:
-  virtual ~BinarySectionWriter() {}
-
-  Error visit(const SymbolTableSection &Sec) override;
-  Error visit(const RelocationSection &Sec) override;
-  Error visit(const GnuDebugLinkSection &Sec) override;
-  Error visit(const GroupSection &Sec) override;
-  Error visit(const SectionIndexSection &Sec) override;
-  Error visit(const CompressedSection &Sec) override;
-  Error visit(const DecompressedSection &Sec) override;
-
-  explicit BinarySectionWriter(WritableMemoryBuffer &Buf)
-      : SectionWriter(Buf) {}
-};
-
-using IHexLineData = SmallVector<char, 64>;
-
-struct IHexRecord {
-  // Memory address of the record.
-  uint16_t Addr;
-  // Record type (see below).
-  uint16_t Type;
-  // Record data in hexadecimal form.
-  StringRef HexData;
-
-  // Helper method to get file length of the record
-  // including newline character
-  static size_t getLength(size_t DataSize) {
-    // :LLAAAATT[DD...DD]CC'
-    return DataSize * 2 + 11;
-  }
-
-  // Gets length of line in a file (getLength + CRLF).
-  static size_t getLineLength(size_t DataSize) {
-    return getLength(DataSize) + 2;
-  }
-
-  // Given type, address and data returns line which can
-  // be written to output file.
-  static IHexLineData getLine(uint8_t Type, uint16_t Addr,
-                              ArrayRef<uint8_t> Data);
-
-  // Parses the line and returns record if possible.
-  // Line should be trimmed from whitespace characters.
-  static Expected<IHexRecord> parse(StringRef Line);
-
-  // Calculates checksum of stringified record representation
-  // S must NOT contain leading ':' and trailing whitespace
-  // characters
-  static uint8_t getChecksum(StringRef S);
-
-  enum Type {
-    // Contains data and a 16-bit starting address for the data.
-    // The byte count specifies number of data bytes in the record.
-    Data = 0,
-    // Must occur exactly once per file in the last line of the file.
-    // The data field is empty (thus byte count is 00) and the address
-    // field is typically 0000.
-    EndOfFile = 1,
-    // The data field contains a 16-bit segment base address (thus byte
-    // count is always 02) compatible with 80x86 real mode addressing.
-    // The address field (typically 0000) is ignored. The segment address
-    // from the most recent 02 record is multiplied by 16 and added to each
-    // subsequent data record address to form the physical starting address
-    // for the data. This allows addressing up to one megabyte of address
-    // space.
-    SegmentAddr = 2,
-    // or 80x86 processors, specifies the initial content of the CS:IP
-    // registers. The address field is 0000, the byte count is always 04,
-    // the first two data bytes are the CS value, the latter two are the
-    // IP value.
-    StartAddr80x86 = 3,
-    // Allows for 32 bit addressing (up to 4GiB). The record's address field
-    // is ignored (typically 0000) and its byte count is always 02. The two
-    // data bytes (big endian) specify the upper 16 bits of the 32 bit
-    // absolute address for all subsequent type 00 records
-    ExtendedAddr = 4,
-    // The address field is 0000 (not used) and the byte count is always 04.
-    // The four data bytes represent a 32-bit address value. In the case of
-    // 80386 and higher CPUs, this address is loaded into the EIP register.
-    StartAddr = 5,
-    // We have no other valid types
-    InvalidType = 6
-  };
-};
-
-// Base class for IHexSectionWriter. This class implements writing algorithm,
-// but doesn't actually write records. It is used for output buffer size
-// calculation in IHexWriter::finalize.
-class IHexSectionWriterBase : public BinarySectionWriter {
-  // 20-bit segment address
-  uint32_t SegmentAddr = 0;
-  // Extended linear address
-  uint32_t BaseAddr = 0;
-
-  // Write segment address corresponding to 'Addr'
-  uint64_t writeSegmentAddr(uint64_t Addr);
-  // Write extended linear (base) address corresponding to 'Addr'
-  uint64_t writeBaseAddr(uint64_t Addr);
-
-protected:
-  // Offset in the output buffer
-  uint64_t Offset = 0;
-
-  void writeSection(const SectionBase *Sec, ArrayRef<uint8_t> Data);
-  virtual void writeData(uint8_t Type, uint16_t Addr, ArrayRef<uint8_t> Data);
-
-public:
-  explicit IHexSectionWriterBase(WritableMemoryBuffer &Buf)
-      : BinarySectionWriter(Buf) {}
-
-  uint64_t getBufferOffset() const { return Offset; }
-  Error visit(const Section &Sec) final;
-  Error visit(const OwnedDataSection &Sec) final;
-  Error visit(const StringTableSection &Sec) override;
-  Error visit(const DynamicRelocationSection &Sec) final;
-  using BinarySectionWriter::visit;
-};
-
-// Real IHEX section writer
-class IHexSectionWriter : public IHexSectionWriterBase {
-public:
-  IHexSectionWriter(WritableMemoryBuffer &Buf) : IHexSectionWriterBase(Buf) {}
-
-  void writeData(uint8_t Type, uint16_t Addr, ArrayRef<uint8_t> Data) override;
-  Error visit(const StringTableSection &Sec) override;
-};
-
-class Writer {
-protected:
-  Object &Obj;
-  std::unique_ptr<WritableMemoryBuffer> Buf;
-  raw_ostream &Out;
-
-public:
-  virtual ~Writer();
-  virtual Error finalize() = 0;
-  virtual Error write() = 0;
-
-  Writer(Object &O, raw_ostream &Out) : Obj(O), Out(Out) {}
-};
-
-template <class ELFT> class ELFWriter : public Writer {
-private:
-  using Elf_Addr = typename ELFT::Addr;
-  using Elf_Shdr = typename ELFT::Shdr;
-  using Elf_Phdr = typename ELFT::Phdr;
-  using Elf_Ehdr = typename ELFT::Ehdr;
-
-  void initEhdrSegment();
-
-  void writeEhdr();
-  void writePhdr(const Segment &Seg);
-  void writeShdr(const SectionBase &Sec);
-
-  void writePhdrs();
-  void writeShdrs();
-  Error writeSectionData();
-  void writeSegmentData();
-
-  void assignOffsets();
-
-  std::unique_ptr<ELFSectionWriter<ELFT>> SecWriter;
-
-  size_t totalSize() const;
-
-public:
-  virtual ~ELFWriter() {}
-  bool WriteSectionHeaders;
-
-  // For --only-keep-debug, select an alternative section/segment layout
-  // algorithm.
-  bool OnlyKeepDebug;
-
-  Error finalize() override;
-  Error write() override;
-  ELFWriter(Object &Obj, raw_ostream &Out, bool WSH, bool OnlyKeepDebug);
-};
-
-class BinaryWriter : public Writer {
-private:
-  std::unique_ptr<BinarySectionWriter> SecWriter;
-
-  uint64_t TotalSize = 0;
-
-public:
-  ~BinaryWriter() {}
-  Error finalize() override;
-  Error write() override;
-  BinaryWriter(Object &Obj, raw_ostream &Out) : Writer(Obj, Out) {}
-};
-
-class IHexWriter : public Writer {
-  struct SectionCompare {
-    bool operator()(const SectionBase *Lhs, const SectionBase *Rhs) const;
-  };
-
-  std::set<const SectionBase *, SectionCompare> Sections;
-  size_t TotalSize = 0;
-
-  Error checkSection(const SectionBase &Sec);
-  uint64_t writeEntryPointRecord(uint8_t *Buf);
-  uint64_t writeEndOfFileRecord(uint8_t *Buf);
-
-public:
-  ~IHexWriter() {}
-  Error finalize() override;
-  Error write() override;
-  IHexWriter(Object &Obj, raw_ostream &Out) : Writer(Obj, Out) {}
-};
-
-class SectionBase {
-public:
-  std::string Name;
-  Segment *ParentSegment = nullptr;
-  uint64_t HeaderOffset = 0;
-  uint32_t Index = 0;
-
-  uint32_t OriginalIndex = 0;
-  uint64_t OriginalFlags = 0;
-  uint64_t OriginalType = ELF::SHT_NULL;
-  uint64_t OriginalOffset = std::numeric_limits<uint64_t>::max();
-
-  uint64_t Addr = 0;
-  uint64_t Align = 1;
-  uint32_t EntrySize = 0;
-  uint64_t Flags = 0;
-  uint64_t Info = 0;
-  uint64_t Link = ELF::SHN_UNDEF;
-  uint64_t NameIndex = 0;
-  uint64_t Offset = 0;
-  uint64_t Size = 0;
-  uint64_t Type = ELF::SHT_NULL;
-  ArrayRef<uint8_t> OriginalData;
-  bool HasSymbol = false;
-
-  SectionBase() = default;
-  SectionBase(const SectionBase &) = default;
-
-  virtual ~SectionBase() = default;
-
-  virtual Error initialize(SectionTableRef SecTable);
-  virtual void finalize();
-  // Remove references to these sections. The list of sections must be sorted.
-  virtual Error
-  removeSectionReferences(bool AllowBrokenLinks,
-                          function_ref<bool(const SectionBase *)> ToRemove);
-  virtual Error removeSymbols(function_ref<bool(const Symbol &)> ToRemove);
-  virtual Error accept(SectionVisitor &Visitor) const = 0;
-  virtual Error accept(MutableSectionVisitor &Visitor) = 0;
-  virtual void markSymbols();
-  virtual void
-  replaceSectionReferences(const DenseMap<SectionBase *, SectionBase *> &);
-  // Notify the section that it is subject to removal.
-  virtual void onRemove();
-};
-
-class Segment {
-private:
-  struct SectionCompare {
-    bool operator()(const SectionBase *Lhs, const SectionBase *Rhs) const {
-      // Some sections might have the same address if one of them is empty. To
-      // fix this we can use the lexicographic ordering on ->Addr and the
-      // original index.
-      if (Lhs->OriginalOffset == Rhs->OriginalOffset)
-        return Lhs->OriginalIndex < Rhs->OriginalIndex;
-      return Lhs->OriginalOffset < Rhs->OriginalOffset;
-    }
-  };
-
-public:
-  uint32_t Type = 0;
-  uint32_t Flags = 0;
-  uint64_t Offset = 0;
-  uint64_t VAddr = 0;
-  uint64_t PAddr = 0;
-  uint64_t FileSize = 0;
-  uint64_t MemSize = 0;
-  uint64_t Align = 0;
-
-  uint32_t Index = 0;
-  uint64_t OriginalOffset = 0;
-  Segment *ParentSegment = nullptr;
-  ArrayRef<uint8_t> Contents;
-  std::set<const SectionBase *, SectionCompare> Sections;
-
-  explicit Segment(ArrayRef<uint8_t> Data) : Contents(Data) {}
-  Segment() = default;
-
-  const SectionBase *firstSection() const {
-    if (!Sections.empty())
-      return *Sections.begin();
-    return nullptr;
-  }
-
-  void removeSection(const SectionBase *Sec) { Sections.erase(Sec); }
-  void addSection(const SectionBase *Sec) { Sections.insert(Sec); }
-
-  ArrayRef<uint8_t> getContents() const { return Contents; }
-};
-
-class Section : public SectionBase {
-  MAKE_SEC_WRITER_FRIEND
-
-  ArrayRef<uint8_t> Contents;
-  SectionBase *LinkSection = nullptr;
-
-public:
-  explicit Section(ArrayRef<uint8_t> Data) : Contents(Data) {}
-
-  Error accept(SectionVisitor &Visitor) const override;
-  Error accept(MutableSectionVisitor &Visitor) override;
-  Error removeSectionReferences(
-      bool AllowBrokenLinks,
-      function_ref<bool(const SectionBase *)> ToRemove) override;
-  Error initialize(SectionTableRef SecTable) override;
-  void finalize() override;
-};
-
-class OwnedDataSection : public SectionBase {
-  MAKE_SEC_WRITER_FRIEND
-
-  std::vector<uint8_t> Data;
-
-public:
-  OwnedDataSection(StringRef SecName, ArrayRef<uint8_t> Data)
-      : Data(std::begin(Data), std::end(Data)) {
-    Name = SecName.str();
-    Type = OriginalType = ELF::SHT_PROGBITS;
-    Size = Data.size();
-    OriginalOffset = std::numeric_limits<uint64_t>::max();
-  }
-
-  OwnedDataSection(const Twine &SecName, uint64_t SecAddr, uint64_t SecFlags,
-                   uint64_t SecOff) {
-    Name = SecName.str();
-    Type = OriginalType = ELF::SHT_PROGBITS;
-    Addr = SecAddr;
-    Flags = OriginalFlags = SecFlags;
-    OriginalOffset = SecOff;
-  }
-
-  void appendHexData(StringRef HexData);
-  Error accept(SectionVisitor &Sec) const override;
-  Error accept(MutableSectionVisitor &Visitor) override;
-};
-
-class CompressedSection : public SectionBase {
-  MAKE_SEC_WRITER_FRIEND
-
-  DebugCompressionType CompressionType;
-  uint64_t DecompressedSize;
-  uint64_t DecompressedAlign;
-  SmallVector<char, 128> CompressedData;
-
-public:
-  static Expected<CompressedSection>
-  create(const SectionBase &Sec, DebugCompressionType CompressionType);
-  static Expected<CompressedSection> create(ArrayRef<uint8_t> CompressedData,
-                                            uint64_t DecompressedSize,
-                                            uint64_t DecompressedAlign);
-
-  uint64_t getDecompressedSize() const { return DecompressedSize; }
-  uint64_t getDecompressedAlign() const { return DecompressedAlign; }
-
-  Error accept(SectionVisitor &Visitor) const override;
-  Error accept(MutableSectionVisitor &Visitor) override;
-
-  static bool classof(const SectionBase *S) {
-    return (S->OriginalFlags & ELF::SHF_COMPRESSED) ||
-           (StringRef(S->Name).startswith(".zdebug"));
-  }
-
-private:
-  CompressedSection(const SectionBase &Sec,
-                    DebugCompressionType CompressionType, Error &Err);
-  CompressedSection(ArrayRef<uint8_t> CompressedData, uint64_t DecompressedSize,
-                    uint64_t DecompressedAlign);
-};
-
-class DecompressedSection : public SectionBase {
-  MAKE_SEC_WRITER_FRIEND
-
-public:
-  explicit DecompressedSection(const CompressedSection &Sec)
-      : SectionBase(Sec) {
-    Size = Sec.getDecompressedSize();
-    Align = Sec.getDecompressedAlign();
-    Flags = OriginalFlags = (Flags & ~ELF::SHF_COMPRESSED);
-    if (StringRef(Name).startswith(".zdebug"))
-      Name = "." + Name.substr(2);
-  }
-
-  Error accept(SectionVisitor &Visitor) const override;
-  Error accept(MutableSectionVisitor &Visitor) override;
-};
-
-// There are two types of string tables that can exist, dynamic and not dynamic.
-// In the dynamic case the string table is allocated. Changing a dynamic string
-// table would mean altering virtual addresses and thus the memory image. So
-// dynamic string tables should not have an interface to modify them or
-// reconstruct them. This type lets us reconstruct a string table. To avoid
-// this class being used for dynamic string tables (which has happened) the
-// classof method checks that the particular instance is not allocated. This
-// then agrees with the makeSection method used to construct most sections.
-class StringTableSection : public SectionBase {
-  MAKE_SEC_WRITER_FRIEND
-
-  StringTableBuilder StrTabBuilder;
-
-public:
-  StringTableSection() : StrTabBuilder(StringTableBuilder::ELF) {
-    Type = OriginalType = ELF::SHT_STRTAB;
-  }
-
-  void addString(StringRef Name);
-  uint32_t findIndex(StringRef Name) const;
-  void prepareForLayout();
-  Error accept(SectionVisitor &Visitor) const override;
-  Error accept(MutableSectionVisitor &Visitor) override;
-
-  static bool classof(const SectionBase *S) {
-    if (S->OriginalFlags & ELF::SHF_ALLOC)
-      return false;
-    return S->OriginalType == ELF::SHT_STRTAB;
-  }
-};
-
-// Symbols have a st_shndx field that normally stores an index but occasionally
-// stores a different special value. This enum keeps track of what the st_shndx
-// field means. Most of the values are just copies of the special SHN_* values.
-// SYMBOL_SIMPLE_INDEX means that the st_shndx is just an index of a section.
-enum SymbolShndxType {
-  SYMBOL_SIMPLE_INDEX = 0,
-  SYMBOL_ABS = ELF::SHN_ABS,
-  SYMBOL_COMMON = ELF::SHN_COMMON,
-  SYMBOL_LOPROC = ELF::SHN_LOPROC,
-  SYMBOL_AMDGPU_LDS = ELF::SHN_AMDGPU_LDS,
-  SYMBOL_HEXAGON_SCOMMON = ELF::SHN_HEXAGON_SCOMMON,
-  SYMBOL_HEXAGON_SCOMMON_2 = ELF::SHN_HEXAGON_SCOMMON_2,
-  SYMBOL_HEXAGON_SCOMMON_4 = ELF::SHN_HEXAGON_SCOMMON_4,
-  SYMBOL_HEXAGON_SCOMMON_8 = ELF::SHN_HEXAGON_SCOMMON_8,
-  SYMBOL_HIPROC = ELF::SHN_HIPROC,
-  SYMBOL_LOOS = ELF::SHN_LOOS,
-  SYMBOL_HIOS = ELF::SHN_HIOS,
-  SYMBOL_XINDEX = ELF::SHN_XINDEX,
-};
-
-struct Symbol {
-  uint8_t Binding;
-  SectionBase *DefinedIn = nullptr;
-  SymbolShndxType ShndxType;
-  uint32_t Index;
-  std::string Name;
-  uint32_t NameIndex;
-  uint64_t Size;
-  uint8_t Type;
-  uint64_t Value;
-  uint8_t Visibility;
-  bool Referenced = false;
-
-  uint16_t getShndx() const;
-  bool isCommon() const;
-};
-
-class SectionIndexSection : public SectionBase {
-  MAKE_SEC_WRITER_FRIEND
-
-private:
-  std::vector<uint32_t> Indexes;
-  SymbolTableSection *Symbols = nullptr;
-
-public:
-  virtual ~SectionIndexSection() {}
-  void addIndex(uint32_t Index) {
-    assert(Size > 0);
-    Indexes.push_back(Index);
-  }
-
-  void reserve(size_t NumSymbols) {
-    Indexes.reserve(NumSymbols);
-    Size = NumSymbols * 4;
-  }
-  void setSymTab(SymbolTableSection *SymTab) { Symbols = SymTab; }
-  Error initialize(SectionTableRef SecTable) override;
-  void finalize() override;
-  Error accept(SectionVisitor &Visitor) const override;
-  Error accept(MutableSectionVisitor &Visitor) override;
-
-  SectionIndexSection() {
-    Name = ".symtab_shndx";
-    Align = 4;
-    EntrySize = 4;
-    Type = OriginalType = ELF::SHT_SYMTAB_SHNDX;
-  }
-};
-
-class SymbolTableSection : public SectionBase {
-  MAKE_SEC_WRITER_FRIEND
-
-  void setStrTab(StringTableSection *StrTab) { SymbolNames = StrTab; }
-  void assignIndices();
-
-protected:
-  std::vector<std::unique_ptr<Symbol>> Symbols;
-  StringTableSection *SymbolNames = nullptr;
-  SectionIndexSection *SectionIndexTable = nullptr;
-
-  using SymPtr = std::unique_ptr<Symbol>;
-
-public:
-  SymbolTableSection() { Type = OriginalType = ELF::SHT_SYMTAB; }
-
-  void addSymbol(Twine Name, uint8_t Bind, uint8_t Type, SectionBase *DefinedIn,
-                 uint64_t Value, uint8_t Visibility, uint16_t Shndx,
-                 uint64_t SymbolSize);
-  void prepareForLayout();
-  // An 'empty' symbol table still contains a null symbol.
-  bool empty() const { return Symbols.size() == 1; }
-  void setShndxTable(SectionIndexSection *ShndxTable) {
-    SectionIndexTable = ShndxTable;
-  }
-  const SectionIndexSection *getShndxTable() const { return SectionIndexTable; }
-  void fillShndxTable();
-  const SectionBase *getStrTab() const { return SymbolNames; }
-  Expected<const Symbol *> getSymbolByIndex(uint32_t Index) const;
-  Expected<Symbol *> getSymbolByIndex(uint32_t Index);
-  void updateSymbols(function_ref<void(Symbol &)> Callable);
-
-  Error removeSectionReferences(
-      bool AllowBrokenLinks,
-      function_ref<bool(const SectionBase *)> ToRemove) override;
-  Error initialize(SectionTableRef SecTable) override;
-  void finalize() override;
-  Error accept(SectionVisitor &Visitor) const override;
-  Error accept(MutableSectionVisitor &Visitor) override;
-  Error removeSymbols(function_ref<bool(const Symbol &)> ToRemove) override;
-  void replaceSectionReferences(
-      const DenseMap<SectionBase *, SectionBase *> &FromTo) override;
-
-  static bool classof(const SectionBase *S) {
-    return S->OriginalType == ELF::SHT_SYMTAB;
-  }
-};
-
-struct Relocation {
-  Symbol *RelocSymbol = nullptr;
-  uint64_t Offset;
-  uint64_t Addend;
-  uint32_t Type;
-};
-
-// All relocation sections denote relocations to apply to another section.
-// However, some relocation sections use a dynamic symbol table and others use
-// a regular symbol table. Because the types of the two symbol tables differ in
-// our system (because they should behave differently) we can't uniformly
-// represent all relocations with the same base class if we expose an interface
-// that mentions the symbol table type. So we split the two base types into two
-// different classes, one which handles the section the relocation is applied to
-// and another which handles the symbol table type. The symbol table type is
-// taken as a type parameter to the class (see RelocSectionWithSymtabBase).
-class RelocationSectionBase : public SectionBase {
-protected:
-  SectionBase *SecToApplyRel = nullptr;
-
-public:
-  const SectionBase *getSection() const { return SecToApplyRel; }
-  void setSection(SectionBase *Sec) { SecToApplyRel = Sec; }
-
-  static bool classof(const SectionBase *S) {
-    return S->OriginalType == ELF::SHT_REL || S->OriginalType == ELF::SHT_RELA;
-  }
-};
-
-// Takes the symbol table type to use as a parameter so that we can deduplicate
-// that code between the two symbol table types.
-template <class SymTabType>
-class RelocSectionWithSymtabBase : public RelocationSectionBase {
-  void setSymTab(SymTabType *SymTab) { Symbols = SymTab; }
-
-protected:
-  RelocSectionWithSymtabBase() = default;
-
-  SymTabType *Symbols = nullptr;
-
-public:
-  Error initialize(SectionTableRef SecTable) override;
-  void finalize() override;
-};
-
-class RelocationSection
-    : public RelocSectionWithSymtabBase<SymbolTableSection> {
-  MAKE_SEC_WRITER_FRIEND
-
-  std::vector<Relocation> Relocations;
-
-public:
-  void addRelocation(Relocation Rel) { Relocations.push_back(Rel); }
-  Error accept(SectionVisitor &Visitor) const override;
-  Error accept(MutableSectionVisitor &Visitor) override;
-  Error removeSectionReferences(
-      bool AllowBrokenLinks,
-      function_ref<bool(const SectionBase *)> ToRemove) override;
-  Error removeSymbols(function_ref<bool(const Symbol &)> ToRemove) override;
-  void markSymbols() override;
-  void replaceSectionReferences(
-      const DenseMap<SectionBase *, SectionBase *> &FromTo) override;
-
-  static bool classof(const SectionBase *S) {
-    if (S->OriginalFlags & ELF::SHF_ALLOC)
-      return false;
-    return S->OriginalType == ELF::SHT_REL || S->OriginalType == ELF::SHT_RELA;
-  }
-};
-
-// TODO: The way stripping and groups interact is complicated
-// and still needs to be worked on.
-
-class GroupSection : public SectionBase {
-  MAKE_SEC_WRITER_FRIEND
-  const SymbolTableSection *SymTab = nullptr;
-  Symbol *Sym = nullptr;
-  ELF::Elf32_Word FlagWord;
-  SmallVector<SectionBase *, 3> GroupMembers;
-
-public:
-  // TODO: Contents is present in several classes of the hierarchy.
-  // This needs to be refactored to avoid duplication.
-  ArrayRef<uint8_t> Contents;
-
-  explicit GroupSection(ArrayRef<uint8_t> Data) : Contents(Data) {}
-
-  void setSymTab(const SymbolTableSection *SymTabSec) { SymTab = SymTabSec; }
-  void setSymbol(Symbol *S) { Sym = S; }
-  void setFlagWord(ELF::Elf32_Word W) { FlagWord = W; }
-  void addMember(SectionBase *Sec) { GroupMembers.push_back(Sec); }
-
-  Error accept(SectionVisitor &) const override;
-  Error accept(MutableSectionVisitor &Visitor) override;
-  void finalize() override;
-  Error removeSectionReferences(
-      bool AllowBrokenLinks,
-      function_ref<bool(const SectionBase *)> ToRemove) override;
-  Error removeSymbols(function_ref<bool(const Symbol &)> ToRemove) override;
-  void markSymbols() override;
-  void replaceSectionReferences(
-      const DenseMap<SectionBase *, SectionBase *> &FromTo) override;
-  void onRemove() override;
-
-  static bool classof(const SectionBase *S) {
-    return S->OriginalType == ELF::SHT_GROUP;
-  }
-};
-
-class DynamicSymbolTableSection : public Section {
-public:
-  explicit DynamicSymbolTableSection(ArrayRef<uint8_t> Data) : Section(Data) {}
-
-  static bool classof(const SectionBase *S) {
-    return S->OriginalType == ELF::SHT_DYNSYM;
-  }
-};
-
-class DynamicSection : public Section {
-public:
-  explicit DynamicSection(ArrayRef<uint8_t> Data) : Section(Data) {}
-
-  static bool classof(const SectionBase *S) {
-    return S->OriginalType == ELF::SHT_DYNAMIC;
-  }
-};
-
-class DynamicRelocationSection
-    : public RelocSectionWithSymtabBase<DynamicSymbolTableSection> {
-  MAKE_SEC_WRITER_FRIEND
-
-private:
-  ArrayRef<uint8_t> Contents;
-
-public:
-  explicit DynamicRelocationSection(ArrayRef<uint8_t> Data) : Contents(Data) {}
-
-  Error accept(SectionVisitor &) const override;
-  Error accept(MutableSectionVisitor &Visitor) override;
-  Error removeSectionReferences(
-      bool AllowBrokenLinks,
-      function_ref<bool(const SectionBase *)> ToRemove) override;
-
-  static bool classof(const SectionBase *S) {
-    if (!(S->OriginalFlags & ELF::SHF_ALLOC))
-      return false;
-    return S->OriginalType == ELF::SHT_REL || S->OriginalType == ELF::SHT_RELA;
-  }
-};
-
-class GnuDebugLinkSection : public SectionBase {
-  MAKE_SEC_WRITER_FRIEND
-
-private:
-  StringRef FileName;
-  uint32_t CRC32;
-
-  void init(StringRef File);
-
-public:
-  // If we add this section from an external source we can use this ctor.
-  explicit GnuDebugLinkSection(StringRef File, uint32_t PrecomputedCRC);
-  Error accept(SectionVisitor &Visitor) const override;
-  Error accept(MutableSectionVisitor &Visitor) override;
-};
-
-class Reader {
-public:
-  virtual ~Reader();
-  virtual Expected<std::unique_ptr<Object>> create(bool EnsureSymtab) const = 0;
-};
-
-using object::Binary;
-using object::ELFFile;
-using object::ELFObjectFile;
-using object::OwningBinary;
-
-class BasicELFBuilder {
-protected:
-  std::unique_ptr<Object> Obj;
-
-  void initFileHeader();
-  void initHeaderSegment();
-  StringTableSection *addStrTab();
-  SymbolTableSection *addSymTab(StringTableSection *StrTab);
-  Error initSections();
-
-public:
-  BasicELFBuilder() : Obj(std::make_unique<Object>()) {}
-};
-
-class BinaryELFBuilder : public BasicELFBuilder {
-  MemoryBuffer *MemBuf;
-  uint8_t NewSymbolVisibility;
-  void addData(SymbolTableSection *SymTab);
-
-public:
-  BinaryELFBuilder(MemoryBuffer *MB, uint8_t NewSymbolVisibility)
-      : BasicELFBuilder(), MemBuf(MB),
-        NewSymbolVisibility(NewSymbolVisibility) {}
-
-  Expected<std::unique_ptr<Object>> build();
-};
-
-class IHexELFBuilder : public BasicELFBuilder {
-  const std::vector<IHexRecord> &Records;
-
-  void addDataSections();
-
-public:
-  IHexELFBuilder(const std::vector<IHexRecord> &Records)
-      : BasicELFBuilder(), Records(Records) {}
-
-  Expected<std::unique_ptr<Object>> build();
-};
-
-template <class ELFT> class ELFBuilder {
-private:
-  using Elf_Addr = typename ELFT::Addr;
-  using Elf_Shdr = typename ELFT::Shdr;
-  using Elf_Word = typename ELFT::Word;
-
-  const ELFFile<ELFT> &ElfFile;
-  Object &Obj;
-  size_t EhdrOffset = 0;
-  Optional<StringRef> ExtractPartition;
-
-  void setParentSegment(Segment &Child);
-  Error readProgramHeaders(const ELFFile<ELFT> &HeadersFile);
-  Error initGroupSection(GroupSection *GroupSec);
-  Error initSymbolTable(SymbolTableSection *SymTab);
-  Error readSectionHeaders();
-  Error readSections(bool EnsureSymtab);
-  Error findEhdrOffset();
-  Expected<SectionBase &> makeSection(const Elf_Shdr &Shdr);
-
-public:
-  ELFBuilder(const ELFObjectFile<ELFT> &ElfObj, Object &Obj,
-             Optional<StringRef> ExtractPartition)
-      : ElfFile(ElfObj.getELFFile()), Obj(Obj),
-        ExtractPartition(ExtractPartition) {}
-
-  Error build(bool EnsureSymtab);
-};
-
-class BinaryReader : public Reader {
-  MemoryBuffer *MemBuf;
-  uint8_t NewSymbolVisibility;
-
-public:
-  BinaryReader(MemoryBuffer *MB, const uint8_t NewSymbolVisibility)
-      : MemBuf(MB), NewSymbolVisibility(NewSymbolVisibility) {}
-  Expected<std::unique_ptr<Object>> create(bool EnsureSymtab) const override;
-};
-
-class IHexReader : public Reader {
-  MemoryBuffer *MemBuf;
-
-  Expected<std::vector<IHexRecord>> parse() const;
-  Error parseError(size_t LineNo, Error E) const {
-    return LineNo == -1U
-               ? createFileError(MemBuf->getBufferIdentifier(), std::move(E))
-               : createFileError(MemBuf->getBufferIdentifier(), LineNo,
-                                 std::move(E));
-  }
-  template <typename... Ts>
-  Error parseError(size_t LineNo, char const *Fmt, const Ts &... Vals) const {
-    Error E = createStringError(errc::invalid_argument, Fmt, Vals...);
-    return parseError(LineNo, std::move(E));
-  }
-
-public:
-  IHexReader(MemoryBuffer *MB) : MemBuf(MB) {}
-
-  Expected<std::unique_ptr<Object>> create(bool EnsureSymtab) const override;
-};
-
-class ELFReader : public Reader {
-  Binary *Bin;
-  Optional<StringRef> ExtractPartition;
-
-public:
-  Expected<std::unique_ptr<Object>> create(bool EnsureSymtab) const override;
-  explicit ELFReader(Binary *B, Optional<StringRef> ExtractPartition)
-      : Bin(B), ExtractPartition(ExtractPartition) {}
-};
-
-class Object {
-private:
-  using SecPtr = std::unique_ptr<SectionBase>;
-  using SegPtr = std::unique_ptr<Segment>;
-
-  std::vector<SecPtr> Sections;
-  std::vector<SegPtr> Segments;
-  std::vector<SecPtr> RemovedSections;
-
-  static bool sectionIsAlloc(const SectionBase &Sec) {
-    return Sec.Flags & ELF::SHF_ALLOC;
-  };
-
-public:
-  template <class T>
-  using Range = iterator_range<
-      pointee_iterator<typename std::vector<std::unique_ptr<T>>::iterator>>;
-
-  template <class T>
-  using ConstRange = iterator_range<pointee_iterator<
-      typename std::vector<std::unique_ptr<T>>::const_iterator>>;
-
-  // It is often the case that the ELF header and the program header table are
-  // not present in any segment. This could be a problem during file layout,
-  // because other segments may get assigned an offset where either of the
-  // two should reside, which will effectively corrupt the resulting binary.
-  // Other than that we use these segments to track program header offsets
-  // when they may not follow the ELF header.
-  Segment ElfHdrSegment;
-  Segment ProgramHdrSegment;
-
-  uint8_t OSABI;
-  uint8_t ABIVersion;
-  uint64_t Entry;
-  uint64_t SHOff;
-  uint32_t Type;
-  uint32_t Machine;
-  uint32_t Version;
-  uint32_t Flags;
-
-  bool HadShdrs = true;
-  bool MustBeRelocatable = false;
-  StringTableSection *SectionNames = nullptr;
-  SymbolTableSection *SymbolTable = nullptr;
-  SectionIndexSection *SectionIndexTable = nullptr;
-
-  void sortSections();
-  SectionTableRef sections() { return SectionTableRef(Sections); }
-  ConstRange<SectionBase> sections() const {
-    return make_pointee_range(Sections);
-  }
-  iterator_range<
-      filter_iterator<pointee_iterator<std::vector<SecPtr>::const_iterator>,
-                      decltype(&sectionIsAlloc)>>
-  allocSections() const {
-    return make_filter_range(make_pointee_range(Sections), sectionIsAlloc);
-  }
-
-  SectionBase *findSection(StringRef Name) {
-    auto SecIt =
-        find_if(Sections, [&](const SecPtr &Sec) { return Sec->Name == Name; });
-    return SecIt == Sections.end() ? nullptr : SecIt->get();
-  }
-  SectionTableRef removedSections() { return SectionTableRef(RemovedSections); }
-
-  Range<Segment> segments() { return make_pointee_range(Segments); }
-  ConstRange<Segment> segments() const { return make_pointee_range(Segments); }
-
-  Error removeSections(bool AllowBrokenLinks,
-                       std::function<bool(const SectionBase &)> ToRemove);
-  Error removeSymbols(function_ref<bool(const Symbol &)> ToRemove);
-  template <class T, class... Ts> T &addSection(Ts &&... Args) {
-    auto Sec = std::make_unique<T>(std::forward<Ts>(Args)...);
-    auto Ptr = Sec.get();
-    MustBeRelocatable |= isa<RelocationSection>(*Ptr);
-    Sections.emplace_back(std::move(Sec));
-    Ptr->Index = Sections.size();
-    return *Ptr;
-  }
-  Error addNewSymbolTable();
-  Segment &addSegment(ArrayRef<uint8_t> Data) {
-    Segments.emplace_back(std::make_unique<Segment>(Data));
-    return *Segments.back();
-  }
-  bool isRelocatable() const {
-    return (Type != ELF::ET_DYN && Type != ELF::ET_EXEC) || MustBeRelocatable;
-  }
-};
-
-} // end namespace elf
-} // end namespace objcopy
-} // end namespace llvm
-
-#endif // LLVM_TOOLS_OBJCOPY_OBJECT_H
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOConfig.h b/gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOConfig.h
deleted file mode 100644
index 7c5dbfde19a..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOConfig.h
+++ /dev/null
@@ -1,21 +0,0 @@
-//===- MachOConfig.h --------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_LLVM_OBJCOPY_MACHO_MACHOCONFIG_H
-#define LLVM_TOOLS_LLVM_OBJCOPY_MACHO_MACHOCONFIG_H
-
-namespace llvm {
-namespace objcopy {
-
-// Mach-O specific configuration for copying/stripping a single file.
-struct MachOConfig {};
-
-} // namespace objcopy
-} // namespace llvm
-
-#endif // LLVM_TOOLS_LLVM_OBJCOPY_MACHO_MACHOCONFIG_H
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOLayoutBuilder.cpp b/gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOLayoutBuilder.cpp
deleted file mode 100644
index 6ed21806fe5..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOLayoutBuilder.cpp
+++ /dev/null
@@ -1,403 +0,0 @@
-//===- MachOLayoutBuilder.cpp -----------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "MachOLayoutBuilder.h"
-#include "llvm/Support/Alignment.h"
-#include "llvm/Support/Errc.h"
-#include "llvm/Support/ErrorHandling.h"
-
-using namespace llvm;
-using namespace llvm::objcopy::macho;
-
-StringTableBuilder::Kind
-MachOLayoutBuilder::getStringTableBuilderKind(const Object &O, bool Is64Bit) {
-  if (O.Header.FileType == MachO::HeaderFileType::MH_OBJECT)
-    return Is64Bit ? StringTableBuilder::MachO64 : StringTableBuilder::MachO;
-  return Is64Bit ? StringTableBuilder::MachO64Linked
-                 : StringTableBuilder::MachOLinked;
-}
-
-uint32_t MachOLayoutBuilder::computeSizeOfCmds() const {
-  uint32_t Size = 0;
-  for (const LoadCommand &LC : O.LoadCommands) {
-    const MachO::macho_load_command &MLC = LC.MachOLoadCommand;
-    auto cmd = MLC.load_command_data.cmd;
-    switch (cmd) {
-    case MachO::LC_SEGMENT:
-      Size += sizeof(MachO::segment_command) +
-              sizeof(MachO::section) * LC.Sections.size();
-      continue;
-    case MachO::LC_SEGMENT_64:
-      Size += sizeof(MachO::segment_command_64) +
-              sizeof(MachO::section_64) * LC.Sections.size();
-      continue;
-    }
-
-    switch (cmd) {
-#define HANDLE_LOAD_COMMAND(LCName, LCValue, LCStruct)                         \
-  case MachO::LCName:                                                          \
-    Size += sizeof(MachO::LCStruct) + LC.Payload.size();                       \
-    break;
-#include "llvm/BinaryFormat/MachO.def"
-#undef HANDLE_LOAD_COMMAND
-    }
-  }
-
-  return Size;
-}
-
-void MachOLayoutBuilder::constructStringTable() {
-  for (std::unique_ptr<SymbolEntry> &Sym : O.SymTable.Symbols)
-    StrTableBuilder.add(Sym->Name);
-  StrTableBuilder.finalize();
-}
-
-void MachOLayoutBuilder::updateSymbolIndexes() {
-  uint32_t Index = 0;
-  for (auto &Symbol : O.SymTable.Symbols)
-    Symbol->Index = Index++;
-}
-
-// Updates the index and the number of local/external/undefined symbols.
-void MachOLayoutBuilder::updateDySymTab(MachO::macho_load_command &MLC) {
-  assert(MLC.load_command_data.cmd == MachO::LC_DYSYMTAB);
-  // Make sure that nlist entries in the symbol table are sorted by the those
-  // types. The order is: local < defined external < undefined external.
-  assert(llvm::is_sorted(O.SymTable.Symbols,
-                         [](const std::unique_ptr<SymbolEntry> &A,
-                            const std::unique_ptr<SymbolEntry> &B) {
-                           bool AL = A->isLocalSymbol(),
-                                BL = B->isLocalSymbol();
-                           if (AL != BL)
-                             return AL;
-                           return !AL && !A->isUndefinedSymbol() &&
-                                  B->isUndefinedSymbol();
-                         }) &&
-         "Symbols are not sorted by their types.");
-
-  uint32_t NumLocalSymbols = 0;
-  auto Iter = O.SymTable.Symbols.begin();
-  auto End = O.SymTable.Symbols.end();
-  for (; Iter != End; ++Iter) {
-    if ((*Iter)->isExternalSymbol())
-      break;
-
-    ++NumLocalSymbols;
-  }
-
-  uint32_t NumExtDefSymbols = 0;
-  for (; Iter != End; ++Iter) {
-    if ((*Iter)->isUndefinedSymbol())
-      break;
-
-    ++NumExtDefSymbols;
-  }
-
-  MLC.dysymtab_command_data.ilocalsym = 0;
-  MLC.dysymtab_command_data.nlocalsym = NumLocalSymbols;
-  MLC.dysymtab_command_data.iextdefsym = NumLocalSymbols;
-  MLC.dysymtab_command_data.nextdefsym = NumExtDefSymbols;
-  MLC.dysymtab_command_data.iundefsym = NumLocalSymbols + NumExtDefSymbols;
-  MLC.dysymtab_command_data.nundefsym =
-      O.SymTable.Symbols.size() - (NumLocalSymbols + NumExtDefSymbols);
-}
-
-// Recomputes and updates offset and size fields in load commands and sections
-// since they could be modified.
-uint64_t MachOLayoutBuilder::layoutSegments() {
-  auto HeaderSize =
-      Is64Bit ? sizeof(MachO::mach_header_64) : sizeof(MachO::mach_header);
-  const bool IsObjectFile =
-      O.Header.FileType == MachO::HeaderFileType::MH_OBJECT;
-  uint64_t Offset = IsObjectFile ? (HeaderSize + O.Header.SizeOfCmds) : 0;
-  for (LoadCommand &LC : O.LoadCommands) {
-    auto &MLC = LC.MachOLoadCommand;
-    StringRef Segname;
-    uint64_t SegmentVmAddr;
-    uint64_t SegmentVmSize;
-    switch (MLC.load_command_data.cmd) {
-    case MachO::LC_SEGMENT:
-      SegmentVmAddr = MLC.segment_command_data.vmaddr;
-      SegmentVmSize = MLC.segment_command_data.vmsize;
-      Segname = StringRef(MLC.segment_command_data.segname,
-                          strnlen(MLC.segment_command_data.segname,
-                                  sizeof(MLC.segment_command_data.segname)));
-      break;
-    case MachO::LC_SEGMENT_64:
-      SegmentVmAddr = MLC.segment_command_64_data.vmaddr;
-      SegmentVmSize = MLC.segment_command_64_data.vmsize;
-      Segname = StringRef(MLC.segment_command_64_data.segname,
-                          strnlen(MLC.segment_command_64_data.segname,
-                                  sizeof(MLC.segment_command_64_data.segname)));
-      break;
-    default:
-      continue;
-    }
-
-    if (Segname == "__LINKEDIT") {
-      // We update the __LINKEDIT segment later (in layoutTail).
-      assert(LC.Sections.empty() && "__LINKEDIT segment has sections");
-      LinkEditLoadCommand = &MLC;
-      continue;
-    }
-
-    // Update file offsets and sizes of sections.
-    uint64_t SegOffset = Offset;
-    uint64_t SegFileSize = 0;
-    uint64_t VMSize = 0;
-    for (std::unique_ptr<Section> &Sec : LC.Sections) {
-      assert(SegmentVmAddr <= Sec->Addr &&
-             "Section's address cannot be smaller than Segment's one");
-      uint32_t SectOffset = Sec->Addr - SegmentVmAddr;
-      if (IsObjectFile) {
-        if (!Sec->hasValidOffset()) {
-          Sec->Offset = 0;
-        } else {
-          uint64_t PaddingSize =
-              offsetToAlignment(SegFileSize, Align(1ull << Sec->Align));
-          Sec->Offset = SegOffset + SegFileSize + PaddingSize;
-          Sec->Size = Sec->Content.size();
-          SegFileSize += PaddingSize + Sec->Size;
-        }
-      } else {
-        if (!Sec->hasValidOffset()) {
-          Sec->Offset = 0;
-        } else {
-          Sec->Offset = SegOffset + SectOffset;
-          Sec->Size = Sec->Content.size();
-          SegFileSize = std::max(SegFileSize, SectOffset + Sec->Size);
-        }
-      }
-      VMSize = std::max(VMSize, SectOffset + Sec->Size);
-    }
-
-    if (IsObjectFile) {
-      Offset += SegFileSize;
-    } else {
-      Offset = alignTo(Offset + SegFileSize, PageSize);
-      SegFileSize = alignTo(SegFileSize, PageSize);
-      // Use the original vmsize if the segment is __PAGEZERO.
-      VMSize =
-          Segname == "__PAGEZERO" ? SegmentVmSize : alignTo(VMSize, PageSize);
-    }
-
-    switch (MLC.load_command_data.cmd) {
-    case MachO::LC_SEGMENT:
-      MLC.segment_command_data.cmdsize =
-          sizeof(MachO::segment_command) +
-          sizeof(MachO::section) * LC.Sections.size();
-      MLC.segment_command_data.nsects = LC.Sections.size();
-      MLC.segment_command_data.fileoff = SegOffset;
-      MLC.segment_command_data.vmsize = VMSize;
-      MLC.segment_command_data.filesize = SegFileSize;
-      break;
-    case MachO::LC_SEGMENT_64:
-      MLC.segment_command_64_data.cmdsize =
-          sizeof(MachO::segment_command_64) +
-          sizeof(MachO::section_64) * LC.Sections.size();
-      MLC.segment_command_64_data.nsects = LC.Sections.size();
-      MLC.segment_command_64_data.fileoff = SegOffset;
-      MLC.segment_command_64_data.vmsize = VMSize;
-      MLC.segment_command_64_data.filesize = SegFileSize;
-      break;
-    }
-  }
-
-  return Offset;
-}
-
-uint64_t MachOLayoutBuilder::layoutRelocations(uint64_t Offset) {
-  for (LoadCommand &LC : O.LoadCommands)
-    for (std::unique_ptr<Section> &Sec : LC.Sections) {
-      Sec->RelOff = Sec->Relocations.empty() ? 0 : Offset;
-      Sec->NReloc = Sec->Relocations.size();
-      Offset += sizeof(MachO::any_relocation_info) * Sec->NReloc;
-    }
-
-  return Offset;
-}
-
-Error MachOLayoutBuilder::layoutTail(uint64_t Offset) {
-  // If we are building the layout of an executable or dynamic library
-  // which does not have any segments other than __LINKEDIT,
-  // the Offset can be equal to zero by this time. It happens because of the
-  // convention that in such cases the file offsets specified by LC_SEGMENT
-  // start with zero (unlike the case of a relocatable object file).
-  const uint64_t HeaderSize =
-      Is64Bit ? sizeof(MachO::mach_header_64) : sizeof(MachO::mach_header);
-  assert((!(O.Header.FileType == MachO::HeaderFileType::MH_OBJECT) ||
-          Offset >= HeaderSize + O.Header.SizeOfCmds) &&
-         "Incorrect tail offset");
-  Offset = std::max(Offset, HeaderSize + O.Header.SizeOfCmds);
-
-  // The order of LINKEDIT elements is as follows:
-  // rebase info, binding info, weak binding info, lazy binding info, export
-  // trie, data-in-code, symbol table, indirect symbol table, symbol table
-  // strings, code signature.
-  uint64_t NListSize = Is64Bit ? sizeof(MachO::nlist_64) : sizeof(MachO::nlist);
-  uint64_t StartOfLinkEdit = Offset;
-  uint64_t StartOfRebaseInfo = StartOfLinkEdit;
-  uint64_t StartOfBindingInfo = StartOfRebaseInfo + O.Rebases.Opcodes.size();
-  uint64_t StartOfWeakBindingInfo = StartOfBindingInfo + O.Binds.Opcodes.size();
-  uint64_t StartOfLazyBindingInfo =
-      StartOfWeakBindingInfo + O.WeakBinds.Opcodes.size();
-  uint64_t StartOfExportTrie =
-      StartOfLazyBindingInfo + O.LazyBinds.Opcodes.size();
-  uint64_t StartOfFunctionStarts = StartOfExportTrie + O.Exports.Trie.size();
-  uint64_t StartOfDataInCode =
-      StartOfFunctionStarts + O.FunctionStarts.Data.size();
-  uint64_t StartOfLinkerOptimizationHint =
-      StartOfDataInCode + O.DataInCode.Data.size();
-  uint64_t StartOfSymbols =
-      StartOfLinkerOptimizationHint + O.LinkerOptimizationHint.Data.size();
-  uint64_t StartOfIndirectSymbols =
-      StartOfSymbols + NListSize * O.SymTable.Symbols.size();
-  uint64_t StartOfSymbolStrings =
-      StartOfIndirectSymbols +
-      sizeof(uint32_t) * O.IndirectSymTable.Symbols.size();
-  uint64_t StartOfCodeSignature =
-      StartOfSymbolStrings + StrTableBuilder.getSize();
-  if (O.CodeSignatureCommandIndex)
-    StartOfCodeSignature = alignTo(StartOfCodeSignature, 16);
-  uint64_t LinkEditSize =
-      (StartOfCodeSignature + O.CodeSignature.Data.size()) - StartOfLinkEdit;
-
-  // Now we have determined the layout of the contents of the __LINKEDIT
-  // segment. Update its load command.
-  if (LinkEditLoadCommand) {
-    MachO::macho_load_command *MLC = LinkEditLoadCommand;
-    switch (LinkEditLoadCommand->load_command_data.cmd) {
-    case MachO::LC_SEGMENT:
-      MLC->segment_command_data.cmdsize = sizeof(MachO::segment_command);
-      MLC->segment_command_data.fileoff = StartOfLinkEdit;
-      MLC->segment_command_data.vmsize = alignTo(LinkEditSize, PageSize);
-      MLC->segment_command_data.filesize = LinkEditSize;
-      break;
-    case MachO::LC_SEGMENT_64:
-      MLC->segment_command_64_data.cmdsize = sizeof(MachO::segment_command_64);
-      MLC->segment_command_64_data.fileoff = StartOfLinkEdit;
-      MLC->segment_command_64_data.vmsize = alignTo(LinkEditSize, PageSize);
-      MLC->segment_command_64_data.filesize = LinkEditSize;
-      break;
-    }
-  }
-
-  for (LoadCommand &LC : O.LoadCommands) {
-    auto &MLC = LC.MachOLoadCommand;
-    auto cmd = MLC.load_command_data.cmd;
-    switch (cmd) {
-    case MachO::LC_CODE_SIGNATURE:
-      MLC.linkedit_data_command_data.dataoff = StartOfCodeSignature;
-      MLC.linkedit_data_command_data.datasize = O.CodeSignature.Data.size();
-      break;
-    case MachO::LC_SYMTAB:
-      MLC.symtab_command_data.symoff = StartOfSymbols;
-      MLC.symtab_command_data.nsyms = O.SymTable.Symbols.size();
-      MLC.symtab_command_data.stroff = StartOfSymbolStrings;
-      MLC.symtab_command_data.strsize = StrTableBuilder.getSize();
-      break;
-    case MachO::LC_DYSYMTAB: {
-      if (MLC.dysymtab_command_data.ntoc != 0 ||
-          MLC.dysymtab_command_data.nmodtab != 0 ||
-          MLC.dysymtab_command_data.nextrefsyms != 0 ||
-          MLC.dysymtab_command_data.nlocrel != 0 ||
-          MLC.dysymtab_command_data.nextrel != 0)
-        return createStringError(llvm::errc::not_supported,
-                                 "shared library is not yet supported");
-
-      if (!O.IndirectSymTable.Symbols.empty()) {
-        MLC.dysymtab_command_data.indirectsymoff = StartOfIndirectSymbols;
-        MLC.dysymtab_command_data.nindirectsyms =
-            O.IndirectSymTable.Symbols.size();
-      }
-
-      updateDySymTab(MLC);
-      break;
-    }
-    case MachO::LC_DATA_IN_CODE:
-      MLC.linkedit_data_command_data.dataoff = StartOfDataInCode;
-      MLC.linkedit_data_command_data.datasize = O.DataInCode.Data.size();
-      break;
-    case MachO::LC_LINKER_OPTIMIZATION_HINT:
-      MLC.linkedit_data_command_data.dataoff = StartOfLinkerOptimizationHint;
-      MLC.linkedit_data_command_data.datasize =
-          O.LinkerOptimizationHint.Data.size();
-      break;
-    case MachO::LC_FUNCTION_STARTS:
-      MLC.linkedit_data_command_data.dataoff = StartOfFunctionStarts;
-      MLC.linkedit_data_command_data.datasize = O.FunctionStarts.Data.size();
-      break;
-    case MachO::LC_DYLD_INFO:
-    case MachO::LC_DYLD_INFO_ONLY:
-      MLC.dyld_info_command_data.rebase_off =
-          O.Rebases.Opcodes.empty() ? 0 : StartOfRebaseInfo;
-      MLC.dyld_info_command_data.rebase_size = O.Rebases.Opcodes.size();
-      MLC.dyld_info_command_data.bind_off =
-          O.Binds.Opcodes.empty() ? 0 : StartOfBindingInfo;
-      MLC.dyld_info_command_data.bind_size = O.Binds.Opcodes.size();
-      MLC.dyld_info_command_data.weak_bind_off =
-          O.WeakBinds.Opcodes.empty() ? 0 : StartOfWeakBindingInfo;
-      MLC.dyld_info_command_data.weak_bind_size = O.WeakBinds.Opcodes.size();
-      MLC.dyld_info_command_data.lazy_bind_off =
-          O.LazyBinds.Opcodes.empty() ? 0 : StartOfLazyBindingInfo;
-      MLC.dyld_info_command_data.lazy_bind_size = O.LazyBinds.Opcodes.size();
-      MLC.dyld_info_command_data.export_off =
-          O.Exports.Trie.empty() ? 0 : StartOfExportTrie;
-      MLC.dyld_info_command_data.export_size = O.Exports.Trie.size();
-      break;
-    // Note that LC_ENCRYPTION_INFO.cryptoff despite its name and the comment in
-    // <mach-o/loader.h> is not an offset in the binary file, instead, it is a
-    // relative virtual address. At the moment modification of the __TEXT
-    // segment of executables isn't supported anyway (e.g. data in code entries
-    // are not recalculated). Moreover, in general
-    // LC_ENCRYPT_INFO/LC_ENCRYPTION_INFO_64 are nontrivial to update because
-    // without making additional assumptions (e.g. that the entire __TEXT
-    // segment should be encrypted) we do not know how to recalculate the
-    // boundaries of the encrypted part. For now just copy over these load
-    // commands until we encounter a real world usecase where
-    // LC_ENCRYPT_INFO/LC_ENCRYPTION_INFO_64 need to be adjusted.
-    case MachO::LC_ENCRYPTION_INFO:
-    case MachO::LC_ENCRYPTION_INFO_64:
-    case MachO::LC_LOAD_DYLINKER:
-    case MachO::LC_MAIN:
-    case MachO::LC_RPATH:
-    case MachO::LC_SEGMENT:
-    case MachO::LC_SEGMENT_64:
-    case MachO::LC_VERSION_MIN_MACOSX:
-    case MachO::LC_VERSION_MIN_IPHONEOS:
-    case MachO::LC_VERSION_MIN_TVOS:
-    case MachO::LC_VERSION_MIN_WATCHOS:
-    case MachO::LC_BUILD_VERSION:
-    case MachO::LC_ID_DYLIB:
-    case MachO::LC_LOAD_DYLIB:
-    case MachO::LC_LOAD_WEAK_DYLIB:
-    case MachO::LC_UUID:
-    case MachO::LC_SOURCE_VERSION:
-    case MachO::LC_THREAD:
-    case MachO::LC_UNIXTHREAD:
-      // Nothing to update.
-      break;
-    default:
-      // Abort if it's unsupported in order to prevent corrupting the object.
-      return createStringError(llvm::errc::not_supported,
-                               "unsupported load command (cmd=0x%x)", cmd);
-    }
-  }
-
-  return Error::success();
-}
-
-Error MachOLayoutBuilder::layout() {
-  O.Header.NCmds = O.LoadCommands.size();
-  O.Header.SizeOfCmds = computeSizeOfCmds();
-  constructStringTable();
-  updateSymbolIndexes();
-  uint64_t Offset = layoutSegments();
-  Offset = layoutRelocations(Offset);
-  return layoutTail(Offset);
-}
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOLayoutBuilder.h b/gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOLayoutBuilder.h
deleted file mode 100644
index 5fe6683e27f..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOLayoutBuilder.h
+++ /dev/null
@@ -1,54 +0,0 @@
-//===- MachOLayoutBuilder.h -------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_OBJCOPY_MACHO_MACHOLAYOUTBUILDER_H
-#define LLVM_OBJCOPY_MACHO_MACHOLAYOUTBUILDER_H
-
-#include "MachOObjcopy.h"
-#include "Object.h"
-
-namespace llvm {
-namespace objcopy {
-namespace macho {
-
-class MachOLayoutBuilder {
-  Object &O;
-  bool Is64Bit;
-  uint64_t PageSize;
-
-  // Points to the __LINKEDIT segment if it exists.
-  MachO::macho_load_command *LinkEditLoadCommand = nullptr;
-  StringTableBuilder StrTableBuilder;
-
-  uint32_t computeSizeOfCmds() const;
-  void constructStringTable();
-  void updateSymbolIndexes();
-  void updateDySymTab(MachO::macho_load_command &MLC);
-  uint64_t layoutSegments();
-  uint64_t layoutRelocations(uint64_t Offset);
-  Error layoutTail(uint64_t Offset);
-
-  static StringTableBuilder::Kind getStringTableBuilderKind(const Object &O,
-                                                            bool Is64Bit);
-
-public:
-  MachOLayoutBuilder(Object &O, bool Is64Bit, uint64_t PageSize)
-      : O(O), Is64Bit(Is64Bit), PageSize(PageSize),
-        StrTableBuilder(getStringTableBuilderKind(O, Is64Bit)) {}
-
-  // Recomputes and updates fields in the given object such as file offsets.
-  Error layout();
-
-  StringTableBuilder &getStringTableBuilder() { return StrTableBuilder; }
-};
-
-} // end namespace macho
-} // end namespace objcopy
-} // end namespace llvm
-
-#endif // LLVM_OBJCOPY_MACHO_MACHOLAYOUTBUILDER_H
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOObjcopy.cpp b/gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOObjcopy.cpp
deleted file mode 100644
index 823306916bb..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOObjcopy.cpp
+++ /dev/null
@@ -1,481 +0,0 @@
-//===- MachOObjcopy.cpp -----------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "MachOObjcopy.h"
-#include "../llvm-objcopy.h"
-#include "CommonConfig.h"
-#include "MachOReader.h"
-#include "MachOWriter.h"
-#include "MultiFormatConfig.h"
-#include "llvm/ADT/DenseSet.h"
-#include "llvm/Object/ArchiveWriter.h"
-#include "llvm/Object/MachOUniversal.h"
-#include "llvm/Object/MachOUniversalWriter.h"
-#include "llvm/Support/Errc.h"
-#include "llvm/Support/Error.h"
-#include "llvm/Support/FileOutputBuffer.h"
-#include "llvm/Support/SmallVectorMemoryBuffer.h"
-
-using namespace llvm;
-using namespace llvm::objcopy;
-using namespace llvm::objcopy::macho;
-using namespace llvm::object;
-
-using SectionPred = std::function<bool(const std::unique_ptr<Section> &Sec)>;
-using LoadCommandPred = std::function<bool(const LoadCommand &LC)>;
-
-#ifndef NDEBUG
-static bool isLoadCommandWithPayloadString(const LoadCommand &LC) {
-  // TODO: Add support for LC_REEXPORT_DYLIB, LC_LOAD_UPWARD_DYLIB and
-  // LC_LAZY_LOAD_DYLIB
-  return LC.MachOLoadCommand.load_command_data.cmd == MachO::LC_RPATH ||
-         LC.MachOLoadCommand.load_command_data.cmd == MachO::LC_ID_DYLIB ||
-         LC.MachOLoadCommand.load_command_data.cmd == MachO::LC_LOAD_DYLIB ||
-         LC.MachOLoadCommand.load_command_data.cmd == MachO::LC_LOAD_WEAK_DYLIB;
-}
-#endif
-
-static StringRef getPayloadString(const LoadCommand &LC) {
-  assert(isLoadCommandWithPayloadString(LC) &&
-         "unsupported load command encountered");
-
-  return StringRef(reinterpret_cast<const char *>(LC.Payload.data()),
-                   LC.Payload.size())
-      .rtrim('\0');
-}
-
-static Error removeSections(const CommonConfig &Config, Object &Obj) {
-  SectionPred RemovePred = [](const std::unique_ptr<Section> &) {
-    return false;
-  };
-
-  if (!Config.ToRemove.empty()) {
-    RemovePred = [&Config, RemovePred](const std::unique_ptr<Section> &Sec) {
-      return Config.ToRemove.matches(Sec->CanonicalName);
-    };
-  }
-
-  if (Config.StripAll || Config.StripDebug) {
-    // Remove all debug sections.
-    RemovePred = [RemovePred](const std::unique_ptr<Section> &Sec) {
-      if (Sec->Segname == "__DWARF")
-        return true;
-
-      return RemovePred(Sec);
-    };
-  }
-
-  if (!Config.OnlySection.empty()) {
-    // Overwrite RemovePred because --only-section takes priority.
-    RemovePred = [&Config](const std::unique_ptr<Section> &Sec) {
-      return !Config.OnlySection.matches(Sec->CanonicalName);
-    };
-  }
-
-  return Obj.removeSections(RemovePred);
-}
-
-static void markSymbols(const CommonConfig &, Object &Obj) {
-  // Symbols referenced from the indirect symbol table must not be removed.
-  for (IndirectSymbolEntry &ISE : Obj.IndirectSymTable.Symbols)
-    if (ISE.Symbol)
-      (*ISE.Symbol)->Referenced = true;
-}
-
-static void updateAndRemoveSymbols(const CommonConfig &Config, Object &Obj) {
-  for (SymbolEntry &Sym : Obj.SymTable) {
-    auto I = Config.SymbolsToRename.find(Sym.Name);
-    if (I != Config.SymbolsToRename.end())
-      Sym.Name = std::string(I->getValue());
-  }
-
-  auto RemovePred = [Config, &Obj](const std::unique_ptr<SymbolEntry> &N) {
-    if (N->Referenced)
-      return false;
-    if (Config.KeepUndefined && N->isUndefinedSymbol())
-      return false;
-    if (N->n_desc & MachO::REFERENCED_DYNAMICALLY)
-      return false;
-    if (Config.StripAll)
-      return true;
-    if (Config.DiscardMode == DiscardType::All && !(N->n_type & MachO::N_EXT))
-      return true;
-    // This behavior is consistent with cctools' strip.
-    if (Config.StripSwiftSymbols && (Obj.Header.Flags & MachO::MH_DYLDLINK) &&
-        Obj.SwiftVersion && *Obj.SwiftVersion && N->isSwiftSymbol())
-      return true;
-    return false;
-  };
-
-  Obj.SymTable.removeSymbols(RemovePred);
-}
-
-template <typename LCType>
-static void updateLoadCommandPayloadString(LoadCommand &LC, StringRef S) {
-  assert(isLoadCommandWithPayloadString(LC) &&
-         "unsupported load command encountered");
-
-  uint32_t NewCmdsize = alignTo(sizeof(LCType) + S.size() + 1, 8);
-
-  LC.MachOLoadCommand.load_command_data.cmdsize = NewCmdsize;
-  LC.Payload.assign(NewCmdsize - sizeof(LCType), 0);
-  std::copy(S.begin(), S.end(), LC.Payload.begin());
-}
-
-static LoadCommand buildRPathLoadCommand(StringRef Path) {
-  LoadCommand LC;
-  MachO::rpath_command RPathLC;
-  RPathLC.cmd = MachO::LC_RPATH;
-  RPathLC.path = sizeof(MachO::rpath_command);
-  RPathLC.cmdsize = alignTo(sizeof(MachO::rpath_command) + Path.size() + 1, 8);
-  LC.MachOLoadCommand.rpath_command_data = RPathLC;
-  LC.Payload.assign(RPathLC.cmdsize - sizeof(MachO::rpath_command), 0);
-  std::copy(Path.begin(), Path.end(), LC.Payload.begin());
-  return LC;
-}
-
-static Error processLoadCommands(const CommonConfig &Config, Object &Obj) {
-  // Remove RPaths.
-  DenseSet<StringRef> RPathsToRemove(Config.RPathsToRemove.begin(),
-                                     Config.RPathsToRemove.end());
-
-  LoadCommandPred RemovePred = [&RPathsToRemove,
-                                &Config](const LoadCommand &LC) {
-    if (LC.MachOLoadCommand.load_command_data.cmd == MachO::LC_RPATH) {
-      // When removing all RPaths we don't need to care
-      // about what it contains
-      if (Config.RemoveAllRpaths)
-        return true;
-
-      StringRef RPath = getPayloadString(LC);
-      if (RPathsToRemove.count(RPath)) {
-        RPathsToRemove.erase(RPath);
-        return true;
-      }
-    }
-    return false;
-  };
-
-  if (Error E = Obj.removeLoadCommands(RemovePred))
-    return E;
-
-  // Emit an error if the Mach-O binary does not contain an rpath path name
-  // specified in -delete_rpath.
-  for (StringRef RPath : Config.RPathsToRemove) {
-    if (RPathsToRemove.count(RPath))
-      return createStringError(errc::invalid_argument,
-                               "no LC_RPATH load command with path: %s",
-                               RPath.str().c_str());
-  }
-
-  DenseSet<StringRef> RPaths;
-
-  // Get all existing RPaths.
-  for (LoadCommand &LC : Obj.LoadCommands) {
-    if (LC.MachOLoadCommand.load_command_data.cmd == MachO::LC_RPATH)
-      RPaths.insert(getPayloadString(LC));
-  }
-
-  // Throw errors for invalid RPaths.
-  for (const auto &OldNew : Config.RPathsToUpdate) {
-    StringRef Old = OldNew.getFirst();
-    StringRef New = OldNew.getSecond();
-    if (!RPaths.contains(Old))
-      return createStringError(errc::invalid_argument,
-                               "no LC_RPATH load command with path: " + Old);
-    if (RPaths.contains(New))
-      return createStringError(errc::invalid_argument,
-                               "rpath '" + New +
-                                   "' would create a duplicate load command");
-  }
-
-  // Update load commands.
-  for (LoadCommand &LC : Obj.LoadCommands) {
-    switch (LC.MachOLoadCommand.load_command_data.cmd) {
-    case MachO::LC_ID_DYLIB:
-      if (Config.SharedLibId)
-        updateLoadCommandPayloadString<MachO::dylib_command>(
-            LC, *Config.SharedLibId);
-      break;
-
-    case MachO::LC_RPATH: {
-      StringRef RPath = getPayloadString(LC);
-      StringRef NewRPath = Config.RPathsToUpdate.lookup(RPath);
-      if (!NewRPath.empty())
-        updateLoadCommandPayloadString<MachO::rpath_command>(LC, NewRPath);
-      break;
-    }
-
-    // TODO: Add LC_REEXPORT_DYLIB, LC_LAZY_LOAD_DYLIB, and LC_LOAD_UPWARD_DYLIB
-    // here once llvm-objcopy supports them.
-    case MachO::LC_LOAD_DYLIB:
-    case MachO::LC_LOAD_WEAK_DYLIB:
-      StringRef InstallName = getPayloadString(LC);
-      StringRef NewInstallName =
-          Config.InstallNamesToUpdate.lookup(InstallName);
-      if (!NewInstallName.empty())
-        updateLoadCommandPayloadString<MachO::dylib_command>(LC,
-                                                             NewInstallName);
-      break;
-    }
-  }
-
-  // Add new RPaths.
-  for (StringRef RPath : Config.RPathToAdd) {
-    if (RPaths.contains(RPath))
-      return createStringError(errc::invalid_argument,
-                               "rpath '" + RPath +
-                                   "' would create a duplicate load command");
-    RPaths.insert(RPath);
-    Obj.LoadCommands.push_back(buildRPathLoadCommand(RPath));
-  }
-
-  for (StringRef RPath : Config.RPathToPrepend) {
-    if (RPaths.contains(RPath))
-      return createStringError(errc::invalid_argument,
-                               "rpath '" + RPath +
-                                   "' would create a duplicate load command");
-
-    RPaths.insert(RPath);
-    Obj.LoadCommands.insert(Obj.LoadCommands.begin(),
-                            buildRPathLoadCommand(RPath));
-  }
-
-  // Unlike appending rpaths, the indexes of subsequent load commands must
-  // be recalculated after prepending one.
-  if (!Config.RPathToPrepend.empty())
-    Obj.updateLoadCommandIndexes();
-
-  return Error::success();
-}
-
-static Error dumpSectionToFile(StringRef SecName, StringRef Filename,
-                               Object &Obj) {
-  for (LoadCommand &LC : Obj.LoadCommands)
-    for (const std::unique_ptr<Section> &Sec : LC.Sections) {
-      if (Sec->CanonicalName == SecName) {
-        Expected<std::unique_ptr<FileOutputBuffer>> BufferOrErr =
-            FileOutputBuffer::create(Filename, Sec->Content.size());
-        if (!BufferOrErr)
-          return BufferOrErr.takeError();
-        std::unique_ptr<FileOutputBuffer> Buf = std::move(*BufferOrErr);
-        llvm::copy(Sec->Content, Buf->getBufferStart());
-
-        if (Error E = Buf->commit())
-          return E;
-        return Error::success();
-      }
-    }
-
-  return createStringError(object_error::parse_failed, "section '%s' not found",
-                           SecName.str().c_str());
-}
-
-static Error addSection(StringRef SecName, StringRef Filename, Object &Obj) {
-  ErrorOr<std::unique_ptr<MemoryBuffer>> BufOrErr =
-      MemoryBuffer::getFile(Filename);
-  if (!BufOrErr)
-    return createFileError(Filename, errorCodeToError(BufOrErr.getError()));
-  std::unique_ptr<MemoryBuffer> Buf = std::move(*BufOrErr);
-
-  std::pair<StringRef, StringRef> Pair = SecName.split(',');
-  StringRef TargetSegName = Pair.first;
-  Section Sec(TargetSegName, Pair.second);
-  Sec.Content = Obj.NewSectionsContents.save(Buf->getBuffer());
-  Sec.Size = Sec.Content.size();
-
-  // Add the a section into an existing segment.
-  for (LoadCommand &LC : Obj.LoadCommands) {
-    Optional<StringRef> SegName = LC.getSegmentName();
-    if (SegName && SegName == TargetSegName) {
-      uint64_t Addr = *LC.getSegmentVMAddr();
-      for (const std::unique_ptr<Section> &S : LC.Sections)
-        Addr = std::max(Addr, S->Addr + S->Size);
-      LC.Sections.push_back(std::make_unique<Section>(Sec));
-      LC.Sections.back()->Addr = Addr;
-      return Error::success();
-    }
-  }
-
-  // There's no segment named TargetSegName. Create a new load command and
-  // Insert a new section into it.
-  LoadCommand &NewSegment =
-      Obj.addSegment(TargetSegName, alignTo(Sec.Size, 16384));
-  NewSegment.Sections.push_back(std::make_unique<Section>(Sec));
-  NewSegment.Sections.back()->Addr = *NewSegment.getSegmentVMAddr();
-  return Error::success();
-}
-
-// isValidMachOCannonicalName returns success if Name is a MachO cannonical name
-// ("<segment>,<section>") and lengths of both segment and section names are
-// valid.
-static Error isValidMachOCannonicalName(StringRef Name) {
-  if (Name.count(',') != 1)
-    return createStringError(errc::invalid_argument,
-                             "invalid section name '%s' (should be formatted "
-                             "as '<segment name>,<section name>')",
-                             Name.str().c_str());
-
-  std::pair<StringRef, StringRef> Pair = Name.split(',');
-  if (Pair.first.size() > 16)
-    return createStringError(errc::invalid_argument,
-                             "too long segment name: '%s'",
-                             Pair.first.str().c_str());
-  if (Pair.second.size() > 16)
-    return createStringError(errc::invalid_argument,
-                             "too long section name: '%s'",
-                             Pair.second.str().c_str());
-  return Error::success();
-}
-
-static Error handleArgs(const CommonConfig &Config, Object &Obj) {
-  // Dump sections before add/remove for compatibility with GNU objcopy.
-  for (StringRef Flag : Config.DumpSection) {
-    StringRef SectionName;
-    StringRef FileName;
-    std::tie(SectionName, FileName) = Flag.split('=');
-    if (Error E = dumpSectionToFile(SectionName, FileName, Obj))
-      return E;
-  }
-
-  if (Error E = removeSections(Config, Obj))
-    return E;
-
-  // Mark symbols to determine which symbols are still needed.
-  if (Config.StripAll)
-    markSymbols(Config, Obj);
-
-  updateAndRemoveSymbols(Config, Obj);
-
-  if (Config.StripAll)
-    for (LoadCommand &LC : Obj.LoadCommands)
-      for (std::unique_ptr<Section> &Sec : LC.Sections)
-        Sec->Relocations.clear();
-
-  for (const auto &Flag : Config.AddSection) {
-    std::pair<StringRef, StringRef> SecPair = Flag.split("=");
-    StringRef SecName = SecPair.first;
-    StringRef File = SecPair.second;
-    if (Error E = isValidMachOCannonicalName(SecName))
-      return E;
-    if (Error E = addSection(SecName, File, Obj))
-      return E;
-  }
-
-  if (Error E = processLoadCommands(Config, Obj))
-    return E;
-
-  return Error::success();
-}
-
-Error objcopy::macho::executeObjcopyOnBinary(const CommonConfig &Config,
-                                             const MachOConfig &,
-                                             object::MachOObjectFile &In,
-                                             raw_ostream &Out) {
-  MachOReader Reader(In);
-  Expected<std::unique_ptr<Object>> O = Reader.create();
-  if (!O)
-    return createFileError(Config.InputFilename, O.takeError());
-
-  if (Error E = handleArgs(Config, **O))
-    return createFileError(Config.InputFilename, std::move(E));
-
-  // Page size used for alignment of segment sizes in Mach-O executables and
-  // dynamic libraries.
-  uint64_t PageSize;
-  switch (In.getArch()) {
-  case Triple::ArchType::arm:
-  case Triple::ArchType::aarch64:
-  case Triple::ArchType::aarch64_32:
-    PageSize = 16384;
-    break;
-  default:
-    PageSize = 4096;
-  }
-
-  MachOWriter Writer(**O, In.is64Bit(), In.isLittleEndian(), PageSize, Out);
-  if (auto E = Writer.finalize())
-    return E;
-  return Writer.write();
-}
-
-Error objcopy::macho::executeObjcopyOnMachOUniversalBinary(
-    const MultiFormatConfig &Config, const MachOUniversalBinary &In,
-    raw_ostream &Out) {
-  SmallVector<OwningBinary<Binary>, 2> Binaries;
-  SmallVector<Slice, 2> Slices;
-  for (const auto &O : In.objects()) {
-    Expected<std::unique_ptr<Archive>> ArOrErr = O.getAsArchive();
-    if (ArOrErr) {
-      Expected<std::vector<NewArchiveMember>> NewArchiveMembersOrErr =
-          createNewArchiveMembers(Config, **ArOrErr);
-      if (!NewArchiveMembersOrErr)
-        return NewArchiveMembersOrErr.takeError();
-      Expected<std::unique_ptr<MemoryBuffer>> OutputBufferOrErr =
-          writeArchiveToBuffer(*NewArchiveMembersOrErr,
-                               (*ArOrErr)->hasSymbolTable(), (*ArOrErr)->kind(),
-                               Config.getCommonConfig().DeterministicArchives,
-                               (*ArOrErr)->isThin());
-      if (!OutputBufferOrErr)
-        return OutputBufferOrErr.takeError();
-      Expected<std::unique_ptr<Binary>> BinaryOrErr =
-          object::createBinary(**OutputBufferOrErr);
-      if (!BinaryOrErr)
-        return BinaryOrErr.takeError();
-      Binaries.emplace_back(std::move(*BinaryOrErr),
-                            std::move(*OutputBufferOrErr));
-      Slices.emplace_back(*cast<Archive>(Binaries.back().getBinary()),
-                          O.getCPUType(), O.getCPUSubType(),
-                          O.getArchFlagName(), O.getAlign());
-      continue;
-    }
-    // The methods getAsArchive, getAsObjectFile, getAsIRObject of the class
-    // ObjectForArch return an Error in case of the type mismatch. We need to
-    // check each in turn to see what kind of slice this is, so ignore errors
-    // produced along the way.
-    consumeError(ArOrErr.takeError());
-
-    Expected<std::unique_ptr<MachOObjectFile>> ObjOrErr = O.getAsObjectFile();
-    if (!ObjOrErr) {
-      consumeError(ObjOrErr.takeError());
-      return createStringError(
-          std::errc::invalid_argument,
-          "slice for '%s' of the universal Mach-O binary "
-          "'%s' is not a Mach-O object or an archive",
-          O.getArchFlagName().c_str(),
-          Config.getCommonConfig().InputFilename.str().c_str());
-    }
-    std::string ArchFlagName = O.getArchFlagName();
-
-    SmallVector<char, 0> Buffer;
-    raw_svector_ostream MemStream(Buffer);
-
-    Expected<const MachOConfig &> MachO = Config.getMachOConfig();
-    if (!MachO)
-      return MachO.takeError();
-
-    if (Error E = executeObjcopyOnBinary(Config.getCommonConfig(), *MachO,
-                                         **ObjOrErr, MemStream))
-      return E;
-
-    std::unique_ptr<MemoryBuffer> MB =
-        std::make_unique<SmallVectorMemoryBuffer>(std::move(Buffer),
-                                                  ArchFlagName);
-    Expected<std::unique_ptr<Binary>> BinaryOrErr = object::createBinary(*MB);
-    if (!BinaryOrErr)
-      return BinaryOrErr.takeError();
-    Binaries.emplace_back(std::move(*BinaryOrErr), std::move(MB));
-    Slices.emplace_back(*cast<MachOObjectFile>(Binaries.back().getBinary()),
-                        O.getAlign());
-  }
-
-  if (Error Err = writeUniversalBinaryToStream(Slices, Out))
-    return Err;
-
-  return Error::success();
-}
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOObjcopy.h b/gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOObjcopy.h
deleted file mode 100644
index e30940a8d6e..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOObjcopy.h
+++ /dev/null
@@ -1,38 +0,0 @@
-//===- MachOObjcopy.h -------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_OBJCOPY_MACHOOBJCOPY_H
-#define LLVM_TOOLS_OBJCOPY_MACHOOBJCOPY_H
-
-namespace llvm {
-class Error;
-class raw_ostream;
-
-namespace object {
-class MachOObjectFile;
-class MachOUniversalBinary;
-} // end namespace object
-
-namespace objcopy {
-struct CommonConfig;
-struct MachOConfig;
-class MultiFormatConfig;
-
-namespace macho {
-Error executeObjcopyOnBinary(const CommonConfig &Config, const MachOConfig &,
-                             object::MachOObjectFile &In, raw_ostream &Out);
-
-Error executeObjcopyOnMachOUniversalBinary(
-    const MultiFormatConfig &Config, const object::MachOUniversalBinary &In,
-    raw_ostream &Out);
-
-} // end namespace macho
-} // end namespace objcopy
-} // end namespace llvm
-
-#endif // LLVM_TOOLS_OBJCOPY_MACHOOBJCOPY_H
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOReader.cpp b/gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOReader.cpp
deleted file mode 100644
index 7d1c29b42c2..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOReader.cpp
+++ /dev/null
@@ -1,346 +0,0 @@
-//===- MachOReader.cpp ------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "MachOReader.h"
-#include "Object.h"
-#include "llvm/BinaryFormat/MachO.h"
-#include "llvm/Object/MachO.h"
-#include "llvm/Support/Errc.h"
-#include <memory>
-
-using namespace llvm;
-using namespace llvm::objcopy;
-using namespace llvm::objcopy::macho;
-
-void MachOReader::readHeader(Object &O) const {
-  O.Header.Magic = MachOObj.getHeader().magic;
-  O.Header.CPUType = MachOObj.getHeader().cputype;
-  O.Header.CPUSubType = MachOObj.getHeader().cpusubtype;
-  O.Header.FileType = MachOObj.getHeader().filetype;
-  O.Header.NCmds = MachOObj.getHeader().ncmds;
-  O.Header.SizeOfCmds = MachOObj.getHeader().sizeofcmds;
-  O.Header.Flags = MachOObj.getHeader().flags;
-}
-
-template <typename SectionType>
-static Section constructSectionCommon(const SectionType &Sec, uint32_t Index) {
-  StringRef SegName(Sec.segname, strnlen(Sec.segname, sizeof(Sec.segname)));
-  StringRef SectName(Sec.sectname, strnlen(Sec.sectname, sizeof(Sec.sectname)));
-  Section S(SegName, SectName);
-  S.Index = Index;
-  S.Addr = Sec.addr;
-  S.Size = Sec.size;
-  S.OriginalOffset = Sec.offset;
-  S.Align = Sec.align;
-  S.RelOff = Sec.reloff;
-  S.NReloc = Sec.nreloc;
-  S.Flags = Sec.flags;
-  S.Reserved1 = Sec.reserved1;
-  S.Reserved2 = Sec.reserved2;
-  S.Reserved3 = 0;
-  return S;
-}
-
-Section constructSection(const MachO::section &Sec, uint32_t Index) {
-  return constructSectionCommon(Sec, Index);
-}
-
-Section constructSection(const MachO::section_64 &Sec, uint32_t Index) {
-  Section S = constructSectionCommon(Sec, Index);
-  S.Reserved3 = Sec.reserved3;
-  return S;
-}
-
-template <typename SectionType, typename SegmentType>
-Expected<std::vector<std::unique_ptr<Section>>> static extractSections(
-    const object::MachOObjectFile::LoadCommandInfo &LoadCmd,
-    const object::MachOObjectFile &MachOObj, uint32_t &NextSectionIndex) {
-  std::vector<std::unique_ptr<Section>> Sections;
-  for (auto Curr = reinterpret_cast<const SectionType *>(LoadCmd.Ptr +
-                                                         sizeof(SegmentType)),
-            End = reinterpret_cast<const SectionType *>(LoadCmd.Ptr +
-                                                        LoadCmd.C.cmdsize);
-       Curr < End; ++Curr) {
-    SectionType Sec;
-    memcpy((void *)&Sec, Curr, sizeof(SectionType));
-
-    if (MachOObj.isLittleEndian() != sys::IsLittleEndianHost)
-      MachO::swapStruct(Sec);
-
-    Sections.push_back(
-        std::make_unique<Section>(constructSection(Sec, NextSectionIndex)));
-
-    Section &S = *Sections.back();
-
-    Expected<object::SectionRef> SecRef =
-        MachOObj.getSection(NextSectionIndex++);
-    if (!SecRef)
-      return SecRef.takeError();
-
-    Expected<ArrayRef<uint8_t>> Data =
-        MachOObj.getSectionContents(SecRef->getRawDataRefImpl());
-    if (!Data)
-      return Data.takeError();
-
-    S.Content =
-        StringRef(reinterpret_cast<const char *>(Data->data()), Data->size());
-
-    const uint32_t CPUType = MachOObj.getHeader().cputype;
-    S.Relocations.reserve(S.NReloc);
-    for (auto RI = MachOObj.section_rel_begin(SecRef->getRawDataRefImpl()),
-              RE = MachOObj.section_rel_end(SecRef->getRawDataRefImpl());
-         RI != RE; ++RI) {
-      RelocationInfo R;
-      R.Symbol = nullptr; // We'll fill this field later.
-      R.Info = MachOObj.getRelocation(RI->getRawDataRefImpl());
-      R.Scattered = MachOObj.isRelocationScattered(R.Info);
-      unsigned Type = MachOObj.getAnyRelocationType(R.Info);
-      // TODO Support CPU_TYPE_ARM.
-      R.IsAddend = !R.Scattered && (CPUType == MachO::CPU_TYPE_ARM64 &&
-                                    Type == MachO::ARM64_RELOC_ADDEND);
-      R.Extern = !R.Scattered && MachOObj.getPlainRelocationExternal(R.Info);
-      S.Relocations.push_back(R);
-    }
-
-    assert(S.NReloc == S.Relocations.size() &&
-           "Incorrect number of relocations");
-  }
-  return std::move(Sections);
-}
-
-Error MachOReader::readLoadCommands(Object &O) const {
-  // For MachO sections indices start from 1.
-  uint32_t NextSectionIndex = 1;
-  for (auto LoadCmd : MachOObj.load_commands()) {
-    LoadCommand LC;
-    switch (LoadCmd.C.cmd) {
-    case MachO::LC_CODE_SIGNATURE:
-      O.CodeSignatureCommandIndex = O.LoadCommands.size();
-      break;
-    case MachO::LC_SEGMENT:
-      if (Expected<std::vector<std::unique_ptr<Section>>> Sections =
-              extractSections<MachO::section, MachO::segment_command>(
-                  LoadCmd, MachOObj, NextSectionIndex))
-        LC.Sections = std::move(*Sections);
-      else
-        return Sections.takeError();
-      break;
-    case MachO::LC_SEGMENT_64:
-      if (Expected<std::vector<std::unique_ptr<Section>>> Sections =
-              extractSections<MachO::section_64, MachO::segment_command_64>(
-                  LoadCmd, MachOObj, NextSectionIndex))
-        LC.Sections = std::move(*Sections);
-      else
-        return Sections.takeError();
-      break;
-    case MachO::LC_SYMTAB:
-      O.SymTabCommandIndex = O.LoadCommands.size();
-      break;
-    case MachO::LC_DYSYMTAB:
-      O.DySymTabCommandIndex = O.LoadCommands.size();
-      break;
-    case MachO::LC_DYLD_INFO:
-    case MachO::LC_DYLD_INFO_ONLY:
-      O.DyLdInfoCommandIndex = O.LoadCommands.size();
-      break;
-    case MachO::LC_DATA_IN_CODE:
-      O.DataInCodeCommandIndex = O.LoadCommands.size();
-      break;
-    case MachO::LC_LINKER_OPTIMIZATION_HINT:
-      O.LinkerOptimizationHintCommandIndex = O.LoadCommands.size();
-      break;
-    case MachO::LC_FUNCTION_STARTS:
-      O.FunctionStartsCommandIndex = O.LoadCommands.size();
-      break;
-    }
-#define HANDLE_LOAD_COMMAND(LCName, LCValue, LCStruct)                         \
-  case MachO::LCName:                                                          \
-    memcpy((void *)&(LC.MachOLoadCommand.LCStruct##_data), LoadCmd.Ptr,        \
-           sizeof(MachO::LCStruct));                                           \
-    if (MachOObj.isLittleEndian() != sys::IsLittleEndianHost)                  \
-      MachO::swapStruct(LC.MachOLoadCommand.LCStruct##_data);                  \
-    if (LoadCmd.C.cmdsize > sizeof(MachO::LCStruct))                           \
-      LC.Payload = ArrayRef<uint8_t>(                                          \
-          reinterpret_cast<uint8_t *>(const_cast<char *>(LoadCmd.Ptr)) +       \
-              sizeof(MachO::LCStruct),                                         \
-          LoadCmd.C.cmdsize - sizeof(MachO::LCStruct));                        \
-    break;
-
-    switch (LoadCmd.C.cmd) {
-    default:
-      memcpy((void *)&(LC.MachOLoadCommand.load_command_data), LoadCmd.Ptr,
-             sizeof(MachO::load_command));
-      if (MachOObj.isLittleEndian() != sys::IsLittleEndianHost)
-        MachO::swapStruct(LC.MachOLoadCommand.load_command_data);
-      if (LoadCmd.C.cmdsize > sizeof(MachO::load_command))
-        LC.Payload = ArrayRef<uint8_t>(
-            reinterpret_cast<uint8_t *>(const_cast<char *>(LoadCmd.Ptr)) +
-                sizeof(MachO::load_command),
-            LoadCmd.C.cmdsize - sizeof(MachO::load_command));
-      break;
-#include "llvm/BinaryFormat/MachO.def"
-    }
-    O.LoadCommands.push_back(std::move(LC));
-  }
-  return Error::success();
-}
-
-template <typename nlist_t>
-SymbolEntry constructSymbolEntry(StringRef StrTable, const nlist_t &nlist) {
-  assert(nlist.n_strx < StrTable.size() &&
-         "n_strx exceeds the size of the string table");
-  SymbolEntry SE;
-  SE.Name = StringRef(StrTable.data() + nlist.n_strx).str();
-  SE.n_type = nlist.n_type;
-  SE.n_sect = nlist.n_sect;
-  SE.n_desc = nlist.n_desc;
-  SE.n_value = nlist.n_value;
-  return SE;
-}
-
-void MachOReader::readSymbolTable(Object &O) const {
-  StringRef StrTable = MachOObj.getStringTableData();
-  for (auto Symbol : MachOObj.symbols()) {
-    SymbolEntry SE =
-        (MachOObj.is64Bit()
-             ? constructSymbolEntry(StrTable, MachOObj.getSymbol64TableEntry(
-                                                  Symbol.getRawDataRefImpl()))
-             : constructSymbolEntry(StrTable, MachOObj.getSymbolTableEntry(
-                                                  Symbol.getRawDataRefImpl())));
-
-    O.SymTable.Symbols.push_back(std::make_unique<SymbolEntry>(SE));
-  }
-}
-
-void MachOReader::setSymbolInRelocationInfo(Object &O) const {
-  std::vector<const Section *> Sections;
-  for (auto &LC : O.LoadCommands)
-    for (std::unique_ptr<Section> &Sec : LC.Sections)
-      Sections.push_back(Sec.get());
-
-  for (LoadCommand &LC : O.LoadCommands)
-    for (std::unique_ptr<Section> &Sec : LC.Sections)
-      for (auto &Reloc : Sec->Relocations)
-        if (!Reloc.Scattered && !Reloc.IsAddend) {
-          const uint32_t SymbolNum =
-              Reloc.getPlainRelocationSymbolNum(MachOObj.isLittleEndian());
-          if (Reloc.Extern) {
-            Reloc.Symbol = O.SymTable.getSymbolByIndex(SymbolNum);
-          } else {
-            // FIXME: Refactor error handling in MachOReader and report an error
-            // if we encounter an invalid relocation.
-            assert(SymbolNum >= 1 && SymbolNum <= Sections.size() &&
-                   "Invalid section index.");
-            Reloc.Sec = Sections[SymbolNum - 1];
-          }
-        }
-}
-
-void MachOReader::readRebaseInfo(Object &O) const {
-  O.Rebases.Opcodes = MachOObj.getDyldInfoRebaseOpcodes();
-}
-
-void MachOReader::readBindInfo(Object &O) const {
-  O.Binds.Opcodes = MachOObj.getDyldInfoBindOpcodes();
-}
-
-void MachOReader::readWeakBindInfo(Object &O) const {
-  O.WeakBinds.Opcodes = MachOObj.getDyldInfoWeakBindOpcodes();
-}
-
-void MachOReader::readLazyBindInfo(Object &O) const {
-  O.LazyBinds.Opcodes = MachOObj.getDyldInfoLazyBindOpcodes();
-}
-
-void MachOReader::readExportInfo(Object &O) const {
-  O.Exports.Trie = MachOObj.getDyldInfoExportsTrie();
-}
-
-void MachOReader::readLinkData(Object &O, Optional<size_t> LCIndex,
-                               LinkData &LD) const {
-  if (!LCIndex)
-    return;
-  const MachO::linkedit_data_command &LC =
-      O.LoadCommands[*LCIndex].MachOLoadCommand.linkedit_data_command_data;
-  LD.Data =
-      arrayRefFromStringRef(MachOObj.getData().substr(LC.dataoff, LC.datasize));
-}
-
-void MachOReader::readCodeSignature(Object &O) const {
-  return readLinkData(O, O.CodeSignatureCommandIndex, O.CodeSignature);
-}
-
-void MachOReader::readDataInCodeData(Object &O) const {
-  return readLinkData(O, O.DataInCodeCommandIndex, O.DataInCode);
-}
-
-void MachOReader::readLinkerOptimizationHint(Object &O) const {
-  return readLinkData(O, O.LinkerOptimizationHintCommandIndex,
-                      O.LinkerOptimizationHint);
-}
-
-void MachOReader::readFunctionStartsData(Object &O) const {
-  return readLinkData(O, O.FunctionStartsCommandIndex, O.FunctionStarts);
-}
-
-void MachOReader::readIndirectSymbolTable(Object &O) const {
-  MachO::dysymtab_command DySymTab = MachOObj.getDysymtabLoadCommand();
-  constexpr uint32_t AbsOrLocalMask =
-      MachO::INDIRECT_SYMBOL_LOCAL | MachO::INDIRECT_SYMBOL_ABS;
-  for (uint32_t i = 0; i < DySymTab.nindirectsyms; ++i) {
-    uint32_t Index = MachOObj.getIndirectSymbolTableEntry(DySymTab, i);
-    if ((Index & AbsOrLocalMask) != 0)
-      O.IndirectSymTable.Symbols.emplace_back(Index, None);
-    else
-      O.IndirectSymTable.Symbols.emplace_back(
-          Index, O.SymTable.getSymbolByIndex(Index));
-  }
-}
-
-void MachOReader::readSwiftVersion(Object &O) const {
-  struct ObjCImageInfo {
-    uint32_t Version;
-    uint32_t Flags;
-  } ImageInfo;
-
-  for (const LoadCommand &LC : O.LoadCommands)
-    for (const std::unique_ptr<Section> &Sec : LC.Sections)
-      if (Sec->Sectname == "__objc_imageinfo" &&
-          (Sec->Segname == "__DATA" || Sec->Segname == "__DATA_CONST" ||
-           Sec->Segname == "__DATA_DIRTY") &&
-          Sec->Content.size() >= sizeof(ObjCImageInfo)) {
-        memcpy(&ImageInfo, Sec->Content.data(), sizeof(ObjCImageInfo));
-        if (MachOObj.isLittleEndian() != sys::IsLittleEndianHost) {
-          sys::swapByteOrder(ImageInfo.Version);
-          sys::swapByteOrder(ImageInfo.Flags);
-        }
-        O.SwiftVersion = (ImageInfo.Flags >> 8) & 0xff;
-        return;
-      }
-}
-
-Expected<std::unique_ptr<Object>> MachOReader::create() const {
-  auto Obj = std::make_unique<Object>();
-  readHeader(*Obj);
-  if (Error E = readLoadCommands(*Obj))
-    return std::move(E);
-  readSymbolTable(*Obj);
-  setSymbolInRelocationInfo(*Obj);
-  readRebaseInfo(*Obj);
-  readBindInfo(*Obj);
-  readWeakBindInfo(*Obj);
-  readLazyBindInfo(*Obj);
-  readExportInfo(*Obj);
-  readCodeSignature(*Obj);
-  readDataInCodeData(*Obj);
-  readLinkerOptimizationHint(*Obj);
-  readFunctionStartsData(*Obj);
-  readIndirectSymbolTable(*Obj);
-  readSwiftVersion(*Obj);
-  return std::move(Obj);
-}
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOReader.h b/gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOReader.h
deleted file mode 100644
index ca3a0214cb6..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOReader.h
+++ /dev/null
@@ -1,55 +0,0 @@
-//===- MachOReader.h --------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "MachOObjcopy.h"
-#include "Object.h"
-#include "llvm/BinaryFormat/MachO.h"
-#include "llvm/Object/MachO.h"
-#include <memory>
-
-namespace llvm {
-namespace objcopy {
-namespace macho {
-
-// The hierarchy of readers is responsible for parsing different inputs:
-// raw binaries and regular MachO object files.
-class Reader {
-public:
-  virtual ~Reader(){};
-  virtual Expected<std::unique_ptr<Object>> create() const = 0;
-};
-
-class MachOReader : public Reader {
-  const object::MachOObjectFile &MachOObj;
-
-  void readHeader(Object &O) const;
-  Error readLoadCommands(Object &O) const;
-  void readSymbolTable(Object &O) const;
-  void setSymbolInRelocationInfo(Object &O) const;
-  void readRebaseInfo(Object &O) const;
-  void readBindInfo(Object &O) const;
-  void readWeakBindInfo(Object &O) const;
-  void readLazyBindInfo(Object &O) const;
-  void readExportInfo(Object &O) const;
-  void readLinkData(Object &O, Optional<size_t> LCIndex, LinkData &LD) const;
-  void readCodeSignature(Object &O) const;
-  void readDataInCodeData(Object &O) const;
-  void readLinkerOptimizationHint(Object &O) const;
-  void readFunctionStartsData(Object &O) const;
-  void readIndirectSymbolTable(Object &O) const;
-  void readSwiftVersion(Object &O) const;
-
-public:
-  explicit MachOReader(const object::MachOObjectFile &Obj) : MachOObj(Obj) {}
-
-  Expected<std::unique_ptr<Object>> create() const override;
-};
-
-} // end namespace macho
-} // end namespace objcopy
-} // end namespace llvm
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOWriter.cpp b/gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOWriter.cpp
deleted file mode 100644
index 295098ed411..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOWriter.cpp
+++ /dev/null
@@ -1,555 +0,0 @@
-//===- MachOWriter.cpp ------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "MachOWriter.h"
-#include "MachOLayoutBuilder.h"
-#include "Object.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/BinaryFormat/MachO.h"
-#include "llvm/Object/MachO.h"
-#include "llvm/Support/Errc.h"
-#include "llvm/Support/ErrorHandling.h"
-#include <memory>
-
-using namespace llvm;
-using namespace llvm::objcopy::macho;
-
-size_t MachOWriter::headerSize() const {
-  return Is64Bit ? sizeof(MachO::mach_header_64) : sizeof(MachO::mach_header);
-}
-
-size_t MachOWriter::loadCommandsSize() const { return O.Header.SizeOfCmds; }
-
-size_t MachOWriter::symTableSize() const {
-  return O.SymTable.Symbols.size() *
-         (Is64Bit ? sizeof(MachO::nlist_64) : sizeof(MachO::nlist));
-}
-
-size_t MachOWriter::totalSize() const {
-  // Going from tail to head and looking for an appropriate "anchor" to
-  // calculate the total size assuming that all the offsets are either valid
-  // ("true") or 0 (0 indicates that the corresponding part is missing).
-
-  SmallVector<size_t, 7> Ends;
-  if (O.SymTabCommandIndex) {
-    const MachO::symtab_command &SymTabCommand =
-        O.LoadCommands[*O.SymTabCommandIndex]
-            .MachOLoadCommand.symtab_command_data;
-    if (SymTabCommand.symoff)
-      Ends.push_back(SymTabCommand.symoff + symTableSize());
-    if (SymTabCommand.stroff)
-      Ends.push_back(SymTabCommand.stroff + SymTabCommand.strsize);
-  }
-  if (O.DyLdInfoCommandIndex) {
-    const MachO::dyld_info_command &DyLdInfoCommand =
-        O.LoadCommands[*O.DyLdInfoCommandIndex]
-            .MachOLoadCommand.dyld_info_command_data;
-    if (DyLdInfoCommand.rebase_off) {
-      assert((DyLdInfoCommand.rebase_size == O.Rebases.Opcodes.size()) &&
-             "Incorrect rebase opcodes size");
-      Ends.push_back(DyLdInfoCommand.rebase_off + DyLdInfoCommand.rebase_size);
-    }
-    if (DyLdInfoCommand.bind_off) {
-      assert((DyLdInfoCommand.bind_size == O.Binds.Opcodes.size()) &&
-             "Incorrect bind opcodes size");
-      Ends.push_back(DyLdInfoCommand.bind_off + DyLdInfoCommand.bind_size);
-    }
-    if (DyLdInfoCommand.weak_bind_off) {
-      assert((DyLdInfoCommand.weak_bind_size == O.WeakBinds.Opcodes.size()) &&
-             "Incorrect weak bind opcodes size");
-      Ends.push_back(DyLdInfoCommand.weak_bind_off +
-                     DyLdInfoCommand.weak_bind_size);
-    }
-    if (DyLdInfoCommand.lazy_bind_off) {
-      assert((DyLdInfoCommand.lazy_bind_size == O.LazyBinds.Opcodes.size()) &&
-             "Incorrect lazy bind opcodes size");
-      Ends.push_back(DyLdInfoCommand.lazy_bind_off +
-                     DyLdInfoCommand.lazy_bind_size);
-    }
-    if (DyLdInfoCommand.export_off) {
-      assert((DyLdInfoCommand.export_size == O.Exports.Trie.size()) &&
-             "Incorrect trie size");
-      Ends.push_back(DyLdInfoCommand.export_off + DyLdInfoCommand.export_size);
-    }
-  }
-
-  if (O.DySymTabCommandIndex) {
-    const MachO::dysymtab_command &DySymTabCommand =
-        O.LoadCommands[*O.DySymTabCommandIndex]
-            .MachOLoadCommand.dysymtab_command_data;
-
-    if (DySymTabCommand.indirectsymoff)
-      Ends.push_back(DySymTabCommand.indirectsymoff +
-                     sizeof(uint32_t) * O.IndirectSymTable.Symbols.size());
-  }
-
-  if (O.CodeSignatureCommandIndex) {
-    const MachO::linkedit_data_command &LinkEditDataCommand =
-        O.LoadCommands[*O.CodeSignatureCommandIndex]
-            .MachOLoadCommand.linkedit_data_command_data;
-    if (LinkEditDataCommand.dataoff)
-      Ends.push_back(LinkEditDataCommand.dataoff +
-                     LinkEditDataCommand.datasize);
-  }
-
-  if (O.DataInCodeCommandIndex) {
-    const MachO::linkedit_data_command &LinkEditDataCommand =
-        O.LoadCommands[*O.DataInCodeCommandIndex]
-            .MachOLoadCommand.linkedit_data_command_data;
-
-    if (LinkEditDataCommand.dataoff)
-      Ends.push_back(LinkEditDataCommand.dataoff +
-                     LinkEditDataCommand.datasize);
-  }
-
-  if (O.LinkerOptimizationHintCommandIndex) {
-    const MachO::linkedit_data_command &LinkEditDataCommand =
-        O.LoadCommands[*O.LinkerOptimizationHintCommandIndex]
-            .MachOLoadCommand.linkedit_data_command_data;
-
-    if (LinkEditDataCommand.dataoff)
-      Ends.push_back(LinkEditDataCommand.dataoff +
-                     LinkEditDataCommand.datasize);
-  }
-
-  if (O.FunctionStartsCommandIndex) {
-    const MachO::linkedit_data_command &LinkEditDataCommand =
-        O.LoadCommands[*O.FunctionStartsCommandIndex]
-            .MachOLoadCommand.linkedit_data_command_data;
-
-    if (LinkEditDataCommand.dataoff)
-      Ends.push_back(LinkEditDataCommand.dataoff +
-                     LinkEditDataCommand.datasize);
-  }
-
-  // Otherwise, use the last section / reloction.
-  for (const LoadCommand &LC : O.LoadCommands)
-    for (const std::unique_ptr<Section> &S : LC.Sections) {
-      if (!S->hasValidOffset()) {
-        assert((S->Offset == 0) && "Skipped section's offset must be zero");
-        assert((S->isVirtualSection() || S->Size == 0) &&
-               "Non-zero-fill sections with zero offset must have zero size");
-        continue;
-      }
-      assert((S->Offset != 0) &&
-             "Non-zero-fill section's offset cannot be zero");
-      Ends.push_back(S->Offset + S->Size);
-      if (S->RelOff)
-        Ends.push_back(S->RelOff +
-                       S->NReloc * sizeof(MachO::any_relocation_info));
-    }
-
-  if (!Ends.empty())
-    return *std::max_element(Ends.begin(), Ends.end());
-
-  // Otherwise, we have only Mach header and load commands.
-  return headerSize() + loadCommandsSize();
-}
-
-void MachOWriter::writeHeader() {
-  MachO::mach_header_64 Header;
-
-  Header.magic = O.Header.Magic;
-  Header.cputype = O.Header.CPUType;
-  Header.cpusubtype = O.Header.CPUSubType;
-  Header.filetype = O.Header.FileType;
-  Header.ncmds = O.Header.NCmds;
-  Header.sizeofcmds = O.Header.SizeOfCmds;
-  Header.flags = O.Header.Flags;
-  Header.reserved = O.Header.Reserved;
-
-  if (IsLittleEndian != sys::IsLittleEndianHost)
-    MachO::swapStruct(Header);
-
-  auto HeaderSize =
-      Is64Bit ? sizeof(MachO::mach_header_64) : sizeof(MachO::mach_header);
-  memcpy(Buf->getBufferStart(), &Header, HeaderSize);
-}
-
-void MachOWriter::writeLoadCommands() {
-  uint8_t *Begin =
-      reinterpret_cast<uint8_t *>(Buf->getBufferStart()) + headerSize();
-  for (const LoadCommand &LC : O.LoadCommands) {
-    // Construct a load command.
-    MachO::macho_load_command MLC = LC.MachOLoadCommand;
-    switch (MLC.load_command_data.cmd) {
-    case MachO::LC_SEGMENT:
-      if (IsLittleEndian != sys::IsLittleEndianHost)
-        MachO::swapStruct(MLC.segment_command_data);
-      memcpy(Begin, &MLC.segment_command_data, sizeof(MachO::segment_command));
-      Begin += sizeof(MachO::segment_command);
-
-      for (const std::unique_ptr<Section> &Sec : LC.Sections)
-        writeSectionInLoadCommand<MachO::section>(*Sec, Begin);
-      continue;
-    case MachO::LC_SEGMENT_64:
-      if (IsLittleEndian != sys::IsLittleEndianHost)
-        MachO::swapStruct(MLC.segment_command_64_data);
-      memcpy(Begin, &MLC.segment_command_64_data,
-             sizeof(MachO::segment_command_64));
-      Begin += sizeof(MachO::segment_command_64);
-
-      for (const std::unique_ptr<Section> &Sec : LC.Sections)
-        writeSectionInLoadCommand<MachO::section_64>(*Sec, Begin);
-      continue;
-    }
-
-#define HANDLE_LOAD_COMMAND(LCName, LCValue, LCStruct)                         \
-  case MachO::LCName:                                                          \
-    assert(sizeof(MachO::LCStruct) + LC.Payload.size() ==                      \
-           MLC.load_command_data.cmdsize);                                     \
-    if (IsLittleEndian != sys::IsLittleEndianHost)                             \
-      MachO::swapStruct(MLC.LCStruct##_data);                                  \
-    memcpy(Begin, &MLC.LCStruct##_data, sizeof(MachO::LCStruct));              \
-    Begin += sizeof(MachO::LCStruct);                                          \
-    if (!LC.Payload.empty())                                                   \
-      memcpy(Begin, LC.Payload.data(), LC.Payload.size());                     \
-    Begin += LC.Payload.size();                                                \
-    break;
-
-    // Copy the load command as it is.
-    switch (MLC.load_command_data.cmd) {
-    default:
-      assert(sizeof(MachO::load_command) + LC.Payload.size() ==
-             MLC.load_command_data.cmdsize);
-      if (IsLittleEndian != sys::IsLittleEndianHost)
-        MachO::swapStruct(MLC.load_command_data);
-      memcpy(Begin, &MLC.load_command_data, sizeof(MachO::load_command));
-      Begin += sizeof(MachO::load_command);
-      if (!LC.Payload.empty())
-        memcpy(Begin, LC.Payload.data(), LC.Payload.size());
-      Begin += LC.Payload.size();
-      break;
-#include "llvm/BinaryFormat/MachO.def"
-    }
-  }
-}
-
-template <typename StructType>
-void MachOWriter::writeSectionInLoadCommand(const Section &Sec, uint8_t *&Out) {
-  StructType Temp;
-  assert(Sec.Segname.size() <= sizeof(Temp.segname) && "too long segment name");
-  assert(Sec.Sectname.size() <= sizeof(Temp.sectname) &&
-         "too long section name");
-  memset(&Temp, 0, sizeof(StructType));
-  memcpy(Temp.segname, Sec.Segname.data(), Sec.Segname.size());
-  memcpy(Temp.sectname, Sec.Sectname.data(), Sec.Sectname.size());
-  Temp.addr = Sec.Addr;
-  Temp.size = Sec.Size;
-  Temp.offset = Sec.Offset;
-  Temp.align = Sec.Align;
-  Temp.reloff = Sec.RelOff;
-  Temp.nreloc = Sec.NReloc;
-  Temp.flags = Sec.Flags;
-  Temp.reserved1 = Sec.Reserved1;
-  Temp.reserved2 = Sec.Reserved2;
-
-  if (IsLittleEndian != sys::IsLittleEndianHost)
-    MachO::swapStruct(Temp);
-  memcpy(Out, &Temp, sizeof(StructType));
-  Out += sizeof(StructType);
-}
-
-void MachOWriter::writeSections() {
-  for (const LoadCommand &LC : O.LoadCommands)
-    for (const std::unique_ptr<Section> &Sec : LC.Sections) {
-      if (!Sec->hasValidOffset()) {
-        assert((Sec->Offset == 0) && "Skipped section's offset must be zero");
-        assert((Sec->isVirtualSection() || Sec->Size == 0) &&
-               "Non-zero-fill sections with zero offset must have zero size");
-        continue;
-      }
-
-      assert(Sec->Offset && "Section offset can not be zero");
-      assert((Sec->Size == Sec->Content.size()) && "Incorrect section size");
-      memcpy(Buf->getBufferStart() + Sec->Offset, Sec->Content.data(),
-             Sec->Content.size());
-      for (size_t Index = 0; Index < Sec->Relocations.size(); ++Index) {
-        RelocationInfo RelocInfo = Sec->Relocations[Index];
-        if (!RelocInfo.Scattered && !RelocInfo.IsAddend) {
-          const uint32_t SymbolNum = RelocInfo.Extern
-                                         ? (*RelocInfo.Symbol)->Index
-                                         : (*RelocInfo.Sec)->Index;
-          RelocInfo.setPlainRelocationSymbolNum(SymbolNum, IsLittleEndian);
-        }
-        if (IsLittleEndian != sys::IsLittleEndianHost)
-          MachO::swapStruct(
-              reinterpret_cast<MachO::any_relocation_info &>(RelocInfo.Info));
-        memcpy(Buf->getBufferStart() + Sec->RelOff +
-                   Index * sizeof(MachO::any_relocation_info),
-               &RelocInfo.Info, sizeof(RelocInfo.Info));
-      }
-    }
-}
-
-template <typename NListType>
-void writeNListEntry(const SymbolEntry &SE, bool IsLittleEndian, char *&Out,
-                     uint32_t Nstrx) {
-  NListType ListEntry;
-  ListEntry.n_strx = Nstrx;
-  ListEntry.n_type = SE.n_type;
-  ListEntry.n_sect = SE.n_sect;
-  ListEntry.n_desc = SE.n_desc;
-  ListEntry.n_value = SE.n_value;
-
-  if (IsLittleEndian != sys::IsLittleEndianHost)
-    MachO::swapStruct(ListEntry);
-  memcpy(Out, reinterpret_cast<const char *>(&ListEntry), sizeof(NListType));
-  Out += sizeof(NListType);
-}
-
-void MachOWriter::writeStringTable() {
-  if (!O.SymTabCommandIndex)
-    return;
-  const MachO::symtab_command &SymTabCommand =
-      O.LoadCommands[*O.SymTabCommandIndex]
-          .MachOLoadCommand.symtab_command_data;
-
-  uint8_t *StrTable = (uint8_t *)Buf->getBufferStart() + SymTabCommand.stroff;
-  LayoutBuilder.getStringTableBuilder().write(StrTable);
-}
-
-void MachOWriter::writeSymbolTable() {
-  if (!O.SymTabCommandIndex)
-    return;
-  const MachO::symtab_command &SymTabCommand =
-      O.LoadCommands[*O.SymTabCommandIndex]
-          .MachOLoadCommand.symtab_command_data;
-
-  char *SymTable = (char *)Buf->getBufferStart() + SymTabCommand.symoff;
-  for (auto Iter = O.SymTable.Symbols.begin(), End = O.SymTable.Symbols.end();
-       Iter != End; Iter++) {
-    SymbolEntry *Sym = Iter->get();
-    uint32_t Nstrx = LayoutBuilder.getStringTableBuilder().getOffset(Sym->Name);
-
-    if (Is64Bit)
-      writeNListEntry<MachO::nlist_64>(*Sym, IsLittleEndian, SymTable, Nstrx);
-    else
-      writeNListEntry<MachO::nlist>(*Sym, IsLittleEndian, SymTable, Nstrx);
-  }
-}
-
-void MachOWriter::writeRebaseInfo() {
-  if (!O.DyLdInfoCommandIndex)
-    return;
-  const MachO::dyld_info_command &DyLdInfoCommand =
-      O.LoadCommands[*O.DyLdInfoCommandIndex]
-          .MachOLoadCommand.dyld_info_command_data;
-  char *Out = (char *)Buf->getBufferStart() + DyLdInfoCommand.rebase_off;
-  assert((DyLdInfoCommand.rebase_size == O.Rebases.Opcodes.size()) &&
-         "Incorrect rebase opcodes size");
-  memcpy(Out, O.Rebases.Opcodes.data(), O.Rebases.Opcodes.size());
-}
-
-void MachOWriter::writeBindInfo() {
-  if (!O.DyLdInfoCommandIndex)
-    return;
-  const MachO::dyld_info_command &DyLdInfoCommand =
-      O.LoadCommands[*O.DyLdInfoCommandIndex]
-          .MachOLoadCommand.dyld_info_command_data;
-  char *Out = (char *)Buf->getBufferStart() + DyLdInfoCommand.bind_off;
-  assert((DyLdInfoCommand.bind_size == O.Binds.Opcodes.size()) &&
-         "Incorrect bind opcodes size");
-  memcpy(Out, O.Binds.Opcodes.data(), O.Binds.Opcodes.size());
-}
-
-void MachOWriter::writeWeakBindInfo() {
-  if (!O.DyLdInfoCommandIndex)
-    return;
-  const MachO::dyld_info_command &DyLdInfoCommand =
-      O.LoadCommands[*O.DyLdInfoCommandIndex]
-          .MachOLoadCommand.dyld_info_command_data;
-  char *Out = (char *)Buf->getBufferStart() + DyLdInfoCommand.weak_bind_off;
-  assert((DyLdInfoCommand.weak_bind_size == O.WeakBinds.Opcodes.size()) &&
-         "Incorrect weak bind opcodes size");
-  memcpy(Out, O.WeakBinds.Opcodes.data(), O.WeakBinds.Opcodes.size());
-}
-
-void MachOWriter::writeLazyBindInfo() {
-  if (!O.DyLdInfoCommandIndex)
-    return;
-  const MachO::dyld_info_command &DyLdInfoCommand =
-      O.LoadCommands[*O.DyLdInfoCommandIndex]
-          .MachOLoadCommand.dyld_info_command_data;
-  char *Out = (char *)Buf->getBufferStart() + DyLdInfoCommand.lazy_bind_off;
-  assert((DyLdInfoCommand.lazy_bind_size == O.LazyBinds.Opcodes.size()) &&
-         "Incorrect lazy bind opcodes size");
-  memcpy(Out, O.LazyBinds.Opcodes.data(), O.LazyBinds.Opcodes.size());
-}
-
-void MachOWriter::writeExportInfo() {
-  if (!O.DyLdInfoCommandIndex)
-    return;
-  const MachO::dyld_info_command &DyLdInfoCommand =
-      O.LoadCommands[*O.DyLdInfoCommandIndex]
-          .MachOLoadCommand.dyld_info_command_data;
-  char *Out = (char *)Buf->getBufferStart() + DyLdInfoCommand.export_off;
-  assert((DyLdInfoCommand.export_size == O.Exports.Trie.size()) &&
-         "Incorrect export trie size");
-  memcpy(Out, O.Exports.Trie.data(), O.Exports.Trie.size());
-}
-
-void MachOWriter::writeIndirectSymbolTable() {
-  if (!O.DySymTabCommandIndex)
-    return;
-
-  const MachO::dysymtab_command &DySymTabCommand =
-      O.LoadCommands[*O.DySymTabCommandIndex]
-          .MachOLoadCommand.dysymtab_command_data;
-
-  uint32_t *Out =
-      (uint32_t *)(Buf->getBufferStart() + DySymTabCommand.indirectsymoff);
-  for (const IndirectSymbolEntry &Sym : O.IndirectSymTable.Symbols) {
-    uint32_t Entry = (Sym.Symbol) ? (*Sym.Symbol)->Index : Sym.OriginalIndex;
-    if (IsLittleEndian != sys::IsLittleEndianHost)
-      sys::swapByteOrder(Entry);
-    *Out++ = Entry;
-  }
-}
-
-void MachOWriter::writeLinkData(Optional<size_t> LCIndex, const LinkData &LD) {
-  if (!LCIndex)
-    return;
-  const MachO::linkedit_data_command &LinkEditDataCommand =
-      O.LoadCommands[*LCIndex].MachOLoadCommand.linkedit_data_command_data;
-  char *Out = (char *)Buf->getBufferStart() + LinkEditDataCommand.dataoff;
-  assert((LinkEditDataCommand.datasize == LD.Data.size()) &&
-         "Incorrect data size");
-  memcpy(Out, LD.Data.data(), LD.Data.size());
-}
-
-void MachOWriter::writeCodeSignatureData() {
-  return writeLinkData(O.CodeSignatureCommandIndex, O.CodeSignature);
-}
-
-void MachOWriter::writeDataInCodeData() {
-  return writeLinkData(O.DataInCodeCommandIndex, O.DataInCode);
-}
-
-void MachOWriter::writeLinkerOptimizationHint() {
-  return writeLinkData(O.LinkerOptimizationHintCommandIndex,
-                       O.LinkerOptimizationHint);
-}
-
-void MachOWriter::writeFunctionStartsData() {
-  return writeLinkData(O.FunctionStartsCommandIndex, O.FunctionStarts);
-}
-
-void MachOWriter::writeTail() {
-  typedef void (MachOWriter::*WriteHandlerType)(void);
-  typedef std::pair<uint64_t, WriteHandlerType> WriteOperation;
-  SmallVector<WriteOperation, 7> Queue;
-
-  if (O.SymTabCommandIndex) {
-    const MachO::symtab_command &SymTabCommand =
-        O.LoadCommands[*O.SymTabCommandIndex]
-            .MachOLoadCommand.symtab_command_data;
-    if (SymTabCommand.symoff)
-      Queue.push_back({SymTabCommand.symoff, &MachOWriter::writeSymbolTable});
-    if (SymTabCommand.stroff)
-      Queue.push_back({SymTabCommand.stroff, &MachOWriter::writeStringTable});
-  }
-
-  if (O.DyLdInfoCommandIndex) {
-    const MachO::dyld_info_command &DyLdInfoCommand =
-        O.LoadCommands[*O.DyLdInfoCommandIndex]
-            .MachOLoadCommand.dyld_info_command_data;
-    if (DyLdInfoCommand.rebase_off)
-      Queue.push_back(
-          {DyLdInfoCommand.rebase_off, &MachOWriter::writeRebaseInfo});
-    if (DyLdInfoCommand.bind_off)
-      Queue.push_back({DyLdInfoCommand.bind_off, &MachOWriter::writeBindInfo});
-    if (DyLdInfoCommand.weak_bind_off)
-      Queue.push_back(
-          {DyLdInfoCommand.weak_bind_off, &MachOWriter::writeWeakBindInfo});
-    if (DyLdInfoCommand.lazy_bind_off)
-      Queue.push_back(
-          {DyLdInfoCommand.lazy_bind_off, &MachOWriter::writeLazyBindInfo});
-    if (DyLdInfoCommand.export_off)
-      Queue.push_back(
-          {DyLdInfoCommand.export_off, &MachOWriter::writeExportInfo});
-  }
-
-  if (O.DySymTabCommandIndex) {
-    const MachO::dysymtab_command &DySymTabCommand =
-        O.LoadCommands[*O.DySymTabCommandIndex]
-            .MachOLoadCommand.dysymtab_command_data;
-
-    if (DySymTabCommand.indirectsymoff)
-      Queue.emplace_back(DySymTabCommand.indirectsymoff,
-                         &MachOWriter::writeIndirectSymbolTable);
-  }
-
-  if (O.CodeSignatureCommandIndex) {
-    const MachO::linkedit_data_command &LinkEditDataCommand =
-        O.LoadCommands[*O.CodeSignatureCommandIndex]
-            .MachOLoadCommand.linkedit_data_command_data;
-
-    if (LinkEditDataCommand.dataoff)
-      Queue.emplace_back(LinkEditDataCommand.dataoff,
-                         &MachOWriter::writeCodeSignatureData);
-  }
-
-  if (O.DataInCodeCommandIndex) {
-    const MachO::linkedit_data_command &LinkEditDataCommand =
-        O.LoadCommands[*O.DataInCodeCommandIndex]
-            .MachOLoadCommand.linkedit_data_command_data;
-
-    if (LinkEditDataCommand.dataoff)
-      Queue.emplace_back(LinkEditDataCommand.dataoff,
-                         &MachOWriter::writeDataInCodeData);
-  }
-
-  if (O.LinkerOptimizationHintCommandIndex) {
-    const MachO::linkedit_data_command &LinkEditDataCommand =
-        O.LoadCommands[*O.LinkerOptimizationHintCommandIndex]
-            .MachOLoadCommand.linkedit_data_command_data;
-
-    if (LinkEditDataCommand.dataoff)
-      Queue.emplace_back(LinkEditDataCommand.dataoff,
-                         &MachOWriter::writeLinkerOptimizationHint);
-  }
-
-  if (O.FunctionStartsCommandIndex) {
-    const MachO::linkedit_data_command &LinkEditDataCommand =
-        O.LoadCommands[*O.FunctionStartsCommandIndex]
-            .MachOLoadCommand.linkedit_data_command_data;
-
-    if (LinkEditDataCommand.dataoff)
-      Queue.emplace_back(LinkEditDataCommand.dataoff,
-                         &MachOWriter::writeFunctionStartsData);
-  }
-
-  llvm::sort(Queue, [](const WriteOperation &LHS, const WriteOperation &RHS) {
-    return LHS.first < RHS.first;
-  });
-
-  for (auto WriteOp : Queue)
-    (this->*WriteOp.second)();
-}
-
-Error MachOWriter::finalize() { return LayoutBuilder.layout(); }
-
-Error MachOWriter::write() {
-  size_t TotalSize = totalSize();
-  Buf = WritableMemoryBuffer::getNewMemBuffer(TotalSize);
-  if (!Buf)
-    return createStringError(errc::not_enough_memory,
-                             "failed to allocate memory buffer of " +
-                                 Twine::utohexstr(TotalSize) + " bytes");
-  memset(Buf->getBufferStart(), 0, totalSize());
-  writeHeader();
-  writeLoadCommands();
-  writeSections();
-  writeTail();
-
-  // TODO: Implement direct writing to the output stream (without intermediate
-  // memory buffer Buf).
-  Out.write(Buf->getBufferStart(), Buf->getBufferSize());
-  return Error::success();
-}
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOWriter.h b/gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOWriter.h
deleted file mode 100644
index c8c06d644e9..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/MachO/MachOWriter.h
+++ /dev/null
@@ -1,68 +0,0 @@
-//===- MachOWriter.h --------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "MachOLayoutBuilder.h"
-#include "MachOObjcopy.h"
-#include "Object.h"
-#include "llvm/BinaryFormat/MachO.h"
-#include "llvm/Object/MachO.h"
-
-namespace llvm {
-class Error;
-
-namespace objcopy {
-namespace macho {
-
-class MachOWriter {
-  Object &O;
-  bool Is64Bit;
-  bool IsLittleEndian;
-  uint64_t PageSize;
-  std::unique_ptr<WritableMemoryBuffer> Buf;
-  raw_ostream &Out;
-  MachOLayoutBuilder LayoutBuilder;
-
-  size_t headerSize() const;
-  size_t loadCommandsSize() const;
-  size_t symTableSize() const;
-  size_t strTableSize() const;
-
-  void writeHeader();
-  void writeLoadCommands();
-  template <typename StructType>
-  void writeSectionInLoadCommand(const Section &Sec, uint8_t *&Out);
-  void writeSections();
-  void writeSymbolTable();
-  void writeStringTable();
-  void writeRebaseInfo();
-  void writeBindInfo();
-  void writeWeakBindInfo();
-  void writeLazyBindInfo();
-  void writeExportInfo();
-  void writeIndirectSymbolTable();
-  void writeLinkData(Optional<size_t> LCIndex, const LinkData &LD);
-  void writeCodeSignatureData();
-  void writeDataInCodeData();
-  void writeLinkerOptimizationHint();
-  void writeFunctionStartsData();
-  void writeTail();
-
-public:
-  MachOWriter(Object &O, bool Is64Bit, bool IsLittleEndian, uint64_t PageSize,
-              raw_ostream &Out)
-      : O(O), Is64Bit(Is64Bit), IsLittleEndian(IsLittleEndian),
-        PageSize(PageSize), Out(Out), LayoutBuilder(O, Is64Bit, PageSize) {}
-
-  size_t totalSize() const;
-  Error finalize();
-  Error write();
-};
-
-} // end namespace macho
-} // end namespace objcopy
-} // end namespace llvm
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/MachO/Object.cpp b/gnu/llvm/llvm/tools/llvm-objcopy/MachO/Object.cpp
deleted file mode 100644
index b4f98fa84cb..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/MachO/Object.cpp
+++ /dev/null
@@ -1,194 +0,0 @@
-//===- Object.cpp - Mach-O object file model --------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "Object.h"
-#include "llvm/ADT/SmallPtrSet.h"
-#include <unordered_set>
-
-using namespace llvm;
-using namespace llvm::objcopy::macho;
-
-const SymbolEntry *SymbolTable::getSymbolByIndex(uint32_t Index) const {
-  assert(Index < Symbols.size() && "invalid symbol index");
-  return Symbols[Index].get();
-}
-
-SymbolEntry *SymbolTable::getSymbolByIndex(uint32_t Index) {
-  return const_cast<SymbolEntry *>(
-      static_cast<const SymbolTable *>(this)->getSymbolByIndex(Index));
-}
-
-void SymbolTable::removeSymbols(
-    function_ref<bool(const std::unique_ptr<SymbolEntry> &)> ToRemove) {
-  llvm::erase_if(Symbols, ToRemove);
-}
-
-void Object::updateLoadCommandIndexes() {
-  // Update indices of special load commands
-  for (size_t Index = 0, Size = LoadCommands.size(); Index < Size; ++Index) {
-    LoadCommand &LC = LoadCommands[Index];
-    switch (LC.MachOLoadCommand.load_command_data.cmd) {
-    case MachO::LC_SYMTAB:
-      SymTabCommandIndex = Index;
-      break;
-    case MachO::LC_DYSYMTAB:
-      DySymTabCommandIndex = Index;
-      break;
-    case MachO::LC_DYLD_INFO:
-    case MachO::LC_DYLD_INFO_ONLY:
-      DyLdInfoCommandIndex = Index;
-      break;
-    case MachO::LC_DATA_IN_CODE:
-      DataInCodeCommandIndex = Index;
-      break;
-    case MachO::LC_LINKER_OPTIMIZATION_HINT:
-      LinkerOptimizationHintCommandIndex = Index;
-      break;
-    case MachO::LC_FUNCTION_STARTS:
-      FunctionStartsCommandIndex = Index;
-      break;
-    }
-  }
-}
-
-Error Object::removeLoadCommands(
-    function_ref<bool(const LoadCommand &)> ToRemove) {
-  auto It = std::stable_partition(
-      LoadCommands.begin(), LoadCommands.end(),
-      [&](const LoadCommand &LC) { return !ToRemove(LC); });
-  LoadCommands.erase(It, LoadCommands.end());
-
-  updateLoadCommandIndexes();
-  return Error::success();
-}
-
-Error Object::removeSections(
-    function_ref<bool(const std::unique_ptr<Section> &)> ToRemove) {
-  DenseMap<uint32_t, const Section *> OldIndexToSection;
-  uint32_t NextSectionIndex = 1;
-  for (LoadCommand &LC : LoadCommands) {
-    auto It = std::stable_partition(
-        std::begin(LC.Sections), std::end(LC.Sections),
-        [&](const std::unique_ptr<Section> &Sec) { return !ToRemove(Sec); });
-    for (auto I = LC.Sections.begin(), End = It; I != End; ++I) {
-      OldIndexToSection[(*I)->Index] = I->get();
-      (*I)->Index = NextSectionIndex++;
-    }
-    LC.Sections.erase(It, LC.Sections.end());
-  }
-
-  auto IsDead = [&](const std::unique_ptr<SymbolEntry> &S) -> bool {
-    Optional<uint32_t> Section = S->section();
-    return (Section && !OldIndexToSection.count(*Section));
-  };
-
-  SmallPtrSet<const SymbolEntry *, 2> DeadSymbols;
-  for (const std::unique_ptr<SymbolEntry> &Sym : SymTable.Symbols)
-    if (IsDead(Sym))
-      DeadSymbols.insert(Sym.get());
-
-  for (const LoadCommand &LC : LoadCommands)
-    for (const std::unique_ptr<Section> &Sec : LC.Sections)
-      for (const RelocationInfo &R : Sec->Relocations)
-        if (R.Symbol && *R.Symbol && DeadSymbols.count(*R.Symbol))
-          return createStringError(std::errc::invalid_argument,
-                                   "symbol '%s' defined in section with index "
-                                   "'%u' cannot be removed because it is "
-                                   "referenced by a relocation in section '%s'",
-                                   (*R.Symbol)->Name.c_str(),
-                                   *((*R.Symbol)->section()),
-                                   Sec->CanonicalName.c_str());
-  SymTable.removeSymbols(IsDead);
-  for (std::unique_ptr<SymbolEntry> &S : SymTable.Symbols)
-    if (S->section())
-      S->n_sect = OldIndexToSection[S->n_sect]->Index;
-  return Error::success();
-}
-
-uint64_t Object::nextAvailableSegmentAddress() const {
-  uint64_t HeaderSize =
-      is64Bit() ? sizeof(MachO::mach_header_64) : sizeof(MachO::mach_header);
-  uint64_t Addr = HeaderSize + Header.SizeOfCmds;
-  for (const LoadCommand &LC : LoadCommands) {
-    const MachO::macho_load_command &MLC = LC.MachOLoadCommand;
-    switch (MLC.load_command_data.cmd) {
-    case MachO::LC_SEGMENT:
-      Addr = std::max(Addr,
-                      static_cast<uint64_t>(MLC.segment_command_data.vmaddr) +
-                          MLC.segment_command_data.vmsize);
-      break;
-    case MachO::LC_SEGMENT_64:
-      Addr = std::max(Addr, MLC.segment_command_64_data.vmaddr +
-                                MLC.segment_command_64_data.vmsize);
-      break;
-    default:
-      continue;
-    }
-  }
-  return Addr;
-}
-
-template <typename SegmentType>
-static void
-constructSegment(SegmentType &Seg, llvm::MachO::LoadCommandType CmdType,
-                 StringRef SegName, uint64_t SegVMAddr, uint64_t SegVMSize) {
-  assert(SegName.size() <= sizeof(Seg.segname) && "too long segment name");
-  memset(&Seg, 0, sizeof(SegmentType));
-  Seg.cmd = CmdType;
-  strncpy(Seg.segname, SegName.data(), SegName.size());
-  Seg.maxprot |=
-      (MachO::VM_PROT_READ | MachO::VM_PROT_WRITE | MachO::VM_PROT_EXECUTE);
-  Seg.initprot |=
-      (MachO::VM_PROT_READ | MachO::VM_PROT_WRITE | MachO::VM_PROT_EXECUTE);
-  Seg.vmaddr = SegVMAddr;
-  Seg.vmsize = SegVMSize;
-}
-
-LoadCommand &Object::addSegment(StringRef SegName, uint64_t SegVMSize) {
-  LoadCommand LC;
-  const uint64_t SegVMAddr = nextAvailableSegmentAddress();
-  if (is64Bit())
-    constructSegment(LC.MachOLoadCommand.segment_command_64_data,
-                     MachO::LC_SEGMENT_64, SegName, SegVMAddr, SegVMSize);
-  else
-    constructSegment(LC.MachOLoadCommand.segment_command_data,
-                     MachO::LC_SEGMENT, SegName, SegVMAddr, SegVMSize);
-
-  LoadCommands.push_back(std::move(LC));
-  return LoadCommands.back();
-}
-
-/// Extracts a segment name from a string which is possibly non-null-terminated.
-static StringRef extractSegmentName(const char *SegName) {
-  return StringRef(SegName,
-                   strnlen(SegName, sizeof(MachO::segment_command::segname)));
-}
-
-Optional<StringRef> LoadCommand::getSegmentName() const {
-  const MachO::macho_load_command &MLC = MachOLoadCommand;
-  switch (MLC.load_command_data.cmd) {
-  case MachO::LC_SEGMENT:
-    return extractSegmentName(MLC.segment_command_data.segname);
-  case MachO::LC_SEGMENT_64:
-    return extractSegmentName(MLC.segment_command_64_data.segname);
-  default:
-    return None;
-  }
-}
-
-Optional<uint64_t> LoadCommand::getSegmentVMAddr() const {
-  const MachO::macho_load_command &MLC = MachOLoadCommand;
-  switch (MLC.load_command_data.cmd) {
-  case MachO::LC_SEGMENT:
-    return MLC.segment_command_data.vmaddr;
-  case MachO::LC_SEGMENT_64:
-    return MLC.segment_command_64_data.vmaddr;
-  default:
-    return None;
-  }
-}
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/MachO/Object.h b/gnu/llvm/llvm/tools/llvm-objcopy/MachO/Object.h
deleted file mode 100644
index 207502e2241..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/MachO/Object.h
+++ /dev/null
@@ -1,366 +0,0 @@
-//===- Object.h - Mach-O object file model ----------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_OBJCOPY_MACHO_OBJECT_H
-#define LLVM_OBJCOPY_MACHO_OBJECT_H
-
-#include "llvm/ADT/Optional.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/BinaryFormat/MachO.h"
-#include "llvm/MC/StringTableBuilder.h"
-#include "llvm/ObjectYAML/DWARFYAML.h"
-#include "llvm/Support/StringSaver.h"
-#include "llvm/Support/YAMLTraits.h"
-#include <cstdint>
-#include <string>
-#include <vector>
-
-namespace llvm {
-namespace objcopy {
-namespace macho {
-
-struct MachHeader {
-  uint32_t Magic;
-  uint32_t CPUType;
-  uint32_t CPUSubType;
-  uint32_t FileType;
-  uint32_t NCmds;
-  uint32_t SizeOfCmds;
-  uint32_t Flags;
-  uint32_t Reserved = 0;
-};
-
-struct RelocationInfo;
-struct Section {
-  uint32_t Index;
-  std::string Segname;
-  std::string Sectname;
-  // CanonicalName is a string formatted as “<Segname>,<Sectname>".
-  std::string CanonicalName;
-  uint64_t Addr = 0;
-  uint64_t Size = 0;
-  // Offset in the input file.
-  Optional<uint32_t> OriginalOffset;
-  uint32_t Offset = 0;
-  uint32_t Align = 0;
-  uint32_t RelOff = 0;
-  uint32_t NReloc = 0;
-  uint32_t Flags = 0;
-  uint32_t Reserved1 = 0;
-  uint32_t Reserved2 = 0;
-  uint32_t Reserved3 = 0;
-  StringRef Content;
-  std::vector<RelocationInfo> Relocations;
-
-  Section(StringRef SegName, StringRef SectName)
-      : Segname(std::string(SegName)), Sectname(std::string(SectName)),
-        CanonicalName((Twine(SegName) + Twine(',') + SectName).str()) {}
-
-  Section(StringRef SegName, StringRef SectName, StringRef Content)
-      : Segname(std::string(SegName)), Sectname(std::string(SectName)),
-        CanonicalName((Twine(SegName) + Twine(',') + SectName).str()),
-        Content(Content) {}
-
-  MachO::SectionType getType() const {
-    return static_cast<MachO::SectionType>(Flags & MachO::SECTION_TYPE);
-  }
-
-  bool isVirtualSection() const {
-    return (getType() == MachO::S_ZEROFILL ||
-            getType() == MachO::S_GB_ZEROFILL ||
-            getType() == MachO::S_THREAD_LOCAL_ZEROFILL);
-  }
-
-  bool hasValidOffset() const {
-    return !(isVirtualSection() || (OriginalOffset && *OriginalOffset == 0));
-  }
-};
-
-struct LoadCommand {
-  // The type MachO::macho_load_command is defined in llvm/BinaryFormat/MachO.h
-  // and it is a union of all the structs corresponding to various load
-  // commands.
-  MachO::macho_load_command MachOLoadCommand;
-
-  // The raw content of the payload of the load command (located right after the
-  // corresponding struct). In some cases it is either empty or can be
-  // copied-over without digging into its structure.
-  std::vector<uint8_t> Payload;
-
-  // Some load commands can contain (inside the payload) an array of sections,
-  // though the contents of the sections are stored separately. The struct
-  // Section describes only sections' metadata and where to find the
-  // corresponding content inside the binary.
-  std::vector<std::unique_ptr<Section>> Sections;
-
-  // Returns the segment name if the load command is a segment command.
-  Optional<StringRef> getSegmentName() const;
-
-  // Returns the segment vm address if the load command is a segment command.
-  Optional<uint64_t> getSegmentVMAddr() const;
-};
-
-// A symbol information. Fields which starts with "n_" are same as them in the
-// nlist.
-struct SymbolEntry {
-  std::string Name;
-  bool Referenced = false;
-  uint32_t Index;
-  uint8_t n_type;
-  uint8_t n_sect;
-  uint16_t n_desc;
-  uint64_t n_value;
-
-  bool isExternalSymbol() const { return n_type & MachO::N_EXT; }
-
-  bool isLocalSymbol() const { return !isExternalSymbol(); }
-
-  bool isUndefinedSymbol() const {
-    return (n_type & MachO::N_TYPE) == MachO::N_UNDF;
-  }
-
-  bool isSwiftSymbol() const {
-    return StringRef(Name).startswith("_$s") ||
-           StringRef(Name).startswith("_$S");
-  }
-
-  Optional<uint32_t> section() const {
-    return n_sect == MachO::NO_SECT ? None : Optional<uint32_t>(n_sect);
-  }
-};
-
-/// The location of the symbol table inside the binary is described by LC_SYMTAB
-/// load command.
-struct SymbolTable {
-  std::vector<std::unique_ptr<SymbolEntry>> Symbols;
-
-  using iterator = pointee_iterator<
-      std::vector<std::unique_ptr<SymbolEntry>>::const_iterator>;
-
-  iterator begin() const { return iterator(Symbols.begin()); }
-  iterator end() const { return iterator(Symbols.end()); }
-
-  const SymbolEntry *getSymbolByIndex(uint32_t Index) const;
-  SymbolEntry *getSymbolByIndex(uint32_t Index);
-  void removeSymbols(
-      function_ref<bool(const std::unique_ptr<SymbolEntry> &)> ToRemove);
-};
-
-struct IndirectSymbolEntry {
-  // The original value in an indirect symbol table. Higher bits encode extra
-  // information (INDIRECT_SYMBOL_LOCAL and INDIRECT_SYMBOL_ABS).
-  uint32_t OriginalIndex;
-  /// The Symbol referenced by this entry. It's None if the index is
-  /// INDIRECT_SYMBOL_LOCAL or INDIRECT_SYMBOL_ABS.
-  Optional<SymbolEntry *> Symbol;
-
-  IndirectSymbolEntry(uint32_t OriginalIndex, Optional<SymbolEntry *> Symbol)
-      : OriginalIndex(OriginalIndex), Symbol(Symbol) {}
-};
-
-struct IndirectSymbolTable {
-  std::vector<IndirectSymbolEntry> Symbols;
-};
-
-/// The location of the string table inside the binary is described by LC_SYMTAB
-/// load command.
-struct StringTable {
-  std::vector<std::string> Strings;
-};
-
-struct RelocationInfo {
-  // The referenced symbol entry. Set if !Scattered && Extern.
-  Optional<const SymbolEntry *> Symbol;
-  // The referenced section. Set if !Scattered && !Extern.
-  Optional<const Section *> Sec;
-  // True if Info is a scattered_relocation_info.
-  bool Scattered;
-  // True if the type is an ADDEND. r_symbolnum holds the addend instead of a
-  // symbol index.
-  bool IsAddend;
-  // True if the r_symbolnum points to a section number (i.e. r_extern=0).
-  bool Extern;
-  MachO::any_relocation_info Info;
-
-  unsigned getPlainRelocationSymbolNum(bool IsLittleEndian) {
-    if (IsLittleEndian)
-      return Info.r_word1 & 0xffffff;
-    return Info.r_word1 >> 8;
-  }
-
-  void setPlainRelocationSymbolNum(unsigned SymbolNum, bool IsLittleEndian) {
-    assert(SymbolNum < (1 << 24) && "SymbolNum out of range");
-    if (IsLittleEndian)
-      Info.r_word1 = (Info.r_word1 & ~0x00ffffff) | SymbolNum;
-    else
-      Info.r_word1 = (Info.r_word1 & ~0xffffff00) | (SymbolNum << 8);
-  }
-};
-
-/// The location of the rebase info inside the binary is described by
-/// LC_DYLD_INFO load command. Dyld rebases an image whenever dyld loads it at
-/// an address different from its preferred address.  The rebase information is
-/// a stream of byte sized opcodes whose symbolic names start with
-/// REBASE_OPCODE_. Conceptually the rebase information is a table of tuples:
-///   <seg-index, seg-offset, type>
-/// The opcodes are a compressed way to encode the table by only
-/// encoding when a column changes.  In addition simple patterns
-/// like "every n'th offset for m times" can be encoded in a few
-/// bytes.
-struct RebaseInfo {
-  // At the moment we do not parse this info (and it is simply copied over),
-  // but the proper support will be added later.
-  ArrayRef<uint8_t> Opcodes;
-};
-
-/// The location of the bind info inside the binary is described by
-/// LC_DYLD_INFO load command. Dyld binds an image during the loading process,
-/// if the image requires any pointers to be initialized to symbols in other
-/// images. The bind information is a stream of byte sized opcodes whose
-/// symbolic names start with BIND_OPCODE_. Conceptually the bind information is
-/// a table of tuples: <seg-index, seg-offset, type, symbol-library-ordinal,
-/// symbol-name, addend> The opcodes are a compressed way to encode the table by
-/// only encoding when a column changes.  In addition simple patterns like for
-/// runs of pointers initialized to the same value can be encoded in a few
-/// bytes.
-struct BindInfo {
-  // At the moment we do not parse this info (and it is simply copied over),
-  // but the proper support will be added later.
-  ArrayRef<uint8_t> Opcodes;
-};
-
-/// The location of the weak bind info inside the binary is described by
-/// LC_DYLD_INFO load command. Some C++ programs require dyld to unique symbols
-/// so that all images in the process use the same copy of some code/data. This
-/// step is done after binding. The content of the weak_bind info is an opcode
-/// stream like the bind_info.  But it is sorted alphabetically by symbol name.
-/// This enable dyld to walk all images with weak binding information in order
-/// and look for collisions.  If there are no collisions, dyld does no updating.
-/// That means that some fixups are also encoded in the bind_info.  For
-/// instance, all calls to "operator new" are first bound to libstdc++.dylib
-/// using the information in bind_info.  Then if some image overrides operator
-/// new that is detected when the weak_bind information is processed and the
-/// call to operator new is then rebound.
-struct WeakBindInfo {
-  // At the moment we do not parse this info (and it is simply copied over),
-  // but the proper support will be added later.
-  ArrayRef<uint8_t> Opcodes;
-};
-
-/// The location of the lazy bind info inside the binary is described by
-/// LC_DYLD_INFO load command. Some uses of external symbols do not need to be
-/// bound immediately. Instead they can be lazily bound on first use.  The
-/// lazy_bind contains a stream of BIND opcodes to bind all lazy symbols. Normal
-/// use is that dyld ignores the lazy_bind section when loading an image.
-/// Instead the static linker arranged for the lazy pointer to initially point
-/// to a helper function which pushes the offset into the lazy_bind area for the
-/// symbol needing to be bound, then jumps to dyld which simply adds the offset
-/// to lazy_bind_off to get the information on what to bind.
-struct LazyBindInfo {
-  ArrayRef<uint8_t> Opcodes;
-};
-
-/// The location of the export info inside the binary is described by
-/// LC_DYLD_INFO load command. The symbols exported by a dylib are encoded in a
-/// trie.  This is a compact representation that factors out common prefixes. It
-/// also reduces LINKEDIT pages in RAM because it encodes all information (name,
-/// address, flags) in one small, contiguous range. The export area is a stream
-/// of nodes.  The first node sequentially is the start node for the trie. Nodes
-/// for a symbol start with a uleb128 that is the length of the exported symbol
-/// information for the string so far. If there is no exported symbol, the node
-/// starts with a zero byte. If there is exported info, it follows the length.
-/// First is a uleb128 containing flags. Normally, it is followed by
-/// a uleb128 encoded offset which is location of the content named
-/// by the symbol from the mach_header for the image.  If the flags
-/// is EXPORT_SYMBOL_FLAGS_REEXPORT, then following the flags is
-/// a uleb128 encoded library ordinal, then a zero terminated
-/// UTF8 string.  If the string is zero length, then the symbol
-/// is re-export from the specified dylib with the same name.
-/// If the flags is EXPORT_SYMBOL_FLAGS_STUB_AND_RESOLVER, then following
-/// the flags is two uleb128s: the stub offset and the resolver offset.
-/// The stub is used by non-lazy pointers.  The resolver is used
-/// by lazy pointers and must be called to get the actual address to use.
-/// After the optional exported symbol information is a byte of
-/// how many edges (0-255) that this node has leaving it,
-/// followed by each edge.
-/// Each edge is a zero terminated UTF8 of the addition chars
-/// in the symbol, followed by a uleb128 offset for the node that
-/// edge points to.
-struct ExportInfo {
-  ArrayRef<uint8_t> Trie;
-};
-
-struct LinkData {
-  ArrayRef<uint8_t> Data;
-};
-
-struct Object {
-  MachHeader Header;
-  std::vector<LoadCommand> LoadCommands;
-
-  SymbolTable SymTable;
-  StringTable StrTable;
-
-  RebaseInfo Rebases;
-  BindInfo Binds;
-  WeakBindInfo WeakBinds;
-  LazyBindInfo LazyBinds;
-  ExportInfo Exports;
-  IndirectSymbolTable IndirectSymTable;
-  LinkData DataInCode;
-  LinkData LinkerOptimizationHint;
-  LinkData FunctionStarts;
-  LinkData CodeSignature;
-
-  Optional<uint32_t> SwiftVersion;
-
-  /// The index of LC_CODE_SIGNATURE load command if present.
-  Optional<size_t> CodeSignatureCommandIndex;
-  /// The index of LC_SYMTAB load command if present.
-  Optional<size_t> SymTabCommandIndex;
-  /// The index of LC_DYLD_INFO or LC_DYLD_INFO_ONLY load command if present.
-  Optional<size_t> DyLdInfoCommandIndex;
-  /// The index LC_DYSYMTAB load comamnd if present.
-  Optional<size_t> DySymTabCommandIndex;
-  /// The index LC_DATA_IN_CODE load comamnd if present.
-  Optional<size_t> DataInCodeCommandIndex;
-  /// The index of LC_LINKER_OPTIMIZATIN_HINT load comamnd if present.
-  Optional<size_t> LinkerOptimizationHintCommandIndex;
-  /// The index LC_FUNCTION_STARTS load comamnd if present.
-  Optional<size_t> FunctionStartsCommandIndex;
-
-  BumpPtrAllocator Alloc;
-  StringSaver NewSectionsContents;
-
-  Object() : NewSectionsContents(Alloc) {}
-
-  Error
-  removeSections(function_ref<bool(const std::unique_ptr<Section> &)> ToRemove);
-
-  Error removeLoadCommands(function_ref<bool(const LoadCommand &)> ToRemove);
-
-  void updateLoadCommandIndexes();
-
-  /// Creates a new segment load command in the object and returns a reference
-  /// to the newly created load command. The caller should verify that SegName
-  /// is not too long (SegName.size() should be less than or equal to 16).
-  LoadCommand &addSegment(StringRef SegName, uint64_t SegVMSize);
-
-  bool is64Bit() const {
-    return Header.Magic == MachO::MH_MAGIC_64 ||
-           Header.Magic == MachO::MH_CIGAM_64;
-  }
-
-  uint64_t nextAvailableSegmentAddress() const;
-};
-
-} // end namespace macho
-} // end namespace objcopy
-} // end namespace llvm
-
-#endif // LLVM_OBJCOPY_MACHO_OBJECT_H
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/MultiFormatConfig.h b/gnu/llvm/llvm/tools/llvm-objcopy/MultiFormatConfig.h
deleted file mode 100644
index 31d9883d6d3..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/MultiFormatConfig.h
+++ /dev/null
@@ -1,37 +0,0 @@
-//===- MultiFormatConfig.h --------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_LLVM_OBJCOPY_MULTIFORMATCONFIG_H
-#define LLVM_TOOLS_LLVM_OBJCOPY_MULTIFORMATCONFIG_H
-
-#include "llvm/Support/Error.h"
-
-namespace llvm {
-namespace objcopy {
-
-struct CommonConfig;
-struct ELFConfig;
-struct COFFConfig;
-struct MachOConfig;
-struct WasmConfig;
-
-class MultiFormatConfig {
-public:
-  virtual ~MultiFormatConfig() {}
-
-  virtual const CommonConfig &getCommonConfig() const = 0;
-  virtual Expected<const ELFConfig &> getELFConfig() const = 0;
-  virtual Expected<const COFFConfig &> getCOFFConfig() const = 0;
-  virtual Expected<const MachOConfig &> getMachOConfig() const = 0;
-  virtual Expected<const WasmConfig &> getWasmConfig() const = 0;
-};
-
-} // namespace objcopy
-} // namespace llvm
-
-#endif // LLVM_TOOLS_LLVM_OBJCOPY_MULTIFORMATCONFIG_H
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/llvm-objcopy.h b/gnu/llvm/llvm/tools/llvm-objcopy/llvm-objcopy.h
deleted file mode 100644
index 182c95dc64c..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/llvm-objcopy.h
+++ /dev/null
@@ -1,34 +0,0 @@
-//===- llvm-objcopy.h -------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_OBJCOPY_OBJCOPY_H
-#define LLVM_TOOLS_OBJCOPY_OBJCOPY_H
-
-#include "llvm/Support/Error.h"
-#include "llvm/Support/raw_ostream.h"
-
-namespace llvm {
-
-struct NewArchiveMember;
-
-namespace object {
-
-class Archive;
-
-} // end namespace object
-
-namespace objcopy {
-class MultiFormatConfig;
-Expected<std::vector<NewArchiveMember>>
-createNewArchiveMembers(const MultiFormatConfig &Config,
-                        const object::Archive &Ar);
-
-} // end namespace objcopy
-} // end namespace llvm
-
-#endif // LLVM_TOOLS_OBJCOPY_OBJCOPY_H
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/wasm/Object.cpp b/gnu/llvm/llvm/tools/llvm-objcopy/wasm/Object.cpp
deleted file mode 100644
index e7a2956fedc..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/wasm/Object.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-//===- Object.cpp ---------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "Object.h"
-
-#include "llvm/Support/LEB128.h"
-#include "llvm/Support/raw_ostream.h"
-
-namespace llvm {
-namespace objcopy {
-namespace wasm {
-
-using namespace object;
-using namespace llvm::wasm;
-
-void Object::addSectionWithOwnedContents(
-    Section NewSection, std::unique_ptr<MemoryBuffer> &&Content) {
-  Sections.push_back(NewSection);
-  OwnedContents.emplace_back(std::move(Content));
-}
-
-void Object::removeSections(function_ref<bool(const Section &)> ToRemove) {
-  // TODO: remove reloc sections for the removed section, handle symbols, etc.
-  llvm::erase_if(Sections, ToRemove);
-}
-
-} // end namespace wasm
-} // end namespace objcopy
-} // end namespace llvm
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/wasm/Object.h b/gnu/llvm/llvm/tools/llvm-objcopy/wasm/Object.h
deleted file mode 100644
index 9db91c41e2e..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/wasm/Object.h
+++ /dev/null
@@ -1,47 +0,0 @@
-//===- Object.h -------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_LLVM_OBJCOPY_WASM_OBJECT_H
-#define LLVM_TOOLS_LLVM_OBJCOPY_WASM_OBJECT_H
-
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Object/Wasm.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include <vector>
-
-namespace llvm {
-namespace objcopy {
-namespace wasm {
-
-struct Section {
-  // For now, each section is only an opaque binary blob with no distinction
-  // between custom and known sections.
-  uint8_t SectionType;
-  StringRef Name;
-  ArrayRef<uint8_t> Contents;
-};
-
-struct Object {
-  llvm::wasm::WasmObjectHeader Header;
-  // For now don't discriminate between kinds of sections.
-  std::vector<Section> Sections;
-
-  void addSectionWithOwnedContents(Section NewSection,
-                                   std::unique_ptr<MemoryBuffer> &&Content);
-  void removeSections(function_ref<bool(const Section &)> ToRemove);
-
-private:
-  std::vector<std::unique_ptr<MemoryBuffer>> OwnedContents;
-};
-
-} // end namespace wasm
-} // end namespace objcopy
-} // end namespace llvm
-
-#endif // LLVM_TOOLS_LLVM_OBJCOPY_WASM_OBJECT_H
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/wasm/Reader.cpp b/gnu/llvm/llvm/tools/llvm-objcopy/wasm/Reader.cpp
deleted file mode 100644
index 13fa84ad802..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/wasm/Reader.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-//===- Reader.cpp ---------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "Reader.h"
-
-namespace llvm {
-namespace objcopy {
-namespace wasm {
-
-using namespace object;
-using namespace llvm::wasm;
-
-Expected<std::unique_ptr<Object>> Reader::create() const {
-  auto Obj = std::make_unique<Object>();
-  Obj->Header = WasmObj.getHeader();
-  std::vector<Section> Sections;
-  Obj->Sections.reserve(WasmObj.getNumSections());
-  for (const SectionRef &Sec : WasmObj.sections()) {
-    const WasmSection &WS = WasmObj.getWasmSection(Sec);
-    Obj->Sections.push_back(
-        {static_cast<uint8_t>(WS.Type), WS.Name, WS.Content});
-  }
-  return std::move(Obj);
-}
-
-} // end namespace wasm
-} // end namespace objcopy
-} // end namespace llvm
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/wasm/Reader.h b/gnu/llvm/llvm/tools/llvm-objcopy/wasm/Reader.h
deleted file mode 100644
index 2dcf7dde029..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/wasm/Reader.h
+++ /dev/null
@@ -1,31 +0,0 @@
-//===- Reader.h -------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_LLVM_OBJCOPY_WASM_READER_H
-#define LLVM_TOOLS_LLVM_OBJCOPY_WASM_READER_H
-
-#include "Object.h"
-
-namespace llvm {
-namespace objcopy {
-namespace wasm {
-
-class Reader {
-public:
-  explicit Reader(const object::WasmObjectFile &O) : WasmObj(O) {}
-  Expected<std::unique_ptr<Object>> create() const;
-
-private:
-  const object::WasmObjectFile &WasmObj;
-};
-
-} // end namespace wasm
-} // end namespace objcopy
-} // end namespace llvm
-
-#endif // LLVM_TOOLS_LLVM_OBJCOPY_WASM_READER_H
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/wasm/WasmConfig.h b/gnu/llvm/llvm/tools/llvm-objcopy/wasm/WasmConfig.h
deleted file mode 100644
index 4e40926ae45..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/wasm/WasmConfig.h
+++ /dev/null
@@ -1,21 +0,0 @@
-//===- WasmConfig.h ---------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_LLVM_OBJCOPY_WASM_WASMCONFIG_H
-#define LLVM_TOOLS_LLVM_OBJCOPY_WASM_WASMCONFIG_H
-
-namespace llvm {
-namespace objcopy {
-
-// Wasm specific configuration for copying/stripping a single file.
-struct WasmConfig {};
-
-} // namespace objcopy
-} // namespace llvm
-
-#endif // LLVM_TOOLS_LLVM_OBJCOPY_WASM_WASMCONFIG_H
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/wasm/WasmObjcopy.cpp b/gnu/llvm/llvm/tools/llvm-objcopy/wasm/WasmObjcopy.cpp
deleted file mode 100644
index 397d09757e5..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/wasm/WasmObjcopy.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-//===- WasmObjcopy.cpp ----------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "WasmObjcopy.h"
-#include "CommonConfig.h"
-#include "Object.h"
-#include "Reader.h"
-#include "Writer.h"
-#include "llvm/Support/Errc.h"
-#include "llvm/Support/FileOutputBuffer.h"
-
-namespace llvm {
-namespace objcopy {
-namespace wasm {
-
-using namespace object;
-using SectionPred = std::function<bool(const Section &Sec)>;
-
-static bool isDebugSection(const Section &Sec) {
-  return Sec.Name.startswith(".debug");
-}
-
-static bool isLinkerSection(const Section &Sec) {
-  return Sec.Name.startswith("reloc.") || Sec.Name == "linking";
-}
-
-static bool isNameSection(const Section &Sec) { return Sec.Name == "name"; }
-
-// Sections which are known to be "comments" or informational and do not affect
-// program semantics.
-static bool isCommentSection(const Section &Sec) {
-  return Sec.Name == "producers";
-}
-
-static Error dumpSectionToFile(StringRef SecName, StringRef Filename,
-                               Object &Obj) {
-  for (const Section &Sec : Obj.Sections) {
-    if (Sec.Name == SecName) {
-      ArrayRef<uint8_t> Contents = Sec.Contents;
-      Expected<std::unique_ptr<FileOutputBuffer>> BufferOrErr =
-          FileOutputBuffer::create(Filename, Contents.size());
-      if (!BufferOrErr)
-        return BufferOrErr.takeError();
-      std::unique_ptr<FileOutputBuffer> Buf = std::move(*BufferOrErr);
-      std::copy(Contents.begin(), Contents.end(), Buf->getBufferStart());
-      if (Error E = Buf->commit())
-        return E;
-      return Error::success();
-    }
-  }
-  return createStringError(errc::invalid_argument, "section '%s' not found",
-                           SecName.str().c_str());
-}
-
-static void removeSections(const CommonConfig &Config, Object &Obj) {
-  SectionPred RemovePred = [](const Section &) { return false; };
-
-  // Explicitly-requested sections.
-  if (!Config.ToRemove.empty()) {
-    RemovePred = [&Config](const Section &Sec) {
-      return Config.ToRemove.matches(Sec.Name);
-    };
-  }
-
-  if (Config.StripDebug) {
-    RemovePred = [RemovePred](const Section &Sec) {
-      return RemovePred(Sec) || isDebugSection(Sec);
-    };
-  }
-
-  if (Config.StripAll) {
-    RemovePred = [RemovePred](const Section &Sec) {
-      return RemovePred(Sec) || isDebugSection(Sec) || isLinkerSection(Sec) ||
-             isNameSection(Sec) || isCommentSection(Sec);
-    };
-  }
-
-  if (Config.OnlyKeepDebug) {
-    RemovePred = [&Config](const Section &Sec) {
-      // Keep debug sections, unless explicitly requested to remove.
-      // Remove everything else, including known sections.
-      return Config.ToRemove.matches(Sec.Name) || !isDebugSection(Sec);
-    };
-  }
-
-  if (!Config.OnlySection.empty()) {
-    RemovePred = [&Config](const Section &Sec) {
-      // Explicitly keep these sections regardless of previous removes.
-      // Remove everything else, inluding known sections.
-      return !Config.OnlySection.matches(Sec.Name);
-    };
-  }
-
-  if (!Config.KeepSection.empty()) {
-    RemovePred = [&Config, RemovePred](const Section &Sec) {
-      // Explicitly keep these sections regardless of previous removes.
-      if (Config.KeepSection.matches(Sec.Name))
-        return false;
-      // Otherwise defer to RemovePred.
-      return RemovePred(Sec);
-    };
-  }
-
-  Obj.removeSections(RemovePred);
-}
-
-static Error handleArgs(const CommonConfig &Config, Object &Obj) {
-  // Only support AddSection, DumpSection, RemoveSection for now.
-  for (StringRef Flag : Config.DumpSection) {
-    StringRef SecName;
-    StringRef FileName;
-    std::tie(SecName, FileName) = Flag.split("=");
-    if (Error E = dumpSectionToFile(SecName, FileName, Obj))
-      return createFileError(FileName, std::move(E));
-  }
-
-  removeSections(Config, Obj);
-
-  for (StringRef Flag : Config.AddSection) {
-    StringRef SecName, FileName;
-    std::tie(SecName, FileName) = Flag.split("=");
-    ErrorOr<std::unique_ptr<MemoryBuffer>> BufOrErr =
-        MemoryBuffer::getFile(FileName);
-    if (!BufOrErr)
-      return createFileError(FileName, errorCodeToError(BufOrErr.getError()));
-    Section Sec;
-    Sec.SectionType = llvm::wasm::WASM_SEC_CUSTOM;
-    Sec.Name = SecName;
-    std::unique_ptr<MemoryBuffer> Buf = std::move(*BufOrErr);
-    Sec.Contents = makeArrayRef<uint8_t>(
-        reinterpret_cast<const uint8_t *>(Buf->getBufferStart()),
-        Buf->getBufferSize());
-    Obj.addSectionWithOwnedContents(Sec, std::move(Buf));
-  }
-
-  return Error::success();
-}
-
-Error executeObjcopyOnBinary(const CommonConfig &Config, const WasmConfig &,
-                             object::WasmObjectFile &In, raw_ostream &Out) {
-  Reader TheReader(In);
-  Expected<std::unique_ptr<Object>> ObjOrErr = TheReader.create();
-  if (!ObjOrErr)
-    return createFileError(Config.InputFilename, ObjOrErr.takeError());
-  Object *Obj = ObjOrErr->get();
-  assert(Obj && "Unable to deserialize Wasm object");
-  if (Error E = handleArgs(Config, *Obj))
-    return E;
-  Writer TheWriter(*Obj, Out);
-  if (Error E = TheWriter.write())
-    return createFileError(Config.OutputFilename, std::move(E));
-  return Error::success();
-}
-
-} // end namespace wasm
-} // end namespace objcopy
-} // end namespace llvm
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/wasm/WasmObjcopy.h b/gnu/llvm/llvm/tools/llvm-objcopy/wasm/WasmObjcopy.h
deleted file mode 100644
index 28268e38c58..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/wasm/WasmObjcopy.h
+++ /dev/null
@@ -1,32 +0,0 @@
-//===- WasmObjcopy.h -------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_LLVM_OBJCOPY_WASM_WASMOBJCOPY_H
-#define LLVM_TOOLS_LLVM_OBJCOPY_WASM_WASMOBJCOPY_H
-
-namespace llvm {
-class Error;
-class raw_ostream;
-
-namespace object {
-class WasmObjectFile;
-} // end namespace object
-
-namespace objcopy {
-struct CommonConfig;
-struct WasmConfig;
-
-namespace wasm {
-Error executeObjcopyOnBinary(const CommonConfig &Config, const WasmConfig &,
-                             object::WasmObjectFile &In, raw_ostream &Out);
-
-} // end namespace wasm
-} // end namespace objcopy
-} // end namespace llvm
-
-#endif // LLVM_TOOLS_LLVM_OBJCOPY_WASM_WASMOBJCOPY_H
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/wasm/Writer.cpp b/gnu/llvm/llvm/tools/llvm-objcopy/wasm/Writer.cpp
deleted file mode 100644
index 2fad9e60c50..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/wasm/Writer.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-//===- Writer.cpp ---------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "Writer.h"
-#include "llvm/BinaryFormat/Wasm.h"
-#include "llvm/Support/Endian.h"
-#include "llvm/Support/Errc.h"
-#include "llvm/Support/LEB128.h"
-#include "llvm/Support/raw_ostream.h"
-
-namespace llvm {
-namespace objcopy {
-namespace wasm {
-
-using namespace object;
-using namespace llvm::wasm;
-
-Writer::SectionHeader Writer::createSectionHeader(const Section &S,
-                                                  size_t &SectionSize) {
-  SectionHeader Header;
-  raw_svector_ostream OS(Header);
-  OS << S.SectionType;
-  bool HasName = S.SectionType == WASM_SEC_CUSTOM;
-  SectionSize = S.Contents.size();
-  if (HasName)
-    SectionSize += getULEB128Size(S.Name.size()) + S.Name.size();
-  // Pad the LEB value out to 5 bytes to make it a predictable size, and
-  // match the behavior of clang.
-  encodeULEB128(SectionSize, OS, 5);
-  if (HasName) {
-    encodeULEB128(S.Name.size(), OS);
-    OS << S.Name;
-  }
-  // Total section size is the content size plus 1 for the section type and
-  // 5 for the LEB-encoded size.
-  SectionSize = SectionSize + 1 + 5;
-  return Header;
-}
-
-size_t Writer::finalize() {
-  size_t ObjectSize = sizeof(WasmMagic) + sizeof(WasmVersion);
-  SectionHeaders.reserve(Obj.Sections.size());
-  // Finalize the headers of each section so we know the total size.
-  for (const Section &S : Obj.Sections) {
-    size_t SectionSize;
-    SectionHeaders.push_back(createSectionHeader(S, SectionSize));
-    ObjectSize += SectionSize;
-  }
-  return ObjectSize;
-}
-
-Error Writer::write() {
-  size_t TotalSize = finalize();
-  Out.reserveExtraSpace(TotalSize);
-
-  // Write the header.
-  Out.write(Obj.Header.Magic.data(), Obj.Header.Magic.size());
-  uint32_t Version;
-  support::endian::write32le(&Version, Obj.Header.Version);
-  Out.write(reinterpret_cast<const char *>(&Version), sizeof(Version));
-
-  // Write each section.
-  for (size_t I = 0, S = SectionHeaders.size(); I < S; ++I) {
-    Out.write(SectionHeaders[I].data(), SectionHeaders[I].size());
-    Out.write(reinterpret_cast<const char *>(Obj.Sections[I].Contents.data()),
-              Obj.Sections[I].Contents.size());
-  }
-
-  return Error::success();
-}
-
-} // end namespace wasm
-} // end namespace objcopy
-} // end namespace llvm
diff --git a/gnu/llvm/llvm/tools/llvm-objcopy/wasm/Writer.h b/gnu/llvm/llvm/tools/llvm-objcopy/wasm/Writer.h
deleted file mode 100644
index 4404cd8caf8..00000000000
--- a/gnu/llvm/llvm/tools/llvm-objcopy/wasm/Writer.h
+++ /dev/null
@@ -1,49 +0,0 @@
-//===- Writer.h -------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_LLVM_OBJCOPY_WASM_WRITER_H
-#define LLVM_TOOLS_LLVM_OBJCOPY_WASM_WRITER_H
-
-#include "Object.h"
-#include <cstdint>
-#include <vector>
-
-namespace llvm {
-namespace objcopy {
-namespace wasm {
-
-class Writer {
-public:
-  Writer(Object &Obj, raw_ostream &Out) : Obj(Obj), Out(Out) {}
-  Error write();
-
-private:
-  using SectionHeader = SmallVector<char, 8>;
-  Object &Obj;
-  raw_ostream &Out;
-  std::vector<SectionHeader> SectionHeaders;
-
-  /// Generate a wasm section section header for S.
-  /// The header consists of
-  /// * A one-byte section ID (aka the section type).
-  /// * The size of the section contents, encoded as ULEB128.
-  /// * If the section is a custom section (type 0) it also has a name, which is
-  ///   encoded as a length-prefixed string. The encoded section size *includes*
-  ///   this string.
-  /// See https://webassembly.github.io/spec/core/binary/modules.html#sections
-  /// Return the header and store the total size in SectionSize.
-  static SectionHeader createSectionHeader(const Section &S,
-                                           size_t &SectionSize);
-  size_t finalize();
-};
-
-} // end namespace wasm
-} // end namespace objcopy
-} // end namespace llvm
-
-#endif // LLVM_TOOLS_LLVM_OBJCOPY_WASM_WRITER_H
diff --git a/gnu/llvm/llvm/tools/llvm-objdump/ELFDump.cpp b/gnu/llvm/llvm/tools/llvm-objdump/ELFDump.cpp
index 952a417f820..a07e29874f9 100644
--- a/gnu/llvm/llvm/tools/llvm-objdump/ELFDump.cpp
+++ b/gnu/llvm/llvm/tools/llvm-objdump/ELFDump.cpp
@@ -145,7 +145,7 @@ static uint64_t getSectionLMA(const ELFFile<ELFT> &Obj,
                               const object::ELFSectionRef &Sec) {
   auto PhdrRangeOrErr = Obj.program_headers();
   if (!PhdrRangeOrErr)
-    report_fatal_error(toString(PhdrRangeOrErr.takeError()));
+    report_fatal_error(Twine(toString(PhdrRangeOrErr.takeError())));
 
   // Search for a PT_LOAD segment containing the requested section. Use this
   // segment's p_addr to calculate the section's LMA.
@@ -171,8 +171,12 @@ uint64_t objdump::getELFSectionLMA(const object::ELFSectionRef &Sec) {
 
 template <class ELFT>
 static void printDynamicSection(const ELFFile<ELFT> &Elf, StringRef Filename) {
-  ArrayRef<typename ELFT::Dyn> DynamicEntries =
-      unwrapOrError(Elf.dynamicEntries(), Filename);
+  auto DynamicEntriesOrErr = Elf.dynamicEntries();
+  if (!DynamicEntriesOrErr) {
+    reportWarning(toString(DynamicEntriesOrErr.takeError()), Filename);
+    return;
+  }
+  ArrayRef<typename ELFT::Dyn> DynamicEntries = *DynamicEntriesOrErr;
 
   // Find the maximum tag name length to format the value column properly.
   size_t MaxLen = 0;
@@ -284,27 +288,28 @@ static void printProgramHeaders(const ELFFile<ELFT> &Obj, StringRef FileName) {
 }
 
 template <class ELFT>
-static void printSymbolVersionDependency(ArrayRef<uint8_t> Contents,
-                                         StringRef StrTab) {
+static void printSymbolVersionDependency(StringRef FileName,
+                                         const ELFFile<ELFT> &Obj,
+                                         const typename ELFT::Shdr &Sec) {
   outs() << "\nVersion References:\n";
 
-  const uint8_t *Buf = Contents.data();
-  while (Buf) {
-    auto *Verneed = reinterpret_cast<const typename ELFT::Verneed *>(Buf);
-    outs() << "  required from "
-           << StringRef(StrTab.drop_front(Verneed->vn_file).data()) << ":\n";
+  auto WarningHandler = [&](const Twine &Msg) {
+    reportWarning(Msg, FileName);
+    return Error::success();
+  };
+  Expected<std::vector<VerNeed>> V =
+      Obj.getVersionDependencies(Sec, WarningHandler);
+  if (!V) {
+    reportWarning(toString(V.takeError()), FileName);
+    return;
+  }
 
-    const uint8_t *BufAux = Buf + Verneed->vn_aux;
-    while (BufAux) {
-      auto *Vernaux = reinterpret_cast<const typename ELFT::Vernaux *>(BufAux);
-      outs() << "    "
-             << format("0x%08" PRIx32 " ", (uint32_t)Vernaux->vna_hash)
-             << format("0x%02" PRIx16 " ", (uint16_t)Vernaux->vna_flags)
-             << format("%02" PRIu16 " ", (uint16_t)Vernaux->vna_other)
-             << StringRef(StrTab.drop_front(Vernaux->vna_name).data()) << '\n';
-      BufAux = Vernaux->vna_next ? BufAux + Vernaux->vna_next : nullptr;
-    }
-    Buf = Verneed->vn_next ? Buf + Verneed->vn_next : nullptr;
+  raw_fd_ostream &OS = outs();
+  for (const VerNeed &VN : *V) {
+    OS << "  required from " << VN.File << ":\n";
+    for (const VernAux &Aux : VN.AuxV)
+      OS << format("    0x%08x 0x%02x %02u %s\n", Aux.Hash, Aux.Flags,
+                   Aux.Other, Aux.Name.c_str());
   }
 }
 
@@ -357,7 +362,7 @@ static void printSymbolVersionInfo(const ELFFile<ELFT> &Elf,
     StringRef StrTab = unwrapOrError(Elf.getStringTable(*StrTabSec), FileName);
 
     if (Shdr.sh_type == ELF::SHT_GNU_verneed)
-      printSymbolVersionDependency<ELFT>(Contents, StrTab);
+      printSymbolVersionDependency<ELFT>(FileName, Elf, Shdr);
     else
       printSymbolVersionDefinition<ELFT>(Shdr, Contents, StrTab);
   }
diff --git a/gnu/llvm/llvm/tools/llvm-pdbutil/FormatUtil.cpp b/gnu/llvm/llvm/tools/llvm-pdbutil/FormatUtil.cpp
deleted file mode 100644
index b4837398f1d..00000000000
--- a/gnu/llvm/llvm/tools/llvm-pdbutil/FormatUtil.cpp
+++ /dev/null
@@ -1,258 +0,0 @@
-//===- FormatUtil.cpp ----------------------------------------- *- C++ --*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "FormatUtil.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/StringExtras.h"
-#include "llvm/BinaryFormat/COFF.h"
-#include "llvm/DebugInfo/CodeView/CodeView.h"
-#include "llvm/Support/FormatAdapters.h"
-#include "llvm/Support/FormatVariadic.h"
-
-using namespace llvm;
-using namespace llvm::codeview;
-using namespace llvm::pdb;
-
-std::string llvm::pdb::truncateStringBack(StringRef S, uint32_t MaxLen) {
-  if (MaxLen == 0 || S.size() <= MaxLen || S.size() <= 3)
-    return std::string(S);
-
-  assert(MaxLen >= 3);
-  uint32_t FinalLen = std::min<size_t>(S.size(), MaxLen - 3);
-  S = S.take_front(FinalLen);
-  return std::string(S) + std::string("...");
-}
-
-std::string llvm::pdb::truncateStringMiddle(StringRef S, uint32_t MaxLen) {
-  if (MaxLen == 0 || S.size() <= MaxLen || S.size() <= 3)
-    return std::string(S);
-
-  assert(MaxLen >= 3);
-  uint32_t FinalLen = std::min<size_t>(S.size(), MaxLen - 3);
-  StringRef Front = S.take_front(FinalLen / 2);
-  StringRef Back = S.take_back(Front.size());
-  return std::string(Front) + std::string("...") + std::string(Back);
-}
-
-std::string llvm::pdb::truncateStringFront(StringRef S, uint32_t MaxLen) {
-  if (MaxLen == 0 || S.size() <= MaxLen || S.size() <= 3)
-    return std::string(S);
-
-  assert(MaxLen >= 3);
-  S = S.take_back(MaxLen - 3);
-  return std::string("...") + std::string(S);
-}
-
-std::string llvm::pdb::truncateQuotedNameFront(StringRef Label, StringRef Name,
-                                               uint32_t MaxLen) {
-  uint32_t RequiredExtraChars = Label.size() + 1 + 2;
-  if (MaxLen == 0 || RequiredExtraChars + Name.size() <= MaxLen)
-    return formatv("{0} \"{1}\"", Label, Name).str();
-
-  assert(MaxLen >= RequiredExtraChars);
-  std::string TN = truncateStringFront(Name, MaxLen - RequiredExtraChars);
-  return formatv("{0} \"{1}\"", Label, TN).str();
-}
-
-std::string llvm::pdb::truncateQuotedNameBack(StringRef Label, StringRef Name,
-                                              uint32_t MaxLen) {
-  uint32_t RequiredExtraChars = Label.size() + 1 + 2;
-  if (MaxLen == 0 || RequiredExtraChars + Name.size() <= MaxLen)
-    return formatv("{0} \"{1}\"", Label, Name).str();
-
-  assert(MaxLen >= RequiredExtraChars);
-  std::string TN = truncateStringBack(Name, MaxLen - RequiredExtraChars);
-  return formatv("{0} \"{1}\"", Label, TN).str();
-}
-
-std::string llvm::pdb::typesetItemList(ArrayRef<std::string> Opts,
-                                       uint32_t IndentLevel, uint32_t GroupSize,
-                                       StringRef Sep) {
-  std::string Result;
-  while (!Opts.empty()) {
-    ArrayRef<std::string> ThisGroup;
-    ThisGroup = Opts.take_front(GroupSize);
-    Opts = Opts.drop_front(ThisGroup.size());
-    Result += join(ThisGroup, Sep);
-    if (!Opts.empty()) {
-      Result += Sep;
-      Result += "\n";
-      Result += std::string(formatv("{0}", fmt_repeat(' ', IndentLevel)));
-    }
-  }
-  return Result;
-}
-
-std::string llvm::pdb::typesetStringList(uint32_t IndentLevel,
-                                         ArrayRef<StringRef> Strings) {
-  std::string Result = "[";
-  for (const auto &S : Strings) {
-    Result += std::string(formatv("\n{0}{1}", fmt_repeat(' ', IndentLevel), S));
-  }
-  Result += "]";
-  return Result;
-}
-
-std::string llvm::pdb::formatChunkKind(DebugSubsectionKind Kind,
-                                       bool Friendly) {
-  if (Friendly) {
-    switch (Kind) {
-      RETURN_CASE(DebugSubsectionKind, None, "none");
-      RETURN_CASE(DebugSubsectionKind, Symbols, "symbols");
-      RETURN_CASE(DebugSubsectionKind, Lines, "lines");
-      RETURN_CASE(DebugSubsectionKind, StringTable, "strings");
-      RETURN_CASE(DebugSubsectionKind, FileChecksums, "checksums");
-      RETURN_CASE(DebugSubsectionKind, FrameData, "frames");
-      RETURN_CASE(DebugSubsectionKind, InlineeLines, "inlinee lines");
-      RETURN_CASE(DebugSubsectionKind, CrossScopeImports, "xmi");
-      RETURN_CASE(DebugSubsectionKind, CrossScopeExports, "xme");
-      RETURN_CASE(DebugSubsectionKind, ILLines, "il lines");
-      RETURN_CASE(DebugSubsectionKind, FuncMDTokenMap, "func md token map");
-      RETURN_CASE(DebugSubsectionKind, TypeMDTokenMap, "type md token map");
-      RETURN_CASE(DebugSubsectionKind, MergedAssemblyInput,
-                  "merged assembly input");
-      RETURN_CASE(DebugSubsectionKind, CoffSymbolRVA, "coff symbol rva");
-    }
-  } else {
-    switch (Kind) {
-      RETURN_CASE(DebugSubsectionKind, None, "none");
-      RETURN_CASE(DebugSubsectionKind, Symbols, "DEBUG_S_SYMBOLS");
-      RETURN_CASE(DebugSubsectionKind, Lines, "DEBUG_S_LINES");
-      RETURN_CASE(DebugSubsectionKind, StringTable, "DEBUG_S_STRINGTABLE");
-      RETURN_CASE(DebugSubsectionKind, FileChecksums, "DEBUG_S_FILECHKSMS");
-      RETURN_CASE(DebugSubsectionKind, FrameData, "DEBUG_S_FRAMEDATA");
-      RETURN_CASE(DebugSubsectionKind, InlineeLines, "DEBUG_S_INLINEELINES");
-      RETURN_CASE(DebugSubsectionKind, CrossScopeImports,
-                  "DEBUG_S_CROSSSCOPEIMPORTS");
-      RETURN_CASE(DebugSubsectionKind, CrossScopeExports,
-                  "DEBUG_S_CROSSSCOPEEXPORTS");
-      RETURN_CASE(DebugSubsectionKind, ILLines, "DEBUG_S_IL_LINES");
-      RETURN_CASE(DebugSubsectionKind, FuncMDTokenMap,
-                  "DEBUG_S_FUNC_MDTOKEN_MAP");
-      RETURN_CASE(DebugSubsectionKind, TypeMDTokenMap,
-                  "DEBUG_S_TYPE_MDTOKEN_MAP");
-      RETURN_CASE(DebugSubsectionKind, MergedAssemblyInput,
-                  "DEBUG_S_MERGED_ASSEMBLYINPUT");
-      RETURN_CASE(DebugSubsectionKind, CoffSymbolRVA,
-                  "DEBUG_S_COFF_SYMBOL_RVA");
-    }
-  }
-  return formatUnknownEnum(Kind);
-}
-
-std::string llvm::pdb::formatSymbolKind(SymbolKind K) {
-  switch (uint32_t(K)) {
-#define SYMBOL_RECORD(EnumName, value, name)                                   \
-  case EnumName:                                                               \
-    return #EnumName;
-#define CV_SYMBOL(EnumName, value) SYMBOL_RECORD(EnumName, value, EnumName)
-#include "llvm/DebugInfo/CodeView/CodeViewSymbols.def"
-  }
-  return formatUnknownEnum(K);
-}
-
-std::string llvm::pdb::formatTypeLeafKind(TypeLeafKind K) {
-  switch (K) {
-#define TYPE_RECORD(EnumName, value, name)                                     \
-  case EnumName:                                                               \
-    return #EnumName;
-#include "llvm/DebugInfo/CodeView/CodeViewTypes.def"
-  default:
-    return formatv("UNKNOWN RECORD ({0:X})",
-                   static_cast<std::underlying_type_t<TypeLeafKind>>(K))
-        .str();
-  }
-}
-
-std::string llvm::pdb::formatSegmentOffset(uint16_t Segment, uint32_t Offset) {
-  return std::string(formatv("{0:4}:{1:4}", Segment, Offset));
-}
-
-#define PUSH_CHARACTERISTIC_FLAG(Enum, TheOpt, Value, Style, Descriptive)      \
-  PUSH_FLAG(Enum, TheOpt, Value,                                               \
-            ((Style == CharacteristicStyle::HeaderDefinition) ? #TheOpt        \
-                                                              : Descriptive))
-
-#define PUSH_MASKED_CHARACTERISTIC_FLAG(Enum, Mask, TheOpt, Value, Style,      \
-                                        Descriptive)                           \
-  PUSH_MASKED_FLAG(Enum, Mask, TheOpt, Value,                                  \
-                   ((Style == CharacteristicStyle::HeaderDefinition)           \
-                        ? #TheOpt                                              \
-                        : Descriptive))
-
-std::string llvm::pdb::formatSectionCharacteristics(uint32_t IndentLevel,
-                                                    uint32_t C,
-                                                    uint32_t FlagsPerLine,
-                                                    StringRef Separator,
-                                                    CharacteristicStyle Style) {
-  using SC = COFF::SectionCharacteristics;
-  std::vector<std::string> Opts;
-  if (C == COFF::SC_Invalid)
-    return "invalid";
-  if (C == 0)
-    return "none";
-  PUSH_CHARACTERISTIC_FLAG(SC, IMAGE_SCN_TYPE_NOLOAD, C, Style, "noload");
-  PUSH_CHARACTERISTIC_FLAG(SC, IMAGE_SCN_TYPE_NO_PAD, C, Style, "no padding");
-  PUSH_CHARACTERISTIC_FLAG(SC, IMAGE_SCN_CNT_CODE, C, Style, "code");
-  PUSH_CHARACTERISTIC_FLAG(SC, IMAGE_SCN_CNT_INITIALIZED_DATA, C, Style,
-                           "initialized data");
-  PUSH_CHARACTERISTIC_FLAG(SC, IMAGE_SCN_CNT_UNINITIALIZED_DATA, C, Style,
-                           "uninitialized data");
-  PUSH_CHARACTERISTIC_FLAG(SC, IMAGE_SCN_LNK_OTHER, C, Style, "other");
-  PUSH_CHARACTERISTIC_FLAG(SC, IMAGE_SCN_LNK_INFO, C, Style, "info");
-  PUSH_CHARACTERISTIC_FLAG(SC, IMAGE_SCN_LNK_REMOVE, C, Style, "remove");
-  PUSH_CHARACTERISTIC_FLAG(SC, IMAGE_SCN_LNK_COMDAT, C, Style, "comdat");
-  PUSH_CHARACTERISTIC_FLAG(SC, IMAGE_SCN_GPREL, C, Style, "gp rel");
-  PUSH_CHARACTERISTIC_FLAG(SC, IMAGE_SCN_MEM_PURGEABLE, C, Style, "purgeable");
-  PUSH_CHARACTERISTIC_FLAG(SC, IMAGE_SCN_MEM_16BIT, C, Style, "16-bit");
-  PUSH_CHARACTERISTIC_FLAG(SC, IMAGE_SCN_MEM_LOCKED, C, Style, "locked");
-  PUSH_CHARACTERISTIC_FLAG(SC, IMAGE_SCN_MEM_PRELOAD, C, Style, "preload");
-  PUSH_MASKED_CHARACTERISTIC_FLAG(SC, 0xF00000, IMAGE_SCN_ALIGN_1BYTES, C,
-                                  Style, "1 byte align");
-  PUSH_MASKED_CHARACTERISTIC_FLAG(SC, 0xF00000, IMAGE_SCN_ALIGN_2BYTES, C,
-                                  Style, "2 byte align");
-  PUSH_MASKED_CHARACTERISTIC_FLAG(SC, 0xF00000, IMAGE_SCN_ALIGN_4BYTES, C,
-                                  Style, "4 byte align");
-  PUSH_MASKED_CHARACTERISTIC_FLAG(SC, 0xF00000, IMAGE_SCN_ALIGN_8BYTES, C,
-                                  Style, "8 byte align");
-  PUSH_MASKED_CHARACTERISTIC_FLAG(SC, 0xF00000, IMAGE_SCN_ALIGN_16BYTES, C,
-                                  Style, "16 byte align");
-  PUSH_MASKED_CHARACTERISTIC_FLAG(SC, 0xF00000, IMAGE_SCN_ALIGN_32BYTES, C,
-                                  Style, "32 byte align");
-  PUSH_MASKED_CHARACTERISTIC_FLAG(SC, 0xF00000, IMAGE_SCN_ALIGN_64BYTES, C,
-                                  Style, "64 byte align");
-  PUSH_MASKED_CHARACTERISTIC_FLAG(SC, 0xF00000, IMAGE_SCN_ALIGN_128BYTES, C,
-                                  Style, "128 byte align");
-  PUSH_MASKED_CHARACTERISTIC_FLAG(SC, 0xF00000, IMAGE_SCN_ALIGN_256BYTES, C,
-                                  Style, "256 byte align");
-  PUSH_MASKED_CHARACTERISTIC_FLAG(SC, 0xF00000, IMAGE_SCN_ALIGN_512BYTES, C,
-                                  Style, "512 byte align");
-  PUSH_MASKED_CHARACTERISTIC_FLAG(SC, 0xF00000, IMAGE_SCN_ALIGN_1024BYTES, C,
-                                  Style, "1024 byte align");
-  PUSH_MASKED_CHARACTERISTIC_FLAG(SC, 0xF00000, IMAGE_SCN_ALIGN_2048BYTES, C,
-                                  Style, "2048 byte align");
-  PUSH_MASKED_CHARACTERISTIC_FLAG(SC, 0xF00000, IMAGE_SCN_ALIGN_4096BYTES, C,
-                                  Style, "4096 byte align");
-  PUSH_MASKED_CHARACTERISTIC_FLAG(SC, 0xF00000, IMAGE_SCN_ALIGN_8192BYTES, C,
-                                  Style, "8192 byte align");
-  PUSH_CHARACTERISTIC_FLAG(SC, IMAGE_SCN_LNK_NRELOC_OVFL, C, Style,
-                           "noreloc overflow");
-  PUSH_CHARACTERISTIC_FLAG(SC, IMAGE_SCN_MEM_DISCARDABLE, C, Style,
-                           "discardable");
-  PUSH_CHARACTERISTIC_FLAG(SC, IMAGE_SCN_MEM_NOT_CACHED, C, Style,
-                           "not cached");
-  PUSH_CHARACTERISTIC_FLAG(SC, IMAGE_SCN_MEM_NOT_PAGED, C, Style, "not paged");
-  PUSH_CHARACTERISTIC_FLAG(SC, IMAGE_SCN_MEM_SHARED, C, Style, "shared");
-  PUSH_CHARACTERISTIC_FLAG(SC, IMAGE_SCN_MEM_EXECUTE, C, Style,
-                           "execute permissions");
-  PUSH_CHARACTERISTIC_FLAG(SC, IMAGE_SCN_MEM_READ, C, Style,
-                           "read permissions");
-  PUSH_CHARACTERISTIC_FLAG(SC, IMAGE_SCN_MEM_WRITE, C, Style,
-                           "write permissions");
-  return typesetItemList(Opts, IndentLevel, FlagsPerLine, Separator);
-}
diff --git a/gnu/llvm/llvm/tools/llvm-pdbutil/FormatUtil.h b/gnu/llvm/llvm/tools/llvm-pdbutil/FormatUtil.h
deleted file mode 100644
index b99ccec215b..00000000000
--- a/gnu/llvm/llvm/tools/llvm-pdbutil/FormatUtil.h
+++ /dev/null
@@ -1,141 +0,0 @@
-//===- FormatUtil.h ------------------------------------------- *- C++ --*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_LLVMPDBUTIL_FORMAT_UTIL_H
-#define LLVM_TOOLS_LLVMPDBUTIL_FORMAT_UTIL_H
-
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/DebugInfo/CodeView/CodeView.h"
-#include "llvm/Support/Endian.h"
-#include "llvm/Support/FormatAdapters.h"
-#include "llvm/Support/FormatVariadic.h"
-
-#include <string>
-#include <type_traits>
-
-namespace llvm {
-namespace pdb {
-
-std::string truncateStringBack(StringRef S, uint32_t MaxLen);
-std::string truncateStringMiddle(StringRef S, uint32_t MaxLen);
-std::string truncateStringFront(StringRef S, uint32_t MaxLen);
-std::string truncateQuotedNameFront(StringRef Label, StringRef Name,
-                                    uint32_t MaxLen);
-std::string truncateQuotedNameBack(StringRef Label, StringRef Name,
-                                   uint32_t MaxLen);
-
-#define PUSH_MASKED_FLAG(Enum, Mask, TheOpt, Value, Text)                      \
-  if (Enum::TheOpt == (Value & Mask))                                          \
-    Opts.push_back(Text);
-
-#define PUSH_FLAG(Enum, TheOpt, Value, Text)                                   \
-  PUSH_MASKED_FLAG(Enum, Enum::TheOpt, TheOpt, Value, Text)
-
-#define RETURN_CASE(Enum, X, Ret)                                              \
-  case Enum::X:                                                                \
-    return Ret;
-
-template <typename T> std::string formatUnknownEnum(T Value) {
-  return formatv("unknown ({0})", static_cast<std::underlying_type_t<T>>(Value))
-      .str();
-}
-
-std::string formatSegmentOffset(uint16_t Segment, uint32_t Offset);
-
-enum class CharacteristicStyle {
-  HeaderDefinition, // format as windows header definition
-  Descriptive,      // format as human readable words
-};
-std::string formatSectionCharacteristics(
-    uint32_t IndentLevel, uint32_t C, uint32_t FlagsPerLine,
-    StringRef Separator,
-    CharacteristicStyle Style = CharacteristicStyle::HeaderDefinition);
-
-std::string typesetItemList(ArrayRef<std::string> Opts, uint32_t IndentLevel,
-                            uint32_t GroupSize, StringRef Sep);
-
-std::string typesetStringList(uint32_t IndentLevel,
-                              ArrayRef<StringRef> Strings);
-
-std::string formatChunkKind(codeview::DebugSubsectionKind Kind,
-                            bool Friendly = true);
-std::string formatSymbolKind(codeview::SymbolKind K);
-std::string formatTypeLeafKind(codeview::TypeLeafKind K);
-
-/// Returns the number of digits in the given integer.
-inline int NumDigits(uint64_t N) {
-  if (N < 10ULL)
-    return 1;
-  if (N < 100ULL)
-    return 2;
-  if (N < 1000ULL)
-    return 3;
-  if (N < 10000ULL)
-    return 4;
-  if (N < 100000ULL)
-    return 5;
-  if (N < 1000000ULL)
-    return 6;
-  if (N < 10000000ULL)
-    return 7;
-  if (N < 100000000ULL)
-    return 8;
-  if (N < 1000000000ULL)
-    return 9;
-  if (N < 10000000000ULL)
-    return 10;
-  if (N < 100000000000ULL)
-    return 11;
-  if (N < 1000000000000ULL)
-    return 12;
-  if (N < 10000000000000ULL)
-    return 13;
-  if (N < 100000000000000ULL)
-    return 14;
-  if (N < 1000000000000000ULL)
-    return 15;
-  if (N < 10000000000000000ULL)
-    return 16;
-  if (N < 100000000000000000ULL)
-    return 17;
-  if (N < 1000000000000000000ULL)
-    return 18;
-  if (N < 10000000000000000000ULL)
-    return 19;
-  return 20;
-}
-
-namespace detail {
-template <typename T>
-struct EndianAdapter final
-    : public FormatAdapter<support::detail::packed_endian_specific_integral<
-          T, support::little, support::unaligned>> {
-  using EndianType =
-      support::detail::packed_endian_specific_integral<T, support::little,
-                                                       support::unaligned>;
-
-  explicit EndianAdapter(EndianType &&Item)
-      : FormatAdapter<EndianType>(std::move(Item)) {}
-
-  void format(llvm::raw_ostream &Stream, StringRef Style) override {
-    format_provider<T>::format(static_cast<T>(this->Item), Stream, Style);
-  }
-};
-} // namespace detail
-
-template <typename T>
-detail::EndianAdapter<T>
-fmtle(support::detail::packed_endian_specific_integral<T, support::little,
-                                                       support::unaligned>
-          Value) {
-  return detail::EndianAdapter<T>(std::move(Value));
-}
-}
-} // namespace llvm
-#endif
diff --git a/gnu/llvm/llvm/tools/llvm-pdbutil/InputFile.cpp b/gnu/llvm/llvm/tools/llvm-pdbutil/InputFile.cpp
deleted file mode 100644
index 40b35625b6f..00000000000
--- a/gnu/llvm/llvm/tools/llvm-pdbutil/InputFile.cpp
+++ /dev/null
@@ -1,510 +0,0 @@
-//===- InputFile.cpp ------------------------------------------ *- C++ --*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "InputFile.h"
-
-#include "FormatUtil.h"
-#include "LinePrinter.h"
-
-#include "llvm/BinaryFormat/Magic.h"
-#include "llvm/DebugInfo/CodeView/CodeView.h"
-#include "llvm/DebugInfo/CodeView/LazyRandomTypeCollection.h"
-#include "llvm/DebugInfo/CodeView/StringsAndChecksums.h"
-#include "llvm/DebugInfo/PDB/Native/DbiStream.h"
-#include "llvm/DebugInfo/PDB/Native/NativeSession.h"
-#include "llvm/DebugInfo/PDB/Native/PDBFile.h"
-#include "llvm/DebugInfo/PDB/Native/PDBStringTable.h"
-#include "llvm/DebugInfo/PDB/Native/RawError.h"
-#include "llvm/DebugInfo/PDB/Native/TpiStream.h"
-#include "llvm/DebugInfo/PDB/PDB.h"
-#include "llvm/Object/COFF.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/FormatVariadic.h"
-
-using namespace llvm;
-using namespace llvm::codeview;
-using namespace llvm::object;
-using namespace llvm::pdb;
-
-InputFile::InputFile() {}
-InputFile::~InputFile() {}
-
-static Expected<ModuleDebugStreamRef>
-getModuleDebugStream(PDBFile &File, StringRef &ModuleName, uint32_t Index) {
-  ExitOnError Err("Unexpected error: ");
-
-  auto &Dbi = Err(File.getPDBDbiStream());
-  const auto &Modules = Dbi.modules();
-  if (Index >= Modules.getModuleCount())
-    return make_error<RawError>(raw_error_code::index_out_of_bounds,
-                                "Invalid module index");
-
-  auto Modi = Modules.getModuleDescriptor(Index);
-
-  ModuleName = Modi.getModuleName();
-
-  uint16_t ModiStream = Modi.getModuleStreamIndex();
-  if (ModiStream == kInvalidStreamIndex)
-    return make_error<RawError>(raw_error_code::no_stream,
-                                "Module stream not present");
-
-  auto ModStreamData = File.createIndexedStream(ModiStream);
-
-  ModuleDebugStreamRef ModS(Modi, std::move(ModStreamData));
-  if (auto EC = ModS.reload())
-    return make_error<RawError>(raw_error_code::corrupt_file,
-                                "Invalid module stream");
-
-  return std::move(ModS);
-}
-
-static inline bool isCodeViewDebugSubsection(object::SectionRef Section,
-                                             StringRef Name,
-                                             BinaryStreamReader &Reader) {
-  if (Expected<StringRef> NameOrErr = Section.getName()) {
-    if (*NameOrErr != Name)
-      return false;
-  } else {
-    consumeError(NameOrErr.takeError());
-    return false;
-  }
-
-  Expected<StringRef> ContentsOrErr = Section.getContents();
-  if (!ContentsOrErr) {
-    consumeError(ContentsOrErr.takeError());
-    return false;
-  }
-
-  Reader = BinaryStreamReader(*ContentsOrErr, support::little);
-  uint32_t Magic;
-  if (Reader.bytesRemaining() < sizeof(uint32_t))
-    return false;
-  cantFail(Reader.readInteger(Magic));
-  if (Magic != COFF::DEBUG_SECTION_MAGIC)
-    return false;
-  return true;
-}
-
-static inline bool isDebugSSection(object::SectionRef Section,
-                                   DebugSubsectionArray &Subsections) {
-  BinaryStreamReader Reader;
-  if (!isCodeViewDebugSubsection(Section, ".debug$S", Reader))
-    return false;
-
-  cantFail(Reader.readArray(Subsections, Reader.bytesRemaining()));
-  return true;
-}
-
-static bool isDebugTSection(SectionRef Section, CVTypeArray &Types) {
-  BinaryStreamReader Reader;
-  if (!isCodeViewDebugSubsection(Section, ".debug$T", Reader) &&
-      !isCodeViewDebugSubsection(Section, ".debug$P", Reader))
-    return false;
-  cantFail(Reader.readArray(Types, Reader.bytesRemaining()));
-  return true;
-}
-
-static std::string formatChecksumKind(FileChecksumKind Kind) {
-  switch (Kind) {
-    RETURN_CASE(FileChecksumKind, None, "None");
-    RETURN_CASE(FileChecksumKind, MD5, "MD5");
-    RETURN_CASE(FileChecksumKind, SHA1, "SHA-1");
-    RETURN_CASE(FileChecksumKind, SHA256, "SHA-256");
-  }
-  return formatUnknownEnum(Kind);
-}
-
-template <typename... Args>
-static void formatInternal(LinePrinter &Printer, bool Append, Args &&... args) {
-  if (Append)
-    Printer.format(std::forward<Args>(args)...);
-  else
-    Printer.formatLine(std::forward<Args>(args)...);
-}
-
-SymbolGroup::SymbolGroup(InputFile *File, uint32_t GroupIndex) : File(File) {
-  if (!File)
-    return;
-
-  if (File->isPdb())
-    initializeForPdb(GroupIndex);
-  else {
-    Name = ".debug$S";
-    uint32_t I = 0;
-    for (const auto &S : File->obj().sections()) {
-      DebugSubsectionArray SS;
-      if (!isDebugSSection(S, SS))
-        continue;
-
-      if (!SC.hasChecksums() || !SC.hasStrings())
-        SC.initialize(SS);
-
-      if (I == GroupIndex)
-        Subsections = SS;
-
-      if (SC.hasChecksums() && SC.hasStrings())
-        break;
-    }
-    rebuildChecksumMap();
-  }
-}
-
-StringRef SymbolGroup::name() const { return Name; }
-
-void SymbolGroup::updateDebugS(const codeview::DebugSubsectionArray &SS) {
-  Subsections = SS;
-}
-
-void SymbolGroup::updatePdbModi(uint32_t Modi) { initializeForPdb(Modi); }
-
-void SymbolGroup::initializeForPdb(uint32_t Modi) {
-  assert(File && File->isPdb());
-
-  // PDB always uses the same string table, but each module has its own
-  // checksums.  So we only set the strings if they're not already set.
-  if (!SC.hasStrings()) {
-    auto StringTable = File->pdb().getStringTable();
-    if (StringTable)
-      SC.setStrings(StringTable->getStringTable());
-    else
-      consumeError(StringTable.takeError());
-  }
-
-  SC.resetChecksums();
-  auto MDS = getModuleDebugStream(File->pdb(), Name, Modi);
-  if (!MDS) {
-    consumeError(MDS.takeError());
-    return;
-  }
-
-  DebugStream = std::make_shared<ModuleDebugStreamRef>(std::move(*MDS));
-  Subsections = DebugStream->getSubsectionsArray();
-  SC.initialize(Subsections);
-  rebuildChecksumMap();
-}
-
-void SymbolGroup::rebuildChecksumMap() {
-  if (!SC.hasChecksums())
-    return;
-
-  for (const auto &Entry : SC.checksums()) {
-    auto S = SC.strings().getString(Entry.FileNameOffset);
-    if (!S)
-      continue;
-    ChecksumsByFile[*S] = Entry;
-  }
-}
-
-const ModuleDebugStreamRef &SymbolGroup::getPdbModuleStream() const {
-  assert(File && File->isPdb() && DebugStream);
-  return *DebugStream;
-}
-
-Expected<StringRef> SymbolGroup::getNameFromStringTable(uint32_t Offset) const {
-  return SC.strings().getString(Offset);
-}
-
-void SymbolGroup::formatFromFileName(LinePrinter &Printer, StringRef File,
-                                     bool Append) const {
-  auto FC = ChecksumsByFile.find(File);
-  if (FC == ChecksumsByFile.end()) {
-    formatInternal(Printer, Append, "- (no checksum) {0}", File);
-    return;
-  }
-
-  formatInternal(Printer, Append, "- ({0}: {1}) {2}",
-                 formatChecksumKind(FC->getValue().Kind),
-                 toHex(FC->getValue().Checksum), File);
-}
-
-void SymbolGroup::formatFromChecksumsOffset(LinePrinter &Printer,
-                                            uint32_t Offset,
-                                            bool Append) const {
-  if (!SC.hasChecksums()) {
-    formatInternal(Printer, Append, "(unknown file name offset {0})", Offset);
-    return;
-  }
-
-  auto Iter = SC.checksums().getArray().at(Offset);
-  if (Iter == SC.checksums().getArray().end()) {
-    formatInternal(Printer, Append, "(unknown file name offset {0})", Offset);
-    return;
-  }
-
-  uint32_t FO = Iter->FileNameOffset;
-  auto ExpectedFile = getNameFromStringTable(FO);
-  if (!ExpectedFile) {
-    formatInternal(Printer, Append, "(unknown file name offset {0})", Offset);
-    consumeError(ExpectedFile.takeError());
-    return;
-  }
-  if (Iter->Kind == FileChecksumKind::None) {
-    formatInternal(Printer, Append, "{0} (no checksum)", *ExpectedFile);
-  } else {
-    formatInternal(Printer, Append, "{0} ({1}: {2})", *ExpectedFile,
-                   formatChecksumKind(Iter->Kind), toHex(Iter->Checksum));
-  }
-}
-
-Expected<InputFile> InputFile::open(StringRef Path, bool AllowUnknownFile) {
-  InputFile IF;
-  if (!llvm::sys::fs::exists(Path))
-    return make_error<StringError>(formatv("File {0} not found", Path),
-                                   inconvertibleErrorCode());
-
-  file_magic Magic;
-  if (auto EC = identify_magic(Path, Magic))
-    return make_error<StringError>(
-        formatv("Unable to identify file type for file {0}", Path), EC);
-
-  if (Magic == file_magic::coff_object) {
-    Expected<OwningBinary<Binary>> BinaryOrErr = createBinary(Path);
-    if (!BinaryOrErr)
-      return BinaryOrErr.takeError();
-
-    IF.CoffObject = std::move(*BinaryOrErr);
-    IF.PdbOrObj = llvm::cast<COFFObjectFile>(IF.CoffObject.getBinary());
-    return std::move(IF);
-  }
-
-  if (Magic == file_magic::pdb) {
-    std::unique_ptr<IPDBSession> Session;
-    if (auto Err = loadDataForPDB(PDB_ReaderType::Native, Path, Session))
-      return std::move(Err);
-
-    IF.PdbSession.reset(static_cast<NativeSession *>(Session.release()));
-    IF.PdbOrObj = &IF.PdbSession->getPDBFile();
-
-    return std::move(IF);
-  }
-
-  if (!AllowUnknownFile)
-    return make_error<StringError>(
-        formatv("File {0} is not a supported file type", Path),
-        inconvertibleErrorCode());
-
-  auto Result = MemoryBuffer::getFile(Path, /*IsText=*/false,
-                                      /*RequiresNullTerminator=*/false);
-  if (!Result)
-    return make_error<StringError>(
-        formatv("File {0} could not be opened", Path), Result.getError());
-
-  IF.UnknownFile = std::move(*Result);
-  IF.PdbOrObj = IF.UnknownFile.get();
-  return std::move(IF);
-}
-
-PDBFile &InputFile::pdb() {
-  assert(isPdb());
-  return *PdbOrObj.get<PDBFile *>();
-}
-
-const PDBFile &InputFile::pdb() const {
-  assert(isPdb());
-  return *PdbOrObj.get<PDBFile *>();
-}
-
-object::COFFObjectFile &InputFile::obj() {
-  assert(isObj());
-  return *PdbOrObj.get<object::COFFObjectFile *>();
-}
-
-const object::COFFObjectFile &InputFile::obj() const {
-  assert(isObj());
-  return *PdbOrObj.get<object::COFFObjectFile *>();
-}
-
-MemoryBuffer &InputFile::unknown() {
-  assert(isUnknown());
-  return *PdbOrObj.get<MemoryBuffer *>();
-}
-
-const MemoryBuffer &InputFile::unknown() const {
-  assert(isUnknown());
-  return *PdbOrObj.get<MemoryBuffer *>();
-}
-
-StringRef InputFile::getFilePath() const {
-  if (isPdb())
-    return pdb().getFilePath();
-  if (isObj())
-    return obj().getFileName();
-  assert(isUnknown());
-  return unknown().getBufferIdentifier();
-}
-
-bool InputFile::hasTypes() const {
-  if (isPdb())
-    return pdb().hasPDBTpiStream();
-
-  for (const auto &Section : obj().sections()) {
-    CVTypeArray Types;
-    if (isDebugTSection(Section, Types))
-      return true;
-  }
-  return false;
-}
-
-bool InputFile::hasIds() const {
-  if (isObj())
-    return false;
-  return pdb().hasPDBIpiStream();
-}
-
-bool InputFile::isPdb() const { return PdbOrObj.is<PDBFile *>(); }
-
-bool InputFile::isObj() const {
-  return PdbOrObj.is<object::COFFObjectFile *>();
-}
-
-bool InputFile::isUnknown() const { return PdbOrObj.is<MemoryBuffer *>(); }
-
-codeview::LazyRandomTypeCollection &
-InputFile::getOrCreateTypeCollection(TypeCollectionKind Kind) {
-  if (Types && Kind == kTypes)
-    return *Types;
-  if (Ids && Kind == kIds)
-    return *Ids;
-
-  if (Kind == kIds) {
-    assert(isPdb() && pdb().hasPDBIpiStream());
-  }
-
-  // If the collection was already initialized, we should have just returned it
-  // in step 1.
-  if (isPdb()) {
-    TypeCollectionPtr &Collection = (Kind == kIds) ? Ids : Types;
-    auto &Stream = cantFail((Kind == kIds) ? pdb().getPDBIpiStream()
-                                           : pdb().getPDBTpiStream());
-
-    auto &Array = Stream.typeArray();
-    uint32_t Count = Stream.getNumTypeRecords();
-    auto Offsets = Stream.getTypeIndexOffsets();
-    Collection =
-        std::make_unique<LazyRandomTypeCollection>(Array, Count, Offsets);
-    return *Collection;
-  }
-
-  assert(isObj());
-  assert(Kind == kTypes);
-  assert(!Types);
-
-  for (const auto &Section : obj().sections()) {
-    CVTypeArray Records;
-    if (!isDebugTSection(Section, Records))
-      continue;
-
-    Types = std::make_unique<LazyRandomTypeCollection>(Records, 100);
-    return *Types;
-  }
-
-  Types = std::make_unique<LazyRandomTypeCollection>(100);
-  return *Types;
-}
-
-codeview::LazyRandomTypeCollection &InputFile::types() {
-  return getOrCreateTypeCollection(kTypes);
-}
-
-codeview::LazyRandomTypeCollection &InputFile::ids() {
-  // Object files have only one type stream that contains both types and ids.
-  // Similarly, some PDBs don't contain an IPI stream, and for those both types
-  // and IDs are in the same stream.
-  if (isObj() || !pdb().hasPDBIpiStream())
-    return types();
-
-  return getOrCreateTypeCollection(kIds);
-}
-
-iterator_range<SymbolGroupIterator> InputFile::symbol_groups() {
-  return make_range<SymbolGroupIterator>(symbol_groups_begin(),
-                                         symbol_groups_end());
-}
-
-SymbolGroupIterator InputFile::symbol_groups_begin() {
-  return SymbolGroupIterator(*this);
-}
-
-SymbolGroupIterator InputFile::symbol_groups_end() {
-  return SymbolGroupIterator();
-}
-
-SymbolGroupIterator::SymbolGroupIterator() : Value(nullptr) {}
-
-SymbolGroupIterator::SymbolGroupIterator(InputFile &File) : Value(&File) {
-  if (File.isObj()) {
-    SectionIter = File.obj().section_begin();
-    scanToNextDebugS();
-  }
-}
-
-bool SymbolGroupIterator::operator==(const SymbolGroupIterator &R) const {
-  bool E = isEnd();
-  bool RE = R.isEnd();
-  if (E || RE)
-    return E == RE;
-
-  if (Value.File != R.Value.File)
-    return false;
-  return Index == R.Index;
-}
-
-const SymbolGroup &SymbolGroupIterator::operator*() const {
-  assert(!isEnd());
-  return Value;
-}
-SymbolGroup &SymbolGroupIterator::operator*() {
-  assert(!isEnd());
-  return Value;
-}
-
-SymbolGroupIterator &SymbolGroupIterator::operator++() {
-  assert(Value.File && !isEnd());
-  ++Index;
-  if (isEnd())
-    return *this;
-
-  if (Value.File->isPdb()) {
-    Value.updatePdbModi(Index);
-    return *this;
-  }
-
-  scanToNextDebugS();
-  return *this;
-}
-
-void SymbolGroupIterator::scanToNextDebugS() {
-  assert(SectionIter.hasValue());
-  auto End = Value.File->obj().section_end();
-  auto &Iter = *SectionIter;
-  assert(!isEnd());
-
-  while (++Iter != End) {
-    DebugSubsectionArray SS;
-    SectionRef SR = *Iter;
-    if (!isDebugSSection(SR, SS))
-      continue;
-
-    Value.updateDebugS(SS);
-    return;
-  }
-}
-
-bool SymbolGroupIterator::isEnd() const {
-  if (!Value.File)
-    return true;
-  if (Value.File->isPdb()) {
-    auto &Dbi = cantFail(Value.File->pdb().getPDBDbiStream());
-    uint32_t Count = Dbi.modules().getModuleCount();
-    assert(Index <= Count);
-    return Index == Count;
-  }
-
-  assert(SectionIter.hasValue());
-  return *SectionIter == Value.File->obj().section_end();
-}
diff --git a/gnu/llvm/llvm/tools/llvm-pdbutil/InputFile.h b/gnu/llvm/llvm/tools/llvm-pdbutil/InputFile.h
deleted file mode 100644
index a5d2897f560..00000000000
--- a/gnu/llvm/llvm/tools/llvm-pdbutil/InputFile.h
+++ /dev/null
@@ -1,155 +0,0 @@
-//===- InputFile.h -------------------------------------------- *- C++ --*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_LLVMPDBDUMP_INPUTFILE_H
-#define LLVM_TOOLS_LLVMPDBDUMP_INPUTFILE_H
-
-#include "llvm/ADT/Optional.h"
-#include "llvm/ADT/PointerUnion.h"
-#include "llvm/ADT/StringMap.h"
-#include "llvm/ADT/iterator.h"
-#include "llvm/DebugInfo/CodeView/DebugChecksumsSubsection.h"
-#include "llvm/DebugInfo/CodeView/StringsAndChecksums.h"
-#include "llvm/DebugInfo/PDB/Native/ModuleDebugStream.h"
-#include "llvm/Object/Binary.h"
-#include "llvm/Object/ObjectFile.h"
-#include "llvm/Support/Error.h"
-
-namespace llvm {
-namespace codeview {
-class LazyRandomTypeCollection;
-}
-namespace object {
-class COFFObjectFile;
-class SectionRef;
-} // namespace object
-
-namespace pdb {
-class InputFile;
-class LinePrinter;
-class PDBFile;
-class NativeSession;
-class SymbolGroupIterator;
-class SymbolGroup;
-
-class InputFile {
-  InputFile();
-
-  std::unique_ptr<NativeSession> PdbSession;
-  object::OwningBinary<object::Binary> CoffObject;
-  std::unique_ptr<MemoryBuffer> UnknownFile;
-  PointerUnion<PDBFile *, object::COFFObjectFile *, MemoryBuffer *> PdbOrObj;
-
-  using TypeCollectionPtr = std::unique_ptr<codeview::LazyRandomTypeCollection>;
-
-  TypeCollectionPtr Types;
-  TypeCollectionPtr Ids;
-
-  enum TypeCollectionKind { kTypes, kIds };
-  codeview::LazyRandomTypeCollection &
-  getOrCreateTypeCollection(TypeCollectionKind Kind);
-
-public:
-  ~InputFile();
-  InputFile(InputFile &&Other) = default;
-
-  static Expected<InputFile> open(StringRef Path,
-                                  bool AllowUnknownFile = false);
-
-  PDBFile &pdb();
-  const PDBFile &pdb() const;
-  object::COFFObjectFile &obj();
-  const object::COFFObjectFile &obj() const;
-  MemoryBuffer &unknown();
-  const MemoryBuffer &unknown() const;
-
-  StringRef getFilePath() const;
-
-  bool hasTypes() const;
-  bool hasIds() const;
-
-  codeview::LazyRandomTypeCollection &types();
-  codeview::LazyRandomTypeCollection &ids();
-
-  iterator_range<SymbolGroupIterator> symbol_groups();
-  SymbolGroupIterator symbol_groups_begin();
-  SymbolGroupIterator symbol_groups_end();
-
-  bool isPdb() const;
-  bool isObj() const;
-  bool isUnknown() const;
-};
-
-class SymbolGroup {
-  friend class SymbolGroupIterator;
-
-public:
-  explicit SymbolGroup(InputFile *File, uint32_t GroupIndex = 0);
-
-  Expected<StringRef> getNameFromStringTable(uint32_t Offset) const;
-
-  void formatFromFileName(LinePrinter &Printer, StringRef File,
-                          bool Append = false) const;
-
-  void formatFromChecksumsOffset(LinePrinter &Printer, uint32_t Offset,
-                                 bool Append = false) const;
-
-  StringRef name() const;
-
-  codeview::DebugSubsectionArray getDebugSubsections() const {
-    return Subsections;
-  }
-  const ModuleDebugStreamRef &getPdbModuleStream() const;
-
-  const InputFile &getFile() const { return *File; }
-  InputFile &getFile() { return *File; }
-
-  bool hasDebugStream() const { return DebugStream != nullptr; }
-
-private:
-  void initializeForPdb(uint32_t Modi);
-  void updatePdbModi(uint32_t Modi);
-  void updateDebugS(const codeview::DebugSubsectionArray &SS);
-
-  void rebuildChecksumMap();
-  InputFile *File = nullptr;
-  StringRef Name;
-  codeview::DebugSubsectionArray Subsections;
-  std::shared_ptr<ModuleDebugStreamRef> DebugStream;
-  codeview::StringsAndChecksumsRef SC;
-  StringMap<codeview::FileChecksumEntry> ChecksumsByFile;
-};
-
-class SymbolGroupIterator
-    : public iterator_facade_base<SymbolGroupIterator,
-                                  std::forward_iterator_tag, SymbolGroup> {
-public:
-  SymbolGroupIterator();
-  explicit SymbolGroupIterator(InputFile &File);
-  SymbolGroupIterator(const SymbolGroupIterator &Other) = default;
-  SymbolGroupIterator &operator=(const SymbolGroupIterator &R) = default;
-
-  const SymbolGroup &operator*() const;
-  SymbolGroup &operator*();
-
-  bool operator==(const SymbolGroupIterator &R) const;
-  SymbolGroupIterator &operator++();
-
-private:
-  void scanToNextDebugS();
-  bool isEnd() const;
-
-  uint32_t Index = 0;
-  Optional<object::section_iterator> SectionIter;
-  SymbolGroup Value;
-};
-
-} // namespace pdb
-} // namespace llvm
-
-#endif
diff --git a/gnu/llvm/llvm/tools/llvm-pdbutil/LinePrinter.cpp b/gnu/llvm/llvm/tools/llvm-pdbutil/LinePrinter.cpp
deleted file mode 100644
index 280c000bd65..00000000000
--- a/gnu/llvm/llvm/tools/llvm-pdbutil/LinePrinter.cpp
+++ /dev/null
@@ -1,333 +0,0 @@
-//===- LinePrinter.cpp ------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "LinePrinter.h"
-
-#include "llvm-pdbutil.h"
-
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/DebugInfo/MSF/MSFCommon.h"
-#include "llvm/DebugInfo/MSF/MappedBlockStream.h"
-#include "llvm/DebugInfo/PDB/Native/PDBFile.h"
-#include "llvm/DebugInfo/PDB/UDTLayout.h"
-#include "llvm/Support/BinaryStreamReader.h"
-#include "llvm/Support/Format.h"
-#include "llvm/Support/FormatAdapters.h"
-#include "llvm/Support/FormatVariadic.h"
-#include "llvm/Support/Regex.h"
-
-#include <algorithm>
-
-using namespace llvm;
-using namespace llvm::msf;
-using namespace llvm::pdb;
-
-namespace {
-bool IsItemExcluded(llvm::StringRef Item,
-                    std::list<llvm::Regex> &IncludeFilters,
-                    std::list<llvm::Regex> &ExcludeFilters) {
-  if (Item.empty())
-    return false;
-
-  auto match_pred = [Item](llvm::Regex &R) { return R.match(Item); };
-
-  // Include takes priority over exclude.  If the user specified include
-  // filters, and none of them include this item, them item is gone.
-  if (!IncludeFilters.empty() && !any_of(IncludeFilters, match_pred))
-    return true;
-
-  if (any_of(ExcludeFilters, match_pred))
-    return true;
-
-  return false;
-}
-}
-
-using namespace llvm;
-
-LinePrinter::LinePrinter(int Indent, bool UseColor, llvm::raw_ostream &Stream)
-    : OS(Stream), IndentSpaces(Indent), CurrentIndent(0), UseColor(UseColor) {
-  SetFilters(ExcludeTypeFilters, opts::pretty::ExcludeTypes.begin(),
-             opts::pretty::ExcludeTypes.end());
-  SetFilters(ExcludeSymbolFilters, opts::pretty::ExcludeSymbols.begin(),
-             opts::pretty::ExcludeSymbols.end());
-  SetFilters(ExcludeCompilandFilters, opts::pretty::ExcludeCompilands.begin(),
-             opts::pretty::ExcludeCompilands.end());
-
-  SetFilters(IncludeTypeFilters, opts::pretty::IncludeTypes.begin(),
-             opts::pretty::IncludeTypes.end());
-  SetFilters(IncludeSymbolFilters, opts::pretty::IncludeSymbols.begin(),
-             opts::pretty::IncludeSymbols.end());
-  SetFilters(IncludeCompilandFilters, opts::pretty::IncludeCompilands.begin(),
-             opts::pretty::IncludeCompilands.end());
-}
-
-void LinePrinter::Indent(uint32_t Amount) {
-  if (Amount == 0)
-    Amount = IndentSpaces;
-  CurrentIndent += Amount;
-}
-
-void LinePrinter::Unindent(uint32_t Amount) {
-  if (Amount == 0)
-    Amount = IndentSpaces;
-  CurrentIndent = std::max<int>(0, CurrentIndent - Amount);
-}
-
-void LinePrinter::NewLine() {
-  OS << "\n";
-  OS.indent(CurrentIndent);
-}
-
-void LinePrinter::print(const Twine &T) { OS << T; }
-
-void LinePrinter::printLine(const Twine &T) {
-  NewLine();
-  OS << T;
-}
-
-bool LinePrinter::IsClassExcluded(const ClassLayout &Class) {
-  if (IsTypeExcluded(Class.getName(), Class.getSize()))
-    return true;
-  if (Class.deepPaddingSize() < opts::pretty::PaddingThreshold)
-    return true;
-  return false;
-}
-
-void LinePrinter::formatBinary(StringRef Label, ArrayRef<uint8_t> Data,
-                               uint32_t StartOffset) {
-  NewLine();
-  OS << Label << " (";
-  if (!Data.empty()) {
-    OS << "\n";
-    OS << format_bytes_with_ascii(Data, StartOffset, 32, 4,
-                                  CurrentIndent + IndentSpaces, true);
-    NewLine();
-  }
-  OS << ")";
-}
-
-void LinePrinter::formatBinary(StringRef Label, ArrayRef<uint8_t> Data,
-                               uint64_t Base, uint32_t StartOffset) {
-  NewLine();
-  OS << Label << " (";
-  if (!Data.empty()) {
-    OS << "\n";
-    Base += StartOffset;
-    OS << format_bytes_with_ascii(Data, Base, 32, 4,
-                                  CurrentIndent + IndentSpaces, true);
-    NewLine();
-  }
-  OS << ")";
-}
-
-namespace {
-struct Run {
-  Run() = default;
-  explicit Run(uint32_t Block) : Block(Block) {}
-  uint32_t Block = 0;
-  uint32_t ByteLen = 0;
-};
-} // namespace
-
-static std::vector<Run> computeBlockRuns(uint32_t BlockSize,
-                                         const msf::MSFStreamLayout &Layout) {
-  std::vector<Run> Runs;
-  if (Layout.Length == 0)
-    return Runs;
-
-  ArrayRef<support::ulittle32_t> Blocks = Layout.Blocks;
-  assert(!Blocks.empty());
-  uint32_t StreamBytesRemaining = Layout.Length;
-  uint32_t CurrentBlock = Blocks[0];
-  Runs.emplace_back(CurrentBlock);
-  while (!Blocks.empty()) {
-    Run *CurrentRun = &Runs.back();
-    uint32_t NextBlock = Blocks.front();
-    if (NextBlock < CurrentBlock || (NextBlock - CurrentBlock > 1)) {
-      Runs.emplace_back(NextBlock);
-      CurrentRun = &Runs.back();
-    }
-    uint32_t Used = std::min(BlockSize, StreamBytesRemaining);
-    CurrentRun->ByteLen += Used;
-    StreamBytesRemaining -= Used;
-    CurrentBlock = NextBlock;
-    Blocks = Blocks.drop_front();
-  }
-  return Runs;
-}
-
-static std::pair<Run, uint32_t> findRun(uint32_t Offset, ArrayRef<Run> Runs) {
-  for (const auto &R : Runs) {
-    if (Offset < R.ByteLen)
-      return std::make_pair(R, Offset);
-    Offset -= R.ByteLen;
-  }
-  llvm_unreachable("Invalid offset!");
-}
-
-void LinePrinter::formatMsfStreamData(StringRef Label, PDBFile &File,
-                                      uint32_t StreamIdx,
-                                      StringRef StreamPurpose, uint32_t Offset,
-                                      uint32_t Size) {
-  if (StreamIdx >= File.getNumStreams()) {
-    formatLine("Stream {0}: Not present", StreamIdx);
-    return;
-  }
-  if (Size + Offset > File.getStreamByteSize(StreamIdx)) {
-    formatLine(
-        "Stream {0}: Invalid offset and size, range out of stream bounds",
-        StreamIdx);
-    return;
-  }
-
-  auto S = File.createIndexedStream(StreamIdx);
-  if (!S) {
-    NewLine();
-    formatLine("Stream {0}: Not present", StreamIdx);
-    return;
-  }
-
-  uint32_t End =
-      (Size == 0) ? S->getLength() : std::min(Offset + Size, S->getLength());
-  Size = End - Offset;
-
-  formatLine("Stream {0}: {1} (dumping {2:N} / {3:N} bytes)", StreamIdx,
-             StreamPurpose, Size, S->getLength());
-  AutoIndent Indent(*this);
-  BinaryStreamRef Slice(*S);
-  BinarySubstreamRef Substream;
-  Substream.Offset = Offset;
-  Substream.StreamData = Slice.drop_front(Offset).keep_front(Size);
-
-  auto Layout = File.getStreamLayout(StreamIdx);
-  formatMsfStreamData(Label, File, Layout, Substream);
-}
-
-void LinePrinter::formatMsfStreamData(StringRef Label, PDBFile &File,
-                                      const msf::MSFStreamLayout &Stream,
-                                      BinarySubstreamRef Substream) {
-  BinaryStreamReader Reader(Substream.StreamData);
-
-  auto Runs = computeBlockRuns(File.getBlockSize(), Stream);
-
-  NewLine();
-  OS << Label << " (";
-  while (Reader.bytesRemaining() > 0) {
-    OS << "\n";
-
-    Run FoundRun;
-    uint32_t RunOffset;
-    std::tie(FoundRun, RunOffset) = findRun(Substream.Offset, Runs);
-    assert(FoundRun.ByteLen >= RunOffset);
-    uint32_t Len = FoundRun.ByteLen - RunOffset;
-    Len = std::min(Len, Reader.bytesRemaining());
-    uint64_t Base = FoundRun.Block * File.getBlockSize() + RunOffset;
-    ArrayRef<uint8_t> Data;
-    consumeError(Reader.readBytes(Data, Len));
-    OS << format_bytes_with_ascii(Data, Base, 32, 4,
-                                  CurrentIndent + IndentSpaces, true);
-    if (Reader.bytesRemaining() > 0) {
-      NewLine();
-      OS << formatv("  {0}",
-                    fmt_align("<discontinuity>", AlignStyle::Center, 114, '-'));
-    }
-    Substream.Offset += Len;
-  }
-  NewLine();
-  OS << ")";
-}
-
-void LinePrinter::formatMsfStreamBlocks(
-    PDBFile &File, const msf::MSFStreamLayout &StreamLayout) {
-  auto Blocks = makeArrayRef(StreamLayout.Blocks);
-  uint32_t L = StreamLayout.Length;
-
-  while (L > 0) {
-    NewLine();
-    assert(!Blocks.empty());
-    OS << formatv("Block {0} (\n", uint32_t(Blocks.front()));
-    uint32_t UsedBytes = std::min(L, File.getBlockSize());
-    ArrayRef<uint8_t> BlockData =
-        cantFail(File.getBlockData(Blocks.front(), File.getBlockSize()));
-    uint64_t BaseOffset = Blocks.front();
-    BaseOffset *= File.getBlockSize();
-    OS << format_bytes_with_ascii(BlockData, BaseOffset, 32, 4,
-                                  CurrentIndent + IndentSpaces, true);
-    NewLine();
-    OS << ")";
-    NewLine();
-    L -= UsedBytes;
-    Blocks = Blocks.drop_front();
-  }
-}
-
-bool LinePrinter::IsTypeExcluded(llvm::StringRef TypeName, uint32_t Size) {
-  if (IsItemExcluded(TypeName, IncludeTypeFilters, ExcludeTypeFilters))
-    return true;
-  if (Size < opts::pretty::SizeThreshold)
-    return true;
-  return false;
-}
-
-bool LinePrinter::IsSymbolExcluded(llvm::StringRef SymbolName) {
-  return IsItemExcluded(SymbolName, IncludeSymbolFilters, ExcludeSymbolFilters);
-}
-
-bool LinePrinter::IsCompilandExcluded(llvm::StringRef CompilandName) {
-  return IsItemExcluded(CompilandName, IncludeCompilandFilters,
-                        ExcludeCompilandFilters);
-}
-
-WithColor::WithColor(LinePrinter &P, PDB_ColorItem C)
-    : OS(P.OS), UseColor(P.hasColor()) {
-  if (UseColor)
-    applyColor(C);
-}
-
-WithColor::~WithColor() {
-  if (UseColor)
-    OS.resetColor();
-}
-
-void WithColor::applyColor(PDB_ColorItem C) {
-  switch (C) {
-  case PDB_ColorItem::None:
-    OS.resetColor();
-    return;
-  case PDB_ColorItem::Comment:
-    OS.changeColor(raw_ostream::GREEN, false);
-    return;
-  case PDB_ColorItem::Address:
-    OS.changeColor(raw_ostream::YELLOW, /*bold=*/true);
-    return;
-  case PDB_ColorItem::Keyword:
-    OS.changeColor(raw_ostream::MAGENTA, true);
-    return;
-  case PDB_ColorItem::Register:
-  case PDB_ColorItem::Offset:
-    OS.changeColor(raw_ostream::YELLOW, false);
-    return;
-  case PDB_ColorItem::Type:
-    OS.changeColor(raw_ostream::CYAN, true);
-    return;
-  case PDB_ColorItem::Identifier:
-    OS.changeColor(raw_ostream::CYAN, false);
-    return;
-  case PDB_ColorItem::Path:
-    OS.changeColor(raw_ostream::CYAN, false);
-    return;
-  case PDB_ColorItem::Padding:
-  case PDB_ColorItem::SectionHeader:
-    OS.changeColor(raw_ostream::RED, true);
-    return;
-  case PDB_ColorItem::LiteralValue:
-    OS.changeColor(raw_ostream::GREEN, true);
-    return;
-  }
-}
diff --git a/gnu/llvm/llvm/tools/llvm-pdbutil/LinePrinter.h b/gnu/llvm/llvm/tools/llvm-pdbutil/LinePrinter.h
deleted file mode 100644
index 7ecfae17354..00000000000
--- a/gnu/llvm/llvm/tools/llvm-pdbutil/LinePrinter.h
+++ /dev/null
@@ -1,168 +0,0 @@
-//===- LinePrinter.h ------------------------------------------ *- C++ --*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_LLVMPDBDUMP_LINEPRINTER_H
-#define LLVM_TOOLS_LLVMPDBDUMP_LINEPRINTER_H
-
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/ADT/Twine.h"
-#include "llvm/Support/BinaryStreamRef.h"
-#include "llvm/Support/FormatVariadic.h"
-#include "llvm/Support/Regex.h"
-#include "llvm/Support/raw_ostream.h"
-
-#include <list>
-
-namespace llvm {
-class BinaryStreamReader;
-namespace msf {
-class MSFStreamLayout;
-} // namespace msf
-namespace pdb {
-
-class ClassLayout;
-class PDBFile;
-
-class LinePrinter {
-  friend class WithColor;
-
-public:
-  LinePrinter(int Indent, bool UseColor, raw_ostream &Stream);
-
-  void Indent(uint32_t Amount = 0);
-  void Unindent(uint32_t Amount = 0);
-  void NewLine();
-
-  void printLine(const Twine &T);
-  void print(const Twine &T);
-  template <typename... Ts> void formatLine(const char *Fmt, Ts &&... Items) {
-    printLine(formatv(Fmt, std::forward<Ts>(Items)...));
-  }
-  template <typename... Ts> void format(const char *Fmt, Ts &&... Items) {
-    print(formatv(Fmt, std::forward<Ts>(Items)...));
-  }
-
-  void formatBinary(StringRef Label, ArrayRef<uint8_t> Data,
-                    uint32_t StartOffset);
-  void formatBinary(StringRef Label, ArrayRef<uint8_t> Data, uint64_t BaseAddr,
-                    uint32_t StartOffset);
-
-  void formatMsfStreamData(StringRef Label, PDBFile &File, uint32_t StreamIdx,
-                           StringRef StreamPurpose, uint32_t Offset,
-                           uint32_t Size);
-  void formatMsfStreamData(StringRef Label, PDBFile &File,
-                           const msf::MSFStreamLayout &Stream,
-                           BinarySubstreamRef Substream);
-  void formatMsfStreamBlocks(PDBFile &File, const msf::MSFStreamLayout &Stream);
-
-  bool hasColor() const { return UseColor; }
-  raw_ostream &getStream() { return OS; }
-  int getIndentLevel() const { return CurrentIndent; }
-
-  bool IsClassExcluded(const ClassLayout &Class);
-  bool IsTypeExcluded(llvm::StringRef TypeName, uint32_t Size);
-  bool IsSymbolExcluded(llvm::StringRef SymbolName);
-  bool IsCompilandExcluded(llvm::StringRef CompilandName);
-
-private:
-  template <typename Iter>
-  void SetFilters(std::list<Regex> &List, Iter Begin, Iter End) {
-    List.clear();
-    for (; Begin != End; ++Begin)
-      List.emplace_back(StringRef(*Begin));
-  }
-
-  raw_ostream &OS;
-  int IndentSpaces;
-  int CurrentIndent;
-  bool UseColor;
-
-  std::list<Regex> ExcludeCompilandFilters;
-  std::list<Regex> ExcludeTypeFilters;
-  std::list<Regex> ExcludeSymbolFilters;
-
-  std::list<Regex> IncludeCompilandFilters;
-  std::list<Regex> IncludeTypeFilters;
-  std::list<Regex> IncludeSymbolFilters;
-};
-
-struct PrintScope {
-  explicit PrintScope(LinePrinter &P, uint32_t IndentLevel)
-      : P(P), IndentLevel(IndentLevel) {}
-  explicit PrintScope(const PrintScope &Other, uint32_t LabelWidth)
-      : P(Other.P), IndentLevel(Other.IndentLevel), LabelWidth(LabelWidth) {}
-
-  LinePrinter &P;
-  uint32_t IndentLevel;
-  uint32_t LabelWidth = 0;
-};
-
-inline Optional<PrintScope> withLabelWidth(const Optional<PrintScope> &Scope,
-                                           uint32_t W) {
-  if (!Scope)
-    return None;
-  return PrintScope{*Scope, W};
-}
-
-struct AutoIndent {
-  explicit AutoIndent(LinePrinter &L, uint32_t Amount = 0)
-      : L(&L), Amount(Amount) {
-    L.Indent(Amount);
-  }
-  explicit AutoIndent(const Optional<PrintScope> &Scope) {
-    if (Scope.hasValue()) {
-      L = &Scope->P;
-      Amount = Scope->IndentLevel;
-    }
-  }
-  ~AutoIndent() {
-    if (L)
-      L->Unindent(Amount);
-  }
-
-  LinePrinter *L = nullptr;
-  uint32_t Amount = 0;
-};
-
-template <class T>
-inline raw_ostream &operator<<(LinePrinter &Printer, const T &Item) {
-  return Printer.getStream() << Item;
-}
-
-enum class PDB_ColorItem {
-  None,
-  Address,
-  Type,
-  Comment,
-  Padding,
-  Keyword,
-  Offset,
-  Identifier,
-  Path,
-  SectionHeader,
-  LiteralValue,
-  Register,
-};
-
-class WithColor {
-public:
-  WithColor(LinePrinter &P, PDB_ColorItem C);
-  ~WithColor();
-
-  raw_ostream &get() { return OS; }
-
-private:
-  void applyColor(PDB_ColorItem C);
-  raw_ostream &OS;
-  bool UseColor;
-};
-}
-}
-
-#endif
diff --git a/gnu/llvm/llvm/tools/llvm-profgen/PseudoProbe.cpp b/gnu/llvm/llvm/tools/llvm-profgen/PseudoProbe.cpp
deleted file mode 100644
index 02af3f0ffd6..00000000000
--- a/gnu/llvm/llvm/tools/llvm-profgen/PseudoProbe.cpp
+++ /dev/null
@@ -1,341 +0,0 @@
-//===--- PseudoProbe.cpp - Pseudo probe decoding utilities  ------*- C++-*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "PseudoProbe.h"
-#include "ErrorHandling.h"
-#include "llvm/Support/Endian.h"
-#include "llvm/Support/LEB128.h"
-#include "llvm/Support/raw_ostream.h"
-#include <limits>
-#include <memory>
-
-using namespace llvm;
-using namespace sampleprof;
-using namespace support;
-
-namespace llvm {
-namespace sampleprof {
-
-static StringRef getProbeFNameForGUID(const GUIDProbeFunctionMap &GUID2FuncMAP,
-                                      uint64_t GUID) {
-  auto It = GUID2FuncMAP.find(GUID);
-  assert(It != GUID2FuncMAP.end() &&
-         "Probe function must exist for a valid GUID");
-  return It->second.FuncName;
-}
-
-void PseudoProbeFuncDesc::print(raw_ostream &OS) {
-  OS << "GUID: " << FuncGUID << " Name: " << FuncName << "\n";
-  OS << "Hash: " << FuncHash << "\n";
-}
-
-void PseudoProbe::getInlineContext(SmallVectorImpl<std::string> &ContextStack,
-                                   const GUIDProbeFunctionMap &GUID2FuncMAP,
-                                   bool ShowName) const {
-  uint32_t Begin = ContextStack.size();
-  PseudoProbeInlineTree *Cur = InlineTree;
-  // It will add the string of each node's inline site during iteration.
-  // Note that it won't include the probe's belonging function(leaf location)
-  while (Cur->hasInlineSite()) {
-    std::string ContextStr;
-    if (ShowName) {
-      StringRef FuncName =
-          getProbeFNameForGUID(GUID2FuncMAP, std::get<0>(Cur->ISite));
-      ContextStr += FuncName.str();
-    } else {
-      ContextStr += Twine(std::get<0>(Cur->ISite)).str();
-    }
-    ContextStr += ":";
-    ContextStr += Twine(std::get<1>(Cur->ISite)).str();
-    ContextStack.emplace_back(ContextStr);
-    Cur = Cur->Parent;
-  }
-  // Make the ContextStack in caller-callee order
-  std::reverse(ContextStack.begin() + Begin, ContextStack.end());
-}
-
-std::string
-PseudoProbe::getInlineContextStr(const GUIDProbeFunctionMap &GUID2FuncMAP,
-                                 bool ShowName) const {
-  std::ostringstream OContextStr;
-  SmallVector<std::string, 16> ContextStack;
-  getInlineContext(ContextStack, GUID2FuncMAP, ShowName);
-  for (auto &CxtStr : ContextStack) {
-    if (OContextStr.str().size())
-      OContextStr << " @ ";
-    OContextStr << CxtStr;
-  }
-  return OContextStr.str();
-}
-
-static const char *PseudoProbeTypeStr[3] = {"Block", "IndirectCall",
-                                            "DirectCall"};
-
-void PseudoProbe::print(raw_ostream &OS,
-                        const GUIDProbeFunctionMap &GUID2FuncMAP,
-                        bool ShowName) {
-  OS << "FUNC: ";
-  if (ShowName) {
-    StringRef FuncName = getProbeFNameForGUID(GUID2FuncMAP, GUID);
-    OS << FuncName.str() << " ";
-  } else {
-    OS << GUID << " ";
-  }
-  OS << "Index: " << Index << "  ";
-  OS << "Type: " << PseudoProbeTypeStr[static_cast<uint8_t>(Type)] << "  ";
-
-  std::string InlineContextStr = getInlineContextStr(GUID2FuncMAP, ShowName);
-  if (InlineContextStr.size()) {
-    OS << "Inlined: @ ";
-    OS << InlineContextStr;
-  }
-  OS << "\n";
-}
-
-template <typename T> T PseudoProbeDecoder::readUnencodedNumber() {
-  if (Data + sizeof(T) > End) {
-    exitWithError("Decode unencoded number error in " + SectionName +
-                  " section");
-  }
-  T Val = endian::readNext<T, little, unaligned>(Data);
-  return Val;
-}
-
-template <typename T> T PseudoProbeDecoder::readUnsignedNumber() {
-  unsigned NumBytesRead = 0;
-  uint64_t Val = decodeULEB128(Data, &NumBytesRead);
-  if (Val > std::numeric_limits<T>::max() || (Data + NumBytesRead > End)) {
-    exitWithError("Decode number error in " + SectionName + " section");
-  }
-  Data += NumBytesRead;
-  return static_cast<T>(Val);
-}
-
-template <typename T> T PseudoProbeDecoder::readSignedNumber() {
-  unsigned NumBytesRead = 0;
-  int64_t Val = decodeSLEB128(Data, &NumBytesRead);
-  if (Val > std::numeric_limits<T>::max() || (Data + NumBytesRead > End)) {
-    exitWithError("Decode number error in " + SectionName + " section");
-  }
-  Data += NumBytesRead;
-  return static_cast<T>(Val);
-}
-
-StringRef PseudoProbeDecoder::readString(uint32_t Size) {
-  StringRef Str(reinterpret_cast<const char *>(Data), Size);
-  if (Data + Size > End) {
-    exitWithError("Decode string error in " + SectionName + " section");
-  }
-  Data += Size;
-  return Str;
-}
-
-void PseudoProbeDecoder::buildGUID2FuncDescMap(const uint8_t *Start,
-                                               std::size_t Size) {
-  // The pseudo_probe_desc section has a format like:
-  // .section .pseudo_probe_desc,"",@progbits
-  // .quad -5182264717993193164   // GUID
-  // .quad 4294967295             // Hash
-  // .uleb 3                      // Name size
-  // .ascii "foo"                 // Name
-  // .quad -2624081020897602054
-  // .quad 174696971957
-  // .uleb 34
-  // .ascii "main"
-#ifndef NDEBUG
-  SectionName = "pseudo_probe_desc";
-#endif
-  Data = Start;
-  End = Data + Size;
-
-  while (Data < End) {
-    uint64_t GUID = readUnencodedNumber<uint64_t>();
-    uint64_t Hash = readUnencodedNumber<uint64_t>();
-    uint32_t NameSize = readUnsignedNumber<uint32_t>();
-    StringRef Name = FunctionSamples::getCanonicalFnName(readString(NameSize));
-
-    // Initialize PseudoProbeFuncDesc and populate it into GUID2FuncDescMap
-    GUID2FuncDescMap.emplace(GUID, PseudoProbeFuncDesc(GUID, Hash, Name));
-  }
-  assert(Data == End && "Have unprocessed data in pseudo_probe_desc section");
-}
-
-void PseudoProbeDecoder::buildAddress2ProbeMap(const uint8_t *Start,
-                                               std::size_t Size) {
-  // The pseudo_probe section encodes an inline forest and each tree has a
-  // format like:
-  //  FUNCTION BODY (one for each uninlined function present in the text
-  //  section)
-  //     GUID (uint64)
-  //         GUID of the function
-  //     NPROBES (ULEB128)
-  //         Number of probes originating from this function.
-  //     NUM_INLINED_FUNCTIONS (ULEB128)
-  //         Number of callees inlined into this function, aka number of
-  //         first-level inlinees
-  //     PROBE RECORDS
-  //         A list of NPROBES entries. Each entry contains:
-  //           INDEX (ULEB128)
-  //           TYPE (uint4)
-  //             0 - block probe, 1 - indirect call, 2 - direct call
-  //           ATTRIBUTE (uint3)
-  //             1 - reserved
-  //           ADDRESS_TYPE (uint1)
-  //             0 - code address, 1 - address delta
-  //           CODE_ADDRESS (uint64 or ULEB128)
-  //             code address or address delta, depending on Flag
-  //     INLINED FUNCTION RECORDS
-  //         A list of NUM_INLINED_FUNCTIONS entries describing each of the
-  //         inlined callees.  Each record contains:
-  //           INLINE SITE
-  //             Index of the callsite probe (ULEB128)
-  //           FUNCTION BODY
-  //             A FUNCTION BODY entry describing the inlined function.
-#ifndef NDEBUG
-  SectionName = "pseudo_probe";
-#endif
-  Data = Start;
-  End = Data + Size;
-
-  PseudoProbeInlineTree *Root = &DummyInlineRoot;
-  PseudoProbeInlineTree *Cur = &DummyInlineRoot;
-  uint64_t LastAddr = 0;
-  uint32_t Index = 0;
-  // A DFS-based decoding
-  while (Data < End) {
-    if (Root == Cur) {
-      // Use a sequential id for top level inliner.
-      Index = Root->getChildren().size();
-    } else {
-      // Read inline site for inlinees
-      Index = readUnsignedNumber<uint32_t>();
-    }
-    // Switch/add to a new tree node(inlinee)
-    Cur = Cur->getOrAddNode(std::make_tuple(Cur->GUID, Index));
-    // Read guid
-    Cur->GUID = readUnencodedNumber<uint64_t>();
-    // Read number of probes in the current node.
-    uint32_t NodeCount = readUnsignedNumber<uint32_t>();
-    // Read number of direct inlinees
-    Cur->ChildrenToProcess = readUnsignedNumber<uint32_t>();
-    // Read all probes in this node
-    for (std::size_t I = 0; I < NodeCount; I++) {
-      // Read index
-      uint32_t Index = readUnsignedNumber<uint32_t>();
-      // Read type | flag.
-      uint8_t Value = readUnencodedNumber<uint8_t>();
-      uint8_t Kind = Value & 0xf;
-      uint8_t Attr = (Value & 0x70) >> 4;
-      // Read address
-      uint64_t Addr = 0;
-      if (Value & 0x80) {
-        int64_t Offset = readSignedNumber<int64_t>();
-        Addr = LastAddr + Offset;
-      } else {
-        Addr = readUnencodedNumber<int64_t>();
-      }
-      // Populate Address2ProbesMap
-      auto &Probes = Address2ProbesMap[Addr];
-      Probes.emplace_back(Addr, Cur->GUID, Index, PseudoProbeType(Kind), Attr,
-                          Cur);
-      Cur->addProbes(&Probes.back());
-      LastAddr = Addr;
-    }
-
-    // Look for the parent for the next node by subtracting the current
-    // node count from tree counts along the parent chain. The first node
-    // in the chain that has a non-zero tree count is the target.
-    while (Cur != Root) {
-      if (Cur->ChildrenToProcess == 0) {
-        Cur = Cur->Parent;
-        if (Cur != Root) {
-          assert(Cur->ChildrenToProcess > 0 &&
-                 "Should have some unprocessed nodes");
-          Cur->ChildrenToProcess -= 1;
-        }
-      } else {
-        break;
-      }
-    }
-  }
-
-  assert(Data == End && "Have unprocessed data in pseudo_probe section");
-  assert(Cur == Root &&
-         " Cur should point to root when the forest is fully built up");
-}
-
-void PseudoProbeDecoder::printGUID2FuncDescMap(raw_ostream &OS) {
-  OS << "Pseudo Probe Desc:\n";
-  // Make the output deterministic
-  std::map<uint64_t, PseudoProbeFuncDesc> OrderedMap(GUID2FuncDescMap.begin(),
-                                                     GUID2FuncDescMap.end());
-  for (auto &I : OrderedMap) {
-    I.second.print(OS);
-  }
-}
-
-void PseudoProbeDecoder::printProbeForAddress(raw_ostream &OS,
-                                              uint64_t Address) {
-  auto It = Address2ProbesMap.find(Address);
-  if (It != Address2ProbesMap.end()) {
-    for (auto &Probe : It->second) {
-      OS << " [Probe]:\t";
-      Probe.print(OS, GUID2FuncDescMap, true);
-    }
-  }
-}
-
-const PseudoProbe *
-PseudoProbeDecoder::getCallProbeForAddr(uint64_t Address) const {
-  auto It = Address2ProbesMap.find(Address);
-  if (It == Address2ProbesMap.end())
-    return nullptr;
-  const auto &Probes = It->second;
-
-  const PseudoProbe *CallProbe = nullptr;
-  for (const auto &Probe : Probes) {
-    if (Probe.isCall()) {
-      assert(!CallProbe &&
-             "There should be only one call probe corresponding to address "
-             "which is a callsite.");
-      CallProbe = &Probe;
-    }
-  }
-  return CallProbe;
-}
-
-const PseudoProbeFuncDesc *
-PseudoProbeDecoder::getFuncDescForGUID(uint64_t GUID) const {
-  auto It = GUID2FuncDescMap.find(GUID);
-  assert(It != GUID2FuncDescMap.end() && "Function descriptor doesn't exist");
-  return &It->second;
-}
-
-void PseudoProbeDecoder::getInlineContextForProbe(
-    const PseudoProbe *Probe, SmallVectorImpl<std::string> &InlineContextStack,
-    bool IncludeLeaf) const {
-  Probe->getInlineContext(InlineContextStack, GUID2FuncDescMap, true);
-  if (!IncludeLeaf)
-    return;
-  // Note that the context from probe doesn't include leaf frame,
-  // hence we need to retrieve and prepend leaf if requested.
-  const auto *FuncDesc = getFuncDescForGUID(Probe->GUID);
-  InlineContextStack.emplace_back(FuncDesc->FuncName + ":" +
-                                  Twine(Probe->Index).str());
-}
-
-const PseudoProbeFuncDesc *
-PseudoProbeDecoder::getInlinerDescForProbe(const PseudoProbe *Probe) const {
-  PseudoProbeInlineTree *InlinerNode = Probe->InlineTree;
-  if (!InlinerNode->hasInlineSite())
-    return nullptr;
-  return getFuncDescForGUID(std::get<0>(InlinerNode->ISite));
-}
-
-} // end namespace sampleprof
-} // end namespace llvm
diff --git a/gnu/llvm/llvm/tools/llvm-profgen/PseudoProbe.h b/gnu/llvm/llvm/tools/llvm-profgen/PseudoProbe.h
deleted file mode 100644
index 62d46d3092b..00000000000
--- a/gnu/llvm/llvm/tools/llvm-profgen/PseudoProbe.h
+++ /dev/null
@@ -1,227 +0,0 @@
-//===--- PseudoProbe.h - Pseudo probe decoding utilities ---------*- C++-*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-#ifndef LLVM_TOOLS_LLVM_PROFGEN_PSEUDOPROBE_H
-#define LLVM_TOOLS_LLVM_PROFGEN_PSEUDOPROBE_H
-
-#include "llvm/ADT/StringRef.h"
-#include "llvm/ADT/Twine.h"
-#include "llvm/IR/PseudoProbe.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/Transforms/IPO/SampleProfileProbe.h"
-#include <algorithm>
-#include <set>
-#include <sstream>
-#include <string>
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
-
-namespace llvm {
-namespace sampleprof {
-
-enum PseudoProbeAttributes { RESERVED = 1 };
-
-// Use func GUID and index as the location info of the inline site
-using InlineSite = std::tuple<uint64_t, uint32_t>;
-
-struct PseudoProbe;
-
-// Tree node to represent the inline relation and its inline site, we use a
-// dummy root in the PseudoProbeDecoder to lead the tree, the outlined
-// function will directly be the children of the dummy root. For the inlined
-// function, all the inlinee will be connected to its inlineer, then further to
-// its outlined function. Pseudo probes originating from the function stores the
-// tree's leaf node which we can process backwards to get its inline context
-class PseudoProbeInlineTree {
-  std::vector<PseudoProbe *> ProbeVector;
-
-  struct InlineSiteHash {
-    uint64_t operator()(const InlineSite &Site) const {
-      return std::get<0>(Site) ^ std::get<1>(Site);
-    }
-  };
-  using InlinedProbeTreeMap =
-      std::unordered_map<InlineSite, std::unique_ptr<PseudoProbeInlineTree>,
-                         InlineSiteHash>;
-  InlinedProbeTreeMap Children;
-
-public:
-  // Inlinee function GUID
-  uint64_t GUID = 0;
-  // Inline site to indicate the location in its inliner. As the node could also
-  // be an outlined function, it will use a dummy InlineSite whose GUID and
-  // Index is 0 connected to the dummy root
-  InlineSite ISite;
-  // Used for decoding
-  uint32_t ChildrenToProcess = 0;
-  // Caller node of the inline site
-  PseudoProbeInlineTree *Parent;
-
-  PseudoProbeInlineTree(){};
-  PseudoProbeInlineTree(const InlineSite &Site) : ISite(Site){};
-
-  PseudoProbeInlineTree *getOrAddNode(const InlineSite &Site) {
-    auto Ret =
-        Children.emplace(Site, std::make_unique<PseudoProbeInlineTree>(Site));
-    Ret.first->second->Parent = this;
-    return Ret.first->second.get();
-  }
-
-  InlinedProbeTreeMap &getChildren() { return Children; }
-  std::vector<PseudoProbe *> &getProbes() { return ProbeVector; }
-  void addProbes(PseudoProbe *Probe) { ProbeVector.push_back(Probe); }
-  // Return false if it's a dummy inline site
-  bool hasInlineSite() const { return std::get<0>(ISite) != 0; }
-};
-
-// Function descriptor decoded from .pseudo_probe_desc section
-struct PseudoProbeFuncDesc {
-  uint64_t FuncGUID = 0;
-  uint64_t FuncHash = 0;
-  std::string FuncName;
-
-  PseudoProbeFuncDesc(uint64_t GUID, uint64_t Hash, StringRef Name)
-      : FuncGUID(GUID), FuncHash(Hash), FuncName(Name){};
-
-  void print(raw_ostream &OS);
-};
-
-// GUID to PseudoProbeFuncDesc map
-using GUIDProbeFunctionMap = std::unordered_map<uint64_t, PseudoProbeFuncDesc>;
-// Address to pseudo probes map.
-using AddressProbesMap = std::unordered_map<uint64_t, std::list<PseudoProbe>>;
-
-/*
-A pseudo probe has the format like below:
-  INDEX (ULEB128)
-  TYPE (uint4)
-    0 - block probe, 1 - indirect call, 2 - direct call
-  ATTRIBUTE (uint3)
-    1 - reserved
-  ADDRESS_TYPE (uint1)
-    0 - code address, 1 - address delta
-  CODE_ADDRESS (uint64 or ULEB128)
-  code address or address delta, depending on Flag
-*/
-struct PseudoProbe {
-  uint64_t Address;
-  uint64_t GUID;
-  uint32_t Index;
-  PseudoProbeType Type;
-  uint8_t Attribute;
-  PseudoProbeInlineTree *InlineTree;
-  const static uint32_t PseudoProbeFirstId =
-      static_cast<uint32_t>(PseudoProbeReservedId::Last) + 1;
-
-  PseudoProbe(uint64_t Ad, uint64_t G, uint32_t I, PseudoProbeType K,
-              uint8_t At, PseudoProbeInlineTree *Tree)
-      : Address(Ad), GUID(G), Index(I), Type(K), Attribute(At),
-        InlineTree(Tree){};
-
-  bool isEntry() const { return Index == PseudoProbeFirstId; }
-  bool isBlock() const { return Type == PseudoProbeType::Block; }
-  bool isIndirectCall() const { return Type == PseudoProbeType::IndirectCall; }
-  bool isDirectCall() const { return Type == PseudoProbeType::DirectCall; }
-  bool isCall() const { return isIndirectCall() || isDirectCall(); }
-
-  PseudoProbeInlineTree *getInlineTreeNode() const { return InlineTree; }
-
-  // Get the inlined context by traversing current inline tree backwards,
-  // each tree node has its InlineSite which is taken as the context.
-  // \p ContextStack is populated in root to leaf order
-  void getInlineContext(SmallVectorImpl<std::string> &ContextStack,
-                        const GUIDProbeFunctionMap &GUID2FuncMAP,
-                        bool ShowName) const;
-  // Helper function to get the string from context stack
-  std::string getInlineContextStr(const GUIDProbeFunctionMap &GUID2FuncMAP,
-                                  bool ShowName) const;
-  // Print pseudo probe while disassembling
-  void print(raw_ostream &OS, const GUIDProbeFunctionMap &GUID2FuncMAP,
-             bool ShowName);
-};
-
-/*
-Decode pseudo probe info from ELF section, used along with ELF reader
-Two sections are decoded here:
-  1) \fn buildGUID2FunctionMap is responsible for .pseudo_probe_desc
-  section which encodes all function descriptors.
-  2) \fn buildAddress2ProbeMap is responsible for .pseudoprobe section
-    which encodes an inline function forest and each tree includes its
-    inlined function and all pseudo probes inside the function.
-see \file MCPseudoProbe.h for the details of the section encoding format.
-*/
-class PseudoProbeDecoder {
-  // GUID to PseudoProbeFuncDesc map.
-  GUIDProbeFunctionMap GUID2FuncDescMap;
-
-  // Address to probes map.
-  AddressProbesMap Address2ProbesMap;
-
-  // The dummy root of the inline trie, all the outlined function will directly
-  // be the children of the dummy root, all the inlined function will be the
-  // children of its inlineer. So the relation would be like:
-  // DummyRoot --> OutlinedFunc --> InlinedFunc1 --> InlinedFunc2
-  PseudoProbeInlineTree DummyInlineRoot;
-
-  /// Points to the current location in the buffer.
-  const uint8_t *Data = nullptr;
-
-  /// Points to the end of the buffer.
-  const uint8_t *End = nullptr;
-
-  /// SectionName used for debug
-  std::string SectionName;
-
-  // Decoding helper function
-  template <typename T> T readUnencodedNumber();
-  template <typename T> T readUnsignedNumber();
-  template <typename T> T readSignedNumber();
-  StringRef readString(uint32_t Size);
-
-public:
-  // Decode pseudo_probe_desc section to build GUID to PseudoProbeFuncDesc map.
-  void buildGUID2FuncDescMap(const uint8_t *Start, std::size_t Size);
-
-  // Decode pseudo_probe section to build address to probes map.
-  void buildAddress2ProbeMap(const uint8_t *Start, std::size_t Size);
-
-  // Print pseudo_probe_desc section info
-  void printGUID2FuncDescMap(raw_ostream &OS);
-
-  // Print pseudo_probe section info, used along with show-disassembly
-  void printProbeForAddress(raw_ostream &OS, uint64_t Address);
-
-  // Look up the probe of a call for the input address
-  const PseudoProbe *getCallProbeForAddr(uint64_t Address) const;
-
-  const PseudoProbeFuncDesc *getFuncDescForGUID(uint64_t GUID) const;
-
-  // Helper function to populate one probe's inline stack into
-  // \p InlineContextStack.
-  // Current leaf location info will be added if IncludeLeaf is true
-  // Example:
-  //  Current probe(bar:3) inlined at foo:2 then inlined at main:1
-  //  IncludeLeaf = true,  Output: [main:1, foo:2, bar:3]
-  //  IncludeLeaf = false, Output: [main:1, foo:2]
-  void
-  getInlineContextForProbe(const PseudoProbe *Probe,
-                           SmallVectorImpl<std::string> &InlineContextStack,
-                           bool IncludeLeaf) const;
-
-  const AddressProbesMap &getAddress2ProbesMap() const {
-    return Address2ProbesMap;
-  }
-
-  const PseudoProbeFuncDesc *
-  getInlinerDescForProbe(const PseudoProbe *Probe) const;
-};
-
-} // end namespace sampleprof
-} // end namespace llvm
-
-#endif
diff --git a/gnu/llvm/llvm/tools/llvm-readobj/ELFDumper.cpp b/gnu/llvm/llvm/tools/llvm-readobj/ELFDumper.cpp
index 97e6e25841e..1fc0583750d 100644
--- a/gnu/llvm/llvm/tools/llvm-readobj/ELFDumper.cpp
+++ b/gnu/llvm/llvm/tools/llvm-readobj/ELFDumper.cpp
@@ -17,10 +17,10 @@
 #include "StackMapPrinter.h"
 #include "llvm-readobj.h"
 #include "llvm/ADT/ArrayRef.h"
+#include "llvm/ADT/BitVector.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/MapVector.h"
-#include "llvm/ADT/Optional.h"
 #include "llvm/ADT/PointerIntPair.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallString.h"
@@ -30,7 +30,9 @@
 #include "llvm/ADT/Twine.h"
 #include "llvm/BinaryFormat/AMDGPUMetadataVerifier.h"
 #include "llvm/BinaryFormat/ELF.h"
+#include "llvm/BinaryFormat/MsgPackDocument.h"
 #include "llvm/Demangle/Demangle.h"
+#include "llvm/Object/Archive.h"
 #include "llvm/Object/ELF.h"
 #include "llvm/Object/ELFObjectFile.h"
 #include "llvm/Object/ELFTypes.h"
@@ -49,6 +51,8 @@
 #include "llvm/Support/FormatVariadic.h"
 #include "llvm/Support/FormattedStream.h"
 #include "llvm/Support/LEB128.h"
+#include "llvm/Support/MSP430AttributeParser.h"
+#include "llvm/Support/MSP430Attributes.h"
 #include "llvm/Support/MathExtras.h"
 #include "llvm/Support/MipsABIFlags.h"
 #include "llvm/Support/RISCVAttributeParser.h"
@@ -62,6 +66,7 @@
 #include <cstdlib>
 #include <iterator>
 #include <memory>
+#include <optional>
 #include <string>
 #include <system_error>
 #include <vector>
@@ -196,7 +201,7 @@ public:
   uint32_t Symbol;
   typename ELFT::uint Offset;
   typename ELFT::uint Info;
-  Optional<int64_t> Addend;
+  std::optional<int64_t> Addend;
 };
 
 template <class ELFT> class MipsGOTParser;
@@ -284,7 +289,7 @@ protected:
                                   bool NonVisibilityBitsUsed) const {};
   virtual void printSymbol(const Elf_Sym &Symbol, unsigned SymIndex,
                            DataRegion<Elf_Word> ShndxTable,
-                           Optional<StringRef> StrTable, bool IsDynamic,
+                           std::optional<StringRef> StrTable, bool IsDynamic,
                            bool NonVisibilityBitsUsed) const = 0;
 
   virtual void printMipsABIFlags() = 0;
@@ -300,13 +305,12 @@ protected:
 
   // Returns the function symbol index for the given address. Matches the
   // symbol's section with FunctionSec when specified.
-  // Returns None if no function symbol can be found for the address or in case
-  // it is not defined in the specified section.
-  SmallVector<uint32_t>
-  getSymbolIndexesForFunctionAddress(uint64_t SymValue,
-                                     Optional<const Elf_Shdr *> FunctionSec);
+  // Returns std::nullopt if no function symbol can be found for the address or
+  // in case it is not defined in the specified section.
+  SmallVector<uint32_t> getSymbolIndexesForFunctionAddress(
+      uint64_t SymValue, std::optional<const Elf_Shdr *> FunctionSec);
   bool printFunctionStackSize(uint64_t SymValue,
-                              Optional<const Elf_Shdr *> FunctionSec,
+                              std::optional<const Elf_Shdr *> FunctionSec,
                               const Elf_Shdr &StackSizeSec, DataExtractor Data,
                               uint64_t *Offset);
   void printStackSize(const Relocation<ELFT> &R, const Elf_Shdr &RelocSec,
@@ -339,7 +343,8 @@ protected:
     return DynRegionInfo(ObjF, *this, Obj.base() + Offset, Size, EntSize);
   }
 
-  void printAttributes();
+  void printAttributes(unsigned, std::unique_ptr<ELFAttributeParser>,
+                       support::endianness);
   void printMipsReginfo();
   void printMipsOptions();
 
@@ -349,13 +354,13 @@ protected:
 
   Expected<StringRef> getSymbolVersion(const Elf_Sym &Sym,
                                        bool &IsDefault) const;
-  Expected<SmallVector<Optional<VersionEntry>, 0> *> getVersionMap() const;
+  Expected<SmallVector<std::optional<VersionEntry>, 0> *> getVersionMap() const;
 
   DynRegionInfo DynRelRegion;
   DynRegionInfo DynRelaRegion;
   DynRegionInfo DynRelrRegion;
   DynRegionInfo DynPLTRelRegion;
-  Optional<DynRegionInfo> DynSymRegion;
+  std::optional<DynRegionInfo> DynSymRegion;
   DynRegionInfo DynSymTabShndxRegion;
   DynRegionInfo DynamicTable;
   StringRef DynamicStringTable;
@@ -365,8 +370,8 @@ protected:
   const Elf_Shdr *DotDynsymSec = nullptr;
   const Elf_Shdr *DotAddrsigSec = nullptr;
   DenseMap<const Elf_Shdr *, ArrayRef<Elf_Word>> ShndxTables;
-  Optional<uint64_t> SONameOffset;
-  Optional<DenseMap<uint64_t, std::vector<uint32_t>>> AddressToIndexMap;
+  std::optional<uint64_t> SONameOffset;
+  std::optional<DenseMap<uint64_t, std::vector<uint32_t>>> AddressToIndexMap;
 
   const Elf_Shdr *SymbolVersionSection = nullptr;   // .gnu.version
   const Elf_Shdr *SymbolVersionNeedSection = nullptr; // .gnu.version_r
@@ -374,7 +379,7 @@ protected:
 
   std::string getFullSymbolName(const Elf_Sym &Symbol, unsigned SymIndex,
                                 DataRegion<Elf_Word> ShndxTable,
-                                Optional<StringRef> StrTable,
+                                std::optional<StringRef> StrTable,
                                 bool IsDynamic) const;
   Expected<unsigned>
   getSymbolSectionIndex(const Elf_Sym &Symbol, unsigned SymIndex,
@@ -393,7 +398,7 @@ protected:
   ArrayRef<Elf_Word> getShndxTable(const Elf_Shdr *Symtab) const;
 
 private:
-  mutable SmallVector<Optional<VersionEntry>, 0> VersionMap;
+  mutable SmallVector<std::optional<VersionEntry>, 0> VersionMap;
 };
 
 template <class ELFT>
@@ -487,7 +492,7 @@ ELFDumper<ELFT>::getVersionTable(const Elf_Shdr &Sec, ArrayRef<Elf_Sym> *SymTab,
 
 template <class ELFT>
 void ELFDumper<ELFT>::printSymbolsHelper(bool IsDynamic) const {
-  Optional<StringRef> StrTable;
+  std::optional<StringRef> StrTable;
   size_t Entries = 0;
   Elf_Sym_Range Syms(nullptr, nullptr);
   const Elf_Shdr *SymtabSec = IsDynamic ? DotDynsymSec : DotSymtabSec;
@@ -545,6 +550,9 @@ public:
     assert(&this->W.getOStream() == &llvm::fouts());
   }
 
+  void printFileSummary(StringRef FileStr, ObjectFile &Obj,
+                        ArrayRef<std::string> InputFilenames,
+                        const Archive *A) override;
   void printFileHeaders() override;
   void printGroupSections() override;
   void printRelocations() override;
@@ -584,14 +592,6 @@ private:
     Field(unsigned Col) : Column(Col) {}
   };
 
-  template <typename T, typename TEnum>
-  std::string printEnum(T Value, ArrayRef<EnumEntry<TEnum>> EnumValues) const {
-    for (const EnumEntry<TEnum> &EnumItem : EnumValues)
-      if (EnumItem.Value == Value)
-        return std::string(EnumItem.AltName);
-    return to_hexString(Value, false);
-  }
-
   template <typename T, typename TEnum>
   std::string printFlags(T Value, ArrayRef<EnumEntry<TEnum>> EnumValues,
                          TEnum EnumMask1 = {}, TEnum EnumMask2 = {},
@@ -634,7 +634,7 @@ private:
                          const RelSymbol<ELFT> &RelSym) override;
   void printSymbol(const Elf_Sym &Symbol, unsigned SymIndex,
                    DataRegion<Elf_Word> ShndxTable,
-                   Optional<StringRef> StrTable, bool IsDynamic,
+                   std::optional<StringRef> StrTable, bool IsDynamic,
                    bool NonVisibilityBitsUsed) const override;
   void printDynamicRelocHeader(unsigned Type, StringRef Name,
                                const DynRegionInfo &Reg) override;
@@ -691,7 +691,7 @@ private:
                           DataRegion<Elf_Word> ShndxTable) const;
   void printSymbol(const Elf_Sym &Symbol, unsigned SymIndex,
                    DataRegion<Elf_Word> ShndxTable,
-                   Optional<StringRef> StrTable, bool IsDynamic,
+                   std::optional<StringRef> StrTable, bool IsDynamic,
                    bool /*NonVisibilityBitsUsed*/) const override;
   void printProgramHeaders() override;
   void printSectionMapping() override {}
@@ -702,9 +702,27 @@ private:
   void printMipsPLT(const MipsGOTParser<ELFT> &Parser) override;
   void printMipsABIFlags() override;
 
+protected:
   ScopedPrinter &W;
 };
 
+// JSONELFDumper shares most of the same implementation as LLVMELFDumper except
+// it uses a JSONScopedPrinter.
+template <typename ELFT> class JSONELFDumper : public LLVMELFDumper<ELFT> {
+public:
+  LLVM_ELF_IMPORT_TYPES_ELFT(ELFT)
+
+  JSONELFDumper(const object::ELFObjectFile<ELFT> &ObjF, ScopedPrinter &Writer)
+      : LLVMELFDumper<ELFT>(ObjF, Writer) {}
+
+  void printFileSummary(StringRef FileStr, ObjectFile &Obj,
+                        ArrayRef<std::string> InputFilenames,
+                        const Archive *A) override;
+
+private:
+  std::unique_ptr<DictScope> FileScope;
+};
+
 } // end anonymous namespace
 
 namespace llvm {
@@ -714,6 +732,8 @@ static std::unique_ptr<ObjDumper>
 createELFDumper(const ELFObjectFile<ELFT> &Obj, ScopedPrinter &Writer) {
   if (opts::Output == opts::GNU)
     return std::make_unique<GNUELFDumper<ELFT>>(Obj, Writer);
+  else if (opts::Output == opts::JSON)
+    return std::make_unique<JSONELFDumper<ELFT>>(Obj, Writer);
   return std::make_unique<LLVMELFDumper<ELFT>>(Obj, Writer);
 }
 
@@ -738,14 +758,14 @@ std::unique_ptr<ObjDumper> createELFDumper(const object::ELFObjectFileBase &Obj,
 } // end namespace llvm
 
 template <class ELFT>
-Expected<SmallVector<Optional<VersionEntry>, 0> *>
+Expected<SmallVector<std::optional<VersionEntry>, 0> *>
 ELFDumper<ELFT>::getVersionMap() const {
   // If the VersionMap has already been loaded or if there is no dynamic symtab
   // or version table, there is nothing to do.
   if (!VersionMap.empty() || !DynSymRegion || !SymbolVersionSection)
     return &VersionMap;
 
-  Expected<SmallVector<Optional<VersionEntry>, 0>> MapOrErr =
+  Expected<SmallVector<std::optional<VersionEntry>, 0>> MapOrErr =
       Obj.loadVersionMap(SymbolVersionNeedSection, SymbolVersionDefSection);
   if (MapOrErr)
     VersionMap = *MapOrErr;
@@ -783,7 +803,7 @@ Expected<StringRef> ELFDumper<ELFT>::getSymbolVersion(const Elf_Sym &Sym,
     return "";
   }
 
-  Expected<SmallVector<Optional<VersionEntry>, 0> *> MapOrErr =
+  Expected<SmallVector<std::optional<VersionEntry>, 0> *> MapOrErr =
       getVersionMap();
   if (!MapOrErr)
     return MapOrErr.takeError();
@@ -860,11 +880,9 @@ std::string ELFDumper<ELFT>::getStaticSymbolName(uint32_t Index) const {
 }
 
 template <typename ELFT>
-std::string ELFDumper<ELFT>::getFullSymbolName(const Elf_Sym &Symbol,
-                                               unsigned SymIndex,
-                                               DataRegion<Elf_Word> ShndxTable,
-                                               Optional<StringRef> StrTable,
-                                               bool IsDynamic) const {
+std::string ELFDumper<ELFT>::getFullSymbolName(
+    const Elf_Sym &Symbol, unsigned SymIndex, DataRegion<Elf_Word> ShndxTable,
+    std::optional<StringRef> StrTable, bool IsDynamic) const {
   if (!StrTable)
     return "<?>";
 
@@ -919,7 +937,8 @@ ELFDumper<ELFT>::getSymbolSectionIndex(const Elf_Sym &Symbol, unsigned SymIndex,
   if (Ndx != SHN_UNDEF && Ndx < SHN_LORESERVE)
     return Ndx;
 
-  auto CreateErr = [&](const Twine &Name, Optional<unsigned> Offset = None) {
+  auto CreateErr = [&](const Twine &Name,
+                       std::optional<unsigned> Offset = std::nullopt) {
     std::string Desc;
     if (Offset)
       Desc = (Name + "+0x" + Twine::utohexstr(*Offset)).str();
@@ -963,19 +982,19 @@ findNotEmptySectionByAddress(const ELFO &Obj, StringRef FileName,
   return nullptr;
 }
 
-static const EnumEntry<unsigned> ElfClass[] = {
+const EnumEntry<unsigned> ElfClass[] = {
   {"None",   "none",   ELF::ELFCLASSNONE},
   {"32-bit", "ELF32",  ELF::ELFCLASS32},
   {"64-bit", "ELF64",  ELF::ELFCLASS64},
 };
 
-static const EnumEntry<unsigned> ElfDataEncoding[] = {
+const EnumEntry<unsigned> ElfDataEncoding[] = {
   {"None",         "none",                          ELF::ELFDATANONE},
   {"LittleEndian", "2's complement, little endian", ELF::ELFDATA2LSB},
   {"BigEndian",    "2's complement, big endian",    ELF::ELFDATA2MSB},
 };
 
-static const EnumEntry<unsigned> ElfObjectFileType[] = {
+const EnumEntry<unsigned> ElfObjectFileType[] = {
   {"None",         "NONE (none)",              ELF::ET_NONE},
   {"Relocatable",  "REL (Relocatable file)",   ELF::ET_REL},
   {"Executable",   "EXEC (Executable file)",   ELF::ET_EXEC},
@@ -983,7 +1002,7 @@ static const EnumEntry<unsigned> ElfObjectFileType[] = {
   {"Core",         "CORE (Core file)",         ELF::ET_CORE},
 };
 
-static const EnumEntry<unsigned> ElfOSABI[] = {
+const EnumEntry<unsigned> ElfOSABI[] = {
   {"SystemV",      "UNIX - System V",      ELF::ELFOSABI_NONE},
   {"HPUX",         "UNIX - HP-UX",         ELF::ELFOSABI_HPUX},
   {"NetBSD",       "UNIX - NetBSD",        ELF::ELFOSABI_NETBSD},
@@ -1004,22 +1023,22 @@ static const EnumEntry<unsigned> ElfOSABI[] = {
   {"Standalone",   "Standalone App",       ELF::ELFOSABI_STANDALONE}
 };
 
-static const EnumEntry<unsigned> AMDGPUElfOSABI[] = {
+const EnumEntry<unsigned> AMDGPUElfOSABI[] = {
   {"AMDGPU_HSA",    "AMDGPU - HSA",    ELF::ELFOSABI_AMDGPU_HSA},
   {"AMDGPU_PAL",    "AMDGPU - PAL",    ELF::ELFOSABI_AMDGPU_PAL},
   {"AMDGPU_MESA3D", "AMDGPU - MESA3D", ELF::ELFOSABI_AMDGPU_MESA3D}
 };
 
-static const EnumEntry<unsigned> ARMElfOSABI[] = {
+const EnumEntry<unsigned> ARMElfOSABI[] = {
   {"ARM", "ARM", ELF::ELFOSABI_ARM}
 };
 
-static const EnumEntry<unsigned> C6000ElfOSABI[] = {
+const EnumEntry<unsigned> C6000ElfOSABI[] = {
   {"C6000_ELFABI", "Bare-metal C6000", ELF::ELFOSABI_C6000_ELFABI},
   {"C6000_LINUX",  "Linux C6000",      ELF::ELFOSABI_C6000_LINUX}
 };
 
-static const EnumEntry<unsigned> ElfMachineType[] = {
+const EnumEntry<unsigned> ElfMachineType[] = {
   ENUM_ENT(EM_NONE,          "None"),
   ENUM_ENT(EM_M32,           "WE32100"),
   ENUM_ENT(EM_SPARC,         "Sparc"),
@@ -1183,21 +1202,22 @@ static const EnumEntry<unsigned> ElfMachineType[] = {
   ENUM_ENT(EM_LANAI,         "EM_LANAI"),
   ENUM_ENT(EM_BPF,           "EM_BPF"),
   ENUM_ENT(EM_VE,            "NEC SX-Aurora Vector Engine"),
+  ENUM_ENT(EM_LOONGARCH,     "LoongArch"),
 };
 
-static const EnumEntry<unsigned> ElfSymbolBindings[] = {
+const EnumEntry<unsigned> ElfSymbolBindings[] = {
     {"Local",  "LOCAL",  ELF::STB_LOCAL},
     {"Global", "GLOBAL", ELF::STB_GLOBAL},
     {"Weak",   "WEAK",   ELF::STB_WEAK},
     {"Unique", "UNIQUE", ELF::STB_GNU_UNIQUE}};
 
-static const EnumEntry<unsigned> ElfSymbolVisibilities[] = {
+const EnumEntry<unsigned> ElfSymbolVisibilities[] = {
     {"DEFAULT",   "DEFAULT",   ELF::STV_DEFAULT},
     {"INTERNAL",  "INTERNAL",  ELF::STV_INTERNAL},
     {"HIDDEN",    "HIDDEN",    ELF::STV_HIDDEN},
     {"PROTECTED", "PROTECTED", ELF::STV_PROTECTED}};
 
-static const EnumEntry<unsigned> AMDGPUSymbolTypes[] = {
+const EnumEntry<unsigned> AMDGPUSymbolTypes[] = {
   { "AMDGPU_HSA_KERNEL",            ELF::STT_AMDGPU_HSA_KERNEL }
 };
 
@@ -1208,7 +1228,7 @@ static const char *getGroupType(uint32_t Flag) {
     return "(unknown)";
 }
 
-static const EnumEntry<unsigned> ElfSectionFlags[] = {
+const EnumEntry<unsigned> ElfSectionFlags[] = {
   ENUM_ENT(SHF_WRITE,            "W"),
   ENUM_ENT(SHF_ALLOC,            "A"),
   ENUM_ENT(SHF_EXECINSTR,        "X"),
@@ -1220,24 +1240,31 @@ static const EnumEntry<unsigned> ElfSectionFlags[] = {
   ENUM_ENT(SHF_GROUP,            "G"),
   ENUM_ENT(SHF_TLS,              "T"),
   ENUM_ENT(SHF_COMPRESSED,       "C"),
-  ENUM_ENT(SHF_GNU_RETAIN,       "R"),
   ENUM_ENT(SHF_EXCLUDE,          "E"),
 };
 
-static const EnumEntry<unsigned> ElfXCoreSectionFlags[] = {
+const EnumEntry<unsigned> ElfGNUSectionFlags[] = {
+  ENUM_ENT(SHF_GNU_RETAIN, "R")
+};
+
+const EnumEntry<unsigned> ElfSolarisSectionFlags[] = {
+  ENUM_ENT(SHF_SUNW_NODISCARD, "R")
+};
+
+const EnumEntry<unsigned> ElfXCoreSectionFlags[] = {
   ENUM_ENT(XCORE_SHF_CP_SECTION, ""),
   ENUM_ENT(XCORE_SHF_DP_SECTION, "")
 };
 
-static const EnumEntry<unsigned> ElfARMSectionFlags[] = {
+const EnumEntry<unsigned> ElfARMSectionFlags[] = {
   ENUM_ENT(SHF_ARM_PURECODE, "y")
 };
 
-static const EnumEntry<unsigned> ElfHexagonSectionFlags[] = {
+const EnumEntry<unsigned> ElfHexagonSectionFlags[] = {
   ENUM_ENT(SHF_HEX_GPREL, "")
 };
 
-static const EnumEntry<unsigned> ElfMipsSectionFlags[] = {
+const EnumEntry<unsigned> ElfMipsSectionFlags[] = {
   ENUM_ENT(SHF_MIPS_NODUPES, ""),
   ENUM_ENT(SHF_MIPS_NAMES,   ""),
   ENUM_ENT(SHF_MIPS_LOCAL,   ""),
@@ -1248,14 +1275,24 @@ static const EnumEntry<unsigned> ElfMipsSectionFlags[] = {
   ENUM_ENT(SHF_MIPS_STRING,  "")
 };
 
-static const EnumEntry<unsigned> ElfX86_64SectionFlags[] = {
+const EnumEntry<unsigned> ElfX86_64SectionFlags[] = {
   ENUM_ENT(SHF_X86_64_LARGE, "l")
 };
 
 static std::vector<EnumEntry<unsigned>>
-getSectionFlagsForTarget(unsigned EMachine) {
+getSectionFlagsForTarget(unsigned EOSAbi, unsigned EMachine) {
   std::vector<EnumEntry<unsigned>> Ret(std::begin(ElfSectionFlags),
                                        std::end(ElfSectionFlags));
+  switch (EOSAbi) {
+  case ELFOSABI_SOLARIS:
+    Ret.insert(Ret.end(), std::begin(ElfSolarisSectionFlags),
+               std::end(ElfSolarisSectionFlags));
+    break;
+  default:
+    Ret.insert(Ret.end(), std::begin(ElfGNUSectionFlags),
+               std::end(ElfGNUSectionFlags));
+    break;
+  }
   switch (EMachine) {
   case EM_ARM:
     Ret.insert(Ret.end(), std::begin(ElfARMSectionFlags),
@@ -1283,7 +1320,8 @@ getSectionFlagsForTarget(unsigned EMachine) {
   return Ret;
 }
 
-static std::string getGNUFlags(unsigned EMachine, uint64_t Flags) {
+static std::string getGNUFlags(unsigned EOSAbi, unsigned EMachine,
+                               uint64_t Flags) {
   // Here we are trying to build the flags string in the same way as GNU does.
   // It is not that straightforward. Imagine we have sh_flags == 0x90000000.
   // SHF_EXCLUDE ("E") has a value of 0x80000000 and SHF_MASKPROC is 0xf0000000.
@@ -1294,7 +1332,7 @@ static std::string getGNUFlags(unsigned EMachine, uint64_t Flags) {
   bool HasOSFlag = false;
   bool HasProcFlag = false;
   std::vector<EnumEntry<unsigned>> FlagsList =
-      getSectionFlagsForTarget(EMachine);
+      getSectionFlagsForTarget(EOSAbi, EMachine);
   while (Flags) {
     // Take the least significant bit as a flag.
     uint64_t Flag = Flags & -Flags;
@@ -1350,6 +1388,8 @@ static StringRef segmentTypeToString(unsigned Arch, unsigned Type) {
       LLVM_READOBJ_ENUM_CASE(ELF, PT_MIPS_ABIFLAGS);
     }
     break;
+  case ELF::EM_RISCV:
+    switch (Type) { LLVM_READOBJ_ENUM_CASE(ELF, PT_RISCV_ATTRIBUTES); }
   }
 
   switch (Type) {
@@ -1385,25 +1425,29 @@ static std::string getGNUPtType(unsigned Arch, unsigned Type) {
     return std::string("<unknown>: ") + to_string(format_hex(Type, 1));
 
   // E.g. "PT_ARM_EXIDX" -> "EXIDX".
-  if (Seg.startswith("PT_ARM_"))
-    return Seg.drop_front(7).str();
+  if (Seg.consume_front("PT_ARM_"))
+    return Seg.str();
 
   // E.g. "PT_MIPS_REGINFO" -> "REGINFO".
-  if (Seg.startswith("PT_MIPS_"))
-    return Seg.drop_front(8).str();
+  if (Seg.consume_front("PT_MIPS_"))
+    return Seg.str();
+
+  // E.g. "PT_RISCV_ATTRIBUTES"
+  if (Seg.consume_front("PT_RISCV_"))
+    return Seg.str();
 
   // E.g. "PT_LOAD" -> "LOAD".
   assert(Seg.startswith("PT_"));
   return Seg.drop_front(3).str();
 }
 
-static const EnumEntry<unsigned> ElfSegmentFlags[] = {
+const EnumEntry<unsigned> ElfSegmentFlags[] = {
   LLVM_READOBJ_ENUM_ENT(ELF, PF_X),
   LLVM_READOBJ_ENUM_ENT(ELF, PF_W),
   LLVM_READOBJ_ENUM_ENT(ELF, PF_R)
 };
 
-static const EnumEntry<unsigned> ElfHeaderMipsFlags[] = {
+const EnumEntry<unsigned> ElfHeaderMipsFlags[] = {
   ENUM_ENT(EF_MIPS_NOREORDER, "noreorder"),
   ENUM_ENT(EF_MIPS_PIC, "pic"),
   ENUM_ENT(EF_MIPS_CPIC, "cpic"),
@@ -1449,7 +1493,7 @@ static const EnumEntry<unsigned> ElfHeaderMipsFlags[] = {
   ENUM_ENT(EF_MIPS_ARCH_64R6, "mips64r6")
 };
 
-static const EnumEntry<unsigned> ElfHeaderAMDGPUFlagsABIVersion3[] = {
+const EnumEntry<unsigned> ElfHeaderAMDGPUFlagsABIVersion3[] = {
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_NONE),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_R600_R600),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_R600_R630),
@@ -1489,6 +1533,7 @@ static const EnumEntry<unsigned> ElfHeaderAMDGPUFlagsABIVersion3[] = {
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_AMDGCN_GFX909),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_AMDGCN_GFX90A),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_AMDGCN_GFX90C),
+  LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_AMDGCN_GFX940),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_AMDGCN_GFX1010),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_AMDGCN_GFX1011),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_AMDGCN_GFX1012),
@@ -1499,11 +1544,16 @@ static const EnumEntry<unsigned> ElfHeaderAMDGPUFlagsABIVersion3[] = {
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_AMDGCN_GFX1033),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_AMDGCN_GFX1034),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_AMDGCN_GFX1035),
+  LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_AMDGCN_GFX1036),
+  LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_AMDGCN_GFX1100),
+  LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_AMDGCN_GFX1101),
+  LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_AMDGCN_GFX1102),
+  LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_AMDGCN_GFX1103),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_FEATURE_XNACK_V3),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_FEATURE_SRAMECC_V3)
 };
 
-static const EnumEntry<unsigned> ElfHeaderAMDGPUFlagsABIVersion4[] = {
+const EnumEntry<unsigned> ElfHeaderAMDGPUFlagsABIVersion4[] = {
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_NONE),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_R600_R600),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_R600_R630),
@@ -1543,6 +1593,7 @@ static const EnumEntry<unsigned> ElfHeaderAMDGPUFlagsABIVersion4[] = {
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_AMDGCN_GFX909),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_AMDGCN_GFX90A),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_AMDGCN_GFX90C),
+  LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_AMDGCN_GFX940),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_AMDGCN_GFX1010),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_AMDGCN_GFX1011),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_AMDGCN_GFX1012),
@@ -1553,6 +1604,11 @@ static const EnumEntry<unsigned> ElfHeaderAMDGPUFlagsABIVersion4[] = {
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_AMDGCN_GFX1033),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_AMDGCN_GFX1034),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_AMDGCN_GFX1035),
+  LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_AMDGCN_GFX1036),
+  LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_AMDGCN_GFX1100),
+  LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_AMDGCN_GFX1101),
+  LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_AMDGCN_GFX1102),
+  LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_AMDGCN_GFX1103),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_FEATURE_XNACK_ANY_V4),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_FEATURE_XNACK_OFF_V4),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_FEATURE_XNACK_ON_V4),
@@ -1561,15 +1617,16 @@ static const EnumEntry<unsigned> ElfHeaderAMDGPUFlagsABIVersion4[] = {
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_FEATURE_SRAMECC_ON_V4)
 };
 
-static const EnumEntry<unsigned> ElfHeaderRISCVFlags[] = {
+const EnumEntry<unsigned> ElfHeaderRISCVFlags[] = {
   ENUM_ENT(EF_RISCV_RVC, "RVC"),
   ENUM_ENT(EF_RISCV_FLOAT_ABI_SINGLE, "single-float ABI"),
   ENUM_ENT(EF_RISCV_FLOAT_ABI_DOUBLE, "double-float ABI"),
   ENUM_ENT(EF_RISCV_FLOAT_ABI_QUAD, "quad-float ABI"),
-  ENUM_ENT(EF_RISCV_RVE, "RVE")
+  ENUM_ENT(EF_RISCV_RVE, "RVE"),
+  ENUM_ENT(EF_RISCV_TSO, "TSO"),
 };
 
-static const EnumEntry<unsigned> ElfHeaderAVRFlags[] = {
+const EnumEntry<unsigned> ElfHeaderAVRFlags[] = {
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AVR_ARCH_AVR1),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AVR_ARCH_AVR2),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AVR_ARCH_AVR25),
@@ -1591,30 +1648,46 @@ static const EnumEntry<unsigned> ElfHeaderAVRFlags[] = {
   ENUM_ENT(EF_AVR_LINKRELAX_PREPARED, "relaxable"),
 };
 
+const EnumEntry<unsigned> ElfHeaderLoongArchFlags[] = {
+  ENUM_ENT(EF_LOONGARCH_ABI_SOFT_FLOAT, "SOFT-FLOAT"),
+  ENUM_ENT(EF_LOONGARCH_ABI_SINGLE_FLOAT, "SINGLE-FLOAT"),
+  ENUM_ENT(EF_LOONGARCH_ABI_DOUBLE_FLOAT, "DOUBLE-FLOAT"),
+  ENUM_ENT(EF_LOONGARCH_OBJABI_V0, "OBJ-v0"),
+  ENUM_ENT(EF_LOONGARCH_OBJABI_V1, "OBJ-v1"),
+};
 
-static const EnumEntry<unsigned> ElfSymOtherFlags[] = {
+static const EnumEntry<unsigned> ElfHeaderXtensaFlags[] = {
+  LLVM_READOBJ_ENUM_ENT(ELF, EF_XTENSA_MACH_NONE),
+  LLVM_READOBJ_ENUM_ENT(ELF, EF_XTENSA_XT_INSN),
+  LLVM_READOBJ_ENUM_ENT(ELF, EF_XTENSA_XT_LIT)
+};
+
+const EnumEntry<unsigned> ElfSymOtherFlags[] = {
   LLVM_READOBJ_ENUM_ENT(ELF, STV_INTERNAL),
   LLVM_READOBJ_ENUM_ENT(ELF, STV_HIDDEN),
   LLVM_READOBJ_ENUM_ENT(ELF, STV_PROTECTED)
 };
 
-static const EnumEntry<unsigned> ElfMipsSymOtherFlags[] = {
+const EnumEntry<unsigned> ElfMipsSymOtherFlags[] = {
   LLVM_READOBJ_ENUM_ENT(ELF, STO_MIPS_OPTIONAL),
   LLVM_READOBJ_ENUM_ENT(ELF, STO_MIPS_PLT),
   LLVM_READOBJ_ENUM_ENT(ELF, STO_MIPS_PIC),
   LLVM_READOBJ_ENUM_ENT(ELF, STO_MIPS_MICROMIPS)
 };
 
-static const EnumEntry<unsigned> ElfAArch64SymOtherFlags[] = {
+const EnumEntry<unsigned> ElfAArch64SymOtherFlags[] = {
   LLVM_READOBJ_ENUM_ENT(ELF, STO_AARCH64_VARIANT_PCS)
 };
 
-static const EnumEntry<unsigned> ElfMips16SymOtherFlags[] = {
+const EnumEntry<unsigned> ElfMips16SymOtherFlags[] = {
   LLVM_READOBJ_ENUM_ENT(ELF, STO_MIPS_OPTIONAL),
   LLVM_READOBJ_ENUM_ENT(ELF, STO_MIPS_PLT),
   LLVM_READOBJ_ENUM_ENT(ELF, STO_MIPS_MIPS16)
 };
 
+const EnumEntry<unsigned> ElfRISCVSymOtherFlags[] = {
+    LLVM_READOBJ_ENUM_ENT(ELF, STO_RISCV_VARIANT_CC)};
+
 static const char *getElfMipsOptionsOdkType(unsigned Odk) {
   switch (Odk) {
   LLVM_READOBJ_ENUM_CASE(ELF, ODK_NULL);
@@ -1877,7 +1950,7 @@ template <typename ELFT> void ELFDumper<ELFT>::parseDynamicTable() {
 
   const char *StringTableBegin = nullptr;
   uint64_t StringTableSize = 0;
-  Optional<DynRegionInfo> DynSymFromTable;
+  std::optional<DynRegionInfo> DynSymFromTable;
   for (const Elf_Dyn &Dyn : dynamic_table()) {
     switch (Dyn.d_tag) {
     case ELF::DT_HASH:
@@ -2067,7 +2140,7 @@ template <typename ELFT> void ELFDumper<ELFT>::printVersionInfo() {
 #define LLVM_READOBJ_DT_FLAG_ENT(prefix, enum)                                 \
   { #enum, prefix##_##enum }
 
-static const EnumEntry<unsigned> ElfDynamicDTFlags[] = {
+const EnumEntry<unsigned> ElfDynamicDTFlags[] = {
   LLVM_READOBJ_DT_FLAG_ENT(DF, ORIGIN),
   LLVM_READOBJ_DT_FLAG_ENT(DF, SYMBOLIC),
   LLVM_READOBJ_DT_FLAG_ENT(DF, TEXTREL),
@@ -2075,7 +2148,7 @@ static const EnumEntry<unsigned> ElfDynamicDTFlags[] = {
   LLVM_READOBJ_DT_FLAG_ENT(DF, STATIC_TLS)
 };
 
-static const EnumEntry<unsigned> ElfDynamicDTFlags1[] = {
+const EnumEntry<unsigned> ElfDynamicDTFlags1[] = {
   LLVM_READOBJ_DT_FLAG_ENT(DF_1, NOW),
   LLVM_READOBJ_DT_FLAG_ENT(DF_1, GLOBAL),
   LLVM_READOBJ_DT_FLAG_ENT(DF_1, GROUP),
@@ -2105,7 +2178,7 @@ static const EnumEntry<unsigned> ElfDynamicDTFlags1[] = {
   LLVM_READOBJ_DT_FLAG_ENT(DF_1, PIE),
 };
 
-static const EnumEntry<unsigned> ElfDynamicDTMipsFlags[] = {
+const EnumEntry<unsigned> ElfDynamicDTMipsFlags[] = {
   LLVM_READOBJ_DT_FLAG_ENT(RHF, NONE),
   LLVM_READOBJ_DT_FLAG_ENT(RHF, QUICKSTART),
   LLVM_READOBJ_DT_FLAG_ENT(RHF, NOTPOT),
@@ -2242,9 +2315,10 @@ std::string ELFDumper<ELFT>::getDynamicEntry(uint64_t Type,
     case DT_MIPS_PLTGOT:
     case DT_MIPS_RWPLT:
     case DT_MIPS_RLD_MAP_REL:
+    case DT_MIPS_XHASH:
       return FormatHexValue(Value);
     case DT_MIPS_FLAGS:
-      return FormatFlags(Value, makeArrayRef(ElfDynamicDTMipsFlags));
+      return FormatFlags(Value, ArrayRef(ElfDynamicDTMipsFlags));
     default:
       break;
     }
@@ -2259,7 +2333,7 @@ std::string ELFDumper<ELFT>::getDynamicEntry(uint64_t Type,
       return "REL";
     if (Value == DT_RELA)
       return "RELA";
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case DT_PLTGOT:
   case DT_HASH:
   case DT_STRTAB:
@@ -2294,6 +2368,8 @@ std::string ELFDumper<ELFT>::getDynamicEntry(uint64_t Type,
   case DT_INIT_ARRAYSZ:
   case DT_FINI_ARRAYSZ:
   case DT_PREINIT_ARRAYSZ:
+  case DT_RELRSZ:
+  case DT_RELRENT:
   case DT_ANDROID_RELSZ:
   case DT_ANDROID_RELASZ:
     return std::to_string(Value) + " (bytes)";
@@ -2315,9 +2391,9 @@ std::string ELFDumper<ELFT>::getDynamicEntry(uint64_t Type,
         .str();
   }
   case DT_FLAGS:
-    return FormatFlags(Value, makeArrayRef(ElfDynamicDTFlags));
+    return FormatFlags(Value, ArrayRef(ElfDynamicDTFlags));
   case DT_FLAGS_1:
-    return FormatFlags(Value, makeArrayRef(ElfDynamicDTFlags1));
+    return FormatFlags(Value, ArrayRef(ElfDynamicDTFlags1));
   default:
     return FormatHexValue(Value);
   }
@@ -2479,7 +2555,7 @@ template <typename ELFT> void ELFDumper<ELFT>::printHashTable() {
 
 template <class ELFT>
 static Expected<ArrayRef<typename ELFT::Word>>
-getGnuHashTableChains(Optional<DynRegionInfo> DynSymRegion,
+getGnuHashTableChains(std::optional<DynRegionInfo> DynSymRegion,
                       const typename ELFT::GnuHash *GnuHashTable) {
   if (!DynSymRegion)
     return createError("no dynamic symbol table found");
@@ -2559,8 +2635,27 @@ template <typename ELFT> void ELFDumper<ELFT>::printLoadName() {
 template <class ELFT> void ELFDumper<ELFT>::printArchSpecificInfo() {
   switch (Obj.getHeader().e_machine) {
   case EM_ARM:
+    if (Obj.isLE())
+      printAttributes(ELF::SHT_ARM_ATTRIBUTES,
+                      std::make_unique<ARMAttributeParser>(&W),
+                      support::little);
+    else
+      reportUniqueWarning("attribute printing not implemented for big-endian "
+                          "ARM objects");
+    break;
   case EM_RISCV:
-    printAttributes();
+    if (Obj.isLE())
+      printAttributes(ELF::SHT_RISCV_ATTRIBUTES,
+                      std::make_unique<RISCVAttributeParser>(&W),
+                      support::little);
+    else
+      reportUniqueWarning("attribute printing not implemented for big-endian "
+                          "RISC-V objects");
+    break;
+  case EM_MSP430:
+    printAttributes(ELF::SHT_MSP430_ATTRIBUTES,
+                    std::make_unique<MSP430AttributeParser>(&W),
+                    support::little);
     break;
   case EM_MIPS: {
     printMipsABIFlags();
@@ -2583,20 +2678,15 @@ template <class ELFT> void ELFDumper<ELFT>::printArchSpecificInfo() {
   }
 }
 
-template <class ELFT> void ELFDumper<ELFT>::printAttributes() {
-  if (!Obj.isLE()) {
-    W.startLine() << "Attributes not implemented.\n";
-    return;
-  }
-
-  const unsigned Machine = Obj.getHeader().e_machine;
-  assert((Machine == EM_ARM || Machine == EM_RISCV) &&
-         "Attributes not implemented.");
-
+template <class ELFT>
+void ELFDumper<ELFT>::printAttributes(
+    unsigned AttrShType, std::unique_ptr<ELFAttributeParser> AttrParser,
+    support::endianness Endianness) {
+  assert((AttrShType != ELF::SHT_NULL) && AttrParser &&
+         "Incomplete ELF attribute implementation");
   DictScope BA(W, "BuildAttributes");
   for (const Elf_Shdr &Sec : cantFail(Obj.sections())) {
-    if (Sec.sh_type != ELF::SHT_ARM_ATTRIBUTES &&
-        Sec.sh_type != ELF::SHT_RISCV_ATTRIBUTES)
+    if (Sec.sh_type != AttrShType)
       continue;
 
     ArrayRef<uint8_t> Contents;
@@ -2615,13 +2705,7 @@ template <class ELFT> void ELFDumper<ELFT>::printAttributes() {
 
     W.printHex("FormatVersion", Contents[0]);
 
-    auto ParseAttrubutes = [&]() {
-      if (Machine == EM_ARM)
-        return ARMAttributeParser(&W).parse(Contents, support::little);
-      return RISCVAttributeParser(&W).parse(Contents, support::little);
-    };
-
-    if (Error E = ParseAttrubutes())
+    if (Error E = AttrParser->parse(Contents, Endianness))
       reportUniqueWarning("unable to dump attributes from the " +
                           describe(Sec) + ": " + toString(std::move(E)));
   }
@@ -2716,9 +2800,9 @@ Error MipsGOTParser<ELFT>::findGOT(Elf_Dyn_Range DynTable,
   }
 
   // Lookup dynamic table tags which define the GOT layout.
-  Optional<uint64_t> DtPltGot;
-  Optional<uint64_t> DtLocalGotNum;
-  Optional<uint64_t> DtGotSym;
+  std::optional<uint64_t> DtPltGot;
+  std::optional<uint64_t> DtLocalGotNum;
+  std::optional<uint64_t> DtGotSym;
   for (const auto &Entry : DynTable) {
     switch (Entry.getTag()) {
     case ELF::DT_PLTGOT:
@@ -2769,8 +2853,8 @@ Error MipsGOTParser<ELFT>::findGOT(Elf_Dyn_Range DynTable,
 template <class ELFT>
 Error MipsGOTParser<ELFT>::findPLT(Elf_Dyn_Range DynTable) {
   // Lookup dynamic table tags which define the PLT layout.
-  Optional<uint64_t> DtMipsPltGot;
-  Optional<uint64_t> DtJmpRel;
+  std::optional<uint64_t> DtMipsPltGot;
+  std::optional<uint64_t> DtJmpRel;
   for (const auto &Entry : DynTable) {
     switch (Entry.getTag()) {
     case ELF::DT_MIPS_PLTGOT:
@@ -2936,7 +3020,7 @@ MipsGOTParser<ELFT>::getPltSym(const Entry *E) const {
   }
 }
 
-static const EnumEntry<unsigned> ElfMipsISAExtType[] = {
+const EnumEntry<unsigned> ElfMipsISAExtType[] = {
   {"None",                    Mips::AFL_EXT_NONE},
   {"Broadcom SB-1",           Mips::AFL_EXT_SB1},
   {"Cavium Networks Octeon",  Mips::AFL_EXT_OCTEON},
@@ -2959,7 +3043,7 @@ static const EnumEntry<unsigned> ElfMipsISAExtType[] = {
   {"Toshiba R3900",           Mips::AFL_EXT_3900}
 };
 
-static const EnumEntry<unsigned> ElfMipsASEFlags[] = {
+const EnumEntry<unsigned> ElfMipsASEFlags[] = {
   {"DSP",                Mips::AFL_ASE_DSP},
   {"DSPR2",              Mips::AFL_ASE_DSPR2},
   {"Enhanced VA Scheme", Mips::AFL_ASE_EVA},
@@ -2977,7 +3061,7 @@ static const EnumEntry<unsigned> ElfMipsASEFlags[] = {
   {"GINV",               Mips::AFL_ASE_GINV},
 };
 
-static const EnumEntry<unsigned> ElfMipsFpABIType[] = {
+const EnumEntry<unsigned> ElfMipsFpABIType[] = {
   {"Hard or soft float",                  Mips::Val_GNU_MIPS_ABI_FP_ANY},
   {"Hard float (double precision)",       Mips::Val_GNU_MIPS_ABI_FP_DOUBLE},
   {"Hard float (single precision)",       Mips::Val_GNU_MIPS_ABI_FP_SINGLE},
@@ -3214,11 +3298,21 @@ static const EnumEntry<unsigned> *getObjectFileEnumEntry(unsigned Type) {
   auto It = llvm::find_if(ElfObjectFileType, [&](const EnumEntry<unsigned> &E) {
     return E.Value == Type;
   });
-  if (It != makeArrayRef(ElfObjectFileType).end())
+  if (It != ArrayRef(ElfObjectFileType).end())
     return It;
   return nullptr;
 }
 
+template <class ELFT>
+void GNUELFDumper<ELFT>::printFileSummary(StringRef FileStr, ObjectFile &Obj,
+                                          ArrayRef<std::string> InputFilenames,
+                                          const Archive *A) {
+  if (InputFilenames.size() > 1 || A) {
+    this->W.startLine() << "\n";
+    this->W.printString("File", FileStr);
+  }
+}
+
 template <class ELFT> void GNUELFDumper<ELFT>::printFileHeaders() {
   const Elf_Ehdr &e = this->Obj.getHeader();
   OS << "ELF Header:\n";
@@ -3227,18 +3321,18 @@ template <class ELFT> void GNUELFDumper<ELFT>::printFileHeaders() {
   for (int i = 0; i < ELF::EI_NIDENT; i++)
     OS << format(" %02x", static_cast<int>(e.e_ident[i]));
   OS << "\n";
-  Str = printEnum(e.e_ident[ELF::EI_CLASS], makeArrayRef(ElfClass));
+  Str = enumToString(e.e_ident[ELF::EI_CLASS], ArrayRef(ElfClass));
   printFields(OS, "Class:", Str);
-  Str = printEnum(e.e_ident[ELF::EI_DATA], makeArrayRef(ElfDataEncoding));
+  Str = enumToString(e.e_ident[ELF::EI_DATA], ArrayRef(ElfDataEncoding));
   printFields(OS, "Data:", Str);
   OS.PadToColumn(2u);
   OS << "Version:";
   OS.PadToColumn(37u);
-  OS << to_hexString(e.e_ident[ELF::EI_VERSION]);
+  OS << utohexstr(e.e_ident[ELF::EI_VERSION]);
   if (e.e_version == ELF::EV_CURRENT)
     OS << " (current)";
   OS << "\n";
-  Str = printEnum(e.e_ident[ELF::EI_OSABI], makeArrayRef(ElfOSABI));
+  Str = enumToString(e.e_ident[ELF::EI_OSABI], ArrayRef(ElfOSABI));
   printFields(OS, "OS/ABI:", Str);
   printFields(OS,
               "ABI Version:", std::to_string(e.e_ident[ELF::EI_ABIVERSION]));
@@ -3247,19 +3341,19 @@ template <class ELFT> void GNUELFDumper<ELFT>::printFileHeaders() {
     Str = E->AltName.str();
   } else {
     if (e.e_type >= ET_LOPROC)
-      Str = "Processor Specific: (" + to_hexString(e.e_type, false) + ")";
+      Str = "Processor Specific: (" + utohexstr(e.e_type, /*LowerCase=*/true) + ")";
     else if (e.e_type >= ET_LOOS)
-      Str = "OS Specific: (" + to_hexString(e.e_type, false) + ")";
+      Str = "OS Specific: (" + utohexstr(e.e_type, /*LowerCase=*/true) + ")";
     else
-      Str = "<unknown>: " + to_hexString(e.e_type, false);
+      Str = "<unknown>: " + utohexstr(e.e_type, /*LowerCase=*/true);
   }
   printFields(OS, "Type:", Str);
 
-  Str = printEnum(e.e_machine, makeArrayRef(ElfMachineType));
+  Str = enumToString(e.e_machine, ArrayRef(ElfMachineType));
   printFields(OS, "Machine:", Str);
-  Str = "0x" + to_hexString(e.e_version);
+  Str = "0x" + utohexstr(e.e_version);
   printFields(OS, "Version:", Str);
-  Str = "0x" + to_hexString(e.e_entry);
+  Str = "0x" + utohexstr(e.e_entry);
   printFields(OS, "Entry point address:", Str);
   Str = to_string(e.e_phoff) + " (bytes into file)";
   printFields(OS, "Start of program headers:", Str);
@@ -3267,16 +3361,22 @@ template <class ELFT> void GNUELFDumper<ELFT>::printFileHeaders() {
   printFields(OS, "Start of section headers:", Str);
   std::string ElfFlags;
   if (e.e_machine == EM_MIPS)
-    ElfFlags =
-        printFlags(e.e_flags, makeArrayRef(ElfHeaderMipsFlags),
-                   unsigned(ELF::EF_MIPS_ARCH), unsigned(ELF::EF_MIPS_ABI),
-                   unsigned(ELF::EF_MIPS_MACH));
+    ElfFlags = printFlags(
+        e.e_flags, ArrayRef(ElfHeaderMipsFlags), unsigned(ELF::EF_MIPS_ARCH),
+        unsigned(ELF::EF_MIPS_ABI), unsigned(ELF::EF_MIPS_MACH));
   else if (e.e_machine == EM_RISCV)
-    ElfFlags = printFlags(e.e_flags, makeArrayRef(ElfHeaderRISCVFlags));
+    ElfFlags = printFlags(e.e_flags, ArrayRef(ElfHeaderRISCVFlags));
   else if (e.e_machine == EM_AVR)
-    ElfFlags = printFlags(e.e_flags, makeArrayRef(ElfHeaderAVRFlags),
+    ElfFlags = printFlags(e.e_flags, ArrayRef(ElfHeaderAVRFlags),
                           unsigned(ELF::EF_AVR_ARCH_MASK));
-  Str = "0x" + to_hexString(e.e_flags);
+  else if (e.e_machine == EM_LOONGARCH)
+    ElfFlags = printFlags(e.e_flags, ArrayRef(ElfHeaderLoongArchFlags),
+                          unsigned(ELF::EF_LOONGARCH_ABI_MODIFIER_MASK),
+                          unsigned(ELF::EF_LOONGARCH_OBJABI_MASK));
+  else if (e.e_machine == EM_XTENSA)
+    ElfFlags = printFlags(e.e_flags, ArrayRef(ElfHeaderXtensaFlags),
+                          unsigned(ELF::EF_XTENSA_MACH));
+  Str = "0x" + utohexstr(e.e_flags);
   if (!ElfFlags.empty())
     Str = Str + ", " + ElfFlags;
   printFields(OS, "Flags:", Str);
@@ -3444,7 +3544,7 @@ void GNUELFDumper<ELFT>::printRelRelaReloc(const Relocation<ELFT> &R,
     printField(F);
 
   std::string Addend;
-  if (Optional<int64_t> A = R.Addend) {
+  if (std::optional<int64_t> A = R.Addend) {
     int64_t RelAddend = *A;
     if (!RelSym.Name.empty()) {
       if (RelAddend < 0) {
@@ -3454,7 +3554,7 @@ void GNUELFDumper<ELFT>::printRelRelaReloc(const Relocation<ELFT> &R,
         Addend = " + ";
       }
     }
-    Addend += to_hexString(RelAddend, false);
+    Addend += utohexstr(RelAddend, /*LowerCase=*/true);
   }
   OS << Addend << "\n";
 }
@@ -3486,7 +3586,7 @@ void GNUELFDumper<ELFT>::printDynamicRelocHeader(unsigned Type, StringRef Name,
                                                  const DynRegionInfo &Reg) {
   uint64_t Offset = Reg.Addr - this->Obj.base();
   OS << "\n'" << Name.str().c_str() << "' relocation section at offset 0x"
-     << to_hexString(Offset, false) << " contains " << Reg.Size << " bytes:\n";
+     << utohexstr(Offset, /*LowerCase=*/true) << " contains " << Reg.Size << " bytes:\n";
   printRelocHeaderFields<ELFT>(OS, Type);
 }
 
@@ -3539,7 +3639,7 @@ template <class ELFT> void GNUELFDumper<ELFT>::printRelocations() {
     uintX_t Offset = Sec.sh_offset;
     StringRef Name = this->getPrintableSectionName(Sec);
     OS << "\nRelocation section '" << Name << "' at offset 0x"
-       << to_hexString(Offset, false) << " contains " << EntriesNum
+       << utohexstr(Offset, /*LowerCase=*/true) << " contains " << EntriesNum
        << " entries:\n";
     printRelocHeaderFields<ELFT>(OS, Sec.sh_type);
     this->printRelocationsHelper(Sec);
@@ -3554,30 +3654,30 @@ template <class ELFT> void GNUELFDumper<ELFT>::printRelocations() {
 // returned as '<unknown>' followed by the type value.
 static std::string getSectionTypeOffsetString(unsigned Type) {
   if (Type >= SHT_LOOS && Type <= SHT_HIOS)
-    return "LOOS+0x" + to_hexString(Type - SHT_LOOS);
+    return "LOOS+0x" + utohexstr(Type - SHT_LOOS);
   else if (Type >= SHT_LOPROC && Type <= SHT_HIPROC)
-    return "LOPROC+0x" + to_hexString(Type - SHT_LOPROC);
+    return "LOPROC+0x" + utohexstr(Type - SHT_LOPROC);
   else if (Type >= SHT_LOUSER && Type <= SHT_HIUSER)
-    return "LOUSER+0x" + to_hexString(Type - SHT_LOUSER);
-  return "0x" + to_hexString(Type) + ": <unknown>";
+    return "LOUSER+0x" + utohexstr(Type - SHT_LOUSER);
+  return "0x" + utohexstr(Type) + ": <unknown>";
 }
 
 static std::string getSectionTypeString(unsigned Machine, unsigned Type) {
   StringRef Name = getELFSectionTypeName(Machine, Type);
 
   // Handle SHT_GNU_* type names.
-  if (Name.startswith("SHT_GNU_")) {
-    if (Name == "SHT_GNU_HASH")
+  if (Name.consume_front("SHT_GNU_")) {
+    if (Name == "HASH")
       return "GNU_HASH";
     // E.g. SHT_GNU_verneed -> VERNEED.
-    return Name.drop_front(8).upper();
+    return Name.upper();
   }
 
   if (Name == "SHT_SYMTAB_SHNDX")
     return "SYMTAB SECTION INDICES";
 
-  if (Name.startswith("SHT_"))
-    return Name.drop_front(4).str();
+  if (Name.consume_front("SHT_"))
+    return Name.str();
   return getSectionTypeOffsetString(Type);
 }
 
@@ -3600,11 +3700,19 @@ static void printSectionDescription(formatted_raw_ostream &OS,
 }
 
 template <class ELFT> void GNUELFDumper<ELFT>::printSectionHeaders() {
-  unsigned Bias = ELFT::Is64Bits ? 0 : 8;
   ArrayRef<Elf_Shdr> Sections = cantFail(this->Obj.sections());
+  if (Sections.empty()) {
+    OS << "\nThere are no sections in this file.\n";
+    Expected<StringRef> SecStrTableOrErr =
+        this->Obj.getSectionStringTable(Sections, this->WarningHandler);
+    if (!SecStrTableOrErr)
+      this->reportUniqueWarning(SecStrTableOrErr.takeError());
+    return;
+  }
+  unsigned Bias = ELFT::Is64Bits ? 0 : 8;
   OS << "There are " << to_string(Sections.size())
      << " section headers, starting at offset "
-     << "0x" << to_hexString(this->Obj.getHeader().e_shoff, false) << ":\n\n";
+     << "0x" << utohexstr(this->Obj.getHeader().e_shoff, /*LowerCase=*/true) << ":\n\n";
   OS << "Section Headers:\n";
   Field Fields[11] = {
       {"[Nr]", 2},        {"Name", 7},        {"Type", 25},
@@ -3637,7 +3745,8 @@ template <class ELFT> void GNUELFDumper<ELFT>::printSectionHeaders() {
     Fields[4].Str = to_string(format_hex_no_prefix(Sec.sh_offset, 6));
     Fields[5].Str = to_string(format_hex_no_prefix(Sec.sh_size, 6));
     Fields[6].Str = to_string(format_hex_no_prefix(Sec.sh_entsize, 2));
-    Fields[7].Str = getGNUFlags(this->Obj.getHeader().e_machine, Sec.sh_flags);
+    Fields[7].Str = getGNUFlags(this->Obj.getHeader().e_ident[ELF::EI_OSABI],
+                                this->Obj.getHeader().e_machine, Sec.sh_flags);
     Fields[8].Str = to_string(Sec.sh_link);
     Fields[9].Str = to_string(Sec.sh_info);
     Fields[10].Str = to_string(Sec.sh_addralign);
@@ -3731,7 +3840,7 @@ GNUELFDumper<ELFT>::getSymbolSectionNdx(const Elf_Sym &Symbol,
 template <class ELFT>
 void GNUELFDumper<ELFT>::printSymbol(const Elf_Sym &Symbol, unsigned SymIndex,
                                      DataRegion<Elf_Word> ShndxTable,
-                                     Optional<StringRef> StrTable,
+                                     std::optional<StringRef> StrTable,
                                      bool IsDynamic,
                                      bool NonVisibilityBitsUsed) const {
   unsigned Bias = ELFT::Is64Bits ? 8 : 0;
@@ -3745,14 +3854,14 @@ void GNUELFDumper<ELFT>::printSymbol(const Elf_Sym &Symbol, unsigned SymIndex,
   unsigned char SymbolType = Symbol.getType();
   if (this->Obj.getHeader().e_machine == ELF::EM_AMDGPU &&
       SymbolType >= ELF::STT_LOOS && SymbolType < ELF::STT_HIOS)
-    Fields[3].Str = printEnum(SymbolType, makeArrayRef(AMDGPUSymbolTypes));
+    Fields[3].Str = enumToString(SymbolType, ArrayRef(AMDGPUSymbolTypes));
   else
-    Fields[3].Str = printEnum(SymbolType, makeArrayRef(ElfSymbolTypes));
+    Fields[3].Str = enumToString(SymbolType, ArrayRef(ElfSymbolTypes));
 
   Fields[4].Str =
-      printEnum(Symbol.getBinding(), makeArrayRef(ElfSymbolBindings));
+      enumToString(Symbol.getBinding(), ArrayRef(ElfSymbolBindings));
   Fields[5].Str =
-      printEnum(Symbol.getVisibility(), makeArrayRef(ElfSymbolVisibilities));
+      enumToString(Symbol.getVisibility(), ArrayRef(ElfSymbolVisibilities));
 
   if (Symbol.st_other & ~0x3) {
     if (this->Obj.getHeader().e_machine == ELF::EM_AARCH64) {
@@ -3761,7 +3870,16 @@ void GNUELFDumper<ELFT>::printSymbol(const Elf_Sym &Symbol, unsigned SymIndex,
         Other &= ~STO_AARCH64_VARIANT_PCS;
         Fields[5].Str += " [VARIANT_PCS";
         if (Other != 0)
-          Fields[5].Str.append(" | " + to_hexString(Other, false));
+          Fields[5].Str.append(" | " + utohexstr(Other, /*LowerCase=*/true));
+        Fields[5].Str.append("]");
+      }
+    } else if (this->Obj.getHeader().e_machine == ELF::EM_RISCV) {
+      uint8_t Other = Symbol.st_other & ~0x3;
+      if (Other & STO_RISCV_VARIANT_CC) {
+        Other &= ~STO_RISCV_VARIANT_CC;
+        Fields[5].Str += " [VARIANT_CC";
+        if (Other != 0)
+          Fields[5].Str.append(" | " + utohexstr(Other, /*LowerCase=*/true));
         Fields[5].Str.append("]");
       }
     } else {
@@ -3799,14 +3917,14 @@ void GNUELFDumper<ELFT>::printHashedSymbol(const Elf_Sym *Symbol,
   unsigned char SymbolType = Symbol->getType();
   if (this->Obj.getHeader().e_machine == ELF::EM_AMDGPU &&
       SymbolType >= ELF::STT_LOOS && SymbolType < ELF::STT_HIOS)
-    Fields[4].Str = printEnum(SymbolType, makeArrayRef(AMDGPUSymbolTypes));
+    Fields[4].Str = enumToString(SymbolType, ArrayRef(AMDGPUSymbolTypes));
   else
-    Fields[4].Str = printEnum(SymbolType, makeArrayRef(ElfSymbolTypes));
+    Fields[4].Str = enumToString(SymbolType, ArrayRef(ElfSymbolTypes));
 
   Fields[5].Str =
-      printEnum(Symbol->getBinding(), makeArrayRef(ElfSymbolBindings));
+      enumToString(Symbol->getBinding(), ArrayRef(ElfSymbolBindings));
   Fields[6].Str =
-      printEnum(Symbol->getVisibility(), makeArrayRef(ElfSymbolVisibilities));
+      enumToString(Symbol->getVisibility(), ArrayRef(ElfSymbolVisibilities));
   Fields[7].Str = getSymbolSectionNdx(*Symbol, SymIndex, ShndxTable);
   Fields[8].Str =
       this->getFullSymbolName(*Symbol, SymIndex, ShndxTable, StrTable, true);
@@ -3855,7 +3973,7 @@ void GNUELFDumper<ELFT>::printHashTableSymbols(const Elf_Hash &SysVHash) {
   for (uint32_t Buc = 0; Buc < SysVHash.nbucket; Buc++) {
     if (Buckets[Buc] == ELF::STN_UNDEF)
       continue;
-    std::vector<bool> Visited(SysVHash.nchain);
+    BitVector Visited(SysVHash.nchain);
     for (uint32_t Ch = Buckets[Buc]; Ch < SysVHash.nchain; Ch = Chains[Ch]) {
       if (Ch == ELF::STN_UNDEF)
         break;
@@ -3971,9 +4089,17 @@ template <class ELFT> void GNUELFDumper<ELFT>::printHashSymbols() {
 
 template <class ELFT> void GNUELFDumper<ELFT>::printSectionDetails() {
   ArrayRef<Elf_Shdr> Sections = cantFail(this->Obj.sections());
+  if (Sections.empty()) {
+    OS << "\nThere are no sections in this file.\n";
+    Expected<StringRef> SecStrTableOrErr =
+        this->Obj.getSectionStringTable(Sections, this->WarningHandler);
+    if (!SecStrTableOrErr)
+      this->reportUniqueWarning(SecStrTableOrErr.takeError());
+    return;
+  }
   OS << "There are " << to_string(Sections.size())
      << " section headers, starting at offset "
-     << "0x" << to_hexString(this->Obj.getHeader().e_shoff, false) << ":\n\n";
+     << "0x" << utohexstr(this->Obj.getHeader().e_shoff, /*LowerCase=*/true) << ":\n\n";
 
   OS << "Section Headers:\n";
 
@@ -4068,6 +4194,30 @@ template <class ELFT> void GNUELFDumper<ELFT>::printSectionDetails() {
 
     OS << "\n";
     ++SectionIndex;
+
+    if (!(S.sh_flags & SHF_COMPRESSED))
+      continue;
+    Expected<ArrayRef<uint8_t>> Data = this->Obj.getSectionContents(S);
+    if (!Data || Data->size() < sizeof(Elf_Chdr)) {
+      consumeError(Data.takeError());
+      reportWarning(createError("SHF_COMPRESSED section '" + Name +
+                                "' does not have an Elf_Chdr header"),
+                    this->FileName);
+      OS.indent(7);
+      OS << "[<corrupt>]";
+    } else {
+      OS.indent(7);
+      auto *Chdr = reinterpret_cast<const Elf_Chdr *>(Data->data());
+      if (Chdr->ch_type == ELFCOMPRESS_ZLIB)
+        OS << "ZLIB";
+      else if (Chdr->ch_type == ELFCOMPRESS_ZSTD)
+        OS << "ZSTD";
+      else
+        OS << format("[<unknown>: 0x%x]", unsigned(Chdr->ch_type));
+      OS << ", " << format_hex_no_prefix(Chdr->ch_size, ELFT::Is64Bits ? 16 : 8)
+         << ", " << Chdr->ch_addralign;
+    }
+    OS << '\n';
   }
 }
 
@@ -4154,12 +4304,21 @@ static bool checkPTDynamic(const typename ELFT::Phdr &Phdr,
 template <class ELFT>
 void GNUELFDumper<ELFT>::printProgramHeaders(
     bool PrintProgramHeaders, cl::boolOrDefault PrintSectionMapping) {
-  if (PrintProgramHeaders)
-    printProgramHeaders();
+  const bool ShouldPrintSectionMapping = (PrintSectionMapping != cl::BOU_FALSE);
+  // Exit early if no program header or section mapping details were requested.
+  if (!PrintProgramHeaders && !ShouldPrintSectionMapping)
+    return;
+
+  if (PrintProgramHeaders) {
+    const Elf_Ehdr &Header = this->Obj.getHeader();
+    if (Header.e_phnum == 0) {
+      OS << "\nThere are no program headers in this file.\n";
+    } else {
+      printProgramHeaders();
+    }
+  }
 
-  // Display the section mapping along with the program headers, unless
-  // -section-mapping is explicitly set to false.
-  if (PrintSectionMapping != cl::BOU_FALSE)
+  if (ShouldPrintSectionMapping)
     printSectionMapping();
 }
 
@@ -4169,7 +4328,7 @@ template <class ELFT> void GNUELFDumper<ELFT>::printProgramHeaders() {
   Field Fields[8] = {2,         17,        26,        37 + Bias,
                      48 + Bias, 56 + Bias, 64 + Bias, 68 + Bias};
   OS << "\nElf file type is "
-     << printEnum(Header.e_type, makeArrayRef(ElfObjectFileType)) << "\n"
+     << enumToString(Header.e_type, ArrayRef(ElfObjectFileType)) << "\n"
      << "Entry point " << format_hex(Header.e_entry, 3) << "\n"
      << "There are " << Header.e_phnum << " program headers,"
      << " starting at offset " << Header.e_phoff << "\n\n"
@@ -4360,7 +4519,7 @@ template <class ELFT> void GNUELFDumper<ELFT>::printDynamicTable() {
   for (auto Entry : Table) {
     uintX_t Tag = Entry.getTag();
     std::string Type =
-        std::string("(") + this->Obj.getDynamicTagAsString(Tag).c_str() + ")";
+        std::string("(") + this->Obj.getDynamicTagAsString(Tag) + ")";
     std::string Value = this->getDynamicEntry(Tag, Entry.getVal());
     OS << "  " << format_hex(Tag, ELFT::Is64Bits ? 18 : 10)
        << format(ValueFmt.c_str(), Type.c_str()) << Value << "\n";
@@ -4462,8 +4621,8 @@ void GNUELFDumper<ELFT>::printVersionSymbolSection(const Elf_Shdr *Sec) {
     return;
   }
 
-  SmallVector<Optional<VersionEntry>, 0> *VersionMap = nullptr;
-  if (Expected<SmallVector<Optional<VersionEntry>, 0> *> MapOrErr =
+  SmallVector<std::optional<VersionEntry>, 0> *VersionMap = nullptr;
+  if (Expected<SmallVector<std::optional<VersionEntry>, 0> *> MapOrErr =
           this->getVersionMap())
     VersionMap = *MapOrErr;
   else
@@ -4485,7 +4644,7 @@ void GNUELFDumper<ELFT>::printVersionSymbolSection(const Elf_Shdr *Sec) {
 
     bool IsDefault;
     Expected<StringRef> NameOrErr = this->Obj.getSymbolVersionByIndex(
-        Ndx, IsDefault, *VersionMap, /*IsSymHidden=*/None);
+        Ndx, IsDefault, *VersionMap, /*IsSymHidden=*/std::nullopt);
     if (!NameOrErr) {
       this->reportUniqueWarning("unable to get a version for entry " +
                                 Twine(I) + " of " + this->describe(*Sec) +
@@ -4603,7 +4762,7 @@ void GNUELFDumper<ELFT>::printHashHistogram(const Elf_Hash &HashTable) {
   // Go over all buckets and and note chain lengths of each bucket (total
   // unique chain lengths).
   for (size_t B = 0; B < NBucket; B++) {
-    std::vector<bool> Visited(NChain);
+    BitVector Visited(NChain);
     for (size_t C = Buckets[B]; C < NChain; C = Chains[C]) {
       if (C == ELF::STN_UNDEF)
         break;
@@ -4936,7 +5095,7 @@ template <typename ELFT> static GNUAbiTag getGNUAbiTag(ArrayRef<uint8_t> Desc) {
       "Linux", "Hurd", "Solaris", "FreeBSD", "NetBSD", "Syllable", "NaCl",
   };
   StringRef OSName = "Unknown";
-  if (Words[0] < array_lengthof(OSNames))
+  if (Words[0] < std::size(OSNames))
     OSName = OSNames[Words[0]];
   uint32_t Major = Words[1], Minor = Words[2], Patch = Words[3];
   std::string str;
@@ -4953,7 +5112,7 @@ static std::string getGNUBuildId(ArrayRef<uint8_t> Desc) {
   return OS.str();
 }
 
-static StringRef getGNUGoldVersion(ArrayRef<uint8_t> Desc) {
+static StringRef getDescAsStringRef(ArrayRef<uint8_t> Desc) {
   return StringRef(reinterpret_cast<const char *>(Desc.data()), Desc.size());
 }
 
@@ -4977,7 +5136,7 @@ static bool printGNUNote(raw_ostream &OS, uint32_t NoteType,
     break;
   }
   case ELF::NT_GNU_GOLD_VERSION:
-    OS << "    Version: " << getGNUGoldVersion(Desc);
+    OS << "    Version: " << getDescAsStringRef(Desc);
     break;
   case ELF::NT_GNU_PROPERTY_TYPE_0:
     OS << "    Properties:";
@@ -4989,7 +5148,78 @@ static bool printGNUNote(raw_ostream &OS, uint32_t NoteType,
   return true;
 }
 
-static const EnumEntry<unsigned> FreeBSDFeatureCtlFlags[] = {
+using AndroidNoteProperties = std::vector<std::pair<StringRef, std::string>>;
+static AndroidNoteProperties getAndroidNoteProperties(uint32_t NoteType,
+                                                      ArrayRef<uint8_t> Desc) {
+  AndroidNoteProperties Props;
+  switch (NoteType) {
+  case ELF::NT_ANDROID_TYPE_MEMTAG:
+    if (Desc.empty()) {
+      Props.emplace_back("Invalid .note.android.memtag", "");
+      return Props;
+    }
+
+    switch (Desc[0] & NT_MEMTAG_LEVEL_MASK) {
+    case NT_MEMTAG_LEVEL_NONE:
+      Props.emplace_back("Tagging Mode", "NONE");
+      break;
+    case NT_MEMTAG_LEVEL_ASYNC:
+      Props.emplace_back("Tagging Mode", "ASYNC");
+      break;
+    case NT_MEMTAG_LEVEL_SYNC:
+      Props.emplace_back("Tagging Mode", "SYNC");
+      break;
+    default:
+      Props.emplace_back(
+          "Tagging Mode",
+          ("Unknown (" + Twine::utohexstr(Desc[0] & NT_MEMTAG_LEVEL_MASK) + ")")
+              .str());
+      break;
+    }
+    Props.emplace_back("Heap",
+                       (Desc[0] & NT_MEMTAG_HEAP) ? "Enabled" : "Disabled");
+    Props.emplace_back("Stack",
+                       (Desc[0] & NT_MEMTAG_STACK) ? "Enabled" : "Disabled");
+    break;
+  default:
+    return Props;
+  }
+  return Props;
+}
+
+static bool printAndroidNote(raw_ostream &OS, uint32_t NoteType,
+                             ArrayRef<uint8_t> Desc) {
+  // Return true if we were able to pretty-print the note, false otherwise.
+  AndroidNoteProperties Props = getAndroidNoteProperties(NoteType, Desc);
+  if (Props.empty())
+    return false;
+  for (const auto &KV : Props)
+    OS << "    " << KV.first << ": " << KV.second << '\n';
+  OS << '\n';
+  return true;
+}
+
+template <typename ELFT>
+static bool printLLVMOMPOFFLOADNote(raw_ostream &OS, uint32_t NoteType,
+                                    ArrayRef<uint8_t> Desc) {
+  switch (NoteType) {
+  default:
+    return false;
+  case ELF::NT_LLVM_OPENMP_OFFLOAD_VERSION:
+    OS << "    Version: " << getDescAsStringRef(Desc);
+    break;
+  case ELF::NT_LLVM_OPENMP_OFFLOAD_PRODUCER:
+    OS << "    Producer: " << getDescAsStringRef(Desc);
+    break;
+  case ELF::NT_LLVM_OPENMP_OFFLOAD_PRODUCER_VERSION:
+    OS << "    Producer version: " << getDescAsStringRef(Desc);
+    break;
+  }
+  OS << '\n';
+  return true;
+}
+
+const EnumEntry<unsigned> FreeBSDFeatureCtlFlags[] = {
     {"ASLR_DISABLE", NT_FREEBSD_FCTL_ASLR_DISABLE},
     {"PROTMAX_DISABLE", NT_FREEBSD_FCTL_PROTMAX_DISABLE},
     {"STKGAP_DISABLE", NT_FREEBSD_FCTL_STKGAP_DISABLE},
@@ -5004,14 +5234,14 @@ struct FreeBSDNote {
 };
 
 template <typename ELFT>
-static Optional<FreeBSDNote>
+static std::optional<FreeBSDNote>
 getFreeBSDNote(uint32_t NoteType, ArrayRef<uint8_t> Desc, bool IsCore) {
   if (IsCore)
-    return None; // No pretty-printing yet.
+    return std::nullopt; // No pretty-printing yet.
   switch (NoteType) {
   case ELF::NT_FREEBSD_ABI_TAG:
     if (Desc.size() != 4)
-      return None;
+      return std::nullopt;
     return FreeBSDNote{
         "ABI tag",
         utostr(support::endian::read32<ELFT::TargetEndianness>(Desc.data()))};
@@ -5019,12 +5249,12 @@ getFreeBSDNote(uint32_t NoteType, ArrayRef<uint8_t> Desc, bool IsCore) {
     return FreeBSDNote{"Arch tag", toStringRef(Desc).str()};
   case ELF::NT_FREEBSD_FEATURE_CTL: {
     if (Desc.size() != 4)
-      return None;
+      return std::nullopt;
     unsigned Value =
         support::endian::read32<ELFT::TargetEndianness>(Desc.data());
     std::string FlagsStr;
     raw_string_ostream OS(FlagsStr);
-    printFlags(Value, makeArrayRef(FreeBSDFeatureCtlFlags), OS);
+    printFlags(Value, ArrayRef(FreeBSDFeatureCtlFlags), OS);
     if (OS.str().empty())
       OS << "0x" << utohexstr(Value);
     else
@@ -5032,7 +5262,7 @@ getFreeBSDNote(uint32_t NoteType, ArrayRef<uint8_t> Desc, bool IsCore) {
     return FreeBSDNote{"Feature flags", OS.str()};
   }
   default:
-    return None;
+    return std::nullopt;
   }
 }
 
@@ -5253,14 +5483,14 @@ static void printCoreNote(raw_ostream &OS, const CoreNote &Note) {
   }
 }
 
-static const NoteType GenericNoteTypes[] = {
+const NoteType GenericNoteTypes[] = {
     {ELF::NT_VERSION, "NT_VERSION (version)"},
     {ELF::NT_ARCH, "NT_ARCH (architecture)"},
     {ELF::NT_GNU_BUILD_ATTRIBUTE_OPEN, "OPEN"},
     {ELF::NT_GNU_BUILD_ATTRIBUTE_FUNC, "func"},
 };
 
-static const NoteType GNUNoteTypes[] = {
+const NoteType GNUNoteTypes[] = {
     {ELF::NT_GNU_ABI_TAG, "NT_GNU_ABI_TAG (ABI version tag)"},
     {ELF::NT_GNU_HWCAP, "NT_GNU_HWCAP (DSO-supplied software HWCAP info)"},
     {ELF::NT_GNU_BUILD_ID, "NT_GNU_BUILD_ID (unique build ID bitstring)"},
@@ -5268,7 +5498,7 @@ static const NoteType GNUNoteTypes[] = {
     {ELF::NT_GNU_PROPERTY_TYPE_0, "NT_GNU_PROPERTY_TYPE_0 (property note)"},
 };
 
-static const NoteType FreeBSDCoreNoteTypes[] = {
+const NoteType FreeBSDCoreNoteTypes[] = {
     {ELF::NT_FREEBSD_THRMISC, "NT_THRMISC (thrmisc structure)"},
     {ELF::NT_FREEBSD_PROCSTAT_PROC, "NT_PROCSTAT_PROC (proc data)"},
     {ELF::NT_FREEBSD_PROCSTAT_FILES, "NT_PROCSTAT_FILES (files data)"},
@@ -5282,7 +5512,7 @@ static const NoteType FreeBSDCoreNoteTypes[] = {
     {ELF::NT_FREEBSD_PROCSTAT_AUXV, "NT_PROCSTAT_AUXV (auxv data)"},
 };
 
-static const NoteType FreeBSDNoteTypes[] = {
+const NoteType FreeBSDNoteTypes[] = {
     {ELF::NT_FREEBSD_ABI_TAG, "NT_FREEBSD_ABI_TAG (ABI version tag)"},
     {ELF::NT_FREEBSD_NOINIT_TAG, "NT_FREEBSD_NOINIT_TAG (no .init tag)"},
     {ELF::NT_FREEBSD_ARCH_TAG, "NT_FREEBSD_ARCH_TAG (architecture tag)"},
@@ -5290,7 +5520,22 @@ static const NoteType FreeBSDNoteTypes[] = {
      "NT_FREEBSD_FEATURE_CTL (FreeBSD feature control)"},
 };
 
-static const NoteType AMDNoteTypes[] = {
+const NoteType NetBSDCoreNoteTypes[] = {
+    {ELF::NT_NETBSDCORE_PROCINFO,
+     "NT_NETBSDCORE_PROCINFO (procinfo structure)"},
+    {ELF::NT_NETBSDCORE_AUXV, "NT_NETBSDCORE_AUXV (ELF auxiliary vector data)"},
+    {ELF::NT_NETBSDCORE_LWPSTATUS, "PT_LWPSTATUS (ptrace_lwpstatus structure)"},
+};
+
+const NoteType OpenBSDCoreNoteTypes[] = {
+    {ELF::NT_OPENBSD_PROCINFO, "NT_OPENBSD_PROCINFO (procinfo structure)"},
+    {ELF::NT_OPENBSD_AUXV, "NT_OPENBSD_AUXV (ELF auxiliary vector data)"},
+    {ELF::NT_OPENBSD_REGS, "NT_OPENBSD_REGS (regular registers)"},
+    {ELF::NT_OPENBSD_FPREGS, "NT_OPENBSD_FPREGS (floating point registers)"},
+    {ELF::NT_OPENBSD_WCOOKIE, "NT_OPENBSD_WCOOKIE (window cookie)"},
+};
+
+const NoteType AMDNoteTypes[] = {
     {ELF::NT_AMD_HSA_CODE_OBJECT_VERSION,
      "NT_AMD_HSA_CODE_OBJECT_VERSION (AMD HSA Code Object Version)"},
     {ELF::NT_AMD_HSA_HSAIL, "NT_AMD_HSA_HSAIL (AMD HSA HSAIL Properties)"},
@@ -5300,11 +5545,27 @@ static const NoteType AMDNoteTypes[] = {
     {ELF::NT_AMD_PAL_METADATA, "NT_AMD_PAL_METADATA (AMD PAL Metadata)"},
 };
 
-static const NoteType AMDGPUNoteTypes[] = {
+const NoteType AMDGPUNoteTypes[] = {
     {ELF::NT_AMDGPU_METADATA, "NT_AMDGPU_METADATA (AMDGPU Metadata)"},
 };
 
-static const NoteType CoreNoteTypes[] = {
+const NoteType LLVMOMPOFFLOADNoteTypes[] = {
+    {ELF::NT_LLVM_OPENMP_OFFLOAD_VERSION,
+     "NT_LLVM_OPENMP_OFFLOAD_VERSION (image format version)"},
+    {ELF::NT_LLVM_OPENMP_OFFLOAD_PRODUCER,
+     "NT_LLVM_OPENMP_OFFLOAD_PRODUCER (producing toolchain)"},
+    {ELF::NT_LLVM_OPENMP_OFFLOAD_PRODUCER_VERSION,
+     "NT_LLVM_OPENMP_OFFLOAD_PRODUCER_VERSION (producing toolchain version)"},
+};
+
+const NoteType AndroidNoteTypes[] = {
+    {ELF::NT_ANDROID_TYPE_IDENT, "NT_ANDROID_TYPE_IDENT"},
+    {ELF::NT_ANDROID_TYPE_KUSER, "NT_ANDROID_TYPE_KUSER"},
+    {ELF::NT_ANDROID_TYPE_MEMTAG,
+     "NT_ANDROID_TYPE_MEMTAG (Android memory tagging information)"},
+};
+
+const NoteType CoreNoteTypes[] = {
     {ELF::NT_PRSTATUS, "NT_PRSTATUS (prstatus structure)"},
     {ELF::NT_FPREGSET, "NT_FPREGSET (floating point registers)"},
     {ELF::NT_PRPSINFO, "NT_PRPSINFO (prpsinfo structure)"},
@@ -5393,10 +5654,27 @@ StringRef getNoteTypeName(const typename ELFT::Note &Note, unsigned ELFType) {
       return FindNote(FreeBSDNoteTypes);
     }
   }
+  if (ELFType == ELF::ET_CORE && Name.startswith("NetBSD-CORE")) {
+    StringRef Result = FindNote(NetBSDCoreNoteTypes);
+    if (!Result.empty())
+      return Result;
+    return FindNote(CoreNoteTypes);
+  }
+  if (ELFType == ELF::ET_CORE && Name.startswith("OpenBSD")) {
+    // OpenBSD also places the generic core notes in the OpenBSD namespace.
+    StringRef Result = FindNote(OpenBSDCoreNoteTypes);
+    if (!Result.empty())
+      return Result;
+    return FindNote(CoreNoteTypes);
+  }
   if (Name == "AMD")
     return FindNote(AMDNoteTypes);
   if (Name == "AMDGPU")
     return FindNote(AMDGPUNoteTypes);
+  if (Name == "LLVMOMPOFFLOAD")
+    return FindNote(LLVMOMPOFFLOADNoteTypes);
+  if (Name == "Android")
+    return FindNote(AndroidNoteTypes);
 
   if (ELFType == ELF::ET_CORE)
     return FindNote(CoreNoteTypes);
@@ -5406,7 +5684,7 @@ StringRef getNoteTypeName(const typename ELFT::Note &Note, unsigned ELFType) {
 template <class ELFT>
 static void printNotesHelper(
     const ELFDumper<ELFT> &Dumper,
-    llvm::function_ref<void(Optional<StringRef>, typename ELFT::Off,
+    llvm::function_ref<void(std::optional<StringRef>, typename ELFT::Off,
                             typename ELFT::Addr)>
         StartNotesFn,
     llvm::function_ref<Error(const typename ELFT::Note &, bool)> ProcessNoteFn,
@@ -5419,7 +5697,7 @@ static void printNotesHelper(
     for (const typename ELFT::Shdr &S : Sections) {
       if (S.sh_type != SHT_NOTE)
         continue;
-      StartNotesFn(expectedToOptional(Obj.getSectionName(S)), S.sh_offset,
+      StartNotesFn(expectedToStdOptional(Obj.getSectionName(S)), S.sh_offset,
                    S.sh_size);
       Error Err = Error::success();
       size_t I = 0;
@@ -5451,7 +5729,7 @@ static void printNotesHelper(
     const typename ELFT::Phdr &P = (*PhdrsOrErr)[I];
     if (P.p_type != PT_NOTE)
       continue;
-    StartNotesFn(/*SecName=*/None, P.p_offset, P.p_filesz);
+    StartNotesFn(/*SecName=*/std::nullopt, P.p_offset, P.p_filesz);
     Error Err = Error::success();
     size_t Index = 0;
     for (const typename ELFT::Note Note : Obj.notes(P, Err)) {
@@ -5472,7 +5750,7 @@ static void printNotesHelper(
 
 template <class ELFT> void GNUELFDumper<ELFT>::printNotes() {
   bool IsFirstHeader = true;
-  auto PrintHeader = [&](Optional<StringRef> SecName,
+  auto PrintHeader = [&](std::optional<StringRef> SecName,
                          const typename ELFT::Off Offset,
                          const typename ELFT::Addr Size) {
     // Print a newline between notes sections to match GNU readelf.
@@ -5515,7 +5793,7 @@ template <class ELFT> void GNUELFDumper<ELFT>::printNotes() {
       if (printGNUNote<ELFT>(OS, Type, Descriptor))
         return Error::success();
     } else if (Name == "FreeBSD") {
-      if (Optional<FreeBSDNote> N =
+      if (std::optional<FreeBSDNote> N =
               getFreeBSDNote<ELFT>(Type, Descriptor, IsCore)) {
         OS << "    " << N->Type << ": " << N->Value << '\n';
         return Error::success();
@@ -5532,6 +5810,9 @@ template <class ELFT> void GNUELFDumper<ELFT>::printNotes() {
         OS << "    " << N.Type << ":\n        " << N.Value << '\n';
         return Error::success();
       }
+    } else if (Name == "LLVMOMPOFFLOAD") {
+      if (printLLVMOMPOFFLOADNote<ELFT>(OS, Type, Descriptor))
+        return Error::success();
     } else if (Name == "CORE") {
       if (Type == ELF::NT_FILE) {
         DataExtractor DescExtractor(Descriptor,
@@ -5544,6 +5825,9 @@ template <class ELFT> void GNUELFDumper<ELFT>::printNotes() {
           return NoteOrErr.takeError();
         }
       }
+    } else if (Name == "Android") {
+      if (printAndroidNote(OS, Type, Descriptor))
+        return Error::success();
     }
     if (!Descriptor.empty()) {
       OS << "   description data:";
@@ -5722,9 +6006,9 @@ template <class ELFT> void GNUELFDumper<ELFT>::printDependentLibs() {
 
 template <class ELFT>
 SmallVector<uint32_t> ELFDumper<ELFT>::getSymbolIndexesForFunctionAddress(
-    uint64_t SymValue, Optional<const Elf_Shdr *> FunctionSec) {
+    uint64_t SymValue, std::optional<const Elf_Shdr *> FunctionSec) {
   SmallVector<uint32_t> SymbolIndexes;
-  if (!this->AddressToIndexMap.hasValue()) {
+  if (!this->AddressToIndexMap) {
     // Populate the address to index map upon the first invocation of this
     // function.
     this->AddressToIndexMap.emplace();
@@ -5788,7 +6072,7 @@ SmallVector<uint32_t> ELFDumper<ELFT>::getSymbolIndexesForFunctionAddress(
 
 template <class ELFT>
 bool ELFDumper<ELFT>::printFunctionStackSize(
-    uint64_t SymValue, Optional<const Elf_Shdr *> FunctionSec,
+    uint64_t SymValue, std::optional<const Elf_Shdr *> FunctionSec,
     const Elf_Shdr &StackSizeSec, DataExtractor Data, uint64_t *Offset) {
   SmallVector<uint32_t> FuncSymIndexes =
       this->getSymbolIndexesForFunctionAddress(SymValue, FunctionSec);
@@ -5877,9 +6161,8 @@ void ELFDumper<ELFT>::printStackSize(const Relocation<ELFT> &R,
     return;
   }
 
-  uint64_t SymValue =
-      Resolver(R.Type, Offset, RelocSymValue, Data.getAddress(&Offset),
-               R.Addend.getValueOr(0));
+  uint64_t SymValue = Resolver(R.Type, Offset, RelocSymValue,
+                               Data.getAddress(&Offset), R.Addend.value_or(0));
   this->printFunctionStackSize(SymValue, FunctionSec, StackSizeSec, Data,
                                &Offset);
 }
@@ -5907,8 +6190,8 @@ void ELFDumper<ELFT>::printNonRelocatableStackSizes(
         break;
       }
       uint64_t SymValue = Data.getAddress(&Offset);
-      if (!printFunctionStackSize(SymValue, /*FunctionSec=*/None, Sec, Data,
-                                  &Offset))
+      if (!printFunctionStackSize(SymValue, /*FunctionSec=*/std::nullopt, Sec,
+                                  Data, &Offset))
         break;
     }
   }
@@ -6095,7 +6378,7 @@ void GNUELFDumper<ELFT>::printMipsGOT(const MipsGOTParser<ELFT> &Parser) {
       OS.PadToColumn(31 + 2 * Bias);
       OS << to_string(format_hex_no_prefix(Sym.st_value, 8 + Bias));
       OS.PadToColumn(40 + 3 * Bias);
-      OS << printEnum(Sym.getType(), makeArrayRef(ElfSymbolTypes));
+      OS << enumToString(Sym.getType(), ArrayRef(ElfSymbolTypes));
       OS.PadToColumn(48 + 3 * Bias);
       OS << getSymbolSectionNdx(Sym, &Sym - this->dynamic_symbols().begin(),
                                 ShndxTable);
@@ -6149,7 +6432,7 @@ void GNUELFDumper<ELFT>::printMipsPLT(const MipsGOTParser<ELFT> &Parser) {
       OS.PadToColumn(20 + 2 * Bias);
       OS << to_string(format_hex_no_prefix(Sym.st_value, 8 + Bias));
       OS.PadToColumn(29 + 3 * Bias);
-      OS << printEnum(Sym.getType(), makeArrayRef(ElfSymbolTypes));
+      OS << enumToString(Sym.getType(), ArrayRef(ElfSymbolTypes));
       OS.PadToColumn(37 + 3 * Bias);
       OS << getSymbolSectionNdx(Sym, &Sym - this->dynamic_symbols().begin(),
                                 ShndxTable);
@@ -6196,15 +6479,15 @@ template <class ELFT> void GNUELFDumper<ELFT>::printMipsABIFlags() {
   OS << "GPR size: " << getMipsRegisterSize(Flags->gpr_size) << "\n";
   OS << "CPR1 size: " << getMipsRegisterSize(Flags->cpr1_size) << "\n";
   OS << "CPR2 size: " << getMipsRegisterSize(Flags->cpr2_size) << "\n";
-  OS << "FP ABI: " << printEnum(Flags->fp_abi, makeArrayRef(ElfMipsFpABIType))
+  OS << "FP ABI: " << enumToString(Flags->fp_abi, ArrayRef(ElfMipsFpABIType))
      << "\n";
   OS << "ISA Extension: "
-     << printEnum(Flags->isa_ext, makeArrayRef(ElfMipsISAExtType)) << "\n";
+     << enumToString(Flags->isa_ext, ArrayRef(ElfMipsISAExtType)) << "\n";
   if (Flags->ases == 0)
     OS << "ASEs: None\n";
   else
     // FIXME: Print each flag on a separate line.
-    OS << "ASEs: " << printFlags(Flags->ases, makeArrayRef(ElfMipsASEFlags))
+    OS << "ASEs: " << printFlags(Flags->ases, ArrayRef(ElfMipsASEFlags))
        << "\n";
   OS << "FLAGS 1: " << format_hex_no_prefix(Flags->flags1, 8, false) << "\n";
   OS << "FLAGS 2: " << format_hex_no_prefix(Flags->flags2, 8, false) << "\n";
@@ -6217,30 +6500,32 @@ template <class ELFT> void LLVMELFDumper<ELFT>::printFileHeaders() {
     DictScope D(W, "ElfHeader");
     {
       DictScope D(W, "Ident");
-      W.printBinary("Magic", makeArrayRef(E.e_ident).slice(ELF::EI_MAG0, 4));
-      W.printEnum("Class", E.e_ident[ELF::EI_CLASS], makeArrayRef(ElfClass));
+      W.printBinary("Magic",
+                    ArrayRef<unsigned char>(E.e_ident).slice(ELF::EI_MAG0, 4));
+      W.printEnum("Class", E.e_ident[ELF::EI_CLASS], ArrayRef(ElfClass));
       W.printEnum("DataEncoding", E.e_ident[ELF::EI_DATA],
-                  makeArrayRef(ElfDataEncoding));
+                  ArrayRef(ElfDataEncoding));
       W.printNumber("FileVersion", E.e_ident[ELF::EI_VERSION]);
 
-      auto OSABI = makeArrayRef(ElfOSABI);
+      auto OSABI = ArrayRef(ElfOSABI);
       if (E.e_ident[ELF::EI_OSABI] >= ELF::ELFOSABI_FIRST_ARCH &&
           E.e_ident[ELF::EI_OSABI] <= ELF::ELFOSABI_LAST_ARCH) {
         switch (E.e_machine) {
         case ELF::EM_AMDGPU:
-          OSABI = makeArrayRef(AMDGPUElfOSABI);
+          OSABI = ArrayRef(AMDGPUElfOSABI);
           break;
         case ELF::EM_ARM:
-          OSABI = makeArrayRef(ARMElfOSABI);
+          OSABI = ArrayRef(ARMElfOSABI);
           break;
         case ELF::EM_TI_C6000:
-          OSABI = makeArrayRef(C6000ElfOSABI);
+          OSABI = ArrayRef(C6000ElfOSABI);
           break;
         }
       }
       W.printEnum("OS/ABI", E.e_ident[ELF::EI_OSABI], OSABI);
       W.printNumber("ABIVersion", E.e_ident[ELF::EI_ABIVERSION]);
-      W.printBinary("Unused", makeArrayRef(E.e_ident).slice(ELF::EI_PAD));
+      W.printBinary("Unused",
+                    ArrayRef<unsigned char>(E.e_ident).slice(ELF::EI_PAD));
     }
 
     std::string TypeStr;
@@ -6254,15 +6539,15 @@ template <class ELFT> void LLVMELFDumper<ELFT>::printFileHeaders() {
       else
         TypeStr = "Unknown";
     }
-    W.printString("Type", TypeStr + " (0x" + to_hexString(E.e_type) + ")");
+    W.printString("Type", TypeStr + " (0x" + utohexstr(E.e_type) + ")");
 
-    W.printEnum("Machine", E.e_machine, makeArrayRef(ElfMachineType));
+    W.printEnum("Machine", E.e_machine, ArrayRef(ElfMachineType));
     W.printNumber("Version", E.e_version);
     W.printHex("Entry", E.e_entry);
     W.printHex("ProgramHeaderOffset", E.e_phoff);
     W.printHex("SectionHeaderOffset", E.e_shoff);
     if (E.e_machine == EM_MIPS)
-      W.printFlags("Flags", E.e_flags, makeArrayRef(ElfHeaderMipsFlags),
+      W.printFlags("Flags", E.e_flags, ArrayRef(ElfHeaderMipsFlags),
                    unsigned(ELF::EF_MIPS_ARCH), unsigned(ELF::EF_MIPS_ABI),
                    unsigned(ELF::EF_MIPS_MACH));
     else if (E.e_machine == EM_AMDGPU) {
@@ -6272,25 +6557,33 @@ template <class ELFT> void LLVMELFDumper<ELFT>::printFileHeaders() {
         break;
       case 0:
         // ELFOSABI_AMDGPU_PAL, ELFOSABI_AMDGPU_MESA3D support *_V3 flags.
-        LLVM_FALLTHROUGH;
+        [[fallthrough]];
       case ELF::ELFABIVERSION_AMDGPU_HSA_V3:
         W.printFlags("Flags", E.e_flags,
-                     makeArrayRef(ElfHeaderAMDGPUFlagsABIVersion3),
+                     ArrayRef(ElfHeaderAMDGPUFlagsABIVersion3),
                      unsigned(ELF::EF_AMDGPU_MACH));
         break;
       case ELF::ELFABIVERSION_AMDGPU_HSA_V4:
+      case ELF::ELFABIVERSION_AMDGPU_HSA_V5:
         W.printFlags("Flags", E.e_flags,
-                     makeArrayRef(ElfHeaderAMDGPUFlagsABIVersion4),
+                     ArrayRef(ElfHeaderAMDGPUFlagsABIVersion4),
                      unsigned(ELF::EF_AMDGPU_MACH),
                      unsigned(ELF::EF_AMDGPU_FEATURE_XNACK_V4),
                      unsigned(ELF::EF_AMDGPU_FEATURE_SRAMECC_V4));
         break;
       }
     } else if (E.e_machine == EM_RISCV)
-      W.printFlags("Flags", E.e_flags, makeArrayRef(ElfHeaderRISCVFlags));
+      W.printFlags("Flags", E.e_flags, ArrayRef(ElfHeaderRISCVFlags));
     else if (E.e_machine == EM_AVR)
-      W.printFlags("Flags", E.e_flags, makeArrayRef(ElfHeaderAVRFlags),
+      W.printFlags("Flags", E.e_flags, ArrayRef(ElfHeaderAVRFlags),
                    unsigned(ELF::EF_AVR_ARCH_MASK));
+    else if (E.e_machine == EM_LOONGARCH)
+      W.printFlags("Flags", E.e_flags, ArrayRef(ElfHeaderLoongArchFlags),
+                   unsigned(ELF::EF_LOONGARCH_ABI_MODIFIER_MASK),
+                   unsigned(ELF::EF_LOONGARCH_OBJABI_MASK));
+    else if (E.e_machine == EM_XTENSA)
+      W.printFlags("Flags", E.e_flags, ArrayRef(ElfHeaderXtensaFlags),
+                   unsigned(ELF::EF_XTENSA_MACH));
     else
       W.printFlags("Flags", E.e_flags);
     W.printNumber("HeaderSize", E.e_ehsize);
@@ -6386,7 +6679,8 @@ template <class ELFT> void LLVMELFDumper<ELFT>::printSectionHeaders() {
 
   int SectionIndex = -1;
   std::vector<EnumEntry<unsigned>> FlagsList =
-      getSectionFlagsForTarget(this->Obj.getHeader().e_machine);
+      getSectionFlagsForTarget(this->Obj.getHeader().e_ident[ELF::EI_OSABI],
+                               this->Obj.getHeader().e_machine);
   for (const Elf_Shdr &Sec : cantFail(this->Obj.sections())) {
     DictScope SectionD(W, "Section");
     W.printNumber("Index", ++SectionIndex);
@@ -6395,7 +6689,7 @@ template <class ELFT> void LLVMELFDumper<ELFT>::printSectionHeaders() {
                object::getELFSectionTypeName(this->Obj.getHeader().e_machine,
                                              Sec.sh_type),
                Sec.sh_type);
-    W.printFlags("Flags", Sec.sh_flags, makeArrayRef(FlagsList));
+    W.printFlags("Flags", Sec.sh_flags, ArrayRef(FlagsList));
     W.printHex("Address", Sec.sh_addr);
     W.printHex("Offset", Sec.sh_offset);
     W.printNumber("Size", Sec.sh_size);
@@ -6444,7 +6738,7 @@ template <class ELFT>
 void LLVMELFDumper<ELFT>::printSymbolSection(
     const Elf_Sym &Symbol, unsigned SymIndex,
     DataRegion<Elf_Word> ShndxTable) const {
-  auto GetSectionSpecialType = [&]() -> Optional<StringRef> {
+  auto GetSectionSpecialType = [&]() -> std::optional<StringRef> {
     if (Symbol.isUndefined())
       return StringRef("Undefined");
     if (Symbol.isProcessorSpecific())
@@ -6457,10 +6751,10 @@ void LLVMELFDumper<ELFT>::printSymbolSection(
       return StringRef("Common");
     if (Symbol.isReserved() && Symbol.st_shndx != SHN_XINDEX)
       return StringRef("Reserved");
-    return None;
+    return std::nullopt;
   };
 
-  if (Optional<StringRef> Type = GetSectionSpecialType()) {
+  if (std::optional<StringRef> Type = GetSectionSpecialType()) {
     W.printHex("Section", *Type, Symbol.st_shndx);
     return;
   }
@@ -6494,7 +6788,7 @@ void LLVMELFDumper<ELFT>::printSymbolSection(
 template <class ELFT>
 void LLVMELFDumper<ELFT>::printSymbol(const Elf_Sym &Symbol, unsigned SymIndex,
                                       DataRegion<Elf_Word> ShndxTable,
-                                      Optional<StringRef> StrTable,
+                                      std::optional<StringRef> StrTable,
                                       bool IsDynamic,
                                       bool /*NonVisibilityBitsUsed*/) const {
   std::string FullSymbolName = this->getFullSymbolName(
@@ -6505,12 +6799,12 @@ void LLVMELFDumper<ELFT>::printSymbol(const Elf_Sym &Symbol, unsigned SymIndex,
   W.printNumber("Name", FullSymbolName, Symbol.st_name);
   W.printHex("Value", Symbol.st_value);
   W.printNumber("Size", Symbol.st_size);
-  W.printEnum("Binding", Symbol.getBinding(), makeArrayRef(ElfSymbolBindings));
+  W.printEnum("Binding", Symbol.getBinding(), ArrayRef(ElfSymbolBindings));
   if (this->Obj.getHeader().e_machine == ELF::EM_AMDGPU &&
       SymbolType >= ELF::STT_LOOS && SymbolType < ELF::STT_HIOS)
-    W.printEnum("Type", SymbolType, makeArrayRef(AMDGPUSymbolTypes));
+    W.printEnum("Type", SymbolType, ArrayRef(AMDGPUSymbolTypes));
   else
-    W.printEnum("Type", SymbolType, makeArrayRef(ElfSymbolTypes));
+    W.printEnum("Type", SymbolType, ArrayRef(ElfSymbolTypes));
   if (Symbol.st_other == 0)
     // Usually st_other flag is zero. Do not pollute the output
     // by flags enumeration in that case.
@@ -6534,8 +6828,12 @@ void LLVMELFDumper<ELFT>::printSymbol(const Elf_Sym &Symbol, unsigned SymIndex,
       SymOtherFlags.insert(SymOtherFlags.end(),
                            std::begin(ElfAArch64SymOtherFlags),
                            std::end(ElfAArch64SymOtherFlags));
+    } else if (this->Obj.getHeader().e_machine == EM_RISCV) {
+      SymOtherFlags.insert(SymOtherFlags.end(),
+                           std::begin(ElfRISCVSymOtherFlags),
+                           std::end(ElfRISCVSymOtherFlags));
     }
-    W.printFlags("Other", Symbol.st_other, makeArrayRef(SymOtherFlags), 0x3u);
+    W.printFlags("Other", Symbol.st_other, ArrayRef(SymOtherFlags), 0x3u);
   }
   printSymbolSection(Symbol, SymIndex, ShndxTable);
 }
@@ -6618,7 +6916,7 @@ template <class ELFT> void LLVMELFDumper<ELFT>::printProgramHeaders() {
     W.printHex("PhysicalAddress", Phdr.p_paddr);
     W.printNumber("FileSize", Phdr.p_filesz);
     W.printNumber("MemSize", Phdr.p_memsz);
-    W.printFlags("Flags", Phdr.p_flags, makeArrayRef(ElfSegmentFlags));
+    W.printFlags("Flags", Phdr.p_flags, ArrayRef(ElfSegmentFlags));
     W.printNumber("Alignment", Phdr.p_align);
   }
 }
@@ -6652,7 +6950,7 @@ void LLVMELFDumper<ELFT>::printVersionSymbolSection(const Elf_Shdr *Sec) {
   }
 }
 
-static const EnumEntry<unsigned> SymVersionFlags[] = {
+const EnumEntry<unsigned> SymVersionFlags[] = {
     {"Base", "BASE", VER_FLG_BASE},
     {"Weak", "WEAK", VER_FLG_WEAK},
     {"Info", "INFO", VER_FLG_INFO}};
@@ -6672,7 +6970,7 @@ void LLVMELFDumper<ELFT>::printVersionDefinitionSection(const Elf_Shdr *Sec) {
   for (const VerDef &D : *V) {
     DictScope Def(W, "Definition");
     W.printNumber("Version", D.Version);
-    W.printFlags("Flags", D.Flags, makeArrayRef(SymVersionFlags));
+    W.printFlags("Flags", D.Flags, ArrayRef(SymVersionFlags));
     W.printNumber("Index", D.Ndx);
     W.printNumber("Hash", D.Hash);
     W.printString("Name", D.Name.c_str());
@@ -6705,7 +7003,7 @@ void LLVMELFDumper<ELFT>::printVersionDependencySection(const Elf_Shdr *Sec) {
     for (const VernAux &Aux : VN.AuxV) {
       DictScope Entry(W, "Entry");
       W.printNumber("Hash", Aux.Hash);
-      W.printFlags("Flags", Aux.Flags, makeArrayRef(SymVersionFlags));
+      W.printFlags("Flags", Aux.Flags, ArrayRef(SymVersionFlags));
       W.printNumber("Index", Aux.Other);
       W.printString("Name", Aux.Name.c_str());
     }
@@ -6813,21 +7111,23 @@ template <class ELFT> void LLVMELFDumper<ELFT>::printCGProfile() {
 template <class ELFT> void LLVMELFDumper<ELFT>::printBBAddrMaps() {
   bool IsRelocatable = this->Obj.getHeader().e_type == ELF::ET_REL;
   for (const Elf_Shdr &Sec : cantFail(this->Obj.sections())) {
-    if (Sec.sh_type != SHT_LLVM_BB_ADDR_MAP)
+    if (Sec.sh_type != SHT_LLVM_BB_ADDR_MAP &&
+        Sec.sh_type != SHT_LLVM_BB_ADDR_MAP_V0) {
       continue;
-    Optional<const Elf_Shdr *> FunctionSec = None;
+    }
+    std::optional<const Elf_Shdr *> FunctionSec;
     if (IsRelocatable)
       FunctionSec =
           unwrapOrError(this->FileName, this->Obj.getSection(Sec.sh_link));
     ListScope L(W, "BBAddrMap");
-    Expected<std::vector<Elf_BBAddrMap>> BBAddrMapOrErr =
+    Expected<std::vector<BBAddrMap>> BBAddrMapOrErr =
         this->Obj.decodeBBAddrMap(Sec);
     if (!BBAddrMapOrErr) {
       this->reportUniqueWarning("unable to dump " + this->describe(Sec) + ": " +
                                 toString(BBAddrMapOrErr.takeError()));
       continue;
     }
-    for (const Elf_BBAddrMap &AM : *BBAddrMapOrErr) {
+    for (const BBAddrMap &AM : *BBAddrMapOrErr) {
       DictScope D(W, "Function");
       W.printHex("At", AM.Addr);
       SmallVector<uint32_t> FuncSymIndex =
@@ -6842,8 +7142,9 @@ template <class ELFT> void LLVMELFDumper<ELFT>::printBBAddrMaps() {
       W.printString("Name", FuncName);
 
       ListScope L(W, "BB entries");
-      for (const typename Elf_BBAddrMap::BBEntry &BBE : AM.BBEntries) {
+      for (const BBAddrMap::BBEntry &BBE : AM.BBEntries) {
         DictScope L(W);
+        W.printNumber("ID", BBE.ID);
         W.printHex("Offset", BBE.Offset);
         W.printHex("Size", BBE.Size);
         W.printBoolean("HasReturn", BBE.HasReturn);
@@ -6894,7 +7195,7 @@ static bool printGNUNoteLLVMStyle(uint32_t NoteType, ArrayRef<uint8_t> Desc,
     break;
   }
   case ELF::NT_GNU_GOLD_VERSION:
-    W.printString("Version", getGNUGoldVersion(Desc));
+    W.printString("Version", getDescAsStringRef(Desc));
     break;
   case ELF::NT_GNU_PROPERTY_TYPE_0:
     ListScope D(W, "Property");
@@ -6905,6 +7206,37 @@ static bool printGNUNoteLLVMStyle(uint32_t NoteType, ArrayRef<uint8_t> Desc,
   return true;
 }
 
+static bool printAndroidNoteLLVMStyle(uint32_t NoteType, ArrayRef<uint8_t> Desc,
+                                      ScopedPrinter &W) {
+  // Return true if we were able to pretty-print the note, false otherwise.
+  AndroidNoteProperties Props = getAndroidNoteProperties(NoteType, Desc);
+  if (Props.empty())
+    return false;
+  for (const auto &KV : Props)
+    W.printString(KV.first, KV.second);
+  return true;
+}
+
+template <typename ELFT>
+static bool printLLVMOMPOFFLOADNoteLLVMStyle(uint32_t NoteType,
+                                             ArrayRef<uint8_t> Desc,
+                                             ScopedPrinter &W) {
+  switch (NoteType) {
+  default:
+    return false;
+  case ELF::NT_LLVM_OPENMP_OFFLOAD_VERSION:
+    W.printString("Version", getDescAsStringRef(Desc));
+    break;
+  case ELF::NT_LLVM_OPENMP_OFFLOAD_PRODUCER:
+    W.printString("Producer", getDescAsStringRef(Desc));
+    break;
+  case ELF::NT_LLVM_OPENMP_OFFLOAD_PRODUCER_VERSION:
+    W.printString("Producer version", getDescAsStringRef(Desc));
+    break;
+  }
+  return true;
+}
+
 static void printCoreNoteLLVMStyle(const CoreNote &Note, ScopedPrinter &W) {
   W.printNumber("Page Size", Note.PageSize);
   for (const CoreFileMapping &Mapping : Note.Mappings) {
@@ -6920,7 +7252,7 @@ template <class ELFT> void LLVMELFDumper<ELFT>::printNotes() {
   ListScope L(W, "Notes");
 
   std::unique_ptr<DictScope> NoteScope;
-  auto StartNotes = [&](Optional<StringRef> SecName,
+  auto StartNotes = [&](std::optional<StringRef> SecName,
                         const typename ELFT::Off Offset,
                         const typename ELFT::Addr Size) {
     NoteScope = std::make_unique<DictScope>(W, "NoteSection");
@@ -6955,7 +7287,7 @@ template <class ELFT> void LLVMELFDumper<ELFT>::printNotes() {
       if (printGNUNoteLLVMStyle<ELFT>(Type, Descriptor, W))
         return Error::success();
     } else if (Name == "FreeBSD") {
-      if (Optional<FreeBSDNote> N =
+      if (std::optional<FreeBSDNote> N =
               getFreeBSDNote<ELFT>(Type, Descriptor, IsCore)) {
         W.printString(N->Type, N->Value);
         return Error::success();
@@ -6972,6 +7304,9 @@ template <class ELFT> void LLVMELFDumper<ELFT>::printNotes() {
         W.printString(N.Type, N.Value);
         return Error::success();
       }
+    } else if (Name == "LLVMOMPOFFLOAD") {
+      if (printLLVMOMPOFFLOADNoteLLVMStyle<ELFT>(Type, Descriptor, W))
+        return Error::success();
     } else if (Name == "CORE") {
       if (Type == ELF::NT_FILE) {
         DataExtractor DescExtractor(Descriptor,
@@ -6984,6 +7319,9 @@ template <class ELFT> void LLVMELFDumper<ELFT>::printNotes() {
           return N.takeError();
         }
       }
+    } else if (Name == "Android") {
+      if (printAndroidNoteLLVMStyle(Type, Descriptor, W))
+        return Error::success();
     }
     if (!Descriptor.empty()) {
       W.printBinaryBlock("Description data", Descriptor);
@@ -7106,7 +7444,7 @@ void LLVMELFDumper<ELFT>::printMipsGOT(const MipsGOTParser<ELFT> &Parser) {
 
       const Elf_Sym &Sym = *Parser.getGotSym(&E);
       W.printHex("Value", Sym.st_value);
-      W.printEnum("Type", Sym.getType(), makeArrayRef(ElfSymbolTypes));
+      W.printEnum("Type", Sym.getType(), ArrayRef(ElfSymbolTypes));
 
       const unsigned SymIndex = &Sym - this->dynamic_symbols().begin();
       DataRegion<Elf_Word> ShndxTable(
@@ -7156,7 +7494,7 @@ void LLVMELFDumper<ELFT>::printMipsPLT(const MipsGOTParser<ELFT> &Parser) {
 
       const Elf_Sym &Sym = *Parser.getPltSym(&E);
       W.printHex("Value", Sym.st_value);
-      W.printEnum("Type", Sym.getType(), makeArrayRef(ElfSymbolTypes));
+      W.printEnum("Type", Sym.getType(), ArrayRef(ElfSymbolTypes));
       printSymbolSection(Sym, &Sym - this->dynamic_symbols().begin(),
                          ShndxTable);
 
@@ -7193,12 +7531,27 @@ template <class ELFT> void LLVMELFDumper<ELFT>::printMipsABIFlags() {
   else
     OS << format("MIPS%ur%u", Flags->isa_level, Flags->isa_rev);
   OS << "\n";
-  W.printEnum("ISA Extension", Flags->isa_ext, makeArrayRef(ElfMipsISAExtType));
-  W.printFlags("ASEs", Flags->ases, makeArrayRef(ElfMipsASEFlags));
-  W.printEnum("FP ABI", Flags->fp_abi, makeArrayRef(ElfMipsFpABIType));
+  W.printEnum("ISA Extension", Flags->isa_ext, ArrayRef(ElfMipsISAExtType));
+  W.printFlags("ASEs", Flags->ases, ArrayRef(ElfMipsASEFlags));
+  W.printEnum("FP ABI", Flags->fp_abi, ArrayRef(ElfMipsFpABIType));
   W.printNumber("GPR size", getMipsRegisterSize(Flags->gpr_size));
   W.printNumber("CPR1 size", getMipsRegisterSize(Flags->cpr1_size));
   W.printNumber("CPR2 size", getMipsRegisterSize(Flags->cpr2_size));
-  W.printFlags("Flags 1", Flags->flags1, makeArrayRef(ElfMipsFlags1));
+  W.printFlags("Flags 1", Flags->flags1, ArrayRef(ElfMipsFlags1));
   W.printHex("Flags 2", Flags->flags2);
 }
+
+template <class ELFT>
+void JSONELFDumper<ELFT>::printFileSummary(StringRef FileStr, ObjectFile &Obj,
+                                           ArrayRef<std::string> InputFilenames,
+                                           const Archive *A) {
+  FileScope = std::make_unique<DictScope>(this->W);
+  DictScope D(this->W, "FileSummary");
+  this->W.printString("File", FileStr);
+  this->W.printString("Format", Obj.getFileFormatName());
+  this->W.printString("Arch", Triple::getArchTypeName(Obj.getArch()));
+  this->W.printString(
+      "AddressSize",
+      std::string(formatv("{0}bit", 8 * Obj.getBytesInAddress())));
+  this->printLoadName();
+}
diff --git a/gnu/llvm/llvm/tools/llvm-reduce/deltas/ReduceModuleInlineAsm.cpp b/gnu/llvm/llvm/tools/llvm-reduce/deltas/ReduceModuleInlineAsm.cpp
deleted file mode 100644
index b74bd0ae08d..00000000000
--- a/gnu/llvm/llvm/tools/llvm-reduce/deltas/ReduceModuleInlineAsm.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-//===- ReduceModuleInlineAsm.cpp ------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements a function which calls the Generic Delta pass to reduce
-// module inline asm.
-//
-//===----------------------------------------------------------------------===//
-
-#include "ReduceModuleInlineAsm.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/GlobalValue.h"
-
-using namespace llvm;
-
-static void clearModuleInlineAsm(std::vector<Chunk> ChunksToKeep,
-                                 Module *Program) {
-  Oracle O(ChunksToKeep);
-
-  // TODO: clear line by line rather than all at once
-  if (!O.shouldKeep())
-    Program->setModuleInlineAsm("");
-}
-
-void llvm::reduceModuleInlineAsmDeltaPass(TestRunner &Test) {
-  outs() << "*** Reducing Module Inline Asm...\n";
-  runDeltaPass(Test, 1, clearModuleInlineAsm);
-}
diff --git a/gnu/llvm/llvm/tools/llvm-reduce/deltas/ReduceModuleInlineAsm.h b/gnu/llvm/llvm/tools/llvm-reduce/deltas/ReduceModuleInlineAsm.h
deleted file mode 100644
index 6d31c8f008d..00000000000
--- a/gnu/llvm/llvm/tools/llvm-reduce/deltas/ReduceModuleInlineAsm.h
+++ /dev/null
@@ -1,18 +0,0 @@
-//===- ReduceModuleInlineAsm.h --------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_LLVM_REDUCE_DELTAS_REDUCE_MODULEINLINEASM_H
-#define LLVM_TOOLS_LLVM_REDUCE_DELTAS_REDUCE_MODULEINLINEASM_H
-
-#include "Delta.h"
-
-namespace llvm {
-void reduceModuleInlineAsmDeltaPass(TestRunner &Test);
-} // namespace llvm
-
-#endif
diff --git a/gnu/llvm/llvm/tools/llvm-shlib/CMakeLists.txt b/gnu/llvm/llvm/tools/llvm-shlib/CMakeLists.txt
index 90e29043572..24f127cc8d4 100644
--- a/gnu/llvm/llvm/tools/llvm-shlib/CMakeLists.txt
+++ b/gnu/llvm/llvm/tools/llvm-shlib/CMakeLists.txt
@@ -51,7 +51,7 @@ if(LLVM_BUILD_LLVM_DYLIB)
       # Solaris ld does not accept global: *; so there is no way to version *all* global symbols
       set(LIB_NAMES -Wl,--version-script,${LLVM_LIBRARY_DIR}/tools/llvm-shlib/simple_version_script.map ${LIB_NAMES})
     endif()
-    if (NOT MINGW)
+    if (NOT MINGW AND ${OPENBSD_LD_IS_LLD})
       # Optimize function calls for default visibility definitions to avoid PLT and
       # reduce dynamic relocations.
       # Note: for -fno-pic default, the address of a function may be different from
diff --git a/gnu/llvm/llvm/tools/msbuild/.gitignore b/gnu/llvm/llvm/tools/msbuild/.gitignore
deleted file mode 100644
index 692d171a21a..00000000000
--- a/gnu/llvm/llvm/tools/msbuild/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-obj/
-bin/
-.vs/
-Key.snk
-packages/
-*.csproj.user
diff --git a/gnu/llvm/llvm/tools/msbuild/LLVM.Cpp.Common.props b/gnu/llvm/llvm/tools/msbuild/LLVM.Cpp.Common.props
deleted file mode 100644
index bc021b3b9e1..00000000000
--- a/gnu/llvm/llvm/tools/msbuild/LLVM.Cpp.Common.props
+++ /dev/null
@@ -1,79 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!-- The general order of executing an MSBuild file is roughly:
-       1) vcxproj file
-       2) ├─ Import Microsoft.Cpp.props
-       3) │  └─ Import Toolset specific props (e.g. $(VCTargets)Platforms\Win32\PlatformToolsets\llvm\Toolset.props)
-       4) │     └─ Import This File (LLVM.Cpp.Common.props)
-       5) │─ Core logic of vcxproj (define files, override properties, etc)
-       6) └─ Import Microsoft.Cpp.targets
-       7)    │─ Import Toolset specific targets file (e.g. $(VCTargets)Platforms\Win32\PlatformToolsets\llvm\Toolset.targets)
-       8)    └─ Run the compiler.
-       The important thing is that we have hooks at 3, 4, and 7.  3 and 4 give
-       us the ability to provide initial values for toolchain settings (where
-       is the compiler, what values are considered "default" for a given
-       setting, etc), 7 gives us the ability to act on anything that the user
-       has overridden (such as warning or erroring on incompatible settings,
-       mapping settings to other settings, etc).
-       -->
-
-  <PropertyGroup>
-    <!-- This initializes the values in Properties > General > Output Directory.
-       Builds will fail without this. -->
-    <OutDirWasSpecified Condition=" '$(OutDir)'!='' AND '$(OutDirWasSpecified)'=='' ">true</OutDirWasSpecified>
-    <OutDirWasSpecified Condition=" '$(OutDir)'=='' AND '$(OutDirWasSpecified)'=='' ">false</OutDirWasSpecified>
-
-    <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'!=''">$(IntermediateOutputPath)</IntDir>
-    <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'==''">$(Configuration)\</IntDir>
-    <OutDir Condition="'$(OutDir)'=='' AND '$(SolutionDir)' != ''">$(SolutionDir)$(Configuration)\</OutDir>
-    <OutDir Condition="'$(OutDir)'=='' AND '$(SolutionDir)' == ''">$(IntDir)</OutDir>
-    <DebuggerFlavor Condition="'$(DebuggerFlavor)'==''">WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <!-- Short names for platform toolsets (added to project name in Solution Explorer) -->
-    <_PlatformToolsetShortNameFor_llvm>LLVM</_PlatformToolsetShortNameFor_llvm>
-    <_PlatformToolsetFriendlyNameFor_llvm>LLVM</_PlatformToolsetFriendlyNameFor_llvm>
-  </PropertyGroup>
-
-  <!-- Find an installed LLVM and set up our paths. -->
-  <PropertyGroup>
-    <LLVMInstallDir>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\LLVM\LLVM)</LLVMInstallDir>
-    <LLVMInstallDir Condition="'$(LLVMInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\LLVM\LLVM)</LLVMInstallDir>
-    <LLVMInstallDir Condition="'$(LLVMInstallDir)' != ''">$(LLVMInstallDir)\</LLVMInstallDir>
-    <ClangClExecutable>$(LLVMInstallDir)bin\clang-cl.exe</ClangClExecutable>
-    <LldLinkExecutable>$(LLVMInstallDir)bin\lld-link.exe</LldLinkExecutable>
-    <LlvmLibExecutable>$(LLVMInstallDir)bin\llvm-lib.exe</LlvmLibExecutable>
-    <UseClangCl>true</UseClangCl>
-    <UseLldLink>true</UseLldLink>
-    <UseLlvmLib>true</UseLlvmLib>
-  </PropertyGroup>
-
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.WindowsSDK.props" Condition="Exists('$(VCTargetsPath)\Microsoft.Cpp.WindowsSDK.props')"/>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Common.props" />
-
-  <PropertyGroup>
-    <!-- Set some paths (such as include paths) that are common to all platforms.  This is the same as what
-         the default paths for cl will use.
-         -->
-    <IncludePath Condition="'$(IncludePath)' == ''">$(IncludePath);$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
-    <LibraryWPath Condition="'$(LibraryWPath)' == ''">$(WindowsSDK_MetadataPath);</LibraryWPath>
-    <SourcePath Condition="'$(SourcePath)' == ''">$(VC_SourcePath);</SourcePath>
-  </PropertyGroup>
-
-
-  <!-- Set values which are reflected in the property UI by default.  The user can override these
-       by editing the vcxproj file (or making changes via the UI, which has the same effect).
-       -->
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <!-- Set this to "Default" (which means not passing any /RTC option) so that any other value will
-           be treated as having been overridden by the user.  This Serves as a hint to the user that
-           Default is the value we support, and other values will generate a warning.  It also means
-           that if the user simply creates a new project in MSVC (which uses /RTCu by default), then
-           switches the toolset to Clang, we will still treat the value as default (which for us is to
-           not pass the option).  Only if the user explicitly overrode this setting in a project to use
-           /RTCu would we see the warning. -->
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-    </ClCompile>
-  </ItemDefinitionGroup>
-</Project>
diff --git a/gnu/llvm/llvm/tools/msbuild/LLVM.Cpp.Common.targets b/gnu/llvm/llvm/tools/msbuild/LLVM.Cpp.Common.targets
deleted file mode 100644
index 74a98d6439b..00000000000
--- a/gnu/llvm/llvm/tools/msbuild/LLVM.Cpp.Common.targets
+++ /dev/null
@@ -1,132 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(VCTargetsPath)\Microsoft.CppCommon.targets" />
-
-  <PropertyGroup>
-    <!-- Set the path to clang-cl executable based on the value of the project-
-         level setting.  This has to be done in the .targets file since values
-         selected via the settings UI appear in the vcxproj (which is imported
-         before the targets file but after the props file) and we need the path
-         that the user may have overridden in the UI. -->
-    <CLToolExe Condition="$(UseClangCl)">$(ClangClExecutable)</CLToolExe>
-    <LinkToolExe Condition="$(UseLldLink)">$(LldLinkExecutable)</LinkToolExe>
-    <LIBToolExe Condition="$(UseLlvmLib)">$(LlvmLibExecutable)</LIBToolExe>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PropertyPageSchema Include="$(VCTargetsPath)$(LangID)\llvm-general.xml">
-      <Context>Project</Context>
-    </PropertyPageSchema>
-  </ItemGroup>
-
-  <!-- Take any clang-specific options that the user wants to pass and stick them onto the
-       general purpose list of command line flags. -->
-  <ItemDefinitionGroup Condition="$(UseClangCl)">
-    <ClCompile>
-      <AdditionalOptions>-m$(PlatformArchitecture) $(ClangClAdditionalOptions) %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-  <ItemDefinitionGroup Condition="$(UseLldLink)">
-    <Link>
-      <AdditionalOptions>$(LldLinkAdditionalOptions) %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- We hook up a target to run every time ClCompile is about to run, the
-       purpose of which is to sanitize the command line before it gets passed to
-       the compiler.  Some options we silently discard, other options we warn on
-       and then discard, and other options we generate a hard error.
-
-       We try to keep hard errors to a minimum and reserve it for cases where
-       the option implies fundamentally different assumptions about the way code
-       should be compiled.  This code would probably generate an error anyway,
-       but at least this way we give the user a more useful message about what
-       the actual problem is, rather than relying on some obscure compilation
-       error.
-
-       For any options that clang-cl discards, we would prefer to not even pass
-       them in on the command line.  So if a user starts with a cl projects and
-       changes the toolset to clang, they could have set options such as /Gm
-       (minimal rebuild), /sdl (Security Checks), etc.  The ClCompile task would
-       then notice this and pass these through to clang-cl.exe.  Clang would of
-       course ignore them, but in some cases (such as /Gm), they would generate
-       -Wunused-command-line-argument warnings, so it's better if we can just
-       strip them from the command line entirely.  This also has the side
-       benefit of making command lines shorter which is always nice when trying
-       to look at the tool output.
-      -->
-  <Target Name="BeforeClCompile" BeforeTargets="ClCompile" Condition="$(UseClangCl)">
-    <!-- Error if they're trying to compile this file as managed code. -->
-    <Error Condition="('%(ClCompile.CompileAsManaged)' != 'false') AND ('%(ClCompile.CompileAsManaged)' != '')"
-           File="@(ClCompile)(0,0)"
-           Text="clang-cl does not support compiling managed code (/clr).  This file cannot be compiled."/>
-
-    <!-- Error if WinRT is being used. -->
-    <Error Condition="('%(ClCompile.CompileAsWinRT)' == 'true') OR ('%(ClCompile.WinRTNoStdLib)' == 'true')"
-           File="@(ClCompile)(0,0)"
-           Text="clang-cl does not support Windows Runtime Language Extensions (/ZW, /ZW:nostdlib).  This file cannot be compiled."/>
-
-    <!-- Error if OpenMP language extensions are enabled. -->
-    <Error Condition="'%(ClCompile.OpenMPSupport)' == 'true'"
-           File="@(ClCompile)(0,0)"
-           Text="clang-cl does not support OpenMP (/openmp).  This file cannot be compiled."/>
-
-    <!-- Error if C++ Modules are enabled.  Clang has its own notion of modules that are not compatible. -->
-    <Error Condition="'%(ClCompile.EnableModules)' == 'true'"
-           File="@(ClCompile)(0,0)"
-           Text="clang-cl does not support MSVC Modules (/experimental:module).  This file cannot be compiled."/>
-
-    <ItemGroup>
-      <ClCompile>
-        <!-- Map /ZI and /Zi to /Z7.  Clang internally does this, so if we were
-             to just pass the option through, clang would work.  The problem is
-             that MSBuild would not.  MSBuild detects /ZI and /Zi and then
-             assumes (rightly) that there will be a compiler-generated PDB (e.g.
-             vc141.pdb).  Since clang-cl will not emit this, MSBuild will always
-             think that the compiler-generated PDB needs to be re-generated from
-             scratch and trigger a full build.  The way to avoid this is to
-             always give MSBuild accurate information about how we plan to
-             generate debug info (which is to always using /Z7 semantics).
-             -->
-        <DebugInformationFormat Condition="'%(ClCompile.DebugInformationFormat)' == 'ProgramDatabase'">OldStyle</DebugInformationFormat>
-        <DebugInformationFormat Condition="'%(ClCompile.DebugInformationFormat)' == 'EditAndContinue'">OldStyle</DebugInformationFormat>
-
-        <!-- Unset any options that we either silently ignore or warn about due to compatibility.
-             Generally when an option is set to no value, that means "Don't pass an option to the
-             compiler at all."
-             -->
-        <WholeProgramOptimization/>
-        <EnableFiberSafeOptimizations/>
-        <IgnoreStandardIncludePath/>
-        <EnableParallelCodeGeneration/>
-        <ForceConformanceInForLoopScope/>
-        <TreatWChar_tAsBuiltInType/>
-        <SDLCheck/>
-        <GenerateXMLDocumentationFiles/>
-        <BrowseInformation/>
-        <EnablePREfast/>
-        <MinimalRebuild/>
-        <StringPooling/>
-        <ExpandAttributedSource/>
-        <EnforceTypeConversionRules/>
-        <ErrorReporting/>
-        <DisableLanguageExtensions/>
-        <ProgramDataBaseFileName/>
-        <DisableSpecificWarnings/>
-        <TreatSpecificWarningsAsErrors/>
-        <ForcedUsingFiles/>
-        <PREfastLog/>
-        <PREfastAdditionalOptions/>
-        <PREfastAdditionalPlugins/>
-        <MultiProcessorCompilation/>
-        <UseFullPaths/>
-        <RemoveUnreferencedCodeData/>
-
-        <!-- We can't just unset BasicRuntimeChecks, as that will pass /RTCu to the compiler.
-             We have to explicitly set it to 'Default' to avoid passing anything. -->
-        <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      </ClCompile>
-    </ItemGroup>
-  </Target>
-
-</Project>
diff --git a/gnu/llvm/llvm/tools/msbuild/Platformx64/Toolset.props b/gnu/llvm/llvm/tools/msbuild/Platformx64/Toolset.props
deleted file mode 100644
index 4762f4eaa1c..00000000000
--- a/gnu/llvm/llvm/tools/msbuild/Platformx64/Toolset.props
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(VCTargetsPath)\LLVM.Cpp.Common.props"/>
-
-  <PropertyGroup>
-    <ExecutablePath Condition="'$(ExecutablePath)' == ''">$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);</ExecutablePath>
-    <ReferencePath Condition="'$(ReferencePath)' == ''">$(VC_ReferencesPath_x64);</ReferencePath>
-    <LibraryPath Condition="'$(LibraryPath)' == ''">$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64</LibraryPath>
-    <ExcludePath Condition="'$(ExcludePath)' == ''">$(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x64);</ExcludePath>
-    <DebugCppRuntimeFilesPath Condition="'$(DebugCppRuntimeFilesPath)' == ''">$(VCToolsInstallDir)redist\Debug_NonRedist\x64</DebugCppRuntimeFilesPath>
-  </PropertyGroup>
-</Project>
diff --git a/gnu/llvm/llvm/tools/msbuild/Platformx64/Toolset.targets b/gnu/llvm/llvm/tools/msbuild/Platformx64/Toolset.targets
deleted file mode 100644
index 938e03b51e2..00000000000
--- a/gnu/llvm/llvm/tools/msbuild/Platformx64/Toolset.targets
+++ /dev/null
@@ -1,3 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(VCTargetsPath)\LLVM.Cpp.Common.targets"/>
-</Project>
diff --git a/gnu/llvm/llvm/tools/msbuild/Platformx86/Toolset.props b/gnu/llvm/llvm/tools/msbuild/Platformx86/Toolset.props
deleted file mode 100644
index 5a5cd6c736f..00000000000
--- a/gnu/llvm/llvm/tools/msbuild/Platformx86/Toolset.props
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(VCTargetsPath)\LLVM.Cpp.Common.props"/>
-
-  <PropertyGroup>
-    <ExecutablePath Condition="'$(ExecutablePath)' == ''">$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
-    <ReferencePath Condition="'$(ReferencePath)' == ''">$(VC_ReferencesPath_x86);</ReferencePath>
-    <LibraryPath Condition="'$(LibraryPath)' == ''">$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86</LibraryPath>
-    <ExcludePath Condition="'$(ExcludePath)' == ''">$(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x86);</ExcludePath>
-    <DebugCppRuntimeFilesPath Condition="'$(DebugCppRuntimeFilesPath)' == ''">$(VCToolsInstallDir)redist\Debug_NonRedist\x86</DebugCppRuntimeFilesPath>
-  </PropertyGroup>
-</Project>
diff --git a/gnu/llvm/llvm/tools/msbuild/Platformx86/Toolset.targets b/gnu/llvm/llvm/tools/msbuild/Platformx86/Toolset.targets
deleted file mode 100644
index 938e03b51e2..00000000000
--- a/gnu/llvm/llvm/tools/msbuild/Platformx86/Toolset.targets
+++ /dev/null
@@ -1,3 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(VCTargetsPath)\LLVM.Cpp.Common.targets"/>
-</Project>
diff --git a/gnu/llvm/llvm/tools/msbuild/install.bat b/gnu/llvm/llvm/tools/msbuild/install.bat
deleted file mode 100644
index bbc8a746151..00000000000
--- a/gnu/llvm/llvm/tools/msbuild/install.bat
+++ /dev/null
@@ -1,57 +0,0 @@
-@echo off
-
-echo Installing MSVC integration...
-set SUCCESS=0
-
-REM In general this script should not be used except for development and testing
-REM purposes.  The proper way to install is via the VSIX, and the proper way to
-REM uninstall is through the Visual Studio extension manager.
-
-REM Change to the directory of this batch file.
-cd /d %~dp0
-
-REM Older versions of VS would look for these files in the Program Files\MSBuild directory
-REM but with VS2017 it seems to look for these directly in the Visual Studio instance.
-REM This means we'll need to do a little extra work to properly detect all the various
-REM instances, but in reality we can probably sidestep all of this by just wrapping this
-REM in a vsix and calling it a day, as that should handle everything for us.
-SET VCTargets=%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Professional\Common7\IDE\VC\VCTargets
-
-ECHO Installing Common Files
-copy LLVM.Cpp.Common.props "%VCTargets%"
-IF NOT %ERRORLEVEL% == 0 GOTO FAILED
-copy LLVM.Cpp.Common.targets "%VCTargets%"
-IF NOT %ERRORLEVEL% == 0 GOTO FAILED
-
-ECHO Installing x64 Platform Toolset
-SET PlatformToolsets=%VCTargets%\Platforms\x64\PlatformToolsets
-IF NOT EXIST "%PlatformToolsets%\llvm" mkdir "%PlatformToolsets%\llvm"
-IF NOT %ERRORLEVEL% == 0 GOTO FAILED
-copy PlatformX64\Toolset.props "%PlatformToolsets%\llvm"
-IF NOT %ERRORLEVEL% == 0 GOTO FAILED
-copy PlatformX64\Toolset.targets "%PlatformToolsets%\llvm"
-IF NOT %ERRORLEVEL% == 0 GOTO FAILED
-
-ECHO Installing Win32 Platform Toolset
-SET PlatformToolsets=%VCTargets%\Platforms\Win32\PlatformToolsets
-IF NOT EXIST "%PlatformToolsets%\llvm" mkdir "%PlatformToolsets%\llvm"
-IF NOT %ERRORLEVEL% == 0 GOTO FAILED
-copy PlatformX86\Toolset.props "%PlatformToolsets%\llvm"
-IF NOT %ERRORLEVEL% == 0 GOTO FAILED
-copy PlatformX86\Toolset.targets "%PlatformToolsets%\llvm"
-IF NOT %ERRORLEVEL% == 0 GOTO FAILED
-
-ECHO Installing C++ Settings UI
-copy llvm-general.xml "%VCTargets%\1033"
-IF NOT %ERRORLEVEL% == 0 GOTO FAILED
-
-:DONE
-echo Done!
-goto END
-
-:FAILED
-echo MSVC integration install failed.
-pause
-goto END
-
-:END
diff --git a/gnu/llvm/llvm/tools/msbuild/license.txt b/gnu/llvm/llvm/tools/msbuild/license.txt
deleted file mode 100644
index 63c17f148e7..00000000000
--- a/gnu/llvm/llvm/tools/msbuild/license.txt
+++ /dev/null
@@ -1,261 +0,0 @@
-==============================================================================
-The LLVM Project is under the Apache License v2.0 with LLVM Exceptions:
-==============================================================================
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-    1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-    2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-    3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-    4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-    5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-    6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-    7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-    8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-    9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-    END OF TERMS AND CONDITIONS
-
-    APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-    Copyright [yyyy] [name of copyright owner]
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-
----- LLVM Exceptions to the Apache 2.0 License ----
-
-As an exception, if, as a result of your compiling your source code, portions
-of this Software are embedded into an Object form of such source code, you
-may redistribute such embedded portions in such Object form without complying
-with the conditions of Sections 4(a), 4(b) and 4(d) of the License.
-
-In addition, if you combine or link compiled forms of this Software with
-software that is licensed under the GPLv2 ("Combined Software") and if a
-court of competent jurisdiction determines that the patent provision (Section
-3), the indemnity provision (Section 9) or other Section of the License
-conflicts with the conditions of the GPLv2, you may retroactively and
-prospectively choose to deem waived or otherwise exclude such Section(s) of
-the License, but only in their entirety and only with respect to the Combined
-Software.
-
-==============================================================================
-Software from third parties included in the LLVM Project:
-==============================================================================
-The LLVM Project contains third party software which is under different license
-terms. All such code will be identified clearly using at least one of two
-mechanisms:
-1) It will be in a separate directory tree with its own `LICENSE.txt` or
-   `LICENSE` file at the top containing the specific license and restrictions
-   which apply to that software, or
-2) It will contain specific license and restriction terms at the top of every
-   file.
-
-==============================================================================
-Legacy LLVM License (https://llvm.org/docs/DeveloperPolicy.html#legacy):
-==============================================================================
-University of Illinois/NCSA
-Open Source License
-
-Copyright (c) 2007-2018 University of Illinois at Urbana-Champaign.
-All rights reserved.
-
-Developed by:
-
-    LLVM Team
-
-    University of Illinois at Urbana-Champaign
-
-    http://llvm.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal with the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-    * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimers.
-
-    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimers in the documentation and/or other materials provided with the distribution.
-
-    * Neither the names of the LLVM Team, University of Illinois at Urbana-Champaign, nor the names of its contributors may be used to endorse or promote products derived from this Software without specific prior written permission.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
diff --git a/gnu/llvm/llvm/tools/msbuild/llvm-general.xml b/gnu/llvm/llvm/tools/msbuild/llvm-general.xml
deleted file mode 100644
index 66a2cfec0b4..00000000000
--- a/gnu/llvm/llvm/tools/msbuild/llvm-general.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Rule
-      Name="LLVMGeneral"
-      DisplayName="LLVM"
-      PageTemplate="generic"
-      Description="LLVM"
-      xmlns="http://schemas.microsoft.com/build/2009/properties">
-  <Rule.Categories>
-    <Category Name="General" DisplayName="General" Description="General" />
-  </Rule.Categories>
-  <Rule.DataSource>
-    <DataSource Persistence="ProjectFile" Label="LLVM" />
-  </Rule.DataSource>
-
-  <BoolProperty Name="UseClangCl" 
-                DisplayName="Use clang-cl" 
-                Description="Use clang-cl for compiling.  If this option is disabled, the Microsoft compiler (cl.exe) will be used instead." 
-                Category="General" 
-                Default="true">
-  </BoolProperty>
-  <StringProperty Name="ClangClExecutable"
-                  DisplayName="clang-cl Executable"
-                  Description="Specifies the path to clang-cl.exe."
-                  Category="General"
-                  Default="$(LLVMInstallDir)bin\clang-cl.exe"
-                  Subtype="file">
-  </StringProperty>
-
-  <StringProperty Name="ClangClAdditionalOptions"
-                  DisplayName="Additional Compiler Options"
-                  Description="Additional options to pass to clang.  This is essentially the same as C/C++ > Command Line > Additional Options, except that it is safe to put options here that will be rejected by cl.exe in case you switch toolchains back and forth."
-                  Category="General">
-  </StringProperty>
-
-  <BoolProperty Name="UseLldLink"
-                DisplayName="Use lld-link"
-                Description="Use lld-link for linking.  If this option is disabled, the Microsoft linker (link.exe) will be used instead."
-                Category="General"
-                Default="true">
-  </BoolProperty>
-  <StringProperty Name="LldLinkExecutable"
-                  DisplayName="lld-link Executable"
-                  Description="Specifies the path to lld-link.exe."
-                  Category="General"
-                  Default="$(LLVMInstallDir)bin\lld-link.exe"
-                  Subtype="file">
-  </StringProperty>
-
-  <StringProperty Name="LldLinkAdditionalOptions"
-                  DisplayName="Additional Linker Options"
-                  Description="Additional options to pass to lld-link.  This is essentially the same as General > Linker > Command Line > Additional Options, except that it is safe to put options here that will be rejected by link.exe in case you switch toolchains back and forth."
-                  Category="General">
-  </StringProperty>
-
-
-  <BoolProperty Name="UseLlvmLib"
-                DisplayName="Use llvm-lib"
-                Description="Use llvm-lib for managing libraries.  If this option is disabled, the Microsoft librarian (lib.exe) will be used instead."
-                Category="General"
-                Default="true">
-  </BoolProperty>
-  <StringProperty Name="LlvmLibExecutable"
-                  DisplayName="llvm-lib Executable"
-                  Description="Specifies the path to llvm-lib.exe."
-                  Category="General"
-                  Default="$(LLVMInstallDir)bin\llvm-lib.exe"
-                  Subtype="file">
-  </StringProperty>
-
-  <StringProperty Name="LlvmLibAdditionalOptions"
-                  DisplayName="Additional Librarian Options"
-                  Description="Additional options to pass to llvm-lib.  This is essentially the same as General > Librarian > Command Line > Additional Options, except that it is safe to put options here that will be rejected by lib.exe in case you switch toolchains back and forth."
-                  Category="General">
-  </StringProperty>
-
-</Rule>
diff --git a/gnu/llvm/llvm/tools/msbuild/llvm.csproj b/gnu/llvm/llvm/tools/msbuild/llvm.csproj
deleted file mode 100644
index 39e898d7368..00000000000
--- a/gnu/llvm/llvm/tools/msbuild/llvm.csproj
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>{62530D9E-1B24-4C31-8DC9-AE47E9E5DC53}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>llvm</RootNamespace>
-    <AssemblyName>llvm</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <GeneratePkgDefFile>false</GeneratePkgDefFile>
-    <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
-    <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
-    <IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
-    <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
-    <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
-    <StartAction>Program</StartAction>
-    <StartProgram Condition="'$(DevEnvDir)' != ''">$(DevEnvDir)devenv.exe</StartProgram>
-    <StartArguments>/rootsuffix Exp</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Content Include="llvm-general.xml">
-      <IncludeInVSIX>true</IncludeInVSIX>
-      <InstallRoot>VCTargets</InstallRoot>
-      <VSIXSubPath>1033</VSIXSubPath>
-    </Content>
-    <Content Include="LLVM.Cpp.Common.props">
-      <IncludeInVSIX>true</IncludeInVSIX>
-      <InstallRoot>VCTargets</InstallRoot>
-    </Content>
-    <Content Include="license.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>
-    <Content Include="LLVM.Cpp.Common.targets">
-      <IncludeInVSIX>true</IncludeInVSIX>
-      <InstallRoot>VCTargets</InstallRoot>
-    </Content>
-    <None Include="source.extension.vsixmanifest">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Key.snk" />
-    <Content Include="Platformx64\Toolset.props">
-      <IncludeInVSIX>true</IncludeInVSIX>
-      <InstallRoot>VCTargets</InstallRoot>
-      <VSIXSubPath>Platforms\x64\PlatformToolsets\llvm</VSIXSubPath>
-    </Content>
-    <Content Include="Platformx64\Toolset.targets">
-      <IncludeInVSIX>true</IncludeInVSIX>
-      <InstallRoot>VCTargets</InstallRoot>
-      <VSIXSubPath>Platforms\x64\PlatformToolsets\llvm</VSIXSubPath>
-    </Content>
-    <Content Include="Platformx86\Toolset.props">
-      <IncludeInVSIX>true</IncludeInVSIX>
-      <InstallRoot>VCTargets</InstallRoot>
-      <VSIXSubPath>Platforms\Win32\PlatformToolsets\llvm</VSIXSubPath>
-    </Content>
-    <Content Include="Platformx86\Toolset.targets">
-      <IncludeInVSIX>true</IncludeInVSIX>
-      <InstallRoot>VCTargets</InstallRoot>
-      <VSIXSubPath>Platforms\Win32\PlatformToolsets\llvm</VSIXSubPath>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup>
-    <PreBuildEvent>if not exist $(ProjectDir)Key.snk ("$(TargetFrameworkSDKToolsDirectory)\x64\sn.exe" -k $(ProjectDir)Key.snk)</PreBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/gnu/llvm/llvm/tools/msbuild/llvm.sln b/gnu/llvm/llvm/tools/msbuild/llvm.sln
deleted file mode 100644
index 9fc37441b8b..00000000000
--- a/gnu/llvm/llvm/tools/msbuild/llvm.sln
+++ /dev/null
@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27004.2006
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "llvm", "llvm.csproj", "{62530D9E-1B24-4C31-8DC9-AE47E9E5DC53}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{62530D9E-1B24-4C31-8DC9-AE47E9E5DC53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{62530D9E-1B24-4C31-8DC9-AE47E9E5DC53}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{62530D9E-1B24-4C31-8DC9-AE47E9E5DC53}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{62530D9E-1B24-4C31-8DC9-AE47E9E5DC53}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {BD0FC803-C28B-4327-A129-CFB35C873897}
-	EndGlobalSection
-EndGlobal
diff --git a/gnu/llvm/llvm/tools/msbuild/source.extension.vsixmanifest b/gnu/llvm/llvm/tools/msbuild/source.extension.vsixmanifest
deleted file mode 100644
index ac2d3c4d49b..00000000000
--- a/gnu/llvm/llvm/tools/msbuild/source.extension.vsixmanifest
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
-    <Metadata>
-        <Identity Id="llvm.d29c51f0-961f-4e20-aad6-356af569907f" Version="1.0.363769" Language="en-US" Publisher="LLVM Extensions" />
-        <DisplayName>LLVM Compiler Toolchain</DisplayName>
-        <Description xml:space="preserve">Allows the LLVM Compiler Toolchain (installed separately) to be used from within Visual Studio to build C/C++ Projects.</Description>
-        <License>license.txt</License>
-    </Metadata>
-    <Installation AllUsers="true">
-        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0,16.0)" />
-        <InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Pro" />
-        <InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Enterprise" />
-    </Installation>
-    <Dependencies>
-        <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
-    </Dependencies>
-    <Prerequisites>
-        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
-        <Prerequisite Id="Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core" Version="[15.0.26621.2,16.0)" DisplayName="Visual C++ core desktop features" />
-        <Prerequisite Id="Microsoft.VisualStudio.Component.VC.CoreIde" Version="[15.0.26606.0,16.0)" DisplayName="Visual Studio C++ core features" />
-    </Prerequisites>
-</PackageManifest>
diff --git a/gnu/llvm/llvm/tools/msbuild/uninstall.bat b/gnu/llvm/llvm/tools/msbuild/uninstall.bat
deleted file mode 100644
index 0c8852ec46d..00000000000
--- a/gnu/llvm/llvm/tools/msbuild/uninstall.bat
+++ /dev/null
@@ -1,33 +0,0 @@
-@echo off
-
-echo Uninstalling MSVC integration...
-
-REM In general this script should not be used except for development and testing
-REM purposes.  The proper way to install is via the VSIX, and the proper way to
-REM uninstall is through the Visual Studio extension manager.
-
-REM CD to the directory of this batch file.
-cd /d %~dp0
-
-SET VCTargets=%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Professional\Common7\IDE\VC\VCTargets
-
-ECHO Uninstalling Common Files
-IF EXIST "%VCTargets%\LLVM.Cpp.Common.props" del "%VCTargets%\LLVM.Cpp.Common.props"
-IF EXIST "%VCTargets%\LLVM.Cpp.Common.targets" del "%VCTargets%\LLVM.Cpp.Common.targets"
-
-ECHO Uninstalling x64 Platform Toolset
-SET PlatformToolsets=%VCTargets%\Platforms\x64\PlatformToolsets
-IF EXIST "%PlatformToolsets%\llvm\Toolset.props" del "%PlatformToolsets%\llvm\Toolset.props"
-IF EXIST "%PlatformToolsets%\llvm\Toolset.targets" del "%PlatformToolsets%\llvm\Toolset.targets"
-IF EXIST "%PlatformToolsets%\llvm" rd "%PlatformToolsets%\llvm"
-
-ECHO Uninstalling Win32 Platform Toolset
-SET PlatformToolsets=%VCTargets%\Platforms\Win32\PlatformToolsets
-IF EXIST "%PlatformToolsets%\llvm\Toolset.props" del "%PlatformToolsets%\llvm\Toolset.props"
-IF EXIST "%PlatformToolsets%\llvm\Toolset.targets" del "%PlatformToolsets%\llvm\Toolset.targets"
-IF EXIST "%PlatformToolsets%\llvm" rd "%PlatformToolsets%\llvm"
-
-ECHO Uninstalling C++ Settings UI
-IF EXIST "%VCTargets%\1033\llvm-general.xml" del "%VCTargets%\1033\llvm-general.xml"
-
-echo Done!
diff --git a/gnu/llvm/llvm/tools/opt/GraphPrinters.cpp b/gnu/llvm/llvm/tools/opt/GraphPrinters.cpp
deleted file mode 100644
index 611fb20513c..00000000000
--- a/gnu/llvm/llvm/tools/opt/GraphPrinters.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-//===- GraphPrinters.cpp - DOT printers for various graph types -----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines several printers for various different types of graphs used
-// by the LLVM infrastructure.  It uses the generic graph interface to convert
-// the graph into a .dot graph.  These graphs can then be processed with the
-// "dot" tool to convert them to postscript or some other suitable format.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/IR/Dominators.h"
-#include "llvm/Pass.h"
-
-using namespace llvm;
-
-//===----------------------------------------------------------------------===//
-//                            DomInfoPrinter Pass
-//===----------------------------------------------------------------------===//
-
-namespace {
-  class DomInfoPrinter : public FunctionPass {
-  public:
-    static char ID; // Pass identification, replacement for typeid
-    DomInfoPrinter() : FunctionPass(ID) {}
-
-    void getAnalysisUsage(AnalysisUsage &AU) const override {
-      AU.setPreservesAll();
-      AU.addRequired<DominatorTreeWrapperPass>();
-    }
-
-    bool runOnFunction(Function &F) override {
-      getAnalysis<DominatorTreeWrapperPass>().print(dbgs());
-      return false;
-    }
-  };
-}
-
-char DomInfoPrinter::ID = 0;
-static RegisterPass<DomInfoPrinter>
-DIP("print-dom-info", "Dominator Info Printer", true, true);
diff --git a/gnu/llvm/llvm/tools/opt/PassPrinters.cpp b/gnu/llvm/llvm/tools/opt/PassPrinters.cpp
deleted file mode 100644
index 4e81b5d29c4..00000000000
--- a/gnu/llvm/llvm/tools/opt/PassPrinters.cpp
+++ /dev/null
@@ -1,212 +0,0 @@
-//===- PassPrinters.cpp - Utilities to print analysis info for passes -----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-///
-/// \file
-/// Utilities to print analysis info for various kinds of passes.
-///
-//===----------------------------------------------------------------------===//
-
-#include "PassPrinters.h"
-#include "llvm/Analysis/CallGraph.h"
-#include "llvm/Analysis/CallGraphSCCPass.h"
-#include "llvm/Analysis/LoopInfo.h"
-#include "llvm/Analysis/LoopPass.h"
-#include "llvm/Analysis/RegionInfo.h"
-#include "llvm/Analysis/RegionPass.h"
-#include "llvm/IR/BasicBlock.h"
-#include "llvm/IR/Function.h"
-#include "llvm/Pass.h"
-#include "llvm/Support/raw_ostream.h"
-#include <string>
-
-using namespace llvm;
-
-namespace {
-
-struct FunctionPassPrinter : public FunctionPass {
-  const PassInfo *PassToPrint;
-  raw_ostream &Out;
-  static char ID;
-  std::string PassName;
-
-  FunctionPassPrinter(const PassInfo *PI, raw_ostream &out)
-      : FunctionPass(ID), PassToPrint(PI), Out(out) {
-    std::string PassToPrintName = std::string(PassToPrint->getPassName());
-    PassName = "FunctionPass Printer: " + PassToPrintName;
-  }
-
-  bool runOnFunction(Function &F) override {
-    Out << "Printing analysis '" << PassToPrint->getPassName()
-        << "' for function '" << F.getName() << "':\n";
-
-    // Get and print pass...
-    getAnalysisID<Pass>(PassToPrint->getTypeInfo()).print(Out, F.getParent());
-    return false;
-  }
-
-  StringRef getPassName() const override { return PassName; }
-
-  void getAnalysisUsage(AnalysisUsage &AU) const override {
-    AU.addRequiredID(PassToPrint->getTypeInfo());
-    AU.setPreservesAll();
-  }
-};
-
-char FunctionPassPrinter::ID = 0;
-
-struct CallGraphSCCPassPrinter : public CallGraphSCCPass {
-  static char ID;
-  const PassInfo *PassToPrint;
-  raw_ostream &Out;
-  std::string PassName;
-
-  CallGraphSCCPassPrinter(const PassInfo *PI, raw_ostream &out)
-      : CallGraphSCCPass(ID), PassToPrint(PI), Out(out) {
-    std::string PassToPrintName = std::string(PassToPrint->getPassName());
-    PassName = "CallGraphSCCPass Printer: " + PassToPrintName;
-  }
-
-  bool runOnSCC(CallGraphSCC &SCC) override {
-    Out << "Printing analysis '" << PassToPrint->getPassName() << "':\n";
-
-    // Get and print pass...
-    for (CallGraphSCC::iterator I = SCC.begin(), E = SCC.end(); I != E; ++I) {
-      Function *F = (*I)->getFunction();
-      if (F)
-        getAnalysisID<Pass>(PassToPrint->getTypeInfo())
-            .print(Out, F->getParent());
-    }
-    return false;
-  }
-
-  StringRef getPassName() const override { return PassName; }
-
-  void getAnalysisUsage(AnalysisUsage &AU) const override {
-    AU.addRequiredID(PassToPrint->getTypeInfo());
-    AU.setPreservesAll();
-  }
-};
-
-char CallGraphSCCPassPrinter::ID = 0;
-
-struct ModulePassPrinter : public ModulePass {
-  static char ID;
-  const PassInfo *PassToPrint;
-  raw_ostream &Out;
-  std::string PassName;
-
-  ModulePassPrinter(const PassInfo *PI, raw_ostream &out)
-      : ModulePass(ID), PassToPrint(PI), Out(out) {
-    std::string PassToPrintName = std::string(PassToPrint->getPassName());
-    PassName = "ModulePass Printer: " + PassToPrintName;
-  }
-
-  bool runOnModule(Module &M) override {
-    Out << "Printing analysis '" << PassToPrint->getPassName() << "':\n";
-
-    // Get and print pass...
-    getAnalysisID<Pass>(PassToPrint->getTypeInfo()).print(Out, &M);
-    return false;
-  }
-
-  StringRef getPassName() const override { return PassName; }
-
-  void getAnalysisUsage(AnalysisUsage &AU) const override {
-    AU.addRequiredID(PassToPrint->getTypeInfo());
-    AU.setPreservesAll();
-  }
-};
-
-char ModulePassPrinter::ID = 0;
-
-struct LoopPassPrinter : public LoopPass {
-  static char ID;
-  const PassInfo *PassToPrint;
-  raw_ostream &Out;
-  std::string PassName;
-
-  LoopPassPrinter(const PassInfo *PI, raw_ostream &out)
-      : LoopPass(ID), PassToPrint(PI), Out(out) {
-    std::string PassToPrintName = std::string(PassToPrint->getPassName());
-    PassName = "LoopPass Printer: " + PassToPrintName;
-  }
-
-  bool runOnLoop(Loop *L, LPPassManager &LPM) override {
-    Out << "Printing analysis '" << PassToPrint->getPassName() << "':\n";
-
-    // Get and print pass...
-    getAnalysisID<Pass>(PassToPrint->getTypeInfo())
-        .print(Out, L->getHeader()->getParent()->getParent());
-    return false;
-  }
-
-  StringRef getPassName() const override { return PassName; }
-
-  void getAnalysisUsage(AnalysisUsage &AU) const override {
-    AU.addRequiredID(PassToPrint->getTypeInfo());
-    AU.setPreservesAll();
-  }
-};
-
-char LoopPassPrinter::ID = 0;
-
-struct RegionPassPrinter : public RegionPass {
-  static char ID;
-  const PassInfo *PassToPrint;
-  raw_ostream &Out;
-  std::string PassName;
-
-  RegionPassPrinter(const PassInfo *PI, raw_ostream &out)
-      : RegionPass(ID), PassToPrint(PI), Out(out) {
-    std::string PassToPrintName = std::string(PassToPrint->getPassName());
-    PassName = "RegionPass Printer: " + PassToPrintName;
-  }
-
-  bool runOnRegion(Region *R, RGPassManager &RGM) override {
-    Out << "Printing analysis '" << PassToPrint->getPassName() << "' for "
-        << "region: '" << R->getNameStr() << "' in function '"
-        << R->getEntry()->getParent()->getName() << "':\n";
-    // Get and print pass...
-    getAnalysisID<Pass>(PassToPrint->getTypeInfo())
-        .print(Out, R->getEntry()->getParent()->getParent());
-    return false;
-  }
-
-  StringRef getPassName() const override { return PassName; }
-
-  void getAnalysisUsage(AnalysisUsage &AU) const override {
-    AU.addRequiredID(PassToPrint->getTypeInfo());
-    AU.setPreservesAll();
-  }
-};
-
-char RegionPassPrinter::ID = 0;
-
-} // end anonymous namespace
-
-FunctionPass *llvm::createFunctionPassPrinter(const PassInfo *PI,
-                                              raw_ostream &OS) {
-  return new FunctionPassPrinter(PI, OS);
-}
-
-CallGraphSCCPass *llvm::createCallGraphPassPrinter(const PassInfo *PI,
-                                                   raw_ostream &OS) {
-  return new CallGraphSCCPassPrinter(PI, OS);
-}
-
-ModulePass *llvm::createModulePassPrinter(const PassInfo *PI, raw_ostream &OS) {
-  return new ModulePassPrinter(PI, OS);
-}
-
-LoopPass *llvm::createLoopPassPrinter(const PassInfo *PI, raw_ostream &OS) {
-  return new LoopPassPrinter(PI, OS);
-}
-
-RegionPass *llvm::createRegionPassPrinter(const PassInfo *PI, raw_ostream &OS) {
-  return new RegionPassPrinter(PI, OS);
-}
diff --git a/gnu/llvm/llvm/tools/opt/PassPrinters.h b/gnu/llvm/llvm/tools/opt/PassPrinters.h
deleted file mode 100644
index a4e1921399f..00000000000
--- a/gnu/llvm/llvm/tools/opt/PassPrinters.h
+++ /dev/null
@@ -1,40 +0,0 @@
-//=- PassPrinters.h - Utilities to print analysis info for passes -*- C++ -*-=//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-///
-/// \file
-/// Utilities to print analysis info for various kinds of passes.
-///
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_OPT_PASSPRINTERS_H
-#define LLVM_TOOLS_OPT_PASSPRINTERS_H
-
-namespace llvm {
-
-class CallGraphSCCPass;
-class FunctionPass;
-class ModulePass;
-class LoopPass;
-class PassInfo;
-class raw_ostream;
-class RegionPass;
-
-FunctionPass *createFunctionPassPrinter(const PassInfo *PI, raw_ostream &out);
-
-CallGraphSCCPass *createCallGraphPassPrinter(const PassInfo *PI,
-                                             raw_ostream &out);
-
-ModulePass *createModulePassPrinter(const PassInfo *PI, raw_ostream &out);
-
-LoopPass *createLoopPassPrinter(const PassInfo *PI, raw_ostream &out);
-
-RegionPass *createRegionPassPrinter(const PassInfo *PI, raw_ostream &out);
-
-} // end namespace llvm
-
-#endif // LLVM_TOOLS_OPT_PASSPRINTERS_H
diff --git a/gnu/llvm/llvm/tools/opt/PrintSCC.cpp b/gnu/llvm/llvm/tools/opt/PrintSCC.cpp
deleted file mode 100644
index 1ca52745ff4..00000000000
--- a/gnu/llvm/llvm/tools/opt/PrintSCC.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-//===- PrintSCC.cpp - Enumerate SCCs in some key graphs -------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file provides passes to print out SCCs in a CFG or a CallGraph.
-// Normally, you would not use these passes; instead, you would use the
-// scc_iterator directly to enumerate SCCs and process them in some way.  These
-// passes serve three purposes:
-//
-// (1) As a reference for how to use the scc_iterator.
-// (2) To print out the SCCs for a CFG or a CallGraph:
-//       analyze -print-cfg-sccs            to print the SCCs in each CFG of a module.
-//       analyze -print-cfg-sccs -stats     to print the #SCCs and the maximum SCC size.
-//       analyze -print-cfg-sccs -debug > /dev/null to watch the algorithm in action.
-//
-//     and similarly:
-//       analyze -print-callgraph-sccs [-stats] [-debug] to print SCCs in the CallGraph
-//
-// (3) To test the scc_iterator.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/SCCIterator.h"
-#include "llvm/Analysis/CallGraph.h"
-#include "llvm/IR/CFG.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Pass.h"
-#include "llvm/Support/raw_ostream.h"
-using namespace llvm;
-
-namespace {
-  struct CFGSCC : public FunctionPass {
-    static char ID;  // Pass identification, replacement for typeid
-    CFGSCC() : FunctionPass(ID) {}
-    bool runOnFunction(Function& func) override;
-
-    void print(raw_ostream &O, const Module* = nullptr) const override { }
-
-    void getAnalysisUsage(AnalysisUsage &AU) const override {
-      AU.setPreservesAll();
-    }
-  };
-
-  struct CallGraphSCC : public ModulePass {
-    static char ID;  // Pass identification, replacement for typeid
-    CallGraphSCC() : ModulePass(ID) {}
-
-    // run - Print out SCCs in the call graph for the specified module.
-    bool runOnModule(Module &M) override;
-
-    void print(raw_ostream &O, const Module* = nullptr) const override { }
-
-    // getAnalysisUsage - This pass requires the CallGraph.
-    void getAnalysisUsage(AnalysisUsage &AU) const override {
-      AU.setPreservesAll();
-      AU.addRequired<CallGraphWrapperPass>();
-    }
-  };
-}
-
-char CFGSCC::ID = 0;
-static RegisterPass<CFGSCC>
-Y("print-cfg-sccs", "Print SCCs of each function CFG");
-
-char CallGraphSCC::ID = 0;
-static RegisterPass<CallGraphSCC>
-Z("print-callgraph-sccs", "Print SCCs of the Call Graph");
-
-bool CFGSCC::runOnFunction(Function &F) {
-  unsigned sccNum = 0;
-  errs() << "SCCs for Function " << F.getName() << " in PostOrder:";
-  for (scc_iterator<Function*> SCCI = scc_begin(&F); !SCCI.isAtEnd(); ++SCCI) {
-    const std::vector<BasicBlock *> &nextSCC = *SCCI;
-    errs() << "\nSCC #" << ++sccNum << " : ";
-    for (BasicBlock *BB : nextSCC) {
-      BB->printAsOperand(errs(), false);
-      errs() << ", ";
-    }
-    if (nextSCC.size() == 1 && SCCI.hasCycle())
-      errs() << " (Has self-loop).";
-  }
-  errs() << "\n";
-
-  return true;
-}
-
-
-// run - Print out SCCs in the call graph for the specified module.
-bool CallGraphSCC::runOnModule(Module &M) {
-  CallGraph &CG = getAnalysis<CallGraphWrapperPass>().getCallGraph();
-  unsigned sccNum = 0;
-  errs() << "SCCs for the program in PostOrder:";
-  for (scc_iterator<CallGraph*> SCCI = scc_begin(&CG); !SCCI.isAtEnd();
-       ++SCCI) {
-    const std::vector<CallGraphNode*> &nextSCC = *SCCI;
-    errs() << "\nSCC #" << ++sccNum << " : ";
-    for (std::vector<CallGraphNode*>::const_iterator I = nextSCC.begin(),
-           E = nextSCC.end(); I != E; ++I)
-      errs() << ((*I)->getFunction() ? (*I)->getFunction()->getName()
-                                     : "external node") << ", ";
-    if (nextSCC.size() == 1 && SCCI.hasCycle())
-      errs() << " (Has self-loop).";
-  }
-  errs() << "\n";
-
-  return true;
-}
diff --git a/gnu/llvm/llvm/tools/split-file/.clang-tidy b/gnu/llvm/llvm/tools/split-file/.clang-tidy
deleted file mode 100644
index acd9361b526..00000000000
--- a/gnu/llvm/llvm/tools/split-file/.clang-tidy
+++ /dev/null
@@ -1,8 +0,0 @@
-InheritParentConfig: true
-CheckOptions:
-  - key:             readability-identifier-naming.MemberCase
-    value:           camelBack
-  - key:             readability-identifier-naming.ParameterCase
-    value:           camelBack
-  - key:             readability-identifier-naming.VariableCase
-    value:           camelBack
diff --git a/gnu/llvm/llvm/tools/split-file/CMakeLists.txt b/gnu/llvm/llvm/tools/split-file/CMakeLists.txt
deleted file mode 100644
index ba998483c22..00000000000
--- a/gnu/llvm/llvm/tools/split-file/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  Support
-  )
-
-add_llvm_tool(split-file
-  split-file.cpp
-  )
diff --git a/gnu/llvm/llvm/tools/split-file/split-file.cpp b/gnu/llvm/llvm/tools/split-file/split-file.cpp
deleted file mode 100644
index 3ebbda47e0d..00000000000
--- a/gnu/llvm/llvm/tools/split-file/split-file.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-//===- split-file.cpp - Input splitting utility ---------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Split input into multipe parts separated by regex '^(.|//)--- ' and extract
-// the specified part.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/DenseMap.h"
-#include "llvm/ADT/StringExtras.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/FileOutputBuffer.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/LineIterator.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Support/ToolOutputFile.h"
-#include "llvm/Support/WithColor.h"
-#include <string>
-#include <system_error>
-
-using namespace llvm;
-
-static cl::OptionCategory cat("split-file Options");
-
-static cl::opt<std::string> input(cl::Positional, cl::desc("filename"),
-                                  cl::cat(cat));
-
-static cl::opt<std::string> output(cl::Positional, cl::desc("directory"),
-                                   cl::value_desc("directory"), cl::cat(cat));
-
-static cl::opt<bool> noLeadingLines("no-leading-lines",
-                                    cl::desc("Don't preserve line numbers"),
-                                    cl::cat(cat));
-
-static StringRef toolName;
-static int errorCount;
-
-LLVM_ATTRIBUTE_NORETURN static void fatal(StringRef filename,
-                                          const Twine &message) {
-  if (filename.empty())
-    WithColor::error(errs(), toolName) << message << '\n';
-  else
-    WithColor::error(errs(), toolName) << filename << ": " << message << '\n';
-  exit(1);
-}
-
-static void error(StringRef filename, int64_t line, const Twine &message) {
-  ++errorCount;
-  errs() << filename << ':' << line << ": ";
-  WithColor::error(errs()) << message << '\n';
-}
-
-namespace {
-struct Part {
-  const char *begin = nullptr;
-  const char *end = nullptr;
-  int64_t leadingLines = 0;
-};
-} // namespace
-
-static int handle(MemoryBuffer &inputBuf, StringRef input) {
-  DenseMap<StringRef, Part> partToBegin;
-  StringRef lastPart, separator;
-  for (line_iterator i(inputBuf, /*SkipBlanks=*/false, '\0'); !i.is_at_eof();) {
-    const int64_t lineNo = i.line_number();
-    const StringRef line = *i++;
-    const size_t markerLen = line.startswith("//") ? 6 : 5;
-    if (!(line.size() >= markerLen &&
-          line.substr(markerLen - 4).startswith("--- ")))
-      continue;
-    separator = line.substr(0, markerLen);
-    const StringRef partName = line.substr(markerLen);
-    if (partName.empty()) {
-      error(input, lineNo, "empty part name");
-      continue;
-    }
-    if (isSpace(partName.front()) || isSpace(partName.back())) {
-      error(input, lineNo, "part name cannot have leading or trailing space");
-      continue;
-    }
-
-    auto res = partToBegin.try_emplace(partName);
-    if (!res.second) {
-      error(input, lineNo,
-            "'" + separator + partName + "' occurs more than once");
-      continue;
-    }
-    if (!lastPart.empty())
-      partToBegin[lastPart].end = line.data();
-    Part &cur = res.first->second;
-    if (!i.is_at_eof())
-      cur.begin = i->data();
-    // If --no-leading-lines is not specified, numEmptyLines is 0. Append
-    // newlines so that the extracted part preserves line numbers.
-    cur.leadingLines = noLeadingLines ? 0 : i.line_number() - 1;
-
-    lastPart = partName;
-  }
-  if (lastPart.empty())
-    fatal(input, "no part separator was found");
-  if (errorCount)
-    return 1;
-  partToBegin[lastPart].end = inputBuf.getBufferEnd();
-
-  std::vector<std::unique_ptr<ToolOutputFile>> outputFiles;
-  SmallString<256> partPath;
-  for (auto &keyValue : partToBegin) {
-    partPath.clear();
-    sys::path::append(partPath, output, keyValue.first);
-    std::error_code ec =
-        sys::fs::create_directories(sys::path::parent_path(partPath));
-    if (ec)
-      fatal(input, ec.message());
-    auto f = std::make_unique<ToolOutputFile>(partPath.str(), ec,
-                                              llvm::sys::fs::OF_None);
-    if (!f)
-      fatal(input, ec.message());
-
-    Part &part = keyValue.second;
-    for (int64_t i = 0; i != part.leadingLines; ++i)
-      (*f).os().write('\n');
-    if (part.begin)
-      (*f).os().write(part.begin, part.end - part.begin);
-    outputFiles.push_back(std::move(f));
-  }
-
-  for (std::unique_ptr<ToolOutputFile> &outputFile : outputFiles)
-    outputFile->keep();
-  return 0;
-}
-
-int main(int argc, const char **argv) {
-  toolName = sys::path::stem(argv[0]);
-  cl::HideUnrelatedOptions({&cat});
-  cl::ParseCommandLineOptions(
-      argc, argv,
-      "Split input into multiple parts separated by regex '^(.|//)--- ' and "
-      "extract the part specified by '^(.|//)--- <part>'\n",
-      nullptr,
-      /*EnvVar=*/nullptr,
-      /*LongOptionsUseDoubleDash=*/true);
-
-  if (input.empty())
-    fatal("", "input filename is not specified");
-  if (output.empty())
-    fatal("", "output directory is not specified");
-  ErrorOr<std::unique_ptr<MemoryBuffer>> bufferOrErr =
-      MemoryBuffer::getFileOrSTDIN(input);
-  if (std::error_code ec = bufferOrErr.getError())
-    fatal(input, ec.message());
-
-  // Delete output if it is a file or an empty directory, so that we can create
-  // a directory.
-  sys::fs::file_status status;
-  if (std::error_code ec = sys::fs::status(output, status))
-    if (ec.value() != static_cast<int>(std::errc::no_such_file_or_directory))
-      fatal(output, ec.message());
-  if (status.type() != sys::fs::file_type::file_not_found &&
-      status.type() != sys::fs::file_type::directory_file &&
-      status.type() != sys::fs::file_type::regular_file)
-    fatal(output, "output cannot be a special file");
-  if (std::error_code ec = sys::fs::remove(output, /*IgnoreNonExisting=*/true))
-    if (ec.value() != static_cast<int>(std::errc::directory_not_empty) &&
-        ec.value() != static_cast<int>(std::errc::file_exists))
-      fatal(output, ec.message());
-  return handle(**bufferOrErr, input);
-}
diff --git a/gnu/llvm/llvm/unittests/ADT/APFixedPointTest.cpp b/gnu/llvm/llvm/unittests/ADT/APFixedPointTest.cpp
deleted file mode 100644
index 53fa1cd8b50..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/APFixedPointTest.cpp
+++ /dev/null
@@ -1,924 +0,0 @@
-//===- unittests/ADT/FixedPointTest.cpp -- fixed point number tests -----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/APFixedPoint.h"
-#include "llvm/ADT/APFloat.h"
-#include "llvm/ADT/APSInt.h"
-#include "gtest/gtest.h"
-
-using llvm::APFixedPoint;
-using llvm::APFloat;
-using llvm::APInt;
-using llvm::APSInt;
-using llvm::FixedPointSemantics;
-
-namespace {
-
-FixedPointSemantics Saturated(FixedPointSemantics Sema) {
-  Sema.setSaturated(true);
-  return Sema;
-}
-
-FixedPointSemantics getSAccumSema() {
-  return FixedPointSemantics(/*width=*/16, /*scale=*/7, /*isSigned=*/true,
-                             /*isSaturated=*/false,
-                             /*hasUnsignedPadding=*/false);
-}
-
-FixedPointSemantics getAccumSema() {
-  return FixedPointSemantics(/*width=*/32, /*scale=*/15, /*isSigned=*/true,
-                             /*isSaturated=*/false,
-                             /*hasUnsignedPadding=*/false);
-}
-
-FixedPointSemantics getLAccumSema() {
-  return FixedPointSemantics(/*width=*/64, /*scale=*/31, /*isSigned=*/true,
-                             /*isSaturated=*/false,
-                             /*hasUnsignedPadding=*/false);
-}
-
-FixedPointSemantics getSFractSema() {
-  return FixedPointSemantics(/*width=*/8, /*scale=*/7, /*isSigned=*/true,
-                             /*isSaturated=*/false,
-                             /*hasUnsignedPadding=*/false);
-}
-
-FixedPointSemantics getFractSema() {
-  return FixedPointSemantics(/*width=*/16, /*scale=*/15, /*isSigned=*/true,
-                             /*isSaturated=*/false,
-                             /*hasUnsignedPadding=*/false);
-}
-
-FixedPointSemantics getLFractSema() {
-  return FixedPointSemantics(/*width=*/32, /*scale=*/31, /*isSigned=*/true,
-                             /*isSaturated=*/false,
-                             /*hasUnsignedPadding=*/false);
-}
-
-FixedPointSemantics getUSAccumSema() {
-  return FixedPointSemantics(/*width=*/16, /*scale=*/8, /*isSigned=*/false,
-                             /*isSaturated=*/false,
-                             /*hasUnsignedPadding=*/false);
-}
-
-FixedPointSemantics getUAccumSema() {
-  return FixedPointSemantics(/*width=*/32, /*scale=*/16, /*isSigned=*/false,
-                             /*isSaturated=*/false,
-                             /*hasUnsignedPadding=*/false);
-}
-
-FixedPointSemantics getULAccumSema() {
-  return FixedPointSemantics(/*width=*/64, /*scale=*/32, /*isSigned=*/false,
-                             /*isSaturated=*/false,
-                             /*hasUnsignedPadding=*/false);
-}
-
-FixedPointSemantics getUSFractSema() {
-  return FixedPointSemantics(/*width=*/8, /*scale=*/8, /*isSigned=*/false,
-                             /*isSaturated=*/false,
-                             /*hasUnsignedPadding=*/false);
-}
-
-FixedPointSemantics getUFractSema() {
-  return FixedPointSemantics(/*width=*/16, /*scale=*/16, /*isSigned=*/false,
-                             /*isSaturated=*/false,
-                             /*hasUnsignedPadding=*/false);
-}
-
-FixedPointSemantics getULFractSema() {
-  return FixedPointSemantics(/*width=*/32, /*scale=*/32, /*isSigned=*/false,
-                             /*isSaturated=*/false,
-                             /*hasUnsignedPadding=*/false);
-}
-
-FixedPointSemantics getPadUSAccumSema() {
-  return FixedPointSemantics(/*width=*/16, /*scale=*/7, /*isSigned=*/false,
-                             /*isSaturated=*/false,
-                             /*hasUnsignedPadding=*/true);
-}
-
-FixedPointSemantics getPadUAccumSema() {
-  return FixedPointSemantics(/*width=*/32, /*scale=*/15, /*isSigned=*/false,
-                             /*isSaturated=*/false,
-                             /*hasUnsignedPadding=*/true);
-}
-
-FixedPointSemantics getPadULAccumSema() {
-  return FixedPointSemantics(/*width=*/64, /*scale=*/31, /*isSigned=*/false,
-                             /*isSaturated=*/false,
-                             /*hasUnsignedPadding=*/true);
-}
-
-FixedPointSemantics getPadUSFractSema() {
-  return FixedPointSemantics(/*width=*/8, /*scale=*/7, /*isSigned=*/false,
-                             /*isSaturated=*/false,
-                             /*hasUnsignedPadding=*/true);
-}
-
-FixedPointSemantics getPadUFractSema() {
-  return FixedPointSemantics(/*width=*/16, /*scale=*/15, /*isSigned=*/false,
-                             /*isSaturated=*/false,
-                             /*hasUnsignedPadding=*/true);
-}
-
-FixedPointSemantics getPadULFractSema() {
-  return FixedPointSemantics(/*width=*/32, /*scale=*/31, /*isSigned=*/false,
-                             /*isSaturated=*/false,
-                             /*hasUnsignedPadding=*/true);
-}
-
-void CheckUnpaddedMax(const FixedPointSemantics &Sema) {
-  ASSERT_EQ(APFixedPoint::getMax(Sema).getValue(),
-            APSInt::getMaxValue(Sema.getWidth(), !Sema.isSigned()));
-}
-
-void CheckPaddedMax(const FixedPointSemantics &Sema) {
-  ASSERT_EQ(APFixedPoint::getMax(Sema).getValue(),
-            APSInt::getMaxValue(Sema.getWidth(), !Sema.isSigned()) >> 1);
-}
-
-void CheckMin(const FixedPointSemantics &Sema) {
-  ASSERT_EQ(APFixedPoint::getMin(Sema).getValue(),
-            APSInt::getMinValue(Sema.getWidth(), !Sema.isSigned()));
-}
-
-TEST(FixedPointTest, getMax) {
-  CheckUnpaddedMax(getSAccumSema());
-  CheckUnpaddedMax(getAccumSema());
-  CheckUnpaddedMax(getLAccumSema());
-  CheckUnpaddedMax(getUSAccumSema());
-  CheckUnpaddedMax(getUAccumSema());
-  CheckUnpaddedMax(getULAccumSema());
-  CheckUnpaddedMax(getSFractSema());
-  CheckUnpaddedMax(getFractSema());
-  CheckUnpaddedMax(getLFractSema());
-  CheckUnpaddedMax(getUSFractSema());
-  CheckUnpaddedMax(getUFractSema());
-  CheckUnpaddedMax(getULFractSema());
-
-  CheckPaddedMax(getPadUSAccumSema());
-  CheckPaddedMax(getPadUAccumSema());
-  CheckPaddedMax(getPadULAccumSema());
-  CheckPaddedMax(getPadUSFractSema());
-  CheckPaddedMax(getPadUFractSema());
-  CheckPaddedMax(getPadULFractSema());
-}
-
-TEST(FixedPointTest, getMin) {
-  CheckMin(getSAccumSema());
-  CheckMin(getAccumSema());
-  CheckMin(getLAccumSema());
-  CheckMin(getUSAccumSema());
-  CheckMin(getUAccumSema());
-  CheckMin(getULAccumSema());
-  CheckMin(getSFractSema());
-  CheckMin(getFractSema());
-  CheckMin(getLFractSema());
-  CheckMin(getUSFractSema());
-  CheckMin(getUFractSema());
-  CheckMin(getULFractSema());
-
-  CheckMin(getPadUSAccumSema());
-  CheckMin(getPadUAccumSema());
-  CheckMin(getPadULAccumSema());
-  CheckMin(getPadUSFractSema());
-  CheckMin(getPadUFractSema());
-  CheckMin(getPadULFractSema());
-}
-
-void CheckIntPart(const FixedPointSemantics &Sema, int64_t IntPart) {
-  unsigned Scale = Sema.getScale();
-
-  // Value with a fraction
-  APFixedPoint ValWithFract(APInt(Sema.getWidth(),
-                                  (IntPart << Scale) + (1ULL << (Scale - 1)),
-                                  Sema.isSigned()),
-                            Sema);
-  ASSERT_EQ(ValWithFract.getIntPart(), IntPart);
-
-  // Just fraction
-  APFixedPoint JustFract(
-      APInt(Sema.getWidth(), (1ULL << (Scale - 1)), Sema.isSigned()), Sema);
-  ASSERT_EQ(JustFract.getIntPart(), 0);
-
-  // Whole number
-  APFixedPoint WholeNum(
-      APInt(Sema.getWidth(), (IntPart << Scale), Sema.isSigned()), Sema);
-  ASSERT_EQ(WholeNum.getIntPart(), IntPart);
-
-  // Negative
-  if (Sema.isSigned()) {
-    APFixedPoint Negative(
-        APInt(Sema.getWidth(), (IntPart << Scale), Sema.isSigned()), Sema);
-    ASSERT_EQ(Negative.getIntPart(), IntPart);
-  }
-}
-
-void CheckIntPartMin(const FixedPointSemantics &Sema, int64_t Expected) {
-  ASSERT_EQ(APFixedPoint::getMin(Sema).getIntPart(), Expected);
-}
-
-void CheckIntPartMax(const FixedPointSemantics &Sema, uint64_t Expected) {
-  ASSERT_EQ(APFixedPoint::getMax(Sema).getIntPart(), Expected);
-}
-
-TEST(FixedPoint, getIntPart) {
-  // Normal values
-  CheckIntPart(getSAccumSema(), 2);
-  CheckIntPart(getAccumSema(), 2);
-  CheckIntPart(getLAccumSema(), 2);
-  CheckIntPart(getUSAccumSema(), 2);
-  CheckIntPart(getUAccumSema(), 2);
-  CheckIntPart(getULAccumSema(), 2);
-
-  // Zero
-  CheckIntPart(getSAccumSema(), 0);
-  CheckIntPart(getAccumSema(), 0);
-  CheckIntPart(getLAccumSema(), 0);
-  CheckIntPart(getUSAccumSema(), 0);
-  CheckIntPart(getUAccumSema(), 0);
-  CheckIntPart(getULAccumSema(), 0);
-
-  CheckIntPart(getSFractSema(), 0);
-  CheckIntPart(getFractSema(), 0);
-  CheckIntPart(getLFractSema(), 0);
-  CheckIntPart(getUSFractSema(), 0);
-  CheckIntPart(getUFractSema(), 0);
-  CheckIntPart(getULFractSema(), 0);
-
-  // Min
-  CheckIntPartMin(getSAccumSema(), -256);
-  CheckIntPartMin(getAccumSema(), -65536);
-  CheckIntPartMin(getLAccumSema(), -4294967296);
-
-  CheckIntPartMin(getSFractSema(), -1);
-  CheckIntPartMin(getFractSema(), -1);
-  CheckIntPartMin(getLFractSema(), -1);
-
-  // Max
-  CheckIntPartMax(getSAccumSema(), 255);
-  CheckIntPartMax(getAccumSema(), 65535);
-  CheckIntPartMax(getLAccumSema(), 4294967295);
-  CheckIntPartMax(getUSAccumSema(), 255);
-  CheckIntPartMax(getUAccumSema(), 65535);
-  CheckIntPartMax(getULAccumSema(), 4294967295);
-
-  CheckIntPartMax(getSFractSema(), 0);
-  CheckIntPartMax(getFractSema(), 0);
-  CheckIntPartMax(getLFractSema(), 0);
-  CheckIntPartMax(getUSFractSema(), 0);
-  CheckIntPartMax(getUFractSema(), 0);
-  CheckIntPartMax(getULFractSema(), 0);
-
-  // Padded
-  // Normal Values
-  CheckIntPart(getPadUSAccumSema(), 2);
-  CheckIntPart(getPadUAccumSema(), 2);
-  CheckIntPart(getPadULAccumSema(), 2);
-
-  // Zero
-  CheckIntPart(getPadUSAccumSema(), 0);
-  CheckIntPart(getPadUAccumSema(), 0);
-  CheckIntPart(getPadULAccumSema(), 0);
-
-  CheckIntPart(getPadUSFractSema(), 0);
-  CheckIntPart(getPadUFractSema(), 0);
-  CheckIntPart(getPadULFractSema(), 0);
-
-  // Max
-  CheckIntPartMax(getPadUSAccumSema(), 255);
-  CheckIntPartMax(getPadUAccumSema(), 65535);
-  CheckIntPartMax(getPadULAccumSema(), 4294967295);
-
-  CheckIntPartMax(getPadUSFractSema(), 0);
-  CheckIntPartMax(getPadUFractSema(), 0);
-  CheckIntPartMax(getPadULFractSema(), 0);
-}
-
-TEST(FixedPoint, compare) {
-  // Equality
-  // With fractional part (2.5)
-  // Across sizes
-  ASSERT_EQ(APFixedPoint(320, getSAccumSema()),
-            APFixedPoint(81920, getAccumSema()));
-  ASSERT_EQ(APFixedPoint(320, getSAccumSema()),
-            APFixedPoint(5368709120, getLAccumSema()));
-  ASSERT_EQ(APFixedPoint(0, getSAccumSema()), APFixedPoint(0, getLAccumSema()));
-
-  // Across types (0.5)
-  ASSERT_EQ(APFixedPoint(64, getSAccumSema()),
-            APFixedPoint(64, getSFractSema()));
-  ASSERT_EQ(APFixedPoint(16384, getAccumSema()),
-            APFixedPoint(16384, getFractSema()));
-  ASSERT_EQ(APFixedPoint(1073741824, getLAccumSema()),
-            APFixedPoint(1073741824, getLFractSema()));
-
-  // Across widths and types (0.5)
-  ASSERT_EQ(APFixedPoint(64, getSAccumSema()),
-            APFixedPoint(16384, getFractSema()));
-  ASSERT_EQ(APFixedPoint(64, getSAccumSema()),
-            APFixedPoint(1073741824, getLFractSema()));
-
-  // Across saturation
-  ASSERT_EQ(APFixedPoint(320, getSAccumSema()),
-            APFixedPoint(81920, Saturated(getAccumSema())));
-
-  // Across signs
-  ASSERT_EQ(APFixedPoint(320, getSAccumSema()),
-            APFixedPoint(640, getUSAccumSema()));
-  ASSERT_EQ(APFixedPoint(-320, getSAccumSema()),
-            APFixedPoint(-81920, getAccumSema()));
-
-  // Across padding
-  ASSERT_EQ(APFixedPoint(320, getSAccumSema()),
-            APFixedPoint(320, getPadUSAccumSema()));
-  ASSERT_EQ(APFixedPoint(640, getUSAccumSema()),
-            APFixedPoint(320, getPadUSAccumSema()));
-
-  // Less than
-  ASSERT_LT(APFixedPoint(-1, getSAccumSema()), APFixedPoint(0, getAccumSema()));
-  ASSERT_LT(APFixedPoint(-1, getSAccumSema()),
-            APFixedPoint(0, getUAccumSema()));
-  ASSERT_LT(APFixedPoint(0, getSAccumSema()), APFixedPoint(1, getAccumSema()));
-  ASSERT_LT(APFixedPoint(0, getSAccumSema()), APFixedPoint(1, getUAccumSema()));
-  ASSERT_LT(APFixedPoint(0, getUSAccumSema()), APFixedPoint(1, getAccumSema()));
-  ASSERT_LT(APFixedPoint(0, getUSAccumSema()),
-            APFixedPoint(1, getUAccumSema()));
-
-  // Greater than
-  ASSERT_GT(APFixedPoint(0, getAccumSema()), APFixedPoint(-1, getSAccumSema()));
-  ASSERT_GT(APFixedPoint(0, getUAccumSema()),
-            APFixedPoint(-1, getSAccumSema()));
-  ASSERT_GT(APFixedPoint(1, getAccumSema()), APFixedPoint(0, getSAccumSema()));
-  ASSERT_GT(APFixedPoint(1, getUAccumSema()), APFixedPoint(0, getSAccumSema()));
-  ASSERT_GT(APFixedPoint(1, getAccumSema()), APFixedPoint(0, getUSAccumSema()));
-  ASSERT_GT(APFixedPoint(1, getUAccumSema()),
-            APFixedPoint(0, getUSAccumSema()));
-}
-
-// Check that a fixed point value in one sema is the same in another sema
-void CheckUnsaturatedConversion(FixedPointSemantics Src,
-                                FixedPointSemantics Dst, int64_t TestVal) {
-  int64_t ScaledVal = TestVal;
-  bool IsNegative = ScaledVal < 0;
-  if (IsNegative)
-    ScaledVal = -ScaledVal;
-
-  if (Dst.getScale() > Src.getScale()) {
-    ScaledVal <<= (Dst.getScale() - Src.getScale());
-  } else {
-    ScaledVal >>= (Src.getScale() - Dst.getScale());
-  }
-
-  if (IsNegative)
-    ScaledVal = -ScaledVal;
-
-  APFixedPoint Fixed(TestVal, Src);
-  APFixedPoint Expected(ScaledVal, Dst);
-  ASSERT_EQ(Fixed.convert(Dst), Expected);
-}
-
-// Check the value in a given fixed point sema overflows to the saturated min
-// for another sema
-void CheckSaturatedConversionMin(FixedPointSemantics Src,
-                                 FixedPointSemantics Dst, int64_t TestVal) {
-  APFixedPoint Fixed(TestVal, Src);
-  ASSERT_EQ(Fixed.convert(Dst), APFixedPoint::getMin(Dst));
-}
-
-// Check the value in a given fixed point sema overflows to the saturated max
-// for another sema
-void CheckSaturatedConversionMax(FixedPointSemantics Src,
-                                 FixedPointSemantics Dst, int64_t TestVal) {
-  APFixedPoint Fixed(TestVal, Src);
-  ASSERT_EQ(Fixed.convert(Dst), APFixedPoint::getMax(Dst));
-}
-
-// Check one signed _Accum sema converted to other sema for different values.
-void CheckSignedAccumConversionsAgainstOthers(FixedPointSemantics Src,
-                                              int64_t OneVal) {
-  int64_t NormalVal = (OneVal * 2) + (OneVal / 2); // 2.5
-  int64_t HalfVal = (OneVal / 2);                  // 0.5
-
-  // +Accums to Accums
-  CheckUnsaturatedConversion(Src, getSAccumSema(), NormalVal);
-  CheckUnsaturatedConversion(Src, getAccumSema(), NormalVal);
-  CheckUnsaturatedConversion(Src, getLAccumSema(), NormalVal);
-  CheckUnsaturatedConversion(Src, getUSAccumSema(), NormalVal);
-  CheckUnsaturatedConversion(Src, getUAccumSema(), NormalVal);
-  CheckUnsaturatedConversion(Src, getULAccumSema(), NormalVal);
-  CheckUnsaturatedConversion(Src, getPadUSAccumSema(), NormalVal);
-  CheckUnsaturatedConversion(Src, getPadUAccumSema(), NormalVal);
-  CheckUnsaturatedConversion(Src, getPadULAccumSema(), NormalVal);
-
-  // -Accums to Accums
-  CheckUnsaturatedConversion(Src, getSAccumSema(), -NormalVal);
-  CheckUnsaturatedConversion(Src, getAccumSema(), -NormalVal);
-  CheckUnsaturatedConversion(Src, getLAccumSema(), -NormalVal);
-  CheckSaturatedConversionMin(Src, Saturated(getUSAccumSema()), -NormalVal);
-  CheckSaturatedConversionMin(Src, Saturated(getUAccumSema()), -NormalVal);
-  CheckSaturatedConversionMin(Src, Saturated(getULAccumSema()), -NormalVal);
-  CheckSaturatedConversionMin(Src, Saturated(getPadUSAccumSema()), -NormalVal);
-  CheckSaturatedConversionMin(Src, Saturated(getPadUAccumSema()), -NormalVal);
-  CheckSaturatedConversionMin(Src, Saturated(getPadULAccumSema()), -NormalVal);
-
-  // +Accums to Fracts
-  CheckUnsaturatedConversion(Src, getSFractSema(), HalfVal);
-  CheckUnsaturatedConversion(Src, getFractSema(), HalfVal);
-  CheckUnsaturatedConversion(Src, getLFractSema(), HalfVal);
-  CheckUnsaturatedConversion(Src, getUSFractSema(), HalfVal);
-  CheckUnsaturatedConversion(Src, getUFractSema(), HalfVal);
-  CheckUnsaturatedConversion(Src, getULFractSema(), HalfVal);
-  CheckUnsaturatedConversion(Src, getPadUSFractSema(), HalfVal);
-  CheckUnsaturatedConversion(Src, getPadUFractSema(), HalfVal);
-  CheckUnsaturatedConversion(Src, getPadULFractSema(), HalfVal);
-
-  // -Accums to Fracts
-  CheckUnsaturatedConversion(Src, getSFractSema(), -HalfVal);
-  CheckUnsaturatedConversion(Src, getFractSema(), -HalfVal);
-  CheckUnsaturatedConversion(Src, getLFractSema(), -HalfVal);
-  CheckSaturatedConversionMin(Src, Saturated(getUSFractSema()), -HalfVal);
-  CheckSaturatedConversionMin(Src, Saturated(getUFractSema()), -HalfVal);
-  CheckSaturatedConversionMin(Src, Saturated(getULFractSema()), -HalfVal);
-  CheckSaturatedConversionMin(Src, Saturated(getPadUSFractSema()), -HalfVal);
-  CheckSaturatedConversionMin(Src, Saturated(getPadUFractSema()), -HalfVal);
-  CheckSaturatedConversionMin(Src, Saturated(getPadULFractSema()), -HalfVal);
-
-  // 0 to Accums
-  CheckUnsaturatedConversion(Src, getSAccumSema(), 0);
-  CheckUnsaturatedConversion(Src, getAccumSema(), 0);
-  CheckUnsaturatedConversion(Src, getLAccumSema(), 0);
-  CheckUnsaturatedConversion(Src, getUSAccumSema(), 0);
-  CheckUnsaturatedConversion(Src, getUAccumSema(), 0);
-  CheckUnsaturatedConversion(Src, getULAccumSema(), 0);
-  CheckUnsaturatedConversion(Src, getPadUSAccumSema(), 0);
-  CheckUnsaturatedConversion(Src, getPadUAccumSema(), 0);
-  CheckUnsaturatedConversion(Src, getPadULAccumSema(), 0);
-
-  // 0 to Fracts
-  CheckUnsaturatedConversion(Src, getSFractSema(), 0);
-  CheckUnsaturatedConversion(Src, getFractSema(), 0);
-  CheckUnsaturatedConversion(Src, getLFractSema(), 0);
-  CheckUnsaturatedConversion(Src, getUSFractSema(), 0);
-  CheckUnsaturatedConversion(Src, getUFractSema(), 0);
-  CheckUnsaturatedConversion(Src, getULFractSema(), 0);
-  CheckUnsaturatedConversion(Src, getPadUSFractSema(), 0);
-  CheckUnsaturatedConversion(Src, getPadUFractSema(), 0);
-  CheckUnsaturatedConversion(Src, getPadULFractSema(), 0);
-}
-
-// Check one unsigned _Accum sema converted to other sema for different
-// values.
-void CheckUnsignedAccumConversionsAgainstOthers(FixedPointSemantics Src,
-                                                int64_t OneVal) {
-  int64_t NormalVal = (OneVal * 2) + (OneVal / 2); // 2.5
-  int64_t HalfVal = (OneVal / 2);                  // 0.5
-
-  // +UAccums to Accums
-  CheckUnsaturatedConversion(Src, getSAccumSema(), NormalVal);
-  CheckUnsaturatedConversion(Src, getAccumSema(), NormalVal);
-  CheckUnsaturatedConversion(Src, getLAccumSema(), NormalVal);
-  CheckUnsaturatedConversion(Src, getUSAccumSema(), NormalVal);
-  CheckUnsaturatedConversion(Src, getUAccumSema(), NormalVal);
-  CheckUnsaturatedConversion(Src, getULAccumSema(), NormalVal);
-  CheckUnsaturatedConversion(Src, getPadUSAccumSema(), NormalVal);
-  CheckUnsaturatedConversion(Src, getPadUAccumSema(), NormalVal);
-  CheckUnsaturatedConversion(Src, getPadULAccumSema(), NormalVal);
-
-  // +UAccums to Fracts
-  CheckUnsaturatedConversion(Src, getSFractSema(), HalfVal);
-  CheckUnsaturatedConversion(Src, getFractSema(), HalfVal);
-  CheckUnsaturatedConversion(Src, getLFractSema(), HalfVal);
-  CheckUnsaturatedConversion(Src, getUSFractSema(), HalfVal);
-  CheckUnsaturatedConversion(Src, getUFractSema(), HalfVal);
-  CheckUnsaturatedConversion(Src, getULFractSema(), HalfVal);
-  CheckUnsaturatedConversion(Src, getPadUSFractSema(), HalfVal);
-  CheckUnsaturatedConversion(Src, getPadUFractSema(), HalfVal);
-  CheckUnsaturatedConversion(Src, getPadULFractSema(), HalfVal);
-}
-
-TEST(FixedPoint, AccumConversions) {
-  // Normal conversions
-  CheckSignedAccumConversionsAgainstOthers(getSAccumSema(), 128);
-  CheckUnsignedAccumConversionsAgainstOthers(getUSAccumSema(), 256);
-  CheckSignedAccumConversionsAgainstOthers(getAccumSema(), 32768);
-  CheckUnsignedAccumConversionsAgainstOthers(getUAccumSema(), 65536);
-  CheckSignedAccumConversionsAgainstOthers(getLAccumSema(), 2147483648);
-  CheckUnsignedAccumConversionsAgainstOthers(getULAccumSema(), 4294967296);
-
-  CheckUnsignedAccumConversionsAgainstOthers(getPadUSAccumSema(), 128);
-  CheckUnsignedAccumConversionsAgainstOthers(getPadUAccumSema(), 32768);
-  CheckUnsignedAccumConversionsAgainstOthers(getPadULAccumSema(), 2147483648);
-}
-
-TEST(FixedPoint, AccumConversionOverflow) {
-  // To SAccum max limit (65536)
-  CheckSaturatedConversionMax(getLAccumSema(), Saturated(getAccumSema()),
-                              140737488355328);
-  CheckSaturatedConversionMax(getLAccumSema(), Saturated(getUAccumSema()),
-                              140737488355328);
-  CheckSaturatedConversionMax(getLAccumSema(), Saturated(getPadUAccumSema()),
-                              140737488355328);
-  CheckSaturatedConversionMax(getULAccumSema(), Saturated(getAccumSema()),
-                              281474976710656);
-  CheckSaturatedConversionMax(getULAccumSema(), Saturated(getUAccumSema()),
-                              281474976710656);
-  CheckSaturatedConversionMax(getULAccumSema(), Saturated(getPadUAccumSema()),
-                              281474976710656);
-
-  CheckSaturatedConversionMax(getPadULAccumSema(), Saturated(getAccumSema()),
-                              140737488355328);
-  CheckSaturatedConversionMax(getPadULAccumSema(), Saturated(getUAccumSema()),
-                              140737488355328);
-  CheckSaturatedConversionMax(getPadULAccumSema(),
-                              Saturated(getPadUAccumSema()), 140737488355328);
-
-  // To SAccum min limit (-65536)
-  CheckSaturatedConversionMin(getLAccumSema(), Saturated(getAccumSema()),
-                              -140737488355328);
-  CheckSaturatedConversionMin(getLAccumSema(), Saturated(getUAccumSema()),
-                              -140737488355328);
-  CheckSaturatedConversionMin(getLAccumSema(), Saturated(getPadUAccumSema()),
-                              -140737488355328);
-}
-
-TEST(FixedPoint, SAccumConversionOverflow) {
-  // To SAccum max limit (256)
-  CheckSaturatedConversionMax(getAccumSema(), Saturated(getSAccumSema()),
-                              8388608);
-  CheckSaturatedConversionMax(getAccumSema(), Saturated(getUSAccumSema()),
-                              8388608);
-  CheckSaturatedConversionMax(getAccumSema(), Saturated(getPadUSAccumSema()),
-                              8388608);
-  CheckSaturatedConversionMax(getUAccumSema(), Saturated(getSAccumSema()),
-                              16777216);
-  CheckSaturatedConversionMax(getUAccumSema(), Saturated(getUSAccumSema()),
-                              16777216);
-  CheckSaturatedConversionMax(getUAccumSema(), Saturated(getPadUSAccumSema()),
-                              16777216);
-  CheckSaturatedConversionMax(getLAccumSema(), Saturated(getSAccumSema()),
-                              549755813888);
-  CheckSaturatedConversionMax(getLAccumSema(), Saturated(getUSAccumSema()),
-                              549755813888);
-  CheckSaturatedConversionMax(getLAccumSema(), Saturated(getPadUSAccumSema()),
-                              549755813888);
-  CheckSaturatedConversionMax(getULAccumSema(), Saturated(getSAccumSema()),
-                              1099511627776);
-  CheckSaturatedConversionMax(getULAccumSema(), Saturated(getUSAccumSema()),
-                              1099511627776);
-  CheckSaturatedConversionMax(getULAccumSema(), Saturated(getPadUSAccumSema()),
-                              1099511627776);
-
-  CheckSaturatedConversionMax(getPadUAccumSema(), Saturated(getSAccumSema()),
-                              8388608);
-  CheckSaturatedConversionMax(getPadUAccumSema(), Saturated(getUSAccumSema()),
-                              8388608);
-  CheckSaturatedConversionMax(getPadUAccumSema(),
-                              Saturated(getPadUSAccumSema()), 8388608);
-  CheckSaturatedConversionMax(getPadULAccumSema(), Saturated(getSAccumSema()),
-                              549755813888);
-  CheckSaturatedConversionMax(getPadULAccumSema(), Saturated(getUSAccumSema()),
-                              549755813888);
-  CheckSaturatedConversionMax(getPadULAccumSema(),
-                              Saturated(getPadUSAccumSema()), 549755813888);
-
-  // To SAccum min limit (-256)
-  CheckSaturatedConversionMin(getAccumSema(), Saturated(getSAccumSema()),
-                              -8388608);
-  CheckSaturatedConversionMin(getAccumSema(), Saturated(getUSAccumSema()),
-                              -8388608);
-  CheckSaturatedConversionMin(getAccumSema(), Saturated(getPadUSAccumSema()),
-                              -8388608);
-  CheckSaturatedConversionMin(getLAccumSema(), Saturated(getSAccumSema()),
-                              -549755813888);
-  CheckSaturatedConversionMin(getLAccumSema(), Saturated(getUSAccumSema()),
-                              -549755813888);
-  CheckSaturatedConversionMin(getLAccumSema(), Saturated(getPadUSAccumSema()),
-                              -549755813888);
-}
-
-TEST(FixedPoint, GetValueSignAfterConversion) {
-  APFixedPoint Fixed(255 << 7, getSAccumSema());
-  ASSERT_TRUE(Fixed.getValue().isSigned());
-  APFixedPoint UFixed = Fixed.convert(getUSAccumSema());
-  ASSERT_TRUE(UFixed.getValue().isUnsigned());
-  ASSERT_EQ(UFixed.getValue(), APSInt::getUnsigned(255 << 8).extOrTrunc(16));
-}
-
-TEST(FixedPoint, ModularWrapAround) {
-  // Positive to negative
-  APFixedPoint Val = APFixedPoint(1ULL << 7, getSAccumSema());
-  ASSERT_EQ(Val.convert(getLFractSema()).getValue(), -(1ULL << 31));
-
-  Val = APFixedPoint(1ULL << 23, getAccumSema());
-  ASSERT_EQ(Val.convert(getSAccumSema()).getValue(), -(1ULL << 15));
-
-  Val = APFixedPoint(1ULL << 47, getLAccumSema());
-  ASSERT_EQ(Val.convert(getAccumSema()).getValue(), -(1ULL << 31));
-
-  // Negative to positive
-  Val = APFixedPoint(/*-1.5*/ -192, getSAccumSema());
-  ASSERT_EQ(Val.convert(getLFractSema()).getValue(), 1ULL << 30);
-
-  Val = APFixedPoint(-(257 << 15), getAccumSema());
-  ASSERT_EQ(Val.convert(getSAccumSema()).getValue(), 255 << 7);
-
-  Val = APFixedPoint(-(65537ULL << 31), getLAccumSema());
-  ASSERT_EQ(Val.convert(getAccumSema()).getValue(), 65535 << 15);
-
-  // Signed to unsigned
-  Val = APFixedPoint(-(1 << 7), getSAccumSema());
-  ASSERT_EQ(Val.convert(getUSAccumSema()).getValue(), 255 << 8);
-
-  Val = APFixedPoint(-(1 << 15), getAccumSema());
-  ASSERT_EQ(Val.convert(getUAccumSema()).getValue(), 65535ULL << 16);
-
-  Val = APFixedPoint(-(1ULL << 31), getLAccumSema());
-  ASSERT_EQ(Val.convert(getULAccumSema()).getValue().getZExtValue(),
-            4294967295ULL << 32);
-}
-
-enum OvfKind { MinSat, MaxSat };
-
-void CheckFloatToFixedConversion(APFloat &Val, const FixedPointSemantics &Sema,
-                                 int64_t ExpectedNonSat) {
-  bool Ovf;
-  ASSERT_EQ(APFixedPoint::getFromFloatValue(Val, Sema, &Ovf).getValue(),
-            ExpectedNonSat);
-  ASSERT_EQ(Ovf, false);
-  ASSERT_EQ(
-      APFixedPoint::getFromFloatValue(Val, Saturated(Sema), &Ovf).getValue(),
-      ExpectedNonSat);
-  ASSERT_EQ(Ovf, false);
-}
-
-void CheckFloatToFixedConversion(APFloat &Val, const FixedPointSemantics &Sema,
-                                 OvfKind ExpectedOvf) {
-  bool Ovf;
-  (void)APFixedPoint::getFromFloatValue(Val, Sema, &Ovf);
-  ASSERT_EQ(Ovf, true);
-  ASSERT_EQ(
-      APFixedPoint::getFromFloatValue(Val, Saturated(Sema), &Ovf).getValue(),
-      (ExpectedOvf == MinSat ? APFixedPoint::getMin(Sema)
-                             : APFixedPoint::getMax(Sema))
-          .getValue());
-  ASSERT_EQ(Ovf, false);
-}
-
-TEST(FixedPoint, FloatToFixed) {
-  APFloat Val(0.0f);
-
-  // Simple exact fraction
-  Val = APFloat(0.75f);
-  CheckFloatToFixedConversion(Val, getSAccumSema(), 3ULL << 5);
-  CheckFloatToFixedConversion(Val, getAccumSema(),  3ULL << 13);
-  CheckFloatToFixedConversion(Val, getLAccumSema(), 3ULL << 29);
-
-  CheckFloatToFixedConversion(Val, getUSAccumSema(), 3ULL << 6);
-  CheckFloatToFixedConversion(Val, getUAccumSema(),  3ULL << 14);
-  CheckFloatToFixedConversion(Val, getULAccumSema(), 3ULL << 30);
-
-  CheckFloatToFixedConversion(Val, getSFractSema(), 3ULL << 5);
-  CheckFloatToFixedConversion(Val, getFractSema(),  3ULL << 13);
-  CheckFloatToFixedConversion(Val, getLFractSema(), 3ULL << 29);
-
-  CheckFloatToFixedConversion(Val, getUSFractSema(), 3ULL << 6);
-  CheckFloatToFixedConversion(Val, getUFractSema(),  3ULL << 14);
-  CheckFloatToFixedConversion(Val, getULFractSema(), 3ULL << 30);
-
-  // Simple negative exact fraction
-  Val = APFloat(-0.75f);
-  CheckFloatToFixedConversion(Val, getSAccumSema(), -3ULL << 5);
-  CheckFloatToFixedConversion(Val, getAccumSema(),  -3ULL << 13);
-  CheckFloatToFixedConversion(Val, getLAccumSema(), -3ULL << 29);
-
-  CheckFloatToFixedConversion(Val, getUSAccumSema(), MinSat);
-  CheckFloatToFixedConversion(Val, getUAccumSema(),  MinSat);
-  CheckFloatToFixedConversion(Val, getULAccumSema(), MinSat);
-
-  CheckFloatToFixedConversion(Val, getSFractSema(), -3ULL << 5);
-  CheckFloatToFixedConversion(Val, getFractSema(),  -3ULL << 13);
-  CheckFloatToFixedConversion(Val, getLFractSema(), -3ULL << 29);
-
-  CheckFloatToFixedConversion(Val, getUSFractSema(), MinSat);
-  CheckFloatToFixedConversion(Val, getUFractSema(),  MinSat);
-  CheckFloatToFixedConversion(Val, getULFractSema(), MinSat);
-
-  // Highly precise fraction
-  Val = APFloat(0.999999940395355224609375f);
-  CheckFloatToFixedConversion(Val, getSAccumSema(), 0x7FULL);
-  CheckFloatToFixedConversion(Val, getAccumSema(),  0x7FFFULL);
-  CheckFloatToFixedConversion(Val, getLAccumSema(), 0xFFFFFFULL << 7);
-
-  CheckFloatToFixedConversion(Val, getUSAccumSema(), 0xFFULL);
-  CheckFloatToFixedConversion(Val, getUAccumSema(),  0xFFFFULL);
-  CheckFloatToFixedConversion(Val, getULAccumSema(), 0xFFFFFFULL << 8);
-
-  CheckFloatToFixedConversion(Val, getSFractSema(), 0x7FULL);
-  CheckFloatToFixedConversion(Val, getFractSema(),  0x7FFFULL);
-  CheckFloatToFixedConversion(Val, getLFractSema(), 0xFFFFFFULL << 7);
-
-  CheckFloatToFixedConversion(Val, getUSFractSema(), 0xFFULL);
-  CheckFloatToFixedConversion(Val, getUFractSema(),  0xFFFFULL);
-  CheckFloatToFixedConversion(Val, getULFractSema(), 0xFFFFFFULL << 8);
-
-  // Integral and fraction
-  Val = APFloat(17.99609375f);
-  CheckFloatToFixedConversion(Val, getSAccumSema(), 0x11FFULL >> 1);
-  CheckFloatToFixedConversion(Val, getAccumSema(),  0x11FFULL << 7);
-  CheckFloatToFixedConversion(Val, getLAccumSema(), 0x11FFULL << 23);
-
-  CheckFloatToFixedConversion(Val, getUSAccumSema(), 0x11FFULL);
-  CheckFloatToFixedConversion(Val, getUAccumSema(),  0x11FFULL << 8);
-  CheckFloatToFixedConversion(Val, getULAccumSema(), 0x11FFULL << 24);
-
-  CheckFloatToFixedConversion(Val, getSFractSema(), MaxSat);
-  CheckFloatToFixedConversion(Val, getFractSema(),  MaxSat);
-  CheckFloatToFixedConversion(Val, getLFractSema(), MaxSat);
-
-  CheckFloatToFixedConversion(Val, getUSFractSema(), MaxSat);
-  CheckFloatToFixedConversion(Val, getUFractSema(),  MaxSat);
-  CheckFloatToFixedConversion(Val, getULFractSema(), MaxSat);
-
-  // Negative integral and fraction
-  Val = APFloat(-17.99609375f);
-  CheckFloatToFixedConversion(Val, getSAccumSema(), -0x11FELL >> 1);
-  CheckFloatToFixedConversion(Val, getAccumSema(),  -0x11FFULL << 7);
-  CheckFloatToFixedConversion(Val, getLAccumSema(), -0x11FFULL << 23);
-
-  CheckFloatToFixedConversion(Val, getUSAccumSema(), MinSat);
-  CheckFloatToFixedConversion(Val, getUAccumSema(),  MinSat);
-  CheckFloatToFixedConversion(Val, getULAccumSema(), MinSat);
-
-  CheckFloatToFixedConversion(Val, getSFractSema(), MinSat);
-  CheckFloatToFixedConversion(Val, getFractSema(),  MinSat);
-  CheckFloatToFixedConversion(Val, getLFractSema(), MinSat);
-
-  CheckFloatToFixedConversion(Val, getUSFractSema(), MinSat);
-  CheckFloatToFixedConversion(Val, getUFractSema(),  MinSat);
-  CheckFloatToFixedConversion(Val, getULFractSema(), MinSat);
-
-  // Very large value
-  Val = APFloat(1.0e38f);
-  CheckFloatToFixedConversion(Val, getSAccumSema(), MaxSat);
-  CheckFloatToFixedConversion(Val, getAccumSema(),  MaxSat);
-  CheckFloatToFixedConversion(Val, getLAccumSema(), MaxSat);
-
-  CheckFloatToFixedConversion(Val, getUSAccumSema(), MaxSat);
-  CheckFloatToFixedConversion(Val, getUAccumSema(),  MaxSat);
-  CheckFloatToFixedConversion(Val, getULAccumSema(), MaxSat);
-
-  CheckFloatToFixedConversion(Val, getSFractSema(), MaxSat);
-  CheckFloatToFixedConversion(Val, getFractSema(),  MaxSat);
-  CheckFloatToFixedConversion(Val, getLFractSema(), MaxSat);
-
-  CheckFloatToFixedConversion(Val, getUSFractSema(), MaxSat);
-  CheckFloatToFixedConversion(Val, getUFractSema(),  MaxSat);
-  CheckFloatToFixedConversion(Val, getULFractSema(), MaxSat);
-
-  // Very small value
-  Val = APFloat(1.0e-38f);
-  CheckFloatToFixedConversion(Val, getSAccumSema(), 0);
-  CheckFloatToFixedConversion(Val, getAccumSema(),  0);
-  CheckFloatToFixedConversion(Val, getLAccumSema(), 0);
-
-  CheckFloatToFixedConversion(Val, getUSAccumSema(), 0);
-  CheckFloatToFixedConversion(Val, getUAccumSema(),  0);
-  CheckFloatToFixedConversion(Val, getULAccumSema(), 0);
-
-  CheckFloatToFixedConversion(Val, getSFractSema(), 0);
-  CheckFloatToFixedConversion(Val, getFractSema(),  0);
-  CheckFloatToFixedConversion(Val, getLFractSema(), 0);
-
-  CheckFloatToFixedConversion(Val, getUSFractSema(), 0);
-  CheckFloatToFixedConversion(Val, getUFractSema(),  0);
-  CheckFloatToFixedConversion(Val, getULFractSema(), 0);
-
-  // Half conversion
-  Val = APFloat(0.99951171875f);
-  bool Ignored;
-  Val.convert(APFloat::IEEEhalf(), APFloat::rmNearestTiesToEven, &Ignored);
-
-  CheckFloatToFixedConversion(Val, getSAccumSema(), 0x7FULL);
-  CheckFloatToFixedConversion(Val, getAccumSema(),  0x7FFULL << 4);
-  CheckFloatToFixedConversion(Val, getLAccumSema(), 0x7FFULL << 20);
-
-  CheckFloatToFixedConversion(Val, getUSAccumSema(), 0xFFULL);
-  CheckFloatToFixedConversion(Val, getUAccumSema(),  0xFFEULL << 4);
-  CheckFloatToFixedConversion(Val, getULAccumSema(), 0xFFEULL << 20);
-
-  CheckFloatToFixedConversion(Val, getSFractSema(), 0x7FULL);
-  CheckFloatToFixedConversion(Val, getFractSema(),  0x7FFULL << 4);
-  CheckFloatToFixedConversion(Val, getLFractSema(), 0x7FFULL << 20);
-
-  CheckFloatToFixedConversion(Val, getUSFractSema(), 0xFFULL);
-  CheckFloatToFixedConversion(Val, getUFractSema(),  0xFFEULL << 4);
-  CheckFloatToFixedConversion(Val, getULFractSema(), 0xFFEULL << 20);
-}
-
-void CheckFixedToFloatConversion(int64_t Val, const FixedPointSemantics &Sema,
-                                 float Result) {
-  APFixedPoint FXVal(Val, Sema);
-  APFloat APRes(Result);
-  ASSERT_EQ(FXVal.convertToFloat(APFloat::IEEEsingle()), APRes);
-}
-
-void CheckFixedToHalfConversion(int64_t Val, const FixedPointSemantics &Sema,
-                                float Result) {
-  APFixedPoint FXVal(Val, Sema);
-  APFloat APRes(Result);
-  bool Ignored;
-  APRes.convert(APFloat::IEEEhalf(), APFloat::rmNearestTiesToEven, &Ignored);
-  ASSERT_EQ(FXVal.convertToFloat(APFloat::IEEEhalf()), APRes);
-}
-
-TEST(FixedPoint, FixedToFloat) {
-  int64_t Val = 0x1ULL;
-  CheckFixedToFloatConversion(Val, getSAccumSema(), 0.0078125f);
-  CheckFixedToFloatConversion(Val, getFractSema(),  0.000030517578125f);
-  CheckFixedToFloatConversion(Val, getAccumSema(),  0.000030517578125f);
-  CheckFixedToFloatConversion(Val, getLFractSema(),
-                              0.0000000004656612873077392578125f);
-
-  CheckFixedToFloatConversion(Val, getUSAccumSema(), 0.00390625f);
-  CheckFixedToFloatConversion(Val, getUFractSema(),  0.0000152587890625f);
-  CheckFixedToFloatConversion(Val, getUAccumSema(),  0.0000152587890625f);
-  CheckFixedToFloatConversion(Val, getULFractSema(),
-                              0.00000000023283064365386962890625f);
-
-  Val = 0x7FULL;
-  CheckFixedToFloatConversion(Val, getSAccumSema(), 0.9921875f);
-  CheckFixedToFloatConversion(Val, getFractSema(),  0.003875732421875f);
-  CheckFixedToFloatConversion(Val, getAccumSema(),  0.003875732421875f);
-  CheckFixedToFloatConversion(Val, getLFractSema(),
-                              0.0000000591389834880828857421875f);
-
-  CheckFixedToFloatConversion(Val, getUSAccumSema(), 0.49609375f);
-  CheckFixedToFloatConversion(Val, getUFractSema(),  0.0019378662109375f);
-  CheckFixedToFloatConversion(Val, getUAccumSema(),  0.0019378662109375f);
-  CheckFixedToFloatConversion(Val, getULFractSema(),
-                              0.00000002956949174404144287109375f);
-
-  Val = -0x1ULL;
-  CheckFixedToFloatConversion(Val, getSAccumSema(), -0.0078125f);
-  CheckFixedToFloatConversion(Val, getFractSema(),  -0.000030517578125f);
-  CheckFixedToFloatConversion(Val, getAccumSema(),  -0.000030517578125f);
-  CheckFixedToFloatConversion(Val, getLFractSema(),
-                              -0.0000000004656612873077392578125f);
-
-
-  CheckFixedToFloatConversion(-0x80ULL,       getSAccumSema(), -1.0f);
-  CheckFixedToFloatConversion(-0x8000ULL,     getFractSema(),  -1.0f);
-  CheckFixedToFloatConversion(-0x8000ULL,     getAccumSema(),  -1.0f);
-  CheckFixedToFloatConversion(-0x80000000ULL, getLFractSema(), -1.0f);
-
-  Val = 0xAFAULL;
-  CheckFixedToFloatConversion(Val, getSAccumSema(), 21.953125f);
-  CheckFixedToFloatConversion(Val, getFractSema(),  0.08575439453125f);
-  CheckFixedToFloatConversion(Val, getAccumSema(),  0.08575439453125f);
-  CheckFixedToFloatConversion(Val, getLFractSema(),
-                              0.000001308508217334747314453125f);
-
-  CheckFixedToFloatConversion(Val, getUSAccumSema(), 10.9765625f);
-  CheckFixedToFloatConversion(Val, getUFractSema(),  0.042877197265625f);
-  CheckFixedToFloatConversion(Val, getUAccumSema(),  0.042877197265625f);
-  CheckFixedToFloatConversion(Val, getULFractSema(),
-                              0.0000006542541086673736572265625f);
-
-  Val = -0xAFAULL;
-  CheckFixedToFloatConversion(Val, getSAccumSema(), -21.953125f);
-  CheckFixedToFloatConversion(Val, getFractSema(),  -0.08575439453125f);
-  CheckFixedToFloatConversion(Val, getAccumSema(),  -0.08575439453125f);
-  CheckFixedToFloatConversion(Val, getLFractSema(),
-                              -0.000001308508217334747314453125f);
-
-  Val = 0x40000080ULL;
-  CheckFixedToFloatConversion(Val, getAccumSema(),  32768.00390625f);
-  CheckFixedToFloatConversion(Val, getLFractSema(),
-                              0.500000059604644775390625f);
-
-  CheckFixedToFloatConversion(Val, getUAccumSema(),  16384.001953125f);
-  CheckFixedToFloatConversion(Val, getULFractSema(),
-                              0.2500000298023223876953125f);
-
-  Val = 0x40000040ULL;
-  CheckFixedToFloatConversion(Val, getAccumSema(),  32768.0f);
-  CheckFixedToFloatConversion(Val, getLFractSema(), 0.5f);
-
-  CheckFixedToFloatConversion(Val, getUAccumSema(),  16384.0f);
-  CheckFixedToFloatConversion(Val, getULFractSema(), 0.25f);
-
-  Val = 0x7FF0ULL;
-  CheckFixedToHalfConversion(Val, getAccumSema(), 0.99951171875f);
-  CheckFixedToHalfConversion(Val, getLFractSema(), 0.000015251338481903076171875f);
-
-  CheckFixedToHalfConversion(Val, getUAccumSema(), 0.499755859375f);
-  CheckFixedToHalfConversion(Val, getULFractSema(), 0.0000076256692409515380859375f);
-}
-
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/APFloatTest.cpp b/gnu/llvm/llvm/unittests/ADT/APFloatTest.cpp
deleted file mode 100644
index 1683a9d6717..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/APFloatTest.cpp
+++ /dev/null
@@ -1,4969 +0,0 @@
-//===- llvm/unittest/ADT/APFloat.cpp - APFloat unit tests ---------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/APFloat.h"
-#include "llvm/ADT/APSInt.h"
-#include "llvm/ADT/Hashing.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/Support/Error.h"
-#include "llvm/Support/FormatVariadic.h"
-#include "gtest/gtest.h"
-#include <cmath>
-#include <ostream>
-#include <string>
-#include <tuple>
-
-using namespace llvm;
-
-static std::string convertToErrorFromString(StringRef Str) {
-  llvm::APFloat F(0.0);
-  auto StatusOrErr =
-      F.convertFromString(Str, llvm::APFloat::rmNearestTiesToEven);
-  EXPECT_TRUE(!StatusOrErr);
-  return toString(StatusOrErr.takeError());
-}
-
-static double convertToDoubleFromString(StringRef Str) {
-  llvm::APFloat F(0.0);
-  auto StatusOrErr =
-      F.convertFromString(Str, llvm::APFloat::rmNearestTiesToEven);
-  EXPECT_FALSE(!StatusOrErr);
-  consumeError(StatusOrErr.takeError());
-  return F.convertToDouble();
-}
-
-static std::string convertToString(double d, unsigned Prec, unsigned Pad,
-                                   bool Tr = true) {
-  llvm::SmallVector<char, 100> Buffer;
-  llvm::APFloat F(d);
-  F.toString(Buffer, Prec, Pad, Tr);
-  return std::string(Buffer.data(), Buffer.size());
-}
-
-namespace {
-
-TEST(APFloatTest, isSignaling) {
-  // We test qNaN, -qNaN, +sNaN, -sNaN with and without payloads. *NOTE* The
-  // positive/negative distinction is included only since the getQNaN/getSNaN
-  // API provides the option.
-  APInt payload = APInt::getOneBitSet(4, 2);
-  EXPECT_FALSE(APFloat::getQNaN(APFloat::IEEEsingle(), false).isSignaling());
-  EXPECT_FALSE(APFloat::getQNaN(APFloat::IEEEsingle(), true).isSignaling());
-  EXPECT_FALSE(APFloat::getQNaN(APFloat::IEEEsingle(), false, &payload).isSignaling());
-  EXPECT_FALSE(APFloat::getQNaN(APFloat::IEEEsingle(), true, &payload).isSignaling());
-  EXPECT_TRUE(APFloat::getSNaN(APFloat::IEEEsingle(), false).isSignaling());
-  EXPECT_TRUE(APFloat::getSNaN(APFloat::IEEEsingle(), true).isSignaling());
-  EXPECT_TRUE(APFloat::getSNaN(APFloat::IEEEsingle(), false, &payload).isSignaling());
-  EXPECT_TRUE(APFloat::getSNaN(APFloat::IEEEsingle(), true, &payload).isSignaling());
-}
-
-TEST(APFloatTest, next) {
-
-  APFloat test(APFloat::IEEEquad(), APFloat::uninitialized);
-  APFloat expected(APFloat::IEEEquad(), APFloat::uninitialized);
-
-  // 1. Test Special Cases Values.
-  //
-  // Test all special values for nextUp and nextDown perscribed by IEEE-754R
-  // 2008. These are:
-  //   1.  +inf
-  //   2.  -inf
-  //   3.  getLargest()
-  //   4.  -getLargest()
-  //   5.  getSmallest()
-  //   6.  -getSmallest()
-  //   7.  qNaN
-  //   8.  sNaN
-  //   9.  +0
-  //   10. -0
-
-  // nextUp(+inf) = +inf.
-  test = APFloat::getInf(APFloat::IEEEquad(), false);
-  expected = APFloat::getInf(APFloat::IEEEquad(), false);
-  EXPECT_EQ(test.next(false), APFloat::opOK);
-  EXPECT_TRUE(test.isInfinity());
-  EXPECT_TRUE(!test.isNegative());
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextDown(+inf) = -nextUp(-inf) = -(-getLargest()) = getLargest()
-  test = APFloat::getInf(APFloat::IEEEquad(), false);
-  expected = APFloat::getLargest(APFloat::IEEEquad(), false);
-  EXPECT_EQ(test.next(true), APFloat::opOK);
-  EXPECT_TRUE(!test.isNegative());
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextUp(-inf) = -getLargest()
-  test = APFloat::getInf(APFloat::IEEEquad(), true);
-  expected = APFloat::getLargest(APFloat::IEEEquad(), true);
-  EXPECT_EQ(test.next(false), APFloat::opOK);
-  EXPECT_TRUE(test.isNegative());
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextDown(-inf) = -nextUp(+inf) = -(+inf) = -inf.
-  test = APFloat::getInf(APFloat::IEEEquad(), true);
-  expected = APFloat::getInf(APFloat::IEEEquad(), true);
-  EXPECT_EQ(test.next(true), APFloat::opOK);
-  EXPECT_TRUE(test.isInfinity() && test.isNegative());
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextUp(getLargest()) = +inf
-  test = APFloat::getLargest(APFloat::IEEEquad(), false);
-  expected = APFloat::getInf(APFloat::IEEEquad(), false);
-  EXPECT_EQ(test.next(false), APFloat::opOK);
-  EXPECT_TRUE(test.isInfinity() && !test.isNegative());
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextDown(getLargest()) = -nextUp(-getLargest())
-  //                        = -(-getLargest() + inc)
-  //                        = getLargest() - inc.
-  test = APFloat::getLargest(APFloat::IEEEquad(), false);
-  expected = APFloat(APFloat::IEEEquad(),
-                     "0x1.fffffffffffffffffffffffffffep+16383");
-  EXPECT_EQ(test.next(true), APFloat::opOK);
-  EXPECT_TRUE(!test.isInfinity() && !test.isNegative());
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextUp(-getLargest()) = -getLargest() + inc.
-  test = APFloat::getLargest(APFloat::IEEEquad(), true);
-  expected = APFloat(APFloat::IEEEquad(),
-                     "-0x1.fffffffffffffffffffffffffffep+16383");
-  EXPECT_EQ(test.next(false), APFloat::opOK);
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextDown(-getLargest()) = -nextUp(getLargest()) = -(inf) = -inf.
-  test = APFloat::getLargest(APFloat::IEEEquad(), true);
-  expected = APFloat::getInf(APFloat::IEEEquad(), true);
-  EXPECT_EQ(test.next(true), APFloat::opOK);
-  EXPECT_TRUE(test.isInfinity() && test.isNegative());
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextUp(getSmallest()) = getSmallest() + inc.
-  test = APFloat(APFloat::IEEEquad(), "0x0.0000000000000000000000000001p-16382");
-  expected = APFloat(APFloat::IEEEquad(),
-                     "0x0.0000000000000000000000000002p-16382");
-  EXPECT_EQ(test.next(false), APFloat::opOK);
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextDown(getSmallest()) = -nextUp(-getSmallest()) = -(-0) = +0.
-  test = APFloat(APFloat::IEEEquad(), "0x0.0000000000000000000000000001p-16382");
-  expected = APFloat::getZero(APFloat::IEEEquad(), false);
-  EXPECT_EQ(test.next(true), APFloat::opOK);
-  EXPECT_TRUE(test.isPosZero());
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextUp(-getSmallest()) = -0.
-  test = APFloat(APFloat::IEEEquad(), "-0x0.0000000000000000000000000001p-16382");
-  expected = APFloat::getZero(APFloat::IEEEquad(), true);
-  EXPECT_EQ(test.next(false), APFloat::opOK);
-  EXPECT_TRUE(test.isNegZero());
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextDown(-getSmallest()) = -nextUp(getSmallest()) = -getSmallest() - inc.
-  test = APFloat(APFloat::IEEEquad(), "-0x0.0000000000000000000000000001p-16382");
-  expected = APFloat(APFloat::IEEEquad(),
-                     "-0x0.0000000000000000000000000002p-16382");
-  EXPECT_EQ(test.next(true), APFloat::opOK);
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextUp(qNaN) = qNaN
-  test = APFloat::getQNaN(APFloat::IEEEquad(), false);
-  expected = APFloat::getQNaN(APFloat::IEEEquad(), false);
-  EXPECT_EQ(test.next(false), APFloat::opOK);
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextDown(qNaN) = qNaN
-  test = APFloat::getQNaN(APFloat::IEEEquad(), false);
-  expected = APFloat::getQNaN(APFloat::IEEEquad(), false);
-  EXPECT_EQ(test.next(true), APFloat::opOK);
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextUp(sNaN) = qNaN
-  test = APFloat::getSNaN(APFloat::IEEEquad(), false);
-  expected = APFloat::getQNaN(APFloat::IEEEquad(), false);
-  EXPECT_EQ(test.next(false), APFloat::opInvalidOp);
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextDown(sNaN) = qNaN
-  test = APFloat::getSNaN(APFloat::IEEEquad(), false);
-  expected = APFloat::getQNaN(APFloat::IEEEquad(), false);
-  EXPECT_EQ(test.next(true), APFloat::opInvalidOp);
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextUp(+0) = +getSmallest()
-  test = APFloat::getZero(APFloat::IEEEquad(), false);
-  expected = APFloat::getSmallest(APFloat::IEEEquad(), false);
-  EXPECT_EQ(test.next(false), APFloat::opOK);
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextDown(+0) = -nextUp(-0) = -getSmallest()
-  test = APFloat::getZero(APFloat::IEEEquad(), false);
-  expected = APFloat::getSmallest(APFloat::IEEEquad(), true);
-  EXPECT_EQ(test.next(true), APFloat::opOK);
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextUp(-0) = +getSmallest()
-  test = APFloat::getZero(APFloat::IEEEquad(), true);
-  expected = APFloat::getSmallest(APFloat::IEEEquad(), false);
-  EXPECT_EQ(test.next(false), APFloat::opOK);
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextDown(-0) = -nextUp(0) = -getSmallest()
-  test = APFloat::getZero(APFloat::IEEEquad(), true);
-  expected = APFloat::getSmallest(APFloat::IEEEquad(), true);
-  EXPECT_EQ(test.next(true), APFloat::opOK);
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // 2. Binade Boundary Tests.
-
-  // 2a. Test denormal <-> normal binade boundaries.
-  //     * nextUp(+Largest Denormal) -> +Smallest Normal.
-  //     * nextDown(-Largest Denormal) -> -Smallest Normal.
-  //     * nextUp(-Smallest Normal) -> -Largest Denormal.
-  //     * nextDown(+Smallest Normal) -> +Largest Denormal.
-
-  // nextUp(+Largest Denormal) -> +Smallest Normal.
-  test = APFloat(APFloat::IEEEquad(), "0x0.ffffffffffffffffffffffffffffp-16382");
-  expected = APFloat(APFloat::IEEEquad(),
-                     "0x1.0000000000000000000000000000p-16382");
-  EXPECT_EQ(test.next(false), APFloat::opOK);
-  EXPECT_FALSE(test.isDenormal());
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextDown(-Largest Denormal) -> -Smallest Normal.
-  test = APFloat(APFloat::IEEEquad(),
-                 "-0x0.ffffffffffffffffffffffffffffp-16382");
-  expected = APFloat(APFloat::IEEEquad(),
-                     "-0x1.0000000000000000000000000000p-16382");
-  EXPECT_EQ(test.next(true), APFloat::opOK);
-  EXPECT_FALSE(test.isDenormal());
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextUp(-Smallest Normal) -> -LargestDenormal.
-  test = APFloat(APFloat::IEEEquad(),
-                 "-0x1.0000000000000000000000000000p-16382");
-  expected = APFloat(APFloat::IEEEquad(),
-                     "-0x0.ffffffffffffffffffffffffffffp-16382");
-  EXPECT_EQ(test.next(false), APFloat::opOK);
-  EXPECT_TRUE(test.isDenormal());
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextDown(+Smallest Normal) -> +Largest Denormal.
-  test = APFloat(APFloat::IEEEquad(),
-                 "+0x1.0000000000000000000000000000p-16382");
-  expected = APFloat(APFloat::IEEEquad(),
-                     "+0x0.ffffffffffffffffffffffffffffp-16382");
-  EXPECT_EQ(test.next(true), APFloat::opOK);
-  EXPECT_TRUE(test.isDenormal());
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // 2b. Test normal <-> normal binade boundaries.
-  //     * nextUp(-Normal Binade Boundary) -> -Normal Binade Boundary + 1.
-  //     * nextDown(+Normal Binade Boundary) -> +Normal Binade Boundary - 1.
-  //     * nextUp(+Normal Binade Boundary - 1) -> +Normal Binade Boundary.
-  //     * nextDown(-Normal Binade Boundary + 1) -> -Normal Binade Boundary.
-
-  // nextUp(-Normal Binade Boundary) -> -Normal Binade Boundary + 1.
-  test = APFloat(APFloat::IEEEquad(), "-0x1p+1");
-  expected = APFloat(APFloat::IEEEquad(),
-                     "-0x1.ffffffffffffffffffffffffffffp+0");
-  EXPECT_EQ(test.next(false), APFloat::opOK);
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextDown(+Normal Binade Boundary) -> +Normal Binade Boundary - 1.
-  test = APFloat(APFloat::IEEEquad(), "0x1p+1");
-  expected = APFloat(APFloat::IEEEquad(), "0x1.ffffffffffffffffffffffffffffp+0");
-  EXPECT_EQ(test.next(true), APFloat::opOK);
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextUp(+Normal Binade Boundary - 1) -> +Normal Binade Boundary.
-  test = APFloat(APFloat::IEEEquad(), "0x1.ffffffffffffffffffffffffffffp+0");
-  expected = APFloat(APFloat::IEEEquad(), "0x1p+1");
-  EXPECT_EQ(test.next(false), APFloat::opOK);
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextDown(-Normal Binade Boundary + 1) -> -Normal Binade Boundary.
-  test = APFloat(APFloat::IEEEquad(), "-0x1.ffffffffffffffffffffffffffffp+0");
-  expected = APFloat(APFloat::IEEEquad(), "-0x1p+1");
-  EXPECT_EQ(test.next(true), APFloat::opOK);
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // 2c. Test using next at binade boundaries with a direction away from the
-  // binade boundary. Away from denormal <-> normal boundaries.
-  //
-  // This is to make sure that even though we are at a binade boundary, since
-  // we are rounding away, we do not trigger the binade boundary code. Thus we
-  // test:
-  //   * nextUp(-Largest Denormal) -> -Largest Denormal + inc.
-  //   * nextDown(+Largest Denormal) -> +Largest Denormal - inc.
-  //   * nextUp(+Smallest Normal) -> +Smallest Normal + inc.
-  //   * nextDown(-Smallest Normal) -> -Smallest Normal - inc.
-
-  // nextUp(-Largest Denormal) -> -Largest Denormal + inc.
-  test = APFloat(APFloat::IEEEquad(), "-0x0.ffffffffffffffffffffffffffffp-16382");
-  expected = APFloat(APFloat::IEEEquad(),
-                     "-0x0.fffffffffffffffffffffffffffep-16382");
-  EXPECT_EQ(test.next(false), APFloat::opOK);
-  EXPECT_TRUE(test.isDenormal());
-  EXPECT_TRUE(test.isNegative());
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextDown(+Largest Denormal) -> +Largest Denormal - inc.
-  test = APFloat(APFloat::IEEEquad(), "0x0.ffffffffffffffffffffffffffffp-16382");
-  expected = APFloat(APFloat::IEEEquad(),
-                     "0x0.fffffffffffffffffffffffffffep-16382");
-  EXPECT_EQ(test.next(true), APFloat::opOK);
-  EXPECT_TRUE(test.isDenormal());
-  EXPECT_TRUE(!test.isNegative());
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextUp(+Smallest Normal) -> +Smallest Normal + inc.
-  test = APFloat(APFloat::IEEEquad(), "0x1.0000000000000000000000000000p-16382");
-  expected = APFloat(APFloat::IEEEquad(),
-                     "0x1.0000000000000000000000000001p-16382");
-  EXPECT_EQ(test.next(false), APFloat::opOK);
-  EXPECT_TRUE(!test.isDenormal());
-  EXPECT_TRUE(!test.isNegative());
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextDown(-Smallest Normal) -> -Smallest Normal - inc.
-  test = APFloat(APFloat::IEEEquad(), "-0x1.0000000000000000000000000000p-16382");
-  expected = APFloat(APFloat::IEEEquad(),
-                     "-0x1.0000000000000000000000000001p-16382");
-  EXPECT_EQ(test.next(true), APFloat::opOK);
-  EXPECT_TRUE(!test.isDenormal());
-  EXPECT_TRUE(test.isNegative());
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // 2d. Test values which cause our exponent to go to min exponent. This
-  // is to ensure that guards in the code to check for min exponent
-  // trigger properly.
-  //     * nextUp(-0x1p-16381) -> -0x1.ffffffffffffffffffffffffffffp-16382
-  //     * nextDown(-0x1.ffffffffffffffffffffffffffffp-16382) ->
-  //         -0x1p-16381
-  //     * nextUp(0x1.ffffffffffffffffffffffffffffp-16382) -> 0x1p-16382
-  //     * nextDown(0x1p-16382) -> 0x1.ffffffffffffffffffffffffffffp-16382
-
-  // nextUp(-0x1p-16381) -> -0x1.ffffffffffffffffffffffffffffp-16382
-  test = APFloat(APFloat::IEEEquad(), "-0x1p-16381");
-  expected = APFloat(APFloat::IEEEquad(),
-                     "-0x1.ffffffffffffffffffffffffffffp-16382");
-  EXPECT_EQ(test.next(false), APFloat::opOK);
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextDown(-0x1.ffffffffffffffffffffffffffffp-16382) ->
-  //         -0x1p-16381
-  test = APFloat(APFloat::IEEEquad(), "-0x1.ffffffffffffffffffffffffffffp-16382");
-  expected = APFloat(APFloat::IEEEquad(), "-0x1p-16381");
-  EXPECT_EQ(test.next(true), APFloat::opOK);
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextUp(0x1.ffffffffffffffffffffffffffffp-16382) -> 0x1p-16381
-  test = APFloat(APFloat::IEEEquad(), "0x1.ffffffffffffffffffffffffffffp-16382");
-  expected = APFloat(APFloat::IEEEquad(), "0x1p-16381");
-  EXPECT_EQ(test.next(false), APFloat::opOK);
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextDown(0x1p-16381) -> 0x1.ffffffffffffffffffffffffffffp-16382
-  test = APFloat(APFloat::IEEEquad(), "0x1p-16381");
-  expected = APFloat(APFloat::IEEEquad(),
-                     "0x1.ffffffffffffffffffffffffffffp-16382");
-  EXPECT_EQ(test.next(true), APFloat::opOK);
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // 3. Now we test both denormal/normal computation which will not cause us
-  // to go across binade boundaries. Specifically we test:
-  //   * nextUp(+Denormal) -> +Denormal.
-  //   * nextDown(+Denormal) -> +Denormal.
-  //   * nextUp(-Denormal) -> -Denormal.
-  //   * nextDown(-Denormal) -> -Denormal.
-  //   * nextUp(+Normal) -> +Normal.
-  //   * nextDown(+Normal) -> +Normal.
-  //   * nextUp(-Normal) -> -Normal.
-  //   * nextDown(-Normal) -> -Normal.
-
-  // nextUp(+Denormal) -> +Denormal.
-  test = APFloat(APFloat::IEEEquad(),
-                 "0x0.ffffffffffffffffffffffff000cp-16382");
-  expected = APFloat(APFloat::IEEEquad(),
-                 "0x0.ffffffffffffffffffffffff000dp-16382");
-  EXPECT_EQ(test.next(false), APFloat::opOK);
-  EXPECT_TRUE(test.isDenormal());
-  EXPECT_TRUE(!test.isNegative());
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextDown(+Denormal) -> +Denormal.
-  test = APFloat(APFloat::IEEEquad(),
-                 "0x0.ffffffffffffffffffffffff000cp-16382");
-  expected = APFloat(APFloat::IEEEquad(),
-                 "0x0.ffffffffffffffffffffffff000bp-16382");
-  EXPECT_EQ(test.next(true), APFloat::opOK);
-  EXPECT_TRUE(test.isDenormal());
-  EXPECT_TRUE(!test.isNegative());
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextUp(-Denormal) -> -Denormal.
-  test = APFloat(APFloat::IEEEquad(),
-                 "-0x0.ffffffffffffffffffffffff000cp-16382");
-  expected = APFloat(APFloat::IEEEquad(),
-                 "-0x0.ffffffffffffffffffffffff000bp-16382");
-  EXPECT_EQ(test.next(false), APFloat::opOK);
-  EXPECT_TRUE(test.isDenormal());
-  EXPECT_TRUE(test.isNegative());
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextDown(-Denormal) -> -Denormal
-  test = APFloat(APFloat::IEEEquad(),
-                 "-0x0.ffffffffffffffffffffffff000cp-16382");
-  expected = APFloat(APFloat::IEEEquad(),
-                 "-0x0.ffffffffffffffffffffffff000dp-16382");
-  EXPECT_EQ(test.next(true), APFloat::opOK);
-  EXPECT_TRUE(test.isDenormal());
-  EXPECT_TRUE(test.isNegative());
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextUp(+Normal) -> +Normal.
-  test = APFloat(APFloat::IEEEquad(),
-                 "0x1.ffffffffffffffffffffffff000cp-16000");
-  expected = APFloat(APFloat::IEEEquad(),
-                 "0x1.ffffffffffffffffffffffff000dp-16000");
-  EXPECT_EQ(test.next(false), APFloat::opOK);
-  EXPECT_TRUE(!test.isDenormal());
-  EXPECT_TRUE(!test.isNegative());
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextDown(+Normal) -> +Normal.
-  test = APFloat(APFloat::IEEEquad(),
-                 "0x1.ffffffffffffffffffffffff000cp-16000");
-  expected = APFloat(APFloat::IEEEquad(),
-                 "0x1.ffffffffffffffffffffffff000bp-16000");
-  EXPECT_EQ(test.next(true), APFloat::opOK);
-  EXPECT_TRUE(!test.isDenormal());
-  EXPECT_TRUE(!test.isNegative());
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextUp(-Normal) -> -Normal.
-  test = APFloat(APFloat::IEEEquad(),
-                 "-0x1.ffffffffffffffffffffffff000cp-16000");
-  expected = APFloat(APFloat::IEEEquad(),
-                 "-0x1.ffffffffffffffffffffffff000bp-16000");
-  EXPECT_EQ(test.next(false), APFloat::opOK);
-  EXPECT_TRUE(!test.isDenormal());
-  EXPECT_TRUE(test.isNegative());
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  // nextDown(-Normal) -> -Normal.
-  test = APFloat(APFloat::IEEEquad(),
-                 "-0x1.ffffffffffffffffffffffff000cp-16000");
-  expected = APFloat(APFloat::IEEEquad(),
-                 "-0x1.ffffffffffffffffffffffff000dp-16000");
-  EXPECT_EQ(test.next(true), APFloat::opOK);
-  EXPECT_TRUE(!test.isDenormal());
-  EXPECT_TRUE(test.isNegative());
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-}
-
-TEST(APFloatTest, FMA) {
-  APFloat::roundingMode rdmd = APFloat::rmNearestTiesToEven;
-
-  {
-    APFloat f1(14.5f);
-    APFloat f2(-14.5f);
-    APFloat f3(225.0f);
-    f1.fusedMultiplyAdd(f2, f3, APFloat::rmNearestTiesToEven);
-    EXPECT_EQ(14.75f, f1.convertToFloat());
-  }
-
-  {
-    APFloat Val2(2.0f);
-    APFloat f1((float)1.17549435e-38F);
-    APFloat f2((float)1.17549435e-38F);
-    f1.divide(Val2, rdmd);
-    f2.divide(Val2, rdmd);
-    APFloat f3(12.0f);
-    f1.fusedMultiplyAdd(f2, f3, APFloat::rmNearestTiesToEven);
-    EXPECT_EQ(12.0f, f1.convertToFloat());
-  }
-
-  // Test for correct zero sign when answer is exactly zero.
-  // fma(1.0, -1.0, 1.0) -> +ve 0.
-  {
-    APFloat f1(1.0);
-    APFloat f2(-1.0);
-    APFloat f3(1.0);
-    f1.fusedMultiplyAdd(f2, f3, APFloat::rmNearestTiesToEven);
-    EXPECT_TRUE(!f1.isNegative() && f1.isZero());
-  }
-
-  // Test for correct zero sign when answer is exactly zero and rounding towards
-  // negative.
-  // fma(1.0, -1.0, 1.0) -> +ve 0.
-  {
-    APFloat f1(1.0);
-    APFloat f2(-1.0);
-    APFloat f3(1.0);
-    f1.fusedMultiplyAdd(f2, f3, APFloat::rmTowardNegative);
-    EXPECT_TRUE(f1.isNegative() && f1.isZero());
-  }
-
-  // Test for correct (in this case -ve) sign when adding like signed zeros.
-  // Test fma(0.0, -0.0, -0.0) -> -ve 0.
-  {
-    APFloat f1(0.0);
-    APFloat f2(-0.0);
-    APFloat f3(-0.0);
-    f1.fusedMultiplyAdd(f2, f3, APFloat::rmNearestTiesToEven);
-    EXPECT_TRUE(f1.isNegative() && f1.isZero());
-  }
-
-  // Test -ve sign preservation when small negative results underflow.
-  {
-    APFloat f1(APFloat::IEEEdouble(),  "-0x1p-1074");
-    APFloat f2(APFloat::IEEEdouble(), "+0x1p-1074");
-    APFloat f3(0.0);
-    f1.fusedMultiplyAdd(f2, f3, APFloat::rmNearestTiesToEven);
-    EXPECT_TRUE(f1.isNegative() && f1.isZero());
-  }
-
-  // Test x87 extended precision case from http://llvm.org/PR20728.
-  {
-    APFloat M1(APFloat::x87DoubleExtended(), 1);
-    APFloat M2(APFloat::x87DoubleExtended(), 1);
-    APFloat A(APFloat::x87DoubleExtended(), 3);
-
-    bool losesInfo = false;
-    M1.fusedMultiplyAdd(M1, A, APFloat::rmNearestTiesToEven);
-    M1.convert(APFloat::IEEEsingle(), APFloat::rmNearestTiesToEven, &losesInfo);
-    EXPECT_FALSE(losesInfo);
-    EXPECT_EQ(4.0f, M1.convertToFloat());
-  }
-
-  // Regression test that failed an assertion.
-  {
-    APFloat f1(-8.85242279E-41f);
-    APFloat f2(2.0f);
-    APFloat f3(8.85242279E-41f);
-    f1.fusedMultiplyAdd(f2, f3, APFloat::rmNearestTiesToEven);
-    EXPECT_EQ(-8.85242279E-41f, f1.convertToFloat());
-  }
-
-  // Test using only a single instance of APFloat.
-  {
-    APFloat F(1.5);
-
-    F.fusedMultiplyAdd(F, F, APFloat::rmNearestTiesToEven);
-    EXPECT_EQ(3.75, F.convertToDouble());
-  }
-}
-
-TEST(APFloatTest, MinNum) {
-  APFloat f1(1.0);
-  APFloat f2(2.0);
-  APFloat nan = APFloat::getNaN(APFloat::IEEEdouble());
-
-  EXPECT_EQ(1.0, minnum(f1, f2).convertToDouble());
-  EXPECT_EQ(1.0, minnum(f2, f1).convertToDouble());
-  EXPECT_EQ(1.0, minnum(f1, nan).convertToDouble());
-  EXPECT_EQ(1.0, minnum(nan, f1).convertToDouble());
-}
-
-TEST(APFloatTest, MaxNum) {
-  APFloat f1(1.0);
-  APFloat f2(2.0);
-  APFloat nan = APFloat::getNaN(APFloat::IEEEdouble());
-
-  EXPECT_EQ(2.0, maxnum(f1, f2).convertToDouble());
-  EXPECT_EQ(2.0, maxnum(f2, f1).convertToDouble());
-  EXPECT_EQ(1.0, maxnum(f1, nan).convertToDouble());
-  EXPECT_EQ(1.0, maxnum(nan, f1).convertToDouble());
-}
-
-TEST(APFloatTest, Minimum) {
-  APFloat f1(1.0);
-  APFloat f2(2.0);
-  APFloat zp(0.0);
-  APFloat zn(-0.0);
-  APFloat nan = APFloat::getNaN(APFloat::IEEEdouble());
-
-  EXPECT_EQ(1.0, minimum(f1, f2).convertToDouble());
-  EXPECT_EQ(1.0, minimum(f2, f1).convertToDouble());
-  EXPECT_EQ(-0.0, minimum(zp, zn).convertToDouble());
-  EXPECT_EQ(-0.0, minimum(zn, zp).convertToDouble());
-  EXPECT_TRUE(std::isnan(minimum(f1, nan).convertToDouble()));
-  EXPECT_TRUE(std::isnan(minimum(nan, f1).convertToDouble()));
-}
-
-TEST(APFloatTest, Maximum) {
-  APFloat f1(1.0);
-  APFloat f2(2.0);
-  APFloat zp(0.0);
-  APFloat zn(-0.0);
-  APFloat nan = APFloat::getNaN(APFloat::IEEEdouble());
-
-  EXPECT_EQ(2.0, maximum(f1, f2).convertToDouble());
-  EXPECT_EQ(2.0, maximum(f2, f1).convertToDouble());
-  EXPECT_EQ(0.0, maximum(zp, zn).convertToDouble());
-  EXPECT_EQ(0.0, maximum(zn, zp).convertToDouble());
-  EXPECT_TRUE(std::isnan(maximum(f1, nan).convertToDouble()));
-  EXPECT_TRUE(std::isnan(maximum(nan, f1).convertToDouble()));
-}
-
-TEST(APFloatTest, Denormal) {
-  APFloat::roundingMode rdmd = APFloat::rmNearestTiesToEven;
-
-  // Test single precision
-  {
-    const char *MinNormalStr = "1.17549435082228750797e-38";
-    EXPECT_FALSE(APFloat(APFloat::IEEEsingle(), MinNormalStr).isDenormal());
-    EXPECT_FALSE(APFloat(APFloat::IEEEsingle(), 0).isDenormal());
-
-    APFloat Val2(APFloat::IEEEsingle(), 2);
-    APFloat T(APFloat::IEEEsingle(), MinNormalStr);
-    T.divide(Val2, rdmd);
-    EXPECT_TRUE(T.isDenormal());
-  }
-
-  // Test double precision
-  {
-    const char *MinNormalStr = "2.22507385850720138309e-308";
-    EXPECT_FALSE(APFloat(APFloat::IEEEdouble(), MinNormalStr).isDenormal());
-    EXPECT_FALSE(APFloat(APFloat::IEEEdouble(), 0).isDenormal());
-
-    APFloat Val2(APFloat::IEEEdouble(), 2);
-    APFloat T(APFloat::IEEEdouble(), MinNormalStr);
-    T.divide(Val2, rdmd);
-    EXPECT_TRUE(T.isDenormal());
-  }
-
-  // Test Intel double-ext
-  {
-    const char *MinNormalStr = "3.36210314311209350626e-4932";
-    EXPECT_FALSE(APFloat(APFloat::x87DoubleExtended(), MinNormalStr).isDenormal());
-    EXPECT_FALSE(APFloat(APFloat::x87DoubleExtended(), 0).isDenormal());
-
-    APFloat Val2(APFloat::x87DoubleExtended(), 2);
-    APFloat T(APFloat::x87DoubleExtended(), MinNormalStr);
-    T.divide(Val2, rdmd);
-    EXPECT_TRUE(T.isDenormal());
-  }
-
-  // Test quadruple precision
-  {
-    const char *MinNormalStr = "3.36210314311209350626267781732175260e-4932";
-    EXPECT_FALSE(APFloat(APFloat::IEEEquad(), MinNormalStr).isDenormal());
-    EXPECT_FALSE(APFloat(APFloat::IEEEquad(), 0).isDenormal());
-
-    APFloat Val2(APFloat::IEEEquad(), 2);
-    APFloat T(APFloat::IEEEquad(), MinNormalStr);
-    T.divide(Val2, rdmd);
-    EXPECT_TRUE(T.isDenormal());
-  }
-}
-
-TEST(APFloatTest, Zero) {
-  EXPECT_EQ(0.0f,  APFloat(0.0f).convertToFloat());
-  EXPECT_EQ(-0.0f, APFloat(-0.0f).convertToFloat());
-  EXPECT_TRUE(APFloat(-0.0f).isNegative());
-
-  EXPECT_EQ(0.0,  APFloat(0.0).convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(-0.0).convertToDouble());
-  EXPECT_TRUE(APFloat(-0.0).isNegative());
-}
-
-TEST(APFloatTest, DecimalStringsWithoutNullTerminators) {
-  // Make sure that we can parse strings without null terminators.
-  // rdar://14323230.
-  EXPECT_EQ(convertToDoubleFromString(StringRef("0.00", 3)), 0.0);
-  EXPECT_EQ(convertToDoubleFromString(StringRef("0.01", 3)), 0.0);
-  EXPECT_EQ(convertToDoubleFromString(StringRef("0.09", 3)), 0.0);
-  EXPECT_EQ(convertToDoubleFromString(StringRef("0.095", 4)), 0.09);
-  EXPECT_EQ(convertToDoubleFromString(StringRef("0.00e+3", 7)), 0.00);
-  EXPECT_EQ(convertToDoubleFromString(StringRef("0e+3", 4)), 0.00);
-}
-
-TEST(APFloatTest, fromZeroDecimalString) {
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(),  "0").convertToDouble());
-  EXPECT_EQ(+0.0, APFloat(APFloat::IEEEdouble(), "+0").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(), "-0").convertToDouble());
-
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(),  "0.").convertToDouble());
-  EXPECT_EQ(+0.0, APFloat(APFloat::IEEEdouble(), "+0.").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(), "-0.").convertToDouble());
-
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(),  ".0").convertToDouble());
-  EXPECT_EQ(+0.0, APFloat(APFloat::IEEEdouble(), "+.0").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(), "-.0").convertToDouble());
-
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(),  "0.0").convertToDouble());
-  EXPECT_EQ(+0.0, APFloat(APFloat::IEEEdouble(), "+0.0").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(), "-0.0").convertToDouble());
-
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(),  "00000.").convertToDouble());
-  EXPECT_EQ(+0.0, APFloat(APFloat::IEEEdouble(), "+00000.").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(), "-00000.").convertToDouble());
-
-  EXPECT_EQ(0.0,  APFloat(APFloat::IEEEdouble(), ".00000").convertToDouble());
-  EXPECT_EQ(+0.0, APFloat(APFloat::IEEEdouble(), "+.00000").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(), "-.00000").convertToDouble());
-
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(),  "0000.00000").convertToDouble());
-  EXPECT_EQ(+0.0, APFloat(APFloat::IEEEdouble(), "+0000.00000").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(), "-0000.00000").convertToDouble());
-}
-
-TEST(APFloatTest, fromZeroDecimalSingleExponentString) {
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(),   "0e1").convertToDouble());
-  EXPECT_EQ(+0.0, APFloat(APFloat::IEEEdouble(),  "+0e1").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(),  "-0e1").convertToDouble());
-
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(),  "0e+1").convertToDouble());
-  EXPECT_EQ(+0.0, APFloat(APFloat::IEEEdouble(), "+0e+1").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(), "-0e+1").convertToDouble());
-
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(),  "0e-1").convertToDouble());
-  EXPECT_EQ(+0.0, APFloat(APFloat::IEEEdouble(), "+0e-1").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(), "-0e-1").convertToDouble());
-
-
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(),   "0.e1").convertToDouble());
-  EXPECT_EQ(+0.0, APFloat(APFloat::IEEEdouble(),  "+0.e1").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(),  "-0.e1").convertToDouble());
-
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(),  "0.e+1").convertToDouble());
-  EXPECT_EQ(+0.0, APFloat(APFloat::IEEEdouble(), "+0.e+1").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(), "-0.e+1").convertToDouble());
-
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(),  "0.e-1").convertToDouble());
-  EXPECT_EQ(+0.0, APFloat(APFloat::IEEEdouble(), "+0.e-1").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(), "-0.e-1").convertToDouble());
-
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(),   ".0e1").convertToDouble());
-  EXPECT_EQ(+0.0, APFloat(APFloat::IEEEdouble(),  "+.0e1").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(),  "-.0e1").convertToDouble());
-
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(),  ".0e+1").convertToDouble());
-  EXPECT_EQ(+0.0, APFloat(APFloat::IEEEdouble(), "+.0e+1").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(), "-.0e+1").convertToDouble());
-
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(),  ".0e-1").convertToDouble());
-  EXPECT_EQ(+0.0, APFloat(APFloat::IEEEdouble(), "+.0e-1").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(), "-.0e-1").convertToDouble());
-
-
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(),   "0.0e1").convertToDouble());
-  EXPECT_EQ(+0.0, APFloat(APFloat::IEEEdouble(),  "+0.0e1").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(),  "-0.0e1").convertToDouble());
-
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(),  "0.0e+1").convertToDouble());
-  EXPECT_EQ(+0.0, APFloat(APFloat::IEEEdouble(), "+0.0e+1").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(), "-0.0e+1").convertToDouble());
-
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(),  "0.0e-1").convertToDouble());
-  EXPECT_EQ(+0.0, APFloat(APFloat::IEEEdouble(), "+0.0e-1").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(), "-0.0e-1").convertToDouble());
-
-
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(),  "000.0000e1").convertToDouble());
-  EXPECT_EQ(+0.0, APFloat(APFloat::IEEEdouble(), "+000.0000e+1").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(), "-000.0000e+1").convertToDouble());
-}
-
-TEST(APFloatTest, fromZeroDecimalLargeExponentString) {
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(),  "0e1234").convertToDouble());
-  EXPECT_EQ(+0.0, APFloat(APFloat::IEEEdouble(), "+0e1234").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(), "-0e1234").convertToDouble());
-
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(),  "0e+1234").convertToDouble());
-  EXPECT_EQ(+0.0, APFloat(APFloat::IEEEdouble(), "+0e+1234").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(), "-0e+1234").convertToDouble());
-
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(),  "0e-1234").convertToDouble());
-  EXPECT_EQ(+0.0, APFloat(APFloat::IEEEdouble(), "+0e-1234").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(), "-0e-1234").convertToDouble());
-
-  EXPECT_EQ(0.0,  APFloat(APFloat::IEEEdouble(), "000.0000e1234").convertToDouble());
-  EXPECT_EQ(0.0,  APFloat(APFloat::IEEEdouble(), "000.0000e-1234").convertToDouble());
-
-  EXPECT_EQ(0.0,  APFloat(APFloat::IEEEdouble(), StringRef("0e1234" "\0" "2", 6)).convertToDouble());
-}
-
-TEST(APFloatTest, fromZeroHexadecimalString) {
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(),  "0x0p1").convertToDouble());
-  EXPECT_EQ(+0.0, APFloat(APFloat::IEEEdouble(), "+0x0p1").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(), "-0x0p1").convertToDouble());
-
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(),  "0x0p+1").convertToDouble());
-  EXPECT_EQ(+0.0, APFloat(APFloat::IEEEdouble(), "+0x0p+1").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(), "-0x0p+1").convertToDouble());
-
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(),  "0x0p-1").convertToDouble());
-  EXPECT_EQ(+0.0, APFloat(APFloat::IEEEdouble(), "+0x0p-1").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(), "-0x0p-1").convertToDouble());
-
-
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(),  "0x0.p1").convertToDouble());
-  EXPECT_EQ(+0.0, APFloat(APFloat::IEEEdouble(), "+0x0.p1").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(), "-0x0.p1").convertToDouble());
-
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(),  "0x0.p+1").convertToDouble());
-  EXPECT_EQ(+0.0, APFloat(APFloat::IEEEdouble(), "+0x0.p+1").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(), "-0x0.p+1").convertToDouble());
-
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(),  "0x0.p-1").convertToDouble());
-  EXPECT_EQ(+0.0, APFloat(APFloat::IEEEdouble(), "+0x0.p-1").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(), "-0x0.p-1").convertToDouble());
-
-
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(),  "0x.0p1").convertToDouble());
-  EXPECT_EQ(+0.0, APFloat(APFloat::IEEEdouble(), "+0x.0p1").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(), "-0x.0p1").convertToDouble());
-
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(),  "0x.0p+1").convertToDouble());
-  EXPECT_EQ(+0.0, APFloat(APFloat::IEEEdouble(), "+0x.0p+1").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(), "-0x.0p+1").convertToDouble());
-
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(),  "0x.0p-1").convertToDouble());
-  EXPECT_EQ(+0.0, APFloat(APFloat::IEEEdouble(), "+0x.0p-1").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(), "-0x.0p-1").convertToDouble());
-
-
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(),  "0x0.0p1").convertToDouble());
-  EXPECT_EQ(+0.0, APFloat(APFloat::IEEEdouble(), "+0x0.0p1").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(), "-0x0.0p1").convertToDouble());
-
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(),  "0x0.0p+1").convertToDouble());
-  EXPECT_EQ(+0.0, APFloat(APFloat::IEEEdouble(), "+0x0.0p+1").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(), "-0x0.0p+1").convertToDouble());
-
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(),  "0x0.0p-1").convertToDouble());
-  EXPECT_EQ(+0.0, APFloat(APFloat::IEEEdouble(), "+0x0.0p-1").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(), "-0x0.0p-1").convertToDouble());
-
-
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(), "0x00000.p1").convertToDouble());
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(), "0x0000.00000p1").convertToDouble());
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(), "0x.00000p1").convertToDouble());
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(), "0x0.p1").convertToDouble());
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(), "0x0p1234").convertToDouble());
-  EXPECT_EQ(-0.0, APFloat(APFloat::IEEEdouble(), "-0x0p1234").convertToDouble());
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(), "0x00000.p1234").convertToDouble());
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(), "0x0000.00000p1234").convertToDouble());
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(), "0x.00000p1234").convertToDouble());
-  EXPECT_EQ( 0.0, APFloat(APFloat::IEEEdouble(), "0x0.p1234").convertToDouble());
-}
-
-TEST(APFloatTest, fromDecimalString) {
-  EXPECT_EQ(1.0,      APFloat(APFloat::IEEEdouble(), "1").convertToDouble());
-  EXPECT_EQ(2.0,      APFloat(APFloat::IEEEdouble(), "2.").convertToDouble());
-  EXPECT_EQ(0.5,      APFloat(APFloat::IEEEdouble(), ".5").convertToDouble());
-  EXPECT_EQ(1.0,      APFloat(APFloat::IEEEdouble(), "1.0").convertToDouble());
-  EXPECT_EQ(-2.0,     APFloat(APFloat::IEEEdouble(), "-2").convertToDouble());
-  EXPECT_EQ(-4.0,     APFloat(APFloat::IEEEdouble(), "-4.").convertToDouble());
-  EXPECT_EQ(-0.5,     APFloat(APFloat::IEEEdouble(), "-.5").convertToDouble());
-  EXPECT_EQ(-1.5,     APFloat(APFloat::IEEEdouble(), "-1.5").convertToDouble());
-  EXPECT_EQ(1.25e12,  APFloat(APFloat::IEEEdouble(), "1.25e12").convertToDouble());
-  EXPECT_EQ(1.25e+12, APFloat(APFloat::IEEEdouble(), "1.25e+12").convertToDouble());
-  EXPECT_EQ(1.25e-12, APFloat(APFloat::IEEEdouble(), "1.25e-12").convertToDouble());
-  EXPECT_EQ(1024.0,   APFloat(APFloat::IEEEdouble(), "1024.").convertToDouble());
-  EXPECT_EQ(1024.05,  APFloat(APFloat::IEEEdouble(), "1024.05000").convertToDouble());
-  EXPECT_EQ(0.05,     APFloat(APFloat::IEEEdouble(), ".05000").convertToDouble());
-  EXPECT_EQ(2.0,      APFloat(APFloat::IEEEdouble(), "2.").convertToDouble());
-  EXPECT_EQ(2.0e2,    APFloat(APFloat::IEEEdouble(), "2.e2").convertToDouble());
-  EXPECT_EQ(2.0e+2,   APFloat(APFloat::IEEEdouble(), "2.e+2").convertToDouble());
-  EXPECT_EQ(2.0e-2,   APFloat(APFloat::IEEEdouble(), "2.e-2").convertToDouble());
-  EXPECT_EQ(2.05e2,    APFloat(APFloat::IEEEdouble(), "002.05000e2").convertToDouble());
-  EXPECT_EQ(2.05e+2,   APFloat(APFloat::IEEEdouble(), "002.05000e+2").convertToDouble());
-  EXPECT_EQ(2.05e-2,   APFloat(APFloat::IEEEdouble(), "002.05000e-2").convertToDouble());
-  EXPECT_EQ(2.05e12,   APFloat(APFloat::IEEEdouble(), "002.05000e12").convertToDouble());
-  EXPECT_EQ(2.05e+12,  APFloat(APFloat::IEEEdouble(), "002.05000e+12").convertToDouble());
-  EXPECT_EQ(2.05e-12,  APFloat(APFloat::IEEEdouble(), "002.05000e-12").convertToDouble());
-
-  EXPECT_EQ(1.0,      APFloat(APFloat::IEEEdouble(), "1e").convertToDouble());
-  EXPECT_EQ(1.0,      APFloat(APFloat::IEEEdouble(), "+1e").convertToDouble());
-  EXPECT_EQ(-1.0,      APFloat(APFloat::IEEEdouble(), "-1e").convertToDouble());
-
-  EXPECT_EQ(1.0,      APFloat(APFloat::IEEEdouble(), "1.e").convertToDouble());
-  EXPECT_EQ(1.0,      APFloat(APFloat::IEEEdouble(), "+1.e").convertToDouble());
-  EXPECT_EQ(-1.0,      APFloat(APFloat::IEEEdouble(), "-1.e").convertToDouble());
-
-  EXPECT_EQ(0.1,      APFloat(APFloat::IEEEdouble(), ".1e").convertToDouble());
-  EXPECT_EQ(0.1,      APFloat(APFloat::IEEEdouble(), "+.1e").convertToDouble());
-  EXPECT_EQ(-0.1,      APFloat(APFloat::IEEEdouble(), "-.1e").convertToDouble());
-
-  EXPECT_EQ(1.1,      APFloat(APFloat::IEEEdouble(), "1.1e").convertToDouble());
-  EXPECT_EQ(1.1,      APFloat(APFloat::IEEEdouble(), "+1.1e").convertToDouble());
-  EXPECT_EQ(-1.1,      APFloat(APFloat::IEEEdouble(), "-1.1e").convertToDouble());
-
-  EXPECT_EQ(1.0,      APFloat(APFloat::IEEEdouble(), "1e+").convertToDouble());
-  EXPECT_EQ(1.0,      APFloat(APFloat::IEEEdouble(), "1e-").convertToDouble());
-
-  EXPECT_EQ(0.1,      APFloat(APFloat::IEEEdouble(), ".1e").convertToDouble());
-  EXPECT_EQ(0.1,      APFloat(APFloat::IEEEdouble(), ".1e+").convertToDouble());
-  EXPECT_EQ(0.1,      APFloat(APFloat::IEEEdouble(), ".1e-").convertToDouble());
-
-  EXPECT_EQ(1.0,      APFloat(APFloat::IEEEdouble(), "1.0e").convertToDouble());
-  EXPECT_EQ(1.0,      APFloat(APFloat::IEEEdouble(), "1.0e+").convertToDouble());
-  EXPECT_EQ(1.0,      APFloat(APFloat::IEEEdouble(), "1.0e-").convertToDouble());
-
-  // These are "carefully selected" to overflow the fast log-base
-  // calculations in APFloat.cpp
-  EXPECT_TRUE(APFloat(APFloat::IEEEdouble(), "99e99999").isInfinity());
-  EXPECT_TRUE(APFloat(APFloat::IEEEdouble(), "-99e99999").isInfinity());
-  EXPECT_TRUE(APFloat(APFloat::IEEEdouble(), "1e-99999").isPosZero());
-  EXPECT_TRUE(APFloat(APFloat::IEEEdouble(), "-1e-99999").isNegZero());
-
-  EXPECT_EQ(2.71828, convertToDoubleFromString("2.71828"));
-}
-
-TEST(APFloatTest, fromStringSpecials) {
-  const fltSemantics &Sem = APFloat::IEEEdouble();
-  const unsigned Precision = 53;
-  const unsigned PayloadBits = Precision - 2;
-  uint64_t PayloadMask = (uint64_t(1) << PayloadBits) - uint64_t(1);
-
-  uint64_t NaNPayloads[] = {
-      0,
-      1,
-      123,
-      0xDEADBEEF,
-      uint64_t(-2),
-      uint64_t(1) << PayloadBits,       // overflow bit
-      uint64_t(1) << (PayloadBits - 1), // signaling bit
-      uint64_t(1) << (PayloadBits - 2)  // highest possible bit
-  };
-
-  // Convert payload integer to decimal string representation.
-  std::string NaNPayloadDecStrings[array_lengthof(NaNPayloads)];
-  for (size_t I = 0; I < array_lengthof(NaNPayloads); ++I)
-    NaNPayloadDecStrings[I] = utostr(NaNPayloads[I]);
-
-  // Convert payload integer to hexadecimal string representation.
-  std::string NaNPayloadHexStrings[array_lengthof(NaNPayloads)];
-  for (size_t I = 0; I < array_lengthof(NaNPayloads); ++I)
-    NaNPayloadHexStrings[I] = "0x" + utohexstr(NaNPayloads[I]);
-
-  // Fix payloads to expected result.
-  for (uint64_t &Payload : NaNPayloads)
-    Payload &= PayloadMask;
-
-  // Signaling NaN must have a non-zero payload. In case a zero payload is
-  // requested, a default arbitrary payload is set instead. Save this payload
-  // for testing.
-  const uint64_t SNaNDefaultPayload =
-      APFloat::getSNaN(Sem).bitcastToAPInt().getZExtValue() & PayloadMask;
-
-  // Negative sign prefix (or none - for positive).
-  const char Signs[] = {0, '-'};
-
-  // "Signaling" prefix (or none - for "Quiet").
-  const char NaNTypes[] = {0, 's', 'S'};
-
-  const StringRef NaNStrings[] = {"nan", "NaN"};
-  for (StringRef NaNStr : NaNStrings)
-    for (char TypeChar : NaNTypes) {
-      bool Signaling = (TypeChar == 's' || TypeChar == 'S');
-
-      for (size_t J = 0; J < array_lengthof(NaNPayloads); ++J) {
-        uint64_t Payload = (Signaling && !NaNPayloads[J]) ? SNaNDefaultPayload
-                                                          : NaNPayloads[J];
-        std::string &PayloadDec = NaNPayloadDecStrings[J];
-        std::string &PayloadHex = NaNPayloadHexStrings[J];
-
-        for (char SignChar : Signs) {
-          bool Negative = (SignChar == '-');
-
-          std::string TestStrings[5];
-          size_t NumTestStrings = 0;
-
-          std::string Prefix;
-          if (SignChar)
-            Prefix += SignChar;
-          if (TypeChar)
-            Prefix += TypeChar;
-          Prefix += NaNStr;
-
-          // Test without any paylod.
-          if (!Payload)
-            TestStrings[NumTestStrings++] = Prefix;
-
-          // Test with the payload as a suffix.
-          TestStrings[NumTestStrings++] = Prefix + PayloadDec;
-          TestStrings[NumTestStrings++] = Prefix + PayloadHex;
-
-          // Test with the payload inside parentheses.
-          TestStrings[NumTestStrings++] = Prefix + '(' + PayloadDec + ')';
-          TestStrings[NumTestStrings++] = Prefix + '(' + PayloadHex + ')';
-
-          for (size_t K = 0; K < NumTestStrings; ++K) {
-            StringRef TestStr = TestStrings[K];
-
-            APFloat F(Sem);
-            bool HasError = !F.convertFromString(
-                TestStr, llvm::APFloat::rmNearestTiesToEven);
-            EXPECT_FALSE(HasError);
-            EXPECT_TRUE(F.isNaN());
-            EXPECT_EQ(Signaling, F.isSignaling());
-            EXPECT_EQ(Negative, F.isNegative());
-            uint64_t PayloadResult =
-                F.bitcastToAPInt().getZExtValue() & PayloadMask;
-            EXPECT_EQ(Payload, PayloadResult);
-          }
-        }
-      }
-    }
-
-  const StringRef InfStrings[] = {"inf",  "INFINITY",  "+Inf",
-                                  "-inf", "-INFINITY", "-Inf"};
-  for (StringRef InfStr : InfStrings) {
-    bool Negative = InfStr.front() == '-';
-
-    APFloat F(Sem);
-    bool HasError =
-        !F.convertFromString(InfStr, llvm::APFloat::rmNearestTiesToEven);
-    EXPECT_FALSE(HasError);
-    EXPECT_TRUE(F.isInfinity());
-    EXPECT_EQ(Negative, F.isNegative());
-    uint64_t PayloadResult = F.bitcastToAPInt().getZExtValue() & PayloadMask;
-    EXPECT_EQ(UINT64_C(0), PayloadResult);
-  }
-}
-
-TEST(APFloatTest, fromToStringSpecials) {
-  auto expects = [] (const char *first, const char *second) {
-    std::string roundtrip = convertToString(convertToDoubleFromString(second), 0, 3);
-    EXPECT_STREQ(first, roundtrip.c_str());
-  };
-  expects("+Inf", "+Inf");
-  expects("+Inf", "INFINITY");
-  expects("+Inf", "inf");
-  expects("-Inf", "-Inf");
-  expects("-Inf", "-INFINITY");
-  expects("-Inf", "-inf");
-  expects("NaN", "NaN");
-  expects("NaN", "nan");
-  expects("NaN", "-NaN");
-  expects("NaN", "-nan");
-}
-
-TEST(APFloatTest, fromHexadecimalString) {
-  EXPECT_EQ( 1.0, APFloat(APFloat::IEEEdouble(),  "0x1p0").convertToDouble());
-  EXPECT_EQ(+1.0, APFloat(APFloat::IEEEdouble(), "+0x1p0").convertToDouble());
-  EXPECT_EQ(-1.0, APFloat(APFloat::IEEEdouble(), "-0x1p0").convertToDouble());
-
-  EXPECT_EQ( 1.0, APFloat(APFloat::IEEEdouble(),  "0x1p+0").convertToDouble());
-  EXPECT_EQ(+1.0, APFloat(APFloat::IEEEdouble(), "+0x1p+0").convertToDouble());
-  EXPECT_EQ(-1.0, APFloat(APFloat::IEEEdouble(), "-0x1p+0").convertToDouble());
-
-  EXPECT_EQ( 1.0, APFloat(APFloat::IEEEdouble(),  "0x1p-0").convertToDouble());
-  EXPECT_EQ(+1.0, APFloat(APFloat::IEEEdouble(), "+0x1p-0").convertToDouble());
-  EXPECT_EQ(-1.0, APFloat(APFloat::IEEEdouble(), "-0x1p-0").convertToDouble());
-
-
-  EXPECT_EQ( 2.0, APFloat(APFloat::IEEEdouble(),  "0x1p1").convertToDouble());
-  EXPECT_EQ(+2.0, APFloat(APFloat::IEEEdouble(), "+0x1p1").convertToDouble());
-  EXPECT_EQ(-2.0, APFloat(APFloat::IEEEdouble(), "-0x1p1").convertToDouble());
-
-  EXPECT_EQ( 2.0, APFloat(APFloat::IEEEdouble(),  "0x1p+1").convertToDouble());
-  EXPECT_EQ(+2.0, APFloat(APFloat::IEEEdouble(), "+0x1p+1").convertToDouble());
-  EXPECT_EQ(-2.0, APFloat(APFloat::IEEEdouble(), "-0x1p+1").convertToDouble());
-
-  EXPECT_EQ( 0.5, APFloat(APFloat::IEEEdouble(),  "0x1p-1").convertToDouble());
-  EXPECT_EQ(+0.5, APFloat(APFloat::IEEEdouble(), "+0x1p-1").convertToDouble());
-  EXPECT_EQ(-0.5, APFloat(APFloat::IEEEdouble(), "-0x1p-1").convertToDouble());
-
-
-  EXPECT_EQ( 3.0, APFloat(APFloat::IEEEdouble(),  "0x1.8p1").convertToDouble());
-  EXPECT_EQ(+3.0, APFloat(APFloat::IEEEdouble(), "+0x1.8p1").convertToDouble());
-  EXPECT_EQ(-3.0, APFloat(APFloat::IEEEdouble(), "-0x1.8p1").convertToDouble());
-
-  EXPECT_EQ( 3.0, APFloat(APFloat::IEEEdouble(),  "0x1.8p+1").convertToDouble());
-  EXPECT_EQ(+3.0, APFloat(APFloat::IEEEdouble(), "+0x1.8p+1").convertToDouble());
-  EXPECT_EQ(-3.0, APFloat(APFloat::IEEEdouble(), "-0x1.8p+1").convertToDouble());
-
-  EXPECT_EQ( 0.75, APFloat(APFloat::IEEEdouble(),  "0x1.8p-1").convertToDouble());
-  EXPECT_EQ(+0.75, APFloat(APFloat::IEEEdouble(), "+0x1.8p-1").convertToDouble());
-  EXPECT_EQ(-0.75, APFloat(APFloat::IEEEdouble(), "-0x1.8p-1").convertToDouble());
-
-
-  EXPECT_EQ( 8192.0, APFloat(APFloat::IEEEdouble(),  "0x1000.000p1").convertToDouble());
-  EXPECT_EQ(+8192.0, APFloat(APFloat::IEEEdouble(), "+0x1000.000p1").convertToDouble());
-  EXPECT_EQ(-8192.0, APFloat(APFloat::IEEEdouble(), "-0x1000.000p1").convertToDouble());
-
-  EXPECT_EQ( 8192.0, APFloat(APFloat::IEEEdouble(),  "0x1000.000p+1").convertToDouble());
-  EXPECT_EQ(+8192.0, APFloat(APFloat::IEEEdouble(), "+0x1000.000p+1").convertToDouble());
-  EXPECT_EQ(-8192.0, APFloat(APFloat::IEEEdouble(), "-0x1000.000p+1").convertToDouble());
-
-  EXPECT_EQ( 2048.0, APFloat(APFloat::IEEEdouble(),  "0x1000.000p-1").convertToDouble());
-  EXPECT_EQ(+2048.0, APFloat(APFloat::IEEEdouble(), "+0x1000.000p-1").convertToDouble());
-  EXPECT_EQ(-2048.0, APFloat(APFloat::IEEEdouble(), "-0x1000.000p-1").convertToDouble());
-
-
-  EXPECT_EQ( 8192.0, APFloat(APFloat::IEEEdouble(),  "0x1000p1").convertToDouble());
-  EXPECT_EQ(+8192.0, APFloat(APFloat::IEEEdouble(), "+0x1000p1").convertToDouble());
-  EXPECT_EQ(-8192.0, APFloat(APFloat::IEEEdouble(), "-0x1000p1").convertToDouble());
-
-  EXPECT_EQ( 8192.0, APFloat(APFloat::IEEEdouble(),  "0x1000p+1").convertToDouble());
-  EXPECT_EQ(+8192.0, APFloat(APFloat::IEEEdouble(), "+0x1000p+1").convertToDouble());
-  EXPECT_EQ(-8192.0, APFloat(APFloat::IEEEdouble(), "-0x1000p+1").convertToDouble());
-
-  EXPECT_EQ( 2048.0, APFloat(APFloat::IEEEdouble(),  "0x1000p-1").convertToDouble());
-  EXPECT_EQ(+2048.0, APFloat(APFloat::IEEEdouble(), "+0x1000p-1").convertToDouble());
-  EXPECT_EQ(-2048.0, APFloat(APFloat::IEEEdouble(), "-0x1000p-1").convertToDouble());
-
-
-  EXPECT_EQ( 16384.0, APFloat(APFloat::IEEEdouble(),  "0x10p10").convertToDouble());
-  EXPECT_EQ(+16384.0, APFloat(APFloat::IEEEdouble(), "+0x10p10").convertToDouble());
-  EXPECT_EQ(-16384.0, APFloat(APFloat::IEEEdouble(), "-0x10p10").convertToDouble());
-
-  EXPECT_EQ( 16384.0, APFloat(APFloat::IEEEdouble(),  "0x10p+10").convertToDouble());
-  EXPECT_EQ(+16384.0, APFloat(APFloat::IEEEdouble(), "+0x10p+10").convertToDouble());
-  EXPECT_EQ(-16384.0, APFloat(APFloat::IEEEdouble(), "-0x10p+10").convertToDouble());
-
-  EXPECT_EQ( 0.015625, APFloat(APFloat::IEEEdouble(),  "0x10p-10").convertToDouble());
-  EXPECT_EQ(+0.015625, APFloat(APFloat::IEEEdouble(), "+0x10p-10").convertToDouble());
-  EXPECT_EQ(-0.015625, APFloat(APFloat::IEEEdouble(), "-0x10p-10").convertToDouble());
-
-  EXPECT_EQ(1.0625, APFloat(APFloat::IEEEdouble(), "0x1.1p0").convertToDouble());
-  EXPECT_EQ(1.0, APFloat(APFloat::IEEEdouble(), "0x1p0").convertToDouble());
-
-  EXPECT_EQ(convertToDoubleFromString("0x1p-150"),
-            convertToDoubleFromString("+0x800000000000000001.p-221"));
-  EXPECT_EQ(2251799813685248.5,
-            convertToDoubleFromString("0x80000000000004000000.010p-28"));
-}
-
-TEST(APFloatTest, toString) {
-  ASSERT_EQ("10", convertToString(10.0, 6, 3));
-  ASSERT_EQ("1.0E+1", convertToString(10.0, 6, 0));
-  ASSERT_EQ("10100", convertToString(1.01E+4, 5, 2));
-  ASSERT_EQ("1.01E+4", convertToString(1.01E+4, 4, 2));
-  ASSERT_EQ("1.01E+4", convertToString(1.01E+4, 5, 1));
-  ASSERT_EQ("0.0101", convertToString(1.01E-2, 5, 2));
-  ASSERT_EQ("0.0101", convertToString(1.01E-2, 4, 2));
-  ASSERT_EQ("1.01E-2", convertToString(1.01E-2, 5, 1));
-  ASSERT_EQ("0.78539816339744828", convertToString(0.78539816339744830961, 0, 3));
-  ASSERT_EQ("4.9406564584124654E-324", convertToString(4.9406564584124654e-324, 0, 3));
-  ASSERT_EQ("873.18340000000001", convertToString(873.1834, 0, 1));
-  ASSERT_EQ("8.7318340000000001E+2", convertToString(873.1834, 0, 0));
-  ASSERT_EQ("1.7976931348623157E+308", convertToString(1.7976931348623157E+308, 0, 0));
-  ASSERT_EQ("10", convertToString(10.0, 6, 3, false));
-  ASSERT_EQ("1.000000e+01", convertToString(10.0, 6, 0, false));
-  ASSERT_EQ("10100", convertToString(1.01E+4, 5, 2, false));
-  ASSERT_EQ("1.0100e+04", convertToString(1.01E+4, 4, 2, false));
-  ASSERT_EQ("1.01000e+04", convertToString(1.01E+4, 5, 1, false));
-  ASSERT_EQ("0.0101", convertToString(1.01E-2, 5, 2, false));
-  ASSERT_EQ("0.0101", convertToString(1.01E-2, 4, 2, false));
-  ASSERT_EQ("1.01000e-02", convertToString(1.01E-2, 5, 1, false));
-  ASSERT_EQ("0.78539816339744828",
-            convertToString(0.78539816339744830961, 0, 3, false));
-  ASSERT_EQ("4.94065645841246540e-324",
-            convertToString(4.9406564584124654e-324, 0, 3, false));
-  ASSERT_EQ("873.18340000000001", convertToString(873.1834, 0, 1, false));
-  ASSERT_EQ("8.73183400000000010e+02", convertToString(873.1834, 0, 0, false));
-  ASSERT_EQ("1.79769313486231570e+308",
-            convertToString(1.7976931348623157E+308, 0, 0, false));
-
-  {
-    SmallString<64> Str;
-    APFloat UnnormalZero(APFloat::x87DoubleExtended(), APInt(80, {0, 1}));
-    UnnormalZero.toString(Str);
-    ASSERT_EQ("NaN", Str);
-  }
-}
-
-TEST(APFloatTest, toInteger) {
-  bool isExact = false;
-  APSInt result(5, /*isUnsigned=*/true);
-
-  EXPECT_EQ(APFloat::opOK,
-            APFloat(APFloat::IEEEdouble(), "10")
-            .convertToInteger(result, APFloat::rmTowardZero, &isExact));
-  EXPECT_TRUE(isExact);
-  EXPECT_EQ(APSInt(APInt(5, 10), true), result);
-
-  EXPECT_EQ(APFloat::opInvalidOp,
-            APFloat(APFloat::IEEEdouble(), "-10")
-            .convertToInteger(result, APFloat::rmTowardZero, &isExact));
-  EXPECT_FALSE(isExact);
-  EXPECT_EQ(APSInt::getMinValue(5, true), result);
-
-  EXPECT_EQ(APFloat::opInvalidOp,
-            APFloat(APFloat::IEEEdouble(), "32")
-            .convertToInteger(result, APFloat::rmTowardZero, &isExact));
-  EXPECT_FALSE(isExact);
-  EXPECT_EQ(APSInt::getMaxValue(5, true), result);
-
-  EXPECT_EQ(APFloat::opInexact,
-            APFloat(APFloat::IEEEdouble(), "7.9")
-            .convertToInteger(result, APFloat::rmTowardZero, &isExact));
-  EXPECT_FALSE(isExact);
-  EXPECT_EQ(APSInt(APInt(5, 7), true), result);
-
-  result.setIsUnsigned(false);
-  EXPECT_EQ(APFloat::opOK,
-            APFloat(APFloat::IEEEdouble(), "-10")
-            .convertToInteger(result, APFloat::rmTowardZero, &isExact));
-  EXPECT_TRUE(isExact);
-  EXPECT_EQ(APSInt(APInt(5, -10, true), false), result);
-
-  EXPECT_EQ(APFloat::opInvalidOp,
-            APFloat(APFloat::IEEEdouble(), "-17")
-            .convertToInteger(result, APFloat::rmTowardZero, &isExact));
-  EXPECT_FALSE(isExact);
-  EXPECT_EQ(APSInt::getMinValue(5, false), result);
-
-  EXPECT_EQ(APFloat::opInvalidOp,
-            APFloat(APFloat::IEEEdouble(), "16")
-            .convertToInteger(result, APFloat::rmTowardZero, &isExact));
-  EXPECT_FALSE(isExact);
-  EXPECT_EQ(APSInt::getMaxValue(5, false), result);
-}
-
-static APInt nanbitsFromAPInt(const fltSemantics &Sem, bool SNaN, bool Negative,
-                              uint64_t payload) {
-  APInt appayload(64, payload);
-  if (SNaN)
-    return APFloat::getSNaN(Sem, Negative, &appayload).bitcastToAPInt();
-  else
-    return APFloat::getQNaN(Sem, Negative, &appayload).bitcastToAPInt();
-}
-
-TEST(APFloatTest, makeNaN) {
-  const struct {
-    uint64_t expected;
-    const fltSemantics &semantics;
-    bool SNaN;
-    bool Negative;
-    uint64_t payload;
-  } tests[] = {
-    /*             expected              semantics   SNaN    Neg                payload */
-    {         0x7fc00000ULL, APFloat::IEEEsingle(), false, false,         0x00000000ULL },
-    {         0xffc00000ULL, APFloat::IEEEsingle(), false,  true,         0x00000000ULL },
-    {         0x7fc0ae72ULL, APFloat::IEEEsingle(), false, false,         0x0000ae72ULL },
-    {         0x7fffae72ULL, APFloat::IEEEsingle(), false, false,         0xffffae72ULL },
-    {         0x7fdaae72ULL, APFloat::IEEEsingle(), false, false,         0x00daae72ULL },
-    {         0x7fa00000ULL, APFloat::IEEEsingle(),  true, false,         0x00000000ULL },
-    {         0xffa00000ULL, APFloat::IEEEsingle(),  true,  true,         0x00000000ULL },
-    {         0x7f80ae72ULL, APFloat::IEEEsingle(),  true, false,         0x0000ae72ULL },
-    {         0x7fbfae72ULL, APFloat::IEEEsingle(),  true, false,         0xffffae72ULL },
-    {         0x7f9aae72ULL, APFloat::IEEEsingle(),  true, false,         0x001aae72ULL },
-    { 0x7ff8000000000000ULL, APFloat::IEEEdouble(), false, false, 0x0000000000000000ULL },
-    { 0xfff8000000000000ULL, APFloat::IEEEdouble(), false,  true, 0x0000000000000000ULL },
-    { 0x7ff800000000ae72ULL, APFloat::IEEEdouble(), false, false, 0x000000000000ae72ULL },
-    { 0x7fffffffffffae72ULL, APFloat::IEEEdouble(), false, false, 0xffffffffffffae72ULL },
-    { 0x7ffdaaaaaaaaae72ULL, APFloat::IEEEdouble(), false, false, 0x000daaaaaaaaae72ULL },
-    { 0x7ff4000000000000ULL, APFloat::IEEEdouble(),  true, false, 0x0000000000000000ULL },
-    { 0xfff4000000000000ULL, APFloat::IEEEdouble(),  true,  true, 0x0000000000000000ULL },
-    { 0x7ff000000000ae72ULL, APFloat::IEEEdouble(),  true, false, 0x000000000000ae72ULL },
-    { 0x7ff7ffffffffae72ULL, APFloat::IEEEdouble(),  true, false, 0xffffffffffffae72ULL },
-    { 0x7ff1aaaaaaaaae72ULL, APFloat::IEEEdouble(),  true, false, 0x0001aaaaaaaaae72ULL },
-  };
-
-  for (const auto &t : tests) {
-    ASSERT_EQ(t.expected, nanbitsFromAPInt(t.semantics, t.SNaN, t.Negative, t.payload));
-  }
-}
-
-#ifdef GTEST_HAS_DEATH_TEST
-#ifndef NDEBUG
-TEST(APFloatTest, SemanticsDeath) {
-  EXPECT_DEATH(APFloat(APFloat::IEEEquad(), 0).convertToDouble(),
-               "Float semantics is not representable by IEEEdouble");
-  EXPECT_DEATH(APFloat(APFloat::IEEEdouble(), 0).convertToFloat(),
-               "Float semantics is not representable by IEEEsingle");
-}
-#endif
-#endif
-
-TEST(APFloatTest, StringDecimalError) {
-  EXPECT_EQ("Invalid string length", convertToErrorFromString(""));
-  EXPECT_EQ("String has no digits", convertToErrorFromString("+"));
-  EXPECT_EQ("String has no digits", convertToErrorFromString("-"));
-
-  EXPECT_EQ("Invalid character in significand", convertToErrorFromString(StringRef("\0", 1)));
-  EXPECT_EQ("Invalid character in significand", convertToErrorFromString(StringRef("1\0", 2)));
-  EXPECT_EQ("Invalid character in significand", convertToErrorFromString(StringRef("1" "\0" "2", 3)));
-  EXPECT_EQ("Invalid character in significand", convertToErrorFromString(StringRef("1" "\0" "2e1", 5)));
-  EXPECT_EQ("Invalid character in exponent", convertToErrorFromString(StringRef("1e\0", 3)));
-  EXPECT_EQ("Invalid character in exponent", convertToErrorFromString(StringRef("1e1\0", 4)));
-  EXPECT_EQ("Invalid character in exponent", convertToErrorFromString(StringRef("1e1" "\0" "2", 5)));
-
-  EXPECT_EQ("Invalid character in significand", convertToErrorFromString("1.0f"));
-
-  EXPECT_EQ("String contains multiple dots", convertToErrorFromString(".."));
-  EXPECT_EQ("String contains multiple dots", convertToErrorFromString("..0"));
-  EXPECT_EQ("String contains multiple dots", convertToErrorFromString("1.0.0"));
-}
-
-TEST(APFloatTest, StringDecimalSignificandError) {
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString( "."));
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString("+."));
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString("-."));
-
-
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString( "e"));
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString("+e"));
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString("-e"));
-
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString( "e1"));
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString("+e1"));
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString("-e1"));
-
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString( ".e1"));
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString("+.e1"));
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString("-.e1"));
-
-
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString( ".e"));
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString("+.e"));
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString("-.e"));
-}
-
-TEST(APFloatTest, StringHexadecimalError) {
-  EXPECT_EQ("Invalid string", convertToErrorFromString( "0x"));
-  EXPECT_EQ("Invalid string", convertToErrorFromString("+0x"));
-  EXPECT_EQ("Invalid string", convertToErrorFromString("-0x"));
-
-  EXPECT_EQ("Hex strings require an exponent", convertToErrorFromString( "0x0"));
-  EXPECT_EQ("Hex strings require an exponent", convertToErrorFromString("+0x0"));
-  EXPECT_EQ("Hex strings require an exponent", convertToErrorFromString("-0x0"));
-
-  EXPECT_EQ("Hex strings require an exponent", convertToErrorFromString( "0x0."));
-  EXPECT_EQ("Hex strings require an exponent", convertToErrorFromString("+0x0."));
-  EXPECT_EQ("Hex strings require an exponent", convertToErrorFromString("-0x0."));
-
-  EXPECT_EQ("Hex strings require an exponent", convertToErrorFromString( "0x.0"));
-  EXPECT_EQ("Hex strings require an exponent", convertToErrorFromString("+0x.0"));
-  EXPECT_EQ("Hex strings require an exponent", convertToErrorFromString("-0x.0"));
-
-  EXPECT_EQ("Hex strings require an exponent", convertToErrorFromString( "0x0.0"));
-  EXPECT_EQ("Hex strings require an exponent", convertToErrorFromString("+0x0.0"));
-  EXPECT_EQ("Hex strings require an exponent", convertToErrorFromString("-0x0.0"));
-
-  EXPECT_EQ("Invalid character in significand", convertToErrorFromString(StringRef("0x\0", 3)));
-  EXPECT_EQ("Invalid character in significand", convertToErrorFromString(StringRef("0x1\0", 4)));
-  EXPECT_EQ("Invalid character in significand", convertToErrorFromString(StringRef("0x1" "\0" "2", 5)));
-  EXPECT_EQ("Invalid character in significand", convertToErrorFromString(StringRef("0x1" "\0" "2p1", 7)));
-  EXPECT_EQ("Invalid character in exponent", convertToErrorFromString(StringRef("0x1p\0", 5)));
-  EXPECT_EQ("Invalid character in exponent", convertToErrorFromString(StringRef("0x1p1\0", 6)));
-  EXPECT_EQ("Invalid character in exponent", convertToErrorFromString(StringRef("0x1p1" "\0" "2", 7)));
-
-  EXPECT_EQ("Invalid character in exponent", convertToErrorFromString("0x1p0f"));
-
-  EXPECT_EQ("String contains multiple dots", convertToErrorFromString("0x..p1"));
-  EXPECT_EQ("String contains multiple dots", convertToErrorFromString("0x..0p1"));
-  EXPECT_EQ("String contains multiple dots", convertToErrorFromString("0x1.0.0p1"));
-}
-
-TEST(APFloatTest, StringHexadecimalSignificandError) {
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString( "0x."));
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString("+0x."));
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString("-0x."));
-
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString( "0xp"));
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString("+0xp"));
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString("-0xp"));
-
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString( "0xp+"));
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString("+0xp+"));
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString("-0xp+"));
-
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString( "0xp-"));
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString("+0xp-"));
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString("-0xp-"));
-
-
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString( "0x.p"));
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString("+0x.p"));
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString("-0x.p"));
-
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString( "0x.p+"));
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString("+0x.p+"));
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString("-0x.p+"));
-
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString( "0x.p-"));
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString("+0x.p-"));
-  EXPECT_EQ("Significand has no digits", convertToErrorFromString("-0x.p-"));
-}
-
-TEST(APFloatTest, StringHexadecimalExponentError) {
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString( "0x1p"));
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString("+0x1p"));
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString("-0x1p"));
-
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString( "0x1p+"));
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString("+0x1p+"));
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString("-0x1p+"));
-
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString( "0x1p-"));
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString("+0x1p-"));
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString("-0x1p-"));
-
-
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString( "0x1.p"));
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString("+0x1.p"));
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString("-0x1.p"));
-
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString( "0x1.p+"));
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString("+0x1.p+"));
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString("-0x1.p+"));
-
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString( "0x1.p-"));
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString("+0x1.p-"));
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString("-0x1.p-"));
-
-
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString( "0x.1p"));
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString("+0x.1p"));
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString("-0x.1p"));
-
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString( "0x.1p+"));
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString("+0x.1p+"));
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString("-0x.1p+"));
-
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString( "0x.1p-"));
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString("+0x.1p-"));
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString("-0x.1p-"));
-
-
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString( "0x1.1p"));
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString("+0x1.1p"));
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString("-0x1.1p"));
-
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString( "0x1.1p+"));
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString("+0x1.1p+"));
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString("-0x1.1p+"));
-
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString( "0x1.1p-"));
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString("+0x1.1p-"));
-  EXPECT_EQ("Exponent has no digits", convertToErrorFromString("-0x1.1p-"));
-}
-
-TEST(APFloatTest, exactInverse) {
-  APFloat inv(0.0f);
-
-  // Trivial operation.
-  EXPECT_TRUE(APFloat(2.0).getExactInverse(&inv));
-  EXPECT_TRUE(inv.bitwiseIsEqual(APFloat(0.5)));
-  EXPECT_TRUE(APFloat(2.0f).getExactInverse(&inv));
-  EXPECT_TRUE(inv.bitwiseIsEqual(APFloat(0.5f)));
-  EXPECT_TRUE(APFloat(APFloat::IEEEquad(), "2.0").getExactInverse(&inv));
-  EXPECT_TRUE(inv.bitwiseIsEqual(APFloat(APFloat::IEEEquad(), "0.5")));
-  EXPECT_TRUE(APFloat(APFloat::PPCDoubleDouble(), "2.0").getExactInverse(&inv));
-  EXPECT_TRUE(inv.bitwiseIsEqual(APFloat(APFloat::PPCDoubleDouble(), "0.5")));
-  EXPECT_TRUE(APFloat(APFloat::x87DoubleExtended(), "2.0").getExactInverse(&inv));
-  EXPECT_TRUE(inv.bitwiseIsEqual(APFloat(APFloat::x87DoubleExtended(), "0.5")));
-
-  // FLT_MIN
-  EXPECT_TRUE(APFloat(1.17549435e-38f).getExactInverse(&inv));
-  EXPECT_TRUE(inv.bitwiseIsEqual(APFloat(8.5070592e+37f)));
-
-  // Large float, inverse is a denormal.
-  EXPECT_FALSE(APFloat(1.7014118e38f).getExactInverse(nullptr));
-  // Zero
-  EXPECT_FALSE(APFloat(0.0).getExactInverse(nullptr));
-  // Denormalized float
-  EXPECT_FALSE(APFloat(1.40129846e-45f).getExactInverse(nullptr));
-}
-
-TEST(APFloatTest, roundToIntegral) {
-  APFloat T(-0.5), S(3.14), R(APFloat::getLargest(APFloat::IEEEdouble())), P(0.0);
-
-  P = T;
-  P.roundToIntegral(APFloat::rmTowardZero);
-  EXPECT_EQ(-0.0, P.convertToDouble());
-  P = T;
-  P.roundToIntegral(APFloat::rmTowardNegative);
-  EXPECT_EQ(-1.0, P.convertToDouble());
-  P = T;
-  P.roundToIntegral(APFloat::rmTowardPositive);
-  EXPECT_EQ(-0.0, P.convertToDouble());
-  P = T;
-  P.roundToIntegral(APFloat::rmNearestTiesToEven);
-  EXPECT_EQ(-0.0, P.convertToDouble());
-
-  P = S;
-  P.roundToIntegral(APFloat::rmTowardZero);
-  EXPECT_EQ(3.0, P.convertToDouble());
-  P = S;
-  P.roundToIntegral(APFloat::rmTowardNegative);
-  EXPECT_EQ(3.0, P.convertToDouble());
-  P = S;
-  P.roundToIntegral(APFloat::rmTowardPositive);
-  EXPECT_EQ(4.0, P.convertToDouble());
-  P = S;
-  P.roundToIntegral(APFloat::rmNearestTiesToEven);
-  EXPECT_EQ(3.0, P.convertToDouble());
-
-  P = R;
-  P.roundToIntegral(APFloat::rmTowardZero);
-  EXPECT_EQ(R.convertToDouble(), P.convertToDouble());
-  P = R;
-  P.roundToIntegral(APFloat::rmTowardNegative);
-  EXPECT_EQ(R.convertToDouble(), P.convertToDouble());
-  P = R;
-  P.roundToIntegral(APFloat::rmTowardPositive);
-  EXPECT_EQ(R.convertToDouble(), P.convertToDouble());
-  P = R;
-  P.roundToIntegral(APFloat::rmNearestTiesToEven);
-  EXPECT_EQ(R.convertToDouble(), P.convertToDouble());
-
-  P = APFloat::getZero(APFloat::IEEEdouble());
-  P.roundToIntegral(APFloat::rmTowardZero);
-  EXPECT_EQ(0.0, P.convertToDouble());
-  P = APFloat::getZero(APFloat::IEEEdouble(), true);
-  P.roundToIntegral(APFloat::rmTowardZero);
-  EXPECT_EQ(-0.0, P.convertToDouble());
-  P = APFloat::getNaN(APFloat::IEEEdouble());
-  P.roundToIntegral(APFloat::rmTowardZero);
-  EXPECT_TRUE(std::isnan(P.convertToDouble()));
-  P = APFloat::getInf(APFloat::IEEEdouble());
-  P.roundToIntegral(APFloat::rmTowardZero);
-  EXPECT_TRUE(std::isinf(P.convertToDouble()) && P.convertToDouble() > 0.0);
-  P = APFloat::getInf(APFloat::IEEEdouble(), true);
-  P.roundToIntegral(APFloat::rmTowardZero);
-  EXPECT_TRUE(std::isinf(P.convertToDouble()) && P.convertToDouble() < 0.0);
-
-  APFloat::opStatus St;
-
-  P = APFloat::getNaN(APFloat::IEEEdouble());
-  St = P.roundToIntegral(APFloat::rmTowardZero);
-  EXPECT_TRUE(P.isNaN());
-  EXPECT_FALSE(P.isNegative());
-  EXPECT_EQ(APFloat::opOK, St);
-
-  P = APFloat::getNaN(APFloat::IEEEdouble(), true);
-  St = P.roundToIntegral(APFloat::rmTowardZero);
-  EXPECT_TRUE(P.isNaN());
-  EXPECT_TRUE(P.isNegative());
-  EXPECT_EQ(APFloat::opOK, St);
-
-  P = APFloat::getSNaN(APFloat::IEEEdouble());
-  St = P.roundToIntegral(APFloat::rmTowardZero);
-  EXPECT_TRUE(P.isNaN());
-  EXPECT_FALSE(P.isSignaling());
-  EXPECT_FALSE(P.isNegative());
-  EXPECT_EQ(APFloat::opInvalidOp, St);
-
-  P = APFloat::getSNaN(APFloat::IEEEdouble(), true);
-  St = P.roundToIntegral(APFloat::rmTowardZero);
-  EXPECT_TRUE(P.isNaN());
-  EXPECT_FALSE(P.isSignaling());
-  EXPECT_TRUE(P.isNegative());
-  EXPECT_EQ(APFloat::opInvalidOp, St);
-
-  P = APFloat::getInf(APFloat::IEEEdouble());
-  St = P.roundToIntegral(APFloat::rmTowardZero);
-  EXPECT_TRUE(P.isInfinity());
-  EXPECT_FALSE(P.isNegative());
-  EXPECT_EQ(APFloat::opOK, St);
-
-  P = APFloat::getInf(APFloat::IEEEdouble(), true);
-  St = P.roundToIntegral(APFloat::rmTowardZero);
-  EXPECT_TRUE(P.isInfinity());
-  EXPECT_TRUE(P.isNegative());
-  EXPECT_EQ(APFloat::opOK, St);
-
-  P = APFloat::getZero(APFloat::IEEEdouble(), false);
-  St = P.roundToIntegral(APFloat::rmTowardZero);
-  EXPECT_TRUE(P.isZero());
-  EXPECT_FALSE(P.isNegative());
-  EXPECT_EQ(APFloat::opOK, St);
-
-  P = APFloat::getZero(APFloat::IEEEdouble(), false);
-  St = P.roundToIntegral(APFloat::rmTowardNegative);
-  EXPECT_TRUE(P.isZero());
-  EXPECT_FALSE(P.isNegative());
-  EXPECT_EQ(APFloat::opOK, St);
-
-  P = APFloat::getZero(APFloat::IEEEdouble(), true);
-  St = P.roundToIntegral(APFloat::rmTowardZero);
-  EXPECT_TRUE(P.isZero());
-  EXPECT_TRUE(P.isNegative());
-  EXPECT_EQ(APFloat::opOK, St);
-
-  P = APFloat::getZero(APFloat::IEEEdouble(), true);
-  St = P.roundToIntegral(APFloat::rmTowardNegative);
-  EXPECT_TRUE(P.isZero());
-  EXPECT_TRUE(P.isNegative());
-  EXPECT_EQ(APFloat::opOK, St);
-
-  P = APFloat(1E-100);
-  St = P.roundToIntegral(APFloat::rmTowardNegative);
-  EXPECT_TRUE(P.isZero());
-  EXPECT_FALSE(P.isNegative());
-  EXPECT_EQ(APFloat::opInexact, St);
-
-  P = APFloat(1E-100);
-  St = P.roundToIntegral(APFloat::rmTowardPositive);
-  EXPECT_EQ(1.0, P.convertToDouble());
-  EXPECT_FALSE(P.isNegative());
-  EXPECT_EQ(APFloat::opInexact, St);
-
-  P = APFloat(-1E-100);
-  St = P.roundToIntegral(APFloat::rmTowardNegative);
-  EXPECT_TRUE(P.isNegative());
-  EXPECT_EQ(-1.0, P.convertToDouble());
-  EXPECT_EQ(APFloat::opInexact, St);
-
-  P = APFloat(-1E-100);
-  St = P.roundToIntegral(APFloat::rmTowardPositive);
-  EXPECT_TRUE(P.isZero());
-  EXPECT_TRUE(P.isNegative());
-  EXPECT_EQ(APFloat::opInexact, St);
-
-  P = APFloat(10.0);
-  St = P.roundToIntegral(APFloat::rmTowardZero);
-  EXPECT_EQ(10.0, P.convertToDouble());
-  EXPECT_EQ(APFloat::opOK, St);
-
-  P = APFloat(10.5);
-  St = P.roundToIntegral(APFloat::rmTowardZero);
-  EXPECT_EQ(10.0, P.convertToDouble());
-  EXPECT_EQ(APFloat::opInexact, St);
-
-  P = APFloat(10.5);
-  St = P.roundToIntegral(APFloat::rmTowardPositive);
-  EXPECT_EQ(11.0, P.convertToDouble());
-  EXPECT_EQ(APFloat::opInexact, St);
-
-  P = APFloat(10.5);
-  St = P.roundToIntegral(APFloat::rmTowardNegative);
-  EXPECT_EQ(10.0, P.convertToDouble());
-  EXPECT_EQ(APFloat::opInexact, St);
-
-  P = APFloat(10.5);
-  St = P.roundToIntegral(APFloat::rmNearestTiesToAway);
-  EXPECT_EQ(11.0, P.convertToDouble());
-  EXPECT_EQ(APFloat::opInexact, St);
-
-  P = APFloat(10.5);
-  St = P.roundToIntegral(APFloat::rmNearestTiesToEven);
-  EXPECT_EQ(10.0, P.convertToDouble());
-  EXPECT_EQ(APFloat::opInexact, St);
-}
-
-TEST(APFloatTest, isInteger) {
-  APFloat T(-0.0);
-  EXPECT_TRUE(T.isInteger());
-  T = APFloat(3.14159);
-  EXPECT_FALSE(T.isInteger());
-  T = APFloat::getNaN(APFloat::IEEEdouble());
-  EXPECT_FALSE(T.isInteger());
-  T = APFloat::getInf(APFloat::IEEEdouble());
-  EXPECT_FALSE(T.isInteger());
-  T = APFloat::getInf(APFloat::IEEEdouble(), true);
-  EXPECT_FALSE(T.isInteger());
-  T = APFloat::getLargest(APFloat::IEEEdouble());
-  EXPECT_TRUE(T.isInteger());
-}
-
-TEST(DoubleAPFloatTest, isInteger) {
-  APFloat F1(-0.0);
-  APFloat F2(-0.0);
-  llvm::detail::DoubleAPFloat T(APFloat::PPCDoubleDouble(), std::move(F1),
-                                std::move(F2));
-  EXPECT_TRUE(T.isInteger());
-  APFloat F3(3.14159);
-  APFloat F4(-0.0);
-  llvm::detail::DoubleAPFloat T2(APFloat::PPCDoubleDouble(), std::move(F3),
-                                std::move(F4));
-  EXPECT_FALSE(T2.isInteger());
-  APFloat F5(-0.0);
-  APFloat F6(3.14159);
-  llvm::detail::DoubleAPFloat T3(APFloat::PPCDoubleDouble(), std::move(F5),
-                                std::move(F6));
-  EXPECT_FALSE(T3.isInteger());
-}
-
-TEST(APFloatTest, getLargest) {
-  EXPECT_EQ(3.402823466e+38f, APFloat::getLargest(APFloat::IEEEsingle()).convertToFloat());
-  EXPECT_EQ(1.7976931348623158e+308, APFloat::getLargest(APFloat::IEEEdouble()).convertToDouble());
-}
-
-TEST(APFloatTest, getSmallest) {
-  APFloat test = APFloat::getSmallest(APFloat::IEEEsingle(), false);
-  APFloat expected = APFloat(APFloat::IEEEsingle(), "0x0.000002p-126");
-  EXPECT_FALSE(test.isNegative());
-  EXPECT_TRUE(test.isFiniteNonZero());
-  EXPECT_TRUE(test.isDenormal());
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  test = APFloat::getSmallest(APFloat::IEEEsingle(), true);
-  expected = APFloat(APFloat::IEEEsingle(), "-0x0.000002p-126");
-  EXPECT_TRUE(test.isNegative());
-  EXPECT_TRUE(test.isFiniteNonZero());
-  EXPECT_TRUE(test.isDenormal());
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  test = APFloat::getSmallest(APFloat::IEEEquad(), false);
-  expected = APFloat(APFloat::IEEEquad(), "0x0.0000000000000000000000000001p-16382");
-  EXPECT_FALSE(test.isNegative());
-  EXPECT_TRUE(test.isFiniteNonZero());
-  EXPECT_TRUE(test.isDenormal());
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  test = APFloat::getSmallest(APFloat::IEEEquad(), true);
-  expected = APFloat(APFloat::IEEEquad(), "-0x0.0000000000000000000000000001p-16382");
-  EXPECT_TRUE(test.isNegative());
-  EXPECT_TRUE(test.isFiniteNonZero());
-  EXPECT_TRUE(test.isDenormal());
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-}
-
-TEST(APFloatTest, getSmallestNormalized) {
-  APFloat test = APFloat::getSmallestNormalized(APFloat::IEEEsingle(), false);
-  APFloat expected = APFloat(APFloat::IEEEsingle(), "0x1p-126");
-  EXPECT_FALSE(test.isNegative());
-  EXPECT_TRUE(test.isFiniteNonZero());
-  EXPECT_FALSE(test.isDenormal());
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  test = APFloat::getSmallestNormalized(APFloat::IEEEsingle(), true);
-  expected = APFloat(APFloat::IEEEsingle(), "-0x1p-126");
-  EXPECT_TRUE(test.isNegative());
-  EXPECT_TRUE(test.isFiniteNonZero());
-  EXPECT_FALSE(test.isDenormal());
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  test = APFloat::getSmallestNormalized(APFloat::IEEEquad(), false);
-  expected = APFloat(APFloat::IEEEquad(), "0x1p-16382");
-  EXPECT_FALSE(test.isNegative());
-  EXPECT_TRUE(test.isFiniteNonZero());
-  EXPECT_FALSE(test.isDenormal());
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-
-  test = APFloat::getSmallestNormalized(APFloat::IEEEquad(), true);
-  expected = APFloat(APFloat::IEEEquad(), "-0x1p-16382");
-  EXPECT_TRUE(test.isNegative());
-  EXPECT_TRUE(test.isFiniteNonZero());
-  EXPECT_FALSE(test.isDenormal());
-  EXPECT_TRUE(test.bitwiseIsEqual(expected));
-}
-
-TEST(APFloatTest, getZero) {
-  struct {
-    const fltSemantics *semantics;
-    const bool sign;
-    const unsigned long long bitPattern[2];
-    const unsigned bitPatternLength;
-  } const GetZeroTest[] = {
-    { &APFloat::IEEEhalf(), false, {0, 0}, 1},
-    { &APFloat::IEEEhalf(), true, {0x8000ULL, 0}, 1},
-    { &APFloat::IEEEsingle(), false, {0, 0}, 1},
-    { &APFloat::IEEEsingle(), true, {0x80000000ULL, 0}, 1},
-    { &APFloat::IEEEdouble(), false, {0, 0}, 1},
-    { &APFloat::IEEEdouble(), true, {0x8000000000000000ULL, 0}, 1},
-    { &APFloat::IEEEquad(), false, {0, 0}, 2},
-    { &APFloat::IEEEquad(), true, {0, 0x8000000000000000ULL}, 2},
-    { &APFloat::PPCDoubleDouble(), false, {0, 0}, 2},
-    { &APFloat::PPCDoubleDouble(), true, {0x8000000000000000ULL, 0}, 2},
-    { &APFloat::x87DoubleExtended(), false, {0, 0}, 2},
-    { &APFloat::x87DoubleExtended(), true, {0, 0x8000ULL}, 2},
-  };
-  const unsigned NumGetZeroTests = 12;
-  for (unsigned i = 0; i < NumGetZeroTests; ++i) {
-    APFloat test = APFloat::getZero(*GetZeroTest[i].semantics,
-                                    GetZeroTest[i].sign);
-    const char *pattern = GetZeroTest[i].sign? "-0x0p+0" : "0x0p+0";
-    APFloat expected = APFloat(*GetZeroTest[i].semantics,
-                               pattern);
-    EXPECT_TRUE(test.isZero());
-    EXPECT_TRUE(GetZeroTest[i].sign? test.isNegative() : !test.isNegative());
-    EXPECT_TRUE(test.bitwiseIsEqual(expected));
-    for (unsigned j = 0, je = GetZeroTest[i].bitPatternLength; j < je; ++j) {
-      EXPECT_EQ(GetZeroTest[i].bitPattern[j],
-                test.bitcastToAPInt().getRawData()[j]);
-    }
-  }
-}
-
-TEST(APFloatTest, copySign) {
-  EXPECT_TRUE(APFloat(-42.0).bitwiseIsEqual(
-      APFloat::copySign(APFloat(42.0), APFloat(-1.0))));
-  EXPECT_TRUE(APFloat(42.0).bitwiseIsEqual(
-      APFloat::copySign(APFloat(-42.0), APFloat(1.0))));
-  EXPECT_TRUE(APFloat(-42.0).bitwiseIsEqual(
-      APFloat::copySign(APFloat(-42.0), APFloat(-1.0))));
-  EXPECT_TRUE(APFloat(42.0).bitwiseIsEqual(
-      APFloat::copySign(APFloat(42.0), APFloat(1.0))));
-}
-
-TEST(APFloatTest, convert) {
-  bool losesInfo;
-  APFloat test(APFloat::IEEEdouble(), "1.0");
-  test.convert(APFloat::IEEEsingle(), APFloat::rmNearestTiesToEven, &losesInfo);
-  EXPECT_EQ(1.0f, test.convertToFloat());
-  EXPECT_FALSE(losesInfo);
-
-  test = APFloat(APFloat::x87DoubleExtended(), "0x1p-53");
-  test.add(APFloat(APFloat::x87DoubleExtended(), "1.0"), APFloat::rmNearestTiesToEven);
-  test.convert(APFloat::IEEEdouble(), APFloat::rmNearestTiesToEven, &losesInfo);
-  EXPECT_EQ(1.0, test.convertToDouble());
-  EXPECT_TRUE(losesInfo);
-
-  test = APFloat(APFloat::IEEEquad(), "0x1p-53");
-  test.add(APFloat(APFloat::IEEEquad(), "1.0"), APFloat::rmNearestTiesToEven);
-  test.convert(APFloat::IEEEdouble(), APFloat::rmNearestTiesToEven, &losesInfo);
-  EXPECT_EQ(1.0, test.convertToDouble());
-  EXPECT_TRUE(losesInfo);
-
-  test = APFloat(APFloat::x87DoubleExtended(), "0xf.fffffffp+28");
-  test.convert(APFloat::IEEEdouble(), APFloat::rmNearestTiesToEven, &losesInfo);
-  EXPECT_EQ(4294967295.0, test.convertToDouble());
-  EXPECT_FALSE(losesInfo);
-
-  test = APFloat::getSNaN(APFloat::IEEEsingle());
-  APFloat::opStatus status = test.convert(APFloat::x87DoubleExtended(), APFloat::rmNearestTiesToEven, &losesInfo);
-  // Conversion quiets the SNAN, so now 2 bits of the 64-bit significand should be set.
-  APInt topTwoBits(64, 0x6000000000000000);
-  EXPECT_TRUE(test.bitwiseIsEqual(APFloat::getQNaN(APFloat::x87DoubleExtended(), false, &topTwoBits)));
-  EXPECT_FALSE(losesInfo);
-  EXPECT_EQ(status, APFloat::opInvalidOp);
-
-  test = APFloat::getQNaN(APFloat::IEEEsingle());
-  APFloat X87QNaN = APFloat::getQNaN(APFloat::x87DoubleExtended());
-  test.convert(APFloat::x87DoubleExtended(), APFloat::rmNearestTiesToEven,
-               &losesInfo);
-  EXPECT_TRUE(test.bitwiseIsEqual(X87QNaN));
-  EXPECT_FALSE(losesInfo);
-
-  test = APFloat::getSNaN(APFloat::x87DoubleExtended());
-  test.convert(APFloat::x87DoubleExtended(), APFloat::rmNearestTiesToEven,
-               &losesInfo);
-  APFloat X87SNaN = APFloat::getSNaN(APFloat::x87DoubleExtended());
-  EXPECT_TRUE(test.bitwiseIsEqual(X87SNaN));
-  EXPECT_FALSE(losesInfo);
-
-  test = APFloat::getQNaN(APFloat::x87DoubleExtended());
-  test.convert(APFloat::x87DoubleExtended(), APFloat::rmNearestTiesToEven,
-               &losesInfo);
-  EXPECT_TRUE(test.bitwiseIsEqual(X87QNaN));
-  EXPECT_FALSE(losesInfo);
-
-  // The payload is lost in truncation, but we retain NaN by setting the quiet bit.
-  APInt payload(52, 1);
-  test = APFloat::getSNaN(APFloat::IEEEdouble(), false, &payload);
-  status = test.convert(APFloat::IEEEsingle(), APFloat::rmNearestTiesToEven, &losesInfo);
-  EXPECT_EQ(0x7fc00000, test.bitcastToAPInt());
-  EXPECT_TRUE(losesInfo);
-  EXPECT_EQ(status, APFloat::opInvalidOp);
-
-  // The payload is lost in truncation. QNaN remains QNaN.
-  test = APFloat::getQNaN(APFloat::IEEEdouble(), false, &payload);
-  status = test.convert(APFloat::IEEEsingle(), APFloat::rmNearestTiesToEven, &losesInfo);
-  EXPECT_EQ(0x7fc00000, test.bitcastToAPInt());
-  EXPECT_TRUE(losesInfo);
-  EXPECT_EQ(status, APFloat::opOK);
-}
-
-TEST(APFloatTest, PPCDoubleDouble) {
-  APFloat test(APFloat::PPCDoubleDouble(), "1.0");
-  EXPECT_EQ(0x3ff0000000000000ull, test.bitcastToAPInt().getRawData()[0]);
-  EXPECT_EQ(0x0000000000000000ull, test.bitcastToAPInt().getRawData()[1]);
-
-  // LDBL_MAX
-  test = APFloat(APFloat::PPCDoubleDouble(), "1.79769313486231580793728971405301e+308");
-  EXPECT_EQ(0x7fefffffffffffffull, test.bitcastToAPInt().getRawData()[0]);
-  EXPECT_EQ(0x7c8ffffffffffffeull, test.bitcastToAPInt().getRawData()[1]);
-
-  // LDBL_MIN
-  test = APFloat(APFloat::PPCDoubleDouble(), "2.00416836000897277799610805135016e-292");
-  EXPECT_EQ(0x0360000000000000ull, test.bitcastToAPInt().getRawData()[0]);
-  EXPECT_EQ(0x0000000000000000ull, test.bitcastToAPInt().getRawData()[1]);
-
-  // PR30869
-  {
-    auto Result = APFloat(APFloat::PPCDoubleDouble(), "1.0") +
-                  APFloat(APFloat::PPCDoubleDouble(), "1.0");
-    EXPECT_EQ(&APFloat::PPCDoubleDouble(), &Result.getSemantics());
-
-    Result = APFloat(APFloat::PPCDoubleDouble(), "1.0") -
-             APFloat(APFloat::PPCDoubleDouble(), "1.0");
-    EXPECT_EQ(&APFloat::PPCDoubleDouble(), &Result.getSemantics());
-
-    Result = APFloat(APFloat::PPCDoubleDouble(), "1.0") *
-             APFloat(APFloat::PPCDoubleDouble(), "1.0");
-    EXPECT_EQ(&APFloat::PPCDoubleDouble(), &Result.getSemantics());
-
-    Result = APFloat(APFloat::PPCDoubleDouble(), "1.0") /
-             APFloat(APFloat::PPCDoubleDouble(), "1.0");
-    EXPECT_EQ(&APFloat::PPCDoubleDouble(), &Result.getSemantics());
-
-    int Exp;
-    Result = frexp(APFloat(APFloat::PPCDoubleDouble(), "1.0"), Exp,
-                   APFloat::rmNearestTiesToEven);
-    EXPECT_EQ(&APFloat::PPCDoubleDouble(), &Result.getSemantics());
-
-    Result = scalbn(APFloat(APFloat::PPCDoubleDouble(), "1.0"), 1,
-                    APFloat::rmNearestTiesToEven);
-    EXPECT_EQ(&APFloat::PPCDoubleDouble(), &Result.getSemantics());
-  }
-}
-
-TEST(APFloatTest, isNegative) {
-  APFloat t(APFloat::IEEEsingle(), "0x1p+0");
-  EXPECT_FALSE(t.isNegative());
-  t = APFloat(APFloat::IEEEsingle(), "-0x1p+0");
-  EXPECT_TRUE(t.isNegative());
-
-  EXPECT_FALSE(APFloat::getInf(APFloat::IEEEsingle(), false).isNegative());
-  EXPECT_TRUE(APFloat::getInf(APFloat::IEEEsingle(), true).isNegative());
-
-  EXPECT_FALSE(APFloat::getZero(APFloat::IEEEsingle(), false).isNegative());
-  EXPECT_TRUE(APFloat::getZero(APFloat::IEEEsingle(), true).isNegative());
-
-  EXPECT_FALSE(APFloat::getNaN(APFloat::IEEEsingle(), false).isNegative());
-  EXPECT_TRUE(APFloat::getNaN(APFloat::IEEEsingle(), true).isNegative());
-
-  EXPECT_FALSE(APFloat::getSNaN(APFloat::IEEEsingle(), false).isNegative());
-  EXPECT_TRUE(APFloat::getSNaN(APFloat::IEEEsingle(), true).isNegative());
-}
-
-TEST(APFloatTest, isNormal) {
-  APFloat t(APFloat::IEEEsingle(), "0x1p+0");
-  EXPECT_TRUE(t.isNormal());
-
-  EXPECT_FALSE(APFloat::getInf(APFloat::IEEEsingle(), false).isNormal());
-  EXPECT_FALSE(APFloat::getZero(APFloat::IEEEsingle(), false).isNormal());
-  EXPECT_FALSE(APFloat::getNaN(APFloat::IEEEsingle(), false).isNormal());
-  EXPECT_FALSE(APFloat::getSNaN(APFloat::IEEEsingle(), false).isNormal());
-  EXPECT_FALSE(APFloat(APFloat::IEEEsingle(), "0x1p-149").isNormal());
-}
-
-TEST(APFloatTest, isFinite) {
-  APFloat t(APFloat::IEEEsingle(), "0x1p+0");
-  EXPECT_TRUE(t.isFinite());
-  EXPECT_FALSE(APFloat::getInf(APFloat::IEEEsingle(), false).isFinite());
-  EXPECT_TRUE(APFloat::getZero(APFloat::IEEEsingle(), false).isFinite());
-  EXPECT_FALSE(APFloat::getNaN(APFloat::IEEEsingle(), false).isFinite());
-  EXPECT_FALSE(APFloat::getSNaN(APFloat::IEEEsingle(), false).isFinite());
-  EXPECT_TRUE(APFloat(APFloat::IEEEsingle(), "0x1p-149").isFinite());
-}
-
-TEST(APFloatTest, isInfinity) {
-  APFloat t(APFloat::IEEEsingle(), "0x1p+0");
-  EXPECT_FALSE(t.isInfinity());
-  EXPECT_TRUE(APFloat::getInf(APFloat::IEEEsingle(), false).isInfinity());
-  EXPECT_FALSE(APFloat::getZero(APFloat::IEEEsingle(), false).isInfinity());
-  EXPECT_FALSE(APFloat::getNaN(APFloat::IEEEsingle(), false).isInfinity());
-  EXPECT_FALSE(APFloat::getSNaN(APFloat::IEEEsingle(), false).isInfinity());
-  EXPECT_FALSE(APFloat(APFloat::IEEEsingle(), "0x1p-149").isInfinity());
-}
-
-TEST(APFloatTest, isNaN) {
-  APFloat t(APFloat::IEEEsingle(), "0x1p+0");
-  EXPECT_FALSE(t.isNaN());
-  EXPECT_FALSE(APFloat::getInf(APFloat::IEEEsingle(), false).isNaN());
-  EXPECT_FALSE(APFloat::getZero(APFloat::IEEEsingle(), false).isNaN());
-  EXPECT_TRUE(APFloat::getNaN(APFloat::IEEEsingle(), false).isNaN());
-  EXPECT_TRUE(APFloat::getSNaN(APFloat::IEEEsingle(), false).isNaN());
-  EXPECT_FALSE(APFloat(APFloat::IEEEsingle(), "0x1p-149").isNaN());
-}
-
-TEST(APFloatTest, isFiniteNonZero) {
-  // Test positive/negative normal value.
-  EXPECT_TRUE(APFloat(APFloat::IEEEsingle(), "0x1p+0").isFiniteNonZero());
-  EXPECT_TRUE(APFloat(APFloat::IEEEsingle(), "-0x1p+0").isFiniteNonZero());
-
-  // Test positive/negative denormal value.
-  EXPECT_TRUE(APFloat(APFloat::IEEEsingle(), "0x1p-149").isFiniteNonZero());
-  EXPECT_TRUE(APFloat(APFloat::IEEEsingle(), "-0x1p-149").isFiniteNonZero());
-
-  // Test +/- Infinity.
-  EXPECT_FALSE(APFloat::getInf(APFloat::IEEEsingle(), false).isFiniteNonZero());
-  EXPECT_FALSE(APFloat::getInf(APFloat::IEEEsingle(), true).isFiniteNonZero());
-
-  // Test +/- Zero.
-  EXPECT_FALSE(APFloat::getZero(APFloat::IEEEsingle(), false).isFiniteNonZero());
-  EXPECT_FALSE(APFloat::getZero(APFloat::IEEEsingle(), true).isFiniteNonZero());
-
-  // Test +/- qNaN. +/- dont mean anything with qNaN but paranoia can't hurt in
-  // this instance.
-  EXPECT_FALSE(APFloat::getNaN(APFloat::IEEEsingle(), false).isFiniteNonZero());
-  EXPECT_FALSE(APFloat::getNaN(APFloat::IEEEsingle(), true).isFiniteNonZero());
-
-  // Test +/- sNaN. +/- dont mean anything with sNaN but paranoia can't hurt in
-  // this instance.
-  EXPECT_FALSE(APFloat::getSNaN(APFloat::IEEEsingle(), false).isFiniteNonZero());
-  EXPECT_FALSE(APFloat::getSNaN(APFloat::IEEEsingle(), true).isFiniteNonZero());
-}
-
-TEST(APFloatTest, add) {
-  // Test Special Cases against each other and normal values.
-
-  APFloat PInf = APFloat::getInf(APFloat::IEEEsingle(), false);
-  APFloat MInf = APFloat::getInf(APFloat::IEEEsingle(), true);
-  APFloat PZero = APFloat::getZero(APFloat::IEEEsingle(), false);
-  APFloat MZero = APFloat::getZero(APFloat::IEEEsingle(), true);
-  APFloat QNaN = APFloat::getNaN(APFloat::IEEEsingle(), false);
-  APFloat SNaN = APFloat(APFloat::IEEEsingle(), "snan123");
-  APFloat PNormalValue = APFloat(APFloat::IEEEsingle(), "0x1p+0");
-  APFloat MNormalValue = APFloat(APFloat::IEEEsingle(), "-0x1p+0");
-  APFloat PLargestValue = APFloat::getLargest(APFloat::IEEEsingle(), false);
-  APFloat MLargestValue = APFloat::getLargest(APFloat::IEEEsingle(), true);
-  APFloat PSmallestValue = APFloat::getSmallest(APFloat::IEEEsingle(), false);
-  APFloat MSmallestValue = APFloat::getSmallest(APFloat::IEEEsingle(), true);
-  APFloat PSmallestNormalized =
-    APFloat::getSmallestNormalized(APFloat::IEEEsingle(), false);
-  APFloat MSmallestNormalized =
-    APFloat::getSmallestNormalized(APFloat::IEEEsingle(), true);
-
-  const int OverflowStatus = APFloat::opOverflow | APFloat::opInexact;
-
-  struct {
-    APFloat x;
-    APFloat y;
-    const char *result;
-    int status;
-    int category;
-  } SpecialCaseTests[] = {
-    { PInf, PInf, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, MInf, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PInf, PZero, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, MZero, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { PInf, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PInf, PNormalValue, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, MNormalValue, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, PLargestValue, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, MLargestValue, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, PSmallestValue, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, MSmallestValue, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, PSmallestNormalized, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, MSmallestNormalized, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, PInf, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MInf, MInf, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, PZero, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, MZero, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { MInf, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MInf, PNormalValue, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, MNormalValue, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, PLargestValue, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, MLargestValue, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, PSmallestValue, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, MSmallestValue, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, PSmallestNormalized, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, MSmallestNormalized, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { PZero, PInf, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PZero, MInf, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { PZero, PZero, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PZero, MZero, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PZero, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { PZero, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PZero, PNormalValue, "0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { PZero, MNormalValue, "-0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { PZero, PLargestValue, "0x1.fffffep+127", APFloat::opOK, APFloat::fcNormal },
-    { PZero, MLargestValue, "-0x1.fffffep+127", APFloat::opOK, APFloat::fcNormal },
-    { PZero, PSmallestValue, "0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { PZero, MSmallestValue, "-0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { PZero, PSmallestNormalized, "0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { PZero, MSmallestNormalized, "-0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { MZero, PInf, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { MZero, MInf, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MZero, PZero, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MZero, MZero, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MZero, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { MZero, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MZero, PNormalValue, "0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { MZero, MNormalValue, "-0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { MZero, PLargestValue, "0x1.fffffep+127", APFloat::opOK, APFloat::fcNormal },
-    { MZero, MLargestValue, "-0x1.fffffep+127", APFloat::opOK, APFloat::fcNormal },
-    { MZero, PSmallestValue, "0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { MZero, MSmallestValue, "-0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { MZero, PSmallestNormalized, "0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { MZero, MSmallestNormalized, "-0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { QNaN, PInf, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, MInf, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, PZero, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, MZero, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, SNaN, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { QNaN, PNormalValue, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, MNormalValue, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, PLargestValue, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, MLargestValue, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, PSmallestValue, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, MSmallestValue, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, PSmallestNormalized, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, MSmallestNormalized, "nan", APFloat::opOK, APFloat::fcNaN },
-    { SNaN, PInf, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, MInf, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, PZero, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, MZero, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, QNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, PNormalValue, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, MNormalValue, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, PLargestValue, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, MLargestValue, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, PSmallestValue, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, MSmallestValue, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, PSmallestNormalized, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, MSmallestNormalized, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PNormalValue, PInf, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PNormalValue, MInf, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { PNormalValue, PZero, "0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { PNormalValue, MZero, "0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { PNormalValue, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { PNormalValue, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PNormalValue, PNormalValue, "0x1p+1", APFloat::opOK, APFloat::fcNormal },
-    { PNormalValue, MNormalValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PNormalValue, PLargestValue, "0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { PNormalValue, MLargestValue, "-0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { PNormalValue, PSmallestValue, "0x1p+0", APFloat::opInexact, APFloat::fcNormal },
-    { PNormalValue, MSmallestValue, "0x1p+0", APFloat::opInexact, APFloat::fcNormal },
-    { PNormalValue, PSmallestNormalized, "0x1p+0", APFloat::opInexact, APFloat::fcNormal },
-    { PNormalValue, MSmallestNormalized, "0x1p+0", APFloat::opInexact, APFloat::fcNormal },
-    { MNormalValue, PInf, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { MNormalValue, MInf, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MNormalValue, PZero, "-0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { MNormalValue, MZero, "-0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { MNormalValue, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { MNormalValue, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MNormalValue, PNormalValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MNormalValue, MNormalValue, "-0x1p+1", APFloat::opOK, APFloat::fcNormal },
-    { MNormalValue, PLargestValue, "0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { MNormalValue, MLargestValue, "-0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { MNormalValue, PSmallestValue, "-0x1p+0", APFloat::opInexact, APFloat::fcNormal },
-    { MNormalValue, MSmallestValue, "-0x1p+0", APFloat::opInexact, APFloat::fcNormal },
-    { MNormalValue, PSmallestNormalized, "-0x1p+0", APFloat::opInexact, APFloat::fcNormal },
-    { MNormalValue, MSmallestNormalized, "-0x1p+0", APFloat::opInexact, APFloat::fcNormal },
-    { PLargestValue, PInf, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PLargestValue, MInf, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { PLargestValue, PZero, "0x1.fffffep+127", APFloat::opOK, APFloat::fcNormal },
-    { PLargestValue, MZero, "0x1.fffffep+127", APFloat::opOK, APFloat::fcNormal },
-    { PLargestValue, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { PLargestValue, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PLargestValue, PNormalValue, "0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { PLargestValue, MNormalValue, "0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { PLargestValue, PLargestValue, "inf", OverflowStatus, APFloat::fcInfinity },
-    { PLargestValue, MLargestValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PLargestValue, PSmallestValue, "0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { PLargestValue, MSmallestValue, "0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { PLargestValue, PSmallestNormalized, "0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { PLargestValue, MSmallestNormalized, "0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { MLargestValue, PInf, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { MLargestValue, MInf, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MLargestValue, PZero, "-0x1.fffffep+127", APFloat::opOK, APFloat::fcNormal },
-    { MLargestValue, MZero, "-0x1.fffffep+127", APFloat::opOK, APFloat::fcNormal },
-    { MLargestValue, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { MLargestValue, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MLargestValue, PNormalValue, "-0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { MLargestValue, MNormalValue, "-0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { MLargestValue, PLargestValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MLargestValue, MLargestValue, "-inf", OverflowStatus, APFloat::fcInfinity },
-    { MLargestValue, PSmallestValue, "-0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { MLargestValue, MSmallestValue, "-0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { MLargestValue, PSmallestNormalized, "-0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { MLargestValue, MSmallestNormalized, "-0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { PSmallestValue, PInf, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PSmallestValue, MInf, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { PSmallestValue, PZero, "0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestValue, MZero, "0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestValue, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { PSmallestValue, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PSmallestValue, PNormalValue, "0x1p+0", APFloat::opInexact, APFloat::fcNormal },
-    { PSmallestValue, MNormalValue, "-0x1p+0", APFloat::opInexact, APFloat::fcNormal },
-    { PSmallestValue, PLargestValue, "0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { PSmallestValue, MLargestValue, "-0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { PSmallestValue, PSmallestValue, "0x1p-148", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestValue, MSmallestValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PSmallestValue, PSmallestNormalized, "0x1.000002p-126", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestValue, MSmallestNormalized, "-0x1.fffffcp-127", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestValue, PInf, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { MSmallestValue, MInf, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MSmallestValue, PZero, "-0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestValue, MZero, "-0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestValue, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { MSmallestValue, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MSmallestValue, PNormalValue, "0x1p+0", APFloat::opInexact, APFloat::fcNormal },
-    { MSmallestValue, MNormalValue, "-0x1p+0", APFloat::opInexact, APFloat::fcNormal },
-    { MSmallestValue, PLargestValue, "0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { MSmallestValue, MLargestValue, "-0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { MSmallestValue, PSmallestValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MSmallestValue, MSmallestValue, "-0x1p-148", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestValue, PSmallestNormalized, "0x1.fffffcp-127", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestValue, MSmallestNormalized, "-0x1.000002p-126", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestNormalized, PInf, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PSmallestNormalized, MInf, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { PSmallestNormalized, PZero, "0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestNormalized, MZero, "0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestNormalized, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { PSmallestNormalized, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PSmallestNormalized, PNormalValue, "0x1p+0", APFloat::opInexact, APFloat::fcNormal },
-    { PSmallestNormalized, MNormalValue, "-0x1p+0", APFloat::opInexact, APFloat::fcNormal },
-    { PSmallestNormalized, PLargestValue, "0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { PSmallestNormalized, MLargestValue, "-0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { PSmallestNormalized, PSmallestValue, "0x1.000002p-126", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestNormalized, MSmallestValue, "0x1.fffffcp-127", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestNormalized, PSmallestNormalized, "0x1p-125", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestNormalized, MSmallestNormalized, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MSmallestNormalized, PInf, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { MSmallestNormalized, MInf, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MSmallestNormalized, PZero, "-0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestNormalized, MZero, "-0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestNormalized, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { MSmallestNormalized, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MSmallestNormalized, PNormalValue, "0x1p+0", APFloat::opInexact, APFloat::fcNormal },
-    { MSmallestNormalized, MNormalValue, "-0x1p+0", APFloat::opInexact, APFloat::fcNormal },
-    { MSmallestNormalized, PLargestValue, "0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { MSmallestNormalized, MLargestValue, "-0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { MSmallestNormalized, PSmallestValue, "-0x1.fffffcp-127", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestNormalized, MSmallestValue, "-0x1.000002p-126", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestNormalized, PSmallestNormalized, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MSmallestNormalized, MSmallestNormalized, "-0x1p-125", APFloat::opOK, APFloat::fcNormal }
-  };
-
-  for (size_t i = 0; i < array_lengthof(SpecialCaseTests); ++i) {
-    APFloat x(SpecialCaseTests[i].x);
-    APFloat y(SpecialCaseTests[i].y);
-    APFloat::opStatus status = x.add(y, APFloat::rmNearestTiesToEven);
-
-    APFloat result(APFloat::IEEEsingle(), SpecialCaseTests[i].result);
-
-    EXPECT_TRUE(result.bitwiseIsEqual(x));
-    EXPECT_EQ(SpecialCaseTests[i].status, (int)status);
-    EXPECT_EQ(SpecialCaseTests[i].category, (int)x.getCategory());
-  }
-}
-
-TEST(APFloatTest, subtract) {
-  // Test Special Cases against each other and normal values.
-
-  APFloat PInf = APFloat::getInf(APFloat::IEEEsingle(), false);
-  APFloat MInf = APFloat::getInf(APFloat::IEEEsingle(), true);
-  APFloat PZero = APFloat::getZero(APFloat::IEEEsingle(), false);
-  APFloat MZero = APFloat::getZero(APFloat::IEEEsingle(), true);
-  APFloat QNaN = APFloat::getNaN(APFloat::IEEEsingle(), false);
-  APFloat SNaN = APFloat(APFloat::IEEEsingle(), "snan123");
-  APFloat PNormalValue = APFloat(APFloat::IEEEsingle(), "0x1p+0");
-  APFloat MNormalValue = APFloat(APFloat::IEEEsingle(), "-0x1p+0");
-  APFloat PLargestValue = APFloat::getLargest(APFloat::IEEEsingle(), false);
-  APFloat MLargestValue = APFloat::getLargest(APFloat::IEEEsingle(), true);
-  APFloat PSmallestValue = APFloat::getSmallest(APFloat::IEEEsingle(), false);
-  APFloat MSmallestValue = APFloat::getSmallest(APFloat::IEEEsingle(), true);
-  APFloat PSmallestNormalized =
-    APFloat::getSmallestNormalized(APFloat::IEEEsingle(), false);
-  APFloat MSmallestNormalized =
-    APFloat::getSmallestNormalized(APFloat::IEEEsingle(), true);
-
-  const int OverflowStatus = APFloat::opOverflow | APFloat::opInexact;
-
-  struct {
-    APFloat x;
-    APFloat y;
-    const char *result;
-    int status;
-    int category;
-  } SpecialCaseTests[] = {
-    { PInf, PInf, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PInf, MInf, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, PZero, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, MZero, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { PInf, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PInf, PNormalValue, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, MNormalValue, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, PLargestValue, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, MLargestValue, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, PSmallestValue, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, MSmallestValue, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, PSmallestNormalized, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, MSmallestNormalized, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, PInf, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, MInf, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MInf, PZero, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, MZero, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { MInf, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MInf, PNormalValue, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, MNormalValue, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, PLargestValue, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, MLargestValue, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, PSmallestValue, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, MSmallestValue, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, PSmallestNormalized, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, MSmallestNormalized, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { PZero, PInf, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { PZero, MInf, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PZero, PZero, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PZero, MZero, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PZero, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { PZero, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PZero, PNormalValue, "-0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { PZero, MNormalValue, "0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { PZero, PLargestValue, "-0x1.fffffep+127", APFloat::opOK, APFloat::fcNormal },
-    { PZero, MLargestValue, "0x1.fffffep+127", APFloat::opOK, APFloat::fcNormal },
-    { PZero, PSmallestValue, "-0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { PZero, MSmallestValue, "0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { PZero, PSmallestNormalized, "-0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { PZero, MSmallestNormalized, "0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { MZero, PInf, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MZero, MInf, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { MZero, PZero, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MZero, MZero, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MZero, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { MZero, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MZero, PNormalValue, "-0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { MZero, MNormalValue, "0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { MZero, PLargestValue, "-0x1.fffffep+127", APFloat::opOK, APFloat::fcNormal },
-    { MZero, MLargestValue, "0x1.fffffep+127", APFloat::opOK, APFloat::fcNormal },
-    { MZero, PSmallestValue, "-0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { MZero, MSmallestValue, "0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { MZero, PSmallestNormalized, "-0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { MZero, MSmallestNormalized, "0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { QNaN, PInf, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, MInf, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, PZero, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, MZero, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, SNaN, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { QNaN, PNormalValue, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, MNormalValue, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, PLargestValue, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, MLargestValue, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, PSmallestValue, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, MSmallestValue, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, PSmallestNormalized, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, MSmallestNormalized, "nan", APFloat::opOK, APFloat::fcNaN },
-    { SNaN, PInf, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, MInf, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, PZero, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, MZero, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, QNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, PNormalValue, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, MNormalValue, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, PLargestValue, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, MLargestValue, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, PSmallestValue, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, MSmallestValue, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, PSmallestNormalized, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, MSmallestNormalized, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PNormalValue, PInf, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { PNormalValue, MInf, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PNormalValue, PZero, "0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { PNormalValue, MZero, "0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { PNormalValue, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { PNormalValue, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PNormalValue, PNormalValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PNormalValue, MNormalValue, "0x1p+1", APFloat::opOK, APFloat::fcNormal },
-    { PNormalValue, PLargestValue, "-0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { PNormalValue, MLargestValue, "0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { PNormalValue, PSmallestValue, "0x1p+0", APFloat::opInexact, APFloat::fcNormal },
-    { PNormalValue, MSmallestValue, "0x1p+0", APFloat::opInexact, APFloat::fcNormal },
-    { PNormalValue, PSmallestNormalized, "0x1p+0", APFloat::opInexact, APFloat::fcNormal },
-    { PNormalValue, MSmallestNormalized, "0x1p+0", APFloat::opInexact, APFloat::fcNormal },
-    { MNormalValue, PInf, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MNormalValue, MInf, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { MNormalValue, PZero, "-0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { MNormalValue, MZero, "-0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { MNormalValue, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { MNormalValue, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MNormalValue, PNormalValue, "-0x1p+1", APFloat::opOK, APFloat::fcNormal },
-    { MNormalValue, MNormalValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MNormalValue, PLargestValue, "-0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { MNormalValue, MLargestValue, "0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { MNormalValue, PSmallestValue, "-0x1p+0", APFloat::opInexact, APFloat::fcNormal },
-    { MNormalValue, MSmallestValue, "-0x1p+0", APFloat::opInexact, APFloat::fcNormal },
-    { MNormalValue, PSmallestNormalized, "-0x1p+0", APFloat::opInexact, APFloat::fcNormal },
-    { MNormalValue, MSmallestNormalized, "-0x1p+0", APFloat::opInexact, APFloat::fcNormal },
-    { PLargestValue, PInf, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { PLargestValue, MInf, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PLargestValue, PZero, "0x1.fffffep+127", APFloat::opOK, APFloat::fcNormal },
-    { PLargestValue, MZero, "0x1.fffffep+127", APFloat::opOK, APFloat::fcNormal },
-    { PLargestValue, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { PLargestValue, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PLargestValue, PNormalValue, "0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { PLargestValue, MNormalValue, "0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { PLargestValue, PLargestValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PLargestValue, MLargestValue, "inf", OverflowStatus, APFloat::fcInfinity },
-    { PLargestValue, PSmallestValue, "0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { PLargestValue, MSmallestValue, "0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { PLargestValue, PSmallestNormalized, "0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { PLargestValue, MSmallestNormalized, "0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { MLargestValue, PInf, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MLargestValue, MInf, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { MLargestValue, PZero, "-0x1.fffffep+127", APFloat::opOK, APFloat::fcNormal },
-    { MLargestValue, MZero, "-0x1.fffffep+127", APFloat::opOK, APFloat::fcNormal },
-    { MLargestValue, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { MLargestValue, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MLargestValue, PNormalValue, "-0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { MLargestValue, MNormalValue, "-0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { MLargestValue, PLargestValue, "-inf", OverflowStatus, APFloat::fcInfinity },
-    { MLargestValue, MLargestValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MLargestValue, PSmallestValue, "-0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { MLargestValue, MSmallestValue, "-0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { MLargestValue, PSmallestNormalized, "-0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { MLargestValue, MSmallestNormalized, "-0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { PSmallestValue, PInf, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { PSmallestValue, MInf, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PSmallestValue, PZero, "0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestValue, MZero, "0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestValue, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { PSmallestValue, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PSmallestValue, PNormalValue, "-0x1p+0", APFloat::opInexact, APFloat::fcNormal },
-    { PSmallestValue, MNormalValue, "0x1p+0", APFloat::opInexact, APFloat::fcNormal },
-    { PSmallestValue, PLargestValue, "-0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { PSmallestValue, MLargestValue, "0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { PSmallestValue, PSmallestValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PSmallestValue, MSmallestValue, "0x1p-148", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestValue, PSmallestNormalized, "-0x1.fffffcp-127", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestValue, MSmallestNormalized, "0x1.000002p-126", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestValue, PInf, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MSmallestValue, MInf, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { MSmallestValue, PZero, "-0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestValue, MZero, "-0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestValue, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { MSmallestValue, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MSmallestValue, PNormalValue, "-0x1p+0", APFloat::opInexact, APFloat::fcNormal },
-    { MSmallestValue, MNormalValue, "0x1p+0", APFloat::opInexact, APFloat::fcNormal },
-    { MSmallestValue, PLargestValue, "-0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { MSmallestValue, MLargestValue, "0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { MSmallestValue, PSmallestValue, "-0x1p-148", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestValue, MSmallestValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MSmallestValue, PSmallestNormalized, "-0x1.000002p-126", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestValue, MSmallestNormalized, "0x1.fffffcp-127", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestNormalized, PInf, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { PSmallestNormalized, MInf, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PSmallestNormalized, PZero, "0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestNormalized, MZero, "0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestNormalized, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { PSmallestNormalized, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PSmallestNormalized, PNormalValue, "-0x1p+0", APFloat::opInexact, APFloat::fcNormal },
-    { PSmallestNormalized, MNormalValue, "0x1p+0", APFloat::opInexact, APFloat::fcNormal },
-    { PSmallestNormalized, PLargestValue, "-0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { PSmallestNormalized, MLargestValue, "0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { PSmallestNormalized, PSmallestValue, "0x1.fffffcp-127", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestNormalized, MSmallestValue, "0x1.000002p-126", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestNormalized, PSmallestNormalized, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PSmallestNormalized, MSmallestNormalized, "0x1p-125", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestNormalized, PInf, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MSmallestNormalized, MInf, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { MSmallestNormalized, PZero, "-0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestNormalized, MZero, "-0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestNormalized, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { MSmallestNormalized, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MSmallestNormalized, PNormalValue, "-0x1p+0", APFloat::opInexact, APFloat::fcNormal },
-    { MSmallestNormalized, MNormalValue, "0x1p+0", APFloat::opInexact, APFloat::fcNormal },
-    { MSmallestNormalized, PLargestValue, "-0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { MSmallestNormalized, MLargestValue, "0x1.fffffep+127", APFloat::opInexact, APFloat::fcNormal },
-    { MSmallestNormalized, PSmallestValue, "-0x1.000002p-126", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestNormalized, MSmallestValue, "-0x1.fffffcp-127", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestNormalized, PSmallestNormalized, "-0x1p-125", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestNormalized, MSmallestNormalized, "0x0p+0", APFloat::opOK, APFloat::fcZero }
-  };
-
-  for (size_t i = 0; i < array_lengthof(SpecialCaseTests); ++i) {
-    APFloat x(SpecialCaseTests[i].x);
-    APFloat y(SpecialCaseTests[i].y);
-    APFloat::opStatus status = x.subtract(y, APFloat::rmNearestTiesToEven);
-
-    APFloat result(APFloat::IEEEsingle(), SpecialCaseTests[i].result);
-
-    EXPECT_TRUE(result.bitwiseIsEqual(x));
-    EXPECT_EQ(SpecialCaseTests[i].status, (int)status);
-    EXPECT_EQ(SpecialCaseTests[i].category, (int)x.getCategory());
-  }
-}
-
-TEST(APFloatTest, multiply) {
-  // Test Special Cases against each other and normal values.
-
-  APFloat PInf = APFloat::getInf(APFloat::IEEEsingle(), false);
-  APFloat MInf = APFloat::getInf(APFloat::IEEEsingle(), true);
-  APFloat PZero = APFloat::getZero(APFloat::IEEEsingle(), false);
-  APFloat MZero = APFloat::getZero(APFloat::IEEEsingle(), true);
-  APFloat QNaN = APFloat::getNaN(APFloat::IEEEsingle(), false);
-  APFloat SNaN = APFloat(APFloat::IEEEsingle(), "snan123");
-  APFloat PNormalValue = APFloat(APFloat::IEEEsingle(), "0x1p+0");
-  APFloat MNormalValue = APFloat(APFloat::IEEEsingle(), "-0x1p+0");
-  APFloat PLargestValue = APFloat::getLargest(APFloat::IEEEsingle(), false);
-  APFloat MLargestValue = APFloat::getLargest(APFloat::IEEEsingle(), true);
-  APFloat PSmallestValue = APFloat::getSmallest(APFloat::IEEEsingle(), false);
-  APFloat MSmallestValue = APFloat::getSmallest(APFloat::IEEEsingle(), true);
-  APFloat PSmallestNormalized =
-      APFloat::getSmallestNormalized(APFloat::IEEEsingle(), false);
-  APFloat MSmallestNormalized =
-      APFloat::getSmallestNormalized(APFloat::IEEEsingle(), true);
-
-  APFloat MaxQuad(APFloat::IEEEquad(),
-                  "0x1.ffffffffffffffffffffffffffffp+16383");
-  APFloat MinQuad(APFloat::IEEEquad(),
-                  "0x0.0000000000000000000000000001p-16382");
-  APFloat NMinQuad(APFloat::IEEEquad(),
-                   "-0x0.0000000000000000000000000001p-16382");
-
-  const int OverflowStatus = APFloat::opOverflow | APFloat::opInexact;
-  const int UnderflowStatus = APFloat::opUnderflow | APFloat::opInexact;
-
-  struct {
-    APFloat x;
-    APFloat y;
-    const char *result;
-    int status;
-    int category;
-    APFloat::roundingMode roundingMode = APFloat::rmNearestTiesToEven;
-  } SpecialCaseTests[] = {
-    { PInf, PInf, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, MInf, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, PZero, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PInf, MZero, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PInf, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { PInf, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PInf, PNormalValue, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, MNormalValue, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, PLargestValue, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, MLargestValue, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, PSmallestValue, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, MSmallestValue, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, PSmallestNormalized, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, MSmallestNormalized, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, PInf, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, MInf, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, PZero, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MInf, MZero, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MInf, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { MInf, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MInf, PNormalValue, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, MNormalValue, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, PLargestValue, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, MLargestValue, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, PSmallestValue, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, MSmallestValue, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, PSmallestNormalized, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, MSmallestNormalized, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PZero, PInf, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PZero, MInf, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PZero, PZero, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PZero, MZero, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PZero, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { PZero, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PZero, PNormalValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PZero, MNormalValue, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PZero, PLargestValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PZero, MLargestValue, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PZero, PSmallestValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PZero, MSmallestValue, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PZero, PSmallestNormalized, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PZero, MSmallestNormalized, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MZero, PInf, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MZero, MInf, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MZero, PZero, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MZero, MZero, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MZero, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { MZero, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MZero, PNormalValue, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MZero, MNormalValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MZero, PLargestValue, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MZero, MLargestValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MZero, PSmallestValue, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MZero, MSmallestValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MZero, PSmallestNormalized, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MZero, MSmallestNormalized, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { QNaN, PInf, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, MInf, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, PZero, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, MZero, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, SNaN, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { QNaN, PNormalValue, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, MNormalValue, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, PLargestValue, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, MLargestValue, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, PSmallestValue, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, MSmallestValue, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, PSmallestNormalized, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, MSmallestNormalized, "nan", APFloat::opOK, APFloat::fcNaN },
-    { SNaN, PInf, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, MInf, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, PZero, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, MZero, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, QNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, PNormalValue, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, MNormalValue, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, PLargestValue, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, MLargestValue, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, PSmallestValue, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, MSmallestValue, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, PSmallestNormalized, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, MSmallestNormalized, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PNormalValue, PInf, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PNormalValue, MInf, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { PNormalValue, PZero, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PNormalValue, MZero, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PNormalValue, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { PNormalValue, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PNormalValue, PNormalValue, "0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { PNormalValue, MNormalValue, "-0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { PNormalValue, PLargestValue, "0x1.fffffep+127", APFloat::opOK, APFloat::fcNormal },
-    { PNormalValue, MLargestValue, "-0x1.fffffep+127", APFloat::opOK, APFloat::fcNormal },
-    { PNormalValue, PSmallestValue, "0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { PNormalValue, MSmallestValue, "-0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { PNormalValue, PSmallestNormalized, "0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { PNormalValue, MSmallestNormalized, "-0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { MNormalValue, PInf, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MNormalValue, MInf, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { MNormalValue, PZero, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MNormalValue, MZero, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MNormalValue, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { MNormalValue, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MNormalValue, PNormalValue, "-0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { MNormalValue, MNormalValue, "0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { MNormalValue, PLargestValue, "-0x1.fffffep+127", APFloat::opOK, APFloat::fcNormal },
-    { MNormalValue, MLargestValue, "0x1.fffffep+127", APFloat::opOK, APFloat::fcNormal },
-    { MNormalValue, PSmallestValue, "-0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { MNormalValue, MSmallestValue, "0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { MNormalValue, PSmallestNormalized, "-0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { MNormalValue, MSmallestNormalized, "0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { PLargestValue, PInf, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PLargestValue, MInf, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { PLargestValue, PZero, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PLargestValue, MZero, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PLargestValue, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { PLargestValue, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PLargestValue, PNormalValue, "0x1.fffffep+127", APFloat::opOK, APFloat::fcNormal },
-    { PLargestValue, MNormalValue, "-0x1.fffffep+127", APFloat::opOK, APFloat::fcNormal },
-    { PLargestValue, PLargestValue, "inf", OverflowStatus, APFloat::fcInfinity },
-    { PLargestValue, MLargestValue, "-inf", OverflowStatus, APFloat::fcInfinity },
-    { PLargestValue, PSmallestValue, "0x1.fffffep-22", APFloat::opOK, APFloat::fcNormal },
-    { PLargestValue, MSmallestValue, "-0x1.fffffep-22", APFloat::opOK, APFloat::fcNormal },
-    { PLargestValue, PSmallestNormalized, "0x1.fffffep+1", APFloat::opOK, APFloat::fcNormal },
-    { PLargestValue, MSmallestNormalized, "-0x1.fffffep+1", APFloat::opOK, APFloat::fcNormal },
-    { MLargestValue, PInf, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MLargestValue, MInf, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { MLargestValue, PZero, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MLargestValue, MZero, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MLargestValue, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { MLargestValue, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MLargestValue, PNormalValue, "-0x1.fffffep+127", APFloat::opOK, APFloat::fcNormal },
-    { MLargestValue, MNormalValue, "0x1.fffffep+127", APFloat::opOK, APFloat::fcNormal },
-    { MLargestValue, PLargestValue, "-inf", OverflowStatus, APFloat::fcInfinity },
-    { MLargestValue, MLargestValue, "inf", OverflowStatus, APFloat::fcInfinity },
-    { MLargestValue, PSmallestValue, "-0x1.fffffep-22", APFloat::opOK, APFloat::fcNormal },
-    { MLargestValue, MSmallestValue, "0x1.fffffep-22", APFloat::opOK, APFloat::fcNormal },
-    { MLargestValue, PSmallestNormalized, "-0x1.fffffep+1", APFloat::opOK, APFloat::fcNormal },
-    { MLargestValue, MSmallestNormalized, "0x1.fffffep+1", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestValue, PInf, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PSmallestValue, MInf, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { PSmallestValue, PZero, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PSmallestValue, MZero, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PSmallestValue, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { PSmallestValue, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PSmallestValue, PNormalValue, "0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestValue, MNormalValue, "-0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestValue, PLargestValue, "0x1.fffffep-22", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestValue, MLargestValue, "-0x1.fffffep-22", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestValue, PSmallestValue, "0x0p+0", UnderflowStatus, APFloat::fcZero },
-    { PSmallestValue, MSmallestValue, "-0x0p+0", UnderflowStatus, APFloat::fcZero },
-    { PSmallestValue, PSmallestNormalized, "0x0p+0", UnderflowStatus, APFloat::fcZero },
-    { PSmallestValue, MSmallestNormalized, "-0x0p+0", UnderflowStatus, APFloat::fcZero },
-    { MSmallestValue, PInf, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MSmallestValue, MInf, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { MSmallestValue, PZero, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MSmallestValue, MZero, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MSmallestValue, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { MSmallestValue, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MSmallestValue, PNormalValue, "-0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestValue, MNormalValue, "0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestValue, PLargestValue, "-0x1.fffffep-22", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestValue, MLargestValue, "0x1.fffffep-22", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestValue, PSmallestValue, "-0x0p+0", UnderflowStatus, APFloat::fcZero },
-    { MSmallestValue, MSmallestValue, "0x0p+0", UnderflowStatus, APFloat::fcZero },
-    { MSmallestValue, PSmallestNormalized, "-0x0p+0", UnderflowStatus, APFloat::fcZero },
-    { MSmallestValue, MSmallestNormalized, "0x0p+0", UnderflowStatus, APFloat::fcZero },
-    { PSmallestNormalized, PInf, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PSmallestNormalized, MInf, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { PSmallestNormalized, PZero, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PSmallestNormalized, MZero, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PSmallestNormalized, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { PSmallestNormalized, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PSmallestNormalized, PNormalValue, "0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestNormalized, MNormalValue, "-0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestNormalized, PLargestValue, "0x1.fffffep+1", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestNormalized, MLargestValue, "-0x1.fffffep+1", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestNormalized, PSmallestValue, "0x0p+0", UnderflowStatus, APFloat::fcZero },
-    { PSmallestNormalized, MSmallestValue, "-0x0p+0", UnderflowStatus, APFloat::fcZero },
-    { PSmallestNormalized, PSmallestNormalized, "0x0p+0", UnderflowStatus, APFloat::fcZero },
-    { PSmallestNormalized, MSmallestNormalized, "-0x0p+0", UnderflowStatus, APFloat::fcZero },
-    { MSmallestNormalized, PInf, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MSmallestNormalized, MInf, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { MSmallestNormalized, PZero, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MSmallestNormalized, MZero, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MSmallestNormalized, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { MSmallestNormalized, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MSmallestNormalized, PNormalValue, "-0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestNormalized, MNormalValue, "0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestNormalized, PLargestValue, "-0x1.fffffep+1", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestNormalized, MLargestValue, "0x1.fffffep+1", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestNormalized, PSmallestValue, "-0x0p+0", UnderflowStatus, APFloat::fcZero },
-    { MSmallestNormalized, MSmallestValue, "0x0p+0", UnderflowStatus, APFloat::fcZero },
-    { MSmallestNormalized, PSmallestNormalized, "-0x0p+0", UnderflowStatus, APFloat::fcZero },
-    { MSmallestNormalized, MSmallestNormalized, "0x0p+0", UnderflowStatus, APFloat::fcZero },
-
-    {MaxQuad, MinQuad, "0x1.ffffffffffffffffffffffffffffp-111", APFloat::opOK,
-     APFloat::fcNormal, APFloat::rmNearestTiesToEven},
-    {MaxQuad, MinQuad, "0x1.ffffffffffffffffffffffffffffp-111", APFloat::opOK,
-     APFloat::fcNormal, APFloat::rmTowardPositive},
-    {MaxQuad, MinQuad, "0x1.ffffffffffffffffffffffffffffp-111", APFloat::opOK,
-     APFloat::fcNormal, APFloat::rmTowardNegative},
-    {MaxQuad, MinQuad, "0x1.ffffffffffffffffffffffffffffp-111", APFloat::opOK,
-     APFloat::fcNormal, APFloat::rmTowardZero},
-    {MaxQuad, MinQuad, "0x1.ffffffffffffffffffffffffffffp-111", APFloat::opOK,
-     APFloat::fcNormal, APFloat::rmNearestTiesToAway},
-
-    {MaxQuad, NMinQuad, "-0x1.ffffffffffffffffffffffffffffp-111", APFloat::opOK,
-     APFloat::fcNormal, APFloat::rmNearestTiesToEven},
-    {MaxQuad, NMinQuad, "-0x1.ffffffffffffffffffffffffffffp-111", APFloat::opOK,
-     APFloat::fcNormal, APFloat::rmTowardPositive},
-    {MaxQuad, NMinQuad, "-0x1.ffffffffffffffffffffffffffffp-111", APFloat::opOK,
-     APFloat::fcNormal, APFloat::rmTowardNegative},
-    {MaxQuad, NMinQuad, "-0x1.ffffffffffffffffffffffffffffp-111", APFloat::opOK,
-     APFloat::fcNormal, APFloat::rmTowardZero},
-    {MaxQuad, NMinQuad, "-0x1.ffffffffffffffffffffffffffffp-111", APFloat::opOK,
-     APFloat::fcNormal, APFloat::rmNearestTiesToAway},
-
-    {MaxQuad, MaxQuad, "inf", OverflowStatus, APFloat::fcInfinity,
-     APFloat::rmNearestTiesToEven},
-    {MaxQuad, MaxQuad, "inf", OverflowStatus, APFloat::fcInfinity,
-     APFloat::rmTowardPositive},
-    {MaxQuad, MaxQuad, "0x1.ffffffffffffffffffffffffffffp+16383",
-     APFloat::opInexact, APFloat::fcNormal, APFloat::rmTowardNegative},
-    {MaxQuad, MaxQuad, "0x1.ffffffffffffffffffffffffffffp+16383",
-     APFloat::opInexact, APFloat::fcNormal, APFloat::rmTowardZero},
-    {MaxQuad, MaxQuad, "inf", OverflowStatus, APFloat::fcInfinity,
-     APFloat::rmNearestTiesToAway},
-
-    {MinQuad, MinQuad, "0", UnderflowStatus, APFloat::fcZero,
-     APFloat::rmNearestTiesToEven},
-    {MinQuad, MinQuad, "0x0.0000000000000000000000000001p-16382",
-     UnderflowStatus, APFloat::fcNormal, APFloat::rmTowardPositive},
-    {MinQuad, MinQuad, "0", UnderflowStatus, APFloat::fcZero,
-     APFloat::rmTowardNegative},
-    {MinQuad, MinQuad, "0", UnderflowStatus, APFloat::fcZero,
-     APFloat::rmTowardZero},
-    {MinQuad, MinQuad, "0", UnderflowStatus, APFloat::fcZero,
-     APFloat::rmNearestTiesToAway},
-
-    {MinQuad, NMinQuad, "-0", UnderflowStatus, APFloat::fcZero,
-     APFloat::rmNearestTiesToEven},
-    {MinQuad, NMinQuad, "-0", UnderflowStatus, APFloat::fcZero,
-     APFloat::rmTowardPositive},
-    {MinQuad, NMinQuad, "-0x0.0000000000000000000000000001p-16382",
-     UnderflowStatus, APFloat::fcNormal, APFloat::rmTowardNegative},
-    {MinQuad, NMinQuad, "-0", UnderflowStatus, APFloat::fcZero,
-     APFloat::rmTowardZero},
-    {MinQuad, NMinQuad, "-0", UnderflowStatus, APFloat::fcZero,
-     APFloat::rmNearestTiesToAway},
-  };
-
-  for (size_t i = 0; i < array_lengthof(SpecialCaseTests); ++i) {
-    APFloat x(SpecialCaseTests[i].x);
-    APFloat y(SpecialCaseTests[i].y);
-    APFloat::opStatus status = x.multiply(y, SpecialCaseTests[i].roundingMode);
-
-    APFloat result(x.getSemantics(), SpecialCaseTests[i].result);
-
-    EXPECT_TRUE(result.bitwiseIsEqual(x));
-    EXPECT_EQ(SpecialCaseTests[i].status, (int)status);
-    EXPECT_EQ(SpecialCaseTests[i].category, (int)x.getCategory());
-  }
-}
-
-TEST(APFloatTest, divide) {
-  // Test Special Cases against each other and normal values.
-
-  APFloat PInf = APFloat::getInf(APFloat::IEEEsingle(), false);
-  APFloat MInf = APFloat::getInf(APFloat::IEEEsingle(), true);
-  APFloat PZero = APFloat::getZero(APFloat::IEEEsingle(), false);
-  APFloat MZero = APFloat::getZero(APFloat::IEEEsingle(), true);
-  APFloat QNaN = APFloat::getNaN(APFloat::IEEEsingle(), false);
-  APFloat SNaN = APFloat(APFloat::IEEEsingle(), "snan123");
-  APFloat PNormalValue = APFloat(APFloat::IEEEsingle(), "0x1p+0");
-  APFloat MNormalValue = APFloat(APFloat::IEEEsingle(), "-0x1p+0");
-  APFloat PLargestValue = APFloat::getLargest(APFloat::IEEEsingle(), false);
-  APFloat MLargestValue = APFloat::getLargest(APFloat::IEEEsingle(), true);
-  APFloat PSmallestValue = APFloat::getSmallest(APFloat::IEEEsingle(), false);
-  APFloat MSmallestValue = APFloat::getSmallest(APFloat::IEEEsingle(), true);
-  APFloat PSmallestNormalized =
-      APFloat::getSmallestNormalized(APFloat::IEEEsingle(), false);
-  APFloat MSmallestNormalized =
-      APFloat::getSmallestNormalized(APFloat::IEEEsingle(), true);
-
-  APFloat MaxQuad(APFloat::IEEEquad(),
-                  "0x1.ffffffffffffffffffffffffffffp+16383");
-  APFloat MinQuad(APFloat::IEEEquad(),
-                  "0x0.0000000000000000000000000001p-16382");
-  APFloat NMinQuad(APFloat::IEEEquad(),
-                   "-0x0.0000000000000000000000000001p-16382");
-
-  const int OverflowStatus = APFloat::opOverflow | APFloat::opInexact;
-  const int UnderflowStatus = APFloat::opUnderflow | APFloat::opInexact;
-
-  struct {
-    APFloat x;
-    APFloat y;
-    const char *result;
-    int status;
-    int category;
-    APFloat::roundingMode roundingMode = APFloat::rmNearestTiesToEven;
-  } SpecialCaseTests[] = {
-    { PInf, PInf, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PInf, MInf, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PInf, PZero, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, MZero, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { PInf, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PInf, PNormalValue, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, MNormalValue, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, PLargestValue, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, MLargestValue, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, PSmallestValue, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, MSmallestValue, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, PSmallestNormalized, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PInf, MSmallestNormalized, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, PInf, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MInf, MInf, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MInf, PZero, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, MZero, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { MInf, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MInf, PNormalValue, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, MNormalValue, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, PLargestValue, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, MLargestValue, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, PSmallestValue, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, MSmallestValue, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, PSmallestNormalized, "-inf", APFloat::opOK, APFloat::fcInfinity },
-    { MInf, MSmallestNormalized, "inf", APFloat::opOK, APFloat::fcInfinity },
-    { PZero, PInf, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PZero, MInf, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PZero, PZero, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PZero, MZero, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PZero, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { PZero, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PZero, PNormalValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PZero, MNormalValue, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PZero, PLargestValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PZero, MLargestValue, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PZero, PSmallestValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PZero, MSmallestValue, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PZero, PSmallestNormalized, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PZero, MSmallestNormalized, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MZero, PInf, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MZero, MInf, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MZero, PZero, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MZero, MZero, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MZero, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { MZero, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MZero, PNormalValue, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MZero, MNormalValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MZero, PLargestValue, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MZero, MLargestValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MZero, PSmallestValue, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MZero, MSmallestValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MZero, PSmallestNormalized, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MZero, MSmallestNormalized, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { QNaN, PInf, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, MInf, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, PZero, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, MZero, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, SNaN, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { QNaN, PNormalValue, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, MNormalValue, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, PLargestValue, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, MLargestValue, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, PSmallestValue, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, MSmallestValue, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, PSmallestNormalized, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, MSmallestNormalized, "nan", APFloat::opOK, APFloat::fcNaN },
-    { SNaN, PInf, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, MInf, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, PZero, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, MZero, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, QNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, PNormalValue, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, MNormalValue, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, PLargestValue, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, MLargestValue, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, PSmallestValue, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, MSmallestValue, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, PSmallestNormalized, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, MSmallestNormalized, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PNormalValue, PInf, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PNormalValue, MInf, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PNormalValue, PZero, "inf", APFloat::opDivByZero, APFloat::fcInfinity },
-    { PNormalValue, MZero, "-inf", APFloat::opDivByZero, APFloat::fcInfinity },
-    { PNormalValue, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { PNormalValue, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PNormalValue, PNormalValue, "0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { PNormalValue, MNormalValue, "-0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { PNormalValue, PLargestValue, "0x1p-128", UnderflowStatus, APFloat::fcNormal },
-    { PNormalValue, MLargestValue, "-0x1p-128", UnderflowStatus, APFloat::fcNormal },
-    { PNormalValue, PSmallestValue, "inf", OverflowStatus, APFloat::fcInfinity },
-    { PNormalValue, MSmallestValue, "-inf", OverflowStatus, APFloat::fcInfinity },
-    { PNormalValue, PSmallestNormalized, "0x1p+126", APFloat::opOK, APFloat::fcNormal },
-    { PNormalValue, MSmallestNormalized, "-0x1p+126", APFloat::opOK, APFloat::fcNormal },
-    { MNormalValue, PInf, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MNormalValue, MInf, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MNormalValue, PZero, "-inf", APFloat::opDivByZero, APFloat::fcInfinity },
-    { MNormalValue, MZero, "inf", APFloat::opDivByZero, APFloat::fcInfinity },
-    { MNormalValue, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { MNormalValue, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MNormalValue, PNormalValue, "-0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { MNormalValue, MNormalValue, "0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { MNormalValue, PLargestValue, "-0x1p-128", UnderflowStatus, APFloat::fcNormal },
-    { MNormalValue, MLargestValue, "0x1p-128", UnderflowStatus, APFloat::fcNormal },
-    { MNormalValue, PSmallestValue, "-inf", OverflowStatus, APFloat::fcInfinity },
-    { MNormalValue, MSmallestValue, "inf", OverflowStatus, APFloat::fcInfinity },
-    { MNormalValue, PSmallestNormalized, "-0x1p+126", APFloat::opOK, APFloat::fcNormal },
-    { MNormalValue, MSmallestNormalized, "0x1p+126", APFloat::opOK, APFloat::fcNormal },
-    { PLargestValue, PInf, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PLargestValue, MInf, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PLargestValue, PZero, "inf", APFloat::opDivByZero, APFloat::fcInfinity },
-    { PLargestValue, MZero, "-inf", APFloat::opDivByZero, APFloat::fcInfinity },
-    { PLargestValue, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { PLargestValue, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PLargestValue, PNormalValue, "0x1.fffffep+127", APFloat::opOK, APFloat::fcNormal },
-    { PLargestValue, MNormalValue, "-0x1.fffffep+127", APFloat::opOK, APFloat::fcNormal },
-    { PLargestValue, PLargestValue, "0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { PLargestValue, MLargestValue, "-0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { PLargestValue, PSmallestValue, "inf", OverflowStatus, APFloat::fcInfinity },
-    { PLargestValue, MSmallestValue, "-inf", OverflowStatus, APFloat::fcInfinity },
-    { PLargestValue, PSmallestNormalized, "inf", OverflowStatus, APFloat::fcInfinity },
-    { PLargestValue, MSmallestNormalized, "-inf", OverflowStatus, APFloat::fcInfinity },
-    { MLargestValue, PInf, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MLargestValue, MInf, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MLargestValue, PZero, "-inf", APFloat::opDivByZero, APFloat::fcInfinity },
-    { MLargestValue, MZero, "inf", APFloat::opDivByZero, APFloat::fcInfinity },
-    { MLargestValue, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { MLargestValue, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MLargestValue, PNormalValue, "-0x1.fffffep+127", APFloat::opOK, APFloat::fcNormal },
-    { MLargestValue, MNormalValue, "0x1.fffffep+127", APFloat::opOK, APFloat::fcNormal },
-    { MLargestValue, PLargestValue, "-0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { MLargestValue, MLargestValue, "0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { MLargestValue, PSmallestValue, "-inf", OverflowStatus, APFloat::fcInfinity },
-    { MLargestValue, MSmallestValue, "inf", OverflowStatus, APFloat::fcInfinity },
-    { MLargestValue, PSmallestNormalized, "-inf", OverflowStatus, APFloat::fcInfinity },
-    { MLargestValue, MSmallestNormalized, "inf", OverflowStatus, APFloat::fcInfinity },
-    { PSmallestValue, PInf, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PSmallestValue, MInf, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PSmallestValue, PZero, "inf", APFloat::opDivByZero, APFloat::fcInfinity },
-    { PSmallestValue, MZero, "-inf", APFloat::opDivByZero, APFloat::fcInfinity },
-    { PSmallestValue, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { PSmallestValue, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PSmallestValue, PNormalValue, "0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestValue, MNormalValue, "-0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestValue, PLargestValue, "0x0p+0", UnderflowStatus, APFloat::fcZero },
-    { PSmallestValue, MLargestValue, "-0x0p+0", UnderflowStatus, APFloat::fcZero },
-    { PSmallestValue, PSmallestValue, "0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestValue, MSmallestValue, "-0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestValue, PSmallestNormalized, "0x1p-23", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestValue, MSmallestNormalized, "-0x1p-23", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestValue, PInf, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MSmallestValue, MInf, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MSmallestValue, PZero, "-inf", APFloat::opDivByZero, APFloat::fcInfinity },
-    { MSmallestValue, MZero, "inf", APFloat::opDivByZero, APFloat::fcInfinity },
-    { MSmallestValue, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { MSmallestValue, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MSmallestValue, PNormalValue, "-0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestValue, MNormalValue, "0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestValue, PLargestValue, "-0x0p+0", UnderflowStatus, APFloat::fcZero },
-    { MSmallestValue, MLargestValue, "0x0p+0", UnderflowStatus, APFloat::fcZero },
-    { MSmallestValue, PSmallestValue, "-0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestValue, MSmallestValue, "0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestValue, PSmallestNormalized, "-0x1p-23", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestValue, MSmallestNormalized, "0x1p-23", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestNormalized, PInf, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PSmallestNormalized, MInf, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PSmallestNormalized, PZero, "inf", APFloat::opDivByZero, APFloat::fcInfinity },
-    { PSmallestNormalized, MZero, "-inf", APFloat::opDivByZero, APFloat::fcInfinity },
-    { PSmallestNormalized, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { PSmallestNormalized, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PSmallestNormalized, PNormalValue, "0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestNormalized, MNormalValue, "-0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestNormalized, PLargestValue, "0x0p+0", UnderflowStatus, APFloat::fcZero },
-    { PSmallestNormalized, MLargestValue, "-0x0p+0", UnderflowStatus, APFloat::fcZero },
-    { PSmallestNormalized, PSmallestValue, "0x1p+23", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestNormalized, MSmallestValue, "-0x1p+23", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestNormalized, PSmallestNormalized, "0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestNormalized, MSmallestNormalized, "-0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestNormalized, PInf, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MSmallestNormalized, MInf, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MSmallestNormalized, PZero, "-inf", APFloat::opDivByZero, APFloat::fcInfinity },
-    { MSmallestNormalized, MZero, "inf", APFloat::opDivByZero, APFloat::fcInfinity },
-    { MSmallestNormalized, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { MSmallestNormalized, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MSmallestNormalized, PNormalValue, "-0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestNormalized, MNormalValue, "0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestNormalized, PLargestValue, "-0x0p+0", UnderflowStatus, APFloat::fcZero },
-    { MSmallestNormalized, MLargestValue, "0x0p+0", UnderflowStatus, APFloat::fcZero },
-    { MSmallestNormalized, PSmallestValue, "-0x1p+23", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestNormalized, MSmallestValue, "0x1p+23", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestNormalized, PSmallestNormalized, "-0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestNormalized, MSmallestNormalized, "0x1p+0", APFloat::opOK, APFloat::fcNormal },
-
-    {MaxQuad, NMinQuad, "-inf", OverflowStatus, APFloat::fcInfinity,
-     APFloat::rmNearestTiesToEven},
-    {MaxQuad, NMinQuad, "-0x1.ffffffffffffffffffffffffffffp+16383",
-     APFloat::opInexact, APFloat::fcNormal, APFloat::rmTowardPositive},
-    {MaxQuad, NMinQuad, "-inf", OverflowStatus, APFloat::fcInfinity,
-     APFloat::rmTowardNegative},
-    {MaxQuad, NMinQuad, "-0x1.ffffffffffffffffffffffffffffp+16383",
-     APFloat::opInexact, APFloat::fcNormal, APFloat::rmTowardZero},
-    {MaxQuad, NMinQuad, "-inf", OverflowStatus, APFloat::fcInfinity,
-     APFloat::rmNearestTiesToAway},
-
-    {MinQuad, MaxQuad, "0", UnderflowStatus, APFloat::fcZero,
-     APFloat::rmNearestTiesToEven},
-    {MinQuad, MaxQuad, "0x0.0000000000000000000000000001p-16382",
-     UnderflowStatus, APFloat::fcNormal, APFloat::rmTowardPositive},
-    {MinQuad, MaxQuad, "0", UnderflowStatus, APFloat::fcZero,
-     APFloat::rmTowardNegative},
-    {MinQuad, MaxQuad, "0", UnderflowStatus, APFloat::fcZero,
-     APFloat::rmTowardZero},
-    {MinQuad, MaxQuad, "0", UnderflowStatus, APFloat::fcZero,
-     APFloat::rmNearestTiesToAway},
-
-    {NMinQuad, MaxQuad, "-0", UnderflowStatus, APFloat::fcZero,
-     APFloat::rmNearestTiesToEven},
-    {NMinQuad, MaxQuad, "-0", UnderflowStatus, APFloat::fcZero,
-     APFloat::rmTowardPositive},
-    {NMinQuad, MaxQuad, "-0x0.0000000000000000000000000001p-16382",
-     UnderflowStatus, APFloat::fcNormal, APFloat::rmTowardNegative},
-    {NMinQuad, MaxQuad, "-0", UnderflowStatus, APFloat::fcZero,
-     APFloat::rmTowardZero},
-    {NMinQuad, MaxQuad, "-0", UnderflowStatus, APFloat::fcZero,
-     APFloat::rmNearestTiesToAway},
-  };
-
-  for (size_t i = 0; i < array_lengthof(SpecialCaseTests); ++i) {
-    APFloat x(SpecialCaseTests[i].x);
-    APFloat y(SpecialCaseTests[i].y);
-    APFloat::opStatus status = x.divide(y, SpecialCaseTests[i].roundingMode);
-
-    APFloat result(x.getSemantics(), SpecialCaseTests[i].result);
-
-    EXPECT_TRUE(result.bitwiseIsEqual(x));
-    EXPECT_EQ(SpecialCaseTests[i].status, (int)status);
-    EXPECT_EQ(SpecialCaseTests[i].category, (int)x.getCategory());
-  }
-}
-
-TEST(APFloatTest, operatorOverloads) {
-  // This is mostly testing that these operator overloads compile.
-  APFloat One = APFloat(APFloat::IEEEsingle(), "0x1p+0");
-  APFloat Two = APFloat(APFloat::IEEEsingle(), "0x2p+0");
-  EXPECT_TRUE(Two.bitwiseIsEqual(One + One));
-  EXPECT_TRUE(One.bitwiseIsEqual(Two - One));
-  EXPECT_TRUE(Two.bitwiseIsEqual(One * Two));
-  EXPECT_TRUE(One.bitwiseIsEqual(Two / Two));
-}
-
-TEST(APFloatTest, Comparisons) {
-  enum {MNan, MInf, MBig, MOne, MZer, PZer, POne, PBig, PInf, PNan, NumVals};
-  APFloat Vals[NumVals] = {
-    APFloat::getNaN(APFloat::IEEEsingle(), true),
-    APFloat::getInf(APFloat::IEEEsingle(), true),
-    APFloat::getLargest(APFloat::IEEEsingle(), true),
-    APFloat(APFloat::IEEEsingle(), "-0x1p+0"),
-    APFloat::getZero(APFloat::IEEEsingle(), true),
-    APFloat::getZero(APFloat::IEEEsingle(), false),
-    APFloat(APFloat::IEEEsingle(), "0x1p+0"),
-    APFloat::getLargest(APFloat::IEEEsingle(), false),
-    APFloat::getInf(APFloat::IEEEsingle(), false),
-    APFloat::getNaN(APFloat::IEEEsingle(), false),
-  };
-  using Relation = void (*)(const APFloat &, const APFloat &);
-  Relation LT = [](const APFloat &LHS, const APFloat &RHS) {
-    EXPECT_FALSE(LHS == RHS);
-    EXPECT_TRUE(LHS != RHS);
-    EXPECT_TRUE(LHS < RHS);
-    EXPECT_FALSE(LHS > RHS);
-    EXPECT_TRUE(LHS <= RHS);
-    EXPECT_FALSE(LHS >= RHS);
-  };
-  Relation EQ = [](const APFloat &LHS, const APFloat &RHS) {
-    EXPECT_TRUE(LHS == RHS);
-    EXPECT_FALSE(LHS != RHS);
-    EXPECT_FALSE(LHS < RHS);
-    EXPECT_FALSE(LHS > RHS);
-    EXPECT_TRUE(LHS <= RHS);
-    EXPECT_TRUE(LHS >= RHS);
-  };
-  Relation GT = [](const APFloat &LHS, const APFloat &RHS) {
-    EXPECT_FALSE(LHS == RHS);
-    EXPECT_TRUE(LHS != RHS);
-    EXPECT_FALSE(LHS < RHS);
-    EXPECT_TRUE(LHS > RHS);
-    EXPECT_FALSE(LHS <= RHS);
-    EXPECT_TRUE(LHS >= RHS);
-  };
-  Relation UN = [](const APFloat &LHS, const APFloat &RHS) {
-    EXPECT_FALSE(LHS == RHS);
-    EXPECT_TRUE(LHS != RHS);
-    EXPECT_FALSE(LHS < RHS);
-    EXPECT_FALSE(LHS > RHS);
-    EXPECT_FALSE(LHS <= RHS);
-    EXPECT_FALSE(LHS >= RHS);
-  };
-  Relation Relations[NumVals][NumVals] = {
-    //          -N  -I  -B  -1  -0  +0  +1  +B  +I  +N
-    /* MNan */ {UN, UN, UN, UN, UN, UN, UN, UN, UN, UN},
-    /* MInf */ {UN, EQ, LT, LT, LT, LT, LT, LT, LT, UN},
-    /* MBig */ {UN, GT, EQ, LT, LT, LT, LT, LT, LT, UN},
-    /* MOne */ {UN, GT, GT, EQ, LT, LT, LT, LT, LT, UN},
-    /* MZer */ {UN, GT, GT, GT, EQ, EQ, LT, LT, LT, UN},
-    /* PZer */ {UN, GT, GT, GT, EQ, EQ, LT, LT, LT, UN},
-    /* POne */ {UN, GT, GT, GT, GT, GT, EQ, LT, LT, UN},
-    /* PBig */ {UN, GT, GT, GT, GT, GT, GT, EQ, LT, UN},
-    /* PInf */ {UN, GT, GT, GT, GT, GT, GT, GT, EQ, UN},
-    /* PNan */ {UN, UN, UN, UN, UN, UN, UN, UN, UN, UN},
-  };
-  for (unsigned I = 0; I < NumVals; ++I)
-    for (unsigned J = 0; J < NumVals; ++J)
-      Relations[I][J](Vals[I], Vals[J]);
-}
-
-TEST(APFloatTest, abs) {
-  APFloat PInf = APFloat::getInf(APFloat::IEEEsingle(), false);
-  APFloat MInf = APFloat::getInf(APFloat::IEEEsingle(), true);
-  APFloat PZero = APFloat::getZero(APFloat::IEEEsingle(), false);
-  APFloat MZero = APFloat::getZero(APFloat::IEEEsingle(), true);
-  APFloat PQNaN = APFloat::getNaN(APFloat::IEEEsingle(), false);
-  APFloat MQNaN = APFloat::getNaN(APFloat::IEEEsingle(), true);
-  APFloat PSNaN = APFloat::getSNaN(APFloat::IEEEsingle(), false);
-  APFloat MSNaN = APFloat::getSNaN(APFloat::IEEEsingle(), true);
-  APFloat PNormalValue = APFloat(APFloat::IEEEsingle(), "0x1p+0");
-  APFloat MNormalValue = APFloat(APFloat::IEEEsingle(), "-0x1p+0");
-  APFloat PLargestValue = APFloat::getLargest(APFloat::IEEEsingle(), false);
-  APFloat MLargestValue = APFloat::getLargest(APFloat::IEEEsingle(), true);
-  APFloat PSmallestValue = APFloat::getSmallest(APFloat::IEEEsingle(), false);
-  APFloat MSmallestValue = APFloat::getSmallest(APFloat::IEEEsingle(), true);
-  APFloat PSmallestNormalized =
-    APFloat::getSmallestNormalized(APFloat::IEEEsingle(), false);
-  APFloat MSmallestNormalized =
-    APFloat::getSmallestNormalized(APFloat::IEEEsingle(), true);
-
-  EXPECT_TRUE(PInf.bitwiseIsEqual(abs(PInf)));
-  EXPECT_TRUE(PInf.bitwiseIsEqual(abs(MInf)));
-  EXPECT_TRUE(PZero.bitwiseIsEqual(abs(PZero)));
-  EXPECT_TRUE(PZero.bitwiseIsEqual(abs(MZero)));
-  EXPECT_TRUE(PQNaN.bitwiseIsEqual(abs(PQNaN)));
-  EXPECT_TRUE(PQNaN.bitwiseIsEqual(abs(MQNaN)));
-  EXPECT_TRUE(PSNaN.bitwiseIsEqual(abs(PSNaN)));
-  EXPECT_TRUE(PSNaN.bitwiseIsEqual(abs(MSNaN)));
-  EXPECT_TRUE(PNormalValue.bitwiseIsEqual(abs(PNormalValue)));
-  EXPECT_TRUE(PNormalValue.bitwiseIsEqual(abs(MNormalValue)));
-  EXPECT_TRUE(PLargestValue.bitwiseIsEqual(abs(PLargestValue)));
-  EXPECT_TRUE(PLargestValue.bitwiseIsEqual(abs(MLargestValue)));
-  EXPECT_TRUE(PSmallestValue.bitwiseIsEqual(abs(PSmallestValue)));
-  EXPECT_TRUE(PSmallestValue.bitwiseIsEqual(abs(MSmallestValue)));
-  EXPECT_TRUE(PSmallestNormalized.bitwiseIsEqual(abs(PSmallestNormalized)));
-  EXPECT_TRUE(PSmallestNormalized.bitwiseIsEqual(abs(MSmallestNormalized)));
-}
-
-TEST(APFloatTest, neg) {
-  APFloat One = APFloat(APFloat::IEEEsingle(), "1.0");
-  APFloat NegOne = APFloat(APFloat::IEEEsingle(), "-1.0");
-  APFloat Zero = APFloat::getZero(APFloat::IEEEsingle(), false);
-  APFloat NegZero = APFloat::getZero(APFloat::IEEEsingle(), true);
-  APFloat Inf = APFloat::getInf(APFloat::IEEEsingle(), false);
-  APFloat NegInf = APFloat::getInf(APFloat::IEEEsingle(), true);
-  APFloat QNaN = APFloat::getNaN(APFloat::IEEEsingle(), false);
-  APFloat NegQNaN = APFloat::getNaN(APFloat::IEEEsingle(), true);
-
-  EXPECT_TRUE(NegOne.bitwiseIsEqual(neg(One)));
-  EXPECT_TRUE(One.bitwiseIsEqual(neg(NegOne)));
-  EXPECT_TRUE(NegZero.bitwiseIsEqual(neg(Zero)));
-  EXPECT_TRUE(Zero.bitwiseIsEqual(neg(NegZero)));
-  EXPECT_TRUE(NegInf.bitwiseIsEqual(neg(Inf)));
-  EXPECT_TRUE(Inf.bitwiseIsEqual(neg(NegInf)));
-  EXPECT_TRUE(NegInf.bitwiseIsEqual(neg(Inf)));
-  EXPECT_TRUE(Inf.bitwiseIsEqual(neg(NegInf)));
-  EXPECT_TRUE(NegQNaN.bitwiseIsEqual(neg(QNaN)));
-  EXPECT_TRUE(QNaN.bitwiseIsEqual(neg(NegQNaN)));
-
-  EXPECT_TRUE(NegOne.bitwiseIsEqual(-One));
-  EXPECT_TRUE(One.bitwiseIsEqual(-NegOne));
-  EXPECT_TRUE(NegZero.bitwiseIsEqual(-Zero));
-  EXPECT_TRUE(Zero.bitwiseIsEqual(-NegZero));
-  EXPECT_TRUE(NegInf.bitwiseIsEqual(-Inf));
-  EXPECT_TRUE(Inf.bitwiseIsEqual(-NegInf));
-  EXPECT_TRUE(NegInf.bitwiseIsEqual(-Inf));
-  EXPECT_TRUE(Inf.bitwiseIsEqual(-NegInf));
-  EXPECT_TRUE(NegQNaN.bitwiseIsEqual(-QNaN));
-  EXPECT_TRUE(QNaN.bitwiseIsEqual(-NegQNaN));
-}
-
-TEST(APFloatTest, ilogb) {
-  EXPECT_EQ(-1074, ilogb(APFloat::getSmallest(APFloat::IEEEdouble(), false)));
-  EXPECT_EQ(-1074, ilogb(APFloat::getSmallest(APFloat::IEEEdouble(), true)));
-  EXPECT_EQ(-1023, ilogb(APFloat(APFloat::IEEEdouble(), "0x1.ffffffffffffep-1024")));
-  EXPECT_EQ(-1023, ilogb(APFloat(APFloat::IEEEdouble(), "0x1.ffffffffffffep-1023")));
-  EXPECT_EQ(-1023, ilogb(APFloat(APFloat::IEEEdouble(), "-0x1.ffffffffffffep-1023")));
-  EXPECT_EQ(-51, ilogb(APFloat(APFloat::IEEEdouble(), "0x1p-51")));
-  EXPECT_EQ(-1023, ilogb(APFloat(APFloat::IEEEdouble(), "0x1.c60f120d9f87cp-1023")));
-  EXPECT_EQ(-2, ilogb(APFloat(APFloat::IEEEdouble(), "0x0.ffffp-1")));
-  EXPECT_EQ(-1023, ilogb(APFloat(APFloat::IEEEdouble(), "0x1.fffep-1023")));
-  EXPECT_EQ(1023, ilogb(APFloat::getLargest(APFloat::IEEEdouble(), false)));
-  EXPECT_EQ(1023, ilogb(APFloat::getLargest(APFloat::IEEEdouble(), true)));
-
-
-  EXPECT_EQ(0, ilogb(APFloat(APFloat::IEEEsingle(), "0x1p+0")));
-  EXPECT_EQ(0, ilogb(APFloat(APFloat::IEEEsingle(), "-0x1p+0")));
-  EXPECT_EQ(42, ilogb(APFloat(APFloat::IEEEsingle(), "0x1p+42")));
-  EXPECT_EQ(-42, ilogb(APFloat(APFloat::IEEEsingle(), "0x1p-42")));
-
-  EXPECT_EQ(APFloat::IEK_Inf,
-            ilogb(APFloat::getInf(APFloat::IEEEsingle(), false)));
-  EXPECT_EQ(APFloat::IEK_Inf,
-            ilogb(APFloat::getInf(APFloat::IEEEsingle(), true)));
-  EXPECT_EQ(APFloat::IEK_Zero,
-            ilogb(APFloat::getZero(APFloat::IEEEsingle(), false)));
-  EXPECT_EQ(APFloat::IEK_Zero,
-            ilogb(APFloat::getZero(APFloat::IEEEsingle(), true)));
-  EXPECT_EQ(APFloat::IEK_NaN,
-            ilogb(APFloat::getNaN(APFloat::IEEEsingle(), false)));
-  EXPECT_EQ(APFloat::IEK_NaN,
-            ilogb(APFloat::getSNaN(APFloat::IEEEsingle(), false)));
-
-  EXPECT_EQ(127, ilogb(APFloat::getLargest(APFloat::IEEEsingle(), false)));
-  EXPECT_EQ(127, ilogb(APFloat::getLargest(APFloat::IEEEsingle(), true)));
-
-  EXPECT_EQ(-149, ilogb(APFloat::getSmallest(APFloat::IEEEsingle(), false)));
-  EXPECT_EQ(-149, ilogb(APFloat::getSmallest(APFloat::IEEEsingle(), true)));
-  EXPECT_EQ(-126,
-            ilogb(APFloat::getSmallestNormalized(APFloat::IEEEsingle(), false)));
-  EXPECT_EQ(-126,
-            ilogb(APFloat::getSmallestNormalized(APFloat::IEEEsingle(), true)));
-}
-
-TEST(APFloatTest, scalbn) {
-
-  const APFloat::roundingMode RM = APFloat::rmNearestTiesToEven;
-  EXPECT_TRUE(
-      APFloat(APFloat::IEEEsingle(), "0x1p+0")
-      .bitwiseIsEqual(scalbn(APFloat(APFloat::IEEEsingle(), "0x1p+0"), 0, RM)));
-  EXPECT_TRUE(
-      APFloat(APFloat::IEEEsingle(), "0x1p+42")
-      .bitwiseIsEqual(scalbn(APFloat(APFloat::IEEEsingle(), "0x1p+0"), 42, RM)));
-  EXPECT_TRUE(
-      APFloat(APFloat::IEEEsingle(), "0x1p-42")
-      .bitwiseIsEqual(scalbn(APFloat(APFloat::IEEEsingle(), "0x1p+0"), -42, RM)));
-
-  APFloat PInf = APFloat::getInf(APFloat::IEEEsingle(), false);
-  APFloat MInf = APFloat::getInf(APFloat::IEEEsingle(), true);
-  APFloat PZero = APFloat::getZero(APFloat::IEEEsingle(), false);
-  APFloat MZero = APFloat::getZero(APFloat::IEEEsingle(), true);
-  APFloat QPNaN = APFloat::getNaN(APFloat::IEEEsingle(), false);
-  APFloat QMNaN = APFloat::getNaN(APFloat::IEEEsingle(), true);
-  APFloat SNaN = APFloat::getSNaN(APFloat::IEEEsingle(), false);
-
-  EXPECT_TRUE(PInf.bitwiseIsEqual(scalbn(PInf, 0, RM)));
-  EXPECT_TRUE(MInf.bitwiseIsEqual(scalbn(MInf, 0, RM)));
-  EXPECT_TRUE(PZero.bitwiseIsEqual(scalbn(PZero, 0, RM)));
-  EXPECT_TRUE(MZero.bitwiseIsEqual(scalbn(MZero, 0, RM)));
-  EXPECT_TRUE(QPNaN.bitwiseIsEqual(scalbn(QPNaN, 0, RM)));
-  EXPECT_TRUE(QMNaN.bitwiseIsEqual(scalbn(QMNaN, 0, RM)));
-  EXPECT_FALSE(scalbn(SNaN, 0, RM).isSignaling());
-
-  APFloat ScalbnSNaN = scalbn(SNaN, 1, RM);
-  EXPECT_TRUE(ScalbnSNaN.isNaN() && !ScalbnSNaN.isSignaling());
-
-  // Make sure highest bit of payload is preserved.
-  const APInt Payload(64, (UINT64_C(1) << 50) |
-                      (UINT64_C(1) << 49) |
-                      (UINT64_C(1234) << 32) |
-                      1);
-
-  APFloat SNaNWithPayload = APFloat::getSNaN(APFloat::IEEEdouble(), false,
-                                             &Payload);
-  APFloat QuietPayload = scalbn(SNaNWithPayload, 1, RM);
-  EXPECT_TRUE(QuietPayload.isNaN() && !QuietPayload.isSignaling());
-  EXPECT_EQ(Payload, QuietPayload.bitcastToAPInt().getLoBits(51));
-
-  EXPECT_TRUE(PInf.bitwiseIsEqual(
-                scalbn(APFloat(APFloat::IEEEsingle(), "0x1p+0"), 128, RM)));
-  EXPECT_TRUE(MInf.bitwiseIsEqual(
-                scalbn(APFloat(APFloat::IEEEsingle(), "-0x1p+0"), 128, RM)));
-  EXPECT_TRUE(PInf.bitwiseIsEqual(
-                scalbn(APFloat(APFloat::IEEEsingle(), "0x1p+127"), 1, RM)));
-  EXPECT_TRUE(PZero.bitwiseIsEqual(
-                scalbn(APFloat(APFloat::IEEEsingle(), "0x1p-127"), -127, RM)));
-  EXPECT_TRUE(MZero.bitwiseIsEqual(
-                scalbn(APFloat(APFloat::IEEEsingle(), "-0x1p-127"), -127, RM)));
-  EXPECT_TRUE(APFloat(APFloat::IEEEsingle(), "-0x1p-149").bitwiseIsEqual(
-                scalbn(APFloat(APFloat::IEEEsingle(), "-0x1p-127"), -22, RM)));
-  EXPECT_TRUE(PZero.bitwiseIsEqual(
-                scalbn(APFloat(APFloat::IEEEsingle(), "0x1p-126"), -24, RM)));
-
-
-  APFloat SmallestF64 = APFloat::getSmallest(APFloat::IEEEdouble(), false);
-  APFloat NegSmallestF64 = APFloat::getSmallest(APFloat::IEEEdouble(), true);
-
-  APFloat LargestF64 = APFloat::getLargest(APFloat::IEEEdouble(), false);
-  APFloat NegLargestF64 = APFloat::getLargest(APFloat::IEEEdouble(), true);
-
-  APFloat SmallestNormalizedF64
-    = APFloat::getSmallestNormalized(APFloat::IEEEdouble(), false);
-  APFloat NegSmallestNormalizedF64
-    = APFloat::getSmallestNormalized(APFloat::IEEEdouble(), true);
-
-  APFloat LargestDenormalF64(APFloat::IEEEdouble(), "0x1.ffffffffffffep-1023");
-  APFloat NegLargestDenormalF64(APFloat::IEEEdouble(), "-0x1.ffffffffffffep-1023");
-
-
-  EXPECT_TRUE(SmallestF64.bitwiseIsEqual(
-                scalbn(APFloat(APFloat::IEEEdouble(), "0x1p-1074"), 0, RM)));
-  EXPECT_TRUE(NegSmallestF64.bitwiseIsEqual(
-                scalbn(APFloat(APFloat::IEEEdouble(), "-0x1p-1074"), 0, RM)));
-
-  EXPECT_TRUE(APFloat(APFloat::IEEEdouble(), "0x1p+1023")
-              .bitwiseIsEqual(scalbn(SmallestF64, 2097, RM)));
-
-  EXPECT_TRUE(scalbn(SmallestF64, -2097, RM).isPosZero());
-  EXPECT_TRUE(scalbn(SmallestF64, -2098, RM).isPosZero());
-  EXPECT_TRUE(scalbn(SmallestF64, -2099, RM).isPosZero());
-  EXPECT_TRUE(APFloat(APFloat::IEEEdouble(), "0x1p+1022")
-              .bitwiseIsEqual(scalbn(SmallestF64, 2096, RM)));
-  EXPECT_TRUE(APFloat(APFloat::IEEEdouble(), "0x1p+1023")
-              .bitwiseIsEqual(scalbn(SmallestF64, 2097, RM)));
-  EXPECT_TRUE(scalbn(SmallestF64, 2098, RM).isInfinity());
-  EXPECT_TRUE(scalbn(SmallestF64, 2099, RM).isInfinity());
-
-  // Test for integer overflows when adding to exponent.
-  EXPECT_TRUE(scalbn(SmallestF64, -INT_MAX, RM).isPosZero());
-  EXPECT_TRUE(scalbn(LargestF64, INT_MAX, RM).isInfinity());
-
-  EXPECT_TRUE(LargestDenormalF64
-              .bitwiseIsEqual(scalbn(LargestDenormalF64, 0, RM)));
-  EXPECT_TRUE(NegLargestDenormalF64
-              .bitwiseIsEqual(scalbn(NegLargestDenormalF64, 0, RM)));
-
-  EXPECT_TRUE(APFloat(APFloat::IEEEdouble(), "0x1.ffffffffffffep-1022")
-              .bitwiseIsEqual(scalbn(LargestDenormalF64, 1, RM)));
-  EXPECT_TRUE(APFloat(APFloat::IEEEdouble(), "-0x1.ffffffffffffep-1021")
-              .bitwiseIsEqual(scalbn(NegLargestDenormalF64, 2, RM)));
-
-  EXPECT_TRUE(APFloat(APFloat::IEEEdouble(), "0x1.ffffffffffffep+1")
-              .bitwiseIsEqual(scalbn(LargestDenormalF64, 1024, RM)));
-  EXPECT_TRUE(scalbn(LargestDenormalF64, -1023, RM).isPosZero());
-  EXPECT_TRUE(scalbn(LargestDenormalF64, -1024, RM).isPosZero());
-  EXPECT_TRUE(scalbn(LargestDenormalF64, -2048, RM).isPosZero());
-  EXPECT_TRUE(scalbn(LargestDenormalF64, 2047, RM).isInfinity());
-  EXPECT_TRUE(scalbn(LargestDenormalF64, 2098, RM).isInfinity());
-  EXPECT_TRUE(scalbn(LargestDenormalF64, 2099, RM).isInfinity());
-
-  EXPECT_TRUE(APFloat(APFloat::IEEEdouble(), "0x1.ffffffffffffep-2")
-              .bitwiseIsEqual(scalbn(LargestDenormalF64, 1021, RM)));
-  EXPECT_TRUE(APFloat(APFloat::IEEEdouble(), "0x1.ffffffffffffep-1")
-              .bitwiseIsEqual(scalbn(LargestDenormalF64, 1022, RM)));
-  EXPECT_TRUE(APFloat(APFloat::IEEEdouble(), "0x1.ffffffffffffep+0")
-              .bitwiseIsEqual(scalbn(LargestDenormalF64, 1023, RM)));
-  EXPECT_TRUE(APFloat(APFloat::IEEEdouble(), "0x1.ffffffffffffep+1023")
-              .bitwiseIsEqual(scalbn(LargestDenormalF64, 2046, RM)));
-  EXPECT_TRUE(APFloat(APFloat::IEEEdouble(), "0x1p+974")
-              .bitwiseIsEqual(scalbn(SmallestF64, 2048, RM)));
-
-  APFloat RandomDenormalF64(APFloat::IEEEdouble(), "0x1.c60f120d9f87cp+51");
-  EXPECT_TRUE(APFloat(APFloat::IEEEdouble(), "0x1.c60f120d9f87cp-972")
-              .bitwiseIsEqual(scalbn(RandomDenormalF64, -1023, RM)));
-  EXPECT_TRUE(APFloat(APFloat::IEEEdouble(), "0x1.c60f120d9f87cp-1")
-              .bitwiseIsEqual(scalbn(RandomDenormalF64, -52, RM)));
-  EXPECT_TRUE(APFloat(APFloat::IEEEdouble(), "0x1.c60f120d9f87cp-2")
-              .bitwiseIsEqual(scalbn(RandomDenormalF64, -53, RM)));
-  EXPECT_TRUE(APFloat(APFloat::IEEEdouble(), "0x1.c60f120d9f87cp+0")
-              .bitwiseIsEqual(scalbn(RandomDenormalF64, -51, RM)));
-
-  EXPECT_TRUE(scalbn(RandomDenormalF64, -2097, RM).isPosZero());
-  EXPECT_TRUE(scalbn(RandomDenormalF64, -2090, RM).isPosZero());
-
-
-  EXPECT_TRUE(
-    APFloat(APFloat::IEEEdouble(), "-0x1p-1073")
-    .bitwiseIsEqual(scalbn(NegLargestF64, -2097, RM)));
-
-  EXPECT_TRUE(
-    APFloat(APFloat::IEEEdouble(), "-0x1p-1024")
-    .bitwiseIsEqual(scalbn(NegLargestF64, -2048, RM)));
-
-  EXPECT_TRUE(
-    APFloat(APFloat::IEEEdouble(), "0x1p-1073")
-    .bitwiseIsEqual(scalbn(LargestF64, -2097, RM)));
-
-  EXPECT_TRUE(
-    APFloat(APFloat::IEEEdouble(), "0x1p-1074")
-    .bitwiseIsEqual(scalbn(LargestF64, -2098, RM)));
-  EXPECT_TRUE(APFloat(APFloat::IEEEdouble(), "-0x1p-1074")
-              .bitwiseIsEqual(scalbn(NegLargestF64, -2098, RM)));
-  EXPECT_TRUE(scalbn(NegLargestF64, -2099, RM).isNegZero());
-  EXPECT_TRUE(scalbn(LargestF64, 1, RM).isInfinity());
-
-
-  EXPECT_TRUE(
-    APFloat(APFloat::IEEEdouble(), "0x1p+0")
-    .bitwiseIsEqual(scalbn(APFloat(APFloat::IEEEdouble(), "0x1p+52"), -52, RM)));
-
-  EXPECT_TRUE(
-    APFloat(APFloat::IEEEdouble(), "0x1p-103")
-    .bitwiseIsEqual(scalbn(APFloat(APFloat::IEEEdouble(), "0x1p-51"), -52, RM)));
-}
-
-TEST(APFloatTest, frexp) {
-  const APFloat::roundingMode RM = APFloat::rmNearestTiesToEven;
-
-  APFloat PZero = APFloat::getZero(APFloat::IEEEdouble(), false);
-  APFloat MZero = APFloat::getZero(APFloat::IEEEdouble(), true);
-  APFloat One(1.0);
-  APFloat MOne(-1.0);
-  APFloat Two(2.0);
-  APFloat MTwo(-2.0);
-
-  APFloat LargestDenormal(APFloat::IEEEdouble(), "0x1.ffffffffffffep-1023");
-  APFloat NegLargestDenormal(APFloat::IEEEdouble(), "-0x1.ffffffffffffep-1023");
-
-  APFloat Smallest = APFloat::getSmallest(APFloat::IEEEdouble(), false);
-  APFloat NegSmallest = APFloat::getSmallest(APFloat::IEEEdouble(), true);
-
-  APFloat Largest = APFloat::getLargest(APFloat::IEEEdouble(), false);
-  APFloat NegLargest = APFloat::getLargest(APFloat::IEEEdouble(), true);
-
-  APFloat PInf = APFloat::getInf(APFloat::IEEEdouble(), false);
-  APFloat MInf = APFloat::getInf(APFloat::IEEEdouble(), true);
-
-  APFloat QPNaN = APFloat::getNaN(APFloat::IEEEdouble(), false);
-  APFloat QMNaN = APFloat::getNaN(APFloat::IEEEdouble(), true);
-  APFloat SNaN = APFloat::getSNaN(APFloat::IEEEdouble(), false);
-
-  // Make sure highest bit of payload is preserved.
-  const APInt Payload(64, (UINT64_C(1) << 50) |
-                      (UINT64_C(1) << 49) |
-                      (UINT64_C(1234) << 32) |
-                      1);
-
-  APFloat SNaNWithPayload = APFloat::getSNaN(APFloat::IEEEdouble(), false,
-                                             &Payload);
-
-  APFloat SmallestNormalized
-    = APFloat::getSmallestNormalized(APFloat::IEEEdouble(), false);
-  APFloat NegSmallestNormalized
-    = APFloat::getSmallestNormalized(APFloat::IEEEdouble(), true);
-
-  int Exp;
-  APFloat Frac(APFloat::IEEEdouble());
-
-
-  Frac = frexp(PZero, Exp, RM);
-  EXPECT_EQ(0, Exp);
-  EXPECT_TRUE(Frac.isPosZero());
-
-  Frac = frexp(MZero, Exp, RM);
-  EXPECT_EQ(0, Exp);
-  EXPECT_TRUE(Frac.isNegZero());
-
-
-  Frac = frexp(One, Exp, RM);
-  EXPECT_EQ(1, Exp);
-  EXPECT_TRUE(APFloat(APFloat::IEEEdouble(), "0x1p-1").bitwiseIsEqual(Frac));
-
-  Frac = frexp(MOne, Exp, RM);
-  EXPECT_EQ(1, Exp);
-  EXPECT_TRUE(APFloat(APFloat::IEEEdouble(), "-0x1p-1").bitwiseIsEqual(Frac));
-
-  Frac = frexp(LargestDenormal, Exp, RM);
-  EXPECT_EQ(-1022, Exp);
-  EXPECT_TRUE(APFloat(APFloat::IEEEdouble(), "0x1.ffffffffffffep-1").bitwiseIsEqual(Frac));
-
-  Frac = frexp(NegLargestDenormal, Exp, RM);
-  EXPECT_EQ(-1022, Exp);
-  EXPECT_TRUE(APFloat(APFloat::IEEEdouble(), "-0x1.ffffffffffffep-1").bitwiseIsEqual(Frac));
-
-
-  Frac = frexp(Smallest, Exp, RM);
-  EXPECT_EQ(-1073, Exp);
-  EXPECT_TRUE(APFloat(APFloat::IEEEdouble(), "0x1p-1").bitwiseIsEqual(Frac));
-
-  Frac = frexp(NegSmallest, Exp, RM);
-  EXPECT_EQ(-1073, Exp);
-  EXPECT_TRUE(APFloat(APFloat::IEEEdouble(), "-0x1p-1").bitwiseIsEqual(Frac));
-
-
-  Frac = frexp(Largest, Exp, RM);
-  EXPECT_EQ(1024, Exp);
-  EXPECT_TRUE(APFloat(APFloat::IEEEdouble(), "0x1.fffffffffffffp-1").bitwiseIsEqual(Frac));
-
-  Frac = frexp(NegLargest, Exp, RM);
-  EXPECT_EQ(1024, Exp);
-  EXPECT_TRUE(APFloat(APFloat::IEEEdouble(), "-0x1.fffffffffffffp-1").bitwiseIsEqual(Frac));
-
-
-  Frac = frexp(PInf, Exp, RM);
-  EXPECT_EQ(INT_MAX, Exp);
-  EXPECT_TRUE(Frac.isInfinity() && !Frac.isNegative());
-
-  Frac = frexp(MInf, Exp, RM);
-  EXPECT_EQ(INT_MAX, Exp);
-  EXPECT_TRUE(Frac.isInfinity() && Frac.isNegative());
-
-  Frac = frexp(QPNaN, Exp, RM);
-  EXPECT_EQ(INT_MIN, Exp);
-  EXPECT_TRUE(Frac.isNaN());
-
-  Frac = frexp(QMNaN, Exp, RM);
-  EXPECT_EQ(INT_MIN, Exp);
-  EXPECT_TRUE(Frac.isNaN());
-
-  Frac = frexp(SNaN, Exp, RM);
-  EXPECT_EQ(INT_MIN, Exp);
-  EXPECT_TRUE(Frac.isNaN() && !Frac.isSignaling());
-
-  Frac = frexp(SNaNWithPayload, Exp, RM);
-  EXPECT_EQ(INT_MIN, Exp);
-  EXPECT_TRUE(Frac.isNaN() && !Frac.isSignaling());
-  EXPECT_EQ(Payload, Frac.bitcastToAPInt().getLoBits(51));
-
-  Frac = frexp(APFloat(APFloat::IEEEdouble(), "0x0.ffffp-1"), Exp, RM);
-  EXPECT_EQ(-1, Exp);
-  EXPECT_TRUE(APFloat(APFloat::IEEEdouble(), "0x1.fffep-1").bitwiseIsEqual(Frac));
-
-  Frac = frexp(APFloat(APFloat::IEEEdouble(), "0x1p-51"), Exp, RM);
-  EXPECT_EQ(-50, Exp);
-  EXPECT_TRUE(APFloat(APFloat::IEEEdouble(), "0x1p-1").bitwiseIsEqual(Frac));
-
-  Frac = frexp(APFloat(APFloat::IEEEdouble(), "0x1.c60f120d9f87cp+51"), Exp, RM);
-  EXPECT_EQ(52, Exp);
-  EXPECT_TRUE(APFloat(APFloat::IEEEdouble(), "0x1.c60f120d9f87cp-1").bitwiseIsEqual(Frac));
-}
-
-TEST(APFloatTest, mod) {
-  {
-    APFloat f1(APFloat::IEEEdouble(), "1.5");
-    APFloat f2(APFloat::IEEEdouble(), "1.0");
-    APFloat expected(APFloat::IEEEdouble(), "0.5");
-    EXPECT_EQ(f1.mod(f2), APFloat::opOK);
-    EXPECT_TRUE(f1.bitwiseIsEqual(expected));
-  }
-  {
-    APFloat f1(APFloat::IEEEdouble(), "0.5");
-    APFloat f2(APFloat::IEEEdouble(), "1.0");
-    APFloat expected(APFloat::IEEEdouble(), "0.5");
-    EXPECT_EQ(f1.mod(f2), APFloat::opOK);
-    EXPECT_TRUE(f1.bitwiseIsEqual(expected));
-  }
-  {
-    APFloat f1(APFloat::IEEEdouble(), "0x1.3333333333333p-2"); // 0.3
-    APFloat f2(APFloat::IEEEdouble(), "0x1.47ae147ae147bp-7"); // 0.01
-    APFloat expected(APFloat::IEEEdouble(),
-                     "0x1.47ae147ae1471p-7"); // 0.009999999999999983
-    EXPECT_EQ(f1.mod(f2), APFloat::opOK);
-    EXPECT_TRUE(f1.bitwiseIsEqual(expected));
-  }
-  {
-    APFloat f1(APFloat::IEEEdouble(), "0x1p64"); // 1.8446744073709552e19
-    APFloat f2(APFloat::IEEEdouble(), "1.5");
-    APFloat expected(APFloat::IEEEdouble(), "1.0");
-    EXPECT_EQ(f1.mod(f2), APFloat::opOK);
-    EXPECT_TRUE(f1.bitwiseIsEqual(expected));
-  }
-  {
-    APFloat f1(APFloat::IEEEdouble(), "0x1p1000");
-    APFloat f2(APFloat::IEEEdouble(), "0x1p-1000");
-    APFloat expected(APFloat::IEEEdouble(), "0.0");
-    EXPECT_EQ(f1.mod(f2), APFloat::opOK);
-    EXPECT_TRUE(f1.bitwiseIsEqual(expected));
-  }
-  {
-    APFloat f1(APFloat::IEEEdouble(), "0.0");
-    APFloat f2(APFloat::IEEEdouble(), "1.0");
-    APFloat expected(APFloat::IEEEdouble(), "0.0");
-    EXPECT_EQ(f1.mod(f2), APFloat::opOK);
-    EXPECT_TRUE(f1.bitwiseIsEqual(expected));
-  }
-  {
-    APFloat f1(APFloat::IEEEdouble(), "1.0");
-    APFloat f2(APFloat::IEEEdouble(), "0.0");
-    EXPECT_EQ(f1.mod(f2), APFloat::opInvalidOp);
-    EXPECT_TRUE(f1.isNaN());
-  }
-  {
-    APFloat f1(APFloat::IEEEdouble(), "0.0");
-    APFloat f2(APFloat::IEEEdouble(), "0.0");
-    EXPECT_EQ(f1.mod(f2), APFloat::opInvalidOp);
-    EXPECT_TRUE(f1.isNaN());
-  }
-  {
-    APFloat f1 = APFloat::getInf(APFloat::IEEEdouble(), false);
-    APFloat f2(APFloat::IEEEdouble(), "1.0");
-    EXPECT_EQ(f1.mod(f2), APFloat::opInvalidOp);
-    EXPECT_TRUE(f1.isNaN());
-  }
-  {
-    APFloat f1(APFloat::IEEEdouble(), "-4.0");
-    APFloat f2(APFloat::IEEEdouble(), "-2.0");
-    APFloat expected(APFloat::IEEEdouble(), "-0.0");
-    EXPECT_EQ(f1.mod(f2), APFloat::opOK);
-    EXPECT_TRUE(f1.bitwiseIsEqual(expected));
-  }
-  {
-    APFloat f1(APFloat::IEEEdouble(), "-4.0");
-    APFloat f2(APFloat::IEEEdouble(), "2.0");
-    APFloat expected(APFloat::IEEEdouble(), "-0.0");
-    EXPECT_EQ(f1.mod(f2), APFloat::opOK);
-    EXPECT_TRUE(f1.bitwiseIsEqual(expected));
-  }
-}
-
-TEST(APFloatTest, remainder) {
-  // Test Special Cases against each other and normal values.
-
-  APFloat PInf = APFloat::getInf(APFloat::IEEEsingle(), false);
-  APFloat MInf = APFloat::getInf(APFloat::IEEEsingle(), true);
-  APFloat PZero = APFloat::getZero(APFloat::IEEEsingle(), false);
-  APFloat MZero = APFloat::getZero(APFloat::IEEEsingle(), true);
-  APFloat QNaN = APFloat::getNaN(APFloat::IEEEsingle(), false);
-  APFloat SNaN = APFloat(APFloat::IEEEsingle(), "snan123");
-  APFloat PNormalValue = APFloat(APFloat::IEEEsingle(), "0x1p+0");
-  APFloat MNormalValue = APFloat(APFloat::IEEEsingle(), "-0x1p+0");
-  APFloat PLargestValue = APFloat::getLargest(APFloat::IEEEsingle(), false);
-  APFloat MLargestValue = APFloat::getLargest(APFloat::IEEEsingle(), true);
-  APFloat PSmallestValue = APFloat::getSmallest(APFloat::IEEEsingle(), false);
-  APFloat MSmallestValue = APFloat::getSmallest(APFloat::IEEEsingle(), true);
-  APFloat PSmallestNormalized =
-      APFloat::getSmallestNormalized(APFloat::IEEEsingle(), false);
-  APFloat MSmallestNormalized =
-      APFloat::getSmallestNormalized(APFloat::IEEEsingle(), true);
-
-  APFloat PVal1(APFloat::IEEEsingle(), "0x1.fffffep+126");
-  APFloat MVal1(APFloat::IEEEsingle(), "-0x1.fffffep+126");
-  APFloat PVal2(APFloat::IEEEsingle(), "0x1.fffffep-126");
-  APFloat MVal2(APFloat::IEEEsingle(), "-0x1.fffffep-126");
-  APFloat PVal3(APFloat::IEEEsingle(), "0x1p-125");
-  APFloat MVal3(APFloat::IEEEsingle(), "-0x1p-125");
-  APFloat PVal4(APFloat::IEEEsingle(), "0x1p+127");
-  APFloat MVal4(APFloat::IEEEsingle(), "-0x1p+127");
-  APFloat PVal5(APFloat::IEEEsingle(), "1.5");
-  APFloat MVal5(APFloat::IEEEsingle(), "-1.5");
-  APFloat PVal6(APFloat::IEEEsingle(), "1");
-  APFloat MVal6(APFloat::IEEEsingle(), "-1");
-
-  struct {
-    APFloat x;
-    APFloat y;
-    const char *result;
-    int status;
-    int category;
-  } SpecialCaseTests[] = {
-    { PInf, PInf, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PInf, MInf, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PInf, PZero, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PInf, MZero, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PInf, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { PInf, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PInf, PNormalValue, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PInf, MNormalValue, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PInf, PLargestValue, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PInf, MLargestValue, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PInf, PSmallestValue, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PInf, MSmallestValue, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PInf, PSmallestNormalized, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PInf, MSmallestNormalized, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MInf, PInf, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MInf, MInf, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MInf, PZero, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MInf, MZero, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MInf, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { MInf, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MInf, PNormalValue, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MInf, MNormalValue, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MInf, PLargestValue, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MInf, MLargestValue, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MInf, PSmallestValue, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MInf, MSmallestValue, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MInf, PSmallestNormalized, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MInf, MSmallestNormalized, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PZero, PInf, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PZero, MInf, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PZero, PZero, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PZero, MZero, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PZero, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { PZero, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PZero, PNormalValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PZero, MNormalValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PZero, PLargestValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PZero, MLargestValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PZero, PSmallestValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PZero, MSmallestValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PZero, PSmallestNormalized, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PZero, MSmallestNormalized, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MZero, PInf, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MZero, MInf, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MZero, PZero, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MZero, MZero, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MZero, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { MZero, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MZero, PNormalValue, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MZero, MNormalValue, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MZero, PLargestValue, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MZero, MLargestValue, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MZero, PSmallestValue, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MZero, MSmallestValue, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MZero, PSmallestNormalized, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MZero, MSmallestNormalized, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { QNaN, PInf, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, MInf, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, PZero, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, MZero, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, SNaN, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { QNaN, PNormalValue, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, MNormalValue, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, PLargestValue, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, MLargestValue, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, PSmallestValue, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, MSmallestValue, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, PSmallestNormalized, "nan", APFloat::opOK, APFloat::fcNaN },
-    { QNaN, MSmallestNormalized, "nan", APFloat::opOK, APFloat::fcNaN },
-    { SNaN, PInf, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, MInf, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, PZero, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, MZero, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, QNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, PNormalValue, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, MNormalValue, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, PLargestValue, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, MLargestValue, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, PSmallestValue, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, MSmallestValue, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, PSmallestNormalized, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { SNaN, MSmallestNormalized, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PNormalValue, PInf, "0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { PNormalValue, MInf, "0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { PNormalValue, PZero, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PNormalValue, MZero, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PNormalValue, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { PNormalValue, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PNormalValue, PNormalValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PNormalValue, MNormalValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PNormalValue, PLargestValue, "0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { PNormalValue, MLargestValue, "0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { PNormalValue, PSmallestValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PNormalValue, MSmallestValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PNormalValue, PSmallestNormalized, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PNormalValue, MSmallestNormalized, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MNormalValue, PInf, "-0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { MNormalValue, MInf, "-0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { MNormalValue, PZero, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MNormalValue, MZero, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MNormalValue, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { MNormalValue, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MNormalValue, PNormalValue, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MNormalValue, MNormalValue, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MNormalValue, PLargestValue, "-0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { MNormalValue, MLargestValue, "-0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { MNormalValue, PSmallestValue, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MNormalValue, MSmallestValue, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MNormalValue, PSmallestNormalized, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MNormalValue, MSmallestNormalized, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PLargestValue, PInf, "0x1.fffffep+127", APFloat::opOK, APFloat::fcNormal },
-    { PLargestValue, MInf, "0x1.fffffep+127", APFloat::opOK, APFloat::fcNormal },
-    { PLargestValue, PZero, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PLargestValue, MZero, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PLargestValue, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { PLargestValue, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PLargestValue, PNormalValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PLargestValue, MNormalValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PLargestValue, PLargestValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PLargestValue, MLargestValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PLargestValue, PSmallestValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PLargestValue, MSmallestValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PLargestValue, PSmallestNormalized, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PLargestValue, MSmallestNormalized, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MLargestValue, PInf, "-0x1.fffffep+127", APFloat::opOK, APFloat::fcNormal },
-    { MLargestValue, MInf, "-0x1.fffffep+127", APFloat::opOK, APFloat::fcNormal },
-    { MLargestValue, PZero, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MLargestValue, MZero, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MLargestValue, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { MLargestValue, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MLargestValue, PNormalValue, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MLargestValue, MNormalValue, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MLargestValue, PLargestValue, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MLargestValue, MLargestValue, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MLargestValue, PSmallestValue, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MLargestValue, MSmallestValue, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MLargestValue, PSmallestNormalized, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MLargestValue, MSmallestNormalized, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PSmallestValue, PInf, "0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestValue, MInf, "0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestValue, PZero, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PSmallestValue, MZero, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PSmallestValue, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { PSmallestValue, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PSmallestValue, PNormalValue, "0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestValue, MNormalValue, "0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestValue, PLargestValue, "0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestValue, MLargestValue, "0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestValue, PSmallestValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PSmallestValue, MSmallestValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PSmallestValue, PSmallestNormalized, "0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestValue, MSmallestNormalized, "0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestValue, PInf, "-0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestValue, MInf, "-0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestValue, PZero, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MSmallestValue, MZero, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MSmallestValue, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { MSmallestValue, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MSmallestValue, PNormalValue, "-0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestValue, MNormalValue, "-0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestValue, PLargestValue, "-0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestValue, MLargestValue, "-0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestValue, PSmallestValue, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MSmallestValue, MSmallestValue, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MSmallestValue, PSmallestNormalized, "-0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestValue, MSmallestNormalized, "-0x1p-149", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestNormalized, PInf, "0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestNormalized, MInf, "0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestNormalized, PZero, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PSmallestNormalized, MZero, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PSmallestNormalized, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { PSmallestNormalized, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { PSmallestNormalized, PNormalValue, "0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestNormalized, MNormalValue, "0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestNormalized, PLargestValue, "0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestNormalized, MLargestValue, "0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { PSmallestNormalized, PSmallestValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PSmallestNormalized, MSmallestValue, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PSmallestNormalized, PSmallestNormalized, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PSmallestNormalized, MSmallestNormalized, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MSmallestNormalized, PInf, "-0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestNormalized, MInf, "-0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestNormalized, PZero, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MSmallestNormalized, MZero, "nan", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MSmallestNormalized, QNaN, "nan", APFloat::opOK, APFloat::fcNaN },
-    { MSmallestNormalized, SNaN, "nan123", APFloat::opInvalidOp, APFloat::fcNaN },
-    { MSmallestNormalized, PNormalValue, "-0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestNormalized, MNormalValue, "-0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestNormalized, PLargestValue, "-0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestNormalized, MLargestValue, "-0x1p-126", APFloat::opOK, APFloat::fcNormal },
-    { MSmallestNormalized, PSmallestValue, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MSmallestNormalized, MSmallestValue, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MSmallestNormalized, PSmallestNormalized, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MSmallestNormalized, MSmallestNormalized, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-
-    { PVal1, PVal1, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PVal1, MVal1, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PVal1, PVal2, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PVal1, MVal2, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PVal1, PVal3, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PVal1, MVal3, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PVal1, PVal4, "-0x1p+103", APFloat::opOK, APFloat::fcNormal },
-    { PVal1, MVal4, "-0x1p+103", APFloat::opOK, APFloat::fcNormal },
-    { PVal1, PVal5, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PVal1, MVal5, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PVal1, PVal6, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PVal1, MVal6, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MVal1, PVal1, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MVal1, MVal1, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MVal1, PVal2, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MVal1, MVal2, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MVal1, PVal3, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MVal1, MVal3, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MVal1, PVal4, "0x1p+103", APFloat::opOK, APFloat::fcNormal },
-    { MVal1, MVal4, "0x1p+103", APFloat::opOK, APFloat::fcNormal },
-    { MVal1, PVal5, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MVal1, MVal5, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MVal1, PVal6, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MVal1, MVal6, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PVal2, PVal1, "0x1.fffffep-126", APFloat::opOK, APFloat::fcNormal },
-    { PVal2, MVal1, "0x1.fffffep-126", APFloat::opOK, APFloat::fcNormal },
-    { PVal2, PVal2, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PVal2, MVal2, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PVal2, PVal3, "-0x0.000002p-126", APFloat::opOK, APFloat::fcNormal },
-    { PVal2, MVal3, "-0x0.000002p-126", APFloat::opOK, APFloat::fcNormal },
-    { PVal2, PVal4, "0x1.fffffep-126", APFloat::opOK, APFloat::fcNormal },
-    { PVal2, MVal4, "0x1.fffffep-126", APFloat::opOK, APFloat::fcNormal },
-    { PVal2, PVal5, "0x1.fffffep-126", APFloat::opOK, APFloat::fcNormal },
-    { PVal2, MVal5, "0x1.fffffep-126", APFloat::opOK, APFloat::fcNormal },
-    { PVal2, PVal6, "0x1.fffffep-126", APFloat::opOK, APFloat::fcNormal },
-    { PVal2, MVal6, "0x1.fffffep-126", APFloat::opOK, APFloat::fcNormal },
-    { MVal2, PVal1, "-0x1.fffffep-126", APFloat::opOK, APFloat::fcNormal },
-    { MVal2, MVal1, "-0x1.fffffep-126", APFloat::opOK, APFloat::fcNormal },
-    { MVal2, PVal2, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MVal2, MVal2, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MVal2, PVal3, "0x0.000002p-126", APFloat::opOK, APFloat::fcNormal },
-    { MVal2, MVal3, "0x0.000002p-126", APFloat::opOK, APFloat::fcNormal },
-    { MVal2, PVal4, "-0x1.fffffep-126", APFloat::opOK, APFloat::fcNormal },
-    { MVal2, MVal4, "-0x1.fffffep-126", APFloat::opOK, APFloat::fcNormal },
-    { MVal2, PVal5, "-0x1.fffffep-126", APFloat::opOK, APFloat::fcNormal },
-    { MVal2, MVal5, "-0x1.fffffep-126", APFloat::opOK, APFloat::fcNormal },
-    { MVal2, PVal6, "-0x1.fffffep-126", APFloat::opOK, APFloat::fcNormal },
-    { MVal2, MVal6, "-0x1.fffffep-126", APFloat::opOK, APFloat::fcNormal },
-    { PVal3, PVal1, "0x1p-125", APFloat::opOK, APFloat::fcNormal },
-    { PVal3, MVal1, "0x1p-125", APFloat::opOK, APFloat::fcNormal },
-    { PVal3, PVal2, "0x0.000002p-126", APFloat::opOK, APFloat::fcNormal },
-    { PVal3, MVal2, "0x0.000002p-126", APFloat::opOK, APFloat::fcNormal },
-    { PVal3, PVal3, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PVal3, MVal3, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PVal3, PVal4, "0x1p-125", APFloat::opOK, APFloat::fcNormal },
-    { PVal3, MVal4, "0x1p-125", APFloat::opOK, APFloat::fcNormal },
-    { PVal3, PVal5, "0x1p-125", APFloat::opOK, APFloat::fcNormal },
-    { PVal3, MVal5, "0x1p-125", APFloat::opOK, APFloat::fcNormal },
-    { PVal3, PVal6, "0x1p-125", APFloat::opOK, APFloat::fcNormal },
-    { PVal3, MVal6, "0x1p-125", APFloat::opOK, APFloat::fcNormal },
-    { MVal3, PVal1, "-0x1p-125", APFloat::opOK, APFloat::fcNormal },
-    { MVal3, MVal1, "-0x1p-125", APFloat::opOK, APFloat::fcNormal },
-    { MVal3, PVal2, "-0x0.000002p-126", APFloat::opOK, APFloat::fcNormal },
-    { MVal3, MVal2, "-0x0.000002p-126", APFloat::opOK, APFloat::fcNormal },
-    { MVal3, PVal3, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MVal3, MVal3, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MVal3, PVal4, "-0x1p-125", APFloat::opOK, APFloat::fcNormal },
-    { MVal3, MVal4, "-0x1p-125", APFloat::opOK, APFloat::fcNormal },
-    { MVal3, PVal5, "-0x1p-125", APFloat::opOK, APFloat::fcNormal },
-    { MVal3, MVal5, "-0x1p-125", APFloat::opOK, APFloat::fcNormal },
-    { MVal3, PVal6, "-0x1p-125", APFloat::opOK, APFloat::fcNormal },
-    { MVal3, MVal6, "-0x1p-125", APFloat::opOK, APFloat::fcNormal },
-    { PVal4, PVal1, "0x1p+103", APFloat::opOK, APFloat::fcNormal },
-    { PVal4, MVal1, "0x1p+103", APFloat::opOK, APFloat::fcNormal },
-    { PVal4, PVal2, "0x0.002p-126", APFloat::opOK, APFloat::fcNormal },
-    { PVal4, MVal2, "0x0.002p-126", APFloat::opOK, APFloat::fcNormal },
-    { PVal4, PVal3, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PVal4, MVal3, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PVal4, PVal4, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PVal4, MVal4, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PVal4, PVal5, "0.5", APFloat::opOK, APFloat::fcNormal },
-    { PVal4, MVal5, "0.5", APFloat::opOK, APFloat::fcNormal },
-    { PVal4, PVal6, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PVal4, MVal6, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MVal4, PVal1, "-0x1p+103", APFloat::opOK, APFloat::fcNormal },
-    { MVal4, MVal1, "-0x1p+103", APFloat::opOK, APFloat::fcNormal },
-    { MVal4, PVal2, "-0x0.002p-126", APFloat::opOK, APFloat::fcNormal },
-    { MVal4, MVal2, "-0x0.002p-126", APFloat::opOK, APFloat::fcNormal },
-    { MVal4, PVal3, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MVal4, MVal3, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MVal4, PVal4, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MVal4, MVal4, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MVal4, PVal5, "-0.5", APFloat::opOK, APFloat::fcNormal },
-    { MVal4, MVal5, "-0.5", APFloat::opOK, APFloat::fcNormal },
-    { MVal4, PVal6, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MVal4, MVal6, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PVal5, PVal1, "1.5", APFloat::opOK, APFloat::fcNormal },
-    { PVal5, MVal1, "1.5", APFloat::opOK, APFloat::fcNormal },
-    { PVal5, PVal2, "0x0.00006p-126", APFloat::opOK, APFloat::fcNormal },
-    { PVal5, MVal2, "0x0.00006p-126", APFloat::opOK, APFloat::fcNormal },
-    { PVal5, PVal3, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PVal5, MVal3, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PVal5, PVal4, "1.5", APFloat::opOK, APFloat::fcNormal },
-    { PVal5, MVal4, "1.5", APFloat::opOK, APFloat::fcNormal },
-    { PVal5, PVal5, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PVal5, MVal5, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PVal5, PVal6, "-0.5", APFloat::opOK, APFloat::fcNormal },
-    { PVal5, MVal6, "-0.5", APFloat::opOK, APFloat::fcNormal },
-    { MVal5, PVal1, "-1.5", APFloat::opOK, APFloat::fcNormal },
-    { MVal5, MVal1, "-1.5", APFloat::opOK, APFloat::fcNormal },
-    { MVal5, PVal2, "-0x0.00006p-126", APFloat::opOK, APFloat::fcNormal },
-    { MVal5, MVal2, "-0x0.00006p-126", APFloat::opOK, APFloat::fcNormal },
-    { MVal5, PVal3, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MVal5, MVal3, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MVal5, PVal4, "-1.5", APFloat::opOK, APFloat::fcNormal },
-    { MVal5, MVal4, "-1.5", APFloat::opOK, APFloat::fcNormal },
-    { MVal5, PVal5, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MVal5, MVal5, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MVal5, PVal6, "0.5", APFloat::opOK, APFloat::fcNormal },
-    { MVal5, MVal6, "0.5", APFloat::opOK, APFloat::fcNormal },
-    { PVal6, PVal1, "0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { PVal6, MVal1, "0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { PVal6, PVal2, "0x0.00004p-126", APFloat::opOK, APFloat::fcNormal },
-    { PVal6, MVal2, "0x0.00004p-126", APFloat::opOK, APFloat::fcNormal },
-    { PVal6, PVal3, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PVal6, MVal3, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PVal6, PVal4, "0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { PVal6, MVal4, "0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { PVal6, PVal5, "-0.5", APFloat::opOK, APFloat::fcNormal },
-    { PVal6, MVal5, "-0.5", APFloat::opOK, APFloat::fcNormal },
-    { PVal6, PVal6, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { PVal6, MVal6, "0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MVal6, PVal1, "-0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { MVal6, MVal1, "-0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { MVal6, PVal2, "-0x0.00004p-126", APFloat::opOK, APFloat::fcNormal },
-    { MVal6, MVal2, "-0x0.00004p-126", APFloat::opOK, APFloat::fcNormal },
-    { MVal6, PVal3, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MVal6, MVal3, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MVal6, PVal4, "-0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { MVal6, MVal4, "-0x1p+0", APFloat::opOK, APFloat::fcNormal },
-    { MVal6, PVal5, "0.5", APFloat::opOK, APFloat::fcNormal },
-    { MVal6, MVal5, "0.5", APFloat::opOK, APFloat::fcNormal },
-    { MVal6, PVal6, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-    { MVal6, MVal6, "-0x0p+0", APFloat::opOK, APFloat::fcZero },
-  };
-
-  for (size_t i = 0; i < array_lengthof(SpecialCaseTests); ++i) {
-    APFloat x(SpecialCaseTests[i].x);
-    APFloat y(SpecialCaseTests[i].y);
-    APFloat::opStatus status = x.remainder(y);
-
-    APFloat result(x.getSemantics(), SpecialCaseTests[i].result);
-
-    EXPECT_TRUE(result.bitwiseIsEqual(x));
-    EXPECT_EQ(SpecialCaseTests[i].status, (int)status);
-    EXPECT_EQ(SpecialCaseTests[i].category, (int)x.getCategory());
-  }
-
-  {
-    APFloat f1(APFloat::IEEEdouble(), "0x1.3333333333333p-2"); // 0.3
-    APFloat f2(APFloat::IEEEdouble(), "0x1.47ae147ae147bp-7"); // 0.01
-    APFloat expected(APFloat::IEEEdouble(), "-0x1.4p-56");
-    EXPECT_EQ(APFloat::opOK, f1.remainder(f2));
-    EXPECT_TRUE(f1.bitwiseIsEqual(expected));
-  }
-  {
-    APFloat f1(APFloat::IEEEdouble(), "0x1p64"); // 1.8446744073709552e19
-    APFloat f2(APFloat::IEEEdouble(), "1.5");
-    APFloat expected(APFloat::IEEEdouble(), "-0.5");
-    EXPECT_EQ(APFloat::opOK, f1.remainder(f2));
-    EXPECT_TRUE(f1.bitwiseIsEqual(expected));
-  }
-  {
-    APFloat f1(APFloat::IEEEdouble(), "0x1p1000");
-    APFloat f2(APFloat::IEEEdouble(), "0x1p-1000");
-    APFloat expected(APFloat::IEEEdouble(), "0.0");
-    EXPECT_EQ(APFloat::opOK, f1.remainder(f2));
-    EXPECT_TRUE(f1.bitwiseIsEqual(expected));
-  }
-  {
-    APFloat f1 = APFloat::getInf(APFloat::IEEEdouble(), false);
-    APFloat f2(APFloat::IEEEdouble(), "1.0");
-    EXPECT_EQ(f1.remainder(f2), APFloat::opInvalidOp);
-    EXPECT_TRUE(f1.isNaN());
-  }
-  {
-    APFloat f1(APFloat::IEEEdouble(), "-4.0");
-    APFloat f2(APFloat::IEEEdouble(), "-2.0");
-    APFloat expected(APFloat::IEEEdouble(), "-0.0");
-    EXPECT_EQ(APFloat::opOK, f1.remainder(f2));
-    EXPECT_TRUE(f1.bitwiseIsEqual(expected));
-  }
-  {
-    APFloat f1(APFloat::IEEEdouble(), "-4.0");
-    APFloat f2(APFloat::IEEEdouble(), "2.0");
-    APFloat expected(APFloat::IEEEdouble(), "-0.0");
-    EXPECT_EQ(APFloat::opOK, f1.remainder(f2));
-    EXPECT_TRUE(f1.bitwiseIsEqual(expected));
-  }
-}
-
-TEST(APFloatTest, PPCDoubleDoubleAddSpecial) {
-  using DataType = std::tuple<uint64_t, uint64_t, uint64_t, uint64_t,
-                              APFloat::fltCategory, APFloat::roundingMode>;
-  DataType Data[] = {
-      // (1 + 0) + (-1 + 0) = fcZero
-      std::make_tuple(0x3ff0000000000000ull, 0, 0xbff0000000000000ull, 0,
-                      APFloat::fcZero, APFloat::rmNearestTiesToEven),
-      // LDBL_MAX + (1.1 >> (1023 - 106) + 0)) = fcInfinity
-      std::make_tuple(0x7fefffffffffffffull, 0x7c8ffffffffffffeull,
-                      0x7948000000000000ull, 0ull, APFloat::fcInfinity,
-                      APFloat::rmNearestTiesToEven),
-      // TODO: change the 4th 0x75effffffffffffe to 0x75efffffffffffff when
-      // semPPCDoubleDoubleLegacy is gone.
-      // LDBL_MAX + (1.011111... >> (1023 - 106) + (1.1111111...0 >> (1023 -
-      // 160))) = fcNormal
-      std::make_tuple(0x7fefffffffffffffull, 0x7c8ffffffffffffeull,
-                      0x7947ffffffffffffull, 0x75effffffffffffeull,
-                      APFloat::fcNormal, APFloat::rmNearestTiesToEven),
-      // LDBL_MAX + (1.1 >> (1023 - 106) + 0)) = fcInfinity
-      std::make_tuple(0x7fefffffffffffffull, 0x7c8ffffffffffffeull,
-                      0x7fefffffffffffffull, 0x7c8ffffffffffffeull,
-                      APFloat::fcInfinity, APFloat::rmNearestTiesToEven),
-      // NaN + (1 + 0) = fcNaN
-      std::make_tuple(0x7ff8000000000000ull, 0, 0x3ff0000000000000ull, 0,
-                      APFloat::fcNaN, APFloat::rmNearestTiesToEven),
-  };
-
-  for (auto Tp : Data) {
-    uint64_t Op1[2], Op2[2];
-    APFloat::fltCategory Expected;
-    APFloat::roundingMode RM;
-    std::tie(Op1[0], Op1[1], Op2[0], Op2[1], Expected, RM) = Tp;
-
-    {
-      APFloat A1(APFloat::PPCDoubleDouble(), APInt(128, 2, Op1));
-      APFloat A2(APFloat::PPCDoubleDouble(), APInt(128, 2, Op2));
-      A1.add(A2, RM);
-
-      EXPECT_EQ(Expected, A1.getCategory())
-          << formatv("({0:x} + {1:x}) + ({2:x} + {3:x})", Op1[0], Op1[1],
-                     Op2[0], Op2[1])
-                 .str();
-    }
-    {
-      APFloat A1(APFloat::PPCDoubleDouble(), APInt(128, 2, Op1));
-      APFloat A2(APFloat::PPCDoubleDouble(), APInt(128, 2, Op2));
-      A2.add(A1, RM);
-
-      EXPECT_EQ(Expected, A2.getCategory())
-          << formatv("({0:x} + {1:x}) + ({2:x} + {3:x})", Op2[0], Op2[1],
-                     Op1[0], Op1[1])
-                 .str();
-    }
-  }
-}
-
-TEST(APFloatTest, PPCDoubleDoubleAdd) {
-  using DataType = std::tuple<uint64_t, uint64_t, uint64_t, uint64_t, uint64_t,
-                              uint64_t, APFloat::roundingMode>;
-  DataType Data[] = {
-      // (1 + 0) + (1e-105 + 0) = (1 + 1e-105)
-      std::make_tuple(0x3ff0000000000000ull, 0, 0x3960000000000000ull, 0,
-                      0x3ff0000000000000ull, 0x3960000000000000ull,
-                      APFloat::rmNearestTiesToEven),
-      // (1 + 0) + (1e-106 + 0) = (1 + 1e-106)
-      std::make_tuple(0x3ff0000000000000ull, 0, 0x3950000000000000ull, 0,
-                      0x3ff0000000000000ull, 0x3950000000000000ull,
-                      APFloat::rmNearestTiesToEven),
-      // (1 + 1e-106) + (1e-106 + 0) = (1 + 1e-105)
-      std::make_tuple(0x3ff0000000000000ull, 0x3950000000000000ull,
-                      0x3950000000000000ull, 0, 0x3ff0000000000000ull,
-                      0x3960000000000000ull, APFloat::rmNearestTiesToEven),
-      // (1 + 0) + (epsilon + 0) = (1 + epsilon)
-      std::make_tuple(0x3ff0000000000000ull, 0, 0x0000000000000001ull, 0,
-                      0x3ff0000000000000ull, 0x0000000000000001ull,
-                      APFloat::rmNearestTiesToEven),
-      // TODO: change 0xf950000000000000 to 0xf940000000000000, when
-      // semPPCDoubleDoubleLegacy is gone.
-      // (DBL_MAX - 1 << (1023 - 105)) + (1 << (1023 - 53) + 0) = DBL_MAX +
-      // 1.11111... << (1023 - 52)
-      std::make_tuple(0x7fefffffffffffffull, 0xf950000000000000ull,
-                      0x7c90000000000000ull, 0, 0x7fefffffffffffffull,
-                      0x7c8ffffffffffffeull, APFloat::rmNearestTiesToEven),
-      // TODO: change 0xf950000000000000 to 0xf940000000000000, when
-      // semPPCDoubleDoubleLegacy is gone.
-      // (1 << (1023 - 53) + 0) + (DBL_MAX - 1 << (1023 - 105)) = DBL_MAX +
-      // 1.11111... << (1023 - 52)
-      std::make_tuple(0x7c90000000000000ull, 0, 0x7fefffffffffffffull,
-                      0xf950000000000000ull, 0x7fefffffffffffffull,
-                      0x7c8ffffffffffffeull, APFloat::rmNearestTiesToEven),
-  };
-
-  for (auto Tp : Data) {
-    uint64_t Op1[2], Op2[2], Expected[2];
-    APFloat::roundingMode RM;
-    std::tie(Op1[0], Op1[1], Op2[0], Op2[1], Expected[0], Expected[1], RM) = Tp;
-
-    {
-      APFloat A1(APFloat::PPCDoubleDouble(), APInt(128, 2, Op1));
-      APFloat A2(APFloat::PPCDoubleDouble(), APInt(128, 2, Op2));
-      A1.add(A2, RM);
-
-      EXPECT_EQ(Expected[0], A1.bitcastToAPInt().getRawData()[0])
-          << formatv("({0:x} + {1:x}) + ({2:x} + {3:x})", Op1[0], Op1[1],
-                     Op2[0], Op2[1])
-                 .str();
-      EXPECT_EQ(Expected[1], A1.bitcastToAPInt().getRawData()[1])
-          << formatv("({0:x} + {1:x}) + ({2:x} + {3:x})", Op1[0], Op1[1],
-                     Op2[0], Op2[1])
-                 .str();
-    }
-    {
-      APFloat A1(APFloat::PPCDoubleDouble(), APInt(128, 2, Op1));
-      APFloat A2(APFloat::PPCDoubleDouble(), APInt(128, 2, Op2));
-      A2.add(A1, RM);
-
-      EXPECT_EQ(Expected[0], A2.bitcastToAPInt().getRawData()[0])
-          << formatv("({0:x} + {1:x}) + ({2:x} + {3:x})", Op2[0], Op2[1],
-                     Op1[0], Op1[1])
-                 .str();
-      EXPECT_EQ(Expected[1], A2.bitcastToAPInt().getRawData()[1])
-          << formatv("({0:x} + {1:x}) + ({2:x} + {3:x})", Op2[0], Op2[1],
-                     Op1[0], Op1[1])
-                 .str();
-    }
-  }
-}
-
-TEST(APFloatTest, PPCDoubleDoubleSubtract) {
-  using DataType = std::tuple<uint64_t, uint64_t, uint64_t, uint64_t, uint64_t,
-                              uint64_t, APFloat::roundingMode>;
-  DataType Data[] = {
-      // (1 + 0) - (-1e-105 + 0) = (1 + 1e-105)
-      std::make_tuple(0x3ff0000000000000ull, 0, 0xb960000000000000ull, 0,
-                      0x3ff0000000000000ull, 0x3960000000000000ull,
-                      APFloat::rmNearestTiesToEven),
-      // (1 + 0) - (-1e-106 + 0) = (1 + 1e-106)
-      std::make_tuple(0x3ff0000000000000ull, 0, 0xb950000000000000ull, 0,
-                      0x3ff0000000000000ull, 0x3950000000000000ull,
-                      APFloat::rmNearestTiesToEven),
-  };
-
-  for (auto Tp : Data) {
-    uint64_t Op1[2], Op2[2], Expected[2];
-    APFloat::roundingMode RM;
-    std::tie(Op1[0], Op1[1], Op2[0], Op2[1], Expected[0], Expected[1], RM) = Tp;
-
-    APFloat A1(APFloat::PPCDoubleDouble(), APInt(128, 2, Op1));
-    APFloat A2(APFloat::PPCDoubleDouble(), APInt(128, 2, Op2));
-    A1.subtract(A2, RM);
-
-    EXPECT_EQ(Expected[0], A1.bitcastToAPInt().getRawData()[0])
-        << formatv("({0:x} + {1:x}) - ({2:x} + {3:x})", Op1[0], Op1[1], Op2[0],
-                   Op2[1])
-               .str();
-    EXPECT_EQ(Expected[1], A1.bitcastToAPInt().getRawData()[1])
-        << formatv("({0:x} + {1:x}) - ({2:x} + {3:x})", Op1[0], Op1[1], Op2[0],
-                   Op2[1])
-               .str();
-  }
-}
-
-TEST(APFloatTest, PPCDoubleDoubleMultiplySpecial) {
-  using DataType = std::tuple<uint64_t, uint64_t, uint64_t, uint64_t,
-                              APFloat::fltCategory, APFloat::roundingMode>;
-  DataType Data[] = {
-      // fcNaN * fcNaN = fcNaN
-      std::make_tuple(0x7ff8000000000000ull, 0, 0x7ff8000000000000ull, 0,
-                      APFloat::fcNaN, APFloat::rmNearestTiesToEven),
-      // fcNaN * fcZero = fcNaN
-      std::make_tuple(0x7ff8000000000000ull, 0, 0, 0, APFloat::fcNaN,
-                      APFloat::rmNearestTiesToEven),
-      // fcNaN * fcInfinity = fcNaN
-      std::make_tuple(0x7ff8000000000000ull, 0, 0x7ff0000000000000ull, 0,
-                      APFloat::fcNaN, APFloat::rmNearestTiesToEven),
-      // fcNaN * fcNormal = fcNaN
-      std::make_tuple(0x7ff8000000000000ull, 0, 0x3ff0000000000000ull, 0,
-                      APFloat::fcNaN, APFloat::rmNearestTiesToEven),
-      // fcInfinity * fcInfinity = fcInfinity
-      std::make_tuple(0x7ff0000000000000ull, 0, 0x7ff0000000000000ull, 0,
-                      APFloat::fcInfinity, APFloat::rmNearestTiesToEven),
-      // fcInfinity * fcZero = fcNaN
-      std::make_tuple(0x7ff0000000000000ull, 0, 0, 0, APFloat::fcNaN,
-                      APFloat::rmNearestTiesToEven),
-      // fcInfinity * fcNormal = fcInfinity
-      std::make_tuple(0x7ff0000000000000ull, 0, 0x3ff0000000000000ull, 0,
-                      APFloat::fcInfinity, APFloat::rmNearestTiesToEven),
-      // fcZero * fcZero = fcZero
-      std::make_tuple(0, 0, 0, 0, APFloat::fcZero,
-                      APFloat::rmNearestTiesToEven),
-      // fcZero * fcNormal = fcZero
-      std::make_tuple(0, 0, 0x3ff0000000000000ull, 0, APFloat::fcZero,
-                      APFloat::rmNearestTiesToEven),
-  };
-
-  for (auto Tp : Data) {
-    uint64_t Op1[2], Op2[2];
-    APFloat::fltCategory Expected;
-    APFloat::roundingMode RM;
-    std::tie(Op1[0], Op1[1], Op2[0], Op2[1], Expected, RM) = Tp;
-
-    {
-      APFloat A1(APFloat::PPCDoubleDouble(), APInt(128, 2, Op1));
-      APFloat A2(APFloat::PPCDoubleDouble(), APInt(128, 2, Op2));
-      A1.multiply(A2, RM);
-
-      EXPECT_EQ(Expected, A1.getCategory())
-          << formatv("({0:x} + {1:x}) * ({2:x} + {3:x})", Op1[0], Op1[1],
-                     Op2[0], Op2[1])
-                 .str();
-    }
-    {
-      APFloat A1(APFloat::PPCDoubleDouble(), APInt(128, 2, Op1));
-      APFloat A2(APFloat::PPCDoubleDouble(), APInt(128, 2, Op2));
-      A2.multiply(A1, RM);
-
-      EXPECT_EQ(Expected, A2.getCategory())
-          << formatv("({0:x} + {1:x}) * ({2:x} + {3:x})", Op2[0], Op2[1],
-                     Op1[0], Op1[1])
-                 .str();
-    }
-  }
-}
-
-TEST(APFloatTest, PPCDoubleDoubleMultiply) {
-  using DataType = std::tuple<uint64_t, uint64_t, uint64_t, uint64_t, uint64_t,
-                              uint64_t, APFloat::roundingMode>;
-  DataType Data[] = {
-      // 1/3 * 3 = 1.0
-      std::make_tuple(0x3fd5555555555555ull, 0x3c75555555555556ull,
-                      0x4008000000000000ull, 0, 0x3ff0000000000000ull, 0,
-                      APFloat::rmNearestTiesToEven),
-      // (1 + epsilon) * (1 + 0) = fcZero
-      std::make_tuple(0x3ff0000000000000ull, 0x0000000000000001ull,
-                      0x3ff0000000000000ull, 0, 0x3ff0000000000000ull,
-                      0x0000000000000001ull, APFloat::rmNearestTiesToEven),
-      // (1 + epsilon) * (1 + epsilon) = 1 + 2 * epsilon
-      std::make_tuple(0x3ff0000000000000ull, 0x0000000000000001ull,
-                      0x3ff0000000000000ull, 0x0000000000000001ull,
-                      0x3ff0000000000000ull, 0x0000000000000002ull,
-                      APFloat::rmNearestTiesToEven),
-      // -(1 + epsilon) * (1 + epsilon) = -1
-      std::make_tuple(0xbff0000000000000ull, 0x0000000000000001ull,
-                      0x3ff0000000000000ull, 0x0000000000000001ull,
-                      0xbff0000000000000ull, 0, APFloat::rmNearestTiesToEven),
-      // (0.5 + 0) * (1 + 2 * epsilon) = 0.5 + epsilon
-      std::make_tuple(0x3fe0000000000000ull, 0, 0x3ff0000000000000ull,
-                      0x0000000000000002ull, 0x3fe0000000000000ull,
-                      0x0000000000000001ull, APFloat::rmNearestTiesToEven),
-      // (0.5 + 0) * (1 + epsilon) = 0.5
-      std::make_tuple(0x3fe0000000000000ull, 0, 0x3ff0000000000000ull,
-                      0x0000000000000001ull, 0x3fe0000000000000ull, 0,
-                      APFloat::rmNearestTiesToEven),
-      // __LDBL_MAX__ * (1 + 1 << 106) = inf
-      std::make_tuple(0x7fefffffffffffffull, 0x7c8ffffffffffffeull,
-                      0x3ff0000000000000ull, 0x3950000000000000ull,
-                      0x7ff0000000000000ull, 0, APFloat::rmNearestTiesToEven),
-      // __LDBL_MAX__ * (1 + 1 << 107) > __LDBL_MAX__, but not inf, yes =_=|||
-      std::make_tuple(0x7fefffffffffffffull, 0x7c8ffffffffffffeull,
-                      0x3ff0000000000000ull, 0x3940000000000000ull,
-                      0x7fefffffffffffffull, 0x7c8fffffffffffffull,
-                      APFloat::rmNearestTiesToEven),
-      // __LDBL_MAX__ * (1 + 1 << 108) = __LDBL_MAX__
-      std::make_tuple(0x7fefffffffffffffull, 0x7c8ffffffffffffeull,
-                      0x3ff0000000000000ull, 0x3930000000000000ull,
-                      0x7fefffffffffffffull, 0x7c8ffffffffffffeull,
-                      APFloat::rmNearestTiesToEven),
-  };
-
-  for (auto Tp : Data) {
-    uint64_t Op1[2], Op2[2], Expected[2];
-    APFloat::roundingMode RM;
-    std::tie(Op1[0], Op1[1], Op2[0], Op2[1], Expected[0], Expected[1], RM) = Tp;
-
-    {
-      APFloat A1(APFloat::PPCDoubleDouble(), APInt(128, 2, Op1));
-      APFloat A2(APFloat::PPCDoubleDouble(), APInt(128, 2, Op2));
-      A1.multiply(A2, RM);
-
-      EXPECT_EQ(Expected[0], A1.bitcastToAPInt().getRawData()[0])
-          << formatv("({0:x} + {1:x}) * ({2:x} + {3:x})", Op1[0], Op1[1],
-                     Op2[0], Op2[1])
-                 .str();
-      EXPECT_EQ(Expected[1], A1.bitcastToAPInt().getRawData()[1])
-          << formatv("({0:x} + {1:x}) * ({2:x} + {3:x})", Op1[0], Op1[1],
-                     Op2[0], Op2[1])
-                 .str();
-    }
-    {
-      APFloat A1(APFloat::PPCDoubleDouble(), APInt(128, 2, Op1));
-      APFloat A2(APFloat::PPCDoubleDouble(), APInt(128, 2, Op2));
-      A2.multiply(A1, RM);
-
-      EXPECT_EQ(Expected[0], A2.bitcastToAPInt().getRawData()[0])
-          << formatv("({0:x} + {1:x}) * ({2:x} + {3:x})", Op2[0], Op2[1],
-                     Op1[0], Op1[1])
-                 .str();
-      EXPECT_EQ(Expected[1], A2.bitcastToAPInt().getRawData()[1])
-          << formatv("({0:x} + {1:x}) * ({2:x} + {3:x})", Op2[0], Op2[1],
-                     Op1[0], Op1[1])
-                 .str();
-    }
-  }
-}
-
-TEST(APFloatTest, PPCDoubleDoubleDivide) {
-  using DataType = std::tuple<uint64_t, uint64_t, uint64_t, uint64_t, uint64_t,
-                              uint64_t, APFloat::roundingMode>;
-  // TODO: Only a sanity check for now. Add more edge cases when the
-  // double-double algorithm is implemented.
-  DataType Data[] = {
-      // 1 / 3 = 1/3
-      std::make_tuple(0x3ff0000000000000ull, 0, 0x4008000000000000ull, 0,
-                      0x3fd5555555555555ull, 0x3c75555555555556ull,
-                      APFloat::rmNearestTiesToEven),
-  };
-
-  for (auto Tp : Data) {
-    uint64_t Op1[2], Op2[2], Expected[2];
-    APFloat::roundingMode RM;
-    std::tie(Op1[0], Op1[1], Op2[0], Op2[1], Expected[0], Expected[1], RM) = Tp;
-
-    APFloat A1(APFloat::PPCDoubleDouble(), APInt(128, 2, Op1));
-    APFloat A2(APFloat::PPCDoubleDouble(), APInt(128, 2, Op2));
-    A1.divide(A2, RM);
-
-    EXPECT_EQ(Expected[0], A1.bitcastToAPInt().getRawData()[0])
-        << formatv("({0:x} + {1:x}) / ({2:x} + {3:x})", Op1[0], Op1[1], Op2[0],
-                   Op2[1])
-               .str();
-    EXPECT_EQ(Expected[1], A1.bitcastToAPInt().getRawData()[1])
-        << formatv("({0:x} + {1:x}) / ({2:x} + {3:x})", Op1[0], Op1[1], Op2[0],
-                   Op2[1])
-               .str();
-  }
-}
-
-TEST(APFloatTest, PPCDoubleDoubleRemainder) {
-  using DataType =
-      std::tuple<uint64_t, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t>;
-  DataType Data[] = {
-      // remainder(3.0 + 3.0 << 53, 1.25 + 1.25 << 53) = (0.5 + 0.5 << 53)
-      std::make_tuple(0x4008000000000000ull, 0x3cb8000000000000ull,
-                      0x3ff4000000000000ull, 0x3ca4000000000000ull,
-                      0x3fe0000000000000ull, 0x3c90000000000000ull),
-      // remainder(3.0 + 3.0 << 53, 1.75 + 1.75 << 53) = (-0.5 - 0.5 << 53)
-      std::make_tuple(0x4008000000000000ull, 0x3cb8000000000000ull,
-                      0x3ffc000000000000ull, 0x3cac000000000000ull,
-                      0xbfe0000000000000ull, 0xbc90000000000000ull),
-  };
-
-  for (auto Tp : Data) {
-    uint64_t Op1[2], Op2[2], Expected[2];
-    std::tie(Op1[0], Op1[1], Op2[0], Op2[1], Expected[0], Expected[1]) = Tp;
-
-    APFloat A1(APFloat::PPCDoubleDouble(), APInt(128, 2, Op1));
-    APFloat A2(APFloat::PPCDoubleDouble(), APInt(128, 2, Op2));
-    A1.remainder(A2);
-
-    EXPECT_EQ(Expected[0], A1.bitcastToAPInt().getRawData()[0])
-        << formatv("remainder({0:x} + {1:x}), ({2:x} + {3:x}))", Op1[0], Op1[1],
-                   Op2[0], Op2[1])
-               .str();
-    EXPECT_EQ(Expected[1], A1.bitcastToAPInt().getRawData()[1])
-        << formatv("remainder(({0:x} + {1:x}), ({2:x} + {3:x}))", Op1[0],
-                   Op1[1], Op2[0], Op2[1])
-               .str();
-  }
-}
-
-TEST(APFloatTest, PPCDoubleDoubleMod) {
-  using DataType =
-      std::tuple<uint64_t, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t>;
-  DataType Data[] = {
-      // mod(3.0 + 3.0 << 53, 1.25 + 1.25 << 53) = (0.5 + 0.5 << 53)
-      std::make_tuple(0x4008000000000000ull, 0x3cb8000000000000ull,
-                      0x3ff4000000000000ull, 0x3ca4000000000000ull,
-                      0x3fe0000000000000ull, 0x3c90000000000000ull),
-      // mod(3.0 + 3.0 << 53, 1.75 + 1.75 << 53) = (1.25 + 1.25 << 53)
-      // 0xbc98000000000000 doesn't seem right, but it's what we currently have.
-      // TODO: investigate
-      std::make_tuple(0x4008000000000000ull, 0x3cb8000000000000ull,
-                      0x3ffc000000000000ull, 0x3cac000000000000ull,
-                      0x3ff4000000000001ull, 0xbc98000000000000ull),
-  };
-
-  for (auto Tp : Data) {
-    uint64_t Op1[2], Op2[2], Expected[2];
-    std::tie(Op1[0], Op1[1], Op2[0], Op2[1], Expected[0], Expected[1]) = Tp;
-
-    APFloat A1(APFloat::PPCDoubleDouble(), APInt(128, 2, Op1));
-    APFloat A2(APFloat::PPCDoubleDouble(), APInt(128, 2, Op2));
-    A1.mod(A2);
-
-    EXPECT_EQ(Expected[0], A1.bitcastToAPInt().getRawData()[0])
-        << formatv("fmod(({0:x} + {1:x}),  ({2:x} + {3:x}))", Op1[0], Op1[1],
-                   Op2[0], Op2[1])
-               .str();
-    EXPECT_EQ(Expected[1], A1.bitcastToAPInt().getRawData()[1])
-        << formatv("fmod(({0:x} + {1:x}), ({2:x} + {3:x}))", Op1[0], Op1[1],
-                   Op2[0], Op2[1])
-               .str();
-  }
-}
-
-TEST(APFloatTest, PPCDoubleDoubleFMA) {
-  // Sanity check for now.
-  APFloat A(APFloat::PPCDoubleDouble(), "2");
-  A.fusedMultiplyAdd(APFloat(APFloat::PPCDoubleDouble(), "3"),
-                     APFloat(APFloat::PPCDoubleDouble(), "4"),
-                     APFloat::rmNearestTiesToEven);
-  EXPECT_EQ(APFloat::cmpEqual,
-            APFloat(APFloat::PPCDoubleDouble(), "10").compare(A));
-}
-
-TEST(APFloatTest, PPCDoubleDoubleRoundToIntegral) {
-  {
-    APFloat A(APFloat::PPCDoubleDouble(), "1.5");
-    A.roundToIntegral(APFloat::rmNearestTiesToEven);
-    EXPECT_EQ(APFloat::cmpEqual,
-              APFloat(APFloat::PPCDoubleDouble(), "2").compare(A));
-  }
-  {
-    APFloat A(APFloat::PPCDoubleDouble(), "2.5");
-    A.roundToIntegral(APFloat::rmNearestTiesToEven);
-    EXPECT_EQ(APFloat::cmpEqual,
-              APFloat(APFloat::PPCDoubleDouble(), "2").compare(A));
-  }
-}
-
-TEST(APFloatTest, PPCDoubleDoubleCompare) {
-  using DataType =
-      std::tuple<uint64_t, uint64_t, uint64_t, uint64_t, APFloat::cmpResult>;
-
-  DataType Data[] = {
-      // (1 + 0) = (1 + 0)
-      std::make_tuple(0x3ff0000000000000ull, 0, 0x3ff0000000000000ull, 0,
-                      APFloat::cmpEqual),
-      // (1 + 0) < (1.00...1 + 0)
-      std::make_tuple(0x3ff0000000000000ull, 0, 0x3ff0000000000001ull, 0,
-                      APFloat::cmpLessThan),
-      // (1.00...1 + 0) > (1 + 0)
-      std::make_tuple(0x3ff0000000000001ull, 0, 0x3ff0000000000000ull, 0,
-                      APFloat::cmpGreaterThan),
-      // (1 + 0) < (1 + epsilon)
-      std::make_tuple(0x3ff0000000000000ull, 0, 0x3ff0000000000001ull,
-                      0x0000000000000001ull, APFloat::cmpLessThan),
-      // NaN != NaN
-      std::make_tuple(0x7ff8000000000000ull, 0, 0x7ff8000000000000ull, 0,
-                      APFloat::cmpUnordered),
-      // (1 + 0) != NaN
-      std::make_tuple(0x3ff0000000000000ull, 0, 0x7ff8000000000000ull, 0,
-                      APFloat::cmpUnordered),
-      // Inf = Inf
-      std::make_tuple(0x7ff0000000000000ull, 0, 0x7ff0000000000000ull, 0,
-                      APFloat::cmpEqual),
-  };
-
-  for (auto Tp : Data) {
-    uint64_t Op1[2], Op2[2];
-    APFloat::cmpResult Expected;
-    std::tie(Op1[0], Op1[1], Op2[0], Op2[1], Expected) = Tp;
-
-    APFloat A1(APFloat::PPCDoubleDouble(), APInt(128, 2, Op1));
-    APFloat A2(APFloat::PPCDoubleDouble(), APInt(128, 2, Op2));
-    EXPECT_EQ(Expected, A1.compare(A2))
-        << formatv("compare(({0:x} + {1:x}), ({2:x} + {3:x}))", Op1[0], Op1[1],
-                   Op2[0], Op2[1])
-               .str();
-  }
-}
-
-TEST(APFloatTest, PPCDoubleDoubleBitwiseIsEqual) {
-  using DataType = std::tuple<uint64_t, uint64_t, uint64_t, uint64_t, bool>;
-
-  DataType Data[] = {
-      // (1 + 0) = (1 + 0)
-      std::make_tuple(0x3ff0000000000000ull, 0, 0x3ff0000000000000ull, 0, true),
-      // (1 + 0) != (1.00...1 + 0)
-      std::make_tuple(0x3ff0000000000000ull, 0, 0x3ff0000000000001ull, 0,
-                      false),
-      // NaN = NaN
-      std::make_tuple(0x7ff8000000000000ull, 0, 0x7ff8000000000000ull, 0, true),
-      // NaN != NaN with a different bit pattern
-      std::make_tuple(0x7ff8000000000000ull, 0, 0x7ff8000000000000ull,
-                      0x3ff0000000000000ull, false),
-      // Inf = Inf
-      std::make_tuple(0x7ff0000000000000ull, 0, 0x7ff0000000000000ull, 0, true),
-  };
-
-  for (auto Tp : Data) {
-    uint64_t Op1[2], Op2[2];
-    bool Expected;
-    std::tie(Op1[0], Op1[1], Op2[0], Op2[1], Expected) = Tp;
-
-    APFloat A1(APFloat::PPCDoubleDouble(), APInt(128, 2, Op1));
-    APFloat A2(APFloat::PPCDoubleDouble(), APInt(128, 2, Op2));
-    EXPECT_EQ(Expected, A1.bitwiseIsEqual(A2))
-        << formatv("({0:x} + {1:x}) = ({2:x} + {3:x})", Op1[0], Op1[1], Op2[0],
-                   Op2[1])
-               .str();
-  }
-}
-
-TEST(APFloatTest, PPCDoubleDoubleHashValue) {
-  uint64_t Data1[] = {0x3ff0000000000001ull, 0x0000000000000001ull};
-  uint64_t Data2[] = {0x3ff0000000000001ull, 0};
-  // The hash values are *hopefully* different.
-  EXPECT_NE(
-      hash_value(APFloat(APFloat::PPCDoubleDouble(), APInt(128, 2, Data1))),
-      hash_value(APFloat(APFloat::PPCDoubleDouble(), APInt(128, 2, Data2))));
-}
-
-TEST(APFloatTest, PPCDoubleDoubleChangeSign) {
-  uint64_t Data[] = {
-      0x400f000000000000ull, 0xbcb0000000000000ull,
-  };
-  APFloat Float(APFloat::PPCDoubleDouble(), APInt(128, 2, Data));
-  {
-    APFloat Actual =
-        APFloat::copySign(Float, APFloat(APFloat::IEEEdouble(), "1"));
-    EXPECT_EQ(0x400f000000000000ull, Actual.bitcastToAPInt().getRawData()[0]);
-    EXPECT_EQ(0xbcb0000000000000ull, Actual.bitcastToAPInt().getRawData()[1]);
-  }
-  {
-    APFloat Actual =
-        APFloat::copySign(Float, APFloat(APFloat::IEEEdouble(), "-1"));
-    EXPECT_EQ(0xc00f000000000000ull, Actual.bitcastToAPInt().getRawData()[0]);
-    EXPECT_EQ(0x3cb0000000000000ull, Actual.bitcastToAPInt().getRawData()[1]);
-  }
-}
-
-TEST(APFloatTest, PPCDoubleDoubleFactories) {
-  {
-    uint64_t Data[] = {
-        0, 0,
-    };
-    EXPECT_EQ(APInt(128, 2, Data),
-              APFloat::getZero(APFloat::PPCDoubleDouble()).bitcastToAPInt());
-  }
-  {
-    uint64_t Data[] = {
-        0x7fefffffffffffffull, 0x7c8ffffffffffffeull,
-    };
-    EXPECT_EQ(APInt(128, 2, Data),
-              APFloat::getLargest(APFloat::PPCDoubleDouble()).bitcastToAPInt());
-  }
-  {
-    uint64_t Data[] = {
-        0x0000000000000001ull, 0,
-    };
-    EXPECT_EQ(
-        APInt(128, 2, Data),
-        APFloat::getSmallest(APFloat::PPCDoubleDouble()).bitcastToAPInt());
-  }
-  {
-    uint64_t Data[] = {0x0360000000000000ull, 0};
-    EXPECT_EQ(APInt(128, 2, Data),
-              APFloat::getSmallestNormalized(APFloat::PPCDoubleDouble())
-                  .bitcastToAPInt());
-  }
-  {
-    uint64_t Data[] = {
-        0x8000000000000000ull, 0x0000000000000000ull,
-    };
-    EXPECT_EQ(
-        APInt(128, 2, Data),
-        APFloat::getZero(APFloat::PPCDoubleDouble(), true).bitcastToAPInt());
-  }
-  {
-    uint64_t Data[] = {
-        0xffefffffffffffffull, 0xfc8ffffffffffffeull,
-    };
-    EXPECT_EQ(
-        APInt(128, 2, Data),
-        APFloat::getLargest(APFloat::PPCDoubleDouble(), true).bitcastToAPInt());
-  }
-  {
-    uint64_t Data[] = {
-        0x8000000000000001ull, 0x0000000000000000ull,
-    };
-    EXPECT_EQ(APInt(128, 2, Data),
-              APFloat::getSmallest(APFloat::PPCDoubleDouble(), true)
-                  .bitcastToAPInt());
-  }
-  {
-    uint64_t Data[] = {
-        0x8360000000000000ull, 0x0000000000000000ull,
-    };
-    EXPECT_EQ(APInt(128, 2, Data),
-              APFloat::getSmallestNormalized(APFloat::PPCDoubleDouble(), true)
-                  .bitcastToAPInt());
-  }
-  EXPECT_TRUE(APFloat::getSmallest(APFloat::PPCDoubleDouble()).isSmallest());
-  EXPECT_TRUE(APFloat::getLargest(APFloat::PPCDoubleDouble()).isLargest());
-}
-
-TEST(APFloatTest, PPCDoubleDoubleIsDenormal) {
-  EXPECT_TRUE(APFloat::getSmallest(APFloat::PPCDoubleDouble()).isDenormal());
-  EXPECT_FALSE(APFloat::getLargest(APFloat::PPCDoubleDouble()).isDenormal());
-  EXPECT_FALSE(
-      APFloat::getSmallestNormalized(APFloat::PPCDoubleDouble()).isDenormal());
-  {
-    // (4 + 3) is not normalized
-    uint64_t Data[] = {
-        0x4010000000000000ull, 0x4008000000000000ull,
-    };
-    EXPECT_TRUE(
-        APFloat(APFloat::PPCDoubleDouble(), APInt(128, 2, Data)).isDenormal());
-  }
-}
-
-TEST(APFloatTest, PPCDoubleDoubleScalbn) {
-  // 3.0 + 3.0 << 53
-  uint64_t Input[] = {
-      0x4008000000000000ull, 0x3cb8000000000000ull,
-  };
-  APFloat Result =
-      scalbn(APFloat(APFloat::PPCDoubleDouble(), APInt(128, 2, Input)), 1,
-             APFloat::rmNearestTiesToEven);
-  // 6.0 + 6.0 << 53
-  EXPECT_EQ(0x4018000000000000ull, Result.bitcastToAPInt().getRawData()[0]);
-  EXPECT_EQ(0x3cc8000000000000ull, Result.bitcastToAPInt().getRawData()[1]);
-}
-
-TEST(APFloatTest, PPCDoubleDoubleFrexp) {
-  // 3.0 + 3.0 << 53
-  uint64_t Input[] = {
-      0x4008000000000000ull, 0x3cb8000000000000ull,
-  };
-  int Exp;
-  // 0.75 + 0.75 << 53
-  APFloat Result =
-      frexp(APFloat(APFloat::PPCDoubleDouble(), APInt(128, 2, Input)), Exp,
-            APFloat::rmNearestTiesToEven);
-  EXPECT_EQ(2, Exp);
-  EXPECT_EQ(0x3fe8000000000000ull, Result.bitcastToAPInt().getRawData()[0]);
-  EXPECT_EQ(0x3c98000000000000ull, Result.bitcastToAPInt().getRawData()[1]);
-}
-
-TEST(APFloatTest, x87Largest) {
-  APFloat MaxX87Val = APFloat::getLargest(APFloat::x87DoubleExtended());
-  EXPECT_TRUE(MaxX87Val.isLargest());
-}
-
-TEST(APFloatTest, x87Next) {
-  APFloat F(APFloat::x87DoubleExtended(), "-1.0");
-  F.next(false);
-  EXPECT_TRUE(ilogb(F) == -1);
-}
-
-TEST(APFloatTest, ToDouble) {
-  APFloat DPosZero(0.0);
-  APFloat DPosZeroToDouble(DPosZero.convertToDouble());
-  EXPECT_TRUE(DPosZeroToDouble.isPosZero());
-  APFloat DNegZero(-0.0);
-  APFloat DNegZeroToDouble(DNegZero.convertToDouble());
-  EXPECT_TRUE(DNegZeroToDouble.isNegZero());
-
-  APFloat DOne(1.0);
-  EXPECT_EQ(1.0, DOne.convertToDouble());
-  APFloat DPosLargest = APFloat::getLargest(APFloat::IEEEdouble(), false);
-  EXPECT_EQ(std::numeric_limits<double>::max(), DPosLargest.convertToDouble());
-  APFloat DNegLargest = APFloat::getLargest(APFloat::IEEEdouble(), true);
-  EXPECT_EQ(-std::numeric_limits<double>::max(), DNegLargest.convertToDouble());
-  APFloat DPosSmallest =
-      APFloat::getSmallestNormalized(APFloat::IEEEdouble(), false);
-  EXPECT_EQ(std::numeric_limits<double>::min(), DPosSmallest.convertToDouble());
-  APFloat DNegSmallest =
-      APFloat::getSmallestNormalized(APFloat::IEEEdouble(), true);
-  EXPECT_EQ(-std::numeric_limits<double>::min(),
-            DNegSmallest.convertToDouble());
-
-  APFloat DSmallestDenorm = APFloat::getSmallest(APFloat::IEEEdouble(), false);
-  EXPECT_EQ(std::numeric_limits<double>::denorm_min(),
-            DSmallestDenorm.convertToDouble());
-  APFloat DLargestDenorm(APFloat::IEEEdouble(), "0x0.FFFFFFFFFFFFFp-1022");
-  EXPECT_EQ(/*0x0.FFFFFFFFFFFFFp-1022*/ 2.225073858507201e-308,
-            DLargestDenorm.convertToDouble());
-
-  APFloat DPosInf = APFloat::getInf(APFloat::IEEEdouble());
-  EXPECT_EQ(std::numeric_limits<double>::infinity(), DPosInf.convertToDouble());
-  APFloat DNegInf = APFloat::getInf(APFloat::IEEEdouble(), true);
-  EXPECT_EQ(-std::numeric_limits<double>::infinity(),
-            DNegInf.convertToDouble());
-  APFloat DQNaN = APFloat::getQNaN(APFloat::IEEEdouble());
-  EXPECT_TRUE(std::isnan(DQNaN.convertToDouble()));
-
-  APFloat FPosZero(0.0F);
-  APFloat FPosZeroToDouble(FPosZero.convertToDouble());
-  EXPECT_TRUE(FPosZeroToDouble.isPosZero());
-  APFloat FNegZero(-0.0F);
-  APFloat FNegZeroToDouble(FNegZero.convertToDouble());
-  EXPECT_TRUE(FNegZeroToDouble.isNegZero());
-
-  APFloat FOne(1.0F);
-  EXPECT_EQ(1.0, FOne.convertToDouble());
-  APFloat FPosLargest = APFloat::getLargest(APFloat::IEEEsingle(), false);
-  EXPECT_EQ(std::numeric_limits<float>::max(), FPosLargest.convertToDouble());
-  APFloat FNegLargest = APFloat::getLargest(APFloat::IEEEsingle(), true);
-  EXPECT_EQ(-std::numeric_limits<float>::max(), FNegLargest.convertToDouble());
-  APFloat FPosSmallest =
-      APFloat::getSmallestNormalized(APFloat::IEEEsingle(), false);
-  EXPECT_EQ(std::numeric_limits<float>::min(), FPosSmallest.convertToDouble());
-  APFloat FNegSmallest =
-      APFloat::getSmallestNormalized(APFloat::IEEEsingle(), true);
-  EXPECT_EQ(-std::numeric_limits<float>::min(), FNegSmallest.convertToDouble());
-
-  APFloat FSmallestDenorm = APFloat::getSmallest(APFloat::IEEEsingle(), false);
-  EXPECT_EQ(std::numeric_limits<float>::denorm_min(),
-            FSmallestDenorm.convertToDouble());
-  APFloat FLargestDenorm(APFloat::IEEEdouble(), "0x0.FFFFFEp-126");
-  EXPECT_EQ(/*0x0.FFFFFEp-126*/ 1.1754942106924411e-38,
-            FLargestDenorm.convertToDouble());
-
-  APFloat FPosInf = APFloat::getInf(APFloat::IEEEsingle());
-  EXPECT_EQ(std::numeric_limits<double>::infinity(), FPosInf.convertToDouble());
-  APFloat FNegInf = APFloat::getInf(APFloat::IEEEsingle(), true);
-  EXPECT_EQ(-std::numeric_limits<double>::infinity(),
-            FNegInf.convertToDouble());
-  APFloat FQNaN = APFloat::getQNaN(APFloat::IEEEsingle());
-  EXPECT_TRUE(std::isnan(FQNaN.convertToDouble()));
-
-  APFloat HPosZero = APFloat::getZero(APFloat::IEEEhalf());
-  APFloat HPosZeroToDouble(HPosZero.convertToDouble());
-  EXPECT_TRUE(HPosZeroToDouble.isPosZero());
-  APFloat HNegZero = APFloat::getZero(APFloat::IEEEhalf(), true);
-  APFloat HNegZeroToDouble(HNegZero.convertToDouble());
-  EXPECT_TRUE(HNegZeroToDouble.isNegZero());
-
-  APFloat HOne(APFloat::IEEEhalf(), "1.0");
-  EXPECT_EQ(1.0, HOne.convertToDouble());
-  APFloat HPosLargest = APFloat::getLargest(APFloat::IEEEhalf(), false);
-  EXPECT_EQ(65504.0, HPosLargest.convertToDouble());
-  APFloat HNegLargest = APFloat::getLargest(APFloat::IEEEhalf(), true);
-  EXPECT_EQ(-65504.0, HNegLargest.convertToDouble());
-  APFloat HPosSmallest =
-      APFloat::getSmallestNormalized(APFloat::IEEEhalf(), false);
-  EXPECT_EQ(/*0x1.p-14*/ 6.103515625e-05, HPosSmallest.convertToDouble());
-  APFloat HNegSmallest =
-      APFloat::getSmallestNormalized(APFloat::IEEEhalf(), true);
-  EXPECT_EQ(/*-0x1.p-14*/ -6.103515625e-05, HNegSmallest.convertToDouble());
-
-  APFloat HSmallestDenorm = APFloat::getSmallest(APFloat::IEEEhalf(), false);
-  EXPECT_EQ(/*0x1.p-24*/ 5.960464477539063e-08,
-            HSmallestDenorm.convertToDouble());
-  APFloat HLargestDenorm(APFloat::IEEEhalf(), "0x1.FFCp-14");
-  EXPECT_EQ(/*0x1.FFCp-14*/ 0.00012201070785522461,
-            HLargestDenorm.convertToDouble());
-
-  APFloat HPosInf = APFloat::getInf(APFloat::IEEEhalf());
-  EXPECT_EQ(std::numeric_limits<double>::infinity(), HPosInf.convertToDouble());
-  APFloat HNegInf = APFloat::getInf(APFloat::IEEEhalf(), true);
-  EXPECT_EQ(-std::numeric_limits<double>::infinity(),
-            HNegInf.convertToDouble());
-  APFloat HQNaN = APFloat::getQNaN(APFloat::IEEEhalf());
-  EXPECT_TRUE(std::isnan(HQNaN.convertToDouble()));
-
-  APFloat BPosZero = APFloat::getZero(APFloat::IEEEhalf());
-  APFloat BPosZeroToDouble(BPosZero.convertToDouble());
-  EXPECT_TRUE(BPosZeroToDouble.isPosZero());
-  APFloat BNegZero = APFloat::getZero(APFloat::IEEEhalf(), true);
-  APFloat BNegZeroToDouble(BNegZero.convertToDouble());
-  EXPECT_TRUE(BNegZeroToDouble.isNegZero());
-
-  APFloat BOne(APFloat::BFloat(), "1.0");
-  EXPECT_EQ(1.0, BOne.convertToDouble());
-  APFloat BPosLargest = APFloat::getLargest(APFloat::BFloat(), false);
-  EXPECT_EQ(/*0x1.FEp127*/ 3.3895313892515355e+38,
-            BPosLargest.convertToDouble());
-  APFloat BNegLargest = APFloat::getLargest(APFloat::BFloat(), true);
-  EXPECT_EQ(/*-0x1.FEp127*/ -3.3895313892515355e+38,
-            BNegLargest.convertToDouble());
-  APFloat BPosSmallest =
-      APFloat::getSmallestNormalized(APFloat::BFloat(), false);
-  EXPECT_EQ(/*0x1.p-126*/ 1.1754943508222875e-38,
-            BPosSmallest.convertToDouble());
-  APFloat BNegSmallest =
-      APFloat::getSmallestNormalized(APFloat::BFloat(), true);
-  EXPECT_EQ(/*-0x1.p-126*/ -1.1754943508222875e-38,
-            BNegSmallest.convertToDouble());
-
-  APFloat BSmallestDenorm = APFloat::getSmallest(APFloat::BFloat(), false);
-  EXPECT_EQ(/*0x1.p-133*/ 9.183549615799121e-41,
-            BSmallestDenorm.convertToDouble());
-  APFloat BLargestDenorm(APFloat::BFloat(), "0x1.FCp-127");
-  EXPECT_EQ(/*0x1.FCp-127*/ 1.1663108012064884e-38,
-            BLargestDenorm.convertToDouble());
-
-  APFloat BPosInf = APFloat::getInf(APFloat::BFloat());
-  EXPECT_EQ(std::numeric_limits<double>::infinity(), BPosInf.convertToDouble());
-  APFloat BNegInf = APFloat::getInf(APFloat::BFloat(), true);
-  EXPECT_EQ(-std::numeric_limits<double>::infinity(),
-            BNegInf.convertToDouble());
-  APFloat BQNaN = APFloat::getQNaN(APFloat::BFloat());
-  EXPECT_TRUE(std::isnan(BQNaN.convertToDouble()));
-}
-
-TEST(APFloatTest, ToFloat) {
-  APFloat FPosZero(0.0F);
-  APFloat FPosZeroToFloat(FPosZero.convertToFloat());
-  EXPECT_TRUE(FPosZeroToFloat.isPosZero());
-  APFloat FNegZero(-0.0F);
-  APFloat FNegZeroToFloat(FNegZero.convertToFloat());
-  EXPECT_TRUE(FNegZeroToFloat.isNegZero());
-
-  APFloat FOne(1.0F);
-  EXPECT_EQ(1.0F, FOne.convertToFloat());
-  APFloat FPosLargest = APFloat::getLargest(APFloat::IEEEsingle(), false);
-  EXPECT_EQ(std::numeric_limits<float>::max(), FPosLargest.convertToFloat());
-  APFloat FNegLargest = APFloat::getLargest(APFloat::IEEEsingle(), true);
-  EXPECT_EQ(-std::numeric_limits<float>::max(), FNegLargest.convertToFloat());
-  APFloat FPosSmallest =
-      APFloat::getSmallestNormalized(APFloat::IEEEsingle(), false);
-  EXPECT_EQ(std::numeric_limits<float>::min(), FPosSmallest.convertToFloat());
-  APFloat FNegSmallest =
-      APFloat::getSmallestNormalized(APFloat::IEEEsingle(), true);
-  EXPECT_EQ(-std::numeric_limits<float>::min(), FNegSmallest.convertToFloat());
-
-  APFloat FSmallestDenorm = APFloat::getSmallest(APFloat::IEEEsingle(), false);
-  EXPECT_EQ(std::numeric_limits<float>::denorm_min(),
-            FSmallestDenorm.convertToFloat());
-  APFloat FLargestDenorm(APFloat::IEEEsingle(), "0x1.FFFFFEp-126");
-  EXPECT_EQ(/*0x1.FFFFFEp-126*/ 2.3509885615147286e-38F,
-            FLargestDenorm.convertToFloat());
-
-  APFloat FPosInf = APFloat::getInf(APFloat::IEEEsingle());
-  EXPECT_EQ(std::numeric_limits<float>::infinity(), FPosInf.convertToFloat());
-  APFloat FNegInf = APFloat::getInf(APFloat::IEEEsingle(), true);
-  EXPECT_EQ(-std::numeric_limits<float>::infinity(), FNegInf.convertToFloat());
-  APFloat FQNaN = APFloat::getQNaN(APFloat::IEEEsingle());
-  EXPECT_TRUE(std::isnan(FQNaN.convertToFloat()));
-
-  APFloat HPosZero = APFloat::getZero(APFloat::IEEEhalf());
-  APFloat HPosZeroToFloat(HPosZero.convertToFloat());
-  EXPECT_TRUE(HPosZeroToFloat.isPosZero());
-  APFloat HNegZero = APFloat::getZero(APFloat::IEEEhalf(), true);
-  APFloat HNegZeroToFloat(HNegZero.convertToFloat());
-  EXPECT_TRUE(HNegZeroToFloat.isNegZero());
-
-  APFloat HOne(APFloat::IEEEhalf(), "1.0");
-  EXPECT_EQ(1.0F, HOne.convertToFloat());
-  APFloat HPosLargest = APFloat::getLargest(APFloat::IEEEhalf(), false);
-  EXPECT_EQ(/*0x1.FFCp15*/ 65504.0F, HPosLargest.convertToFloat());
-  APFloat HNegLargest = APFloat::getLargest(APFloat::IEEEhalf(), true);
-  EXPECT_EQ(/*-0x1.FFCp15*/ -65504.0F, HNegLargest.convertToFloat());
-  APFloat HPosSmallest =
-      APFloat::getSmallestNormalized(APFloat::IEEEhalf(), false);
-  EXPECT_EQ(/*0x1.p-14*/ 6.103515625e-05F, HPosSmallest.convertToFloat());
-  APFloat HNegSmallest =
-      APFloat::getSmallestNormalized(APFloat::IEEEhalf(), true);
-  EXPECT_EQ(/*-0x1.p-14*/ -6.103515625e-05F, HNegSmallest.convertToFloat());
-
-  APFloat HSmallestDenorm = APFloat::getSmallest(APFloat::IEEEhalf(), false);
-  EXPECT_EQ(/*0x1.p-24*/ 5.960464477539063e-08F,
-            HSmallestDenorm.convertToFloat());
-  APFloat HLargestDenorm(APFloat::IEEEhalf(), "0x1.FFCp-14");
-  EXPECT_EQ(/*0x1.FFCp-14*/ 0.00012201070785522461F,
-            HLargestDenorm.convertToFloat());
-
-  APFloat HPosInf = APFloat::getInf(APFloat::IEEEhalf());
-  EXPECT_EQ(std::numeric_limits<float>::infinity(), HPosInf.convertToFloat());
-  APFloat HNegInf = APFloat::getInf(APFloat::IEEEhalf(), true);
-  EXPECT_EQ(-std::numeric_limits<float>::infinity(), HNegInf.convertToFloat());
-  APFloat HQNaN = APFloat::getQNaN(APFloat::IEEEhalf());
-  EXPECT_TRUE(std::isnan(HQNaN.convertToFloat()));
-
-  APFloat BPosZero = APFloat::getZero(APFloat::BFloat());
-  APFloat BPosZeroToDouble(BPosZero.convertToFloat());
-  EXPECT_TRUE(BPosZeroToDouble.isPosZero());
-  APFloat BNegZero = APFloat::getZero(APFloat::BFloat(), true);
-  APFloat BNegZeroToDouble(BNegZero.convertToFloat());
-  EXPECT_TRUE(BNegZeroToDouble.isNegZero());
-
-  APFloat BOne(APFloat::BFloat(), "1.0");
-  EXPECT_EQ(1.0F, BOne.convertToFloat());
-  APFloat BPosLargest = APFloat::getLargest(APFloat::BFloat(), false);
-  EXPECT_EQ(/*0x1.FEp127*/ 3.3895313892515355e+38F,
-            BPosLargest.convertToFloat());
-  APFloat BNegLargest = APFloat::getLargest(APFloat::BFloat(), true);
-  EXPECT_EQ(/*-0x1.FEp127*/ -3.3895313892515355e+38F,
-            BNegLargest.convertToFloat());
-  APFloat BPosSmallest =
-      APFloat::getSmallestNormalized(APFloat::BFloat(), false);
-  EXPECT_EQ(/*0x1.p-126*/ 1.1754943508222875e-38F,
-            BPosSmallest.convertToFloat());
-  APFloat BNegSmallest =
-      APFloat::getSmallestNormalized(APFloat::BFloat(), true);
-  EXPECT_EQ(/*-0x1.p-126*/ -1.1754943508222875e-38F,
-            BNegSmallest.convertToFloat());
-
-  APFloat BSmallestDenorm = APFloat::getSmallest(APFloat::BFloat(), false);
-  EXPECT_EQ(/*0x1.p-133*/ 9.183549615799121e-41F,
-            BSmallestDenorm.convertToFloat());
-  APFloat BLargestDenorm(APFloat::BFloat(), "0x1.FCp-127");
-  EXPECT_EQ(/*0x1.FCp-127*/ 1.1663108012064884e-38F,
-            BLargestDenorm.convertToFloat());
-
-  APFloat BPosInf = APFloat::getInf(APFloat::BFloat());
-  EXPECT_EQ(std::numeric_limits<float>::infinity(), BPosInf.convertToFloat());
-  APFloat BNegInf = APFloat::getInf(APFloat::BFloat(), true);
-  EXPECT_EQ(-std::numeric_limits<float>::infinity(), BNegInf.convertToFloat());
-  APFloat BQNaN = APFloat::getQNaN(APFloat::BFloat());
-  EXPECT_TRUE(std::isnan(BQNaN.convertToFloat()));
-}
-}
diff --git a/gnu/llvm/llvm/unittests/ADT/APIntTest.cpp b/gnu/llvm/llvm/unittests/ADT/APIntTest.cpp
deleted file mode 100644
index 947d9598bac..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/APIntTest.cpp
+++ /dev/null
@@ -1,2931 +0,0 @@
-//===- llvm/unittest/ADT/APInt.cpp - APInt unit tests ---------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/APInt.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/SmallString.h"
-#include "llvm/ADT/Twine.h"
-#include "gtest/gtest.h"
-#include <array>
-
-using namespace llvm;
-
-namespace {
-
-TEST(APIntTest, ValueInit) {
-  APInt Zero = APInt();
-  EXPECT_TRUE(!Zero);
-  EXPECT_TRUE(!Zero.zext(64));
-  EXPECT_TRUE(!Zero.sext(64));
-}
-
-// Test that APInt shift left works when bitwidth > 64 and shiftamt == 0
-TEST(APIntTest, ShiftLeftByZero) {
-  APInt One = APInt::getNullValue(65) + 1;
-  APInt Shl = One.shl(0);
-  EXPECT_TRUE(Shl[0]);
-  EXPECT_FALSE(Shl[1]);
-}
-
-TEST(APIntTest, i64_ArithmeticRightShiftNegative) {
-  const APInt neg_one(64, static_cast<uint64_t>(-1), true);
-  EXPECT_EQ(neg_one, neg_one.ashr(7));
-}
-
-TEST(APIntTest, i128_NegativeCount) {
-  APInt Minus3(128, static_cast<uint64_t>(-3), true);
-  EXPECT_EQ(126u, Minus3.countLeadingOnes());
-  EXPECT_EQ(-3, Minus3.getSExtValue());
-
-  APInt Minus1(128, static_cast<uint64_t>(-1), true);
-  EXPECT_EQ(0u, Minus1.countLeadingZeros());
-  EXPECT_EQ(128u, Minus1.countLeadingOnes());
-  EXPECT_EQ(128u, Minus1.getActiveBits());
-  EXPECT_EQ(0u, Minus1.countTrailingZeros());
-  EXPECT_EQ(128u, Minus1.countTrailingOnes());
-  EXPECT_EQ(128u, Minus1.countPopulation());
-  EXPECT_EQ(-1, Minus1.getSExtValue());
-}
-
-TEST(APIntTest, i33_Count) {
-  APInt i33minus2(33, static_cast<uint64_t>(-2), true);
-  EXPECT_EQ(0u, i33minus2.countLeadingZeros());
-  EXPECT_EQ(32u, i33minus2.countLeadingOnes());
-  EXPECT_EQ(33u, i33minus2.getActiveBits());
-  EXPECT_EQ(1u, i33minus2.countTrailingZeros());
-  EXPECT_EQ(32u, i33minus2.countPopulation());
-  EXPECT_EQ(-2, i33minus2.getSExtValue());
-  EXPECT_EQ(((uint64_t)-2)&((1ull<<33) -1), i33minus2.getZExtValue());
-}
-
-TEST(APIntTest, i61_Count) {
-  APInt i61(61, 1 << 15);
-  EXPECT_EQ(45u, i61.countLeadingZeros());
-  EXPECT_EQ(0u, i61.countLeadingOnes());
-  EXPECT_EQ(16u, i61.getActiveBits());
-  EXPECT_EQ(15u, i61.countTrailingZeros());
-  EXPECT_EQ(1u, i61.countPopulation());
-  EXPECT_EQ(static_cast<int64_t>(1 << 15), i61.getSExtValue());
-  EXPECT_EQ(static_cast<uint64_t>(1 << 15), i61.getZExtValue());
-
-  i61.setBits(8, 19);
-  EXPECT_EQ(42u, i61.countLeadingZeros());
-  EXPECT_EQ(0u, i61.countLeadingOnes());
-  EXPECT_EQ(19u, i61.getActiveBits());
-  EXPECT_EQ(8u, i61.countTrailingZeros());
-  EXPECT_EQ(11u, i61.countPopulation());
-  EXPECT_EQ(static_cast<int64_t>((1 << 19) - (1 << 8)), i61.getSExtValue());
-  EXPECT_EQ(static_cast<uint64_t>((1 << 19) - (1 << 8)), i61.getZExtValue());
-}
-
-TEST(APIntTest, i65_Count) {
-  APInt i65(65, 0, true);
-  EXPECT_EQ(65u, i65.countLeadingZeros());
-  EXPECT_EQ(0u, i65.countLeadingOnes());
-  EXPECT_EQ(0u, i65.getActiveBits());
-  EXPECT_EQ(1u, i65.getActiveWords());
-  EXPECT_EQ(65u, i65.countTrailingZeros());
-  EXPECT_EQ(0u, i65.countPopulation());
-
-  APInt i65minus(65, 0, true);
-  i65minus.setBit(64);
-  EXPECT_EQ(0u, i65minus.countLeadingZeros());
-  EXPECT_EQ(1u, i65minus.countLeadingOnes());
-  EXPECT_EQ(65u, i65minus.getActiveBits());
-  EXPECT_EQ(64u, i65minus.countTrailingZeros());
-  EXPECT_EQ(1u, i65minus.countPopulation());
-}
-
-TEST(APIntTest, i128_PositiveCount) {
-  APInt u128max = APInt::getAllOnesValue(128);
-  EXPECT_EQ(128u, u128max.countLeadingOnes());
-  EXPECT_EQ(0u, u128max.countLeadingZeros());
-  EXPECT_EQ(128u, u128max.getActiveBits());
-  EXPECT_EQ(0u, u128max.countTrailingZeros());
-  EXPECT_EQ(128u, u128max.countTrailingOnes());
-  EXPECT_EQ(128u, u128max.countPopulation());
-
-  APInt u64max(128, static_cast<uint64_t>(-1), false);
-  EXPECT_EQ(64u, u64max.countLeadingZeros());
-  EXPECT_EQ(0u, u64max.countLeadingOnes());
-  EXPECT_EQ(64u, u64max.getActiveBits());
-  EXPECT_EQ(0u, u64max.countTrailingZeros());
-  EXPECT_EQ(64u, u64max.countTrailingOnes());
-  EXPECT_EQ(64u, u64max.countPopulation());
-  EXPECT_EQ((uint64_t)~0ull, u64max.getZExtValue());
-
-  APInt zero(128, 0, true);
-  EXPECT_EQ(128u, zero.countLeadingZeros());
-  EXPECT_EQ(0u, zero.countLeadingOnes());
-  EXPECT_EQ(0u, zero.getActiveBits());
-  EXPECT_EQ(128u, zero.countTrailingZeros());
-  EXPECT_EQ(0u, zero.countTrailingOnes());
-  EXPECT_EQ(0u, zero.countPopulation());
-  EXPECT_EQ(0u, zero.getSExtValue());
-  EXPECT_EQ(0u, zero.getZExtValue());
-
-  APInt one(128, 1, true);
-  EXPECT_EQ(127u, one.countLeadingZeros());
-  EXPECT_EQ(0u, one.countLeadingOnes());
-  EXPECT_EQ(1u, one.getActiveBits());
-  EXPECT_EQ(0u, one.countTrailingZeros());
-  EXPECT_EQ(1u, one.countTrailingOnes());
-  EXPECT_EQ(1u, one.countPopulation());
-  EXPECT_EQ(1, one.getSExtValue());
-  EXPECT_EQ(1u, one.getZExtValue());
-
-  APInt s128(128, 2, true);
-  EXPECT_EQ(126u, s128.countLeadingZeros());
-  EXPECT_EQ(0u, s128.countLeadingOnes());
-  EXPECT_EQ(2u, s128.getActiveBits());
-  EXPECT_EQ(1u, s128.countTrailingZeros());
-  EXPECT_EQ(0u, s128.countTrailingOnes());
-  EXPECT_EQ(1u, s128.countPopulation());
-  EXPECT_EQ(2, s128.getSExtValue());
-  EXPECT_EQ(2u, s128.getZExtValue());
-
-  // NOP Test
-  s128.setBits(42, 42);
-  EXPECT_EQ(126u, s128.countLeadingZeros());
-  EXPECT_EQ(0u, s128.countLeadingOnes());
-  EXPECT_EQ(2u, s128.getActiveBits());
-  EXPECT_EQ(1u, s128.countTrailingZeros());
-  EXPECT_EQ(0u, s128.countTrailingOnes());
-  EXPECT_EQ(1u, s128.countPopulation());
-  EXPECT_EQ(2, s128.getSExtValue());
-  EXPECT_EQ(2u, s128.getZExtValue());
-
-  s128.setBits(3, 32);
-  EXPECT_EQ(96u, s128.countLeadingZeros());
-  EXPECT_EQ(0u, s128.countLeadingOnes());
-  EXPECT_EQ(32u, s128.getActiveBits());
-  EXPECT_EQ(33u, s128.getMinSignedBits());
-  EXPECT_EQ(1u, s128.countTrailingZeros());
-  EXPECT_EQ(0u, s128.countTrailingOnes());
-  EXPECT_EQ(30u, s128.countPopulation());
-  EXPECT_EQ(static_cast<uint32_t>((~0u << 3) | 2), s128.getZExtValue());
-
-  s128.setBits(62, 128);
-  EXPECT_EQ(0u, s128.countLeadingZeros());
-  EXPECT_EQ(66u, s128.countLeadingOnes());
-  EXPECT_EQ(128u, s128.getActiveBits());
-  EXPECT_EQ(63u, s128.getMinSignedBits());
-  EXPECT_EQ(1u, s128.countTrailingZeros());
-  EXPECT_EQ(0u, s128.countTrailingOnes());
-  EXPECT_EQ(96u, s128.countPopulation());
-  EXPECT_EQ(static_cast<int64_t>((3ull << 62) |
-                                 static_cast<uint32_t>((~0u << 3) | 2)),
-            s128.getSExtValue());
-}
-
-TEST(APIntTest, i256) {
-  APInt s256(256, 15, true);
-  EXPECT_EQ(252u, s256.countLeadingZeros());
-  EXPECT_EQ(0u, s256.countLeadingOnes());
-  EXPECT_EQ(4u, s256.getActiveBits());
-  EXPECT_EQ(0u, s256.countTrailingZeros());
-  EXPECT_EQ(4u, s256.countTrailingOnes());
-  EXPECT_EQ(4u, s256.countPopulation());
-  EXPECT_EQ(15, s256.getSExtValue());
-  EXPECT_EQ(15u, s256.getZExtValue());
-
-  s256.setBits(62, 66);
-  EXPECT_EQ(190u, s256.countLeadingZeros());
-  EXPECT_EQ(0u, s256.countLeadingOnes());
-  EXPECT_EQ(66u, s256.getActiveBits());
-  EXPECT_EQ(67u, s256.getMinSignedBits());
-  EXPECT_EQ(0u, s256.countTrailingZeros());
-  EXPECT_EQ(4u, s256.countTrailingOnes());
-  EXPECT_EQ(8u, s256.countPopulation());
-
-  s256.setBits(60, 256);
-  EXPECT_EQ(0u, s256.countLeadingZeros());
-  EXPECT_EQ(196u, s256.countLeadingOnes());
-  EXPECT_EQ(256u, s256.getActiveBits());
-  EXPECT_EQ(61u, s256.getMinSignedBits());
-  EXPECT_EQ(0u, s256.countTrailingZeros());
-  EXPECT_EQ(4u, s256.countTrailingOnes());
-  EXPECT_EQ(200u, s256.countPopulation());
-  EXPECT_EQ(static_cast<int64_t>((~0ull << 60) | 15), s256.getSExtValue());
-}
-
-TEST(APIntTest, i1) {
-  const APInt neg_two(1, static_cast<uint64_t>(-2), true);
-  const APInt neg_one(1, static_cast<uint64_t>(-1), true);
-  const APInt zero(1, 0);
-  const APInt one(1, 1);
-  const APInt two(1, 2);
-
-  EXPECT_EQ(0, neg_two.getSExtValue());
-  EXPECT_EQ(-1, neg_one.getSExtValue());
-  EXPECT_EQ(1u, neg_one.getZExtValue());
-  EXPECT_EQ(0u, zero.getZExtValue());
-  EXPECT_EQ(-1, one.getSExtValue());
-  EXPECT_EQ(1u, one.getZExtValue());
-  EXPECT_EQ(0u, two.getZExtValue());
-  EXPECT_EQ(0, two.getSExtValue());
-
-  // Basic equalities for 1-bit values.
-  EXPECT_EQ(zero, two);
-  EXPECT_EQ(zero, neg_two);
-  EXPECT_EQ(one, neg_one);
-  EXPECT_EQ(two, neg_two);
-
-  // Min/max signed values.
-  EXPECT_TRUE(zero.isMaxSignedValue());
-  EXPECT_FALSE(one.isMaxSignedValue());
-  EXPECT_FALSE(zero.isMinSignedValue());
-  EXPECT_TRUE(one.isMinSignedValue());
-
-  // Additions.
-  EXPECT_EQ(two, one + one);
-  EXPECT_EQ(zero, neg_one + one);
-  EXPECT_EQ(neg_two, neg_one + neg_one);
-
-  // Subtractions.
-  EXPECT_EQ(neg_two, neg_one - one);
-  EXPECT_EQ(two, one - neg_one);
-  EXPECT_EQ(zero, one - one);
-
-  // And
-  EXPECT_EQ(zero, zero & zero);
-  EXPECT_EQ(zero, one & zero);
-  EXPECT_EQ(zero, zero & one);
-  EXPECT_EQ(one, one & one);
-  EXPECT_EQ(zero, zero & zero);
-  EXPECT_EQ(zero, neg_one & zero);
-  EXPECT_EQ(zero, zero & neg_one);
-  EXPECT_EQ(neg_one, neg_one & neg_one);
-
-  // Or
-  EXPECT_EQ(zero, zero | zero);
-  EXPECT_EQ(one, one | zero);
-  EXPECT_EQ(one, zero | one);
-  EXPECT_EQ(one, one | one);
-  EXPECT_EQ(zero, zero | zero);
-  EXPECT_EQ(neg_one, neg_one | zero);
-  EXPECT_EQ(neg_one, zero | neg_one);
-  EXPECT_EQ(neg_one, neg_one | neg_one);
-
-  // Xor
-  EXPECT_EQ(zero, zero ^ zero);
-  EXPECT_EQ(one, one ^ zero);
-  EXPECT_EQ(one, zero ^ one);
-  EXPECT_EQ(zero, one ^ one);
-  EXPECT_EQ(zero, zero ^ zero);
-  EXPECT_EQ(neg_one, neg_one ^ zero);
-  EXPECT_EQ(neg_one, zero ^ neg_one);
-  EXPECT_EQ(zero, neg_one ^ neg_one);
-
-  // Shifts.
-  EXPECT_EQ(zero, one << one);
-  EXPECT_EQ(one, one << zero);
-  EXPECT_EQ(zero, one.shl(1));
-  EXPECT_EQ(one, one.shl(0));
-  EXPECT_EQ(zero, one.lshr(1));
-  EXPECT_EQ(one, one.ashr(1));
-
-  // Rotates.
-  EXPECT_EQ(one, one.rotl(0));
-  EXPECT_EQ(one, one.rotl(1));
-  EXPECT_EQ(one, one.rotr(0));
-  EXPECT_EQ(one, one.rotr(1));
-
-  // Multiplies.
-  EXPECT_EQ(neg_one, neg_one * one);
-  EXPECT_EQ(neg_one, one * neg_one);
-  EXPECT_EQ(one, neg_one * neg_one);
-  EXPECT_EQ(one, one * one);
-
-  // Divides.
-  EXPECT_EQ(neg_one, one.sdiv(neg_one));
-  EXPECT_EQ(neg_one, neg_one.sdiv(one));
-  EXPECT_EQ(one, neg_one.sdiv(neg_one));
-  EXPECT_EQ(one, one.sdiv(one));
-
-  EXPECT_EQ(neg_one, one.udiv(neg_one));
-  EXPECT_EQ(neg_one, neg_one.udiv(one));
-  EXPECT_EQ(one, neg_one.udiv(neg_one));
-  EXPECT_EQ(one, one.udiv(one));
-
-  // Remainders.
-  EXPECT_EQ(zero, neg_one.srem(one));
-  EXPECT_EQ(zero, neg_one.urem(one));
-  EXPECT_EQ(zero, one.srem(neg_one));
-
-  // sdivrem
-  {
-  APInt q(8, 0);
-  APInt r(8, 0);
-  APInt one(8, 1);
-  APInt two(8, 2);
-  APInt nine(8, 9);
-  APInt four(8, 4);
-
-  EXPECT_EQ(nine.srem(two), one);
-  EXPECT_EQ(nine.srem(-two), one);
-  EXPECT_EQ((-nine).srem(two), -one);
-  EXPECT_EQ((-nine).srem(-two), -one);
-
-  APInt::sdivrem(nine, two, q, r);
-  EXPECT_EQ(four, q);
-  EXPECT_EQ(one, r);
-  APInt::sdivrem(-nine, two, q, r);
-  EXPECT_EQ(-four, q);
-  EXPECT_EQ(-one, r);
-  APInt::sdivrem(nine, -two, q, r);
-  EXPECT_EQ(-four, q);
-  EXPECT_EQ(one, r);
-  APInt::sdivrem(-nine, -two, q, r);
-  EXPECT_EQ(four, q);
-  EXPECT_EQ(-one, r);
-  }
-}
-
-TEST(APIntTest, compare) {
-  std::array<APInt, 5> testVals{{
-    APInt{16, 2},
-    APInt{16, 1},
-    APInt{16, 0},
-    APInt{16, (uint64_t)-1, true},
-    APInt{16, (uint64_t)-2, true},
-  }};
-
-  for (auto &arg1 : testVals)
-    for (auto &arg2 : testVals) {
-      auto uv1 = arg1.getZExtValue();
-      auto uv2 = arg2.getZExtValue();
-      auto sv1 = arg1.getSExtValue();
-      auto sv2 = arg2.getSExtValue();
-
-      EXPECT_EQ(uv1 <  uv2, arg1.ult(arg2));
-      EXPECT_EQ(uv1 <= uv2, arg1.ule(arg2));
-      EXPECT_EQ(uv1 >  uv2, arg1.ugt(arg2));
-      EXPECT_EQ(uv1 >= uv2, arg1.uge(arg2));
-
-      EXPECT_EQ(sv1 <  sv2, arg1.slt(arg2));
-      EXPECT_EQ(sv1 <= sv2, arg1.sle(arg2));
-      EXPECT_EQ(sv1 >  sv2, arg1.sgt(arg2));
-      EXPECT_EQ(sv1 >= sv2, arg1.sge(arg2));
-
-      EXPECT_EQ(uv1 <  uv2, arg1.ult(uv2));
-      EXPECT_EQ(uv1 <= uv2, arg1.ule(uv2));
-      EXPECT_EQ(uv1 >  uv2, arg1.ugt(uv2));
-      EXPECT_EQ(uv1 >= uv2, arg1.uge(uv2));
-
-      EXPECT_EQ(sv1 <  sv2, arg1.slt(sv2));
-      EXPECT_EQ(sv1 <= sv2, arg1.sle(sv2));
-      EXPECT_EQ(sv1 >  sv2, arg1.sgt(sv2));
-      EXPECT_EQ(sv1 >= sv2, arg1.sge(sv2));
-    }
-}
-
-TEST(APIntTest, compareWithRawIntegers) {
-  EXPECT_TRUE(!APInt(8, 1).uge(256));
-  EXPECT_TRUE(!APInt(8, 1).ugt(256));
-  EXPECT_TRUE( APInt(8, 1).ule(256));
-  EXPECT_TRUE( APInt(8, 1).ult(256));
-  EXPECT_TRUE(!APInt(8, 1).sge(256));
-  EXPECT_TRUE(!APInt(8, 1).sgt(256));
-  EXPECT_TRUE( APInt(8, 1).sle(256));
-  EXPECT_TRUE( APInt(8, 1).slt(256));
-  EXPECT_TRUE(!(APInt(8, 0) == 256));
-  EXPECT_TRUE(  APInt(8, 0) != 256);
-  EXPECT_TRUE(!(APInt(8, 1) == 256));
-  EXPECT_TRUE(  APInt(8, 1) != 256);
-
-  auto uint64max = UINT64_MAX;
-  auto int64max  = INT64_MAX;
-  auto int64min  = INT64_MIN;
-
-  auto u64 = APInt{128, uint64max};
-  auto s64 = APInt{128, static_cast<uint64_t>(int64max), true};
-  auto big = u64 + 1;
-
-  EXPECT_TRUE( u64.uge(uint64max));
-  EXPECT_TRUE(!u64.ugt(uint64max));
-  EXPECT_TRUE( u64.ule(uint64max));
-  EXPECT_TRUE(!u64.ult(uint64max));
-  EXPECT_TRUE( u64.sge(int64max));
-  EXPECT_TRUE( u64.sgt(int64max));
-  EXPECT_TRUE(!u64.sle(int64max));
-  EXPECT_TRUE(!u64.slt(int64max));
-  EXPECT_TRUE( u64.sge(int64min));
-  EXPECT_TRUE( u64.sgt(int64min));
-  EXPECT_TRUE(!u64.sle(int64min));
-  EXPECT_TRUE(!u64.slt(int64min));
-
-  EXPECT_TRUE(u64 == uint64max);
-  EXPECT_TRUE(u64 != int64max);
-  EXPECT_TRUE(u64 != int64min);
-
-  EXPECT_TRUE(!s64.uge(uint64max));
-  EXPECT_TRUE(!s64.ugt(uint64max));
-  EXPECT_TRUE( s64.ule(uint64max));
-  EXPECT_TRUE( s64.ult(uint64max));
-  EXPECT_TRUE( s64.sge(int64max));
-  EXPECT_TRUE(!s64.sgt(int64max));
-  EXPECT_TRUE( s64.sle(int64max));
-  EXPECT_TRUE(!s64.slt(int64max));
-  EXPECT_TRUE( s64.sge(int64min));
-  EXPECT_TRUE( s64.sgt(int64min));
-  EXPECT_TRUE(!s64.sle(int64min));
-  EXPECT_TRUE(!s64.slt(int64min));
-
-  EXPECT_TRUE(s64 != uint64max);
-  EXPECT_TRUE(s64 == int64max);
-  EXPECT_TRUE(s64 != int64min);
-
-  EXPECT_TRUE( big.uge(uint64max));
-  EXPECT_TRUE( big.ugt(uint64max));
-  EXPECT_TRUE(!big.ule(uint64max));
-  EXPECT_TRUE(!big.ult(uint64max));
-  EXPECT_TRUE( big.sge(int64max));
-  EXPECT_TRUE( big.sgt(int64max));
-  EXPECT_TRUE(!big.sle(int64max));
-  EXPECT_TRUE(!big.slt(int64max));
-  EXPECT_TRUE( big.sge(int64min));
-  EXPECT_TRUE( big.sgt(int64min));
-  EXPECT_TRUE(!big.sle(int64min));
-  EXPECT_TRUE(!big.slt(int64min));
-
-  EXPECT_TRUE(big != uint64max);
-  EXPECT_TRUE(big != int64max);
-  EXPECT_TRUE(big != int64min);
-}
-
-TEST(APIntTest, compareWithInt64Min) {
-  int64_t edge = INT64_MIN;
-  int64_t edgeP1 = edge + 1;
-  int64_t edgeM1 = INT64_MAX;
-  auto a = APInt{64, static_cast<uint64_t>(edge), true};
-
-  EXPECT_TRUE(!a.slt(edge));
-  EXPECT_TRUE( a.sle(edge));
-  EXPECT_TRUE(!a.sgt(edge));
-  EXPECT_TRUE( a.sge(edge));
-  EXPECT_TRUE( a.slt(edgeP1));
-  EXPECT_TRUE( a.sle(edgeP1));
-  EXPECT_TRUE(!a.sgt(edgeP1));
-  EXPECT_TRUE(!a.sge(edgeP1));
-  EXPECT_TRUE( a.slt(edgeM1));
-  EXPECT_TRUE( a.sle(edgeM1));
-  EXPECT_TRUE(!a.sgt(edgeM1));
-  EXPECT_TRUE(!a.sge(edgeM1));
-}
-
-TEST(APIntTest, compareWithHalfInt64Max) {
-  uint64_t edge = 0x4000000000000000;
-  uint64_t edgeP1 = edge + 1;
-  uint64_t edgeM1 = edge - 1;
-  auto a = APInt{64, edge};
-
-  EXPECT_TRUE(!a.ult(edge));
-  EXPECT_TRUE( a.ule(edge));
-  EXPECT_TRUE(!a.ugt(edge));
-  EXPECT_TRUE( a.uge(edge));
-  EXPECT_TRUE( a.ult(edgeP1));
-  EXPECT_TRUE( a.ule(edgeP1));
-  EXPECT_TRUE(!a.ugt(edgeP1));
-  EXPECT_TRUE(!a.uge(edgeP1));
-  EXPECT_TRUE(!a.ult(edgeM1));
-  EXPECT_TRUE(!a.ule(edgeM1));
-  EXPECT_TRUE( a.ugt(edgeM1));
-  EXPECT_TRUE( a.uge(edgeM1));
-
-  EXPECT_TRUE(!a.slt(edge));
-  EXPECT_TRUE( a.sle(edge));
-  EXPECT_TRUE(!a.sgt(edge));
-  EXPECT_TRUE( a.sge(edge));
-  EXPECT_TRUE( a.slt(edgeP1));
-  EXPECT_TRUE( a.sle(edgeP1));
-  EXPECT_TRUE(!a.sgt(edgeP1));
-  EXPECT_TRUE(!a.sge(edgeP1));
-  EXPECT_TRUE(!a.slt(edgeM1));
-  EXPECT_TRUE(!a.sle(edgeM1));
-  EXPECT_TRUE( a.sgt(edgeM1));
-  EXPECT_TRUE( a.sge(edgeM1));
-}
-
-TEST(APIntTest, compareLargeIntegers) {
-  // Make sure all the combinations of signed comparisons work with big ints.
-  auto One = APInt{128, static_cast<uint64_t>(1), true};
-  auto Two = APInt{128, static_cast<uint64_t>(2), true};
-  auto MinusOne = APInt{128, static_cast<uint64_t>(-1), true};
-  auto MinusTwo = APInt{128, static_cast<uint64_t>(-2), true};
-
-  EXPECT_TRUE(!One.slt(One));
-  EXPECT_TRUE(!Two.slt(One));
-  EXPECT_TRUE(MinusOne.slt(One));
-  EXPECT_TRUE(MinusTwo.slt(One));
-
-  EXPECT_TRUE(One.slt(Two));
-  EXPECT_TRUE(!Two.slt(Two));
-  EXPECT_TRUE(MinusOne.slt(Two));
-  EXPECT_TRUE(MinusTwo.slt(Two));
-
-  EXPECT_TRUE(!One.slt(MinusOne));
-  EXPECT_TRUE(!Two.slt(MinusOne));
-  EXPECT_TRUE(!MinusOne.slt(MinusOne));
-  EXPECT_TRUE(MinusTwo.slt(MinusOne));
-
-  EXPECT_TRUE(!One.slt(MinusTwo));
-  EXPECT_TRUE(!Two.slt(MinusTwo));
-  EXPECT_TRUE(!MinusOne.slt(MinusTwo));
-  EXPECT_TRUE(!MinusTwo.slt(MinusTwo));
-}
-
-TEST(APIntTest, binaryOpsWithRawIntegers) {
-  // Single word check.
-  uint64_t E1 = 0x2CA7F46BF6569915ULL;
-  APInt A1(64, E1);
-
-  EXPECT_EQ(A1 & E1, E1);
-  EXPECT_EQ(A1 & 0, 0);
-  EXPECT_EQ(A1 & 1, 1);
-  EXPECT_EQ(A1 & 5, 5);
-  EXPECT_EQ(A1 & UINT64_MAX, E1);
-
-  EXPECT_EQ(A1 | E1, E1);
-  EXPECT_EQ(A1 | 0, E1);
-  EXPECT_EQ(A1 | 1, E1);
-  EXPECT_EQ(A1 | 2, E1 | 2);
-  EXPECT_EQ(A1 | UINT64_MAX, UINT64_MAX);
-
-  EXPECT_EQ(A1 ^ E1, 0);
-  EXPECT_EQ(A1 ^ 0, E1);
-  EXPECT_EQ(A1 ^ 1, E1 ^ 1);
-  EXPECT_EQ(A1 ^ 7, E1 ^ 7);
-  EXPECT_EQ(A1 ^ UINT64_MAX, ~E1);
-
-  // Multiword check.
-  uint64_t N = 0xEB6EB136591CBA21ULL;
-  APInt::WordType E2[4] = {
-    N,
-    0x7B9358BD6A33F10AULL,
-    0x7E7FFA5EADD8846ULL,
-    0x305F341CA00B613DULL
-  };
-  APInt A2(APInt::APINT_BITS_PER_WORD*4, E2);
-
-  EXPECT_EQ(A2 & N, N);
-  EXPECT_EQ(A2 & 0, 0);
-  EXPECT_EQ(A2 & 1, 1);
-  EXPECT_EQ(A2 & 5, 1);
-  EXPECT_EQ(A2 & UINT64_MAX, N);
-
-  EXPECT_EQ(A2 | N, A2);
-  EXPECT_EQ(A2 | 0, A2);
-  EXPECT_EQ(A2 | 1, A2);
-  EXPECT_EQ(A2 | 2, A2 + 2);
-  EXPECT_EQ(A2 | UINT64_MAX, A2 - N + UINT64_MAX);
-
-  EXPECT_EQ(A2 ^ N, A2 - N);
-  EXPECT_EQ(A2 ^ 0, A2);
-  EXPECT_EQ(A2 ^ 1, A2 - 1);
-  EXPECT_EQ(A2 ^ 7, A2 + 5);
-  EXPECT_EQ(A2 ^ UINT64_MAX, A2 - N + ~N);
-}
-
-TEST(APIntTest, rvalue_arithmetic) {
-  // Test all combinations of lvalue/rvalue lhs/rhs of add/sub
-
-  // Lamdba to return an APInt by value, but also provide the raw value of the
-  // allocated data.
-  auto getRValue = [](const char *HexString, uint64_t const *&RawData) {
-    APInt V(129, HexString, 16);
-    RawData = V.getRawData();
-    return V;
-  };
-
-  APInt One(129, "1", 16);
-  APInt Two(129, "2", 16);
-  APInt Three(129, "3", 16);
-  APInt MinusOne = -One;
-
-  const uint64_t *RawDataL = nullptr;
-  const uint64_t *RawDataR = nullptr;
-
-  {
-    // 1 + 1 = 2
-    APInt AddLL = One + One;
-    EXPECT_EQ(AddLL, Two);
-
-    APInt AddLR = One + getRValue("1", RawDataR);
-    EXPECT_EQ(AddLR, Two);
-    EXPECT_EQ(AddLR.getRawData(), RawDataR);
-
-    APInt AddRL = getRValue("1", RawDataL) + One;
-    EXPECT_EQ(AddRL, Two);
-    EXPECT_EQ(AddRL.getRawData(), RawDataL);
-
-    APInt AddRR = getRValue("1", RawDataL) + getRValue("1", RawDataR);
-    EXPECT_EQ(AddRR, Two);
-    EXPECT_EQ(AddRR.getRawData(), RawDataR);
-
-    // LValue's and constants
-    APInt AddLK = One + 1;
-    EXPECT_EQ(AddLK, Two);
-
-    APInt AddKL = 1 + One;
-    EXPECT_EQ(AddKL, Two);
-
-    // RValue's and constants
-    APInt AddRK = getRValue("1", RawDataL) + 1;
-    EXPECT_EQ(AddRK, Two);
-    EXPECT_EQ(AddRK.getRawData(), RawDataL);
-
-    APInt AddKR = 1 + getRValue("1", RawDataR);
-    EXPECT_EQ(AddKR, Two);
-    EXPECT_EQ(AddKR.getRawData(), RawDataR);
-  }
-
-  {
-    // 0x0,FFFF...FFFF + 0x2 = 0x100...0001
-    APInt AllOnes(129, "0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF", 16);
-    APInt HighOneLowOne(129, "100000000000000000000000000000001", 16);
-
-    APInt AddLL = AllOnes + Two;
-    EXPECT_EQ(AddLL, HighOneLowOne);
-
-    APInt AddLR = AllOnes + getRValue("2", RawDataR);
-    EXPECT_EQ(AddLR, HighOneLowOne);
-    EXPECT_EQ(AddLR.getRawData(), RawDataR);
-
-    APInt AddRL = getRValue("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF", RawDataL) + Two;
-    EXPECT_EQ(AddRL, HighOneLowOne);
-    EXPECT_EQ(AddRL.getRawData(), RawDataL);
-
-    APInt AddRR = getRValue("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF", RawDataL) +
-                  getRValue("2", RawDataR);
-    EXPECT_EQ(AddRR, HighOneLowOne);
-    EXPECT_EQ(AddRR.getRawData(), RawDataR);
-
-    // LValue's and constants
-    APInt AddLK = AllOnes + 2;
-    EXPECT_EQ(AddLK, HighOneLowOne);
-
-    APInt AddKL = 2 + AllOnes;
-    EXPECT_EQ(AddKL, HighOneLowOne);
-
-    // RValue's and constants
-    APInt AddRK = getRValue("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF", RawDataL) + 2;
-    EXPECT_EQ(AddRK, HighOneLowOne);
-    EXPECT_EQ(AddRK.getRawData(), RawDataL);
-
-    APInt AddKR = 2 + getRValue("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF", RawDataR);
-    EXPECT_EQ(AddKR, HighOneLowOne);
-    EXPECT_EQ(AddKR.getRawData(), RawDataR);
-  }
-
-  {
-    // 2 - 1 = 1
-    APInt SubLL = Two - One;
-    EXPECT_EQ(SubLL, One);
-
-    APInt SubLR = Two - getRValue("1", RawDataR);
-    EXPECT_EQ(SubLR, One);
-    EXPECT_EQ(SubLR.getRawData(), RawDataR);
-
-    APInt SubRL = getRValue("2", RawDataL) - One;
-    EXPECT_EQ(SubRL, One);
-    EXPECT_EQ(SubRL.getRawData(), RawDataL);
-
-    APInt SubRR = getRValue("2", RawDataL) - getRValue("1", RawDataR);
-    EXPECT_EQ(SubRR, One);
-    EXPECT_EQ(SubRR.getRawData(), RawDataR);
-
-    // LValue's and constants
-    APInt SubLK = Two - 1;
-    EXPECT_EQ(SubLK, One);
-
-    APInt SubKL = 2 - One;
-    EXPECT_EQ(SubKL, One);
-
-    // RValue's and constants
-    APInt SubRK = getRValue("2", RawDataL) - 1;
-    EXPECT_EQ(SubRK, One);
-    EXPECT_EQ(SubRK.getRawData(), RawDataL);
-
-    APInt SubKR = 2 - getRValue("1", RawDataR);
-    EXPECT_EQ(SubKR, One);
-    EXPECT_EQ(SubKR.getRawData(), RawDataR);
-  }
-
-  {
-    // 0x100...0001 - 0x0,FFFF...FFFF = 0x2
-    APInt AllOnes(129, "0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF", 16);
-    APInt HighOneLowOne(129, "100000000000000000000000000000001", 16);
-
-    APInt SubLL = HighOneLowOne - AllOnes;
-    EXPECT_EQ(SubLL, Two);
-
-    APInt SubLR = HighOneLowOne -
-                  getRValue("0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF", RawDataR);
-    EXPECT_EQ(SubLR, Two);
-    EXPECT_EQ(SubLR.getRawData(), RawDataR);
-
-    APInt SubRL = getRValue("100000000000000000000000000000001", RawDataL) -
-                  AllOnes;
-    EXPECT_EQ(SubRL, Two);
-    EXPECT_EQ(SubRL.getRawData(), RawDataL);
-
-    APInt SubRR = getRValue("100000000000000000000000000000001", RawDataL) -
-                  getRValue("0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF", RawDataR);
-    EXPECT_EQ(SubRR, Two);
-    EXPECT_EQ(SubRR.getRawData(), RawDataR);
-
-    // LValue's and constants
-    // 0x100...0001 - 0x2 = 0x0,FFFF...FFFF
-    APInt SubLK = HighOneLowOne - 2;
-    EXPECT_EQ(SubLK, AllOnes);
-
-    // 2 - (-1) = 3
-    APInt SubKL = 2 - MinusOne;
-    EXPECT_EQ(SubKL, Three);
-
-    // RValue's and constants
-    // 0x100...0001 - 0x2 = 0x0,FFFF...FFFF
-    APInt SubRK = getRValue("100000000000000000000000000000001", RawDataL) - 2;
-    EXPECT_EQ(SubRK, AllOnes);
-    EXPECT_EQ(SubRK.getRawData(), RawDataL);
-
-    APInt SubKR = 2 - getRValue("1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF", RawDataR);
-    EXPECT_EQ(SubKR, Three);
-    EXPECT_EQ(SubKR.getRawData(), RawDataR);
-  }
-}
-
-TEST(APIntTest, rvalue_bitwise) {
-  // Test all combinations of lvalue/rvalue lhs/rhs of and/or/xor
-
-  // Lamdba to return an APInt by value, but also provide the raw value of the
-  // allocated data.
-  auto getRValue = [](const char *HexString, uint64_t const *&RawData) {
-    APInt V(129, HexString, 16);
-    RawData = V.getRawData();
-    return V;
-  };
-
-  APInt Ten(129, "A", 16);
-  APInt Twelve(129, "C", 16);
-
-  const uint64_t *RawDataL = nullptr;
-  const uint64_t *RawDataR = nullptr;
-
-  {
-    // 12 & 10 = 8
-    APInt AndLL = Ten & Twelve;
-    EXPECT_EQ(AndLL, 0x8);
-
-    APInt AndLR = Ten & getRValue("C", RawDataR);
-    EXPECT_EQ(AndLR, 0x8);
-    EXPECT_EQ(AndLR.getRawData(), RawDataR);
-
-    APInt AndRL = getRValue("A", RawDataL) & Twelve;
-    EXPECT_EQ(AndRL, 0x8);
-    EXPECT_EQ(AndRL.getRawData(), RawDataL);
-
-    APInt AndRR = getRValue("A", RawDataL) & getRValue("C", RawDataR);
-    EXPECT_EQ(AndRR, 0x8);
-    EXPECT_EQ(AndRR.getRawData(), RawDataR);
-
-    // LValue's and constants
-    APInt AndLK = Ten & 0xc;
-    EXPECT_EQ(AndLK, 0x8);
-
-    APInt AndKL = 0xa & Twelve;
-    EXPECT_EQ(AndKL, 0x8);
-
-    // RValue's and constants
-    APInt AndRK = getRValue("A", RawDataL) & 0xc;
-    EXPECT_EQ(AndRK, 0x8);
-    EXPECT_EQ(AndRK.getRawData(), RawDataL);
-
-    APInt AndKR = 0xa & getRValue("C", RawDataR);
-    EXPECT_EQ(AndKR, 0x8);
-    EXPECT_EQ(AndKR.getRawData(), RawDataR);
-  }
-
-  {
-    // 12 | 10 = 14
-    APInt OrLL = Ten | Twelve;
-    EXPECT_EQ(OrLL, 0xe);
-
-    APInt OrLR = Ten | getRValue("C", RawDataR);
-    EXPECT_EQ(OrLR, 0xe);
-    EXPECT_EQ(OrLR.getRawData(), RawDataR);
-
-    APInt OrRL = getRValue("A", RawDataL) | Twelve;
-    EXPECT_EQ(OrRL, 0xe);
-    EXPECT_EQ(OrRL.getRawData(), RawDataL);
-
-    APInt OrRR = getRValue("A", RawDataL) | getRValue("C", RawDataR);
-    EXPECT_EQ(OrRR, 0xe);
-    EXPECT_EQ(OrRR.getRawData(), RawDataR);
-
-    // LValue's and constants
-    APInt OrLK = Ten | 0xc;
-    EXPECT_EQ(OrLK, 0xe);
-
-    APInt OrKL = 0xa | Twelve;
-    EXPECT_EQ(OrKL, 0xe);
-
-    // RValue's and constants
-    APInt OrRK = getRValue("A", RawDataL) | 0xc;
-    EXPECT_EQ(OrRK, 0xe);
-    EXPECT_EQ(OrRK.getRawData(), RawDataL);
-
-    APInt OrKR = 0xa | getRValue("C", RawDataR);
-    EXPECT_EQ(OrKR, 0xe);
-    EXPECT_EQ(OrKR.getRawData(), RawDataR);
-  }
-
-  {
-    // 12 ^ 10 = 6
-    APInt XorLL = Ten ^ Twelve;
-    EXPECT_EQ(XorLL, 0x6);
-
-    APInt XorLR = Ten ^ getRValue("C", RawDataR);
-    EXPECT_EQ(XorLR, 0x6);
-    EXPECT_EQ(XorLR.getRawData(), RawDataR);
-
-    APInt XorRL = getRValue("A", RawDataL) ^ Twelve;
-    EXPECT_EQ(XorRL, 0x6);
-    EXPECT_EQ(XorRL.getRawData(), RawDataL);
-
-    APInt XorRR = getRValue("A", RawDataL) ^ getRValue("C", RawDataR);
-    EXPECT_EQ(XorRR, 0x6);
-    EXPECT_EQ(XorRR.getRawData(), RawDataR);
-
-    // LValue's and constants
-    APInt XorLK = Ten ^ 0xc;
-    EXPECT_EQ(XorLK, 0x6);
-
-    APInt XorKL = 0xa ^ Twelve;
-    EXPECT_EQ(XorKL, 0x6);
-
-    // RValue's and constants
-    APInt XorRK = getRValue("A", RawDataL) ^ 0xc;
-    EXPECT_EQ(XorRK, 0x6);
-    EXPECT_EQ(XorRK.getRawData(), RawDataL);
-
-    APInt XorKR = 0xa ^ getRValue("C", RawDataR);
-    EXPECT_EQ(XorKR, 0x6);
-    EXPECT_EQ(XorKR.getRawData(), RawDataR);
-  }
-}
-
-TEST(APIntTest, rvalue_invert) {
-  // Lamdba to return an APInt by value, but also provide the raw value of the
-  // allocated data.
-  auto getRValue = [](const char *HexString, uint64_t const *&RawData) {
-    APInt V(129, HexString, 16);
-    RawData = V.getRawData();
-    return V;
-  };
-
-  APInt One(129, 1);
-  APInt NegativeTwo(129, -2ULL, true);
-
-  const uint64_t *RawData = nullptr;
-
-  {
-    // ~1 = -2
-    APInt NegL = ~One;
-    EXPECT_EQ(NegL, NegativeTwo);
-
-    APInt NegR = ~getRValue("1", RawData);
-    EXPECT_EQ(NegR, NegativeTwo);
-    EXPECT_EQ(NegR.getRawData(), RawData);
-  }
-}
-
-// Tests different div/rem varaints using scheme (a * b + c) / a
-void testDiv(APInt a, APInt b, APInt c) {
-  ASSERT_TRUE(a.uge(b)); // Must: a >= b
-  ASSERT_TRUE(a.ugt(c)); // Must: a > c
-
-  auto p = a * b + c;
-
-  auto q = p.udiv(a);
-  auto r = p.urem(a);
-  EXPECT_EQ(b, q);
-  EXPECT_EQ(c, r);
-  APInt::udivrem(p, a, q, r);
-  EXPECT_EQ(b, q);
-  EXPECT_EQ(c, r);
-  q = p.sdiv(a);
-  r = p.srem(a);
-  EXPECT_EQ(b, q);
-  EXPECT_EQ(c, r);
-  APInt::sdivrem(p, a, q, r);
-  EXPECT_EQ(b, q);
-  EXPECT_EQ(c, r);
-
-  if (b.ugt(c)) { // Test also symmetric case
-    q = p.udiv(b);
-    r = p.urem(b);
-    EXPECT_EQ(a, q);
-    EXPECT_EQ(c, r);
-    APInt::udivrem(p, b, q, r);
-    EXPECT_EQ(a, q);
-    EXPECT_EQ(c, r);
-    q = p.sdiv(b);
-    r = p.srem(b);
-    EXPECT_EQ(a, q);
-    EXPECT_EQ(c, r);
-    APInt::sdivrem(p, b, q, r);
-    EXPECT_EQ(a, q);
-    EXPECT_EQ(c, r);
-  }
-}
-
-TEST(APIntTest, divrem_big1) {
-  // Tests KnuthDiv rare step D6
-  testDiv({256, "1ffffffffffffffff", 16},
-          {256, "1ffffffffffffffff", 16},
-          {256, 0});
-}
-
-TEST(APIntTest, divrem_big2) {
-  // Tests KnuthDiv rare step D6
-  testDiv({1024,                       "112233ceff"
-                 "cecece000000ffffffffffffffffffff"
-                 "ffffffffffffffffffffffffffffffff"
-                 "ffffffffffffffffffffffffffffffff"
-                 "ffffffffffffffffffffffffffffff33", 16},
-          {1024,           "111111ffffffffffffffff"
-                 "ffffffffffffffffffffffffffffffff"
-                 "fffffffffffffffffffffffffffffccf"
-                 "ffffffffffffffffffffffffffffff00", 16},
-          {1024, 7919});
-}
-
-TEST(APIntTest, divrem_big3) {
-  // Tests KnuthDiv case without shift
-  testDiv({256, "80000001ffffffffffffffff", 16},
-          {256, "ffffffffffffff0000000", 16},
-          {256, 4219});
-}
-
-TEST(APIntTest, divrem_big4) {
-  // Tests heap allocation in divide() enfoced by huge numbers
-  testDiv(APInt{4096, 5}.shl(2001),
-          APInt{4096, 1}.shl(2000),
-          APInt{4096, 4219*13});
-}
-
-TEST(APIntTest, divrem_big5) {
-  // Tests one word divisor case of divide()
-  testDiv(APInt{1024, 19}.shl(811),
-          APInt{1024, 4356013}, // one word
-          APInt{1024, 1});
-}
-
-TEST(APIntTest, divrem_big6) {
-  // Tests some rare "borrow" cases in D4 step
-  testDiv(APInt{512, "ffffffffffffffff00000000000000000000000001", 16},
-          APInt{512, "10000000000000001000000000000001", 16},
-          APInt{512, "10000000000000000000000000000000", 16});
-}
-
-TEST(APIntTest, divrem_big7) {
-  // Yet another test for KnuthDiv rare step D6.
-  testDiv({224, "800000008000000200000005", 16},
-          {224, "fffffffd", 16},
-          {224, "80000000800000010000000f", 16});
-}
-
-void testDiv(APInt a, uint64_t b, APInt c) {
-  auto p = a * b + c;
-
-  APInt q;
-  uint64_t r;
-  // Unsigned division will only work if our original number wasn't negative.
-  if (!a.isNegative()) {
-    q = p.udiv(b);
-    r = p.urem(b);
-    EXPECT_EQ(a, q);
-    EXPECT_EQ(c, r);
-    APInt::udivrem(p, b, q, r);
-    EXPECT_EQ(a, q);
-    EXPECT_EQ(c, r);
-  }
-  q = p.sdiv(b);
-  r = p.srem(b);
-  EXPECT_EQ(a, q);
-  if (c.isNegative())
-    EXPECT_EQ(-c, -r); // Need to negate so the uint64_t compare will work.
-  else
-    EXPECT_EQ(c, r);
-  int64_t sr;
-  APInt::sdivrem(p, b, q, sr);
-  EXPECT_EQ(a, q);
-  if (c.isNegative())
-    EXPECT_EQ(-c, -sr); // Need to negate so the uint64_t compare will work.
-  else
-    EXPECT_EQ(c, sr);
-}
-
-TEST(APIntTest, divremuint) {
-  // Single word APInt
-  testDiv(APInt{64, 9},
-          2,
-          APInt{64, 1});
-
-  // Single word negative APInt
-  testDiv(-APInt{64, 9},
-          2,
-          -APInt{64, 1});
-
-  // Multiword dividend with only one significant word.
-  testDiv(APInt{256, 9},
-          2,
-          APInt{256, 1});
-
-  // Negative dividend.
-  testDiv(-APInt{256, 9},
-          2,
-          -APInt{256, 1});
-
-  // Multiword dividend
-  testDiv(APInt{1024, 19}.shl(811),
-          4356013, // one word
-          APInt{1024, 1});
-}
-
-TEST(APIntTest, divrem_simple) {
-  // Test simple cases.
-  APInt A(65, 2), B(65, 2);
-  APInt Q, R;
-
-  // X / X
-  APInt::sdivrem(A, B, Q, R);
-  EXPECT_EQ(Q, APInt(65, 1));
-  EXPECT_EQ(R, APInt(65, 0));
-  APInt::udivrem(A, B, Q, R);
-  EXPECT_EQ(Q, APInt(65, 1));
-  EXPECT_EQ(R, APInt(65, 0));
-
-  // 0 / X
-  APInt O(65, 0);
-  APInt::sdivrem(O, B, Q, R);
-  EXPECT_EQ(Q, APInt(65, 0));
-  EXPECT_EQ(R, APInt(65, 0));
-  APInt::udivrem(O, B, Q, R);
-  EXPECT_EQ(Q, APInt(65, 0));
-  EXPECT_EQ(R, APInt(65, 0));
-
-  // X / 1
-  APInt I(65, 1);
-  APInt::sdivrem(A, I, Q, R);
-  EXPECT_EQ(Q, A);
-  EXPECT_EQ(R, APInt(65, 0));
-  APInt::udivrem(A, I, Q, R);
-  EXPECT_EQ(Q, A);
-  EXPECT_EQ(R, APInt(65, 0));
-}
-
-TEST(APIntTest, fromString) {
-  EXPECT_EQ(APInt(32, 0), APInt(32,   "0", 2));
-  EXPECT_EQ(APInt(32, 1), APInt(32,   "1", 2));
-  EXPECT_EQ(APInt(32, 2), APInt(32,  "10", 2));
-  EXPECT_EQ(APInt(32, 3), APInt(32,  "11", 2));
-  EXPECT_EQ(APInt(32, 4), APInt(32, "100", 2));
-
-  EXPECT_EQ(APInt(32, 0), APInt(32,   "+0", 2));
-  EXPECT_EQ(APInt(32, 1), APInt(32,   "+1", 2));
-  EXPECT_EQ(APInt(32, 2), APInt(32,  "+10", 2));
-  EXPECT_EQ(APInt(32, 3), APInt(32,  "+11", 2));
-  EXPECT_EQ(APInt(32, 4), APInt(32, "+100", 2));
-
-  EXPECT_EQ(APInt(32, uint64_t(-0LL)), APInt(32,   "-0", 2));
-  EXPECT_EQ(APInt(32, uint64_t(-1LL)), APInt(32,   "-1", 2));
-  EXPECT_EQ(APInt(32, uint64_t(-2LL)), APInt(32,  "-10", 2));
-  EXPECT_EQ(APInt(32, uint64_t(-3LL)), APInt(32,  "-11", 2));
-  EXPECT_EQ(APInt(32, uint64_t(-4LL)), APInt(32, "-100", 2));
-
-  EXPECT_EQ(APInt(32,  0), APInt(32,  "0",  8));
-  EXPECT_EQ(APInt(32,  1), APInt(32,  "1",  8));
-  EXPECT_EQ(APInt(32,  7), APInt(32,  "7",  8));
-  EXPECT_EQ(APInt(32,  8), APInt(32,  "10", 8));
-  EXPECT_EQ(APInt(32, 15), APInt(32,  "17", 8));
-  EXPECT_EQ(APInt(32, 16), APInt(32,  "20", 8));
-
-  EXPECT_EQ(APInt(32,  +0), APInt(32,  "+0",  8));
-  EXPECT_EQ(APInt(32,  +1), APInt(32,  "+1",  8));
-  EXPECT_EQ(APInt(32,  +7), APInt(32,  "+7",  8));
-  EXPECT_EQ(APInt(32,  +8), APInt(32,  "+10", 8));
-  EXPECT_EQ(APInt(32, +15), APInt(32,  "+17", 8));
-  EXPECT_EQ(APInt(32, +16), APInt(32,  "+20", 8));
-
-  EXPECT_EQ(APInt(32,  uint64_t(-0LL)), APInt(32,  "-0",  8));
-  EXPECT_EQ(APInt(32,  uint64_t(-1LL)), APInt(32,  "-1",  8));
-  EXPECT_EQ(APInt(32,  uint64_t(-7LL)), APInt(32,  "-7",  8));
-  EXPECT_EQ(APInt(32,  uint64_t(-8LL)), APInt(32,  "-10", 8));
-  EXPECT_EQ(APInt(32, uint64_t(-15LL)), APInt(32,  "-17", 8));
-  EXPECT_EQ(APInt(32, uint64_t(-16LL)), APInt(32,  "-20", 8));
-
-  EXPECT_EQ(APInt(32,  0), APInt(32,  "0", 10));
-  EXPECT_EQ(APInt(32,  1), APInt(32,  "1", 10));
-  EXPECT_EQ(APInt(32,  9), APInt(32,  "9", 10));
-  EXPECT_EQ(APInt(32, 10), APInt(32, "10", 10));
-  EXPECT_EQ(APInt(32, 19), APInt(32, "19", 10));
-  EXPECT_EQ(APInt(32, 20), APInt(32, "20", 10));
-
-  EXPECT_EQ(APInt(32,  uint64_t(-0LL)), APInt(32,  "-0", 10));
-  EXPECT_EQ(APInt(32,  uint64_t(-1LL)), APInt(32,  "-1", 10));
-  EXPECT_EQ(APInt(32,  uint64_t(-9LL)), APInt(32,  "-9", 10));
-  EXPECT_EQ(APInt(32, uint64_t(-10LL)), APInt(32, "-10", 10));
-  EXPECT_EQ(APInt(32, uint64_t(-19LL)), APInt(32, "-19", 10));
-  EXPECT_EQ(APInt(32, uint64_t(-20LL)), APInt(32, "-20", 10));
-
-  EXPECT_EQ(APInt(32,  0), APInt(32,  "0", 16));
-  EXPECT_EQ(APInt(32,  1), APInt(32,  "1", 16));
-  EXPECT_EQ(APInt(32, 15), APInt(32,  "F", 16));
-  EXPECT_EQ(APInt(32, 16), APInt(32, "10", 16));
-  EXPECT_EQ(APInt(32, 31), APInt(32, "1F", 16));
-  EXPECT_EQ(APInt(32, 32), APInt(32, "20", 16));
-
-  EXPECT_EQ(APInt(32,  uint64_t(-0LL)), APInt(32,  "-0", 16));
-  EXPECT_EQ(APInt(32,  uint64_t(-1LL)), APInt(32,  "-1", 16));
-  EXPECT_EQ(APInt(32, uint64_t(-15LL)), APInt(32,  "-F", 16));
-  EXPECT_EQ(APInt(32, uint64_t(-16LL)), APInt(32, "-10", 16));
-  EXPECT_EQ(APInt(32, uint64_t(-31LL)), APInt(32, "-1F", 16));
-  EXPECT_EQ(APInt(32, uint64_t(-32LL)), APInt(32, "-20", 16));
-
-  EXPECT_EQ(APInt(32,  0), APInt(32,  "0", 36));
-  EXPECT_EQ(APInt(32,  1), APInt(32,  "1", 36));
-  EXPECT_EQ(APInt(32, 35), APInt(32,  "Z", 36));
-  EXPECT_EQ(APInt(32, 36), APInt(32, "10", 36));
-  EXPECT_EQ(APInt(32, 71), APInt(32, "1Z", 36));
-  EXPECT_EQ(APInt(32, 72), APInt(32, "20", 36));
-
-  EXPECT_EQ(APInt(32,  uint64_t(-0LL)), APInt(32,  "-0", 36));
-  EXPECT_EQ(APInt(32,  uint64_t(-1LL)), APInt(32,  "-1", 36));
-  EXPECT_EQ(APInt(32, uint64_t(-35LL)), APInt(32,  "-Z", 36));
-  EXPECT_EQ(APInt(32, uint64_t(-36LL)), APInt(32, "-10", 36));
-  EXPECT_EQ(APInt(32, uint64_t(-71LL)), APInt(32, "-1Z", 36));
-  EXPECT_EQ(APInt(32, uint64_t(-72LL)), APInt(32, "-20", 36));
-}
-
-TEST(APIntTest, SaturatingMath) {
-  APInt AP_10 = APInt(8, 10);
-  APInt AP_42 = APInt(8, 42);
-  APInt AP_100 = APInt(8, 100);
-  APInt AP_200 = APInt(8, 200);
-
-  EXPECT_EQ(APInt(7, 100), AP_100.truncUSat(7));
-  EXPECT_EQ(APInt(6, 63), AP_100.truncUSat(6));
-  EXPECT_EQ(APInt(5, 31), AP_100.truncUSat(5));
-
-  EXPECT_EQ(APInt(7, 127), AP_200.truncUSat(7));
-  EXPECT_EQ(APInt(6, 63), AP_200.truncUSat(6));
-  EXPECT_EQ(APInt(5, 31), AP_200.truncUSat(5));
-
-  EXPECT_EQ(APInt(7, 42), AP_42.truncSSat(7));
-  EXPECT_EQ(APInt(6, 31), AP_42.truncSSat(6));
-  EXPECT_EQ(APInt(5, 15), AP_42.truncSSat(5));
-
-  EXPECT_EQ(APInt(7, -56), AP_200.truncSSat(7));
-  EXPECT_EQ(APInt(6, -32), AP_200.truncSSat(6));
-  EXPECT_EQ(APInt(5, -16), AP_200.truncSSat(5));
-
-  EXPECT_EQ(APInt(8, 200), AP_100.uadd_sat(AP_100));
-  EXPECT_EQ(APInt(8, 255), AP_100.uadd_sat(AP_200));
-  EXPECT_EQ(APInt(8, 255), APInt(8, 255).uadd_sat(APInt(8, 255)));
-
-  EXPECT_EQ(APInt(8, 110), AP_10.sadd_sat(AP_100));
-  EXPECT_EQ(APInt(8, 127), AP_100.sadd_sat(AP_100));
-  EXPECT_EQ(APInt(8, -128), (-AP_100).sadd_sat(-AP_100));
-  EXPECT_EQ(APInt(8, -128), APInt(8, -128).sadd_sat(APInt(8, -128)));
-
-  EXPECT_EQ(APInt(8, 90), AP_100.usub_sat(AP_10));
-  EXPECT_EQ(APInt(8, 0), AP_100.usub_sat(AP_200));
-  EXPECT_EQ(APInt(8, 0), APInt(8, 0).usub_sat(APInt(8, 255)));
-
-  EXPECT_EQ(APInt(8, -90), AP_10.ssub_sat(AP_100));
-  EXPECT_EQ(APInt(8, 127), AP_100.ssub_sat(-AP_100));
-  EXPECT_EQ(APInt(8, -128), (-AP_100).ssub_sat(AP_100));
-  EXPECT_EQ(APInt(8, -128), APInt(8, -128).ssub_sat(APInt(8, 127)));
-
-  EXPECT_EQ(APInt(8, 250), APInt(8, 50).umul_sat(APInt(8, 5)));
-  EXPECT_EQ(APInt(8, 255), APInt(8, 50).umul_sat(APInt(8, 6)));
-  EXPECT_EQ(APInt(8, 255), APInt(8, -128).umul_sat(APInt(8, 3)));
-  EXPECT_EQ(APInt(8, 255), APInt(8, 3).umul_sat(APInt(8, -128)));
-  EXPECT_EQ(APInt(8, 255), APInt(8, -128).umul_sat(APInt(8, -128)));
-
-  EXPECT_EQ(APInt(8, 125), APInt(8, 25).smul_sat(APInt(8, 5)));
-  EXPECT_EQ(APInt(8, 127), APInt(8, 25).smul_sat(APInt(8, 6)));
-  EXPECT_EQ(APInt(8, 127), APInt(8, 127).smul_sat(APInt(8, 127)));
-  EXPECT_EQ(APInt(8, -125), APInt(8, -25).smul_sat(APInt(8, 5)));
-  EXPECT_EQ(APInt(8, -125), APInt(8, 25).smul_sat(APInt(8, -5)));
-  EXPECT_EQ(APInt(8, 125), APInt(8, -25).smul_sat(APInt(8, -5)));
-  EXPECT_EQ(APInt(8, 125), APInt(8, 25).smul_sat(APInt(8, 5)));
-  EXPECT_EQ(APInt(8, -128), APInt(8, -25).smul_sat(APInt(8, 6)));
-  EXPECT_EQ(APInt(8, -128), APInt(8, 25).smul_sat(APInt(8, -6)));
-  EXPECT_EQ(APInt(8, 127), APInt(8, -25).smul_sat(APInt(8, -6)));
-  EXPECT_EQ(APInt(8, 127), APInt(8, 25).smul_sat(APInt(8, 6)));
-
-  EXPECT_EQ(APInt(8, 128), APInt(8, 4).ushl_sat(APInt(8, 5)));
-  EXPECT_EQ(APInt(8, 255), APInt(8, 4).ushl_sat(APInt(8, 6)));
-  EXPECT_EQ(APInt(8, 128), APInt(8, 1).ushl_sat(APInt(8, 7)));
-  EXPECT_EQ(APInt(8, 255), APInt(8, 1).ushl_sat(APInt(8, 8)));
-  EXPECT_EQ(APInt(8, 255), APInt(8, -128).ushl_sat(APInt(8, 2)));
-  EXPECT_EQ(APInt(8, 255), APInt(8, 64).ushl_sat(APInt(8, 2)));
-  EXPECT_EQ(APInt(8, 255), APInt(8, 64).ushl_sat(APInt(8, -2)));
-
-  EXPECT_EQ(APInt(8, 64), APInt(8, 4).sshl_sat(APInt(8, 4)));
-  EXPECT_EQ(APInt(8, 127), APInt(8, 4).sshl_sat(APInt(8, 5)));
-  EXPECT_EQ(APInt(8, 127), APInt(8, 1).sshl_sat(APInt(8, 8)));
-  EXPECT_EQ(APInt(8, -64), APInt(8, -4).sshl_sat(APInt(8, 4)));
-  EXPECT_EQ(APInt(8, -128), APInt(8, -4).sshl_sat(APInt(8, 5)));
-  EXPECT_EQ(APInt(8, -128), APInt(8, -4).sshl_sat(APInt(8, 6)));
-  EXPECT_EQ(APInt(8, -128), APInt(8, -1).sshl_sat(APInt(8, 7)));
-  EXPECT_EQ(APInt(8, -128), APInt(8, -1).sshl_sat(APInt(8, 8)));
-}
-
-TEST(APIntTest, FromArray) {
-  EXPECT_EQ(APInt(32, uint64_t(1)), APInt(32, ArrayRef<uint64_t>(1)));
-}
-
-TEST(APIntTest, StringBitsNeeded2) {
-  EXPECT_EQ(1U, APInt::getBitsNeeded(  "0", 2));
-  EXPECT_EQ(1U, APInt::getBitsNeeded(  "1", 2));
-  EXPECT_EQ(2U, APInt::getBitsNeeded( "10", 2));
-  EXPECT_EQ(2U, APInt::getBitsNeeded( "11", 2));
-  EXPECT_EQ(3U, APInt::getBitsNeeded("100", 2));
-
-  EXPECT_EQ(1U, APInt::getBitsNeeded(  "+0", 2));
-  EXPECT_EQ(1U, APInt::getBitsNeeded(  "+1", 2));
-  EXPECT_EQ(2U, APInt::getBitsNeeded( "+10", 2));
-  EXPECT_EQ(2U, APInt::getBitsNeeded( "+11", 2));
-  EXPECT_EQ(3U, APInt::getBitsNeeded("+100", 2));
-
-  EXPECT_EQ(2U, APInt::getBitsNeeded(  "-0", 2));
-  EXPECT_EQ(2U, APInt::getBitsNeeded(  "-1", 2));
-  EXPECT_EQ(3U, APInt::getBitsNeeded( "-10", 2));
-  EXPECT_EQ(3U, APInt::getBitsNeeded( "-11", 2));
-  EXPECT_EQ(4U, APInt::getBitsNeeded("-100", 2));
-}
-
-TEST(APIntTest, StringBitsNeeded8) {
-  EXPECT_EQ(3U, APInt::getBitsNeeded( "0", 8));
-  EXPECT_EQ(3U, APInt::getBitsNeeded( "7", 8));
-  EXPECT_EQ(6U, APInt::getBitsNeeded("10", 8));
-  EXPECT_EQ(6U, APInt::getBitsNeeded("17", 8));
-  EXPECT_EQ(6U, APInt::getBitsNeeded("20", 8));
-
-  EXPECT_EQ(3U, APInt::getBitsNeeded( "+0", 8));
-  EXPECT_EQ(3U, APInt::getBitsNeeded( "+7", 8));
-  EXPECT_EQ(6U, APInt::getBitsNeeded("+10", 8));
-  EXPECT_EQ(6U, APInt::getBitsNeeded("+17", 8));
-  EXPECT_EQ(6U, APInt::getBitsNeeded("+20", 8));
-
-  EXPECT_EQ(4U, APInt::getBitsNeeded( "-0", 8));
-  EXPECT_EQ(4U, APInt::getBitsNeeded( "-7", 8));
-  EXPECT_EQ(7U, APInt::getBitsNeeded("-10", 8));
-  EXPECT_EQ(7U, APInt::getBitsNeeded("-17", 8));
-  EXPECT_EQ(7U, APInt::getBitsNeeded("-20", 8));
-}
-
-TEST(APIntTest, StringBitsNeeded10) {
-  EXPECT_EQ(1U, APInt::getBitsNeeded( "0", 10));
-  EXPECT_EQ(2U, APInt::getBitsNeeded( "3", 10));
-  EXPECT_EQ(4U, APInt::getBitsNeeded( "9", 10));
-  EXPECT_EQ(4U, APInt::getBitsNeeded("10", 10));
-  EXPECT_EQ(5U, APInt::getBitsNeeded("19", 10));
-  EXPECT_EQ(5U, APInt::getBitsNeeded("20", 10));
-
-  EXPECT_EQ(1U, APInt::getBitsNeeded( "+0", 10));
-  EXPECT_EQ(4U, APInt::getBitsNeeded( "+9", 10));
-  EXPECT_EQ(4U, APInt::getBitsNeeded("+10", 10));
-  EXPECT_EQ(5U, APInt::getBitsNeeded("+19", 10));
-  EXPECT_EQ(5U, APInt::getBitsNeeded("+20", 10));
-
-  EXPECT_EQ(2U, APInt::getBitsNeeded( "-0", 10));
-  EXPECT_EQ(5U, APInt::getBitsNeeded( "-9", 10));
-  EXPECT_EQ(5U, APInt::getBitsNeeded("-10", 10));
-  EXPECT_EQ(6U, APInt::getBitsNeeded("-19", 10));
-  EXPECT_EQ(6U, APInt::getBitsNeeded("-20", 10));
-
-  EXPECT_EQ(1U, APInt::getBitsNeeded("-1", 10));
-  EXPECT_EQ(2U, APInt::getBitsNeeded("-2", 10));
-  EXPECT_EQ(3U, APInt::getBitsNeeded("-4", 10));
-  EXPECT_EQ(4U, APInt::getBitsNeeded("-8", 10));
-  EXPECT_EQ(5U, APInt::getBitsNeeded("-16", 10));
-  EXPECT_EQ(6U, APInt::getBitsNeeded("-23", 10));
-  EXPECT_EQ(6U, APInt::getBitsNeeded("-32", 10));
-  EXPECT_EQ(7U, APInt::getBitsNeeded("-64", 10));
-  EXPECT_EQ(8U, APInt::getBitsNeeded("-127", 10));
-  EXPECT_EQ(8U, APInt::getBitsNeeded("-128", 10));
-  EXPECT_EQ(9U, APInt::getBitsNeeded("-255", 10));
-  EXPECT_EQ(9U, APInt::getBitsNeeded("-256", 10));
-  EXPECT_EQ(10U, APInt::getBitsNeeded("-512", 10));
-  EXPECT_EQ(11U, APInt::getBitsNeeded("-1024", 10));
-  EXPECT_EQ(12U, APInt::getBitsNeeded("-1025", 10));
-}
-
-TEST(APIntTest, StringBitsNeeded16) {
-  EXPECT_EQ(4U, APInt::getBitsNeeded( "0", 16));
-  EXPECT_EQ(4U, APInt::getBitsNeeded( "F", 16));
-  EXPECT_EQ(8U, APInt::getBitsNeeded("10", 16));
-  EXPECT_EQ(8U, APInt::getBitsNeeded("1F", 16));
-  EXPECT_EQ(8U, APInt::getBitsNeeded("20", 16));
-
-  EXPECT_EQ(4U, APInt::getBitsNeeded( "+0", 16));
-  EXPECT_EQ(4U, APInt::getBitsNeeded( "+F", 16));
-  EXPECT_EQ(8U, APInt::getBitsNeeded("+10", 16));
-  EXPECT_EQ(8U, APInt::getBitsNeeded("+1F", 16));
-  EXPECT_EQ(8U, APInt::getBitsNeeded("+20", 16));
-
-  EXPECT_EQ(5U, APInt::getBitsNeeded( "-0", 16));
-  EXPECT_EQ(5U, APInt::getBitsNeeded( "-F", 16));
-  EXPECT_EQ(9U, APInt::getBitsNeeded("-10", 16));
-  EXPECT_EQ(9U, APInt::getBitsNeeded("-1F", 16));
-  EXPECT_EQ(9U, APInt::getBitsNeeded("-20", 16));
-}
-
-TEST(APIntTest, toString) {
-  SmallString<16> S;
-  bool isSigned;
-
-  APInt(8, 0).toString(S, 2, true, true);
-  EXPECT_EQ(std::string(S), "0b0");
-  S.clear();
-  APInt(8, 0).toString(S, 8, true, true);
-  EXPECT_EQ(std::string(S), "00");
-  S.clear();
-  APInt(8, 0).toString(S, 10, true, true);
-  EXPECT_EQ(std::string(S), "0");
-  S.clear();
-  APInt(8, 0).toString(S, 16, true, true);
-  EXPECT_EQ(std::string(S), "0x0");
-  S.clear();
-  APInt(8, 0).toString(S, 36, true, false);
-  EXPECT_EQ(std::string(S), "0");
-  S.clear();
-
-  isSigned = false;
-  APInt(8, 255, isSigned).toString(S, 2, isSigned, true);
-  EXPECT_EQ(std::string(S), "0b11111111");
-  S.clear();
-  APInt(8, 255, isSigned).toString(S, 8, isSigned, true);
-  EXPECT_EQ(std::string(S), "0377");
-  S.clear();
-  APInt(8, 255, isSigned).toString(S, 10, isSigned, true);
-  EXPECT_EQ(std::string(S), "255");
-  S.clear();
-  APInt(8, 255, isSigned).toString(S, 16, isSigned, true);
-  EXPECT_EQ(std::string(S), "0xFF");
-  S.clear();
-  APInt(8, 255, isSigned).toString(S, 36, isSigned, false);
-  EXPECT_EQ(std::string(S), "73");
-  S.clear();
-
-  isSigned = true;
-  APInt(8, 255, isSigned).toString(S, 2, isSigned, true);
-  EXPECT_EQ(std::string(S), "-0b1");
-  S.clear();
-  APInt(8, 255, isSigned).toString(S, 8, isSigned, true);
-  EXPECT_EQ(std::string(S), "-01");
-  S.clear();
-  APInt(8, 255, isSigned).toString(S, 10, isSigned, true);
-  EXPECT_EQ(std::string(S), "-1");
-  S.clear();
-  APInt(8, 255, isSigned).toString(S, 16, isSigned, true);
-  EXPECT_EQ(std::string(S), "-0x1");
-  S.clear();
-  APInt(8, 255, isSigned).toString(S, 36, isSigned, false);
-  EXPECT_EQ(std::string(S), "-1");
-  S.clear();
-}
-
-TEST(APIntTest, Log2) {
-  EXPECT_EQ(APInt(15, 7).logBase2(), 2U);
-  EXPECT_EQ(APInt(15, 7).ceilLogBase2(), 3U);
-  EXPECT_EQ(APInt(15, 7).exactLogBase2(), -1);
-  EXPECT_EQ(APInt(15, 8).logBase2(), 3U);
-  EXPECT_EQ(APInt(15, 8).ceilLogBase2(), 3U);
-  EXPECT_EQ(APInt(15, 8).exactLogBase2(), 3);
-  EXPECT_EQ(APInt(15, 9).logBase2(), 3U);
-  EXPECT_EQ(APInt(15, 9).ceilLogBase2(), 4U);
-  EXPECT_EQ(APInt(15, 9).exactLogBase2(), -1);
-}
-
-TEST(APIntTest, magic) {
-  EXPECT_EQ(APInt(32, 3).magic().m, APInt(32, "55555556", 16));
-  EXPECT_EQ(APInt(32, 3).magic().s, 0U);
-  EXPECT_EQ(APInt(32, 5).magic().m, APInt(32, "66666667", 16));
-  EXPECT_EQ(APInt(32, 5).magic().s, 1U);
-  EXPECT_EQ(APInt(32, 7).magic().m, APInt(32, "92492493", 16));
-  EXPECT_EQ(APInt(32, 7).magic().s, 2U);
-}
-
-TEST(APIntTest, magicu) {
-  EXPECT_EQ(APInt(32, 3).magicu().m, APInt(32, "AAAAAAAB", 16));
-  EXPECT_EQ(APInt(32, 3).magicu().s, 1U);
-  EXPECT_EQ(APInt(32, 5).magicu().m, APInt(32, "CCCCCCCD", 16));
-  EXPECT_EQ(APInt(32, 5).magicu().s, 2U);
-  EXPECT_EQ(APInt(32, 7).magicu().m, APInt(32, "24924925", 16));
-  EXPECT_EQ(APInt(32, 7).magicu().s, 3U);
-  EXPECT_EQ(APInt(64, 25).magicu(1).m, APInt(64, "A3D70A3D70A3D70B", 16));
-  EXPECT_EQ(APInt(64, 25).magicu(1).s, 4U);
-}
-
-#ifdef GTEST_HAS_DEATH_TEST
-#ifndef NDEBUG
-TEST(APIntTest, StringDeath) {
-  EXPECT_DEATH((void)APInt(0, "", 0), "Bitwidth too small");
-  EXPECT_DEATH((void)APInt(32, "", 0), "Invalid string length");
-  EXPECT_DEATH((void)APInt(32, "0", 0), "Radix should be 2, 8, 10, 16, or 36!");
-  EXPECT_DEATH((void)APInt(32, "", 10), "Invalid string length");
-  EXPECT_DEATH((void)APInt(32, "-", 10), "String is only a sign, needs a value.");
-  EXPECT_DEATH((void)APInt(1, "1234", 10), "Insufficient bit width");
-  EXPECT_DEATH((void)APInt(32, "\0", 10), "Invalid string length");
-  EXPECT_DEATH((void)APInt(32, StringRef("1\02", 3), 10), "Invalid character in digit string");
-  EXPECT_DEATH((void)APInt(32, "1L", 10), "Invalid character in digit string");
-}
-#endif
-#endif
-
-TEST(APIntTest, mul_clear) {
-  APInt ValA(65, -1ULL);
-  APInt ValB(65, 4);
-  APInt ValC(65, 0);
-  ValC = ValA * ValB;
-  ValA *= ValB;
-  SmallString<16> StrA, StrC;
-  ValA.toString(StrA, 10, false);
-  ValC.toString(StrC, 10, false);
-  EXPECT_EQ(std::string(StrA), std::string(StrC));
-}
-
-TEST(APIntTest, Rotate) {
-  EXPECT_EQ(APInt(8, 1),  APInt(8, 1).rotl(0));
-  EXPECT_EQ(APInt(8, 2),  APInt(8, 1).rotl(1));
-  EXPECT_EQ(APInt(8, 4),  APInt(8, 1).rotl(2));
-  EXPECT_EQ(APInt(8, 16), APInt(8, 1).rotl(4));
-  EXPECT_EQ(APInt(8, 1),  APInt(8, 1).rotl(8));
-
-  EXPECT_EQ(APInt(8, 16), APInt(8, 16).rotl(0));
-  EXPECT_EQ(APInt(8, 32), APInt(8, 16).rotl(1));
-  EXPECT_EQ(APInt(8, 64), APInt(8, 16).rotl(2));
-  EXPECT_EQ(APInt(8, 1),  APInt(8, 16).rotl(4));
-  EXPECT_EQ(APInt(8, 16), APInt(8, 16).rotl(8));
-
-  EXPECT_EQ(APInt(32, 2), APInt(32, 1).rotl(33));
-  EXPECT_EQ(APInt(32, 2), APInt(32, 1).rotl(APInt(32, 33)));
-
-  EXPECT_EQ(APInt(32, 2), APInt(32, 1).rotl(33));
-  EXPECT_EQ(APInt(32, 2), APInt(32, 1).rotl(APInt(32, 33)));
-  EXPECT_EQ(APInt(32, 2), APInt(32, 1).rotl(APInt(33, 33)));
-  EXPECT_EQ(APInt(32, (1 << 8)), APInt(32, 1).rotl(APInt(32, 40)));
-  EXPECT_EQ(APInt(32, (1 << 30)), APInt(32, 1).rotl(APInt(31, 30)));
-  EXPECT_EQ(APInt(32, (1 << 31)), APInt(32, 1).rotl(APInt(31, 31)));
-
-  EXPECT_EQ(APInt(32, 1), APInt(32, 1).rotl(APInt(1, 0)));
-  EXPECT_EQ(APInt(32, 2), APInt(32, 1).rotl(APInt(1, 1)));
-
-  EXPECT_EQ(APInt(32, 16), APInt(32, 1).rotl(APInt(3, 4)));
-
-  EXPECT_EQ(APInt(32, 1), APInt(32, 1).rotl(APInt(64, 64)));
-  EXPECT_EQ(APInt(32, 2), APInt(32, 1).rotl(APInt(64, 65)));
-
-  EXPECT_EQ(APInt(7, 24), APInt(7, 3).rotl(APInt(7, 3)));
-  EXPECT_EQ(APInt(7, 24), APInt(7, 3).rotl(APInt(7, 10)));
-  EXPECT_EQ(APInt(7, 24), APInt(7, 3).rotl(APInt(5, 10)));
-  EXPECT_EQ(APInt(7, 6), APInt(7, 3).rotl(APInt(12, 120)));
-
-  EXPECT_EQ(APInt(8, 16), APInt(8, 16).rotr(0));
-  EXPECT_EQ(APInt(8, 8),  APInt(8, 16).rotr(1));
-  EXPECT_EQ(APInt(8, 4),  APInt(8, 16).rotr(2));
-  EXPECT_EQ(APInt(8, 1),  APInt(8, 16).rotr(4));
-  EXPECT_EQ(APInt(8, 16), APInt(8, 16).rotr(8));
-
-  EXPECT_EQ(APInt(8, 1),   APInt(8, 1).rotr(0));
-  EXPECT_EQ(APInt(8, 128), APInt(8, 1).rotr(1));
-  EXPECT_EQ(APInt(8, 64),  APInt(8, 1).rotr(2));
-  EXPECT_EQ(APInt(8, 16),  APInt(8, 1).rotr(4));
-  EXPECT_EQ(APInt(8, 1),   APInt(8, 1).rotr(8));
-
-  EXPECT_EQ(APInt(32, (1 << 31)), APInt(32, 1).rotr(33));
-  EXPECT_EQ(APInt(32, (1 << 31)), APInt(32, 1).rotr(APInt(32, 33)));
-
-  EXPECT_EQ(APInt(32, (1 << 31)), APInt(32, 1).rotr(33));
-  EXPECT_EQ(APInt(32, (1 << 31)), APInt(32, 1).rotr(APInt(32, 33)));
-  EXPECT_EQ(APInt(32, (1 << 31)), APInt(32, 1).rotr(APInt(33, 33)));
-  EXPECT_EQ(APInt(32, (1 << 24)), APInt(32, 1).rotr(APInt(32, 40)));
-
-  EXPECT_EQ(APInt(32, (1 << 2)), APInt(32, 1).rotr(APInt(31, 30)));
-  EXPECT_EQ(APInt(32, (1 << 1)), APInt(32, 1).rotr(APInt(31, 31)));
-
-  EXPECT_EQ(APInt(32, 1), APInt(32, 1).rotr(APInt(1, 0)));
-  EXPECT_EQ(APInt(32, (1 << 31)), APInt(32, 1).rotr(APInt(1, 1)));
-
-  EXPECT_EQ(APInt(32, (1 << 28)), APInt(32, 1).rotr(APInt(3, 4)));
-
-  EXPECT_EQ(APInt(32, 1), APInt(32, 1).rotr(APInt(64, 64)));
-  EXPECT_EQ(APInt(32, (1 << 31)), APInt(32, 1).rotr(APInt(64, 65)));
-
-  EXPECT_EQ(APInt(7, 48), APInt(7, 3).rotr(APInt(7, 3)));
-  EXPECT_EQ(APInt(7, 48), APInt(7, 3).rotr(APInt(7, 10)));
-  EXPECT_EQ(APInt(7, 48), APInt(7, 3).rotr(APInt(5, 10)));
-  EXPECT_EQ(APInt(7, 65), APInt(7, 3).rotr(APInt(12, 120)));
-
-  APInt Big(256, "00004000800000000000000000003fff8000000000000003", 16);
-  APInt Rot(256, "3fff80000000000000030000000000000000000040008000", 16);
-  EXPECT_EQ(Rot, Big.rotr(144));
-
-  EXPECT_EQ(APInt(32, 8), APInt(32, 1).rotl(Big));
-  EXPECT_EQ(APInt(32, (1 << 29)), APInt(32, 1).rotr(Big));
-}
-
-TEST(APIntTest, Splat) {
-  APInt ValA(8, 0x01);
-  EXPECT_EQ(ValA, APInt::getSplat(8, ValA));
-  EXPECT_EQ(APInt(64, 0x0101010101010101ULL), APInt::getSplat(64, ValA));
-
-  APInt ValB(3, 5);
-  EXPECT_EQ(APInt(4, 0xD), APInt::getSplat(4, ValB));
-  EXPECT_EQ(APInt(15, 0xDB6D), APInt::getSplat(15, ValB));
-}
-
-TEST(APIntTest, tcDecrement) {
-  // Test single word decrement.
-
-  // No out borrow.
-  {
-    APInt::WordType singleWord = ~APInt::WordType(0) << (APInt::APINT_BITS_PER_WORD - 1);
-    APInt::WordType carry = APInt::tcDecrement(&singleWord, 1);
-    EXPECT_EQ(carry, APInt::WordType(0));
-    EXPECT_EQ(singleWord, ~APInt::WordType(0) >> 1);
-  }
-
-  // With out borrow.
-  {
-    APInt::WordType singleWord = 0;
-    APInt::WordType carry = APInt::tcDecrement(&singleWord, 1);
-    EXPECT_EQ(carry, APInt::WordType(1));
-    EXPECT_EQ(singleWord, ~APInt::WordType(0));
-  }
-
-  // Test multiword decrement.
-
-  // No across word borrow, no out borrow.
-  {
-    APInt::WordType test[4] = {0x1, 0x1, 0x1, 0x1};
-    APInt::WordType expected[4] = {0x0, 0x1, 0x1, 0x1};
-    APInt::tcDecrement(test, 4);
-    EXPECT_EQ(APInt::tcCompare(test, expected, 4), 0);
-  }
-
-  // 1 across word borrow, no out borrow.
-  {
-    APInt::WordType test[4] = {0x0, 0xF, 0x1, 0x1};
-    APInt::WordType expected[4] = {~APInt::WordType(0), 0xE, 0x1, 0x1};
-    APInt::WordType carry = APInt::tcDecrement(test, 4);
-    EXPECT_EQ(carry, APInt::WordType(0));
-    EXPECT_EQ(APInt::tcCompare(test, expected, 4), 0);
-  }
-
-  // 2 across word borrow, no out borrow.
-  {
-    APInt::WordType test[4] = {0x0, 0x0, 0xC, 0x1};
-    APInt::WordType expected[4] = {~APInt::WordType(0), ~APInt::WordType(0), 0xB, 0x1};
-    APInt::WordType carry = APInt::tcDecrement(test, 4);
-    EXPECT_EQ(carry, APInt::WordType(0));
-    EXPECT_EQ(APInt::tcCompare(test, expected, 4), 0);
-  }
-
-  // 3 across word borrow, no out borrow.
-  {
-    APInt::WordType test[4] = {0x0, 0x0, 0x0, 0x1};
-    APInt::WordType expected[4] = {~APInt::WordType(0), ~APInt::WordType(0), ~APInt::WordType(0), 0x0};
-    APInt::WordType carry = APInt::tcDecrement(test, 4);
-    EXPECT_EQ(carry, APInt::WordType(0));
-    EXPECT_EQ(APInt::tcCompare(test, expected, 4), 0);
-  }
-
-  // 3 across word borrow, with out borrow.
-  {
-    APInt::WordType test[4] = {0x0, 0x0, 0x0, 0x0};
-    APInt::WordType expected[4] = {~APInt::WordType(0), ~APInt::WordType(0), ~APInt::WordType(0), ~APInt::WordType(0)};
-    APInt::WordType carry = APInt::tcDecrement(test, 4);
-    EXPECT_EQ(carry, APInt::WordType(1));
-    EXPECT_EQ(APInt::tcCompare(test, expected, 4), 0);
-  }
-}
-
-TEST(APIntTest, arrayAccess) {
-  // Single word check.
-  uint64_t E1 = 0x2CA7F46BF6569915ULL;
-  APInt A1(64, E1);
-  for (unsigned i = 0, e = 64; i < e; ++i) {
-    EXPECT_EQ(bool(E1 & (1ULL << i)),
-              A1[i]);
-  }
-
-  // Multiword check.
-  APInt::WordType E2[4] = {
-    0xEB6EB136591CBA21ULL,
-    0x7B9358BD6A33F10AULL,
-    0x7E7FFA5EADD8846ULL,
-    0x305F341CA00B613DULL
-  };
-  APInt A2(APInt::APINT_BITS_PER_WORD*4, E2);
-  for (unsigned i = 0; i < 4; ++i) {
-    for (unsigned j = 0; j < APInt::APINT_BITS_PER_WORD; ++j) {
-      EXPECT_EQ(bool(E2[i] & (1ULL << j)),
-                A2[i*APInt::APINT_BITS_PER_WORD + j]);
-    }
-  }
-}
-
-TEST(APIntTest, LargeAPIntConstruction) {
-  // Check that we can properly construct very large APInt. It is very
-  // unlikely that people will ever do this, but it is a legal input,
-  // so we should not crash on it.
-  APInt A9(UINT32_MAX, 0);
-  EXPECT_FALSE(A9.getBoolValue());
-}
-
-TEST(APIntTest, nearestLogBase2) {
-  // Single word check.
-
-  // Test round up.
-  uint64_t I1 = 0x1800001;
-  APInt A1(64, I1);
-  EXPECT_EQ(A1.nearestLogBase2(), A1.ceilLogBase2());
-
-  // Test round down.
-  uint64_t I2 = 0x1000011;
-  APInt A2(64, I2);
-  EXPECT_EQ(A2.nearestLogBase2(), A2.logBase2());
-
-  // Test ties round up.
-  uint64_t I3 = 0x1800000;
-  APInt A3(64, I3);
-  EXPECT_EQ(A3.nearestLogBase2(), A3.ceilLogBase2());
-
-  // Multiple word check.
-
-  // Test round up.
-  APInt::WordType I4[4] = {0x0, 0xF, 0x18, 0x0};
-  APInt A4(APInt::APINT_BITS_PER_WORD*4, I4);
-  EXPECT_EQ(A4.nearestLogBase2(), A4.ceilLogBase2());
-
-  // Test round down.
-  APInt::WordType I5[4] = {0x0, 0xF, 0x10, 0x0};
-  APInt A5(APInt::APINT_BITS_PER_WORD*4, I5);
-  EXPECT_EQ(A5.nearestLogBase2(), A5.logBase2());
-
-  // Test ties round up.
-  uint64_t I6[4] = {0x0, 0x0, 0x0, 0x18};
-  APInt A6(APInt::APINT_BITS_PER_WORD*4, I6);
-  EXPECT_EQ(A6.nearestLogBase2(), A6.ceilLogBase2());
-
-  // Test BitWidth == 1 special cases.
-  APInt A7(1, 1);
-  EXPECT_EQ(A7.nearestLogBase2(), 0ULL);
-  APInt A8(1, 0);
-  EXPECT_EQ(A8.nearestLogBase2(), UINT32_MAX);
-
-  // Test the zero case when we have a bit width large enough such
-  // that the bit width is larger than UINT32_MAX-1.
-  APInt A9(UINT32_MAX, 0);
-  EXPECT_EQ(A9.nearestLogBase2(), UINT32_MAX);
-}
-
-TEST(APIntTest, IsSplat) {
-  APInt A(32, 0x01010101);
-  EXPECT_FALSE(A.isSplat(1));
-  EXPECT_FALSE(A.isSplat(2));
-  EXPECT_FALSE(A.isSplat(4));
-  EXPECT_TRUE(A.isSplat(8));
-  EXPECT_TRUE(A.isSplat(16));
-  EXPECT_TRUE(A.isSplat(32));
-
-  APInt B(24, 0xAAAAAA);
-  EXPECT_FALSE(B.isSplat(1));
-  EXPECT_TRUE(B.isSplat(2));
-  EXPECT_TRUE(B.isSplat(4));
-  EXPECT_TRUE(B.isSplat(8));
-  EXPECT_TRUE(B.isSplat(24));
-
-  APInt C(24, 0xABAAAB);
-  EXPECT_FALSE(C.isSplat(1));
-  EXPECT_FALSE(C.isSplat(2));
-  EXPECT_FALSE(C.isSplat(4));
-  EXPECT_FALSE(C.isSplat(8));
-  EXPECT_TRUE(C.isSplat(24));
-
-  APInt D(32, 0xABBAABBA);
-  EXPECT_FALSE(D.isSplat(1));
-  EXPECT_FALSE(D.isSplat(2));
-  EXPECT_FALSE(D.isSplat(4));
-  EXPECT_FALSE(D.isSplat(8));
-  EXPECT_TRUE(D.isSplat(16));
-  EXPECT_TRUE(D.isSplat(32));
-
-  APInt E(32, 0);
-  EXPECT_TRUE(E.isSplat(1));
-  EXPECT_TRUE(E.isSplat(2));
-  EXPECT_TRUE(E.isSplat(4));
-  EXPECT_TRUE(E.isSplat(8));
-  EXPECT_TRUE(E.isSplat(16));
-  EXPECT_TRUE(E.isSplat(32));
-}
-
-TEST(APIntTest, isMask) {
-  EXPECT_FALSE(APInt(32, 0x01010101).isMask());
-  EXPECT_FALSE(APInt(32, 0xf0000000).isMask());
-  EXPECT_FALSE(APInt(32, 0xffff0000).isMask());
-  EXPECT_FALSE(APInt(32, 0xff << 1).isMask());
-
-  for (int N : { 1, 2, 3, 4, 7, 8, 16, 32, 64, 127, 128, 129, 256 }) {
-    EXPECT_FALSE(APInt(N, 0).isMask());
-
-    APInt One(N, 1);
-    for (int I = 1; I <= N; ++I) {
-      APInt MaskVal = One.shl(I) - 1;
-      EXPECT_TRUE(MaskVal.isMask());
-      EXPECT_TRUE(MaskVal.isMask(I));
-    }
-  }
-}
-
-TEST(APIntTest, isShiftedMask) {
-  EXPECT_FALSE(APInt(32, 0x01010101).isShiftedMask());
-  EXPECT_TRUE(APInt(32, 0xf0000000).isShiftedMask());
-  EXPECT_TRUE(APInt(32, 0xffff0000).isShiftedMask());
-  EXPECT_TRUE(APInt(32, 0xff << 1).isShiftedMask());
-
-  for (int N : { 1, 2, 3, 4, 7, 8, 16, 32, 64, 127, 128, 129, 256 }) {
-    EXPECT_FALSE(APInt(N, 0).isShiftedMask());
-
-    APInt One(N, 1);
-    for (int I = 1; I < N; ++I) {
-      APInt MaskVal = One.shl(I) - 1;
-      EXPECT_TRUE(MaskVal.isShiftedMask());
-    }
-    for (int I = 1; I < N - 1; ++I) {
-      APInt MaskVal = One.shl(I);
-      EXPECT_TRUE(MaskVal.isShiftedMask());
-    }
-    for (int I = 1; I < N; ++I) {
-      APInt MaskVal = APInt::getHighBitsSet(N, I);
-      EXPECT_TRUE(MaskVal.isShiftedMask());
-    }
-  }
-}
-
-// Test that self-move works with EXPENSIVE_CHECKS. It calls std::shuffle which
-// does self-move on some platforms.
-#ifdef EXPENSIVE_CHECKS
-#if defined(__clang__)
-// Disable the pragma warning from versions of Clang without -Wself-move
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunknown-pragmas"
-// Disable the warning that triggers on exactly what is being tested.
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wself-move"
-#endif
-TEST(APIntTest, SelfMoveAssignment) {
-  APInt X(32, 0xdeadbeef);
-  X = std::move(X);
-  EXPECT_EQ(32u, X.getBitWidth());
-  EXPECT_EQ(0xdeadbeefULL, X.getLimitedValue());
-
-  uint64_t Bits[] = {0xdeadbeefdeadbeefULL, 0xdeadbeefdeadbeefULL};
-  APInt Y(128, Bits);
-  Y = std::move(Y);
-  EXPECT_EQ(128u, Y.getBitWidth());
-  EXPECT_EQ(~0ULL, Y.getLimitedValue());
-  const uint64_t *Raw = Y.getRawData();
-  EXPECT_EQ(2u, Y.getNumWords());
-  EXPECT_EQ(0xdeadbeefdeadbeefULL, Raw[0]);
-  EXPECT_EQ(0xdeadbeefdeadbeefULL, Raw[1]);
-}
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#pragma clang diagnostic pop
-#endif
-#endif // EXPENSIVE_CHECKS
-
-TEST(APIntTest, byteSwap) {
-  EXPECT_EQ(0x00000000, APInt(16, 0x0000).byteSwap());
-  EXPECT_EQ(0x0000010f, APInt(16, 0x0f01).byteSwap());
-  EXPECT_EQ(0x00ff8000, APInt(24, 0x0080ff).byteSwap());
-  EXPECT_EQ(0x117700ff, APInt(32, 0xff007711).byteSwap());
-  EXPECT_EQ(0x228811aaffULL, APInt(40, 0xffaa118822ULL).byteSwap());
-  EXPECT_EQ(0x050403020100ULL, APInt(48, 0x000102030405ULL).byteSwap());
-  EXPECT_EQ(0xff050403020100ULL, APInt(56, 0x000102030405ffULL).byteSwap());
-  EXPECT_EQ(0xff050403020100aaULL, APInt(64, 0xaa000102030405ffULL).byteSwap());
-
-  for (unsigned N : {16, 24, 32, 48, 56, 64, 72, 80, 96, 112, 128, 248, 256,
-                     1024, 1032, 1040}) {
-    for (unsigned I = 0; I < N; I += 8) {
-      APInt X = APInt::getBitsSet(N, I, I + 8);
-      APInt Y = APInt::getBitsSet(N, N - I - 8, N - I);
-      EXPECT_EQ(Y, X.byteSwap());
-      EXPECT_EQ(X, Y.byteSwap());
-    }
-  }
-}
-
-TEST(APIntTest, reverseBits) {
-  EXPECT_EQ(1, APInt(1, 1).reverseBits());
-  EXPECT_EQ(0, APInt(1, 0).reverseBits());
-
-  EXPECT_EQ(3, APInt(2, 3).reverseBits());
-  EXPECT_EQ(3, APInt(2, 3).reverseBits());
-
-  EXPECT_EQ(0xb, APInt(4, 0xd).reverseBits());
-  EXPECT_EQ(0xd, APInt(4, 0xb).reverseBits());
-  EXPECT_EQ(0xf, APInt(4, 0xf).reverseBits());
-
-  EXPECT_EQ(0x30, APInt(7, 0x6).reverseBits());
-  EXPECT_EQ(0x5a, APInt(7, 0x2d).reverseBits());
-
-  EXPECT_EQ(0x0f, APInt(8, 0xf0).reverseBits());
-  EXPECT_EQ(0xf0, APInt(8, 0x0f).reverseBits());
-
-  EXPECT_EQ(0x0f0f, APInt(16, 0xf0f0).reverseBits());
-  EXPECT_EQ(0xf0f0, APInt(16, 0x0f0f).reverseBits());
-
-  EXPECT_EQ(0x0f0f0f0f, APInt(32, 0xf0f0f0f0).reverseBits());
-  EXPECT_EQ(0xf0f0f0f0, APInt(32, 0x0f0f0f0f).reverseBits());
-
-  EXPECT_EQ(0x402880a0 >> 1, APInt(31, 0x05011402).reverseBits());
-
-  EXPECT_EQ(0x0f0f0f0f, APInt(32, 0xf0f0f0f0).reverseBits());
-  EXPECT_EQ(0xf0f0f0f0, APInt(32, 0x0f0f0f0f).reverseBits());
-
-  EXPECT_EQ(0x0f0f0f0f0f0f0f0f, APInt(64, 0xf0f0f0f0f0f0f0f0).reverseBits());
-  EXPECT_EQ(0xf0f0f0f0f0f0f0f0, APInt(64, 0x0f0f0f0f0f0f0f0f).reverseBits());
-
-  for (unsigned N : { 1, 8, 16, 24, 31, 32, 33,
-                      63, 64, 65, 127, 128, 257, 1024 }) {
-    for (unsigned I = 0; I < N; ++I) {
-      APInt X = APInt::getOneBitSet(N, I);
-      APInt Y = APInt::getOneBitSet(N, N - (I + 1));
-      EXPECT_EQ(Y, X.reverseBits());
-      EXPECT_EQ(X, Y.reverseBits());
-    }
-  }
-}
-
-TEST(APIntTest, insertBits) {
-  APInt iSrc(31, 0x00123456);
-
-  // Direct copy.
-  APInt i31(31, 0x76543210ull);
-  i31.insertBits(iSrc, 0);
-  EXPECT_EQ(static_cast<int64_t>(0x00123456ull), i31.getSExtValue());
-
-  // Single word src/dst insertion.
-  APInt i63(63, 0x01234567FFFFFFFFull);
-  i63.insertBits(iSrc, 4);
-  EXPECT_EQ(static_cast<int64_t>(0x012345600123456Full), i63.getSExtValue());
-
-  // Insert single word src into one word of dst.
-  APInt i120(120, UINT64_MAX, true);
-  i120.insertBits(iSrc, 8);
-  EXPECT_EQ(static_cast<int64_t>(0xFFFFFF80123456FFull), i120.getSExtValue());
-
-  // Insert single word src into two words of dst.
-  APInt i127(127, UINT64_MAX, true);
-  i127.insertBits(iSrc, 48);
-  EXPECT_EQ(i127.extractBits(64, 0).getZExtValue(), 0x3456FFFFFFFFFFFFull);
-  EXPECT_EQ(i127.extractBits(63, 64).getZExtValue(), 0x7FFFFFFFFFFF8012ull);
-
-  // Insert on word boundaries.
-  APInt i128(128, 0);
-  i128.insertBits(APInt(64, UINT64_MAX, true), 0);
-  i128.insertBits(APInt(64, UINT64_MAX, true), 64);
-  EXPECT_EQ(-1, i128.getSExtValue());
-
-  APInt i256(256, UINT64_MAX, true);
-  i256.insertBits(APInt(65, 0), 0);
-  i256.insertBits(APInt(69, 0), 64);
-  i256.insertBits(APInt(128, 0), 128);
-  EXPECT_EQ(0u, i256.getSExtValue());
-
-  APInt i257(257, 0);
-  i257.insertBits(APInt(96, UINT64_MAX, true), 64);
-  EXPECT_EQ(i257.extractBits(64, 0).getZExtValue(), 0x0000000000000000ull);
-  EXPECT_EQ(i257.extractBits(64, 64).getZExtValue(), 0xFFFFFFFFFFFFFFFFull);
-  EXPECT_EQ(i257.extractBits(64, 128).getZExtValue(), 0x00000000FFFFFFFFull);
-  EXPECT_EQ(i257.extractBits(65, 192).getZExtValue(), 0x0000000000000000ull);
-
-  // General insertion.
-  APInt i260(260, UINT64_MAX, true);
-  i260.insertBits(APInt(129, 1ull << 48), 15);
-  EXPECT_EQ(i260.extractBits(64, 0).getZExtValue(), 0x8000000000007FFFull);
-  EXPECT_EQ(i260.extractBits(64, 64).getZExtValue(), 0x0000000000000000ull);
-  EXPECT_EQ(i260.extractBits(64, 128).getZExtValue(), 0xFFFFFFFFFFFF0000ull);
-  EXPECT_EQ(i260.extractBits(64, 192).getZExtValue(), 0xFFFFFFFFFFFFFFFFull);
-  EXPECT_EQ(i260.extractBits(4, 256).getZExtValue(), 0x000000000000000Full);
-}
-
-TEST(APIntTest, insertBitsUInt64) {
-  // Tests cloned from insertBits but adapted to the numBits <= 64 constraint
-  uint64_t iSrc = 0x00123456;
-
-  // Direct copy.
-  APInt i31(31, 0x76543210ull);
-  i31.insertBits(iSrc, 0, 31);
-  EXPECT_EQ(static_cast<int64_t>(0x00123456ull), i31.getSExtValue());
-
-  // Single word src/dst insertion.
-  APInt i63(63, 0x01234567FFFFFFFFull);
-  i63.insertBits(iSrc, 4, 31);
-  EXPECT_EQ(static_cast<int64_t>(0x012345600123456Full), i63.getSExtValue());
-
-  // Insert single word src into one word of dst.
-  APInt i120(120, UINT64_MAX, true);
-  i120.insertBits(iSrc, 8, 31);
-  EXPECT_EQ(static_cast<int64_t>(0xFFFFFF80123456FFull), i120.getSExtValue());
-
-  // Insert single word src into two words of dst.
-  APInt i127(127, UINT64_MAX, true);
-  i127.insertBits(iSrc, 48, 31);
-  EXPECT_EQ(i127.extractBits(64, 0).getZExtValue(), 0x3456FFFFFFFFFFFFull);
-  EXPECT_EQ(i127.extractBits(63, 64).getZExtValue(), 0x7FFFFFFFFFFF8012ull);
-
-  // Insert on word boundaries.
-  APInt i128(128, 0);
-  i128.insertBits(UINT64_MAX, 0, 64);
-  i128.insertBits(UINT64_MAX, 64, 64);
-  EXPECT_EQ(-1, i128.getSExtValue());
-
-  APInt i256(256, UINT64_MAX, true);
-  i256.insertBits(0, 0, 64);
-  i256.insertBits(0, 64, 1);
-  i256.insertBits(0, 64, 64);
-  i256.insertBits(0, 128, 5);
-  i256.insertBits(0, 128, 64);
-  i256.insertBits(0, 192, 64);
-  EXPECT_EQ(0u, i256.getSExtValue());
-
-  APInt i257(257, 0);
-  i257.insertBits(APInt(96, UINT64_MAX, true), 64);
-  EXPECT_EQ(i257.extractBitsAsZExtValue(64, 0), 0x0000000000000000ull);
-  EXPECT_EQ(i257.extractBitsAsZExtValue(64, 64), 0xFFFFFFFFFFFFFFFFull);
-  EXPECT_EQ(i257.extractBitsAsZExtValue(64, 128), 0x00000000FFFFFFFFull);
-  EXPECT_EQ(i257.extractBitsAsZExtValue(64, 192), 0x0000000000000000ull);
-  EXPECT_EQ(i257.extractBitsAsZExtValue(1, 256), 0x0000000000000000ull);
-
-  // General insertion.
-  APInt i260(260, UINT64_MAX, true);
-  i260.insertBits(APInt(129, 1ull << 48), 15);
-  EXPECT_EQ(i260.extractBitsAsZExtValue(64, 0), 0x8000000000007FFFull);
-  EXPECT_EQ(i260.extractBitsAsZExtValue(64, 64), 0x0000000000000000ull);
-  EXPECT_EQ(i260.extractBitsAsZExtValue(64, 128), 0xFFFFFFFFFFFF0000ull);
-  EXPECT_EQ(i260.extractBitsAsZExtValue(64, 192), 0xFFFFFFFFFFFFFFFFull);
-  EXPECT_EQ(i260.extractBitsAsZExtValue(4, 256), 0x000000000000000Full);
-}
-
-TEST(APIntTest, extractBits) {
-  APInt i32(32, 0x1234567);
-  EXPECT_EQ(0x3456, i32.extractBits(16, 4));
-
-  APInt i64(64, 0x01234567FFFFFFFFull);
-  EXPECT_EQ(0xFFFFFFFF, i64.extractBits(32, 0));
-  EXPECT_EQ(0xFFFFFFFF, i64.trunc(32));
-  EXPECT_EQ(0x01234567, i64.extractBits(32, 32));
-  EXPECT_EQ(0x01234567, i64.lshr(32).trunc(32));
-
-  APInt i257(257, 0xFFFFFFFFFF0000FFull, true);
-  EXPECT_EQ(0xFFu, i257.extractBits(16, 0));
-  EXPECT_EQ(0xFFu, i257.lshr(0).trunc(16));
-  EXPECT_EQ((0xFFu >> 1), i257.extractBits(16, 1));
-  EXPECT_EQ((0xFFu >> 1), i257.lshr(1).trunc(16));
-  EXPECT_EQ(-1, i257.extractBits(32, 64).getSExtValue());
-  EXPECT_EQ(-1, i257.lshr(64).trunc(32).getSExtValue());
-  EXPECT_EQ(-1, i257.extractBits(128, 128).getSExtValue());
-  EXPECT_EQ(-1, i257.lshr(128).trunc(128).getSExtValue());
-  EXPECT_EQ(-1, i257.extractBits(66, 191).getSExtValue());
-  EXPECT_EQ(-1, i257.lshr(191).trunc(66).getSExtValue());
-  EXPECT_EQ(static_cast<int64_t>(0xFFFFFFFFFF80007Full),
-            i257.extractBits(128, 1).getSExtValue());
-  EXPECT_EQ(static_cast<int64_t>(0xFFFFFFFFFF80007Full),
-            i257.lshr(1).trunc(128).getSExtValue());
-  EXPECT_EQ(static_cast<int64_t>(0xFFFFFFFFFF80007Full),
-            i257.extractBits(129, 1).getSExtValue());
-  EXPECT_EQ(static_cast<int64_t>(0xFFFFFFFFFF80007Full),
-            i257.lshr(1).trunc(129).getSExtValue());
-
-  EXPECT_EQ(APInt(48, 0),
-            APInt(144, "281474976710655", 10).extractBits(48, 48));
-  EXPECT_EQ(APInt(48, 0),
-            APInt(144, "281474976710655", 10).lshr(48).trunc(48));
-  EXPECT_EQ(APInt(48, 0x0000ffffffffffffull),
-            APInt(144, "281474976710655", 10).extractBits(48, 0));
-  EXPECT_EQ(APInt(48, 0x0000ffffffffffffull),
-            APInt(144, "281474976710655", 10).lshr(0).trunc(48));
-  EXPECT_EQ(APInt(48, 0x00007fffffffffffull),
-            APInt(144, "281474976710655", 10).extractBits(48, 1));
-  EXPECT_EQ(APInt(48, 0x00007fffffffffffull),
-            APInt(144, "281474976710655", 10).lshr(1).trunc(48));
-}
-
-TEST(APIntTest, extractBitsAsZExtValue) {
-  // Tests based on extractBits
-  APInt i32(32, 0x1234567);
-  EXPECT_EQ(0x3456u, i32.extractBitsAsZExtValue(16, 4));
-
-  APInt i257(257, 0xFFFFFFFFFF0000FFull, true);
-  EXPECT_EQ(0xFFu, i257.extractBitsAsZExtValue(16, 0));
-  EXPECT_EQ((0xFFu >> 1), i257.extractBitsAsZExtValue(16, 1));
-  EXPECT_EQ(0xFFFFFFFFull, i257.extractBitsAsZExtValue(32, 64));
-  EXPECT_EQ(0xFFFFFFFFFFFFFFFFull, i257.extractBitsAsZExtValue(64, 128));
-  EXPECT_EQ(0xFFFFFFFFFFFFFFFFull, i257.extractBitsAsZExtValue(64, 192));
-  EXPECT_EQ(0xFFFFFFFFFFFFFFFFull, i257.extractBitsAsZExtValue(64, 191));
-  EXPECT_EQ(0x3u, i257.extractBitsAsZExtValue(2, 255));
-  EXPECT_EQ(0xFFFFFFFFFF80007Full, i257.extractBitsAsZExtValue(64, 1));
-  EXPECT_EQ(0xFFFFFFFFFFFFFFFFull, i257.extractBitsAsZExtValue(64, 65));
-  EXPECT_EQ(0xFFFFFFFFFF80007Full, i257.extractBitsAsZExtValue(64, 1));
-  EXPECT_EQ(0xFFFFFFFFFFFFFFFFull, i257.extractBitsAsZExtValue(64, 65));
-  EXPECT_EQ(0x1ull, i257.extractBitsAsZExtValue(1, 129));
-
-  EXPECT_EQ(APInt(48, 0),
-            APInt(144, "281474976710655", 10).extractBitsAsZExtValue(48, 48));
-  EXPECT_EQ(APInt(48, 0x0000ffffffffffffull),
-            APInt(144, "281474976710655", 10).extractBitsAsZExtValue(48, 0));
-  EXPECT_EQ(APInt(48, 0x00007fffffffffffull),
-            APInt(144, "281474976710655", 10).extractBitsAsZExtValue(48, 1));
-}
-
-TEST(APIntTest, getLowBitsSet) {
-  APInt i128lo64 = APInt::getLowBitsSet(128, 64);
-  EXPECT_EQ(0u, i128lo64.countLeadingOnes());
-  EXPECT_EQ(64u, i128lo64.countLeadingZeros());
-  EXPECT_EQ(64u, i128lo64.getActiveBits());
-  EXPECT_EQ(0u, i128lo64.countTrailingZeros());
-  EXPECT_EQ(64u, i128lo64.countTrailingOnes());
-  EXPECT_EQ(64u, i128lo64.countPopulation());
-}
-
-TEST(APIntTest, getBitsSet) {
-  APInt i64hi1lo1 = APInt::getBitsSet(64, 1, 63);
-  EXPECT_EQ(0u, i64hi1lo1.countLeadingOnes());
-  EXPECT_EQ(1u, i64hi1lo1.countLeadingZeros());
-  EXPECT_EQ(63u, i64hi1lo1.getActiveBits());
-  EXPECT_EQ(1u, i64hi1lo1.countTrailingZeros());
-  EXPECT_EQ(0u, i64hi1lo1.countTrailingOnes());
-  EXPECT_EQ(62u, i64hi1lo1.countPopulation());
-
-  APInt i127hi1lo1 = APInt::getBitsSet(127, 1, 126);
-  EXPECT_EQ(0u, i127hi1lo1.countLeadingOnes());
-  EXPECT_EQ(1u, i127hi1lo1.countLeadingZeros());
-  EXPECT_EQ(126u, i127hi1lo1.getActiveBits());
-  EXPECT_EQ(1u, i127hi1lo1.countTrailingZeros());
-  EXPECT_EQ(0u, i127hi1lo1.countTrailingOnes());
-  EXPECT_EQ(125u, i127hi1lo1.countPopulation());
-}
-
-TEST(APIntTest, getBitsSetWithWrap) {
-  APInt i64hi1lo1 = APInt::getBitsSetWithWrap(64, 1, 63);
-  EXPECT_EQ(0u, i64hi1lo1.countLeadingOnes());
-  EXPECT_EQ(1u, i64hi1lo1.countLeadingZeros());
-  EXPECT_EQ(63u, i64hi1lo1.getActiveBits());
-  EXPECT_EQ(1u, i64hi1lo1.countTrailingZeros());
-  EXPECT_EQ(0u, i64hi1lo1.countTrailingOnes());
-  EXPECT_EQ(62u, i64hi1lo1.countPopulation());
-
-  APInt i127hi1lo1 = APInt::getBitsSetWithWrap(127, 1, 126);
-  EXPECT_EQ(0u, i127hi1lo1.countLeadingOnes());
-  EXPECT_EQ(1u, i127hi1lo1.countLeadingZeros());
-  EXPECT_EQ(126u, i127hi1lo1.getActiveBits());
-  EXPECT_EQ(1u, i127hi1lo1.countTrailingZeros());
-  EXPECT_EQ(0u, i127hi1lo1.countTrailingOnes());
-  EXPECT_EQ(125u, i127hi1lo1.countPopulation());
-
-  APInt i64hi1lo1wrap = APInt::getBitsSetWithWrap(64, 63, 1);
-  EXPECT_EQ(1u, i64hi1lo1wrap.countLeadingOnes());
-  EXPECT_EQ(0u, i64hi1lo1wrap.countLeadingZeros());
-  EXPECT_EQ(64u, i64hi1lo1wrap.getActiveBits());
-  EXPECT_EQ(0u, i64hi1lo1wrap.countTrailingZeros());
-  EXPECT_EQ(1u, i64hi1lo1wrap.countTrailingOnes());
-  EXPECT_EQ(2u, i64hi1lo1wrap.countPopulation());
-
-  APInt i127hi1lo1wrap = APInt::getBitsSetWithWrap(127, 126, 1);
-  EXPECT_EQ(1u, i127hi1lo1wrap.countLeadingOnes());
-  EXPECT_EQ(0u, i127hi1lo1wrap.countLeadingZeros());
-  EXPECT_EQ(127u, i127hi1lo1wrap.getActiveBits());
-  EXPECT_EQ(0u, i127hi1lo1wrap.countTrailingZeros());
-  EXPECT_EQ(1u, i127hi1lo1wrap.countTrailingOnes());
-  EXPECT_EQ(2u, i127hi1lo1wrap.countPopulation());
-
-  APInt i32hiequallowrap = APInt::getBitsSetWithWrap(32, 10, 10);
-  EXPECT_EQ(32u, i32hiequallowrap.countLeadingOnes());
-  EXPECT_EQ(0u, i32hiequallowrap.countLeadingZeros());
-  EXPECT_EQ(32u, i32hiequallowrap.getActiveBits());
-  EXPECT_EQ(0u, i32hiequallowrap.countTrailingZeros());
-  EXPECT_EQ(32u, i32hiequallowrap.countTrailingOnes());
-  EXPECT_EQ(32u, i32hiequallowrap.countPopulation());
-}
-
-TEST(APIntTest, getHighBitsSet) {
-  APInt i64hi32 = APInt::getHighBitsSet(64, 32);
-  EXPECT_EQ(32u, i64hi32.countLeadingOnes());
-  EXPECT_EQ(0u, i64hi32.countLeadingZeros());
-  EXPECT_EQ(64u, i64hi32.getActiveBits());
-  EXPECT_EQ(32u, i64hi32.countTrailingZeros());
-  EXPECT_EQ(0u, i64hi32.countTrailingOnes());
-  EXPECT_EQ(32u, i64hi32.countPopulation());
-}
-
-TEST(APIntTest, getBitsSetFrom) {
-  APInt i64hi31 = APInt::getBitsSetFrom(64, 33);
-  EXPECT_EQ(31u, i64hi31.countLeadingOnes());
-  EXPECT_EQ(0u, i64hi31.countLeadingZeros());
-  EXPECT_EQ(64u, i64hi31.getActiveBits());
-  EXPECT_EQ(33u, i64hi31.countTrailingZeros());
-  EXPECT_EQ(0u, i64hi31.countTrailingOnes());
-  EXPECT_EQ(31u, i64hi31.countPopulation());
-}
-
-TEST(APIntTest, setLowBits) {
-  APInt i64lo32(64, 0);
-  i64lo32.setLowBits(32);
-  EXPECT_EQ(0u, i64lo32.countLeadingOnes());
-  EXPECT_EQ(32u, i64lo32.countLeadingZeros());
-  EXPECT_EQ(32u, i64lo32.getActiveBits());
-  EXPECT_EQ(0u, i64lo32.countTrailingZeros());
-  EXPECT_EQ(32u, i64lo32.countTrailingOnes());
-  EXPECT_EQ(32u, i64lo32.countPopulation());
-
-  APInt i128lo64(128, 0);
-  i128lo64.setLowBits(64);
-  EXPECT_EQ(0u, i128lo64.countLeadingOnes());
-  EXPECT_EQ(64u, i128lo64.countLeadingZeros());
-  EXPECT_EQ(64u, i128lo64.getActiveBits());
-  EXPECT_EQ(0u, i128lo64.countTrailingZeros());
-  EXPECT_EQ(64u, i128lo64.countTrailingOnes());
-  EXPECT_EQ(64u, i128lo64.countPopulation());
-
-  APInt i128lo24(128, 0);
-  i128lo24.setLowBits(24);
-  EXPECT_EQ(0u, i128lo24.countLeadingOnes());
-  EXPECT_EQ(104u, i128lo24.countLeadingZeros());
-  EXPECT_EQ(24u, i128lo24.getActiveBits());
-  EXPECT_EQ(0u, i128lo24.countTrailingZeros());
-  EXPECT_EQ(24u, i128lo24.countTrailingOnes());
-  EXPECT_EQ(24u, i128lo24.countPopulation());
-
-  APInt i128lo104(128, 0);
-  i128lo104.setLowBits(104);
-  EXPECT_EQ(0u, i128lo104.countLeadingOnes());
-  EXPECT_EQ(24u, i128lo104.countLeadingZeros());
-  EXPECT_EQ(104u, i128lo104.getActiveBits());
-  EXPECT_EQ(0u, i128lo104.countTrailingZeros());
-  EXPECT_EQ(104u, i128lo104.countTrailingOnes());
-  EXPECT_EQ(104u, i128lo104.countPopulation());
-
-  APInt i128lo0(128, 0);
-  i128lo0.setLowBits(0);
-  EXPECT_EQ(0u, i128lo0.countLeadingOnes());
-  EXPECT_EQ(128u, i128lo0.countLeadingZeros());
-  EXPECT_EQ(0u, i128lo0.getActiveBits());
-  EXPECT_EQ(128u, i128lo0.countTrailingZeros());
-  EXPECT_EQ(0u, i128lo0.countTrailingOnes());
-  EXPECT_EQ(0u, i128lo0.countPopulation());
-
-  APInt i80lo79(80, 0);
-  i80lo79.setLowBits(79);
-  EXPECT_EQ(0u, i80lo79.countLeadingOnes());
-  EXPECT_EQ(1u, i80lo79.countLeadingZeros());
-  EXPECT_EQ(79u, i80lo79.getActiveBits());
-  EXPECT_EQ(0u, i80lo79.countTrailingZeros());
-  EXPECT_EQ(79u, i80lo79.countTrailingOnes());
-  EXPECT_EQ(79u, i80lo79.countPopulation());
-}
-
-TEST(APIntTest, setHighBits) {
-  APInt i64hi32(64, 0);
-  i64hi32.setHighBits(32);
-  EXPECT_EQ(32u, i64hi32.countLeadingOnes());
-  EXPECT_EQ(0u, i64hi32.countLeadingZeros());
-  EXPECT_EQ(64u, i64hi32.getActiveBits());
-  EXPECT_EQ(32u, i64hi32.countTrailingZeros());
-  EXPECT_EQ(0u, i64hi32.countTrailingOnes());
-  EXPECT_EQ(32u, i64hi32.countPopulation());
-
-  APInt i128hi64(128, 0);
-  i128hi64.setHighBits(64);
-  EXPECT_EQ(64u, i128hi64.countLeadingOnes());
-  EXPECT_EQ(0u, i128hi64.countLeadingZeros());
-  EXPECT_EQ(128u, i128hi64.getActiveBits());
-  EXPECT_EQ(64u, i128hi64.countTrailingZeros());
-  EXPECT_EQ(0u, i128hi64.countTrailingOnes());
-  EXPECT_EQ(64u, i128hi64.countPopulation());
-
-  APInt i128hi24(128, 0);
-  i128hi24.setHighBits(24);
-  EXPECT_EQ(24u, i128hi24.countLeadingOnes());
-  EXPECT_EQ(0u, i128hi24.countLeadingZeros());
-  EXPECT_EQ(128u, i128hi24.getActiveBits());
-  EXPECT_EQ(104u, i128hi24.countTrailingZeros());
-  EXPECT_EQ(0u, i128hi24.countTrailingOnes());
-  EXPECT_EQ(24u, i128hi24.countPopulation());
-
-  APInt i128hi104(128, 0);
-  i128hi104.setHighBits(104);
-  EXPECT_EQ(104u, i128hi104.countLeadingOnes());
-  EXPECT_EQ(0u, i128hi104.countLeadingZeros());
-  EXPECT_EQ(128u, i128hi104.getActiveBits());
-  EXPECT_EQ(24u, i128hi104.countTrailingZeros());
-  EXPECT_EQ(0u, i128hi104.countTrailingOnes());
-  EXPECT_EQ(104u, i128hi104.countPopulation());
-
-  APInt i128hi0(128, 0);
-  i128hi0.setHighBits(0);
-  EXPECT_EQ(0u, i128hi0.countLeadingOnes());
-  EXPECT_EQ(128u, i128hi0.countLeadingZeros());
-  EXPECT_EQ(0u, i128hi0.getActiveBits());
-  EXPECT_EQ(128u, i128hi0.countTrailingZeros());
-  EXPECT_EQ(0u, i128hi0.countTrailingOnes());
-  EXPECT_EQ(0u, i128hi0.countPopulation());
-
-  APInt i80hi1(80, 0);
-  i80hi1.setHighBits(1);
-  EXPECT_EQ(1u, i80hi1.countLeadingOnes());
-  EXPECT_EQ(0u, i80hi1.countLeadingZeros());
-  EXPECT_EQ(80u, i80hi1.getActiveBits());
-  EXPECT_EQ(79u, i80hi1.countTrailingZeros());
-  EXPECT_EQ(0u, i80hi1.countTrailingOnes());
-  EXPECT_EQ(1u, i80hi1.countPopulation());
-
-  APInt i32hi16(32, 0);
-  i32hi16.setHighBits(16);
-  EXPECT_EQ(16u, i32hi16.countLeadingOnes());
-  EXPECT_EQ(0u, i32hi16.countLeadingZeros());
-  EXPECT_EQ(32u, i32hi16.getActiveBits());
-  EXPECT_EQ(16u, i32hi16.countTrailingZeros());
-  EXPECT_EQ(0u, i32hi16.countTrailingOnes());
-  EXPECT_EQ(16u, i32hi16.countPopulation());
-}
-
-TEST(APIntTest, setBitsFrom) {
-  APInt i64from63(64, 0);
-  i64from63.setBitsFrom(63);
-  EXPECT_EQ(1u, i64from63.countLeadingOnes());
-  EXPECT_EQ(0u, i64from63.countLeadingZeros());
-  EXPECT_EQ(64u, i64from63.getActiveBits());
-  EXPECT_EQ(63u, i64from63.countTrailingZeros());
-  EXPECT_EQ(0u, i64from63.countTrailingOnes());
-  EXPECT_EQ(1u, i64from63.countPopulation());
-}
-
-TEST(APIntTest, setAllBits) {
-  APInt i32(32, 0);
-  i32.setAllBits();
-  EXPECT_EQ(32u, i32.countLeadingOnes());
-  EXPECT_EQ(0u, i32.countLeadingZeros());
-  EXPECT_EQ(32u, i32.getActiveBits());
-  EXPECT_EQ(0u, i32.countTrailingZeros());
-  EXPECT_EQ(32u, i32.countTrailingOnes());
-  EXPECT_EQ(32u, i32.countPopulation());
-
-  APInt i64(64, 0);
-  i64.setAllBits();
-  EXPECT_EQ(64u, i64.countLeadingOnes());
-  EXPECT_EQ(0u, i64.countLeadingZeros());
-  EXPECT_EQ(64u, i64.getActiveBits());
-  EXPECT_EQ(0u, i64.countTrailingZeros());
-  EXPECT_EQ(64u, i64.countTrailingOnes());
-  EXPECT_EQ(64u, i64.countPopulation());
-
-  APInt i96(96, 0);
-  i96.setAllBits();
-  EXPECT_EQ(96u, i96.countLeadingOnes());
-  EXPECT_EQ(0u, i96.countLeadingZeros());
-  EXPECT_EQ(96u, i96.getActiveBits());
-  EXPECT_EQ(0u, i96.countTrailingZeros());
-  EXPECT_EQ(96u, i96.countTrailingOnes());
-  EXPECT_EQ(96u, i96.countPopulation());
-
-  APInt i128(128, 0);
-  i128.setAllBits();
-  EXPECT_EQ(128u, i128.countLeadingOnes());
-  EXPECT_EQ(0u, i128.countLeadingZeros());
-  EXPECT_EQ(128u, i128.getActiveBits());
-  EXPECT_EQ(0u, i128.countTrailingZeros());
-  EXPECT_EQ(128u, i128.countTrailingOnes());
-  EXPECT_EQ(128u, i128.countPopulation());
-}
-
-TEST(APIntTest, getLoBits) {
-  APInt i32(32, 0xfa);
-  i32.setHighBits(1);
-  EXPECT_EQ(0xa, i32.getLoBits(4));
-  APInt i128(128, 0xfa);
-  i128.setHighBits(1);
-  EXPECT_EQ(0xa, i128.getLoBits(4));
-}
-
-TEST(APIntTest, getHiBits) {
-  APInt i32(32, 0xfa);
-  i32.setHighBits(2);
-  EXPECT_EQ(0xc, i32.getHiBits(4));
-  APInt i128(128, 0xfa);
-  i128.setHighBits(2);
-  EXPECT_EQ(0xc, i128.getHiBits(4));
-}
-
-TEST(APIntTest, clearLowBits) {
-  APInt i64hi32 = APInt::getAllOnesValue(64);
-  i64hi32.clearLowBits(32);
-  EXPECT_EQ(32u, i64hi32.countLeadingOnes());
-  EXPECT_EQ(0u, i64hi32.countLeadingZeros());
-  EXPECT_EQ(64u, i64hi32.getActiveBits());
-  EXPECT_EQ(32u, i64hi32.countTrailingZeros());
-  EXPECT_EQ(0u, i64hi32.countTrailingOnes());
-  EXPECT_EQ(32u, i64hi32.countPopulation());
-
-  APInt i128hi64 = APInt::getAllOnesValue(128);
-  i128hi64.clearLowBits(64);
-  EXPECT_EQ(64u, i128hi64.countLeadingOnes());
-  EXPECT_EQ(0u, i128hi64.countLeadingZeros());
-  EXPECT_EQ(128u, i128hi64.getActiveBits());
-  EXPECT_EQ(64u, i128hi64.countTrailingZeros());
-  EXPECT_EQ(0u, i128hi64.countTrailingOnes());
-  EXPECT_EQ(64u, i128hi64.countPopulation());
-
-  APInt i128hi24 = APInt::getAllOnesValue(128);
-  i128hi24.clearLowBits(104);
-  EXPECT_EQ(24u, i128hi24.countLeadingOnes());
-  EXPECT_EQ(0u, i128hi24.countLeadingZeros());
-  EXPECT_EQ(128u, i128hi24.getActiveBits());
-  EXPECT_EQ(104u, i128hi24.countTrailingZeros());
-  EXPECT_EQ(0u, i128hi24.countTrailingOnes());
-  EXPECT_EQ(24u, i128hi24.countPopulation());
-
-  APInt i128hi104 = APInt::getAllOnesValue(128);
-  i128hi104.clearLowBits(24);
-  EXPECT_EQ(104u, i128hi104.countLeadingOnes());
-  EXPECT_EQ(0u, i128hi104.countLeadingZeros());
-  EXPECT_EQ(128u, i128hi104.getActiveBits());
-  EXPECT_EQ(24u, i128hi104.countTrailingZeros());
-  EXPECT_EQ(0u, i128hi104.countTrailingOnes());
-  EXPECT_EQ(104u, i128hi104.countPopulation());
-
-  APInt i128hi0 = APInt::getAllOnesValue(128);
-  i128hi0.clearLowBits(128);
-  EXPECT_EQ(0u, i128hi0.countLeadingOnes());
-  EXPECT_EQ(128u, i128hi0.countLeadingZeros());
-  EXPECT_EQ(0u, i128hi0.getActiveBits());
-  EXPECT_EQ(128u, i128hi0.countTrailingZeros());
-  EXPECT_EQ(0u, i128hi0.countTrailingOnes());
-  EXPECT_EQ(0u, i128hi0.countPopulation());
-
-  APInt i80hi1 = APInt::getAllOnesValue(80);
-  i80hi1.clearLowBits(79);
-  EXPECT_EQ(1u, i80hi1.countLeadingOnes());
-  EXPECT_EQ(0u, i80hi1.countLeadingZeros());
-  EXPECT_EQ(80u, i80hi1.getActiveBits());
-  EXPECT_EQ(79u, i80hi1.countTrailingZeros());
-  EXPECT_EQ(0u, i80hi1.countTrailingOnes());
-  EXPECT_EQ(1u, i80hi1.countPopulation());
-
-  APInt i32hi16 = APInt::getAllOnesValue(32);
-  i32hi16.clearLowBits(16);
-  EXPECT_EQ(16u, i32hi16.countLeadingOnes());
-  EXPECT_EQ(0u, i32hi16.countLeadingZeros());
-  EXPECT_EQ(32u, i32hi16.getActiveBits());
-  EXPECT_EQ(16u, i32hi16.countTrailingZeros());
-  EXPECT_EQ(0u, i32hi16.countTrailingOnes());
-  EXPECT_EQ(16u, i32hi16.countPopulation());
-}
-
-TEST(APIntTest, GCD) {
-  using APIntOps::GreatestCommonDivisor;
-
-  for (unsigned Bits : {1, 2, 32, 63, 64, 65}) {
-    // Test some corner cases near zero.
-    APInt Zero(Bits, 0), One(Bits, 1);
-    EXPECT_EQ(GreatestCommonDivisor(Zero, Zero), Zero);
-    EXPECT_EQ(GreatestCommonDivisor(Zero, One), One);
-    EXPECT_EQ(GreatestCommonDivisor(One, Zero), One);
-    EXPECT_EQ(GreatestCommonDivisor(One, One), One);
-
-    if (Bits > 1) {
-      APInt Two(Bits, 2);
-      EXPECT_EQ(GreatestCommonDivisor(Zero, Two), Two);
-      EXPECT_EQ(GreatestCommonDivisor(One, Two), One);
-      EXPECT_EQ(GreatestCommonDivisor(Two, Two), Two);
-
-      // Test some corner cases near the highest representable value.
-      APInt Max(Bits, 0);
-      Max.setAllBits();
-      EXPECT_EQ(GreatestCommonDivisor(Zero, Max), Max);
-      EXPECT_EQ(GreatestCommonDivisor(One, Max), One);
-      EXPECT_EQ(GreatestCommonDivisor(Two, Max), One);
-      EXPECT_EQ(GreatestCommonDivisor(Max, Max), Max);
-
-      APInt MaxOver2 = Max.udiv(Two);
-      EXPECT_EQ(GreatestCommonDivisor(MaxOver2, Max), One);
-      // Max - 1 == Max / 2 * 2, because Max is odd.
-      EXPECT_EQ(GreatestCommonDivisor(MaxOver2, Max - 1), MaxOver2);
-    }
-  }
-
-  // Compute the 20th Mersenne prime.
-  const unsigned BitWidth = 4450;
-  APInt HugePrime = APInt::getLowBitsSet(BitWidth, 4423);
-
-  // 9931 and 123456 are coprime.
-  APInt A = HugePrime * APInt(BitWidth, 9931);
-  APInt B = HugePrime * APInt(BitWidth, 123456);
-  APInt C = GreatestCommonDivisor(A, B);
-  EXPECT_EQ(C, HugePrime);
-}
-
-TEST(APIntTest, LogicalRightShift) {
-  APInt i256(APInt::getHighBitsSet(256, 2));
-
-  i256.lshrInPlace(1);
-  EXPECT_EQ(1U, i256.countLeadingZeros());
-  EXPECT_EQ(253U, i256.countTrailingZeros());
-  EXPECT_EQ(2U, i256.countPopulation());
-
-  i256.lshrInPlace(62);
-  EXPECT_EQ(63U, i256.countLeadingZeros());
-  EXPECT_EQ(191U, i256.countTrailingZeros());
-  EXPECT_EQ(2U, i256.countPopulation());
-
-  i256.lshrInPlace(65);
-  EXPECT_EQ(128U, i256.countLeadingZeros());
-  EXPECT_EQ(126U, i256.countTrailingZeros());
-  EXPECT_EQ(2U, i256.countPopulation());
-
-  i256.lshrInPlace(64);
-  EXPECT_EQ(192U, i256.countLeadingZeros());
-  EXPECT_EQ(62U, i256.countTrailingZeros());
-  EXPECT_EQ(2U, i256.countPopulation());
-
-  i256.lshrInPlace(63);
-  EXPECT_EQ(255U, i256.countLeadingZeros());
-  EXPECT_EQ(0U, i256.countTrailingZeros());
-  EXPECT_EQ(1U, i256.countPopulation());
-
-  // Ensure we handle large shifts of multi-word.
-  const APInt neg_one(128, static_cast<uint64_t>(-1), true);
-  EXPECT_EQ(0, neg_one.lshr(128));
-}
-
-TEST(APIntTest, ArithmeticRightShift) {
-  APInt i72(APInt::getHighBitsSet(72, 1));
-  i72.ashrInPlace(46);
-  EXPECT_EQ(47U, i72.countLeadingOnes());
-  EXPECT_EQ(25U, i72.countTrailingZeros());
-  EXPECT_EQ(47U, i72.countPopulation());
-
-  i72 = APInt::getHighBitsSet(72, 1);
-  i72.ashrInPlace(64);
-  EXPECT_EQ(65U, i72.countLeadingOnes());
-  EXPECT_EQ(7U, i72.countTrailingZeros());
-  EXPECT_EQ(65U, i72.countPopulation());
-
-  APInt i128(APInt::getHighBitsSet(128, 1));
-  i128.ashrInPlace(64);
-  EXPECT_EQ(65U, i128.countLeadingOnes());
-  EXPECT_EQ(63U, i128.countTrailingZeros());
-  EXPECT_EQ(65U, i128.countPopulation());
-
-  // Ensure we handle large shifts of multi-word.
-  const APInt signmin32(APInt::getSignedMinValue(32));
-  EXPECT_TRUE(signmin32.ashr(32).isAllOnesValue());
-
-  // Ensure we handle large shifts of multi-word.
-  const APInt umax32(APInt::getSignedMaxValue(32));
-  EXPECT_EQ(0, umax32.ashr(32));
-
-  // Ensure we handle large shifts of multi-word.
-  const APInt signmin128(APInt::getSignedMinValue(128));
-  EXPECT_TRUE(signmin128.ashr(128).isAllOnesValue());
-
-  // Ensure we handle large shifts of multi-word.
-  const APInt umax128(APInt::getSignedMaxValue(128));
-  EXPECT_EQ(0, umax128.ashr(128));
-}
-
-TEST(APIntTest, LeftShift) {
-  APInt i256(APInt::getLowBitsSet(256, 2));
-
-  i256 <<= 1;
-  EXPECT_EQ(253U, i256.countLeadingZeros());
-  EXPECT_EQ(1U, i256.countTrailingZeros());
-  EXPECT_EQ(2U, i256.countPopulation());
-
-  i256 <<= 62;
-  EXPECT_EQ(191U, i256.countLeadingZeros());
-  EXPECT_EQ(63U, i256.countTrailingZeros());
-  EXPECT_EQ(2U, i256.countPopulation());
-
-  i256 <<= 65;
-  EXPECT_EQ(126U, i256.countLeadingZeros());
-  EXPECT_EQ(128U, i256.countTrailingZeros());
-  EXPECT_EQ(2U, i256.countPopulation());
-
-  i256 <<= 64;
-  EXPECT_EQ(62U, i256.countLeadingZeros());
-  EXPECT_EQ(192U, i256.countTrailingZeros());
-  EXPECT_EQ(2U, i256.countPopulation());
-
-  i256 <<= 63;
-  EXPECT_EQ(0U, i256.countLeadingZeros());
-  EXPECT_EQ(255U, i256.countTrailingZeros());
-  EXPECT_EQ(1U, i256.countPopulation());
-
-  // Ensure we handle large shifts of multi-word.
-  const APInt neg_one(128, static_cast<uint64_t>(-1), true);
-  EXPECT_EQ(0, neg_one.shl(128));
-}
-
-TEST(APIntTest, isSubsetOf) {
-  APInt i32_1(32, 1);
-  APInt i32_2(32, 2);
-  APInt i32_3(32, 3);
-  EXPECT_FALSE(i32_3.isSubsetOf(i32_1));
-  EXPECT_TRUE(i32_1.isSubsetOf(i32_3));
-  EXPECT_FALSE(i32_2.isSubsetOf(i32_1));
-  EXPECT_FALSE(i32_1.isSubsetOf(i32_2));
-  EXPECT_TRUE(i32_3.isSubsetOf(i32_3));
-
-  APInt i128_1(128, 1);
-  APInt i128_2(128, 2);
-  APInt i128_3(128, 3);
-  EXPECT_FALSE(i128_3.isSubsetOf(i128_1));
-  EXPECT_TRUE(i128_1.isSubsetOf(i128_3));
-  EXPECT_FALSE(i128_2.isSubsetOf(i128_1));
-  EXPECT_FALSE(i128_1.isSubsetOf(i128_2));
-  EXPECT_TRUE(i128_3.isSubsetOf(i128_3));
-
-  i128_1 <<= 64;
-  i128_2 <<= 64;
-  i128_3 <<= 64;
-  EXPECT_FALSE(i128_3.isSubsetOf(i128_1));
-  EXPECT_TRUE(i128_1.isSubsetOf(i128_3));
-  EXPECT_FALSE(i128_2.isSubsetOf(i128_1));
-  EXPECT_FALSE(i128_1.isSubsetOf(i128_2));
-  EXPECT_TRUE(i128_3.isSubsetOf(i128_3));
-}
-
-TEST(APIntTest, sext) {
-  EXPECT_EQ(0, APInt(1, 0).sext(64));
-  EXPECT_EQ(~uint64_t(0), APInt(1, 1).sext(64));
-
-  APInt i32_max(APInt::getSignedMaxValue(32).sext(63));
-  EXPECT_EQ(32U, i32_max.countLeadingZeros());
-  EXPECT_EQ(0U, i32_max.countTrailingZeros());
-  EXPECT_EQ(31U, i32_max.countPopulation());
-
-  APInt i32_min(APInt::getSignedMinValue(32).sext(63));
-  EXPECT_EQ(32U, i32_min.countLeadingOnes());
-  EXPECT_EQ(31U, i32_min.countTrailingZeros());
-  EXPECT_EQ(32U, i32_min.countPopulation());
-
-  APInt i32_neg1(APInt(32, ~uint64_t(0)).sext(63));
-  EXPECT_EQ(63U, i32_neg1.countLeadingOnes());
-  EXPECT_EQ(0U, i32_neg1.countTrailingZeros());
-  EXPECT_EQ(63U, i32_neg1.countPopulation());
-}
-
-TEST(APIntTest, truncOrSelf) {
-  APInt val(32, 0xFFFFFFFF);
-  EXPECT_EQ(0xFFFF, val.truncOrSelf(16));
-  EXPECT_EQ(0xFFFFFFFF, val.truncOrSelf(32));
-  EXPECT_EQ(0xFFFFFFFF, val.truncOrSelf(64));
-}
-
-TEST(APIntTest, multiply) {
-  APInt i64(64, 1234);
-
-  EXPECT_EQ(7006652, i64 * 5678);
-  EXPECT_EQ(7006652, 5678 * i64);
-
-  APInt i128 = APInt::getOneBitSet(128, 64);
-  APInt i128_1234(128, 1234);
-  i128_1234 <<= 64;
-  EXPECT_EQ(i128_1234, i128 * 1234);
-  EXPECT_EQ(i128_1234, 1234 * i128);
-
-  APInt i96 = APInt::getOneBitSet(96, 64);
-  i96 *= ~0ULL;
-  EXPECT_EQ(32U, i96.countLeadingOnes());
-  EXPECT_EQ(32U, i96.countPopulation());
-  EXPECT_EQ(64U, i96.countTrailingZeros());
-}
-
-TEST(APIntTest, RoundingUDiv) {
-  for (uint64_t Ai = 1; Ai <= 255; Ai++) {
-    APInt A(8, Ai);
-    APInt Zero(8, 0);
-    EXPECT_EQ(0, APIntOps::RoundingUDiv(Zero, A, APInt::Rounding::UP));
-    EXPECT_EQ(0, APIntOps::RoundingUDiv(Zero, A, APInt::Rounding::DOWN));
-    EXPECT_EQ(0, APIntOps::RoundingUDiv(Zero, A, APInt::Rounding::TOWARD_ZERO));
-
-    for (uint64_t Bi = 1; Bi <= 255; Bi++) {
-      APInt B(8, Bi);
-      {
-        APInt Quo = APIntOps::RoundingUDiv(A, B, APInt::Rounding::UP);
-        auto Prod = Quo.zext(16) * B.zext(16);
-        EXPECT_TRUE(Prod.uge(Ai));
-        if (Prod.ugt(Ai)) {
-          EXPECT_TRUE(((Quo - 1).zext(16) * B.zext(16)).ult(Ai));
-        }
-      }
-      {
-        APInt Quo = A.udiv(B);
-        EXPECT_EQ(Quo, APIntOps::RoundingUDiv(A, B, APInt::Rounding::TOWARD_ZERO));
-        EXPECT_EQ(Quo, APIntOps::RoundingUDiv(A, B, APInt::Rounding::DOWN));
-      }
-    }
-  }
-}
-
-TEST(APIntTest, RoundingSDiv) {
-  for (int64_t Ai = -128; Ai <= 127; Ai++) {
-    APInt A(8, Ai);
-
-    if (Ai != 0) {
-      APInt Zero(8, 0);
-      EXPECT_EQ(0, APIntOps::RoundingSDiv(Zero, A, APInt::Rounding::UP));
-      EXPECT_EQ(0, APIntOps::RoundingSDiv(Zero, A, APInt::Rounding::DOWN));
-      EXPECT_EQ(0, APIntOps::RoundingSDiv(Zero, A, APInt::Rounding::TOWARD_ZERO));
-    }
-
-    for (int64_t Bi = -128; Bi <= 127; Bi++) {
-      if (Bi == 0)
-        continue;
-
-      APInt B(8, Bi);
-      APInt QuoTowardZero = A.sdiv(B);
-      {
-        APInt Quo = APIntOps::RoundingSDiv(A, B, APInt::Rounding::UP);
-        if (A.srem(B).isNullValue()) {
-          EXPECT_EQ(QuoTowardZero, Quo);
-        } else if (A.isNegative() !=
-                   B.isNegative()) { // if the math quotient is negative.
-          EXPECT_EQ(QuoTowardZero, Quo);
-        } else {
-          EXPECT_EQ(QuoTowardZero + 1, Quo);
-        }
-      }
-      {
-        APInt Quo = APIntOps::RoundingSDiv(A, B, APInt::Rounding::DOWN);
-        if (A.srem(B).isNullValue()) {
-          EXPECT_EQ(QuoTowardZero, Quo);
-        } else if (A.isNegative() !=
-                   B.isNegative()) { // if the math quotient is negative.
-          EXPECT_EQ(QuoTowardZero - 1, Quo);
-        } else {
-          EXPECT_EQ(QuoTowardZero, Quo);
-        }
-      }
-      EXPECT_EQ(QuoTowardZero,
-                APIntOps::RoundingSDiv(A, B, APInt::Rounding::TOWARD_ZERO));
-    }
-  }
-}
-
-TEST(APIntTest, umul_ov) {
-  const std::pair<uint64_t, uint64_t> Overflows[] = {
-      {0x8000000000000000, 2},
-      {0x5555555555555556, 3},
-      {4294967296, 4294967296},
-      {4294967295, 4294967298},
-  };
-  const std::pair<uint64_t, uint64_t> NonOverflows[] = {
-      {0x7fffffffffffffff, 2},
-      {0x5555555555555555, 3},
-      {4294967295, 4294967297},
-  };
-
-  bool Overflow;
-  for (auto &X : Overflows) {
-    APInt A(64, X.first);
-    APInt B(64, X.second);
-    (void)A.umul_ov(B, Overflow);
-    EXPECT_TRUE(Overflow);
-  }
-  for (auto &X : NonOverflows) {
-    APInt A(64, X.first);
-    APInt B(64, X.second);
-    (void)A.umul_ov(B, Overflow);
-    EXPECT_FALSE(Overflow);
-  }
-
-  for (unsigned Bits = 1; Bits <= 5; ++Bits)
-    for (unsigned A = 0; A != 1u << Bits; ++A)
-      for (unsigned B = 0; B != 1u << Bits; ++B) {
-        APInt C = APInt(Bits, A).umul_ov(APInt(Bits, B), Overflow);
-        APInt D = APInt(2 * Bits, A) * APInt(2 * Bits, B);
-        EXPECT_TRUE(D.getHiBits(Bits).isNullValue() != Overflow);
-      }
-}
-
-TEST(APIntTest, SolveQuadraticEquationWrap) {
-  // Verify that "Solution" is the first non-negative integer that solves
-  // Ax^2 + Bx + C = "0 or overflow", i.e. that it is a correct solution
-  // as calculated by SolveQuadraticEquationWrap.
-  auto Validate = [] (int A, int B, int C, unsigned Width, int Solution) {
-    int Mask = (1 << Width) - 1;
-
-    // Solution should be non-negative.
-    EXPECT_GE(Solution, 0);
-
-    auto OverflowBits = [] (int64_t V, unsigned W) {
-      return V & -(1 << W);
-    };
-
-    int64_t Over0 = OverflowBits(C, Width);
-
-    auto IsZeroOrOverflow = [&] (int X) {
-      int64_t ValueAtX = A*X*X + B*X + C;
-      int64_t OverX = OverflowBits(ValueAtX, Width);
-      return (ValueAtX & Mask) == 0 || OverX != Over0;
-    };
-
-    auto EquationToString = [&] (const char *X_str) {
-      return (Twine(A) + Twine(X_str) + Twine("^2 + ") + Twine(B) +
-              Twine(X_str) + Twine(" + ") + Twine(C) + Twine(", bitwidth: ") +
-              Twine(Width)).str();
-    };
-
-    auto IsSolution = [&] (const char *X_str, int X) {
-      if (IsZeroOrOverflow(X))
-        return ::testing::AssertionSuccess()
-                  << X << " is a solution of " << EquationToString(X_str);
-      return ::testing::AssertionFailure()
-                << X << " is not an expected solution of "
-                << EquationToString(X_str);
-    };
-
-    auto IsNotSolution = [&] (const char *X_str, int X) {
-      if (!IsZeroOrOverflow(X))
-        return ::testing::AssertionSuccess()
-                  << X << " is not a solution of " << EquationToString(X_str);
-      return ::testing::AssertionFailure()
-                << X << " is an unexpected solution of "
-                << EquationToString(X_str);
-    };
-
-    // This is the important part: make sure that there is no solution that
-    // is less than the calculated one.
-    if (Solution > 0) {
-      for (int X = 1; X < Solution-1; ++X)
-        EXPECT_PRED_FORMAT1(IsNotSolution, X);
-    }
-
-    // Verify that the calculated solution is indeed a solution.
-    EXPECT_PRED_FORMAT1(IsSolution, Solution);
-  };
-
-  // Generate all possible quadratic equations with Width-bit wide integer
-  // coefficients, get the solution from SolveQuadraticEquationWrap, and
-  // verify that the solution is correct.
-  auto Iterate = [&] (unsigned Width) {
-    assert(1 < Width && Width < 32);
-    int Low = -(1 << (Width-1));
-    int High = (1 << (Width-1));
-
-    for (int A = Low; A != High; ++A) {
-      if (A == 0)
-        continue;
-      for (int B = Low; B != High; ++B) {
-        for (int C = Low; C != High; ++C) {
-          Optional<APInt> S = APIntOps::SolveQuadraticEquationWrap(
-                                APInt(Width, A), APInt(Width, B),
-                                APInt(Width, C), Width);
-          if (S.hasValue())
-            Validate(A, B, C, Width, S->getSExtValue());
-        }
-      }
-    }
-  };
-
-  // Test all widths in [2..6].
-  for (unsigned i = 2; i <= 6; ++i)
-    Iterate(i);
-}
-
-TEST(APIntTest, MultiplicativeInverseExaustive) {
-  for (unsigned BitWidth = 1; BitWidth <= 16; ++BitWidth) {
-    for (unsigned Value = 0; Value < (1u << BitWidth); ++Value) {
-      APInt V = APInt(BitWidth, Value);
-      APInt MulInv =
-          V.zext(BitWidth + 1)
-              .multiplicativeInverse(APInt::getSignedMinValue(BitWidth + 1))
-              .trunc(BitWidth);
-      APInt One = V * MulInv;
-      if (!V.isNullValue() && V.countTrailingZeros() == 0) {
-        // Multiplicative inverse exists for all odd numbers.
-        EXPECT_TRUE(One.isOneValue());
-      } else {
-        // Multiplicative inverse does not exist for even numbers (and 0).
-        EXPECT_TRUE(MulInv.isNullValue());
-      }
-    }
-  }
-}
-
-TEST(APIntTest, GetMostSignificantDifferentBit) {
-  EXPECT_EQ(APIntOps::GetMostSignificantDifferentBit(APInt(8, 0), APInt(8, 0)),
-            llvm::None);
-  EXPECT_EQ(
-      APIntOps::GetMostSignificantDifferentBit(APInt(8, 42), APInt(8, 42)),
-      llvm::None);
-  EXPECT_EQ(*APIntOps::GetMostSignificantDifferentBit(APInt(8, 0), APInt(8, 1)),
-            0u);
-  EXPECT_EQ(*APIntOps::GetMostSignificantDifferentBit(APInt(8, 0), APInt(8, 2)),
-            1u);
-  EXPECT_EQ(*APIntOps::GetMostSignificantDifferentBit(APInt(8, 0), APInt(8, 3)),
-            1u);
-  EXPECT_EQ(*APIntOps::GetMostSignificantDifferentBit(APInt(8, 1), APInt(8, 0)),
-            0u);
-  EXPECT_EQ(APIntOps::GetMostSignificantDifferentBit(APInt(8, 1), APInt(8, 1)),
-            llvm::None);
-  EXPECT_EQ(*APIntOps::GetMostSignificantDifferentBit(APInt(8, 1), APInt(8, 2)),
-            1u);
-  EXPECT_EQ(*APIntOps::GetMostSignificantDifferentBit(APInt(8, 1), APInt(8, 3)),
-            1u);
-  EXPECT_EQ(
-      *APIntOps::GetMostSignificantDifferentBit(APInt(8, 42), APInt(8, 112)),
-      6u);
-}
-
-TEST(APIntTest, GetMostSignificantDifferentBitExaustive) {
-  auto GetHighestDifferentBitBruteforce =
-      [](const APInt &V0, const APInt &V1) -> llvm::Optional<unsigned> {
-    assert(V0.getBitWidth() == V1.getBitWidth() && "Must have same bitwidth");
-    if (V0 == V1)
-      return llvm::None; // Bitwise identical.
-    // There is a mismatch. Let's find the most significant different bit.
-    for (int Bit = V0.getBitWidth() - 1; Bit >= 0; --Bit) {
-      if (V0[Bit] == V1[Bit])
-        continue;
-      return Bit;
-    }
-    llvm_unreachable("Must have found bit mismatch.");
-  };
-
-  for (unsigned BitWidth = 1; BitWidth <= 8; ++BitWidth) {
-    for (unsigned V0 = 0; V0 < (1u << BitWidth); ++V0) {
-      for (unsigned V1 = 0; V1 < (1u << BitWidth); ++V1) {
-        APInt A = APInt(BitWidth, V0);
-        APInt B = APInt(BitWidth, V1);
-
-        auto Bit = APIntOps::GetMostSignificantDifferentBit(A, B);
-        EXPECT_EQ(Bit, GetHighestDifferentBitBruteforce(A, B));
-
-        if (!Bit.hasValue())
-          EXPECT_EQ(A, B);
-        else {
-          EXPECT_NE(A, B);
-          for (unsigned NumLowBits = 0; NumLowBits <= BitWidth; ++NumLowBits) {
-            APInt Adash = A;
-            Adash.clearLowBits(NumLowBits);
-            APInt Bdash = B;
-            Bdash.clearLowBits(NumLowBits);
-            // Clearing only low bits up to and including *Bit is sufficient
-            // to make values equal.
-            if (NumLowBits >= 1 + *Bit)
-              EXPECT_EQ(Adash, Bdash);
-            else
-              EXPECT_NE(Adash, Bdash);
-          }
-        }
-      }
-    }
-  }
-}
-
-TEST(APIntTest, SignbitZeroChecks) {
-  EXPECT_TRUE(APInt(8, -1).isNegative());
-  EXPECT_FALSE(APInt(8, -1).isNonNegative());
-  EXPECT_FALSE(APInt(8, -1).isStrictlyPositive());
-  EXPECT_TRUE(APInt(8, -1).isNonPositive());
-
-  EXPECT_FALSE(APInt(8, 0).isNegative());
-  EXPECT_TRUE(APInt(8, 0).isNonNegative());
-  EXPECT_FALSE(APInt(8, 0).isStrictlyPositive());
-  EXPECT_TRUE(APInt(8, 0).isNonPositive());
-
-  EXPECT_FALSE(APInt(8, 1).isNegative());
-  EXPECT_TRUE(APInt(8, 1).isNonNegative());
-  EXPECT_TRUE(APInt(8, 1).isStrictlyPositive());
-  EXPECT_FALSE(APInt(8, 1).isNonPositive());
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/APSIntTest.cpp b/gnu/llvm/llvm/unittests/ADT/APSIntTest.cpp
deleted file mode 100644
index 932f54c19f1..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/APSIntTest.cpp
+++ /dev/null
@@ -1,271 +0,0 @@
-//===- llvm/unittest/ADT/APSIntTest.cpp - APSInt unit tests ---------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/APSInt.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST(APSIntTest, MoveTest) {
-  APSInt A(32, true);
-  EXPECT_TRUE(A.isUnsigned());
-
-  APSInt B(128, false);
-  A = B;
-  EXPECT_FALSE(A.isUnsigned());
-
-  APSInt C(B);
-  EXPECT_FALSE(C.isUnsigned());
-
-  APInt Wide(256, 0);
-  const uint64_t *Bits = Wide.getRawData();
-  APSInt D(std::move(Wide));
-  EXPECT_TRUE(D.isUnsigned());
-  EXPECT_EQ(Bits, D.getRawData()); // Verify that "Wide" was really moved.
-
-  A = APSInt(64, true);
-  EXPECT_TRUE(A.isUnsigned());
-
-  Wide = APInt(128, 1);
-  Bits = Wide.getRawData();
-  A = std::move(Wide);
-  EXPECT_TRUE(A.isUnsigned());
-  EXPECT_EQ(Bits, A.getRawData()); // Verify that "Wide" was really moved.
-}
-
-TEST(APSIntTest, get) {
-  EXPECT_TRUE(APSInt::get(7).isSigned());
-  EXPECT_EQ(64u, APSInt::get(7).getBitWidth());
-  EXPECT_EQ(7u, APSInt::get(7).getZExtValue());
-  EXPECT_EQ(7, APSInt::get(7).getSExtValue());
-  EXPECT_TRUE(APSInt::get(-7).isSigned());
-  EXPECT_EQ(64u, APSInt::get(-7).getBitWidth());
-  EXPECT_EQ(-7, APSInt::get(-7).getSExtValue());
-  EXPECT_EQ(UINT64_C(0) - 7, APSInt::get(-7).getZExtValue());
-}
-
-TEST(APSIntTest, getUnsigned) {
-  EXPECT_TRUE(APSInt::getUnsigned(7).isUnsigned());
-  EXPECT_EQ(64u, APSInt::getUnsigned(7).getBitWidth());
-  EXPECT_EQ(7u, APSInt::getUnsigned(7).getZExtValue());
-  EXPECT_EQ(7, APSInt::getUnsigned(7).getSExtValue());
-  EXPECT_TRUE(APSInt::getUnsigned(-7).isUnsigned());
-  EXPECT_EQ(64u, APSInt::getUnsigned(-7).getBitWidth());
-  EXPECT_EQ(-7, APSInt::getUnsigned(-7).getSExtValue());
-  EXPECT_EQ(UINT64_C(0) - 7, APSInt::getUnsigned(-7).getZExtValue());
-}
-
-TEST(APSIntTest, getExtValue) {
-  EXPECT_TRUE(APSInt(APInt(3, 7), true).isUnsigned());
-  EXPECT_TRUE(APSInt(APInt(3, 7), false).isSigned());
-  EXPECT_TRUE(APSInt(APInt(4, 7), true).isUnsigned());
-  EXPECT_TRUE(APSInt(APInt(4, 7), false).isSigned());
-  EXPECT_TRUE(APSInt(APInt(4, -7), true).isUnsigned());
-  EXPECT_TRUE(APSInt(APInt(4, -7), false).isSigned());
-  EXPECT_EQ(7, APSInt(APInt(3, 7), true).getExtValue());
-  EXPECT_EQ(-1, APSInt(APInt(3, 7), false).getExtValue());
-  EXPECT_EQ(7, APSInt(APInt(4, 7), true).getExtValue());
-  EXPECT_EQ(7, APSInt(APInt(4, 7), false).getExtValue());
-  EXPECT_EQ(9, APSInt(APInt(4, -7), true).getExtValue());
-  EXPECT_EQ(-7, APSInt(APInt(4, -7), false).getExtValue());
-}
-
-TEST(APSIntTest, compareValues) {
-  auto U = [](uint64_t V) { return APSInt::getUnsigned(V); };
-  auto S = [](int64_t V) { return APSInt::get(V); };
-
-  // Bit-width matches and is-signed.
-  EXPECT_TRUE(APSInt::compareValues(S(7), S(8)) < 0);
-  EXPECT_TRUE(APSInt::compareValues(S(8), S(7)) > 0);
-  EXPECT_TRUE(APSInt::compareValues(S(7), S(7)) == 0);
-  EXPECT_TRUE(APSInt::compareValues(S(-7), S(8)) < 0);
-  EXPECT_TRUE(APSInt::compareValues(S(8), S(-7)) > 0);
-  EXPECT_TRUE(APSInt::compareValues(S(-7), S(-7)) == 0);
-  EXPECT_TRUE(APSInt::compareValues(S(-7), S(-8)) > 0);
-  EXPECT_TRUE(APSInt::compareValues(S(-8), S(-7)) < 0);
-  EXPECT_TRUE(APSInt::compareValues(S(-7), S(-7)) == 0);
-
-  // Bit-width matches and not is-signed.
-  EXPECT_TRUE(APSInt::compareValues(U(7), U(8)) < 0);
-  EXPECT_TRUE(APSInt::compareValues(U(8), U(7)) > 0);
-  EXPECT_TRUE(APSInt::compareValues(U(7), U(7)) == 0);
-
-  // Bit-width matches and mixed signs.
-  EXPECT_TRUE(APSInt::compareValues(U(7), S(8)) < 0);
-  EXPECT_TRUE(APSInt::compareValues(U(8), S(7)) > 0);
-  EXPECT_TRUE(APSInt::compareValues(U(7), S(7)) == 0);
-  EXPECT_TRUE(APSInt::compareValues(U(8), S(-7)) > 0);
-
-  // Bit-width mismatch and is-signed.
-  EXPECT_TRUE(APSInt::compareValues(S(7).trunc(32), S(8)) < 0);
-  EXPECT_TRUE(APSInt::compareValues(S(8).trunc(32), S(7)) > 0);
-  EXPECT_TRUE(APSInt::compareValues(S(7).trunc(32), S(7)) == 0);
-  EXPECT_TRUE(APSInt::compareValues(S(-7).trunc(32), S(8)) < 0);
-  EXPECT_TRUE(APSInt::compareValues(S(8).trunc(32), S(-7)) > 0);
-  EXPECT_TRUE(APSInt::compareValues(S(-7).trunc(32), S(-7)) == 0);
-  EXPECT_TRUE(APSInt::compareValues(S(-7).trunc(32), S(-8)) > 0);
-  EXPECT_TRUE(APSInt::compareValues(S(-8).trunc(32), S(-7)) < 0);
-  EXPECT_TRUE(APSInt::compareValues(S(-7).trunc(32), S(-7)) == 0);
-  EXPECT_TRUE(APSInt::compareValues(S(7), S(8).trunc(32)) < 0);
-  EXPECT_TRUE(APSInt::compareValues(S(8), S(7).trunc(32)) > 0);
-  EXPECT_TRUE(APSInt::compareValues(S(7), S(7).trunc(32)) == 0);
-  EXPECT_TRUE(APSInt::compareValues(S(-7), S(8).trunc(32)) < 0);
-  EXPECT_TRUE(APSInt::compareValues(S(8), S(-7).trunc(32)) > 0);
-  EXPECT_TRUE(APSInt::compareValues(S(-7), S(-7).trunc(32)) == 0);
-  EXPECT_TRUE(APSInt::compareValues(S(-7), S(-8).trunc(32)) > 0);
-  EXPECT_TRUE(APSInt::compareValues(S(-8), S(-7).trunc(32)) < 0);
-  EXPECT_TRUE(APSInt::compareValues(S(-7), S(-7).trunc(32)) == 0);
-
-  // Bit-width mismatch and not is-signed.
-  EXPECT_TRUE(APSInt::compareValues(U(7), U(8).trunc(32)) < 0);
-  EXPECT_TRUE(APSInt::compareValues(U(8), U(7).trunc(32)) > 0);
-  EXPECT_TRUE(APSInt::compareValues(U(7), U(7).trunc(32)) == 0);
-  EXPECT_TRUE(APSInt::compareValues(U(7).trunc(32), U(8)) < 0);
-  EXPECT_TRUE(APSInt::compareValues(U(8).trunc(32), U(7)) > 0);
-  EXPECT_TRUE(APSInt::compareValues(U(7).trunc(32), U(7)) == 0);
-
-  // Bit-width mismatch and mixed signs.
-  EXPECT_TRUE(APSInt::compareValues(U(7).trunc(32), S(8)) < 0);
-  EXPECT_TRUE(APSInt::compareValues(U(8).trunc(32), S(7)) > 0);
-  EXPECT_TRUE(APSInt::compareValues(U(7).trunc(32), S(7)) == 0);
-  EXPECT_TRUE(APSInt::compareValues(U(8).trunc(32), S(-7)) > 0);
-  EXPECT_TRUE(APSInt::compareValues(U(7), S(8).trunc(32)) < 0);
-  EXPECT_TRUE(APSInt::compareValues(U(8), S(7).trunc(32)) > 0);
-  EXPECT_TRUE(APSInt::compareValues(U(7), S(7).trunc(32)) == 0);
-  EXPECT_TRUE(APSInt::compareValues(U(8), S(-7).trunc(32)) > 0);
-}
-
-TEST(APSIntTest, FromString) {
-  EXPECT_EQ(APSInt("1").getExtValue(), 1);
-  EXPECT_EQ(APSInt("-1").getExtValue(), -1);
-  EXPECT_EQ(APSInt("0").getExtValue(), 0);
-  EXPECT_EQ(APSInt("56789").getExtValue(), 56789);
-  EXPECT_EQ(APSInt("-1234").getExtValue(), -1234);
-}
-
-TEST(APSIntTest, FromStringBitWidth) {
-  EXPECT_EQ(APSInt("0").getBitWidth(), 1U);
-  EXPECT_EQ(APSInt("000").getBitWidth(), 1U);
-  EXPECT_EQ(APSInt("1").getBitWidth(), 1U);
-  EXPECT_EQ(APSInt("2").getBitWidth(), 2U);
-  EXPECT_EQ(APSInt("3").getBitWidth(), 2U);
-  EXPECT_EQ(APSInt("003").getBitWidth(), 2U);
-  EXPECT_EQ(APSInt("15").getBitWidth(), 4U);
-  EXPECT_EQ(APSInt("16").getBitWidth(), 5U);
-  EXPECT_EQ(APSInt("17").getBitWidth(), 5U);
-
-  EXPECT_EQ(APSInt("-0").getBitWidth(), 1U);
-  EXPECT_EQ(APSInt("-000").getBitWidth(), 1U);
-  EXPECT_EQ(APSInt("-1").getBitWidth(), 1U);
-  EXPECT_EQ(APSInt("-2").getBitWidth(), 2U);
-  EXPECT_EQ(APSInt("-3").getBitWidth(), 3U);
-  EXPECT_EQ(APSInt("-003").getBitWidth(), 3U);
-  EXPECT_EQ(APSInt("-5").getBitWidth(), 4U);
-  EXPECT_EQ(APSInt("-15").getBitWidth(), 5U);
-  EXPECT_EQ(APSInt("-16").getBitWidth(), 5U);
-  EXPECT_EQ(APSInt("-17").getBitWidth(), 6U);
-}
-
-#if defined(GTEST_HAS_DEATH_TEST) && !defined(NDEBUG)
-
-TEST(APSIntTest, StringDeath) {
-  EXPECT_DEATH((void)APSInt(""), "Invalid string length");
-  EXPECT_DEATH((void)APSInt("1a"), "Invalid character in digit string");
-}
-
-#endif
-
-TEST(APSIntTest, SignedHighBit) {
-  APSInt False(APInt(1, 0), false);
-  APSInt True(APInt(1, 1), false);
-  APSInt CharMin(APInt(8, 0), false);
-  APSInt CharSmall(APInt(8, 0x13), false);
-  APSInt CharBoundaryUnder(APInt(8, 0x7f), false);
-  APSInt CharBoundaryOver(APInt(8, 0x80), false);
-  APSInt CharLarge(APInt(8, 0xd9), false);
-  APSInt CharMax(APInt(8, 0xff), false);
-
-  EXPECT_FALSE(False.isNegative());
-  EXPECT_TRUE(False.isNonNegative());
-  EXPECT_FALSE(False.isStrictlyPositive());
-
-  EXPECT_TRUE(True.isNegative());
-  EXPECT_FALSE(True.isNonNegative());
-  EXPECT_FALSE(True.isStrictlyPositive());
-
-  EXPECT_FALSE(CharMin.isNegative());
-  EXPECT_TRUE(CharMin.isNonNegative());
-  EXPECT_FALSE(CharMin.isStrictlyPositive());
-
-  EXPECT_FALSE(CharSmall.isNegative());
-  EXPECT_TRUE(CharSmall.isNonNegative());
-  EXPECT_TRUE(CharSmall.isStrictlyPositive());
-
-  EXPECT_FALSE(CharBoundaryUnder.isNegative());
-  EXPECT_TRUE(CharBoundaryUnder.isNonNegative());
-  EXPECT_TRUE(CharBoundaryUnder.isStrictlyPositive());
-
-  EXPECT_TRUE(CharBoundaryOver.isNegative());
-  EXPECT_FALSE(CharBoundaryOver.isNonNegative());
-  EXPECT_FALSE(CharBoundaryOver.isStrictlyPositive());
-
-  EXPECT_TRUE(CharLarge.isNegative());
-  EXPECT_FALSE(CharLarge.isNonNegative());
-  EXPECT_FALSE(CharLarge.isStrictlyPositive());
-
-  EXPECT_TRUE(CharMax.isNegative());
-  EXPECT_FALSE(CharMax.isNonNegative());
-  EXPECT_FALSE(CharMax.isStrictlyPositive());
-}
-
-TEST(APSIntTest, UnsignedHighBit) {
-  APSInt False(APInt(1, 0));
-  APSInt True(APInt(1, 1));
-  APSInt CharMin(APInt(8, 0));
-  APSInt CharSmall(APInt(8, 0x13));
-  APSInt CharBoundaryUnder(APInt(8, 0x7f));
-  APSInt CharBoundaryOver(APInt(8, 0x80));
-  APSInt CharLarge(APInt(8, 0xd9));
-  APSInt CharMax(APInt(8, 0xff));
-
-  EXPECT_FALSE(False.isNegative());
-  EXPECT_TRUE(False.isNonNegative());
-  EXPECT_FALSE(False.isStrictlyPositive());
-
-  EXPECT_FALSE(True.isNegative());
-  EXPECT_TRUE(True.isNonNegative());
-  EXPECT_TRUE(True.isStrictlyPositive());
-
-  EXPECT_FALSE(CharMin.isNegative());
-  EXPECT_TRUE(CharMin.isNonNegative());
-  EXPECT_FALSE(CharMin.isStrictlyPositive());
-
-  EXPECT_FALSE(CharSmall.isNegative());
-  EXPECT_TRUE(CharSmall.isNonNegative());
-  EXPECT_TRUE(CharSmall.isStrictlyPositive());
-
-  EXPECT_FALSE(CharBoundaryUnder.isNegative());
-  EXPECT_TRUE(CharBoundaryUnder.isNonNegative());
-  EXPECT_TRUE(CharBoundaryUnder.isStrictlyPositive());
-
-  EXPECT_FALSE(CharBoundaryOver.isNegative());
-  EXPECT_TRUE(CharBoundaryOver.isNonNegative());
-  EXPECT_TRUE(CharBoundaryOver.isStrictlyPositive());
-
-  EXPECT_FALSE(CharLarge.isNegative());
-  EXPECT_TRUE(CharLarge.isNonNegative());
-  EXPECT_TRUE(CharLarge.isStrictlyPositive());
-
-  EXPECT_FALSE(CharMax.isNegative());
-  EXPECT_TRUE(CharMax.isNonNegative());
-  EXPECT_TRUE(CharMax.isStrictlyPositive());
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/AnyTest.cpp b/gnu/llvm/llvm/unittests/ADT/AnyTest.cpp
deleted file mode 100644
index 2ca81bd61d5..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/AnyTest.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-//===- llvm/unittest/Support/AnyTest.cpp - Any tests ---===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/Any.h"
-#include "gtest/gtest.h"
-#include <cstdlib>
-
-using namespace llvm;
-
-namespace {
-
-// Make sure we can construct, copy-construct, move-construct, and assign Any's.
-TEST(AnyTest, ConstructionAndAssignment) {
-  llvm::Any A;
-  llvm::Any B{7};
-  llvm::Any C{8};
-  llvm::Any D{"hello"};
-  llvm::Any E{3.7};
-
-  // An empty Any is not anything.
-  EXPECT_FALSE(A.hasValue());
-  EXPECT_FALSE(any_isa<int>(A));
-
-  // An int is an int but not something else.
-  EXPECT_TRUE(B.hasValue());
-  EXPECT_TRUE(any_isa<int>(B));
-  EXPECT_FALSE(any_isa<float>(B));
-
-  EXPECT_TRUE(C.hasValue());
-  EXPECT_TRUE(any_isa<int>(C));
-
-  // A const char * is a const char * but not an int.
-  EXPECT_TRUE(D.hasValue());
-  EXPECT_TRUE(any_isa<const char *>(D));
-  EXPECT_FALSE(any_isa<int>(D));
-
-  // A double is a double but not a float.
-  EXPECT_TRUE(E.hasValue());
-  EXPECT_TRUE(any_isa<double>(E));
-  EXPECT_FALSE(any_isa<float>(E));
-
-  // After copy constructing from an int, the new item and old item are both
-  // ints.
-  llvm::Any F(B);
-  EXPECT_TRUE(B.hasValue());
-  EXPECT_TRUE(F.hasValue());
-  EXPECT_TRUE(any_isa<int>(F));
-  EXPECT_TRUE(any_isa<int>(B));
-
-  // After move constructing from an int, the new item is an int and the old one
-  // isn't.
-  llvm::Any G(std::move(C));
-  EXPECT_FALSE(C.hasValue());
-  EXPECT_TRUE(G.hasValue());
-  EXPECT_TRUE(any_isa<int>(G));
-  EXPECT_FALSE(any_isa<int>(C));
-
-  // After copy-assigning from an int, the new item and old item are both ints.
-  A = F;
-  EXPECT_TRUE(A.hasValue());
-  EXPECT_TRUE(F.hasValue());
-  EXPECT_TRUE(any_isa<int>(A));
-  EXPECT_TRUE(any_isa<int>(F));
-
-  // After move-assigning from an int, the new item and old item are both ints.
-  B = std::move(G);
-  EXPECT_TRUE(B.hasValue());
-  EXPECT_FALSE(G.hasValue());
-  EXPECT_TRUE(any_isa<int>(B));
-  EXPECT_FALSE(any_isa<int>(G));
-}
-
-TEST(AnyTest, GoodAnyCast) {
-  llvm::Any A;
-  llvm::Any B{7};
-  llvm::Any C{8};
-  llvm::Any D{"hello"};
-  llvm::Any E{'x'};
-
-  // Check each value twice to make sure it isn't damaged by the cast.
-  EXPECT_EQ(7, llvm::any_cast<int>(B));
-  EXPECT_EQ(7, llvm::any_cast<int>(B));
-
-  EXPECT_STREQ("hello", llvm::any_cast<const char *>(D));
-  EXPECT_STREQ("hello", llvm::any_cast<const char *>(D));
-
-  EXPECT_EQ('x', llvm::any_cast<char>(E));
-  EXPECT_EQ('x', llvm::any_cast<char>(E));
-
-  llvm::Any F(B);
-  EXPECT_EQ(7, llvm::any_cast<int>(F));
-  EXPECT_EQ(7, llvm::any_cast<int>(F));
-
-  llvm::Any G(std::move(C));
-  EXPECT_EQ(8, llvm::any_cast<int>(G));
-  EXPECT_EQ(8, llvm::any_cast<int>(G));
-
-  A = F;
-  EXPECT_EQ(7, llvm::any_cast<int>(A));
-  EXPECT_EQ(7, llvm::any_cast<int>(A));
-
-  E = std::move(G);
-  EXPECT_EQ(8, llvm::any_cast<int>(E));
-  EXPECT_EQ(8, llvm::any_cast<int>(E));
-
-  // Make sure we can any_cast from an rvalue and that it's properly destroyed
-  // in the process.
-  EXPECT_EQ(8, llvm::any_cast<int>(std::move(E)));
-  EXPECT_TRUE(E.hasValue());
-
-  // Make sure moving from pointers gives back pointers, and that we can modify
-  // the underlying value through those pointers.
-  EXPECT_EQ(7, *llvm::any_cast<int>(&A));
-  int *N = llvm::any_cast<int>(&A);
-  *N = 42;
-  EXPECT_EQ(42, llvm::any_cast<int>(A));
-
-  // Make sure that we can any_cast to a reference and this is considered a good
-  // cast, resulting in an lvalue which can be modified.
-  llvm::any_cast<int &>(A) = 43;
-  EXPECT_EQ(43, llvm::any_cast<int>(A));
-}
-
-TEST(AnyTest, CopiesAndMoves) {
-  struct TestType {
-    TestType() = default;
-    TestType(const TestType &Other)
-        : Copies(Other.Copies + 1), Moves(Other.Moves) {}
-    TestType(TestType &&Other) : Copies(Other.Copies), Moves(Other.Moves + 1) {}
-    int Copies = 0;
-    int Moves = 0;
-  };
-
-  // One move to get TestType into the Any, and one move on the cast.
-  TestType T1 = llvm::any_cast<TestType>(Any{TestType()});
-  EXPECT_EQ(0, T1.Copies);
-  EXPECT_EQ(2, T1.Moves);
-
-  // One move to get TestType into the Any, and one copy on the cast.
-  Any A{TestType()};
-  TestType T2 = llvm::any_cast<TestType>(A);
-  EXPECT_EQ(1, T2.Copies);
-  EXPECT_EQ(1, T2.Moves);
-
-  // One move to get TestType into the Any, and one move on the cast.
-  TestType T3 = llvm::any_cast<TestType>(std::move(A));
-  EXPECT_EQ(0, T3.Copies);
-  EXPECT_EQ(2, T3.Moves);
-}
-
-TEST(AnyTest, BadAnyCast) {
-  llvm::Any A;
-  llvm::Any B{7};
-  llvm::Any C{"hello"};
-  llvm::Any D{'x'};
-
-#if !defined(NDEBUG) && GTEST_HAS_DEATH_TEST
-  EXPECT_DEATH(llvm::any_cast<int>(A), "");
-
-  EXPECT_DEATH(llvm::any_cast<float>(B), "");
-  EXPECT_DEATH(llvm::any_cast<int *>(B), "");
-
-  EXPECT_DEATH(llvm::any_cast<std::string>(C), "");
-
-  EXPECT_DEATH(llvm::any_cast<unsigned char>(D), "");
-#endif
-}
-
-} // anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/ArrayRefTest.cpp b/gnu/llvm/llvm/unittests/ADT/ArrayRefTest.cpp
deleted file mode 100644
index f3da4c675a8..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/ArrayRefTest.cpp
+++ /dev/null
@@ -1,268 +0,0 @@
-//===- llvm/unittest/ADT/ArrayRefTest.cpp - ArrayRef unit tests -----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/Support/Allocator.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gtest/gtest.h"
-#include <limits>
-#include <vector>
-using namespace llvm;
-
-// Check that the ArrayRef-of-pointer converting constructor only allows adding
-// cv qualifiers (not removing them, or otherwise changing the type)
-static_assert(
-    std::is_convertible<ArrayRef<int *>, ArrayRef<const int *>>::value,
-    "Adding const");
-static_assert(
-    std::is_convertible<ArrayRef<int *>, ArrayRef<volatile int *>>::value,
-    "Adding volatile");
-static_assert(!std::is_convertible<ArrayRef<int *>, ArrayRef<float *>>::value,
-              "Changing pointer of one type to a pointer of another");
-static_assert(
-    !std::is_convertible<ArrayRef<const int *>, ArrayRef<int *>>::value,
-    "Removing const");
-static_assert(
-    !std::is_convertible<ArrayRef<volatile int *>, ArrayRef<int *>>::value,
-    "Removing volatile");
-
-// Check that we can't accidentally assign a temporary location to an ArrayRef.
-// (Unfortunately we can't make use of the same thing with constructors.)
-static_assert(
-    !std::is_assignable<ArrayRef<int *>&, int *>::value,
-    "Assigning from single prvalue element");
-static_assert(
-    !std::is_assignable<ArrayRef<int *>&, int * &&>::value,
-    "Assigning from single xvalue element");
-static_assert(
-    std::is_assignable<ArrayRef<int *>&, int * &>::value,
-    "Assigning from single lvalue element");
-static_assert(
-    !std::is_assignable<ArrayRef<int *>&, std::initializer_list<int *>>::value,
-    "Assigning from an initializer list");
-
-namespace {
-
-TEST(ArrayRefTest, AllocatorCopy) {
-  BumpPtrAllocator Alloc;
-  static const uint16_t Words1[] = { 1, 4, 200, 37 };
-  ArrayRef<uint16_t> Array1 = makeArrayRef(Words1, 4);
-  static const uint16_t Words2[] = { 11, 4003, 67, 64000, 13 };
-  ArrayRef<uint16_t> Array2 = makeArrayRef(Words2, 5);
-  ArrayRef<uint16_t> Array1c = Array1.copy(Alloc);
-  ArrayRef<uint16_t> Array2c = Array2.copy(Alloc);
-  EXPECT_TRUE(Array1.equals(Array1c));
-  EXPECT_NE(Array1.data(), Array1c.data());
-  EXPECT_TRUE(Array2.equals(Array2c));
-  EXPECT_NE(Array2.data(), Array2c.data());
-
-  // Check that copy can cope with uninitialized memory.
-  struct NonAssignable {
-    const char *Ptr;
-
-    NonAssignable(const char *Ptr) : Ptr(Ptr) {}
-    NonAssignable(const NonAssignable &RHS) = default;
-    void operator=(const NonAssignable &RHS) { assert(RHS.Ptr != nullptr); }
-    bool operator==(const NonAssignable &RHS) const { return Ptr == RHS.Ptr; }
-  } Array3Src[] = {"hello", "world"};
-  ArrayRef<NonAssignable> Array3Copy = makeArrayRef(Array3Src).copy(Alloc);
-  EXPECT_EQ(makeArrayRef(Array3Src), Array3Copy);
-  EXPECT_NE(makeArrayRef(Array3Src).data(), Array3Copy.data());
-}
-
-// This test is pure UB given the ArrayRef<> implementation.
-// You are not allowed to produce non-null pointers given null base pointer.
-TEST(ArrayRefTest, DISABLED_SizeTSizedOperations) {
-  ArrayRef<char> AR(nullptr, std::numeric_limits<ptrdiff_t>::max());
-
-  // Check that drop_back accepts size_t-sized numbers.
-  EXPECT_EQ(1U, AR.drop_back(AR.size() - 1).size());
-
-  // Check that drop_front accepts size_t-sized numbers.
-  EXPECT_EQ(1U, AR.drop_front(AR.size() - 1).size());
-
-  // Check that slice accepts size_t-sized numbers.
-  EXPECT_EQ(1U, AR.slice(AR.size() - 1).size());
-  EXPECT_EQ(AR.size() - 1, AR.slice(1, AR.size() - 1).size());
-}
-
-TEST(ArrayRefTest, DropBack) {
-  static const int TheNumbers[] = {4, 8, 15, 16, 23, 42};
-  ArrayRef<int> AR1(TheNumbers);
-  ArrayRef<int> AR2(TheNumbers, AR1.size() - 1);
-  EXPECT_TRUE(AR1.drop_back().equals(AR2));
-}
-
-TEST(ArrayRefTest, DropFront) {
-  static const int TheNumbers[] = {4, 8, 15, 16, 23, 42};
-  ArrayRef<int> AR1(TheNumbers);
-  ArrayRef<int> AR2(&TheNumbers[2], AR1.size() - 2);
-  EXPECT_TRUE(AR1.drop_front(2).equals(AR2));
-}
-
-TEST(ArrayRefTest, DropWhile) {
-  static const int TheNumbers[] = {1, 3, 5, 8, 10, 11};
-  ArrayRef<int> AR1(TheNumbers);
-  ArrayRef<int> Expected = AR1.drop_front(3);
-  EXPECT_EQ(Expected, AR1.drop_while([](const int &N) { return N % 2 == 1; }));
-
-  EXPECT_EQ(AR1, AR1.drop_while([](const int &N) { return N < 0; }));
-  EXPECT_EQ(ArrayRef<int>(),
-            AR1.drop_while([](const int &N) { return N > 0; }));
-}
-
-TEST(ArrayRefTest, DropUntil) {
-  static const int TheNumbers[] = {1, 3, 5, 8, 10, 11};
-  ArrayRef<int> AR1(TheNumbers);
-  ArrayRef<int> Expected = AR1.drop_front(3);
-  EXPECT_EQ(Expected, AR1.drop_until([](const int &N) { return N % 2 == 0; }));
-
-  EXPECT_EQ(ArrayRef<int>(),
-            AR1.drop_until([](const int &N) { return N < 0; }));
-  EXPECT_EQ(AR1, AR1.drop_until([](const int &N) { return N > 0; }));
-}
-
-TEST(ArrayRefTest, TakeBack) {
-  static const int TheNumbers[] = {4, 8, 15, 16, 23, 42};
-  ArrayRef<int> AR1(TheNumbers);
-  ArrayRef<int> AR2(AR1.end() - 1, 1);
-  EXPECT_TRUE(AR1.take_back().equals(AR2));
-}
-
-TEST(ArrayRefTest, TakeFront) {
-  static const int TheNumbers[] = {4, 8, 15, 16, 23, 42};
-  ArrayRef<int> AR1(TheNumbers);
-  ArrayRef<int> AR2(AR1.data(), 2);
-  EXPECT_TRUE(AR1.take_front(2).equals(AR2));
-}
-
-TEST(ArrayRefTest, TakeWhile) {
-  static const int TheNumbers[] = {1, 3, 5, 8, 10, 11};
-  ArrayRef<int> AR1(TheNumbers);
-  ArrayRef<int> Expected = AR1.take_front(3);
-  EXPECT_EQ(Expected, AR1.take_while([](const int &N) { return N % 2 == 1; }));
-
-  EXPECT_EQ(ArrayRef<int>(),
-            AR1.take_while([](const int &N) { return N < 0; }));
-  EXPECT_EQ(AR1, AR1.take_while([](const int &N) { return N > 0; }));
-}
-
-TEST(ArrayRefTest, TakeUntil) {
-  static const int TheNumbers[] = {1, 3, 5, 8, 10, 11};
-  ArrayRef<int> AR1(TheNumbers);
-  ArrayRef<int> Expected = AR1.take_front(3);
-  EXPECT_EQ(Expected, AR1.take_until([](const int &N) { return N % 2 == 0; }));
-
-  EXPECT_EQ(AR1, AR1.take_until([](const int &N) { return N < 0; }));
-  EXPECT_EQ(ArrayRef<int>(),
-            AR1.take_until([](const int &N) { return N > 0; }));
-}
-
-TEST(ArrayRefTest, Equals) {
-  static const int A1[] = {1, 2, 3, 4, 5, 6, 7, 8};
-  ArrayRef<int> AR1(A1);
-  EXPECT_TRUE(AR1.equals({1, 2, 3, 4, 5, 6, 7, 8}));
-  EXPECT_FALSE(AR1.equals({8, 1, 2, 4, 5, 6, 6, 7}));
-  EXPECT_FALSE(AR1.equals({2, 4, 5, 6, 6, 7, 8, 1}));
-  EXPECT_FALSE(AR1.equals({0, 1, 2, 4, 5, 6, 6, 7}));
-  EXPECT_FALSE(AR1.equals({1, 2, 42, 4, 5, 6, 7, 8}));
-  EXPECT_FALSE(AR1.equals({42, 2, 3, 4, 5, 6, 7, 8}));
-  EXPECT_FALSE(AR1.equals({1, 2, 3, 4, 5, 6, 7, 42}));
-  EXPECT_FALSE(AR1.equals({1, 2, 3, 4, 5, 6, 7}));
-  EXPECT_FALSE(AR1.equals({1, 2, 3, 4, 5, 6, 7, 8, 9}));
-
-  ArrayRef<int> AR1a = AR1.drop_back();
-  EXPECT_TRUE(AR1a.equals({1, 2, 3, 4, 5, 6, 7}));
-  EXPECT_FALSE(AR1a.equals({1, 2, 3, 4, 5, 6, 7, 8}));
-
-  ArrayRef<int> AR1b = AR1a.slice(2, 4);
-  EXPECT_TRUE(AR1b.equals({3, 4, 5, 6}));
-  EXPECT_FALSE(AR1b.equals({2, 3, 4, 5, 6}));
-  EXPECT_FALSE(AR1b.equals({3, 4, 5, 6, 7}));
-}
-
-TEST(ArrayRefTest, EmptyEquals) {
-  EXPECT_TRUE(ArrayRef<unsigned>() == ArrayRef<unsigned>());
-}
-
-TEST(ArrayRefTest, ConstConvert) {
-  int buf[4];
-  for (int i = 0; i < 4; ++i)
-    buf[i] = i;
-
-  static int *A[] = {&buf[0], &buf[1], &buf[2], &buf[3]};
-  ArrayRef<const int *> a((ArrayRef<int *>(A)));
-  a = ArrayRef<int *>(A);
-}
-
-static std::vector<int> ReturnTest12() { return {1, 2}; }
-static void ArgTest12(ArrayRef<int> A) {
-  EXPECT_EQ(2U, A.size());
-  EXPECT_EQ(1, A[0]);
-  EXPECT_EQ(2, A[1]);
-}
-
-TEST(ArrayRefTest, InitializerList) {
-  std::initializer_list<int> init_list = { 0, 1, 2, 3, 4 };
-  ArrayRef<int> A = init_list;
-  for (int i = 0; i < 5; ++i)
-    EXPECT_EQ(i, A[i]);
-
-  std::vector<int> B = ReturnTest12();
-  A = B;
-  EXPECT_EQ(1, A[0]);
-  EXPECT_EQ(2, A[1]);
-
-  ArgTest12({1, 2});
-}
-
-TEST(ArrayRefTest, EmptyInitializerList) {
-  ArrayRef<int> A = {};
-  EXPECT_TRUE(A.empty());
-
-  A = {};
-  EXPECT_TRUE(A.empty());
-}
-
-// Test that makeArrayRef works on ArrayRef (no-op)
-TEST(ArrayRefTest, makeArrayRef) {
-  static const int A1[] = {1, 2, 3, 4, 5, 6, 7, 8};
-
-  // No copy expected for non-const ArrayRef (true no-op)
-  ArrayRef<int> AR1(A1);
-  ArrayRef<int> &AR1Ref = makeArrayRef(AR1);
-  EXPECT_EQ(&AR1, &AR1Ref);
-
-  // A copy is expected for non-const ArrayRef (thin copy)
-  const ArrayRef<int> AR2(A1);
-  const ArrayRef<int> &AR2Ref = makeArrayRef(AR2);
-  EXPECT_NE(&AR2Ref, &AR2);
-  EXPECT_TRUE(AR2.equals(AR2Ref));
-}
-
-TEST(ArrayRefTest, OwningArrayRef) {
-  static const int A1[] = {0, 1};
-  OwningArrayRef<int> A(makeArrayRef(A1));
-  OwningArrayRef<int> B(std::move(A));
-  EXPECT_EQ(A.data(), nullptr);
-}
-
-TEST(ArrayRefTest, makeArrayRefFromStdArray) {
-  std::array<int, 5> A1{{42, -5, 0, 1000000, -1000000}};
-  ArrayRef<int> A2 = makeArrayRef(A1);
-
-  EXPECT_EQ(A1.size(), A2.size());
-  for (std::size_t i = 0; i < A1.size(); ++i) {
-    EXPECT_EQ(A1[i], A2[i]);
-  }
-}
-
-static_assert(std::is_trivially_copyable<ArrayRef<int>>::value,
-              "trivially copyable");
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/BitFieldsTest.cpp b/gnu/llvm/llvm/unittests/ADT/BitFieldsTest.cpp
deleted file mode 100644
index 3062d5d7f29..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/BitFieldsTest.cpp
+++ /dev/null
@@ -1,256 +0,0 @@
-//===- llvm/unittests/ADT/BitFieldsTest.cpp - BitFields unit tests --------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/Bitfields.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST(BitfieldsTest, Example) {
-  uint8_t Storage = 0;
-
-  // Store and retrieve a single bit as bool.
-  using Bool = Bitfield::Element<bool, 0, 1>;
-  Bitfield::set<Bool>(Storage, true);
-  EXPECT_EQ(Storage, 0b00000001);
-  //                          ^
-  EXPECT_EQ(Bitfield::get<Bool>(Storage), true);
-
-  // Store and retrieve a 2 bit typed enum.
-  // Note: enum underlying type must be unsigned.
-  enum class SuitEnum : uint8_t { CLUBS, DIAMONDS, HEARTS, SPADES };
-  // Note: enum maximum value needs to be passed in as last parameter.
-  using Suit = Bitfield::Element<SuitEnum, 1, 2, SuitEnum::SPADES>;
-  Bitfield::set<Suit>(Storage, SuitEnum::HEARTS);
-  EXPECT_EQ(Storage, 0b00000101);
-  //                        ^^
-  EXPECT_EQ(Bitfield::get<Suit>(Storage), SuitEnum::HEARTS);
-
-  // Store and retrieve a 5 bit value as unsigned.
-  using Value = Bitfield::Element<unsigned, 3, 5>;
-  Bitfield::set<Value>(Storage, 10);
-  EXPECT_EQ(Storage, 0b01010101);
-  //                   ^^^^^
-  EXPECT_EQ(Bitfield::get<Value>(Storage), 10U);
-
-  // Interpret the same 5 bit value as signed.
-  using SignedValue = Bitfield::Element<int, 3, 5>;
-  Bitfield::set<SignedValue>(Storage, -2);
-  EXPECT_EQ(Storage, 0b11110101);
-  //                   ^^^^^
-  EXPECT_EQ(Bitfield::get<SignedValue>(Storage), -2);
-
-  // Ability to efficiently test if a field is non zero.
-  EXPECT_TRUE(Bitfield::test<Value>(Storage));
-
-  // Alter Storage changes value.
-  Storage = 0;
-  EXPECT_EQ(Bitfield::get<Bool>(Storage), false);
-  EXPECT_EQ(Bitfield::get<Suit>(Storage), SuitEnum::CLUBS);
-  EXPECT_EQ(Bitfield::get<Value>(Storage), 0U);
-  EXPECT_EQ(Bitfield::get<SignedValue>(Storage), 0);
-
-  Storage = 255;
-  EXPECT_EQ(Bitfield::get<Bool>(Storage), true);
-  EXPECT_EQ(Bitfield::get<Suit>(Storage), SuitEnum::SPADES);
-  EXPECT_EQ(Bitfield::get<Value>(Storage), 31U);
-  EXPECT_EQ(Bitfield::get<SignedValue>(Storage), -1);
-}
-
-TEST(BitfieldsTest, FirstBit) {
-  uint8_t Storage = 0;
-  using FirstBit = Bitfield::Element<bool, 0, 1>;
-  // Set true
-  Bitfield::set<FirstBit>(Storage, true);
-  EXPECT_EQ(Bitfield::get<FirstBit>(Storage), true);
-  EXPECT_EQ(Storage, 0x1ULL);
-  // Set false
-  Bitfield::set<FirstBit>(Storage, false);
-  EXPECT_EQ(Bitfield::get<FirstBit>(Storage), false);
-  EXPECT_EQ(Storage, 0x0ULL);
-}
-
-TEST(BitfieldsTest, SecondBit) {
-  uint8_t Storage = 0;
-  using SecondBit = Bitfield::Element<bool, 1, 1>;
-  // Set true
-  Bitfield::set<SecondBit>(Storage, true);
-  EXPECT_EQ(Bitfield::get<SecondBit>(Storage), true);
-  EXPECT_EQ(Storage, 0x2ULL);
-  // Set false
-  Bitfield::set<SecondBit>(Storage, false);
-  EXPECT_EQ(Bitfield::get<SecondBit>(Storage), false);
-  EXPECT_EQ(Storage, 0x0ULL);
-}
-
-TEST(BitfieldsTest, LastBit) {
-  uint8_t Storage = 0;
-  using LastBit = Bitfield::Element<bool, 7, 1>;
-  // Set true
-  Bitfield::set<LastBit>(Storage, true);
-  EXPECT_EQ(Bitfield::get<LastBit>(Storage), true);
-  EXPECT_EQ(Storage, 0x80ULL);
-  // Set false
-  Bitfield::set<LastBit>(Storage, false);
-  EXPECT_EQ(Bitfield::get<LastBit>(Storage), false);
-  EXPECT_EQ(Storage, 0x0ULL);
-}
-
-TEST(BitfieldsTest, LastBitUint64) {
-  uint64_t Storage = 0;
-  using LastBit = Bitfield::Element<bool, 63, 1>;
-  // Set true
-  Bitfield::set<LastBit>(Storage, true);
-  EXPECT_EQ(Bitfield::get<LastBit>(Storage), true);
-  EXPECT_EQ(Storage, 0x8000000000000000ULL);
-  // Set false
-  Bitfield::set<LastBit>(Storage, false);
-  EXPECT_EQ(Bitfield::get<LastBit>(Storage), false);
-  EXPECT_EQ(Storage, 0x0ULL);
-}
-
-TEST(BitfieldsTest, Enum) {
-  enum Enum : unsigned { Zero = 0, Two = 2, LAST = Two };
-
-  uint8_t Storage = 0;
-  using OrderingField = Bitfield::Element<Enum, 1, 2, LAST>;
-  EXPECT_EQ(Bitfield::get<OrderingField>(Storage), Zero);
-  Bitfield::set<OrderingField>(Storage, Two);
-  EXPECT_EQ(Bitfield::get<OrderingField>(Storage), Two);
-  EXPECT_EQ(Storage, 0b00000100);
-  // value 2 in             ^^
-}
-
-TEST(BitfieldsTest, EnumClass) {
-  enum class Enum : unsigned { Zero = 0, Two = 2, LAST = Two };
-
-  uint8_t Storage = 0;
-  using OrderingField = Bitfield::Element<Enum, 1, 2, Enum::LAST>;
-  EXPECT_EQ(Bitfield::get<OrderingField>(Storage), Enum::Zero);
-  Bitfield::set<OrderingField>(Storage, Enum::Two);
-  EXPECT_EQ(Bitfield::get<OrderingField>(Storage), Enum::Two);
-  EXPECT_EQ(Storage, 0b00000100);
-  // value 2 in             ^^
-}
-
-TEST(BitfieldsTest, OneBitSigned) {
-  uint8_t Storage = 0;
-  using SignedField = Bitfield::Element<int, 1, 1>;
-  EXPECT_EQ(Bitfield::get<SignedField>(Storage), 0);
-  EXPECT_EQ(Storage, 0b00000000);
-  // value 0 in              ^
-  Bitfield::set<SignedField>(Storage, -1);
-  EXPECT_EQ(Bitfield::get<SignedField>(Storage), -1);
-  EXPECT_EQ(Storage, 0b00000010);
-  // value 1 in              ^
-}
-
-TEST(BitfieldsTest, TwoBitSigned) {
-  uint8_t Storage = 0;
-  using SignedField = Bitfield::Element<int, 1, 2>;
-  EXPECT_EQ(Bitfield::get<SignedField>(Storage), 0);
-  EXPECT_EQ(Storage, 0b00000000);
-  // value 0 in             ^^
-  Bitfield::set<SignedField>(Storage, 1);
-  EXPECT_EQ(Bitfield::get<SignedField>(Storage), 1);
-  EXPECT_EQ(Storage, 0b00000010);
-  // value 1 in             ^^
-  Bitfield::set<SignedField>(Storage, -1);
-  EXPECT_EQ(Bitfield::get<SignedField>(Storage), -1);
-  EXPECT_EQ(Storage, 0b00000110);
-  // value -1 in            ^^
-  Bitfield::set<SignedField>(Storage, -2);
-  EXPECT_EQ(Bitfield::get<SignedField>(Storage), -2);
-  EXPECT_EQ(Storage, 0b00000100);
-  // value -2 in            ^^
-}
-
-TEST(BitfieldsTest, isOverlapping) {
-  //    01234567
-  // A: --------
-  // B:    ---
-  // C:  ---
-  // D:     ---
-  using A = Bitfield::Element<unsigned, 0, 8>;
-  using B = Bitfield::Element<unsigned, 3, 3>;
-  using C = Bitfield::Element<unsigned, 1, 3>;
-  using D = Bitfield::Element<unsigned, 4, 3>;
-  EXPECT_TRUE((Bitfield::isOverlapping<A, B>()));
-  EXPECT_TRUE((Bitfield::isOverlapping<A, C>()));
-  EXPECT_TRUE((Bitfield::isOverlapping<A, B>()));
-  EXPECT_TRUE((Bitfield::isOverlapping<A, D>()));
-
-  EXPECT_TRUE((Bitfield::isOverlapping<B, C>()));
-  EXPECT_TRUE((Bitfield::isOverlapping<B, D>()));
-  EXPECT_FALSE((Bitfield::isOverlapping<C, D>()));
-}
-
-TEST(BitfieldsTest, areContiguous) {
-  using A = Bitfield::Element<unsigned, 0, 1>; // Next Bit:1
-  using B = Bitfield::Element<unsigned, 1, 4>; // Next Bit:5
-  using C = Bitfield::Element<unsigned, 5, 3>; // Next Bit:8
-  EXPECT_TRUE((Bitfield::areContiguous<A, B>()));
-  EXPECT_TRUE((Bitfield::areContiguous<A, B, C>()));
-
-  EXPECT_FALSE((Bitfield::areContiguous<A, C>()));
-  EXPECT_FALSE((Bitfield::areContiguous<A, A>()));
-  EXPECT_FALSE((Bitfield::areContiguous<B, A>()));
-}
-
-TEST(BitfieldsTest, FullUint64) {
-  uint64_t Storage = 0;
-  using Value = Bitfield::Element<uint64_t, 0, 64>;
-  Bitfield::set<Value>(Storage, -1ULL);
-  EXPECT_EQ(Bitfield::get<Value>(Storage), -1ULL);
-  Bitfield::set<Value>(Storage, 0ULL);
-  EXPECT_EQ(Bitfield::get<Value>(Storage), 0ULL);
-}
-
-TEST(BitfieldsTest, FullInt64) {
-  uint64_t Storage = 0;
-  using Value = Bitfield::Element<int64_t, 0, 64>;
-  Bitfield::set<Value>(Storage, -1);
-  EXPECT_EQ(Bitfield::get<Value>(Storage), -1);
-  Bitfield::set<Value>(Storage, 0);
-  EXPECT_EQ(Bitfield::get<Value>(Storage), 0);
-}
-
-#ifdef EXPECT_DEBUG_DEATH
-
-TEST(BitfieldsTest, ValueTooBigBool) {
-  uint64_t Storage = 0;
-  using A = Bitfield::Element<unsigned, 0, 1>;
-  Bitfield::set<A>(Storage, true);
-  Bitfield::set<A>(Storage, false);
-  EXPECT_DEBUG_DEATH(Bitfield::set<A>(Storage, 2), "value is too big");
-}
-
-TEST(BitfieldsTest, ValueTooBigInt) {
-  uint64_t Storage = 0;
-  using A = Bitfield::Element<unsigned, 0, 2>;
-  Bitfield::set<A>(Storage, 3);
-  EXPECT_DEBUG_DEATH(Bitfield::set<A>(Storage, 4), "value is too big");
-  EXPECT_DEBUG_DEATH(Bitfield::set<A>(Storage, -1), "value is too big");
-}
-
-TEST(BitfieldsTest, ValueTooBigBounded) {
-  uint8_t Storage = 0;
-  using A = Bitfield::Element<int, 1, 2>;
-  Bitfield::set<A>(Storage, 1);
-  Bitfield::set<A>(Storage, 0);
-  Bitfield::set<A>(Storage, -1);
-  Bitfield::set<A>(Storage, -2);
-  EXPECT_DEBUG_DEATH(Bitfield::set<A>(Storage, 2), "value is too big");
-  EXPECT_DEBUG_DEATH(Bitfield::set<A>(Storage, -3), "value is too small");
-}
-
-#endif
-
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/BitVectorTest.cpp b/gnu/llvm/llvm/unittests/ADT/BitVectorTest.cpp
deleted file mode 100644
index 7ab4ab9a9d0..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/BitVectorTest.cpp
+++ /dev/null
@@ -1,1301 +0,0 @@
-//===- llvm/unittest/ADT/BitVectorTest.cpp - BitVector tests --------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/BitVector.h"
-#include "llvm/ADT/DenseSet.h"
-#include "llvm/ADT/SmallBitVector.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-// Test fixture
-template <typename T>
-class BitVectorTest : public ::testing::Test { };
-
-// Test both BitVector and SmallBitVector with the same suite of tests.
-typedef ::testing::Types<BitVector, SmallBitVector> BitVectorTestTypes;
-TYPED_TEST_SUITE(BitVectorTest, BitVectorTestTypes, );
-
-TYPED_TEST(BitVectorTest, TrivialOperation) {
-  TypeParam Vec;
-  EXPECT_EQ(0U, Vec.count());
-  EXPECT_EQ(0U, Vec.size());
-  EXPECT_FALSE(Vec.any());
-  EXPECT_TRUE(Vec.all());
-  EXPECT_TRUE(Vec.none());
-  EXPECT_TRUE(Vec.empty());
-
-  Vec.resize(5, true);
-  EXPECT_EQ(5U, Vec.count());
-  EXPECT_EQ(5U, Vec.size());
-  EXPECT_TRUE(Vec.any());
-  EXPECT_TRUE(Vec.all());
-  EXPECT_FALSE(Vec.none());
-  EXPECT_FALSE(Vec.empty());
-
-  Vec.resize(11);
-  EXPECT_EQ(5U, Vec.count());
-  EXPECT_EQ(11U, Vec.size());
-  EXPECT_TRUE(Vec.any());
-  EXPECT_FALSE(Vec.all());
-  EXPECT_FALSE(Vec.none());
-  EXPECT_FALSE(Vec.empty());
-
-  TypeParam Inv = Vec;
-  Inv.flip();
-  EXPECT_EQ(6U, Inv.count());
-  EXPECT_EQ(11U, Inv.size());
-  EXPECT_TRUE(Inv.any());
-  EXPECT_FALSE(Inv.all());
-  EXPECT_FALSE(Inv.none());
-  EXPECT_FALSE(Inv.empty());
-
-  EXPECT_FALSE(Inv == Vec);
-  EXPECT_TRUE(Inv != Vec);
-  Vec.flip();
-  EXPECT_TRUE(Inv == Vec);
-  EXPECT_FALSE(Inv != Vec);
-
-  // Add some "interesting" data to Vec.
-  Vec.resize(23, true);
-  Vec.resize(25, false);
-  Vec.resize(26, true);
-  Vec.resize(29, false);
-  Vec.resize(33, true);
-  Vec.resize(57, false);
-  unsigned Count = 0;
-  for (unsigned i = Vec.find_first(); i != -1u; i = Vec.find_next(i)) {
-    ++Count;
-    EXPECT_TRUE(Vec[i]);
-    EXPECT_TRUE(Vec.test(i));
-  }
-  EXPECT_EQ(Count, Vec.count());
-  EXPECT_EQ(Count, 23u);
-  EXPECT_FALSE(Vec[0]);
-  EXPECT_TRUE(Vec[32]);
-  EXPECT_FALSE(Vec[56]);
-  Vec.resize(61, false);
-
-  TypeParam Copy = Vec;
-  TypeParam Alt(3, false);
-  Alt.resize(6, true);
-  std::swap(Alt, Vec);
-  EXPECT_TRUE(Copy == Alt);
-  EXPECT_TRUE(Vec.size() == 6);
-  EXPECT_TRUE(Vec.count() == 3);
-  EXPECT_TRUE(Vec.find_first() == 3);
-  std::swap(Copy, Vec);
-
-  // Add some more "interesting" data.
-  Vec.resize(68, true);
-  Vec.resize(78, false);
-  Vec.resize(89, true);
-  Vec.resize(90, false);
-  Vec.resize(91, true);
-  Vec.resize(130, false);
-  Count = 0;
-  for (unsigned i = Vec.find_first(); i != -1u; i = Vec.find_next(i)) {
-    ++Count;
-    EXPECT_TRUE(Vec[i]);
-    EXPECT_TRUE(Vec.test(i));
-  }
-  EXPECT_EQ(Count, Vec.count());
-  EXPECT_EQ(Count, 42u);
-  EXPECT_FALSE(Vec[0]);
-  EXPECT_TRUE(Vec[32]);
-  EXPECT_FALSE(Vec[60]);
-  EXPECT_FALSE(Vec[129]);
-
-  Vec.flip(60);
-  EXPECT_TRUE(Vec[60]);
-  EXPECT_EQ(Count + 1, Vec.count());
-  Vec.flip(60);
-  EXPECT_FALSE(Vec[60]);
-  EXPECT_EQ(Count, Vec.count());
-
-  Vec.reset(32);
-  EXPECT_FALSE(Vec[32]);
-  EXPECT_EQ(Count - 1, Vec.count());
-  Vec.set(32);
-  EXPECT_TRUE(Vec[32]);
-  EXPECT_EQ(Count, Vec.count());
-
-  Vec.flip();
-  EXPECT_EQ(Vec.size() - Count, Vec.count());
-
-  Vec.reset();
-  EXPECT_EQ(0U, Vec.count());
-  EXPECT_EQ(130U, Vec.size());
-  EXPECT_FALSE(Vec.any());
-  EXPECT_FALSE(Vec.all());
-  EXPECT_TRUE(Vec.none());
-  EXPECT_FALSE(Vec.empty());
-
-  Vec.flip();
-  EXPECT_EQ(130U, Vec.count());
-  EXPECT_EQ(130U, Vec.size());
-  EXPECT_TRUE(Vec.any());
-  EXPECT_TRUE(Vec.all());
-  EXPECT_FALSE(Vec.none());
-  EXPECT_FALSE(Vec.empty());
-
-  Vec.resize(64);
-  EXPECT_EQ(64U, Vec.count());
-  EXPECT_EQ(64U, Vec.size());
-  EXPECT_TRUE(Vec.any());
-  EXPECT_TRUE(Vec.all());
-  EXPECT_FALSE(Vec.none());
-  EXPECT_FALSE(Vec.empty());
-
-  Vec.flip();
-  EXPECT_EQ(0U, Vec.count());
-  EXPECT_EQ(64U, Vec.size());
-  EXPECT_FALSE(Vec.any());
-  EXPECT_FALSE(Vec.all());
-  EXPECT_TRUE(Vec.none());
-  EXPECT_FALSE(Vec.empty());
-
-  Inv = TypeParam().flip();
-  EXPECT_EQ(0U, Inv.count());
-  EXPECT_EQ(0U, Inv.size());
-  EXPECT_FALSE(Inv.any());
-  EXPECT_TRUE(Inv.all());
-  EXPECT_TRUE(Inv.none());
-  EXPECT_TRUE(Inv.empty());
-
-  Vec.clear();
-  EXPECT_EQ(0U, Vec.count());
-  EXPECT_EQ(0U, Vec.size());
-  EXPECT_FALSE(Vec.any());
-  EXPECT_TRUE(Vec.all());
-  EXPECT_TRUE(Vec.none());
-  EXPECT_TRUE(Vec.empty());
-}
-
-TYPED_TEST(BitVectorTest, Equality) {
-  TypeParam A;
-  TypeParam B;
-  EXPECT_TRUE(A == B);
-  A.resize(10);
-  EXPECT_FALSE(A == B);
-  B.resize(10);
-  EXPECT_TRUE(A == B);
-  A.set(5);
-  EXPECT_FALSE(A == B);
-  B.set(5);
-  EXPECT_TRUE(A == B);
-  A.resize(20);
-  EXPECT_FALSE(A == B);
-  B.resize(20);
-  EXPECT_TRUE(A == B);
-}
-
-TYPED_TEST(BitVectorTest, SimpleFindOpsMultiWord) {
-  TypeParam A;
-
-  // Test finding next set and unset bits in a BitVector with multiple words
-  A.resize(100);
-  A.set(12);
-  A.set(13);
-  A.set(75);
-
-  EXPECT_EQ(75, A.find_last());
-  EXPECT_EQ(12, A.find_first());
-  EXPECT_EQ(13, A.find_next(12));
-  EXPECT_EQ(75, A.find_next(13));
-  EXPECT_EQ(-1, A.find_next(75));
-
-  EXPECT_EQ(-1, A.find_prev(12));
-  EXPECT_EQ(12, A.find_prev(13));
-  EXPECT_EQ(13, A.find_prev(75));
-  EXPECT_EQ(75, A.find_prev(90));
-
-  EXPECT_EQ(0, A.find_first_unset());
-  EXPECT_EQ(99, A.find_last_unset());
-  EXPECT_EQ(14, A.find_next_unset(11));
-  EXPECT_EQ(14, A.find_next_unset(12));
-  EXPECT_EQ(14, A.find_next_unset(13));
-  EXPECT_EQ(16, A.find_next_unset(15));
-  EXPECT_EQ(76, A.find_next_unset(74));
-  EXPECT_EQ(76, A.find_next_unset(75));
-  EXPECT_EQ(-1, A.find_next_unset(99));
-
-  A.set(0, 100);
-  EXPECT_EQ(100U, A.count());
-  EXPECT_EQ(0, A.find_first());
-  EXPECT_EQ(-1, A.find_first_unset());
-  EXPECT_EQ(-1, A.find_last_unset());
-  EXPECT_EQ(99, A.find_last());
-  EXPECT_EQ(99, A.find_next(98));
-
-  A.reset(0, 100);
-  EXPECT_EQ(0U, A.count());
-  EXPECT_EQ(-1, A.find_first());
-  EXPECT_EQ(-1, A.find_last());
-  EXPECT_EQ(0, A.find_first_unset());
-  EXPECT_EQ(99, A.find_last_unset());
-  EXPECT_EQ(99, A.find_next_unset(98));
-}
-
-// Test finding next set and unset bits in a BitVector/SmallBitVector within a
-// uintptr_t - check both 32-bit (Multi) and 64-bit (Small) targets.
-TYPED_TEST(BitVectorTest, SimpleFindOps64Bit) {
-  TypeParam A;
-
-  A.resize(57);
-  A.set(12);
-  A.set(13);
-  A.set(47);
-
-  EXPECT_EQ(47, A.find_last());
-  EXPECT_EQ(12, A.find_first());
-  EXPECT_EQ(13, A.find_next(12));
-  EXPECT_EQ(47, A.find_next(13));
-  EXPECT_EQ(-1, A.find_next(47));
-
-  EXPECT_EQ(-1, A.find_prev(12));
-  EXPECT_EQ(12, A.find_prev(13));
-  EXPECT_EQ(13, A.find_prev(47));
-  EXPECT_EQ(47, A.find_prev(56));
-
-  EXPECT_EQ(0, A.find_first_unset());
-  EXPECT_EQ(56, A.find_last_unset());
-  EXPECT_EQ(14, A.find_next_unset(11));
-  EXPECT_EQ(14, A.find_next_unset(12));
-  EXPECT_EQ(14, A.find_next_unset(13));
-  EXPECT_EQ(16, A.find_next_unset(15));
-  EXPECT_EQ(48, A.find_next_unset(46));
-  EXPECT_EQ(48, A.find_next_unset(47));
-  EXPECT_EQ(-1, A.find_next_unset(56));
-}
-
-// Check if a SmallBitVector is in small mode. This check is used in tests
-// that run for both SmallBitVector and BitVector. This check doesn't apply
-// to BitVector so we provide an overload that returns true to get the tests
-// to compile.
-static bool SmallBitVectorIsSmallMode(const SmallBitVector &bv) {
-  return bv.isSmall();
-}
-static bool SmallBitVectorIsSmallMode(const BitVector &) { return true; }
-
-// These tests are intended to exercise the single-word case of BitVector
-// and the small-mode case of SmallBitVector.
-TYPED_TEST(BitVectorTest, SimpleFindOpsSingleWord) {
-  // Test finding in an empty BitVector.
-  TypeParam A;
-  ASSERT_TRUE(SmallBitVectorIsSmallMode(A));
-  EXPECT_EQ(-1, A.find_first());
-  EXPECT_EQ(-1, A.find_last());
-  EXPECT_EQ(-1, A.find_first_unset());
-  EXPECT_EQ(-1, A.find_last_unset());
-
-  A.resize(20);
-  ASSERT_TRUE(SmallBitVectorIsSmallMode(A));
-  EXPECT_EQ(-1, A.find_first());
-  EXPECT_EQ(-1, A.find_last());
-  EXPECT_EQ(-1, A.find_next(5));
-  EXPECT_EQ(-1, A.find_next(19));
-  EXPECT_EQ(-1, A.find_prev(5));
-  EXPECT_EQ(-1, A.find_prev(20));
-  EXPECT_EQ(0, A.find_first_unset());
-  EXPECT_EQ(19, A.find_last_unset());
-  EXPECT_EQ(6, A.find_next_unset(5));
-  EXPECT_EQ(-1, A.find_next_unset(19));
-
-  A.set(3);
-  A.set(4);
-  A.set(16);
-  ASSERT_TRUE(SmallBitVectorIsSmallMode(A));
-  EXPECT_EQ(16, A.find_last());
-  EXPECT_EQ(3, A.find_first());
-  EXPECT_EQ(3, A.find_next(1));
-  EXPECT_EQ(4, A.find_next(3));
-  EXPECT_EQ(16, A.find_next(4));
-  EXPECT_EQ(-1, A.find_next(16));
-
-  EXPECT_EQ(-1, A.find_prev(3));
-  EXPECT_EQ(3, A.find_prev(4));
-  EXPECT_EQ(4, A.find_prev(16));
-  EXPECT_EQ(16, A.find_prev(18));
-
-  EXPECT_EQ(0, A.find_first_unset());
-  EXPECT_EQ(19, A.find_last_unset());
-  EXPECT_EQ(5, A.find_next_unset(3));
-  EXPECT_EQ(5, A.find_next_unset(4));
-  EXPECT_EQ(13, A.find_next_unset(12));
-  EXPECT_EQ(17, A.find_next_unset(15));
-
-  A.set();
-  ASSERT_TRUE(SmallBitVectorIsSmallMode(A));
-  EXPECT_EQ(0, A.find_first());
-  EXPECT_EQ(19, A.find_last());
-  EXPECT_EQ(6, A.find_next(5));
-  EXPECT_EQ(-1, A.find_next(19));
-  EXPECT_EQ(4, A.find_prev(5));
-  EXPECT_EQ(19, A.find_prev(20));
-  EXPECT_EQ(-1, A.find_first_unset());
-  EXPECT_EQ(-1, A.find_last_unset());
-  EXPECT_EQ(-1, A.find_next_unset(5));
-  EXPECT_EQ(-1, A.find_next_unset(19));
-}
-
-TEST(BitVectorTest, FindInRangeMultiWord) {
-  BitVector Vec;
-
-  Vec.resize(200);
-  Vec.set(3, 7);
-  Vec.set(24, 35);
-  Vec.set(50, 70);
-  Vec.set(150);
-  Vec.set(152);
-  Vec.set(154);
-
-  // find first
-  EXPECT_EQ(-1, Vec.find_first_in(0, 0));
-  EXPECT_EQ(-1, Vec.find_first_in(24, 24));
-  EXPECT_EQ(-1, Vec.find_first_in(7, 24));
-
-  EXPECT_EQ(3, Vec.find_first_in(0, 10));
-  EXPECT_EQ(4, Vec.find_first_in(4, 10));
-  EXPECT_EQ(150, Vec.find_first_in(100, 200));
-  EXPECT_EQ(152, Vec.find_first_in(151, 200));
-  EXPECT_EQ(154, Vec.find_first_in(153, 200));
-
-  EXPECT_EQ(-1, Vec.find_first_in(155, 200));
-  Vec.set(199);
-  EXPECT_EQ(199, Vec.find_first_in(199, 200));
-  Vec.reset(199);
-
-  // find last
-  EXPECT_EQ(-1, Vec.find_last_in(0, 0));
-  EXPECT_EQ(-1, Vec.find_last_in(24, 24));
-  EXPECT_EQ(-1, Vec.find_last_in(7, 24));
-
-  EXPECT_EQ(6, Vec.find_last_in(0, 10));
-  EXPECT_EQ(5, Vec.find_last_in(0, 6));
-  EXPECT_EQ(154, Vec.find_last_in(100, 155));
-  EXPECT_EQ(152, Vec.find_last_in(100, 154));
-  EXPECT_EQ(150, Vec.find_last_in(100, 152));
-  EXPECT_EQ(-1, Vec.find_last_in(100, 150));
-  Vec.set(199);
-  EXPECT_EQ(199, Vec.find_last_in(199, 200));
-  Vec.reset(199);
-
-  // find first unset
-  EXPECT_EQ(-1, Vec.find_first_unset_in(0, 0));
-  EXPECT_EQ(-1, Vec.find_first_unset_in(23, 23));
-  EXPECT_EQ(-1, Vec.find_first_unset_in(24, 35));
-
-  EXPECT_EQ(0, Vec.find_first_unset_in(0, 10));
-  EXPECT_EQ(1, Vec.find_first_unset_in(1, 10));
-  EXPECT_EQ(7, Vec.find_first_unset_in(5, 25));
-  EXPECT_EQ(151, Vec.find_first_unset_in(150, 200));
-  EXPECT_EQ(151, Vec.find_first_unset_in(151, 200));
-  EXPECT_EQ(153, Vec.find_first_unset_in(152, 200));
-  EXPECT_EQ(153, Vec.find_first_unset_in(153, 200));
-  EXPECT_EQ(155, Vec.find_first_unset_in(154, 200));
-  EXPECT_EQ(155, Vec.find_first_unset_in(155, 200));
-  EXPECT_EQ(199, Vec.find_first_unset_in(199, 200));
-
-  // find last unset
-  EXPECT_EQ(-1, Vec.find_last_unset_in(0, 0));
-  EXPECT_EQ(-1, Vec.find_last_unset_in(23, 23));
-  EXPECT_EQ(-1, Vec.find_last_unset_in(24, 35));
-
-  EXPECT_EQ(9, Vec.find_last_unset_in(0, 10));
-  EXPECT_EQ(8, Vec.find_last_unset_in(0, 9));
-  EXPECT_EQ(2, Vec.find_last_unset_in(0, 7));
-  EXPECT_EQ(149, Vec.find_last_unset_in(100, 151));
-  EXPECT_EQ(151, Vec.find_last_unset_in(100, 152));
-  EXPECT_EQ(151, Vec.find_last_unset_in(100, 153));
-  EXPECT_EQ(153, Vec.find_last_unset_in(100, 154));
-  EXPECT_EQ(153, Vec.find_last_unset_in(100, 155));
-  EXPECT_EQ(155, Vec.find_last_unset_in(100, 156));
-  EXPECT_EQ(199, Vec.find_last_unset_in(199, 200));
-}
-
-TEST(BitVectorTest, FindInRangeSingleWord) {
-  // When the bit vector contains only a single word, this is slightly different
-  // than when the bit vector contains multiple words, because masks are applied
-  // to the front and back of the same word.  So make sure this works.
-  BitVector Vec;
-
-  Vec.resize(25);
-  Vec.set(2, 4);
-  Vec.set(6, 9);
-  Vec.set(12, 15);
-  Vec.set(19);
-  Vec.set(21);
-  Vec.set(23);
-
-  // find first
-  EXPECT_EQ(-1, Vec.find_first_in(0, 0));
-  EXPECT_EQ(-1, Vec.find_first_in(24, 24));
-  EXPECT_EQ(-1, Vec.find_first_in(9, 12));
-
-  EXPECT_EQ(2, Vec.find_first_in(0, 10));
-  EXPECT_EQ(6, Vec.find_first_in(4, 10));
-  EXPECT_EQ(19, Vec.find_first_in(18, 25));
-  EXPECT_EQ(21, Vec.find_first_in(20, 25));
-  EXPECT_EQ(23, Vec.find_first_in(22, 25));
-  EXPECT_EQ(-1, Vec.find_first_in(24, 25));
-
-  // find last
-  EXPECT_EQ(-1, Vec.find_last_in(0, 0));
-  EXPECT_EQ(-1, Vec.find_last_in(24, 24));
-  EXPECT_EQ(-1, Vec.find_last_in(9, 12));
-
-  EXPECT_EQ(8, Vec.find_last_in(0, 10));
-  EXPECT_EQ(3, Vec.find_last_in(0, 6));
-  EXPECT_EQ(23, Vec.find_last_in(18, 25));
-  EXPECT_EQ(21, Vec.find_last_in(18, 23));
-  EXPECT_EQ(19, Vec.find_last_in(18, 21));
-  EXPECT_EQ(-1, Vec.find_last_in(18, 19));
-
-  // find first unset
-  EXPECT_EQ(-1, Vec.find_first_unset_in(0, 0));
-  EXPECT_EQ(-1, Vec.find_first_unset_in(23, 23));
-  EXPECT_EQ(-1, Vec.find_first_unset_in(6, 9));
-
-  EXPECT_EQ(0, Vec.find_first_unset_in(0, 6));
-  EXPECT_EQ(1, Vec.find_first_unset_in(1, 6));
-  EXPECT_EQ(9, Vec.find_first_unset_in(7, 13));
-  EXPECT_EQ(18, Vec.find_first_unset_in(18, 25));
-  EXPECT_EQ(20, Vec.find_first_unset_in(19, 25));
-  EXPECT_EQ(20, Vec.find_first_unset_in(20, 25));
-  EXPECT_EQ(22, Vec.find_first_unset_in(21, 25));
-  EXPECT_EQ(22, Vec.find_first_unset_in(22, 25));
-  EXPECT_EQ(24, Vec.find_first_unset_in(23, 25));
-  EXPECT_EQ(24, Vec.find_first_unset_in(24, 25));
-
-  // find last unset
-  EXPECT_EQ(-1, Vec.find_last_unset_in(0, 0));
-  EXPECT_EQ(-1, Vec.find_last_unset_in(23, 23));
-  EXPECT_EQ(-1, Vec.find_last_unset_in(6, 9));
-
-  EXPECT_EQ(5, Vec.find_last_unset_in(0, 6));
-  EXPECT_EQ(4, Vec.find_last_unset_in(0, 5));
-  EXPECT_EQ(1, Vec.find_last_unset_in(0, 4));
-  EXPECT_EQ(11, Vec.find_last_unset_in(7, 13));
-  EXPECT_EQ(24, Vec.find_last_unset_in(18, 25));
-  EXPECT_EQ(22, Vec.find_last_unset_in(18, 24));
-  EXPECT_EQ(22, Vec.find_last_unset_in(18, 23));
-  EXPECT_EQ(20, Vec.find_last_unset_in(18, 22));
-  EXPECT_EQ(20, Vec.find_last_unset_in(18, 21));
-  EXPECT_EQ(18, Vec.find_last_unset_in(18, 20));
-  EXPECT_EQ(18, Vec.find_last_unset_in(18, 19));
-}
-
-TYPED_TEST(BitVectorTest, CompoundAssignment) {
-  TypeParam A;
-  A.resize(10);
-  A.set(4);
-  A.set(7);
-
-  TypeParam B;
-  B.resize(50);
-  B.set(5);
-  B.set(18);
-
-  A |= B;
-  EXPECT_TRUE(A.test(4));
-  EXPECT_TRUE(A.test(5));
-  EXPECT_TRUE(A.test(7));
-  EXPECT_TRUE(A.test(18));
-  EXPECT_EQ(4U, A.count());
-  EXPECT_EQ(50U, A.size());
-
-  B.resize(10);
-  B.set();
-  B.reset(2);
-  B.reset(7);
-  A &= B;
-  EXPECT_FALSE(A.test(2));
-  EXPECT_FALSE(A.test(7));
-  EXPECT_TRUE(A.test(4));
-  EXPECT_TRUE(A.test(5));
-  EXPECT_EQ(2U, A.count());
-  EXPECT_EQ(50U, A.size());
-
-  B.resize(100);
-  B.set();
-
-  A ^= B;
-  EXPECT_TRUE(A.test(2));
-  EXPECT_TRUE(A.test(7));
-  EXPECT_EQ(98U, A.count());
-  EXPECT_EQ(100U, A.size());
-}
-
-// Test SmallBitVector operations with mixed big/small representations
-TYPED_TEST(BitVectorTest, MixedBigSmall) {
-  {
-    TypeParam Big;
-    TypeParam Small;
-
-    Big.reserve(100);
-    Big.resize(20);
-    Small.resize(10);
-
-    Small.set(0);
-    Small.set(1);
-    Big.set(0);
-    Big.set(2);
-    Big.set(16);
-
-    Small &= Big;
-    EXPECT_TRUE(Small.test(0));
-    EXPECT_EQ(1u, Small.count());
-    // FIXME BitVector and SmallBitVector behave differently here.
-    // SmallBitVector resizes the LHS to max(LHS.size(), RHS.size())
-    // but BitVector does not.
-    // EXPECT_EQ(20u, Small.size());
-  }
-
-  {
-    TypeParam Big;
-    TypeParam Small;
-
-    Big.reserve(100);
-    Big.resize(20);
-    Small.resize(10);
-
-    Small.set(0);
-    Small.set(1);
-    Big.set(0);
-    Big.set(2);
-    Big.set(16);
-
-    Big &= Small;
-    EXPECT_TRUE(Big.test(0));
-    EXPECT_EQ(1u, Big.count());
-    // FIXME BitVector and SmallBitVector behave differently here.
-    // SmallBitVector resizes the LHS to max(LHS.size(), RHS.size())
-    // but BitVector does not.
-    // EXPECT_EQ(20u, Big.size());
-  }
-
-  {
-    TypeParam Big;
-    TypeParam Small;
-
-    Big.reserve(100);
-    Big.resize(20);
-    Small.resize(10);
-
-    Small.set(0);
-    Small.set(1);
-    Big.set(0);
-    Big.set(2);
-    Big.set(16);
-
-    Small |= Big;
-    EXPECT_TRUE(Small.test(0));
-    EXPECT_TRUE(Small.test(1));
-    EXPECT_TRUE(Small.test(2));
-    EXPECT_TRUE(Small.test(16));
-    EXPECT_EQ(4u, Small.count());
-    EXPECT_EQ(20u, Small.size());
-  }
-
-  {
-    TypeParam Big;
-    TypeParam Small;
-
-    Big.reserve(100);
-    Big.resize(20);
-    Small.resize(10);
-
-    Small.set(0);
-    Small.set(1);
-    Big.set(0);
-    Big.set(2);
-    Big.set(16);
-
-    Big |= Small;
-    EXPECT_TRUE(Big.test(0));
-    EXPECT_TRUE(Big.test(1));
-    EXPECT_TRUE(Big.test(2));
-    EXPECT_TRUE(Big.test(16));
-    EXPECT_EQ(4u, Big.count());
-    EXPECT_EQ(20u, Big.size());
-  }
-
-  {
-    TypeParam Big;
-    TypeParam Small;
-
-    Big.reserve(100);
-    Big.resize(20);
-    Small.resize(10);
-
-    Small.set(0);
-    Small.set(1);
-    Big.set(0);
-    Big.set(2);
-    Big.set(16);
-
-    Small ^= Big;
-    EXPECT_TRUE(Small.test(1));
-    EXPECT_TRUE(Small.test(2));
-    EXPECT_TRUE(Small.test(16));
-    EXPECT_EQ(3u, Small.count());
-    EXPECT_EQ(20u, Small.size());
-  }
-
-  {
-    TypeParam Big;
-    TypeParam Small;
-
-    Big.reserve(100);
-    Big.resize(20);
-    Small.resize(10);
-
-    Small.set(0);
-    Small.set(1);
-    Big.set(0);
-    Big.set(2);
-    Big.set(16);
-
-    Big ^= Small;
-    EXPECT_TRUE(Big.test(1));
-    EXPECT_TRUE(Big.test(2));
-    EXPECT_TRUE(Big.test(16));
-    EXPECT_EQ(3u, Big.count());
-    EXPECT_EQ(20u, Big.size());
-  }
-
-  {
-    TypeParam Big;
-    TypeParam Small;
-
-    Big.reserve(100);
-    Big.resize(20);
-    Small.resize(10);
-
-    Small.set(0);
-    Small.set(1);
-    Big.set(0);
-    Big.set(2);
-    Big.set(16);
-
-    Small.reset(Big);
-    EXPECT_TRUE(Small.test(1));
-    EXPECT_EQ(1u, Small.count());
-    EXPECT_EQ(10u, Small.size());
-  }
-
-  {
-    TypeParam Big;
-    TypeParam Small;
-
-    Big.reserve(100);
-    Big.resize(20);
-    Small.resize(10);
-
-    Small.set(0);
-    Small.set(1);
-    Big.set(0);
-    Big.set(2);
-    Big.set(16);
-
-    Big.reset(Small);
-    EXPECT_TRUE(Big.test(2));
-    EXPECT_TRUE(Big.test(16));
-    EXPECT_EQ(2u, Big.count());
-    EXPECT_EQ(20u, Big.size());
-  }
-
-  {
-    TypeParam Big;
-    TypeParam Small;
-
-    Big.reserve(100);
-    Big.resize(10);
-    Small.resize(10);
-
-    Small.set(0);
-    Small.set(1);
-    Big.set(0);
-
-    EXPECT_FALSE(Big == Small);
-    EXPECT_FALSE(Small == Big);
-    Big.set(1);
-    EXPECT_TRUE(Big == Small);
-    EXPECT_TRUE(Small == Big);
-  }
-
-  {
-    TypeParam Big;
-    TypeParam Small;
-
-    Big.reserve(100);
-    Big.resize(20);
-    Small.resize(10);
-
-    Small.set(0);
-    Big.set(1);
-
-    EXPECT_FALSE(Small.anyCommon(Big));
-    EXPECT_FALSE(Big.anyCommon(Small));
-    Big.set(0);
-    EXPECT_TRUE(Small.anyCommon(Big));
-    EXPECT_TRUE(Big.anyCommon(Small));
-  }
-
-  {
-    TypeParam Big;
-    TypeParam Small;
-
-    Big.reserve(100);
-    Big.resize(10);
-    Small.resize(10);
-
-    Small.set(0);
-    Small.set(1);
-    Big.set(0);
-
-    EXPECT_TRUE(Small.test(Big));
-    EXPECT_FALSE(Big.test(Small));
-    Big.set(1);
-    EXPECT_FALSE(Small.test(Big));
-    EXPECT_FALSE(Big.test(Small));
-  }
-}
-
-TYPED_TEST(BitVectorTest, ProxyIndex) {
-  TypeParam Vec(3);
-  EXPECT_TRUE(Vec.none());
-  Vec[0] = Vec[1] = Vec[2] = true;
-  EXPECT_EQ(Vec.size(), Vec.count());
-  Vec[2] = Vec[1] = Vec[0] = false;
-  EXPECT_TRUE(Vec.none());
-}
-
-
-TYPED_TEST(BitVectorTest, PortableBitMask) {
-  TypeParam A;
-  const uint32_t Mask1[] = { 0x80000000, 6, 5 };
-
-  A.resize(10);
-  A.setBitsInMask(Mask1, 1);
-  EXPECT_EQ(10u, A.size());
-  EXPECT_FALSE(A.test(0));
-
-  A.resize(32);
-  A.setBitsInMask(Mask1, 1);
-  EXPECT_FALSE(A.test(0));
-  EXPECT_TRUE(A.test(31));
-  EXPECT_EQ(1u, A.count());
-
-  A.resize(33);
-  A.setBitsInMask(Mask1, 1);
-  EXPECT_EQ(1u, A.count());
-  A.setBitsInMask(Mask1, 2);
-  EXPECT_EQ(1u, A.count());
-
-  A.resize(34);
-  A.setBitsInMask(Mask1, 2);
-  EXPECT_EQ(2u, A.count());
-
-  A.resize(65);
-  A.setBitsInMask(Mask1, 3);
-  EXPECT_EQ(4u, A.count());
-
-  A.setBitsNotInMask(Mask1, 1);
-  EXPECT_EQ(32u+3u, A.count());
-
-  A.setBitsNotInMask(Mask1, 3);
-  EXPECT_EQ(65u, A.count());
-
-  A.resize(96);
-  EXPECT_EQ(65u, A.count());
-
-  A.clear();
-  A.resize(128);
-  A.setBitsNotInMask(Mask1, 3);
-  EXPECT_EQ(96u-5u, A.count());
-
-  A.clearBitsNotInMask(Mask1, 1);
-  EXPECT_EQ(64-4u, A.count());
-}
-
-TYPED_TEST(BitVectorTest, BinOps) {
-  TypeParam A;
-  TypeParam B;
-
-  A.resize(65);
-  EXPECT_FALSE(A.anyCommon(B));
-  EXPECT_FALSE(B.anyCommon(B));
-
-  B.resize(64);
-  A.set(64);
-  EXPECT_FALSE(A.anyCommon(B));
-  EXPECT_FALSE(B.anyCommon(A));
-
-  B.set(63);
-  EXPECT_FALSE(A.anyCommon(B));
-  EXPECT_FALSE(B.anyCommon(A));
-
-  A.set(63);
-  EXPECT_TRUE(A.anyCommon(B));
-  EXPECT_TRUE(B.anyCommon(A));
-
-  B.resize(70);
-  B.set(64);
-  B.reset(63);
-  A.resize(64);
-  EXPECT_FALSE(A.anyCommon(B));
-  EXPECT_FALSE(B.anyCommon(A));
-}
-
-typedef std::vector<std::pair<int, int>> RangeList;
-
-template <typename VecType>
-static inline VecType createBitVector(uint32_t Size,
-                                      const RangeList &setRanges) {
-  VecType V;
-  V.resize(Size);
-  for (auto &R : setRanges)
-    V.set(R.first, R.second);
-  return V;
-}
-
-TYPED_TEST(BitVectorTest, ShiftOpsSingleWord) {
-  // Test that shift ops work when the desired shift amount is less
-  // than one word.
-
-  // 1. Case where the number of bits in the BitVector also fit into a single
-  // word.
-  TypeParam A = createBitVector<TypeParam>(12, {{2, 4}, {8, 10}});
-  TypeParam B = A;
-
-  EXPECT_EQ(4U, A.count());
-  EXPECT_TRUE(A.test(2));
-  EXPECT_TRUE(A.test(3));
-  EXPECT_TRUE(A.test(8));
-  EXPECT_TRUE(A.test(9));
-
-  A >>= 1;
-  EXPECT_EQ(createBitVector<TypeParam>(12, {{1, 3}, {7, 9}}), A);
-
-  A <<= 1;
-  EXPECT_EQ(B, A);
-
-  A >>= 10;
-  EXPECT_EQ(createBitVector<TypeParam>(12, {}), A);
-
-  A = B;
-  A <<= 10;
-  EXPECT_EQ(createBitVector<TypeParam>(12, {}), A);
-
-  // 2. Case where the number of bits in the BitVector do not fit into a single
-  // word.
-
-  // 31----------------------------------------------------------------------0
-  // XXXXXXXX XXXXXXXX XXXXXXXX 00000111 | 11111110 00000000 00001111 11111111
-  A = createBitVector<TypeParam>(40, {{0, 12}, {25, 35}});
-  EXPECT_EQ(40U, A.size());
-  EXPECT_EQ(22U, A.count());
-
-  // 2a. Make sure that left shifting some 1 bits out of the vector works.
-  //   31----------------------------------------------------------------------0
-  // Before:
-  //   XXXXXXXX XXXXXXXX XXXXXXXX 00000111 | 11111110 00000000 00001111 11111111
-  // After:
-  //   XXXXXXXX XXXXXXXX XXXXXXXX 11111100 | 00000000 00011111 11111110 00000000
-  A <<= 9;
-  EXPECT_EQ(createBitVector<TypeParam>(40, {{9, 21}, {34, 40}}), A);
-
-  // 2b. Make sure that keeping the number of one bits unchanged works.
-  //   31----------------------------------------------------------------------0
-  // Before:
-  //   XXXXXXXX XXXXXXXX XXXXXXXX 11111100 | 00000000 00011111 11111110 00000000
-  // After:
-  //   XXXXXXXX XXXXXXXX XXXXXXXX 00000011 | 11110000 00000000 01111111 11111000
-  A >>= 6;
-  EXPECT_EQ(createBitVector<TypeParam>(40, {{3, 15}, {28, 34}}), A);
-
-  // 2c. Make sure that right shifting some 1 bits out of the vector works.
-  //   31----------------------------------------------------------------------0
-  // Before:
-  //   XXXXXXXX XXXXXXXX XXXXXXXX 00000011 | 11110000 00000000 01111111 11111000
-  // After:
-  //   XXXXXXXX XXXXXXXX XXXXXXXX 00000000 | 00000000 11111100 00000000 00011111
-  A >>= 10;
-  EXPECT_EQ(createBitVector<TypeParam>(40, {{0, 5}, {18, 24}}), A);
-
-  // 3. Big test.
-  A = createBitVector<TypeParam>(300, {{1, 30}, {60, 95}, {200, 275}});
-  A <<= 29;
-  EXPECT_EQ(createBitVector<TypeParam>(
-                300, {{1 + 29, 30 + 29}, {60 + 29, 95 + 29}, {200 + 29, 300}}),
-            A);
-}
-
-TYPED_TEST(BitVectorTest, ShiftOpsMultiWord) {
-  // Test that shift ops work when the desired shift amount is greater than or
-  // equal to the size of a single word.
-  auto A = createBitVector<TypeParam>(300, {{1, 30}, {60, 95}, {200, 275}});
-
-  // Make a copy so we can re-use it later.
-  auto B = A;
-
-  // 1. Shift left by an exact multiple of the word size.  This should invoke
-  // only a memmove and no per-word bit operations.
-  A <<= 64;
-  auto Expected = createBitVector<TypeParam>(
-      300, {{1 + 64, 30 + 64}, {60 + 64, 95 + 64}, {200 + 64, 300}});
-  EXPECT_EQ(Expected, A);
-
-  // 2. Shift left by a non multiple of the word size.  This should invoke both
-  // a memmove and per-word bit operations.
-  A = B;
-  A <<= 93;
-  EXPECT_EQ(createBitVector<TypeParam>(
-                300, {{1 + 93, 30 + 93}, {60 + 93, 95 + 93}, {200 + 93, 300}}),
-            A);
-
-  // 1. Shift right by an exact multiple of the word size.  This should invoke
-  // only a memmove and no per-word bit operations.
-  A = B;
-  A >>= 64;
-  EXPECT_EQ(
-      createBitVector<TypeParam>(300, {{0, 95 - 64}, {200 - 64, 275 - 64}}), A);
-
-  // 2. Shift left by a non multiple of the word size.  This should invoke both
-  // a memmove and per-word bit operations.
-  A = B;
-  A >>= 93;
-  EXPECT_EQ(
-      createBitVector<TypeParam>(300, {{0, 95 - 93}, {200 - 93, 275 - 93}}), A);
-}
-
-TYPED_TEST(BitVectorTest, RangeOps) {
-  TypeParam A;
-  A.resize(256);
-  A.reset();
-  A.set(1, 255);
-
-  EXPECT_FALSE(A.test(0));
-  EXPECT_TRUE( A.test(1));
-  EXPECT_TRUE( A.test(23));
-  EXPECT_TRUE( A.test(254));
-  EXPECT_FALSE(A.test(255));
-
-  TypeParam B;
-  B.resize(256);
-  B.set();
-  B.reset(1, 255);
-
-  EXPECT_TRUE( B.test(0));
-  EXPECT_FALSE(B.test(1));
-  EXPECT_FALSE(B.test(23));
-  EXPECT_FALSE(B.test(254));
-  EXPECT_TRUE( B.test(255));
-
-  TypeParam C;
-  C.resize(3);
-  C.reset();
-  C.set(0, 1);
-
-  EXPECT_TRUE(C.test(0));
-  EXPECT_FALSE( C.test(1));
-  EXPECT_FALSE( C.test(2));
-
-  TypeParam D;
-  D.resize(3);
-  D.set();
-  D.reset(0, 1);
-
-  EXPECT_FALSE(D.test(0));
-  EXPECT_TRUE( D.test(1));
-  EXPECT_TRUE( D.test(2));
-
-  TypeParam E;
-  E.resize(128);
-  E.reset();
-  E.set(1, 33);
-
-  EXPECT_FALSE(E.test(0));
-  EXPECT_TRUE( E.test(1));
-  EXPECT_TRUE( E.test(32));
-  EXPECT_FALSE(E.test(33));
-
-  TypeParam BufferOverrun;
-  unsigned size = sizeof(unsigned long) * 8;
-  BufferOverrun.resize(size);
-  BufferOverrun.reset(0, size);
-  BufferOverrun.set(0, size);
-}
-
-TYPED_TEST(BitVectorTest, CompoundTestReset) {
-  TypeParam A(50, true);
-  TypeParam B(50, false);
-
-  TypeParam C(100, true);
-  TypeParam D(100, false);
-
-  EXPECT_FALSE(A.test(A));
-  EXPECT_TRUE(A.test(B));
-  EXPECT_FALSE(A.test(C));
-  EXPECT_TRUE(A.test(D));
-  EXPECT_FALSE(B.test(A));
-  EXPECT_FALSE(B.test(B));
-  EXPECT_FALSE(B.test(C));
-  EXPECT_FALSE(B.test(D));
-  EXPECT_TRUE(C.test(A));
-  EXPECT_TRUE(C.test(B));
-  EXPECT_FALSE(C.test(C));
-  EXPECT_TRUE(C.test(D));
-
-  A.reset(B);
-  A.reset(D);
-  EXPECT_TRUE(A.all());
-  A.reset(A);
-  EXPECT_TRUE(A.none());
-  A.set();
-  A.reset(C);
-  EXPECT_TRUE(A.none());
-  A.set();
-
-  C.reset(A);
-  EXPECT_EQ(50, C.find_first());
-  C.reset(C);
-  EXPECT_TRUE(C.none());
-}
-
-TYPED_TEST(BitVectorTest, MoveConstructor) {
-  TypeParam A(10, true);
-  TypeParam B(std::move(A));
-  // Check that the move ctor leaves the moved-from object in a valid state.
-  // The following line used to crash.
-  A = B;
-
-  TypeParam C(10, true);
-  EXPECT_EQ(C, A);
-  EXPECT_EQ(C, B);
-}
-
-TYPED_TEST(BitVectorTest, MoveAssignment) {
-  TypeParam A(10, true);
-  TypeParam B;
-  B = std::move(A);
-  // Check that move assignment leaves the moved-from object in a valid state.
-  // The following line used to crash.
-  A = B;
-
-  TypeParam C(10, true);
-  EXPECT_EQ(C, A);
-  EXPECT_EQ(C, B);
-}
-
-template<class TypeParam>
-static void testEmpty(const TypeParam &A) {
-  EXPECT_TRUE(A.empty());
-  EXPECT_EQ((size_t)0, A.size());
-  EXPECT_EQ((size_t)0, A.count());
-  EXPECT_FALSE(A.any());
-  EXPECT_TRUE(A.all());
-  EXPECT_TRUE(A.none());
-  EXPECT_EQ(-1, A.find_first());
-  EXPECT_EQ(A, TypeParam());
-}
-
-/// Tests whether BitVector behaves well with Bits==nullptr, Capacity==0
-TYPED_TEST(BitVectorTest, EmptyVector) {
-  TypeParam A;
-  testEmpty(A);
-
-  TypeParam B;
-  B.reset();
-  testEmpty(B);
-
-  TypeParam C;
-  C.clear();
-  testEmpty(C);
-
-  TypeParam D(A);
-  testEmpty(D);
-
-  TypeParam E;
-  E = A;
-  testEmpty(E);
-
-  TypeParam F;
-  E.reset(A);
-  testEmpty(E);
-}
-
-TYPED_TEST(BitVectorTest, Iterators) {
-  TypeParam Filled(10, true);
-  EXPECT_NE(Filled.set_bits_begin(), Filled.set_bits_end());
-  unsigned Counter = 0;
-  for (unsigned Bit : Filled.set_bits())
-    EXPECT_EQ(Bit, Counter++);
-
-  TypeParam Empty;
-  EXPECT_EQ(Empty.set_bits_begin(), Empty.set_bits_end());
-  int BitCount = 0;
-  for (unsigned Bit : Empty.set_bits()) {
-    (void)Bit;
-    BitCount++;
-  }
-  ASSERT_EQ(BitCount, 0);
-
-  TypeParam ToFill(100, false);
-  ToFill.set(0);
-  EXPECT_NE(ToFill.set_bits_begin(), ToFill.set_bits_end());
-  EXPECT_EQ(++ToFill.set_bits_begin(), ToFill.set_bits_end());
-  EXPECT_EQ(*ToFill.set_bits_begin(), 0U);
-  ToFill.reset(0);
-  EXPECT_EQ(ToFill.set_bits_begin(), ToFill.set_bits_end());
-
-  const unsigned List[] = {1, 10, 25, 99};
-  for (unsigned Num : List)
-    ToFill.set(Num);
-  unsigned i = 0;
-  for (unsigned Bit : ToFill.set_bits())
-    EXPECT_EQ(List[i++], Bit);
-}
-
-TYPED_TEST(BitVectorTest, PushBack) {
-  TypeParam Vec(10, false);
-  EXPECT_EQ(-1, Vec.find_first());
-  EXPECT_EQ(10U, Vec.size());
-  EXPECT_EQ(0U, Vec.count());
-
-  Vec.push_back(true);
-  EXPECT_EQ(10, Vec.find_first());
-  EXPECT_EQ(11U, Vec.size());
-  EXPECT_EQ(1U, Vec.count());
-
-  Vec.push_back(false);
-  EXPECT_EQ(10, Vec.find_first());
-  EXPECT_EQ(12U, Vec.size());
-  EXPECT_EQ(1U, Vec.count());
-
-  Vec.push_back(true);
-  EXPECT_EQ(10, Vec.find_first());
-  EXPECT_EQ(13U, Vec.size());
-  EXPECT_EQ(2U, Vec.count());
-
-  // Add a lot of values to cause reallocation.
-  for (int i = 0; i != 100; ++i) {
-    Vec.push_back(true);
-    Vec.push_back(false);
-  }
-  EXPECT_EQ(10, Vec.find_first());
-  EXPECT_EQ(213U, Vec.size());
-  EXPECT_EQ(102U, Vec.count());
-}
-
-TYPED_TEST(BitVectorTest, DenseSet) {
-  DenseSet<TypeParam> Set;
-  TypeParam A(10, true);
-  auto I = Set.insert(A);
-  EXPECT_EQ(true, I.second);
-
-  TypeParam B(5, true);
-  I = Set.insert(B);
-  EXPECT_EQ(true, I.second);
-
-  TypeParam C(20, false);
-  C.set(19);
-  I = Set.insert(C);
-  EXPECT_EQ(true, I.second);
-
-#if LLVM_ENABLE_ABI_BREAKING_CHECKS
-  TypeParam D;
-  EXPECT_DEATH(Set.insert(D),
-               "Empty/Tombstone value shouldn't be inserted into map!");
-#endif
-
-  EXPECT_EQ(3U, Set.size());
-  EXPECT_EQ(1U, Set.count(A));
-  EXPECT_EQ(1U, Set.count(B));
-  EXPECT_EQ(1U, Set.count(C));
-
-  EXPECT_EQ(true, Set.erase(B));
-  EXPECT_EQ(2U, Set.size());
-
-  EXPECT_EQ(true, Set.erase(C));
-  EXPECT_EQ(1U, Set.size());
-
-  EXPECT_EQ(true, Set.erase(A));
-  EXPECT_EQ(0U, Set.size());
-}
-
-/// Test that capacity doesn't affect hashing.
-TYPED_TEST(BitVectorTest, DenseMapHashing) {
-  using DMI = DenseMapInfo<TypeParam>;
-  {
-    TypeParam A;
-    A.resize(200);
-    A.set(100);
-
-    TypeParam B;
-    B.resize(200);
-    B.set(100);
-    B.reserve(1000);
-
-    EXPECT_EQ(DMI::getHashValue(A), DMI::getHashValue(B));
-  }
-  {
-    TypeParam A;
-    A.resize(20);
-    A.set(10);
-
-    TypeParam B;
-    B.resize(20);
-    B.set(10);
-    B.reserve(1000);
-
-    EXPECT_EQ(DMI::getHashValue(A), DMI::getHashValue(B));
-  }
-}
-
-TEST(BitVectoryTest, Apply) {
-  for (int i = 0; i < 2; ++i) {
-    int j = i * 100 + 3;
-
-    const BitVector x =
-        createBitVector<BitVector>(j + 5, {{i, i + 1}, {j - 1, j}});
-    const BitVector y = createBitVector<BitVector>(j + 5, {{i, j}});
-    const BitVector z =
-        createBitVector<BitVector>(j + 5, {{i + 1, i + 2}, {j, j + 1}});
-
-    auto op0 = [](auto x) { return ~x; };
-    BitVector expected0 = x;
-    expected0.flip();
-    BitVector out0(j - 2);
-    BitVector::apply(op0, out0, x);
-    EXPECT_EQ(out0, expected0);
-
-    auto op1 = [](auto x, auto y) { return x & ~y; };
-    BitVector expected1 = x;
-    expected1.reset(y);
-    BitVector out1;
-    BitVector::apply(op1, out1, x, y);
-    EXPECT_EQ(out1, expected1);
-
-    auto op2 = [](auto x, auto y, auto z) { return (x ^ ~y) | z; };
-    BitVector expected2 = y;
-    expected2.flip();
-    expected2 ^= x;
-    expected2 |= z;
-    BitVector out2(j + 5);
-    BitVector::apply(op2, out2, x, y, z);
-    EXPECT_EQ(out2, expected2);
-  }
-}
-
-
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/BitmaskEnumTest.cpp b/gnu/llvm/llvm/unittests/ADT/BitmaskEnumTest.cpp
deleted file mode 100644
index f07e20330ae..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/BitmaskEnumTest.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-//===- llvm/unittest/ADT/BitmaskEnumTest.cpp - BitmaskEnum unit tests -----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/BitmaskEnum.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-enum Flags {
-  F0 = 0,
-  F1 = 1,
-  F2 = 2,
-  F3 = 4,
-  F4 = 8,
-  LLVM_MARK_AS_BITMASK_ENUM(F4)
-};
-
-TEST(BitmaskEnumTest, BitwiseOr) {
-  Flags f = F1 | F2;
-  EXPECT_EQ(3, f);
-
-  f = f | F3;
-  EXPECT_EQ(7, f);
-}
-
-TEST(BitmaskEnumTest, BitwiseOrEquals) {
-  Flags f = F1;
-  f |= F3;
-  EXPECT_EQ(5, f);
-
-  // |= should return a reference to the LHS.
-  f = F2;
-  (f |= F3) = F1;
-  EXPECT_EQ(F1, f);
-}
-
-TEST(BitmaskEnumTest, BitwiseAnd) {
-  Flags f = static_cast<Flags>(3) & F2;
-  EXPECT_EQ(F2, f);
-
-  f = (f | F3) & (F1 | F2 | F3);
-  EXPECT_EQ(6, f);
-}
-
-TEST(BitmaskEnumTest, BitwiseAndEquals) {
-  Flags f = F1 | F2 | F3;
-  f &= F1 | F2;
-  EXPECT_EQ(3, f);
-
-  // &= should return a reference to the LHS.
-  (f &= F1) = F3;
-  EXPECT_EQ(F3, f);
-}
-
-TEST(BitmaskEnumTest, BitwiseXor) {
-  Flags f = (F1 | F2) ^ (F2 | F3);
-  EXPECT_EQ(5, f);
-
-  f = f ^ F1;
-  EXPECT_EQ(4, f);
-}
-
-TEST(BitmaskEnumTest, BitwiseXorEquals) {
-  Flags f = (F1 | F2);
-  f ^= (F2 | F4);
-  EXPECT_EQ(9, f);
-
-  // ^= should return a reference to the LHS.
-  (f ^= F4) = F3;
-  EXPECT_EQ(F3, f);
-}
-
-TEST(BitmaskEnumTest, BitwiseNot) {
-  Flags f = ~F1;
-  EXPECT_EQ(14, f); // Largest value for f is 15.
-  EXPECT_EQ(15, ~F0);
-}
-
-enum class FlagsClass {
-  F0 = 0,
-  F1 = 1,
-  F2 = 2,
-  F3 = 4,
-  LLVM_MARK_AS_BITMASK_ENUM(F3)
-};
-
-TEST(BitmaskEnumTest, ScopedEnum) {
-  FlagsClass f = (FlagsClass::F1 & ~FlagsClass::F0) | FlagsClass::F2;
-  f |= FlagsClass::F3;
-  EXPECT_EQ(7, static_cast<int>(f));
-}
-
-struct Container {
-  enum Flags { F0 = 0, F1 = 1, F2 = 2, F3 = 4, LLVM_MARK_AS_BITMASK_ENUM(F3) };
-
-  static Flags getFlags() {
-    Flags f = F0 | F1;
-    f |= F2;
-    return f;
-  }
-};
-
-TEST(BitmaskEnumTest, EnumInStruct) { EXPECT_EQ(3, Container::getFlags()); }
-
-} // namespace
-
-namespace foo {
-namespace bar {
-namespace {
-enum FlagsInNamespace {
-  F0 = 0,
-  F1 = 1,
-  F2 = 2,
-  F3 = 4,
-  LLVM_MARK_AS_BITMASK_ENUM(F3)
-};
-} // namespace
-} // namespace foo
-} // namespace bar
-
-namespace {
-TEST(BitmaskEnumTest, EnumInNamespace) {
-  foo::bar::FlagsInNamespace f = ~foo::bar::F0 & (foo::bar::F1 | foo::bar::F2);
-  f |= foo::bar::F3;
-  EXPECT_EQ(7, f);
-}
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/BreadthFirstIteratorTest.cpp b/gnu/llvm/llvm/unittests/ADT/BreadthFirstIteratorTest.cpp
deleted file mode 100644
index 5d034ad41fc..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/BreadthFirstIteratorTest.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//=== llvm/unittest/ADT/BreadthFirstIteratorTest.cpp - BFS iterator tests -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/BreadthFirstIterator.h"
-#include "TestGraph.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace llvm {
-
-TEST(BreadthFristIteratorTest, Basic) {
-  typedef bf_iterator<Graph<4>> BFIter;
-
-  Graph<4> G;
-  G.AddEdge(0, 1);
-  G.AddEdge(0, 2);
-  G.AddEdge(1, 3);
-
-  auto It = BFIter::begin(G);
-  auto End = BFIter::end(G);
-  EXPECT_EQ(It.getLevel(), 0U);
-  EXPECT_EQ(*It, G.AccessNode(0));
-  ++It;
-  EXPECT_EQ(It.getLevel(), 1U);
-  EXPECT_EQ(*It, G.AccessNode(1));
-  ++It;
-  EXPECT_EQ(It.getLevel(), 1U);
-  EXPECT_EQ(*It, G.AccessNode(2));
-  ++It;
-  EXPECT_EQ(It.getLevel(), 2U);
-  EXPECT_EQ(*It, G.AccessNode(3));
-  ++It;
-  EXPECT_EQ(It, End);
-}
-
-TEST(BreadthFristIteratorTest, Cycle) {
-  typedef bf_iterator<Graph<4>> BFIter;
-
-  Graph<4> G;
-  G.AddEdge(0, 1);
-  G.AddEdge(1, 0);
-  G.AddEdge(1, 2);
-  G.AddEdge(2, 1);
-  G.AddEdge(2, 1);
-  G.AddEdge(2, 3);
-  G.AddEdge(3, 2);
-  G.AddEdge(3, 1);
-  G.AddEdge(3, 0);
-
-  auto It = BFIter::begin(G);
-  auto End = BFIter::end(G);
-  EXPECT_EQ(It.getLevel(), 0U);
-  EXPECT_EQ(*It, G.AccessNode(0));
-  ++It;
-  EXPECT_EQ(It.getLevel(), 1U);
-  EXPECT_EQ(*It, G.AccessNode(1));
-  ++It;
-  EXPECT_EQ(It.getLevel(), 2U);
-  EXPECT_EQ(*It, G.AccessNode(2));
-  ++It;
-  EXPECT_EQ(It.getLevel(), 3U);
-  EXPECT_EQ(*It, G.AccessNode(3));
-  ++It;
-  EXPECT_EQ(It, End);
-}
-
-} // end namespace llvm
diff --git a/gnu/llvm/llvm/unittests/ADT/BumpPtrListTest.cpp b/gnu/llvm/llvm/unittests/ADT/BumpPtrListTest.cpp
deleted file mode 100644
index ebd0ce2532f..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/BumpPtrListTest.cpp
+++ /dev/null
@@ -1,242 +0,0 @@
-//===- unittests/ADT/BumpPtrListTest.cpp - BumpPtrList unit tests ---------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/AllocatorList.h"
-#include "llvm/ADT/STLExtras.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-struct CountsDestructors {
-  static unsigned NumCalls;
-  ~CountsDestructors() { ++NumCalls; }
-};
-unsigned CountsDestructors::NumCalls = 0;
-
-struct MoveOnly {
-  int V;
-  explicit MoveOnly(int V) : V(V) {}
-  MoveOnly() = delete;
-  MoveOnly(MoveOnly &&X) { V = X.V; }
-  MoveOnly(const MoveOnly &X) = delete;
-  MoveOnly &operator=(MoveOnly &&X) = delete;
-  MoveOnly &operator=(const MoveOnly &X) = delete;
-};
-
-struct EmplaceOnly {
-  int V1, V2;
-  explicit EmplaceOnly(int V1, int V2) : V1(V1), V2(V2) {}
-  EmplaceOnly() = delete;
-  EmplaceOnly(EmplaceOnly &&X) = delete;
-  EmplaceOnly(const EmplaceOnly &X) = delete;
-  EmplaceOnly &operator=(EmplaceOnly &&X) = delete;
-  EmplaceOnly &operator=(const EmplaceOnly &X) = delete;
-};
-
-TEST(BumpPtrListTest, DefaultConstructor) {
-  BumpPtrList<int> L;
-  EXPECT_TRUE(L.empty());
-}
-
-TEST(BumpPtrListTest, pushPopBack) {
-  // Build a list with push_back.
-  BumpPtrList<int> L;
-  int Ns[] = {1, 3, 9, 5, 7};
-  for (const int N : Ns)
-    L.push_back(N);
-
-  // Use iterators to check contents.
-  auto I = L.begin();
-  for (int N : Ns)
-    EXPECT_EQ(N, *I++);
-  EXPECT_EQ(I, L.end());
-
-  // Unbuild the list with pop_back.
-  for (int N : llvm::reverse(Ns)) {
-    EXPECT_EQ(N, L.back());
-    L.pop_back();
-  }
-  EXPECT_TRUE(L.empty());
-}
-
-TEST(BumpPtrListTest, pushPopFront) {
-  // Build a list with push_front.
-  BumpPtrList<int> L;
-  int Ns[] = {1, 3, 9, 5, 7};
-  for (const int N : Ns)
-    L.push_front(N);
-
-  // Use reverse iterators to check contents.
-  auto I = L.rbegin();
-  for (int N : Ns)
-    EXPECT_EQ(N, *I++);
-  EXPECT_EQ(I, L.rend());
-
-  // Unbuild the list with pop_front.
-  for (int N : llvm::reverse(Ns)) {
-    EXPECT_EQ(N, L.front());
-    L.pop_front();
-  }
-  EXPECT_TRUE(L.empty());
-}
-
-TEST(BumpPtrListTest, pushBackMoveOnly) {
-  BumpPtrList<MoveOnly> L;
-  int Ns[] = {1, 3, 9, 5, 7};
-  for (const int N : Ns) {
-    L.push_back(MoveOnly(N));
-    EXPECT_EQ(N, L.back().V);
-  }
-  // Instantiate with MoveOnly.
-  while (!L.empty())
-    L.pop_back();
-}
-
-TEST(BumpPtrListTest, pushFrontMoveOnly) {
-  BumpPtrList<MoveOnly> L;
-  int Ns[] = {1, 3, 9, 5, 7};
-  for (const int N : Ns) {
-    L.push_front(MoveOnly(N));
-    EXPECT_EQ(N, L.front().V);
-  }
-  // Instantiate with MoveOnly.
-  while (!L.empty())
-    L.pop_front();
-}
-
-TEST(BumpPtrListTest, emplaceBack) {
-  BumpPtrList<EmplaceOnly> L;
-  int N1s[] = {1, 3, 9, 5, 7};
-  int N2s[] = {7, 3, 1, 8, 2};
-  for (int I = 0; I != 5; ++I) {
-    L.emplace_back(N1s[I], N2s[I]);
-    EXPECT_EQ(N1s[I], L.back().V1);
-    EXPECT_EQ(N2s[I], L.back().V2);
-  }
-  // Instantiate with EmplaceOnly.
-  while (!L.empty())
-    L.pop_back();
-}
-
-TEST(BumpPtrListTest, emplaceFront) {
-  BumpPtrList<EmplaceOnly> L;
-  int N1s[] = {1, 3, 9, 5, 7};
-  int N2s[] = {7, 3, 1, 8, 2};
-  for (int I = 0; I != 5; ++I) {
-    L.emplace_front(N1s[I], N2s[I]);
-    EXPECT_EQ(N1s[I], L.front().V1);
-    EXPECT_EQ(N2s[I], L.front().V2);
-  }
-  // Instantiate with EmplaceOnly.
-  while (!L.empty())
-    L.pop_front();
-}
-
-TEST(BumpPtrListTest, swap) {
-  // Build two lists with different lifetimes and swap them.
-  int N1s[] = {1, 3, 5, 7, 9};
-  int N2s[] = {2, 4, 6, 8, 10};
-
-  BumpPtrList<int> L1;
-  L1.insert(L1.end(), std::begin(N1s), std::end(N1s));
-  {
-    BumpPtrList<int> L2;
-    L2.insert(L2.end(), std::begin(N2s), std::end(N2s));
-
-    // Swap the lists.
-    L1.swap(L2);
-
-    // Check L2's contents before it goes out of scope.
-    auto I = L2.begin();
-    for (int N : N1s)
-      EXPECT_EQ(N, *I++);
-    EXPECT_EQ(I, L2.end());
-  }
-
-  // Check L1's contents now that L2 is out of scope (with its allocation
-  // blocks).
-  auto I = L1.begin();
-  for (int N : N2s)
-    EXPECT_EQ(N, *I++);
-  EXPECT_EQ(I, L1.end());
-}
-
-TEST(BumpPtrListTest, clear) {
-  CountsDestructors::NumCalls = 0;
-  CountsDestructors N;
-  BumpPtrList<CountsDestructors> L;
-  L.push_back(N);
-  L.push_back(N);
-  L.push_back(N);
-  EXPECT_EQ(3u, L.size());
-  EXPECT_EQ(0u, CountsDestructors::NumCalls);
-  L.pop_back();
-  EXPECT_EQ(1u, CountsDestructors::NumCalls);
-  L.clear();
-  EXPECT_EQ(3u, CountsDestructors::NumCalls);
-}
-
-TEST(BumpPtrListTest, move) {
-  BumpPtrList<int> L1, L2;
-  L1.push_back(1);
-  L2.push_back(2);
-  L1 = std::move(L2);
-  EXPECT_EQ(1u, L1.size());
-  EXPECT_EQ(2, L1.front());
-  EXPECT_EQ(0u, L2.size());
-}
-
-TEST(BumpPtrListTest, moveCallsDestructors) {
-  CountsDestructors::NumCalls = 0;
-  BumpPtrList<CountsDestructors> L1, L2;
-  L1.emplace_back();
-  EXPECT_EQ(0u, CountsDestructors::NumCalls);
-  L1 = std::move(L2);
-  EXPECT_EQ(1u, CountsDestructors::NumCalls);
-}
-
-TEST(BumpPtrListTest, copy) {
-  BumpPtrList<int> L1, L2;
-  L1.push_back(1);
-  L2.push_back(2);
-  L1 = L2;
-  EXPECT_EQ(1u, L1.size());
-  EXPECT_EQ(2, L1.front());
-  EXPECT_EQ(1u, L2.size());
-  EXPECT_EQ(2, L2.front());
-}
-
-TEST(BumpPtrListTest, copyCallsDestructors) {
-  CountsDestructors::NumCalls = 0;
-  BumpPtrList<CountsDestructors> L1, L2;
-  L1.emplace_back();
-  EXPECT_EQ(0u, CountsDestructors::NumCalls);
-  L1 = L2;
-  EXPECT_EQ(1u, CountsDestructors::NumCalls);
-}
-
-TEST(BumpPtrListTest, resetAlloc) {
-  // Resetting an empty list should work.
-  BumpPtrList<int> L;
-
-  // Resetting an empty list that has allocated should also work.
-  L.resetAlloc();
-  L.push_back(5);
-  L.erase(L.begin());
-  L.resetAlloc();
-
-  // Resetting a non-empty list should crash.
-  L.push_back(5);
-#if defined(GTEST_HAS_DEATH_TEST) && !defined(NDEBUG)
-  EXPECT_DEATH(L.resetAlloc(), "Cannot reset allocator if not empty");
-#endif
-}
-
-} // end namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/CMakeLists.txt b/gnu/llvm/llvm/unittests/ADT/CMakeLists.txt
deleted file mode 100644
index e64b1a0c7b3..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/CMakeLists.txt
+++ /dev/null
@@ -1,86 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  Support
-  )
-
-add_llvm_unittest(ADTTests
-  AnyTest.cpp
-  APFixedPointTest.cpp
-  APFloatTest.cpp
-  APIntTest.cpp
-  APSIntTest.cpp
-  ArrayRefTest.cpp
-  BitFieldsTest.cpp
-  BitmaskEnumTest.cpp
-  BitVectorTest.cpp
-  BreadthFirstIteratorTest.cpp
-  BumpPtrListTest.cpp
-  CoalescingBitVectorTest.cpp
-  DAGDeltaAlgorithmTest.cpp
-  DeltaAlgorithmTest.cpp
-  DenseMapTest.cpp
-  DenseSetTest.cpp
-  DepthFirstIteratorTest.cpp
-  DirectedGraphTest.cpp
-  EnumeratedArrayTest.cpp
-  EquivalenceClassesTest.cpp
-  FallibleIteratorTest.cpp
-  FloatingPointMode.cpp
-  FoldingSet.cpp
-  FunctionExtrasTest.cpp
-  FunctionRefTest.cpp
-  HashingTest.cpp
-  IListBaseTest.cpp
-  IListIteratorTest.cpp
-  IListNodeBaseTest.cpp
-  IListNodeTest.cpp
-  IListSentinelTest.cpp
-  IListTest.cpp
-  ImmutableListTest.cpp
-  ImmutableMapTest.cpp
-  ImmutableSetTest.cpp
-  IntEqClassesTest.cpp
-  IntervalMapTest.cpp
-  IntrusiveRefCntPtrTest.cpp
-  IteratorTest.cpp
-  MappedIteratorTest.cpp
-  MapVectorTest.cpp
-  OptionalTest.cpp
-  PackedVectorTest.cpp
-  PointerEmbeddedIntTest.cpp
-  PointerIntPairTest.cpp
-  PointerSumTypeTest.cpp
-  PointerUnionTest.cpp
-  PostOrderIteratorTest.cpp
-  PriorityWorklistTest.cpp
-  RangeAdapterTest.cpp
-  SCCIteratorTest.cpp
-  STLExtrasTest.cpp
-  STLForwardCompatTest.cpp
-  ScopeExitTest.cpp
-  SequenceTest.cpp
-  SetVectorTest.cpp
-  SimpleIListTest.cpp
-  SmallPtrSetTest.cpp
-  SmallSetTest.cpp
-  SmallStringTest.cpp
-  SmallVectorTest.cpp
-  SparseBitVectorTest.cpp
-  SparseMultiSetTest.cpp
-  SparseSetTest.cpp
-  StatisticTest.cpp
-  StringExtrasTest.cpp
-  StringMapTest.cpp
-  StringRefTest.cpp
-  StringSetTest.cpp
-  StringSwitchTest.cpp
-  TinyPtrVectorTest.cpp
-  TripleTest.cpp
-  TwineTest.cpp
-  TypeSwitchTest.cpp
-  TypeTraitsTest.cpp
-  WaymarkingTest.cpp
-  )
-
-target_link_libraries(ADTTests PRIVATE LLVMTestingSupport)
-
-add_dependencies(ADTTests intrinsics_gen)
diff --git a/gnu/llvm/llvm/unittests/ADT/CoalescingBitVectorTest.cpp b/gnu/llvm/llvm/unittests/ADT/CoalescingBitVectorTest.cpp
deleted file mode 100644
index 355426c4d84..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/CoalescingBitVectorTest.cpp
+++ /dev/null
@@ -1,561 +0,0 @@
-//=== CoalescingBitVectorTest.cpp - CoalescingBitVector unit tests --------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/CoalescingBitVector.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-using UBitVec = CoalescingBitVector<unsigned>;
-using U64BitVec = CoalescingBitVector<uint64_t>;
-
-bool elementsMatch(const UBitVec &BV, std::initializer_list<unsigned> List) {
-  if (!std::equal(BV.begin(), BV.end(), List.begin(), List.end())) {
-    UBitVec::Allocator Alloc;
-    UBitVec Expected(Alloc);
-    Expected.set(List);
-    dbgs() << "elementsMatch:\n"
-           << "     Expected: ";
-    Expected.print(dbgs());
-    dbgs() << "          Got: ";
-    BV.print(dbgs());
-    return false;
-  }
-  return true;
-}
-
-bool rangesMatch(iterator_range<UBitVec::const_iterator> R,
-                 std::initializer_list<unsigned> List) {
-  return std::equal(R.begin(), R.end(), List.begin(), List.end());
-}
-
-TEST(CoalescingBitVectorTest, Set) {
-  UBitVec::Allocator Alloc;
-  UBitVec BV1(Alloc);
-  UBitVec BV2(Alloc);
-
-  BV1.set(0);
-  EXPECT_TRUE(BV1.test(0));
-  EXPECT_FALSE(BV1.test(1));
-
-  BV2.set(BV1);
-  EXPECT_TRUE(BV2.test(0));
-}
-
-TEST(CoalescingBitVectorTest, Count) {
-  UBitVec::Allocator Alloc;
-  UBitVec BV(Alloc);
-  EXPECT_EQ(BV.count(), 0u);
-  BV.set(0);
-  EXPECT_EQ(BV.count(), 1u);
-  BV.set({11, 12, 13, 14, 15});
-  EXPECT_EQ(BV.count(), 6u);
-}
-
-TEST(CoalescingBitVectorTest, ClearAndEmpty) {
-  UBitVec::Allocator Alloc;
-  UBitVec BV(Alloc);
-  EXPECT_TRUE(BV.empty());
-  BV.set(1);
-  EXPECT_FALSE(BV.empty());
-  BV.clear();
-  EXPECT_TRUE(BV.empty());
-}
-
-TEST(CoalescingBitVector, Copy) {
-  UBitVec::Allocator Alloc;
-  UBitVec BV1(Alloc);
-  BV1.set(0);
-  UBitVec BV2 = BV1;
-  EXPECT_TRUE(elementsMatch(BV1, {0}));
-  EXPECT_TRUE(elementsMatch(BV2, {0}));
-  BV2.set(5);
-  BV2 = BV1;
-  EXPECT_TRUE(elementsMatch(BV1, {0}));
-  EXPECT_TRUE(elementsMatch(BV2, {0}));
-}
-
-TEST(CoalescingBitVectorTest, Iterators) {
-  UBitVec::Allocator Alloc;
-  UBitVec BV(Alloc);
-
-  BV.set({0, 1, 2});
-
-  auto It = BV.begin();
-  EXPECT_TRUE(It == BV.begin());
-  EXPECT_EQ(*It, 0u);
-  ++It;
-  EXPECT_EQ(*It, 1u);
-  ++It;
-  EXPECT_EQ(*It, 2u);
-  ++It;
-  EXPECT_TRUE(It == BV.end());
-  EXPECT_TRUE(BV.end() == BV.end());
-
-  It = BV.begin();
-  EXPECT_TRUE(It == BV.begin());
-  auto ItCopy = It++;
-  EXPECT_TRUE(ItCopy == BV.begin());
-  EXPECT_EQ(*ItCopy, 0u);
-  EXPECT_EQ(*It, 1u);
-
-  EXPECT_TRUE(elementsMatch(BV, {0, 1, 2}));
-
-  BV.set({4, 5, 6});
-  EXPECT_TRUE(elementsMatch(BV, {0, 1, 2, 4, 5, 6}));
-
-  BV.set(3);
-  EXPECT_TRUE(elementsMatch(BV, {0, 1, 2, 3, 4, 5, 6}));
-
-  BV.set(10);
-  EXPECT_TRUE(elementsMatch(BV, {0, 1, 2, 3, 4, 5, 6, 10}));
-
-  // Should be able to reset unset bits.
-  BV.reset(3);
-  BV.reset(3);
-  BV.reset(20000);
-  BV.set({1000, 1001, 1002});
-  EXPECT_TRUE(elementsMatch(BV, {0, 1, 2, 4, 5, 6, 10, 1000, 1001, 1002}));
-
-  auto It1 = BV.begin();
-  EXPECT_TRUE(It1 == BV.begin());
-  EXPECT_TRUE(++It1 == ++BV.begin());
-  EXPECT_TRUE(It1 != BV.begin());
-  EXPECT_TRUE(It1 != BV.end());
-}
-
-TEST(CoalescingBitVectorTest, Reset) {
-  UBitVec::Allocator Alloc;
-  UBitVec BV(Alloc);
-
-  BV.set(0);
-  EXPECT_TRUE(BV.test(0));
-  BV.reset(0);
-  EXPECT_FALSE(BV.test(0));
-
-  BV.clear();
-  BV.set({1, 2, 3});
-  BV.reset(1);
-  EXPECT_TRUE(elementsMatch(BV, {2, 3}));
-
-  BV.clear();
-  BV.set({1, 2, 3});
-  BV.reset(2);
-  EXPECT_TRUE(elementsMatch(BV, {1, 3}));
-
-  BV.clear();
-  BV.set({1, 2, 3});
-  BV.reset(3);
-  EXPECT_TRUE(elementsMatch(BV, {1, 2}));
-}
-
-TEST(CoalescingBitVectorTest, Comparison) {
-  UBitVec::Allocator Alloc;
-  UBitVec BV1(Alloc);
-  UBitVec BV2(Alloc);
-
-  // Single interval.
-  BV1.set({1, 2, 3});
-  BV2.set({1, 2, 3});
-  EXPECT_EQ(BV1, BV2);
-  EXPECT_FALSE(BV1 != BV2);
-
-  // Different number of intervals.
-  BV1.clear();
-  BV2.clear();
-  BV1.set({1, 2, 3});
-  EXPECT_NE(BV1, BV2);
-
-  // Multiple intervals.
-  BV1.clear();
-  BV2.clear();
-  BV1.set({1, 2, 11, 12});
-  BV2.set({1, 2, 11, 12});
-  EXPECT_EQ(BV1, BV2);
-  BV2.reset(1);
-  EXPECT_NE(BV1, BV2);
-  BV2.set(1);
-  BV2.reset(11);
-  EXPECT_NE(BV1, BV2);
-}
-
-// A simple implementation of set union, used to double-check the human
-// "expected" answer.
-void simpleUnion(UBitVec &Union, const UBitVec &LHS,
-                    const UBitVec &RHS) {
-  for (unsigned Bit : LHS)
-    Union.test_and_set(Bit);
-  for (unsigned Bit : RHS)
-    Union.test_and_set(Bit);
-}
-
-TEST(CoalescingBitVectorTest, Union) {
-  UBitVec::Allocator Alloc;
-
-  // Check that after doing LHS |= RHS, LHS == Expected.
-  auto unionIs = [&](std::initializer_list<unsigned> LHS,
-                     std::initializer_list<unsigned> RHS,
-                     std::initializer_list<unsigned> Expected) {
-    UBitVec BV1(Alloc);
-    BV1.set(LHS);
-    UBitVec BV2(Alloc);
-    BV2.set(RHS);
-    UBitVec DoubleCheckedExpected(Alloc);
-    simpleUnion(DoubleCheckedExpected, BV1, BV2);
-    ASSERT_TRUE(elementsMatch(DoubleCheckedExpected, Expected));
-    BV1 |= BV2;
-    ASSERT_TRUE(elementsMatch(BV1, Expected));
-  };
-
-  // Check that "LHS |= RHS" and "RHS |= LHS" both produce the expected result.
-  auto testUnionSymmetrically = [&](std::initializer_list<unsigned> LHS,
-                     std::initializer_list<unsigned> RHS,
-                     std::initializer_list<unsigned> Expected) {
-    unionIs(LHS, RHS, Expected);
-    unionIs(RHS, LHS, Expected);
-  };
-
-  // Empty LHS.
-  testUnionSymmetrically({}, {1, 2, 3}, {1, 2, 3});
-
-  // Empty RHS.
-  testUnionSymmetrically({1, 2, 3}, {}, {1, 2, 3});
-
-  // Full overlap.
-  testUnionSymmetrically({1}, {1}, {1});
-  testUnionSymmetrically({1, 2, 11, 12}, {1, 2, 11, 12}, {1, 2, 11, 12});
-
-  // Sliding window: fix {2, 3, 4} as the LHS, and slide a window before/after
-  // it. Repeat this swapping LHS and RHS.
-  testUnionSymmetrically({2, 3, 4}, {1, 2, 3}, {1, 2, 3, 4});
-  testUnionSymmetrically({2, 3, 4}, {2, 3, 4}, {2, 3, 4});
-  testUnionSymmetrically({2, 3, 4}, {3, 4, 5}, {2, 3, 4, 5});
-  testUnionSymmetrically({1, 2, 3}, {2, 3, 4}, {1, 2, 3, 4});
-  testUnionSymmetrically({3, 4, 5}, {2, 3, 4}, {2, 3, 4, 5});
-
-  // Multiple overlaps, but at least one of the overlaps forces us to split an
-  // interval (and possibly both do). For ease of understanding, fix LHS to be
-  // {1, 2, 11, 12}, but vary RHS.
-  testUnionSymmetrically({1, 2, 11, 12}, {1}, {1, 2, 11, 12});
-  testUnionSymmetrically({1, 2, 11, 12}, {2}, {1, 2, 11, 12});
-  testUnionSymmetrically({1, 2, 11, 12}, {11}, {1, 2, 11, 12});
-  testUnionSymmetrically({1, 2, 11, 12}, {12}, {1, 2, 11, 12});
-  testUnionSymmetrically({1, 2, 11, 12}, {1, 11}, {1, 2, 11, 12});
-  testUnionSymmetrically({1, 2, 11, 12}, {1, 12}, {1, 2, 11, 12});
-  testUnionSymmetrically({1, 2, 11, 12}, {2, 11}, {1, 2, 11, 12});
-  testUnionSymmetrically({1, 2, 11, 12}, {2, 12}, {1, 2, 11, 12});
-  testUnionSymmetrically({1, 2, 11, 12}, {1, 2, 11}, {1, 2, 11, 12});
-  testUnionSymmetrically({1, 2, 11, 12}, {1, 2, 12}, {1, 2, 11, 12});
-  testUnionSymmetrically({1, 2, 11, 12}, {1, 11, 12}, {1, 2, 11, 12});
-  testUnionSymmetrically({1, 2, 11, 12}, {2, 11, 12}, {1, 2, 11, 12});
-  testUnionSymmetrically({1, 2, 11, 12}, {0, 11, 12}, {0, 1, 2, 11, 12});
-  testUnionSymmetrically({1, 2, 11, 12}, {3, 11, 12}, {1, 2, 3, 11, 12});
-  testUnionSymmetrically({1, 2, 11, 12}, {1, 11, 13}, {1, 2, 11, 12, 13});
-  testUnionSymmetrically({1, 2, 11, 12}, {1, 10, 11}, {1, 2, 10, 11, 12});
-
-  // Partial overlap, but the existing interval covers future overlaps.
-  testUnionSymmetrically({1, 2, 3, 4, 5, 6, 7, 8}, {2, 3, 4, 6, 7},
-                         {1, 2, 3, 4, 5, 6, 7, 8});
-  testUnionSymmetrically({1, 2, 3, 4, 5, 6, 7, 8}, {2, 3, 7, 8, 9},
-                         {1, 2, 3, 4, 5, 6, 7, 8, 9});
-
-  // More partial overlaps.
-  testUnionSymmetrically({1, 2, 3, 4, 5}, {0, 1, 2, 4, 5, 6},
-                         {0, 1, 2, 3, 4, 5, 6});
-  testUnionSymmetrically({2, 3}, {1, 2, 3, 4}, {1, 2, 3, 4});
-  testUnionSymmetrically({3, 4}, {1, 2, 3, 4}, {1, 2, 3, 4});
-  testUnionSymmetrically({1, 2}, {1, 2, 3, 4}, {1, 2, 3, 4});
-  testUnionSymmetrically({0, 1}, {1, 2, 3, 4}, {0, 1, 2, 3, 4});
-
-  // Merge non-overlapping.
-  testUnionSymmetrically({0, 1}, {2, 3}, {0, 1, 2, 3});
-  testUnionSymmetrically({0, 3}, {1, 2}, {0, 1, 2, 3});
-}
-
-// A simple implementation of set intersection, used to double-check the
-// human "expected" answer.
-void simpleIntersection(UBitVec &Intersection, const UBitVec &LHS,
-                        const UBitVec &RHS) {
-  for (unsigned Bit : LHS)
-    if (RHS.test(Bit))
-      Intersection.set(Bit);
-}
-
-TEST(CoalescingBitVectorTest, Intersection) {
-  UBitVec::Allocator Alloc;
-
-  // Check that after doing LHS &= RHS, LHS == Expected.
-  auto intersectionIs = [&](std::initializer_list<unsigned> LHS,
-                            std::initializer_list<unsigned> RHS,
-                            std::initializer_list<unsigned> Expected) {
-    UBitVec BV1(Alloc);
-    BV1.set(LHS);
-    UBitVec BV2(Alloc);
-    BV2.set(RHS);
-    UBitVec DoubleCheckedExpected(Alloc);
-    simpleIntersection(DoubleCheckedExpected, BV1, BV2);
-    ASSERT_TRUE(elementsMatch(DoubleCheckedExpected, Expected));
-    BV1 &= BV2;
-    ASSERT_TRUE(elementsMatch(BV1, Expected));
-  };
-
-  // Check that "LHS &= RHS" and "RHS &= LHS" both produce the expected result.
-  auto testIntersectionSymmetrically = [&](std::initializer_list<unsigned> LHS,
-                     std::initializer_list<unsigned> RHS,
-                     std::initializer_list<unsigned> Expected) {
-    intersectionIs(LHS, RHS, Expected);
-    intersectionIs(RHS, LHS, Expected);
-  };
-
-  // Empty case, one-element case.
-  testIntersectionSymmetrically({}, {}, {});
-  testIntersectionSymmetrically({1}, {1}, {1});
-  testIntersectionSymmetrically({1}, {2}, {});
-
-  // Exact overlaps cases: single overlap and multiple overlaps.
-  testIntersectionSymmetrically({1, 2}, {1, 2}, {1, 2});
-  testIntersectionSymmetrically({1, 2, 11, 12}, {1, 2, 11, 12}, {1, 2, 11, 12});
-
-  // Sliding window: fix {2, 3, 4} as the LHS, and slide a window before/after
-  // it.
-  testIntersectionSymmetrically({2, 3, 4}, {1, 2, 3}, {2, 3});
-  testIntersectionSymmetrically({2, 3, 4}, {2, 3, 4}, {2, 3, 4});
-  testIntersectionSymmetrically({2, 3, 4}, {3, 4, 5}, {3, 4});
-
-  // No overlap, but we have multiple intervals.
-  testIntersectionSymmetrically({1, 2, 11, 12}, {3, 4, 13, 14}, {});
-
-  // Multiple overlaps, but at least one of the overlaps forces us to split an
-  // interval (and possibly both do). For ease of understanding, fix LHS to be
-  // {1, 2, 11, 12}, but vary RHS.
-  testIntersectionSymmetrically({1, 2, 11, 12}, {1}, {1});
-  testIntersectionSymmetrically({1, 2, 11, 12}, {2}, {2});
-  testIntersectionSymmetrically({1, 2, 11, 12}, {11}, {11});
-  testIntersectionSymmetrically({1, 2, 11, 12}, {12}, {12});
-  testIntersectionSymmetrically({1, 2, 11, 12}, {1, 11}, {1, 11});
-  testIntersectionSymmetrically({1, 2, 11, 12}, {1, 12}, {1, 12});
-  testIntersectionSymmetrically({1, 2, 11, 12}, {2, 11}, {2, 11});
-  testIntersectionSymmetrically({1, 2, 11, 12}, {2, 12}, {2, 12});
-  testIntersectionSymmetrically({1, 2, 11, 12}, {1, 2, 11}, {1, 2, 11});
-  testIntersectionSymmetrically({1, 2, 11, 12}, {1, 2, 12}, {1, 2, 12});
-  testIntersectionSymmetrically({1, 2, 11, 12}, {1, 11, 12}, {1, 11, 12});
-  testIntersectionSymmetrically({1, 2, 11, 12}, {2, 11, 12}, {2, 11, 12});
-  testIntersectionSymmetrically({1, 2, 11, 12}, {0, 11, 12}, {11, 12});
-  testIntersectionSymmetrically({1, 2, 11, 12}, {3, 11, 12}, {11, 12});
-  testIntersectionSymmetrically({1, 2, 11, 12}, {1, 11, 13}, {1, 11});
-  testIntersectionSymmetrically({1, 2, 11, 12}, {1, 10, 11}, {1, 11});
-
-  // Partial overlap, but the existing interval covers future overlaps.
-  testIntersectionSymmetrically({1, 2, 3, 4, 5, 6, 7, 8}, {2, 3, 4, 6, 7},
-                                {2, 3, 4, 6, 7});
-}
-
-// A simple implementation of set intersection-with-complement, used to
-// double-check the human "expected" answer.
-void simpleIntersectionWithComplement(UBitVec &Intersection, const UBitVec &LHS,
-                                      const UBitVec &RHS) {
-  for (unsigned Bit : LHS)
-    if (!RHS.test(Bit))
-      Intersection.set(Bit);
-}
-
-TEST(CoalescingBitVectorTest, IntersectWithComplement) {
-  UBitVec::Allocator Alloc;
-
-  // Check that after doing LHS.intersectWithComplement(RHS), LHS == Expected.
-  auto intersectionWithComplementIs =
-      [&](std::initializer_list<unsigned> LHS,
-          std::initializer_list<unsigned> RHS,
-          std::initializer_list<unsigned> Expected) {
-        UBitVec BV1(Alloc);
-        BV1.set(LHS);
-        UBitVec BV2(Alloc);
-        BV2.set(RHS);
-        UBitVec DoubleCheckedExpected(Alloc);
-        simpleIntersectionWithComplement(DoubleCheckedExpected, BV1, BV2);
-        ASSERT_TRUE(elementsMatch(DoubleCheckedExpected, Expected));
-        BV1.intersectWithComplement(BV2);
-        ASSERT_TRUE(elementsMatch(BV1, Expected));
-      };
-
-  // Empty case, one-element case.
-  intersectionWithComplementIs({}, {}, {});
-  intersectionWithComplementIs({1}, {1}, {});
-  intersectionWithComplementIs({1}, {2}, {1});
-
-  // Exact overlaps cases: single overlap and multiple overlaps.
-  intersectionWithComplementIs({1, 2}, {1, 2}, {});
-  intersectionWithComplementIs({1, 2, 11, 12}, {1, 2, 11, 12}, {});
-
-  // Sliding window: fix {2, 3, 4} as the LHS, and slide a window before/after
-  // it. Repeat this swapping LHS and RHS.
-  intersectionWithComplementIs({2, 3, 4}, {1, 2, 3}, {4});
-  intersectionWithComplementIs({2, 3, 4}, {2, 3, 4}, {});
-  intersectionWithComplementIs({2, 3, 4}, {3, 4, 5}, {2});
-  intersectionWithComplementIs({1, 2, 3}, {2, 3, 4}, {1});
-  intersectionWithComplementIs({3, 4, 5}, {2, 3, 4}, {5});
-
-  // No overlap, but we have multiple intervals.
-  intersectionWithComplementIs({1, 2, 11, 12}, {3, 4, 13, 14}, {1, 2, 11, 12});
-
-  // Multiple overlaps. For ease of understanding, fix LHS to be
-  // {1, 2, 11, 12}, but vary RHS.
-  intersectionWithComplementIs({1, 2, 11, 12}, {1}, {2, 11, 12});
-  intersectionWithComplementIs({1, 2, 11, 12}, {2}, {1, 11, 12});
-  intersectionWithComplementIs({1, 2, 11, 12}, {11}, {1, 2, 12});
-  intersectionWithComplementIs({1, 2, 11, 12}, {12}, {1, 2, 11});
-  intersectionWithComplementIs({1, 2, 11, 12}, {1, 11}, {2, 12});
-  intersectionWithComplementIs({1, 2, 11, 12}, {1, 12}, {2, 11});
-  intersectionWithComplementIs({1, 2, 11, 12}, {2, 11}, {1, 12});
-  intersectionWithComplementIs({1, 2, 11, 12}, {2, 12}, {1, 11});
-  intersectionWithComplementIs({1, 2, 11, 12}, {1, 2, 11}, {12});
-  intersectionWithComplementIs({1, 2, 11, 12}, {1, 2, 12}, {11});
-  intersectionWithComplementIs({1, 2, 11, 12}, {1, 11, 12}, {2});
-  intersectionWithComplementIs({1, 2, 11, 12}, {2, 11, 12}, {1});
-  intersectionWithComplementIs({1, 2, 11, 12}, {0, 11, 12}, {1, 2});
-  intersectionWithComplementIs({1, 2, 11, 12}, {3, 11, 12}, {1, 2});
-  intersectionWithComplementIs({1, 2, 11, 12}, {1, 11, 13}, {2, 12});
-  intersectionWithComplementIs({1, 2, 11, 12}, {1, 10, 11}, {2, 12});
-
-  // Partial overlap, but the existing interval covers future overlaps.
-  intersectionWithComplementIs({1, 2, 3, 4, 5, 6, 7, 8}, {2, 3, 4, 6, 7},
-                               {1, 5, 8});
-}
-
-TEST(CoalescingBitVectorTest, FindLowerBound) {
-  U64BitVec::Allocator Alloc;
-  U64BitVec BV(Alloc);
-  uint64_t BigNum1 = uint64_t(1) << 32;
-  uint64_t BigNum2 = (uint64_t(1) << 33) + 1;
-  EXPECT_TRUE(BV.find(BigNum1) == BV.end());
-  BV.set(BigNum1);
-  auto Find1 = BV.find(BigNum1);
-  EXPECT_EQ(*Find1, BigNum1);
-  BV.set(BigNum2);
-  auto Find2 = BV.find(BigNum1);
-  EXPECT_EQ(*Find2, BigNum1);
-  auto Find3 = BV.find(BigNum2);
-  EXPECT_EQ(*Find3, BigNum2);
-  BV.reset(BigNum1);
-  auto Find4 = BV.find(BigNum1);
-  EXPECT_EQ(*Find4, BigNum2);
-
-  BV.clear();
-  BV.set({1, 2, 3});
-  EXPECT_EQ(*BV.find(2), 2u);
-  EXPECT_EQ(*BV.find(3), 3u);
-}
-
-TEST(CoalescingBitVectorTest, AdvanceToLowerBound) {
-  U64BitVec::Allocator Alloc;
-  U64BitVec BV(Alloc);
-  uint64_t BigNum1 = uint64_t(1) << 32;
-  uint64_t BigNum2 = (uint64_t(1) << 33) + 1;
-
-  auto advFromBegin = [&](uint64_t To) -> U64BitVec::const_iterator {
-    auto It = BV.begin();
-    It.advanceToLowerBound(To);
-    return It;
-  };
-
-  EXPECT_TRUE(advFromBegin(BigNum1) == BV.end());
-  BV.set(BigNum1);
-  auto Find1 = advFromBegin(BigNum1);
-  EXPECT_EQ(*Find1, BigNum1);
-  BV.set(BigNum2);
-  auto Find2 = advFromBegin(BigNum1);
-  EXPECT_EQ(*Find2, BigNum1);
-  auto Find3 = advFromBegin(BigNum2);
-  EXPECT_EQ(*Find3, BigNum2);
-  BV.reset(BigNum1);
-  auto Find4 = advFromBegin(BigNum1);
-  EXPECT_EQ(*Find4, BigNum2);
-
-  BV.clear();
-  BV.set({1, 2, 3});
-  EXPECT_EQ(*advFromBegin(2), 2u);
-  EXPECT_EQ(*advFromBegin(3), 3u);
-  auto It = BV.begin();
-  It.advanceToLowerBound(0);
-  EXPECT_EQ(*It, 1u);
-  It.advanceToLowerBound(100);
-  EXPECT_TRUE(It == BV.end());
-  It.advanceToLowerBound(100);
-  EXPECT_TRUE(It == BV.end());
-}
-
-TEST(CoalescingBitVectorTest, HalfOpenRange) {
-  UBitVec::Allocator Alloc;
-
-  {
-    UBitVec BV(Alloc);
-    BV.set({1, 2, 3});
-
-    EXPECT_EQ(*BV.find(0), 1U); // find(Start) > Start
-    EXPECT_TRUE(rangesMatch(BV.half_open_range(0, 5), {1, 2, 3}));
-    EXPECT_TRUE(rangesMatch(BV.half_open_range(1, 4), {1, 2, 3}));
-    EXPECT_TRUE(rangesMatch(BV.half_open_range(1, 3), {1, 2}));
-    EXPECT_TRUE(rangesMatch(BV.half_open_range(2, 3), {2}));
-    EXPECT_TRUE(rangesMatch(BV.half_open_range(2, 4), {2, 3}));
-    EXPECT_TRUE(rangesMatch(BV.half_open_range(4, 5), {}));
-  }
-
-  {
-    UBitVec BV(Alloc);
-    BV.set({1, 2, 11, 12});
-
-    EXPECT_TRUE(rangesMatch(BV.half_open_range(0, 15), {1, 2, 11, 12}));
-    EXPECT_TRUE(rangesMatch(BV.half_open_range(1, 13), {1, 2, 11, 12}));
-    EXPECT_TRUE(rangesMatch(BV.half_open_range(1, 12), {1, 2, 11}));
-
-    EXPECT_TRUE(rangesMatch(BV.half_open_range(0, 5), {1, 2}));
-    EXPECT_TRUE(rangesMatch(BV.half_open_range(1, 5), {1, 2}));
-    EXPECT_TRUE(rangesMatch(BV.half_open_range(2, 5), {2}));
-    EXPECT_TRUE(rangesMatch(BV.half_open_range(1, 2), {1}));
-    EXPECT_TRUE(rangesMatch(BV.half_open_range(13, 14), {}));
-
-    EXPECT_TRUE(rangesMatch(BV.half_open_range(2, 10), {2}));
-  }
-
-  {
-    UBitVec BV(Alloc);
-    BV.set({1});
-
-    EXPECT_EQ(*BV.find(0), 1U); // find(Start) == End
-    EXPECT_TRUE(rangesMatch(BV.half_open_range(0, 1), {}));
-  }
-
-  {
-    UBitVec BV(Alloc);
-    BV.set({5});
-
-    EXPECT_EQ(*BV.find(3), 5U); // find(Start) > End
-    EXPECT_TRUE(rangesMatch(BV.half_open_range(3, 4), {}));
-  }
-}
-
-TEST(CoalescingBitVectorTest, Print) {
-  std::string S;
-  {
-    raw_string_ostream OS(S);
-    UBitVec::Allocator Alloc;
-    UBitVec BV(Alloc);
-    BV.set({1});
-    BV.print(OS);
-
-    BV.clear();
-    BV.set({1, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20});
-    BV.print(OS);
-  }
-  EXPECT_EQ(S, "{[1]}"
-               "{[1][11, 20]}");
-}
-
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/DAGDeltaAlgorithmTest.cpp b/gnu/llvm/llvm/unittests/ADT/DAGDeltaAlgorithmTest.cpp
deleted file mode 100644
index 66a67d96d15..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/DAGDeltaAlgorithmTest.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-//===- llvm/unittest/ADT/DAGDeltaAlgorithmTest.cpp ------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/DAGDeltaAlgorithm.h"
-#include "gtest/gtest.h"
-#include <algorithm>
-#include <cstdarg>
-using namespace llvm;
-
-namespace {
-
-typedef DAGDeltaAlgorithm::edge_ty edge_ty;
-
-class FixedDAGDeltaAlgorithm : public DAGDeltaAlgorithm {
-  changeset_ty FailingSet;
-  unsigned NumTests;
-
-protected:
-  bool ExecuteOneTest(const changeset_ty &Changes) override {
-    ++NumTests;
-    return std::includes(Changes.begin(), Changes.end(),
-                         FailingSet.begin(), FailingSet.end());
-  }
-
-public:
-  FixedDAGDeltaAlgorithm(const changeset_ty &_FailingSet)
-    : FailingSet(_FailingSet),
-      NumTests(0) {}
-
-  unsigned getNumTests() const { return NumTests; }
-};
-
-std::set<unsigned> fixed_set(unsigned N, ...) {
-  std::set<unsigned> S;
-  va_list ap;
-  va_start(ap, N);
-  for (unsigned i = 0; i != N; ++i)
-    S.insert(va_arg(ap, unsigned));
-  va_end(ap);
-  return S;
-}
-
-std::set<unsigned> range(unsigned Start, unsigned End) {
-  std::set<unsigned> S;
-  while (Start != End)
-    S.insert(Start++);
-  return S;
-}
-
-std::set<unsigned> range(unsigned N) {
-  return range(0, N);
-}
-
-TEST(DAGDeltaAlgorithmTest, Basic) {
-  std::vector<edge_ty> Deps;
-
-  // Dependencies:
-  //  1 - 3
-  Deps.clear();
-  Deps.push_back(std::make_pair(3, 1));
-
-  // P = {3,5,7} \in S,
-  //   [0, 20),
-  // should minimize to {1,3,5,7} in a reasonable number of tests.
-  FixedDAGDeltaAlgorithm FDA(fixed_set(3, 3, 5, 7));
-  EXPECT_EQ(fixed_set(4, 1, 3, 5, 7), FDA.Run(range(20), Deps));
-  EXPECT_GE(46U, FDA.getNumTests());
-
-  // Dependencies:
-  // 0 - 1
-  //  \- 2 - 3
-  //  \- 4
-  Deps.clear();
-  Deps.push_back(std::make_pair(1, 0));
-  Deps.push_back(std::make_pair(2, 0));
-  Deps.push_back(std::make_pair(4, 0));
-  Deps.push_back(std::make_pair(3, 2));
-
-  // This is a case where we must hold required changes.
-  //
-  // P = {1,3} \in S,
-  //   [0, 5),
-  // should minimize to {0,1,2,3} in a small number of tests.
-  FixedDAGDeltaAlgorithm FDA2(fixed_set(2, 1, 3));
-  EXPECT_EQ(fixed_set(4, 0, 1, 2, 3), FDA2.Run(range(5), Deps));
-  EXPECT_GE(9U, FDA2.getNumTests());
-
-  // This is a case where we should quickly prune part of the tree.
-  //
-  // P = {4} \in S,
-  //   [0, 5),
-  // should minimize to {0,4} in a small number of tests.
-  FixedDAGDeltaAlgorithm FDA3(fixed_set(1, 4));
-  EXPECT_EQ(fixed_set(2, 0, 4), FDA3.Run(range(5), Deps));
-  EXPECT_GE(6U, FDA3.getNumTests());
-}
-
-}
-
diff --git a/gnu/llvm/llvm/unittests/ADT/DeltaAlgorithmTest.cpp b/gnu/llvm/llvm/unittests/ADT/DeltaAlgorithmTest.cpp
deleted file mode 100644
index 5e284129180..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/DeltaAlgorithmTest.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-//===- llvm/unittest/ADT/DeltaAlgorithmTest.cpp ---------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/DeltaAlgorithm.h"
-#include "gtest/gtest.h"
-#include <algorithm>
-#include <cstdarg>
-using namespace llvm;
-
-namespace std {
-
-std::ostream &operator<<(std::ostream &OS,
-                         const std::set<unsigned> &S) {
-  OS << "{";
-  for (std::set<unsigned>::const_iterator it = S.begin(),
-         ie = S.end(); it != ie; ++it) {
-    if (it != S.begin())
-      OS << ",";
-    OS << *it;
-  }
-  OS << "}";
-  return OS;
-}
-
-}
-
-namespace {
-
-class FixedDeltaAlgorithm final : public DeltaAlgorithm {
-  changeset_ty FailingSet;
-  unsigned NumTests;
-
-protected:
-  bool ExecuteOneTest(const changeset_ty &Changes) override {
-    ++NumTests;
-    return std::includes(Changes.begin(), Changes.end(),
-                         FailingSet.begin(), FailingSet.end());
-  }
-
-public:
-  FixedDeltaAlgorithm(const changeset_ty &_FailingSet)
-    : FailingSet(_FailingSet),
-      NumTests(0) {}
-
-  unsigned getNumTests() const { return NumTests; }
-};
-
-std::set<unsigned> fixed_set(unsigned N, ...) {
-  std::set<unsigned> S;
-  va_list ap;
-  va_start(ap, N);
-  for (unsigned i = 0; i != N; ++i)
-    S.insert(va_arg(ap, unsigned));
-  va_end(ap);
-  return S;
-}
-
-std::set<unsigned> range(unsigned Start, unsigned End) {
-  std::set<unsigned> S;
-  while (Start != End)
-    S.insert(Start++);
-  return S;
-}
-
-std::set<unsigned> range(unsigned N) {
-  return range(0, N);
-}
-
-TEST(DeltaAlgorithmTest, Basic) {
-  // P = {3,5,7} \in S
-  //   [0, 20) should minimize to {3,5,7} in a reasonable number of tests.
-  std::set<unsigned> Fails = fixed_set(3, 3, 5, 7);
-  FixedDeltaAlgorithm FDA(Fails);
-  EXPECT_EQ(fixed_set(3, 3, 5, 7), FDA.Run(range(20)));
-  EXPECT_GE(33U, FDA.getNumTests());
-
-  // P = {3,5,7} \in S
-  //   [10, 20) should minimize to [10,20)
-  EXPECT_EQ(range(10,20), FDA.Run(range(10,20)));
-
-  // P = [0,4) \in S
-  //   [0, 4) should minimize to [0,4) in 11 tests.
-  //
-  // 11 = |{ {},
-  //         {0}, {1}, {2}, {3},
-  //         {1, 2, 3}, {0, 2, 3}, {0, 1, 3}, {0, 1, 2}, 
-  //         {0, 1}, {2, 3} }|
-  FDA = FixedDeltaAlgorithm(range(10));
-  EXPECT_EQ(range(4), FDA.Run(range(4)));
-  EXPECT_EQ(11U, FDA.getNumTests());  
-}
-
-}
-
diff --git a/gnu/llvm/llvm/unittests/ADT/DenseMapTest.cpp b/gnu/llvm/llvm/unittests/ADT/DenseMapTest.cpp
deleted file mode 100644
index 352270adec0..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/DenseMapTest.cpp
+++ /dev/null
@@ -1,658 +0,0 @@
-//===- llvm/unittest/ADT/DenseMapMap.cpp - DenseMap unit tests --*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/DenseMap.h"
-#include "gtest/gtest.h"
-#include <map>
-#include <set>
-
-using namespace llvm;
-
-namespace {
-
-uint32_t getTestKey(int i, uint32_t *) { return i; }
-uint32_t getTestValue(int i, uint32_t *) { return 42 + i; }
-
-uint32_t *getTestKey(int i, uint32_t **) {
-  static uint32_t dummy_arr1[8192];
-  assert(i < 8192 && "Only support 8192 dummy keys.");
-  return &dummy_arr1[i];
-}
-uint32_t *getTestValue(int i, uint32_t **) {
-  static uint32_t dummy_arr1[8192];
-  assert(i < 8192 && "Only support 8192 dummy keys.");
-  return &dummy_arr1[i];
-}
-
-/// A test class that tries to check that construction and destruction
-/// occur correctly.
-class CtorTester {
-  static std::set<CtorTester *> Constructed;
-  int Value;
-
-public:
-  explicit CtorTester(int Value = 0) : Value(Value) {
-    EXPECT_TRUE(Constructed.insert(this).second);
-  }
-  CtorTester(uint32_t Value) : Value(Value) {
-    EXPECT_TRUE(Constructed.insert(this).second);
-  }
-  CtorTester(const CtorTester &Arg) : Value(Arg.Value) {
-    EXPECT_TRUE(Constructed.insert(this).second);
-  }
-  CtorTester &operator=(const CtorTester &) = default;
-  ~CtorTester() {
-    EXPECT_EQ(1u, Constructed.erase(this));
-  }
-  operator uint32_t() const { return Value; }
-
-  int getValue() const { return Value; }
-  bool operator==(const CtorTester &RHS) const { return Value == RHS.Value; }
-};
-
-std::set<CtorTester *> CtorTester::Constructed;
-
-struct CtorTesterMapInfo {
-  static inline CtorTester getEmptyKey() { return CtorTester(-1); }
-  static inline CtorTester getTombstoneKey() { return CtorTester(-2); }
-  static unsigned getHashValue(const CtorTester &Val) {
-    return Val.getValue() * 37u;
-  }
-  static bool isEqual(const CtorTester &LHS, const CtorTester &RHS) {
-    return LHS == RHS;
-  }
-};
-
-CtorTester getTestKey(int i, CtorTester *) { return CtorTester(i); }
-CtorTester getTestValue(int i, CtorTester *) { return CtorTester(42 + i); }
-
-// Test fixture, with helper functions implemented by forwarding to global
-// function overloads selected by component types of the type parameter. This
-// allows all of the map implementations to be tested with shared
-// implementations of helper routines.
-template <typename T>
-class DenseMapTest : public ::testing::Test {
-protected:
-  T Map;
-
-  static typename T::key_type *const dummy_key_ptr;
-  static typename T::mapped_type *const dummy_value_ptr;
-
-  typename T::key_type getKey(int i = 0) {
-    return getTestKey(i, dummy_key_ptr);
-  }
-  typename T::mapped_type getValue(int i = 0) {
-    return getTestValue(i, dummy_value_ptr);
-  }
-};
-
-template <typename T>
-typename T::key_type *const DenseMapTest<T>::dummy_key_ptr = nullptr;
-template <typename T>
-typename T::mapped_type *const DenseMapTest<T>::dummy_value_ptr = nullptr;
-
-// Register these types for testing.
-typedef ::testing::Types<DenseMap<uint32_t, uint32_t>,
-                         DenseMap<uint32_t *, uint32_t *>,
-                         DenseMap<CtorTester, CtorTester, CtorTesterMapInfo>,
-                         SmallDenseMap<uint32_t, uint32_t>,
-                         SmallDenseMap<uint32_t *, uint32_t *>,
-                         SmallDenseMap<CtorTester, CtorTester, 4,
-                                       CtorTesterMapInfo>
-                         > DenseMapTestTypes;
-TYPED_TEST_SUITE(DenseMapTest, DenseMapTestTypes, );
-
-// Empty map tests
-TYPED_TEST(DenseMapTest, EmptyIntMapTest) {
-  // Size tests
-  EXPECT_EQ(0u, this->Map.size());
-  EXPECT_TRUE(this->Map.empty());
-
-  // Iterator tests
-  EXPECT_TRUE(this->Map.begin() == this->Map.end());
-
-  // Lookup tests
-  EXPECT_FALSE(this->Map.count(this->getKey()));
-  EXPECT_TRUE(this->Map.find(this->getKey()) == this->Map.end());
-  EXPECT_EQ(typename TypeParam::mapped_type(),
-            this->Map.lookup(this->getKey()));
-}
-
-// Constant map tests
-TYPED_TEST(DenseMapTest, ConstEmptyMapTest) {
-  const TypeParam &ConstMap = this->Map;
-  EXPECT_EQ(0u, ConstMap.size());
-  EXPECT_TRUE(ConstMap.empty());
-  EXPECT_TRUE(ConstMap.begin() == ConstMap.end());
-}
-
-// A map with a single entry
-TYPED_TEST(DenseMapTest, SingleEntryMapTest) {
-  this->Map[this->getKey()] = this->getValue();
-
-  // Size tests
-  EXPECT_EQ(1u, this->Map.size());
-  EXPECT_FALSE(this->Map.begin() == this->Map.end());
-  EXPECT_FALSE(this->Map.empty());
-
-  // Iterator tests
-  typename TypeParam::iterator it = this->Map.begin();
-  EXPECT_EQ(this->getKey(), it->first);
-  EXPECT_EQ(this->getValue(), it->second);
-  ++it;
-  EXPECT_TRUE(it == this->Map.end());
-
-  // Lookup tests
-  EXPECT_TRUE(this->Map.count(this->getKey()));
-  EXPECT_TRUE(this->Map.find(this->getKey()) == this->Map.begin());
-  EXPECT_EQ(this->getValue(), this->Map.lookup(this->getKey()));
-  EXPECT_EQ(this->getValue(), this->Map[this->getKey()]);
-}
-
-// Test clear() method
-TYPED_TEST(DenseMapTest, ClearTest) {
-  this->Map[this->getKey()] = this->getValue();
-  this->Map.clear();
-
-  EXPECT_EQ(0u, this->Map.size());
-  EXPECT_TRUE(this->Map.empty());
-  EXPECT_TRUE(this->Map.begin() == this->Map.end());
-}
-
-// Test erase(iterator) method
-TYPED_TEST(DenseMapTest, EraseTest) {
-  this->Map[this->getKey()] = this->getValue();
-  this->Map.erase(this->Map.begin());
-
-  EXPECT_EQ(0u, this->Map.size());
-  EXPECT_TRUE(this->Map.empty());
-  EXPECT_TRUE(this->Map.begin() == this->Map.end());
-}
-
-// Test erase(value) method
-TYPED_TEST(DenseMapTest, EraseTest2) {
-  this->Map[this->getKey()] = this->getValue();
-  this->Map.erase(this->getKey());
-
-  EXPECT_EQ(0u, this->Map.size());
-  EXPECT_TRUE(this->Map.empty());
-  EXPECT_TRUE(this->Map.begin() == this->Map.end());
-}
-
-// Test insert() method
-TYPED_TEST(DenseMapTest, InsertTest) {
-  this->Map.insert(std::make_pair(this->getKey(), this->getValue()));
-  EXPECT_EQ(1u, this->Map.size());
-  EXPECT_EQ(this->getValue(), this->Map[this->getKey()]);
-}
-
-// Test copy constructor method
-TYPED_TEST(DenseMapTest, CopyConstructorTest) {
-  this->Map[this->getKey()] = this->getValue();
-  TypeParam copyMap(this->Map);
-
-  EXPECT_EQ(1u, copyMap.size());
-  EXPECT_EQ(this->getValue(), copyMap[this->getKey()]);
-}
-
-// Test copy constructor method where SmallDenseMap isn't small.
-TYPED_TEST(DenseMapTest, CopyConstructorNotSmallTest) {
-  for (int Key = 0; Key < 5; ++Key)
-    this->Map[this->getKey(Key)] = this->getValue(Key);
-  TypeParam copyMap(this->Map);
-
-  EXPECT_EQ(5u, copyMap.size());
-  for (int Key = 0; Key < 5; ++Key)
-    EXPECT_EQ(this->getValue(Key), copyMap[this->getKey(Key)]);
-}
-
-// Test copying from a default-constructed map.
-TYPED_TEST(DenseMapTest, CopyConstructorFromDefaultTest) {
-  TypeParam copyMap(this->Map);
-
-  EXPECT_TRUE(copyMap.empty());
-}
-
-// Test copying from an empty map where SmallDenseMap isn't small.
-TYPED_TEST(DenseMapTest, CopyConstructorFromEmptyTest) {
-  for (int Key = 0; Key < 5; ++Key)
-    this->Map[this->getKey(Key)] = this->getValue(Key);
-  this->Map.clear();
-  TypeParam copyMap(this->Map);
-
-  EXPECT_TRUE(copyMap.empty());
-}
-
-// Test assignment operator method
-TYPED_TEST(DenseMapTest, AssignmentTest) {
-  this->Map[this->getKey()] = this->getValue();
-  TypeParam copyMap = this->Map;
-
-  EXPECT_EQ(1u, copyMap.size());
-  EXPECT_EQ(this->getValue(), copyMap[this->getKey()]);
-
-  // test self-assignment.
-  copyMap = static_cast<TypeParam &>(copyMap);
-  EXPECT_EQ(1u, copyMap.size());
-  EXPECT_EQ(this->getValue(), copyMap[this->getKey()]);
-}
-
-TYPED_TEST(DenseMapTest, AssignmentTestNotSmall) {
-  for (int Key = 0; Key < 5; ++Key)
-    this->Map[this->getKey(Key)] = this->getValue(Key);
-  TypeParam copyMap = this->Map;
-
-  EXPECT_EQ(5u, copyMap.size());
-  for (int Key = 0; Key < 5; ++Key)
-    EXPECT_EQ(this->getValue(Key), copyMap[this->getKey(Key)]);
-
-  // test self-assignment.
-  copyMap = static_cast<TypeParam &>(copyMap);
-  EXPECT_EQ(5u, copyMap.size());
-  for (int Key = 0; Key < 5; ++Key)
-    EXPECT_EQ(this->getValue(Key), copyMap[this->getKey(Key)]);
-}
-
-// Test swap method
-TYPED_TEST(DenseMapTest, SwapTest) {
-  this->Map[this->getKey()] = this->getValue();
-  TypeParam otherMap;
-
-  this->Map.swap(otherMap);
-  EXPECT_EQ(0u, this->Map.size());
-  EXPECT_TRUE(this->Map.empty());
-  EXPECT_EQ(1u, otherMap.size());
-  EXPECT_EQ(this->getValue(), otherMap[this->getKey()]);
-
-  this->Map.swap(otherMap);
-  EXPECT_EQ(0u, otherMap.size());
-  EXPECT_TRUE(otherMap.empty());
-  EXPECT_EQ(1u, this->Map.size());
-  EXPECT_EQ(this->getValue(), this->Map[this->getKey()]);
-
-  // Make this more interesting by inserting 100 numbers into the map.
-  for (int i = 0; i < 100; ++i)
-    this->Map[this->getKey(i)] = this->getValue(i);
-
-  this->Map.swap(otherMap);
-  EXPECT_EQ(0u, this->Map.size());
-  EXPECT_TRUE(this->Map.empty());
-  EXPECT_EQ(100u, otherMap.size());
-  for (int i = 0; i < 100; ++i)
-    EXPECT_EQ(this->getValue(i), otherMap[this->getKey(i)]);
-
-  this->Map.swap(otherMap);
-  EXPECT_EQ(0u, otherMap.size());
-  EXPECT_TRUE(otherMap.empty());
-  EXPECT_EQ(100u, this->Map.size());
-  for (int i = 0; i < 100; ++i)
-    EXPECT_EQ(this->getValue(i), this->Map[this->getKey(i)]);
-}
-
-// A more complex iteration test
-TYPED_TEST(DenseMapTest, IterationTest) {
-  bool visited[100];
-  std::map<typename TypeParam::key_type, unsigned> visitedIndex;
-
-  // Insert 100 numbers into the map
-  for (int i = 0; i < 100; ++i) {
-    visited[i] = false;
-    visitedIndex[this->getKey(i)] = i;
-
-    this->Map[this->getKey(i)] = this->getValue(i);
-  }
-
-  // Iterate over all numbers and mark each one found.
-  for (typename TypeParam::iterator it = this->Map.begin();
-       it != this->Map.end(); ++it)
-    visited[visitedIndex[it->first]] = true;
-
-  // Ensure every number was visited.
-  for (int i = 0; i < 100; ++i)
-    ASSERT_TRUE(visited[i]) << "Entry #" << i << " was never visited";
-}
-
-// const_iterator test
-TYPED_TEST(DenseMapTest, ConstIteratorTest) {
-  // Check conversion from iterator to const_iterator.
-  typename TypeParam::iterator it = this->Map.begin();
-  typename TypeParam::const_iterator cit(it);
-  EXPECT_TRUE(it == cit);
-
-  // Check copying of const_iterators.
-  typename TypeParam::const_iterator cit2(cit);
-  EXPECT_TRUE(cit == cit2);
-}
-
-namespace {
-// Simple class that counts how many moves and copy happens when growing a map
-struct CountCopyAndMove {
-  static int Move;
-  static int Copy;
-  CountCopyAndMove() {}
-
-  CountCopyAndMove(const CountCopyAndMove &) { Copy++; }
-  CountCopyAndMove &operator=(const CountCopyAndMove &) {
-    Copy++;
-    return *this;
-  }
-  CountCopyAndMove(CountCopyAndMove &&) { Move++; }
-  CountCopyAndMove &operator=(const CountCopyAndMove &&) {
-    Move++;
-    return *this;
-  }
-};
-int CountCopyAndMove::Copy = 0;
-int CountCopyAndMove::Move = 0;
-
-} // anonymous namespace
-
-// Test initializer list construction.
-TEST(DenseMapCustomTest, InitializerList) {
-  DenseMap<int, int> M({{0, 0}, {0, 1}, {1, 2}});
-  EXPECT_EQ(2u, M.size());
-  EXPECT_EQ(1u, M.count(0));
-  EXPECT_EQ(0, M[0]);
-  EXPECT_EQ(1u, M.count(1));
-  EXPECT_EQ(2, M[1]);
-}
-
-// Test initializer list construction.
-TEST(DenseMapCustomTest, EqualityComparison) {
-  DenseMap<int, int> M1({{0, 0}, {1, 2}});
-  DenseMap<int, int> M2({{0, 0}, {1, 2}});
-  DenseMap<int, int> M3({{0, 0}, {1, 3}});
-
-  EXPECT_EQ(M1, M2);
-  EXPECT_NE(M1, M3);
-}
-
-// Test for the default minimum size of a DenseMap
-TEST(DenseMapCustomTest, DefaultMinReservedSizeTest) {
-  // IF THIS VALUE CHANGE, please update InitialSizeTest, InitFromIterator, and
-  // ReserveTest as well!
-  const int ExpectedInitialBucketCount = 64;
-  // Formula from DenseMap::getMinBucketToReserveForEntries()
-  const int ExpectedMaxInitialEntries = ExpectedInitialBucketCount * 3 / 4 - 1;
-
-  DenseMap<int, CountCopyAndMove> Map;
-  // Will allocate 64 buckets
-  Map.reserve(1);
-  unsigned MemorySize = Map.getMemorySize();
-  CountCopyAndMove::Copy = 0;
-  CountCopyAndMove::Move = 0;
-  for (int i = 0; i < ExpectedMaxInitialEntries; ++i)
-    Map.insert(std::pair<int, CountCopyAndMove>(std::piecewise_construct,
-                                                std::forward_as_tuple(i),
-                                                std::forward_as_tuple()));
-  // Check that we didn't grow
-  EXPECT_EQ(MemorySize, Map.getMemorySize());
-  // Check that move was called the expected number of times
-  EXPECT_EQ(ExpectedMaxInitialEntries, CountCopyAndMove::Move);
-  // Check that no copy occurred
-  EXPECT_EQ(0, CountCopyAndMove::Copy);
-
-  // Adding one extra element should grow the map
-  Map.insert(std::pair<int, CountCopyAndMove>(
-      std::piecewise_construct,
-      std::forward_as_tuple(ExpectedMaxInitialEntries),
-      std::forward_as_tuple()));
-  // Check that we grew
-  EXPECT_NE(MemorySize, Map.getMemorySize());
-  // Check that move was called the expected number of times
-  //  This relies on move-construction elision, and cannot be reliably tested.
-  //   EXPECT_EQ(ExpectedMaxInitialEntries + 2, CountCopyAndMove::Move);
-  // Check that no copy occurred
-  EXPECT_EQ(0, CountCopyAndMove::Copy);
-}
-
-// Make sure creating the map with an initial size of N actually gives us enough
-// buckets to insert N items without increasing allocation size.
-TEST(DenseMapCustomTest, InitialSizeTest) {
-  // Test a few different sizes, 48 is *not* a random choice: we need a value
-  // that is 2/3 of a power of two to stress the grow() condition, and the power
-  // of two has to be at least 64 because of minimum size allocation in the
-  // DenseMap (see DefaultMinReservedSizeTest). 66 is a value just above the
-  // 64 default init.
-  for (auto Size : {1, 2, 48, 66}) {
-    DenseMap<int, CountCopyAndMove> Map(Size);
-    unsigned MemorySize = Map.getMemorySize();
-    CountCopyAndMove::Copy = 0;
-    CountCopyAndMove::Move = 0;
-    for (int i = 0; i < Size; ++i)
-      Map.insert(std::pair<int, CountCopyAndMove>(std::piecewise_construct,
-                                                  std::forward_as_tuple(i),
-                                                  std::forward_as_tuple()));
-    // Check that we didn't grow
-    EXPECT_EQ(MemorySize, Map.getMemorySize());
-    // Check that move was called the expected number of times
-    EXPECT_EQ(Size, CountCopyAndMove::Move);
-    // Check that no copy occurred
-    EXPECT_EQ(0, CountCopyAndMove::Copy);
-  }
-}
-
-// Make sure creating the map with a iterator range does not trigger grow()
-TEST(DenseMapCustomTest, InitFromIterator) {
-  std::vector<std::pair<int, CountCopyAndMove>> Values;
-  // The size is a random value greater than 64 (hardcoded DenseMap min init)
-  const int Count = 65;
-  for (int i = 0; i < Count; i++)
-    Values.emplace_back(i, CountCopyAndMove());
-
-  CountCopyAndMove::Move = 0;
-  CountCopyAndMove::Copy = 0;
-  DenseMap<int, CountCopyAndMove> Map(Values.begin(), Values.end());
-  // Check that no move occurred
-  EXPECT_EQ(0, CountCopyAndMove::Move);
-  // Check that copy was called the expected number of times
-  EXPECT_EQ(Count, CountCopyAndMove::Copy);
-}
-
-// Make sure reserve actually gives us enough buckets to insert N items
-// without increasing allocation size.
-TEST(DenseMapCustomTest, ReserveTest) {
-  // Test a few different size, 48 is *not* a random choice: we need a value
-  // that is 2/3 of a power of two to stress the grow() condition, and the power
-  // of two has to be at least 64 because of minimum size allocation in the
-  // DenseMap (see DefaultMinReservedSizeTest). 66 is a value just above the
-  // 64 default init.
-  for (auto Size : {1, 2, 48, 66}) {
-    DenseMap<int, CountCopyAndMove> Map;
-    Map.reserve(Size);
-    unsigned MemorySize = Map.getMemorySize();
-    CountCopyAndMove::Copy = 0;
-    CountCopyAndMove::Move = 0;
-    for (int i = 0; i < Size; ++i)
-      Map.insert(std::pair<int, CountCopyAndMove>(std::piecewise_construct,
-                                                  std::forward_as_tuple(i),
-                                                  std::forward_as_tuple()));
-    // Check that we didn't grow
-    EXPECT_EQ(MemorySize, Map.getMemorySize());
-    // Check that move was called the expected number of times
-    EXPECT_EQ(Size, CountCopyAndMove::Move);
-    // Check that no copy occurred
-    EXPECT_EQ(0, CountCopyAndMove::Copy);
-  }
-}
-
-// Make sure DenseMap works with StringRef keys.
-TEST(DenseMapCustomTest, StringRefTest) {
-  DenseMap<StringRef, int> M;
-
-  M["a"] = 1;
-  M["b"] = 2;
-  M["c"] = 3;
-
-  EXPECT_EQ(3u, M.size());
-  EXPECT_EQ(1, M.lookup("a"));
-  EXPECT_EQ(2, M.lookup("b"));
-  EXPECT_EQ(3, M.lookup("c"));
-
-  EXPECT_EQ(0, M.lookup("q"));
-
-  // Test the empty string, spelled various ways.
-  EXPECT_EQ(0, M.lookup(""));
-  EXPECT_EQ(0, M.lookup(StringRef()));
-  EXPECT_EQ(0, M.lookup(StringRef("a", 0)));
-  M[""] = 42;
-  EXPECT_EQ(42, M.lookup(""));
-  EXPECT_EQ(42, M.lookup(StringRef()));
-  EXPECT_EQ(42, M.lookup(StringRef("a", 0)));
-}
-
-// Key traits that allows lookup with either an unsigned or char* key;
-// In the latter case, "a" == 0, "b" == 1 and so on.
-struct TestDenseMapInfo {
-  static inline unsigned getEmptyKey() { return ~0; }
-  static inline unsigned getTombstoneKey() { return ~0U - 1; }
-  static unsigned getHashValue(const unsigned& Val) { return Val * 37U; }
-  static unsigned getHashValue(const char* Val) {
-    return (unsigned)(Val[0] - 'a') * 37U;
-  }
-  static bool isEqual(const unsigned& LHS, const unsigned& RHS) {
-    return LHS == RHS;
-  }
-  static bool isEqual(const char* LHS, const unsigned& RHS) {
-    return (unsigned)(LHS[0] - 'a') == RHS;
-  }
-};
-
-// find_as() tests
-TEST(DenseMapCustomTest, FindAsTest) {
-  DenseMap<unsigned, unsigned, TestDenseMapInfo> map;
-  map[0] = 1;
-  map[1] = 2;
-  map[2] = 3;
-
-  // Size tests
-  EXPECT_EQ(3u, map.size());
-
-  // Normal lookup tests
-  EXPECT_EQ(1u, map.count(1));
-  EXPECT_EQ(1u, map.find(0)->second);
-  EXPECT_EQ(2u, map.find(1)->second);
-  EXPECT_EQ(3u, map.find(2)->second);
-  EXPECT_TRUE(map.find(3) == map.end());
-
-  // find_as() tests
-  EXPECT_EQ(1u, map.find_as("a")->second);
-  EXPECT_EQ(2u, map.find_as("b")->second);
-  EXPECT_EQ(3u, map.find_as("c")->second);
-  EXPECT_TRUE(map.find_as("d") == map.end());
-}
-
-TEST(DenseMapCustomTest, SmallDenseMapInitializerList) {
-  SmallDenseMap<int, int> M = {{0, 0}, {0, 1}, {1, 2}};
-  EXPECT_EQ(2u, M.size());
-  EXPECT_EQ(1u, M.count(0));
-  EXPECT_EQ(0, M[0]);
-  EXPECT_EQ(1u, M.count(1));
-  EXPECT_EQ(2, M[1]);
-}
-
-struct ContiguousDenseMapInfo {
-  static inline unsigned getEmptyKey() { return ~0; }
-  static inline unsigned getTombstoneKey() { return ~0U - 1; }
-  static unsigned getHashValue(const unsigned& Val) { return Val; }
-  static bool isEqual(const unsigned& LHS, const unsigned& RHS) {
-    return LHS == RHS;
-  }
-};
-
-// Test that filling a small dense map with exactly the number of elements in
-// the map grows to have enough space for an empty bucket.
-TEST(DenseMapCustomTest, SmallDenseMapGrowTest) {
-  SmallDenseMap<unsigned, unsigned, 32, ContiguousDenseMapInfo> map;
-  // Add some number of elements, then delete a few to leave us some tombstones.
-  // If we just filled the map with 32 elements we'd grow because of not enough
-  // tombstones which masks the issue here.
-  for (unsigned i = 0; i < 20; ++i)
-    map[i] = i + 1;
-  for (unsigned i = 0; i < 10; ++i)
-    map.erase(i);
-  for (unsigned i = 20; i < 32; ++i)
-    map[i] = i + 1;
-
-  // Size tests
-  EXPECT_EQ(22u, map.size());
-
-  // Try to find an element which doesn't exist.  There was a bug in
-  // SmallDenseMap which led to a map with num elements == small capacity not
-  // having an empty bucket any more.  Finding an element not in the map would
-  // therefore never terminate.
-  EXPECT_TRUE(map.find(32) == map.end());
-}
-
-TEST(DenseMapCustomTest, LargeSmallDenseMapCompaction) {
-  SmallDenseMap<unsigned, unsigned, 128, ContiguousDenseMapInfo> map;
-  // Fill to < 3/4 load.
-  for (unsigned i = 0; i < 95; ++i)
-    map[i] = i;
-  // And erase, leaving behind tombstones.
-  for (unsigned i = 0; i < 95; ++i)
-    map.erase(i);
-  // Fill further, so that less than 1/8 are empty, but still below 3/4 load.
-  for (unsigned i = 95; i < 128; ++i)
-    map[i] = i;
-
-  EXPECT_EQ(33u, map.size());
-  // Similar to the previous test, check for a non-existing element, as an
-  // indirect check that tombstones have been removed.
-  EXPECT_TRUE(map.find(0) == map.end());
-}
-
-TEST(DenseMapCustomTest, TryEmplaceTest) {
-  DenseMap<int, std::unique_ptr<int>> Map;
-  std::unique_ptr<int> P(new int(2));
-  auto Try1 = Map.try_emplace(0, new int(1));
-  EXPECT_TRUE(Try1.second);
-  auto Try2 = Map.try_emplace(0, std::move(P));
-  EXPECT_FALSE(Try2.second);
-  EXPECT_EQ(Try1.first, Try2.first);
-  EXPECT_NE(nullptr, P);
-}
-
-TEST(DenseMapCustomTest, ConstTest) {
-  // Test that const pointers work okay for count and find, even when the
-  // underlying map is a non-const pointer.
-  DenseMap<int *, int> Map;
-  int A;
-  int *B = &A;
-  const int *C = &A;
-  Map.insert({B, 0});
-  EXPECT_EQ(Map.count(B), 1u);
-  EXPECT_EQ(Map.count(C), 1u);
-  EXPECT_NE(Map.find(B), Map.end());
-  EXPECT_NE(Map.find(C), Map.end());
-}
-
-struct IncompleteStruct;
-
-TEST(DenseMapCustomTest, OpaquePointerKey) {
-  // Test that we can use a pointer to an incomplete type as a DenseMap key.
-  // This is an important build time optimization, since many classes have
-  // DenseMap members.
-  DenseMap<IncompleteStruct *, int> Map;
-  int Keys[3] = {0, 0, 0};
-  IncompleteStruct *K1 = reinterpret_cast<IncompleteStruct *>(&Keys[0]);
-  IncompleteStruct *K2 = reinterpret_cast<IncompleteStruct *>(&Keys[1]);
-  IncompleteStruct *K3 = reinterpret_cast<IncompleteStruct *>(&Keys[2]);
-  Map.insert({K1, 1});
-  Map.insert({K2, 2});
-  Map.insert({K3, 3});
-  EXPECT_EQ(Map.count(K1), 1u);
-  EXPECT_EQ(Map[K1], 1);
-  EXPECT_EQ(Map[K2], 2);
-  EXPECT_EQ(Map[K3], 3);
-  Map.clear();
-  EXPECT_EQ(Map.find(K1), Map.end());
-  EXPECT_EQ(Map.find(K2), Map.end());
-  EXPECT_EQ(Map.find(K3), Map.end());
-}
-}
diff --git a/gnu/llvm/llvm/unittests/ADT/DenseSetTest.cpp b/gnu/llvm/llvm/unittests/ADT/DenseSetTest.cpp
deleted file mode 100644
index 82ac1d8bff0..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/DenseSetTest.cpp
+++ /dev/null
@@ -1,233 +0,0 @@
-//===- llvm/unittest/ADT/DenseSetTest.cpp - DenseSet unit tests --*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/DenseSet.h"
-#include "gtest/gtest.h"
-#include <type_traits>
-
-using namespace llvm;
-
-namespace {
-
-static_assert(std::is_const<std::remove_pointer<
-                  DenseSet<int>::const_iterator::pointer>::type>::value,
-              "Iterator pointer type should be const");
-static_assert(std::is_const<std::remove_reference<
-                  DenseSet<int>::const_iterator::reference>::type>::value,
-              "Iterator reference type should be const");
-
-// Test hashing with a set of only two entries.
-TEST(DenseSetTest, DoubleEntrySetTest) {
-  llvm::DenseSet<unsigned> set(2);
-  set.insert(0);
-  set.insert(1);
-  // Original failure was an infinite loop in this call:
-  EXPECT_EQ(0u, set.count(2));
-}
-
-struct TestDenseSetInfo {
-  static inline unsigned getEmptyKey() { return ~0; }
-  static inline unsigned getTombstoneKey() { return ~0U - 1; }
-  static unsigned getHashValue(const unsigned& Val) { return Val * 37U; }
-  static unsigned getHashValue(const char* Val) {
-    return (unsigned)(Val[0] - 'a') * 37U;
-  }
-  static bool isEqual(const unsigned& LHS, const unsigned& RHS) {
-    return LHS == RHS;
-  }
-  static bool isEqual(const char* LHS, const unsigned& RHS) {
-    return (unsigned)(LHS[0] - 'a') == RHS;
-  }
-};
-
-// Test fixture
-template <typename T> class DenseSetTest : public testing::Test {
-protected:
-  T Set = GetTestSet();
-
-private:
-  static T GetTestSet() {
-    std::remove_const_t<T> Set;
-    Set.insert(0);
-    Set.insert(1);
-    Set.insert(2);
-    return Set;
-  }
-};
-
-// Register these types for testing.
-typedef ::testing::Types<DenseSet<unsigned, TestDenseSetInfo>,
-                         const DenseSet<unsigned, TestDenseSetInfo>,
-                         SmallDenseSet<unsigned, 1, TestDenseSetInfo>,
-                         SmallDenseSet<unsigned, 4, TestDenseSetInfo>,
-                         const SmallDenseSet<unsigned, 4, TestDenseSetInfo>,
-                         SmallDenseSet<unsigned, 64, TestDenseSetInfo>>
-    DenseSetTestTypes;
-TYPED_TEST_SUITE(DenseSetTest, DenseSetTestTypes, );
-
-TYPED_TEST(DenseSetTest, Constructor) {
-  constexpr unsigned a[] = {1, 2, 4};
-  TypeParam set(std::begin(a), std::end(a));
-  EXPECT_EQ(3u, set.size());
-  EXPECT_EQ(1u, set.count(1));
-  EXPECT_EQ(1u, set.count(2));
-  EXPECT_EQ(1u, set.count(4));
-}
-
-TYPED_TEST(DenseSetTest, InitializerList) {
-  TypeParam set({1, 2, 1, 4});
-  EXPECT_EQ(3u, set.size());
-  EXPECT_EQ(1u, set.count(1));
-  EXPECT_EQ(1u, set.count(2));
-  EXPECT_EQ(1u, set.count(4));
-  EXPECT_EQ(0u, set.count(3));
-}
-
-TYPED_TEST(DenseSetTest, InitializerListWithNonPowerOfTwoLength) {
-  TypeParam set({1, 2, 3});
-  EXPECT_EQ(3u, set.size());
-  EXPECT_EQ(1u, set.count(1));
-  EXPECT_EQ(1u, set.count(2));
-  EXPECT_EQ(1u, set.count(3));
-}
-
-TYPED_TEST(DenseSetTest, ConstIteratorComparison) {
-  TypeParam set({1});
-  const TypeParam &cset = set;
-  EXPECT_EQ(set.begin(), cset.begin());
-  EXPECT_EQ(set.end(), cset.end());
-  EXPECT_NE(set.end(), cset.begin());
-  EXPECT_NE(set.begin(), cset.end());
-}
-
-TYPED_TEST(DenseSetTest, DefaultConstruction) {
-  typename TypeParam::iterator I, J;
-  typename TypeParam::const_iterator CI, CJ;
-  EXPECT_EQ(I, J);
-  EXPECT_EQ(CI, CJ);
-}
-
-TYPED_TEST(DenseSetTest, EmptyInitializerList) {
-  TypeParam set({});
-  EXPECT_EQ(0u, set.size());
-  EXPECT_EQ(0u, set.count(0));
-}
-
-TYPED_TEST(DenseSetTest, FindAsTest) {
-  auto &set = this->Set;
-  // Size tests
-  EXPECT_EQ(3u, set.size());
-
-  // Normal lookup tests
-  EXPECT_EQ(1u, set.count(1));
-  EXPECT_EQ(0u, *set.find(0));
-  EXPECT_EQ(1u, *set.find(1));
-  EXPECT_EQ(2u, *set.find(2));
-  EXPECT_TRUE(set.find(3) == set.end());
-
-  // find_as() tests
-  EXPECT_EQ(0u, *set.find_as("a"));
-  EXPECT_EQ(1u, *set.find_as("b"));
-  EXPECT_EQ(2u, *set.find_as("c"));
-  EXPECT_TRUE(set.find_as("d") == set.end());
-}
-
-TYPED_TEST(DenseSetTest, EqualityComparisonTest) {
-  TypeParam set1({1, 2, 3, 4});
-  TypeParam set2({4, 3, 2, 1});
-  TypeParam set3({2, 3, 4, 5});
-
-  EXPECT_EQ(set1, set2);
-  EXPECT_NE(set1, set3);
-}
-
-// Simple class that counts how many moves and copy happens when growing a map
-struct CountCopyAndMove {
-  static int Move;
-  static int Copy;
-  int Value;
-  CountCopyAndMove(int Value) : Value(Value) {}
-
-  CountCopyAndMove(const CountCopyAndMove &RHS) {
-    Value = RHS.Value;
-    Copy++;
-  }
-  CountCopyAndMove &operator=(const CountCopyAndMove &RHS) {
-    Value = RHS.Value;
-    Copy++;
-    return *this;
-  }
-  CountCopyAndMove(CountCopyAndMove &&RHS) {
-    Value = RHS.Value;
-    Move++;
-  }
-  CountCopyAndMove &operator=(const CountCopyAndMove &&RHS) {
-    Value = RHS.Value;
-    Move++;
-    return *this;
-  }
-};
-int CountCopyAndMove::Copy = 0;
-int CountCopyAndMove::Move = 0;
-} // anonymous namespace
-
-namespace llvm {
-// Specialization required to insert a CountCopyAndMove into a DenseSet.
-template <> struct DenseMapInfo<CountCopyAndMove> {
-  static inline CountCopyAndMove getEmptyKey() { return CountCopyAndMove(-1); };
-  static inline CountCopyAndMove getTombstoneKey() {
-    return CountCopyAndMove(-2);
-  };
-  static unsigned getHashValue(const CountCopyAndMove &Val) {
-    return Val.Value;
-  }
-  static bool isEqual(const CountCopyAndMove &LHS,
-                      const CountCopyAndMove &RHS) {
-    return LHS.Value == RHS.Value;
-  }
-};
-}
-
-namespace {
-// Make sure reserve actually gives us enough buckets to insert N items
-// without increasing allocation size.
-TEST(DenseSetCustomTest, ReserveTest) {
-  // Test a few different size, 48 is *not* a random choice: we need a value
-  // that is 2/3 of a power of two to stress the grow() condition, and the power
-  // of two has to be at least 64 because of minimum size allocation in the
-  // DenseMa. 66 is a value just above the 64 default init.
-  for (auto Size : {1, 2, 48, 66}) {
-    DenseSet<CountCopyAndMove> Set;
-    Set.reserve(Size);
-    unsigned MemorySize = Set.getMemorySize();
-    CountCopyAndMove::Copy = 0;
-    CountCopyAndMove::Move = 0;
-    for (int i = 0; i < Size; ++i)
-      Set.insert(CountCopyAndMove(i));
-    // Check that we didn't grow
-    EXPECT_EQ(MemorySize, Set.getMemorySize());
-    // Check that move was called the expected number of times
-    EXPECT_EQ(Size, CountCopyAndMove::Move);
-    // Check that no copy occurred
-    EXPECT_EQ(0, CountCopyAndMove::Copy);
-  }
-}
-TEST(DenseSetCustomTest, ConstTest) {
-  // Test that const pointers work okay for count and find, even when the
-  // underlying map is a non-const pointer.
-  DenseSet<int *> Map;
-  int A;
-  int *B = &A;
-  const int *C = &A;
-  Map.insert(B);
-  EXPECT_EQ(Map.count(B), 1u);
-  EXPECT_EQ(Map.count(C), 1u);
-  EXPECT_TRUE(Map.contains(B));
-  EXPECT_TRUE(Map.contains(C));
-}
-}
diff --git a/gnu/llvm/llvm/unittests/ADT/DepthFirstIteratorTest.cpp b/gnu/llvm/llvm/unittests/ADT/DepthFirstIteratorTest.cpp
deleted file mode 100644
index 0e3e0e66d71..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/DepthFirstIteratorTest.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-//=== llvm/unittest/ADT/DepthFirstIteratorTest.cpp - DFS iterator tests ---===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/DepthFirstIterator.h"
-#include "TestGraph.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace llvm {
-
-template <typename T> struct CountedSet {
-  typedef typename SmallPtrSet<T, 4>::iterator iterator;
-
-  SmallPtrSet<T, 4> S;
-  int InsertVisited = 0;
-
-  std::pair<iterator, bool> insert(const T &Item) {
-    InsertVisited++;
-    return S.insert(Item);
-  }
-
-  size_t count(const T &Item) const { return S.count(Item); }
-  
-  void completed(T) { }
-};
-
-template <typename T> class df_iterator_storage<CountedSet<T>, true> {
-public:
-  df_iterator_storage(CountedSet<T> &VSet) : Visited(VSet) {}
-
-  CountedSet<T> &Visited;
-};
-
-TEST(DepthFirstIteratorTest, ActuallyUpdateIterator) {
-  typedef CountedSet<Graph<3>::NodeType *> StorageT;
-  typedef df_iterator<Graph<3>, StorageT, true> DFIter;
-
-  Graph<3> G;
-  G.AddEdge(0, 1);
-  G.AddEdge(0, 2);
-  StorageT S;
-  for (auto N : make_range(DFIter::begin(G, S), DFIter::end(G, S)))
-    (void)N;
-
-  EXPECT_EQ(3, S.InsertVisited);
-}
-}
diff --git a/gnu/llvm/llvm/unittests/ADT/DirectedGraphTest.cpp b/gnu/llvm/llvm/unittests/ADT/DirectedGraphTest.cpp
deleted file mode 100644
index ae1f6b01ef2..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/DirectedGraphTest.cpp
+++ /dev/null
@@ -1,295 +0,0 @@
-//===- llvm/unittest/ADT/DirectedGraphTest.cpp ------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines concrete derivations of the directed-graph base classes
-// for testing purposes.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/DirectedGraph.h"
-#include "llvm/ADT/GraphTraits.h"
-#include "llvm/ADT/SCCIterator.h"
-#include "llvm/ADT/SmallPtrSet.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-
-//===--------------------------------------------------------------------===//
-// Derived nodes, edges and graph types based on DirectedGraph.
-//===--------------------------------------------------------------------===//
-
-class DGTestNode;
-class DGTestEdge;
-using DGTestNodeBase = DGNode<DGTestNode, DGTestEdge>;
-using DGTestEdgeBase = DGEdge<DGTestNode, DGTestEdge>;
-using DGTestBase = DirectedGraph<DGTestNode, DGTestEdge>;
-
-class DGTestNode : public DGTestNodeBase {
-public:
-  DGTestNode() = default;
-};
-
-class DGTestEdge : public DGTestEdgeBase {
-public:
-  DGTestEdge() = delete;
-  DGTestEdge(DGTestNode &N) : DGTestEdgeBase(N) {}
-};
-
-class DGTestGraph : public DGTestBase {
-public:
-  DGTestGraph() = default;
-  ~DGTestGraph(){};
-};
-
-using EdgeListTy = SmallVector<DGTestEdge *, 2>;
-
-//===--------------------------------------------------------------------===//
-// GraphTraits specializations for the DGTest
-//===--------------------------------------------------------------------===//
-
-template <> struct GraphTraits<DGTestNode *> {
-  using NodeRef = DGTestNode *;
-
-  static DGTestNode *DGTestGetTargetNode(DGEdge<DGTestNode, DGTestEdge> *P) {
-    return &P->getTargetNode();
-  }
-
-  // Provide a mapped iterator so that the GraphTrait-based implementations can
-  // find the target nodes without having to explicitly go through the edges.
-  using ChildIteratorType =
-      mapped_iterator<DGTestNode::iterator, decltype(&DGTestGetTargetNode)>;
-  using ChildEdgeIteratorType = DGTestNode::iterator;
-
-  static NodeRef getEntryNode(NodeRef N) { return N; }
-  static ChildIteratorType child_begin(NodeRef N) {
-    return ChildIteratorType(N->begin(), &DGTestGetTargetNode);
-  }
-  static ChildIteratorType child_end(NodeRef N) {
-    return ChildIteratorType(N->end(), &DGTestGetTargetNode);
-  }
-
-  static ChildEdgeIteratorType child_edge_begin(NodeRef N) {
-    return N->begin();
-  }
-  static ChildEdgeIteratorType child_edge_end(NodeRef N) { return N->end(); }
-};
-
-template <>
-struct GraphTraits<DGTestGraph *> : public GraphTraits<DGTestNode *> {
-  using nodes_iterator = DGTestGraph::iterator;
-  static NodeRef getEntryNode(DGTestGraph *DG) { return *DG->begin(); }
-  static nodes_iterator nodes_begin(DGTestGraph *DG) { return DG->begin(); }
-  static nodes_iterator nodes_end(DGTestGraph *DG) { return DG->end(); }
-};
-
-//===--------------------------------------------------------------------===//
-// Test various modification and query functions.
-//===--------------------------------------------------------------------===//
-
-TEST(DirectedGraphTest, AddAndConnectNodes) {
-  DGTestGraph DG;
-  DGTestNode N1, N2, N3;
-  DGTestEdge E1(N1), E2(N2), E3(N3);
-
-  // Check that new nodes can be added successfully.
-  EXPECT_TRUE(DG.addNode(N1));
-  EXPECT_TRUE(DG.addNode(N2));
-  EXPECT_TRUE(DG.addNode(N3));
-
-  // Check that duplicate nodes are not added to the graph.
-  EXPECT_FALSE(DG.addNode(N1));
-
-  // Check that nodes can be connected using valid edges with no errors.
-  EXPECT_TRUE(DG.connect(N1, N2, E2));
-  EXPECT_TRUE(DG.connect(N2, N3, E3));
-  EXPECT_TRUE(DG.connect(N3, N1, E1));
-
-  // The graph looks like this now:
-  //
-  // +---------------+
-  // v               |
-  // N1 -> N2 -> N3 -+
-
-  // Check that already connected nodes with the given edge are not connected
-  // again (ie. edges are between nodes are not duplicated).
-  EXPECT_FALSE(DG.connect(N3, N1, E1));
-
-  // Check that there are 3 nodes in the graph.
-  EXPECT_TRUE(DG.size() == 3);
-
-  // Check that the added nodes can be found in the graph.
-  EXPECT_NE(DG.findNode(N3), DG.end());
-
-  // Check that nodes that are not part of the graph are not found.
-  DGTestNode N4;
-  EXPECT_EQ(DG.findNode(N4), DG.end());
-
-  // Check that findIncommingEdgesToNode works correctly.
-  EdgeListTy EL;
-  EXPECT_TRUE(DG.findIncomingEdgesToNode(N1, EL));
-  EXPECT_TRUE(EL.size() == 1);
-  EXPECT_EQ(*EL[0], E1);
-}
-
-TEST(DirectedGraphTest, AddRemoveEdge) {
-  DGTestGraph DG;
-  DGTestNode N1, N2, N3;
-  DGTestEdge E1(N1), E2(N2), E3(N3);
-  DG.addNode(N1);
-  DG.addNode(N2);
-  DG.addNode(N3);
-  DG.connect(N1, N2, E2);
-  DG.connect(N2, N3, E3);
-  DG.connect(N3, N1, E1);
-
-  // The graph looks like this now:
-  //
-  // +---------------+
-  // v               |
-  // N1 -> N2 -> N3 -+
-
-  // Check that there are 3 nodes in the graph.
-  EXPECT_TRUE(DG.size() == 3);
-
-  // Check that the target nodes of the edges are correct.
-  EXPECT_EQ(E1.getTargetNode(), N1);
-  EXPECT_EQ(E2.getTargetNode(), N2);
-  EXPECT_EQ(E3.getTargetNode(), N3);
-
-  // Remove the edge from N1 to N2.
-  N1.removeEdge(E2);
-
-  // The graph looks like this now:
-  //
-  // N2 -> N3 -> N1
-
-  // Check that there are no incoming edges to N2.
-  EdgeListTy EL;
-  EXPECT_FALSE(DG.findIncomingEdgesToNode(N2, EL));
-  EXPECT_TRUE(EL.empty());
-
-  // Put the edge from N1 to N2 back in place.
-  N1.addEdge(E2);
-
-  // Check that E2 is the only incoming edge to N2.
-  EL.clear();
-  EXPECT_TRUE(DG.findIncomingEdgesToNode(N2, EL));
-  EXPECT_EQ(*EL[0], E2);
-}
-
-TEST(DirectedGraphTest, hasEdgeTo) {
-  DGTestGraph DG;
-  DGTestNode N1, N2, N3;
-  DGTestEdge E1(N1), E2(N2), E3(N3), E4(N1);
-  DG.addNode(N1);
-  DG.addNode(N2);
-  DG.addNode(N3);
-  DG.connect(N1, N2, E2);
-  DG.connect(N2, N3, E3);
-  DG.connect(N3, N1, E1);
-  DG.connect(N2, N1, E4);
-
-  // The graph looks like this now:
-  //
-  // +-----+
-  // v     |
-  // N1 -> N2 -> N3
-  // ^           |
-  // +-----------+
-
-  EXPECT_TRUE(N2.hasEdgeTo(N1));
-  EXPECT_TRUE(N3.hasEdgeTo(N1));
-}
-
-TEST(DirectedGraphTest, AddRemoveNode) {
-  DGTestGraph DG;
-  DGTestNode N1, N2, N3;
-  DGTestEdge E1(N1), E2(N2), E3(N3);
-  DG.addNode(N1);
-  DG.addNode(N2);
-  DG.addNode(N3);
-  DG.connect(N1, N2, E2);
-  DG.connect(N2, N3, E3);
-  DG.connect(N3, N1, E1);
-
-  // The graph looks like this now:
-  //
-  // +---------------+
-  // v               |
-  // N1 -> N2 -> N3 -+
-
-  // Check that there are 3 nodes in the graph.
-  EXPECT_TRUE(DG.size() == 3);
-
-  // Check that a node in the graph can be removed, but not more than once.
-  EXPECT_TRUE(DG.removeNode(N1));
-  EXPECT_EQ(DG.findNode(N1), DG.end());
-  EXPECT_FALSE(DG.removeNode(N1));
-
-  // The graph looks like this now:
-  //
-  // N2 -> N3
-
-  // Check that there are 2 nodes in the graph and only N2 is connected to N3.
-  EXPECT_TRUE(DG.size() == 2);
-  EXPECT_TRUE(N3.getEdges().empty());
-  EdgeListTy EL;
-  EXPECT_FALSE(DG.findIncomingEdgesToNode(N2, EL));
-  EXPECT_TRUE(EL.empty());
-}
-
-TEST(DirectedGraphTest, SCC) {
-
-  DGTestGraph DG;
-  DGTestNode N1, N2, N3, N4;
-  DGTestEdge E1(N1), E2(N2), E3(N3), E4(N4);
-  DG.addNode(N1);
-  DG.addNode(N2);
-  DG.addNode(N3);
-  DG.addNode(N4);
-  DG.connect(N1, N2, E2);
-  DG.connect(N2, N3, E3);
-  DG.connect(N3, N1, E1);
-  DG.connect(N3, N4, E4);
-
-  // The graph looks like this now:
-  //
-  // +---------------+
-  // v               |
-  // N1 -> N2 -> N3 -+    N4
-  //             |        ^
-  //             +--------+
-
-  // Test that there are two SCCs:
-  // 1. {N1, N2, N3}
-  // 2. {N4}
-  using NodeListTy = SmallPtrSet<DGTestNode *, 3>;
-  SmallVector<NodeListTy, 4> ListOfSCCs;
-  for (auto &SCC : make_range(scc_begin(&DG), scc_end(&DG)))
-    ListOfSCCs.push_back(NodeListTy(SCC.begin(), SCC.end()));
-
-  EXPECT_TRUE(ListOfSCCs.size() == 2);
-
-  for (auto &SCC : ListOfSCCs) {
-    if (SCC.size() > 1)
-      continue;
-    EXPECT_TRUE(SCC.size() == 1);
-    EXPECT_TRUE(SCC.count(&N4) == 1);
-  }
-  for (auto &SCC : ListOfSCCs) {
-    if (SCC.size() <= 1)
-      continue;
-    EXPECT_TRUE(SCC.size() == 3);
-    EXPECT_TRUE(SCC.count(&N1) == 1);
-    EXPECT_TRUE(SCC.count(&N2) == 1);
-    EXPECT_TRUE(SCC.count(&N3) == 1);
-    EXPECT_TRUE(SCC.count(&N4) == 0);
-  }
-}
-
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/ADT/EnumeratedArrayTest.cpp b/gnu/llvm/llvm/unittests/ADT/EnumeratedArrayTest.cpp
deleted file mode 100644
index 29107a7b9a7..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/EnumeratedArrayTest.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-//===- llvm/unittest/ADT/EnumeratedArrayTest.cpp ----------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// EnumeratedArray unit tests.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/EnumeratedArray.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-
-//===--------------------------------------------------------------------===//
-// Test initialization and use of operator[] for both read and write.
-//===--------------------------------------------------------------------===//
-
-TEST(EnumeratedArray, InitAndIndex) {
-
-  enum class Colors { Red, Blue, Green, Last = Green };
-
-  EnumeratedArray<float, Colors, Colors::Last, size_t> Array1;
-
-  Array1[Colors::Red] = 1.0;
-  Array1[Colors::Blue] = 2.0;
-  Array1[Colors::Green] = 3.0;
-
-  EXPECT_EQ(Array1[Colors::Red], 1.0);
-  EXPECT_EQ(Array1[Colors::Blue], 2.0);
-  EXPECT_EQ(Array1[Colors::Green], 3.0);
-
-  EnumeratedArray<bool, Colors> Array2(true);
-
-  EXPECT_TRUE(Array2[Colors::Red]);
-  EXPECT_TRUE(Array2[Colors::Blue]);
-  EXPECT_TRUE(Array2[Colors::Green]);
-
-  Array2[Colors::Red] = true;
-  Array2[Colors::Blue] = false;
-  Array2[Colors::Green] = true;
-
-  EXPECT_TRUE(Array2[Colors::Red]);
-  EXPECT_FALSE(Array2[Colors::Blue]);
-  EXPECT_TRUE(Array2[Colors::Green]);
-}
-
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/ADT/EquivalenceClassesTest.cpp b/gnu/llvm/llvm/unittests/ADT/EquivalenceClassesTest.cpp
deleted file mode 100644
index 30eab6eab08..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/EquivalenceClassesTest.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-//=== llvm/unittest/ADT/EquivalenceClassesTest.cpp - the structure tests --===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/EquivalenceClasses.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace llvm {
-
-TEST(EquivalenceClassesTest, NoMerges) {
-  EquivalenceClasses<int> EqClasses;
-  // Until we merged any sets, check that every element is only equivalent to
-  // itself.
-  for (int i = 0; i < 3; i++)
-    for (int j = 0; j < 3; j++)
-      if (i == j)
-        EXPECT_TRUE(EqClasses.isEquivalent(i, j));
-      else
-        EXPECT_FALSE(EqClasses.isEquivalent(i, j));
-}
-
-TEST(EquivalenceClassesTest, SimpleMerge1) {
-  EquivalenceClasses<int> EqClasses;
-  // Check that once we merge (A, B), (B, C), (C, D), then all elements belong
-  // to one set.
-  EqClasses.unionSets(0, 1);
-  EqClasses.unionSets(1, 2);
-  EqClasses.unionSets(2, 3);
-  for (int i = 0; i < 4; ++i)
-    for (int j = 0; j < 4; ++j)
-      EXPECT_TRUE(EqClasses.isEquivalent(i, j));
-}
-
-TEST(EquivalenceClassesTest, SimpleMerge2) {
-  EquivalenceClasses<int> EqClasses;
-  // Check that once we merge (A, B), (C, D), (A, C), then all elements belong
-  // to one set.
-  EqClasses.unionSets(0, 1);
-  EqClasses.unionSets(2, 3);
-  EqClasses.unionSets(0, 2);
-  for (int i = 0; i < 4; ++i)
-    for (int j = 0; j < 4; ++j)
-      EXPECT_TRUE(EqClasses.isEquivalent(i, j));
-}
-
-TEST(EquivalenceClassesTest, TwoSets) {
-  EquivalenceClasses<int> EqClasses;
-  // Form sets of odd and even numbers, check that we split them into these
-  // two sets correcrly.
-  for (int i = 0; i < 30; i += 2)
-    EqClasses.unionSets(0, i);
-  for (int i = 1; i < 30; i += 2)
-    EqClasses.unionSets(1, i);
-
-  for (int i = 0; i < 30; i++)
-    for (int j = 0; j < 30; j++)
-      if (i % 2 == j % 2)
-        EXPECT_TRUE(EqClasses.isEquivalent(i, j));
-      else
-        EXPECT_FALSE(EqClasses.isEquivalent(i, j));
-}
-
-TEST(EquivalenceClassesTest, MultipleSets) {
-  EquivalenceClasses<int> EqClasses;
-  // Split numbers from [0, 100) into sets so that values in the same set have
-  // equal remainders (mod 17).
-  for (int i = 0; i < 100; i++)
-    EqClasses.unionSets(i % 17, i);
-
-  for (int i = 0; i < 100; i++)
-    for (int j = 0; j < 100; j++)
-      if (i % 17 == j % 17)
-        EXPECT_TRUE(EqClasses.isEquivalent(i, j));
-      else
-        EXPECT_FALSE(EqClasses.isEquivalent(i, j));
-}
-
-} // llvm
diff --git a/gnu/llvm/llvm/unittests/ADT/FallibleIteratorTest.cpp b/gnu/llvm/llvm/unittests/ADT/FallibleIteratorTest.cpp
deleted file mode 100644
index d3389744ffb..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/FallibleIteratorTest.cpp
+++ /dev/null
@@ -1,291 +0,0 @@
-//===- unittests/ADT/FallibleIteratorTest.cpp - fallible_iterator.h tests -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/fallible_iterator.h"
-#include "llvm/Testing/Support/Error.h"
-
-#include "gtest/gtest-spi.h"
-#include "gtest/gtest.h"
-
-#include <utility>
-#include <vector>
-
-using namespace llvm;
-
-namespace {
-
-using ItemValid = enum { ValidItem, InvalidItem };
-using LinkValid = enum { ValidLink, InvalidLink };
-
-class Item {
-public:
-  Item(ItemValid V) : V(V) {}
-  bool isValid() const { return V == ValidItem; }
-
-private:
-  ItemValid V;
-};
-
-// A utility to mock "bad collections". It supports both invalid items,
-// where the dereference operator may return an Error, and bad links
-// where the inc/dec operations may return an Error.
-// Each element of the mock collection contains a pair of a (possibly broken)
-// item and link.
-using FallibleCollection = std::vector<std::pair<Item, LinkValid>>;
-
-class FallibleCollectionWalker {
-public:
-  FallibleCollectionWalker(FallibleCollection &C, unsigned Idx)
-      : C(C), Idx(Idx) {}
-
-  Item &operator*() { return C[Idx].first; }
-
-  const Item &operator*() const { return C[Idx].first; }
-
-  Error inc() {
-    assert(Idx != C.size() && "Walking off end of (mock) collection");
-    if (C[Idx].second == ValidLink) {
-      ++Idx;
-      return Error::success();
-    }
-    return make_error<StringError>("cant get next object in (mock) collection",
-                                   inconvertibleErrorCode());
-  }
-
-  Error dec() {
-    assert(Idx != 0 && "Walking off start of (mock) collection");
-    --Idx;
-    if (C[Idx].second == ValidLink)
-      return Error::success();
-    return make_error<StringError>("cant get prev object in (mock) collection",
-                                   inconvertibleErrorCode());
-  }
-
-  friend bool operator==(const FallibleCollectionWalker &LHS,
-                         const FallibleCollectionWalker &RHS) {
-    assert(&LHS.C == &RHS.C && "Comparing iterators across collectionss.");
-    return LHS.Idx == RHS.Idx;
-  }
-
-private:
-  FallibleCollection &C;
-  unsigned Idx;
-};
-
-class FallibleCollectionWalkerWithStructDeref
-    : public FallibleCollectionWalker {
-public:
-  using FallibleCollectionWalker::FallibleCollectionWalker;
-
-  Item *operator->() { return &this->operator*(); }
-
-  const Item *operator->() const { return &this->operator*(); }
-};
-
-class FallibleCollectionWalkerWithFallibleDeref
-    : public FallibleCollectionWalker {
-public:
-  using FallibleCollectionWalker::FallibleCollectionWalker;
-
-  Expected<Item &> operator*() {
-    auto &I = FallibleCollectionWalker::operator*();
-    if (!I.isValid())
-      return make_error<StringError>("bad item", inconvertibleErrorCode());
-    return I;
-  }
-
-  Expected<const Item &> operator*() const {
-    const auto &I = FallibleCollectionWalker::operator*();
-    if (!I.isValid())
-      return make_error<StringError>("bad item", inconvertibleErrorCode());
-    return I;
-  }
-};
-
-TEST(FallibleIteratorTest, BasicSuccess) {
-
-  // Check that a basic use-case involing successful iteration over a
-  // "FallibleCollection" works.
-
-  FallibleCollection C({{ValidItem, ValidLink}, {ValidItem, ValidLink}});
-
-  FallibleCollectionWalker begin(C, 0);
-  FallibleCollectionWalker end(C, 2);
-
-  Error Err = Error::success();
-  for (auto &Elem :
-       make_fallible_range<FallibleCollectionWalker>(begin, end, Err))
-    EXPECT_TRUE(Elem.isValid());
-  cantFail(std::move(Err));
-}
-
-TEST(FallibleIteratorTest, BasicFailure) {
-
-  // Check that a iteration failure (due to the InvalidLink state on element one
-  // of the fallible collection) breaks out of the loop and raises an Error.
-
-  FallibleCollection C({{ValidItem, ValidLink}, {ValidItem, InvalidLink}});
-
-  FallibleCollectionWalker begin(C, 0);
-  FallibleCollectionWalker end(C, 2);
-
-  Error Err = Error::success();
-  for (auto &Elem :
-       make_fallible_range<FallibleCollectionWalker>(begin, end, Err))
-    EXPECT_TRUE(Elem.isValid());
-
-  EXPECT_THAT_ERROR(std::move(Err), Failed()) << "Expected failure value";
-}
-
-TEST(FallibleIteratorTest, NoRedundantErrorCheckOnEarlyExit) {
-
-  // Check that an early return from the loop body does not require a redundant
-  // check of Err.
-
-  FallibleCollection C({{ValidItem, ValidLink}, {ValidItem, ValidLink}});
-
-  FallibleCollectionWalker begin(C, 0);
-  FallibleCollectionWalker end(C, 2);
-
-  Error Err = Error::success();
-  for (auto &Elem :
-       make_fallible_range<FallibleCollectionWalker>(begin, end, Err)) {
-    (void)Elem;
-    return;
-  }
-  // Err not checked, but should be ok because we exit from the loop
-  // body.
-}
-
-#if LLVM_ENABLE_ABI_BREAKING_CHECKS
-TEST(FallibleIteratorTest, RegularLoopExitRequiresErrorCheck) {
-
-  // Check that Err must be checked after a normal (i.e. not early) loop exit
-  // by failing to check and expecting program death (due to the unchecked
-  // error).
-
-  EXPECT_DEATH(
-      {
-        FallibleCollection C({{ValidItem, ValidLink}, {ValidItem, ValidLink}});
-
-        FallibleCollectionWalker begin(C, 0);
-        FallibleCollectionWalker end(C, 2);
-
-        Error Err = Error::success();
-        for (auto &Elem :
-             make_fallible_range<FallibleCollectionWalker>(begin, end, Err))
-          (void)Elem;
-      },
-      "Program aborted due to an unhandled Error:")
-      << "Normal (i.e. not early) loop exit should require an error check";
-}
-#endif
-
-TEST(FallibleIteratorTest, RawIncrementAndDecrementBehavior) {
-
-  // Check the exact behavior of increment / decrement.
-
-  FallibleCollection C({{ValidItem, ValidLink},
-                        {ValidItem, InvalidLink},
-                        {ValidItem, ValidLink},
-                        {ValidItem, InvalidLink}});
-
-  {
-    // One increment from begin succeeds.
-    Error Err = Error::success();
-    auto I = make_fallible_itr(FallibleCollectionWalker(C, 0), Err);
-    ++I;
-    EXPECT_THAT_ERROR(std::move(Err), Succeeded());
-  }
-
-  {
-    // Two increments from begin fail.
-    Error Err = Error::success();
-    auto I = make_fallible_itr(FallibleCollectionWalker(C, 0), Err);
-    ++I;
-    EXPECT_THAT_ERROR(std::move(Err), Succeeded());
-    ++I;
-    EXPECT_THAT_ERROR(std::move(Err), Failed()) << "Expected failure value";
-  }
-
-  {
-    // One decement from element three succeeds.
-    Error Err = Error::success();
-    auto I = make_fallible_itr(FallibleCollectionWalker(C, 3), Err);
-    --I;
-    EXPECT_THAT_ERROR(std::move(Err), Succeeded());
-  }
-
-  {
-    // One decement from element three succeeds.
-    Error Err = Error::success();
-    auto I = make_fallible_itr(FallibleCollectionWalker(C, 3), Err);
-    --I;
-    EXPECT_THAT_ERROR(std::move(Err), Succeeded());
-    --I;
-    EXPECT_THAT_ERROR(std::move(Err), Failed());
-  }
-}
-
-TEST(FallibleIteratorTest, CheckStructDerefOperatorSupport) {
-  // Check that the fallible_iterator wrapper forwards through to the
-  // underlying iterator's structure dereference operator if present.
-
-  FallibleCollection C({{ValidItem, ValidLink},
-                        {ValidItem, ValidLink},
-                        {InvalidItem, InvalidLink}});
-
-  FallibleCollectionWalkerWithStructDeref begin(C, 0);
-
-  {
-    Error Err = Error::success();
-    auto I = make_fallible_itr(begin, Err);
-    EXPECT_TRUE(I->isValid());
-    cantFail(std::move(Err));
-  }
-
-  {
-    Error Err = Error::success();
-    const auto I = make_fallible_itr(begin, Err);
-    EXPECT_TRUE(I->isValid());
-    cantFail(std::move(Err));
-  }
-}
-
-TEST(FallibleIteratorTest, CheckDerefToExpectedSupport) {
-
-  // Check that the fallible_iterator wrapper forwards value types, in
-  // particular llvm::Expected, correctly.
-
-  FallibleCollection C({{ValidItem, ValidLink},
-                        {InvalidItem, ValidLink},
-                        {ValidItem, ValidLink}});
-
-  FallibleCollectionWalkerWithFallibleDeref begin(C, 0);
-  FallibleCollectionWalkerWithFallibleDeref end(C, 3);
-
-  Error Err = Error::success();
-  auto I = make_fallible_itr(begin, Err);
-  auto E = make_fallible_end(end);
-
-  Expected<Item> V1 = *I;
-  EXPECT_THAT_ERROR(V1.takeError(), Succeeded());
-  ++I;
-  EXPECT_NE(I, E); // Implicitly check error.
-  Expected<Item> V2 = *I;
-  EXPECT_THAT_ERROR(V2.takeError(), Failed());
-  ++I;
-  EXPECT_NE(I, E); // Implicitly check error.
-  Expected<Item> V3 = *I;
-  EXPECT_THAT_ERROR(V3.takeError(), Succeeded());
-  ++I;
-  EXPECT_EQ(I, E);
-  cantFail(std::move(Err));
-}
-
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/FloatingPointMode.cpp b/gnu/llvm/llvm/unittests/ADT/FloatingPointMode.cpp
deleted file mode 100644
index 5b819f3495a..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/FloatingPointMode.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-//===- llvm/unittest/ADT/FloatingPointMode.cpp ----------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/FloatingPointMode.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST(FloatingPointModeTest, ParseDenormalFPAttributeComponent) {
-  EXPECT_EQ(DenormalMode::IEEE, parseDenormalFPAttributeComponent("ieee"));
-  EXPECT_EQ(DenormalMode::IEEE, parseDenormalFPAttributeComponent(""));
-  EXPECT_EQ(DenormalMode::PreserveSign,
-            parseDenormalFPAttributeComponent("preserve-sign"));
-  EXPECT_EQ(DenormalMode::PositiveZero,
-            parseDenormalFPAttributeComponent("positive-zero"));
-  EXPECT_EQ(DenormalMode::Invalid, parseDenormalFPAttributeComponent("foo"));
-}
-
-TEST(FloatingPointModeTest, DenormalAttributeName) {
-  EXPECT_EQ("ieee", denormalModeKindName(DenormalMode::IEEE));
-  EXPECT_EQ("preserve-sign", denormalModeKindName(DenormalMode::PreserveSign));
-  EXPECT_EQ("positive-zero", denormalModeKindName(DenormalMode::PositiveZero));
-  EXPECT_EQ("", denormalModeKindName(DenormalMode::Invalid));
-}
-
-TEST(FloatingPointModeTest, ParseDenormalFPAttribute) {
-  EXPECT_EQ(DenormalMode(DenormalMode::IEEE, DenormalMode::IEEE),
-            parseDenormalFPAttribute("ieee"));
-  EXPECT_EQ(DenormalMode(DenormalMode::IEEE, DenormalMode::IEEE),
-            parseDenormalFPAttribute("ieee,ieee"));
-  EXPECT_EQ(DenormalMode(DenormalMode::IEEE, DenormalMode::IEEE),
-            parseDenormalFPAttribute("ieee,"));
-  EXPECT_EQ(DenormalMode(DenormalMode::IEEE, DenormalMode::IEEE),
-            parseDenormalFPAttribute(""));
-  EXPECT_EQ(DenormalMode(DenormalMode::IEEE, DenormalMode::IEEE),
-            parseDenormalFPAttribute(","));
-
-  EXPECT_EQ(DenormalMode(DenormalMode::PreserveSign, DenormalMode::PreserveSign),
-            parseDenormalFPAttribute("preserve-sign"));
-  EXPECT_EQ(DenormalMode(DenormalMode::PreserveSign, DenormalMode::PreserveSign),
-            parseDenormalFPAttribute("preserve-sign,"));
-  EXPECT_EQ(DenormalMode(DenormalMode::PreserveSign, DenormalMode::PreserveSign),
-            parseDenormalFPAttribute("preserve-sign,preserve-sign"));
-
-  EXPECT_EQ(DenormalMode(DenormalMode::PositiveZero, DenormalMode::PositiveZero),
-            parseDenormalFPAttribute("positive-zero"));
-  EXPECT_EQ(DenormalMode(DenormalMode::PositiveZero, DenormalMode::PositiveZero),
-            parseDenormalFPAttribute("positive-zero,positive-zero"));
-
-
-  EXPECT_EQ(DenormalMode(DenormalMode::IEEE, DenormalMode::PositiveZero),
-            parseDenormalFPAttribute("ieee,positive-zero"));
-  EXPECT_EQ(DenormalMode(DenormalMode::PositiveZero, DenormalMode::IEEE),
-            parseDenormalFPAttribute("positive-zero,ieee"));
-
-  EXPECT_EQ(DenormalMode(DenormalMode::PreserveSign, DenormalMode::IEEE),
-            parseDenormalFPAttribute("preserve-sign,ieee"));
-  EXPECT_EQ(DenormalMode(DenormalMode::IEEE, DenormalMode::PreserveSign),
-            parseDenormalFPAttribute("ieee,preserve-sign"));
-
-
-  EXPECT_EQ(DenormalMode(DenormalMode::Invalid, DenormalMode::Invalid),
-            parseDenormalFPAttribute("foo"));
-  EXPECT_EQ(DenormalMode(DenormalMode::Invalid, DenormalMode::Invalid),
-            parseDenormalFPAttribute("foo,foo"));
-  EXPECT_EQ(DenormalMode(DenormalMode::Invalid, DenormalMode::Invalid),
-            parseDenormalFPAttribute("foo,bar"));
-}
-
-TEST(FloatingPointModeTest, RenderDenormalFPAttribute) {
-  EXPECT_EQ(DenormalMode(DenormalMode::Invalid, DenormalMode::Invalid),
-            parseDenormalFPAttribute("foo"));
-
-  EXPECT_EQ("ieee,ieee",
-            DenormalMode(DenormalMode::IEEE, DenormalMode::IEEE).str());
-  EXPECT_EQ(",",
-            DenormalMode(DenormalMode::Invalid, DenormalMode::Invalid).str());
-
-  EXPECT_EQ(
-    "preserve-sign,preserve-sign",
-    DenormalMode(DenormalMode::PreserveSign, DenormalMode::PreserveSign).str());
-
-  EXPECT_EQ(
-    "positive-zero,positive-zero",
-    DenormalMode(DenormalMode::PositiveZero, DenormalMode::PositiveZero).str());
-
-  EXPECT_EQ(
-    "ieee,preserve-sign",
-    DenormalMode(DenormalMode::IEEE, DenormalMode::PreserveSign).str());
-
-  EXPECT_EQ(
-    "preserve-sign,ieee",
-    DenormalMode(DenormalMode::PreserveSign, DenormalMode::IEEE).str());
-
-  EXPECT_EQ(
-    "preserve-sign,positive-zero",
-    DenormalMode(DenormalMode::PreserveSign, DenormalMode::PositiveZero).str());
-}
-
-TEST(FloatingPointModeTest, DenormalModeIsSimple) {
-  EXPECT_TRUE(DenormalMode(DenormalMode::IEEE, DenormalMode::IEEE).isSimple());
-  EXPECT_FALSE(DenormalMode(DenormalMode::IEEE,
-                            DenormalMode::Invalid).isSimple());
-  EXPECT_FALSE(DenormalMode(DenormalMode::PreserveSign,
-                            DenormalMode::PositiveZero).isSimple());
-}
-
-TEST(FloatingPointModeTest, DenormalModeIsValid) {
-  EXPECT_TRUE(DenormalMode(DenormalMode::IEEE, DenormalMode::IEEE).isValid());
-  EXPECT_FALSE(DenormalMode(DenormalMode::IEEE, DenormalMode::Invalid).isValid());
-  EXPECT_FALSE(DenormalMode(DenormalMode::Invalid, DenormalMode::IEEE).isValid());
-  EXPECT_FALSE(DenormalMode(DenormalMode::Invalid,
-                            DenormalMode::Invalid).isValid());
-}
-
-TEST(FloatingPointModeTest, DenormalModeConstructor) {
-  EXPECT_EQ(DenormalMode(DenormalMode::Invalid, DenormalMode::Invalid),
-            DenormalMode::getInvalid());
-  EXPECT_EQ(DenormalMode(DenormalMode::IEEE, DenormalMode::IEEE),
-            DenormalMode::getIEEE());
-  EXPECT_EQ(DenormalMode(DenormalMode::PreserveSign, DenormalMode::PreserveSign),
-            DenormalMode::getPreserveSign());
-  EXPECT_EQ(DenormalMode(DenormalMode::PositiveZero, DenormalMode::PositiveZero),
-            DenormalMode::getPositiveZero());
-}
-
-}
diff --git a/gnu/llvm/llvm/unittests/ADT/FoldingSet.cpp b/gnu/llvm/llvm/unittests/ADT/FoldingSet.cpp
deleted file mode 100644
index c03353f4e4b..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/FoldingSet.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-//===- llvm/unittest/ADT/FoldingSetTest.cpp -------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// FoldingSet unit tests.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/FoldingSet.h"
-#include "gtest/gtest.h"
-#include <string>
-
-using namespace llvm;
-
-namespace {
-
-// Unaligned string test.
-TEST(FoldingSetTest, UnalignedStringTest) {
-  SCOPED_TRACE("UnalignedStringTest");
-
-  FoldingSetNodeID a, b;
-  // An aligned string.
-  std::string str1= "a test string";
-  a.AddString(str1);
-
-  // An unaligned string.
-  std::string str2 = ">" + str1;
-  b.AddString(str2.c_str() + 1);
-
-  EXPECT_EQ(a.ComputeHash(), b.ComputeHash());
-}
-
-TEST(FoldingSetTest, LongLongComparison) {
-  struct LongLongContainer : FoldingSetNode {
-    unsigned long long A, B;
-    LongLongContainer(unsigned long long A, unsigned long long B)
-        : A(A), B(B) {}
-    void Profile(FoldingSetNodeID &ID) const {
-      ID.AddInteger(A);
-      ID.AddInteger(B);
-    }
-  };
-
-  LongLongContainer C1((1ULL << 32) + 1, 1ULL);
-  LongLongContainer C2(1ULL, (1ULL << 32) + 1);
-
-  FoldingSet<LongLongContainer> Set;
-
-  EXPECT_EQ(&C1, Set.GetOrInsertNode(&C1));
-  EXPECT_EQ(&C2, Set.GetOrInsertNode(&C2));
-  EXPECT_EQ(2U, Set.size());
-}
-
-struct TrivialPair : public FoldingSetNode {
-  unsigned Key = 0;
-  unsigned Value = 0;
-  TrivialPair(unsigned K, unsigned V) : FoldingSetNode(), Key(K), Value(V) {}
-
-  void Profile(FoldingSetNodeID &ID) const {
-    ID.AddInteger(Key);
-    ID.AddInteger(Value);
-  }
-};
-
-TEST(FoldingSetTest, IDComparison) {
-  FoldingSet<TrivialPair> Trivial;
-
-  TrivialPair T(99, 42);
-  Trivial.InsertNode(&T);
-
-  void *InsertPos = nullptr;
-  FoldingSetNodeID ID;
-  T.Profile(ID);
-  TrivialPair *N = Trivial.FindNodeOrInsertPos(ID, InsertPos);
-  EXPECT_EQ(&T, N);
-  EXPECT_EQ(nullptr, InsertPos);
-}
-
-TEST(FoldingSetTest, MissedIDComparison) {
-  FoldingSet<TrivialPair> Trivial;
-
-  TrivialPair S(100, 42);
-  TrivialPair T(99, 42);
-  Trivial.InsertNode(&T);
-
-  void *InsertPos = nullptr;
-  FoldingSetNodeID ID;
-  S.Profile(ID);
-  TrivialPair *N = Trivial.FindNodeOrInsertPos(ID, InsertPos);
-  EXPECT_EQ(nullptr, N);
-  EXPECT_NE(nullptr, InsertPos);
-}
-
-TEST(FoldingSetTest, RemoveNodeThatIsPresent) {
-  FoldingSet<TrivialPair> Trivial;
-
-  TrivialPair T(99, 42);
-  Trivial.InsertNode(&T);
-  EXPECT_EQ(Trivial.size(), 1U);
-
-  bool WasThere = Trivial.RemoveNode(&T);
-  EXPECT_TRUE(WasThere);
-  EXPECT_EQ(0U, Trivial.size());
-}
-
-TEST(FoldingSetTest, RemoveNodeThatIsAbsent) {
-  FoldingSet<TrivialPair> Trivial;
-
-  TrivialPair T(99, 42);
-  bool WasThere = Trivial.RemoveNode(&T);
-  EXPECT_FALSE(WasThere);
-  EXPECT_EQ(0U, Trivial.size());
-}
-
-TEST(FoldingSetTest, GetOrInsertInserting) {
-  FoldingSet<TrivialPair> Trivial;
-
-  TrivialPair T(99, 42);
-  TrivialPair *N = Trivial.GetOrInsertNode(&T);
-  EXPECT_EQ(&T, N);
-}
-
-TEST(FoldingSetTest, GetOrInsertGetting) {
-  FoldingSet<TrivialPair> Trivial;
-
-  TrivialPair T(99, 42);
-  TrivialPair T2(99, 42);
-  Trivial.InsertNode(&T);
-  TrivialPair *N = Trivial.GetOrInsertNode(&T2);
-  EXPECT_EQ(&T, N);
-}
-
-TEST(FoldingSetTest, InsertAtPos) {
-  FoldingSet<TrivialPair> Trivial;
-
-  void *InsertPos = nullptr;
-  TrivialPair Finder(99, 42);
-  FoldingSetNodeID ID;
-  Finder.Profile(ID);
-  Trivial.FindNodeOrInsertPos(ID, InsertPos);
-
-  TrivialPair T(99, 42);
-  Trivial.InsertNode(&T, InsertPos);
-  EXPECT_EQ(1U, Trivial.size());
-}
-
-TEST(FoldingSetTest, EmptyIsTrue) {
-  FoldingSet<TrivialPair> Trivial;
-  EXPECT_TRUE(Trivial.empty());
-}
-
-TEST(FoldingSetTest, EmptyIsFalse) {
-  FoldingSet<TrivialPair> Trivial;
-  TrivialPair T(99, 42);
-  Trivial.InsertNode(&T);
-  EXPECT_FALSE(Trivial.empty());
-}
-
-TEST(FoldingSetTest, ClearOnEmpty) {
-  FoldingSet<TrivialPair> Trivial;
-  Trivial.clear();
-  EXPECT_TRUE(Trivial.empty());
-}
-
-TEST(FoldingSetTest, ClearOnNonEmpty) {
-  FoldingSet<TrivialPair> Trivial;
-  TrivialPair T(99, 42);
-  Trivial.InsertNode(&T);
-  Trivial.clear();
-  EXPECT_TRUE(Trivial.empty());
-}
-
-TEST(FoldingSetTest, CapacityLargerThanReserve) {
-  FoldingSet<TrivialPair> Trivial;
-  auto OldCapacity = Trivial.capacity();
-  Trivial.reserve(OldCapacity + 1);
-  EXPECT_GE(Trivial.capacity(), OldCapacity + 1);
-}
-
-TEST(FoldingSetTest, SmallReserveChangesNothing) {
-  FoldingSet<TrivialPair> Trivial;
-  auto OldCapacity = Trivial.capacity();
-  Trivial.reserve(OldCapacity - 1);
-  EXPECT_EQ(Trivial.capacity(), OldCapacity);
-}
-
-}
-
diff --git a/gnu/llvm/llvm/unittests/ADT/FunctionExtrasTest.cpp b/gnu/llvm/llvm/unittests/ADT/FunctionExtrasTest.cpp
deleted file mode 100644
index 3c6f179c190..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/FunctionExtrasTest.cpp
+++ /dev/null
@@ -1,294 +0,0 @@
-//===- FunctionExtrasTest.cpp - Unit tests for function type erasure ------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/FunctionExtras.h"
-#include "gtest/gtest.h"
-
-#include <memory>
-#include <type_traits>
-
-using namespace llvm;
-
-namespace {
-
-TEST(UniqueFunctionTest, Basic) {
-  unique_function<int(int, int)> Sum = [](int A, int B) { return A + B; };
-  EXPECT_EQ(Sum(1, 2), 3);
-
-  unique_function<int(int, int)> Sum2 = std::move(Sum);
-  EXPECT_EQ(Sum2(1, 2), 3);
-
-  unique_function<int(int, int)> Sum3 = [](int A, int B) { return A + B; };
-  Sum2 = std::move(Sum3);
-  EXPECT_EQ(Sum2(1, 2), 3);
-
-  Sum2 = unique_function<int(int, int)>([](int A, int B) { return A + B; });
-  EXPECT_EQ(Sum2(1, 2), 3);
-
-  // Explicit self-move test.
-  *&Sum2 = std::move(Sum2);
-  EXPECT_EQ(Sum2(1, 2), 3);
-
-  Sum2 = unique_function<int(int, int)>();
-  EXPECT_FALSE(Sum2);
-
-  // Make sure we can forward through l-value reference parameters.
-  unique_function<void(int &)> Inc = [](int &X) { ++X; };
-  int X = 42;
-  Inc(X);
-  EXPECT_EQ(X, 43);
-
-  // Make sure we can forward through r-value reference parameters with
-  // move-only types.
-  unique_function<int(std::unique_ptr<int> &&)> ReadAndDeallocByRef =
-      [](std::unique_ptr<int> &&Ptr) {
-        int V = *Ptr;
-        Ptr.reset();
-        return V;
-      };
-  std::unique_ptr<int> Ptr{new int(13)};
-  EXPECT_EQ(ReadAndDeallocByRef(std::move(Ptr)), 13);
-  EXPECT_FALSE((bool)Ptr);
-
-  // Make sure we can pass a move-only temporary as opposed to a local variable.
-  EXPECT_EQ(ReadAndDeallocByRef(std::unique_ptr<int>(new int(42))), 42);
-
-  // Make sure we can pass a move-only type by-value.
-  unique_function<int(std::unique_ptr<int>)> ReadAndDeallocByVal =
-      [](std::unique_ptr<int> Ptr) {
-        int V = *Ptr;
-        Ptr.reset();
-        return V;
-      };
-  Ptr.reset(new int(13));
-  EXPECT_EQ(ReadAndDeallocByVal(std::move(Ptr)), 13);
-  EXPECT_FALSE((bool)Ptr);
-
-  EXPECT_EQ(ReadAndDeallocByVal(std::unique_ptr<int>(new int(42))), 42);
-}
-
-TEST(UniqueFunctionTest, Captures) {
-  long A = 1, B = 2, C = 3, D = 4, E = 5;
-
-  unique_function<long()> Tmp;
-
-  unique_function<long()> C1 = [A]() { return A; };
-  EXPECT_EQ(C1(), 1);
-  Tmp = std::move(C1);
-  EXPECT_EQ(Tmp(), 1);
-
-  unique_function<long()> C2 = [A, B]() { return A + B; };
-  EXPECT_EQ(C2(), 3);
-  Tmp = std::move(C2);
-  EXPECT_EQ(Tmp(), 3);
-
-  unique_function<long()> C3 = [A, B, C]() { return A + B + C; };
-  EXPECT_EQ(C3(), 6);
-  Tmp = std::move(C3);
-  EXPECT_EQ(Tmp(), 6);
-
-  unique_function<long()> C4 = [A, B, C, D]() { return A + B + C + D; };
-  EXPECT_EQ(C4(), 10);
-  Tmp = std::move(C4);
-  EXPECT_EQ(Tmp(), 10);
-
-  unique_function<long()> C5 = [A, B, C, D, E]() { return A + B + C + D + E; };
-  EXPECT_EQ(C5(), 15);
-  Tmp = std::move(C5);
-  EXPECT_EQ(Tmp(), 15);
-}
-
-TEST(UniqueFunctionTest, MoveOnly) {
-  struct SmallCallable {
-    std::unique_ptr<int> A{new int(1)};
-
-    int operator()(int B) { return *A + B; }
-  };
-  unique_function<int(int)> Small = SmallCallable();
-  EXPECT_EQ(Small(2), 3);
-  unique_function<int(int)> Small2 = std::move(Small);
-  EXPECT_EQ(Small2(2), 3);
-
-  struct LargeCallable {
-    std::unique_ptr<int> A{new int(1)};
-    std::unique_ptr<int> B{new int(2)};
-    std::unique_ptr<int> C{new int(3)};
-    std::unique_ptr<int> D{new int(4)};
-    std::unique_ptr<int> E{new int(5)};
-
-    int operator()() { return *A + *B + *C + *D + *E; }
-  };
-  unique_function<int()> Large = LargeCallable();
-  EXPECT_EQ(Large(), 15);
-  unique_function<int()> Large2 = std::move(Large);
-  EXPECT_EQ(Large2(), 15);
-}
-
-TEST(UniqueFunctionTest, CountForwardingCopies) {
-  struct CopyCounter {
-    int &CopyCount;
-
-    CopyCounter(int &CopyCount) : CopyCount(CopyCount) {}
-    CopyCounter(const CopyCounter &Arg) : CopyCount(Arg.CopyCount) {
-      ++CopyCount;
-    }
-  };
-
-  unique_function<void(CopyCounter)> ByValF = [](CopyCounter) {};
-  int CopyCount = 0;
-  ByValF(CopyCounter(CopyCount));
-  EXPECT_EQ(1, CopyCount);
-
-  CopyCount = 0;
-  {
-    CopyCounter Counter{CopyCount};
-    ByValF(Counter);
-  }
-  EXPECT_EQ(2, CopyCount);
-
-  // Check that we don't generate a copy at all when we can bind a reference all
-  // the way down, even if that reference could *in theory* allow copies.
-  unique_function<void(const CopyCounter &)> ByRefF = [](const CopyCounter &) {
-  };
-  CopyCount = 0;
-  ByRefF(CopyCounter(CopyCount));
-  EXPECT_EQ(0, CopyCount);
-
-  CopyCount = 0;
-  {
-    CopyCounter Counter{CopyCount};
-    ByRefF(Counter);
-  }
-  EXPECT_EQ(0, CopyCount);
-
-  // If we use a reference, we can make a stronger guarantee that *no* copy
-  // occurs.
-  struct Uncopyable {
-    Uncopyable() = default;
-    Uncopyable(const Uncopyable &) = delete;
-  };
-  unique_function<void(const Uncopyable &)> UncopyableF =
-      [](const Uncopyable &) {};
-  UncopyableF(Uncopyable());
-  Uncopyable X;
-  UncopyableF(X);
-}
-
-TEST(UniqueFunctionTest, CountForwardingMoves) {
-  struct MoveCounter {
-    int &MoveCount;
-
-    MoveCounter(int &MoveCount) : MoveCount(MoveCount) {}
-    MoveCounter(MoveCounter &&Arg) : MoveCount(Arg.MoveCount) { ++MoveCount; }
-  };
-
-  unique_function<void(MoveCounter)> ByValF = [](MoveCounter) {};
-  int MoveCount = 0;
-  ByValF(MoveCounter(MoveCount));
-  EXPECT_EQ(1, MoveCount);
-
-  MoveCount = 0;
-  {
-    MoveCounter Counter{MoveCount};
-    ByValF(std::move(Counter));
-  }
-  EXPECT_EQ(2, MoveCount);
-
-  // Check that when we use an r-value reference we get no spurious copies.
-  unique_function<void(MoveCounter &&)> ByRefF = [](MoveCounter &&) {};
-  MoveCount = 0;
-  ByRefF(MoveCounter(MoveCount));
-  EXPECT_EQ(0, MoveCount);
-
-  MoveCount = 0;
-  {
-    MoveCounter Counter{MoveCount};
-    ByRefF(std::move(Counter));
-  }
-  EXPECT_EQ(0, MoveCount);
-
-  // If we use an r-value reference we can in fact make a stronger guarantee
-  // with an unmovable type.
-  struct Unmovable {
-    Unmovable() = default;
-    Unmovable(Unmovable &&) = delete;
-  };
-  unique_function<void(const Unmovable &)> UnmovableF = [](const Unmovable &) {
-  };
-  UnmovableF(Unmovable());
-  Unmovable X;
-  UnmovableF(X);
-}
-
-TEST(UniqueFunctionTest, Const) {
-  // Can assign from const lambda.
-  unique_function<int(int) const> Plus2 = [X(std::make_unique<int>(2))](int Y) {
-    return *X + Y;
-  };
-  EXPECT_EQ(5, Plus2(3));
-
-  // Can call through a const ref.
-  const auto &Plus2Ref = Plus2;
-  EXPECT_EQ(5, Plus2Ref(3));
-
-  // Can move-construct and assign.
-  unique_function<int(int) const> Plus2A = std::move(Plus2);
-  EXPECT_EQ(5, Plus2A(3));
-  unique_function<int(int) const> Plus2B;
-  Plus2B = std::move(Plus2A);
-  EXPECT_EQ(5, Plus2B(3));
-
-  // Can convert to non-const function type, but not back.
-  unique_function<int(int)> Plus2C = std::move(Plus2B);
-  EXPECT_EQ(5, Plus2C(3));
-
-  // Overloaded call operator correctly resolved.
-  struct ChooseCorrectOverload {
-    StringRef operator()() { return "non-const"; }
-    StringRef operator()() const { return "const"; }
-  };
-  unique_function<StringRef()> ChooseMutable = ChooseCorrectOverload();
-  ChooseCorrectOverload A;
-  EXPECT_EQ("non-const", ChooseMutable());
-  EXPECT_EQ("non-const", A());
-  unique_function<StringRef() const> ChooseConst = ChooseCorrectOverload();
-  const ChooseCorrectOverload &X = A;
-  EXPECT_EQ("const", ChooseConst());
-  EXPECT_EQ("const", X());
-}
-
-// Test that overloads on unique_functions are resolved as expected.
-std::string returns(StringRef) { return "not a function"; }
-std::string returns(unique_function<double()> F) { return "number"; }
-std::string returns(unique_function<StringRef()> F) { return "string"; }
-
-TEST(UniqueFunctionTest, SFINAE) {
-  EXPECT_EQ("not a function", returns("boo!"));
-  EXPECT_EQ("number", returns([] { return 42; }));
-  EXPECT_EQ("string", returns([] { return "hello"; }));
-}
-
-// A forward declared type, and a templated type.
-class Incomplete;
-template <typename T> class Templated { T A; };
-
-// Check that we can define unique_function that have references to
-// incomplete types, even if those types are templated over an
-// incomplete type.
-TEST(UniqueFunctionTest, IncompleteTypes) {
-  unique_function<void(Templated<Incomplete> &&)>
-      IncompleteArgumentRValueReference;
-  unique_function<void(Templated<Incomplete> &)>
-      IncompleteArgumentLValueReference;
-  unique_function<void(Templated<Incomplete> *)> IncompleteArgumentPointer;
-  unique_function<Templated<Incomplete> &()> IncompleteResultLValueReference;
-  unique_function<Templated<Incomplete> && ()> IncompleteResultRValueReference2;
-  unique_function<Templated<Incomplete> *()> IncompleteResultPointer;
-}
-
-} // anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/FunctionRefTest.cpp b/gnu/llvm/llvm/unittests/ADT/FunctionRefTest.cpp
deleted file mode 100644
index 47633cada0f..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/FunctionRefTest.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-//===- llvm/unittest/ADT/FunctionRefTest.cpp - function_ref unit tests ----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/STLExtras.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-// Ensure that there is a default constructor and we can test for a null
-// function_ref.
-TEST(FunctionRefTest, Null) {
-  function_ref<int()> F;
-  EXPECT_FALSE(F);
-
-  auto L = [] { return 1; };
-  F = L;
-  EXPECT_TRUE(F);
-
-  F = {};
-  EXPECT_FALSE(F);
-}
-
-// Ensure that copies of a function_ref copy the underlying state rather than
-// causing one function_ref to chain to the next.
-TEST(FunctionRefTest, Copy) {
-  auto A = [] { return 1; };
-  auto B = [] { return 2; };
-  function_ref<int()> X = A;
-  function_ref<int()> Y = X;
-  X = B;
-  EXPECT_EQ(1, Y());
-}
-
-TEST(FunctionRefTest, BadCopy) {
-  auto A = [] { return 1; };
-  function_ref<int()> X;
-  function_ref<int()> Y = A;
-  function_ref<int()> Z = static_cast<const function_ref<int()> &&>(Y);
-  X = Z;
-  Y = nullptr;
-  ASSERT_EQ(1, X());
-}
-
-// Test that overloads on function_refs are resolved as expected.
-std::string returns(StringRef) { return "not a function"; }
-std::string returns(function_ref<double()> F) { return "number"; }
-std::string returns(function_ref<StringRef()> F) { return "string"; }
-
-TEST(FunctionRefTest, SFINAE) {
-  EXPECT_EQ("not a function", returns("boo!"));
-  EXPECT_EQ("number", returns([] { return 42; }));
-  EXPECT_EQ("string", returns([] { return "hello"; }));
-}
-
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/HashingTest.cpp b/gnu/llvm/llvm/unittests/ADT/HashingTest.cpp
deleted file mode 100644
index d2cda3afdda..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/HashingTest.cpp
+++ /dev/null
@@ -1,405 +0,0 @@
-//===- llvm/unittest/ADT/HashingTest.cpp ----------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Hashing.h unit tests.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/Hashing.h"
-#include "llvm/Support/DataTypes.h"
-#include "gtest/gtest.h"
-#include <deque>
-#include <list>
-#include <map>
-#include <vector>
-
-namespace llvm {
-
-// Helper for test code to print hash codes.
-void PrintTo(const hash_code &code, std::ostream *os) {
-  *os << static_cast<size_t>(code);
-}
-
-// Fake an object that is recognized as hashable data to test super large
-// objects.
-struct LargeTestInteger { uint64_t arr[8]; };
-
-struct NonPOD {
-  uint64_t x, y;
-  NonPOD(uint64_t x, uint64_t y) : x(x), y(y) {}
-  friend hash_code hash_value(const NonPOD &obj) {
-    return hash_combine(obj.x, obj.y);
-  }
-};
-
-namespace hashing {
-namespace detail {
-template <> struct is_hashable_data<LargeTestInteger> : std::true_type {};
-} // namespace detail
-} // namespace hashing
-
-} // namespace llvm
-
-using namespace llvm;
-
-namespace {
-
-enum TestEnumeration {
-  TE_Foo = 42,
-  TE_Bar = 43
-};
-
-TEST(HashingTest, HashValueBasicTest) {
-  int x = 42, y = 43, c = 'x';
-  void *p = nullptr;
-  uint64_t i = 71;
-  const unsigned ci = 71;
-  volatile int vi = 71;
-  const volatile int cvi = 71;
-  uintptr_t addr = reinterpret_cast<uintptr_t>(&y);
-  EXPECT_EQ(hash_value(42), hash_value(x));
-  EXPECT_EQ(hash_value(42), hash_value(TE_Foo));
-  EXPECT_NE(hash_value(42), hash_value(y));
-  EXPECT_NE(hash_value(42), hash_value(TE_Bar));
-  EXPECT_NE(hash_value(42), hash_value(p));
-  EXPECT_EQ(hash_value(71), hash_value(i));
-  EXPECT_EQ(hash_value(71), hash_value(ci));
-  EXPECT_EQ(hash_value(71), hash_value(vi));
-  EXPECT_EQ(hash_value(71), hash_value(cvi));
-  EXPECT_EQ(hash_value(c), hash_value('x'));
-  EXPECT_EQ(hash_value('4'), hash_value('0' + 4));
-  EXPECT_EQ(hash_value(addr), hash_value(&y));
-}
-
-TEST(HashingTest, HashValueStdPair) {
-  EXPECT_EQ(hash_combine(42, 43), hash_value(std::make_pair(42, 43)));
-  EXPECT_NE(hash_combine(43, 42), hash_value(std::make_pair(42, 43)));
-  EXPECT_NE(hash_combine(42, 43), hash_value(std::make_pair(42ull, 43ull)));
-  EXPECT_NE(hash_combine(42, 43), hash_value(std::make_pair(42, 43ull)));
-  EXPECT_NE(hash_combine(42, 43), hash_value(std::make_pair(42ull, 43)));
-
-  // Note that pairs are implicitly flattened to a direct sequence of data and
-  // hashed efficiently as a consequence.
-  EXPECT_EQ(hash_combine(42, 43, 44),
-            hash_value(std::make_pair(42, std::make_pair(43, 44))));
-  EXPECT_EQ(hash_value(std::make_pair(42, std::make_pair(43, 44))),
-            hash_value(std::make_pair(std::make_pair(42, 43), 44)));
-
-  // Ensure that pairs which have padding bytes *inside* them don't get treated
-  // this way.
-  EXPECT_EQ(hash_combine('0', hash_combine(1ull, '2')),
-            hash_value(std::make_pair('0', std::make_pair(1ull, '2'))));
-
-  // Ensure that non-POD pairs don't explode the traits used.
-  NonPOD obj1(1, 2), obj2(3, 4), obj3(5, 6);
-  EXPECT_EQ(hash_combine(obj1, hash_combine(obj2, obj3)),
-            hash_value(std::make_pair(obj1, std::make_pair(obj2, obj3))));
-}
-
-TEST(HashingTest, HashValueStdTuple) {
-  EXPECT_EQ(hash_combine(), hash_value(std::make_tuple()));
-  EXPECT_EQ(hash_combine(42), hash_value(std::make_tuple(42)));
-  EXPECT_EQ(hash_combine(42, 'c'), hash_value(std::make_tuple(42, 'c')));
-
-  EXPECT_NE(hash_combine(43, 42), hash_value(std::make_tuple(42, 43)));
-  EXPECT_NE(hash_combine(42, 43), hash_value(std::make_tuple(42ull, 43ull)));
-  EXPECT_NE(hash_combine(42, 43), hash_value(std::make_tuple(42, 43ull)));
-  EXPECT_NE(hash_combine(42, 43), hash_value(std::make_tuple(42ull, 43)));
-}
-
-TEST(HashingTest, HashValueStdString) {
-  std::string s = "Hello World!";
-  EXPECT_EQ(hash_combine_range(s.c_str(), s.c_str() + s.size()), hash_value(s));
-  EXPECT_EQ(hash_combine_range(s.c_str(), s.c_str() + s.size() - 1),
-            hash_value(s.substr(0, s.size() - 1)));
-  EXPECT_EQ(hash_combine_range(s.c_str() + 1, s.c_str() + s.size() - 1),
-            hash_value(s.substr(1, s.size() - 2)));
-
-  std::wstring ws = L"Hello Wide World!";
-  EXPECT_EQ(hash_combine_range(ws.c_str(), ws.c_str() + ws.size()),
-            hash_value(ws));
-  EXPECT_EQ(hash_combine_range(ws.c_str(), ws.c_str() + ws.size() - 1),
-            hash_value(ws.substr(0, ws.size() - 1)));
-  EXPECT_EQ(hash_combine_range(ws.c_str() + 1, ws.c_str() + ws.size() - 1),
-            hash_value(ws.substr(1, ws.size() - 2)));
-}
-
-template <typename T, size_t N> T *begin(T (&arr)[N]) { return arr; }
-template <typename T, size_t N> T *end(T (&arr)[N]) { return arr + N; }
-
-// Provide a dummy, hashable type designed for easy verification: its hash is
-// the same as its value.
-struct HashableDummy { size_t value; };
-hash_code hash_value(HashableDummy dummy) { return dummy.value; }
-
-TEST(HashingTest, HashCombineRangeBasicTest) {
-  // Leave this uninitialized in the hope that valgrind will catch bad reads.
-  int dummy;
-  hash_code dummy_hash = hash_combine_range(&dummy, &dummy);
-  EXPECT_NE(hash_code(0), dummy_hash);
-
-  const int arr1[] = { 1, 2, 3 };
-  hash_code arr1_hash = hash_combine_range(begin(arr1), end(arr1));
-  EXPECT_NE(dummy_hash, arr1_hash);
-  EXPECT_EQ(arr1_hash, hash_combine_range(begin(arr1), end(arr1)));
-
-  const std::vector<int> vec(begin(arr1), end(arr1));
-  EXPECT_EQ(arr1_hash, hash_combine_range(vec.begin(), vec.end()));
-
-  const std::list<int> list(begin(arr1), end(arr1));
-  EXPECT_EQ(arr1_hash, hash_combine_range(list.begin(), list.end()));
-
-  const std::deque<int> deque(begin(arr1), end(arr1));
-  EXPECT_EQ(arr1_hash, hash_combine_range(deque.begin(), deque.end()));
-
-  const int arr2[] = { 3, 2, 1 };
-  hash_code arr2_hash = hash_combine_range(begin(arr2), end(arr2));
-  EXPECT_NE(dummy_hash, arr2_hash);
-  EXPECT_NE(arr1_hash, arr2_hash);
-
-  const int arr3[] = { 1, 1, 2, 3 };
-  hash_code arr3_hash = hash_combine_range(begin(arr3), end(arr3));
-  EXPECT_NE(dummy_hash, arr3_hash);
-  EXPECT_NE(arr1_hash, arr3_hash);
-
-  const int arr4[] = { 1, 2, 3, 3 };
-  hash_code arr4_hash = hash_combine_range(begin(arr4), end(arr4));
-  EXPECT_NE(dummy_hash, arr4_hash);
-  EXPECT_NE(arr1_hash, arr4_hash);
-
-  const size_t arr5[] = { 1, 2, 3 };
-  const HashableDummy d_arr5[] = { {1}, {2}, {3} };
-  hash_code arr5_hash = hash_combine_range(begin(arr5), end(arr5));
-  hash_code d_arr5_hash = hash_combine_range(begin(d_arr5), end(d_arr5));
-  EXPECT_EQ(arr5_hash, d_arr5_hash);
-}
-
-TEST(HashingTest, HashCombineRangeLengthDiff) {
-  // Test that as only the length varies, we compute different hash codes for
-  // sequences.
-  std::map<size_t, size_t> code_to_size;
-  std::vector<char> all_one_c(256, '\xff');
-  for (unsigned Idx = 1, Size = all_one_c.size(); Idx < Size; ++Idx) {
-    hash_code code = hash_combine_range(&all_one_c[0], &all_one_c[0] + Idx);
-    std::map<size_t, size_t>::iterator
-      I = code_to_size.insert(std::make_pair(code, Idx)).first;
-    EXPECT_EQ(Idx, I->second);
-  }
-  code_to_size.clear();
-  std::vector<char> all_zero_c(256, '\0');
-  for (unsigned Idx = 1, Size = all_zero_c.size(); Idx < Size; ++Idx) {
-    hash_code code = hash_combine_range(&all_zero_c[0], &all_zero_c[0] + Idx);
-    std::map<size_t, size_t>::iterator
-      I = code_to_size.insert(std::make_pair(code, Idx)).first;
-    EXPECT_EQ(Idx, I->second);
-  }
-  code_to_size.clear();
-  std::vector<unsigned> all_one_int(512, -1);
-  for (unsigned Idx = 1, Size = all_one_int.size(); Idx < Size; ++Idx) {
-    hash_code code = hash_combine_range(&all_one_int[0], &all_one_int[0] + Idx);
-    std::map<size_t, size_t>::iterator
-      I = code_to_size.insert(std::make_pair(code, Idx)).first;
-    EXPECT_EQ(Idx, I->second);
-  }
-  code_to_size.clear();
-  std::vector<unsigned> all_zero_int(512, 0);
-  for (unsigned Idx = 1, Size = all_zero_int.size(); Idx < Size; ++Idx) {
-    hash_code code = hash_combine_range(&all_zero_int[0], &all_zero_int[0] + Idx);
-    std::map<size_t, size_t>::iterator
-      I = code_to_size.insert(std::make_pair(code, Idx)).first;
-    EXPECT_EQ(Idx, I->second);
-  }
-}
-
-TEST(HashingTest, HashCombineRangeGoldenTest) {
-  struct { const char *s; uint64_t hash; } golden_data[] = {
-#if SIZE_MAX == UINT64_MAX || SIZE_MAX == UINT32_MAX
-    { "a",                                0xaeb6f9d5517c61f8ULL },
-    { "ab",                               0x7ab1edb96be496b4ULL },
-    { "abc",                              0xe38e60bf19c71a3fULL },
-    { "abcde",                            0xd24461a66de97f6eULL },
-    { "abcdefgh",                         0x4ef872ec411dec9dULL },
-    { "abcdefghijklm",                    0xe8a865539f4eadfeULL },
-    { "abcdefghijklmnopqrstu",            0x261cdf85faaf4e79ULL },
-    { "abcdefghijklmnopqrstuvwxyzabcdef", 0x43ba70e4198e3b2aULL },
-    { "abcdefghijklmnopqrstuvwxyzabcdef"
-      "abcdefghijklmnopqrstuvwxyzghijkl"
-      "abcdefghijklmnopqrstuvwxyzmnopqr"
-      "abcdefghijklmnopqrstuvwxyzstuvwx"
-      "abcdefghijklmnopqrstuvwxyzyzabcd", 0xdcd57fb2afdf72beULL },
-    { "a",                                0xaeb6f9d5517c61f8ULL },
-    { "aa",                               0xf2b3b69a9736a1ebULL },
-    { "aaa",                              0xf752eb6f07b1cafeULL },
-    { "aaaaa",                            0x812bd21e1236954cULL },
-    { "aaaaaaaa",                         0xff07a2cff08ac587ULL },
-    { "aaaaaaaaaaaaa",                    0x84ac949d54d704ecULL },
-    { "aaaaaaaaaaaaaaaaaaaaa",            0xcb2c8fb6be8f5648ULL },
-    { "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", 0xcc40ab7f164091b6ULL },
-    { "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", 0xc58e174c1e78ffe9ULL },
-    { "z",                                0x1ba160d7e8f8785cULL },
-    { "zz",                               0x2c5c03172f1285d7ULL },
-    { "zzz",                              0x9d2c4f4b507a2ac3ULL },
-    { "zzzzz",                            0x0f03b9031735693aULL },
-    { "zzzzzzzz",                         0xe674147c8582c08eULL },
-    { "zzzzzzzzzzzzz",                    0x3162d9fa6938db83ULL },
-    { "zzzzzzzzzzzzzzzzzzzzz",            0x37b9a549e013620cULL },
-    { "zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz", 0x8921470aff885016ULL },
-    { "zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"
-      "zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"
-      "zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"
-      "zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"
-      "zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz", 0xf60fdcd9beb08441ULL },
-    { "a",                                0xaeb6f9d5517c61f8ULL },
-    { "ab",                               0x7ab1edb96be496b4ULL },
-    { "aba",                              0x3edb049950884d0aULL },
-    { "ababa",                            0x8f2de9e73a97714bULL },
-    { "abababab",                         0xee14a29ddf0ce54cULL },
-    { "ababababababa",                    0x38b3ddaada2d52b4ULL },
-    { "ababababababababababa",            0xd3665364219f2b85ULL },
-    { "abababababababababababababababab", 0xa75cd6afbf1bc972ULL },
-    { "abababababababababababababababab"
-      "abababababababababababababababab"
-      "abababababababababababababababab"
-      "abababababababababababababababab"
-      "abababababababababababababababab", 0x840192d129f7a22bULL }
-#else
-#error This test only supports 64-bit and 32-bit systems.
-#endif
-  };
-  for (unsigned i = 0; i < sizeof(golden_data)/sizeof(*golden_data); ++i) {
-    StringRef str = golden_data[i].s;
-    hash_code hash = hash_combine_range(str.begin(), str.end());
-#if 0 // Enable this to generate paste-able text for the above structure.
-    std::string member_str = "\"" + str.str() + "\",";
-    fprintf(stderr, " { %-35s 0x%016llxULL },\n",
-            member_str.c_str(), static_cast<uint64_t>(hash));
-#endif
-    EXPECT_EQ(static_cast<size_t>(golden_data[i].hash),
-              static_cast<size_t>(hash));
-  }
-}
-
-TEST(HashingTest, HashCombineBasicTest) {
-  // Hashing a sequence of homogenous types matches range hashing.
-  const int i1 = 42, i2 = 43, i3 = 123, i4 = 999, i5 = 0, i6 = 79;
-  const int arr1[] = { i1, i2, i3, i4, i5, i6 };
-  EXPECT_EQ(hash_combine_range(arr1, arr1 + 1), hash_combine(i1));
-  EXPECT_EQ(hash_combine_range(arr1, arr1 + 2), hash_combine(i1, i2));
-  EXPECT_EQ(hash_combine_range(arr1, arr1 + 3), hash_combine(i1, i2, i3));
-  EXPECT_EQ(hash_combine_range(arr1, arr1 + 4), hash_combine(i1, i2, i3, i4));
-  EXPECT_EQ(hash_combine_range(arr1, arr1 + 5),
-            hash_combine(i1, i2, i3, i4, i5));
-  EXPECT_EQ(hash_combine_range(arr1, arr1 + 6),
-            hash_combine(i1, i2, i3, i4, i5, i6));
-
-  // Hashing a sequence of heterogeneous types which *happen* to all produce the
-  // same data for hashing produces the same as a range-based hash of the
-  // fundamental values.
-  const size_t s1 = 1024, s2 = 8888, s3 = 9000000;
-  const HashableDummy d1 = { 1024 }, d2 = { 8888 }, d3 = { 9000000 };
-  const size_t arr2[] = { s1, s2, s3 };
-  EXPECT_EQ(hash_combine_range(begin(arr2), end(arr2)),
-            hash_combine(s1, s2, s3));
-  EXPECT_EQ(hash_combine(s1, s2, s3), hash_combine(s1, s2, d3));
-  EXPECT_EQ(hash_combine(s1, s2, s3), hash_combine(s1, d2, s3));
-  EXPECT_EQ(hash_combine(s1, s2, s3), hash_combine(d1, s2, s3));
-  EXPECT_EQ(hash_combine(s1, s2, s3), hash_combine(d1, d2, s3));
-  EXPECT_EQ(hash_combine(s1, s2, s3), hash_combine(d1, d2, d3));
-
-  // Permuting values causes hashes to change.
-  EXPECT_NE(hash_combine(i1, i1, i1), hash_combine(i1, i1, i2));
-  EXPECT_NE(hash_combine(i1, i1, i1), hash_combine(i1, i2, i1));
-  EXPECT_NE(hash_combine(i1, i1, i1), hash_combine(i2, i1, i1));
-  EXPECT_NE(hash_combine(i1, i1, i1), hash_combine(i2, i2, i1));
-  EXPECT_NE(hash_combine(i1, i1, i1), hash_combine(i2, i2, i2));
-  EXPECT_NE(hash_combine(i2, i1, i1), hash_combine(i1, i1, i2));
-  EXPECT_NE(hash_combine(i1, i1, i2), hash_combine(i1, i2, i1));
-  EXPECT_NE(hash_combine(i1, i2, i1), hash_combine(i2, i1, i1));
-
-  // Changing type w/o changing value causes hashes to change.
-  EXPECT_NE(hash_combine(i1, i2, i3), hash_combine((char)i1, i2, i3));
-  EXPECT_NE(hash_combine(i1, i2, i3), hash_combine(i1, (char)i2, i3));
-  EXPECT_NE(hash_combine(i1, i2, i3), hash_combine(i1, i2, (char)i3));
-
-  // This is array of uint64, but it should have the exact same byte pattern as
-  // an array of LargeTestIntegers.
-  const uint64_t bigarr[] = {
-    0xaaaaaaaaababababULL, 0xacacacacbcbcbcbcULL, 0xccddeeffeeddccbbULL,
-    0xdeadbeafdeadbeefULL, 0xfefefefededededeULL, 0xafafafafededededULL,
-    0xffffeeeeddddccccULL, 0xaaaacbcbffffababULL,
-    0xaaaaaaaaababababULL, 0xacacacacbcbcbcbcULL, 0xccddeeffeeddccbbULL,
-    0xdeadbeafdeadbeefULL, 0xfefefefededededeULL, 0xafafafafededededULL,
-    0xffffeeeeddddccccULL, 0xaaaacbcbffffababULL,
-    0xaaaaaaaaababababULL, 0xacacacacbcbcbcbcULL, 0xccddeeffeeddccbbULL,
-    0xdeadbeafdeadbeefULL, 0xfefefefededededeULL, 0xafafafafededededULL,
-    0xffffeeeeddddccccULL, 0xaaaacbcbffffababULL
-  };
-  // Hash a preposterously large integer, both aligned with the buffer and
-  // misaligned.
-  const LargeTestInteger li = { {
-    0xaaaaaaaaababababULL, 0xacacacacbcbcbcbcULL, 0xccddeeffeeddccbbULL,
-    0xdeadbeafdeadbeefULL, 0xfefefefededededeULL, 0xafafafafededededULL,
-    0xffffeeeeddddccccULL, 0xaaaacbcbffffababULL
-  } };
-  // Rotate the storage from 'li'.
-  const LargeTestInteger l2 = { {
-    0xacacacacbcbcbcbcULL, 0xccddeeffeeddccbbULL, 0xdeadbeafdeadbeefULL,
-    0xfefefefededededeULL, 0xafafafafededededULL, 0xffffeeeeddddccccULL,
-    0xaaaacbcbffffababULL, 0xaaaaaaaaababababULL
-  } };
-  const LargeTestInteger l3 = { {
-    0xccddeeffeeddccbbULL, 0xdeadbeafdeadbeefULL, 0xfefefefededededeULL,
-    0xafafafafededededULL, 0xffffeeeeddddccccULL, 0xaaaacbcbffffababULL,
-    0xaaaaaaaaababababULL, 0xacacacacbcbcbcbcULL
-  } };
-  EXPECT_EQ(hash_combine_range(begin(bigarr), end(bigarr)),
-            hash_combine(li, li, li));
-  EXPECT_EQ(hash_combine_range(bigarr, bigarr + 9),
-            hash_combine(bigarr[0], l2));
-  EXPECT_EQ(hash_combine_range(bigarr, bigarr + 10),
-            hash_combine(bigarr[0], bigarr[1], l3));
-  EXPECT_EQ(hash_combine_range(bigarr, bigarr + 17),
-            hash_combine(li, bigarr[0], l2));
-  EXPECT_EQ(hash_combine_range(bigarr, bigarr + 18),
-            hash_combine(li, bigarr[0], bigarr[1], l3));
-  EXPECT_EQ(hash_combine_range(bigarr, bigarr + 18),
-            hash_combine(bigarr[0], l2, bigarr[9], l3));
-  EXPECT_EQ(hash_combine_range(bigarr, bigarr + 20),
-            hash_combine(bigarr[0], l2, bigarr[9], l3, bigarr[18], bigarr[19]));
-}
-
-TEST(HashingTest, HashCombineArgs18) {
-  // This tests that we can pass in up to 18 args.
-#define CHECK_SAME(...)                                                        \
-  EXPECT_EQ(hash_combine(__VA_ARGS__), hash_combine(__VA_ARGS__))
-  CHECK_SAME(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18);
-  CHECK_SAME(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17);
-  CHECK_SAME(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16);
-  CHECK_SAME(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15);
-  CHECK_SAME(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14);
-  CHECK_SAME(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13);
-  CHECK_SAME(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12);
-  CHECK_SAME(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11);
-  CHECK_SAME(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
-  CHECK_SAME(1, 2, 3, 4, 5, 6, 7, 8, 9);
-  CHECK_SAME(1, 2, 3, 4, 5, 6, 7, 8);
-  CHECK_SAME(1, 2, 3, 4, 5, 6, 7);
-  CHECK_SAME(1, 2, 3, 4, 5, 6);
-  CHECK_SAME(1, 2, 3, 4, 5);
-  CHECK_SAME(1, 2, 3, 4);
-  CHECK_SAME(1, 2, 3);
-  CHECK_SAME(1, 2);
-  CHECK_SAME(1);
-#undef CHECK_SAME
-}
-
-}
diff --git a/gnu/llvm/llvm/unittests/ADT/IListBaseTest.cpp b/gnu/llvm/llvm/unittests/ADT/IListBaseTest.cpp
deleted file mode 100644
index 1c55eac5c53..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/IListBaseTest.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-//===- unittests/ADT/IListBaseTest.cpp - ilist_base unit tests ------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/ilist_base.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-// Test fixture.
-template <typename T> class IListBaseTest : public ::testing::Test {};
-
-// Test variants with the same test.
-typedef ::testing::Types<ilist_base<false>, ilist_base<true>>
-    IListBaseTestTypes;
-TYPED_TEST_SUITE(IListBaseTest, IListBaseTestTypes, );
-
-TYPED_TEST(IListBaseTest, insertBeforeImpl) {
-  typedef TypeParam list_base_type;
-  typedef typename list_base_type::node_base_type node_base_type;
-
-  node_base_type S, A, B;
-
-  // [S] <-> [S]
-  S.setPrev(&S);
-  S.setNext(&S);
-
-  // [S] <-> A <-> [S]
-  list_base_type::insertBeforeImpl(S, A);
-  EXPECT_EQ(&A, S.getPrev());
-  EXPECT_EQ(&S, A.getPrev());
-  EXPECT_EQ(&A, S.getNext());
-  EXPECT_EQ(&S, A.getNext());
-
-  // [S] <-> A <-> B <-> [S]
-  list_base_type::insertBeforeImpl(S, B);
-  EXPECT_EQ(&B, S.getPrev());
-  EXPECT_EQ(&A, B.getPrev());
-  EXPECT_EQ(&S, A.getPrev());
-  EXPECT_EQ(&A, S.getNext());
-  EXPECT_EQ(&B, A.getNext());
-  EXPECT_EQ(&S, B.getNext());
-}
-
-TYPED_TEST(IListBaseTest, removeImpl) {
-  typedef TypeParam list_base_type;
-  typedef typename list_base_type::node_base_type node_base_type;
-
-  node_base_type S, A, B;
-
-  // [S] <-> A <-> B <-> [S]
-  S.setPrev(&S);
-  S.setNext(&S);
-  list_base_type::insertBeforeImpl(S, A);
-  list_base_type::insertBeforeImpl(S, B);
-
-  // [S] <-> B <-> [S]
-  list_base_type::removeImpl(A);
-  EXPECT_EQ(&B, S.getPrev());
-  EXPECT_EQ(&S, B.getPrev());
-  EXPECT_EQ(&B, S.getNext());
-  EXPECT_EQ(&S, B.getNext());
-  EXPECT_EQ(nullptr, A.getPrev());
-  EXPECT_EQ(nullptr, A.getNext());
-
-  // [S] <-> [S]
-  list_base_type::removeImpl(B);
-  EXPECT_EQ(&S, S.getPrev());
-  EXPECT_EQ(&S, S.getNext());
-  EXPECT_EQ(nullptr, B.getPrev());
-  EXPECT_EQ(nullptr, B.getNext());
-}
-
-TYPED_TEST(IListBaseTest, removeRangeImpl) {
-  typedef TypeParam list_base_type;
-  typedef typename list_base_type::node_base_type node_base_type;
-
-  node_base_type S, A, B, C, D;
-
-  // [S] <-> A <-> B <-> C <-> D <-> [S]
-  S.setPrev(&S);
-  S.setNext(&S);
-  list_base_type::insertBeforeImpl(S, A);
-  list_base_type::insertBeforeImpl(S, B);
-  list_base_type::insertBeforeImpl(S, C);
-  list_base_type::insertBeforeImpl(S, D);
-
-  // [S] <-> A <-> D <-> [S]
-  list_base_type::removeRangeImpl(B, D);
-  EXPECT_EQ(&D, S.getPrev());
-  EXPECT_EQ(&A, D.getPrev());
-  EXPECT_EQ(&S, A.getPrev());
-  EXPECT_EQ(&A, S.getNext());
-  EXPECT_EQ(&D, A.getNext());
-  EXPECT_EQ(&S, D.getNext());
-  EXPECT_EQ(nullptr, B.getPrev());
-  EXPECT_EQ(nullptr, C.getNext());
-}
-
-TYPED_TEST(IListBaseTest, removeRangeImplAllButSentinel) {
-  typedef TypeParam list_base_type;
-  typedef typename list_base_type::node_base_type node_base_type;
-
-  node_base_type S, A, B;
-
-  // [S] <-> A <-> B <-> [S]
-  S.setPrev(&S);
-  S.setNext(&S);
-  list_base_type::insertBeforeImpl(S, A);
-  list_base_type::insertBeforeImpl(S, B);
-
-  // [S] <-> [S]
-  list_base_type::removeRangeImpl(A, S);
-  EXPECT_EQ(&S, S.getPrev());
-  EXPECT_EQ(&S, S.getNext());
-  EXPECT_EQ(nullptr, A.getPrev());
-  EXPECT_EQ(nullptr, B.getNext());
-}
-
-TYPED_TEST(IListBaseTest, transferBeforeImpl) {
-  typedef TypeParam list_base_type;
-  typedef typename list_base_type::node_base_type node_base_type;
-
-  node_base_type S1, S2, A, B, C, D, E;
-
-  // [S1] <-> A <-> B <-> C <-> [S1]
-  S1.setPrev(&S1);
-  S1.setNext(&S1);
-  list_base_type::insertBeforeImpl(S1, A);
-  list_base_type::insertBeforeImpl(S1, B);
-  list_base_type::insertBeforeImpl(S1, C);
-
-  // [S2] <-> D <-> E <-> [S2]
-  S2.setPrev(&S2);
-  S2.setNext(&S2);
-  list_base_type::insertBeforeImpl(S2, D);
-  list_base_type::insertBeforeImpl(S2, E);
-
-  // [S1] <-> C <-> [S1]
-  list_base_type::transferBeforeImpl(D, A, C);
-  EXPECT_EQ(&C, S1.getPrev());
-  EXPECT_EQ(&S1, C.getPrev());
-  EXPECT_EQ(&C, S1.getNext());
-  EXPECT_EQ(&S1, C.getNext());
-
-  // [S2] <-> A <-> B <-> D <-> E <-> [S2]
-  EXPECT_EQ(&E, S2.getPrev());
-  EXPECT_EQ(&D, E.getPrev());
-  EXPECT_EQ(&B, D.getPrev());
-  EXPECT_EQ(&A, B.getPrev());
-  EXPECT_EQ(&S2, A.getPrev());
-  EXPECT_EQ(&A, S2.getNext());
-  EXPECT_EQ(&B, A.getNext());
-  EXPECT_EQ(&D, B.getNext());
-  EXPECT_EQ(&E, D.getNext());
-  EXPECT_EQ(&S2, E.getNext());
-}
-
-} // end namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/IListIteratorTest.cpp b/gnu/llvm/llvm/unittests/ADT/IListIteratorTest.cpp
deleted file mode 100644
index 559e32de077..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/IListIteratorTest.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-//===- unittests/ADT/IListIteratorTest.cpp - ilist_iterator unit tests ----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/simple_ilist.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-struct Node : ilist_node<Node> {};
-
-TEST(IListIteratorTest, DefaultConstructor) {
-  simple_ilist<Node>::iterator I;
-  simple_ilist<Node>::reverse_iterator RI;
-  simple_ilist<Node>::const_iterator CI;
-  simple_ilist<Node>::const_reverse_iterator CRI;
-  EXPECT_EQ(nullptr, I.getNodePtr());
-  EXPECT_EQ(nullptr, CI.getNodePtr());
-  EXPECT_EQ(nullptr, RI.getNodePtr());
-  EXPECT_EQ(nullptr, CRI.getNodePtr());
-  EXPECT_EQ(I, I);
-  EXPECT_EQ(I, CI);
-  EXPECT_EQ(CI, I);
-  EXPECT_EQ(CI, CI);
-  EXPECT_EQ(RI, RI);
-  EXPECT_EQ(RI, CRI);
-  EXPECT_EQ(CRI, RI);
-  EXPECT_EQ(CRI, CRI);
-  EXPECT_EQ(I, RI.getReverse());
-  EXPECT_EQ(RI, I.getReverse());
-}
-
-TEST(IListIteratorTest, Empty) {
-  simple_ilist<Node> L;
-
-  // Check iterators of L.
-  EXPECT_EQ(L.begin(), L.end());
-  EXPECT_EQ(L.rbegin(), L.rend());
-
-  // Reverse of end should be rend (since the sentinel sits on both sides).
-  EXPECT_EQ(L.end(), L.rend().getReverse());
-  EXPECT_EQ(L.rend(), L.end().getReverse());
-
-  // Iterators shouldn't match default constructors.
-  simple_ilist<Node>::iterator I;
-  simple_ilist<Node>::reverse_iterator RI;
-  EXPECT_NE(I, L.begin());
-  EXPECT_NE(I, L.end());
-  EXPECT_NE(RI, L.rbegin());
-  EXPECT_NE(RI, L.rend());
-}
-
-TEST(IListIteratorTest, OneNodeList) {
-  simple_ilist<Node> L;
-  Node A;
-  L.insert(L.end(), A);
-
-  // Check address of reference.
-  EXPECT_EQ(&A, &*L.begin());
-  EXPECT_EQ(&A, &*L.rbegin());
-
-  // Check that the handle matches.
-  EXPECT_EQ(L.rbegin().getNodePtr(), L.begin().getNodePtr());
-
-  // Check iteration.
-  EXPECT_EQ(L.end(), ++L.begin());
-  EXPECT_EQ(L.begin(), --L.end());
-  EXPECT_EQ(L.rend(), ++L.rbegin());
-  EXPECT_EQ(L.rbegin(), --L.rend());
-
-  // Check conversions.
-  EXPECT_EQ(L.rbegin(), L.begin().getReverse());
-  EXPECT_EQ(L.begin(), L.rbegin().getReverse());
-}
-
-TEST(IListIteratorTest, TwoNodeList) {
-  simple_ilist<Node> L;
-  Node A, B;
-  L.insert(L.end(), A);
-  L.insert(L.end(), B);
-
-  // Check order.
-  EXPECT_EQ(&A, &*L.begin());
-  EXPECT_EQ(&B, &*++L.begin());
-  EXPECT_EQ(L.end(), ++++L.begin());
-  EXPECT_EQ(&B, &*L.rbegin());
-  EXPECT_EQ(&A, &*++L.rbegin());
-  EXPECT_EQ(L.rend(), ++++L.rbegin());
-
-  // Check conversions.
-  EXPECT_EQ(++L.rbegin(), L.begin().getReverse());
-  EXPECT_EQ(L.rbegin(), (++L.begin()).getReverse());
-  EXPECT_EQ(++L.begin(), L.rbegin().getReverse());
-  EXPECT_EQ(L.begin(), (++L.rbegin()).getReverse());
-}
-
-TEST(IListIteratorTest, CheckEraseForward) {
-  simple_ilist<Node> L;
-  Node A, B;
-  L.insert(L.end(), A);
-  L.insert(L.end(), B);
-
-  // Erase nodes.
-  auto I = L.begin();
-  EXPECT_EQ(&A, &*I);
-  L.remove(*I++);
-  EXPECT_EQ(&B, &*I);
-  L.remove(*I++);
-  EXPECT_EQ(L.end(), I);
-}
-
-TEST(IListIteratorTest, CheckEraseReverse) {
-  simple_ilist<Node> L;
-  Node A, B;
-  L.insert(L.end(), A);
-  L.insert(L.end(), B);
-
-  // Erase nodes.
-  auto RI = L.rbegin();
-  EXPECT_EQ(&B, &*RI);
-  L.remove(*RI++);
-  EXPECT_EQ(&A, &*RI);
-  L.remove(*RI++);
-  EXPECT_EQ(L.rend(), RI);
-}
-
-TEST(IListIteratorTest, ReverseConstructor) {
-  simple_ilist<Node> L;
-  const simple_ilist<Node> &CL = L;
-  Node A, B;
-  L.insert(L.end(), A);
-  L.insert(L.end(), B);
-
-  // Save typing.
-  typedef simple_ilist<Node>::iterator iterator;
-  typedef simple_ilist<Node>::reverse_iterator reverse_iterator;
-  typedef simple_ilist<Node>::const_iterator const_iterator;
-  typedef simple_ilist<Node>::const_reverse_iterator const_reverse_iterator;
-
-  // Check conversion values.
-  EXPECT_EQ(L.begin(), iterator(L.rend()));
-  EXPECT_EQ(++L.begin(), iterator(++L.rbegin()));
-  EXPECT_EQ(L.end(), iterator(L.rbegin()));
-  EXPECT_EQ(L.rbegin(), reverse_iterator(L.end()));
-  EXPECT_EQ(++L.rbegin(), reverse_iterator(++L.begin()));
-  EXPECT_EQ(L.rend(), reverse_iterator(L.begin()));
-
-  // Check const iterator constructors.
-  EXPECT_EQ(CL.begin(), const_iterator(L.rend()));
-  EXPECT_EQ(CL.begin(), const_iterator(CL.rend()));
-  EXPECT_EQ(CL.rbegin(), const_reverse_iterator(L.end()));
-  EXPECT_EQ(CL.rbegin(), const_reverse_iterator(CL.end()));
-
-  // Confirm lack of implicit conversions.
-  static_assert(!std::is_convertible<iterator, reverse_iterator>::value,
-                "unexpected implicit conversion");
-  static_assert(!std::is_convertible<reverse_iterator, iterator>::value,
-                "unexpected implicit conversion");
-  static_assert(
-      !std::is_convertible<const_iterator, const_reverse_iterator>::value,
-      "unexpected implicit conversion");
-  static_assert(
-      !std::is_convertible<const_reverse_iterator, const_iterator>::value,
-      "unexpected implicit conversion");
-}
-
-} // end namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/IListNodeBaseTest.cpp b/gnu/llvm/llvm/unittests/ADT/IListNodeBaseTest.cpp
deleted file mode 100644
index 65f85fc3a23..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/IListNodeBaseTest.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-//===- unittests/ADT/IListNodeBaseTest.cpp - ilist_node_base unit tests ---===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/ilist_node_base.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-typedef ilist_node_base<false> RawNode;
-typedef ilist_node_base<true> TrackingNode;
-
-TEST(IListNodeBaseTest, DefaultConstructor) {
-  RawNode A;
-  EXPECT_EQ(nullptr, A.getPrev());
-  EXPECT_EQ(nullptr, A.getNext());
-  EXPECT_FALSE(A.isKnownSentinel());
-
-  TrackingNode TA;
-  EXPECT_EQ(nullptr, TA.getPrev());
-  EXPECT_EQ(nullptr, TA.getNext());
-  EXPECT_FALSE(TA.isKnownSentinel());
-  EXPECT_FALSE(TA.isSentinel());
-}
-
-TEST(IListNodeBaseTest, setPrevAndNext) {
-  RawNode A, B, C;
-  A.setPrev(&B);
-  EXPECT_EQ(&B, A.getPrev());
-  EXPECT_EQ(nullptr, A.getNext());
-  EXPECT_EQ(nullptr, B.getPrev());
-  EXPECT_EQ(nullptr, B.getNext());
-  EXPECT_EQ(nullptr, C.getPrev());
-  EXPECT_EQ(nullptr, C.getNext());
-
-  A.setNext(&C);
-  EXPECT_EQ(&B, A.getPrev());
-  EXPECT_EQ(&C, A.getNext());
-  EXPECT_EQ(nullptr, B.getPrev());
-  EXPECT_EQ(nullptr, B.getNext());
-  EXPECT_EQ(nullptr, C.getPrev());
-  EXPECT_EQ(nullptr, C.getNext());
-
-  TrackingNode TA, TB, TC;
-  TA.setPrev(&TB);
-  EXPECT_EQ(&TB, TA.getPrev());
-  EXPECT_EQ(nullptr, TA.getNext());
-  EXPECT_EQ(nullptr, TB.getPrev());
-  EXPECT_EQ(nullptr, TB.getNext());
-  EXPECT_EQ(nullptr, TC.getPrev());
-  EXPECT_EQ(nullptr, TC.getNext());
-
-  TA.setNext(&TC);
-  EXPECT_EQ(&TB, TA.getPrev());
-  EXPECT_EQ(&TC, TA.getNext());
-  EXPECT_EQ(nullptr, TB.getPrev());
-  EXPECT_EQ(nullptr, TB.getNext());
-  EXPECT_EQ(nullptr, TC.getPrev());
-  EXPECT_EQ(nullptr, TC.getNext());
-}
-
-TEST(IListNodeBaseTest, isKnownSentinel) {
-  // Without sentinel tracking.
-  RawNode A, B;
-  EXPECT_FALSE(A.isKnownSentinel());
-  A.setPrev(&B);
-  A.setNext(&B);
-  EXPECT_EQ(&B, A.getPrev());
-  EXPECT_EQ(&B, A.getNext());
-  EXPECT_FALSE(A.isKnownSentinel());
-  A.initializeSentinel();
-  EXPECT_FALSE(A.isKnownSentinel());
-  EXPECT_EQ(&B, A.getPrev());
-  EXPECT_EQ(&B, A.getNext());
-
-  // With sentinel tracking.
-  TrackingNode TA, TB;
-  EXPECT_FALSE(TA.isKnownSentinel());
-  EXPECT_FALSE(TA.isSentinel());
-  TA.setPrev(&TB);
-  TA.setNext(&TB);
-  EXPECT_EQ(&TB, TA.getPrev());
-  EXPECT_EQ(&TB, TA.getNext());
-  EXPECT_FALSE(TA.isKnownSentinel());
-  EXPECT_FALSE(TA.isSentinel());
-  TA.initializeSentinel();
-  EXPECT_TRUE(TA.isKnownSentinel());
-  EXPECT_TRUE(TA.isSentinel());
-  EXPECT_EQ(&TB, TA.getPrev());
-  EXPECT_EQ(&TB, TA.getNext());
-}
-
-} // end namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/IListNodeTest.cpp b/gnu/llvm/llvm/unittests/ADT/IListNodeTest.cpp
deleted file mode 100644
index cf775eb5d06..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/IListNodeTest.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-//===- unittests/ADT/IListNodeTest.cpp - ilist_node unit tests ------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/ilist_node.h"
-#include "gtest/gtest.h"
-#include <type_traits>
-
-using namespace llvm;
-using namespace llvm::ilist_detail;
-
-namespace {
-
-struct Node;
-
-struct TagA {};
-struct TagB {};
-
-TEST(IListNodeTest, Options) {
-  static_assert(
-      std::is_same<compute_node_options<Node>::type,
-                   compute_node_options<Node, ilist_tag<void>>::type>::value,
-      "default tag is void");
-  static_assert(
-      !std::is_same<compute_node_options<Node, ilist_tag<TagA>>::type,
-                    compute_node_options<Node, ilist_tag<void>>::type>::value,
-      "default tag is void, different from TagA");
-  static_assert(
-      !std::is_same<compute_node_options<Node, ilist_tag<TagA>>::type,
-                    compute_node_options<Node, ilist_tag<TagB>>::type>::value,
-      "TagA is not TagB");
-  static_assert(
-      std::is_same<
-          compute_node_options<Node, ilist_sentinel_tracking<false>>::type,
-          compute_node_options<Node, ilist_sentinel_tracking<false>,
-                               ilist_tag<void>>::type>::value,
-      "default tag is void, even with sentinel tracking off");
-  static_assert(
-      std::is_same<
-          compute_node_options<Node, ilist_sentinel_tracking<false>>::type,
-          compute_node_options<Node, ilist_tag<void>,
-                               ilist_sentinel_tracking<false>>::type>::value,
-      "order shouldn't matter");
-  static_assert(
-      std::is_same<
-          compute_node_options<Node, ilist_sentinel_tracking<true>>::type,
-          compute_node_options<Node, ilist_sentinel_tracking<true>,
-                               ilist_tag<void>>::type>::value,
-      "default tag is void, even with sentinel tracking on");
-  static_assert(
-      std::is_same<
-          compute_node_options<Node, ilist_sentinel_tracking<true>>::type,
-          compute_node_options<Node, ilist_tag<void>,
-                               ilist_sentinel_tracking<true>>::type>::value,
-      "order shouldn't matter");
-  static_assert(
-      std::is_same<
-          compute_node_options<Node, ilist_sentinel_tracking<true>,
-                               ilist_tag<TagA>>::type,
-          compute_node_options<Node, ilist_tag<TagA>,
-                               ilist_sentinel_tracking<true>>::type>::value,
-      "order shouldn't matter with real tags");
-}
-
-} // end namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/IListSentinelTest.cpp b/gnu/llvm/llvm/unittests/ADT/IListSentinelTest.cpp
deleted file mode 100644
index 1f4a8311370..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/IListSentinelTest.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-//===- unittests/ADT/IListSentinelTest.cpp - ilist_sentinel unit tests ----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/ilist_node.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-template <class T, class... Options> struct PickSentinel {
-  typedef ilist_sentinel<
-      typename ilist_detail::compute_node_options<T, Options...>::type>
-      type;
-};
-
-class Node : public ilist_node<Node> {};
-class TrackingNode : public ilist_node<Node, ilist_sentinel_tracking<true>> {};
-typedef PickSentinel<Node>::type Sentinel;
-typedef PickSentinel<Node, ilist_sentinel_tracking<true>>::type
-    TrackingSentinel;
-typedef PickSentinel<Node, ilist_sentinel_tracking<false>>::type
-    NoTrackingSentinel;
-
-struct LocalAccess : ilist_detail::NodeAccess {
-  using NodeAccess::getPrev;
-  using NodeAccess::getNext;
-};
-
-TEST(IListSentinelTest, DefaultConstructor) {
-  Sentinel S;
-  EXPECT_EQ(&S, LocalAccess::getPrev(S));
-  EXPECT_EQ(&S, LocalAccess::getNext(S));
-#if LLVM_ENABLE_ABI_BREAKING_CHECKS
-  EXPECT_TRUE(S.isKnownSentinel());
-#else
-  EXPECT_FALSE(S.isKnownSentinel());
-#endif
-
-  TrackingSentinel TS;
-  NoTrackingSentinel NTS;
-  EXPECT_TRUE(TS.isSentinel());
-  EXPECT_TRUE(TS.isKnownSentinel());
-  EXPECT_FALSE(NTS.isKnownSentinel());
-}
-
-TEST(IListSentinelTest, NormalNodeIsNotKnownSentinel) {
-  Node N;
-  EXPECT_EQ(nullptr, LocalAccess::getPrev(N));
-  EXPECT_EQ(nullptr, LocalAccess::getNext(N));
-  EXPECT_FALSE(N.isKnownSentinel());
-
-  TrackingNode TN;
-  EXPECT_FALSE(TN.isSentinel());
-}
-
-} // end namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/IListTest.cpp b/gnu/llvm/llvm/unittests/ADT/IListTest.cpp
deleted file mode 100644
index 18f6c41a648..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/IListTest.cpp
+++ /dev/null
@@ -1,305 +0,0 @@
-//===- unittests/ADT/IListTest.cpp - ilist unit tests ---------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/ilist.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/ilist_node.h"
-#include "gtest/gtest.h"
-#include <ostream>
-
-using namespace llvm;
-
-namespace {
-
-struct Node : ilist_node<Node> {
-  int Value;
-
-  Node() {}
-  Node(int Value) : Value(Value) {}
-  Node(const Node&) = default;
-  ~Node() { Value = -1; }
-};
-
-TEST(IListTest, Basic) {
-  ilist<Node> List;
-  List.push_back(new Node(1));
-  EXPECT_EQ(1, List.back().Value);
-  EXPECT_EQ(nullptr, List.getPrevNode(List.back()));
-  EXPECT_EQ(nullptr, List.getNextNode(List.back()));
-
-  List.push_back(new Node(2));
-  EXPECT_EQ(2, List.back().Value);
-  EXPECT_EQ(2, List.getNextNode(List.front())->Value);
-  EXPECT_EQ(1, List.getPrevNode(List.back())->Value);
-
-  const ilist<Node> &ConstList = List;
-  EXPECT_EQ(2, ConstList.back().Value);
-  EXPECT_EQ(2, ConstList.getNextNode(ConstList.front())->Value);
-  EXPECT_EQ(1, ConstList.getPrevNode(ConstList.back())->Value);
-}
-
-TEST(IListTest, cloneFrom) {
-  Node L1Nodes[] = {Node(0), Node(1)};
-  Node L2Nodes[] = {Node(0), Node(1)};
-  ilist<Node> L1, L2, L3;
-
-  // Build L1 from L1Nodes.
-  L1.push_back(&L1Nodes[0]);
-  L1.push_back(&L1Nodes[1]);
-
-  // Build L2 from L2Nodes, based on L1 nodes.
-  L2.cloneFrom(L1, [&](const Node &N) { return &L2Nodes[N.Value]; });
-
-  // Add a node to L3 to be deleted, and then rebuild L3 by copying L1.
-  L3.push_back(new Node(7));
-  L3.cloneFrom(L1, [](const Node &N) { return new Node(N); });
-
-  EXPECT_EQ(2u, L1.size());
-  EXPECT_EQ(&L1Nodes[0], &L1.front());
-  EXPECT_EQ(&L1Nodes[1], &L1.back());
-  EXPECT_EQ(2u, L2.size());
-  EXPECT_EQ(&L2Nodes[0], &L2.front());
-  EXPECT_EQ(&L2Nodes[1], &L2.back());
-  EXPECT_EQ(2u, L3.size());
-  EXPECT_EQ(0, L3.front().Value);
-  EXPECT_EQ(1, L3.back().Value);
-
-  // Don't free nodes on the stack.
-  L1.clearAndLeakNodesUnsafely();
-  L2.clearAndLeakNodesUnsafely();
-}
-
-TEST(IListTest, SpliceOne) {
-  ilist<Node> List;
-  List.push_back(new Node(1));
-
-  // The single-element splice operation supports noops.
-  List.splice(List.begin(), List, List.begin());
-  EXPECT_EQ(1u, List.size());
-  EXPECT_EQ(1, List.front().Value);
-  EXPECT_TRUE(std::next(List.begin()) == List.end());
-
-  // Altenative noop. Move the first element behind itself.
-  List.push_back(new Node(2));
-  List.push_back(new Node(3));
-  List.splice(std::next(List.begin()), List, List.begin());
-  EXPECT_EQ(3u, List.size());
-  EXPECT_EQ(1, List.front().Value);
-  EXPECT_EQ(2, std::next(List.begin())->Value);
-  EXPECT_EQ(3, List.back().Value);
-}
-
-TEST(IListTest, SpliceSwap) {
-  ilist<Node> L;
-  Node N0(0);
-  Node N1(1);
-  L.insert(L.end(), &N0);
-  L.insert(L.end(), &N1);
-  EXPECT_EQ(0, L.front().Value);
-  EXPECT_EQ(1, L.back().Value);
-
-  L.splice(L.begin(), L, ++L.begin());
-  EXPECT_EQ(1, L.front().Value);
-  EXPECT_EQ(0, L.back().Value);
-
-  L.clearAndLeakNodesUnsafely();
-}
-
-TEST(IListTest, SpliceSwapOtherWay) {
-  ilist<Node> L;
-  Node N0(0);
-  Node N1(1);
-  L.insert(L.end(), &N0);
-  L.insert(L.end(), &N1);
-  EXPECT_EQ(0, L.front().Value);
-  EXPECT_EQ(1, L.back().Value);
-
-  L.splice(L.end(), L, L.begin());
-  EXPECT_EQ(1, L.front().Value);
-  EXPECT_EQ(0, L.back().Value);
-
-  L.clearAndLeakNodesUnsafely();
-}
-
-TEST(IListTest, UnsafeClear) {
-  ilist<Node> List;
-
-  // Before even allocating a sentinel.
-  List.clearAndLeakNodesUnsafely();
-  EXPECT_EQ(0u, List.size());
-
-  // Empty list with sentinel.
-  ilist<Node>::iterator E = List.end();
-  List.clearAndLeakNodesUnsafely();
-  EXPECT_EQ(0u, List.size());
-  // The sentinel shouldn't change.
-  EXPECT_TRUE(E == List.end());
-
-  // List with contents.
-  List.push_back(new Node(1));
-  ASSERT_EQ(1u, List.size());
-  Node *N = &*List.begin();
-  EXPECT_EQ(1, N->Value);
-  List.clearAndLeakNodesUnsafely();
-  EXPECT_EQ(0u, List.size());
-  ASSERT_EQ(1, N->Value);
-  delete N;
-
-  // List is still functional.
-  List.push_back(new Node(5));
-  List.push_back(new Node(6));
-  ASSERT_EQ(2u, List.size());
-  EXPECT_EQ(5, List.front().Value);
-  EXPECT_EQ(6, List.back().Value);
-}
-
-struct Empty {};
-TEST(IListTest, HasObsoleteCustomizationTrait) {
-  // Negative test for HasObsoleteCustomization.
-  static_assert(!ilist_detail::HasObsoleteCustomization<Empty, Node>::value,
-                "Empty has no customizations");
-}
-
-struct GetNext {
-  Node *getNext(Node *);
-};
-TEST(IListTest, HasGetNextTrait) {
-  static_assert(ilist_detail::HasGetNext<GetNext, Node>::value,
-                "GetNext has a getNext(Node*)");
-  static_assert(ilist_detail::HasObsoleteCustomization<GetNext, Node>::value,
-                "Empty should be obsolete because of getNext()");
-
-  // Negative test for HasGetNext.
-  static_assert(!ilist_detail::HasGetNext<Empty, Node>::value,
-                "Empty does not have a getNext(Node*)");
-}
-
-struct CreateSentinel {
-  Node *createSentinel();
-};
-TEST(IListTest, HasCreateSentinelTrait) {
-  static_assert(ilist_detail::HasCreateSentinel<CreateSentinel>::value,
-                "CreateSentinel has a getNext(Node*)");
-  static_assert(
-      ilist_detail::HasObsoleteCustomization<CreateSentinel, Node>::value,
-      "Empty should be obsolete because of createSentinel()");
-
-  // Negative test for HasCreateSentinel.
-  static_assert(!ilist_detail::HasCreateSentinel<Empty>::value,
-                "Empty does not have a createSentinel()");
-}
-
-struct NodeWithCallback : ilist_node<NodeWithCallback> {
-  int Value = 0;
-  bool IsInList = false;
-  bool WasTransferred = false;
-
-  NodeWithCallback() = default;
-  NodeWithCallback(int Value) : Value(Value) {}
-  NodeWithCallback(const NodeWithCallback &) = delete;
-};
-
-} // end namespace
-
-namespace llvm {
-// These nodes are stack-allocated for testing purposes, so don't let the ilist
-// own or delete them.
-template <> struct ilist_alloc_traits<NodeWithCallback> {
-  static void deleteNode(NodeWithCallback *) {}
-};
-
-template <> struct ilist_callback_traits<NodeWithCallback> {
-  void addNodeToList(NodeWithCallback *N) { N->IsInList = true; }
-  void removeNodeFromList(NodeWithCallback *N) { N->IsInList = false; }
-  template <class Iterator>
-  void transferNodesFromList(ilist_callback_traits &Other, Iterator First,
-                             Iterator Last) {
-    for (; First != Last; ++First) {
-      First->WasTransferred = true;
-      Other.removeNodeFromList(&*First);
-      addNodeToList(&*First);
-    }
-  }
-};
-} // end namespace llvm
-
-namespace {
-
-TEST(IListTest, addNodeToList) {
-  ilist<NodeWithCallback> L1, L2;
-  NodeWithCallback N(7);
-  ASSERT_FALSE(N.IsInList);
-  ASSERT_FALSE(N.WasTransferred);
-
-  L1.insert(L1.begin(), &N);
-  ASSERT_EQ(1u, L1.size());
-  ASSERT_EQ(&N, &L1.front());
-  ASSERT_TRUE(N.IsInList);
-  ASSERT_FALSE(N.WasTransferred);
-
-  L2.splice(L2.end(), L1);
-  ASSERT_EQ(&N, &L2.front());
-  ASSERT_TRUE(N.IsInList);
-  ASSERT_TRUE(N.WasTransferred);
-
-  L1.remove(&N);
-  ASSERT_EQ(0u, L1.size());
-  ASSERT_FALSE(N.IsInList);
-  ASSERT_TRUE(N.WasTransferred);
-}
-
-TEST(IListTest, sameListSplice) {
-  NodeWithCallback N1(1);
-  NodeWithCallback N2(2);
-  ASSERT_FALSE(N1.WasTransferred);
-  ASSERT_FALSE(N2.WasTransferred);
-
-  ilist<NodeWithCallback> L1;
-  L1.insert(L1.end(), &N1);
-  L1.insert(L1.end(), &N2);
-  ASSERT_EQ(2u, L1.size());
-  ASSERT_EQ(&N1, &L1.front());
-  ASSERT_FALSE(N1.WasTransferred);
-  ASSERT_FALSE(N2.WasTransferred);
-
-  // Swap the nodes with splice inside the same list. Check that we get the
-  // transfer callback.
-  L1.splice(L1.begin(), L1, std::next(L1.begin()), L1.end());
-  ASSERT_EQ(2u, L1.size());
-  ASSERT_EQ(&N1, &L1.back());
-  ASSERT_EQ(&N2, &L1.front());
-  ASSERT_FALSE(N1.WasTransferred);
-  ASSERT_TRUE(N2.WasTransferred);
-}
-
-struct PrivateNode : private ilist_node<PrivateNode> {
-  friend struct llvm::ilist_detail::NodeAccess;
-
-  int Value = 0;
-
-  PrivateNode() = default;
-  PrivateNode(int Value) : Value(Value) {}
-  PrivateNode(const PrivateNode &) = delete;
-};
-
-TEST(IListTest, privateNode) {
-  // Instantiate various APIs to be sure they're callable when ilist_node is
-  // inherited privately.
-  ilist<PrivateNode> L;
-  PrivateNode N(7);
-  L.insert(L.begin(), &N);
-  ++L.begin();
-  (void)*L.begin();
-  (void)(L.begin() == L.end());
-
-  ilist<PrivateNode> L2;
-  L2.splice(L2.end(), L);
-  L2.remove(&N);
-}
-
-} // end namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/ImmutableListTest.cpp b/gnu/llvm/llvm/unittests/ADT/ImmutableListTest.cpp
deleted file mode 100644
index 28624c0d551..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/ImmutableListTest.cpp
+++ /dev/null
@@ -1,272 +0,0 @@
-//===--------- ImmutableListTest.cpp - ImmutableList unit tests --*- C++ -*-==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/ImmutableList.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-template <typename Fundamental> struct Wrapper : llvm::FoldingSetNode {
-  Fundamental F;
-
-  Wrapper(Fundamental F) : F(F) {}
-
-  operator Fundamental() const { return F; }
-
-  void Profile(FoldingSetNodeID &ID) const { ID.AddInteger(F); }
-};
-
-class ImmutableListTest : public testing::Test {};
-
-void concat(const ImmutableList<Wrapper<char>> &L, char *Buffer) {
-  int Index = 0;
-  for (ImmutableList<Wrapper<char>>::iterator It = L.begin(), End = L.end();
-       It != End; ++It) {
-    Buffer[Index++] = *It;
-  }
-  Buffer[Index] = '\0';
-}
-
-TEST_F(ImmutableListTest, EmptyIntListTest) {
-  ImmutableList<Wrapper<int>>::Factory f;
-
-  EXPECT_TRUE(f.getEmptyList() == f.getEmptyList());
-  EXPECT_TRUE(f.getEmptyList().isEqual(f.getEmptyList()));
-  EXPECT_TRUE(f.getEmptyList().isEmpty());
-
-  ImmutableList<Wrapper<int>> L = f.getEmptyList();
-  EXPECT_EQ(nullptr, L.getTail().getInternalPointer());
-  EXPECT_TRUE(L.getTail().isEmpty());
-  EXPECT_TRUE(L.begin() == L.end());
-}
-
-TEST_F(ImmutableListTest, OneElemIntListTest) {
-  ImmutableList<Wrapper<int>>::Factory f;
-  ImmutableList<Wrapper<int>> L = f.getEmptyList();
-
-  ImmutableList<Wrapper<int>> L2 = f.add(3, L);
-  EXPECT_TRUE(L.isEmpty());
-  EXPECT_FALSE(L2.isEmpty());
-  EXPECT_TRUE(L2.getTail().isEmpty());
-
-  EXPECT_FALSE(L == L2);
-  EXPECT_TRUE(L == L2.getTail());
-  EXPECT_FALSE(L.isEqual(L2));
-  EXPECT_TRUE(L.isEqual(L2.getTail()));
-  EXPECT_FALSE(L2.begin() == L2.end());
-  EXPECT_TRUE(L2.begin() != L2.end());
-
-  EXPECT_FALSE(L.contains(3));
-  EXPECT_EQ(3, L2.getHead());
-  EXPECT_TRUE(L2.contains(3));
-
-  ImmutableList<Wrapper<int>> L3 = f.add(2, L);
-  EXPECT_TRUE(L.isEmpty());
-  EXPECT_FALSE(L3.isEmpty());
-  EXPECT_FALSE(L == L3);
-  EXPECT_FALSE(L.contains(2));
-  EXPECT_TRUE(L3.contains(2));
-  EXPECT_EQ(2, L3.getHead());
-
-  EXPECT_FALSE(L2 == L3);
-  EXPECT_FALSE(L2.contains(2));
-}
-
-// We'll store references to objects of this type.
-struct Unmodifiable {
-  Unmodifiable() = default;
-
-  // We'll delete all of these special member functions to make sure no copy or
-  // move happens during insertation.
-  Unmodifiable(const Unmodifiable &) = delete;
-  Unmodifiable(const Unmodifiable &&) = delete;
-  Unmodifiable &operator=(const Unmodifiable &) = delete;
-  Unmodifiable &operator=(const Unmodifiable &&) = delete;
-
-  void doNothing() const {}
-
-  void Profile(FoldingSetNodeID &ID) const { ID.AddPointer(this); }
-};
-
-// Mostly just a check whether ImmutableList::iterator can be instantiated
-// with a reference type as a template argument.
-TEST_F(ImmutableListTest, ReferenceStoringTest) {
-  ImmutableList<const Unmodifiable &>::Factory f;
-
-  Unmodifiable N;
-  ImmutableList<const Unmodifiable &> L = f.create(N);
-  for (ImmutableList<const Unmodifiable &>::iterator It = L.begin(),
-                                                     E = L.end();
-       It != E; ++It) {
-    It->doNothing();
-  }
-}
-
-TEST_F(ImmutableListTest, CreatingIntListTest) {
-  ImmutableList<Wrapper<int>>::Factory f;
-
-  ImmutableList<Wrapper<int>> L = f.getEmptyList();
-  ImmutableList<Wrapper<int>> L2 = f.create(3);
-
-  EXPECT_FALSE(L2.isEmpty());
-  EXPECT_TRUE(L2.getTail().isEmpty());
-  EXPECT_EQ(3, L2.getHead());
-  EXPECT_TRUE(L.isEqual(L2.getTail()));
-  EXPECT_TRUE(L2.getTail().isEqual(L));
-}
-
-TEST_F(ImmutableListTest, MultiElemIntListTest) {
-  ImmutableList<Wrapper<int>>::Factory f;
-
-  ImmutableList<Wrapper<int>> L = f.getEmptyList();
-  ImmutableList<Wrapper<int>> L2 = f.add(5, f.add(4, f.add(3, L)));
-  ImmutableList<Wrapper<int>> L3 = f.add(43, f.add(20, f.add(9, L2)));
-  ImmutableList<Wrapper<int>> L4 = f.add(9, L2);
-  ImmutableList<Wrapper<int>> L5 = f.add(9, L2);
-
-  EXPECT_TRUE(L.isEmpty());
-  EXPECT_FALSE(L2.isEmpty());
-  EXPECT_FALSE(L3.isEmpty());
-  EXPECT_FALSE(L4.isEmpty());
-
-  EXPECT_FALSE(L.contains(3));
-  EXPECT_FALSE(L.contains(9));
-
-  EXPECT_TRUE(L2.contains(3));
-  EXPECT_TRUE(L2.contains(4));
-  EXPECT_TRUE(L2.contains(5));
-  EXPECT_FALSE(L2.contains(9));
-  EXPECT_FALSE(L2.contains(0));
-
-  EXPECT_EQ(5, L2.getHead());
-  EXPECT_EQ(4, L2.getTail().getHead());
-  EXPECT_EQ(3, L2.getTail().getTail().getHead());
-
-  EXPECT_TRUE(L3.contains(43));
-  EXPECT_TRUE(L3.contains(20));
-  EXPECT_TRUE(L3.contains(9));
-  EXPECT_TRUE(L3.contains(3));
-  EXPECT_TRUE(L3.contains(4));
-  EXPECT_TRUE(L3.contains(5));
-  EXPECT_FALSE(L3.contains(0));
-
-  EXPECT_EQ(43, L3.getHead());
-  EXPECT_EQ(20, L3.getTail().getHead());
-  EXPECT_EQ(9, L3.getTail().getTail().getHead());
-
-  EXPECT_TRUE(L3.getTail().getTail().getTail() == L2);
-  EXPECT_TRUE(L2 == L3.getTail().getTail().getTail());
-  EXPECT_TRUE(L3.getTail().getTail().getTail().isEqual(L2));
-  EXPECT_TRUE(L2.isEqual(L3.getTail().getTail().getTail()));
-
-  EXPECT_TRUE(L4.contains(9));
-  EXPECT_TRUE(L4.contains(3));
-  EXPECT_TRUE(L4.contains(4));
-  EXPECT_TRUE(L4.contains(5));
-  EXPECT_FALSE(L4.contains(20));
-  EXPECT_FALSE(L4.contains(43));
-  EXPECT_TRUE(L4.isEqual(L4));
-  EXPECT_TRUE(L4.isEqual(L5));
-
-  EXPECT_TRUE(L5.isEqual(L4));
-  EXPECT_TRUE(L5.isEqual(L5));
-}
-
-template <typename Fundamental>
-struct ExplicitCtorWrapper : public Wrapper<Fundamental> {
-  explicit ExplicitCtorWrapper(Fundamental F) : Wrapper<Fundamental>(F) {}
-  ExplicitCtorWrapper(const ExplicitCtorWrapper &) = delete;
-  ExplicitCtorWrapper(ExplicitCtorWrapper &&) = default;
-  ExplicitCtorWrapper &operator=(const ExplicitCtorWrapper &) = delete;
-  ExplicitCtorWrapper &operator=(ExplicitCtorWrapper &&) = default;
-};
-
-TEST_F(ImmutableListTest, EmplaceIntListTest) {
-  ImmutableList<ExplicitCtorWrapper<int>>::Factory f;
-
-  ImmutableList<ExplicitCtorWrapper<int>> L = f.getEmptyList();
-  ImmutableList<ExplicitCtorWrapper<int>> L2 = f.emplace(L, 3);
-
-  ImmutableList<ExplicitCtorWrapper<int>> L3 =
-      f.add(ExplicitCtorWrapper<int>(2), L2);
-
-  ImmutableList<ExplicitCtorWrapper<int>> L4 =
-      f.emplace(L3, ExplicitCtorWrapper<int>(1));
-
-  ImmutableList<ExplicitCtorWrapper<int>> L5 =
-      f.add(ExplicitCtorWrapper<int>(1), L3);
-
-  EXPECT_FALSE(L2.isEmpty());
-  EXPECT_TRUE(L2.getTail().isEmpty());
-  EXPECT_EQ(3, L2.getHead());
-  EXPECT_TRUE(L.isEqual(L2.getTail()));
-  EXPECT_TRUE(L2.getTail().isEqual(L));
-
-  EXPECT_FALSE(L3.isEmpty());
-  EXPECT_FALSE(L2 == L3);
-  EXPECT_EQ(2, L3.getHead());
-  EXPECT_TRUE(L2 == L3.getTail());
-
-  EXPECT_FALSE(L4.isEmpty());
-  EXPECT_EQ(1, L4.getHead());
-  EXPECT_TRUE(L3 == L4.getTail());
-
-  EXPECT_TRUE(L4 == L5);
-  EXPECT_TRUE(L3 == L5.getTail());
-}
-
-TEST_F(ImmutableListTest, CharListOrderingTest) {
-  ImmutableList<Wrapper<char>>::Factory f;
-  ImmutableList<Wrapper<char>> L = f.getEmptyList();
-
-  ImmutableList<Wrapper<char>> L2 = f.add('i', f.add('e', f.add('a', L)));
-  ImmutableList<Wrapper<char>> L3 = f.add('u', f.add('o', L2));
-
-  char Buffer[10];
-  concat(L3, Buffer);
-
-  ASSERT_STREQ("uoiea", Buffer);
-}
-
-TEST_F(ImmutableListTest, LongListOrderingTest) {
-  ImmutableList<Wrapper<long>>::Factory f;
-  ImmutableList<Wrapper<long>> L = f.getEmptyList();
-
-  ImmutableList<Wrapper<long>> L2 = f.add(3, f.add(4, f.add(5, L)));
-  ImmutableList<Wrapper<long>> L3 = f.add(0, f.add(1, f.add(2, L2)));
-
-  int i = 0;
-  for (ImmutableList<Wrapper<long>>::iterator I = L.begin(), E = L.end();
-       I != E; ++I) {
-    i++;
-  }
-  ASSERT_EQ(0, i);
-
-  i = 3;
-  for (ImmutableList<Wrapper<long>>::iterator I = L2.begin(), E = L2.end();
-       I != E; ++I) {
-    ASSERT_EQ(i, *I);
-    i++;
-  }
-  ASSERT_EQ(6, i);
-
-  i = 0;
-  for (ImmutableList<Wrapper<long>>::iterator I = L3.begin(), E = L3.end();
-       I != E; ++I) {
-    ASSERT_EQ(i, *I);
-    i++;
-  }
-  ASSERT_EQ(6, i);
-}
-
-static_assert(std::is_trivially_copyable<ImmutableList<Wrapper<long>>>::value,
-              "trivially copyable");
-
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/ImmutableMapTest.cpp b/gnu/llvm/llvm/unittests/ADT/ImmutableMapTest.cpp
deleted file mode 100644
index 1217718826f..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/ImmutableMapTest.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-//===----------- ImmutableMapTest.cpp - ImmutableMap unit tests ------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/ImmutableMap.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST(ImmutableMapTest, EmptyIntMapTest) {
-  ImmutableMap<int, int>::Factory f;
-
-  EXPECT_TRUE(f.getEmptyMap() == f.getEmptyMap());
-  EXPECT_FALSE(f.getEmptyMap() != f.getEmptyMap());
-  EXPECT_TRUE(f.getEmptyMap().isEmpty());
-
-  ImmutableMap<int, int> S = f.getEmptyMap();
-  EXPECT_EQ(0u, S.getHeight());
-  EXPECT_TRUE(S.begin() == S.end());
-  EXPECT_FALSE(S.begin() != S.end());
-}
-
-TEST(ImmutableMapTest, MultiElemIntMapTest) {
-  ImmutableMap<int, int>::Factory f;
-  ImmutableMap<int, int> S = f.getEmptyMap();
-
-  ImmutableMap<int, int> S2 = f.add(f.add(f.add(S, 3, 10), 4, 11), 5, 12);
-
-  EXPECT_TRUE(S.isEmpty());
-  EXPECT_FALSE(S2.isEmpty());
-
-  EXPECT_EQ(nullptr, S.lookup(3));
-  EXPECT_EQ(nullptr, S.lookup(9));
-
-  EXPECT_EQ(10, *S2.lookup(3));
-  EXPECT_EQ(11, *S2.lookup(4));
-  EXPECT_EQ(12, *S2.lookup(5));
-
-  EXPECT_EQ(5, S2.getMaxElement()->first);
-  EXPECT_EQ(3U, S2.getHeight());
-}
-
-TEST(ImmutableMapTest, EmptyIntMapRefTest) {
-  using int_int_map = ImmutableMapRef<int, int>;
-  ImmutableMapRef<int, int>::FactoryTy f;
-
-  EXPECT_TRUE(int_int_map::getEmptyMap(&f) == int_int_map::getEmptyMap(&f));
-  EXPECT_FALSE(int_int_map::getEmptyMap(&f) != int_int_map::getEmptyMap(&f));
-  EXPECT_TRUE(int_int_map::getEmptyMap(&f).isEmpty());
-
-  int_int_map S = int_int_map::getEmptyMap(&f);
-  EXPECT_EQ(0u, S.getHeight());
-  EXPECT_TRUE(S.begin() == S.end());
-  EXPECT_FALSE(S.begin() != S.end());
-}
-
-TEST(ImmutableMapTest, MultiElemIntMapRefTest) {
-  ImmutableMapRef<int, int>::FactoryTy f;
-
-  ImmutableMapRef<int, int> S = ImmutableMapRef<int, int>::getEmptyMap(&f);
-
-  ImmutableMapRef<int, int> S2 = S.add(3, 10).add(4, 11).add(5, 12);
-
-  EXPECT_TRUE(S.isEmpty());
-  EXPECT_FALSE(S2.isEmpty());
-
-  EXPECT_EQ(nullptr, S.lookup(3));
-  EXPECT_EQ(nullptr, S.lookup(9));
-
-  EXPECT_EQ(10, *S2.lookup(3));
-  EXPECT_EQ(11, *S2.lookup(4));
-  EXPECT_EQ(12, *S2.lookup(5));
-
-  EXPECT_EQ(5, S2.getMaxElement()->first);
-  EXPECT_EQ(3U, S2.getHeight());
-}
-
-  TEST(ImmutableMapTest, MapOfMapRefsTest) {
-  ImmutableMap<int, ImmutableMapRef<int, int>>::Factory f;
-
-  EXPECT_TRUE(f.getEmptyMap() == f.getEmptyMap());
-  }
-
-}
diff --git a/gnu/llvm/llvm/unittests/ADT/ImmutableSetTest.cpp b/gnu/llvm/llvm/unittests/ADT/ImmutableSetTest.cpp
deleted file mode 100644
index e23cd2b3d1a..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/ImmutableSetTest.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-//===----------- ImmutableSetTest.cpp - ImmutableSet unit tests ------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/ImmutableSet.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-class ImmutableSetTest : public testing::Test {
-protected:
-  // for callback tests
-  static char buffer[10];
-
-  struct MyIter {
-    int counter;
-    char *ptr;
-
-    MyIter() : counter(0), ptr(buffer) {
-      for (unsigned i=0; i<sizeof(buffer);++i) buffer[i]='\0';
-    }
-    void operator()(char c) {
-      *ptr++ = c;
-      ++counter;
-    }
-  };
-};
-char ImmutableSetTest::buffer[10];
-
-
-TEST_F(ImmutableSetTest, EmptyIntSetTest) {
-  ImmutableSet<int>::Factory f;
-
-  EXPECT_TRUE(f.getEmptySet() == f.getEmptySet());
-  EXPECT_FALSE(f.getEmptySet() != f.getEmptySet());
-  EXPECT_TRUE(f.getEmptySet().isEmpty());
-
-  ImmutableSet<int> S = f.getEmptySet();
-  EXPECT_EQ(0u, S.getHeight());
-  EXPECT_TRUE(S.begin() == S.end());
-  EXPECT_FALSE(S.begin() != S.end());
-}
-
-
-TEST_F(ImmutableSetTest, OneElemIntSetTest) {
-  ImmutableSet<int>::Factory f;
-  ImmutableSet<int> S = f.getEmptySet();
-
-  ImmutableSet<int> S2 = f.add(S, 3);
-  EXPECT_TRUE(S.isEmpty());
-  EXPECT_FALSE(S2.isEmpty());
-  EXPECT_FALSE(S == S2);
-  EXPECT_TRUE(S != S2);
-  EXPECT_FALSE(S.contains(3));
-  EXPECT_TRUE(S2.contains(3));
-  EXPECT_FALSE(S2.begin() == S2.end());
-  EXPECT_TRUE(S2.begin() != S2.end());
-
-  ImmutableSet<int> S3 = f.add(S, 2);
-  EXPECT_TRUE(S.isEmpty());
-  EXPECT_FALSE(S3.isEmpty());
-  EXPECT_FALSE(S == S3);
-  EXPECT_TRUE(S != S3);
-  EXPECT_FALSE(S.contains(2));
-  EXPECT_TRUE(S3.contains(2));
-
-  EXPECT_FALSE(S2 == S3);
-  EXPECT_TRUE(S2 != S3);
-  EXPECT_FALSE(S2.contains(2));
-  EXPECT_FALSE(S3.contains(3));
-}
-
-TEST_F(ImmutableSetTest, MultiElemIntSetTest) {
-  ImmutableSet<int>::Factory f;
-  ImmutableSet<int> S = f.getEmptySet();
-
-  ImmutableSet<int> S2 = f.add(f.add(f.add(S, 3), 4), 5);
-  ImmutableSet<int> S3 = f.add(f.add(f.add(S2, 9), 20), 43);
-  ImmutableSet<int> S4 = f.add(S2, 9);
-
-  EXPECT_TRUE(S.isEmpty());
-  EXPECT_FALSE(S2.isEmpty());
-  EXPECT_FALSE(S3.isEmpty());
-  EXPECT_FALSE(S4.isEmpty());
-
-  EXPECT_FALSE(S.contains(3));
-  EXPECT_FALSE(S.contains(9));
-
-  EXPECT_TRUE(S2.contains(3));
-  EXPECT_TRUE(S2.contains(4));
-  EXPECT_TRUE(S2.contains(5));
-  EXPECT_FALSE(S2.contains(9));
-  EXPECT_FALSE(S2.contains(0));
-
-  EXPECT_TRUE(S3.contains(43));
-  EXPECT_TRUE(S3.contains(20));
-  EXPECT_TRUE(S3.contains(9));
-  EXPECT_TRUE(S3.contains(3));
-  EXPECT_TRUE(S3.contains(4));
-  EXPECT_TRUE(S3.contains(5));
-  EXPECT_FALSE(S3.contains(0));
-
-  EXPECT_TRUE(S4.contains(9));
-  EXPECT_TRUE(S4.contains(3));
-  EXPECT_TRUE(S4.contains(4));
-  EXPECT_TRUE(S4.contains(5));
-  EXPECT_FALSE(S4.contains(20));
-  EXPECT_FALSE(S4.contains(43));
-}
-
-TEST_F(ImmutableSetTest, RemoveIntSetTest) {
-  ImmutableSet<int>::Factory f;
-  ImmutableSet<int> S = f.getEmptySet();
-
-  ImmutableSet<int> S2 = f.add(f.add(S, 4), 5);
-  ImmutableSet<int> S3 = f.add(S2, 3);
-  ImmutableSet<int> S4 = f.remove(S3, 3);
-
-  EXPECT_TRUE(S3.contains(3));
-  EXPECT_FALSE(S2.contains(3));
-  EXPECT_FALSE(S4.contains(3));
-
-  EXPECT_TRUE(S2 == S4);
-  EXPECT_TRUE(S3 != S2);
-  EXPECT_TRUE(S3 != S4);
-
-  EXPECT_TRUE(S3.contains(4));
-  EXPECT_TRUE(S3.contains(5));
-
-  EXPECT_TRUE(S4.contains(4));
-  EXPECT_TRUE(S4.contains(5));
-}
-
-TEST_F(ImmutableSetTest, CallbackCharSetTest) {
-  ImmutableSet<char>::Factory f;
-  ImmutableSet<char> S = f.getEmptySet();
-
-  ImmutableSet<char> S2 = f.add(f.add(f.add(S, 'a'), 'e'), 'i');
-  ImmutableSet<char> S3 = f.add(f.add(S2, 'o'), 'u');
-
-  S3.foreach<MyIter>();
-
-  ASSERT_STREQ("aeiou", buffer);
-}
-
-TEST_F(ImmutableSetTest, Callback2CharSetTest) {
-  ImmutableSet<char>::Factory f;
-  ImmutableSet<char> S = f.getEmptySet();
-
-  ImmutableSet<char> S2 = f.add(f.add(f.add(S, 'b'), 'c'), 'd');
-  ImmutableSet<char> S3 = f.add(f.add(f.add(S2, 'f'), 'g'), 'h');
-
-  MyIter obj;
-  S3.foreach<MyIter>(obj);
-  ASSERT_STREQ("bcdfgh", buffer);
-  ASSERT_EQ(6, obj.counter);
-
-  MyIter obj2;
-  S2.foreach<MyIter>(obj2);
-  ASSERT_STREQ("bcd", buffer);
-  ASSERT_EQ(3, obj2.counter);
-
-  MyIter obj3;
-  S.foreach<MyIter>(obj);
-  ASSERT_STREQ("", buffer);
-  ASSERT_EQ(0, obj3.counter);
-}
-
-TEST_F(ImmutableSetTest, IterLongSetTest) {
-  ImmutableSet<long>::Factory f;
-  ImmutableSet<long> S = f.getEmptySet();
-
-  ImmutableSet<long> S2 = f.add(f.add(f.add(S, 0), 1), 2);
-  ImmutableSet<long> S3 = f.add(f.add(f.add(S2, 3), 4), 5);
-
-  int i = 0;
-  for (ImmutableSet<long>::iterator I = S.begin(), E = S.end(); I != E; ++I) {
-    i++;
-  }
-  ASSERT_EQ(0, i);
-
-  i = 0;
-  for (ImmutableSet<long>::iterator I = S2.begin(), E = S2.end(); I != E; ++I) {
-    ASSERT_EQ(i, *I);
-    i++;
-  }
-  ASSERT_EQ(3, i);
-
-  i = 0;
-  for (ImmutableSet<long>::iterator I = S3.begin(), E = S3.end(); I != E; I++) {
-    ASSERT_EQ(i, *I);
-    i++;
-  }
-  ASSERT_EQ(6, i);
-}
-
-}
diff --git a/gnu/llvm/llvm/unittests/ADT/IntEqClassesTest.cpp b/gnu/llvm/llvm/unittests/ADT/IntEqClassesTest.cpp
deleted file mode 100644
index 1c15d2c6f3c..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/IntEqClassesTest.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-//===---- ADT/IntEqClassesTest.cpp - IntEqClasses unit tests ----*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/IntEqClasses.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST(IntEqClasses, Simple) {
-  IntEqClasses ec(10);
-
-  ec.join(0, 1);
-  ec.join(3, 2);
-  ec.join(4, 5);
-  ec.join(7, 6);
-
-  EXPECT_EQ(0u, ec.findLeader(0));
-  EXPECT_EQ(0u, ec.findLeader(1));
-  EXPECT_EQ(2u, ec.findLeader(2));
-  EXPECT_EQ(2u, ec.findLeader(3));
-  EXPECT_EQ(4u, ec.findLeader(4));
-  EXPECT_EQ(4u, ec.findLeader(5));
-  EXPECT_EQ(6u, ec.findLeader(6));
-  EXPECT_EQ(6u, ec.findLeader(7));
-  EXPECT_EQ(8u, ec.findLeader(8));
-  EXPECT_EQ(9u, ec.findLeader(9));
-
-  // join two non-leaders.
-  ec.join(1, 3);
-
-  EXPECT_EQ(0u, ec.findLeader(0));
-  EXPECT_EQ(0u, ec.findLeader(1));
-  EXPECT_EQ(0u, ec.findLeader(2));
-  EXPECT_EQ(0u, ec.findLeader(3));
-  EXPECT_EQ(4u, ec.findLeader(4));
-  EXPECT_EQ(4u, ec.findLeader(5));
-  EXPECT_EQ(6u, ec.findLeader(6));
-  EXPECT_EQ(6u, ec.findLeader(7));
-  EXPECT_EQ(8u, ec.findLeader(8));
-  EXPECT_EQ(9u, ec.findLeader(9));
-
-  // join two leaders.
-  ec.join(4, 8);
-
-  EXPECT_EQ(0u, ec.findLeader(0));
-  EXPECT_EQ(0u, ec.findLeader(1));
-  EXPECT_EQ(0u, ec.findLeader(2));
-  EXPECT_EQ(0u, ec.findLeader(3));
-  EXPECT_EQ(4u, ec.findLeader(4));
-  EXPECT_EQ(4u, ec.findLeader(5));
-  EXPECT_EQ(6u, ec.findLeader(6));
-  EXPECT_EQ(6u, ec.findLeader(7));
-  EXPECT_EQ(4u, ec.findLeader(8));
-  EXPECT_EQ(9u, ec.findLeader(9));
-
-  // join mixed.
-  ec.join(9, 1);
-
-  EXPECT_EQ(0u, ec.findLeader(0));
-  EXPECT_EQ(0u, ec.findLeader(1));
-  EXPECT_EQ(0u, ec.findLeader(2));
-  EXPECT_EQ(0u, ec.findLeader(3));
-  EXPECT_EQ(4u, ec.findLeader(4));
-  EXPECT_EQ(4u, ec.findLeader(5));
-  EXPECT_EQ(6u, ec.findLeader(6));
-  EXPECT_EQ(6u, ec.findLeader(7));
-  EXPECT_EQ(4u, ec.findLeader(8));
-  EXPECT_EQ(0u, ec.findLeader(9));
-
-  // compressed map.
-  ec.compress();
-  EXPECT_EQ(3u, ec.getNumClasses());
-
-  EXPECT_EQ(0u, ec[0]);
-  EXPECT_EQ(0u, ec[1]);
-  EXPECT_EQ(0u, ec[2]);
-  EXPECT_EQ(0u, ec[3]);
-  EXPECT_EQ(1u, ec[4]);
-  EXPECT_EQ(1u, ec[5]);
-  EXPECT_EQ(2u, ec[6]);
-  EXPECT_EQ(2u, ec[7]);
-  EXPECT_EQ(1u, ec[8]);
-  EXPECT_EQ(0u, ec[9]);
-
-  // uncompressed map.
-  ec.uncompress();
-  EXPECT_EQ(0u, ec.findLeader(0));
-  EXPECT_EQ(0u, ec.findLeader(1));
-  EXPECT_EQ(0u, ec.findLeader(2));
-  EXPECT_EQ(0u, ec.findLeader(3));
-  EXPECT_EQ(4u, ec.findLeader(4));
-  EXPECT_EQ(4u, ec.findLeader(5));
-  EXPECT_EQ(6u, ec.findLeader(6));
-  EXPECT_EQ(6u, ec.findLeader(7));
-  EXPECT_EQ(4u, ec.findLeader(8));
-  EXPECT_EQ(0u, ec.findLeader(9));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/IntervalMapTest.cpp b/gnu/llvm/llvm/unittests/ADT/IntervalMapTest.cpp
deleted file mode 100644
index 65a9064cbc3..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/IntervalMapTest.cpp
+++ /dev/null
@@ -1,816 +0,0 @@
-//===---- ADT/IntervalMapTest.cpp - IntervalMap unit tests ------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/IntervalMap.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-typedef IntervalMap<unsigned, unsigned, 4> UUMap;
-typedef IntervalMap<unsigned, unsigned, 4,
-                    IntervalMapHalfOpenInfo<unsigned>> UUHalfOpenMap;
-
-// Empty map tests
-TEST(IntervalMapTest, EmptyMap) {
-  UUMap::Allocator allocator;
-  UUMap map(allocator);
-  EXPECT_TRUE(map.empty());
-
-  // Lookup on empty map.
-  EXPECT_EQ(0u, map.lookup(0));
-  EXPECT_EQ(7u, map.lookup(0, 7));
-  EXPECT_EQ(0u, map.lookup(~0u-1));
-  EXPECT_EQ(7u, map.lookup(~0u-1, 7));
-
-  // Iterators.
-  EXPECT_TRUE(map.begin() == map.begin());
-  EXPECT_TRUE(map.begin() == map.end());
-  EXPECT_TRUE(map.end() == map.end());
-  EXPECT_FALSE(map.begin() != map.begin());
-  EXPECT_FALSE(map.begin() != map.end());
-  EXPECT_FALSE(map.end() != map.end());
-  EXPECT_FALSE(map.begin().valid());
-  EXPECT_FALSE(map.end().valid());
-  UUMap::iterator I = map.begin();
-  EXPECT_FALSE(I.valid());
-  EXPECT_TRUE(I == map.end());
-
-  // Default constructor and cross-constness compares.
-  UUMap::const_iterator CI;
-  CI = map.begin();
-  EXPECT_TRUE(CI == I);
-  UUMap::iterator I2;
-  I2 = map.end();
-  EXPECT_TRUE(I2 == CI);
-}
-
-// Test one-element closed ranges.
-TEST(IntervalMapTest, OneElementRanges) {
-  UUMap::Allocator allocator;
-  UUMap map(allocator);
-  map.insert(1, 1, 1);
-  map.insert(2, 2, 2);
-  EXPECT_EQ(1u, map.lookup(1));
-  EXPECT_EQ(2u, map.lookup(2));
-}
-
-// Single entry map tests
-TEST(IntervalMapTest, SingleEntryMap) {
-  UUMap::Allocator allocator;
-  UUMap map(allocator);
-  map.insert(100, 150, 1);
-  EXPECT_FALSE(map.empty());
-
-  // Lookup around interval.
-  EXPECT_EQ(0u, map.lookup(0));
-  EXPECT_EQ(0u, map.lookup(99));
-  EXPECT_EQ(1u, map.lookup(100));
-  EXPECT_EQ(1u, map.lookup(101));
-  EXPECT_EQ(1u, map.lookup(125));
-  EXPECT_EQ(1u, map.lookup(149));
-  EXPECT_EQ(1u, map.lookup(150));
-  EXPECT_EQ(0u, map.lookup(151));
-  EXPECT_EQ(0u, map.lookup(200));
-  EXPECT_EQ(0u, map.lookup(~0u-1));
-
-  // Iterators.
-  EXPECT_TRUE(map.begin() == map.begin());
-  EXPECT_FALSE(map.begin() == map.end());
-  EXPECT_TRUE(map.end() == map.end());
-  EXPECT_TRUE(map.begin().valid());
-  EXPECT_FALSE(map.end().valid());
-
-  // Iter deref.
-  UUMap::iterator I = map.begin();
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(100u, I.start());
-  EXPECT_EQ(150u, I.stop());
-  EXPECT_EQ(1u, I.value());
-
-  // Preincrement.
-  ++I;
-  EXPECT_FALSE(I.valid());
-  EXPECT_FALSE(I == map.begin());
-  EXPECT_TRUE(I == map.end());
-
-  // PreDecrement.
-  --I;
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(100u, I.start());
-  EXPECT_EQ(150u, I.stop());
-  EXPECT_EQ(1u, I.value());
-  EXPECT_TRUE(I == map.begin());
-  EXPECT_FALSE(I == map.end());
-
-  // Change the value.
-  I.setValue(2);
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(100u, I.start());
-  EXPECT_EQ(150u, I.stop());
-  EXPECT_EQ(2u, I.value());
-
-  // Grow the bounds.
-  I.setStart(0);
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(0u, I.start());
-  EXPECT_EQ(150u, I.stop());
-  EXPECT_EQ(2u, I.value());
-
-  I.setStop(200);
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(0u, I.start());
-  EXPECT_EQ(200u, I.stop());
-  EXPECT_EQ(2u, I.value());
-
-  // Shrink the bounds.
-  I.setStart(150);
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(150u, I.start());
-  EXPECT_EQ(200u, I.stop());
-  EXPECT_EQ(2u, I.value());
-
-  // Shrink the interval to have a length of 1
-  I.setStop(150);
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(150u, I.start());
-  EXPECT_EQ(150u, I.stop());
-  EXPECT_EQ(2u, I.value());
-
-  I.setStop(160);
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(150u, I.start());
-  EXPECT_EQ(160u, I.stop());
-  EXPECT_EQ(2u, I.value());
-
-  // Shrink the interval to have a length of 1
-  I.setStart(160);
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(160u, I.start());
-  EXPECT_EQ(160u, I.stop());
-  EXPECT_EQ(2u, I.value());
-
-  // Erase last elem.
-  I.erase();
-  EXPECT_TRUE(map.empty());
-  EXPECT_EQ(0, std::distance(map.begin(), map.end()));
-}
-
-// Single entry half-open map tests
-TEST(IntervalMapTest, SingleEntryHalfOpenMap) {
-  UUHalfOpenMap::Allocator allocator;
-  UUHalfOpenMap map(allocator);
-  map.insert(100, 150, 1);
-  EXPECT_FALSE(map.empty());
-
-  UUHalfOpenMap::iterator I = map.begin();
-  ASSERT_TRUE(I.valid());
-
-  // Shrink the interval to have a length of 1
-  I.setStart(149);
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(149u, I.start());
-  EXPECT_EQ(150u, I.stop());
-  EXPECT_EQ(1u, I.value());
-
-  I.setStop(160);
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(149u, I.start());
-  EXPECT_EQ(160u, I.stop());
-  EXPECT_EQ(1u, I.value());
-
-  // Shrink the interval to have a length of 1
-  I.setStop(150);
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(149u, I.start());
-  EXPECT_EQ(150u, I.stop());
-  EXPECT_EQ(1u, I.value());
-}
-
-// Flat coalescing tests.
-TEST(IntervalMapTest, RootCoalescing) {
-  UUMap::Allocator allocator;
-  UUMap map(allocator);
-  map.insert(100, 150, 1);
-
-  // Coalesce from the left.
-  map.insert(90, 99, 1);
-  EXPECT_EQ(1, std::distance(map.begin(), map.end()));
-  EXPECT_EQ(90u, map.start());
-  EXPECT_EQ(150u, map.stop());
-
-  // Coalesce from the right.
-  map.insert(151, 200, 1);
-  EXPECT_EQ(1, std::distance(map.begin(), map.end()));
-  EXPECT_EQ(90u, map.start());
-  EXPECT_EQ(200u, map.stop());
-
-  // Non-coalesce from the left.
-  map.insert(60, 89, 2);
-  EXPECT_EQ(2, std::distance(map.begin(), map.end()));
-  EXPECT_EQ(60u, map.start());
-  EXPECT_EQ(200u, map.stop());
-  EXPECT_EQ(2u, map.lookup(89));
-  EXPECT_EQ(1u, map.lookup(90));
-
-  UUMap::iterator I = map.begin();
-  EXPECT_EQ(60u, I.start());
-  EXPECT_EQ(89u, I.stop());
-  EXPECT_EQ(2u, I.value());
-  ++I;
-  EXPECT_EQ(90u, I.start());
-  EXPECT_EQ(200u, I.stop());
-  EXPECT_EQ(1u, I.value());
-  ++I;
-  EXPECT_FALSE(I.valid());
-
-  // Non-coalesce from the right.
-  map.insert(201, 210, 2);
-  EXPECT_EQ(3, std::distance(map.begin(), map.end()));
-  EXPECT_EQ(60u, map.start());
-  EXPECT_EQ(210u, map.stop());
-  EXPECT_EQ(2u, map.lookup(201));
-  EXPECT_EQ(1u, map.lookup(200));
-
-  // Erase from the left.
-  map.begin().erase();
-  EXPECT_EQ(2, std::distance(map.begin(), map.end()));
-  EXPECT_EQ(90u, map.start());
-  EXPECT_EQ(210u, map.stop());
-
-  // Erase from the right.
-  (--map.end()).erase();
-  EXPECT_EQ(1, std::distance(map.begin(), map.end()));
-  EXPECT_EQ(90u, map.start());
-  EXPECT_EQ(200u, map.stop());
-
-  // Add non-coalescing, then trigger coalescing with setValue.
-  map.insert(80, 89, 2);
-  map.insert(201, 210, 2);
-  EXPECT_EQ(3, std::distance(map.begin(), map.end()));
-  (++map.begin()).setValue(2);
-  EXPECT_EQ(1, std::distance(map.begin(), map.end()));
-  I = map.begin();
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(80u, I.start());
-  EXPECT_EQ(210u, I.stop());
-  EXPECT_EQ(2u, I.value());
-}
-
-// Flat multi-coalescing tests.
-TEST(IntervalMapTest, RootMultiCoalescing) {
-  UUMap::Allocator allocator;
-  UUMap map(allocator);
-  map.insert(140, 150, 1);
-  map.insert(160, 170, 1);
-  map.insert(100, 110, 1);
-  map.insert(120, 130, 1);
-  EXPECT_EQ(4, std::distance(map.begin(), map.end()));
-  EXPECT_EQ(100u, map.start());
-  EXPECT_EQ(170u, map.stop());
-
-  // Verify inserts.
-  UUMap::iterator I = map.begin();
-  EXPECT_EQ(100u, I.start());
-  EXPECT_EQ(110u, I.stop());
-  ++I;
-  EXPECT_EQ(120u, I.start());
-  EXPECT_EQ(130u, I.stop());
-  ++I;
-  EXPECT_EQ(140u, I.start());
-  EXPECT_EQ(150u, I.stop());
-  ++I;
-  EXPECT_EQ(160u, I.start());
-  EXPECT_EQ(170u, I.stop());
-  ++I;
-  EXPECT_FALSE(I.valid());
-
-  // Test advanceTo on flat tree.
-  I = map.begin();
-  I.advanceTo(135);
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(140u, I.start());
-  EXPECT_EQ(150u, I.stop());
-
-  I.advanceTo(145);
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(140u, I.start());
-  EXPECT_EQ(150u, I.stop());
-
-  I.advanceTo(200);
-  EXPECT_FALSE(I.valid());
-
-  I.advanceTo(300);
-  EXPECT_FALSE(I.valid());
-
-  // Coalesce left with followers.
-  // [100;110] [120;130] [140;150] [160;170]
-  map.insert(111, 115, 1);
-  I = map.begin();
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(100u, I.start());
-  EXPECT_EQ(115u, I.stop());
-  ++I;
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(120u, I.start());
-  EXPECT_EQ(130u, I.stop());
-  ++I;
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(140u, I.start());
-  EXPECT_EQ(150u, I.stop());
-  ++I;
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(160u, I.start());
-  EXPECT_EQ(170u, I.stop());
-  ++I;
-  EXPECT_FALSE(I.valid());
-
-  // Coalesce right with followers.
-  // [100;115] [120;130] [140;150] [160;170]
-  map.insert(135, 139, 1);
-  I = map.begin();
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(100u, I.start());
-  EXPECT_EQ(115u, I.stop());
-  ++I;
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(120u, I.start());
-  EXPECT_EQ(130u, I.stop());
-  ++I;
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(135u, I.start());
-  EXPECT_EQ(150u, I.stop());
-  ++I;
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(160u, I.start());
-  EXPECT_EQ(170u, I.stop());
-  ++I;
-  EXPECT_FALSE(I.valid());
-
-  // Coalesce left and right with followers.
-  // [100;115] [120;130] [135;150] [160;170]
-  map.insert(131, 134, 1);
-  I = map.begin();
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(100u, I.start());
-  EXPECT_EQ(115u, I.stop());
-  ++I;
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(120u, I.start());
-  EXPECT_EQ(150u, I.stop());
-  ++I;
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(160u, I.start());
-  EXPECT_EQ(170u, I.stop());
-  ++I;
-  EXPECT_FALSE(I.valid());
-
-  // Test clear() on non-branched map.
-  map.clear();
-  EXPECT_TRUE(map.empty());
-  EXPECT_TRUE(map.begin() == map.end());
-}
-
-// Branched, non-coalescing tests.
-TEST(IntervalMapTest, Branched) {
-  UUMap::Allocator allocator;
-  UUMap map(allocator);
-
-  // Insert enough intervals to force a branched tree.
-  // This creates 9 leaf nodes with 11 elements each, tree height = 1.
-  for (unsigned i = 1; i < 100; ++i) {
-    map.insert(10*i, 10*i+5, i);
-    EXPECT_EQ(10u, map.start());
-    EXPECT_EQ(10*i+5, map.stop());
-  }
-
-  // Tree limits.
-  EXPECT_FALSE(map.empty());
-  EXPECT_EQ(10u, map.start());
-  EXPECT_EQ(995u, map.stop());
-
-  // Tree lookup.
-  for (unsigned i = 1; i < 100; ++i) {
-    EXPECT_EQ(0u, map.lookup(10*i-1));
-    EXPECT_EQ(i, map.lookup(10*i));
-    EXPECT_EQ(i, map.lookup(10*i+5));
-    EXPECT_EQ(0u, map.lookup(10*i+6));
-  }
-
-  // Forward iteration.
-  UUMap::iterator I = map.begin();
-  for (unsigned i = 1; i < 100; ++i) {
-    ASSERT_TRUE(I.valid());
-    EXPECT_EQ(10*i, I.start());
-    EXPECT_EQ(10*i+5, I.stop());
-    EXPECT_EQ(i, *I);
-    ++I;
-  }
-  EXPECT_FALSE(I.valid());
-  EXPECT_TRUE(I == map.end());
-
-  // Backwards iteration.
-  for (unsigned i = 99; i; --i) {
-    --I;
-    ASSERT_TRUE(I.valid());
-    EXPECT_EQ(10*i, I.start());
-    EXPECT_EQ(10*i+5, I.stop());
-    EXPECT_EQ(i, *I);
-  }
-  EXPECT_TRUE(I == map.begin());
-
-  // Test advanceTo in same node.
-  I.advanceTo(20);
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(20u, I.start());
-  EXPECT_EQ(25u, I.stop());
-
-  // Change value, no coalescing.
-  I.setValue(0);
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(20u, I.start());
-  EXPECT_EQ(25u, I.stop());
-  EXPECT_EQ(0u, I.value());
-
-  // Close the gap right, no coalescing.
-  I.setStop(29);
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(20u, I.start());
-  EXPECT_EQ(29u, I.stop());
-  EXPECT_EQ(0u, I.value());
-
-  // Change value, no coalescing.
-  I.setValue(2);
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(20u, I.start());
-  EXPECT_EQ(29u, I.stop());
-  EXPECT_EQ(2u, I.value());
-
-  // Change value, now coalescing.
-  I.setValue(3);
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(20u, I.start());
-  EXPECT_EQ(35u, I.stop());
-  EXPECT_EQ(3u, I.value());
-
-  // Close the gap, now coalescing.
-  I.setValue(4);
-  ASSERT_TRUE(I.valid());
-  I.setStop(39);
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(20u, I.start());
-  EXPECT_EQ(45u, I.stop());
-  EXPECT_EQ(4u, I.value());
-
-  // advanceTo another node.
-  I.advanceTo(200);
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(200u, I.start());
-  EXPECT_EQ(205u, I.stop());
-
-  // Close the gap left, no coalescing.
-  I.setStart(196);
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(196u, I.start());
-  EXPECT_EQ(205u, I.stop());
-  EXPECT_EQ(20u, I.value());
-
-  // Change value, no coalescing.
-  I.setValue(0);
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(196u, I.start());
-  EXPECT_EQ(205u, I.stop());
-  EXPECT_EQ(0u, I.value());
-
-  // Change value, now coalescing.
-  I.setValue(19);
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(190u, I.start());
-  EXPECT_EQ(205u, I.stop());
-  EXPECT_EQ(19u, I.value());
-
-  // Close the gap, now coalescing.
-  I.setValue(18);
-  ASSERT_TRUE(I.valid());
-  I.setStart(186);
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(180u, I.start());
-  EXPECT_EQ(205u, I.stop());
-  EXPECT_EQ(18u, I.value());
-
-  // Erase from the front.
-  I = map.begin();
-  for (unsigned i = 0; i != 20; ++i) {
-    I.erase();
-    EXPECT_TRUE(I == map.begin());
-    EXPECT_FALSE(map.empty());
-    EXPECT_EQ(I.start(), map.start());
-    EXPECT_EQ(995u, map.stop());
-  }
-
-  // Test clear() on branched map.
-  map.clear();
-  EXPECT_TRUE(map.empty());
-  EXPECT_TRUE(map.begin() == map.end());
-}
-
-// Branched, high, non-coalescing tests.
-TEST(IntervalMapTest, Branched2) {
-  UUMap::Allocator allocator;
-  UUMap map(allocator);
-
-  // Insert enough intervals to force a height >= 2 tree.
-  for (unsigned i = 1; i < 1000; ++i)
-    map.insert(10*i, 10*i+5, i);
-
-  // Tree limits.
-  EXPECT_FALSE(map.empty());
-  EXPECT_EQ(10u, map.start());
-  EXPECT_EQ(9995u, map.stop());
-
-  // Tree lookup.
-  for (unsigned i = 1; i < 1000; ++i) {
-    EXPECT_EQ(0u, map.lookup(10*i-1));
-    EXPECT_EQ(i, map.lookup(10*i));
-    EXPECT_EQ(i, map.lookup(10*i+5));
-    EXPECT_EQ(0u, map.lookup(10*i+6));
-  }
-
-  // Forward iteration.
-  UUMap::iterator I = map.begin();
-  for (unsigned i = 1; i < 1000; ++i) {
-    ASSERT_TRUE(I.valid());
-    EXPECT_EQ(10*i, I.start());
-    EXPECT_EQ(10*i+5, I.stop());
-    EXPECT_EQ(i, *I);
-    ++I;
-  }
-  EXPECT_FALSE(I.valid());
-  EXPECT_TRUE(I == map.end());
-
-  // Backwards iteration.
-  for (unsigned i = 999; i; --i) {
-    --I;
-    ASSERT_TRUE(I.valid());
-    EXPECT_EQ(10*i, I.start());
-    EXPECT_EQ(10*i+5, I.stop());
-    EXPECT_EQ(i, *I);
-  }
-  EXPECT_TRUE(I == map.begin());
-
-  // Test advanceTo in same node.
-  I.advanceTo(20);
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(20u, I.start());
-  EXPECT_EQ(25u, I.stop());
-
-  // advanceTo sibling leaf node.
-  I.advanceTo(200);
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(200u, I.start());
-  EXPECT_EQ(205u, I.stop());
-
-  // advanceTo further.
-  I.advanceTo(2000);
-  ASSERT_TRUE(I.valid());
-  EXPECT_EQ(2000u, I.start());
-  EXPECT_EQ(2005u, I.stop());
-
-  // advanceTo beyond end()
-  I.advanceTo(20000);
-  EXPECT_FALSE(I.valid());
-
-  // end().advanceTo() is valid as long as x > map.stop()
-  I.advanceTo(30000);
-  EXPECT_FALSE(I.valid());
-
-  // Test clear() on branched map.
-  map.clear();
-  EXPECT_TRUE(map.empty());
-  EXPECT_TRUE(map.begin() == map.end());
-}
-
-// Random insertions, coalescing to a single interval.
-TEST(IntervalMapTest, RandomCoalescing) {
-  UUMap::Allocator allocator;
-  UUMap map(allocator);
-
-  // This is a poor PRNG with maximal period:
-  // x_n = 5 x_{n-1} + 1 mod 2^N
-
-  unsigned x = 100;
-  for (unsigned i = 0; i != 4096; ++i) {
-    map.insert(10*x, 10*x+9, 1);
-    EXPECT_GE(10*x, map.start());
-    EXPECT_LE(10*x+9, map.stop());
-    x = (5*x+1)%4096;
-  }
-
-  // Map should be fully coalesced after that exercise.
-  EXPECT_FALSE(map.empty());
-  EXPECT_EQ(0u, map.start());
-  EXPECT_EQ(40959u, map.stop());
-  EXPECT_EQ(1, std::distance(map.begin(), map.end()));
-
-}
-
-TEST(IntervalMapTest, Overlaps) {
-  UUMap::Allocator allocator;
-  UUMap map(allocator);
-  map.insert(10, 20, 0);
-  map.insert(30, 40, 0);
-  map.insert(50, 60, 0);
-
-  EXPECT_FALSE(map.overlaps(0, 9));
-  EXPECT_TRUE(map.overlaps(0, 10));
-  EXPECT_TRUE(map.overlaps(0, 15));
-  EXPECT_TRUE(map.overlaps(0, 25));
-  EXPECT_TRUE(map.overlaps(0, 45));
-  EXPECT_TRUE(map.overlaps(10, 45));
-  EXPECT_TRUE(map.overlaps(30, 45));
-  EXPECT_TRUE(map.overlaps(35, 36));
-  EXPECT_TRUE(map.overlaps(40, 45));
-  EXPECT_FALSE(map.overlaps(45, 45));
-  EXPECT_TRUE(map.overlaps(60, 60));
-  EXPECT_TRUE(map.overlaps(60, 66));
-  EXPECT_FALSE(map.overlaps(66, 66));
-}
-
-TEST(IntervalMapTest, OverlapsHalfOpen) {
-  UUHalfOpenMap::Allocator allocator;
-  UUHalfOpenMap map(allocator);
-  map.insert(10, 20, 0);
-  map.insert(30, 40, 0);
-  map.insert(50, 60, 0);
-
-  EXPECT_FALSE(map.overlaps(0, 9));
-  EXPECT_FALSE(map.overlaps(0, 10));
-  EXPECT_TRUE(map.overlaps(0, 15));
-  EXPECT_TRUE(map.overlaps(0, 25));
-  EXPECT_TRUE(map.overlaps(0, 45));
-  EXPECT_TRUE(map.overlaps(10, 45));
-  EXPECT_TRUE(map.overlaps(30, 45));
-  EXPECT_TRUE(map.overlaps(35, 36));
-  EXPECT_FALSE(map.overlaps(40, 45));
-  EXPECT_FALSE(map.overlaps(45, 46));
-  EXPECT_FALSE(map.overlaps(60, 61));
-  EXPECT_FALSE(map.overlaps(60, 66));
-  EXPECT_FALSE(map.overlaps(66, 67));
-}
-
-TEST(IntervalMapOverlapsTest, SmallMaps) {
-  typedef IntervalMapOverlaps<UUMap,UUMap> UUOverlaps;
-  UUMap::Allocator allocator;
-  UUMap mapA(allocator);
-  UUMap mapB(allocator);
-
-  // empty, empty.
-  EXPECT_FALSE(UUOverlaps(mapA, mapB).valid());
-
-  mapA.insert(1, 2, 3);
-
-  // full, empty
-  EXPECT_FALSE(UUOverlaps(mapA, mapB).valid());
-  // empty, full
-  EXPECT_FALSE(UUOverlaps(mapB, mapA).valid());
-
-  mapB.insert(3, 4, 5);
-
-  // full, full, non-overlapping
-  EXPECT_FALSE(UUOverlaps(mapA, mapB).valid());
-  EXPECT_FALSE(UUOverlaps(mapB, mapA).valid());
-
-  // Add an overlapping segment.
-  mapA.insert(4, 5, 6);
-
-  UUOverlaps AB(mapA, mapB);
-  ASSERT_TRUE(AB.valid());
-  EXPECT_EQ(4u, AB.a().start());
-  EXPECT_EQ(3u, AB.b().start());
-  ++AB;
-  EXPECT_FALSE(AB.valid());
-
-  UUOverlaps BA(mapB, mapA);
-  ASSERT_TRUE(BA.valid());
-  EXPECT_EQ(3u, BA.a().start());
-  EXPECT_EQ(4u, BA.b().start());
-  // advance past end.
-  BA.advanceTo(6);
-  EXPECT_FALSE(BA.valid());
-  // advance an invalid iterator.
-  BA.advanceTo(7);
-  EXPECT_FALSE(BA.valid());
-}
-
-TEST(IntervalMapOverlapsTest, BigMaps) {
-  typedef IntervalMapOverlaps<UUMap,UUMap> UUOverlaps;
-  UUMap::Allocator allocator;
-  UUMap mapA(allocator);
-  UUMap mapB(allocator);
-
-  // [0;4] [10;14] [20;24] ...
-  for (unsigned n = 0; n != 100; ++n)
-    mapA.insert(10*n, 10*n+4, n);
-
-  // [5;6] [15;16] [25;26] ...
-  for (unsigned n = 10; n != 20; ++n)
-    mapB.insert(10*n+5, 10*n+6, n);
-
-  // [208;209] [218;219] ...
-  for (unsigned n = 20; n != 30; ++n)
-    mapB.insert(10*n+8, 10*n+9, n);
-
-  // insert some overlapping segments.
-  mapB.insert(400, 400, 400);
-  mapB.insert(401, 401, 401);
-  mapB.insert(402, 500, 402);
-  mapB.insert(600, 601, 402);
-
-  UUOverlaps AB(mapA, mapB);
-  ASSERT_TRUE(AB.valid());
-  EXPECT_EQ(400u, AB.a().start());
-  EXPECT_EQ(400u, AB.b().start());
-  ++AB;
-  ASSERT_TRUE(AB.valid());
-  EXPECT_EQ(400u, AB.a().start());
-  EXPECT_EQ(401u, AB.b().start());
-  ++AB;
-  ASSERT_TRUE(AB.valid());
-  EXPECT_EQ(400u, AB.a().start());
-  EXPECT_EQ(402u, AB.b().start());
-  ++AB;
-  ASSERT_TRUE(AB.valid());
-  EXPECT_EQ(410u, AB.a().start());
-  EXPECT_EQ(402u, AB.b().start());
-  ++AB;
-  ASSERT_TRUE(AB.valid());
-  EXPECT_EQ(420u, AB.a().start());
-  EXPECT_EQ(402u, AB.b().start());
-  AB.skipB();
-  ASSERT_TRUE(AB.valid());
-  EXPECT_EQ(600u, AB.a().start());
-  EXPECT_EQ(600u, AB.b().start());
-  ++AB;
-  EXPECT_FALSE(AB.valid());
-
-  // Test advanceTo.
-  UUOverlaps AB2(mapA, mapB);
-  AB2.advanceTo(410);
-  ASSERT_TRUE(AB2.valid());
-  EXPECT_EQ(410u, AB2.a().start());
-  EXPECT_EQ(402u, AB2.b().start());
-
-  // It is valid to advanceTo with any monotonic sequence.
-  AB2.advanceTo(411);
-  ASSERT_TRUE(AB2.valid());
-  EXPECT_EQ(410u, AB2.a().start());
-  EXPECT_EQ(402u, AB2.b().start());
-
-  // Check reversed maps.
-  UUOverlaps BA(mapB, mapA);
-  ASSERT_TRUE(BA.valid());
-  EXPECT_EQ(400u, BA.b().start());
-  EXPECT_EQ(400u, BA.a().start());
-  ++BA;
-  ASSERT_TRUE(BA.valid());
-  EXPECT_EQ(400u, BA.b().start());
-  EXPECT_EQ(401u, BA.a().start());
-  ++BA;
-  ASSERT_TRUE(BA.valid());
-  EXPECT_EQ(400u, BA.b().start());
-  EXPECT_EQ(402u, BA.a().start());
-  ++BA;
-  ASSERT_TRUE(BA.valid());
-  EXPECT_EQ(410u, BA.b().start());
-  EXPECT_EQ(402u, BA.a().start());
-  ++BA;
-  ASSERT_TRUE(BA.valid());
-  EXPECT_EQ(420u, BA.b().start());
-  EXPECT_EQ(402u, BA.a().start());
-  BA.skipA();
-  ASSERT_TRUE(BA.valid());
-  EXPECT_EQ(600u, BA.b().start());
-  EXPECT_EQ(600u, BA.a().start());
-  ++BA;
-  EXPECT_FALSE(BA.valid());
-
-  // Test advanceTo.
-  UUOverlaps BA2(mapB, mapA);
-  BA2.advanceTo(410);
-  ASSERT_TRUE(BA2.valid());
-  EXPECT_EQ(410u, BA2.b().start());
-  EXPECT_EQ(402u, BA2.a().start());
-
-  BA2.advanceTo(411);
-  ASSERT_TRUE(BA2.valid());
-  EXPECT_EQ(410u, BA2.b().start());
-  EXPECT_EQ(402u, BA2.a().start());
-}
-
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/IntrusiveRefCntPtrTest.cpp b/gnu/llvm/llvm/unittests/ADT/IntrusiveRefCntPtrTest.cpp
deleted file mode 100644
index e4b649837f6..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/IntrusiveRefCntPtrTest.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-//===- unittest/ADT/IntrusiveRefCntPtrTest.cpp ----------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/IntrusiveRefCntPtr.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-
-namespace {
-int NumInstances = 0;
-template <template <typename> class Base>
-struct SimpleRefCounted : Base<SimpleRefCounted<Base>> {
-  SimpleRefCounted() { ++NumInstances; }
-  SimpleRefCounted(const SimpleRefCounted &RHS) : Base<SimpleRefCounted>(RHS) {
-    ++NumInstances;
-  }
-  ~SimpleRefCounted() { --NumInstances; }
-};
-} // anonymous namespace
-
-template <typename T> struct IntrusiveRefCntPtrTest : testing::Test {};
-
-typedef ::testing::Types<SimpleRefCounted<RefCountedBase>,
-                         SimpleRefCounted<ThreadSafeRefCountedBase>>
-    IntrusiveRefCntTypes;
-TYPED_TEST_SUITE(IntrusiveRefCntPtrTest, IntrusiveRefCntTypes, );
-
-TYPED_TEST(IntrusiveRefCntPtrTest, RefCountedBaseCopyDoesNotLeak) {
-  EXPECT_EQ(0, NumInstances);
-  {
-    TypeParam *S1 = new TypeParam;
-    IntrusiveRefCntPtr<TypeParam> R1 = S1;
-    TypeParam *S2 = new TypeParam(*S1);
-    IntrusiveRefCntPtr<TypeParam> R2 = S2;
-    EXPECT_EQ(2, NumInstances);
-  }
-  EXPECT_EQ(0, NumInstances);
-}
-
-TYPED_TEST(IntrusiveRefCntPtrTest, InteropsWithUniquePtr) {
-  EXPECT_EQ(0, NumInstances);
-  {
-    auto S1 = std::make_unique<TypeParam>();
-    IntrusiveRefCntPtr<TypeParam> R1 = std::move(S1);
-    EXPECT_EQ(1, NumInstances);
-    EXPECT_EQ(S1, nullptr);
-  }
-  EXPECT_EQ(0, NumInstances);
-}
-
-TYPED_TEST(IntrusiveRefCntPtrTest, MakeIntrusiveRefCnt) {
-  EXPECT_EQ(0, NumInstances);
-  {
-    auto S1 = makeIntrusiveRefCnt<TypeParam>();
-    auto S2 = makeIntrusiveRefCnt<const TypeParam>();
-    EXPECT_EQ(2, NumInstances);
-    static_assert(
-        std::is_same<decltype(S1), IntrusiveRefCntPtr<TypeParam>>::value,
-        "Non-const type mismatch");
-    static_assert(
-        std::is_same<decltype(S2), IntrusiveRefCntPtr<const TypeParam>>::value,
-        "Const type mismatch");
-  }
-  EXPECT_EQ(0, NumInstances);
-}
-
-struct InterceptRefCounted : public RefCountedBase<InterceptRefCounted> {
-  InterceptRefCounted(bool *Released, bool *Retained)
-    : Released(Released), Retained(Retained) {}
-  bool * const Released;
-  bool * const Retained;
-};
-template <> struct IntrusiveRefCntPtrInfo<InterceptRefCounted> {
-  static void retain(InterceptRefCounted *I) {
-    *I->Retained = true;
-    I->Retain();
-  }
-  static void release(InterceptRefCounted *I) {
-    *I->Released = true;
-    I->Release();
-  }
-};
-TEST(IntrusiveRefCntPtr, UsesTraitsToRetainAndRelease) {
-  bool Released = false;
-  bool Retained = false;
-  {
-    InterceptRefCounted *I = new InterceptRefCounted(&Released, &Retained);
-    IntrusiveRefCntPtr<InterceptRefCounted> R = I;
-  }
-  EXPECT_TRUE(Released);
-  EXPECT_TRUE(Retained);
-}
-
-// Test that the generic constructors use SFINAE to disable invalid
-// conversions.
-struct X : RefCountedBase<X> {};
-struct Y : X {};
-struct Z : RefCountedBase<Z> {};
-static_assert(!std::is_convertible<IntrusiveRefCntPtr<X> &&,
-                                   IntrusiveRefCntPtr<Y>>::value,
-              "X&& -> Y should be rejected with SFINAE");
-static_assert(!std::is_convertible<const IntrusiveRefCntPtr<X> &,
-                                   IntrusiveRefCntPtr<Y>>::value,
-              "const X& -> Y should be rejected with SFINAE");
-static_assert(
-    !std::is_convertible<std::unique_ptr<X>, IntrusiveRefCntPtr<Y>>::value,
-    "X -> Y should be rejected with SFINAE");
-static_assert(!std::is_convertible<IntrusiveRefCntPtr<X> &&,
-                                   IntrusiveRefCntPtr<Z>>::value,
-              "X&& -> Z should be rejected with SFINAE");
-static_assert(!std::is_convertible<const IntrusiveRefCntPtr<X> &,
-                                   IntrusiveRefCntPtr<Z>>::value,
-              "const X& -> Z should be rejected with SFINAE");
-static_assert(
-    !std::is_convertible<std::unique_ptr<X>, IntrusiveRefCntPtr<Z>>::value,
-    "X -> Z should be rejected with SFINAE");
-
-TEST(IntrusiveRefCntPtr, InteropsWithConvertible) {
-  // Check converting constructors and operator=.
-  auto Y1 = makeIntrusiveRefCnt<Y>();
-  auto Y2 = makeIntrusiveRefCnt<Y>();
-  auto Y3 = makeIntrusiveRefCnt<Y>();
-  auto Y4 = makeIntrusiveRefCnt<Y>();
-  const void *P1 = Y1.get();
-  const void *P2 = Y2.get();
-  const void *P3 = Y3.get();
-  const void *P4 = Y4.get();
-  IntrusiveRefCntPtr<X> X1 = std::move(Y1);
-  IntrusiveRefCntPtr<X> X2 = Y2;
-  IntrusiveRefCntPtr<X> X3;
-  IntrusiveRefCntPtr<X> X4;
-  X3 = std::move(Y3);
-  X4 = Y4;
-  EXPECT_EQ(P1, X1.get());
-  EXPECT_EQ(P2, X2.get());
-  EXPECT_EQ(P3, X3.get());
-  EXPECT_EQ(P4, X4.get());
-}
-
-} // end namespace llvm
diff --git a/gnu/llvm/llvm/unittests/ADT/IteratorTest.cpp b/gnu/llvm/llvm/unittests/ADT/IteratorTest.cpp
deleted file mode 100644
index de74811321a..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/IteratorTest.cpp
+++ /dev/null
@@ -1,452 +0,0 @@
-//===- IteratorTest.cpp - Unit tests for iterator utilities ---------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/ilist.h"
-#include "llvm/ADT/iterator.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/SmallVector.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-template <int> struct Shadow;
-
-struct WeirdIter : std::iterator<std::input_iterator_tag, Shadow<0>, Shadow<1>,
-                                 Shadow<2>, Shadow<3>> {};
-
-struct AdaptedIter : iterator_adaptor_base<AdaptedIter, WeirdIter> {};
-
-// Test that iterator_adaptor_base forwards typedefs, if value_type is
-// unchanged.
-static_assert(std::is_same<typename AdaptedIter::value_type, Shadow<0>>::value,
-              "");
-static_assert(
-    std::is_same<typename AdaptedIter::difference_type, Shadow<1>>::value, "");
-static_assert(std::is_same<typename AdaptedIter::pointer, Shadow<2>>::value,
-              "");
-static_assert(std::is_same<typename AdaptedIter::reference, Shadow<3>>::value,
-              "");
-
-// Ensure that pointe{e,r}_iterator adaptors correctly forward the category of
-// the underlying iterator.
-
-using RandomAccessIter = SmallVectorImpl<int*>::iterator;
-using BidiIter = ilist<int*>::iterator;
-
-template<class T>
-using pointee_iterator_defaulted = pointee_iterator<T>;
-template<class T>
-using pointer_iterator_defaulted = pointer_iterator<T>;
-
-// Ensures that an iterator and its adaptation have the same iterator_category.
-template<template<typename> class A, typename It>
-using IsAdaptedIterCategorySame =
-  std::is_same<typename std::iterator_traits<It>::iterator_category,
-               typename std::iterator_traits<A<It>>::iterator_category>;
-
-// pointeE_iterator
-static_assert(IsAdaptedIterCategorySame<pointee_iterator_defaulted,
-                                        RandomAccessIter>::value, "");
-static_assert(IsAdaptedIterCategorySame<pointee_iterator_defaulted,
-                                        BidiIter>::value, "");
-// pointeR_iterator
-static_assert(IsAdaptedIterCategorySame<pointer_iterator_defaulted,
-                                        RandomAccessIter>::value, "");
-static_assert(IsAdaptedIterCategorySame<pointer_iterator_defaulted,
-                                        BidiIter>::value, "");
-
-TEST(PointeeIteratorTest, Basic) {
-  int arr[4] = {1, 2, 3, 4};
-  SmallVector<int *, 4> V;
-  V.push_back(&arr[0]);
-  V.push_back(&arr[1]);
-  V.push_back(&arr[2]);
-  V.push_back(&arr[3]);
-
-  typedef pointee_iterator<SmallVectorImpl<int *>::const_iterator>
-      test_iterator;
-
-  test_iterator Begin, End;
-  Begin = V.begin();
-  End = test_iterator(V.end());
-
-  test_iterator I = Begin;
-  for (int i = 0; i < 4; ++i) {
-    EXPECT_EQ(*V[i], *I);
-
-    EXPECT_EQ(I, Begin + i);
-    EXPECT_EQ(I, std::next(Begin, i));
-    test_iterator J = Begin;
-    J += i;
-    EXPECT_EQ(I, J);
-    EXPECT_EQ(*V[i], Begin[i]);
-
-    EXPECT_NE(I, End);
-    EXPECT_GT(End, I);
-    EXPECT_LT(I, End);
-    EXPECT_GE(I, Begin);
-    EXPECT_LE(Begin, I);
-
-    EXPECT_EQ(i, I - Begin);
-    EXPECT_EQ(i, std::distance(Begin, I));
-    EXPECT_EQ(Begin, I - i);
-
-    test_iterator K = I++;
-    EXPECT_EQ(K, std::prev(I));
-  }
-  EXPECT_EQ(End, I);
-}
-
-TEST(PointeeIteratorTest, SmartPointer) {
-  SmallVector<std::unique_ptr<int>, 4> V;
-  V.push_back(std::make_unique<int>(1));
-  V.push_back(std::make_unique<int>(2));
-  V.push_back(std::make_unique<int>(3));
-  V.push_back(std::make_unique<int>(4));
-
-  typedef pointee_iterator<
-      SmallVectorImpl<std::unique_ptr<int>>::const_iterator>
-      test_iterator;
-
-  test_iterator Begin, End;
-  Begin = V.begin();
-  End = test_iterator(V.end());
-
-  test_iterator I = Begin;
-  for (int i = 0; i < 4; ++i) {
-    EXPECT_EQ(*V[i], *I);
-
-    EXPECT_EQ(I, Begin + i);
-    EXPECT_EQ(I, std::next(Begin, i));
-    test_iterator J = Begin;
-    J += i;
-    EXPECT_EQ(I, J);
-    EXPECT_EQ(*V[i], Begin[i]);
-
-    EXPECT_NE(I, End);
-    EXPECT_GT(End, I);
-    EXPECT_LT(I, End);
-    EXPECT_GE(I, Begin);
-    EXPECT_LE(Begin, I);
-
-    EXPECT_EQ(i, I - Begin);
-    EXPECT_EQ(i, std::distance(Begin, I));
-    EXPECT_EQ(Begin, I - i);
-
-    test_iterator K = I++;
-    EXPECT_EQ(K, std::prev(I));
-  }
-  EXPECT_EQ(End, I);
-}
-
-TEST(PointeeIteratorTest, Range) {
-  int A[] = {1, 2, 3, 4};
-  SmallVector<int *, 4> V{&A[0], &A[1], &A[2], &A[3]};
-
-  int I = 0;
-  for (int II : make_pointee_range(V))
-    EXPECT_EQ(A[I++], II);
-}
-
-TEST(PointeeIteratorTest, PointeeType) {
-  struct S {
-    int X;
-    bool operator==(const S &RHS) const { return X == RHS.X; };
-  };
-  S A[] = {S{0}, S{1}};
-  SmallVector<S *, 2> V{&A[0], &A[1]};
-
-  pointee_iterator<SmallVectorImpl<S *>::const_iterator, const S> I = V.begin();
-  for (int j = 0; j < 2; ++j, ++I) {
-    EXPECT_EQ(*V[j], *I);
-  }
-}
-
-TEST(FilterIteratorTest, Lambda) {
-  auto IsOdd = [](int N) { return N % 2 == 1; };
-  int A[] = {0, 1, 2, 3, 4, 5, 6};
-  auto Range = make_filter_range(A, IsOdd);
-  SmallVector<int, 3> Actual(Range.begin(), Range.end());
-  EXPECT_EQ((SmallVector<int, 3>{1, 3, 5}), Actual);
-}
-
-TEST(FilterIteratorTest, CallableObject) {
-  int Counter = 0;
-  struct Callable {
-    int &Counter;
-
-    Callable(int &Counter) : Counter(Counter) {}
-
-    bool operator()(int N) {
-      Counter++;
-      return N % 2 == 1;
-    }
-  };
-  Callable IsOdd(Counter);
-  int A[] = {0, 1, 2, 3, 4, 5, 6};
-  auto Range = make_filter_range(A, IsOdd);
-  EXPECT_EQ(2, Counter);
-  SmallVector<int, 3> Actual(Range.begin(), Range.end());
-  EXPECT_GE(Counter, 7);
-  EXPECT_EQ((SmallVector<int, 3>{1, 3, 5}), Actual);
-}
-
-TEST(FilterIteratorTest, FunctionPointer) {
-  bool (*IsOdd)(int) = [](int N) { return N % 2 == 1; };
-  int A[] = {0, 1, 2, 3, 4, 5, 6};
-  auto Range = make_filter_range(A, IsOdd);
-  SmallVector<int, 3> Actual(Range.begin(), Range.end());
-  EXPECT_EQ((SmallVector<int, 3>{1, 3, 5}), Actual);
-}
-
-TEST(FilterIteratorTest, Composition) {
-  auto IsOdd = [](int N) { return N % 2 == 1; };
-  std::unique_ptr<int> A[] = {std::make_unique<int>(0), std::make_unique<int>(1),
-                              std::make_unique<int>(2), std::make_unique<int>(3),
-                              std::make_unique<int>(4), std::make_unique<int>(5),
-                              std::make_unique<int>(6)};
-  using PointeeIterator = pointee_iterator<std::unique_ptr<int> *>;
-  auto Range = make_filter_range(
-      make_range(PointeeIterator(std::begin(A)), PointeeIterator(std::end(A))),
-      IsOdd);
-  SmallVector<int, 3> Actual(Range.begin(), Range.end());
-  EXPECT_EQ((SmallVector<int, 3>{1, 3, 5}), Actual);
-}
-
-TEST(FilterIteratorTest, InputIterator) {
-  struct InputIterator
-      : iterator_adaptor_base<InputIterator, int *, std::input_iterator_tag> {
-    using BaseT =
-        iterator_adaptor_base<InputIterator, int *, std::input_iterator_tag>;
-
-    InputIterator(int *It) : BaseT(It) {}
-  };
-
-  auto IsOdd = [](int N) { return N % 2 == 1; };
-  int A[] = {0, 1, 2, 3, 4, 5, 6};
-  auto Range = make_filter_range(
-      make_range(InputIterator(std::begin(A)), InputIterator(std::end(A))),
-      IsOdd);
-  SmallVector<int, 3> Actual(Range.begin(), Range.end());
-  EXPECT_EQ((SmallVector<int, 3>{1, 3, 5}), Actual);
-}
-
-TEST(FilterIteratorTest, ReverseFilterRange) {
-  auto IsOdd = [](int N) { return N % 2 == 1; };
-  int A[] = {0, 1, 2, 3, 4, 5, 6};
-
-  // Check basic reversal.
-  auto Range = reverse(make_filter_range(A, IsOdd));
-  SmallVector<int, 3> Actual(Range.begin(), Range.end());
-  EXPECT_EQ((SmallVector<int, 3>{5, 3, 1}), Actual);
-
-  // Check that the reverse of the reverse is the original.
-  auto Range2 = reverse(reverse(make_filter_range(A, IsOdd)));
-  SmallVector<int, 3> Actual2(Range2.begin(), Range2.end());
-  EXPECT_EQ((SmallVector<int, 3>{1, 3, 5}), Actual2);
-
-  // Check empty ranges.
-  auto Range3 = reverse(make_filter_range(ArrayRef<int>(), IsOdd));
-  SmallVector<int, 0> Actual3(Range3.begin(), Range3.end());
-  EXPECT_EQ((SmallVector<int, 0>{}), Actual3);
-
-  // Check that we don't skip the first element, provided it isn't filtered
-  // away.
-  auto IsEven = [](int N) { return N % 2 == 0; };
-  auto Range4 = reverse(make_filter_range(A, IsEven));
-  SmallVector<int, 4> Actual4(Range4.begin(), Range4.end());
-  EXPECT_EQ((SmallVector<int, 4>{6, 4, 2, 0}), Actual4);
-}
-
-TEST(PointerIterator, Basic) {
-  int A[] = {1, 2, 3, 4};
-  pointer_iterator<int *> Begin(std::begin(A)), End(std::end(A));
-  EXPECT_EQ(A, *Begin);
-  ++Begin;
-  EXPECT_EQ(A + 1, *Begin);
-  ++Begin;
-  EXPECT_EQ(A + 2, *Begin);
-  ++Begin;
-  EXPECT_EQ(A + 3, *Begin);
-  ++Begin;
-  EXPECT_EQ(Begin, End);
-}
-
-TEST(PointerIterator, Const) {
-  int A[] = {1, 2, 3, 4};
-  const pointer_iterator<int *> Begin(std::begin(A));
-  EXPECT_EQ(A, *Begin);
-  EXPECT_EQ(A + 1, std::next(*Begin, 1));
-  EXPECT_EQ(A + 2, std::next(*Begin, 2));
-  EXPECT_EQ(A + 3, std::next(*Begin, 3));
-  EXPECT_EQ(A + 4, std::next(*Begin, 4));
-}
-
-TEST(PointerIterator, Range) {
-  int A[] = {1, 2, 3, 4};
-  int I = 0;
-  for (int *P : make_pointer_range(A))
-    EXPECT_EQ(A + I++, P);
-}
-
-TEST(ZipIteratorTest, Basic) {
-  using namespace std;
-  const SmallVector<unsigned, 6> pi{3, 1, 4, 1, 5, 9};
-  SmallVector<bool, 6> odd{1, 1, 0, 1, 1, 1};
-  const char message[] = "yynyyy\0";
-
-  for (auto tup : zip(pi, odd, message)) {
-    EXPECT_EQ(get<0>(tup) & 0x01, get<1>(tup));
-    EXPECT_EQ(get<0>(tup) & 0x01 ? 'y' : 'n', get<2>(tup));
-  }
-
-  // note the rvalue
-  for (auto tup : zip(pi, SmallVector<bool, 0>{1, 1, 0, 1, 1})) {
-    EXPECT_EQ(get<0>(tup) & 0x01, get<1>(tup));
-  }
-}
-
-TEST(ZipIteratorTest, ZipFirstBasic) {
-  using namespace std;
-  const SmallVector<unsigned, 6> pi{3, 1, 4, 1, 5, 9};
-  unsigned iters = 0;
-
-  for (auto tup : zip_first(SmallVector<bool, 0>{1, 1, 0, 1}, pi)) {
-    EXPECT_EQ(get<0>(tup), get<1>(tup) & 0x01);
-    iters += 1;
-  }
-
-  EXPECT_EQ(iters, 4u);
-}
-
-TEST(ZipIteratorTest, ZipLongestBasic) {
-  using namespace std;
-  const vector<unsigned> pi{3, 1, 4, 1, 5, 9};
-  const vector<StringRef> e{"2", "7", "1", "8"};
-
-  {
-    // Check left range longer than right.
-    const vector<tuple<Optional<unsigned>, Optional<StringRef>>> expected{
-        make_tuple(3, StringRef("2")), make_tuple(1, StringRef("7")),
-        make_tuple(4, StringRef("1")), make_tuple(1, StringRef("8")),
-        make_tuple(5, None),           make_tuple(9, None)};
-    size_t iters = 0;
-    for (auto tup : zip_longest(pi, e)) {
-      EXPECT_EQ(tup, expected[iters]);
-      iters += 1;
-    }
-    EXPECT_EQ(iters, expected.size());
-  }
-
-  {
-    // Check right range longer than left.
-    const vector<tuple<Optional<StringRef>, Optional<unsigned>>> expected{
-        make_tuple(StringRef("2"), 3), make_tuple(StringRef("7"), 1),
-        make_tuple(StringRef("1"), 4), make_tuple(StringRef("8"), 1),
-        make_tuple(None, 5),           make_tuple(None, 9)};
-    size_t iters = 0;
-    for (auto tup : zip_longest(e, pi)) {
-      EXPECT_EQ(tup, expected[iters]);
-      iters += 1;
-    }
-    EXPECT_EQ(iters, expected.size());
-  }
-}
-
-TEST(ZipIteratorTest, Mutability) {
-  using namespace std;
-  const SmallVector<unsigned, 4> pi{3, 1, 4, 1, 5, 9};
-  char message[] = "hello zip\0";
-
-  for (auto tup : zip(pi, message, message)) {
-    EXPECT_EQ(get<1>(tup), get<2>(tup));
-    get<2>(tup) = get<0>(tup) & 0x01 ? 'y' : 'n';
-  }
-
-  // note the rvalue
-  for (auto tup : zip(message, "yynyyyzip\0")) {
-    EXPECT_EQ(get<0>(tup), get<1>(tup));
-  }
-}
-
-TEST(ZipIteratorTest, ZipFirstMutability) {
-  using namespace std;
-  vector<unsigned> pi{3, 1, 4, 1, 5, 9};
-  unsigned iters = 0;
-
-  for (auto tup : zip_first(SmallVector<bool, 0>{1, 1, 0, 1}, pi)) {
-    get<1>(tup) = get<0>(tup);
-    iters += 1;
-  }
-
-  EXPECT_EQ(iters, 4u);
-
-  for (auto tup : zip_first(SmallVector<bool, 0>{1, 1, 0, 1}, pi)) {
-    EXPECT_EQ(get<0>(tup), get<1>(tup));
-  }
-}
-
-TEST(ZipIteratorTest, Filter) {
-  using namespace std;
-  vector<unsigned> pi{3, 1, 4, 1, 5, 9};
-
-  unsigned iters = 0;
-  // pi is length 6, but the zip RHS is length 7.
-  auto zipped = zip_first(pi, vector<bool>{1, 1, 0, 1, 1, 1, 0});
-  for (auto tup : make_filter_range(
-           zipped, [](decltype(zipped)::value_type t) { return get<1>(t); })) {
-    EXPECT_EQ(get<0>(tup) & 0x01, get<1>(tup));
-    get<0>(tup) += 1;
-    iters += 1;
-  }
-
-  // Should have skipped pi[2].
-  EXPECT_EQ(iters, 5u);
-
-  // Ensure that in-place mutation works.
-  EXPECT_TRUE(all_of(pi, [](unsigned n) { return (n & 0x01) == 0; }));
-}
-
-TEST(ZipIteratorTest, Reverse) {
-  using namespace std;
-  vector<unsigned> ascending{0, 1, 2, 3, 4, 5};
-
-  auto zipped = zip_first(ascending, vector<bool>{0, 1, 0, 1, 0, 1});
-  unsigned last = 6;
-  for (auto tup : reverse(zipped)) {
-    // Check that this is in reverse.
-    EXPECT_LT(get<0>(tup), last);
-    last = get<0>(tup);
-    EXPECT_EQ(get<0>(tup) & 0x01, get<1>(tup));
-  }
-
-  auto odds = [](decltype(zipped)::value_type tup) { return get<1>(tup); };
-  last = 6;
-  for (auto tup : make_filter_range(reverse(zipped), odds)) {
-    EXPECT_LT(get<0>(tup), last);
-    last = get<0>(tup);
-    EXPECT_TRUE(get<0>(tup) & 0x01);
-    get<0>(tup) += 1;
-  }
-
-  // Ensure that in-place mutation works.
-  EXPECT_TRUE(all_of(ascending, [](unsigned n) { return (n & 0x01) == 0; }));
-}
-
-TEST(RangeTest, Distance) {
-  std::vector<int> v1;
-  std::vector<int> v2{1, 2, 3};
-
-  EXPECT_EQ(std::distance(v1.begin(), v1.end()), size(v1));
-  EXPECT_EQ(std::distance(v2.begin(), v2.end()), size(v2));
-}
-
-} // anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/MapVectorTest.cpp b/gnu/llvm/llvm/unittests/ADT/MapVectorTest.cpp
deleted file mode 100644
index 552f9956bdc..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/MapVectorTest.cpp
+++ /dev/null
@@ -1,423 +0,0 @@
-//===- unittest/ADT/MapVectorTest.cpp - MapVector unit tests ----*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/MapVector.h"
-#include "llvm/ADT/iterator_range.h"
-#include "gtest/gtest.h"
-#include <utility>
-
-using namespace llvm;
-
-TEST(MapVectorTest, swap) {
-  MapVector<int, int> MV1, MV2;
-  std::pair<MapVector<int, int>::iterator, bool> R;
-
-  R = MV1.insert(std::make_pair(1, 2));
-  ASSERT_EQ(R.first, MV1.begin());
-  EXPECT_EQ(R.first->first, 1);
-  EXPECT_EQ(R.first->second, 2);
-  EXPECT_TRUE(R.second);
-
-  EXPECT_FALSE(MV1.empty());
-  EXPECT_TRUE(MV2.empty());
-  MV2.swap(MV1);
-  EXPECT_TRUE(MV1.empty());
-  EXPECT_FALSE(MV2.empty());
-
-  auto I = MV1.find(1);
-  ASSERT_EQ(MV1.end(), I);
-
-  I = MV2.find(1);
-  ASSERT_EQ(I, MV2.begin());
-  EXPECT_EQ(I->first, 1);
-  EXPECT_EQ(I->second, 2);
-}
-
-TEST(MapVectorTest, insert_pop) {
-  MapVector<int, int> MV;
-  std::pair<MapVector<int, int>::iterator, bool> R;
-
-  R = MV.insert(std::make_pair(1, 2));
-  ASSERT_EQ(R.first, MV.begin());
-  EXPECT_EQ(R.first->first, 1);
-  EXPECT_EQ(R.first->second, 2);
-  EXPECT_TRUE(R.second);
-
-  R = MV.insert(std::make_pair(1, 3));
-  ASSERT_EQ(R.first, MV.begin());
-  EXPECT_EQ(R.first->first, 1);
-  EXPECT_EQ(R.first->second, 2);
-  EXPECT_FALSE(R.second);
-
-  R = MV.insert(std::make_pair(4, 5));
-  ASSERT_NE(R.first, MV.end());
-  EXPECT_EQ(R.first->first, 4);
-  EXPECT_EQ(R.first->second, 5);
-  EXPECT_TRUE(R.second);
-
-  EXPECT_EQ(MV.size(), 2u);
-  EXPECT_EQ(MV[1], 2);
-  EXPECT_EQ(MV[4], 5);
-
-  MV.pop_back();
-  EXPECT_EQ(MV.size(), 1u);
-  EXPECT_EQ(MV[1], 2);
-
-  R = MV.insert(std::make_pair(4, 7));
-  ASSERT_NE(R.first, MV.end());
-  EXPECT_EQ(R.first->first, 4);
-  EXPECT_EQ(R.first->second, 7);
-  EXPECT_TRUE(R.second);
-
-  EXPECT_EQ(MV.size(), 2u);
-  EXPECT_EQ(MV[1], 2);
-  EXPECT_EQ(MV[4], 7);
-}
-
-TEST(MapVectorTest, erase) {
-  MapVector<int, int> MV;
-
-  MV.insert(std::make_pair(1, 2));
-  MV.insert(std::make_pair(3, 4));
-  MV.insert(std::make_pair(5, 6));
-  ASSERT_EQ(MV.size(), 3u);
-
-  MV.erase(MV.find(1));
-  ASSERT_EQ(MV.size(), 2u);
-  ASSERT_EQ(MV.find(1), MV.end());
-  ASSERT_EQ(MV[3], 4);
-  ASSERT_EQ(MV[5], 6);
-
-  ASSERT_EQ(MV.erase(3), 1u);
-  ASSERT_EQ(MV.size(), 1u);
-  ASSERT_EQ(MV.find(3), MV.end());
-  ASSERT_EQ(MV[5], 6);
-
-  ASSERT_EQ(MV.erase(79), 0u);
-  ASSERT_EQ(MV.size(), 1u);
-}
-
-TEST(MapVectorTest, remove_if) {
-  MapVector<int, int> MV;
-
-  MV.insert(std::make_pair(1, 11));
-  MV.insert(std::make_pair(2, 12));
-  MV.insert(std::make_pair(3, 13));
-  MV.insert(std::make_pair(4, 14));
-  MV.insert(std::make_pair(5, 15));
-  MV.insert(std::make_pair(6, 16));
-  ASSERT_EQ(MV.size(), 6u);
-
-  MV.remove_if([](const std::pair<int, int> &Val) { return Val.second % 2; });
-  ASSERT_EQ(MV.size(), 3u);
-  ASSERT_EQ(MV.find(1), MV.end());
-  ASSERT_EQ(MV.find(3), MV.end());
-  ASSERT_EQ(MV.find(5), MV.end());
-  ASSERT_EQ(MV[2], 12);
-  ASSERT_EQ(MV[4], 14);
-  ASSERT_EQ(MV[6], 16);
-}
-
-TEST(MapVectorTest, iteration_test) {
-  MapVector<int, int> MV;
-
-  MV.insert(std::make_pair(1, 11));
-  MV.insert(std::make_pair(2, 12));
-  MV.insert(std::make_pair(3, 13));
-  MV.insert(std::make_pair(4, 14));
-  MV.insert(std::make_pair(5, 15));
-  MV.insert(std::make_pair(6, 16));
-  ASSERT_EQ(MV.size(), 6u);
-
-  int count = 1;
-  for (auto P : make_range(MV.begin(), MV.end())) {
-    ASSERT_EQ(P.first, count);
-    count++;
-  }
-
-  count = 6;
-  for (auto P : make_range(MV.rbegin(), MV.rend())) {
-    ASSERT_EQ(P.first, count);
-    count--;
-  }
-}
-
-TEST(MapVectorTest, NonCopyable) {
-  MapVector<int, std::unique_ptr<int>> MV;
-  MV.insert(std::make_pair(1, std::make_unique<int>(1)));
-  MV.insert(std::make_pair(2, std::make_unique<int>(2)));
-
-  ASSERT_EQ(MV.count(1), 1u);
-  ASSERT_EQ(*MV.find(2)->second, 2);
-}
-
-template <class IntType> struct MapVectorMappedTypeTest : ::testing::Test {
-  using int_type = IntType;
-};
-
-using MapIntTypes = ::testing::Types<int, long, long long, unsigned,
-                                     unsigned long, unsigned long long>;
-TYPED_TEST_SUITE(MapVectorMappedTypeTest, MapIntTypes, );
-
-TYPED_TEST(MapVectorMappedTypeTest, DifferentDenseMap) {
-  // Test that using a map with a mapped type other than 'unsigned' compiles
-  // and works.
-  using IntType = typename TestFixture::int_type;
-  using MapVectorType = MapVector<int, int, DenseMap<int, IntType>>;
-
-  MapVectorType MV;
-  std::pair<typename MapVectorType::iterator, bool> R;
-
-  R = MV.insert(std::make_pair(1, 2));
-  ASSERT_EQ(R.first, MV.begin());
-  EXPECT_EQ(R.first->first, 1);
-  EXPECT_EQ(R.first->second, 2);
-  EXPECT_TRUE(R.second);
-
-  const std::pair<int, int> Elem(1, 3);
-  R = MV.insert(Elem);
-  ASSERT_EQ(R.first, MV.begin());
-  EXPECT_EQ(R.first->first, 1);
-  EXPECT_EQ(R.first->second, 2);
-  EXPECT_FALSE(R.second);
-
-  int& value = MV[4];
-  EXPECT_EQ(value, 0);
-  value = 5;
-
-  EXPECT_EQ(MV.size(), 2u);
-  EXPECT_EQ(MV[1], 2);
-  EXPECT_EQ(MV[4], 5);
-}
-
-TEST(SmallMapVectorSmallTest, insert_pop) {
-  SmallMapVector<int, int, 32> MV;
-  std::pair<SmallMapVector<int, int, 32>::iterator, bool> R;
-
-  R = MV.insert(std::make_pair(1, 2));
-  ASSERT_EQ(R.first, MV.begin());
-  EXPECT_EQ(R.first->first, 1);
-  EXPECT_EQ(R.first->second, 2);
-  EXPECT_TRUE(R.second);
-
-  R = MV.insert(std::make_pair(1, 3));
-  ASSERT_EQ(R.first, MV.begin());
-  EXPECT_EQ(R.first->first, 1);
-  EXPECT_EQ(R.first->second, 2);
-  EXPECT_FALSE(R.second);
-
-  R = MV.insert(std::make_pair(4, 5));
-  ASSERT_NE(R.first, MV.end());
-  EXPECT_EQ(R.first->first, 4);
-  EXPECT_EQ(R.first->second, 5);
-  EXPECT_TRUE(R.second);
-
-  EXPECT_EQ(MV.size(), 2u);
-  EXPECT_EQ(MV[1], 2);
-  EXPECT_EQ(MV[4], 5);
-
-  MV.pop_back();
-  EXPECT_EQ(MV.size(), 1u);
-  EXPECT_EQ(MV[1], 2);
-
-  R = MV.insert(std::make_pair(4, 7));
-  ASSERT_NE(R.first, MV.end());
-  EXPECT_EQ(R.first->first, 4);
-  EXPECT_EQ(R.first->second, 7);
-  EXPECT_TRUE(R.second);
-
-  EXPECT_EQ(MV.size(), 2u);
-  EXPECT_EQ(MV[1], 2);
-  EXPECT_EQ(MV[4], 7);
-}
-
-TEST(SmallMapVectorSmallTest, erase) {
-  SmallMapVector<int, int, 32> MV;
-
-  MV.insert(std::make_pair(1, 2));
-  MV.insert(std::make_pair(3, 4));
-  MV.insert(std::make_pair(5, 6));
-  ASSERT_EQ(MV.size(), 3u);
-
-  MV.erase(MV.find(1));
-  ASSERT_EQ(MV.size(), 2u);
-  ASSERT_EQ(MV.find(1), MV.end());
-  ASSERT_EQ(MV[3], 4);
-  ASSERT_EQ(MV[5], 6);
-
-  ASSERT_EQ(MV.erase(3), 1u);
-  ASSERT_EQ(MV.size(), 1u);
-  ASSERT_EQ(MV.find(3), MV.end());
-  ASSERT_EQ(MV[5], 6);
-
-  ASSERT_EQ(MV.erase(79), 0u);
-  ASSERT_EQ(MV.size(), 1u);
-}
-
-TEST(SmallMapVectorSmallTest, remove_if) {
-  SmallMapVector<int, int, 32> MV;
-
-  MV.insert(std::make_pair(1, 11));
-  MV.insert(std::make_pair(2, 12));
-  MV.insert(std::make_pair(3, 13));
-  MV.insert(std::make_pair(4, 14));
-  MV.insert(std::make_pair(5, 15));
-  MV.insert(std::make_pair(6, 16));
-  ASSERT_EQ(MV.size(), 6u);
-
-  MV.remove_if([](const std::pair<int, int> &Val) { return Val.second % 2; });
-  ASSERT_EQ(MV.size(), 3u);
-  ASSERT_EQ(MV.find(1), MV.end());
-  ASSERT_EQ(MV.find(3), MV.end());
-  ASSERT_EQ(MV.find(5), MV.end());
-  ASSERT_EQ(MV[2], 12);
-  ASSERT_EQ(MV[4], 14);
-  ASSERT_EQ(MV[6], 16);
-}
-
-TEST(SmallMapVectorSmallTest, iteration_test) {
-  SmallMapVector<int, int, 32> MV;
-
-  MV.insert(std::make_pair(1, 11));
-  MV.insert(std::make_pair(2, 12));
-  MV.insert(std::make_pair(3, 13));
-  MV.insert(std::make_pair(4, 14));
-  MV.insert(std::make_pair(5, 15));
-  MV.insert(std::make_pair(6, 16));
-  ASSERT_EQ(MV.size(), 6u);
-
-  int count = 1;
-  for (auto P : make_range(MV.begin(), MV.end())) {
-    ASSERT_EQ(P.first, count);
-    count++;
-  }
-
-  count = 6;
-  for (auto P : make_range(MV.rbegin(), MV.rend())) {
-    ASSERT_EQ(P.first, count);
-    count--;
-  }
-}
-
-TEST(SmallMapVectorSmallTest, NonCopyable) {
-  SmallMapVector<int, std::unique_ptr<int>, 8> MV;
-  MV.insert(std::make_pair(1, std::make_unique<int>(1)));
-  MV.insert(std::make_pair(2, std::make_unique<int>(2)));
-
-  ASSERT_EQ(MV.count(1), 1u);
-  ASSERT_EQ(*MV.find(2)->second, 2);
-}
-
-TEST(SmallMapVectorLargeTest, insert_pop) {
-  SmallMapVector<int, int, 1> MV;
-  std::pair<SmallMapVector<int, int, 1>::iterator, bool> R;
-
-  R = MV.insert(std::make_pair(1, 2));
-  ASSERT_EQ(R.first, MV.begin());
-  EXPECT_EQ(R.first->first, 1);
-  EXPECT_EQ(R.first->second, 2);
-  EXPECT_TRUE(R.second);
-
-  R = MV.insert(std::make_pair(1, 3));
-  ASSERT_EQ(R.first, MV.begin());
-  EXPECT_EQ(R.first->first, 1);
-  EXPECT_EQ(R.first->second, 2);
-  EXPECT_FALSE(R.second);
-
-  R = MV.insert(std::make_pair(4, 5));
-  ASSERT_NE(R.first, MV.end());
-  EXPECT_EQ(R.first->first, 4);
-  EXPECT_EQ(R.first->second, 5);
-  EXPECT_TRUE(R.second);
-
-  EXPECT_EQ(MV.size(), 2u);
-  EXPECT_EQ(MV[1], 2);
-  EXPECT_EQ(MV[4], 5);
-
-  MV.pop_back();
-  EXPECT_EQ(MV.size(), 1u);
-  EXPECT_EQ(MV[1], 2);
-
-  R = MV.insert(std::make_pair(4, 7));
-  ASSERT_NE(R.first, MV.end());
-  EXPECT_EQ(R.first->first, 4);
-  EXPECT_EQ(R.first->second, 7);
-  EXPECT_TRUE(R.second);
-
-  EXPECT_EQ(MV.size(), 2u);
-  EXPECT_EQ(MV[1], 2);
-  EXPECT_EQ(MV[4], 7);
-}
-
-TEST(SmallMapVectorLargeTest, erase) {
-  SmallMapVector<int, int, 1> MV;
-
-  MV.insert(std::make_pair(1, 2));
-  MV.insert(std::make_pair(3, 4));
-  MV.insert(std::make_pair(5, 6));
-  ASSERT_EQ(MV.size(), 3u);
-
-  MV.erase(MV.find(1));
-  ASSERT_EQ(MV.size(), 2u);
-  ASSERT_EQ(MV.find(1), MV.end());
-  ASSERT_EQ(MV[3], 4);
-  ASSERT_EQ(MV[5], 6);
-
-  ASSERT_EQ(MV.erase(3), 1u);
-  ASSERT_EQ(MV.size(), 1u);
-  ASSERT_EQ(MV.find(3), MV.end());
-  ASSERT_EQ(MV[5], 6);
-
-  ASSERT_EQ(MV.erase(79), 0u);
-  ASSERT_EQ(MV.size(), 1u);
-}
-
-TEST(SmallMapVectorLargeTest, remove_if) {
-  SmallMapVector<int, int, 1> MV;
-
-  MV.insert(std::make_pair(1, 11));
-  MV.insert(std::make_pair(2, 12));
-  MV.insert(std::make_pair(3, 13));
-  MV.insert(std::make_pair(4, 14));
-  MV.insert(std::make_pair(5, 15));
-  MV.insert(std::make_pair(6, 16));
-  ASSERT_EQ(MV.size(), 6u);
-
-  MV.remove_if([](const std::pair<int, int> &Val) { return Val.second % 2; });
-  ASSERT_EQ(MV.size(), 3u);
-  ASSERT_EQ(MV.find(1), MV.end());
-  ASSERT_EQ(MV.find(3), MV.end());
-  ASSERT_EQ(MV.find(5), MV.end());
-  ASSERT_EQ(MV[2], 12);
-  ASSERT_EQ(MV[4], 14);
-  ASSERT_EQ(MV[6], 16);
-}
-
-TEST(SmallMapVectorLargeTest, iteration_test) {
-  SmallMapVector<int, int, 1> MV;
-
-  MV.insert(std::make_pair(1, 11));
-  MV.insert(std::make_pair(2, 12));
-  MV.insert(std::make_pair(3, 13));
-  MV.insert(std::make_pair(4, 14));
-  MV.insert(std::make_pair(5, 15));
-  MV.insert(std::make_pair(6, 16));
-  ASSERT_EQ(MV.size(), 6u);
-
-  int count = 1;
-  for (auto P : make_range(MV.begin(), MV.end())) {
-    ASSERT_EQ(P.first, count);
-    count++;
-  }
-
-  count = 6;
-  for (auto P : make_range(MV.rbegin(), MV.rend())) {
-    ASSERT_EQ(P.first, count);
-    count--;
-  }
-}
diff --git a/gnu/llvm/llvm/unittests/ADT/MappedIteratorTest.cpp b/gnu/llvm/llvm/unittests/ADT/MappedIteratorTest.cpp
deleted file mode 100644
index 61e45e3a66e..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/MappedIteratorTest.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-//===------ MappedIteratorTest.cpp - Unit tests for mapped_iterator -------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/STLExtras.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST(MappedIteratorTest, ApplyFunctionOnDereference) {
-  std::vector<int> V({0});
-
-  auto I = map_iterator(V.begin(), [](int X) { return X + 1; });
-
-  EXPECT_EQ(*I, 1) << "should have applied function in dereference";
-}
-
-TEST(MappedIteratorTest, ApplyFunctionOnArrow) {
-  struct S {
-    int Z = 0;
-  };
-
-  std::vector<int> V({0});
-  S Y;
-  S* P = &Y;
-
-  auto I = map_iterator(V.begin(), [&](int X) -> S& { return *(P + X); });
-
-  I->Z = 42;
-
-  EXPECT_EQ(Y.Z, 42) << "should have applied function during arrow";
-}
-
-TEST(MappedIteratorTest, FunctionPreservesReferences) {
-  std::vector<int> V({1});
-  std::map<int, int> M({ {1, 1} });
-
-  auto I = map_iterator(V.begin(), [&](int X) -> int& { return M[X]; });
-  *I = 42;
-
-  EXPECT_EQ(M[1], 42) << "assignment should have modified M";
-}
-
-} // anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/OptionalTest.cpp b/gnu/llvm/llvm/unittests/ADT/OptionalTest.cpp
deleted file mode 100644
index debeb78e8fa..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/OptionalTest.cpp
+++ /dev/null
@@ -1,808 +0,0 @@
-//===- llvm/unittest/ADT/OptionalTest.cpp - Optional unit tests -----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/Optional.h"
-#include "llvm/ADT/SmallString.h"
-#include "llvm/ADT/StringMap.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gtest/gtest-spi.h"
-#include "gtest/gtest.h"
-
-#include <array>
-
-
-using namespace llvm;
-
-static_assert(std::is_trivially_copyable<Optional<int>>::value,
-              "trivially copyable");
-
-static_assert(std::is_trivially_copyable<Optional<std::array<int, 3>>>::value,
-              "trivially copyable");
-
-void OptionalWorksInConstexpr() {
-  constexpr auto x1 = Optional<int>();
-  constexpr Optional<int> x2{};
-  static_assert(!x1.hasValue() && !x2.hasValue(),
-                "Default construction and hasValue() are contexpr");
-  constexpr auto y1 = Optional<int>(3);
-  constexpr Optional<int> y2{3};
-  static_assert(y1.getValue() == y2.getValue() && y1.getValue() == 3,
-                "Construction with value and getValue() are constexpr");
-  static_assert(Optional<int>{3} >= 2 && Optional<int>{1} < Optional<int>{2},
-                "Comparisons work in constexpr");
-}
-
-namespace {
-
-struct NonDefaultConstructible {
-  static unsigned CopyConstructions;
-  static unsigned Destructions;
-  static unsigned CopyAssignments;
-  explicit NonDefaultConstructible(int) {
-  }
-  NonDefaultConstructible(const NonDefaultConstructible&) {
-    ++CopyConstructions;
-  }
-  NonDefaultConstructible &operator=(const NonDefaultConstructible&) {
-    ++CopyAssignments;
-    return *this;
-  }
-  ~NonDefaultConstructible() {
-    ++Destructions;
-  }
-  static void ResetCounts() {
-    CopyConstructions = 0;
-    Destructions = 0;
-    CopyAssignments = 0;
-  }
-};
-
-unsigned NonDefaultConstructible::CopyConstructions = 0;
-unsigned NonDefaultConstructible::Destructions = 0;
-unsigned NonDefaultConstructible::CopyAssignments = 0;
-
-static_assert(
-    !std::is_trivially_copyable<Optional<NonDefaultConstructible>>::value,
-    "not trivially copyable");
-
-TEST(OptionalTest, NonDefaultConstructibleTest) {
-  Optional<NonDefaultConstructible> O;
-  EXPECT_FALSE(O);
-}
-
-TEST(OptionalTest, ResetTest) {
-  NonDefaultConstructible::ResetCounts();
-  Optional<NonDefaultConstructible> O(NonDefaultConstructible(3));
-  EXPECT_EQ(1u, NonDefaultConstructible::CopyConstructions);
-  EXPECT_EQ(0u, NonDefaultConstructible::CopyAssignments);
-  EXPECT_EQ(1u, NonDefaultConstructible::Destructions);
-  NonDefaultConstructible::ResetCounts();
-  O.reset();
-  EXPECT_EQ(0u, NonDefaultConstructible::CopyConstructions);
-  EXPECT_EQ(0u, NonDefaultConstructible::CopyAssignments);
-  EXPECT_EQ(1u, NonDefaultConstructible::Destructions);
-}
-
-TEST(OptionalTest, InitializationLeakTest) {
-  NonDefaultConstructible::ResetCounts();
-  Optional<NonDefaultConstructible>(NonDefaultConstructible(3));
-  EXPECT_EQ(1u, NonDefaultConstructible::CopyConstructions);
-  EXPECT_EQ(0u, NonDefaultConstructible::CopyAssignments);
-  EXPECT_EQ(2u, NonDefaultConstructible::Destructions);
-}
-
-TEST(OptionalTest, CopyConstructionTest) {
-  NonDefaultConstructible::ResetCounts();
-  {
-    Optional<NonDefaultConstructible> A(NonDefaultConstructible(3));
-    EXPECT_EQ(1u, NonDefaultConstructible::CopyConstructions);
-    EXPECT_EQ(0u, NonDefaultConstructible::CopyAssignments);
-    EXPECT_EQ(1u, NonDefaultConstructible::Destructions);
-    NonDefaultConstructible::ResetCounts();
-    Optional<NonDefaultConstructible> B(A);
-    EXPECT_EQ(1u, NonDefaultConstructible::CopyConstructions);
-    EXPECT_EQ(0u, NonDefaultConstructible::CopyAssignments);
-    EXPECT_EQ(0u, NonDefaultConstructible::Destructions);
-    NonDefaultConstructible::ResetCounts();
-  }
-  EXPECT_EQ(0u, NonDefaultConstructible::CopyConstructions);
-  EXPECT_EQ(0u, NonDefaultConstructible::CopyAssignments);
-  EXPECT_EQ(2u, NonDefaultConstructible::Destructions);
-}
-
-TEST(OptionalTest, ConstructingCopyAssignmentTest) {
-  NonDefaultConstructible::ResetCounts();
-  {
-    Optional<NonDefaultConstructible> A(NonDefaultConstructible(3));
-    Optional<NonDefaultConstructible> B;
-    EXPECT_EQ(1u, NonDefaultConstructible::CopyConstructions);
-    EXPECT_EQ(0u, NonDefaultConstructible::CopyAssignments);
-    EXPECT_EQ(1u, NonDefaultConstructible::Destructions);
-    NonDefaultConstructible::ResetCounts();
-    B = A;
-    EXPECT_EQ(1u, NonDefaultConstructible::CopyConstructions);
-    EXPECT_EQ(0u, NonDefaultConstructible::CopyAssignments);
-    EXPECT_EQ(0u, NonDefaultConstructible::Destructions);
-    NonDefaultConstructible::ResetCounts();
-  }
-  EXPECT_EQ(0u, NonDefaultConstructible::CopyConstructions);
-  EXPECT_EQ(0u, NonDefaultConstructible::CopyAssignments);
-  EXPECT_EQ(2u, NonDefaultConstructible::Destructions);
-}
-
-TEST(OptionalTest, CopyingCopyAssignmentTest) {
-  NonDefaultConstructible::ResetCounts();
-  {
-    Optional<NonDefaultConstructible> A(NonDefaultConstructible(3));
-    Optional<NonDefaultConstructible> B(NonDefaultConstructible(4));
-    EXPECT_EQ(2u, NonDefaultConstructible::CopyConstructions);
-    EXPECT_EQ(0u, NonDefaultConstructible::CopyAssignments);
-    EXPECT_EQ(2u, NonDefaultConstructible::Destructions);
-    NonDefaultConstructible::ResetCounts();
-    B = A;
-    EXPECT_EQ(0u, NonDefaultConstructible::CopyConstructions);
-    EXPECT_EQ(1u, NonDefaultConstructible::CopyAssignments);
-    EXPECT_EQ(0u, NonDefaultConstructible::Destructions);
-    NonDefaultConstructible::ResetCounts();
-  }
-  EXPECT_EQ(0u, NonDefaultConstructible::CopyConstructions);
-  EXPECT_EQ(0u, NonDefaultConstructible::CopyAssignments);
-  EXPECT_EQ(2u, NonDefaultConstructible::Destructions);
-}
-
-TEST(OptionalTest, DeletingCopyAssignmentTest) {
-  NonDefaultConstructible::ResetCounts();
-  {
-    Optional<NonDefaultConstructible> A;
-    Optional<NonDefaultConstructible> B(NonDefaultConstructible(3));
-    EXPECT_EQ(1u, NonDefaultConstructible::CopyConstructions);
-    EXPECT_EQ(0u, NonDefaultConstructible::CopyAssignments);
-    EXPECT_EQ(1u, NonDefaultConstructible::Destructions);
-    NonDefaultConstructible::ResetCounts();
-    B = A;
-    EXPECT_EQ(0u, NonDefaultConstructible::CopyConstructions);
-    EXPECT_EQ(0u, NonDefaultConstructible::CopyAssignments);
-    EXPECT_EQ(1u, NonDefaultConstructible::Destructions);
-    NonDefaultConstructible::ResetCounts();
-  }
-  EXPECT_EQ(0u, NonDefaultConstructible::CopyConstructions);
-  EXPECT_EQ(0u, NonDefaultConstructible::CopyAssignments);
-  EXPECT_EQ(0u, NonDefaultConstructible::Destructions);
-}
-
-TEST(OptionalTest, NullCopyConstructionTest) {
-  NonDefaultConstructible::ResetCounts();
-  {
-    Optional<NonDefaultConstructible> A;
-    Optional<NonDefaultConstructible> B;
-    EXPECT_EQ(0u, NonDefaultConstructible::CopyConstructions);
-    EXPECT_EQ(0u, NonDefaultConstructible::CopyAssignments);
-    EXPECT_EQ(0u, NonDefaultConstructible::Destructions);
-    NonDefaultConstructible::ResetCounts();
-    B = A;
-    EXPECT_EQ(0u, NonDefaultConstructible::CopyConstructions);
-    EXPECT_EQ(0u, NonDefaultConstructible::CopyAssignments);
-    EXPECT_EQ(0u, NonDefaultConstructible::Destructions);
-    NonDefaultConstructible::ResetCounts();
-  }
-  EXPECT_EQ(0u, NonDefaultConstructible::CopyConstructions);
-  EXPECT_EQ(0u, NonDefaultConstructible::CopyAssignments);
-  EXPECT_EQ(0u, NonDefaultConstructible::Destructions);
-}
-
-TEST(OptionalTest, InPlaceConstructionNonDefaultConstructibleTest) {
-  NonDefaultConstructible::ResetCounts();
-  { Optional<NonDefaultConstructible> A{in_place, 1}; }
-  EXPECT_EQ(0u, NonDefaultConstructible::CopyConstructions);
-  EXPECT_EQ(0u, NonDefaultConstructible::CopyAssignments);
-  EXPECT_EQ(1u, NonDefaultConstructible::Destructions);
-}
-
-TEST(OptionalTest, GetValueOr) {
-  Optional<int> A;
-  EXPECT_EQ(42, A.getValueOr(42));
-
-  A = 5;
-  EXPECT_EQ(5, A.getValueOr(42));
-}
-
-struct MultiArgConstructor {
-  int x, y;
-  MultiArgConstructor(int x, int y) : x(x), y(y) {}
-  explicit MultiArgConstructor(int x, bool positive)
-    : x(x), y(positive ? x : -x) {}
-
-  MultiArgConstructor(const MultiArgConstructor &) = delete;
-  MultiArgConstructor(MultiArgConstructor &&) = delete;
-  MultiArgConstructor &operator=(const MultiArgConstructor &) = delete;
-  MultiArgConstructor &operator=(MultiArgConstructor &&) = delete;
-
-  friend bool operator==(const MultiArgConstructor &LHS,
-                         const MultiArgConstructor &RHS) {
-    return LHS.x == RHS.x && LHS.y == RHS.y;
-  }
-
-  static unsigned Destructions;
-  ~MultiArgConstructor() {
-    ++Destructions;
-  }
-  static void ResetCounts() {
-    Destructions = 0;
-  }
-};
-unsigned MultiArgConstructor::Destructions = 0;
-
-static_assert(!std::is_trivially_copyable<Optional<MultiArgConstructor>>::value,
-              "not trivially copyable");
-
-TEST(OptionalTest, Emplace) {
-  MultiArgConstructor::ResetCounts();
-  Optional<MultiArgConstructor> A;
-  
-  A.emplace(1, 2);
-  EXPECT_TRUE(A.hasValue());
-  EXPECT_EQ(1, A->x);
-  EXPECT_EQ(2, A->y);
-  EXPECT_EQ(0u, MultiArgConstructor::Destructions);
-
-  A.emplace(5, false);
-  EXPECT_TRUE(A.hasValue());
-  EXPECT_EQ(5, A->x);
-  EXPECT_EQ(-5, A->y);
-  EXPECT_EQ(1u, MultiArgConstructor::Destructions);
-}
-
-TEST(OptionalTest, InPlaceConstructionMultiArgConstructorTest) {
-  MultiArgConstructor::ResetCounts();
-  {
-    Optional<MultiArgConstructor> A{in_place, 1, 2};
-    EXPECT_TRUE(A.hasValue());
-    EXPECT_EQ(1, A->x);
-    EXPECT_EQ(2, A->y);
-    Optional<MultiArgConstructor> B{in_place, 5, false};
-    EXPECT_TRUE(B.hasValue());
-    EXPECT_EQ(5, B->x);
-    EXPECT_EQ(-5, B->y);
-    EXPECT_EQ(0u, MultiArgConstructor::Destructions);
-  }
-  EXPECT_EQ(2u, MultiArgConstructor::Destructions);
-}
-
-TEST(OptionalTest, InPlaceConstructionAndEmplaceEquivalentTest) {
-  MultiArgConstructor::ResetCounts();
-  {
-    Optional<MultiArgConstructor> A{in_place, 1, 2};
-    Optional<MultiArgConstructor> B;
-    B.emplace(1, 2);
-    EXPECT_EQ(0u, MultiArgConstructor::Destructions);
-    ASSERT_EQ(A, B);
-  }
-  EXPECT_EQ(2u, MultiArgConstructor::Destructions);
-}
-
-struct MoveOnly {
-  static unsigned MoveConstructions;
-  static unsigned Destructions;
-  static unsigned MoveAssignments;
-  int val;
-  explicit MoveOnly(int val) : val(val) {
-  }
-  MoveOnly(MoveOnly&& other) {
-    val = other.val;
-    ++MoveConstructions;
-  }
-  MoveOnly &operator=(MoveOnly&& other) {
-    val = other.val;
-    ++MoveAssignments;
-    return *this;
-  }
-  ~MoveOnly() {
-    ++Destructions;
-  }
-  static void ResetCounts() {
-    MoveConstructions = 0;
-    Destructions = 0;
-    MoveAssignments = 0;
-  }
-};
-
-unsigned MoveOnly::MoveConstructions = 0;
-unsigned MoveOnly::Destructions = 0;
-unsigned MoveOnly::MoveAssignments = 0;
-
-static_assert(!std::is_trivially_copyable<Optional<MoveOnly>>::value,
-              "not trivially copyable");
-
-TEST(OptionalTest, MoveOnlyNull) {
-  MoveOnly::ResetCounts();
-  Optional<MoveOnly> O;
-  EXPECT_EQ(0u, MoveOnly::MoveConstructions);
-  EXPECT_EQ(0u, MoveOnly::MoveAssignments);
-  EXPECT_EQ(0u, MoveOnly::Destructions);
-}
-
-TEST(OptionalTest, MoveOnlyConstruction) {
-  MoveOnly::ResetCounts();
-  Optional<MoveOnly> O(MoveOnly(3));
-  EXPECT_TRUE((bool)O);
-  EXPECT_EQ(3, O->val);
-  EXPECT_EQ(1u, MoveOnly::MoveConstructions);
-  EXPECT_EQ(0u, MoveOnly::MoveAssignments);
-  EXPECT_EQ(1u, MoveOnly::Destructions);
-}
-
-TEST(OptionalTest, MoveOnlyMoveConstruction) {
-  Optional<MoveOnly> A(MoveOnly(3));
-  MoveOnly::ResetCounts();
-  Optional<MoveOnly> B(std::move(A));
-  EXPECT_TRUE((bool)A);
-  EXPECT_TRUE((bool)B);
-  EXPECT_EQ(3, B->val);
-  EXPECT_EQ(1u, MoveOnly::MoveConstructions);
-  EXPECT_EQ(0u, MoveOnly::MoveAssignments);
-  EXPECT_EQ(0u, MoveOnly::Destructions);
-}
-
-TEST(OptionalTest, MoveOnlyAssignment) {
-  MoveOnly::ResetCounts();
-  Optional<MoveOnly> O;
-  O = MoveOnly(3);
-  EXPECT_TRUE((bool)O);
-  EXPECT_EQ(3, O->val);
-  EXPECT_EQ(1u, MoveOnly::MoveConstructions);
-  EXPECT_EQ(0u, MoveOnly::MoveAssignments);
-  EXPECT_EQ(1u, MoveOnly::Destructions);
-}
-
-TEST(OptionalTest, MoveOnlyInitializingAssignment) {
-  Optional<MoveOnly> A(MoveOnly(3));
-  Optional<MoveOnly> B;
-  MoveOnly::ResetCounts();
-  B = std::move(A);
-  EXPECT_TRUE((bool)A);
-  EXPECT_TRUE((bool)B);
-  EXPECT_EQ(3, B->val);
-  EXPECT_EQ(1u, MoveOnly::MoveConstructions);
-  EXPECT_EQ(0u, MoveOnly::MoveAssignments);
-  EXPECT_EQ(0u, MoveOnly::Destructions);
-}
-
-TEST(OptionalTest, MoveOnlyNullingAssignment) {
-  Optional<MoveOnly> A;
-  Optional<MoveOnly> B(MoveOnly(3));
-  MoveOnly::ResetCounts();
-  B = std::move(A);
-  EXPECT_FALSE((bool)A);
-  EXPECT_FALSE((bool)B);
-  EXPECT_EQ(0u, MoveOnly::MoveConstructions);
-  EXPECT_EQ(0u, MoveOnly::MoveAssignments);
-  EXPECT_EQ(1u, MoveOnly::Destructions);
-}
-
-TEST(OptionalTest, MoveOnlyAssigningAssignment) {
-  Optional<MoveOnly> A(MoveOnly(3));
-  Optional<MoveOnly> B(MoveOnly(4));
-  MoveOnly::ResetCounts();
-  B = std::move(A);
-  EXPECT_TRUE((bool)A);
-  EXPECT_TRUE((bool)B);
-  EXPECT_EQ(3, B->val);
-  EXPECT_EQ(0u, MoveOnly::MoveConstructions);
-  EXPECT_EQ(1u, MoveOnly::MoveAssignments);
-  EXPECT_EQ(0u, MoveOnly::Destructions);
-}
-
-struct Immovable {
-  static unsigned Constructions;
-  static unsigned Destructions;
-  int val;
-  explicit Immovable(int val) : val(val) {
-    ++Constructions;
-  }
-  ~Immovable() {
-    ++Destructions;
-  }
-  static void ResetCounts() {
-    Constructions = 0;
-    Destructions = 0;
-  }
-private:
-  // This should disable all move/copy operations.
-  Immovable(Immovable&& other) = delete;
-};
-
-unsigned Immovable::Constructions = 0;
-unsigned Immovable::Destructions = 0;
-
-static_assert(!std::is_trivially_copyable<Optional<Immovable>>::value,
-              "not trivially copyable");
-
-TEST(OptionalTest, ImmovableEmplace) {
-  Optional<Immovable> A;
-  Immovable::ResetCounts();
-  A.emplace(4);
-  EXPECT_TRUE((bool)A);
-  EXPECT_EQ(4, A->val);
-  EXPECT_EQ(1u, Immovable::Constructions);
-  EXPECT_EQ(0u, Immovable::Destructions);
-}
-
-TEST(OptionalTest, ImmovableInPlaceConstruction) {
-  Immovable::ResetCounts();
-  Optional<Immovable> A{in_place, 4};
-  EXPECT_TRUE((bool)A);
-  EXPECT_EQ(4, A->val);
-  EXPECT_EQ(1u, Immovable::Constructions);
-  EXPECT_EQ(0u, Immovable::Destructions);
-}
-
-// Craft a class which is_trivially_copyable, but not
-// is_trivially_copy_constructible.
-struct NonTCopy {
-  NonTCopy() = default;
-
-  // Delete the volatile copy constructor to engage the "rule of 3" and delete
-  // any unspecified copy assignment or constructor.
-  NonTCopy(volatile NonTCopy const &) = delete;
-
-  // Leave the non-volatile default copy constructor unspecified (deleted by
-  // rule of 3)
-
-  // This template can serve as the copy constructor, but isn't chosen
-  // by =default in a class with a 'NonTCopy' member.
-  template <typename Self = NonTCopy>
-  NonTCopy(Self const &Other) : Val(Other.Val) {}
-
-  NonTCopy &operator=(NonTCopy const &) = default;
-
-  int Val{0};
-};
-
-#if defined(_MSC_VER) && _MSC_VER >= 1927 && !defined(__clang__)
-// Currently only true on recent MSVC releases.
-static_assert(std::is_trivially_copyable<NonTCopy>::value,
-              "Expect NonTCopy to be trivially copyable");
-
-static_assert(!std::is_trivially_copy_constructible<NonTCopy>::value,
-              "Expect NonTCopy not to be trivially copy constructible.");
-#endif // defined(_MSC_VER) && _MSC_VER >= 1927
-
-TEST(OptionalTest, DeletedCopyConstructor) {
-
-  // Expect compile to fail if 'trivial' version of
-  // optional_detail::OptionalStorage is chosen.
-  using NonTCopyOptT = Optional<NonTCopy>;
-  NonTCopyOptT NonTCopy1;
-
-  // Check that the Optional can be copy constructed.
-  NonTCopyOptT NonTCopy2{NonTCopy1};
-
-  // Check that the Optional can be copy assigned.
-  NonTCopy1 = NonTCopy2;
-}
-
-// Craft a class which is_trivially_copyable, but not
-// is_trivially_copy_assignable.
-class NonTAssign {
-public:
-  NonTAssign() = default;
-  NonTAssign(NonTAssign const &) = default;
-
-  // Delete the volatile copy assignment to engage the "rule of 3" and delete
-  // any unspecified copy assignment or constructor.
-  NonTAssign &operator=(volatile NonTAssign const &) = delete;
-
-  // Leave the non-volatile default copy assignment unspecified (deleted by rule
-  // of 3).
-
-  // This template can serve as the copy assignment, but isn't chosen
-  // by =default in a class with a 'NonTAssign' member.
-  template <typename Self = NonTAssign>
-  NonTAssign &operator=(Self const &Other) {
-    A = Other.A;
-    return *this;
-  }
-
-  int A{0};
-};
-
-#if defined(_MSC_VER) && _MSC_VER >= 1927 && !defined(__clang__)
-// Currently only true on recent MSVC releases.
-static_assert(std::is_trivially_copyable<NonTAssign>::value,
-              "Expect NonTAssign to be trivially copyable");
-
-static_assert(!std::is_trivially_copy_assignable<NonTAssign>::value,
-              "Expect NonTAssign not to be trivially assignable.");
-#endif // defined(_MSC_VER) && _MSC_VER >= 1927
-
-TEST(OptionalTest, DeletedCopyAssignment) {
-
-  // Expect compile to fail if 'trivial' version of
-  // optional_detail::OptionalStorage is chosen.
-  using NonTAssignOptT = Optional<NonTAssign>;
-  NonTAssignOptT NonTAssign1;
-
-  // Check that the Optional can be copy constructed.
-  NonTAssignOptT NonTAssign2{NonTAssign1};
-
-  // Check that the Optional can be copy assigned.
-  NonTAssign1 = NonTAssign2;
-}
-
-struct NoTMove {
-  NoTMove() = default;
-  NoTMove(NoTMove const &) = default;
-  NoTMove &operator=(NoTMove const &) = default;
-
-  // Delete move constructor / assignment.  Compiler should fall-back to the
-  // trivial copy constructor / assignment in the trivial OptionalStorage
-  // specialization.
-  NoTMove(NoTMove &&) = delete;
-  NoTMove &operator=(NoTMove &&) = delete;
-
-  int Val{0};
-};
-
-TEST(OptionalTest, DeletedMoveConstructor) {
-  using NoTMoveOptT = Optional<NoTMove>;
-
-  NoTMoveOptT NonTMove1;
-  NoTMoveOptT NonTMove2{std::move(NonTMove1)};
-
-  NonTMove1 = std::move(NonTMove2);
-
-  static_assert(
-      std::is_trivially_copyable<NoTMoveOptT>::value,
-      "Expect Optional<NoTMove> to still use the trivial specialization "
-      "of OptionalStorage despite the deleted move constructor / assignment.");
-}
-
-class NoCopyStringMap {
-public:
-  NoCopyStringMap() = default;
-
-private:
-  llvm::StringMap<std::unique_ptr<int>> Map;
-};
-
-TEST(OptionalTest, DeletedCopyStringMap) {
-  // Old versions of gcc (7.3 and prior) instantiate the copy constructor when
-  // std::is_trivially_copyable is instantiated.  This test will fail
-  // compilation if std::is_trivially_copyable is used in the OptionalStorage
-  // specialization condition by gcc <= 7.3.
-  Optional<NoCopyStringMap> TestInstantiation;
-}
-
-#if LLVM_HAS_RVALUE_REFERENCE_THIS
-
-TEST(OptionalTest, MoveGetValueOr) {
-  Optional<MoveOnly> A;
-
-  MoveOnly::ResetCounts();
-  EXPECT_EQ(42, std::move(A).getValueOr(MoveOnly(42)).val);
-  EXPECT_EQ(1u, MoveOnly::MoveConstructions);
-  EXPECT_EQ(0u, MoveOnly::MoveAssignments);
-  EXPECT_EQ(2u, MoveOnly::Destructions);
-
-  A = MoveOnly(5);
-  MoveOnly::ResetCounts();
-  EXPECT_EQ(5, std::move(A).getValueOr(MoveOnly(42)).val);
-  EXPECT_EQ(1u, MoveOnly::MoveConstructions);
-  EXPECT_EQ(0u, MoveOnly::MoveAssignments);
-  EXPECT_EQ(2u, MoveOnly::Destructions);
-}
-
-#endif // LLVM_HAS_RVALUE_REFERENCE_THIS
-
-struct EqualTo {
-  template <typename T, typename U> static bool apply(const T &X, const U &Y) {
-    return X == Y;
-  }
-};
-
-struct NotEqualTo {
-  template <typename T, typename U> static bool apply(const T &X, const U &Y) {
-    return X != Y;
-  }
-};
-
-struct Less {
-  template <typename T, typename U> static bool apply(const T &X, const U &Y) {
-    return X < Y;
-  }
-};
-
-struct Greater {
-  template <typename T, typename U> static bool apply(const T &X, const U &Y) {
-    return X > Y;
-  }
-};
-
-struct LessEqual {
-  template <typename T, typename U> static bool apply(const T &X, const U &Y) {
-    return X <= Y;
-  }
-};
-
-struct GreaterEqual {
-  template <typename T, typename U> static bool apply(const T &X, const U &Y) {
-    return X >= Y;
-  }
-};
-
-template <typename OperatorT, typename T>
-void CheckRelation(const Optional<T> &Lhs, const Optional<T> &Rhs,
-                   bool Expected) {
-  EXPECT_EQ(Expected, OperatorT::apply(Lhs, Rhs));
-
-  if (Lhs)
-    EXPECT_EQ(Expected, OperatorT::apply(*Lhs, Rhs));
-  else
-    EXPECT_EQ(Expected, OperatorT::apply(None, Rhs));
-
-  if (Rhs)
-    EXPECT_EQ(Expected, OperatorT::apply(Lhs, *Rhs));
-  else
-    EXPECT_EQ(Expected, OperatorT::apply(Lhs, None));
-}
-
-struct EqualityMock {};
-const Optional<EqualityMock> NoneEq, EqualityLhs((EqualityMock())),
-    EqualityRhs((EqualityMock()));
-bool IsEqual;
-
-bool operator==(const EqualityMock &Lhs, const EqualityMock &Rhs) {
-  EXPECT_EQ(&*EqualityLhs, &Lhs);
-  EXPECT_EQ(&*EqualityRhs, &Rhs);
-  return IsEqual;
-}
-
-TEST(OptionalTest, OperatorEqual) {
-  CheckRelation<EqualTo>(NoneEq, NoneEq, true);
-  CheckRelation<EqualTo>(NoneEq, EqualityRhs, false);
-  CheckRelation<EqualTo>(EqualityLhs, NoneEq, false);
-
-  IsEqual = false;
-  CheckRelation<EqualTo>(EqualityLhs, EqualityRhs, IsEqual);
-  IsEqual = true;
-  CheckRelation<EqualTo>(EqualityLhs, EqualityRhs, IsEqual);
-}
-
-TEST(OptionalTest, OperatorNotEqual) {
-  CheckRelation<NotEqualTo>(NoneEq, NoneEq, false);
-  CheckRelation<NotEqualTo>(NoneEq, EqualityRhs, true);
-  CheckRelation<NotEqualTo>(EqualityLhs, NoneEq, true);
-
-  IsEqual = false;
-  CheckRelation<NotEqualTo>(EqualityLhs, EqualityRhs, !IsEqual);
-  IsEqual = true;
-  CheckRelation<NotEqualTo>(EqualityLhs, EqualityRhs, !IsEqual);
-}
-
-struct InequalityMock {};
-const Optional<InequalityMock> NoneIneq, InequalityLhs((InequalityMock())),
-    InequalityRhs((InequalityMock()));
-bool IsLess;
-
-bool operator<(const InequalityMock &Lhs, const InequalityMock &Rhs) {
-  EXPECT_EQ(&*InequalityLhs, &Lhs);
-  EXPECT_EQ(&*InequalityRhs, &Rhs);
-  return IsLess;
-}
-
-TEST(OptionalTest, OperatorLess) {
-  CheckRelation<Less>(NoneIneq, NoneIneq, false);
-  CheckRelation<Less>(NoneIneq, InequalityRhs, true);
-  CheckRelation<Less>(InequalityLhs, NoneIneq, false);
-
-  IsLess = false;
-  CheckRelation<Less>(InequalityLhs, InequalityRhs, IsLess);
-  IsLess = true;
-  CheckRelation<Less>(InequalityLhs, InequalityRhs, IsLess);
-}
-
-TEST(OptionalTest, OperatorGreater) {
-  CheckRelation<Greater>(NoneIneq, NoneIneq, false);
-  CheckRelation<Greater>(NoneIneq, InequalityRhs, false);
-  CheckRelation<Greater>(InequalityLhs, NoneIneq, true);
-
-  IsLess = false;
-  CheckRelation<Greater>(InequalityRhs, InequalityLhs, IsLess);
-  IsLess = true;
-  CheckRelation<Greater>(InequalityRhs, InequalityLhs, IsLess);
-}
-
-TEST(OptionalTest, OperatorLessEqual) {
-  CheckRelation<LessEqual>(NoneIneq, NoneIneq, true);
-  CheckRelation<LessEqual>(NoneIneq, InequalityRhs, true);
-  CheckRelation<LessEqual>(InequalityLhs, NoneIneq, false);
-
-  IsLess = false;
-  CheckRelation<LessEqual>(InequalityRhs, InequalityLhs, !IsLess);
-  IsLess = true;
-  CheckRelation<LessEqual>(InequalityRhs, InequalityLhs, !IsLess);
-}
-
-TEST(OptionalTest, OperatorGreaterEqual) {
-  CheckRelation<GreaterEqual>(NoneIneq, NoneIneq, true);
-  CheckRelation<GreaterEqual>(NoneIneq, InequalityRhs, false);
-  CheckRelation<GreaterEqual>(InequalityLhs, NoneIneq, true);
-
-  IsLess = false;
-  CheckRelation<GreaterEqual>(InequalityLhs, InequalityRhs, !IsLess);
-  IsLess = true;
-  CheckRelation<GreaterEqual>(InequalityLhs, InequalityRhs, !IsLess);
-}
-
-struct ComparableAndStreamable {
-  friend bool operator==(ComparableAndStreamable,
-                         ComparableAndStreamable) LLVM_ATTRIBUTE_USED {
-    return true;
-  }
-
-  friend raw_ostream &operator<<(raw_ostream &OS, ComparableAndStreamable) {
-    return OS << "ComparableAndStreamable";
-  }
-
-  static Optional<ComparableAndStreamable> get() {
-    return ComparableAndStreamable();
-  }
-};
-
-TEST(OptionalTest, StreamOperator) {
-  auto to_string = [](Optional<ComparableAndStreamable> O) {
-    SmallString<16> S;
-    raw_svector_ostream OS(S);
-    OS << O;
-    return S;
-  };
-  EXPECT_EQ("ComparableAndStreamable",
-            to_string(ComparableAndStreamable::get()));
-  EXPECT_EQ("None", to_string(None));
-}
-
-struct Comparable {
-  friend bool operator==(Comparable, Comparable) LLVM_ATTRIBUTE_USED {
-    return true;
-  }
-  static Optional<Comparable> get() { return Comparable(); }
-};
-
-TEST(OptionalTest, UseInUnitTests) {
-  // Test that we invoke the streaming operators when pretty-printing values in
-  // EXPECT macros.
-  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(llvm::None, ComparableAndStreamable::get()),
-                          "Expected equality of these values:\n"
-                          "  llvm::None\n"
-                          "    Which is: None\n"
-                          "  ComparableAndStreamable::get()\n"
-                          "    Which is: ComparableAndStreamable");
-
-  // Test that it is still possible to compare objects which do not have a
-  // custom streaming operator.
-  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(llvm::None, Comparable::get()), "object");
-}
-
-TEST(OptionalTest, HashValue) {
-  // Check that None, false, and true all hash differently.
-  Optional<bool> B, B0 = false, B1 = true;
-  EXPECT_NE(hash_value(B0), hash_value(B));
-  EXPECT_NE(hash_value(B1), hash_value(B));
-  EXPECT_NE(hash_value(B1), hash_value(B0));
-
-  // Check that None, 0, and 1 all hash differently.
-  Optional<int> I, I0 = 0, I1 = 1;
-  EXPECT_NE(hash_value(I0), hash_value(I));
-  EXPECT_NE(hash_value(I1), hash_value(I));
-  EXPECT_NE(hash_value(I1), hash_value(I0));
-
-  // Check None hash the same way regardless of type.
-  EXPECT_EQ(hash_value(B), hash_value(I));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/PackedVectorTest.cpp b/gnu/llvm/llvm/unittests/ADT/PackedVectorTest.cpp
deleted file mode 100644
index 24df3989346..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/PackedVectorTest.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-//===- llvm/unittest/ADT/PackedVectorTest.cpp - PackedVector tests --------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// BitVectorTest tests fail on PowerPC for unknown reasons, so disable this
-// as well since it depends on a BitVector.
-#ifndef __ppc__
-
-#include "llvm/ADT/PackedVector.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST(PackedVectorTest, Operation) {
-  PackedVector<unsigned, 2> Vec;
-  EXPECT_EQ(0U, Vec.size());
-  EXPECT_TRUE(Vec.empty());
-
-  Vec.resize(5);
-  EXPECT_EQ(5U, Vec.size());
-  EXPECT_FALSE(Vec.empty());
-
-  Vec.resize(11);
-  EXPECT_EQ(11U, Vec.size());
-  EXPECT_FALSE(Vec.empty());
-
-  PackedVector<unsigned, 2> Vec2(3);
-  EXPECT_EQ(3U, Vec2.size());
-  EXPECT_FALSE(Vec2.empty());
-
-  Vec.clear();
-  EXPECT_EQ(0U, Vec.size());
-  EXPECT_TRUE(Vec.empty());
-
-  Vec.push_back(2);
-  Vec.push_back(0);
-  Vec.push_back(1);
-  Vec.push_back(3);
-
-  EXPECT_EQ(2U, Vec[0]);
-  EXPECT_EQ(0U, Vec[1]);
-  EXPECT_EQ(1U, Vec[2]);
-  EXPECT_EQ(3U, Vec[3]);
-
-  EXPECT_FALSE(Vec == Vec2);
-  EXPECT_TRUE(Vec != Vec2);
-
-  Vec = Vec2;
-  EXPECT_TRUE(Vec == Vec2);
-  EXPECT_FALSE(Vec != Vec2);
-
-  Vec[1] = 1;
-  Vec2[1] = 2;
-  Vec |= Vec2;
-  EXPECT_EQ(3U, Vec[1]);
-}
-
-#ifdef EXPECT_DEBUG_DEATH
-
-TEST(PackedVectorTest, UnsignedValues) {
-  PackedVector<unsigned, 2> Vec(1);
-  Vec[0] = 0;
-  Vec[0] = 1;
-  Vec[0] = 2;
-  Vec[0] = 3;
-  EXPECT_DEBUG_DEATH(Vec[0] = 4, "value is too big");
-  EXPECT_DEBUG_DEATH(Vec[0] = -1, "value is too big");
-  EXPECT_DEBUG_DEATH(Vec[0] = 0x100, "value is too big");
-
-  PackedVector<unsigned, 3> Vec2(1);
-  Vec2[0] = 0;
-  Vec2[0] = 7;
-  EXPECT_DEBUG_DEATH(Vec[0] = 8, "value is too big");
-}
-
-TEST(PackedVectorTest, SignedValues) {
-  PackedVector<signed, 2> Vec(1);
-  Vec[0] = -2;
-  Vec[0] = -1;
-  Vec[0] = 0;
-  Vec[0] = 1;
-  EXPECT_DEBUG_DEATH(Vec[0] = -3, "value is too big");
-  EXPECT_DEBUG_DEATH(Vec[0] = 2, "value is too big");
-
-  PackedVector<signed, 3> Vec2(1);
-  Vec2[0] = -4;
-  Vec2[0] = 3;
-  EXPECT_DEBUG_DEATH(Vec[0] = -5, "value is too big");
-  EXPECT_DEBUG_DEATH(Vec[0] = 4, "value is too big");
-}
-
-#endif
-
-}
-
-#endif
diff --git a/gnu/llvm/llvm/unittests/ADT/PointerEmbeddedIntTest.cpp b/gnu/llvm/llvm/unittests/ADT/PointerEmbeddedIntTest.cpp
deleted file mode 100644
index 12096e489bc..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/PointerEmbeddedIntTest.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-//===- llvm/unittest/ADT/PointerEmbeddedIntTest.cpp -----------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/PointerEmbeddedInt.h"
-#include "gtest/gtest.h"
-using namespace llvm;
-
-namespace {
-
-TEST(PointerEmbeddedIntTest, Basic) {
-  PointerEmbeddedInt<int, CHAR_BIT> I = 42, J = 43;
-
-  EXPECT_EQ(42, I);
-  EXPECT_EQ(43, I + 1);
-  EXPECT_EQ((int)sizeof(uintptr_t) * CHAR_BIT - CHAR_BIT,
-            (int)PointerLikeTypeTraits<decltype(I)>::NumLowBitsAvailable);
-
-  EXPECT_FALSE(I == J);
-  EXPECT_TRUE(I != J);
-  EXPECT_TRUE(I < J);
-  EXPECT_FALSE(I > J);
-  EXPECT_TRUE(I <= J);
-  EXPECT_FALSE(I >= J);
-
-  EXPECT_FALSE(I == 43);
-  EXPECT_TRUE(I != 43);
-  EXPECT_TRUE(I < 43);
-  EXPECT_FALSE(I > 43);
-  EXPECT_TRUE(I <= 43);
-  EXPECT_FALSE(I >= 43);
-
-  EXPECT_FALSE(42 == J);
-  EXPECT_TRUE(42 != J);
-  EXPECT_TRUE(42 < J);
-  EXPECT_FALSE(42 > J);
-  EXPECT_TRUE(42 <= J);
-  EXPECT_FALSE(42 >= J);
-}
-
-TEST(PointerEmbeddedIntTest, intptr_t) {
-  PointerEmbeddedInt<intptr_t, CHAR_BIT> IPos = 42, INeg = -42;
-  EXPECT_EQ(42, IPos);
-  EXPECT_EQ(-42, INeg);
-
-  PointerEmbeddedInt<uintptr_t, CHAR_BIT> U = 42, USaturated = 255;
-  EXPECT_EQ(42U, U);
-  EXPECT_EQ(255U, USaturated);
-
-  PointerEmbeddedInt<intptr_t, std::numeric_limits<intptr_t>::digits>
-      IMax = std::numeric_limits<intptr_t>::max() >> 1,
-      IMin = std::numeric_limits<intptr_t>::min() >> 1;
-  EXPECT_EQ(std::numeric_limits<intptr_t>::max() >> 1, IMax);
-  EXPECT_EQ(std::numeric_limits<intptr_t>::min() >> 1, IMin);
-
-  PointerEmbeddedInt<uintptr_t, std::numeric_limits<uintptr_t>::digits - 1>
-      UMax = std::numeric_limits<uintptr_t>::max() >> 1,
-      UMin = std::numeric_limits<uintptr_t>::min() >> 1;
-  EXPECT_EQ(std::numeric_limits<uintptr_t>::max() >> 1, UMax);
-  EXPECT_EQ(std::numeric_limits<uintptr_t>::min() >> 1, UMin);
-}
-
-TEST(PointerEmbeddedIntTest, PointerLikeTypeTraits) {
-  PointerEmbeddedInt<int, CHAR_BIT> I = 42;
-  using ITraits = PointerLikeTypeTraits<decltype(I)>;
-  EXPECT_EQ(42, ITraits::getFromVoidPointer(ITraits::getAsVoidPointer(I)));
-
-  PointerEmbeddedInt<uintptr_t, std::numeric_limits<uintptr_t>::digits - 1>
-      Max = std::numeric_limits<uintptr_t>::max() >> 1;
-  using MaxTraits = PointerLikeTypeTraits<decltype(Max)>;
-  EXPECT_EQ(std::numeric_limits<uintptr_t>::max() >> 1,
-            MaxTraits::getFromVoidPointer(MaxTraits::getAsVoidPointer(Max)));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/PointerIntPairTest.cpp b/gnu/llvm/llvm/unittests/ADT/PointerIntPairTest.cpp
deleted file mode 100644
index 8a42e5b9f55..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/PointerIntPairTest.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//===- llvm/unittest/ADT/PointerIntPairTest.cpp - Unit tests --------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/PointerIntPair.h"
-#include "gtest/gtest.h"
-#include <limits>
-using namespace llvm;
-
-namespace {
-
-TEST(PointerIntPairTest, GetSet) {
-  struct S {
-    int i;
-  };
-  S s;
-
-  PointerIntPair<S *, 2> Pair(&s, 1U);
-  EXPECT_EQ(&s, Pair.getPointer());
-  EXPECT_EQ(1U, Pair.getInt());
-
-  Pair.setInt(2);
-  EXPECT_EQ(&s, Pair.getPointer());
-  EXPECT_EQ(2U, Pair.getInt());
-
-  Pair.setPointer(nullptr);
-  EXPECT_EQ(nullptr, Pair.getPointer());
-  EXPECT_EQ(2U, Pair.getInt());
-
-  Pair.setPointerAndInt(&s, 3U);
-  EXPECT_EQ(&s, Pair.getPointer());
-  EXPECT_EQ(3U, Pair.getInt());
-
-  // Make sure that we can perform all of our operations on enum classes.
-  //
-  // The concern is that enum classes are only explicitly convertible to
-  // integers. This means that if we assume in PointerIntPair this, a
-  // compilation error will result. This group of tests exercises the enum class
-  // code to make sure that we do not run into such issues in the future.
-  enum class E : unsigned {
-    Case1,
-    Case2,
-    Case3,
-  };
-  PointerIntPair<S *, 2, E> Pair2(&s, E::Case1);
-  EXPECT_EQ(&s, Pair2.getPointer());
-  EXPECT_EQ(E::Case1, Pair2.getInt());
-
-  Pair2.setInt(E::Case2);
-  EXPECT_EQ(&s, Pair2.getPointer());
-  EXPECT_EQ(E::Case2, Pair2.getInt());
-
-  Pair2.setPointer(nullptr);
-  EXPECT_EQ(nullptr, Pair2.getPointer());
-  EXPECT_EQ(E::Case2, Pair2.getInt());
-
-  Pair2.setPointerAndInt(&s, E::Case3);
-  EXPECT_EQ(&s, Pair2.getPointer());
-  EXPECT_EQ(E::Case3, Pair2.getInt());
-
-  static_assert(std::is_trivially_copyable<PointerIntPair<S *, 2, E>>::value,
-                "trivially copyable");
-}
-
-TEST(PointerIntPairTest, DefaultInitialize) {
-  PointerIntPair<float *, 2> Pair;
-  EXPECT_EQ(nullptr, Pair.getPointer());
-  EXPECT_EQ(0U, Pair.getInt());
-}
-
-// In real code this would be a word-sized integer limited to 31 bits.
-struct Fixnum31 {
-  uintptr_t Value;
-};
-struct FixnumPointerTraits {
-  static inline void *getAsVoidPointer(Fixnum31 Num) {
-    return reinterpret_cast<void *>(Num.Value << NumLowBitsAvailable);
-  }
-  static inline Fixnum31 getFromVoidPointer(void *P) {
-    // In real code this would assert that the value is in range.
-    return {reinterpret_cast<uintptr_t>(P) >> NumLowBitsAvailable};
-  }
-  static constexpr int NumLowBitsAvailable =
-      std::numeric_limits<uintptr_t>::digits - 31;
-};
-TEST(PointerIntPairTest, ManyUnusedBits) {
-
-  PointerIntPair<Fixnum31, 1, bool, FixnumPointerTraits> pair;
-  EXPECT_EQ((uintptr_t)0, pair.getPointer().Value);
-  EXPECT_FALSE(pair.getInt());
-
-  pair.setPointerAndInt({ 0x7FFFFFFF }, true );
-  EXPECT_EQ((uintptr_t)0x7FFFFFFF, pair.getPointer().Value);
-  EXPECT_TRUE(pair.getInt());
-
-  EXPECT_EQ(FixnumPointerTraits::NumLowBitsAvailable - 1,
-            (int)PointerLikeTypeTraits<decltype(pair)>::NumLowBitsAvailable);
-
-  static_assert(
-      std::is_trivially_copyable<
-          PointerIntPair<Fixnum31, 1, bool, FixnumPointerTraits>>::value,
-      "trivially copyable");
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/PointerSumTypeTest.cpp b/gnu/llvm/llvm/unittests/ADT/PointerSumTypeTest.cpp
deleted file mode 100644
index fbf59f3a2fd..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/PointerSumTypeTest.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-//===- llvm/unittest/ADT/PointerSumTypeTest.cpp ---------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/PointerSumType.h"
-#include "gtest/gtest.h"
-using namespace llvm;
-
-namespace {
-
-struct PointerSumTypeTest : public testing::Test {
-  enum Kinds { Float, Int1, Int2 };
-  float f;
-  int i1, i2;
-
-  typedef PointerSumType<Kinds, PointerSumTypeMember<Float, float *>,
-                         PointerSumTypeMember<Int1, int *>,
-                         PointerSumTypeMember<Int2, int *>>
-      SumType;
-  SumType a, b, c, n;
-
-  PointerSumTypeTest()
-      : f(3.14f), i1(42), i2(-1), a(SumType::create<Float>(&f)),
-        b(SumType::create<Int1>(&i1)), c(SumType::create<Int2>(&i2)), n() {}
-};
-
-TEST_F(PointerSumTypeTest, NullTest) {
-  EXPECT_TRUE(a);
-  EXPECT_TRUE(b);
-  EXPECT_TRUE(c);
-  EXPECT_FALSE(n);
-}
-
-TEST_F(PointerSumTypeTest, GetTag) {
-  EXPECT_EQ(Float, a.getTag());
-  EXPECT_EQ(Int1, b.getTag());
-  EXPECT_EQ(Int2, c.getTag());
-  EXPECT_EQ((Kinds)0, n.getTag());
-}
-
-TEST_F(PointerSumTypeTest, Is) {
-  EXPECT_TRUE(a.is<Float>());
-  EXPECT_FALSE(a.is<Int1>());
-  EXPECT_FALSE(a.is<Int2>());
-  EXPECT_FALSE(b.is<Float>());
-  EXPECT_TRUE(b.is<Int1>());
-  EXPECT_FALSE(b.is<Int2>());
-  EXPECT_FALSE(c.is<Float>());
-  EXPECT_FALSE(c.is<Int1>());
-  EXPECT_TRUE(c.is<Int2>());
-}
-
-TEST_F(PointerSumTypeTest, Get) {
-  EXPECT_EQ(&f, a.get<Float>());
-  EXPECT_EQ(nullptr, a.get<Int1>());
-  EXPECT_EQ(nullptr, a.get<Int2>());
-  EXPECT_EQ(nullptr, b.get<Float>());
-  EXPECT_EQ(&i1, b.get<Int1>());
-  EXPECT_EQ(nullptr, b.get<Int2>());
-  EXPECT_EQ(nullptr, c.get<Float>());
-  EXPECT_EQ(nullptr, c.get<Int1>());
-  EXPECT_EQ(&i2, c.get<Int2>());
-
-  // Note that we can use .get even on a null sum type. It just always produces
-  // a null pointer, even if one of the discriminants is null.
-  EXPECT_EQ(nullptr, n.get<Float>());
-  EXPECT_EQ(nullptr, n.get<Int1>());
-  EXPECT_EQ(nullptr, n.get<Int2>());
-}
-
-TEST_F(PointerSumTypeTest, Cast) {
-  EXPECT_EQ(&f, a.cast<Float>());
-  EXPECT_EQ(&i1, b.cast<Int1>());
-  EXPECT_EQ(&i2, c.cast<Int2>());
-}
-
-TEST_F(PointerSumTypeTest, Assignment) {
-  b = SumType::create<Int2>(&i2);
-  EXPECT_EQ(nullptr, b.get<Float>());
-  EXPECT_EQ(nullptr, b.get<Int1>());
-  EXPECT_EQ(&i2, b.get<Int2>());
-
-  b = SumType::create<Int2>(&i1);
-  EXPECT_EQ(nullptr, b.get<Float>());
-  EXPECT_EQ(nullptr, b.get<Int1>());
-  EXPECT_EQ(&i1, b.get<Int2>());
-
-  float Local = 1.616f;
-  b = SumType::create<Float>(&Local);
-  EXPECT_EQ(&Local, b.get<Float>());
-  EXPECT_EQ(nullptr, b.get<Int1>());
-  EXPECT_EQ(nullptr, b.get<Int2>());
-
-  n = SumType::create<Int1>(&i2);
-  EXPECT_TRUE(n);
-  EXPECT_EQ(nullptr, n.get<Float>());
-  EXPECT_EQ(&i2, n.get<Int1>());
-  EXPECT_EQ(nullptr, n.get<Int2>());
-
-  n = SumType::create<Float>(nullptr);
-  EXPECT_FALSE(n);
-  EXPECT_EQ(nullptr, n.get<Float>());
-  EXPECT_EQ(nullptr, n.get<Int1>());
-  EXPECT_EQ(nullptr, n.get<Int2>());
-}
-
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/PointerUnionTest.cpp b/gnu/llvm/llvm/unittests/ADT/PointerUnionTest.cpp
deleted file mode 100644
index 3c709baf385..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/PointerUnionTest.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-//===- llvm/unittest/ADT/PointerUnionTest.cpp - Optional unit tests -------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/PointerUnion.h"
-#include "gtest/gtest.h"
-using namespace llvm;
-
-namespace {
-
-typedef PointerUnion<int *, float *> PU;
-typedef PointerUnion<int *, float *, long long *> PU3;
-typedef PointerUnion<int *, float *, long long *, double *> PU4;
-
-struct PointerUnionTest : public testing::Test {
-  float f;
-  int i;
-  double d;
-  long long l;
-
-  PU a, b, c, n;
-  PU3 i3, f3, l3;
-  PU4 i4, f4, l4, d4;
-  PU4 i4null, f4null, l4null, d4null;
-
-  PointerUnionTest()
-      : f(3.14f), i(42), d(3.14), l(42), a(&f), b(&i), c(&i), n(), i3(&i),
-        f3(&f), l3(&l), i4(&i), f4(&f), l4(&l), d4(&d), i4null((int *)nullptr),
-        f4null((float *)nullptr), l4null((long long *)nullptr),
-        d4null((double *)nullptr) {}
-};
-
-TEST_F(PointerUnionTest, Comparison) {
-  EXPECT_TRUE(a == a);
-  EXPECT_FALSE(a != a);
-  EXPECT_TRUE(a != b);
-  EXPECT_FALSE(a == b);
-  EXPECT_TRUE(b == c);
-  EXPECT_FALSE(b != c);
-  EXPECT_TRUE(b != n);
-  EXPECT_FALSE(b == n);
-  EXPECT_TRUE(i3 == i3);
-  EXPECT_FALSE(i3 != i3);
-  EXPECT_TRUE(i3 != f3);
-  EXPECT_TRUE(f3 != l3);
-  EXPECT_TRUE(i4 == i4);
-  EXPECT_FALSE(i4 != i4);
-  EXPECT_TRUE(i4 != f4);
-  EXPECT_TRUE(i4 != l4);
-  EXPECT_TRUE(f4 != l4);
-  EXPECT_TRUE(l4 != d4);
-  EXPECT_TRUE(i4null != f4null);
-  EXPECT_TRUE(i4null != l4null);
-  EXPECT_TRUE(i4null != d4null);
-}
-
-TEST_F(PointerUnionTest, Null) {
-  EXPECT_FALSE(a.isNull());
-  EXPECT_FALSE(b.isNull());
-  EXPECT_TRUE(n.isNull());
-  EXPECT_FALSE(!a);
-  EXPECT_FALSE(!b);
-  EXPECT_TRUE(!n);
-  // workaround an issue with EXPECT macros and explicit bool
-  EXPECT_TRUE((bool)a);
-  EXPECT_TRUE((bool)b);
-  EXPECT_FALSE(n);
-
-  EXPECT_NE(n, b);
-  EXPECT_EQ(b, c);
-  b = nullptr;
-  EXPECT_EQ(n, b);
-  EXPECT_NE(b, c);
-  EXPECT_FALSE(i3.isNull());
-  EXPECT_FALSE(f3.isNull());
-  EXPECT_FALSE(l3.isNull());
-  EXPECT_FALSE(i4.isNull());
-  EXPECT_FALSE(f4.isNull());
-  EXPECT_FALSE(l4.isNull());
-  EXPECT_FALSE(d4.isNull());
-  EXPECT_TRUE(i4null.isNull());
-  EXPECT_TRUE(f4null.isNull());
-  EXPECT_TRUE(l4null.isNull());
-  EXPECT_TRUE(d4null.isNull());
-}
-
-TEST_F(PointerUnionTest, Is) {
-  EXPECT_FALSE(a.is<int *>());
-  EXPECT_TRUE(a.is<float *>());
-  EXPECT_TRUE(b.is<int *>());
-  EXPECT_FALSE(b.is<float *>());
-  EXPECT_TRUE(n.is<int *>());
-  EXPECT_FALSE(n.is<float *>());
-  EXPECT_TRUE(i3.is<int *>());
-  EXPECT_TRUE(f3.is<float *>());
-  EXPECT_TRUE(l3.is<long long *>());
-  EXPECT_TRUE(i4.is<int *>());
-  EXPECT_TRUE(f4.is<float *>());
-  EXPECT_TRUE(l4.is<long long *>());
-  EXPECT_TRUE(d4.is<double *>());
-  EXPECT_TRUE(i4null.is<int *>());
-  EXPECT_TRUE(f4null.is<float *>());
-  EXPECT_TRUE(l4null.is<long long *>());
-  EXPECT_TRUE(d4null.is<double *>());
-}
-
-TEST_F(PointerUnionTest, Get) {
-  EXPECT_EQ(a.get<float *>(), &f);
-  EXPECT_EQ(b.get<int *>(), &i);
-  EXPECT_EQ(n.get<int *>(), (int *)nullptr);
-}
-
-template<int I> struct alignas(8) Aligned {};
-
-typedef PointerUnion<Aligned<0> *, Aligned<1> *, Aligned<2> *, Aligned<3> *,
-                     Aligned<4> *, Aligned<5> *, Aligned<6> *, Aligned<7> *>
-    PU8;
-
-TEST_F(PointerUnionTest, ManyElements) {
-  Aligned<0> a0;
-  Aligned<7> a7;
-
-  PU8 a = &a0;
-  EXPECT_TRUE(a.is<Aligned<0>*>());
-  EXPECT_FALSE(a.is<Aligned<1>*>());
-  EXPECT_FALSE(a.is<Aligned<2>*>());
-  EXPECT_FALSE(a.is<Aligned<3>*>());
-  EXPECT_FALSE(a.is<Aligned<4>*>());
-  EXPECT_FALSE(a.is<Aligned<5>*>());
-  EXPECT_FALSE(a.is<Aligned<6>*>());
-  EXPECT_FALSE(a.is<Aligned<7>*>());
-  EXPECT_EQ(a.dyn_cast<Aligned<0>*>(), &a0);
-  EXPECT_EQ(*a.getAddrOfPtr1(), &a0);
-
-  a = &a7;
-  EXPECT_FALSE(a.is<Aligned<0>*>());
-  EXPECT_FALSE(a.is<Aligned<1>*>());
-  EXPECT_FALSE(a.is<Aligned<2>*>());
-  EXPECT_FALSE(a.is<Aligned<3>*>());
-  EXPECT_FALSE(a.is<Aligned<4>*>());
-  EXPECT_FALSE(a.is<Aligned<5>*>());
-  EXPECT_FALSE(a.is<Aligned<6>*>());
-  EXPECT_TRUE(a.is<Aligned<7>*>());
-  EXPECT_EQ(a.dyn_cast<Aligned<7>*>(), &a7);
-
-  EXPECT_TRUE(a == PU8(&a7));
-  EXPECT_TRUE(a != PU8(&a0));
-}
-
-TEST_F(PointerUnionTest, GetAddrOfPtr1) {
-  EXPECT_TRUE((void *)b.getAddrOfPtr1() == (void *)&b);
-  EXPECT_TRUE((void *)n.getAddrOfPtr1() == (void *)&n);
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/PostOrderIteratorTest.cpp b/gnu/llvm/llvm/unittests/ADT/PostOrderIteratorTest.cpp
deleted file mode 100644
index e9ab251f422..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/PostOrderIteratorTest.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//===- PostOrderIteratorTest.cpp - PostOrderIterator unit tests -----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-#include "llvm/ADT/PostOrderIterator.h"
-#include "llvm/IR/BasicBlock.h"
-#include "llvm/IR/CFG.h"
-#include "gtest/gtest.h"
-#include "TestGraph.h"
-
-using namespace llvm;
-
-namespace {
-
-// Whether we're able to compile
-TEST(PostOrderIteratorTest, Compiles) {
-  typedef SmallPtrSet<void *, 4> ExtSetTy;
-
-  // Tests that template specializations are kept up to date
-  void *Null = nullptr;
-  po_iterator_storage<std::set<void *>, false> PIS;
-  PIS.insertEdge(Optional<void *>(), Null);
-  ExtSetTy Ext;
-  po_iterator_storage<ExtSetTy, true> PISExt(Ext);
-  PIS.insertEdge(Optional<void *>(), Null);
-
-  // Test above, but going through po_iterator (which inherits from template
-  // base)
-  BasicBlock *NullBB = nullptr;
-  auto PI = po_end(NullBB);
-  PI.insertEdge(Optional<BasicBlock *>(), NullBB);
-  auto PIExt = po_ext_end(NullBB, Ext);
-  PIExt.insertEdge(Optional<BasicBlock *>(), NullBB);
-}
-
-// Test post-order and reverse post-order traversals for simple graph type.
-TEST(PostOrderIteratorTest, PostOrderAndReversePostOrderTraverrsal) {
-  Graph<6> G;
-  G.AddEdge(0, 1);
-  G.AddEdge(0, 2);
-  G.AddEdge(0, 3);
-  G.AddEdge(1, 4);
-  G.AddEdge(2, 5);
-  G.AddEdge(5, 2);
-  G.AddEdge(2, 4);
-  G.AddEdge(1, 4);
-
-  SmallVector<int> FromIterator;
-  for (auto N : post_order(G))
-    FromIterator.push_back(N->first);
-  EXPECT_EQ(6u, FromIterator.size());
-  EXPECT_EQ(4, FromIterator[0]);
-  EXPECT_EQ(1, FromIterator[1]);
-  EXPECT_EQ(5, FromIterator[2]);
-  EXPECT_EQ(2, FromIterator[3]);
-  EXPECT_EQ(3, FromIterator[4]);
-  EXPECT_EQ(0, FromIterator[5]);
-  FromIterator.clear();
-
-  ReversePostOrderTraversal<Graph<6>> RPOT(G);
-  for (auto N : RPOT)
-    FromIterator.push_back(N->first);
-  EXPECT_EQ(6u, FromIterator.size());
-  EXPECT_EQ(0, FromIterator[0]);
-  EXPECT_EQ(3, FromIterator[1]);
-  EXPECT_EQ(2, FromIterator[2]);
-  EXPECT_EQ(5, FromIterator[3]);
-  EXPECT_EQ(1, FromIterator[4]);
-  EXPECT_EQ(4, FromIterator[5]);
-}
-}
diff --git a/gnu/llvm/llvm/unittests/ADT/PriorityWorklistTest.cpp b/gnu/llvm/llvm/unittests/ADT/PriorityWorklistTest.cpp
deleted file mode 100644
index f12d32ac9f4..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/PriorityWorklistTest.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-//===- llvm/unittest/ADT/PriorityWorklist.cpp -----------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// PriorityWorklist unit tests.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/PriorityWorklist.h"
-#include "gtest/gtest.h"
-#include <list>
-#include <vector>
-
-namespace {
-
-using namespace llvm;
-
-template <typename T> class PriorityWorklistTest : public ::testing::Test {};
-typedef ::testing::Types<PriorityWorklist<int>, SmallPriorityWorklist<int, 2>>
-    TestTypes;
-TYPED_TEST_SUITE(PriorityWorklistTest, TestTypes, );
-
-TYPED_TEST(PriorityWorklistTest, Basic) {
-  TypeParam W;
-  EXPECT_TRUE(W.empty());
-  EXPECT_EQ(0u, W.size());
-  EXPECT_FALSE(W.count(42));
-
-  EXPECT_TRUE(W.insert(21));
-  EXPECT_TRUE(W.insert(42));
-  EXPECT_TRUE(W.insert(17));
-
-  EXPECT_FALSE(W.empty());
-  EXPECT_EQ(3u, W.size());
-  EXPECT_TRUE(W.count(42));
-
-  EXPECT_FALSE(W.erase(75));
-  EXPECT_EQ(3u, W.size());
-  EXPECT_EQ(17, W.back());
-
-  EXPECT_TRUE(W.erase(17));
-  EXPECT_FALSE(W.count(17));
-  EXPECT_EQ(2u, W.size());
-  EXPECT_EQ(42, W.back());
-
-  W.clear();
-  EXPECT_TRUE(W.empty());
-  EXPECT_EQ(0u, W.size());
-
-  EXPECT_TRUE(W.insert(21));
-  EXPECT_TRUE(W.insert(42));
-  EXPECT_TRUE(W.insert(12));
-  EXPECT_TRUE(W.insert(17));
-  EXPECT_TRUE(W.count(12));
-  EXPECT_TRUE(W.count(17));
-  EXPECT_EQ(4u, W.size());
-  EXPECT_EQ(17, W.back());
-  EXPECT_TRUE(W.erase(12));
-  EXPECT_FALSE(W.count(12));
-  EXPECT_TRUE(W.count(17));
-  EXPECT_EQ(3u, W.size());
-  EXPECT_EQ(17, W.back());
-
-  EXPECT_FALSE(W.insert(42));
-  EXPECT_EQ(3u, W.size());
-  EXPECT_EQ(42, W.pop_back_val());
-  EXPECT_EQ(17, W.pop_back_val());
-  EXPECT_EQ(21, W.pop_back_val());
-  EXPECT_TRUE(W.empty());
-}
-
-TYPED_TEST(PriorityWorklistTest, InsertSequence) {
-  TypeParam W;
-  ASSERT_TRUE(W.insert(2));
-  ASSERT_TRUE(W.insert(4));
-  ASSERT_TRUE(W.insert(7));
-  // Insert a sequence that has internal duplicates and a duplicate among
-  // existing entries.
-  W.insert(std::vector<int>({42, 13, 42, 7, 8}));
-  EXPECT_EQ(8, W.pop_back_val());
-  EXPECT_EQ(7, W.pop_back_val());
-  EXPECT_EQ(42, W.pop_back_val());
-  EXPECT_EQ(13, W.pop_back_val());
-  EXPECT_EQ(4, W.pop_back_val());
-  EXPECT_EQ(2, W.pop_back_val());
-  ASSERT_TRUE(W.empty());
-
-  // Simpler tests with various other input types.
-  ASSERT_TRUE(W.insert(2));
-  ASSERT_TRUE(W.insert(7));
-  // Use a non-random-access container.
-  W.insert(std::list<int>({7, 5}));
-  EXPECT_EQ(5, W.pop_back_val());
-  EXPECT_EQ(7, W.pop_back_val());
-  EXPECT_EQ(2, W.pop_back_val());
-  ASSERT_TRUE(W.empty());
-
-  ASSERT_TRUE(W.insert(2));
-  ASSERT_TRUE(W.insert(7));
-  // Use a raw array.
-  int A[] = {7, 5};
-  W.insert(A);
-  EXPECT_EQ(5, W.pop_back_val());
-  EXPECT_EQ(7, W.pop_back_val());
-  EXPECT_EQ(2, W.pop_back_val());
-  ASSERT_TRUE(W.empty());
-
-  ASSERT_TRUE(W.insert(2));
-  ASSERT_TRUE(W.insert(7));
-  // Inserting an empty sequence does nothing.
-  W.insert(std::vector<int>());
-  EXPECT_EQ(7, W.pop_back_val());
-  EXPECT_EQ(2, W.pop_back_val());
-  ASSERT_TRUE(W.empty());
-}
-
-TYPED_TEST(PriorityWorklistTest, EraseIf) {
-  TypeParam W;
-  W.insert(23);
-  W.insert(10);
-  W.insert(47);
-  W.insert(42);
-  W.insert(23);
-  W.insert(13);
-  W.insert(26);
-  W.insert(42);
-  EXPECT_EQ(6u, W.size());
-
-  EXPECT_FALSE(W.erase_if([](int i) { return i > 100; }));
-  EXPECT_EQ(6u, W.size());
-  EXPECT_EQ(42, W.back());
-
-  EXPECT_TRUE(W.erase_if([](int i) {
-    assert(i != 0 && "Saw a null value!");
-    return (i & 1) == 0;
-  }));
-  EXPECT_EQ(3u, W.size());
-  EXPECT_FALSE(W.count(42));
-  EXPECT_FALSE(W.count(26));
-  EXPECT_FALSE(W.count(10));
-  EXPECT_FALSE(W.insert(47));
-  EXPECT_FALSE(W.insert(23));
-  EXPECT_EQ(23, W.pop_back_val());
-  EXPECT_EQ(47, W.pop_back_val());
-  EXPECT_EQ(13, W.pop_back_val());
-}
-
-}
diff --git a/gnu/llvm/llvm/unittests/ADT/RangeAdapterTest.cpp b/gnu/llvm/llvm/unittests/ADT/RangeAdapterTest.cpp
deleted file mode 100644
index 3c68103e174..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/RangeAdapterTest.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-//===- RangeAdapterTest.cpp - Unit tests for range adapters  --------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/iterator_range.h"
-#include "gtest/gtest.h"
-
-#include <iterator>
-#include <list>
-#include <vector>
-
-using namespace llvm;
-
-namespace {
-
-// A wrapper around vector which exposes rbegin(), rend().
-class ReverseOnlyVector {
-  std::vector<int> Vec;
-
-public:
-  ReverseOnlyVector(std::initializer_list<int> list) : Vec(list) {}
-
-  typedef std::vector<int>::reverse_iterator reverse_iterator;
-  typedef std::vector<int>::const_reverse_iterator const_reverse_iterator;
-  reverse_iterator rbegin() { return Vec.rbegin(); }
-  reverse_iterator rend() { return Vec.rend(); }
-  const_reverse_iterator rbegin() const { return Vec.rbegin(); }
-  const_reverse_iterator rend() const { return Vec.rend(); }
-};
-
-// A wrapper around vector which exposes begin(), end(), rbegin() and rend().
-// begin() and end() don't have implementations as this ensures that we will
-// get a linker error if reverse() chooses begin()/end() over rbegin(), rend().
-class BidirectionalVector {
-  mutable std::vector<int> Vec;
-
-public:
-  BidirectionalVector(std::initializer_list<int> list) : Vec(list) {}
-
-  typedef std::vector<int>::iterator iterator;
-  iterator begin() const;
-  iterator end() const;
-
-  typedef std::vector<int>::reverse_iterator reverse_iterator;
-  reverse_iterator rbegin() const { return Vec.rbegin(); }
-  reverse_iterator rend() const { return Vec.rend(); }
-};
-
-/// This is the same as BidirectionalVector but with the addition of const
-/// begin/rbegin methods to ensure that the type traits for has_rbegin works.
-class BidirectionalVectorConsts {
-  std::vector<int> Vec;
-
-public:
-  BidirectionalVectorConsts(std::initializer_list<int> list) : Vec(list) {}
-
-  typedef std::vector<int>::iterator iterator;
-  typedef std::vector<int>::const_iterator const_iterator;
-  iterator begin();
-  iterator end();
-  const_iterator begin() const;
-  const_iterator end() const;
-
-  typedef std::vector<int>::reverse_iterator reverse_iterator;
-  typedef std::vector<int>::const_reverse_iterator const_reverse_iterator;
-  reverse_iterator rbegin() { return Vec.rbegin(); }
-  reverse_iterator rend() { return Vec.rend(); }
-  const_reverse_iterator rbegin() const { return Vec.rbegin(); }
-  const_reverse_iterator rend() const { return Vec.rend(); }
-};
-
-/// Check that types with custom iterators work.
-class CustomIteratorVector {
-  mutable std::vector<int> V;
-
-public:
-  CustomIteratorVector(std::initializer_list<int> list) : V(list) {}
-
-  typedef std::vector<int>::iterator iterator;
-  class reverse_iterator {
-    std::vector<int>::iterator I;
-
-  public:
-    reverse_iterator() = default;
-    reverse_iterator(const reverse_iterator &) = default;
-    reverse_iterator &operator=(const reverse_iterator &) = default;
-
-    explicit reverse_iterator(std::vector<int>::iterator I) : I(I) {}
-
-    reverse_iterator &operator++() {
-      --I;
-      return *this;
-    }
-    reverse_iterator &operator--() {
-      ++I;
-      return *this;
-    }
-    int &operator*() const { return *std::prev(I); }
-    int *operator->() const { return &*std::prev(I); }
-    friend bool operator==(const reverse_iterator &L,
-                           const reverse_iterator &R) {
-      return L.I == R.I;
-    }
-    friend bool operator!=(const reverse_iterator &L,
-                           const reverse_iterator &R) {
-      return !(L == R);
-    }
-  };
-
-  iterator begin() const { return V.begin(); }
-  iterator end()  const { return V.end(); }
-  reverse_iterator rbegin() const { return reverse_iterator(V.end()); }
-  reverse_iterator rend() const { return reverse_iterator(V.begin()); }
-};
-
-template <typename R> void TestRev(const R &r) {
-  int counter = 3;
-  for (int i : r)
-    EXPECT_EQ(i, counter--);
-}
-
-// Test fixture
-template <typename T> class RangeAdapterLValueTest : public ::testing::Test {};
-
-typedef ::testing::Types<std::vector<int>, std::list<int>, int[4]>
-    RangeAdapterLValueTestTypes;
-TYPED_TEST_SUITE(RangeAdapterLValueTest, RangeAdapterLValueTestTypes, );
-
-TYPED_TEST(RangeAdapterLValueTest, TrivialOperation) {
-  TypeParam v = {0, 1, 2, 3};
-  TestRev(reverse(v));
-
-  const TypeParam c = {0, 1, 2, 3};
-  TestRev(reverse(c));
-}
-
-template <typename T> struct RangeAdapterRValueTest : testing::Test {};
-
-typedef ::testing::Types<std::vector<int>, std::list<int>, CustomIteratorVector,
-                         ReverseOnlyVector, BidirectionalVector,
-                         BidirectionalVectorConsts>
-    RangeAdapterRValueTestTypes;
-TYPED_TEST_SUITE(RangeAdapterRValueTest, RangeAdapterRValueTestTypes, );
-
-TYPED_TEST(RangeAdapterRValueTest, TrivialOperation) {
-  TestRev(reverse(TypeParam({0, 1, 2, 3})));
-}
-
-TYPED_TEST(RangeAdapterRValueTest, HasRbegin) {
-  static_assert(has_rbegin<TypeParam>::value, "rbegin() should be defined");
-}
-
-TYPED_TEST(RangeAdapterRValueTest, RangeType) {
-  static_assert(
-      std::is_same<
-          decltype(reverse(*static_cast<TypeParam *>(nullptr)).begin()),
-          decltype(static_cast<TypeParam *>(nullptr)->rbegin())>::value,
-      "reverse().begin() should have the same type as rbegin()");
-  static_assert(
-      std::is_same<
-          decltype(reverse(*static_cast<const TypeParam *>(nullptr)).begin()),
-          decltype(static_cast<const TypeParam *>(nullptr)->rbegin())>::value,
-      "reverse().begin() should have the same type as rbegin() [const]");
-}
-
-} // anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/SCCIteratorTest.cpp b/gnu/llvm/llvm/unittests/ADT/SCCIteratorTest.cpp
deleted file mode 100644
index 48350959d04..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/SCCIteratorTest.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-//===----- llvm/unittest/ADT/SCCIteratorTest.cpp - SCCIterator tests ------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/SCCIterator.h"
-#include "TestGraph.h"
-#include "gtest/gtest.h"
-#include <limits.h>
-
-using namespace llvm;
-
-namespace llvm {
-
-TEST(SCCIteratorTest, AllSmallGraphs) {
-  // Test SCC computation against every graph with NUM_NODES nodes or less.
-  // Since SCC considers every node to have an implicit self-edge, we only
-  // create graphs for which every node has a self-edge.
-#define NUM_NODES 4
-#define NUM_GRAPHS (NUM_NODES * (NUM_NODES - 1))
-  typedef Graph<NUM_NODES> GT;
-
-  /// Enumerate all graphs using NUM_GRAPHS bits.
-  static_assert(NUM_GRAPHS < sizeof(unsigned) * CHAR_BIT, "Too many graphs!");
-  for (unsigned GraphDescriptor = 0; GraphDescriptor < (1U << NUM_GRAPHS);
-       ++GraphDescriptor) {
-    GT G;
-
-    // Add edges as specified by the descriptor.
-    unsigned DescriptorCopy = GraphDescriptor;
-    for (unsigned i = 0; i != NUM_NODES; ++i)
-      for (unsigned j = 0; j != NUM_NODES; ++j) {
-        // Always add a self-edge.
-        if (i == j) {
-          G.AddEdge(i, j);
-          continue;
-        }
-        if (DescriptorCopy & 1)
-          G.AddEdge(i, j);
-        DescriptorCopy >>= 1;
-      }
-
-    // Test the SCC logic on this graph.
-
-    /// NodesInSomeSCC - Those nodes which are in some SCC.
-    GT::NodeSubset NodesInSomeSCC;
-
-    for (scc_iterator<GT> I = scc_begin(G), E = scc_end(G); I != E; ++I) {
-      const std::vector<GT::NodeType *> &SCC = *I;
-
-      // Get the nodes in this SCC as a NodeSubset rather than a vector.
-      GT::NodeSubset NodesInThisSCC;
-      for (unsigned i = 0, e = SCC.size(); i != e; ++i)
-        NodesInThisSCC.AddNode(SCC[i]->first);
-
-      // There should be at least one node in every SCC.
-      EXPECT_FALSE(NodesInThisSCC.isEmpty());
-
-      // Check that every node in the SCC is reachable from every other node in
-      // the SCC.
-      for (unsigned i = 0; i != NUM_NODES; ++i)
-        if (NodesInThisSCC.count(i)) {
-          EXPECT_TRUE(NodesInThisSCC.isSubsetOf(G.NodesReachableFrom(i)));
-        }
-
-      // OK, now that we now that every node in the SCC is reachable from every
-      // other, this means that the set of nodes reachable from any node in the
-      // SCC is the same as the set of nodes reachable from every node in the
-      // SCC.  Check that for every node N not in the SCC but reachable from the
-      // SCC, no element of the SCC is reachable from N.
-      for (unsigned i = 0; i != NUM_NODES; ++i)
-        if (NodesInThisSCC.count(i)) {
-          GT::NodeSubset NodesReachableFromSCC = G.NodesReachableFrom(i);
-          GT::NodeSubset ReachableButNotInSCC =
-            NodesReachableFromSCC.Meet(NodesInThisSCC.Complement());
-
-          for (unsigned j = 0; j != NUM_NODES; ++j)
-            if (ReachableButNotInSCC.count(j)) {
-              EXPECT_TRUE(G.NodesReachableFrom(j).Meet(NodesInThisSCC).isEmpty());
-            }
-
-          // The result must be the same for all other nodes in this SCC, so
-          // there is no point in checking them.
-          break;
-        }
-
-      // This is indeed a SCC: a maximal set of nodes for which each node is
-      // reachable from every other.
-
-      // Check that we didn't already see this SCC.
-      EXPECT_TRUE(NodesInSomeSCC.Meet(NodesInThisSCC).isEmpty());
-
-      NodesInSomeSCC = NodesInSomeSCC.Join(NodesInThisSCC);
-
-      // Check a property that is specific to the LLVM SCC iterator and
-      // guaranteed by it: if a node in SCC S1 has an edge to a node in
-      // SCC S2, then S1 is visited *after* S2.  This means that the set
-      // of nodes reachable from this SCC must be contained either in the
-      // union of this SCC and all previously visited SCC's.
-
-      for (unsigned i = 0; i != NUM_NODES; ++i)
-        if (NodesInThisSCC.count(i)) {
-          GT::NodeSubset NodesReachableFromSCC = G.NodesReachableFrom(i);
-          EXPECT_TRUE(NodesReachableFromSCC.isSubsetOf(NodesInSomeSCC));
-          // The result must be the same for all other nodes in this SCC, so
-          // there is no point in checking them.
-          break;
-        }
-    }
-
-    // Finally, check that the nodes in some SCC are exactly those that are
-    // reachable from the initial node.
-    EXPECT_EQ(NodesInSomeSCC, G.NodesReachableFrom(0));
-  }
-}
-
-}
diff --git a/gnu/llvm/llvm/unittests/ADT/STLExtrasTest.cpp b/gnu/llvm/llvm/unittests/ADT/STLExtrasTest.cpp
deleted file mode 100644
index 85208e4f4a2..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/STLExtrasTest.cpp
+++ /dev/null
@@ -1,879 +0,0 @@
-//===- STLExtrasTest.cpp - Unit tests for STL extras ----------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/STLExtras.h"
-#include "gtest/gtest.h"
-
-#include <list>
-#include <vector>
-
-using namespace llvm;
-
-namespace {
-
-int f(rank<0>) { return 0; }
-int f(rank<1>) { return 1; }
-int f(rank<2>) { return 2; }
-int f(rank<4>) { return 4; }
-
-TEST(STLExtrasTest, Rank) {
-  // We shouldn't get ambiguities and should select the overload of the same
-  // rank as the argument.
-  EXPECT_EQ(0, f(rank<0>()));
-  EXPECT_EQ(1, f(rank<1>()));
-  EXPECT_EQ(2, f(rank<2>()));
-
-  // This overload is missing so we end up back at 2.
-  EXPECT_EQ(2, f(rank<3>()));
-
-  // But going past 3 should work fine.
-  EXPECT_EQ(4, f(rank<4>()));
-
-  // And we can even go higher and just fall back to the last overload.
-  EXPECT_EQ(4, f(rank<5>()));
-  EXPECT_EQ(4, f(rank<6>()));
-}
-
-TEST(STLExtrasTest, EnumerateLValue) {
-  // Test that a simple LValue can be enumerated and gives correct results with
-  // multiple types, including the empty container.
-  std::vector<char> foo = {'a', 'b', 'c'};
-  typedef std::pair<std::size_t, char> CharPairType;
-  std::vector<CharPairType> CharResults;
-
-  for (auto X : llvm::enumerate(foo)) {
-    CharResults.emplace_back(X.index(), X.value());
-  }
-  ASSERT_EQ(3u, CharResults.size());
-  EXPECT_EQ(CharPairType(0u, 'a'), CharResults[0]);
-  EXPECT_EQ(CharPairType(1u, 'b'), CharResults[1]);
-  EXPECT_EQ(CharPairType(2u, 'c'), CharResults[2]);
-
-  // Test a const range of a different type.
-  typedef std::pair<std::size_t, int> IntPairType;
-  std::vector<IntPairType> IntResults;
-  const std::vector<int> bar = {1, 2, 3};
-  for (auto X : llvm::enumerate(bar)) {
-    IntResults.emplace_back(X.index(), X.value());
-  }
-  ASSERT_EQ(3u, IntResults.size());
-  EXPECT_EQ(IntPairType(0u, 1), IntResults[0]);
-  EXPECT_EQ(IntPairType(1u, 2), IntResults[1]);
-  EXPECT_EQ(IntPairType(2u, 3), IntResults[2]);
-
-  // Test an empty range.
-  IntResults.clear();
-  const std::vector<int> baz{};
-  for (auto X : llvm::enumerate(baz)) {
-    IntResults.emplace_back(X.index(), X.value());
-  }
-  EXPECT_TRUE(IntResults.empty());
-}
-
-TEST(STLExtrasTest, EnumerateModifyLValue) {
-  // Test that you can modify the underlying entries of an lvalue range through
-  // the enumeration iterator.
-  std::vector<char> foo = {'a', 'b', 'c'};
-
-  for (auto X : llvm::enumerate(foo)) {
-    ++X.value();
-  }
-  EXPECT_EQ('b', foo[0]);
-  EXPECT_EQ('c', foo[1]);
-  EXPECT_EQ('d', foo[2]);
-}
-
-TEST(STLExtrasTest, EnumerateRValueRef) {
-  // Test that an rvalue can be enumerated.
-  typedef std::pair<std::size_t, int> PairType;
-  std::vector<PairType> Results;
-
-  auto Enumerator = llvm::enumerate(std::vector<int>{1, 2, 3});
-
-  for (auto X : llvm::enumerate(std::vector<int>{1, 2, 3})) {
-    Results.emplace_back(X.index(), X.value());
-  }
-
-  ASSERT_EQ(3u, Results.size());
-  EXPECT_EQ(PairType(0u, 1), Results[0]);
-  EXPECT_EQ(PairType(1u, 2), Results[1]);
-  EXPECT_EQ(PairType(2u, 3), Results[2]);
-}
-
-TEST(STLExtrasTest, EnumerateModifyRValue) {
-  // Test that when enumerating an rvalue, modification still works (even if
-  // this isn't terribly useful, it at least shows that we haven't snuck an
-  // extra const in there somewhere.
-  typedef std::pair<std::size_t, char> PairType;
-  std::vector<PairType> Results;
-
-  for (auto X : llvm::enumerate(std::vector<char>{'1', '2', '3'})) {
-    ++X.value();
-    Results.emplace_back(X.index(), X.value());
-  }
-
-  ASSERT_EQ(3u, Results.size());
-  EXPECT_EQ(PairType(0u, '2'), Results[0]);
-  EXPECT_EQ(PairType(1u, '3'), Results[1]);
-  EXPECT_EQ(PairType(2u, '4'), Results[2]);
-}
-
-template <bool B> struct CanMove {};
-template <> struct CanMove<false> {
-  CanMove(CanMove &&) = delete;
-
-  CanMove() = default;
-  CanMove(const CanMove &) = default;
-};
-
-template <bool B> struct CanCopy {};
-template <> struct CanCopy<false> {
-  CanCopy(const CanCopy &) = delete;
-
-  CanCopy() = default;
-  CanCopy(CanCopy &&) = default;
-};
-
-template <bool Moveable, bool Copyable>
-class Counted : CanMove<Moveable>, CanCopy<Copyable> {
-  int &C;
-  int &M;
-  int &D;
-
-public:
-  explicit Counted(int &C, int &M, int &D) : C(C), M(M), D(D) {}
-  Counted(const Counted &O) : CanCopy<Copyable>(O), C(O.C), M(O.M), D(O.D) {
-    ++C;
-  }
-  Counted(Counted &&O)
-      : CanMove<Moveable>(std::move(O)), C(O.C), M(O.M), D(O.D) {
-    ++M;
-  }
-  ~Counted() { ++D; }
-};
-
-template <bool Moveable, bool Copyable>
-struct Range : Counted<Moveable, Copyable> {
-  using Counted<Moveable, Copyable>::Counted;
-  int *begin() { return nullptr; }
-  int *end() { return nullptr; }
-};
-
-TEST(STLExtrasTest, EnumerateLifetimeSemanticsPRValue) {
-  int Copies = 0;
-  int Moves = 0;
-  int Destructors = 0;
-  {
-    auto E = enumerate(Range<true, false>(Copies, Moves, Destructors));
-    (void)E;
-    // Doesn't compile.  rvalue ranges must be moveable.
-    // auto E2 = enumerate(Range<false, true>(Copies, Moves, Destructors));
-    EXPECT_EQ(0, Copies);
-    EXPECT_EQ(1, Moves);
-    EXPECT_EQ(1, Destructors);
-  }
-  EXPECT_EQ(0, Copies);
-  EXPECT_EQ(1, Moves);
-  EXPECT_EQ(2, Destructors);
-}
-
-TEST(STLExtrasTest, EnumerateLifetimeSemanticsRValue) {
-  // With an rvalue, it should not be destroyed until the end of the scope.
-  int Copies = 0;
-  int Moves = 0;
-  int Destructors = 0;
-  {
-    Range<true, false> R(Copies, Moves, Destructors);
-    {
-      auto E = enumerate(std::move(R));
-      (void)E;
-      // Doesn't compile.  rvalue ranges must be moveable.
-      // auto E2 = enumerate(Range<false, true>(Copies, Moves, Destructors));
-      EXPECT_EQ(0, Copies);
-      EXPECT_EQ(1, Moves);
-      EXPECT_EQ(0, Destructors);
-    }
-    EXPECT_EQ(0, Copies);
-    EXPECT_EQ(1, Moves);
-    EXPECT_EQ(1, Destructors);
-  }
-  EXPECT_EQ(0, Copies);
-  EXPECT_EQ(1, Moves);
-  EXPECT_EQ(2, Destructors);
-}
-
-TEST(STLExtrasTest, EnumerateLifetimeSemanticsLValue) {
-  // With an lvalue, it should not be destroyed even after the end of the scope.
-  // lvalue ranges need be neither copyable nor moveable.
-  int Copies = 0;
-  int Moves = 0;
-  int Destructors = 0;
-  {
-    Range<false, false> R(Copies, Moves, Destructors);
-    {
-      auto E = enumerate(R);
-      (void)E;
-      EXPECT_EQ(0, Copies);
-      EXPECT_EQ(0, Moves);
-      EXPECT_EQ(0, Destructors);
-    }
-    EXPECT_EQ(0, Copies);
-    EXPECT_EQ(0, Moves);
-    EXPECT_EQ(0, Destructors);
-  }
-  EXPECT_EQ(0, Copies);
-  EXPECT_EQ(0, Moves);
-  EXPECT_EQ(1, Destructors);
-}
-
-TEST(STLExtrasTest, ApplyTuple) {
-  auto T = std::make_tuple(1, 3, 7);
-  auto U = llvm::apply_tuple(
-      [](int A, int B, int C) { return std::make_tuple(A - B, B - C, C - A); },
-      T);
-
-  EXPECT_EQ(-2, std::get<0>(U));
-  EXPECT_EQ(-4, std::get<1>(U));
-  EXPECT_EQ(6, std::get<2>(U));
-
-  auto V = llvm::apply_tuple(
-      [](int A, int B, int C) {
-        return std::make_tuple(std::make_pair(A, char('A' + A)),
-                               std::make_pair(B, char('A' + B)),
-                               std::make_pair(C, char('A' + C)));
-      },
-      T);
-
-  EXPECT_EQ(std::make_pair(1, 'B'), std::get<0>(V));
-  EXPECT_EQ(std::make_pair(3, 'D'), std::get<1>(V));
-  EXPECT_EQ(std::make_pair(7, 'H'), std::get<2>(V));
-}
-
-class apply_variadic {
-  static int apply_one(int X) { return X + 1; }
-  static char apply_one(char C) { return C + 1; }
-  static StringRef apply_one(StringRef S) { return S.drop_back(); }
-
-public:
-  template <typename... Ts> auto operator()(Ts &&... Items) {
-    return std::make_tuple(apply_one(Items)...);
-  }
-};
-
-TEST(STLExtrasTest, ApplyTupleVariadic) {
-  auto Items = std::make_tuple(1, llvm::StringRef("Test"), 'X');
-  auto Values = apply_tuple(apply_variadic(), Items);
-
-  EXPECT_EQ(2, std::get<0>(Values));
-  EXPECT_EQ("Tes", std::get<1>(Values));
-  EXPECT_EQ('Y', std::get<2>(Values));
-}
-
-TEST(STLExtrasTest, CountAdaptor) {
-  std::vector<int> v;
-
-  v.push_back(1);
-  v.push_back(2);
-  v.push_back(1);
-  v.push_back(4);
-  v.push_back(3);
-  v.push_back(2);
-  v.push_back(1);
-
-  EXPECT_EQ(3, count(v, 1));
-  EXPECT_EQ(2, count(v, 2));
-  EXPECT_EQ(1, count(v, 3));
-  EXPECT_EQ(1, count(v, 4));
-}
-
-TEST(STLExtrasTest, for_each) {
-  std::vector<int> v{0, 1, 2, 3, 4};
-  int count = 0;
-
-  llvm::for_each(v, [&count](int) { ++count; });
-  EXPECT_EQ(5, count);
-}
-
-TEST(STLExtrasTest, ToVector) {
-  std::vector<char> v = {'a', 'b', 'c'};
-  auto Enumerated = to_vector<4>(enumerate(v));
-  ASSERT_EQ(3u, Enumerated.size());
-  for (size_t I = 0; I < v.size(); ++I) {
-    EXPECT_EQ(I, Enumerated[I].index());
-    EXPECT_EQ(v[I], Enumerated[I].value());
-  }
-}
-
-TEST(STLExtrasTest, ConcatRange) {
-  std::vector<int> Expected = {1, 2, 3, 4, 5, 6, 7, 8};
-  std::vector<int> Test;
-
-  std::vector<int> V1234 = {1, 2, 3, 4};
-  std::list<int> L56 = {5, 6};
-  SmallVector<int, 2> SV78 = {7, 8};
-
-  // Use concat across different sized ranges of different types with different
-  // iterators.
-  for (int &i : concat<int>(V1234, L56, SV78))
-    Test.push_back(i);
-  EXPECT_EQ(Expected, Test);
-
-  // Use concat between a temporary, an L-value, and an R-value to make sure
-  // complex lifetimes work well.
-  Test.clear();
-  for (int &i : concat<int>(std::vector<int>(V1234), L56, std::move(SV78)))
-    Test.push_back(i);
-  EXPECT_EQ(Expected, Test);
-}
-
-TEST(STLExtrasTest, PartitionAdaptor) {
-  std::vector<int> V = {1, 2, 3, 4, 5, 6, 7, 8};
-
-  auto I = partition(V, [](int i) { return i % 2 == 0; });
-  ASSERT_EQ(V.begin() + 4, I);
-
-  // Sort the two halves as partition may have messed with the order.
-  llvm::sort(V.begin(), I);
-  llvm::sort(I, V.end());
-
-  EXPECT_EQ(2, V[0]);
-  EXPECT_EQ(4, V[1]);
-  EXPECT_EQ(6, V[2]);
-  EXPECT_EQ(8, V[3]);
-  EXPECT_EQ(1, V[4]);
-  EXPECT_EQ(3, V[5]);
-  EXPECT_EQ(5, V[6]);
-  EXPECT_EQ(7, V[7]);
-}
-
-TEST(STLExtrasTest, EraseIf) {
-  std::vector<int> V = {1, 2, 3, 4, 5, 6, 7, 8};
-
-  erase_if(V, [](int i) { return i % 2 == 0; });
-  EXPECT_EQ(4u, V.size());
-  EXPECT_EQ(1, V[0]);
-  EXPECT_EQ(3, V[1]);
-  EXPECT_EQ(5, V[2]);
-  EXPECT_EQ(7, V[3]);
-}
-
-TEST(STLExtrasTest, AppendRange) {
-  auto AppendVals = {3};
-  std::vector<int> V = {1, 2};
-  append_range(V, AppendVals);
-  EXPECT_EQ(1, V[0]);
-  EXPECT_EQ(2, V[1]);
-  EXPECT_EQ(3, V[2]);
-}
-
-namespace some_namespace {
-struct some_struct {
-  std::vector<int> data;
-  std::string swap_val;
-};
-
-std::vector<int>::const_iterator begin(const some_struct &s) {
-  return s.data.begin();
-}
-
-std::vector<int>::const_iterator end(const some_struct &s) {
-  return s.data.end();
-}
-
-void swap(some_struct &lhs, some_struct &rhs) {
-  // make swap visible as non-adl swap would even seem to
-  // work with std::swap which defaults to moving
-  lhs.swap_val = "lhs";
-  rhs.swap_val = "rhs";
-}
-} // namespace some_namespace
-
-TEST(STLExtrasTest, ADLTest) {
-  some_namespace::some_struct s{{1, 2, 3, 4, 5}, ""};
-  some_namespace::some_struct s2{{2, 4, 6, 8, 10}, ""};
-
-  EXPECT_EQ(*adl_begin(s), 1);
-  EXPECT_EQ(*(adl_end(s) - 1), 5);
-
-  adl_swap(s, s2);
-  EXPECT_EQ(s.swap_val, "lhs");
-  EXPECT_EQ(s2.swap_val, "rhs");
-
-  int count = 0;
-  llvm::for_each(s, [&count](int) { ++count; });
-  EXPECT_EQ(5, count);
-}
-
-TEST(STLExtrasTest, EmptyTest) {
-  std::vector<void*> V;
-  EXPECT_TRUE(llvm::empty(V));
-  V.push_back(nullptr);
-  EXPECT_FALSE(llvm::empty(V));
-
-  std::initializer_list<int> E = {};
-  std::initializer_list<int> NotE = {7, 13, 42};
-  EXPECT_TRUE(llvm::empty(E));
-  EXPECT_FALSE(llvm::empty(NotE));
-
-  auto R0 = make_range(V.begin(), V.begin());
-  EXPECT_TRUE(llvm::empty(R0));
-  auto R1 = make_range(V.begin(), V.end());
-  EXPECT_FALSE(llvm::empty(R1));
-}
-
-TEST(STLExtrasTest, DropBeginTest) {
-  SmallVector<int, 5> vec{0, 1, 2, 3, 4};
-
-  for (int n = 0; n < 5; ++n) {
-    int i = n;
-    for (auto &v : drop_begin(vec, n)) {
-      EXPECT_EQ(v, i);
-      i += 1;
-    }
-    EXPECT_EQ(i, 5);
-  }
-}
-
-TEST(STLExtrasTest, DropBeginDefaultTest) {
-  SmallVector<int, 5> vec{0, 1, 2, 3, 4};
-
-  int i = 1;
-  for (auto &v : drop_begin(vec)) {
-    EXPECT_EQ(v, i);
-    i += 1;
-  }
-  EXPECT_EQ(i, 5);
-}
-
-TEST(STLExtrasTest, EarlyIncrementTest) {
-  std::list<int> L = {1, 2, 3, 4};
-
-  auto EIR = make_early_inc_range(L);
-
-  auto I = EIR.begin();
-  auto EI = EIR.end();
-  EXPECT_NE(I, EI);
-
-  EXPECT_EQ(1, *I);
-#if LLVM_ENABLE_ABI_BREAKING_CHECKS
-#ifndef NDEBUG
-  // Repeated dereferences are not allowed.
-  EXPECT_DEATH(*I, "Cannot dereference");
-  // Comparison after dereference is not allowed.
-  EXPECT_DEATH((void)(I == EI), "Cannot compare");
-  EXPECT_DEATH((void)(I != EI), "Cannot compare");
-#endif
-#endif
-
-  ++I;
-  EXPECT_NE(I, EI);
-#if LLVM_ENABLE_ABI_BREAKING_CHECKS
-#ifndef NDEBUG
-  // You cannot increment prior to dereference.
-  EXPECT_DEATH(++I, "Cannot increment");
-#endif
-#endif
-  EXPECT_EQ(2, *I);
-#if LLVM_ENABLE_ABI_BREAKING_CHECKS
-#ifndef NDEBUG
-  // Repeated dereferences are not allowed.
-  EXPECT_DEATH(*I, "Cannot dereference");
-#endif
-#endif
-
-  // Inserting shouldn't break anything. We should be able to keep dereferencing
-  // the currrent iterator and increment. The increment to go to the "next"
-  // iterator from before we inserted.
-  L.insert(std::next(L.begin(), 2), -1);
-  ++I;
-  EXPECT_EQ(3, *I);
-
-  // Erasing the front including the current doesn't break incrementing.
-  L.erase(L.begin(), std::prev(L.end()));
-  ++I;
-  EXPECT_EQ(4, *I);
-  ++I;
-  EXPECT_EQ(EIR.end(), I);
-}
-
-// A custom iterator that returns a pointer when dereferenced. This is used to
-// test make_early_inc_range with iterators that do not return a reference on
-// dereferencing.
-struct CustomPointerIterator
-    : public iterator_adaptor_base<CustomPointerIterator,
-                                   std::list<int>::iterator,
-                                   std::forward_iterator_tag> {
-  using base_type =
-      iterator_adaptor_base<CustomPointerIterator, std::list<int>::iterator,
-                            std::forward_iterator_tag>;
-
-  explicit CustomPointerIterator(std::list<int>::iterator I) : base_type(I) {}
-
-  // Retrieve a pointer to the current int.
-  int *operator*() const { return &*base_type::wrapped(); }
-};
-
-// Make sure make_early_inc_range works with iterators that do not return a
-// reference on dereferencing. The test is similar to EarlyIncrementTest, but
-// uses CustomPointerIterator.
-TEST(STLExtrasTest, EarlyIncrementTestCustomPointerIterator) {
-  std::list<int> L = {1, 2, 3, 4};
-
-  auto CustomRange = make_range(CustomPointerIterator(L.begin()),
-                                CustomPointerIterator(L.end()));
-  auto EIR = make_early_inc_range(CustomRange);
-
-  auto I = EIR.begin();
-  auto EI = EIR.end();
-  EXPECT_NE(I, EI);
-
-  EXPECT_EQ(&*L.begin(), *I);
-#if LLVM_ENABLE_ABI_BREAKING_CHECKS
-#ifndef NDEBUG
-  // Repeated dereferences are not allowed.
-  EXPECT_DEATH(*I, "Cannot dereference");
-  // Comparison after dereference is not allowed.
-  EXPECT_DEATH((void)(I == EI), "Cannot compare");
-  EXPECT_DEATH((void)(I != EI), "Cannot compare");
-#endif
-#endif
-
-  ++I;
-  EXPECT_NE(I, EI);
-#if LLVM_ENABLE_ABI_BREAKING_CHECKS
-#ifndef NDEBUG
-  // You cannot increment prior to dereference.
-  EXPECT_DEATH(++I, "Cannot increment");
-#endif
-#endif
-  EXPECT_EQ(&*std::next(L.begin()), *I);
-#if LLVM_ENABLE_ABI_BREAKING_CHECKS
-#ifndef NDEBUG
-  // Repeated dereferences are not allowed.
-  EXPECT_DEATH(*I, "Cannot dereference");
-#endif
-#endif
-
-  // Inserting shouldn't break anything. We should be able to keep dereferencing
-  // the currrent iterator and increment. The increment to go to the "next"
-  // iterator from before we inserted.
-  L.insert(std::next(L.begin(), 2), -1);
-  ++I;
-  EXPECT_EQ(&*std::next(L.begin(), 3), *I);
-
-  // Erasing the front including the current doesn't break incrementing.
-  L.erase(L.begin(), std::prev(L.end()));
-  ++I;
-  EXPECT_EQ(&*L.begin(), *I);
-  ++I;
-  EXPECT_EQ(EIR.end(), I);
-}
-
-TEST(STLExtrasTest, splat) {
-  std::vector<int> V;
-  EXPECT_FALSE(is_splat(V));
-
-  V.push_back(1);
-  EXPECT_TRUE(is_splat(V));
-
-  V.push_back(1);
-  V.push_back(1);
-  EXPECT_TRUE(is_splat(V));
-
-  V.push_back(2);
-  EXPECT_FALSE(is_splat(V));
-}
-
-TEST(STLExtrasTest, to_address) {
-  int *V1 = new int;
-  EXPECT_EQ(V1, to_address(V1));
-
-  // Check fancy pointer overload for unique_ptr
-  std::unique_ptr<int> V2 = std::make_unique<int>(0);
-  EXPECT_EQ(V2.get(), llvm::to_address(V2));
-
-  V2.reset(V1);
-  EXPECT_EQ(V1, llvm::to_address(V2));
-  V2.release();
-
-  // Check fancy pointer overload for shared_ptr
-  std::shared_ptr<int> V3 = std::make_shared<int>(0);
-  std::shared_ptr<int> V4 = V3;
-  EXPECT_EQ(V3.get(), V4.get());
-  EXPECT_EQ(V3.get(), llvm::to_address(V3));
-  EXPECT_EQ(V4.get(), llvm::to_address(V4));
-
-  V3.reset(V1);
-  EXPECT_EQ(V1, llvm::to_address(V3));
-}
-
-TEST(STLExtrasTest, partition_point) {
-  std::vector<int> V = {1, 3, 5, 7, 9};
-
-  // Range version.
-  EXPECT_EQ(V.begin() + 3,
-            partition_point(V, [](unsigned X) { return X < 7; }));
-  EXPECT_EQ(V.begin(), partition_point(V, [](unsigned X) { return X < 1; }));
-  EXPECT_EQ(V.end(), partition_point(V, [](unsigned X) { return X < 50; }));
-}
-
-TEST(STLExtrasTest, hasSingleElement) {
-  const std::vector<int> V0 = {}, V1 = {1}, V2 = {1, 2};
-  const std::vector<int> V10(10);
-
-  EXPECT_EQ(hasSingleElement(V0), false);
-  EXPECT_EQ(hasSingleElement(V1), true);
-  EXPECT_EQ(hasSingleElement(V2), false);
-  EXPECT_EQ(hasSingleElement(V10), false);
-}
-
-TEST(STLExtrasTest, hasNItems) {
-  const std::list<int> V0 = {}, V1 = {1}, V2 = {1, 2};
-  const std::list<int> V3 = {1, 3, 5};
-
-  EXPECT_TRUE(hasNItems(V0, 0));
-  EXPECT_FALSE(hasNItems(V0, 2));
-  EXPECT_TRUE(hasNItems(V1, 1));
-  EXPECT_FALSE(hasNItems(V1, 2));
-
-  EXPECT_TRUE(hasNItems(V3.begin(), V3.end(), 3, [](int x) { return x < 10; }));
-  EXPECT_TRUE(hasNItems(V3.begin(), V3.end(), 0, [](int x) { return x > 10; }));
-  EXPECT_TRUE(hasNItems(V3.begin(), V3.end(), 2, [](int x) { return x < 5; }));
-}
-
-TEST(STLExtras, hasNItemsOrMore) {
-  const std::list<int> V0 = {}, V1 = {1}, V2 = {1, 2};
-  const std::list<int> V3 = {1, 3, 5};
-
-  EXPECT_TRUE(hasNItemsOrMore(V1, 1));
-  EXPECT_FALSE(hasNItemsOrMore(V1, 2));
-
-  EXPECT_TRUE(hasNItemsOrMore(V2, 1));
-  EXPECT_TRUE(hasNItemsOrMore(V2, 2));
-  EXPECT_FALSE(hasNItemsOrMore(V2, 3));
-
-  EXPECT_TRUE(hasNItemsOrMore(V3, 3));
-  EXPECT_FALSE(hasNItemsOrMore(V3, 4));
-
-  EXPECT_TRUE(
-      hasNItemsOrMore(V3.begin(), V3.end(), 3, [](int x) { return x < 10; }));
-  EXPECT_FALSE(
-      hasNItemsOrMore(V3.begin(), V3.end(), 3, [](int x) { return x > 10; }));
-  EXPECT_TRUE(
-      hasNItemsOrMore(V3.begin(), V3.end(), 2, [](int x) { return x < 5; }));
-}
-
-TEST(STLExtras, hasNItemsOrLess) {
-  const std::list<int> V0 = {}, V1 = {1}, V2 = {1, 2};
-  const std::list<int> V3 = {1, 3, 5};
-
-  EXPECT_TRUE(hasNItemsOrLess(V0, 0));
-  EXPECT_TRUE(hasNItemsOrLess(V0, 1));
-  EXPECT_TRUE(hasNItemsOrLess(V0, 2));
-
-  EXPECT_FALSE(hasNItemsOrLess(V1, 0));
-  EXPECT_TRUE(hasNItemsOrLess(V1, 1));
-  EXPECT_TRUE(hasNItemsOrLess(V1, 2));
-
-  EXPECT_FALSE(hasNItemsOrLess(V2, 0));
-  EXPECT_FALSE(hasNItemsOrLess(V2, 1));
-  EXPECT_TRUE(hasNItemsOrLess(V2, 2));
-  EXPECT_TRUE(hasNItemsOrLess(V2, 3));
-
-  EXPECT_FALSE(hasNItemsOrLess(V3, 0));
-  EXPECT_FALSE(hasNItemsOrLess(V3, 1));
-  EXPECT_FALSE(hasNItemsOrLess(V3, 2));
-  EXPECT_TRUE(hasNItemsOrLess(V3, 3));
-  EXPECT_TRUE(hasNItemsOrLess(V3, 4));
-
-  EXPECT_TRUE(
-      hasNItemsOrLess(V3.begin(), V3.end(), 1, [](int x) { return x == 1; }));
-  EXPECT_TRUE(
-      hasNItemsOrLess(V3.begin(), V3.end(), 2, [](int x) { return x < 5; }));
-  EXPECT_TRUE(
-      hasNItemsOrLess(V3.begin(), V3.end(), 5, [](int x) { return x < 5; }));
-  EXPECT_FALSE(
-      hasNItemsOrLess(V3.begin(), V3.end(), 2, [](int x) { return x < 10; }));
-}
-
-TEST(STLExtras, MoveRange) {
-  class Foo {
-    bool A;
-
-  public:
-    Foo() : A(true) {}
-    Foo(const Foo &) = delete;
-    Foo(Foo &&Other) : A(Other.A) { Other.A = false; }
-    Foo &operator=(const Foo &) = delete;
-    Foo &operator=(Foo &&Other) {
-      if (this != &Other) {
-        A = Other.A;
-        Other.A = false;
-      }
-      return *this;
-    }
-    operator bool() const { return A; }
-  };
-  SmallVector<Foo, 4U> V1, V2, V3, V4;
-  auto HasVal = [](const Foo &Item) { return static_cast<bool>(Item); };
-  auto Build = [&] {
-    SmallVector<Foo, 4U> Foos;
-    Foos.resize(4U);
-    return Foos;
-  };
-
-  V1.resize(4U);
-  EXPECT_TRUE(llvm::all_of(V1, HasVal));
-
-  llvm::move(V1, std::back_inserter(V2));
-
-  // Ensure input container is same size, but its contents were moved out.
-  EXPECT_EQ(V1.size(), 4U);
-  EXPECT_TRUE(llvm::none_of(V1, HasVal));
-
-  // Ensure output container has the contents of the input container.
-  EXPECT_EQ(V2.size(), 4U);
-  EXPECT_TRUE(llvm::all_of(V2, HasVal));
-
-  llvm::move(std::move(V2), std::back_inserter(V3));
-
-  EXPECT_TRUE(llvm::none_of(V2, HasVal));
-  EXPECT_EQ(V3.size(), 4U);
-  EXPECT_TRUE(llvm::all_of(V3, HasVal));
-
-  llvm::move(Build(), std::back_inserter(V4));
-  EXPECT_EQ(V4.size(), 4U);
-  EXPECT_TRUE(llvm::all_of(V4, HasVal));
-}
-
-TEST(STLExtras, Unique) {
-  std::vector<int> V = {1, 5, 5, 4, 3, 3, 3};
-
-  auto I = llvm::unique(V, [](int a, int b) { return a == b; });
-
-  EXPECT_EQ(I, V.begin() + 4);
-
-  EXPECT_EQ(1, V[0]);
-  EXPECT_EQ(5, V[1]);
-  EXPECT_EQ(4, V[2]);
-  EXPECT_EQ(3, V[3]);
-}
-
-TEST(STLExtrasTest, MakeVisitorOneCallable) {
-  auto IdentityLambda = [](auto X) { return X; };
-  auto IdentityVisitor = makeVisitor(IdentityLambda);
-  EXPECT_EQ(IdentityLambda(1), IdentityVisitor(1));
-  EXPECT_EQ(IdentityLambda(2.0f), IdentityVisitor(2.0f));
-  EXPECT_TRUE((std::is_same<decltype(IdentityLambda(IdentityLambda)),
-                            decltype(IdentityLambda)>::value));
-  EXPECT_TRUE((std::is_same<decltype(IdentityVisitor(IdentityVisitor)),
-                            decltype(IdentityVisitor)>::value));
-}
-
-TEST(STLExtrasTest, MakeVisitorTwoCallables) {
-  auto Visitor =
-      makeVisitor([](int) { return 0; }, [](std::string) { return 1; });
-  EXPECT_EQ(Visitor(42), 0);
-  EXPECT_EQ(Visitor("foo"), 1);
-}
-
-TEST(STLExtrasTest, MakeVisitorCallableMultipleOperands) {
-  auto Second = makeVisitor([](int I, float F) { return F; },
-                            [](float F, int I) { return I; });
-  EXPECT_EQ(Second(1.f, 1), 1);
-  EXPECT_EQ(Second(1, 1.f), 1.f);
-}
-
-TEST(STLExtrasTest, MakeVisitorDefaultCase) {
-  {
-    auto Visitor = makeVisitor([](int I) { return I + 100; },
-                               [](float F) { return F * 2; },
-                               [](auto) { return -1; });
-    EXPECT_EQ(Visitor(24), 124);
-    EXPECT_EQ(Visitor(2.f), 4.f);
-    EXPECT_EQ(Visitor(2.), -1);
-    EXPECT_EQ(Visitor(Visitor), -1);
-  }
-  {
-    auto Visitor = makeVisitor([](auto) { return -1; },
-                               [](int I) { return I + 100; },
-                               [](float F) { return F * 2; });
-    EXPECT_EQ(Visitor(24), 124);
-    EXPECT_EQ(Visitor(2.f), 4.f);
-    EXPECT_EQ(Visitor(2.), -1);
-    EXPECT_EQ(Visitor(Visitor), -1);
-  }
-}
-
-template <bool Moveable, bool Copyable>
-struct Functor : Counted<Moveable, Copyable> {
-  using Counted<Moveable, Copyable>::Counted;
-  void operator()() {}
-};
-
-TEST(STLExtrasTest, MakeVisitorLifetimeSemanticsPRValue) {
-  int Copies = 0;
-  int Moves = 0;
-  int Destructors = 0;
-  {
-    auto V = makeVisitor(Functor<true, false>(Copies, Moves, Destructors));
-    (void)V;
-    EXPECT_EQ(0, Copies);
-    EXPECT_EQ(1, Moves);
-    EXPECT_EQ(1, Destructors);
-  }
-  EXPECT_EQ(0, Copies);
-  EXPECT_EQ(1, Moves);
-  EXPECT_EQ(2, Destructors);
-}
-
-TEST(STLExtrasTest, MakeVisitorLifetimeSemanticsRValue) {
-  int Copies = 0;
-  int Moves = 0;
-  int Destructors = 0;
-  {
-    Functor<true, false> F(Copies, Moves, Destructors);
-    {
-      auto V = makeVisitor(std::move(F));
-      (void)V;
-      EXPECT_EQ(0, Copies);
-      EXPECT_EQ(1, Moves);
-      EXPECT_EQ(0, Destructors);
-    }
-    EXPECT_EQ(0, Copies);
-    EXPECT_EQ(1, Moves);
-    EXPECT_EQ(1, Destructors);
-  }
-  EXPECT_EQ(0, Copies);
-  EXPECT_EQ(1, Moves);
-  EXPECT_EQ(2, Destructors);
-}
-
-TEST(STLExtrasTest, MakeVisitorLifetimeSemanticsLValue) {
-  int Copies = 0;
-  int Moves = 0;
-  int Destructors = 0;
-  {
-    Functor<true, true> F(Copies, Moves, Destructors);
-    {
-      auto V = makeVisitor(F);
-      (void)V;
-      EXPECT_EQ(1, Copies);
-      EXPECT_EQ(0, Moves);
-      EXPECT_EQ(0, Destructors);
-    }
-    EXPECT_EQ(1, Copies);
-    EXPECT_EQ(0, Moves);
-    EXPECT_EQ(1, Destructors);
-  }
-  EXPECT_EQ(1, Copies);
-  EXPECT_EQ(0, Moves);
-  EXPECT_EQ(2, Destructors);
-}
-
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/STLForwardCompatTest.cpp b/gnu/llvm/llvm/unittests/ADT/STLForwardCompatTest.cpp
deleted file mode 100644
index 12bf4031235..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/STLForwardCompatTest.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-//===- STLForwardCompatTest.cpp - Unit tests for STLForwardCompat ---------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/STLForwardCompat.h"
-#include "gtest/gtest.h"
-
-namespace {
-
-TEST(STLForwardCompatTest, NegationTest) {
-  EXPECT_TRUE((llvm::negation<std::false_type>::value));
-  EXPECT_FALSE((llvm::negation<std::true_type>::value));
-}
-
-struct incomplete_type;
-
-TEST(STLForwardCompatTest, ConjunctionTest) {
-  EXPECT_TRUE((llvm::conjunction<>::value));
-  EXPECT_FALSE((llvm::conjunction<std::false_type>::value));
-  EXPECT_TRUE((llvm::conjunction<std::true_type>::value));
-  EXPECT_FALSE((llvm::conjunction<std::false_type, incomplete_type>::value));
-  EXPECT_FALSE((llvm::conjunction<std::false_type, std::true_type>::value));
-  EXPECT_FALSE((llvm::conjunction<std::true_type, std::false_type>::value));
-  EXPECT_TRUE((llvm::conjunction<std::true_type, std::true_type>::value));
-  EXPECT_TRUE((llvm::conjunction<std::true_type, std::true_type,
-                                 std::true_type>::value));
-}
-
-TEST(STLForwardCompatTest, DisjunctionTest) {
-  EXPECT_FALSE((llvm::disjunction<>::value));
-  EXPECT_FALSE((llvm::disjunction<std::false_type>::value));
-  EXPECT_TRUE((llvm::disjunction<std::true_type>::value));
-  EXPECT_TRUE((llvm::disjunction<std::true_type, incomplete_type>::value));
-  EXPECT_TRUE((llvm::disjunction<std::false_type, std::true_type>::value));
-  EXPECT_TRUE((llvm::disjunction<std::true_type, std::false_type>::value));
-  EXPECT_TRUE((llvm::disjunction<std::true_type, std::true_type>::value));
-  EXPECT_TRUE((llvm::disjunction<std::true_type, std::true_type,
-                                 std::true_type>::value));
-}
-
-template <typename T>
-class STLForwardCompatRemoveCVRefTest : public ::testing::Test {};
-
-using STLForwardCompatRemoveCVRefTestTypes = ::testing::Types<
-    // clang-format off
-    std::pair<int, int>,
-    std::pair<int &, int>,
-    std::pair<const int, int>,
-    std::pair<volatile int, int>,
-    std::pair<const volatile int &, int>,
-    std::pair<int *, int *>,
-    std::pair<int *const, int *>,
-    std::pair<const int *, const int *>,
-    std::pair<int *&, int *>
-    // clang-format on
-    >;
-
-TYPED_TEST_SUITE(STLForwardCompatRemoveCVRefTest,
-                 STLForwardCompatRemoveCVRefTestTypes, );
-
-TYPED_TEST(STLForwardCompatRemoveCVRefTest, RemoveCVRef) {
-  using From = typename TypeParam::first_type;
-  using To = typename TypeParam::second_type;
-  EXPECT_TRUE(
-      (std::is_same<typename llvm::remove_cvref<From>::type, To>::value));
-}
-
-TYPED_TEST(STLForwardCompatRemoveCVRefTest, RemoveCVRefT) {
-  using From = typename TypeParam::first_type;
-  EXPECT_TRUE((std::is_same<typename llvm::remove_cvref<From>::type,
-                            llvm::remove_cvref_t<From>>::value));
-}
-
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/ScopeExitTest.cpp b/gnu/llvm/llvm/unittests/ADT/ScopeExitTest.cpp
deleted file mode 100644
index 14376529766..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/ScopeExitTest.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-//===- llvm/unittest/ADT/ScopeExit.cpp - Scope exit unit tests --*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/ScopeExit.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST(ScopeExitTest, Basic) {
-  struct Callable {
-    bool &Called;
-    Callable(bool &Called) : Called(Called) {}
-    Callable(Callable &&RHS) : Called(RHS.Called) {}
-    void operator()() { Called = true; }
-  };
-  bool Called = false;
-  {
-    auto g = make_scope_exit(Callable(Called));
-    EXPECT_FALSE(Called);
-  }
-  EXPECT_TRUE(Called);
-}
-
-TEST(ScopeExitTest, Release) {
-  int Count = 0;
-  auto Increment = [&] { ++Count; };
-  {
-    auto G = make_scope_exit(Increment);
-    auto H = std::move(G);
-    auto I = std::move(G);
-    EXPECT_EQ(0, Count);
-  }
-  EXPECT_EQ(1, Count);
-  {
-    auto G = make_scope_exit(Increment);
-    G.release();
-  }
-  EXPECT_EQ(1, Count);
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/SequenceTest.cpp b/gnu/llvm/llvm/unittests/ADT/SequenceTest.cpp
deleted file mode 100644
index 4ed54f1589d..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/SequenceTest.cpp
+++ /dev/null
@@ -1,218 +0,0 @@
-//===- SequenceTest.cpp - Unit tests for a sequence abstraciton -----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/Sequence.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-#include <algorithm>
-#include <numeric>
-
-using namespace llvm;
-
-using testing::ElementsAre;
-
-namespace {
-
-using detail::canTypeFitValue;
-using detail::CheckedInt;
-
-using IntegralTypes = testing::Types<uint8_t,   // 0
-                                     uint16_t,  // 1
-                                     uint32_t,  // 2
-                                     uint64_t,  // 3
-                                     uintmax_t, // 4
-                                     int8_t,    // 5
-                                     int16_t,   // 6
-                                     int32_t,   // 7
-                                     int64_t,   // 8
-                                     intmax_t   // 9
-                                     >;
-
-template <class T> class StrongIntTest : public testing::Test {};
-TYPED_TEST_SUITE(StrongIntTest, IntegralTypes);
-TYPED_TEST(StrongIntTest, Operations) {
-  using T = TypeParam;
-  auto Max = std::numeric_limits<T>::max();
-  auto Min = std::numeric_limits<T>::min();
-
-  // We bail out for types that are not entirely representable within intmax_t.
-  if (!canTypeFitValue<intmax_t>(Max) || !canTypeFitValue<intmax_t>(Min))
-    return;
-
-  // All representable values convert back and forth.
-  EXPECT_EQ(CheckedInt::from(Min).template to<T>(), Min);
-  EXPECT_EQ(CheckedInt::from(Max).template to<T>(), Max);
-
-  // Addition -2, -1, 0, 1, 2.
-  const T Expected = Max / 2;
-  const CheckedInt Actual = CheckedInt::from(Expected);
-  EXPECT_EQ((Actual + -2).template to<T>(), Expected - 2);
-  EXPECT_EQ((Actual + -1).template to<T>(), Expected - 1);
-  EXPECT_EQ((Actual + 0).template to<T>(), Expected);
-  EXPECT_EQ((Actual + 1).template to<T>(), Expected + 1);
-  EXPECT_EQ((Actual + 2).template to<T>(), Expected + 2);
-
-  // EQ/NEQ
-  EXPECT_EQ(Actual, Actual);
-  EXPECT_NE(Actual, Actual + 1);
-
-  // Difference
-  EXPECT_EQ(Actual - Actual, 0);
-  EXPECT_EQ((Actual + 1) - Actual, 1);
-  EXPECT_EQ(Actual - (Actual + 2), -2);
-}
-
-TEST(StrongIntTest, Enums) {
-  enum UntypedEnum { A = 3 };
-  EXPECT_EQ(CheckedInt::from(A).to<UntypedEnum>(), A);
-
-  enum TypedEnum : uint32_t { B = 3 };
-  EXPECT_EQ(CheckedInt::from(B).to<TypedEnum>(), B);
-
-  enum class ScopedEnum : uint16_t { C = 3 };
-  EXPECT_EQ(CheckedInt::from(ScopedEnum::C).to<ScopedEnum>(), ScopedEnum::C);
-}
-
-#if defined(GTEST_HAS_DEATH_TEST) && !defined(NDEBUG)
-TEST(StrongIntDeathTest, OutOfBounds) {
-  // Values above 'INTMAX_MAX' are not representable.
-  EXPECT_DEATH(CheckedInt::from<uintmax_t>(INTMAX_MAX + 1ULL), "Out of bounds");
-  EXPECT_DEATH(CheckedInt::from<uintmax_t>(UINTMAX_MAX), "Out of bounds");
-  // Casting to narrower type asserts when out of bounds.
-  EXPECT_DEATH(CheckedInt::from(-1).to<uint8_t>(), "Out of bounds");
-  EXPECT_DEATH(CheckedInt::from(256).to<uint8_t>(), "Out of bounds");
-  // Operations leading to intmax_t overflow assert.
-  EXPECT_DEATH(CheckedInt::from(INTMAX_MAX) + 1, "Out of bounds");
-  EXPECT_DEATH(CheckedInt::from(INTMAX_MIN) + -1, "Out of bounds");
-  EXPECT_DEATH(CheckedInt::from(INTMAX_MIN) - CheckedInt::from(INTMAX_MAX),
-               "Out of bounds");
-}
-#endif
-
-TEST(SafeIntIteratorTest, Operations) {
-  detail::SafeIntIterator<int, false> Forward(0);
-  detail::SafeIntIterator<int, true> Reverse(0);
-
-  const auto SetToZero = [&]() {
-    Forward = detail::SafeIntIterator<int, false>(0);
-    Reverse = detail::SafeIntIterator<int, true>(0);
-  };
-
-  // Equality / Comparisons
-  SetToZero();
-  EXPECT_EQ(Forward, Forward);
-  EXPECT_LT(Forward - 1, Forward);
-  EXPECT_LE(Forward, Forward);
-  EXPECT_LE(Forward - 1, Forward);
-  EXPECT_GT(Forward + 1, Forward);
-  EXPECT_GE(Forward, Forward);
-  EXPECT_GE(Forward + 1, Forward);
-
-  EXPECT_EQ(Reverse, Reverse);
-  EXPECT_LT(Reverse - 1, Reverse);
-  EXPECT_LE(Reverse, Reverse);
-  EXPECT_LE(Reverse - 1, Reverse);
-  EXPECT_GT(Reverse + 1, Reverse);
-  EXPECT_GE(Reverse, Reverse);
-  EXPECT_GE(Reverse + 1, Reverse);
-
-  // Dereference
-  SetToZero();
-  EXPECT_EQ(*Forward, 0);
-  EXPECT_EQ(*Reverse, 0);
-
-  // Indexing
-  SetToZero();
-  EXPECT_EQ(Forward[2], 2);
-  EXPECT_EQ(Reverse[2], -2);
-
-  // Pre-increment
-  SetToZero();
-  ++Forward;
-  EXPECT_EQ(*Forward, 1);
-  ++Reverse;
-  EXPECT_EQ(*Reverse, -1);
-
-  // Pre-decrement
-  SetToZero();
-  --Forward;
-  EXPECT_EQ(*Forward, -1);
-  --Reverse;
-  EXPECT_EQ(*Reverse, 1);
-
-  // Post-increment
-  SetToZero();
-  EXPECT_EQ(*(Forward++), 0);
-  EXPECT_EQ(*Forward, 1);
-  EXPECT_EQ(*(Reverse++), 0);
-  EXPECT_EQ(*Reverse, -1);
-
-  // Post-decrement
-  SetToZero();
-  EXPECT_EQ(*(Forward--), 0);
-  EXPECT_EQ(*Forward, -1);
-  EXPECT_EQ(*(Reverse--), 0);
-  EXPECT_EQ(*Reverse, 1);
-
-  // Compound assignment operators
-  SetToZero();
-  Forward += 1;
-  EXPECT_EQ(*Forward, 1);
-  Reverse += 1;
-  EXPECT_EQ(*Reverse, -1);
-  SetToZero();
-  Forward -= 2;
-  EXPECT_EQ(*Forward, -2);
-  Reverse -= 2;
-  EXPECT_EQ(*Reverse, 2);
-
-  // Arithmetic
-  SetToZero();
-  EXPECT_EQ(*(Forward + 3), 3);
-  EXPECT_EQ(*(Reverse + 3), -3);
-  SetToZero();
-  EXPECT_EQ(*(Forward - 4), -4);
-  EXPECT_EQ(*(Reverse - 4), 4);
-
-  // Difference
-  SetToZero();
-  EXPECT_EQ(Forward - Forward, 0);
-  EXPECT_EQ(Reverse - Reverse, 0);
-  EXPECT_EQ((Forward + 1) - Forward, 1);
-  EXPECT_EQ(Forward - (Forward + 1), -1);
-  EXPECT_EQ((Reverse + 1) - Reverse, 1);
-  EXPECT_EQ(Reverse - (Reverse + 1), -1);
-}
-
-TEST(SequenceTest, Iteration) {
-  EXPECT_THAT(seq(-4, 5), ElementsAre(-4, -3, -2, -1, 0, 1, 2, 3, 4));
-  EXPECT_THAT(reverse(seq(-4, 5)), ElementsAre(4, 3, 2, 1, 0, -1, -2, -3, -4));
-
-  EXPECT_THAT(seq_inclusive(-4, 5),
-              ElementsAre(-4, -3, -2, -1, 0, 1, 2, 3, 4, 5));
-  EXPECT_THAT(reverse(seq_inclusive(-4, 5)),
-              ElementsAre(5, 4, 3, 2, 1, 0, -1, -2, -3, -4));
-}
-
-TEST(SequenceTest, Distance) {
-  const auto Forward = seq(0, 10);
-  EXPECT_EQ(std::distance(Forward.begin(), Forward.end()), 10);
-  EXPECT_EQ(std::distance(Forward.rbegin(), Forward.rend()), 10);
-}
-
-TEST(SequenceTest, Dereference) {
-  const auto Forward = seq(0, 10).begin();
-  EXPECT_EQ(Forward[0], 0);
-  EXPECT_EQ(Forward[2], 2);
-  const auto Backward = seq(0, 10).rbegin();
-  EXPECT_EQ(Backward[0], 9);
-  EXPECT_EQ(Backward[2], 7);
-}
-
-} // anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/SetVectorTest.cpp b/gnu/llvm/llvm/unittests/ADT/SetVectorTest.cpp
deleted file mode 100644
index d5d49fba5e5..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/SetVectorTest.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-//===- llvm/unittest/ADT/SetVector.cpp ------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// SetVector unit tests.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/SetVector.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-TEST(SetVector, EraseTest) {
-  SetVector<int> S;
-  S.insert(0);
-  S.insert(1);
-  S.insert(2);
-
-  auto I = S.erase(std::next(S.begin()));
-
-  // Test that the returned iterator is the expected one-after-erase
-  // and the size/contents is the expected sequence {0, 2}.
-  EXPECT_EQ(std::next(S.begin()), I);
-  EXPECT_EQ(2u, S.size());
-  EXPECT_EQ(0, *S.begin());
-  EXPECT_EQ(2, *std::next(S.begin()));
-}
-
-TEST(SetVector, ContainsTest) {
-  SetVector<int> S;
-  S.insert(0);
-  S.insert(1);
-  S.insert(2);
-
-  EXPECT_TRUE(S.contains(0));
-  EXPECT_TRUE(S.contains(1));
-  EXPECT_TRUE(S.contains(2));
-  EXPECT_FALSE(S.contains(-1));
-
-  S.insert(2);
-  EXPECT_TRUE(S.contains(2));
-
-  S.remove(2);
-  EXPECT_FALSE(S.contains(2));
-}
diff --git a/gnu/llvm/llvm/unittests/ADT/SimpleIListTest.cpp b/gnu/llvm/llvm/unittests/ADT/SimpleIListTest.cpp
deleted file mode 100644
index 238896eaefb..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/SimpleIListTest.cpp
+++ /dev/null
@@ -1,653 +0,0 @@
-//===- unittests/ADT/SimpleIListTest.cpp - simple_ilist unit tests --------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/simple_ilist.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-struct Node : ilist_node<Node> {};
-bool operator<(const Node &L, const Node &R) { return &L < &R; }
-bool makeFalse(const Node &, const Node &) { return false; }
-
-struct deleteNode : std::default_delete<Node> {};
-void doNothing(Node *) {}
-
-TEST(SimpleIListTest, DefaultConstructor) {
-  simple_ilist<Node> L;
-  EXPECT_EQ(L.begin(), L.end());
-  EXPECT_TRUE(L.empty());
-  EXPECT_EQ(0u, L.size());
-}
-
-TEST(SimpleIListTest, pushPopFront) {
-  simple_ilist<Node> L;
-  Node A, B;
-  L.push_front(B);
-  L.push_front(A);
-  EXPECT_EQ(&A, &L.front());
-  EXPECT_EQ(&B, &L.back());
-  EXPECT_FALSE(L.empty());
-  EXPECT_EQ(2u, L.size());
-
-  // Pop front and check the new front.
-  L.pop_front();
-  EXPECT_EQ(&B, &L.front());
-
-  // Pop to empty.
-  L.pop_front();
-  EXPECT_TRUE(L.empty());
-}
-
-TEST(SimpleIListTest, pushPopBack) {
-  simple_ilist<Node> L;
-  Node A, B;
-  L.push_back(A);
-  L.push_back(B);
-  EXPECT_EQ(&A, &L.front());
-  EXPECT_EQ(&B, &L.back());
-  EXPECT_FALSE(L.empty());
-  EXPECT_EQ(2u, L.size());
-
-  // Pop back and check the new front.
-  L.pop_back();
-  EXPECT_EQ(&A, &L.back());
-
-  // Pop to empty.
-  L.pop_back();
-  EXPECT_TRUE(L.empty());
-}
-
-TEST(SimpleIListTest, swap) {
-  simple_ilist<Node> L1, L2;
-  Node A, B;
-  L1.push_back(A);
-  L1.push_back(B);
-  L1.swap(L2);
-  EXPECT_TRUE(L1.empty());
-  EXPECT_EQ(0u, L1.size());
-  EXPECT_EQ(&A, &L2.front());
-  EXPECT_EQ(&B, &L2.back());
-  EXPECT_FALSE(L2.empty());
-  EXPECT_EQ(2u, L2.size());
-}
-
-TEST(SimpleIListTest, insertEraseAtEnd) {
-  simple_ilist<Node> L;
-  Node A, B;
-  L.insert(L.end(), A);
-  L.insert(L.end(), B);
-  EXPECT_EQ(&A, &L.front());
-  EXPECT_EQ(&B, &L.back());
-  EXPECT_FALSE(L.empty());
-  EXPECT_EQ(2u, L.size());
-}
-
-TEST(SimpleIListTest, insertAtBegin) {
-  simple_ilist<Node> L;
-  Node A, B;
-  L.insert(L.begin(), B);
-  L.insert(L.begin(), A);
-  EXPECT_EQ(&A, &L.front());
-  EXPECT_EQ(&B, &L.back());
-  EXPECT_FALSE(L.empty());
-  EXPECT_EQ(2u, L.size());
-}
-
-TEST(SimpleIListTest, remove) {
-  simple_ilist<Node> L;
-  Node A, B, C;
-  L.push_back(A);
-  L.push_back(B);
-  L.push_back(C);
-  EXPECT_EQ(&A, &L.front());
-  EXPECT_EQ(&B, &*++L.begin());
-  EXPECT_EQ(&C, &L.back());
-  EXPECT_EQ(3u, L.size());
-
-  L.remove(B);
-  EXPECT_EQ(&A, &L.front());
-  EXPECT_EQ(&C, &L.back());
-  EXPECT_EQ(2u, L.size());
-
-  L.remove(A);
-  EXPECT_EQ(&C, &L.front());
-  EXPECT_EQ(1u, L.size());
-
-  L.remove(C);
-  EXPECT_TRUE(L.empty());
-}
-
-TEST(SimpleIListTest, removeAndDispose) {
-  simple_ilist<Node> L;
-  Node A, C;
-  Node *B = new Node;
-  L.push_back(A);
-  L.push_back(*B);
-  L.push_back(C);
-  EXPECT_EQ(&A, &L.front());
-  EXPECT_EQ(B, &*++L.begin());
-  EXPECT_EQ(&C, &L.back());
-  EXPECT_EQ(3u, L.size());
-
-  L.removeAndDispose(*B, deleteNode());
-  EXPECT_EQ(&A, &L.front());
-  EXPECT_EQ(&C, &L.back());
-  EXPECT_EQ(2u, L.size());
-}
-
-TEST(SimpleIListTest, removeAndDisposeNullDeleter) {
-  simple_ilist<Node> L;
-  Node A, B, C;
-  L.push_back(A);
-  L.push_back(B);
-  L.push_back(C);
-  EXPECT_EQ(&A, &L.front());
-  EXPECT_EQ(&B, &*++L.begin());
-  EXPECT_EQ(&C, &L.back());
-  EXPECT_EQ(3u, L.size());
-
-  L.removeAndDispose(B, doNothing);
-  EXPECT_EQ(&A, &L.front());
-  EXPECT_EQ(&C, &L.back());
-  EXPECT_EQ(2u, L.size());
-}
-
-TEST(SimpleIListTest, erase) {
-  simple_ilist<Node> L;
-  Node A, B, C;
-  L.push_back(A);
-  L.push_back(B);
-  L.push_back(C);
-  EXPECT_EQ(&A, &L.front());
-  EXPECT_EQ(&B, &*++L.begin());
-  EXPECT_EQ(&C, &L.back());
-  EXPECT_EQ(3u, L.size());
-
-  EXPECT_EQ(C.getIterator(), L.erase(B.getIterator()));
-  EXPECT_EQ(&A, &L.front());
-  EXPECT_EQ(&C, &L.back());
-  EXPECT_EQ(2u, L.size());
-}
-
-TEST(SimpleIListTest, reverse_iterator) {
-  simple_ilist<Node> L;
-  Node A, B, C;
-  L.push_back(A);
-  L.push_back(B);
-  L.push_back(C);
-
-  auto ReverseIter = L.rbegin();
-  EXPECT_EQ(C.getReverseIterator(), ReverseIter);
-  ++ReverseIter;
-  EXPECT_EQ(B.getReverseIterator(), ReverseIter);
-  ++ReverseIter;
-  EXPECT_EQ(A.getReverseIterator(), ReverseIter);
-  ++ReverseIter;
-  EXPECT_EQ(L.rend(), ReverseIter);
-}
-
-TEST(SimpleIListTest, eraseAndDispose) {
-  simple_ilist<Node> L;
-  Node A, C;
-  Node *B = new Node;
-  L.push_back(A);
-  L.push_back(*B);
-  L.push_back(C);
-  EXPECT_EQ(&A, &L.front());
-  EXPECT_EQ(B, &*++L.begin());
-  EXPECT_EQ(&C, &L.back());
-  EXPECT_EQ(3u, L.size());
-
-  L.eraseAndDispose(B->getIterator(), deleteNode());
-  EXPECT_EQ(&A, &L.front());
-  EXPECT_EQ(&C, &L.back());
-  EXPECT_EQ(2u, L.size());
-}
-
-TEST(SimpleIListTest, eraseAndDisposeNullDeleter) {
-  simple_ilist<Node> L;
-  Node A, B, C;
-  L.push_back(A);
-  L.push_back(B);
-  L.push_back(C);
-  EXPECT_EQ(&A, &L.front());
-  EXPECT_EQ(&B, &*++L.begin());
-  EXPECT_EQ(&C, &L.back());
-  EXPECT_EQ(3u, L.size());
-
-  L.eraseAndDispose(B.getIterator(), doNothing);
-  EXPECT_EQ(&A, &L.front());
-  EXPECT_EQ(&C, &L.back());
-  EXPECT_EQ(2u, L.size());
-}
-
-TEST(SimpleIListTest, eraseRange) {
-  simple_ilist<Node> L;
-  Node A, B, C, D, E;
-  L.push_back(A);
-  L.push_back(B);
-  L.push_back(C);
-  L.push_back(D);
-  L.push_back(E);
-  auto I = L.begin();
-  EXPECT_EQ(&A, &*I++);
-  EXPECT_EQ(&B, &*I++);
-  EXPECT_EQ(&C, &*I++);
-  EXPECT_EQ(&D, &*I++);
-  EXPECT_EQ(&E, &*I++);
-  EXPECT_EQ(L.end(), I);
-  EXPECT_EQ(5u, L.size());
-
-  // Erase a range.
-  EXPECT_EQ(E.getIterator(), L.erase(B.getIterator(), E.getIterator()));
-  EXPECT_EQ(&A, &L.front());
-  EXPECT_EQ(&E, &L.back());
-  EXPECT_EQ(2u, L.size());
-}
-
-TEST(SimpleIListTest, eraseAndDisposeRange) {
-  simple_ilist<Node> L;
-  Node A, *B = new Node, *C = new Node, *D = new Node, E;
-  L.push_back(A);
-  L.push_back(*B);
-  L.push_back(*C);
-  L.push_back(*D);
-  L.push_back(E);
-  auto I = L.begin();
-  EXPECT_EQ(&A, &*I++);
-  EXPECT_EQ(B, &*I++);
-  EXPECT_EQ(C, &*I++);
-  EXPECT_EQ(D, &*I++);
-  EXPECT_EQ(&E, &*I++);
-  EXPECT_EQ(L.end(), I);
-  EXPECT_EQ(5u, L.size());
-
-  // Erase a range.
-  EXPECT_EQ(E.getIterator(),
-            L.eraseAndDispose(B->getIterator(), E.getIterator(), deleteNode()));
-  EXPECT_EQ(&A, &L.front());
-  EXPECT_EQ(&E, &L.back());
-  EXPECT_EQ(2u, L.size());
-}
-
-TEST(SimpleIListTest, eraseAndDisposeRangeNullDeleter) {
-  simple_ilist<Node> L;
-  Node A, B, C, D, E;
-  L.push_back(A);
-  L.push_back(B);
-  L.push_back(C);
-  L.push_back(D);
-  L.push_back(E);
-  auto I = L.begin();
-  EXPECT_EQ(&A, &*I++);
-  EXPECT_EQ(&B, &*I++);
-  EXPECT_EQ(&C, &*I++);
-  EXPECT_EQ(&D, &*I++);
-  EXPECT_EQ(&E, &*I++);
-  EXPECT_EQ(L.end(), I);
-  EXPECT_EQ(5u, L.size());
-
-  // Erase a range.
-  EXPECT_EQ(E.getIterator(),
-            L.eraseAndDispose(B.getIterator(), E.getIterator(), doNothing));
-  EXPECT_EQ(&A, &L.front());
-  EXPECT_EQ(&E, &L.back());
-  EXPECT_EQ(2u, L.size());
-}
-
-TEST(SimpleIListTest, clear) {
-  simple_ilist<Node> L;
-  Node A, B;
-  L.push_back(A);
-  L.push_back(B);
-  L.clear();
-  EXPECT_TRUE(L.empty());
-  EXPECT_EQ(0u, L.size());
-}
-
-TEST(SimpleIListTest, clearAndDispose) {
-  simple_ilist<Node> L;
-  Node *A = new Node;
-  Node *B = new Node;
-  L.push_back(*A);
-  L.push_back(*B);
-  L.clearAndDispose(deleteNode());
-  EXPECT_TRUE(L.empty());
-  EXPECT_EQ(0u, L.size());
-}
-
-TEST(SimpleIListTest, clearAndDisposeNullDeleter) {
-  simple_ilist<Node> L;
-  Node A, B;
-  L.push_back(A);
-  L.push_back(B);
-  L.clearAndDispose(doNothing);
-  EXPECT_TRUE(L.empty());
-  EXPECT_EQ(0u, L.size());
-}
-
-TEST(SimpleIListTest, spliceList) {
-  simple_ilist<Node> L1, L2;
-  Node A, B, C, D;
-
-  // [A, D].
-  L1.push_back(A);
-  L1.push_back(D);
-
-  // [B, C].
-  L2.push_back(B);
-  L2.push_back(C);
-
-  // Splice in L2, giving [A, B, C, D].
-  L1.splice(--L1.end(), L2);
-  EXPECT_TRUE(L2.empty());
-  EXPECT_EQ(4u, L1.size());
-  auto I = L1.begin();
-  EXPECT_EQ(&A, &*I++);
-  EXPECT_EQ(&B, &*I++);
-  EXPECT_EQ(&C, &*I++);
-  EXPECT_EQ(&D, &*I++);
-  EXPECT_EQ(L1.end(), I);
-}
-
-TEST(SimpleIListTest, spliceSingle) {
-  simple_ilist<Node> L1, L2;
-  Node A, B, C, D, E;
-
-  // [A, C].
-  L1.push_back(A);
-  L1.push_back(C);
-
-  // [D, B, E].
-  L2.push_back(D);
-  L2.push_back(B);
-  L2.push_back(E);
-
-  // Splice B from L2 to L1, giving [A, B, C] and [D, E].
-  L1.splice(--L1.end(), L2, ++L2.begin());
-  auto I = L1.begin();
-  EXPECT_EQ(&A, &*I++);
-  EXPECT_EQ(&B, &*I++);
-  EXPECT_EQ(&C, &*I++);
-  EXPECT_EQ(L1.end(), I);
-
-  I = L2.begin();
-  EXPECT_EQ(&D, &*I++);
-  EXPECT_EQ(&E, &*I++);
-  EXPECT_EQ(L2.end(), I);
-}
-
-TEST(SimpleIListTest, spliceRange) {
-  simple_ilist<Node> L1, L2;
-  Node A, B, C, D, E, F;
-
-  // [A, D].
-  L1.push_back(A);
-  L1.push_back(D);
-
-  // [E, B, C, F].
-  L2.push_back(E);
-  L2.push_back(B);
-  L2.push_back(C);
-  L2.push_back(F);
-
-  // Splice B from L2 to L1, giving [A, B, C, D] and [E, F].
-  L1.splice(--L1.end(), L2, ++L2.begin(), --L2.end());
-  auto I = L1.begin();
-  EXPECT_EQ(&A, &*I++);
-  EXPECT_EQ(&B, &*I++);
-  EXPECT_EQ(&C, &*I++);
-  EXPECT_EQ(&D, &*I++);
-  EXPECT_EQ(L1.end(), I);
-
-  I = L2.begin();
-  EXPECT_EQ(&E, &*I++);
-  EXPECT_EQ(&F, &*I++);
-  EXPECT_EQ(L2.end(), I);
-}
-
-TEST(SimpleIListTest, merge) {
-  for (bool IsL1LHS : {false, true}) {
-    simple_ilist<Node> L1, L2;
-    Node Ns[10];
-
-    // Fill L1.
-    L1.push_back(Ns[0]);
-    L1.push_back(Ns[3]);
-    L1.push_back(Ns[4]);
-    L1.push_back(Ns[8]);
-
-    // Fill L2.
-    L2.push_back(Ns[1]);
-    L2.push_back(Ns[2]);
-    L2.push_back(Ns[5]);
-    L2.push_back(Ns[6]);
-    L2.push_back(Ns[7]);
-    L2.push_back(Ns[9]);
-
-    // Check setup.
-    EXPECT_EQ(4u, L1.size());
-    EXPECT_EQ(6u, L2.size());
-    EXPECT_TRUE(llvm::is_sorted(L1));
-    EXPECT_TRUE(llvm::is_sorted(L2));
-
-    // Merge.
-    auto &LHS = IsL1LHS ? L1 : L2;
-    auto &RHS = IsL1LHS ? L2 : L1;
-    LHS.merge(RHS);
-    EXPECT_TRUE(RHS.empty());
-    EXPECT_FALSE(LHS.empty());
-    EXPECT_TRUE(llvm::is_sorted(LHS));
-    auto I = LHS.begin();
-    for (Node &N : Ns)
-      EXPECT_EQ(&N, &*I++);
-    EXPECT_EQ(LHS.end(), I);
-  }
-}
-
-TEST(SimpleIListTest, mergeIsStable) {
-  simple_ilist<Node> L1, L2;
-  Node Ns[5];
-
-  auto setup = [&]() {
-    EXPECT_TRUE(L1.empty());
-    EXPECT_TRUE(L2.empty());
-
-    // Fill L1.
-    L1.push_back(Ns[0]);
-    L1.push_back(Ns[3]);
-    L1.push_back(Ns[4]);
-
-    // Fill L2.
-    L2.push_back(Ns[1]);
-    L2.push_back(Ns[2]);
-
-    // Check setup.
-    EXPECT_EQ(3u, L1.size());
-    EXPECT_EQ(2u, L2.size());
-    EXPECT_TRUE(llvm::is_sorted(L1, makeFalse));
-    EXPECT_TRUE(llvm::is_sorted(L2, makeFalse));
-  };
-
-  // Merge.  Should be stable.
-  setup();
-  L1.merge(L2, makeFalse);
-  EXPECT_TRUE(L2.empty());
-  EXPECT_FALSE(L1.empty());
-  EXPECT_TRUE(llvm::is_sorted(L1, makeFalse));
-  auto I = L1.begin();
-  EXPECT_EQ(&Ns[0], &*I++);
-  EXPECT_EQ(&Ns[3], &*I++);
-  EXPECT_EQ(&Ns[4], &*I++);
-  EXPECT_EQ(&Ns[1], &*I++);
-  EXPECT_EQ(&Ns[2], &*I++);
-  EXPECT_EQ(L1.end(), I);
-
-  // Merge the other way.  Should be stable.
-  L1.clear();
-  setup();
-  L2.merge(L1, makeFalse);
-  EXPECT_TRUE(L1.empty());
-  EXPECT_FALSE(L2.empty());
-  EXPECT_TRUE(llvm::is_sorted(L2, makeFalse));
-  I = L2.begin();
-  EXPECT_EQ(&Ns[1], &*I++);
-  EXPECT_EQ(&Ns[2], &*I++);
-  EXPECT_EQ(&Ns[0], &*I++);
-  EXPECT_EQ(&Ns[3], &*I++);
-  EXPECT_EQ(&Ns[4], &*I++);
-  EXPECT_EQ(L2.end(), I);
-}
-
-TEST(SimpleIListTest, mergeEmpty) {
-  for (bool IsL1LHS : {false, true}) {
-    simple_ilist<Node> L1, L2;
-    Node Ns[4];
-
-    // Fill L1.
-    L1.push_back(Ns[0]);
-    L1.push_back(Ns[1]);
-    L1.push_back(Ns[2]);
-    L1.push_back(Ns[3]);
-
-    // Check setup.
-    EXPECT_EQ(4u, L1.size());
-    EXPECT_TRUE(L2.empty());
-    EXPECT_TRUE(llvm::is_sorted(L1));
-
-    // Merge.
-    auto &LHS = IsL1LHS ? L1 : L2;
-    auto &RHS = IsL1LHS ? L2 : L1;
-    LHS.merge(RHS);
-    EXPECT_TRUE(RHS.empty());
-    EXPECT_FALSE(LHS.empty());
-    EXPECT_TRUE(llvm::is_sorted(LHS));
-    auto I = LHS.begin();
-    for (Node &N : Ns)
-      EXPECT_EQ(&N, &*I++);
-    EXPECT_EQ(LHS.end(), I);
-  }
-}
-
-TEST(SimpleIListTest, mergeBothEmpty) {
-  simple_ilist<Node> L1, L2;
-  L1.merge(L2);
-  EXPECT_TRUE(L1.empty());
-  EXPECT_TRUE(L2.empty());
-}
-
-TEST(SimpleIListTest, sort) {
-  simple_ilist<Node> L;
-  Node Ns[10];
-
-  // Fill L.
-  for (int I : {3, 4, 0, 8, 1, 2, 6, 7, 9, 5})
-    L.push_back(Ns[I]);
-
-  // Check setup.
-  EXPECT_EQ(10u, L.size());
-  EXPECT_FALSE(llvm::is_sorted(L));
-
-  // Sort.
-  L.sort();
-  EXPECT_TRUE(llvm::is_sorted(L));
-  auto I = L.begin();
-  for (Node &N : Ns)
-    EXPECT_EQ(&N, &*I++);
-  EXPECT_EQ(L.end(), I);
-}
-
-TEST(SimpleIListTest, sortIsStable) {
-  simple_ilist<Node> L;
-  Node Ns[10];
-
-  // Compare such that nodes are partitioned but not fully sorted.
-  auto partition = [&](const Node &N) { return &N >= &Ns[5]; };
-  auto compare = [&](const Node &L, const Node &R) {
-    return partition(L) < partition(R);
-  };
-
-  // Fill L.
-  for (int I : {3, 4, 7, 8, 1, 2, 6, 0, 9, 5})
-    L.push_back(Ns[I]);
-
-  // Check setup.
-  EXPECT_EQ(10u, L.size());
-  EXPECT_FALSE(llvm::is_sorted(L, compare));
-
-  // Sort.
-  L.sort(compare);
-  EXPECT_TRUE(llvm::is_sorted(L, compare));
-  auto I = L.begin();
-  for (int O : {3, 4, 1, 2, 0})
-    EXPECT_EQ(&Ns[O], &*I++);
-  for (int O : {7, 8, 6, 9, 5})
-    EXPECT_EQ(&Ns[O], &*I++);
-  EXPECT_EQ(L.end(), I);
-}
-
-TEST(SimpleIListTest, sortEmpty) {
-  simple_ilist<Node> L;
-  L.sort();
-}
-
-struct Tag1 {};
-struct Tag2 {};
-
-struct DoubleNode : ilist_node<DoubleNode, ilist_tag<Tag1>>,
-                    ilist_node<DoubleNode, ilist_tag<Tag2>> {
-  typedef ilist_node<DoubleNode, ilist_tag<Tag1>> Node1Type;
-  typedef ilist_node<DoubleNode, ilist_tag<Tag2>> Node2Type;
-
-  Node1Type::self_iterator getIterator1() { return Node1Type::getIterator(); }
-  Node2Type::self_iterator getIterator2() { return Node2Type::getIterator(); }
-  Node1Type::const_self_iterator getIterator1() const {
-    return Node1Type::getIterator();
-  }
-  Node2Type::const_self_iterator getIterator2() const {
-    return Node2Type::getIterator();
-  }
-};
-typedef simple_ilist<DoubleNode, ilist_tag<Tag1>> TaggedList1Type;
-typedef simple_ilist<DoubleNode, ilist_tag<Tag2>> TaggedList2Type;
-
-TEST(SimpleIListTest, TaggedLists) {
-  TaggedList1Type L1;
-  TaggedList2Type L2;
-
-  // Build the two lists, sharing a couple of nodes.
-  DoubleNode Ns[10];
-  int Order1[] = {0, 1, 2, 3, 4, 7, 9};
-  int Order2[] = {2, 5, 6, 7, 8, 4, 9, 1};
-  for (int I : Order1)
-    L1.push_back(Ns[I]);
-  for (int I : Order2)
-    L2.push_back(Ns[I]);
-
-  // Check that each list is correct.
-  EXPECT_EQ(sizeof(Order1) / sizeof(int), L1.size());
-  auto I1 = L1.begin();
-  for (int I : Order1) {
-    EXPECT_EQ(Ns[I].getIterator1(), I1);
-    EXPECT_EQ(&Ns[I], &*I1++);
-  }
-  EXPECT_EQ(L1.end(), I1);
-
-  EXPECT_EQ(sizeof(Order2) / sizeof(int), L2.size());
-  auto I2 = L2.begin();
-  for (int I : Order2) {
-    EXPECT_EQ(Ns[I].getIterator2(), I2);
-    EXPECT_EQ(&Ns[I], &*I2++);
-  }
-  EXPECT_EQ(L2.end(), I2);
-}
-
-} // end namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/SmallPtrSetTest.cpp b/gnu/llvm/llvm/unittests/ADT/SmallPtrSetTest.cpp
deleted file mode 100644
index 6f3c94eed27..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/SmallPtrSetTest.cpp
+++ /dev/null
@@ -1,410 +0,0 @@
-//===- llvm/unittest/ADT/SmallPtrSetTest.cpp ------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// SmallPtrSet unit tests.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/SmallPtrSet.h"
-#include "llvm/ADT/PointerIntPair.h"
-#include "llvm/Support/PointerLikeTypeTraits.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-TEST(SmallPtrSetTest, Assignment) {
-  int buf[8];
-  for (int i = 0; i < 8; ++i)
-    buf[i] = 0;
-
-  SmallPtrSet<int *, 4> s1 = {&buf[0], &buf[1]};
-  SmallPtrSet<int *, 4> s2;
-  (s2 = s1).insert(&buf[2]);
-
-  // Self assign as well.
-  (s2 = static_cast<SmallPtrSet<int *, 4> &>(s2)).insert(&buf[3]);
-
-  s1 = s2;
-  EXPECT_EQ(4U, s1.size());
-  for (int i = 0; i < 8; ++i)
-    if (i < 4)
-      EXPECT_TRUE(s1.count(&buf[i]));
-    else
-      EXPECT_FALSE(s1.count(&buf[i]));
-
-  // Assign and insert with initializer lists, and ones that contain both
-  // duplicates and out-of-order elements.
-  (s2 = {&buf[6], &buf[7], &buf[6]}).insert({&buf[5], &buf[4]});
-  for (int i = 0; i < 8; ++i)
-    if (i < 4)
-      EXPECT_FALSE(s2.count(&buf[i]));
-    else
-      EXPECT_TRUE(s2.count(&buf[i]));
-}
-
-TEST(SmallPtrSetTest, GrowthTest) {
-  int i;
-  int buf[8];
-  for(i=0; i<8; ++i) buf[i]=0;
-
-
-  SmallPtrSet<int *, 4> s;
-  typedef SmallPtrSet<int *, 4>::iterator iter;
-
-  s.insert(&buf[0]);
-  s.insert(&buf[1]);
-  s.insert(&buf[2]);
-  s.insert(&buf[3]);
-  EXPECT_EQ(4U, s.size());
-
-  i = 0;
-  for(iter I=s.begin(), E=s.end(); I!=E; ++I, ++i)
-      (**I)++;
-  EXPECT_EQ(4, i);
-  for(i=0; i<8; ++i)
-      EXPECT_EQ(i<4?1:0,buf[i]);
-
-  s.insert(&buf[4]);
-  s.insert(&buf[5]);
-  s.insert(&buf[6]);
-  s.insert(&buf[7]);
-
-  i = 0;
-  for(iter I=s.begin(), E=s.end(); I!=E; ++I, ++i)
-      (**I)++;
-  EXPECT_EQ(8, i);
-  s.erase(&buf[4]);
-  s.erase(&buf[5]);
-  s.erase(&buf[6]);
-  s.erase(&buf[7]);
-  EXPECT_EQ(4U, s.size());
-
-  i = 0;
-  for(iter I=s.begin(), E=s.end(); I!=E; ++I, ++i)
-      (**I)++;
-  EXPECT_EQ(4, i);
-  for(i=0; i<8; ++i)
-      EXPECT_EQ(i<4?3:1,buf[i]);
-
-  s.clear();
-  for(i=0; i<8; ++i) buf[i]=0;
-  for(i=0; i<128; ++i) s.insert(&buf[i%8]); // test repeated entires
-  EXPECT_EQ(8U, s.size());
-  for(iter I=s.begin(), E=s.end(); I!=E; ++I, ++i)
-      (**I)++;
-  for(i=0; i<8; ++i)
-      EXPECT_EQ(1,buf[i]);
-}
-
-TEST(SmallPtrSetTest, CopyAndMoveTest) {
-  int buf[8];
-  for (int i = 0; i < 8; ++i)
-    buf[i] = 0;
-
-  SmallPtrSet<int *, 4> s1;
-  s1.insert(&buf[0]);
-  s1.insert(&buf[1]);
-  s1.insert(&buf[2]);
-  s1.insert(&buf[3]);
-  EXPECT_EQ(4U, s1.size());
-  for (int i = 0; i < 8; ++i)
-    if (i < 4)
-      EXPECT_TRUE(s1.count(&buf[i]));
-    else
-      EXPECT_FALSE(s1.count(&buf[i]));
-
-  SmallPtrSet<int *, 4> s2(s1);
-  EXPECT_EQ(4U, s2.size());
-  for (int i = 0; i < 8; ++i)
-    if (i < 4)
-      EXPECT_TRUE(s2.count(&buf[i]));
-    else
-      EXPECT_FALSE(s2.count(&buf[i]));
-
-  s1 = s2;
-  EXPECT_EQ(4U, s1.size());
-  EXPECT_EQ(4U, s2.size());
-  for (int i = 0; i < 8; ++i)
-    if (i < 4)
-      EXPECT_TRUE(s1.count(&buf[i]));
-    else
-      EXPECT_FALSE(s1.count(&buf[i]));
-
-  SmallPtrSet<int *, 4> s3(std::move(s1));
-  EXPECT_EQ(4U, s3.size());
-  EXPECT_TRUE(s1.empty());
-  for (int i = 0; i < 8; ++i)
-    if (i < 4)
-      EXPECT_TRUE(s3.count(&buf[i]));
-    else
-      EXPECT_FALSE(s3.count(&buf[i]));
-
-  // Move assign into the moved-from object. Also test move of a non-small
-  // container.
-  s3.insert(&buf[4]);
-  s3.insert(&buf[5]);
-  s3.insert(&buf[6]);
-  s3.insert(&buf[7]);
-  s1 = std::move(s3);
-  EXPECT_EQ(8U, s1.size());
-  EXPECT_TRUE(s3.empty());
-  for (int i = 0; i < 8; ++i)
-    EXPECT_TRUE(s1.count(&buf[i]));
-
-  // Copy assign into a moved-from object.
-  s3 = s1;
-  EXPECT_EQ(8U, s3.size());
-  EXPECT_EQ(8U, s1.size());
-  for (int i = 0; i < 8; ++i)
-    EXPECT_TRUE(s3.count(&buf[i]));
-}
-
-TEST(SmallPtrSetTest, SwapTest) {
-  int buf[10];
-
-  SmallPtrSet<int *, 2> a;
-  SmallPtrSet<int *, 2> b;
-
-  a.insert(&buf[0]);
-  a.insert(&buf[1]);
-  b.insert(&buf[2]);
-
-  EXPECT_EQ(2U, a.size());
-  EXPECT_EQ(1U, b.size());
-  EXPECT_TRUE(a.count(&buf[0]));
-  EXPECT_TRUE(a.count(&buf[1]));
-  EXPECT_FALSE(a.count(&buf[2]));
-  EXPECT_FALSE(a.count(&buf[3]));
-  EXPECT_FALSE(b.count(&buf[0]));
-  EXPECT_FALSE(b.count(&buf[1]));
-  EXPECT_TRUE(b.count(&buf[2]));
-  EXPECT_FALSE(b.count(&buf[3]));
-
-  std::swap(a, b);
-
-  EXPECT_EQ(1U, a.size());
-  EXPECT_EQ(2U, b.size());
-  EXPECT_FALSE(a.count(&buf[0]));
-  EXPECT_FALSE(a.count(&buf[1]));
-  EXPECT_TRUE(a.count(&buf[2]));
-  EXPECT_FALSE(a.count(&buf[3]));
-  EXPECT_TRUE(b.count(&buf[0]));
-  EXPECT_TRUE(b.count(&buf[1]));
-  EXPECT_FALSE(b.count(&buf[2]));
-  EXPECT_FALSE(b.count(&buf[3]));
-
-  b.insert(&buf[3]);
-  std::swap(a, b);
-
-  EXPECT_EQ(3U, a.size());
-  EXPECT_EQ(1U, b.size());
-  EXPECT_TRUE(a.count(&buf[0]));
-  EXPECT_TRUE(a.count(&buf[1]));
-  EXPECT_FALSE(a.count(&buf[2]));
-  EXPECT_TRUE(a.count(&buf[3]));
-  EXPECT_FALSE(b.count(&buf[0]));
-  EXPECT_FALSE(b.count(&buf[1]));
-  EXPECT_TRUE(b.count(&buf[2]));
-  EXPECT_FALSE(b.count(&buf[3]));
-
-  std::swap(a, b);
-
-  EXPECT_EQ(1U, a.size());
-  EXPECT_EQ(3U, b.size());
-  EXPECT_FALSE(a.count(&buf[0]));
-  EXPECT_FALSE(a.count(&buf[1]));
-  EXPECT_TRUE(a.count(&buf[2]));
-  EXPECT_FALSE(a.count(&buf[3]));
-  EXPECT_TRUE(b.count(&buf[0]));
-  EXPECT_TRUE(b.count(&buf[1]));
-  EXPECT_FALSE(b.count(&buf[2]));
-  EXPECT_TRUE(b.count(&buf[3]));
-
-  a.insert(&buf[4]);
-  a.insert(&buf[5]);
-  a.insert(&buf[6]);
-
-  std::swap(b, a);
-
-  EXPECT_EQ(3U, a.size());
-  EXPECT_EQ(4U, b.size());
-  EXPECT_TRUE(b.count(&buf[2]));
-  EXPECT_TRUE(b.count(&buf[4]));
-  EXPECT_TRUE(b.count(&buf[5]));
-  EXPECT_TRUE(b.count(&buf[6]));
-  EXPECT_TRUE(a.count(&buf[0]));
-  EXPECT_TRUE(a.count(&buf[1]));
-  EXPECT_TRUE(a.count(&buf[3]));
-}
-
-void checkEraseAndIterators(SmallPtrSetImpl<int*> &S) {
-  int buf[3];
-
-  S.insert(&buf[0]);
-  S.insert(&buf[1]);
-  S.insert(&buf[2]);
-
-  // Iterators must still be valid after erase() calls;
-  auto B = S.begin();
-  auto M = std::next(B);
-  auto E = S.end();
-  EXPECT_TRUE(*B == &buf[0] || *B == &buf[1] || *B == &buf[2]);
-  EXPECT_TRUE(*M == &buf[0] || *M == &buf[1] || *M == &buf[2]);
-  EXPECT_TRUE(*B != *M);
-  int *Removable = *std::next(M);
-  // No iterator points to Removable now.
-  EXPECT_TRUE(Removable == &buf[0] || Removable == &buf[1] ||
-              Removable == &buf[2]);
-  EXPECT_TRUE(Removable != *B && Removable != *M);
-
-  S.erase(Removable);
-
-  // B,M,E iterators should still be valid
-  EXPECT_EQ(B, S.begin());
-  EXPECT_EQ(M, std::next(B));
-  EXPECT_EQ(E, S.end());
-  EXPECT_EQ(std::next(M), E);
-}
-
-TEST(SmallPtrSetTest, EraseTest) {
-  // Test when set stays small.
-  SmallPtrSet<int *, 8> B;
-  checkEraseAndIterators(B);
-
-  // Test when set grows big.
-  SmallPtrSet<int *, 2> A;
-  checkEraseAndIterators(A);
-}
-
-// Verify that dereferencing and iteration work.
-TEST(SmallPtrSetTest, dereferenceAndIterate) {
-  int Ints[] = {0, 1, 2, 3, 4, 5, 6, 7};
-  SmallPtrSet<const int *, 4> S;
-  for (int &I : Ints) {
-    EXPECT_EQ(&I, *S.insert(&I).first);
-    EXPECT_EQ(&I, *S.find(&I));
-  }
-
-  // Iterate from each and count how many times each element is found.
-  int Found[sizeof(Ints)/sizeof(int)] = {0};
-  for (int &I : Ints)
-    for (auto F = S.find(&I), E = S.end(); F != E; ++F)
-      ++Found[*F - Ints];
-
-  // Sort.  We should hit the first element just once and the final element N
-  // times.
-  llvm::sort(std::begin(Found), std::end(Found));
-  for (auto F = std::begin(Found), E = std::end(Found); F != E; ++F)
-    EXPECT_EQ(F - Found + 1, *F);
-}
-
-// Verify that const pointers work for count and find even when the underlying
-// SmallPtrSet is not for a const pointer type.
-TEST(SmallPtrSetTest, ConstTest) {
-  SmallPtrSet<int *, 8> IntSet;
-  int A;
-  int *B = &A;
-  const int *C = &A;
-  IntSet.insert(B);
-  EXPECT_EQ(IntSet.count(B), 1u);
-  EXPECT_EQ(IntSet.count(C), 1u);
-  EXPECT_TRUE(IntSet.contains(B));
-  EXPECT_TRUE(IntSet.contains(C));
-}
-
-// Verify that we automatically get the const version of PointerLikeTypeTraits
-// filled in for us, even for a non-pointer type
-using TestPair = PointerIntPair<int *, 1>;
-
-TEST(SmallPtrSetTest, ConstNonPtrTest) {
-  SmallPtrSet<TestPair, 8> IntSet;
-  int A[1];
-  TestPair Pair(&A[0], 1);
-  IntSet.insert(Pair);
-  EXPECT_EQ(IntSet.count(Pair), 1u);
-  EXPECT_TRUE(IntSet.contains(Pair));
-}
-
-// Test equality comparison.
-TEST(SmallPtrSetTest, EqualityComparison) {
-  int buf[3];
-  for (int i = 0; i < 3; ++i)
-    buf[i] = 0;
-
-  SmallPtrSet<int *, 1> a;
-  a.insert(&buf[0]);
-  a.insert(&buf[1]);
-
-  SmallPtrSet<int *, 2> b;
-  b.insert(&buf[1]);
-  b.insert(&buf[0]);
-
-  SmallPtrSet<int *, 3> c;
-  c.insert(&buf[1]);
-  c.insert(&buf[2]);
-
-  SmallPtrSet<int *, 4> d;
-  d.insert(&buf[0]);
-
-  SmallPtrSet<int *, 5> e;
-  e.insert(&buf[0]);
-  e.insert(&buf[1]);
-  e.insert(&buf[2]);
-
-  EXPECT_EQ(a, b);
-  EXPECT_EQ(b, a);
-  EXPECT_NE(b, c);
-  EXPECT_NE(c, a);
-  EXPECT_NE(d, a);
-  EXPECT_NE(a, d);
-  EXPECT_NE(a, e);
-  EXPECT_NE(e, a);
-  EXPECT_NE(c, e);
-  EXPECT_NE(e, d);
-}
-
-TEST(SmallPtrSetTest, Contains) {
-  SmallPtrSet<int *, 2> Set;
-  int buf[4] = {0, 11, 22, 11};
-  EXPECT_FALSE(Set.contains(&buf[0]));
-  EXPECT_FALSE(Set.contains(&buf[1]));
-
-  Set.insert(&buf[0]);
-  Set.insert(&buf[1]);
-  EXPECT_TRUE(Set.contains(&buf[0]));
-  EXPECT_TRUE(Set.contains(&buf[1]));
-  EXPECT_FALSE(Set.contains(&buf[3]));
-
-  Set.insert(&buf[1]);
-  EXPECT_TRUE(Set.contains(&buf[0]));
-  EXPECT_TRUE(Set.contains(&buf[1]));
-  EXPECT_FALSE(Set.contains(&buf[3]));
-
-  Set.erase(&buf[1]);
-  EXPECT_TRUE(Set.contains(&buf[0]));
-  EXPECT_FALSE(Set.contains(&buf[1]));
-
-  Set.insert(&buf[1]);
-  Set.insert(&buf[2]);
-  EXPECT_TRUE(Set.contains(&buf[0]));
-  EXPECT_TRUE(Set.contains(&buf[1]));
-  EXPECT_TRUE(Set.contains(&buf[2]));
-}
-
-TEST(SmallPtrSetTest, InsertIterator) {
-  SmallPtrSet<int *, 5> Set;
-  int Vals[5] = {11, 22, 33, 44, 55};
-  int *Buf[5] = {&Vals[0], &Vals[1], &Vals[2], &Vals[3], &Vals[4]};
-
-  for (int *Ptr : Buf)
-    Set.insert(Set.begin(), Ptr);
-
-  // Ensure that all of the values were copied into the set.
-  for (const auto *Ptr : Buf)
-    EXPECT_TRUE(Set.contains(Ptr));
-}
diff --git a/gnu/llvm/llvm/unittests/ADT/SmallSetTest.cpp b/gnu/llvm/llvm/unittests/ADT/SmallSetTest.cpp
deleted file mode 100644
index 26cab828c78..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/SmallSetTest.cpp
+++ /dev/null
@@ -1,194 +0,0 @@
-//===- llvm/unittest/ADT/SmallSetTest.cpp ------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// SmallSet unit tests.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/SmallSet.h"
-#include "gtest/gtest.h"
-#include <string>
-
-using namespace llvm;
-
-TEST(SmallSetTest, Insert) {
-
-  SmallSet<int, 4> s1;
-
-  for (int i = 0; i < 4; i++)
-    s1.insert(i);
-
-  for (int i = 0; i < 4; i++)
-    s1.insert(i);
-
-  EXPECT_EQ(4u, s1.size());
-
-  for (int i = 0; i < 4; i++)
-    EXPECT_EQ(1u, s1.count(i));
-
-  EXPECT_EQ(0u, s1.count(4));
-}
-
-TEST(SmallSetTest, Grow) {
-  SmallSet<int, 4> s1;
-
-  for (int i = 0; i < 8; i++)
-    s1.insert(i);
-
-  EXPECT_EQ(8u, s1.size());
-
-  for (int i = 0; i < 8; i++)
-    EXPECT_EQ(1u, s1.count(i));
-
-  EXPECT_EQ(0u, s1.count(8));
-}
-
-TEST(SmallSetTest, Erase) {
-  SmallSet<int, 4> s1;
-
-  for (int i = 0; i < 8; i++)
-    s1.insert(i);
-
-  EXPECT_EQ(8u, s1.size());
-
-  // Remove elements one by one and check if all other elements are still there.
-  for (int i = 0; i < 8; i++) {
-    EXPECT_EQ(1u, s1.count(i));
-    EXPECT_TRUE(s1.erase(i));
-    EXPECT_EQ(0u, s1.count(i));
-    EXPECT_EQ(8u - i - 1, s1.size());
-    for (int j = i + 1; j < 8; j++)
-      EXPECT_EQ(1u, s1.count(j));
-  }
-
-  EXPECT_EQ(0u, s1.count(8));
-}
-
-TEST(SmallSetTest, IteratorInt) {
-  SmallSet<int, 4> s1;
-
-  // Test the 'small' case.
-  for (int i = 0; i < 3; i++)
-    s1.insert(i);
-
-  std::vector<int> V(s1.begin(), s1.end());
-  // Make sure the elements are in the expected order.
-  std::sort(V.begin(), V.end());
-  for (int i = 0; i < 3; i++)
-    EXPECT_EQ(i, V[i]);
-
-  // Test the 'big' case by adding a few more elements to switch to std::set
-  // internally.
-  for (int i = 3; i < 6; i++)
-    s1.insert(i);
-
-  V.assign(s1.begin(), s1.end());
-  // Make sure the elements are in the expected order.
-  std::sort(V.begin(), V.end());
-  for (int i = 0; i < 6; i++)
-    EXPECT_EQ(i, V[i]);
-}
-
-TEST(SmallSetTest, IteratorString) {
-  // Test SmallSetIterator for SmallSet with a type with non-trivial
-  // ctors/dtors.
-  SmallSet<std::string, 2> s1;
-
-  s1.insert("str 1");
-  s1.insert("str 2");
-  s1.insert("str 1");
-
-  std::vector<std::string> V(s1.begin(), s1.end());
-  std::sort(V.begin(), V.end());
-  EXPECT_EQ(2u, s1.size());
-  EXPECT_EQ("str 1", V[0]);
-  EXPECT_EQ("str 2", V[1]);
-
-  s1.insert("str 4");
-  s1.insert("str 0");
-  s1.insert("str 4");
-
-  V.assign(s1.begin(), s1.end());
-  // Make sure the elements are in the expected order.
-  std::sort(V.begin(), V.end());
-  EXPECT_EQ(4u, s1.size());
-  EXPECT_EQ("str 0", V[0]);
-  EXPECT_EQ("str 1", V[1]);
-  EXPECT_EQ("str 2", V[2]);
-  EXPECT_EQ("str 4", V[3]);
-}
-
-TEST(SmallSetTest, IteratorIncMoveCopy) {
-  // Test SmallSetIterator for SmallSet with a type with non-trivial
-  // ctors/dtors.
-  SmallSet<std::string, 2> s1;
-
-  s1.insert("str 1");
-  s1.insert("str 2");
-
-  auto Iter = s1.begin();
-  EXPECT_EQ("str 1", *Iter);
-  ++Iter;
-  EXPECT_EQ("str 2", *Iter);
-
-  s1.insert("str 4");
-  s1.insert("str 0");
-  auto Iter2 = s1.begin();
-  Iter = std::move(Iter2);
-  EXPECT_EQ("str 0", *Iter);
-}
-
-TEST(SmallSetTest, EqualityComparisonTest) {
-  SmallSet<int, 8> s1small;
-  SmallSet<int, 10> s2small;
-  SmallSet<int, 3> s3large;
-  SmallSet<int, 8> s4large;
-
-  for (int i = 1; i < 5; i++) {
-    s1small.insert(i);
-    s2small.insert(5 - i);
-    s3large.insert(i);
-  }
-  for (int i = 1; i < 11; i++)
-    s4large.insert(i);
-
-  EXPECT_EQ(s1small, s1small);
-  EXPECT_EQ(s3large, s3large);
-
-  EXPECT_EQ(s1small, s2small);
-  EXPECT_EQ(s1small, s3large);
-  EXPECT_EQ(s2small, s3large);
-
-  EXPECT_NE(s1small, s4large);
-  EXPECT_NE(s4large, s3large);
-}
-
-TEST(SmallSetTest, Contains) {
-  SmallSet<int, 2> Set;
-  EXPECT_FALSE(Set.contains(0));
-  EXPECT_FALSE(Set.contains(1));
-
-  Set.insert(0);
-  Set.insert(1);
-  EXPECT_TRUE(Set.contains(0));
-  EXPECT_TRUE(Set.contains(1));
-
-  Set.insert(1);
-  EXPECT_TRUE(Set.contains(0));
-  EXPECT_TRUE(Set.contains(1));
-
-  Set.erase(1);
-  EXPECT_TRUE(Set.contains(0));
-  EXPECT_FALSE(Set.contains(1));
-
-  Set.insert(1);
-  Set.insert(2);
-  EXPECT_TRUE(Set.contains(0));
-  EXPECT_TRUE(Set.contains(1));
-  EXPECT_TRUE(Set.contains(2));
-}
diff --git a/gnu/llvm/llvm/unittests/ADT/SmallStringTest.cpp b/gnu/llvm/llvm/unittests/ADT/SmallStringTest.cpp
deleted file mode 100644
index b207f582e91..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/SmallStringTest.cpp
+++ /dev/null
@@ -1,247 +0,0 @@
-//===- llvm/unittest/ADT/SmallStringTest.cpp ------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// SmallString unit tests.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/SmallString.h"
-#include "gtest/gtest.h"
-#include <climits>
-#include <cstring>
-#include <stdarg.h>
-
-using namespace llvm;
-
-namespace {
-
-// Test fixture class
-class SmallStringTest : public testing::Test {
-protected:
-  typedef SmallString<40> StringType;
-
-  StringType theString;
-
-  void assertEmpty(StringType & v) {
-    // Size tests
-    EXPECT_EQ(0u, v.size());
-    EXPECT_TRUE(v.empty());
-    // Iterator tests
-    EXPECT_TRUE(v.begin() == v.end());
-  }
-};
-
-// New string test.
-TEST_F(SmallStringTest, EmptyStringTest) {
-  SCOPED_TRACE("EmptyStringTest");
-  assertEmpty(theString);
-  EXPECT_TRUE(theString.rbegin() == theString.rend());
-}
-
-TEST_F(SmallStringTest, AssignRepeated) {
-  theString.assign(3, 'a');
-  EXPECT_EQ(3u, theString.size());
-  EXPECT_STREQ("aaa", theString.c_str());
-}
-
-TEST_F(SmallStringTest, AssignIterPair) {
-  StringRef abc = "abc";
-  theString.assign(abc.begin(), abc.end());
-  EXPECT_EQ(3u, theString.size());
-  EXPECT_STREQ("abc", theString.c_str());
-}
-
-TEST_F(SmallStringTest, AssignStringRef) {
-  StringRef abc = "abc";
-  theString.assign(abc);
-  EXPECT_EQ(3u, theString.size());
-  EXPECT_STREQ("abc", theString.c_str());
-}
-
-TEST_F(SmallStringTest, AssignSmallVector) {
-  StringRef abc = "abc";
-  SmallVector<char, 10> abcVec(abc.begin(), abc.end());
-  theString.assign(abcVec);
-  EXPECT_EQ(3u, theString.size());
-  EXPECT_STREQ("abc", theString.c_str());
-}
-
-TEST_F(SmallStringTest, AssignStringRefs) {
-  theString.assign({"abc", "def", "ghi"});
-  EXPECT_EQ(9u, theString.size());
-  EXPECT_STREQ("abcdefghi", theString.c_str());
-}
-
-TEST_F(SmallStringTest, AppendIterPair) {
-  StringRef abc = "abc";
-  theString.append(abc.begin(), abc.end());
-  theString.append(abc.begin(), abc.end());
-  EXPECT_EQ(6u, theString.size());
-  EXPECT_STREQ("abcabc", theString.c_str());
-}
-
-TEST_F(SmallStringTest, AppendStringRef) {
-  StringRef abc = "abc";
-  theString.append(abc);
-  theString.append(abc);
-  EXPECT_EQ(6u, theString.size());
-  EXPECT_STREQ("abcabc", theString.c_str());
-}
-
-TEST_F(SmallStringTest, AppendSmallVector) {
-  StringRef abc = "abc";
-  SmallVector<char, 10> abcVec(abc.begin(), abc.end());
-  theString.append(abcVec);
-  theString.append(abcVec);
-  EXPECT_EQ(6u, theString.size());
-  EXPECT_STREQ("abcabc", theString.c_str());
-}
-
-TEST_F(SmallStringTest, AppendStringRefs) {
-  theString.append({"abc", "def", "ghi"});
-  EXPECT_EQ(9u, theString.size());
-  EXPECT_STREQ("abcdefghi", theString.c_str());
-  StringRef Jkl = "jkl";
-  std::string Mno = "mno";
-  SmallString<4> Pqr("pqr");
-  const char *Stu = "stu";
-  theString.append({Jkl, Mno, Pqr, Stu});
-  EXPECT_EQ(21u, theString.size());
-  EXPECT_STREQ("abcdefghijklmnopqrstu", theString.c_str());
-}
-
-TEST_F(SmallStringTest, StringRefConversion) {
-  StringRef abc = "abc";
-  theString.assign(abc.begin(), abc.end());
-  StringRef theStringRef = theString;
-  EXPECT_EQ("abc", theStringRef);
-}
-
-TEST_F(SmallStringTest, StdStringConversion) {
-  StringRef abc = "abc";
-  theString.assign(abc.begin(), abc.end());
-  std::string theStdString = std::string(theString);
-  EXPECT_EQ("abc", theStdString);
-}
-
-TEST_F(SmallStringTest, Substr) {
-  theString = "hello";
-  EXPECT_EQ("lo", theString.substr(3));
-  EXPECT_EQ("", theString.substr(100));
-  EXPECT_EQ("hello", theString.substr(0, 100));
-  EXPECT_EQ("o", theString.substr(4, 10));
-}
-
-TEST_F(SmallStringTest, Slice) {
-  theString = "hello";
-  EXPECT_EQ("l", theString.slice(2, 3));
-  EXPECT_EQ("ell", theString.slice(1, 4));
-  EXPECT_EQ("llo", theString.slice(2, 100));
-  EXPECT_EQ("", theString.slice(2, 1));
-  EXPECT_EQ("", theString.slice(10, 20));
-}
-
-TEST_F(SmallStringTest, Find) {
-  theString = "hello";
-  EXPECT_EQ(2U, theString.find('l'));
-  EXPECT_EQ(StringRef::npos, theString.find('z'));
-  EXPECT_EQ(StringRef::npos, theString.find("helloworld"));
-  EXPECT_EQ(0U, theString.find("hello"));
-  EXPECT_EQ(1U, theString.find("ello"));
-  EXPECT_EQ(StringRef::npos, theString.find("zz"));
-  EXPECT_EQ(2U, theString.find("ll", 2));
-  EXPECT_EQ(StringRef::npos, theString.find("ll", 3));
-  EXPECT_EQ(0U, theString.find(""));
-
-  EXPECT_EQ(3U, theString.rfind('l'));
-  EXPECT_EQ(StringRef::npos, theString.rfind('z'));
-  EXPECT_EQ(StringRef::npos, theString.rfind("helloworld"));
-  EXPECT_EQ(0U, theString.rfind("hello"));
-  EXPECT_EQ(1U, theString.rfind("ello"));
-  EXPECT_EQ(StringRef::npos, theString.rfind("zz"));
-
-  EXPECT_EQ(2U, theString.find_first_of('l'));
-  EXPECT_EQ(1U, theString.find_first_of("el"));
-  EXPECT_EQ(StringRef::npos, theString.find_first_of("xyz"));
-
-  EXPECT_EQ(1U, theString.find_first_not_of('h'));
-  EXPECT_EQ(4U, theString.find_first_not_of("hel"));
-  EXPECT_EQ(StringRef::npos, theString.find_first_not_of("hello"));
-
-  theString = "hellx xello hell ello world foo bar hello";
-  EXPECT_EQ(36U, theString.find("hello"));
-  EXPECT_EQ(28U, theString.find("foo"));
-  EXPECT_EQ(12U, theString.find("hell", 2));
-  EXPECT_EQ(0U, theString.find(""));
-}
-
-TEST_F(SmallStringTest, Count) {
-  theString = "hello";
-  EXPECT_EQ(2U, theString.count('l'));
-  EXPECT_EQ(1U, theString.count('o'));
-  EXPECT_EQ(0U, theString.count('z'));
-  EXPECT_EQ(0U, theString.count("helloworld"));
-  EXPECT_EQ(1U, theString.count("hello"));
-  EXPECT_EQ(1U, theString.count("ello"));
-  EXPECT_EQ(0U, theString.count("zz"));
-}
-
-TEST_F(SmallStringTest, Realloc) {
-  theString = "abcd";
-  theString.reserve(100);
-  EXPECT_EQ("abcd", theString);
-  unsigned const N = 100000;
-  theString.reserve(N);
-  for (unsigned i = 0; i < N - 4; ++i)
-    theString.push_back('y');
-  EXPECT_EQ("abcdyyy", theString.slice(0, 7));
-}
-
-TEST_F(SmallStringTest, Comparisons) {
-  EXPECT_EQ(-1, SmallString<10>("aab").compare("aad"));
-  EXPECT_EQ( 0, SmallString<10>("aab").compare("aab"));
-  EXPECT_EQ( 1, SmallString<10>("aab").compare("aaa"));
-  EXPECT_EQ(-1, SmallString<10>("aab").compare("aabb"));
-  EXPECT_EQ( 1, SmallString<10>("aab").compare("aa"));
-  EXPECT_EQ( 1, SmallString<10>("\xFF").compare("\1"));
-
-  EXPECT_EQ(-1, SmallString<10>("AaB").compare_insensitive("aAd"));
-  EXPECT_EQ( 0, SmallString<10>("AaB").compare_insensitive("aab"));
-  EXPECT_EQ( 1, SmallString<10>("AaB").compare_insensitive("AAA"));
-  EXPECT_EQ(-1, SmallString<10>("AaB").compare_insensitive("aaBb"));
-  EXPECT_EQ( 1, SmallString<10>("AaB").compare_insensitive("aA"));
-  EXPECT_EQ( 1, SmallString<10>("\xFF").compare_insensitive("\1"));
-
-  EXPECT_EQ(-1, SmallString<10>("aab").compare_numeric("aad"));
-  EXPECT_EQ( 0, SmallString<10>("aab").compare_numeric("aab"));
-  EXPECT_EQ( 1, SmallString<10>("aab").compare_numeric("aaa"));
-  EXPECT_EQ(-1, SmallString<10>("aab").compare_numeric("aabb"));
-  EXPECT_EQ( 1, SmallString<10>("aab").compare_numeric("aa"));
-  EXPECT_EQ(-1, SmallString<10>("1").compare_numeric("10"));
-  EXPECT_EQ( 0, SmallString<10>("10").compare_numeric("10"));
-  EXPECT_EQ( 0, SmallString<10>("10a").compare_numeric("10a"));
-  EXPECT_EQ( 1, SmallString<10>("2").compare_numeric("1"));
-  EXPECT_EQ( 0, SmallString<10>("llvm_v1i64_ty").compare_numeric("llvm_v1i64_ty"));
-  EXPECT_EQ( 1, SmallString<10>("\xFF").compare_numeric("\1"));
-  EXPECT_EQ( 1, SmallString<10>("V16").compare_numeric("V1_q0"));
-  EXPECT_EQ(-1, SmallString<10>("V1_q0").compare_numeric("V16"));
-  EXPECT_EQ(-1, SmallString<10>("V8_q0").compare_numeric("V16"));
-  EXPECT_EQ( 1, SmallString<10>("V16").compare_numeric("V8_q0"));
-  EXPECT_EQ(-1, SmallString<10>("V1_q0").compare_numeric("V8_q0"));
-  EXPECT_EQ( 1, SmallString<10>("V8_q0").compare_numeric("V1_q0"));
-}
-
-// Check gtest prints SmallString as a string instead of a container of chars.
-// The code is in utils/unittest/googletest/internal/custom/gtest-printers.h
-TEST_F(SmallStringTest, GTestPrinter) {
-  EXPECT_EQ(R"("foo")", ::testing::PrintToString(SmallString<1>("foo")));
-  const SmallVectorImpl<char> &ErasedSmallString = SmallString<1>("foo");
-  EXPECT_EQ(R"("foo")", ::testing::PrintToString(ErasedSmallString));
-}
-
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/SmallVectorTest.cpp b/gnu/llvm/llvm/unittests/ADT/SmallVectorTest.cpp
deleted file mode 100644
index 06b98efe66e..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/SmallVectorTest.cpp
+++ /dev/null
@@ -1,1413 +0,0 @@
-//===- llvm/unittest/ADT/SmallVectorTest.cpp ------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// SmallVector unit tests.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/Support/Compiler.h"
-#include "gtest/gtest.h"
-#include <list>
-#include <stdarg.h>
-
-using namespace llvm;
-
-namespace {
-
-/// A helper class that counts the total number of constructor and
-/// destructor calls.
-class Constructable {
-private:
-  static int numConstructorCalls;
-  static int numMoveConstructorCalls;
-  static int numCopyConstructorCalls;
-  static int numDestructorCalls;
-  static int numAssignmentCalls;
-  static int numMoveAssignmentCalls;
-  static int numCopyAssignmentCalls;
-
-  bool constructed;
-  int value;
-
-public:
-  Constructable() : constructed(true), value(0) {
-    ++numConstructorCalls;
-  }
-
-  Constructable(int val) : constructed(true), value(val) {
-    ++numConstructorCalls;
-  }
-
-  Constructable(const Constructable & src) : constructed(true) {
-    value = src.value;
-    ++numConstructorCalls;
-    ++numCopyConstructorCalls;
-  }
-
-  Constructable(Constructable && src) : constructed(true) {
-    value = src.value;
-    src.value = 0;
-    ++numConstructorCalls;
-    ++numMoveConstructorCalls;
-  }
-
-  ~Constructable() {
-    EXPECT_TRUE(constructed);
-    ++numDestructorCalls;
-    constructed = false;
-  }
-
-  Constructable & operator=(const Constructable & src) {
-    EXPECT_TRUE(constructed);
-    value = src.value;
-    ++numAssignmentCalls;
-    ++numCopyAssignmentCalls;
-    return *this;
-  }
-
-  Constructable & operator=(Constructable && src) {
-    EXPECT_TRUE(constructed);
-    value = src.value;
-    src.value = 0;
-    ++numAssignmentCalls;
-    ++numMoveAssignmentCalls;
-    return *this;
-  }
-
-  int getValue() const {
-    return abs(value);
-  }
-
-  static void reset() {
-    numConstructorCalls = 0;
-    numMoveConstructorCalls = 0;
-    numCopyConstructorCalls = 0;
-    numDestructorCalls = 0;
-    numAssignmentCalls = 0;
-    numMoveAssignmentCalls = 0;
-    numCopyAssignmentCalls = 0;
-  }
-
-  static int getNumConstructorCalls() {
-    return numConstructorCalls;
-  }
-
-  static int getNumMoveConstructorCalls() {
-    return numMoveConstructorCalls;
-  }
-
-  static int getNumCopyConstructorCalls() {
-    return numCopyConstructorCalls;
-  }
-
-  static int getNumDestructorCalls() {
-    return numDestructorCalls;
-  }
-
-  static int getNumAssignmentCalls() {
-    return numAssignmentCalls;
-  }
-
-  static int getNumMoveAssignmentCalls() {
-    return numMoveAssignmentCalls;
-  }
-
-  static int getNumCopyAssignmentCalls() {
-    return numCopyAssignmentCalls;
-  }
-
-  friend bool operator==(const Constructable & c0, const Constructable & c1) {
-    return c0.getValue() == c1.getValue();
-  }
-
-  friend bool LLVM_ATTRIBUTE_UNUSED
-  operator!=(const Constructable & c0, const Constructable & c1) {
-    return c0.getValue() != c1.getValue();
-  }
-};
-
-int Constructable::numConstructorCalls;
-int Constructable::numCopyConstructorCalls;
-int Constructable::numMoveConstructorCalls;
-int Constructable::numDestructorCalls;
-int Constructable::numAssignmentCalls;
-int Constructable::numCopyAssignmentCalls;
-int Constructable::numMoveAssignmentCalls;
-
-struct NonCopyable {
-  NonCopyable() {}
-  NonCopyable(NonCopyable &&) {}
-  NonCopyable &operator=(NonCopyable &&) { return *this; }
-private:
-  NonCopyable(const NonCopyable &) = delete;
-  NonCopyable &operator=(const NonCopyable &) = delete;
-};
-
-LLVM_ATTRIBUTE_USED void CompileTest() {
-  SmallVector<NonCopyable, 0> V;
-  V.resize(42);
-}
-
-class SmallVectorTestBase : public testing::Test {
-protected:
-  void SetUp() override { Constructable::reset(); }
-
-  template <typename VectorT>
-  void assertEmpty(VectorT & v) {
-    // Size tests
-    EXPECT_EQ(0u, v.size());
-    EXPECT_TRUE(v.empty());
-
-    // Iterator tests
-    EXPECT_TRUE(v.begin() == v.end());
-  }
-
-  // Assert that v contains the specified values, in order.
-  template <typename VectorT>
-  void assertValuesInOrder(VectorT & v, size_t size, ...) {
-    EXPECT_EQ(size, v.size());
-
-    va_list ap;
-    va_start(ap, size);
-    for (size_t i = 0; i < size; ++i) {
-      int value = va_arg(ap, int);
-      EXPECT_EQ(value, v[i].getValue());
-    }
-
-    va_end(ap);
-  }
-
-  // Generate a sequence of values to initialize the vector.
-  template <typename VectorT>
-  void makeSequence(VectorT & v, int start, int end) {
-    for (int i = start; i <= end; ++i) {
-      v.push_back(Constructable(i));
-    }
-  }
-};
-
-// Test fixture class
-template <typename VectorT>
-class SmallVectorTest : public SmallVectorTestBase {
-protected:
-  VectorT theVector;
-  VectorT otherVector;
-};
-
-
-typedef ::testing::Types<SmallVector<Constructable, 0>,
-                         SmallVector<Constructable, 1>,
-                         SmallVector<Constructable, 2>,
-                         SmallVector<Constructable, 4>,
-                         SmallVector<Constructable, 5>
-                         > SmallVectorTestTypes;
-TYPED_TEST_SUITE(SmallVectorTest, SmallVectorTestTypes, );
-
-// Constructor test.
-TYPED_TEST(SmallVectorTest, ConstructorNonIterTest) {
-  SCOPED_TRACE("ConstructorTest");
-  this->theVector = SmallVector<Constructable, 2>(2, 2);
-  this->assertValuesInOrder(this->theVector, 2u, 2, 2);
-}
-
-// Constructor test.
-TYPED_TEST(SmallVectorTest, ConstructorIterTest) {
-  SCOPED_TRACE("ConstructorTest");
-  int arr[] = {1, 2, 3};
-  this->theVector =
-      SmallVector<Constructable, 4>(std::begin(arr), std::end(arr));
-  this->assertValuesInOrder(this->theVector, 3u, 1, 2, 3);
-}
-
-// New vector test.
-TYPED_TEST(SmallVectorTest, EmptyVectorTest) {
-  SCOPED_TRACE("EmptyVectorTest");
-  this->assertEmpty(this->theVector);
-  EXPECT_TRUE(this->theVector.rbegin() == this->theVector.rend());
-  EXPECT_EQ(0, Constructable::getNumConstructorCalls());
-  EXPECT_EQ(0, Constructable::getNumDestructorCalls());
-}
-
-// Simple insertions and deletions.
-TYPED_TEST(SmallVectorTest, PushPopTest) {
-  SCOPED_TRACE("PushPopTest");
-
-  // Track whether the vector will potentially have to grow.
-  bool RequiresGrowth = this->theVector.capacity() < 3;
-
-  // Push an element
-  this->theVector.push_back(Constructable(1));
-
-  // Size tests
-  this->assertValuesInOrder(this->theVector, 1u, 1);
-  EXPECT_FALSE(this->theVector.begin() == this->theVector.end());
-  EXPECT_FALSE(this->theVector.empty());
-
-  // Push another element
-  this->theVector.push_back(Constructable(2));
-  this->assertValuesInOrder(this->theVector, 2u, 1, 2);
-
-  // Insert at beginning. Reserve space to avoid reference invalidation from
-  // this->theVector[1].
-  this->theVector.reserve(this->theVector.size() + 1);
-  this->theVector.insert(this->theVector.begin(), this->theVector[1]);
-  this->assertValuesInOrder(this->theVector, 3u, 2, 1, 2);
-
-  // Pop one element
-  this->theVector.pop_back();
-  this->assertValuesInOrder(this->theVector, 2u, 2, 1);
-
-  // Pop remaining elements
-  this->theVector.pop_back_n(2);
-  this->assertEmpty(this->theVector);
-
-  // Check number of constructor calls. Should be 2 for each list element,
-  // one for the argument to push_back, one for the argument to insert,
-  // and one for the list element itself.
-  if (!RequiresGrowth) {
-    EXPECT_EQ(5, Constructable::getNumConstructorCalls());
-    EXPECT_EQ(5, Constructable::getNumDestructorCalls());
-  } else {
-    // If we had to grow the vector, these only have a lower bound, but should
-    // always be equal.
-    EXPECT_LE(5, Constructable::getNumConstructorCalls());
-    EXPECT_EQ(Constructable::getNumConstructorCalls(),
-              Constructable::getNumDestructorCalls());
-  }
-}
-
-// Clear test.
-TYPED_TEST(SmallVectorTest, ClearTest) {
-  SCOPED_TRACE("ClearTest");
-
-  this->theVector.reserve(2);
-  this->makeSequence(this->theVector, 1, 2);
-  this->theVector.clear();
-
-  this->assertEmpty(this->theVector);
-  EXPECT_EQ(4, Constructable::getNumConstructorCalls());
-  EXPECT_EQ(4, Constructable::getNumDestructorCalls());
-}
-
-// Resize smaller test.
-TYPED_TEST(SmallVectorTest, ResizeShrinkTest) {
-  SCOPED_TRACE("ResizeShrinkTest");
-
-  this->theVector.reserve(3);
-  this->makeSequence(this->theVector, 1, 3);
-  this->theVector.resize(1);
-
-  this->assertValuesInOrder(this->theVector, 1u, 1);
-  EXPECT_EQ(6, Constructable::getNumConstructorCalls());
-  EXPECT_EQ(5, Constructable::getNumDestructorCalls());
-}
-
-// Resize bigger test.
-TYPED_TEST(SmallVectorTest, ResizeGrowTest) {
-  SCOPED_TRACE("ResizeGrowTest");
-
-  this->theVector.resize(2);
-
-  EXPECT_EQ(2, Constructable::getNumConstructorCalls());
-  EXPECT_EQ(0, Constructable::getNumDestructorCalls());
-  EXPECT_EQ(2u, this->theVector.size());
-}
-
-TYPED_TEST(SmallVectorTest, ResizeWithElementsTest) {
-  this->theVector.resize(2);
-
-  Constructable::reset();
-
-  this->theVector.resize(4);
-
-  size_t Ctors = Constructable::getNumConstructorCalls();
-  EXPECT_TRUE(Ctors == 2 || Ctors == 4);
-  size_t MoveCtors = Constructable::getNumMoveConstructorCalls();
-  EXPECT_TRUE(MoveCtors == 0 || MoveCtors == 2);
-  size_t Dtors = Constructable::getNumDestructorCalls();
-  EXPECT_TRUE(Dtors == 0 || Dtors == 2);
-}
-
-// Resize with fill value.
-TYPED_TEST(SmallVectorTest, ResizeFillTest) {
-  SCOPED_TRACE("ResizeFillTest");
-
-  this->theVector.resize(3, Constructable(77));
-  this->assertValuesInOrder(this->theVector, 3u, 77, 77, 77);
-}
-
-TEST(SmallVectorTest, ResizeForOverwrite) {
-  {
-    // Heap allocated storage.
-    SmallVector<unsigned, 0> V;
-    V.push_back(5U);
-    V.pop_back();
-    V.resize_for_overwrite(V.size() + 1U);
-    EXPECT_EQ(5U, V.back());
-    V.pop_back();
-    V.resize(V.size() + 1);
-    EXPECT_EQ(0U, V.back());
-  }
-  {
-    // Inline storage.
-    SmallVector<unsigned, 2> V;
-    V.push_back(5U);
-    V.pop_back();
-    V.resize_for_overwrite(V.size() + 1U);
-    EXPECT_EQ(5U, V.back());
-    V.pop_back();
-    V.resize(V.size() + 1);
-    EXPECT_EQ(0U, V.back());
-  }
-}
-
-// Overflow past fixed size.
-TYPED_TEST(SmallVectorTest, OverflowTest) {
-  SCOPED_TRACE("OverflowTest");
-
-  // Push more elements than the fixed size.
-  this->makeSequence(this->theVector, 1, 10);
-
-  // Test size and values.
-  EXPECT_EQ(10u, this->theVector.size());
-  for (int i = 0; i < 10; ++i) {
-    EXPECT_EQ(i+1, this->theVector[i].getValue());
-  }
-
-  // Now resize back to fixed size.
-  this->theVector.resize(1);
-
-  this->assertValuesInOrder(this->theVector, 1u, 1);
-}
-
-// Iteration tests.
-TYPED_TEST(SmallVectorTest, IterationTest) {
-  this->makeSequence(this->theVector, 1, 2);
-
-  // Forward Iteration
-  typename TypeParam::iterator it = this->theVector.begin();
-  EXPECT_TRUE(*it == this->theVector.front());
-  EXPECT_TRUE(*it == this->theVector[0]);
-  EXPECT_EQ(1, it->getValue());
-  ++it;
-  EXPECT_TRUE(*it == this->theVector[1]);
-  EXPECT_TRUE(*it == this->theVector.back());
-  EXPECT_EQ(2, it->getValue());
-  ++it;
-  EXPECT_TRUE(it == this->theVector.end());
-  --it;
-  EXPECT_TRUE(*it == this->theVector[1]);
-  EXPECT_EQ(2, it->getValue());
-  --it;
-  EXPECT_TRUE(*it == this->theVector[0]);
-  EXPECT_EQ(1, it->getValue());
-
-  // Reverse Iteration
-  typename TypeParam::reverse_iterator rit = this->theVector.rbegin();
-  EXPECT_TRUE(*rit == this->theVector[1]);
-  EXPECT_EQ(2, rit->getValue());
-  ++rit;
-  EXPECT_TRUE(*rit == this->theVector[0]);
-  EXPECT_EQ(1, rit->getValue());
-  ++rit;
-  EXPECT_TRUE(rit == this->theVector.rend());
-  --rit;
-  EXPECT_TRUE(*rit == this->theVector[0]);
-  EXPECT_EQ(1, rit->getValue());
-  --rit;
-  EXPECT_TRUE(*rit == this->theVector[1]);
-  EXPECT_EQ(2, rit->getValue());
-}
-
-// Swap test.
-TYPED_TEST(SmallVectorTest, SwapTest) {
-  SCOPED_TRACE("SwapTest");
-
-  this->makeSequence(this->theVector, 1, 2);
-  std::swap(this->theVector, this->otherVector);
-
-  this->assertEmpty(this->theVector);
-  this->assertValuesInOrder(this->otherVector, 2u, 1, 2);
-}
-
-// Append test
-TYPED_TEST(SmallVectorTest, AppendTest) {
-  SCOPED_TRACE("AppendTest");
-
-  this->makeSequence(this->otherVector, 2, 3);
-
-  this->theVector.push_back(Constructable(1));
-  this->theVector.append(this->otherVector.begin(), this->otherVector.end());
-
-  this->assertValuesInOrder(this->theVector, 3u, 1, 2, 3);
-}
-
-// Append repeated test
-TYPED_TEST(SmallVectorTest, AppendRepeatedTest) {
-  SCOPED_TRACE("AppendRepeatedTest");
-
-  this->theVector.push_back(Constructable(1));
-  this->theVector.append(2, Constructable(77));
-  this->assertValuesInOrder(this->theVector, 3u, 1, 77, 77);
-}
-
-// Append test
-TYPED_TEST(SmallVectorTest, AppendNonIterTest) {
-  SCOPED_TRACE("AppendRepeatedTest");
-
-  this->theVector.push_back(Constructable(1));
-  this->theVector.append(2, 7);
-  this->assertValuesInOrder(this->theVector, 3u, 1, 7, 7);
-}
-
-struct output_iterator {
-  typedef std::output_iterator_tag iterator_category;
-  typedef int value_type;
-  typedef int difference_type;
-  typedef value_type *pointer;
-  typedef value_type &reference;
-  operator int() { return 2; }
-  operator Constructable() { return 7; }
-};
-
-TYPED_TEST(SmallVectorTest, AppendRepeatedNonForwardIterator) {
-  SCOPED_TRACE("AppendRepeatedTest");
-
-  this->theVector.push_back(Constructable(1));
-  this->theVector.append(output_iterator(), output_iterator());
-  this->assertValuesInOrder(this->theVector, 3u, 1, 7, 7);
-}
-
-TYPED_TEST(SmallVectorTest, AppendSmallVector) {
-  SCOPED_TRACE("AppendSmallVector");
-
-  SmallVector<Constructable, 3> otherVector = {7, 7};
-  this->theVector.push_back(Constructable(1));
-  this->theVector.append(otherVector);
-  this->assertValuesInOrder(this->theVector, 3u, 1, 7, 7);
-}
-
-// Assign test
-TYPED_TEST(SmallVectorTest, AssignTest) {
-  SCOPED_TRACE("AssignTest");
-
-  this->theVector.push_back(Constructable(1));
-  this->theVector.assign(2, Constructable(77));
-  this->assertValuesInOrder(this->theVector, 2u, 77, 77);
-}
-
-// Assign test
-TYPED_TEST(SmallVectorTest, AssignRangeTest) {
-  SCOPED_TRACE("AssignTest");
-
-  this->theVector.push_back(Constructable(1));
-  int arr[] = {1, 2, 3};
-  this->theVector.assign(std::begin(arr), std::end(arr));
-  this->assertValuesInOrder(this->theVector, 3u, 1, 2, 3);
-}
-
-// Assign test
-TYPED_TEST(SmallVectorTest, AssignNonIterTest) {
-  SCOPED_TRACE("AssignTest");
-
-  this->theVector.push_back(Constructable(1));
-  this->theVector.assign(2, 7);
-  this->assertValuesInOrder(this->theVector, 2u, 7, 7);
-}
-
-TYPED_TEST(SmallVectorTest, AssignSmallVector) {
-  SCOPED_TRACE("AssignSmallVector");
-
-  SmallVector<Constructable, 3> otherVector = {7, 7};
-  this->theVector.push_back(Constructable(1));
-  this->theVector.assign(otherVector);
-  this->assertValuesInOrder(this->theVector, 2u, 7, 7);
-}
-
-// Move-assign test
-TYPED_TEST(SmallVectorTest, MoveAssignTest) {
-  SCOPED_TRACE("MoveAssignTest");
-
-  // Set up our vector with a single element, but enough capacity for 4.
-  this->theVector.reserve(4);
-  this->theVector.push_back(Constructable(1));
-  
-  // Set up the other vector with 2 elements.
-  this->otherVector.push_back(Constructable(2));
-  this->otherVector.push_back(Constructable(3));
-
-  // Move-assign from the other vector.
-  this->theVector = std::move(this->otherVector);
-
-  // Make sure we have the right result.
-  this->assertValuesInOrder(this->theVector, 2u, 2, 3);
-
-  // Make sure the # of constructor/destructor calls line up. There
-  // are two live objects after clearing the other vector.
-  this->otherVector.clear();
-  EXPECT_EQ(Constructable::getNumConstructorCalls()-2, 
-            Constructable::getNumDestructorCalls());
-
-  // There shouldn't be any live objects any more.
-  this->theVector.clear();
-  EXPECT_EQ(Constructable::getNumConstructorCalls(), 
-            Constructable::getNumDestructorCalls());
-}
-
-// Erase a single element
-TYPED_TEST(SmallVectorTest, EraseTest) {
-  SCOPED_TRACE("EraseTest");
-
-  this->makeSequence(this->theVector, 1, 3);
-  const auto &theConstVector = this->theVector;
-  this->theVector.erase(theConstVector.begin());
-  this->assertValuesInOrder(this->theVector, 2u, 2, 3);
-}
-
-// Erase a range of elements
-TYPED_TEST(SmallVectorTest, EraseRangeTest) {
-  SCOPED_TRACE("EraseRangeTest");
-
-  this->makeSequence(this->theVector, 1, 3);
-  const auto &theConstVector = this->theVector;
-  this->theVector.erase(theConstVector.begin(), theConstVector.begin() + 2);
-  this->assertValuesInOrder(this->theVector, 1u, 3);
-}
-
-// Insert a single element.
-TYPED_TEST(SmallVectorTest, InsertTest) {
-  SCOPED_TRACE("InsertTest");
-
-  this->makeSequence(this->theVector, 1, 3);
-  typename TypeParam::iterator I =
-    this->theVector.insert(this->theVector.begin() + 1, Constructable(77));
-  EXPECT_EQ(this->theVector.begin() + 1, I);
-  this->assertValuesInOrder(this->theVector, 4u, 1, 77, 2, 3);
-}
-
-// Insert a copy of a single element.
-TYPED_TEST(SmallVectorTest, InsertCopy) {
-  SCOPED_TRACE("InsertTest");
-
-  this->makeSequence(this->theVector, 1, 3);
-  Constructable C(77);
-  typename TypeParam::iterator I =
-      this->theVector.insert(this->theVector.begin() + 1, C);
-  EXPECT_EQ(this->theVector.begin() + 1, I);
-  this->assertValuesInOrder(this->theVector, 4u, 1, 77, 2, 3);
-}
-
-// Insert repeated elements.
-TYPED_TEST(SmallVectorTest, InsertRepeatedTest) {
-  SCOPED_TRACE("InsertRepeatedTest");
-
-  this->makeSequence(this->theVector, 1, 4);
-  Constructable::reset();
-  auto I =
-      this->theVector.insert(this->theVector.begin() + 1, 2, Constructable(16));
-  // Move construct the top element into newly allocated space, and optionally
-  // reallocate the whole buffer, move constructing into it.
-  // FIXME: This is inefficient, we shouldn't move things into newly allocated
-  // space, then move them up/around, there should only be 2 or 4 move
-  // constructions here.
-  EXPECT_TRUE(Constructable::getNumMoveConstructorCalls() == 2 ||
-              Constructable::getNumMoveConstructorCalls() == 6);
-  // Move assign the next two to shift them up and make a gap.
-  EXPECT_EQ(1, Constructable::getNumMoveAssignmentCalls());
-  // Copy construct the two new elements from the parameter.
-  EXPECT_EQ(2, Constructable::getNumCopyAssignmentCalls());
-  // All without any copy construction.
-  EXPECT_EQ(0, Constructable::getNumCopyConstructorCalls());
-  EXPECT_EQ(this->theVector.begin() + 1, I);
-  this->assertValuesInOrder(this->theVector, 6u, 1, 16, 16, 2, 3, 4);
-}
-
-TYPED_TEST(SmallVectorTest, InsertRepeatedNonIterTest) {
-  SCOPED_TRACE("InsertRepeatedTest");
-
-  this->makeSequence(this->theVector, 1, 4);
-  Constructable::reset();
-  auto I = this->theVector.insert(this->theVector.begin() + 1, 2, 7);
-  EXPECT_EQ(this->theVector.begin() + 1, I);
-  this->assertValuesInOrder(this->theVector, 6u, 1, 7, 7, 2, 3, 4);
-}
-
-TYPED_TEST(SmallVectorTest, InsertRepeatedAtEndTest) {
-  SCOPED_TRACE("InsertRepeatedTest");
-
-  this->makeSequence(this->theVector, 1, 4);
-  Constructable::reset();
-  auto I = this->theVector.insert(this->theVector.end(), 2, Constructable(16));
-  // Just copy construct them into newly allocated space
-  EXPECT_EQ(2, Constructable::getNumCopyConstructorCalls());
-  // Move everything across if reallocation is needed.
-  EXPECT_TRUE(Constructable::getNumMoveConstructorCalls() == 0 ||
-              Constructable::getNumMoveConstructorCalls() == 4);
-  // Without ever moving or copying anything else.
-  EXPECT_EQ(0, Constructable::getNumCopyAssignmentCalls());
-  EXPECT_EQ(0, Constructable::getNumMoveAssignmentCalls());
-
-  EXPECT_EQ(this->theVector.begin() + 4, I);
-  this->assertValuesInOrder(this->theVector, 6u, 1, 2, 3, 4, 16, 16);
-}
-
-TYPED_TEST(SmallVectorTest, InsertRepeatedEmptyTest) {
-  SCOPED_TRACE("InsertRepeatedTest");
-
-  this->makeSequence(this->theVector, 10, 15);
-
-  // Empty insert.
-  EXPECT_EQ(this->theVector.end(),
-            this->theVector.insert(this->theVector.end(),
-                                   0, Constructable(42)));
-  EXPECT_EQ(this->theVector.begin() + 1,
-            this->theVector.insert(this->theVector.begin() + 1,
-                                   0, Constructable(42)));
-}
-
-// Insert range.
-TYPED_TEST(SmallVectorTest, InsertRangeTest) {
-  SCOPED_TRACE("InsertRangeTest");
-
-  Constructable Arr[3] =
-    { Constructable(77), Constructable(77), Constructable(77) };
-
-  this->makeSequence(this->theVector, 1, 3);
-  Constructable::reset();
-  auto I = this->theVector.insert(this->theVector.begin() + 1, Arr, Arr + 3);
-  // Move construct the top 3 elements into newly allocated space.
-  // Possibly move the whole sequence into new space first.
-  // FIXME: This is inefficient, we shouldn't move things into newly allocated
-  // space, then move them up/around, there should only be 2 or 3 move
-  // constructions here.
-  EXPECT_TRUE(Constructable::getNumMoveConstructorCalls() == 2 ||
-              Constructable::getNumMoveConstructorCalls() == 5);
-  // Copy assign the lower 2 new elements into existing space.
-  EXPECT_EQ(2, Constructable::getNumCopyAssignmentCalls());
-  // Copy construct the third element into newly allocated space.
-  EXPECT_EQ(1, Constructable::getNumCopyConstructorCalls());
-  EXPECT_EQ(this->theVector.begin() + 1, I);
-  this->assertValuesInOrder(this->theVector, 6u, 1, 77, 77, 77, 2, 3);
-}
-
-
-TYPED_TEST(SmallVectorTest, InsertRangeAtEndTest) {
-  SCOPED_TRACE("InsertRangeTest");
-
-  Constructable Arr[3] =
-    { Constructable(77), Constructable(77), Constructable(77) };
-
-  this->makeSequence(this->theVector, 1, 3);
-
-  // Insert at end.
-  Constructable::reset();
-  auto I = this->theVector.insert(this->theVector.end(), Arr, Arr+3);
-  // Copy construct the 3 elements into new space at the top.
-  EXPECT_EQ(3, Constructable::getNumCopyConstructorCalls());
-  // Don't copy/move anything else.
-  EXPECT_EQ(0, Constructable::getNumCopyAssignmentCalls());
-  // Reallocation might occur, causing all elements to be moved into the new
-  // buffer.
-  EXPECT_TRUE(Constructable::getNumMoveConstructorCalls() == 0 ||
-              Constructable::getNumMoveConstructorCalls() == 3);
-  EXPECT_EQ(0, Constructable::getNumMoveAssignmentCalls());
-  EXPECT_EQ(this->theVector.begin() + 3, I);
-  this->assertValuesInOrder(this->theVector, 6u,
-                            1, 2, 3, 77, 77, 77);
-}
-
-TYPED_TEST(SmallVectorTest, InsertEmptyRangeTest) {
-  SCOPED_TRACE("InsertRangeTest");
-
-  this->makeSequence(this->theVector, 1, 3);
-
-  // Empty insert.
-  EXPECT_EQ(this->theVector.end(),
-            this->theVector.insert(this->theVector.end(),
-                                   this->theVector.begin(),
-                                   this->theVector.begin()));
-  EXPECT_EQ(this->theVector.begin() + 1,
-            this->theVector.insert(this->theVector.begin() + 1,
-                                   this->theVector.begin(),
-                                   this->theVector.begin()));
-}
-
-// Comparison tests.
-TYPED_TEST(SmallVectorTest, ComparisonTest) {
-  SCOPED_TRACE("ComparisonTest");
-
-  this->makeSequence(this->theVector, 1, 3);
-  this->makeSequence(this->otherVector, 1, 3);
-
-  EXPECT_TRUE(this->theVector == this->otherVector);
-  EXPECT_FALSE(this->theVector != this->otherVector);
-
-  this->otherVector.clear();
-  this->makeSequence(this->otherVector, 2, 4);
-
-  EXPECT_FALSE(this->theVector == this->otherVector);
-  EXPECT_TRUE(this->theVector != this->otherVector);
-}
-
-// Constant vector tests.
-TYPED_TEST(SmallVectorTest, ConstVectorTest) {
-  const TypeParam constVector;
-
-  EXPECT_EQ(0u, constVector.size());
-  EXPECT_TRUE(constVector.empty());
-  EXPECT_TRUE(constVector.begin() == constVector.end());
-}
-
-// Direct array access.
-TYPED_TEST(SmallVectorTest, DirectVectorTest) {
-  EXPECT_EQ(0u, this->theVector.size());
-  this->theVector.reserve(4);
-  EXPECT_LE(4u, this->theVector.capacity());
-  EXPECT_EQ(0, Constructable::getNumConstructorCalls());
-  this->theVector.push_back(1);
-  this->theVector.push_back(2);
-  this->theVector.push_back(3);
-  this->theVector.push_back(4);
-  EXPECT_EQ(4u, this->theVector.size());
-  EXPECT_EQ(8, Constructable::getNumConstructorCalls());
-  EXPECT_EQ(1, this->theVector[0].getValue());
-  EXPECT_EQ(2, this->theVector[1].getValue());
-  EXPECT_EQ(3, this->theVector[2].getValue());
-  EXPECT_EQ(4, this->theVector[3].getValue());
-}
-
-TYPED_TEST(SmallVectorTest, IteratorTest) {
-  std::list<int> L;
-  this->theVector.insert(this->theVector.end(), L.begin(), L.end());
-}
-
-template <typename InvalidType> class DualSmallVectorsTest;
-
-template <typename VectorT1, typename VectorT2>
-class DualSmallVectorsTest<std::pair<VectorT1, VectorT2>> : public SmallVectorTestBase {
-protected:
-  VectorT1 theVector;
-  VectorT2 otherVector;
-
-  template <typename T, unsigned N>
-  static unsigned NumBuiltinElts(const SmallVector<T, N>&) { return N; }
-};
-
-typedef ::testing::Types<
-    // Small mode -> Small mode.
-    std::pair<SmallVector<Constructable, 4>, SmallVector<Constructable, 4>>,
-    // Small mode -> Big mode.
-    std::pair<SmallVector<Constructable, 4>, SmallVector<Constructable, 2>>,
-    // Big mode -> Small mode.
-    std::pair<SmallVector<Constructable, 2>, SmallVector<Constructable, 4>>,
-    // Big mode -> Big mode.
-    std::pair<SmallVector<Constructable, 2>, SmallVector<Constructable, 2>>
-  > DualSmallVectorTestTypes;
-
-TYPED_TEST_SUITE(DualSmallVectorsTest, DualSmallVectorTestTypes, );
-
-TYPED_TEST(DualSmallVectorsTest, MoveAssignment) {
-  SCOPED_TRACE("MoveAssignTest-DualVectorTypes");
-
-  // Set up our vector with four elements.
-  for (unsigned I = 0; I < 4; ++I)
-    this->otherVector.push_back(Constructable(I));
-
-  const Constructable *OrigDataPtr = this->otherVector.data();
-
-  // Move-assign from the other vector.
-  this->theVector =
-    std::move(static_cast<SmallVectorImpl<Constructable>&>(this->otherVector));
-
-  // Make sure we have the right result.
-  this->assertValuesInOrder(this->theVector, 4u, 0, 1, 2, 3);
-
-  // Make sure the # of constructor/destructor calls line up. There
-  // are two live objects after clearing the other vector.
-  this->otherVector.clear();
-  EXPECT_EQ(Constructable::getNumConstructorCalls()-4,
-            Constructable::getNumDestructorCalls());
-
-  // If the source vector (otherVector) was in small-mode, assert that we just
-  // moved the data pointer over.
-  EXPECT_TRUE(this->NumBuiltinElts(this->otherVector) == 4 ||
-              this->theVector.data() == OrigDataPtr);
-
-  // There shouldn't be any live objects any more.
-  this->theVector.clear();
-  EXPECT_EQ(Constructable::getNumConstructorCalls(),
-            Constructable::getNumDestructorCalls());
-
-  // We shouldn't have copied anything in this whole process.
-  EXPECT_EQ(Constructable::getNumCopyConstructorCalls(), 0);
-}
-
-struct notassignable {
-  int &x;
-  notassignable(int &x) : x(x) {}
-};
-
-TEST(SmallVectorCustomTest, NoAssignTest) {
-  int x = 0;
-  SmallVector<notassignable, 2> vec;
-  vec.push_back(notassignable(x));
-  x = 42;
-  EXPECT_EQ(42, vec.pop_back_val().x);
-}
-
-struct MovedFrom {
-  bool hasValue;
-  MovedFrom() : hasValue(true) {
-  }
-  MovedFrom(MovedFrom&& m) : hasValue(m.hasValue) {
-    m.hasValue = false;
-  }
-  MovedFrom &operator=(MovedFrom&& m) {
-    hasValue = m.hasValue;
-    m.hasValue = false;
-    return *this;
-  }
-};
-
-TEST(SmallVectorTest, MidInsert) {
-  SmallVector<MovedFrom, 3> v;
-  v.push_back(MovedFrom());
-  v.insert(v.begin(), MovedFrom());
-  for (MovedFrom &m : v)
-    EXPECT_TRUE(m.hasValue);
-}
-
-enum EmplaceableArgState {
-  EAS_Defaulted,
-  EAS_Arg,
-  EAS_LValue,
-  EAS_RValue,
-  EAS_Failure
-};
-template <int I> struct EmplaceableArg {
-  EmplaceableArgState State;
-  EmplaceableArg() : State(EAS_Defaulted) {}
-  EmplaceableArg(EmplaceableArg &&X)
-      : State(X.State == EAS_Arg ? EAS_RValue : EAS_Failure) {}
-  EmplaceableArg(EmplaceableArg &X)
-      : State(X.State == EAS_Arg ? EAS_LValue : EAS_Failure) {}
-
-  explicit EmplaceableArg(bool) : State(EAS_Arg) {}
-
-private:
-  EmplaceableArg &operator=(EmplaceableArg &&) = delete;
-  EmplaceableArg &operator=(const EmplaceableArg &) = delete;
-};
-
-enum EmplaceableState { ES_Emplaced, ES_Moved };
-struct Emplaceable {
-  EmplaceableArg<0> A0;
-  EmplaceableArg<1> A1;
-  EmplaceableArg<2> A2;
-  EmplaceableArg<3> A3;
-  EmplaceableState State;
-
-  Emplaceable() : State(ES_Emplaced) {}
-
-  template <class A0Ty>
-  explicit Emplaceable(A0Ty &&A0)
-      : A0(std::forward<A0Ty>(A0)), State(ES_Emplaced) {}
-
-  template <class A0Ty, class A1Ty>
-  Emplaceable(A0Ty &&A0, A1Ty &&A1)
-      : A0(std::forward<A0Ty>(A0)), A1(std::forward<A1Ty>(A1)),
-        State(ES_Emplaced) {}
-
-  template <class A0Ty, class A1Ty, class A2Ty>
-  Emplaceable(A0Ty &&A0, A1Ty &&A1, A2Ty &&A2)
-      : A0(std::forward<A0Ty>(A0)), A1(std::forward<A1Ty>(A1)),
-        A2(std::forward<A2Ty>(A2)), State(ES_Emplaced) {}
-
-  template <class A0Ty, class A1Ty, class A2Ty, class A3Ty>
-  Emplaceable(A0Ty &&A0, A1Ty &&A1, A2Ty &&A2, A3Ty &&A3)
-      : A0(std::forward<A0Ty>(A0)), A1(std::forward<A1Ty>(A1)),
-        A2(std::forward<A2Ty>(A2)), A3(std::forward<A3Ty>(A3)),
-        State(ES_Emplaced) {}
-
-  Emplaceable(Emplaceable &&) : State(ES_Moved) {}
-  Emplaceable &operator=(Emplaceable &&) {
-    State = ES_Moved;
-    return *this;
-  }
-
-private:
-  Emplaceable(const Emplaceable &) = delete;
-  Emplaceable &operator=(const Emplaceable &) = delete;
-};
-
-TEST(SmallVectorTest, EmplaceBack) {
-  EmplaceableArg<0> A0(true);
-  EmplaceableArg<1> A1(true);
-  EmplaceableArg<2> A2(true);
-  EmplaceableArg<3> A3(true);
-  {
-    SmallVector<Emplaceable, 3> V;
-    Emplaceable &back = V.emplace_back();
-    EXPECT_TRUE(&back == &V.back());
-    EXPECT_TRUE(V.size() == 1);
-    EXPECT_TRUE(back.State == ES_Emplaced);
-    EXPECT_TRUE(back.A0.State == EAS_Defaulted);
-    EXPECT_TRUE(back.A1.State == EAS_Defaulted);
-    EXPECT_TRUE(back.A2.State == EAS_Defaulted);
-    EXPECT_TRUE(back.A3.State == EAS_Defaulted);
-  }
-  {
-    SmallVector<Emplaceable, 3> V;
-    Emplaceable &back = V.emplace_back(std::move(A0));
-    EXPECT_TRUE(&back == &V.back());
-    EXPECT_TRUE(V.size() == 1);
-    EXPECT_TRUE(back.State == ES_Emplaced);
-    EXPECT_TRUE(back.A0.State == EAS_RValue);
-    EXPECT_TRUE(back.A1.State == EAS_Defaulted);
-    EXPECT_TRUE(back.A2.State == EAS_Defaulted);
-    EXPECT_TRUE(back.A3.State == EAS_Defaulted);
-  }
-  {
-    SmallVector<Emplaceable, 3> V;
-    Emplaceable &back = V.emplace_back(A0);
-    EXPECT_TRUE(&back == &V.back());
-    EXPECT_TRUE(V.size() == 1);
-    EXPECT_TRUE(back.State == ES_Emplaced);
-    EXPECT_TRUE(back.A0.State == EAS_LValue);
-    EXPECT_TRUE(back.A1.State == EAS_Defaulted);
-    EXPECT_TRUE(back.A2.State == EAS_Defaulted);
-    EXPECT_TRUE(back.A3.State == EAS_Defaulted);
-  }
-  {
-    SmallVector<Emplaceable, 3> V;
-    Emplaceable &back = V.emplace_back(A0, A1);
-    EXPECT_TRUE(&back == &V.back());
-    EXPECT_TRUE(V.size() == 1);
-    EXPECT_TRUE(back.State == ES_Emplaced);
-    EXPECT_TRUE(back.A0.State == EAS_LValue);
-    EXPECT_TRUE(back.A1.State == EAS_LValue);
-    EXPECT_TRUE(back.A2.State == EAS_Defaulted);
-    EXPECT_TRUE(back.A3.State == EAS_Defaulted);
-  }
-  {
-    SmallVector<Emplaceable, 3> V;
-    Emplaceable &back = V.emplace_back(std::move(A0), std::move(A1));
-    EXPECT_TRUE(&back == &V.back());
-    EXPECT_TRUE(V.size() == 1);
-    EXPECT_TRUE(back.State == ES_Emplaced);
-    EXPECT_TRUE(back.A0.State == EAS_RValue);
-    EXPECT_TRUE(back.A1.State == EAS_RValue);
-    EXPECT_TRUE(back.A2.State == EAS_Defaulted);
-    EXPECT_TRUE(back.A3.State == EAS_Defaulted);
-  }
-  {
-    SmallVector<Emplaceable, 3> V;
-    Emplaceable &back = V.emplace_back(std::move(A0), A1, std::move(A2), A3);
-    EXPECT_TRUE(&back == &V.back());
-    EXPECT_TRUE(V.size() == 1);
-    EXPECT_TRUE(back.State == ES_Emplaced);
-    EXPECT_TRUE(back.A0.State == EAS_RValue);
-    EXPECT_TRUE(back.A1.State == EAS_LValue);
-    EXPECT_TRUE(back.A2.State == EAS_RValue);
-    EXPECT_TRUE(back.A3.State == EAS_LValue);
-  }
-  {
-    SmallVector<int, 1> V;
-    V.emplace_back();
-    V.emplace_back(42);
-    EXPECT_EQ(2U, V.size());
-    EXPECT_EQ(0, V[0]);
-    EXPECT_EQ(42, V[1]);
-  }
-}
-
-TEST(SmallVectorTest, DefaultInlinedElements) {
-  SmallVector<int> V;
-  EXPECT_TRUE(V.empty());
-  V.push_back(7);
-  EXPECT_EQ(V[0], 7);
-
-  // Check that at least a couple layers of nested SmallVector<T>'s are allowed
-  // by the default inline elements policy. This pattern happens in practice
-  // with some frequency, and it seems fairly harmless even though each layer of
-  // SmallVector's will grow the total sizeof by a vector header beyond the
-  // "preferred" maximum sizeof.
-  SmallVector<SmallVector<SmallVector<int>>> NestedV;
-  NestedV.emplace_back().emplace_back().emplace_back(42);
-  EXPECT_EQ(NestedV[0][0][0], 42);
-}
-
-TEST(SmallVectorTest, InitializerList) {
-  SmallVector<int, 2> V1 = {};
-  EXPECT_TRUE(V1.empty());
-  V1 = {0, 0};
-  EXPECT_TRUE(makeArrayRef(V1).equals({0, 0}));
-  V1 = {-1, -1};
-  EXPECT_TRUE(makeArrayRef(V1).equals({-1, -1}));
-
-  SmallVector<int, 2> V2 = {1, 2, 3, 4};
-  EXPECT_TRUE(makeArrayRef(V2).equals({1, 2, 3, 4}));
-  V2.assign({4});
-  EXPECT_TRUE(makeArrayRef(V2).equals({4}));
-  V2.append({3, 2});
-  EXPECT_TRUE(makeArrayRef(V2).equals({4, 3, 2}));
-  V2.insert(V2.begin() + 1, 5);
-  EXPECT_TRUE(makeArrayRef(V2).equals({4, 5, 3, 2}));
-}
-
-template <class VectorT>
-class SmallVectorReferenceInvalidationTest : public SmallVectorTestBase {
-protected:
-  const char *AssertionMessage =
-      "Attempting to reference an element of the vector in an operation \" "
-      "\"that invalidates it";
-
-  VectorT V;
-
-  template <typename T, unsigned N>
-  static unsigned NumBuiltinElts(const SmallVector<T, N> &) {
-    return N;
-  }
-
-  template <class T> static bool isValueType() {
-    return std::is_same<T, typename VectorT::value_type>::value;
-  }
-
-  void SetUp() override {
-    SmallVectorTestBase::SetUp();
-
-    // Fill up the small size so that insertions move the elements.
-    for (int I = 0, E = NumBuiltinElts(V); I != E; ++I)
-      V.emplace_back(I + 1);
-  }
-};
-
-// Test one type that's trivially copyable (int) and one that isn't
-// (Constructable) since reference invalidation may be fixed differently for
-// each.
-using SmallVectorReferenceInvalidationTestTypes =
-    ::testing::Types<SmallVector<int, 3>, SmallVector<Constructable, 3>>;
-
-TYPED_TEST_SUITE(SmallVectorReferenceInvalidationTest,
-                 SmallVectorReferenceInvalidationTestTypes, );
-
-TYPED_TEST(SmallVectorReferenceInvalidationTest, PushBack) {
-  // Note: setup adds [1, 2, ...] to V until it's at capacity in small mode.
-  auto &V = this->V;
-  int N = this->NumBuiltinElts(V);
-
-  // Push back a reference to last element when growing from small storage.
-  V.push_back(V.back());
-  EXPECT_EQ(N, V.back());
-
-  // Check that the old value is still there (not moved away).
-  EXPECT_EQ(N, V[V.size() - 2]);
-
-  // Fill storage again.
-  V.back() = V.size();
-  while (V.size() < V.capacity())
-    V.push_back(V.size() + 1);
-
-  // Push back a reference to last element when growing from large storage.
-  V.push_back(V.back());
-  EXPECT_EQ(int(V.size()) - 1, V.back());
-}
-
-TYPED_TEST(SmallVectorReferenceInvalidationTest, PushBackMoved) {
-  // Note: setup adds [1, 2, ...] to V until it's at capacity in small mode.
-  auto &V = this->V;
-  int N = this->NumBuiltinElts(V);
-
-  // Push back a reference to last element when growing from small storage.
-  V.push_back(std::move(V.back()));
-  EXPECT_EQ(N, V.back());
-  if (this->template isValueType<Constructable>()) {
-    // Check that the value was moved (not copied).
-    EXPECT_EQ(0, V[V.size() - 2]);
-  }
-
-  // Fill storage again.
-  V.back() = V.size();
-  while (V.size() < V.capacity())
-    V.push_back(V.size() + 1);
-
-  // Push back a reference to last element when growing from large storage.
-  V.push_back(std::move(V.back()));
-
-  // Check the values.
-  EXPECT_EQ(int(V.size()) - 1, V.back());
-  if (this->template isValueType<Constructable>()) {
-    // Check the value got moved out.
-    EXPECT_EQ(0, V[V.size() - 2]);
-  }
-}
-
-TYPED_TEST(SmallVectorReferenceInvalidationTest, Resize) {
-  auto &V = this->V;
-  (void)V;
-  int N = this->NumBuiltinElts(V);
-  V.resize(N + 1, V.back());
-  EXPECT_EQ(N, V.back());
-
-  // Resize to add enough elements that V will grow again. If reference
-  // invalidation breaks in the future, sanitizers should be able to catch a
-  // use-after-free here.
-  V.resize(V.capacity() + 1, V.front());
-  EXPECT_EQ(1, V.back());
-}
-
-TYPED_TEST(SmallVectorReferenceInvalidationTest, Append) {
-  auto &V = this->V;
-  (void)V;
-  V.append(1, V.back());
-  int N = this->NumBuiltinElts(V);
-  EXPECT_EQ(N, V[N - 1]);
-
-  // Append enough more elements that V will grow again. This tests growing
-  // when already in large mode.
-  //
-  // If reference invalidation breaks in the future, sanitizers should be able
-  // to catch a use-after-free here.
-  V.append(V.capacity() - V.size() + 1, V.front());
-  EXPECT_EQ(1, V.back());
-}
-
-TYPED_TEST(SmallVectorReferenceInvalidationTest, AppendRange) {
-  auto &V = this->V;
-  (void)V;
-#if !defined(NDEBUG) && GTEST_HAS_DEATH_TEST
-  EXPECT_DEATH(V.append(V.begin(), V.begin() + 1), this->AssertionMessage);
-
-  ASSERT_EQ(3u, this->NumBuiltinElts(V));
-  ASSERT_EQ(3u, V.size());
-  V.pop_back();
-  ASSERT_EQ(2u, V.size());
-
-  // Confirm this checks for growth when there's more than one element
-  // appended.
-  EXPECT_DEATH(V.append(V.begin(), V.end()), this->AssertionMessage);
-#endif
-}
-
-TYPED_TEST(SmallVectorReferenceInvalidationTest, Assign) {
-  // Note: setup adds [1, 2, ...] to V until it's at capacity in small mode.
-  auto &V = this->V;
-  (void)V;
-  int N = this->NumBuiltinElts(V);
-  ASSERT_EQ(unsigned(N), V.size());
-  ASSERT_EQ(unsigned(N), V.capacity());
-
-  // Check assign that shrinks in small mode.
-  V.assign(1, V.back());
-  EXPECT_EQ(1u, V.size());
-  EXPECT_EQ(N, V[0]);
-
-  // Check assign that grows within small mode.
-  ASSERT_LT(V.size(), V.capacity());
-  V.assign(V.capacity(), V.back());
-  for (int I = 0, E = V.size(); I != E; ++I) {
-    EXPECT_EQ(N, V[I]);
-
-    // Reset to [1, 2, ...].
-    V[I] = I + 1;
-  }
-
-  // Check assign that grows to large mode.
-  ASSERT_EQ(2, V[1]);
-  V.assign(V.capacity() + 1, V[1]);
-  for (int I = 0, E = V.size(); I != E; ++I) {
-    EXPECT_EQ(2, V[I]);
-
-    // Reset to [1, 2, ...].
-    V[I] = I + 1;
-  }
-
-  // Check assign that shrinks in large mode.
-  V.assign(1, V[1]);
-  EXPECT_EQ(2, V[0]);
-}
-
-TYPED_TEST(SmallVectorReferenceInvalidationTest, AssignRange) {
-  auto &V = this->V;
-#if !defined(NDEBUG) && GTEST_HAS_DEATH_TEST
-  EXPECT_DEATH(V.assign(V.begin(), V.end()), this->AssertionMessage);
-  EXPECT_DEATH(V.assign(V.begin(), V.end() - 1), this->AssertionMessage);
-#endif
-  V.assign(V.begin(), V.begin());
-  EXPECT_TRUE(V.empty());
-}
-
-TYPED_TEST(SmallVectorReferenceInvalidationTest, Insert) {
-  // Note: setup adds [1, 2, ...] to V until it's at capacity in small mode.
-  auto &V = this->V;
-  (void)V;
-
-  // Insert a reference to the back (not at end() or else insert delegates to
-  // push_back()), growing out of small mode. Confirm the value was copied out
-  // (moving out Constructable sets it to 0).
-  V.insert(V.begin(), V.back());
-  EXPECT_EQ(int(V.size() - 1), V.front());
-  EXPECT_EQ(int(V.size() - 1), V.back());
-
-  // Fill up the vector again.
-  while (V.size() < V.capacity())
-    V.push_back(V.size() + 1);
-
-  // Grow again from large storage to large storage.
-  V.insert(V.begin(), V.back());
-  EXPECT_EQ(int(V.size() - 1), V.front());
-  EXPECT_EQ(int(V.size() - 1), V.back());
-}
-
-TYPED_TEST(SmallVectorReferenceInvalidationTest, InsertMoved) {
-  // Note: setup adds [1, 2, ...] to V until it's at capacity in small mode.
-  auto &V = this->V;
-  (void)V;
-
-  // Insert a reference to the back (not at end() or else insert delegates to
-  // push_back()), growing out of small mode. Confirm the value was copied out
-  // (moving out Constructable sets it to 0).
-  V.insert(V.begin(), std::move(V.back()));
-  EXPECT_EQ(int(V.size() - 1), V.front());
-  if (this->template isValueType<Constructable>()) {
-    // Check the value got moved out.
-    EXPECT_EQ(0, V.back());
-  }
-
-  // Fill up the vector again.
-  while (V.size() < V.capacity())
-    V.push_back(V.size() + 1);
-
-  // Grow again from large storage to large storage.
-  V.insert(V.begin(), std::move(V.back()));
-  EXPECT_EQ(int(V.size() - 1), V.front());
-  if (this->template isValueType<Constructable>()) {
-    // Check the value got moved out.
-    EXPECT_EQ(0, V.back());
-  }
-}
-
-TYPED_TEST(SmallVectorReferenceInvalidationTest, InsertN) {
-  auto &V = this->V;
-  (void)V;
-
-  // Cover NumToInsert <= this->end() - I.
-  V.insert(V.begin() + 1, 1, V.back());
-  int N = this->NumBuiltinElts(V);
-  EXPECT_EQ(N, V[1]);
-
-  // Cover NumToInsert > this->end() - I, inserting enough elements that V will
-  // also grow again; V.capacity() will be more elements than necessary but
-  // it's a simple way to cover both conditions.
-  //
-  // If reference invalidation breaks in the future, sanitizers should be able
-  // to catch a use-after-free here.
-  V.insert(V.begin(), V.capacity(), V.front());
-  EXPECT_EQ(1, V.front());
-}
-
-TYPED_TEST(SmallVectorReferenceInvalidationTest, InsertRange) {
-  auto &V = this->V;
-  (void)V;
-#if !defined(NDEBUG) && GTEST_HAS_DEATH_TEST
-  EXPECT_DEATH(V.insert(V.begin(), V.begin(), V.begin() + 1),
-               this->AssertionMessage);
-
-  ASSERT_EQ(3u, this->NumBuiltinElts(V));
-  ASSERT_EQ(3u, V.size());
-  V.pop_back();
-  ASSERT_EQ(2u, V.size());
-
-  // Confirm this checks for growth when there's more than one element
-  // inserted.
-  EXPECT_DEATH(V.insert(V.begin(), V.begin(), V.end()), this->AssertionMessage);
-#endif
-}
-
-TYPED_TEST(SmallVectorReferenceInvalidationTest, EmplaceBack) {
-  // Note: setup adds [1, 2, ...] to V until it's at capacity in small mode.
-  auto &V = this->V;
-  int N = this->NumBuiltinElts(V);
-
-  // Push back a reference to last element when growing from small storage.
-  V.emplace_back(V.back());
-  EXPECT_EQ(N, V.back());
-
-  // Check that the old value is still there (not moved away).
-  EXPECT_EQ(N, V[V.size() - 2]);
-
-  // Fill storage again.
-  V.back() = V.size();
-  while (V.size() < V.capacity())
-    V.push_back(V.size() + 1);
-
-  // Push back a reference to last element when growing from large storage.
-  V.emplace_back(V.back());
-  EXPECT_EQ(int(V.size()) - 1, V.back());
-}
-
-template <class VectorT>
-class SmallVectorInternalReferenceInvalidationTest
-    : public SmallVectorTestBase {
-protected:
-  const char *AssertionMessage =
-      "Attempting to reference an element of the vector in an operation \" "
-      "\"that invalidates it";
-
-  VectorT V;
-
-  template <typename T, unsigned N>
-  static unsigned NumBuiltinElts(const SmallVector<T, N> &) {
-    return N;
-  }
-
-  void SetUp() override {
-    SmallVectorTestBase::SetUp();
-
-    // Fill up the small size so that insertions move the elements.
-    for (int I = 0, E = NumBuiltinElts(V); I != E; ++I)
-      V.emplace_back(I + 1, I + 1);
-  }
-};
-
-// Test pairs of the same types from SmallVectorReferenceInvalidationTestTypes.
-using SmallVectorInternalReferenceInvalidationTestTypes =
-    ::testing::Types<SmallVector<std::pair<int, int>, 3>,
-                     SmallVector<std::pair<Constructable, Constructable>, 3>>;
-
-TYPED_TEST_SUITE(SmallVectorInternalReferenceInvalidationTest,
-                 SmallVectorInternalReferenceInvalidationTestTypes, );
-
-TYPED_TEST(SmallVectorInternalReferenceInvalidationTest, EmplaceBack) {
-  // Note: setup adds [1, 2, ...] to V until it's at capacity in small mode.
-  auto &V = this->V;
-  int N = this->NumBuiltinElts(V);
-
-  // Push back a reference to last element when growing from small storage.
-  V.emplace_back(V.back().first, V.back().second);
-  EXPECT_EQ(N, V.back().first);
-  EXPECT_EQ(N, V.back().second);
-
-  // Check that the old value is still there (not moved away).
-  EXPECT_EQ(N, V[V.size() - 2].first);
-  EXPECT_EQ(N, V[V.size() - 2].second);
-
-  // Fill storage again.
-  V.back().first = V.back().second = V.size();
-  while (V.size() < V.capacity())
-    V.emplace_back(V.size() + 1, V.size() + 1);
-
-  // Push back a reference to last element when growing from large storage.
-  V.emplace_back(V.back().first, V.back().second);
-  EXPECT_EQ(int(V.size()) - 1, V.back().first);
-  EXPECT_EQ(int(V.size()) - 1, V.back().second);
-}
-
-} // end namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/SparseBitVectorTest.cpp b/gnu/llvm/llvm/unittests/ADT/SparseBitVectorTest.cpp
deleted file mode 100644
index db8d58a1199..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/SparseBitVectorTest.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-//===- llvm/unittest/ADT/SparseBitVectorTest.cpp - SparseBitVector tests --===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/SparseBitVector.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST(SparseBitVectorTest, TrivialOperation) {
-  SparseBitVector<> Vec;
-  EXPECT_EQ(0U, Vec.count());
-  EXPECT_FALSE(Vec.test(17));
-  Vec.set(5);
-  EXPECT_TRUE(Vec.test(5));
-  EXPECT_FALSE(Vec.test(17));
-  Vec.reset(6);
-  EXPECT_TRUE(Vec.test(5));
-  EXPECT_FALSE(Vec.test(6));
-  Vec.reset(5);
-  EXPECT_FALSE(Vec.test(5));
-  EXPECT_TRUE(Vec.test_and_set(17));
-  EXPECT_FALSE(Vec.test_and_set(17));
-  EXPECT_TRUE(Vec.test(17));
-  Vec.clear();
-  EXPECT_FALSE(Vec.test(17));
-
-  Vec.set(5);
-  const SparseBitVector<> ConstVec = Vec;
-  EXPECT_TRUE(ConstVec.test(5));
-  EXPECT_FALSE(ConstVec.test(17));
-
-  Vec.set(1337);
-  EXPECT_TRUE(Vec.test(1337));
-  Vec = ConstVec;
-  EXPECT_FALSE(Vec.test(1337));
-
-  Vec.set(1337);
-  EXPECT_FALSE(Vec.empty());
-  SparseBitVector<> MovedVec(std::move(Vec));
-  EXPECT_TRUE(Vec.empty());
-  EXPECT_TRUE(MovedVec.test(5));
-  EXPECT_TRUE(MovedVec.test(1337));
-
-  Vec = std::move(MovedVec);
-  EXPECT_TRUE(MovedVec.empty());
-  EXPECT_FALSE(Vec.empty());
-}
-
-TEST(SparseBitVectorTest, IntersectWith) {
-  SparseBitVector<> Vec, Other;
-
-  Vec.set(1);
-  Other.set(1);
-  EXPECT_FALSE(Vec &= Other);
-  EXPECT_TRUE(Vec.test(1));
-
-  Vec.clear();
-  Vec.set(5);
-  Other.clear();
-  Other.set(6);
-  EXPECT_TRUE(Vec &= Other);
-  EXPECT_TRUE(Vec.empty());
-
-  Vec.clear();
-  Vec.set(5);
-  Other.clear();
-  Other.set(225);
-  EXPECT_TRUE(Vec &= Other);
-  EXPECT_TRUE(Vec.empty());
-
-  Vec.clear();
-  Vec.set(225);
-  Other.clear();
-  Other.set(5);
-  EXPECT_TRUE(Vec &= Other);
-  EXPECT_TRUE(Vec.empty());
-}
-
-TEST(SparseBitVectorTest, SelfAssignment) {
-  SparseBitVector<> Vec, Other;
-
-  Vec.set(23);
-  Vec.set(234);
-  Vec = static_cast<SparseBitVector<> &>(Vec);
-  EXPECT_TRUE(Vec.test(23));
-  EXPECT_TRUE(Vec.test(234));
-
-  Vec.clear();
-  Vec.set(17);
-  Vec.set(256);
-  EXPECT_FALSE(Vec |= Vec);
-  EXPECT_TRUE(Vec.test(17));
-  EXPECT_TRUE(Vec.test(256));
-
-  Vec.clear();
-  Vec.set(56);
-  Vec.set(517);
-  EXPECT_FALSE(Vec &= Vec);
-  EXPECT_TRUE(Vec.test(56));
-  EXPECT_TRUE(Vec.test(517));
-
-  Vec.clear();
-  Vec.set(99);
-  Vec.set(333);
-  EXPECT_TRUE(Vec.intersectWithComplement(Vec));
-  EXPECT_TRUE(Vec.empty());
-  EXPECT_FALSE(Vec.intersectWithComplement(Vec));
-
-  Vec.clear();
-  Vec.set(28);
-  Vec.set(43);
-  Vec.intersectWithComplement(Vec, Vec);
-  EXPECT_TRUE(Vec.empty());
-
-  Vec.clear();
-  Vec.set(42);
-  Vec.set(567);
-  Other.set(55);
-  Other.set(567);
-  Vec.intersectWithComplement(Vec, Other);
-  EXPECT_TRUE(Vec.test(42));
-  EXPECT_FALSE(Vec.test(567));
-
-  Vec.clear();
-  Vec.set(19);
-  Vec.set(21);
-  Other.clear();
-  Other.set(19);
-  Other.set(31);
-  Vec.intersectWithComplement(Other, Vec);
-  EXPECT_FALSE(Vec.test(19));
-  EXPECT_TRUE(Vec.test(31));
-
-  Vec.clear();
-  Vec.set(1);
-  Other.clear();
-  Other.set(59);
-  Other.set(75);
-  Vec.intersectWithComplement(Other, Other);
-  EXPECT_TRUE(Vec.empty());
-}
-
-TEST(SparseBitVectorTest, Find) {
-  SparseBitVector<> Vec;
-  Vec.set(1);
-  EXPECT_EQ(1, Vec.find_first());
-  EXPECT_EQ(1, Vec.find_last());
-
-  Vec.set(2);
-  EXPECT_EQ(1, Vec.find_first());
-  EXPECT_EQ(2, Vec.find_last());
-
-  Vec.set(0);
-  Vec.set(3);
-  EXPECT_EQ(0, Vec.find_first());
-  EXPECT_EQ(3, Vec.find_last());
-
-  Vec.reset(1);
-  Vec.reset(0);
-  Vec.reset(3);
-  EXPECT_EQ(2, Vec.find_first());
-  EXPECT_EQ(2, Vec.find_last());
-
-  // Set some large bits to ensure we are pulling bits from more than just a
-  // single bitword.
-  Vec.set(500);
-  Vec.set(2000);
-  Vec.set(3000);
-  Vec.set(4000);
-  Vec.reset(2);
-  EXPECT_EQ(500, Vec.find_first());
-  EXPECT_EQ(4000, Vec.find_last());
-
-  Vec.reset(500);
-  Vec.reset(3000);
-  Vec.reset(4000);
-  EXPECT_EQ(2000, Vec.find_first());
-  EXPECT_EQ(2000, Vec.find_last());
-
-  Vec.clear();
-}
-}
diff --git a/gnu/llvm/llvm/unittests/ADT/SparseMultiSetTest.cpp b/gnu/llvm/llvm/unittests/ADT/SparseMultiSetTest.cpp
deleted file mode 100644
index 54f7bc99b52..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/SparseMultiSetTest.cpp
+++ /dev/null
@@ -1,234 +0,0 @@
-//===------ ADT/SparseSetTest.cpp - SparseSet unit tests -  -----*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/SparseMultiSet.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-typedef SparseMultiSet<unsigned> USet;
-
-// Empty set tests.
-TEST(SparseMultiSetTest, EmptySet) {
-  USet Set;
-  EXPECT_TRUE(Set.empty());
-  EXPECT_EQ(0u, Set.size());
-
-  Set.setUniverse(10);
-
-  // Lookups on empty set.
-  EXPECT_TRUE(Set.find(0) == Set.end());
-  EXPECT_TRUE(Set.find(9) == Set.end());
-
-  // Same thing on a const reference.
-  const USet &CSet = Set;
-  EXPECT_TRUE(CSet.empty());
-  EXPECT_EQ(0u, CSet.size());
-  EXPECT_TRUE(CSet.find(0) == CSet.end());
-  USet::const_iterator I = CSet.find(5);
-  EXPECT_TRUE(I == CSet.end());
-}
-
-// Single entry set tests.
-TEST(SparseMultiSetTest, SingleEntrySet) {
-  USet Set;
-  Set.setUniverse(10);
-  USet::iterator I = Set.insert(5);
-  EXPECT_TRUE(I != Set.end());
-  EXPECT_TRUE(*I == 5);
-
-  EXPECT_FALSE(Set.empty());
-  EXPECT_EQ(1u, Set.size());
-
-  EXPECT_TRUE(Set.find(0) == Set.end());
-  EXPECT_TRUE(Set.find(9) == Set.end());
-
-  EXPECT_FALSE(Set.contains(0));
-  EXPECT_TRUE(Set.contains(5));
-
-  // Extra insert.
-  I = Set.insert(5);
-  EXPECT_TRUE(I != Set.end());
-  EXPECT_TRUE(I == ++Set.find(5));
-  I--;
-  EXPECT_TRUE(I == Set.find(5));
-
-  // Erase non-existent element.
-  I = Set.find(1);
-  EXPECT_TRUE(I == Set.end());
-  EXPECT_EQ(2u, Set.size());
-  EXPECT_EQ(5u, *Set.find(5));
-
-  // Erase iterator.
-  I = Set.find(5);
-  EXPECT_TRUE(I != Set.end());
-  I = Set.erase(I);
-  EXPECT_TRUE(I != Set.end());
-  I = Set.erase(I);
-  EXPECT_TRUE(I == Set.end());
-  EXPECT_TRUE(Set.empty());
-}
-
-// Multiple entry set tests.
-TEST(SparseMultiSetTest, MultipleEntrySet) {
-  USet Set;
-  Set.setUniverse(10);
-
-  Set.insert(5);
-  Set.insert(5);
-  Set.insert(5);
-  Set.insert(3);
-  Set.insert(2);
-  Set.insert(1);
-  Set.insert(4);
-  EXPECT_EQ(7u, Set.size());
-
-  // Erase last element by key.
-  EXPECT_TRUE(Set.erase(Set.find(4)) == Set.end());
-  EXPECT_EQ(6u, Set.size());
-  EXPECT_FALSE(Set.contains(4));
-  EXPECT_TRUE(Set.find(4) == Set.end());
-
-  // Erase first element by key.
-  EXPECT_EQ(3u, Set.count(5));
-  EXPECT_TRUE(Set.find(5) != Set.end());
-  EXPECT_TRUE(Set.erase(Set.find(5)) != Set.end());
-  EXPECT_EQ(5u, Set.size());
-  EXPECT_EQ(2u, Set.count(5));
-
-  Set.insert(6);
-  Set.insert(7);
-  EXPECT_EQ(7u, Set.size());
-
-  // Erase tail by iterator.
-  EXPECT_TRUE(Set.getTail(6) == Set.getHead(6));
-  USet::iterator I = Set.erase(Set.find(6));
-  EXPECT_TRUE(I == Set.end());
-  EXPECT_EQ(6u, Set.size());
-
-  // Erase tails by iterator.
-  EXPECT_EQ(2u, Set.count(5));
-  I = Set.getTail(5);
-  I = Set.erase(I);
-  EXPECT_TRUE(I == Set.end());
-  --I;
-  EXPECT_EQ(1u, Set.count(5));
-  EXPECT_EQ(5u, *I);
-  I = Set.erase(I);
-  EXPECT_TRUE(I == Set.end());
-  EXPECT_EQ(0u, Set.count(5));
-
-  Set.insert(8);
-  Set.insert(8);
-  Set.insert(8);
-  Set.insert(8);
-  Set.insert(8);
-
-  // Erase all the 8s
-  EXPECT_EQ(5, std::distance(Set.getHead(8), Set.end()));
-  Set.eraseAll(8);
-  EXPECT_EQ(0, std::distance(Set.getHead(8), Set.end()));
-
-  // Clear and resize the universe.
-  Set.clear();
-  EXPECT_EQ(0u, Set.size());
-  EXPECT_FALSE(Set.contains(3));
-  Set.setUniverse(1000);
-
-  // Add more than 256 elements.
-  for (unsigned i = 100; i != 800; ++i)
-    Set.insert(i);
-
-  for (unsigned i = 0; i != 10; ++i)
-    Set.eraseAll(i);
-
-  for (unsigned i = 100; i != 800; ++i)
-    EXPECT_EQ(1u, Set.count(i));
-
-  EXPECT_FALSE(Set.contains(99));
-  EXPECT_FALSE(Set.contains(800));
-  EXPECT_EQ(700u, Set.size());
-}
-
-// Test out iterators
-TEST(SparseMultiSetTest, Iterators) {
-  USet Set;
-  Set.setUniverse(100);
-
-  Set.insert(0);
-  Set.insert(1);
-  Set.insert(2);
-  Set.insert(0);
-  Set.insert(1);
-  Set.insert(0);
-
-  USet::RangePair RangePair = Set.equal_range(0);
-  USet::iterator B = RangePair.first;
-  USet::iterator E = RangePair.second;
-
-  // Move the iterators around, going to end and coming back.
-  EXPECT_EQ(3, std::distance(B, E));
-  EXPECT_EQ(B, --(--(--E)));
-  EXPECT_EQ(++(++(++E)), Set.end());
-  EXPECT_EQ(B, --(--(--E)));
-  EXPECT_EQ(++(++(++E)), Set.end());
-
-  // Insert into the tail, and move around again
-  Set.insert(0);
-  EXPECT_EQ(B, --(--(--(--E))));
-  EXPECT_EQ(++(++(++(++E))), Set.end());
-  EXPECT_EQ(B, --(--(--(--E))));
-  EXPECT_EQ(++(++(++(++E))), Set.end());
-
-  // Erase a tail, and move around again
-  USet::iterator Erased = Set.erase(Set.getTail(0));
-  EXPECT_EQ(Erased, E);
-  EXPECT_EQ(B, --(--(--E)));
-
-  USet Set2;
-  Set2.setUniverse(11);
-  Set2.insert(3);
-  EXPECT_TRUE(!Set2.contains(0));
-  EXPECT_TRUE(!Set.contains(3));
-
-  EXPECT_EQ(Set2.getHead(3), Set2.getTail(3));
-  EXPECT_EQ(Set2.getHead(0), Set2.getTail(0));
-  B = Set2.find(3);
-  EXPECT_EQ(Set2.find(3), --(++B));
-}
-
-struct Alt {
-  unsigned Value;
-  explicit Alt(unsigned x) : Value(x) {}
-  unsigned getSparseSetIndex() const { return Value - 1000; }
-};
-
-TEST(SparseMultiSetTest, AltStructSet) {
-  typedef SparseMultiSet<Alt> ASet;
-  ASet Set;
-  Set.setUniverse(10);
-  Set.insert(Alt(1005));
-
-  ASet::iterator I = Set.find(5);
-  ASSERT_TRUE(I != Set.end());
-  EXPECT_EQ(1005u, I->Value);
-
-  Set.insert(Alt(1006));
-  Set.insert(Alt(1006));
-  I = Set.erase(Set.find(6));
-  ASSERT_TRUE(I != Set.end());
-  EXPECT_EQ(1006u, I->Value);
-  I = Set.erase(Set.find(6));
-  ASSERT_TRUE(I == Set.end());
-
-  EXPECT_TRUE(Set.contains(5));
-  EXPECT_FALSE(Set.contains(6));
-}
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/SparseSetTest.cpp b/gnu/llvm/llvm/unittests/ADT/SparseSetTest.cpp
deleted file mode 100644
index 3eea4bde8c0..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/SparseSetTest.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-//===------ ADT/SparseSetTest.cpp - SparseSet unit tests -  -----*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/SparseSet.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-typedef SparseSet<unsigned> USet;
-
-// Empty set tests.
-TEST(SparseSetTest, EmptySet) {
-  USet Set;
-  EXPECT_TRUE(Set.empty());
-  EXPECT_TRUE(Set.begin() == Set.end());
-  EXPECT_EQ(0u, Set.size());
-
-  Set.setUniverse(10);
-
-  // Lookups on empty set.
-  EXPECT_FALSE(Set.contains(0));
-  EXPECT_FALSE(Set.contains(9));
-
-  // Same thing on a const reference.
-  const USet &CSet = Set;
-  EXPECT_TRUE(CSet.empty());
-  EXPECT_TRUE(CSet.begin() == CSet.end());
-  EXPECT_EQ(0u, CSet.size());
-  EXPECT_FALSE(CSet.contains(0));
-  USet::const_iterator I = CSet.find(5);
-  EXPECT_TRUE(I == CSet.end());
-}
-
-// Single entry set tests.
-TEST(SparseSetTest, SingleEntrySet) {
-  USet Set;
-  Set.setUniverse(10);
-  std::pair<USet::iterator, bool> IP = Set.insert(5);
-  EXPECT_TRUE(IP.second);
-  EXPECT_TRUE(IP.first == Set.begin());
-
-  EXPECT_FALSE(Set.empty());
-  EXPECT_FALSE(Set.begin() == Set.end());
-  EXPECT_TRUE(Set.begin() + 1 == Set.end());
-  EXPECT_EQ(1u, Set.size());
-
-  EXPECT_FALSE(Set.contains(0));
-  EXPECT_FALSE(Set.contains(9));
-  EXPECT_TRUE(Set.contains(5));
-
-  EXPECT_FALSE(Set.count(0));
-  EXPECT_TRUE(Set.count(5));
-
-  // Redundant insert.
-  IP = Set.insert(5);
-  EXPECT_FALSE(IP.second);
-  EXPECT_TRUE(IP.first == Set.begin());
-
-  // Erase non-existent element.
-  EXPECT_FALSE(Set.erase(1));
-  EXPECT_EQ(1u, Set.size());
-  EXPECT_EQ(5u, *Set.begin());
-
-  // Erase iterator.
-  USet::iterator I = Set.find(5);
-  EXPECT_TRUE(I == Set.begin());
-  I = Set.erase(I);
-  EXPECT_FALSE(Set.contains(5));
-  EXPECT_TRUE(I == Set.end());
-  EXPECT_TRUE(Set.empty());
-}
-
-// Multiple entry set tests.
-TEST(SparseSetTest, MultipleEntrySet) {
-  USet Set;
-  Set.setUniverse(10);
-
-  Set.insert(5);
-  Set.insert(3);
-  Set.insert(2);
-  Set.insert(1);
-  Set.insert(4);
-  EXPECT_EQ(5u, Set.size());
-
-  // Without deletions, iteration order == insertion order.
-  USet::const_iterator I = Set.begin();
-  EXPECT_EQ(5u, *I);
-  ++I;
-  EXPECT_EQ(3u, *I);
-  ++I;
-  EXPECT_EQ(2u, *I);
-  ++I;
-  EXPECT_EQ(1u, *I);
-  ++I;
-  EXPECT_EQ(4u, *I);
-  ++I;
-  EXPECT_TRUE(I == Set.end());
-
-  // Redundant insert.
-  std::pair<USet::iterator, bool> IP = Set.insert(3);
-  EXPECT_FALSE(IP.second);
-  EXPECT_TRUE(IP.first == Set.begin() + 1);
-
-  // Erase last element by key.
-  EXPECT_TRUE(Set.erase(4));
-  EXPECT_EQ(4u, Set.size());
-  EXPECT_FALSE(Set.count(4));
-  EXPECT_FALSE(Set.erase(4));
-  EXPECT_EQ(4u, Set.size());
-  EXPECT_FALSE(Set.count(4));
-
-  // Erase first element by key.
-  EXPECT_TRUE(Set.count(5));
-  EXPECT_TRUE(Set.find(5) == Set.begin());
-  EXPECT_TRUE(Set.erase(5));
-  EXPECT_EQ(3u, Set.size());
-  EXPECT_FALSE(Set.count(5));
-  EXPECT_FALSE(Set.erase(5));
-  EXPECT_EQ(3u, Set.size());
-  EXPECT_FALSE(Set.count(5));
-
-  Set.insert(6);
-  Set.insert(7);
-  EXPECT_EQ(5u, Set.size());
-
-  // Erase last element by iterator.
-  I = Set.erase(Set.end() - 1);
-  EXPECT_TRUE(I == Set.end());
-  EXPECT_EQ(4u, Set.size());
-
-  // Erase second element by iterator.
-  I = Set.erase(Set.begin() + 1);
-  EXPECT_TRUE(I == Set.begin() + 1);
-
-  // Clear and resize the universe.
-  Set.clear();
-  EXPECT_FALSE(Set.count(5));
-  Set.setUniverse(1000);
-
-  // Add more than 256 elements.
-  for (unsigned i = 100; i != 800; ++i)
-    Set.insert(i);
-
-  for (unsigned i = 0; i != 10; ++i)
-    Set.erase(i);
-
-  for (unsigned i = 100; i != 800; ++i)
-    EXPECT_TRUE(Set.count(i));
-
-  EXPECT_FALSE(Set.count(99));
-  EXPECT_FALSE(Set.count(800));
-  EXPECT_EQ(700u, Set.size());
-}
-
-struct Alt {
-  unsigned Value;
-  explicit Alt(unsigned x) : Value(x) {}
-  unsigned getSparseSetIndex() const { return Value - 1000; }
-};
-
-TEST(SparseSetTest, AltStructSet) {
-  typedef SparseSet<Alt> ASet;
-  ASet Set;
-  Set.setUniverse(10);
-  Set.insert(Alt(1005));
-
-  ASet::iterator I = Set.find(5);
-  ASSERT_TRUE(I == Set.begin());
-  EXPECT_EQ(1005u, I->Value);
-
-  Set.insert(Alt(1006));
-  Set.insert(Alt(1006));
-  I = Set.erase(Set.begin());
-  ASSERT_TRUE(I == Set.begin());
-  EXPECT_EQ(1006u, I->Value);
-
-  EXPECT_FALSE(Set.erase(5));
-  EXPECT_TRUE(Set.erase(6));
-}
-
-TEST(SparseSetTest, PopBack) {
-  USet Set;
-  const unsigned UpperBound = 300;
-  Set.setUniverse(UpperBound);
-  for (unsigned i = 0; i < UpperBound; ++i)
-    Set.insert(i);
-
-  // Make sure pop back returns the values in the reverse order we
-  // inserted them.
-  unsigned Expected = UpperBound;
-  while (!Set.empty())
-    ASSERT_TRUE(--Expected == Set.pop_back_val());
-
-  // Insert again the same elements in the sparse set and make sure
-  // each insertion actually inserts the elements. I.e., check
-  // that the underlying data structure are properly cleared.
-  for (unsigned i = 0; i < UpperBound; ++i)
-    ASSERT_TRUE(Set.insert(i).second);
-}
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/StatisticTest.cpp b/gnu/llvm/llvm/unittests/ADT/StatisticTest.cpp
deleted file mode 100644
index e5a0cad26d6..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/StatisticTest.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-//===- llvm/unittest/ADT/StatisticTest.cpp - Statistic unit tests ---------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/Statistic.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gtest/gtest.h"
-using namespace llvm;
-
-using OptionalStatistic = Optional<std::pair<StringRef, unsigned>>;
-
-namespace {
-#define DEBUG_TYPE "unittest"
-STATISTIC(Counter, "Counts things");
-STATISTIC(Counter2, "Counts other things");
-ALWAYS_ENABLED_STATISTIC(AlwaysCounter, "Counts things always");
-
-#if LLVM_ENABLE_STATS
-static void
-extractCounters(const std::vector<std::pair<StringRef, unsigned>> &Range,
-                OptionalStatistic &S1, OptionalStatistic &S2) {
-  for (const auto &S : Range) {
-    if (S.first == "Counter")
-      S1 = S;
-    if (S.first == "Counter2")
-      S2 = S;
-  }
-}
-#endif
-
-TEST(StatisticTest, Count) {
-  EnableStatistics();
-
-  Counter = 0;
-  EXPECT_EQ(Counter, 0u);
-  Counter++;
-  Counter++;
-#if LLVM_ENABLE_STATS
-  EXPECT_EQ(Counter, 2u);
-#else
-  EXPECT_EQ(Counter, 0u);
-#endif
-
-  AlwaysCounter = 0;
-  EXPECT_EQ(AlwaysCounter, 0u);
-  AlwaysCounter++;
-  ++AlwaysCounter;
-  EXPECT_EQ(AlwaysCounter, 2u);
-}
-
-TEST(StatisticTest, Assign) {
-  EnableStatistics();
-
-  Counter = 2;
-#if LLVM_ENABLE_STATS
-  EXPECT_EQ(Counter, 2u);
-#else
-  EXPECT_EQ(Counter, 0u);
-#endif
-
-  AlwaysCounter = 2;
-  EXPECT_EQ(AlwaysCounter, 2u);
-}
-
-TEST(StatisticTest, API) {
-  EnableStatistics();
-  // Reset beforehand to make sure previous tests don't effect this one.
-  ResetStatistics();
-
-  Counter = 0;
-  EXPECT_EQ(Counter, 0u);
-  Counter++;
-  Counter++;
-#if LLVM_ENABLE_STATS
-  EXPECT_EQ(Counter, 2u);
-#else
-  EXPECT_EQ(Counter, 0u);
-#endif
-
-#if LLVM_ENABLE_STATS
-  {
-    const auto Range1 = GetStatistics();
-    EXPECT_NE(Range1.begin(), Range1.end());
-    EXPECT_EQ(Range1.begin() + 1, Range1.end());
-
-    OptionalStatistic S1;
-    OptionalStatistic S2;
-    extractCounters(Range1, S1, S2);
-
-    EXPECT_EQ(S1.hasValue(), true);
-    EXPECT_EQ(S2.hasValue(), false);
-  }
-
-  // Counter2 will be registered when it's first touched.
-  Counter2++;
-
-  {
-    const auto Range = GetStatistics();
-    EXPECT_NE(Range.begin(), Range.end());
-    EXPECT_EQ(Range.begin() + 2, Range.end());
-
-    OptionalStatistic S1;
-    OptionalStatistic S2;
-    extractCounters(Range, S1, S2);
-
-    EXPECT_EQ(S1.hasValue(), true);
-    EXPECT_EQ(S2.hasValue(), true);
-
-    EXPECT_EQ(S1->first, "Counter");
-    EXPECT_EQ(S1->second, 2u);
-
-    EXPECT_EQ(S2->first, "Counter2");
-    EXPECT_EQ(S2->second, 1u);
-  }
-#else
-  Counter2++;
-  auto &Range = GetStatistics();
-  EXPECT_EQ(Range.begin(), Range.end());
-#endif
-
-#if LLVM_ENABLE_STATS
-  // Check that resetting the statistics works correctly.
-  // It should empty the list and zero the counters.
-  ResetStatistics();
-  {
-    auto &Range = GetStatistics();
-    EXPECT_EQ(Range.begin(), Range.end());
-    EXPECT_EQ(Counter, 0u);
-    EXPECT_EQ(Counter2, 0u);
-    OptionalStatistic S1;
-    OptionalStatistic S2;
-    extractCounters(Range, S1, S2);
-    EXPECT_EQ(S1.hasValue(), false);
-    EXPECT_EQ(S2.hasValue(), false);
-  }
-
-  // Now check that they successfully re-register and count.
-  Counter++;
-  Counter2++;
-
-  {
-    auto &Range = GetStatistics();
-    EXPECT_EQ(Range.begin() + 2, Range.end());
-    EXPECT_EQ(Counter, 1u);
-    EXPECT_EQ(Counter2, 1u);
-
-    OptionalStatistic S1;
-    OptionalStatistic S2;
-    extractCounters(Range, S1, S2);
-
-    EXPECT_EQ(S1.hasValue(), true);
-    EXPECT_EQ(S2.hasValue(), true);
-
-    EXPECT_EQ(S1->first, "Counter");
-    EXPECT_EQ(S1->second, 1u);
-
-    EXPECT_EQ(S2->first, "Counter2");
-    EXPECT_EQ(S2->second, 1u);
-  }
-#else
-  // No need to test the output ResetStatistics(), there's nothing to reset so
-  // we can't tell if it failed anyway.
-  ResetStatistics();
-#endif
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/StringExtrasTest.cpp b/gnu/llvm/llvm/unittests/ADT/StringExtrasTest.cpp
deleted file mode 100644
index 3918a35fcef..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/StringExtrasTest.cpp
+++ /dev/null
@@ -1,276 +0,0 @@
-//===- StringExtrasTest.cpp - Unit tests for String extras ----------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/StringExtras.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-TEST(StringExtrasTest, isPrint) {
-  EXPECT_FALSE(isPrint('\0'));
-  EXPECT_FALSE(isPrint('\t'));
-  EXPECT_TRUE(isPrint('0'));
-  EXPECT_TRUE(isPrint('a'));
-  EXPECT_TRUE(isPrint('A'));
-  EXPECT_TRUE(isPrint(' '));
-  EXPECT_TRUE(isPrint('~'));
-  EXPECT_TRUE(isPrint('?'));
-}
-
-TEST(StringExtrasTest, isSpace) {
-  EXPECT_TRUE(isSpace(' '));
-  EXPECT_TRUE(isSpace('\t'));
-  EXPECT_TRUE(isSpace('\n'));
-  EXPECT_TRUE(isSpace('\v'));
-  EXPECT_TRUE(isSpace('\f'));
-  EXPECT_TRUE(isSpace('\v'));
-  EXPECT_FALSE(isSpace('\0'));
-  EXPECT_FALSE(isSpace('_'));
-}
-
-TEST(StringExtrasTest, Join) {
-  std::vector<std::string> Items;
-  EXPECT_EQ("", join(Items.begin(), Items.end(), " <sep> "));
-
-  Items = {"foo"};
-  EXPECT_EQ("foo", join(Items.begin(), Items.end(), " <sep> "));
-
-  Items = {"foo", "bar"};
-  EXPECT_EQ("foo <sep> bar", join(Items.begin(), Items.end(), " <sep> "));
-
-  Items = {"foo", "bar", "baz"};
-  EXPECT_EQ("foo <sep> bar <sep> baz",
-            join(Items.begin(), Items.end(), " <sep> "));
-}
-
-TEST(StringExtrasTest, JoinItems) {
-  const char *Foo = "foo";
-  std::string Bar = "bar";
-  llvm::StringRef Baz = "baz";
-  char X = 'x';
-
-  EXPECT_EQ("", join_items(" <sep> "));
-  EXPECT_EQ("", join_items('/'));
-
-  EXPECT_EQ("foo", join_items(" <sep> ", Foo));
-  EXPECT_EQ("foo", join_items('/', Foo));
-
-  EXPECT_EQ("foo <sep> bar", join_items(" <sep> ", Foo, Bar));
-  EXPECT_EQ("foo/bar", join_items('/', Foo, Bar));
-
-  EXPECT_EQ("foo <sep> bar <sep> baz", join_items(" <sep> ", Foo, Bar, Baz));
-  EXPECT_EQ("foo/bar/baz", join_items('/', Foo, Bar, Baz));
-
-  EXPECT_EQ("foo <sep> bar <sep> baz <sep> x",
-            join_items(" <sep> ", Foo, Bar, Baz, X));
-
-  EXPECT_EQ("foo/bar/baz/x", join_items('/', Foo, Bar, Baz, X));
-}
-
-TEST(StringExtrasTest, ToAndFromHex) {
-  std::vector<uint8_t> OddBytes = {0x5, 0xBD, 0x0D, 0x3E, 0xCD};
-  std::string OddStr = "05BD0D3ECD";
-  StringRef OddData(reinterpret_cast<const char *>(OddBytes.data()),
-                    OddBytes.size());
-  EXPECT_EQ(OddStr, toHex(OddData));
-  EXPECT_EQ(OddData, fromHex(StringRef(OddStr).drop_front()));
-  EXPECT_EQ(StringRef(OddStr).lower(), toHex(OddData, true));
-
-  std::vector<uint8_t> EvenBytes = {0xA5, 0xBD, 0x0D, 0x3E, 0xCD};
-  std::string EvenStr = "A5BD0D3ECD";
-  StringRef EvenData(reinterpret_cast<const char *>(EvenBytes.data()),
-                     EvenBytes.size());
-  EXPECT_EQ(EvenStr, toHex(EvenData));
-  EXPECT_EQ(EvenData, fromHex(EvenStr));
-  EXPECT_EQ(StringRef(EvenStr).lower(), toHex(EvenData, true));
-
-  std::string InvalidStr = "A5ZX";
-  std::string IgnoredOutput;
-  EXPECT_FALSE(tryGetFromHex(InvalidStr, IgnoredOutput));
-}
-
-TEST(StringExtrasTest, to_float) {
-  float F;
-  EXPECT_TRUE(to_float("4.7", F));
-  EXPECT_FLOAT_EQ(4.7f, F);
-
-  double D;
-  EXPECT_TRUE(to_float("4.7", D));
-  EXPECT_DOUBLE_EQ(4.7, D);
-
-  long double LD;
-  EXPECT_TRUE(to_float("4.7", LD));
-  EXPECT_DOUBLE_EQ(4.7, LD);
-
-  EXPECT_FALSE(to_float("foo", F));
-  EXPECT_FALSE(to_float("7.4 foo", F));
-  EXPECT_FLOAT_EQ(4.7f, F); // F should be unchanged
-}
-
-TEST(StringExtrasTest, printLowerCase) {
-  std::string str;
-  raw_string_ostream OS(str);
-  printLowerCase("ABCdefg01234.,&!~`'}\"", OS);
-  EXPECT_EQ("abcdefg01234.,&!~`'}\"", OS.str());
-}
-
-TEST(StringExtrasTest, printEscapedString) {
-  std::string str;
-  raw_string_ostream OS(str);
-  printEscapedString("ABCdef123&<>\\\"'\t", OS);
-  EXPECT_EQ("ABCdef123&<>\\\\\\22'\\09", OS.str());
-}
-
-TEST(StringExtrasTest, printHTMLEscaped) {
-  std::string str;
-  raw_string_ostream OS(str);
-  printHTMLEscaped("ABCdef123&<>\"'", OS);
-  EXPECT_EQ("ABCdef123&amp;&lt;&gt;&quot;&apos;", OS.str());
-}
-
-TEST(StringExtrasTest, ConvertToSnakeFromCamelCase) {
-  auto testConvertToSnakeCase = [](llvm::StringRef input,
-                                   llvm::StringRef expected) {
-    EXPECT_EQ(convertToSnakeFromCamelCase(input), expected.str());
-  };
-
-  testConvertToSnakeCase("OpName", "op_name");
-  testConvertToSnakeCase("opName", "op_name");
-  testConvertToSnakeCase("_OpName", "_op_name");
-  testConvertToSnakeCase("Op_Name", "op_name");
-  testConvertToSnakeCase("", "");
-  testConvertToSnakeCase("A", "a");
-  testConvertToSnakeCase("_", "_");
-  testConvertToSnakeCase("a", "a");
-  testConvertToSnakeCase("op_name", "op_name");
-  testConvertToSnakeCase("_op_name", "_op_name");
-  testConvertToSnakeCase("__op_name", "__op_name");
-  testConvertToSnakeCase("op__name", "op__name");
-}
-
-TEST(StringExtrasTest, ConvertToCamelFromSnakeCase) {
-  auto testConvertToCamelCase = [](bool capitalizeFirst, llvm::StringRef input,
-                                   llvm::StringRef expected) {
-    EXPECT_EQ(convertToCamelFromSnakeCase(input, capitalizeFirst),
-              expected.str());
-  };
-
-  testConvertToCamelCase(false, "op_name", "opName");
-  testConvertToCamelCase(false, "_op_name", "_opName");
-  testConvertToCamelCase(false, "__op_name", "_OpName");
-  testConvertToCamelCase(false, "op__name", "op_Name");
-  testConvertToCamelCase(false, "", "");
-  testConvertToCamelCase(false, "A", "A");
-  testConvertToCamelCase(false, "_", "_");
-  testConvertToCamelCase(false, "a", "a");
-  testConvertToCamelCase(false, "OpName", "OpName");
-  testConvertToCamelCase(false, "opName", "opName");
-  testConvertToCamelCase(false, "_OpName", "_OpName");
-  testConvertToCamelCase(false, "Op_Name", "Op_Name");
-  testConvertToCamelCase(true, "op_name", "OpName");
-  testConvertToCamelCase(true, "_op_name", "_opName");
-  testConvertToCamelCase(true, "__op_name", "_OpName");
-  testConvertToCamelCase(true, "op__name", "Op_Name");
-  testConvertToCamelCase(true, "", "");
-  testConvertToCamelCase(true, "A", "A");
-  testConvertToCamelCase(true, "_", "_");
-  testConvertToCamelCase(true, "a", "A");
-  testConvertToCamelCase(true, "OpName", "OpName");
-  testConvertToCamelCase(true, "_OpName", "_OpName");
-  testConvertToCamelCase(true, "Op_Name", "Op_Name");
-  testConvertToCamelCase(true, "opName", "OpName");
-}
-
-constexpr uint64_t MaxUint64 = std::numeric_limits<uint64_t>::max();
-constexpr int64_t MaxInt64 = std::numeric_limits<int64_t>::max();
-constexpr int64_t MinInt64 = std::numeric_limits<int64_t>::min();
-
-TEST(StringExtrasTest, UToStr) {
-  EXPECT_EQ("0", utostr(0));
-  EXPECT_EQ("0", utostr(0, /*isNeg=*/false));
-  EXPECT_EQ("1", utostr(1));
-  EXPECT_EQ("1", utostr(1, /*isNeg=*/false));
-  EXPECT_EQ(std::to_string(MaxUint64), utostr(MaxUint64));
-  EXPECT_EQ(std::to_string(MaxUint64), utostr(MaxUint64, /*isNeg=*/false));
-
-  EXPECT_EQ("-0", utostr(0, /*isNeg=*/true));
-  EXPECT_EQ("-1", utostr(1, /*isNeg=*/true));
-  EXPECT_EQ("-" + std::to_string(MaxInt64), utostr(MaxInt64, /*isNeg=*/true));
-  constexpr uint64_t MinusMinInt64 = -static_cast<uint64_t>(MinInt64);
-  EXPECT_EQ("-" + std::to_string(MinusMinInt64),
-            utostr(MinusMinInt64, /*isNeg=*/true));
-  EXPECT_EQ("-" + std::to_string(MaxUint64), utostr(MaxUint64, /*isNeg=*/true));
-}
-
-TEST(StringExtrasTest, IToStr) {
-  EXPECT_EQ("0", itostr(0));
-  EXPECT_EQ("1", itostr(1));
-  EXPECT_EQ("-1", itostr(-1));
-  EXPECT_EQ(std::to_string(MinInt64), itostr(MinInt64));
-  EXPECT_EQ(std::to_string(MaxInt64), itostr(MaxInt64));
-}
-
-TEST(StringExtrasTest, ListSeparator) {
-  ListSeparator LS;
-  StringRef S = LS;
-  EXPECT_EQ(S, "");
-  S = LS;
-  EXPECT_EQ(S, ", ");
-
-  ListSeparator LS2(" ");
-  S = LS2;
-  EXPECT_EQ(S, "");
-  S = LS2;
-  EXPECT_EQ(S, " ");
-}
-
-TEST(StringExtrasTest, toStringAPInt) {
-  bool isSigned;
-
-  EXPECT_EQ(toString(APInt(8, 0), 2, true, true), "0b0");
-  EXPECT_EQ(toString(APInt(8, 0), 8, true, true), "00");
-  EXPECT_EQ(toString(APInt(8, 0), 10, true, true), "0");
-  EXPECT_EQ(toString(APInt(8, 0), 16, true, true), "0x0");
-  EXPECT_EQ(toString(APInt(8, 0), 36, true, false), "0");
-
-  isSigned = false;
-  EXPECT_EQ(toString(APInt(8, 255, isSigned), 2, isSigned, true), "0b11111111");
-  EXPECT_EQ(toString(APInt(8, 255, isSigned), 8, isSigned, true), "0377");
-  EXPECT_EQ(toString(APInt(8, 255, isSigned), 10, isSigned, true), "255");
-  EXPECT_EQ(toString(APInt(8, 255, isSigned), 16, isSigned, true), "0xFF");
-  EXPECT_EQ(toString(APInt(8, 255, isSigned), 36, isSigned, false), "73");
-
-  isSigned = true;
-  EXPECT_EQ(toString(APInt(8, 255, isSigned), 2, isSigned, true), "-0b1");
-  EXPECT_EQ(toString(APInt(8, 255, isSigned), 8, isSigned, true), "-01");
-  EXPECT_EQ(toString(APInt(8, 255, isSigned), 10, isSigned, true), "-1");
-  EXPECT_EQ(toString(APInt(8, 255, isSigned), 16, isSigned, true), "-0x1");
-  EXPECT_EQ(toString(APInt(8, 255, isSigned), 36, isSigned, false), "-1");
-}
-
-TEST(StringExtrasTest, toStringAPSInt) {
-  bool isUnsigned;
-
-  EXPECT_EQ(toString(APSInt(APInt(8, 0), false), 2), "0");
-  EXPECT_EQ(toString(APSInt(APInt(8, 0), false), 8), "0");
-  EXPECT_EQ(toString(APSInt(APInt(8, 0), false), 10), "0");
-  EXPECT_EQ(toString(APSInt(APInt(8, 0), false), 16), "0");
-
-  isUnsigned = true;
-  EXPECT_EQ(toString(APSInt(APInt(8, 255), isUnsigned), 2), "11111111");
-  EXPECT_EQ(toString(APSInt(APInt(8, 255), isUnsigned), 8), "377");
-  EXPECT_EQ(toString(APSInt(APInt(8, 255), isUnsigned), 10), "255");
-  EXPECT_EQ(toString(APSInt(APInt(8, 255), isUnsigned), 16), "FF");
-
-  isUnsigned = false;
-  EXPECT_EQ(toString(APSInt(APInt(8, 255), isUnsigned), 2), "-1");
-  EXPECT_EQ(toString(APSInt(APInt(8, 255), isUnsigned), 8), "-1");
-  EXPECT_EQ(toString(APSInt(APInt(8, 255), isUnsigned), 10), "-1");
-  EXPECT_EQ(toString(APSInt(APInt(8, 255), isUnsigned), 16), "-1");
-}
diff --git a/gnu/llvm/llvm/unittests/ADT/StringMapTest.cpp b/gnu/llvm/llvm/unittests/ADT/StringMapTest.cpp
deleted file mode 100644
index 98fbd6e1df5..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/StringMapTest.cpp
+++ /dev/null
@@ -1,616 +0,0 @@
-//===- llvm/unittest/ADT/StringMapMap.cpp - StringMap unit tests ----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/StringMap.h"
-#include "llvm/ADT/Twine.h"
-#include "llvm/Support/DataTypes.h"
-#include "gtest/gtest.h"
-#include <limits>
-#include <tuple>
-using namespace llvm;
-
-namespace {
-
-// Test fixture
-class StringMapTest : public testing::Test {
-protected:
-  StringMap<uint32_t> testMap;
-
-  static const char testKey[];
-  static const uint32_t testValue;
-  static const char* testKeyFirst;
-  static size_t testKeyLength;
-  static const std::string testKeyStr;
-
-  void assertEmptyMap() {
-    // Size tests
-    EXPECT_EQ(0u, testMap.size());
-    EXPECT_TRUE(testMap.empty());
-
-    // Iterator tests
-    EXPECT_TRUE(testMap.begin() == testMap.end());
-
-    // Lookup tests
-    EXPECT_EQ(0u, testMap.count(testKey));
-    EXPECT_EQ(0u, testMap.count(StringRef(testKeyFirst, testKeyLength)));
-    EXPECT_EQ(0u, testMap.count(testKeyStr));
-    EXPECT_TRUE(testMap.find(testKey) == testMap.end());
-    EXPECT_TRUE(testMap.find(StringRef(testKeyFirst, testKeyLength)) == 
-                testMap.end());
-    EXPECT_TRUE(testMap.find(testKeyStr) == testMap.end());
-  }
-
-  void assertSingleItemMap() {
-    // Size tests
-    EXPECT_EQ(1u, testMap.size());
-    EXPECT_FALSE(testMap.begin() == testMap.end());
-    EXPECT_FALSE(testMap.empty());
-
-    // Iterator tests
-    StringMap<uint32_t>::iterator it = testMap.begin();
-    EXPECT_STREQ(testKey, it->first().data());
-    EXPECT_EQ(testValue, it->second);
-    ++it;
-    EXPECT_TRUE(it == testMap.end());
-
-    // Lookup tests
-    EXPECT_EQ(1u, testMap.count(testKey));
-    EXPECT_EQ(1u, testMap.count(StringRef(testKeyFirst, testKeyLength)));
-    EXPECT_EQ(1u, testMap.count(testKeyStr));
-    EXPECT_TRUE(testMap.find(testKey) == testMap.begin());
-    EXPECT_TRUE(testMap.find(StringRef(testKeyFirst, testKeyLength)) == 
-                testMap.begin());
-    EXPECT_TRUE(testMap.find(testKeyStr) == testMap.begin());
-  }
-};
-
-const char StringMapTest::testKey[] = "key";
-const uint32_t StringMapTest::testValue = 1u;
-const char* StringMapTest::testKeyFirst = testKey;
-size_t StringMapTest::testKeyLength = sizeof(testKey) - 1;
-const std::string StringMapTest::testKeyStr(testKey);
-
-struct CountCopyAndMove {
-  CountCopyAndMove() = default;
-  CountCopyAndMove(const CountCopyAndMove &) { copy = 1; }
-  CountCopyAndMove(CountCopyAndMove &&) { move = 1; }
-  void operator=(const CountCopyAndMove &) { ++copy; }
-  void operator=(CountCopyAndMove &&) { ++move; }
-  int copy = 0;
-  int move = 0;
-};
-
-// Empty map tests.
-TEST_F(StringMapTest, EmptyMapTest) {
-  assertEmptyMap();
-}
-
-// Constant map tests.
-TEST_F(StringMapTest, ConstEmptyMapTest) {
-  const StringMap<uint32_t>& constTestMap = testMap;
-
-  // Size tests
-  EXPECT_EQ(0u, constTestMap.size());
-  EXPECT_TRUE(constTestMap.empty());
-
-  // Iterator tests
-  EXPECT_TRUE(constTestMap.begin() == constTestMap.end());
-
-  // Lookup tests
-  EXPECT_EQ(0u, constTestMap.count(testKey));
-  EXPECT_EQ(0u, constTestMap.count(StringRef(testKeyFirst, testKeyLength)));
-  EXPECT_EQ(0u, constTestMap.count(testKeyStr));
-  EXPECT_TRUE(constTestMap.find(testKey) == constTestMap.end());
-  EXPECT_TRUE(constTestMap.find(StringRef(testKeyFirst, testKeyLength)) ==
-              constTestMap.end());
-  EXPECT_TRUE(constTestMap.find(testKeyStr) == constTestMap.end());
-}
-
-// A map with a single entry.
-TEST_F(StringMapTest, SingleEntryMapTest) {
-  testMap[testKey] = testValue;
-  assertSingleItemMap();
-}
-
-// Test clear() method.
-TEST_F(StringMapTest, ClearTest) {
-  testMap[testKey] = testValue;
-  testMap.clear();
-  assertEmptyMap();
-}
-
-// Test erase(iterator) method.
-TEST_F(StringMapTest, EraseIteratorTest) {
-  testMap[testKey] = testValue;
-  testMap.erase(testMap.begin());
-  assertEmptyMap();
-}
-
-// Test erase(value) method.
-TEST_F(StringMapTest, EraseValueTest) {
-  testMap[testKey] = testValue;
-  testMap.erase(testKey);
-  assertEmptyMap();
-}
-
-// Test inserting two values and erasing one.
-TEST_F(StringMapTest, InsertAndEraseTest) {
-  testMap[testKey] = testValue;
-  testMap["otherKey"] = 2;
-  testMap.erase("otherKey");
-  assertSingleItemMap();
-}
-
-TEST_F(StringMapTest, SmallFullMapTest) {
-  // StringMap has a tricky corner case when the map is small (<8 buckets) and
-  // it fills up through a balanced pattern of inserts and erases. This can
-  // lead to inf-loops in some cases (PR13148) so we test it explicitly here.
-  llvm::StringMap<int> Map(2);
-
-  Map["eins"] = 1;
-  Map["zwei"] = 2;
-  Map["drei"] = 3;
-  Map.erase("drei");
-  Map.erase("eins");
-  Map["veir"] = 4;
-  Map["funf"] = 5;
-
-  EXPECT_EQ(3u, Map.size());
-  EXPECT_EQ(0, Map.lookup("eins"));
-  EXPECT_EQ(2, Map.lookup("zwei"));
-  EXPECT_EQ(0, Map.lookup("drei"));
-  EXPECT_EQ(4, Map.lookup("veir"));
-  EXPECT_EQ(5, Map.lookup("funf"));
-}
-
-TEST_F(StringMapTest, CopyCtorTest) {
-  llvm::StringMap<int> Map;
-
-  Map["eins"] = 1;
-  Map["zwei"] = 2;
-  Map["drei"] = 3;
-  Map.erase("drei");
-  Map.erase("eins");
-  Map["veir"] = 4;
-  Map["funf"] = 5;
-
-  EXPECT_EQ(3u, Map.size());
-  EXPECT_EQ(0, Map.lookup("eins"));
-  EXPECT_EQ(2, Map.lookup("zwei"));
-  EXPECT_EQ(0, Map.lookup("drei"));
-  EXPECT_EQ(4, Map.lookup("veir"));
-  EXPECT_EQ(5, Map.lookup("funf"));
-
-  llvm::StringMap<int> Map2(Map);
-  EXPECT_EQ(3u, Map2.size());
-  EXPECT_EQ(0, Map2.lookup("eins"));
-  EXPECT_EQ(2, Map2.lookup("zwei"));
-  EXPECT_EQ(0, Map2.lookup("drei"));
-  EXPECT_EQ(4, Map2.lookup("veir"));
-  EXPECT_EQ(5, Map2.lookup("funf"));
-}
-
-// A more complex iteration test.
-TEST_F(StringMapTest, IterationTest) {
-  bool visited[100];
-
-  // Insert 100 numbers into the map
-  for (int i = 0; i < 100; ++i) {
-    std::stringstream ss;
-    ss << "key_" << i;
-    testMap[ss.str()] = i;
-    visited[i] = false;
-  }
-
-  // Iterate over all numbers and mark each one found.
-  for (StringMap<uint32_t>::iterator it = testMap.begin();
-      it != testMap.end(); ++it) {
-    std::stringstream ss;
-    ss << "key_" << it->second;
-    ASSERT_STREQ(ss.str().c_str(), it->first().data());
-    visited[it->second] = true;
-  }
-
-  // Ensure every number was visited.
-  for (int i = 0; i < 100; ++i) {
-    ASSERT_TRUE(visited[i]) << "Entry #" << i << " was never visited";
-  }
-}
-
-// Test StringMapEntry::Create() method.
-TEST_F(StringMapTest, StringMapEntryTest) {
-  MallocAllocator Allocator;
-  StringMap<uint32_t>::value_type *entry =
-      StringMap<uint32_t>::value_type::Create(
-          StringRef(testKeyFirst, testKeyLength), Allocator, 1u);
-  EXPECT_STREQ(testKey, entry->first().data());
-  EXPECT_EQ(1u, entry->second);
-  entry->Destroy(Allocator);
-}
-
-// Test insert() method.
-TEST_F(StringMapTest, InsertTest) {
-  SCOPED_TRACE("InsertTest");
-  testMap.insert(
-      StringMap<uint32_t>::value_type::Create(
-          StringRef(testKeyFirst, testKeyLength),
-          testMap.getAllocator(), 1u));
-  assertSingleItemMap();
-}
-
-// Test insert(pair<K, V>) method
-TEST_F(StringMapTest, InsertPairTest) {
-  bool Inserted;
-  StringMap<uint32_t>::iterator NewIt;
-  std::tie(NewIt, Inserted) =
-      testMap.insert(std::make_pair(testKeyFirst, testValue));
-  EXPECT_EQ(1u, testMap.size());
-  EXPECT_EQ(testValue, testMap[testKeyFirst]);
-  EXPECT_EQ(testKeyFirst, NewIt->first());
-  EXPECT_EQ(testValue, NewIt->second);
-  EXPECT_TRUE(Inserted);
-
-  StringMap<uint32_t>::iterator ExistingIt;
-  std::tie(ExistingIt, Inserted) =
-      testMap.insert(std::make_pair(testKeyFirst, testValue + 1));
-  EXPECT_EQ(1u, testMap.size());
-  EXPECT_EQ(testValue, testMap[testKeyFirst]);
-  EXPECT_FALSE(Inserted);
-  EXPECT_EQ(NewIt, ExistingIt);
-}
-
-// Test insert(pair<K, V>) method when rehashing occurs
-TEST_F(StringMapTest, InsertRehashingPairTest) {
-  // Check that the correct iterator is returned when the inserted element is
-  // moved to a different bucket during internal rehashing. This depends on
-  // the particular key, and the implementation of StringMap and HashString.
-  // Changes to those might result in this test not actually checking that.
-  StringMap<uint32_t> t(0);
-  EXPECT_EQ(0u, t.getNumBuckets());
-
-  StringMap<uint32_t>::iterator It =
-    t.insert(std::make_pair("abcdef", 42)).first;
-  EXPECT_EQ(16u, t.getNumBuckets());
-  EXPECT_EQ("abcdef", It->first());
-  EXPECT_EQ(42u, It->second);
-}
-
-TEST_F(StringMapTest, InsertOrAssignTest) {
-  struct A : CountCopyAndMove {
-    A(int v) : v(v) {}
-    int v;
-  };
-  StringMap<A> t(0);
-
-  auto try1 = t.insert_or_assign("A", A(1));
-  EXPECT_TRUE(try1.second);
-  EXPECT_EQ(1, try1.first->second.v);
-  EXPECT_EQ(1, try1.first->second.move);
-
-  auto try2 = t.insert_or_assign("A", A(2));
-  EXPECT_FALSE(try2.second);
-  EXPECT_EQ(2, try2.first->second.v);
-  EXPECT_EQ(2, try1.first->second.move);
-
-  EXPECT_EQ(try1.first, try2.first);
-  EXPECT_EQ(0, try1.first->second.copy);
-}
-
-TEST_F(StringMapTest, IterMapKeys) {
-  StringMap<int> Map;
-  Map["A"] = 1;
-  Map["B"] = 2;
-  Map["C"] = 3;
-  Map["D"] = 3;
-
-  auto Keys = to_vector<4>(Map.keys());
-  llvm::sort(Keys);
-
-  SmallVector<StringRef, 4> Expected = {"A", "B", "C", "D"};
-  EXPECT_EQ(Expected, Keys);
-}
-
-// Create a non-default constructable value
-struct StringMapTestStruct {
-  StringMapTestStruct(int i) : i(i) {}
-  StringMapTestStruct() = delete;
-  int i;
-};
-
-TEST_F(StringMapTest, NonDefaultConstructable) {
-  StringMap<StringMapTestStruct> t;
-  t.insert(std::make_pair("Test", StringMapTestStruct(123)));
-  StringMap<StringMapTestStruct>::iterator iter = t.find("Test");
-  ASSERT_NE(iter, t.end());
-  ASSERT_EQ(iter->second.i, 123);
-}
-
-struct Immovable {
-  Immovable() {}
-  Immovable(Immovable&&) = delete; // will disable the other special members
-};
-
-struct MoveOnly {
-  int i;
-  MoveOnly(int i) : i(i) {}
-  MoveOnly(const Immovable&) : i(0) {}
-  MoveOnly(MoveOnly &&RHS) : i(RHS.i) {}
-  MoveOnly &operator=(MoveOnly &&RHS) {
-    i = RHS.i;
-    return *this;
-  }
-
-private:
-  MoveOnly(const MoveOnly &) = delete;
-  MoveOnly &operator=(const MoveOnly &) = delete;
-};
-
-TEST_F(StringMapTest, MoveOnly) {
-  StringMap<MoveOnly> t;
-  t.insert(std::make_pair("Test", MoveOnly(42)));
-  StringRef Key = "Test";
-  StringMapEntry<MoveOnly>::Create(Key, t.getAllocator(), MoveOnly(42))
-      ->Destroy(t.getAllocator());
-}
-
-TEST_F(StringMapTest, CtorArg) {
-  StringRef Key = "Test";
-  MallocAllocator Allocator;
-  StringMapEntry<MoveOnly>::Create(Key, Allocator, Immovable())
-      ->Destroy(Allocator);
-}
-
-TEST_F(StringMapTest, MoveConstruct) {
-  StringMap<int> A;
-  A["x"] = 42;
-  StringMap<int> B = std::move(A);
-  ASSERT_EQ(A.size(), 0u);
-  ASSERT_EQ(B.size(), 1u);
-  ASSERT_EQ(B["x"], 42);
-  ASSERT_EQ(B.count("y"), 0u);
-}
-
-TEST_F(StringMapTest, MoveAssignment) {
-  StringMap<int> A;
-  A["x"] = 42;
-  StringMap<int> B;
-  B["y"] = 117;
-  A = std::move(B);
-  ASSERT_EQ(A.size(), 1u);
-  ASSERT_EQ(B.size(), 0u);
-  ASSERT_EQ(A["y"], 117);
-  ASSERT_EQ(B.count("x"), 0u);
-}
-
-TEST_F(StringMapTest, EqualEmpty) {
-  StringMap<int> A;
-  StringMap<int> B;
-  ASSERT_TRUE(A == B);
-  ASSERT_FALSE(A != B);
-  ASSERT_TRUE(A == A); // self check
-}
-
-TEST_F(StringMapTest, EqualWithValues) {
-  StringMap<int> A;
-  A["A"] = 1;
-  A["B"] = 2;
-  A["C"] = 3;
-  A["D"] = 3;
-
-  StringMap<int> B;
-  B["A"] = 1;
-  B["B"] = 2;
-  B["C"] = 3;
-  B["D"] = 3;
-
-  ASSERT_TRUE(A == B);
-  ASSERT_TRUE(B == A);
-  ASSERT_FALSE(A != B);
-  ASSERT_FALSE(B != A);
-  ASSERT_TRUE(A == A); // self check
-}
-
-TEST_F(StringMapTest, NotEqualMissingKeys) {
-  StringMap<int> A;
-  A["A"] = 1;
-  A["B"] = 2;
-
-  StringMap<int> B;
-  B["A"] = 1;
-  B["B"] = 2;
-  B["C"] = 3;
-  B["D"] = 3;
-
-  ASSERT_FALSE(A == B);
-  ASSERT_FALSE(B == A);
-  ASSERT_TRUE(A != B);
-  ASSERT_TRUE(B != A);
-}
-
-TEST_F(StringMapTest, NotEqualWithDifferentValues) {
-  StringMap<int> A;
-  A["A"] = 1;
-  A["B"] = 2;
-  A["C"] = 100;
-  A["D"] = 3;
-
-  StringMap<int> B;
-  B["A"] = 1;
-  B["B"] = 2;
-  B["C"] = 3;
-  B["D"] = 3;
-
-  ASSERT_FALSE(A == B);
-  ASSERT_FALSE(B == A);
-  ASSERT_TRUE(A != B);
-  ASSERT_TRUE(B != A);
-}
-
-struct Countable {
-  int &InstanceCount;
-  int Number;
-  Countable(int Number, int &InstanceCount)
-      : InstanceCount(InstanceCount), Number(Number) {
-    ++InstanceCount;
-  }
-  Countable(Countable &&C) : InstanceCount(C.InstanceCount), Number(C.Number) {
-    ++InstanceCount;
-    C.Number = -1;
-  }
-  Countable(const Countable &C)
-      : InstanceCount(C.InstanceCount), Number(C.Number) {
-    ++InstanceCount;
-  }
-  Countable &operator=(Countable C) {
-    Number = C.Number;
-    return *this;
-  }
-  ~Countable() { --InstanceCount; }
-};
-
-TEST_F(StringMapTest, MoveDtor) {
-  int InstanceCount = 0;
-  StringMap<Countable> A;
-  A.insert(std::make_pair("x", Countable(42, InstanceCount)));
-  ASSERT_EQ(InstanceCount, 1);
-  auto I = A.find("x");
-  ASSERT_NE(I, A.end());
-  ASSERT_EQ(I->second.Number, 42);
-
-  StringMap<Countable> B;
-  B = std::move(A);
-  ASSERT_EQ(InstanceCount, 1);
-  ASSERT_TRUE(A.empty());
-  I = B.find("x");
-  ASSERT_NE(I, B.end());
-  ASSERT_EQ(I->second.Number, 42);
-
-  B = StringMap<Countable>();
-  ASSERT_EQ(InstanceCount, 0);
-  ASSERT_TRUE(B.empty());
-}
-
-namespace {
-// Simple class that counts how many moves and copy happens when growing a map
-struct CountCtorCopyAndMove {
-  static unsigned Ctor;
-  static unsigned Move;
-  static unsigned Copy;
-  int Data = 0;
-  CountCtorCopyAndMove(int Data) : Data(Data) { Ctor++; }
-  CountCtorCopyAndMove() { Ctor++; }
-
-  CountCtorCopyAndMove(const CountCtorCopyAndMove &) { Copy++; }
-  CountCtorCopyAndMove &operator=(const CountCtorCopyAndMove &) {
-    Copy++;
-    return *this;
-  }
-  CountCtorCopyAndMove(CountCtorCopyAndMove &&) { Move++; }
-  CountCtorCopyAndMove &operator=(const CountCtorCopyAndMove &&) {
-    Move++;
-    return *this;
-  }
-};
-unsigned CountCtorCopyAndMove::Copy = 0;
-unsigned CountCtorCopyAndMove::Move = 0;
-unsigned CountCtorCopyAndMove::Ctor = 0;
-
-} // anonymous namespace
-
-// Make sure creating the map with an initial size of N actually gives us enough
-// buckets to insert N items without increasing allocation size.
-TEST(StringMapCustomTest, InitialSizeTest) {
-  // 1 is an "edge value", 32 is an arbitrary power of two, and 67 is an
-  // arbitrary prime, picked without any good reason.
-  for (auto Size : {1, 32, 67}) {
-    StringMap<CountCtorCopyAndMove> Map(Size);
-    auto NumBuckets = Map.getNumBuckets();
-    CountCtorCopyAndMove::Move = 0;
-    CountCtorCopyAndMove::Copy = 0;
-    for (int i = 0; i < Size; ++i)
-      Map.insert(std::pair<std::string, CountCtorCopyAndMove>(
-          std::piecewise_construct, std::forward_as_tuple(Twine(i).str()),
-          std::forward_as_tuple(i)));
-    // After the initial move, the map will move the Elts in the Entry.
-    EXPECT_EQ((unsigned)Size * 2, CountCtorCopyAndMove::Move);
-    // We copy once the pair from the Elts vector
-    EXPECT_EQ(0u, CountCtorCopyAndMove::Copy);
-    // Check that the map didn't grow
-    EXPECT_EQ(Map.getNumBuckets(), NumBuckets);
-  }
-}
-
-TEST(StringMapCustomTest, BracketOperatorCtor) {
-  StringMap<CountCtorCopyAndMove> Map;
-  CountCtorCopyAndMove::Ctor = 0;
-  Map["abcd"];
-  EXPECT_EQ(1u, CountCtorCopyAndMove::Ctor);
-  // Test that operator[] does not create a value when it is already in the map
-  CountCtorCopyAndMove::Ctor = 0;
-  Map["abcd"];
-  EXPECT_EQ(0u, CountCtorCopyAndMove::Ctor);
-}
-
-namespace {
-struct NonMoveableNonCopyableType {
-  int Data = 0;
-  NonMoveableNonCopyableType() = default;
-  NonMoveableNonCopyableType(int Data) : Data(Data) {}
-  NonMoveableNonCopyableType(const NonMoveableNonCopyableType &) = delete;
-  NonMoveableNonCopyableType(NonMoveableNonCopyableType &&) = delete;
-};
-}
-
-// Test that we can "emplace" an element in the map without involving map/move
-TEST(StringMapCustomTest, EmplaceTest) {
-  StringMap<NonMoveableNonCopyableType> Map;
-  Map.try_emplace("abcd", 42);
-  EXPECT_EQ(1u, Map.count("abcd"));
-  EXPECT_EQ(42, Map["abcd"].Data);
-}
-
-// Test that StringMapEntryBase can handle size_t wide sizes.
-TEST(StringMapCustomTest, StringMapEntryBaseSize) {
-  size_t LargeValue;
-
-  // Test that the entry can represent max-unsigned.
-  if (sizeof(size_t) <= sizeof(unsigned))
-    LargeValue = std::numeric_limits<unsigned>::max();
-  else
-    LargeValue = std::numeric_limits<unsigned>::max() + 1ULL;
-  StringMapEntryBase LargeBase(LargeValue);
-  EXPECT_EQ(LargeValue, LargeBase.getKeyLength());
-
-  // Test that the entry can hold at least max size_t.
-  LargeValue = std::numeric_limits<size_t>::max();
-  StringMapEntryBase LargerBase(LargeValue);
-  LargeValue = std::numeric_limits<size_t>::max();
-  EXPECT_EQ(LargeValue, LargerBase.getKeyLength());
-}
-
-// Test that StringMapEntry can handle size_t wide sizes.
-TEST(StringMapCustomTest, StringMapEntrySize) {
-  size_t LargeValue;
-
-  // Test that the entry can represent max-unsigned.
-  if (sizeof(size_t) <= sizeof(unsigned))
-    LargeValue = std::numeric_limits<unsigned>::max();
-  else
-    LargeValue = std::numeric_limits<unsigned>::max() + 1ULL;
-  StringMapEntry<int> LargeEntry(LargeValue);
-  StringRef Key = LargeEntry.getKey();
-  EXPECT_EQ(LargeValue, Key.size());
-
-  // Test that the entry can hold at least max size_t.
-  LargeValue = std::numeric_limits<size_t>::max();
-  StringMapEntry<int> LargerEntry(LargeValue);
-  Key = LargerEntry.getKey();
-  EXPECT_EQ(LargeValue, Key.size());
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/StringRefTest.cpp b/gnu/llvm/llvm/unittests/ADT/StringRefTest.cpp
deleted file mode 100644
index 87285e0e61c..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/StringRefTest.cpp
+++ /dev/null
@@ -1,1111 +0,0 @@
-//===- llvm/unittest/ADT/StringRefTest.cpp - StringRef unit tests ---------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/StringRef.h"
-#include "llvm/ADT/Hashing.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/StringExtras.h"
-#include "llvm/Support/Allocator.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gtest/gtest.h"
-using namespace llvm;
-
-namespace llvm {
-
-std::ostream &operator<<(std::ostream &OS, const StringRef &S) {
-  OS << S.str();
-  return OS;
-}
-
-std::ostream &operator<<(std::ostream &OS,
-                         const std::pair<StringRef, StringRef> &P) {
-  OS << "(" << P.first << ", " << P.second << ")";
-  return OS;
-}
-
-}
-
-// Check that we can't accidentally assign a temporary std::string to a
-// StringRef. (Unfortunately we can't make use of the same thing with
-// constructors.)
-static_assert(
-    !std::is_assignable<StringRef&, std::string>::value,
-    "Assigning from prvalue std::string");
-static_assert(
-    !std::is_assignable<StringRef&, std::string &&>::value,
-    "Assigning from xvalue std::string");
-static_assert(
-    std::is_assignable<StringRef&, std::string &>::value,
-    "Assigning from lvalue std::string");
-static_assert(
-    std::is_assignable<StringRef&, const char *>::value,
-    "Assigning from prvalue C string");
-static_assert(
-    std::is_assignable<StringRef&, const char * &&>::value,
-    "Assigning from xvalue C string");
-static_assert(
-    std::is_assignable<StringRef&, const char * &>::value,
-    "Assigning from lvalue C string");
-
-namespace {
-TEST(StringRefTest, Construction) {
-  EXPECT_EQ("", StringRef());
-  EXPECT_EQ("hello", StringRef("hello"));
-  EXPECT_EQ("hello", StringRef("hello world", 5));
-  EXPECT_EQ("hello", StringRef(std::string("hello")));
-#if __cplusplus > 201402L
-  EXPECT_EQ("hello", StringRef(std::string_view("hello")));
-#endif
-}
-
-TEST(StringRefTest, Conversion) {
-  EXPECT_EQ("hello", std::string(StringRef("hello")));
-#if __cplusplus > 201402L
-  EXPECT_EQ("hello", std::string_view(StringRef("hello")));
-#endif
-}
-
-TEST(StringRefTest, EmptyInitializerList) {
-  StringRef S = {};
-  EXPECT_TRUE(S.empty());
-
-  S = {};
-  EXPECT_TRUE(S.empty());
-}
-
-TEST(StringRefTest, Iteration) {
-  StringRef S("hello");
-  const char *p = "hello";
-  for (const char *it = S.begin(), *ie = S.end(); it != ie; ++it, ++p)
-    EXPECT_EQ(*it, *p);
-}
-
-TEST(StringRefTest, StringOps) {
-  const char *p = "hello";
-  EXPECT_EQ(p, StringRef(p, 0).data());
-  EXPECT_TRUE(StringRef().empty());
-  EXPECT_EQ((size_t) 5, StringRef("hello").size());
-  EXPECT_EQ(-1, StringRef("aab").compare("aad"));
-  EXPECT_EQ( 0, StringRef("aab").compare("aab"));
-  EXPECT_EQ( 1, StringRef("aab").compare("aaa"));
-  EXPECT_EQ(-1, StringRef("aab").compare("aabb"));
-  EXPECT_EQ( 1, StringRef("aab").compare("aa"));
-  EXPECT_EQ( 1, StringRef("\xFF").compare("\1"));
-
-  EXPECT_EQ(-1, StringRef("AaB").compare_insensitive("aAd"));
-  EXPECT_EQ( 0, StringRef("AaB").compare_insensitive("aab"));
-  EXPECT_EQ( 1, StringRef("AaB").compare_insensitive("AAA"));
-  EXPECT_EQ(-1, StringRef("AaB").compare_insensitive("aaBb"));
-  EXPECT_EQ(-1, StringRef("AaB").compare_insensitive("bb"));
-  EXPECT_EQ( 1, StringRef("aaBb").compare_insensitive("AaB"));
-  EXPECT_EQ( 1, StringRef("bb").compare_insensitive("AaB"));
-  EXPECT_EQ( 1, StringRef("AaB").compare_insensitive("aA"));
-  EXPECT_EQ( 1, StringRef("\xFF").compare_insensitive("\1"));
-
-  EXPECT_EQ(-1, StringRef("aab").compare_numeric("aad"));
-  EXPECT_EQ( 0, StringRef("aab").compare_numeric("aab"));
-  EXPECT_EQ( 1, StringRef("aab").compare_numeric("aaa"));
-  EXPECT_EQ(-1, StringRef("aab").compare_numeric("aabb"));
-  EXPECT_EQ( 1, StringRef("aab").compare_numeric("aa"));
-  EXPECT_EQ(-1, StringRef("1").compare_numeric("10"));
-  EXPECT_EQ( 0, StringRef("10").compare_numeric("10"));
-  EXPECT_EQ( 0, StringRef("10a").compare_numeric("10a"));
-  EXPECT_EQ( 1, StringRef("2").compare_numeric("1"));
-  EXPECT_EQ( 0, StringRef("llvm_v1i64_ty").compare_numeric("llvm_v1i64_ty"));
-  EXPECT_EQ( 1, StringRef("\xFF").compare_numeric("\1"));
-  EXPECT_EQ( 1, StringRef("V16").compare_numeric("V1_q0"));
-  EXPECT_EQ(-1, StringRef("V1_q0").compare_numeric("V16"));
-  EXPECT_EQ(-1, StringRef("V8_q0").compare_numeric("V16"));
-  EXPECT_EQ( 1, StringRef("V16").compare_numeric("V8_q0"));
-  EXPECT_EQ(-1, StringRef("V1_q0").compare_numeric("V8_q0"));
-  EXPECT_EQ( 1, StringRef("V8_q0").compare_numeric("V1_q0"));
-}
-
-TEST(StringRefTest, Operators) {
-  EXPECT_EQ("", StringRef());
-  EXPECT_TRUE(StringRef("aab") < StringRef("aad"));
-  EXPECT_FALSE(StringRef("aab") < StringRef("aab"));
-  EXPECT_TRUE(StringRef("aab") <= StringRef("aab"));
-  EXPECT_FALSE(StringRef("aab") <= StringRef("aaa"));
-  EXPECT_TRUE(StringRef("aad") > StringRef("aab"));
-  EXPECT_FALSE(StringRef("aab") > StringRef("aab"));
-  EXPECT_TRUE(StringRef("aab") >= StringRef("aab"));
-  EXPECT_FALSE(StringRef("aaa") >= StringRef("aab"));
-  EXPECT_EQ(StringRef("aab"), StringRef("aab"));
-  EXPECT_FALSE(StringRef("aab") == StringRef("aac"));
-  EXPECT_FALSE(StringRef("aab") != StringRef("aab"));
-  EXPECT_TRUE(StringRef("aab") != StringRef("aac"));
-  EXPECT_EQ('a', StringRef("aab")[1]);
-}
-
-TEST(StringRefTest, Substr) {
-  StringRef Str("hello");
-  EXPECT_EQ("lo", Str.substr(3));
-  EXPECT_EQ("", Str.substr(100));
-  EXPECT_EQ("hello", Str.substr(0, 100));
-  EXPECT_EQ("o", Str.substr(4, 10));
-}
-
-TEST(StringRefTest, Slice) {
-  StringRef Str("hello");
-  EXPECT_EQ("l", Str.slice(2, 3));
-  EXPECT_EQ("ell", Str.slice(1, 4));
-  EXPECT_EQ("llo", Str.slice(2, 100));
-  EXPECT_EQ("", Str.slice(2, 1));
-  EXPECT_EQ("", Str.slice(10, 20));
-}
-
-TEST(StringRefTest, Split) {
-  StringRef Str("hello");
-  EXPECT_EQ(std::make_pair(StringRef("hello"), StringRef("")),
-            Str.split('X'));
-  EXPECT_EQ(std::make_pair(StringRef("h"), StringRef("llo")),
-            Str.split('e'));
-  EXPECT_EQ(std::make_pair(StringRef(""), StringRef("ello")),
-            Str.split('h'));
-  EXPECT_EQ(std::make_pair(StringRef("he"), StringRef("lo")),
-            Str.split('l'));
-  EXPECT_EQ(std::make_pair(StringRef("hell"), StringRef("")),
-            Str.split('o'));
-
-  EXPECT_EQ(std::make_pair(StringRef("hello"), StringRef("")),
-            Str.rsplit('X'));
-  EXPECT_EQ(std::make_pair(StringRef("h"), StringRef("llo")),
-            Str.rsplit('e'));
-  EXPECT_EQ(std::make_pair(StringRef(""), StringRef("ello")),
-            Str.rsplit('h'));
-  EXPECT_EQ(std::make_pair(StringRef("hel"), StringRef("o")),
-            Str.rsplit('l'));
-  EXPECT_EQ(std::make_pair(StringRef("hell"), StringRef("")),
-            Str.rsplit('o'));
-
-  EXPECT_EQ(std::make_pair(StringRef("he"), StringRef("o")),
-		    Str.rsplit("ll"));
-  EXPECT_EQ(std::make_pair(StringRef(""), StringRef("ello")),
-		    Str.rsplit("h"));
-  EXPECT_EQ(std::make_pair(StringRef("hell"), StringRef("")),
-	      Str.rsplit("o"));
-  EXPECT_EQ(std::make_pair(StringRef("hello"), StringRef("")),
-		    Str.rsplit("::"));
-  EXPECT_EQ(std::make_pair(StringRef("hel"), StringRef("o")),
-		    Str.rsplit("l"));
-}
-
-TEST(StringRefTest, Split2) {
-  SmallVector<StringRef, 5> parts;
-  SmallVector<StringRef, 5> expected;
-
-  expected.push_back("ab"); expected.push_back("c");
-  StringRef(",ab,,c,").split(parts, ",", -1, false);
-  EXPECT_TRUE(parts == expected);
-
-  expected.clear(); parts.clear();
-  expected.push_back(""); expected.push_back("ab"); expected.push_back("");
-  expected.push_back("c"); expected.push_back("");
-  StringRef(",ab,,c,").split(parts, ",", -1, true);
-  EXPECT_TRUE(parts == expected);
-
-  expected.clear(); parts.clear();
-  expected.push_back("");
-  StringRef("").split(parts, ",", -1, true);
-  EXPECT_TRUE(parts == expected);
-
-  expected.clear(); parts.clear();
-  StringRef("").split(parts, ",", -1, false);
-  EXPECT_TRUE(parts == expected);
-
-  expected.clear(); parts.clear();
-  StringRef(",").split(parts, ",", -1, false);
-  EXPECT_TRUE(parts == expected);
-
-  expected.clear(); parts.clear();
-  expected.push_back(""); expected.push_back("");
-  StringRef(",").split(parts, ",", -1, true);
-  EXPECT_TRUE(parts == expected);
-
-  expected.clear(); parts.clear();
-  expected.push_back("a"); expected.push_back("b");
-  StringRef("a,b").split(parts, ",", -1, true);
-  EXPECT_TRUE(parts == expected);
-
-  // Test MaxSplit
-  expected.clear(); parts.clear();
-  expected.push_back("a,,b,c");
-  StringRef("a,,b,c").split(parts, ",", 0, true);
-  EXPECT_TRUE(parts == expected);
-
-  expected.clear(); parts.clear();
-  expected.push_back("a,,b,c");
-  StringRef("a,,b,c").split(parts, ",", 0, false);
-  EXPECT_TRUE(parts == expected);
-
-  expected.clear(); parts.clear();
-  expected.push_back("a"); expected.push_back(",b,c");
-  StringRef("a,,b,c").split(parts, ",", 1, true);
-  EXPECT_TRUE(parts == expected);
-
-  expected.clear(); parts.clear();
-  expected.push_back("a"); expected.push_back(",b,c");
-  StringRef("a,,b,c").split(parts, ",", 1, false);
-  EXPECT_TRUE(parts == expected);
-
-  expected.clear(); parts.clear();
-  expected.push_back("a"); expected.push_back(""); expected.push_back("b,c");
-  StringRef("a,,b,c").split(parts, ",", 2, true);
-  EXPECT_TRUE(parts == expected);
-
-  expected.clear(); parts.clear();
-  expected.push_back("a"); expected.push_back("b,c");
-  StringRef("a,,b,c").split(parts, ",", 2, false);
-  EXPECT_TRUE(parts == expected);
-
-  expected.clear(); parts.clear();
-  expected.push_back("a"); expected.push_back(""); expected.push_back("b");
-  expected.push_back("c");
-  StringRef("a,,b,c").split(parts, ",", 3, true);
-  EXPECT_TRUE(parts == expected);
-
-  expected.clear(); parts.clear();
-  expected.push_back("a"); expected.push_back("b"); expected.push_back("c");
-  StringRef("a,,b,c").split(parts, ",", 3, false);
-  EXPECT_TRUE(parts == expected);
-
-  expected.clear(); parts.clear();
-  expected.push_back("a"); expected.push_back("b"); expected.push_back("c");
-  StringRef("a,,b,c").split(parts, ',', 3, false);
-  EXPECT_TRUE(parts == expected);
-
-  expected.clear(); parts.clear();
-  expected.push_back("");
-  StringRef().split(parts, ",", 0, true);
-  EXPECT_TRUE(parts == expected);
-
-  expected.clear(); parts.clear();
-  expected.push_back(StringRef());
-  StringRef("").split(parts, ",", 0, true);
-  EXPECT_TRUE(parts == expected);
-
-  expected.clear(); parts.clear();
-  StringRef("").split(parts, ",", 0, false);
-  EXPECT_TRUE(parts == expected);
-  StringRef().split(parts, ",", 0, false);
-  EXPECT_TRUE(parts == expected);
-
-  expected.clear(); parts.clear();
-  expected.push_back("a");
-  expected.push_back("");
-  expected.push_back("b");
-  expected.push_back("c,d");
-  StringRef("a,,b,c,d").split(parts, ",", 3, true);
-  EXPECT_TRUE(parts == expected);
-
-  expected.clear(); parts.clear();
-  expected.push_back("");
-  StringRef().split(parts, ',', 0, true);
-  EXPECT_TRUE(parts == expected);
-
-  expected.clear(); parts.clear();
-  expected.push_back(StringRef());
-  StringRef("").split(parts, ',', 0, true);
-  EXPECT_TRUE(parts == expected);
-
-  expected.clear(); parts.clear();
-  StringRef("").split(parts, ',', 0, false);
-  EXPECT_TRUE(parts == expected);
-  StringRef().split(parts, ',', 0, false);
-  EXPECT_TRUE(parts == expected);
-
-  expected.clear(); parts.clear();
-  expected.push_back("a");
-  expected.push_back("");
-  expected.push_back("b");
-  expected.push_back("c,d");
-  StringRef("a,,b,c,d").split(parts, ',', 3, true);
-  EXPECT_TRUE(parts == expected);
-}
-
-TEST(StringRefTest, Trim) {
-  StringRef Str0("hello");
-  StringRef Str1(" hello ");
-  StringRef Str2("  hello  ");
-  StringRef Str3("\t\n\v\f\r  hello  \t\n\v\f\r");
-
-  EXPECT_EQ(StringRef("hello"), Str0.rtrim());
-  EXPECT_EQ(StringRef(" hello"), Str1.rtrim());
-  EXPECT_EQ(StringRef("  hello"), Str2.rtrim());
-  EXPECT_EQ(StringRef("\t\n\v\f\r  hello"), Str3.rtrim());
-  EXPECT_EQ(StringRef("hello"), Str0.ltrim());
-  EXPECT_EQ(StringRef("hello "), Str1.ltrim());
-  EXPECT_EQ(StringRef("hello  "), Str2.ltrim());
-  EXPECT_EQ(StringRef("hello  \t\n\v\f\r"), Str3.ltrim());
-  EXPECT_EQ(StringRef("hello"), Str0.trim());
-  EXPECT_EQ(StringRef("hello"), Str1.trim());
-  EXPECT_EQ(StringRef("hello"), Str2.trim());
-  EXPECT_EQ(StringRef("hello"), Str3.trim());
-
-  EXPECT_EQ(StringRef("ello"), Str0.trim("hhhhhhhhhhh"));
-
-  EXPECT_EQ(StringRef(""), StringRef("").trim());
-  EXPECT_EQ(StringRef(""), StringRef(" ").trim());
-  EXPECT_EQ(StringRef("\0", 1), StringRef(" \0 ", 3).trim());
-  EXPECT_EQ(StringRef("\0\0", 2), StringRef("\0\0", 2).trim());
-  EXPECT_EQ(StringRef("x"), StringRef("\0\0x\0\0", 5).trim('\0'));
-}
-
-TEST(StringRefTest, StartsWith) {
-  StringRef Str("hello");
-  EXPECT_TRUE(Str.startswith(""));
-  EXPECT_TRUE(Str.startswith("he"));
-  EXPECT_FALSE(Str.startswith("helloworld"));
-  EXPECT_FALSE(Str.startswith("hi"));
-}
-
-TEST(StringRefTest, StartsWithInsensitive) {
-  StringRef Str("heLLo");
-  EXPECT_TRUE(Str.startswith_insensitive(""));
-  EXPECT_TRUE(Str.startswith_insensitive("he"));
-  EXPECT_TRUE(Str.startswith_insensitive("hell"));
-  EXPECT_TRUE(Str.startswith_insensitive("HELlo"));
-  EXPECT_FALSE(Str.startswith_insensitive("helloworld"));
-  EXPECT_FALSE(Str.startswith_insensitive("hi"));
-}
-
-TEST(StringRefTest, ConsumeFront) {
-  StringRef Str("hello");
-  EXPECT_TRUE(Str.consume_front(""));
-  EXPECT_EQ("hello", Str);
-  EXPECT_TRUE(Str.consume_front("he"));
-  EXPECT_EQ("llo", Str);
-  EXPECT_FALSE(Str.consume_front("lloworld"));
-  EXPECT_EQ("llo", Str);
-  EXPECT_FALSE(Str.consume_front("lol"));
-  EXPECT_EQ("llo", Str);
-  EXPECT_TRUE(Str.consume_front("llo"));
-  EXPECT_EQ("", Str);
-  EXPECT_FALSE(Str.consume_front("o"));
-  EXPECT_TRUE(Str.consume_front(""));
-}
-
-TEST(StringRefTest, ConsumeFrontInsensitive) {
-  StringRef Str("heLLo");
-  EXPECT_TRUE(Str.consume_front_insensitive(""));
-  EXPECT_EQ("heLLo", Str);
-  EXPECT_FALSE(Str.consume_front("HEl"));
-  EXPECT_EQ("heLLo", Str);
-  EXPECT_TRUE(Str.consume_front_insensitive("HEl"));
-  EXPECT_EQ("Lo", Str);
-  EXPECT_FALSE(Str.consume_front_insensitive("loworld"));
-  EXPECT_EQ("Lo", Str);
-  EXPECT_FALSE(Str.consume_front_insensitive("ol"));
-  EXPECT_EQ("Lo", Str);
-  EXPECT_TRUE(Str.consume_front_insensitive("lo"));
-  EXPECT_EQ("", Str);
-  EXPECT_FALSE(Str.consume_front_insensitive("o"));
-  EXPECT_TRUE(Str.consume_front_insensitive(""));
-}
-
-TEST(StringRefTest, EndsWith) {
-  StringRef Str("hello");
-  EXPECT_TRUE(Str.endswith(""));
-  EXPECT_TRUE(Str.endswith("lo"));
-  EXPECT_FALSE(Str.endswith("helloworld"));
-  EXPECT_FALSE(Str.endswith("worldhello"));
-  EXPECT_FALSE(Str.endswith("so"));
-}
-
-TEST(StringRefTest, EndsWithInsensitive) {
-  StringRef Str("heLLo");
-  EXPECT_TRUE(Str.endswith_insensitive(""));
-  EXPECT_TRUE(Str.endswith_insensitive("lo"));
-  EXPECT_TRUE(Str.endswith_insensitive("LO"));
-  EXPECT_TRUE(Str.endswith_insensitive("ELlo"));
-  EXPECT_FALSE(Str.endswith_insensitive("helloworld"));
-  EXPECT_FALSE(Str.endswith_insensitive("hi"));
-}
-
-TEST(StringRefTest, ConsumeBack) {
-  StringRef Str("hello");
-  EXPECT_TRUE(Str.consume_back(""));
-  EXPECT_EQ("hello", Str);
-  EXPECT_TRUE(Str.consume_back("lo"));
-  EXPECT_EQ("hel", Str);
-  EXPECT_FALSE(Str.consume_back("helhel"));
-  EXPECT_EQ("hel", Str);
-  EXPECT_FALSE(Str.consume_back("hle"));
-  EXPECT_EQ("hel", Str);
-  EXPECT_TRUE(Str.consume_back("hel"));
-  EXPECT_EQ("", Str);
-  EXPECT_FALSE(Str.consume_back("h"));
-  EXPECT_TRUE(Str.consume_back(""));
-}
-
-TEST(StringRefTest, ConsumeBackInsensitive) {
-  StringRef Str("heLLo");
-  EXPECT_TRUE(Str.consume_back_insensitive(""));
-  EXPECT_EQ("heLLo", Str);
-  EXPECT_FALSE(Str.consume_back("lO"));
-  EXPECT_EQ("heLLo", Str);
-  EXPECT_TRUE(Str.consume_back_insensitive("lO"));
-  EXPECT_EQ("heL", Str);
-  EXPECT_FALSE(Str.consume_back_insensitive("helhel"));
-  EXPECT_EQ("heL", Str);
-  EXPECT_FALSE(Str.consume_back_insensitive("hle"));
-  EXPECT_EQ("heL", Str);
-  EXPECT_TRUE(Str.consume_back_insensitive("hEl"));
-  EXPECT_EQ("", Str);
-  EXPECT_FALSE(Str.consume_back_insensitive("h"));
-  EXPECT_TRUE(Str.consume_back_insensitive(""));
-}
-
-TEST(StringRefTest, Find) {
-  StringRef Str("helloHELLO");
-  StringRef LongStr("hellx xello hell ello world foo bar hello HELLO");
-
-  struct {
-    StringRef Str;
-    char C;
-    std::size_t From;
-    std::size_t Pos;
-    std::size_t InsensitivePos;
-  } CharExpectations[] = {
-      {Str, 'h', 0U, 0U, 0U},
-      {Str, 'e', 0U, 1U, 1U},
-      {Str, 'l', 0U, 2U, 2U},
-      {Str, 'l', 3U, 3U, 3U},
-      {Str, 'o', 0U, 4U, 4U},
-      {Str, 'L', 0U, 7U, 2U},
-      {Str, 'z', 0U, StringRef::npos, StringRef::npos},
-  };
-
-  struct {
-    StringRef Str;
-    llvm::StringRef S;
-    std::size_t From;
-    std::size_t Pos;
-    std::size_t InsensitivePos;
-  } StrExpectations[] = {
-      {Str, "helloword", 0, StringRef::npos, StringRef::npos},
-      {Str, "hello", 0, 0U, 0U},
-      {Str, "ello", 0, 1U, 1U},
-      {Str, "zz", 0, StringRef::npos, StringRef::npos},
-      {Str, "ll", 2U, 2U, 2U},
-      {Str, "ll", 3U, StringRef::npos, 7U},
-      {Str, "LL", 2U, 7U, 2U},
-      {Str, "LL", 3U, 7U, 7U},
-      {Str, "", 0U, 0U, 0U},
-      {LongStr, "hello", 0U, 36U, 36U},
-      {LongStr, "foo", 0U, 28U, 28U},
-      {LongStr, "hell", 2U, 12U, 12U},
-      {LongStr, "HELL", 2U, 42U, 12U},
-      {LongStr, "", 0U, 0U, 0U}};
-
-  for (auto &E : CharExpectations) {
-    EXPECT_EQ(E.Pos, E.Str.find(E.C, E.From));
-    EXPECT_EQ(E.InsensitivePos, E.Str.find_insensitive(E.C, E.From));
-    EXPECT_EQ(E.InsensitivePos, E.Str.find_insensitive(toupper(E.C), E.From));
-  }
-
-  for (auto &E : StrExpectations) {
-    EXPECT_EQ(E.Pos, E.Str.find(E.S, E.From));
-    EXPECT_EQ(E.InsensitivePos, E.Str.find_insensitive(E.S, E.From));
-    EXPECT_EQ(E.InsensitivePos, E.Str.find_insensitive(E.S.upper(), E.From));
-  }
-
-  EXPECT_EQ(3U, Str.rfind('l'));
-  EXPECT_EQ(StringRef::npos, Str.rfind('z'));
-  EXPECT_EQ(StringRef::npos, Str.rfind("helloworld"));
-  EXPECT_EQ(0U, Str.rfind("hello"));
-  EXPECT_EQ(1U, Str.rfind("ello"));
-  EXPECT_EQ(StringRef::npos, Str.rfind("zz"));
-
-  EXPECT_EQ(8U, Str.rfind_insensitive('l'));
-  EXPECT_EQ(8U, Str.rfind_insensitive('L'));
-  EXPECT_EQ(StringRef::npos, Str.rfind_insensitive('z'));
-  EXPECT_EQ(StringRef::npos, Str.rfind_insensitive("HELLOWORLD"));
-  EXPECT_EQ(5U, Str.rfind("HELLO"));
-  EXPECT_EQ(6U, Str.rfind("ELLO"));
-  EXPECT_EQ(StringRef::npos, Str.rfind("ZZ"));
-
-  EXPECT_EQ(2U, Str.find_first_of('l'));
-  EXPECT_EQ(1U, Str.find_first_of("el"));
-  EXPECT_EQ(StringRef::npos, Str.find_first_of("xyz"));
-
-  Str = "hello";
-  EXPECT_EQ(1U, Str.find_first_not_of('h'));
-  EXPECT_EQ(4U, Str.find_first_not_of("hel"));
-  EXPECT_EQ(StringRef::npos, Str.find_first_not_of("hello"));
-
-  EXPECT_EQ(3U, Str.find_last_not_of('o'));
-  EXPECT_EQ(1U, Str.find_last_not_of("lo"));
-  EXPECT_EQ(StringRef::npos, Str.find_last_not_of("helo"));
-}
-
-TEST(StringRefTest, Count) {
-  StringRef Str("hello");
-  EXPECT_EQ(2U, Str.count('l'));
-  EXPECT_EQ(1U, Str.count('o'));
-  EXPECT_EQ(0U, Str.count('z'));
-  EXPECT_EQ(0U, Str.count("helloworld"));
-  EXPECT_EQ(1U, Str.count("hello"));
-  EXPECT_EQ(1U, Str.count("ello"));
-  EXPECT_EQ(0U, Str.count("zz"));
-  EXPECT_EQ(0U, Str.count(""));
-
-  StringRef OverlappingAbba("abbabba");
-  EXPECT_EQ(1U, OverlappingAbba.count("abba"));
-  StringRef NonOverlappingAbba("abbaabba");
-  EXPECT_EQ(2U, NonOverlappingAbba.count("abba"));
-  StringRef ComplexAbba("abbabbaxyzabbaxyz");
-  EXPECT_EQ(2U, ComplexAbba.count("abba"));
-}
-
-TEST(StringRefTest, EditDistance) {
-  StringRef Hello("hello");
-  EXPECT_EQ(2U, Hello.edit_distance("hill"));
-
-  StringRef Industry("industry");
-  EXPECT_EQ(6U, Industry.edit_distance("interest"));
-
-  StringRef Soylent("soylent green is people");
-  EXPECT_EQ(19U, Soylent.edit_distance("people soiled our green"));
-  EXPECT_EQ(26U, Soylent.edit_distance("people soiled our green",
-                                      /* allow replacements = */ false));
-  EXPECT_EQ(9U, Soylent.edit_distance("people soiled our green",
-                                      /* allow replacements = */ true,
-                                      /* max edit distance = */ 8));
-  EXPECT_EQ(53U, Soylent.edit_distance("people soiled our green "
-                                       "people soiled our green "
-                                       "people soiled our green "));
-}
-
-TEST(StringRefTest, Misc) {
-  std::string Storage;
-  raw_string_ostream OS(Storage);
-  OS << StringRef("hello");
-  EXPECT_EQ("hello", OS.str());
-}
-
-TEST(StringRefTest, Hashing) {
-  EXPECT_EQ(hash_value(std::string()), hash_value(StringRef()));
-  EXPECT_EQ(hash_value(std::string()), hash_value(StringRef("")));
-  std::string S = "hello world";
-  hash_code H = hash_value(S);
-  EXPECT_EQ(H, hash_value(StringRef("hello world")));
-  EXPECT_EQ(H, hash_value(StringRef(S)));
-  EXPECT_NE(H, hash_value(StringRef("hello worl")));
-  EXPECT_EQ(hash_value(std::string("hello worl")),
-            hash_value(StringRef("hello worl")));
-  EXPECT_NE(H, hash_value(StringRef("hello world ")));
-  EXPECT_EQ(hash_value(std::string("hello world ")),
-            hash_value(StringRef("hello world ")));
-  EXPECT_EQ(H, hash_value(StringRef("hello world\0")));
-  EXPECT_NE(hash_value(std::string("ello worl")),
-            hash_value(StringRef("hello world").slice(1, -1)));
-}
-
-struct UnsignedPair {
-  const char *Str;
-  uint64_t Expected;
-} Unsigned[] =
-  { {"0", 0}
-  , {"255", 255}
-  , {"256", 256}
-  , {"65535", 65535}
-  , {"65536", 65536}
-  , {"4294967295", 4294967295ULL}
-  , {"4294967296", 4294967296ULL}
-  , {"18446744073709551615", 18446744073709551615ULL}
-  , {"042", 34}
-  , {"0x42", 66}
-  , {"0b101010", 42}
-  };
-
-struct SignedPair {
-  const char *Str;
-  int64_t Expected;
-} Signed[] =
-  { {"0", 0}
-  , {"-0", 0}
-  , {"127", 127}
-  , {"128", 128}
-  , {"-128", -128}
-  , {"-129", -129}
-  , {"32767", 32767}
-  , {"32768", 32768}
-  , {"-32768", -32768}
-  , {"-32769", -32769}
-  , {"2147483647", 2147483647LL}
-  , {"2147483648", 2147483648LL}
-  , {"-2147483648", -2147483648LL}
-  , {"-2147483649", -2147483649LL}
-  , {"-9223372036854775808", -(9223372036854775807LL) - 1}
-  , {"042", 34}
-  , {"0x42", 66}
-  , {"0b101010", 42}
-  , {"-042", -34}
-  , {"-0x42", -66}
-  , {"-0b101010", -42}
-  };
-
-TEST(StringRefTest, getAsInteger) {
-  uint8_t U8;
-  uint16_t U16;
-  uint32_t U32;
-  uint64_t U64;
-
-  for (size_t i = 0; i < array_lengthof(Unsigned); ++i) {
-    bool U8Success = StringRef(Unsigned[i].Str).getAsInteger(0, U8);
-    if (static_cast<uint8_t>(Unsigned[i].Expected) == Unsigned[i].Expected) {
-      ASSERT_FALSE(U8Success);
-      EXPECT_EQ(U8, Unsigned[i].Expected);
-    } else {
-      ASSERT_TRUE(U8Success);
-    }
-    bool U16Success = StringRef(Unsigned[i].Str).getAsInteger(0, U16);
-    if (static_cast<uint16_t>(Unsigned[i].Expected) == Unsigned[i].Expected) {
-      ASSERT_FALSE(U16Success);
-      EXPECT_EQ(U16, Unsigned[i].Expected);
-    } else {
-      ASSERT_TRUE(U16Success);
-    }
-    bool U32Success = StringRef(Unsigned[i].Str).getAsInteger(0, U32);
-    if (static_cast<uint32_t>(Unsigned[i].Expected) == Unsigned[i].Expected) {
-      ASSERT_FALSE(U32Success);
-      EXPECT_EQ(U32, Unsigned[i].Expected);
-    } else {
-      ASSERT_TRUE(U32Success);
-    }
-    bool U64Success = StringRef(Unsigned[i].Str).getAsInteger(0, U64);
-    ASSERT_FALSE(U64Success);
-    EXPECT_EQ(U64, Unsigned[i].Expected);
-  }
-
-  int8_t S8;
-  int16_t S16;
-  int32_t S32;
-  int64_t S64;
-
-  for (size_t i = 0; i < array_lengthof(Signed); ++i) {
-    bool S8Success = StringRef(Signed[i].Str).getAsInteger(0, S8);
-    if (static_cast<int8_t>(Signed[i].Expected) == Signed[i].Expected) {
-      ASSERT_FALSE(S8Success);
-      EXPECT_EQ(S8, Signed[i].Expected);
-    } else {
-      ASSERT_TRUE(S8Success);
-    }
-    bool S16Success = StringRef(Signed[i].Str).getAsInteger(0, S16);
-    if (static_cast<int16_t>(Signed[i].Expected) == Signed[i].Expected) {
-      ASSERT_FALSE(S16Success);
-      EXPECT_EQ(S16, Signed[i].Expected);
-    } else {
-      ASSERT_TRUE(S16Success);
-    }
-    bool S32Success = StringRef(Signed[i].Str).getAsInteger(0, S32);
-    if (static_cast<int32_t>(Signed[i].Expected) == Signed[i].Expected) {
-      ASSERT_FALSE(S32Success);
-      EXPECT_EQ(S32, Signed[i].Expected);
-    } else {
-      ASSERT_TRUE(S32Success);
-    }
-    bool S64Success = StringRef(Signed[i].Str).getAsInteger(0, S64);
-    ASSERT_FALSE(S64Success);
-    EXPECT_EQ(S64, Signed[i].Expected);
-  }
-}
-
-
-static const char* BadStrings[] = {
-    ""                      // empty string
-  , "18446744073709551617"  // value just over max
-  , "123456789012345678901" // value way too large
-  , "4t23v"                 // illegal decimal characters
-  , "0x123W56"              // illegal hex characters
-  , "0b2"                   // illegal bin characters
-  , "08"                    // illegal oct characters
-  , "0o8"                   // illegal oct characters
-  , "-123"                  // negative unsigned value
-  , "0x"
-  , "0b"
-};
-
-
-TEST(StringRefTest, getAsUnsignedIntegerBadStrings) {
-  unsigned long long U64;
-  for (size_t i = 0; i < array_lengthof(BadStrings); ++i) {
-    bool IsBadNumber = StringRef(BadStrings[i]).getAsInteger(0, U64);
-    ASSERT_TRUE(IsBadNumber);
-  }
-}
-
-struct ConsumeUnsignedPair {
-  const char *Str;
-  uint64_t Expected;
-  const char *Leftover;
-} ConsumeUnsigned[] = {
-    {"0", 0, ""},
-    {"255", 255, ""},
-    {"256", 256, ""},
-    {"65535", 65535, ""},
-    {"65536", 65536, ""},
-    {"4294967295", 4294967295ULL, ""},
-    {"4294967296", 4294967296ULL, ""},
-    {"255A376", 255, "A376"},
-    {"18446744073709551615", 18446744073709551615ULL, ""},
-    {"18446744073709551615ABC", 18446744073709551615ULL, "ABC"},
-    {"042", 34, ""},
-    {"0x42", 66, ""},
-    {"0x42-0x34", 66, "-0x34"},
-    {"0b101010", 42, ""},
-    {"0429F", 042, "9F"},            // Auto-sensed octal radix, invalid digit
-    {"0x42G12", 0x42, "G12"},        // Auto-sensed hex radix, invalid digit
-    {"0b10101020101", 42, "20101"}}; // Auto-sensed binary radix, invalid digit.
-
-struct ConsumeSignedPair {
-  const char *Str;
-  int64_t Expected;
-  const char *Leftover;
-} ConsumeSigned[] = {
-    {"0", 0, ""},
-    {"-0", 0, ""},
-    {"0-1", 0, "-1"},
-    {"-0-1", 0, "-1"},
-    {"127", 127, ""},
-    {"128", 128, ""},
-    {"127-1", 127, "-1"},
-    {"128-1", 128, "-1"},
-    {"-128", -128, ""},
-    {"-129", -129, ""},
-    {"-128-1", -128, "-1"},
-    {"-129-1", -129, "-1"},
-    {"32767", 32767, ""},
-    {"32768", 32768, ""},
-    {"32767-1", 32767, "-1"},
-    {"32768-1", 32768, "-1"},
-    {"-32768", -32768, ""},
-    {"-32769", -32769, ""},
-    {"-32768-1", -32768, "-1"},
-    {"-32769-1", -32769, "-1"},
-    {"2147483647", 2147483647LL, ""},
-    {"2147483648", 2147483648LL, ""},
-    {"2147483647-1", 2147483647LL, "-1"},
-    {"2147483648-1", 2147483648LL, "-1"},
-    {"-2147483648", -2147483648LL, ""},
-    {"-2147483649", -2147483649LL, ""},
-    {"-2147483648-1", -2147483648LL, "-1"},
-    {"-2147483649-1", -2147483649LL, "-1"},
-    {"-9223372036854775808", -(9223372036854775807LL) - 1, ""},
-    {"-9223372036854775808-1", -(9223372036854775807LL) - 1, "-1"},
-    {"042", 34, ""},
-    {"042-1", 34, "-1"},
-    {"0x42", 66, ""},
-    {"0x42-1", 66, "-1"},
-    {"0b101010", 42, ""},
-    {"0b101010-1", 42, "-1"},
-    {"-042", -34, ""},
-    {"-042-1", -34, "-1"},
-    {"-0x42", -66, ""},
-    {"-0x42-1", -66, "-1"},
-    {"-0b101010", -42, ""},
-    {"-0b101010-1", -42, "-1"}};
-
-TEST(StringRefTest, consumeIntegerUnsigned) {
-  uint8_t U8;
-  uint16_t U16;
-  uint32_t U32;
-  uint64_t U64;
-
-  for (size_t i = 0; i < array_lengthof(ConsumeUnsigned); ++i) {
-    StringRef Str = ConsumeUnsigned[i].Str;
-    bool U8Success = Str.consumeInteger(0, U8);
-    if (static_cast<uint8_t>(ConsumeUnsigned[i].Expected) ==
-        ConsumeUnsigned[i].Expected) {
-      ASSERT_FALSE(U8Success);
-      EXPECT_EQ(U8, ConsumeUnsigned[i].Expected);
-      EXPECT_EQ(Str, ConsumeUnsigned[i].Leftover);
-    } else {
-      ASSERT_TRUE(U8Success);
-    }
-
-    Str = ConsumeUnsigned[i].Str;
-    bool U16Success = Str.consumeInteger(0, U16);
-    if (static_cast<uint16_t>(ConsumeUnsigned[i].Expected) ==
-        ConsumeUnsigned[i].Expected) {
-      ASSERT_FALSE(U16Success);
-      EXPECT_EQ(U16, ConsumeUnsigned[i].Expected);
-      EXPECT_EQ(Str, ConsumeUnsigned[i].Leftover);
-    } else {
-      ASSERT_TRUE(U16Success);
-    }
-
-    Str = ConsumeUnsigned[i].Str;
-    bool U32Success = Str.consumeInteger(0, U32);
-    if (static_cast<uint32_t>(ConsumeUnsigned[i].Expected) ==
-        ConsumeUnsigned[i].Expected) {
-      ASSERT_FALSE(U32Success);
-      EXPECT_EQ(U32, ConsumeUnsigned[i].Expected);
-      EXPECT_EQ(Str, ConsumeUnsigned[i].Leftover);
-    } else {
-      ASSERT_TRUE(U32Success);
-    }
-
-    Str = ConsumeUnsigned[i].Str;
-    bool U64Success = Str.consumeInteger(0, U64);
-    ASSERT_FALSE(U64Success);
-    EXPECT_EQ(U64, ConsumeUnsigned[i].Expected);
-    EXPECT_EQ(Str, ConsumeUnsigned[i].Leftover);
-  }
-}
-
-TEST(StringRefTest, consumeIntegerSigned) {
-  int8_t S8;
-  int16_t S16;
-  int32_t S32;
-  int64_t S64;
-
-  for (size_t i = 0; i < array_lengthof(ConsumeSigned); ++i) {
-    StringRef Str = ConsumeSigned[i].Str;
-    bool S8Success = Str.consumeInteger(0, S8);
-    if (static_cast<int8_t>(ConsumeSigned[i].Expected) ==
-        ConsumeSigned[i].Expected) {
-      ASSERT_FALSE(S8Success);
-      EXPECT_EQ(S8, ConsumeSigned[i].Expected);
-      EXPECT_EQ(Str, ConsumeSigned[i].Leftover);
-    } else {
-      ASSERT_TRUE(S8Success);
-    }
-
-    Str = ConsumeSigned[i].Str;
-    bool S16Success = Str.consumeInteger(0, S16);
-    if (static_cast<int16_t>(ConsumeSigned[i].Expected) ==
-        ConsumeSigned[i].Expected) {
-      ASSERT_FALSE(S16Success);
-      EXPECT_EQ(S16, ConsumeSigned[i].Expected);
-      EXPECT_EQ(Str, ConsumeSigned[i].Leftover);
-    } else {
-      ASSERT_TRUE(S16Success);
-    }
-
-    Str = ConsumeSigned[i].Str;
-    bool S32Success = Str.consumeInteger(0, S32);
-    if (static_cast<int32_t>(ConsumeSigned[i].Expected) ==
-        ConsumeSigned[i].Expected) {
-      ASSERT_FALSE(S32Success);
-      EXPECT_EQ(S32, ConsumeSigned[i].Expected);
-      EXPECT_EQ(Str, ConsumeSigned[i].Leftover);
-    } else {
-      ASSERT_TRUE(S32Success);
-    }
-
-    Str = ConsumeSigned[i].Str;
-    bool S64Success = Str.consumeInteger(0, S64);
-    ASSERT_FALSE(S64Success);
-    EXPECT_EQ(S64, ConsumeSigned[i].Expected);
-    EXPECT_EQ(Str, ConsumeSigned[i].Leftover);
-  }
-}
-
-struct GetDoubleStrings {
-  const char *Str;
-  bool AllowInexact;
-  bool ShouldFail;
-  double D;
-} DoubleStrings[] = {{"0", false, false, 0.0},
-                     {"0.0", false, false, 0.0},
-                     {"-0.0", false, false, -0.0},
-                     {"123.45", false, true, 123.45},
-                     {"123.45", true, false, 123.45},
-                     {"1.8e308", true, false, std::numeric_limits<double>::infinity()},
-                     {"1.8e308", false, true, std::numeric_limits<double>::infinity()},
-                     {"0x0.0000000000001P-1023", false, true, 0.0},
-                     {"0x0.0000000000001P-1023", true, false, 0.0},
-                    };
-
-TEST(StringRefTest, getAsDouble) {
-  for (const auto &Entry : DoubleStrings) {
-    double Result;
-    StringRef S(Entry.Str);
-    EXPECT_EQ(Entry.ShouldFail, S.getAsDouble(Result, Entry.AllowInexact));
-    if (!Entry.ShouldFail) {
-      EXPECT_EQ(Result, Entry.D);
-    }
-  }
-}
-
-static const char *join_input[] = { "a", "b", "c" };
-static const char join_result1[] = "a";
-static const char join_result2[] = "a:b:c";
-static const char join_result3[] = "a::b::c";
-
-TEST(StringRefTest, joinStrings) {
-  std::vector<StringRef> v1;
-  std::vector<std::string> v2;
-  for (size_t i = 0; i < array_lengthof(join_input); ++i) {
-    v1.push_back(join_input[i]);
-    v2.push_back(join_input[i]);
-  }
-
-  bool v1_join1 = join(v1.begin(), v1.begin() + 1, ":") == join_result1;
-  EXPECT_TRUE(v1_join1);
-  bool v1_join2 = join(v1.begin(), v1.end(), ":") == join_result2;
-  EXPECT_TRUE(v1_join2);
-  bool v1_join3 = join(v1.begin(), v1.end(), "::") == join_result3;
-  EXPECT_TRUE(v1_join3);
-
-  bool v2_join1 = join(v2.begin(), v2.begin() + 1, ":") == join_result1;
-  EXPECT_TRUE(v2_join1);
-  bool v2_join2 = join(v2.begin(), v2.end(), ":") == join_result2;
-  EXPECT_TRUE(v2_join2);
-  bool v2_join3 = join(v2.begin(), v2.end(), "::") == join_result3;
-  EXPECT_TRUE(v2_join3);
-  v2_join3 = join(v2, "::") == join_result3;
-  EXPECT_TRUE(v2_join3);
-}
-
-
-TEST(StringRefTest, AllocatorCopy) {
-  BumpPtrAllocator Alloc;
-  // First test empty strings.  We don't want these to allocate anything on the
-  // allocator.
-  StringRef StrEmpty = "";
-  StringRef StrEmptyc = StrEmpty.copy(Alloc);
-  EXPECT_TRUE(StrEmpty.equals(StrEmptyc));
-  EXPECT_EQ(StrEmptyc.data(), nullptr);
-  EXPECT_EQ(StrEmptyc.size(), 0u);
-  EXPECT_EQ(Alloc.getTotalMemory(), 0u);
-
-  StringRef Str1 = "hello";
-  StringRef Str2 = "bye";
-  StringRef Str1c = Str1.copy(Alloc);
-  StringRef Str2c = Str2.copy(Alloc);
-  EXPECT_TRUE(Str1.equals(Str1c));
-  EXPECT_NE(Str1.data(), Str1c.data());
-  EXPECT_TRUE(Str2.equals(Str2c));
-  EXPECT_NE(Str2.data(), Str2c.data());
-}
-
-TEST(StringRefTest, Drop) {
-  StringRef Test("StringRefTest::Drop");
-
-  StringRef Dropped = Test.drop_front(5);
-  EXPECT_EQ(Dropped, "gRefTest::Drop");
-
-  Dropped = Test.drop_back(5);
-  EXPECT_EQ(Dropped, "StringRefTest:");
-
-  Dropped = Test.drop_front(0);
-  EXPECT_EQ(Dropped, Test);
-
-  Dropped = Test.drop_back(0);
-  EXPECT_EQ(Dropped, Test);
-
-  Dropped = Test.drop_front(Test.size());
-  EXPECT_TRUE(Dropped.empty());
-
-  Dropped = Test.drop_back(Test.size());
-  EXPECT_TRUE(Dropped.empty());
-}
-
-TEST(StringRefTest, Take) {
-  StringRef Test("StringRefTest::Take");
-
-  StringRef Taken = Test.take_front(5);
-  EXPECT_EQ(Taken, "Strin");
-
-  Taken = Test.take_back(5);
-  EXPECT_EQ(Taken, ":Take");
-
-  Taken = Test.take_front(Test.size());
-  EXPECT_EQ(Taken, Test);
-
-  Taken = Test.take_back(Test.size());
-  EXPECT_EQ(Taken, Test);
-
-  Taken = Test.take_front(0);
-  EXPECT_TRUE(Taken.empty());
-
-  Taken = Test.take_back(0);
-  EXPECT_TRUE(Taken.empty());
-}
-
-TEST(StringRefTest, FindIf) {
-  StringRef Punct("Test.String");
-  StringRef NoPunct("ABCDEFG");
-  StringRef Empty;
-
-  auto IsPunct = [](char c) { return ::ispunct(c); };
-  auto IsAlpha = [](char c) { return ::isalpha(c); };
-  EXPECT_EQ(4U, Punct.find_if(IsPunct));
-  EXPECT_EQ(StringRef::npos, NoPunct.find_if(IsPunct));
-  EXPECT_EQ(StringRef::npos, Empty.find_if(IsPunct));
-
-  EXPECT_EQ(4U, Punct.find_if_not(IsAlpha));
-  EXPECT_EQ(StringRef::npos, NoPunct.find_if_not(IsAlpha));
-  EXPECT_EQ(StringRef::npos, Empty.find_if_not(IsAlpha));
-}
-
-TEST(StringRefTest, TakeWhileUntil) {
-  StringRef Test("String With 1 Number");
-
-  StringRef Taken = Test.take_while([](char c) { return ::isdigit(c); });
-  EXPECT_EQ("", Taken);
-
-  Taken = Test.take_until([](char c) { return ::isdigit(c); });
-  EXPECT_EQ("String With ", Taken);
-
-  Taken = Test.take_while([](char c) { return true; });
-  EXPECT_EQ(Test, Taken);
-
-  Taken = Test.take_until([](char c) { return true; });
-  EXPECT_EQ("", Taken);
-
-  Test = "";
-  Taken = Test.take_while([](char c) { return true; });
-  EXPECT_EQ("", Taken);
-}
-
-TEST(StringRefTest, DropWhileUntil) {
-  StringRef Test("String With 1 Number");
-
-  StringRef Taken = Test.drop_while([](char c) { return ::isdigit(c); });
-  EXPECT_EQ(Test, Taken);
-
-  Taken = Test.drop_until([](char c) { return ::isdigit(c); });
-  EXPECT_EQ("1 Number", Taken);
-
-  Taken = Test.drop_while([](char c) { return true; });
-  EXPECT_EQ("", Taken);
-
-  Taken = Test.drop_until([](char c) { return true; });
-  EXPECT_EQ(Test, Taken);
-
-  StringRef EmptyString = "";
-  Taken = EmptyString.drop_while([](char c) { return true; });
-  EXPECT_EQ("", Taken);
-}
-
-TEST(StringRefTest, StringLiteral) {
-  constexpr StringRef StringRefs[] = {"Foo", "Bar"};
-  EXPECT_EQ(StringRef("Foo"), StringRefs[0]);
-  EXPECT_EQ(StringRef("Bar"), StringRefs[1]);
-
-  constexpr StringLiteral Strings[] = {"Foo", "Bar"};
-  EXPECT_EQ(StringRef("Foo"), Strings[0]);
-  EXPECT_EQ(StringRef("Bar"), Strings[1]);
-}
-
-// Check gtest prints StringRef as a string instead of a container of chars.
-// The code is in utils/unittest/googletest/internal/custom/gtest-printers.h
-TEST(StringRefTest, GTestPrinter) {
-  EXPECT_EQ(R"("foo")", ::testing::PrintToString(StringRef("foo")));
-}
-
-static_assert(std::is_trivially_copyable<StringRef>::value,
-              "trivially copyable");
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/StringSetTest.cpp b/gnu/llvm/llvm/unittests/ADT/StringSetTest.cpp
deleted file mode 100644
index 0071f5a3775..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/StringSetTest.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-//===- llvm/unittest/ADT/StringSetTest.cpp - StringSet unit tests ---------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/StringSet.h"
-#include "gtest/gtest.h"
-using namespace llvm;
-
-namespace {
-
-// Test fixture
-class StringSetTest : public testing::Test {};
-
-TEST_F(StringSetTest, IterSetKeys) {
-  StringSet<> Set;
-  Set.insert("A");
-  Set.insert("B");
-  Set.insert("C");
-  Set.insert("D");
-
-  auto Keys = to_vector<4>(Set.keys());
-  llvm::sort(Keys);
-
-  SmallVector<StringRef, 4> Expected = {"A", "B", "C", "D"};
-  EXPECT_EQ(Expected, Keys);
-}
-
-TEST_F(StringSetTest, InsertAndCountStringMapEntry) {
-  // Test insert(StringMapEntry) and count(StringMapEntry)
-  // which are required for set_difference(StringSet, StringSet).
-  StringSet<> Set;
-  StringMapEntry<StringRef> *Element =
-      StringMapEntry<StringRef>::Create("A", Set.getAllocator());
-  Set.insert(*Element);
-  size_t Count = Set.count(*Element);
-  size_t Expected = 1;
-  EXPECT_EQ(Expected, Count);
-  Element->Destroy(Set.getAllocator());
-}
-
-TEST_F(StringSetTest, EmptyString) {
-  // Verify that the empty string can by successfully inserted
-  StringSet<> Set;
-  size_t Count = Set.count("");
-  EXPECT_EQ(Count, 0UL);
-
-  Set.insert("");
-  Count = Set.count("");
-  EXPECT_EQ(Count, 1UL);
-}
-
-TEST_F(StringSetTest, Contains) {
-  StringSet<> Set;
-  EXPECT_FALSE(Set.contains(""));
-  EXPECT_FALSE(Set.contains("test"));
-
-  Set.insert("");
-  Set.insert("test");
-  EXPECT_TRUE(Set.contains(""));
-  EXPECT_TRUE(Set.contains("test"));
-
-  Set.insert("test");
-  EXPECT_TRUE(Set.contains(""));
-  EXPECT_TRUE(Set.contains("test"));
-
-  Set.erase("test");
-  EXPECT_TRUE(Set.contains(""));
-  EXPECT_FALSE(Set.contains("test"));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/StringSwitchTest.cpp b/gnu/llvm/llvm/unittests/ADT/StringSwitchTest.cpp
deleted file mode 100644
index 2ce6cdca8d3..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/StringSwitchTest.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-//===- llvm/unittest/ADT/StringSwitchTest.cpp - StringSwitch unit tests ---===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/StringSwitch.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-TEST(StringSwitchTest, Case) {
-  auto Translate = [](StringRef S) {
-    return llvm::StringSwitch<int>(S)
-        .Case("0", 0)
-        .Case("1", 1)
-        .Case("2", 2)
-        .Case("3", 3)
-        .Case("4", 4)
-        .Case("5", 5)
-        .Case("6", 6)
-        .Case("7", 7)
-        .Case("8", 8)
-        .Case("9", 9)
-        .Case("A", 10)
-        .Case("B", 11)
-        .Case("C", 12)
-        .Case("D", 13)
-        .Case("E", 14)
-        .Case("F", 15)
-        .Default(-1);
-  };
-  EXPECT_EQ(1, Translate("1"));
-  EXPECT_EQ(2, Translate("2"));
-  EXPECT_EQ(11, Translate("B"));
-  EXPECT_EQ(-1, Translate("b"));
-  EXPECT_EQ(-1, Translate(""));
-  EXPECT_EQ(-1, Translate("Test"));
-}
-
-TEST(StringSwitchTest, CaseLower) {
-  auto Translate = [](StringRef S) {
-    return llvm::StringSwitch<int>(S)
-        .Case("0", 0)
-        .Case("1", 1)
-        .Case("2", 2)
-        .Case("3", 3)
-        .Case("4", 4)
-        .Case("5", 5)
-        .Case("6", 6)
-        .Case("7", 7)
-        .Case("8", 8)
-        .Case("9", 9)
-        .CaseLower("A", 10)
-        .CaseLower("B", 11)
-        .CaseLower("C", 12)
-        .CaseLower("D", 13)
-        .CaseLower("E", 14)
-        .CaseLower("F", 15)
-        .Default(-1);
-  };
-  EXPECT_EQ(1, Translate("1"));
-  EXPECT_EQ(2, Translate("2"));
-  EXPECT_EQ(11, Translate("B"));
-  EXPECT_EQ(11, Translate("b"));
-
-  EXPECT_EQ(-1, Translate(""));
-  EXPECT_EQ(-1, Translate("Test"));
-}
-
-TEST(StringSwitchTest, StartsWith) {
-  auto Translate = [](StringRef S) {
-    return llvm::StringSwitch<std::function<int(int, int)>>(S)
-        .StartsWith("add", [](int X, int Y) { return X + Y; })
-        .StartsWith("sub", [](int X, int Y) { return X - Y; })
-        .StartsWith("mul", [](int X, int Y) { return X * Y; })
-        .StartsWith("div", [](int X, int Y) { return X / Y; })
-        .Default([](int X, int Y) { return 0; });
-  };
-
-  EXPECT_EQ(15, Translate("adder")(10, 5));
-  EXPECT_EQ(5, Translate("subtracter")(10, 5));
-  EXPECT_EQ(50, Translate("multiplier")(10, 5));
-  EXPECT_EQ(2, Translate("divider")(10, 5));
-
-  EXPECT_EQ(0, Translate("nothing")(10, 5));
-  EXPECT_EQ(0, Translate("ADDER")(10, 5));
-}
-
-TEST(StringSwitchTest, StartsWithLower) {
-  auto Translate = [](StringRef S) {
-    return llvm::StringSwitch<std::function<int(int, int)>>(S)
-        .StartsWithLower("add", [](int X, int Y) { return X + Y; })
-        .StartsWithLower("sub", [](int X, int Y) { return X - Y; })
-        .StartsWithLower("mul", [](int X, int Y) { return X * Y; })
-        .StartsWithLower("div", [](int X, int Y) { return X / Y; })
-        .Default([](int X, int Y) { return 0; });
-  };
-
-  EXPECT_EQ(15, Translate("adder")(10, 5));
-  EXPECT_EQ(5, Translate("subtracter")(10, 5));
-  EXPECT_EQ(50, Translate("multiplier")(10, 5));
-  EXPECT_EQ(2, Translate("divider")(10, 5));
-
-  EXPECT_EQ(15, Translate("AdDeR")(10, 5));
-  EXPECT_EQ(5, Translate("SuBtRaCtEr")(10, 5));
-  EXPECT_EQ(50, Translate("MuLtIpLiEr")(10, 5));
-  EXPECT_EQ(2, Translate("DiViDeR")(10, 5));
-
-  EXPECT_EQ(0, Translate("nothing")(10, 5));
-}
-
-TEST(StringSwitchTest, EndsWith) {
-  enum class Suffix { Possible, PastTense, Process, InProgressAction, Unknown };
-
-  auto Translate = [](StringRef S) {
-    return llvm::StringSwitch<Suffix>(S)
-        .EndsWith("able", Suffix::Possible)
-        .EndsWith("ed", Suffix::PastTense)
-        .EndsWith("ation", Suffix::Process)
-        .EndsWith("ing", Suffix::InProgressAction)
-        .Default(Suffix::Unknown);
-  };
-
-  EXPECT_EQ(Suffix::Possible, Translate("optimizable"));
-  EXPECT_EQ(Suffix::PastTense, Translate("optimized"));
-  EXPECT_EQ(Suffix::Process, Translate("optimization"));
-  EXPECT_EQ(Suffix::InProgressAction, Translate("optimizing"));
-  EXPECT_EQ(Suffix::Unknown, Translate("optimizer"));
-  EXPECT_EQ(Suffix::Unknown, Translate("OPTIMIZABLE"));
-}
-
-TEST(StringSwitchTest, EndsWithLower) {
-  enum class Suffix { Possible, PastTense, Process, InProgressAction, Unknown };
-
-  auto Translate = [](StringRef S) {
-    return llvm::StringSwitch<Suffix>(S)
-        .EndsWithLower("able", Suffix::Possible)
-        .EndsWithLower("ed", Suffix::PastTense)
-        .EndsWithLower("ation", Suffix::Process)
-        .EndsWithLower("ing", Suffix::InProgressAction)
-        .Default(Suffix::Unknown);
-  };
-
-  EXPECT_EQ(Suffix::Possible, Translate("optimizable"));
-  EXPECT_EQ(Suffix::Possible, Translate("OPTIMIZABLE"));
-  EXPECT_EQ(Suffix::PastTense, Translate("optimized"));
-  EXPECT_EQ(Suffix::Process, Translate("optimization"));
-  EXPECT_EQ(Suffix::InProgressAction, Translate("optimizing"));
-  EXPECT_EQ(Suffix::Unknown, Translate("optimizer"));
-}
-
-TEST(StringSwitchTest, Cases) {
-  enum class OSType { Windows, Linux, Unknown };
-
-  auto Translate = [](StringRef S) {
-    return llvm::StringSwitch<OSType>(S)
-        .Cases(StringLiteral::withInnerNUL("wind\0ws"), "win32", "winnt",
-               OSType::Windows)
-        .Cases("linux", "unix", "*nix", "posix", OSType::Linux)
-        .Default(OSType::Unknown);
-  };
-
-  EXPECT_EQ(OSType::Windows, Translate(llvm::StringRef("wind\0ws", 7)));
-  EXPECT_EQ(OSType::Windows, Translate("win32"));
-  EXPECT_EQ(OSType::Windows, Translate("winnt"));
-
-  EXPECT_EQ(OSType::Linux, Translate("linux"));
-  EXPECT_EQ(OSType::Linux, Translate("unix"));
-  EXPECT_EQ(OSType::Linux, Translate("*nix"));
-  EXPECT_EQ(OSType::Linux, Translate("posix"));
-
-  // Note that the whole null-terminator embedded string is required for the
-  // case to match.
-  EXPECT_EQ(OSType::Unknown, Translate("wind"));
-  EXPECT_EQ(OSType::Unknown, Translate("Windows"));
-  EXPECT_EQ(OSType::Unknown, Translate(""));
-}
-
-TEST(StringSwitchTest, CasesLower) {
-  enum class OSType { Windows, Linux, Unknown };
-
-  auto Translate = [](StringRef S) {
-    return llvm::StringSwitch<OSType>(S)
-        .CasesLower(StringLiteral::withInnerNUL("wind\0ws"), "win32", "winnt",
-                    OSType::Windows)
-        .CasesLower("linux", "unix", "*nix", "posix", OSType::Linux)
-        .Default(OSType::Unknown);
-  };
-
-  EXPECT_EQ(OSType::Windows, Translate(llvm::StringRef("WIND\0WS", 7)));
-  EXPECT_EQ(OSType::Windows, Translate("WIN32"));
-  EXPECT_EQ(OSType::Windows, Translate("WINNT"));
-
-  EXPECT_EQ(OSType::Linux, Translate("LINUX"));
-  EXPECT_EQ(OSType::Linux, Translate("UNIX"));
-  EXPECT_EQ(OSType::Linux, Translate("*NIX"));
-  EXPECT_EQ(OSType::Linux, Translate("POSIX"));
-
-  EXPECT_EQ(OSType::Windows, Translate(llvm::StringRef("wind\0ws", 7)));
-  EXPECT_EQ(OSType::Linux, Translate("linux"));
-
-  EXPECT_EQ(OSType::Unknown, Translate("wind"));
-  EXPECT_EQ(OSType::Unknown, Translate(""));
-}
diff --git a/gnu/llvm/llvm/unittests/ADT/TestGraph.h b/gnu/llvm/llvm/unittests/ADT/TestGraph.h
deleted file mode 100644
index 3e6d4e14d5c..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/TestGraph.h
+++ /dev/null
@@ -1,250 +0,0 @@
-//===- llvm/unittest/ADT/TestGraph.h - Graph for testing ------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Common graph data structure for testing.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_UNITTESTS_ADT_TEST_GRAPH_H
-#define LLVM_UNITTESTS_ADT_TEST_GRAPH_H
-
-#include "llvm/ADT/GraphTraits.h"
-#include <cassert>
-#include <climits>
-#include <utility>
-
-namespace llvm {
-
-/// Graph<N> - A graph with N nodes.  Note that N can be at most 8.
-template <unsigned N>
-class Graph {
-private:
-  // Disable copying.
-  Graph(const Graph&);
-  Graph& operator=(const Graph&);
-
-  static void ValidateIndex(unsigned Idx) {
-    assert(Idx < N && "Invalid node index!");
-  }
-public:
-
-  /// NodeSubset - A subset of the graph's nodes.
-  class NodeSubset {
-    typedef unsigned char BitVector; // Where the limitation N <= 8 comes from.
-    BitVector Elements;
-    NodeSubset(BitVector e) : Elements(e) {}
-  public:
-    /// NodeSubset - Default constructor, creates an empty subset.
-    NodeSubset() : Elements(0) {
-      assert(N <= sizeof(BitVector)*CHAR_BIT && "Graph too big!");
-    }
-
-    /// Comparison operators.
-    bool operator==(const NodeSubset &other) const {
-      return other.Elements == this->Elements;
-    }
-    bool operator!=(const NodeSubset &other) const {
-      return !(*this == other);
-    }
-
-    /// AddNode - Add the node with the given index to the subset.
-    void AddNode(unsigned Idx) {
-      ValidateIndex(Idx);
-      Elements |= 1U << Idx;
-    }
-
-    /// DeleteNode - Remove the node with the given index from the subset.
-    void DeleteNode(unsigned Idx) {
-      ValidateIndex(Idx);
-      Elements &= ~(1U << Idx);
-    }
-
-    /// count - Return true if the node with the given index is in the subset.
-    bool count(unsigned Idx) {
-      ValidateIndex(Idx);
-      return (Elements & (1U << Idx)) != 0;
-    }
-
-    /// isEmpty - Return true if this is the empty set.
-    bool isEmpty() const {
-      return Elements == 0;
-    }
-
-    /// isSubsetOf - Return true if this set is a subset of the given one.
-    bool isSubsetOf(const NodeSubset &other) const {
-      return (this->Elements | other.Elements) == other.Elements;
-    }
-
-    /// Complement - Return the complement of this subset.
-    NodeSubset Complement() const {
-      return ~(unsigned)this->Elements & ((1U << N) - 1);
-    }
-
-    /// Join - Return the union of this subset and the given one.
-    NodeSubset Join(const NodeSubset &other) const {
-      return this->Elements | other.Elements;
-    }
-
-    /// Meet - Return the intersection of this subset and the given one.
-    NodeSubset Meet(const NodeSubset &other) const {
-      return this->Elements & other.Elements;
-    }
-  };
-
-  /// NodeType - Node index and set of children of the node.
-  typedef std::pair<unsigned, NodeSubset> NodeType;
-
-private:
-  /// Nodes - The list of nodes for this graph.
-  NodeType Nodes[N];
-public:
-
-  /// Graph - Default constructor.  Creates an empty graph.
-  Graph() {
-    // Let each node know which node it is.  This allows us to find the start of
-    // the Nodes array given a pointer to any element of it.
-    for (unsigned i = 0; i != N; ++i)
-      Nodes[i].first = i;
-  }
-
-  /// AddEdge - Add an edge from the node with index FromIdx to the node with
-  /// index ToIdx.
-  void AddEdge(unsigned FromIdx, unsigned ToIdx) {
-    ValidateIndex(FromIdx);
-    Nodes[FromIdx].second.AddNode(ToIdx);
-  }
-
-  /// DeleteEdge - Remove the edge (if any) from the node with index FromIdx to
-  /// the node with index ToIdx.
-  void DeleteEdge(unsigned FromIdx, unsigned ToIdx) {
-    ValidateIndex(FromIdx);
-    Nodes[FromIdx].second.DeleteNode(ToIdx);
-  }
-
-  /// AccessNode - Get a pointer to the node with the given index.
-  NodeType *AccessNode(unsigned Idx) const {
-    ValidateIndex(Idx);
-    // The constant cast is needed when working with GraphTraits, which insists
-    // on taking a constant Graph.
-    return const_cast<NodeType *>(&Nodes[Idx]);
-  }
-
-  /// NodesReachableFrom - Return the set of all nodes reachable from the given
-  /// node.
-  NodeSubset NodesReachableFrom(unsigned Idx) const {
-    // This algorithm doesn't scale, but that doesn't matter given the small
-    // size of our graphs.
-    NodeSubset Reachable;
-
-    // The initial node is reachable.
-    Reachable.AddNode(Idx);
-    do {
-      NodeSubset Previous(Reachable);
-
-      // Add in all nodes which are children of a reachable node.
-      for (unsigned i = 0; i != N; ++i)
-        if (Previous.count(i))
-          Reachable = Reachable.Join(Nodes[i].second);
-
-      // If nothing changed then we have found all reachable nodes.
-      if (Reachable == Previous)
-        return Reachable;
-
-      // Rinse and repeat.
-    } while (1);
-  }
-
-  /// ChildIterator - Visit all children of a node.
-  class ChildIterator {
-    friend class Graph;
-
-    /// FirstNode - Pointer to first node in the graph's Nodes array.
-    NodeType *FirstNode;
-    /// Children - Set of nodes which are children of this one and that haven't
-    /// yet been visited.
-    NodeSubset Children;
-
-    ChildIterator(); // Disable default constructor.
-  protected:
-    ChildIterator(NodeType *F, NodeSubset C) : FirstNode(F), Children(C) {}
-
-  public:
-    /// ChildIterator - Copy constructor.
-    ChildIterator(const ChildIterator &other) = default;
-    ChildIterator &operator=(const ChildIterator &other) = default;
-
-    /// Comparison operators.
-    bool operator==(const ChildIterator &other) const {
-      return other.FirstNode == this->FirstNode &&
-        other.Children == this->Children;
-    }
-    bool operator!=(const ChildIterator &other) const {
-      return !(*this == other);
-    }
-
-    /// Prefix increment operator.
-    ChildIterator& operator++() {
-      // Find the next unvisited child node.
-      for (unsigned i = 0; i != N; ++i)
-        if (Children.count(i)) {
-          // Remove that child - it has been visited.  This is the increment!
-          Children.DeleteNode(i);
-          return *this;
-        }
-      assert(false && "Incrementing end iterator!");
-      return *this; // Avoid compiler warnings.
-    }
-
-    /// Postfix increment operator.
-    ChildIterator operator++(int) {
-      ChildIterator Result(*this);
-      ++(*this);
-      return Result;
-    }
-
-    /// Dereference operator.
-    NodeType *operator*() {
-      // Find the next unvisited child node.
-      for (unsigned i = 0; i != N; ++i)
-        if (Children.count(i))
-          // Return a pointer to it.
-          return FirstNode + i;
-      assert(false && "Dereferencing end iterator!");
-      return nullptr; // Avoid compiler warning.
-    }
-  };
-
-  /// child_begin - Return an iterator pointing to the first child of the given
-  /// node.
-  static ChildIterator child_begin(NodeType *Parent) {
-    return ChildIterator(Parent - Parent->first, Parent->second);
-  }
-
-  /// child_end - Return the end iterator for children of the given node.
-  static ChildIterator child_end(NodeType *Parent) {
-    return ChildIterator(Parent - Parent->first, NodeSubset());
-  }
-};
-
-template <unsigned N>
-struct GraphTraits<Graph<N> > {
-  typedef typename Graph<N>::NodeType *NodeRef;
-  typedef typename Graph<N>::ChildIterator ChildIteratorType;
-
-  static NodeRef getEntryNode(const Graph<N> &G) { return G.AccessNode(0); }
-  static ChildIteratorType child_begin(NodeRef Node) {
-    return Graph<N>::child_begin(Node);
-  }
-  static ChildIteratorType child_end(NodeRef Node) {
-    return Graph<N>::child_end(Node);
-  }
-};
-
-} // End namespace llvm
-
-#endif
diff --git a/gnu/llvm/llvm/unittests/ADT/TinyPtrVectorTest.cpp b/gnu/llvm/llvm/unittests/ADT/TinyPtrVectorTest.cpp
deleted file mode 100644
index a78f5b0d32a..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/TinyPtrVectorTest.cpp
+++ /dev/null
@@ -1,469 +0,0 @@
-//===- llvm/unittest/ADT/TinyPtrVectorTest.cpp ----------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// TinyPtrVector unit tests.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/TinyPtrVector.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/Support/type_traits.h"
-#include "gtest/gtest.h"
-#include <algorithm>
-#include <random>
-#include <vector>
-
-using namespace llvm;
-
-namespace {
-template <typename T> struct RemovePointer : std::remove_pointer<T> {};
-
-template <typename PointerTy, unsigned IntBits, typename IntType,
-          typename PtrTraits, typename Info>
-struct RemovePointer<
-    PointerIntPair<PointerTy, IntBits, IntType, PtrTraits, Info>> {
-  typedef typename RemovePointer<PointerTy>::type type;
-};
-
-template <typename VectorT>
-class TinyPtrVectorTest : public testing::Test {
-protected:
-  typedef typename VectorT::value_type PtrT;
-  typedef typename RemovePointer<PtrT>::type ValueT;
-  using PtrTraits = PointerLikeTypeTraits<PtrT>;
-
-  VectorT V;
-  VectorT V2;
-
-  ValueT TestValues[1024];
-  std::vector<PtrT> TestPtrs;
-
-  TinyPtrVectorTest() {
-    for (size_t i = 0, e = array_lengthof(TestValues); i != e; ++i)
-      TestPtrs.push_back(PtrT(&TestValues[i]));
-
-    std::shuffle(TestPtrs.begin(), TestPtrs.end(), std::mt19937{});
-  }
-
-  PtrT makePtr(ValueT *V) { return PtrT(V); }
-
-  ArrayRef<PtrT> testArray(size_t N) {
-    return makeArrayRef(&TestPtrs[0], N);
-  }
-
-  void appendValues(VectorT &V, ArrayRef<PtrT> Values) {
-    for (size_t i = 0, e = Values.size(); i != e; ++i)
-      V.push_back(Values[i]);
-  }
-
-  void setVectors(ArrayRef<PtrT> Values1, ArrayRef<PtrT> Values2) {
-    V.clear();
-    appendValues(V, Values1);
-    V2.clear();
-    appendValues(V2, Values2);
-  }
-
-  void expectValues(const VectorT &V, ArrayRef<PtrT> Values) {
-    EXPECT_EQ(Values.empty(), V.empty());
-    EXPECT_EQ(Values.size(), V.size());
-    for (size_t i = 0, e = Values.size(); i != e; ++i) {
-      EXPECT_EQ(Values[i], V[i]);
-      EXPECT_EQ(Values[i], *std::next(V.begin(), i));
-    }
-    EXPECT_EQ(V.end(), std::next(V.begin(), Values.size()));
-  }
-};
-
-typedef ::testing::Types<TinyPtrVector<int *>, TinyPtrVector<double *>,
-                         TinyPtrVector<PointerIntPair<int *, 1>>>
-    TinyPtrVectorTestTypes;
-TYPED_TEST_SUITE(TinyPtrVectorTest, TinyPtrVectorTestTypes, );
-
-TYPED_TEST(TinyPtrVectorTest, EmptyTest) {
-  this->expectValues(this->V, this->testArray(0));
-}
-
-TYPED_TEST(TinyPtrVectorTest, PushPopBack) {
-  this->V.push_back(this->TestPtrs[0]);
-  this->expectValues(this->V, this->testArray(1));
-  this->V.push_back(this->TestPtrs[1]);
-  this->expectValues(this->V, this->testArray(2));
-  this->V.push_back(this->TestPtrs[2]);
-  this->expectValues(this->V, this->testArray(3));
-  this->V.push_back(this->TestPtrs[3]);
-  this->expectValues(this->V, this->testArray(4));
-  this->V.push_back(this->TestPtrs[4]);
-  this->expectValues(this->V, this->testArray(5));
-
-  // Pop and clobber a few values to keep things interesting.
-  this->V.pop_back();
-  this->expectValues(this->V, this->testArray(4));
-  this->V.pop_back();
-  this->expectValues(this->V, this->testArray(3));
-  this->TestPtrs[3] = this->makePtr(&this->TestValues[42]);
-  this->TestPtrs[4] = this->makePtr(&this->TestValues[43]);
-  this->V.push_back(this->TestPtrs[3]);
-  this->expectValues(this->V, this->testArray(4));
-  this->V.push_back(this->TestPtrs[4]);
-  this->expectValues(this->V, this->testArray(5));
-
-  this->V.pop_back();
-  this->expectValues(this->V, this->testArray(4));
-  this->V.pop_back();
-  this->expectValues(this->V, this->testArray(3));
-  this->V.pop_back();
-  this->expectValues(this->V, this->testArray(2));
-  this->V.pop_back();
-  this->expectValues(this->V, this->testArray(1));
-  this->V.pop_back();
-  this->expectValues(this->V, this->testArray(0));
-
-  this->appendValues(this->V, this->testArray(42));
-  this->expectValues(this->V, this->testArray(42));
-}
-
-TYPED_TEST(TinyPtrVectorTest, ClearTest) {
-  this->expectValues(this->V, this->testArray(0));
-  this->V.clear();
-  this->expectValues(this->V, this->testArray(0));
-
-  this->appendValues(this->V, this->testArray(1));
-  this->expectValues(this->V, this->testArray(1));
-  this->V.clear();
-  this->expectValues(this->V, this->testArray(0));
-
-  this->appendValues(this->V, this->testArray(42));
-  this->expectValues(this->V, this->testArray(42));
-  this->V.clear();
-  this->expectValues(this->V, this->testArray(0));
-}
-
-TYPED_TEST(TinyPtrVectorTest, CopyAndMoveCtorTest) {
-  this->appendValues(this->V, this->testArray(42));
-  TypeParam Copy(this->V);
-  this->expectValues(Copy, this->testArray(42));
-
-  // This is a separate copy, and so it shouldn't destroy the original.
-  Copy.clear();
-  this->expectValues(Copy, this->testArray(0));
-  this->expectValues(this->V, this->testArray(42));
-
-  TypeParam Copy2(this->V2);
-  this->appendValues(Copy2, this->testArray(42));
-  this->expectValues(Copy2, this->testArray(42));
-  this->expectValues(this->V2, this->testArray(0));
-
-  TypeParam Move(std::move(Copy2));
-  this->expectValues(Move, this->testArray(42));
-  this->expectValues(Copy2, this->testArray(0));
-
-  TypeParam MultipleElements(this->testArray(2));
-  TypeParam SingleElement(this->testArray(1));
-  MultipleElements = std::move(SingleElement);
-  this->expectValues(MultipleElements, this->testArray(1));
-  this->expectValues(SingleElement, this->testArray(0));
-}
-
-TYPED_TEST(TinyPtrVectorTest, CopyAndMoveTest) {
-  this->V = this->V2;
-  this->expectValues(this->V, this->testArray(0));
-  this->expectValues(this->V2, this->testArray(0));
-  this->V = std::move(this->V2);
-  this->expectValues(this->V, this->testArray(0));
-
-  this->setVectors(this->testArray(1), this->testArray(0));
-  this->V = this->V2;
-  this->expectValues(this->V, this->testArray(0));
-  this->expectValues(this->V2, this->testArray(0));
-  this->setVectors(this->testArray(1), this->testArray(0));
-  this->V = std::move(this->V2);
-  this->expectValues(this->V, this->testArray(0));
-
-  this->setVectors(this->testArray(2), this->testArray(0));
-  this->V = this->V2;
-  this->expectValues(this->V, this->testArray(0));
-  this->expectValues(this->V2, this->testArray(0));
-  this->setVectors(this->testArray(2), this->testArray(0));
-  this->V = std::move(this->V2);
-  this->expectValues(this->V, this->testArray(0));
-
-  this->setVectors(this->testArray(42), this->testArray(0));
-  this->V = this->V2;
-  this->expectValues(this->V, this->testArray(0));
-  this->expectValues(this->V2, this->testArray(0));
-  this->setVectors(this->testArray(42), this->testArray(0));
-  this->V = std::move(this->V2);
-  this->expectValues(this->V, this->testArray(0));
-
-  this->setVectors(this->testArray(0), this->testArray(1));
-  this->V = this->V2;
-  this->expectValues(this->V, this->testArray(1));
-  this->expectValues(this->V2, this->testArray(1));
-  this->setVectors(this->testArray(0), this->testArray(1));
-  this->V = std::move(this->V2);
-  this->expectValues(this->V, this->testArray(1));
-
-  this->setVectors(this->testArray(0), this->testArray(2));
-  this->V = this->V2;
-  this->expectValues(this->V, this->testArray(2));
-  this->expectValues(this->V2, this->testArray(2));
-  this->setVectors(this->testArray(0), this->testArray(2));
-  this->V = std::move(this->V2);
-  this->expectValues(this->V, this->testArray(2));
-
-  this->setVectors(this->testArray(0), this->testArray(42));
-  this->V = this->V2;
-  this->expectValues(this->V, this->testArray(42));
-  this->expectValues(this->V2, this->testArray(42));
-  this->setVectors(this->testArray(0), this->testArray(42));
-  this->V = std::move(this->V2);
-  this->expectValues(this->V, this->testArray(42));
-
-  this->setVectors(this->testArray(1), this->testArray(1));
-  this->V = this->V2;
-  this->expectValues(this->V, this->testArray(1));
-  this->expectValues(this->V2, this->testArray(1));
-  this->V = std::move(this->V2);
-  this->expectValues(this->V, this->testArray(1));
-
-  this->setVectors(this->testArray(1), this->testArray(2));
-  this->V = this->V2;
-  this->expectValues(this->V, this->testArray(2));
-  this->expectValues(this->V2, this->testArray(2));
-  this->setVectors(this->testArray(1), this->testArray(2));
-  this->V = std::move(this->V2);
-  this->expectValues(this->V, this->testArray(2));
-
-  this->setVectors(this->testArray(1), this->testArray(42));
-  this->V = this->V2;
-  this->expectValues(this->V, this->testArray(42));
-  this->expectValues(this->V2, this->testArray(42));
-  this->setVectors(this->testArray(1), this->testArray(42));
-  this->V = std::move(this->V2);
-  this->expectValues(this->V, this->testArray(42));
-
-  this->setVectors(this->testArray(2), this->testArray(1));
-  this->V = this->V2;
-  this->expectValues(this->V, this->testArray(1));
-  this->expectValues(this->V2, this->testArray(1));
-  this->setVectors(this->testArray(2), this->testArray(1));
-  this->V = std::move(this->V2);
-  this->expectValues(this->V, this->testArray(1));
-
-  this->setVectors(this->testArray(2), this->testArray(2));
-  this->V = this->V2;
-  this->expectValues(this->V, this->testArray(2));
-  this->expectValues(this->V2, this->testArray(2));
-  this->setVectors(this->testArray(2), this->testArray(2));
-  this->V = std::move(this->V2);
-  this->expectValues(this->V, this->testArray(2));
-
-  this->setVectors(this->testArray(2), this->testArray(42));
-  this->V = this->V2;
-  this->expectValues(this->V, this->testArray(42));
-  this->expectValues(this->V2, this->testArray(42));
-  this->setVectors(this->testArray(2), this->testArray(42));
-  this->V = std::move(this->V2);
-  this->expectValues(this->V, this->testArray(42));
-
-  this->setVectors(this->testArray(42), this->testArray(1));
-  this->V = this->V2;
-  this->expectValues(this->V, this->testArray(1));
-  this->expectValues(this->V2, this->testArray(1));
-  this->setVectors(this->testArray(42), this->testArray(1));
-  this->V = std::move(this->V2);
-  this->expectValues(this->V, this->testArray(1));
-
-  this->setVectors(this->testArray(42), this->testArray(2));
-  this->V = this->V2;
-  this->expectValues(this->V, this->testArray(2));
-  this->expectValues(this->V2, this->testArray(2));
-  this->setVectors(this->testArray(42), this->testArray(2));
-  this->V = std::move(this->V2);
-  this->expectValues(this->V, this->testArray(2));
-
-  this->setVectors(this->testArray(42), this->testArray(42));
-  this->V = this->V2;
-  this->expectValues(this->V, this->testArray(42));
-  this->expectValues(this->V2, this->testArray(42));
-  this->setVectors(this->testArray(42), this->testArray(42));
-  this->V = std::move(this->V2);
-  this->expectValues(this->V, this->testArray(42));
-}
-
-TYPED_TEST(TinyPtrVectorTest, EraseTest) {
-  this->appendValues(this->V, this->testArray(1));
-  this->expectValues(this->V, this->testArray(1));
-  this->V.erase(this->V.begin());
-  this->expectValues(this->V, this->testArray(0));
-
-  this->appendValues(this->V, this->testArray(42));
-  this->expectValues(this->V, this->testArray(42));
-  this->V.erase(this->V.begin());
-  this->TestPtrs.erase(this->TestPtrs.begin());
-  this->expectValues(this->V, this->testArray(41));
-  this->V.erase(std::next(this->V.begin(), 1));
-  this->TestPtrs.erase(std::next(this->TestPtrs.begin(), 1));
-  this->expectValues(this->V, this->testArray(40));
-  this->V.erase(std::next(this->V.begin(), 2));
-  this->TestPtrs.erase(std::next(this->TestPtrs.begin(), 2));
-  this->expectValues(this->V, this->testArray(39));
-  this->V.erase(std::next(this->V.begin(), 5));
-  this->TestPtrs.erase(std::next(this->TestPtrs.begin(), 5));
-  this->expectValues(this->V, this->testArray(38));
-  this->V.erase(std::next(this->V.begin(), 13));
-  this->TestPtrs.erase(std::next(this->TestPtrs.begin(), 13));
-  this->expectValues(this->V, this->testArray(37));
-
-  typename TypeParam::iterator I = this->V.begin();
-  do {
-    I = this->V.erase(I);
-  } while (I != this->V.end());
-  this->expectValues(this->V, this->testArray(0));
-}
-
-TYPED_TEST(TinyPtrVectorTest, EraseRangeTest) {
-  this->appendValues(this->V, this->testArray(1));
-  this->expectValues(this->V, this->testArray(1));
-  this->V.erase(this->V.begin(), this->V.begin());
-  this->expectValues(this->V, this->testArray(1));
-  this->V.erase(this->V.end(), this->V.end());
-  this->expectValues(this->V, this->testArray(1));
-  this->V.erase(this->V.begin(), this->V.end());
-  this->expectValues(this->V, this->testArray(0));
-
-  this->appendValues(this->V, this->testArray(42));
-  this->expectValues(this->V, this->testArray(42));
-  this->V.erase(this->V.begin(), std::next(this->V.begin(), 1));
-  this->TestPtrs.erase(this->TestPtrs.begin(),
-                       std::next(this->TestPtrs.begin(), 1));
-  this->expectValues(this->V, this->testArray(41));
-  this->V.erase(std::next(this->V.begin(), 1), std::next(this->V.begin(), 2));
-  this->TestPtrs.erase(std::next(this->TestPtrs.begin(), 1),
-                       std::next(this->TestPtrs.begin(), 2));
-  this->expectValues(this->V, this->testArray(40));
-  this->V.erase(std::next(this->V.begin(), 2), std::next(this->V.begin(), 4));
-  this->TestPtrs.erase(std::next(this->TestPtrs.begin(), 2),
-                       std::next(this->TestPtrs.begin(), 4));
-  this->expectValues(this->V, this->testArray(38));
-  this->V.erase(std::next(this->V.begin(), 5), std::next(this->V.begin(), 10));
-  this->TestPtrs.erase(std::next(this->TestPtrs.begin(), 5),
-                       std::next(this->TestPtrs.begin(), 10));
-  this->expectValues(this->V, this->testArray(33));
-  this->V.erase(std::next(this->V.begin(), 13), std::next(this->V.begin(), 26));
-  this->TestPtrs.erase(std::next(this->TestPtrs.begin(), 13),
-                       std::next(this->TestPtrs.begin(), 26));
-  this->expectValues(this->V, this->testArray(20));
-  this->V.erase(std::next(this->V.begin(), 7), this->V.end());
-  this->expectValues(this->V, this->testArray(7));
-  this->V.erase(this->V.begin(), this->V.end());
-  this->expectValues(this->V, this->testArray(0));
-}
-
-TYPED_TEST(TinyPtrVectorTest, Insert) {
-  this->V.insert(this->V.end(), this->TestPtrs[0]);
-  this->expectValues(this->V, this->testArray(1));
-  this->V.clear();
-  this->appendValues(this->V, this->testArray(4));
-  this->expectValues(this->V, this->testArray(4));
-  this->V.insert(this->V.end(), this->TestPtrs[4]);
-  this->expectValues(this->V, this->testArray(5));
-  this->V.insert(this->V.begin(), this->TestPtrs[42]);
-  this->TestPtrs.insert(this->TestPtrs.begin(), this->TestPtrs[42]);
-  this->expectValues(this->V, this->testArray(6));
-  this->V.insert(std::next(this->V.begin(), 3), this->TestPtrs[43]);
-  this->TestPtrs.insert(std::next(this->TestPtrs.begin(), 3),
-                        this->TestPtrs[43]);
-  this->expectValues(this->V, this->testArray(7));
-}
-
-TYPED_TEST(TinyPtrVectorTest, InsertRange) {
-  this->V.insert(this->V.end(), this->TestPtrs.begin(), this->TestPtrs.begin());
-  this->expectValues(this->V, this->testArray(0));
-  this->V.insert(this->V.begin(), this->TestPtrs.begin(),
-                 this->TestPtrs.begin());
-  this->expectValues(this->V, this->testArray(0));
-  this->V.insert(this->V.end(), this->TestPtrs.end(), this->TestPtrs.end());
-  this->expectValues(this->V, this->testArray(0));
-  this->V.insert(this->V.end(), this->TestPtrs.begin(),
-                 std::next(this->TestPtrs.begin()));
-  this->expectValues(this->V, this->testArray(1));
-  this->V.clear();
-  this->V.insert(this->V.end(), this->TestPtrs.begin(),
-                 std::next(this->TestPtrs.begin(), 2));
-  this->expectValues(this->V, this->testArray(2));
-  this->V.clear();
-  this->V.insert(this->V.end(), this->TestPtrs.begin(),
-                 std::next(this->TestPtrs.begin(), 42));
-  this->expectValues(this->V, this->testArray(42));
-  this->V.clear();
-  this->V.insert(this->V.end(),
-                 std::next(this->TestPtrs.begin(), 5),
-                 std::next(this->TestPtrs.begin(), 13));
-  this->V.insert(this->V.begin(),
-                 std::next(this->TestPtrs.begin(), 0),
-                 std::next(this->TestPtrs.begin(), 3));
-  this->V.insert(std::next(this->V.begin(), 2),
-                 std::next(this->TestPtrs.begin(), 2),
-                 std::next(this->TestPtrs.begin(), 4));
-  this->V.erase(std::next(this->V.begin(), 4));
-  this->V.insert(std::next(this->V.begin(), 4),
-                 std::next(this->TestPtrs.begin(), 4),
-                 std::next(this->TestPtrs.begin(), 5));
-  this->expectValues(this->V, this->testArray(13));
-}
-
-}
-
-TEST(TinyPtrVectorTest, SingleEltCtorTest) {
-  int v = 55;
-  TinyPtrVector<int *> V(&v);
-
-  EXPECT_TRUE(V.size() == 1);
-  EXPECT_FALSE(V.empty());
-  EXPECT_TRUE(V.front() == &v);
-}
-
-TEST(TinyPtrVectorTest, ArrayRefCtorTest) {
-  int data_array[128];
-  std::vector<int *> data;
-
-  for (unsigned i = 0, e = 128; i != e; ++i) {
-    data_array[i] = 324 - int(i);
-    data.push_back(&data_array[i]);
-  }
-
-  TinyPtrVector<int *> V(data);
-  EXPECT_TRUE(V.size() == 128);
-  EXPECT_FALSE(V.empty());
-  for (unsigned i = 0, e = 128; i != e; ++i) {
-    EXPECT_TRUE(V[i] == data[i]);
-  }
-}
-
-TEST(TinyPtrVectorTest, MutableArrayRefTest) {
-  int data_array[128];
-  std::vector<int *> data;
-
-  for (unsigned i = 0, e = 128; i != e; ++i) {
-    data_array[i] = 324 - int(i);
-    data.push_back(&data_array[i]);
-  }
-
-  TinyPtrVector<int *> V(data);
-  EXPECT_TRUE(V.size() == 128);
-  EXPECT_FALSE(V.empty());
-
-  MutableArrayRef<int *> mut_array = V;
-  for (unsigned i = 0, e = 128; i != e; ++i) {
-    EXPECT_TRUE(mut_array[i] == data[i]);
-    mut_array[i] = 324 + mut_array[i];
-    EXPECT_TRUE(mut_array[i] == (324 + data[i]));
-  }
-}
diff --git a/gnu/llvm/llvm/unittests/ADT/TripleTest.cpp b/gnu/llvm/llvm/unittests/ADT/TripleTest.cpp
deleted file mode 100644
index f9ff7dd586c..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/TripleTest.cpp
+++ /dev/null
@@ -1,1609 +0,0 @@
-//===----------- Triple.cpp - Triple unit tests ---------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/Triple.h"
-#include "llvm/Support/VersionTuple.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST(TripleTest, BasicParsing) {
-  Triple T;
-
-  T = Triple("");
-  EXPECT_EQ("", T.getArchName().str());
-  EXPECT_EQ("", T.getVendorName().str());
-  EXPECT_EQ("", T.getOSName().str());
-  EXPECT_EQ("", T.getEnvironmentName().str());
-
-  T = Triple("-");
-  EXPECT_EQ("", T.getArchName().str());
-  EXPECT_EQ("", T.getVendorName().str());
-  EXPECT_EQ("", T.getOSName().str());
-  EXPECT_EQ("", T.getEnvironmentName().str());
-
-  T = Triple("--");
-  EXPECT_EQ("", T.getArchName().str());
-  EXPECT_EQ("", T.getVendorName().str());
-  EXPECT_EQ("", T.getOSName().str());
-  EXPECT_EQ("", T.getEnvironmentName().str());
-
-  T = Triple("---");
-  EXPECT_EQ("", T.getArchName().str());
-  EXPECT_EQ("", T.getVendorName().str());
-  EXPECT_EQ("", T.getOSName().str());
-  EXPECT_EQ("", T.getEnvironmentName().str());
-
-  T = Triple("----");
-  EXPECT_EQ("", T.getArchName().str());
-  EXPECT_EQ("", T.getVendorName().str());
-  EXPECT_EQ("", T.getOSName().str());
-  EXPECT_EQ("-", T.getEnvironmentName().str());
-
-  T = Triple("a");
-  EXPECT_EQ("a", T.getArchName().str());
-  EXPECT_EQ("", T.getVendorName().str());
-  EXPECT_EQ("", T.getOSName().str());
-  EXPECT_EQ("", T.getEnvironmentName().str());
-
-  T = Triple("a-b");
-  EXPECT_EQ("a", T.getArchName().str());
-  EXPECT_EQ("b", T.getVendorName().str());
-  EXPECT_EQ("", T.getOSName().str());
-  EXPECT_EQ("", T.getEnvironmentName().str());
-
-  T = Triple("a-b-c");
-  EXPECT_EQ("a", T.getArchName().str());
-  EXPECT_EQ("b", T.getVendorName().str());
-  EXPECT_EQ("c", T.getOSName().str());
-  EXPECT_EQ("", T.getEnvironmentName().str());
-
-  T = Triple("a-b-c-d");
-  EXPECT_EQ("a", T.getArchName().str());
-  EXPECT_EQ("b", T.getVendorName().str());
-  EXPECT_EQ("c", T.getOSName().str());
-  EXPECT_EQ("d", T.getEnvironmentName().str());
-}
-
-TEST(TripleTest, ParsedIDs) {
-  Triple T;
-
-  T = Triple("i386-apple-darwin");
-  EXPECT_EQ(Triple::x86, T.getArch());
-  EXPECT_EQ(Triple::Apple, T.getVendor());
-  EXPECT_EQ(Triple::Darwin, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-
-  T = Triple("i386-pc-elfiamcu");
-  EXPECT_EQ(Triple::x86, T.getArch());
-  EXPECT_EQ(Triple::PC, T.getVendor());
-  EXPECT_EQ(Triple::ELFIAMCU, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-
-  T = Triple("i386-pc-contiki-unknown");
-  EXPECT_EQ(Triple::x86, T.getArch());
-  EXPECT_EQ(Triple::PC, T.getVendor());
-  EXPECT_EQ(Triple::Contiki, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-
-  T = Triple("i386-pc-hurd-gnu");
-  EXPECT_EQ(Triple::x86, T.getArch());
-  EXPECT_EQ(Triple::PC, T.getVendor());
-  EXPECT_EQ(Triple::Hurd, T.getOS());
-  EXPECT_EQ(Triple::GNU, T.getEnvironment());
-
-  T = Triple("x86_64-pc-linux-gnu");
-  EXPECT_EQ(Triple::x86_64, T.getArch());
-  EXPECT_EQ(Triple::PC, T.getVendor());
-  EXPECT_EQ(Triple::Linux, T.getOS());
-  EXPECT_EQ(Triple::GNU, T.getEnvironment());
-
-  T = Triple("x86_64-pc-linux-musl");
-  EXPECT_EQ(Triple::x86_64, T.getArch());
-  EXPECT_EQ(Triple::PC, T.getVendor());
-  EXPECT_EQ(Triple::Linux, T.getOS());
-  EXPECT_EQ(Triple::Musl, T.getEnvironment());
-
-  T = Triple("x86_64-pc-linux-muslx32");
-  EXPECT_EQ(Triple::x86_64, T.getArch());
-  EXPECT_EQ(Triple::PC, T.getVendor());
-  EXPECT_EQ(Triple::Linux, T.getOS());
-  EXPECT_EQ(Triple::MuslX32, T.getEnvironment());
-
-  // PS4 has two spellings for the vendor.
-  T = Triple("x86_64-scei-ps4");
-  EXPECT_EQ(Triple::x86_64, T.getArch());
-  EXPECT_EQ(Triple::SCEI, T.getVendor());
-  EXPECT_EQ(Triple::PS4, T.getOS());
-
-  T = Triple("x86_64-sie-ps4");
-  EXPECT_EQ(Triple::x86_64, T.getArch());
-  EXPECT_EQ(Triple::SCEI, T.getVendor());
-  EXPECT_EQ(Triple::PS4, T.getOS());
-
-  T = Triple("powerpc-ibm-aix");
-  EXPECT_EQ(Triple::ppc, T.getArch());
-  EXPECT_EQ(Triple::IBM, T.getVendor());
-  EXPECT_EQ(Triple::AIX, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-
-  T = Triple("powerpc64-ibm-aix");
-  EXPECT_EQ(Triple::ppc64, T.getArch());
-  EXPECT_EQ(Triple::IBM, T.getVendor());
-  EXPECT_EQ(Triple::AIX, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-
-  T = Triple("powerpc-dunno-notsure");
-  EXPECT_EQ(Triple::ppc, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::UnknownOS, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-
-  T = Triple("powerpcspe-unknown-freebsd");
-  EXPECT_EQ(Triple::ppc, T.getArch());
-  EXPECT_EQ(Triple::PPCSubArch_spe, T.getSubArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::FreeBSD, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-
-  T = Triple("s390x-ibm-zos");
-  EXPECT_EQ(Triple::systemz, T.getArch());
-  EXPECT_EQ(Triple::IBM, T.getVendor());
-  EXPECT_EQ(Triple::ZOS, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-
-  T = Triple("systemz-ibm-zos");
-  EXPECT_EQ(Triple::systemz, T.getArch());
-  EXPECT_EQ(Triple::IBM, T.getVendor());
-  EXPECT_EQ(Triple::ZOS, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-
-  T = Triple("arm-none-none-eabi");
-  EXPECT_EQ(Triple::arm, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::UnknownOS, T.getOS());
-  EXPECT_EQ(Triple::EABI, T.getEnvironment());
-
-  T = Triple("arm-none-linux-musleabi");
-  EXPECT_EQ(Triple::arm, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::Linux, T.getOS());
-  EXPECT_EQ(Triple::MuslEABI, T.getEnvironment());
-
-  T = Triple("armv6hl-none-linux-gnueabi");
-  EXPECT_EQ(Triple::arm, T.getArch());
-  EXPECT_EQ(Triple::Linux, T.getOS());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::GNUEABI, T.getEnvironment());
-
-  T = Triple("armv7hl-none-linux-gnueabi");
-  EXPECT_EQ(Triple::arm, T.getArch());
-  EXPECT_EQ(Triple::Linux, T.getOS());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::GNUEABI, T.getEnvironment());
-
-  T = Triple("amdil-unknown-unknown");
-  EXPECT_EQ(Triple::amdil, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::UnknownOS, T.getOS());
-
-  T = Triple("amdil64-unknown-unknown");
-  EXPECT_EQ(Triple::amdil64, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::UnknownOS, T.getOS());
-
-  T = Triple("hsail-unknown-unknown");
-  EXPECT_EQ(Triple::hsail, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::UnknownOS, T.getOS());
-
-  T = Triple("hsail64-unknown-unknown");
-  EXPECT_EQ(Triple::hsail64, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::UnknownOS, T.getOS());
-
-  T = Triple("sparcel-unknown-unknown");
-  EXPECT_EQ(Triple::sparcel, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::UnknownOS, T.getOS());
-
-  T = Triple("spir-unknown-unknown");
-  EXPECT_EQ(Triple::spir, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::UnknownOS, T.getOS());
-
-  T = Triple("spir64-unknown-unknown");
-  EXPECT_EQ(Triple::spir64, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::UnknownOS, T.getOS());
-
-  T = Triple("x86_64-unknown-ananas");
-  EXPECT_EQ(Triple::x86_64, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::Ananas, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-
-  T = Triple("x86_64-unknown-cloudabi");
-  EXPECT_EQ(Triple::x86_64, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::CloudABI, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-
-  T = Triple("x86_64-unknown-fuchsia");
-  EXPECT_EQ(Triple::x86_64, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::Fuchsia, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-
-  T = Triple("x86_64-unknown-hermit");
-  EXPECT_EQ(Triple::x86_64, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::HermitCore, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-
-  T = Triple("wasm32-unknown-unknown");
-  EXPECT_EQ(Triple::wasm32, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::UnknownOS, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-
-  T = Triple("wasm32-unknown-wasi");
-  EXPECT_EQ(Triple::wasm32, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::WASI, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-
-  T = Triple("wasm64-unknown-unknown");
-  EXPECT_EQ(Triple::wasm64, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::UnknownOS, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-
-  T = Triple("wasm64-unknown-wasi");
-  EXPECT_EQ(Triple::wasm64, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::WASI, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-
-  T = Triple("avr-unknown-unknown");
-  EXPECT_EQ(Triple::avr, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::UnknownOS, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-
-  T = Triple("avr");
-  EXPECT_EQ(Triple::avr, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::UnknownOS, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-
-  T = Triple("lanai-unknown-unknown");
-  EXPECT_EQ(Triple::lanai, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::UnknownOS, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-
-  T = Triple("lanai");
-  EXPECT_EQ(Triple::lanai, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::UnknownOS, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-
-  T = Triple("amdgcn-mesa-mesa3d");
-  EXPECT_EQ(Triple::amdgcn, T.getArch());
-  EXPECT_EQ(Triple::Mesa, T.getVendor());
-  EXPECT_EQ(Triple::Mesa3D, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-
-  T = Triple("amdgcn-amd-amdhsa");
-  EXPECT_EQ(Triple::amdgcn, T.getArch());
-  EXPECT_EQ(Triple::AMD, T.getVendor());
-  EXPECT_EQ(Triple::AMDHSA, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-
-  T = Triple("amdgcn-amd-amdpal");
-  EXPECT_EQ(Triple::amdgcn, T.getArch());
-  EXPECT_EQ(Triple::AMD, T.getVendor());
-  EXPECT_EQ(Triple::AMDPAL, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-
-  T = Triple("ve-unknown-linux");
-  EXPECT_EQ(Triple::ve, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::Linux, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-
-  T = Triple("csky-unknown-unknown");
-  EXPECT_EQ(Triple::csky, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::UnknownOS, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-
-  T = Triple("csky-unknown-linux");
-  EXPECT_EQ(Triple::csky, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::Linux, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-
-  T = Triple("riscv32-unknown-unknown");
-  EXPECT_EQ(Triple::riscv32, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::UnknownOS, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-
-  T = Triple("riscv64-unknown-linux");
-  EXPECT_EQ(Triple::riscv64, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::Linux, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-
-  T = Triple("riscv64-unknown-freebsd");
-  EXPECT_EQ(Triple::riscv64, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::FreeBSD, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-
-  T = Triple("riscv64-suse-linux");
-  EXPECT_EQ(Triple::riscv64, T.getArch());
-  EXPECT_EQ(Triple::SUSE, T.getVendor());
-  EXPECT_EQ(Triple::Linux, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-
-  T = Triple("armv7hl-suse-linux-gnueabi");
-  EXPECT_EQ(Triple::arm, T.getArch());
-  EXPECT_EQ(Triple::SUSE, T.getVendor());
-  EXPECT_EQ(Triple::Linux, T.getOS());
-  EXPECT_EQ(Triple::GNUEABI, T.getEnvironment());
-
-  T = Triple("i586-pc-haiku");
-  EXPECT_EQ(Triple::x86, T.getArch());
-  EXPECT_EQ(Triple::PC, T.getVendor());
-  EXPECT_EQ(Triple::Haiku, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-
-  T = Triple("x86_64-unknown-haiku");
-  EXPECT_EQ(Triple::x86_64, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::Haiku, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-
-  T = Triple("mips-mti-linux-gnu");
-  EXPECT_EQ(Triple::mips, T.getArch());
-  EXPECT_EQ(Triple::MipsTechnologies, T.getVendor());
-  EXPECT_EQ(Triple::Linux, T.getOS());
-  EXPECT_EQ(Triple::GNU, T.getEnvironment());
-
-  T = Triple("mipsel-img-linux-gnu");
-  EXPECT_EQ(Triple::mipsel, T.getArch());
-  EXPECT_EQ(Triple::ImaginationTechnologies, T.getVendor());
-  EXPECT_EQ(Triple::Linux, T.getOS());
-  EXPECT_EQ(Triple::GNU, T.getEnvironment());
-
-  T = Triple("mips64-mti-linux-gnu");
-  EXPECT_EQ(Triple::mips64, T.getArch());
-  EXPECT_EQ(Triple::MipsTechnologies, T.getVendor());
-  EXPECT_EQ(Triple::Linux, T.getOS());
-  EXPECT_EQ(Triple::GNU, T.getEnvironment());
-
-  T = Triple("mips64el-img-linux-gnu");
-  EXPECT_EQ(Triple::mips64el, T.getArch());
-  EXPECT_EQ(Triple::ImaginationTechnologies, T.getVendor());
-  EXPECT_EQ(Triple::Linux, T.getOS());
-  EXPECT_EQ(Triple::GNU, T.getEnvironment());
-
-  T = Triple("mips64el-img-linux-gnuabin32");
-  EXPECT_EQ(Triple::mips64el, T.getArch());
-  EXPECT_EQ(Triple::ImaginationTechnologies, T.getVendor());
-  EXPECT_EQ(Triple::Linux, T.getOS());
-  EXPECT_EQ(Triple::GNUABIN32, T.getEnvironment());
-
-  T = Triple("mips64el-unknown-linux-gnuabi64");
-  EXPECT_EQ(Triple::mips64el, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::Linux, T.getOS());
-  EXPECT_EQ(Triple::GNUABI64, T.getEnvironment());
-  EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
-  T = Triple("mips64el");
-  EXPECT_EQ(Triple::mips64el, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::GNUABI64, T.getEnvironment());
-  EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
-
-  T = Triple("mips64-unknown-linux-gnuabi64");
-  EXPECT_EQ(Triple::mips64, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::Linux, T.getOS());
-  EXPECT_EQ(Triple::GNUABI64, T.getEnvironment());
-  EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
-  T = Triple("mips64");
-  EXPECT_EQ(Triple::mips64, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::GNUABI64, T.getEnvironment());
-  EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
-
-  T = Triple("mipsisa64r6el-unknown-linux-gnuabi64");
-  EXPECT_EQ(Triple::mips64el, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::Linux, T.getOS());
-  EXPECT_EQ(Triple::GNUABI64, T.getEnvironment());
-  EXPECT_EQ(Triple::MipsSubArch_r6, T.getSubArch());
-  T = Triple("mips64r6el");
-  EXPECT_EQ(Triple::mips64el, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::GNUABI64, T.getEnvironment());
-  EXPECT_EQ(Triple::MipsSubArch_r6, T.getSubArch());
-  T = Triple("mipsisa64r6el");
-  EXPECT_EQ(Triple::mips64el, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::GNUABI64, T.getEnvironment());
-  EXPECT_EQ(Triple::MipsSubArch_r6, T.getSubArch());
-
-  T = Triple("mipsisa64r6-unknown-linux-gnuabi64");
-  EXPECT_EQ(Triple::mips64, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::Linux, T.getOS());
-  EXPECT_EQ(Triple::GNUABI64, T.getEnvironment());
-  EXPECT_EQ(Triple::MipsSubArch_r6, T.getSubArch());
-  T = Triple("mips64r6");
-  EXPECT_EQ(Triple::mips64, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::GNUABI64, T.getEnvironment());
-  EXPECT_EQ(Triple::MipsSubArch_r6, T.getSubArch());
-  T = Triple("mipsisa64r6");
-  EXPECT_EQ(Triple::mips64, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::GNUABI64, T.getEnvironment());
-  EXPECT_EQ(Triple::MipsSubArch_r6, T.getSubArch());
-
-  T = Triple("mips64el-unknown-linux-gnuabin32");
-  EXPECT_EQ(Triple::mips64el, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::Linux, T.getOS());
-  EXPECT_EQ(Triple::GNUABIN32, T.getEnvironment());
-  EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
-  T = Triple("mipsn32el");
-  EXPECT_EQ(Triple::mips64el, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::GNUABIN32, T.getEnvironment());
-  EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
-
-  T = Triple("mips64-unknown-linux-gnuabin32");
-  EXPECT_EQ(Triple::mips64, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::Linux, T.getOS());
-  EXPECT_EQ(Triple::GNUABIN32, T.getEnvironment());
-  EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
-  T = Triple("mipsn32");
-  EXPECT_EQ(Triple::mips64, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::GNUABIN32, T.getEnvironment());
-  EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
-
-  T = Triple("mipsisa64r6el-unknown-linux-gnuabin32");
-  EXPECT_EQ(Triple::mips64el, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::Linux, T.getOS());
-  EXPECT_EQ(Triple::GNUABIN32, T.getEnvironment());
-  EXPECT_EQ(Triple::MipsSubArch_r6, T.getSubArch());
-  T = Triple("mipsn32r6el");
-  EXPECT_EQ(Triple::mips64el, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::GNUABIN32, T.getEnvironment());
-  EXPECT_EQ(Triple::MipsSubArch_r6, T.getSubArch());
-
-  T = Triple("mipsisa64r6-unknown-linux-gnuabin32");
-  EXPECT_EQ(Triple::mips64, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::Linux, T.getOS());
-  EXPECT_EQ(Triple::GNUABIN32, T.getEnvironment());
-  EXPECT_EQ(Triple::MipsSubArch_r6, T.getSubArch());
-  T = Triple("mipsn32r6");
-  EXPECT_EQ(Triple::mips64, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::GNUABIN32, T.getEnvironment());
-  EXPECT_EQ(Triple::MipsSubArch_r6, T.getSubArch());
-
-  T = Triple("mipsel-unknown-linux-gnu");
-  EXPECT_EQ(Triple::mipsel, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::Linux, T.getOS());
-  EXPECT_EQ(Triple::GNU, T.getEnvironment());
-  EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
-  T = Triple("mipsel");
-  EXPECT_EQ(Triple::mipsel, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::GNU, T.getEnvironment());
-  EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
-
-  T = Triple("mips-unknown-linux-gnu");
-  EXPECT_EQ(Triple::mips, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::Linux, T.getOS());
-  EXPECT_EQ(Triple::GNU, T.getEnvironment());
-  EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
-  T = Triple("mips");
-  EXPECT_EQ(Triple::mips, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::GNU, T.getEnvironment());
-  EXPECT_EQ(Triple::NoSubArch, T.getSubArch());
-
-  T = Triple("mipsisa32r6el-unknown-linux-gnu");
-  EXPECT_EQ(Triple::mipsel, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::Linux, T.getOS());
-  EXPECT_EQ(Triple::GNU, T.getEnvironment());
-  EXPECT_EQ(Triple::MipsSubArch_r6, T.getSubArch());
-  T = Triple("mipsr6el");
-  EXPECT_EQ(Triple::mipsel, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::MipsSubArch_r6, T.getSubArch());
-  T = Triple("mipsisa32r6el");
-  EXPECT_EQ(Triple::mipsel, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::GNU, T.getEnvironment());
-  EXPECT_EQ(Triple::MipsSubArch_r6, T.getSubArch());
-
-  T = Triple("mipsisa32r6-unknown-linux-gnu");
-  EXPECT_EQ(Triple::mips, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::Linux, T.getOS());
-  EXPECT_EQ(Triple::GNU, T.getEnvironment());
-  EXPECT_EQ(Triple::MipsSubArch_r6, T.getSubArch());
-  T = Triple("mipsr6");
-  EXPECT_EQ(Triple::mips, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::GNU, T.getEnvironment());
-  EXPECT_EQ(Triple::MipsSubArch_r6, T.getSubArch());
-  T = Triple("mipsisa32r6");
-  EXPECT_EQ(Triple::mips, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::GNU, T.getEnvironment());
-  EXPECT_EQ(Triple::MipsSubArch_r6, T.getSubArch());
-
-  T = Triple("arm-oe-linux-gnueabi");
-  EXPECT_EQ(Triple::arm, T.getArch());
-  EXPECT_EQ(Triple::OpenEmbedded, T.getVendor());
-  EXPECT_EQ(Triple::Linux, T.getOS());
-  EXPECT_EQ(Triple::GNUEABI, T.getEnvironment());
-
-  T = Triple("aarch64-oe-linux");
-  EXPECT_EQ(Triple::aarch64, T.getArch());
-  EXPECT_EQ(Triple::OpenEmbedded, T.getVendor());
-  EXPECT_EQ(Triple::Linux, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-  EXPECT_TRUE(T.isArch64Bit());
-
-  T = Triple("arm64_32-apple-ios");
-  EXPECT_EQ(Triple::aarch64_32, T.getArch());
-  EXPECT_EQ(Triple::IOS, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-  EXPECT_TRUE(T.isArch32Bit());
-
-  T = Triple("huh");
-  EXPECT_EQ(Triple::UnknownArch, T.getArch());
-}
-
-static std::string Join(StringRef A, StringRef B, StringRef C) {
-  std::string Str = std::string(A);
-  Str += '-';
-  Str += B;
-  Str += '-';
-  Str += C;
-  return Str;
-}
-
-static std::string Join(StringRef A, StringRef B, StringRef C, StringRef D) {
-  std::string Str = std::string(A);
-  Str += '-';
-  Str += B;
-  Str += '-';
-  Str += C;
-  Str += '-';
-  Str += D;
-  return Str;
-}
-
-TEST(TripleTest, Normalization) {
-
-  EXPECT_EQ("unknown", Triple::normalize(""));
-  EXPECT_EQ("unknown-unknown", Triple::normalize("-"));
-  EXPECT_EQ("unknown-unknown-unknown", Triple::normalize("--"));
-  EXPECT_EQ("unknown-unknown-unknown-unknown", Triple::normalize("---"));
-  EXPECT_EQ("unknown-unknown-unknown-unknown-unknown",
-            Triple::normalize("----"));
-
-  EXPECT_EQ("a", Triple::normalize("a"));
-  EXPECT_EQ("a-b", Triple::normalize("a-b"));
-  EXPECT_EQ("a-b-c", Triple::normalize("a-b-c"));
-  EXPECT_EQ("a-b-c-d", Triple::normalize("a-b-c-d"));
-
-  EXPECT_EQ("i386-b-c", Triple::normalize("i386-b-c"));
-  EXPECT_EQ("i386-a-c", Triple::normalize("a-i386-c"));
-  EXPECT_EQ("i386-a-b", Triple::normalize("a-b-i386"));
-  EXPECT_EQ("i386-a-b-c", Triple::normalize("a-b-c-i386"));
-
-  EXPECT_EQ("a-pc-c", Triple::normalize("a-pc-c"));
-  EXPECT_EQ("unknown-pc-b-c", Triple::normalize("pc-b-c"));
-  EXPECT_EQ("a-pc-b", Triple::normalize("a-b-pc"));
-  EXPECT_EQ("a-pc-b-c", Triple::normalize("a-b-c-pc"));
-
-  EXPECT_EQ("a-b-linux", Triple::normalize("a-b-linux"));
-  EXPECT_EQ("unknown-unknown-linux-b-c", Triple::normalize("linux-b-c"));
-  EXPECT_EQ("a-unknown-linux-c", Triple::normalize("a-linux-c"));
-
-  EXPECT_EQ("i386-pc-a", Triple::normalize("a-pc-i386"));
-  EXPECT_EQ("i386-pc-unknown", Triple::normalize("-pc-i386"));
-  EXPECT_EQ("unknown-pc-linux-c", Triple::normalize("linux-pc-c"));
-  EXPECT_EQ("unknown-pc-linux", Triple::normalize("linux-pc-"));
-
-  EXPECT_EQ("i386", Triple::normalize("i386"));
-  EXPECT_EQ("unknown-pc", Triple::normalize("pc"));
-  EXPECT_EQ("unknown-unknown-linux", Triple::normalize("linux"));
-
-  EXPECT_EQ("x86_64-unknown-linux-gnu", Triple::normalize("x86_64-gnu-linux"));
-
-  // Check that normalizing a permutated set of valid components returns a
-  // triple with the unpermuted components.
-  //
-  // We don't check every possible combination. For the set of architectures A,
-  // vendors V, operating systems O, and environments E, that would require |A|
-  // * |V| * |O| * |E| * 4! tests. Instead we check every option for any given
-  // slot and make sure it gets normalized to the correct position from every
-  // permutation. This should cover the core logic while being a tractable
-  // number of tests at (|A| + |V| + |O| + |E|) * 4!.
-  auto FirstArchType = Triple::ArchType(Triple::UnknownArch + 1);
-  auto FirstVendorType = Triple::VendorType(Triple::UnknownVendor + 1);
-  auto FirstOSType = Triple::OSType(Triple::UnknownOS + 1);
-  auto FirstEnvType = Triple::EnvironmentType(Triple::UnknownEnvironment + 1);
-  StringRef InitialC[] = {Triple::getArchTypeName(FirstArchType),
-                          Triple::getVendorTypeName(FirstVendorType),
-                          Triple::getOSTypeName(FirstOSType),
-                          Triple::getEnvironmentTypeName(FirstEnvType)};
-  for (int Arch = FirstArchType; Arch <= Triple::LastArchType; ++Arch) {
-    StringRef C[] = {InitialC[0], InitialC[1], InitialC[2], InitialC[3]};
-    C[0] = Triple::getArchTypeName(Triple::ArchType(Arch));
-    std::string E = Join(C[0], C[1], C[2]);
-    int I[] = {0, 1, 2};
-    do {
-      EXPECT_EQ(E, Triple::normalize(Join(C[I[0]], C[I[1]], C[I[2]])));
-    } while (std::next_permutation(std::begin(I), std::end(I)));
-    std::string F = Join(C[0], C[1], C[2], C[3]);
-    int J[] = {0, 1, 2, 3};
-    do {
-      EXPECT_EQ(F, Triple::normalize(Join(C[J[0]], C[J[1]], C[J[2]], C[J[3]])));
-    } while (std::next_permutation(std::begin(J), std::end(J)));
-  }
-  for (int Vendor = FirstVendorType; Vendor <= Triple::LastVendorType;
-       ++Vendor) {
-    StringRef C[] = {InitialC[0], InitialC[1], InitialC[2], InitialC[3]};
-    C[1] = Triple::getVendorTypeName(Triple::VendorType(Vendor));
-    std::string E = Join(C[0], C[1], C[2]);
-    int I[] = {0, 1, 2};
-    do {
-      EXPECT_EQ(E, Triple::normalize(Join(C[I[0]], C[I[1]], C[I[2]])));
-    } while (std::next_permutation(std::begin(I), std::end(I)));
-    std::string F = Join(C[0], C[1], C[2], C[3]);
-    int J[] = {0, 1, 2, 3};
-    do {
-      EXPECT_EQ(F, Triple::normalize(Join(C[J[0]], C[J[1]], C[J[2]], C[J[3]])));
-    } while (std::next_permutation(std::begin(J), std::end(J)));
-  }
-  for (int OS = FirstOSType; OS <= Triple::LastOSType; ++OS) {
-    if (OS == Triple::Win32)
-      continue;
-    StringRef C[] = {InitialC[0], InitialC[1], InitialC[2], InitialC[3]};
-    C[2] = Triple::getOSTypeName(Triple::OSType(OS));
-    std::string E = Join(C[0], C[1], C[2]);
-    int I[] = {0, 1, 2};
-    do {
-      EXPECT_EQ(E, Triple::normalize(Join(C[I[0]], C[I[1]], C[I[2]])));
-    } while (std::next_permutation(std::begin(I), std::end(I)));
-    std::string F = Join(C[0], C[1], C[2], C[3]);
-    int J[] = {0, 1, 2, 3};
-    do {
-      EXPECT_EQ(F, Triple::normalize(Join(C[J[0]], C[J[1]], C[J[2]], C[J[3]])));
-    } while (std::next_permutation(std::begin(J), std::end(J)));
-  }
-  for (int Env = FirstEnvType; Env <= Triple::LastEnvironmentType; ++Env) {
-    StringRef C[] = {InitialC[0], InitialC[1], InitialC[2], InitialC[3]};
-    C[3] = Triple::getEnvironmentTypeName(Triple::EnvironmentType(Env));
-    std::string F = Join(C[0], C[1], C[2], C[3]);
-    int J[] = {0, 1, 2, 3};
-    do {
-      EXPECT_EQ(F, Triple::normalize(Join(C[J[0]], C[J[1]], C[J[2]], C[J[3]])));
-    } while (std::next_permutation(std::begin(J), std::end(J)));
-  }
-
-  // Various real-world funky triples.  The value returned by GCC's config.sub
-  // is given in the comment.
-  EXPECT_EQ("i386-unknown-windows-gnu",
-            Triple::normalize("i386-mingw32")); // i386-pc-mingw32
-  EXPECT_EQ("x86_64-unknown-linux-gnu",
-            Triple::normalize("x86_64-linux-gnu")); // x86_64-pc-linux-gnu
-  EXPECT_EQ("i486-unknown-linux-gnu",
-            Triple::normalize("i486-linux-gnu")); // i486-pc-linux-gnu
-  EXPECT_EQ("i386-redhat-linux",
-            Triple::normalize("i386-redhat-linux")); // i386-redhat-linux-gnu
-  EXPECT_EQ("i686-unknown-linux",
-            Triple::normalize("i686-linux")); // i686-pc-linux-gnu
-  EXPECT_EQ("arm-none-unknown-eabi",
-            Triple::normalize("arm-none-eabi")); // arm-none-eabi
-  EXPECT_EQ("ve-unknown-linux",
-            Triple::normalize("ve-linux")); // ve-linux
-  EXPECT_EQ("wasm32-unknown-wasi",
-            Triple::normalize("wasm32-wasi")); // wasm32-unknown-wasi
-  EXPECT_EQ("wasm64-unknown-wasi",
-            Triple::normalize("wasm64-wasi")); // wasm64-unknown-wasi
-}
-
-TEST(TripleTest, MutateName) {
-  Triple T;
-  EXPECT_EQ(Triple::UnknownArch, T.getArch());
-  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::UnknownOS, T.getOS());
-  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
-
-  T.setArchName("i386");
-  EXPECT_EQ(Triple::x86, T.getArch());
-  EXPECT_EQ("i386--", T.getTriple());
-
-  T.setVendorName("pc");
-  EXPECT_EQ(Triple::x86, T.getArch());
-  EXPECT_EQ(Triple::PC, T.getVendor());
-  EXPECT_EQ("i386-pc-", T.getTriple());
-
-  T.setOSName("linux");
-  EXPECT_EQ(Triple::x86, T.getArch());
-  EXPECT_EQ(Triple::PC, T.getVendor());
-  EXPECT_EQ(Triple::Linux, T.getOS());
-  EXPECT_EQ("i386-pc-linux", T.getTriple());
-
-  T.setEnvironmentName("gnu");
-  EXPECT_EQ(Triple::x86, T.getArch());
-  EXPECT_EQ(Triple::PC, T.getVendor());
-  EXPECT_EQ(Triple::Linux, T.getOS());
-  EXPECT_EQ("i386-pc-linux-gnu", T.getTriple());
-
-  T.setOSName("freebsd");
-  EXPECT_EQ(Triple::x86, T.getArch());
-  EXPECT_EQ(Triple::PC, T.getVendor());
-  EXPECT_EQ(Triple::FreeBSD, T.getOS());
-  EXPECT_EQ("i386-pc-freebsd-gnu", T.getTriple());
-
-  T.setOSAndEnvironmentName("darwin");
-  EXPECT_EQ(Triple::x86, T.getArch());
-  EXPECT_EQ(Triple::PC, T.getVendor());
-  EXPECT_EQ(Triple::Darwin, T.getOS());
-  EXPECT_EQ("i386-pc-darwin", T.getTriple());
-}
-
-TEST(TripleTest, BitWidthPredicates) {
-  Triple T;
-  EXPECT_FALSE(T.isArch16Bit());
-  EXPECT_FALSE(T.isArch32Bit());
-  EXPECT_FALSE(T.isArch64Bit());
-
-  T.setArch(Triple::arm);
-  EXPECT_FALSE(T.isArch16Bit());
-  EXPECT_TRUE(T.isArch32Bit());
-  EXPECT_FALSE(T.isArch64Bit());
-
-  T.setArch(Triple::hexagon);
-  EXPECT_FALSE(T.isArch16Bit());
-  EXPECT_TRUE(T.isArch32Bit());
-  EXPECT_FALSE(T.isArch64Bit());
-
-  T.setArch(Triple::mips);
-  EXPECT_FALSE(T.isArch16Bit());
-  EXPECT_TRUE(T.isArch32Bit());
-  EXPECT_FALSE(T.isArch64Bit());
-
-  T.setArch(Triple::mips64);
-  EXPECT_FALSE(T.isArch16Bit());
-  EXPECT_FALSE(T.isArch32Bit());
-  EXPECT_TRUE(T.isArch64Bit());
-
-  T.setArch(Triple::msp430);
-  EXPECT_TRUE(T.isArch16Bit());
-  EXPECT_FALSE(T.isArch32Bit());
-  EXPECT_FALSE(T.isArch64Bit());
-
-  T.setArch(Triple::ppc);
-  EXPECT_FALSE(T.isArch16Bit());
-  EXPECT_TRUE(T.isArch32Bit());
-  EXPECT_FALSE(T.isArch64Bit());
-
-  T.setArch(Triple::ppc64);
-  EXPECT_FALSE(T.isArch16Bit());
-  EXPECT_FALSE(T.isArch32Bit());
-  EXPECT_TRUE(T.isArch64Bit());
-
-  T.setArch(Triple::x86);
-  EXPECT_FALSE(T.isArch16Bit());
-  EXPECT_TRUE(T.isArch32Bit());
-  EXPECT_FALSE(T.isArch64Bit());
-
-  T.setArch(Triple::x86_64);
-  EXPECT_FALSE(T.isArch16Bit());
-  EXPECT_FALSE(T.isArch32Bit());
-  EXPECT_TRUE(T.isArch64Bit());
-
-  T.setArch(Triple::amdil);
-  EXPECT_FALSE(T.isArch16Bit());
-  EXPECT_TRUE(T.isArch32Bit());
-  EXPECT_FALSE(T.isArch64Bit());
-
-  T.setArch(Triple::amdil64);
-  EXPECT_FALSE(T.isArch16Bit());
-  EXPECT_FALSE(T.isArch32Bit());
-  EXPECT_TRUE(T.isArch64Bit());
-
-  T.setArch(Triple::hsail);
-  EXPECT_FALSE(T.isArch16Bit());
-  EXPECT_TRUE(T.isArch32Bit());
-  EXPECT_FALSE(T.isArch64Bit());
-
-  T.setArch(Triple::hsail64);
-  EXPECT_FALSE(T.isArch16Bit());
-  EXPECT_FALSE(T.isArch32Bit());
-  EXPECT_TRUE(T.isArch64Bit());
-
-  T.setArch(Triple::spir);
-  EXPECT_FALSE(T.isArch16Bit());
-  EXPECT_TRUE(T.isArch32Bit());
-  EXPECT_FALSE(T.isArch64Bit());
-
-  T.setArch(Triple::spir64);
-  EXPECT_FALSE(T.isArch16Bit());
-  EXPECT_FALSE(T.isArch32Bit());
-  EXPECT_TRUE(T.isArch64Bit());
-
-  T.setArch(Triple::sparc);
-  EXPECT_FALSE(T.isArch16Bit());
-  EXPECT_TRUE(T.isArch32Bit());
-  EXPECT_FALSE(T.isArch64Bit());
-
-  T.setArch(Triple::sparcel);
-  EXPECT_FALSE(T.isArch16Bit());
-  EXPECT_TRUE(T.isArch32Bit());
-  EXPECT_FALSE(T.isArch64Bit());
-
-  T.setArch(Triple::sparcv9);
-  EXPECT_FALSE(T.isArch16Bit());
-  EXPECT_FALSE(T.isArch32Bit());
-  EXPECT_TRUE(T.isArch64Bit());
-
-  T.setArch(Triple::wasm32);
-  EXPECT_FALSE(T.isArch16Bit());
-  EXPECT_TRUE(T.isArch32Bit());
-  EXPECT_FALSE(T.isArch64Bit());
-
-  T.setArch(Triple::wasm64);
-  EXPECT_FALSE(T.isArch16Bit());
-  EXPECT_FALSE(T.isArch32Bit());
-  EXPECT_TRUE(T.isArch64Bit());
-
-  T.setArch(Triple::avr);
-  EXPECT_TRUE(T.isArch16Bit());
-  EXPECT_FALSE(T.isArch32Bit());
-  EXPECT_FALSE(T.isArch64Bit());
-
-  T.setArch(Triple::lanai);
-  EXPECT_FALSE(T.isArch16Bit());
-  EXPECT_TRUE(T.isArch32Bit());
-  EXPECT_FALSE(T.isArch64Bit());
-
-  T.setArch(Triple::riscv32);
-  EXPECT_FALSE(T.isArch16Bit());
-  EXPECT_TRUE(T.isArch32Bit());
-  EXPECT_FALSE(T.isArch64Bit());
-  EXPECT_TRUE(T.isRISCV());
-
-  T.setArch(Triple::riscv64);
-  EXPECT_FALSE(T.isArch16Bit());
-  EXPECT_FALSE(T.isArch32Bit());
-  EXPECT_TRUE(T.isArch64Bit());
-  EXPECT_TRUE(T.isRISCV());
-
-  T.setArch(Triple::csky);
-  EXPECT_FALSE(T.isArch16Bit());
-  EXPECT_TRUE(T.isArch32Bit());
-  EXPECT_FALSE(T.isArch64Bit());
-  EXPECT_TRUE(T.isCSKY());
-}
-
-TEST(TripleTest, BitWidthArchVariants) {
-  Triple T;
-  EXPECT_EQ(Triple::UnknownArch, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::UnknownArch, T.get64BitArchVariant().getArch());
-
-  T.setArch(Triple::UnknownArch);
-  EXPECT_EQ(Triple::UnknownArch, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::UnknownArch, T.get64BitArchVariant().getArch());
-
-  T.setArch(Triple::mips);
-  EXPECT_EQ(Triple::mips, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::mips64, T.get64BitArchVariant().getArch());
-
-  T.setArch(Triple::mipsel);
-  EXPECT_EQ(Triple::mipsel, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::mips64el, T.get64BitArchVariant().getArch());
-
-  T.setArch(Triple::ppc);
-  EXPECT_EQ(Triple::ppc, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::ppc64, T.get64BitArchVariant().getArch());
-
-  T.setArch(Triple::nvptx);
-  EXPECT_EQ(Triple::nvptx, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::nvptx64, T.get64BitArchVariant().getArch());
-
-  T.setArch(Triple::sparc);
-  EXPECT_EQ(Triple::sparc, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::sparcv9, T.get64BitArchVariant().getArch());
-
-  T.setArch(Triple::x86);
-  EXPECT_EQ(Triple::x86, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::x86_64, T.get64BitArchVariant().getArch());
-
-  T.setArch(Triple::mips64);
-  EXPECT_EQ(Triple::mips, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::mips64, T.get64BitArchVariant().getArch());
-
-  T.setArch(Triple::mips64el);
-  EXPECT_EQ(Triple::mipsel, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::mips64el, T.get64BitArchVariant().getArch());
-
-  T.setArch(Triple::ppc64);
-  EXPECT_EQ(Triple::ppc, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::ppc64, T.get64BitArchVariant().getArch());
-
-  T.setArch(Triple::nvptx64);
-  EXPECT_EQ(Triple::nvptx, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::nvptx64, T.get64BitArchVariant().getArch());
-
-  T.setArch(Triple::sparcv9);
-  EXPECT_EQ(Triple::sparc, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::sparcv9, T.get64BitArchVariant().getArch());
-
-  T.setArch(Triple::x86_64);
-  EXPECT_EQ(Triple::x86, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::x86_64, T.get64BitArchVariant().getArch());
-
-  T.setArch(Triple::amdil);
-  EXPECT_EQ(Triple::amdil, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::amdil64, T.get64BitArchVariant().getArch());
-
-  T.setArch(Triple::amdil64);
-  EXPECT_EQ(Triple::amdil, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::amdil64, T.get64BitArchVariant().getArch());
-
-  T.setArch(Triple::hsail);
-  EXPECT_EQ(Triple::hsail, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::hsail64, T.get64BitArchVariant().getArch());
-
-  T.setArch(Triple::hsail64);
-  EXPECT_EQ(Triple::hsail, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::hsail64, T.get64BitArchVariant().getArch());
-
-  T.setArch(Triple::spir);
-  EXPECT_EQ(Triple::spir, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::spir64, T.get64BitArchVariant().getArch());
-
-  T.setArch(Triple::spir64);
-  EXPECT_EQ(Triple::spir, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::spir64, T.get64BitArchVariant().getArch());
-
-  T.setArch(Triple::wasm32);
-  EXPECT_EQ(Triple::wasm32, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::wasm64, T.get64BitArchVariant().getArch());
-
-  T.setArch(Triple::wasm64);
-  EXPECT_EQ(Triple::wasm32, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::wasm64, T.get64BitArchVariant().getArch());
-
-  T.setArch(Triple::riscv32);
-  EXPECT_EQ(Triple::riscv32, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::riscv64, T.get64BitArchVariant().getArch());
-
-  T.setArch(Triple::riscv64);
-  EXPECT_EQ(Triple::riscv32, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::riscv64, T.get64BitArchVariant().getArch());
-
-  T.setArch(Triple::csky);
-  EXPECT_EQ(Triple::csky, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::UnknownArch, T.get64BitArchVariant().getArch());
-
-  T.setArch(Triple::thumbeb);
-  EXPECT_EQ(Triple::thumbeb, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::aarch64_be, T.get64BitArchVariant().getArch());
-
-  T.setArch(Triple::thumb);
-  EXPECT_EQ(Triple::thumb, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::aarch64, T.get64BitArchVariant().getArch());
-
-  T.setArch(Triple::aarch64);
-  EXPECT_EQ(Triple::arm, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::aarch64, T.get64BitArchVariant().getArch());
-
-  T.setArch(Triple::aarch64_be);
-  EXPECT_EQ(Triple::armeb, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::aarch64_be, T.get64BitArchVariant().getArch());
-
-  T.setArch(Triple::renderscript32);
-  EXPECT_EQ(Triple::renderscript32, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::renderscript64, T.get64BitArchVariant().getArch());
-
-  T.setArch(Triple::renderscript64);
-  EXPECT_EQ(Triple::renderscript32, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::renderscript64, T.get64BitArchVariant().getArch());
-
-  T.setArch(Triple::armeb);
-  EXPECT_EQ(Triple::armeb, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::aarch64_be, T.get64BitArchVariant().getArch());
-
-  T.setArch(Triple::arm);
-  EXPECT_EQ(Triple::arm, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::aarch64, T.get64BitArchVariant().getArch());
-
-  T.setArch(Triple::systemz);
-  EXPECT_EQ(Triple::UnknownArch, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::systemz, T.get64BitArchVariant().getArch());
-
-  T.setArch(Triple::xcore);
-  EXPECT_EQ(Triple::xcore, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::UnknownArch, T.get64BitArchVariant().getArch());
-}
-
-TEST(TripleTest, EndianArchVariants) {
-  Triple T;
-  EXPECT_EQ(Triple::UnknownArch, T.getBigEndianArchVariant().getArch());
-  EXPECT_EQ(Triple::UnknownArch, T.getLittleEndianArchVariant().getArch());
-
-  T.setArch(Triple::UnknownArch);
-  EXPECT_EQ(Triple::UnknownArch, T.getBigEndianArchVariant().getArch());
-  EXPECT_EQ(Triple::UnknownArch, T.getLittleEndianArchVariant().getArch());
-
-  T.setArch(Triple::aarch64_be);
-  EXPECT_EQ(Triple::aarch64_be, T.getBigEndianArchVariant().getArch());
-  EXPECT_EQ(Triple::aarch64, T.getLittleEndianArchVariant().getArch());
-
-  T.setArch(Triple::aarch64);
-  EXPECT_EQ(Triple::aarch64_be, T.getBigEndianArchVariant().getArch());
-  EXPECT_EQ(Triple::aarch64, T.getLittleEndianArchVariant().getArch());
-
-  T.setArch(Triple::armeb);
-  EXPECT_EQ(Triple::armeb, T.getBigEndianArchVariant().getArch());
-  EXPECT_EQ(Triple::UnknownArch, T.getLittleEndianArchVariant().getArch());
-
-  T.setArch(Triple::arm);
-  EXPECT_EQ(Triple::UnknownArch, T.getBigEndianArchVariant().getArch());
-  EXPECT_EQ(Triple::arm, T.getLittleEndianArchVariant().getArch());
-  T = Triple("arm");
-  EXPECT_TRUE(T.isLittleEndian());
-  T = Triple("thumb");
-  EXPECT_TRUE(T.isLittleEndian());
-  T = Triple("armeb");
-  EXPECT_FALSE(T.isLittleEndian());
-  T = Triple("thumbeb");
-  EXPECT_FALSE(T.isLittleEndian());
-
-  T.setArch(Triple::bpfeb);
-  EXPECT_EQ(Triple::bpfeb, T.getBigEndianArchVariant().getArch());
-  EXPECT_EQ(Triple::bpfel, T.getLittleEndianArchVariant().getArch());
-
-  T.setArch(Triple::bpfel);
-  EXPECT_EQ(Triple::bpfeb, T.getBigEndianArchVariant().getArch());
-  EXPECT_EQ(Triple::bpfel, T.getLittleEndianArchVariant().getArch());
-
-  T.setArch(Triple::mips64);
-  EXPECT_EQ(Triple::mips64, T.getBigEndianArchVariant().getArch());
-  EXPECT_EQ(Triple::mips64el, T.getLittleEndianArchVariant().getArch());
-
-  T.setArch(Triple::mips64el);
-  EXPECT_EQ(Triple::mips64, T.getBigEndianArchVariant().getArch());
-  EXPECT_EQ(Triple::mips64el, T.getLittleEndianArchVariant().getArch());
-
-  T.setArch(Triple::mips);
-  EXPECT_EQ(Triple::mips, T.getBigEndianArchVariant().getArch());
-  EXPECT_EQ(Triple::mipsel, T.getLittleEndianArchVariant().getArch());
-
-  T.setArch(Triple::mipsel);
-  EXPECT_EQ(Triple::mips, T.getBigEndianArchVariant().getArch());
-  EXPECT_EQ(Triple::mipsel, T.getLittleEndianArchVariant().getArch());
-
-  T.setArch(Triple::ppc);
-  EXPECT_EQ(Triple::ppc, T.getBigEndianArchVariant().getArch());
-  EXPECT_EQ(Triple::ppcle, T.getLittleEndianArchVariant().getArch());
-
-  T.setArch(Triple::ppc64);
-  EXPECT_EQ(Triple::ppc64, T.getBigEndianArchVariant().getArch());
-  EXPECT_EQ(Triple::ppc64le, T.getLittleEndianArchVariant().getArch());
-
-  T.setArch(Triple::ppc64le);
-  EXPECT_EQ(Triple::ppc64, T.getBigEndianArchVariant().getArch());
-  EXPECT_EQ(Triple::ppc64le, T.getLittleEndianArchVariant().getArch());
-
-  T.setArch(Triple::sparc);
-  EXPECT_EQ(Triple::sparc, T.getBigEndianArchVariant().getArch());
-  EXPECT_EQ(Triple::sparcel, T.getLittleEndianArchVariant().getArch());
-
-  T.setArch(Triple::sparcel);
-  EXPECT_EQ(Triple::sparc, T.getBigEndianArchVariant().getArch());
-  EXPECT_EQ(Triple::sparcel, T.getLittleEndianArchVariant().getArch());
-
-  T.setArch(Triple::thumb);
-  EXPECT_EQ(Triple::UnknownArch, T.getBigEndianArchVariant().getArch());
-  EXPECT_EQ(Triple::thumb, T.getLittleEndianArchVariant().getArch());
-
-  T.setArch(Triple::thumbeb);
-  EXPECT_EQ(Triple::thumbeb, T.getBigEndianArchVariant().getArch());
-  EXPECT_EQ(Triple::UnknownArch, T.getLittleEndianArchVariant().getArch());
-
-  T.setArch(Triple::lanai);
-  EXPECT_EQ(Triple::lanai, T.getBigEndianArchVariant().getArch());
-  EXPECT_EQ(Triple::UnknownArch, T.getLittleEndianArchVariant().getArch());
-
-  T.setArch(Triple::tcele);
-  EXPECT_EQ(Triple::tce, T.getBigEndianArchVariant().getArch());
-  EXPECT_EQ(Triple::tcele, T.getLittleEndianArchVariant().getArch());
-
-  T.setArch(Triple::tce);
-  EXPECT_EQ(Triple::tce, T.getBigEndianArchVariant().getArch());
-  EXPECT_EQ(Triple::tcele, T.getLittleEndianArchVariant().getArch());
-
-  T.setArch(Triple::csky);
-  EXPECT_EQ(Triple::UnknownArch, T.getBigEndianArchVariant().getArch());
-  EXPECT_EQ(Triple::csky, T.getLittleEndianArchVariant().getArch());
-}
-
-TEST(TripleTest, getOSVersion) {
-  Triple T;
-  unsigned Major, Minor, Micro;
-
-  T = Triple("i386-apple-darwin9");
-  EXPECT_TRUE(T.isMacOSX());
-  EXPECT_FALSE(T.isiOS());
-  EXPECT_FALSE(T.isArch16Bit());
-  EXPECT_TRUE(T.isArch32Bit());
-  EXPECT_FALSE(T.isArch64Bit());
-  T.getMacOSXVersion(Major, Minor, Micro);
-  EXPECT_EQ((unsigned)10, Major);
-  EXPECT_EQ((unsigned)5, Minor);
-  EXPECT_EQ((unsigned)0, Micro);
-  T.getiOSVersion(Major, Minor, Micro);
-  EXPECT_EQ((unsigned)5, Major);
-  EXPECT_EQ((unsigned)0, Minor);
-  EXPECT_EQ((unsigned)0, Micro);
-
-  T = Triple("x86_64-apple-darwin9");
-  EXPECT_TRUE(T.isMacOSX());
-  EXPECT_FALSE(T.isiOS());
-  EXPECT_FALSE(T.isArch16Bit());
-  EXPECT_FALSE(T.isArch32Bit());
-  EXPECT_TRUE(T.isArch64Bit());
-  T.getMacOSXVersion(Major, Minor, Micro);
-  EXPECT_EQ((unsigned)10, Major);
-  EXPECT_EQ((unsigned)5, Minor);
-  EXPECT_EQ((unsigned)0, Micro);
-  T.getiOSVersion(Major, Minor, Micro);
-  EXPECT_EQ((unsigned)5, Major);
-  EXPECT_EQ((unsigned)0, Minor);
-  EXPECT_EQ((unsigned)0, Micro);
-
-  T = Triple("x86_64-apple-macosx");
-  EXPECT_TRUE(T.isMacOSX());
-  EXPECT_FALSE(T.isiOS());
-  EXPECT_FALSE(T.isArch16Bit());
-  EXPECT_FALSE(T.isArch32Bit());
-  EXPECT_TRUE(T.isArch64Bit());
-  T.getMacOSXVersion(Major, Minor, Micro);
-  EXPECT_EQ((unsigned)10, Major);
-  EXPECT_EQ((unsigned)4, Minor);
-  EXPECT_EQ((unsigned)0, Micro);
-  T.getiOSVersion(Major, Minor, Micro);
-  EXPECT_EQ((unsigned)5, Major);
-  EXPECT_EQ((unsigned)0, Minor);
-  EXPECT_EQ((unsigned)0, Micro);
-
-  T = Triple("x86_64-apple-macosx10.7");
-  EXPECT_TRUE(T.isMacOSX());
-  EXPECT_FALSE(T.isiOS());
-  EXPECT_FALSE(T.isArch16Bit());
-  EXPECT_FALSE(T.isArch32Bit());
-  EXPECT_TRUE(T.isArch64Bit());
-  T.getMacOSXVersion(Major, Minor, Micro);
-  EXPECT_EQ((unsigned)10, Major);
-  EXPECT_EQ((unsigned)7, Minor);
-  EXPECT_EQ((unsigned)0, Micro);
-  T.getiOSVersion(Major, Minor, Micro);
-  EXPECT_EQ((unsigned)5, Major);
-  EXPECT_EQ((unsigned)0, Minor);
-  EXPECT_EQ((unsigned)0, Micro);
-
-  T = Triple("x86_64-apple-macos11.0");
-  EXPECT_TRUE(T.isMacOSX());
-  EXPECT_FALSE(T.isiOS());
-  EXPECT_FALSE(T.isArch16Bit());
-  EXPECT_FALSE(T.isArch32Bit());
-  EXPECT_TRUE(T.isArch64Bit());
-  T.getMacOSXVersion(Major, Minor, Micro);
-  EXPECT_EQ((unsigned)11, Major);
-  EXPECT_EQ((unsigned)0, Minor);
-  EXPECT_EQ((unsigned)0, Micro);
-
-  T = Triple("arm64-apple-macosx11.5.8");
-  EXPECT_TRUE(T.isMacOSX());
-  EXPECT_FALSE(T.isiOS());
-  EXPECT_FALSE(T.isArch16Bit());
-  EXPECT_FALSE(T.isArch32Bit());
-  EXPECT_TRUE(T.isArch64Bit());
-  T.getMacOSXVersion(Major, Minor, Micro);
-  EXPECT_EQ((unsigned)11, Major);
-  EXPECT_EQ((unsigned)5, Minor);
-  EXPECT_EQ((unsigned)8, Micro);
-
-  // 10.16 forms a valid triple, even though it's not
-  // a version of a macOS.
-  T = Triple("x86_64-apple-macos10.16");
-  EXPECT_TRUE(T.isMacOSX());
-  T.getMacOSXVersion(Major, Minor, Micro);
-  EXPECT_EQ((unsigned)10, Major);
-  EXPECT_EQ((unsigned)16, Minor);
-  EXPECT_EQ((unsigned)0, Micro);
-
-  T = Triple("x86_64-apple-darwin20");
-  EXPECT_TRUE(T.isMacOSX());
-  T.getMacOSXVersion(Major, Minor, Micro);
-  EXPECT_EQ((unsigned)11, Major);
-  EXPECT_EQ((unsigned)0, Minor);
-  EXPECT_EQ((unsigned)0, Micro);
-
-  // For darwin triples on macOS 11, only compare the major version.
-  T = Triple("x86_64-apple-darwin20.2");
-  EXPECT_TRUE(T.isMacOSX());
-  T.getMacOSXVersion(Major, Minor, Micro);
-  EXPECT_EQ((unsigned)11, Major);
-  EXPECT_EQ((unsigned)0, Minor);
-  EXPECT_EQ((unsigned)0, Micro);
-
-  T = Triple("armv7-apple-ios");
-  EXPECT_FALSE(T.isMacOSX());
-  EXPECT_TRUE(T.isiOS());
-  EXPECT_FALSE(T.isArch16Bit());
-  EXPECT_TRUE(T.isArch32Bit());
-  EXPECT_FALSE(T.isArch64Bit());
-  T.getMacOSXVersion(Major, Minor, Micro);
-  EXPECT_EQ((unsigned)10, Major);
-  EXPECT_EQ((unsigned)4, Minor);
-  EXPECT_EQ((unsigned)0, Micro);
-  T.getiOSVersion(Major, Minor, Micro);
-  EXPECT_EQ((unsigned)5, Major);
-  EXPECT_EQ((unsigned)0, Minor);
-  EXPECT_EQ((unsigned)0, Micro);
-
-  T = Triple("armv7-apple-ios7.0");
-  EXPECT_FALSE(T.isMacOSX());
-  EXPECT_TRUE(T.isiOS());
-  EXPECT_FALSE(T.isArch16Bit());
-  EXPECT_TRUE(T.isArch32Bit());
-  EXPECT_FALSE(T.isArch64Bit());
-  T.getMacOSXVersion(Major, Minor, Micro);
-  EXPECT_EQ((unsigned)10, Major);
-  EXPECT_EQ((unsigned)4, Minor);
-  EXPECT_EQ((unsigned)0, Micro);
-  T.getiOSVersion(Major, Minor, Micro);
-  EXPECT_EQ((unsigned)7, Major);
-  EXPECT_EQ((unsigned)0, Minor);
-  EXPECT_EQ((unsigned)0, Micro);
-  EXPECT_FALSE(T.isSimulatorEnvironment());
-
-  T = Triple("x86_64-apple-ios10.3-simulator");
-  EXPECT_TRUE(T.isiOS());
-  T.getiOSVersion(Major, Minor, Micro);
-  EXPECT_EQ((unsigned)10, Major);
-  EXPECT_EQ((unsigned)3, Minor);
-  EXPECT_EQ((unsigned)0, Micro);
-  EXPECT_TRUE(T.isSimulatorEnvironment());
-  EXPECT_FALSE(T.isMacCatalystEnvironment());
-
-  T = Triple("x86_64-apple-ios13.0-macabi");
-  EXPECT_TRUE(T.isiOS());
-  T.getiOSVersion(Major, Minor, Micro);
-  EXPECT_EQ((unsigned)13, Major);
-  EXPECT_EQ((unsigned)0, Minor);
-  EXPECT_EQ((unsigned)0, Micro);
-  EXPECT_TRUE(T.getEnvironment() == Triple::MacABI);
-  EXPECT_TRUE(T.isMacCatalystEnvironment());
-  EXPECT_FALSE(T.isSimulatorEnvironment());
-}
-
-TEST(TripleTest, isMacOSVersionLT) {
-  Triple T = Triple("x86_64-apple-macos11");
-  EXPECT_TRUE(T.isMacOSXVersionLT(11, 1, 0));
-  EXPECT_FALSE(T.isMacOSXVersionLT(10, 15, 0));
-
-  T = Triple("x86_64-apple-darwin20");
-  EXPECT_TRUE(T.isMacOSXVersionLT(11, 1, 0));
-  EXPECT_FALSE(T.isMacOSXVersionLT(11, 0, 0));
-  EXPECT_FALSE(T.isMacOSXVersionLT(10, 15, 0));
-}
-
-TEST(TripleTest, CanonicalizeOSVersion) {
-  EXPECT_EQ(VersionTuple(10, 15, 4),
-            Triple::getCanonicalVersionForOS(Triple::MacOSX,
-                                             VersionTuple(10, 15, 4)));
-  EXPECT_EQ(VersionTuple(11, 0), Triple::getCanonicalVersionForOS(
-                                     Triple::MacOSX, VersionTuple(10, 16)));
-  EXPECT_EQ(VersionTuple(20),
-            Triple::getCanonicalVersionForOS(Triple::Darwin, VersionTuple(20)));
-}
-
-TEST(TripleTest, FileFormat) {
-  EXPECT_EQ(Triple::ELF, Triple("i686-unknown-linux-gnu").getObjectFormat());
-  EXPECT_EQ(Triple::ELF, Triple("i686-unknown-freebsd").getObjectFormat());
-  EXPECT_EQ(Triple::ELF, Triple("i686-unknown-netbsd").getObjectFormat());
-  EXPECT_EQ(Triple::ELF, Triple("i686--win32-elf").getObjectFormat());
-  EXPECT_EQ(Triple::ELF, Triple("i686---elf").getObjectFormat());
-
-  EXPECT_EQ(Triple::MachO, Triple("i686-apple-macosx").getObjectFormat());
-  EXPECT_EQ(Triple::MachO, Triple("i686-apple-ios").getObjectFormat());
-  EXPECT_EQ(Triple::MachO, Triple("i686---macho").getObjectFormat());
-
-  EXPECT_EQ(Triple::COFF, Triple("i686--win32").getObjectFormat());
-
-  EXPECT_EQ(Triple::ELF, Triple("i686-pc-windows-msvc-elf").getObjectFormat());
-  EXPECT_EQ(Triple::ELF, Triple("i686-pc-cygwin-elf").getObjectFormat());
-
-  EXPECT_EQ(Triple::ELF, Triple("systemz-ibm-linux").getObjectFormat());
-  EXPECT_EQ(Triple::ELF, Triple("systemz-ibm-unknown").getObjectFormat());
-
-  EXPECT_EQ(Triple::GOFF, Triple("s390x-ibm-zos").getObjectFormat());
-  EXPECT_EQ(Triple::GOFF, Triple("systemz-ibm-zos").getObjectFormat());
-  EXPECT_EQ(Triple::GOFF, Triple("s390x-ibm-zos-goff").getObjectFormat());
-  EXPECT_EQ(Triple::GOFF, Triple("s390x-unknown-zos-goff").getObjectFormat());
-  EXPECT_EQ(Triple::GOFF, Triple("s390x---goff").getObjectFormat());
-
-  EXPECT_EQ(Triple::Wasm, Triple("wasm32-unknown-unknown").getObjectFormat());
-  EXPECT_EQ(Triple::Wasm, Triple("wasm64-unknown-unknown").getObjectFormat());
-  EXPECT_EQ(Triple::Wasm, Triple("wasm32-wasi").getObjectFormat());
-  EXPECT_EQ(Triple::Wasm, Triple("wasm64-wasi").getObjectFormat());
-  EXPECT_EQ(Triple::Wasm, Triple("wasm32-unknown-wasi").getObjectFormat());
-  EXPECT_EQ(Triple::Wasm, Triple("wasm64-unknown-wasi").getObjectFormat());
-
-  EXPECT_EQ(Triple::Wasm,
-            Triple("wasm32-unknown-unknown-wasm").getObjectFormat());
-  EXPECT_EQ(Triple::Wasm,
-            Triple("wasm64-unknown-unknown-wasm").getObjectFormat());
-  EXPECT_EQ(Triple::Wasm,
-            Triple("wasm32-wasi-wasm").getObjectFormat());
-  EXPECT_EQ(Triple::Wasm,
-            Triple("wasm64-wasi-wasm").getObjectFormat());
-  EXPECT_EQ(Triple::Wasm,
-            Triple("wasm32-unknown-wasi-wasm").getObjectFormat());
-  EXPECT_EQ(Triple::Wasm,
-            Triple("wasm64-unknown-wasi-wasm").getObjectFormat());
-
-  EXPECT_EQ(Triple::XCOFF, Triple("powerpc-ibm-aix").getObjectFormat());
-  EXPECT_EQ(Triple::XCOFF, Triple("powerpc64-ibm-aix").getObjectFormat());
-  EXPECT_EQ(Triple::XCOFF, Triple("powerpc---xcoff").getObjectFormat());
-  EXPECT_EQ(Triple::XCOFF, Triple("powerpc64---xcoff").getObjectFormat());
-
-  EXPECT_EQ(Triple::ELF, Triple("csky-unknown-unknown").getObjectFormat());
-  EXPECT_EQ(Triple::ELF, Triple("csky-unknown-linux").getObjectFormat());
-
-  Triple MSVCNormalized(Triple::normalize("i686-pc-windows-msvc-elf"));
-  EXPECT_EQ(Triple::ELF, MSVCNormalized.getObjectFormat());
-
-  Triple GNUWindowsNormalized(Triple::normalize("i686-pc-windows-gnu-elf"));
-  EXPECT_EQ(Triple::ELF, GNUWindowsNormalized.getObjectFormat());
-
-  Triple CygnusNormalised(Triple::normalize("i686-pc-windows-cygnus-elf"));
-  EXPECT_EQ(Triple::ELF, CygnusNormalised.getObjectFormat());
-
-  Triple CygwinNormalized(Triple::normalize("i686-pc-cygwin-elf"));
-  EXPECT_EQ(Triple::ELF, CygwinNormalized.getObjectFormat());
-
-  Triple T = Triple("");
-  T.setObjectFormat(Triple::ELF);
-  EXPECT_EQ(Triple::ELF, T.getObjectFormat());
-
-  T.setObjectFormat(Triple::MachO);
-  EXPECT_EQ(Triple::MachO, T.getObjectFormat());
-
-  T.setObjectFormat(Triple::XCOFF);
-  EXPECT_EQ(Triple::XCOFF, T.getObjectFormat());
-
-  T.setObjectFormat(Triple::GOFF);
-  EXPECT_EQ(Triple::GOFF, T.getObjectFormat());
-}
-
-TEST(TripleTest, NormalizeWindows) {
-  EXPECT_EQ("i686-pc-windows-msvc", Triple::normalize("i686-pc-win32"));
-  EXPECT_EQ("i686-unknown-windows-msvc", Triple::normalize("i686-win32"));
-  EXPECT_EQ("i686-pc-windows-gnu", Triple::normalize("i686-pc-mingw32"));
-  EXPECT_EQ("i686-unknown-windows-gnu", Triple::normalize("i686-mingw32"));
-  EXPECT_EQ("i686-pc-windows-gnu", Triple::normalize("i686-pc-mingw32-w64"));
-  EXPECT_EQ("i686-unknown-windows-gnu", Triple::normalize("i686-mingw32-w64"));
-  EXPECT_EQ("i686-pc-windows-cygnus", Triple::normalize("i686-pc-cygwin"));
-  EXPECT_EQ("i686-unknown-windows-cygnus", Triple::normalize("i686-cygwin"));
-
-  EXPECT_EQ("x86_64-pc-windows-msvc", Triple::normalize("x86_64-pc-win32"));
-  EXPECT_EQ("x86_64-unknown-windows-msvc", Triple::normalize("x86_64-win32"));
-  EXPECT_EQ("x86_64-pc-windows-gnu", Triple::normalize("x86_64-pc-mingw32"));
-  EXPECT_EQ("x86_64-unknown-windows-gnu", Triple::normalize("x86_64-mingw32"));
-  EXPECT_EQ("x86_64-pc-windows-gnu",
-            Triple::normalize("x86_64-pc-mingw32-w64"));
-  EXPECT_EQ("x86_64-unknown-windows-gnu",
-            Triple::normalize("x86_64-mingw32-w64"));
-
-  EXPECT_EQ("i686-pc-windows-elf", Triple::normalize("i686-pc-win32-elf"));
-  EXPECT_EQ("i686-unknown-windows-elf", Triple::normalize("i686-win32-elf"));
-  EXPECT_EQ("i686-pc-windows-macho", Triple::normalize("i686-pc-win32-macho"));
-  EXPECT_EQ("i686-unknown-windows-macho",
-            Triple::normalize("i686-win32-macho"));
-
-  EXPECT_EQ("x86_64-pc-windows-elf", Triple::normalize("x86_64-pc-win32-elf"));
-  EXPECT_EQ("x86_64-unknown-windows-elf",
-            Triple::normalize("x86_64-win32-elf"));
-  EXPECT_EQ("x86_64-pc-windows-macho",
-            Triple::normalize("x86_64-pc-win32-macho"));
-  EXPECT_EQ("x86_64-unknown-windows-macho",
-            Triple::normalize("x86_64-win32-macho"));
-
-  EXPECT_EQ("i686-pc-windows-cygnus",
-            Triple::normalize("i686-pc-windows-cygnus"));
-  EXPECT_EQ("i686-pc-windows-gnu", Triple::normalize("i686-pc-windows-gnu"));
-  EXPECT_EQ("i686-pc-windows-itanium",
-            Triple::normalize("i686-pc-windows-itanium"));
-  EXPECT_EQ("i686-pc-windows-msvc", Triple::normalize("i686-pc-windows-msvc"));
-
-  EXPECT_EQ("i686-pc-windows-elf",
-            Triple::normalize("i686-pc-windows-elf-elf"));
-
-  EXPECT_TRUE(Triple("x86_64-pc-win32").isWindowsMSVCEnvironment());
-}
-
-TEST(TripleTest, getARMCPUForArch) {
-  // Platform specific defaults.
-  {
-    llvm::Triple Triple("arm--nacl");
-    EXPECT_EQ("cortex-a8", Triple.getARMCPUForArch());
-  }
-  {
-    llvm::Triple Triple("arm--openbsd");
-    EXPECT_EQ("cortex-a8", Triple.getARMCPUForArch());
-  }
-  {
-    llvm::Triple Triple("armv6-unknown-freebsd");
-    EXPECT_EQ("arm1176jzf-s", Triple.getARMCPUForArch());
-  }
-  {
-    llvm::Triple Triple("thumbv6-unknown-freebsd");
-    EXPECT_EQ("arm1176jzf-s", Triple.getARMCPUForArch());
-  }
-  {
-    llvm::Triple Triple("armebv6-unknown-freebsd");
-    EXPECT_EQ("arm1176jzf-s", Triple.getARMCPUForArch());
-  }
-  {
-    llvm::Triple Triple("arm--win32");
-    EXPECT_EQ("cortex-a9", Triple.getARMCPUForArch());
-    EXPECT_EQ("generic", Triple.getARMCPUForArch("armv8-a"));
-  }
-  // Some alternative architectures
-  {
-    llvm::Triple Triple("armv7k-apple-ios9");
-    EXPECT_EQ("cortex-a7", Triple.getARMCPUForArch());
-  }
-  {
-    llvm::Triple Triple("armv7k-apple-watchos3");
-    EXPECT_EQ("cortex-a7", Triple.getARMCPUForArch());
-  }
-  {
-    llvm::Triple Triple("armv7k-apple-tvos9");
-    EXPECT_EQ("cortex-a7", Triple.getARMCPUForArch());
-  }
-  // armeb is permitted, but armebeb is not
-  {
-    llvm::Triple Triple("armeb-none-eabi");
-    EXPECT_EQ("arm7tdmi", Triple.getARMCPUForArch());
-  }
-  {
-    llvm::Triple Triple("armebeb-none-eabi");
-    EXPECT_EQ("", Triple.getARMCPUForArch());
-  }
-  {
-    llvm::Triple Triple("armebv6eb-none-eabi");
-    EXPECT_EQ("", Triple.getARMCPUForArch());
-  }
-  // xscaleeb is permitted, but armebxscale is not
-  {
-    llvm::Triple Triple("xscaleeb-none-eabi");
-    EXPECT_EQ("xscale", Triple.getARMCPUForArch());
-  }
-  {
-    llvm::Triple Triple("armebxscale-none-eabi");
-    EXPECT_EQ("", Triple.getARMCPUForArch());
-  }
-}
-
-TEST(TripleTest, NormalizeARM) {
-  EXPECT_EQ("armv6-unknown-netbsd-eabi",
-            Triple::normalize("armv6-netbsd-eabi"));
-  EXPECT_EQ("armv7-unknown-netbsd-eabi",
-            Triple::normalize("armv7-netbsd-eabi"));
-  EXPECT_EQ("armv6eb-unknown-netbsd-eabi",
-            Triple::normalize("armv6eb-netbsd-eabi"));
-  EXPECT_EQ("armv7eb-unknown-netbsd-eabi",
-            Triple::normalize("armv7eb-netbsd-eabi"));
-  EXPECT_EQ("armv6-unknown-netbsd-eabihf",
-            Triple::normalize("armv6-netbsd-eabihf"));
-  EXPECT_EQ("armv7-unknown-netbsd-eabihf",
-            Triple::normalize("armv7-netbsd-eabihf"));
-  EXPECT_EQ("armv6eb-unknown-netbsd-eabihf",
-            Triple::normalize("armv6eb-netbsd-eabihf"));
-  EXPECT_EQ("armv7eb-unknown-netbsd-eabihf",
-            Triple::normalize("armv7eb-netbsd-eabihf"));
-
-  EXPECT_EQ("armv7-suse-linux-gnueabihf",
-            Triple::normalize("armv7-suse-linux-gnueabi"));
-
-  Triple T;
-  T = Triple("armv6--netbsd-eabi");
-  EXPECT_EQ(Triple::arm, T.getArch());
-  T = Triple("armv6eb--netbsd-eabi");
-  EXPECT_EQ(Triple::armeb, T.getArch());
-  T = Triple("armv7-suse-linux-gnueabihf");
-  EXPECT_EQ(Triple::GNUEABIHF, T.getEnvironment());
-}
-
-TEST(TripleTest, ParseARMArch) {
-  // ARM
-  {
-    Triple T = Triple("arm");
-    EXPECT_EQ(Triple::arm, T.getArch());
-  }
-  {
-    Triple T = Triple("armeb");
-    EXPECT_EQ(Triple::armeb, T.getArch());
-  }
-  // THUMB
-  {
-    Triple T = Triple("thumb");
-    EXPECT_EQ(Triple::thumb, T.getArch());
-  }
-  {
-    Triple T = Triple("thumbeb");
-    EXPECT_EQ(Triple::thumbeb, T.getArch());
-  }
-  // AARCH64
-  {
-    Triple T = Triple("arm64");
-    EXPECT_EQ(Triple::aarch64, T.getArch());
-  }
-  {
-    Triple T = Triple("arm64_32");
-    EXPECT_EQ(Triple::aarch64_32, T.getArch());
-  }
-  {
-    Triple T = Triple("aarch64");
-    EXPECT_EQ(Triple::aarch64, T.getArch());
-  }
-  {
-    Triple T = Triple("aarch64_be");
-    EXPECT_EQ(Triple::aarch64_be, T.getArch());
-  }
-  {
-    Triple T = Triple("arm64e");
-    EXPECT_EQ(Triple::aarch64, T.getArch());
-    EXPECT_EQ(Triple::AArch64SubArch_arm64e, T.getSubArch());
-  }
-}
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/TwineTest.cpp b/gnu/llvm/llvm/unittests/ADT/TwineTest.cpp
deleted file mode 100644
index 543b4507f27..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/TwineTest.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-//===- TwineTest.cpp - Twine unit tests -----------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/Twine.h"
-#include "llvm/ADT/SmallString.h"
-#include "llvm/Support/FormatAdapters.h"
-#include "llvm/Support/FormatVariadic.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gtest/gtest.h"
-using namespace llvm;
-
-namespace {
-
-std::string repr(const Twine &Value) {
-  std::string res;
-  llvm::raw_string_ostream OS(res);
-  Value.printRepr(OS);
-  return OS.str();
-}
-
-TEST(TwineTest, Construction) {
-  EXPECT_EQ("", Twine().str());
-  EXPECT_EQ("hi", Twine("hi").str());
-  EXPECT_EQ("hi", Twine(std::string("hi")).str());
-  EXPECT_EQ("hi", Twine(StringRef("hi")).str());
-  EXPECT_EQ("hi", Twine(StringRef(std::string("hi"))).str());
-  EXPECT_EQ("hi", Twine(StringRef("hithere", 2)).str());
-  EXPECT_EQ("hi", Twine(SmallString<4>("hi")).str());
-  EXPECT_EQ("hi", Twine(formatv("{0}", "hi")).str());
-#if __cplusplus > 201402L
-  EXPECT_EQ("hi", Twine(std::string_view("hi")).str());
-#endif
-}
-
-TEST(TwineTest, Numbers) {
-  EXPECT_EQ("123", Twine(123U).str());
-  EXPECT_EQ("123", Twine(123).str());
-  EXPECT_EQ("-123", Twine(-123).str());
-  EXPECT_EQ("123", Twine(123).str());
-  EXPECT_EQ("-123", Twine(-123).str());
-
-  EXPECT_EQ("7b", Twine::utohexstr(123).str());
-}
-
-TEST(TwineTest, Characters) {
-  EXPECT_EQ("x", Twine('x').str());
-  EXPECT_EQ("x", Twine(static_cast<unsigned char>('x')).str());
-  EXPECT_EQ("x", Twine(static_cast<signed char>('x')).str());
-}
-
-TEST(TwineTest, Concat) {
-  // Check verse repr, since we care about the actual representation not just
-  // the result.
-
-  // Concat with null.
-  EXPECT_EQ("(Twine null empty)", 
-            repr(Twine("hi").concat(Twine::createNull())));
-  EXPECT_EQ("(Twine null empty)", 
-            repr(Twine::createNull().concat(Twine("hi"))));
-  
-  // Concat with empty.
-  EXPECT_EQ("(Twine cstring:\"hi\" empty)", 
-            repr(Twine("hi").concat(Twine())));
-  EXPECT_EQ("(Twine cstring:\"hi\" empty)", 
-            repr(Twine().concat(Twine("hi"))));
-  EXPECT_EQ("(Twine ptrAndLength:\"hi\" empty)",
-            repr(Twine().concat(Twine(SmallString<5>("hi")))));
-  EXPECT_EQ("(Twine formatv:\"howdy\" empty)",
-            repr(Twine(formatv("howdy")).concat(Twine())));
-  EXPECT_EQ("(Twine formatv:\"howdy\" empty)",
-            repr(Twine().concat(Twine(formatv("howdy")))));
-  EXPECT_EQ("(Twine ptrAndLength:\"hey\" cstring:\"there\")",
-            repr(Twine(SmallString<7>("hey")).concat(Twine("there"))));
-#if __cplusplus > 201402L
-  EXPECT_EQ("(Twine ptrAndLength:\"hey\" cstring:\"there\")",
-            repr(Twine(std::string_view("hey")).concat(Twine("there"))));
-#endif
-
-  // Concatenation of unary ropes.
-  EXPECT_EQ("(Twine cstring:\"a\" cstring:\"b\")", 
-            repr(Twine("a").concat(Twine("b"))));
-
-  // Concatenation of other ropes.
-  EXPECT_EQ("(Twine rope:(Twine cstring:\"a\" cstring:\"b\") cstring:\"c\")", 
-            repr(Twine("a").concat(Twine("b")).concat(Twine("c"))));
-  EXPECT_EQ("(Twine cstring:\"a\" rope:(Twine cstring:\"b\" cstring:\"c\"))",
-            repr(Twine("a").concat(Twine("b").concat(Twine("c")))));
-  EXPECT_EQ(
-      "(Twine cstring:\"a\" rope:(Twine ptrAndLength:\"b\" cstring:\"c\"))",
-      repr(Twine("a").concat(Twine(SmallString<3>("b")).concat(Twine("c")))));
-}
-
-TEST(TwineTest, toNullTerminatedStringRef) {
-  SmallString<8> storage;
-  EXPECT_EQ(0, *Twine("hello").toNullTerminatedStringRef(storage).end());
-  EXPECT_EQ(0,
-           *Twine(StringRef("hello")).toNullTerminatedStringRef(storage).end());
-  EXPECT_EQ(0, *Twine(SmallString<11>("hello"))
-                    .toNullTerminatedStringRef(storage)
-                    .end());
-  EXPECT_EQ(0, *Twine(formatv("{0}{1}", "how", "dy"))
-                    .toNullTerminatedStringRef(storage)
-                    .end());
-}
-
-TEST(TwineTest, LazyEvaluation) {
-  struct formatter : FormatAdapter<int> {
-    explicit formatter(int &Count) : FormatAdapter(0), Count(Count) {}
-    int &Count;
-
-    void format(raw_ostream &OS, StringRef Style) override { ++Count; }
-  };
-
-  int Count = 0;
-  formatter Formatter(Count);
-  (void)Twine(formatv("{0}", Formatter));
-  EXPECT_EQ(0, Count);
-  (void)Twine(formatv("{0}", Formatter)).str();
-  EXPECT_EQ(1, Count);
-}
-
-  // I suppose linking in the entire code generator to add a unit test to check
-  // the code size of the concat operation is overkill... :)
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/ADT/TypeSwitchTest.cpp b/gnu/llvm/llvm/unittests/ADT/TypeSwitchTest.cpp
deleted file mode 100644
index 442ac1910a0..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/TypeSwitchTest.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-//===- TypeSwitchTest.cpp - TypeSwitch unit tests -------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/TypeSwitch.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-/// Utility classes to setup casting functionality.
-struct Base {
-  enum Kind { DerivedA, DerivedB, DerivedC, DerivedD, DerivedE };
-  Kind kind;
-};
-template <Base::Kind DerivedKind> struct DerivedImpl : Base {
-  DerivedImpl() : Base{DerivedKind} {}
-  static bool classof(const Base *base) { return base->kind == DerivedKind; }
-};
-struct DerivedA : public DerivedImpl<Base::DerivedA> {};
-struct DerivedB : public DerivedImpl<Base::DerivedB> {};
-struct DerivedC : public DerivedImpl<Base::DerivedC> {};
-struct DerivedD : public DerivedImpl<Base::DerivedD> {};
-struct DerivedE : public DerivedImpl<Base::DerivedE> {};
-} // end anonymous namespace
-
-TEST(TypeSwitchTest, CaseResult) {
-  auto translate = [](auto value) {
-    return TypeSwitch<Base *, int>(&value)
-        .Case<DerivedA>([](DerivedA *) { return 0; })
-        .Case([](DerivedB *) { return 1; })
-        .Case([](DerivedC *) { return 2; })
-        .Default([](Base *) { return -1; });
-  };
-  EXPECT_EQ(0, translate(DerivedA()));
-  EXPECT_EQ(1, translate(DerivedB()));
-  EXPECT_EQ(2, translate(DerivedC()));
-  EXPECT_EQ(-1, translate(DerivedD()));
-}
-
-TEST(TypeSwitchTest, CasesResult) {
-  auto translate = [](auto value) {
-    return TypeSwitch<Base *, int>(&value)
-        .Case<DerivedA, DerivedB, DerivedD>([](auto *) { return 0; })
-        .Case([](DerivedC *) { return 1; })
-        .Default(-1);
-  };
-  EXPECT_EQ(0, translate(DerivedA()));
-  EXPECT_EQ(0, translate(DerivedB()));
-  EXPECT_EQ(1, translate(DerivedC()));
-  EXPECT_EQ(0, translate(DerivedD()));
-  EXPECT_EQ(-1, translate(DerivedE()));
-}
-
-TEST(TypeSwitchTest, CaseVoid) {
-  auto translate = [](auto value) {
-    int result = -2;
-    TypeSwitch<Base *>(&value)
-        .Case([&](DerivedA *) { result = 0; })
-        .Case([&](DerivedB *) { result = 1; })
-        .Case([&](DerivedC *) { result = 2; })
-        .Default([&](Base *) { result = -1; });
-    return result;
-  };
-  EXPECT_EQ(0, translate(DerivedA()));
-  EXPECT_EQ(1, translate(DerivedB()));
-  EXPECT_EQ(2, translate(DerivedC()));
-  EXPECT_EQ(-1, translate(DerivedD()));
-}
-
-TEST(TypeSwitchTest, CasesVoid) {
-  auto translate = [](auto value) {
-    int result = -1;
-    TypeSwitch<Base *>(&value)
-        .Case<DerivedA, DerivedB, DerivedD>([&](auto *) { result = 0; })
-        .Case([&](DerivedC *) { result = 1; });
-    return result;
-  };
-  EXPECT_EQ(0, translate(DerivedA()));
-  EXPECT_EQ(0, translate(DerivedB()));
-  EXPECT_EQ(1, translate(DerivedC()));
-  EXPECT_EQ(0, translate(DerivedD()));
-  EXPECT_EQ(-1, translate(DerivedE()));
-}
diff --git a/gnu/llvm/llvm/unittests/ADT/TypeTraitsTest.cpp b/gnu/llvm/llvm/unittests/ADT/TypeTraitsTest.cpp
deleted file mode 100644
index 74d3bbe1fcc..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/TypeTraitsTest.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-//===- TypeTraitsTest.cpp - type_traits unit tests ------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/STLExtras.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-//===----------------------------------------------------------------------===//
-// function_traits
-//===----------------------------------------------------------------------===//
-
-namespace {
-/// Check a callable type of the form `bool(const int &)`.
-template <typename CallableT> struct CheckFunctionTraits {
-  static_assert(
-      std::is_same<typename function_traits<CallableT>::result_t, bool>::value,
-      "expected result_t to be `bool`");
-  static_assert(
-      std::is_same<typename function_traits<CallableT>::template arg_t<0>,
-                   const int &>::value,
-      "expected arg_t<0> to be `const int &`");
-  static_assert(function_traits<CallableT>::num_args == 1,
-                "expected num_args to be 1");
-};
-
-/// Test function pointers.
-using FuncType = bool (*)(const int &);
-struct CheckFunctionPointer : CheckFunctionTraits<FuncType> {};
-
-/// Test method pointers.
-struct Foo {
-  bool func(const int &v);
-};
-struct CheckMethodPointer : CheckFunctionTraits<decltype(&Foo::func)> {};
-
-/// Test lambda references.
-LLVM_ATTRIBUTE_UNUSED auto lambdaFunc = [](const int &v) -> bool {
-  return true;
-};
-struct CheckLambda : CheckFunctionTraits<decltype(lambdaFunc)> {};
-
-} // end anonymous namespace
-
-//===----------------------------------------------------------------------===//
-// is_detected
-//===----------------------------------------------------------------------===//
-
-namespace {
-struct HasFooMethod {
-  void foo() {}
-};
-struct NoFooMethod {};
-
-template <class T> using has_foo_method_t = decltype(std::declval<T &>().foo());
-
-static_assert(is_detected<has_foo_method_t, HasFooMethod>::value,
-              "expected foo method to be detected");
-static_assert(!is_detected<has_foo_method_t, NoFooMethod>::value,
-              "expected no foo method to be detected");
-} // end anonymous namespace
-
-//===----------------------------------------------------------------------===//
-// is_invocable
-//===----------------------------------------------------------------------===//
-
-void invocable_fn(int);
-
-static_assert(is_invocable<decltype(invocable_fn), int>::value,
-              "expected function to be invocable");
-static_assert(!is_invocable<decltype(invocable_fn), void *>::value,
-              "expected function not to be invocable");
-static_assert(!is_invocable<decltype(invocable_fn), int, int>::value,
-              "expected function not to be invocable");
diff --git a/gnu/llvm/llvm/unittests/ADT/WaymarkingTest.cpp b/gnu/llvm/llvm/unittests/ADT/WaymarkingTest.cpp
deleted file mode 100644
index 0a6b66e8d21..00000000000
--- a/gnu/llvm/llvm/unittests/ADT/WaymarkingTest.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-//===- llvm/unittest/IR/WaymarkTest.cpp - Waymarking unit tests -----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/Waymarking.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-static const int N = 100;
-
-// Get the Waymarking Tag of the pointer.
-static int tag(int *P) {
-  return static_cast<int>(reinterpret_cast<uintptr_t>(P) &
-                          uintptr_t(alignof(int *) - 1));
-}
-
-// Get the actual pointer, by stripping the Waymarking Tag.
-static int *ref(int *P) {
-  return reinterpret_cast<int *>(reinterpret_cast<uintptr_t>(P) &
-                                 ~uintptr_t(alignof(int *) - 1));
-}
-
-static int **createArray(int Len) {
-  int **A = new int *[Len];
-  for (int I = 0; I < Len; ++I)
-    A[I] = new int(I);
-  return A;
-}
-
-static void freeArray(int **A, int Len) {
-  for (int I = 0; I < Len; ++I)
-    delete ref(A[I]);
-  delete[] A;
-}
-
-// Verify the values stored in the array are as expected, and did not change due
-// to fillWaymarks.
-static void verifyArrayValues(int **A, int Begin, int End) {
-  for (int I = Begin; I < End; ++I)
-    EXPECT_EQ(I, *ref(A[I]));
-}
-
-static void verifyArrayValues(int **A, int Len) {
-  verifyArrayValues(A, 0, Len);
-}
-
-// Verify that we can follow the waymarks to the array's head from each element
-// of the array.
-static void verifyFollowWaymarks(int **A, int Len) {
-  for (int I = 0; I < Len; ++I) {
-    int **P = followWaymarks(A + I);
-    EXPECT_EQ(A, P);
-  }
-}
-
-namespace {
-
-// Test filling and following the waymarks of a single array.
-TEST(WaymarkingTest, SingleHead) {
-  const int N2 = 2 * N;
-  int **volatile A = createArray(N2);
-
-  // Fill the first half of the array with waymarks.
-  fillWaymarks(A, A + N, 0);
-  verifyArrayValues(A, N2);
-
-  verifyFollowWaymarks(A, N);
-
-  // Fill the rest of the waymarks (continuing from where we stopped).
-  fillWaymarks(A + N, A + N2, N);
-  verifyArrayValues(A, N2);
-
-  verifyFollowWaymarks(A, N);
-
-  freeArray(A, N2);
-}
-
-// Test filling and following the waymarks of an array split into several
-// different sections of waymarks (treated just like separate arrays).
-TEST(WaymarkingTest, MultiHead) {
-  const int N2 = 2 * N;
-  const int N3 = 3 * N;
-  int **volatile A = createArray(N3);
-
-  // Separate the array into 3 sections of waymarks.
-  fillWaymarks(A, A + N, 0);
-  fillWaymarks(A + N, A + N2, 0);
-  fillWaymarks(A + N2, A + N3, 0);
-  verifyArrayValues(A, N3);
-
-  verifyFollowWaymarks(A, N);
-  verifyFollowWaymarks(A + N, N2 - N);
-  verifyFollowWaymarks(A + N2, N3 - N2);
-
-  freeArray(A, N3);
-}
-
-// Test reseting (value and tag of) elements inside an array of waymarks.
-TEST(WaymarkingTest, Reset) {
-  int **volatile A = createArray(N);
-
-  fillWaymarks(A, A + N, 0);
-  verifyArrayValues(A, N);
-
-  const int N2 = N / 2;
-  const int N3 = N / 3;
-  const int N4 = N / 4;
-
-  // Reset specific elements and check that the tag remains the same.
-  int T2 = tag(A[N2]);
-  delete ref(A[N2]);
-  A[N2] = new int(N2);
-  fillWaymarks(A + N2, A + N2 + 1, N2);
-  verifyArrayValues(A, N2, N2 + 1);
-  EXPECT_EQ(T2, tag(A[N2]));
-
-  int T3 = tag(A[N3]);
-  delete ref(A[N3]);
-  A[N3] = new int(N3);
-  fillWaymarks(A + N3, A + N3 + 1, N3);
-  verifyArrayValues(A, N3, N3 + 1);
-  EXPECT_EQ(T3, tag(A[N3]));
-
-  int T4 = tag(A[N4]);
-  delete ref(A[N4]);
-  A[N4] = new int(N4);
-  fillWaymarks(A + N4, A + N4 + 1, N4);
-  verifyArrayValues(A, N4, N4 + 1);
-  EXPECT_EQ(T4, tag(A[N4]));
-
-  verifyArrayValues(A, N);
-  verifyFollowWaymarks(A, N);
-
-  freeArray(A, N);
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/Analysis/AliasAnalysisTest.cpp b/gnu/llvm/llvm/unittests/Analysis/AliasAnalysisTest.cpp
deleted file mode 100644
index e7a70e736a1..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/AliasAnalysisTest.cpp
+++ /dev/null
@@ -1,381 +0,0 @@
-//===--- AliasAnalysisTest.cpp - Mixed TBAA unit tests --------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/AliasAnalysis.h"
-#include "llvm/ADT/SetVector.h"
-#include "llvm/Analysis/AssumptionCache.h"
-#include "llvm/Analysis/BasicAliasAnalysis.h"
-#include "llvm/Analysis/TargetLibraryInfo.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/InstIterator.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/LegacyPassManager.h"
-#include "llvm/IR/Module.h"
-#include "llvm/InitializePasses.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-// Set up some test passes.
-namespace llvm {
-void initializeAATestPassPass(PassRegistry&);
-void initializeTestCustomAAWrapperPassPass(PassRegistry&);
-}
-
-namespace {
-struct AATestPass : FunctionPass {
-  static char ID;
-  AATestPass() : FunctionPass(ID) {
-    initializeAATestPassPass(*PassRegistry::getPassRegistry());
-  }
-
-  void getAnalysisUsage(AnalysisUsage &AU) const override {
-    AU.addRequired<AAResultsWrapperPass>();
-    AU.setPreservesAll();
-  }
-
-  bool runOnFunction(Function &F) override {
-    AliasAnalysis &AA = getAnalysis<AAResultsWrapperPass>().getAAResults();
-
-    SetVector<Value *> Pointers;
-    for (Argument &A : F.args())
-      if (A.getType()->isPointerTy())
-        Pointers.insert(&A);
-    for (Instruction &I : instructions(F))
-      if (I.getType()->isPointerTy())
-        Pointers.insert(&I);
-
-    for (Value *P1 : Pointers)
-      for (Value *P2 : Pointers)
-        (void)AA.alias(P1, LocationSize::beforeOrAfterPointer(), P2,
-                       LocationSize::beforeOrAfterPointer());
-
-    return false;
-  }
-};
-}
-
-char AATestPass::ID = 0;
-INITIALIZE_PASS_BEGIN(AATestPass, "aa-test-pas", "Alias Analysis Test Pass",
-                      false, true)
-INITIALIZE_PASS_DEPENDENCY(AAResultsWrapperPass)
-INITIALIZE_PASS_END(AATestPass, "aa-test-pass", "Alias Analysis Test Pass",
-                    false, true)
-
-namespace {
-/// A test customizable AA result. It merely accepts a callback to run whenever
-/// it receives an alias query. Useful for testing that a particular AA result
-/// is reached.
-struct TestCustomAAResult : AAResultBase<TestCustomAAResult> {
-  friend AAResultBase<TestCustomAAResult>;
-
-  std::function<void()> CB;
-
-  explicit TestCustomAAResult(std::function<void()> CB)
-      : AAResultBase(), CB(std::move(CB)) {}
-  TestCustomAAResult(TestCustomAAResult &&Arg)
-      : AAResultBase(std::move(Arg)), CB(std::move(Arg.CB)) {}
-
-  bool invalidate(Function &, const PreservedAnalyses &) { return false; }
-
-  AliasResult alias(const MemoryLocation &LocA, const MemoryLocation &LocB,
-                    AAQueryInfo &AAQI) {
-    CB();
-    return AliasResult::MayAlias;
-  }
-};
-}
-
-namespace {
-/// A wrapper pass for the legacy pass manager to use with the above custom AA
-/// result.
-class TestCustomAAWrapperPass : public ImmutablePass {
-  std::function<void()> CB;
-  std::unique_ptr<TestCustomAAResult> Result;
-
-public:
-  static char ID;
-
-  explicit TestCustomAAWrapperPass(
-      std::function<void()> CB = std::function<void()>())
-      : ImmutablePass(ID), CB(std::move(CB)) {
-    initializeTestCustomAAWrapperPassPass(*PassRegistry::getPassRegistry());
-  }
-
-  void getAnalysisUsage(AnalysisUsage &AU) const override {
-    AU.setPreservesAll();
-    AU.addRequired<TargetLibraryInfoWrapperPass>();
-  }
-
-  bool doInitialization(Module &M) override {
-    Result.reset(new TestCustomAAResult(std::move(CB)));
-    return true;
-  }
-
-  bool doFinalization(Module &M) override {
-    Result.reset();
-    return true;
-  }
-
-  TestCustomAAResult &getResult() { return *Result; }
-  const TestCustomAAResult &getResult() const { return *Result; }
-};
-}
-
-char TestCustomAAWrapperPass::ID = 0;
-INITIALIZE_PASS_BEGIN(TestCustomAAWrapperPass, "test-custom-aa",
-                "Test Custom AA Wrapper Pass", false, true)
-INITIALIZE_PASS_DEPENDENCY(TargetLibraryInfoWrapperPass)
-INITIALIZE_PASS_END(TestCustomAAWrapperPass, "test-custom-aa",
-                "Test Custom AA Wrapper Pass", false, true)
-
-namespace {
-
-class AliasAnalysisTest : public testing::Test {
-protected:
-  LLVMContext C;
-  Module M;
-  TargetLibraryInfoImpl TLII;
-  TargetLibraryInfo TLI;
-  std::unique_ptr<AssumptionCache> AC;
-  std::unique_ptr<BasicAAResult> BAR;
-  std::unique_ptr<AAResults> AAR;
-
-  AliasAnalysisTest() : M("AliasAnalysisTest", C), TLI(TLII) {}
-
-  AAResults &getAAResults(Function &F) {
-    // Reset the Function AA results first to clear out any references.
-    AAR.reset(new AAResults(TLI));
-
-    // Build the various AA results and register them.
-    AC.reset(new AssumptionCache(F));
-    BAR.reset(new BasicAAResult(M.getDataLayout(), F, TLI, *AC));
-    AAR->addAAResult(*BAR);
-
-    return *AAR;
-  }
-};
-
-TEST_F(AliasAnalysisTest, getModRefInfo) {
-  // Setup function.
-  FunctionType *FTy =
-      FunctionType::get(Type::getVoidTy(C), std::vector<Type *>(), false);
-  auto *F = Function::Create(FTy, Function::ExternalLinkage, "f", M);
-  auto *BB = BasicBlock::Create(C, "entry", F);
-  auto IntType = Type::getInt32Ty(C);
-  auto PtrType = Type::getInt32PtrTy(C);
-  auto *Value = ConstantInt::get(IntType, 42);
-  auto *Addr = ConstantPointerNull::get(PtrType);
-  auto Alignment = Align(IntType->getBitWidth() / 8);
-
-  auto *Store1 = new StoreInst(Value, Addr, BB);
-  auto *Load1 = new LoadInst(IntType, Addr, "load", BB);
-  auto *Add1 = BinaryOperator::CreateAdd(Value, Value, "add", BB);
-  auto *VAArg1 = new VAArgInst(Addr, PtrType, "vaarg", BB);
-  auto *CmpXChg1 = new AtomicCmpXchgInst(
-      Addr, ConstantInt::get(IntType, 0), ConstantInt::get(IntType, 1),
-      Alignment, AtomicOrdering::Monotonic, AtomicOrdering::Monotonic,
-      SyncScope::System, BB);
-  auto *AtomicRMW = new AtomicRMWInst(
-      AtomicRMWInst::Xchg, Addr, ConstantInt::get(IntType, 1), Alignment,
-      AtomicOrdering::Monotonic, SyncScope::System, BB);
-
-  ReturnInst::Create(C, nullptr, BB);
-
-  auto &AA = getAAResults(*F);
-
-  // Check basic results
-  EXPECT_EQ(AA.getModRefInfo(Store1, MemoryLocation()), ModRefInfo::Mod);
-  EXPECT_EQ(AA.getModRefInfo(Store1, None), ModRefInfo::Mod);
-  EXPECT_EQ(AA.getModRefInfo(Load1, MemoryLocation()), ModRefInfo::Ref);
-  EXPECT_EQ(AA.getModRefInfo(Load1, None), ModRefInfo::Ref);
-  EXPECT_EQ(AA.getModRefInfo(Add1, MemoryLocation()), ModRefInfo::NoModRef);
-  EXPECT_EQ(AA.getModRefInfo(Add1, None), ModRefInfo::NoModRef);
-  EXPECT_EQ(AA.getModRefInfo(VAArg1, MemoryLocation()), ModRefInfo::ModRef);
-  EXPECT_EQ(AA.getModRefInfo(VAArg1, None), ModRefInfo::ModRef);
-  EXPECT_EQ(AA.getModRefInfo(CmpXChg1, MemoryLocation()), ModRefInfo::ModRef);
-  EXPECT_EQ(AA.getModRefInfo(CmpXChg1, None), ModRefInfo::ModRef);
-  EXPECT_EQ(AA.getModRefInfo(AtomicRMW, MemoryLocation()), ModRefInfo::ModRef);
-  EXPECT_EQ(AA.getModRefInfo(AtomicRMW, None), ModRefInfo::ModRef);
-}
-
-static Instruction *getInstructionByName(Function &F, StringRef Name) {
-  for (auto &I : instructions(F))
-    if (I.getName() == Name)
-      return &I;
-  llvm_unreachable("Expected to find instruction!");
-}
-
-TEST_F(AliasAnalysisTest, BatchAAPhiCycles) {
-  LLVMContext C;
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M = parseAssemblyString(R"(
-    define void @f(i8* noalias %a, i1 %c) {
-    entry:
-      br label %loop
-
-    loop:
-      %phi = phi i8* [ null, %entry ], [ %a2, %loop ]
-      %offset1 = phi i64 [ 0, %entry ], [ %offset2, %loop]
-      %offset2 = add i64 %offset1, 1
-      %a1 = getelementptr i8, i8* %a, i64 %offset1
-      %a2 = getelementptr i8, i8* %a, i64 %offset2
-      %s1 = select i1 %c, i8* %a1, i8* %phi
-      %s2 = select i1 %c, i8* %a2, i8* %a1
-      br label %loop
-    }
-  )", Err, C);
-
-  Function *F = M->getFunction("f");
-  Instruction *Phi = getInstructionByName(*F, "phi");
-  Instruction *A1 = getInstructionByName(*F, "a1");
-  Instruction *A2 = getInstructionByName(*F, "a2");
-  Instruction *S1 = getInstructionByName(*F, "s1");
-  Instruction *S2 = getInstructionByName(*F, "s2");
-  MemoryLocation PhiLoc(Phi, LocationSize::precise(1));
-  MemoryLocation A1Loc(A1, LocationSize::precise(1));
-  MemoryLocation A2Loc(A2, LocationSize::precise(1));
-  MemoryLocation S1Loc(S1, LocationSize::precise(1));
-  MemoryLocation S2Loc(S2, LocationSize::precise(1));
-
-  auto &AA = getAAResults(*F);
-  EXPECT_EQ(AliasResult::NoAlias, AA.alias(A1Loc, A2Loc));
-  EXPECT_EQ(AliasResult::MayAlias, AA.alias(PhiLoc, A1Loc));
-  EXPECT_EQ(AliasResult::MayAlias, AA.alias(S1Loc, S2Loc));
-
-  BatchAAResults BatchAA(AA);
-  EXPECT_EQ(AliasResult::NoAlias, BatchAA.alias(A1Loc, A2Loc));
-  EXPECT_EQ(AliasResult::MayAlias, BatchAA.alias(PhiLoc, A1Loc));
-  EXPECT_EQ(AliasResult::MayAlias, BatchAA.alias(S1Loc, S2Loc));
-
-  BatchAAResults BatchAA2(AA);
-  EXPECT_EQ(AliasResult::NoAlias, BatchAA2.alias(A1Loc, A2Loc));
-  EXPECT_EQ(AliasResult::MayAlias, BatchAA2.alias(S1Loc, S2Loc));
-  EXPECT_EQ(AliasResult::MayAlias, BatchAA2.alias(PhiLoc, A1Loc));
-}
-
-TEST_F(AliasAnalysisTest, BatchAAPhiAssumption) {
-  LLVMContext C;
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M = parseAssemblyString(R"(
-    define void @f(i8* %a.base, i8* %b.base, i1 %c) {
-    entry:
-      br label %loop
-
-    loop:
-      %a = phi i8* [ %a.next, %loop ], [ %a.base, %entry ]
-      %b = phi i8* [ %b.next, %loop ], [ %b.base, %entry ]
-      %a.next = getelementptr i8, i8* %a, i64 1
-      %b.next = getelementptr i8, i8* %b, i64 1
-      br label %loop
-    }
-  )", Err, C);
-
-  Function *F = M->getFunction("f");
-  Instruction *A = getInstructionByName(*F, "a");
-  Instruction *B = getInstructionByName(*F, "b");
-  Instruction *ANext = getInstructionByName(*F, "a.next");
-  Instruction *BNext = getInstructionByName(*F, "b.next");
-  MemoryLocation ALoc(A, LocationSize::precise(1));
-  MemoryLocation BLoc(B, LocationSize::precise(1));
-  MemoryLocation ANextLoc(ANext, LocationSize::precise(1));
-  MemoryLocation BNextLoc(BNext, LocationSize::precise(1));
-
-  auto &AA = getAAResults(*F);
-  EXPECT_EQ(AliasResult::MayAlias, AA.alias(ALoc, BLoc));
-  EXPECT_EQ(AliasResult::MayAlias, AA.alias(ANextLoc, BNextLoc));
-
-  BatchAAResults BatchAA(AA);
-  EXPECT_EQ(AliasResult::MayAlias, BatchAA.alias(ALoc, BLoc));
-  EXPECT_EQ(AliasResult::MayAlias, BatchAA.alias(ANextLoc, BNextLoc));
-}
-
-// Check that two aliased GEPs with non-constant offsets are correctly
-// analyzed and their relative offset can be requested from AA.
-TEST_F(AliasAnalysisTest, PartialAliasOffset) {
-  LLVMContext C;
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M = parseAssemblyString(R"(
-    define void @foo(float* %arg, i32 %i) {
-    bb:
-      %i2 = zext i32 %i to i64
-      %i3 = getelementptr inbounds float, float* %arg, i64 %i2
-      %i4 = bitcast float* %i3 to <2 x float>*
-      %L1 = load <2 x float>, <2 x float>* %i4, align 16
-      %i7 = add nuw nsw i32 %i, 1
-      %i8 = zext i32 %i7 to i64
-      %i9 = getelementptr inbounds float, float* %arg, i64 %i8
-      %L2 = load float, float* %i9, align 4
-      ret void
-    }
-  )",
-                                                  Err, C);
-
-  if (!M)
-    Err.print("PartialAliasOffset", errs());
-
-  Function *F = M->getFunction("foo");
-  const auto Loc1 = MemoryLocation::get(getInstructionByName(*F, "L1"));
-  const auto Loc2 = MemoryLocation::get(getInstructionByName(*F, "L2"));
-
-  auto &AA = getAAResults(*F);
-
-  const auto AR = AA.alias(Loc1, Loc2);
-  EXPECT_EQ(AR, AliasResult::PartialAlias);
-  EXPECT_EQ(4, AR.getOffset());
-}
-
-class AAPassInfraTest : public testing::Test {
-protected:
-  LLVMContext C;
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M;
-
-public:
-  AAPassInfraTest()
-      : M(parseAssemblyString("define i32 @f(i32* %x, i32* %y) {\n"
-                              "entry:\n"
-                              "  %lx = load i32, i32* %x\n"
-                              "  %ly = load i32, i32* %y\n"
-                              "  %sum = add i32 %lx, %ly\n"
-                              "  ret i32 %sum\n"
-                              "}\n",
-                              Err, C)) {
-    assert(M && "Failed to build the module!");
-  }
-};
-
-TEST_F(AAPassInfraTest, injectExternalAA) {
-  legacy::PassManager PM;
-
-  // Register our custom AA's wrapper pass manually.
-  bool IsCustomAAQueried = false;
-  PM.add(new TestCustomAAWrapperPass([&] { IsCustomAAQueried = true; }));
-
-  // Now add the external AA wrapper with a lambda which queries for the
-  // wrapper around our custom AA and adds it to the results.
-  PM.add(createExternalAAWrapperPass([](Pass &P, Function &, AAResults &AAR) {
-    if (auto *WrapperPass = P.getAnalysisIfAvailable<TestCustomAAWrapperPass>())
-      AAR.addAAResult(WrapperPass->getResult());
-  }));
-
-  // And run a pass that will make some alias queries. This will automatically
-  // trigger the rest of the alias analysis stack to be run. It is analagous to
-  // building a full pass pipeline with any of the existing pass manager
-  // builders.
-  PM.add(new AATestPass());
-  PM.run(*M);
-
-  // Finally, ensure that our custom AA was indeed queried.
-  EXPECT_TRUE(IsCustomAAQueried);
-}
-
-} // end anonymous namspace
diff --git a/gnu/llvm/llvm/unittests/Analysis/AliasSetTrackerTest.cpp b/gnu/llvm/llvm/unittests/Analysis/AliasSetTrackerTest.cpp
deleted file mode 100644
index 625971b1db0..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/AliasSetTrackerTest.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-//=======- AliasSetTrackerTest.cpp - Unit test for the Alias Set Tracker  -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/AliasSetTracker.h"
-#include "llvm/ADT/Triple.h"
-#include "llvm/Analysis/AliasAnalysis.h"
-#include "llvm/Analysis/TargetLibraryInfo.h"
-#include "llvm/Analysis/TypeBasedAliasAnalysis.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-TEST(AliasSetTracker, AliasUnknownInst) {
-  StringRef Assembly = R"(
-    @a = common global i32 0, align 4
-    @b = common global float 0.000000e+00, align 4
-
-    ; Function Attrs: nounwind ssp uwtable
-    define i32 @read_a() #0 {
-      %1 = load i32, i32* @a, align 4, !tbaa !3
-      ret i32 %1
-    }
-
-    ; Function Attrs: nounwind ssp uwtable
-    define void @write_b() #0 {
-      store float 1.000000e+01, float* @b, align 4, !tbaa !7
-      ret void
-    }
-
-    ; Function Attrs: nounwind ssp uwtable
-    define void @test() #0 {
-      %1 = call i32 @read_a(), !tbaa !3
-      call void @write_b(), !tbaa !7
-      ret void
-    }
-
-    !3 = !{!4, !4, i64 0}
-    !4 = !{!"int", !5, i64 0}
-    !5 = !{!"omnipotent char", !6, i64 0}
-    !6 = !{!"Simple C/C++ TBAA"}
-    !7 = !{!8, !8, i64 0}
-    !8 = !{!"float", !5, i64 0}
-  )";
-
-  // Parse the IR. The two calls in @test can not access aliasing elements.
-  LLVMContext Context;
-  SMDiagnostic Error;
-  auto M = parseAssemblyString(Assembly, Error, Context);
-  ASSERT_TRUE(M) << "Bad assembly?";
-
-  // Initialize the alias result.
-  Triple Trip(M->getTargetTriple());
-  TargetLibraryInfoImpl TLII(Trip);
-  TargetLibraryInfo TLI(TLII);
-  AAResults AA(TLI);
-  TypeBasedAAResult TBAAR;
-  AA.addAAResult(TBAAR);
-
-  // Initialize the alias set tracker for the @test function.
-  Function *Test = M->getFunction("test");
-  ASSERT_NE(Test, nullptr);
-  AliasSetTracker AST(AA);
-  for (auto &BB : *Test)
-    AST.add(BB);
-  // There should be 2 disjoint alias sets. 1 from each call. 
-  ASSERT_EQ((int)AST.getAliasSets().size(), 2);
-
-  // Directly test aliasesUnknownInst.
-  // Now every call instruction should only alias one alias set.
-  for (auto &Inst : *Test->begin()) {
-    bool FoundAS = false;
-    for (AliasSet &AS : AST) {
-      if (!Inst.mayReadOrWriteMemory())
-        continue;
-      if (!AS.aliasesUnknownInst(&Inst, AA))
-        continue;
-      ASSERT_NE(FoundAS, true);
-      FoundAS = true;
-    }
-  }
-}
diff --git a/gnu/llvm/llvm/unittests/Analysis/AssumeBundleQueriesTest.cpp b/gnu/llvm/llvm/unittests/Analysis/AssumeBundleQueriesTest.cpp
deleted file mode 100644
index 28ebb8cda01..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/AssumeBundleQueriesTest.cpp
+++ /dev/null
@@ -1,602 +0,0 @@
-//===- AssumeBundleQueriesTest.cpp ------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/AssumptionCache.h"
-#include "llvm/Analysis/AssumeBundleQueries.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/IntrinsicInst.h"
-#include "llvm/Support/Regex.h"
-#include "llvm/Support/SourceMgr.h"
-#include "llvm/Support/CommandLine.h"
-#include "llvm/Transforms/Utils/AssumeBundleBuilder.h"
-#include "gtest/gtest.h"
-#include <random>
-
-using namespace llvm;
-
-namespace llvm {
-extern cl::opt<bool> ShouldPreserveAllAttributes;
-extern cl::opt<bool> EnableKnowledgeRetention;
-} // namespace llvm
-
-static void RunTest(
-    StringRef Head, StringRef Tail,
-    std::vector<std::pair<StringRef, llvm::function_ref<void(Instruction *)>>>
-        &Tests) {
-  for (auto &Elem : Tests) {
-    std::string IR;
-    IR.append(Head.begin(), Head.end());
-    IR.append(Elem.first.begin(), Elem.first.end());
-    IR.append(Tail.begin(), Tail.end());
-    LLVMContext C;
-    SMDiagnostic Err;
-    std::unique_ptr<Module> Mod = parseAssemblyString(IR, Err, C);
-    if (!Mod)
-      Err.print("AssumeQueryAPI", errs());
-    Elem.second(&*(Mod->getFunction("test")->begin()->begin()));
-  }
-}
-
-bool hasMatchesExactlyAttributes(AssumeInst *Assume, Value *WasOn,
-                                 StringRef AttrToMatch) {
-  Regex Reg(AttrToMatch);
-  SmallVector<StringRef, 1> Matches;
-  for (StringRef Attr : {
-#define GET_ATTR_NAMES
-#define ATTRIBUTE_ALL(ENUM_NAME, DISPLAY_NAME) StringRef(#DISPLAY_NAME),
-#include "llvm/IR/Attributes.inc"
-       }) {
-    bool ShouldHaveAttr = Reg.match(Attr, &Matches) && Matches[0] == Attr;
-    if (ShouldHaveAttr != hasAttributeInAssume(*Assume, WasOn, Attr))
-      return false;
-  }
-  return true;
-}
-
-bool hasTheRightValue(AssumeInst *Assume, Value *WasOn,
-                      Attribute::AttrKind Kind, unsigned Value) {
-  uint64_t ArgVal = 0;
-  if (!hasAttributeInAssume(*Assume, WasOn, Kind, &ArgVal))
-    return false;
-  if (ArgVal != Value)
-    return false;
-  return true;
-}
-
-TEST(AssumeQueryAPI, hasAttributeInAssume) {
-  EnableKnowledgeRetention.setValue(true);
-  StringRef Head =
-      "declare void @llvm.assume(i1)\n"
-      "declare void @func(i32*, i32*, i32*)\n"
-      "declare void @func1(i32*, i32*, i32*, i32*)\n"
-      "declare void @func_many(i32*) \"no-jump-tables\" nounwind "
-      "\"less-precise-fpmad\" willreturn norecurse\n"
-      "define void @test(i32* %P, i32* %P1, i32* %P2, i32* %P3) {\n";
-  StringRef Tail = "ret void\n"
-                   "}";
-  std::vector<std::pair<StringRef, llvm::function_ref<void(Instruction *)>>>
-      Tests;
-  Tests.push_back(std::make_pair(
-      "call void @func(i32* nonnull align 4 dereferenceable(16) %P, i32* align "
-      "8 noalias %P1, i32* align 8 noundef %P2)\n",
-      [](Instruction *I) {
-        auto *Assume = buildAssumeFromInst(I);
-        Assume->insertBefore(I);
-        ASSERT_TRUE(hasMatchesExactlyAttributes(Assume, I->getOperand(0),
-                                       "(nonnull|align|dereferenceable)"));
-        ASSERT_TRUE(hasMatchesExactlyAttributes(Assume, I->getOperand(1),
-                                       "()"));
-        ASSERT_TRUE(hasMatchesExactlyAttributes(Assume, I->getOperand(2),
-                                       "(align|noundef)"));
-        ASSERT_TRUE(hasTheRightValue(Assume, I->getOperand(0),
-                                     Attribute::AttrKind::Dereferenceable, 16));
-        ASSERT_TRUE(hasTheRightValue(Assume, I->getOperand(0),
-                                     Attribute::AttrKind::Alignment, 4));
-        ASSERT_TRUE(hasTheRightValue(Assume, I->getOperand(0),
-                                     Attribute::AttrKind::Alignment, 4));
-      }));
-  Tests.push_back(std::make_pair(
-      "call void @func1(i32* nonnull align 32 dereferenceable(48) %P, i32* "
-      "nonnull "
-      "align 8 dereferenceable(28) %P, i32* nonnull align 64 "
-      "dereferenceable(4) "
-      "%P, i32* nonnull align 16 dereferenceable(12) %P)\n",
-      [](Instruction *I) {
-        auto *Assume = buildAssumeFromInst(I);
-        Assume->insertBefore(I);
-        ASSERT_TRUE(hasMatchesExactlyAttributes(Assume, I->getOperand(0),
-                                       "(nonnull|align|dereferenceable)"));
-        ASSERT_TRUE(hasMatchesExactlyAttributes(Assume, I->getOperand(1),
-                                       "(nonnull|align|dereferenceable)"));
-        ASSERT_TRUE(hasMatchesExactlyAttributes(Assume, I->getOperand(2),
-                                       "(nonnull|align|dereferenceable)"));
-        ASSERT_TRUE(hasMatchesExactlyAttributes(Assume, I->getOperand(3),
-                                       "(nonnull|align|dereferenceable)"));
-        ASSERT_TRUE(hasTheRightValue(Assume, I->getOperand(0),
-                                     Attribute::AttrKind::Dereferenceable, 48));
-        ASSERT_TRUE(hasTheRightValue(Assume, I->getOperand(0),
-                                     Attribute::AttrKind::Alignment, 64));
-        ASSERT_TRUE(hasTheRightValue(Assume, I->getOperand(1),
-                                     Attribute::AttrKind::Alignment, 64));
-      }));
-  Tests.push_back(std::make_pair(
-      "call void @func_many(i32* align 8 noundef %P1) cold\n", [](Instruction *I) {
-        ShouldPreserveAllAttributes.setValue(true);
-        auto *Assume = buildAssumeFromInst(I);
-        Assume->insertBefore(I);
-        ASSERT_TRUE(hasMatchesExactlyAttributes(
-            Assume, nullptr,
-            "(align|nounwind|norecurse|noundef|willreturn|cold)"));
-        ShouldPreserveAllAttributes.setValue(false);
-      }));
-  Tests.push_back(
-      std::make_pair("call void @llvm.assume(i1 true)\n", [](Instruction *I) {
-        auto *Assume = cast<AssumeInst>(I);
-        ASSERT_TRUE(hasMatchesExactlyAttributes(Assume, nullptr, ""));
-      }));
-  Tests.push_back(std::make_pair(
-      "call void @func1(i32* readnone align 32 "
-      "dereferenceable(48) noalias %P, i32* "
-      "align 8 dereferenceable(28) %P1, i32* align 64 "
-      "dereferenceable(4) "
-      "%P2, i32* nonnull align 16 dereferenceable(12) %P3)\n",
-      [](Instruction *I) {
-        auto *Assume = buildAssumeFromInst(I);
-        Assume->insertBefore(I);
-        ASSERT_TRUE(hasMatchesExactlyAttributes(
-            Assume, I->getOperand(0),
-            "(align|dereferenceable)"));
-        ASSERT_TRUE(hasMatchesExactlyAttributes(Assume, I->getOperand(1),
-                                       "(align|dereferenceable)"));
-        ASSERT_TRUE(hasMatchesExactlyAttributes(Assume, I->getOperand(2),
-                                       "(align|dereferenceable)"));
-        ASSERT_TRUE(hasMatchesExactlyAttributes(Assume, I->getOperand(3),
-                                       "(nonnull|align|dereferenceable)"));
-        ASSERT_TRUE(hasTheRightValue(Assume, I->getOperand(0),
-                                     Attribute::AttrKind::Alignment, 32));
-        ASSERT_TRUE(hasTheRightValue(Assume, I->getOperand(0),
-                                     Attribute::AttrKind::Dereferenceable, 48));
-        ASSERT_TRUE(hasTheRightValue(Assume, I->getOperand(1),
-                                     Attribute::AttrKind::Dereferenceable, 28));
-        ASSERT_TRUE(hasTheRightValue(Assume, I->getOperand(1),
-                                     Attribute::AttrKind::Alignment, 8));
-        ASSERT_TRUE(hasTheRightValue(Assume, I->getOperand(2),
-                                     Attribute::AttrKind::Alignment, 64));
-        ASSERT_TRUE(hasTheRightValue(Assume, I->getOperand(2),
-                                     Attribute::AttrKind::Dereferenceable, 4));
-        ASSERT_TRUE(hasTheRightValue(Assume, I->getOperand(3),
-                                     Attribute::AttrKind::Alignment, 16));
-        ASSERT_TRUE(hasTheRightValue(Assume, I->getOperand(3),
-                                     Attribute::AttrKind::Dereferenceable, 12));
-      }));
-
-  Tests.push_back(std::make_pair(
-      "call void @func1(i32* readnone align 32 "
-      "dereferenceable(48) noalias %P, i32* "
-      "align 8 dereferenceable(28) %P1, i32* align 64 "
-      "dereferenceable(4) "
-      "%P2, i32* nonnull align 16 dereferenceable(12) %P3)\n",
-      [](Instruction *I) {
-        auto *Assume = buildAssumeFromInst(I);
-        Assume->insertBefore(I);
-        I->getOperand(1)->dropDroppableUses();
-        I->getOperand(2)->dropDroppableUses();
-        I->getOperand(3)->dropDroppableUses();
-        ASSERT_TRUE(hasMatchesExactlyAttributes(
-            Assume, I->getOperand(0),
-            "(align|dereferenceable)"));
-        ASSERT_TRUE(hasMatchesExactlyAttributes(Assume, I->getOperand(1),
-                                       ""));
-        ASSERT_TRUE(hasMatchesExactlyAttributes(Assume, I->getOperand(2),
-                                       ""));
-        ASSERT_TRUE(hasMatchesExactlyAttributes(Assume, I->getOperand(3),
-                                       ""));
-        ASSERT_TRUE(hasTheRightValue(Assume, I->getOperand(0),
-                                     Attribute::AttrKind::Alignment, 32));
-        ASSERT_TRUE(hasTheRightValue(Assume, I->getOperand(0),
-                                     Attribute::AttrKind::Dereferenceable, 48));
-      }));
-  Tests.push_back(std::make_pair(
-      "call void @func(i32* nonnull align 4 dereferenceable(16) %P, i32* align "
-      "8 noalias %P1, i32* %P1)\n",
-      [](Instruction *I) {
-        auto *Assume = buildAssumeFromInst(I);
-        Assume->insertBefore(I);
-        Value *New = I->getFunction()->getArg(3);
-        Value *Old = I->getOperand(0);
-        ASSERT_TRUE(hasMatchesExactlyAttributes(Assume, New, ""));
-        ASSERT_TRUE(hasMatchesExactlyAttributes(Assume, Old,
-                                       "(nonnull|align|dereferenceable)"));
-        Old->replaceAllUsesWith(New);
-        ASSERT_TRUE(hasMatchesExactlyAttributes(Assume, New,
-                                       "(nonnull|align|dereferenceable)"));
-        ASSERT_TRUE(hasMatchesExactlyAttributes(Assume, Old, ""));
-      }));
-  RunTest(Head, Tail, Tests);
-}
-
-static bool FindExactlyAttributes(RetainedKnowledgeMap &Map, Value *WasOn,
-                                 StringRef AttrToMatch) {
-  Regex Reg(AttrToMatch);
-  SmallVector<StringRef, 1> Matches;
-  for (StringRef Attr : {
-#define GET_ATTR_NAMES
-#define ATTRIBUTE_ENUM(ENUM_NAME, DISPLAY_NAME) StringRef(#DISPLAY_NAME),
-#include "llvm/IR/Attributes.inc"
-       }) {
-    bool ShouldHaveAttr = Reg.match(Attr, &Matches) && Matches[0] == Attr;
-
-    if (ShouldHaveAttr != (Map.find(RetainedKnowledgeKey{WasOn, Attribute::getAttrKindFromName(Attr)}) != Map.end()))
-      return false;
-  }
-  return true;
-}
-
-static bool MapHasRightValue(RetainedKnowledgeMap &Map, AssumeInst *II,
-                             RetainedKnowledgeKey Key, MinMax MM) {
-  auto LookupIt = Map.find(Key);
-  return (LookupIt != Map.end()) && (LookupIt->second[II].Min == MM.Min) &&
-         (LookupIt->second[II].Max == MM.Max);
-}
-
-TEST(AssumeQueryAPI, fillMapFromAssume) {
-  EnableKnowledgeRetention.setValue(true);
-  StringRef Head =
-      "declare void @llvm.assume(i1)\n"
-      "declare void @func(i32*, i32*, i32*)\n"
-      "declare void @func1(i32*, i32*, i32*, i32*)\n"
-      "declare void @func_many(i32*) \"no-jump-tables\" nounwind "
-      "\"less-precise-fpmad\" willreturn norecurse\n"
-      "define void @test(i32* %P, i32* %P1, i32* %P2, i32* %P3) {\n";
-  StringRef Tail = "ret void\n"
-                   "}";
-  std::vector<std::pair<StringRef, llvm::function_ref<void(Instruction *)>>>
-      Tests;
-  Tests.push_back(std::make_pair(
-      "call void @func(i32* nonnull align 4 dereferenceable(16) %P, i32* align "
-      "8 noalias %P1, i32* align 8 dereferenceable(8) %P2)\n",
-      [](Instruction *I) {
-        auto *Assume = buildAssumeFromInst(I);
-        Assume->insertBefore(I);
-
-        RetainedKnowledgeMap Map;
-        fillMapFromAssume(*Assume, Map);
-        ASSERT_TRUE(FindExactlyAttributes(Map, I->getOperand(0),
-                                       "(nonnull|align|dereferenceable)"));
-        ASSERT_FALSE(FindExactlyAttributes(Map, I->getOperand(1),
-                                       "(align)"));
-        ASSERT_TRUE(FindExactlyAttributes(Map, I->getOperand(2),
-                                       "(align|dereferenceable)"));
-        ASSERT_TRUE(MapHasRightValue(
-            Map, Assume, {I->getOperand(0), Attribute::Dereferenceable}, {16, 16}));
-        ASSERT_TRUE(MapHasRightValue(Map, Assume, {I->getOperand(0), Attribute::Alignment},
-                               {4, 4}));
-        ASSERT_TRUE(MapHasRightValue(Map, Assume, {I->getOperand(0), Attribute::Alignment},
-                               {4, 4}));
-      }));
-  Tests.push_back(std::make_pair(
-      "call void @func1(i32* nonnull align 32 dereferenceable(48) %P, i32* "
-      "nonnull "
-      "align 8 dereferenceable(28) %P, i32* nonnull align 64 "
-      "dereferenceable(4) "
-      "%P, i32* nonnull align 16 dereferenceable(12) %P)\n",
-      [](Instruction *I) {
-        auto *Assume = buildAssumeFromInst(I);
-        Assume->insertBefore(I);
-
-        RetainedKnowledgeMap Map;
-        fillMapFromAssume(*Assume, Map);
-
-        ASSERT_TRUE(FindExactlyAttributes(Map, I->getOperand(0),
-                                       "(nonnull|align|dereferenceable)"));
-        ASSERT_TRUE(FindExactlyAttributes(Map, I->getOperand(1),
-                                       "(nonnull|align|dereferenceable)"));
-        ASSERT_TRUE(FindExactlyAttributes(Map, I->getOperand(2),
-                                       "(nonnull|align|dereferenceable)"));
-        ASSERT_TRUE(FindExactlyAttributes(Map, I->getOperand(3),
-                                       "(nonnull|align|dereferenceable)"));
-        ASSERT_TRUE(MapHasRightValue(
-            Map, Assume, {I->getOperand(0), Attribute::Dereferenceable},
-            {48, 48}));
-        ASSERT_TRUE(MapHasRightValue(
-            Map, Assume, {I->getOperand(0), Attribute::Alignment}, {64, 64}));
-      }));
-  Tests.push_back(std::make_pair(
-      "call void @func_many(i32* align 8 %P1) cold\n", [](Instruction *I) {
-        ShouldPreserveAllAttributes.setValue(true);
-        auto *Assume = buildAssumeFromInst(I);
-        Assume->insertBefore(I);
-
-        RetainedKnowledgeMap Map;
-        fillMapFromAssume(*Assume, Map);
-
-        ASSERT_TRUE(FindExactlyAttributes(
-            Map, nullptr, "(nounwind|norecurse|willreturn|cold)"));
-        ShouldPreserveAllAttributes.setValue(false);
-      }));
-  Tests.push_back(
-      std::make_pair("call void @llvm.assume(i1 true)\n", [](Instruction *I) {
-        RetainedKnowledgeMap Map;
-        fillMapFromAssume(*cast<AssumeInst>(I), Map);
-
-        ASSERT_TRUE(FindExactlyAttributes(Map, nullptr, ""));
-        ASSERT_TRUE(Map.empty());
-      }));
-  Tests.push_back(std::make_pair(
-      "call void @func1(i32* readnone align 32 "
-      "dereferenceable(48) noalias %P, i32* "
-      "align 8 dereferenceable(28) %P1, i32* align 64 "
-      "dereferenceable(4) "
-      "%P2, i32* nonnull align 16 dereferenceable(12) %P3)\n",
-      [](Instruction *I) {
-        auto *Assume = buildAssumeFromInst(I);
-        Assume->insertBefore(I);
-
-        RetainedKnowledgeMap Map;
-        fillMapFromAssume(*Assume, Map);
-
-        ASSERT_TRUE(FindExactlyAttributes(Map, I->getOperand(0),
-                                    "(align|dereferenceable)"));
-        ASSERT_TRUE(FindExactlyAttributes(Map, I->getOperand(1),
-                                    "(align|dereferenceable)"));
-        ASSERT_TRUE(FindExactlyAttributes(Map, I->getOperand(2),
-                                       "(align|dereferenceable)"));
-        ASSERT_TRUE(FindExactlyAttributes(Map, I->getOperand(3),
-                                       "(nonnull|align|dereferenceable)"));
-        ASSERT_TRUE(MapHasRightValue(Map, Assume, {I->getOperand(0), Attribute::Alignment},
-                               {32, 32}));
-        ASSERT_TRUE(MapHasRightValue(
-            Map, Assume, {I->getOperand(0), Attribute::Dereferenceable}, {48, 48}));
-        ASSERT_TRUE(MapHasRightValue(
-            Map, Assume, {I->getOperand(1), Attribute::Dereferenceable}, {28, 28}));
-        ASSERT_TRUE(MapHasRightValue(Map, Assume, {I->getOperand(1), Attribute::Alignment},
-                               {8, 8}));
-        ASSERT_TRUE(MapHasRightValue(Map, Assume, {I->getOperand(2), Attribute::Alignment},
-                               {64, 64}));
-        ASSERT_TRUE(MapHasRightValue(
-            Map, Assume, {I->getOperand(2), Attribute::Dereferenceable}, {4, 4}));
-        ASSERT_TRUE(MapHasRightValue(Map, Assume, {I->getOperand(3), Attribute::Alignment},
-                               {16, 16}));
-        ASSERT_TRUE(MapHasRightValue(
-            Map, Assume, {I->getOperand(3), Attribute::Dereferenceable}, {12, 12}));
-      }));
-
-  /// Keep this test last as it modifies the function.
-  Tests.push_back(std::make_pair(
-      "call void @func(i32* nonnull align 4 dereferenceable(16) %P, i32* align "
-      "8 noalias %P1, i32* %P2)\n",
-      [](Instruction *I) {
-        auto *Assume = buildAssumeFromInst(I);
-        Assume->insertBefore(I);
-
-        RetainedKnowledgeMap Map;
-        fillMapFromAssume(*Assume, Map);
-
-        Value *New = I->getFunction()->getArg(3);
-        Value *Old = I->getOperand(0);
-        ASSERT_TRUE(FindExactlyAttributes(Map, New, ""));
-        ASSERT_TRUE(FindExactlyAttributes(Map, Old,
-                                       "(nonnull|align|dereferenceable)"));
-        Old->replaceAllUsesWith(New);
-        Map.clear();
-        fillMapFromAssume(*Assume, Map);
-        ASSERT_TRUE(FindExactlyAttributes(Map, New,
-                                       "(nonnull|align|dereferenceable)"));
-        ASSERT_TRUE(FindExactlyAttributes(Map, Old, ""));
-      }));
-  Tests.push_back(std::make_pair(
-      "call void @llvm.assume(i1 true) [\"align\"(i8* undef, i32 undef)]",
-      [](Instruction *I) {
-        // Don't crash but don't learn from undef.
-        RetainedKnowledgeMap Map;
-        fillMapFromAssume(*cast<AssumeInst>(I), Map);
-
-        ASSERT_TRUE(Map.empty());
-      }));
-  RunTest(Head, Tail, Tests);
-}
-
-static void RunRandTest(uint64_t Seed, int Size, int MinCount, int MaxCount,
-                        unsigned MaxValue) {
-  LLVMContext C;
-  SMDiagnostic Err;
-
-  std::random_device dev;
-  std::mt19937 Rng(Seed);
-  std::uniform_int_distribution<int> DistCount(MinCount, MaxCount);
-  std::uniform_int_distribution<unsigned> DistValue(0, MaxValue);
-  std::uniform_int_distribution<unsigned> DistAttr(0,
-                                                   Attribute::EndAttrKinds - 1);
-
-  std::unique_ptr<Module> Mod = std::make_unique<Module>("AssumeQueryAPI", C);
-  if (!Mod)
-    Err.print("AssumeQueryAPI", errs());
-
-  std::vector<Type *> TypeArgs;
-  for (int i = 0; i < (Size * 2); i++)
-    TypeArgs.push_back(Type::getInt32PtrTy(C));
-  FunctionType *FuncType =
-      FunctionType::get(Type::getVoidTy(C), TypeArgs, false);
-
-  Function *F =
-      Function::Create(FuncType, GlobalValue::ExternalLinkage, "test", &*Mod);
-  BasicBlock *BB = BasicBlock::Create(C);
-  BB->insertInto(F);
-  Instruction *Ret = ReturnInst::Create(C);
-  BB->getInstList().insert(BB->begin(), Ret);
-  Function *FnAssume = Intrinsic::getDeclaration(Mod.get(), Intrinsic::assume);
-
-  std::vector<Argument *> ShuffledArgs;
-  std::vector<bool> HasArg;
-  for (auto &Arg : F->args()) {
-    ShuffledArgs.push_back(&Arg);
-    HasArg.push_back(false);
-  }
-
-  std::shuffle(ShuffledArgs.begin(), ShuffledArgs.end(), Rng);
-
-  std::vector<OperandBundleDef> OpBundle;
-  OpBundle.reserve(Size);
-  std::vector<Value *> Args;
-  Args.reserve(2);
-  for (int i = 0; i < Size; i++) {
-    int count = DistCount(Rng);
-    int value = DistValue(Rng);
-    int attr = DistAttr(Rng);
-    std::string str;
-    raw_string_ostream ss(str);
-    ss << Attribute::getNameFromAttrKind(
-        static_cast<Attribute::AttrKind>(attr));
-    Args.clear();
-
-    if (count > 0) {
-      Args.push_back(ShuffledArgs[i]);
-      HasArg[i] = true;
-    }
-    if (count > 1)
-      Args.push_back(ConstantInt::get(Type::getInt32Ty(C), value));
-
-    OpBundle.push_back(OperandBundleDef{ss.str().c_str(), std::move(Args)});
-  }
-
-  auto *Assume = cast<AssumeInst>(CallInst::Create(
-      FnAssume, ArrayRef<Value *>({ConstantInt::getTrue(C)}), OpBundle));
-  Assume->insertBefore(&F->begin()->front());
-  RetainedKnowledgeMap Map;
-  fillMapFromAssume(*Assume, Map);
-  for (int i = 0; i < (Size * 2); i++) {
-    if (!HasArg[i])
-      continue;
-    RetainedKnowledge K =
-        getKnowledgeFromUseInAssume(&*ShuffledArgs[i]->use_begin());
-    auto LookupIt = Map.find(RetainedKnowledgeKey{K.WasOn, K.AttrKind});
-    ASSERT_TRUE(LookupIt != Map.end());
-    MinMax MM = LookupIt->second[Assume];
-    ASSERT_TRUE(MM.Min == MM.Max);
-    ASSERT_TRUE(MM.Min == K.ArgValue);
-  }
-}
-
-TEST(AssumeQueryAPI, getKnowledgeFromUseInAssume) {
-  // // For Fuzzing
-  // std::random_device dev;
-  // std::mt19937 Rng(dev());
-  // while (true) {
-  //   unsigned Seed = Rng();
-  //   dbgs() << Seed << "\n";
-  //   RunRandTest(Seed, 100000, 0, 2, 100);
-  // }
-  RunRandTest(23456, 4, 0, 2, 100);
-  RunRandTest(560987, 25, -3, 2, 100);
-
-  // Large bundles can lead to special cases. this is why this test is soo
-  // large.
-  RunRandTest(9876789, 100000, -0, 7, 100);
-}
-
-TEST(AssumeQueryAPI, AssumptionCache) {
-  LLVMContext C;
-  SMDiagnostic Err;
-  std::unique_ptr<Module> Mod = parseAssemblyString(
-      "declare void @llvm.assume(i1)\n"
-      "define void @test(i32* %P, i32* %P1, i32* %P2, i32* %P3, i1 %B) {\n"
-      "call void @llvm.assume(i1 true) [\"nonnull\"(i32* %P), \"align\"(i32* "
-      "%P2, i32 4), \"align\"(i32* %P, i32 8)]\n"
-      "call void @llvm.assume(i1 %B) [\"test\"(i32* %P1), "
-      "\"dereferenceable\"(i32* %P, i32 4)]\n"
-      "ret void\n}\n",
-      Err, C);
-  if (!Mod)
-    Err.print("AssumeQueryAPI", errs());
-  Function *F = Mod->getFunction("test");
-  BasicBlock::iterator First = F->begin()->begin();
-  BasicBlock::iterator Second = F->begin()->begin();
-  Second++;
-  AssumptionCacheTracker ACT;
-  AssumptionCache &AC = ACT.getAssumptionCache(*F);
-  auto AR = AC.assumptionsFor(F->getArg(3));
-  ASSERT_EQ(AR.size(), 0u);
-  AR = AC.assumptionsFor(F->getArg(1));
-  ASSERT_EQ(AR.size(), 1u);
-  ASSERT_EQ(AR[0].Index, 0u);
-  ASSERT_EQ(AR[0].Assume, &*Second);
-  AR = AC.assumptionsFor(F->getArg(2));
-  ASSERT_EQ(AR.size(), 1u);
-  ASSERT_EQ(AR[0].Index, 1u);
-  ASSERT_EQ(AR[0].Assume, &*First);
-  AR = AC.assumptionsFor(F->getArg(0));
-  ASSERT_EQ(AR.size(), 3u);
-  llvm::sort(AR,
-             [](const auto &L, const auto &R) { return L.Index < R.Index; });
-  ASSERT_EQ(AR[0].Assume, &*First);
-  ASSERT_EQ(AR[0].Index, 0u);
-  ASSERT_EQ(AR[1].Assume, &*Second);
-  ASSERT_EQ(AR[1].Index, 1u);
-  ASSERT_EQ(AR[2].Assume, &*First);
-  ASSERT_EQ(AR[2].Index, 2u);
-  AR = AC.assumptionsFor(F->getArg(4));
-  ASSERT_EQ(AR.size(), 1u);
-  ASSERT_EQ(AR[0].Assume, &*Second);
-  ASSERT_EQ(AR[0].Index, AssumptionCache::ExprResultIdx);
-  AC.unregisterAssumption(cast<AssumeInst>(&*Second));
-  AR = AC.assumptionsFor(F->getArg(1));
-  ASSERT_EQ(AR.size(), 0u);
-  AR = AC.assumptionsFor(F->getArg(0));
-  ASSERT_EQ(AR.size(), 3u);
-  llvm::sort(AR,
-             [](const auto &L, const auto &R) { return L.Index < R.Index; });
-  ASSERT_EQ(AR[0].Assume, &*First);
-  ASSERT_EQ(AR[0].Index, 0u);
-  ASSERT_EQ(AR[1].Assume, nullptr);
-  ASSERT_EQ(AR[1].Index, 1u);
-  ASSERT_EQ(AR[2].Assume, &*First);
-  ASSERT_EQ(AR[2].Index, 2u);
-  AR = AC.assumptionsFor(F->getArg(2));
-  ASSERT_EQ(AR.size(), 1u);
-  ASSERT_EQ(AR[0].Index, 1u);
-  ASSERT_EQ(AR[0].Assume, &*First);
-}
-
-TEST(AssumeQueryAPI, Alignment) {
-  LLVMContext C;
-  SMDiagnostic Err;
-  std::unique_ptr<Module> Mod = parseAssemblyString(
-      "declare void @llvm.assume(i1)\n"
-      "define void @test(i32* %P, i32* %P1, i32* %P2, i32 %I3, i1 %B) {\n"
-      "call void @llvm.assume(i1 true) [\"align\"(i32* %P, i32 8, i32 %I3)]\n"
-      "call void @llvm.assume(i1 true) [\"align\"(i32* %P1, i32 %I3, i32 "
-      "%I3)]\n"
-      "call void @llvm.assume(i1 true) [\"align\"(i32* %P2, i32 16, i32 8)]\n"
-      "ret void\n}\n",
-      Err, C);
-  if (!Mod)
-    Err.print("AssumeQueryAPI", errs());
-
-  Function *F = Mod->getFunction("test");
-  BasicBlock::iterator Start = F->begin()->begin();
-  AssumeInst *II;
-  RetainedKnowledge RK;
-  II = cast<AssumeInst>(&*Start);
-  RK = getKnowledgeFromBundle(*II, II->bundle_op_info_begin()[0]);
-  ASSERT_EQ(RK.AttrKind, Attribute::Alignment);
-  ASSERT_EQ(RK.WasOn, F->getArg(0));
-  ASSERT_EQ(RK.ArgValue, 1u);
-  Start++;
-  II = cast<AssumeInst>(&*Start);
-  RK = getKnowledgeFromBundle(*II, II->bundle_op_info_begin()[0]);
-  ASSERT_EQ(RK.AttrKind, Attribute::Alignment);
-  ASSERT_EQ(RK.WasOn, F->getArg(1));
-  ASSERT_EQ(RK.ArgValue, 1u);
-  Start++;
-  II = cast<AssumeInst>(&*Start);
-  RK = getKnowledgeFromBundle(*II, II->bundle_op_info_begin()[0]);
-  ASSERT_EQ(RK.AttrKind, Attribute::Alignment);
-  ASSERT_EQ(RK.WasOn, F->getArg(2));
-  ASSERT_EQ(RK.ArgValue, 8u);
-}
diff --git a/gnu/llvm/llvm/unittests/Analysis/BasicAliasAnalysisTest.cpp b/gnu/llvm/llvm/unittests/Analysis/BasicAliasAnalysisTest.cpp
deleted file mode 100644
index 5b8ece41b07..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/BasicAliasAnalysisTest.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-//===- BasicAliasAnalysisTest.cpp - Unit tests for BasicAA ----------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Targeted tests that are hard/convoluted to make happen with just `opt`.
-//
-
-#include "llvm/Analysis/BasicAliasAnalysis.h"
-#include "llvm/Analysis/AliasAnalysis.h"
-#include "llvm/Analysis/AssumptionCache.h"
-#include "llvm/Analysis/TargetLibraryInfo.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Dominators.h"
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-// FIXME: This is duplicated between this file and MemorySSATest. Refactor.
-const static char DLString[] = "e-i64:64-f80:128-n8:16:32:64-S128";
-
-/// There's a lot of common setup between these tests. This fixture helps reduce
-/// that. Tests should mock up a function, store it in F, and then call
-/// setupAnalyses().
-class BasicAATest : public testing::Test {
-protected:
-  // N.B. Many of these members depend on each other (e.g. the Module depends on
-  // the Context, etc.). So, order matters here (and in TestAnalyses).
-  LLVMContext C;
-  Module M;
-  IRBuilder<> B;
-  DataLayout DL;
-  TargetLibraryInfoImpl TLII;
-  TargetLibraryInfo TLI;
-  Function *F;
-
-  // Things that we need to build after the function is created.
-  struct TestAnalyses {
-    DominatorTree DT;
-    AssumptionCache AC;
-    BasicAAResult BAA;
-    AAQueryInfo AAQI;
-
-    TestAnalyses(BasicAATest &Test)
-        : DT(*Test.F), AC(*Test.F), BAA(Test.DL, *Test.F, Test.TLI, AC, &DT),
-          AAQI() {}
-  };
-
-  llvm::Optional<TestAnalyses> Analyses;
-
-  TestAnalyses &setupAnalyses() {
-    assert(F);
-    Analyses.emplace(*this);
-    return Analyses.getValue();
-  }
-
-public:
-  BasicAATest()
-      : M("BasicAATest", C), B(C), DL(DLString), TLI(TLII), F(nullptr) {}
-};
-
-// Check that a function arg can't trivially alias a global when we're accessing
-// >sizeof(global) bytes through that arg, unless the access size is just an
-// upper-bound.
-TEST_F(BasicAATest, AliasInstWithObjectOfImpreciseSize) {
-  F = Function::Create(
-      FunctionType::get(B.getVoidTy(), {B.getInt32Ty()->getPointerTo()}, false),
-      GlobalValue::ExternalLinkage, "F", &M);
-
-  BasicBlock *Entry(BasicBlock::Create(C, "", F));
-  B.SetInsertPoint(Entry);
-
-  Value *IncomingI32Ptr = F->arg_begin();
-
-  auto *GlobalPtr =
-      cast<GlobalVariable>(M.getOrInsertGlobal("some_global", B.getInt8Ty()));
-
-  // Without sufficiently restricted linkage/an init, some of the object size
-  // checking bits get more conservative.
-  GlobalPtr->setLinkage(GlobalValue::LinkageTypes::InternalLinkage);
-  GlobalPtr->setInitializer(B.getInt8(0));
-
-  auto &AllAnalyses = setupAnalyses();
-  BasicAAResult &BasicAA = AllAnalyses.BAA;
-  AAQueryInfo &AAQI = AllAnalyses.AAQI;
-  ASSERT_EQ(
-      BasicAA.alias(MemoryLocation(IncomingI32Ptr, LocationSize::precise(4)),
-                    MemoryLocation(GlobalPtr, LocationSize::precise(1)), AAQI),
-      AliasResult::NoAlias);
-
-  ASSERT_EQ(
-      BasicAA.alias(MemoryLocation(IncomingI32Ptr, LocationSize::upperBound(4)),
-                    MemoryLocation(GlobalPtr, LocationSize::precise(1)), AAQI),
-      AliasResult::MayAlias);
-}
-
-// Check that we fall back to MayAlias if we see an access of an entire object
-// that's just an upper-bound.
-TEST_F(BasicAATest, AliasInstWithFullObjectOfImpreciseSize) {
-  F = Function::Create(
-      FunctionType::get(B.getVoidTy(), {B.getInt64Ty()}, false),
-      GlobalValue::ExternalLinkage, "F", &M);
-
-  BasicBlock *Entry(BasicBlock::Create(C, "", F));
-  B.SetInsertPoint(Entry);
-
-  Value *ArbitraryI32 = F->arg_begin();
-  AllocaInst *I8 = B.CreateAlloca(B.getInt8Ty(), B.getInt32(2));
-  auto *I8AtUncertainOffset =
-      cast<GetElementPtrInst>(B.CreateGEP(B.getInt8Ty(), I8, ArbitraryI32));
-
-  auto &AllAnalyses = setupAnalyses();
-  BasicAAResult &BasicAA = AllAnalyses.BAA;
-  AAQueryInfo &AAQI = AllAnalyses.AAQI;
-  ASSERT_EQ(BasicAA.alias(
-                MemoryLocation(I8, LocationSize::precise(2)),
-                MemoryLocation(I8AtUncertainOffset, LocationSize::precise(1)),
-                AAQI),
-            AliasResult::PartialAlias);
-
-  ASSERT_EQ(BasicAA.alias(
-                MemoryLocation(I8, LocationSize::upperBound(2)),
-                MemoryLocation(I8AtUncertainOffset, LocationSize::precise(1)),
-                AAQI),
-            AliasResult::MayAlias);
-}
diff --git a/gnu/llvm/llvm/unittests/Analysis/BlockFrequencyInfoTest.cpp b/gnu/llvm/llvm/unittests/Analysis/BlockFrequencyInfoTest.cpp
deleted file mode 100644
index 5dd39951716..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/BlockFrequencyInfoTest.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-//===- BlockFrequencyInfoTest.cpp - BlockFrequencyInfo unit tests ---------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/BlockFrequencyInfo.h"
-#include "llvm/Analysis/BlockFrequencyInfoImpl.h"
-#include "llvm/Analysis/BranchProbabilityInfo.h"
-#include "llvm/Analysis/LoopInfo.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/BasicBlock.h"
-#include "llvm/IR/Dominators.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Support/DataTypes.h"
-#include "llvm/Support/SourceMgr.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-namespace {
-
-class BlockFrequencyInfoTest : public testing::Test {
-protected:
-  std::unique_ptr<BranchProbabilityInfo> BPI;
-  std::unique_ptr<DominatorTree> DT;
-  std::unique_ptr<LoopInfo> LI;
-  LLVMContext C;
-
-  BlockFrequencyInfo buildBFI(Function &F) {
-    DT.reset(new DominatorTree(F));
-    LI.reset(new LoopInfo(*DT));
-    BPI.reset(new BranchProbabilityInfo(F, *LI));
-    return BlockFrequencyInfo(F, *BPI, *LI);
-  }
-  std::unique_ptr<Module> makeLLVMModule() {
-    const char *ModuleStrig = "define i32 @f(i32 %x) {\n"
-                              "bb0:\n"
-                              "  %y1 = icmp eq i32 %x, 0 \n"
-                              "  br i1 %y1, label %bb1, label %bb2 \n"
-                              "bb1:\n"
-                              "  br label %bb3\n"
-                              "bb2:\n"
-                              "  br label %bb3\n"
-                              "bb3:\n"
-                              "  %y2 = phi i32 [0, %bb1], [1, %bb2] \n"
-                              "  ret i32 %y2\n"
-                              "}\n";
-    SMDiagnostic Err;
-    return parseAssemblyString(ModuleStrig, Err, C);
-  }
-};
-
-TEST_F(BlockFrequencyInfoTest, Basic) {
-  auto M = makeLLVMModule();
-  Function *F = M->getFunction("f");
-  F->setEntryCount(100);
-
-  BlockFrequencyInfo BFI = buildBFI(*F);
-  BasicBlock &BB0 = F->getEntryBlock();
-  BasicBlock *BB1 = BB0.getTerminator()->getSuccessor(0);
-  BasicBlock *BB2 = BB0.getTerminator()->getSuccessor(1);
-  BasicBlock *BB3 = BB1->getSingleSuccessor();
-
-  uint64_t BB0Freq = BFI.getBlockFreq(&BB0).getFrequency();
-  uint64_t BB1Freq = BFI.getBlockFreq(BB1).getFrequency();
-  uint64_t BB2Freq = BFI.getBlockFreq(BB2).getFrequency();
-  uint64_t BB3Freq = BFI.getBlockFreq(BB3).getFrequency();
-
-  EXPECT_EQ(BB0Freq, BB3Freq);
-  EXPECT_EQ(BB0Freq, BB1Freq + BB2Freq);
-  EXPECT_EQ(BB0Freq, BB3Freq);
-
-  EXPECT_EQ(BFI.getBlockProfileCount(&BB0).getValue(), UINT64_C(100));
-  EXPECT_EQ(BFI.getBlockProfileCount(BB3).getValue(), UINT64_C(100));
-  EXPECT_EQ(BFI.getBlockProfileCount(BB1).getValue(),
-            (100 * BB1Freq + BB0Freq / 2) / BB0Freq);
-  EXPECT_EQ(BFI.getBlockProfileCount(BB2).getValue(),
-            (100 * BB2Freq + BB0Freq / 2) / BB0Freq);
-
-  // Scale the frequencies of BB0, BB1 and BB2 by a factor of two.
-  SmallPtrSet<BasicBlock *, 4> BlocksToScale({BB1, BB2});
-  BFI.setBlockFreqAndScale(&BB0, BB0Freq * 2, BlocksToScale);
-  EXPECT_EQ(BFI.getBlockFreq(&BB0).getFrequency(), 2 * BB0Freq);
-  EXPECT_EQ(BFI.getBlockFreq(BB1).getFrequency(), 2 * BB1Freq);
-  EXPECT_EQ(BFI.getBlockFreq(BB2).getFrequency(), 2 * BB2Freq);
-  EXPECT_EQ(BFI.getBlockFreq(BB3).getFrequency(), BB3Freq);
-}
-
-static_assert(std::is_trivially_copyable<bfi_detail::BlockMass>::value,
-              "trivially copyable");
-
-} // end anonymous namespace
-} // end namespace llvm
diff --git a/gnu/llvm/llvm/unittests/Analysis/BranchProbabilityInfoTest.cpp b/gnu/llvm/llvm/unittests/Analysis/BranchProbabilityInfoTest.cpp
deleted file mode 100644
index 01661636cdd..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/BranchProbabilityInfoTest.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-//===- BranchProbabilityInfoTest.cpp - BranchProbabilityInfo unit tests ---===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/BranchProbabilityInfo.h"
-#include "llvm/Analysis/LoopInfo.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/BasicBlock.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/Dominators.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Support/DataTypes.h"
-#include "llvm/Support/SourceMgr.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-namespace {
-
-struct BranchProbabilityInfoTest : public testing::Test {
-  std::unique_ptr<BranchProbabilityInfo> BPI;
-  std::unique_ptr<DominatorTree> DT;
-  std::unique_ptr<LoopInfo> LI;
-  LLVMContext C;
-
-  BranchProbabilityInfo &buildBPI(Function &F) {
-    DT.reset(new DominatorTree(F));
-    LI.reset(new LoopInfo(*DT));
-    BPI.reset(new BranchProbabilityInfo(F, *LI));
-    return *BPI;
-  }
-
-  std::unique_ptr<Module> makeLLVMModule() {
-    const char *ModuleString = "define void @f() { exit: ret void }\n";
-    SMDiagnostic Err;
-    return parseAssemblyString(ModuleString, Err, C);
-  }
-};
-
-TEST_F(BranchProbabilityInfoTest, StressUnreachableHeuristic) {
-  auto M = makeLLVMModule();
-  Function *F = M->getFunction("f");
-
-  // define void @f() {
-  // entry:
-  //   switch i32 undef, label %exit, [
-  //      i32 0, label %preexit
-  //      ...                   ;;< Add lots of cases to stress the heuristic.
-  //   ]
-  // preexit:
-  //   unreachable
-  // exit:
-  //   ret void
-  // }
-
-  auto *ExitBB = &F->back();
-  auto *EntryBB = BasicBlock::Create(C, "entry", F, /*insertBefore=*/ExitBB);
-
-  auto *PreExitBB =
-      BasicBlock::Create(C, "preexit", F, /*insertBefore=*/ExitBB);
-  new UnreachableInst(C, PreExitBB);
-
-  unsigned NumCases = 4096;
-  auto *I32 = IntegerType::get(C, 32);
-  auto *Undef = UndefValue::get(I32);
-  auto *Switch = SwitchInst::Create(Undef, ExitBB, NumCases, EntryBB);
-  for (unsigned I = 0; I < NumCases; ++I)
-    Switch->addCase(ConstantInt::get(I32, I), PreExitBB);
-
-  BranchProbabilityInfo &BPI = buildBPI(*F);
-
-  // FIXME: This doesn't seem optimal. Since all of the cases handled by the
-  // switch have the *same* destination block ("preexit"), shouldn't it be the
-  // hot one? I'd expect the results to be reversed here...
-  EXPECT_FALSE(BPI.isEdgeHot(EntryBB, PreExitBB));
-  EXPECT_TRUE(BPI.isEdgeHot(EntryBB, ExitBB));
-}
-
-} // end anonymous namespace
-} // end namespace llvm
diff --git a/gnu/llvm/llvm/unittests/Analysis/CFGTest.cpp b/gnu/llvm/llvm/unittests/Analysis/CFGTest.cpp
deleted file mode 100644
index 5ac5306d0a1..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/CFGTest.cpp
+++ /dev/null
@@ -1,507 +0,0 @@
-//===- CFGTest.cpp - CFG tests --------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/CFG.h"
-#include "llvm/ADT/SmallPtrSet.h"
-#include "llvm/Analysis/LoopInfo.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Dominators.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/InstIterator.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/LegacyPassManager.h"
-#include "llvm/IR/Module.h"
-#include "llvm/InitializePasses.h"
-#include "llvm/Support/ErrorHandling.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-// This fixture assists in running the isPotentiallyReachable utility four ways
-// and ensuring it produces the correct answer each time.
-class IsPotentiallyReachableTest : public testing::Test {
-protected:
-  void ParseAssembly(const char *Assembly) {
-    SMDiagnostic Error;
-    M = parseAssemblyString(Assembly, Error, Context);
-
-    std::string errMsg;
-    raw_string_ostream os(errMsg);
-    Error.print("", os);
-
-    // A failure here means that the test itself is buggy.
-    if (!M)
-      report_fatal_error(os.str().c_str());
-
-    Function *F = M->getFunction("test");
-    if (F == nullptr)
-      report_fatal_error("Test must have a function named @test");
-
-    A = B = nullptr;
-    for (inst_iterator I = inst_begin(F), E = inst_end(F); I != E; ++I) {
-      if (I->hasName()) {
-        if (I->getName() == "A")
-          A = &*I;
-        else if (I->getName() == "B")
-          B = &*I;
-      }
-    }
-    if (A == nullptr)
-      report_fatal_error("@test must have an instruction %A");
-    if (B == nullptr)
-      report_fatal_error("@test must have an instruction %B");
-
-    assert(ExclusionSet.empty());
-    for (auto I = F->begin(), E = F->end(); I != E; ++I) {
-      if (I->hasName() && I->getName().startswith("excluded"))
-        ExclusionSet.insert(&*I);
-    }
-  }
-
-  void ExpectPath(bool ExpectedResult) {
-    static char ID;
-    class IsPotentiallyReachableTestPass : public FunctionPass {
-     public:
-       IsPotentiallyReachableTestPass(bool ExpectedResult, Instruction *A,
-                                      Instruction *B,
-                                      SmallPtrSet<BasicBlock *, 4> ExclusionSet)
-           : FunctionPass(ID), ExpectedResult(ExpectedResult), A(A), B(B),
-             ExclusionSet(ExclusionSet) {}
-
-       static int initialize() {
-         PassInfo *PI = new PassInfo("isPotentiallyReachable testing pass", "",
-                                     &ID, nullptr, true, true);
-         PassRegistry::getPassRegistry()->registerPass(*PI, false);
-         initializeLoopInfoWrapperPassPass(*PassRegistry::getPassRegistry());
-         initializeDominatorTreeWrapperPassPass(
-             *PassRegistry::getPassRegistry());
-         return 0;
-      }
-
-      void getAnalysisUsage(AnalysisUsage &AU) const override {
-        AU.setPreservesAll();
-        AU.addRequired<LoopInfoWrapperPass>();
-        AU.addRequired<DominatorTreeWrapperPass>();
-      }
-
-      bool runOnFunction(Function &F) override {
-        if (!F.hasName() || F.getName() != "test")
-          return false;
-
-        LoopInfo *LI = &getAnalysis<LoopInfoWrapperPass>().getLoopInfo();
-        DominatorTree *DT =
-            &getAnalysis<DominatorTreeWrapperPass>().getDomTree();
-        EXPECT_EQ(isPotentiallyReachable(A, B, &ExclusionSet, nullptr, nullptr),
-                  ExpectedResult);
-        EXPECT_EQ(isPotentiallyReachable(A, B, &ExclusionSet, DT, nullptr),
-                  ExpectedResult);
-        EXPECT_EQ(isPotentiallyReachable(A, B, &ExclusionSet, nullptr, LI),
-                  ExpectedResult);
-        EXPECT_EQ(isPotentiallyReachable(A, B, &ExclusionSet, DT, LI),
-                  ExpectedResult);
-        return false;
-      }
-      bool ExpectedResult;
-      Instruction *A, *B;
-      SmallPtrSet<BasicBlock *, 4> ExclusionSet;
-    };
-
-    static int initialize = IsPotentiallyReachableTestPass::initialize();
-    (void)initialize;
-
-    IsPotentiallyReachableTestPass *P =
-        new IsPotentiallyReachableTestPass(ExpectedResult, A, B, ExclusionSet);
-    legacy::PassManager PM;
-    PM.add(P);
-    PM.run(*M);
-  }
-
-  LLVMContext Context;
-  std::unique_ptr<Module> M;
-  Instruction *A, *B;
-  SmallPtrSet<BasicBlock *, 4> ExclusionSet;
-};
-
-}
-
-TEST_F(IsPotentiallyReachableTest, SameBlockNoPath) {
-  ParseAssembly(
-      "define void @test() {\n"
-      "entry:\n"
-      "  bitcast i8 undef to i8\n"
-      "  %B = bitcast i8 undef to i8\n"
-      "  bitcast i8 undef to i8\n"
-      "  bitcast i8 undef to i8\n"
-      "  %A = bitcast i8 undef to i8\n"
-      "  ret void\n"
-      "}\n");
-  ExpectPath(false);
-}
-
-TEST_F(IsPotentiallyReachableTest, SameBlockPath) {
-  ParseAssembly(
-      "define void @test() {\n"
-      "entry:\n"
-      "  %A = bitcast i8 undef to i8\n"
-      "  bitcast i8 undef to i8\n"
-      "  bitcast i8 undef to i8\n"
-      "  %B = bitcast i8 undef to i8\n"
-      "  ret void\n"
-      "}\n");
-  ExpectPath(true);
-}
-
-TEST_F(IsPotentiallyReachableTest, SameBlockNoLoop) {
-  ParseAssembly(
-      "define void @test() {\n"
-      "entry:\n"
-      "  br label %middle\n"
-      "middle:\n"
-      "  %B = bitcast i8 undef to i8\n"
-      "  bitcast i8 undef to i8\n"
-      "  bitcast i8 undef to i8\n"
-      "  %A = bitcast i8 undef to i8\n"
-      "  br label %nextblock\n"
-      "nextblock:\n"
-      "  ret void\n"
-      "}\n");
-  ExpectPath(false);
-}
-
-TEST_F(IsPotentiallyReachableTest, StraightNoPath) {
-  ParseAssembly(
-      "define void @test() {\n"
-      "entry:\n"
-      "  %B = bitcast i8 undef to i8\n"
-      "  br label %exit\n"
-      "exit:\n"
-      "  %A = bitcast i8 undef to i8\n"
-      "  ret void\n"
-      "}");
-  ExpectPath(false);
-}
-
-TEST_F(IsPotentiallyReachableTest, StraightPath) {
-  ParseAssembly(
-      "define void @test() {\n"
-      "entry:\n"
-      "  %A = bitcast i8 undef to i8\n"
-      "  br label %exit\n"
-      "exit:\n"
-      "  %B = bitcast i8 undef to i8\n"
-      "  ret void\n"
-      "}");
-  ExpectPath(true);
-}
-
-TEST_F(IsPotentiallyReachableTest, DestUnreachable) {
-  ParseAssembly(
-      "define void @test() {\n"
-      "entry:\n"
-      "  br label %midblock\n"
-      "midblock:\n"
-      "  %A = bitcast i8 undef to i8\n"
-      "  ret void\n"
-      "unreachable:\n"
-      "  %B = bitcast i8 undef to i8\n"
-      "  br label %midblock\n"
-      "}");
-  ExpectPath(false);
-}
-
-TEST_F(IsPotentiallyReachableTest, BranchToReturn) {
-  ParseAssembly(
-      "define void @test(i1 %x) {\n"
-      "entry:\n"
-      "  %A = bitcast i8 undef to i8\n"
-      "  br i1 %x, label %block1, label %block2\n"
-      "block1:\n"
-      "  ret void\n"
-      "block2:\n"
-      "  %B = bitcast i8 undef to i8\n"
-      "  ret void\n"
-      "}");
-  ExpectPath(true);
-}
-
-TEST_F(IsPotentiallyReachableTest, SimpleLoop1) {
-  ParseAssembly(
-      "declare i1 @switch()\n"
-      "\n"
-      "define void @test() {\n"
-      "entry:\n"
-      "  br label %loop\n"
-      "loop:\n"
-      "  %B = bitcast i8 undef to i8\n"
-      "  %A = bitcast i8 undef to i8\n"
-      "  %x = call i1 @switch()\n"
-      "  br i1 %x, label %loop, label %exit\n"
-      "exit:\n"
-      "  ret void\n"
-      "}");
-  ExpectPath(true);
-}
-
-TEST_F(IsPotentiallyReachableTest, SimpleLoop2) {
-  ParseAssembly(
-      "declare i1 @switch()\n"
-      "\n"
-      "define void @test() {\n"
-      "entry:\n"
-      "  %B = bitcast i8 undef to i8\n"
-      "  br label %loop\n"
-      "loop:\n"
-      "  %A = bitcast i8 undef to i8\n"
-      "  %x = call i1 @switch()\n"
-      "  br i1 %x, label %loop, label %exit\n"
-      "exit:\n"
-      "  ret void\n"
-      "}");
-  ExpectPath(false);
-}
-
-TEST_F(IsPotentiallyReachableTest, SimpleLoop3) {
-  ParseAssembly(
-      "declare i1 @switch()\n"
-      "\n"
-      "define void @test() {\n"
-      "entry:\n"
-      "  br label %loop\n"
-      "loop:\n"
-      "  %B = bitcast i8 undef to i8\n"
-      "  %x = call i1 @switch()\n"
-      "  br i1 %x, label %loop, label %exit\n"
-      "exit:\n"
-      "  %A = bitcast i8 undef to i8\n"
-      "  ret void\n"
-      "}");
-  ExpectPath(false);
-}
-
-
-TEST_F(IsPotentiallyReachableTest, OneLoopAfterTheOther1) {
-  ParseAssembly(
-      "declare i1 @switch()\n"
-      "\n"
-      "define void @test() {\n"
-      "entry:\n"
-      "  br label %loop1\n"
-      "loop1:\n"
-      "  %A = bitcast i8 undef to i8\n"
-      "  %x = call i1 @switch()\n"
-      "  br i1 %x, label %loop1, label %loop1exit\n"
-      "loop1exit:\n"
-      "  br label %loop2\n"
-      "loop2:\n"
-      "  %B = bitcast i8 undef to i8\n"
-      "  %y = call i1 @switch()\n"
-      "  br i1 %x, label %loop2, label %loop2exit\n"
-      "loop2exit:"
-      "  ret void\n"
-      "}");
-  ExpectPath(true);
-}
-
-TEST_F(IsPotentiallyReachableTest, OneLoopAfterTheOther2) {
-  ParseAssembly(
-      "declare i1 @switch()\n"
-      "\n"
-      "define void @test() {\n"
-      "entry:\n"
-      "  br label %loop1\n"
-      "loop1:\n"
-      "  %B = bitcast i8 undef to i8\n"
-      "  %x = call i1 @switch()\n"
-      "  br i1 %x, label %loop1, label %loop1exit\n"
-      "loop1exit:\n"
-      "  br label %loop2\n"
-      "loop2:\n"
-      "  %A = bitcast i8 undef to i8\n"
-      "  %y = call i1 @switch()\n"
-      "  br i1 %x, label %loop2, label %loop2exit\n"
-      "loop2exit:"
-      "  ret void\n"
-      "}");
-  ExpectPath(false);
-}
-
-TEST_F(IsPotentiallyReachableTest, OneLoopAfterTheOtherInsideAThirdLoop) {
-  ParseAssembly(
-      "declare i1 @switch()\n"
-      "\n"
-      "define void @test() {\n"
-      "entry:\n"
-      "  br label %outerloop3\n"
-      "outerloop3:\n"
-      "  br label %innerloop1\n"
-      "innerloop1:\n"
-      "  %B = bitcast i8 undef to i8\n"
-      "  %x = call i1 @switch()\n"
-      "  br i1 %x, label %innerloop1, label %innerloop1exit\n"
-      "innerloop1exit:\n"
-      "  br label %innerloop2\n"
-      "innerloop2:\n"
-      "  %A = bitcast i8 undef to i8\n"
-      "  %y = call i1 @switch()\n"
-      "  br i1 %x, label %innerloop2, label %innerloop2exit\n"
-      "innerloop2exit:"
-      "  ;; In outer loop3 now.\n"
-      "  %z = call i1 @switch()\n"
-      "  br i1 %z, label %outerloop3, label %exit\n"
-      "exit:\n"
-      "  ret void\n"
-      "}");
-  ExpectPath(true);
-}
-
-static const char *BranchInsideLoopIR =
-    "declare i1 @switch()\n"
-    "\n"
-    "define void @test() {\n"
-    "entry:\n"
-    "  br label %loop\n"
-    "loop:\n"
-    "  %x = call i1 @switch()\n"
-    "  br i1 %x, label %nextloopblock, label %exit\n"
-    "nextloopblock:\n"
-    "  %y = call i1 @switch()\n"
-    "  br i1 %y, label %left, label %right\n"
-    "left:\n"
-    "  %A = bitcast i8 undef to i8\n"
-    "  br label %loop\n"
-    "right:\n"
-    "  %B = bitcast i8 undef to i8\n"
-    "  br label %loop\n"
-    "exit:\n"
-    "  ret void\n"
-    "}";
-
-TEST_F(IsPotentiallyReachableTest, BranchInsideLoop) {
-  ParseAssembly(BranchInsideLoopIR);
-  ExpectPath(true);
-}
-
-TEST_F(IsPotentiallyReachableTest, ModifyTest) {
-  ParseAssembly(BranchInsideLoopIR);
-
-  succ_iterator S = succ_begin(&*++M->getFunction("test")->begin());
-  BasicBlock *OldBB = S[0];
-  S[0] = S[1];
-  ExpectPath(false);
-  S[0] = OldBB;
-  ExpectPath(true);
-}
-
-TEST_F(IsPotentiallyReachableTest, UnreachableFromEntryTest) {
-  ParseAssembly("define void @test() {\n"
-                "entry:\n"
-                "  %A = bitcast i8 undef to i8\n"
-                "  ret void\n"
-                "not.reachable:\n"
-                "  %B = bitcast i8 undef to i8\n"
-                "  ret void\n"
-                "}");
-  ExpectPath(false);
-}
-
-TEST_F(IsPotentiallyReachableTest, UnreachableBlocksTest1) {
-  ParseAssembly("define void @test() {\n"
-                "entry:\n"
-                "  ret void\n"
-                "not.reachable.1:\n"
-                "  %A = bitcast i8 undef to i8\n"
-                "  br label %not.reachable.2\n"
-                "not.reachable.2:\n"
-                "  %B = bitcast i8 undef to i8\n"
-                "  ret void\n"
-                "}");
-  ExpectPath(true);
-}
-
-TEST_F(IsPotentiallyReachableTest, UnreachableBlocksTest2) {
-  ParseAssembly("define void @test() {\n"
-                "entry:\n"
-                "  ret void\n"
-                "not.reachable.1:\n"
-                "  %B = bitcast i8 undef to i8\n"
-                "  br label %not.reachable.2\n"
-                "not.reachable.2:\n"
-                "  %A = bitcast i8 undef to i8\n"
-                "  ret void\n"
-                "}");
-  ExpectPath(false);
-}
-
-TEST_F(IsPotentiallyReachableTest, SimpleExclusionTest) {
-  ParseAssembly("define void @test() {\n"
-                "entry:\n"
-                "  %A = bitcast i8 undef to i8\n"
-                "  br label %excluded\n"
-                "excluded:\n"
-                "  br label %exit\n"
-                "exit:\n"
-                "  %B = bitcast i8 undef to i8\n"
-                "  ret void\n"
-                "}");
-  ExpectPath(false);
-}
-
-TEST_F(IsPotentiallyReachableTest, DiamondExcludedTest) {
-  ParseAssembly("declare i1 @switch()\n"
-                "\n"
-                "define void @test() {\n"
-                "entry:\n"
-                "  %x = call i1 @switch()\n"
-                "  %A = bitcast i8 undef to i8\n"
-                "  br i1 %x, label %excluded.1, label %excluded.2\n"
-                "excluded.1:\n"
-                "  br label %exit\n"
-                "excluded.2:\n"
-                "  br label %exit\n"
-                "exit:\n"
-                "  %B = bitcast i8 undef to i8\n"
-                "  ret void\n"
-                "}");
-  ExpectPath(false);
-}
-
-TEST_F(IsPotentiallyReachableTest, DiamondOneSideExcludedTest) {
-  ParseAssembly("declare i1 @switch()\n"
-                "\n"
-                "define void @test() {\n"
-                "entry:\n"
-                "  %x = call i1 @switch()\n"
-                "  %A = bitcast i8 undef to i8\n"
-                "  br i1 %x, label %excluded, label %diamond\n"
-                "excluded:\n"
-                "  br label %exit\n"
-                "diamond:\n"
-                "  br label %exit\n"
-                "exit:\n"
-                "  %B = bitcast i8 undef to i8\n"
-                "  ret void\n"
-                "}");
-  ExpectPath(true);
-}
-
-TEST_F(IsPotentiallyReachableTest, UnreachableToReachable) {
-  ParseAssembly("define void @test() {\n"
-                "entry:\n"
-                "  br label %exit\n"
-                "unreachableblock:\n"
-                "  %A = bitcast i8 undef to i8\n"
-                "  br label %exit\n"
-                "exit:\n"
-                "  %B = bitcast i8 undef to i8\n"
-                "  ret void\n"
-                "}");
-  ExpectPath(true);
-}
diff --git a/gnu/llvm/llvm/unittests/Analysis/CGSCCPassManagerTest.cpp b/gnu/llvm/llvm/unittests/Analysis/CGSCCPassManagerTest.cpp
deleted file mode 100644
index e0b0aeda5bb..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/CGSCCPassManagerTest.cpp
+++ /dev/null
@@ -1,1970 +0,0 @@
-//===- CGSCCPassManagerTest.cpp -------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/CGSCCPassManager.h"
-#include "llvm/Analysis/LazyCallGraph.h"
-#include "llvm/Analysis/TargetLibraryInfo.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/InstIterator.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/PassManager.h"
-#include "llvm/IR/Verifier.h"
-#include "llvm/Support/SourceMgr.h"
-#include "llvm/Transforms/Utils/CallGraphUpdater.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-class TestModuleAnalysis : public AnalysisInfoMixin<TestModuleAnalysis> {
-public:
-  struct Result {
-    Result(int Count) : FunctionCount(Count) {}
-    int FunctionCount;
-    bool invalidate(Module &, const PreservedAnalyses &PA,
-                    ModuleAnalysisManager::Invalidator &) {
-      // Check whether the analysis or all analyses on modules have been
-      // preserved.
-      auto PAC = PA.getChecker<TestModuleAnalysis>();
-      return !(PAC.preserved() || PAC.preservedSet<AllAnalysesOn<Module>>());
-    }
-  };
-
-  TestModuleAnalysis(int &Runs) : Runs(Runs) {}
-
-  Result run(Module &M, ModuleAnalysisManager &AM) {
-    ++Runs;
-    return Result(M.size());
-  }
-
-private:
-  friend AnalysisInfoMixin<TestModuleAnalysis>;
-  static AnalysisKey Key;
-
-  int &Runs;
-};
-
-AnalysisKey TestModuleAnalysis::Key;
-
-class TestSCCAnalysis : public AnalysisInfoMixin<TestSCCAnalysis> {
-public:
-  struct Result {
-    Result(int Count) : FunctionCount(Count) {}
-    int FunctionCount;
-    bool invalidate(LazyCallGraph::SCC &, const PreservedAnalyses &PA,
-                    CGSCCAnalysisManager::Invalidator &) {
-      // Check whether the analysis or all analyses on SCCs have been
-      // preserved.
-      auto PAC = PA.getChecker<TestSCCAnalysis>();
-      return !(PAC.preserved() ||
-               PAC.preservedSet<AllAnalysesOn<LazyCallGraph::SCC>>());
-    }
-  };
-
-  TestSCCAnalysis(int &Runs) : Runs(Runs) {}
-
-  Result run(LazyCallGraph::SCC &C, CGSCCAnalysisManager &AM, LazyCallGraph &) {
-    ++Runs;
-    return Result(C.size());
-  }
-
-private:
-  friend AnalysisInfoMixin<TestSCCAnalysis>;
-  static AnalysisKey Key;
-
-  int &Runs;
-};
-
-AnalysisKey TestSCCAnalysis::Key;
-
-class TestFunctionAnalysis : public AnalysisInfoMixin<TestFunctionAnalysis> {
-public:
-  struct Result {
-    Result(int Count) : InstructionCount(Count) {}
-    int InstructionCount;
-    bool invalidate(Function &, const PreservedAnalyses &PA,
-                    FunctionAnalysisManager::Invalidator &) {
-      // Check whether the analysis or all analyses on functions have been
-      // preserved.
-      auto PAC = PA.getChecker<TestFunctionAnalysis>();
-      return !(PAC.preserved() || PAC.preservedSet<AllAnalysesOn<Function>>());
-    }
-  };
-
-  TestFunctionAnalysis(int &Runs) : Runs(Runs) {}
-
-  Result run(Function &F, FunctionAnalysisManager &AM) {
-    ++Runs;
-    int Count = 0;
-    for (Instruction &I : instructions(F)) {
-      (void)I;
-      ++Count;
-    }
-    return Result(Count);
-  }
-
-private:
-  friend AnalysisInfoMixin<TestFunctionAnalysis>;
-  static AnalysisKey Key;
-
-  int &Runs;
-};
-
-AnalysisKey TestFunctionAnalysis::Key;
-
-class TestImmutableFunctionAnalysis
-    : public AnalysisInfoMixin<TestImmutableFunctionAnalysis> {
-public:
-  struct Result {
-    bool invalidate(Function &, const PreservedAnalyses &,
-                    FunctionAnalysisManager::Invalidator &) {
-      return false;
-    }
-  };
-
-  TestImmutableFunctionAnalysis(int &Runs) : Runs(Runs) {}
-
-  Result run(Function &F, FunctionAnalysisManager &AM) {
-    ++Runs;
-    return Result();
-  }
-
-private:
-  friend AnalysisInfoMixin<TestImmutableFunctionAnalysis>;
-  static AnalysisKey Key;
-
-  int &Runs;
-};
-
-AnalysisKey TestImmutableFunctionAnalysis::Key;
-
-struct LambdaModulePass : public PassInfoMixin<LambdaModulePass> {
-  template <typename T>
-  LambdaModulePass(T &&Arg) : Func(std::forward<T>(Arg)) {}
-
-  PreservedAnalyses run(Module &F, ModuleAnalysisManager &AM) {
-    return Func(F, AM);
-  }
-
-  std::function<PreservedAnalyses(Module &, ModuleAnalysisManager &)> Func;
-};
-
-struct LambdaSCCPass : public PassInfoMixin<LambdaSCCPass> {
-  template <typename T> LambdaSCCPass(T &&Arg) : Func(std::forward<T>(Arg)) {}
-
-  PreservedAnalyses run(LazyCallGraph::SCC &C, CGSCCAnalysisManager &AM,
-                        LazyCallGraph &CG, CGSCCUpdateResult &UR) {
-    return Func(C, AM, CG, UR);
-  }
-
-  std::function<PreservedAnalyses(LazyCallGraph::SCC &, CGSCCAnalysisManager &,
-                                  LazyCallGraph &, CGSCCUpdateResult &)>
-      Func;
-};
-
-struct LambdaFunctionPass : public PassInfoMixin<LambdaFunctionPass> {
-  template <typename T>
-  LambdaFunctionPass(T &&Arg) : Func(std::forward<T>(Arg)) {}
-
-  PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM) {
-    return Func(F, AM);
-  }
-
-  std::function<PreservedAnalyses(Function &, FunctionAnalysisManager &)> Func;
-};
-
-std::unique_ptr<Module> parseIR(const char *IR) {
-  // We just use a static context here. This is never called from multiple
-  // threads so it is harmless no matter how it is implemented. We just need
-  // the context to outlive the module which it does.
-  static LLVMContext C;
-  SMDiagnostic Err;
-  return parseAssemblyString(IR, Err, C);
-}
-
-class CGSCCPassManagerTest : public ::testing::Test {
-protected:
-  LLVMContext Context;
-  FunctionAnalysisManager FAM;
-  CGSCCAnalysisManager CGAM;
-  ModuleAnalysisManager MAM;
-
-  std::unique_ptr<Module> M;
-
-public:
-  CGSCCPassManagerTest()
-      : FAM(), CGAM(), MAM(),
-        M(parseIR(
-            // Define a module with the following call graph, where calls go
-            // out the bottom of nodes and enter the top:
-            //
-            // f
-            // |\   _
-            // | \ / |
-            // g  h1 |
-            // |  |  |
-            // |  h2 |
-            // |  |  |
-            // |  h3 |
-            // | / \_/
-            // |/
-            // x
-            //
-            "define void @x() {\n"
-            "entry:\n"
-            "  ret void\n"
-            "}\n"
-            "define void @h3() {\n"
-            "entry:\n"
-            "  call void @h1()\n"
-            "  ret void\n"
-            "}\n"
-            "define void @h2() {\n"
-            "entry:\n"
-            "  call void @h3()\n"
-            "  call void @x()\n"
-            "  ret void\n"
-            "}\n"
-            "define void @h1() {\n"
-            "entry:\n"
-            "  call void @h2()\n"
-            "  ret void\n"
-            "}\n"
-            "define void @g() {\n"
-            "entry:\n"
-            "  call void @g()\n"
-            "  call void @x()\n"
-            "  ret void\n"
-            "}\n"
-            "define void @f() {\n"
-            "entry:\n"
-            "  call void @g()\n"
-            "  call void @h1()\n"
-            "  ret void\n"
-            "}\n")) {
-    FAM.registerPass([&] { return TargetLibraryAnalysis(); });
-    MAM.registerPass([&] { return LazyCallGraphAnalysis(); });
-    MAM.registerPass([&] { return FunctionAnalysisManagerModuleProxy(FAM); });
-
-    // Register required pass instrumentation analysis.
-    MAM.registerPass([&] { return PassInstrumentationAnalysis(); });
-    CGAM.registerPass([&] { return PassInstrumentationAnalysis(); });
-    FAM.registerPass([&] { return PassInstrumentationAnalysis(); });
-
-    // Cross-register proxies.
-    MAM.registerPass([&] { return CGSCCAnalysisManagerModuleProxy(CGAM); });
-    CGAM.registerPass([&] { return FunctionAnalysisManagerCGSCCProxy(); });
-    CGAM.registerPass([&] { return ModuleAnalysisManagerCGSCCProxy(MAM); });
-    FAM.registerPass([&] { return CGSCCAnalysisManagerFunctionProxy(CGAM); });
-    FAM.registerPass([&] { return ModuleAnalysisManagerFunctionProxy(MAM); });
-  }
-};
-
-TEST_F(CGSCCPassManagerTest, Basic) {
-  int FunctionAnalysisRuns = 0;
-  FAM.registerPass([&] { return TestFunctionAnalysis(FunctionAnalysisRuns); });
-  int ImmutableFunctionAnalysisRuns = 0;
-  FAM.registerPass([&] {
-    return TestImmutableFunctionAnalysis(ImmutableFunctionAnalysisRuns);
-  });
-
-  int SCCAnalysisRuns = 0;
-  CGAM.registerPass([&] { return TestSCCAnalysis(SCCAnalysisRuns); });
-
-  int ModuleAnalysisRuns = 0;
-  MAM.registerPass([&] { return TestModuleAnalysis(ModuleAnalysisRuns); });
-
-  ModulePassManager MPM;
-  MPM.addPass(RequireAnalysisPass<TestModuleAnalysis, Module>());
-
-  CGSCCPassManager CGPM1;
-  FunctionPassManager FPM1;
-  int FunctionPassRunCount1 = 0;
-  FPM1.addPass(LambdaFunctionPass([&](Function &, FunctionAnalysisManager &) {
-    ++FunctionPassRunCount1;
-    return PreservedAnalyses::none();
-  }));
-  CGPM1.addPass(createCGSCCToFunctionPassAdaptor(std::move(FPM1)));
-
-  int SCCPassRunCount1 = 0;
-  int AnalyzedInstrCount1 = 0;
-  int AnalyzedSCCFunctionCount1 = 0;
-  int AnalyzedModuleFunctionCount1 = 0;
-  CGPM1.addPass(
-      LambdaSCCPass([&](LazyCallGraph::SCC &C, CGSCCAnalysisManager &AM,
-                        LazyCallGraph &CG, CGSCCUpdateResult &UR) {
-        ++SCCPassRunCount1;
-
-        // Note: The proper way to get to a module pass from a CGSCC pass is
-        // through the ModuleAnalysisManagerCGSCCProxy:
-        // ```
-        // const auto &MAMProxy =
-        //    AM.getResult<ModuleAnalysisManagerCGSCCProxy>(C, CG);
-        // ```
-        // However getting a stateful analysis is incorrect usage, and the call
-        // to getCachedResult below asserts:
-        // ```
-        // if (TestModuleAnalysis::Result *TMA =
-        //        MAMProxy.getCachedResult<TestModuleAnalysis>(
-        //            *C.begin()->getFunction().getParent()))
-        //   AnalyzedModuleFunctionCount1 += TMA->FunctionCount;
-        // ```
-        // For the purposes of this unittest, use the above MAM directly.
-        if (TestModuleAnalysis::Result *TMA =
-                MAM.getCachedResult<TestModuleAnalysis>(
-                    *C.begin()->getFunction().getParent()))
-          AnalyzedModuleFunctionCount1 += TMA->FunctionCount;
-
-        FunctionAnalysisManager &FAM =
-            AM.getResult<FunctionAnalysisManagerCGSCCProxy>(C, CG).getManager();
-        TestSCCAnalysis::Result &AR = AM.getResult<TestSCCAnalysis>(C, CG);
-        AnalyzedSCCFunctionCount1 += AR.FunctionCount;
-        for (LazyCallGraph::Node &N : C) {
-          TestFunctionAnalysis::Result &FAR =
-              FAM.getResult<TestFunctionAnalysis>(N.getFunction());
-          AnalyzedInstrCount1 += FAR.InstructionCount;
-
-          // Just ensure we get the immutable results.
-          (void)FAM.getResult<TestImmutableFunctionAnalysis>(N.getFunction());
-        }
-
-        return PreservedAnalyses::all();
-      }));
-
-  FunctionPassManager FPM2;
-  int FunctionPassRunCount2 = 0;
-  FPM2.addPass(LambdaFunctionPass([&](Function &, FunctionAnalysisManager &) {
-    ++FunctionPassRunCount2;
-    return PreservedAnalyses::none();
-  }));
-  CGPM1.addPass(createCGSCCToFunctionPassAdaptor(std::move(FPM2)));
-
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM1)));
-
-  FunctionPassManager FPM3;
-  int FunctionPassRunCount3 = 0;
-  FPM3.addPass(LambdaFunctionPass([&](Function &, FunctionAnalysisManager &) {
-    ++FunctionPassRunCount3;
-    return PreservedAnalyses::none();
-  }));
-  MPM.addPass(createModuleToFunctionPassAdaptor(std::move(FPM3)));
-
-  MPM.run(*M, MAM);
-
-  EXPECT_EQ(4, SCCPassRunCount1);
-  EXPECT_EQ(6, FunctionPassRunCount1);
-  EXPECT_EQ(6, FunctionPassRunCount2);
-  EXPECT_EQ(6, FunctionPassRunCount3);
-
-  EXPECT_EQ(1, ModuleAnalysisRuns);
-  EXPECT_EQ(4, SCCAnalysisRuns);
-  EXPECT_EQ(6, FunctionAnalysisRuns);
-  EXPECT_EQ(6, ImmutableFunctionAnalysisRuns);
-
-  EXPECT_EQ(14, AnalyzedInstrCount1);
-  EXPECT_EQ(6, AnalyzedSCCFunctionCount1);
-  EXPECT_EQ(4 * 6, AnalyzedModuleFunctionCount1);
-}
-
-// Test that an SCC pass which fails to preserve a module analysis does in fact
-// invalidate that module analysis.
-TEST_F(CGSCCPassManagerTest, TestSCCPassInvalidatesModuleAnalysis) {
-  int ModuleAnalysisRuns = 0;
-  MAM.registerPass([&] { return TestModuleAnalysis(ModuleAnalysisRuns); });
-
-  ModulePassManager MPM;
-  MPM.addPass(RequireAnalysisPass<TestModuleAnalysis, Module>());
-
-  // The first CGSCC run we preserve everything and make sure that works and
-  // the module analysis is available in the second CGSCC run from the one
-  // required module pass above.
-  CGSCCPassManager CGPM1;
-  int CountFoundModuleAnalysis1 = 0;
-  CGPM1.addPass(LambdaSCCPass([&](LazyCallGraph::SCC &C,
-                                  CGSCCAnalysisManager &AM, LazyCallGraph &CG,
-                                  CGSCCUpdateResult &UR) {
-    const auto &MAMProxy = AM.getResult<ModuleAnalysisManagerCGSCCProxy>(C, CG);
-    if (MAMProxy.cachedResultExists<TestModuleAnalysis>(
-            *C.begin()->getFunction().getParent()))
-      ++CountFoundModuleAnalysis1;
-
-    return PreservedAnalyses::all();
-  }));
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM1)));
-
-  // The second CGSCC run checks that the module analysis got preserved the
-  // previous time and in one SCC fails to preserve it.
-  CGSCCPassManager CGPM2;
-  int CountFoundModuleAnalysis2 = 0;
-  CGPM2.addPass(
-      LambdaSCCPass([&](LazyCallGraph::SCC &C, CGSCCAnalysisManager &AM,
-                        LazyCallGraph &CG, CGSCCUpdateResult &UR) {
-        const auto &MAMProxy =
-            AM.getResult<ModuleAnalysisManagerCGSCCProxy>(C, CG);
-        if (MAMProxy.cachedResultExists<TestModuleAnalysis>(
-                *C.begin()->getFunction().getParent()))
-          ++CountFoundModuleAnalysis2;
-
-        // Only fail to preserve analyses on one SCC and make sure that gets
-        // propagated.
-        return C.getName() == "(g)" ? PreservedAnalyses::none()
-                                  : PreservedAnalyses::all();
-      }));
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM2)));
-
-  // The third CGSCC run should fail to find a cached module analysis as it
-  // should have been invalidated by the above CGSCC run.
-  CGSCCPassManager CGPM3;
-  int CountFoundModuleAnalysis3 = 0;
-  CGPM3.addPass(LambdaSCCPass([&](LazyCallGraph::SCC &C,
-                                  CGSCCAnalysisManager &AM, LazyCallGraph &CG,
-                                  CGSCCUpdateResult &UR) {
-    const auto &MAMProxy = AM.getResult<ModuleAnalysisManagerCGSCCProxy>(C, CG);
-    if (MAMProxy.cachedResultExists<TestModuleAnalysis>(
-            *C.begin()->getFunction().getParent()))
-      ++CountFoundModuleAnalysis3;
-
-    return PreservedAnalyses::none();
-  }));
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM3)));
-
-  MPM.run(*M, MAM);
-
-  EXPECT_EQ(1, ModuleAnalysisRuns);
-  EXPECT_EQ(4, CountFoundModuleAnalysis1);
-  EXPECT_EQ(4, CountFoundModuleAnalysis2);
-  EXPECT_EQ(0, CountFoundModuleAnalysis3);
-}
-
-// Similar to the above, but test that this works for function passes embedded
-// *within* a CGSCC layer.
-TEST_F(CGSCCPassManagerTest, TestFunctionPassInsideCGSCCInvalidatesModuleAnalysis) {
-  int ModuleAnalysisRuns = 0;
-  MAM.registerPass([&] { return TestModuleAnalysis(ModuleAnalysisRuns); });
-
-  ModulePassManager MPM;
-  MPM.addPass(RequireAnalysisPass<TestModuleAnalysis, Module>());
-
-  // The first run we preserve everything and make sure that works and the
-  // module analysis is available in the second run from the one required
-  // module pass above.
-  FunctionPassManager FPM1;
-  // Start true and mark false if we ever failed to find a module analysis
-  // because we expect this to succeed for each SCC.
-  bool FoundModuleAnalysis1 = true;
-  FPM1.addPass(LambdaFunctionPass([&](Function &F,
-                                      FunctionAnalysisManager &AM) {
-    const auto &MAMProxy = AM.getResult<ModuleAnalysisManagerFunctionProxy>(F);
-    if (!MAMProxy.cachedResultExists<TestModuleAnalysis>(*F.getParent()))
-      FoundModuleAnalysis1 = false;
-
-    return PreservedAnalyses::all();
-  }));
-  CGSCCPassManager CGPM1;
-  CGPM1.addPass(createCGSCCToFunctionPassAdaptor(std::move(FPM1)));
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM1)));
-
-  // The second run checks that the module analysis got preserved the previous
-  // time and in one function fails to preserve it.
-  FunctionPassManager FPM2;
-  // Again, start true and mark false if we ever failed to find a module analysis
-  // because we expect this to succeed for each SCC.
-  bool FoundModuleAnalysis2 = true;
-  FPM2.addPass(LambdaFunctionPass([&](Function &F,
-                                      FunctionAnalysisManager &AM) {
-    const auto &MAMProxy = AM.getResult<ModuleAnalysisManagerFunctionProxy>(F);
-    if (!MAMProxy.cachedResultExists<TestModuleAnalysis>(*F.getParent()))
-      FoundModuleAnalysis2 = false;
-
-    // Only fail to preserve analyses on one SCC and make sure that gets
-    // propagated.
-    return F.getName() == "h2" ? PreservedAnalyses::none()
-                               : PreservedAnalyses::all();
-  }));
-  CGSCCPassManager CGPM2;
-  CGPM2.addPass(createCGSCCToFunctionPassAdaptor(std::move(FPM2)));
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM2)));
-
-  // The third run should fail to find a cached module analysis as it should
-  // have been invalidated by the above run.
-  FunctionPassManager FPM3;
-  // Start false and mark true if we ever *succeeded* to find a module
-  // analysis, as we expect this to fail for every function.
-  bool FoundModuleAnalysis3 = false;
-  FPM3.addPass(LambdaFunctionPass([&](Function &F,
-                                      FunctionAnalysisManager &AM) {
-    const auto &MAMProxy = AM.getResult<ModuleAnalysisManagerFunctionProxy>(F);
-    if (MAMProxy.cachedResultExists<TestModuleAnalysis>(*F.getParent()))
-      FoundModuleAnalysis3 = true;
-
-    return PreservedAnalyses::none();
-  }));
-  CGSCCPassManager CGPM3;
-  CGPM3.addPass(createCGSCCToFunctionPassAdaptor(std::move(FPM3)));
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM3)));
-
-  MPM.run(*M, MAM);
-
-  EXPECT_EQ(1, ModuleAnalysisRuns);
-  EXPECT_TRUE(FoundModuleAnalysis1);
-  EXPECT_TRUE(FoundModuleAnalysis2);
-  EXPECT_FALSE(FoundModuleAnalysis3);
-}
-
-// Test that a Module pass which fails to preserve an SCC analysis in fact
-// invalidates that analysis.
-TEST_F(CGSCCPassManagerTest, TestModulePassInvalidatesSCCAnalysis) {
-  int SCCAnalysisRuns = 0;
-  CGAM.registerPass([&] { return TestSCCAnalysis(SCCAnalysisRuns); });
-
-  ModulePassManager MPM;
-
-  // First force the analysis to be run.
-  CGSCCPassManager CGPM1;
-  CGPM1.addPass(RequireAnalysisPass<TestSCCAnalysis, LazyCallGraph::SCC,
-                                    CGSCCAnalysisManager, LazyCallGraph &,
-                                    CGSCCUpdateResult &>());
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM1)));
-
-  // Now run a module pass that preserves the LazyCallGraph and the proxy but
-  // not the SCC analysis.
-  MPM.addPass(LambdaModulePass([&](Module &M, ModuleAnalysisManager &) {
-    PreservedAnalyses PA;
-    PA.preserve<LazyCallGraphAnalysis>();
-    PA.preserve<CGSCCAnalysisManagerModuleProxy>();
-    PA.preserve<FunctionAnalysisManagerModuleProxy>();
-    return PA;
-  }));
-
-  // And now a second CGSCC run which requires the SCC analysis again. This
-  // will trigger re-running it.
-  CGSCCPassManager CGPM2;
-  CGPM2.addPass(RequireAnalysisPass<TestSCCAnalysis, LazyCallGraph::SCC,
-                                    CGSCCAnalysisManager, LazyCallGraph &,
-                                    CGSCCUpdateResult &>());
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM2)));
-
-  MPM.run(*M, MAM);
-  // Two runs and four SCCs.
-  EXPECT_EQ(2 * 4, SCCAnalysisRuns);
-}
-
-// Check that marking the SCC analysis preserved is sufficient to avoid
-// invaliadtion. This should only run the analysis once for each SCC.
-TEST_F(CGSCCPassManagerTest, TestModulePassCanPreserveSCCAnalysis) {
-  int SCCAnalysisRuns = 0;
-  CGAM.registerPass([&] { return TestSCCAnalysis(SCCAnalysisRuns); });
-
-  ModulePassManager MPM;
-
-  // First force the analysis to be run.
-  CGSCCPassManager CGPM1;
-  CGPM1.addPass(RequireAnalysisPass<TestSCCAnalysis, LazyCallGraph::SCC,
-                                    CGSCCAnalysisManager, LazyCallGraph &,
-                                    CGSCCUpdateResult &>());
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM1)));
-
-  // Now run a module pass that preserves each of the necessary components
-  // (but not everything).
-  MPM.addPass(LambdaModulePass([&](Module &M, ModuleAnalysisManager &) {
-    PreservedAnalyses PA;
-    PA.preserve<LazyCallGraphAnalysis>();
-    PA.preserve<CGSCCAnalysisManagerModuleProxy>();
-    PA.preserve<FunctionAnalysisManagerModuleProxy>();
-    PA.preserve<TestSCCAnalysis>();
-    return PA;
-  }));
-
-  // And now a second CGSCC run which requires the SCC analysis again but find
-  // it in the cache.
-  CGSCCPassManager CGPM2;
-  CGPM2.addPass(RequireAnalysisPass<TestSCCAnalysis, LazyCallGraph::SCC,
-                                    CGSCCAnalysisManager, LazyCallGraph &,
-                                    CGSCCUpdateResult &>());
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM2)));
-
-  MPM.run(*M, MAM);
-  // Four SCCs
-  EXPECT_EQ(4, SCCAnalysisRuns);
-}
-
-// Check that even when the analysis is preserved, if the SCC information isn't
-// we still nuke things because the SCC keys could change.
-TEST_F(CGSCCPassManagerTest, TestModulePassInvalidatesSCCAnalysisOnCGChange) {
-  int SCCAnalysisRuns = 0;
-  CGAM.registerPass([&] { return TestSCCAnalysis(SCCAnalysisRuns); });
-
-  ModulePassManager MPM;
-
-  // First force the analysis to be run.
-  CGSCCPassManager CGPM1;
-  CGPM1.addPass(RequireAnalysisPass<TestSCCAnalysis, LazyCallGraph::SCC,
-                                    CGSCCAnalysisManager, LazyCallGraph &,
-                                    CGSCCUpdateResult &>());
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM1)));
-
-  // Now run a module pass that preserves the analysis but not the call
-  // graph or proxy.
-  MPM.addPass(LambdaModulePass([&](Module &M, ModuleAnalysisManager &) {
-    PreservedAnalyses PA;
-    PA.preserve<TestSCCAnalysis>();
-    return PA;
-  }));
-
-  // And now a second CGSCC run which requires the SCC analysis again.
-  CGSCCPassManager CGPM2;
-  CGPM2.addPass(RequireAnalysisPass<TestSCCAnalysis, LazyCallGraph::SCC,
-                                    CGSCCAnalysisManager, LazyCallGraph &,
-                                    CGSCCUpdateResult &>());
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM2)));
-
-  MPM.run(*M, MAM);
-  // Two runs and four SCCs.
-  EXPECT_EQ(2 * 4, SCCAnalysisRuns);
-}
-
-// Test that an SCC pass which fails to preserve a Function analysis in fact
-// invalidates that analysis.
-TEST_F(CGSCCPassManagerTest, TestSCCPassInvalidatesFunctionAnalysis) {
-  int FunctionAnalysisRuns = 0;
-  FAM.registerPass([&] { return TestFunctionAnalysis(FunctionAnalysisRuns); });
-
-  // Create a very simple module with a single function and SCC to make testing
-  // these issues much easier.
-  std::unique_ptr<Module> M = parseIR("declare void @g()\n"
-                                      "declare void @h()\n"
-                                      "define void @f() {\n"
-                                      "entry:\n"
-                                      "  call void @g()\n"
-                                      "  call void @h()\n"
-                                      "  ret void\n"
-                                      "}\n");
-
-  CGSCCPassManager CGPM;
-
-  // First force the analysis to be run.
-  FunctionPassManager FPM1;
-  FPM1.addPass(RequireAnalysisPass<TestFunctionAnalysis, Function>());
-  CGPM.addPass(createCGSCCToFunctionPassAdaptor(std::move(FPM1)));
-
-  // Now run a module pass that preserves the LazyCallGraph and proxy but not
-  // the SCC analysis.
-  CGPM.addPass(LambdaSCCPass([&](LazyCallGraph::SCC &C, CGSCCAnalysisManager &,
-                                 LazyCallGraph &, CGSCCUpdateResult &) {
-    PreservedAnalyses PA;
-    PA.preserve<LazyCallGraphAnalysis>();
-    return PA;
-  }));
-
-  // And now a second CGSCC run which requires the SCC analysis again. This
-  // will trigger re-running it.
-  FunctionPassManager FPM2;
-  FPM2.addPass(RequireAnalysisPass<TestFunctionAnalysis, Function>());
-  CGPM.addPass(createCGSCCToFunctionPassAdaptor(std::move(FPM2)));
-
-  ModulePassManager MPM;
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM)));
-  MPM.run(*M, MAM);
-  EXPECT_EQ(2, FunctionAnalysisRuns);
-}
-
-// Check that marking the SCC analysis preserved is sufficient. This should
-// only run the analysis once the SCC.
-TEST_F(CGSCCPassManagerTest, TestSCCPassCanPreserveFunctionAnalysis) {
-  int FunctionAnalysisRuns = 0;
-  FAM.registerPass([&] { return TestFunctionAnalysis(FunctionAnalysisRuns); });
-
-  // Create a very simple module with a single function and SCC to make testing
-  // these issues much easier.
-  std::unique_ptr<Module> M = parseIR("declare void @g()\n"
-                                      "declare void @h()\n"
-                                      "define void @f() {\n"
-                                      "entry:\n"
-                                      "  call void @g()\n"
-                                      "  call void @h()\n"
-                                      "  ret void\n"
-                                      "}\n");
-
-  CGSCCPassManager CGPM;
-
-  // First force the analysis to be run.
-  FunctionPassManager FPM1;
-  FPM1.addPass(RequireAnalysisPass<TestFunctionAnalysis, Function>());
-  CGPM.addPass(createCGSCCToFunctionPassAdaptor(std::move(FPM1)));
-
-  // Now run a module pass that preserves each of the necessary components
-  // (but
-  // not everything).
-  CGPM.addPass(LambdaSCCPass([&](LazyCallGraph::SCC &C, CGSCCAnalysisManager &,
-                                 LazyCallGraph &, CGSCCUpdateResult &) {
-    PreservedAnalyses PA;
-    PA.preserve<LazyCallGraphAnalysis>();
-    PA.preserve<FunctionAnalysisManagerCGSCCProxy>();
-    PA.preserve<TestFunctionAnalysis>();
-    return PA;
-  }));
-
-  // And now a second CGSCC run which requires the SCC analysis again but find
-  // it in the cache.
-  FunctionPassManager FPM2;
-  FPM2.addPass(RequireAnalysisPass<TestFunctionAnalysis, Function>());
-  CGPM.addPass(createCGSCCToFunctionPassAdaptor(std::move(FPM2)));
-
-  ModulePassManager MPM;
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM)));
-  MPM.run(*M, MAM);
-  EXPECT_EQ(1, FunctionAnalysisRuns);
-}
-
-// Note that there is no test for invalidating the call graph or other
-// structure with an SCC pass because there is no mechanism to do that from
-// withinsuch a pass. Instead, such a pass has to directly update the call
-// graph structure.
-
-// Test that a madule pass invalidates function analyses when the CGSCC proxies
-// and pass manager.
-TEST_F(CGSCCPassManagerTest,
-       TestModulePassInvalidatesFunctionAnalysisNestedInCGSCC) {
-  MAM.registerPass([&] { return LazyCallGraphAnalysis(); });
-
-  int FunctionAnalysisRuns = 0;
-  FAM.registerPass([&] { return TestFunctionAnalysis(FunctionAnalysisRuns); });
-
-  ModulePassManager MPM;
-
-  // First force the analysis to be run.
-  FunctionPassManager FPM1;
-  FPM1.addPass(RequireAnalysisPass<TestFunctionAnalysis, Function>());
-  CGSCCPassManager CGPM1;
-  CGPM1.addPass(createCGSCCToFunctionPassAdaptor(std::move(FPM1)));
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM1)));
-
-  // Now run a module pass that preserves the LazyCallGraph and proxies but not
-  // the Function analysis.
-  MPM.addPass(LambdaModulePass([&](Module &M, ModuleAnalysisManager &) {
-    PreservedAnalyses PA;
-    PA.preserve<LazyCallGraphAnalysis>();
-    PA.preserve<CGSCCAnalysisManagerModuleProxy>();
-    PA.preserve<FunctionAnalysisManagerCGSCCProxy>();
-    PA.preserve<FunctionAnalysisManagerModuleProxy>();
-    return PA;
-  }));
-
-  // And now a second CGSCC run which requires the SCC analysis again. This
-  // will trigger re-running it.
-  FunctionPassManager FPM2;
-  FPM2.addPass(RequireAnalysisPass<TestFunctionAnalysis, Function>());
-  CGSCCPassManager CGPM2;
-  CGPM2.addPass(createCGSCCToFunctionPassAdaptor(std::move(FPM2)));
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM2)));
-
-  MPM.run(*M, MAM);
-  // Two runs and 6 functions.
-  EXPECT_EQ(2 * 6, FunctionAnalysisRuns);
-}
-
-// Check that by marking the function pass and proxies as preserved, this
-// propagates all the way through.
-TEST_F(CGSCCPassManagerTest,
-       TestModulePassCanPreserveFunctionAnalysisNestedInCGSCC) {
-  MAM.registerPass([&] { return LazyCallGraphAnalysis(); });
-
-  int FunctionAnalysisRuns = 0;
-  FAM.registerPass([&] { return TestFunctionAnalysis(FunctionAnalysisRuns); });
-
-  ModulePassManager MPM;
-
-  // First force the analysis to be run.
-  FunctionPassManager FPM1;
-  FPM1.addPass(RequireAnalysisPass<TestFunctionAnalysis, Function>());
-  CGSCCPassManager CGPM1;
-  CGPM1.addPass(createCGSCCToFunctionPassAdaptor(std::move(FPM1)));
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM1)));
-
-  // Now run a module pass that preserves the LazyCallGraph, the proxy, and
-  // the Function analysis.
-  MPM.addPass(LambdaModulePass([&](Module &M, ModuleAnalysisManager &) {
-    PreservedAnalyses PA;
-    PA.preserve<LazyCallGraphAnalysis>();
-    PA.preserve<CGSCCAnalysisManagerModuleProxy>();
-    PA.preserve<FunctionAnalysisManagerCGSCCProxy>();
-    PA.preserve<FunctionAnalysisManagerModuleProxy>();
-    PA.preserve<TestFunctionAnalysis>();
-    return PA;
-  }));
-
-  // And now a second CGSCC run which requires the SCC analysis again. This
-  // will trigger re-running it.
-  FunctionPassManager FPM2;
-  FPM2.addPass(RequireAnalysisPass<TestFunctionAnalysis, Function>());
-  CGSCCPassManager CGPM2;
-  CGPM2.addPass(createCGSCCToFunctionPassAdaptor(std::move(FPM2)));
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM2)));
-
-  MPM.run(*M, MAM);
-  // One run and 6 functions.
-  EXPECT_EQ(6, FunctionAnalysisRuns);
-}
-
-// Check that if the lazy call graph itself isn't preserved we still manage to
-// invalidate everything.
-TEST_F(CGSCCPassManagerTest,
-       TestModulePassInvalidatesFunctionAnalysisNestedInCGSCCOnCGChange) {
-  MAM.registerPass([&] { return LazyCallGraphAnalysis(); });
-
-  int FunctionAnalysisRuns = 0;
-  FAM.registerPass([&] { return TestFunctionAnalysis(FunctionAnalysisRuns); });
-
-  ModulePassManager MPM;
-
-  // First force the analysis to be run.
-  FunctionPassManager FPM1;
-  FPM1.addPass(RequireAnalysisPass<TestFunctionAnalysis, Function>());
-  CGSCCPassManager CGPM1;
-  CGPM1.addPass(createCGSCCToFunctionPassAdaptor(std::move(FPM1)));
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM1)));
-
-  // Now run a module pass that preserves the LazyCallGraph but not the
-  // Function analysis.
-  MPM.addPass(LambdaModulePass([&](Module &M, ModuleAnalysisManager &) {
-    PreservedAnalyses PA;
-    return PA;
-  }));
-
-  // And now a second CGSCC run which requires the SCC analysis again. This
-  // will trigger re-running it.
-  FunctionPassManager FPM2;
-  FPM2.addPass(RequireAnalysisPass<TestFunctionAnalysis, Function>());
-  CGSCCPassManager CGPM2;
-  CGPM2.addPass(createCGSCCToFunctionPassAdaptor(std::move(FPM2)));
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM2)));
-
-  MPM.run(*M, MAM);
-  // Two runs and 6 functions.
-  EXPECT_EQ(2 * 6, FunctionAnalysisRuns);
-}
-
-/// A test CGSCC-level analysis pass which caches in its result another
-/// analysis pass and uses it to serve queries. This requires the result to
-/// invalidate itself when its dependency is invalidated.
-///
-/// FIXME: Currently this doesn't also depend on a function analysis, and if it
-/// did we would fail to invalidate it correctly.
-struct TestIndirectSCCAnalysis
-    : public AnalysisInfoMixin<TestIndirectSCCAnalysis> {
-  struct Result {
-    Result(TestSCCAnalysis::Result &SCCDep, TestModuleAnalysis::Result &MDep)
-        : SCCDep(SCCDep), MDep(MDep) {}
-    TestSCCAnalysis::Result &SCCDep;
-    TestModuleAnalysis::Result &MDep;
-
-    bool invalidate(LazyCallGraph::SCC &C, const PreservedAnalyses &PA,
-                    CGSCCAnalysisManager::Invalidator &Inv) {
-      auto PAC = PA.getChecker<TestIndirectSCCAnalysis>();
-      return !(PAC.preserved() ||
-               PAC.preservedSet<AllAnalysesOn<LazyCallGraph::SCC>>()) ||
-             Inv.invalidate<TestSCCAnalysis>(C, PA);
-    }
-  };
-
-  TestIndirectSCCAnalysis(int &Runs, ModuleAnalysisManager &MAM)
-      : Runs(Runs), MAM(MAM) {}
-
-  /// Run the analysis pass over the function and return a result.
-  Result run(LazyCallGraph::SCC &C, CGSCCAnalysisManager &AM,
-             LazyCallGraph &CG) {
-    ++Runs;
-    auto &SCCDep = AM.getResult<TestSCCAnalysis>(C, CG);
-
-    auto &ModuleProxy = AM.getResult<ModuleAnalysisManagerCGSCCProxy>(C, CG);
-    // For the test, we insist that the module analysis starts off in the
-    // cache. Getting a cached result that isn't stateless triggers an assert.
-    // auto &MDep = *ModuleProxy.getCachedResult<TestModuleAnalysis>(
-    //  *C.begin()->getFunction().getParent());
-    // Use MAM, for the purposes of this unittest.
-    auto &MDep = *MAM.getCachedResult<TestModuleAnalysis>(
-        *C.begin()->getFunction().getParent());
-    // Register the dependency as module analysis dependencies have to be
-    // pre-registered on the proxy.
-    ModuleProxy.registerOuterAnalysisInvalidation<TestModuleAnalysis,
-                                                  TestIndirectSCCAnalysis>();
-
-    return Result(SCCDep, MDep);
-  }
-
-private:
-  friend AnalysisInfoMixin<TestIndirectSCCAnalysis>;
-  static AnalysisKey Key;
-
-  int &Runs;
-  ModuleAnalysisManager &MAM;
-};
-
-AnalysisKey TestIndirectSCCAnalysis::Key;
-
-/// A test analysis pass which caches in its result the result from the above
-/// indirect analysis pass.
-///
-/// This allows us to ensure that whenever an analysis pass is invalidated due
-/// to dependencies (especially dependencies across IR units that trigger
-/// asynchronous invalidation) we correctly detect that this may in turn cause
-/// other analysis to be invalidated.
-struct TestDoublyIndirectSCCAnalysis
-    : public AnalysisInfoMixin<TestDoublyIndirectSCCAnalysis> {
-  struct Result {
-    Result(TestIndirectSCCAnalysis::Result &IDep) : IDep(IDep) {}
-    TestIndirectSCCAnalysis::Result &IDep;
-
-    bool invalidate(LazyCallGraph::SCC &C, const PreservedAnalyses &PA,
-                    CGSCCAnalysisManager::Invalidator &Inv) {
-      auto PAC = PA.getChecker<TestDoublyIndirectSCCAnalysis>();
-      return !(PAC.preserved() ||
-               PAC.preservedSet<AllAnalysesOn<LazyCallGraph::SCC>>()) ||
-             Inv.invalidate<TestIndirectSCCAnalysis>(C, PA);
-    }
-  };
-
-  TestDoublyIndirectSCCAnalysis(int &Runs) : Runs(Runs) {}
-
-  /// Run the analysis pass over the function and return a result.
-  Result run(LazyCallGraph::SCC &C, CGSCCAnalysisManager &AM,
-             LazyCallGraph &CG) {
-    ++Runs;
-    auto &IDep = AM.getResult<TestIndirectSCCAnalysis>(C, CG);
-    return Result(IDep);
-  }
-
-private:
-  friend AnalysisInfoMixin<TestDoublyIndirectSCCAnalysis>;
-  static AnalysisKey Key;
-
-  int &Runs;
-};
-
-AnalysisKey TestDoublyIndirectSCCAnalysis::Key;
-
-/// A test analysis pass which caches results from three different IR unit
-/// layers and requires intermediate layers to correctly propagate the entire
-/// distance.
-struct TestIndirectFunctionAnalysis
-    : public AnalysisInfoMixin<TestIndirectFunctionAnalysis> {
-  struct Result {
-    Result(TestFunctionAnalysis::Result &FDep, TestModuleAnalysis::Result &MDep,
-           TestSCCAnalysis::Result &SCCDep)
-        : FDep(FDep), MDep(MDep), SCCDep(SCCDep) {}
-    TestFunctionAnalysis::Result &FDep;
-    TestModuleAnalysis::Result &MDep;
-    TestSCCAnalysis::Result &SCCDep;
-
-    bool invalidate(Function &F, const PreservedAnalyses &PA,
-                    FunctionAnalysisManager::Invalidator &Inv) {
-      auto PAC = PA.getChecker<TestIndirectFunctionAnalysis>();
-      return !(PAC.preserved() ||
-               PAC.preservedSet<AllAnalysesOn<Function>>()) ||
-             Inv.invalidate<TestFunctionAnalysis>(F, PA);
-    }
-  };
-
-  TestIndirectFunctionAnalysis(int &Runs, ModuleAnalysisManager &MAM,
-                               CGSCCAnalysisManager &CGAM)
-      : Runs(Runs), MAM(MAM), CGAM(CGAM) {}
-
-  /// Run the analysis pass over the function and return a result.
-  Result run(Function &F, FunctionAnalysisManager &AM) {
-    ++Runs;
-    auto &FDep = AM.getResult<TestFunctionAnalysis>(F);
-
-    auto &ModuleProxy = AM.getResult<ModuleAnalysisManagerFunctionProxy>(F);
-    // For the test, we insist that the module analysis starts off in the
-    // cache. Getting a cached result that isn't stateless triggers an assert.
-    // Use MAM, for the purposes of this unittest.
-    auto &MDep = *MAM.getCachedResult<TestModuleAnalysis>(*F.getParent());
-    // Register the dependency as module analysis dependencies have to be
-    // pre-registered on the proxy.
-    ModuleProxy.registerOuterAnalysisInvalidation<
-        TestModuleAnalysis, TestIndirectFunctionAnalysis>();
-
-    // For the test we assume this is run inside a CGSCC pass manager.
-    // Use MAM, for the purposes of this unittest.
-    const LazyCallGraph &CG =
-        *MAM.getCachedResult<LazyCallGraphAnalysis>(*F.getParent());
-    auto &CGSCCProxy = AM.getResult<CGSCCAnalysisManagerFunctionProxy>(F);
-    // For the test, we insist that the CGSCC analysis starts off in the cache.
-    // Getting a cached result that isn't stateless triggers an assert.
-    // Use CGAM, for the purposes of this unittest.
-    auto &SCCDep =
-        *CGAM.getCachedResult<TestSCCAnalysis>(*CG.lookupSCC(*CG.lookup(F)));
-    // Register the dependency as CGSCC analysis dependencies have to be
-    // pre-registered on the proxy.
-    CGSCCProxy.registerOuterAnalysisInvalidation<
-        TestSCCAnalysis, TestIndirectFunctionAnalysis>();
-
-    return Result(FDep, MDep, SCCDep);
-  }
-
-private:
-  friend AnalysisInfoMixin<TestIndirectFunctionAnalysis>;
-  static AnalysisKey Key;
-
-  int &Runs;
-  ModuleAnalysisManager &MAM;
-  CGSCCAnalysisManager &CGAM;
-};
-
-AnalysisKey TestIndirectFunctionAnalysis::Key;
-
-TEST_F(CGSCCPassManagerTest, TestIndirectAnalysisInvalidation) {
-  int ModuleAnalysisRuns = 0;
-  MAM.registerPass([&] { return TestModuleAnalysis(ModuleAnalysisRuns); });
-
-  int SCCAnalysisRuns = 0, IndirectSCCAnalysisRuns = 0,
-      DoublyIndirectSCCAnalysisRuns = 0;
-  CGAM.registerPass([&] { return TestSCCAnalysis(SCCAnalysisRuns); });
-  CGAM.registerPass(
-      [&] { return TestIndirectSCCAnalysis(IndirectSCCAnalysisRuns, MAM); });
-  CGAM.registerPass([&] {
-    return TestDoublyIndirectSCCAnalysis(DoublyIndirectSCCAnalysisRuns);
-  });
-
-  int FunctionAnalysisRuns = 0, IndirectFunctionAnalysisRuns = 0;
-  FAM.registerPass([&] { return TestFunctionAnalysis(FunctionAnalysisRuns); });
-  FAM.registerPass([&] {
-    return TestIndirectFunctionAnalysis(IndirectFunctionAnalysisRuns, MAM,
-                                        CGAM);
-  });
-
-  ModulePassManager MPM;
-
-  int FunctionCount = 0;
-  CGSCCPassManager CGPM;
-  // First just use the analysis to get the function count and preserve
-  // everything.
-  CGPM.addPass(
-      LambdaSCCPass([&](LazyCallGraph::SCC &C, CGSCCAnalysisManager &AM,
-                        LazyCallGraph &CG, CGSCCUpdateResult &) {
-        auto &DoublyIndirectResult =
-            AM.getResult<TestDoublyIndirectSCCAnalysis>(C, CG);
-        auto &IndirectResult = DoublyIndirectResult.IDep;
-        FunctionCount += IndirectResult.SCCDep.FunctionCount;
-        return PreservedAnalyses::all();
-      }));
-  CGPM.addPass(createCGSCCToFunctionPassAdaptor(
-      RequireAnalysisPass<TestIndirectFunctionAnalysis, Function>()));
-
-  // Next, invalidate
-  //   - both analyses for the (f) and (x) SCCs,
-  //   - just the underlying (indirect) analysis for (g) SCC, and
-  //   - just the direct analysis for (h1,h2,h3) SCC.
-  CGPM.addPass(
-      LambdaSCCPass([&](LazyCallGraph::SCC &C, CGSCCAnalysisManager &AM,
-                        LazyCallGraph &CG, CGSCCUpdateResult &) {
-        auto &DoublyIndirectResult =
-            AM.getResult<TestDoublyIndirectSCCAnalysis>(C, CG);
-        auto &IndirectResult = DoublyIndirectResult.IDep;
-        FunctionCount += IndirectResult.SCCDep.FunctionCount;
-        auto PA = PreservedAnalyses::none();
-        PA.preserve<FunctionAnalysisManagerCGSCCProxy>();
-        PA.preserveSet<AllAnalysesOn<Function>>();
-        if (C.getName() == "(g)")
-          PA.preserve<TestSCCAnalysis>();
-        else if (C.getName() == "(h3, h1, h2)")
-          PA.preserve<TestIndirectSCCAnalysis>();
-        return PA;
-      }));
-  // Finally, use the analysis again on each SCC (and function), forcing
-  // re-computation for all of them.
-  CGPM.addPass(
-      LambdaSCCPass([&](LazyCallGraph::SCC &C, CGSCCAnalysisManager &AM,
-                        LazyCallGraph &CG, CGSCCUpdateResult &) {
-        auto &DoublyIndirectResult =
-            AM.getResult<TestDoublyIndirectSCCAnalysis>(C, CG);
-        auto &IndirectResult = DoublyIndirectResult.IDep;
-        FunctionCount += IndirectResult.SCCDep.FunctionCount;
-        return PreservedAnalyses::all();
-      }));
-  CGPM.addPass(createCGSCCToFunctionPassAdaptor(
-      RequireAnalysisPass<TestIndirectFunctionAnalysis, Function>()));
-
-  // Create a second CGSCC pass manager. This will cause the module-level
-  // invalidation to occur, which will force yet another invalidation of the
-  // indirect SCC-level analysis as the module analysis it depends on gets
-  // invalidated.
-  CGSCCPassManager CGPM2;
-  CGPM2.addPass(
-      LambdaSCCPass([&](LazyCallGraph::SCC &C, CGSCCAnalysisManager &AM,
-                        LazyCallGraph &CG, CGSCCUpdateResult &) {
-        auto &DoublyIndirectResult =
-            AM.getResult<TestDoublyIndirectSCCAnalysis>(C, CG);
-        auto &IndirectResult = DoublyIndirectResult.IDep;
-        FunctionCount += IndirectResult.SCCDep.FunctionCount;
-        return PreservedAnalyses::all();
-      }));
-  CGPM2.addPass(createCGSCCToFunctionPassAdaptor(
-      RequireAnalysisPass<TestIndirectFunctionAnalysis, Function>()));
-
-  // Add a requires pass to populate the module analysis and then our CGSCC
-  // pass pipeline.
-  MPM.addPass(RequireAnalysisPass<TestModuleAnalysis, Module>());
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM)));
-  // Now require the module analysis again (it will have been invalidated once)
-  // and then use it again from our second CGSCC pipeline..
-  MPM.addPass(RequireAnalysisPass<TestModuleAnalysis, Module>());
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM2)));
-  MPM.run(*M, MAM);
-
-  // There are generally two possible runs for each of the four SCCs. But
-  // for one SCC, we only invalidate the indirect analysis so the base one
-  // only gets run seven times.
-  EXPECT_EQ(7, SCCAnalysisRuns);
-  // The module analysis pass should be run twice here.
-  EXPECT_EQ(2, ModuleAnalysisRuns);
-  // The indirect analysis is invalidated (either directly or indirectly) three
-  // times for each of four SCCs.
-  EXPECT_EQ(3 * 4, IndirectSCCAnalysisRuns);
-  EXPECT_EQ(3 * 4, DoublyIndirectSCCAnalysisRuns);
-
-  // We run the indirect function analysis once per function the first time.
-  // Then we re-run it for every SCC but "(g)". Then we re-run it for every
-  // function again.
-  EXPECT_EQ(6 + 5 + 6, IndirectFunctionAnalysisRuns);
-
-  // Four passes count each of six functions once (via SCCs).
-  EXPECT_EQ(4 * 6, FunctionCount);
-}
-
-TEST_F(CGSCCPassManagerTest, TestAnalysisInvalidationCGSCCUpdate) {
-  int ModuleAnalysisRuns = 0;
-  MAM.registerPass([&] { return TestModuleAnalysis(ModuleAnalysisRuns); });
-
-  int SCCAnalysisRuns = 0, IndirectSCCAnalysisRuns = 0,
-      DoublyIndirectSCCAnalysisRuns = 0;
-  CGAM.registerPass([&] { return TestSCCAnalysis(SCCAnalysisRuns); });
-  CGAM.registerPass(
-      [&] { return TestIndirectSCCAnalysis(IndirectSCCAnalysisRuns, MAM); });
-  CGAM.registerPass([&] {
-    return TestDoublyIndirectSCCAnalysis(DoublyIndirectSCCAnalysisRuns);
-  });
-
-  int FunctionAnalysisRuns = 0, IndirectFunctionAnalysisRuns = 0;
-  FAM.registerPass([&] { return TestFunctionAnalysis(FunctionAnalysisRuns); });
-  FAM.registerPass([&] {
-    return TestIndirectFunctionAnalysis(IndirectFunctionAnalysisRuns, MAM,
-                                        CGAM);
-  });
-
-  ModulePassManager MPM;
-
-  CGSCCPassManager CGPM;
-  // First just use the analysis to get the function count and preserve
-  // everything.
-  using RequireTestIndirectFunctionAnalysisPass =
-      RequireAnalysisPass<TestIndirectFunctionAnalysis, Function>;
-  using RequireTestDoublyIndirectSCCAnalysisPass =
-      RequireAnalysisPass<TestDoublyIndirectSCCAnalysis, LazyCallGraph::SCC,
-                          CGSCCAnalysisManager, LazyCallGraph &,
-                          CGSCCUpdateResult &>;
-  CGPM.addPass(RequireTestDoublyIndirectSCCAnalysisPass());
-  CGPM.addPass(createCGSCCToFunctionPassAdaptor(
-      RequireTestIndirectFunctionAnalysisPass()));
-
-  // Next, we inject an SCC pass that invalidates everything for the `(h3, h1,
-  // h2)` SCC but also deletes the call edge from `h2` to `h3` and updates the
-  // CG. This should successfully invalidate (and force to be re-run) all the
-  // analyses for that SCC and for the functions.
-  CGPM.addPass(
-      LambdaSCCPass([&](LazyCallGraph::SCC &C, CGSCCAnalysisManager &AM,
-                        LazyCallGraph &CG, CGSCCUpdateResult &UR) {
-        (void)AM.getResult<TestDoublyIndirectSCCAnalysis>(C, CG);
-        if (C.getName() != "(h3, h1, h2)")
-          return PreservedAnalyses::all();
-
-        // Build the preserved set.
-        auto PA = PreservedAnalyses::none();
-        PA.preserve<FunctionAnalysisManagerCGSCCProxy>();
-        PA.preserve<TestIndirectSCCAnalysis>();
-        PA.preserve<TestDoublyIndirectSCCAnalysis>();
-
-        // Delete the call from `h2` to `h3`.
-        auto &H2N = *llvm::find_if(
-            C, [](LazyCallGraph::Node &N) { return N.getName() == "h2"; });
-        auto &H2F = H2N.getFunction();
-        auto &H3F = *cast<CallInst>(H2F.begin()->begin())->getCalledFunction();
-        assert(H3F.getName() == "h3" && "Wrong called function!");
-        H2F.begin()->begin()->eraseFromParent();
-        // Insert a bitcast of `h3` so that we retain a ref edge to it.
-        (void)CastInst::CreatePointerCast(&H3F,
-                                          Type::getInt8PtrTy(H2F.getContext()),
-                                          "dummy", &*H2F.begin()->begin());
-
-        // Now update the call graph.
-        auto &NewC =
-            updateCGAndAnalysisManagerForFunctionPass(CG, C, H2N, AM, UR, FAM);
-        assert(&NewC != &C && "Should get a new SCC due to update!");
-        (void)&NewC;
-
-        return PA;
-      }));
-  // Now use the analysis again on each SCC and function, forcing
-  // re-computation for all of them.
-  CGPM.addPass(RequireTestDoublyIndirectSCCAnalysisPass());
-  CGPM.addPass(createCGSCCToFunctionPassAdaptor(
-      RequireTestIndirectFunctionAnalysisPass()));
-
-  // Create another CGSCC pipeline that requires all the analyses again.
-  CGSCCPassManager CGPM2;
-  CGPM2.addPass(RequireTestDoublyIndirectSCCAnalysisPass());
-  CGPM2.addPass(createCGSCCToFunctionPassAdaptor(
-      RequireTestIndirectFunctionAnalysisPass()));
-
-  // Next we inject an SCC pass that finds the `(h2)` SCC, adds a call to `h3`
-  // back to `h2`, and then invalidates everything for what will then be the
-  // `(h3, h1, h2)` SCC again.
-  CGSCCPassManager CGPM3;
-  CGPM3.addPass(
-      LambdaSCCPass([&](LazyCallGraph::SCC &C, CGSCCAnalysisManager &AM,
-                        LazyCallGraph &CG, CGSCCUpdateResult &UR) {
-        (void)AM.getResult<TestDoublyIndirectSCCAnalysis>(C, CG);
-        if (C.getName() != "(h2)")
-          return PreservedAnalyses::all();
-
-        // Build the preserved set.
-        auto PA = PreservedAnalyses::none();
-        PA.preserve<FunctionAnalysisManagerCGSCCProxy>();
-        PA.preserve<TestIndirectSCCAnalysis>();
-        PA.preserve<TestDoublyIndirectSCCAnalysis>();
-
-        // Delete the bitcast of `h3` that we added earlier.
-        auto &H2N = *C.begin();
-        auto &H2F = H2N.getFunction();
-        auto &H3F = *cast<Function>(cast<BitCastInst>(H2F.begin()->begin())->getOperand(0));
-        assert(H3F.getName() == "h3" && "Wrong called function!");
-        H2F.begin()->begin()->eraseFromParent();
-        // And insert a call to `h3`.
-        (void)CallInst::Create(&H3F, {}, "", &*H2F.begin()->begin());
-
-        // Now update the call graph.
-        auto &NewC =
-            updateCGAndAnalysisManagerForFunctionPass(CG, C, H2N, AM, UR, FAM);
-        assert(&NewC != &C && "Should get a new SCC due to update!");
-        (void)&NewC;
-
-        return PA;
-      }));
-  // Now use the analysis again on each SCC and function, forcing
-  // re-computation for all of them.
-  CGPM3.addPass(RequireTestDoublyIndirectSCCAnalysisPass());
-  CGPM3.addPass(createCGSCCToFunctionPassAdaptor(
-      RequireTestIndirectFunctionAnalysisPass()));
-
-  // Create a second CGSCC pass manager. This will cause the module-level
-  // invalidation to occur, which will force yet another invalidation of the
-  // indirect SCC-level analysis as the module analysis it depends on gets
-  // invalidated.
-  CGSCCPassManager CGPM4;
-  CGPM4.addPass(RequireTestDoublyIndirectSCCAnalysisPass());
-  CGPM4.addPass(createCGSCCToFunctionPassAdaptor(
-      RequireTestIndirectFunctionAnalysisPass()));
-
-  // Add a requires pass to populate the module analysis and then one of our
-  // CGSCC pipelines. Repeat for all four CGSCC pipelines.
-  MPM.addPass(RequireAnalysisPass<TestModuleAnalysis, Module>());
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM)));
-  MPM.addPass(RequireAnalysisPass<TestModuleAnalysis, Module>());
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM2)));
-  MPM.addPass(RequireAnalysisPass<TestModuleAnalysis, Module>());
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM3)));
-  MPM.addPass(RequireAnalysisPass<TestModuleAnalysis, Module>());
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM4)));
-  MPM.run(*M, MAM);
-
-  // We run over four SCCs the first time. But then we split an SCC into three.
-  // And then we merge those three back into one. However, this also
-  // invalidates all three SCCs further down in the PO walk.
-  EXPECT_EQ(4 + 3 + 3, SCCAnalysisRuns);
-  // The module analysis pass should be run three times.
-  EXPECT_EQ(3, ModuleAnalysisRuns);
-  // We run over four SCCs the first time. Then over the two new ones. Then the
-  // entire module is invalidated causing a full run over all seven. Then we
-  // fold three SCCs back to one, re-compute for it and the two SCCs above it
-  // in the graph, and then run over the whole module again.
-  EXPECT_EQ(4 + 2 + 7 + 3 + 4, IndirectSCCAnalysisRuns);
-  EXPECT_EQ(4 + 2 + 7 + 3 + 4, DoublyIndirectSCCAnalysisRuns);
-
-  // First we run over all six functions. Then we re-run it over three when we
-  // split their SCCs. Then we re-run over the whole module. Then we re-run
-  // over three functions merged back into a single SCC, then those three
-  // functions again, the two functions in SCCs above it in the graph, and then
-  // over the whole module again.
-  EXPECT_EQ(6 + 3 + 6 + 3 + 2 + 6, FunctionAnalysisRuns);
-
-  // Re run the function analysis over the entire module, and then re-run it
-  // over the `(h3, h1, h2)` SCC due to invalidation. Then we re-run it over
-  // the entire module, then the three functions merged back into a single SCC,
-  // those three functions again, then the two functions in SCCs above it in
-  // the graph, and then over the whole module.
-  EXPECT_EQ(6 + 3 + 6 + 3 + 2 + 6, IndirectFunctionAnalysisRuns);
-}
-
-// The (negative) tests below check for assertions so we only run them if NDEBUG
-// is not defined.
-#ifndef NDEBUG
-
-struct LambdaSCCPassNoPreserve : public PassInfoMixin<LambdaSCCPassNoPreserve> {
-  template <typename T>
-  LambdaSCCPassNoPreserve(T &&Arg) : Func(std::forward<T>(Arg)) {}
-
-  PreservedAnalyses run(LazyCallGraph::SCC &C, CGSCCAnalysisManager &AM,
-                        LazyCallGraph &CG, CGSCCUpdateResult &UR) {
-    Func(C, AM, CG, UR);
-    PreservedAnalyses PA;
-    // We update the core CGSCC data structures and so can preserve the proxy to
-    // the function analysis manager.
-    PA.preserve<FunctionAnalysisManagerCGSCCProxy>();
-    return PA;
-  }
-
-  std::function<void(LazyCallGraph::SCC &, CGSCCAnalysisManager &,
-                     LazyCallGraph &, CGSCCUpdateResult &)>
-      Func;
-};
-
-TEST_F(CGSCCPassManagerTest, TestUpdateCGAndAnalysisManagerForPasses0) {
-  CGSCCPassManager CGPM;
-  CGPM.addPass(LambdaSCCPassNoPreserve(
-      [&](LazyCallGraph::SCC &C, CGSCCAnalysisManager &AM, LazyCallGraph &CG,
-          CGSCCUpdateResult &UR) {
-        if (C.getName() != "(h3, h1, h2)")
-          return;
-
-        auto &FAM =
-            AM.getResult<FunctionAnalysisManagerCGSCCProxy>(C, CG).getManager();
-        Function *FnX = M->getFunction("x");
-        Function *FnH1 = M->getFunction("h1");
-        Function *FnH2 = M->getFunction("h2");
-        Function *FnH3 = M->getFunction("h3");
-        ASSERT_NE(FnX, nullptr);
-        ASSERT_NE(FnH1, nullptr);
-        ASSERT_NE(FnH2, nullptr);
-        ASSERT_NE(FnH3, nullptr);
-
-        // And insert a call to `h1`, `h2`, and `h3`.
-        Instruction *IP = &FnH2->getEntryBlock().front();
-        (void)CallInst::Create(FnH1, {}, "", IP);
-        (void)CallInst::Create(FnH2, {}, "", IP);
-        (void)CallInst::Create(FnH3, {}, "", IP);
-
-        auto &H2N = *llvm::find_if(
-            C, [](LazyCallGraph::Node &N) { return N.getName() == "h2"; });
-        ASSERT_NO_FATAL_FAILURE(
-            updateCGAndAnalysisManagerForCGSCCPass(CG, C, H2N, AM, UR, FAM));
-      }));
-
-  ModulePassManager MPM;
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM)));
-  MPM.run(*M, MAM);
-}
-
-TEST_F(CGSCCPassManagerTest, TestUpdateCGAndAnalysisManagerForPasses1) {
-  CGSCCPassManager CGPM;
-  CGPM.addPass(LambdaSCCPassNoPreserve([&](LazyCallGraph::SCC &C,
-                                           CGSCCAnalysisManager &AM,
-                                           LazyCallGraph &CG,
-                                           CGSCCUpdateResult &UR) {
-    if (C.getName() != "(h3, h1, h2)")
-      return;
-
-    auto &FAM =
-        AM.getResult<FunctionAnalysisManagerCGSCCProxy>(C, CG).getManager();
-    Function *FnX = M->getFunction("x");
-    Function *FnH1 = M->getFunction("h1");
-    Function *FnH2 = M->getFunction("h2");
-    Function *FnH3 = M->getFunction("h3");
-    ASSERT_NE(FnX, nullptr);
-    ASSERT_NE(FnH1, nullptr);
-    ASSERT_NE(FnH2, nullptr);
-    ASSERT_NE(FnH3, nullptr);
-
-    // And insert a call to `h1`, `h2`, and `h3`.
-    Instruction *IP = &FnH2->getEntryBlock().front();
-    (void)CallInst::Create(FnH1, {}, "", IP);
-    (void)CallInst::Create(FnH2, {}, "", IP);
-    (void)CallInst::Create(FnH3, {}, "", IP);
-
-    auto &H2N = *llvm::find_if(
-        C, [](LazyCallGraph::Node &N) { return N.getName() == "h2"; });
-    ASSERT_DEATH(
-        updateCGAndAnalysisManagerForFunctionPass(CG, C, H2N, AM, UR, FAM),
-        "Any new calls should be modeled as");
-  }));
-
-  ModulePassManager MPM;
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM)));
-  MPM.run(*M, MAM);
-}
-
-TEST_F(CGSCCPassManagerTest, TestUpdateCGAndAnalysisManagerForPasses2) {
-  CGSCCPassManager CGPM;
-  CGPM.addPass(LambdaSCCPassNoPreserve(
-      [&](LazyCallGraph::SCC &C, CGSCCAnalysisManager &AM, LazyCallGraph &CG,
-          CGSCCUpdateResult &UR) {
-        if (C.getName() != "(f)")
-          return;
-
-        auto &FAM =
-            AM.getResult<FunctionAnalysisManagerCGSCCProxy>(C, CG).getManager();
-        Function *FnF = M->getFunction("f");
-        Function *FnH2 = M->getFunction("h2");
-        ASSERT_NE(FnF, nullptr);
-        ASSERT_NE(FnH2, nullptr);
-
-        // And insert a call to `h2`
-        Instruction *IP = &FnF->getEntryBlock().front();
-        (void)CallInst::Create(FnH2, {}, "", IP);
-
-        auto &FN = *llvm::find_if(
-            C, [](LazyCallGraph::Node &N) { return N.getName() == "f"; });
-        ASSERT_NO_FATAL_FAILURE(
-            updateCGAndAnalysisManagerForCGSCCPass(CG, C, FN, AM, UR, FAM));
-      }));
-
-  ModulePassManager MPM;
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM)));
-  MPM.run(*M, MAM);
-}
-
-TEST_F(CGSCCPassManagerTest, TestUpdateCGAndAnalysisManagerForPasses3) {
-  CGSCCPassManager CGPM;
-  CGPM.addPass(LambdaSCCPassNoPreserve([&](LazyCallGraph::SCC &C,
-                                           CGSCCAnalysisManager &AM,
-                                           LazyCallGraph &CG,
-                                           CGSCCUpdateResult &UR) {
-    if (C.getName() != "(f)")
-      return;
-
-    auto &FAM =
-        AM.getResult<FunctionAnalysisManagerCGSCCProxy>(C, CG).getManager();
-    Function *FnF = M->getFunction("f");
-    Function *FnH2 = M->getFunction("h2");
-    ASSERT_NE(FnF, nullptr);
-    ASSERT_NE(FnH2, nullptr);
-
-    // And insert a call to `h2`
-    Instruction *IP = &FnF->getEntryBlock().front();
-    (void)CallInst::Create(FnH2, {}, "", IP);
-
-    auto &FN = *llvm::find_if(
-        C, [](LazyCallGraph::Node &N) { return N.getName() == "f"; });
-    ASSERT_DEATH(
-        updateCGAndAnalysisManagerForFunctionPass(CG, C, FN, AM, UR, FAM),
-        "Any new calls should be modeled as");
-  }));
-
-  ModulePassManager MPM;
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM)));
-  MPM.run(*M, MAM);
-}
-
-TEST_F(CGSCCPassManagerTest, TestUpdateCGAndAnalysisManagerForPasses4) {
-  CGSCCPassManager CGPM;
-  CGPM.addPass(LambdaSCCPassNoPreserve(
-      [&](LazyCallGraph::SCC &C, CGSCCAnalysisManager &AM, LazyCallGraph &CG,
-          CGSCCUpdateResult &UR) {
-        if (C.getName() != "(f)")
-          return;
-
-        auto &FAM =
-            AM.getResult<FunctionAnalysisManagerCGSCCProxy>(C, CG).getManager();
-        Function *FnF = M->getFunction("f");
-        Function *FnewF = Function::Create(FnF->getFunctionType(),
-                                           FnF->getLinkage(), "newF", *M);
-        BasicBlock *BB = BasicBlock::Create(FnewF->getContext(), "", FnewF);
-        ReturnInst::Create(FnewF->getContext(), BB);
-
-        // And insert a call to `newF`
-        Instruction *IP = &FnF->getEntryBlock().front();
-        (void)CallInst::Create(FnewF, {}, "", IP);
-
-        // Use the CallGraphUpdater to update the call graph for the new
-        // function.
-        CallGraphUpdater CGU;
-        CGU.initialize(CG, C, AM, UR);
-        CGU.registerOutlinedFunction(*FnF, *FnewF);
-
-        auto &FN = *llvm::find_if(
-            C, [](LazyCallGraph::Node &N) { return N.getName() == "f"; });
-
-        ASSERT_NO_FATAL_FAILURE(
-            updateCGAndAnalysisManagerForCGSCCPass(CG, C, FN, AM, UR, FAM));
-      }));
-
-  ModulePassManager MPM;
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM)));
-  MPM.run(*M, MAM);
-}
-
-TEST_F(CGSCCPassManagerTest, TestUpdateCGAndAnalysisManagerForPasses5) {
-  CGSCCPassManager CGPM;
-  CGPM.addPass(LambdaSCCPassNoPreserve([&](LazyCallGraph::SCC &C,
-                                           CGSCCAnalysisManager &AM,
-                                           LazyCallGraph &CG,
-                                           CGSCCUpdateResult &UR) {
-    if (C.getName() != "(f)")
-      return;
-
-    auto &FAM =
-        AM.getResult<FunctionAnalysisManagerCGSCCProxy>(C, CG).getManager();
-    Function *FnF = M->getFunction("f");
-    Function *FnewF =
-        Function::Create(FnF->getFunctionType(), FnF->getLinkage(), "newF", *M);
-    BasicBlock *BB = BasicBlock::Create(FnewF->getContext(), "", FnewF);
-    ReturnInst::Create(FnewF->getContext(), BB);
-
-    // Use the CallGraphUpdater to update the call graph for the new
-    // function.
-    CallGraphUpdater CGU;
-    CGU.initialize(CG, C, AM, UR);
-
-    // And insert a call to `newF`
-    Instruction *IP = &FnF->getEntryBlock().front();
-    (void)CallInst::Create(FnewF, {}, "", IP);
-
-    auto &FN = *llvm::find_if(
-        C, [](LazyCallGraph::Node &N) { return N.getName() == "f"; });
-
-    ASSERT_DEATH(updateCGAndAnalysisManagerForCGSCCPass(CG, C, FN, AM, UR, FAM),
-                 "should already have an associated node");
-  }));
-
-  ModulePassManager MPM;
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM)));
-  MPM.run(*M, MAM);
-}
-
-TEST_F(CGSCCPassManagerTest, TestUpdateCGAndAnalysisManagerForPasses6) {
-  CGSCCPassManager CGPM;
-  CGPM.addPass(LambdaSCCPassNoPreserve(
-      [&](LazyCallGraph::SCC &C, CGSCCAnalysisManager &AM, LazyCallGraph &CG,
-          CGSCCUpdateResult &UR) {
-        if (C.getName() != "(h3, h1, h2)")
-          return;
-
-        Function *FnX = M->getFunction("x");
-        Function *FnH1 = M->getFunction("h1");
-        Function *FnH2 = M->getFunction("h2");
-        Function *FnH3 = M->getFunction("h3");
-        ASSERT_NE(FnX, nullptr);
-        ASSERT_NE(FnH1, nullptr);
-        ASSERT_NE(FnH2, nullptr);
-        ASSERT_NE(FnH3, nullptr);
-
-        // And insert a call to `h1`, `h2`, and `h3`.
-        Instruction *IP = &FnH2->getEntryBlock().front();
-        (void)CallInst::Create(FnH1, {}, "", IP);
-        (void)CallInst::Create(FnH2, {}, "", IP);
-        (void)CallInst::Create(FnH3, {}, "", IP);
-
-        // Use the CallGraphUpdater to update the call graph for the new
-        // function.
-        CallGraphUpdater CGU;
-        CGU.initialize(CG, C, AM, UR);
-        ASSERT_NO_FATAL_FAILURE(CGU.reanalyzeFunction(*FnH2));
-      }));
-
-  ModulePassManager MPM;
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM)));
-  MPM.run(*M, MAM);
-}
-
-TEST_F(CGSCCPassManagerTest, TestUpdateCGAndAnalysisManagerForPasses7) {
-  CGSCCPassManager CGPM;
-  CGPM.addPass(LambdaSCCPassNoPreserve(
-      [&](LazyCallGraph::SCC &C, CGSCCAnalysisManager &AM, LazyCallGraph &CG,
-          CGSCCUpdateResult &UR) {
-        if (C.getName() != "(f)")
-          return;
-
-        Function *FnF = M->getFunction("f");
-        Function *FnH2 = M->getFunction("h2");
-        ASSERT_NE(FnF, nullptr);
-        ASSERT_NE(FnH2, nullptr);
-
-        // And insert a call to `h2`
-        Instruction *IP = &FnF->getEntryBlock().front();
-        (void)CallInst::Create(FnH2, {}, "", IP);
-
-        // Use the CallGraphUpdater to update the call graph for the new
-        // function.
-        CallGraphUpdater CGU;
-        CGU.initialize(CG, C, AM, UR);
-        ASSERT_NO_FATAL_FAILURE(CGU.reanalyzeFunction(*FnF));
-      }));
-
-  ModulePassManager MPM;
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM)));
-  MPM.run(*M, MAM);
-}
-
-TEST_F(CGSCCPassManagerTest, TestUpdateCGAndAnalysisManagerForPasses8) {
-  CGSCCPassManager CGPM;
-  CGPM.addPass(LambdaSCCPassNoPreserve(
-      [&](LazyCallGraph::SCC &C, CGSCCAnalysisManager &AM, LazyCallGraph &CG,
-          CGSCCUpdateResult &UR) {
-        if (C.getName() != "(f)")
-          return;
-
-        Function *FnF = M->getFunction("f");
-        Function *FnewF = Function::Create(FnF->getFunctionType(),
-                                           FnF->getLinkage(), "newF", *M);
-        BasicBlock *BB = BasicBlock::Create(FnewF->getContext(), "", FnewF);
-        auto *RI = ReturnInst::Create(FnewF->getContext(), BB);
-        while (FnF->getEntryBlock().size() > 1)
-          FnF->getEntryBlock().front().moveBefore(RI);
-        ASSERT_NE(FnF, nullptr);
-
-        // Create an unsused constant that is referencing the old (=replaced)
-        // function.
-        ConstantExpr::getBitCast(FnF, Type::getInt8PtrTy(FnF->getContext()));
-
-        // Use the CallGraphUpdater to update the call graph.
-        CallGraphUpdater CGU;
-        CGU.initialize(CG, C, AM, UR);
-        ASSERT_NO_FATAL_FAILURE(CGU.replaceFunctionWith(*FnF, *FnewF));
-        ASSERT_TRUE(FnF->isDeclaration());
-        ASSERT_EQ(FnF->getNumUses(), 0U);
-      }));
-
-  ModulePassManager MPM;
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM)));
-  MPM.run(*M, MAM);
-}
-
-TEST_F(CGSCCPassManagerTest, TestUpdateCGAndAnalysisManagerForPasses9) {
-  CGSCCPassManager CGPM;
-  CGPM.addPass(LambdaSCCPassNoPreserve(
-      [&](LazyCallGraph::SCC &C, CGSCCAnalysisManager &AM, LazyCallGraph &CG,
-          CGSCCUpdateResult &UR) {
-        if (C.getName() != "(f)")
-          return;
-
-        Function *FnF = M->getFunction("f");
-
-        // Use the CallGraphUpdater to update the call graph.
-        {
-          CallGraphUpdater CGU;
-          CGU.initialize(CG, C, AM, UR);
-          ASSERT_NO_FATAL_FAILURE(CGU.removeFunction(*FnF));
-          ASSERT_EQ(M->getFunctionList().size(), 6U);
-        }
-        ASSERT_EQ(M->getFunctionList().size(), 5U);
-      }));
-
-  ModulePassManager MPM;
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM)));
-  MPM.run(*M, MAM);
-}
-
-TEST_F(CGSCCPassManagerTest, TestUpdateCGAndAnalysisManagerForPasses10) {
-  CGSCCPassManager CGPM;
-  CGPM.addPass(LambdaSCCPassNoPreserve(
-      [&](LazyCallGraph::SCC &C, CGSCCAnalysisManager &AM, LazyCallGraph &CG,
-          CGSCCUpdateResult &UR) {
-        if (C.getName() != "(h3, h1, h2)")
-          return;
-
-        Function *FnX = M->getFunction("x");
-        Function *FnH1 = M->getFunction("h1");
-        Function *FnH2 = M->getFunction("h2");
-        Function *FnH3 = M->getFunction("h3");
-        ASSERT_NE(FnX, nullptr);
-        ASSERT_NE(FnH1, nullptr);
-        ASSERT_NE(FnH2, nullptr);
-        ASSERT_NE(FnH3, nullptr);
-
-        // And insert a call to `h1`, and `h3`.
-        Instruction *IP = &FnH1->getEntryBlock().front();
-        (void)CallInst::Create(FnH1, {}, "", IP);
-        (void)CallInst::Create(FnH3, {}, "", IP);
-
-        // Remove the `h2` call.
-        ASSERT_TRUE(isa<CallBase>(IP));
-        ASSERT_EQ(cast<CallBase>(IP)->getCalledFunction(), FnH2);
-        IP->eraseFromParent();
-
-        // Use the CallGraphUpdater to update the call graph.
-        CallGraphUpdater CGU;
-        CGU.initialize(CG, C, AM, UR);
-        ASSERT_NO_FATAL_FAILURE(CGU.reanalyzeFunction(*FnH1));
-        ASSERT_NO_FATAL_FAILURE(CGU.removeFunction(*FnH2));
-      }));
-
-  ModulePassManager MPM;
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM)));
-  MPM.run(*M, MAM);
-}
-
-// Returns a vector containing the SCC's nodes. Useful for not iterating over an
-// SCC while mutating it.
-static SmallVector<LazyCallGraph::Node *> SCCNodes(LazyCallGraph::SCC &C) {
-  SmallVector<LazyCallGraph::Node *> Nodes;
-  for (auto &N : C)
-    Nodes.push_back(&N);
-
-  return Nodes;
-}
-
-// Start with call recursive f, create f -> g and ref recursive f.
-TEST_F(CGSCCPassManagerTest, TestInsertionOfNewFunctions1) {
-  std::unique_ptr<Module> M = parseIR("define void @f() {\n"
-                                      "entry:\n"
-                                      "  call void @f()\n"
-                                      "  ret void\n"
-                                      "}\n");
-
-  bool Ran = false;
-
-  CGSCCPassManager CGPM;
-  CGPM.addPass(LambdaSCCPassNoPreserve(
-      [&](LazyCallGraph::SCC &C, CGSCCAnalysisManager &AM, LazyCallGraph &CG,
-          CGSCCUpdateResult &UR) {
-        if (Ran)
-          return;
-
-        auto &FAM =
-            AM.getResult<FunctionAnalysisManagerCGSCCProxy>(C, CG).getManager();
-
-        for (LazyCallGraph::Node *N : SCCNodes(C)) {
-          Function &F = N->getFunction();
-          if (F.getName() != "f")
-            continue;
-
-          // Create a new function 'g'.
-          auto *G = Function::Create(F.getFunctionType(), F.getLinkage(),
-                                     F.getAddressSpace(), "g", F.getParent());
-          auto *GBB =
-              BasicBlock::Create(F.getParent()->getContext(), "entry", G);
-          (void)ReturnInst::Create(G->getContext(), GBB);
-          // Instruct the LazyCallGraph to create a new node for 'g', as the
-          // single node in a new SCC, into the call graph. As a result
-          // the call graph is composed of a single RefSCC with two SCCs:
-          // [(f), (g)].
-
-          // "Demote" the 'f -> f' call edge to a ref edge.
-          // 1. Erase the call edge from 'f' to 'f'.
-          F.getEntryBlock().front().eraseFromParent();
-          // 2. Insert a ref edge from 'f' to 'f'.
-          (void)CastInst::CreatePointerCast(
-              &F, Type::getInt8PtrTy(F.getContext()), "f.ref",
-              &F.getEntryBlock().front());
-          // 3. Insert a ref edge from 'f' to 'g'.
-          (void)CastInst::CreatePointerCast(
-              G, Type::getInt8PtrTy(F.getContext()), "g.ref",
-              &F.getEntryBlock().front());
-
-          CG.addSplitFunction(F, *G);
-
-          ASSERT_FALSE(verifyModule(*F.getParent(), &errs()));
-
-          ASSERT_NO_FATAL_FAILURE(
-              updateCGAndAnalysisManagerForCGSCCPass(CG, C, *N, AM, UR, FAM))
-              << "Updating the call graph with a demoted, self-referential "
-                 "call edge 'f -> f', and a newly inserted ref edge 'f -> g', "
-                 "caused a fatal failure";
-
-          Ran = true;
-        }
-      }));
-
-  ModulePassManager MPM;
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM)));
-  MPM.run(*M, MAM);
-  ASSERT_TRUE(Ran);
-}
-
-// Start with f, end with f -> g1, f -> g2, and f -ref-> (h1 <-ref-> h2).
-TEST_F(CGSCCPassManagerTest, TestInsertionOfNewFunctions2) {
-  std::unique_ptr<Module> M = parseIR("define void @f() {\n"
-                                      "entry:\n"
-                                      "  ret void\n"
-                                      "}\n");
-
-  bool Ran = false;
-
-  CGSCCPassManager CGPM;
-  CGPM.addPass(LambdaSCCPassNoPreserve([&](LazyCallGraph::SCC &C,
-                                           CGSCCAnalysisManager &AM,
-                                           LazyCallGraph &CG,
-                                           CGSCCUpdateResult &UR) {
-    if (Ran)
-      return;
-
-    auto &FAM =
-        AM.getResult<FunctionAnalysisManagerCGSCCProxy>(C, CG).getManager();
-
-    for (LazyCallGraph::Node *N : SCCNodes(C)) {
-      Function &F = N->getFunction();
-      if (F.getName() != "f")
-        continue;
-
-      // Create g1 and g2.
-      auto *G1 = Function::Create(F.getFunctionType(), F.getLinkage(),
-                                  F.getAddressSpace(), "g1", F.getParent());
-      auto *G2 = Function::Create(F.getFunctionType(), F.getLinkage(),
-                                  F.getAddressSpace(), "g2", F.getParent());
-      BasicBlock *G1BB =
-          BasicBlock::Create(F.getParent()->getContext(), "entry", G1);
-      BasicBlock *G2BB =
-          BasicBlock::Create(F.getParent()->getContext(), "entry", G2);
-      (void)ReturnInst::Create(G1->getContext(), G1BB);
-      (void)ReturnInst::Create(G2->getContext(), G2BB);
-
-      // Add 'f -> g1' call edge.
-      (void)CallInst::Create(G1, {}, "", &F.getEntryBlock().front());
-      // Add 'f -> g2' call edge.
-      (void)CallInst::Create(G2, {}, "", &F.getEntryBlock().front());
-
-      CG.addSplitFunction(F, *G1);
-      CG.addSplitFunction(F, *G2);
-
-      // Create mutually recursive functions (ref only) 'h1' and 'h2'.
-      auto *H1 = Function::Create(F.getFunctionType(), F.getLinkage(),
-                                  F.getAddressSpace(), "h1", F.getParent());
-      auto *H2 = Function::Create(F.getFunctionType(), F.getLinkage(),
-                                  F.getAddressSpace(), "h2", F.getParent());
-      BasicBlock *H1BB =
-          BasicBlock::Create(F.getParent()->getContext(), "entry", H1);
-      BasicBlock *H2BB =
-          BasicBlock::Create(F.getParent()->getContext(), "entry", H2);
-      (void)CastInst::CreatePointerCast(H2, Type::getInt8PtrTy(F.getContext()),
-                                        "h2.ref", H1BB);
-      (void)ReturnInst::Create(H1->getContext(), H1BB);
-      (void)CastInst::CreatePointerCast(H1, Type::getInt8PtrTy(F.getContext()),
-                                        "h1.ref", H2BB);
-      (void)ReturnInst::Create(H2->getContext(), H2BB);
-
-      // Add 'f -> h1' ref edge.
-      (void)CastInst::CreatePointerCast(H1, Type::getInt8PtrTy(F.getContext()),
-                                        "h1.ref", &F.getEntryBlock().front());
-      // Add 'f -> h2' ref edge.
-      (void)CastInst::CreatePointerCast(H2, Type::getInt8PtrTy(F.getContext()),
-                                        "h2.ref", &F.getEntryBlock().front());
-
-      CG.addSplitRefRecursiveFunctions(F, SmallVector<Function *, 2>({H1, H2}));
-
-      ASSERT_FALSE(verifyModule(*F.getParent(), &errs()));
-
-      ASSERT_NO_FATAL_FAILURE(
-          updateCGAndAnalysisManagerForCGSCCPass(CG, C, *N, AM, UR, FAM))
-          << "Updating the call graph with mutually recursive g1 <-> g2, h1 "
-             "<-> h2 caused a fatal failure";
-
-      Ran = true;
-    }
-  }));
-
-  ModulePassManager MPM;
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM)));
-  MPM.run(*M, MAM);
-  ASSERT_TRUE(Ran);
-}
-
-TEST_F(CGSCCPassManagerTest, TestInsertionOfNewNonTrivialCallEdge) {
-  std::unique_ptr<Module> M = parseIR("define void @f1() {\n"
-                                      "entry:\n"
-                                      "  %a = bitcast void ()* @f4 to i8*\n"
-                                      "  %b = bitcast void ()* @f2 to i8*\n"
-                                      "  ret void\n"
-                                      "}\n"
-                                      "define void @f2() {\n"
-                                      "entry:\n"
-                                      "  %a = bitcast void ()* @f1 to i8*\n"
-                                      "  %b = bitcast void ()* @f3 to i8*\n"
-                                      "  ret void\n"
-                                      "}\n"
-                                      "define void @f3() {\n"
-                                      "entry:\n"
-                                      "  %a = bitcast void ()* @f2 to i8*\n"
-                                      "  %b = bitcast void ()* @f4 to i8*\n"
-                                      "  ret void\n"
-                                      "}\n"
-                                      "define void @f4() {\n"
-                                      "entry:\n"
-                                      "  %a = bitcast void ()* @f3 to i8*\n"
-                                      "  %b = bitcast void ()* @f1 to i8*\n"
-                                      "  ret void\n"
-                                      "}\n");
-
-  bool Ran = false;
-  CGSCCPassManager CGPM;
-  CGPM.addPass(LambdaSCCPassNoPreserve([&](LazyCallGraph::SCC &C,
-                                           CGSCCAnalysisManager &AM,
-                                           LazyCallGraph &CG,
-                                           CGSCCUpdateResult &UR) {
-    if (Ran)
-      return;
-
-    auto &FAM =
-        AM.getResult<FunctionAnalysisManagerCGSCCProxy>(C, CG).getManager();
-
-    for (LazyCallGraph::Node *N : SCCNodes(C)) {
-      Function &F = N->getFunction();
-      if (F.getName() != "f1")
-        continue;
-
-      Function *F3 = F.getParent()->getFunction("f3");
-      ASSERT_TRUE(F3 != nullptr);
-
-      // Create call from f1 to f3.
-      (void)CallInst::Create(F3, {}, "", F.getEntryBlock().getTerminator());
-
-      ASSERT_NO_FATAL_FAILURE(
-          updateCGAndAnalysisManagerForCGSCCPass(CG, C, *N, AM, UR, FAM))
-          << "Updating the call graph with mutually recursive g1 <-> g2, h1 "
-             "<-> h2 caused a fatal failure";
-
-      Ran = true;
-    }
-  }));
-
-  ModulePassManager MPM;
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM)));
-  MPM.run(*M, MAM);
-
-  ASSERT_TRUE(Ran);
-}
-
-TEST_F(CGSCCPassManagerTest, TestFunctionPassesAreQueriedForInvalidation) {
-  std::unique_ptr<Module> M = parseIR("define void @f() { ret void }");
-  CGSCCPassManager CGPM;
-  bool SCCCalled = false;
-  FunctionPassManager FPM;
-  int ImmRuns = 0;
-  FAM.registerPass([&] { return TestImmutableFunctionAnalysis(ImmRuns); });
-  FPM.addPass(RequireAnalysisPass<TestImmutableFunctionAnalysis, Function>());
-  CGPM.addPass(
-      LambdaSCCPass([&](LazyCallGraph::SCC &C, CGSCCAnalysisManager &AM,
-                        LazyCallGraph &CG, CGSCCUpdateResult &UR) {
-        SCCCalled = true;
-        return PreservedAnalyses::none();
-      }));
-  CGPM.addPass(createCGSCCToFunctionPassAdaptor(
-      RequireAnalysisPass<TestImmutableFunctionAnalysis, Function>()));
-  ModulePassManager MPM;
-
-  MPM.addPass(createModuleToFunctionPassAdaptor(std::move(FPM)));
-  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM)));
-  MPM.run(*M, MAM);
-  ASSERT_EQ(ImmRuns, 1);
-  ASSERT_TRUE(SCCCalled);
-}
-
-#endif
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/Analysis/CMakeLists.txt b/gnu/llvm/llvm/unittests/Analysis/CMakeLists.txt
deleted file mode 100644
index 7e3e20e4af2..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/CMakeLists.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  Analysis
-  AsmParser
-  Core
-  Support
-  TransformUtils
-  )
-
-if (DEFINED LLVM_HAVE_TF_API)
-  LIST(APPEND EXTRA_TESTS TFUtilsTest.cpp)
-else()
-  LIST(APPEND LLVM_OPTIONAL_SOURCES TFUtilsTest.cpp)
-endif()
-
-add_llvm_unittest_with_input_files(AnalysisTests
-  AliasAnalysisTest.cpp
-  AliasSetTrackerTest.cpp
-  AssumeBundleQueriesTest.cpp
-  BasicAliasAnalysisTest.cpp
-  BlockFrequencyInfoTest.cpp
-  BranchProbabilityInfoTest.cpp
-  CallGraphTest.cpp
-  CaptureTrackingTest.cpp
-  CFGTest.cpp
-  CGSCCPassManagerTest.cpp
-  ConstraintSystemTest.cpp
-  DDGTest.cpp
-  DivergenceAnalysisTest.cpp
-  DomTreeUpdaterTest.cpp
-  GlobalsModRefTest.cpp
-  FunctionPropertiesAnalysisTest.cpp
-  InlineCostTest.cpp
-  IRSimilarityIdentifierTest.cpp
-  IVDescriptorsTest.cpp
-  LazyCallGraphTest.cpp
-  LoadsTest.cpp
-  LoopInfoTest.cpp
-  LoopNestTest.cpp
-  MemoryBuiltinsTest.cpp
-  MemorySSATest.cpp
-  PhiValuesTest.cpp
-  ProfileSummaryInfoTest.cpp
-  ScalarEvolutionTest.cpp
-  VectorFunctionABITest.cpp
-  SparsePropagation.cpp
-  TargetLibraryInfoTest.cpp
-  TBAATest.cpp
-  UnrollAnalyzerTest.cpp
-  ValueLatticeTest.cpp
-  ValueTrackingTest.cpp
-  VectorUtilsTest.cpp
-  ${EXTRA_TESTS}
-  )
-
- target_link_libraries(AnalysisTests PRIVATE LLVMTestingSupport)
diff --git a/gnu/llvm/llvm/unittests/Analysis/CallGraphTest.cpp b/gnu/llvm/llvm/unittests/Analysis/CallGraphTest.cpp
deleted file mode 100644
index 0060d2c4b23..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/CallGraphTest.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-//=======- CallGraphTest.cpp - Unit tests for the CG analysis -------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/CallGraph.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-template <typename Ty> void canSpecializeGraphTraitsIterators(Ty *G) {
-  typedef typename GraphTraits<Ty *>::NodeRef NodeRef;
-
-  auto I = GraphTraits<Ty *>::nodes_begin(G);
-  auto E = GraphTraits<Ty *>::nodes_end(G);
-  auto X = ++I;
-
-  // Should be able to iterate over all nodes of the graph.
-  static_assert(std::is_same<decltype(*I), NodeRef>::value,
-                "Node type does not match");
-  static_assert(std::is_same<decltype(*X), NodeRef>::value,
-                "Node type does not match");
-  static_assert(std::is_same<decltype(*E), NodeRef>::value,
-                "Node type does not match");
-
-  NodeRef N = GraphTraits<Ty *>::getEntryNode(G);
-
-  auto S = GraphTraits<NodeRef>::child_begin(N);
-  auto F = GraphTraits<NodeRef>::child_end(N);
-
-  // Should be able to iterate over immediate successors of a node.
-  static_assert(std::is_same<decltype(*S), NodeRef>::value,
-                "Node type does not match");
-  static_assert(std::is_same<decltype(*F), NodeRef>::value,
-                "Node type does not match");
-}
-
-TEST(CallGraphTest, GraphTraitsSpecialization) {
-  LLVMContext Context;
-  Module M("", Context);
-  CallGraph CG(M);
-
-  canSpecializeGraphTraitsIterators(&CG);
-}
-
-TEST(CallGraphTest, GraphTraitsConstSpecialization) {
-  LLVMContext Context;
-  Module M("", Context);
-  CallGraph CG(M);
-
-  canSpecializeGraphTraitsIterators(const_cast<const CallGraph *>(&CG));
-}
-}
diff --git a/gnu/llvm/llvm/unittests/Analysis/CaptureTrackingTest.cpp b/gnu/llvm/llvm/unittests/Analysis/CaptureTrackingTest.cpp
deleted file mode 100644
index 73dd82fb921..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/CaptureTrackingTest.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-//=======- CaptureTrackingTest.cpp - Unit test for the Capture Tracking ---===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/CaptureTracking.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Dominators.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-TEST(CaptureTracking, MaxUsesToExplore) {
-  StringRef Assembly = R"(
-    ; Function Attrs: nounwind ssp uwtable
-    declare void @doesnt_capture(i8* nocapture, i8* nocapture, i8* nocapture, 
-                                 i8* nocapture, i8* nocapture)
-
-    ; %arg has 5 uses
-    define void @test_few_uses(i8* %arg) {
-      call void @doesnt_capture(i8* %arg, i8* %arg, i8* %arg, i8* %arg, i8* %arg)
-      ret void
-    }
-
-    ; %arg has 50 uses
-    define void @test_many_uses(i8* %arg) {
-      call void @doesnt_capture(i8* %arg, i8* %arg, i8* %arg, i8* %arg, i8* %arg)
-      call void @doesnt_capture(i8* %arg, i8* %arg, i8* %arg, i8* %arg, i8* %arg)
-      call void @doesnt_capture(i8* %arg, i8* %arg, i8* %arg, i8* %arg, i8* %arg)
-      call void @doesnt_capture(i8* %arg, i8* %arg, i8* %arg, i8* %arg, i8* %arg)
-      call void @doesnt_capture(i8* %arg, i8* %arg, i8* %arg, i8* %arg, i8* %arg)
-      call void @doesnt_capture(i8* %arg, i8* %arg, i8* %arg, i8* %arg, i8* %arg)
-      call void @doesnt_capture(i8* %arg, i8* %arg, i8* %arg, i8* %arg, i8* %arg)
-      call void @doesnt_capture(i8* %arg, i8* %arg, i8* %arg, i8* %arg, i8* %arg)
-      call void @doesnt_capture(i8* %arg, i8* %arg, i8* %arg, i8* %arg, i8* %arg)
-      call void @doesnt_capture(i8* %arg, i8* %arg, i8* %arg, i8* %arg, i8* %arg)
-      ret void
-    }
-  )";
-
-  LLVMContext Context;
-  SMDiagnostic Error;
-  auto M = parseAssemblyString(Assembly, Error, Context);
-  ASSERT_TRUE(M) << "Bad assembly?";
-
-  auto Test = [&M](const char *FName, unsigned FalseMaxUsesLimit,
-                   unsigned TrueMaxUsesLimit) {
-    Function *F = M->getFunction(FName);
-    ASSERT_NE(F, nullptr);
-    Value *Arg = &*F->arg_begin();
-    ASSERT_NE(Arg, nullptr);
-    ASSERT_FALSE(PointerMayBeCaptured(Arg, true, true, FalseMaxUsesLimit));
-    ASSERT_TRUE(PointerMayBeCaptured(Arg, true, true, TrueMaxUsesLimit));
-
-    BasicBlock *EntryBB = &F->getEntryBlock();
-    DominatorTree DT(*F);
-
-    Instruction *Ret = EntryBB->getTerminator();
-    ASSERT_TRUE(isa<ReturnInst>(Ret));
-    ASSERT_FALSE(PointerMayBeCapturedBefore(Arg, true, true, Ret, &DT, false,
-                                            FalseMaxUsesLimit));
-    ASSERT_TRUE(PointerMayBeCapturedBefore(Arg, true, true, Ret, &DT, false,
-                                           TrueMaxUsesLimit));
-  };
-
-  Test("test_few_uses", 6, 4);
-  Test("test_many_uses", 50, 30);
-}
-
-struct CollectingCaptureTracker : public CaptureTracker {
-  SmallVector<const Use *, 4> Captures;
-  void tooManyUses() override { }
-  bool captured(const Use *U) override {
-    Captures.push_back(U);
-    return false;
-  }
-};
-
-TEST(CaptureTracking, MultipleUsesInSameInstruction) {
-  StringRef Assembly = R"(
-    declare void @call(i8*, i8*, i8*)
-
-    define void @test(i8* %arg, i8** %ptr) {
-      call void @call(i8* %arg, i8* nocapture %arg, i8* %arg) [ "bundle"(i8* %arg) ]
-      cmpxchg i8** %ptr, i8* %arg, i8* %arg acq_rel monotonic
-      icmp eq i8* %arg, %arg
-      ret void
-    }
-  )";
-
-  LLVMContext Context;
-  SMDiagnostic Error;
-  auto M = parseAssemblyString(Assembly, Error, Context);
-  ASSERT_TRUE(M) << "Bad assembly?";
-
-  Function *F = M->getFunction("test");
-  Value *Arg = &*F->arg_begin();
-  BasicBlock *BB = &F->getEntryBlock();
-  Instruction *Call = &*BB->begin();
-  Instruction *CmpXChg = Call->getNextNode();
-  Instruction *ICmp = CmpXChg->getNextNode();
-
-  CollectingCaptureTracker CT;
-  PointerMayBeCaptured(Arg, &CT);
-  EXPECT_EQ(7u, CT.Captures.size());
-  // Call arg 1
-  EXPECT_EQ(Call, CT.Captures[0]->getUser());
-  EXPECT_EQ(0u, CT.Captures[0]->getOperandNo());
-  // Call arg 3
-  EXPECT_EQ(Call, CT.Captures[1]->getUser());
-  EXPECT_EQ(2u, CT.Captures[1]->getOperandNo());
-  // Operand bundle arg
-  EXPECT_EQ(Call, CT.Captures[2]->getUser());
-  EXPECT_EQ(3u, CT.Captures[2]->getOperandNo());
-  // Cmpxchg compare operand
-  EXPECT_EQ(CmpXChg, CT.Captures[3]->getUser());
-  EXPECT_EQ(1u, CT.Captures[3]->getOperandNo());
-  // Cmpxchg new value operand
-  EXPECT_EQ(CmpXChg, CT.Captures[4]->getUser());
-  EXPECT_EQ(2u, CT.Captures[4]->getOperandNo());
-  // ICmp first operand
-  EXPECT_EQ(ICmp, CT.Captures[5]->getUser());
-  EXPECT_EQ(0u, CT.Captures[5]->getOperandNo());
-  // ICmp second operand
-  EXPECT_EQ(ICmp, CT.Captures[6]->getUser());
-  EXPECT_EQ(1u, CT.Captures[6]->getOperandNo());
-}
diff --git a/gnu/llvm/llvm/unittests/Analysis/ConstraintSystemTest.cpp b/gnu/llvm/llvm/unittests/Analysis/ConstraintSystemTest.cpp
deleted file mode 100644
index 337a1116341..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/ConstraintSystemTest.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-//===--- ConstraintSystemTests.cpp ----------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/ConstraintSystem.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST(ConstraintSolverTest, TestSolutionChecks) {
-  {
-    ConstraintSystem CS;
-    // x + y <= 10, x >= 5, y >= 6, x <= 10, y <= 10
-    CS.addVariableRow({10, 1, 1});
-    CS.addVariableRow({-5, -1, 0});
-    CS.addVariableRow({-6, 0, -1});
-    CS.addVariableRow({10, 1, 0});
-    CS.addVariableRow({10, 0, 1});
-
-    EXPECT_FALSE(CS.mayHaveSolution());
-  }
-
-  {
-    ConstraintSystem CS;
-    // x + y <= 10, x >= 2, y >= 3, x <= 10, y <= 10
-    CS.addVariableRow({10, 1, 1});
-    CS.addVariableRow({-2, -1, 0});
-    CS.addVariableRow({-3, 0, -1});
-    CS.addVariableRow({10, 1, 0});
-    CS.addVariableRow({10, 0, 1});
-
-    EXPECT_TRUE(CS.mayHaveSolution());
-  }
-
-  {
-    ConstraintSystem CS;
-    // x + y <= 10, 10 >= x, 10 >= y; does not have a solution.
-    CS.addVariableRow({10, 1, 1});
-    CS.addVariableRow({-10, -1, 0});
-    CS.addVariableRow({-10, 0, -1});
-
-    EXPECT_FALSE(CS.mayHaveSolution());
-  }
-
-  {
-    ConstraintSystem CS;
-    // x + y >= 20, 10 >= x, 10 >= y; does HAVE a solution.
-    CS.addVariableRow({-20, -1, -1});
-    CS.addVariableRow({-10, -1, 0});
-    CS.addVariableRow({-10, 0, -1});
-
-    EXPECT_TRUE(CS.mayHaveSolution());
-  }
-
-  {
-    ConstraintSystem CS;
-
-    // 2x + y + 3z <= 10,  2x + y >= 10, y >= 1
-    CS.addVariableRow({10, 2, 1, 3});
-    CS.addVariableRow({-10, -2, -1, 0});
-    CS.addVariableRow({-1, 0, 0, -1});
-
-    EXPECT_FALSE(CS.mayHaveSolution());
-  }
-
-  {
-    ConstraintSystem CS;
-
-    // 2x + y + 3z <= 10,  2x + y >= 10
-    CS.addVariableRow({10, 2, 1, 3});
-    CS.addVariableRow({-10, -2, -1, 0});
-
-    EXPECT_TRUE(CS.mayHaveSolution());
-  }
-}
-
-TEST(ConstraintSolverTest, IsConditionImplied) {
-  {
-    // For the test below, we assume we know
-    // x <= 5 && y <= 3
-    ConstraintSystem CS;
-    CS.addVariableRow({5, 1, 0});
-    CS.addVariableRow({3, 0, 1});
-
-    // x + y <= 6 does not hold.
-    EXPECT_FALSE(CS.isConditionImplied({6, 1, 1}));
-    // x + y <= 7 does not hold.
-    EXPECT_FALSE(CS.isConditionImplied({7, 1, 1}));
-    // x + y <= 8 does hold.
-    EXPECT_TRUE(CS.isConditionImplied({8, 1, 1}));
-
-    // 2 * x + y <= 12 does hold.
-    EXPECT_FALSE(CS.isConditionImplied({12, 2, 1}));
-    // 2 * x + y <= 13 does hold.
-    EXPECT_TRUE(CS.isConditionImplied({13, 2, 1}));
-
-    //  x + y <= 12 does hold.
-    EXPECT_FALSE(CS.isConditionImplied({12, 2, 1}));
-    // 2 * x + y <= 13 does hold.
-    EXPECT_TRUE(CS.isConditionImplied({13, 2, 1}));
-
-    // x <= y == x - y <= 0 does not hold.
-    EXPECT_FALSE(CS.isConditionImplied({0, 1, -1}));
-    // y <= x == -x + y <= 0 does not hold.
-    EXPECT_FALSE(CS.isConditionImplied({0, -1, 1}));
-  }
-
-  {
-    // For the test below, we assume we know
-    // x + 1 <= y + 1 == x - y <= 0
-    ConstraintSystem CS;
-    CS.addVariableRow({0, 1, -1});
-
-    // x <= y == x - y <= 0 does hold.
-    EXPECT_TRUE(CS.isConditionImplied({0, 1, -1}));
-    // y <= x == -x + y <= 0 does not hold.
-    EXPECT_FALSE(CS.isConditionImplied({0, -1, 1}));
-
-    // x <= y + 10 == x - y <= 10 does hold.
-    EXPECT_TRUE(CS.isConditionImplied({10, 1, -1}));
-    // x + 10 <= y == x - y <= -10 does NOT hold.
-    EXPECT_FALSE(CS.isConditionImplied({-10, 1, -1}));
-  }
-
-  {
-    // For the test below, we assume we know
-    // x <= y == x - y <= 0
-    // y <= z == y - x <= 0
-    ConstraintSystem CS;
-    CS.addVariableRow({0, 1, -1, 0});
-    CS.addVariableRow({0, 0, 1, -1});
-
-    // z <= y == -y + z <= 0 does not hold.
-    EXPECT_FALSE(CS.isConditionImplied({0, 0, -1, 1}));
-    // x <= z == x - z <= 0 does hold.
-    EXPECT_TRUE(CS.isConditionImplied({0, 1, 0, -1}));
-  }
-}
-
-TEST(ConstraintSolverTest, IsConditionImpliedOverflow) {
-  ConstraintSystem CS;
-  // Make sure isConditionImplied returns false when there is an overflow.
-  int64_t Limit = std::numeric_limits<int64_t>::max();
-  CS.addVariableRow({Limit - 1, Limit - 2, Limit - 3});
-  EXPECT_FALSE(CS.isConditionImplied({Limit - 1, Limit - 2, Limit - 3}));
-}
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/Analysis/DDGTest.cpp b/gnu/llvm/llvm/unittests/Analysis/DDGTest.cpp
deleted file mode 100644
index b1d35596c1e..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/DDGTest.cpp
+++ /dev/null
@@ -1,284 +0,0 @@
-//===- DDGTest.cpp - DDGAnalysis unit tests -------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/DDG.h"
-#include "llvm/Analysis/AliasAnalysis.h"
-#include "llvm/Analysis/AssumptionCache.h"
-#include "llvm/Analysis/BasicAliasAnalysis.h"
-#include "llvm/Analysis/LoopInfo.h"
-#include "llvm/Analysis/ScalarEvolution.h"
-#include "llvm/Analysis/TargetLibraryInfo.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Dominators.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-/// Build the DDG analysis for a loop and run the given test \p Test.
-static void runTest(Module &M, StringRef FuncName,
-                    function_ref<void(Function &F, LoopInfo &LI,
-                                      DependenceInfo &DI, ScalarEvolution &SE)>
-                        Test) {
-  auto *F = M.getFunction(FuncName);
-  ASSERT_NE(F, nullptr) << "Could not find " << FuncName;
-
-  TargetLibraryInfoImpl TLII;
-  TargetLibraryInfo TLI(TLII);
-  AssumptionCache AC(*F);
-  DominatorTree DT(*F);
-  LoopInfo LI(DT);
-  ScalarEvolution SE(*F, TLI, AC, DT, LI);
-  AAResults AA(TLI);
-  DependenceInfo DI(F, &AA, &SE, &LI);
-  Test(*F, LI, DI, SE);
-}
-
-static std::unique_ptr<Module> makeLLVMModule(LLVMContext &Context,
-                                              const char *ModuleStr) {
-  SMDiagnostic Err;
-  return parseAssemblyString(ModuleStr, Err, Context);
-}
-
-TEST(DDGTest, getDependencies) {
-  const char *ModuleStr =
-      "target datalayout = \"e-m:e-i64:64-n32:64\"\n"
-      "target triple = \"powerpc64le-unknown-linux-gnu\"\n"
-      "\n"
-      "define dso_local void @foo(i32 signext %n, i32* noalias %A, i32* "
-      "noalias %B) {\n"
-      "entry:\n"
-      "   %cmp1 = icmp sgt i32 %n, 0\n"
-      "   br i1 %cmp1, label %for.body.preheader, label %for.end\n"
-      "\n"
-      "for.body.preheader:\n"
-      "   %wide.trip.count = zext i32 %n to i64\n"
-      "   br label %for.body\n"
-      " \n"
-      " for.body:\n"
-      "   %indvars.iv = phi i64 [ 0, %for.body.preheader ], [ "
-      "%indvars.iv.next, %for.body ]\n"
-      "   %arrayidx = getelementptr inbounds i32, i32* %A, i64 %indvars.iv\n"
-      "  %0 = trunc i64 %indvars.iv to i32\n"
-      "  store i32 %0, i32* %arrayidx, align 4\n"
-      "  %indvars.iv.next = add nuw nsw i64 %indvars.iv, 1\n"
-      "  %arrayidx2 = getelementptr inbounds i32, i32* %A, i64 "
-      "%indvars.iv.next\n"
-      "  %1 = load i32, i32* %arrayidx2, align 4\n"
-      "  %add3 = add nsw i32 %1, 1\n"
-      "  %arrayidx5 = getelementptr inbounds i32, i32* %B, i64 %indvars.iv\n"
-      "  store i32 %add3, i32* %arrayidx5, align 4\n"
-      "  %exitcond = icmp ne i64 %indvars.iv.next, %wide.trip.count\n"
-      "  br i1 %exitcond, label %for.body, label %for.end.loopexit\n"
-      "\n"
-      "for.end.loopexit:\n"
-      "  br label %for.end\n"
-      "\n"
-      "for.end:\n"
-      "  ret void\n"
-      "}\n";
-
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleStr);
-
-  runTest(
-      *M, "foo",
-      [&](Function &F, LoopInfo &LI, DependenceInfo &DI, ScalarEvolution &SE) {
-        Loop *L = *LI.begin();
-        assert(L && "expected the loop to be identified.");
-
-        DataDependenceGraph DDG(*L, LI, DI);
-
-        // Collect all the nodes that have an outgoing memory edge
-        // while collecting all memory edges as well. There should
-        // only be one node with an outgoing memory edge and there
-        // should only be one memory edge in the entire graph.
-        std::vector<DDGNode *> DependenceSourceNodes;
-        std::vector<DDGEdge *> MemoryEdges;
-        for (DDGNode *N : DDG) {
-          for (DDGEdge *E : *N) {
-            bool SourceAdded = false;
-            if (E->isMemoryDependence()) {
-              MemoryEdges.push_back(E);
-              if (!SourceAdded) {
-                DependenceSourceNodes.push_back(N);
-                SourceAdded = true;
-              }
-            }
-          }
-        }
-
-        EXPECT_EQ(DependenceSourceNodes.size(), 1ull);
-        EXPECT_EQ(MemoryEdges.size(), 1ull);
-
-        DataDependenceGraph::DependenceList DL;
-        DDG.getDependencies(*DependenceSourceNodes.back(),
-                            MemoryEdges.back()->getTargetNode(), DL);
-
-        EXPECT_EQ(DL.size(), 1ull);
-        EXPECT_TRUE(DL.back()->isAnti());
-        EXPECT_EQ(DL.back()->getLevels(), 1u);
-        EXPECT_NE(DL.back()->getDistance(1), nullptr);
-        EXPECT_EQ(DL.back()->getDistance(1),
-                  SE.getOne(DL.back()->getDistance(1)->getType()));
-      });
-}
-
-/// Test to make sure that when pi-blocks are formed, multiple edges of the same
-/// kind and direction are collapsed into a single edge.
-/// In the test below, %loadASubI belongs to an outside node, which has input
-/// dependency with multiple load instructions in the pi-block containing
-/// %loadBSubI. We expect a single memory dependence edge from the outside node
-/// to this pi-block. The pi-block also contains %add and %add7 both of which
-/// feed a phi in an outside node. We expect a single def-use edge from the
-/// pi-block to the node containing that phi.
-TEST(DDGTest, avoidDuplicateEdgesToFromPiBlocks) {
-  const char *ModuleStr =
-      "target datalayout = \"e-m:e-i64:64-n32:64-v256:256:256-v512:512:512\"\n"
-      "\n"
-      "define void @foo(float* noalias %A, float* noalias %B, float* noalias "
-      "%C, float* noalias %D, i32 signext %n) {\n"
-      "entry:\n"
-      "  %cmp1 = icmp sgt i32 %n, 0\n"
-      "  br i1 %cmp1, label %for.body.preheader, label %for.end\n"
-      "\n"
-      "for.body.preheader:                               ; preds = %entry\n"
-      "  %wide.trip.count = zext i32 %n to i64\n"
-      "  br label %for.body\n"
-      "\n"
-      "for.body:                                         ; preds = "
-      "%for.body.preheader, %if.end\n"
-      "  %indvars.iv = phi i64 [ 0, %for.body.preheader ], [ %indvars.iv.next, "
-      "%if.end ]\n"
-      "  %arrayidx = getelementptr inbounds float, float* %A, i64 %indvars.iv\n"
-      "  %loadASubI = load float, float* %arrayidx, align 4\n"
-      "  %arrayidx2 = getelementptr inbounds float, float* %B, i64 "
-      "%indvars.iv\n"
-      "  %loadBSubI = load float, float* %arrayidx2, align 4\n"
-      "  %add = fadd fast float %loadASubI, %loadBSubI\n"
-      "  %arrayidx4 = getelementptr inbounds float, float* %A, i64 "
-      "%indvars.iv\n"
-      "  store float %add, float* %arrayidx4, align 4\n"
-      "  %arrayidx6 = getelementptr inbounds float, float* %A, i64 "
-      "%indvars.iv\n"
-      "  %0 = load float, float* %arrayidx6, align 4\n"
-      "  %add7 = fadd fast float %0, 1.000000e+00\n"
-      "  %indvars.iv.next = add nuw nsw i64 %indvars.iv, 1\n"
-      "  %arrayidx10 = getelementptr inbounds float, float* %B, i64 "
-      "%indvars.iv.next\n"
-      "  store float %add7, float* %arrayidx10, align 4\n"
-      "  %arrayidx12 = getelementptr inbounds float, float* %A, i64 "
-      "%indvars.iv\n"
-      "  %1 = load float, float* %arrayidx12, align 4\n"
-      "  %cmp13 = fcmp fast ogt float %1, 1.000000e+02\n"
-      "  br i1 %cmp13, label %if.then, label %if.else\n"
-      "\n"
-      "if.then:                                          ; preds = %for.body\n"
-      "  br label %if.end\n"
-      "\n"
-      "if.else:                                          ; preds = %for.body\n"
-      "  br label %if.end\n"
-      "\n"
-      "if.end:                                           ; preds = %if.else, "
-      "%if.then\n"
-      "  %ff.0 = phi float [ %add, %if.then ], [ %add7, %if.else ]\n"
-      "  store float %ff.0, float* %C, align 4\n"
-      "  %exitcond = icmp ne i64 %indvars.iv.next, %wide.trip.count\n"
-      "  br i1 %exitcond, label %for.body, label %for.end.loopexit\n"
-      "\n"
-      "for.end.loopexit:                                 ; preds = %if.end\n"
-      "  br label %for.end\n"
-      "\n"
-      "for.end:                                          ; preds = "
-      "%for.end.loopexit, %entry\n"
-      "  ret void\n"
-      "}\n";
-
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleStr);
-
-  runTest(
-      *M, "foo",
-      [&](Function &F, LoopInfo &LI, DependenceInfo &DI, ScalarEvolution &SE) {
-        Loop *L = *LI.begin();
-        assert(L && "expected the loop to be identified.");
-
-        DataDependenceGraph DDG(*L, LI, DI);
-
-        const DDGNode *LoadASubI = nullptr;
-        for (DDGNode *N : DDG) {
-          if (!isa<SimpleDDGNode>(N))
-            continue;
-          SmallVector<Instruction *, 8> IList;
-          N->collectInstructions([](const Instruction *I) { return true; },
-                                 IList);
-          if (llvm::any_of(IList, [](Instruction *I) {
-                return I->getName() == "loadASubI";
-              })) {
-            LoadASubI = N;
-            break;
-          }
-        }
-        assert(LoadASubI && "Did not find load of A[i]");
-
-        const PiBlockDDGNode *PiBlockWithBSubI = nullptr;
-        for (DDGNode *N : DDG) {
-          if (!isa<PiBlockDDGNode>(N))
-            continue;
-          for (DDGNode *M : cast<PiBlockDDGNode>(N)->getNodes()) {
-            SmallVector<Instruction *, 8> IList;
-            M->collectInstructions([](const Instruction *I) { return true; },
-                                   IList);
-            if (llvm::any_of(IList, [](Instruction *I) {
-                  return I->getName() == "loadBSubI";
-                })) {
-              PiBlockWithBSubI = static_cast<PiBlockDDGNode *>(N);
-              break;
-            }
-          }
-          if (PiBlockWithBSubI)
-            break;
-        }
-        assert(PiBlockWithBSubI &&
-               "Did not find pi-block containing load of B[i]");
-
-        const DDGNode *FFPhi = nullptr;
-        for (DDGNode *N : DDG) {
-          if (!isa<SimpleDDGNode>(N))
-            continue;
-          SmallVector<Instruction *, 8> IList;
-          N->collectInstructions([](const Instruction *I) { return true; },
-                                 IList);
-          if (llvm::any_of(IList, [](Instruction *I) {
-                return I->getName() == "ff.0";
-              })) {
-            FFPhi = N;
-            break;
-          }
-        }
-        assert(FFPhi && "Did not find ff.0 phi instruction");
-
-        // Expect a single memory edge from '%0 = A[i]' to the pi-block. This
-        // means the duplicate incoming memory edges are removed during pi-block
-        // formation.
-        SmallVector<DDGEdge *, 4> EL;
-        LoadASubI->findEdgesTo(*PiBlockWithBSubI, EL);
-        unsigned NumMemoryEdges = llvm::count_if(
-            EL, [](DDGEdge *Edge) { return Edge->isMemoryDependence(); });
-        EXPECT_EQ(NumMemoryEdges, 1ull);
-
-        /// Expect a single def-use edge from the pi-block to '%ff.0 = phi...`.
-        /// This means the duplicate outgoing def-use edges are removed during
-        /// pi-block formation.
-        EL.clear();
-        PiBlockWithBSubI->findEdgesTo(*FFPhi, EL);
-        NumMemoryEdges =
-            llvm::count_if(EL, [](DDGEdge *Edge) { return Edge->isDefUse(); });
-        EXPECT_EQ(NumMemoryEdges, 1ull);
-      });
-}
diff --git a/gnu/llvm/llvm/unittests/Analysis/DivergenceAnalysisTest.cpp b/gnu/llvm/llvm/unittests/Analysis/DivergenceAnalysisTest.cpp
deleted file mode 100644
index 0737e7773fb..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/DivergenceAnalysisTest.cpp
+++ /dev/null
@@ -1,430 +0,0 @@
-//===- DivergenceAnalysisTest.cpp - DivergenceAnalysis unit tests ---------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/Analysis/AssumptionCache.h"
-#include "llvm/Analysis/DivergenceAnalysis.h"
-#include "llvm/Analysis/LoopInfo.h"
-#include "llvm/Analysis/PostDominators.h"
-#include "llvm/Analysis/SyncDependenceAnalysis.h"
-#include "llvm/Analysis/TargetLibraryInfo.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/Dominators.h"
-#include "llvm/IR/GlobalVariable.h"
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/InstIterator.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/LegacyPassManager.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/Verifier.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-namespace {
-
-BasicBlock *GetBlockByName(StringRef BlockName, Function &F) {
-  for (auto &BB : F) {
-    if (BB.getName() != BlockName)
-      continue;
-    return &BB;
-  }
-  return nullptr;
-}
-
-// We use this fixture to ensure that we clean up DivergenceAnalysisImpl before
-// deleting the PassManager.
-class DivergenceAnalysisTest : public testing::Test {
-protected:
-  LLVMContext Context;
-  Module M;
-  TargetLibraryInfoImpl TLII;
-  TargetLibraryInfo TLI;
-
-  std::unique_ptr<DominatorTree> DT;
-  std::unique_ptr<PostDominatorTree> PDT;
-  std::unique_ptr<LoopInfo> LI;
-  std::unique_ptr<SyncDependenceAnalysis> SDA;
-
-  DivergenceAnalysisTest() : M("", Context), TLII(), TLI(TLII) {}
-
-  DivergenceAnalysisImpl buildDA(Function &F, bool IsLCSSA) {
-    DT.reset(new DominatorTree(F));
-    PDT.reset(new PostDominatorTree(F));
-    LI.reset(new LoopInfo(*DT));
-    SDA.reset(new SyncDependenceAnalysis(*DT, *PDT, *LI));
-    return DivergenceAnalysisImpl(F, nullptr, *DT, *LI, *SDA, IsLCSSA);
-  }
-
-  void runWithDA(
-      Module &M, StringRef FuncName, bool IsLCSSA,
-      function_ref<void(Function &F, LoopInfo &LI, DivergenceAnalysisImpl &DA)>
-          Test) {
-    auto *F = M.getFunction(FuncName);
-    ASSERT_NE(F, nullptr) << "Could not find " << FuncName;
-    DivergenceAnalysisImpl DA = buildDA(*F, IsLCSSA);
-    Test(*F, *LI, DA);
-  }
-};
-
-// Simple initial state test
-TEST_F(DivergenceAnalysisTest, DAInitialState) {
-  IntegerType *IntTy = IntegerType::getInt32Ty(Context);
-  FunctionType *FTy =
-      FunctionType::get(Type::getVoidTy(Context), {IntTy}, false);
-  Function *F = Function::Create(FTy, Function::ExternalLinkage, "f", M);
-  BasicBlock *BB = BasicBlock::Create(Context, "entry", F);
-  ReturnInst::Create(Context, nullptr, BB);
-
-  DivergenceAnalysisImpl DA = buildDA(*F, false);
-
-  // Whole function region
-  EXPECT_EQ(DA.getRegionLoop(), nullptr);
-
-  // No divergence in initial state
-  EXPECT_FALSE(DA.hasDetectedDivergence());
-
-  // No spurious divergence
-  DA.compute();
-  EXPECT_FALSE(DA.hasDetectedDivergence());
-
-  // Detected divergence after marking
-  Argument &arg = *F->arg_begin();
-  DA.markDivergent(arg);
-
-  EXPECT_TRUE(DA.hasDetectedDivergence());
-  EXPECT_TRUE(DA.isDivergent(arg));
-
-  DA.compute();
-  EXPECT_TRUE(DA.hasDetectedDivergence());
-  EXPECT_TRUE(DA.isDivergent(arg));
-}
-
-TEST_F(DivergenceAnalysisTest, DANoLCSSA) {
-  LLVMContext C;
-  SMDiagnostic Err;
-
-  std::unique_ptr<Module> M = parseAssemblyString(
-      "target datalayout = \"e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128\" "
-      " "
-      "define i32 @f_1(i8* nocapture %arr, i32 %n, i32* %A, i32* %B) "
-      "    local_unnamed_addr { "
-      "entry: "
-      "  br label %loop.ph "
-      " "
-      "loop.ph: "
-      "  br label %loop "
-      " "
-      "loop: "
-      "  %iv0 = phi i32 [ %iv0.inc, %loop ], [ 0, %loop.ph ] "
-      "  %iv1 = phi i32 [ %iv1.inc, %loop ], [ -2147483648, %loop.ph ] "
-      "  %iv0.inc = add i32 %iv0, 1 "
-      "  %iv1.inc = add i32 %iv1, 3 "
-      "  %cond.cont = icmp slt i32 %iv0, %n "
-      "  br i1 %cond.cont, label %loop, label %for.end.loopexit "
-      " "
-      "for.end.loopexit: "
-      "  ret i32 %iv0 "
-      "} ",
-      Err, C);
-
-  Function *F = M->getFunction("f_1");
-  DivergenceAnalysisImpl DA = buildDA(*F, false);
-  EXPECT_FALSE(DA.hasDetectedDivergence());
-
-  auto ItArg = F->arg_begin();
-  ItArg++;
-  auto &NArg = *ItArg;
-
-  // Seed divergence in argument %n
-  DA.markDivergent(NArg);
-
-  DA.compute();
-  EXPECT_TRUE(DA.hasDetectedDivergence());
-
-  // Verify that "ret %iv.0" is divergent
-  auto ItBlock = F->begin();
-  std::advance(ItBlock, 3);
-  auto &ExitBlock = *GetBlockByName("for.end.loopexit", *F);
-  auto &RetInst = *cast<ReturnInst>(ExitBlock.begin());
-  EXPECT_TRUE(DA.isDivergent(RetInst));
-}
-
-TEST_F(DivergenceAnalysisTest, DALCSSA) {
-  LLVMContext C;
-  SMDiagnostic Err;
-
-  std::unique_ptr<Module> M = parseAssemblyString(
-      "target datalayout = \"e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128\" "
-      " "
-      "define i32 @f_lcssa(i8* nocapture %arr, i32 %n, i32* %A, i32* %B) "
-      "    local_unnamed_addr { "
-      "entry: "
-      "  br label %loop.ph "
-      " "
-      "loop.ph: "
-      "  br label %loop "
-      " "
-      "loop: "
-      "  %iv0 = phi i32 [ %iv0.inc, %loop ], [ 0, %loop.ph ] "
-      "  %iv1 = phi i32 [ %iv1.inc, %loop ], [ -2147483648, %loop.ph ] "
-      "  %iv0.inc = add i32 %iv0, 1 "
-      "  %iv1.inc = add i32 %iv1, 3 "
-      "  %cond.cont = icmp slt i32 %iv0, %n "
-      "  br i1 %cond.cont, label %loop, label %for.end.loopexit "
-      " "
-      "for.end.loopexit: "
-      "  %val.ret = phi i32 [ %iv0, %loop ] "
-      "  br label %detached.return "
-      " "
-      "detached.return: "
-      "  ret i32 %val.ret "
-      "} ",
-      Err, C);
-
-  Function *F = M->getFunction("f_lcssa");
-  DivergenceAnalysisImpl DA = buildDA(*F, true);
-  EXPECT_FALSE(DA.hasDetectedDivergence());
-
-  auto ItArg = F->arg_begin();
-  ItArg++;
-  auto &NArg = *ItArg;
-
-  // Seed divergence in argument %n
-  DA.markDivergent(NArg);
-
-  DA.compute();
-  EXPECT_TRUE(DA.hasDetectedDivergence());
-
-  // Verify that "ret %iv.0" is divergent
-  auto ItBlock = F->begin();
-  std::advance(ItBlock, 4);
-  auto &ExitBlock = *GetBlockByName("detached.return", *F);
-  auto &RetInst = *cast<ReturnInst>(ExitBlock.begin());
-  EXPECT_TRUE(DA.isDivergent(RetInst));
-}
-
-TEST_F(DivergenceAnalysisTest, DAJoinDivergence) {
-  LLVMContext C;
-  SMDiagnostic Err;
-
-  std::unique_ptr<Module> M = parseAssemblyString(
-      "target datalayout = \"e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128\" "
-      " "
-      "define void @f_1(i1 %a, i1 %b, i1 %c) "
-      "    local_unnamed_addr { "
-      "A: "
-      "  br i1 %a, label %B, label %C "
-      " "
-      "B: "
-      "  br i1 %b, label %C, label %D "
-      " "
-      "C: "
-      "  %c.join = phi i32 [ 0, %A ], [ 1, %B ] "
-      "  br i1 %c, label %D, label %E "
-      " "
-      "D: "
-      "  %d.join = phi i32 [ 0, %B ], [ 1, %C ] "
-      "  br label %E "
-      " "
-      "E: "
-      "  %e.join = phi i32 [ 0, %C ], [ 1, %D ] "
-      "  ret void "
-      "} "
-      " "
-      "define void @f_2(i1 %a, i1 %b, i1 %c) "
-      "    local_unnamed_addr { "
-      "A: "
-      "  br i1 %a, label %B, label %E "
-      " "
-      "B: "
-      "  br i1 %b, label %C, label %D "
-      " "
-      "C: "
-      "  br label %D "
-      " "
-      "D: "
-      "  %d.join = phi i32 [ 0, %B ], [ 1, %C ] "
-      "  br label %E "
-      " "
-      "E: "
-      "  %e.join = phi i32 [ 0, %A ], [ 1, %D ] "
-      "  ret void "
-      "} "
-      " "
-      "define void @f_3(i1 %a, i1 %b, i1 %c)"
-      "    local_unnamed_addr { "
-      "A: "
-      "  br i1 %a, label %B, label %C "
-      " "
-      "B: "
-      "  br label %C "
-      " "
-      "C: "
-      "  %c.join = phi i32 [ 0, %A ], [ 1, %B ] "
-      "  br i1 %c, label %D, label %E "
-      " "
-      "D: "
-      "  br label %E "
-      " "
-      "E: "
-      "  %e.join = phi i32 [ 0, %C ], [ 1, %D ] "
-      "  ret void "
-      "} ",
-      Err, C);
-
-  // Maps divergent conditions to the basic blocks whose Phi nodes become
-  // divergent. Blocks need to be listed in IR order.
-  using SmallBlockVec = SmallVector<const BasicBlock *, 4>;
-  using InducedDivJoinMap = std::map<const Value *, SmallBlockVec>;
-
-  // Actual function performing the checks.
-  auto CheckDivergenceFunc = [this](Function &F,
-                                    InducedDivJoinMap &ExpectedDivJoins) {
-    for (auto &ItCase : ExpectedDivJoins) {
-      auto *DivVal = ItCase.first;
-      auto DA = buildDA(F, false);
-      DA.markDivergent(*DivVal);
-      DA.compute();
-
-      // List of basic blocks that shall host divergent Phi nodes.
-      auto ItDivJoins = ItCase.second.begin();
-
-      for (auto &BB : F) {
-        auto *Phi = dyn_cast<PHINode>(BB.begin());
-        if (!Phi)
-          continue;
-
-        if (ItDivJoins != ItCase.second.end() && &BB == *ItDivJoins) {
-          EXPECT_TRUE(DA.isDivergent(*Phi));
-          // Advance to next block with expected divergent PHI node.
-          ++ItDivJoins;
-        } else {
-          EXPECT_FALSE(DA.isDivergent(*Phi));
-        }
-      }
-    }
-  };
-
-  {
-    auto *F = M->getFunction("f_1");
-    auto ItBlocks = F->begin();
-    ItBlocks++; // Skip A
-    ItBlocks++; // Skip B
-    auto *C = &*ItBlocks++;
-    auto *D = &*ItBlocks++;
-    auto *E = &*ItBlocks;
-
-    auto ItArg = F->arg_begin();
-    auto *AArg = &*ItArg++;
-    auto *BArg = &*ItArg++;
-    auto *CArg = &*ItArg;
-
-    InducedDivJoinMap DivJoins;
-    DivJoins.emplace(AArg, SmallBlockVec({C, D, E}));
-    DivJoins.emplace(BArg, SmallBlockVec({D, E}));
-    DivJoins.emplace(CArg, SmallBlockVec({E}));
-
-    CheckDivergenceFunc(*F, DivJoins);
-  }
-
-  {
-    auto *F = M->getFunction("f_2");
-    auto ItBlocks = F->begin();
-    ItBlocks++; // Skip A
-    ItBlocks++; // Skip B
-    ItBlocks++; // Skip C
-    auto *D = &*ItBlocks++;
-    auto *E = &*ItBlocks;
-
-    auto ItArg = F->arg_begin();
-    auto *AArg = &*ItArg++;
-    auto *BArg = &*ItArg++;
-    auto *CArg = &*ItArg;
-
-    InducedDivJoinMap DivJoins;
-    DivJoins.emplace(AArg, SmallBlockVec({E}));
-    DivJoins.emplace(BArg, SmallBlockVec({D}));
-    DivJoins.emplace(CArg, SmallBlockVec({}));
-
-    CheckDivergenceFunc(*F, DivJoins);
-  }
-
-  {
-    auto *F = M->getFunction("f_3");
-    auto ItBlocks = F->begin();
-    ItBlocks++; // Skip A
-    ItBlocks++; // Skip B
-    auto *C = &*ItBlocks++;
-    ItBlocks++; // Skip D
-    auto *E = &*ItBlocks;
-
-    auto ItArg = F->arg_begin();
-    auto *AArg = &*ItArg++;
-    auto *BArg = &*ItArg++;
-    auto *CArg = &*ItArg;
-
-    InducedDivJoinMap DivJoins;
-    DivJoins.emplace(AArg, SmallBlockVec({C}));
-    DivJoins.emplace(BArg, SmallBlockVec({}));
-    DivJoins.emplace(CArg, SmallBlockVec({E}));
-
-    CheckDivergenceFunc(*F, DivJoins);
-  }
-}
-
-TEST_F(DivergenceAnalysisTest, DASwitchUnreachableDefault) {
-  LLVMContext C;
-  SMDiagnostic Err;
-
-  std::unique_ptr<Module> M = parseAssemblyString(
-      "target datalayout = \"e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128\" "
-      " "
-      "define void @switch_unreachable_default(i32 %cond) local_unnamed_addr { "
-      "entry: "
-      "  switch i32 %cond, label %sw.default [ "
-      "    i32 0, label %sw.bb0 "
-      "    i32 1, label %sw.bb1 "
-      "  ] "
-      " "
-      "sw.bb0: "
-      "  br label %sw.epilog "
-      " "
-      "sw.bb1: "
-      "  br label %sw.epilog "
-      " "
-      "sw.default: "
-      "  unreachable "
-      " "
-      "sw.epilog: "
-      "  %div.dbl = phi double [ 0.0, %sw.bb0], [ -1.0, %sw.bb1 ] "
-      "  ret void "
-      "}",
-      Err, C);
-
-  auto *F = M->getFunction("switch_unreachable_default");
-  auto &CondArg = *F->arg_begin();
-  auto DA = buildDA(*F, false);
-
-  EXPECT_FALSE(DA.hasDetectedDivergence());
-
-  DA.markDivergent(CondArg);
-  DA.compute();
-
-  // Still %CondArg is divergent.
-  EXPECT_TRUE(DA.hasDetectedDivergence());
-
-  // The join uni.dbl is not divergent (see D52221)
-  auto &ExitBlock = *GetBlockByName("sw.epilog", *F);
-  auto &DivDblPhi = *cast<PHINode>(ExitBlock.begin());
-  EXPECT_TRUE(DA.isDivergent(DivDblPhi));
-}
-
-} // end anonymous namespace
-} // end namespace llvm
diff --git a/gnu/llvm/llvm/unittests/Analysis/DomTreeUpdaterTest.cpp b/gnu/llvm/llvm/unittests/Analysis/DomTreeUpdaterTest.cpp
deleted file mode 100644
index 4a5e2d73f96..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/DomTreeUpdaterTest.cpp
+++ /dev/null
@@ -1,794 +0,0 @@
-//===- DomTreeUpdaterTest.cpp - DomTreeUpdater unit tests -----------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/DomTreeUpdater.h"
-#include "llvm/Analysis/PostDominators.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/Dominators.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-#include <algorithm>
-
-using namespace llvm;
-
-static std::unique_ptr<Module> makeLLVMModule(LLVMContext &Context,
-                                              StringRef ModuleStr) {
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M = parseAssemblyString(ModuleStr, Err, Context);
-  assert(M && "Bad LLVM IR?");
-  return M;
-}
-
-TEST(DomTreeUpdater, EagerUpdateBasicOperations) {
-  StringRef FuncName = "f";
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %i, i32 *%p) {
-                          bb0:
-                             store i32 %i, i32 *%p
-                             switch i32 %i, label %bb1 [
-                               i32 1, label %bb2
-                               i32 2, label %bb3
-                             ]
-                          bb1:
-                             ret i32 1
-                          bb2:
-                             ret i32 2
-                          bb3:
-                             ret i32 3
-                          })";
-  // Make the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-  Function *F = M->getFunction(FuncName);
-
-  // Make the DomTreeUpdater.
-  DominatorTree DT(*F);
-  PostDominatorTree PDT(*F);
-  DomTreeUpdater DTU(DT, PDT, DomTreeUpdater::UpdateStrategy::Eager);
-
-  ASSERT_TRUE(DTU.hasDomTree());
-  ASSERT_TRUE(DTU.hasPostDomTree());
-  ASSERT_TRUE(DTU.isEager());
-  ASSERT_FALSE(DTU.isLazy());
-  ASSERT_TRUE(DTU.getDomTree().verify());
-  ASSERT_TRUE(DTU.getPostDomTree().verify());
-  ASSERT_FALSE(DTU.hasPendingUpdates());
-
-  Function::iterator FI = F->begin();
-  BasicBlock *BB0 = &*FI++;
-  BasicBlock *BB1 = &*FI++;
-  BasicBlock *BB2 = &*FI++;
-  BasicBlock *BB3 = &*FI++;
-  SwitchInst *SI = dyn_cast<SwitchInst>(BB0->getTerminator());
-  ASSERT_NE(SI, nullptr) << "Couldn't get SwitchInst.";
-
-  DTU.applyUpdatesPermissive(
-      {{DominatorTree::Insert, BB0, BB0}, {DominatorTree::Delete, BB0, BB0}});
-  ASSERT_FALSE(DTU.hasPendingUpdates());
-
-  // Delete edge bb0 -> bb3 and push the update twice to verify duplicate
-  // entries are discarded.
-  std::vector<DominatorTree::UpdateType> Updates;
-  Updates.reserve(4);
-  Updates.push_back({DominatorTree::Delete, BB0, BB3});
-  Updates.push_back({DominatorTree::Delete, BB0, BB3});
-
-  // Invalid Insert: no edge bb1 -> bb2 after change to bb0.
-  Updates.push_back({DominatorTree::Insert, BB1, BB2});
-  // Invalid Delete: edge exists bb0 -> bb1 after change to bb0.
-  Updates.push_back({DominatorTree::Delete, BB0, BB1});
-
-  // CFG Change: remove edge bb0 -> bb3.
-  EXPECT_EQ(BB0->getTerminator()->getNumSuccessors(), 3u);
-  BB3->removePredecessor(BB0);
-  for (auto i = SI->case_begin(), e = SI->case_end(); i != e; ++i) {
-    if (i->getCaseSuccessor() == BB3) {
-      SI->removeCase(i);
-      break;
-    }
-  }
-  EXPECT_EQ(BB0->getTerminator()->getNumSuccessors(), 2u);
-  // Deletion of a BasicBlock is an immediate event. We remove all uses to the
-  // contained Instructions and change the Terminator to "unreachable" when
-  // queued for deletion.
-  ASSERT_FALSE(isa<UnreachableInst>(BB3->getTerminator()));
-  EXPECT_FALSE(DTU.isBBPendingDeletion(BB3));
-  DTU.applyUpdatesPermissive(Updates);
-  ASSERT_FALSE(DTU.hasPendingUpdates());
-
-  // Invalid Insert: no edge bb1 -> bb2 after change to bb0.
-  // Invalid Delete: edge exists bb0 -> bb1 after change to bb0.
-  DTU.applyUpdatesPermissive(
-      {{DominatorTree::Insert, BB1, BB2}, {DominatorTree::Delete, BB0, BB1}});
-
-  // DTU working with Eager UpdateStrategy does not need to flush.
-  ASSERT_TRUE(DT.verify());
-  ASSERT_TRUE(PDT.verify());
-
-  // Test callback utils.
-  ASSERT_EQ(BB3->getParent(), F);
-  DTU.callbackDeleteBB(BB3,
-                       [&F](BasicBlock *BB) { ASSERT_NE(BB->getParent(), F); });
-
-  ASSERT_TRUE(DT.verify());
-  ASSERT_TRUE(PDT.verify());
-  ASSERT_FALSE(DTU.hasPendingUpdates());
-
-  // Unnecessary flush() test
-  DTU.flush();
-  EXPECT_TRUE(DT.verify());
-  EXPECT_TRUE(PDT.verify());
-
-  // Remove all case branch to BB2 to test Eager recalculation.
-  // Code section from llvm::ConstantFoldTerminator
-  for (auto i = SI->case_begin(), e = SI->case_end(); i != e;) {
-    if (i->getCaseSuccessor() == BB2) {
-      // Remove this entry.
-      BB2->removePredecessor(BB0);
-      i = SI->removeCase(i);
-      e = SI->case_end();
-    } else
-      ++i;
-  }
-  ASSERT_FALSE(DT.verify());
-  ASSERT_FALSE(PDT.verify());
-  DTU.recalculate(*F);
-  ASSERT_TRUE(DT.verify());
-  ASSERT_TRUE(PDT.verify());
-}
-
-TEST(DomTreeUpdater, EagerUpdateReplaceEntryBB) {
-  StringRef FuncName = "f";
-  StringRef ModuleString = R"(
-                           define i32 @f() {
-                           bb0:
-                              br label %bb1
-                            bb1:
-                              ret i32 1
-                           }
-                           )";
-  // Make the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-  Function *F = M->getFunction(FuncName);
-
-  // Make the DTU.
-  DominatorTree DT(*F);
-  PostDominatorTree PDT(*F);
-  DomTreeUpdater DTU(DT, PDT, DomTreeUpdater::UpdateStrategy::Eager);
-  ASSERT_TRUE(DTU.hasDomTree());
-  ASSERT_TRUE(DTU.hasPostDomTree());
-  ASSERT_TRUE(DTU.isEager());
-  ASSERT_FALSE(DTU.isLazy());
-  ASSERT_TRUE(DT.verify());
-  ASSERT_TRUE(PDT.verify());
-
-  Function::iterator FI = F->begin();
-  BasicBlock *BB0 = &*FI++;
-  BasicBlock *BB1 = &*FI++;
-
-  // Add a block as the new function entry BB. We also link it to BB0.
-  BasicBlock *NewEntry =
-      BasicBlock::Create(F->getContext(), "new_entry", F, BB0);
-  BranchInst::Create(BB0, NewEntry);
-  EXPECT_EQ(F->begin()->getName(), NewEntry->getName());
-  EXPECT_TRUE(&F->getEntryBlock() == NewEntry);
-
-  DTU.applyUpdates({{DominatorTree::Insert, NewEntry, BB0}});
-
-  // Changing the Entry BB requires a full recalculation of DomTree.
-  DTU.recalculate(*F);
-  ASSERT_TRUE(DT.verify());
-  ASSERT_TRUE(PDT.verify());
-
-  // CFG Change: remove new_edge -> bb0 and redirect to new_edge -> bb1.
-  EXPECT_EQ(NewEntry->getTerminator()->getNumSuccessors(), 1u);
-  NewEntry->getTerminator()->eraseFromParent();
-  BranchInst::Create(BB1, NewEntry);
-  EXPECT_EQ(BB0->getTerminator()->getNumSuccessors(), 1u);
-
-  // Update the DTU. At this point bb0 now has no predecessors but is still a
-  // Child of F.
-  DTU.applyUpdates({{DominatorTree::Delete, NewEntry, BB0},
-                    {DominatorTree::Insert, NewEntry, BB1}});
-  ASSERT_TRUE(DT.verify());
-  ASSERT_TRUE(PDT.verify());
-
-  // Now remove bb0 from F.
-  ASSERT_FALSE(isa<UnreachableInst>(BB0->getTerminator()));
-  EXPECT_FALSE(DTU.isBBPendingDeletion(BB0));
-  DTU.deleteBB(BB0);
-  ASSERT_TRUE(DT.verify());
-  ASSERT_TRUE(PDT.verify());
-}
-
-TEST(DomTreeUpdater, LazyUpdateDTBasicOperations) {
-  StringRef FuncName = "f";
-  StringRef ModuleString = R"(
-                           define i32 @f(i32 %i, i32 *%p) {
-                            bb0:
-                              store i32 %i, i32 *%p
-                              switch i32 %i, label %bb1 [
-                                i32 0, label %bb2
-                                i32 1, label %bb2
-                                i32 2, label %bb3
-                              ]
-                            bb1:
-                              ret i32 1
-                            bb2:
-                              ret i32 2
-                            bb3:
-                              ret i32 3
-                           }
-                           )";
-  // Make the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-  Function *F = M->getFunction(FuncName);
-
-  // Make the DTU.
-  DominatorTree DT(*F);
-  PostDominatorTree *PDT = nullptr;
-  DomTreeUpdater DTU(&DT, PDT, DomTreeUpdater::UpdateStrategy::Lazy);
-  ASSERT_TRUE(DTU.hasDomTree());
-  ASSERT_FALSE(DTU.hasPostDomTree());
-  ASSERT_FALSE(DTU.isEager());
-  ASSERT_TRUE(DTU.isLazy());
-  ASSERT_TRUE(DTU.getDomTree().verify());
-
-  Function::iterator FI = F->begin();
-  BasicBlock *BB0 = &*FI++;
-  BasicBlock *BB1 = &*FI++;
-  BasicBlock *BB2 = &*FI++;
-  BasicBlock *BB3 = &*FI++;
-
-  // Test discards of self-domination update.
-  DTU.applyUpdatesPermissive({{DominatorTree::Insert, BB0, BB0}});
-  ASSERT_FALSE(DTU.hasPendingDomTreeUpdates());
-
-  // Delete edge bb0 -> bb3 and push the update twice to verify duplicate
-  // entries are discarded.
-  std::vector<DominatorTree::UpdateType> Updates;
-  Updates.reserve(4);
-  Updates.push_back({DominatorTree::Delete, BB0, BB3});
-  Updates.push_back({DominatorTree::Delete, BB0, BB3});
-
-  // Invalid Insert: no edge bb1 -> bb2 after change to bb0.
-  Updates.push_back({DominatorTree::Insert, BB1, BB2});
-  // Invalid Delete: edge exists bb0 -> bb1 after change to bb0.
-  Updates.push_back({DominatorTree::Delete, BB0, BB1});
-
-  // CFG Change: remove edge bb0 -> bb3 and one duplicate edge bb0 -> bb2.
-  EXPECT_EQ(BB0->getTerminator()->getNumSuccessors(), 4u);
-  BB0->getTerminator()->eraseFromParent();
-  BranchInst::Create(BB1, BB2, ConstantInt::getTrue(F->getContext()), BB0);
-  EXPECT_EQ(BB0->getTerminator()->getNumSuccessors(), 2u);
-
-  // Verify. Updates to DTU must be applied *after* all changes to the CFG
-  // (including block deletion).
-  DTU.applyUpdatesPermissive(Updates);
-  ASSERT_TRUE(DTU.getDomTree().verify());
-
-  // Deletion of a BasicBlock is an immediate event. We remove all uses to the
-  // contained Instructions and change the Terminator to "unreachable" when
-  // queued for deletion. Its parent is still F until all the pending updates
-  // are applied to all trees held by the DomTreeUpdater (DomTree/PostDomTree).
-  // We don't defer this action because it can cause problems for other
-  // transforms or analysis as it's part of the actual CFG. We only defer
-  // updates to the DominatorTrees. This code will crash if it is placed before
-  // the BranchInst::Create() call above. After a deletion of a BasicBlock. Only
-  // an explicit flush event can trigger the flushing of deleteBBs. Because some
-  // passes using Lazy UpdateStrategy rely on this behavior.
-
-  ASSERT_FALSE(isa<UnreachableInst>(BB3->getTerminator()));
-  EXPECT_FALSE(DTU.isBBPendingDeletion(BB3));
-  EXPECT_FALSE(DTU.hasPendingDeletedBB());
-  DTU.deleteBB(BB3);
-  EXPECT_TRUE(DTU.isBBPendingDeletion(BB3));
-  EXPECT_TRUE(DTU.hasPendingDeletedBB());
-  ASSERT_TRUE(isa<UnreachableInst>(BB3->getTerminator()));
-  EXPECT_EQ(BB3->getParent(), F);
-  DTU.recalculate(*F);
-  EXPECT_FALSE(DTU.hasPendingDeletedBB());
-}
-
-TEST(DomTreeUpdater, LazyUpdateDTInheritedPreds) {
-  StringRef FuncName = "f";
-  StringRef ModuleString = R"(
-                           define i32 @f(i32 %i, i32 *%p) {
-                            bb0:
-                              store i32 %i, i32 *%p
-                              switch i32 %i, label %bb1 [
-                                i32 2, label %bb2
-                                i32 3, label %bb3
-                              ]
-                            bb1:
-                              br label %bb3
-                            bb2:
-                              br label %bb3
-                            bb3:
-                              ret i32 3
-                           }
-                           )";
-  // Make the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-  Function *F = M->getFunction(FuncName);
-
-  // Make the DTU.
-  DominatorTree DT(*F);
-  PostDominatorTree *PDT = nullptr;
-  DomTreeUpdater DTU(&DT, PDT, DomTreeUpdater::UpdateStrategy::Lazy);
-  ASSERT_TRUE(DTU.hasDomTree());
-  ASSERT_FALSE(DTU.hasPostDomTree());
-  ASSERT_FALSE(DTU.isEager());
-  ASSERT_TRUE(DTU.isLazy());
-  ASSERT_TRUE(DTU.getDomTree().verify());
-
-  Function::iterator FI = F->begin();
-  BasicBlock *BB0 = &*FI++;
-  BasicBlock *BB1 = &*FI++;
-  BasicBlock *BB2 = &*FI++;
-  BasicBlock *BB3 = &*FI++;
-
-  // There are several CFG locations where we have:
-  //
-  //   pred1..predN
-  //    |        |
-  //    +> curr <+    converted into:   pred1..predN curr
-  //        |                            |        |
-  //        v                            +> succ <+
-  //       succ
-  //
-  // There is a specific shape of this we have to be careful of:
-  //
-  //   pred1..predN
-  //   ||        |
-  //   |+> curr <+    converted into:   pred1..predN curr
-  //   |    |                            |        |
-  //   |    v                            +> succ <+
-  //   +-> succ
-  //
-  // While the final CFG form is functionally identical the updates to
-  // DTU are not. In the first case we must have
-  // DTU.applyUpdates({{DominatorTree::Insert, Pred1, Succ}}) while in
-  // the latter case we must *NOT* have
-  // DTU.applyUpdates({{DominatorTree::Insert, Pred1, Succ}}).
-
-  // CFG Change: bb0 now only has bb0 -> bb1 and bb0 -> bb3. We are preparing to
-  // remove bb2.
-  EXPECT_EQ(BB0->getTerminator()->getNumSuccessors(), 3u);
-  BB0->getTerminator()->eraseFromParent();
-  BranchInst::Create(BB1, BB3, ConstantInt::getTrue(F->getContext()), BB0);
-  EXPECT_EQ(BB0->getTerminator()->getNumSuccessors(), 2u);
-
-  // Test callback utils.
-  std::vector<BasicBlock *> BasicBlocks;
-  BasicBlocks.push_back(BB1);
-  BasicBlocks.push_back(BB2);
-  auto Eraser = [&](BasicBlock *BB) {
-    BasicBlocks.erase(
-        std::remove_if(BasicBlocks.begin(), BasicBlocks.end(),
-                       [&](const BasicBlock *i) { return i == BB; }),
-        BasicBlocks.end());
-  };
-  ASSERT_EQ(BasicBlocks.size(), static_cast<size_t>(2));
-  // Remove bb2 from F. This has to happen before the call to
-  // applyUpdates() for DTU to detect there is no longer an edge between
-  // bb2 -> bb3. The deleteBB() method converts bb2's TI into "unreachable".
-  ASSERT_FALSE(isa<UnreachableInst>(BB2->getTerminator()));
-  EXPECT_FALSE(DTU.isBBPendingDeletion(BB2));
-  DTU.callbackDeleteBB(BB2, Eraser);
-  EXPECT_TRUE(DTU.isBBPendingDeletion(BB2));
-  ASSERT_TRUE(isa<UnreachableInst>(BB2->getTerminator()));
-  EXPECT_EQ(BB2->getParent(), F);
-
-  // Queue up the DTU updates.
-  std::vector<DominatorTree::UpdateType> Updates;
-  Updates.reserve(4);
-  Updates.push_back({DominatorTree::Delete, BB0, BB2});
-  Updates.push_back({DominatorTree::Delete, BB2, BB3});
-
-  // Handle the specific shape case next.
-  // CFG Change: bb0 now only branches to bb3. We are preparing to remove bb1.
-  EXPECT_EQ(BB0->getTerminator()->getNumSuccessors(), 2u);
-  BB0->getTerminator()->eraseFromParent();
-  BranchInst::Create(BB3, BB0);
-  EXPECT_EQ(BB0->getTerminator()->getNumSuccessors(), 1u);
-
-  // Remove bb1 from F. This has to happen before the call to
-  // applyUpdates() for DTU to detect there is no longer an edge between
-  // bb1 -> bb3. The deleteBB() method converts bb1's TI into "unreachable".
-  ASSERT_FALSE(isa<UnreachableInst>(BB1->getTerminator()));
-  EXPECT_FALSE(DTU.isBBPendingDeletion(BB1));
-  DTU.callbackDeleteBB(BB1, Eraser);
-  EXPECT_TRUE(DTU.isBBPendingDeletion(BB1));
-  ASSERT_TRUE(isa<UnreachableInst>(BB1->getTerminator()));
-  EXPECT_EQ(BB1->getParent(), F);
-
-  // Update the DTU. In this case we don't submit {DominatorTree::Insert, BB0,
-  // BB3} because the edge previously existed at the start of this test when DT
-  // was first created.
-  Updates.push_back({DominatorTree::Delete, BB0, BB1});
-  Updates.push_back({DominatorTree::Delete, BB1, BB3});
-
-  // Verify everything.
-  DTU.applyUpdatesPermissive(Updates);
-  ASSERT_EQ(BasicBlocks.size(), static_cast<size_t>(2));
-  DTU.flush();
-  ASSERT_EQ(BasicBlocks.size(), static_cast<size_t>(0));
-  ASSERT_TRUE(DT.verify());
-}
-
-TEST(DomTreeUpdater, LazyUpdateBasicOperations) {
-  StringRef FuncName = "f";
-  StringRef ModuleString = R"(
-                           define i32 @f(i32 %i, i32 *%p) {
-                            bb0:
-                              store i32 %i, i32 *%p
-                              switch i32 %i, label %bb1 [
-                                i32 0, label %bb2
-                                i32 1, label %bb2
-                                i32 2, label %bb3
-                              ]
-                            bb1:
-                              ret i32 1
-                            bb2:
-                              ret i32 2
-                            bb3:
-                              ret i32 3
-                           }
-                           )";
-  // Make the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-  Function *F = M->getFunction(FuncName);
-
-  // Make the DTU.
-  DominatorTree DT(*F);
-  PostDominatorTree PDT(*F);
-  DomTreeUpdater DTU(&DT, &PDT, DomTreeUpdater::UpdateStrategy::Lazy);
-  ASSERT_TRUE(DTU.hasDomTree());
-  ASSERT_TRUE(DTU.hasPostDomTree());
-  ASSERT_FALSE(DTU.isEager());
-  ASSERT_TRUE(DTU.isLazy());
-  ASSERT_TRUE(DTU.getDomTree().verify());
-  ASSERT_TRUE(DTU.getPostDomTree().verify());
-
-  Function::iterator FI = F->begin();
-  BasicBlock *BB0 = &*FI++;
-  BasicBlock *BB1 = &*FI++;
-  BasicBlock *BB2 = &*FI++;
-  BasicBlock *BB3 = &*FI++;
-  // Test discards of self-domination update.
-  DTU.applyUpdates({{DominatorTree::Delete, BB0, BB0}});
-
-  // Delete edge bb0 -> bb3 and push the update twice to verify duplicate
-  // entries are discarded.
-  std::vector<DominatorTree::UpdateType> Updates;
-  Updates.reserve(4);
-  Updates.push_back({DominatorTree::Delete, BB0, BB3});
-  Updates.push_back({DominatorTree::Delete, BB0, BB3});
-
-  // Unnecessary Insert: no edge bb1 -> bb2 after change to bb0.
-  Updates.push_back({DominatorTree::Insert, BB1, BB2});
-  // Unnecessary Delete: edge exists bb0 -> bb1 after change to bb0.
-  Updates.push_back({DominatorTree::Delete, BB0, BB1});
-
-  // CFG Change: remove edge bb0 -> bb3 and one duplicate edge bb0 -> bb2.
-  EXPECT_EQ(BB0->getTerminator()->getNumSuccessors(), 4u);
-  BB0->getTerminator()->eraseFromParent();
-  BranchInst::Create(BB1, BB2, ConstantInt::getTrue(F->getContext()), BB0);
-  EXPECT_EQ(BB0->getTerminator()->getNumSuccessors(), 2u);
-
-  // Deletion of a BasicBlock is an immediate event. We remove all uses to the
-  // contained Instructions and change the Terminator to "unreachable" when
-  // queued for deletion. Its parent is still F until DTU.flushDomTree is
-  // called. We don't defer this action because it can cause problems for other
-  // transforms or analysis as it's part of the actual CFG. We only defer
-  // updates to the DominatorTree. This code will crash if it is placed before
-  // the BranchInst::Create() call above.
-  bool CallbackFlag = false;
-  ASSERT_FALSE(isa<UnreachableInst>(BB3->getTerminator()));
-  EXPECT_FALSE(DTU.isBBPendingDeletion(BB3));
-  DTU.callbackDeleteBB(BB3, [&](BasicBlock *) { CallbackFlag = true; });
-  EXPECT_TRUE(DTU.isBBPendingDeletion(BB3));
-  ASSERT_TRUE(isa<UnreachableInst>(BB3->getTerminator()));
-  EXPECT_EQ(BB3->getParent(), F);
-
-  // Verify. Updates to DTU must be applied *after* all changes to the CFG
-  // (including block deletion).
-  DTU.applyUpdatesPermissive(Updates);
-  ASSERT_TRUE(DTU.getDomTree().verify());
-  ASSERT_TRUE(DTU.hasPendingUpdates());
-  ASSERT_TRUE(DTU.hasPendingPostDomTreeUpdates());
-  ASSERT_FALSE(DTU.hasPendingDomTreeUpdates());
-  ASSERT_TRUE(DTU.hasPendingDeletedBB());
-  ASSERT_TRUE(DTU.getPostDomTree().verify());
-  ASSERT_FALSE(DTU.hasPendingUpdates());
-  ASSERT_FALSE(DTU.hasPendingPostDomTreeUpdates());
-  ASSERT_FALSE(DTU.hasPendingDomTreeUpdates());
-  ASSERT_FALSE(DTU.hasPendingDeletedBB());
-  ASSERT_EQ(CallbackFlag, true);
-}
-
-TEST(DomTreeUpdater, LazyUpdateReplaceEntryBB) {
-  StringRef FuncName = "f";
-  StringRef ModuleString = R"(
-                           define i32 @f() {
-                           bb0:
-                              br label %bb1
-                            bb1:
-                              ret i32 1
-                           }
-                           )";
-  // Make the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-  Function *F = M->getFunction(FuncName);
-
-  // Make the DTU.
-  DominatorTree DT(*F);
-  PostDominatorTree PDT(*F);
-  DomTreeUpdater DTU(DT, PDT, DomTreeUpdater::UpdateStrategy::Lazy);
-  ASSERT_TRUE(DTU.hasDomTree());
-  ASSERT_TRUE(DTU.hasPostDomTree());
-  ASSERT_FALSE(DTU.isEager());
-  ASSERT_TRUE(DTU.isLazy());
-  ASSERT_TRUE(DTU.getDomTree().verify());
-  ASSERT_TRUE(DTU.getPostDomTree().verify());
-
-  Function::iterator FI = F->begin();
-  BasicBlock *BB0 = &*FI++;
-  BasicBlock *BB1 = &*FI++;
-
-  // Add a block as the new function entry BB. We also link it to BB0.
-  BasicBlock *NewEntry =
-      BasicBlock::Create(F->getContext(), "new_entry", F, BB0);
-  BranchInst::Create(BB0, NewEntry);
-  EXPECT_EQ(F->begin()->getName(), NewEntry->getName());
-  EXPECT_TRUE(&F->getEntryBlock() == NewEntry);
-
-  // Insert the new edge between new_entry -> bb0. Without this the
-  // recalculate() call below will not actually recalculate the DT as there
-  // are no changes pending and no blocks deleted.
-  DTU.applyUpdates({{DominatorTree::Insert, NewEntry, BB0}});
-
-  // Changing the Entry BB requires a full recalculation.
-  DTU.recalculate(*F);
-  ASSERT_TRUE(DTU.getDomTree().verify());
-  ASSERT_TRUE(DTU.getPostDomTree().verify());
-
-  // CFG Change: remove new_edge -> bb0 and redirect to new_edge -> bb1.
-  EXPECT_EQ(NewEntry->getTerminator()->getNumSuccessors(), 1u);
-  NewEntry->getTerminator()->eraseFromParent();
-  BranchInst::Create(BB1, NewEntry);
-  EXPECT_EQ(BB0->getTerminator()->getNumSuccessors(), 1u);
-
-  // Update the DTU. At this point bb0 now has no predecessors but is still a
-  // Child of F.
-  DTU.applyUpdates({{DominatorTree::Delete, NewEntry, BB0},
-                    {DominatorTree::Insert, NewEntry, BB1}});
-  DTU.flush();
-  ASSERT_TRUE(DT.verify());
-  ASSERT_TRUE(PDT.verify());
-
-  // Now remove bb0 from F.
-  ASSERT_FALSE(isa<UnreachableInst>(BB0->getTerminator()));
-  EXPECT_FALSE(DTU.isBBPendingDeletion(BB0));
-  DTU.deleteBB(BB0);
-  EXPECT_TRUE(DTU.isBBPendingDeletion(BB0));
-  ASSERT_TRUE(isa<UnreachableInst>(BB0->getTerminator()));
-  EXPECT_EQ(BB0->getParent(), F);
-
-  // Perform a full recalculation of the DTU. It is not necessary here but we
-  // do this to test the case when there are no pending DT updates but there are
-  // pending deleted BBs.
-  ASSERT_TRUE(DTU.hasPendingDeletedBB());
-  DTU.recalculate(*F);
-  ASSERT_FALSE(DTU.hasPendingDeletedBB());
-}
-
-TEST(DomTreeUpdater, LazyUpdateStepTest) {
-  // This test focus on testing a DTU holding both trees applying multiple
-  // updates and DT/PDT not flushed together.
-  StringRef FuncName = "f";
-  StringRef ModuleString = R"(
-                           define i32 @f(i32 %i, i32 *%p) {
-                            bb0:
-                              store i32 %i, i32 *%p
-                              switch i32 %i, label %bb1 [
-                                i32 0, label %bb1
-                                i32 1, label %bb2
-                                i32 2, label %bb3
-                                i32 3, label %bb1
-                              ]
-                            bb1:
-                              ret i32 1
-                            bb2:
-                              ret i32 2
-                            bb3:
-                              ret i32 3
-                           }
-                           )";
-  // Make the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-  Function *F = M->getFunction(FuncName);
-
-  // Make the DomTreeUpdater.
-  DominatorTree DT(*F);
-  PostDominatorTree PDT(*F);
-  DomTreeUpdater DTU(DT, PDT, DomTreeUpdater::UpdateStrategy::Lazy);
-
-  ASSERT_TRUE(DTU.hasDomTree());
-  ASSERT_TRUE(DTU.hasPostDomTree());
-  ASSERT_FALSE(DTU.isEager());
-  ASSERT_TRUE(DTU.isLazy());
-  ASSERT_TRUE(DTU.getDomTree().verify());
-  ASSERT_TRUE(DTU.getPostDomTree().verify());
-  ASSERT_FALSE(DTU.hasPendingUpdates());
-
-  Function::iterator FI = F->begin();
-  BasicBlock *BB0 = &*FI++;
-  FI++;
-  BasicBlock *BB2 = &*FI++;
-  BasicBlock *BB3 = &*FI++;
-  SwitchInst *SI = dyn_cast<SwitchInst>(BB0->getTerminator());
-  ASSERT_NE(SI, nullptr) << "Couldn't get SwitchInst.";
-
-  // Delete edge bb0 -> bb3.
-  std::vector<DominatorTree::UpdateType> Updates;
-  Updates.reserve(1);
-  Updates.push_back({DominatorTree::Delete, BB0, BB3});
-
-  // CFG Change: remove edge bb0 -> bb3.
-  EXPECT_EQ(BB0->getTerminator()->getNumSuccessors(), 5u);
-  BB3->removePredecessor(BB0);
-  for (auto i = SI->case_begin(), e = SI->case_end(); i != e; ++i) {
-    if (i->getCaseIndex() == 2) {
-      SI->removeCase(i);
-      break;
-    }
-  }
-  EXPECT_EQ(BB0->getTerminator()->getNumSuccessors(), 4u);
-  // Deletion of a BasicBlock is an immediate event. We remove all uses to the
-  // contained Instructions and change the Terminator to "unreachable" when
-  // queued for deletion.
-  ASSERT_FALSE(isa<UnreachableInst>(BB3->getTerminator()));
-  EXPECT_FALSE(DTU.isBBPendingDeletion(BB3));
-  DTU.applyUpdates(Updates);
-
-  // Only flush DomTree.
-  ASSERT_TRUE(DTU.getDomTree().verify());
-  ASSERT_TRUE(DTU.hasPendingPostDomTreeUpdates());
-  ASSERT_FALSE(DTU.hasPendingDomTreeUpdates());
-
-  ASSERT_EQ(BB3->getParent(), F);
-  DTU.deleteBB(BB3);
-
-  Updates.clear();
-
-  // Remove all case branch to BB2 to test Eager recalculation.
-  // Code section from llvm::ConstantFoldTerminator
-  for (auto i = SI->case_begin(), e = SI->case_end(); i != e;) {
-    if (i->getCaseSuccessor() == BB2) {
-      // Remove this entry.
-      BB2->removePredecessor(BB0);
-      i = SI->removeCase(i);
-      e = SI->case_end();
-      Updates.push_back({DominatorTree::Delete, BB0, BB2});
-    } else
-      ++i;
-  }
-
-  DTU.applyUpdatesPermissive(Updates);
-  // flush PostDomTree
-  ASSERT_TRUE(DTU.getPostDomTree().verify());
-  ASSERT_FALSE(DTU.hasPendingPostDomTreeUpdates());
-  ASSERT_TRUE(DTU.hasPendingDomTreeUpdates());
-  // flush both trees
-  DTU.flush();
-  ASSERT_TRUE(DT.verify());
-}
-
-TEST(DomTreeUpdater, NoTreeTest) {
-  StringRef FuncName = "f";
-  StringRef ModuleString = R"(
-                           define i32 @f() {
-                           bb0:
-                              ret i32 0
-                           }
-                           )";
-  // Make the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-  Function *F = M->getFunction(FuncName);
-
-  // Make the DTU.
-  DomTreeUpdater DTU(nullptr, nullptr, DomTreeUpdater::UpdateStrategy::Lazy);
-  ASSERT_FALSE(DTU.hasDomTree());
-  ASSERT_FALSE(DTU.hasPostDomTree());
-  Function::iterator FI = F->begin();
-  BasicBlock *BB0 = &*FI++;
-  // Test whether PendingDeletedBB is flushed after the recalculation.
-  DTU.deleteBB(BB0);
-  ASSERT_TRUE(DTU.hasPendingDeletedBB());
-  DTU.recalculate(*F);
-  ASSERT_FALSE(DTU.hasPendingDeletedBB());
-}
-
-TEST(DomTreeUpdater, LazyUpdateDeduplicationTest) {
-  StringRef FuncName = "f";
-  StringRef ModuleString = R"(
-                           define i32 @f() {
-                           bb0:
-                              br label %bb1
-                           bb1:
-                              ret i32 1
-                           bb2:
-                              ret i32 1
-                           }
-                           )";
-  // Make the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-  Function *F = M->getFunction(FuncName);
-
-  // Make the DTU.
-  DominatorTree DT(*F);
-  DomTreeUpdater DTU(&DT, nullptr, DomTreeUpdater::UpdateStrategy::Lazy);
-  ASSERT_TRUE(DTU.getDomTree().verify());
-
-  Function::iterator FI = F->begin();
-  BasicBlock *BB0 = &*FI++;
-  BasicBlock *BB1 = &*FI++;
-  BasicBlock *BB2 = &*FI++;
-
-  // CFG Change: remove bb0 -> bb1 and add back bb0 -> bb1.
-  EXPECT_EQ(BB0->getTerminator()->getNumSuccessors(), 1u);
-  BB0->getTerminator()->eraseFromParent();
-  BranchInst::Create(BB1, BB0);
-  EXPECT_EQ(BB0->getTerminator()->getNumSuccessors(), 1u);
-
-  // Update the DTU and simulate duplicates.
-  DTU.applyUpdatesPermissive({{DominatorTree::Delete, BB0, BB1},
-                              {DominatorTree::Delete, BB0, BB1},
-                              {DominatorTree::Insert, BB0, BB1},
-                              {DominatorTree::Insert, BB0, BB1},
-                              {DominatorTree::Insert, BB0, BB1}});
-
-  // The above operations result in a no-op.
-  ASSERT_FALSE(DTU.hasPendingUpdates());
-
-  // Update the DTU. Simulate an invalid update.
-  DTU.applyUpdatesPermissive({{DominatorTree::Delete, BB0, BB1}});
-  ASSERT_FALSE(DTU.hasPendingUpdates());
-
-  // CFG Change: remove bb0 -> bb1.
-  EXPECT_EQ(BB0->getTerminator()->getNumSuccessors(), 1u);
-  BB0->getTerminator()->eraseFromParent();
-
-  // Update the DTU and simulate invalid updates.
-  DTU.applyUpdatesPermissive({{DominatorTree::Delete, BB0, BB1},
-                              {DominatorTree::Insert, BB0, BB1},
-                              {DominatorTree::Delete, BB0, BB1},
-                              {DominatorTree::Insert, BB0, BB1},
-                              {DominatorTree::Insert, BB0, BB1}});
-  ASSERT_TRUE(DTU.hasPendingUpdates());
-
-  // CFG Change: add bb0 -> bb2.
-  BranchInst::Create(BB2, BB0);
-  EXPECT_EQ(BB0->getTerminator()->getNumSuccessors(), 1u);
-  DTU.applyUpdates({{DominatorTree::Insert, BB0, BB2}});
-  ASSERT_TRUE(DTU.getDomTree().verify());
-}
diff --git a/gnu/llvm/llvm/unittests/Analysis/FunctionPropertiesAnalysisTest.cpp b/gnu/llvm/llvm/unittests/Analysis/FunctionPropertiesAnalysisTest.cpp
deleted file mode 100644
index 7b2a985bba6..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/FunctionPropertiesAnalysisTest.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-//===- FunctionPropertiesAnalysisTest.cpp - Function Properties Unit Tests-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/FunctionPropertiesAnalysis.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Dominators.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-namespace {
-
-class FunctionPropertiesAnalysisTest : public testing::Test {
-protected:
-  std::unique_ptr<DominatorTree> DT;
-  std::unique_ptr<LoopInfo> LI;
-
-  FunctionPropertiesInfo buildFPI(Function &F) {
-    DT.reset(new DominatorTree(F));
-    LI.reset(new LoopInfo(*DT));
-    return FunctionPropertiesInfo::getFunctionPropertiesInfo(F, *LI);
-  }
-
-  std::unique_ptr<Module> makeLLVMModule(LLVMContext &C, const char *IR) {
-    SMDiagnostic Err;
-    std::unique_ptr<Module> Mod = parseAssemblyString(IR, Err, C);
-    if (!Mod)
-      Err.print("MLAnalysisTests", errs());
-    return Mod;
-  }
-};
-
-TEST_F(FunctionPropertiesAnalysisTest, BasicTest) {
-  LLVMContext C;
-  std::unique_ptr<Module> M = makeLLVMModule(C,
-                                             R"IR(
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-pc-linux-gnu"
-declare i32 @f1(i32)
-declare i32 @f2(i32)
-define i32 @branches(i32) {
-  %cond = icmp slt i32 %0, 3
-  br i1 %cond, label %then, label %else
-then:
-  %ret.1 = call i32 @f1(i32 %0)
-  br label %last.block
-else:
-  %ret.2 = call i32 @f2(i32 %0)
-  br label %last.block
-last.block:
-  %ret = phi i32 [%ret.1, %then], [%ret.2, %else]
-  ret i32 %ret
-}
-define internal i32 @top() {
-  %1 = call i32 @branches(i32 2)
-  %2 = call i32 @f1(i32 %1)
-  ret i32 %2
-}
-)IR");
-
-  Function *BranchesFunction = M->getFunction("branches");
-  FunctionPropertiesInfo BranchesFeatures = buildFPI(*BranchesFunction);
-  EXPECT_EQ(BranchesFeatures.BasicBlockCount, 4);
-  EXPECT_EQ(BranchesFeatures.BlocksReachedFromConditionalInstruction, 2);
-  // 2 Users: top is one. The other is added because @branches is not internal,
-  // so it may have external callers.
-  EXPECT_EQ(BranchesFeatures.Uses, 2);
-  EXPECT_EQ(BranchesFeatures.DirectCallsToDefinedFunctions, 0);
-  EXPECT_EQ(BranchesFeatures.LoadInstCount, 0);
-  EXPECT_EQ(BranchesFeatures.StoreInstCount, 0);
-  EXPECT_EQ(BranchesFeatures.MaxLoopDepth, 0);
-  EXPECT_EQ(BranchesFeatures.TopLevelLoopCount, 0);
-
-  Function *TopFunction = M->getFunction("top");
-  FunctionPropertiesInfo TopFeatures = buildFPI(*TopFunction);
-  EXPECT_EQ(TopFeatures.BasicBlockCount, 1);
-  EXPECT_EQ(TopFeatures.BlocksReachedFromConditionalInstruction, 0);
-  EXPECT_EQ(TopFeatures.Uses, 0);
-  EXPECT_EQ(TopFeatures.DirectCallsToDefinedFunctions, 1);
-  EXPECT_EQ(BranchesFeatures.LoadInstCount, 0);
-  EXPECT_EQ(BranchesFeatures.StoreInstCount, 0);
-  EXPECT_EQ(BranchesFeatures.MaxLoopDepth, 0);
-  EXPECT_EQ(BranchesFeatures.TopLevelLoopCount, 0);
-}
-} // end anonymous namespace
\ No newline at end of file
diff --git a/gnu/llvm/llvm/unittests/Analysis/GlobalsModRefTest.cpp b/gnu/llvm/llvm/unittests/Analysis/GlobalsModRefTest.cpp
deleted file mode 100644
index 5066d748e11..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/GlobalsModRefTest.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-//===--- GlobalsModRefTest.cpp - Mixed TBAA unit tests --------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/GlobalsModRef.h"
-#include "llvm/ADT/Triple.h"
-#include "llvm/Analysis/CallGraph.h"
-#include "llvm/Analysis/TargetLibraryInfo.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-TEST(GlobalsModRef, OptNone) {
-  StringRef Assembly = R"(
-    define void @f1() optnone {
-      ret void
-    }
-    define void @f2() optnone readnone {
-      ret void
-    }
-    define void @f3() optnone readonly {
-      ret void
-    }
-  )";
-
-  LLVMContext Context;
-  SMDiagnostic Error;
-  auto M = parseAssemblyString(Assembly, Error, Context);
-  ASSERT_TRUE(M) << "Bad assembly?";
-
-  const auto &funcs = M->functions();
-  auto I = funcs.begin();
-  ASSERT_NE(I, funcs.end());
-  const Function &F1 = *I;
-  ASSERT_NE(++I, funcs.end());
-  const Function &F2 = *I;
-  ASSERT_NE(++I, funcs.end());
-  const Function &F3 = *I;
-  EXPECT_EQ(++I, funcs.end());
-
-  Triple Trip(M->getTargetTriple());
-  TargetLibraryInfoImpl TLII(Trip);
-  TargetLibraryInfo TLI(TLII);
-  auto GetTLI = [&TLI](Function &F) -> TargetLibraryInfo & { return TLI; };
-  llvm::CallGraph CG(*M);
-
-  auto AAR = GlobalsAAResult::analyzeModule(*M, GetTLI, CG);
-
-  EXPECT_EQ(FMRB_UnknownModRefBehavior, AAR.getModRefBehavior(&F1));
-  EXPECT_EQ(FMRB_DoesNotAccessMemory, AAR.getModRefBehavior(&F2));
-  EXPECT_EQ(FMRB_OnlyReadsMemory, AAR.getModRefBehavior(&F3));
-}
diff --git a/gnu/llvm/llvm/unittests/Analysis/IRSimilarityIdentifierTest.cpp b/gnu/llvm/llvm/unittests/Analysis/IRSimilarityIdentifierTest.cpp
deleted file mode 100644
index 6bb6d7da228..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/IRSimilarityIdentifierTest.cpp
+++ /dev/null
@@ -1,2275 +0,0 @@
-//===- IRSimilarityIdentifierTest.cpp - IRSimilarityIdentifier unit tests -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Tests for components for finding similarity such as the instruction mapper,
-// suffix tree usage, and structural analysis.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/IRSimilarityIdentifier.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Support/Allocator.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace IRSimilarity;
-
-static std::unique_ptr<Module> makeLLVMModule(LLVMContext &Context,
-                                              StringRef ModuleStr) {
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M = parseAssemblyString(ModuleStr, Err, Context);
-  assert(M && "Bad LLVM IR?");
-  return M;
-}
-
-void getVectors(Module &M, IRInstructionMapper &Mapper,
-                std::vector<IRInstructionData *> &InstrList,
-                std::vector<unsigned> &UnsignedVec) {
-  for (Function &F : M)
-    for (BasicBlock &BB : F)
-      Mapper.convertToUnsignedVec(BB, InstrList, UnsignedVec);
-}
-
-void getSimilarities(
-    Module &M,
-    std::vector<std::vector<IRSimilarityCandidate>> &SimilarityCandidates) {
-  IRSimilarityIdentifier Identifier;
-  SimilarityCandidates = Identifier.findSimilarity(M);
-}
-
-// Checks that different opcodes are mapped to different values
-TEST(IRInstructionMapper, OpcodeDifferentiation) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a, i32 %b) {
-                          bb0:
-                             %0 = add i32 %a, %b
-                             %1 = mul i32 %a, %b
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  // Check that the size of the unsigned vector and the instruction list are the
-  // same as a safety check.
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-
-  // Make sure that the unsigned vector is the expected size.
-  ASSERT_TRUE(UnsignedVec.size() == 3);
-
-  // Check whether the instructions are not mapped to the same value.
-  ASSERT_TRUE(UnsignedVec[0] != UnsignedVec[1]);
-}
-
-// Checks that the same opcodes and types are mapped to the same values.
-TEST(IRInstructionMapper, OpcodeTypeSimilarity) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a, i32 %b) {
-                          bb0:
-                             %0 = add i32 %a, %b
-                             %1 = add i32 %b, %a
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-  ASSERT_TRUE(UnsignedVec.size() == 3);
-
-  // Check whether the instructions are mapped to the same value.
-  ASSERT_TRUE(UnsignedVec[0] == UnsignedVec[1]);
-}
-
-// Checks that the same opcode and different types are mapped to different
-// values.
-TEST(IRInstructionMapper, TypeDifferentiation) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a, i32 %b, i64 %c, i64 %d) {
-                          bb0:
-                             %0 = add i32 %a, %b
-                             %1 = add i64 %c, %d
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-  ASSERT_TRUE(UnsignedVec.size() == 3);
-  ASSERT_TRUE(UnsignedVec[0] != UnsignedVec[1]);
-}
-
-// Checks that different predicates map to different values.
-TEST(IRInstructionMapper, PredicateDifferentiation) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a, i32 %b) {
-                          bb0:
-                             %0 = icmp sge i32 %b, %a
-                             %1 = icmp slt i32 %a, %b
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-  ASSERT_TRUE(UnsignedVec.size() == 3);
-  ASSERT_TRUE(UnsignedVec[0] != UnsignedVec[1]);
-}
-
-// Checks that predicates where that can be considered the same when the
-// operands are swapped, i.e. greater than to less than are mapped to the same
-// unsigned integer.
-TEST(IRInstructionMapper, PredicateIsomorphism) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a, i32 %b) {
-                          bb0:
-                             %0 = icmp sgt i32 %a, %b
-                             %1 = icmp slt i32 %b, %a
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-  ASSERT_TRUE(UnsignedVec.size() == 3);
-  ASSERT_TRUE(UnsignedVec[0] == UnsignedVec[1]);
-}
-
-// Checks that the same predicate maps to the same value.
-TEST(IRInstructionMapper, PredicateSimilarity) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a, i32 %b) {
-                          bb0:
-                             %0 = icmp slt i32 %a, %b
-                             %1 = icmp slt i32 %b, %a
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-  ASSERT_TRUE(UnsignedVec.size() == 3);
-  ASSERT_TRUE(UnsignedVec[0] == UnsignedVec[1]);
-}
-
-// Checks that the same predicate maps to the same value for floating point
-// CmpInsts.
-TEST(IRInstructionMapper, FPPredicateSimilarity) {
-  StringRef ModuleString = R"(
-                          define i32 @f(double %a, double %b) {
-                          bb0:
-                             %0 = fcmp olt double %a, %b
-                             %1 = fcmp olt double %b, %a
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-  ASSERT_TRUE(UnsignedVec.size() == 3);
-  ASSERT_TRUE(UnsignedVec[0] == UnsignedVec[1]);
-}
-
-// Checks that the different predicate maps to a different value for floating
-// point CmpInsts.
-TEST(IRInstructionMapper, FPPredicatDifference) {
-  StringRef ModuleString = R"(
-                          define i32 @f(double %a, double %b) {
-                          bb0:
-                             %0 = fcmp olt double %a, %b
-                             %1 = fcmp oge double %b, %a
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-  ASSERT_TRUE(UnsignedVec.size() == 3);
-  ASSERT_TRUE(UnsignedVec[0] != UnsignedVec[1]);
-}
-
-// Checks that the zexts that have the same type parameters map to the same
-// unsigned integer.
-TEST(IRInstructionMapper, ZextTypeSimilarity) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a) {
-                          bb0:
-                             %0 = zext i32  %a to i64
-                             %1 = zext i32  %a to i64
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-  ASSERT_TRUE(UnsignedVec.size() == 3);
-  ASSERT_TRUE(UnsignedVec[0] == UnsignedVec[1]);
-}
-
-// Checks that the sexts that have the same type parameters map to the same
-// unsigned integer.
-TEST(IRInstructionMapper, SextTypeSimilarity) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a) {
-                          bb0:
-                             %0 = sext i32  %a to i64
-                             %1 = sext i32  %a to i64
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-  ASSERT_TRUE(UnsignedVec.size() == 3);
-  ASSERT_TRUE(UnsignedVec[0] == UnsignedVec[1]);
-}
-
-// Checks that the zexts that have the different type parameters map to the
-// different unsigned integers.
-TEST(IRInstructionMapper, ZextTypeDifference) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a, i8 %b) {
-                          bb0:
-                             %0 = zext i32 %a to i64
-                             %1 = zext i8 %b to i32
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-  ASSERT_TRUE(UnsignedVec.size() == 3);
-  ASSERT_TRUE(UnsignedVec[0] != UnsignedVec[1]);
-}
-
-// Checks that the sexts that have the different type parameters map to the
-// different unsigned integers.
-TEST(IRInstructionMapper, SextTypeDifference) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a, i8 %b) {
-                          bb0:
-                             %0 = sext i32 %a to i64
-                             %1 = sext i8 %b to i32
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-  ASSERT_TRUE(UnsignedVec.size() == 3);
-  ASSERT_TRUE(UnsignedVec[0] != UnsignedVec[1]);
-}
-
-// Checks that loads that have the same type are mapped to the same unsigned
-// integer.
-TEST(IRInstructionMapper, LoadSimilarType) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32* %a, i32* %b) {
-                          bb0:
-                             %0 = load i32, i32* %a
-                             %1 = load i32, i32* %b
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-  ASSERT_TRUE(UnsignedVec.size() == 3);
-  ASSERT_TRUE(UnsignedVec[0] == UnsignedVec[1]);
-}
-
-// Checks that loads that have the different types are mapped to
-// different unsigned integers.
-TEST(IRInstructionMapper, LoadDifferentType) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32* %a, i64* %b) {
-                          bb0:
-                             %0 = load i32, i32* %a
-                             %1 = load i64, i64* %b
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-  ASSERT_TRUE(UnsignedVec.size() == 3);
-  ASSERT_TRUE(UnsignedVec[0] != UnsignedVec[1]);
-}
-
-// Checks that loads that have the different aligns are mapped to different
-// unsigned integers.
-TEST(IRInstructionMapper, LoadDifferentAlign) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32* %a, i32* %b) {
-                          bb0:
-                             %0 = load i32, i32* %a, align 4
-                             %1 = load i32, i32* %b, align 8
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-  ASSERT_TRUE(UnsignedVec.size() == 3);
-  ASSERT_TRUE(UnsignedVec[0] != UnsignedVec[1]);
-}
-
-// Checks that loads that have the different volatile settings are mapped to
-// different unsigned integers.
-TEST(IRInstructionMapper, LoadDifferentVolatile) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32* %a, i32* %b) {
-                          bb0:
-                             %0 = load volatile i32, i32* %a
-                             %1 = load i32, i32* %b
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-  ASSERT_TRUE(UnsignedVec.size() == 3);
-  ASSERT_TRUE(UnsignedVec[0] != UnsignedVec[1]);
-}
-
-// Checks that loads that have the same volatile settings are mapped to
-// different unsigned integers.
-TEST(IRInstructionMapper, LoadSameVolatile) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32* %a, i32* %b) {
-                          bb0:
-                             %0 = load volatile i32, i32* %a
-                             %1 = load volatile i32, i32* %b
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-  ASSERT_TRUE(UnsignedVec.size() == 3);
-  ASSERT_TRUE(UnsignedVec[0] == UnsignedVec[1]);
-}
-
-// Checks that loads that have the different atomicity settings are mapped to
-// different unsigned integers.
-TEST(IRInstructionMapper, LoadDifferentAtomic) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32* %a, i32* %b) {
-                          bb0:
-                             %0 = load atomic i32, i32* %a unordered, align 4
-                             %1 = load atomic i32, i32* %b monotonic, align 4
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-  ASSERT_TRUE(UnsignedVec.size() == 3);
-  ASSERT_TRUE(UnsignedVec[0] != UnsignedVec[1]);
-}
-
-// Checks that loads that have the same atomicity settings are mapped to
-// different unsigned integers.
-TEST(IRInstructionMapper, LoadSameAtomic) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32* %a, i32* %b) {
-                          bb0:
-                             %0 = load atomic i32, i32* %a unordered, align 4
-                             %1 = load atomic i32, i32* %b unordered, align 4
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-  ASSERT_TRUE(UnsignedVec.size() == 3);
-  ASSERT_TRUE(UnsignedVec[0] == UnsignedVec[1]);
-}
-
-// Checks that stores that have the same type are mapped to the same unsigned
-// integer.
-TEST(IRInstructionMapper, StoreSimilarType) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32* %a, i32* %b) {
-                          bb0:
-                             store i32 1, i32* %a
-                             store i32 2, i32* %a
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-  ASSERT_TRUE(UnsignedVec.size() == 3);
-  ASSERT_TRUE(UnsignedVec[0] == UnsignedVec[1]);
-}
-
-// Checks that stores that have the different types are mapped to
-// different unsigned integers.
-TEST(IRInstructionMapper, StoreDifferentType) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32* %a, i64* %b) {
-                          bb0:
-                             store i32 1, i32* %a
-                             store i64 1, i64* %b
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-  ASSERT_TRUE(UnsignedVec.size() == 3);
-  ASSERT_TRUE(UnsignedVec[0] != UnsignedVec[1]);
-}
-
-// Checks that stores that have the different aligns are mapped to different
-// unsigned integers.
-TEST(IRInstructionMapper, StoreDifferentAlign) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32* %a, i32* %b) {
-                          bb0:
-                             store i32 1, i32* %a, align 4
-                             store i32 1, i32* %b, align 8
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-  ASSERT_TRUE(UnsignedVec.size() == 3);
-  ASSERT_TRUE(UnsignedVec[0] != UnsignedVec[1]);
-}
-
-// Checks that stores that have the different volatile settings are mapped to
-// different unsigned integers.
-TEST(IRInstructionMapper, StoreDifferentVolatile) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32* %a, i32* %b) {
-                          bb0:
-                             store volatile i32 1, i32* %a
-                             store i32 1, i32* %b
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-  ASSERT_TRUE(UnsignedVec.size() == 3);
-  ASSERT_TRUE(UnsignedVec[0] != UnsignedVec[1]);
-}
-
-// Checks that stores that have the same volatile settings are mapped to
-// different unsigned integers.
-TEST(IRInstructionMapper, StoreSameVolatile) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32* %a, i32* %b) {
-                          bb0:
-                             store volatile i32 1, i32* %a
-                             store volatile i32 1, i32* %b
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-  ASSERT_TRUE(UnsignedVec.size() == 3);
-  ASSERT_TRUE(UnsignedVec[0] == UnsignedVec[1]);
-}
-
-// Checks that loads that have the same atomicity settings are mapped to
-// different unsigned integers.
-TEST(IRInstructionMapper, StoreSameAtomic) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32* %a, i32* %b) {
-                          bb0:
-                             store atomic i32 1, i32* %a unordered, align 4
-                             store atomic i32 1, i32* %b unordered, align 4
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-  ASSERT_TRUE(UnsignedVec.size() == 3);
-  ASSERT_TRUE(UnsignedVec[0] == UnsignedVec[1]);
-}
-
-// Checks that loads that have the different atomicity settings are mapped to
-// different unsigned integers.
-TEST(IRInstructionMapper, StoreDifferentAtomic) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32* %a, i32* %b) {
-                          bb0:
-                             store atomic i32 1, i32* %a unordered, align 4
-                             store atomic i32 1, i32* %b monotonic, align 4
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-  ASSERT_TRUE(UnsignedVec.size() == 3);
-  ASSERT_TRUE(UnsignedVec[0] != UnsignedVec[1]);
-}
-
-// In most cases, the illegal instructions we are collecting don't require any
-// sort of setup.  In these cases, we can just only have illegal instructions,
-// and the mapper will create 0 length vectors, and we can check that.
-
-// In cases where we have legal instructions needed to set up the illegal
-// instruction, to check illegal instructions are assigned unsigned integers
-// from the maximum value decreasing to 0, it will be greater than a legal
-// instruction that comes after.  So to check that we have an illegal
-// instruction, we place a legal instruction after an illegal instruction, and
-// check that the illegal unsigned integer is greater than the unsigned integer
-// of the legal instruction.
-
-// Checks that the branch is mapped to be illegal since there is extra checking
-// needed to ensure that a branch in one region is branching to an isomorphic
-// location in a different region.
-TEST(IRInstructionMapper, BranchIllegal) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a, i32 %b) {
-                          bb0:
-                             %0 = icmp slt i32 %a, %b
-                             br i1 %0, label %bb0, label %bb1
-                          bb1:
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_EQ(InstrList.size(), UnsignedVec.size());
-  ASSERT_EQ(UnsignedVec.size(), static_cast<unsigned>(0));
-}
-
-// Checks that a PHINode is mapped to be illegal since there is extra checking
-// needed to ensure that a branch in one region is bin an isomorphic
-// location in a different region.
-TEST(IRInstructionMapper, PhiIllegal) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a, i32 %b) {
-                          bb0:
-                             %0 = phi i1 [ 0, %bb0 ], [ %0, %bb1 ]
-                             ret i32 0
-                          bb1:
-                             ret i32 1
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_EQ(InstrList.size(), UnsignedVec.size());
-  ASSERT_EQ(UnsignedVec.size(), static_cast<unsigned>(0));
-}
-
-// Checks that an alloca instruction is mapped to be illegal.
-TEST(IRInstructionMapper, AllocaIllegal) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a, i32 %b) {
-                          bb0:
-                             %0 = alloca i32
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_EQ(InstrList.size(), UnsignedVec.size());
-  ASSERT_EQ(UnsignedVec.size(), static_cast<unsigned>(0));
-}
-
-// Checks that an getelementptr instruction is mapped to be legal.  And that
-// the operands in getelementpointer instructions are the exact same after the
-// first element operand, which only requires the same type.
-TEST(IRInstructionMapper, GetElementPtrSameEndOperands) {
-  StringRef ModuleString = R"(
-    %struct.RT = type { i8, [10 x [20 x i32]], i8 }
-    %struct.ST = type { i32, double, %struct.RT }
-    define i32 @f(%struct.ST* %s, i64 %a, i64 %b) {
-    bb0:
-       %0 = getelementptr inbounds %struct.ST, %struct.ST* %s, i64 %a, i32 0
-       %1 = getelementptr inbounds %struct.ST, %struct.ST* %s, i64 %b, i32 0
-       ret i32 0
-    })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_EQ(InstrList.size(), UnsignedVec.size());
-  ASSERT_EQ(UnsignedVec.size(), static_cast<unsigned>(3));
-  ASSERT_EQ(UnsignedVec[0], UnsignedVec[1]);
-}
-
-// Check that when the operands in getelementpointer instructions are not the
-// exact same after the first element operand, the instructions are mapped to
-// different values.
-TEST(IRInstructionMapper, GetElementPtrDifferentEndOperands) {
-  StringRef ModuleString = R"(
-    %struct.RT = type { i8, [10 x [20 x i32]], i8 }
-    %struct.ST = type { i32, double, %struct.RT }
-    define i32 @f(%struct.ST* %s, i64 %a, i64 %b) {
-    bb0:
-       %0 = getelementptr inbounds %struct.ST, %struct.ST* %s, i64 %a, i32 0
-       %1 = getelementptr inbounds %struct.ST, %struct.ST* %s, i64 %b, i32 2
-       ret i32 0
-    })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_EQ(InstrList.size(), UnsignedVec.size());
-  ASSERT_EQ(UnsignedVec.size(), static_cast<unsigned>(3));
-  ASSERT_NE(UnsignedVec[0], UnsignedVec[1]);
-}
-
-// Check that when the operands in getelementpointer instructions are not the
-// same initial base type, each instruction is mapped to a different value.
-TEST(IRInstructionMapper, GetElementPtrDifferentBaseType) {
-  StringRef ModuleString = R"(
-    %struct.RT = type { i8, [10 x [20 x i32]], i8 }
-    %struct.ST = type { i32, double, %struct.RT }
-    define i32 @f(%struct.ST* %s, %struct.RT* %r, i64 %a, i64 %b) {
-    bb0:
-       %0 = getelementptr inbounds %struct.ST, %struct.ST* %s, i64 %a
-       %1 = getelementptr inbounds %struct.RT, %struct.RT* %r, i64 %b
-       ret i32 0
-    })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_EQ(InstrList.size(), UnsignedVec.size());
-  ASSERT_EQ(UnsignedVec.size(), static_cast<unsigned>(3));
-  ASSERT_NE(UnsignedVec[0], UnsignedVec[1]);
-}
-
-// Check that when the operands in getelementpointer instructions do not have
-// the same inbounds modifier, they are not counted as the same.
-TEST(IRInstructionMapper, GetElementPtrDifferentInBounds) {
-  StringRef ModuleString = R"(
-    %struct.RT = type { i8, [10 x [20 x i32]], i8 }
-    %struct.ST = type { i32, double, %struct.RT }
-    define i32 @f(%struct.ST* %s, %struct.RT* %r, i64 %a, i64 %b) {
-    bb0:
-       %0 = getelementptr inbounds %struct.ST, %struct.ST* %s, i64 %a, i32 0
-       %1 = getelementptr %struct.ST, %struct.ST* %s, i64 %b, i32 0
-       ret i32 0
-    })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_EQ(InstrList.size(), UnsignedVec.size());
-  ASSERT_EQ(UnsignedVec.size(), static_cast<unsigned>(3));
-  ASSERT_NE(UnsignedVec[0], UnsignedVec[1]);
-}
-
-// Checks that indirect call instructions are mapped to be illegal since we
-// cannot guarantee the same function in two different cases.
-TEST(IRInstructionMapper, CallsIllegalIndirect) {
-  StringRef ModuleString = R"(
-                          define i32 @f(void()* %func) {
-                          bb0:
-                             call void %func()
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_EQ(InstrList.size(), UnsignedVec.size());
-  ASSERT_EQ(UnsignedVec.size(), static_cast<unsigned>(0));
-}
-
-// Checks that a call instruction is mapped to be legal.  Here we check that
-// a call with the same name, and same types are mapped to the same
-// value.
-TEST(IRInstructionMapper, CallsSameTypeSameName) {
-  StringRef ModuleString = R"(
-                          declare i32 @f1(i32, i32)
-                          define i32 @f(i32 %a, i32 %b) {
-                          bb0:
-                             %0 = call i32 @f1(i32 %a, i32 %b)
-                             %1 = call i32 @f1(i32 %a, i32 %b)
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_EQ(InstrList.size(), UnsignedVec.size());
-  ASSERT_EQ(UnsignedVec.size(), static_cast<unsigned>(3));
-  ASSERT_EQ(UnsignedVec[0], UnsignedVec[1]);
-}
-
-// Here we check that a calls with different names, but the same arguments types
-// are mapped to different value.
-TEST(IRInstructionMapper, CallsSameArgTypeDifferentName) {
-  StringRef ModuleString = R"(
-                          declare i32 @f1(i32, i32)
-                          declare i32 @f2(i32, i32)
-                          define i32 @f(i32 %a, i32 %b) {
-                          bb0:
-                             %0 = call i32 @f1(i32 %a, i32 %b)
-                             %1 = call i32 @f2(i32 %a, i32 %b)
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_EQ(InstrList.size(), UnsignedVec.size());
-  ASSERT_EQ(UnsignedVec.size(), static_cast<unsigned>(3));
-  ASSERT_NE(UnsignedVec[0], UnsignedVec[1]);
-}
-
-// Here we check that a calls with different names, and different arguments
-// types are mapped to different value.
-TEST(IRInstructionMapper, CallsDifferentArgTypeDifferentName) {
-  StringRef ModuleString = R"(
-                          declare i32 @f1(i32, i32)
-                          declare i32 @f2(i32)
-                          define i32 @f(i32 %a, i32 %b) {
-                          bb0:
-                             %0 = call i32 @f1(i32 %a, i32 %b)
-                             %1 = call i32 @f2(i32 %a)
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_EQ(InstrList.size(), UnsignedVec.size());
-  ASSERT_EQ(UnsignedVec.size(), static_cast<unsigned>(3));
-  ASSERT_NE(UnsignedVec[0], UnsignedVec[1]);
-}
-
-// Here we check that calls with different names, and different return
-// types are mapped to different value.
-TEST(IRInstructionMapper, CallsDifferentReturnTypeDifferentName) {
-  StringRef ModuleString = R"(
-                          declare i64 @f1(i32, i32)
-                          declare i32 @f2(i32, i32)
-                          define i32 @f(i32 %a, i32 %b) {
-                          bb0:
-                             %0 = call i64 @f1(i32 %a, i32 %b)
-                             %1 = call i32 @f2(i32 %a, i32 %b)
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_EQ(InstrList.size(), UnsignedVec.size());
-  ASSERT_EQ(UnsignedVec.size(), static_cast<unsigned>(3));
-  ASSERT_NE(UnsignedVec[0], UnsignedVec[1]);
-}
-
-// Here we check that calls with the same name, types, and parameters map to the
-// same unsigned integer.
-TEST(IRInstructionMapper, CallsSameParameters) {
-  StringRef ModuleString = R"(
-                          declare i32 @f1(i32, i32)
-                          define i32 @f(i32 %a, i32 %b) {
-                          bb0:
-                             %0 = tail call fastcc i32 @f1(i32 %a, i32 %b)
-                             %1 = tail call fastcc i32 @f1(i32 %a, i32 %b)
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_EQ(InstrList.size(), UnsignedVec.size());
-  ASSERT_EQ(UnsignedVec.size(), static_cast<unsigned>(3));
-  ASSERT_EQ(UnsignedVec[0], UnsignedVec[1]);
-}
-
-// Here we check that calls with different tail call settings are mapped to
-// different values.
-TEST(IRInstructionMapper, CallsDifferentTails) {
-  StringRef ModuleString = R"(
-                          declare i32 @f1(i32, i32)
-                          define i32 @f(i32 %a, i32 %b) {
-                          bb0:
-                             %0 = tail call i32 @f1(i32 %a, i32 %b)
-                             %1 = call i32 @f1(i32 %a, i32 %b)
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_EQ(InstrList.size(), UnsignedVec.size());
-  ASSERT_EQ(UnsignedVec.size(), static_cast<unsigned>(3));
-  ASSERT_NE(UnsignedVec[0], UnsignedVec[1]);
-}
-
-// Here we check that calls with different calling convention settings are
-// mapped to different values.
-TEST(IRInstructionMapper, CallsDifferentCallingConventions) {
-  StringRef ModuleString = R"(
-                          declare i32 @f1(i32, i32)
-                          define i32 @f(i32 %a, i32 %b) {
-                          bb0:
-                             %0 = call fastcc i32 @f1(i32 %a, i32 %b)
-                             %1 = call i32 @f1(i32 %a, i32 %b)
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_EQ(InstrList.size(), UnsignedVec.size());
-  ASSERT_EQ(UnsignedVec.size(), static_cast<unsigned>(3));
-  ASSERT_NE(UnsignedVec[0], UnsignedVec[1]);
-}
-
-// Checks that an invoke instruction is mapped to be illegal. Invoke
-// instructions are considered to be illegal because of the change in the
-// control flow that is currently not recognized.
-TEST(IRInstructionMapper, InvokeIllegal) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i8 *%gep1, i32 %b) {
-                          then:                       
-                            invoke i32 undef(i8* undef)
-                               to label %invoke unwind label %lpad
-
-                          invoke:
-                            unreachable
-
-                          lpad:
-                            landingpad { i8*, i32 }
-                               catch i8* null
-                            unreachable
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_EQ(InstrList.size(), UnsignedVec.size());
-  ASSERT_EQ(UnsignedVec.size(), static_cast<unsigned>(0));
-}
-
-// Checks that an callbr instructions are considered to be illegal.  Callbr
-// instructions are considered to be illegal because of the change in the
-// control flow that is currently not recognized.
-TEST(IRInstructionMapper, CallBrInstIllegal) {
-  StringRef ModuleString = R"(
-  define void @test() {
-    fail:
-      ret void
-  }
-
-  define i32 @f(i32 %a, i32 %b) {
-      bb0:
-        callbr void asm "xorl $0, $0; jmp ${1:l}", "r,X,~{dirflag},~{fpsr},~{flags}"(i32 %a, i8* blockaddress(@test, %fail)) to label %normal [label %fail]
-      fail:
-        ret i32 0
-      normal:
-        ret i32 0
-  })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_EQ(InstrList.size(), UnsignedVec.size());
-  ASSERT_EQ(UnsignedVec.size(), static_cast<unsigned>(0));
-}
-
-// Checks that an debuginfo intrinsics are mapped to be invisible.  Since they
-// do not semantically change the program, they can be recognized as similar.
-TEST(IRInstructionMapper, DebugInfoInvisible) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a, i32 %b) {
-                          then:
-                            %0 = add i32 %a, %b                    
-                            call void @llvm.dbg.value(metadata !0)
-                            %1 = add i32 %a, %b     
-                            ret i32 0
-                          }
-
-                          declare void @llvm.dbg.value(metadata)
-                          !0 = distinct !{!"test\00", i32 10})";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_EQ(InstrList.size(), UnsignedVec.size());
-  ASSERT_EQ(UnsignedVec.size(), static_cast<unsigned>(3));
-}
-
-// The following are all exception handling intrinsics.  We do not currently
-// handle these instruction because they are very context dependent.
-
-// Checks that an eh.typeid.for intrinsic is mapped to be illegal.
-TEST(IRInstructionMapper, ExceptionHandlingTypeIdIllegal) {
-  StringRef ModuleString = R"(
-    @_ZTIi = external constant i8*
-    define i32 @f() {
-    then:
-      %0 = call i32 @llvm.eh.typeid.for(i8* bitcast (i8** @_ZTIi to i8*))
-      ret i32 0
-    }
-
-    declare i32 @llvm.eh.typeid.for(i8*))";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_EQ(InstrList.size(), UnsignedVec.size());
-  ASSERT_EQ(UnsignedVec.size(), static_cast<unsigned>(0));
-}
-
-// Checks that an eh.exceptioncode intrinsic is mapped to be illegal.
-TEST(IRInstructionMapper, ExceptionHandlingExceptionCodeIllegal) {
-  StringRef ModuleString = R"(
-    define i32 @f(i32 %a, i32 %b) {
-    entry:
-      %0 = catchswitch within none [label %__except] unwind to caller
-
-    __except:
-      %1 = catchpad within %0 [i8* null]
-      catchret from %1 to label %__except
-
-    then:
-      %2 = call i32 @llvm.eh.exceptioncode(token %1)
-      ret i32 0
-    }
-
-    declare i32 @llvm.eh.exceptioncode(token))";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_EQ(InstrList.size(), UnsignedVec.size());
-  ASSERT_EQ(UnsignedVec.size(), static_cast<unsigned>(0));
-}
-
-// Checks that an eh.unwind intrinsic is mapped to be illegal.
-TEST(IRInstructionMapper, ExceptionHandlingUnwindIllegal) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a, i32 %b) {
-                          entry:
-                            call void @llvm.eh.unwind.init()
-                            ret i32 0
-                          }
-
-                          declare void @llvm.eh.unwind.init())";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_EQ(InstrList.size(), UnsignedVec.size());
-  ASSERT_EQ(UnsignedVec.size(), static_cast<unsigned>(0));
-}
-
-// Checks that an eh.exceptionpointer intrinsic is mapped to be illegal.
-TEST(IRInstructionMapper, ExceptionHandlingExceptionPointerIllegal) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a, i32 %b) {
-                          entry:
-                            %0 = call i8* @llvm.eh.exceptionpointer.p0i8(i32 0)
-                            ret i32 0
-                          }
-
-                          declare i8* @llvm.eh.exceptionpointer.p0i8(i32))";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_EQ(InstrList.size(), UnsignedVec.size());
-  ASSERT_EQ(UnsignedVec.size(), static_cast<unsigned>(0));
-}
-
-// Checks that a catchpad instruction is mapped to an illegal value.
-TEST(IRInstructionMapper, CatchpadIllegal) {
-  StringRef ModuleString = R"(
-    declare void @llvm.donothing() nounwind readnone
-
-    define void @function() personality i8 3 {
-      entry:
-        invoke void @llvm.donothing() to label %normal unwind label %exception
-      exception:
-        %cs1 = catchswitch within none [label %catchpad1] unwind to caller
-      catchpad1:
-        catchpad within %cs1 []
-        br label %normal
-      normal:
-        ret void
-  })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_EQ(InstrList.size(), UnsignedVec.size());
-  ASSERT_EQ(UnsignedVec.size(), static_cast<unsigned>(0));
-}
-
-// Checks that a cleanuppad instruction is mapped to an illegal value.
-TEST(IRInstructionMapper, CleanuppadIllegal) {
-  StringRef ModuleString = R"(
-    declare void @llvm.donothing() nounwind readnone
-
-    define void @function() personality i8 3 {
-      entry:
-        invoke void @llvm.donothing() to label %normal unwind label %exception
-      exception:
-        %cs1 = catchswitch within none [label %catchpad1] unwind to caller
-      catchpad1:
-        %clean = cleanuppad within none []
-        br label %normal
-      normal:
-        ret void
-  })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_EQ(InstrList.size(), UnsignedVec.size());
-  ASSERT_EQ(UnsignedVec.size(), static_cast<unsigned>(0));
-}
-
-// The following three instructions are memory transfer and setting based, which
-// are considered illegal since is extra checking needed to handle the address
-// space checking.
-
-// Checks that a memset instruction is mapped to an illegal value.
-TEST(IRInstructionMapper, MemSetIllegal) {
-  StringRef ModuleString = R"(
-  declare void @llvm.memset.p0i8.i64(i8* nocapture writeonly, i8, i64, i32, i1)
-
-  define i64 @function(i64 %x, i64 %z, i64 %n) {
-  entry:
-    %pool = alloca [59 x i64], align 4
-    %tmp = bitcast [59 x i64]* %pool to i8*
-    call void @llvm.memset.p0i8.i64(i8* nonnull %tmp, i8 0, i64 236, i32 4, i1 false)
-    %cmp3 = icmp eq i64 %n, 0
-    %a = add i64 %x, %z
-    %c = add i64 %x, %z
-    ret i64 0
-  })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_EQ(InstrList.size(), UnsignedVec.size());
-  ASSERT_EQ(UnsignedVec.size(), static_cast<unsigned>(6));
-  ASSERT_TRUE(UnsignedVec[2] < UnsignedVec[1]);
-}
-
-// Checks that a memcpy instruction is mapped to an illegal value.
-TEST(IRInstructionMapper, MemCpyIllegal) {
-  StringRef ModuleString = R"(
-  declare void @llvm.memcpy.p0i8.i64(i8* nocapture writeonly, i8, i64, i32, i1)
-
-  define i64 @function(i64 %x, i64 %z, i64 %n) {
-  entry:
-    %pool = alloca [59 x i64], align 4
-    %tmp = bitcast [59 x i64]* %pool to i8*
-    call void @llvm.memcpy.p0i8.i64(i8* nonnull %tmp, i8 0, i64 236, i32 4, i1 false)
-    %cmp3 = icmp eq i64 %n, 0
-    %a = add i64 %x, %z
-    %c = add i64 %x, %z
-    ret i64 0
-  })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_EQ(InstrList.size(), UnsignedVec.size());
-  ASSERT_EQ(UnsignedVec.size(), static_cast<unsigned>(6));
-  ASSERT_TRUE(UnsignedVec[2] < UnsignedVec[1]);
-}
-
-// Checks that a memmove instruction is mapped to an illegal value.
-TEST(IRInstructionMapper, MemMoveIllegal) {
-  StringRef ModuleString = R"(
-  declare void @llvm.memmove.p0i8.i64(i8* nocapture writeonly, i8, i64, i32, i1)
-
-  define i64 @function(i64 %x, i64 %z, i64 %n) {
-  entry:
-    %pool = alloca [59 x i64], align 4
-    %tmp = bitcast [59 x i64]* %pool to i8*
-    call void @llvm.memmove.p0i8.i64(i8* nonnull %tmp, i8 0, i64 236, i32 4, i1 false)
-    %cmp3 = icmp eq i64 %n, 0
-    %a = add i64 %x, %z
-    %c = add i64 %x, %z
-    ret i64 0
-  })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_EQ(InstrList.size(), UnsignedVec.size());
-  ASSERT_EQ(UnsignedVec.size(), static_cast<unsigned>(6));
-  ASSERT_TRUE(UnsignedVec[2] < UnsignedVec[1]);
-}
-
-// Checks that a variable argument instructions are mapped to an illegal value.
-// We exclude variable argument instructions since variable arguments
-// requires extra checking of the argument list.
-TEST(IRInstructionMapper, VarArgsIllegal) {
-  StringRef ModuleString = R"(
-  declare void @llvm.va_start(i8*)
-  declare void @llvm.va_copy(i8*, i8*)
-  declare void @llvm.va_end(i8*)
-
-  define i32 @func1(i32 %a, double %b, i8* %v, ...) nounwind {
-  entry:
-    %a.addr = alloca i32, align 4
-    %b.addr = alloca double, align 8
-    %ap = alloca i8*, align 4
-    %c = alloca i32, align 4
-    store i32 %a, i32* %a.addr, align 4
-    store double %b, double* %b.addr, align 8
-    %ap1 = bitcast i8** %ap to i8*
-    call void @llvm.va_start(i8* %ap1)
-    store double %b, double* %b.addr, align 8
-    store double %b, double* %b.addr, align 8
-    %0 = va_arg i8** %ap, i32
-    store double %b, double* %b.addr, align 8
-    store double %b, double* %b.addr, align 8
-    call void @llvm.va_copy(i8* %v, i8* %ap1)
-    store double %b, double* %b.addr, align 8
-    store double %b, double* %b.addr, align 8
-    call void @llvm.va_end(i8* %ap1)
-    store i32 %0, i32* %c, align 4
-    %tmp = load i32, i32* %c, align 4
-    ret i32 %tmp
-  })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_EQ(InstrList.size(), UnsignedVec.size());
-  ASSERT_EQ(UnsignedVec.size(), static_cast<unsigned>(16));
-  ASSERT_TRUE(UnsignedVec[4] < UnsignedVec[3]);
-  ASSERT_TRUE(UnsignedVec[7] < UnsignedVec[6]);
-  ASSERT_TRUE(UnsignedVec[10] < UnsignedVec[9]);
-  ASSERT_TRUE(UnsignedVec[13] < UnsignedVec[12]);
-}
-
-// Check the length of adding two illegal instructions one after th other.  We
-// should find that only one element is added for each illegal range.
-TEST(IRInstructionMapper, RepeatedIllegalLength) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a, i32 %b) {
-                          bb0:
-                             %0 = add i32 %a, %b
-                             %1 = mul i32 %a, %b
-                             %2 = alloca i32
-                             %3 = alloca i32
-                             %4 = add i32 %a, %b
-                             %5 = mul i32 %a, %b
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  // Check that the size of the unsigned vector and the instruction list are the
-  // same as a safety check.
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-
-  // Make sure that the unsigned vector is the expected size.
-  ASSERT_TRUE(UnsignedVec.size() == 6);
-}
-
-// A helper function that accepts an instruction list from a module made up of
-// two blocks of two legal instructions and terminator, and checks them for
-// instruction similarity.
-static bool longSimCandCompare(std::vector<IRInstructionData *> &InstrList,
-                               bool Structure = false) {
-  std::vector<IRInstructionData *>::iterator Start, End;
-
-  Start = InstrList.begin();
-  End = InstrList.begin();
-
-  std::advance(End, 1);
-  IRSimilarityCandidate Cand1(0, 2, *Start, *End);
-
-  Start = InstrList.begin();
-  End = InstrList.begin();
-
-  std::advance(Start, 3);
-  std::advance(End, 4);
-  IRSimilarityCandidate Cand2(3, 2, *Start, *End);
-  if (Structure)
-    return IRSimilarityCandidate::compareStructure(Cand1, Cand2);
-  return IRSimilarityCandidate::isSimilar(Cand1, Cand2);
-}
-
-// Checks that two adds with commuted operands are considered to be the same
-// instructions.
-TEST(IRSimilarityCandidate, CheckIdenticalInstructions) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a, i32 %b) {
-                          bb0:
-                             %0 = add i32 %a, %b
-                             %1 = add i32 %b, %a
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  // Check to make sure that we have a long enough region.
-  ASSERT_EQ(InstrList.size(), static_cast<unsigned>(3));
-  // Check that the instructions were added correctly to both vectors.
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-
-  std::vector<IRInstructionData *>::iterator Start, End;
-  Start = InstrList.begin();
-  End = InstrList.begin();
-  std::advance(End, 1);
-  IRSimilarityCandidate Cand1(0, 2, *Start, *End);
-  IRSimilarityCandidate Cand2(0, 2, *Start, *End);
-
-  ASSERT_TRUE(IRSimilarityCandidate::isSimilar(Cand1, Cand2));
-}
-
-// Checks that comparison instructions are found to be similar instructions
-// when the operands are flipped and the predicate is also swapped.
-TEST(IRSimilarityCandidate, PredicateIsomorphism) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a, i32 %b) {
-                          bb0:
-                             %0 = icmp sgt i32 %a, %b
-                             %1 = add i32 %b, %a
-                             br label %bb1
-                          bb1:
-                             %2 = icmp slt i32 %a, %b
-                             %3 = add i32 %a, %b
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_TRUE(InstrList.size() > 5);
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-
-  std::vector<IRInstructionData *>::iterator Start, End;
-  Start = InstrList.begin();
-  End = InstrList.begin();
-  
-  std::advance(End, 1);
-  IRSimilarityCandidate Cand1(0, 2, *Start, *End);
-
-  Start = InstrList.begin();
-  End = InstrList.begin();
-  
-  std::advance(Start, 3);
-  std::advance(End, 4);
-  IRSimilarityCandidate Cand2(3, 2, *Start, *End);
-
-  ASSERT_TRUE(IRSimilarityCandidate::isSimilar(Cand1, Cand2));
-}
-
-// Checks that IRSimilarityCandidates wrapping these two regions of instructions
-// are able to differentiate between instructions that have different opcodes.
-TEST(IRSimilarityCandidate, CheckRegionsDifferentInstruction) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a, i32 %b) {
-                          bb0:
-                             %0 = add i32 %a, %b
-                             %1 = add i32 %b, %a
-                             ret i32 0
-                          bb1:
-                             %2 = sub i32 %a, %b
-                             %3 = add i32 %b, %a
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  // Check to make sure that we have a long enough region.
-  ASSERT_EQ(InstrList.size(), static_cast<unsigned>(6));
-  // Check that the instructions were added correctly to both vectors.
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-
-  ASSERT_FALSE(longSimCandCompare(InstrList));
-}
-
-// Checks that IRSimilarityCandidates wrapping these two regions of instructions
-// are able to differentiate between instructions that have different types.
-TEST(IRSimilarityCandidate, CheckRegionsDifferentTypes) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a, i32 %b, i64 %c, i64 %d) {
-                          bb0:
-                             %0 = add i32 %a, %b
-                             %1 = add i32 %b, %a
-                             ret i32 0
-                          bb1:
-                             %2 = add i64 %c, %d
-                             %3 = add i64 %d, %c
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  // Check to make sure that we have a long enough region.
-  ASSERT_EQ(InstrList.size(), static_cast<unsigned>(6));
-  // Check that the instructions were added correctly to both vectors.
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-
-  ASSERT_FALSE(longSimCandCompare(InstrList));
-}
-
-// Check that debug instructions do not impact similarity. They are marked as
-// invisible.
-TEST(IRSimilarityCandidate, IdenticalWithDebug) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a, i32 %b) {
-                          bb0:
-                             %0 = add i32 %a, %b
-                             call void @llvm.dbg.value(metadata !0)
-                             %1 = add i32 %b, %a
-                             ret i32 0
-                          bb1:
-                             %2 = add i32 %a, %b
-                             call void @llvm.dbg.value(metadata !1)
-                             %3 = add i32 %b, %a
-                             ret i32 0
-                          bb2:
-                             %4 = add i32 %a, %b
-                             %5 = add i32 %b, %a
-                             ret i32 0       
-                          }
-
-                          declare void @llvm.dbg.value(metadata)
-                          !0 = distinct !{!"test\00", i32 10}
-                          !1 = distinct !{!"test\00", i32 11})";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  // Check to make sure that we have a long enough region.
-  ASSERT_EQ(InstrList.size(), static_cast<unsigned>(9));
-  // Check that the instructions were added correctly to both vectors.
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-
-  ASSERT_TRUE(longSimCandCompare(InstrList));
-}
-
-// Checks that IRSimilarityCandidates that include illegal instructions, are not
-// considered to be the same set of instructions.  In these sets of instructions
-// the allocas are illegal.
-TEST(IRSimilarityCandidate, IllegalInCandidate) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a, i32 %b) {
-                          bb0:
-                             %0 = add i32 %a, %b
-                             %1 = add i32 %a, %b
-                             %2 = alloca i32
-                             ret i32 0
-                          bb1:
-                             %3 = add i32 %a, %b
-                             %4 = add i32 %a, %b
-                             %5 = alloca i32
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  // Check to make sure that we have a long enough region.
-  ASSERT_EQ(InstrList.size(), static_cast<unsigned>(6));
-  // Check that the instructions were added correctly to both vectors.
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-
-  std::vector<IRInstructionData *>::iterator Start, End;
-
-  Start = InstrList.begin();
-  End = InstrList.begin();
-
-  std::advance(End, 2);
-  IRSimilarityCandidate Cand1(0, 3, *Start, *End);
-
-  Start = InstrList.begin();
-  End = InstrList.begin();
-
-  std::advance(Start, 3);
-  std::advance(End, 5);
-  IRSimilarityCandidate Cand2(3, 3, *Start, *End);
-  ASSERT_FALSE(IRSimilarityCandidate::isSimilar(Cand1, Cand2));
-}
-
-// Checks that different structure, in this case, where we introduce a new
-// needed input in one region, is recognized as different.
-TEST(IRSimilarityCandidate, DifferentStructure) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a, i32 %b) {
-                          bb0:
-                             %0 = add i32 %a, %b
-                             %1 = add i32 %b, %a
-                             ret i32 0
-                          bb1:
-                             %2 = add i32 %a, %b
-                             %3 = add i32 %b, %0
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  // Check to make sure that we have a long enough region.
-  ASSERT_EQ(InstrList.size(), static_cast<unsigned>(6));
-  // Check that the instructions were added correctly to both vectors.
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-
-  ASSERT_FALSE(longSimCandCompare(InstrList, true));
-}
-
-// Checks that comparison instructions are found to have the same structure
-// when the operands are flipped and the predicate is also swapped.
-TEST(IRSimilarityCandidate, PredicateIsomorphismStructure) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a, i32 %b) {
-                          bb0:
-                             %0 = icmp sgt i32 %a, %b
-                             %1 = add i32 %a, %b
-                             br label %bb1
-                          bb1:
-                             %2 = icmp slt i32 %b, %a
-                             %3 = add i32 %a, %b
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_TRUE(InstrList.size() > 5);
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-
-  ASSERT_TRUE(longSimCandCompare(InstrList, true));
-}
-
-// Checks that different predicates are counted as diferent.
-TEST(IRSimilarityCandidate, PredicateDifference) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a, i32 %b) {
-                          bb0:
-                             %0 = icmp sge i32 %a, %b
-                             %1 = add i32 %b, %a
-                             br label %bb1
-                          bb1:
-                             %2 = icmp slt i32 %b, %a
-                             %3 = add i32 %a, %b
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  ASSERT_TRUE(InstrList.size() > 5);
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-
-  ASSERT_FALSE(longSimCandCompare(InstrList));
-}
-
-// Checks that the same structure is recognized between two candidates. The
-// items %a and %b are used in the same way in both sets of instructions.
-TEST(IRSimilarityCandidate, SameStructure) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a, i32 %b) {
-                          bb0:
-                             %0 = add i32 %a, %b
-                             %1 = sub i32 %b, %a
-                             ret i32 0
-                          bb1:
-                             %2 = add i32 %a, %b
-                             %3 = sub i32 %b, %a
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  // Check to make sure that we have a long enough region.
-  ASSERT_EQ(InstrList.size(), static_cast<unsigned>(6));
-  // Check that the instructions were added correctly to both vectors.
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-
-  ASSERT_TRUE(longSimCandCompare(InstrList, true));
-}
-
-// Checks that the same structure is recognized between two candidates. While
-// the input names are reversed, they still perform the same overall operation.
-TEST(IRSimilarityCandidate, DifferentNameSameStructure) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a, i32 %b) {
-                          bb0:
-                             %0 = add i32 %a, %b
-                             %1 = add i32 %b, %a
-                             ret i32 0
-                          bb1:
-                             %2 = add i32 %b, %a
-                             %3 = add i32 %a, %b
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<IRInstructionData *> InstrList;
-  std::vector<unsigned> UnsignedVec;
-
-  SpecificBumpPtrAllocator<IRInstructionData> InstDataAllocator;
-  SpecificBumpPtrAllocator<IRInstructionDataList> IDLAllocator;
-  IRInstructionMapper Mapper(&InstDataAllocator, &IDLAllocator);
-  getVectors(*M, Mapper, InstrList, UnsignedVec);
-
-  // Check to make sure that we have a long enough region.
-  ASSERT_EQ(InstrList.size(), static_cast<unsigned>(6));
-  // Check that the instructions were added correctly to both vectors.
-  ASSERT_TRUE(InstrList.size() == UnsignedVec.size());
-
-  ASSERT_TRUE(longSimCandCompare(InstrList, true));
-}
-
-// Checks that two sets of identical instructions are found to be the same.
-// Both sequences of adds have the same operand ordering, and the same
-// instructions, making them strcturally equivalent.
-TEST(IRSimilarityIdentifier, IdentitySimilarity) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a, i32 %b) {
-                          bb0:
-                             %0 = add i32 %a, %b
-                             %1 = sub i32 %b, %a
-                             br label %bb1
-                          bb1:
-                             %2 = add i32 %a, %b
-                             %3 = sub i32 %b, %a
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<std::vector<IRSimilarityCandidate>> SimilarityCandidates;
-  getSimilarities(*M, SimilarityCandidates);
-
-  ASSERT_TRUE(SimilarityCandidates.size() == 1);
-  for (std::vector<IRSimilarityCandidate> &Cands : SimilarityCandidates) {
-    ASSERT_TRUE(Cands.size() == 2);
-    unsigned InstIdx = 0;
-    for (IRSimilarityCandidate &Cand : Cands) {
-      ASSERT_TRUE(Cand.getStartIdx() == InstIdx);
-      InstIdx += 3;
-    }
-  }
-}
-
-// Checks that incorrect sequences are not found as similar.  In this case,
-// we have different sequences of instructions.
-TEST(IRSimilarityIdentifier, InstructionDifference) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a, i32 %b, i32 %c, i32 %d) {
-                          bb0:
-                             %0 = sub i32 %a, %b
-                             %1 = add i32 %b, %a
-                             br label %bb1
-                          bb1:
-                             %2 = add i32 %c, %d
-                             %3 = sub i32 %d, %c
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<std::vector<IRSimilarityCandidate>> SimilarityCandidates;
-  getSimilarities(*M, SimilarityCandidates);
-
-  ASSERT_TRUE(SimilarityCandidates.empty());
-}
-
-// This test checks to see whether we can detect similarity for commutative
-// instructions where the operands have been reversed.
-TEST(IRSimilarityIdentifier, CommutativeSimilarity) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a, i32 %b) {
-                          bb0:
-                             %0 = add i32 %a, %b
-                             %1 = add i32 %b, %a
-                             br label %bb1
-                          bb1:
-                             %2 = add i32 %a, %b
-                             %3 = add i32 %a, %b
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<std::vector<IRSimilarityCandidate>> SimilarityCandidates;
-  getSimilarities(*M, SimilarityCandidates);
-
-  ASSERT_TRUE(SimilarityCandidates.size() == 1);
-  for (std::vector<IRSimilarityCandidate> &Cands : SimilarityCandidates) {
-    ASSERT_TRUE(Cands.size() == 2);
-    unsigned InstIdx = 0;
-    for (IRSimilarityCandidate &Cand : Cands) {
-      ASSERT_TRUE(Cand.getStartIdx() == InstIdx);
-      InstIdx += 3;
-    }
-  }
-}
-
-// This test checks to see whether we can detect different structure in
-// commutative instructions.  In this case, the second operand in the second
-// add is different.
-TEST(IRSimilarityIdentifier, NoCommutativeSimilarity) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a, i32 %b) {
-                          bb0:
-                             %0 = add i32 %a, %b
-                             %1 = add i32 %1, %b
-                             br label %bb1
-                          bb1:
-                             %2 = add i32 %a, %b
-                             %3 = add i32 %2, %a
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<std::vector<IRSimilarityCandidate>> SimilarityCandidates;
-  getSimilarities(*M, SimilarityCandidates);
-
-  ASSERT_TRUE(SimilarityCandidates.size() == 0);
-}
-
-// Check that we are not finding similarity in non commutative
-// instructions.  That is, while the instruction and operands used are the same
-// in the two subtraction sequences, they are in a different order, and cannot
-// be counted as the same since a subtraction is not commutative.
-TEST(IRSimilarityIdentifier, NonCommutativeDifference) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a, i32 %b) {
-                          bb0:
-                             %0 = sub i32 %a, %b
-                             %1 = sub i32 %b, %a
-                             br label %bb1
-                          bb1:
-                             %2 = sub i32 %a, %b
-                             %3 = sub i32 %a, %b
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<std::vector<IRSimilarityCandidate>> SimilarityCandidates;
-  getSimilarities(*M, SimilarityCandidates);
-
-  ASSERT_TRUE(SimilarityCandidates.empty());
-}
-
-// Check that we find similarity despite changing the register names.
-TEST(IRSimilarityIdentifier, MappingSimilarity) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a, i32 %b, i32 %c, i32 %d) {
-                          bb0:
-                             %0 = add i32 %a, %b
-                             %1 = sub i32 %b, %a
-                             br label %bb1
-                          bb1:
-                             %2 = add i32 %c, %d
-                             %3 = sub i32 %d, %c
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<std::vector<IRSimilarityCandidate>> SimilarityCandidates;
-  getSimilarities(*M, SimilarityCandidates);
-
-  ASSERT_TRUE(SimilarityCandidates.size() == 1);
-  for (std::vector<IRSimilarityCandidate> &Cands : SimilarityCandidates) {
-    ASSERT_TRUE(Cands.size() == 2);
-    unsigned InstIdx = 0;
-    for (IRSimilarityCandidate &Cand : Cands) {
-      ASSERT_TRUE(Cand.getStartIdx() == InstIdx);
-      InstIdx += 3;
-    }
-  }
-}
-
-// Check that we find instances of swapped predicate isomorphism.  That is,
-// for predicates that can be flipped, e.g. greater than to less than,
-// we can identify that instances of these different literal predicates, but are
-// the same within a single swap can be found.
-TEST(IRSimilarityIdentifier, PredicateIsomorphism) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a, i32 %b) {
-                          bb0:
-                             %0 = add i32 %a, %b
-                             %1 = icmp sgt i32 %b, %a
-                             br label %bb1
-                          bb1:
-                             %2 = add i32 %a, %b
-                             %3 = icmp slt i32 %a, %b
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<std::vector<IRSimilarityCandidate>> SimilarityCandidates;
-  getSimilarities(*M, SimilarityCandidates);
-
-  ASSERT_TRUE(SimilarityCandidates.size() == 1);
-  for (std::vector<IRSimilarityCandidate> &Cands : SimilarityCandidates) {
-    ASSERT_TRUE(Cands.size() == 2);
-    unsigned InstIdx = 0;
-    for (IRSimilarityCandidate &Cand : Cands) {
-      ASSERT_TRUE(Cand.getStartIdx() == InstIdx);
-      InstIdx += 3;
-    }
-  }
-}
-
-// Checks that constants are detected as the same operand in each use in the
-// sequences of instructions.  Also checks that we can find structural
-// equivalence using constants.  In this case the 1 has the same use pattern as
-// %a.
-TEST(IRSimilarityIdentifier, ConstantMappingSimilarity) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a, i32 %b) {
-                          bb0:
-                             %0 = add i32 1, %b
-                             %1 = icmp sgt i32 %b, 1
-                             br label %bb1
-                          bb1:
-                             %2 = add i32 %a, %b
-                             %3 = icmp sgt i32 %b, %a
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<std::vector<IRSimilarityCandidate>> SimilarityCandidates;
-  getSimilarities(*M, SimilarityCandidates);
-
-  ASSERT_TRUE(SimilarityCandidates.size() == 1);
-  for (std::vector<IRSimilarityCandidate> &Cands : SimilarityCandidates) {
-    ASSERT_TRUE(Cands.size() == 2);
-    unsigned InstIdx = 0;
-    for (IRSimilarityCandidate &Cand : Cands) {
-      ASSERT_TRUE(Cand.getStartIdx() == InstIdx);
-      InstIdx += 3;
-    }
-  }
-}
-
-// Check that constants are uniquely identified. i.e. two different constants
-// are not considered the same.  This means that this should not find any
-// structural similarity.
-TEST(IRSimilarityIdentifier, ConstantMappingDifference) {
-  StringRef ModuleString = R"(
-                          define i32 @f(i32 %a, i32 %b) {
-                          bb0:
-                             %0 = add i32 1, %b
-                             %1 = icmp sgt i32 %b, 2
-                             br label %bb1
-                          bb1:
-                             %2 = add i32 %a, %b
-                             %3 = icmp slt i32 %a, %b
-                             ret i32 0
-                          })";
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  std::vector<std::vector<IRSimilarityCandidate>> SimilarityCandidates;
-  getSimilarities(*M, SimilarityCandidates);
-
-  ASSERT_TRUE(SimilarityCandidates.empty());
-}
diff --git a/gnu/llvm/llvm/unittests/Analysis/IVDescriptorsTest.cpp b/gnu/llvm/llvm/unittests/Analysis/IVDescriptorsTest.cpp
deleted file mode 100644
index 1f63db3ff31..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/IVDescriptorsTest.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-//===- IVDescriptorsTest.cpp - IVDescriptors unit tests -------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/IVDescriptors.h"
-#include "llvm/Analysis/AssumptionCache.h"
-#include "llvm/Analysis/LoopInfo.h"
-#include "llvm/Analysis/ScalarEvolution.h"
-#include "llvm/Analysis/TargetLibraryInfo.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Dominators.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-/// Build the loop info and scalar evolution for the function and run the Test.
-static void runWithLoopInfoAndSE(
-    Module &M, StringRef FuncName,
-    function_ref<void(Function &F, LoopInfo &LI, ScalarEvolution &SE)> Test) {
-  auto *F = M.getFunction(FuncName);
-  ASSERT_NE(F, nullptr) << "Could not find " << FuncName;
-
-  TargetLibraryInfoImpl TLII;
-  TargetLibraryInfo TLI(TLII);
-  AssumptionCache AC(*F);
-  DominatorTree DT(*F);
-  LoopInfo LI(DT);
-  ScalarEvolution SE(*F, TLI, AC, DT, LI);
-
-  Test(*F, LI, SE);
-}
-
-static std::unique_ptr<Module> parseIR(LLVMContext &C, const char *IR) {
-  SMDiagnostic Err;
-  std::unique_ptr<Module> Mod = parseAssemblyString(IR, Err, C);
-  if (!Mod)
-    Err.print("IVDescriptorsTests", errs());
-  return Mod;
-}
-
-// This tests that IVDescriptors can obtain the induction binary operator for
-// integer induction variables. And getExactFPMathInst() correctly return the
-// expected behavior, i.e. no FMF algebra.
-TEST(IVDescriptorsTest, LoopWithSingleLatch) {
-  // Parse the module.
-  LLVMContext Context;
-
-  std::unique_ptr<Module> M = parseIR(
-    Context,
-    R"(define void @foo(i32* %A, i32 %ub) {
-entry:
-  br label %for.body
-for.body:
-  %i = phi i32 [ 0, %entry ], [ %inc, %for.body ]
-  %idxprom = sext i32 %i to i64
-  %arrayidx = getelementptr inbounds i32, i32* %A, i64 %idxprom
-  store i32 %i, i32* %arrayidx, align 4
-  %inc = add nsw i32 %i, 1
-  %cmp = icmp slt i32 %inc, %ub
-  br i1 %cmp, label %for.body, label %for.exit
-for.exit:
-  br label %for.end
-for.end:
-  ret void
-})"
-    );
-
-  runWithLoopInfoAndSE(
-      *M, "foo", [&](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-        Function::iterator FI = F.begin();
-        // First basic block is entry - skip it.
-        BasicBlock *Header = &*(++FI);
-        assert(Header->getName() == "for.body");
-        Loop *L = LI.getLoopFor(Header);
-        EXPECT_NE(L, nullptr);
-        PHINode *Inst_i = dyn_cast<PHINode>(&Header->front());
-        assert(Inst_i->getName() == "i");
-        InductionDescriptor IndDesc;
-        bool IsInductionPHI =
-            InductionDescriptor::isInductionPHI(Inst_i, L, &SE, IndDesc);
-        EXPECT_TRUE(IsInductionPHI);
-        Instruction *Inst_inc = nullptr;
-        BasicBlock::iterator BBI = Header->begin();
-        do {
-          if ((&*BBI)->getName() == "inc")
-            Inst_inc = &*BBI;
-          ++BBI;
-        } while (!Inst_inc);
-        assert(Inst_inc->getName() == "inc");
-        EXPECT_EQ(IndDesc.getInductionBinOp(), Inst_inc);
-        EXPECT_EQ(IndDesc.getExactFPMathInst(), nullptr);
-      });
-}
-
-// Depending on how SCEV deals with ptrtoint cast, the step of a phi could be
-// a pointer, and InductionDescriptor used to fail with an assertion.
-// So just check that it doesn't assert.
-TEST(IVDescriptorsTest, LoopWithPtrToInt) {
-  // Parse the module.
-  LLVMContext Context;
-
-  std::unique_ptr<Module> M = parseIR(Context, R"(
-      target datalayout = "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64"
-      target triple = "thumbv6m-arm-none-eabi"
-
-      declare void @widget()
-      declare void @wobble(i32)
-
-      define void @barney(i8* %arg, i8* %arg18, i32 %arg19) {
-      bb:
-        %tmp = ptrtoint i8* %arg to i32
-        %tmp20 = ptrtoint i8* %arg18 to i32
-        %tmp21 = or i32 %tmp20, %tmp
-        %tmp22 = and i32 %tmp21, 3
-        %tmp23 = icmp eq i32 %tmp22, 0
-        br i1 %tmp23, label %bb24, label %bb25
-
-      bb24:
-        tail call void @widget()
-        br label %bb34
-
-      bb25:
-        %tmp26 = sub i32 %tmp, %tmp20
-        %tmp27 = icmp ult i32 %tmp26, %arg19
-        br i1 %tmp27, label %bb28, label %bb34
-
-      bb28:
-        br label %bb29
-
-      bb29:
-        %tmp30 = phi i32 [ %tmp31, %bb29 ], [ %arg19, %bb28 ]
-        tail call void @wobble(i32 %tmp26)
-        %tmp31 = sub i32 %tmp30, %tmp26
-        %tmp32 = icmp ugt i32 %tmp31, %tmp26
-        br i1 %tmp32, label %bb29, label %bb33
-
-      bb33:
-        br label %bb34
-
-      bb34:
-        ret void
-      })");
-
-  runWithLoopInfoAndSE(
-      *M, "barney", [&](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-        Function::iterator FI = F.begin();
-        // First basic block is entry - skip it.
-        BasicBlock *Header = &*(++(++(++(++FI))));
-        assert(Header->getName() == "bb29");
-        Loop *L = LI.getLoopFor(Header);
-        EXPECT_NE(L, nullptr);
-        PHINode *Inst_i = dyn_cast<PHINode>(&Header->front());
-        assert(Inst_i->getName() == "tmp30");
-        InductionDescriptor IndDesc;
-        bool IsInductionPHI =
-            InductionDescriptor::isInductionPHI(Inst_i, L, &SE, IndDesc);
-        EXPECT_TRUE(IsInductionPHI);
-      });
-}
diff --git a/gnu/llvm/llvm/unittests/Analysis/InlineCostTest.cpp b/gnu/llvm/llvm/unittests/Analysis/InlineCostTest.cpp
deleted file mode 100644
index cb92ea79c45..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/InlineCostTest.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-//===- InlineCostTest.cpp - test for InlineCost ---------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/InlineCost.h"
-#include "llvm/Analysis/TargetTransformInfo.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "gtest/gtest.h"
-
-namespace {
-
-// Tests that we can retrieve the CostFeatures without an error
-TEST(InlineCostTest, CostFeatures) {
-  using namespace llvm;
-
-  const auto *const IR = R"IR(
-define i32 @f(i32) {
-  ret i32 4
-}
-
-define i32 @g(i32) {
-  %2 = call i32 @f(i32 0)
-  ret i32 %2
-}
-)IR";
-
-  LLVMContext C;
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M = parseAssemblyString(IR, Err, C);
-  ASSERT_TRUE(M);
-
-  auto *G = M->getFunction("g");
-  ASSERT_TRUE(G);
-
-  // find the call to f in g
-  CallBase *CB = nullptr;
-  for (auto &BB : *G) {
-    for (auto &I : BB) {
-      if ((CB = dyn_cast<CallBase>(&I)))
-        break;
-    }
-  }
-  ASSERT_TRUE(CB);
-
-  ModuleAnalysisManager MAM;
-  FunctionAnalysisManager FAM;
-  FAM.registerPass([&] { return TargetIRAnalysis(); });
-  FAM.registerPass([&] { return ModuleAnalysisManagerFunctionProxy(MAM); });
-  FAM.registerPass([&] { return AssumptionAnalysis(); });
-  MAM.registerPass([&] { return FunctionAnalysisManagerModuleProxy(FAM); });
-
-  MAM.registerPass([&] { return PassInstrumentationAnalysis(); });
-  FAM.registerPass([&] { return PassInstrumentationAnalysis(); });
-
-  ModulePassManager MPM;
-  MPM.run(*M, MAM);
-
-  auto GetAssumptionCache = [&](Function &F) -> AssumptionCache & {
-    return FAM.getResult<AssumptionAnalysis>(F);
-  };
-  auto &TIR = FAM.getResult<TargetIRAnalysis>(*G);
-
-  const auto Features =
-      llvm::getInliningCostFeatures(*CB, TIR, GetAssumptionCache);
-
-  // Check that the optional is not empty
-  ASSERT_TRUE(Features);
-}
-
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/Analysis/Inputs/ir2native_x86_64_model/saved_model.pbtxt b/gnu/llvm/llvm/unittests/Analysis/Inputs/ir2native_x86_64_model/saved_model.pbtxt
deleted file mode 100644
index 6efdad51083..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/Inputs/ir2native_x86_64_model/saved_model.pbtxt
+++ /dev/null
@@ -1,10596 +0,0 @@
-saved_model_schema_version: 1
-meta_graphs {
-  meta_info_def {
-    stripped_op_list {
-      op {
-        name: "Const"
-        output_arg {
-          name: "output"
-          type_attr: "dtype"
-        }
-        attr {
-          name: "value"
-          type: "tensor"
-        }
-        attr {
-          name: "dtype"
-          type: "type"
-        }
-      }
-      op {
-        name: "NoOp"
-      }
-      op {
-        name: "Placeholder"
-        output_arg {
-          name: "output"
-          type_attr: "dtype"
-        }
-        attr {
-          name: "dtype"
-          type: "type"
-        }
-        attr {
-          name: "shape"
-          type: "shape"
-          default_value {
-            shape {
-              unknown_rank: true
-            }
-          }
-        }
-      }
-      op {
-        name: "ReadVariableOp"
-        input_arg {
-          name: "resource"
-          type: DT_RESOURCE
-        }
-        output_arg {
-          name: "value"
-          type_attr: "dtype"
-        }
-        attr {
-          name: "dtype"
-          type: "type"
-        }
-        is_stateful: true
-      }
-      op {
-        name: "StatefulPartitionedCall"
-        input_arg {
-          name: "args"
-          type_list_attr: "Tin"
-        }
-        output_arg {
-          name: "output"
-          type_list_attr: "Tout"
-        }
-        attr {
-          name: "Tin"
-          type: "list(type)"
-          has_minimum: true
-        }
-        attr {
-          name: "Tout"
-          type: "list(type)"
-          has_minimum: true
-        }
-        attr {
-          name: "f"
-          type: "func"
-        }
-        attr {
-          name: "config"
-          type: "string"
-          default_value {
-            s: ""
-          }
-        }
-        attr {
-          name: "config_proto"
-          type: "string"
-          default_value {
-            s: ""
-          }
-        }
-        attr {
-          name: "executor_type"
-          type: "string"
-          default_value {
-            s: ""
-          }
-        }
-        is_stateful: true
-      }
-      op {
-        name: "VarHandleOp"
-        output_arg {
-          name: "resource"
-          type: DT_RESOURCE
-        }
-        attr {
-          name: "container"
-          type: "string"
-          default_value {
-            s: ""
-          }
-        }
-        attr {
-          name: "shared_name"
-          type: "string"
-          default_value {
-            s: ""
-          }
-        }
-        attr {
-          name: "dtype"
-          type: "type"
-        }
-        attr {
-          name: "shape"
-          type: "shape"
-        }
-        is_stateful: true
-      }
-    }
-    tags: "serve"
-    tensorflow_version: "1.15.0"
-    tensorflow_git_version: "unknown"
-    stripped_default_attrs: true
-  }
-  graph_def {
-    node {
-      name: "dense/kernel"
-      op: "VarHandleOp"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_FLOAT
-        }
-      }
-      attr {
-        key: "shape"
-        value {
-          shape {
-            dim {
-              size: 214
-            }
-            dim {
-              size: 100
-            }
-          }
-        }
-      }
-      attr {
-        key: "shared_name"
-        value {
-          s: "dense/kernel"
-        }
-      }
-    }
-    node {
-      name: "dense/kernel/Read/ReadVariableOp"
-      op: "ReadVariableOp"
-      input: "dense/kernel"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-              dim {
-                size: 214
-              }
-              dim {
-                size: 100
-              }
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_FLOAT
-        }
-      }
-    }
-    node {
-      name: "dense/bias"
-      op: "VarHandleOp"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_FLOAT
-        }
-      }
-      attr {
-        key: "shape"
-        value {
-          shape {
-            dim {
-              size: 100
-            }
-          }
-        }
-      }
-      attr {
-        key: "shared_name"
-        value {
-          s: "dense/bias"
-        }
-      }
-    }
-    node {
-      name: "dense/bias/Read/ReadVariableOp"
-      op: "ReadVariableOp"
-      input: "dense/bias"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-              dim {
-                size: 100
-              }
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_FLOAT
-        }
-      }
-    }
-    node {
-      name: "dense_1/kernel"
-      op: "VarHandleOp"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_FLOAT
-        }
-      }
-      attr {
-        key: "shape"
-        value {
-          shape {
-            dim {
-              size: 100
-            }
-            dim {
-              size: 1
-            }
-          }
-        }
-      }
-      attr {
-        key: "shared_name"
-        value {
-          s: "dense_1/kernel"
-        }
-      }
-    }
-    node {
-      name: "dense_1/kernel/Read/ReadVariableOp"
-      op: "ReadVariableOp"
-      input: "dense_1/kernel"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-              dim {
-                size: 100
-              }
-              dim {
-                size: 1
-              }
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_FLOAT
-        }
-      }
-    }
-    node {
-      name: "dense_1/bias"
-      op: "VarHandleOp"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_FLOAT
-        }
-      }
-      attr {
-        key: "shape"
-        value {
-          shape {
-            dim {
-              size: 1
-            }
-          }
-        }
-      }
-      attr {
-        key: "shared_name"
-        value {
-          s: "dense_1/bias"
-        }
-      }
-    }
-    node {
-      name: "dense_1/bias/Read/ReadVariableOp"
-      op: "ReadVariableOp"
-      input: "dense_1/bias"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-              dim {
-                size: 1
-              }
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_FLOAT
-        }
-      }
-    }
-    node {
-      name: "total"
-      op: "VarHandleOp"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_FLOAT
-        }
-      }
-      attr {
-        key: "shape"
-        value {
-          shape {
-          }
-        }
-      }
-      attr {
-        key: "shared_name"
-        value {
-          s: "total"
-        }
-      }
-    }
-    node {
-      name: "total/Read/ReadVariableOp"
-      op: "ReadVariableOp"
-      input: "total"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_FLOAT
-        }
-      }
-    }
-    node {
-      name: "count"
-      op: "VarHandleOp"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_FLOAT
-        }
-      }
-      attr {
-        key: "shape"
-        value {
-          shape {
-          }
-        }
-      }
-      attr {
-        key: "shared_name"
-        value {
-          s: "count"
-        }
-      }
-    }
-    node {
-      name: "count/Read/ReadVariableOp"
-      op: "ReadVariableOp"
-      input: "count"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_FLOAT
-        }
-      }
-    }
-    node {
-      name: "total_1"
-      op: "VarHandleOp"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_FLOAT
-        }
-      }
-      attr {
-        key: "shape"
-        value {
-          shape {
-          }
-        }
-      }
-      attr {
-        key: "shared_name"
-        value {
-          s: "total_1"
-        }
-      }
-    }
-    node {
-      name: "total_1/Read/ReadVariableOp"
-      op: "ReadVariableOp"
-      input: "total_1"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_FLOAT
-        }
-      }
-    }
-    node {
-      name: "count_1"
-      op: "VarHandleOp"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_FLOAT
-        }
-      }
-      attr {
-        key: "shape"
-        value {
-          shape {
-          }
-        }
-      }
-      attr {
-        key: "shared_name"
-        value {
-          s: "count_1"
-        }
-      }
-    }
-    node {
-      name: "count_1/Read/ReadVariableOp"
-      op: "ReadVariableOp"
-      input: "count_1"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_FLOAT
-        }
-      }
-    }
-    node {
-      name: "NoOp"
-      op: "NoOp"
-    }
-    node {
-      name: "Const"
-      op: "Const"
-      device: "/device:CPU:0"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_STRING
-        }
-      }
-      attr {
-        key: "value"
-        value {
-          tensor {
-            dtype: DT_STRING
-            tensor_shape {
-            }
-            string_val: "\n\277\001\n\030\010\001\022\024layer_with_weights-0\n\013\010\001\022\007layer-0\n\030\010\002\022\024layer_with_weights-1\n\013\010\002\022\007layer-1\n\r\010\003\022\toptimizer\n\031\010\004\022\025regularization_losses\n\r\010\005\022\tvariables\n\027\010\006\022\023trainable_variables\n\r\010\007\022\tkeras_api\n\016\010\010\022\nsignatures\nh\n\n\010\t\022\006kernel\n\010\010\n\022\004bias\n\031\010\013\022\025regularization_losses\n\r\010\014\022\tvariables\n\027\010\r\022\023trainable_variables\n\r\010\016\022\tkeras_api\nh\n\n\010\017\022\006kernel\n\010\010\020\022\004bias\n\031\010\021\022\025regularization_losses\n\r\010\022\022\tvariables\n\027\010\023\022\023trainable_variables\n\r\010\024\022\tkeras_api\n\000\n\000\n\034\n\005\010\t\022\0010\n\005\010\n\022\0011\n\005\010\017\022\0012\n\005\010\020\022\0013\n\034\n\005\010\t\022\0010\n\005\010\n\022\0011\n\005\010\017\022\0012\n\005\010\020\022\0013\n\255\001\n\n\010\025\022\006layers\n\037\010\026\022\033layer_regularization_losses\n\033\010\027\022\027non_trainable_variables\n\021\010\030\022\rlayer_metrics\n\031\010\004\022\025regularization_losses\n\013\010\031\022\007metrics\n\r\010\005\022\tvariables\n\027\010\006\022\023trainable_variables\n\000\nX\022V\n\016VARIABLE_VALUE\022\014dense/kernel\0326layer_with_weights-0/kernel/.ATTRIBUTES/VARIABLE_VALUE\nT\022R\n\016VARIABLE_VALUE\022\ndense/bias\0324layer_with_weights-0/bias/.ATTRIBUTES/VARIABLE_VALUE\n\000\n\016\n\005\010\t\022\0010\n\005\010\n\022\0011\n\016\n\005\010\t\022\0010\n\005\010\n\022\0011\n\255\001\n\n\010\032\022\006layers\n\037\010\033\022\033layer_regularization_losses\n\033\010\034\022\027non_trainable_variables\n\021\010\035\022\rlayer_metrics\n\031\010\013\022\025regularization_losses\n\013\010\036\022\007metrics\n\r\010\014\022\tvariables\n\027\010\r\022\023trainable_variables\nZ\022X\n\016VARIABLE_VALUE\022\016dense_1/kernel\0326layer_with_weights-1/kernel/.ATTRIBUTES/VARIABLE_VALUE\nV\022T\n\016VARIABLE_VALUE\022\014dense_1/bias\0324layer_with_weights-1/bias/.ATTRIBUTES/VARIABLE_VALUE\n\000\n\016\n\005\010\017\022\0010\n\005\010\020\022\0011\n\016\n\005\010\017\022\0010\n\005\010\020\022\0011\n\255\001\n\n\010\037\022\006layers\n\037\010 \022\033layer_regularization_losses\n\033\010!\022\027non_trainable_variables\n\021\010\"\022\rlayer_metrics\n\031\010\021\022\025regularization_losses\n\013\010#\022\007metrics\n\r\010\022\022\tvariables\n\027\010\023\022\023trainable_variables\n\016\n\005\010\001\022\0010\n\005\010\002\022\0011\n\000\n\000\n\000\n\016\n\005\010$\022\0010\n\005\010%\022\0011\n\000\n\000\n\000\n\000\n\000\n\000\n\000\n\000\n\000\n\000\n4\n\t\010&\022\005total\n\t\010\'\022\005count\n\r\010(\022\tvariables\n\r\010)\022\tkeras_api\nD\n\t\010*\022\005total\n\t\010+\022\005count\n\016\010,\022\n_fn_kwargs\n\r\010-\022\tvariables\n\r\010.\022\tkeras_api\nO\022M\n\016VARIABLE_VALUE\022\005total\0324keras_api/metrics/0/total/.ATTRIBUTES/VARIABLE_VALUE\nO\022M\n\016VARIABLE_VALUE\022\005count\0324keras_api/metrics/0/count/.ATTRIBUTES/VARIABLE_VALUE\n\016\n\005\010&\022\0010\n\005\010\'\022\0011\n\017\n\r\010(\022\tvariables\nQ\022O\n\016VARIABLE_VALUE\022\007total_1\0324keras_api/metrics/1/total/.ATTRIBUTES/VARIABLE_VALUE\nQ\022O\n\016VARIABLE_VALUE\022\007count_1\0324keras_api/metrics/1/count/.ATTRIBUTES/VARIABLE_VALUE\n\000\n\016\n\005\010*\022\0010\n\005\010+\022\0011\n\017\n\r\010-\022\tvariables"
-          }
-        }
-      }
-    }
-    node {
-      name: "serving_default_input_1"
-      op: "Placeholder"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-              dim {
-                size: -1
-              }
-              dim {
-                size: 214
-              }
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_INT32
-        }
-      }
-      attr {
-        key: "shape"
-        value {
-          shape {
-            dim {
-              size: -1
-            }
-            dim {
-              size: 214
-            }
-          }
-        }
-      }
-    }
-    node {
-      name: "StatefulPartitionedCall"
-      op: "StatefulPartitionedCall"
-      input: "serving_default_input_1"
-      input: "dense/kernel"
-      input: "dense/bias"
-      input: "dense_1/kernel"
-      input: "dense_1/bias"
-      attr {
-        key: "Tin"
-        value {
-          list {
-            type: DT_INT32
-            type: DT_RESOURCE
-            type: DT_RESOURCE
-            type: DT_RESOURCE
-            type: DT_RESOURCE
-          }
-        }
-      }
-      attr {
-        key: "Tout"
-        value {
-          list {
-            type: DT_FLOAT
-          }
-        }
-      }
-      attr {
-        key: "_collective_manager_ids"
-        value {
-          list {
-          }
-        }
-      }
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-              dim {
-                size: -1
-              }
-              dim {
-                size: 1
-              }
-            }
-          }
-        }
-      }
-      attr {
-        key: "_read_only_resource_inputs"
-        value {
-          list {
-            i: 1
-            i: 2
-            i: 3
-            i: 4
-          }
-        }
-      }
-      attr {
-        key: "config_proto"
-        value {
-          s: "\n\007\n\003CPU\020\001\n\007\n\003GPU\020\0002\002J\0008\001"
-        }
-      }
-      attr {
-        key: "f"
-        value {
-          func {
-            name: "__inference_signature_wrapper_6671"
-          }
-        }
-      }
-    }
-    node {
-      name: "saver_filename"
-      op: "Placeholder"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_STRING
-        }
-      }
-      attr {
-        key: "shape"
-        value {
-          shape {
-          }
-        }
-      }
-    }
-    node {
-      name: "StatefulPartitionedCall_1"
-      op: "StatefulPartitionedCall"
-      input: "saver_filename"
-      input: "dense/kernel/Read/ReadVariableOp"
-      input: "dense/bias/Read/ReadVariableOp"
-      input: "dense_1/kernel/Read/ReadVariableOp"
-      input: "dense_1/bias/Read/ReadVariableOp"
-      input: "total/Read/ReadVariableOp"
-      input: "count/Read/ReadVariableOp"
-      input: "total_1/Read/ReadVariableOp"
-      input: "count_1/Read/ReadVariableOp"
-      input: "Const"
-      attr {
-        key: "Tin"
-        value {
-          list {
-            type: DT_STRING
-            type: DT_FLOAT
-            type: DT_FLOAT
-            type: DT_FLOAT
-            type: DT_FLOAT
-            type: DT_FLOAT
-            type: DT_FLOAT
-            type: DT_FLOAT
-            type: DT_FLOAT
-            type: DT_STRING
-          }
-        }
-      }
-      attr {
-        key: "Tout"
-        value {
-          list {
-            type: DT_STRING
-          }
-        }
-      }
-      attr {
-        key: "_collective_manager_ids"
-        value {
-          list {
-          }
-        }
-      }
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "_read_only_resource_inputs"
-        value {
-          list {
-          }
-        }
-      }
-      attr {
-        key: "config_proto"
-        value {
-          s: "\n\007\n\003CPU\020\001\n\007\n\003GPU\020\0002\002J\0008\001"
-        }
-      }
-      attr {
-        key: "f"
-        value {
-          func {
-            name: "__inference__traced_save_6824"
-          }
-        }
-      }
-    }
-    node {
-      name: "StatefulPartitionedCall_2"
-      op: "StatefulPartitionedCall"
-      input: "saver_filename"
-      input: "dense/kernel"
-      input: "dense/bias"
-      input: "dense_1/kernel"
-      input: "dense_1/bias"
-      input: "total"
-      input: "count"
-      input: "total_1"
-      input: "count_1"
-      attr {
-        key: "Tin"
-        value {
-          list {
-            type: DT_STRING
-            type: DT_RESOURCE
-            type: DT_RESOURCE
-            type: DT_RESOURCE
-            type: DT_RESOURCE
-            type: DT_RESOURCE
-            type: DT_RESOURCE
-            type: DT_RESOURCE
-            type: DT_RESOURCE
-          }
-        }
-      }
-      attr {
-        key: "Tout"
-        value {
-          list {
-            type: DT_STRING
-          }
-        }
-      }
-      attr {
-        key: "_collective_manager_ids"
-        value {
-          list {
-          }
-        }
-      }
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "_read_only_resource_inputs"
-        value {
-          list {
-          }
-        }
-      }
-      attr {
-        key: "config_proto"
-        value {
-          s: "\n\007\n\003CPU\020\001\n\007\n\003GPU\020\0002\002J\0008\001"
-        }
-      }
-      attr {
-        key: "f"
-        value {
-          func {
-            name: "__inference__traced_restore_6860"
-          }
-        }
-      }
-    }
-    library {
-      function {
-        signature {
-          name: "__inference__traced_restore_6860"
-          input_arg {
-            name: "file_prefix"
-            type: DT_STRING
-          }
-          input_arg {
-            name: "assignvariableop_dense_kernel"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "assignvariableop_1_dense_bias"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "assignvariableop_2_dense_1_kernel"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "assignvariableop_3_dense_1_bias"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "assignvariableop_4_total"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "assignvariableop_5_count"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "assignvariableop_6_total_1"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "assignvariableop_7_count_1"
-            type: DT_RESOURCE
-          }
-          output_arg {
-            name: "identity_9"
-            type: DT_STRING
-          }
-          is_stateful: true
-          control_output: "AssignVariableOp"
-          control_output: "AssignVariableOp_1"
-          control_output: "AssignVariableOp_2"
-          control_output: "AssignVariableOp_3"
-          control_output: "AssignVariableOp_4"
-          control_output: "AssignVariableOp_5"
-          control_output: "AssignVariableOp_6"
-          control_output: "AssignVariableOp_7"
-          control_output: "RestoreV2"
-          control_output: "RestoreV2_1"
-        }
-        node_def {
-          name: "RestoreV2/tensor_names"
-          op: "Const"
-          device: "/device:CPU:0"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: 8
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_STRING
-            }
-          }
-          attr {
-            key: "value"
-            value {
-              tensor {
-                dtype: DT_STRING
-                tensor_shape {
-                  dim {
-                    size: 8
-                  }
-                }
-                string_val: "layer_with_weights-0/kernel/.ATTRIBUTES/VARIABLE_VALUE"
-                string_val: "layer_with_weights-0/bias/.ATTRIBUTES/VARIABLE_VALUE"
-                string_val: "layer_with_weights-1/kernel/.ATTRIBUTES/VARIABLE_VALUE"
-                string_val: "layer_with_weights-1/bias/.ATTRIBUTES/VARIABLE_VALUE"
-                string_val: "keras_api/metrics/0/total/.ATTRIBUTES/VARIABLE_VALUE"
-                string_val: "keras_api/metrics/0/count/.ATTRIBUTES/VARIABLE_VALUE"
-                string_val: "keras_api/metrics/1/total/.ATTRIBUTES/VARIABLE_VALUE"
-                string_val: "keras_api/metrics/1/count/.ATTRIBUTES/VARIABLE_VALUE"
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "RestoreV2/tensor_names"
-          }
-        }
-        node_def {
-          name: "RestoreV2/shape_and_slices"
-          op: "Const"
-          device: "/device:CPU:0"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: 8
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_STRING
-            }
-          }
-          attr {
-            key: "value"
-            value {
-              tensor {
-                dtype: DT_STRING
-                tensor_shape {
-                  dim {
-                    size: 8
-                  }
-                }
-                string_val: ""
-                string_val: ""
-                string_val: ""
-                string_val: ""
-                string_val: ""
-                string_val: ""
-                string_val: ""
-                string_val: ""
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "RestoreV2/shape_and_slices"
-          }
-        }
-        node_def {
-          name: "RestoreV2"
-          op: "RestoreV2"
-          input: "file_prefix"
-          input: "RestoreV2/tensor_names:output:0"
-          input: "RestoreV2/shape_and_slices:output:0"
-          device: "/device:CPU:0"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  unknown_rank: true
-                }
-                shape {
-                  unknown_rank: true
-                }
-                shape {
-                  unknown_rank: true
-                }
-                shape {
-                  unknown_rank: true
-                }
-                shape {
-                  unknown_rank: true
-                }
-                shape {
-                  unknown_rank: true
-                }
-                shape {
-                  unknown_rank: true
-                }
-                shape {
-                  unknown_rank: true
-                }
-              }
-            }
-          }
-          attr {
-            key: "dtypes"
-            value {
-              list {
-                type: DT_FLOAT
-                type: DT_FLOAT
-                type: DT_FLOAT
-                type: DT_FLOAT
-                type: DT_FLOAT
-                type: DT_FLOAT
-                type: DT_FLOAT
-                type: DT_FLOAT
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "RestoreV2"
-          }
-        }
-        node_def {
-          name: "Identity"
-          op: "Identity"
-          input: "RestoreV2:tensors:0"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  unknown_rank: true
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Identity"
-          }
-        }
-        node_def {
-          name: "AssignVariableOp"
-          op: "AssignVariableOp"
-          input: "assignvariableop_dense_kernel"
-          input: "Identity:output:0"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "AssignVariableOp"
-          }
-        }
-        node_def {
-          name: "Identity_1"
-          op: "Identity"
-          input: "RestoreV2:tensors:1"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  unknown_rank: true
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Identity_1"
-          }
-        }
-        node_def {
-          name: "AssignVariableOp_1"
-          op: "AssignVariableOp"
-          input: "assignvariableop_1_dense_bias"
-          input: "Identity_1:output:0"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "AssignVariableOp_1"
-          }
-        }
-        node_def {
-          name: "Identity_2"
-          op: "Identity"
-          input: "RestoreV2:tensors:2"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  unknown_rank: true
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Identity_2"
-          }
-        }
-        node_def {
-          name: "AssignVariableOp_2"
-          op: "AssignVariableOp"
-          input: "assignvariableop_2_dense_1_kernel"
-          input: "Identity_2:output:0"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "AssignVariableOp_2"
-          }
-        }
-        node_def {
-          name: "Identity_3"
-          op: "Identity"
-          input: "RestoreV2:tensors:3"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  unknown_rank: true
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Identity_3"
-          }
-        }
-        node_def {
-          name: "AssignVariableOp_3"
-          op: "AssignVariableOp"
-          input: "assignvariableop_3_dense_1_bias"
-          input: "Identity_3:output:0"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "AssignVariableOp_3"
-          }
-        }
-        node_def {
-          name: "Identity_4"
-          op: "Identity"
-          input: "RestoreV2:tensors:4"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  unknown_rank: true
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Identity_4"
-          }
-        }
-        node_def {
-          name: "AssignVariableOp_4"
-          op: "AssignVariableOp"
-          input: "assignvariableop_4_total"
-          input: "Identity_4:output:0"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "AssignVariableOp_4"
-          }
-        }
-        node_def {
-          name: "Identity_5"
-          op: "Identity"
-          input: "RestoreV2:tensors:5"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  unknown_rank: true
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Identity_5"
-          }
-        }
-        node_def {
-          name: "AssignVariableOp_5"
-          op: "AssignVariableOp"
-          input: "assignvariableop_5_count"
-          input: "Identity_5:output:0"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "AssignVariableOp_5"
-          }
-        }
-        node_def {
-          name: "Identity_6"
-          op: "Identity"
-          input: "RestoreV2:tensors:6"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  unknown_rank: true
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Identity_6"
-          }
-        }
-        node_def {
-          name: "AssignVariableOp_6"
-          op: "AssignVariableOp"
-          input: "assignvariableop_6_total_1"
-          input: "Identity_6:output:0"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "AssignVariableOp_6"
-          }
-        }
-        node_def {
-          name: "Identity_7"
-          op: "Identity"
-          input: "RestoreV2:tensors:7"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  unknown_rank: true
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Identity_7"
-          }
-        }
-        node_def {
-          name: "AssignVariableOp_7"
-          op: "AssignVariableOp"
-          input: "assignvariableop_7_count_1"
-          input: "Identity_7:output:0"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "AssignVariableOp_7"
-          }
-        }
-        node_def {
-          name: "RestoreV2_1/tensor_names"
-          op: "Const"
-          device: "/device:CPU:0"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_STRING
-            }
-          }
-          attr {
-            key: "value"
-            value {
-              tensor {
-                dtype: DT_STRING
-                tensor_shape {
-                  dim {
-                    size: 1
-                  }
-                }
-                string_val: "_CHECKPOINTABLE_OBJECT_GRAPH"
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "RestoreV2_1/tensor_names"
-          }
-        }
-        node_def {
-          name: "RestoreV2_1/shape_and_slices"
-          op: "Const"
-          device: "/device:CPU:0"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_STRING
-            }
-          }
-          attr {
-            key: "value"
-            value {
-              tensor {
-                dtype: DT_STRING
-                tensor_shape {
-                  dim {
-                    size: 1
-                  }
-                }
-                string_val: ""
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "RestoreV2_1/shape_and_slices"
-          }
-        }
-        node_def {
-          name: "RestoreV2_1"
-          op: "RestoreV2"
-          input: "file_prefix"
-          input: "RestoreV2_1/tensor_names:output:0"
-          input: "RestoreV2_1/shape_and_slices:output:0"
-          input: "^RestoreV2"
-          device: "/device:CPU:0"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  unknown_rank: true
-                }
-              }
-            }
-          }
-          attr {
-            key: "dtypes"
-            value {
-              list {
-                type: DT_STRING
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "RestoreV2_1"
-          }
-        }
-        node_def {
-          name: "NoOp"
-          op: "NoOp"
-          device: "/device:CPU:0"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "NoOp"
-          }
-        }
-        node_def {
-          name: "Identity_8"
-          op: "Identity"
-          input: "file_prefix"
-          input: "^AssignVariableOp"
-          input: "^AssignVariableOp_1"
-          input: "^AssignVariableOp_2"
-          input: "^AssignVariableOp_3"
-          input: "^AssignVariableOp_4"
-          input: "^AssignVariableOp_5"
-          input: "^AssignVariableOp_6"
-          input: "^AssignVariableOp_7"
-          input: "^NoOp"
-          device: "/device:CPU:0"
-          attr {
-            key: "T"
-            value {
-              type: DT_STRING
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Identity_8"
-          }
-        }
-        node_def {
-          name: "Identity_9"
-          op: "Identity"
-          input: "Identity_8:output:0"
-          input: "^AssignVariableOp"
-          input: "^AssignVariableOp_1"
-          input: "^AssignVariableOp_2"
-          input: "^AssignVariableOp_3"
-          input: "^AssignVariableOp_4"
-          input: "^AssignVariableOp_5"
-          input: "^AssignVariableOp_6"
-          input: "^AssignVariableOp_7"
-          input: "^RestoreV2"
-          input: "^RestoreV2_1"
-          attr {
-            key: "T"
-            value {
-              type: DT_STRING
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Identity_9"
-          }
-        }
-        ret {
-          key: "identity_9"
-          value: "Identity_9:output:0"
-        }
-        attr {
-          key: "_input_shapes"
-          value {
-            list {
-              shape {
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-            }
-          }
-        }
-        control_ret {
-          key: "AssignVariableOp"
-          value: "AssignVariableOp"
-        }
-        control_ret {
-          key: "AssignVariableOp_1"
-          value: "AssignVariableOp_1"
-        }
-        control_ret {
-          key: "AssignVariableOp_2"
-          value: "AssignVariableOp_2"
-        }
-        control_ret {
-          key: "AssignVariableOp_3"
-          value: "AssignVariableOp_3"
-        }
-        control_ret {
-          key: "AssignVariableOp_4"
-          value: "AssignVariableOp_4"
-        }
-        control_ret {
-          key: "AssignVariableOp_5"
-          value: "AssignVariableOp_5"
-        }
-        control_ret {
-          key: "AssignVariableOp_6"
-          value: "AssignVariableOp_6"
-        }
-        control_ret {
-          key: "AssignVariableOp_7"
-          value: "AssignVariableOp_7"
-        }
-        control_ret {
-          key: "RestoreV2"
-          value: "RestoreV2"
-        }
-        control_ret {
-          key: "RestoreV2_1"
-          value: "RestoreV2_1"
-        }
-        arg_attr {
-          key: 0
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-            attr {
-              key: "_user_specified_name"
-              value {
-                s: "file_prefix"
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 1
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 2
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 3
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 4
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 5
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 6
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 7
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 8
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-      function {
-        signature {
-          name: "__inference_sequential_layer_call_fn_6629"
-          input_arg {
-            name: "input_1"
-            type: DT_INT32
-          }
-          input_arg {
-            name: "unknown"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "unknown_0"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "unknown_1"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "unknown_2"
-            type: DT_RESOURCE
-          }
-          output_arg {
-            name: "identity"
-            type: DT_FLOAT
-          }
-          is_stateful: true
-          control_output: "StatefulPartitionedCall"
-        }
-        node_def {
-          name: "StatefulPartitionedCall"
-          op: "StatefulPartitionedCall"
-          input: "input_1"
-          input: "unknown"
-          input: "unknown_0"
-          input: "unknown_1"
-          input: "unknown_2"
-          attr {
-            key: "Tin"
-            value {
-              list {
-                type: DT_INT32
-                type: DT_RESOURCE
-                type: DT_RESOURCE
-                type: DT_RESOURCE
-                type: DT_RESOURCE
-              }
-            }
-          }
-          attr {
-            key: "Tout"
-            value {
-              list {
-                type: DT_FLOAT
-              }
-            }
-          }
-          attr {
-            key: "_collective_manager_ids"
-            value {
-              list {
-              }
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "_read_only_resource_inputs"
-            value {
-              list {
-                i: 1
-                i: 2
-                i: 3
-                i: 4
-              }
-            }
-          }
-          attr {
-            key: "config_proto"
-            value {
-              s: "\n\007\n\003CPU\020\001\n\007\n\003GPU\020\0002\002J\0008\001"
-            }
-          }
-          attr {
-            key: "f"
-            value {
-              func {
-                name: "__inference_sequential_layer_call_and_return_conditional_losses_6618"
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "StatefulPartitionedCall"
-          }
-        }
-        node_def {
-          name: "Identity"
-          op: "Identity"
-          input: "StatefulPartitionedCall:output:0"
-          input: "^StatefulPartitionedCall"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Identity"
-          }
-        }
-        ret {
-          key: "identity"
-          value: "Identity:output:0"
-        }
-        attr {
-          key: "_input_shapes"
-          value {
-            list {
-              shape {
-                dim {
-                  size: -1
-                }
-                dim {
-                  size: 214
-                }
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-            }
-          }
-        }
-        control_ret {
-          key: "StatefulPartitionedCall"
-          value: "StatefulPartitionedCall"
-        }
-        arg_attr {
-          key: 0
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                    dim {
-                      size: -1
-                    }
-                    dim {
-                      size: 214
-                    }
-                  }
-                }
-              }
-            }
-            attr {
-              key: "_user_specified_name"
-              value {
-                s: "input_1"
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 1
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 2
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 3
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 4
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-      function {
-        signature {
-          name: "__inference_sequential_layer_call_and_return_conditional_losses_6587"
-          input_arg {
-            name: "input_1"
-            type: DT_INT32
-          }
-          input_arg {
-            name: "dense_6555"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "dense_6557"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "dense_1_6581"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "dense_1_6583"
-            type: DT_RESOURCE
-          }
-          output_arg {
-            name: "identity"
-            type: DT_FLOAT
-          }
-          is_stateful: true
-          control_output: "dense/StatefulPartitionedCall"
-          control_output: "dense_1/StatefulPartitionedCall"
-        }
-        node_def {
-          name: "dense/StatefulPartitionedCall"
-          op: "StatefulPartitionedCall"
-          input: "input_1"
-          input: "dense_6555"
-          input: "dense_6557"
-          attr {
-            key: "Tin"
-            value {
-              list {
-                type: DT_INT32
-                type: DT_RESOURCE
-                type: DT_RESOURCE
-              }
-            }
-          }
-          attr {
-            key: "Tout"
-            value {
-              list {
-                type: DT_FLOAT
-              }
-            }
-          }
-          attr {
-            key: "_collective_manager_ids"
-            value {
-              list {
-              }
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 100
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "_read_only_resource_inputs"
-            value {
-              list {
-                i: 1
-                i: 2
-              }
-            }
-          }
-          attr {
-            key: "config_proto"
-            value {
-              s: "\n\007\n\003CPU\020\001\n\007\n\003GPU\020\0002\002J\0008\001"
-            }
-          }
-          attr {
-            key: "f"
-            value {
-              func {
-                name: "__inference_dense_layer_call_and_return_conditional_losses_6544"
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "dense/StatefulPartitionedCall"
-          }
-        }
-        node_def {
-          name: "dense_1/StatefulPartitionedCall"
-          op: "StatefulPartitionedCall"
-          input: "dense/StatefulPartitionedCall:output:0"
-          input: "dense_1_6581"
-          input: "dense_1_6583"
-          attr {
-            key: "Tin"
-            value {
-              list {
-                type: DT_FLOAT
-                type: DT_RESOURCE
-                type: DT_RESOURCE
-              }
-            }
-          }
-          attr {
-            key: "Tout"
-            value {
-              list {
-                type: DT_FLOAT
-              }
-            }
-          }
-          attr {
-            key: "_collective_manager_ids"
-            value {
-              list {
-              }
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "_read_only_resource_inputs"
-            value {
-              list {
-                i: 1
-                i: 2
-              }
-            }
-          }
-          attr {
-            key: "config_proto"
-            value {
-              s: "\n\007\n\003CPU\020\001\n\007\n\003GPU\020\0002\002J\0008\001"
-            }
-          }
-          attr {
-            key: "f"
-            value {
-              func {
-                name: "__inference_dense_1_layer_call_and_return_conditional_losses_6570"
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "dense_1/StatefulPartitionedCall"
-          }
-        }
-        node_def {
-          name: "Identity"
-          op: "Identity"
-          input: "dense_1/StatefulPartitionedCall:output:0"
-          input: "^dense/StatefulPartitionedCall"
-          input: "^dense_1/StatefulPartitionedCall"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Identity"
-          }
-        }
-        ret {
-          key: "identity"
-          value: "Identity:output:0"
-        }
-        attr {
-          key: "_input_shapes"
-          value {
-            list {
-              shape {
-                dim {
-                  size: -1
-                }
-                dim {
-                  size: 214
-                }
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-            }
-          }
-        }
-        control_ret {
-          key: "dense/StatefulPartitionedCall"
-          value: "dense/StatefulPartitionedCall"
-        }
-        control_ret {
-          key: "dense_1/StatefulPartitionedCall"
-          value: "dense_1/StatefulPartitionedCall"
-        }
-        arg_attr {
-          key: 0
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                    dim {
-                      size: -1
-                    }
-                    dim {
-                      size: 214
-                    }
-                  }
-                }
-              }
-            }
-            attr {
-              key: "_user_specified_name"
-              value {
-                s: "input_1"
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 1
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 2
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 3
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 4
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-      function {
-        signature {
-          name: "__inference_sequential_layer_call_and_return_conditional_losses_6618"
-          input_arg {
-            name: "inputs"
-            type: DT_INT32
-          }
-          input_arg {
-            name: "dense_6607"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "dense_6609"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "dense_1_6612"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "dense_1_6614"
-            type: DT_RESOURCE
-          }
-          output_arg {
-            name: "identity"
-            type: DT_FLOAT
-          }
-          is_stateful: true
-          control_output: "dense/StatefulPartitionedCall"
-          control_output: "dense_1/StatefulPartitionedCall"
-        }
-        node_def {
-          name: "dense/StatefulPartitionedCall"
-          op: "StatefulPartitionedCall"
-          input: "inputs"
-          input: "dense_6607"
-          input: "dense_6609"
-          attr {
-            key: "Tin"
-            value {
-              list {
-                type: DT_INT32
-                type: DT_RESOURCE
-                type: DT_RESOURCE
-              }
-            }
-          }
-          attr {
-            key: "Tout"
-            value {
-              list {
-                type: DT_FLOAT
-              }
-            }
-          }
-          attr {
-            key: "_collective_manager_ids"
-            value {
-              list {
-              }
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 100
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "_read_only_resource_inputs"
-            value {
-              list {
-                i: 1
-                i: 2
-              }
-            }
-          }
-          attr {
-            key: "config_proto"
-            value {
-              s: "\n\007\n\003CPU\020\001\n\007\n\003GPU\020\0002\002J\0008\001"
-            }
-          }
-          attr {
-            key: "f"
-            value {
-              func {
-                name: "__inference_dense_layer_call_and_return_conditional_losses_6544"
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "dense/StatefulPartitionedCall"
-          }
-        }
-        node_def {
-          name: "dense_1/StatefulPartitionedCall"
-          op: "StatefulPartitionedCall"
-          input: "dense/StatefulPartitionedCall:output:0"
-          input: "dense_1_6612"
-          input: "dense_1_6614"
-          attr {
-            key: "Tin"
-            value {
-              list {
-                type: DT_FLOAT
-                type: DT_RESOURCE
-                type: DT_RESOURCE
-              }
-            }
-          }
-          attr {
-            key: "Tout"
-            value {
-              list {
-                type: DT_FLOAT
-              }
-            }
-          }
-          attr {
-            key: "_collective_manager_ids"
-            value {
-              list {
-              }
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "_read_only_resource_inputs"
-            value {
-              list {
-                i: 1
-                i: 2
-              }
-            }
-          }
-          attr {
-            key: "config_proto"
-            value {
-              s: "\n\007\n\003CPU\020\001\n\007\n\003GPU\020\0002\002J\0008\001"
-            }
-          }
-          attr {
-            key: "f"
-            value {
-              func {
-                name: "__inference_dense_1_layer_call_and_return_conditional_losses_6570"
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "dense_1/StatefulPartitionedCall"
-          }
-        }
-        node_def {
-          name: "Identity"
-          op: "Identity"
-          input: "dense_1/StatefulPartitionedCall:output:0"
-          input: "^dense/StatefulPartitionedCall"
-          input: "^dense_1/StatefulPartitionedCall"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Identity"
-          }
-        }
-        ret {
-          key: "identity"
-          value: "Identity:output:0"
-        }
-        attr {
-          key: "_input_shapes"
-          value {
-            list {
-              shape {
-                dim {
-                  size: -1
-                }
-                dim {
-                  size: 214
-                }
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-            }
-          }
-        }
-        control_ret {
-          key: "dense/StatefulPartitionedCall"
-          value: "dense/StatefulPartitionedCall"
-        }
-        control_ret {
-          key: "dense_1/StatefulPartitionedCall"
-          value: "dense_1/StatefulPartitionedCall"
-        }
-        arg_attr {
-          key: 0
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                    dim {
-                      size: -1
-                    }
-                    dim {
-                      size: 214
-                    }
-                  }
-                }
-              }
-            }
-            attr {
-              key: "_user_specified_name"
-              value {
-                s: "inputs"
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 1
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 2
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 3
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 4
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-      function {
-        signature {
-          name: "__inference_sequential_layer_call_fn_6656"
-          input_arg {
-            name: "input_1"
-            type: DT_INT32
-          }
-          input_arg {
-            name: "unknown"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "unknown_0"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "unknown_1"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "unknown_2"
-            type: DT_RESOURCE
-          }
-          output_arg {
-            name: "identity"
-            type: DT_FLOAT
-          }
-          is_stateful: true
-          control_output: "StatefulPartitionedCall"
-        }
-        node_def {
-          name: "StatefulPartitionedCall"
-          op: "StatefulPartitionedCall"
-          input: "input_1"
-          input: "unknown"
-          input: "unknown_0"
-          input: "unknown_1"
-          input: "unknown_2"
-          attr {
-            key: "Tin"
-            value {
-              list {
-                type: DT_INT32
-                type: DT_RESOURCE
-                type: DT_RESOURCE
-                type: DT_RESOURCE
-                type: DT_RESOURCE
-              }
-            }
-          }
-          attr {
-            key: "Tout"
-            value {
-              list {
-                type: DT_FLOAT
-              }
-            }
-          }
-          attr {
-            key: "_collective_manager_ids"
-            value {
-              list {
-              }
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "_read_only_resource_inputs"
-            value {
-              list {
-                i: 1
-                i: 2
-                i: 3
-                i: 4
-              }
-            }
-          }
-          attr {
-            key: "config_proto"
-            value {
-              s: "\n\007\n\003CPU\020\001\n\007\n\003GPU\020\0002\002J\0008\001"
-            }
-          }
-          attr {
-            key: "f"
-            value {
-              func {
-                name: "__inference_sequential_layer_call_and_return_conditional_losses_6645"
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "StatefulPartitionedCall"
-          }
-        }
-        node_def {
-          name: "Identity"
-          op: "Identity"
-          input: "StatefulPartitionedCall:output:0"
-          input: "^StatefulPartitionedCall"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Identity"
-          }
-        }
-        ret {
-          key: "identity"
-          value: "Identity:output:0"
-        }
-        attr {
-          key: "_input_shapes"
-          value {
-            list {
-              shape {
-                dim {
-                  size: -1
-                }
-                dim {
-                  size: 214
-                }
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-            }
-          }
-        }
-        control_ret {
-          key: "StatefulPartitionedCall"
-          value: "StatefulPartitionedCall"
-        }
-        arg_attr {
-          key: 0
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                    dim {
-                      size: -1
-                    }
-                    dim {
-                      size: 214
-                    }
-                  }
-                }
-              }
-            }
-            attr {
-              key: "_user_specified_name"
-              value {
-                s: "input_1"
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 1
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 2
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 3
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 4
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-      function {
-        signature {
-          name: "__inference_dense_1_layer_call_and_return_conditional_losses_6764"
-          input_arg {
-            name: "inputs"
-            type: DT_FLOAT
-          }
-          input_arg {
-            name: "matmul_readvariableop_resource"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "biasadd_readvariableop_resource"
-            type: DT_RESOURCE
-          }
-          output_arg {
-            name: "identity"
-            type: DT_FLOAT
-          }
-          is_stateful: true
-        }
-        node_def {
-          name: "MatMul/ReadVariableOp"
-          op: "ReadVariableOp"
-          input: "matmul_readvariableop_resource"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: 100
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "MatMul/ReadVariableOp"
-          }
-        }
-        node_def {
-          name: "MatMul"
-          op: "MatMul"
-          input: "inputs"
-          input: "MatMul/ReadVariableOp:value:0"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "MatMul"
-          }
-        }
-        node_def {
-          name: "BiasAdd/ReadVariableOp"
-          op: "ReadVariableOp"
-          input: "biasadd_readvariableop_resource"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "BiasAdd/ReadVariableOp"
-          }
-        }
-        node_def {
-          name: "BiasAdd"
-          op: "BiasAdd"
-          input: "MatMul:product:0"
-          input: "BiasAdd/ReadVariableOp:value:0"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "BiasAdd"
-          }
-        }
-        node_def {
-          name: "Identity"
-          op: "Identity"
-          input: "BiasAdd:output:0"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Identity"
-          }
-        }
-        ret {
-          key: "identity"
-          value: "Identity:output:0"
-        }
-        attr {
-          key: "_input_shapes"
-          value {
-            list {
-              shape {
-                dim {
-                  size: -1
-                }
-                dim {
-                  size: 100
-                }
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 0
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                    dim {
-                      size: -1
-                    }
-                    dim {
-                      size: 100
-                    }
-                  }
-                }
-              }
-            }
-            attr {
-              key: "_user_specified_name"
-              value {
-                s: "inputs"
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 1
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 2
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-      function {
-        signature {
-          name: "__inference_dense_layer_call_fn_6754"
-          input_arg {
-            name: "inputs"
-            type: DT_INT32
-          }
-          input_arg {
-            name: "unknown"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "unknown_0"
-            type: DT_RESOURCE
-          }
-          output_arg {
-            name: "identity"
-            type: DT_FLOAT
-          }
-          is_stateful: true
-          control_output: "StatefulPartitionedCall"
-        }
-        node_def {
-          name: "StatefulPartitionedCall"
-          op: "StatefulPartitionedCall"
-          input: "inputs"
-          input: "unknown"
-          input: "unknown_0"
-          attr {
-            key: "Tin"
-            value {
-              list {
-                type: DT_INT32
-                type: DT_RESOURCE
-                type: DT_RESOURCE
-              }
-            }
-          }
-          attr {
-            key: "Tout"
-            value {
-              list {
-                type: DT_FLOAT
-              }
-            }
-          }
-          attr {
-            key: "_collective_manager_ids"
-            value {
-              list {
-              }
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 100
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "_read_only_resource_inputs"
-            value {
-              list {
-                i: 1
-                i: 2
-              }
-            }
-          }
-          attr {
-            key: "config_proto"
-            value {
-              s: "\n\007\n\003CPU\020\001\n\007\n\003GPU\020\0002\002J\0008\001"
-            }
-          }
-          attr {
-            key: "f"
-            value {
-              func {
-                name: "__inference_dense_layer_call_and_return_conditional_losses_6544"
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "StatefulPartitionedCall"
-          }
-        }
-        node_def {
-          name: "Identity"
-          op: "Identity"
-          input: "StatefulPartitionedCall:output:0"
-          input: "^StatefulPartitionedCall"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 100
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Identity"
-          }
-        }
-        ret {
-          key: "identity"
-          value: "Identity:output:0"
-        }
-        attr {
-          key: "_input_shapes"
-          value {
-            list {
-              shape {
-                dim {
-                  size: -1
-                }
-                dim {
-                  size: 214
-                }
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-            }
-          }
-        }
-        control_ret {
-          key: "StatefulPartitionedCall"
-          value: "StatefulPartitionedCall"
-        }
-        arg_attr {
-          key: 0
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                    dim {
-                      size: -1
-                    }
-                    dim {
-                      size: 214
-                    }
-                  }
-                }
-              }
-            }
-            attr {
-              key: "_user_specified_name"
-              value {
-                s: "inputs"
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 1
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 2
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-      function {
-        signature {
-          name: "__inference__traced_save_6824"
-          input_arg {
-            name: "file_prefix"
-            type: DT_STRING
-          }
-          input_arg {
-            name: "savev2_dense_kernel_read_readvariableop"
-            type: DT_FLOAT
-          }
-          input_arg {
-            name: "savev2_dense_bias_read_readvariableop"
-            type: DT_FLOAT
-          }
-          input_arg {
-            name: "savev2_dense_1_kernel_read_readvariableop"
-            type: DT_FLOAT
-          }
-          input_arg {
-            name: "savev2_dense_1_bias_read_readvariableop"
-            type: DT_FLOAT
-          }
-          input_arg {
-            name: "savev2_total_read_readvariableop"
-            type: DT_FLOAT
-          }
-          input_arg {
-            name: "savev2_count_read_readvariableop"
-            type: DT_FLOAT
-          }
-          input_arg {
-            name: "savev2_total_1_read_readvariableop"
-            type: DT_FLOAT
-          }
-          input_arg {
-            name: "savev2_count_1_read_readvariableop"
-            type: DT_FLOAT
-          }
-          input_arg {
-            name: "savev2_1_const"
-            type: DT_STRING
-          }
-          output_arg {
-            name: "identity_1"
-            type: DT_STRING
-          }
-          is_stateful: true
-          control_output: "MergeV2Checkpoints"
-          control_output: "SaveV2"
-          control_output: "SaveV2_1"
-        }
-        node_def {
-          name: "StaticRegexFullMatch"
-          op: "StaticRegexFullMatch"
-          input: "file_prefix"
-          device: "/device:CPU:*"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                }
-              }
-            }
-          }
-          attr {
-            key: "pattern"
-            value {
-              s: "^s3://.*"
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "StaticRegexFullMatch"
-          }
-        }
-        node_def {
-          name: "Const"
-          op: "Const"
-          device: "/device:CPU:*"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                }
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_STRING
-            }
-          }
-          attr {
-            key: "value"
-            value {
-              tensor {
-                dtype: DT_STRING
-                tensor_shape {
-                }
-                string_val: ".part"
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Const"
-          }
-        }
-        node_def {
-          name: "Const_1"
-          op: "Const"
-          device: "/device:CPU:*"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                }
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_STRING
-            }
-          }
-          attr {
-            key: "value"
-            value {
-              tensor {
-                dtype: DT_STRING
-                tensor_shape {
-                }
-                string_val: "_temp_6f1e5fef49bb4c06ace07a8a95dfbb1b/part"
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Const_1"
-          }
-        }
-        node_def {
-          name: "Select"
-          op: "Select"
-          input: "StaticRegexFullMatch:output:0"
-          input: "Const:output:0"
-          input: "Const_1:output:0"
-          device: "/device:CPU:*"
-          attr {
-            key: "T"
-            value {
-              type: DT_STRING
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Select"
-          }
-        }
-        node_def {
-          name: "StringJoin"
-          op: "StringJoin"
-          input: "file_prefix"
-          input: "Select:output:0"
-          device: "/device:CPU:*"
-          attr {
-            key: "N"
-            value {
-              i: 2
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "StringJoin"
-          }
-        }
-        node_def {
-          name: "num_shards"
-          op: "Const"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                }
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_INT32
-            }
-          }
-          attr {
-            key: "value"
-            value {
-              tensor {
-                dtype: DT_INT32
-                tensor_shape {
-                }
-                int_val: 2
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "num_shards"
-          }
-        }
-        node_def {
-          name: "ShardedFilename/shard"
-          op: "Const"
-          device: "/device:CPU:0"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                }
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_INT32
-            }
-          }
-          attr {
-            key: "value"
-            value {
-              tensor {
-                dtype: DT_INT32
-                tensor_shape {
-                }
-                int_val: 0
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "ShardedFilename/shard"
-          }
-        }
-        node_def {
-          name: "ShardedFilename"
-          op: "ShardedFilename"
-          input: "StringJoin:output:0"
-          input: "ShardedFilename/shard:output:0"
-          input: "num_shards:output:0"
-          device: "/device:CPU:0"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "ShardedFilename"
-          }
-        }
-        node_def {
-          name: "SaveV2/tensor_names"
-          op: "Const"
-          device: "/device:CPU:0"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: 8
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_STRING
-            }
-          }
-          attr {
-            key: "value"
-            value {
-              tensor {
-                dtype: DT_STRING
-                tensor_shape {
-                  dim {
-                    size: 8
-                  }
-                }
-                string_val: "layer_with_weights-0/kernel/.ATTRIBUTES/VARIABLE_VALUE"
-                string_val: "layer_with_weights-0/bias/.ATTRIBUTES/VARIABLE_VALUE"
-                string_val: "layer_with_weights-1/kernel/.ATTRIBUTES/VARIABLE_VALUE"
-                string_val: "layer_with_weights-1/bias/.ATTRIBUTES/VARIABLE_VALUE"
-                string_val: "keras_api/metrics/0/total/.ATTRIBUTES/VARIABLE_VALUE"
-                string_val: "keras_api/metrics/0/count/.ATTRIBUTES/VARIABLE_VALUE"
-                string_val: "keras_api/metrics/1/total/.ATTRIBUTES/VARIABLE_VALUE"
-                string_val: "keras_api/metrics/1/count/.ATTRIBUTES/VARIABLE_VALUE"
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "SaveV2/tensor_names"
-          }
-        }
-        node_def {
-          name: "SaveV2/shape_and_slices"
-          op: "Const"
-          device: "/device:CPU:0"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: 8
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_STRING
-            }
-          }
-          attr {
-            key: "value"
-            value {
-              tensor {
-                dtype: DT_STRING
-                tensor_shape {
-                  dim {
-                    size: 8
-                  }
-                }
-                string_val: ""
-                string_val: ""
-                string_val: ""
-                string_val: ""
-                string_val: ""
-                string_val: ""
-                string_val: ""
-                string_val: ""
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "SaveV2/shape_and_slices"
-          }
-        }
-        node_def {
-          name: "SaveV2"
-          op: "SaveV2"
-          input: "ShardedFilename:filename:0"
-          input: "SaveV2/tensor_names:output:0"
-          input: "SaveV2/shape_and_slices:output:0"
-          input: "savev2_dense_kernel_read_readvariableop"
-          input: "savev2_dense_bias_read_readvariableop"
-          input: "savev2_dense_1_kernel_read_readvariableop"
-          input: "savev2_dense_1_bias_read_readvariableop"
-          input: "savev2_total_read_readvariableop"
-          input: "savev2_count_read_readvariableop"
-          input: "savev2_total_1_read_readvariableop"
-          input: "savev2_count_1_read_readvariableop"
-          device: "/device:CPU:0"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-              }
-            }
-          }
-          attr {
-            key: "dtypes"
-            value {
-              list {
-                type: DT_FLOAT
-                type: DT_FLOAT
-                type: DT_FLOAT
-                type: DT_FLOAT
-                type: DT_FLOAT
-                type: DT_FLOAT
-                type: DT_FLOAT
-                type: DT_FLOAT
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "SaveV2"
-          }
-        }
-        node_def {
-          name: "ShardedFilename_1/shard"
-          op: "Const"
-          device: "/device:CPU:0"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                }
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_INT32
-            }
-          }
-          attr {
-            key: "value"
-            value {
-              tensor {
-                dtype: DT_INT32
-                tensor_shape {
-                }
-                int_val: 1
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "ShardedFilename_1/shard"
-          }
-        }
-        node_def {
-          name: "ShardedFilename_1"
-          op: "ShardedFilename"
-          input: "StringJoin:output:0"
-          input: "ShardedFilename_1/shard:output:0"
-          input: "num_shards:output:0"
-          device: "/device:CPU:0"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "ShardedFilename_1"
-          }
-        }
-        node_def {
-          name: "SaveV2_1/tensor_names"
-          op: "Const"
-          device: "/device:CPU:0"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_STRING
-            }
-          }
-          attr {
-            key: "value"
-            value {
-              tensor {
-                dtype: DT_STRING
-                tensor_shape {
-                  dim {
-                    size: 1
-                  }
-                }
-                string_val: "_CHECKPOINTABLE_OBJECT_GRAPH"
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "SaveV2_1/tensor_names"
-          }
-        }
-        node_def {
-          name: "SaveV2_1/shape_and_slices"
-          op: "Const"
-          device: "/device:CPU:0"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_STRING
-            }
-          }
-          attr {
-            key: "value"
-            value {
-              tensor {
-                dtype: DT_STRING
-                tensor_shape {
-                  dim {
-                    size: 1
-                  }
-                }
-                string_val: ""
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "SaveV2_1/shape_and_slices"
-          }
-        }
-        node_def {
-          name: "SaveV2_1"
-          op: "SaveV2"
-          input: "ShardedFilename_1:filename:0"
-          input: "SaveV2_1/tensor_names:output:0"
-          input: "SaveV2_1/shape_and_slices:output:0"
-          input: "savev2_1_const"
-          input: "^SaveV2"
-          device: "/device:CPU:0"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-              }
-            }
-          }
-          attr {
-            key: "dtypes"
-            value {
-              list {
-                type: DT_STRING
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "SaveV2_1"
-          }
-        }
-        node_def {
-          name: "MergeV2Checkpoints/checkpoint_prefixes"
-          op: "Pack"
-          input: "ShardedFilename:filename:0"
-          input: "ShardedFilename_1:filename:0"
-          input: "^SaveV2"
-          input: "^SaveV2_1"
-          device: "/device:CPU:0"
-          attr {
-            key: "N"
-            value {
-              i: 2
-            }
-          }
-          attr {
-            key: "T"
-            value {
-              type: DT_STRING
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: 2
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "MergeV2Checkpoints/checkpoint_prefixes"
-          }
-        }
-        node_def {
-          name: "MergeV2Checkpoints"
-          op: "MergeV2Checkpoints"
-          input: "MergeV2Checkpoints/checkpoint_prefixes:output:0"
-          input: "file_prefix"
-          input: "^SaveV2_1"
-          device: "/device:CPU:0"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "MergeV2Checkpoints"
-          }
-        }
-        node_def {
-          name: "Identity"
-          op: "Identity"
-          input: "file_prefix"
-          input: "^MergeV2Checkpoints"
-          device: "/device:CPU:0"
-          attr {
-            key: "T"
-            value {
-              type: DT_STRING
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Identity"
-          }
-        }
-        node_def {
-          name: "Identity_1"
-          op: "Identity"
-          input: "Identity:output:0"
-          input: "^MergeV2Checkpoints"
-          input: "^SaveV2"
-          input: "^SaveV2_1"
-          attr {
-            key: "T"
-            value {
-              type: DT_STRING
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Identity_1"
-          }
-        }
-        ret {
-          key: "identity_1"
-          value: "Identity_1:output:0"
-        }
-        attr {
-          key: "_input_shapes"
-          value {
-            list {
-              shape {
-              }
-              shape {
-                dim {
-                  size: 214
-                }
-                dim {
-                  size: 100
-                }
-              }
-              shape {
-                dim {
-                  size: 100
-                }
-              }
-              shape {
-                dim {
-                  size: 100
-                }
-                dim {
-                  size: 1
-                }
-              }
-              shape {
-                dim {
-                  size: 1
-                }
-              }
-              shape {
-              }
-              shape {
-              }
-              shape {
-              }
-              shape {
-              }
-              shape {
-              }
-            }
-          }
-        }
-        control_ret {
-          key: "MergeV2Checkpoints"
-          value: "MergeV2Checkpoints"
-        }
-        control_ret {
-          key: "SaveV2"
-          value: "SaveV2"
-        }
-        control_ret {
-          key: "SaveV2_1"
-          value: "SaveV2_1"
-        }
-        arg_attr {
-          key: 0
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-            attr {
-              key: "_user_specified_name"
-              value {
-                s: "file_prefix"
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 1
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                    dim {
-                      size: 214
-                    }
-                    dim {
-                      size: 100
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 2
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                    dim {
-                      size: 100
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 3
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                    dim {
-                      size: 100
-                    }
-                    dim {
-                      size: 1
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 4
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                    dim {
-                      size: 1
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 5
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 6
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 7
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 8
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 9
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-      function {
-        signature {
-          name: "__inference_sequential_layer_call_and_return_conditional_losses_6689"
-          input_arg {
-            name: "inputs"
-            type: DT_INT32
-          }
-          input_arg {
-            name: "dense_matmul_readvariableop_resource"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "dense_biasadd_readvariableop_resource"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "dense_1_matmul_readvariableop_resource"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "dense_1_biasadd_readvariableop_resource"
-            type: DT_RESOURCE
-          }
-          output_arg {
-            name: "identity"
-            type: DT_FLOAT
-          }
-          is_stateful: true
-        }
-        node_def {
-          name: "dense/Cast"
-          op: "Cast"
-          input: "inputs"
-          attr {
-            key: "DstT"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "SrcT"
-            value {
-              type: DT_INT32
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 214
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "dense/Cast"
-          }
-        }
-        node_def {
-          name: "dense/MatMul/ReadVariableOp"
-          op: "ReadVariableOp"
-          input: "dense_matmul_readvariableop_resource"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: 214
-                  }
-                  dim {
-                    size: 100
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "dense/MatMul/ReadVariableOp"
-          }
-        }
-        node_def {
-          name: "dense/MatMul"
-          op: "MatMul"
-          input: "dense/Cast:y:0"
-          input: "dense/MatMul/ReadVariableOp:value:0"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 100
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "dense/MatMul"
-          }
-        }
-        node_def {
-          name: "dense/BiasAdd/ReadVariableOp"
-          op: "ReadVariableOp"
-          input: "dense_biasadd_readvariableop_resource"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: 100
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "dense/BiasAdd/ReadVariableOp"
-          }
-        }
-        node_def {
-          name: "dense/BiasAdd"
-          op: "BiasAdd"
-          input: "dense/MatMul:product:0"
-          input: "dense/BiasAdd/ReadVariableOp:value:0"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 100
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "dense/BiasAdd"
-          }
-        }
-        node_def {
-          name: "dense/Relu"
-          op: "Relu"
-          input: "dense/BiasAdd:output:0"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 100
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "dense/Relu"
-          }
-        }
-        node_def {
-          name: "dense_1/MatMul/ReadVariableOp"
-          op: "ReadVariableOp"
-          input: "dense_1_matmul_readvariableop_resource"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: 100
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "dense_1/MatMul/ReadVariableOp"
-          }
-        }
-        node_def {
-          name: "dense_1/MatMul"
-          op: "MatMul"
-          input: "dense/Relu:activations:0"
-          input: "dense_1/MatMul/ReadVariableOp:value:0"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "dense_1/MatMul"
-          }
-        }
-        node_def {
-          name: "dense_1/BiasAdd/ReadVariableOp"
-          op: "ReadVariableOp"
-          input: "dense_1_biasadd_readvariableop_resource"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "dense_1/BiasAdd/ReadVariableOp"
-          }
-        }
-        node_def {
-          name: "dense_1/BiasAdd"
-          op: "BiasAdd"
-          input: "dense_1/MatMul:product:0"
-          input: "dense_1/BiasAdd/ReadVariableOp:value:0"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "dense_1/BiasAdd"
-          }
-        }
-        node_def {
-          name: "Identity"
-          op: "Identity"
-          input: "dense_1/BiasAdd:output:0"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Identity"
-          }
-        }
-        ret {
-          key: "identity"
-          value: "Identity:output:0"
-        }
-        attr {
-          key: "_input_shapes"
-          value {
-            list {
-              shape {
-                dim {
-                  size: -1
-                }
-                dim {
-                  size: 214
-                }
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 0
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                    dim {
-                      size: -1
-                    }
-                    dim {
-                      size: 214
-                    }
-                  }
-                }
-              }
-            }
-            attr {
-              key: "_user_specified_name"
-              value {
-                s: "inputs"
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 1
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 2
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 3
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 4
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-      function {
-        signature {
-          name: "__inference_dense_layer_call_and_return_conditional_losses_6745"
-          input_arg {
-            name: "inputs"
-            type: DT_INT32
-          }
-          input_arg {
-            name: "matmul_readvariableop_resource"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "biasadd_readvariableop_resource"
-            type: DT_RESOURCE
-          }
-          output_arg {
-            name: "identity"
-            type: DT_FLOAT
-          }
-          is_stateful: true
-        }
-        node_def {
-          name: "Cast"
-          op: "Cast"
-          input: "inputs"
-          attr {
-            key: "DstT"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "SrcT"
-            value {
-              type: DT_INT32
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 214
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Cast"
-          }
-        }
-        node_def {
-          name: "MatMul/ReadVariableOp"
-          op: "ReadVariableOp"
-          input: "matmul_readvariableop_resource"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: 214
-                  }
-                  dim {
-                    size: 100
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "MatMul/ReadVariableOp"
-          }
-        }
-        node_def {
-          name: "MatMul"
-          op: "MatMul"
-          input: "Cast:y:0"
-          input: "MatMul/ReadVariableOp:value:0"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 100
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "MatMul"
-          }
-        }
-        node_def {
-          name: "BiasAdd/ReadVariableOp"
-          op: "ReadVariableOp"
-          input: "biasadd_readvariableop_resource"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: 100
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "BiasAdd/ReadVariableOp"
-          }
-        }
-        node_def {
-          name: "BiasAdd"
-          op: "BiasAdd"
-          input: "MatMul:product:0"
-          input: "BiasAdd/ReadVariableOp:value:0"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 100
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "BiasAdd"
-          }
-        }
-        node_def {
-          name: "Relu"
-          op: "Relu"
-          input: "BiasAdd:output:0"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 100
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Relu"
-          }
-        }
-        node_def {
-          name: "Identity"
-          op: "Identity"
-          input: "Relu:activations:0"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 100
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Identity"
-          }
-        }
-        ret {
-          key: "identity"
-          value: "Identity:output:0"
-        }
-        attr {
-          key: "_input_shapes"
-          value {
-            list {
-              shape {
-                dim {
-                  size: -1
-                }
-                dim {
-                  size: 214
-                }
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 0
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                    dim {
-                      size: -1
-                    }
-                    dim {
-                      size: 214
-                    }
-                  }
-                }
-              }
-            }
-            attr {
-              key: "_user_specified_name"
-              value {
-                s: "inputs"
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 1
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 2
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-      function {
-        signature {
-          name: "__inference_dense_1_layer_call_fn_6773"
-          input_arg {
-            name: "inputs"
-            type: DT_FLOAT
-          }
-          input_arg {
-            name: "unknown"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "unknown_0"
-            type: DT_RESOURCE
-          }
-          output_arg {
-            name: "identity"
-            type: DT_FLOAT
-          }
-          is_stateful: true
-          control_output: "StatefulPartitionedCall"
-        }
-        node_def {
-          name: "StatefulPartitionedCall"
-          op: "StatefulPartitionedCall"
-          input: "inputs"
-          input: "unknown"
-          input: "unknown_0"
-          attr {
-            key: "Tin"
-            value {
-              list {
-                type: DT_FLOAT
-                type: DT_RESOURCE
-                type: DT_RESOURCE
-              }
-            }
-          }
-          attr {
-            key: "Tout"
-            value {
-              list {
-                type: DT_FLOAT
-              }
-            }
-          }
-          attr {
-            key: "_collective_manager_ids"
-            value {
-              list {
-              }
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "_read_only_resource_inputs"
-            value {
-              list {
-                i: 1
-                i: 2
-              }
-            }
-          }
-          attr {
-            key: "config_proto"
-            value {
-              s: "\n\007\n\003CPU\020\001\n\007\n\003GPU\020\0002\002J\0008\001"
-            }
-          }
-          attr {
-            key: "f"
-            value {
-              func {
-                name: "__inference_dense_1_layer_call_and_return_conditional_losses_6570"
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "StatefulPartitionedCall"
-          }
-        }
-        node_def {
-          name: "Identity"
-          op: "Identity"
-          input: "StatefulPartitionedCall:output:0"
-          input: "^StatefulPartitionedCall"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Identity"
-          }
-        }
-        ret {
-          key: "identity"
-          value: "Identity:output:0"
-        }
-        attr {
-          key: "_input_shapes"
-          value {
-            list {
-              shape {
-                dim {
-                  size: -1
-                }
-                dim {
-                  size: 100
-                }
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-            }
-          }
-        }
-        control_ret {
-          key: "StatefulPartitionedCall"
-          value: "StatefulPartitionedCall"
-        }
-        arg_attr {
-          key: 0
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                    dim {
-                      size: -1
-                    }
-                    dim {
-                      size: 100
-                    }
-                  }
-                }
-              }
-            }
-            attr {
-              key: "_user_specified_name"
-              value {
-                s: "inputs"
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 1
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 2
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-      function {
-        signature {
-          name: "__inference__wrapped_model_6528"
-          input_arg {
-            name: "input_1"
-            type: DT_INT32
-          }
-          input_arg {
-            name: "sequential_dense_matmul_readvariableop_resource"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "sequential_dense_biasadd_readvariableop_resource"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "sequential_dense_1_matmul_readvariableop_resource"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "sequential_dense_1_biasadd_readvariableop_resource"
-            type: DT_RESOURCE
-          }
-          output_arg {
-            name: "identity"
-            type: DT_FLOAT
-          }
-          is_stateful: true
-        }
-        node_def {
-          name: "sequential/dense/Cast"
-          op: "Cast"
-          input: "input_1"
-          attr {
-            key: "DstT"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "SrcT"
-            value {
-              type: DT_INT32
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 214
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "sequential/dense/Cast"
-          }
-        }
-        node_def {
-          name: "sequential/dense/MatMul/ReadVariableOp"
-          op: "ReadVariableOp"
-          input: "sequential_dense_matmul_readvariableop_resource"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: 214
-                  }
-                  dim {
-                    size: 100
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "sequential/dense/MatMul/ReadVariableOp"
-          }
-        }
-        node_def {
-          name: "sequential/dense/MatMul"
-          op: "MatMul"
-          input: "sequential/dense/Cast:y:0"
-          input: "sequential/dense/MatMul/ReadVariableOp:value:0"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 100
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "sequential/dense/MatMul"
-          }
-        }
-        node_def {
-          name: "sequential/dense/BiasAdd/ReadVariableOp"
-          op: "ReadVariableOp"
-          input: "sequential_dense_biasadd_readvariableop_resource"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: 100
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "sequential/dense/BiasAdd/ReadVariableOp"
-          }
-        }
-        node_def {
-          name: "sequential/dense/BiasAdd"
-          op: "BiasAdd"
-          input: "sequential/dense/MatMul:product:0"
-          input: "sequential/dense/BiasAdd/ReadVariableOp:value:0"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 100
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "sequential/dense/BiasAdd"
-          }
-        }
-        node_def {
-          name: "sequential/dense/Relu"
-          op: "Relu"
-          input: "sequential/dense/BiasAdd:output:0"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 100
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "sequential/dense/Relu"
-          }
-        }
-        node_def {
-          name: "sequential/dense_1/MatMul/ReadVariableOp"
-          op: "ReadVariableOp"
-          input: "sequential_dense_1_matmul_readvariableop_resource"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: 100
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "sequential/dense_1/MatMul/ReadVariableOp"
-          }
-        }
-        node_def {
-          name: "sequential/dense_1/MatMul"
-          op: "MatMul"
-          input: "sequential/dense/Relu:activations:0"
-          input: "sequential/dense_1/MatMul/ReadVariableOp:value:0"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "sequential/dense_1/MatMul"
-          }
-        }
-        node_def {
-          name: "sequential/dense_1/BiasAdd/ReadVariableOp"
-          op: "ReadVariableOp"
-          input: "sequential_dense_1_biasadd_readvariableop_resource"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "sequential/dense_1/BiasAdd/ReadVariableOp"
-          }
-        }
-        node_def {
-          name: "sequential/dense_1/BiasAdd"
-          op: "BiasAdd"
-          input: "sequential/dense_1/MatMul:product:0"
-          input: "sequential/dense_1/BiasAdd/ReadVariableOp:value:0"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "sequential/dense_1/BiasAdd"
-          }
-        }
-        node_def {
-          name: "Identity"
-          op: "Identity"
-          input: "sequential/dense_1/BiasAdd:output:0"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Identity"
-          }
-        }
-        ret {
-          key: "identity"
-          value: "Identity:output:0"
-        }
-        attr {
-          key: "_input_shapes"
-          value {
-            list {
-              shape {
-                dim {
-                  size: -1
-                }
-                dim {
-                  size: 214
-                }
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 0
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                    dim {
-                      size: -1
-                    }
-                    dim {
-                      size: 214
-                    }
-                  }
-                }
-              }
-            }
-            attr {
-              key: "_user_specified_name"
-              value {
-                s: "input_1"
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 1
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 2
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 3
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 4
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-      function {
-        signature {
-          name: "__inference_dense_layer_call_and_return_conditional_losses_6544"
-          input_arg {
-            name: "inputs"
-            type: DT_INT32
-          }
-          input_arg {
-            name: "matmul_readvariableop_resource"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "biasadd_readvariableop_resource"
-            type: DT_RESOURCE
-          }
-          output_arg {
-            name: "identity"
-            type: DT_FLOAT
-          }
-          is_stateful: true
-        }
-        node_def {
-          name: "Cast"
-          op: "Cast"
-          input: "inputs"
-          attr {
-            key: "DstT"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "SrcT"
-            value {
-              type: DT_INT32
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 214
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Cast"
-          }
-        }
-        node_def {
-          name: "MatMul/ReadVariableOp"
-          op: "ReadVariableOp"
-          input: "matmul_readvariableop_resource"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: 214
-                  }
-                  dim {
-                    size: 100
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "MatMul/ReadVariableOp"
-          }
-        }
-        node_def {
-          name: "MatMul"
-          op: "MatMul"
-          input: "Cast:y:0"
-          input: "MatMul/ReadVariableOp:value:0"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 100
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "MatMul"
-          }
-        }
-        node_def {
-          name: "BiasAdd/ReadVariableOp"
-          op: "ReadVariableOp"
-          input: "biasadd_readvariableop_resource"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: 100
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "BiasAdd/ReadVariableOp"
-          }
-        }
-        node_def {
-          name: "BiasAdd"
-          op: "BiasAdd"
-          input: "MatMul:product:0"
-          input: "BiasAdd/ReadVariableOp:value:0"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 100
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "BiasAdd"
-          }
-        }
-        node_def {
-          name: "Relu"
-          op: "Relu"
-          input: "BiasAdd:output:0"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 100
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Relu"
-          }
-        }
-        node_def {
-          name: "Identity"
-          op: "Identity"
-          input: "Relu:activations:0"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 100
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Identity"
-          }
-        }
-        ret {
-          key: "identity"
-          value: "Identity:output:0"
-        }
-        attr {
-          key: "_input_shapes"
-          value {
-            list {
-              shape {
-                dim {
-                  size: -1
-                }
-                dim {
-                  size: 214
-                }
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 0
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                    dim {
-                      size: -1
-                    }
-                    dim {
-                      size: 214
-                    }
-                  }
-                }
-              }
-            }
-            attr {
-              key: "_user_specified_name"
-              value {
-                s: "inputs"
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 1
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 2
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-      function {
-        signature {
-          name: "__inference_sequential_layer_call_and_return_conditional_losses_6601"
-          input_arg {
-            name: "input_1"
-            type: DT_INT32
-          }
-          input_arg {
-            name: "dense_6590"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "dense_6592"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "dense_1_6595"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "dense_1_6597"
-            type: DT_RESOURCE
-          }
-          output_arg {
-            name: "identity"
-            type: DT_FLOAT
-          }
-          is_stateful: true
-          control_output: "dense/StatefulPartitionedCall"
-          control_output: "dense_1/StatefulPartitionedCall"
-        }
-        node_def {
-          name: "dense/StatefulPartitionedCall"
-          op: "StatefulPartitionedCall"
-          input: "input_1"
-          input: "dense_6590"
-          input: "dense_6592"
-          attr {
-            key: "Tin"
-            value {
-              list {
-                type: DT_INT32
-                type: DT_RESOURCE
-                type: DT_RESOURCE
-              }
-            }
-          }
-          attr {
-            key: "Tout"
-            value {
-              list {
-                type: DT_FLOAT
-              }
-            }
-          }
-          attr {
-            key: "_collective_manager_ids"
-            value {
-              list {
-              }
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 100
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "_read_only_resource_inputs"
-            value {
-              list {
-                i: 1
-                i: 2
-              }
-            }
-          }
-          attr {
-            key: "config_proto"
-            value {
-              s: "\n\007\n\003CPU\020\001\n\007\n\003GPU\020\0002\002J\0008\001"
-            }
-          }
-          attr {
-            key: "f"
-            value {
-              func {
-                name: "__inference_dense_layer_call_and_return_conditional_losses_6544"
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "dense/StatefulPartitionedCall"
-          }
-        }
-        node_def {
-          name: "dense_1/StatefulPartitionedCall"
-          op: "StatefulPartitionedCall"
-          input: "dense/StatefulPartitionedCall:output:0"
-          input: "dense_1_6595"
-          input: "dense_1_6597"
-          attr {
-            key: "Tin"
-            value {
-              list {
-                type: DT_FLOAT
-                type: DT_RESOURCE
-                type: DT_RESOURCE
-              }
-            }
-          }
-          attr {
-            key: "Tout"
-            value {
-              list {
-                type: DT_FLOAT
-              }
-            }
-          }
-          attr {
-            key: "_collective_manager_ids"
-            value {
-              list {
-              }
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "_read_only_resource_inputs"
-            value {
-              list {
-                i: 1
-                i: 2
-              }
-            }
-          }
-          attr {
-            key: "config_proto"
-            value {
-              s: "\n\007\n\003CPU\020\001\n\007\n\003GPU\020\0002\002J\0008\001"
-            }
-          }
-          attr {
-            key: "f"
-            value {
-              func {
-                name: "__inference_dense_1_layer_call_and_return_conditional_losses_6570"
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "dense_1/StatefulPartitionedCall"
-          }
-        }
-        node_def {
-          name: "Identity"
-          op: "Identity"
-          input: "dense_1/StatefulPartitionedCall:output:0"
-          input: "^dense/StatefulPartitionedCall"
-          input: "^dense_1/StatefulPartitionedCall"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Identity"
-          }
-        }
-        ret {
-          key: "identity"
-          value: "Identity:output:0"
-        }
-        attr {
-          key: "_input_shapes"
-          value {
-            list {
-              shape {
-                dim {
-                  size: -1
-                }
-                dim {
-                  size: 214
-                }
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-            }
-          }
-        }
-        control_ret {
-          key: "dense/StatefulPartitionedCall"
-          value: "dense/StatefulPartitionedCall"
-        }
-        control_ret {
-          key: "dense_1/StatefulPartitionedCall"
-          value: "dense_1/StatefulPartitionedCall"
-        }
-        arg_attr {
-          key: 0
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                    dim {
-                      size: -1
-                    }
-                    dim {
-                      size: 214
-                    }
-                  }
-                }
-              }
-            }
-            attr {
-              key: "_user_specified_name"
-              value {
-                s: "input_1"
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 1
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 2
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 3
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 4
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-      function {
-        signature {
-          name: "__inference_sequential_layer_call_fn_6733"
-          input_arg {
-            name: "inputs"
-            type: DT_INT32
-          }
-          input_arg {
-            name: "unknown"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "unknown_0"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "unknown_1"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "unknown_2"
-            type: DT_RESOURCE
-          }
-          output_arg {
-            name: "identity"
-            type: DT_FLOAT
-          }
-          is_stateful: true
-          control_output: "StatefulPartitionedCall"
-        }
-        node_def {
-          name: "StatefulPartitionedCall"
-          op: "StatefulPartitionedCall"
-          input: "inputs"
-          input: "unknown"
-          input: "unknown_0"
-          input: "unknown_1"
-          input: "unknown_2"
-          attr {
-            key: "Tin"
-            value {
-              list {
-                type: DT_INT32
-                type: DT_RESOURCE
-                type: DT_RESOURCE
-                type: DT_RESOURCE
-                type: DT_RESOURCE
-              }
-            }
-          }
-          attr {
-            key: "Tout"
-            value {
-              list {
-                type: DT_FLOAT
-              }
-            }
-          }
-          attr {
-            key: "_collective_manager_ids"
-            value {
-              list {
-              }
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "_read_only_resource_inputs"
-            value {
-              list {
-                i: 1
-                i: 2
-                i: 3
-                i: 4
-              }
-            }
-          }
-          attr {
-            key: "config_proto"
-            value {
-              s: "\n\007\n\003CPU\020\001\n\007\n\003GPU\020\0002\002J\0008\001"
-            }
-          }
-          attr {
-            key: "f"
-            value {
-              func {
-                name: "__inference_sequential_layer_call_and_return_conditional_losses_6645"
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "StatefulPartitionedCall"
-          }
-        }
-        node_def {
-          name: "Identity"
-          op: "Identity"
-          input: "StatefulPartitionedCall:output:0"
-          input: "^StatefulPartitionedCall"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Identity"
-          }
-        }
-        ret {
-          key: "identity"
-          value: "Identity:output:0"
-        }
-        attr {
-          key: "_input_shapes"
-          value {
-            list {
-              shape {
-                dim {
-                  size: -1
-                }
-                dim {
-                  size: 214
-                }
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-            }
-          }
-        }
-        control_ret {
-          key: "StatefulPartitionedCall"
-          value: "StatefulPartitionedCall"
-        }
-        arg_attr {
-          key: 0
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                    dim {
-                      size: -1
-                    }
-                    dim {
-                      size: 214
-                    }
-                  }
-                }
-              }
-            }
-            attr {
-              key: "_user_specified_name"
-              value {
-                s: "inputs"
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 1
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 2
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 3
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 4
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-      function {
-        signature {
-          name: "__inference_sequential_layer_call_and_return_conditional_losses_6645"
-          input_arg {
-            name: "inputs"
-            type: DT_INT32
-          }
-          input_arg {
-            name: "dense_6634"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "dense_6636"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "dense_1_6639"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "dense_1_6641"
-            type: DT_RESOURCE
-          }
-          output_arg {
-            name: "identity"
-            type: DT_FLOAT
-          }
-          is_stateful: true
-          control_output: "dense/StatefulPartitionedCall"
-          control_output: "dense_1/StatefulPartitionedCall"
-        }
-        node_def {
-          name: "dense/StatefulPartitionedCall"
-          op: "StatefulPartitionedCall"
-          input: "inputs"
-          input: "dense_6634"
-          input: "dense_6636"
-          attr {
-            key: "Tin"
-            value {
-              list {
-                type: DT_INT32
-                type: DT_RESOURCE
-                type: DT_RESOURCE
-              }
-            }
-          }
-          attr {
-            key: "Tout"
-            value {
-              list {
-                type: DT_FLOAT
-              }
-            }
-          }
-          attr {
-            key: "_collective_manager_ids"
-            value {
-              list {
-              }
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 100
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "_read_only_resource_inputs"
-            value {
-              list {
-                i: 1
-                i: 2
-              }
-            }
-          }
-          attr {
-            key: "config_proto"
-            value {
-              s: "\n\007\n\003CPU\020\001\n\007\n\003GPU\020\0002\002J\0008\001"
-            }
-          }
-          attr {
-            key: "f"
-            value {
-              func {
-                name: "__inference_dense_layer_call_and_return_conditional_losses_6544"
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "dense/StatefulPartitionedCall"
-          }
-        }
-        node_def {
-          name: "dense_1/StatefulPartitionedCall"
-          op: "StatefulPartitionedCall"
-          input: "dense/StatefulPartitionedCall:output:0"
-          input: "dense_1_6639"
-          input: "dense_1_6641"
-          attr {
-            key: "Tin"
-            value {
-              list {
-                type: DT_FLOAT
-                type: DT_RESOURCE
-                type: DT_RESOURCE
-              }
-            }
-          }
-          attr {
-            key: "Tout"
-            value {
-              list {
-                type: DT_FLOAT
-              }
-            }
-          }
-          attr {
-            key: "_collective_manager_ids"
-            value {
-              list {
-              }
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "_read_only_resource_inputs"
-            value {
-              list {
-                i: 1
-                i: 2
-              }
-            }
-          }
-          attr {
-            key: "config_proto"
-            value {
-              s: "\n\007\n\003CPU\020\001\n\007\n\003GPU\020\0002\002J\0008\001"
-            }
-          }
-          attr {
-            key: "f"
-            value {
-              func {
-                name: "__inference_dense_1_layer_call_and_return_conditional_losses_6570"
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "dense_1/StatefulPartitionedCall"
-          }
-        }
-        node_def {
-          name: "Identity"
-          op: "Identity"
-          input: "dense_1/StatefulPartitionedCall:output:0"
-          input: "^dense/StatefulPartitionedCall"
-          input: "^dense_1/StatefulPartitionedCall"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Identity"
-          }
-        }
-        ret {
-          key: "identity"
-          value: "Identity:output:0"
-        }
-        attr {
-          key: "_input_shapes"
-          value {
-            list {
-              shape {
-                dim {
-                  size: -1
-                }
-                dim {
-                  size: 214
-                }
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-            }
-          }
-        }
-        control_ret {
-          key: "dense/StatefulPartitionedCall"
-          value: "dense/StatefulPartitionedCall"
-        }
-        control_ret {
-          key: "dense_1/StatefulPartitionedCall"
-          value: "dense_1/StatefulPartitionedCall"
-        }
-        arg_attr {
-          key: 0
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                    dim {
-                      size: -1
-                    }
-                    dim {
-                      size: 214
-                    }
-                  }
-                }
-              }
-            }
-            attr {
-              key: "_user_specified_name"
-              value {
-                s: "inputs"
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 1
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 2
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 3
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 4
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-      function {
-        signature {
-          name: "__inference_dense_1_layer_call_and_return_conditional_losses_6570"
-          input_arg {
-            name: "inputs"
-            type: DT_FLOAT
-          }
-          input_arg {
-            name: "matmul_readvariableop_resource"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "biasadd_readvariableop_resource"
-            type: DT_RESOURCE
-          }
-          output_arg {
-            name: "identity"
-            type: DT_FLOAT
-          }
-          is_stateful: true
-        }
-        node_def {
-          name: "MatMul/ReadVariableOp"
-          op: "ReadVariableOp"
-          input: "matmul_readvariableop_resource"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: 100
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "MatMul/ReadVariableOp"
-          }
-        }
-        node_def {
-          name: "MatMul"
-          op: "MatMul"
-          input: "inputs"
-          input: "MatMul/ReadVariableOp:value:0"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "MatMul"
-          }
-        }
-        node_def {
-          name: "BiasAdd/ReadVariableOp"
-          op: "ReadVariableOp"
-          input: "biasadd_readvariableop_resource"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "BiasAdd/ReadVariableOp"
-          }
-        }
-        node_def {
-          name: "BiasAdd"
-          op: "BiasAdd"
-          input: "MatMul:product:0"
-          input: "BiasAdd/ReadVariableOp:value:0"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "BiasAdd"
-          }
-        }
-        node_def {
-          name: "Identity"
-          op: "Identity"
-          input: "BiasAdd:output:0"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Identity"
-          }
-        }
-        ret {
-          key: "identity"
-          value: "Identity:output:0"
-        }
-        attr {
-          key: "_input_shapes"
-          value {
-            list {
-              shape {
-                dim {
-                  size: -1
-                }
-                dim {
-                  size: 100
-                }
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 0
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                    dim {
-                      size: -1
-                    }
-                    dim {
-                      size: 100
-                    }
-                  }
-                }
-              }
-            }
-            attr {
-              key: "_user_specified_name"
-              value {
-                s: "inputs"
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 1
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 2
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-      function {
-        signature {
-          name: "__inference_signature_wrapper_6671"
-          input_arg {
-            name: "input_1"
-            type: DT_INT32
-          }
-          input_arg {
-            name: "unknown"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "unknown_0"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "unknown_1"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "unknown_2"
-            type: DT_RESOURCE
-          }
-          output_arg {
-            name: "identity"
-            type: DT_FLOAT
-          }
-          is_stateful: true
-          control_output: "StatefulPartitionedCall"
-        }
-        node_def {
-          name: "StatefulPartitionedCall"
-          op: "StatefulPartitionedCall"
-          input: "input_1"
-          input: "unknown"
-          input: "unknown_0"
-          input: "unknown_1"
-          input: "unknown_2"
-          attr {
-            key: "Tin"
-            value {
-              list {
-                type: DT_INT32
-                type: DT_RESOURCE
-                type: DT_RESOURCE
-                type: DT_RESOURCE
-                type: DT_RESOURCE
-              }
-            }
-          }
-          attr {
-            key: "Tout"
-            value {
-              list {
-                type: DT_FLOAT
-              }
-            }
-          }
-          attr {
-            key: "_collective_manager_ids"
-            value {
-              list {
-              }
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "_read_only_resource_inputs"
-            value {
-              list {
-                i: 1
-                i: 2
-                i: 3
-                i: 4
-              }
-            }
-          }
-          attr {
-            key: "config_proto"
-            value {
-              s: "\n\007\n\003CPU\020\001\n\007\n\003GPU\020\0002\002J\0008\001"
-            }
-          }
-          attr {
-            key: "f"
-            value {
-              func {
-                name: "__inference__wrapped_model_6528"
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "StatefulPartitionedCall"
-          }
-        }
-        node_def {
-          name: "Identity"
-          op: "Identity"
-          input: "StatefulPartitionedCall:output:0"
-          input: "^StatefulPartitionedCall"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Identity"
-          }
-        }
-        ret {
-          key: "identity"
-          value: "Identity:output:0"
-        }
-        attr {
-          key: "_input_shapes"
-          value {
-            list {
-              shape {
-                dim {
-                  size: -1
-                }
-                dim {
-                  size: 214
-                }
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-            }
-          }
-        }
-        control_ret {
-          key: "StatefulPartitionedCall"
-          value: "StatefulPartitionedCall"
-        }
-        arg_attr {
-          key: 0
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                    dim {
-                      size: -1
-                    }
-                    dim {
-                      size: 214
-                    }
-                  }
-                }
-              }
-            }
-            attr {
-              key: "_user_specified_name"
-              value {
-                s: "input_1"
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 1
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 2
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 3
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 4
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-      function {
-        signature {
-          name: "__inference_sequential_layer_call_fn_6720"
-          input_arg {
-            name: "inputs"
-            type: DT_INT32
-          }
-          input_arg {
-            name: "unknown"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "unknown_0"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "unknown_1"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "unknown_2"
-            type: DT_RESOURCE
-          }
-          output_arg {
-            name: "identity"
-            type: DT_FLOAT
-          }
-          is_stateful: true
-          control_output: "StatefulPartitionedCall"
-        }
-        node_def {
-          name: "StatefulPartitionedCall"
-          op: "StatefulPartitionedCall"
-          input: "inputs"
-          input: "unknown"
-          input: "unknown_0"
-          input: "unknown_1"
-          input: "unknown_2"
-          attr {
-            key: "Tin"
-            value {
-              list {
-                type: DT_INT32
-                type: DT_RESOURCE
-                type: DT_RESOURCE
-                type: DT_RESOURCE
-                type: DT_RESOURCE
-              }
-            }
-          }
-          attr {
-            key: "Tout"
-            value {
-              list {
-                type: DT_FLOAT
-              }
-            }
-          }
-          attr {
-            key: "_collective_manager_ids"
-            value {
-              list {
-              }
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "_read_only_resource_inputs"
-            value {
-              list {
-                i: 1
-                i: 2
-                i: 3
-                i: 4
-              }
-            }
-          }
-          attr {
-            key: "config_proto"
-            value {
-              s: "\n\007\n\003CPU\020\001\n\007\n\003GPU\020\0002\002J\0008\001"
-            }
-          }
-          attr {
-            key: "f"
-            value {
-              func {
-                name: "__inference_sequential_layer_call_and_return_conditional_losses_6618"
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "StatefulPartitionedCall"
-          }
-        }
-        node_def {
-          name: "Identity"
-          op: "Identity"
-          input: "StatefulPartitionedCall:output:0"
-          input: "^StatefulPartitionedCall"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Identity"
-          }
-        }
-        ret {
-          key: "identity"
-          value: "Identity:output:0"
-        }
-        attr {
-          key: "_input_shapes"
-          value {
-            list {
-              shape {
-                dim {
-                  size: -1
-                }
-                dim {
-                  size: 214
-                }
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-            }
-          }
-        }
-        control_ret {
-          key: "StatefulPartitionedCall"
-          value: "StatefulPartitionedCall"
-        }
-        arg_attr {
-          key: 0
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                    dim {
-                      size: -1
-                    }
-                    dim {
-                      size: 214
-                    }
-                  }
-                }
-              }
-            }
-            attr {
-              key: "_user_specified_name"
-              value {
-                s: "inputs"
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 1
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 2
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 3
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 4
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-      function {
-        signature {
-          name: "__inference_sequential_layer_call_and_return_conditional_losses_6707"
-          input_arg {
-            name: "inputs"
-            type: DT_INT32
-          }
-          input_arg {
-            name: "dense_matmul_readvariableop_resource"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "dense_biasadd_readvariableop_resource"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "dense_1_matmul_readvariableop_resource"
-            type: DT_RESOURCE
-          }
-          input_arg {
-            name: "dense_1_biasadd_readvariableop_resource"
-            type: DT_RESOURCE
-          }
-          output_arg {
-            name: "identity"
-            type: DT_FLOAT
-          }
-          is_stateful: true
-        }
-        node_def {
-          name: "dense/Cast"
-          op: "Cast"
-          input: "inputs"
-          attr {
-            key: "DstT"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "SrcT"
-            value {
-              type: DT_INT32
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 214
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "dense/Cast"
-          }
-        }
-        node_def {
-          name: "dense/MatMul/ReadVariableOp"
-          op: "ReadVariableOp"
-          input: "dense_matmul_readvariableop_resource"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: 214
-                  }
-                  dim {
-                    size: 100
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "dense/MatMul/ReadVariableOp"
-          }
-        }
-        node_def {
-          name: "dense/MatMul"
-          op: "MatMul"
-          input: "dense/Cast:y:0"
-          input: "dense/MatMul/ReadVariableOp:value:0"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 100
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "dense/MatMul"
-          }
-        }
-        node_def {
-          name: "dense/BiasAdd/ReadVariableOp"
-          op: "ReadVariableOp"
-          input: "dense_biasadd_readvariableop_resource"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: 100
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "dense/BiasAdd/ReadVariableOp"
-          }
-        }
-        node_def {
-          name: "dense/BiasAdd"
-          op: "BiasAdd"
-          input: "dense/MatMul:product:0"
-          input: "dense/BiasAdd/ReadVariableOp:value:0"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 100
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "dense/BiasAdd"
-          }
-        }
-        node_def {
-          name: "dense/Relu"
-          op: "Relu"
-          input: "dense/BiasAdd:output:0"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 100
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "dense/Relu"
-          }
-        }
-        node_def {
-          name: "dense_1/MatMul/ReadVariableOp"
-          op: "ReadVariableOp"
-          input: "dense_1_matmul_readvariableop_resource"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: 100
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "dense_1/MatMul/ReadVariableOp"
-          }
-        }
-        node_def {
-          name: "dense_1/MatMul"
-          op: "MatMul"
-          input: "dense/Relu:activations:0"
-          input: "dense_1/MatMul/ReadVariableOp:value:0"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "dense_1/MatMul"
-          }
-        }
-        node_def {
-          name: "dense_1/BiasAdd/ReadVariableOp"
-          op: "ReadVariableOp"
-          input: "dense_1_biasadd_readvariableop_resource"
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          attr {
-            key: "dtype"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "dense_1/BiasAdd/ReadVariableOp"
-          }
-        }
-        node_def {
-          name: "dense_1/BiasAdd"
-          op: "BiasAdd"
-          input: "dense_1/MatMul:product:0"
-          input: "dense_1/BiasAdd/ReadVariableOp:value:0"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "dense_1/BiasAdd"
-          }
-        }
-        node_def {
-          name: "Identity"
-          op: "Identity"
-          input: "dense_1/BiasAdd:output:0"
-          attr {
-            key: "T"
-            value {
-              type: DT_FLOAT
-            }
-          }
-          attr {
-            key: "_output_shapes"
-            value {
-              list {
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-              }
-            }
-          }
-          experimental_debug_info {
-            original_node_names: "Identity"
-          }
-        }
-        ret {
-          key: "identity"
-          value: "Identity:output:0"
-        }
-        attr {
-          key: "_input_shapes"
-          value {
-            list {
-              shape {
-                dim {
-                  size: -1
-                }
-                dim {
-                  size: 214
-                }
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-              shape {
-                unknown_rank: true
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 0
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                    dim {
-                      size: -1
-                    }
-                    dim {
-                      size: 214
-                    }
-                  }
-                }
-              }
-            }
-            attr {
-              key: "_user_specified_name"
-              value {
-                s: "inputs"
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 1
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 2
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 3
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-        arg_attr {
-          key: 4
-          value {
-            attr {
-              key: "_output_shapes"
-              value {
-                list {
-                  shape {
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-    versions {
-      producer: 331
-      min_consumer: 12
-    }
-  }
-  saver_def {
-    filename_tensor_name: "saver_filename:0"
-    save_tensor_name: "StatefulPartitionedCall_1:0"
-    restore_op_name: "StatefulPartitionedCall_2"
-    version: V2
-  }
-  collection_def {
-    key: "saved_model_main_op"
-    value {
-      node_list {
-        value: "NoOp"
-      }
-    }
-  }
-  signature_def {
-    key: "__saved_model_init_op"
-    value {
-      outputs {
-        key: "__saved_model_init_op"
-        value {
-          name: "NoOp"
-          tensor_shape {
-            unknown_rank: true
-          }
-        }
-      }
-    }
-  }
-  signature_def {
-    key: "serving_default"
-    value {
-      inputs {
-        key: "input_1"
-        value {
-          name: "serving_default_input_1:0"
-          dtype: DT_INT32
-          tensor_shape {
-            dim {
-              size: -1
-            }
-            dim {
-              size: 214
-            }
-          }
-        }
-      }
-      outputs {
-        key: "output_1"
-        value {
-          name: "StatefulPartitionedCall:0"
-          dtype: DT_FLOAT
-          tensor_shape {
-            dim {
-              size: -1
-            }
-            dim {
-              size: 1
-            }
-          }
-        }
-      }
-      method_name: "tensorflow/serving/predict"
-    }
-  }
-  object_graph_def {
-    nodes {
-      children {
-        node_id: 1
-        local_name: "layer_with_weights-0"
-      }
-      children {
-        node_id: 1
-        local_name: "layer-0"
-      }
-      children {
-        node_id: 2
-        local_name: "layer_with_weights-1"
-      }
-      children {
-        node_id: 2
-        local_name: "layer-1"
-      }
-      children {
-        node_id: 3
-        local_name: "optimizer"
-      }
-      children {
-        node_id: 4
-        local_name: "regularization_losses"
-      }
-      children {
-        node_id: 5
-        local_name: "variables"
-      }
-      children {
-        node_id: 6
-        local_name: "trainable_variables"
-      }
-      children {
-        node_id: 7
-        local_name: "keras_api"
-      }
-      children {
-        node_id: 8
-        local_name: "signatures"
-      }
-      children {
-        node_id: 47
-        local_name: "__call__"
-      }
-      children {
-        node_id: 48
-        local_name: "_default_save_signature"
-      }
-      children {
-        node_id: 49
-        local_name: "call_and_return_all_conditional_losses"
-      }
-      user_object {
-        identifier: "_tf_keras_sequential"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-        metadata: "{\"class_name\": \"Sequential\", \"name\": \"sequential\", \"trainable\": true, \"expects_training_arg\": true, \"dtype\": \"float32\", \"batch_input_shape\": null, \"config\": {\"name\": \"sequential\", \"layers\": [{\"class_name\": \"Dense\", \"config\": {\"name\": \"dense\", \"trainable\": true, \"dtype\": \"float32\", \"units\": 100, \"activation\": \"relu\", \"use_bias\": true, \"kernel_initializer\": {\"class_name\": \"GlorotUniform\", \"config\": {\"seed\": null}}, \"bias_initializer\": {\"class_name\": \"Zeros\", \"config\": {}}, \"kernel_regularizer\": null, \"bias_regularizer\": null, \"activity_regularizer\": null, \"kernel_constraint\": null, \"bias_constraint\": null}}, {\"class_name\": \"Dense\", \"config\": {\"name\": \"dense_1\", \"trainable\": true, \"dtype\": \"float32\", \"units\": 1, \"activation\": \"linear\", \"use_bias\": true, \"kernel_initializer\": {\"class_name\": \"GlorotUniform\", \"config\": {\"seed\": null}}, \"bias_initializer\": {\"class_name\": \"Zeros\", \"config\": {}}, \"kernel_regularizer\": null, \"bias_regularizer\": null, \"activity_regularizer\": null, \"kernel_constraint\": null, \"bias_constraint\": null}}], \"build_input_shape\": {\"class_name\": \"__tuple__\", \"items\": [null, 214]}}, \"input_spec\": {\"class_name\": \"InputSpec\", \"config\": {\"dtype\": null, \"shape\": null, \"ndim\": null, \"max_ndim\": null, \"min_ndim\": 2, \"axes\": {\"-1\": 214}}}, \"build_input_shape\": {\"class_name\": \"__tuple__\", \"items\": [null, 214]}, \"is_graph_network\": false, \"keras_version\": \"2.2.4-tf\", \"backend\": \"tensorflow\", \"model_config\": {\"class_name\": \"Sequential\", \"config\": {\"name\": \"sequential\", \"layers\": [{\"class_name\": \"Dense\", \"config\": {\"name\": \"dense\", \"trainable\": true, \"dtype\": \"float32\", \"units\": 100, \"activation\": \"relu\", \"use_bias\": true, \"kernel_initializer\": {\"class_name\": \"GlorotUniform\", \"config\": {\"seed\": null}}, \"bias_initializer\": {\"class_name\": \"Zeros\", \"config\": {}}, \"kernel_regularizer\": null, \"bias_regularizer\": null, \"activity_regularizer\": null, \"kernel_constraint\": null, \"bias_constraint\": null}}, {\"class_name\": \"Dense\", \"config\": {\"name\": \"dense_1\", \"trainable\": true, \"dtype\": \"float32\", \"units\": 1, \"activation\": \"linear\", \"use_bias\": true, \"kernel_initializer\": {\"class_name\": \"GlorotUniform\", \"config\": {\"seed\": null}}, \"bias_initializer\": {\"class_name\": \"Zeros\", \"config\": {}}, \"kernel_regularizer\": null, \"bias_regularizer\": null, \"activity_regularizer\": null, \"kernel_constraint\": null, \"bias_constraint\": null}}], \"build_input_shape\": {\"class_name\": \"__tuple__\", \"items\": [null, 214]}}}, \"training_config\": {\"loss\": \"mean_absolute_error\", \"metrics\": [\"mean_squared_error\"], \"weighted_metrics\": null, \"loss_weights\": null, \"sample_weight_mode\": null, \"optimizer_config\": {\"class_name\": \"Adam\", \"config\": {\"name\": \"Adam\", \"learning_rate\": 0.0003000000142492354, \"decay\": 0.0, \"beta_1\": 0.8999999761581421, \"beta_2\": 0.9990000128746033, \"epsilon\": 1e-07, \"amsgrad\": false}}}}"
-      }
-    }
-    nodes {
-      children {
-        node_id: 9
-        local_name: "kernel"
-      }
-      children {
-        node_id: 10
-        local_name: "bias"
-      }
-      children {
-        node_id: 11
-        local_name: "regularization_losses"
-      }
-      children {
-        node_id: 12
-        local_name: "variables"
-      }
-      children {
-        node_id: 13
-        local_name: "trainable_variables"
-      }
-      children {
-        node_id: 14
-        local_name: "keras_api"
-      }
-      children {
-        node_id: 50
-        local_name: "__call__"
-      }
-      children {
-        node_id: 51
-        local_name: "call_and_return_all_conditional_losses"
-      }
-      user_object {
-        identifier: "_tf_keras_layer"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-        metadata: "{\"class_name\": \"Dense\", \"name\": \"dense\", \"trainable\": true, \"expects_training_arg\": false, \"dtype\": \"float32\", \"batch_input_shape\": null, \"stateful\": false, \"config\": {\"name\": \"dense\", \"trainable\": true, \"dtype\": \"float32\", \"units\": 100, \"activation\": \"relu\", \"use_bias\": true, \"kernel_initializer\": {\"class_name\": \"GlorotUniform\", \"config\": {\"seed\": null}}, \"bias_initializer\": {\"class_name\": \"Zeros\", \"config\": {}}, \"kernel_regularizer\": null, \"bias_regularizer\": null, \"activity_regularizer\": null, \"kernel_constraint\": null, \"bias_constraint\": null}, \"input_spec\": {\"class_name\": \"InputSpec\", \"config\": {\"dtype\": null, \"shape\": null, \"ndim\": null, \"max_ndim\": null, \"min_ndim\": 2, \"axes\": {\"-1\": 214}}}, \"build_input_shape\": {\"class_name\": \"TensorShape\", \"items\": [null, 214]}}"
-      }
-    }
-    nodes {
-      children {
-        node_id: 15
-        local_name: "kernel"
-      }
-      children {
-        node_id: 16
-        local_name: "bias"
-      }
-      children {
-        node_id: 17
-        local_name: "regularization_losses"
-      }
-      children {
-        node_id: 18
-        local_name: "variables"
-      }
-      children {
-        node_id: 19
-        local_name: "trainable_variables"
-      }
-      children {
-        node_id: 20
-        local_name: "keras_api"
-      }
-      children {
-        node_id: 52
-        local_name: "__call__"
-      }
-      children {
-        node_id: 53
-        local_name: "call_and_return_all_conditional_losses"
-      }
-      user_object {
-        identifier: "_tf_keras_layer"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-        metadata: "{\"class_name\": \"Dense\", \"name\": \"dense_1\", \"trainable\": true, \"expects_training_arg\": false, \"dtype\": \"float32\", \"batch_input_shape\": null, \"stateful\": false, \"config\": {\"name\": \"dense_1\", \"trainable\": true, \"dtype\": \"float32\", \"units\": 1, \"activation\": \"linear\", \"use_bias\": true, \"kernel_initializer\": {\"class_name\": \"GlorotUniform\", \"config\": {\"seed\": null}}, \"bias_initializer\": {\"class_name\": \"Zeros\", \"config\": {}}, \"kernel_regularizer\": null, \"bias_regularizer\": null, \"activity_regularizer\": null, \"kernel_constraint\": null, \"bias_constraint\": null}, \"input_spec\": {\"class_name\": \"InputSpec\", \"config\": {\"dtype\": null, \"shape\": null, \"ndim\": null, \"max_ndim\": null, \"min_ndim\": 2, \"axes\": {\"-1\": 100}}}, \"build_input_shape\": {\"class_name\": \"TensorShape\", \"items\": [null, 100]}}"
-      }
-    }
-    nodes {
-      user_object {
-        identifier: "optimizer"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-      }
-    }
-    nodes {
-      user_object {
-        identifier: "trackable_list_wrapper"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-      }
-    }
-    nodes {
-      children {
-        node_id: 9
-        local_name: "0"
-      }
-      children {
-        node_id: 10
-        local_name: "1"
-      }
-      children {
-        node_id: 15
-        local_name: "2"
-      }
-      children {
-        node_id: 16
-        local_name: "3"
-      }
-      user_object {
-        identifier: "trackable_list_wrapper"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-      }
-    }
-    nodes {
-      children {
-        node_id: 9
-        local_name: "0"
-      }
-      children {
-        node_id: 10
-        local_name: "1"
-      }
-      children {
-        node_id: 15
-        local_name: "2"
-      }
-      children {
-        node_id: 16
-        local_name: "3"
-      }
-      user_object {
-        identifier: "trackable_list_wrapper"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-      }
-    }
-    nodes {
-      children {
-        node_id: 21
-        local_name: "layers"
-      }
-      children {
-        node_id: 22
-        local_name: "layer_regularization_losses"
-      }
-      children {
-        node_id: 23
-        local_name: "non_trainable_variables"
-      }
-      children {
-        node_id: 24
-        local_name: "layer_metrics"
-      }
-      children {
-        node_id: 4
-        local_name: "regularization_losses"
-      }
-      children {
-        node_id: 25
-        local_name: "metrics"
-      }
-      children {
-        node_id: 5
-        local_name: "variables"
-      }
-      children {
-        node_id: 6
-        local_name: "trainable_variables"
-      }
-      children {
-        node_id: 47
-        local_name: "__call__"
-      }
-      children {
-        node_id: 48
-        local_name: "_default_save_signature"
-      }
-      children {
-        node_id: 49
-        local_name: "call_and_return_all_conditional_losses"
-      }
-      children {
-        node_id: 49
-        local_name: "call_and_return_conditional_losses"
-      }
-      user_object {
-        identifier: "_generic_user_object"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-      }
-    }
-    nodes {
-      children {
-        node_id: 54
-        local_name: "serving_default"
-      }
-      user_object {
-        identifier: "signature_map"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-      }
-    }
-    nodes {
-      variable {
-        dtype: DT_FLOAT
-        shape {
-          dim {
-            size: 214
-          }
-          dim {
-            size: 100
-          }
-        }
-        trainable: true
-        name: "dense/kernel"
-      }
-    }
-    nodes {
-      variable {
-        dtype: DT_FLOAT
-        shape {
-          dim {
-            size: 100
-          }
-        }
-        trainable: true
-        name: "dense/bias"
-      }
-    }
-    nodes {
-      user_object {
-        identifier: "trackable_list_wrapper"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-      }
-    }
-    nodes {
-      children {
-        node_id: 9
-        local_name: "0"
-      }
-      children {
-        node_id: 10
-        local_name: "1"
-      }
-      user_object {
-        identifier: "trackable_list_wrapper"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-      }
-    }
-    nodes {
-      children {
-        node_id: 9
-        local_name: "0"
-      }
-      children {
-        node_id: 10
-        local_name: "1"
-      }
-      user_object {
-        identifier: "trackable_list_wrapper"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-      }
-    }
-    nodes {
-      children {
-        node_id: 26
-        local_name: "layers"
-      }
-      children {
-        node_id: 27
-        local_name: "layer_regularization_losses"
-      }
-      children {
-        node_id: 28
-        local_name: "non_trainable_variables"
-      }
-      children {
-        node_id: 29
-        local_name: "layer_metrics"
-      }
-      children {
-        node_id: 11
-        local_name: "regularization_losses"
-      }
-      children {
-        node_id: 30
-        local_name: "metrics"
-      }
-      children {
-        node_id: 12
-        local_name: "variables"
-      }
-      children {
-        node_id: 13
-        local_name: "trainable_variables"
-      }
-      children {
-        node_id: 50
-        local_name: "__call__"
-      }
-      children {
-        node_id: 51
-        local_name: "call_and_return_all_conditional_losses"
-      }
-      children {
-        node_id: 51
-        local_name: "call_and_return_conditional_losses"
-      }
-      user_object {
-        identifier: "_generic_user_object"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-      }
-    }
-    nodes {
-      variable {
-        dtype: DT_FLOAT
-        shape {
-          dim {
-            size: 100
-          }
-          dim {
-            size: 1
-          }
-        }
-        trainable: true
-        name: "dense_1/kernel"
-      }
-    }
-    nodes {
-      variable {
-        dtype: DT_FLOAT
-        shape {
-          dim {
-            size: 1
-          }
-        }
-        trainable: true
-        name: "dense_1/bias"
-      }
-    }
-    nodes {
-      user_object {
-        identifier: "trackable_list_wrapper"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-      }
-    }
-    nodes {
-      children {
-        node_id: 15
-        local_name: "0"
-      }
-      children {
-        node_id: 16
-        local_name: "1"
-      }
-      user_object {
-        identifier: "trackable_list_wrapper"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-      }
-    }
-    nodes {
-      children {
-        node_id: 15
-        local_name: "0"
-      }
-      children {
-        node_id: 16
-        local_name: "1"
-      }
-      user_object {
-        identifier: "trackable_list_wrapper"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-      }
-    }
-    nodes {
-      children {
-        node_id: 31
-        local_name: "layers"
-      }
-      children {
-        node_id: 32
-        local_name: "layer_regularization_losses"
-      }
-      children {
-        node_id: 33
-        local_name: "non_trainable_variables"
-      }
-      children {
-        node_id: 34
-        local_name: "layer_metrics"
-      }
-      children {
-        node_id: 17
-        local_name: "regularization_losses"
-      }
-      children {
-        node_id: 35
-        local_name: "metrics"
-      }
-      children {
-        node_id: 18
-        local_name: "variables"
-      }
-      children {
-        node_id: 19
-        local_name: "trainable_variables"
-      }
-      children {
-        node_id: 52
-        local_name: "__call__"
-      }
-      children {
-        node_id: 53
-        local_name: "call_and_return_all_conditional_losses"
-      }
-      children {
-        node_id: 53
-        local_name: "call_and_return_conditional_losses"
-      }
-      user_object {
-        identifier: "_generic_user_object"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-      }
-    }
-    nodes {
-      children {
-        node_id: 1
-        local_name: "0"
-      }
-      children {
-        node_id: 2
-        local_name: "1"
-      }
-      user_object {
-        identifier: "trackable_list_wrapper"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-      }
-    }
-    nodes {
-      user_object {
-        identifier: "trackable_list_wrapper"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-      }
-    }
-    nodes {
-      user_object {
-        identifier: "trackable_list_wrapper"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-      }
-    }
-    nodes {
-      user_object {
-        identifier: "trackable_dict_wrapper"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-      }
-    }
-    nodes {
-      children {
-        node_id: 36
-        local_name: "0"
-      }
-      children {
-        node_id: 37
-        local_name: "1"
-      }
-      user_object {
-        identifier: "trackable_list_wrapper"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-      }
-    }
-    nodes {
-      user_object {
-        identifier: "trackable_list_wrapper"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-      }
-    }
-    nodes {
-      user_object {
-        identifier: "trackable_list_wrapper"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-      }
-    }
-    nodes {
-      user_object {
-        identifier: "trackable_list_wrapper"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-      }
-    }
-    nodes {
-      user_object {
-        identifier: "trackable_dict_wrapper"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-      }
-    }
-    nodes {
-      user_object {
-        identifier: "trackable_list_wrapper"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-      }
-    }
-    nodes {
-      user_object {
-        identifier: "trackable_list_wrapper"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-      }
-    }
-    nodes {
-      user_object {
-        identifier: "trackable_list_wrapper"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-      }
-    }
-    nodes {
-      user_object {
-        identifier: "trackable_list_wrapper"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-      }
-    }
-    nodes {
-      user_object {
-        identifier: "trackable_dict_wrapper"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-      }
-    }
-    nodes {
-      user_object {
-        identifier: "trackable_list_wrapper"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-      }
-    }
-    nodes {
-      children {
-        node_id: 38
-        local_name: "total"
-      }
-      children {
-        node_id: 39
-        local_name: "count"
-      }
-      children {
-        node_id: 40
-        local_name: "variables"
-      }
-      children {
-        node_id: 41
-        local_name: "keras_api"
-      }
-      user_object {
-        identifier: "_tf_keras_metric"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-        metadata: "{\"class_name\": \"Mean\", \"name\": \"loss\", \"dtype\": \"float32\", \"config\": {\"name\": \"loss\", \"dtype\": \"float32\"}}"
-      }
-    }
-    nodes {
-      children {
-        node_id: 42
-        local_name: "total"
-      }
-      children {
-        node_id: 43
-        local_name: "count"
-      }
-      children {
-        node_id: 44
-        local_name: "_fn_kwargs"
-      }
-      children {
-        node_id: 45
-        local_name: "variables"
-      }
-      children {
-        node_id: 46
-        local_name: "keras_api"
-      }
-      user_object {
-        identifier: "_tf_keras_metric"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-        metadata: "{\"class_name\": \"MeanMetricWrapper\", \"name\": \"mean_squared_error\", \"dtype\": \"float32\", \"config\": {\"name\": \"mean_squared_error\", \"dtype\": \"float32\", \"fn\": \"mean_squared_error\"}}"
-      }
-    }
-    nodes {
-      variable {
-        dtype: DT_FLOAT
-        shape {
-        }
-        synchronization: VARIABLE_SYNCHRONIZATION_ON_READ
-        aggregation: VARIABLE_AGGREGATION_SUM
-        name: "total"
-      }
-    }
-    nodes {
-      variable {
-        dtype: DT_FLOAT
-        shape {
-        }
-        synchronization: VARIABLE_SYNCHRONIZATION_ON_READ
-        aggregation: VARIABLE_AGGREGATION_SUM
-        name: "count"
-      }
-    }
-    nodes {
-      children {
-        node_id: 38
-        local_name: "0"
-      }
-      children {
-        node_id: 39
-        local_name: "1"
-      }
-      user_object {
-        identifier: "trackable_list_wrapper"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-      }
-    }
-    nodes {
-      children {
-        node_id: 40
-        local_name: "variables"
-      }
-      user_object {
-        identifier: "_generic_user_object"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-      }
-    }
-    nodes {
-      variable {
-        dtype: DT_FLOAT
-        shape {
-        }
-        synchronization: VARIABLE_SYNCHRONIZATION_ON_READ
-        aggregation: VARIABLE_AGGREGATION_SUM
-        name: "total"
-      }
-    }
-    nodes {
-      variable {
-        dtype: DT_FLOAT
-        shape {
-        }
-        synchronization: VARIABLE_SYNCHRONIZATION_ON_READ
-        aggregation: VARIABLE_AGGREGATION_SUM
-        name: "count"
-      }
-    }
-    nodes {
-      user_object {
-        identifier: "trackable_dict_wrapper"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-      }
-    }
-    nodes {
-      children {
-        node_id: 42
-        local_name: "0"
-      }
-      children {
-        node_id: 43
-        local_name: "1"
-      }
-      user_object {
-        identifier: "trackable_list_wrapper"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-      }
-    }
-    nodes {
-      children {
-        node_id: 45
-        local_name: "variables"
-      }
-      user_object {
-        identifier: "_generic_user_object"
-        version {
-          producer: 1
-          min_consumer: 1
-        }
-      }
-    }
-    nodes {
-      function {
-        concrete_functions: "__inference_sequential_layer_call_fn_6629"
-        concrete_functions: "__inference_sequential_layer_call_fn_6733"
-        concrete_functions: "__inference_sequential_layer_call_fn_6720"
-        concrete_functions: "__inference_sequential_layer_call_fn_6656"
-        function_spec {
-          fullargspec {
-            named_tuple_value {
-              name: "FullArgSpec"
-              values {
-                key: "args"
-                value {
-                  list_value {
-                    values {
-                      string_value: "self"
-                    }
-                    values {
-                      string_value: "inputs"
-                    }
-                    values {
-                      string_value: "training"
-                    }
-                    values {
-                      string_value: "mask"
-                    }
-                  }
-                }
-              }
-              values {
-                key: "varargs"
-                value {
-                  none_value {
-                  }
-                }
-              }
-              values {
-                key: "varkw"
-                value {
-                  none_value {
-                  }
-                }
-              }
-              values {
-                key: "defaults"
-                value {
-                  list_value {
-                    values {
-                      bool_value: false
-                    }
-                    values {
-                      none_value {
-                      }
-                    }
-                  }
-                }
-              }
-              values {
-                key: "kwonlyargs"
-                value {
-                  list_value {
-                  }
-                }
-              }
-              values {
-                key: "kwonlydefaults"
-                value {
-                  dict_value {
-                  }
-                }
-              }
-              values {
-                key: "annotations"
-                value {
-                  dict_value {
-                  }
-                }
-              }
-            }
-          }
-          is_method: true
-          input_signature {
-            none_value {
-            }
-          }
-        }
-      }
-    }
-    nodes {
-      function {
-        concrete_functions: "__inference__wrapped_model_6528"
-        function_spec {
-          fullargspec {
-            named_tuple_value {
-              name: "FullArgSpec"
-              values {
-                key: "args"
-                value {
-                  list_value {
-                  }
-                }
-              }
-              values {
-                key: "varargs"
-                value {
-                  string_value: "args"
-                }
-              }
-              values {
-                key: "varkw"
-                value {
-                  none_value {
-                  }
-                }
-              }
-              values {
-                key: "defaults"
-                value {
-                  none_value {
-                  }
-                }
-              }
-              values {
-                key: "kwonlyargs"
-                value {
-                  list_value {
-                  }
-                }
-              }
-              values {
-                key: "kwonlydefaults"
-                value {
-                  none_value {
-                  }
-                }
-              }
-              values {
-                key: "annotations"
-                value {
-                  dict_value {
-                  }
-                }
-              }
-            }
-          }
-          input_signature {
-            tuple_value {
-              values {
-                tensor_spec_value {
-                  name: "input_1"
-                  shape {
-                    dim {
-                      size: -1
-                    }
-                    dim {
-                      size: 214
-                    }
-                  }
-                  dtype: DT_INT32
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-    nodes {
-      function {
-        concrete_functions: "__inference_sequential_layer_call_and_return_conditional_losses_6689"
-        concrete_functions: "__inference_sequential_layer_call_and_return_conditional_losses_6587"
-        concrete_functions: "__inference_sequential_layer_call_and_return_conditional_losses_6707"
-        concrete_functions: "__inference_sequential_layer_call_and_return_conditional_losses_6601"
-        function_spec {
-          fullargspec {
-            named_tuple_value {
-              name: "FullArgSpec"
-              values {
-                key: "args"
-                value {
-                  list_value {
-                    values {
-                      string_value: "self"
-                    }
-                    values {
-                      string_value: "inputs"
-                    }
-                    values {
-                      string_value: "training"
-                    }
-                    values {
-                      string_value: "mask"
-                    }
-                  }
-                }
-              }
-              values {
-                key: "varargs"
-                value {
-                  none_value {
-                  }
-                }
-              }
-              values {
-                key: "varkw"
-                value {
-                  none_value {
-                  }
-                }
-              }
-              values {
-                key: "defaults"
-                value {
-                  list_value {
-                    values {
-                      bool_value: false
-                    }
-                    values {
-                      none_value {
-                      }
-                    }
-                  }
-                }
-              }
-              values {
-                key: "kwonlyargs"
-                value {
-                  list_value {
-                  }
-                }
-              }
-              values {
-                key: "kwonlydefaults"
-                value {
-                  dict_value {
-                  }
-                }
-              }
-              values {
-                key: "annotations"
-                value {
-                  dict_value {
-                  }
-                }
-              }
-            }
-          }
-          is_method: true
-          input_signature {
-            none_value {
-            }
-          }
-        }
-      }
-    }
-    nodes {
-      function {
-        concrete_functions: "__inference_dense_layer_call_fn_6754"
-        function_spec {
-          fullargspec {
-            named_tuple_value {
-              name: "FullArgSpec"
-              values {
-                key: "args"
-                value {
-                  list_value {
-                    values {
-                      string_value: "self"
-                    }
-                    values {
-                      string_value: "inputs"
-                    }
-                  }
-                }
-              }
-              values {
-                key: "varargs"
-                value {
-                  none_value {
-                  }
-                }
-              }
-              values {
-                key: "varkw"
-                value {
-                  none_value {
-                  }
-                }
-              }
-              values {
-                key: "defaults"
-                value {
-                  none_value {
-                  }
-                }
-              }
-              values {
-                key: "kwonlyargs"
-                value {
-                  list_value {
-                  }
-                }
-              }
-              values {
-                key: "kwonlydefaults"
-                value {
-                  none_value {
-                  }
-                }
-              }
-              values {
-                key: "annotations"
-                value {
-                  dict_value {
-                  }
-                }
-              }
-            }
-          }
-          is_method: true
-          input_signature {
-            none_value {
-            }
-          }
-        }
-      }
-    }
-    nodes {
-      function {
-        concrete_functions: "__inference_dense_layer_call_and_return_conditional_losses_6745"
-        function_spec {
-          fullargspec {
-            named_tuple_value {
-              name: "FullArgSpec"
-              values {
-                key: "args"
-                value {
-                  list_value {
-                    values {
-                      string_value: "self"
-                    }
-                    values {
-                      string_value: "inputs"
-                    }
-                  }
-                }
-              }
-              values {
-                key: "varargs"
-                value {
-                  none_value {
-                  }
-                }
-              }
-              values {
-                key: "varkw"
-                value {
-                  none_value {
-                  }
-                }
-              }
-              values {
-                key: "defaults"
-                value {
-                  none_value {
-                  }
-                }
-              }
-              values {
-                key: "kwonlyargs"
-                value {
-                  list_value {
-                  }
-                }
-              }
-              values {
-                key: "kwonlydefaults"
-                value {
-                  none_value {
-                  }
-                }
-              }
-              values {
-                key: "annotations"
-                value {
-                  dict_value {
-                  }
-                }
-              }
-            }
-          }
-          is_method: true
-          input_signature {
-            none_value {
-            }
-          }
-        }
-      }
-    }
-    nodes {
-      function {
-        concrete_functions: "__inference_dense_1_layer_call_fn_6773"
-        function_spec {
-          fullargspec {
-            named_tuple_value {
-              name: "FullArgSpec"
-              values {
-                key: "args"
-                value {
-                  list_value {
-                    values {
-                      string_value: "self"
-                    }
-                    values {
-                      string_value: "inputs"
-                    }
-                  }
-                }
-              }
-              values {
-                key: "varargs"
-                value {
-                  none_value {
-                  }
-                }
-              }
-              values {
-                key: "varkw"
-                value {
-                  none_value {
-                  }
-                }
-              }
-              values {
-                key: "defaults"
-                value {
-                  none_value {
-                  }
-                }
-              }
-              values {
-                key: "kwonlyargs"
-                value {
-                  list_value {
-                  }
-                }
-              }
-              values {
-                key: "kwonlydefaults"
-                value {
-                  none_value {
-                  }
-                }
-              }
-              values {
-                key: "annotations"
-                value {
-                  dict_value {
-                  }
-                }
-              }
-            }
-          }
-          is_method: true
-          input_signature {
-            none_value {
-            }
-          }
-        }
-      }
-    }
-    nodes {
-      function {
-        concrete_functions: "__inference_dense_1_layer_call_and_return_conditional_losses_6764"
-        function_spec {
-          fullargspec {
-            named_tuple_value {
-              name: "FullArgSpec"
-              values {
-                key: "args"
-                value {
-                  list_value {
-                    values {
-                      string_value: "self"
-                    }
-                    values {
-                      string_value: "inputs"
-                    }
-                  }
-                }
-              }
-              values {
-                key: "varargs"
-                value {
-                  none_value {
-                  }
-                }
-              }
-              values {
-                key: "varkw"
-                value {
-                  none_value {
-                  }
-                }
-              }
-              values {
-                key: "defaults"
-                value {
-                  none_value {
-                  }
-                }
-              }
-              values {
-                key: "kwonlyargs"
-                value {
-                  list_value {
-                  }
-                }
-              }
-              values {
-                key: "kwonlydefaults"
-                value {
-                  none_value {
-                  }
-                }
-              }
-              values {
-                key: "annotations"
-                value {
-                  dict_value {
-                  }
-                }
-              }
-            }
-          }
-          is_method: true
-          input_signature {
-            none_value {
-            }
-          }
-        }
-      }
-    }
-    nodes {
-      bare_concrete_function {
-        concrete_function_name: "__inference_signature_wrapper_6671"
-        argument_keywords: "input_1"
-        allowed_positional_arguments: 1
-      }
-    }
-    concrete_functions {
-      key: "__inference__wrapped_model_6528"
-      value {
-        bound_inputs: 9
-        bound_inputs: 10
-        bound_inputs: 15
-        bound_inputs: 16
-        canonicalized_input_signature {
-          tuple_value {
-            values {
-              tuple_value {
-                values {
-                  tensor_spec_value {
-                    name: "input_1"
-                    shape {
-                      dim {
-                        size: -1
-                      }
-                      dim {
-                        size: 214
-                      }
-                    }
-                    dtype: DT_INT32
-                  }
-                }
-              }
-            }
-            values {
-              dict_value {
-              }
-            }
-          }
-        }
-        output_signature {
-          dict_value {
-            fields {
-              key: "output_1"
-              value {
-                tensor_spec_value {
-                  name: "output_1"
-                  shape {
-                    dim {
-                      size: -1
-                    }
-                    dim {
-                      size: 1
-                    }
-                  }
-                  dtype: DT_FLOAT
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-    concrete_functions {
-      key: "__inference_dense_1_layer_call_and_return_conditional_losses_6764"
-      value {
-        bound_inputs: 15
-        bound_inputs: 16
-        canonicalized_input_signature {
-          tuple_value {
-            values {
-              tuple_value {
-                values {
-                  tensor_spec_value {
-                    name: "inputs"
-                    shape {
-                      dim {
-                        size: -1
-                      }
-                      dim {
-                        size: 100
-                      }
-                    }
-                    dtype: DT_FLOAT
-                  }
-                }
-              }
-            }
-            values {
-              dict_value {
-              }
-            }
-          }
-        }
-        output_signature {
-          tuple_value {
-            values {
-              tensor_spec_value {
-                name: "0"
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-                dtype: DT_FLOAT
-              }
-            }
-            values {
-              list_value {
-              }
-            }
-          }
-        }
-      }
-    }
-    concrete_functions {
-      key: "__inference_dense_1_layer_call_fn_6773"
-      value {
-        bound_inputs: 15
-        bound_inputs: 16
-        canonicalized_input_signature {
-          tuple_value {
-            values {
-              tuple_value {
-                values {
-                  tensor_spec_value {
-                    name: "inputs"
-                    shape {
-                      dim {
-                        size: -1
-                      }
-                      dim {
-                        size: 100
-                      }
-                    }
-                    dtype: DT_FLOAT
-                  }
-                }
-              }
-            }
-            values {
-              dict_value {
-              }
-            }
-          }
-        }
-        output_signature {
-          tensor_spec_value {
-            shape {
-              dim {
-                size: -1
-              }
-              dim {
-                size: 1
-              }
-            }
-            dtype: DT_FLOAT
-          }
-        }
-      }
-    }
-    concrete_functions {
-      key: "__inference_dense_layer_call_and_return_conditional_losses_6745"
-      value {
-        bound_inputs: 9
-        bound_inputs: 10
-        canonicalized_input_signature {
-          tuple_value {
-            values {
-              tuple_value {
-                values {
-                  tensor_spec_value {
-                    name: "inputs"
-                    shape {
-                      dim {
-                        size: -1
-                      }
-                      dim {
-                        size: 214
-                      }
-                    }
-                    dtype: DT_INT32
-                  }
-                }
-              }
-            }
-            values {
-              dict_value {
-              }
-            }
-          }
-        }
-        output_signature {
-          tuple_value {
-            values {
-              tensor_spec_value {
-                name: "0"
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 100
-                  }
-                }
-                dtype: DT_FLOAT
-              }
-            }
-            values {
-              list_value {
-              }
-            }
-          }
-        }
-      }
-    }
-    concrete_functions {
-      key: "__inference_dense_layer_call_fn_6754"
-      value {
-        bound_inputs: 9
-        bound_inputs: 10
-        canonicalized_input_signature {
-          tuple_value {
-            values {
-              tuple_value {
-                values {
-                  tensor_spec_value {
-                    name: "inputs"
-                    shape {
-                      dim {
-                        size: -1
-                      }
-                      dim {
-                        size: 214
-                      }
-                    }
-                    dtype: DT_INT32
-                  }
-                }
-              }
-            }
-            values {
-              dict_value {
-              }
-            }
-          }
-        }
-        output_signature {
-          tensor_spec_value {
-            shape {
-              dim {
-                size: -1
-              }
-              dim {
-                size: 100
-              }
-            }
-            dtype: DT_FLOAT
-          }
-        }
-      }
-    }
-    concrete_functions {
-      key: "__inference_sequential_layer_call_and_return_conditional_losses_6587"
-      value {
-        bound_inputs: 9
-        bound_inputs: 10
-        bound_inputs: 15
-        bound_inputs: 16
-        canonicalized_input_signature {
-          tuple_value {
-            values {
-              tuple_value {
-                values {
-                  tensor_spec_value {
-                    name: "input_1"
-                    shape {
-                      dim {
-                        size: -1
-                      }
-                      dim {
-                        size: 214
-                      }
-                    }
-                    dtype: DT_INT32
-                  }
-                }
-                values {
-                  bool_value: true
-                }
-                values {
-                  none_value {
-                  }
-                }
-              }
-            }
-            values {
-              dict_value {
-              }
-            }
-          }
-        }
-        output_signature {
-          tuple_value {
-            values {
-              tensor_spec_value {
-                name: "0"
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-                dtype: DT_FLOAT
-              }
-            }
-            values {
-              list_value {
-              }
-            }
-          }
-        }
-      }
-    }
-    concrete_functions {
-      key: "__inference_sequential_layer_call_and_return_conditional_losses_6601"
-      value {
-        bound_inputs: 9
-        bound_inputs: 10
-        bound_inputs: 15
-        bound_inputs: 16
-        canonicalized_input_signature {
-          tuple_value {
-            values {
-              tuple_value {
-                values {
-                  tensor_spec_value {
-                    name: "input_1"
-                    shape {
-                      dim {
-                        size: -1
-                      }
-                      dim {
-                        size: 214
-                      }
-                    }
-                    dtype: DT_INT32
-                  }
-                }
-                values {
-                  bool_value: false
-                }
-                values {
-                  none_value {
-                  }
-                }
-              }
-            }
-            values {
-              dict_value {
-              }
-            }
-          }
-        }
-        output_signature {
-          tuple_value {
-            values {
-              tensor_spec_value {
-                name: "0"
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-                dtype: DT_FLOAT
-              }
-            }
-            values {
-              list_value {
-              }
-            }
-          }
-        }
-      }
-    }
-    concrete_functions {
-      key: "__inference_sequential_layer_call_and_return_conditional_losses_6689"
-      value {
-        bound_inputs: 9
-        bound_inputs: 10
-        bound_inputs: 15
-        bound_inputs: 16
-        canonicalized_input_signature {
-          tuple_value {
-            values {
-              tuple_value {
-                values {
-                  tensor_spec_value {
-                    name: "inputs"
-                    shape {
-                      dim {
-                        size: -1
-                      }
-                      dim {
-                        size: 214
-                      }
-                    }
-                    dtype: DT_INT32
-                  }
-                }
-                values {
-                  bool_value: true
-                }
-                values {
-                  none_value {
-                  }
-                }
-              }
-            }
-            values {
-              dict_value {
-              }
-            }
-          }
-        }
-        output_signature {
-          tuple_value {
-            values {
-              tensor_spec_value {
-                name: "0"
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-                dtype: DT_FLOAT
-              }
-            }
-            values {
-              list_value {
-              }
-            }
-          }
-        }
-      }
-    }
-    concrete_functions {
-      key: "__inference_sequential_layer_call_and_return_conditional_losses_6707"
-      value {
-        bound_inputs: 9
-        bound_inputs: 10
-        bound_inputs: 15
-        bound_inputs: 16
-        canonicalized_input_signature {
-          tuple_value {
-            values {
-              tuple_value {
-                values {
-                  tensor_spec_value {
-                    name: "inputs"
-                    shape {
-                      dim {
-                        size: -1
-                      }
-                      dim {
-                        size: 214
-                      }
-                    }
-                    dtype: DT_INT32
-                  }
-                }
-                values {
-                  bool_value: false
-                }
-                values {
-                  none_value {
-                  }
-                }
-              }
-            }
-            values {
-              dict_value {
-              }
-            }
-          }
-        }
-        output_signature {
-          tuple_value {
-            values {
-              tensor_spec_value {
-                name: "0"
-                shape {
-                  dim {
-                    size: -1
-                  }
-                  dim {
-                    size: 1
-                  }
-                }
-                dtype: DT_FLOAT
-              }
-            }
-            values {
-              list_value {
-              }
-            }
-          }
-        }
-      }
-    }
-    concrete_functions {
-      key: "__inference_sequential_layer_call_fn_6629"
-      value {
-        bound_inputs: 9
-        bound_inputs: 10
-        bound_inputs: 15
-        bound_inputs: 16
-        canonicalized_input_signature {
-          tuple_value {
-            values {
-              tuple_value {
-                values {
-                  tensor_spec_value {
-                    name: "input_1"
-                    shape {
-                      dim {
-                        size: -1
-                      }
-                      dim {
-                        size: 214
-                      }
-                    }
-                    dtype: DT_INT32
-                  }
-                }
-                values {
-                  bool_value: true
-                }
-                values {
-                  none_value {
-                  }
-                }
-              }
-            }
-            values {
-              dict_value {
-              }
-            }
-          }
-        }
-        output_signature {
-          tensor_spec_value {
-            shape {
-              dim {
-                size: -1
-              }
-              dim {
-                size: 1
-              }
-            }
-            dtype: DT_FLOAT
-          }
-        }
-      }
-    }
-    concrete_functions {
-      key: "__inference_sequential_layer_call_fn_6656"
-      value {
-        bound_inputs: 9
-        bound_inputs: 10
-        bound_inputs: 15
-        bound_inputs: 16
-        canonicalized_input_signature {
-          tuple_value {
-            values {
-              tuple_value {
-                values {
-                  tensor_spec_value {
-                    name: "input_1"
-                    shape {
-                      dim {
-                        size: -1
-                      }
-                      dim {
-                        size: 214
-                      }
-                    }
-                    dtype: DT_INT32
-                  }
-                }
-                values {
-                  bool_value: false
-                }
-                values {
-                  none_value {
-                  }
-                }
-              }
-            }
-            values {
-              dict_value {
-              }
-            }
-          }
-        }
-        output_signature {
-          tensor_spec_value {
-            shape {
-              dim {
-                size: -1
-              }
-              dim {
-                size: 1
-              }
-            }
-            dtype: DT_FLOAT
-          }
-        }
-      }
-    }
-    concrete_functions {
-      key: "__inference_sequential_layer_call_fn_6720"
-      value {
-        bound_inputs: 9
-        bound_inputs: 10
-        bound_inputs: 15
-        bound_inputs: 16
-        canonicalized_input_signature {
-          tuple_value {
-            values {
-              tuple_value {
-                values {
-                  tensor_spec_value {
-                    name: "inputs"
-                    shape {
-                      dim {
-                        size: -1
-                      }
-                      dim {
-                        size: 214
-                      }
-                    }
-                    dtype: DT_INT32
-                  }
-                }
-                values {
-                  bool_value: true
-                }
-                values {
-                  none_value {
-                  }
-                }
-              }
-            }
-            values {
-              dict_value {
-              }
-            }
-          }
-        }
-        output_signature {
-          tensor_spec_value {
-            shape {
-              dim {
-                size: -1
-              }
-              dim {
-                size: 1
-              }
-            }
-            dtype: DT_FLOAT
-          }
-        }
-      }
-    }
-    concrete_functions {
-      key: "__inference_sequential_layer_call_fn_6733"
-      value {
-        bound_inputs: 9
-        bound_inputs: 10
-        bound_inputs: 15
-        bound_inputs: 16
-        canonicalized_input_signature {
-          tuple_value {
-            values {
-              tuple_value {
-                values {
-                  tensor_spec_value {
-                    name: "inputs"
-                    shape {
-                      dim {
-                        size: -1
-                      }
-                      dim {
-                        size: 214
-                      }
-                    }
-                    dtype: DT_INT32
-                  }
-                }
-                values {
-                  bool_value: false
-                }
-                values {
-                  none_value {
-                  }
-                }
-              }
-            }
-            values {
-              dict_value {
-              }
-            }
-          }
-        }
-        output_signature {
-          tensor_spec_value {
-            shape {
-              dim {
-                size: -1
-              }
-              dim {
-                size: 1
-              }
-            }
-            dtype: DT_FLOAT
-          }
-        }
-      }
-    }
-    concrete_functions {
-      key: "__inference_signature_wrapper_6671"
-      value {
-        bound_inputs: 9
-        bound_inputs: 10
-        bound_inputs: 15
-        bound_inputs: 16
-        canonicalized_input_signature {
-          tuple_value {
-            values {
-              tuple_value {
-              }
-            }
-            values {
-              dict_value {
-                fields {
-                  key: "input_1"
-                  value {
-                    tensor_spec_value {
-                      name: "input_1"
-                      shape {
-                        dim {
-                          size: -1
-                        }
-                        dim {
-                          size: 214
-                        }
-                      }
-                      dtype: DT_INT32
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-        output_signature {
-          dict_value {
-            fields {
-              key: "output_1"
-              value {
-                tensor_spec_value {
-                  name: "output_1"
-                  shape {
-                    dim {
-                      size: -1
-                    }
-                    dim {
-                      size: 1
-                    }
-                  }
-                  dtype: DT_FLOAT
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
diff --git a/gnu/llvm/llvm/unittests/Analysis/Inputs/ir2native_x86_64_model/variables/variables.data-00000-of-00001 b/gnu/llvm/llvm/unittests/Analysis/Inputs/ir2native_x86_64_model/variables/variables.data-00000-of-00001
deleted file mode 100644
index 98807d26ee9f40e99330ae6a5d2988c640a320ec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 88424
zcmWh!c{mqe7bi;yKWmgiMMaWI3*R|s5Q-F$5-o~KCA5f&60#E#rIPGRmV_*G??@_@
zN?B5tR4VOSNZMZSpYzN-&)m89nRCu(tKOK$y|sxzTm1;s6$-;cXFh^VV=}hORHKaO
zW2m$^j(RsVm;%=@45{3PJEC0BeR}}jJTxBT&a8&=Wj5&lt^gaG6^Y1MOO#*vo;mRK
zGVU4kmf!TQm54oH@%Xo76upp*vtq;X!Vbc{?(jpGm)}7=<P#?vX+bLg>Z0i)iY{kn
zk~N>@Xxp1{n7_>vGj;c%=a^Dl_eTpd#ytfyxi#n`X-GcKyNL1kmJ(MDca*tki>Yf5
z;>)eNsB+dBb3>mH*Z2ZlC>xK}@BYJwcMS1qxf4c3X5iili?F*d6q)KsL7;pj$#OE`
ze!iJNMCt|Td{-KsTzr_Jeq*9`(~^qhUnSw`7YQquS(_4~2$Q{zk(N~+*padi=h@hz
zz5ixrIQTZ%X{Ceam&>uoAsKUy=HSaY+4%j7DveFCL79LkTzW*5TYAKUvk`T`RU-4S
zdP5xc?9IVL!R^F6u#iNwU&e8Ndby2(TJ(^HH~!9V<-RG3p__~$K983p|H&CJb9d`8
zZLwo($4Nbd&q^^Q{?bdZ6ljo&ABLbUri7>G>>;(v7a?zpG_^Nsfk~<7NwCW#Iy6fi
zuZ`UbBQe@oVzGw3azTN6T-*SWru{H>%_GQ)Jql4N9>lOj2EV%n!@PVUENkzC>R0kO
z^_Cij=j1}+ld}+EXNg%FcR)W^9S^z0FfPfrxgP<Q^jlwMt=)++m|%Gr8kG%5=YB1+
zaVQ*=8Eq_9J4)dAT<*!icJdSTu`?m4M*s7FR8+YN{`MUdB={zQ$<78)`KiVE{=Nox
z7Z{>Tr2)#cc;fAar#Yp4*GP(m5mwp^alNh!V9ok|`0e%<cJ6pd=1<)Z*9SYmc1VF#
zzxn|uceFFDU$+v^x`p_y^c3^rq$>8mH9!TUAjaj52MKPqgFY!2Xg+%orq9(y`P4;%
zfF?bf8gZM9xwQ!Y+47XLu;<8>Ug&oYhQ(jk<1R5H=3LPU=AgVfaz1y-M?W_~&;51q
z)LnyLl=cNQQW}`n25F`$Qj__c@{oEgZ({1Eh~d2gag=d1CAG6}aC}}W*;T`GA9viW
z74f%4g;opXPyQgsho-{X$vUh=n<uv45X03QbIF~(XUIkKMWC_$8VonJfdA@FnEAc~
zMtbJrwP$<aOn4X62PA;>>lQAt>oX(=6f>HsQQ+1viRk7eQp;vFW@$n`<0|=x@h%R7
zz*9HC(Q*k$;7nY(*p&DUWl$&m3(THyQQEzWt0k+pgPFb#A0^@hp7}C3!(k!0n{<N{
z$oIfgk%{Eaw^VXSZWT3@%?B&><BX+u5`>3U(Xm~Pu%jf1e!9C6tzQeHi~lYXePTW?
z4q3~T6a!P`?g_gK6;Qplp5FDDg?1eb_txwJlx_ASR^y*RPJ1P>tS=+=unbbd#88K+
zrWtb!!Liqvzb!hBuW7nXJhr(JtH=f5EHa(euy<i_XC&@?I-cl<J`;TIlx52w96+hL
z`|!)tWZdpz#jaDhiW&d*;1@kLoZEN-ef8y0e{2!@oybM^&#w6EzgDc0O~I|1o9g11
zpTy%Lm1tR<h^f}MaLKAoh@<DQ@0dtk;ObD;Z~96+HXMW|(-P4ueHAJ^JIIDP6`{zw
z7Q7zakFmeS>0|TrX#H&_O5SL|ajQg0(EeLE(Q+bQ5MPS)JA;xnTk+Lh4&V8tW4oC@
zn;NZ+O|*fZyLSuDXLsOl(K?KiRjN}vHV22V4sy3Q2Vqcc7|sYWrowyo<Fa+KcxCZq
zTr#U3ty^tyv*<x~z95TzKV6!=^H!fV-BN@*3D2~?b;l0|Li~WqEB@&RFZTNhRn|b-
zieHrXhAMPgvcoC~s9kacUtf;LxQ)Yj?MWc3@T&%M1*dS*n<wbcMd0EKmoewSA5Q4V
zDZHMnh<<`%p5NQb+qFmYr&a9g?wc9n$oD|Daq@Vk!8VAME90>2T{bWGIE$-#vK$*k
z9}%4+G1&M+18Wk5L3?!;^gal|d0YD6_Qj?6^WA1Nketl=9*slW?Lp{MuK+K6d{GxC
z;F)iJsJ$u{Q}<**=SovHENFyrHl5BEkND#+$%*_6>pZwvVTi#C9I$o44k*l&6@0GX
zFpx^3VNDuyQ>y@527{rvFai&4I0&KBXFyQlV6DB-TTq)Ei1RGp!?tEM3|a7ruH6`m
zhZh}!9JwI)*!~M-f9;};HiXGF4adBjfIr7-!IP}{_{gw~2yU)N?cWPfZ%!sksEmHY
zvq@+(Ll{?2`VG(O<KW%)KXm--4Y0*GmL{L@$CDFv@n_p*nCKr0dn)Xxc855>%KtY>
zE|5U0_tNZZFDGWZbvb>#-5K>CN8!E$CxL$zN4?+=oRdt076%KQl_1G1xR?%AJ43Ll
z+k)|&Ylk8_c}!p00z&Q{VffR+tfKHyydW!#>-S`lK8yF<?d{E&I(s>2u9%HqB-asT
z15LcN^(-0Z5svM)ir9N&v|jJXWT?3-mhY$pFN5ch@#8VnKUQQ*TXnEoVi|@x?f}sV
zfQ{n<@keK0t<Vk|G#re8iXshm&Yjh$r~erPJRTWg@CP~{)o^pv7*HRPVM0RxLZV9q
zW*`2F^AF6y2Rr8D>u1L>bnqlB=o|pAEyrODX9b+jFH-Lv3X}bF1+_*tD1FBk$$U{h
zIH(F&Vm@=Gb}?$-NeA<}%c+ZACY)UGhj~7D1C#>oX;Gdd7K>aYYqHl>Ka{Y-Ei2qG
zZEPD{v73j@Cymg_dnsy!H$%GcJL<l89e%zsnPy#Hf!eAc8EF$U)YkGvkp(lTdG#9_
z)|5%(-mXALVHx&%VJ35QegYj6ItTA%^urbBpKx~8F52`+94idn&_zNX&zf2@_a4*<
zwsec*$Df+?ldc{<n|umPa30j0_k)A3LTrg;6e_;3!Z$l~>6qtBiA7T(&Y!b~*=cYU
z2Q$~gotQ{mB6AUA_g+D(>348f8i%5bL(tAH5Z4A9;EG!(FtL9J-nhMuf1U6eZGYF`
zs>@eUOJyg{k2r^CH0H1-?+99s=|n}bv$*DX35GX_)y1aGMZp#&K6KR!tj82AlE}vz
z<vn=g$T=Lmrp^map25R<UAUk;AI|qE5U<XgcuPGL@!Tuo->?bH&z#43r`zz^wRHT-
zIN*tVZ~D`21A4Bt#BdQ?s(i8+MGk4=`Q__SM~}t$M8I9)%hBjZGxj&~VEeoX%f3Iy
zaHSZkrgIW!KhHyN^}YDLxB_P`{)8DT+iO)Wsq#|g`|-!`$Mlzw6Fw3XVVnG|aFK^E
zmWBi~Dp|%<p>+d4W!E+~y333|Hr9)dT<k%W`y96Q+{9I7Pl%**6*9ZeVdCNInA_)u
zy^5K5X{Zj9f0mGg_kyr~q!15^ZRQv4P~_d#n(#r~RNi34LafWXfq_?2;lTPbI==Z7
z8f`-MrtfXoUF?m1PEV0!O4A4Do^cMZ=fUiY3Cz3mqBQYz1j*k&ksjFkn7Q#}ERzv(
zl2{k2(V(G?bb+WN4bjOXotB+2xc4s+$t~p6L!<G?JbPND8P0DG9wfJa>hX)0R^VOV
zhg|1I4Vv(22j}KJM3#0-veVqQ({Gg}Bx$o4tKP=&4pD7Hf5I<f`7i`c?4~nU6Lt_~
ze@!}R;1h{ZT}eI4)Y#$g)7i?SeZ=@y8dLh>42c@^m3H@Rp)>c5p`c_-SGUWs<BvBJ
zeOqyS5yT13yLU40g@^HV&onyc+!PuZ5JM`TYJ*L}1R5wDjv}wM;E}fw4fAjk@Yj~m
z!RO+nL?i|KRGwn}q&yZQGSR1NHT7~9<K<ik-y*XO1J(kQ$tjYP|D?#L3{7f$w~sU7
z^cnlqnrg4An<T2^29X+TMQ_)hWySB0rHa*ow5^)b?@1!OPwFvhuNs2W3Z#gu8P8w4
z6#=qw((L3-KS*TdL%w&g2o^N!Q*9+x>gV7IPfSGVrlB%Mxn71pTYCj`DxLwAktB)Z
z`^kFe`Pe9Whdi70yjFCkE4d)z!vr3zBf?!@P*g+~&y*bi@$0GlDz95m5U$F5@2Dfj
zJCpg+wHzKf_7|oHtI{og_lRw-8l6xU3wG1287KETM(oXFTB`J(Vd_0WspdQw>ukk)
z<ptmn*uylWw2^;*M~pXYbAqr+Z>n%XijOc?gw1giam0Q+oeA1(iqR){v{@8Qe-y*f
z(0lah@FGUDXC5<guOxN<a+b^Sh@e644umzUfMXNHskHGR**tzGxi&8gw!j-k$=4Jw
zt0%&o1qx(!aRQZ?W<=jCNQaFRexr9yJy<Rg@ZTOCz@a5>xXJT0o=_H|RV$Yedg>CW
zt4*RG`}0uWd=LD#>V@>;>C6kkFqzZ6jog#hW6ur}Qt~N*v`v0T4=PD8VPon@*^9gM
zh+PrWWTVZOu4(41L_?^>+|j-3j-Wn2PjN2uD+I0kWI?HM7B~%_V>}Y_!Cy9#Jp22C
zG+VbZN*7y*Q#22y|6L_b4T`{2Y7!5{LRjw=3+CH*l0ytf>|#V|*4S~d@<1c;%**BS
z^~9;BvJ?&&WWl<GGvr9kHBwNwoWvIeG9Th)Aw9K-=)PJ-G*=!VBfhgqLBf4-{!~M>
z9-rf?e$ON(-DYIK(3}~+=Lk`^r~#ihKfv%yJ19=dBzbzLIR9Q1Qr~fhG&H3{knb=P
z)Rb&oDz=Wv7#jpl8-7DwffObM<-^TgR>Wjz5rYZI<aOW`NbyM|hUN`q^}1o`o&BD1
zKduN<hs8-MQxCIlCX@aX8H6?JBd6mfQM&jQ*D74hH8_b<OUpi@d6g%nt=qZb>z|2T
z^Dsy*Ng&%7CXmFfUZie8t6*i&9@0Oym*f?nVisTj2hEEr$eO1@B*69qq#NbHdb^`A
z^Th@(D0vlQp7sDbCM1ESR|U9=C@|(?gzJK9U{`Ac%>n_*6dJ^TuXEAia4;Uy=F#g~
zBxt|1L;F9cahq5winL!tqpBMidRd%37`OrDL$9EmU~~rFl!j|w*ODQhZru6fD84g2
zL{kkOVCvhg#CvK14*U*fyEbm-^)-BOiTN2kqQqhB1}B93VRWIk6XJ?{_;j8WUAQ)g
zDwjM%?M;IymUxk?>QbUh4uqmxM>87O+`|jq?r6qeMwhg|T>sS?v{hEcvyb0m@F*^<
zd2$f#YZ7qLq<a`Tr3$k8c$7^KC9~3saJ5MjK0KgB7M^Or;M=Wua!NOTd^v*BCkin8
zn;g8i?S*+R{oIDz>tMfRBZ};6C1)>>XFqID!OgG$)<zoCCOX{0wWagvC1(NZ3TKj7
zlSK4gVT%`L2jgYWxhNmfO3yodLpJLQPRvV2)$Ys4uGoY(2MNUN^1`HtCvdLB==Em?
zKmO`Rh0}?!*P;ev*B#~${>l(!286>;qiy(ZVHSP1vbDz3LWnJj+C#ry?Il|t1aRtQ
z5g=WBr?xtAFI?6%VOm~}L2Iu9*ioKIcI|jejvtVN&ZUVYBlRJ-x%xbjEM7*J^^}rz
zy`PBq!&UT-FNLde1F-L#7vu)7;uQ@=FunX6aOXb?)QoqMxlId+)a^^Kpw*OY@;?aw
zO4M<3=4td$Gb4w-?k3;*Ez!f?iP%(>kXaFxr1C`uC>2FR|KTT~y+NJ((J2KgL$3tu
z{|%CB=dY4`b&|N$NQ_LrIsra3)Dz7ewNPm$fj;x~h;UB_NnI<A#px|v_}@}uIV^%F
zjVIQ2txe^wbk~7S`3NuvH)8%V7qogZ6HfSa!I$iA#&6aFYVD_q-<~GH)Kw2)$MZfY
z$X!XttxiK%&v%?*+#6=|Co%k-)=B#Jj>Uf^<M5IS2m3XgNp5@;xA%Ar^XC38(pwP?
z0w*Ob^-|z0M90FW@V**niF~ri<}Xp6txn|<`pFYtDNN7HBwHNCaNvFcQ+F?#B+VYf
z%aA4%{d^L$Pkq4Fi?ev25gzxBVvVz+X=q`23Y#zV@&Cre<EIB(aA!k2x<p>arRPJi
z{m5LlcX}$mtt-ZLG70ST?uYm}TZ5iAxrPVQw$lqu`=}tl7iY#6Vt7V2`klRpPOc1!
zO!$cw8>+FZuabA@x=8>2cOH}emE!J-Gn6E@k<`Y6XuCEPJ1QUJq4r9=_i_rol$_14
z-_eii?qzf&-~t+7UdtZ-auWCLF2dY#r_lc3UoN&X9OKVShupjZJOedYV11Tf{ptY5
z#E-7$MGKxjaTt#udVznJ2m{~c#A`N<huvK}X?e~oT;@O7B=o&5f4nD)t#B;m)n^|e
z@xv$ixJ&mz=wvtUFSMm?$1mc?Pw(-1WgSjy%j6T^Xz|lTzN6m48|X273uVrg;R^FF
zC}3)6_Cksi=k(#`Plnj@=Qx%0y}_I6Y~~kVID|n9hUw?%7+^0;vCB7J#UBUe^F4dT
zsOs6XsCXof1a18(kT`mtSt<09l<HMMT9F^|krcwkqdZT6N(M-e6~MX1y`UMW1nFy>
zNW+>sus51YCW%|a%B#BM)7bZfk-Nc-*XjWOQ{H4{zX)v{sU=OD8$tYQCam{723je%
zN!Afz>^K_+t_2yOa8!dFNvnpchp!pUmH!}pTY;dfqn#+VT;^PNGR(B;LUiZq3`iOX
zBR7qOQTXj|(rbDNhBH5tn7qxPv|xY;Eq+wp=XMNMi%%rYDlOm~69ev3^x+7~;G6hF
z(!W)RxE{%_ePKkwu9M{=Ufw3dIoXWdwAYN5<S(wv#u0=Z#?YuU%|y3a8h_vU1agI|
zfGL{;6Q`a9pJO9%?s5dE?(+m8m8G>|3GSrP;WJa$16=R$FF~zpF<Dr1mZZ4`5JB`K
z;x#du^fo@PZPpwQeJVpBz5Njc@rJNo=L~0_;s|S=s*}@ku0&{Z1BA-9fI(sl>=Bow
z4ZF^eE(-}d>(C2Qc1w*;+f+_^6(@p5auKPV^q7b*B+Nc-SMq(e0{O8<23WrstTI(6
z!OSs%8TXypYSmI}p0tpL@!>Qg=`&ZU^O6|bDPZTFR?ai^B3AmJ;g*J#Q;oqqAYtC{
zt3F#`rS_J|{=5iW#pLNg#sq2{@R-qjY>9EPb#QfH1<aaoPEgbQw00osH#uN*mwW4z
z4O0&r(()`Fntd#cMD>p4%h&xHoi#FGed0GVL+?IWQ#Ovy=M8AmmtbyszAecwUQcFb
z1;e#9*09}VZ|%o~ohada6{79jx$Aqh$g_9fx!vDaaV7s2<Lu2b+#cU;xF~1{B0p=;
zkM;Ah$uNT~+~`7gPd-S08);(l#>d#A5sWWQ_JD%0D8?`HBcY!+5c|#2G|*uNPG9Q@
zKZj<J*wr)Wn;&Cn=FUQRSofLiuVU#Bb{*{PPABiSbrRoOS+v|ng*_`9hc9iHG1E%)
z+5T0QuvW?%7k+%nTwMx8==D@Vd-VkBkSxict=WnHmdWCg#}hDAT9dDze~~K~Cx8Hp
zdtk1oFL)v)4<Dtrfx^4<0?#f5=5=oYOuRG%CQ{L`y!jH)E&Y)2pqm=0egS1Hpp#{C
zVcox6T2dZ}5jqMO_a>Hk9kmT*=HD{r<4#f~MLjetTU7hEdof<Id_ui+XJ9~pJh%lq
zQK4y9xlOsZ84o8TI2pYaKmR((wNx1J*UGDCV$vTNu9rjS_rb93`~u>H92AD-K~!*X
z?ZbEv-e8?Jd~Xw?_V*CY5{KdGE)K=*DYL?A56*Yc!CjjE=$1MIO=mgb>hX_hOw?nT
zwnK#0Z8-_8U3KX9oFO~gu8|+T<M}^sd+7q5=UDjp0s)02VjZMKI=1HtZkL+i3ac9+
zJ}AZ?a^^^J(N5UVcNlD!??khi9H(dMgX<E~_+4&1Xvw=kvVJ*P8B<NU!}C}&M;bj|
zFUILjMl2Iq2o5t6sMwo+CTGQYB9y6GJFzGcgnjMV_bP65SE(KeEo~tQQ<k$SDgLzT
zvMFs{=Sx>9E787sI}A2DO}YX~$k=<E1p^(kY5vVrt^>SyQ`k$@A1tE@FP_kbN2XN3
z&Y&C04M?cjKAJP-3z0fMg%)foC2B)1^l9@<YF8l6DC}ECCI0p^DWi47dXE=->*Y^k
z=jlg0XU)ZL;)>94-G?rA4j>*+dPw(6Z=(3Yn3a3B0{)6mhGE``#)L&N3vUOb*^h1X
zPK_5GJI$XfP~OhIcuW`{`!@3Mhz;#*)1~jHkFPuT$A_NYRzrGOd3xJ_8Eu}Mc=bt&
z7Aj;UQ{`K>I61?SuHP5ScwbB5^-b=Aajsfj_lN?2elfw+=`M7~$4TtA`zMIlJ8{<P
zN-(wDA5SW#Od}DsDLAaDM0XtLiAzE@nSaHYW8~L!Tc7LGOPU%m&+ZwqDir26pVtMU
ztrbM)P$(50^k%w4tZ3@c6;hXSoJmmEr{?WT>3r8j?9kuMIsQx|%S`f^jW-*}C7X3%
z4(lMSm5@?)0_hIt$Xk+0vK*H|m%J%(llx%6*@&2|b*)|1JV=5j)svW!AWpMhjx#hD
zB{rV_;M~H|TABQj99i)Q;#ZAhnj1}ts_t@9Jk&(&TyK)1<xhxn$!X|neZl#^R3pzo
zl#Wz65O<qlBC2FVj3ZOvltM7s-`Wk$UM+BQ$rlojqO@K!6M`ak3gWMvBX&9>cscbf
zsdF)4bZ4C+L0{yU8wbM4@RwXp+N>RdswKJj$%e!x<s$f$4lzMzJ>dI7WvD7^hD#-{
zV5l+)l1A6rdr}?rRqLU}<pr7U83qmO|3cK%n`FIhA{hL8!}O*|q3gvOflyvtEi<!#
z)7brnXxg6@tZ(H>#?xrhx*{H2uVgSz=IzY=iaPk+G@Ueo3;5itgodz4PP$r@lxK*e
zNf%%H?q4GqJXyd{=^G#va;WBj-*pm}7((QX$1y^#e-}xlghSZ`2VyXA86p&Yxghxn
zf#I_^aOwF4u5Z&gdU;$4@s?~O9?LSBj_krwd_RS&v+M<fjawO^vS46Gl1ZtSJU27;
zBJB4chYGb{NZ!*1W@g<svVJ6=q^g&Z*yrJ-(Z7{jR&E8W2TyQA-;%&HZzVb8r%6CX
zh6;_fskKoPMIXbzOz>l2;!~l^v{uXolQj<@M%Eb`p4D^X7YdIKDesBT(S;yxZb(F5
zjgS{xTVQpg7sNeGBh4ZC47H3WNy>R7!uk%=8u$+6R!h*+&5L3B@G0_v?S^-sUJ`$5
z2old8GQ*}tjOyo9sG7c+417~#Qj5w+qmd(#3mRhjl|I0lNhw5hYdp93VkHO#wJ#Jp
zDbLw#aRE=k02v$_?YnU?@Xxi9e66g6&+EEKhj}45x8DNQ&Z)qJCxH9mJjhD^L*#l}
zK*+qm)<>m`=~&(mbzUOa@cjfQbYN#q-IjVLaWISw=>LIbF;|(SCFUgOYXtbzuY`dg
zvf#P<2eI37i4$6)!?>2sg4ab=AonGQ`F?wJKA0p+dY|M89zH)q>UNLgTD>2Uyw(IJ
zEQN>W@29vCSt+cyO@q3nAx!DEBGTX}gUw>~#Kd8xAZyqU?2Vtn^vYh6VN^`2gp<ia
zfeiX=-A{rK=0G}iX3(M+Cgs+0LglH|a=Aa5y7PCK#W9JDsz?enA6w5j3`7zkmND*#
z9wz0rDMU5?6%02A5R*P>flyru*uO7_OEU(D(mNv%l7C7JqF#V~t2j2!`pP-iye9=8
z3ZQg_Ke4%A4=?R6lF}9bNaMGDkQ40X@GOw1!Dcw^pUouCyh!TSsMf|O>A=1#^~50i
z7<YQ-MZ%r-fjng%sCN$0OIiuT&m_=k`!G!R@FZsW!qg+|Am}|VfZ<2dC{g(chA&%y
z&jd5Fzby>p4)`#Ah85hA=<B0rd!ourq6X|<+H*>!y<C#gcTQDG6M7#_=Sn;F6O-2G
zweca!aKQ8y1a%A>-#=IkCKj`6C#l{h=$i%QJ0gh*+H#ZDj76anf1%^|My_;kKeKgu
zBI)ay0J_(<kocvxWO3zNrpmF9X;xXu_&b@Bua=TDSoI+3^7%*%TIO+96~eSUIt&&M
zjDvvgQW&WcMgx}#j7RQw=vtP-<y;b_i({*yd1yDOyDuP`(@)nPDoljoi6un((;H9<
zzYIxQKR|2bG6Zb+0710}1=mbuXuS9<P<UWRhQia~ut+7T%i6}6Z23k4GRldlk0$x8
zFNr+`(kN%9&rOOx1VJ<QLeRwVwW24kgTLTC6fNb+yidi%eD@YGS$q=wqs~Iz{vWkL
zOH*K3=xi9$>mVNE8kyGUuMlM-N-}QNf#w-g5IUAn+t@V>ZY7Z<=%TM6$jGhMHE{++
z6n`Wp<MX)QKkb5H9d~XfBtX#pq}s8~L&Q#M8A+P_l~5-NP0i2A>hmTLz&(Typ`-e>
zyaa5w6Q-r@v7B>OEum*7lba`Bp_OVi()14~cPt;}sz1=fiAS*R-+r`c?L$e;LOgU@
zm;ajYjZ*pHxM9<4bZ^>;m-#DbG}1}8El9;v|23ohn_=Qp?~E1+Z^_d?pU@$3klgL~
zMlWI?UfS>({TF$o-A-pL8udqvM4!iX@kRJy`a@h`yo?`CAH=}&ViYyqS(_7ckEn_~
z#1~)PFt9NUtE^6<Xtpn{`5DQtwdlovNf+?b@=JI@`#UWUeSzoR>>kC773kgjnZC8C
z!@hZO<oqZ{0wS&G+=2Y%B|lJ6<^<aPy@|3u5x7X?ES5YAz(@BaScj7nc~>Dn?96Pz
zJ(pi#^@?G%zVn$Zd>={524%qSPzi0kbC3VE--0ijdWX=^6x6CLz|HTsk7`(_XtE%S
z*9mS!q2?02JXnTdRgKs^_Yn?62hiByM4V1v;#I##7-2CMDn6W`D|QL-QHQfoQ=^)i
z{JX&j9HKEZy#lY)?cptrqhN(-2Od9`gx$NOF)X`)DLir=zE;Q6#nMiw`)oIkwkv#>
zln8cR7ja6j9o`!whVR#`!=BJ0@ChD<isNB;^oSu`(wz$awlnbd0V6yal82=12JGu|
zV?8E2a{Fh7B6pR=*_CqWF#a33oSA|}DTgs7R|S8LGhsZ`-;%EE0Z^Oq08%&gfsm<I
zO_^5%e4Bg#75&!0SQR6@5Iz=5oW~I3a>{HdpG1u>n!<%PQB0X|7^CMd#a*!)ka$xM
z&n0)kr0#q&C+!sIXfMM_!%4I%ZxfEwtp;w(Yz)W?#{iS3pw`0DeTPor{7qt1WkC<g
ztr~qt*){BTl_mb=am31hE}A?@WYYVt3C<elalYkSP%M8A4Y*&<JQ-5M$^Prm;CdK2
z{wRm}7jdul<)Y14#&*Kb*?+)FkPd!#ci|G_0npjt0Wn7L*lU<T-47SimX!0PbK59K
zR4Bs3tG@!rcRgTqx|~b?;)v^oL~-BwLl`-Hwbo+uWn9>;fLdGs!}|_lRQy*p&J0P#
zWk-roF47yT6{<K#`RVxI*mIcqNgYdbZ1KiT6&%!>L645k`tKrDkTu>!9si8Q?Ay|`
z=U67%9yvg_#|mSc?*BE}WoYVu37>IM=&h)Q4r0Q%Kkz*EOrDMt{N1qQ`87QKHVx04
zorQ(5V^Du@Htw^YkJ1t=u{7=y&if%lH@3(zEx)efy-_T8F^j>R&wtTq_HHaSDM6Fv
zRY>*1sE(uDDE>=^4NX(=-3v9WON}OXE8I|Koh^Ev6UN^*voXIn7%j%%=a#>|h=Lr3
z7r!~eS&r)RY{vxRb}1UoM20{?qXyNyuS2w>0=^y+@Ztwg@GZ(|0!Kq0mxoQl_D(tU
z^I)+x^9tyO55SVmt1u^xALUm~@e+Dr$?;G4cv=W*?dbvYf5(}+-QohzsuXH)Yc)Od
zR1-t**kFeK0GYEx45ig=u&-SK*B{M;stbNN^2v=a^|S(<zZ`chvO=xSLpY~97{A;1
zLsWnhBY4mTrhbQE1#JZDV}Wol<SaaHpM&Ss|A5j<dwOx`7}gey!(p9BXv^4$X0l@J
zURMu%Y;}toHE*OFH>i!?2YeW~A7}KBz@P2wM*RVZ&EJkg<VQEuKPRAD)&}FPUKN~q
zDG&x&QBGOY8-E!o<Cz{0Sa*IQ*1Htak^VLGLs=k_r-9(MV;sgXLsaCD4mL>W;)4Z#
zsOT!nzj=8Qqh@=M13wZ_z&(XyCPC=k5R4x-xxxCRJvh_o4&2#40YlU~Aw5=_m0uEr
zDG&@(mOJC$yE*t;dn%id-$SnSm!qy%D6XCQ2P*e$q;@?#*l$0Ay&FckdRG?Lw5-O-
zEiyRO@I0C4e2NjQoC|AxpMlJ)aM+;bgEudh^3s~2VAsqt!bBMBKl~-C``&`On>znl
zaV!p&yyT7;)xh4Hv2bzTGH6<;1X7ul?7m}!ySMFQqIJs=pP6GAFNT6ut7y<$HGDKx
z0S|2Auz5~7KJREIX|^_q>{)zjE{1slGB`6o8u!oi<j<xZz)z2Cu&MDs+Tm@F+X||2
z%6Kyj`SFtIe>h9N-aC$Oe2eh+N@-mGXD?P;C(yl_#yDkEGv<jmER8*ZL*zCx4)>Ao
zK7hSF>%rIVJPvi|;Owb-SSNM}GnI0Q{h4f{FSHRq%&#MRcizQ#_lcA|4MF7>c^Iy(
zf>p}0<gc$PMy&q@t=u%!`xSvEzvoiBmPx2Npn?YD{LnNc80To*MHMM=+HpS*U)@;E
z*N0u_R`&jbWerBuTQ?ne>(eAspTWzwA7GN`Lb~5;9)D-dZk#N;2Lm`u%vkM@rr?fe
zLr#&;TIn=WArbH0o`UaxZ^t@=si-yTWBK3_Lbd7|aoH?HCogw8(z~5zZ!)HD6#wJx
zr)lFqxkYej??rGuDM6Em)$mqW5Z`Rr3aOWZP)h1H{gq>i<^fYN@0U6jtD4~xjzRh6
zGq_{oLVV7pqm9-eF`2&}O}`6aXI=#s(ry^ByMnLPk+)5iK=BL3_`TPMQ<<fP+wB-W
zG4&5L-Vspe4|{0n<a2l^Z3w($u3*75UsN>D07<SDwrXs_mVv3T^rk=6&Rl>uM|~ug
zqS7erTtsd}W#ORXWK3VY73Uv4jN^P&a9Xwnuj=cJtIYLjgmft~nj7(pdKgOFn}VmK
zLh(iVSpM~pH!i$>fE=8mgwwSy;+i@|cG|f@^zZY>D-+IQ@beg4;3<VtH#snT_nfr%
zjN|>M=MWRgJK&xv!<YRvM%6-9F6(GKm!_l4-rrt=!K^g@)ao4nT7MRso0N<APZy2Y
zWE{6P7L|QVVcFr&FzI$DR7T0*)2UZbx@-n&RL8QH{MMrW&nBqUNWppgD`Cz!G0c&Z
zA<DC&asBX1YI3HHIC#|)kJ-~PYHb$pxxbG48Zs6C-HgH_r7t*(zksH8!?+peVxD;c
z4r{gJln*5+BsGS0*Sv=LP2~uuEAex81y+22fqpqZai{zmO!K~sfw%u-vmL(Tfp`D0
z*7t8<>xyfL%TIw*;TNhfrytMP{>Gyp@8BU_3HI${7Ca0~a7#=vUS5%d=}RZ`Bil=H
zMY9qs__c<rW<F-rE8gSxBY$wC^G%#<AkKaXIYHj+)uWnu6a{n2h}DMy{8ivVizd9n
z8nrg8jJbsI?`!G4=~*b(=E|r{t-{`CU3lWrd(x)x9p&X3F(yHb4IOxmg5cM<#7LDo
zKW)RDoh|&iVMiwPeLqSbSwP;EyyIriDM7Z&0Z%Q}rPikXD3JexZ|o=GZy`szdE;1i
z?(t&ubZkQ#$3W_QvkbpZ9K$~S(u;wsCD~1d-*F2*$5#Sx+_6rIwOO2pGI5U~#P=Ys
zeNhBIBj)4a;<4<r!Dx^>-NpFLo{hHkC-8%H6#f3?F-HSM*jJ;zvFuGAw2XD5^@fS$
zib(=rk!(O;znV#fUii_+H&f}_k-L2M%1!iqY$XxdzlV-I-9TT?cBWFj)-1~S(|dD-
zNmgbSJ+Wa0v6^X%Z5C(AQ(s|v6h4h|qiR(8xFY#%GlMQ0K26(}AEL9A6lwM1Ei`p!
z8@!HDVrvqnk>K?@^mp7koFu*hgcXBnZICi0Y9e(0?`veWg(1H<-kpux7DFt_1ys5}
zg^mb~N0&+VlrH^20{7d{qb-W8yj2A$cQ1v6j0(bQ`B9Orq5P18J-L-(Mt^U0r(@sF
zqjqBPG;pmhIjC6*;xBh_!yZd;N%43(WBf|y`6hqrc55SlJz@{h$k~Z<b7!%O3pMxy
zzNRdE%|V_^p>a0J#PekuakM>5XE;q^{W85tTflDWyeE^C-ZP`BC(Nm!DwHi(jHOCr
zh3LVRdB8U`vLsrQ@9I;nlU;e3Mu?=+U3w)%q+FN(^;L%62Q$_*XB=%2nn1l`H{h+)
znq)?^G##9-N0RsaBNsPY5XH$ZMDln$cX(lA?Yxj>_~y=Jfo)9`^fuQ+{fF(4<2?uF
zc?(eQNk8d~i6U%!D38y(n4nL+e0SFuNSr#8PTg{xtr<!%PCw~SejL$Y{<>YLjV`-D
z%LFOlmL-96LlxMLQNIw?SO*EO8i<k67rdm<$UV!r3O1X&;bn4@;8JHNk=6cziD1rG
zrF6pqD8Ma3ek7`CDWCR!Daed!_(z}rN4w_{_VesFL{#n-ym_#Pm>hQ`Gv(&v#)@1r
zFS-x5EB0`IBmbkbZ{{)<ZGZ8Uurwd<@d+3D&BBGfji6ej%tps8VtZEzvry?qCEm?o
zx81a6eNP$G8MdFIq5EXnN#D+p4}XkcS=ThU^8EnYqWOS7mC#7=(&pNTDU1Ls6Cl*I
zQy}Pb<*St|$b<9{Vm4C5-amMgS33HIKk;}!eK1;&KQB?M>u7TZqaU%fD(5YnOPIqp
zx~Y-QO@+)7?I#$%U<)1Tyhy*U6{6Mj82`&kg<kc(KxUZbP;L2NWUKaRwEdYw=9fv*
zN3J1ss>CZ2Sn!D~oh-y#=0?#EQ#aFYeOY>O_yTofV{uS2nCfgg4^5f!?5a3rnm(nL
z8uoh9!htX3<jfIrT>TR{n6;5=@?vcE`a>*xu#JfHThg!lig9uE0Cd`3psERn=!vbz
z=xEcUFJ{XUyPc7|qE{7B$^C<?;zDV1l0KR??4pci<S6#KNG;P>@&1o4(*3)&N#*)f
zswf{r+n<{X_SM?cnJSZMa7ql-Ta-t&8`H>x@$&468_M*8uL}F|tO9$*ynse8>w(|P
zhq=MdOt5m5VUOHVV)t(qW&`Gapu_G_v`dA@K<SzE<#|i`cZ@fUdgIPION6pR+6B~n
zP9}9pRig`PBj~|Bm#K<%5U#v%jhq?NPExg>V}RGF!~1tN-OEix`>)nCCO4k{TP8wg
zt<1*7<D99E(G1Y4x=3#69-#LU7O^$SrBrsB67ME+huT>Nv)8AN;qzun^G5?^`DxKl
zsP35AG`#l*{pNm$Zu<D0c7`_7s3wl?t~$m?Cy(VLqZRl~bv?Y3bt}F1a3ialF@_Jw
zw;(^VB3Vt1V){;fEN_|6MpY83siAT%`=6XNf2_Qk_J>_%e;aZ9HydSMes?1kI`<q?
zQ^sPze+qm#9ihrnGW@h}qWqj}*}CG%;e0%PrANd%Q1$2tZHZjV?yywi|Hju)GY?sQ
zm*zw2J|>@X6($h5SeCbNFQ?~%yx920&$L40Bfa`=BHzAsBLCf!rw$L5SfzU@ti-Ch
z?7kdX_Unc&I(t<Wj$A(vT0-Ug%4c@$z<F8L<4Y`m|Cj__bt#ws)btKRk4x~H-zM@Y
zullK%%Ld%L%a6?uuc19d-{^w9WBByd^)$VwkX9KbVHOJUnUk*4<xzFC;6*AM<tAG<
zr$vQtI{u7qyF8Uoew9ahtK#^<#kXnSu2}xVr^|4mrk=`>D7?9{m9CLh;-`kcq<60C
z@)2>l)UR2bKeOUC6|R%!ul^@q_vZRF`rhCcz1tzp$3DM9tMpoENz+X_*Xjf9zTZie
zP!ew#exwg_68P@Dg|uvEH{9NHhs|?pq<1nK>GVba@f#DR_<77eV(V8yukIP5>x`$c
zVwX(VwH?3c?A6k|c}*_%-ns?q4sEo?<}021?lv8(FUOys&GBWn^J!-505uE{!LO~4
z=u7KJ*1S@ce;G}w*1RTKs+&&#=2uYX+y=NldKS7rzf!j1Cz>dA)B8>z=;P&ORNioO
zkH%8^V*7oxAscz&TM>BA&J5FvCHVb!zrg%6;kbWwEAgEEk8QuTinVTNq?^2dQRj?C
zzN$NjRUA+0uC#W#xIvM3`cX|ulo<7W_?ODmKcJUGm3d~3C_m3pj2C-5ssdfQM(u({
z`87i7{2#fEe3_4Oo$J)AyiRO4{pB{cPIg5k^eXnDShphozHK)zUMP<1o@LSfGwZnF
z1!oy<iVoQyya<|X<iY0xPn`0-U|HBnSlAW{!NOO_`ZEcju%{W!C-y-f$>2g)pMoaY
zDhN_cCJ|>w^$)d$;CbXNI1T8L)i2sPW}y)&t?LKP{dIz6Vnxj9SFcD;^A?hxs>?Lk
zZ-S=kUodj97`CiYBod$efcY{^oKIU3h4(xJ6hy(m8c$;PUWm~&m1TN{I3l|35yVt}
z0K2I&+^5*9M7714>;EMWk0uvFmQw|p_@V|h_cYZu{D}kAYJI5Fk{~(bYDV>%QH{7S
zTTnWwij=vmAbl?$b6N_8Wc(O4((qwEp^j@vZ=3?7S(VIm>1cqfWB^x?RRX<cmYlxV
zI1JcOMf$(jk^Y10!N6xdxpSxngd#_K$Vy3CH-Q1USu>dO;VVQzU5IuJk3Q@0i22kw
z2F=~R!hlXLC!R?mNbM-o@L?y3_f;p4MlQnQ#iBUr0>`b)ItQ-H?3pBk^PJX$Gw|Wf
zDRMpX4IK6Ag`dB^!r!V?uH?o9-c<0M%zNm^g-qEEn(e!okIf99+4hIL>p4Mm_ui{<
zx#$J%k*cG!&{Y2Vr}M;JTL@Gwo3O`4ju^ib;Xh8R25FyE_TdQuUViOG!V~22KP7EE
zv?qY1H4otSW)XZpX*^C}eStqTu84X5TZk-NW=wiIgmL1rT=*sX-8jwRDzRU23vM)7
z*G#I^rJAO`JhvhX)?C`gh_{IukH0PheO^6alN3kt8}AacF>(}I6Cr7l3%U7n3b82;
zV2rGP!=TALV(9gT*;+bG5>21NM<rzxxP%cV$^iQ3i_)JTw^2t^QB=E-f^m~ISnqcZ
zXfgR)?c$|#n9s0;-H|QIublgav3n|wH>0Y-{i`&zC2NwEuHsN@Z-r)&!{kcRN5+1|
zOb8mAK=K9?NQhn<{1eEb`MP$d`erge@Ysxv-1e4!ikiVDe)-C5Sty4|S;tA<dTk2f
zlklnA3gXiAkz`G{O=i7ZLo*MVFh8D7LCH5k%+Z63_<Lm>7|Gc&78T`;@HQcc9ree~
zNE*$3Ih|&fE{T9Os~>@1rzd>veMN6X1fas?b1?iI`I$kxadU;+s9*msH01@b>s&|Z
zHK#Q2OLV~dlU%UnRXVpJW+i90JOTt7gPeog3)HLM&ia%H89%Gr3B{MwYdo99u&b$p
zQ=Q3RM#XoC5g8A5U(+#eQ#$4JdE=?;W#IOxXX@UW6};&m1#Gf$#c|wTP~3WiO1L`U
zfc{|yuSUQEsad0#F^eAEJqFLce*?dZKXJ_DlfbQh24*uevDe`ey)n~)_4(*S9&6f-
z;>=UfcVCA(A6DekmEY1`lG^wodlJ7ndC@3l5}@o{c@*1N10J6LYMVVa;D`8Ir2B^m
z%Pl_*BdZ1kAA{w<y+EEUiFsP9dN~l6CLV+E5x|`5Cupi$KJK&n%G`Uu9A{ar196!v
z^p(^*&>5%3?*1c-L;jOkpK}4+x7;-_E?S25%$S6B`(!|L*AQrLh(QgprR1_&7u^5y
znt6BoI3Yq!blWc-V6^lQN;E+ye+Xo)$8+OfB(o0FzjCvuk3h7~RJLnxJ;=YG#WtUO
z!TFAPMMM%WVa01H64uua8<{<VlT00FGT{+wTYiJDSEOJ}O&_B&{v%mE9LBiy{o#H!
zkJiYz8lc_A_$}|XK<H);8B+8Ubf#9&&xJ1R_`xcebkGLwpK5`qPYiq4t_Z#=h!Byf
z8klD{gC8@&m9g0{8(Qv)0`vS4SU)?7{h|Z#ukwN*GD{2<v5oQVSp`vgS4l_5XJ*me
z$8@!?IB3V2!z#x_`Zn=46+BU7-OTf0L)8fB-`CDx*PBjfkDJYwW~MUU!*L+6T7(mi
zbPJrX%JV_#5g2Wh4^LOhppl;`v&|urjCuJO(i3v1%$7^AxxPSf?qd_b`|u>TKX8D$
z+m-U>vlYp^zxMp(3q2&*{Ups+5n;OJ4x#z#A7EoSljQf`fmF9S@L2m8Q@Cy-PMq}t
z&5m}1s=F-cf1HTL>SHj*dNfOM;~FR~r0~2+8l`8?M@U|S+btYX?&v&Xk<$#;JtYW6
z3$XF~ds_7(zs70z4IFY@gImUzLA0+fN@RBcmJ6dya)luKL=$&8x*bv;h4Io$Z^EPR
z|3Gc-3+DCj8m>U6i8!y@M6Pe1iH?D7;BKdg3AG%Z7F&Sx2MCk8mvT1SKZ1z)e6+e}
zf=_*e$h#aBRMZ40nI}QEmG~0N2LrWT&GT?`+F`1<`a1lbm%!{@afYad9tX9DNnGMI
z4f;U;In;bKz_d-8XxJ75GLD^e>$XU!a*xDQ&sX6a3nirSCA4Smc-ofagVj=owC<y$
zK&-$BADpfRvDrD)XWDUCY08ZH1WUQLZ41cMPqL`|Yz=UO>(QeqkmLy+B-aXN(P-gX
zV%FhD=WDjo!=oCy-*z*)QsFdncC0im$)3m^k1C>yMZ)Nm9l|*Ow+MHD7@c$UIgyF3
zC+pT7;YW6skYvda_~b2xniK8{mI^K8buK-CmYyLv(lQ49>IQ2=|N92FZcL-Xq6M7M
zEk`iD6pyWztKe4eDN>XpLcU#l#SY~?!qSm*L{ZKc4%p2lb`wttHcQmvj-|Iq-WW5e
zlQ*T6M{4nsc`DhIH^Th)Rs_9T;)%Vt71{mb2k?=xBt3IJ*h-0``n+mp^I@UUG)V{{
zXF4HVPlr$Ys)A+y&EPEG3|pVd@Yh54!L6s3kn*;gd|9!VyOJ--XGw1W4WU-@bnD~V
zei3)Lqjmy<G=rewyCppwl#XBCA1CR@mlC6UOW?f!FS;+(f{ZZ}&`0a;aUwh3V&05N
zILGfa=KoY?#)SNZhcH1<zxx(ZUz<hK_Y`8bni|fr&0vQ9c7l^t9<yiOE>dm$nx-8M
zhAU-pTwdG;epZABZREbt8FMD^52n6{)7#46S)~o=9k^So^hXG{JT|BAPCSDiy}9IM
z;|-J$guv~@*Mk3|E1<RBm+EyYqqoI&)Yo9K@O==RRpg-jr49!C`wR=M$KfOS&B)e<
zFlWN&ur<rt;E$pNuKZJuS0wGR0Y@`CGV}4)KBZAkcMD^1p#{#`5vU)$1xIbx;lg`4
ztk@HC{FoV!mM@OcGh;)!cMoFW{+wv^Eb<d*rR9_IC{-+)y@v6>`x&~rmtw#T6RNye
zhz(WEfGM9Q;O`@PXfGAXlpmW2iw7^jGqG}5G(8$)ytFawmIArUb~B0&<8XbnBmYh7
zAntWN1MU9>z>OoT;d5X)_>V22dHs6)e~waog6;_Po*##%#!|RNRi55&euQUse#MR1
z<EYwURkUAF1=`}%*vMDbbYs9ETo_q|FMW2SW9UZOb3Cl}N31Bb!!{U&N4)W0&O>HF
zDud2bf7Aam0N#d9#%Y2We5mq>obDEb-xhgbyL*^fmYcyVn5l3L-@lQmhj+oiV>y~P
zj6_Uj7TP~i<K8doVdQVkhS%>CjbAJu%>d=f;dZ);OR&g>-c36|{!$13XxUa&Jf@F#
z_T7W=aW`N~+6oNl9>smrC*X`jKS5Du0)$KTgNl_k``lEHcuDHl{qRpAf-PgQcl7@?
z@IDGt3ff`cf*>k1PXrvZZAbG>*$h4;qx@|g{48n**V`viXx){XVpTOX5fZ`tc~00l
zql>vNs>*+twWA+58^QfuZgkczNt`?ClXt1|!-4c)Fmr_?{ytz#|J`~I^FEvgclRlf
zVs3|z&;7?6oIZ-{OSdsM-CJSXIBRUSDui^2ZkS>^gME9+mhLulrv1!vym_P(_IRG<
zzu33Xpf?f3MZE!v7b^4bEOcr3pa(x9t%jw$_ri$vEqI%p1W`+rdCQ&;%nFT^+Ilqu
z?$wINpu6Wf+^8~v^x843rNO8l&PtZ#Y^cFsc5y)V#DT$we|(*Y7s#!zM`^Fm+*XUD
z)MT0frB9!u!-7@tCVv9%_fCP+|Ba^#d2hK1hEwRi8P`WM@M3gPc^UEjG?DD6wWJMO
zC5il1F`8i?N754xk^v!m`pQur4z*6D58~c(O@7A&ip$NYhCq+Ho{FV`t8%$$Ia6FU
znwc#wkO!|XmZbk`3So;vnA}ed@Y_>`bf_y*{RO|_twV8bxN8P!ud$|L0so`uOyjBg
z+Aw@Fha@D4QmKR@MRE4CmV^eB(!Xdfjha*{X+lC0DhVlbMJhz(>}PFh5~Wm1lO%;w
zDGHT(_xsh)2j}c_thMgvy05if-1`;4SLYD!$vh*xE#{g#B-Ym+m~F?y<pyktb2jdr
za+Rz%euRU)2a%IE1~c80!}*08BRSlkg$@r7pw-Q%C6AxZXPFO{u#u+L`~n+qY|Utr
z{k>+)mL|G@@nI?3{%;~l88cmW;_K{^2|pf_@A+bno|%)}KaG5)#uu#fIz$#9yG+>r
z;V>~_JnL~-iO!d*$RNIg`<m>`s_wMo;!C}Vjej)e{!?bpdp0nu_8g2_oXGw3Rc2on
zt%XvX@hm$NnDvT{Z1(=kU=mluE|>+P<f=9EKc&ika&oNMVKO*sbm7JF*Qh=724Jfa
zi!SnpJJ00FXU)s}*VLonb4rsj?LuS?YcU~PLRzYyaISXu*|)dn_`KoD{If!L7@Vk2
zUZi}4J40tOkIlMduf{#p9JU_yKg4tK$3;GOu`V(Bk;H2Z&LzLE41=l<S|me@liB-p
zaGSk0W7+qUSa(c^++HHj8dJ9txz<}H^PVSy<EjJ_IdwU1dR&b5BMpi7^bgS2G!u;G
z?+|XNFJ!&5it!ugNcK*df$NL<!t!7Za^E%zzw2m`h=);pKlR0EWqTE}9;=ecXNGV~
zN4YY+R~ndI?~4D@K67`v4uSoKX|OZy4d~pFBhN0JBzm2WWYt$AZm11qJNByxKA6fB
z2VR18>o{WG^OEhJdW0|aFlW7%#t@}OZ>$<3A!Ge^VC}XTb|WVqoYRK!qd)rK{qqU<
zY1>~&Is66g76!3t``kfs+XHUv>)CK|O(@q?c#l0(Ok;*`3;5_kgXmMwQrWxzsI14m
z3IY#KM0uGq>pcD*{<QXngVws-hmU4N|E~>p1oUENozZaiqcYj{y$_kK5&@eHZIIYJ
z=3ibmhI-qnn7?NrNz5KWW~o)ehLi@_tn5Pip7djCCmqB+x(3;JVKDix@GU8tb{>8X
zb%9paz<U?x%BDw|!G*^P#O9wP!efqj>w1#T?;IPTDbBrPXLFlsE`kkJVBT>aWI_K~
zP^M-@KCNDlo!i2=C1=vvX$xKQ;;Y!VT|bw+%~->aPdE?tQ?7D)SR`B7vW?YO+K7D8
zNX+~=hPeFKm&6wCWMk5kxeZU4G_iIv8Foy87>Qjx+jlA?YL_=z?VAeu(y>H-)kM;z
zDRQ5VGg;AOFEW48e*Q#o15A|V!@$`xeE#wThWj5S<*iAw`3p2jVV4m;%y<aj3w0Pv
zUQRA%zX4g{UwHiG3~*~t@|_idFeG&@X{?z@t}wCNI#HbkrOhE-5Aq;t$A0b}871zC
zLuJ$MjwjoTrlZEbJ*>O95m&uC$9Ebmgi#ml`MBwRIJ=(#(>!j-^3~<=kN*Vr^^zmo
za6`(f9TR1$Ca-Wxsy=J>4@Z0RzHFq|Up%<pl&S4)<JN|Sqs#yI>&oGH^otv&caLVN
zhgxB0)nW2`bT&rs$;aJ#&bVaZ30!A9fUOA_z(zK`!+(W@{S(*HabCfo*58ONT;NPP
z^n)OLnlm#xV9%N@3b+kvL)b3!JJ47SWSRXtyyG>TSe@Ap{=reiV=iTD#tnh_!X@s;
zy&K^AWfjM}|AoMj=HmLj4B9`Q;{1P1X1fhlpe9O#)eKZ)e<E{bHjfz`*&RVHMb9Vy
z=DCQ;pEYwm^#gY)_hoBL-r&%}2cRu~iyJC_=FgOPlPRmGlfs-J7(DreH0PNmw(dT`
zPYB3hz3N5_ZO+Cp{De84IyxV7t=>u3saddDJ$Jaz+QY&2<X2hfO^)Ph)iEPY8!|*|
zG0_~X18tjwShMy9e%VPK_Icz;zRc|ktM^WodHeKZT30xs&EYxroK*zd=5Nrhkw+|b
ze#7>|=is1z12kzoh0s1pWM%KUNZzl&XZ6nT;KpMpe4z|l)d?a`@Ryey{tt6s`w3Ir
zCGb3L1F?{c6xY?w7}LP9@Ku?(_Um?;t4T6$9k5o~7WtPo|5|{XTVBZyx3mdqk-kLz
zTrjNcxFciYKHZo5$h9fmz=X*Q;ONvs&LOdlFETL@QgkP?znku%;SVKJ5|Gbb=v6D6
zGxLM!%c)p1Cjy^N*bG|VPr{k_gP;-n6BnDU2D#`^Hm>~$wre`!!bwkH%HaF3s@(!D
zHhdL`R~cEn$&Qo_oeK*`e#9m9r9zyF4=qT&CM54QAU{Wqg}MRv$d<%fF}p5epC)F(
zjMqNURCNYof4s()z3GC-x)^e{hC=JDi?H760^e!90;@yBUP8b!nCQ9$w`NX<F%#7U
zlU}L9nhj6L+INFUx7P<O*c(kHBi71F`e_I)Q<cbS{bH`_;9w*pOSyLu3u#CB1mavR
z@)TotfLpv8T{0pJV$RJb)_u>Bs&64=#;(^)Z`To`Xpuq`E(Cz<)lcx_(O7caKMrC~
zP9)zR^(KQa48!%$Ldb%~K4i>^c(QBA2;uP3<Mc=OUNW&Y8octigUgN}5*1y_4)=Ku
zXCg`=b6^^&xR}Q*$7&Jg=|h&^&cpbd-Eg8(jeOfXh184O_s14BqH|q?$inUlANGzT
zUt627xl@_s=O^O}kFzi{RE>P{av-HcS_JnU#|anP2M^m8!)eXea5E)|u2TyJgIP<+
z2!(j?NInFg8l>cYLmV*-olaw7b`ck;A?pb}L&jX-spa7UYEI&WpD|-eTmBOmb~;y>
zKJS;b{7yT&c3FX>)t>~*&?GW?!z|M0=K|sGFo9jXr$P=u06BX21WEBTCW-g^k`ua0
z)bLRZ*goz}4%R;qYHL;t{_k>xKC8m%(9Py#@+NoT^~WDDEA0l9MV%w7hXx4qI$Kby
z<S_AUN#YdtJCahfRpfh;H92XPNs5jX!@IG;r0Ij9m_t5><0Y5y;p@TV>j+aa+sl;G
z*gS*mi(LW<=~?VYP$YOSvL|swhrYiaLNa{xiS7V<a__Z^;I~16jB#-%mH$~2m1VO@
ziLdA=`Rz^odi5d0zc~=y9mD9X@{OdA+%*oDIFqw)0>NR@7kD`)6)Zov!5qs)q}9}l
zOv<zq&&&z<AgB)Fdm?ztf3LVtjTP)p=W5cha0PLEp9z~JBiW<U<wPNB18msR7tH4`
z=Dt`sgSBxpw1&Eq?tL%dlJyW0@7R~vR!osTNm@vvUuKht83uUz$S~5c_zaut(nul>
z+-C>RR}*!$a`wAvF}ancORv=q6|PP?#dge*l3wdwU{G=yH~K*k>mQs&?$u1T+gDry
z-*>x_%ljHQBb6j*UJ*_zbTXl=`ye#9l#zKEtt86!7-;KT2}iU-$n5p~gdLG1an9TV
zMs)Sa@dRg<Wn2!qxeCN-$!wN<av2nP`QX{Ac>K5E9_M&Om;a~XfT7#_5VC8yUG|Vh
zs4hCj?HiJa)jOW@XRcd;=e-@6-n5TdO?5(@B{kUCevzog{(#V^z4W_XAXM(WKp!g_
zW7PUY$Y0n6%jfjR@k;%OwlI{X<c9L@DSaSjX<zzje>!Q4`2z8`GD=$8tKrv`G5B%o
zQ1IvpMwy)0^|4mNptc?GyCi~9ybCRB|3c>NHre>4k!;}ZiP+|y2-kEfQCakxRKAJD
zwv4CTn7Lc9F@6@Fd%m88%}RiM9Zk@G{y;LLj~}0KYBK-LX*p5T97T4FdIAnVPmoVO
zNw~5lm!v9rvlqVtnbSsR@Jm_+ind4iy4^Bn2;X4Ca<Nx5kH<eN0sI3DNm$@K@_a)l
zyvtT5tv*up9lIB_CF|ix>NwK7E(1?Gs1ZS8fN5jB=*AF5Qa$`U?w3Y0@7ptB&kQ3P
zGoBNfRDBY7L5FM+9Uzg(X>ckjn={T#XOCp1V5QK5J*fp)p6|`u4|~OVZCnUj9jZ`%
zy2$=&_7glmm&u&|C=;d0Vb~Tk53Uje((^T)xqRG-<*5p=EYX4X-82d`)n||gxo1$-
zDT~gXhNQ(k1f%VvVX{g-b|eJC(LcdtxbqP#{ZfgUz09~1(|L6Bw}DBf+4y{9HE1f$
z2Wxj5^gN`>S4!8ws!~njG&@2lO&vs=JP*U-)+bzfN^cS}?gY6X9?Z|I)Fy44-{6sj
z=g6tr-;mNd7FON)Dr;F9ha-1x!l{c|WZf0lrKKO5A?eIk(28t^HBC36_~QWD=95gm
zRjwl^<{!kSp08xUv@9??bdJz-+gOQ1G+ESpBcX5+<7{?fuMykqw(ij-eO(X1{38NJ
z?=B~)p9GTLUdQ*`uZG`4%}`o_T<I8Zd}nAP_>WU3&lYBKjl+}$(*r52dcz?>EA=Ha
zE;whmPwto?>lcdG!oAsz$=6|89}}TzWhN><d;>p5-7l$W(W4nN#Tlm8IBHiMEV!#t
zs_!(Lj+3d;_4y-ctzio>EgeI@H#*R?)0#B=urY1At}nWj5(UMkadcrEp?>2O1ciy_
zbi&Fvq-&rFHIO~Rkd@Zp8m&&}XO5+Ve@SVn*BIJ<-%If5H;R@u^rzFUhX`-$HJO6S
zbZUHT7TxsSQP2?`URKGI>BqiWbZEIHRobFQHv}!D!Pj@wx~IdaW!(kgr~g!{q!dC-
z^~Tc7G-s-OONSoVQN*&+XVL$&RBB?5qq5$BzTZ88UJCG_R?}RlZ0cxwCw>ThZaa-$
zHJ>0%^L-}l*HjZmze*9ht+lA7!&YHhl^k>K?oHh$#gjRGwh1|2Y0Po1q97ODgpczU
z31q-5+V`d%eQxGR^}kl&;dyTagY{FX-Z5>eFhi3T9Mz|rrn=IJwt>Qw_3qSvjXJgF
zA_SIiDKy@$U{B?ph1w|tsrpPx(^~eU$C`J-_VhV)cvLr&Je*w22lb<)JOb&bVg6vW
z^%L4Wa$=K5B?$ek^kBKX8=q<=WpO!L%>LmIQrB{wzm%nnBYtW@+>Ti=XRRD>6*HBX
znhilkF_V3^Ww-G2(@^e}<tG*@3&w!Rcl_T!=SbyzGiE1dHt#2#<>Z@!p<<r`{RB5K
z<%j}HIdK-4&QxK}>`iE1!LhTZKiROMQZ$WoV6z*2A$@)gzd5ZOKYu#SW{Ul8wE_E~
zuy!irX1Kz?d-Lec?0&3zXfR*w@RNTxZ6ICy)Km169E0~x-8iOT1I~)}pc|5mxU$T-
z=y}e8rOFRwwXga!Lnihdo*oo(0_=rJK9|_#jk@f8iZ*jn)&kqiNa`te(*j;NNhhYA
z5nc_xF1#u|CLEp>%qFUgVe@}i<A%s0+}gdC`gA%7+cyUD*G{Kn0CRz7;ota@)3ex}
z-->Lq&oWdy>W*W=>Tp8NWWjt;AR+1ULffFla3Z>#l`Sd6m1`CV8d{F9@5MD?(x6#T
zQ)|Qid*VcuPRh{~r%z;M`){)LEKosSmA>xMp-l!lbXD^QGEdQxidiaM>eY*yM7||&
zw|^$f?6jy&=?F6DrUosZDL(U3Wvt71ND4D-iEF`KLOT=rZA#|C`%+!n@4{WO)K!bV
zih4^rVqW5J@|zUKloFZYX>wxne8DAGg}Q1r6RU^8Lj1#@&^NO`jSe14&kcA+?rQar
z)dO_s=i9uH*T<0N_V;1ui$~Kx&us;RXF62jkp`X6BcbYXH-%~G!)fi|3?R22kff2L
zXxNEfFyXQx&Dz*bu1*?EEw}T;zke0kCOZb4p0*HX{TKBocCe(*{`8bO3T~1M?2Sjf
z@LGw|iRRClj>!Sxuv-PO>~AKxD7XkpA}6wEt%Pc3NGQA5hQ~q|k@zQl==*u!$lcyA
ziN?flB>43sqWj}I_WV|&{ZsqU$#<Tzokv2+wJG&NZw(W=bEg8`Gg%@eFMf<%YYUD)
z`i9KCJDD0xlw-mS1*-U4p62dU<kubi0)f9*pu)ewLhl55vMlW{guHvkt!VO)-7vWW
z=C`Kfqcclj_@Q{*Fkv$ElTX7-%3s(@hXlyBd%|g7HlUt<x+L_eD$cERMIt($eBm95
z8T1|GFC~kem(7@aWE^ft89@2|i!tzwJc-zRhio4Dn!V<O@TkRUe)_ZrkTh=@-mWUb
zjJzYb@$GMT+FR@-P3cXH6%J#ZFT>5wDzr$i6K({^v0+vxWfe()$0OSL!JpM>b&fo#
z4d{ZyuNfp5<YHP*2J2`aMppNF%1gZyc(;A#{Ep%oa3kp&*;m#9xt1?k#_}8F(ZDk3
zsh5&-U!9rR+H|6EdjfmfXFADpPZeR51@y_bfr4_?Wr#V@1yY4g__=>5t}jp$46Gwr
zck&PDnl^@8y5<P%T3QFI9vKqs8c0hYsFLW&lUT0xnpG5>WS(2jvBjtTSkz4&*@pue
zg5!tB*z4ppqI|so8`4Gyt--H(z52c+wYnMj;swODE1a}k7!5Y}J^0!4x0A<7^2A3x
zUoSZ}ms_Jz$a$-8CZ&gZaZ6S&CmT2IBq7h2l0FL#3Hz1%NedSTa<ix&9W!_%nQAbd
zzSQ)ByxT=^u<)#q?KP6PDkg(@i8gT!+e6~i9T?x14dw3#fVI+UcE$ZFnK&zmoH;rP
z6334KhX)ae9%-N-GM&uJiRK3G^#*f~9MNYriRkPDqHk~y6<SJRt&fs0Aan@v$(u;Z
zYIc!`2jhelmnM*ehfO$lsVAiLUPp+%oRD=}fy|Dmfziw6a2MiAIlEL-a$P4L^|!W>
zy`#nn-p58T@0mAYLdRv1`5Z<6$%2Hnm9cDpRyue1i76?miN_!Jn@QI&Z+@YL9nrSh
zOf33G67PK}Ou48CT6Ya3@>+X{P17iD-pg5JvF|wIZ&iRpI!wr~LPMf|FbVHyIg+QH
zD}<$8gV^Ns!P2}wr6^gNQetW|pEj5^K(hWR;p%RC{O`a_GA`pLF>9U1wi)hYO2Zx4
z(mes}{6u+NoPMA8TC2!LOzexJgTk3~Ocs|I-hl2$D`l)H03CHtOLKCrV(i*&Z1h`Q
zR_m%y%|3MU%WpIj->Y$)EItSJytfsS&)Z^9?NI!y_yo7*D6za=>TvNvEH_%rM52g{
z4DK8+sEK|QeUBRcN6rKilQx}Sua|?jY8|;vtFGaRfirP|%29T1qC1(Iwv(k>d<HKg
zZ&s9<MgDAXW_f4t@*x?cSk(IaaAwzAG__VD&H>g~a2HY6>J|GOG?cCV^cfwz?O55Q
z8#wElA3OKv3Ou}&K~BtADfF&?!oSo$hWEAB6C*1FN<PddhfSh!(auGDx!h=?`sNQC
zyJ`^hRc{8e$eg9SPsGN*%lYd1JQx+VikYS~;>eoSti(7CZ#&Gug^$I4O-CoW@-UA7
zRJwvy^qDG1-?V_Mg+Kb6gh5Kn2YjO1!tB<j;|9HBWbgD*Y-k5!xvLt1e@8ik-kn5R
zGZRxtF0?k76Dut}VR6)I-lt@WEZA){%v?H^91XF7FE`TR-kD_RRsRgkq?1UR(m>*C
zcZp>cQ49!FA*CA4%yQanxW4ic8}U@^w>oLEGiRNpF#&O~W!Fvc>Z#%u_~pR1ZHI`R
z=1NR|Bqh4bFOlpoB`nXjH{pC9!O?&z=s4y(mMH^-|D*7F<0d$`atMj_yvCM|J3~JH
zGa*7{3~7(6l;xgQrJ;WZlB#*8CC|Svz@bA-1fLJ0+o)>`s>~LV2Hy{`Qym!0G9b&_
zw20brH7LGb4RQS_v3z+0UN&D~*A}!8hrl(EaI!Bs94m5V!BU~dbw;Vj?$dN*z-Z8T
z8BLble87zJLj_4W&mZ)ckiB|}#9Zl&G;Oc5n35_BDfj!6DW*@j|9|do>aXM$W9c=n
zCy(+`&$!<2zsVHiR|uP$^yu8tsmvf|q~P4LPt4A>N>`hYhN;UX^y|b<m?hs=$jH(G
zxsP9f-9N-y(@hXNXX4ozH&MOlKD#QILd(9TQnkL8aG^Q}AE)*uudl@MQ~Vyny5-%x
zwzfY16K6y4ARjL9+6Ty4br>2uM$j332Eo8bO7y?XPkffdKrlAggdOeSxYe)$CfTZx
z8E><3)OS<%UrIY1%&vx@fPr-P$f;Oa+8?~`6~n@V^EuD)J76bgj<PK=xFFgD{4F%d
z7I{N*rPhhe_8tuS-)8b*vnsiHI$<#L<p^TJhvIVQr|@`m1v|0DfRqM`T^C;)P}g?B
zW1Gjb!kiskx4}7-uh4-rrW~(7<p=Mm7bca<Jx|VG7)oq^FX6u^UgoxZF{F#599aKQ
zEn)TI?QC0WB`Az|0lb$PEbg_29Bxd68U1&|d$&3`f29(AW6to0N87@z&~NyDUxchM
zeGoVL#B&Hw>y5@1|FPeHAEQP51wLWSJ2uKeMwTxR;uo#`Vt0M#HPCs_@eRX&NZ-64
z%SIZX<9`)u;DvjKU_td%DDsO&8~PZ&F1-VeMz`RGMGyDfDjast&qO)D0(k3~2g>>N
zplMNn`Kv|Vqpve=YSbo?ZJ%M^x&UrYS27;^e1uokTgR-t)riV@M^-(&kgNS#z%&D9
za3@AZ@)sUW!?~{O@Q}k_EdG6)tC)6xyZ>t<By2rRHqV(w8XPP5>ZWIyJ|Kc9?2tfE
zp6HQzW{;8QZ1J~M8Xp{YhG+$Pi@d!&F+Qos?-*i);Wsu&*GOt{gd~~|Ii-iBPYrLi
zsSOV0cVmM47IX{Vjn-l7VAMu;J2kbJpxAX8f-=%@mxm#qSn?nF{;wK*UF^~3-b(T^
zayFc_b|Z<7FG0I376WDvBqwJ1lAmr@;OKIDw&=!pe(U4_GUU=Dv^YwoExYgX$CT%h
z;E97+&DkZ`Eh0FNY^MVKQ_9^v@q#aZx`$jIdPi2HItgdyY$4;M1yB}I344b2=NuaH
zxB-`a*$VeNV0liQFInHl-5njw;j9&=n;MeZB}cGJd`7DOnd9vQ1>$HCj0K`wMrU^t
zq?}*RwI27yjq~F$XUHOS|FVHEzgY~qwO6>dxT&1Pj_{W3I;Mne<Tlxrfy0V!B<>qg
zEBh$^S#JUw1-I~~ngNy{S7r6KxA5#AasHc)@S<xQDr8kaps@v{Og7|FD({HvxDshg
zZbbXN_hgn!SMiGznlbmMKc6GABqr_k7@wVvj<$)sMR$qVh5sl!|E_~uw(uL)28)dM
z##>^KPQnfhQeeZn<;iXR4Y(}%7S}j%B}ht5ic)(1^4S{a!Dz=tss7I=7~<2#YmzZg
zyiA6BHICwhs*Aj?<NyX7ONNJ_!NpECN4X(W@XYtcsI%=Kj-~NXJVNv~s-55svgbi;
zzdn$>AQ*?$9)hlZ@}$S}1a^;+u(tD`aGB`eQOVkc5+65dOw2sK)U+SyCO^aG1uMik
zZ8N-j>kBG%-k@nyfRgg1CGl%Epr+F(?p5A&l;pg|@Q=Uw4u#ENF0!3%bpyEttAAqY
z?6+KE^eYVitIi@-GU4ZgFbu31&zC(bK;IpzB<+Sgv0nNQeS?%p<e<CoDo+KRk2zt)
zyD*6Osm20d{KopxRs7R=*;sW?LYxgwLzhM+r~0A@;&z6k-iu1mA1h&{;Zd?hQbiIk
zcMQgLoIuS%id^8B{UBLm#Q&*PW4Z@Z@%;89yp=%#vX)55J$RR!oO}vzivJfvwL?Mj
z{Jk`Cl^sqvIuvAHN{o;EgLSP4%a>oq@?mEn{G1m^3YYQv^Lmpf1sSkXbbXh8wuYy#
zPs5ydifrxja&CstboAE_;~tK0<y0!g4tv*XH0ZepIWMzNFZC|Ece(LDwyCiCBh#VP
zZal=NUF0vVItu27zj2u8EYEFi!vfzsU|*FiE!}iY_T0E0W8_qb>nU|I=U@WH%)P-a
zQ?`SS#<5`9Enq`uD(=~72rI|e^Iu-R0HH^X)vr_JZr$!cUsE-#zk3?&Gg74S-CCgd
z_Xqw`EyF)*!%)*^Gq<hr1YUaGTRac#<R%U2McnuN<J!U~v?=W4Vs3L>Y(PF3y}2o_
zU^k?rdLH4;KC3XGbp|$C*Pv#~ChjRk)U1Ai<uyT2<#QJXhNv^L?I;ZXVu87}BRR`n
z_i^N|b8s)QgI|`>%}q;igRa`?aDGcVFX^3A;+TCME&S^-WaC|NjgICEW^G5S&+*7#
z7N4PiEm~?F;dnuuKW_aAUA>jzypbj-%zF%@<9_14qAK)?NI=huIU;|hf;X>?1V`=l
zkQ;r5n-K66rd6NdT0cbcE64tUNfS?S(@s@j$Kd1Q`&<QEOLC!NsUo>$5r_dj)iCO`
z9E&yWkB>b2Fkk2Q{4~8+oYB8TkkoyKWzrxntm7RPdq$#0WgX<p_hC0*I>0N(-XNJG
zm08^#j*=UNoQYEp7ZDu_N*m*#d}B2K@WePiCHtJT&-;gXaZ5Pbt&N68(RHBsehU9|
z?+`ZmYaO}_?a!`c)v&^JZ>;IqgbAM0p?hi&{CL^`^V;3Hif&K%6h43*T0dS~Q_7_O
z#ns?l8#$J;=?T1V{|0YoZNn)uKfxj0@BF*TfkY}3X9B5Bxah|%E~ZhH{fnFlchzp8
z|7y|ix^FKm`LTwpRartN+`G!ZcsoMsJK+rI?O6jY;|1V(Tb!z%i{m5)P}%v1OO3E3
z$24NVIBy9t+Hnr1Tm0s4MqlEV?@L36;t}9yu7~4C1*6R?dA3OFFoxy~WwDEng2eJN
zuK6|r?2|6z+wN;n=p6%ZjTHF@vSe98L=KsDF9`OG$_MVOCtEb0a*h`bSx|uvsql&=
zhdd_2qN@YRo{a;^`|xlQ^`IJT3dYJzn<wJDAJ6#V${ld$y@cI8^B4o`O^|!r%H_=!
zJy_s|MJGRV@s*MA^i>QLj$A>89a)WrN4DY4wrVKboXXaO1jDtICSGpJ0rblF2jlTG
zez+3EeWzJueXT0(dQ(sQ#2jGSgA$zo;R6ZnkWiz{`{amw3$b4~mMq_=N53R$&^@Dv
z(@4X2<c)3<`TKV~yPl~@GhY}`$ok3lH4mk2g*MbN{x&fPTF%ekbQx$t1vz`+Be6A7
zqiWK@RPBT_O&<4`*f)J426B!xurNoc8mK}yx#-f0yK7l(d@y`l*^ge98qof??h<W-
zE^<iIhUPwNCoAQ2Y5DOexagrxzi%%jGki5^&X#V{Y4w@}HN0o<e`?c!G5J_}PM<b-
z452NqS^V|oy{JJ&UwUA!GEJWQgACKtr|+vy^L-v%BJ!d7%mqi{LYp@v(^~8mo&#au
z;DM~8SeeT5R<X>ddzjb4oJktrW7+W-U)FW@Gr9YXC%yK6B7+B5ku1@3CCrh~GCei=
zSTdB(%$HEb1YKJCq@4{Of0rDeqDT*~>tRY)zku_Zb?82{53@X5PGArx7%eU5rYk-s
zVeZu=_ErQ5EZrfKT)t1v|Mwa^?uqwy#7-h|ccr3#F@P}rqr|}dC9FPoiA>-23$R1X
z0=^p(=Zr<f$D<b+zkNM<v(AL{%N4niAxR|AtB6=06WtbW{=~3pu+Vt!G;vII5uQ1n
zmBwn{g0+zm<eB*^_;2MvBJ`bsNpeTX-UKOeZ{Ntay9B_?R9j;9Ab@Ce^<f|UIymE)
z5@=J6Bv-Z<!_cH0G9X!=`MroIk53&VS4VZ>ygTo~asM!~LnDKT2`PCvCWxfxH9%_K
z08%^B8+wN&6RYw#vhlP%+CN@OhCdxfqPF=E5;lko+x8UR%q)hU&r_tu!P?~FJWclP
zQxd7!-hf&IN0DB)!pNbkmT)-z7q(ATA^(1ho&70K;9+GYG_)Ng&Vf$k+vAI5-cMsP
z)?aiTyH!Bg^?~9H*^ngMJwi60KSOHQtRiVQ3(4;aj*L0#!Vmt|j)N=rGTSdUWTg1J
zr+r>BjhX?l-YkKu4%tf9m^u&-vp#H>_kPmdFABalctO^$gS<yqKDS{1K%wEOHEBFr
z3I2`pWcr*@L{Cvi=&lNuGPRj#`r<fLzCXg}eovR3-!~66mIlGZ%zU`!_6uf7-b3pr
zPo%~3A>sK5+6?Yw+m8fW-|uO#FU$=t*=O<2qqo75q2tK%JLaUIG=kS%z8x;86+xn+
zD~_Gf%GK0fgaj`qzD_v^R!n^hgH!tP=il10cvVBNn8JZ2uLP|&dU#J5f<K2$<;Q)w
z1`wr-$GU#v{58EmsklFksfdEtZ#_uAPy=Dw)eXdUmjFX_MiTc0Vcey@I^^KAVti)#
z5!($WVfmP2;3P9ABTkDP%_e`A>dv5IT?h*c8^kAk%*Ep$=fe4)m(b5U9;R1`45;2H
za^Z3`ysbRV{H;#|8=`~_2TagyuQ@hGjevrugGv4v1H9V0m!tZdpnYx)i!}Cuk?Y0_
z!ISz5F>Vqvqb-uR-D{1fRU-I9`THOvB#a~#DzG2u0M&dV4Byv48qDqxyWaxwh@1qc
zs&(o6v2TcW+dYDQw~4y^K)U#i*r)UVL};oUeXjL|IIqy4QSHY`-+nbj!|De)GC2tL
z&8{RDeUFf5>s!dG%4nLYFEHEJMZ~WW$)43})FP>clxZoG#Y=vYX`|HWS0eH%4kp4W
zrb$m)|0Dy3iXFBRHKPC4fYzHS((qFfYOUQwQci}_e-q7w$wgh{yys}<*`81Ke$WF|
z(}DDg&wXOS|0L{L6I;7f%#hEyf#rX-WWi`%D*0YZ(ro)vm%06DO7Ci7eqNbw`czMj
zx{P3jO*@1EdtY#d$we&a-~bvl+lpNp(nVsPnNZ8&S77h!^X%Tg!F2f4Y_h#{0vSFz
zoK2qBPV!hbxe}{GhtEqV`G;ar<ytp6_A!g-7u_Lh-7kom!!@Ei*^}G<u$`RQF@R2R
zcnI=sAy}R^0AnM=$g6R6WP@EPS#ZHaG@w3WN46=`xLYB-rPD0FR{UEn7sPTVv9BTC
zQvpgBIq;2R7GPJ&Z1CLo31?=vW1UQmHJBtq?X^5kuk0bzlYE?3=L~a8<%z<q?NB<Y
z8cKUVlp4)$g!$<~SReeK=-paqSDY1!1)nHxTB$+;m8>AnXAq8ku^o@H1hkA)=Zy^S
zadNxvfsyWancsh(AgS~rnnW8y(ukwb8gC3n=}jEB;sU>?<Q&>NbwJ?Dc3Gp697yI6
znPsRh$6X8J)4rsEujMyrdvAjh-linC@EE6%63Ndf5$Esad0?e_7dmZfP_nGIH1_Iv
ze8@TB!@R3#_f(0Q`z?pny*07it%u8Vmt$>inOuzGN{AWM4Mt`OGPAo)n7i`^q<E?l
zIpY`bvt<(gJhcE*(mrwe-%CW7);yTl)0-KHthdsNo8WFC?(P0N&)eTs<(pTiVe^{R
z{6o8m+~BF_@q5HMC>{0@0v+B;qweg-troek%(@SGRn!gV>oT~4E$z^Mu`-J{?E;-v
zT?|Qz!LIS@OtnRox%ZFf{3K=Qr>O}k@0W3Qb*ZAi=?w4tZ8pDsW+uiCZ-bAM9$}pJ
zFpPVB0{-kafz_M(;JLq-MX&ZC-u{^v*Zf+Y-Rw>R`)%TD*}fA$tWCv&7uR7$=4;HT
zas$cKMA?!3(YV|;5Ch}faYuwIDL#EroaY+DlPeymbV>B|fB1=Qj{A7eJ9BWwj+byq
zRl>sE_kn(xgnjS-55t>hAW=L7b!rFT$ypx0_t}owD>Ttsy&LBSuErQ+@ilwj;w$1!
zQQ!R_1~#`yC55JZhEWn&`RC%?<^3R~rx9KaoB~VAo?wdiKj}qn1s4D5CKr?5i+sqb
z#<FqEs26O8F_Zc*<CG7$==V=3J!#J`bF0CAlO!zgtQnWG^Crfu8_0?0H_>FF!J8W{
zfLK!jBY$s&@Z-J7m%0K_8r6;K-m0<>&l1qxvl}FTZ}S_jgu~XSv0(DP7prxe2cDy@
zh}n~aY~$K`EGxKxUqTvCq3JuH9jZ*0$$rDD>~7w^QBjs(#zUah3SRPEMaFseAg9vJ
zkM7rl5g+RzNy!Zq9`u9rdgrm-yc(D3uH(%<-ozJ!E`a@5hULAy_`qA4b`!d~`SW?=
z_sOaQmyN09mZhpf%4h|UB;J7^YAS3&)gk!HL{F-L5!j3U@zNVS*EQxFN|toW^eUTC
z(?f+Ty_CbHm|Vg76W=jqS|!Z<twP$y8S_y|D&lP6ALl>$Ag9n%#j7`*#S@}SPW|2r
zI2$z%eJgahJ>|bavY~_TSo0NTip-&7WjV&bw1A{a8Q6~>Ahq9P2jTfDq{DwQ26jrg
zW`z&%drAmCHvNear`|zs<w`z$*&HZ1-3>86P5GpNB5a<j11iDZ;{7ql>`c5rayI>M
zKx}CtZkQ)#SUR0tww~zOOWMGn?>NRy`*)vvxNrg&qg^a^{zPWT<P1)F*A5+Wj=1%B
zE~=c-!4&_UobL-wJ|WCas90!?MYU$EQ=tJj=j{?avPZLyoLClN;mdBj>ap`LZn43C
zJekMZjcnc>@%>4BkJbq%G4=f{mY24R4YM&~iWz;Wc8xVN`7LAThj-w|+1;2P?=NUr
z9b|9&d$LjcT~YgO2rE{<gBwdi_!C;2SpRGV8Xm33wdT!aPtz7Mg`jh!bwmf>X0;u?
z1j>T!7BGkVC$VDWHL`d6ETK1@%?_KHu<>T?*bn>BY~NmN^0Q-X(9USqF>fC!{P!OV
z_Y1;*RkK;vo-Dj(cANdFTg)!K`i&n037g=XiOp^2u#ZDG|0Z=2`P=t_Fn?$Xxg^=m
z`rVc%dXlNU$_s09(@UB9WR521<@`w2tU6}n&`U__I7Q;+4>9HYS8$BJ4x=HH=$V76
z!ri7R?7v@z%t|_!)hx;53l`5~6Zc!uyTOOqxvK4~YJ!ar;9$nw`kAp80r#17ffW;o
z=+bcc0=0Aeh|!T&e&kVG`s@}%rCqPlJm3XaxbP%>boT`9E1yEm|J<U1xe0XW(QwMw
z9i!SO4^hK+TWGaK2yKmtq_?_5smZ=5x+E}=7T%6x9f_xD#m*#pVWA$Xw;ZSEUGnJb
ztdlfD&52go<_kLdCutZTMn}v&M#qhfq#4#>Xxh4$?o*4RNB@nb_Y3+7Wf4*IS7QR*
zxMHZVPg4dxxrww{K9-s$Cey*02k8jQ!!&=H8BN)JgjOp=3VUwF(?NBK>_tl=Wup&?
zefHyYghWDzx+POhv%C1yDuQNjI7!RXuM^kDr|HN2p>%a=1eGQR(34sxXw|eM!tLJ4
zWOwgVLXvl+&`U3t-q$(L!afCnR=1(xQCLprz1kt{fBTpW(so6Q<2P9G$6Z3zv3>O5
zlUN%4?G$}1&Y|Tx?~>k!j?u6uDKt9l43(@6p${Gg)2^xzGUak0y(T?HpYs|-|M6mC
z;rfa$Q7>V)by8{G#!kV$brYZX;{-i+?ErNhca^-kau5eUiKh(@$FP5+2GEQrj&zfb
zE}fSDnuIE7(;3~O&*tM)I?s9>Rmn0Y1Ez};z%vu*=~sQJ_km%Q+dhsO{+x~v8>CeC
z#VlI=!I+<5;7nVz<_M>)b?8513wonZj&R7vgw8fsq}(DyI@_r)ZTGh#11=Axt3t-n
zm$&l>x5Y>Ru%dhZy3q8IiR^a!8{FG5j)ql_rmyE2(=YSwY2OFK>GH4?a`io>WfKjB
zLf4se(z86`@@))#>S{n2M>x}{HN%Lt;UKzf_&1sQJ`<`wW)5x2oW_#U2UD#!Ju2y|
zLH9P9Q-^D!|6rTBpt9i<xi+#)&{&2nM$Uk)8$Jd~uZ1zm6(2!c>j=GEsv?BG?@#y6
zu_v-j58?H*GNw1zfx5_#qHhAE^heGnYHU4)*_;_jXEdwQ24X~)SW_CldKis8=1g@u
zG--a~Wa{l^B3vDIgUoX3L)|=YvVoR{G@>+$rEuHf`jwIN<b;v*;DMjaKYtNE>zqq7
z(*?F=<`y=3uo=sCl4rjPvM@Pp9Tvb6=BY4_d$emNW-keZPLq}FQ1*Sis<wu6qW!pN
z+YKy!STdQwOt7B&Ba1f}Njw`~<GPIhK>xxnmOAw!Y%_4eMUV1PHN=(stJ{e;yzcSt
zM^e}+ugQFHhXXp+>5y&J(?l1l=sESV#cAzFh>8A2XkL_I*JQ6=GQ#}>T1ywO%$qOy
zpo8yOPGB@n`C7_eUOIp#dE-gXj0r5z*O-mbti*ker(j{(M_GqwC1w|G##>PpDDic}
z-ir;G<y#m2>WD-fmT%2GPWH!=Um8OCS_=qQ`OcPRSYzv-Mw}(OMg}~-z>O$SFTGpQ
zNPZvq1pZwQh^@~-@K*W-uD7R?nmx~CyVo(iel1xxO?xBB@AM;y%9VC<*Q)WoMG<$%
zZX&DJx`eZ~OX%p!T^Q7I8!z<<70S5%Y;<)c_;gY5d3jm7*Cj-FcTtN|n%ydNzd(fW
z`)om*KEiZO+@UJZwtt<(dV7dj>VNfk_x2mq^VDNocG|Q2b1uwZ_5{n8DDpkJ&dg@a
zWOm?q3JypntWjjpCJnG7;dKjHo=+e?j$Q?en@q4UF$n9@G}*Os1Dq57oa`67{CRJ!
zL>{7=|E8<Nif_$8=@nb%xnG;#y*q>0wQnHOMTW3Jb2uAubR<by(+|EMGDIz<A#Bm@
zp{(`OBzD|#AZUgzCtA+$r4|PLWlmX&>~8W<YNjW{U~gNt{@YwIeJ0*L;jx=r`=fzt
z^*oM~x9Bo$&}Cz9T|f+Zi{DDKOM0p=N-NDXrAD`uSy5*U)3~O<59(57YX3TMr(Zhm
zFPOs2lXO_ypA<4$8cy<VE3+T|54c{-lgaqOpFmyiIeyRlh1pUkma)%`*pFKPk)o`B
z$(9D(FPX_QE{HDwkFKm$@FW|y3}ku{x4Eqe@`7!QhESMdFKix?#Z(td*z$H4p+svV
z{<~wta;~=FmFb*dE;Gg?iz7UjvzWEiMzSCM4zll4s&MUWeX``W7Q1UOp2<(lVLc@Y
zta!+7VxMz@nKX`NUapZMZ_|i9%dOe)$mN)OsttEp$}!`0N6Fp^AuJ^L1+mjhV};eH
zSnzvAa>d7#U6U2Cg<5qOCwd(ReX=J@=QQG2Sr)tWN8}=vZOHv1BR2T&d}gMbNFI$Z
z!k5j9*>yJ;Rv4AWYLvCvh<_HuAy~$qxTT4Eg)2m*^B_y_Gl^}OBV~)TqnK%YDBF}R
zWln#6*o0X-LDTCjd(bzGsod-)8g5~%m?kpt^<!tptFmhT0Mmb^MAwa&3ypJblAy?L
zC`z2lCO*7QEZ9hx5*-E(!*bYGjZ(1qHHJ3!s8j8tdxSnQAsr&GlCe@nWVfQ(ivFv~
zzt<hm{LPJJ8;af-eg|t*OJIi08`=Fks;o@GkR2MI$fnH`d&-)s!k46pbnA@4WW-4e
z=3cmpwk4f|iV9V7@wYzvZ?OVdp`%QKZ_N^&Q_ZkRbozQ;WtgoZ!>+(4P#2w3f2=p5
z>7ko2t^6Mr%q`-b=M`d#&L7?<{2dB>2*xc*MMo1`_&e?<tTnCVS9cA^zpry(`pFRN
zaEyh9gC&qCal;q4<VehRJub!L0od=oBWvE<1o~OZ<i*1mSifoz*LCFv7k@Vu_AJN-
zgKg0`;ompdKlTUCGH*iSG7ta6roqk6{orEdA@sWxf`Qq+NKOI=^~Z9h_3I_vw0(ix
zo|-qPBknKxp1trhECQM}@1Xsbmr~<j6TmVip8Ml&1dh8VVnNPBP%+U$BTG;5Tq%>y
zeDVRUmZ*}rKq;n7{RL}_FF}=d70ieh@4z*-<u09@jeZN{$lOn-k%_aP@U1@}``tAh
zJmEC>Sw-+^u?O&v@j|S+^8}vI4^XyVLgMR+xa<Wd(0!B0yL~@^lcIiriFlVs<fupd
z)xa|_L;Veu%Hm+clPP%m+cC7i^Fd04%b@XK4!Wz%;5;(&nN$0527@lMvg9p{Hv0;p
z>yw!2k^{`N+L>+Aeak{~=ag=$vta?<PuR0(SJ}Q9H`o{MEpts&pi0Vn*ufuJtb1{}
zz+cT_dpgfk1vMWQ?eGJph(5TUvHRJ%iXzsbvY5%$yl3s>hYGIwhuCSc3x7sQ>^5vV
zO`iK5W1rW|V<7{!6NiOSC<*gtQL`&pMEWYWI3$YoI&W0EbdR;r_x1&r)T@zXO*z2w
zuViCpX&GDO_KwMQEM&v=9ZSFOe#1Twtj5B3j~SV<l?~ln!&?2WGR44X)>Bl(if97s
z3CLu9yWZfY1J~i{?OxRGn~Y4!sbm^suhX>(@xt|rMAB7rQTThHis<Aqn*OC&m=w`O
zj=GnS&2#J6ZjW@<_f`@c=;i>HZgs*qrRQw%>JMzG_C0nb{wO<?m%@~mZ5CQs1v~b6
zK5HD7O~VFSm1+(iOwIh%1l1fTX0N9te0eCxh1rf2HVv|8Kla25CRWQK<!L!vB(iOK
zI@5sNTZ0PrJ&^k~3<BTlOJ50LP;A-)Ihj+T>v0SC8TCN@s%UA9g(6A$wG9;hUFQ21
z^`O7|57auWPGUDYLD{d<m{K(un)lXl9aAr1{m)?JM{a}}Tkn99v>a3hMR5GT!I0BO
zk+r#;<>ubM36=pHc$40)z?o};aoaPPafS!YKP$MTsmEbi&H>p`*<JBMXo25uSAr9_
zUO<g)ad_<dI}CixNpB84%0GPh57a9a$@i4mD8wnSd%Gj~xuRde{jvZJD=uT;`w3Ft
z<rbX8q{enmfE;<~V#awcng}U5hor?3FL{Rvtys2QLYB?zlG%|pXi~BQZtF|P`Oq)e
zWO@MeAJ;*KWhewsZ2-vyPR5l#h5GhWoRR!xX|9nPIKRsRy>fNPS#kot$o~`_+siQU
z>vLIaw;~S9I1g<hhB$7}XVeTH!fC8kCX-C>Kx^@MoICd_7=L;X%L<Qhb8mitN%Bqj
z;woUsJJGT3GYdRz6xc}L9jL7J6W3Yi@R}FrFm>h+FCUL*t7G24%1P7N>(?u>^3))h
zm~6nbV+M1jZkhOCmOQhJw`W-;O6&#9!xs<K*tWIPSsDJo?WN7KOUD;-!!|pzmLx+Q
zq^QD5b>wBe<Y%xoo+j+Po;lc7%99bDwdm?BNF_cQ+`}jN{Pl(2{M9S{Iln>IdG!<4
zaEZ#Z8|mtdQ+mcf^5_d1yblgL&Ow(_G2ZfjY1ia4oh=%=8SpovqmmoyMf7HDf)`t)
z(gR1&eZUL5Zpf4$U6N)lFkt%2joCH9m<(T_%pNlFp3_zvm^nZb9u-HTF^l9cmAIf+
zAdmlu3|=YNz{4fiA$d+OT;VZ}c&#+Y4ar^*qqDKZue};Oza+r&$TR4S)@*m%R#=_>
zms8a3;T66~$W*o(l5Y*b_fymHXqP<m3Q}YSYd^r-iv~<q*N%F3zu=Qd1$OAACo4`_
z19QKPz#&cvh<RqD>U1pj#3V9@z9+?V?l~w-IU?TS(}@!n=&_AHI;>^+NYt_2$TsCh
zu^{=;Y;oHbwpULMhXilr4HOTtT-&{DS-Bh8S}~B_DiPq)g0-yPLmiIfG|N7G7{Z>W
z?qVKdW^Gv^_TRr3@jANN?9Ke0csuDkcc@gCjM+YfJ$&{CC38|aonO63=yfw3?y{9V
zQJ#R_TgTz&$*Z{Rn-4^<QyQ))5q(PE<Jpw*TG;*59sgK`v7_Tgv5ANCQ2$UIvs~@R
zNn18EFNXsxV#*+#RGYxAG>&1a&7;`ro>*q-a}TTR#k&N)i+AX#H$b@54}36~y|Xib
zb54t3$4@U@5j%*<``M7x8W*zrEl2K1(@E<d36YKoWz+xkWrZ>KQN|^LDfa@3Zd$Oj
zqc36k5<50|&qB6;?Qjfwx&^<!Fl0>+_cN=<$=Lg^4ZD{R3wvshVv_r8X73gUrQ`ZY
z6;40pPRe;QrzROD#Z5*1u_xJ*|CCu*_*tBb$zcD*K$@~J6Oz8ELqJXh6hyZ|M#31F
z)c-nYKHbj6-$@3);4`S-bq=>m#qaN|f&8mGGSG9n2yF-I(6jO`Jav&HiM7G7Or{UM
zk4JMlKK3AqO13o(m4VNuleqA+gq_d&#80d9;sZoCO8ug5u%M|oDV-fFyO-Y=+1Os}
zjIx}_%Jsq0Ew{Kuz0>*9L6c;E@E<mRzQ7F|S^;xzNYF$*mUnTf$7LREywUCl(unu%
zc&`W0_t7aX#aM|o5842pv%28kUI5qgI^ul;PW;pVvf->h;!M?-V6RbuIal<-xceWJ
z8uY~vZ{9*qgM>Ya71_nTg%F&qfk_*mLV3+YzHMoLn6`H*jEg#fjobHQ;JP>*e7!$D
z*^>kQKgL4Zz~d0#ubB4@o(55d3(?gt3}dAL^%1YRY1>buqiPGUdHFZo+wd3n^~!^?
z(YL^)>McZlIu0R!IMCJYL4(|Cp1f2>KBf%+HavrsBd=jf&I74rMyc$hraEzQ{e_a=
zzoo?woY2)mfmrHYfMxV2-&Xh?^v4&YME;{x?}wOw>${3SKLSg74G=q>p}ge39T@Hs
z3S-Ck;?^~h@Qcd@|N3?Oz3q=7d~^i(J{^Mh;xE9Dxq)aHejMdWtg)`YI;lM|1FEu4
zL)+d4czEU+pR?E(dQMkktC$O4`nv{w-yGxJ&;Nj9b&ufc*;HuWx)g4{u!RD@T5!J-
ziESSW`T8@9p#D~a^rnTFZ}+>$xu;y?Iy~|qY<nj@@cN1d+795#4}^E#otUBX3!;{l
zgZ-|<I7~wc)i#Bp@33sH6i0IsC+(6)xg}8AaT&a&C((abDyLt2A2ge<V54g<DE;zE
z*4VNXK5V%T@s*D-c8@BUTtxi+xg6csW^p?0;jp8xGD-RJNVek88(3CX%Fmp34d<$*
zfI`b+OnY+<@9jzCXUshWlRkIiG8J=Px2zY*z0e6Y?uF=jQ-#D<+~QS7JcqT%nxNkQ
z3D`A@_o75860O^6thHn<C@s&$M!Qzr^YA<>e4T@m{rkAMjd#IaV>Oq1U%Xd3NCD@S
zDB`kcDR}g`iOW)kb4L6Ba5}Ss_~zq(VM(4UiMsX(+oo{b9<NL&{gn^yA6}qQ{|DIo
zq=x_UdoRWh{~tx?9S_v|#c_K}NhK5s5sI?Pea=-$3N1ycG>C?@qrMU%BQna0P!W=%
zRK|VIm1HChDU_sADMDJ(`rY6EUS8MB9p^dcbKY+cPO48}HC&ucKjto>s@e7=;Pf4m
zSFxEB>6IgOX^l*Ahb$^AHlY%>wdC)y4RmN_HW^4eLTr2!E411lGDDiv=nLH{>X`AE
zGYW~PZo%hCWr1A9IV>SLwTX1u8^PDvmP-zqD`NQ{HENTyiahidayDwRv|_&u_HC>r
zA&>Hi+j;}qTHs6{l1-%bn;2wf$z!{)yKOq*9<{sph-NvjpaC1M3;)v#bYOE5{rdD6
zIek(TL}uwS4=q%<%AsoOl+^dkf!X4)_H#WEIlh?&#blLdx2z^AUy3<*feT|YQiB+k
z94A4;14Jc6j-1d;CXQo;?8UOZMARsV`t_ZsTX-cB;&z{|m9Y@c13^M24z2Gm6~|q<
zY205CRl4QfRuXM4L#zxsI4zreqR{V2Y^7x3p2Q$M75<m(Q~X2nE{l-e6Ow7P&sMt4
zM}Zy+NFa4JS<J-2&(!l*G$+8+$Q5aMjJO!e+@8};MM}<9*iX30Of!B!RBg|4YvVrA
zf6~9HNya#eKUJyC^$gNCu903|B}MO6o*)m?w-ANgXWY>12Taz)_Z5A!1@3lt3aK>w
zLb}d1a!XTxk}g_F+ULs>$Czqjm#u&@k;k|VZTlHHBT+0pHI76~>St8<wJ`RB!Y=XD
zK&G>FG>0DfBxtQog@pA<+N&EyD(kG7=$oOW%SXu7&E~nPcXh%UL>!ZX<Zz(XglHv(
zG1=y)iQ}k#67i^vS@rxJ8LqlX<b+xG$KJ*C#BPR)%n=nButH|+?q+hM>jas5u$Vsm
zeTP2W0}Nxgi!Pl0liExduBX0}k@R~>WgSPcxKWWUQ2Ymns{g|F89DIs$4pi}ZzOBb
zKZ7k@F;3`-PlNdnCE12QW7*FzgY|WkW2+5Ev!~uGRnB_V2LpFTumvKTbh?<HP-{z8
z(nJw<gH<p2EPsv0^!$WckCCh@W6l;H(qQi-OTx;<Ggw)tPmo*rg;*t6@E^m+us?%-
z!^_h{LTyk?A2cemg%MJ0<UUKb_FX^3&DXWDv-!$ieyq=aT`+}rb<kz|oW@r6Ysm@x
zyD{tvFBNv+dml`EX3aj$x<ztco3Q8K&0?ju%wp$_QDYw@YO$$Cs;u^o@vOU*JeylF
z3qKxs!8@E;$itS={NwQ&?9xS}`3<kb$>ecK{PQtu`RT{U@ROXhY$_LjW0!23&u903
z$Eo-Gq5k#^)>_Pv9op@L!M{27{KJ{->0f{0so+}WQHOP`n#PXP5wQ`~l4czjj$&`L
zFX111IrF2(E<tBkN*$vm*^AklHd!5x%+*|fJ~r$R_$v?d{&ThHcSU0sPdz7<(j&Qu
zIY2aI1on{ADeI@BPm{F~pUGk~o_uapz{~d@5VxhJB;s^E+2A>gnXwn?sZBr>>hwuo
z>m{N!<UvC8QpwP9!3&eT#o8vXtztkUkgDhjyPlZJXghQfRpmx5Bq*Pra*pOKxKgrj
zc?-?3&L(SJCCQGsVruZ{75zI~6i3K4(90Jdk#pq<q;1-38ZpLKc!sahKS9B?^mYXk
zWO;~rGW?Z3>^ev~?n%=vkvhb#^c30BfaKKkRGMDZLxMC4xmLqZq-oqIYO#0}4JsJR
zDBLojADelaa5$Uj+nymo)o&^e4=2%m?Z>#l-2do+MG@z?tCtg5Kb{<(_k+sB9H#Gu
z{Oa471X|8jQ<1ZendQDoRAyKTRdW={uFEn^cV;|!J*AZ16&yFs-}=dunPIejPA>KT
zHOM8rmx4V7ab)e<E^5~JQSc(MM9sLGUK=lqSu+&5n!aW_?^O_8>ZwgiRPWG{<8`>8
zx4)THXJ2!E0TS?hFTnhxT40dd%FKD-0FQQWByBg35Lxp;=y%jYU$1bI@;He+at$Jn
zXStFpSC(j`c%tXmaM(U-H0bRXcCVC;U{F*6msWTJH&+C|7N-fj9wUL5TmzW`^E3ZO
zwsk`IXj-7V4#FBkVNXXdCob?64i_nt%BdkRQ>mJpntFkH4elZ%{Y4?wSzsw$+YD@?
zJL9{yo!-xu1E~mCeB3*R)BR(KPp&>9XJRIT%LKvQ+850&HoeR2nO{wdv<AujrRj|F
zvOId?;yMVhQ-r5}w&jWUh3v=O0<z}E#|r=Ovs@JuPaZz+q33>;Fx_rR74gR%g`JF0
z##_@Ks}@g36^ol>ZI2vQo=fLk?n$BY!K1M2%?WbgLmc_{^)|7%lutS{j)JIg9(EMC
zZ_gG>LXD^gT=jTFd&1X1)>?mfT$e?6cuIqYxHIZ(c{QtKnk}Tv4<jNiGP6sj#bTbv
zelT^&FK_J_MLVny2s^p^q5Wbc-toysrF4NO2sva+*-LCu*^de-p|~~h4VDP`k`>#p
z;pORtsPyg&#*E9sZ5g}qVb5tIf4v6ZC)~x1pI!n(?;YOL7)7m3v(f*{RI<j&K;VXT
z;7OlU;b#&s`JKRoQJ)OSCLeLbseJtJOEjoz#e!Nvp|I8|%5Qj;1$q*pBs=FlTD6y;
z30z0{X|GW_Y$Q9Y`7ub4vl!GH4{T)}>X1*cMd)`vo1BbyCnjJ%JDGL<=8F$al1b35
zFBm#rU<Wr?uw#}c;mnCAao*}Dc%m^HQ|&)s&CQ9hxvvSX{u&3*cio1RfK#|ew+6~1
z4cT4aXF-PP7RY*vpgnT}TX<OouR1-0$7^51Sf8I*{ImqsB(l-7b2PiHOO8zX9FO_8
zPodKV5k4a{0Kb@K;Zr?%HpML+?^*rA)c%un@32rKJv<HM%{OpS8p5Gv=P*cLj(qdG
z2)l|a@MOC@ThiRX{Rj&}$7f$Es+NAD{~1W2{FWhl%eIqPNPi$k_s&oQ&nc7}dxi51
zpG^vzMXU{`KcRljwxn3t9bG81!dm?BK`uP#Fd6<C$C+s=(GaCra@jkX@o`Qes^fN%
zAG#fcS|^acrLrKo$HDs0k{6`SE`SdCrP2<eraLD2(0W5WB`0<Wu0P#O+95HPxVd)_
zR2!y2{vE=e#wMzhe2T7DOQoBKW;54y>X}4QJ<_c<f!?1YMeY?D5UJ|l%-E5i$YE7E
z*r|Mo1}#kCTy(w?kK8LXx<LxA?v}&$QIF{F3s>nw`jJjFcui|<^vNpUGICVyIt^@_
zO%A8DQuE?t)*PWk4+zy%Fe7nEmxz34H!WM9PXk?!(N}Y7E3(%0FnQ%-AQ3c?xY!*l
ze>WgaQ+I_hYjXDqGnIw(;=vxqwCEgBAJ!B6v_5q0y-UPiU?KTR@2AxRtEh?g6Y|pT
z5A$H!OVX+IfeA9ZO`V1F+(fX$4VuR*7T8A+n@U$}3(qEEBX*ot%1Oh3*9n59LN;3I
zmyo3hBwMV;Qdlg4k!yusMBp9zWUY|L?(ZWu?aRo+ofV9h%TGo_(Us=CF(<k^6cEQe
zB}Oa86RQGo*#7e(6;Y72zWU!CS~OOXm@N^wy)Gpr;)>wpOA+c}!x>~PI+O1QGwH)0
zcNyO^dbIWTHAYL@j7tj3BpbX_tb?=-xbz@xQZVg2jXLn2&K)C%KZ3$&v$nt$mrJEn
zmmi|7+xp3+wqDYe`hvXd{6d%WPw8wA1r)n11uMG4N#68h)THSrQF-}?R80$}Sx?RB
zcC%<|vhfa$sGUN${CdfFj;rJbq(q_n=nY0>#1$^?dnMCZ*hVXT4sp$f;zCVf#pyj8
zM`t^Q(u|90^kQ%y%?n6p?i$vTpdX)@4_)u*1<g}r=$<^)TDh0pJsV2?zLP*B;Vjv@
zJdR8G9!v(NNHUpo<+0LqigmT}KicW?iP69OjT_0|p;>iPxIv>}QW+yb|EMLPl*J8v
zwIK`l#~#L)S(ccq9E116FQV~{1DH50cvG8FFn6pz)^9$EDN-kK(Op?|@l`|ZQ?+RB
zn}N^m!|2DEQW&-V1bp5)8V^jaqDj3@G|fE}TcVC*<`Nk!l|7D%b-nbxFq;^>n1VZ#
z6|v~Fv+&-yhFO^w=uue+_19u)jJ&|^ES-Xt|9F&VD6T#-Om79|)4Tg`pqB8R;S|<k
z+4&x@w7Q99ukT>`Ne<oX&%*dOzWCg+hQ|7p;y7(dR8*2-U)?o8n>SJTd~6hEqzB{I
z_#FIKGMZKUJ%jygS^{@OszF%K#c7f@7^))7d6+X+-WM)YU71O+F5oO}*3$%Xb1@wH
zz6hi%ywKzINqn+57?l$52s_=yc;e|rJe1>tgXs?V?S~dly_$?66OUqQkUqYzsls4-
z3?ze9(ErS7yp~xF?G~dk?msJR+}}*=hgY#`qs?(uW&w6Bm8C72=dtywEEvR;&_UTJ
z6*hZE!F<?Ap9h)2D>WbMnx~sd%9f+tvBoE)SmiQ3=cNV1LeF2pP@3Mc{KRZJE`uuz
zjNxEr8TU=xi%|}YV747mBySgsgNSx288bKsXE)_C36n0<MYF4@VQm2MzbAu1QWMES
z%NxQo-$Lf^+J(<Xtf!&HHAH3Q2kWd!V<<GIkq6eT)_XfG;8*Bcnln8U&kp|}4~$k)
z<z8`2nY5jL)|-m{WwlK7<^`1dmP;?sW5Drk2E8hBj%vLY;bs-Y(l@4JOxm;6RB=Zk
zbN`t)xAVV1dSS&i?(l+P&e^J^;(Ayy{b3woZSc#4DdI+;tcyHo7HtQQiv6JEu#=Rg
zoZ*7wL}-QFO59{exlucdNp$OIdT)9nb+%ne(z}EnNOKf9V_U*(EH>n1Q-X=J;9z*=
zD8meGUB!tN3$;wH0jIHgG?S(w3*~A*$=C0vn2bal93Yy^y7O1KiE81bcau9FGuNhr
zlOky31`)_qoq&&*+hg2-1?qo4O_xu0!)X->l*`#jJH+JinUy%<#(Gng(V{ro<qUV2
z8Kzcy2@P=j$gGl|fZ>xZanYDe@=Vj7s=JtzZ`;PuyVC7sNt^;admx61wSm+=F@-Ms
z@I`RI9->i|zE*`j&&rp^UMHBo2sGRr(D}!liX!JWQe-@Zi?ytr^<K1ze(-(F*hO!n
z@O>oJat!6Xv?6HQqs`FtXR)=xk9_9lx3&0dtu$Wj>7mov3hr;45^)p0Sp{29(JOPC
zxGzz2DD6_m-U=h@qQ0l}-QEl)wOX5Y_*+qpVJCW^+Ksc$3L|D4%jv!k(@Bia0AU7F
zNWqc+XA)(shxL@eM*S?a_ls0{yk-p1QdYxAx*2aio=Ieuy(Nn`jt7mz4(@5}TdK2Y
z35NDGGtZJHk)*d8bfj?`<9lE###X3Nr2#QWHb^CGphiVuiVJq`TSh#Uc2W1b6}0Ka
zdgk@ixpYuMicXJ;qI#98Bzw#w@cUE<H*>wgWPcBnqMi#Ui4%-j?g`?#2@qzo9E&bJ
z0`W~*pcYU9w?=iqjQXo!W#Nx0Yh$6<H5N4ckI}Ebb-=it!r-i3aEePKty2>4^Zb|a
zVfh|->G}X7B?}?1d<>YEEC3Q444Na32;4YBn$5(3{Ox4;dF}x&wNT*dk95Godxbzp
zdV}nv`B0v)9VfkU6IiUBAQrZTF}>FTKkht%f18A!vgB6yWm^yRd#=#n(}&^UJmH)2
z^D-O}7!jV0vD}_B!gC{g7p}UUgk1SuprZH~#9}6pf7)GWxU&g0&+oz{*9K6SJ`)ef
zJ5o!>9fJF`7L@DvW3*%~h_s!<hS1&ARj~@^gr0>Zqffvrxq6Ve?G8<mhPZhDYS_8s
zEleC^1MOGuK)qcK3?66^GS%-PIWZX|6?fz4W;v+P9Knn3|A}9&w!_rhDO5qXfLPCL
z#F7nnK&y|^6Z4*v-pmDHc60*Kk2=8h)u$0#(*iowlFoV63A5XpT(Z<(@E!+0;WPx7
zaLS8#VxoJJiQDhV9q<n!atCDT(o^$={NGKw@ly@$oG^mZld7SmSIZcqzW@7frL0>=
zRx{nh=ZX2w8hSwK7G3!2A3eD86P3x!CGUm>*Rkr)vLN%a3aznQiB0oHMnZcm(VBbI
zTBBTs?BDT&2F<XoXkPnH$h01$i`(RI<YR&1EW%Ok8Kp$^Lmf%q6UvqJ{w1nXJE_0Y
zd!jKpib!e6f!U@-MCDQ%@f5xxiz4rl-)qkik@?O<?|KuJ5WEVzf@d=kp`xIh@rxc<
zQbIQ@MrxEAPvuk<z&7b5dGqO{@U36KRHqD(;Pgk-YGWWV3j5A|U3`EJ*9Z)j@&ao2
zJfDm>-bPX<$5ELl?ey!?f3!LL4>_<kmpEn^(sa*v<YQhP)taTn?bA3#7eBv1N{@VF
zUXK@evom*-8*aB~o|6u#$=pXTSzjhg1)ugnsWej;`<RxV)r5ZO4PchF2ew413vLNf
z(BtbMf+>ZOThs)usv?cdz6c^qb3lK>NZ6q70WUr;fMvRsxOiDCSl?a*@18``f1P&F
z|8Whjyrl~>YBTA-yW(g#DjmM$tO3R%7lMx&fX4G+bU9lBQ#`alI&V8&AD@N={5Ysv
z{Es|bcnf#E?q>?;@{r>^3TBpBf~$g);HbMsWnZb%M?QW~t!0Mo>h@4*Z!OFfj6lk9
zH~f1&1KMqOp#Qo^SmAVsTPsos8BNi!%~+epn_U+eXsJM*H2`yYc$snr?q*2hD-Ri}
zDa=KT-ld`<Hyz$Ck4Ms=O7D6t#F_=C@$K~U7#lJMX2_>gg&$&6I(IgPI2;8n)0?1V
zzZT54J|H{gEb-FHbs)U#A!FAa0L@gWSc7oy?QW*+BEpM<6`=Hf3jKNMCY?F>j*DAc
z%UM2~4yj7{B+F(Qvplq$erT70?3;jzCq=RCdnlw6RU$H^MgGY|(ToQrq&0FA*(WKS
z<G&d)zmj9=*SL#Z)VI%c-y#(DF=}bF+DTGAaSUx;BRD~nr;{$v3}NRYk+iB+Qdfft
zYJW%q{`7pLO24G=_ZTy>@~s4(I_pHrM~k4%x;E?o_cBYrc#(8Pp?9CNj}tM7=Dczq
zlI8`1e|mHbUH-6|Ox&YGyC&w*(A1M;?*3%b*dc;(j#^B~X`YCU8BZ-PW{~J&6GDD<
zQNstK=r!&&ox1unEnR+(QS+073<Xg-kmW#sNXX)<#ap;z=Ua$Aok!wqPjRI$EXapt
zAL$9VW>Piyh-gjiU|jpdX@a3J^NooW=BFbWx1El3=^|AwagG9(#6IVA4R6w+DLc95
zPwhmt?=|ygLoglrBcI&eD+zmq9TgR;G-@)+fs0y|EaZ19s7OI4Wv-agX`5dWnMKpc
zwCf@C;Rz}5vHwK`j1A`#A%Y@*IJ&D*mm{@7w5V@9!(<r|TSGbWZ|fd5|E(oIP^QNJ
zT`b41nthyoJ*>p%@KgDxBD(y4f}>}%;LI6Xr^rj|X!2XYkiY7!&sXm==G_hERR;1h
zyzY`8sNI>(uiw^z4$nvMt7{GTWxLIZvaKOr>7UN;-mlCL{~XQRiTx9tIGSv#tscKA
zX%erl%Ch@kMX(L!5`2f-c)se|9Ja_`mQjmV;^9;mhX2y%YgSF+WenExks=EGjn~uo
zAFfka|JZNBxwoG${;R`hH0kntbNle}DM@xk<5*r_*b^RYHk!9MBgvPoT7X(g68v1$
z<uBHa;@?Y}^7937^zX7stY)WWW%?HtmL8eTR<@e)%PLdoz|~M*WQj%Pk%f``gN<X@
zmRrl=Z{Y#{&oWD1LCT)Z-=@H~u2kW7m8tWi6knk0E}nm`B*zDxmf{=uv3$XYiM*Yw
z0lz<p6`V)E@!%#Ue!|@S?Bxq_f@k&s$do_eW9G^6KOP*Y<a%F`0$-8J3jx#kpWj3(
zvu^w){xK>%V_rzqMW><dEf+d3(iA=0Mfh<RdKl0iiE{56>5D9Je61Y}d-DA;tlN`v
ztw(W(wg)vjwuQPFHKEyrKH4--AJ2!ikaA@cy8C`NL^mklIrFnLzUBdJe|7}5KMH(%
z!+EGb!3;-zT>#%Utf!h&_EYQAL2O0Q0w_9nhqL>z3#aY>NyaLTqbm<8pil5_Z2Yno
zRYZ5<oS9Bom7&Mm%;D&X>y)Sq9EoqqiP)K5LC;(5!S;#8T$7I`xP_>rzvWWmr7wyR
z#<f(bvyFLLrhzSbCKxt!0C!>_E;zIbpJ>Xm$K$ox{h}$tKIc@Rt8Y*fCYpU(T8c?i
zp5mUz3@fEY$)HgxnYOb7i(`a5o3=gt8FQYSS8<8D=#<ebt0uEta5oP7`(ay^HJ$%9
z1jjVXp#6+m`gKk}*fzwXy22DZw`L}LEa@`Jwlu>)xg>kDFNlkgyMR*SU+Bofb?mWK
zI;ec%iM5tQr7%N##_8-l%HErEAI1fJ0wzgtK7O=fbGEL4b5_fs=EzN0zPSzPuq!*e
zG6yaWpM+y$o`6nI2Fy;r59=J<`G%gCVDV)ojO`=r4$D07+%Im!skg#jpS1uHQCz#v
zLTCz!gLU=7{^f*d@UkDlcQ-GBl*SflpAbfk>$Au)?Ns=g+X;4Qv6xccNUT=fgCzU=
zu%3Gig;uWxE}}LoQh1*2Hhc%;K2V$>)F`)>yhB=X6(SdG2b-ITFeL57M*MpVB2)b<
z6b8>hzRh09Ptl>tKjUG=y)-CQ>V}`)F))=00X;iA-uU5fR_cmyd(CLWDm@2iUbmvs
z)U^Yf6W7DJdOKdsX$8)ie;+@6ZiPvXQ`qCd%W$3hLKuk3f#rYJ!A=*JZE$c06WL;z
zKT%*zSYLt(weLY@v=5w!Udva-hQq7R<?w3CZjg*U%s#eIWB2^f#Yg7$aAapazMFW6
z=xUd+C4spR{bMTIyLu*Fe7Xq^Da)}Zj?AF<+(WR>+W?P^{lok%8K&39?hxwMlQiS)
zUThZ`#aHB&&}Y&kFtBA0*ZX)UwlTstPV*IAcws#nOb)~&Rg&=j=SSMrVNTU;M^Src
z2NGB}j=VlM9lso&g0e+DwD`+ksx+(uWAwXe{P)jPMd}o~*lvYMDo3bKT|CZD%O@%2
zCS+N=87kdAhAN%Iv_k1CEwuiFY~5Ul?p%N!WfQ@Ddk{uOOonHlw2|2!f{rhCq06Kj
zILUt_N^TItkBl-t+GT`?-<(73>;)*QD1jl{Tj=EILYj5>3(fd;kUJb{gR>THLefz}
z&V`HNzYG~-nUscKJQ_jl^B@i_Y$6ZtF2?li34C|BC5|ukhGffaICAH4wAi^5?UqgB
z2PfTw{3Z{4*%OA*o`jP;n?&y?BWE3b885nr;nxensA_(nzS?KV`YEYlZb~p>!EtmM
zIL6z^thXLKJ&i9iHo+4b0RHb!F}oYrQJQwVd``)Hw0|~0w-pO)lAGU|4Vzcc(W|%M
znU5;O{Av{4|8FB0)UTtXE|^mX*<5P!^*x<rB0}FfWzfy`*J#m|iR4|xb)vsO5yd~g
z;^s{opuKZ!$d4^2Q2om$lqXU2((WN@cxM@Ux?d1#vUTYGXd7-GswYir=F^h}W~h5t
z5?!)KK+~DO^!}wP`mECyV}#ukm>R~Z>8}@dVvUIEkppxcIKs?$MV$Uw6b7>2S{JC!
z#NW;4=#eoWly2M=m`1I1gQYL^UG9nNW`2dZ{!O^Rb1hCE7=<;IqgQmf3O_R~&}sD~
zf3C#CSg+oSqpJ;wc1{k>aJmh$_muFT;}$qlF&?so{YVcxNl+2$xq{yxxcI^h8X8l<
zEf%;PlOOp(ZG$FsZi}R2i%l{5*<ZTj`w#2du?3vImIXvPxiBuJ)l{z}hWxiu5+ls>
zAvk|NX`Zl!`o%7RO^ShZUBDtR_-TyuuXNJEnhY{C;3-{Ye1_3#C?k1ZvP8LPGHu<o
zmPovPM%I4fi2tT^=HcErZdZo9unR3t?Zyt%r|L4)=67*LM8r)-Av21oR`oHyqmVXz
z1sa;tPk(RmBXS=HsaBQ1?sj-VZv4GZx&sf=>ZMDm&9h?b^d;g@^kJCk+<(=2!@?x8
zsa_8K6TCT-f$<!(<qlQW5Ikhh{kYaShQ$8Vd?IM*Nw$a?@pOuz*-`7s)1Ee(<?YFw
z4#}lm-Rfj*$}cWJQW5-rOOOH6^IVEk4vG4+iWZr@C3|{rk>`Wrn7(Qb897M|Z6r-N
zaq^574?m*0m13B8zm>6Th@-6zf=8etj@VECMJ*rwqxOz#NJ{ZLqHH7!wl@w_x1K9x
z!<G@;(!L?aXTb}StrSYc8ZQag5<*rqmkJq-NlaIVI0iW!Esslcq8UdjsfwKi8E_pT
z_~*{gE)p^oK4r@Z5iOyPyG3BBpBq!O-kkd|ErMn@-=iw)Z*%TKAJON-A@W`~owN@Z
zGQ-OjmM5Fbk+CAH=#JhjdZ<&f;+?B3otZulHD-&Gs0Fh~k4p_B=B9|obEYEu=?o1x
zTSli{vBwK_HRT6BJf=65esNLlwR92nCqaV_74Ey2!mVrhoY{wSoU67gDoh)uV)7S=
z%(_T=f4nF4&X`BjWHjkFbxSVej2%j6+d$CuvI^Z9FKJJ^H>2UcfzD76$Lc9zoYcfS
zBr|gsoef!}#a-~C9S<a@_YIbPSo)RjP1?i!nj1<La+I*?t_tlPwTv40ZK3;quOXu&
zVyQv#8sc6zowR*6qu(wFtgP%eByi(#qS}1hx|;82=G|>&YAbdM`GVinG2s>Ij*|o>
zqeWmGDvevl^pHCH$MpACS@?I^6ptSiLG}6LQ0>Gp-F0*xcXx>!{bsIAHRackH|{6s
zmyHBhKFa5^!&W2P-(YR>R+E&3yOypTzDR?V|1k%*3S7<vG45i<C93^E749oL(~tx4
zBxzv~`6%?z#1}>KKi8ST&JUBw!hIJ=k9j$3Cm{#b^^>UH!ZfZc-x1`Nk7Em*BdA!Q
zFLXbeS#izG4fNknhW2~oDle~0C&$)kL-)i2^7i5^E`72&dw--mQxoifI`-T7+3Q!9
zKV>ao!(vLb556WT`%d#u<T|*ts`2pRZwrl-dxD>rM3c!@V?cBN3*zo_l5BNQWQv74
z%2~3Gxtk&fZ{F``#l6dU)dNAW@RbqFO*MqGm1~Il&3&+Tga#bzk_C|+zj(`EZ<tfx
zFLSGot$`oQSAgEqIMziijkr#l$5s1FTW`Fi4K*ftOrXL8!d{hOJ3ilrF%~`$bF_ui
zoMFcQS$v3fyLO0|es&2qrrji!w|2AB226R+N*CgM-5fZ<b6Y#b1xBt_g4f2Pu=eLU
zxR!4NzaL#EWp5o}F=qs?cLu?Cm$iJRc?6jtbCP`Ay`H_}p}`jJ_GFviH<9nLJtQyw
z7jIKu&$x{cSh<}+Op!(`9~4(dlKo;y@P03%cm4~baAP`AYh5@?^jqz$lAve8J2;B^
zc;2VJ;&#M;d^iS$Pk>q0s*tnwD47slKnI_uPzfs~Hu78}xh?I*$jt5Me~N^YuOTJ)
zPfUWbxvWN>*VKah=Tw^Sm_|NW$$@R6I{j5?D=<)BQS;tVYt~zgz4&fAZjMRh&U6{W
zhBqZd)~bP|%n=3Nw2_Y4m_^6lm`*!e1ZKCwI==gx@IDGN0(tc@V4qpWzb+3ZQhV#E
z#u;-ed-@?CKY0Sv6_w33s4ukse%_DTmzwccPsfm5JLI_=Zu>YXZ7H(3Pnb1~5rVP_
zL3}*@kJN_R%+3r_gHFd-T%{X?rRt{e&({@eOtXlEiU)6F@QA-Et4F59U*nEfOK{#E
z8RSQ@4AuYd1%!<fP!`S?=-$?|<iW0bQnPzA_crk&$*xa8uQ!*-i+ct1ZIm1u&5Y+e
zj7}iidD+_f$aC^B;3DFYB2q0CinB*9u+Y-WL%qEBbjcGjlB;LVPH2vS+iVpaUVQ{!
zZIfYFtZ4;XjV9ogZ-K_Yr(l*b3#N=}gERBq!P5OnaMtP}NZiR6xOF##JZU(5Ig<gC
zS1e*rT)hp?!?M^V?genEUy7?wJI*~maUWuYI@Q9d4g7XCK+uUlaLC>pTn<J<{nQ2_
zcix8DnioLoTPe(JZJ<SCl*z8fM(F*t58Q6|LY03891B_i>#MuLwEP|nd9K7cX5PRQ
zy6}(1P61xaf-Tz3khH7~_DWq5cofrUNY)17KFEX;=Tc~X{|QQDGvNBOB1ktp4}OlH
z!A~?4KNfVr8JjamU+qAhuPLzTRtTNBWErlwVZxtUlZ+m}wxN|oRe5ei0;t)%gMIN$
z^zo&8@L%l*u(YfO<@`kEadJEx7I*`0$zO)U<txFf{0byDo`tVv6`<;K5&kTU1M!TB
z=o@d$hhI3vPH$6U9b?iV<-`{Vic=;pGhRSV?rnG!nFDo!a%d&|-PEgt9G&Y8qxGgR
zO>rV{O7{yW=JMRyF{+Gc>@;FA<~aE`Ck%cz){~>!*NLmG5=q&;5nj6~RD^6(X6wCn
zkjCGIWcrhSY!c>lMe^n7XxBw_4xXm70|-{VPUMQ7Zy>Ap%oaG8V_^8zW}J0?H+j^)
z5Jr|q^L?%fuqEg?NtV{8E8O#`w%#);`n!UJJzWPHi;PHh-U2vRlg5XKMA0JWg`B;w
zHM4Kv6p0XD2IFLB!dH<Muy<-cN&Msup^^fZRH2o=&e=zn*R^u{U^d@$@GFtd7qS?i
zZOG(<f4H*P0&;883F<R3jaZXU#Ba!hNtzi-)^VvA?k~Zf&G(02hZJ}V31yr$<~<5>
zPn_~}JEm@lCr2;lkvE5(q3P*92s<Om6&@G*%H?~xs*Uncp{fJ@!Sjgx_Z5)846(E6
zEjQEC66UVk%)18(J|J=i!?Ws9W5z>Lt#B2_+c(n%>+hn(fgP~;NFcQB6~*~=3D)_M
zi_zF66x2Pg!-S#j;H|!vZ|<xl)#trnZAA|$o0<pn54-XkW?I8x@dSub$pF*mE1@ad
z4N{LLV5Z+O*yqi|*8}p{_Uaf+@th7_MS6leMOnxk?12;*1Fe7aNVW1LF#4nl<<1w-
zd3-+1_ppFlp~s=l@I5%!g@Nq&P?+FLsnPx0WTD`fYxqgvlw=5G#Hz!MY4<>^rWssE
zZ3oe<+R!^v7sM~Wfj|Q}SR=k1@^+WPQ}wNI+5ZPo?%qzHeNcs`X4@gn$CzKaP!;x+
zKPKlwmcX*UL-3=?6Xt2^!lK^KFzV9-xE51SZ@v{gHtTe8M7SeN`sNRGYZJ<){N#*3
zN1^4U-FWtiBh+^traK<~By|`2iK;PynmkFi@=Q2{MxTIt-Z$Ywxid8U$b#433t{r_
z+2qM*12Ehk25Fvd81b(k5?ZBE`%M_17<mI$TiLTGg3IV*@97xTd<DLB1@QCTOX#O}
z!g~g8!KHiV5My_XSey-oIJsHWH}oHgb36bY-{(VCfC9-=PQdvyV+B~}Hb~lf0wxO#
zj0Uxj<U938wWw{d^tm!Ts`KEjx{krm#owUZ?J_AJcEi210x-_Ll$qZ$f$<agHyZKZ
z$bs6A@Y&@Fu^h-D%T^D=@2{a4a3zy`^bl(KFYjsb4RQQrXaR$RO5iv$mK@nPKtd~>
z0BzUc=i1%yE?OSbq!QtUwj94E#}U-#r;<9kHJ~r-)x_J6gO=}|G<u~B=+}9I>r7wk
z49*SMCC0F<ES@-_GAN9n3i9I*qRY%%VCnRpF+5OCKgzd~wA7o-Qlr_Z1<qWL^m_dF
z^cXGf4FUJGy?ELuA4jg(LhF`|CU19KCo8rOF;jY^@$vIKkSfz61Mk{Mo<{<RUR(w5
z1P;)WCN*}W*f{VPvdDQKL|K&_2NcAsFhyh@@6~&ne7A^Z9E?8F#rI<{u6w88*M3I2
z6lCF6^KpXRX}I<GSP-3?MGk-bORgc|SEvMm&ewk722Ek6-m-;1bHZ2?;rumY<XpH`
zaTultIFr}|!`9FGu9HC14KP{E2R3}jWG89QVQfns*h6<yi2D%<D&y7<Qye|u<+w-?
zZCXJ-hS-DG=c&B&JWuF#{Y2(&d_!h?$78I{SQzExBCxjVNzv~<Zj@XIyizg%@y3-f
zt0n;WEz79ZyjXVm>+japANr}{kR8<DD<c1#bzth7gHUX~7IMlGuriWBuhuG3;IJQl
zdrQDd(PU!v*#}NPea!3{a01Om(_!^BMUXuxkH>Z@uvUW8OLtQ$J=2m}v3TS$VfRyy
zUw%CU#E+}9|EV?7<lwV>x3Mm(8(4~ifo0??Zw!sbL11vcmsEax0#^j*`L<6Q;4{|}
zF2)!^c&ZN(&ueAUX+E4;7XqmxBjNNw9!A_YBi5lZ?DrFPjA^UDy-s+6DWCRP5B2UM
z-cEZVYQH}}(m0UOpP~YX`aG#>R_JUQLw#C#Sc6(ux8bWnEk;?W33D`Dp<2C>+v)q0
z7#bgE4$n;^*URn_>N~1@QQ3HA^7uEn(RdO_uWKivGe)vw#kEPJz~xOHlgK@_evSTX
z^0|Ot(L`nUTavl!MupvcYna|_iPu-zQddh8Zb6_oX;!~MHpN)N_Y5nT`soR$5<fu7
z?+VOT<z^DJr+|}@Jwy`5KSG1(H2zzyD3~}WGnf0!!0VI&%(%3fjMz03W?yxt`-3y6
z_+SW$H_E5;wEJeaP8bJeJ+I*Lj%iG6=PEAZ^AxbT<<7;FO_|M}dQIlP&&HNa!41`)
zMDka@CN1rvU`O6i-Sry$JDbZ?ag+$?zlx>r-A_{awi=WOdQ7e+ogjZaeQ1DQGO4*b
z2^;1;M%$D#L}Hy0_gtrt_z8)z8_8?o@=Xy|xpNI;dSE<_&rZeKg=1k}_zik3Uya#j
ze1o$th$1o%qp7h)BG{VoOhNTVV)Z+W>gH%d)XEKP?!BWB7*GYSgCS7j|A@nUEr|1~
zg!1qf(AgIYFGsPotmY;tnAd=hY!cjDbr%#%g5axP9ux?<jtMa(P+@<BFH)Qh>c7r{
z{>8PBdsCcNW*hOPKdysQ+;-T!fxwG~XuzX$*$3yJf|7|fl!@NNCJ{-J*qRAxn|4CF
zpATw9U+0`o-Gmf@k>#}nz`dsqjKWk{H@ElTFu;Ikeg?k0eH&75A7hH!Bfu++gU-F~
z;4JX14yCS#>Kp&aMZwK6XKo5ap$#8wqy^(5kHXujwIFA63<MxMs45G6oH7OUJHujR
zLj#s9vxU*lgLLUFd*b_|3)@W#vDM)`4jnrS^F>wI<$tF`i|=`yW5a>u?F1N7(}uZI
z8hIt%<?PJ;Cm?`^gL$eOm|a*8O82AT{Q6M#uxB2K=9z+m=WnQ*R|rKDkAkgZIRE;0
zI4s{ML$X@jm`k&s@C|o7;Pke+P`B|2&A9+@Wc(stRnZk*up_|f%Mx<6kma9?zF_+H
z=~H<pNyZ}n7TLdj6$Tdg5={$2#70a7)wyRY*0T%f`>+9~(aH!eh<xVS!k@EdmK|i`
z_IUUzW(Uv5|1DpZkODdT^NFRKD1G$j74f;T0wSi%5cR+6U_E03#KbMf#Qt;ma)%vE
zNxMq%PzQCsSW1;7<4Ebak0h=4h4r#l5zfEUoBcLe#;eKekTW9ZIpqhlpnKIt#^v99
zV8m3(nVuHn42Sv1N9(D6Sr<3C#ReW$-e!)@HRoR~mm+y{oM2$vE5>MZDmnPufgb)=
zMRKm5C8Jjfee-nl3eQ7}Dtw)G;_iHNenoi^pEg>IU1@l_!X+;RDqg;W-rY)2b>|eb
z5|`6?GS;9~ziM{Jh{*DZIuAgkFp-2Rt`K?-dl{p}BZ#$E3pw}jC(IpVK;BMpp&>DO
z_-s=wEb^O49GelR1hQo1t9;fW{v_#L^dH7OizFojBdLwIJ~_Pa2bo#)7)-;LP_BD`
zSij>5^Ccb(j8*W$s4tB7vJu>=a#J#Ivkr}ny~a764Wi2v-;m^ZCHiRDN&3jfo!`3k
z2}zUNL<0lv@-trf(2D`nnG5<KXt}>Q{*V`8Q(G!47LL12!o7DechtLy&rC6V;UZ03
zHYreVsYLYuX36fqsm;9FsUz&=ClZD6?sU4RE_rEmpT_qG5r<P+)YAM5ec74=bCVx1
zVrhM7Fk=gellhO&P54o!C3r&{YDKs`tz-G28-oIus+`L67rDvL8yTz0<K$j~K0TvR
zPS!d)kxsoh=AYI_`u2(ipZ7NvpLpNIF5N-uQa_Vc_7tLxWh3@J@M7yXZzGOnl4M~0
z2-Z4$3V%o{3*FYw1a*3bzBlf!cxv2C#_9XvFVk%Dy1a`pCBKMe;TLi!Vvt_ZK2TxV
zRZ2749+9SxLbf1D84v9&!bh7X&GLNy0&X1=SP3a!yp|tt{ae^Kp7DmKE4=jhtC^xO
zZ$cx{-|G!;1|HE`^EPTcGnI;d8s=@<Ur?#0YDV#JKV^O_C0$M5(dSwkvAB4pLVFt}
zr*wvCa^N{8e0MP~xqAnd_b8@DXRgxkeJANorzXyA@fA92WFD=3kjD9pSVWRElDN0`
zo2gdodoF&{AO2TBA6>F)C0E|EgVMn&{5~RxzEx2sZ64at_g54iSf<mIv$vU_Im@Yp
zsTZm1468H^tLA<#zAEhf3H<2HGUk`fIoNjl8p-(nkC`23$CRnQX7qECN!(T`ruLx}
zWAtAkag1029V?Ldnw?~Nq=y;Q)xi8gebRHn0sN1?Lz#^ta5+$)*_!H3%baXje%p7P
zq}srTgChItk^^ZNf0s8*e1Nkp5A#P}DuH;JG2=C98OJZWL%m!g;B256zkKXOZr`MO
z;<-T%R||8umqQo1@NWWVyKfQw)io1`b}wSp(!+2z*Nk685Uv~wp_}^N;NHxUbR~0y
zt*9G?*Cvl-E92xV&iylF-c)&@aqlqkuqr36b0-l~H907ob&YzQSAgy73u&h7ddBvc
z7UbmyaW%o;$Y8);V(EHTsQXUPvIU)x{r3``H#MJLnRbOH2UySxdS6k-(2x4%dGJrJ
z1;W_J;?Vt6iwiuxpT^z!BJ8V$;^T4$BCBCQ2NJR{Vy7aEx*o(SMKsX0+jx>$(@r~+
zC)3<Jd1SUkA?N?`A&s17g0j^of#5AJ`PeMzQXdJXH4)H0)IpjuH<7=qCsQ-K?cf``
zoXG6F#MEw1CX#WH-0E{}z^99Y5!paPb~lqnyflp5G#>h07!v){hj!SUCD|3yu<EWc
z6Lak*#mbwIp{fWovW}AWzek}#Q8*{N=Yjchp^h(=ArSC~J9B#h?eTfU+4nm@PLLG8
z4b<S{MKxIVppVRO9}j~b_o?w36-F>55;wt9|1#1G#zq%$<6G^?igVJmVzUy=T`-oP
zbN(~AVkYEDUW5>{-ixqiV<fFhqs%v5d%kR0G5P#Tm3*C@MRsl!V;8QrgPRRci0_tT
zkd<)?B&C2kA}@I1Yhr*qpAHwo{lT~|9fX89Jil<C)VO-VeIF?{aqDiPQgaOMz3wOe
z@_E=L^oe>}iiq}$I8YKin6`~Eko7wU4w4?S<X${vyIr7*_WXpR>F<a~^dKo(*GN|h
zoP+Y3K&TlM=4|`_5c4aGA>djWY*tYrX$NYEdAl<CCY-zna{rOrmbzrCbQ*Ys19&XG
zjB~o@!ljYwB>bQ<#73Qgy=)XUy_^AG(<Z{ME9Srq+k)QH1hA8S1R+P~fk{;jD86qX
zbA;z5DokL*6&Jw3v;Yz!ejJvaFCg9Pw&VBcJJ9tr3of-~6K9d5P<>oRxL<`rL&AVv
zJSG!o-VTGl5P{)PkxTaWEQ0md+R2fsM${R{6U&d|!9RE}iP<<06Zsh=PEMcI%bX$P
zzIFMxBhQe_Memu_cPD_!=rY0KDUXJp=V9oz9-iAiMCW8Zq^t5=(e&IKpshMs`q_(q
z@p(ZPo)1OMUz_>sNy#WZWdvS5tAHZkrlHQ9cyw3I2gL`fbfb|xF3geTb1XOE&&R*9
z?zA%=n=G(smS~amRnjOfeiGl)Se)hkkgC5H+(a2CaFntm_OG7G&hyh`mDsnmV}BCL
z1<e7gXNR~O#%<KGt%QEzHlw#NJ5P}fz=?MZdCU-4=X)dIKmYM)tTYHo(#qI8Z8A*}
zdi7b{W3qH80=*<l$;~cn`tyqyuDH64_s?zRvV$sw+9gcLByU7p;!MwdJPn;va(o8+
z1UA^ogJHY_?)-BT9;He0?;jt<`0J)@_OWts&wNLczFXmw@+>T#oCy7kwP|g72;S<p
zqkbxKm?D!+9;`ZqUOlE*=PgcEzK7w`71}sP?=x&)a}wWPiNU6`NWN|y0YNpFap<-L
zzjfRQ%J<*r50)De!<W4ve#ITvF&?lo=s0!SlgH`%w&JR+^B|xHi1E=GF!TDf3S}-C
z3@3ddzC~xqlY$_yG@C*un|vep2Q$F!R{#m>9}7NmN#I<cjQ({(->%0%U{fvRdqTtD
z;gws|d%zbev*zG}a7|YIs~Qw{3Y_caIB>0s2C2emK5ADE$c^=YHl2z539o}}<2)O(
zWUM5}eI1M02AbrcMi?|ZNJHiWfH{|sgNf!G5L5C6%dfA<ni<v9@oPE+n9X48a$XBw
zFCCCmi-yT+bBR%@5~%JKf%@+IMAST!jGJv!Iconx=$st`H%GH@J8cwnsyc(?oU^!p
zgasRXX9;WSaRK}8M8M?IBxcL^`-Hdl!^ag<*>i{V@kH-AbodfRBp>&3t2MXLKMKik
zYhWk%cV8u6CRp<76D3&}>AjG=G*{s4?jQrv1;lpO7ARK8g$bil$e*smu*P-3+Gx4~
zZ~NjbRX_cc*S0l)sXsPgwYWZ=@_9Q(+;xF5PSLPwzc!6~dlmvNAE1iyE!e7BfR#I+
z;PxYhIDPmXde&XV`%_P%toUhsM8>kd7u!&k?MAWlf6!Hb824SzLdP8rtj!y7exs}m
zf8u94K5`e~QzxI~z3#^%dsG1ps*mFZw|dMhyo?9_E5~ga4{)s32E4Q6C^`wx*HI5U
z-03y|E#;NiF}Dr#5*md(z+GDZbO5hU>qVzK?=i1dl5YzwhPGN;wkG>1inSHMm2<K9
z!7Lq?H)Z45)*8IhMbSNR669}vk2co=tXDEm(05K3-o6$MGWi48d#enepRdBD!*_7&
z?Q0kl-2$TToA|O;XH+*j2Z>e@*s(AdI@H?HOrZ_Z0w&U<^X|dC7vov)Np0|B(owkj
ztdO2we+E~4Nx;pT2{?69F2+}i@cJF+@peN2eiX?;6{qu9@aF|?AMr!T*WW?%vl3U+
zebD+~h}@k&fz8Vs&xZH+;K6ifcx7Ho)<pb=7M@~!oL>zS8jwvDeI$7QyS8lekO{tm
z<J{8uO1N)*JxmK7OX`9HIa*!Lxs1NYXit=594AU*dy6A(Uoeh}H%-Un6frz`B@S;4
zico`98r;gF0aWt1OBX3;Lvj2L-1qAo+j6}c6sH+-M-ud~A!Q*N?~z5`M2C;opI*@|
zc(#ki?S)Tg4xwRR63z5%qz)H-;ataETDl;Y-jsDiou1_=MQ34-a}@vgVHW<a(ZGT`
zI?!-~Qp2uBYJN6@dTvvrRqv#5dGly~#p~5rez1gSMn0o1VP_~gu8e*y35>yMp2jUq
zqv1OoFeT?YNAmko5VgZhu^{kRM_`9kDoyt22A^BAS*c@hu*_i=%ov_Wyq&9rGjBCi
zSO$aj2|eMtT|u=zNO1jAo4ASU(L{V}o4^6q=i<KEV^gj-dOh#t#y@VRu3sbgLl5n+
ze)t%(cuhH#I9N{RTdttHJ&uEhUBT=(dpfu}y=UAu>ml6Qe&1RmU4qx$Ad504t^$Wl
zhi&Yh4mu%!NzaFQ@FDFw5kI{dPBgf{zH1)vH0V4T+OieY1`}bHl?t>3DnN?gTVi)X
z1_BdQSeuV~;77v^GXD5mUiHdHvaRtJRKzF%bK?O~vaiI9PktnTQGw5PlfZV#NAfXH
zU|cRW1&6BDWc`^@vrdc_=S|v#-~D(#csMM_E|qE;k!1%hb0cAEkTN6>+rWR4#gOD-
zh!d~*Lf*DR*wr0Ktd=E%`3+U@y%!5t7V5+C>%TxMYNpUz9wu6z^T6kE1gt#xmYS>*
zg9U!M<V(Rb(y%K63Uvf7W%^T;r?+vk?p4g(r-S0cwGGr(k?pI-Vdx}T-fVm{SS{f3
z;_1!&%%sZ@RH4B3GtD&O(^9ZGtpQivWnj&dRETPC0exLD$k~wu4Xb9r{NX6LF);&1
zZ)pdM<V&RH!Xc7;c@@@IwK2;)LU7Ue4JiKJkC=GbgGH|bT~yg)UGOvz3?(A*{<13a
zxcDR)`x?MyT@>CPPRGplP(0<}%8EAUQ^$3Ou_w}kS|#14A-0L^s6Y7vV?+g~>+PgL
z=EbzfJRX0Wgz+ZAS#9=Lz^R`O@>>>(q4muT{3xS!m_Fq#vqpUsJ8o$iRn|(P(<kN9
zCzi3ereB<W8tF$(k49p-!#`n{F98~K4`O2Pcd8~f1SZGrx%{iCcyGBaI{uMIzoH!4
zKKT%dlH7$}+l^2n5lOe#QQYlc1?RJjFhs-|rKXKT(Y;$yDsn1nFMUh5%RZ!zxeM^U
zM?8L<nS=`FA=KBz5KV%eam=0=bX%McL-Q*6*roMwV~-Pz-g*M{Jq`GjGq<tjogN#U
z-3%sbHP9$FfjzuLjY<_O@tg1cgp8Lxv|+XvS~2msXO$xh3sQ;b#1u?4_(#W$*Tk?Z
z1+-r!jy`YEW3Oq&;Ptd%d=x5OIV)f}Z>u>DdY1?pw>w*~EL4Lv8E)Z<3lFhvn$7f)
zq$)o!c!m-GS4I5{?VwwCE_^#6)RVKUVCA?zxUr&y=<BV4rNO7jx5v{U-6NDe(K8JS
zFUxYj+?-&jq?%bHn@vo*f1|yzDz`}227-6-@FOq=+^=2XP0c7%V<eoxvkr5=I^U5C
z&SM47xGAW;9|hr_yRF}0B{Tk*61=S&&lWr=<h4^5L94PnKxq)8HAfL|f+~0)Sq7Oc
zJ!EC&FjL|$h4)<zkiV)7X=MUy{oOq1D{sYb(%Zqo_8=TEO=so~dh^ERpGjQfJ8szf
zKI6DK2EImJVV$+5VE^L(z_)TaVeW~;MB%(+8)_!Z3Tjb#@jtwoECP2$PLT2o?!0}c
zz}u`E2~m?fczZ=ry4hNVFP~J#?>#@7A46*^>i0*&nAi76$JjE)Iw%ILbiOlXw*RB(
zyyLn0zc@}-HmQu#LR6x%x$kpTl*)?8O3~1iv`~>vR+*7XkrEnY#C@Nuh0q{MODTQZ
zlm_kJ{r$@yp9i1M=Y8MjoY#3iZ<6dl71B`S4G|$;r1y3JjDJVario*=$nOO8D&vL}
zLqp!yVJ`bzte!pocs5in=|kTeUF5imwlFJ=1=X#Ayxg8=bS}ihu5CByv(w2aIU@+a
zuA7KgFX^+JNFnOo@kdneqIX*iaglxovv%4JZ1`M^zivIFp$}eB`YIADtu&xhCL0w!
zXCf_W<F~(^iv9zg0(a6+xC<9^$69S!Ev*7<T^5ZscYTnXatb%UXa+^!R;tk*ikB<J
z+55|s`MrBZuuwS*XLi&O^ZC`xRtpRKQg@CX>5ar$O_}uEu7}`$Y(GOzXQ7&D3%PD_
z6uU)JAg<F6HKdgBJ$qm9t@eV0Qw)8(J&8tChvOcJ6ZrUv6FaKz6qc?C!$}p9s3mQR
zJN77}wuvE$DSJpe8;rpHK@x1$b3?CT7yjwiYp{H^D}V5h5o7LohxCa7f5>w#SskCl
z*9*PAq+i!*w{;e6dSilJLC&;6$fn5*72~=+x!7O-k1kad7_?V}yZxGHB<I~}{E^j2
zH=JF~4jFubd(wBAIGtta{C5w|ADqul5~(B$-tMA*UACjHsym<V`;_kV%|^F_+Wf*N
z$7sr(n{?C2(_GQ^i$q(wlpYwZOZ`5T(iIaT$Y-XS>R$UnyARdUxQ6#+;8r1>cKtQC
z<L3naYsx*Vib|wQ?%DI#)YPEe|0pkA)J@)risI_+m(evLlBs&%O#i#CNt8Qwkp$0o
zOl`tya&q4hl5lTS!!!At5OXY<zA$~uUC-J}Z9a981zG{zI>m*|@|lzAbxH-vlOGxX
zawOl_6GLu}w4_O2n@QKHbh`W71ZtFSFFd>7kYNv=DAIIdUDZrf!+ubM!<l5@TM=J6
z{F9t`eTS9=ZlgvE8@XjFr^xR0ifHn_0{88jOx<DvA#I;I)lGYk8-68{W8u~KbKGBQ
zdhG!9G{~cAyM##Ik+GmrFb#UIHql+3g+#YrgOfVy!yb!!0)>&E=+lFJ<d1SFDasea
znH$PTt`3h14&B@X_6B{p)ew>_PjZqeBf04X2K=^(BVl}7HlO`*8|jJC=NBnVC&l~y
zN$$zfT<IrG;<@-my?ePbMz(6uXD7@t;(8;h=WEiwN&}SMq)LXCeXqyN2x43HkR~15
z&IB(vz-dC}UvmX;pB~?YyKm*G7avQd?yHftqgP_!`=wa%z#7YobTL-PhCEVqVVnj(
zaj!&N>AoQoT)TEMn2fPSxt%+#Y!8VyJlOXIQYZJ*l#AzR)|6DZuv`SUs|H}vld1Lo
zdBTkU^%GhlItHedX_B8?r{jj6YjD@dkcK>KA^2w&7HX}*#|yUMimfS_*r~;p`6bi8
zPgbLOLm~Y#w*`l-duc#SEMw(63McnWz`|cvG_&9}?6RxHubWrHA)g9ZlXIG`{XCLB
zTeJ@o$BD4U^Ie$(FDl^jjzwhbpd(R^dIg!Ug`Kh10`AbAOY}{&IR?l0<BS(xFeCRK
zm0Ug#t(U%Jp4;Tn6T#|aldl`NKli7TcKu?+3gfZnWCwY3DUM{T#?VnE>n+dTm4UF+
zcI3;I3y|zH2K5U%!BpU)uWI;3yPBWkcIRx^<|PMzHFCkq_#$R$Btn6=@Z6sg4Qu{8
zL$r<isq36=pi<!o)7q5bg!XaB+cFPyDs6eC(>@U7s|ISasaWph0YRDz*n`;?kQ1ap
z{@fqHF;9zNOy_lh^D+)#p%`30JcqnjTn!!rN65hiXZZN9b`ZOF9&8)A2m<=_G33I0
z@=SPbKKLkH$*3SAjtTJSTP<yOSP7*fZ%LlsN7|Y(0&Ms{+!RS;7#>mtn{WQ`sH~fx
zv2GJw?-m!_DKU_B@f?)=7TA|z49J+fz=nPgsJ^ZaL+R7NV~H~=<0|$;P8D@p8$+!+
zcY=E!@G3T=*@?4f@Rm<wSUICZoRU=t`nL2_kq$j}|B*3t(TgD>t$dzzF&9YN(sWjQ
zh7mO9m_hMi4rpi}g_q*S@Z`m5c(3#swKFHfv|mYZH_u$)n#=R|W6f!HNhoVla~O0l
z35pc$KKelK2s_5f5B7*$;(cE|Cj;|z;k<=A=qaBQcBXPjq}U{!`7#OZzt(fFw;du1
z4(sUbPd}+yL84XD`fSQtvpDHY4^7yRXEk}jC|oQuf-RAmf~{}bxuzqJ;dQ_)I^~`Y
z`|;U9GFQKjO;ncv<4r1<oo`CR<(p`1VzcF+ID6RiJ&xQh2qI%E4#A8eNj~*bJ4M-X
z*nATp@2?m=o^^<Z-7+D~7CWex{Y(1vnK?T`ZUMLm{e*4a0q{yeg7l7$#?q{F<aK2h
zX=qo(xQnS^S~-P8E_qJkl|RwD(SIo_=&;4Y9nG-g2bFnuj#j-hL2_sThKxxeS)&K>
zO}hlne<Vllu56~7J%}14S(xQI@F_Ee9pLw_@O9M{fwQ|2R!@D%rB>}H)5qzNL8TAO
z8YL5Y@F(y`0!slbx6+UGpJ}{0gHMwssq1?SoIl5byRtl(X<w^}c`{lw_U}bHCg?Mq
zRk48|uWUKD;5#^qNhX)oB-pqzGpm9SE%3j3pNyQFNGn`7utRM!%urgpz`01qw1q0T
zICnaJJmiLkQv|N-W{vt2MN3)b5r<H1&O&rLVvC+$k(d|wgzHng4(+dEX?493ExDFK
zuP=xC2gaS?Cou&LLu>I@U<|+CO^ogzeb&lvNe|7Lahoo`T8~A$BXFt3H+tExmH%TF
zAP_qC<CrUeSHcF!toAa}XC`D`R$iyQ^?K-N9D^sH&SEuPz2N=<MeItC!ZX$u7$<4~
zAC*?&ucb%16?Uz3nD)Y8z+&ulm4%)JDNGaHjk==qVZ)PfJV58rz@{R4Bs-qU#RcK>
z?~gFw;x%3kw!n{@W8ips9NNy-U<b0?*^PHa*{E-Sz#&tGXFrCqMZ&#FC;A*bTJR5d
ztck+ddv3Hm<ss#y31mBrXCp*^*8iQTMVC#tps_yT7_?zN71^N5)=crYyf;M+`(=CK
z+|nG@?QSg;ewP7@C4=?jM*o0WDM|F6`9V@Y`v_e;eFl5?8gf(Lp5-=u(u8k2P3w))
z<7jGqxz)eve=uSB5h|Jeo4N_EKilNi`u5u@4L4FvNv7j-8uy@`PXE+GI?X@PPkOJc
zqJ_TszjvBwn|%S6DW`I|mX+XZ`;GCpLq6%11E=&rR(O`UQ!2BM2^yot?Zxr<=i(tM
zGW3bcO{igBmz9HCRz7h!EX5337J<l|3w3)kx|v`jSGxX)HfakgprTT(80oWybv}NJ
zir$UH)z7QQ<0~#WSRjL1A?n<;9dX>SzAF3p-DfK2E{*Z>hWO8Y4CPjeG`PNfPxfZ^
z(t&HG+@sqJRqeY@E<D^wdc017X}2pc)e%W@gzu`!(^A@N{S1|xh2CB7Z9F4x0ozI)
z+5al4IhDBy;OFTCw<1Q8`G+L1@>4#MR67F}cPs^8b!EMEzBzuB^J84D1(R|6jcLuu
zw?K}_GHxpfZmb^P&{8p$T{!*#*_S%R7fRiu>vnGhxmg0M@W>4Qu6#B<_4WvL{?o|F
zEK|hVqDqoCbE}p5c!6WCs0mSVZv2H6dStt2nZS8mLtp5=Cfi;<0+ktN<n7U;G+Ap4
z5mU6Y@a}J+-3LFD9lzV@vHb}&Qo@S2R*#@Z8{_z%q*7Y4!5cT!S)gM3dAdjH28mqV
zMi%T5-p{H+{(i|b#$)eo^3ArE{E|Kap{M1@C~D0yWAv~f{RDGv^Lr|8af-$Wv%a2_
zYe~+38ob<7OZMcoRrIQRG`+0mNd9%J@IKRvxeVz#`karZ<mUye`}|olY<z>pG_I^4
z`LLV@{2IeMooyxgYHO+e>IiCZ^(|+ST1v&<3cDf>er$`<2tK*|8`m0jl0^K~WKF`&
z`J+k;(J*y4t8~v7+TAy>=Do*p-;ZSUQ&~nnA2cBue($X|%LUMhjqz;85nylsEw4BE
zCkKto)2VIkZ&FrK#eCD4z^;FIoqk-JMC%71^F}#g@cl#ybSOT+%EW#v7m~`qGi)Tw
z6P~cSD+cMo78yQ-Tw#1qEu}|{7%Z(CkGK2&()@uW?Dd<^%C1VKe%6VYXHh{PXMCrI
z&2|kBm$3Nf<tRF67>DB7W@xoZ;ES8-G?c8p#l1-P!_!h(5b~~twszX^yW~6R`oYZ&
z8B52q(gzH1Zl^6BT&Ia<{Rc5fVKhJMswgg~5qf#vhOFVmy+owxFa=jVw0N38?h09c
z&D=2BvPI|xnETLyH<9RQW&s~=&2Fe&_LX)PS@7{io3XNR4R2TFf}d7Drx8M5OMcXO
zzR^+@1NjE>=944JX?S2nPza7X{+*`fgrL5OA%5%;{-(?^+-LjWoW+X<7RJ7W^4=&!
zdq3P1y`9~D4e_i+I&Zzal~2sg!#{<-=yn{Squ8v$Fg%?|NAAb_hm$e1^)&bDVlDst
zR}t&=MI3+SeV}^{EU5eseT*=gjH%JZ?5M(a>iX_G4f?zlF7?e|MK2pSz&PWE3r^?h
z3p8MZHkL55{X6-M`_6Ii4PwB~t&(|KaEEq>+wcxo6UYLoT&5w)h5T{&%#TqnXQVes
zfwR*l_<C_Zjg`2JUiX&5!Ox2sORXVpS(6IW|L+dBX7X%a>+oV?@>UnVZ5quR?A}h)
zbB?jeXIe-|$Sr>Ks?)q;Ni?~YcAdB`*hjcoV(=kfp1pQc4n*g+kpA8?c!d#R?_Kc)
z_iasN^|TYvXnKM;Ojt=WW_=;g3**UgftM4--r=+F>Na#&E0H~O?O3H~O(?r=z{|UD
z<K8ZBBATy9gWeTue*UBkl5aPcRG7@-dgjT)M`u&)vq)i3cRM*VgAz~w29n|F4PKd>
z*kF-h)?;lft3GKd`>kynS)V_j*rh!O-{m74V$HnS__|?YNKN=-20DCGh8&w^hmf)<
zm-uJ0%*t*vGVsudulweT`TL`|y)Sggy@wK{v~2=i*gOd~opyn+bJJn&?nlI`PoBQF
z`NsF2nPaW-REmG*xftX}`9V@zDlO}=gWI};%mknF{3FRXbjH)~<kue?*ta=Ta6#>$
z3(Kp>?&d<CO%$hYN^fYRzXBfJ8bwSy9?;{A0cmn$Xrje!=GKN|^}b57*taMev*Zs^
z)0kN_G<Y$1{8~>W6zA}#uR74G+_6|Lo!$_l5l*C*R*|OWv2=(&B#mCanBH)N$~@al
z=4ED5`<H$AI#dR_iie4lodI098O8VvZ6coSe7(ndH>$ePj}C~QfQNB4FuWw+YWV0x
zP&S%Cr2N0~vJQfS?zaqHl2U=o@4hmkPY==OmLJH>2{VbIUkCA<!}6BP^JwYUCXUwU
zFdIc*T6xC)AyrNhye>6k+52kzj1>pKURxUGS2r`+m8+;)m!dF-b)Yj33w3kII0%1n
zi7GjTL376eIAhvG&DWXG#_g^ocfK*6ltKQIT|PC|b|>rB)G^aF2WTyGmT@*`VA+&3
z^6}n1;x}?O{HWAtFV5M8PQuf3v%zid$)X*sw!#QJG5;0nOTVXy2b>!urhlTzAMTS$
zhod0ncmgi>T!j9wTIsqwq7Ct3&D8En67Cf8_rtA@_%+L%1-}%``D2dLH4kI3+ER3{
z&%uK`g6LHDDEfB90h;k8iC0oyh@bB-hB=~uH}}XBw}}Vg?YmW2Ri}-nPTTQ)&nLQ8
z<TpfGnBiT@(i<li@E5ndrj6eBX_TfB<}qq8wd@N0IXekw@^ZNC?+@zO7>-$!65w^I
z4V&fQjJg#|;n1TTbclR}fs>ZuFAYll`ke68t=W8EYAt=zaFKjhlg8#x_XQ_Y9q6xf
z!k15VaB09&lsjETRf^mM7Md2^DLlsqIwnxlr`H93%pCk?=R(}&ucPOgNNz#u7wleX
z59hrl_~PObyxq5P?8rYJQ1fXMvdPDA)}sW}@fDcbTn&Z|D+n`yskmwGU8*5Jg<9GE
zp~stdBfJVlmwk_DmUaaW-C4j_-g5)(;XYV1Z2|7@k7WB>)|1hy$DqUiFKtlG#pgZ`
zIOQ3c_`M>Ve=hjA_pR{5^-8YTq|gcM^Obapt^~#>E8vEDZTxN8gVIYfaQc@*yjh-y
z@&W_xP1p$R@J?cW$4^C3@pPKx&BEmKQYgFR8I3dvM%nryZ0>7^$mp9i_~LP_J=jgn
zlHSn1D@SSR>t&d=ND3u?`r))c)6l*7Fh;FS!vC(>!t?$1)PB7Io{)FKvBR=xZAmHI
z>%uwPHWSNrVt8v>o8SPo!Cmcsth9<d)?Ew0BgQ${+3C%H3wc2gn|~#HPMxEjp_X{|
z(R{MaEFO#I8zG<;20HD=rM4NE8+Z?o{|)26X_dpc>B7A5c^A#Tn~vEPQ`lV*7Wh_A
znpOQ8#aL^+K-Y=C@!<L~d_q`3{Sxh|*wI^zHQ)7dvCk9q)p|(pPwAjyh8g%`r!&T1
z_QvX8sYtL4Nkuc&PIAWt6-j=J%qNoKsDa@^&pmglz#@9Nn74SFO3PJ5*k+fFg8!ov
zt5zpcZq6a}jIPAeDH*u&Z3`|uCj6hY&hovB4`F<?G!|P5E`#@pSTs+SpTQo*#_VA#
z<FE!#3cifXBm*}+lfz!qy?9}ZEPm^}z|Z9~@R6x4j#1La4~aY%=v9HM>{sHvvK#nk
z_y7)?p2WQg&HU!2*{I(XhIZlh>{*9n{1~S?Ot;X*QB$sgqkI-A$vcAXGf&~*>nZ43
zlZwf|&hwKUEs6HV5vZL10p{L!Mv=|u;MFI@4M(!@$UH6lceIHAH)awhdp{);BV+N*
zfqIlle*;rnQn0XK4_=y6fDyr~Fg9NsCw1zwS|1Xqk?&Dh_3jz?EG@_WNy<>Y=Lskz
zdO<~jkhK^RVZ-aR8hrl<9CiCDen#hKNa&2kIpb=O-JFP>&R_Y^<v$_QpTX4JMYzhz
z4bO_#;q^yHaZHO6&Ir&$v+A9=K1PGRw%r|5HkKmQP~cnMjKu>XR=m$v2^5>PfW2mW
z2?O_g(z~B~nO5Hnd^()TwnW>5RU!itmYQJsqY1>sRbZ#HHP~FaLgM4||L;d-n1zKz
z)JGY{Z+7Q8r53|FYY|9Xx|0s%tHF%m2TV<@6YTW2B+FYOSOw{F;XEA%pOu^OZKy8k
z9K#Xm%$e{p&lxt;{cv~6L!#TBPVSYNG`MNBQL}4X;LedLkhy3-z4YJ*>3-@Af95X-
zw}?TZFDV8SFYTvs%WWDQZZ8q`sMau-eHVjeiae}c=?_&qZj=6d<Kfcse&~<1tJ9m*
zPe%TYBXl3f>6NOo24oT(P--VyKJA1Jk|u9Pu7=dBli=8@X^_DE5b~jusJ)sx$jp3>
zM-!BIQ|mVJ?UW1~I<|_2ZEAq%*ZP<kV8QmaiPGV%p77CW8W@LKgS%BDby)d<i*sT?
zT}_jE`f9`bQQ>4p`C7=8@};HQ|B{b4wW0d`XRt0fL_Opb!Kc6mZrv^tW&%<CtwrBS
z&BbG&x$-ol?=u?*9&=>7ZZ`Q{b{IBIoP;NWUehi8C+PR5_Ne(qhx6Pw8kH2sQ)!EN
z7`|){nJeszyjV60Gydx1pD$1A50tOKPxnRHgBB6==_5xb==TNQ+S>!?e|N#PT5q^N
z{;%1`J}1FfV;a4mq--_e$0E8^7MWkcMX>mZGA902V%BJHBpMHsQGVfZ#?B=Q!_F@w
zmuh?|*<QuuoYug-J}T&SD2ZG0vH(A7yYYpxHH=v8akzWEm#(a6r$G{{arruR{GH#-
z$YcpzmaQ|fcUPOB!tqD-0tGx$@f_an9*2w8%cJ-RBfQ?GLysx%#4v-yLcXC91H9gm
z+P79h_H>vz<C_c*wiu8%`rpCp>0w+GdJ<NzUCB=n=4D^_hs;=6Z#X;dKDAnXi80f3
z#fz!6u+(EBKABP~)Ls@;H)<U<)(pT~-gbClQ42Pm8-){JZl^(YZ-u_5G4A~Kl#I<2
z9ONgr;6&|U!51Wuv_OSd4%VT|G-X)kxHOof0_XB>Gba2@g2PgZpqw!i(j4ZXO@lb}
z7@j4!Xcm!aJOXvU{5jQ~esH<<47vZUft=|rhIbG2KyriNM}3$9_d`WN%TF3#mBhnK
zivXhk`y^}<2by>EFZb)gTQajZ7F;5Vpj2S&#APM`7j>K@%(8&uyEb5}eGpVvS-{Tu
zC7`qE19cSkwM!pPg~;v6kiA<3_G~RD6F#NDQ+qkMzWx)DmR*5qH=|)ZnBdHEJ8&9&
zO+Iw2hs2wM#PZl$2;JC4KeWX|V`C9asB_@YOxJ?CYhOwC<5<|N<qDIZC4#GJDRZ<|
zjomS&j=AQSkDdRd;laOV2+uCY`!^!3R_W>CD$hDByBWgTW&6R+7l|0Uqy<AW#NlG+
zH_|qA1TG5CojI+Q^q;`vKe6gLvDz>dWMc$Y*nCO2+QLDvdN}Mm?hU_teRy$Ma~54k
zv+iZ#Fe^R{M#fy?V-~nl^9SeA@$yNsTS=MMj*^2&r(#G+T*=5^vS8K^&wz`m6Y1M*
zJ@#=|7G2z1PP*1zp?0_Q=mWUKasK7pWA}A*!saZxw&xmUE);XwQr!@iS4(etnJ_Vy
z;<!)X<d_J12ce2Ti0}J-{MYFHbiAEC*=v+S^^3J(cJV1<{x*?n%G*=Zwhppec+-lT
zcxv$9TzdQkB`TvbY1I2eB-i8_bMuit)c@+KFYABEG=v;tFITGbskTSRq|52>>Q^Y~
zKPh;d+)mPE|BjKiL&u5R)(moPrxO`3F%r6mw79No84NY~Ogn|XTIJb;wBolOsXV%c
zj%qf5M1N5*Kbis8ylNqAzX3e|lt4P3TVmU{6sj6{i99KIL3iwVODsQo;^h)acGXN>
zy!IxWUf9o)m(c~ZVvz)+xFi~re`L^(v+|&rs|u6eXu+ZW82Y=YkVt=GaQuea`o*yl
zkh`doR#%9j@x&#>B;Ydtesu$NT(ccLjP4WPeVsV6>;YYHbS)%JzfDI?siwA()wIEX
zH4|JynW@iSlPmG(;Z4^#;A-{Y?AjO*`4Iy<tQWvUEsiV{GEzl5g`dSFL;L)3aM((p
zuaoH{&S54n@2U<Pr!<nNdwD>JX(72%IEOD0y-lL~1Q)oF56E>dBZYrgk;L?u)VS@p
z#nF~p^7W4vK2O{M!~XqbMCMoGIBy{Y-S=gl?9l<UtlOm6SsRp&Eg+E>axl@RjeJfq
zgsY|l<mTR1G9~B%^Xbf5(7u*S?%TP-{1f{i?94c_cqK<yE*>CJh6`Zn_B66}FqV9;
zB_JVWpm#3mVkT*Cf|b&Vbl(Y2P<=jvBnf=^uk(W-RsAm3C+60dHHM;*<tR82?F_{?
zB>D5klgV1Ycr0)Ik4W0>gTmX+jNiG%Fj=_!epJwfo;xC>bNnL6b6Ew8OIE<#j(TRx
z*XN+QcLZ2(hyhHsrY^yD=&fgtqw~XY;sFP^qw|~V`C3Ype9YlcnIC*z+5?y3dTF(1
zD<e}W%3pODL&8g4q2Nnq{pxL(P_jE5+%FgtGYcuAlwC`9_soKnf<cn@&jUUMdO*~|
zolrM%BfQ&`O?>Z;0ORWM5T7N~=o-SzU0eds-;0El8cF`;@D<{5ARfk_Rsi##o<erz
z8rk*1j1~RcLQ-t=$z?{0cX$>Bf%86){$n9zTDU*mUsGM*(&PlYUwkDdVlp76{+|3B
z>w-HDO0l~xS^?wW2rBy@k%JAIxG(hwGclovq`JgHfp`Wc-0vY%9~>s3H!6sKpa}H)
z$fK6OGMsO)0@XNY`1V#Dv_JKd!;WsWLde+U?h)mM?Pc;+QusW0<&g$>C}fb!LBhR;
z&bcB3*wI1McdM}lQ>GF%xeJ`Z%@U^S&PwLYTpMzzYzo@`UIybe=fQ}KL=w1Il?;qI
zN0OG#h5HkJkez9&;BxQ*`KXx1$18u~wpR4O^r~Xy(uPQSOekwNW(#*N+>1w#t*~cp
z1C`m}L)R}!V!|K)M0R%~OniERgf9<<vQNkHrQHZH7%%{-+o#CpSO<9a=>_z(gu!#O
z8zk?P3k3e>0aMpW5jn5#a6T~-M%XTZ>f7Gz5&bM8l55Gou8x7}(|7X&&6nZSY(uzI
z8v$)=juRc@A<}o#gWp(~Nh*H!lllLBhoSZonDr@ud~lgTBulF;qaw;Ex8XCH|2PM{
zZQn7mL+S9Zct88EB?qe)nL^T=gI0I^Qoy9)FS9Z}5<U(Zk?335M7gOJMLiP92+cy`
zzSxf>zBmeCGM?`CK2N5H9)jSYH{^)@6SBQf8|K;O5=m(pepibQdu)op%jmX+I~7j2
zcU3I6@|pu$9?!4;xqUNU5c>5_1u76?HHoZ$^PR3<=>lW+j3s~HJ|~xT-O;orkv-LY
zl^n7>3_)|U;hm2TIao6XygM`D{@zIN{1pvb+*%-f*qZe_Da#nT+i*8CjfH-VIXh{@
zWv*XKsi9tbFQk1>1p5?eaGrkvevEPC<DFI6Z=-csyPX5j^-sfkg#Kt&EyIM(jh@VY
zQ&weP`p@S5#7DDl=4i3!tkv0PZhGvdWCixg!eBntLX2I*j%CM6O|-r}Rg3MFO2D>#
zBiWd_{*1m|n80NJ4lB(}*y2cYHmpa7ow+=P4{^|Ecc<vHiPF04zy5>Jw9<&3s3*%-
zh5g22Gg-V9H<oSwqR*<A$g;K9wAh>lD!kptW?pjZG}h+8S+sv_!S=44j!p@(tmAnz
zHc`iv9lK;KH0p}5*7wv&`9v$W&&QJWe$c~vOgCl+X3k;9y&l0H26J}m*3a-E>ojWY
zm222NXD*v}?J3^9YR*Pqac3Q#%QhG{edI&O&Y?#W22o=BRrdYOGthdem0xHgaLv>v
zvLDCIVO{P`VwDFE@Kg7SuxriL*-r8n^arP~wHi9?)p~ih?e9H^{O==#{in@}=5ONn
zxT#q`UcQ*u$~Z}*{Uq3}&+kyr`6Ix8Fb9KEXR%c<g5SR~k<nAJX6-je@)x%cli0#E
zGDE+d^xYZ>_{R%uZ2pk<16wKCWe&H+^KsGkjr3#I9U?R91kv!c;z}ZZ6N#^Xa0jOd
zBzOZkW|F|h_H1V+lYi7~(;!*&q?G@w{RH;}Mw6m9Gs%PECnV?JQL99;PZ(hQlZ?C?
zPfYYIP?Ar?)CrwL<jXY@w#JDx3q8%Xg;T-l-+s>QxEKsQ6o>b+sW7al$#;G{!A)Af
zisaR?V4TSE(HU~IH&B}i7&VGfRExqx5ytSmF_WZjW{6nBGp;1*GxD1jz>ybE$ghPj
z>+GV{VA`B6;+huBZS(zyTkBTv0Xsi)C+Si+J>nYEIa`u{{!bR=%=+N;f6DaRju0%^
zT8n`;sgTy)W;tshnN%!oBpVAN$lk&C^$qXpAbnUKJXYC5>uLv>5g15}#t3)CEFL;q
zMnSHDI&tz6u#Lf^`R>(IS?>kjv}f%~V&459s?{zOG6<Hix_F4ABUIU-pU%vt^kqbS
zK{imM%iQSOmuX3vGkHAq6)al6lCaI!=-h^dRC-M{J-uC?HTxoXq=|&3>^3p1_!vnY
zEzC&a9}lua*AcJxZo~%;bD_JXMCh$K(M3~d<D*gDyxF#skYw_NEBic)Tl!g(Xl85U
z?9_ZA|GS??+Rnj6Ry%2|{waJCw44lhjY9d9VRCF$GkNT$N>8`_rEe94^U6wrevQaO
z|B68n)l@?x4>K5&bjF)PHX&!-82qnM0*!s<<HqvKAQC$o51QQJRytgz3BvAl6r)UE
z1c=b#x^0#pl64S8)-lO@Iquz;9B56I;ce!d;ta9<;8vYUou^rY+wz%wz=qFg>MILg
z6-A(!ID$Vvw2jM5xzGHqm<xyZo#9TOZ4+vcH&*GDXQ20~0Uw?GfSJ&Dlh*scV*JIB
zZZdyO7p{=TW8FdY++G><4S9lcyZg|T?P6x#TLlWXH|PqT$^4{dG3L~jF(@$R@!{HA
z7|ajQyoaM`(5=O^;K(F2-cv&7j8Mf3LXBS+dcex5Xg&_g*D=Y4-pJV7f?>xA+C89-
zqpbi>G>*m-qyNw`>Ej`-I)hG9GZehG8R(MS#Fcm_<E(!&C_$w7qfN)_lzeV7ZY2kq
zSj$T^B)XF>*1ClClh<Hmk2L<fl8uXWHe+9G5w)sP!B-LIN$2y^oZ4QYPGA0k@!Qr&
zKdjuwe8?AtpQ9ytr1LN~I1c{gzM%)ZkD`6K83sO0qX{e5G4gxD_?+39w4t?(jvJmz
z76t95^P+_F#3YF_R%fYXsym*GjG=GF%*E4{&4N`%nw5U?g7$em0b4g8TJuka8>N^E
zgZ4gbiQgSMWl0{C^Ol%&MIG*I9jCWDTw#IL2=tYd$A>zLF+2Pl`1=&0xZ75mlI)4j
zj3f6a>^8IA^CunR&moR3rMd3!=$4`$@@#e=RtvqIuNIToG_h8?$uJ2PwA?0Q@E4zC
zzNHJkw!(UTJ+VG84R43F!mh7bAeq?+4f*M?*fb7e_vgUme^qd(@*YgAu7Z;~i+Iz5
z&EVW{6HLe5gf{jcdH=!$Oizki8*SbKUSd7acT|$x7=8`gKpzyY)I-d@Ag<9dlYMnB
z0zL>F)^`TFa9Z^wT-+>-@_G}YU0c{ex1PwJ-7|uhK2rv&-FHCD<^ry_Z6>3OuEG|V
zad1Oh70%9`2clI!_-^$b{KLa%KzXeku1QY^-Sgcr{q6zyx8f1_M@)ekvWcwG*H@r3
zB2(bW6~ml&O%UFbhNt5zh1Wg<Spw6c#rXj28Bq(Z>l;8xei}QF)DI_0m3d6C122uW
zY|L?YJZ2;f*PiOa<a%qSaMFHWOa2R=+t><zk=10Cb0diSHUg#cT8J^<!n#;D^FiPX
z7K}6WD%HZ->J_kT5d&Hm3*qx%A*73{fT2t{zwT8$zft!DDl|<e8{7oO#V%>S`}}{@
z<!uvjo$Li$O3(8<`hJkI>-NwU{t^_t_S36-*5k{@HMF8%mUby9W4G=>y8rzep$DGJ
z1dA9_@nAhX)iMr~`a`Lr;(dDL$4zeYm)X#ImSB>s3_f<x!Q{$ySbuy3kC_WGG*gcm
zoT$nAhpI5Lxk+69F=gx$&Y6u*<XC^hL>k~U9>e34(0lkF;ilJfp^uet^#lo_E<Z$f
zWawi>o<FDSpG<j;x7^|>%W!bqIKITc+R9Sq2a#{@r<2tN;frMvUAIFWOS@VayWro%
z;Q2UA>FcK+&V7^)+@M9-9he;;$4#4I%sE9*#G+6K`h0%`B?J4pgWAdX{KEryoEHbz
zH?HBj>IiS}W(t=7R%e5<n_*RGI+*`RXI{4H;%uWEWar>)xW3yS*CyEEy&Dto(ilk~
zk+;F+zs;yVeJ8DW@QhwOsE<+`X3?IJm*MrH0E7u&xtf@<Y)H;L9BK8Di0-PPE<NrT
z)m{zZ3lEbII}V~>uQ5&SbA$cL4pt$WQuNHtv8?#U7j(#AHXU*j&h<a1_!&J*v1E4~
zR~fa9Ua^>fe-5=lZ&Wl+iG4{uiv@1?lKnXFc><1n&<ftM>iB6z5Uvb7!td6YfR~+j
z@CRada1)ILMxNO;$dA`T-9@YM8ai@4%xl`JbB2z&$D)GCTFlGK#}yUcywYtooRa2_
zGMV~d5B~Jj1#{HS3C8U%x2g0YWo+{h?iUljFzM=xvH1D~ViA`{|C~Pp<D5t0SoKlV
zV!aL;l_!&h=bPxVr!2QZ;|6v6wVx&rCBZ|zG-`j2!HrD|aiBYm+g4aa{bJ^#xY}Ou
za(M*ImJV|9_AWecxQ#z>SAk!aD&$&2qS&RvK6XgpN6chJSnui{%;8O7<Dy==!zl)R
zHr}P5*6FYb$xDf&*8yt$(;EMKa+EgjA{e+*fg3xS$D{Y=;+v{)JhWW!cv@!Dtrnu}
z<&<E2(^g2oYO2GT*p1wg)#Le1iqlX-V9<;>Qch|-CgHNOpXd;320mhWW{C&QNLax~
zK7Rcm*>&(VR~B^FYFk_!cVHP04^`s`sdR)zBlp3b`gM@`JJ0I05bU~eRv8W#)RC-A
zb>8$+7a6)B!yZW44CX`US(P6pFbCH`Ok*~2?U+IA6>UL0r4LqTI1p{c`CONaGiWTb
zr((}7n327+;IHRY*jv4v>ZEp);x+<C4Qbr=t*6PiZ}ts$mBWb5`0X&9+0Fdi<_=LG
ztI>GlEhhJ05;vL=gIkN;`H4R&n1(K6&TijWrrv*cedz0SlJ;>j{JH8V@NQCwvL~_3
zT(Y`;Q&0y@yQG2>)|6w3oj0_oDZ-7ZJ_Ia2!n8Z}@cz~*l6bHXF8bEc-~AE|?|hPI
z-Doj*;h+JB2IYih#dBoeniOyzJqm^;CxK1!FbQH6$-qlv=u~|vxSZOE&R7>F_LC#Y
z417SBm}wL3{P7_5Splw(K1Qr}9%HZV67sVDdP&NXOw#dTKXm^!A!qz6$)4@feB!AN
z;(OSGv=lw3XMzRC=#0lC|Lk`%KC+0S^F?~0RFr+c@lE~H$6fTOxgyy$+mf9B9!ng>
zF4DF`soZQ?72;+Sz>e%tC;3zQs8OyqCt51QUVY($GfW%E+511~+=z18CHaVqtD`ti
z;S|9}b$Xw*$1{=p$TZ1E%+iV+k`WmS<_f*slHa??mVG%^0r|G{LP;WhuXmP@^wEay
z${S=`%QCpy_k$KG+QX05cVw~u<a(3NEA-MC5!^H9vz1*(E1jk>MBmL&gf(P6oIP`r
zY_PN>)ulpSS-zKierQZ?%ol;Y?49^LE`?;qj)p6Q(u4p>JTFoNyB_)y-^u^cuX?he
zGx;EY#<U&M!<6ZcppDQM9!K(RD`@<qZNzh3J-OgDiM_SrB4crQIhDOC110}0q-rv^
zN!XKNX5|cbY8#M5<)ZY^dLW1_ZGTEXw~vD>g};~(16ls--@{g&Q`&L8lOj;<P_Py<
zYSL@vV8~dXy|MHz*=VFnq$Vm_{N2|@a{cSbR_kRPgw!+Bf+j-!U><(PZ01J20@L+C
zlq_6+oH+K%LdS|6UR*?m7M6?z`FrPh<;^;<c8UVKr@o2WK8$78iYXDz-COF{eN%zu
z(I@HMBqipg_XzgJ_pxv<dL}$;zlwRH6NuYBa~S)liIf>?k^-AG%-q>)i54RXY1h7y
zn;TYIz1P3SuAd}n?Rr-N`lBcEPRoag$CUdJyrhnZr*)I<+Ir;TiHWFGZb*;++fUht
z<}m8d7vdi-+VJL388wDtI`yhDD6K0YH;y+D3CX``FR&tJcPEiuWy^5&qG@pKT{32V
zp2ja<v5()o=AYmU9S3z6MEJF4F6?@vFI?_bb$Y%?7Cv74&e^LfkR!(q<3id0sA$P*
zLeFc%!kc9@a4>-Uwdp3I_62YkqUrFKY4F1;4_4NE7FhIbL+DN|Y}}bfMrJFpJ8!4b
z(Mu)K+-)*cJ!?lPRs_XOHQ>{&Cb-$Y2@lOs!VbCvTeh9!-5&2mnX&6=&e9mHt_a5*
zmlq@{dNfKb_ra*u+1M`@L#5_h(Z13Vc=X$Qx^d4iEeU;v2BBlH;+-S^Hgb~Sra8yD
zxDLTWR+?_i1j;suV@;tV-pCeu=jOF^mEsHfxNAKuZh1vyO~ugGwuat(dj$6Dnp!=)
zt3+>}TaA@Y()8Pp1pI9?gm2cFvO~vK;RX3xkTVdY2B9_lZ_{Xe@^L1PJ)=q&ru={b
zBNf`Bx|1GamvS{rd$>1sZmj&H7~JY`ol30@!<+->sL_)Z_$6qNCa65Yc|osXjMWKn
z?oz~%yeqsEE7LHs_ZE!nKg#!x;^EF6J=lIc3;r!rz{aR_D36?vF7g}Dp!EyYwhZ6{
z#;dZ|R?kJ%*%3Ia#gWc8+JOP87TEo!0}}3fpx&iSj9Gb)3mN$nB!0%S;Rmjx<egYr
zweul4_q~d0Pke?A>wBnU_ea`rWi_+ZLmJ;*G_mwc@28USUg)NMfGEG%$Ctb<<yJY_
z(^#2fT;>5|tiDA^!bvHd{#b|^>LiiGCmFQXY7*Md9u^!N22>~S7q$8)(Xe^EBE4vl
z41zZTbxxSD9yX$^_usMT8aRox55A&Y%4TN$+XnLD&n|kl;~+WJRf$DC%h|XZ1611B
z##G2$1`olD!6K4@3+;68JY!sY@Ev{Z=h#p&bthjbTS-5Bok)HbZK8W@&r<&@-b8Hi
z1rj97(VLgQGm0W<m*Y0c(*+BWZdQ2AIJxG-g<Vz5)O0z#_H{mbRq%|u(?{x;evDMR
zKIOL-33Xh71T++@;f1Yz#4ma)?=LX-IvYya9S?@c^mShRZ2PnLxh@mc)*gn2wMk4~
zFEZxhCoQYgg7JQ(C2!R&PZzsH)6t6JR6Np@$lg<>*<=IgX-7~|_X0XFQG;Fc*ATyp
zpJpvO`q|dSoAK*830ROjK%4yB1+G&U)BQ}?0fG{eH|G>}ws&aAR?i{}+VyDgcTKM3
zb1EEDDyIr_$8+~r?5Cr%3{ix2AQx<A;^K%C#Mo4otdts$zGLI){nB#&{O{$=gB9Ai
z`oag0pP<PtDpBJ3KpT=ZcL#q`Q<e8<ACG#!4shk`-cpa>)3~y+A`MB-JlW;iW#z3Y
z#ea!*MJwSB^>XYO+!DSH3Pz@LJ?f$Kp4v>bldh!27OJ@G)+IhmPn6BMD6m@>tf0AR
zY4rLY5%$N<6Wlhx5!C3h6nPg=!EXuwObgt*X=wT>X5IR4^xTF)dVBwFDkJU1<To^N
zSUm-2z0|}x_rJoX>%dkhd$P+M)5z$S>*RjMCN{p~JFVQ?zz2Sw!=AE=q9HNU_|3C5
zXz!s)-YNS%UGhMO(w4JiPjMY74lv<PKhq+vN|%YI#4TdHt(J7`XtGRy7%H6iQhd%0
z2|Vd+Kuiu_MbQ~g`ICPG`R&!|#COCM?(5<uEF5sBOK+;Prvu;9$+!2S|GxxkRhrB3
zIR$uSOcs=#Glb>*FLLWvA%;HCfQY74D0R9`E_=3-lzv@kt6fZVN2ox8u_tsZ*uW@(
zSNP_Zkf{%gg(r$f;r<#+xO^}NCgm*S{YM!>RkI<l*!Y;c_A>*lv;^O?y9dmCxfM3&
zL_<LEN|-9J*DTU+g7U1}^xo>vB)lshl4on+#nb<2(jG}@(%k?S54_-p(KLA8Bg(J!
z6=&x!vxVw|GqBt&861)n@zOCpP&dzlg??+Hv*Z_y-A}+;#-0f_j{s?B4d97AA1&<9
z@2Z;!hks2V>tq;c3r&OBmeuugg$%oQvkJ_O8Rpu`V<E!eCg~FP6rPd?Q1?y+{Wol;
z*1JzYbmt7#^K~`7)N7Ar6(hjG^ad&35CDG!#+9SmaY$!dNo=LSJpU;NtG?<&L9Pz@
zIc^zwb-)6;8?B*p+FkySZvu8E*TSDS$51dXLZ_k}zokO~T~2Axofg3mgzBL8)K73=
zMuK{o@cYze`b=^uj@q@3sb+tXyZ-7}zT5_rZbs6agQM|It_((00;kY&jHy}T!dPn=
z(>seS=$!`#U`9q4y*ghD2To=~%SQ%hs9E9J{X*8dIu3Fog&N2~12uOV5NQbp!}sLW
zSJTOKL4`Wqo8Zlq$LQhxkoQdfTqFEgGZRGx|H<>&52-=UC(gLfg1W~Gv!#c&)Oe9K
zoNV!e)jRYUE#nwSexZqDUYsP$8-j?k=zRPl^i5s|ti%g}%kbFGcjO9xt3GS~Gfrmt
zS}gM^rmIhWXVe#&5*=NFITMXh<U|{3-qufg|3=b7(RHwCj1PTr*Onf>;YmkFC{UkB
zo*sYJ3F|&hfZ)zd;`m)0bc7xFg#v@p>Dx&3vf991Z5CzP=LBP_%wMa(;Zrm^R|5A1
zxT3VvuKG8U2T;m!nbpt53i!LHoD7|apczezsjOEG`P^JXpUtqs&*!hwS-+FuVo^I4
zFAm_+Ci;;BU)<{>zQ2c=;T@djn9=ZhogAI_C=ouqldv-P(14VzY|ebcOj718gU9OC
zVQgG<ee<Ms5W7^I#0<EDC-uR2i5E=e$yO5m`!i;xibL5d1*izSNAeeVvPNmM(DBVQ
zlGJGfKCVsmN3Px>ZKtA0_4p4YX3Hv2jU7!IUrzyWl;J9b`7tv_nF|RMgE2vFuuaYx
zN}UI-w&a?@3Y%gs<Xk+s?==C5W3%Diyadj|Hi~8j>>xu2Co<30?kBCjVsIk9iG*8^
zfUL=*!AJi$$#7E!zc7wDBlCxN+&E1BT0bQxXO9APn+}*|k5sp)68yBI!Trf;a&glO
za$HV?y;yP>8lS#`JmGVhuha_JD~j;(;8S#o41s?o@yub#t<2vae@U08GSu#_z^7xg
z$(FW_q-=?Oy?_67nCg*Fj>ew@!v;IB>K+9N@uKX5H?lBuS0?@OQUvGj_5{0U(V*e<
zjZuvI4JjAx>ekr`z6hl(QoFUB`#UX+gbZ{OUtyp8&@?rg9hHuEx^!XogEgdN<1V`3
zzW`#^{Q|~$j|Rj0?c~GF*F-%+hfG{<MW1;o!bcNZvOU=f8vTl3V(k)GIdp?8ar%#0
zaLJEfWPgtPFkokOJ?$T<3I0SBUoU6&&98&|8;i(8A>-M#>J*(F!sBMLL*U8`Fq=Ld
z7G`9{MD?RQ{azJ9UP2@Z(GDei+7w*7cr$PG>oD1pyMS}C4yRXtG*H(bAcbqz(0fNs
zVK`KTA6Xy^Ww%aod!}g6qaTpm(%%P1<bkZ|O5+yUC6K^%1>{PIz@0Y9M<<&UqF;ZH
zhTRCGe)~d58sAT5TT8I&1J+>IJOf8v(<eS7w&AiL--)_y1<BJ%q``gS@b>8|tBg)@
z@GuO<kB{X@!O%&LY2z8omPxeZeHmR+`HgvW(-ng`7uY7RLl&+`g78mjn8#{k?7y>k
zCR&C#^Q925<N*CA>WatZ8_2F_zp>6@2CWQ}B^#TL;L6bJ<kHbc#Os6v+;9=$*GD`i
z$Df@dai<P2pZ9JAamTk**Zd=K>AOsfUoQjKwl`MdXD7kEv1N4DDp%54?f|QfMDYqI
zSCcj2Dwr_p0eRToCpd-_p!}OCi3`{Y+0L%ee?=b}i>qi!mn*nSvrP4sV7xtN4}`s(
z3K8krAXU7EYdaFnwdRe2H@`Hkj#XbIXD*x}^c})iYX`nvArO}B(1snKBZ;$H8tt{P
zff^eFh)FdE@x!{bAVwK1MHHyNQUj;Ad<_w^n24Zpo4IIYMU4F?3+!JHm^XbL$VVLm
zm-EXoIo6%pCCvh-^BN$3!Vlkny@Hor3}L~?VziZ$0Zo5l?sU)t7}?$Q*u!*UvdtJg
z!%x;v5>+I>hc>`&=RAyj$S`xPqe(^JCoXrv2FCGd4rA{hg_(N-!0zZ9@*tAJ&hPOs
z`|3BK=lW<js{uAsjZu!1Mk;WDj6Lj_3e|S(ba_X@dPfPFRA08K${Aivw*!BnHVIPd
zV#^!^UsjGdj68IO*zQPz+0>ZtxZwm7BuwFX*?3q|eE@C*1%v*m?=<V30tBUrf@uFG
zl=xBy-Xq)4d{Gj#{&a%ZWr;X;TQ6C-I|a0E`hY^jJirfeyyuGyD36#UFanXrP6(i5
z#+eJur2TN`WguGke4r!zYe39%7nC@TgH_YpN#api{*$XtgU786@bT9&eBl!c31;u1
zuiXr+zNf&$i)X+*zaQJ@UWSW{B=F1ABhVElI8$=xHhlhXsldKI4Og0?;r76Bh>eT@
zqYX`{aY2%=DT{%~sX_*FVK($DoAS9G`E1qNO#a-0F;p_sl{PB<MYF}v*^nzDe8H*B
zD7!Ha>K817f-~0OrM0V}ZlRntwg!OrIRcE}n@LE^7I;vO@T4z|*IyG2QMTsb%qv5O
zO(q_<+KY2u>;~_`A(F9an1r3HwURvM$=+RD0F44uCw*BSIj=DlrffE3@4B9_I(1pd
z|6Dhtu5%mfBO`MeF{4&e;@{6CzPm~s0`1YPb`r$SumZ^t6|%<rJ(<_O6!v<}hQC$Q
zi5)Y{)GV^%)rtZISD_|b_g^T{2-Amc_w(T_2_?%!C&Biu3*g|&S)_KaF}vFKt`)nf
zf@_<c4lj#%_!+B5nu-PQxBN8hO6{hDGX+M+j`6}y>jNS-bu~#!J`WyoJTIf8L&`0W
z5Q)ICP-7QkIk;C1uF9s9jTMQU&(~&%$=4(z+Pk<NGH2=!YYA>{=O1wQpBLDTB;<XC
z6s*ypOvu?sb)qLZ&<=>eEw)aORVyJlK9ICXr82Jylc7~64Pt0Nzfs8T$0&cXlG&)k
z7pk>Ee&f&jM{Oz)ZXiXjhE|c({ljp;HVZATU*fLC#WDtWYU*=NjACZW-C|bIUQ+Dq
z4OjjUt6jvMnNu?!tgGgtvL*+LlbxXb<w#cjP#pE1h(bTb0+t2Hp!HsNW`j~G`7o{t
z<*GjtR~-eq>c3JZcCZPvCsZ*C6IPLf9xa6H5g}0n(O}nLLdzexg2<D6;&Vv^Ch5As
zK(IGF>gXd{S2D>R%X(g4F#xhcxAB1^^hg<d0mF?cE=|411;>vfZSfO8`=~#6r_~mI
zDLB)b#K#s{?z#MV-UZ~+z3Q&rGzAl<sdRev4J!UUgUn3S0LS9dq(|Bf)<|jMrJ;B9
zPIWPPF1dkhSR*i$+GN;HPiv4X^`mbF%b8%V5{`F@LHEqfG=8DrCsdE;c8}k~Pw1X>
zdF+aI^0Vq38MqS3NuF-yCW|P-)?^#Jswxk5QN2vT#ZgeXpny&IP>t!{xkyxyjG3T7
zR7`fWhKhGc+Dm!X{eV1vU$c+4a>)Y2%|z%c9A!ht9mHQMrNpvp4x_x}CUe47$Y#$^
zBM<bqph1KR1SaK>H_xBosFmA5+b$Y6$SF3c2aJIF<DGc;%v0un44sKz4Q&{Pqtd25
zrM=XrA_~zq?=uMzNkS-;tyM)uA+)Dmi#92xR8+P|HSarzN{C2{NQ+P+ONEf~&3|xy
z=ggd$_qp%qy8c_Zl4XtyL&rL8GUYphS2}WYQJ>r3vg$Z#(*8t(Z(b(JQ@=pCsE({%
zS4!xvU&P|`Lt=HLpJ-h>LXt~Uh|zU7BDQ~!@D+xTAT4S7Cg-`C5C|nBmL}}%ecfc5
zR2C@>=_GeY1IW9J93NJ^f<*V7Cxt)mlH!HY#Bs}ddheAslBilij6+SK&F>IX^S*;5
z933H(tupkh@dbG2WD@zZ`~xvr#FD(+B2wok2E7Yf*}GpKl8HhYn*ZYnc{vyi?{!K@
zNLn)yb<Zbf_71T>((aL2I2=D2{7Kev9sVL0Mf%&_LQ=5r1@U{v5LJ;nBJ?hjcnWCJ
z6COtpUABiB|MMC)ZNEVhYBQm8-e1u4j3VXgnJBWP5{4%`$eqR;<l)6S_D1_-Xi^I%
zdR)I<$+nS<tI%xy@$cC9;ANuAq0-KsOeFVe-w*@cd*rF`W$@gWP9hqUh*kO<vg8ZL
zd8kcB5BE#J%-_$6tj=vV_^B0UxqB=o=>c(?ug+S;&c*Ia5=eIOd=OfW!0Odw^rrP7
z=gr&<D|OVU(6~)7vGWTuJE?#(8tWOuaSHKrpVrK;sN%we=V-Ot45aBejGoKcgCN(>
z*=={0WeeX^Q>UAW(;gK#<Tgs*P9VfW$pGX#zaitzz34y!x9j42fQ|E;5AkQSDT#td
z#A96!5!&C2jxOfjljrP1!kmM8&A(~De^U%@N6&*r2e{tb@Bi2%_xac>*L5MyHU`VJ
z8-vwsUz&e2AN+o421^6pp(kd|#Na=EnDJi`$Ao=c<H+?JZ|qKGYTHdIty}}J*HnX9
zTYoVp6P56@8)spI%Pv-CuLiy2!W!7^GHPbw<c`xhZsh6cI<s3%9D{AE8*^Ds8+N+h
z0kg3xh#S+z8n08(S7l+CHm{qqS-zD1AWyMXPlQ0}6CajZp$ke2X5pJjE8#hwPmWZq
z0qc-YjH>fZh)j4)ZY(hb<CTAr;i3$*ep(2376`+Ukt_(Z^FYLV7Aw3u166$YL)V(3
z*cEe&koWdH95A<onvsyhw);!tn%c9BI$t^p^Wt*O#i8WSja|sMltucw7paCE0pLx|
zf_W{NmRxw7(GZ-A{nhi}se%()VeuVgjm}|ZvkSzF>m9}F$5BIe?PikK&N8mimyu4D
zG)OAY<|76bl;)dl#98zvWW+2q?^HHoJ_NTQlaLGO@~9jW`jE?a|LaEILQSyKL@}^J
zJL$Tev(e^ESMcdwz;)K=)3=8PsrOC4DVb+uOof;u`Q&g6ou2&>J>1Hm_X5{YwImO0
zMmZOy0oOAhx{8#4i6FJ<`IKGT98wQ+=(xLIaFVDFjBWO%v^myEf%O8G%?shJl<a}`
zgDz0$JOid5lp_P}zi6Z3NL;wd1lrkOsJws=S7lG9^H-+R8Lw3#F-#qNH(OCJ_TNG}
z_IlvhU(E)->p>~LcTnPwPIBmH7uo8hi3P<P!Adn6&2T71d5e^gm&F7jSc-aLX-IGP
zti-K%Uzrz-o+f>3j-X$Qo>2))RzP}hA1(Io7A3ltdu}+NfaFUD(c}?5`gB%4vbOdD
z-a8dAcoG3=zx_c|sgO+DGmfMWxq+LT3%R#01onxYVfO|cMVF=A*fNd<eQerJ)X#Zx
zSDx~Oe2%Lwaq>0$@ysGvI$#1X2OhE?<~|@@6^mh>V<K!TSVL~-kK&R&qv)^22r8(!
zjU@Z4(EhyX7Efl|^BlCJK>LO>{-v=S>S7Y$mhcbs>EUtsTqTTnKWFnaKEFZwJ0GIj
z4RetEzhT7pSA^E_*N1s_XCc1ZmYZWEknxd$@W!>odR_>tx_m$FY7bc5(Fy|A9pfE6
zF3YouTTSG?J)%Xu+)(3;TeNtKl?7X$MhA}?61R}~C`M5e=5#uOVW9+l^-(&!YK#Dv
z2xT<VX9RLwhv~xR5@cBUgh;x}fIeGEDg2%w2RL`&zrX-^0QT%x&M_RhT8PKInocyI
zUZC4HY=*Lc@8%EYo<tiwonbhx4z#ilkPDLvWQM&cIr_VtXh(57ZD@co4SJ1jb9XU+
zB_+risc<6Od7H`m9D%<Ec@Z5wWopISpV-omk7MX{<AHroSiHamr#+oPi>~n_Z~H%?
zPux4!yq(o}N-dnRi7_WFA?NUM<|-7*t{^LRE+S`qrI;plPa=?i1$!^<VV+VWjPC4>
zXnk7%S*PDr8~$ZG(J5O;23+gdz#mmS5Bu%JNbe{(uCBu0Cbp96;j2i=v4L8p!6nSx
z<X~2>CK_ihQ9^Srx8W!IbjZo2AMmgFN+eBMjzs%!Ahm~^nK=Cg<QLyO^v3Eg7zxXw
z%B?w2oNtF~edR#NaSN!F=ddxlA*`;I7+RTohOPN$Oj4iUM;EVH!}V$RvD8CXJSRRD
zn+gu%OQ8?Re?m%Rh}uaC^n!@B+d{I}B@e$*)}p^9EoYup&mw=exWcFL%j}5LF!jps
z8BudxZFVL(m<}^^MS_2~fL8euG8ibrn%GsN19J+PLhV(w{hi<VpII4hO}4^<8xPWU
zwV6bI#~ISa`S8S6Eh8rj)uH{{K_Xqhn#kt*;`b#xi2kK4GOqLttWCaP-E3PD>$8^#
z`WE861>4yjf|0~uPlA<mumFF<Vl4MelgPxlk-F2a_;w`&?q61sTfP3|=qm{}Fm4UW
zzjKBJ`nZ#T1`$v(o(`24PLXBz`?0V6Anr{_C3OmM>{>@@-a+A1d}Ea&oak^Qb5!?W
z*@tPw;GG*Dl)j3m*2jZx%r&h2EdvcJ<zmUIZDiYtUNRsuiU;n+5F48{glD>zhz#YB
z<}KgQWg9y@u)GjX1=zraw;^POnLg+RY#|e&No>)9I9BUe88kPzk~LMWNIKe<9Dm1o
z304=9$hZ5*d1@vR;Y}w?K$0F>RX}3BB}iDnC~h)v!eW8K+_k93-i)%xTlhoB!>@+y
z=<-%FZfyiz){|7=6JxS6@gkczB0~LGR!VC23z5?42brMYM|k-CMzT8X4cV7>7fm)R
zkiZSkaE-Sz?@4A5T9{mh=BP#D&>aLV&6PkKIX}h$M**z!;WJ{mj)3*D8N@cklFrM_
zL+&I4yQ#m2?_sStyW=}`{#FMiYkk2yNSA@iOIOg}<r`7_7w_5`@4w?NMIk!nMicJS
ze2R3<RCpU##!=;~%JI`5{4n!JCS|fo4=tPM;CjsqvCZ~-SZaAEl3kn%-JudZmA&am
zkK2n8skw=Dj_}hzBTr#<=RWg+l3YBKd(T$dRe<EpIKJw#<47^57Ol6?<i#$T2H9g;
z`1<AoJZvz*JebL#saQn1R-9%(#@A#2P(dVeF^#gx{YH|%YtlN0&eF4&+p~xGr77`(
zx5Ve3J8hD)hTih|Ds`cb>yKrKkv%g6$U|cXR=UEGRD0cG)S{}GZ1r!r?T<G;qj&@*
zF76`Vl*gHPbrrNT*2Y}STY)$C<TM!bNTSOhJuolXKTNNi+=sq2JtjvsEJXCI?OYH2
zDsoCZgs+?xVAuB5A%p89++4~N&;M@9)BN=mw_bmQYi9D{KdM92-YQE7O%)^VYpT$V
z|9Y|M-Xh$+Y#CZ_Do4NWD?!)21;|SN2W-o)!$`|xFC=Wns12`Yzw)`$lXKJ2O#2PE
zZHXmrnC{0!c6yP}2d~k+aB*_h*nqXrse`{4r@_yGD;R87p^|K2vS<BIe5$4vDH-SE
z%UqUNEp?cr?K0;n3%KE?<44$viyQF4t`u5ZS`!Czy)WioH?zr0n&<OJhBW^;hbor;
z#S#s+$fh}$Uh{Jpg&6TrwTm!$5dMdnzhx=1(THIem0W@gg7Gl@CXef~h@cfKop@`$
z@Tl(Uef0iPJ>JRbG7$Qy0VFbp*uc!2tcQyi@)>W$ijNfVJFU~^2V`pLt`lczvFvkr
zlgJa4@@pIS9bQ3Sj8CGO^<Qc2S*l3v!x-kZ7SP^rW!e0&4EoQrXj=cyM6G?|8d^Jl
z)O>B-TiV8-heWlnv!b6)Vt?Iks{4KkjOrCb>3tjE_3j1(?VIf5y#esa>m0aO%>=(O
zMd;sGNsc@`h}Qf{h0N1hoKsc_Odq+xvGcZ&^K>3OjmU<k`yuSTFE=@Ev?A}N%uP65
z!f^y-)abRl;vmaw4lK*8Kmyu1z;=6+q`@kf-(w6mUv|(TqH*v?w+e+%rJ>JlO61Pl
zAILZAB`R8Qk@Ks|!^=5Y;Gp9OX<m`^i^TJ=W$-_&7`7cYhAHu`b#H)8T=v2{?*Xz_
zGIX6@9(>>Yhq+Oa4~8qBpgju{NZONP7?A#ncwgn<uc$llZM_Y)&-uWla|bkUYX|Xl
z`lPTi6pD6?;j-!C?3npoR(fq2c^2r4?mC~P=QOs0Yvyf;v6sYpc^<G~s1W!))nLc!
z>Ga+czN92m4JKC>z>Kw~FlyP2Ru|>L_K%)KMx`H3#%e&>YcD7(G^GU_#=x)q0r~l|
z65`rK*f#F{PhrMlHZCk2b_<!YcI79K<){5n^4pHJ-xdldO0po=t^jUaDW)lt3eZe>
z0a7}n(6a3p$H4;jPC3UjvdjUgzO#@JS`B+j2f*N-HOsqt0>&NtK*-OXEPmGs4cLJ`
z+It5~Tr9|^mIGv+gA;^Fd4tsMA^5et3Px6B(Pv*2!1BUAfWI2d_m9zFMQ4C@&MD9`
zO((YxXQR6|-7rJC2fl552z}3nz&ouMQ0E)+!l?qplvGGlz!Ok3yH6b67r{yK<J{io
zMeu6QW>rt7L4kM%+F4W&_U6xFyKfO0o@jx?UpZHNdpKN*_yiTpf5LFB9$xujKYcFv
zK8p=&h=dmlvRgChMJ@+u^&jV0)wub*c{_HJ^>{V$pLd?U7%)ihEX*Rabp7CGR|>2P
zdJJ1d{;~@;NwbI7zW}uC7;HVC2zj$Tq4@Y6ko5Gm=y%9~|AK?yL-lmtLX#>ot5J#9
zGt@$4T0g_X@?28F_@LVQac)oN9UM+oCfe6}7=@=bu&K2NP1Ih&88@bpjec9O1k&ct
z?2Ad=<HtC_BM$M}5ZWQR8{7mm(M3O1vZGLfL`p0n-3!vu>b}*u$aF6@jvc}&GgR1Z
z!ke&Kg&QbtNoM#I?y|}~Vi2-jfG8`h#od7$QG-PT_VEvblTW9i$Sn&|+gJs@Uity8
za=V2G^!o8BOHoFn?UlL3`A6vI7BwQ$?|~i-Hsj~kK+-F&GW%ro@U%k_$WT3++B#~0
z4)f<z9j;>NOFh?TbiYr%i8DuXgMy^*>0`XgX^;8Haa}rVMi-NE#2??hFG8&Nzv0V$
za>P1D4ZPL+ag?VIY;6_-SCd{`KySc7b}`Vb?7@8TbfPvpWmEW^1S=Hq5;@-;fIl2Z
z?D4EZB&1M_H@rTJZS5|RYmHanX61Z5Z@m^t)zKyWheU{<gC2?TH3mVE+xTN|KB_n>
z&l-H!gYC>Hnd1f!OQP_jt8Yn!Enzxk__6SeFZkr&Ur1tq5UTlFQf(<*#*$VisQzLM
zFWgN)mfP=h%Qb<NJOe11Xh3h+EyzW$5&vs(0o(r`BJHn2NMceRT?k8tA6sO>qdoyt
z;%s2q+)9>C@;BQuG6ZujF9Ao@GWyDu>qLFG4~)B6!_br&yw7xpr542~F2V|C2W!C>
z&fTHfo=3ixJwkgf`Xa0R3+PV8GiH;mChWK@fNbTtzSLh2^m>y3jc2bw?v^TWVdWf{
z(RCi_+)@P33>9Sd$qgw-wNS-JW$>PqU1*VDG>$-r;PS{e_{nfQls_?W^i(9;l-PiF
zr>ufq-!C9LtuOdyq6i$C^@`Lt_<@htG?;F1lyt>b(}#*T)2|FGz@3lt^JxD@W@nw)
zIWc`O79<DLX6e8!V-xCS+gcF#ev90@d7cEC^rLqNhS0{}-%*V<9~8`5ih_@xCGXWU
zsoBH6F#S#dIx&4Zn|E*@+0SnY$2Fr+^sbpai?CO?rQj$Ip5_Ew<W~`?s2`M@z!7+&
zZclp@0J>~z1VzWhVaSmIp$;v0zh?wVKa>H#3%j5r@G!pjZ#mE^X~>exu%o{RB4sBb
zxL8>Nl081)WYuooTpCVWCMBcQhDXS&;bt_;xQi_m-UrPKnotmJkBk%cQw3b!PECZt
zrtEXnI<dK+Il6(Yww_OaH@uD7J(R&zu(@^y*DE_FJ|7+|*a%PFr892ozVKyWEvxO4
zNLGJoK}s26=tS2JM&D}yX(x-JU^tB8C<T~*m*WcRheH2C0l0mKhDTc~nHi!Aq_RZ_
z9anWhH&%yJ|Dh9TV}%rRKIkW!+u%<OH0pp)zYcvIqq#gOAJ;Z&(x=^MR+TP>74gZa
zSx5t3UE*d#ZT#%vm<~qMWI3}PS-@54#o%{bmDXJ<M{dyf7$MJ(Opv_*Oso!O_Ak)^
z8|SZV?Yc(v;r@DNNAOx$H?F{DqIq!I%!?IW1L$4WEZV*#8yhasAdXh;==_FFtcA=!
zv}sfTj2=$0Hlo{6g2Yu!S*;?4ZK`a0n*fOjc+H&C|B0XW^fUg=`M_WL1dCoaLKZI`
zGd-Rs(1#bA<Xi9#HlW81eNGml*2U$p!=85N!uv#?UmnMwiAW<ClF!1^Iz_ViVicEq
z&BMZebMT4IK+^j#kh*v2EDk(r249#S2(bK*2!yVpcpEdpePINpoAv<v6>8zuP(8D0
zQX!1B&;X$x&!Zc6=#uTpk`Uw+fkn<r(21FINK^_xdbnJTd@)%;Um4QE8mrBy_;Gv8
z5>INL$7M*cRjFO+JAtcz7GSkS3S7S0$*5#*hsY@nUi=L^D2uiR^@uA>NJ1(|ss19z
zn(rXbA_;cW=b4}z{DajA<<Xl~%Fr)%&4nE!FY(Q}vPA!546b>tN^gx%r;km%#y*o5
z@r89+_*vUp;#wDo8Y<tT28XLSsm>Ca@TF2qY^PbQ$d03bpNfH*PLhm<&TcxmxgAMP
zRS@RhZ(N}mM+enf;HcU_>^ED69Q1TTo=BNeNQlP2mShtgzZ@sN{fBct7UQ2v_GqT)
z1}u8>7xw-fhMWB@QObIGh~hX$m5Vf(7Dst_alMDR^}d`QZ@G;0>QAtGW)4X2!W@fP
zruT?T=scVw(Tez;bMYryAAd>skIhcO*neRqS~as6iyzIvdVijwV>aS2w&ny%sjbDw
z%39DH=WJv>@)gh6+lR&-+PV8VmeoGzfcl9(BsJYdp$(77-+mY5SapXgl)HlR(v^u&
ztxrwRhfL;JoD|GEavg09Nnw3Ce)wk2Nz|`g!}QVbsqj0E=zPH(h|u{91p>h&WWpQX
zW!0j093$OOQ;U`Pe3>LU@X=P&ZX)N%5o}epi<a41!aQDm9VvTcVMi<o#e=d?*b<AQ
zAD1ANKWflq+*Etpw*X)N_J_%;I**Ii$*^CAgy37r2zt&h1xe0XRB`!XI#5oHKH?<`
zPuiTx#Y%rHWfDNoysU_PQxe$E<!QKNsVXD%Y$yIDNuje{x<oiwhgi1$hRUm5Ow`q7
zsLOmcI##ra82N~>iwDo*3VA*9VG0p}#Cy0vB@rjaI)J=RHnQJZYHn4m#NOk2<EH<e
z#}39rl$mi7d(%Ra-Yt=DT4FE_S=}$fDFVri?@7+l!Ba$9>n8BMwc03f&u>b?C;)G}
zBu!#tuENyrFIf409!?nwK|-x2M6tY+V>{~6xr)bOp~WopMbjFD=Vs!PrgbQPOp-K9
zyrTA4?WWq#=HT(4^N7ZV8ob_c2B8KMDd#uN>{eEToR+jB_f_T-9qrY%pF72o`SV(E
z7M#GzEj?II>^0Je48vcKV_2>e%JM1kk=tt5AxJ#~whl#+u-B!mX+tShI`RSBb)Vv=
zQp?Dmm?4}xM~0T%b(gqJPei75f!OJy6S~^&PiemrCOyI{NPmhV*|o%x@Fir^uC}gZ
zThwW^@xW?0X{1hS8>B!YYYe|h3&+WdL-^dlTH<1ANZA<clYU+Rq<p)D=g&OB$jqHb
zLTty`yK%?Jhc0ux_Ma?X7Pf*sJ9z+3{PnF}H=;tKH-5&CZp4!873p{nC&HWhk%;3%
z|KadOH3Xg=V}$>nWwY(X$uIPXsB0$Cwg0w|_?9x}z5GGktG<SW`VSMA8<Y5<=wn>M
zGhh!dk%o)=L&?T<Mr2z~1oW}5(a4TCg6}J1$+zmHIcf}#Dvluyd0jeb_B@W=L0I4N
z5F!<+!82Gij33#VldJDnkgRxr;H~|NI~WJ-eXIoEO@7K`N^7%acard(L_N}Kc7izJ
zXkr-VfUAbSup&D}dB$DJbZG1qqHAYE%F`ryrcyw6A2%R&u{CVobrqI>6~_>9y2Vy{
z>yUlMLhJ<ZdaaAmG*Vl3ruK(QH7Pn7OUr9)BeU!r7`{nu?BDN8_*H_5@bxARW}S!U
zEa}5%tvJ@xrMLK1_f?|0JqjnqHsD`foowH&7u0qQbzZjm5~AO0OBc>thb5A>GCPN#
zlP?ncKvjG%RW_mzG5lQZ{^J!!Z*vGTvG;=GInS9LJU-mBY%$*Z@)H`{MnjU47+m-|
z58}7ns#V+&$XqVl3AbXzkfFUk@O{1x%O9&?Y3YsZyRZM@y3_nHbS)owD&I6;9oK*s
zWvP=*Oa>Lm$7NB|f1@$(9^2ilhT=mK(Q_v!+!qvW-fjFHskppF`&ODj>`EVWygnPO
zr@upMf^V4VD=op>#zs-cEETf8>NzFS^QHFpwYfMv!UJ#HK9h03B!iL;i$LJ7&49Lb
zFmoK2gT_!P^|WmP9HCMuZ`u<b%f5ymXIjE1z8Rp^W`UmVPD8uX1W3Ut7q}*Rj>+8^
zi~}O9L0eab7I)c>w(W_5EUr`1V(Jg-tr2LW3XQIE^IM40gu-*Spu&HnW|DKfi{%fa
zR!WTX*Cdmseipf?hNFyiUPL)43VL1cV(}C9B=`3tG*?7}5a)D!=Uga}=)8>XP(PUg
zmn!rt+=V$@ZNfG<DItENaoiW)i^~g+vk9A5)J6}?MRn77`1HatH1<}O5j=DsSyVk|
z*4&?s-#bR2NJ$kUr8LYWiy300f@IXY@_Mbz>LkXibr19{c4L-(?K0bFX+m4LbB@bS
zc{HkehVq-$jWhU;6YT?;=%o+G#n2XFYg<Ja@vU*Sxz`>bd3PN%jkyK2&i*BsdT7mD
ztB<H@<X1o{hV>9V_=;6Xdv2cb9GQwAWAN+8h0I8?I6(>bk^B8<tTeuk&REuf-3BH(
zFS{tI;uqjN!t?2~x7VV+@Q+C9RVC8E!OXr(Gl}UhTUblmv&b$1)c9sYPc{#)FgItH
z+uuS*cdTdqi<(HpIOhX+VFYQ5vboGrf!(d)f;D^7nH4!IxYh3xg(NrP2M=5D$e&x(
zt_FX6q`Cyvy>dq4L9OOxrw_8H56cqaO<w5L>lt)&;VtsgSr+_ab0Kk27<!!TL9bc;
z0(q`V!GhN@-X$kUhs3(!6)sgZn@38>9<M!AdHi(FIn~CPxK>bZ|59+r`>#xpv^?tb
z6(ReVn38enIAr}P1^4wIL-&qfM3+Y1BXNz(Fvq8uIyhd0KJaU>KRG{L%!$oBmy}k_
za^2##eJ{YzfV*Pa-SCAg?zlN>1KMxy3et~WGE%G_u~9fjUT^z`HXOf%x`h`L+vKC5
z?`(nOyCsQar6Zaw(k4;+#F;do8|2=+I5x5B2cDZ31)GKo%>^DOvkiSxBzt)Y6=Pq?
z@JpAmOE_2J2TvC7j^BdABaJC_o*pdul!VXqm7;*jF07CxP0n=QL6?1-(T<uNl#nG(
zuQ&RH!dvz50&gc)?$&Q?CXmeSX)U6KmY%^;yZ@3?sv%_C#o6p7-KXZBnQC}eb`|sB
zVm3<ddPQ!xN6_b9E8#UycbhkHXXMy}c_^0uB{jpL4DYn~fyJy#(EarH%-=hkd4C!{
zqw>AlbilSDbIJKuY_(;T`5|{@I&bd%+R@Y;;A6N^Z;TtB@%9nY{>v31j%hOD8f_>b
zz7G!l7Y3qfg79Wy2TUkLf#n@9_OM$Q+Q1%x8He~$KezwXWE2dR*2743)lBsLh#Kcl
zEn#<@UIx~u(&>tW(NJHo7t4mPqyE~QL@B*nD4SFFDUZ0-u&gGZ?Wl@|j~vr6>SQ^&
zGP8)=sW=WNbWg(eee03b%2H(h?;)DW8$rRZEn$DsK_pwN$DZp6C13S4;ecy0RtR{A
z-ag49FH4s|(Vblozh*52h6}Q4UACZ~u>zlM)Q5wA&!d0EPl?V*D5xxmhBaD7u=eI6
zwC>MJuv&48_#15F_WEDJupH;j)jJ4~q{WV<s)6XtHL#%2kFAc+fRKqYV(_h+q#CS%
z`ENsDMUNkhH0LAR@^R|;WFfoy(;S-rR4J9gb()(#CQ_!%QrH;ViAwSh!S3i-NDrHi
z47<d!(Z~%lr1}`{aDByp3#X`&jmKHLl}k~^`Em5EWC>jN+X5CL#;9p#3^3x=M0MB(
zNz6S*jR-s9+*N(#R%tAjdiIQ|D-(gNJ#96E(luo1!#&6}`U+b5M*?8yW$N$fCd?<;
zPFhQkq2%06@S9`BD!w?1HjOE9^ZAb`!v8KEP~(cSqtlS2R=@eza7`|wziXCT2CU-o
z&3IXG0tyK~12w73>GRSV=(eT;tZSD=8mgCS?b797-{W&g*Y6g7Rlfu+T@b}isqwQv
zVk0pQ9Y#yNC|LOBAGjK*quN`am_)$|^a(A3w(E;A4|1tP%csNP?baaAb0zBjYf;tE
zM%3RiV1904GUc#Yzq-d}JNG=~+|xhi(lxdO<*f>5W@<T->8VM?zG)HtPK%Fz-tvli
zkhGgVGqWDg8sPTT{~bb<Wqs}WfflA@u?`G#y&yy7H;}PF7_`OpA;OCf)P6035z8C+
z!#_=MmgAvomz06;1A}`czd+NA4P=YE7)VF~lF;2kw@aTz#rvgM&1ZH@ZSp4c#aWQN
zlRVFC=@X>$NIU#J=?J2MsSqr3p5F6^2X>m3a7DWS0w1|TO?p0U@!1<>2b<vKkE3wq
ziW_KU7DHv)0Ll2#2#*ikhQA&|sI>nfNEY(Z@0#sET27S=7RmGUEnmaiu9uK;dn+`n
zKLRV@7<21bh*9G_hCXsU^ZX8&6R;HAd7AM4r3G=h#^RXdXzq-A6n<XwgzCOx@J}s-
z_|Qpccv25b7D$q;dp7W;;|H1bcO8W8se_zOZ_rp(LO<YTfXl;|=7v^hz}$pztd8gK
zcJmGB|B?V#e_e%n>d)cxt!;2M#evA{t%S=P=d(3;R-$E`2R`nH9PJw11SDb?tD$m~
zE$=u+{Z=xi&wMN-!^4SCy!9p1#(9)SWWvFy@fJLt8;R{7@X^Z#+~L!|VDRRpg2DAy
zuom5b&)P>xiBuizm5Kn7*#$&eb_xvMhtNw44?uBEIqbc1k2R5xN9w-uaAkG}JWD=8
zKR|nN(fS%N$x1cP@A*unTBt$C%T4IKz$G@Ypn%bmdy4+dS7b~c)iIU_e}W$#Mv1|~
z5K(={{8#@>oX|#Nx1+Hj_9Gn)Yn|cdPan8Fp;F{77|X{0RDsvBdr?097fnz~=wpf;
zxU0?P9CiDt8(bD@_;3ilA2dM?Y6r=kM}DBHVFjt@pCbj44>)t%V=6aS3?8KO!Fc34
zXpOXmEky?@J<C$?HEl%K)}-PGFV$dVX(Y6mrBWvAjA0Gdg=b}^tiXFu$R2!;Gf#WL
zpK_phg0^gYl`Sew(L#EQ2GO&fT=uxVhq*kqgz|c(!uzzGbK~u9WJE7n!y^MZc2{Ho
zGziynxvd4bXnQk#<(pWWxf|h6+5ohxYf}-+?lb(!Eb^#LMBPi$pkHDH@7bUQ7VpGh
zGW%^!IyZ~Wm~w__2d*dCpG#>*&V%Wv1!=K{D&nno6*L8BvE7w(nXTa&tdv+iX1-2<
z)HY|>{*wi{lgc<ypckDQR%VxFhJozPX<P^9BI=9PCEwn*pb%AYbW0=$vVVI(#xFgh
z@Mi{ex*vk()trO=wh@^6h{2`;84?iq6m`uKLUWcz&>c_0A@-RcYxJy*oA(*B&S4lP
zX90}I4p3K4>2i!*8mjkg25XU3a6Ho+F2yL3sVE=zhHofp`lAD9792oCwF{{li6L5y
zg844{;M4CGYQvo)^r;nU>`aX_@Wf9Xg_R1y>nq}9NxB~#5BZ3Kmqx&*Q#nL?(jR2b
zX5)2ct{`zclw&eJM;Ql}gUqlyH2&9uW_s(w^Y@G4N^B2WAWpMsGh(?+q7IKca@|<f
z15jjenC<+j4!SCzz+^ZUtyz8rWk&*?<eWrXcV?nKYnD36?KY9%&7c~04E&#7q7R!p
zLub1w=oK$OOGDqIYwZ`&(V+}-Nihz+4Nyi=9|yp@r2?#X?q!d3e?~n8_bD00DB8#T
z4bt4B&o<vX3A?!&HQ(K_TDy~$(7C*yF>2F;14mULV|Os@<lTlbOMB@5VF3qU1|jD_
zMM&R@(Ruj}^t{j;X=_Ep`L%D+7yo&Hzf6Ixc09Pq$3n3AfAr27TcDu2kbSkH5>0-6
zj}Gmxr|5Z3Fy5dBRsYgp-Q!{OshG>!W1pe?A$u?uN<;BIA8`B25YW8l4RUT<3Dvs?
zZ{&7%)=a2!{0CJym}&?Ywo8EFPbE59d?q6Px+G-#40zFB2Iey}(Apg?aK<7NW%otl
zkNeuthmF4}S!M>*ACH3m+tI{rb|DN$uHp6uQX$oOKcL^8$hS)z-btmiZ)eGqht)^O
zuYoW)e0?u;Hu|txqc6!tT}L`4IG9vy7GynTZ^A-jj>AVq;%PFq=v7e+_>PMMofUyU
ztr#IZj;$oYF~vUguL7n1WN0uv0>ba#01;RXP1BuW^;A50#51Cavl~kJX+sV)r@+eZ
zL!fS-io#at((?CB;L=hp+HL_tZx87~+|fm}_vkM8{%-}hcl#MFQ&<a6`MFua2UU)r
zwhN+zClUJhhxry22k&Gu;QhbnXz%fDP%hez?rCiyH+5X$_@eW0a<c|}$gD-K4!P{3
z(k#f2y^r^A)Fk63(a`ra6e_znLAL55j)~Nb?%JM$l*;LFK_M8$pDV)Z^)J!%T@=i`
zwTko^0xs~p1k2e?sIu)3O8*uOd8Qj6*VqZ79z92w>WvstxyvA8&Vn_Y1K$%@LhSSy
z@YIVTR24=8yTg%h&^46pybzRMufvGT%LH|L(SWWi7)m`t-Oe%a^kD&G`CuVQHw%R@
z$C>7NR|Mc96G>vUj*!vS{B-YIB`l;Xgqoh;AUXeZiQJ_O;_Kke#3jT+jc^{UKOzfB
z@js9z_ggJn&*i9Qr(slz`wS+z@KJ6(q}X=BzX?0o`*AVwrPD;PDFBjrCg5LW4bIMa
zFhfF{gzsyp?GrwPW54}F|1<zQiiv^6w5=SE?<_eHCrjFTRq@|>+<wrY0+)phGB)>@
z;nms#l)rokuAQAkM#uV@eP2$JXqRPVp;sW0RC|gS78IcY!QHr_Lz;+rPrx$u=XgTB
z6QldaWQogGwm@z=?Rl~uUyIQt4K_pgvsn;9Sc2_)znsWRFCkTivT(cT57{Jfig+q<
zojc(z%)2#1%#8i}Z~@hV|K{>)5AGGk^M0LR(_crzt*iw6b=MNq+9*l7b5&XUb)h(5
z6+byT7*4hoegucP3HU;(6SICzBTn$8uys!c?D%C@Yjkiqx$NGB<vl;ujOm(_?KkX*
z`QrkpmX2fu-1h-)T0teC!#MM5Ed7hiIAeV_(4s}$h4J4_GGpHY_I7&%s}s8b7U_DE
ziltm;Gklnwo3)30-!{VRpg!Y07W`yGwG!De)`kO{LvX>rBlOP}8<JveNX|a*rm<BI
z{(2;lsNCv>D=QpuqJaf_Lq~+ryB5IYx~JGXzLFg^;o+l7KKRf1F7^R01`?NPz>ClZ
zII}jCHkM6>{V%UTSVunC;%ks{TNUWt6@Wj~g55C(=-9jn)Wx2`_cPx?@z{A-+CK+G
zx);#lZ82O<>IrVAd9Z#gk-kC&Gd+i&L6FG>XcblgW$7@W>nFkf=Q+^x;IcLAncS2i
zljL&ur%><;2>%xf-}lJil<WqWb*3IppO=T#VRc-W&4ku$eE}Z&$KczLI$d*PCal<T
z5qXI|0wuo!Zr>#W{=IKP*18D3z7Qd0HjhDg@HY5}CDPYNEMc*^2att15RvB(+>Q{m
zO_aik@OWx_OA?6{l%_S7T7$;KT_)7Zf<AmxmELKyjoWum0PEs#(0MSE-ueAEu<LGv
za=RV$)}4e~9d$4s*AG|K13}jD3B)VR1QB^x*wQ+JmPwui$qoNNpuP&k4>7RRXgMu;
z&6suEa0n8rwQ1hsdidCsMbzXOG-B!v*%sH}bmS(M@0woqS(8m57o0;3UvM43fM2yw
z8ZFVHT4VZ7YBX{>c?x$4{y>I)3vturUg92}g(A{EQ5Req@d5w0sC0t~s83&tpDepa
zLB)Giwpg9E7t6%<2cCiF>}habc#5npoMQBxa~X$Mf{^)25Hb2!DHDq)B-MfQm-0v9
zI^#2Bljt+ZJ+Fb*TWX=d*8(VAjf2?edJ|4f<KbpM7c@Hb7D-X=U^=RAer$R>qt|;8
z-G38L8ThoBpPR}@;#Xzh&6og$ehI^KCl909($|sXz6v~S?TIHGuaXL%672eFHCiGz
zigjYI)SjETit}cM!=v^VMD5wb{nvX!RB#M))u@Ox_Rqp1bPw~2>mIb`gu>}r7Qojc
z4PKn{)yG~Q*?R@n*tI1vlBOj%bJaL((GN%2MzXN}+I4()$9(4bD43`7JEGUNKiNxX
zhp8m%Pnavc(oMRy<m|W>{3oIU0+psrWRyDl@udt3;*^pNVHFH@aRAnYwo$9oi}9{T
zWm<?*AW=_dV#k|PxO;6H_{I0)Lzp75dj+`fB^KXnh=ahdN%&RGCUUnSibz(t;M|B9
zvh#5qTR3b^{I#y&rypmryw@^hEU$@FcJUGA#pNV(?{%E7Foz7P6=Q@o$<FRj^4snd
zEHsrS>1TG31#66uJhr31Qz2x@(IDcn;wU6@T-NOu<`b&lgoqYT;a`pvQO(z;tHxfT
zncR+;TF7itvtcdKpC(Lq`@g{^rWDz4e4OO#htjDt>ahE89mh}1!`m#oapIcUyk2u3
zqJPVfWa`F{(vH2P?b=R~CmjS2*JqQ32j0QdGD$RQhDgrVOxBJPfrA6WJllI+gwL}Z
zJS_KN+vF&iAK*xCbo~W~KLhxiV;He5Od+cZzrkgV4dm|rG=l8X$hD~u;!kN1)5FoE
zQn?(867<P3o+d#XW64diqj2-AFS66~0PRLMV*2$p<^y$ek8epNbvT1K8hpYITsC;?
z%ywL2`vFGdX4mF*2!lg+7xH#r%I@KBLie7^BIfotv_&!q>+R$iU?mm!)J_vD@1h81
zJNgisE{hA^XA!xDVT?z>U-V)nAI)D@h=X$y>3_ZZu=<;s$b2D<#(h#zy%FbBYq&sN
z*kM4i55rh#trJK*vIWo5=_27alPIBUDOy@1Yvw)1%?VasN4Mu+Ks~4LV~t)O`k~xS
zeJ;v@M;n*&l+N78YSjbSZ01(v;WtVyfFK+%RD_@DznN2ss;p_M1Z;cyiV?0h#XPeZ
zWIt5Ns=Qr>1PxA7GA&-zH?3T1k$Nc;K<^^6x0$kb(sryazddtQC>%L$FrlLtNI`>-
z1);r^sKCF%SnNzHD?ZN=ok5SlVZIjO8&QDfRW2yVM+r(>&Jn+hQY@d08c1(?ghR%R
zu%gnH+RrJw(NiyT;-s(=A?HM7e4n7K096)F=hF)kIgi_f5`59_WgocP;hep}JZ15x
zSoNg>@Qry<v-K^IhT<q$^Ls7xE<1%Xw%v`DpQW*z_-DX^t`BJ2e0#i9h4bd+#j=0A
zk{JVb5J{cAN9iugVFLUo%_SZyk$WF{k;?u>usD1VJ7xa{?R*u1bN5L>{<$;kf8IPs
zeuEocuze$n%Kb#y;>Y;yqIPtkaue>#5`*H1<G6Xi5e4P(p_j9j0CAcu3o0C4D$Bx_
zgFg5ZZv`6aPsMK!ZDNhNT(M90DOGdM1se<~Ld@pH^xk(EJ-YkX{JGpXa=5IAomX*Z
z*1(l0t9miaU$U)sQIras>G6|#{ahZe`}Gj_Ye_(&qd5N7Cql+Qj*}CYJV8J4J~q$_
zM%ERJiJ6cw@4f#zy1XfZ_F(eK-Bk<d_7kn>-wi9E7S*AI>u#vsKi~XJog|ca&qk(C
z<>*D7HK@|HA33$n2kXRxsLtX#CyiP}S9?d83k+4@y3h8=+4wo^T=R#$JkN^#5~qq@
zUdmv1Ik%vQ+m7t>ydu0jdMl~*io}Db60o{_36a(iB@>qO$#yR*^1!N|ZMAYBj@_0_
zzw0hMw|oH!+;)*3ealB44mRS7VhU$$S0Eb42F;_q<A_5?srh`)4-xd}7R^%^MeCYm
zNsNvb@ek=hUeo00f%Im4@l6nJvQ}W0G|nO~{$&%Jj=Q*B<qr-NHmCE(+F`TB5j?!0
zi_%*^4Nix?rNl4Ukf%vIiHN2fxz5ZbZEJV3`O+O^NP7;oVB`{hEVBdm{hbG-Tbk^T
zdW}0T&E>qz!f-mv2><HIqns1{@j{RDcp7=YN;l3RQxd++!<5gpUjt6yRUJZzza^To
zxl&3(zNb>hR53E^Tus(B6|+CKv=b-aRixBx7fWSdfJ&)7JcE$$Nc!bmj`y+y1O|b8
zD|m|q<}V-@od1&K-i`Fidk!RUbC8*CWi%yfB2H9#w5cyC@1XI86gju+7$dsefE8-G
zghmeQ(y5N8NLG#~i6X1%mTgxl6feo<^(vAJ@4Z>&>N<Sva|({v&LPV;Tt;=Klax5~
z8o4GVuu6)W`1+G-X13XM7`YyXrN@85!%A%!@V$c8KNN>~^SklxKPT|~*2ARd`)yRD
zHw!8C&?w!v40$bFM-(jOV1fNF5aTnZH60J(3ySx!!}HZh<(LV!@{pl;=0(hxioIN3
zAj9rj6$+gprtm;E5!EjqMxDYj)YKITMkU)AE&Dc#)$g_ARKG0p$n_v7TBl$MFFUeW
z<rdTC*@AzSV?5e456o|b;Um!;U$p1~>iaW}GGDNmTUtc%J9=25`b=EB<sIshxsTq=
zy^BmgH=%cWhpCsc-e6yrLKanx)%;CAhTfTplH~2%cp{+3sx?c~%?ob8{cBmIan&-q
zZ@xZhrj~-)c7&SeBr!|X-=Tr(l~noF15EbxQs(RT=-R{_7Afs%G0#}*hfnjbC!Zrr
zaKz4gc)P(F)?&niOr6&tcY4yGSgZ?c3H88r(GYxIya;6bKBAEz4Z1lx9k+b3W8|B=
zkb0RNtakzQOl$<%v^TN57n0!lXc}yai-1e(qfmI6H;hVnqV_v>@NK(16pnpI!50D{
z!8H^7HP=I+)*WP~GM(#{a6XCAZ~`9F0KO-)TNSo|`L0iBFe(r(&+-NRJ`ae!Do&fI
zOCqOWUuah@MIY}^BaPdSLz8kSs1D~a2Znm_n@8p7PCzhvED;Eov{S%#PBf~hpH3&q
zd_lH*B4F-F1gw>qM)KPmP{kC3mb@|qGq))4X!YXw(|gg<v8U)sX$Uk7D$pwq$U(XC
zVF=VIMV<U!=u7@V*t}Jo*102x)-3%85_go4)-EfQS279#WrgrA;w%w7Y0VZ){zA(Q
zmym%4g+vP#fCtA*3&JyjpI-@bH!p+~UJp6$=R!~k0xfQqv8I1640X<czaLIR^+r1~
z_U}7N668>zItuL9ow4kA+bZ_I+x?_dVlNu~DMm+}m_`n+GG&JplR#E23StWzQFmGv
z$0*-T*Rk@<;>>xqRfFz~>(48!w!S4v1zi-O$IT%0+8CE4U=O~X!l(CDG1f-Y$@OLf
zGWREUO)y0)t0q7c<$Lfe*Q3O<dN(@tRFQ3=^ibP_6|f~$ioSE}9e(%U3QSyA;^{IJ
zv3%VHvlAm2yM<@)GW!I&_iP_YKCpr`-t3?pXYT}en?G1(*pbBERVTvbcd_mEb=X(y
z6Omf^fw(R==Jp3ZkaMo*u+O(xDza-WvCUga9e30tPT99XW6vTyrCox4<h4@I23}Dl
zxQ^?AOOcMRR(MhK5A({dN<8I5F?0V(v*GV^V8-7rwB+a<vSZ;^a>=@YHA-`(E9d1v
zidY0oyr+;#(z)86*;821Opuj#<@Sgdc4Cp~W4Pq;2tK*il>J_vO~w!DlY`w4u;v>9
zQhz~@gs3<Z=BhHAlP-cICzVNj$zOIplII+$o7t%FchGX;J9ZDYVAl+X;mIi%b}+_~
zn!d$_<*U!A-4`fM4Cx|d)QxNF3qMl9Ys{fnYLfNddk#G_c0>*-KPmG&$@s?y3$ml>
z0UG2FMs*&dVDv%`{oYlHiVU2Xj>nlO|CK4;;Fm)Be_lh>zaYjpyA(}pHniA%UJHSO
z5Av*9jTO9NnA^2~DSLtSSYs#%506+^izLh>$=ifUS!X4hx+DZT^XI|N^P!jyv4(q5
zADJD~k0M7wZJ03XVUv!E@B~+tQ1A9z!Q$@}?*DrUg+=G08|CwGudp?oUtq&hXJx?V
z$s}47pTIDDi{aje+pLY(J_vi$i54_uBdyGL=1k#yylvJeD$w;LX?k%9zMq^zJ*`)%
zdWj3<T*VA}bYXa{dan-cd~z9NkI#j7t0=ZyOP(ZG9t9oOUUVaG4wu(yLgXiFTJXCy
zJjFaJo_`q>w@0IcMIVr*?IG&ooy&-$?=q=6pQzts&Cr=qgfDK5VtdXz^TJjFJejS8
zeQlhv{#_$_L~#wMJl|N`VJv~OE=Djed5Y-NiL1Ey{xcN(NS#O~oMwHsT=B$GO|oms
z8m&5>&SkIu<oI_#YN6o+>^?04buIahUnY;^_7iE)_|qPx`}L#3OO;gHxE}K@?+-b_
zpNJlmar@pPSunyA!oNP2Vx`AhYGYU2LS}DhviVdG?o0ZN#kr^CjRP`p%IXaYm6=Vw
zkK6-yVw&;gg^g&Rq#<grdxjOP6-m(72{N^_oOGx}BR_`@QV_*5#@7Vs&M#|Fv3L=F
z7$QO*8h(ShyS0(Z*Bn&*L58gR6NBpIwz5-Y4D<HpWfXFJ4Q@L40;>q!Wghz!v(d`?
z$-cw<tnhIa;y%H-p9k#7h+ZAqTlt$ka;6V&d+f%<tlDXw*V{;*JTAoIi~pDht(PNi
z7h`eEq&OK^LL)7MUr?L59pBwsflrikel*bzs?2AM>YghO;&FK>Kc)xmtM6mme)mA;
z_fB%THXjBaWa7rRwd`;J$FeEZ<jvbM59R8lvM1?tc<bQ_Br$Opti)1**{2F0pH#wM
zEyQN^Yr(nVqu@|g4z8ldpzYH!)@Hj4=VrDCp|-`K7*_=AIcCbe#WzXG7E$mz764n`
zc(C=7mLNK4K)*LT2*x|k&>p`|qxQQQFh_JI=lzTV(d}F>|GFIQlN%1J^4GxDpPZvN
z_XX6p-UYjCu7BQ7<NL`kQS=}U;TFr_N^K@2Ps;%Xp@-<ZVHXGvq{5BdAY$^o46>KL
z!*vR$q5Ve$bY2XE<YQvAeW@rsyYn5nm2xRz(N1VDKy2&EGWb`>fJ6OfbW*JuPAJvD
zDeb$=r6GS>pPT*sRJ9<R9XTf9NGGUI*+7))336)ROH_7R9*v~2tp4jbQX~G5^3dU)
z9~DX9;XTOh`)r4-^jcPF);jwAoNKUNZ3fr(je(*21g0(K^kb!7w6nW4oOoLgqrA)X
z;vqZQ@F*cmf{WR`U7@fw7SPeTYE*}^46P_%4F_lB(-(}wYTfY@;QhEm2c@Kw83+C&
z8{P(y$$wkno0Se}OnFA8-C4%Xg07K{ct3V%pC*aknn|2?=915IP7{aURb=bnGg9CF
zh~)h_Nv>QQgzr}p$&a2%BJ;kJ{O8|F&-t7Ow_0k*q46^$sXd8=-SHzihfdJbIxdir
zM-Pa`+Gs|9^f82pJ>d4iLdo0OW03x<49z>8NKRk#<92XX6O*oIWQR>JVG6Fp3XOZD
zO2P(oWXp+n!)-{MSxLGjHj|R`7s=Tv6;`rs8p%<XL+z@YNqMFW$##l@BB&#)&!rKQ
zt2>D6a5xzVze4h&%V9wq%PyM$<YV0p`qidH&PAV%8nq`2_(IqvooCsB3zG0HW)=I=
zubwE|N3p_Zy3xaF9Q)?!QsT8cpX8|;vnw1JwEN5=vQ4FpFwgDCb)El+r>!-~^Gm0v
zPuwJHxkuPv%PzP~tFp7?2FQbAD_&{qN%B$ZIBV!LguGHT={pO(Ny-g1R=YU?LFz6-
zk8VKSDn{5w)s(F5osBntS;7{qxrycWI@RVx{KTbOQn9p94VnB;jhs+>g~jySD5Vd2
zr1YTynciPTpXjK=<wCEhmw#U}QJPE9w8`^q&B-ukPooI=?b-}oZDsgyqy%m?(m+=V
z5S|lmORL`)$I+?rOu}Y9*vqevm!Elrmo;-Pa*<RBnth+KkJKWE=49diymY*!wG~U8
zo57AXWYbATxA4u3HYnbAm6DxQq<3-uWmXdhv5>JOTDGT*eLeSvdGp95o;yp9c+Bu*
zCT-)W^lh#9ow6i3`GKF<q~zdP>$9<=b}Bd?QD@_AwP4?cOc;C|iyiOHL4%hiiBww_
z9T6SGPTWcYn@efn6`v0LFSJR+@jdY5!Fk+SA4t4LIEIQxA#2|72~F(UNen(u;4(u|
z(!AS|yw$KGKHqk+#SPPNvxy;-rE!Gq^`B&6dMh3)KTqB*e#zX`4`yHN5+!=xoTtj@
z7WG-|0+C6H#HSKh;`@9qsL62-sSPa0=Vjw?--=LFk`scv&L$J>uv(nk@&VWUu7kwa
zVWi@A4vCj7AU+%us(NuMd9<?@JEf$NGkWt$iP1e+_<w8H9T(N{#A)jB=nsxwg-B63
zKv1K%vx0yH6h%ZuBOZ7HN>T1?*sw%I5D-lx*svF{fr#AhJFK7rMvdL5p#CH=Vl1GN
zU-&&BCKv(p$M2tew{K==cILY~pI3I~#c0yIN%>^u@t;Uo(M59Oxfk6yH=2svZj+I*
zOXznm#5AGi1O$bAPla`TX^hu0S}-q(f7hf<-y|8)kcV6N+!O)z5zVHyO9H9)=|b|P
z<ZF69NEdUtm8ihqkmeE@cpNJsb%)o}y#D+>mjz!RygZfO6g@_h0*2Ay)lKMexG&9b
z^rXeVI?@H&Db&CJM&f@UgQ}-{Qqibf8uCsBPx>kcp8m0xMwG3G>AknpT%$vLO@F?S
zg7;XsIZcI|Tt6Hf_`Hur%_~u8Rv|>V4+A)nL#s{=r1k?m>HbwZU@L4wSykVY1Fz4K
zoPIV`5&4V^OK_v=YbFD7GN&^qvecf>nNa>*OYheng>))|ZZ2gcp+1t1uT_Or->Tv-
zssicTeU9V+pNwr$B&T_MD(G#K0<pyyH3*ncA?|m3#o)_@e7!z@H?%vQzn03{i5ec5
z<0Hvqpf<1;$!@zql~)K_<YJG!eKWbT!X>bEV5WGT7A5)A9x7G5lvA#(hJ(EhK;;h?
zsK&b*^h)jmCdWgePn<JK9DI=cIz|tAG(JKeNh3+D=?E$;IxUW9l9t^4&75A=K8>0M
z$xxm>2`Vp4gM>JDv`wAg)Az$vV)GP(tjv-#*}WMtYR&MZN)PN<XPC7bK|^;#JYt|J
z=)2XTwV@BtlF{>^|DXbh+7S-F$Qfk4yb?Leb>ZImP?(XjnR_POk0$O>rCH71bZPu0
z6wol1)12oIp85L9RJBo9t)!ZiP4woroEV7BJdC&}&-srR@cUr)I!uKzkqk;sGs78w
z*un+*A}Btv3~Vlqg~#8dit9(|DpID}qcszPK$MzPs=V<nSLjuYG6X63>Zlc9Ts9uw
z=v2{HX#q%M$3l)N&K9q){fe6=)TVl)zZ|U8Dx`i@s`Sf2c_=zGi}YO>LcY$ZP&gQ@
zM&@N>kXq{Y(ntOITpY`-sD6PNowzg;>7=u?*j|U0N|Rx?p*nqO@Emok)<u%5Q;=fh
z&$RnRBP7`}j{Z@<0`|KY(w9<OnvyuM)VIVAB`eR;<|m$F=U)xU?Ce2`O?<5{gS`cc
z(P@on&fYcXTfXK?^W)uQ_!&Y@@P$nmmzpE18MTT*FV{hU&swrQ^9C`t6wvB$C%j-q
z7;@Eqtw?y*NX#GIhH6=V)F)n>9ywf&UUB=$*!pA$Qw<=q_FO@SfAJz}&wGj8mPC@7
zH}}z}mVvOrYAu@HGn{6*EJUO48F6WIOrfv*3aOlX8?>xf5;buH(e{`}@4;M{Gk_8M
z7uA#dI*I7g$xOv4elJ^8<~)cFa~EIRTSuDa`;+Encf<|dYtZ6k7Wcdpsqmh8mpD0P
z^0_)1oIs?@EgOAZ@nSvy48n2(=hXW#8vUvt9o(=R^|<*tm-R3fp-YaW+s_Zl@~zjz
z4?SihmklgfG})3O{+lCfH}G<7`1(qA2y(Z3(+%P*G<E7z<Q8cQMz@B8-WDsxwuQd%
z`}Jd`tEz<H&it2vSrz(h=zXeob}X5uGJ-CO8;GX79gEiP-9fJVbI5g?GfZB&35x#n
zHPWoof-6HWL+m!2(qJzma;4l4ls{6UlCer0H~4`fV*d-p0#c1MX7+@i^z}iK=nUn?
z7H~Rofnv8^BQnj_$0=2BN@<8S?DDrJY~EB@Sgwf%2@a7tjhgWGd848xWFL*6zY^I!
z2uA*q+2YbX{yk5uKC0M}PWP54bIoNk@rJD;I{yn_7?k>qsze)eHZ-3Gy+Pn}>L5|g
zI8B{r96^(vzJq-^KcK!#<H^vlW2iP#8x4Ku0qF;iLCpzHESl^DL+tON-a`r$FVFNN
z>|y?zPxrdma6pn`X?{Mp1-$6y*PnALTo2CgoEgNNoI~&M@1y3<=uUe__>-QmW4M}e
zqey;k5ejn1Ahz9DOoLe*G1L-gx+B`N(g3?I6XN+L##qh>@w!Z7Sdwjz1-A@w+I@3e
zu}g?6hFIe5=IPYxyb1Q3Xn{r1hTQsXrdar@iBvbT_)f!GJZ4rJXL;8cTL&57b$O=v
z;uK@NXU2DQ+f*U$f6x@;7n<DBC{xZ!%@W6qGsElTIrNX+H44WnD=e`x#3!HW<KOBG
z@r5lZg9`>z8sKA!*DYUD`f!B_zUq9Eoc1xp2SUxU+6)tXX0|I8-Lk-59=eK~)qGu_
zTr<3?cL;gqV2yt|WQfIfhB#<}HP$_9jw`P;kwN3ssonX-)Nr;I#lB|P*l#mkU9c5y
zo#+qDNg=Gfv6E(n9TA_Ywd6kkK8I``mr9orYaDo&#VdXj;>$~lQQeMQ`i{@0(#<u(
zT)HVfe%}B)R<L-(GFNKvZ-IZQGr$3hcc6QhC(-*-PpBW4qNr60v5kiv_v-fvB&zTf
zsqi+&ds8WmFuka#(6PdO>NJ$A&%c6a12;j|vMNX&vRdijdlicRn+ywSIP9Fj*ZSL?
zz!^U%2BRChz}>zaB7%#+_|`#?=AGm&85F@Gqi}E?8ldDK`NQ@I6QwR6|F14lEh~6C
zf=h@hfee#9pp<Nc@SsJ|Fzhww(IW+X&+g;vQrasu>e9G^yHzmcq733w-_g<^H6eB1
zJ$NL|gt2i4p<Ht#oc*Ss(kOF<a+g>E-UmzQx%wpV2)oE#m7Irrm5*R&TriMcI?5FO
zyIeWm$4iUzr-9zlXt3NIsI+yILdm>T5U<XJ=|MH%pj-;idOfBq;+i@Aso7lGn<Dz)
z=tj7C>K*5=W~N*|z)cAfBV}%uI#=_%lhQ(4U72_HIcK}6nQp263Vf0a!H+zE89r{x
z$SQT^Ykpr<W9&B|TP%TrpIv~FJFdad-~i?0lx%n#d>b^EGRmDkjB-<skuu`CP<f*;
z8G1Vp9TJgvjvR8S=HP4!G+)2QjkG^W4mZWarRn-upUd=CQQ69;7}^h4QL*){(tCSz
zxF^G@GNuAm)+ko8P?{J%KSmxMK3^IW6)l(bbz`)6N{?0w-!K)Zb;#z<v#Gsjb7yn}
z>a1qMY<WyvOp-K_F%xL8!bEA*+*nCsOp-(%lMo*sn;?@(Wjtp$R&ySIS`rb<H%$cH
zSwnfEBqqM49sV~#N6>@SoFz?^$igMFV;Eh5fMsMcQSlP_+(f=#G{Xoq+3q|;yfl^(
z2pCo)B1R(PHEVUQS^GoHI-P0OZLhgSlU_Sb`hRIM=v))~p(ex5G#Rzmq{65$mP|L^
zE>$=Fz_6<B{6UXZ_23WstZKhcQ1ey!p$ggVt=P#J8-X!v(S~rxP*?~|Sd(}jnvVQ$
zATVWh+Iq)H<%uzoExzp(RV{%T+v7dozlB(ZnaGARx}n~|BfNbA{lY`N1IPQZ+S8@+
zGO4HyS@ZsFL-=rt{z(+MdWVDrkMJ2E;x|t8p%f;B4gN?n(<ZrPo|t=fD7S^wl~ff*
z_aFHDv)zh;c{>a&K81m0R~T4*j6tXKTT5Ww9)o{3*~8e0ANfhQ)lcE>U19K^*p;_J
z*^rN9x1r0+?i7VKQde@@P~g`^%PQg5g?lS1?c1#=*tA2z_ERX>b%jFDk5TA!?Q03_
z+oSOB0zu0xQf;$Gt;L>}NYG}bL)+QU{yy7Ad;janXbO6<-Q)>!Ni6@@k?j_lFgIS#
zhgqlgAxKBy+&<Fy@~kd@_v-z=m#&}>%Y@H}51%z(k{Hzztowc_#kIYZAa>M8__mG2
z-1D!<E&4Mmh}=Z2gX{{}4h6Q_)3Lx-Qda_7{MxI{gN`j8)cdDjI@H)Y&W<#?|G!Oe
U7k$!%wrSwfW<>AzMzn|Jf3W)|^Z)<=

diff --git a/gnu/llvm/llvm/unittests/Analysis/Inputs/ir2native_x86_64_model/variables/variables.index b/gnu/llvm/llvm/unittests/Analysis/Inputs/ir2native_x86_64_model/variables/variables.index
deleted file mode 100644
index c20d8afabf383430e807fde58270f4ff7c92fdc5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 398
zcmbQn@*$OhfsKPviiv}fK}I0n*~8V@JHX%5FT~Nw$2H#H$;;I_B;Gy9F~Ea^U5G(p
z%3@ZHEBvOMEJwl_O!%`?ixP|D6ALo+b5l!-GLwt-4fK=qOY=(f^&CS&f;^o<LtKOP
z!yJP=9U1*f!W?}<T{#$mrgQ*JVKHrBZE+M);4jH9NzBpLD>GtXXkj%{$(r+6K}d<;
zP(QgZje%hTs|n91pMdA{fb1StqZ*47qNWTcA~}hbsYUVSnI#$V<*AwJ870NK2Kq^v
ziN$4W7!p{7m^e}t9?W6Yn80lMt3U99sG=CqrFp4UPZ%ONg_t?6F@jWR09BZFzuEp#
zSW(z;RuKaSqe27g9*HtPHz83)iM~Pxph%7cP$i?nhxx2)b@qRrx`qJ=7(uw8ao<lE
qhvC4dg&P<cnR6L-Fu}!Un~AmVW#Tx+#19g}55j*pbgPuQ-v$5_)n_*V

diff --git a/gnu/llvm/llvm/unittests/Analysis/LazyCallGraphTest.cpp b/gnu/llvm/llvm/unittests/Analysis/LazyCallGraphTest.cpp
deleted file mode 100644
index b154c6f2908..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/LazyCallGraphTest.cpp
+++ /dev/null
@@ -1,2855 +0,0 @@
-//===- LazyCallGraphTest.cpp - Unit tests for the lazy CG analysis --------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/LazyCallGraph.h"
-#include "llvm/ADT/Triple.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/Verifier.h"
-#include "llvm/Support/ErrorHandling.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-#include <memory>
-
-using namespace llvm;
-
-namespace {
-
-std::unique_ptr<Module> parseAssembly(LLVMContext &Context,
-                                      const char *Assembly) {
-  SMDiagnostic Error;
-  std::unique_ptr<Module> M = parseAssemblyString(Assembly, Error, Context);
-
-  std::string ErrMsg;
-  raw_string_ostream OS(ErrMsg);
-  Error.print("", OS);
-
-  // A failure here means that the test itself is buggy.
-  if (!M)
-    report_fatal_error(OS.str().c_str());
-
-  return M;
-}
-
-/*
-   IR forming a call graph with a diamond of triangle-shaped SCCs:
-
-           d1
-          /  \
-         d3--d2
-        /     \
-       b1     c1
-     /  \    /  \
-    b3--b2  c3--c2
-         \  /
-          a1
-         /  \
-        a3--a2
-
-   All call edges go up between SCCs, and clockwise around the SCC.
- */
-static const char DiamondOfTriangles[] =
-     "define void @a1() {\n"
-     "entry:\n"
-     "  call void @a2()\n"
-     "  call void @b2()\n"
-     "  call void @c3()\n"
-     "  ret void\n"
-     "}\n"
-     "define void @a2() {\n"
-     "entry:\n"
-     "  call void @a3()\n"
-     "  ret void\n"
-     "}\n"
-     "define void @a3() {\n"
-     "entry:\n"
-     "  call void @a1()\n"
-     "  ret void\n"
-     "}\n"
-     "define void @b1() {\n"
-     "entry:\n"
-     "  call void @b2()\n"
-     "  call void @d3()\n"
-     "  ret void\n"
-     "}\n"
-     "define void @b2() {\n"
-     "entry:\n"
-     "  call void @b3()\n"
-     "  ret void\n"
-     "}\n"
-     "define void @b3() {\n"
-     "entry:\n"
-     "  call void @b1()\n"
-     "  ret void\n"
-     "}\n"
-     "define void @c1() {\n"
-     "entry:\n"
-     "  call void @c2()\n"
-     "  call void @d2()\n"
-     "  ret void\n"
-     "}\n"
-     "define void @c2() {\n"
-     "entry:\n"
-     "  call void @c3()\n"
-     "  ret void\n"
-     "}\n"
-     "define void @c3() {\n"
-     "entry:\n"
-     "  call void @c1()\n"
-     "  ret void\n"
-     "}\n"
-     "define void @d1() {\n"
-     "entry:\n"
-     "  call void @d2()\n"
-     "  ret void\n"
-     "}\n"
-     "define void @d2() {\n"
-     "entry:\n"
-     "  call void @d3()\n"
-     "  ret void\n"
-     "}\n"
-     "define void @d3() {\n"
-     "entry:\n"
-     "  call void @d1()\n"
-     "  ret void\n"
-     "}\n";
-
-/*
-   IR forming a reference graph with a diamond of triangle-shaped RefSCCs
-
-           d1
-          /  \
-         d3--d2
-        /     \
-       b1     c1
-     /  \    /  \
-    b3--b2  c3--c2
-         \  /
-          a1
-         /  \
-        a3--a2
-
-   All call edges go up between RefSCCs, and clockwise around the RefSCC.
- */
-static const char DiamondOfTrianglesRefGraph[] =
-     "define void @a1() {\n"
-     "entry:\n"
-     "  %a = alloca void ()*\n"
-     "  store void ()* @a2, void ()** %a\n"
-     "  store void ()* @b2, void ()** %a\n"
-     "  store void ()* @c3, void ()** %a\n"
-     "  ret void\n"
-     "}\n"
-     "define void @a2() {\n"
-     "entry:\n"
-     "  %a = alloca void ()*\n"
-     "  store void ()* @a3, void ()** %a\n"
-     "  ret void\n"
-     "}\n"
-     "define void @a3() {\n"
-     "entry:\n"
-     "  %a = alloca void ()*\n"
-     "  store void ()* @a1, void ()** %a\n"
-     "  ret void\n"
-     "}\n"
-     "define void @b1() {\n"
-     "entry:\n"
-     "  %a = alloca void ()*\n"
-     "  store void ()* @b2, void ()** %a\n"
-     "  store void ()* @d3, void ()** %a\n"
-     "  ret void\n"
-     "}\n"
-     "define void @b2() {\n"
-     "entry:\n"
-     "  %a = alloca void ()*\n"
-     "  store void ()* @b3, void ()** %a\n"
-     "  ret void\n"
-     "}\n"
-     "define void @b3() {\n"
-     "entry:\n"
-     "  %a = alloca void ()*\n"
-     "  store void ()* @b1, void ()** %a\n"
-     "  ret void\n"
-     "}\n"
-     "define void @c1() {\n"
-     "entry:\n"
-     "  %a = alloca void ()*\n"
-     "  store void ()* @c2, void ()** %a\n"
-     "  store void ()* @d2, void ()** %a\n"
-     "  ret void\n"
-     "}\n"
-     "define void @c2() {\n"
-     "entry:\n"
-     "  %a = alloca void ()*\n"
-     "  store void ()* @c3, void ()** %a\n"
-     "  ret void\n"
-     "}\n"
-     "define void @c3() {\n"
-     "entry:\n"
-     "  %a = alloca void ()*\n"
-     "  store void ()* @c1, void ()** %a\n"
-     "  ret void\n"
-     "}\n"
-     "define void @d1() {\n"
-     "entry:\n"
-     "  %a = alloca void ()*\n"
-     "  store void ()* @d2, void ()** %a\n"
-     "  ret void\n"
-     "}\n"
-     "define void @d2() {\n"
-     "entry:\n"
-     "  %a = alloca void ()*\n"
-     "  store void ()* @d3, void ()** %a\n"
-     "  ret void\n"
-     "}\n"
-     "define void @d3() {\n"
-     "entry:\n"
-     "  %a = alloca void ()*\n"
-     "  store void ()* @d1, void ()** %a\n"
-     "  ret void\n"
-     "}\n";
-
-static LazyCallGraph buildCG(Module &M) {
-  TargetLibraryInfoImpl TLII(Triple(M.getTargetTriple()));
-  TargetLibraryInfo TLI(TLII);
-  auto GetTLI = [&TLI](Function &F) -> TargetLibraryInfo & { return TLI; };
-
-  LazyCallGraph CG(M, GetTLI);
-  return CG;
-}
-
-TEST(LazyCallGraphTest, BasicGraphFormation) {
-  LLVMContext Context;
-  std::unique_ptr<Module> M = parseAssembly(Context, DiamondOfTriangles);
-  LazyCallGraph CG = buildCG(*M);
-
-  // The order of the entry nodes should be stable w.r.t. the source order of
-  // the IR, and everything in our module is an entry node, so just directly
-  // build variables for each node.
-  auto I = CG.begin();
-  LazyCallGraph::Node &A1 = (I++)->getNode();
-  EXPECT_EQ("a1", A1.getFunction().getName());
-  LazyCallGraph::Node &A2 = (I++)->getNode();
-  EXPECT_EQ("a2", A2.getFunction().getName());
-  LazyCallGraph::Node &A3 = (I++)->getNode();
-  EXPECT_EQ("a3", A3.getFunction().getName());
-  LazyCallGraph::Node &B1 = (I++)->getNode();
-  EXPECT_EQ("b1", B1.getFunction().getName());
-  LazyCallGraph::Node &B2 = (I++)->getNode();
-  EXPECT_EQ("b2", B2.getFunction().getName());
-  LazyCallGraph::Node &B3 = (I++)->getNode();
-  EXPECT_EQ("b3", B3.getFunction().getName());
-  LazyCallGraph::Node &C1 = (I++)->getNode();
-  EXPECT_EQ("c1", C1.getFunction().getName());
-  LazyCallGraph::Node &C2 = (I++)->getNode();
-  EXPECT_EQ("c2", C2.getFunction().getName());
-  LazyCallGraph::Node &C3 = (I++)->getNode();
-  EXPECT_EQ("c3", C3.getFunction().getName());
-  LazyCallGraph::Node &D1 = (I++)->getNode();
-  EXPECT_EQ("d1", D1.getFunction().getName());
-  LazyCallGraph::Node &D2 = (I++)->getNode();
-  EXPECT_EQ("d2", D2.getFunction().getName());
-  LazyCallGraph::Node &D3 = (I++)->getNode();
-  EXPECT_EQ("d3", D3.getFunction().getName());
-  EXPECT_EQ(CG.end(), I);
-
-  // Build vectors and sort them for the rest of the assertions to make them
-  // independent of order.
-  std::vector<std::string> Nodes;
-
-  for (LazyCallGraph::Edge &E : A1.populate())
-    Nodes.push_back(std::string(E.getFunction().getName()));
-  llvm::sort(Nodes);
-  EXPECT_EQ("a2", Nodes[0]);
-  EXPECT_EQ("b2", Nodes[1]);
-  EXPECT_EQ("c3", Nodes[2]);
-  Nodes.clear();
-
-  A2.populate();
-  EXPECT_EQ(A2->end(), std::next(A2->begin()));
-  EXPECT_EQ("a3", A2->begin()->getFunction().getName());
-  A3.populate();
-  EXPECT_EQ(A3->end(), std::next(A3->begin()));
-  EXPECT_EQ("a1", A3->begin()->getFunction().getName());
-
-  for (LazyCallGraph::Edge &E : B1.populate())
-    Nodes.push_back(std::string(E.getFunction().getName()));
-  llvm::sort(Nodes);
-  EXPECT_EQ("b2", Nodes[0]);
-  EXPECT_EQ("d3", Nodes[1]);
-  Nodes.clear();
-
-  B2.populate();
-  EXPECT_EQ(B2->end(), std::next(B2->begin()));
-  EXPECT_EQ("b3", B2->begin()->getFunction().getName());
-  B3.populate();
-  EXPECT_EQ(B3->end(), std::next(B3->begin()));
-  EXPECT_EQ("b1", B3->begin()->getFunction().getName());
-
-  for (LazyCallGraph::Edge &E : C1.populate())
-    Nodes.push_back(std::string(E.getFunction().getName()));
-  llvm::sort(Nodes);
-  EXPECT_EQ("c2", Nodes[0]);
-  EXPECT_EQ("d2", Nodes[1]);
-  Nodes.clear();
-
-  C2.populate();
-  EXPECT_EQ(C2->end(), std::next(C2->begin()));
-  EXPECT_EQ("c3", C2->begin()->getFunction().getName());
-  C3.populate();
-  EXPECT_EQ(C3->end(), std::next(C3->begin()));
-  EXPECT_EQ("c1", C3->begin()->getFunction().getName());
-
-  D1.populate();
-  EXPECT_EQ(D1->end(), std::next(D1->begin()));
-  EXPECT_EQ("d2", D1->begin()->getFunction().getName());
-  D2.populate();
-  EXPECT_EQ(D2->end(), std::next(D2->begin()));
-  EXPECT_EQ("d3", D2->begin()->getFunction().getName());
-  D3.populate();
-  EXPECT_EQ(D3->end(), std::next(D3->begin()));
-  EXPECT_EQ("d1", D3->begin()->getFunction().getName());
-
-  // Now lets look at the RefSCCs and SCCs.
-  CG.buildRefSCCs();
-  auto J = CG.postorder_ref_scc_begin();
-
-  LazyCallGraph::RefSCC &D = *J++;
-  ASSERT_EQ(1, D.size());
-  for (LazyCallGraph::Node &N : *D.begin())
-    Nodes.push_back(std::string(N.getFunction().getName()));
-  llvm::sort(Nodes);
-  EXPECT_EQ(3u, Nodes.size());
-  EXPECT_EQ("d1", Nodes[0]);
-  EXPECT_EQ("d2", Nodes[1]);
-  EXPECT_EQ("d3", Nodes[2]);
-  Nodes.clear();
-  EXPECT_FALSE(D.isParentOf(D));
-  EXPECT_FALSE(D.isChildOf(D));
-  EXPECT_FALSE(D.isAncestorOf(D));
-  EXPECT_FALSE(D.isDescendantOf(D));
-  EXPECT_EQ(&D, &*CG.postorder_ref_scc_begin());
-
-  LazyCallGraph::RefSCC &B = *J++;
-  ASSERT_EQ(1, B.size());
-  for (LazyCallGraph::Node &N : *B.begin())
-    Nodes.push_back(std::string(N.getFunction().getName()));
-  llvm::sort(Nodes);
-  EXPECT_EQ(3u, Nodes.size());
-  EXPECT_EQ("b1", Nodes[0]);
-  EXPECT_EQ("b2", Nodes[1]);
-  EXPECT_EQ("b3", Nodes[2]);
-  Nodes.clear();
-  EXPECT_TRUE(B.isParentOf(D));
-  EXPECT_FALSE(B.isChildOf(D));
-  EXPECT_TRUE(B.isAncestorOf(D));
-  EXPECT_FALSE(B.isDescendantOf(D));
-  EXPECT_EQ(&B, &*std::next(CG.postorder_ref_scc_begin()));
-
-  LazyCallGraph::RefSCC &C = *J++;
-  ASSERT_EQ(1, C.size());
-  for (LazyCallGraph::Node &N : *C.begin())
-    Nodes.push_back(std::string(N.getFunction().getName()));
-  llvm::sort(Nodes);
-  EXPECT_EQ(3u, Nodes.size());
-  EXPECT_EQ("c1", Nodes[0]);
-  EXPECT_EQ("c2", Nodes[1]);
-  EXPECT_EQ("c3", Nodes[2]);
-  Nodes.clear();
-  EXPECT_FALSE(B.isAncestorOf(C));
-  EXPECT_FALSE(C.isAncestorOf(B));
-  EXPECT_TRUE(C.isParentOf(D));
-  EXPECT_FALSE(C.isChildOf(D));
-  EXPECT_TRUE(C.isAncestorOf(D));
-  EXPECT_FALSE(C.isDescendantOf(D));
-  EXPECT_EQ(&C, &*std::next(CG.postorder_ref_scc_begin(), 2));
-
-  LazyCallGraph::RefSCC &A = *J++;
-  ASSERT_EQ(1, A.size());
-  for (LazyCallGraph::Node &N : *A.begin())
-    Nodes.push_back(std::string(N.getFunction().getName()));
-  llvm::sort(Nodes);
-  EXPECT_EQ(3u, Nodes.size());
-  EXPECT_EQ("a1", Nodes[0]);
-  EXPECT_EQ("a2", Nodes[1]);
-  EXPECT_EQ("a3", Nodes[2]);
-  Nodes.clear();
-  EXPECT_TRUE(A.isParentOf(B));
-  EXPECT_TRUE(A.isParentOf(C));
-  EXPECT_FALSE(A.isParentOf(D));
-  EXPECT_TRUE(A.isAncestorOf(B));
-  EXPECT_TRUE(A.isAncestorOf(C));
-  EXPECT_TRUE(A.isAncestorOf(D));
-  EXPECT_EQ(&A, &*std::next(CG.postorder_ref_scc_begin(), 3));
-
-  EXPECT_EQ(CG.postorder_ref_scc_end(), J);
-  EXPECT_EQ(J, std::next(CG.postorder_ref_scc_begin(), 4));
-}
-
-static Function &lookupFunction(Module &M, StringRef Name) {
-  for (Function &F : M)
-    if (F.getName() == Name)
-      return F;
-  report_fatal_error("Couldn't find function!");
-}
-
-TEST(LazyCallGraphTest, BasicGraphMutation) {
-  LLVMContext Context;
-  std::unique_ptr<Module> M = parseAssembly(Context, "define void @a() {\n"
-                                                     "entry:\n"
-                                                     "  call void @b()\n"
-                                                     "  call void @c()\n"
-                                                     "  ret void\n"
-                                                     "}\n"
-                                                     "define void @b() {\n"
-                                                     "entry:\n"
-                                                     "  ret void\n"
-                                                     "}\n"
-                                                     "define void @c() {\n"
-                                                     "entry:\n"
-                                                     "  ret void\n"
-                                                     "}\n");
-  LazyCallGraph CG = buildCG(*M);
-
-  LazyCallGraph::Node &A = CG.get(lookupFunction(*M, "a"));
-  LazyCallGraph::Node &B = CG.get(lookupFunction(*M, "b"));
-  A.populate();
-  EXPECT_EQ(2, std::distance(A->begin(), A->end()));
-  B.populate();
-  EXPECT_EQ(0, std::distance(B->begin(), B->end()));
-
-  LazyCallGraph::Node &C = CG.get(lookupFunction(*M, "c"));
-  C.populate();
-  CG.insertEdge(B, C, LazyCallGraph::Edge::Call);
-  EXPECT_EQ(1, std::distance(B->begin(), B->end()));
-  EXPECT_EQ(0, std::distance(C->begin(), C->end()));
-
-  CG.insertEdge(C, B, LazyCallGraph::Edge::Call);
-  EXPECT_EQ(1, std::distance(C->begin(), C->end()));
-  EXPECT_EQ(&B, &C->begin()->getNode());
-
-  CG.insertEdge(C, C, LazyCallGraph::Edge::Call);
-  EXPECT_EQ(2, std::distance(C->begin(), C->end()));
-  EXPECT_EQ(&B, &C->begin()->getNode());
-  EXPECT_EQ(&C, &std::next(C->begin())->getNode());
-
-  CG.removeEdge(C, B);
-  EXPECT_EQ(1, std::distance(C->begin(), C->end()));
-  EXPECT_EQ(&C, &C->begin()->getNode());
-
-  CG.removeEdge(C, C);
-  EXPECT_EQ(0, std::distance(C->begin(), C->end()));
-
-  CG.removeEdge(B, C);
-  EXPECT_EQ(0, std::distance(B->begin(), B->end()));
-}
-
-TEST(LazyCallGraphTest, InnerSCCFormation) {
-  LLVMContext Context;
-  std::unique_ptr<Module> M = parseAssembly(Context, DiamondOfTriangles);
-  LazyCallGraph CG = buildCG(*M);
-
-  // Now mutate the graph to connect every node into a single RefSCC to ensure
-  // that our inner SCC formation handles the rest.
-  LazyCallGraph::Node &D1 = CG.get(lookupFunction(*M, "d1"));
-  LazyCallGraph::Node &A1 = CG.get(lookupFunction(*M, "a1"));
-  A1.populate();
-  D1.populate();
-  CG.insertEdge(D1, A1, LazyCallGraph::Edge::Ref);
-
-  // Build vectors and sort them for the rest of the assertions to make them
-  // independent of order.
-  std::vector<std::string> Nodes;
-
-  // We should build a single RefSCC for the entire graph.
-  CG.buildRefSCCs();
-  auto I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC &RC = *I++;
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-
-  // Now walk the four SCCs which should be in post-order.
-  auto J = RC.begin();
-  LazyCallGraph::SCC &D = *J++;
-  for (LazyCallGraph::Node &N : D)
-    Nodes.push_back(std::string(N.getFunction().getName()));
-  llvm::sort(Nodes);
-  EXPECT_EQ(3u, Nodes.size());
-  EXPECT_EQ("d1", Nodes[0]);
-  EXPECT_EQ("d2", Nodes[1]);
-  EXPECT_EQ("d3", Nodes[2]);
-  Nodes.clear();
-
-  LazyCallGraph::SCC &B = *J++;
-  for (LazyCallGraph::Node &N : B)
-    Nodes.push_back(std::string(N.getFunction().getName()));
-  llvm::sort(Nodes);
-  EXPECT_EQ(3u, Nodes.size());
-  EXPECT_EQ("b1", Nodes[0]);
-  EXPECT_EQ("b2", Nodes[1]);
-  EXPECT_EQ("b3", Nodes[2]);
-  Nodes.clear();
-
-  LazyCallGraph::SCC &C = *J++;
-  for (LazyCallGraph::Node &N : C)
-    Nodes.push_back(std::string(N.getFunction().getName()));
-  llvm::sort(Nodes);
-  EXPECT_EQ(3u, Nodes.size());
-  EXPECT_EQ("c1", Nodes[0]);
-  EXPECT_EQ("c2", Nodes[1]);
-  EXPECT_EQ("c3", Nodes[2]);
-  Nodes.clear();
-
-  LazyCallGraph::SCC &A = *J++;
-  for (LazyCallGraph::Node &N : A)
-    Nodes.push_back(std::string(N.getFunction().getName()));
-  llvm::sort(Nodes);
-  EXPECT_EQ(3u, Nodes.size());
-  EXPECT_EQ("a1", Nodes[0]);
-  EXPECT_EQ("a2", Nodes[1]);
-  EXPECT_EQ("a3", Nodes[2]);
-  Nodes.clear();
-
-  EXPECT_EQ(RC.end(), J);
-}
-
-TEST(LazyCallGraphTest, MultiArmSCC) {
-  LLVMContext Context;
-  // Two interlocking cycles. The really useful thing about this SCC is that it
-  // will require Tarjan's DFS to backtrack and finish processing all of the
-  // children of each node in the SCC. Since this involves call edges, both
-  // Tarjan implementations will have to successfully navigate the structure.
-  std::unique_ptr<Module> M = parseAssembly(Context, "define void @f1() {\n"
-                                                     "entry:\n"
-                                                     "  call void @f2()\n"
-                                                     "  call void @f4()\n"
-                                                     "  ret void\n"
-                                                     "}\n"
-                                                     "define void @f2() {\n"
-                                                     "entry:\n"
-                                                     "  call void @f3()\n"
-                                                     "  ret void\n"
-                                                     "}\n"
-                                                     "define void @f3() {\n"
-                                                     "entry:\n"
-                                                     "  call void @f1()\n"
-                                                     "  ret void\n"
-                                                     "}\n"
-                                                     "define void @f4() {\n"
-                                                     "entry:\n"
-                                                     "  call void @f5()\n"
-                                                     "  ret void\n"
-                                                     "}\n"
-                                                     "define void @f5() {\n"
-                                                     "entry:\n"
-                                                     "  call void @f1()\n"
-                                                     "  ret void\n"
-                                                     "}\n");
-  LazyCallGraph CG = buildCG(*M);
-
-  // Force the graph to be fully expanded.
-  CG.buildRefSCCs();
-  auto I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC &RC = *I++;
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-
-  LazyCallGraph::Node &N1 = *CG.lookup(lookupFunction(*M, "f1"));
-  LazyCallGraph::Node &N2 = *CG.lookup(lookupFunction(*M, "f2"));
-  LazyCallGraph::Node &N3 = *CG.lookup(lookupFunction(*M, "f3"));
-  LazyCallGraph::Node &N4 = *CG.lookup(lookupFunction(*M, "f4"));
-  LazyCallGraph::Node &N5 = *CG.lookup(lookupFunction(*M, "f4"));
-  EXPECT_EQ(&RC, CG.lookupRefSCC(N1));
-  EXPECT_EQ(&RC, CG.lookupRefSCC(N2));
-  EXPECT_EQ(&RC, CG.lookupRefSCC(N3));
-  EXPECT_EQ(&RC, CG.lookupRefSCC(N4));
-  EXPECT_EQ(&RC, CG.lookupRefSCC(N5));
-
-  ASSERT_EQ(1, RC.size());
-
-  LazyCallGraph::SCC &C = *RC.begin();
-  EXPECT_EQ(&C, CG.lookupSCC(N1));
-  EXPECT_EQ(&C, CG.lookupSCC(N2));
-  EXPECT_EQ(&C, CG.lookupSCC(N3));
-  EXPECT_EQ(&C, CG.lookupSCC(N4));
-  EXPECT_EQ(&C, CG.lookupSCC(N5));
-}
-
-TEST(LazyCallGraphTest, OutgoingEdgeMutation) {
-  LLVMContext Context;
-  std::unique_ptr<Module> M = parseAssembly(Context, "define void @a() {\n"
-                                                     "entry:\n"
-                                                     "  call void @b()\n"
-                                                     "  call void @c()\n"
-                                                     "  ret void\n"
-                                                     "}\n"
-                                                     "define void @b() {\n"
-                                                     "entry:\n"
-                                                     "  call void @d()\n"
-                                                     "  ret void\n"
-                                                     "}\n"
-                                                     "define void @c() {\n"
-                                                     "entry:\n"
-                                                     "  call void @d()\n"
-                                                     "  ret void\n"
-                                                     "}\n"
-                                                     "define void @d() {\n"
-                                                     "entry:\n"
-                                                     "  ret void\n"
-                                                     "}\n");
-  LazyCallGraph CG = buildCG(*M);
-
-  // Force the graph to be fully expanded.
-  CG.buildRefSCCs();
-  for (LazyCallGraph::RefSCC &RC : CG.postorder_ref_sccs())
-    dbgs() << "Formed RefSCC: " << RC << "\n";
-
-  LazyCallGraph::Node &A = *CG.lookup(lookupFunction(*M, "a"));
-  LazyCallGraph::Node &B = *CG.lookup(lookupFunction(*M, "b"));
-  LazyCallGraph::Node &C = *CG.lookup(lookupFunction(*M, "c"));
-  LazyCallGraph::Node &D = *CG.lookup(lookupFunction(*M, "d"));
-  LazyCallGraph::SCC &AC = *CG.lookupSCC(A);
-  LazyCallGraph::SCC &BC = *CG.lookupSCC(B);
-  LazyCallGraph::SCC &CC = *CG.lookupSCC(C);
-  LazyCallGraph::SCC &DC = *CG.lookupSCC(D);
-  LazyCallGraph::RefSCC &ARC = *CG.lookupRefSCC(A);
-  LazyCallGraph::RefSCC &BRC = *CG.lookupRefSCC(B);
-  LazyCallGraph::RefSCC &CRC = *CG.lookupRefSCC(C);
-  LazyCallGraph::RefSCC &DRC = *CG.lookupRefSCC(D);
-  EXPECT_TRUE(ARC.isParentOf(BRC));
-  EXPECT_TRUE(AC.isParentOf(BC));
-  EXPECT_TRUE(ARC.isParentOf(CRC));
-  EXPECT_TRUE(AC.isParentOf(CC));
-  EXPECT_FALSE(ARC.isParentOf(DRC));
-  EXPECT_FALSE(AC.isParentOf(DC));
-  EXPECT_TRUE(ARC.isAncestorOf(DRC));
-  EXPECT_TRUE(AC.isAncestorOf(DC));
-  EXPECT_FALSE(DRC.isChildOf(ARC));
-  EXPECT_FALSE(DC.isChildOf(AC));
-  EXPECT_TRUE(DRC.isDescendantOf(ARC));
-  EXPECT_TRUE(DC.isDescendantOf(AC));
-  EXPECT_TRUE(DRC.isChildOf(BRC));
-  EXPECT_TRUE(DC.isChildOf(BC));
-  EXPECT_TRUE(DRC.isChildOf(CRC));
-  EXPECT_TRUE(DC.isChildOf(CC));
-
-  EXPECT_EQ(2, std::distance(A->begin(), A->end()));
-  ARC.insertOutgoingEdge(A, D, LazyCallGraph::Edge::Call);
-  EXPECT_EQ(3, std::distance(A->begin(), A->end()));
-  const LazyCallGraph::Edge &NewE = (*A)[D];
-  EXPECT_TRUE(NewE);
-  EXPECT_TRUE(NewE.isCall());
-  EXPECT_EQ(&D, &NewE.getNode());
-
-  // Only the parent and child tests sholud have changed. The rest of the graph
-  // remains the same.
-  EXPECT_TRUE(ARC.isParentOf(DRC));
-  EXPECT_TRUE(AC.isParentOf(DC));
-  EXPECT_TRUE(ARC.isAncestorOf(DRC));
-  EXPECT_TRUE(AC.isAncestorOf(DC));
-  EXPECT_TRUE(DRC.isChildOf(ARC));
-  EXPECT_TRUE(DC.isChildOf(AC));
-  EXPECT_TRUE(DRC.isDescendantOf(ARC));
-  EXPECT_TRUE(DC.isDescendantOf(AC));
-  EXPECT_EQ(&AC, CG.lookupSCC(A));
-  EXPECT_EQ(&BC, CG.lookupSCC(B));
-  EXPECT_EQ(&CC, CG.lookupSCC(C));
-  EXPECT_EQ(&DC, CG.lookupSCC(D));
-  EXPECT_EQ(&ARC, CG.lookupRefSCC(A));
-  EXPECT_EQ(&BRC, CG.lookupRefSCC(B));
-  EXPECT_EQ(&CRC, CG.lookupRefSCC(C));
-  EXPECT_EQ(&DRC, CG.lookupRefSCC(D));
-
-  ARC.switchOutgoingEdgeToRef(A, D);
-  EXPECT_FALSE(NewE.isCall());
-
-  // Verify the reference graph remains the same but the SCC graph is updated.
-  EXPECT_TRUE(ARC.isParentOf(DRC));
-  EXPECT_FALSE(AC.isParentOf(DC));
-  EXPECT_TRUE(ARC.isAncestorOf(DRC));
-  EXPECT_TRUE(AC.isAncestorOf(DC));
-  EXPECT_TRUE(DRC.isChildOf(ARC));
-  EXPECT_FALSE(DC.isChildOf(AC));
-  EXPECT_TRUE(DRC.isDescendantOf(ARC));
-  EXPECT_TRUE(DC.isDescendantOf(AC));
-  EXPECT_EQ(&AC, CG.lookupSCC(A));
-  EXPECT_EQ(&BC, CG.lookupSCC(B));
-  EXPECT_EQ(&CC, CG.lookupSCC(C));
-  EXPECT_EQ(&DC, CG.lookupSCC(D));
-  EXPECT_EQ(&ARC, CG.lookupRefSCC(A));
-  EXPECT_EQ(&BRC, CG.lookupRefSCC(B));
-  EXPECT_EQ(&CRC, CG.lookupRefSCC(C));
-  EXPECT_EQ(&DRC, CG.lookupRefSCC(D));
-
-  ARC.switchOutgoingEdgeToCall(A, D);
-  EXPECT_TRUE(NewE.isCall());
-
-  // Verify the reference graph remains the same but the SCC graph is updated.
-  EXPECT_TRUE(ARC.isParentOf(DRC));
-  EXPECT_TRUE(AC.isParentOf(DC));
-  EXPECT_TRUE(ARC.isAncestorOf(DRC));
-  EXPECT_TRUE(AC.isAncestorOf(DC));
-  EXPECT_TRUE(DRC.isChildOf(ARC));
-  EXPECT_TRUE(DC.isChildOf(AC));
-  EXPECT_TRUE(DRC.isDescendantOf(ARC));
-  EXPECT_TRUE(DC.isDescendantOf(AC));
-  EXPECT_EQ(&AC, CG.lookupSCC(A));
-  EXPECT_EQ(&BC, CG.lookupSCC(B));
-  EXPECT_EQ(&CC, CG.lookupSCC(C));
-  EXPECT_EQ(&DC, CG.lookupSCC(D));
-  EXPECT_EQ(&ARC, CG.lookupRefSCC(A));
-  EXPECT_EQ(&BRC, CG.lookupRefSCC(B));
-  EXPECT_EQ(&CRC, CG.lookupRefSCC(C));
-  EXPECT_EQ(&DRC, CG.lookupRefSCC(D));
-
-  ARC.removeOutgoingEdge(A, D);
-  EXPECT_EQ(2, std::distance(A->begin(), A->end()));
-
-  // Now the parent and child tests fail again but the rest remains the same.
-  EXPECT_FALSE(ARC.isParentOf(DRC));
-  EXPECT_FALSE(AC.isParentOf(DC));
-  EXPECT_TRUE(ARC.isAncestorOf(DRC));
-  EXPECT_TRUE(AC.isAncestorOf(DC));
-  EXPECT_FALSE(DRC.isChildOf(ARC));
-  EXPECT_FALSE(DC.isChildOf(AC));
-  EXPECT_TRUE(DRC.isDescendantOf(ARC));
-  EXPECT_TRUE(DC.isDescendantOf(AC));
-  EXPECT_EQ(&AC, CG.lookupSCC(A));
-  EXPECT_EQ(&BC, CG.lookupSCC(B));
-  EXPECT_EQ(&CC, CG.lookupSCC(C));
-  EXPECT_EQ(&DC, CG.lookupSCC(D));
-  EXPECT_EQ(&ARC, CG.lookupRefSCC(A));
-  EXPECT_EQ(&BRC, CG.lookupRefSCC(B));
-  EXPECT_EQ(&CRC, CG.lookupRefSCC(C));
-  EXPECT_EQ(&DRC, CG.lookupRefSCC(D));
-}
-
-TEST(LazyCallGraphTest, IncomingEdgeInsertion) {
-  LLVMContext Context;
-  // We want to ensure we can add edges even across complex diamond graphs, so
-  // we use the diamond of triangles graph defined above. The ascii diagram is
-  // repeated here for easy reference.
-  //
-  //         d1       |
-  //        /  \      |
-  //       d3--d2     |
-  //      /     \     |
-  //     b1     c1    |
-  //   /  \    /  \   |
-  //  b3--b2  c3--c2  |
-  //       \  /       |
-  //        a1        |
-  //       /  \       |
-  //      a3--a2      |
-  //
-  std::unique_ptr<Module> M = parseAssembly(Context, DiamondOfTriangles);
-  LazyCallGraph CG = buildCG(*M);
-
-  // Force the graph to be fully expanded.
-  CG.buildRefSCCs();
-  for (LazyCallGraph::RefSCC &RC : CG.postorder_ref_sccs())
-    dbgs() << "Formed RefSCC: " << RC << "\n";
-
-  LazyCallGraph::Node &A1 = *CG.lookup(lookupFunction(*M, "a1"));
-  LazyCallGraph::Node &A2 = *CG.lookup(lookupFunction(*M, "a2"));
-  LazyCallGraph::Node &A3 = *CG.lookup(lookupFunction(*M, "a3"));
-  LazyCallGraph::Node &B1 = *CG.lookup(lookupFunction(*M, "b1"));
-  LazyCallGraph::Node &B2 = *CG.lookup(lookupFunction(*M, "b2"));
-  LazyCallGraph::Node &B3 = *CG.lookup(lookupFunction(*M, "b3"));
-  LazyCallGraph::Node &C1 = *CG.lookup(lookupFunction(*M, "c1"));
-  LazyCallGraph::Node &C2 = *CG.lookup(lookupFunction(*M, "c2"));
-  LazyCallGraph::Node &C3 = *CG.lookup(lookupFunction(*M, "c3"));
-  LazyCallGraph::Node &D1 = *CG.lookup(lookupFunction(*M, "d1"));
-  LazyCallGraph::Node &D2 = *CG.lookup(lookupFunction(*M, "d2"));
-  LazyCallGraph::Node &D3 = *CG.lookup(lookupFunction(*M, "d3"));
-  LazyCallGraph::RefSCC &ARC = *CG.lookupRefSCC(A1);
-  LazyCallGraph::RefSCC &BRC = *CG.lookupRefSCC(B1);
-  LazyCallGraph::RefSCC &CRC = *CG.lookupRefSCC(C1);
-  LazyCallGraph::RefSCC &DRC = *CG.lookupRefSCC(D1);
-  ASSERT_EQ(&ARC, CG.lookupRefSCC(A2));
-  ASSERT_EQ(&ARC, CG.lookupRefSCC(A3));
-  ASSERT_EQ(&BRC, CG.lookupRefSCC(B2));
-  ASSERT_EQ(&BRC, CG.lookupRefSCC(B3));
-  ASSERT_EQ(&CRC, CG.lookupRefSCC(C2));
-  ASSERT_EQ(&CRC, CG.lookupRefSCC(C3));
-  ASSERT_EQ(&DRC, CG.lookupRefSCC(D2));
-  ASSERT_EQ(&DRC, CG.lookupRefSCC(D3));
-  ASSERT_EQ(1, std::distance(D2->begin(), D2->end()));
-
-  // Add an edge to make the graph:
-  //
-  //         d1         |
-  //        /  \        |
-  //       d3--d2---.   |
-  //      /     \    |  |
-  //     b1     c1   |  |
-  //   /  \    /  \ /   |
-  //  b3--b2  c3--c2    |
-  //       \  /         |
-  //        a1          |
-  //       /  \         |
-  //      a3--a2        |
-  auto MergedRCs = CRC.insertIncomingRefEdge(D2, C2);
-  // Make sure we connected the nodes.
-  for (LazyCallGraph::Edge E : *D2) {
-    if (&E.getNode() == &D3)
-      continue;
-    EXPECT_EQ(&C2, &E.getNode());
-  }
-  // And marked the D ref-SCC as no longer valid.
-  EXPECT_EQ(1u, MergedRCs.size());
-  EXPECT_EQ(&DRC, MergedRCs[0]);
-
-  // Make sure we have the correct nodes in the SCC sets.
-  EXPECT_EQ(&ARC, CG.lookupRefSCC(A1));
-  EXPECT_EQ(&ARC, CG.lookupRefSCC(A2));
-  EXPECT_EQ(&ARC, CG.lookupRefSCC(A3));
-  EXPECT_EQ(&BRC, CG.lookupRefSCC(B1));
-  EXPECT_EQ(&BRC, CG.lookupRefSCC(B2));
-  EXPECT_EQ(&BRC, CG.lookupRefSCC(B3));
-  EXPECT_EQ(&CRC, CG.lookupRefSCC(C1));
-  EXPECT_EQ(&CRC, CG.lookupRefSCC(C2));
-  EXPECT_EQ(&CRC, CG.lookupRefSCC(C3));
-  EXPECT_EQ(&CRC, CG.lookupRefSCC(D1));
-  EXPECT_EQ(&CRC, CG.lookupRefSCC(D2));
-  EXPECT_EQ(&CRC, CG.lookupRefSCC(D3));
-
-  // And that ancestry tests have been updated.
-  EXPECT_TRUE(ARC.isParentOf(CRC));
-  EXPECT_TRUE(BRC.isParentOf(CRC));
-
-  // And verify the post-order walk reflects the updated structure.
-  auto I = CG.postorder_ref_scc_begin(), E = CG.postorder_ref_scc_end();
-  ASSERT_NE(I, E);
-  EXPECT_EQ(&CRC, &*I) << "Actual RefSCC: " << *I;
-  ASSERT_NE(++I, E);
-  EXPECT_EQ(&BRC, &*I) << "Actual RefSCC: " << *I;
-  ASSERT_NE(++I, E);
-  EXPECT_EQ(&ARC, &*I) << "Actual RefSCC: " << *I;
-  EXPECT_EQ(++I, E);
-}
-
-TEST(LazyCallGraphTest, IncomingEdgeInsertionRefGraph) {
-  LLVMContext Context;
-  // Another variation of the above test but with all the edges switched to
-  // references rather than calls.
-  std::unique_ptr<Module> M =
-      parseAssembly(Context, DiamondOfTrianglesRefGraph);
-  LazyCallGraph CG = buildCG(*M);
-
-  // Force the graph to be fully expanded.
-  CG.buildRefSCCs();
-  for (LazyCallGraph::RefSCC &RC : CG.postorder_ref_sccs())
-    dbgs() << "Formed RefSCC: " << RC << "\n";
-
-  LazyCallGraph::Node &A1 = *CG.lookup(lookupFunction(*M, "a1"));
-  LazyCallGraph::Node &A2 = *CG.lookup(lookupFunction(*M, "a2"));
-  LazyCallGraph::Node &A3 = *CG.lookup(lookupFunction(*M, "a3"));
-  LazyCallGraph::Node &B1 = *CG.lookup(lookupFunction(*M, "b1"));
-  LazyCallGraph::Node &B2 = *CG.lookup(lookupFunction(*M, "b2"));
-  LazyCallGraph::Node &B3 = *CG.lookup(lookupFunction(*M, "b3"));
-  LazyCallGraph::Node &C1 = *CG.lookup(lookupFunction(*M, "c1"));
-  LazyCallGraph::Node &C2 = *CG.lookup(lookupFunction(*M, "c2"));
-  LazyCallGraph::Node &C3 = *CG.lookup(lookupFunction(*M, "c3"));
-  LazyCallGraph::Node &D1 = *CG.lookup(lookupFunction(*M, "d1"));
-  LazyCallGraph::Node &D2 = *CG.lookup(lookupFunction(*M, "d2"));
-  LazyCallGraph::Node &D3 = *CG.lookup(lookupFunction(*M, "d3"));
-  LazyCallGraph::RefSCC &ARC = *CG.lookupRefSCC(A1);
-  LazyCallGraph::RefSCC &BRC = *CG.lookupRefSCC(B1);
-  LazyCallGraph::RefSCC &CRC = *CG.lookupRefSCC(C1);
-  LazyCallGraph::RefSCC &DRC = *CG.lookupRefSCC(D1);
-  ASSERT_EQ(&ARC, CG.lookupRefSCC(A2));
-  ASSERT_EQ(&ARC, CG.lookupRefSCC(A3));
-  ASSERT_EQ(&BRC, CG.lookupRefSCC(B2));
-  ASSERT_EQ(&BRC, CG.lookupRefSCC(B3));
-  ASSERT_EQ(&CRC, CG.lookupRefSCC(C2));
-  ASSERT_EQ(&CRC, CG.lookupRefSCC(C3));
-  ASSERT_EQ(&DRC, CG.lookupRefSCC(D2));
-  ASSERT_EQ(&DRC, CG.lookupRefSCC(D3));
-  ASSERT_EQ(1, std::distance(D2->begin(), D2->end()));
-
-  // Add an edge to make the graph:
-  //
-  //         d1         |
-  //        /  \        |
-  //       d3--d2---.   |
-  //      /     \    |  |
-  //     b1     c1   |  |
-  //   /  \    /  \ /   |
-  //  b3--b2  c3--c2    |
-  //       \  /         |
-  //        a1          |
-  //       /  \         |
-  //      a3--a2        |
-  auto MergedRCs = CRC.insertIncomingRefEdge(D2, C2);
-  // Make sure we connected the nodes.
-  for (LazyCallGraph::Edge E : *D2) {
-    if (&E.getNode() == &D3)
-      continue;
-    EXPECT_EQ(&C2, &E.getNode());
-  }
-  // And marked the D ref-SCC as no longer valid.
-  EXPECT_EQ(1u, MergedRCs.size());
-  EXPECT_EQ(&DRC, MergedRCs[0]);
-
-  // Make sure we have the correct nodes in the SCC sets.
-  EXPECT_EQ(&ARC, CG.lookupRefSCC(A1));
-  EXPECT_EQ(&ARC, CG.lookupRefSCC(A2));
-  EXPECT_EQ(&ARC, CG.lookupRefSCC(A3));
-  EXPECT_EQ(&BRC, CG.lookupRefSCC(B1));
-  EXPECT_EQ(&BRC, CG.lookupRefSCC(B2));
-  EXPECT_EQ(&BRC, CG.lookupRefSCC(B3));
-  EXPECT_EQ(&CRC, CG.lookupRefSCC(C1));
-  EXPECT_EQ(&CRC, CG.lookupRefSCC(C2));
-  EXPECT_EQ(&CRC, CG.lookupRefSCC(C3));
-  EXPECT_EQ(&CRC, CG.lookupRefSCC(D1));
-  EXPECT_EQ(&CRC, CG.lookupRefSCC(D2));
-  EXPECT_EQ(&CRC, CG.lookupRefSCC(D3));
-
-  // And that ancestry tests have been updated.
-  EXPECT_TRUE(ARC.isParentOf(CRC));
-  EXPECT_TRUE(BRC.isParentOf(CRC));
-
-  // And verify the post-order walk reflects the updated structure.
-  auto I = CG.postorder_ref_scc_begin(), E = CG.postorder_ref_scc_end();
-  ASSERT_NE(I, E);
-  EXPECT_EQ(&CRC, &*I) << "Actual RefSCC: " << *I;
-  ASSERT_NE(++I, E);
-  EXPECT_EQ(&BRC, &*I) << "Actual RefSCC: " << *I;
-  ASSERT_NE(++I, E);
-  EXPECT_EQ(&ARC, &*I) << "Actual RefSCC: " << *I;
-  EXPECT_EQ(++I, E);
-}
-
-TEST(LazyCallGraphTest, IncomingEdgeInsertionLargeCallCycle) {
-  LLVMContext Context;
-  std::unique_ptr<Module> M = parseAssembly(Context, "define void @a() {\n"
-                                                     "entry:\n"
-                                                     "  call void @b()\n"
-                                                     "  ret void\n"
-                                                     "}\n"
-                                                     "define void @b() {\n"
-                                                     "entry:\n"
-                                                     "  call void @c()\n"
-                                                     "  ret void\n"
-                                                     "}\n"
-                                                     "define void @c() {\n"
-                                                     "entry:\n"
-                                                     "  call void @d()\n"
-                                                     "  ret void\n"
-                                                     "}\n"
-                                                     "define void @d() {\n"
-                                                     "entry:\n"
-                                                     "  ret void\n"
-                                                     "}\n");
-  LazyCallGraph CG = buildCG(*M);
-
-  // Force the graph to be fully expanded.
-  CG.buildRefSCCs();
-  for (LazyCallGraph::RefSCC &RC : CG.postorder_ref_sccs())
-    dbgs() << "Formed RefSCC: " << RC << "\n";
-
-  LazyCallGraph::Node &A = *CG.lookup(lookupFunction(*M, "a"));
-  LazyCallGraph::Node &B = *CG.lookup(lookupFunction(*M, "b"));
-  LazyCallGraph::Node &C = *CG.lookup(lookupFunction(*M, "c"));
-  LazyCallGraph::Node &D = *CG.lookup(lookupFunction(*M, "d"));
-  LazyCallGraph::SCC &AC = *CG.lookupSCC(A);
-  LazyCallGraph::SCC &BC = *CG.lookupSCC(B);
-  LazyCallGraph::SCC &CC = *CG.lookupSCC(C);
-  LazyCallGraph::SCC &DC = *CG.lookupSCC(D);
-  LazyCallGraph::RefSCC &ARC = *CG.lookupRefSCC(A);
-  LazyCallGraph::RefSCC &BRC = *CG.lookupRefSCC(B);
-  LazyCallGraph::RefSCC &CRC = *CG.lookupRefSCC(C);
-  LazyCallGraph::RefSCC &DRC = *CG.lookupRefSCC(D);
-
-  // Connect the top to the bottom forming a large RefSCC made up mostly of calls.
-  auto MergedRCs = ARC.insertIncomingRefEdge(D, A);
-  // Make sure we connected the nodes.
-  EXPECT_NE(D->begin(), D->end());
-  EXPECT_EQ(&A, &D->begin()->getNode());
-
-  // Check that we have the dead RCs, but ignore the order.
-  EXPECT_EQ(3u, MergedRCs.size());
-  EXPECT_NE(find(MergedRCs, &BRC), MergedRCs.end());
-  EXPECT_NE(find(MergedRCs, &CRC), MergedRCs.end());
-  EXPECT_NE(find(MergedRCs, &DRC), MergedRCs.end());
-
-  // Make sure the nodes point to the right place now.
-  EXPECT_EQ(&ARC, CG.lookupRefSCC(A));
-  EXPECT_EQ(&ARC, CG.lookupRefSCC(B));
-  EXPECT_EQ(&ARC, CG.lookupRefSCC(C));
-  EXPECT_EQ(&ARC, CG.lookupRefSCC(D));
-
-  // Check that the SCCs are in postorder.
-  EXPECT_EQ(4, ARC.size());
-  EXPECT_EQ(&DC, &ARC[0]);
-  EXPECT_EQ(&CC, &ARC[1]);
-  EXPECT_EQ(&BC, &ARC[2]);
-  EXPECT_EQ(&AC, &ARC[3]);
-
-  // And verify the post-order walk reflects the updated structure.
-  auto I = CG.postorder_ref_scc_begin(), E = CG.postorder_ref_scc_end();
-  ASSERT_NE(I, E);
-  EXPECT_EQ(&ARC, &*I) << "Actual RefSCC: " << *I;
-  EXPECT_EQ(++I, E);
-}
-
-TEST(LazyCallGraphTest, IncomingEdgeInsertionLargeRefCycle) {
-  LLVMContext Context;
-  std::unique_ptr<Module> M =
-      parseAssembly(Context, "define void @a() {\n"
-                             "entry:\n"
-                             "  %p = alloca void ()*\n"
-                             "  store void ()* @b, void ()** %p\n"
-                             "  ret void\n"
-                             "}\n"
-                             "define void @b() {\n"
-                             "entry:\n"
-                             "  %p = alloca void ()*\n"
-                             "  store void ()* @c, void ()** %p\n"
-                             "  ret void\n"
-                             "}\n"
-                             "define void @c() {\n"
-                             "entry:\n"
-                             "  %p = alloca void ()*\n"
-                             "  store void ()* @d, void ()** %p\n"
-                             "  ret void\n"
-                             "}\n"
-                             "define void @d() {\n"
-                             "entry:\n"
-                             "  ret void\n"
-                             "}\n");
-  LazyCallGraph CG = buildCG(*M);
-
-  // Force the graph to be fully expanded.
-  CG.buildRefSCCs();
-  for (LazyCallGraph::RefSCC &RC : CG.postorder_ref_sccs())
-    dbgs() << "Formed RefSCC: " << RC << "\n";
-
-  LazyCallGraph::Node &A = *CG.lookup(lookupFunction(*M, "a"));
-  LazyCallGraph::Node &B = *CG.lookup(lookupFunction(*M, "b"));
-  LazyCallGraph::Node &C = *CG.lookup(lookupFunction(*M, "c"));
-  LazyCallGraph::Node &D = *CG.lookup(lookupFunction(*M, "d"));
-  LazyCallGraph::RefSCC &ARC = *CG.lookupRefSCC(A);
-  LazyCallGraph::RefSCC &BRC = *CG.lookupRefSCC(B);
-  LazyCallGraph::RefSCC &CRC = *CG.lookupRefSCC(C);
-  LazyCallGraph::RefSCC &DRC = *CG.lookupRefSCC(D);
-
-  // Connect the top to the bottom forming a large RefSCC made up just of
-  // references.
-  auto MergedRCs = ARC.insertIncomingRefEdge(D, A);
-  // Make sure we connected the nodes.
-  EXPECT_NE(D->begin(), D->end());
-  EXPECT_EQ(&A, &D->begin()->getNode());
-
-  // Check that we have the dead RCs, but ignore the order.
-  EXPECT_EQ(3u, MergedRCs.size());
-  EXPECT_NE(find(MergedRCs, &BRC), MergedRCs.end());
-  EXPECT_NE(find(MergedRCs, &CRC), MergedRCs.end());
-  EXPECT_NE(find(MergedRCs, &DRC), MergedRCs.end());
-
-  // Make sure the nodes point to the right place now.
-  EXPECT_EQ(&ARC, CG.lookupRefSCC(A));
-  EXPECT_EQ(&ARC, CG.lookupRefSCC(B));
-  EXPECT_EQ(&ARC, CG.lookupRefSCC(C));
-  EXPECT_EQ(&ARC, CG.lookupRefSCC(D));
-
-  // And verify the post-order walk reflects the updated structure.
-  auto I = CG.postorder_ref_scc_begin(), End = CG.postorder_ref_scc_end();
-  ASSERT_NE(I, End);
-  EXPECT_EQ(&ARC, &*I) << "Actual RefSCC: " << *I;
-  EXPECT_EQ(++I, End);
-}
-
-TEST(LazyCallGraphTest, InlineAndDeleteFunction) {
-  LLVMContext Context;
-  // We want to ensure we can delete nodes from relatively complex graphs and
-  // so use the diamond of triangles graph defined above.
-  //
-  // The ascii diagram is repeated here for easy reference.
-  //
-  //         d1       |
-  //        /  \      |
-  //       d3--d2     |
-  //      /     \     |
-  //     b1     c1    |
-  //   /  \    /  \   |
-  //  b3--b2  c3--c2  |
-  //       \  /       |
-  //        a1        |
-  //       /  \       |
-  //      a3--a2      |
-  //
-  std::unique_ptr<Module> M = parseAssembly(Context, DiamondOfTriangles);
-  LazyCallGraph CG = buildCG(*M);
-
-  // Force the graph to be fully expanded.
-  CG.buildRefSCCs();
-  for (LazyCallGraph::RefSCC &RC : CG.postorder_ref_sccs())
-    dbgs() << "Formed RefSCC: " << RC << "\n";
-
-  LazyCallGraph::Node &A1 = *CG.lookup(lookupFunction(*M, "a1"));
-  LazyCallGraph::Node &A2 = *CG.lookup(lookupFunction(*M, "a2"));
-  LazyCallGraph::Node &A3 = *CG.lookup(lookupFunction(*M, "a3"));
-  LazyCallGraph::Node &B1 = *CG.lookup(lookupFunction(*M, "b1"));
-  LazyCallGraph::Node &B2 = *CG.lookup(lookupFunction(*M, "b2"));
-  LazyCallGraph::Node &B3 = *CG.lookup(lookupFunction(*M, "b3"));
-  LazyCallGraph::Node &C1 = *CG.lookup(lookupFunction(*M, "c1"));
-  LazyCallGraph::Node &C2 = *CG.lookup(lookupFunction(*M, "c2"));
-  LazyCallGraph::Node &C3 = *CG.lookup(lookupFunction(*M, "c3"));
-  LazyCallGraph::Node &D1 = *CG.lookup(lookupFunction(*M, "d1"));
-  LazyCallGraph::Node &D2 = *CG.lookup(lookupFunction(*M, "d2"));
-  LazyCallGraph::Node &D3 = *CG.lookup(lookupFunction(*M, "d3"));
-  LazyCallGraph::RefSCC &ARC = *CG.lookupRefSCC(A1);
-  LazyCallGraph::RefSCC &BRC = *CG.lookupRefSCC(B1);
-  LazyCallGraph::RefSCC &CRC = *CG.lookupRefSCC(C1);
-  LazyCallGraph::RefSCC &DRC = *CG.lookupRefSCC(D1);
-  ASSERT_EQ(&ARC, CG.lookupRefSCC(A2));
-  ASSERT_EQ(&ARC, CG.lookupRefSCC(A3));
-  ASSERT_EQ(&BRC, CG.lookupRefSCC(B2));
-  ASSERT_EQ(&BRC, CG.lookupRefSCC(B3));
-  ASSERT_EQ(&CRC, CG.lookupRefSCC(C2));
-  ASSERT_EQ(&CRC, CG.lookupRefSCC(C3));
-  ASSERT_EQ(&DRC, CG.lookupRefSCC(D2));
-  ASSERT_EQ(&DRC, CG.lookupRefSCC(D3));
-  ASSERT_EQ(1, std::distance(D2->begin(), D2->end()));
-
-  // Delete d2 from the graph, as if it had been inlined.
-  //
-  //         d1         |
-  //        / /         |
-  //       d3--.        |
-  //      /     \       |
-  //     b1     c1      |
-  //   /  \    /  \     |
-  //  b3--b2  c3--c2    |
-  //       \  /         |
-  //        a1          |
-  //       /  \         |
-  //      a3--a2        |
-
-  Function &D2F = D2.getFunction();
-  CallInst *C1Call = nullptr, *D1Call = nullptr;
-  for (User *U : D2F.users()) {
-    CallInst *CI = dyn_cast<CallInst>(U);
-    ASSERT_TRUE(CI) << "Expected a call: " << *U;
-    if (CI->getParent()->getParent() == &C1.getFunction()) {
-      ASSERT_EQ(nullptr, C1Call) << "Found too many C1 calls: " << *CI;
-      C1Call = CI;
-    } else if (CI->getParent()->getParent() == &D1.getFunction()) {
-      ASSERT_EQ(nullptr, D1Call) << "Found too many D1 calls: " << *CI;
-      D1Call = CI;
-    } else {
-      FAIL() << "Found an unexpected call instruction: " << *CI;
-    }
-  }
-  ASSERT_NE(C1Call, nullptr);
-  ASSERT_NE(D1Call, nullptr);
-  ASSERT_EQ(&D2F, C1Call->getCalledFunction());
-  ASSERT_EQ(&D2F, D1Call->getCalledFunction());
-  C1Call->setCalledFunction(&D3.getFunction());
-  D1Call->setCalledFunction(&D3.getFunction());
-  ASSERT_EQ(0u, D2F.getNumUses());
-
-  // Insert new edges first.
-  CRC.insertTrivialCallEdge(C1, D3);
-  DRC.insertTrivialCallEdge(D1, D3);
-
-  // Then remove the old ones.
-  LazyCallGraph::SCC &DC = *CG.lookupSCC(D2);
-  auto NewCs = DRC.switchInternalEdgeToRef(D1, D2);
-  EXPECT_EQ(&DC, CG.lookupSCC(D2));
-  EXPECT_EQ(NewCs.end(), std::next(NewCs.begin()));
-  LazyCallGraph::SCC &NewDC = *NewCs.begin();
-  EXPECT_EQ(&NewDC, CG.lookupSCC(D1));
-  EXPECT_EQ(&NewDC, CG.lookupSCC(D3));
-  auto NewRCs = DRC.removeInternalRefEdge(D1, {&D2});
-  ASSERT_EQ(2u, NewRCs.size());
-  LazyCallGraph::RefSCC &NewDRC = *NewRCs[0];
-  EXPECT_EQ(&NewDRC, CG.lookupRefSCC(D1));
-  EXPECT_EQ(&NewDRC, CG.lookupRefSCC(D3));
-  LazyCallGraph::RefSCC &D2RC = *NewRCs[1];
-  EXPECT_EQ(&D2RC, CG.lookupRefSCC(D2));
-  EXPECT_FALSE(NewDRC.isParentOf(D2RC));
-  EXPECT_TRUE(CRC.isParentOf(D2RC));
-  EXPECT_TRUE(CRC.isParentOf(NewDRC));
-  EXPECT_TRUE(D2RC.isParentOf(NewDRC));
-  CRC.removeOutgoingEdge(C1, D2);
-  EXPECT_FALSE(CRC.isParentOf(D2RC));
-  EXPECT_TRUE(CRC.isParentOf(NewDRC));
-  EXPECT_TRUE(D2RC.isParentOf(NewDRC));
-
-  // Now that we've updated the call graph, D2 is dead, so remove it.
-  CG.removeDeadFunction(D2F);
-
-  // Check that the graph still looks the same.
-  EXPECT_EQ(&ARC, CG.lookupRefSCC(A1));
-  EXPECT_EQ(&ARC, CG.lookupRefSCC(A2));
-  EXPECT_EQ(&ARC, CG.lookupRefSCC(A3));
-  EXPECT_EQ(&BRC, CG.lookupRefSCC(B1));
-  EXPECT_EQ(&BRC, CG.lookupRefSCC(B2));
-  EXPECT_EQ(&BRC, CG.lookupRefSCC(B3));
-  EXPECT_EQ(&CRC, CG.lookupRefSCC(C1));
-  EXPECT_EQ(&CRC, CG.lookupRefSCC(C2));
-  EXPECT_EQ(&CRC, CG.lookupRefSCC(C3));
-  EXPECT_EQ(&NewDRC, CG.lookupRefSCC(D1));
-  EXPECT_EQ(&NewDRC, CG.lookupRefSCC(D3));
-  EXPECT_TRUE(CRC.isParentOf(NewDRC));
-
-  // Verify the post-order walk hasn't changed.
-  auto I = CG.postorder_ref_scc_begin(), E = CG.postorder_ref_scc_end();
-  ASSERT_NE(I, E);
-  EXPECT_EQ(&NewDRC, &*I) << "Actual RefSCC: " << *I;
-  ASSERT_NE(++I, E);
-  EXPECT_EQ(&BRC, &*I) << "Actual RefSCC: " << *I;
-  ASSERT_NE(++I, E);
-  EXPECT_EQ(&CRC, &*I) << "Actual RefSCC: " << *I;
-  ASSERT_NE(++I, E);
-  EXPECT_EQ(&ARC, &*I) << "Actual RefSCC: " << *I;
-  EXPECT_EQ(++I, E);
-}
-
-TEST(LazyCallGraphTest, InternalEdgeMutation) {
-  LLVMContext Context;
-  std::unique_ptr<Module> M = parseAssembly(Context, "define void @a() {\n"
-                                                     "entry:\n"
-                                                     "  call void @b()\n"
-                                                     "  ret void\n"
-                                                     "}\n"
-                                                     "define void @b() {\n"
-                                                     "entry:\n"
-                                                     "  call void @c()\n"
-                                                     "  ret void\n"
-                                                     "}\n"
-                                                     "define void @c() {\n"
-                                                     "entry:\n"
-                                                     "  call void @a()\n"
-                                                     "  ret void\n"
-                                                     "}\n");
-  LazyCallGraph CG = buildCG(*M);
-
-  // Force the graph to be fully expanded.
-  CG.buildRefSCCs();
-  auto I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC &RC = *I++;
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-
-  LazyCallGraph::Node &A = *CG.lookup(lookupFunction(*M, "a"));
-  LazyCallGraph::Node &B = *CG.lookup(lookupFunction(*M, "b"));
-  LazyCallGraph::Node &C = *CG.lookup(lookupFunction(*M, "c"));
-  EXPECT_EQ(&RC, CG.lookupRefSCC(A));
-  EXPECT_EQ(&RC, CG.lookupRefSCC(B));
-  EXPECT_EQ(&RC, CG.lookupRefSCC(C));
-  EXPECT_EQ(1, RC.size());
-  EXPECT_EQ(&*RC.begin(), CG.lookupSCC(A));
-  EXPECT_EQ(&*RC.begin(), CG.lookupSCC(B));
-  EXPECT_EQ(&*RC.begin(), CG.lookupSCC(C));
-
-  // Insert an edge from 'a' to 'c'. Nothing changes about the graph.
-  RC.insertInternalRefEdge(A, C);
-  EXPECT_EQ(2, std::distance(A->begin(), A->end()));
-  EXPECT_EQ(&RC, CG.lookupRefSCC(A));
-  EXPECT_EQ(&RC, CG.lookupRefSCC(B));
-  EXPECT_EQ(&RC, CG.lookupRefSCC(C));
-  EXPECT_EQ(1, RC.size());
-  EXPECT_EQ(&*RC.begin(), CG.lookupSCC(A));
-  EXPECT_EQ(&*RC.begin(), CG.lookupSCC(B));
-  EXPECT_EQ(&*RC.begin(), CG.lookupSCC(C));
-
-  // Switch the call edge from 'b' to 'c' to a ref edge. This will break the
-  // call cycle and cause us to form more SCCs. The RefSCC will remain the same
-  // though.
-  auto NewCs = RC.switchInternalEdgeToRef(B, C);
-  EXPECT_EQ(&RC, CG.lookupRefSCC(A));
-  EXPECT_EQ(&RC, CG.lookupRefSCC(B));
-  EXPECT_EQ(&RC, CG.lookupRefSCC(C));
-  auto J = RC.begin();
-  // The SCCs must be in *post-order* which means successors before
-  // predecessors. At this point we have call edges from C to A and from A to
-  // B. The only valid postorder is B, A, C.
-  EXPECT_EQ(&*J++, CG.lookupSCC(B));
-  EXPECT_EQ(&*J++, CG.lookupSCC(A));
-  EXPECT_EQ(&*J++, CG.lookupSCC(C));
-  EXPECT_EQ(RC.end(), J);
-  // And the returned range must be the slice of this sequence containing new
-  // SCCs.
-  EXPECT_EQ(RC.begin(), NewCs.begin());
-  EXPECT_EQ(std::prev(RC.end()), NewCs.end());
-
-  // Test turning the ref edge from A to C into a call edge. This will form an
-  // SCC out of A and C. Since we previously had a call edge from C to A, the
-  // C SCC should be preserved and have A merged into it while the A SCC should
-  // be invalidated.
-  LazyCallGraph::SCC &AC = *CG.lookupSCC(A);
-  LazyCallGraph::SCC &CC = *CG.lookupSCC(C);
-  EXPECT_TRUE(RC.switchInternalEdgeToCall(A, C, [&](ArrayRef<LazyCallGraph::SCC *> MergedCs) {
-    ASSERT_EQ(1u, MergedCs.size());
-    EXPECT_EQ(&AC, MergedCs[0]);
-  }));
-  EXPECT_EQ(2, CC.size());
-  EXPECT_EQ(&CC, CG.lookupSCC(A));
-  EXPECT_EQ(&CC, CG.lookupSCC(C));
-  J = RC.begin();
-  EXPECT_EQ(&*J++, CG.lookupSCC(B));
-  EXPECT_EQ(&*J++, CG.lookupSCC(C));
-  EXPECT_EQ(RC.end(), J);
-}
-
-TEST(LazyCallGraphTest, InternalEdgeRemoval) {
-  LLVMContext Context;
-  // A nice fully connected (including self-edges) RefSCC.
-  std::unique_ptr<Module> M = parseAssembly(
-      Context, "define void @a(i8** %ptr) {\n"
-               "entry:\n"
-               "  store i8* bitcast (void(i8**)* @a to i8*), i8** %ptr\n"
-               "  store i8* bitcast (void(i8**)* @b to i8*), i8** %ptr\n"
-               "  store i8* bitcast (void(i8**)* @c to i8*), i8** %ptr\n"
-               "  ret void\n"
-               "}\n"
-               "define void @b(i8** %ptr) {\n"
-               "entry:\n"
-               "  store i8* bitcast (void(i8**)* @a to i8*), i8** %ptr\n"
-               "  store i8* bitcast (void(i8**)* @b to i8*), i8** %ptr\n"
-               "  store i8* bitcast (void(i8**)* @c to i8*), i8** %ptr\n"
-               "  ret void\n"
-               "}\n"
-               "define void @c(i8** %ptr) {\n"
-               "entry:\n"
-               "  store i8* bitcast (void(i8**)* @a to i8*), i8** %ptr\n"
-               "  store i8* bitcast (void(i8**)* @b to i8*), i8** %ptr\n"
-               "  store i8* bitcast (void(i8**)* @c to i8*), i8** %ptr\n"
-               "  ret void\n"
-               "}\n");
-  LazyCallGraph CG = buildCG(*M);
-
-  // Force the graph to be fully expanded.
-  CG.buildRefSCCs();
-  auto I = CG.postorder_ref_scc_begin(), E = CG.postorder_ref_scc_end();
-  LazyCallGraph::RefSCC &RC = *I;
-  EXPECT_EQ(E, std::next(I));
-
-  LazyCallGraph::Node &A = *CG.lookup(lookupFunction(*M, "a"));
-  LazyCallGraph::Node &B = *CG.lookup(lookupFunction(*M, "b"));
-  LazyCallGraph::Node &C = *CG.lookup(lookupFunction(*M, "c"));
-  EXPECT_EQ(&RC, CG.lookupRefSCC(A));
-  EXPECT_EQ(&RC, CG.lookupRefSCC(B));
-  EXPECT_EQ(&RC, CG.lookupRefSCC(C));
-
-  // Remove the edge from b -> a, which should leave the 3 functions still in
-  // a single connected component because of a -> b -> c -> a.
-  SmallVector<LazyCallGraph::RefSCC *, 1> NewRCs =
-      RC.removeInternalRefEdge(B, {&A});
-  EXPECT_EQ(0u, NewRCs.size());
-  EXPECT_EQ(&RC, CG.lookupRefSCC(A));
-  EXPECT_EQ(&RC, CG.lookupRefSCC(B));
-  EXPECT_EQ(&RC, CG.lookupRefSCC(C));
-  auto J = CG.postorder_ref_scc_begin();
-  EXPECT_EQ(I, J);
-  EXPECT_EQ(&RC, &*J);
-  EXPECT_EQ(E, std::next(J));
-
-  // Increment I before we actually mutate the structure so that it remains
-  // a valid iterator.
-  ++I;
-
-  // Remove the edge from c -> a, which should leave 'a' in the original RefSCC
-  // and form a new RefSCC for 'b' and 'c'.
-  NewRCs = RC.removeInternalRefEdge(C, {&A});
-  ASSERT_EQ(2u, NewRCs.size());
-  LazyCallGraph::RefSCC &BCRC = *NewRCs[0];
-  LazyCallGraph::RefSCC &ARC = *NewRCs[1];
-  EXPECT_EQ(&ARC, CG.lookupRefSCC(A));
-  EXPECT_EQ(1, std::distance(ARC.begin(), ARC.end()));
-  EXPECT_EQ(&BCRC, CG.lookupRefSCC(B));
-  EXPECT_EQ(&BCRC, CG.lookupRefSCC(C));
-  J = CG.postorder_ref_scc_begin();
-  EXPECT_NE(I, J);
-  EXPECT_EQ(&BCRC, &*J);
-  ++J;
-  EXPECT_NE(I, J);
-  EXPECT_EQ(&ARC, &*J);
-  ++J;
-  EXPECT_EQ(I, J);
-  EXPECT_EQ(E, J);
-}
-
-TEST(LazyCallGraphTest, InternalMultiEdgeRemoval) {
-  LLVMContext Context;
-  // A nice fully connected (including self-edges) RefSCC.
-  std::unique_ptr<Module> M = parseAssembly(
-      Context, "define void @a(i8** %ptr) {\n"
-               "entry:\n"
-               "  store i8* bitcast (void(i8**)* @a to i8*), i8** %ptr\n"
-               "  store i8* bitcast (void(i8**)* @b to i8*), i8** %ptr\n"
-               "  store i8* bitcast (void(i8**)* @c to i8*), i8** %ptr\n"
-               "  ret void\n"
-               "}\n"
-               "define void @b(i8** %ptr) {\n"
-               "entry:\n"
-               "  store i8* bitcast (void(i8**)* @a to i8*), i8** %ptr\n"
-               "  store i8* bitcast (void(i8**)* @b to i8*), i8** %ptr\n"
-               "  store i8* bitcast (void(i8**)* @c to i8*), i8** %ptr\n"
-               "  ret void\n"
-               "}\n"
-               "define void @c(i8** %ptr) {\n"
-               "entry:\n"
-               "  store i8* bitcast (void(i8**)* @a to i8*), i8** %ptr\n"
-               "  store i8* bitcast (void(i8**)* @b to i8*), i8** %ptr\n"
-               "  store i8* bitcast (void(i8**)* @c to i8*), i8** %ptr\n"
-               "  ret void\n"
-               "}\n");
-  LazyCallGraph CG = buildCG(*M);
-
-  // Force the graph to be fully expanded.
-  CG.buildRefSCCs();
-  auto I = CG.postorder_ref_scc_begin(), E = CG.postorder_ref_scc_end();
-  LazyCallGraph::RefSCC &RC = *I;
-  EXPECT_EQ(E, std::next(I));
-
-  LazyCallGraph::Node &A = *CG.lookup(lookupFunction(*M, "a"));
-  LazyCallGraph::Node &B = *CG.lookup(lookupFunction(*M, "b"));
-  LazyCallGraph::Node &C = *CG.lookup(lookupFunction(*M, "c"));
-  EXPECT_EQ(&RC, CG.lookupRefSCC(A));
-  EXPECT_EQ(&RC, CG.lookupRefSCC(B));
-  EXPECT_EQ(&RC, CG.lookupRefSCC(C));
-
-  // Increment I before we actually mutate the structure so that it remains
-  // a valid iterator.
-  ++I;
-
-  // Remove the edges from b -> a and b -> c, leaving b in its own RefSCC.
-  SmallVector<LazyCallGraph::RefSCC *, 1> NewRCs =
-      RC.removeInternalRefEdge(B, {&A, &C});
-
-  ASSERT_EQ(2u, NewRCs.size());
-  LazyCallGraph::RefSCC &BRC = *NewRCs[0];
-  LazyCallGraph::RefSCC &ACRC = *NewRCs[1];
-  EXPECT_EQ(&BRC, CG.lookupRefSCC(B));
-  EXPECT_EQ(1, std::distance(BRC.begin(), BRC.end()));
-  EXPECT_EQ(&ACRC, CG.lookupRefSCC(A));
-  EXPECT_EQ(&ACRC, CG.lookupRefSCC(C));
-  auto J = CG.postorder_ref_scc_begin();
-  EXPECT_NE(I, J);
-  EXPECT_EQ(&BRC, &*J);
-  ++J;
-  EXPECT_NE(I, J);
-  EXPECT_EQ(&ACRC, &*J);
-  ++J;
-  EXPECT_EQ(I, J);
-  EXPECT_EQ(E, J);
-}
-
-TEST(LazyCallGraphTest, InternalNoOpEdgeRemoval) {
-  LLVMContext Context;
-  // A graph with a single cycle formed both from call and reference edges
-  // which makes the reference edges trivial to delete. The graph looks like:
-  //
-  // Reference edges: a -> b -> c -> a
-  //      Call edges: a -> c -> b -> a
-  std::unique_ptr<Module> M = parseAssembly(
-      Context, "define void @a(i8** %ptr) {\n"
-               "entry:\n"
-               "  call void @b(i8** %ptr)\n"
-               "  store i8* bitcast (void(i8**)* @c to i8*), i8** %ptr\n"
-               "  ret void\n"
-               "}\n"
-               "define void @b(i8** %ptr) {\n"
-               "entry:\n"
-               "  store i8* bitcast (void(i8**)* @a to i8*), i8** %ptr\n"
-               "  call void @c(i8** %ptr)\n"
-               "  ret void\n"
-               "}\n"
-               "define void @c(i8** %ptr) {\n"
-               "entry:\n"
-               "  call void @a(i8** %ptr)\n"
-               "  store i8* bitcast (void(i8**)* @b to i8*), i8** %ptr\n"
-               "  ret void\n"
-               "}\n");
-  LazyCallGraph CG = buildCG(*M);
-
-  // Force the graph to be fully expanded.
-  CG.buildRefSCCs();
-  auto I = CG.postorder_ref_scc_begin(), E = CG.postorder_ref_scc_end();
-  LazyCallGraph::RefSCC &RC = *I;
-  EXPECT_EQ(E, std::next(I));
-
-  LazyCallGraph::SCC &C = *RC.begin();
-  EXPECT_EQ(RC.end(), std::next(RC.begin()));
-
-  LazyCallGraph::Node &AN = *CG.lookup(lookupFunction(*M, "a"));
-  LazyCallGraph::Node &BN = *CG.lookup(lookupFunction(*M, "b"));
-  LazyCallGraph::Node &CN = *CG.lookup(lookupFunction(*M, "c"));
-  EXPECT_EQ(&RC, CG.lookupRefSCC(AN));
-  EXPECT_EQ(&RC, CG.lookupRefSCC(BN));
-  EXPECT_EQ(&RC, CG.lookupRefSCC(CN));
-  EXPECT_EQ(&C, CG.lookupSCC(AN));
-  EXPECT_EQ(&C, CG.lookupSCC(BN));
-  EXPECT_EQ(&C, CG.lookupSCC(CN));
-
-  // Remove the edge from a -> c which doesn't change anything.
-  SmallVector<LazyCallGraph::RefSCC *, 1> NewRCs =
-      RC.removeInternalRefEdge(AN, {&CN});
-  EXPECT_EQ(0u, NewRCs.size());
-  EXPECT_EQ(&RC, CG.lookupRefSCC(AN));
-  EXPECT_EQ(&RC, CG.lookupRefSCC(BN));
-  EXPECT_EQ(&RC, CG.lookupRefSCC(CN));
-  EXPECT_EQ(&C, CG.lookupSCC(AN));
-  EXPECT_EQ(&C, CG.lookupSCC(BN));
-  EXPECT_EQ(&C, CG.lookupSCC(CN));
-  auto J = CG.postorder_ref_scc_begin();
-  EXPECT_EQ(I, J);
-  EXPECT_EQ(&RC, &*J);
-  EXPECT_EQ(E, std::next(J));
-
-  // Remove the edge from b -> a and c -> b; again this doesn't change
-  // anything.
-  NewRCs = RC.removeInternalRefEdge(BN, {&AN});
-  NewRCs = RC.removeInternalRefEdge(CN, {&BN});
-  EXPECT_EQ(0u, NewRCs.size());
-  EXPECT_EQ(&RC, CG.lookupRefSCC(AN));
-  EXPECT_EQ(&RC, CG.lookupRefSCC(BN));
-  EXPECT_EQ(&RC, CG.lookupRefSCC(CN));
-  EXPECT_EQ(&C, CG.lookupSCC(AN));
-  EXPECT_EQ(&C, CG.lookupSCC(BN));
-  EXPECT_EQ(&C, CG.lookupSCC(CN));
-  J = CG.postorder_ref_scc_begin();
-  EXPECT_EQ(I, J);
-  EXPECT_EQ(&RC, &*J);
-  EXPECT_EQ(E, std::next(J));
-}
-
-TEST(LazyCallGraphTest, InternalCallEdgeToRef) {
-  LLVMContext Context;
-  // A nice fully connected (including self-edges) SCC (and RefSCC)
-  std::unique_ptr<Module> M = parseAssembly(Context, "define void @a() {\n"
-                                                     "entry:\n"
-                                                     "  call void @a()\n"
-                                                     "  call void @b()\n"
-                                                     "  call void @c()\n"
-                                                     "  ret void\n"
-                                                     "}\n"
-                                                     "define void @b() {\n"
-                                                     "entry:\n"
-                                                     "  call void @a()\n"
-                                                     "  call void @b()\n"
-                                                     "  call void @c()\n"
-                                                     "  ret void\n"
-                                                     "}\n"
-                                                     "define void @c() {\n"
-                                                     "entry:\n"
-                                                     "  call void @a()\n"
-                                                     "  call void @b()\n"
-                                                     "  call void @c()\n"
-                                                     "  ret void\n"
-                                                     "}\n");
-  LazyCallGraph CG = buildCG(*M);
-
-  // Force the graph to be fully expanded.
-  CG.buildRefSCCs();
-  auto I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC &RC = *I++;
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-
-  EXPECT_EQ(1, RC.size());
-  LazyCallGraph::SCC &AC = *RC.begin();
-
-  LazyCallGraph::Node &AN = *CG.lookup(lookupFunction(*M, "a"));
-  LazyCallGraph::Node &BN = *CG.lookup(lookupFunction(*M, "b"));
-  LazyCallGraph::Node &CN = *CG.lookup(lookupFunction(*M, "c"));
-  EXPECT_EQ(&AC, CG.lookupSCC(AN));
-  EXPECT_EQ(&AC, CG.lookupSCC(BN));
-  EXPECT_EQ(&AC, CG.lookupSCC(CN));
-
-  // Remove the call edge from b -> a to a ref edge, which should leave the
-  // 3 functions still in a single connected component because of a -> b ->
-  // c -> a.
-  auto NewCs = RC.switchInternalEdgeToRef(BN, AN);
-  EXPECT_EQ(NewCs.begin(), NewCs.end());
-  EXPECT_EQ(1, RC.size());
-  EXPECT_EQ(&AC, CG.lookupSCC(AN));
-  EXPECT_EQ(&AC, CG.lookupSCC(BN));
-  EXPECT_EQ(&AC, CG.lookupSCC(CN));
-
-  // Remove the edge from c -> a, which should leave 'a' in the original SCC
-  // and form a new SCC for 'b' and 'c'.
-  NewCs = RC.switchInternalEdgeToRef(CN, AN);
-  EXPECT_EQ(1, std::distance(NewCs.begin(), NewCs.end()));
-  EXPECT_EQ(2, RC.size());
-  EXPECT_EQ(&AC, CG.lookupSCC(AN));
-  LazyCallGraph::SCC &BC = *CG.lookupSCC(BN);
-  EXPECT_NE(&BC, &AC);
-  EXPECT_EQ(&BC, CG.lookupSCC(CN));
-  auto J = RC.find(AC);
-  EXPECT_EQ(&AC, &*J);
-  --J;
-  EXPECT_EQ(&BC, &*J);
-  EXPECT_EQ(RC.begin(), J);
-  EXPECT_EQ(J, NewCs.begin());
-
-  // Remove the edge from c -> b, which should leave 'b' in the original SCC
-  // and form a new SCC for 'c'. It shouldn't change 'a's SCC.
-  NewCs = RC.switchInternalEdgeToRef(CN, BN);
-  EXPECT_EQ(1, std::distance(NewCs.begin(), NewCs.end()));
-  EXPECT_EQ(3, RC.size());
-  EXPECT_EQ(&AC, CG.lookupSCC(AN));
-  EXPECT_EQ(&BC, CG.lookupSCC(BN));
-  LazyCallGraph::SCC &CC = *CG.lookupSCC(CN);
-  EXPECT_NE(&CC, &AC);
-  EXPECT_NE(&CC, &BC);
-  J = RC.find(AC);
-  EXPECT_EQ(&AC, &*J);
-  --J;
-  EXPECT_EQ(&BC, &*J);
-  --J;
-  EXPECT_EQ(&CC, &*J);
-  EXPECT_EQ(RC.begin(), J);
-  EXPECT_EQ(J, NewCs.begin());
-}
-
-TEST(LazyCallGraphTest, InternalRefEdgeToCall) {
-  LLVMContext Context;
-  // Basic tests for making a ref edge a call. This hits the basics of the
-  // process only.
-  std::unique_ptr<Module> M =
-      parseAssembly(Context, "define void @a() {\n"
-                             "entry:\n"
-                             "  call void @b()\n"
-                             "  call void @c()\n"
-                             "  store void()* @d, void()** undef\n"
-                             "  ret void\n"
-                             "}\n"
-                             "define void @b() {\n"
-                             "entry:\n"
-                             "  store void()* @c, void()** undef\n"
-                             "  call void @d()\n"
-                             "  ret void\n"
-                             "}\n"
-                             "define void @c() {\n"
-                             "entry:\n"
-                             "  store void()* @b, void()** undef\n"
-                             "  call void @d()\n"
-                             "  ret void\n"
-                             "}\n"
-                             "define void @d() {\n"
-                             "entry:\n"
-                             "  store void()* @a, void()** undef\n"
-                             "  ret void\n"
-                             "}\n");
-  LazyCallGraph CG = buildCG(*M);
-
-  // Force the graph to be fully expanded.
-  CG.buildRefSCCs();
-  auto I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC &RC = *I++;
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-
-  LazyCallGraph::Node &A = *CG.lookup(lookupFunction(*M, "a"));
-  LazyCallGraph::Node &B = *CG.lookup(lookupFunction(*M, "b"));
-  LazyCallGraph::Node &C = *CG.lookup(lookupFunction(*M, "c"));
-  LazyCallGraph::Node &D = *CG.lookup(lookupFunction(*M, "d"));
-  LazyCallGraph::SCC &AC = *CG.lookupSCC(A);
-  LazyCallGraph::SCC &BC = *CG.lookupSCC(B);
-  LazyCallGraph::SCC &CC = *CG.lookupSCC(C);
-  LazyCallGraph::SCC &DC = *CG.lookupSCC(D);
-
-  // Check the initial post-order. Note that B and C could be flipped here (and
-  // in our mutation) without changing the nature of this test.
-  ASSERT_EQ(4, RC.size());
-  EXPECT_EQ(&DC, &RC[0]);
-  EXPECT_EQ(&BC, &RC[1]);
-  EXPECT_EQ(&CC, &RC[2]);
-  EXPECT_EQ(&AC, &RC[3]);
-
-  // Switch the ref edge from A -> D to a call edge. This should have no
-  // effect as it is already in postorder and no new cycles are formed.
-  EXPECT_FALSE(RC.switchInternalEdgeToCall(A, D));
-  ASSERT_EQ(4, RC.size());
-  EXPECT_EQ(&DC, &RC[0]);
-  EXPECT_EQ(&BC, &RC[1]);
-  EXPECT_EQ(&CC, &RC[2]);
-  EXPECT_EQ(&AC, &RC[3]);
-
-  // Switch B -> C to a call edge. This doesn't form any new cycles but does
-  // require reordering the SCCs.
-  EXPECT_FALSE(RC.switchInternalEdgeToCall(B, C));
-  ASSERT_EQ(4, RC.size());
-  EXPECT_EQ(&DC, &RC[0]);
-  EXPECT_EQ(&CC, &RC[1]);
-  EXPECT_EQ(&BC, &RC[2]);
-  EXPECT_EQ(&AC, &RC[3]);
-
-  // Switch C -> B to a call edge. This forms a cycle and forces merging SCCs.
-  EXPECT_TRUE(RC.switchInternalEdgeToCall(C, B, [&](ArrayRef<LazyCallGraph::SCC *> MergedCs) {
-    ASSERT_EQ(1u, MergedCs.size());
-    EXPECT_EQ(&CC, MergedCs[0]);
-  }));
-  ASSERT_EQ(3, RC.size());
-  EXPECT_EQ(&DC, &RC[0]);
-  EXPECT_EQ(&BC, &RC[1]);
-  EXPECT_EQ(&AC, &RC[2]);
-  EXPECT_EQ(2, BC.size());
-  EXPECT_EQ(&BC, CG.lookupSCC(B));
-  EXPECT_EQ(&BC, CG.lookupSCC(C));
-}
-
-TEST(LazyCallGraphTest, InternalRefEdgeToCallNoCycleInterleaved) {
-  LLVMContext Context;
-  // Test for having a post-order prior to changing a ref edge to a call edge
-  // with SCCs connecting to the source and connecting to the target, but not
-  // connecting to both, interleaved between the source and target. This
-  // ensures we correctly partition the range rather than simply moving one or
-  // the other.
-  std::unique_ptr<Module> M =
-      parseAssembly(Context, "define void @a() {\n"
-                             "entry:\n"
-                             "  call void @b1()\n"
-                             "  call void @c1()\n"
-                             "  ret void\n"
-                             "}\n"
-                             "define void @b1() {\n"
-                             "entry:\n"
-                             "  call void @c1()\n"
-                             "  call void @b2()\n"
-                             "  ret void\n"
-                             "}\n"
-                             "define void @c1() {\n"
-                             "entry:\n"
-                             "  call void @b2()\n"
-                             "  call void @c2()\n"
-                             "  ret void\n"
-                             "}\n"
-                             "define void @b2() {\n"
-                             "entry:\n"
-                             "  call void @c2()\n"
-                             "  call void @b3()\n"
-                             "  ret void\n"
-                             "}\n"
-                             "define void @c2() {\n"
-                             "entry:\n"
-                             "  call void @b3()\n"
-                             "  call void @c3()\n"
-                             "  ret void\n"
-                             "}\n"
-                             "define void @b3() {\n"
-                             "entry:\n"
-                             "  call void @c3()\n"
-                             "  call void @d()\n"
-                             "  ret void\n"
-                             "}\n"
-                             "define void @c3() {\n"
-                             "entry:\n"
-                             "  store void()* @b1, void()** undef\n"
-                             "  call void @d()\n"
-                             "  ret void\n"
-                             "}\n"
-                             "define void @d() {\n"
-                             "entry:\n"
-                             "  store void()* @a, void()** undef\n"
-                             "  ret void\n"
-                             "}\n");
-  LazyCallGraph CG = buildCG(*M);
-
-  // Force the graph to be fully expanded.
-  CG.buildRefSCCs();
-  auto I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC &RC = *I++;
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-
-  LazyCallGraph::Node &A = *CG.lookup(lookupFunction(*M, "a"));
-  LazyCallGraph::Node &B1 = *CG.lookup(lookupFunction(*M, "b1"));
-  LazyCallGraph::Node &B2 = *CG.lookup(lookupFunction(*M, "b2"));
-  LazyCallGraph::Node &B3 = *CG.lookup(lookupFunction(*M, "b3"));
-  LazyCallGraph::Node &C1 = *CG.lookup(lookupFunction(*M, "c1"));
-  LazyCallGraph::Node &C2 = *CG.lookup(lookupFunction(*M, "c2"));
-  LazyCallGraph::Node &C3 = *CG.lookup(lookupFunction(*M, "c3"));
-  LazyCallGraph::Node &D = *CG.lookup(lookupFunction(*M, "d"));
-  LazyCallGraph::SCC &AC = *CG.lookupSCC(A);
-  LazyCallGraph::SCC &B1C = *CG.lookupSCC(B1);
-  LazyCallGraph::SCC &B2C = *CG.lookupSCC(B2);
-  LazyCallGraph::SCC &B3C = *CG.lookupSCC(B3);
-  LazyCallGraph::SCC &C1C = *CG.lookupSCC(C1);
-  LazyCallGraph::SCC &C2C = *CG.lookupSCC(C2);
-  LazyCallGraph::SCC &C3C = *CG.lookupSCC(C3);
-  LazyCallGraph::SCC &DC = *CG.lookupSCC(D);
-
-  // Several call edges are initially present to force a particual post-order.
-  // Remove them now, leaving an interleaved post-order pattern.
-  RC.switchTrivialInternalEdgeToRef(B3, C3);
-  RC.switchTrivialInternalEdgeToRef(C2, B3);
-  RC.switchTrivialInternalEdgeToRef(B2, C2);
-  RC.switchTrivialInternalEdgeToRef(C1, B2);
-  RC.switchTrivialInternalEdgeToRef(B1, C1);
-
-  // Check the initial post-order. We ensure this order with the extra edges
-  // that are nuked above.
-  ASSERT_EQ(8, RC.size());
-  EXPECT_EQ(&DC, &RC[0]);
-  EXPECT_EQ(&C3C, &RC[1]);
-  EXPECT_EQ(&B3C, &RC[2]);
-  EXPECT_EQ(&C2C, &RC[3]);
-  EXPECT_EQ(&B2C, &RC[4]);
-  EXPECT_EQ(&C1C, &RC[5]);
-  EXPECT_EQ(&B1C, &RC[6]);
-  EXPECT_EQ(&AC, &RC[7]);
-
-  // Switch C3 -> B1 to a call edge. This doesn't form any new cycles but does
-  // require reordering the SCCs in the face of tricky internal node
-  // structures.
-  EXPECT_FALSE(RC.switchInternalEdgeToCall(C3, B1));
-  ASSERT_EQ(8, RC.size());
-  EXPECT_EQ(&DC, &RC[0]);
-  EXPECT_EQ(&B3C, &RC[1]);
-  EXPECT_EQ(&B2C, &RC[2]);
-  EXPECT_EQ(&B1C, &RC[3]);
-  EXPECT_EQ(&C3C, &RC[4]);
-  EXPECT_EQ(&C2C, &RC[5]);
-  EXPECT_EQ(&C1C, &RC[6]);
-  EXPECT_EQ(&AC, &RC[7]);
-}
-
-TEST(LazyCallGraphTest, InternalRefEdgeToCallBothPartitionAndMerge) {
-  LLVMContext Context;
-  // Test for having a postorder where between the source and target are all
-  // three kinds of other SCCs:
-  // 1) One connected to the target only that have to be shifted below the
-  //    source.
-  // 2) One connected to the source only that have to be shifted below the
-  //    target.
-  // 3) One connected to both source and target that has to remain and get
-  //    merged away.
-  //
-  // To achieve this we construct a heavily connected graph to force
-  // a particular post-order. Then we remove the forcing edges and connect
-  // a cycle.
-  //
-  // Diagram for the graph we want on the left and the graph we use to force
-  // the ordering on the right. Edges ponit down or right.
-  //
-  //   A    |    A    |
-  //  / \   |   / \   |
-  // B   E  |  B   \  |
-  // |\  |  |  |\  |  |
-  // | D |  |  C-D-E  |
-  // |  \|  |  |  \|  |
-  // C   F  |  \   F  |
-  //  \ /   |   \ /   |
-  //   G    |    G    |
-  //
-  // And we form a cycle by connecting F to B.
-  std::unique_ptr<Module> M =
-      parseAssembly(Context, "define void @a() {\n"
-                             "entry:\n"
-                             "  call void @b()\n"
-                             "  call void @e()\n"
-                             "  ret void\n"
-                             "}\n"
-                             "define void @b() {\n"
-                             "entry:\n"
-                             "  call void @c()\n"
-                             "  call void @d()\n"
-                             "  ret void\n"
-                             "}\n"
-                             "define void @c() {\n"
-                             "entry:\n"
-                             "  call void @d()\n"
-                             "  call void @g()\n"
-                             "  ret void\n"
-                             "}\n"
-                             "define void @d() {\n"
-                             "entry:\n"
-                             "  call void @e()\n"
-                             "  call void @f()\n"
-                             "  ret void\n"
-                             "}\n"
-                             "define void @e() {\n"
-                             "entry:\n"
-                             "  call void @f()\n"
-                             "  ret void\n"
-                             "}\n"
-                             "define void @f() {\n"
-                             "entry:\n"
-                             "  store void()* @b, void()** undef\n"
-                             "  call void @g()\n"
-                             "  ret void\n"
-                             "}\n"
-                             "define void @g() {\n"
-                             "entry:\n"
-                             "  store void()* @a, void()** undef\n"
-                             "  ret void\n"
-                             "}\n");
-  LazyCallGraph CG = buildCG(*M);
-
-  // Force the graph to be fully expanded.
-  CG.buildRefSCCs();
-  auto I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC &RC = *I++;
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-
-  LazyCallGraph::Node &A = *CG.lookup(lookupFunction(*M, "a"));
-  LazyCallGraph::Node &B = *CG.lookup(lookupFunction(*M, "b"));
-  LazyCallGraph::Node &C = *CG.lookup(lookupFunction(*M, "c"));
-  LazyCallGraph::Node &D = *CG.lookup(lookupFunction(*M, "d"));
-  LazyCallGraph::Node &E = *CG.lookup(lookupFunction(*M, "e"));
-  LazyCallGraph::Node &F = *CG.lookup(lookupFunction(*M, "f"));
-  LazyCallGraph::Node &G = *CG.lookup(lookupFunction(*M, "g"));
-  LazyCallGraph::SCC &AC = *CG.lookupSCC(A);
-  LazyCallGraph::SCC &BC = *CG.lookupSCC(B);
-  LazyCallGraph::SCC &CC = *CG.lookupSCC(C);
-  LazyCallGraph::SCC &DC = *CG.lookupSCC(D);
-  LazyCallGraph::SCC &EC = *CG.lookupSCC(E);
-  LazyCallGraph::SCC &FC = *CG.lookupSCC(F);
-  LazyCallGraph::SCC &GC = *CG.lookupSCC(G);
-
-  // Remove the extra edges that were used to force a particular post-order.
-  RC.switchTrivialInternalEdgeToRef(C, D);
-  RC.switchTrivialInternalEdgeToRef(D, E);
-
-  // Check the initial post-order. We ensure this order with the extra edges
-  // that are nuked above.
-  ASSERT_EQ(7, RC.size());
-  EXPECT_EQ(&GC, &RC[0]);
-  EXPECT_EQ(&FC, &RC[1]);
-  EXPECT_EQ(&EC, &RC[2]);
-  EXPECT_EQ(&DC, &RC[3]);
-  EXPECT_EQ(&CC, &RC[4]);
-  EXPECT_EQ(&BC, &RC[5]);
-  EXPECT_EQ(&AC, &RC[6]);
-
-  // Switch F -> B to a call edge. This merges B, D, and F into a single SCC,
-  // and has to place the C and E SCCs on either side of it:
-  //   A          A    |
-  //  / \        / \   |
-  // B   E      |   E  |
-  // |\  |       \ /   |
-  // | D |  ->    B    |
-  // |  \|       / \   |
-  // C   F      C   |  |
-  //  \ /        \ /   |
-  //   G          G    |
-  EXPECT_TRUE(RC.switchInternalEdgeToCall(
-      F, B, [&](ArrayRef<LazyCallGraph::SCC *> MergedCs) {
-        ASSERT_EQ(2u, MergedCs.size());
-        EXPECT_EQ(&FC, MergedCs[0]);
-        EXPECT_EQ(&DC, MergedCs[1]);
-      }));
-  EXPECT_EQ(3, BC.size());
-
-  // And make sure the postorder was updated.
-  ASSERT_EQ(5, RC.size());
-  EXPECT_EQ(&GC, &RC[0]);
-  EXPECT_EQ(&CC, &RC[1]);
-  EXPECT_EQ(&BC, &RC[2]);
-  EXPECT_EQ(&EC, &RC[3]);
-  EXPECT_EQ(&AC, &RC[4]);
-}
-
-// Test for IR containing constants using blockaddress constant expressions.
-// These are truly unique constructs: constant expressions with non-constant
-// operands.
-TEST(LazyCallGraphTest, HandleBlockAddress) {
-  LLVMContext Context;
-  std::unique_ptr<Module> M =
-      parseAssembly(Context, "define void @f() {\n"
-                             "entry:\n"
-                             "  ret void\n"
-                             "bb:\n"
-                             "  unreachable\n"
-                             "}\n"
-                             "define void @g(i8** %ptr) {\n"
-                             "entry:\n"
-                             "  store i8* blockaddress(@f, %bb), i8** %ptr\n"
-                             "  ret void\n"
-                             "}\n");
-  LazyCallGraph CG = buildCG(*M);
-
-  CG.buildRefSCCs();
-  auto I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC &FRC = *I++;
-  LazyCallGraph::RefSCC &GRC = *I++;
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-
-  LazyCallGraph::Node &F = *CG.lookup(lookupFunction(*M, "f"));
-  LazyCallGraph::Node &G = *CG.lookup(lookupFunction(*M, "g"));
-  EXPECT_EQ(&FRC, CG.lookupRefSCC(F));
-  EXPECT_EQ(&GRC, CG.lookupRefSCC(G));
-  EXPECT_TRUE(GRC.isParentOf(FRC));
-}
-
-// Test that a blockaddress that refers to itself creates no new RefSCC
-// connections. https://bugs.llvm.org/show_bug.cgi?id=40722
-TEST(LazyCallGraphTest, HandleBlockAddress2) {
-  LLVMContext Context;
-  std::unique_ptr<Module> M =
-      parseAssembly(Context, "define void @f() {\n"
-                             "  ret void\n"
-                             "}\n"
-                             "define void @g(i8** %ptr) {\n"
-                             "bb:\n"
-                             "  store i8* blockaddress(@g, %bb), i8** %ptr\n"
-                             "  ret void\n"
-                             "}\n");
-  LazyCallGraph CG = buildCG(*M);
-
-  CG.buildRefSCCs();
-  auto I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC &FRC = *I++;
-  LazyCallGraph::RefSCC &GRC = *I++;
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-
-  LazyCallGraph::Node &F = *CG.lookup(lookupFunction(*M, "f"));
-  LazyCallGraph::Node &G = *CG.lookup(lookupFunction(*M, "g"));
-  EXPECT_EQ(&FRC, CG.lookupRefSCC(F));
-  EXPECT_EQ(&GRC, CG.lookupRefSCC(G));
-  EXPECT_FALSE(GRC.isParentOf(FRC));
-  EXPECT_FALSE(FRC.isParentOf(GRC));
-}
-
-TEST(LazyCallGraphTest, ReplaceNodeFunction) {
-  LLVMContext Context;
-  // A graph with several different kinds of edges pointing at a particular
-  // function.
-  std::unique_ptr<Module> M =
-      parseAssembly(Context,
-                    "define void @a(i8** %ptr) {\n"
-                    "entry:\n"
-                    "  store i8* bitcast (void(i8**)* @d to i8*), i8** %ptr\n"
-                    "  ret void\n"
-                    "}\n"
-                    "define void @b(i8** %ptr) {\n"
-                    "entry:\n"
-                    "  store i8* bitcast (void(i8**)* @d to i8*), i8** %ptr\n"
-                    "  store i8* bitcast (void(i8**)* @d to i8*), i8** %ptr\n"
-                    "  call void @d(i8** %ptr)"
-                    "  ret void\n"
-                    "}\n"
-                    "define void @c(i8** %ptr) {\n"
-                    "entry:\n"
-                    "  call void @d(i8** %ptr)"
-                    "  call void @d(i8** %ptr)"
-                    "  store i8* bitcast (void(i8**)* @d to i8*), i8** %ptr\n"
-                    "  ret void\n"
-                    "}\n"
-                    "define void @d(i8** %ptr) {\n"
-                    "entry:\n"
-                    "  store i8* bitcast (void(i8**)* @b to i8*), i8** %ptr\n"
-                    "  call void @c(i8** %ptr)"
-                    "  call void @d(i8** %ptr)"
-                    "  store i8* bitcast (void(i8**)* @d to i8*), i8** %ptr\n"
-                    "  ret void\n"
-                    "}\n");
-  LazyCallGraph CG = buildCG(*M);
-
-  // Force the graph to be fully expanded.
-  CG.buildRefSCCs();
-  auto I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC &RC1 = *I++;
-  LazyCallGraph::RefSCC &RC2 = *I++;
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-
-  ASSERT_EQ(2, RC1.size());
-  LazyCallGraph::SCC &C1 = RC1[0];
-  LazyCallGraph::SCC &C2 = RC1[1];
-
-  LazyCallGraph::Node &AN = *CG.lookup(lookupFunction(*M, "a"));
-  LazyCallGraph::Node &BN = *CG.lookup(lookupFunction(*M, "b"));
-  LazyCallGraph::Node &CN = *CG.lookup(lookupFunction(*M, "c"));
-  LazyCallGraph::Node &DN = *CG.lookup(lookupFunction(*M, "d"));
-  EXPECT_EQ(&C1, CG.lookupSCC(DN));
-  EXPECT_EQ(&C1, CG.lookupSCC(CN));
-  EXPECT_EQ(&C2, CG.lookupSCC(BN));
-  EXPECT_EQ(&RC1, CG.lookupRefSCC(DN));
-  EXPECT_EQ(&RC1, CG.lookupRefSCC(CN));
-  EXPECT_EQ(&RC1, CG.lookupRefSCC(BN));
-  EXPECT_EQ(&RC2, CG.lookupRefSCC(AN));
-
-  // Now we need to build a new function 'e' with the same signature as 'd'.
-  Function &D = DN.getFunction();
-  Function &E = *Function::Create(D.getFunctionType(), D.getLinkage(), "e");
-  D.getParent()->getFunctionList().insert(D.getIterator(), &E);
-
-  // Change each use of 'd' to use 'e'. This is particularly easy as they have
-  // the same type.
-  D.replaceAllUsesWith(&E);
-
-  // Splice the body of the old function into the new one.
-  E.getBasicBlockList().splice(E.begin(), D.getBasicBlockList());
-  // And fix up the one argument.
-  D.arg_begin()->replaceAllUsesWith(&*E.arg_begin());
-  E.arg_begin()->takeName(&*D.arg_begin());
-
-  // Now replace the function in the graph.
-  RC1.replaceNodeFunction(DN, E);
-
-  EXPECT_EQ(&E, &DN.getFunction());
-  EXPECT_EQ(&DN, &(*CN)[DN].getNode());
-  EXPECT_EQ(&DN, &(*BN)[DN].getNode());
-}
-
-TEST(LazyCallGraphTest, RemoveFunctionWithSpurriousRef) {
-  LLVMContext Context;
-  // A graph with a couple of RefSCCs.
-  std::unique_ptr<Module> M =
-      parseAssembly(Context,
-                    "define void @a(i8** %ptr) {\n"
-                    "entry:\n"
-                    "  store i8* bitcast (void(i8**)* @d to i8*), i8** %ptr\n"
-                    "  ret void\n"
-                    "}\n"
-                    "define void @b(i8** %ptr) {\n"
-                    "entry:\n"
-                    "  store i8* bitcast (void(i8**)* @c to i8*), i8** %ptr\n"
-                    "  ret void\n"
-                    "}\n"
-                    "define void @c(i8** %ptr) {\n"
-                    "entry:\n"
-                    "  call void @d(i8** %ptr)"
-                    "  ret void\n"
-                    "}\n"
-                    "define void @d(i8** %ptr) {\n"
-                    "entry:\n"
-                    "  call void @c(i8** %ptr)"
-                    "  store i8* bitcast (void(i8**)* @b to i8*), i8** %ptr\n"
-                    "  ret void\n"
-                    "}\n"
-                    "define void @dead() {\n"
-                    "entry:\n"
-                    "  ret void\n"
-                    "}\n");
-  LazyCallGraph CG = buildCG(*M);
-
-  // Insert spurious ref edges.
-  LazyCallGraph::Node &AN = CG.get(lookupFunction(*M, "a"));
-  LazyCallGraph::Node &BN = CG.get(lookupFunction(*M, "b"));
-  LazyCallGraph::Node &CN = CG.get(lookupFunction(*M, "c"));
-  LazyCallGraph::Node &DN = CG.get(lookupFunction(*M, "d"));
-  LazyCallGraph::Node &DeadN = CG.get(lookupFunction(*M, "dead"));
-  AN.populate();
-  BN.populate();
-  CN.populate();
-  DN.populate();
-  DeadN.populate();
-  CG.insertEdge(AN, DeadN, LazyCallGraph::Edge::Ref);
-  CG.insertEdge(BN, DeadN, LazyCallGraph::Edge::Ref);
-  CG.insertEdge(CN, DeadN, LazyCallGraph::Edge::Ref);
-  CG.insertEdge(DN, DeadN, LazyCallGraph::Edge::Ref);
-
-  // Force the graph to be fully expanded.
-  CG.buildRefSCCs();
-  auto I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC &DeadRC = *I++;
-  LazyCallGraph::RefSCC &RC1 = *I++;
-  LazyCallGraph::RefSCC &RC2 = *I++;
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-
-  ASSERT_EQ(2, RC1.size());
-  LazyCallGraph::SCC &C1 = RC1[0];
-  LazyCallGraph::SCC &C2 = RC1[1];
-
-  EXPECT_EQ(&DeadRC, CG.lookupRefSCC(DeadN));
-  EXPECT_EQ(&C1, CG.lookupSCC(DN));
-  EXPECT_EQ(&C1, CG.lookupSCC(CN));
-  EXPECT_EQ(&C2, CG.lookupSCC(BN));
-  EXPECT_EQ(&RC1, CG.lookupRefSCC(DN));
-  EXPECT_EQ(&RC1, CG.lookupRefSCC(CN));
-  EXPECT_EQ(&RC1, CG.lookupRefSCC(BN));
-  EXPECT_EQ(&RC2, CG.lookupRefSCC(AN));
-
-  // Now delete 'dead'. There are no uses of this function but there are
-  // spurious references.
-  CG.removeDeadFunction(DeadN.getFunction());
-
-  // The only observable change should be that the RefSCC is gone from the
-  // postorder sequence.
-  I = CG.postorder_ref_scc_begin();
-  EXPECT_EQ(&RC1, &*I++);
-  EXPECT_EQ(&RC2, &*I++);
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-}
-
-TEST(LazyCallGraphTest, AddSplitFunction1) {
-  LLVMContext Context;
-  std::unique_ptr<Module> M = parseAssembly(Context, "define void @f() {\n"
-                                                     "  ret void\n"
-                                                     "}\n");
-  LazyCallGraph CG = buildCG(*M);
-
-  Function &F = lookupFunction(*M, "f");
-  LazyCallGraph::Node &FN = CG.get(F);
-
-  // Force the graph to be fully expanded.
-  CG.buildRefSCCs();
-  auto I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC *ORC = &*I++;
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-
-  auto *G = Function::Create(F.getFunctionType(), F.getLinkage(),
-                             F.getAddressSpace(), "g", F.getParent());
-  BasicBlock *GBB = BasicBlock::Create(Context, "", G);
-  (void)ReturnInst::Create(Context, GBB);
-
-  // Create f -call-> g.
-  (void)CallInst::Create(G, {}, "", &*F.getEntryBlock().begin());
-
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-
-  CG.addSplitFunction(F, *G);
-
-  LazyCallGraph::Node *GN = CG.lookup(*G);
-  EXPECT_TRUE(GN);
-
-  I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC *RC1 = &*I++;
-  EXPECT_EQ(RC1, CG.lookupRefSCC(*GN));
-  LazyCallGraph::RefSCC *RC2 = &*I++;
-  EXPECT_EQ(RC2, ORC);
-  EXPECT_EQ(RC2, CG.lookupRefSCC(FN));
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-}
-
-TEST(LazyCallGraphTest, AddSplitFunction2) {
-  LLVMContext Context;
-  std::unique_ptr<Module> M = parseAssembly(Context, "define void @f() {\n"
-                                                     "  ret void\n"
-                                                     "}\n");
-  LazyCallGraph CG = buildCG(*M);
-
-  Function &F = lookupFunction(*M, "f");
-  LazyCallGraph::Node &FN = CG.get(F);
-
-  // Force the graph to be fully expanded.
-  CG.buildRefSCCs();
-  auto I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC *ORC = &*I++;
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-
-  auto *G = Function::Create(F.getFunctionType(), F.getLinkage(),
-                             F.getAddressSpace(), "g", F.getParent());
-  BasicBlock *GBB = BasicBlock::Create(Context, "", G);
-  (void)ReturnInst::Create(Context, GBB);
-
-  // Create f -ref-> g.
-  (void)CastInst::CreatePointerCast(G, Type::getInt8PtrTy(Context), "",
-                                    &*F.getEntryBlock().begin());
-
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-
-  CG.addSplitFunction(F, *G);
-
-  LazyCallGraph::Node *GN = CG.lookup(*G);
-  EXPECT_TRUE(GN);
-
-  I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC *RC1 = &*I++;
-  EXPECT_EQ(RC1, CG.lookupRefSCC(*GN));
-  LazyCallGraph::RefSCC *RC2 = &*I++;
-  EXPECT_EQ(RC2, ORC);
-  EXPECT_EQ(RC2, CG.lookupRefSCC(FN));
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-}
-
-TEST(LazyCallGraphTest, AddSplitFunction3) {
-  LLVMContext Context;
-  std::unique_ptr<Module> M = parseAssembly(Context, "define void @f() {\n"
-                                                     "  ret void\n"
-                                                     "}\n");
-  LazyCallGraph CG = buildCG(*M);
-
-  Function &F = lookupFunction(*M, "f");
-  LazyCallGraph::Node &FN = CG.get(F);
-
-  // Force the graph to be fully expanded.
-  CG.buildRefSCCs();
-  auto I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC *ORC = &*I++;
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-
-  auto *G = Function::Create(F.getFunctionType(), F.getLinkage(),
-                             F.getAddressSpace(), "g", F.getParent());
-  BasicBlock *GBB = BasicBlock::Create(Context, "", G);
-  // Create g -ref-> f.
-  (void)CastInst::CreatePointerCast(&F, Type::getInt8PtrTy(Context), "", GBB);
-  (void)ReturnInst::Create(Context, GBB);
-
-  // Create f -call-> g.
-  (void)CallInst::Create(G, {}, "", &*F.getEntryBlock().begin());
-
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-
-  CG.addSplitFunction(F, *G);
-
-  LazyCallGraph::Node *GN = CG.lookup(*G);
-  EXPECT_TRUE(GN);
-
-  I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC *RC = &*I++;
-  EXPECT_EQ(RC, CG.lookupRefSCC(*GN));
-  EXPECT_EQ(RC, ORC);
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-
-  EXPECT_EQ(2, RC->size());
-  EXPECT_EQ(CG.lookupSCC(*GN), &(*RC)[0]);
-  EXPECT_EQ(CG.lookupSCC(FN), &(*RC)[1]);
-}
-
-TEST(LazyCallGraphTest, AddSplitFunction4) {
-  LLVMContext Context;
-  std::unique_ptr<Module> M = parseAssembly(Context, "define void @f() {\n"
-                                                     "  ret void\n"
-                                                     "}\n");
-  LazyCallGraph CG = buildCG(*M);
-
-  Function &F = lookupFunction(*M, "f");
-  LazyCallGraph::Node &FN = CG.get(F);
-
-  // Force the graph to be fully expanded.
-  CG.buildRefSCCs();
-  auto I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC *ORC = &*I++;
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-
-  auto *G = Function::Create(F.getFunctionType(), F.getLinkage(),
-                             F.getAddressSpace(), "g", F.getParent());
-  BasicBlock *GBB = BasicBlock::Create(Context, "", G);
-  // Create g -ref-> f.
-  (void)CastInst::CreatePointerCast(&F, Type::getInt8PtrTy(Context), "", GBB);
-  (void)ReturnInst::Create(Context, GBB);
-
-  // Create f -ref-> g.
-  (void)CastInst::CreatePointerCast(G, Type::getInt8PtrTy(Context), "",
-                                    &*F.getEntryBlock().begin());
-
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-
-  CG.addSplitFunction(F, *G);
-
-  LazyCallGraph::Node *GN = CG.lookup(*G);
-  EXPECT_TRUE(GN);
-
-  I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC *RC = &*I++;
-  EXPECT_EQ(RC, CG.lookupRefSCC(*GN));
-  EXPECT_EQ(RC, ORC);
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-
-  // Order doesn't matter for sibling SCCs.
-  EXPECT_EQ(2, RC->size());
-  EXPECT_EQ(&CG.lookupSCC(*GN)->getOuterRefSCC(), RC);
-  EXPECT_EQ(&CG.lookupSCC(FN)->getOuterRefSCC(), RC);
-}
-
-TEST(LazyCallGraphTest, AddSplitFunction5) {
-  LLVMContext Context;
-  std::unique_ptr<Module> M = parseAssembly(Context, "define void @f() {\n"
-                                                     "  ret void\n"
-                                                     "}\n");
-  LazyCallGraph CG = buildCG(*M);
-
-  Function &F = lookupFunction(*M, "f");
-  LazyCallGraph::Node &FN = CG.get(F);
-
-  // Force the graph to be fully expanded.
-  CG.buildRefSCCs();
-  auto I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC *ORC = &*I++;
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-
-  auto *G = Function::Create(F.getFunctionType(), F.getLinkage(),
-                             F.getAddressSpace(), "g", F.getParent());
-  BasicBlock *GBB = BasicBlock::Create(Context, "", G);
-  // Create g -call-> f.
-  (void)CallInst::Create(&F, {}, "", GBB);
-  (void)ReturnInst::Create(Context, GBB);
-
-  // Create f -ref-> g.
-  (void)CastInst::CreatePointerCast(G, Type::getInt8PtrTy(Context), "",
-                                    &*F.getEntryBlock().begin());
-
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-
-  CG.addSplitFunction(F, *G);
-
-  LazyCallGraph::Node *GN = CG.lookup(*G);
-  EXPECT_TRUE(GN);
-
-  I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC *RC = &*I++;
-  EXPECT_EQ(RC, CG.lookupRefSCC(*GN));
-  EXPECT_EQ(RC, ORC);
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-
-  EXPECT_EQ(2, RC->size());
-  EXPECT_EQ(CG.lookupSCC(FN), &(*RC)[0]);
-  EXPECT_EQ(CG.lookupSCC(*GN), &(*RC)[1]);
-}
-
-TEST(LazyCallGraphTest, AddSplitFunction6) {
-  LLVMContext Context;
-  std::unique_ptr<Module> M = parseAssembly(Context, "define void @f() {\n"
-                                                     "  ret void\n"
-                                                     "}\n");
-  LazyCallGraph CG = buildCG(*M);
-
-  Function &F = lookupFunction(*M, "f");
-  LazyCallGraph::Node &FN = CG.get(F);
-
-  // Force the graph to be fully expanded.
-  CG.buildRefSCCs();
-  auto I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC *ORC = &*I++;
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-
-  auto *G = Function::Create(F.getFunctionType(), F.getLinkage(),
-                             F.getAddressSpace(), "g", F.getParent());
-  BasicBlock *GBB = BasicBlock::Create(Context, "", G);
-  // Create g -call-> f.
-  (void)CallInst::Create(&F, {}, "", GBB);
-  (void)ReturnInst::Create(Context, GBB);
-
-  // Create f -call-> g.
-  (void)CallInst::Create(G, {}, "", &*F.getEntryBlock().begin());
-
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-
-  CG.addSplitFunction(F, *G);
-
-  LazyCallGraph::Node *GN = CG.lookup(*G);
-  EXPECT_TRUE(GN);
-
-  I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC *RC = &*I++;
-  EXPECT_EQ(RC, CG.lookupRefSCC(*GN));
-  EXPECT_EQ(RC, ORC);
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-
-  EXPECT_EQ(1, RC->size());
-  EXPECT_EQ(CG.lookupSCC(FN), &(*RC)[0]);
-  EXPECT_EQ(CG.lookupSCC(*GN), &(*RC)[0]);
-}
-
-TEST(LazyCallGraphTest, AddSplitFunction7) {
-  LLVMContext Context;
-  std::unique_ptr<Module> M = parseAssembly(Context, "define void @f() {\n"
-                                                     "  call void @f2()\n"
-                                                     "  ret void\n"
-                                                     "}\n"
-                                                     "define void @f2() {\n"
-                                                     "  call void @f()\n"
-                                                     "  ret void\n"
-                                                     "}\n");
-  LazyCallGraph CG = buildCG(*M);
-
-  Function &F = lookupFunction(*M, "f");
-  LazyCallGraph::Node &FN = CG.get(F);
-  Function &F2 = lookupFunction(*M, "f2");
-  LazyCallGraph::Node &F2N = CG.get(F2);
-
-  // Force the graph to be fully expanded.
-  CG.buildRefSCCs();
-  auto I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC *ORC = &*I++;
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-
-  auto *G = Function::Create(F.getFunctionType(), F.getLinkage(),
-                             F.getAddressSpace(), "g", F.getParent());
-  BasicBlock *GBB = BasicBlock::Create(Context, "", G);
-  // Create g -call-> f2.
-  (void)CallInst::Create(&F2, {}, "", GBB);
-  (void)ReturnInst::Create(Context, GBB);
-
-  // Create f -call-> g.
-  (void)CallInst::Create(G, {}, "", &*F.getEntryBlock().begin());
-
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-
-  CG.addSplitFunction(F, *G);
-
-  LazyCallGraph::Node *GN = CG.lookup(*G);
-  EXPECT_TRUE(GN);
-
-  I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC *RC = &*I++;
-  EXPECT_EQ(RC, CG.lookupRefSCC(*GN));
-  EXPECT_EQ(RC, ORC);
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-
-  EXPECT_EQ(1, RC->size());
-  EXPECT_EQ(CG.lookupSCC(FN), &(*RC)[0]);
-  EXPECT_EQ(CG.lookupSCC(F2N), &(*RC)[0]);
-  EXPECT_EQ(CG.lookupSCC(*GN), &(*RC)[0]);
-}
-
-TEST(LazyCallGraphTest, AddSplitFunction8) {
-  LLVMContext Context;
-  std::unique_ptr<Module> M = parseAssembly(Context, "define void @f() {\n"
-                                                     "  call void @f2()\n"
-                                                     "  ret void\n"
-                                                     "}\n"
-                                                     "define void @f2() {\n"
-                                                     "  call void @f()\n"
-                                                     "  ret void\n"
-                                                     "}\n");
-  LazyCallGraph CG = buildCG(*M);
-
-  Function &F = lookupFunction(*M, "f");
-  LazyCallGraph::Node &FN = CG.get(F);
-  Function &F2 = lookupFunction(*M, "f2");
-  LazyCallGraph::Node &F2N = CG.get(F2);
-
-  // Force the graph to be fully expanded.
-  CG.buildRefSCCs();
-  auto I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC *ORC = &*I++;
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-
-  auto *G = Function::Create(F.getFunctionType(), F.getLinkage(),
-                             F.getAddressSpace(), "g", F.getParent());
-  BasicBlock *GBB = BasicBlock::Create(Context, "", G);
-  // Create g -call-> f2.
-  (void)CallInst::Create(&F2, {}, "", GBB);
-  (void)ReturnInst::Create(Context, GBB);
-
-  // Create f -ref-> g.
-  (void)CastInst::CreatePointerCast(G, Type::getInt8PtrTy(Context), "",
-                                    &*F.getEntryBlock().begin());
-
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-
-  CG.addSplitFunction(F, *G);
-
-  LazyCallGraph::Node *GN = CG.lookup(*G);
-  EXPECT_TRUE(GN);
-
-  I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC *RC = &*I++;
-  EXPECT_EQ(RC, CG.lookupRefSCC(*GN));
-  EXPECT_EQ(RC, ORC);
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-
-  EXPECT_EQ(2, RC->size());
-  EXPECT_EQ(CG.lookupSCC(FN), &(*RC)[0]);
-  EXPECT_EQ(CG.lookupSCC(F2N), &(*RC)[0]);
-  EXPECT_EQ(CG.lookupSCC(*GN), &(*RC)[1]);
-}
-
-TEST(LazyCallGraphTest, AddSplitFunction9) {
-  LLVMContext Context;
-  std::unique_ptr<Module> M = parseAssembly(Context, "define void @f() {\n"
-                                                     "  call void @f2()\n"
-                                                     "  ret void\n"
-                                                     "}\n"
-                                                     "define void @f2() {\n"
-                                                     "  call void @f()\n"
-                                                     "  ret void\n"
-                                                     "}\n");
-  LazyCallGraph CG = buildCG(*M);
-
-  Function &F = lookupFunction(*M, "f");
-  LazyCallGraph::Node &FN = CG.get(F);
-  Function &F2 = lookupFunction(*M, "f2");
-  LazyCallGraph::Node &F2N = CG.get(F2);
-
-  // Force the graph to be fully expanded.
-  CG.buildRefSCCs();
-  auto I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC *ORC = &*I++;
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-
-  auto *G = Function::Create(F.getFunctionType(), F.getLinkage(),
-                             F.getAddressSpace(), "g", F.getParent());
-  BasicBlock *GBB = BasicBlock::Create(Context, "", G);
-  // Create g -ref-> f2.
-  (void)CastInst::CreatePointerCast(&F2, Type::getInt8PtrTy(Context), "", GBB);
-  (void)ReturnInst::Create(Context, GBB);
-
-  // Create f -call-> g.
-  (void)CallInst::Create(G, {}, "", &*F.getEntryBlock().begin());
-
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-
-  CG.addSplitFunction(F, *G);
-
-  LazyCallGraph::Node *GN = CG.lookup(*G);
-  EXPECT_TRUE(GN);
-
-  I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC *RC = &*I++;
-  EXPECT_EQ(RC, CG.lookupRefSCC(*GN));
-  EXPECT_EQ(RC, ORC);
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-
-  EXPECT_EQ(2, RC->size());
-  EXPECT_EQ(CG.lookupSCC(*GN), &(*RC)[0]);
-  EXPECT_EQ(CG.lookupSCC(FN), &(*RC)[1]);
-  EXPECT_EQ(CG.lookupSCC(F2N), &(*RC)[1]);
-}
-
-TEST(LazyCallGraphTest, AddSplitFunctions1) {
-  LLVMContext Context;
-  std::unique_ptr<Module> M = parseAssembly(Context, "define void @f() {\n"
-                                                     "  ret void\n"
-                                                     "}\n");
-  LazyCallGraph CG = buildCG(*M);
-
-  Function &F = lookupFunction(*M, "f");
-  LazyCallGraph::Node &FN = CG.get(F);
-
-  // Force the graph to be fully expanded.
-  CG.buildRefSCCs();
-  auto I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC *ORC = &*I++;
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-
-  auto *G = Function::Create(F.getFunctionType(), F.getLinkage(),
-                             F.getAddressSpace(), "g", F.getParent());
-  BasicBlock *GBB = BasicBlock::Create(Context, "", G);
-  (void)ReturnInst::Create(Context, GBB);
-
-  // Create f -ref-> g.
-  (void)CastInst::CreatePointerCast(G, Type::getInt8PtrTy(Context), "",
-                                    &*F.getEntryBlock().begin());
-
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-
-  CG.addSplitRefRecursiveFunctions(F, SmallVector<Function *, 1>({G}));
-
-  LazyCallGraph::Node *GN = CG.lookup(*G);
-  EXPECT_TRUE(GN);
-
-  I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC *RC1 = &*I++;
-  EXPECT_EQ(RC1, CG.lookupRefSCC(*GN));
-  LazyCallGraph::RefSCC *RC2 = &*I++;
-  EXPECT_EQ(RC2, ORC);
-  EXPECT_EQ(RC2, CG.lookupRefSCC(FN));
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-}
-
-TEST(LazyCallGraphTest, AddSplitFunctions2) {
-  LLVMContext Context;
-  std::unique_ptr<Module> M = parseAssembly(Context, "define void @f() {\n"
-                                                     "  ret void\n"
-                                                     "}\n");
-  LazyCallGraph CG = buildCG(*M);
-
-  Function &F = lookupFunction(*M, "f");
-  LazyCallGraph::Node &FN = CG.get(F);
-
-  // Force the graph to be fully expanded.
-  CG.buildRefSCCs();
-  auto I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC *ORC = &*I++;
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-
-  auto *G = Function::Create(F.getFunctionType(), F.getLinkage(),
-                             F.getAddressSpace(), "g", F.getParent());
-  BasicBlock *GBB = BasicBlock::Create(Context, "", G);
-  // Create g -ref-> f.
-  (void)CastInst::CreatePointerCast(&F, Type::getInt8PtrTy(Context), "", GBB);
-  (void)ReturnInst::Create(Context, GBB);
-
-  // Create f -ref-> g.
-  (void)CastInst::CreatePointerCast(G, Type::getInt8PtrTy(Context), "",
-                                    &*F.getEntryBlock().begin());
-
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-
-  CG.addSplitRefRecursiveFunctions(F, SmallVector<Function *, 1>({G}));
-
-  LazyCallGraph::Node *GN = CG.lookup(*G);
-  EXPECT_TRUE(GN);
-
-  I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC *RC = &*I++;
-  EXPECT_EQ(RC, CG.lookupRefSCC(*GN));
-  EXPECT_EQ(RC, ORC);
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-
-  // Order doesn't matter for sibling SCCs.
-  EXPECT_EQ(2, RC->size());
-  EXPECT_EQ(&CG.lookupSCC(*GN)->getOuterRefSCC(), RC);
-  EXPECT_EQ(&CG.lookupSCC(FN)->getOuterRefSCC(), RC);
-}
-
-TEST(LazyCallGraphTest, AddSplitFunctions3) {
-  LLVMContext Context;
-  std::unique_ptr<Module> M = parseAssembly(Context, "define void @f() {\n"
-                                                     "  ret void\n"
-                                                     "}\n");
-  LazyCallGraph CG = buildCG(*M);
-
-  Function &F = lookupFunction(*M, "f");
-  LazyCallGraph::Node &FN = CG.get(F);
-
-  // Force the graph to be fully expanded.
-  CG.buildRefSCCs();
-  auto I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC *ORC = &*I++;
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-
-  auto *G1 = Function::Create(F.getFunctionType(), F.getLinkage(),
-                              F.getAddressSpace(), "g1", F.getParent());
-  auto *G2 = Function::Create(F.getFunctionType(), F.getLinkage(),
-                              F.getAddressSpace(), "g2", F.getParent());
-  BasicBlock *G1BB = BasicBlock::Create(Context, "", G1);
-  BasicBlock *G2BB = BasicBlock::Create(Context, "", G2);
-  // Create g1 -ref-> g2 and g2 -ref-> g1.
-  (void)CastInst::CreatePointerCast(G2, Type::getInt8PtrTy(Context), "", G1BB);
-  (void)CastInst::CreatePointerCast(G1, Type::getInt8PtrTy(Context), "", G2BB);
-  (void)ReturnInst::Create(Context, G1BB);
-  (void)ReturnInst::Create(Context, G2BB);
-
-  // Create f -ref-> g1 and f -ref-> g2.
-  (void)CastInst::CreatePointerCast(G1, Type::getInt8PtrTy(Context), "",
-                                    &*F.getEntryBlock().begin());
-  (void)CastInst::CreatePointerCast(G2, Type::getInt8PtrTy(Context), "",
-                                    &*F.getEntryBlock().begin());
-
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-
-  CG.addSplitRefRecursiveFunctions(F, SmallVector<Function *, 1>({G1, G2}));
-
-  LazyCallGraph::Node *G1N = CG.lookup(*G1);
-  EXPECT_TRUE(G1N);
-  LazyCallGraph::Node *G2N = CG.lookup(*G2);
-  EXPECT_TRUE(G2N);
-
-  I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC *RC1 = &*I++;
-  EXPECT_EQ(2, RC1->size());
-  EXPECT_EQ(RC1, CG.lookupRefSCC(*G1N));
-  EXPECT_EQ(RC1, CG.lookupRefSCC(*G2N));
-  LazyCallGraph::RefSCC *RC2 = &*I++;
-  EXPECT_EQ(RC2, ORC);
-  EXPECT_EQ(RC2, CG.lookupRefSCC(FN));
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-}
-
-TEST(LazyCallGraphTest, AddSplitFunctions4) {
-  LLVMContext Context;
-  std::unique_ptr<Module> M = parseAssembly(Context, "define void @f() {\n"
-                                                     "  ret void\n"
-                                                     "}\n");
-  LazyCallGraph CG = buildCG(*M);
-
-  Function &F = lookupFunction(*M, "f");
-  LazyCallGraph::Node &FN = CG.get(F);
-
-  // Force the graph to be fully expanded.
-  CG.buildRefSCCs();
-  auto I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC *ORC = &*I++;
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-
-  auto *G1 = Function::Create(F.getFunctionType(), F.getLinkage(),
-                              F.getAddressSpace(), "g1", F.getParent());
-  auto *G2 = Function::Create(F.getFunctionType(), F.getLinkage(),
-                              F.getAddressSpace(), "g2", F.getParent());
-  BasicBlock *G1BB = BasicBlock::Create(Context, "", G1);
-  BasicBlock *G2BB = BasicBlock::Create(Context, "", G2);
-  // Create g1 -ref-> g2 and g2 -ref-> g1.
-  (void)CastInst::CreatePointerCast(G2, Type::getInt8PtrTy(Context), "", G1BB);
-  (void)CastInst::CreatePointerCast(G1, Type::getInt8PtrTy(Context), "", G2BB);
-  // Create g2 -ref-> f.
-  (void)CastInst::CreatePointerCast(&F, Type::getInt8PtrTy(Context), "", G2BB);
-  (void)ReturnInst::Create(Context, G1BB);
-  (void)ReturnInst::Create(Context, G2BB);
-
-  // Create f -ref-> g1 and f -ref-> g2.
-  (void)CastInst::CreatePointerCast(G1, Type::getInt8PtrTy(Context), "",
-                                    &*F.getEntryBlock().begin());
-  (void)CastInst::CreatePointerCast(G2, Type::getInt8PtrTy(Context), "",
-                                    &*F.getEntryBlock().begin());
-
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-
-  CG.addSplitRefRecursiveFunctions(F, SmallVector<Function *, 1>({G1, G2}));
-
-  LazyCallGraph::Node *G1N = CG.lookup(*G1);
-  EXPECT_TRUE(G1N);
-  LazyCallGraph::Node *G2N = CG.lookup(*G2);
-  EXPECT_TRUE(G2N);
-
-  I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC *RC = &*I++;
-  EXPECT_EQ(RC, ORC);
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-
-  // Order doesn't matter for sibling SCCs.
-  EXPECT_EQ(3, RC->size());
-  EXPECT_EQ(&CG.lookupSCC(FN)->getOuterRefSCC(), RC);
-  EXPECT_EQ(&CG.lookupSCC(*G1N)->getOuterRefSCC(), RC);
-  EXPECT_EQ(&CG.lookupSCC(*G2N)->getOuterRefSCC(), RC);
-  EXPECT_EQ(RC, CG.lookupRefSCC(*G1N));
-  EXPECT_EQ(RC, CG.lookupRefSCC(*G2N));
-}
-
-TEST(LazyCallGraphTest, AddSplitFunctions5) {
-  LLVMContext Context;
-  std::unique_ptr<Module> M =
-      parseAssembly(Context, "define void @f() {\n"
-                             "  %1 = bitcast void ()* @f2 to i8*\n"
-                             "  ret void\n"
-                             "}\n"
-                             "define void @f2() {\n"
-                             "  call void @f()\n"
-                             "  ret void\n"
-                             "}\n");
-  LazyCallGraph CG = buildCG(*M);
-
-  Function &F = lookupFunction(*M, "f");
-  LazyCallGraph::Node &FN = CG.get(F);
-  Function &F2 = lookupFunction(*M, "f2");
-  LazyCallGraph::Node &F2N = CG.get(F);
-
-  // Force the graph to be fully expanded.
-  CG.buildRefSCCs();
-  auto I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC *ORC = &*I++;
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-
-  auto *G1 = Function::Create(F.getFunctionType(), F.getLinkage(),
-                              F.getAddressSpace(), "g1", F.getParent());
-  auto *G2 = Function::Create(F.getFunctionType(), F.getLinkage(),
-                              F.getAddressSpace(), "g2", F.getParent());
-  BasicBlock *G1BB = BasicBlock::Create(Context, "", G1);
-  BasicBlock *G2BB = BasicBlock::Create(Context, "", G2);
-  // Create g1 -ref-> g2 and g2 -ref-> g1.
-  (void)CastInst::CreatePointerCast(G2, Type::getInt8PtrTy(Context), "", G1BB);
-  (void)CastInst::CreatePointerCast(G1, Type::getInt8PtrTy(Context), "", G2BB);
-  // Create g2 -ref-> f2.
-  (void)CastInst::CreatePointerCast(&F2, Type::getInt8PtrTy(Context), "", G2BB);
-  (void)ReturnInst::Create(Context, G1BB);
-  (void)ReturnInst::Create(Context, G2BB);
-
-  // Create f -ref-> g1 and f -ref-> g2.
-  (void)CastInst::CreatePointerCast(G1, Type::getInt8PtrTy(Context), "",
-                                    &*F.getEntryBlock().begin());
-  (void)CastInst::CreatePointerCast(G2, Type::getInt8PtrTy(Context), "",
-                                    &*F.getEntryBlock().begin());
-
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-
-  CG.addSplitRefRecursiveFunctions(F, SmallVector<Function *, 1>({G1, G2}));
-
-  LazyCallGraph::Node *G1N = CG.lookup(*G1);
-  EXPECT_TRUE(G1N);
-  LazyCallGraph::Node *G2N = CG.lookup(*G2);
-  EXPECT_TRUE(G2N);
-
-  I = CG.postorder_ref_scc_begin();
-  LazyCallGraph::RefSCC *RC = &*I++;
-  EXPECT_EQ(4, RC->size());
-  EXPECT_EQ(RC, ORC);
-  EXPECT_EQ(RC, CG.lookupRefSCC(*G1N));
-  EXPECT_EQ(RC, CG.lookupRefSCC(*G2N));
-  EXPECT_EQ(RC, CG.lookupRefSCC(FN));
-  EXPECT_EQ(RC, CG.lookupRefSCC(F2N));
-  EXPECT_EQ(CG.postorder_ref_scc_end(), I);
-}
-}
diff --git a/gnu/llvm/llvm/unittests/Analysis/LoadsTest.cpp b/gnu/llvm/llvm/unittests/Analysis/LoadsTest.cpp
deleted file mode 100644
index 0ee1a5fa08a..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/LoadsTest.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-//===- LoadsTest.cpp - local load analysis unit tests ---------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/Loads.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-static std::unique_ptr<Module> parseIR(LLVMContext &C, const char *IR) {
-  SMDiagnostic Err;
-  std::unique_ptr<Module> Mod = parseAssemblyString(IR, Err, C);
-  if (!Mod)
-    Err.print("AnalysisTests", errs());
-  return Mod;
-}
-
-TEST(LoadsTest, FindAvailableLoadedValueSameBasePtrConstantOffsetsNullAA) {
-  LLVMContext C;
-  std::unique_ptr<Module> M = parseIR(C,
-                                      R"IR(
-%class = type <{ i32, i32 }>
-
-define i32 @f() {
-entry:
-  %o = alloca %class
-  %f1 = getelementptr inbounds %class, %class* %o, i32 0, i32 0
-  store i32 42, i32* %f1
-  %f2 = getelementptr inbounds %class, %class* %o, i32 0, i32 1
-  store i32 43, i32* %f2
-  %v = load i32, i32* %f1
-  ret i32 %v
-}
-)IR");
-  auto *GV = M->getNamedValue("f");
-  ASSERT_TRUE(GV);
-  auto *F = dyn_cast<Function>(GV);
-  ASSERT_TRUE(F);
-  Instruction *Inst = &F->front().front();
-  auto *AI = dyn_cast<AllocaInst>(Inst);
-  ASSERT_TRUE(AI);
-  Inst = &*++F->front().rbegin();
-  auto *LI = dyn_cast<LoadInst>(Inst);
-  ASSERT_TRUE(LI);
-  BasicBlock::iterator BBI(LI);
-  Value *Loaded = FindAvailableLoadedValue(
-      LI, LI->getParent(), BBI, 0, nullptr, nullptr);
-  ASSERT_TRUE(Loaded);
-  auto *CI = dyn_cast<ConstantInt>(Loaded);
-  ASSERT_TRUE(CI);
-  ASSERT_TRUE(CI->equalsInt(42));
-}
-
-TEST(LoadsTest, CanReplacePointersIfEqual) {
-  LLVMContext C;
-  std::unique_ptr<Module> M = parseIR(C,
-                                      R"IR(
-@y = common global [1 x i32] zeroinitializer, align 4
-@x = common global [1 x i32] zeroinitializer, align 4
-
-declare void @use(i32*)
-
-define void @f(i32* %p) {
-  call void @use(i32* getelementptr inbounds ([1 x i32], [1 x i32]* @y, i64 0, i64 0))
-  call void @use(i32* getelementptr inbounds (i32, i32* getelementptr inbounds ([1 x i32], [1 x i32]* @x, i64 0, i64 0), i64 1))
-  ret void
-}
-)IR");
-  const auto &DL = M->getDataLayout();
-  auto *GV = M->getNamedValue("f");
-  ASSERT_TRUE(GV);
-  auto *F = dyn_cast<Function>(GV);
-  ASSERT_TRUE(F);
-
-  // NOTE: the implementation of canReplacePointersIfEqual is incomplete.
-  // Currently the only the cases it returns false for are really sound and
-  // returning true means unknown.
-  Value *P = &*F->arg_begin();
-  auto InstIter = F->front().begin();
-  Value *ConstDerefPtr = *cast<CallInst>(&*InstIter)->arg_begin();
-  // ConstDerefPtr is a constant pointer that is provably de-referenceable. We
-  // can replace an arbitrary pointer with it.
-  EXPECT_TRUE(canReplacePointersIfEqual(P, ConstDerefPtr, DL, nullptr));
-
-  ++InstIter;
-  Value *ConstUnDerefPtr = *cast<CallInst>(&*InstIter)->arg_begin();
-  // ConstUndDerefPtr is a constant pointer that is provably not
-  // de-referenceable. We cannot replace an arbitrary pointer with it.
-  EXPECT_FALSE(
-      canReplacePointersIfEqual(ConstDerefPtr, ConstUnDerefPtr, DL, nullptr));
-}
diff --git a/gnu/llvm/llvm/unittests/Analysis/LoopInfoTest.cpp b/gnu/llvm/llvm/unittests/Analysis/LoopInfoTest.cpp
deleted file mode 100644
index 550458c2701..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/LoopInfoTest.cpp
+++ /dev/null
@@ -1,1549 +0,0 @@
-//===- LoopInfoTest.cpp - LoopInfo unit tests -----------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/LoopInfo.h"
-#include "llvm/Analysis/AssumptionCache.h"
-#include "llvm/Analysis/ScalarEvolution.h"
-#include "llvm/Analysis/TargetLibraryInfo.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Dominators.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-/// Build the loop info for the function and run the Test.
-static void
-runWithLoopInfo(Module &M, StringRef FuncName,
-                function_ref<void(Function &F, LoopInfo &LI)> Test) {
-  auto *F = M.getFunction(FuncName);
-  ASSERT_NE(F, nullptr) << "Could not find " << FuncName;
-  // Compute the dominator tree and the loop info for the function.
-  DominatorTree DT(*F);
-  LoopInfo LI(DT);
-  Test(*F, LI);
-}
-
-/// Build the loop info and scalar evolution for the function and run the Test.
-static void runWithLoopInfoPlus(
-    Module &M, StringRef FuncName,
-    function_ref<void(Function &F, LoopInfo &LI, ScalarEvolution &SE)> Test) {
-  auto *F = M.getFunction(FuncName);
-  ASSERT_NE(F, nullptr) << "Could not find " << FuncName;
-
-  TargetLibraryInfoImpl TLII;
-  TargetLibraryInfo TLI(TLII);
-  AssumptionCache AC(*F);
-  DominatorTree DT(*F);
-  LoopInfo LI(DT);
-  ScalarEvolution SE(*F, TLI, AC, DT, LI);
-  Test(*F, LI, SE);
-}
-
-static std::unique_ptr<Module> makeLLVMModule(LLVMContext &Context,
-                                              const char *ModuleStr) {
-  SMDiagnostic Err;
-  return parseAssemblyString(ModuleStr, Err, Context);
-}
-
-// This tests that for a loop with a single latch, we get the loop id from
-// its only latch, even in case the loop may not be in a simplified form.
-TEST(LoopInfoTest, LoopWithSingleLatch) {
-  const char *ModuleStr =
-      "target datalayout = \"e-m:o-i64:64-f80:128-n8:16:32:64-S128\"\n"
-      "define void @foo(i32 %n) {\n"
-      "entry:\n"
-      "  br i1 undef, label %for.cond, label %for.end\n"
-      "for.cond:\n"
-      "  %i.0 = phi i32 [ 0, %entry ], [ %inc, %for.inc ]\n"
-      "  %cmp = icmp slt i32 %i.0, %n\n"
-      "  br i1 %cmp, label %for.inc, label %for.end\n"
-      "for.inc:\n"
-      "  %inc = add nsw i32 %i.0, 1\n"
-      "  br label %for.cond, !llvm.loop !0\n"
-      "for.end:\n"
-      "  ret void\n"
-      "}\n"
-      "!0 = distinct !{!0, !1}\n"
-      "!1 = !{!\"llvm.loop.distribute.enable\", i1 true}\n";
-
-  // Parse the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleStr);
-
-  runWithLoopInfo(*M, "foo", [&](Function &F, LoopInfo &LI) {
-    Function::iterator FI = F.begin();
-    // First basic block is entry - skip it.
-    BasicBlock *Header = &*(++FI);
-    assert(Header->getName() == "for.cond");
-    Loop *L = LI.getLoopFor(Header);
-
-    // This loop is not in simplified form.
-    EXPECT_FALSE(L->isLoopSimplifyForm());
-
-    // Analyze the loop metadata id.
-    bool loopIDFoundAndSet = false;
-    // Try to get and set the metadata id for the loop.
-    if (MDNode *D = L->getLoopID()) {
-      L->setLoopID(D);
-      loopIDFoundAndSet = true;
-    }
-
-    // We must have successfully found and set the loop id in the
-    // only latch the loop has.
-    EXPECT_TRUE(loopIDFoundAndSet);
-  });
-}
-
-// Test loop id handling for a loop with multiple latches.
-TEST(LoopInfoTest, LoopWithMultipleLatches) {
-  const char *ModuleStr =
-      "target datalayout = \"e-m:o-i64:64-f80:128-n8:16:32:64-S128\"\n"
-      "define void @foo(i32 %n) {\n"
-      "entry:\n"
-      "  br i1 undef, label %for.cond, label %for.end\n"
-      "for.cond:\n"
-      "  %i.0 = phi i32 [ 0, %entry ], [ %inc, %latch.1 ], [ %inc, %latch.2 ]\n"
-      "  %inc = add nsw i32 %i.0, 1\n"
-      "  %cmp = icmp slt i32 %i.0, %n\n"
-      "  br i1 %cmp, label %latch.1, label %for.end\n"
-      "latch.1:\n"
-      "  br i1 undef, label %for.cond, label %latch.2, !llvm.loop !0\n"
-      "latch.2:\n"
-      "  br label %for.cond, !llvm.loop !0\n"
-      "for.end:\n"
-      "  ret void\n"
-      "}\n"
-      "!0 = distinct !{!0, !1}\n"
-      "!1 = !{!\"llvm.loop.distribute.enable\", i1 true}\n";
-
-  // Parse the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleStr);
-
-  runWithLoopInfo(*M, "foo", [&](Function &F, LoopInfo &LI) {
-    Function::iterator FI = F.begin();
-    // First basic block is entry - skip it.
-    BasicBlock *Header = &*(++FI);
-    assert(Header->getName() == "for.cond");
-    Loop *L = LI.getLoopFor(Header);
-    EXPECT_NE(L, nullptr);
-
-    // This loop is not in simplified form.
-    EXPECT_FALSE(L->isLoopSimplifyForm());
-
-    // Try to get and set the metadata id for the loop.
-    MDNode *OldLoopID = L->getLoopID();
-    EXPECT_NE(OldLoopID, nullptr);
-
-    MDNode *NewLoopID = MDNode::get(Context, {nullptr});
-    // Set operand 0 to refer to the loop id itself.
-    NewLoopID->replaceOperandWith(0, NewLoopID);
-
-    L->setLoopID(NewLoopID);
-    EXPECT_EQ(L->getLoopID(), NewLoopID);
-    EXPECT_NE(L->getLoopID(), OldLoopID);
-
-    L->setLoopID(OldLoopID);
-    EXPECT_EQ(L->getLoopID(), OldLoopID);
-    EXPECT_NE(L->getLoopID(), NewLoopID);
-  });
-}
-
-TEST(LoopInfoTest, PreorderTraversals) {
-  const char *ModuleStr = "define void @f() {\n"
-                          "entry:\n"
-                          "  br label %loop.0\n"
-                          "loop.0:\n"
-                          "  br i1 undef, label %loop.0.0, label %loop.1\n"
-                          "loop.0.0:\n"
-                          "  br i1 undef, label %loop.0.0, label %loop.0.1\n"
-                          "loop.0.1:\n"
-                          "  br i1 undef, label %loop.0.1, label %loop.0.2\n"
-                          "loop.0.2:\n"
-                          "  br i1 undef, label %loop.0.2, label %loop.0\n"
-                          "loop.1:\n"
-                          "  br i1 undef, label %loop.1.0, label %end\n"
-                          "loop.1.0:\n"
-                          "  br i1 undef, label %loop.1.0, label %loop.1.1\n"
-                          "loop.1.1:\n"
-                          "  br i1 undef, label %loop.1.1, label %loop.1.2\n"
-                          "loop.1.2:\n"
-                          "  br i1 undef, label %loop.1.2, label %loop.1\n"
-                          "end:\n"
-                          "  ret void\n"
-                          "}\n";
-  // Parse the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleStr);
-  Function &F = *M->begin();
-
-  DominatorTree DT(F);
-  LoopInfo LI;
-  LI.analyze(DT);
-
-  Function::iterator I = F.begin();
-  ASSERT_EQ("entry", I->getName());
-  ++I;
-  Loop &L_0 = *LI.getLoopFor(&*I++);
-  ASSERT_EQ("loop.0", L_0.getHeader()->getName());
-  Loop &L_0_0 = *LI.getLoopFor(&*I++);
-  ASSERT_EQ("loop.0.0", L_0_0.getHeader()->getName());
-  Loop &L_0_1 = *LI.getLoopFor(&*I++);
-  ASSERT_EQ("loop.0.1", L_0_1.getHeader()->getName());
-  Loop &L_0_2 = *LI.getLoopFor(&*I++);
-  ASSERT_EQ("loop.0.2", L_0_2.getHeader()->getName());
-  Loop &L_1 = *LI.getLoopFor(&*I++);
-  ASSERT_EQ("loop.1", L_1.getHeader()->getName());
-  Loop &L_1_0 = *LI.getLoopFor(&*I++);
-  ASSERT_EQ("loop.1.0", L_1_0.getHeader()->getName());
-  Loop &L_1_1 = *LI.getLoopFor(&*I++);
-  ASSERT_EQ("loop.1.1", L_1_1.getHeader()->getName());
-  Loop &L_1_2 = *LI.getLoopFor(&*I++);
-  ASSERT_EQ("loop.1.2", L_1_2.getHeader()->getName());
-
-  auto Preorder = LI.getLoopsInPreorder();
-  ASSERT_EQ(8u, Preorder.size());
-  EXPECT_EQ(&L_0, Preorder[0]);
-  EXPECT_EQ(&L_0_0, Preorder[1]);
-  EXPECT_EQ(&L_0_1, Preorder[2]);
-  EXPECT_EQ(&L_0_2, Preorder[3]);
-  EXPECT_EQ(&L_1, Preorder[4]);
-  EXPECT_EQ(&L_1_0, Preorder[5]);
-  EXPECT_EQ(&L_1_1, Preorder[6]);
-  EXPECT_EQ(&L_1_2, Preorder[7]);
-
-  auto ReverseSiblingPreorder = LI.getLoopsInReverseSiblingPreorder();
-  ASSERT_EQ(8u, ReverseSiblingPreorder.size());
-  EXPECT_EQ(&L_1, ReverseSiblingPreorder[0]);
-  EXPECT_EQ(&L_1_2, ReverseSiblingPreorder[1]);
-  EXPECT_EQ(&L_1_1, ReverseSiblingPreorder[2]);
-  EXPECT_EQ(&L_1_0, ReverseSiblingPreorder[3]);
-  EXPECT_EQ(&L_0, ReverseSiblingPreorder[4]);
-  EXPECT_EQ(&L_0_2, ReverseSiblingPreorder[5]);
-  EXPECT_EQ(&L_0_1, ReverseSiblingPreorder[6]);
-  EXPECT_EQ(&L_0_0, ReverseSiblingPreorder[7]);
-}
-
-TEST(LoopInfoTest, CanonicalLoop) {
-  const char *ModuleStr =
-      "define void @foo(i32* %A, i32 %ub) {\n"
-      "entry:\n"
-      "  %guardcmp = icmp slt i32 0, %ub\n"
-      "  br i1 %guardcmp, label %for.preheader, label %for.end\n"
-      "for.preheader:\n"
-      "  br label %for.body\n"
-      "for.body:\n"
-      "  %i = phi i32 [ 0, %for.preheader ], [ %inc, %for.body ]\n"
-      "  %idxprom = sext i32 %i to i64\n"
-      "  %arrayidx = getelementptr inbounds i32, i32* %A, i64 %idxprom\n"
-      "  store i32 %i, i32* %arrayidx, align 4\n"
-      "  %inc = add nsw i32 %i, 1\n"
-      "  %cmp = icmp slt i32 %inc, %ub\n"
-      "  br i1 %cmp, label %for.body, label %for.exit\n"
-      "for.exit:\n"
-      "  br label %for.end\n"
-      "for.end:\n"
-      "  ret void\n"
-      "}\n";
-
-  // Parse the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleStr);
-
-  runWithLoopInfoPlus(
-      *M, "foo",
-      [&](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-        Function::iterator FI = F.begin();
-        BasicBlock *Entry = &*(FI);
-        BranchInst *Guard = dyn_cast<BranchInst>(Entry->getTerminator());
-        // First two basic block are entry and for.preheader - skip them.
-        ++FI;
-        BasicBlock *Header = &*(++FI);
-        assert(Header->getName() == "for.body");
-        Loop *L = LI.getLoopFor(Header);
-        EXPECT_NE(L, nullptr);
-
-        Optional<Loop::LoopBounds> Bounds = L->getBounds(SE);
-        EXPECT_NE(Bounds, None);
-        ConstantInt *InitialIVValue =
-            dyn_cast<ConstantInt>(&Bounds->getInitialIVValue());
-        EXPECT_TRUE(InitialIVValue && InitialIVValue->isZero());
-        EXPECT_EQ(Bounds->getStepInst().getName(), "inc");
-        ConstantInt *StepValue =
-            dyn_cast_or_null<ConstantInt>(Bounds->getStepValue());
-        EXPECT_TRUE(StepValue && StepValue->isOne());
-        EXPECT_EQ(Bounds->getFinalIVValue().getName(), "ub");
-        EXPECT_EQ(Bounds->getCanonicalPredicate(), ICmpInst::ICMP_SLT);
-        EXPECT_EQ(Bounds->getDirection(),
-                  Loop::LoopBounds::Direction::Increasing);
-        EXPECT_EQ(L->getInductionVariable(SE)->getName(), "i");
-        EXPECT_EQ(L->getLoopGuardBranch(), Guard);
-        EXPECT_TRUE(L->isGuarded());
-        EXPECT_TRUE(L->isRotatedForm());
-      });
-}
-
-TEST(LoopInfoTest, LoopWithInverseGuardSuccs) {
-  const char *ModuleStr =
-      "define void @foo(i32* %A, i32 %ub) {\n"
-      "entry:\n"
-      "  %guardcmp = icmp sge i32 0, %ub\n"
-      "  br i1 %guardcmp, label %for.end, label %for.preheader\n"
-      "for.preheader:\n"
-      "  br label %for.body\n"
-      "for.body:\n"
-      "  %i = phi i32 [ 0, %for.preheader ], [ %inc, %for.body ]\n"
-      "  %idxprom = sext i32 %i to i64\n"
-      "  %arrayidx = getelementptr inbounds i32, i32* %A, i64 %idxprom\n"
-      "  store i32 %i, i32* %arrayidx, align 4\n"
-      "  %inc = add nsw i32 %i, 1\n"
-      "  %cmp = icmp slt i32 %inc, %ub\n"
-      "  br i1 %cmp, label %for.body, label %for.exit\n"
-      "for.exit:\n"
-      "  br label %for.end\n"
-      "for.end:\n"
-      "  ret void\n"
-      "}\n";
-
-  // Parse the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleStr);
-
-  runWithLoopInfoPlus(
-      *M, "foo",
-      [&](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-        Function::iterator FI = F.begin();
-        BasicBlock *Entry = &*(FI);
-        BranchInst *Guard = dyn_cast<BranchInst>(Entry->getTerminator());
-        // First two basic block are entry and for.preheader - skip them.
-        ++FI;
-        BasicBlock *Header = &*(++FI);
-        assert(Header->getName() == "for.body");
-        Loop *L = LI.getLoopFor(Header);
-        EXPECT_NE(L, nullptr);
-
-        Optional<Loop::LoopBounds> Bounds = L->getBounds(SE);
-        EXPECT_NE(Bounds, None);
-        ConstantInt *InitialIVValue =
-            dyn_cast<ConstantInt>(&Bounds->getInitialIVValue());
-        EXPECT_TRUE(InitialIVValue && InitialIVValue->isZero());
-        EXPECT_EQ(Bounds->getStepInst().getName(), "inc");
-        ConstantInt *StepValue =
-            dyn_cast_or_null<ConstantInt>(Bounds->getStepValue());
-        EXPECT_TRUE(StepValue && StepValue->isOne());
-        EXPECT_EQ(Bounds->getFinalIVValue().getName(), "ub");
-        EXPECT_EQ(Bounds->getCanonicalPredicate(), ICmpInst::ICMP_SLT);
-        EXPECT_EQ(Bounds->getDirection(),
-                  Loop::LoopBounds::Direction::Increasing);
-        EXPECT_EQ(L->getInductionVariable(SE)->getName(), "i");
-        EXPECT_EQ(L->getLoopGuardBranch(), Guard);
-        EXPECT_TRUE(L->isGuarded());
-        EXPECT_TRUE(L->isRotatedForm());
-      });
-}
-
-TEST(LoopInfoTest, LoopWithSwappedGuardCmp) {
-  const char *ModuleStr =
-      "define void @foo(i32* %A, i32 %ub) {\n"
-      "entry:\n"
-      "  %guardcmp = icmp sgt i32 %ub, 0\n"
-      "  br i1 %guardcmp, label %for.preheader, label %for.end\n"
-      "for.preheader:\n"
-      "  br label %for.body\n"
-      "for.body:\n"
-      "  %i = phi i32 [ 0, %for.preheader ], [ %inc, %for.body ]\n"
-      "  %idxprom = sext i32 %i to i64\n"
-      "  %arrayidx = getelementptr inbounds i32, i32* %A, i64 %idxprom\n"
-      "  store i32 %i, i32* %arrayidx, align 4\n"
-      "  %inc = add nsw i32 %i, 1\n"
-      "  %cmp = icmp sge i32 %inc, %ub\n"
-      "  br i1 %cmp, label %for.exit, label %for.body\n"
-      "for.exit:\n"
-      "  br label %for.end\n"
-      "for.end:\n"
-      "  ret void\n"
-      "}\n";
-
-  // Parse the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleStr);
-
-  runWithLoopInfoPlus(
-      *M, "foo",
-      [&](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-        Function::iterator FI = F.begin();
-        BasicBlock *Entry = &*(FI);
-        BranchInst *Guard = dyn_cast<BranchInst>(Entry->getTerminator());
-        // First two basic block are entry and for.preheader - skip them.
-        ++FI;
-        BasicBlock *Header = &*(++FI);
-        assert(Header->getName() == "for.body");
-        Loop *L = LI.getLoopFor(Header);
-        EXPECT_NE(L, nullptr);
-
-        Optional<Loop::LoopBounds> Bounds = L->getBounds(SE);
-        EXPECT_NE(Bounds, None);
-        ConstantInt *InitialIVValue =
-            dyn_cast<ConstantInt>(&Bounds->getInitialIVValue());
-        EXPECT_TRUE(InitialIVValue && InitialIVValue->isZero());
-        EXPECT_EQ(Bounds->getStepInst().getName(), "inc");
-        ConstantInt *StepValue =
-            dyn_cast_or_null<ConstantInt>(Bounds->getStepValue());
-        EXPECT_TRUE(StepValue && StepValue->isOne());
-        EXPECT_EQ(Bounds->getFinalIVValue().getName(), "ub");
-        EXPECT_EQ(Bounds->getCanonicalPredicate(), ICmpInst::ICMP_SLT);
-        EXPECT_EQ(Bounds->getDirection(),
-                  Loop::LoopBounds::Direction::Increasing);
-        EXPECT_EQ(L->getInductionVariable(SE)->getName(), "i");
-        EXPECT_EQ(L->getLoopGuardBranch(), Guard);
-        EXPECT_TRUE(L->isGuarded());
-        EXPECT_TRUE(L->isRotatedForm());
-      });
-}
-
-TEST(LoopInfoTest, LoopWithInverseLatchSuccs) {
-  const char *ModuleStr =
-      "define void @foo(i32* %A, i32 %ub) {\n"
-      "entry:\n"
-      "  %guardcmp = icmp slt i32 0, %ub\n"
-      "  br i1 %guardcmp, label %for.preheader, label %for.end\n"
-      "for.preheader:\n"
-      "  br label %for.body\n"
-      "for.body:\n"
-      "  %i = phi i32 [ 0, %for.preheader ], [ %inc, %for.body ]\n"
-      "  %idxprom = sext i32 %i to i64\n"
-      "  %arrayidx = getelementptr inbounds i32, i32* %A, i64 %idxprom\n"
-      "  store i32 %i, i32* %arrayidx, align 4\n"
-      "  %inc = add nsw i32 %i, 1\n"
-      "  %cmp = icmp sge i32 %inc, %ub\n"
-      "  br i1 %cmp, label %for.exit, label %for.body\n"
-      "for.exit:\n"
-      "  br label %for.end\n"
-      "for.end:\n"
-      "  ret void\n"
-      "}\n";
-
-  // Parse the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleStr);
-
-  runWithLoopInfoPlus(
-      *M, "foo",
-      [&](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-        Function::iterator FI = F.begin();
-        BasicBlock *Entry = &*(FI);
-        BranchInst *Guard = dyn_cast<BranchInst>(Entry->getTerminator());
-        // First two basic block are entry and for.preheader - skip them.
-        ++FI;
-        BasicBlock *Header = &*(++FI);
-        assert(Header->getName() == "for.body");
-        Loop *L = LI.getLoopFor(Header);
-        EXPECT_NE(L, nullptr);
-
-        Optional<Loop::LoopBounds> Bounds = L->getBounds(SE);
-        EXPECT_NE(Bounds, None);
-        ConstantInt *InitialIVValue =
-            dyn_cast<ConstantInt>(&Bounds->getInitialIVValue());
-        EXPECT_TRUE(InitialIVValue && InitialIVValue->isZero());
-        EXPECT_EQ(Bounds->getStepInst().getName(), "inc");
-        ConstantInt *StepValue =
-            dyn_cast_or_null<ConstantInt>(Bounds->getStepValue());
-        EXPECT_TRUE(StepValue && StepValue->isOne());
-        EXPECT_EQ(Bounds->getFinalIVValue().getName(), "ub");
-        EXPECT_EQ(Bounds->getCanonicalPredicate(), ICmpInst::ICMP_SLT);
-        EXPECT_EQ(Bounds->getDirection(),
-                  Loop::LoopBounds::Direction::Increasing);
-        EXPECT_EQ(L->getInductionVariable(SE)->getName(), "i");
-        EXPECT_EQ(L->getLoopGuardBranch(), Guard);
-        EXPECT_TRUE(L->isGuarded());
-        EXPECT_TRUE(L->isRotatedForm());
-      });
-}
-
-TEST(LoopInfoTest, LoopWithLatchCmpNE) {
-  const char *ModuleStr =
-      "define void @foo(i32* %A, i32 %ub) {\n"
-      "entry:\n"
-      "  %guardcmp = icmp slt i32 0, %ub\n"
-      "  br i1 %guardcmp, label %for.preheader, label %for.end\n"
-      "for.preheader:\n"
-      "  br label %for.body\n"
-      "for.body:\n"
-      "  %i = phi i32 [ 0, %for.preheader ], [ %inc, %for.body ]\n"
-      "  %idxprom = sext i32 %i to i64\n"
-      "  %arrayidx = getelementptr inbounds i32, i32* %A, i64 %idxprom\n"
-      "  store i32 %i, i32* %arrayidx, align 4\n"
-      "  %inc = add nsw i32 %i, 1\n"
-      "  %cmp = icmp ne i32 %i, %ub\n"
-      "  br i1 %cmp, label %for.body, label %for.exit\n"
-      "for.exit:\n"
-      "  br label %for.end\n"
-      "for.end:\n"
-      "  ret void\n"
-      "}\n";
-
-  // Parse the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleStr);
-
-  runWithLoopInfoPlus(
-      *M, "foo",
-      [&](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-        Function::iterator FI = F.begin();
-        BasicBlock *Entry = &*(FI);
-        BranchInst *Guard = dyn_cast<BranchInst>(Entry->getTerminator());
-        // First two basic block are entry and for.preheader - skip them.
-        ++FI;
-        BasicBlock *Header = &*(++FI);
-        assert(Header->getName() == "for.body");
-        Loop *L = LI.getLoopFor(Header);
-        EXPECT_NE(L, nullptr);
-
-        Optional<Loop::LoopBounds> Bounds = L->getBounds(SE);
-        EXPECT_NE(Bounds, None);
-        ConstantInt *InitialIVValue =
-            dyn_cast<ConstantInt>(&Bounds->getInitialIVValue());
-        EXPECT_TRUE(InitialIVValue && InitialIVValue->isZero());
-        EXPECT_EQ(Bounds->getStepInst().getName(), "inc");
-        ConstantInt *StepValue =
-            dyn_cast_or_null<ConstantInt>(Bounds->getStepValue());
-        EXPECT_TRUE(StepValue && StepValue->isOne());
-        EXPECT_EQ(Bounds->getFinalIVValue().getName(), "ub");
-        EXPECT_EQ(Bounds->getCanonicalPredicate(), ICmpInst::ICMP_SLT);
-        EXPECT_EQ(Bounds->getDirection(),
-                  Loop::LoopBounds::Direction::Increasing);
-        EXPECT_EQ(L->getInductionVariable(SE)->getName(), "i");
-        EXPECT_EQ(L->getLoopGuardBranch(), Guard);
-        EXPECT_TRUE(L->isGuarded());
-        EXPECT_TRUE(L->isRotatedForm());
-      });
-}
-
-TEST(LoopInfoTest, LoopWithGuardCmpSLE) {
-  const char *ModuleStr =
-      "define void @foo(i32* %A, i32 %ub) {\n"
-      "entry:\n"
-      "  %ubPlusOne = add i32 %ub, 1\n"
-      "  %guardcmp = icmp sle i32 0, %ub\n"
-      "  br i1 %guardcmp, label %for.preheader, label %for.end\n"
-      "for.preheader:\n"
-      "  br label %for.body\n"
-      "for.body:\n"
-      "  %i = phi i32 [ 0, %for.preheader ], [ %inc, %for.body ]\n"
-      "  %idxprom = sext i32 %i to i64\n"
-      "  %arrayidx = getelementptr inbounds i32, i32* %A, i64 %idxprom\n"
-      "  store i32 %i, i32* %arrayidx, align 4\n"
-      "  %inc = add nsw i32 %i, 1\n"
-      "  %cmp = icmp ne i32 %i, %ubPlusOne\n"
-      "  br i1 %cmp, label %for.body, label %for.exit\n"
-      "for.exit:\n"
-      "  br label %for.end\n"
-      "for.end:\n"
-      "  ret void\n"
-      "}\n";
-
-  // Parse the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleStr);
-
-  runWithLoopInfoPlus(
-      *M, "foo",
-      [&](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-        Function::iterator FI = F.begin();
-        BasicBlock *Entry = &*(FI);
-        BranchInst *Guard = dyn_cast<BranchInst>(Entry->getTerminator());
-        // First two basic block are entry and for.preheader - skip them.
-        ++FI;
-        BasicBlock *Header = &*(++FI);
-        assert(Header->getName() == "for.body");
-        Loop *L = LI.getLoopFor(Header);
-        EXPECT_NE(L, nullptr);
-
-        Optional<Loop::LoopBounds> Bounds = L->getBounds(SE);
-        EXPECT_NE(Bounds, None);
-        ConstantInt *InitialIVValue =
-            dyn_cast<ConstantInt>(&Bounds->getInitialIVValue());
-        EXPECT_TRUE(InitialIVValue && InitialIVValue->isZero());
-        EXPECT_EQ(Bounds->getStepInst().getName(), "inc");
-        ConstantInt *StepValue =
-            dyn_cast_or_null<ConstantInt>(Bounds->getStepValue());
-        EXPECT_TRUE(StepValue && StepValue->isOne());
-        EXPECT_EQ(Bounds->getFinalIVValue().getName(), "ubPlusOne");
-        EXPECT_EQ(Bounds->getCanonicalPredicate(), ICmpInst::ICMP_SLT);
-        EXPECT_EQ(Bounds->getDirection(),
-                  Loop::LoopBounds::Direction::Increasing);
-        EXPECT_EQ(L->getInductionVariable(SE)->getName(), "i");
-        EXPECT_EQ(L->getLoopGuardBranch(), Guard);
-        EXPECT_TRUE(L->isGuarded());
-        EXPECT_TRUE(L->isRotatedForm());
-      });
-}
-
-TEST(LoopInfoTest, LoopNonConstantStep) {
-  const char *ModuleStr =
-      "define void @foo(i32* %A, i32 %ub, i32 %step) {\n"
-      "entry:\n"
-      "  %guardcmp = icmp slt i32 0, %ub\n"
-      "  br i1 %guardcmp, label %for.preheader, label %for.end\n"
-      "for.preheader:\n"
-      "  br label %for.body\n"
-      "for.body:\n"
-      "  %i = phi i32 [ 0, %for.preheader ], [ %inc, %for.body ]\n"
-      "  %idxprom = zext i32 %i to i64\n"
-      "  %arrayidx = getelementptr inbounds i32, i32* %A, i64 %idxprom\n"
-      "  store i32 %i, i32* %arrayidx, align 4\n"
-      "  %inc = add nsw i32 %i, %step\n"
-      "  %cmp = icmp slt i32 %inc, %ub\n"
-      "  br i1 %cmp, label %for.body, label %for.exit\n"
-      "for.exit:\n"
-      "  br label %for.end\n"
-      "for.end:\n"
-      "  ret void\n"
-      "}\n";
-
-  // Parse the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleStr);
-
-  runWithLoopInfoPlus(
-      *M, "foo",
-      [&](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-        Function::iterator FI = F.begin();
-        BasicBlock *Entry = &*(FI);
-        BranchInst *Guard = dyn_cast<BranchInst>(Entry->getTerminator());
-        // First two basic block are entry and for.preheader - skip them.
-        ++FI;
-        BasicBlock *Header = &*(++FI);
-        assert(Header->getName() == "for.body");
-        Loop *L = LI.getLoopFor(Header);
-        EXPECT_NE(L, nullptr);
-
-        Optional<Loop::LoopBounds> Bounds = L->getBounds(SE);
-        EXPECT_NE(Bounds, None);
-        ConstantInt *InitialIVValue =
-            dyn_cast<ConstantInt>(&Bounds->getInitialIVValue());
-        EXPECT_TRUE(InitialIVValue && InitialIVValue->isZero());
-        EXPECT_EQ(Bounds->getStepInst().getName(), "inc");
-        EXPECT_EQ(Bounds->getStepValue()->getName(), "step");
-        EXPECT_EQ(Bounds->getFinalIVValue().getName(), "ub");
-        EXPECT_EQ(Bounds->getCanonicalPredicate(), ICmpInst::ICMP_SLT);
-        EXPECT_EQ(Bounds->getDirection(), Loop::LoopBounds::Direction::Unknown);
-        EXPECT_EQ(L->getInductionVariable(SE)->getName(), "i");
-        EXPECT_EQ(L->getLoopGuardBranch(), Guard);
-        EXPECT_TRUE(L->isGuarded());
-        EXPECT_TRUE(L->isRotatedForm());
-      });
-}
-
-TEST(LoopInfoTest, LoopUnsignedBounds) {
-  const char *ModuleStr =
-      "define void @foo(i32* %A, i32 %ub) {\n"
-      "entry:\n"
-      "  %guardcmp = icmp ult i32 0, %ub\n"
-      "  br i1 %guardcmp, label %for.preheader, label %for.end\n"
-      "for.preheader:\n"
-      "  br label %for.body\n"
-      "for.body:\n"
-      "  %i = phi i32 [ 0, %for.preheader ], [ %inc, %for.body ]\n"
-      "  %idxprom = zext i32 %i to i64\n"
-      "  %arrayidx = getelementptr inbounds i32, i32* %A, i64 %idxprom\n"
-      "  store i32 %i, i32* %arrayidx, align 4\n"
-      "  %inc = add i32 %i, 1\n"
-      "  %cmp = icmp ult i32 %inc, %ub\n"
-      "  br i1 %cmp, label %for.body, label %for.exit\n"
-      "for.exit:\n"
-      "  br label %for.end\n"
-      "for.end:\n"
-      "  ret void\n"
-      "}\n";
-
-  // Parse the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleStr);
-
-  runWithLoopInfoPlus(
-      *M, "foo",
-      [&](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-        Function::iterator FI = F.begin();
-        BasicBlock *Entry = &*(FI);
-        BranchInst *Guard = dyn_cast<BranchInst>(Entry->getTerminator());
-        // First two basic block are entry and for.preheader - skip them.
-        ++FI;
-        BasicBlock *Header = &*(++FI);
-        assert(Header->getName() == "for.body");
-        Loop *L = LI.getLoopFor(Header);
-        EXPECT_NE(L, nullptr);
-
-        Optional<Loop::LoopBounds> Bounds = L->getBounds(SE);
-        EXPECT_NE(Bounds, None);
-        ConstantInt *InitialIVValue =
-            dyn_cast<ConstantInt>(&Bounds->getInitialIVValue());
-        EXPECT_TRUE(InitialIVValue && InitialIVValue->isZero());
-        EXPECT_EQ(Bounds->getStepInst().getName(), "inc");
-        ConstantInt *StepValue =
-            dyn_cast_or_null<ConstantInt>(Bounds->getStepValue());
-        EXPECT_TRUE(StepValue && StepValue->isOne());
-        EXPECT_EQ(Bounds->getFinalIVValue().getName(), "ub");
-        EXPECT_EQ(Bounds->getCanonicalPredicate(), ICmpInst::ICMP_ULT);
-        EXPECT_EQ(Bounds->getDirection(),
-                  Loop::LoopBounds::Direction::Increasing);
-        EXPECT_EQ(L->getInductionVariable(SE)->getName(), "i");
-        EXPECT_EQ(L->getLoopGuardBranch(), Guard);
-        EXPECT_TRUE(L->isGuarded());
-        EXPECT_TRUE(L->isRotatedForm());
-      });
-}
-
-TEST(LoopInfoTest, DecreasingLoop) {
-  const char *ModuleStr =
-      "define void @foo(i32* %A, i32 %ub) {\n"
-      "entry:\n"
-      "  %guardcmp = icmp slt i32 0, %ub\n"
-      "  br i1 %guardcmp, label %for.preheader, label %for.end\n"
-      "for.preheader:\n"
-      "  br label %for.body\n"
-      "for.body:\n"
-      "  %i = phi i32 [ %ub, %for.preheader ], [ %inc, %for.body ]\n"
-      "  %idxprom = sext i32 %i to i64\n"
-      "  %arrayidx = getelementptr inbounds i32, i32* %A, i64 %idxprom\n"
-      "  store i32 %i, i32* %arrayidx, align 4\n"
-      "  %inc = sub nsw i32 %i, 1\n"
-      "  %cmp = icmp sgt i32 %inc, 0\n"
-      "  br i1 %cmp, label %for.body, label %for.exit\n"
-      "for.exit:\n"
-      "  br label %for.end\n"
-      "for.end:\n"
-      "  ret void\n"
-      "}\n";
-
-  // Parse the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleStr);
-
-  runWithLoopInfoPlus(
-      *M, "foo",
-      [&](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-        Function::iterator FI = F.begin();
-        BasicBlock *Entry = &*(FI);
-        BranchInst *Guard = dyn_cast<BranchInst>(Entry->getTerminator());
-        // First two basic block are entry and for.preheader - skip them.
-        ++FI;
-        BasicBlock *Header = &*(++FI);
-        assert(Header->getName() == "for.body");
-        Loop *L = LI.getLoopFor(Header);
-        EXPECT_NE(L, nullptr);
-
-        Optional<Loop::LoopBounds> Bounds = L->getBounds(SE);
-        EXPECT_NE(Bounds, None);
-        EXPECT_EQ(Bounds->getInitialIVValue().getName(), "ub");
-        EXPECT_EQ(Bounds->getStepInst().getName(), "inc");
-        ConstantInt *StepValue =
-            dyn_cast_or_null<ConstantInt>(Bounds->getStepValue());
-        EXPECT_EQ(StepValue, nullptr);
-        ConstantInt *FinalIVValue =
-            dyn_cast<ConstantInt>(&Bounds->getFinalIVValue());
-        EXPECT_TRUE(FinalIVValue && FinalIVValue->isZero());
-        EXPECT_EQ(Bounds->getCanonicalPredicate(), ICmpInst::ICMP_SGT);
-        EXPECT_EQ(Bounds->getDirection(),
-                  Loop::LoopBounds::Direction::Decreasing);
-        EXPECT_EQ(L->getInductionVariable(SE)->getName(), "i");
-        EXPECT_EQ(L->getLoopGuardBranch(), Guard);
-        EXPECT_TRUE(L->isGuarded());
-        EXPECT_TRUE(L->isRotatedForm());
-      });
-}
-
-TEST(LoopInfoTest, CannotFindDirection) {
-  const char *ModuleStr =
-      "define void @foo(i32* %A, i32 %ub, i32 %step) {\n"
-      "entry:\n"
-      "  %guardcmp = icmp slt i32 0, %ub\n"
-      "  br i1 %guardcmp, label %for.preheader, label %for.end\n"
-      "for.preheader:\n"
-      "  br label %for.body\n"
-      "for.body:\n"
-      "  %i = phi i32 [ 0, %for.preheader ], [ %inc, %for.body ]\n"
-      "  %idxprom = sext i32 %i to i64\n"
-      "  %arrayidx = getelementptr inbounds i32, i32* %A, i64 %idxprom\n"
-      "  store i32 %i, i32* %arrayidx, align 4\n"
-      "  %inc = add nsw i32 %i, %step\n"
-      "  %cmp = icmp ne i32 %i, %ub\n"
-      "  br i1 %cmp, label %for.body, label %for.exit\n"
-      "for.exit:\n"
-      "  br label %for.end\n"
-      "for.end:\n"
-      "  ret void\n"
-      "}\n";
-
-  // Parse the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleStr);
-
-  runWithLoopInfoPlus(
-      *M, "foo",
-      [&](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-        Function::iterator FI = F.begin();
-        BasicBlock *Entry = &*(FI);
-        BranchInst *Guard = dyn_cast<BranchInst>(Entry->getTerminator());
-        // First two basic block are entry and for.preheader
-        // - skip them.
-        ++FI;
-        BasicBlock *Header = &*(++FI);
-        assert(Header->getName() == "for.body");
-        Loop *L = LI.getLoopFor(Header);
-        EXPECT_NE(L, nullptr);
-
-        Optional<Loop::LoopBounds> Bounds = L->getBounds(SE);
-        EXPECT_NE(Bounds, None);
-        ConstantInt *InitialIVValue =
-            dyn_cast<ConstantInt>(&Bounds->getInitialIVValue());
-        EXPECT_TRUE(InitialIVValue && InitialIVValue->isZero());
-        EXPECT_EQ(Bounds->getStepInst().getName(), "inc");
-        EXPECT_EQ(Bounds->getStepValue()->getName(), "step");
-        EXPECT_EQ(Bounds->getFinalIVValue().getName(), "ub");
-        EXPECT_EQ(Bounds->getCanonicalPredicate(),
-                  ICmpInst::BAD_ICMP_PREDICATE);
-        EXPECT_EQ(Bounds->getDirection(), Loop::LoopBounds::Direction::Unknown);
-        EXPECT_EQ(L->getInductionVariable(SE)->getName(), "i");
-        EXPECT_EQ(L->getLoopGuardBranch(), Guard);
-        EXPECT_TRUE(L->isGuarded());
-        EXPECT_TRUE(L->isRotatedForm());
-      });
-}
-
-TEST(LoopInfoTest, ZextIndVar) {
-  const char *ModuleStr =
-      "define void @foo(i32* %A, i32 %ub) {\n"
-      "entry:\n"
-      "  %guardcmp = icmp slt i32 0, %ub\n"
-      "  br i1 %guardcmp, label %for.preheader, label %for.end\n"
-      "for.preheader:\n"
-      "  br label %for.body\n"
-      "for.body:\n"
-      "  %indvars.iv = phi i64 [ 0, %for.preheader ], [ %indvars.iv.next, %for.body ]\n"
-      "  %i = phi i32 [ 0, %for.preheader ], [ %inc, %for.body ]\n"
-      "  %idxprom = sext i32 %i to i64\n"
-      "  %arrayidx = getelementptr inbounds i32, i32* %A, i64 %idxprom\n"
-      "  store i32 %i, i32* %arrayidx, align 4\n"
-      "  %indvars.iv.next = add nuw nsw i64 %indvars.iv, 1\n"
-      "  %inc = add nsw i32 %i, 1\n"
-      "  %wide.trip.count = zext i32 %ub to i64\n"
-      "  %exitcond = icmp ne i64 %indvars.iv.next, %wide.trip.count\n"
-      "  br i1 %exitcond, label %for.body, label %for.exit\n"
-      "for.exit:\n"
-      "  br label %for.end\n"
-      "for.end:\n"
-      "  ret void\n"
-      "}\n";
-
-  // Parse the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleStr);
-
-  runWithLoopInfoPlus(
-      *M, "foo",
-      [&](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-        Function::iterator FI = F.begin();
-        BasicBlock *Entry = &*(FI);
-        BranchInst *Guard = dyn_cast<BranchInst>(Entry->getTerminator());
-        // First two basic block are entry and for.preheader - skip them.
-        ++FI;
-        BasicBlock *Header = &*(++FI);
-        assert(Header->getName() == "for.body");
-        Loop *L = LI.getLoopFor(Header);
-        EXPECT_NE(L, nullptr);
-
-        Optional<Loop::LoopBounds> Bounds = L->getBounds(SE);
-        EXPECT_NE(Bounds, None);
-        ConstantInt *InitialIVValue =
-            dyn_cast<ConstantInt>(&Bounds->getInitialIVValue());
-        EXPECT_TRUE(InitialIVValue && InitialIVValue->isZero());
-        EXPECT_EQ(Bounds->getStepInst().getName(), "indvars.iv.next");
-        ConstantInt *StepValue =
-            dyn_cast_or_null<ConstantInt>(Bounds->getStepValue());
-        EXPECT_TRUE(StepValue && StepValue->isOne());
-        EXPECT_EQ(Bounds->getFinalIVValue().getName(), "wide.trip.count");
-        EXPECT_EQ(Bounds->getCanonicalPredicate(), ICmpInst::ICMP_NE);
-        EXPECT_EQ(Bounds->getDirection(),
-                  Loop::LoopBounds::Direction::Increasing);
-        EXPECT_EQ(L->getInductionVariable(SE)->getName(), "indvars.iv");
-        EXPECT_EQ(L->getLoopGuardBranch(), Guard);
-        EXPECT_TRUE(L->isGuarded());
-        EXPECT_TRUE(L->isRotatedForm());
-      });
-}
-
-TEST(LoopInfoTest, MultiExitingLoop) {
-  const char *ModuleStr =
-      "define void @foo(i32* %A, i32 %ub, i1 %cond) {\n"
-      "entry:\n"
-      "  %guardcmp = icmp slt i32 0, %ub\n"
-      "  br i1 %guardcmp, label %for.preheader, label %for.end\n"
-      "for.preheader:\n"
-      "  br label %for.body\n"
-      "for.body:\n"
-      "  %i = phi i32 [ 0, %for.preheader ], [ %inc, %for.body.1 ]\n"
-      "  br i1 %cond, label %for.body.1, label %for.exit\n"
-      "for.body.1:\n"
-      "  %idxprom = sext i32 %i to i64\n"
-      "  %arrayidx = getelementptr inbounds i32, i32* %A, i64 %idxprom\n"
-      "  store i32 %i, i32* %arrayidx, align 4\n"
-      "  %inc = add nsw i32 %i, 1\n"
-      "  %cmp = icmp slt i32 %inc, %ub\n"
-      "  br i1 %cmp, label %for.body, label %for.exit\n"
-      "for.exit:\n"
-      "  br label %for.end\n"
-      "for.end:\n"
-      "  ret void\n"
-      "}\n";
-
-  // Parse the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleStr);
-
-  runWithLoopInfoPlus(
-      *M, "foo",
-      [&](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-        Function::iterator FI = F.begin();
-        BasicBlock *Entry = &*(FI);
-        BranchInst *Guard = dyn_cast<BranchInst>(Entry->getTerminator());
-        // First two basic block are entry and for.preheader - skip them.
-        ++FI;
-        BasicBlock *Header = &*(++FI);
-        assert(Header->getName() == "for.body");
-        Loop *L = LI.getLoopFor(Header);
-        EXPECT_NE(L, nullptr);
-
-        Optional<Loop::LoopBounds> Bounds = L->getBounds(SE);
-        EXPECT_NE(Bounds, None);
-        ConstantInt *InitialIVValue =
-            dyn_cast<ConstantInt>(&Bounds->getInitialIVValue());
-        EXPECT_TRUE(InitialIVValue && InitialIVValue->isZero());
-        EXPECT_EQ(Bounds->getStepInst().getName(), "inc");
-        ConstantInt *StepValue =
-            dyn_cast_or_null<ConstantInt>(Bounds->getStepValue());
-        EXPECT_TRUE(StepValue && StepValue->isOne());
-        EXPECT_EQ(Bounds->getFinalIVValue().getName(), "ub");
-        EXPECT_EQ(Bounds->getCanonicalPredicate(), ICmpInst::ICMP_SLT);
-        EXPECT_EQ(Bounds->getDirection(),
-                  Loop::LoopBounds::Direction::Increasing);
-        EXPECT_EQ(L->getInductionVariable(SE)->getName(), "i");
-        EXPECT_EQ(L->getLoopGuardBranch(), Guard);
-        EXPECT_TRUE(L->isGuarded());
-      });
-}
-
-TEST(LoopInfoTest, MultiExitLoop) {
-  const char *ModuleStr =
-      "define void @foo(i32* %A, i32 %ub, i1 %cond) {\n"
-      "entry:\n"
-      "  %guardcmp = icmp slt i32 0, %ub\n"
-      "  br i1 %guardcmp, label %for.preheader, label %for.end\n"
-      "for.preheader:\n"
-      "  br label %for.body\n"
-      "for.body:\n"
-      "  %i = phi i32 [ 0, %for.preheader ], [ %inc, %for.body.1 ]\n"
-      "  br i1 %cond, label %for.body.1, label %for.exit\n"
-      "for.body.1:\n"
-      "  %idxprom = sext i32 %i to i64\n"
-      "  %arrayidx = getelementptr inbounds i32, i32* %A, i64 %idxprom\n"
-      "  store i32 %i, i32* %arrayidx, align 4\n"
-      "  %inc = add nsw i32 %i, 1\n"
-      "  %cmp = icmp slt i32 %inc, %ub\n"
-      "  br i1 %cmp, label %for.body, label %for.exit.1\n"
-      "for.exit:\n"
-      "  br label %for.end\n"
-      "for.exit.1:\n"
-      "  br label %for.end\n"
-      "for.end:\n"
-      "  ret void\n"
-      "}\n";
-
-  // Parse the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleStr);
-
-  runWithLoopInfoPlus(
-      *M, "foo",
-      [&](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-        Function::iterator FI = F.begin();
-        // First two basic block are entry and for.preheader - skip them.
-        ++FI;
-        BasicBlock *Header = &*(++FI);
-        assert(Header->getName() == "for.body");
-        Loop *L = LI.getLoopFor(Header);
-        EXPECT_NE(L, nullptr);
-
-        Optional<Loop::LoopBounds> Bounds = L->getBounds(SE);
-        EXPECT_NE(Bounds, None);
-        ConstantInt *InitialIVValue =
-            dyn_cast<ConstantInt>(&Bounds->getInitialIVValue());
-        EXPECT_TRUE(InitialIVValue && InitialIVValue->isZero());
-        EXPECT_EQ(Bounds->getStepInst().getName(), "inc");
-        ConstantInt *StepValue =
-            dyn_cast_or_null<ConstantInt>(Bounds->getStepValue());
-        EXPECT_TRUE(StepValue && StepValue->isOne());
-        EXPECT_EQ(Bounds->getFinalIVValue().getName(), "ub");
-        EXPECT_EQ(Bounds->getCanonicalPredicate(), ICmpInst::ICMP_SLT);
-        EXPECT_EQ(Bounds->getDirection(),
-                  Loop::LoopBounds::Direction::Increasing);
-        EXPECT_EQ(L->getInductionVariable(SE)->getName(), "i");
-        EXPECT_EQ(L->getLoopGuardBranch(), nullptr);
-        EXPECT_FALSE(L->isGuarded());
-      });
-}
-
-TEST(LoopInfoTest, UnguardedLoop) {
-  const char *ModuleStr =
-      "define void @foo(i32* %A, i32 %ub) {\n"
-      "entry:\n"
-      "  br label %for.body\n"
-      "for.body:\n"
-      "  %i = phi i32 [ 0, %entry ], [ %inc, %for.body ]\n"
-      "  %idxprom = sext i32 %i to i64\n"
-      "  %arrayidx = getelementptr inbounds i32, i32* %A, i64 %idxprom\n"
-      "  store i32 %i, i32* %arrayidx, align 4\n"
-      "  %inc = add nsw i32 %i, 1\n"
-      "  %cmp = icmp slt i32 %inc, %ub\n"
-      "  br i1 %cmp, label %for.body, label %for.exit\n"
-      "for.exit:\n"
-      "  br label %for.end\n"
-      "for.end:\n"
-      "  ret void\n"
-      "}\n";
-
-  // Parse the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleStr);
-
-  runWithLoopInfoPlus(
-      *M, "foo",
-      [&](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-        Function::iterator FI = F.begin();
-        // First basic block is entry - skip it.
-        BasicBlock *Header = &*(++FI);
-        assert(Header->getName() == "for.body");
-        Loop *L = LI.getLoopFor(Header);
-        EXPECT_NE(L, nullptr);
-
-        Optional<Loop::LoopBounds> Bounds = L->getBounds(SE);
-        EXPECT_NE(Bounds, None);
-        ConstantInt *InitialIVValue =
-            dyn_cast<ConstantInt>(&Bounds->getInitialIVValue());
-        EXPECT_TRUE(InitialIVValue && InitialIVValue->isZero());
-        EXPECT_EQ(Bounds->getStepInst().getName(), "inc");
-        ConstantInt *StepValue =
-            dyn_cast_or_null<ConstantInt>(Bounds->getStepValue());
-        EXPECT_TRUE(StepValue && StepValue->isOne());
-        EXPECT_EQ(Bounds->getFinalIVValue().getName(), "ub");
-        EXPECT_EQ(Bounds->getCanonicalPredicate(), ICmpInst::ICMP_SLT);
-        EXPECT_EQ(Bounds->getDirection(),
-                  Loop::LoopBounds::Direction::Increasing);
-        EXPECT_EQ(L->getInductionVariable(SE)->getName(), "i");
-        EXPECT_EQ(L->getLoopGuardBranch(), nullptr);
-        EXPECT_FALSE(L->isGuarded());
-        EXPECT_TRUE(L->isRotatedForm());
-      });
-}
-
-TEST(LoopInfoTest, UnguardedLoopWithControlFlow) {
-  const char *ModuleStr =
-      "define void @foo(i32* %A, i32 %ub, i1 %cond) {\n"
-      "entry:\n"
-      "  br i1 %cond, label %for.preheader, label %for.end\n"
-      "for.preheader:\n"
-      "  br label %for.body\n"
-      "for.body:\n"
-      "  %i = phi i32 [ 0, %for.preheader ], [ %inc, %for.body ]\n"
-      "  %idxprom = sext i32 %i to i64\n"
-      "  %arrayidx = getelementptr inbounds i32, i32* %A, i64 %idxprom\n"
-      "  store i32 %i, i32* %arrayidx, align 4\n"
-      "  %inc = add nsw i32 %i, 1\n"
-      "  %cmp = icmp slt i32 %inc, %ub\n"
-      "  br i1 %cmp, label %for.body, label %for.exit\n"
-      "for.exit:\n"
-      "  br label %for.end\n"
-      "for.end:\n"
-      "  ret void\n"
-      "}\n";
-
-  // Parse the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleStr);
-
-  runWithLoopInfoPlus(
-      *M, "foo",
-      [&](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-        Function::iterator FI = F.begin();
-        BasicBlock *Entry = &*(FI);
-        BranchInst *Guard = dyn_cast<BranchInst>(Entry->getTerminator());
-        // First two basic block are entry and for.preheader - skip them.
-        ++FI;
-        BasicBlock *Header = &*(++FI);
-        assert(Header->getName() == "for.body");
-        Loop *L = LI.getLoopFor(Header);
-        EXPECT_NE(L, nullptr);
-
-        Optional<Loop::LoopBounds> Bounds = L->getBounds(SE);
-        EXPECT_NE(Bounds, None);
-        ConstantInt *InitialIVValue =
-            dyn_cast<ConstantInt>(&Bounds->getInitialIVValue());
-        EXPECT_TRUE(InitialIVValue && InitialIVValue->isZero());
-        EXPECT_EQ(Bounds->getStepInst().getName(), "inc");
-        ConstantInt *StepValue =
-            dyn_cast_or_null<ConstantInt>(Bounds->getStepValue());
-        EXPECT_TRUE(StepValue && StepValue->isOne());
-        EXPECT_EQ(Bounds->getFinalIVValue().getName(), "ub");
-        EXPECT_EQ(Bounds->getCanonicalPredicate(), ICmpInst::ICMP_SLT);
-        EXPECT_EQ(Bounds->getDirection(),
-                  Loop::LoopBounds::Direction::Increasing);
-        EXPECT_EQ(L->getInductionVariable(SE)->getName(), "i");
-        EXPECT_EQ(L->getLoopGuardBranch(), Guard);
-        EXPECT_TRUE(L->isGuarded());
-        EXPECT_TRUE(L->isRotatedForm());
-      });
-}
-
-TEST(LoopInfoTest, LoopNest) {
-  const char *ModuleStr =
-      "define void @foo(i32* %A, i32 %ub) {\n"
-      "entry:\n"
-      "  %guardcmp = icmp slt i32 0, %ub\n"
-      "  br i1 %guardcmp, label %for.outer.preheader, label %for.end\n"
-      "for.outer.preheader:\n"
-      "  br label %for.outer\n"
-      "for.outer:\n"
-      "  %j = phi i32 [ 0, %for.outer.preheader ], [ %inc.outer, %for.outer.latch ]\n"
-      "  br i1 %guardcmp, label %for.inner.preheader, label %for.outer.latch\n"
-      "for.inner.preheader:\n"
-      "  br label %for.inner\n"
-      "for.inner:\n"
-      "  %i = phi i32 [ 0, %for.inner.preheader ], [ %inc, %for.inner ]\n"
-      "  %idxprom = sext i32 %i to i64\n"
-      "  %arrayidx = getelementptr inbounds i32, i32* %A, i64 %idxprom\n"
-      "  store i32 %i, i32* %arrayidx, align 4\n"
-      "  %inc = add nsw i32 %i, 1\n"
-      "  %cmp = icmp slt i32 %inc, %ub\n"
-      "  br i1 %cmp, label %for.inner, label %for.inner.exit\n"
-      "for.inner.exit:\n"
-      "  br label %for.outer.latch\n"
-      "for.outer.latch:\n"
-      "  %inc.outer = add nsw i32 %j, 1\n"
-      "  %cmp.outer = icmp slt i32 %inc.outer, %ub\n"
-      "  br i1 %cmp.outer, label %for.outer, label %for.outer.exit\n"
-      "for.outer.exit:\n"
-      "  br label %for.end\n"
-      "for.end:\n"
-      "  ret void\n"
-      "}\n";
-
-  // Parse the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleStr);
-
-  runWithLoopInfoPlus(
-      *M, "foo",
-      [&](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-        Function::iterator FI = F.begin();
-        BasicBlock *Entry = &*(FI);
-        BranchInst *OuterGuard = dyn_cast<BranchInst>(Entry->getTerminator());
-        // First two basic block are entry and for.outer.preheader - skip them.
-        ++FI;
-        BasicBlock *Header = &*(++FI);
-        assert(Header->getName() == "for.outer");
-        BranchInst *InnerGuard = dyn_cast<BranchInst>(Header->getTerminator());
-        Loop *L = LI.getLoopFor(Header);
-        EXPECT_NE(L, nullptr);
-
-        Optional<Loop::LoopBounds> Bounds = L->getBounds(SE);
-        EXPECT_NE(Bounds, None);
-        ConstantInt *InitialIVValue =
-            dyn_cast<ConstantInt>(&Bounds->getInitialIVValue());
-        EXPECT_TRUE(InitialIVValue && InitialIVValue->isZero());
-        EXPECT_EQ(Bounds->getStepInst().getName(), "inc.outer");
-        ConstantInt *StepValue =
-            dyn_cast_or_null<ConstantInt>(Bounds->getStepValue());
-        EXPECT_TRUE(StepValue && StepValue->isOne());
-        EXPECT_EQ(Bounds->getFinalIVValue().getName(), "ub");
-        EXPECT_EQ(Bounds->getCanonicalPredicate(), ICmpInst::ICMP_SLT);
-        EXPECT_EQ(Bounds->getDirection(),
-                  Loop::LoopBounds::Direction::Increasing);
-        EXPECT_EQ(L->getInductionVariable(SE)->getName(), "j");
-        EXPECT_EQ(L->getLoopGuardBranch(), OuterGuard);
-        EXPECT_TRUE(L->isGuarded());
-        EXPECT_TRUE(L->isRotatedForm());
-
-        // Next two basic blocks are for.outer and for.inner.preheader - skip
-        // them.
-        ++FI;
-        Header = &*(++FI);
-        assert(Header->getName() == "for.inner");
-        L = LI.getLoopFor(Header);
-        EXPECT_NE(L, nullptr);
-
-        Optional<Loop::LoopBounds> InnerBounds = L->getBounds(SE);
-        EXPECT_NE(InnerBounds, None);
-        InitialIVValue =
-            dyn_cast<ConstantInt>(&InnerBounds->getInitialIVValue());
-        EXPECT_TRUE(InitialIVValue && InitialIVValue->isZero());
-        EXPECT_EQ(InnerBounds->getStepInst().getName(), "inc");
-        StepValue = dyn_cast_or_null<ConstantInt>(InnerBounds->getStepValue());
-        EXPECT_TRUE(StepValue && StepValue->isOne());
-        EXPECT_EQ(InnerBounds->getFinalIVValue().getName(), "ub");
-        EXPECT_EQ(InnerBounds->getCanonicalPredicate(), ICmpInst::ICMP_SLT);
-        EXPECT_EQ(InnerBounds->getDirection(),
-                  Loop::LoopBounds::Direction::Increasing);
-        EXPECT_EQ(L->getInductionVariable(SE)->getName(), "i");
-        EXPECT_EQ(L->getLoopGuardBranch(), InnerGuard);
-        EXPECT_TRUE(L->isGuarded());
-        EXPECT_TRUE(L->isRotatedForm());
-      });
-}
-
-TEST(LoopInfoTest, AuxiliaryIV) {
-  const char *ModuleStr =
-      "define void @foo(i32* %A, i32 %ub) {\n"
-      "entry:\n"
-      "  %guardcmp = icmp slt i32 0, %ub\n"
-      "  br i1 %guardcmp, label %for.preheader, label %for.end\n"
-      "for.preheader:\n"
-      "  br label %for.body\n"
-      "for.body:\n"
-      "  %i = phi i32 [ 0, %for.preheader ], [ %inc, %for.body ]\n"
-      "  %aux = phi i32 [ 0, %for.preheader ], [ %auxinc, %for.body ]\n"
-      "  %loopvariant = phi i32 [ 0, %for.preheader ], [ %loopvariantinc, %for.body ]\n"
-      "  %usedoutside = phi i32 [ 0, %for.preheader ], [ %usedoutsideinc, %for.body ]\n"
-      "  %mulopcode = phi i32 [ 0, %for.preheader ], [ %mulopcodeinc, %for.body ]\n"
-      "  %idxprom = sext i32 %i to i64\n"
-      "  %arrayidx = getelementptr inbounds i32, i32* %A, i64 %idxprom\n"
-      "  store i32 %i, i32* %arrayidx, align 4\n"
-      "  %mulopcodeinc = mul nsw i32 %mulopcode, 5\n"
-      "  %usedoutsideinc = add nsw i32 %usedoutside, 5\n"
-      "  %loopvariantinc = add nsw i32 %loopvariant, %i\n"
-      "  %auxinc = add nsw i32 %aux, 5\n"
-      "  %inc = add nsw i32 %i, 1\n"
-      "  %cmp = icmp slt i32 %inc, %ub\n"
-      "  br i1 %cmp, label %for.body, label %for.exit\n"
-      "for.exit:\n"
-      "  %lcssa = phi i32 [ %usedoutside, %for.body ]\n"
-      "  br label %for.end\n"
-      "for.end:\n"
-      "  ret void\n"
-      "}\n";
-
-  // Parse the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleStr);
-
-  runWithLoopInfoPlus(
-      *M, "foo",
-      [&](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-        Function::iterator FI = F.begin();
-        BasicBlock *Entry = &*(FI);
-        BranchInst *Guard = dyn_cast<BranchInst>(Entry->getTerminator());
-        // First two basic block are entry and for.preheader - skip them.
-        ++FI;
-        BasicBlock *Header = &*(++FI);
-        assert(Header->getName() == "for.body");
-        Loop *L = LI.getLoopFor(Header);
-        EXPECT_NE(L, nullptr);
-
-        Optional<Loop::LoopBounds> Bounds = L->getBounds(SE);
-        EXPECT_NE(Bounds, None);
-        ConstantInt *InitialIVValue =
-            dyn_cast<ConstantInt>(&Bounds->getInitialIVValue());
-        EXPECT_TRUE(InitialIVValue && InitialIVValue->isZero());
-        EXPECT_EQ(Bounds->getStepInst().getName(), "inc");
-        ConstantInt *StepValue =
-            dyn_cast_or_null<ConstantInt>(Bounds->getStepValue());
-        EXPECT_TRUE(StepValue && StepValue->isOne());
-        EXPECT_EQ(Bounds->getFinalIVValue().getName(), "ub");
-        EXPECT_EQ(Bounds->getCanonicalPredicate(), ICmpInst::ICMP_SLT);
-        EXPECT_EQ(Bounds->getDirection(),
-                  Loop::LoopBounds::Direction::Increasing);
-        EXPECT_EQ(L->getInductionVariable(SE)->getName(), "i");
-        BasicBlock::iterator II = Header->begin();
-        PHINode &Instruction_i = cast<PHINode>(*(II));
-        EXPECT_TRUE(L->isAuxiliaryInductionVariable(Instruction_i, SE));
-        PHINode &Instruction_aux = cast<PHINode>(*(++II));
-        EXPECT_TRUE(L->isAuxiliaryInductionVariable(Instruction_aux, SE));
-        PHINode &Instruction_loopvariant = cast<PHINode>(*(++II));
-        EXPECT_FALSE(
-            L->isAuxiliaryInductionVariable(Instruction_loopvariant, SE));
-        PHINode &Instruction_usedoutside = cast<PHINode>(*(++II));
-        EXPECT_FALSE(
-            L->isAuxiliaryInductionVariable(Instruction_usedoutside, SE));
-        PHINode &Instruction_mulopcode = cast<PHINode>(*(++II));
-        EXPECT_FALSE(
-            L->isAuxiliaryInductionVariable(Instruction_mulopcode, SE));
-        EXPECT_EQ(L->getLoopGuardBranch(), Guard);
-        EXPECT_TRUE(L->isGuarded());
-        EXPECT_TRUE(L->isRotatedForm());
-      });
-}
-
-TEST(LoopInfoTest, LoopNotInSimplifyForm) {
-  const char *ModuleStr =
-      "define void @foo(i32 %n) {\n"
-      "entry:\n"
-      "  %guard.cmp = icmp sgt i32 %n, 0\n"
-      "  br i1 %guard.cmp, label %for.cond, label %for.end\n"
-      "for.cond:\n"
-      "  %i.0 = phi i32 [ 0, %entry ], [ %inc, %latch.1 ], [ %inc, %latch.2 ]\n"
-      "  %inc = add nsw i32 %i.0, 1\n"
-      "  %cmp = icmp slt i32 %i.0, %n\n"
-      "  br i1 %cmp, label %latch.1, label %for.end\n"
-      "latch.1:\n"
-      "  br i1 undef, label %for.cond, label %latch.2\n"
-      "latch.2:\n"
-      "  br label %for.cond\n"
-      "for.end:\n"
-      "  ret void\n"
-      "}\n";
-
-  // Parse the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleStr);
-
-  runWithLoopInfo(*M, "foo", [&](Function &F, LoopInfo &LI) {
-    Function::iterator FI = F.begin();
-    // First basic block is entry - skip it.
-    BasicBlock *Header = &*(++FI);
-    assert(Header && "No header");
-    Loop *L = LI.getLoopFor(Header);
-    EXPECT_NE(L, nullptr);
-    EXPECT_FALSE(L->isLoopSimplifyForm());
-    // No loop guard because loop in not in simplify form.
-    EXPECT_EQ(L->getLoopGuardBranch(), nullptr);
-    EXPECT_FALSE(L->isGuarded());
-  });
-}
-
-TEST(LoopInfoTest, LoopLatchNotExiting) {
-  const char *ModuleStr =
-      "define void @foo(i32* %A, i32 %ub) {\n"
-      "entry:\n"
-      "  %guardcmp = icmp slt i32 0, %ub\n"
-      "  br i1 %guardcmp, label %for.preheader, label %for.end\n"
-      "for.preheader:\n"
-      "  br label %for.body\n"
-      "for.body:\n"
-      "  %i = phi i32 [ 0, %for.preheader ], [ %inc, %for.body ]\n"
-      "  %idxprom = sext i32 %i to i64\n"
-      "  %arrayidx = getelementptr inbounds i32, i32* %A, i64 %idxprom\n"
-      "  store i32 %i, i32* %arrayidx, align 4\n"
-      "  %inc = add nsw i32 %i, 1\n"
-      "  %cmp = icmp slt i32 %inc, %ub\n"
-      "  br i1 %cmp, label %for.latch, label %for.exit\n"
-      "for.latch:\n"
-      "  br label %for.body\n"
-      "for.exit:\n"
-      "  br label %for.end\n"
-      "for.end:\n"
-      "  ret void\n"
-      "}\n";
-
-  // Parse the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleStr);
-
-  runWithLoopInfoPlus(
-      *M, "foo",
-      [&](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-        Function::iterator FI = F.begin();
-        // First two basic block are entry and for.preheader - skip them.
-        ++FI;
-        BasicBlock *Header = &*(++FI);
-        BasicBlock *Latch = &*(++FI);
-        assert(Header && "No header");
-        Loop *L = LI.getLoopFor(Header);
-        EXPECT_NE(L, nullptr);
-        EXPECT_TRUE(L->isLoopSimplifyForm());
-        EXPECT_EQ(L->getLoopLatch(), Latch);
-        EXPECT_FALSE(L->isLoopExiting(Latch));
-        // No loop guard becuase loop is not exiting on latch.
-        EXPECT_EQ(L->getLoopGuardBranch(), nullptr);
-        EXPECT_FALSE(L->isGuarded());
-      });
-}
-
-// Examine getUniqueExitBlocks/getUniqueNonLatchExitBlocks functions.
-TEST(LoopInfoTest, LoopUniqueExitBlocks) {
-  const char *ModuleStr =
-      "target datalayout = \"e-m:o-i64:64-f80:128-n8:16:32:64-S128\"\n"
-      "define void @foo(i32 %n, i1 %cond) {\n"
-      "entry:\n"
-      "  br label %for.cond\n"
-      "for.cond:\n"
-      "  %i.0 = phi i32 [ 0, %entry ], [ %inc, %for.inc ]\n"
-      "  %cmp = icmp slt i32 %i.0, %n\n"
-      "  br i1 %cond, label %for.inc, label %for.end1\n"
-      "for.inc:\n"
-      "  %inc = add nsw i32 %i.0, 1\n"
-      "  br i1 %cmp, label %for.cond, label %for.end2, !llvm.loop !0\n"
-      "for.end1:\n"
-      "  br label %for.end\n"
-      "for.end2:\n"
-      "  br label %for.end\n"
-      "for.end:\n"
-      "  ret void\n"
-      "}\n"
-      "!0 = distinct !{!0, !1}\n"
-      "!1 = !{!\"llvm.loop.distribute.enable\", i1 true}\n";
-
-  // Parse the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleStr);
-
-  runWithLoopInfo(*M, "foo", [&](Function &F, LoopInfo &LI) {
-    Function::iterator FI = F.begin();
-    // First basic block is entry - skip it.
-    BasicBlock *Header = &*(++FI);
-    assert(Header->getName() == "for.cond");
-    Loop *L = LI.getLoopFor(Header);
-
-    SmallVector<BasicBlock *, 2> Exits;
-    // This loop has 2 unique exits.
-    L->getUniqueExitBlocks(Exits);
-    EXPECT_TRUE(Exits.size() == 2);
-    // And one unique non latch exit.
-    Exits.clear();
-    L->getUniqueNonLatchExitBlocks(Exits);
-    EXPECT_TRUE(Exits.size() == 1);
-  });
-}
-
-// Regression test for  getUniqueNonLatchExitBlocks functions.
-// It should detect the exit if it comes from both latch and non-latch blocks.
-TEST(LoopInfoTest, LoopNonLatchUniqueExitBlocks) {
-  const char *ModuleStr =
-      "target datalayout = \"e-m:o-i64:64-f80:128-n8:16:32:64-S128\"\n"
-      "define void @foo(i32 %n, i1 %cond) {\n"
-      "entry:\n"
-      "  br label %for.cond\n"
-      "for.cond:\n"
-      "  %i.0 = phi i32 [ 0, %entry ], [ %inc, %for.inc ]\n"
-      "  %cmp = icmp slt i32 %i.0, %n\n"
-      "  br i1 %cond, label %for.inc, label %for.end\n"
-      "for.inc:\n"
-      "  %inc = add nsw i32 %i.0, 1\n"
-      "  br i1 %cmp, label %for.cond, label %for.end, !llvm.loop !0\n"
-      "for.end:\n"
-      "  ret void\n"
-      "}\n"
-      "!0 = distinct !{!0, !1}\n"
-      "!1 = !{!\"llvm.loop.distribute.enable\", i1 true}\n";
-
-  // Parse the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleStr);
-
-  runWithLoopInfo(*M, "foo", [&](Function &F, LoopInfo &LI) {
-    Function::iterator FI = F.begin();
-    // First basic block is entry - skip it.
-    BasicBlock *Header = &*(++FI);
-    assert(Header->getName() == "for.cond");
-    Loop *L = LI.getLoopFor(Header);
-
-    SmallVector<BasicBlock *, 2> Exits;
-    // This loop has 1 unique exit.
-    L->getUniqueExitBlocks(Exits);
-    EXPECT_TRUE(Exits.size() == 1);
-    // And one unique non latch exit.
-    Exits.clear();
-    L->getUniqueNonLatchExitBlocks(Exits);
-    EXPECT_TRUE(Exits.size() == 1);
-  });
-}
-
-// Test that a pointer-chasing loop is not rotated.
-TEST(LoopInfoTest, LoopNotRotated) {
-  const char *ModuleStr =
-      "target datalayout = \"e-m:o-i64:64-f80:128-n8:16:32:64-S128\"\n"
-      "define void @foo(i32* %elem) {\n"
-      "entry:\n"
-      "  br label %while.cond\n"
-      "while.cond:\n"
-      "  %elem.addr.0 = phi i32* [ %elem, %entry ], [ %incdec.ptr, %while.body "
-      "]\n"
-      "  %tobool = icmp eq i32* %elem.addr.0, null\n"
-      "  br i1 %tobool, label %while.end, label %while.body\n"
-      "while.body:\n"
-      "  %incdec.ptr = getelementptr inbounds i32, i32* %elem.addr.0, i64 1\n"
-      "  br label %while.cond\n"
-      "while.end:\n"
-      "  ret void\n"
-      "}\n";
-
-  // Parse the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleStr);
-
-  runWithLoopInfo(*M, "foo", [&](Function &F, LoopInfo &LI) {
-    Function::iterator FI = F.begin();
-    // First basic block is entry - skip it.
-    BasicBlock *Header = &*(++FI);
-    assert(Header->getName() == "while.cond");
-    Loop *L = LI.getLoopFor(Header);
-    EXPECT_NE(L, nullptr);
-
-    // This loop is in simplified form.
-    EXPECT_TRUE(L->isLoopSimplifyForm());
-
-    // This loop is not rotated.
-    EXPECT_FALSE(L->isRotatedForm());
-  });
-}
-
-TEST(LoopInfoTest, LoopUserBranch) {
-  const char *ModuleStr =
-      "target datalayout = \"e-m:o-i64:64-f80:128-n8:16:32:64-S128\"\n"
-      "define void @foo(i32* %B, i64 signext %nx, i1 %cond) {\n"
-      "entry:\n"
-      "  br i1 %cond, label %bb, label %guard\n"
-      "guard:\n"
-      "  %cmp.guard = icmp slt i64 0, %nx\n"
-      "  br i1 %cmp.guard, label %for.i.preheader, label %for.end\n"
-      "for.i.preheader:\n"
-      "  br label %for.i\n"
-      "for.i:\n"
-      "  %i = phi i64 [ 0, %for.i.preheader ], [ %inc13, %for.i ]\n"
-      "  %Bi = getelementptr inbounds i32, i32* %B, i64 %i\n"
-      "  store i32 0, i32* %Bi, align 4\n"
-      "  %inc13 = add nsw i64 %i, 1\n"
-      "  %cmp = icmp slt i64 %inc13, %nx\n"
-      "  br i1 %cmp, label %for.i, label %for.i.exit\n"
-      "for.i.exit:\n"
-      "  br label %bb\n"
-      "bb:\n"
-      "  br label %for.end\n"
-      "for.end:\n"
-      "  ret void\n"
-      "}\n";
-
-  // Parse the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleStr);
-
-  runWithLoopInfo(*M, "foo", [&](Function &F, LoopInfo &LI) {
-    Function::iterator FI = F.begin();
-    FI = ++FI;
-    assert(FI->getName() == "guard");
-
-    FI = ++FI;
-    BasicBlock *Header = &*(++FI);
-    assert(Header->getName() == "for.i");
-
-    Loop *L = LI.getLoopFor(Header);
-    EXPECT_NE(L, nullptr);
-
-    // L should not have a guard branch
-    EXPECT_EQ(L->getLoopGuardBranch(), nullptr);
-  });
-}
diff --git a/gnu/llvm/llvm/unittests/Analysis/LoopNestTest.cpp b/gnu/llvm/llvm/unittests/Analysis/LoopNestTest.cpp
deleted file mode 100644
index 98071d2dfad..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/LoopNestTest.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-//===- LoopNestTest.cpp - LoopNestAnalysis unit tests ---------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/AssumptionCache.h"
-#include "llvm/Analysis/LoopNestAnalysis.h"
-#include "llvm/Analysis/ScalarEvolution.h"
-#include "llvm/Analysis/TargetLibraryInfo.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Dominators.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-/// Build the loop nest analysis for a loop nest and run the given test \p Test.
-static void runTest(
-    Module &M, StringRef FuncName,
-    function_ref<void(Function &F, LoopInfo &LI, ScalarEvolution &SE)> Test) {
-  auto *F = M.getFunction(FuncName);
-  ASSERT_NE(F, nullptr) << "Could not find " << FuncName;
-
-  TargetLibraryInfoImpl TLII;
-  TargetLibraryInfo TLI(TLII);
-  AssumptionCache AC(*F);
-  DominatorTree DT(*F);
-  LoopInfo LI(DT);
-  ScalarEvolution SE(*F, TLI, AC, DT, LI);
-
-  Test(*F, LI, SE);
-}
-
-static std::unique_ptr<Module> makeLLVMModule(LLVMContext &Context,
-                                              const char *ModuleStr) {
-  SMDiagnostic Err;
-  return parseAssemblyString(ModuleStr, Err, Context);
-}
-
-TEST(LoopNestTest, PerfectLoopNest) {
-  const char *ModuleStr =
-    "target datalayout = \"e-m:o-i64:64-f80:128-n8:16:32:64-S128\"\n"
-    "define void @foo(i64 signext %nx, i64 signext %ny) {\n"
-    "entry:\n"
-    "  br label %for.outer\n"
-    "for.outer:\n"
-    "  %i = phi i64 [ 0, %entry ], [ %inc13, %for.outer.latch ]\n"
-    "  %cmp21 = icmp slt i64 0, %ny\n"
-    "  br i1 %cmp21, label %for.inner.preheader, label %for.outer.latch\n"
-    "for.inner.preheader:\n"
-    "  br label %for.inner\n"
-    "for.inner:\n"
-    "  %j = phi i64 [ 0, %for.inner.preheader ], [ %inc, %for.inner.latch ]\n"
-    "  br label %for.inner.latch\n"
-    "for.inner.latch:\n"
-    "  %inc = add nsw i64 %j, 1\n"
-    "  %cmp2 = icmp slt i64 %inc, %ny\n"
-    "  br i1 %cmp2, label %for.inner, label %for.inner.exit\n"
-    "for.inner.exit:\n"
-    "  br label %for.outer.latch\n"
-    "for.outer.latch:\n"
-    "  %inc13 = add nsw i64 %i, 1\n"
-    "  %cmp = icmp slt i64 %inc13, %nx\n"
-    "  br i1 %cmp, label %for.outer, label %for.outer.exit\n"
-    "for.outer.exit:\n"
-    "  br label %for.end\n"
-    "for.end:\n"
-    "  ret void\n"
-    "}\n";
-
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleStr);
-
-  runTest(*M, "foo", [&](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-    Function::iterator FI = F.begin();
-    // Skip the first basic block (entry), get to the outer loop header.
-    BasicBlock *Header = &*(++FI);
-    assert(Header->getName() == "for.outer");
-    Loop *L = LI.getLoopFor(Header);
-    EXPECT_NE(L, nullptr);
-
-    LoopNest LN(*L, SE);
-    EXPECT_TRUE(LN.areAllLoopsSimplifyForm());
-
-    // Ensure that we can identify the outermost loop in the nest.
-    const Loop &OL = LN.getOutermostLoop();
-    EXPECT_EQ(OL.getName(), "for.outer");
-
-    // Ensure that we can identify the innermost loop in the nest.
-    const Loop *IL = LN.getInnermostLoop();
-    EXPECT_NE(IL, nullptr);
-    EXPECT_EQ(IL->getName(), "for.inner");
-
-    // Ensure the loop nest is recognized as having 2 loops.
-    const ArrayRef<Loop*> Loops = LN.getLoops();
-    EXPECT_EQ(Loops.size(), 2ull);
-
-    // Ensure the loop nest is recognized as perfect in its entirety.
-    const SmallVector<LoopVectorTy, 4> &PLV = LN.getPerfectLoops(SE);
-    EXPECT_EQ(PLV.size(), 1ull);
-    EXPECT_EQ(PLV.front().size(), 2ull);
-
-    // Ensure the nest depth and perfect nest depth are computed correctly.
-    EXPECT_EQ(LN.getNestDepth(), 2u);
-    EXPECT_EQ(LN.getMaxPerfectDepth(), 2u);
-  });
-}
-
-TEST(LoopNestTest, ImperfectLoopNest) {
-  const char *ModuleStr =
-      "target datalayout = \"e-m:o-i64:64-f80:128-n8:16:32:64-S128\"\n"
-      "define void @foo(i32 signext %nx, i32 signext %ny, i32 signext %nk) {\n"
-      "entry:\n"
-      "  br label %loop.i\n"
-      "loop.i:\n"
-      "  %i = phi i32 [ 0, %entry ], [ %inci, %for.inci ]\n"
-      "  %cmp21 = icmp slt i32 0, %ny\n"
-      "  br i1 %cmp21, label %loop.j.preheader, label %for.inci\n"
-      "loop.j.preheader:\n"
-      "  br label %loop.j\n"
-      "loop.j:\n"
-      "  %j = phi i32 [ %incj, %for.incj ], [ 0, %loop.j.preheader ]\n"
-      "  %cmp22 = icmp slt i32 0, %nk\n"
-      "  br i1 %cmp22, label %loop.k.preheader, label %for.incj\n"
-      "loop.k.preheader:\n"
-      "  call void @bar()\n"
-      "  br label %loop.k\n"
-      "loop.k:\n"
-      "  %k = phi i32 [ %inck, %for.inck ], [ 0, %loop.k.preheader ]\n"
-      "  br label %for.inck\n"
-      "for.inck:\n"
-      "  %inck = add nsw i32 %k, 1\n"
-      "  %cmp5 = icmp slt i32 %inck, %nk\n"
-      "  br i1 %cmp5, label %loop.k, label %for.incj.loopexit\n"
-      "for.incj.loopexit:\n"
-      "  br label %for.incj\n"
-      "for.incj:\n"
-      "  %incj = add nsw i32 %j, 1\n"
-      "  %cmp2 = icmp slt i32 %incj, %ny\n"
-      "  br i1 %cmp2, label %loop.j, label %for.inci.loopexit\n"
-      "for.inci.loopexit:\n"
-      "  br label %for.inci\n"
-      "for.inci:\n"
-      "  %inci = add nsw i32 %i, 1\n"
-      "  %cmp = icmp slt i32 %inci, %nx\n"
-      "  br i1 %cmp, label %loop.i, label %loop.i.end\n"
-      "loop.i.end:\n"
-      "  ret void\n"
-      "}\n"
-      "declare void @bar()\n";
-
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleStr);
-
-  runTest(*M, "foo", [&](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-    Function::iterator FI = F.begin();
-    // Skip the first basic block (entry), get to the outermost loop header.
-    BasicBlock *Header = &*(++FI);
-    assert(Header->getName() == "loop.i");
-    Loop *L = LI.getLoopFor(Header);
-    EXPECT_NE(L, nullptr);
-
-    LoopNest LN(*L, SE);
-    EXPECT_TRUE(LN.areAllLoopsSimplifyForm());
-
-    dbgs() << "LN: " << LN << "\n";
-
-    // Ensure that we can identify the outermost loop in the nest.
-    const Loop &OL = LN.getOutermostLoop();
-    EXPECT_EQ(OL.getName(), "loop.i");
-
-    // Ensure that we can identify the innermost loop in the nest.
-    const Loop *IL = LN.getInnermostLoop();
-    EXPECT_NE(IL, nullptr);
-    EXPECT_EQ(IL->getName(), "loop.k");
-
-    // Ensure the loop nest is recognized as having 3 loops.
-    const ArrayRef<Loop*> Loops = LN.getLoops();
-    EXPECT_EQ(Loops.size(), 3ull);
-
-    // Ensure the loop nest is recognized as having 2 separate perfect loops groups.
-    const SmallVector<LoopVectorTy, 4> &PLV = LN.getPerfectLoops(SE);
-    EXPECT_EQ(PLV.size(), 2ull);
-    EXPECT_EQ(PLV.front().size(), 2ull);
-    EXPECT_EQ(PLV.back().size(), 1ull);
-
-    // Ensure the nest depth and perfect nest depth are computed correctly.
-    EXPECT_EQ(LN.getNestDepth(), 3u);
-    EXPECT_EQ(LN.getMaxPerfectDepth(), 2u);
-  });
-}
-
diff --git a/gnu/llvm/llvm/unittests/Analysis/MemoryBuiltinsTest.cpp b/gnu/llvm/llvm/unittests/Analysis/MemoryBuiltinsTest.cpp
deleted file mode 100644
index 575b7f32047..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/MemoryBuiltinsTest.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-//===- MemoryBuiltinsTest.cpp - Tests for utilities in MemoryBuiltins.h ---===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/MemoryBuiltins.h"
-#include "llvm/IR/Attributes.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-// allocsize should not imply that a function is a traditional allocation
-// function (e.g. that can be optimized out/...); it just tells us how many
-// bytes exist at the pointer handed back by the function.
-TEST(AllocSize, AllocationBuiltinsTest) {
-  LLVMContext Context;
-  Module M("", Context);
-  IntegerType *ArgTy = Type::getInt32Ty(Context);
-
-  Function *AllocSizeFn = Function::Create(
-      FunctionType::get(Type::getInt8PtrTy(Context), {ArgTy}, false),
-      GlobalValue::ExternalLinkage, "F", &M);
-
-  AllocSizeFn->addFnAttr(Attribute::getWithAllocSizeArgs(Context, 1, None));
-
-  // 100 is arbitrary.
-  std::unique_ptr<CallInst> Caller(
-      CallInst::Create(AllocSizeFn, {ConstantInt::get(ArgTy, 100)}));
-
-  const TargetLibraryInfo *TLI = nullptr;
-  EXPECT_FALSE(isNoAliasFn(Caller.get(), TLI));
-  EXPECT_FALSE(isMallocLikeFn(Caller.get(), TLI));
-  EXPECT_FALSE(isCallocLikeFn(Caller.get(), TLI));
-  EXPECT_FALSE(isAllocLikeFn(Caller.get(), TLI));
-
-  // FIXME: We might be able to treat allocsize functions as general allocation
-  // functions. For the moment, being conservative seems better (and we'd have
-  // to plumb stuff around `isNoAliasFn`).
-  EXPECT_FALSE(isAllocationFn(Caller.get(), TLI));
-}
-}
diff --git a/gnu/llvm/llvm/unittests/Analysis/MemorySSATest.cpp b/gnu/llvm/llvm/unittests/Analysis/MemorySSATest.cpp
deleted file mode 100644
index 3c8aa0159e6..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/MemorySSATest.cpp
+++ /dev/null
@@ -1,1728 +0,0 @@
-//===- MemorySSA.cpp - Unit tests for MemorySSA ---------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-#include "llvm/Analysis/MemorySSA.h"
-#include "llvm/Analysis/AliasAnalysis.h"
-#include "llvm/Analysis/AssumptionCache.h"
-#include "llvm/Analysis/BasicAliasAnalysis.h"
-#include "llvm/Analysis/MemorySSAUpdater.h"
-#include "llvm/Analysis/TargetLibraryInfo.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/BasicBlock.h"
-#include "llvm/IR/DataLayout.h"
-#include "llvm/IR/Dominators.h"
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-const static char DLString[] = "e-i64:64-f80:128-n8:16:32:64-S128";
-
-/// There's a lot of common setup between these tests. This fixture helps reduce
-/// that. Tests should mock up a function, store it in F, and then call
-/// setupAnalyses().
-class MemorySSATest : public testing::Test {
-protected:
-  // N.B. Many of these members depend on each other (e.g. the Module depends on
-  // the Context, etc.). So, order matters here (and in TestAnalyses).
-  LLVMContext C;
-  Module M;
-  IRBuilder<> B;
-  DataLayout DL;
-  TargetLibraryInfoImpl TLII;
-  TargetLibraryInfo TLI;
-  Function *F;
-
-  // Things that we need to build after the function is created.
-  struct TestAnalyses {
-    DominatorTree DT;
-    AssumptionCache AC;
-    AAResults AA;
-    BasicAAResult BAA;
-    // We need to defer MSSA construction until AA is *entirely* set up, which
-    // requires calling addAAResult. Hence, we just use a pointer here.
-    std::unique_ptr<MemorySSA> MSSA;
-    MemorySSAWalker *Walker;
-
-    TestAnalyses(MemorySSATest &Test)
-        : DT(*Test.F), AC(*Test.F), AA(Test.TLI),
-          BAA(Test.DL, *Test.F, Test.TLI, AC, &DT) {
-      AA.addAAResult(BAA);
-      MSSA = std::make_unique<MemorySSA>(*Test.F, &AA, &DT);
-      Walker = MSSA->getWalker();
-    }
-  };
-
-  std::unique_ptr<TestAnalyses> Analyses;
-
-  void setupAnalyses() {
-    assert(F);
-    Analyses.reset(new TestAnalyses(*this));
-  }
-
-public:
-  MemorySSATest()
-      : M("MemorySSATest", C), B(C), DL(DLString), TLI(TLII), F(nullptr) {}
-};
-
-TEST_F(MemorySSATest, CreateALoad) {
-  // We create a diamond where there is a store on one side, and then after
-  // building MemorySSA, create a load after the merge point, and use it to test
-  // updating by creating an access for the load.
-  F = Function::Create(
-      FunctionType::get(B.getVoidTy(), {B.getInt8PtrTy()}, false),
-      GlobalValue::ExternalLinkage, "F", &M);
-  BasicBlock *Entry(BasicBlock::Create(C, "", F));
-  BasicBlock *Left(BasicBlock::Create(C, "", F));
-  BasicBlock *Right(BasicBlock::Create(C, "", F));
-  BasicBlock *Merge(BasicBlock::Create(C, "", F));
-  B.SetInsertPoint(Entry);
-  B.CreateCondBr(B.getTrue(), Left, Right);
-  B.SetInsertPoint(Left);
-  Argument *PointerArg = &*F->arg_begin();
-  B.CreateStore(B.getInt8(16), PointerArg);
-  BranchInst::Create(Merge, Left);
-  BranchInst::Create(Merge, Right);
-
-  setupAnalyses();
-  MemorySSA &MSSA = *Analyses->MSSA;
-  MemorySSAUpdater Updater(&MSSA);
-  // Add the load
-  B.SetInsertPoint(Merge);
-  LoadInst *LoadInst = B.CreateLoad(B.getInt8Ty(), PointerArg);
-
-  // MemoryPHI should already exist.
-  MemoryPhi *MP = MSSA.getMemoryAccess(Merge);
-  EXPECT_NE(MP, nullptr);
-
-  // Create the load memory acccess
-  MemoryUse *LoadAccess = cast<MemoryUse>(Updater.createMemoryAccessInBB(
-      LoadInst, MP, Merge, MemorySSA::Beginning));
-  MemoryAccess *DefiningAccess = LoadAccess->getDefiningAccess();
-  EXPECT_TRUE(isa<MemoryPhi>(DefiningAccess));
-  MSSA.verifyMemorySSA();
-}
-TEST_F(MemorySSATest, CreateLoadsAndStoreUpdater) {
-  // We create a diamond, then build memoryssa with no memory accesses, and
-  // incrementally update it by inserting a store in the, entry, a load in the
-  // merge point, then a store in the branch, another load in the merge point,
-  // and then a store in the entry.
-  F = Function::Create(
-      FunctionType::get(B.getVoidTy(), {B.getInt8PtrTy()}, false),
-      GlobalValue::ExternalLinkage, "F", &M);
-  BasicBlock *Entry(BasicBlock::Create(C, "", F));
-  BasicBlock *Left(BasicBlock::Create(C, "", F));
-  BasicBlock *Right(BasicBlock::Create(C, "", F));
-  BasicBlock *Merge(BasicBlock::Create(C, "", F));
-  B.SetInsertPoint(Entry);
-  B.CreateCondBr(B.getTrue(), Left, Right);
-  B.SetInsertPoint(Left, Left->begin());
-  Argument *PointerArg = &*F->arg_begin();
-  B.SetInsertPoint(Left);
-  B.CreateBr(Merge);
-  B.SetInsertPoint(Right);
-  B.CreateBr(Merge);
-
-  setupAnalyses();
-  MemorySSA &MSSA = *Analyses->MSSA;
-  MemorySSAUpdater Updater(&MSSA);
-  // Add the store
-  B.SetInsertPoint(Entry, Entry->begin());
-  StoreInst *EntryStore = B.CreateStore(B.getInt8(16), PointerArg);
-  MemoryAccess *EntryStoreAccess = Updater.createMemoryAccessInBB(
-      EntryStore, nullptr, Entry, MemorySSA::Beginning);
-  Updater.insertDef(cast<MemoryDef>(EntryStoreAccess));
-
-  // Add the load
-  B.SetInsertPoint(Merge, Merge->begin());
-  LoadInst *FirstLoad = B.CreateLoad(B.getInt8Ty(), PointerArg);
-
-  // MemoryPHI should not already exist.
-  MemoryPhi *MP = MSSA.getMemoryAccess(Merge);
-  EXPECT_EQ(MP, nullptr);
-
-  // Create the load memory access
-  MemoryUse *FirstLoadAccess = cast<MemoryUse>(Updater.createMemoryAccessInBB(
-      FirstLoad, nullptr, Merge, MemorySSA::Beginning));
-  Updater.insertUse(FirstLoadAccess);
-  // Should just have a load using the entry access, because it should discover
-  // the phi is trivial
-  EXPECT_EQ(FirstLoadAccess->getDefiningAccess(), EntryStoreAccess);
-
-  // Create a store on the left
-  // Add the store
-  B.SetInsertPoint(Left, Left->begin());
-  StoreInst *LeftStore = B.CreateStore(B.getInt8(16), PointerArg);
-  MemoryAccess *LeftStoreAccess = Updater.createMemoryAccessInBB(
-      LeftStore, nullptr, Left, MemorySSA::Beginning);
-  Updater.insertDef(cast<MemoryDef>(LeftStoreAccess), false);
-
-  // MemoryPHI should exist after adding LeftStore.
-  MP = MSSA.getMemoryAccess(Merge);
-  EXPECT_NE(MP, nullptr);
-
-  // Add the second load
-  B.SetInsertPoint(Merge, Merge->begin());
-  LoadInst *SecondLoad = B.CreateLoad(B.getInt8Ty(), PointerArg);
-
-  // Create the load memory access
-  MemoryUse *SecondLoadAccess = cast<MemoryUse>(Updater.createMemoryAccessInBB(
-      SecondLoad, nullptr, Merge, MemorySSA::Beginning));
-  Updater.insertUse(SecondLoadAccess);
-  // Now the load should be a phi of the entry store and the left store
-  MemoryPhi *MergePhi =
-      dyn_cast<MemoryPhi>(SecondLoadAccess->getDefiningAccess());
-  EXPECT_NE(MergePhi, nullptr);
-  EXPECT_EQ(MergePhi->getIncomingValue(0), EntryStoreAccess);
-  EXPECT_EQ(MergePhi->getIncomingValue(1), LeftStoreAccess);
-  // Now create a store below the existing one in the entry
-  B.SetInsertPoint(Entry, --Entry->end());
-  StoreInst *SecondEntryStore = B.CreateStore(B.getInt8(16), PointerArg);
-  MemoryAccess *SecondEntryStoreAccess = Updater.createMemoryAccessInBB(
-      SecondEntryStore, nullptr, Entry, MemorySSA::End);
-  // Insert it twice just to test renaming
-  Updater.insertDef(cast<MemoryDef>(SecondEntryStoreAccess), false);
-  EXPECT_NE(FirstLoadAccess->getDefiningAccess(), MergePhi);
-  Updater.insertDef(cast<MemoryDef>(SecondEntryStoreAccess), true);
-  EXPECT_EQ(FirstLoadAccess->getDefiningAccess(), MergePhi);
-  // and make sure the phi below it got updated, despite being blocks away
-  MergePhi = dyn_cast<MemoryPhi>(SecondLoadAccess->getDefiningAccess());
-  EXPECT_NE(MergePhi, nullptr);
-  EXPECT_EQ(MergePhi->getIncomingValue(0), SecondEntryStoreAccess);
-  EXPECT_EQ(MergePhi->getIncomingValue(1), LeftStoreAccess);
-  MSSA.verifyMemorySSA();
-}
-
-TEST_F(MemorySSATest, CreateALoadUpdater) {
-  // We create a diamond, then build memoryssa with no memory accesses, and
-  // incrementally update it by inserting a store in one of the branches, and a
-  // load in the merge point
-  F = Function::Create(
-      FunctionType::get(B.getVoidTy(), {B.getInt8PtrTy()}, false),
-      GlobalValue::ExternalLinkage, "F", &M);
-  BasicBlock *Entry(BasicBlock::Create(C, "", F));
-  BasicBlock *Left(BasicBlock::Create(C, "", F));
-  BasicBlock *Right(BasicBlock::Create(C, "", F));
-  BasicBlock *Merge(BasicBlock::Create(C, "", F));
-  B.SetInsertPoint(Entry);
-  B.CreateCondBr(B.getTrue(), Left, Right);
-  B.SetInsertPoint(Left, Left->begin());
-  Argument *PointerArg = &*F->arg_begin();
-  B.SetInsertPoint(Left);
-  B.CreateBr(Merge);
-  B.SetInsertPoint(Right);
-  B.CreateBr(Merge);
-
-  setupAnalyses();
-  MemorySSA &MSSA = *Analyses->MSSA;
-  MemorySSAUpdater Updater(&MSSA);
-  B.SetInsertPoint(Left, Left->begin());
-  // Add the store
-  StoreInst *SI = B.CreateStore(B.getInt8(16), PointerArg);
-  MemoryAccess *StoreAccess =
-      Updater.createMemoryAccessInBB(SI, nullptr, Left, MemorySSA::Beginning);
-  Updater.insertDef(cast<MemoryDef>(StoreAccess));
-
-  // MemoryPHI should be created when inserting the def
-  MemoryPhi *MP = MSSA.getMemoryAccess(Merge);
-  EXPECT_NE(MP, nullptr);
-
-  // Add the load
-  B.SetInsertPoint(Merge, Merge->begin());
-  LoadInst *LoadInst = B.CreateLoad(B.getInt8Ty(), PointerArg);
-
-  // Create the load memory acccess
-  MemoryUse *LoadAccess = cast<MemoryUse>(Updater.createMemoryAccessInBB(
-      LoadInst, nullptr, Merge, MemorySSA::Beginning));
-  Updater.insertUse(LoadAccess);
-  MemoryAccess *DefiningAccess = LoadAccess->getDefiningAccess();
-  EXPECT_TRUE(isa<MemoryPhi>(DefiningAccess));
-  MSSA.verifyMemorySSA();
-}
-
-TEST_F(MemorySSATest, SinkLoad) {
-  F = Function::Create(
-      FunctionType::get(B.getVoidTy(), {B.getInt8PtrTy()}, false),
-      GlobalValue::ExternalLinkage, "F", &M);
-  BasicBlock *Entry(BasicBlock::Create(C, "", F));
-  BasicBlock *Left(BasicBlock::Create(C, "", F));
-  BasicBlock *Right(BasicBlock::Create(C, "", F));
-  BasicBlock *Merge(BasicBlock::Create(C, "", F));
-  B.SetInsertPoint(Entry);
-  B.CreateCondBr(B.getTrue(), Left, Right);
-  B.SetInsertPoint(Left, Left->begin());
-  Argument *PointerArg = &*F->arg_begin();
-  B.SetInsertPoint(Left);
-  B.CreateBr(Merge);
-  B.SetInsertPoint(Right);
-  B.CreateBr(Merge);
-
-  // Load in left block
-  B.SetInsertPoint(Left, Left->begin());
-  LoadInst *LoadInst1 = B.CreateLoad(B.getInt8Ty(), PointerArg);
-  // Store in merge block
-  B.SetInsertPoint(Merge, Merge->begin());
-  B.CreateStore(B.getInt8(16), PointerArg);
-
-  setupAnalyses();
-  MemorySSA &MSSA = *Analyses->MSSA;
-  MemorySSAUpdater Updater(&MSSA);
-
-  // Mimic sinking of a load:
-  // - clone load
-  // - insert in "exit" block
-  // - insert in mssa
-  // - remove from original block
-
-  LoadInst *LoadInstClone = cast<LoadInst>(LoadInst1->clone());
-  Merge->getInstList().insert(Merge->begin(), LoadInstClone);
-  MemoryAccess * NewLoadAccess =
-      Updater.createMemoryAccessInBB(LoadInstClone, nullptr,
-                                     LoadInstClone->getParent(),
-                                     MemorySSA::Beginning);
-  Updater.insertUse(cast<MemoryUse>(NewLoadAccess));
-  MSSA.verifyMemorySSA();
-  Updater.removeMemoryAccess(MSSA.getMemoryAccess(LoadInst1));
-  MSSA.verifyMemorySSA();
-}
-
-TEST_F(MemorySSATest, MoveAStore) {
-  // We create a diamond where there is a in the entry, a store on one side, and
-  // a load at the end.  After building MemorySSA, we test updating by moving
-  // the store from the side block to the entry block. This destroys the old
-  // access.
-  F = Function::Create(
-      FunctionType::get(B.getVoidTy(), {B.getInt8PtrTy()}, false),
-      GlobalValue::ExternalLinkage, "F", &M);
-  BasicBlock *Entry(BasicBlock::Create(C, "", F));
-  BasicBlock *Left(BasicBlock::Create(C, "", F));
-  BasicBlock *Right(BasicBlock::Create(C, "", F));
-  BasicBlock *Merge(BasicBlock::Create(C, "", F));
-  B.SetInsertPoint(Entry);
-  Argument *PointerArg = &*F->arg_begin();
-  StoreInst *EntryStore = B.CreateStore(B.getInt8(16), PointerArg);
-  B.CreateCondBr(B.getTrue(), Left, Right);
-  B.SetInsertPoint(Left);
-  StoreInst *SideStore = B.CreateStore(B.getInt8(16), PointerArg);
-  BranchInst::Create(Merge, Left);
-  BranchInst::Create(Merge, Right);
-  B.SetInsertPoint(Merge);
-  B.CreateLoad(B.getInt8Ty(), PointerArg);
-  setupAnalyses();
-  MemorySSA &MSSA = *Analyses->MSSA;
-  MemorySSAUpdater Updater(&MSSA);
-  // Move the store
-  SideStore->moveBefore(Entry->getTerminator());
-  MemoryAccess *EntryStoreAccess = MSSA.getMemoryAccess(EntryStore);
-  MemoryAccess *SideStoreAccess = MSSA.getMemoryAccess(SideStore);
-  MemoryAccess *NewStoreAccess = Updater.createMemoryAccessAfter(
-      SideStore, EntryStoreAccess, EntryStoreAccess);
-  EntryStoreAccess->replaceAllUsesWith(NewStoreAccess);
-  Updater.removeMemoryAccess(SideStoreAccess);
-  MSSA.verifyMemorySSA();
-}
-
-TEST_F(MemorySSATest, MoveAStoreUpdater) {
-  // We create a diamond where there is a in the entry, a store on one side, and
-  // a load at the end.  After building MemorySSA, we test updating by moving
-  // the store from the side block to the entry block.  This destroys the old
-  // access.
-  F = Function::Create(
-      FunctionType::get(B.getVoidTy(), {B.getInt8PtrTy()}, false),
-      GlobalValue::ExternalLinkage, "F", &M);
-  BasicBlock *Entry(BasicBlock::Create(C, "", F));
-  BasicBlock *Left(BasicBlock::Create(C, "", F));
-  BasicBlock *Right(BasicBlock::Create(C, "", F));
-  BasicBlock *Merge(BasicBlock::Create(C, "", F));
-  B.SetInsertPoint(Entry);
-  Argument *PointerArg = &*F->arg_begin();
-  StoreInst *EntryStore = B.CreateStore(B.getInt8(16), PointerArg);
-  B.CreateCondBr(B.getTrue(), Left, Right);
-  B.SetInsertPoint(Left);
-  auto *SideStore = B.CreateStore(B.getInt8(16), PointerArg);
-  BranchInst::Create(Merge, Left);
-  BranchInst::Create(Merge, Right);
-  B.SetInsertPoint(Merge);
-  auto *MergeLoad = B.CreateLoad(B.getInt8Ty(), PointerArg);
-  setupAnalyses();
-  MemorySSA &MSSA = *Analyses->MSSA;
-  MemorySSAUpdater Updater(&MSSA);
-
-  // Move the store
-  SideStore->moveBefore(Entry->getTerminator());
-  auto *EntryStoreAccess = MSSA.getMemoryAccess(EntryStore);
-  auto *SideStoreAccess = MSSA.getMemoryAccess(SideStore);
-  auto *NewStoreAccess = Updater.createMemoryAccessAfter(
-      SideStore, EntryStoreAccess, EntryStoreAccess);
-  // Before, the load will point to a phi of the EntryStore and SideStore.
-  auto *LoadAccess = cast<MemoryUse>(MSSA.getMemoryAccess(MergeLoad));
-  EXPECT_TRUE(isa<MemoryPhi>(LoadAccess->getDefiningAccess()));
-  MemoryPhi *MergePhi = cast<MemoryPhi>(LoadAccess->getDefiningAccess());
-  EXPECT_EQ(MergePhi->getIncomingValue(1), EntryStoreAccess);
-  EXPECT_EQ(MergePhi->getIncomingValue(0), SideStoreAccess);
-  Updater.removeMemoryAccess(SideStoreAccess);
-  Updater.insertDef(cast<MemoryDef>(NewStoreAccess));
-  // After it's a phi of the new side store access.
-  EXPECT_EQ(MergePhi->getIncomingValue(0), NewStoreAccess);
-  EXPECT_EQ(MergePhi->getIncomingValue(1), NewStoreAccess);
-  MSSA.verifyMemorySSA();
-}
-
-TEST_F(MemorySSATest, MoveAStoreUpdaterMove) {
-  // We create a diamond where there is a in the entry, a store on one side, and
-  // a load at the end.  After building MemorySSA, we test updating by moving
-  // the store from the side block to the entry block.  This does not destroy
-  // the old access.
-  F = Function::Create(
-      FunctionType::get(B.getVoidTy(), {B.getInt8PtrTy()}, false),
-      GlobalValue::ExternalLinkage, "F", &M);
-  BasicBlock *Entry(BasicBlock::Create(C, "", F));
-  BasicBlock *Left(BasicBlock::Create(C, "", F));
-  BasicBlock *Right(BasicBlock::Create(C, "", F));
-  BasicBlock *Merge(BasicBlock::Create(C, "", F));
-  B.SetInsertPoint(Entry);
-  Argument *PointerArg = &*F->arg_begin();
-  StoreInst *EntryStore = B.CreateStore(B.getInt8(16), PointerArg);
-  B.CreateCondBr(B.getTrue(), Left, Right);
-  B.SetInsertPoint(Left);
-  auto *SideStore = B.CreateStore(B.getInt8(16), PointerArg);
-  BranchInst::Create(Merge, Left);
-  BranchInst::Create(Merge, Right);
-  B.SetInsertPoint(Merge);
-  auto *MergeLoad = B.CreateLoad(B.getInt8Ty(), PointerArg);
-  setupAnalyses();
-  MemorySSA &MSSA = *Analyses->MSSA;
-  MemorySSAUpdater Updater(&MSSA);
-
-  // Move the store
-  auto *EntryStoreAccess = MSSA.getMemoryAccess(EntryStore);
-  auto *SideStoreAccess = MSSA.getMemoryAccess(SideStore);
-  // Before, the load will point to a phi of the EntryStore and SideStore.
-  auto *LoadAccess = cast<MemoryUse>(MSSA.getMemoryAccess(MergeLoad));
-  EXPECT_TRUE(isa<MemoryPhi>(LoadAccess->getDefiningAccess()));
-  MemoryPhi *MergePhi = cast<MemoryPhi>(LoadAccess->getDefiningAccess());
-  EXPECT_EQ(MergePhi->getIncomingValue(1), EntryStoreAccess);
-  EXPECT_EQ(MergePhi->getIncomingValue(0), SideStoreAccess);
-  SideStore->moveBefore(*EntryStore->getParent(), ++EntryStore->getIterator());
-  Updater.moveAfter(SideStoreAccess, EntryStoreAccess);
-  // After, it's a phi of the side store.
-  EXPECT_EQ(MergePhi->getIncomingValue(0), SideStoreAccess);
-  EXPECT_EQ(MergePhi->getIncomingValue(1), SideStoreAccess);
-
-  MSSA.verifyMemorySSA();
-}
-
-TEST_F(MemorySSATest, MoveAStoreAllAround) {
-  // We create a diamond where there is a in the entry, a store on one side, and
-  // a load at the end.  After building MemorySSA, we test updating by moving
-  // the store from the side block to the entry block, then to the other side
-  // block, then to before the load.  This does not destroy the old access.
-  F = Function::Create(
-      FunctionType::get(B.getVoidTy(), {B.getInt8PtrTy()}, false),
-      GlobalValue::ExternalLinkage, "F", &M);
-  BasicBlock *Entry(BasicBlock::Create(C, "", F));
-  BasicBlock *Left(BasicBlock::Create(C, "", F));
-  BasicBlock *Right(BasicBlock::Create(C, "", F));
-  BasicBlock *Merge(BasicBlock::Create(C, "", F));
-  B.SetInsertPoint(Entry);
-  Argument *PointerArg = &*F->arg_begin();
-  StoreInst *EntryStore = B.CreateStore(B.getInt8(16), PointerArg);
-  B.CreateCondBr(B.getTrue(), Left, Right);
-  B.SetInsertPoint(Left);
-  auto *SideStore = B.CreateStore(B.getInt8(16), PointerArg);
-  BranchInst::Create(Merge, Left);
-  BranchInst::Create(Merge, Right);
-  B.SetInsertPoint(Merge);
-  auto *MergeLoad = B.CreateLoad(B.getInt8Ty(), PointerArg);
-  setupAnalyses();
-  MemorySSA &MSSA = *Analyses->MSSA;
-  MemorySSAUpdater Updater(&MSSA);
-
-  // Move the store
-  auto *EntryStoreAccess = MSSA.getMemoryAccess(EntryStore);
-  auto *SideStoreAccess = MSSA.getMemoryAccess(SideStore);
-  // Before, the load will point to a phi of the EntryStore and SideStore.
-  auto *LoadAccess = cast<MemoryUse>(MSSA.getMemoryAccess(MergeLoad));
-  EXPECT_TRUE(isa<MemoryPhi>(LoadAccess->getDefiningAccess()));
-  MemoryPhi *MergePhi = cast<MemoryPhi>(LoadAccess->getDefiningAccess());
-  EXPECT_EQ(MergePhi->getIncomingValue(1), EntryStoreAccess);
-  EXPECT_EQ(MergePhi->getIncomingValue(0), SideStoreAccess);
-  // Move the store before the entry store
-  SideStore->moveBefore(*EntryStore->getParent(), EntryStore->getIterator());
-  Updater.moveBefore(SideStoreAccess, EntryStoreAccess);
-  // After, it's a phi of the entry store.
-  EXPECT_EQ(MergePhi->getIncomingValue(0), EntryStoreAccess);
-  EXPECT_EQ(MergePhi->getIncomingValue(1), EntryStoreAccess);
-  MSSA.verifyMemorySSA();
-  // Now move the store to the right branch
-  SideStore->moveBefore(*Right, Right->begin());
-  Updater.moveToPlace(SideStoreAccess, Right, MemorySSA::Beginning);
-  MSSA.verifyMemorySSA();
-  EXPECT_EQ(MergePhi->getIncomingValue(0), EntryStoreAccess);
-  EXPECT_EQ(MergePhi->getIncomingValue(1), SideStoreAccess);
-  // Now move it before the load
-  SideStore->moveBefore(MergeLoad);
-  Updater.moveBefore(SideStoreAccess, LoadAccess);
-  EXPECT_EQ(MergePhi->getIncomingValue(0), EntryStoreAccess);
-  EXPECT_EQ(MergePhi->getIncomingValue(1), EntryStoreAccess);
-  MSSA.verifyMemorySSA();
-}
-
-TEST_F(MemorySSATest, RemoveAPhi) {
-  // We create a diamond where there is a store on one side, and then a load
-  // after the merge point.  This enables us to test a bunch of different
-  // removal cases.
-  F = Function::Create(
-      FunctionType::get(B.getVoidTy(), {B.getInt8PtrTy()}, false),
-      GlobalValue::ExternalLinkage, "F", &M);
-  BasicBlock *Entry(BasicBlock::Create(C, "", F));
-  BasicBlock *Left(BasicBlock::Create(C, "", F));
-  BasicBlock *Right(BasicBlock::Create(C, "", F));
-  BasicBlock *Merge(BasicBlock::Create(C, "", F));
-  B.SetInsertPoint(Entry);
-  B.CreateCondBr(B.getTrue(), Left, Right);
-  B.SetInsertPoint(Left);
-  Argument *PointerArg = &*F->arg_begin();
-  StoreInst *StoreInst = B.CreateStore(B.getInt8(16), PointerArg);
-  BranchInst::Create(Merge, Left);
-  BranchInst::Create(Merge, Right);
-  B.SetInsertPoint(Merge);
-  LoadInst *LoadInst = B.CreateLoad(B.getInt8Ty(), PointerArg);
-
-  setupAnalyses();
-  MemorySSA &MSSA = *Analyses->MSSA;
-  MemorySSAUpdater Updater(&MSSA);
-
-  // Before, the load will be a use of a phi<store, liveonentry>.
-  MemoryUse *LoadAccess = cast<MemoryUse>(MSSA.getMemoryAccess(LoadInst));
-  MemoryDef *StoreAccess = cast<MemoryDef>(MSSA.getMemoryAccess(StoreInst));
-  MemoryAccess *DefiningAccess = LoadAccess->getDefiningAccess();
-  EXPECT_TRUE(isa<MemoryPhi>(DefiningAccess));
-  // Kill the store
-  Updater.removeMemoryAccess(StoreAccess);
-  MemoryPhi *MP = cast<MemoryPhi>(DefiningAccess);
-  // Verify the phi ended up as liveonentry, liveonentry
-  for (auto &Op : MP->incoming_values())
-    EXPECT_TRUE(MSSA.isLiveOnEntryDef(cast<MemoryAccess>(Op.get())));
-  // Replace the phi uses with the live on entry def
-  MP->replaceAllUsesWith(MSSA.getLiveOnEntryDef());
-  // Verify the load is now defined by liveOnEntryDef
-  EXPECT_TRUE(MSSA.isLiveOnEntryDef(LoadAccess->getDefiningAccess()));
-  // Remove the PHI
-  Updater.removeMemoryAccess(MP);
-  MSSA.verifyMemorySSA();
-}
-
-TEST_F(MemorySSATest, RemoveMemoryAccess) {
-  // We create a diamond where there is a store on one side, and then a load
-  // after the merge point.  This enables us to test a bunch of different
-  // removal cases.
-  F = Function::Create(
-      FunctionType::get(B.getVoidTy(), {B.getInt8PtrTy()}, false),
-      GlobalValue::ExternalLinkage, "F", &M);
-  BasicBlock *Entry(BasicBlock::Create(C, "", F));
-  BasicBlock *Left(BasicBlock::Create(C, "", F));
-  BasicBlock *Right(BasicBlock::Create(C, "", F));
-  BasicBlock *Merge(BasicBlock::Create(C, "", F));
-  B.SetInsertPoint(Entry);
-  B.CreateCondBr(B.getTrue(), Left, Right);
-  B.SetInsertPoint(Left);
-  Argument *PointerArg = &*F->arg_begin();
-  StoreInst *StoreInst = B.CreateStore(B.getInt8(16), PointerArg);
-  BranchInst::Create(Merge, Left);
-  BranchInst::Create(Merge, Right);
-  B.SetInsertPoint(Merge);
-  LoadInst *LoadInst = B.CreateLoad(B.getInt8Ty(), PointerArg);
-
-  setupAnalyses();
-  MemorySSA &MSSA = *Analyses->MSSA;
-  MemorySSAWalker *Walker = Analyses->Walker;
-  MemorySSAUpdater Updater(&MSSA);
-
-  // Before, the load will be a use of a phi<store, liveonentry>. It should be
-  // the same after.
-  MemoryUse *LoadAccess = cast<MemoryUse>(MSSA.getMemoryAccess(LoadInst));
-  MemoryDef *StoreAccess = cast<MemoryDef>(MSSA.getMemoryAccess(StoreInst));
-  MemoryAccess *DefiningAccess = LoadAccess->getDefiningAccess();
-  EXPECT_TRUE(isa<MemoryPhi>(DefiningAccess));
-  // The load is currently clobbered by one of the phi arguments, so the walker
-  // should determine the clobbering access as the phi.
-  EXPECT_EQ(DefiningAccess, Walker->getClobberingMemoryAccess(LoadInst));
-  Updater.removeMemoryAccess(StoreAccess);
-  MSSA.verifyMemorySSA();
-  // After the removeaccess, let's see if we got the right accesses
-  // The load should still point to the phi ...
-  EXPECT_EQ(DefiningAccess, LoadAccess->getDefiningAccess());
-  // but we should now get live on entry for the clobbering definition of the
-  // load, since it will walk past the phi node since every argument is the
-  // same.
-  // XXX: This currently requires either removing the phi or resetting optimized
-  // on the load
-
-  EXPECT_FALSE(
-      MSSA.isLiveOnEntryDef(Walker->getClobberingMemoryAccess(LoadInst)));
-  // If we reset optimized, we get live on entry.
-  LoadAccess->resetOptimized();
-  EXPECT_TRUE(
-      MSSA.isLiveOnEntryDef(Walker->getClobberingMemoryAccess(LoadInst)));
-  // The phi should now be a two entry phi with two live on entry defs.
-  for (const auto &Op : DefiningAccess->operands()) {
-    MemoryAccess *Operand = cast<MemoryAccess>(&*Op);
-    EXPECT_TRUE(MSSA.isLiveOnEntryDef(Operand));
-  }
-
-  // Now we try to remove the single valued phi
-  Updater.removeMemoryAccess(DefiningAccess);
-  MSSA.verifyMemorySSA();
-  // Now the load should be a load of live on entry.
-  EXPECT_TRUE(MSSA.isLiveOnEntryDef(LoadAccess->getDefiningAccess()));
-}
-
-// We had a bug with caching where the walker would report MemoryDef#3's clobber
-// (below) was MemoryDef#1.
-//
-// define void @F(i8*) {
-//   %A = alloca i8, i8 1
-// ; 1 = MemoryDef(liveOnEntry)
-//   store i8 0, i8* %A
-// ; 2 = MemoryDef(1)
-//   store i8 1, i8* %A
-// ; 3 = MemoryDef(2)
-//   store i8 2, i8* %A
-// }
-TEST_F(MemorySSATest, TestTripleStore) {
-  F = Function::Create(FunctionType::get(B.getVoidTy(), {}, false),
-                       GlobalValue::ExternalLinkage, "F", &M);
-  B.SetInsertPoint(BasicBlock::Create(C, "", F));
-  Type *Int8 = Type::getInt8Ty(C);
-  Value *Alloca = B.CreateAlloca(Int8, ConstantInt::get(Int8, 1), "A");
-  StoreInst *S1 = B.CreateStore(ConstantInt::get(Int8, 0), Alloca);
-  StoreInst *S2 = B.CreateStore(ConstantInt::get(Int8, 1), Alloca);
-  StoreInst *S3 = B.CreateStore(ConstantInt::get(Int8, 2), Alloca);
-
-  setupAnalyses();
-  MemorySSA &MSSA = *Analyses->MSSA;
-  MemorySSAWalker *Walker = Analyses->Walker;
-
-  unsigned I = 0;
-  for (StoreInst *V : {S1, S2, S3}) {
-    // Everything should be clobbered by its defining access
-    MemoryAccess *DefiningAccess = MSSA.getMemoryAccess(V)->getDefiningAccess();
-    MemoryAccess *WalkerClobber = Walker->getClobberingMemoryAccess(V);
-    EXPECT_EQ(DefiningAccess, WalkerClobber)
-        << "Store " << I << " doesn't have the correct clobbering access";
-    // EXPECT_EQ expands such that if we increment I above, it won't get
-    // incremented except when we try to print the error message.
-    ++I;
-  }
-}
-
-// ...And fixing the above bug made it obvious that, when walking, MemorySSA's
-// walker was caching the initial node it walked. This was fine (albeit
-// mostly redundant) unless the initial node being walked is a clobber for the
-// query. In that case, we'd cache that the node clobbered itself.
-TEST_F(MemorySSATest, TestStoreAndLoad) {
-  F = Function::Create(FunctionType::get(B.getVoidTy(), {}, false),
-                       GlobalValue::ExternalLinkage, "F", &M);
-  B.SetInsertPoint(BasicBlock::Create(C, "", F));
-  Type *Int8 = Type::getInt8Ty(C);
-  Value *Alloca = B.CreateAlloca(Int8, ConstantInt::get(Int8, 1), "A");
-  Instruction *SI = B.CreateStore(ConstantInt::get(Int8, 0), Alloca);
-  Instruction *LI = B.CreateLoad(Int8, Alloca);
-
-  setupAnalyses();
-  MemorySSA &MSSA = *Analyses->MSSA;
-  MemorySSAWalker *Walker = Analyses->Walker;
-
-  MemoryAccess *LoadClobber = Walker->getClobberingMemoryAccess(LI);
-  EXPECT_EQ(LoadClobber, MSSA.getMemoryAccess(SI));
-  EXPECT_TRUE(MSSA.isLiveOnEntryDef(Walker->getClobberingMemoryAccess(SI)));
-}
-
-// Another bug (related to the above two fixes): It was noted that, given the
-// following code:
-// ; 1 = MemoryDef(liveOnEntry)
-// store i8 0, i8* %1
-//
-// ...A query to getClobberingMemoryAccess(MemoryAccess*, MemoryLocation) would
-// hand back the store (correctly). A later call to
-// getClobberingMemoryAccess(const Instruction*) would also hand back the store
-// (incorrectly; it should return liveOnEntry).
-//
-// This test checks that repeated calls to either function returns what they're
-// meant to.
-TEST_F(MemorySSATest, TestStoreDoubleQuery) {
-  F = Function::Create(FunctionType::get(B.getVoidTy(), {}, false),
-                       GlobalValue::ExternalLinkage, "F", &M);
-  B.SetInsertPoint(BasicBlock::Create(C, "", F));
-  Type *Int8 = Type::getInt8Ty(C);
-  Value *Alloca = B.CreateAlloca(Int8, ConstantInt::get(Int8, 1), "A");
-  StoreInst *SI = B.CreateStore(ConstantInt::get(Int8, 0), Alloca);
-
-  setupAnalyses();
-  MemorySSA &MSSA = *Analyses->MSSA;
-  MemorySSAWalker *Walker = Analyses->Walker;
-
-  MemoryAccess *StoreAccess = MSSA.getMemoryAccess(SI);
-  MemoryLocation StoreLoc = MemoryLocation::get(SI);
-  MemoryAccess *Clobber =
-      Walker->getClobberingMemoryAccess(StoreAccess, StoreLoc);
-  MemoryAccess *LiveOnEntry = Walker->getClobberingMemoryAccess(SI);
-
-  EXPECT_EQ(Clobber, StoreAccess);
-  EXPECT_TRUE(MSSA.isLiveOnEntryDef(LiveOnEntry));
-
-  // Try again (with entries in the cache already) for good measure...
-  Clobber = Walker->getClobberingMemoryAccess(StoreAccess, StoreLoc);
-  LiveOnEntry = Walker->getClobberingMemoryAccess(SI);
-  EXPECT_EQ(Clobber, StoreAccess);
-  EXPECT_TRUE(MSSA.isLiveOnEntryDef(LiveOnEntry));
-}
-
-// Bug: During phi optimization, the walker wouldn't cache to the proper result
-// in the farthest-walked BB.
-//
-// Specifically, it would assume that whatever we walked to was a clobber.
-// "Whatever we walked to" isn't a clobber if we hit a cache entry.
-//
-// ...So, we need a test case that looks like:
-//    A
-//   / \
-//  B   |
-//   \ /
-//    C
-//
-// Where, when we try to optimize a thing in 'C', a blocker is found in 'B'.
-// The walk must determine that the blocker exists by using cache entries *while
-// walking* 'B'.
-TEST_F(MemorySSATest, PartialWalkerCacheWithPhis) {
-  F = Function::Create(FunctionType::get(B.getVoidTy(), {}, false),
-                       GlobalValue::ExternalLinkage, "F", &M);
-  B.SetInsertPoint(BasicBlock::Create(C, "A", F));
-  Type *Int8 = Type::getInt8Ty(C);
-  Constant *One = ConstantInt::get(Int8, 1);
-  Constant *Zero = ConstantInt::get(Int8, 0);
-  Value *AllocA = B.CreateAlloca(Int8, One, "a");
-  Value *AllocB = B.CreateAlloca(Int8, One, "b");
-  BasicBlock *IfThen = BasicBlock::Create(C, "B", F);
-  BasicBlock *IfEnd = BasicBlock::Create(C, "C", F);
-
-  B.CreateCondBr(UndefValue::get(Type::getInt1Ty(C)), IfThen, IfEnd);
-
-  B.SetInsertPoint(IfThen);
-  Instruction *FirstStore = B.CreateStore(Zero, AllocA);
-  B.CreateStore(Zero, AllocB);
-  Instruction *ALoad0 = B.CreateLoad(Int8, AllocA, "");
-  Instruction *BStore = B.CreateStore(Zero, AllocB);
-  // Due to use optimization/etc. we make a store to A, which is removed after
-  // we build MSSA. This helps keep the test case simple-ish.
-  Instruction *KillStore = B.CreateStore(Zero, AllocA);
-  Instruction *ALoad = B.CreateLoad(Int8, AllocA, "");
-  B.CreateBr(IfEnd);
-
-  B.SetInsertPoint(IfEnd);
-  Instruction *BelowPhi = B.CreateStore(Zero, AllocA);
-
-  setupAnalyses();
-  MemorySSA &MSSA = *Analyses->MSSA;
-  MemorySSAWalker *Walker = Analyses->Walker;
-  MemorySSAUpdater Updater(&MSSA);
-
-  // Kill `KillStore`; it exists solely so that the load after it won't be
-  // optimized to FirstStore.
-  Updater.removeMemoryAccess(MSSA.getMemoryAccess(KillStore));
-  KillStore->eraseFromParent();
-  auto *ALoadMA = cast<MemoryUse>(MSSA.getMemoryAccess(ALoad));
-  EXPECT_EQ(ALoadMA->getDefiningAccess(), MSSA.getMemoryAccess(BStore));
-
-  // Populate the cache for the store to AllocB directly after FirstStore. It
-  // should point to something in block B (so something in D can't be optimized
-  // to it).
-  MemoryAccess *Load0Clobber = Walker->getClobberingMemoryAccess(ALoad0);
-  EXPECT_EQ(MSSA.getMemoryAccess(FirstStore), Load0Clobber);
-
-  // If the bug exists, this will introduce a bad cache entry for %a on BStore.
-  // It will point to the store to %b after FirstStore. This only happens during
-  // phi optimization.
-  MemoryAccess *BottomClobber = Walker->getClobberingMemoryAccess(BelowPhi);
-  MemoryAccess *Phi = MSSA.getMemoryAccess(IfEnd);
-  EXPECT_EQ(BottomClobber, Phi);
-
-  // This query will first check the cache for {%a, BStore}. It should point to
-  // FirstStore, not to the store after FirstStore.
-  MemoryAccess *UseClobber = Walker->getClobberingMemoryAccess(ALoad);
-  EXPECT_EQ(UseClobber, MSSA.getMemoryAccess(FirstStore));
-}
-
-// Test that our walker properly handles loads with the invariant group
-// attribute. It's a bit hacky, since we add the invariant attribute *after*
-// building MSSA. Otherwise, the use optimizer will optimize it for us, which
-// isn't what we want.
-// FIXME: It may be easier/cleaner to just add an 'optimize uses?' flag to MSSA.
-TEST_F(MemorySSATest, WalkerInvariantLoadOpt) {
-  F = Function::Create(FunctionType::get(B.getVoidTy(), {}, false),
-                       GlobalValue::ExternalLinkage, "F", &M);
-  B.SetInsertPoint(BasicBlock::Create(C, "", F));
-  Type *Int8 = Type::getInt8Ty(C);
-  Constant *One = ConstantInt::get(Int8, 1);
-  Value *AllocA = B.CreateAlloca(Int8, One, "");
-
-  Instruction *Store = B.CreateStore(One, AllocA);
-  Instruction *Load = B.CreateLoad(Int8, AllocA);
-
-  setupAnalyses();
-  MemorySSA &MSSA = *Analyses->MSSA;
-  MemorySSAWalker *Walker = Analyses->Walker;
-
-  auto *LoadMA = cast<MemoryUse>(MSSA.getMemoryAccess(Load));
-  auto *StoreMA = cast<MemoryDef>(MSSA.getMemoryAccess(Store));
-  EXPECT_EQ(LoadMA->getDefiningAccess(), StoreMA);
-
-  // ...At the time of writing, no cache should exist for LoadMA. Be a bit
-  // flexible to future changes.
-  Walker->invalidateInfo(LoadMA);
-  Load->setMetadata(LLVMContext::MD_invariant_load, MDNode::get(C, {}));
-
-  MemoryAccess *LoadClobber = Walker->getClobberingMemoryAccess(LoadMA);
-  EXPECT_EQ(LoadClobber, MSSA.getLiveOnEntryDef());
-}
-
-// Test loads get reoptimized properly by the walker.
-TEST_F(MemorySSATest, WalkerReopt) {
-  F = Function::Create(FunctionType::get(B.getVoidTy(), {}, false),
-                       GlobalValue::ExternalLinkage, "F", &M);
-  B.SetInsertPoint(BasicBlock::Create(C, "", F));
-  Type *Int8 = Type::getInt8Ty(C);
-  Value *AllocaA = B.CreateAlloca(Int8, ConstantInt::get(Int8, 1), "A");
-  Instruction *SIA = B.CreateStore(ConstantInt::get(Int8, 0), AllocaA);
-  Value *AllocaB = B.CreateAlloca(Int8, ConstantInt::get(Int8, 1), "B");
-  Instruction *SIB = B.CreateStore(ConstantInt::get(Int8, 0), AllocaB);
-  Instruction *LIA = B.CreateLoad(Int8, AllocaA);
-
-  setupAnalyses();
-  MemorySSA &MSSA = *Analyses->MSSA;
-  MemorySSAWalker *Walker = Analyses->Walker;
-  MemorySSAUpdater Updater(&MSSA);
-
-  MemoryAccess *LoadClobber = Walker->getClobberingMemoryAccess(LIA);
-  MemoryUse *LoadAccess = cast<MemoryUse>(MSSA.getMemoryAccess(LIA));
-  EXPECT_EQ(LoadClobber, MSSA.getMemoryAccess(SIA));
-  EXPECT_TRUE(MSSA.isLiveOnEntryDef(Walker->getClobberingMemoryAccess(SIA)));
-  Updater.removeMemoryAccess(LoadAccess);
-
-  // Create the load memory access pointing to an unoptimized place.
-  MemoryUse *NewLoadAccess = cast<MemoryUse>(Updater.createMemoryAccessInBB(
-      LIA, MSSA.getMemoryAccess(SIB), LIA->getParent(), MemorySSA::End));
-  // This should it cause it to be optimized
-  EXPECT_EQ(Walker->getClobberingMemoryAccess(NewLoadAccess), LoadClobber);
-  EXPECT_EQ(NewLoadAccess->getDefiningAccess(), LoadClobber);
-}
-
-// Test out MemorySSAUpdater::moveBefore
-TEST_F(MemorySSATest, MoveAboveMemoryDef) {
-  F = Function::Create(FunctionType::get(B.getVoidTy(), {}, false),
-                       GlobalValue::ExternalLinkage, "F", &M);
-  B.SetInsertPoint(BasicBlock::Create(C, "", F));
-
-  Type *Int8 = Type::getInt8Ty(C);
-  Value *A = B.CreateAlloca(Int8, ConstantInt::get(Int8, 1), "A");
-  Value *B_ = B.CreateAlloca(Int8, ConstantInt::get(Int8, 1), "B");
-  Value *C = B.CreateAlloca(Int8, ConstantInt::get(Int8, 1), "C");
-
-  StoreInst *StoreA0 = B.CreateStore(ConstantInt::get(Int8, 0), A);
-  StoreInst *StoreB = B.CreateStore(ConstantInt::get(Int8, 0), B_);
-  LoadInst *LoadB = B.CreateLoad(Int8, B_);
-  StoreInst *StoreA1 = B.CreateStore(ConstantInt::get(Int8, 4), A);
-  StoreInst *StoreC = B.CreateStore(ConstantInt::get(Int8, 4), C);
-  StoreInst *StoreA2 = B.CreateStore(ConstantInt::get(Int8, 4), A);
-  LoadInst *LoadC = B.CreateLoad(Int8, C);
-
-  setupAnalyses();
-  MemorySSA &MSSA = *Analyses->MSSA;
-  MemorySSAWalker &Walker = *Analyses->Walker;
-
-  MemorySSAUpdater Updater(&MSSA);
-  StoreC->moveBefore(StoreB);
-  Updater.moveBefore(cast<MemoryDef>(MSSA.getMemoryAccess(StoreC)),
-                     cast<MemoryDef>(MSSA.getMemoryAccess(StoreB)));
-
-  MSSA.verifyMemorySSA();
-
-  EXPECT_EQ(MSSA.getMemoryAccess(StoreB)->getDefiningAccess(),
-            MSSA.getMemoryAccess(StoreC));
-  EXPECT_EQ(MSSA.getMemoryAccess(StoreC)->getDefiningAccess(),
-            MSSA.getMemoryAccess(StoreA0));
-  EXPECT_EQ(MSSA.getMemoryAccess(StoreA2)->getDefiningAccess(),
-            MSSA.getMemoryAccess(StoreA1));
-  EXPECT_EQ(Walker.getClobberingMemoryAccess(LoadB),
-            MSSA.getMemoryAccess(StoreB));
-  EXPECT_EQ(Walker.getClobberingMemoryAccess(LoadC),
-            MSSA.getMemoryAccess(StoreC));
-
-  // exercise block numbering
-  EXPECT_TRUE(MSSA.locallyDominates(MSSA.getMemoryAccess(StoreC),
-                                    MSSA.getMemoryAccess(StoreB)));
-  EXPECT_TRUE(MSSA.locallyDominates(MSSA.getMemoryAccess(StoreA1),
-                                    MSSA.getMemoryAccess(StoreA2)));
-}
-
-TEST_F(MemorySSATest, Irreducible) {
-  // Create the equivalent of
-  // x = something
-  // if (...)
-  //    goto second_loop_entry
-  // while (...) {
-  // second_loop_entry:
-  // }
-  // use(x)
-
-  SmallVector<PHINode *, 8> Inserted;
-  IRBuilder<> B(C);
-  F = Function::Create(
-      FunctionType::get(B.getVoidTy(), {B.getInt8PtrTy()}, false),
-      GlobalValue::ExternalLinkage, "F", &M);
-
-  // Make blocks
-  BasicBlock *IfBB = BasicBlock::Create(C, "if", F);
-  BasicBlock *LoopStartBB = BasicBlock::Create(C, "loopstart", F);
-  BasicBlock *LoopMainBB = BasicBlock::Create(C, "loopmain", F);
-  BasicBlock *AfterLoopBB = BasicBlock::Create(C, "afterloop", F);
-  B.SetInsertPoint(IfBB);
-  B.CreateCondBr(B.getTrue(), LoopMainBB, LoopStartBB);
-  B.SetInsertPoint(LoopStartBB);
-  B.CreateBr(LoopMainBB);
-  B.SetInsertPoint(LoopMainBB);
-  B.CreateCondBr(B.getTrue(), LoopStartBB, AfterLoopBB);
-  B.SetInsertPoint(AfterLoopBB);
-  Argument *FirstArg = &*F->arg_begin();
-  setupAnalyses();
-  MemorySSA &MSSA = *Analyses->MSSA;
-  MemorySSAUpdater Updater(&MSSA);
-  // Create the load memory acccess
-  LoadInst *LoadInst = B.CreateLoad(B.getInt8Ty(), FirstArg);
-  MemoryUse *LoadAccess = cast<MemoryUse>(Updater.createMemoryAccessInBB(
-      LoadInst, nullptr, AfterLoopBB, MemorySSA::Beginning));
-  Updater.insertUse(LoadAccess);
-  MSSA.verifyMemorySSA();
-}
-
-TEST_F(MemorySSATest, MoveToBeforeLiveOnEntryInvalidatesCache) {
-  // Create:
-  //   %1 = alloca i8
-  //   ; 1 = MemoryDef(liveOnEntry)
-  //   store i8 0, i8* %1
-  //   ; 2 = MemoryDef(1)
-  //   store i8 0, i8* %1
-  //
-  // ...And be sure that MSSA's caching doesn't give us `1` for the clobber of
-  // `2` after `1` is removed.
-  IRBuilder<> B(C);
-  F = Function::Create(
-      FunctionType::get(B.getVoidTy(), {B.getInt8PtrTy()}, false),
-      GlobalValue::ExternalLinkage, "F", &M);
-
-  BasicBlock *Entry = BasicBlock::Create(C, "if", F);
-  B.SetInsertPoint(Entry);
-
-  Value *A = B.CreateAlloca(B.getInt8Ty());
-  StoreInst *StoreA = B.CreateStore(B.getInt8(0), A);
-  StoreInst *StoreB = B.CreateStore(B.getInt8(0), A);
-
-  setupAnalyses();
-
-  MemorySSA &MSSA = *Analyses->MSSA;
-
-  auto *DefA = cast<MemoryDef>(MSSA.getMemoryAccess(StoreA));
-  auto *DefB = cast<MemoryDef>(MSSA.getMemoryAccess(StoreB));
-
-  MemoryAccess *BClobber = MSSA.getWalker()->getClobberingMemoryAccess(DefB);
-  ASSERT_EQ(DefA, BClobber);
-
-  MemorySSAUpdater(&MSSA).removeMemoryAccess(DefA);
-  StoreA->eraseFromParent();
-
-  EXPECT_EQ(DefB->getDefiningAccess(), MSSA.getLiveOnEntryDef());
-
-  EXPECT_EQ(MSSA.getWalker()->getClobberingMemoryAccess(DefB),
-            MSSA.getLiveOnEntryDef())
-      << "(DefA = " << DefA << ")";
-}
-
-TEST_F(MemorySSATest, RemovingDefInvalidatesCache) {
-  // Create:
-  //   %x = alloca i8
-  //   %y = alloca i8
-  //   ; 1 = MemoryDef(liveOnEntry)
-  //   store i8 0, i8* %x
-  //   ; 2 = MemoryDef(1)
-  //   store i8 0, i8* %y
-  //   ; 3 = MemoryDef(2)
-  //   store i8 0, i8* %x
-  //
-  // And be sure that MSSA's caching handles the removal of def `1`
-  // appropriately.
-  IRBuilder<> B(C);
-  F = Function::Create(
-      FunctionType::get(B.getVoidTy(), {B.getInt8PtrTy()}, false),
-      GlobalValue::ExternalLinkage, "F", &M);
-
-  BasicBlock *Entry = BasicBlock::Create(C, "if", F);
-  B.SetInsertPoint(Entry);
-
-  Value *X = B.CreateAlloca(B.getInt8Ty());
-  Value *Y = B.CreateAlloca(B.getInt8Ty());
-  StoreInst *StoreX1 = B.CreateStore(B.getInt8(0), X);
-  StoreInst *StoreY = B.CreateStore(B.getInt8(0), Y);
-  StoreInst *StoreX2 = B.CreateStore(B.getInt8(0), X);
-
-  setupAnalyses();
-
-  MemorySSA &MSSA = *Analyses->MSSA;
-
-  auto *DefX1 = cast<MemoryDef>(MSSA.getMemoryAccess(StoreX1));
-  auto *DefY = cast<MemoryDef>(MSSA.getMemoryAccess(StoreY));
-  auto *DefX2 = cast<MemoryDef>(MSSA.getMemoryAccess(StoreX2));
-
-  EXPECT_EQ(DefX2->getDefiningAccess(), DefY);
-  MemoryAccess *X2Clobber = MSSA.getWalker()->getClobberingMemoryAccess(DefX2);
-  ASSERT_EQ(DefX1, X2Clobber);
-
-  MemorySSAUpdater(&MSSA).removeMemoryAccess(DefX1);
-  StoreX1->eraseFromParent();
-
-  EXPECT_EQ(DefX2->getDefiningAccess(), DefY);
-  EXPECT_EQ(MSSA.getWalker()->getClobberingMemoryAccess(DefX2),
-            MSSA.getLiveOnEntryDef())
-      << "(DefX1 = " << DefX1 << ")";
-}
-
-// Test Must alias for optimized uses
-TEST_F(MemorySSATest, TestLoadMustAlias) {
-  F = Function::Create(FunctionType::get(B.getVoidTy(), {}, false),
-                       GlobalValue::ExternalLinkage, "F", &M);
-  B.SetInsertPoint(BasicBlock::Create(C, "", F));
-  Type *Int8 = Type::getInt8Ty(C);
-  Value *AllocaA = B.CreateAlloca(Int8, ConstantInt::get(Int8, 1), "A");
-  Value *AllocaB = B.CreateAlloca(Int8, ConstantInt::get(Int8, 1), "B");
-
-  B.CreateStore(ConstantInt::get(Int8, 1), AllocaB);
-  // Check load from LOE
-  LoadInst *LA1 = B.CreateLoad(Int8, AllocaA, "");
-  // Check load alias cached for second load
-  LoadInst *LA2 = B.CreateLoad(Int8, AllocaA, "");
-
-  B.CreateStore(ConstantInt::get(Int8, 1), AllocaA);
-  // Check load from store/def
-  LoadInst *LA3 = B.CreateLoad(Int8, AllocaA, "");
-  // Check load alias cached for second load
-  LoadInst *LA4 = B.CreateLoad(Int8, AllocaA, "");
-
-  setupAnalyses();
-  MemorySSA &MSSA = *Analyses->MSSA;
-
-  unsigned I = 0;
-  for (LoadInst *V : {LA1, LA2}) {
-    MemoryUse *MemUse = dyn_cast_or_null<MemoryUse>(MSSA.getMemoryAccess(V));
-    EXPECT_EQ(MemUse->getOptimizedAccessType(), None)
-        << "Load " << I << " doesn't have the correct alias information";
-    // EXPECT_EQ expands such that if we increment I above, it won't get
-    // incremented except when we try to print the error message.
-    ++I;
-  }
-  for (LoadInst *V : {LA3, LA4}) {
-    MemoryUse *MemUse = dyn_cast_or_null<MemoryUse>(MSSA.getMemoryAccess(V));
-    EXPECT_EQ(MemUse->getOptimizedAccessType().getValue(),
-              AliasResult::MustAlias)
-        << "Load " << I << " doesn't have the correct alias information";
-    // EXPECT_EQ expands such that if we increment I above, it won't get
-    // incremented except when we try to print the error message.
-    ++I;
-  }
-}
-
-// Test Must alias for optimized defs.
-TEST_F(MemorySSATest, TestStoreMustAlias) {
-  F = Function::Create(FunctionType::get(B.getVoidTy(), {}, false),
-                       GlobalValue::ExternalLinkage, "F", &M);
-  B.SetInsertPoint(BasicBlock::Create(C, "", F));
-  Type *Int8 = Type::getInt8Ty(C);
-  Value *AllocaA = B.CreateAlloca(Int8, ConstantInt::get(Int8, 1), "A");
-  Value *AllocaB = B.CreateAlloca(Int8, ConstantInt::get(Int8, 1), "B");
-  StoreInst *SA1 = B.CreateStore(ConstantInt::get(Int8, 1), AllocaA);
-  StoreInst *SB1 = B.CreateStore(ConstantInt::get(Int8, 1), AllocaB);
-  StoreInst *SA2 = B.CreateStore(ConstantInt::get(Int8, 2), AllocaA);
-  StoreInst *SB2 = B.CreateStore(ConstantInt::get(Int8, 2), AllocaB);
-  StoreInst *SA3 = B.CreateStore(ConstantInt::get(Int8, 3), AllocaA);
-  StoreInst *SB3 = B.CreateStore(ConstantInt::get(Int8, 3), AllocaB);
-
-  setupAnalyses();
-  MemorySSA &MSSA = *Analyses->MSSA;
-  MemorySSAWalker *Walker = Analyses->Walker;
-
-  unsigned I = 0;
-  for (StoreInst *V : {SA1, SB1, SA2, SB2, SA3, SB3}) {
-    MemoryDef *MemDef = dyn_cast_or_null<MemoryDef>(MSSA.getMemoryAccess(V));
-    EXPECT_EQ(MemDef->isOptimized(), false)
-        << "Store " << I << " is optimized from the start?";
-    EXPECT_EQ(MemDef->getOptimizedAccessType(), None)
-        << "Store " << I
-        << " has correct alias information before being optimized?";
-    if (V == SA1)
-      Walker->getClobberingMemoryAccess(V);
-    else {
-      MemoryAccess *Def = MemDef->getDefiningAccess();
-      MemoryAccess *Clob = Walker->getClobberingMemoryAccess(V);
-      EXPECT_NE(Def, Clob) << "Store " << I
-                           << " has Defining Access equal to Clobbering Access";
-    }
-    EXPECT_EQ(MemDef->isOptimized(), true)
-        << "Store " << I << " was not optimized";
-    if (I == 0 || I == 1)
-      EXPECT_EQ(MemDef->getOptimizedAccessType(), None)
-          << "Store " << I << " doesn't have the correct alias information";
-    else
-      EXPECT_EQ(MemDef->getOptimizedAccessType().getValue(),
-                AliasResult::MustAlias)
-          << "Store " << I << " doesn't have the correct alias information";
-    // EXPECT_EQ expands such that if we increment I above, it won't get
-    // incremented except when we try to print the error message.
-    ++I;
-  }
-}
-
-// Test May alias for optimized uses.
-TEST_F(MemorySSATest, TestLoadMayAlias) {
-  F = Function::Create(FunctionType::get(B.getVoidTy(),
-                                         {B.getInt8PtrTy(), B.getInt8PtrTy()},
-                                         false),
-                       GlobalValue::ExternalLinkage, "F", &M);
-  B.SetInsertPoint(BasicBlock::Create(C, "", F));
-  Type *Int8 = Type::getInt8Ty(C);
-  auto *ArgIt = F->arg_begin();
-  Argument *PointerA = &*ArgIt;
-  Argument *PointerB = &*(++ArgIt);
-  B.CreateStore(ConstantInt::get(Int8, 1), PointerB);
-  LoadInst *LA1 = B.CreateLoad(Int8, PointerA, "");
-  B.CreateStore(ConstantInt::get(Int8, 0), PointerA);
-  LoadInst *LB1 = B.CreateLoad(Int8, PointerB, "");
-  B.CreateStore(ConstantInt::get(Int8, 0), PointerA);
-  LoadInst *LA2 = B.CreateLoad(Int8, PointerA, "");
-  B.CreateStore(ConstantInt::get(Int8, 0), PointerB);
-  LoadInst *LB2 = B.CreateLoad(Int8, PointerB, "");
-
-  setupAnalyses();
-  MemorySSA &MSSA = *Analyses->MSSA;
-
-  unsigned I = 0;
-  for (LoadInst *V : {LA1, LB1}) {
-    MemoryUse *MemUse = dyn_cast_or_null<MemoryUse>(MSSA.getMemoryAccess(V));
-    EXPECT_EQ(MemUse->getOptimizedAccessType().getValue(),
-              AliasResult::MayAlias)
-        << "Load " << I << " doesn't have the correct alias information";
-    // EXPECT_EQ expands such that if we increment I above, it won't get
-    // incremented except when we try to print the error message.
-    ++I;
-  }
-  for (LoadInst *V : {LA2, LB2}) {
-    MemoryUse *MemUse = dyn_cast_or_null<MemoryUse>(MSSA.getMemoryAccess(V));
-    EXPECT_EQ(MemUse->getOptimizedAccessType().getValue(),
-              AliasResult::MustAlias)
-        << "Load " << I << " doesn't have the correct alias information";
-    // EXPECT_EQ expands such that if we increment I above, it won't get
-    // incremented except when we try to print the error message.
-    ++I;
-  }
-}
-
-// Test May alias for optimized defs.
-TEST_F(MemorySSATest, TestStoreMayAlias) {
-  F = Function::Create(FunctionType::get(B.getVoidTy(),
-                                         {B.getInt8PtrTy(), B.getInt8PtrTy()},
-                                         false),
-                       GlobalValue::ExternalLinkage, "F", &M);
-  B.SetInsertPoint(BasicBlock::Create(C, "", F));
-  Type *Int8 = Type::getInt8Ty(C);
-  auto *ArgIt = F->arg_begin();
-  Argument *PointerA = &*ArgIt;
-  Argument *PointerB = &*(++ArgIt);
-  Value *AllocaC = B.CreateAlloca(Int8, ConstantInt::get(Int8, 1), "C");
-  // Store into arg1, must alias because it's LOE => must
-  StoreInst *SA1 = B.CreateStore(ConstantInt::get(Int8, 0), PointerA);
-  // Store into arg2, may alias store to arg1 => may
-  StoreInst *SB1 = B.CreateStore(ConstantInt::get(Int8, 1), PointerB);
-  // Store into aloca, no alias with args, so must alias LOE => must
-  StoreInst *SC1 = B.CreateStore(ConstantInt::get(Int8, 2), AllocaC);
-  // Store into arg1, may alias store to arg2 => may
-  StoreInst *SA2 = B.CreateStore(ConstantInt::get(Int8, 3), PointerA);
-  // Store into arg2, may alias store to arg1 => may
-  StoreInst *SB2 = B.CreateStore(ConstantInt::get(Int8, 4), PointerB);
-  // Store into aloca, no alias with args, so must alias SC1 => must
-  StoreInst *SC2 = B.CreateStore(ConstantInt::get(Int8, 5), AllocaC);
-  // Store into arg2, must alias store to arg2 => must
-  StoreInst *SB3 = B.CreateStore(ConstantInt::get(Int8, 6), PointerB);
-  std::initializer_list<StoreInst *> Sts = {SA1, SB1, SC1, SA2, SB2, SC2, SB3};
-
-  setupAnalyses();
-  MemorySSA &MSSA = *Analyses->MSSA;
-  MemorySSAWalker *Walker = Analyses->Walker;
-
-  unsigned I = 0;
-  for (StoreInst *V : Sts) {
-    MemoryDef *MemDef = dyn_cast_or_null<MemoryDef>(MSSA.getMemoryAccess(V));
-    EXPECT_EQ(MemDef->isOptimized(), false)
-        << "Store " << I << " is optimized from the start?";
-    EXPECT_EQ(MemDef->getOptimizedAccessType(), None)
-        << "Store " << I
-        << " has correct alias information before being optimized?";
-    ++I;
-  }
-
-  for (StoreInst *V : Sts)
-    Walker->getClobberingMemoryAccess(V);
-
-  I = 0;
-  for (StoreInst *V : Sts) {
-    MemoryDef *MemDef = dyn_cast_or_null<MemoryDef>(MSSA.getMemoryAccess(V));
-    EXPECT_EQ(MemDef->isOptimized(), true)
-        << "Store " << I << " was not optimized";
-    if (I == 1 || I == 3 || I == 4)
-      EXPECT_EQ(MemDef->getOptimizedAccessType().getValue(),
-                AliasResult::MayAlias)
-          << "Store " << I << " doesn't have the correct alias information";
-    else if (I == 0 || I == 2)
-      EXPECT_EQ(MemDef->getOptimizedAccessType(), None)
-          << "Store " << I << " doesn't have the correct alias information";
-    else
-      EXPECT_EQ(MemDef->getOptimizedAccessType().getValue(),
-                AliasResult::MustAlias)
-          << "Store " << I << " doesn't have the correct alias information";
-    // EXPECT_EQ expands such that if we increment I above, it won't get
-    // incremented except when we try to print the error message.
-    ++I;
-  }
-}
-
-TEST_F(MemorySSATest, LifetimeMarkersAreClobbers) {
-  // Example code:
-  // define void @a(i8* %foo) {
-  //   %bar = getelementptr i8, i8* %foo, i64 1
-  //   %baz = getelementptr i8, i8* %foo, i64 2
-  //   store i8 0, i8* %foo
-  //   store i8 0, i8* %bar
-  //   call void @llvm.lifetime.end.p0i8(i64 3, i8* %foo)
-  //   call void @llvm.lifetime.start.p0i8(i64 3, i8* %foo)
-  //   store i8 0, i8* %foo
-  //   store i8 0, i8* %bar
-  //   call void @llvm.memset.p0i8(i8* %baz, i8 0, i64 1)
-  //   ret void
-  // }
-  //
-  // Patterns like this are possible after inlining; the stores to %foo and %bar
-  // should both be clobbered by the lifetime.start call if they're dominated by
-  // it.
-
-  IRBuilder<> B(C);
-  F = Function::Create(
-      FunctionType::get(B.getVoidTy(), {B.getInt8PtrTy()}, false),
-      GlobalValue::ExternalLinkage, "F", &M);
-
-  // Make blocks
-  BasicBlock *Entry = BasicBlock::Create(C, "entry", F);
-
-  B.SetInsertPoint(Entry);
-  Value *Foo = &*F->arg_begin();
-
-  Value *Bar = B.CreateGEP(B.getInt8Ty(), Foo, B.getInt64(1), "bar");
-  Value *Baz = B.CreateGEP(B.getInt8Ty(), Foo, B.getInt64(2), "baz");
-
-  B.CreateStore(B.getInt8(0), Foo);
-  B.CreateStore(B.getInt8(0), Bar);
-
-  auto GetLifetimeIntrinsic = [&](Intrinsic::ID ID) {
-    return Intrinsic::getDeclaration(&M, ID, {Foo->getType()});
-  };
-
-  B.CreateCall(GetLifetimeIntrinsic(Intrinsic::lifetime_end),
-               {B.getInt64(3), Foo});
-  Instruction *LifetimeStart = B.CreateCall(
-      GetLifetimeIntrinsic(Intrinsic::lifetime_start), {B.getInt64(3), Foo});
-
-  Instruction *FooStore = B.CreateStore(B.getInt8(0), Foo);
-  Instruction *BarStore = B.CreateStore(B.getInt8(0), Bar);
-  Instruction *BazMemSet = B.CreateMemSet(Baz, B.getInt8(0), 1, Align(1));
-
-  setupAnalyses();
-  MemorySSA &MSSA = *Analyses->MSSA;
-
-  MemoryAccess *LifetimeStartAccess = MSSA.getMemoryAccess(LifetimeStart);
-  ASSERT_NE(LifetimeStartAccess, nullptr);
-
-  MemoryAccess *FooAccess = MSSA.getMemoryAccess(FooStore);
-  ASSERT_NE(FooAccess, nullptr);
-
-  MemoryAccess *BarAccess = MSSA.getMemoryAccess(BarStore);
-  ASSERT_NE(BarAccess, nullptr);
-
-  MemoryAccess *BazAccess = MSSA.getMemoryAccess(BazMemSet);
-  ASSERT_NE(BazAccess, nullptr);
-
-  MemoryAccess *FooClobber =
-      MSSA.getWalker()->getClobberingMemoryAccess(FooAccess);
-  EXPECT_EQ(FooClobber, LifetimeStartAccess);
-
-  MemoryAccess *BarClobber =
-      MSSA.getWalker()->getClobberingMemoryAccess(BarAccess);
-  EXPECT_EQ(BarClobber, LifetimeStartAccess);
-
-  MemoryAccess *BazClobber =
-      MSSA.getWalker()->getClobberingMemoryAccess(BazAccess);
-  EXPECT_EQ(BazClobber, LifetimeStartAccess);
-
-  MemoryAccess *LifetimeStartClobber =
-      MSSA.getWalker()->getClobberingMemoryAccess(
-          LifetimeStartAccess, MemoryLocation::getAfter(Foo));
-  EXPECT_EQ(LifetimeStartClobber, LifetimeStartAccess);
-}
-
-TEST_F(MemorySSATest, DefOptimizationsAreInvalidatedOnMoving) {
-  IRBuilder<> B(C);
-  F = Function::Create(FunctionType::get(B.getVoidTy(), {B.getInt1Ty()}, false),
-                       GlobalValue::ExternalLinkage, "F", &M);
-
-  // Make a CFG like
-  //     entry
-  //      / \
-  //     a   b
-  //      \ /
-  //       c
-  //
-  // Put a def in A and a def in B, move the def from A -> B, observe as the
-  // optimization is invalidated.
-  BasicBlock *Entry = BasicBlock::Create(C, "entry", F);
-  BasicBlock *BlockA = BasicBlock::Create(C, "a", F);
-  BasicBlock *BlockB = BasicBlock::Create(C, "b", F);
-  BasicBlock *BlockC = BasicBlock::Create(C, "c", F);
-
-  B.SetInsertPoint(Entry);
-  Type *Int8 = Type::getInt8Ty(C);
-  Value *Alloca = B.CreateAlloca(Int8, ConstantInt::get(Int8, 1), "alloc");
-  StoreInst *StoreEntry = B.CreateStore(B.getInt8(0), Alloca);
-  B.CreateCondBr(B.getTrue(), BlockA, BlockB);
-
-  B.SetInsertPoint(BlockA);
-  StoreInst *StoreA = B.CreateStore(B.getInt8(1), Alloca);
-  B.CreateBr(BlockC);
-
-  B.SetInsertPoint(BlockB);
-  StoreInst *StoreB = B.CreateStore(B.getInt8(2), Alloca);
-  B.CreateBr(BlockC);
-
-  B.SetInsertPoint(BlockC);
-  B.CreateUnreachable();
-
-  setupAnalyses();
-  MemorySSA &MSSA = *Analyses->MSSA;
-
-  auto *AccessEntry = cast<MemoryDef>(MSSA.getMemoryAccess(StoreEntry));
-  auto *StoreAEntry = cast<MemoryDef>(MSSA.getMemoryAccess(StoreA));
-  auto *StoreBEntry = cast<MemoryDef>(MSSA.getMemoryAccess(StoreB));
-
-  ASSERT_EQ(MSSA.getWalker()->getClobberingMemoryAccess(StoreAEntry),
-            AccessEntry);
-  ASSERT_TRUE(StoreAEntry->isOptimized());
-
-  ASSERT_EQ(MSSA.getWalker()->getClobberingMemoryAccess(StoreBEntry),
-            AccessEntry);
-  ASSERT_TRUE(StoreBEntry->isOptimized());
-
-  // Note that if we did InsertionPlace::Beginning, we don't go out of our way
-  // to invalidate the cache for StoreBEntry. If the user wants to actually do
-  // moves like these, it's up to them to ensure that nearby cache entries are
-  // correctly invalidated (which, in general, requires walking all instructions
-  // that the moved instruction dominates. So we probably shouldn't be doing
-  // moves like this in general. Still, works as a test-case. ;) )
-  MemorySSAUpdater(&MSSA).moveToPlace(StoreAEntry, BlockB,
-                                      MemorySSA::InsertionPlace::End);
-  ASSERT_FALSE(StoreAEntry->isOptimized());
-  ASSERT_EQ(MSSA.getWalker()->getClobberingMemoryAccess(StoreAEntry),
-            StoreBEntry);
-}
-
-TEST_F(MemorySSATest, TestOptimizedDefsAreProperUses) {
-  F = Function::Create(FunctionType::get(B.getVoidTy(),
-                                         {B.getInt8PtrTy(), B.getInt8PtrTy()},
-                                         false),
-                       GlobalValue::ExternalLinkage, "F", &M);
-  B.SetInsertPoint(BasicBlock::Create(C, "", F));
-  Type *Int8 = Type::getInt8Ty(C);
-  Value *AllocA = B.CreateAlloca(Int8, ConstantInt::get(Int8, 1), "A");
-  Value *AllocB = B.CreateAlloca(Int8, ConstantInt::get(Int8, 1), "B");
-
-  StoreInst *StoreA = B.CreateStore(ConstantInt::get(Int8, 0), AllocA);
-  StoreInst *StoreB = B.CreateStore(ConstantInt::get(Int8, 1), AllocB);
-  StoreInst *StoreA2 = B.CreateStore(ConstantInt::get(Int8, 2), AllocA);
-
-  setupAnalyses();
-  MemorySSA &MSSA = *Analyses->MSSA;
-  MemorySSAWalker *Walker = Analyses->Walker;
-
-  // If these don't hold, there's no chance of the test result being useful.
-  ASSERT_EQ(Walker->getClobberingMemoryAccess(StoreA),
-            MSSA.getLiveOnEntryDef());
-  ASSERT_EQ(Walker->getClobberingMemoryAccess(StoreB),
-            MSSA.getLiveOnEntryDef());
-  auto *StoreAAccess = cast<MemoryDef>(MSSA.getMemoryAccess(StoreA));
-  auto *StoreA2Access = cast<MemoryDef>(MSSA.getMemoryAccess(StoreA2));
-  ASSERT_EQ(Walker->getClobberingMemoryAccess(StoreA2), StoreAAccess);
-  ASSERT_EQ(StoreA2Access->getOptimized(), StoreAAccess);
-
-  auto *StoreBAccess = cast<MemoryDef>(MSSA.getMemoryAccess(StoreB));
-  ASSERT_LT(StoreAAccess->getID(), StoreBAccess->getID());
-  ASSERT_LT(StoreBAccess->getID(), StoreA2Access->getID());
-
-  auto SortVecByID = [](std::vector<const MemoryDef *> &Defs) {
-    llvm::sort(Defs, [](const MemoryDef *LHS, const MemoryDef *RHS) {
-      return LHS->getID() < RHS->getID();
-    });
-  };
-
-  auto SortedUserList = [&](const MemoryDef *MD) {
-    std::vector<const MemoryDef *> Result;
-    transform(MD->users(), std::back_inserter(Result),
-              [](const User *U) { return cast<MemoryDef>(U); });
-    SortVecByID(Result);
-    return Result;
-  };
-
-  // Use std::vectors, since they have nice pretty-printing if the test fails.
-  // Parens are necessary because EXPECT_EQ is a macro, and we have commas in
-  // our init lists...
-  EXPECT_EQ(SortedUserList(StoreAAccess),
-            (std::vector<const MemoryDef *>{StoreBAccess, StoreA2Access}));
-
-  EXPECT_EQ(SortedUserList(StoreBAccess),
-            std::vector<const MemoryDef *>{StoreA2Access});
-
-  // StoreAAccess should be present twice, since it uses liveOnEntry for both
-  // its defining and optimized accesses. This is a bit awkward, and is not
-  // relied upon anywhere at the moment. If this is painful, we can fix it.
-  EXPECT_EQ(SortedUserList(cast<MemoryDef>(MSSA.getLiveOnEntryDef())),
-            (std::vector<const MemoryDef *>{StoreAAccess, StoreAAccess,
-                                            StoreBAccess}));
-}
-
-//   entry
-//     |
-//   header
-//    / \
-// body  |
-//    \ /
-//    exit
-// header:
-//  ; 1 = MemoryDef(liveOnEntry)
-// body:
-//  ; 2 = MemoryDef(1)
-// exit:
-//  ; 3 = MemoryPhi({body, 2}, {header, 1})
-//  ; 4 = MemoryDef(3); optimized to 3, cannot optimize thorugh phi.
-//  Insert edge: entry -> exit, check mssa Update is correct.
-TEST_F(MemorySSATest, TestAddedEdgeToBlockWithPhiNotOpt) {
-  F = Function::Create(
-      FunctionType::get(B.getVoidTy(), {B.getInt8PtrTy()}, false),
-      GlobalValue::ExternalLinkage, "F", &M);
-  Argument *PointerArg = &*F->arg_begin();
-  BasicBlock *Entry(BasicBlock::Create(C, "entry", F));
-  BasicBlock *Header(BasicBlock::Create(C, "header", F));
-  BasicBlock *Body(BasicBlock::Create(C, "body", F));
-  BasicBlock *Exit(BasicBlock::Create(C, "exit", F));
-  B.SetInsertPoint(Entry);
-  BranchInst::Create(Header, Entry);
-  B.SetInsertPoint(Header);
-  B.CreateStore(B.getInt8(16), PointerArg);
-  B.CreateCondBr(B.getTrue(), Exit, Body);
-  B.SetInsertPoint(Body);
-  B.CreateStore(B.getInt8(16), PointerArg);
-  BranchInst::Create(Exit, Body);
-  B.SetInsertPoint(Exit);
-  StoreInst *S1 = B.CreateStore(B.getInt8(16), PointerArg);
-
-  setupAnalyses();
-  MemorySSA &MSSA = *Analyses->MSSA;
-  MemorySSAWalker *Walker = Analyses->Walker;
-  std::unique_ptr<MemorySSAUpdater> MSSAU =
-      std::make_unique<MemorySSAUpdater>(&MSSA);
-
-  MemoryPhi *Phi = MSSA.getMemoryAccess(Exit);
-  EXPECT_EQ(Phi, Walker->getClobberingMemoryAccess(S1));
-
-  // Alter CFG, add edge: entry -> exit
-  Entry->getTerminator()->eraseFromParent();
-  B.SetInsertPoint(Entry);
-  B.CreateCondBr(B.getTrue(), Header, Exit);
-  SmallVector<CFGUpdate, 1> Updates;
-  Updates.push_back({cfg::UpdateKind::Insert, Entry, Exit});
-  Analyses->DT.applyUpdates(Updates);
-  MSSAU->applyInsertUpdates(Updates, Analyses->DT);
-  EXPECT_EQ(Phi, Walker->getClobberingMemoryAccess(S1));
-}
-
-//   entry
-//     |
-//   header
-//    / \
-// body  |
-//    \ /
-//    exit
-// header:
-//  ; 1 = MemoryDef(liveOnEntry)
-// body:
-//  ; 2 = MemoryDef(1)
-// exit:
-//  ; 3 = MemoryPhi({body, 2}, {header, 1})
-//  ; 4 = MemoryDef(3); optimize this to 1 now, added edge should invalidate
-//  the optimized access.
-//  Insert edge: entry -> exit, check mssa Update is correct.
-TEST_F(MemorySSATest, TestAddedEdgeToBlockWithPhiOpt) {
-  F = Function::Create(
-      FunctionType::get(B.getVoidTy(), {B.getInt8PtrTy()}, false),
-      GlobalValue::ExternalLinkage, "F", &M);
-  Argument *PointerArg = &*F->arg_begin();
-  Type *Int8 = Type::getInt8Ty(C);
-  BasicBlock *Entry(BasicBlock::Create(C, "entry", F));
-  BasicBlock *Header(BasicBlock::Create(C, "header", F));
-  BasicBlock *Body(BasicBlock::Create(C, "body", F));
-  BasicBlock *Exit(BasicBlock::Create(C, "exit", F));
-
-  B.SetInsertPoint(Entry);
-  Value *Alloca = B.CreateAlloca(Int8, ConstantInt::get(Int8, 1), "A");
-  BranchInst::Create(Header, Entry);
-
-  B.SetInsertPoint(Header);
-  StoreInst *S1 = B.CreateStore(B.getInt8(16), PointerArg);
-  B.CreateCondBr(B.getTrue(), Exit, Body);
-
-  B.SetInsertPoint(Body);
-  B.CreateStore(ConstantInt::get(Int8, 0), Alloca);
-  BranchInst::Create(Exit, Body);
-
-  B.SetInsertPoint(Exit);
-  StoreInst *S2 = B.CreateStore(B.getInt8(16), PointerArg);
-
-  setupAnalyses();
-  MemorySSA &MSSA = *Analyses->MSSA;
-  MemorySSAWalker *Walker = Analyses->Walker;
-  std::unique_ptr<MemorySSAUpdater> MSSAU =
-      std::make_unique<MemorySSAUpdater>(&MSSA);
-
-  MemoryDef *DefS1 = cast<MemoryDef>(MSSA.getMemoryAccess(S1));
-  EXPECT_EQ(DefS1, Walker->getClobberingMemoryAccess(S2));
-
-  // Alter CFG, add edge: entry -> exit
-  Entry->getTerminator()->eraseFromParent();
-  B.SetInsertPoint(Entry);
-  B.CreateCondBr(B.getTrue(), Header, Exit);
-  SmallVector<CFGUpdate, 1> Updates;
-  Updates.push_back({cfg::UpdateKind::Insert, Entry, Exit});
-  Analyses->DT.applyUpdates(Updates);
-  MSSAU->applyInsertUpdates(Updates, Analyses->DT);
-
-  MemoryPhi *Phi = MSSA.getMemoryAccess(Exit);
-  EXPECT_EQ(Phi, Walker->getClobberingMemoryAccess(S2));
-}
-
-//   entry
-//    /  |
-//   a   |
-//  / \  |
-//  b c  f
-//  \ /  |
-//   d   |
-//    \ /
-//     e
-// f:
-//  ; 1 = MemoryDef(liveOnEntry)
-// e:
-//  ; 2 = MemoryPhi({d, liveOnEntry}, {f, 1})
-//
-// Insert edge: f -> c, check update is correct.
-// After update:
-// f:
-//  ; 1 = MemoryDef(liveOnEntry)
-// c:
-//  ; 3 = MemoryPhi({a, liveOnEntry}, {f, 1})
-// d:
-//  ; 4 = MemoryPhi({b, liveOnEntry}, {c, 3})
-// e:
-//  ; 2 = MemoryPhi({d, 4}, {f, 1})
-TEST_F(MemorySSATest, TestAddedEdgeToBlockWithNoPhiAddNewPhis) {
-  F = Function::Create(
-      FunctionType::get(B.getVoidTy(), {B.getInt8PtrTy()}, false),
-      GlobalValue::ExternalLinkage, "F", &M);
-  Argument *PointerArg = &*F->arg_begin();
-  BasicBlock *Entry(BasicBlock::Create(C, "entry", F));
-  BasicBlock *ABlock(BasicBlock::Create(C, "a", F));
-  BasicBlock *BBlock(BasicBlock::Create(C, "b", F));
-  BasicBlock *CBlock(BasicBlock::Create(C, "c", F));
-  BasicBlock *DBlock(BasicBlock::Create(C, "d", F));
-  BasicBlock *EBlock(BasicBlock::Create(C, "e", F));
-  BasicBlock *FBlock(BasicBlock::Create(C, "f", F));
-
-  B.SetInsertPoint(Entry);
-  B.CreateCondBr(B.getTrue(), ABlock, FBlock);
-  B.SetInsertPoint(ABlock);
-  B.CreateCondBr(B.getTrue(), BBlock, CBlock);
-  B.SetInsertPoint(BBlock);
-  BranchInst::Create(DBlock, BBlock);
-  B.SetInsertPoint(CBlock);
-  BranchInst::Create(DBlock, CBlock);
-  B.SetInsertPoint(DBlock);
-  BranchInst::Create(EBlock, DBlock);
-  B.SetInsertPoint(FBlock);
-  B.CreateStore(B.getInt8(16), PointerArg);
-  BranchInst::Create(EBlock, FBlock);
-
-  setupAnalyses();
-  MemorySSA &MSSA = *Analyses->MSSA;
-  std::unique_ptr<MemorySSAUpdater> MSSAU =
-      std::make_unique<MemorySSAUpdater>(&MSSA);
-
-  // Alter CFG, add edge: f -> c
-  FBlock->getTerminator()->eraseFromParent();
-  B.SetInsertPoint(FBlock);
-  B.CreateCondBr(B.getTrue(), CBlock, EBlock);
-  SmallVector<CFGUpdate, 1> Updates;
-  Updates.push_back({cfg::UpdateKind::Insert, FBlock, CBlock});
-  Analyses->DT.applyUpdates(Updates);
-  MSSAU->applyInsertUpdates(Updates, Analyses->DT);
-
-  MemoryPhi *MPC = MSSA.getMemoryAccess(CBlock);
-  EXPECT_NE(MPC, nullptr);
-  MemoryPhi *MPD = MSSA.getMemoryAccess(DBlock);
-  EXPECT_NE(MPD, nullptr);
-  MemoryPhi *MPE = MSSA.getMemoryAccess(EBlock);
-  EXPECT_EQ(MPD, MPE->getIncomingValueForBlock(DBlock));
-}
-
-TEST_F(MemorySSATest, TestCallClobber) {
-  F = Function::Create(
-      FunctionType::get(B.getVoidTy(), {B.getInt8PtrTy()}, false),
-      GlobalValue::ExternalLinkage, "F", &M);
-
-  Value *Pointer1 = &*F->arg_begin();
-  BasicBlock *Entry(BasicBlock::Create(C, "", F));
-  B.SetInsertPoint(Entry);
-  Value *Pointer2 = B.CreateGEP(B.getInt8Ty(), Pointer1, B.getInt64(1));
-  Instruction *StorePointer1 = B.CreateStore(B.getInt8(0), Pointer1);
-  Instruction *StorePointer2 = B.CreateStore(B.getInt8(0), Pointer2);
-  Instruction *MemSet = B.CreateMemSet(Pointer2, B.getInt8(0), 1, Align(1));
-
-  setupAnalyses();
-  MemorySSA &MSSA = *Analyses->MSSA;
-  MemorySSAWalker *Walker = Analyses->Walker;
-
-  MemoryUseOrDef *Store1Access = MSSA.getMemoryAccess(StorePointer1);
-  MemoryUseOrDef *Store2Access = MSSA.getMemoryAccess(StorePointer2);
-  MemoryUseOrDef *MemSetAccess = MSSA.getMemoryAccess(MemSet);
-
-  MemoryAccess *Pointer1Clobber = Walker->getClobberingMemoryAccess(
-      MemSetAccess, MemoryLocation(Pointer1, LocationSize::precise(1)));
-  EXPECT_EQ(Pointer1Clobber, Store1Access);
-
-  MemoryAccess *Pointer2Clobber = Walker->getClobberingMemoryAccess(
-      MemSetAccess, MemoryLocation(Pointer2, LocationSize::precise(1)));
-  EXPECT_EQ(Pointer2Clobber, MemSetAccess);
-
-  MemoryAccess *MemSetClobber = Walker->getClobberingMemoryAccess(MemSetAccess);
-  EXPECT_EQ(MemSetClobber, Store2Access);
-}
-
-TEST_F(MemorySSATest, TestLoadClobber) {
-  F = Function::Create(
-      FunctionType::get(B.getVoidTy(), {B.getInt8PtrTy()}, false),
-      GlobalValue::ExternalLinkage, "F", &M);
-
-  Value *Pointer1 = &*F->arg_begin();
-  BasicBlock *Entry(BasicBlock::Create(C, "", F));
-  B.SetInsertPoint(Entry);
-  Value *Pointer2 = B.CreateGEP(B.getInt8Ty(), Pointer1, B.getInt64(1));
-  Instruction *LoadPointer1 =
-      B.CreateLoad(B.getInt8Ty(), Pointer1, /* Volatile */ true);
-  Instruction *LoadPointer2 =
-      B.CreateLoad(B.getInt8Ty(), Pointer2, /* Volatile */ true);
-
-  setupAnalyses();
-  MemorySSA &MSSA = *Analyses->MSSA;
-  MemorySSAWalker *Walker = Analyses->Walker;
-
-  MemoryUseOrDef *Load1Access = MSSA.getMemoryAccess(LoadPointer1);
-  MemoryUseOrDef *Load2Access = MSSA.getMemoryAccess(LoadPointer2);
-
-  // When providing a memory location, we should never return a load as the
-  // clobber.
-  MemoryAccess *Pointer1Clobber = Walker->getClobberingMemoryAccess(
-      Load2Access, MemoryLocation(Pointer1, LocationSize::precise(1)));
-  EXPECT_TRUE(MSSA.isLiveOnEntryDef(Pointer1Clobber));
-
-  MemoryAccess *Pointer2Clobber = Walker->getClobberingMemoryAccess(
-      Load2Access, MemoryLocation(Pointer2, LocationSize::precise(1)));
-  EXPECT_TRUE(MSSA.isLiveOnEntryDef(Pointer2Clobber));
-
-  MemoryAccess *Load2Clobber = Walker->getClobberingMemoryAccess(Load2Access);
-  EXPECT_EQ(Load2Clobber, Load1Access);
-}
-
-// We want to test if the location information are retained
-// when the IsGuaranteedLoopInvariant function handles a
-// memory access referring to a pointer defined in the entry
-// block, hence automatically guaranteed to be loop invariant.
-TEST_F(MemorySSATest, TestLoopInvariantEntryBlockPointer) {
-  SMDiagnostic E;
-  auto LocalM =
-      parseAssemblyString("define void @test(i64 %a0, i8* %a1, i1* %a2) {\n"
-                          "entry:\n"
-                          "%v0 = getelementptr i8, i8* %a1, i64 %a0\n"
-                          "%v1 = bitcast i8* %v0 to i64*\n"
-                          "%v2 = bitcast i8* %v0 to i32*\n"
-                          "%v3 = load i1, i1* %a2\n"
-                          "br i1 %v3, label %body, label %exit\n"
-                          "body:\n"
-                          "store i32 1, i32* %v2\n"
-                          "br label %exit\n"
-                          "exit:\n"
-                          "store i64 0, i64* %v1\n"
-                          "ret void\n"
-                          "}",
-                          E, C);
-  ASSERT_TRUE(LocalM);
-  F = LocalM->getFunction("test");
-  ASSERT_TRUE(F);
-  // Setup the analysis
-  setupAnalyses();
-  MemorySSA &MSSA = *Analyses->MSSA;
-  // Find the exit block
-  for (auto &BB : *F) {
-    if (BB.getName() == "exit") {
-      // Get the store instruction
-      auto *SI = BB.getFirstNonPHI();
-      // Get the memory access and location
-      MemoryAccess *MA = MSSA.getMemoryAccess(SI);
-      MemoryLocation ML = MemoryLocation::get(SI);
-      // Use the 'upward_defs_iterator' which internally calls
-      // IsGuaranteedLoopInvariant
-      auto ItA = upward_defs_begin({MA, ML}, MSSA.getDomTree());
-      auto ItB =
-          upward_defs_begin({ItA->first, ItA->second}, MSSA.getDomTree());
-      // Check if the location information have been retained
-      EXPECT_TRUE(ItB->second.Size.isPrecise());
-      EXPECT_TRUE(ItB->second.Size.hasValue());
-      EXPECT_TRUE(ItB->second.Size.getValue() == 8);
-    }
-  }
-}
\ No newline at end of file
diff --git a/gnu/llvm/llvm/unittests/Analysis/PhiValuesTest.cpp b/gnu/llvm/llvm/unittests/Analysis/PhiValuesTest.cpp
deleted file mode 100644
index 82c02337ef2..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/PhiValuesTest.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-//===- PhiValuesTest.cpp - PhiValues unit tests ---------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/PhiValues.h"
-#include "llvm/IR/BasicBlock.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/Type.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-TEST(PhiValuesTest, SimplePhi) {
-  LLVMContext C;
-  Module M("PhiValuesTest", C);
-
-  Type *VoidTy = Type::getVoidTy(C);
-  Type *I1Ty = Type::getInt1Ty(C);
-  Type *I32Ty = Type::getInt32Ty(C);
-  Type *I32PtrTy = Type::getInt32PtrTy(C);
-
-  // Create a function with phis that do not have other phis as incoming values
-  Function *F = Function::Create(FunctionType::get(VoidTy, false),
-                                 Function::ExternalLinkage, "f", M);
-
-  BasicBlock *Entry = BasicBlock::Create(C, "entry", F);
-  BasicBlock *If = BasicBlock::Create(C, "if", F);
-  BasicBlock *Else = BasicBlock::Create(C, "else", F);
-  BasicBlock *Then = BasicBlock::Create(C, "then", F);
-  BranchInst::Create(If, Else, UndefValue::get(I1Ty), Entry);
-  BranchInst::Create(Then, If);
-  BranchInst::Create(Then, Else);
-
-  Value *Val1 = new LoadInst(I32Ty, UndefValue::get(I32PtrTy), "val1", Entry);
-  Value *Val2 = new LoadInst(I32Ty, UndefValue::get(I32PtrTy), "val2", Entry);
-  Value *Val3 = new LoadInst(I32Ty, UndefValue::get(I32PtrTy), "val3", Entry);
-  Value *Val4 = new LoadInst(I32Ty, UndefValue::get(I32PtrTy), "val4", Entry);
-
-  PHINode *Phi1 = PHINode::Create(I32Ty, 2, "phi1", Then);
-  Phi1->addIncoming(Val1, If);
-  Phi1->addIncoming(Val2, Else);
-  PHINode *Phi2 = PHINode::Create(I32Ty, 2, "phi2", Then);
-  Phi2->addIncoming(Val1, If);
-  Phi2->addIncoming(Val3, Else);
-
-  PhiValues PV(*F);
-  PhiValues::ValueSet Vals;
-
-  // Check that simple usage works
-  Vals = PV.getValuesForPhi(Phi1);
-  EXPECT_EQ(Vals.size(), 2u);
-  EXPECT_TRUE(Vals.count(Val1));
-  EXPECT_TRUE(Vals.count(Val2));
-  Vals = PV.getValuesForPhi(Phi2);
-  EXPECT_EQ(Vals.size(), 2u);
-  EXPECT_TRUE(Vals.count(Val1));
-  EXPECT_TRUE(Vals.count(Val3));
-
-  // Check that values are updated when one value is replaced with another
-  Val1->replaceAllUsesWith(Val4);
-  PV.invalidateValue(Val1);
-  Vals = PV.getValuesForPhi(Phi1);
-  EXPECT_EQ(Vals.size(), 2u);
-  EXPECT_TRUE(Vals.count(Val4));
-  EXPECT_TRUE(Vals.count(Val2));
-  Vals = PV.getValuesForPhi(Phi2);
-  EXPECT_EQ(Vals.size(), 2u);
-  EXPECT_TRUE(Vals.count(Val4));
-  EXPECT_TRUE(Vals.count(Val3));
-
-  // Check that setting in incoming value directly updates the values
-  Phi1->setIncomingValue(0, Val1);
-  PV.invalidateValue(Phi1);
-  Vals = PV.getValuesForPhi(Phi1);
-  EXPECT_EQ(Vals.size(), 2u);
-  EXPECT_TRUE(Vals.count(Val1));
-  EXPECT_TRUE(Vals.count(Val2));
-}
-
-TEST(PhiValuesTest, DependentPhi) {
-  LLVMContext C;
-  Module M("PhiValuesTest", C);
-
-  Type *VoidTy = Type::getVoidTy(C);
-  Type *I1Ty = Type::getInt1Ty(C);
-  Type *I32Ty = Type::getInt32Ty(C);
-  Type *I32PtrTy = Type::getInt32PtrTy(C);
-
-  // Create a function with a phi that has another phi as an incoming value
-  Function *F = Function::Create(FunctionType::get(VoidTy, false),
-                                 Function::ExternalLinkage, "f", M);
-
-  BasicBlock *Entry = BasicBlock::Create(C, "entry", F);
-  BasicBlock *If1 = BasicBlock::Create(C, "if1", F);
-  BasicBlock *Else1 = BasicBlock::Create(C, "else1", F);
-  BasicBlock *Then = BasicBlock::Create(C, "then", F);
-  BasicBlock *If2 = BasicBlock::Create(C, "if2", F);
-  BasicBlock *Else2 = BasicBlock::Create(C, "else2", F);
-  BasicBlock *End = BasicBlock::Create(C, "then", F);
-  BranchInst::Create(If1, Else1, UndefValue::get(I1Ty), Entry);
-  BranchInst::Create(Then, If1);
-  BranchInst::Create(Then, Else1);
-  BranchInst::Create(If2, Else2, UndefValue::get(I1Ty), Then);
-  BranchInst::Create(End, If2);
-  BranchInst::Create(End, Else2);
-
-  Value *Val1 = new LoadInst(I32Ty, UndefValue::get(I32PtrTy), "val1", Entry);
-  Value *Val2 = new LoadInst(I32Ty, UndefValue::get(I32PtrTy), "val2", Entry);
-  Value *Val3 = new LoadInst(I32Ty, UndefValue::get(I32PtrTy), "val3", Entry);
-  Value *Val4 = new LoadInst(I32Ty, UndefValue::get(I32PtrTy), "val4", Entry);
-
-  PHINode *Phi1 = PHINode::Create(I32Ty, 2, "phi1", Then);
-  Phi1->addIncoming(Val1, If1);
-  Phi1->addIncoming(Val2, Else1);
-  PHINode *Phi2 = PHINode::Create(I32Ty, 2, "phi2", Then);
-  Phi2->addIncoming(Val2, If1);
-  Phi2->addIncoming(Val3, Else1);
-  PHINode *Phi3 = PHINode::Create(I32Ty, 2, "phi3", End);
-  Phi3->addIncoming(Phi1, If2);
-  Phi3->addIncoming(Val3, Else2);
-
-  PhiValues PV(*F);
-  PhiValues::ValueSet Vals;
-
-  // Check that simple usage works
-  Vals = PV.getValuesForPhi(Phi1);
-  EXPECT_EQ(Vals.size(), 2u);
-  EXPECT_TRUE(Vals.count(Val1));
-  EXPECT_TRUE(Vals.count(Val2));
-  Vals = PV.getValuesForPhi(Phi2);
-  EXPECT_EQ(Vals.size(), 2u);
-  EXPECT_TRUE(Vals.count(Val2));
-  EXPECT_TRUE(Vals.count(Val3));
-  Vals = PV.getValuesForPhi(Phi3);
-  EXPECT_EQ(Vals.size(), 3u);
-  EXPECT_TRUE(Vals.count(Val1));
-  EXPECT_TRUE(Vals.count(Val2));
-  EXPECT_TRUE(Vals.count(Val3));
-
-  // Check that changing an incoming value in the dependent phi changes the depending phi
-  Phi1->setIncomingValue(0, Val4);
-  PV.invalidateValue(Phi1);
-  Vals = PV.getValuesForPhi(Phi1);
-  EXPECT_EQ(Vals.size(), 2u);
-  EXPECT_TRUE(Vals.count(Val4));
-  EXPECT_TRUE(Vals.count(Val2));
-  Vals = PV.getValuesForPhi(Phi2);
-  EXPECT_EQ(Vals.size(), 2u);
-  EXPECT_TRUE(Vals.count(Val2));
-  EXPECT_TRUE(Vals.count(Val3));
-  Vals = PV.getValuesForPhi(Phi3);
-  EXPECT_EQ(Vals.size(), 3u);
-  EXPECT_TRUE(Vals.count(Val4));
-  EXPECT_TRUE(Vals.count(Val2));
-  EXPECT_TRUE(Vals.count(Val3));
-
-  // Check that replacing an incoming phi with a value works
-  Phi3->setIncomingValue(0, Val1);
-  PV.invalidateValue(Phi3);
-  Vals = PV.getValuesForPhi(Phi1);
-  EXPECT_EQ(Vals.size(), 2u);
-  EXPECT_TRUE(Vals.count(Val4));
-  EXPECT_TRUE(Vals.count(Val2));
-  Vals = PV.getValuesForPhi(Phi2);
-  EXPECT_EQ(Vals.size(), 2u);
-  EXPECT_TRUE(Vals.count(Val2));
-  EXPECT_TRUE(Vals.count(Val3));
-  Vals = PV.getValuesForPhi(Phi3);
-  EXPECT_EQ(Vals.size(), 2u);
-  EXPECT_TRUE(Vals.count(Val1));
-  EXPECT_TRUE(Vals.count(Val3));
-
-  // Check that adding a phi as an incoming value works
-  Phi3->setIncomingValue(1, Phi2);
-  PV.invalidateValue(Phi3);
-  Vals = PV.getValuesForPhi(Phi1);
-  EXPECT_EQ(Vals.size(), 2u);
-  EXPECT_TRUE(Vals.count(Val4));
-  EXPECT_TRUE(Vals.count(Val2));
-  Vals = PV.getValuesForPhi(Phi2);
-  EXPECT_EQ(Vals.size(), 2u);
-  EXPECT_TRUE(Vals.count(Val2));
-  EXPECT_TRUE(Vals.count(Val3));
-  Vals = PV.getValuesForPhi(Phi3);
-  EXPECT_EQ(Vals.size(), 3u);
-  EXPECT_TRUE(Vals.count(Val1));
-  EXPECT_TRUE(Vals.count(Val2));
-  EXPECT_TRUE(Vals.count(Val3));
-
-  // Check that replacing an incoming phi then deleting it works
-  Phi3->setIncomingValue(1, Val2);
-  PV.invalidateValue(Phi2);
-  Phi2->eraseFromParent();
-  PV.invalidateValue(Phi3);
-  Vals = PV.getValuesForPhi(Phi1);
-  EXPECT_EQ(Vals.size(), 2u);
-  EXPECT_TRUE(Vals.count(Val4));
-  EXPECT_TRUE(Vals.count(Val2));
-  Vals = PV.getValuesForPhi(Phi3);
-  EXPECT_EQ(Vals.size(), 2u);
-  EXPECT_TRUE(Vals.count(Val1));
-  EXPECT_TRUE(Vals.count(Val2));
-}
diff --git a/gnu/llvm/llvm/unittests/Analysis/ProfileSummaryInfoTest.cpp b/gnu/llvm/llvm/unittests/Analysis/ProfileSummaryInfoTest.cpp
deleted file mode 100644
index f36d3ba9977..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/ProfileSummaryInfoTest.cpp
+++ /dev/null
@@ -1,433 +0,0 @@
-//===- ProfileSummaryInfoTest.cpp - ProfileSummaryInfo unit tests ---------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/ProfileSummaryInfo.h"
-#include "llvm/Analysis/BlockFrequencyInfo.h"
-#include "llvm/Analysis/BranchProbabilityInfo.h"
-#include "llvm/Analysis/LoopInfo.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/BasicBlock.h"
-#include "llvm/IR/Dominators.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/MDBuilder.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/DataTypes.h"
-#include "llvm/Support/FormatVariadic.h"
-#include "llvm/Support/SourceMgr.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gtest/gtest.h"
-
-extern llvm::cl::opt<bool> ScalePartialSampleProfileWorkingSetSize;
-
-namespace llvm {
-namespace {
-
-class ProfileSummaryInfoTest : public testing::Test {
-protected:
-  LLVMContext C;
-  std::unique_ptr<BranchProbabilityInfo> BPI;
-  std::unique_ptr<DominatorTree> DT;
-  std::unique_ptr<LoopInfo> LI;
-
-  ProfileSummaryInfo buildPSI(Module *M) {
-    return ProfileSummaryInfo(*M);
-  }
-  BlockFrequencyInfo buildBFI(Function &F) {
-    DT.reset(new DominatorTree(F));
-    LI.reset(new LoopInfo(*DT));
-    BPI.reset(new BranchProbabilityInfo(F, *LI));
-    return BlockFrequencyInfo(F, *BPI, *LI);
-  }
-  std::unique_ptr<Module> makeLLVMModule(const char *ProfKind = nullptr,
-                                         uint64_t NumCounts = 3,
-                                         uint64_t IsPartialProfile = 0,
-                                         double PartialProfileRatio = 0.0,
-                                         uint64_t HotNumCounts = 3,
-                                         uint64_t ColdNumCounts = 10) {
-    const char *ModuleString =
-        "define i32 @g(i32 %x) !prof !21 {{\n"
-        "  ret i32 0\n"
-        "}\n"
-        "define i32 @h(i32 %x) !prof !22 {{\n"
-        "  ret i32 0\n"
-        "}\n"
-        "define i32 @f(i32 %x) !prof !20 {{\n"
-        "bb0:\n"
-        "  %y1 = icmp eq i32 %x, 0 \n"
-        "  br i1 %y1, label %bb1, label %bb2, !prof !23 \n"
-        "bb1:\n"
-        "  %z1 = call i32 @g(i32 %x)\n"
-        "  br label %bb3\n"
-        "bb2:\n"
-        "  %z2 = call i32 @h(i32 %x)\n"
-        "  br label %bb3\n"
-        "bb3:\n"
-        "  %y2 = phi i32 [0, %bb1], [1, %bb2] \n"
-        "  ret i32 %y2\n"
-        "}\n"
-        "define i32 @l(i32 %x) {{\n"
-        "bb0:\n"
-        "  %y1 = icmp eq i32 %x, 0 \n"
-        "  br i1 %y1, label %bb1, label %bb2, !prof !23 \n"
-        "bb1:\n"
-        "  %z1 = call i32 @g(i32 %x)\n"
-        "  br label %bb3\n"
-        "bb2:\n"
-        "  %z2 = call i32 @h(i32 %x)\n"
-        "  br label %bb3\n"
-        "bb3:\n"
-        "  %y2 = phi i32 [0, %bb1], [1, %bb2] \n"
-        "  ret i32 %y2\n"
-        "}\n"
-        "!20 = !{{!\"function_entry_count\", i64 400}\n"
-        "!21 = !{{!\"function_entry_count\", i64 1}\n"
-        "!22 = !{{!\"function_entry_count\", i64 100}\n"
-        "!23 = !{{!\"branch_weights\", i32 64, i32 4}\n"
-        "{0}";
-    const char *SummaryString =
-        "!llvm.module.flags = !{{!1}\n"
-        "!1 = !{{i32 1, !\"ProfileSummary\", !2}\n"
-        "!2 = !{{!3, !4, !5, !6, !7, !8, !9, !10, !11, !12}\n"
-        "!3 = !{{!\"ProfileFormat\", !\"{0}\"}\n"
-        "!4 = !{{!\"TotalCount\", i64 10000}\n"
-        "!5 = !{{!\"MaxCount\", i64 10}\n"
-        "!6 = !{{!\"MaxInternalCount\", i64 1}\n"
-        "!7 = !{{!\"MaxFunctionCount\", i64 1000}\n"
-        "!8 = !{{!\"NumCounts\", i64 {1}}\n"
-        "!9 = !{{!\"NumFunctions\", i64 3}\n"
-        "!10 = !{{!\"IsPartialProfile\", i64 {2}}\n"
-        "!11 = !{{!\"PartialProfileRatio\", double {3}}\n"
-        "!12 = !{{!\"DetailedSummary\", !13}\n"
-        "!13 = !{{!14, !15, !16}\n"
-        "!14 = !{{i32 10000, i64 1000, i32 1}\n"
-        "!15 = !{{i32 990000, i64 300, i32 {4}}\n"
-        "!16 = !{{i32 999999, i64 5, i32 {5}}\n";
-    SMDiagnostic Err;
-    if (ProfKind) {
-      auto Summary =
-          formatv(SummaryString, ProfKind, NumCounts, IsPartialProfile,
-                  PartialProfileRatio, HotNumCounts, ColdNumCounts)
-              .str();
-      return parseAssemblyString(formatv(ModuleString, Summary).str(), Err, C);
-    } else
-      return parseAssemblyString(formatv(ModuleString, "").str(), Err, C);
-  }
-};
-
-TEST_F(ProfileSummaryInfoTest, TestNoProfile) {
-  auto M = makeLLVMModule(/*ProfKind=*/nullptr);
-  Function *F = M->getFunction("f");
-
-  ProfileSummaryInfo PSI = buildPSI(M.get());
-  EXPECT_FALSE(PSI.hasProfileSummary());
-  EXPECT_FALSE(PSI.hasSampleProfile());
-  EXPECT_FALSE(PSI.hasInstrumentationProfile());
-  // In the absence of profiles, is{Hot|Cold}X methods should always return
-  // false.
-  EXPECT_FALSE(PSI.isHotCount(1000));
-  EXPECT_FALSE(PSI.isHotCount(0));
-  EXPECT_FALSE(PSI.isColdCount(1000));
-  EXPECT_FALSE(PSI.isColdCount(0));
-
-  EXPECT_FALSE(PSI.isFunctionEntryHot(F));
-  EXPECT_FALSE(PSI.isFunctionEntryCold(F));
-
-  BasicBlock &BB0 = F->getEntryBlock();
-  BasicBlock *BB1 = BB0.getTerminator()->getSuccessor(0);
-
-  BlockFrequencyInfo BFI = buildBFI(*F);
-  EXPECT_FALSE(PSI.isHotBlock(&BB0, &BFI));
-  EXPECT_FALSE(PSI.isColdBlock(&BB0, &BFI));
-
-  CallBase &CS1 = cast<CallBase>(*BB1->getFirstNonPHI());
-  EXPECT_FALSE(PSI.isHotCallSite(CS1, &BFI));
-  EXPECT_FALSE(PSI.isColdCallSite(CS1, &BFI));
-}
-TEST_F(ProfileSummaryInfoTest, TestCommon) {
-  auto M = makeLLVMModule("InstrProf");
-  Function *F = M->getFunction("f");
-  Function *G = M->getFunction("g");
-  Function *H = M->getFunction("h");
-
-  ProfileSummaryInfo PSI = buildPSI(M.get());
-  EXPECT_TRUE(PSI.hasProfileSummary());
-  EXPECT_TRUE(PSI.isHotCount(400));
-  EXPECT_TRUE(PSI.isColdCount(2));
-  EXPECT_FALSE(PSI.isColdCount(100));
-  EXPECT_FALSE(PSI.isHotCount(100));
-
-  EXPECT_TRUE(PSI.isHotCountNthPercentile(990000, 400));
-  EXPECT_FALSE(PSI.isHotCountNthPercentile(990000, 100));
-  EXPECT_FALSE(PSI.isHotCountNthPercentile(990000, 2));
-
-  EXPECT_FALSE(PSI.isColdCountNthPercentile(990000, 400));
-  EXPECT_TRUE(PSI.isColdCountNthPercentile(990000, 100));
-  EXPECT_TRUE(PSI.isColdCountNthPercentile(990000, 2));
-
-  EXPECT_TRUE(PSI.isHotCountNthPercentile(999999, 400));
-  EXPECT_TRUE(PSI.isHotCountNthPercentile(999999, 100));
-  EXPECT_FALSE(PSI.isHotCountNthPercentile(999999, 2));
-
-  EXPECT_FALSE(PSI.isColdCountNthPercentile(999999, 400));
-  EXPECT_FALSE(PSI.isColdCountNthPercentile(999999, 100));
-  EXPECT_TRUE(PSI.isColdCountNthPercentile(999999, 2));
-
-  EXPECT_FALSE(PSI.isHotCountNthPercentile(10000, 400));
-  EXPECT_FALSE(PSI.isHotCountNthPercentile(10000, 100));
-  EXPECT_FALSE(PSI.isHotCountNthPercentile(10000, 2));
-
-  EXPECT_TRUE(PSI.isColdCountNthPercentile(10000, 400));
-  EXPECT_TRUE(PSI.isColdCountNthPercentile(10000, 100));
-  EXPECT_TRUE(PSI.isColdCountNthPercentile(10000, 2));
-
-  EXPECT_TRUE(PSI.isFunctionEntryHot(F));
-  EXPECT_FALSE(PSI.isFunctionEntryHot(G));
-  EXPECT_FALSE(PSI.isFunctionEntryHot(H));
-}
-
-TEST_F(ProfileSummaryInfoTest, InstrProf) {
-  auto M = makeLLVMModule("InstrProf");
-  Function *F = M->getFunction("f");
-  ProfileSummaryInfo PSI = buildPSI(M.get());
-  EXPECT_TRUE(PSI.hasProfileSummary());
-  EXPECT_TRUE(PSI.hasInstrumentationProfile());
-
-  BasicBlock &BB0 = F->getEntryBlock();
-  BasicBlock *BB1 = BB0.getTerminator()->getSuccessor(0);
-  BasicBlock *BB2 = BB0.getTerminator()->getSuccessor(1);
-  BasicBlock *BB3 = BB1->getSingleSuccessor();
-
-  BlockFrequencyInfo BFI = buildBFI(*F);
-  EXPECT_TRUE(PSI.isHotBlock(&BB0, &BFI));
-  EXPECT_TRUE(PSI.isHotBlock(BB1, &BFI));
-  EXPECT_FALSE(PSI.isHotBlock(BB2, &BFI));
-  EXPECT_TRUE(PSI.isHotBlock(BB3, &BFI));
-
-  EXPECT_TRUE(PSI.isHotBlockNthPercentile(990000, &BB0, &BFI));
-  EXPECT_TRUE(PSI.isHotBlockNthPercentile(990000, BB1, &BFI));
-  EXPECT_FALSE(PSI.isHotBlockNthPercentile(990000, BB2, &BFI));
-  EXPECT_TRUE(PSI.isHotBlockNthPercentile(990000, BB3, &BFI));
-
-  EXPECT_FALSE(PSI.isColdBlockNthPercentile(990000, &BB0, &BFI));
-  EXPECT_FALSE(PSI.isColdBlockNthPercentile(990000, BB1, &BFI));
-  EXPECT_TRUE(PSI.isColdBlockNthPercentile(990000, BB2, &BFI));
-  EXPECT_FALSE(PSI.isColdBlockNthPercentile(990000, BB3, &BFI));
-
-  EXPECT_TRUE(PSI.isHotBlockNthPercentile(999900, &BB0, &BFI));
-  EXPECT_TRUE(PSI.isHotBlockNthPercentile(999900, BB1, &BFI));
-  EXPECT_TRUE(PSI.isHotBlockNthPercentile(999900, BB2, &BFI));
-  EXPECT_TRUE(PSI.isHotBlockNthPercentile(999900, BB3, &BFI));
-
-  EXPECT_FALSE(PSI.isColdBlockNthPercentile(999900, &BB0, &BFI));
-  EXPECT_FALSE(PSI.isColdBlockNthPercentile(999900, BB1, &BFI));
-  EXPECT_FALSE(PSI.isColdBlockNthPercentile(999900, BB2, &BFI));
-  EXPECT_FALSE(PSI.isColdBlockNthPercentile(999900, BB3, &BFI));
-
-  EXPECT_FALSE(PSI.isHotBlockNthPercentile(10000, &BB0, &BFI));
-  EXPECT_FALSE(PSI.isHotBlockNthPercentile(10000, BB1, &BFI));
-  EXPECT_FALSE(PSI.isHotBlockNthPercentile(10000, BB2, &BFI));
-  EXPECT_FALSE(PSI.isHotBlockNthPercentile(10000, BB3, &BFI));
-
-  EXPECT_TRUE(PSI.isColdBlockNthPercentile(10000, &BB0, &BFI));
-  EXPECT_TRUE(PSI.isColdBlockNthPercentile(10000, BB1, &BFI));
-  EXPECT_TRUE(PSI.isColdBlockNthPercentile(10000, BB2, &BFI));
-  EXPECT_TRUE(PSI.isColdBlockNthPercentile(10000, BB3, &BFI));
-
-  CallBase &CS1 = cast<CallBase>(*BB1->getFirstNonPHI());
-  auto *CI2 = BB2->getFirstNonPHI();
-  CallBase &CS2 = cast<CallBase>(*CI2);
-
-  EXPECT_TRUE(PSI.isHotCallSite(CS1, &BFI));
-  EXPECT_FALSE(PSI.isHotCallSite(CS2, &BFI));
-
-  // Test that adding an MD_prof metadata with a hot count on CS2 does not
-  // change its hotness as it has no effect in instrumented profiling.
-  MDBuilder MDB(M->getContext());
-  CI2->setMetadata(llvm::LLVMContext::MD_prof, MDB.createBranchWeights({400}));
-  EXPECT_FALSE(PSI.isHotCallSite(CS2, &BFI));
-
-  EXPECT_TRUE(PSI.isFunctionHotInCallGraphNthPercentile(990000, F, BFI));
-  EXPECT_FALSE(PSI.isFunctionColdInCallGraphNthPercentile(990000, F, BFI));
-  EXPECT_FALSE(PSI.isFunctionHotInCallGraphNthPercentile(10000, F, BFI));
-  EXPECT_TRUE(PSI.isFunctionColdInCallGraphNthPercentile(10000, F, BFI));
-}
-
-TEST_F(ProfileSummaryInfoTest, InstrProfNoFuncEntryCount) {
-  auto M = makeLLVMModule("InstrProf");
-  Function *F = M->getFunction("l");
-  ProfileSummaryInfo PSI = buildPSI(M.get());
-  EXPECT_TRUE(PSI.hasProfileSummary());
-  EXPECT_TRUE(PSI.hasInstrumentationProfile());
-
-  BasicBlock &BB0 = F->getEntryBlock();
-  BasicBlock *BB1 = BB0.getTerminator()->getSuccessor(0);
-  BasicBlock *BB2 = BB0.getTerminator()->getSuccessor(1);
-  BasicBlock *BB3 = BB1->getSingleSuccessor();
-
-  BlockFrequencyInfo BFI = buildBFI(*F);
-
-  // Without the entry count, all should return false.
-  EXPECT_FALSE(PSI.isHotBlockNthPercentile(990000, &BB0, &BFI));
-  EXPECT_FALSE(PSI.isHotBlockNthPercentile(990000, BB1, &BFI));
-  EXPECT_FALSE(PSI.isHotBlockNthPercentile(990000, BB2, &BFI));
-  EXPECT_FALSE(PSI.isHotBlockNthPercentile(990000, BB3, &BFI));
-  EXPECT_FALSE(PSI.isColdBlockNthPercentile(990000, &BB0, &BFI));
-  EXPECT_FALSE(PSI.isColdBlockNthPercentile(990000, BB1, &BFI));
-  EXPECT_FALSE(PSI.isColdBlockNthPercentile(990000, BB2, &BFI));
-  EXPECT_FALSE(PSI.isColdBlockNthPercentile(990000, BB3, &BFI));
-
-  EXPECT_FALSE(PSI.isFunctionHotInCallGraphNthPercentile(990000, F, BFI));
-  EXPECT_FALSE(PSI.isFunctionColdInCallGraphNthPercentile(990000, F, BFI));
-}
-
-TEST_F(ProfileSummaryInfoTest, SampleProf) {
-  auto M = makeLLVMModule("SampleProfile");
-  Function *F = M->getFunction("f");
-  ProfileSummaryInfo PSI = buildPSI(M.get());
-  EXPECT_TRUE(PSI.hasProfileSummary());
-  EXPECT_TRUE(PSI.hasSampleProfile());
-  EXPECT_FALSE(PSI.hasPartialSampleProfile());
-
-  BasicBlock &BB0 = F->getEntryBlock();
-  BasicBlock *BB1 = BB0.getTerminator()->getSuccessor(0);
-  BasicBlock *BB2 = BB0.getTerminator()->getSuccessor(1);
-  BasicBlock *BB3 = BB1->getSingleSuccessor();
-
-  BlockFrequencyInfo BFI = buildBFI(*F);
-  EXPECT_TRUE(PSI.isHotBlock(&BB0, &BFI));
-  EXPECT_TRUE(PSI.isHotBlock(BB1, &BFI));
-  EXPECT_FALSE(PSI.isHotBlock(BB2, &BFI));
-  EXPECT_TRUE(PSI.isHotBlock(BB3, &BFI));
-
-  EXPECT_TRUE(PSI.isHotBlockNthPercentile(990000, &BB0, &BFI));
-  EXPECT_TRUE(PSI.isHotBlockNthPercentile(990000, BB1, &BFI));
-  EXPECT_FALSE(PSI.isHotBlockNthPercentile(990000, BB2, &BFI));
-  EXPECT_TRUE(PSI.isHotBlockNthPercentile(990000, BB3, &BFI));
-
-  EXPECT_FALSE(PSI.isColdBlockNthPercentile(990000, &BB0, &BFI));
-  EXPECT_FALSE(PSI.isColdBlockNthPercentile(990000, BB1, &BFI));
-  EXPECT_TRUE(PSI.isColdBlockNthPercentile(990000, BB2, &BFI));
-  EXPECT_FALSE(PSI.isColdBlockNthPercentile(990000, BB3, &BFI));
-
-  EXPECT_TRUE(PSI.isHotBlockNthPercentile(999900, &BB0, &BFI));
-  EXPECT_TRUE(PSI.isHotBlockNthPercentile(999900, BB1, &BFI));
-  EXPECT_TRUE(PSI.isHotBlockNthPercentile(999900, BB2, &BFI));
-  EXPECT_TRUE(PSI.isHotBlockNthPercentile(999900, BB3, &BFI));
-
-  EXPECT_FALSE(PSI.isColdBlockNthPercentile(999900, &BB0, &BFI));
-  EXPECT_FALSE(PSI.isColdBlockNthPercentile(999900, BB1, &BFI));
-  EXPECT_FALSE(PSI.isColdBlockNthPercentile(999900, BB2, &BFI));
-  EXPECT_FALSE(PSI.isColdBlockNthPercentile(999900, BB3, &BFI));
-
-  EXPECT_FALSE(PSI.isHotBlockNthPercentile(10000, &BB0, &BFI));
-  EXPECT_FALSE(PSI.isHotBlockNthPercentile(10000, BB1, &BFI));
-  EXPECT_FALSE(PSI.isHotBlockNthPercentile(10000, BB2, &BFI));
-  EXPECT_FALSE(PSI.isHotBlockNthPercentile(10000, BB3, &BFI));
-
-  EXPECT_TRUE(PSI.isColdBlockNthPercentile(10000, &BB0, &BFI));
-  EXPECT_TRUE(PSI.isColdBlockNthPercentile(10000, BB1, &BFI));
-  EXPECT_TRUE(PSI.isColdBlockNthPercentile(10000, BB2, &BFI));
-  EXPECT_TRUE(PSI.isColdBlockNthPercentile(10000, BB3, &BFI));
-
-  CallBase &CS1 = cast<CallBase>(*BB1->getFirstNonPHI());
-  auto *CI2 = BB2->getFirstNonPHI();
-  // Manually attach branch weights metadata to the call instruction.
-  SmallVector<uint32_t, 1> Weights;
-  Weights.push_back(1000);
-  MDBuilder MDB(M->getContext());
-  CI2->setMetadata(LLVMContext::MD_prof, MDB.createBranchWeights(Weights));
-  CallBase &CS2 = cast<CallBase>(*CI2);
-
-  EXPECT_FALSE(PSI.isHotCallSite(CS1, &BFI));
-  EXPECT_TRUE(PSI.isHotCallSite(CS2, &BFI));
-
-  // Test that CS2 is considered hot when it gets an MD_prof metadata with
-  // weights that exceed the hot count threshold.
-  CI2->setMetadata(llvm::LLVMContext::MD_prof, MDB.createBranchWeights({400}));
-  EXPECT_TRUE(PSI.isHotCallSite(CS2, &BFI));
-
-  EXPECT_TRUE(PSI.isFunctionHotInCallGraphNthPercentile(990000, F, BFI));
-  EXPECT_FALSE(PSI.isFunctionColdInCallGraphNthPercentile(990000, F, BFI));
-  EXPECT_FALSE(PSI.isFunctionHotInCallGraphNthPercentile(10000, F, BFI));
-  EXPECT_TRUE(PSI.isFunctionColdInCallGraphNthPercentile(10000, F, BFI));
-}
-
-TEST_F(ProfileSummaryInfoTest, SampleProfNoFuncEntryCount) {
-  auto M = makeLLVMModule("SampleProfile");
-  Function *F = M->getFunction("l");
-  ProfileSummaryInfo PSI = buildPSI(M.get());
-  EXPECT_TRUE(PSI.hasProfileSummary());
-  EXPECT_TRUE(PSI.hasSampleProfile());
-
-  BasicBlock &BB0 = F->getEntryBlock();
-  BasicBlock *BB1 = BB0.getTerminator()->getSuccessor(0);
-  BasicBlock *BB2 = BB0.getTerminator()->getSuccessor(1);
-  BasicBlock *BB3 = BB1->getSingleSuccessor();
-
-  BlockFrequencyInfo BFI = buildBFI(*F);
-
-  // Without the entry count, all should return false.
-  EXPECT_FALSE(PSI.isHotBlockNthPercentile(990000, &BB0, &BFI));
-  EXPECT_FALSE(PSI.isHotBlockNthPercentile(990000, BB1, &BFI));
-  EXPECT_FALSE(PSI.isHotBlockNthPercentile(990000, BB2, &BFI));
-  EXPECT_FALSE(PSI.isHotBlockNthPercentile(990000, BB3, &BFI));
-  EXPECT_FALSE(PSI.isColdBlockNthPercentile(990000, &BB0, &BFI));
-  EXPECT_FALSE(PSI.isColdBlockNthPercentile(990000, BB1, &BFI));
-  EXPECT_FALSE(PSI.isColdBlockNthPercentile(990000, BB2, &BFI));
-  EXPECT_FALSE(PSI.isColdBlockNthPercentile(990000, BB3, &BFI));
-
-  EXPECT_FALSE(PSI.isFunctionHotInCallGraphNthPercentile(990000, F, BFI));
-  EXPECT_FALSE(PSI.isFunctionColdInCallGraphNthPercentile(990000, F, BFI));
-}
-
-TEST_F(ProfileSummaryInfoTest, PartialSampleProfWorkingSetSize) {
-  ScalePartialSampleProfileWorkingSetSize.setValue(true);
-
-  // With PartialProfileRatio unset (zero.)
-  auto M1 = makeLLVMModule("SampleProfile", /*NumCounts*/ 3,
-                           /*IsPartialProfile*/ 1,
-                           /*PartialProfileRatio*/ 0.0,
-                           /*HotNumCounts*/ 3, /*ColdNumCounts*/ 10);
-  ProfileSummaryInfo PSI1 = buildPSI(M1.get());
-  EXPECT_TRUE(PSI1.hasProfileSummary());
-  EXPECT_TRUE(PSI1.hasSampleProfile());
-  EXPECT_TRUE(PSI1.hasPartialSampleProfile());
-  EXPECT_FALSE(PSI1.hasHugeWorkingSetSize());
-  EXPECT_FALSE(PSI1.hasLargeWorkingSetSize());
-
-  // With PartialProfileRatio set (non-zero) and a small working set size.
-  auto M2 = makeLLVMModule("SampleProfile", /*NumCounts*/ 27493235,
-                           /*IsPartialProfile*/ 1,
-                           /*PartialProfileRatio*/ 0.00000012,
-                           /*HotNumCounts*/ 3102082,
-                           /*ColdNumCounts*/ 18306149);
-  ProfileSummaryInfo PSI2 = buildPSI(M2.get());
-  EXPECT_TRUE(PSI2.hasProfileSummary());
-  EXPECT_TRUE(PSI2.hasSampleProfile());
-  EXPECT_TRUE(PSI2.hasPartialSampleProfile());
-  EXPECT_FALSE(PSI2.hasHugeWorkingSetSize());
-  EXPECT_FALSE(PSI2.hasLargeWorkingSetSize());
-
-  // With PartialProfileRatio is set (non-zero) and a large working set size.
-  auto M3 = makeLLVMModule("SampleProfile", /*NumCounts*/ 27493235,
-                           /*IsPartialProfile*/ 1,
-                           /*PartialProfileRatio*/ 0.9,
-                           /*HotNumCounts*/ 3102082,
-                           /*ColdNumCounts*/ 18306149);
-  ProfileSummaryInfo PSI3 = buildPSI(M3.get());
-  EXPECT_TRUE(PSI3.hasProfileSummary());
-  EXPECT_TRUE(PSI3.hasSampleProfile());
-  EXPECT_TRUE(PSI3.hasPartialSampleProfile());
-  EXPECT_TRUE(PSI3.hasHugeWorkingSetSize());
-  EXPECT_TRUE(PSI3.hasLargeWorkingSetSize());
-}
-
-} // end anonymous namespace
-} // end namespace llvm
diff --git a/gnu/llvm/llvm/unittests/Analysis/ScalarEvolutionTest.cpp b/gnu/llvm/llvm/unittests/Analysis/ScalarEvolutionTest.cpp
deleted file mode 100644
index 2664ffa22fa..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/ScalarEvolutionTest.cpp
+++ /dev/null
@@ -1,1541 +0,0 @@
-//===- ScalarEvolutionsTest.cpp - ScalarEvolution unit tests --------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/Analysis/AssumptionCache.h"
-#include "llvm/Analysis/LoopInfo.h"
-#include "llvm/Analysis/ScalarEvolutionExpressions.h"
-#include "llvm/Analysis/ScalarEvolutionNormalization.h"
-#include "llvm/Analysis/TargetLibraryInfo.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/Dominators.h"
-#include "llvm/IR/GlobalVariable.h"
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/InstIterator.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/LegacyPassManager.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/Verifier.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-
-// We use this fixture to ensure that we clean up ScalarEvolution before
-// deleting the PassManager.
-class ScalarEvolutionsTest : public testing::Test {
-protected:
-  LLVMContext Context;
-  Module M;
-  TargetLibraryInfoImpl TLII;
-  TargetLibraryInfo TLI;
-
-  std::unique_ptr<AssumptionCache> AC;
-  std::unique_ptr<DominatorTree> DT;
-  std::unique_ptr<LoopInfo> LI;
-
-  ScalarEvolutionsTest() : M("", Context), TLII(), TLI(TLII) {}
-
-  ScalarEvolution buildSE(Function &F) {
-    AC.reset(new AssumptionCache(F));
-    DT.reset(new DominatorTree(F));
-    LI.reset(new LoopInfo(*DT));
-    return ScalarEvolution(F, TLI, *AC, *DT, *LI);
-  }
-
-  void runWithSE(
-      Module &M, StringRef FuncName,
-      function_ref<void(Function &F, LoopInfo &LI, ScalarEvolution &SE)> Test) {
-    auto *F = M.getFunction(FuncName);
-    ASSERT_NE(F, nullptr) << "Could not find " << FuncName;
-    ScalarEvolution SE = buildSE(*F);
-    Test(*F, *LI, SE);
-  }
-
-  static Optional<APInt> computeConstantDifference(ScalarEvolution &SE,
-                                                   const SCEV *LHS,
-                                                   const SCEV *RHS) {
-    return SE.computeConstantDifference(LHS, RHS);
-  }
-
-  static bool matchURem(ScalarEvolution &SE, const SCEV *Expr, const SCEV *&LHS,
-                        const SCEV *&RHS) {
-    return SE.matchURem(Expr, LHS, RHS);
-  }
-
-  static bool isImpliedCond(
-      ScalarEvolution &SE, ICmpInst::Predicate Pred, const SCEV *LHS,
-      const SCEV *RHS, ICmpInst::Predicate FoundPred, const SCEV *FoundLHS,
-      const SCEV *FoundRHS) {
-    return SE.isImpliedCond(Pred, LHS, RHS, FoundPred, FoundLHS, FoundRHS);
-  }
-};
-
-TEST_F(ScalarEvolutionsTest, SCEVUnknownRAUW) {
-  FunctionType *FTy = FunctionType::get(Type::getVoidTy(Context),
-                                              std::vector<Type *>(), false);
-  Function *F = Function::Create(FTy, Function::ExternalLinkage, "f", M);
-  BasicBlock *BB = BasicBlock::Create(Context, "entry", F);
-  ReturnInst::Create(Context, nullptr, BB);
-
-  Type *Ty = Type::getInt1Ty(Context);
-  Constant *Init = Constant::getNullValue(Ty);
-  Value *V0 = new GlobalVariable(M, Ty, false, GlobalValue::ExternalLinkage, Init, "V0");
-  Value *V1 = new GlobalVariable(M, Ty, false, GlobalValue::ExternalLinkage, Init, "V1");
-  Value *V2 = new GlobalVariable(M, Ty, false, GlobalValue::ExternalLinkage, Init, "V2");
-
-  ScalarEvolution SE = buildSE(*F);
-
-  const SCEV *S0 = SE.getSCEV(V0);
-  const SCEV *S1 = SE.getSCEV(V1);
-  const SCEV *S2 = SE.getSCEV(V2);
-
-  const SCEV *P0 = SE.getAddExpr(S0, SE.getConstant(S0->getType(), 2));
-  const SCEV *P1 = SE.getAddExpr(S1, SE.getConstant(S0->getType(), 2));
-  const SCEV *P2 = SE.getAddExpr(S2, SE.getConstant(S0->getType(), 2));
-
-  auto *M0 = cast<SCEVAddExpr>(P0);
-  auto *M1 = cast<SCEVAddExpr>(P1);
-  auto *M2 = cast<SCEVAddExpr>(P2);
-
-  EXPECT_EQ(cast<SCEVConstant>(M0->getOperand(0))->getValue()->getZExtValue(),
-            2u);
-  EXPECT_EQ(cast<SCEVConstant>(M1->getOperand(0))->getValue()->getZExtValue(),
-            2u);
-  EXPECT_EQ(cast<SCEVConstant>(M2->getOperand(0))->getValue()->getZExtValue(),
-            2u);
-
-  // Before the RAUWs, these are all pointing to separate values.
-  EXPECT_EQ(cast<SCEVUnknown>(M0->getOperand(1))->getValue(), V0);
-  EXPECT_EQ(cast<SCEVUnknown>(M1->getOperand(1))->getValue(), V1);
-  EXPECT_EQ(cast<SCEVUnknown>(M2->getOperand(1))->getValue(), V2);
-
-  // Do some RAUWs.
-  V2->replaceAllUsesWith(V1);
-  V1->replaceAllUsesWith(V0);
-
-  // After the RAUWs, these should all be pointing to V0.
-  EXPECT_EQ(cast<SCEVUnknown>(M0->getOperand(1))->getValue(), V0);
-  EXPECT_EQ(cast<SCEVUnknown>(M1->getOperand(1))->getValue(), V0);
-  EXPECT_EQ(cast<SCEVUnknown>(M2->getOperand(1))->getValue(), V0);
-}
-
-TEST_F(ScalarEvolutionsTest, SimplifiedPHI) {
-  FunctionType *FTy = FunctionType::get(Type::getVoidTy(Context),
-                                              std::vector<Type *>(), false);
-  Function *F = Function::Create(FTy, Function::ExternalLinkage, "f", M);
-  BasicBlock *EntryBB = BasicBlock::Create(Context, "entry", F);
-  BasicBlock *LoopBB = BasicBlock::Create(Context, "loop", F);
-  BasicBlock *ExitBB = BasicBlock::Create(Context, "exit", F);
-  BranchInst::Create(LoopBB, EntryBB);
-  BranchInst::Create(LoopBB, ExitBB, UndefValue::get(Type::getInt1Ty(Context)),
-                     LoopBB);
-  ReturnInst::Create(Context, nullptr, ExitBB);
-  auto *Ty = Type::getInt32Ty(Context);
-  auto *PN = PHINode::Create(Ty, 2, "", &*LoopBB->begin());
-  PN->addIncoming(Constant::getNullValue(Ty), EntryBB);
-  PN->addIncoming(UndefValue::get(Ty), LoopBB);
-  ScalarEvolution SE = buildSE(*F);
-  auto *S1 = SE.getSCEV(PN);
-  auto *S2 = SE.getSCEV(PN);
-  auto *ZeroConst = SE.getConstant(Ty, 0);
-
-  // At some point, only the first call to getSCEV returned the simplified
-  // SCEVConstant and later calls just returned a SCEVUnknown referencing the
-  // PHI node.
-  EXPECT_EQ(S1, ZeroConst);
-  EXPECT_EQ(S1, S2);
-}
-
-
-static Instruction *getInstructionByName(Function &F, StringRef Name) {
-  for (auto &I : instructions(F))
-    if (I.getName() == Name)
-      return &I;
-  llvm_unreachable("Expected to find instruction!");
-}
-
-static Value *getArgByName(Function &F, StringRef Name) {
-  for (auto &Arg : F.args())
-    if (Arg.getName() == Name)
-      return &Arg;
-  llvm_unreachable("Expected to find instruction!");
-}
-TEST_F(ScalarEvolutionsTest, CommutativeExprOperandOrder) {
-  LLVMContext C;
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M = parseAssemblyString(
-      "target datalayout = \"e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128\" "
-      " "
-      "@var_0 = external global i32, align 4"
-      "@var_1 = external global i32, align 4"
-      "@var_2 = external global i32, align 4"
-      " "
-      "declare i32 @unknown(i32, i32, i32)"
-      " "
-      "define void @f_1(i8* nocapture %arr, i32 %n, i32* %A, i32* %B) "
-      "    local_unnamed_addr { "
-      "entry: "
-      "  %entrycond = icmp sgt i32 %n, 0 "
-      "  br i1 %entrycond, label %loop.ph, label %for.end "
-      " "
-      "loop.ph: "
-      "  %a = load i32, i32* %A, align 4 "
-      "  %b = load i32, i32* %B, align 4 "
-      "  %mul = mul nsw i32 %b, %a "
-      "  %iv0.init = getelementptr inbounds i8, i8* %arr, i32 %mul "
-      "  br label %loop "
-      " "
-      "loop: "
-      "  %iv0 = phi i8* [ %iv0.inc, %loop ], [ %iv0.init, %loop.ph ] "
-      "  %iv1 = phi i32 [ %iv1.inc, %loop ], [ 0, %loop.ph ] "
-      "  %conv = trunc i32 %iv1 to i8 "
-      "  store i8 %conv, i8* %iv0, align 1 "
-      "  %iv0.inc = getelementptr inbounds i8, i8* %iv0, i32 %b "
-      "  %iv1.inc = add nuw nsw i32 %iv1, 1 "
-      "  %exitcond = icmp eq i32 %iv1.inc, %n "
-      "  br i1 %exitcond, label %for.end.loopexit, label %loop "
-      " "
-      "for.end.loopexit: "
-      "  br label %for.end "
-      " "
-      "for.end: "
-      "  ret void "
-      "} "
-      " "
-      "define void @f_2(i32* %X, i32* %Y, i32* %Z) { "
-      "  %x = load i32, i32* %X "
-      "  %y = load i32, i32* %Y "
-      "  %z = load i32, i32* %Z "
-      "  ret void "
-      "} "
-      " "
-      "define void @f_3() { "
-      "  %x = load i32, i32* @var_0"
-      "  %y = load i32, i32* @var_1"
-      "  %z = load i32, i32* @var_2"
-      "  ret void"
-      "} "
-      " "
-      "define void @f_4(i32 %a, i32 %b, i32 %c) { "
-      "  %x = call i32 @unknown(i32 %a, i32 %b, i32 %c)"
-      "  %y = call i32 @unknown(i32 %b, i32 %c, i32 %a)"
-      "  %z = call i32 @unknown(i32 %c, i32 %a, i32 %b)"
-      "  ret void"
-      "} "
-      ,
-      Err, C);
-
-  assert(M && "Could not parse module?");
-  assert(!verifyModule(*M) && "Must have been well formed!");
-
-  runWithSE(*M, "f_1", [&](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-    auto *IV0 = getInstructionByName(F, "iv0");
-    auto *IV0Inc = getInstructionByName(F, "iv0.inc");
-
-    auto *FirstExprForIV0 = SE.getSCEV(IV0);
-    auto *FirstExprForIV0Inc = SE.getSCEV(IV0Inc);
-    auto *SecondExprForIV0 = SE.getSCEV(IV0);
-
-    EXPECT_TRUE(isa<SCEVAddRecExpr>(FirstExprForIV0));
-    EXPECT_TRUE(isa<SCEVAddRecExpr>(FirstExprForIV0Inc));
-    EXPECT_TRUE(isa<SCEVAddRecExpr>(SecondExprForIV0));
-  });
-
-  auto CheckCommutativeMulExprs = [&](ScalarEvolution &SE, const SCEV *A,
-                                      const SCEV *B, const SCEV *C) {
-    EXPECT_EQ(SE.getMulExpr(A, B), SE.getMulExpr(B, A));
-    EXPECT_EQ(SE.getMulExpr(B, C), SE.getMulExpr(C, B));
-    EXPECT_EQ(SE.getMulExpr(A, C), SE.getMulExpr(C, A));
-
-    SmallVector<const SCEV *, 3> Ops0 = {A, B, C};
-    SmallVector<const SCEV *, 3> Ops1 = {A, C, B};
-    SmallVector<const SCEV *, 3> Ops2 = {B, A, C};
-    SmallVector<const SCEV *, 3> Ops3 = {B, C, A};
-    SmallVector<const SCEV *, 3> Ops4 = {C, B, A};
-    SmallVector<const SCEV *, 3> Ops5 = {C, A, B};
-
-    auto *Mul0 = SE.getMulExpr(Ops0);
-    auto *Mul1 = SE.getMulExpr(Ops1);
-    auto *Mul2 = SE.getMulExpr(Ops2);
-    auto *Mul3 = SE.getMulExpr(Ops3);
-    auto *Mul4 = SE.getMulExpr(Ops4);
-    auto *Mul5 = SE.getMulExpr(Ops5);
-
-    EXPECT_EQ(Mul0, Mul1) << "Expected " << *Mul0 << " == " << *Mul1;
-    EXPECT_EQ(Mul1, Mul2) << "Expected " << *Mul1 << " == " << *Mul2;
-    EXPECT_EQ(Mul2, Mul3) << "Expected " << *Mul2 << " == " << *Mul3;
-    EXPECT_EQ(Mul3, Mul4) << "Expected " << *Mul3 << " == " << *Mul4;
-    EXPECT_EQ(Mul4, Mul5) << "Expected " << *Mul4 << " == " << *Mul5;
-  };
-
-  for (StringRef FuncName : {"f_2", "f_3", "f_4"})
-    runWithSE(
-        *M, FuncName, [&](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-          CheckCommutativeMulExprs(SE, SE.getSCEV(getInstructionByName(F, "x")),
-                                   SE.getSCEV(getInstructionByName(F, "y")),
-                                   SE.getSCEV(getInstructionByName(F, "z")));
-        });
-}
-
-TEST_F(ScalarEvolutionsTest, CompareSCEVComplexity) {
-  FunctionType *FTy =
-      FunctionType::get(Type::getVoidTy(Context), std::vector<Type *>(), false);
-  Function *F = Function::Create(FTy, Function::ExternalLinkage, "f", M);
-  BasicBlock *EntryBB = BasicBlock::Create(Context, "entry", F);
-  BasicBlock *LoopBB = BasicBlock::Create(Context, "bb1", F);
-  BranchInst::Create(LoopBB, EntryBB);
-
-  auto *Ty = Type::getInt32Ty(Context);
-  SmallVector<Instruction*, 8> Muls(8), Acc(8), NextAcc(8);
-
-  Acc[0] = PHINode::Create(Ty, 2, "", LoopBB);
-  Acc[1] = PHINode::Create(Ty, 2, "", LoopBB);
-  Acc[2] = PHINode::Create(Ty, 2, "", LoopBB);
-  Acc[3] = PHINode::Create(Ty, 2, "", LoopBB);
-  Acc[4] = PHINode::Create(Ty, 2, "", LoopBB);
-  Acc[5] = PHINode::Create(Ty, 2, "", LoopBB);
-  Acc[6] = PHINode::Create(Ty, 2, "", LoopBB);
-  Acc[7] = PHINode::Create(Ty, 2, "", LoopBB);
-
-  for (int i = 0; i < 20; i++) {
-    Muls[0] = BinaryOperator::CreateMul(Acc[0], Acc[0], "", LoopBB);
-    NextAcc[0] = BinaryOperator::CreateAdd(Muls[0], Acc[4], "", LoopBB);
-    Muls[1] = BinaryOperator::CreateMul(Acc[1], Acc[1], "", LoopBB);
-    NextAcc[1] = BinaryOperator::CreateAdd(Muls[1], Acc[5], "", LoopBB);
-    Muls[2] = BinaryOperator::CreateMul(Acc[2], Acc[2], "", LoopBB);
-    NextAcc[2] = BinaryOperator::CreateAdd(Muls[2], Acc[6], "", LoopBB);
-    Muls[3] = BinaryOperator::CreateMul(Acc[3], Acc[3], "", LoopBB);
-    NextAcc[3] = BinaryOperator::CreateAdd(Muls[3], Acc[7], "", LoopBB);
-
-    Muls[4] = BinaryOperator::CreateMul(Acc[4], Acc[4], "", LoopBB);
-    NextAcc[4] = BinaryOperator::CreateAdd(Muls[4], Acc[0], "", LoopBB);
-    Muls[5] = BinaryOperator::CreateMul(Acc[5], Acc[5], "", LoopBB);
-    NextAcc[5] = BinaryOperator::CreateAdd(Muls[5], Acc[1], "", LoopBB);
-    Muls[6] = BinaryOperator::CreateMul(Acc[6], Acc[6], "", LoopBB);
-    NextAcc[6] = BinaryOperator::CreateAdd(Muls[6], Acc[2], "", LoopBB);
-    Muls[7] = BinaryOperator::CreateMul(Acc[7], Acc[7], "", LoopBB);
-    NextAcc[7] = BinaryOperator::CreateAdd(Muls[7], Acc[3], "", LoopBB);
-    Acc = NextAcc;
-  }
-
-  auto II = LoopBB->begin();
-  for (int i = 0; i < 8; i++) {
-    PHINode *Phi = cast<PHINode>(&*II++);
-    Phi->addIncoming(Acc[i], LoopBB);
-    Phi->addIncoming(UndefValue::get(Ty), EntryBB);
-  }
-
-  BasicBlock *ExitBB = BasicBlock::Create(Context, "bb2", F);
-  BranchInst::Create(LoopBB, ExitBB, UndefValue::get(Type::getInt1Ty(Context)),
-                     LoopBB);
-
-  Acc[0] = BinaryOperator::CreateAdd(Acc[0], Acc[1], "", ExitBB);
-  Acc[1] = BinaryOperator::CreateAdd(Acc[2], Acc[3], "", ExitBB);
-  Acc[2] = BinaryOperator::CreateAdd(Acc[4], Acc[5], "", ExitBB);
-  Acc[3] = BinaryOperator::CreateAdd(Acc[6], Acc[7], "", ExitBB);
-  Acc[0] = BinaryOperator::CreateAdd(Acc[0], Acc[1], "", ExitBB);
-  Acc[1] = BinaryOperator::CreateAdd(Acc[2], Acc[3], "", ExitBB);
-  Acc[0] = BinaryOperator::CreateAdd(Acc[0], Acc[1], "", ExitBB);
-
-  ReturnInst::Create(Context, nullptr, ExitBB);
-
-  ScalarEvolution SE = buildSE(*F);
-
-  EXPECT_NE(nullptr, SE.getSCEV(Acc[0]));
-}
-
-TEST_F(ScalarEvolutionsTest, CompareValueComplexity) {
-  IntegerType *IntPtrTy = M.getDataLayout().getIntPtrType(Context);
-  PointerType *IntPtrPtrTy = IntPtrTy->getPointerTo();
-
-  FunctionType *FTy =
-      FunctionType::get(Type::getVoidTy(Context), {IntPtrTy, IntPtrTy}, false);
-  Function *F = Function::Create(FTy, Function::ExternalLinkage, "f", M);
-  BasicBlock *EntryBB = BasicBlock::Create(Context, "entry", F);
-
-  Value *X = &*F->arg_begin();
-  Value *Y = &*std::next(F->arg_begin());
-
-  const int ValueDepth = 10;
-  for (int i = 0; i < ValueDepth; i++) {
-    X = new LoadInst(IntPtrTy, new IntToPtrInst(X, IntPtrPtrTy, "", EntryBB),
-                     "",
-                     /*isVolatile*/ false, EntryBB);
-    Y = new LoadInst(IntPtrTy, new IntToPtrInst(Y, IntPtrPtrTy, "", EntryBB),
-                     "",
-                     /*isVolatile*/ false, EntryBB);
-  }
-
-  auto *MulA = BinaryOperator::CreateMul(X, Y, "", EntryBB);
-  auto *MulB = BinaryOperator::CreateMul(Y, X, "", EntryBB);
-  ReturnInst::Create(Context, nullptr, EntryBB);
-
-  // This test isn't checking for correctness.  Today making A and B resolve to
-  // the same SCEV would require deeper searching in CompareValueComplexity,
-  // which will slow down compilation.  However, this test can fail (with LLVM's
-  // behavior still being correct) if we ever have a smarter
-  // CompareValueComplexity that is both fast and more accurate.
-
-  ScalarEvolution SE = buildSE(*F);
-  auto *A = SE.getSCEV(MulA);
-  auto *B = SE.getSCEV(MulB);
-  EXPECT_NE(A, B);
-}
-
-TEST_F(ScalarEvolutionsTest, SCEVAddExpr) {
-  Type *Ty32 = Type::getInt32Ty(Context);
-  Type *ArgTys[] = {Type::getInt64Ty(Context), Ty32, Ty32, Ty32, Ty32, Ty32};
-
-  FunctionType *FTy =
-      FunctionType::get(Type::getVoidTy(Context), ArgTys, false);
-  Function *F = Function::Create(FTy, Function::ExternalLinkage, "f", M);
-
-  Argument *A1 = &*F->arg_begin();
-  Argument *A2 = &*(std::next(F->arg_begin()));
-  BasicBlock *EntryBB = BasicBlock::Create(Context, "entry", F);
-
-  Instruction *Trunc = CastInst::CreateTruncOrBitCast(A1, Ty32, "", EntryBB);
-  Instruction *Mul1 = BinaryOperator::CreateMul(Trunc, A2, "", EntryBB);
-  Instruction *Add1 = BinaryOperator::CreateAdd(Mul1, Trunc, "", EntryBB);
-  Mul1 = BinaryOperator::CreateMul(Add1, Trunc, "", EntryBB);
-  Instruction *Add2 = BinaryOperator::CreateAdd(Mul1, Add1, "", EntryBB);
-  // FIXME: The size of this is arbitrary and doesn't seem to change the
-  // result, but SCEV will do quadratic work for these so a large number here
-  // will be extremely slow. We should revisit what and how this is testing
-  // SCEV.
-  for (int i = 0; i < 10; i++) {
-    Mul1 = BinaryOperator::CreateMul(Add2, Add1, "", EntryBB);
-    Add1 = Add2;
-    Add2 = BinaryOperator::CreateAdd(Mul1, Add1, "", EntryBB);
-  }
-
-  ReturnInst::Create(Context, nullptr, EntryBB);
-  ScalarEvolution SE = buildSE(*F);
-  EXPECT_NE(nullptr, SE.getSCEV(Mul1));
-
-  Argument *A3 = &*(std::next(F->arg_begin(), 2));
-  Argument *A4 = &*(std::next(F->arg_begin(), 3));
-  Argument *A5 = &*(std::next(F->arg_begin(), 4));
-  Argument *A6 = &*(std::next(F->arg_begin(), 5));
-
-  auto *AddWithNUW = cast<SCEVAddExpr>(SE.getAddExpr(
-      SE.getAddExpr(SE.getSCEV(A2), SE.getSCEV(A3), SCEV::FlagNUW),
-      SE.getConstant(APInt(/*numBits=*/32, 5)), SCEV::FlagNUW));
-  EXPECT_EQ(AddWithNUW->getNumOperands(), 3u);
-  EXPECT_EQ(AddWithNUW->getNoWrapFlags(), SCEV::FlagNUW);
-
-  auto *AddWithAnyWrap =
-      SE.getAddExpr(SE.getSCEV(A3), SE.getSCEV(A4), SCEV::FlagAnyWrap);
-  auto *AddWithAnyWrapNUW = cast<SCEVAddExpr>(
-      SE.getAddExpr(AddWithAnyWrap, SE.getSCEV(A5), SCEV::FlagNUW));
-  EXPECT_EQ(AddWithAnyWrapNUW->getNumOperands(), 3u);
-  EXPECT_EQ(AddWithAnyWrapNUW->getNoWrapFlags(), SCEV::FlagAnyWrap);
-
-  auto *AddWithNSW = SE.getAddExpr(
-      SE.getSCEV(A2), SE.getConstant(APInt(32, 99)), SCEV::FlagNSW);
-  auto *AddWithNSW_NUW = cast<SCEVAddExpr>(
-      SE.getAddExpr(AddWithNSW, SE.getSCEV(A5), SCEV::FlagNUW));
-  EXPECT_EQ(AddWithNSW_NUW->getNumOperands(), 3u);
-  EXPECT_EQ(AddWithNSW_NUW->getNoWrapFlags(), SCEV::FlagAnyWrap);
-
-  auto *AddWithNSWNUW =
-      SE.getAddExpr(SE.getSCEV(A2), SE.getSCEV(A4),
-                    ScalarEvolution::setFlags(SCEV::FlagNUW, SCEV::FlagNSW));
-  auto *AddWithNSWNUW_NUW = cast<SCEVAddExpr>(
-      SE.getAddExpr(AddWithNSWNUW, SE.getSCEV(A5), SCEV::FlagNUW));
-  EXPECT_EQ(AddWithNSWNUW_NUW->getNumOperands(), 3u);
-  EXPECT_EQ(AddWithNSWNUW_NUW->getNoWrapFlags(), SCEV::FlagNUW);
-
-  auto *AddWithNSW_NSWNUW = cast<SCEVAddExpr>(
-      SE.getAddExpr(AddWithNSW, SE.getSCEV(A6),
-                    ScalarEvolution::setFlags(SCEV::FlagNUW, SCEV::FlagNSW)));
-  EXPECT_EQ(AddWithNSW_NSWNUW->getNumOperands(), 3u);
-  EXPECT_EQ(AddWithNSW_NSWNUW->getNoWrapFlags(), SCEV::FlagAnyWrap);
-}
-
-static Instruction &GetInstByName(Function &F, StringRef Name) {
-  for (auto &I : instructions(F))
-    if (I.getName() == Name)
-      return I;
-  llvm_unreachable("Could not find instructions!");
-}
-
-TEST_F(ScalarEvolutionsTest, SCEVNormalization) {
-  LLVMContext C;
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M = parseAssemblyString(
-      "target datalayout = \"e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128\" "
-      " "
-      "@var_0 = external global i32, align 4"
-      "@var_1 = external global i32, align 4"
-      "@var_2 = external global i32, align 4"
-      " "
-      "declare i32 @unknown(i32, i32, i32)"
-      " "
-      "define void @f_1(i8* nocapture %arr, i32 %n, i32* %A, i32* %B) "
-      "    local_unnamed_addr { "
-      "entry: "
-      "  br label %loop.ph "
-      " "
-      "loop.ph: "
-      "  br label %loop "
-      " "
-      "loop: "
-      "  %iv0 = phi i32 [ %iv0.inc, %loop ], [ 0, %loop.ph ] "
-      "  %iv1 = phi i32 [ %iv1.inc, %loop ], [ -2147483648, %loop.ph ] "
-      "  %iv0.inc = add i32 %iv0, 1 "
-      "  %iv1.inc = add i32 %iv1, 3 "
-      "  br i1 undef, label %for.end.loopexit, label %loop "
-      " "
-      "for.end.loopexit: "
-      "  ret void "
-      "} "
-      " "
-      "define void @f_2(i32 %a, i32 %b, i32 %c, i32 %d) "
-      "    local_unnamed_addr { "
-      "entry: "
-      "  br label %loop_0 "
-      " "
-      "loop_0: "
-      "  br i1 undef, label %loop_0, label %loop_1 "
-      " "
-      "loop_1: "
-      "  br i1 undef, label %loop_2, label %loop_1 "
-      " "
-      " "
-      "loop_2: "
-      "  br i1 undef, label %end, label %loop_2 "
-      " "
-      "end: "
-      "  ret void "
-      "} "
-      ,
-      Err, C);
-
-  assert(M && "Could not parse module?");
-  assert(!verifyModule(*M) && "Must have been well formed!");
-
-  runWithSE(*M, "f_1", [&](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-    auto &I0 = GetInstByName(F, "iv0");
-    auto &I1 = *I0.getNextNode();
-
-    auto *S0 = cast<SCEVAddRecExpr>(SE.getSCEV(&I0));
-    PostIncLoopSet Loops;
-    Loops.insert(S0->getLoop());
-    auto *N0 = normalizeForPostIncUse(S0, Loops, SE);
-    auto *D0 = denormalizeForPostIncUse(N0, Loops, SE);
-    EXPECT_EQ(S0, D0) << *S0 << " " << *D0;
-
-    auto *S1 = cast<SCEVAddRecExpr>(SE.getSCEV(&I1));
-    Loops.clear();
-    Loops.insert(S1->getLoop());
-    auto *N1 = normalizeForPostIncUse(S1, Loops, SE);
-    auto *D1 = denormalizeForPostIncUse(N1, Loops, SE);
-    EXPECT_EQ(S1, D1) << *S1 << " " << *D1;
-  });
-
-  runWithSE(*M, "f_2", [&](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-    auto *L2 = *LI.begin();
-    auto *L1 = *std::next(LI.begin());
-    auto *L0 = *std::next(LI.begin(), 2);
-
-    auto GetAddRec = [&SE](const Loop *L, std::initializer_list<const SCEV *> Ops) {
-      SmallVector<const SCEV *, 4> OpsCopy(Ops);
-      return SE.getAddRecExpr(OpsCopy, L, SCEV::FlagAnyWrap);
-    };
-
-    auto GetAdd = [&SE](std::initializer_list<const SCEV *> Ops) {
-      SmallVector<const SCEV *, 4> OpsCopy(Ops);
-      return SE.getAddExpr(OpsCopy, SCEV::FlagAnyWrap);
-    };
-
-    // We first populate the AddRecs vector with a few "interesting" SCEV
-    // expressions, and then we go through the list and assert that each
-    // expression in it has an invertible normalization.
-
-    std::vector<const SCEV *> Exprs;
-    {
-      const SCEV *V0 = SE.getSCEV(&*F.arg_begin());
-      const SCEV *V1 = SE.getSCEV(&*std::next(F.arg_begin(), 1));
-      const SCEV *V2 = SE.getSCEV(&*std::next(F.arg_begin(), 2));
-      const SCEV *V3 = SE.getSCEV(&*std::next(F.arg_begin(), 3));
-
-      Exprs.push_back(GetAddRec(L0, {V0}));             // 0
-      Exprs.push_back(GetAddRec(L0, {V0, V1}));         // 1
-      Exprs.push_back(GetAddRec(L0, {V0, V1, V2}));     // 2
-      Exprs.push_back(GetAddRec(L0, {V0, V1, V2, V3})); // 3
-
-      Exprs.push_back(
-          GetAddRec(L1, {Exprs[1], Exprs[2], Exprs[3], Exprs[0]})); // 4
-      Exprs.push_back(
-          GetAddRec(L1, {Exprs[1], Exprs[2], Exprs[0], Exprs[3]})); // 5
-      Exprs.push_back(
-          GetAddRec(L1, {Exprs[1], Exprs[3], Exprs[3], Exprs[1]})); // 6
-
-      Exprs.push_back(GetAdd({Exprs[6], Exprs[3], V2})); // 7
-
-      Exprs.push_back(
-          GetAddRec(L2, {Exprs[4], Exprs[3], Exprs[3], Exprs[5]})); // 8
-
-      Exprs.push_back(
-          GetAddRec(L2, {Exprs[4], Exprs[6], Exprs[7], Exprs[3], V0})); // 9
-    }
-
-    std::vector<PostIncLoopSet> LoopSets;
-    for (int i = 0; i < 8; i++) {
-      LoopSets.emplace_back();
-      if (i & 1)
-        LoopSets.back().insert(L0);
-      if (i & 2)
-        LoopSets.back().insert(L1);
-      if (i & 4)
-        LoopSets.back().insert(L2);
-    }
-
-    for (const auto &LoopSet : LoopSets)
-      for (auto *S : Exprs) {
-        {
-          auto *N = llvm::normalizeForPostIncUse(S, LoopSet, SE);
-          auto *D = llvm::denormalizeForPostIncUse(N, LoopSet, SE);
-
-          // Normalization and then denormalizing better give us back the same
-          // value.
-          EXPECT_EQ(S, D) << "S = " << *S << "  D = " << *D << " N = " << *N;
-        }
-        {
-          auto *D = llvm::denormalizeForPostIncUse(S, LoopSet, SE);
-          auto *N = llvm::normalizeForPostIncUse(D, LoopSet, SE);
-
-          // Denormalization and then normalizing better give us back the same
-          // value.
-          EXPECT_EQ(S, N) << "S = " << *S << "  N = " << *N;
-        }
-      }
-  });
-}
-
-// Expect the call of getZeroExtendExpr will not cost exponential time.
-TEST_F(ScalarEvolutionsTest, SCEVZeroExtendExpr) {
-  LLVMContext C;
-  SMDiagnostic Err;
-
-  // Generate a function like below:
-  // define void @foo() {
-  // entry:
-  //   br label %for.cond
-  //
-  // for.cond:
-  //   %0 = phi i64 [ 100, %entry ], [ %dec, %for.inc ]
-  //   %cmp = icmp sgt i64 %0, 90
-  //   br i1 %cmp, label %for.inc, label %for.cond1
-  //
-  // for.inc:
-  //   %dec = add nsw i64 %0, -1
-  //   br label %for.cond
-  //
-  // for.cond1:
-  //   %1 = phi i64 [ 100, %for.cond ], [ %dec5, %for.inc2 ]
-  //   %cmp3 = icmp sgt i64 %1, 90
-  //   br i1 %cmp3, label %for.inc2, label %for.cond4
-  //
-  // for.inc2:
-  //   %dec5 = add nsw i64 %1, -1
-  //   br label %for.cond1
-  //
-  // ......
-  //
-  // for.cond89:
-  //   %19 = phi i64 [ 100, %for.cond84 ], [ %dec94, %for.inc92 ]
-  //   %cmp93 = icmp sgt i64 %19, 90
-  //   br i1 %cmp93, label %for.inc92, label %for.end
-  //
-  // for.inc92:
-  //   %dec94 = add nsw i64 %19, -1
-  //   br label %for.cond89
-  //
-  // for.end:
-  //   %gep = getelementptr i8, i8* null, i64 %dec
-  //   %gep6 = getelementptr i8, i8* %gep, i64 %dec5
-  //   ......
-  //   %gep95 = getelementptr i8, i8* %gep91, i64 %dec94
-  //   ret void
-  // }
-  FunctionType *FTy = FunctionType::get(Type::getVoidTy(Context), {}, false);
-  Function *F = Function::Create(FTy, Function::ExternalLinkage, "foo", M);
-
-  BasicBlock *EntryBB = BasicBlock::Create(Context, "entry", F);
-  BasicBlock *CondBB = BasicBlock::Create(Context, "for.cond", F);
-  BasicBlock *EndBB = BasicBlock::Create(Context, "for.end", F);
-  BranchInst::Create(CondBB, EntryBB);
-  BasicBlock *PrevBB = EntryBB;
-
-  Type *I64Ty = Type::getInt64Ty(Context);
-  Type *I8Ty = Type::getInt8Ty(Context);
-  Type *I8PtrTy = Type::getInt8PtrTy(Context);
-  Value *Accum = Constant::getNullValue(I8PtrTy);
-  int Iters = 20;
-  for (int i = 0; i < Iters; i++) {
-    BasicBlock *IncBB = BasicBlock::Create(Context, "for.inc", F, EndBB);
-    auto *PN = PHINode::Create(I64Ty, 2, "", CondBB);
-    PN->addIncoming(ConstantInt::get(Context, APInt(64, 100)), PrevBB);
-    auto *Cmp = CmpInst::Create(Instruction::ICmp, CmpInst::ICMP_SGT, PN,
-                                ConstantInt::get(Context, APInt(64, 90)), "cmp",
-                                CondBB);
-    BasicBlock *NextBB;
-    if (i != Iters - 1)
-      NextBB = BasicBlock::Create(Context, "for.cond", F, EndBB);
-    else
-      NextBB = EndBB;
-    BranchInst::Create(IncBB, NextBB, Cmp, CondBB);
-    auto *Dec = BinaryOperator::CreateNSWAdd(
-        PN, ConstantInt::get(Context, APInt(64, -1)), "dec", IncBB);
-    PN->addIncoming(Dec, IncBB);
-    BranchInst::Create(CondBB, IncBB);
-
-    Accum = GetElementPtrInst::Create(I8Ty, Accum, PN, "gep", EndBB);
-
-    PrevBB = CondBB;
-    CondBB = NextBB;
-  }
-  ReturnInst::Create(Context, nullptr, EndBB);
-  ScalarEvolution SE = buildSE(*F);
-  const SCEV *S = SE.getSCEV(Accum);
-  S = SE.getLosslessPtrToIntExpr(S);
-  Type *I128Ty = Type::getInt128Ty(Context);
-  SE.getZeroExtendExpr(S, I128Ty);
-}
-
-// Make sure that SCEV invalidates exit limits after invalidating the values it
-// depends on when we forget a loop.
-TEST_F(ScalarEvolutionsTest, SCEVExitLimitForgetLoop) {
-  /*
-   * Create the following code:
-   * func(i64 addrspace(10)* %arg)
-   * top:
-   *  br label %L.ph
-   * L.ph:
-   *  br label %L
-   * L:
-   *  %phi = phi i64 [i64 0, %L.ph], [ %add, %L2 ]
-   *  %add = add i64 %phi2, 1
-   *  %cond = icmp slt i64 %add, 1000; then becomes 2000.
-   *  br i1 %cond, label %post, label %L2
-   * post:
-   *  ret void
-   *
-   */
-
-  // Create a module with non-integral pointers in it's datalayout
-  Module NIM("nonintegral", Context);
-  std::string DataLayout = M.getDataLayoutStr();
-  if (!DataLayout.empty())
-    DataLayout += "-";
-  DataLayout += "ni:10";
-  NIM.setDataLayout(DataLayout);
-
-  Type *T_int64 = Type::getInt64Ty(Context);
-  Type *T_pint64 = T_int64->getPointerTo(10);
-
-  FunctionType *FTy =
-      FunctionType::get(Type::getVoidTy(Context), {T_pint64}, false);
-  Function *F = Function::Create(FTy, Function::ExternalLinkage, "foo", NIM);
-
-  BasicBlock *Top = BasicBlock::Create(Context, "top", F);
-  BasicBlock *LPh = BasicBlock::Create(Context, "L.ph", F);
-  BasicBlock *L = BasicBlock::Create(Context, "L", F);
-  BasicBlock *Post = BasicBlock::Create(Context, "post", F);
-
-  IRBuilder<> Builder(Top);
-  Builder.CreateBr(LPh);
-
-  Builder.SetInsertPoint(LPh);
-  Builder.CreateBr(L);
-
-  Builder.SetInsertPoint(L);
-  PHINode *Phi = Builder.CreatePHI(T_int64, 2);
-  auto *Add = cast<Instruction>(
-      Builder.CreateAdd(Phi, ConstantInt::get(T_int64, 1), "add"));
-  auto *Limit = ConstantInt::get(T_int64, 1000);
-  auto *Cond = cast<Instruction>(
-      Builder.CreateICmp(ICmpInst::ICMP_SLT, Add, Limit, "cond"));
-  auto *Br = cast<Instruction>(Builder.CreateCondBr(Cond, L, Post));
-  Phi->addIncoming(ConstantInt::get(T_int64, 0), LPh);
-  Phi->addIncoming(Add, L);
-
-  Builder.SetInsertPoint(Post);
-  Builder.CreateRetVoid();
-
-  ScalarEvolution SE = buildSE(*F);
-  auto *Loop = LI->getLoopFor(L);
-  const SCEV *EC = SE.getBackedgeTakenCount(Loop);
-  EXPECT_FALSE(isa<SCEVCouldNotCompute>(EC));
-  EXPECT_TRUE(isa<SCEVConstant>(EC));
-  EXPECT_EQ(cast<SCEVConstant>(EC)->getAPInt().getLimitedValue(), 999u);
-
-  // The add recurrence {5,+,1} does not correspond to any PHI in the IR, and
-  // that is relevant to this test.
-  auto *Five = SE.getConstant(APInt(/*numBits=*/64, 5));
-  auto *AR =
-      SE.getAddRecExpr(Five, SE.getOne(T_int64), Loop, SCEV::FlagAnyWrap);
-  const SCEV *ARAtLoopExit = SE.getSCEVAtScope(AR, nullptr);
-  EXPECT_FALSE(isa<SCEVCouldNotCompute>(ARAtLoopExit));
-  EXPECT_TRUE(isa<SCEVConstant>(ARAtLoopExit));
-  EXPECT_EQ(cast<SCEVConstant>(ARAtLoopExit)->getAPInt().getLimitedValue(),
-            1004u);
-
-  SE.forgetLoop(Loop);
-  Br->eraseFromParent();
-  Cond->eraseFromParent();
-
-  Builder.SetInsertPoint(L);
-  auto *NewCond = Builder.CreateICmp(
-      ICmpInst::ICMP_SLT, Add, ConstantInt::get(T_int64, 2000), "new.cond");
-  Builder.CreateCondBr(NewCond, L, Post);
-  const SCEV *NewEC = SE.getBackedgeTakenCount(Loop);
-  EXPECT_FALSE(isa<SCEVCouldNotCompute>(NewEC));
-  EXPECT_TRUE(isa<SCEVConstant>(NewEC));
-  EXPECT_EQ(cast<SCEVConstant>(NewEC)->getAPInt().getLimitedValue(), 1999u);
-  const SCEV *NewARAtLoopExit = SE.getSCEVAtScope(AR, nullptr);
-  EXPECT_FALSE(isa<SCEVCouldNotCompute>(NewARAtLoopExit));
-  EXPECT_TRUE(isa<SCEVConstant>(NewARAtLoopExit));
-  EXPECT_EQ(cast<SCEVConstant>(NewARAtLoopExit)->getAPInt().getLimitedValue(),
-            2004u);
-}
-
-// Make sure that SCEV invalidates exit limits after invalidating the values it
-// depends on when we forget a value.
-TEST_F(ScalarEvolutionsTest, SCEVExitLimitForgetValue) {
-  /*
-   * Create the following code:
-   * func(i64 addrspace(10)* %arg)
-   * top:
-   *  br label %L.ph
-   * L.ph:
-   *  %load = load i64 addrspace(10)* %arg
-   *  br label %L
-   * L:
-   *  %phi = phi i64 [i64 0, %L.ph], [ %add, %L2 ]
-   *  %add = add i64 %phi2, 1
-   *  %cond = icmp slt i64 %add, %load ; then becomes 2000.
-   *  br i1 %cond, label %post, label %L2
-   * post:
-   *  ret void
-   *
-   */
-
-  // Create a module with non-integral pointers in it's datalayout
-  Module NIM("nonintegral", Context);
-  std::string DataLayout = M.getDataLayoutStr();
-  if (!DataLayout.empty())
-    DataLayout += "-";
-  DataLayout += "ni:10";
-  NIM.setDataLayout(DataLayout);
-
-  Type *T_int64 = Type::getInt64Ty(Context);
-  Type *T_pint64 = T_int64->getPointerTo(10);
-
-  FunctionType *FTy =
-      FunctionType::get(Type::getVoidTy(Context), {T_pint64}, false);
-  Function *F = Function::Create(FTy, Function::ExternalLinkage, "foo", NIM);
-
-  Argument *Arg = &*F->arg_begin();
-
-  BasicBlock *Top = BasicBlock::Create(Context, "top", F);
-  BasicBlock *LPh = BasicBlock::Create(Context, "L.ph", F);
-  BasicBlock *L = BasicBlock::Create(Context, "L", F);
-  BasicBlock *Post = BasicBlock::Create(Context, "post", F);
-
-  IRBuilder<> Builder(Top);
-  Builder.CreateBr(LPh);
-
-  Builder.SetInsertPoint(LPh);
-  auto *Load = cast<Instruction>(Builder.CreateLoad(T_int64, Arg, "load"));
-  Builder.CreateBr(L);
-
-  Builder.SetInsertPoint(L);
-  PHINode *Phi = Builder.CreatePHI(T_int64, 2);
-  auto *Add = cast<Instruction>(
-      Builder.CreateAdd(Phi, ConstantInt::get(T_int64, 1), "add"));
-  auto *Cond = cast<Instruction>(
-      Builder.CreateICmp(ICmpInst::ICMP_SLT, Add, Load, "cond"));
-  auto *Br = cast<Instruction>(Builder.CreateCondBr(Cond, L, Post));
-  Phi->addIncoming(ConstantInt::get(T_int64, 0), LPh);
-  Phi->addIncoming(Add, L);
-
-  Builder.SetInsertPoint(Post);
-  Builder.CreateRetVoid();
-
-  ScalarEvolution SE = buildSE(*F);
-  auto *Loop = LI->getLoopFor(L);
-  const SCEV *EC = SE.getBackedgeTakenCount(Loop);
-  EXPECT_FALSE(isa<SCEVCouldNotCompute>(EC));
-  EXPECT_FALSE(isa<SCEVConstant>(EC));
-
-  SE.forgetValue(Load);
-  Br->eraseFromParent();
-  Cond->eraseFromParent();
-  Load->eraseFromParent();
-
-  Builder.SetInsertPoint(L);
-  auto *NewCond = Builder.CreateICmp(
-      ICmpInst::ICMP_SLT, Add, ConstantInt::get(T_int64, 2000), "new.cond");
-  Builder.CreateCondBr(NewCond, L, Post);
-  const SCEV *NewEC = SE.getBackedgeTakenCount(Loop);
-  EXPECT_FALSE(isa<SCEVCouldNotCompute>(NewEC));
-  EXPECT_TRUE(isa<SCEVConstant>(NewEC));
-  EXPECT_EQ(cast<SCEVConstant>(NewEC)->getAPInt().getLimitedValue(), 1999u);
-}
-
-TEST_F(ScalarEvolutionsTest, SCEVAddRecFromPHIwithLargeConstants) {
-  // Reference: https://reviews.llvm.org/D37265
-  // Make sure that SCEV does not blow up when constructing an AddRec
-  // with predicates for a phi with the update pattern:
-  //  (SExt/ZExt ix (Trunc iy (%SymbolicPHI) to ix) to iy) + InvariantAccum
-  // when either the initial value of the Phi or the InvariantAccum are
-  // constants that are too large to fit in an ix but are zero when truncated to
-  // ix.
-  FunctionType *FTy =
-      FunctionType::get(Type::getVoidTy(Context), std::vector<Type *>(), false);
-  Function *F =
-      Function::Create(FTy, Function::ExternalLinkage, "addrecphitest", M);
-
-  /*
-    Create IR:
-    entry:
-     br label %loop
-    loop:
-     %0 = phi i64 [-9223372036854775808, %entry], [%3, %loop]
-     %1 = shl i64 %0, 32
-     %2 = ashr exact i64 %1, 32
-     %3 = add i64 %2, -9223372036854775808
-     br i1 undef, label %exit, label %loop
-    exit:
-     ret void
-   */
-  BasicBlock *EntryBB = BasicBlock::Create(Context, "entry", F);
-  BasicBlock *LoopBB = BasicBlock::Create(Context, "loop", F);
-  BasicBlock *ExitBB = BasicBlock::Create(Context, "exit", F);
-
-  // entry:
-  BranchInst::Create(LoopBB, EntryBB);
-  // loop:
-  auto *MinInt64 =
-      ConstantInt::get(Context, APInt(64, 0x8000000000000000U, true));
-  auto *Int64_32 = ConstantInt::get(Context, APInt(64, 32));
-  auto *Br = BranchInst::Create(
-      LoopBB, ExitBB, UndefValue::get(Type::getInt1Ty(Context)), LoopBB);
-  auto *Phi = PHINode::Create(Type::getInt64Ty(Context), 2, "", Br);
-  auto *Shl = BinaryOperator::CreateShl(Phi, Int64_32, "", Br);
-  auto *AShr = BinaryOperator::CreateExactAShr(Shl, Int64_32, "", Br);
-  auto *Add = BinaryOperator::CreateAdd(AShr, MinInt64, "", Br);
-  Phi->addIncoming(MinInt64, EntryBB);
-  Phi->addIncoming(Add, LoopBB);
-  // exit:
-  ReturnInst::Create(Context, nullptr, ExitBB);
-
-  // Make sure that SCEV doesn't blow up
-  ScalarEvolution SE = buildSE(*F);
-  SCEVUnionPredicate Preds;
-  const SCEV *Expr = SE.getSCEV(Phi);
-  EXPECT_NE(nullptr, Expr);
-  EXPECT_TRUE(isa<SCEVUnknown>(Expr));
-  auto Result = SE.createAddRecFromPHIWithCasts(cast<SCEVUnknown>(Expr));
-}
-
-TEST_F(ScalarEvolutionsTest, SCEVAddRecFromPHIwithLargeConstantAccum) {
-  // Make sure that SCEV does not blow up when constructing an AddRec
-  // with predicates for a phi with the update pattern:
-  //  (SExt/ZExt ix (Trunc iy (%SymbolicPHI) to ix) to iy) + InvariantAccum
-  // when the InvariantAccum is a constant that is too large to fit in an
-  // ix but are zero when truncated to ix, and the initial value of the
-  // phi is not a constant.
-  Type *Int32Ty = Type::getInt32Ty(Context);
-  SmallVector<Type *, 1> Types;
-  Types.push_back(Int32Ty);
-  FunctionType *FTy = FunctionType::get(Type::getVoidTy(Context), Types, false);
-  Function *F =
-      Function::Create(FTy, Function::ExternalLinkage, "addrecphitest", M);
-
-  /*
-    Create IR:
-    define @addrecphitest(i32)
-    entry:
-     br label %loop
-    loop:
-     %1 = phi i32 [%0, %entry], [%4, %loop]
-     %2 = shl i32 %1, 16
-     %3 = ashr exact i32 %2, 16
-     %4 = add i32 %3, -2147483648
-     br i1 undef, label %exit, label %loop
-    exit:
-     ret void
-   */
-  BasicBlock *EntryBB = BasicBlock::Create(Context, "entry", F);
-  BasicBlock *LoopBB = BasicBlock::Create(Context, "loop", F);
-  BasicBlock *ExitBB = BasicBlock::Create(Context, "exit", F);
-
-  // entry:
-  BranchInst::Create(LoopBB, EntryBB);
-  // loop:
-  auto *MinInt32 = ConstantInt::get(Context, APInt(32, 0x80000000U, true));
-  auto *Int32_16 = ConstantInt::get(Context, APInt(32, 16));
-  auto *Br = BranchInst::Create(
-      LoopBB, ExitBB, UndefValue::get(Type::getInt1Ty(Context)), LoopBB);
-  auto *Phi = PHINode::Create(Int32Ty, 2, "", Br);
-  auto *Shl = BinaryOperator::CreateShl(Phi, Int32_16, "", Br);
-  auto *AShr = BinaryOperator::CreateExactAShr(Shl, Int32_16, "", Br);
-  auto *Add = BinaryOperator::CreateAdd(AShr, MinInt32, "", Br);
-  auto *Arg = &*(F->arg_begin());
-  Phi->addIncoming(Arg, EntryBB);
-  Phi->addIncoming(Add, LoopBB);
-  // exit:
-  ReturnInst::Create(Context, nullptr, ExitBB);
-
-  // Make sure that SCEV doesn't blow up
-  ScalarEvolution SE = buildSE(*F);
-  SCEVUnionPredicate Preds;
-  const SCEV *Expr = SE.getSCEV(Phi);
-  EXPECT_NE(nullptr, Expr);
-  EXPECT_TRUE(isa<SCEVUnknown>(Expr));
-  auto Result = SE.createAddRecFromPHIWithCasts(cast<SCEVUnknown>(Expr));
-}
-
-TEST_F(ScalarEvolutionsTest, SCEVFoldSumOfTruncs) {
-  // Verify that the following SCEV gets folded to a zero:
-  //  (-1 * (trunc i64 (-1 * %0) to i32)) + (-1 * (trunc i64 %0 to i32)
-  Type *ArgTy = Type::getInt64Ty(Context);
-  Type *Int32Ty = Type::getInt32Ty(Context);
-  SmallVector<Type *, 1> Types;
-  Types.push_back(ArgTy);
-  FunctionType *FTy = FunctionType::get(Type::getVoidTy(Context), Types, false);
-  Function *F = Function::Create(FTy, Function::ExternalLinkage, "f", M);
-  BasicBlock *BB = BasicBlock::Create(Context, "entry", F);
-  ReturnInst::Create(Context, nullptr, BB);
-
-  ScalarEvolution SE = buildSE(*F);
-
-  auto *Arg = &*(F->arg_begin());
-  const auto *ArgSCEV = SE.getSCEV(Arg);
-
-  // Build the SCEV
-  const auto *A0 = SE.getNegativeSCEV(ArgSCEV);
-  const auto *A1 = SE.getTruncateExpr(A0, Int32Ty);
-  const auto *A = SE.getNegativeSCEV(A1);
-
-  const auto *B0 = SE.getTruncateExpr(ArgSCEV, Int32Ty);
-  const auto *B = SE.getNegativeSCEV(B0);
-
-  const auto *Expr = SE.getAddExpr(A, B);
-  // Verify that the SCEV was folded to 0
-  const auto *ZeroConst = SE.getConstant(Int32Ty, 0);
-  EXPECT_EQ(Expr, ZeroConst);
-}
-
-// Check logic of SCEV expression size computation.
-TEST_F(ScalarEvolutionsTest, SCEVComputeExpressionSize) {
-  /*
-   * Create the following code:
-   * void func(i64 %a, i64 %b)
-   * entry:
-   *  %s1 = add i64 %a, 1
-   *  %s2 = udiv i64 %s1, %b
-   *  br label %exit
-   * exit:
-   *  ret
-   */
-
-  // Create a module.
-  Module M("SCEVComputeExpressionSize", Context);
-
-  Type *T_int64 = Type::getInt64Ty(Context);
-
-  FunctionType *FTy =
-      FunctionType::get(Type::getVoidTy(Context), { T_int64, T_int64 }, false);
-  Function *F = Function::Create(FTy, Function::ExternalLinkage, "func", M);
-  Argument *A = &*F->arg_begin();
-  Argument *B = &*std::next(F->arg_begin());
-  ConstantInt *C = ConstantInt::get(Context, APInt(64, 1));
-
-  BasicBlock *Entry = BasicBlock::Create(Context, "entry", F);
-  BasicBlock *Exit = BasicBlock::Create(Context, "exit", F);
-
-  IRBuilder<> Builder(Entry);
-  auto *S1 = cast<Instruction>(Builder.CreateAdd(A, C, "s1"));
-  auto *S2 = cast<Instruction>(Builder.CreateUDiv(S1, B, "s2"));
-  Builder.CreateBr(Exit);
-
-  Builder.SetInsertPoint(Exit);
-  Builder.CreateRetVoid();
-
-  ScalarEvolution SE = buildSE(*F);
-  // Get S2 first to move it to cache.
-  const SCEV *AS = SE.getSCEV(A);
-  const SCEV *BS = SE.getSCEV(B);
-  const SCEV *CS = SE.getSCEV(C);
-  const SCEV *S1S = SE.getSCEV(S1);
-  const SCEV *S2S = SE.getSCEV(S2);
-  EXPECT_EQ(AS->getExpressionSize(), 1u);
-  EXPECT_EQ(BS->getExpressionSize(), 1u);
-  EXPECT_EQ(CS->getExpressionSize(), 1u);
-  EXPECT_EQ(S1S->getExpressionSize(), 3u);
-  EXPECT_EQ(S2S->getExpressionSize(), 5u);
-}
-
-TEST_F(ScalarEvolutionsTest, SCEVLoopDecIntrinsic) {
-  LLVMContext C;
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M = parseAssemblyString(
-      "define void @foo(i32 %N) { "
-      "entry: "
-      "  %cmp3 = icmp sgt i32 %N, 0 "
-      "  br i1 %cmp3, label %for.body, label %for.cond.cleanup "
-      "for.cond.cleanup: "
-      "  ret void "
-      "for.body: "
-      "  %i.04 = phi i32 [ %inc, %for.body ], [ 100, %entry ] "
-      "  %inc = call i32 @llvm.loop.decrement.reg.i32.i32.i32(i32 %i.04, i32 1) "
-      "  %exitcond = icmp ne i32 %inc, 0 "
-      "  br i1 %exitcond, label %for.cond.cleanup, label %for.body "
-      "} "
-      "declare i32 @llvm.loop.decrement.reg.i32.i32.i32(i32, i32) ",
-      Err, C);
-
-  ASSERT_TRUE(M && "Could not parse module?");
-  ASSERT_TRUE(!verifyModule(*M) && "Must have been well formed!");
-
-  runWithSE(*M, "foo", [&](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-    auto *ScevInc = SE.getSCEV(getInstructionByName(F, "inc"));
-    EXPECT_TRUE(isa<SCEVAddRecExpr>(ScevInc));
-  });
-}
-
-TEST_F(ScalarEvolutionsTest, SCEVComputeConstantDifference) {
-  LLVMContext C;
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M = parseAssemblyString(
-      "define void @foo(i32 %sz, i32 %pp) { "
-      "entry: "
-      "  %v0 = add i32 %pp, 0 "
-      "  %v3 = add i32 %pp, 3 "
-      "  br label %loop.body "
-      "loop.body: "
-      "  %iv = phi i32 [ %iv.next, %loop.body ], [ 0, %entry ] "
-      "  %xa = add nsw i32 %iv, %v0 "
-      "  %yy = add nsw i32 %iv, %v3 "
-      "  %xb = sub nsw i32 %yy, 3 "
-      "  %iv.next = add nsw i32 %iv, 1 "
-      "  %cmp = icmp sle i32 %iv.next, %sz "
-      "  br i1 %cmp, label %loop.body, label %exit "
-      "exit: "
-      "  ret void "
-      "} ",
-      Err, C);
-
-  ASSERT_TRUE(M && "Could not parse module?");
-  ASSERT_TRUE(!verifyModule(*M) && "Must have been well formed!");
-
-  runWithSE(*M, "foo", [](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-    auto *ScevV0 = SE.getSCEV(getInstructionByName(F, "v0")); // %pp
-    auto *ScevV3 = SE.getSCEV(getInstructionByName(F, "v3")); // (3 + %pp)
-    auto *ScevIV = SE.getSCEV(getInstructionByName(F, "iv")); // {0,+,1}
-    auto *ScevXA = SE.getSCEV(getInstructionByName(F, "xa")); // {%pp,+,1}
-    auto *ScevYY = SE.getSCEV(getInstructionByName(F, "yy")); // {(3 + %pp),+,1}
-    auto *ScevXB = SE.getSCEV(getInstructionByName(F, "xb")); // {%pp,+,1}
-    auto *ScevIVNext = SE.getSCEV(getInstructionByName(F, "iv.next")); // {1,+,1}
-
-    auto diff = [&SE](const SCEV *LHS, const SCEV *RHS) -> Optional<int> {
-      auto ConstantDiffOrNone = computeConstantDifference(SE, LHS, RHS);
-      if (!ConstantDiffOrNone)
-        return None;
-
-      auto ExtDiff = ConstantDiffOrNone->getSExtValue();
-      int Diff = ExtDiff;
-      assert(Diff == ExtDiff && "Integer overflow");
-      return Diff;
-    };
-
-    EXPECT_EQ(diff(ScevV3, ScevV0), 3);
-    EXPECT_EQ(diff(ScevV0, ScevV3), -3);
-    EXPECT_EQ(diff(ScevV0, ScevV0), 0);
-    EXPECT_EQ(diff(ScevV3, ScevV3), 0);
-    EXPECT_EQ(diff(ScevIV, ScevIV), 0);
-    EXPECT_EQ(diff(ScevXA, ScevXB), 0);
-    EXPECT_EQ(diff(ScevXA, ScevYY), -3);
-    EXPECT_EQ(diff(ScevYY, ScevXB), 3);
-    EXPECT_EQ(diff(ScevIV, ScevIVNext), -1);
-    EXPECT_EQ(diff(ScevIVNext, ScevIV), 1);
-    EXPECT_EQ(diff(ScevIVNext, ScevIVNext), 0);
-    EXPECT_EQ(diff(ScevV0, ScevIV), None);
-    EXPECT_EQ(diff(ScevIVNext, ScevV3), None);
-    EXPECT_EQ(diff(ScevYY, ScevV3), None);
-  });
-}
-
-TEST_F(ScalarEvolutionsTest, SCEVrewriteUnknowns) {
-  LLVMContext C;
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M = parseAssemblyString(
-      "define void @foo(i32 %i) { "
-      "entry: "
-      "  %cmp3 = icmp ult i32 %i, 16 "
-      "  br i1 %cmp3, label %loop.body, label %exit "
-      "loop.body: "
-      "  %iv = phi i32 [ %iv.next, %loop.body ], [ %i, %entry ] "
-      "  %iv.next = add nsw i32 %iv, 1 "
-      "  %cmp = icmp eq i32 %iv.next, 16 "
-      "  br i1 %cmp, label %exit, label %loop.body "
-      "exit: "
-      "  ret void "
-      "} ",
-      Err, C);
-
-  ASSERT_TRUE(M && "Could not parse module?");
-  ASSERT_TRUE(!verifyModule(*M) && "Must have been well formed!");
-
-  runWithSE(*M, "foo", [](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-    auto *ScevIV = SE.getSCEV(getInstructionByName(F, "iv")); // {0,+,1}
-    auto *ScevI = SE.getSCEV(getArgByName(F, "i"));           // {0,+,1}
-
-    ValueToSCEVMapTy RewriteMap;
-    RewriteMap[cast<SCEVUnknown>(ScevI)->getValue()] =
-        SE.getUMinExpr(ScevI, SE.getConstant(ScevI->getType(), 17));
-    auto *WithUMin = SCEVParameterRewriter::rewrite(ScevIV, SE, RewriteMap);
-
-    EXPECT_NE(WithUMin, ScevIV);
-    auto *AR = dyn_cast<SCEVAddRecExpr>(WithUMin);
-    EXPECT_TRUE(AR);
-    EXPECT_EQ(AR->getStart(),
-              SE.getUMinExpr(ScevI, SE.getConstant(ScevI->getType(), 17)));
-    EXPECT_EQ(AR->getStepRecurrence(SE),
-              cast<SCEVAddRecExpr>(ScevIV)->getStepRecurrence(SE));
-  });
-}
-
-TEST_F(ScalarEvolutionsTest, SCEVAddNUW) {
-  LLVMContext C;
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M = parseAssemblyString("define void @foo(i32 %x) { "
-                                                  "  ret void "
-                                                  "} ",
-                                                  Err, C);
-
-  ASSERT_TRUE(M && "Could not parse module?");
-  ASSERT_TRUE(!verifyModule(*M) && "Must have been well formed!");
-
-  runWithSE(*M, "foo", [](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-    auto *X = SE.getSCEV(getArgByName(F, "x"));
-    auto *One = SE.getOne(X->getType());
-    auto *Sum = SE.getAddExpr(X, One, SCEV::FlagNUW);
-    EXPECT_TRUE(SE.isKnownPredicate(ICmpInst::ICMP_UGE, Sum, X));
-    EXPECT_TRUE(SE.isKnownPredicate(ICmpInst::ICMP_UGT, Sum, X));
-  });
-}
-
-TEST_F(ScalarEvolutionsTest, SCEVgetRanges) {
-  LLVMContext C;
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M = parseAssemblyString(
-      "define void @foo(i32 %i) { "
-      "entry: "
-      "  br label %loop.body "
-      "loop.body: "
-      "  %iv = phi i32 [ %iv.next, %loop.body ], [ 0, %entry ] "
-      "  %iv.next = add nsw i32 %iv, 1 "
-      "  %cmp = icmp eq i32 %iv.next, 16 "
-      "  br i1 %cmp, label %exit, label %loop.body "
-      "exit: "
-      "  ret void "
-      "} ",
-      Err, C);
-
-  runWithSE(*M, "foo", [](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-    auto *ScevIV = SE.getSCEV(getInstructionByName(F, "iv")); // {0,+,1}
-    auto *ScevI = SE.getSCEV(getArgByName(F, "i"));
-    EXPECT_EQ(SE.getUnsignedRange(ScevIV).getLower(), 0);
-    EXPECT_EQ(SE.getUnsignedRange(ScevIV).getUpper(), 16);
-
-    auto *Add = SE.getAddExpr(ScevI, ScevIV);
-    ValueToSCEVMapTy RewriteMap;
-    RewriteMap[cast<SCEVUnknown>(ScevI)->getValue()] =
-        SE.getUMinExpr(ScevI, SE.getConstant(ScevI->getType(), 17));
-    auto *AddWithUMin = SCEVParameterRewriter::rewrite(Add, SE, RewriteMap);
-    EXPECT_EQ(SE.getUnsignedRange(AddWithUMin).getLower(), 0);
-    EXPECT_EQ(SE.getUnsignedRange(AddWithUMin).getUpper(), 33);
-  });
-}
-
-TEST_F(ScalarEvolutionsTest, SCEVgetExitLimitForGuardedLoop) {
-  LLVMContext C;
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M = parseAssemblyString(
-      "define void @foo(i32 %i) { "
-      "entry: "
-      "  %cmp3 = icmp ult i32 %i, 16 "
-      "  br i1 %cmp3, label %loop.body, label %exit "
-      "loop.body: "
-      "  %iv = phi i32 [ %iv.next, %loop.body ], [ %i, %entry ] "
-      "  %iv.next = add nsw i32 %iv, 1 "
-      "  %cmp = icmp eq i32 %iv.next, 16 "
-      "  br i1 %cmp, label %exit, label %loop.body "
-      "exit: "
-      "  ret void "
-      "} ",
-      Err, C);
-
-  ASSERT_TRUE(M && "Could not parse module?");
-  ASSERT_TRUE(!verifyModule(*M) && "Must have been well formed!");
-
-  runWithSE(*M, "foo", [](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-    auto *ScevIV = SE.getSCEV(getInstructionByName(F, "iv")); // {0,+,1}
-    const Loop *L = cast<SCEVAddRecExpr>(ScevIV)->getLoop();
-
-    const SCEV *BTC = SE.getBackedgeTakenCount(L);
-    EXPECT_FALSE(isa<SCEVConstant>(BTC));
-    const SCEV *MaxBTC = SE.getConstantMaxBackedgeTakenCount(L);
-    EXPECT_EQ(cast<SCEVConstant>(MaxBTC)->getAPInt(), 15);
-  });
-}
-
-TEST_F(ScalarEvolutionsTest, ImpliedViaAddRecStart) {
-  LLVMContext C;
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M = parseAssemblyString(
-      "define void @foo(i32* %p) { "
-      "entry: "
-      "  %x = load i32, i32* %p, !range !0 "
-      "  br label %loop "
-      "loop: "
-      "  %iv = phi i32 [ %x, %entry], [%iv.next, %backedge] "
-      "  %ne.check = icmp ne i32 %iv, 0 "
-      "  br i1 %ne.check, label %backedge, label %exit "
-      "backedge: "
-      "  %iv.next = add i32 %iv, -1 "
-      "  br label %loop "
-      "exit:"
-      "  ret void "
-      "} "
-      "!0 = !{i32 0, i32 2147483647}",
-      Err, C);
-
-  ASSERT_TRUE(M && "Could not parse module?");
-  ASSERT_TRUE(!verifyModule(*M) && "Must have been well formed!");
-
-  runWithSE(*M, "foo", [](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-    auto *X = SE.getSCEV(getInstructionByName(F, "x"));
-    auto *Context = getInstructionByName(F, "iv.next");
-    EXPECT_TRUE(SE.isKnownPredicateAt(ICmpInst::ICMP_NE, X,
-                                      SE.getZero(X->getType()), Context));
-  });
-}
-
-TEST_F(ScalarEvolutionsTest, UnsignedIsImpliedViaOperations) {
-  LLVMContext C;
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M =
-      parseAssemblyString("define void @foo(i32* %p1, i32* %p2) { "
-                          "entry: "
-                          "  %x = load i32, i32* %p1, !range !0 "
-                          "  %cond = icmp ne i32 %x, 0 "
-                          "  br i1 %cond, label %guarded, label %exit "
-                          "guarded: "
-                          "  %y = add i32 %x, -1 "
-                          "  ret void "
-                          "exit: "
-                          "  ret void "
-                          "} "
-                          "!0 = !{i32 0, i32 2147483647}",
-                          Err, C);
-
-  ASSERT_TRUE(M && "Could not parse module?");
-  ASSERT_TRUE(!verifyModule(*M) && "Must have been well formed!");
-
-  runWithSE(*M, "foo", [](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-    auto *X = SE.getSCEV(getInstructionByName(F, "x"));
-    auto *Y = SE.getSCEV(getInstructionByName(F, "y"));
-    auto *Guarded = getInstructionByName(F, "y")->getParent();
-    ASSERT_TRUE(Guarded);
-    EXPECT_TRUE(
-        SE.isBasicBlockEntryGuardedByCond(Guarded, ICmpInst::ICMP_ULT, Y, X));
-    EXPECT_TRUE(
-        SE.isBasicBlockEntryGuardedByCond(Guarded, ICmpInst::ICMP_UGT, X, Y));
-  });
-}
-
-TEST_F(ScalarEvolutionsTest, ProveImplicationViaNarrowing) {
-  LLVMContext C;
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M = parseAssemblyString(
-      "define i32 @foo(i32 %start, i32* %q) { "
-      "entry: "
-      "  %wide.start = zext i32 %start to i64 "
-      "  br label %loop "
-      "loop: "
-      "  %wide.iv = phi i64 [%wide.start, %entry], [%wide.iv.next, %backedge] "
-      "  %iv = phi i32 [%start, %entry], [%iv.next, %backedge] "
-      "  %cond = icmp eq i64 %wide.iv, 0 "
-      "  br i1 %cond, label %exit, label %backedge "
-      "backedge: "
-      "  %iv.next = add i32 %iv, -1 "
-      "  %index = zext i32 %iv.next to i64 "
-      "  %load.addr = getelementptr i32, i32* %q, i64 %index "
-      "  %stop = load i32, i32* %load.addr "
-      "  %loop.cond = icmp eq i32 %stop, 0 "
-      "  %wide.iv.next = add nsw i64 %wide.iv, -1 "
-      "  br i1 %loop.cond, label %loop, label %failure "
-      "exit: "
-      "  ret i32 0 "
-      "failure: "
-      "  unreachable "
-      "} ",
-      Err, C);
-
-  ASSERT_TRUE(M && "Could not parse module?");
-  ASSERT_TRUE(!verifyModule(*M) && "Must have been well formed!");
-
-  runWithSE(*M, "foo", [](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-    auto *IV = SE.getSCEV(getInstructionByName(F, "iv"));
-    auto *Zero = SE.getZero(IV->getType());
-    auto *Backedge = getInstructionByName(F, "iv.next")->getParent();
-    ASSERT_TRUE(Backedge);
-    (void)IV;
-    (void)Zero;
-    // FIXME: This can only be proved with turned on option
-    // scalar-evolution-use-expensive-range-sharpening which is currently off.
-    // Enable the check once it's switched true by default.
-    // EXPECT_TRUE(SE.isBasicBlockEntryGuardedByCond(Backedge,
-    //                                               ICmpInst::ICMP_UGT,
-    //                                               IV, Zero));
-  });
-}
-
-TEST_F(ScalarEvolutionsTest, ImpliedCond) {
-  LLVMContext C;
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M = parseAssemblyString(
-      "define void @foo(i32 %len) { "
-      "entry: "
-      "  br label %loop "
-      "loop: "
-      "  %iv = phi i32 [ 0, %entry], [%iv.next, %loop] "
-      "  %iv.next = add nsw i32 %iv, 1 "
-      "  %cmp = icmp slt i32 %iv, %len "
-      "  br i1 %cmp, label %loop, label %exit "
-      "exit:"
-      "  ret void "
-      "}",
-      Err, C);
-
-  ASSERT_TRUE(M && "Could not parse module?");
-  ASSERT_TRUE(!verifyModule(*M) && "Must have been well formed!");
-
-  runWithSE(*M, "foo", [](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-    Instruction *IV = getInstructionByName(F, "iv");
-    Type *Ty = IV->getType();
-    const SCEV *Zero = SE.getZero(Ty);
-    const SCEV *MinusOne = SE.getMinusOne(Ty);
-    // {0,+,1}<nuw><nsw>
-    const SCEV *AddRec_0_1 = SE.getSCEV(IV);
-    // {0,+,-1}<nw>
-    const SCEV *AddRec_0_N1 = SE.getNegativeSCEV(AddRec_0_1);
-
-    // {0,+,1}<nuw><nsw> > 0  ->  {0,+,-1}<nw> < 0
-    EXPECT_TRUE(isImpliedCond(SE, ICmpInst::ICMP_SLT, AddRec_0_N1, Zero,
-                                  ICmpInst::ICMP_SGT, AddRec_0_1, Zero));
-    // {0,+,-1}<nw> < -1  ->  {0,+,1}<nuw><nsw> > 0
-    EXPECT_TRUE(isImpliedCond(SE, ICmpInst::ICMP_SGT, AddRec_0_1, Zero,
-                                  ICmpInst::ICMP_SLT, AddRec_0_N1, MinusOne));
-  });
-}
-
-TEST_F(ScalarEvolutionsTest, MatchURem) {
-  LLVMContext C;
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M = parseAssemblyString(
-      "target datalayout = \"e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128\" "
-      " "
-      "define void @test(i32 %a, i32 %b, i16 %c, i64 %d) {"
-      "entry: "
-      "  %rem1 = urem i32 %a, 2"
-      "  %rem2 = urem i32 %a, 5"
-      "  %rem3 = urem i32 %a, %b"
-      "  %c.ext = zext i16 %c to i32"
-      "  %rem4 = urem i32 %c.ext, 2"
-      "  %ext = zext i32 %rem4 to i64"
-      "  %rem5 = urem i64 %d, 17179869184"
-      "  ret void "
-      "} ",
-      Err, C);
-
-  assert(M && "Could not parse module?");
-  assert(!verifyModule(*M) && "Must have been well formed!");
-
-  runWithSE(*M, "test", [&](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-    for (auto *N : {"rem1", "rem2", "rem3", "rem5"}) {
-      auto *URemI = getInstructionByName(F, N);
-      auto *S = SE.getSCEV(URemI);
-      const SCEV *LHS, *RHS;
-      EXPECT_TRUE(matchURem(SE, S, LHS, RHS));
-      EXPECT_EQ(LHS, SE.getSCEV(URemI->getOperand(0)));
-      EXPECT_EQ(RHS, SE.getSCEV(URemI->getOperand(1)));
-      EXPECT_EQ(LHS->getType(), S->getType());
-      EXPECT_EQ(RHS->getType(), S->getType());
-    }
-
-    // Check the case where the urem operand is zero-extended. Make sure the
-    // match results are extended to the size of the input expression.
-    auto *Ext = getInstructionByName(F, "ext");
-    auto *URem1 = getInstructionByName(F, "rem4");
-    auto *S = SE.getSCEV(Ext);
-    const SCEV *LHS, *RHS;
-    EXPECT_TRUE(matchURem(SE, S, LHS, RHS));
-    EXPECT_NE(LHS, SE.getSCEV(URem1->getOperand(0)));
-    // RHS and URem1->getOperand(1) have different widths, so compare the
-    // integer values.
-    EXPECT_EQ(cast<SCEVConstant>(RHS)->getValue()->getZExtValue(),
-              cast<SCEVConstant>(SE.getSCEV(URem1->getOperand(1)))
-                  ->getValue()
-                  ->getZExtValue());
-    EXPECT_EQ(LHS->getType(), S->getType());
-    EXPECT_EQ(RHS->getType(), S->getType());
-  });
-}
-
-TEST_F(ScalarEvolutionsTest, SCEVUDivFloorCeiling) {
-  LLVMContext C;
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M = parseAssemblyString("define void @foo() { "
-                                                  "  ret void "
-                                                  "} ",
-                                                  Err, C);
-
-  ASSERT_TRUE(M && "Could not parse module?");
-  ASSERT_TRUE(!verifyModule(*M) && "Must have been well formed!");
-
-  runWithSE(*M, "foo", [](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-    // Check that SCEV's udiv and uceil handling produce the correct results
-    // for all 8 bit options. Div-by-zero is deliberately excluded.
-    for (unsigned N = 0; N < 256; N++)
-      for (unsigned D = 1; D < 256; D++) {
-        APInt NInt(8, N);
-        APInt DInt(8, D);
-        using namespace llvm::APIntOps;
-        APInt FloorInt = RoundingUDiv(NInt, DInt, APInt::Rounding::DOWN);
-        APInt CeilingInt = RoundingUDiv(NInt, DInt, APInt::Rounding::UP);
-        auto *NS = SE.getConstant(NInt);
-        auto *DS = SE.getConstant(DInt);
-        auto *FloorS = cast<SCEVConstant>(SE.getUDivExpr(NS, DS));
-        auto *CeilingS = cast<SCEVConstant>(SE.getUDivCeilSCEV(NS, DS));
-        ASSERT_TRUE(FloorS->getAPInt() == FloorInt);
-        ASSERT_TRUE(CeilingS->getAPInt() == CeilingInt);
-      }
-  });
-}
-
-}  // end namespace llvm
diff --git a/gnu/llvm/llvm/unittests/Analysis/SparsePropagation.cpp b/gnu/llvm/llvm/unittests/Analysis/SparsePropagation.cpp
deleted file mode 100644
index f4a7a116d89..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/SparsePropagation.cpp
+++ /dev/null
@@ -1,541 +0,0 @@
-//===- SparsePropagation.cpp - Unit tests for the generic solver ----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/SparsePropagation.h"
-#include "llvm/ADT/PointerIntPair.h"
-#include "llvm/IR/IRBuilder.h"
-#include "gtest/gtest.h"
-using namespace llvm;
-
-namespace {
-/// To enable interprocedural analysis, we assign LLVM values to the following
-/// groups. The register group represents SSA registers, the return group
-/// represents the return values of functions, and the memory group represents
-/// in-memory values. An LLVM Value can technically be in more than one group.
-/// It's necessary to distinguish these groups so we can, for example, track a
-/// global variable separately from the value stored at its location.
-enum class IPOGrouping { Register, Return, Memory };
-
-/// Our LatticeKeys are PointerIntPairs composed of LLVM values and groupings.
-/// The PointerIntPair header provides a DenseMapInfo specialization, so using
-/// these as LatticeKeys is fine.
-using TestLatticeKey = PointerIntPair<Value *, 2, IPOGrouping>;
-} // namespace
-
-namespace llvm {
-/// A specialization of LatticeKeyInfo for TestLatticeKeys. The generic solver
-/// must translate between LatticeKeys and LLVM Values when adding Values to
-/// its work list and inspecting the state of control-flow related values.
-template <> struct LatticeKeyInfo<TestLatticeKey> {
-  static inline Value *getValueFromLatticeKey(TestLatticeKey Key) {
-    return Key.getPointer();
-  }
-  static inline TestLatticeKey getLatticeKeyFromValue(Value *V) {
-    return TestLatticeKey(V, IPOGrouping::Register);
-  }
-};
-} // namespace llvm
-
-namespace {
-/// This class defines a simple test lattice value that could be used for
-/// solving problems similar to constant propagation. The value is maintained
-/// as a PointerIntPair.
-class TestLatticeVal {
-public:
-  /// The states of the lattices value. Only the ConstantVal state is
-  /// interesting; the rest are special states used by the generic solver. The
-  /// UntrackedVal state differs from the other three in that the generic
-  /// solver uses it to avoid doing unnecessary work. In particular, when a
-  /// value moves to the UntrackedVal state, it's users are not notified.
-  enum TestLatticeStateTy {
-    UndefinedVal,
-    ConstantVal,
-    OverdefinedVal,
-    UntrackedVal
-  };
-
-  TestLatticeVal() : LatticeVal(nullptr, UndefinedVal) {}
-  TestLatticeVal(Constant *C, TestLatticeStateTy State)
-      : LatticeVal(C, State) {}
-
-  /// Return true if this lattice value is in the Constant state. This is used
-  /// for checking the solver results.
-  bool isConstant() const { return LatticeVal.getInt() == ConstantVal; }
-
-  /// Return true if this lattice value is in the Overdefined state. This is
-  /// used for checking the solver results.
-  bool isOverdefined() const { return LatticeVal.getInt() == OverdefinedVal; }
-
-  bool operator==(const TestLatticeVal &RHS) const {
-    return LatticeVal == RHS.LatticeVal;
-  }
-
-  bool operator!=(const TestLatticeVal &RHS) const {
-    return LatticeVal != RHS.LatticeVal;
-  }
-
-private:
-  /// A simple lattice value type for problems similar to constant propagation.
-  /// It holds the constant value and the lattice state.
-  PointerIntPair<const Constant *, 2, TestLatticeStateTy> LatticeVal;
-};
-
-/// This class defines a simple test lattice function that could be used for
-/// solving problems similar to constant propagation. The test lattice differs
-/// from a "real" lattice in a few ways. First, it initializes all return
-/// values, values stored in global variables, and arguments in the undefined
-/// state. This means that there are no limitations on what we can track
-/// interprocedurally. For simplicity, all global values in the tests will be
-/// given internal linkage, since this is not something this lattice function
-/// tracks. Second, it only handles the few instructions necessary for the
-/// tests.
-class TestLatticeFunc
-    : public AbstractLatticeFunction<TestLatticeKey, TestLatticeVal> {
-public:
-  /// Construct a new test lattice function with special values for the
-  /// Undefined, Overdefined, and Untracked states.
-  TestLatticeFunc()
-      : AbstractLatticeFunction(
-            TestLatticeVal(nullptr, TestLatticeVal::UndefinedVal),
-            TestLatticeVal(nullptr, TestLatticeVal::OverdefinedVal),
-            TestLatticeVal(nullptr, TestLatticeVal::UntrackedVal)) {}
-
-  /// Compute and return a TestLatticeVal for the given TestLatticeKey. For the
-  /// test analysis, a LatticeKey will begin in the undefined state, unless it
-  /// represents an LLVM Constant in the register grouping.
-  TestLatticeVal ComputeLatticeVal(TestLatticeKey Key) override {
-    if (Key.getInt() == IPOGrouping::Register)
-      if (auto *C = dyn_cast<Constant>(Key.getPointer()))
-        return TestLatticeVal(C, TestLatticeVal::ConstantVal);
-    return getUndefVal();
-  }
-
-  /// Merge the two given lattice values. This merge should be equivalent to
-  /// what is done for constant propagation. That is, the resulting lattice
-  /// value is constant only if the two given lattice values are constant and
-  /// hold the same value.
-  TestLatticeVal MergeValues(TestLatticeVal X, TestLatticeVal Y) override {
-    if (X == getUntrackedVal() || Y == getUntrackedVal())
-      return getUntrackedVal();
-    if (X == getOverdefinedVal() || Y == getOverdefinedVal())
-      return getOverdefinedVal();
-    if (X == getUndefVal() && Y == getUndefVal())
-      return getUndefVal();
-    if (X == getUndefVal())
-      return Y;
-    if (Y == getUndefVal())
-      return X;
-    if (X == Y)
-      return X;
-    return getOverdefinedVal();
-  }
-
-  /// Compute the lattice values that change as a result of executing the given
-  /// instruction. We only handle the few instructions needed for the tests.
-  void ComputeInstructionState(
-      Instruction &I, DenseMap<TestLatticeKey, TestLatticeVal> &ChangedValues,
-      SparseSolver<TestLatticeKey, TestLatticeVal> &SS) override {
-    switch (I.getOpcode()) {
-    case Instruction::Call:
-      return visitCallBase(cast<CallBase>(I), ChangedValues, SS);
-    case Instruction::Ret:
-      return visitReturn(*cast<ReturnInst>(&I), ChangedValues, SS);
-    case Instruction::Store:
-      return visitStore(*cast<StoreInst>(&I), ChangedValues, SS);
-    default:
-      return visitInst(I, ChangedValues, SS);
-    }
-  }
-
-private:
-  /// Handle call sites. The state of a called function's argument is the merge
-  /// of the current formal argument state with the call site's corresponding
-  /// actual argument state. The call site state is the merge of the call site
-  /// state with the returned value state of the called function.
-  void visitCallBase(CallBase &I,
-                     DenseMap<TestLatticeKey, TestLatticeVal> &ChangedValues,
-                     SparseSolver<TestLatticeKey, TestLatticeVal> &SS) {
-    Function *F = I.getCalledFunction();
-    auto RegI = TestLatticeKey(&I, IPOGrouping::Register);
-    if (!F) {
-      ChangedValues[RegI] = getOverdefinedVal();
-      return;
-    }
-    SS.MarkBlockExecutable(&F->front());
-    for (Argument &A : F->args()) {
-      auto RegFormal = TestLatticeKey(&A, IPOGrouping::Register);
-      auto RegActual =
-          TestLatticeKey(I.getArgOperand(A.getArgNo()), IPOGrouping::Register);
-      ChangedValues[RegFormal] =
-          MergeValues(SS.getValueState(RegFormal), SS.getValueState(RegActual));
-    }
-    auto RetF = TestLatticeKey(F, IPOGrouping::Return);
-    ChangedValues[RegI] =
-        MergeValues(SS.getValueState(RegI), SS.getValueState(RetF));
-  }
-
-  /// Handle return instructions. The function's return state is the merge of
-  /// the returned value state and the function's current return state.
-  void visitReturn(ReturnInst &I,
-                   DenseMap<TestLatticeKey, TestLatticeVal> &ChangedValues,
-                   SparseSolver<TestLatticeKey, TestLatticeVal> &SS) {
-    Function *F = I.getParent()->getParent();
-    if (F->getReturnType()->isVoidTy())
-      return;
-    auto RegR = TestLatticeKey(I.getReturnValue(), IPOGrouping::Register);
-    auto RetF = TestLatticeKey(F, IPOGrouping::Return);
-    ChangedValues[RetF] =
-        MergeValues(SS.getValueState(RegR), SS.getValueState(RetF));
-  }
-
-  /// Handle store instructions. If the pointer operand of the store is a
-  /// global variable, we attempt to track the value. The global variable state
-  /// is the merge of the stored value state with the current global variable
-  /// state.
-  void visitStore(StoreInst &I,
-                  DenseMap<TestLatticeKey, TestLatticeVal> &ChangedValues,
-                  SparseSolver<TestLatticeKey, TestLatticeVal> &SS) {
-    auto *GV = dyn_cast<GlobalVariable>(I.getPointerOperand());
-    if (!GV)
-      return;
-    auto RegVal = TestLatticeKey(I.getValueOperand(), IPOGrouping::Register);
-    auto MemPtr = TestLatticeKey(GV, IPOGrouping::Memory);
-    ChangedValues[MemPtr] =
-        MergeValues(SS.getValueState(RegVal), SS.getValueState(MemPtr));
-  }
-
-  /// Handle all other instructions. All other instructions are marked
-  /// overdefined.
-  void visitInst(Instruction &I,
-                 DenseMap<TestLatticeKey, TestLatticeVal> &ChangedValues,
-                 SparseSolver<TestLatticeKey, TestLatticeVal> &SS) {
-    auto RegI = TestLatticeKey(&I, IPOGrouping::Register);
-    ChangedValues[RegI] = getOverdefinedVal();
-  }
-};
-
-/// This class defines the common data used for all of the tests. The tests
-/// should add code to the module and then run the solver.
-class SparsePropagationTest : public testing::Test {
-protected:
-  LLVMContext Context;
-  Module M;
-  IRBuilder<> Builder;
-  TestLatticeFunc Lattice;
-  SparseSolver<TestLatticeKey, TestLatticeVal> Solver;
-
-public:
-  SparsePropagationTest()
-      : M("", Context), Builder(Context), Solver(&Lattice) {}
-};
-} // namespace
-
-/// Test that we mark discovered functions executable.
-///
-/// define internal void @f() {
-///   call void @g()
-///   ret void
-/// }
-///
-/// define internal void @g() {
-///   call void @f()
-///   ret void
-/// }
-///
-/// For this test, we initially mark "f" executable, and the solver discovers
-/// "g" because of the call in "f". The mutually recursive call in "g" also
-/// tests that we don't add a block to the basic block work list if it is
-/// already executable. Doing so would put the solver into an infinite loop.
-TEST_F(SparsePropagationTest, MarkBlockExecutable) {
-  Function *F = Function::Create(FunctionType::get(Builder.getVoidTy(), false),
-                                 GlobalValue::InternalLinkage, "f", &M);
-  Function *G = Function::Create(FunctionType::get(Builder.getVoidTy(), false),
-                                 GlobalValue::InternalLinkage, "g", &M);
-  BasicBlock *FEntry = BasicBlock::Create(Context, "", F);
-  BasicBlock *GEntry = BasicBlock::Create(Context, "", G);
-  Builder.SetInsertPoint(FEntry);
-  Builder.CreateCall(G);
-  Builder.CreateRetVoid();
-  Builder.SetInsertPoint(GEntry);
-  Builder.CreateCall(F);
-  Builder.CreateRetVoid();
-
-  Solver.MarkBlockExecutable(FEntry);
-  Solver.Solve();
-
-  EXPECT_TRUE(Solver.isBlockExecutable(GEntry));
-}
-
-/// Test that we propagate information through global variables.
-///
-/// @gv = internal global i64
-///
-/// define internal void @f() {
-///   store i64 1, i64* @gv
-///   ret void
-/// }
-///
-/// define internal void @g() {
-///   store i64 1, i64* @gv
-///   ret void
-/// }
-///
-/// For this test, we initially mark both "f" and "g" executable, and the
-/// solver computes the lattice state of the global variable as constant.
-TEST_F(SparsePropagationTest, GlobalVariableConstant) {
-  Function *F = Function::Create(FunctionType::get(Builder.getVoidTy(), false),
-                                 GlobalValue::InternalLinkage, "f", &M);
-  Function *G = Function::Create(FunctionType::get(Builder.getVoidTy(), false),
-                                 GlobalValue::InternalLinkage, "g", &M);
-  GlobalVariable *GV =
-      new GlobalVariable(M, Builder.getInt64Ty(), false,
-                         GlobalValue::InternalLinkage, nullptr, "gv");
-  BasicBlock *FEntry = BasicBlock::Create(Context, "", F);
-  BasicBlock *GEntry = BasicBlock::Create(Context, "", G);
-  Builder.SetInsertPoint(FEntry);
-  Builder.CreateStore(Builder.getInt64(1), GV);
-  Builder.CreateRetVoid();
-  Builder.SetInsertPoint(GEntry);
-  Builder.CreateStore(Builder.getInt64(1), GV);
-  Builder.CreateRetVoid();
-
-  Solver.MarkBlockExecutable(FEntry);
-  Solver.MarkBlockExecutable(GEntry);
-  Solver.Solve();
-
-  auto MemGV = TestLatticeKey(GV, IPOGrouping::Memory);
-  EXPECT_TRUE(Solver.getExistingValueState(MemGV).isConstant());
-}
-
-/// Test that we propagate information through global variables.
-///
-/// @gv = internal global i64
-///
-/// define internal void @f() {
-///   store i64 0, i64* @gv
-///   ret void
-/// }
-///
-/// define internal void @g() {
-///   store i64 1, i64* @gv
-///   ret void
-/// }
-///
-/// For this test, we initially mark both "f" and "g" executable, and the
-/// solver computes the lattice state of the global variable as overdefined.
-TEST_F(SparsePropagationTest, GlobalVariableOverDefined) {
-  Function *F = Function::Create(FunctionType::get(Builder.getVoidTy(), false),
-                                 GlobalValue::InternalLinkage, "f", &M);
-  Function *G = Function::Create(FunctionType::get(Builder.getVoidTy(), false),
-                                 GlobalValue::InternalLinkage, "g", &M);
-  GlobalVariable *GV =
-      new GlobalVariable(M, Builder.getInt64Ty(), false,
-                         GlobalValue::InternalLinkage, nullptr, "gv");
-  BasicBlock *FEntry = BasicBlock::Create(Context, "", F);
-  BasicBlock *GEntry = BasicBlock::Create(Context, "", G);
-  Builder.SetInsertPoint(FEntry);
-  Builder.CreateStore(Builder.getInt64(0), GV);
-  Builder.CreateRetVoid();
-  Builder.SetInsertPoint(GEntry);
-  Builder.CreateStore(Builder.getInt64(1), GV);
-  Builder.CreateRetVoid();
-
-  Solver.MarkBlockExecutable(FEntry);
-  Solver.MarkBlockExecutable(GEntry);
-  Solver.Solve();
-
-  auto MemGV = TestLatticeKey(GV, IPOGrouping::Memory);
-  EXPECT_TRUE(Solver.getExistingValueState(MemGV).isOverdefined());
-}
-
-/// Test that we propagate information through function returns.
-///
-/// define internal i64 @f(i1* %cond) {
-/// if:
-///   %0 = load i1, i1* %cond
-///   br i1 %0, label %then, label %else
-///
-/// then:
-///   ret i64 1
-///
-/// else:
-///   ret i64 1
-/// }
-///
-/// For this test, we initially mark "f" executable, and the solver computes
-/// the return value of the function as constant.
-TEST_F(SparsePropagationTest, FunctionDefined) {
-  Function *F =
-      Function::Create(FunctionType::get(Builder.getInt64Ty(),
-                                         {Type::getInt1PtrTy(Context)}, false),
-                       GlobalValue::InternalLinkage, "f", &M);
-  BasicBlock *If = BasicBlock::Create(Context, "if", F);
-  BasicBlock *Then = BasicBlock::Create(Context, "then", F);
-  BasicBlock *Else = BasicBlock::Create(Context, "else", F);
-  F->arg_begin()->setName("cond");
-  Builder.SetInsertPoint(If);
-  LoadInst *Cond = Builder.CreateLoad(Type::getInt1Ty(Context), F->arg_begin());
-  Builder.CreateCondBr(Cond, Then, Else);
-  Builder.SetInsertPoint(Then);
-  Builder.CreateRet(Builder.getInt64(1));
-  Builder.SetInsertPoint(Else);
-  Builder.CreateRet(Builder.getInt64(1));
-
-  Solver.MarkBlockExecutable(If);
-  Solver.Solve();
-
-  auto RetF = TestLatticeKey(F, IPOGrouping::Return);
-  EXPECT_TRUE(Solver.getExistingValueState(RetF).isConstant());
-}
-
-/// Test that we propagate information through function returns.
-///
-/// define internal i64 @f(i1* %cond) {
-/// if:
-///   %0 = load i1, i1* %cond
-///   br i1 %0, label %then, label %else
-///
-/// then:
-///   ret i64 0
-///
-/// else:
-///   ret i64 1
-/// }
-///
-/// For this test, we initially mark "f" executable, and the solver computes
-/// the return value of the function as overdefined.
-TEST_F(SparsePropagationTest, FunctionOverDefined) {
-  Function *F =
-      Function::Create(FunctionType::get(Builder.getInt64Ty(),
-                                         {Type::getInt1PtrTy(Context)}, false),
-                       GlobalValue::InternalLinkage, "f", &M);
-  BasicBlock *If = BasicBlock::Create(Context, "if", F);
-  BasicBlock *Then = BasicBlock::Create(Context, "then", F);
-  BasicBlock *Else = BasicBlock::Create(Context, "else", F);
-  F->arg_begin()->setName("cond");
-  Builder.SetInsertPoint(If);
-  LoadInst *Cond = Builder.CreateLoad(Type::getInt1Ty(Context), F->arg_begin());
-  Builder.CreateCondBr(Cond, Then, Else);
-  Builder.SetInsertPoint(Then);
-  Builder.CreateRet(Builder.getInt64(0));
-  Builder.SetInsertPoint(Else);
-  Builder.CreateRet(Builder.getInt64(1));
-
-  Solver.MarkBlockExecutable(If);
-  Solver.Solve();
-
-  auto RetF = TestLatticeKey(F, IPOGrouping::Return);
-  EXPECT_TRUE(Solver.getExistingValueState(RetF).isOverdefined());
-}
-
-/// Test that we propagate information through arguments.
-///
-/// define internal void @f() {
-///   call void @g(i64 0, i64 1)
-///   call void @g(i64 1, i64 1)
-///   ret void
-/// }
-///
-/// define internal void @g(i64 %a, i64 %b) {
-///   ret void
-/// }
-///
-/// For this test, we initially mark "f" executable, and the solver discovers
-/// "g" because of the calls in "f". The solver computes the state of argument
-/// "a" as overdefined and the state of "b" as constant.
-///
-/// In addition, this test demonstrates that ComputeInstructionState can alter
-/// the state of multiple lattice values, in addition to the one associated
-/// with the instruction definition. Each call instruction in this test updates
-/// the state of arguments "a" and "b".
-TEST_F(SparsePropagationTest, ComputeInstructionState) {
-  Function *F = Function::Create(FunctionType::get(Builder.getVoidTy(), false),
-                                 GlobalValue::InternalLinkage, "f", &M);
-  Function *G = Function::Create(
-      FunctionType::get(Builder.getVoidTy(),
-                        {Builder.getInt64Ty(), Builder.getInt64Ty()}, false),
-      GlobalValue::InternalLinkage, "g", &M);
-  Argument *A = G->arg_begin();
-  Argument *B = std::next(G->arg_begin());
-  A->setName("a");
-  B->setName("b");
-  BasicBlock *FEntry = BasicBlock::Create(Context, "", F);
-  BasicBlock *GEntry = BasicBlock::Create(Context, "", G);
-  Builder.SetInsertPoint(FEntry);
-  Builder.CreateCall(G, {Builder.getInt64(0), Builder.getInt64(1)});
-  Builder.CreateCall(G, {Builder.getInt64(1), Builder.getInt64(1)});
-  Builder.CreateRetVoid();
-  Builder.SetInsertPoint(GEntry);
-  Builder.CreateRetVoid();
-
-  Solver.MarkBlockExecutable(FEntry);
-  Solver.Solve();
-
-  auto RegA = TestLatticeKey(A, IPOGrouping::Register);
-  auto RegB = TestLatticeKey(B, IPOGrouping::Register);
-  EXPECT_TRUE(Solver.getExistingValueState(RegA).isOverdefined());
-  EXPECT_TRUE(Solver.getExistingValueState(RegB).isConstant());
-}
-
-/// Test that we can handle exceptional terminator instructions.
-///
-/// declare internal void @p()
-///
-/// declare internal void @g()
-///
-/// define internal void @f() personality i8* bitcast (void ()* @p to i8*) {
-/// entry:
-///   invoke void @g()
-///           to label %exit unwind label %catch.pad
-///
-/// catch.pad:
-///   %0 = catchswitch within none [label %catch.body] unwind to caller
-///
-/// catch.body:
-///   %1 = catchpad within %0 []
-///   catchret from %1 to label %exit
-///
-/// exit:
-///   ret void
-/// }
-///
-/// For this test, we initially mark the entry block executable. The solver
-/// then discovers the rest of the blocks in the function are executable.
-TEST_F(SparsePropagationTest, ExceptionalTerminatorInsts) {
-  Function *P = Function::Create(FunctionType::get(Builder.getVoidTy(), false),
-                                 GlobalValue::InternalLinkage, "p", &M);
-  Function *G = Function::Create(FunctionType::get(Builder.getVoidTy(), false),
-                                 GlobalValue::InternalLinkage, "g", &M);
-  Function *F = Function::Create(FunctionType::get(Builder.getVoidTy(), false),
-                                 GlobalValue::InternalLinkage, "f", &M);
-  Constant *C =
-      ConstantExpr::getCast(Instruction::BitCast, P, Builder.getInt8PtrTy());
-  F->setPersonalityFn(C);
-  BasicBlock *Entry = BasicBlock::Create(Context, "entry", F);
-  BasicBlock *Pad = BasicBlock::Create(Context, "catch.pad", F);
-  BasicBlock *Body = BasicBlock::Create(Context, "catch.body", F);
-  BasicBlock *Exit = BasicBlock::Create(Context, "exit", F);
-  Builder.SetInsertPoint(Entry);
-  Builder.CreateInvoke(G, Exit, Pad);
-  Builder.SetInsertPoint(Pad);
-  CatchSwitchInst *CatchSwitch =
-      Builder.CreateCatchSwitch(ConstantTokenNone::get(Context), nullptr, 1);
-  CatchSwitch->addHandler(Body);
-  Builder.SetInsertPoint(Body);
-  CatchPadInst *CatchPad = Builder.CreateCatchPad(CatchSwitch, {});
-  Builder.CreateCatchRet(CatchPad, Exit);
-  Builder.SetInsertPoint(Exit);
-  Builder.CreateRetVoid();
-
-  Solver.MarkBlockExecutable(Entry);
-  Solver.Solve();
-
-  EXPECT_TRUE(Solver.isBlockExecutable(Pad));
-  EXPECT_TRUE(Solver.isBlockExecutable(Body));
-  EXPECT_TRUE(Solver.isBlockExecutable(Exit));
-}
diff --git a/gnu/llvm/llvm/unittests/Analysis/TBAATest.cpp b/gnu/llvm/llvm/unittests/Analysis/TBAATest.cpp
deleted file mode 100644
index 5a71c74a80b..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/TBAATest.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-//===--- TBAATest.cpp - Mixed TBAA unit tests -----------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/AliasAnalysisEvaluator.h"
-#include "llvm/Analysis/Passes.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/LegacyPassManager.h"
-#include "llvm/IR/MDBuilder.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/Verifier.h"
-#include "llvm/Support/CommandLine.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-namespace {
-
-class TBAATest : public testing::Test {
-protected:
-  TBAATest() : M("TBAATest", C), MD(C) {}
-
-  LLVMContext C;
-  Module M;
-  MDBuilder MD;
-};
-
-static StoreInst *getFunctionWithSingleStore(Module *M, StringRef Name) {
-  auto &C = M->getContext();
-  FunctionType *FTy = FunctionType::get(Type::getVoidTy(C), {});
-  auto *F = Function::Create(FTy, Function::ExternalLinkage, Name, M);
-  auto *BB = BasicBlock::Create(C, "entry", F);
-  auto *IntType = Type::getInt32Ty(C);
-  auto *PtrType = Type::getInt32PtrTy(C);
-  auto *SI = new StoreInst(ConstantInt::get(IntType, 42),
-                           ConstantPointerNull::get(PtrType), BB);
-  ReturnInst::Create(C, nullptr, BB);
-
-  return SI;
-}
-
-TEST_F(TBAATest, checkVerifierBehaviorForOldTBAA) {
-  auto *SI = getFunctionWithSingleStore(&M, "f1");
-  auto *F = SI->getFunction();
-
-  // C++ unit test case to avoid going through the auto upgrade logic.
-  auto *RootMD = MD.createTBAARoot("Simple C/C++ TBAA");
-  auto *MD1 = MD.createTBAANode("omnipotent char", RootMD);
-  auto *MD2 = MD.createTBAANode("int", MD1);
-  SI->setMetadata(LLVMContext::MD_tbaa, MD2);
-
-  SmallVector<char, 0> ErrorMsg;
-  raw_svector_ostream Outs(ErrorMsg);
-
-  StringRef ExpectedFailureMsg(
-      "Old-style TBAA is no longer allowed, use struct-path TBAA instead");
-
-  EXPECT_TRUE(verifyFunction(*F, &Outs));
-  EXPECT_TRUE(StringRef(ErrorMsg.begin(), ErrorMsg.size())
-                  .startswith(ExpectedFailureMsg));
-}
-
-TEST_F(TBAATest, checkTBAAMerging) {
-  auto *SI = getFunctionWithSingleStore(&M, "f2");
-  auto *F = SI->getFunction();
-
-  auto *RootMD = MD.createTBAARoot("tbaa-root");
-  auto *MD1 = MD.createTBAANode("scalar-a", RootMD);
-  auto *StructTag1 = MD.createTBAAStructTagNode(MD1, MD1, 0);
-  auto *MD2 = MD.createTBAANode("scalar-b", RootMD);
-  auto *StructTag2 = MD.createTBAAStructTagNode(MD2, MD2, 0);
-
-  auto *GenericMD = MDNode::getMostGenericTBAA(StructTag1, StructTag2);
-
-  EXPECT_EQ(GenericMD, nullptr);
-
-  // Despite GenericMD being nullptr, we expect the setMetadata call to be well
-  // defined and produce a well-formed function.
-  SI->setMetadata(LLVMContext::MD_tbaa, GenericMD);
-
-  EXPECT_TRUE(!verifyFunction(*F));
-}
-
-} // end anonymous namspace
-} // end llvm namespace
diff --git a/gnu/llvm/llvm/unittests/Analysis/TFUtilsTest.cpp b/gnu/llvm/llvm/unittests/Analysis/TFUtilsTest.cpp
deleted file mode 100644
index 1dfa8e10b73..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/TFUtilsTest.cpp
+++ /dev/null
@@ -1,285 +0,0 @@
-//===- TFUtilsTest.cpp - test for TFUtils ---------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/Utils/TFUtils.h"
-#include "tensorflow/core/example/example.pb.h"
-#include "tensorflow/core/example/feature.pb.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Dominators.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Support/SourceMgr.h"
-#include "llvm/Testing/Support/SupportHelpers.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-extern const char *TestMainArgv0;
-
-// NOTE! This test model is currently also used by test/Transforms/Inline/ML tests
-//- relevant if updating this model.
-static std::string getModelPath() {
-  SmallString<128> InputsDir = unittest::getInputFileDirectory(TestMainArgv0);
-  llvm::sys::path::append(InputsDir, "ir2native_x86_64_model");
-  return std::string(InputsDir);
-}
-
-// Test observable behavior when no model is provided.
-TEST(TFUtilsTest, NoModel) {
-  TFModelEvaluator Evaluator("", {}, {});
-  EXPECT_FALSE(Evaluator.isValid());
-}
-
-// Test we can correctly load a savedmodel and evaluate it.
-TEST(TFUtilsTest, LoadAndExecuteTest) {
-  // We use the ir2native model for test. We know it has one feature of
-  // dimension (1, 214)
-  const static int64_t KnownSize = 214;
-  std::vector<TensorSpec> InputSpecs{TensorSpec::createSpec<int32_t>(
-      "serving_default_input_1", {1, KnownSize})};
-  std::vector<TensorSpec> OutputSpecs{
-      TensorSpec::createSpec<float>("StatefulPartitionedCall", {1})};
-
-  TFModelEvaluator Evaluator(getModelPath(), InputSpecs, OutputSpecs);
-  EXPECT_TRUE(Evaluator.isValid());
-
-  int32_t *V = Evaluator.getInput<int32_t>(0);
-  // Fill it up with 1's, we know the output.
-  for (auto I = 0; I < KnownSize; ++I) {
-    V[I] = 1;
-  }
-  {
-    auto ER = Evaluator.evaluate();
-    EXPECT_TRUE(ER.hasValue());
-    float Ret = *ER->getTensorValue<float>(0);
-    EXPECT_EQ(static_cast<int64_t>(Ret), 80);
-    EXPECT_EQ(ER->getUntypedTensorValue(0),
-              reinterpret_cast<const void *>(ER->getTensorValue<float>(0)));
-  }
-  // The input vector should be unchanged
-  for (auto I = 0; I < KnownSize; ++I) {
-    EXPECT_EQ(V[I], 1);
-  }
-  // Zero-out the unused position '0' of the instruction histogram, which is
-  // after the first 9 calculated values. Should the the same result.
-  V[9] = 0;
-  {
-    auto ER = Evaluator.evaluate();
-    EXPECT_TRUE(ER.hasValue());
-    float Ret = *ER->getTensorValue<float>(0);
-    EXPECT_EQ(static_cast<int64_t>(Ret), 80);
-  }
-}
-
-// Test incorrect input setup
-TEST(TFUtilsTest, EvalError) {
-  // We use the ir2native model for test. We know it has one feature of
-  // dimension (1, 214)
-  const static int64_t KnownSize = 213;
-  std::vector<TensorSpec> InputSpecs{TensorSpec::createSpec<int32_t>(
-      "serving_default_input_1", {1, KnownSize})};
-  std::vector<TensorSpec> OutputSpecs{
-      TensorSpec::createSpec<float>("StatefulPartitionedCall", {1})};
-
-  TFModelEvaluator Evaluator(getModelPath(), InputSpecs, OutputSpecs);
-  EXPECT_TRUE(Evaluator.isValid());
-
-  int32_t *V = Evaluator.getInput<int32_t>(0);
-  // Fill it up with 1's, we know the output.
-  for (auto I = 0; I < KnownSize; ++I) {
-    V[I] = 1;
-  }
-  auto ER = Evaluator.evaluate();
-  EXPECT_FALSE(ER.hasValue());
-  EXPECT_FALSE(Evaluator.isValid());
-}
-
-TEST(TFUtilsTest, JSONParsing) {
-  auto Value = json::parse(
-      R"({"name": "tensor_name", 
-        "port": 2, 
-        "type": "int32_t", 
-        "shape":[1,4]
-        })");
-  EXPECT_TRUE(!!Value);
-  LLVMContext Ctx;
-  Optional<TensorSpec> Spec = getTensorSpecFromJSON(Ctx, *Value);
-  EXPECT_TRUE(Spec.hasValue());
-  EXPECT_EQ(*Spec, TensorSpec::createSpec<int32_t>("tensor_name", {1, 4}, 2));
-}
-
-TEST(TFUtilsTest, JSONParsingInvalidTensorType) {
-  auto Value = json::parse(
-      R"(
-        {"name": "tensor_name", 
-        "port": 2, 
-        "type": "no such type", 
-        "shape":[1,4]
-        }
-      )");
-  EXPECT_TRUE(!!Value);
-  LLVMContext Ctx;
-  auto Spec = getTensorSpecFromJSON(Ctx, *Value);
-  EXPECT_FALSE(Spec.hasValue());
-}
-
-TEST(TFUtilsTest, TensorSpecSizesAndTypes) {
-  auto Spec1D = TensorSpec::createSpec<int16_t>("Hi1", {1});
-  auto Spec2D = TensorSpec::createSpec<int16_t>("Hi2", {1, 1});
-  auto Spec1DLarge = TensorSpec::createSpec<float>("Hi3", {10});
-  auto Spec3DLarge = TensorSpec::createSpec<float>("Hi3", {2, 4, 10});
-  EXPECT_TRUE(Spec1D.isElementType<int16_t>());
-  EXPECT_FALSE(Spec3DLarge.isElementType<double>());
-  EXPECT_EQ(Spec1D.getElementCount(), 1U);
-  EXPECT_EQ(Spec2D.getElementCount(), 1U);
-  EXPECT_EQ(Spec1DLarge.getElementCount(), 10U);
-  EXPECT_EQ(Spec3DLarge.getElementCount(), 80U);
-  EXPECT_EQ(Spec3DLarge.getElementByteSize(), sizeof(float));
-  EXPECT_EQ(Spec1D.getElementByteSize(), sizeof(int16_t));
-}
-
-#define PROTO_CHECKER(FNAME, TYPE, INDEX, EXP)                                 \
-  do {                                                                         \
-    const auto &V = Expected.feature_lists()                                   \
-                        .feature_list()                                        \
-                        .at(FNAME)                                             \
-                        .feature(INDEX)                                        \
-                        .TYPE()                                                \
-                        .value();                                              \
-    for (auto I = 0; I < V.size(); ++I)                                        \
-      EXPECT_EQ(V.at(I), EXP[I]);                                              \
-  } while (false)
-
-TEST(TFUtilsTest, Logger) {
-  std::vector<LoggedFeatureSpec> Features;
-  Features.push_back(
-      {TensorSpec::createSpec<float>("the_float", {2, 3}), None});
-  Features.push_back({TensorSpec::createSpec<int64_t>("the_int", {2}),
-                      std::string("alternate_name")});
-
-  auto Rewards = TensorSpec::createSpec<float>("reward", {1});
-  Logger L(Features, Rewards, true);
-  const float F00[]{0.0, 0.1, 0.2, 0.3, 0.4, 0.5};
-  const int64_t F01[]{2, 3};
-
-  L.logFloatValue(0, F00);
-  L.logInt64Value(1, F01);
-  L.logFloatReward(3.4);
-  const float F10[]{0.0, 1.0, 2.0, 3.0, 4.0, 5.0};
-  const int64_t F11[]{-2, -3};
-  L.logFloatValue(0, F10);
-  L.logInt64Value(1, F11);
-  L.logFloatReward(-3.0);
-  std::string Result;
-  raw_string_ostream OS(Result);
-  L.print(OS);
-
-  tensorflow::SequenceExample Expected;
-  EXPECT_TRUE(Expected.ParseFromString(Result));
-  PROTO_CHECKER("the_float", float_list, 0, F00);
-  PROTO_CHECKER("the_float", float_list, 1, F10);
-  PROTO_CHECKER("alternate_name", int64_list, 0, F01);
-  PROTO_CHECKER("alternate_name", int64_list, 1, F11);
-  float R0[]{3.4};
-  float R1[]{-3.0};
-  PROTO_CHECKER("reward", float_list, 0, R0);
-  PROTO_CHECKER("reward", float_list, 1, R1);
-}
-
-TEST(TFUtilsTest, LoggerInt32FeaturesAndReward) {
-  std::vector<LoggedFeatureSpec> Features;
-  Features.push_back(
-      {TensorSpec::createSpec<float>("the_float", {2, 3}), None});
-  Features.push_back({TensorSpec::createSpec<int32_t>("the_int", {2}),
-                      std::string("alternate_name")});
-
-  auto Rewards = TensorSpec::createSpec<int32_t>("reward", {1});
-  Logger L(Features, Rewards, true);
-  const float F00[]{0.0, 0.1, 0.2, 0.3, 0.4, 0.5};
-  const int32_t F01[]{2, 3};
-
-  L.logFloatValue(0, F00);
-  L.logInt32Value(1, F01);
-  L.logInt32Reward(3);
-  const float F10[]{0.0, 1.0, 2.0, 3.0, 4.0, 5.0};
-  const int32_t F11[]{-2, -3};
-  L.logFloatValue(0, F10);
-  L.logInt32Value(1, F11);
-  L.logInt32Reward(-3);
-  std::string Result;
-  raw_string_ostream OS(Result);
-  L.print(OS);
-
-  tensorflow::SequenceExample Expected;
-  EXPECT_TRUE(Expected.ParseFromString(Result));
-  PROTO_CHECKER("the_float", float_list, 0, F00);
-  PROTO_CHECKER("the_float", float_list, 1, F10);
-  PROTO_CHECKER("alternate_name", int64_list, 0, F01);
-  PROTO_CHECKER("alternate_name", int64_list, 1, F11);
-  int32_t R0[]{3};
-  int32_t R1[]{-3};
-  PROTO_CHECKER("reward", int64_list, 0, R0);
-  PROTO_CHECKER("reward", int64_list, 1, R1);
-}
-
-TEST(TFUtilsTest, LoggerNoReward) {
-  std::vector<LoggedFeatureSpec> Features;
-  Features.push_back(
-      {TensorSpec::createSpec<float>("the_float", {2, 3}), None});
-  Features.push_back({TensorSpec::createSpec<int64_t>("the_int", {2}),
-                      std::string("alternate_name")});
-
-  auto Rewards = TensorSpec::createSpec<float>("reward", {1});
-  Logger L(Features, Rewards, false);
-  const float F00[]{0.0, 0.1, 0.2, 0.3, 0.4, 0.5};
-  const int64_t F01[]{2, 3};
-
-  L.logFloatValue(0, F00);
-  L.logInt64Value(1, F01);
-  const float F10[]{0.0, 1.0, 2.0, 3.0, 4.0, 5.0};
-  const int64_t F11[]{-2, -3};
-  L.logFloatValue(0, F10);
-  L.logInt64Value(1, F11);
-
-  std::string Result;
-  raw_string_ostream OS(Result);
-  L.print(OS);
-  tensorflow::SequenceExample Expected;
-  EXPECT_TRUE(Expected.ParseFromString(Result));
-  PROTO_CHECKER("the_float", float_list, 0, F00);
-  PROTO_CHECKER("the_float", float_list, 1, F10);
-  PROTO_CHECKER("alternate_name", int64_list, 0, F01);
-  PROTO_CHECKER("alternate_name", int64_list, 1, F11);
-}
-
-TEST(TFUtilsTest, LoggerFinalReward) {
-  std::vector<LoggedFeatureSpec> Features;
-  Features.push_back({TensorSpec::createSpec<float>("the_float", {1}), None});
-  Features.push_back({TensorSpec::createSpec<int64_t>("the_int", {1}), None});
-
-  auto Rewards = TensorSpec::createSpec<float>("reward", {1});
-  Logger L(Features, Rewards, true);
-  for (int64_t I = 0; I < 3; ++I) {
-    float F = static_cast<float>(I);
-    L.logFloatValue(0, &F);
-    L.logInt64Value(1, &I);
-  }
-  L.logFloatFinalReward(3.14);
-  std::string Result;
-  raw_string_ostream OS(Result);
-  L.print(OS);
-  const float Zero[]{0.0};
-  const float R[]{3.14};
-  tensorflow::SequenceExample Expected;
-  EXPECT_TRUE(Expected.ParseFromString(Result));
-  PROTO_CHECKER("reward", float_list, 0, Zero);
-  PROTO_CHECKER("reward", float_list, 1, Zero);
-  PROTO_CHECKER("reward", float_list, 2, R);
-}
diff --git a/gnu/llvm/llvm/unittests/Analysis/TargetLibraryInfoTest.cpp b/gnu/llvm/llvm/unittests/Analysis/TargetLibraryInfoTest.cpp
deleted file mode 100644
index 8c0422aa5cd..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/TargetLibraryInfoTest.cpp
+++ /dev/null
@@ -1,602 +0,0 @@
-//===--- TargetLibraryInfoTest.cpp - TLI/LibFunc unit tests ---------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/TargetLibraryInfo.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/LegacyPassManager.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-class TargetLibraryInfoTest : public testing::Test {
-protected:
-  LLVMContext Context;
-  TargetLibraryInfoImpl TLII;
-  TargetLibraryInfo TLI;
-
-  std::unique_ptr<Module> M;
-
-  TargetLibraryInfoTest() : TLI(TLII) {}
-
-  void parseAssembly(const char *Assembly) {
-    SMDiagnostic Error;
-    M = parseAssemblyString(Assembly, Error, Context);
-
-    std::string errMsg;
-    raw_string_ostream os(errMsg);
-    Error.print("", os);
-
-    if (!M)
-      report_fatal_error(os.str());
-  }
-
-  ::testing::AssertionResult isLibFunc(const Function *FDecl,
-                                       LibFunc ExpectedLF) {
-    StringRef ExpectedLFName = TLI.getName(ExpectedLF);
-
-    if (!FDecl)
-      return ::testing::AssertionFailure() << ExpectedLFName << " not found";
-
-    LibFunc F;
-    if (!TLI.getLibFunc(*FDecl, F))
-      return ::testing::AssertionFailure() << ExpectedLFName << " invalid";
-
-    return ::testing::AssertionSuccess() << ExpectedLFName << " is LibFunc";
-  }
-};
-
-} // end anonymous namespace
-
-// Check that we don't accept egregiously incorrect prototypes.
-TEST_F(TargetLibraryInfoTest, InvalidProto) {
-  parseAssembly("%foo = type { %foo }\n");
-
-  auto *StructTy = StructType::getTypeByName(Context, "foo");
-  auto *InvalidFTy = FunctionType::get(StructTy, /*isVarArg=*/false);
-
-  for (unsigned FI = 0; FI != LibFunc::NumLibFuncs; ++FI) {
-    LibFunc LF = (LibFunc)FI;
-    auto *F = cast<Function>(
-        M->getOrInsertFunction(TLI.getName(LF), InvalidFTy).getCallee());
-    EXPECT_FALSE(isLibFunc(F, LF));
-  }
-}
-
-// Check that we do accept know-correct prototypes.
-TEST_F(TargetLibraryInfoTest, ValidProto) {
-  parseAssembly(
-      // These functions use a 64-bit size_t; use the appropriate datalayout.
-      "target datalayout = \"p:64:64:64\"\n"
-
-      // Struct pointers are replaced with an opaque pointer.
-      "%struct = type opaque\n"
-
-      // These functions were extracted as-is from the OS X headers.
-      "declare double @__cospi(double)\n"
-      "declare float @__cospif(float)\n"
-      "declare { double, double } @__sincospi_stret(double)\n"
-      "declare <2 x float> @__sincospif_stret(float)\n"
-      "declare double @__sinpi(double)\n"
-      "declare float @__sinpif(float)\n"
-      "declare i32 @abs(i32)\n"
-      "declare i32 @access(i8*, i32)\n"
-      "declare double @acos(double)\n"
-      "declare float @acosf(float)\n"
-      "declare double @acosh(double)\n"
-      "declare float @acoshf(float)\n"
-      "declare x86_fp80 @acoshl(x86_fp80)\n"
-      "declare x86_fp80 @acosl(x86_fp80)\n"
-      "declare i8* @aligned_alloc(i64, i64)\n"
-      "declare double @asin(double)\n"
-      "declare float @asinf(float)\n"
-      "declare double @asinh(double)\n"
-      "declare float @asinhf(float)\n"
-      "declare x86_fp80 @asinhl(x86_fp80)\n"
-      "declare x86_fp80 @asinl(x86_fp80)\n"
-      "declare double @atan(double)\n"
-      "declare double @atan2(double, double)\n"
-      "declare float @atan2f(float, float)\n"
-      "declare x86_fp80 @atan2l(x86_fp80, x86_fp80)\n"
-      "declare float @atanf(float)\n"
-      "declare double @atanh(double)\n"
-      "declare float @atanhf(float)\n"
-      "declare x86_fp80 @atanhl(x86_fp80)\n"
-      "declare x86_fp80 @atanl(x86_fp80)\n"
-      "declare double @atof(i8*)\n"
-      "declare i32 @atoi(i8*)\n"
-      "declare i64 @atol(i8*)\n"
-      "declare i64 @atoll(i8*)\n"
-      "declare i32 @bcmp(i8*, i8*, i64)\n"
-      "declare void @bcopy(i8*, i8*, i64)\n"
-      "declare void @bzero(i8*, i64)\n"
-      "declare i8* @calloc(i64, i64)\n"
-      "declare double @cbrt(double)\n"
-      "declare float @cbrtf(float)\n"
-      "declare x86_fp80 @cbrtl(x86_fp80)\n"
-      "declare double @ceil(double)\n"
-      "declare float @ceilf(float)\n"
-      "declare x86_fp80 @ceill(x86_fp80)\n"
-      "declare i32 @chown(i8*, i32, i32)\n"
-      "declare void @clearerr(%struct*)\n"
-      "declare double @copysign(double, double)\n"
-      "declare float @copysignf(float, float)\n"
-      "declare x86_fp80 @copysignl(x86_fp80, x86_fp80)\n"
-      "declare double @cabs([2 x double])\n"
-      "declare float @cabsf([2 x float])\n"
-      "declare x86_fp80 @cabsl([2 x x86_fp80])\n"
-      "declare double @cos(double)\n"
-      "declare float @cosf(float)\n"
-      "declare double @cosh(double)\n"
-      "declare float @coshf(float)\n"
-      "declare x86_fp80 @coshl(x86_fp80)\n"
-      "declare x86_fp80 @cosl(x86_fp80)\n"
-      "declare i8* @ctermid(i8*)\n"
-      "declare double @exp(double)\n"
-      "declare double @exp2(double)\n"
-      "declare float @exp2f(float)\n"
-      "declare x86_fp80 @exp2l(x86_fp80)\n"
-      "declare float @expf(float)\n"
-      "declare x86_fp80 @expl(x86_fp80)\n"
-      "declare double @expm1(double)\n"
-      "declare float @expm1f(float)\n"
-      "declare x86_fp80 @expm1l(x86_fp80)\n"
-      "declare double @fabs(double)\n"
-      "declare float @fabsf(float)\n"
-      "declare x86_fp80 @fabsl(x86_fp80)\n"
-      "declare i32 @fclose(%struct*)\n"
-      "declare i32 @feof(%struct*)\n"
-      "declare i32 @ferror(%struct*)\n"
-      "declare i32 @fflush(%struct*)\n"
-      "declare i32 @ffs(i32)\n"
-      "declare i32 @ffsl(i64)\n"
-      "declare i32 @ffsll(i64)\n"
-      "declare i32 @fgetc(%struct*)\n"
-      "declare i32 @fgetc_unlocked(%struct*)\n"
-      "declare i32 @fgetpos(%struct*, i64*)\n"
-      "declare i8* @fgets(i8*, i32, %struct*)\n"
-      "declare i8* @fgets_unlocked(i8*, i32, %struct*)\n"
-      "declare i32 @fileno(%struct*)\n"
-      "declare void @flockfile(%struct*)\n"
-      "declare double @floor(double)\n"
-      "declare float @floorf(float)\n"
-      "declare x86_fp80 @floorl(x86_fp80)\n"
-      "declare i32 @fls(i32)\n"
-      "declare i32 @flsl(i64)\n"
-      "declare i32 @flsll(i64)\n"
-      "declare double @fmax(double, double)\n"
-      "declare float @fmaxf(float, float)\n"
-      "declare x86_fp80 @fmaxl(x86_fp80, x86_fp80)\n"
-      "declare double @fmin(double, double)\n"
-      "declare float @fminf(float, float)\n"
-      "declare x86_fp80 @fminl(x86_fp80, x86_fp80)\n"
-      "declare double @fmod(double, double)\n"
-      "declare float @fmodf(float, float)\n"
-      "declare x86_fp80 @fmodl(x86_fp80, x86_fp80)\n"
-      "declare i32 @fprintf(%struct*, i8*, ...)\n"
-      "declare i32 @fputc(i32, %struct*)\n"
-      "declare i32 @fputc_unlocked(i32, %struct*)\n"
-      "declare i64 @fread(i8*, i64, i64, %struct*)\n"
-      "declare i64 @fread_unlocked(i8*, i64, i64, %struct*)\n"
-      "declare void @free(i8*)\n"
-      "declare double @frexp(double, i32*)\n"
-      "declare float @frexpf(float, i32*)\n"
-      "declare x86_fp80 @frexpl(x86_fp80, i32*)\n"
-      "declare i32 @fscanf(%struct*, i8*, ...)\n"
-      "declare i32 @fseek(%struct*, i64, i32)\n"
-      "declare i32 @fseeko(%struct*, i64, i32)\n"
-      "declare i32 @fsetpos(%struct*, i64*)\n"
-      "declare i32 @fstatvfs(i32, %struct*)\n"
-      "declare i64 @ftell(%struct*)\n"
-      "declare i64 @ftello(%struct*)\n"
-      "declare i32 @ftrylockfile(%struct*)\n"
-      "declare void @funlockfile(%struct*)\n"
-      "declare i32 @getc(%struct*)\n"
-      "declare i32 @getc_unlocked(%struct*)\n"
-      "declare i32 @getchar()\n"
-      "declare i32 @getchar_unlocked()\n"
-      "declare i8* @getenv(i8*)\n"
-      "declare i32 @getitimer(i32, %struct*)\n"
-      "declare i32 @getlogin_r(i8*, i64)\n"
-      "declare %struct* @getpwnam(i8*)\n"
-      "declare i8* @gets(i8*)\n"
-      "declare i32 @gettimeofday(%struct*, i8*)\n"
-      "declare i32 @_Z7isasciii(i32)\n"
-      "declare i32 @_Z7isdigiti(i32)\n"
-      "declare i64 @labs(i64)\n"
-      "declare double @ldexp(double, i32)\n"
-      "declare float @ldexpf(float, i32)\n"
-      "declare x86_fp80 @ldexpl(x86_fp80, i32)\n"
-      "declare i64 @llabs(i64)\n"
-      "declare double @log(double)\n"
-      "declare double @log10(double)\n"
-      "declare float @log10f(float)\n"
-      "declare x86_fp80 @log10l(x86_fp80)\n"
-      "declare double @log1p(double)\n"
-      "declare float @log1pf(float)\n"
-      "declare x86_fp80 @log1pl(x86_fp80)\n"
-      "declare double @log2(double)\n"
-      "declare float @log2f(float)\n"
-      "declare x86_fp80 @log2l(x86_fp80)\n"
-      "declare double @logb(double)\n"
-      "declare float @logbf(float)\n"
-      "declare x86_fp80 @logbl(x86_fp80)\n"
-      "declare float @logf(float)\n"
-      "declare x86_fp80 @logl(x86_fp80)\n"
-      "declare i8* @malloc(i64)\n"
-      "declare i8* @memccpy(i8*, i8*, i32, i64)\n"
-      "declare i8* @memchr(i8*, i32, i64)\n"
-      "declare i32 @memcmp(i8*, i8*, i64)\n"
-      "declare i8* @memcpy(i8*, i8*, i64)\n"
-      "declare i8* @memmove(i8*, i8*, i64)\n"
-      "declare i8* @memset(i8*, i32, i64)\n"
-      "declare void @memset_pattern16(i8*, i8*, i64)\n"
-      "declare i32 @mkdir(i8*, i16)\n"
-      "declare double @modf(double, double*)\n"
-      "declare float @modff(float, float*)\n"
-      "declare x86_fp80 @modfl(x86_fp80, x86_fp80*)\n"
-      "declare double @nearbyint(double)\n"
-      "declare float @nearbyintf(float)\n"
-      "declare x86_fp80 @nearbyintl(x86_fp80)\n"
-      "declare i32 @pclose(%struct*)\n"
-      "declare void @perror(i8*)\n"
-      "declare i32 @posix_memalign(i8**, i64, i64)\n"
-      "declare double @pow(double, double)\n"
-      "declare float @powf(float, float)\n"
-      "declare x86_fp80 @powl(x86_fp80, x86_fp80)\n"
-      "declare i32 @printf(i8*, ...)\n"
-      "declare i32 @putc(i32, %struct*)\n"
-      "declare i32 @putc_unlocked(i32, %struct*)\n"
-      "declare i32 @putchar(i32)\n"
-      "declare i32 @putchar_unlocked(i32)\n"
-      "declare i32 @puts(i8*)\n"
-      "declare void @qsort(i8*, i64, i64, i32 (i8*, i8*)*)\n"
-      "declare i64 @readlink(i8*, i8*, i64)\n"
-      "declare i8* @realloc(i8*, i64)\n"
-      "declare i8* @reallocf(i8*, i64)\n"
-      "declare double @remainder(double, double)\n"
-      "declare float @remainderf(float, float)\n"
-      "declare x86_fp80 @remainderl(x86_fp80, x86_fp80)\n"
-      "declare i32 @remove(i8*)\n"
-      "declare i32 @rename(i8*, i8*)\n"
-      "declare void @rewind(%struct*)\n"
-      "declare double @rint(double)\n"
-      "declare float @rintf(float)\n"
-      "declare x86_fp80 @rintl(x86_fp80)\n"
-      "declare i32 @rmdir(i8*)\n"
-      "declare double @round(double)\n"
-      "declare float @roundf(float)\n"
-      "declare x86_fp80 @roundl(x86_fp80)\n"
-      "declare double @roundeven(double)\n"
-      "declare float @roundevenf(float)\n"
-      "declare x86_fp80 @roundevenl(x86_fp80)\n"
-      "declare i32 @scanf(i8*, ...)\n"
-      "declare void @setbuf(%struct*, i8*)\n"
-      "declare i32 @setitimer(i32, %struct*, %struct*)\n"
-      "declare i32 @setvbuf(%struct*, i8*, i32, i64)\n"
-      "declare double @sin(double)\n"
-      "declare float @sinf(float)\n"
-      "declare double @sinh(double)\n"
-      "declare float @sinhf(float)\n"
-      "declare x86_fp80 @sinhl(x86_fp80)\n"
-      "declare x86_fp80 @sinl(x86_fp80)\n"
-      "declare i32 @snprintf(i8*, i64, i8*, ...)\n"
-      "declare i32 @sprintf(i8*, i8*, ...)\n"
-      "declare double @sqrt(double)\n"
-      "declare float @sqrtf(float)\n"
-      "declare x86_fp80 @sqrtl(x86_fp80)\n"
-      "declare i32 @sscanf(i8*, i8*, ...)\n"
-      "declare i32 @statvfs(i8*, %struct*)\n"
-      "declare i8* @stpcpy(i8*, i8*)\n"
-      "declare i8* @stpncpy(i8*, i8*, i64)\n"
-      "declare i32 @strcasecmp(i8*, i8*)\n"
-      "declare i8* @strcat(i8*, i8*)\n"
-      "declare i8* @strchr(i8*, i32)\n"
-      "declare i32 @strcmp(i8*, i8*)\n"
-      "declare i32 @strcoll(i8*, i8*)\n"
-      "declare i8* @strcpy(i8*, i8*)\n"
-      "declare i64 @strcspn(i8*, i8*)\n"
-      "declare i8* @strdup(i8*)\n"
-      "declare i64 @strlen(i8*)\n"
-      "declare i32 @strncasecmp(i8*, i8*, i64)\n"
-      "declare i8* @strncat(i8*, i8*, i64)\n"
-      "declare i32 @strncmp(i8*, i8*, i64)\n"
-      "declare i8* @strncpy(i8*, i8*, i64)\n"
-      "declare i8* @strndup(i8*, i64)\n"
-      "declare i64 @strnlen(i8*, i64)\n"
-      "declare i8* @strpbrk(i8*, i8*)\n"
-      "declare i8* @strrchr(i8*, i32)\n"
-      "declare i64 @strspn(i8*, i8*)\n"
-      "declare i8* @strstr(i8*, i8*)\n"
-      "declare i8* @strtok(i8*, i8*)\n"
-      "declare i8* @strtok_r(i8*, i8*, i8**)\n"
-      "declare i64 @strtol(i8*, i8**, i32)\n"
-      "declare i64 @strlcat(i8*, i8**, i64)\n"
-      "declare i64 @strlcpy(i8*, i8**, i64)\n"
-      "declare x86_fp80 @strtold(i8*, i8**)\n"
-      "declare i64 @strtoll(i8*, i8**, i32)\n"
-      "declare i64 @strtoul(i8*, i8**, i32)\n"
-      "declare i64 @strtoull(i8*, i8**, i32)\n"
-      "declare i64 @strxfrm(i8*, i8*, i64)\n"
-      "declare double @tan(double)\n"
-      "declare float @tanf(float)\n"
-      "declare double @tanh(double)\n"
-      "declare float @tanhf(float)\n"
-      "declare x86_fp80 @tanhl(x86_fp80)\n"
-      "declare x86_fp80 @tanl(x86_fp80)\n"
-      "declare i64 @times(%struct*)\n"
-      "declare %struct* @tmpfile()\n"
-      "declare i32 @_Z7toasciii(i32)\n"
-      "declare double @trunc(double)\n"
-      "declare float @truncf(float)\n"
-      "declare x86_fp80 @truncl(x86_fp80)\n"
-      "declare i32 @uname(%struct*)\n"
-      "declare i32 @ungetc(i32, %struct*)\n"
-      "declare i32 @unlink(i8*)\n"
-      "declare i32 @utime(i8*, %struct*)\n"
-      "declare i32 @utimes(i8*, %struct*)\n"
-      "declare i8* @valloc(i64)\n"
-      "declare i32 @vfprintf(%struct*, i8*, %struct*)\n"
-      "declare i32 @vfscanf(%struct*, i8*, %struct*)\n"
-      "declare i32 @vprintf(i8*, %struct*)\n"
-      "declare i32 @vscanf(i8*, %struct*)\n"
-      "declare i32 @vsnprintf(i8*, i64, i8*, %struct*)\n"
-      "declare i32 @vsprintf(i8*, i8*, %struct*)\n"
-      "declare i32 @vsscanf(i8*, i8*, %struct*)\n"
-      "declare i64 @wcslen(i32*)\n"
-      "declare i32 @fork()\n"
-      "declare i32 @execl(i8*, i8*, ...)\n"
-      "declare i32 @execle(i8*, i8*, ...)\n"
-      "declare i32 @execlp(i8*, i8*, ...)\n"
-      "declare i32 @execv(i8*, i8**)\n"
-      "declare i32 @execvP(i8*, i8*, i8**)\n"
-      "declare i32 @execve(i8*, i8**, i8**)\n"
-      "declare i32 @execvp(i8*, i8**)\n"
-      "declare i32 @execvpe(i8*, i8**, i8**)\n"
-
-      // These functions were also extracted from the OS X headers, but they are
-      // available with a special name on darwin.
-      // This test uses the default TLI name instead.
-      "declare i32 @chmod(i8*, i16)\n"
-      "declare i32 @closedir(%struct*)\n"
-      "declare %struct* @fdopen(i32, i8*)\n"
-      "declare %struct* @fopen(i8*, i8*)\n"
-      "declare i32 @fputs(i8*, %struct*)\n"
-      "declare i32 @fputs_unlocked(i8*, %struct*)\n"
-      "declare i32 @fstat(i32, %struct*)\n"
-      "declare i64 @fwrite(i8*, i64, i64, %struct*)\n"
-      "declare i64 @fwrite_unlocked(i8*, i64, i64, %struct*)\n"
-      "declare i32 @lchown(i8*, i32, i32)\n"
-      "declare i32 @lstat(i8*, %struct*)\n"
-      "declare i64 @mktime(%struct*)\n"
-      "declare i32 @open(i8*, i32, ...)\n"
-      "declare %struct* @opendir(i8*)\n"
-      "declare %struct* @popen(i8*, i8*)\n"
-      "declare i64 @pread(i32, i8*, i64, i64)\n"
-      "declare i64 @pwrite(i32, i8*, i64, i64)\n"
-      "declare i64 @read(i32, i8*, i64)\n"
-      "declare i8* @realpath(i8*, i8*)\n"
-      "declare i32 @stat(i8*, %struct*)\n"
-      "declare double @strtod(i8*, i8**)\n"
-      "declare float @strtof(i8*, i8**)\n"
-      "declare i32 @system(i8*)\n"
-      "declare i32 @unsetenv(i8*)\n"
-      "declare i64 @write(i32, i8*, i64)\n"
-
-      // These functions are available on Linux but not Darwin; they only differ
-      // from their non-64 counterparts in the struct type.
-      // Use the same prototype as the non-64 variant.
-      "declare %struct* @fopen64(i8*, i8*)\n"
-      "declare i32 @fstat64(i32, %struct*)\n"
-      "declare i32 @fstatvfs64(i32, %struct*)\n"
-      "declare i32 @lstat64(i8*, %struct*)\n"
-      "declare i32 @open64(i8*, i32, ...)\n"
-      "declare i32 @stat64(i8*, %struct*)\n"
-      "declare i32 @statvfs64(i8*, %struct*)\n"
-      "declare %struct* @tmpfile64()\n"
-
-      // These functions are also -64 variants, but do differ in the type of the
-      // off_t (vs off64_t) parameter.  The non-64 variants declared above used
-      // a 64-bit off_t, so, in practice, they are also equivalent.
-      "declare i32 @fseeko64(%struct*, i64, i32)\n"
-      "declare i64 @ftello64(%struct*)\n"
-
-      "declare void @_ZdaPv(i8*)\n"
-      "declare void @_ZdaPvRKSt9nothrow_t(i8*, %struct*)\n"
-      "declare void @_ZdaPvSt11align_val_t(i8*, i64)\n"
-      "declare void @_ZdaPvSt11align_val_tRKSt9nothrow_t(i8*, i64, %struct*)\n"
-      "declare void @_ZdaPvj(i8*, i32)\n"
-      "declare void @_ZdaPvjSt11align_val_t(i8*, i32, i32)\n"
-      "declare void @_ZdaPvm(i8*, i64)\n"
-      "declare void @_ZdaPvmSt11align_val_t(i8*, i64, i64)\n"
-      "declare void @_ZdlPv(i8*)\n"
-      "declare void @_ZdlPvRKSt9nothrow_t(i8*, %struct*)\n"
-      "declare void @_ZdlPvSt11align_val_t(i8*, i64)\n"
-      "declare void @_ZdlPvSt11align_val_tRKSt9nothrow_t(i8*, i64, %struct*)\n"
-      "declare void @_ZdlPvj(i8*, i32)\n"
-      "declare void @_ZdlPvjSt11align_val_t(i8*, i32, i32)\n"
-      "declare void @_ZdlPvm(i8*, i64)\n"
-      "declare void @_ZdlPvmSt11align_val_t(i8*, i64, i64)\n"
-      "declare i8* @_Znaj(i32)\n"
-      "declare i8* @_ZnajRKSt9nothrow_t(i32, %struct*)\n"
-      "declare i8* @_ZnajSt11align_val_t(i32, i32)\n"
-      "declare i8* @_ZnajSt11align_val_tRKSt9nothrow_t(i32, i32, %struct*)\n"
-      "declare i8* @_Znam(i64)\n"
-      "declare i8* @_ZnamRKSt9nothrow_t(i64, %struct*)\n"
-      "declare i8* @_ZnamSt11align_val_t(i64, i64)\n"
-      "declare i8* @_ZnamSt11align_val_tRKSt9nothrow_t(i64, i64, %struct*)\n"
-      "declare i8* @_Znwj(i32)\n"
-      "declare i8* @_ZnwjRKSt9nothrow_t(i32, %struct*)\n"
-      "declare i8* @_ZnwjSt11align_val_t(i32, i32)\n"
-      "declare i8* @_ZnwjSt11align_val_tRKSt9nothrow_t(i32, i32, %struct*)\n"
-      "declare i8* @_Znwm(i64)\n"
-      "declare i8* @_ZnwmRKSt9nothrow_t(i64, %struct*)\n"
-      "declare i8* @_ZnwmSt11align_val_t(i64, i64)\n"
-      "declare i8* @_ZnwmSt11align_val_tRKSt9nothrow_t(i64, i64, %struct*)\n"
-
-      "declare void @\"??3@YAXPEAX@Z\"(i8*)\n"
-      "declare void @\"??3@YAXPEAXAEBUnothrow_t@std@@@Z\"(i8*, %struct*)\n"
-      "declare void @\"??3@YAXPEAX_K@Z\"(i8*, i64)\n"
-      "declare void @\"??_V@YAXPEAX@Z\"(i8*)\n"
-      "declare void @\"??_V@YAXPEAXAEBUnothrow_t@std@@@Z\"(i8*, %struct*)\n"
-      "declare void @\"??_V@YAXPEAX_K@Z\"(i8*, i64)\n"
-      "declare i8* @\"??2@YAPAXI@Z\"(i32)\n"
-      "declare i8* @\"??2@YAPAXIABUnothrow_t@std@@@Z\"(i32, %struct*)\n"
-      "declare i8* @\"??2@YAPEAX_K@Z\"(i64)\n"
-      "declare i8* @\"??2@YAPEAX_KAEBUnothrow_t@std@@@Z\"(i64, %struct*)\n"
-      "declare i8* @\"??_U@YAPAXI@Z\"(i32)\n"
-      "declare i8* @\"??_U@YAPAXIABUnothrow_t@std@@@Z\"(i32, %struct*)\n"
-      "declare i8* @\"??_U@YAPEAX_K@Z\"(i64)\n"
-      "declare i8* @\"??_U@YAPEAX_KAEBUnothrow_t@std@@@Z\"(i64, %struct*)\n"
-
-      "declare void @\"??3@YAXPAX@Z\"(i8*)\n"
-      "declare void @\"??3@YAXPAXABUnothrow_t@std@@@Z\"(i8*, %struct*)\n"
-      "declare void @\"??3@YAXPAXI@Z\"(i8*, i32)\n"
-      "declare void @\"??_V@YAXPAX@Z\"(i8*)\n"
-      "declare void @\"??_V@YAXPAXABUnothrow_t@std@@@Z\"(i8*, %struct*)\n"
-      "declare void @\"??_V@YAXPAXI@Z\"(i8*, i32)\n"
-
-      // These other functions were derived from the .def C declaration.
-      "declare i32 @__cxa_atexit(void (i8*)*, i8*, i8*)\n"
-      "declare void @__cxa_guard_abort(%struct*)\n"
-      "declare i32 @__cxa_guard_acquire(%struct*)\n"
-      "declare void @__cxa_guard_release(%struct*)\n"
-
-      "declare i32 @__nvvm_reflect(i8*)\n"
-
-      "declare i8* @__memcpy_chk(i8*, i8*, i64, i64)\n"
-      "declare i8* @__memmove_chk(i8*, i8*, i64, i64)\n"
-      "declare i8* @__memset_chk(i8*, i32, i64, i64)\n"
-      "declare i8* @__stpcpy_chk(i8*, i8*, i64)\n"
-      "declare i8* @__stpncpy_chk(i8*, i8*, i64, i64)\n"
-      "declare i8* @__strcpy_chk(i8*, i8*, i64)\n"
-      "declare i8* @__strncpy_chk(i8*, i8*, i64, i64)\n"
-      "declare i8* @__memccpy_chk(i8*, i8*, i32, i64)\n"
-      "declare i8* @__mempcpy_chk(i8*, i8*, i64, i64)\n"
-      "declare i32 @__snprintf_chk(i8*, i64, i32, i64, i8*, ...)\n"
-      "declare i32 @__sprintf_chk(i8*, i32, i64, i8*, ...)\n"
-      "declare i8* @__strcat_chk(i8*, i8*, i64)\n"
-      "declare i64 @__strlcat_chk(i8*, i8*, i64, i64)\n"
-      "declare i64 @__strlen_chk(i8*, i64)\n"
-      "declare i8* @__strncat_chk(i8*, i8*, i64, i64)\n"
-      "declare i64 @__strlcpy_chk(i8*, i8*, i64, i64)\n"
-      "declare i32 @__vsnprintf_chk(i8*, i64, i32, i64, i8*, %struct*)\n"
-      "declare i32 @__vsprintf_chk(i8*, i32, i64, i8*, %struct*)\n"
-
-      "declare i8* @memalign(i64, i64)\n"
-      "declare i8* @mempcpy(i8*, i8*, i64)\n"
-      "declare i8* @memrchr(i8*, i32, i64)\n"
-
-      "declare void @__atomic_load(i64, i8*, i8*, i32)\n"
-      "declare void @__atomic_store(i64, i8*, i8*, i32)\n"
-
-      // These are similar to the FILE* fgetc/fputc.
-      "declare i32 @_IO_getc(%struct*)\n"
-      "declare i32 @_IO_putc(i32, %struct*)\n"
-
-      "declare i32 @__isoc99_scanf(i8*, ...)\n"
-      "declare i32 @__isoc99_sscanf(i8*, i8*, ...)\n"
-      "declare i8* @__strdup(i8*)\n"
-      "declare i8* @__strndup(i8*, i64)\n"
-      "declare i8* @__strtok_r(i8*, i8*, i8**)\n"
-
-      "declare double @__sqrt_finite(double)\n"
-      "declare float @__sqrtf_finite(float)\n"
-      "declare x86_fp80 @__sqrtl_finite(x86_fp80)\n"
-      "declare double @exp10(double)\n"
-      "declare float @exp10f(float)\n"
-      "declare x86_fp80 @exp10l(x86_fp80)\n"
-
-      // These printf variants have the same prototype as the non-'i' versions.
-      "declare i32 @fiprintf(%struct*, i8*, ...)\n"
-      "declare i32 @iprintf(i8*, ...)\n"
-      "declare i32 @siprintf(i8*, i8*, ...)\n"
-
-      // __small_printf variants have the same prototype as the non-'i' versions.
-      "declare i32 @__small_fprintf(%struct*, i8*, ...)\n"
-      "declare i32 @__small_printf(i8*, ...)\n"
-      "declare i32 @__small_sprintf(i8*, i8*, ...)\n"
-
-      "declare i32 @htonl(i32)\n"
-      "declare i16 @htons(i16)\n"
-      "declare i32 @ntohl(i32)\n"
-      "declare i16 @ntohs(i16)\n"
-
-      "declare i32 @isascii(i32)\n"
-      "declare i32 @isdigit(i32)\n"
-      "declare i32 @toascii(i32)\n"
-
-      // These functions were extracted from math-finite.h which provides
-      // functions similar to those in math.h, but optimized for handling
-      // finite values only.
-      "declare double @__acos_finite(double)\n"
-      "declare float @__acosf_finite(float)\n"
-      "declare x86_fp80 @__acosl_finite(x86_fp80)\n"
-      "declare double @__acosh_finite(double)\n"
-      "declare float @__acoshf_finite(float)\n"
-      "declare x86_fp80 @__acoshl_finite(x86_fp80)\n"
-      "declare double @__asin_finite(double)\n"
-      "declare float @__asinf_finite(float)\n"
-      "declare x86_fp80 @__asinl_finite(x86_fp80)\n"
-      "declare double @__atan2_finite(double, double)\n"
-      "declare float @__atan2f_finite(float, float)\n"
-      "declare x86_fp80 @__atan2l_finite(x86_fp80, x86_fp80)\n"
-      "declare double @__atanh_finite(double)\n"
-      "declare float @__atanhf_finite(float)\n"
-      "declare x86_fp80 @__atanhl_finite(x86_fp80)\n"
-      "declare double @__cosh_finite(double)\n"
-      "declare float @__coshf_finite(float)\n"
-      "declare x86_fp80 @__coshl_finite(x86_fp80)\n"
-      "declare double @__exp10_finite(double)\n"
-      "declare float @__exp10f_finite(float)\n"
-      "declare x86_fp80 @__exp10l_finite(x86_fp80)\n"
-      "declare double @__exp2_finite(double)\n"
-      "declare float @__exp2f_finite(float)\n"
-      "declare x86_fp80 @__exp2l_finite(x86_fp80)\n"
-      "declare double @__exp_finite(double)\n"
-      "declare float @__expf_finite(float)\n"
-      "declare x86_fp80 @__expl_finite(x86_fp80)\n"
-      "declare double @__log10_finite(double)\n"
-      "declare float @__log10f_finite(float)\n"
-      "declare x86_fp80 @__log10l_finite(x86_fp80)\n"
-      "declare double @__log2_finite(double)\n"
-      "declare float @__log2f_finite(float)\n"
-      "declare x86_fp80 @__log2l_finite(x86_fp80)\n"
-      "declare double @__log_finite(double)\n"
-      "declare float @__logf_finite(float)\n"
-      "declare x86_fp80 @__logl_finite(x86_fp80)\n"
-      "declare double @__pow_finite(double, double)\n"
-      "declare float @__powf_finite(float, float)\n"
-      "declare x86_fp80 @__powl_finite(x86_fp80, x86_fp80)\n"
-      "declare double @__sinh_finite(double)\n"
-      "declare float @__sinhf_finite(float)\n"
-      "declare x86_fp80 @__sinhl_finite(x86_fp80)\n"
-
-      // These functions are aix vec allocation/free routines
-      "declare i8* @vec_calloc(i64, i64)\n"
-      "declare i8* @vec_malloc(i64)\n"
-      "declare i8* @vec_realloc(i8*, i64)\n"
-      "declare void @vec_free(i8*)\n"
-
-      // These functions are OpenMP Offloading allocation / free routines
-      "declare i8* @__kmpc_alloc_shared(i64)\n"
-      "declare void @__kmpc_free_shared(i8*, i64)\n"
-      );
-
-  for (unsigned FI = 0; FI != LibFunc::NumLibFuncs; ++FI) {
-    LibFunc LF = (LibFunc)FI;
-    // Make sure everything is available; we're not testing target defaults.
-    TLII.setAvailable(LF);
-    Function *F = M->getFunction(TLI.getName(LF));
-    EXPECT_TRUE(isLibFunc(F, LF));
-  }
-}
diff --git a/gnu/llvm/llvm/unittests/Analysis/UnrollAnalyzerTest.cpp b/gnu/llvm/llvm/unittests/Analysis/UnrollAnalyzerTest.cpp
deleted file mode 100644
index 2f9135d4fb2..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/UnrollAnalyzerTest.cpp
+++ /dev/null
@@ -1,331 +0,0 @@
-//===- UnrollAnalyzerTest.cpp - UnrollAnalyzer unit tests -----------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/LoopInfo.h"
-#include "llvm/Analysis/LoopUnrollAnalyzer.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Dominators.h"
-#include "llvm/IR/LegacyPassManager.h"
-#include "llvm/InitializePasses.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-namespace llvm {
-void initializeUnrollAnalyzerTestPass(PassRegistry &);
-
-static SmallVector<DenseMap<Value *, Value *>, 16> SimplifiedValuesVector;
-static unsigned TripCount = 0;
-
-namespace {
-struct UnrollAnalyzerTest : public FunctionPass {
-  static char ID;
-  bool runOnFunction(Function &F) override {
-    LoopInfo *LI = &getAnalysis<LoopInfoWrapperPass>().getLoopInfo();
-    ScalarEvolution *SE = &getAnalysis<ScalarEvolutionWrapperPass>().getSE();
-
-    Function::iterator FI = F.begin();
-    FI++; // First basic block is entry - skip it.
-    BasicBlock *Header = &*FI++;
-    Loop *L = LI->getLoopFor(Header);
-    BasicBlock *Exiting = L->getExitingBlock();
-
-    SimplifiedValuesVector.clear();
-    TripCount = SE->getSmallConstantTripCount(L, Exiting);
-    for (unsigned Iteration = 0; Iteration < TripCount; Iteration++) {
-      DenseMap<Value *, Value *> SimplifiedValues;
-      UnrolledInstAnalyzer Analyzer(Iteration, SimplifiedValues, *SE, L);
-      for (auto *BB : L->getBlocks())
-        for (Instruction &I : *BB)
-          Analyzer.visit(I);
-      SimplifiedValuesVector.push_back(SimplifiedValues);
-    }
-    return false;
-  }
-  void getAnalysisUsage(AnalysisUsage &AU) const override {
-    AU.addRequired<DominatorTreeWrapperPass>();
-    AU.addRequired<LoopInfoWrapperPass>();
-    AU.addRequired<ScalarEvolutionWrapperPass>();
-    AU.setPreservesAll();
-  }
-  UnrollAnalyzerTest() : FunctionPass(ID) {
-    initializeUnrollAnalyzerTestPass(*PassRegistry::getPassRegistry());
-  }
-};
-}
-
-char UnrollAnalyzerTest::ID = 0;
-
-std::unique_ptr<Module> makeLLVMModule(LLVMContext &Context,
-                                       const char *ModuleStr) {
-  SMDiagnostic Err;
-  return parseAssemblyString(ModuleStr, Err, Context);
-}
-
-TEST(UnrollAnalyzerTest, BasicSimplifications) {
-  const char *ModuleStr =
-      "target datalayout = \"e-m:o-i64:64-f80:128-n8:16:32:64-S128\"\n"
-      "define i64 @propagate_loop_phis() {\n"
-      "entry:\n"
-      "  br label %loop\n"
-      "loop:\n"
-      "  %iv = phi i64 [ 0, %entry ], [ %inc, %loop ]\n"
-      "  %x0 = phi i64 [ 0, %entry ], [ %x2, %loop ]\n"
-      "  %x1 = or i64 %x0, 1\n"
-      "  %x2 = or i64 %x1, 2\n"
-      "  %inc = add nuw nsw i64 %iv, 1\n"
-      "  %cond = icmp sge i64 %inc, 8\n"
-      "  br i1 %cond, label %loop.end, label %loop\n"
-      "loop.end:\n"
-      "  %x.lcssa = phi i64 [ %x2, %loop ]\n"
-      "  ret i64 %x.lcssa\n"
-      "}\n";
-  UnrollAnalyzerTest *P = new UnrollAnalyzerTest();
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleStr);
-  legacy::PassManager Passes;
-  Passes.add(P);
-  Passes.run(*M);
-
-  // Perform checks
-  Module::iterator MI = M->begin();
-  Function *F = &*MI++;
-  Function::iterator FI = F->begin();
-  FI++; // First basic block is entry - skip it.
-  BasicBlock *Header = &*FI++;
-
-  BasicBlock::iterator BBI = Header->begin();
-  std::advance(BBI, 4);
-  Instruction *Y1 = &*BBI++;
-  Instruction *Y2 = &*BBI++;
-  // Check simplification expected on the 1st iteration.
-  // Check that "%inc = add nuw nsw i64 %iv, 1" is simplified to 1
-  auto I1 = SimplifiedValuesVector[0].find(Y1);
-  EXPECT_TRUE(I1 != SimplifiedValuesVector[0].end());
-  EXPECT_EQ(cast<ConstantInt>((*I1).second)->getZExtValue(), 1U);
-
-  // Check that "%cond = icmp sge i64 %inc, 10" is simplified to false
-  auto I2 = SimplifiedValuesVector[0].find(Y2);
-  EXPECT_TRUE(I2 != SimplifiedValuesVector[0].end());
-  EXPECT_FALSE(cast<ConstantInt>((*I2).second)->getZExtValue());
-
-  // Check simplification expected on the last iteration.
-  // Check that "%inc = add nuw nsw i64 %iv, 1" is simplified to 8
-  I1 = SimplifiedValuesVector[TripCount - 1].find(Y1);
-  EXPECT_TRUE(I1 != SimplifiedValuesVector[TripCount - 1].end());
-  EXPECT_EQ(cast<ConstantInt>((*I1).second)->getZExtValue(), TripCount);
-
-  // Check that "%cond = icmp sge i64 %inc, 10" is simplified to false
-  I2 = SimplifiedValuesVector[TripCount - 1].find(Y2);
-  EXPECT_TRUE(I2 != SimplifiedValuesVector[TripCount - 1].end());
-  EXPECT_TRUE(cast<ConstantInt>((*I2).second)->getZExtValue());
-}
-
-TEST(UnrollAnalyzerTest, OuterLoopSimplification) {
-  const char *ModuleStr =
-      "target datalayout = \"e-m:o-i64:64-f80:128-n8:16:32:64-S128\"\n"
-      "define void @foo() {\n"
-      "entry:\n"
-      "  br label %outer.loop\n"
-      "outer.loop:\n"
-      "  %iv.outer = phi i64 [ 0, %entry ], [ %iv.outer.next, %outer.loop.latch ]\n"
-      "  %iv.outer.next = add nuw nsw i64 %iv.outer, 1\n"
-      "  br label %inner.loop\n"
-      "inner.loop:\n"
-      "  %iv.inner = phi i64 [ 0, %outer.loop ], [ %iv.inner.next, %inner.loop ]\n"
-      "  %iv.inner.next = add nuw nsw i64 %iv.inner, 1\n"
-      "  %exitcond.inner = icmp eq i64 %iv.inner.next, 1000\n"
-      "  br i1 %exitcond.inner, label %outer.loop.latch, label %inner.loop\n"
-      "outer.loop.latch:\n"
-      "  %exitcond.outer = icmp eq i64 %iv.outer.next, 40\n"
-      "  br i1 %exitcond.outer, label %exit, label %outer.loop\n"
-      "exit:\n"
-      "  ret void\n"
-      "}\n";
-
-  UnrollAnalyzerTest *P = new UnrollAnalyzerTest();
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleStr);
-  legacy::PassManager Passes;
-  Passes.add(P);
-  Passes.run(*M);
-
-  Module::iterator MI = M->begin();
-  Function *F = &*MI++;
-  Function::iterator FI = F->begin();
-  FI++;
-  BasicBlock *Header = &*FI++;
-  BasicBlock *InnerBody = &*FI++;
-
-  BasicBlock::iterator BBI = Header->begin();
-  BBI++;
-  Instruction *Y1 = &*BBI;
-  BBI = InnerBody->begin();
-  BBI++;
-  Instruction *Y2 = &*BBI;
-  // Check that we can simplify IV of the outer loop, but can't simplify the IV
-  // of the inner loop if we only know the iteration number of the outer loop.
-  //
-  //  Y1 is %iv.outer.next, Y2 is %iv.inner.next
-  auto I1 = SimplifiedValuesVector[0].find(Y1);
-  EXPECT_TRUE(I1 != SimplifiedValuesVector[0].end());
-  auto I2 = SimplifiedValuesVector[0].find(Y2);
-  EXPECT_TRUE(I2 == SimplifiedValuesVector[0].end());
-}
-TEST(UnrollAnalyzerTest, CmpSimplifications) {
-  const char *ModuleStr =
-      "target datalayout = \"e-m:o-i64:64-f80:128-n8:16:32:64-S128\"\n"
-      "define void @branch_iv_trunc() {\n"
-      "entry:\n"
-      "  br label %for.body\n"
-      "for.body:\n"
-      "  %indvars.iv = phi i64 [ 0, %entry ], [ %tmp3, %for.body ]\n"
-      "  %tmp2 = trunc i64 %indvars.iv to i32\n"
-      "  %cmp3 = icmp eq i32 %tmp2, 5\n"
-      "  %tmp3 = add nuw nsw i64 %indvars.iv, 1\n"
-      "  %exitcond = icmp eq i64 %tmp3, 10\n"
-      "  br i1 %exitcond, label %for.end, label %for.body\n"
-      "for.end:\n"
-      "  ret void\n"
-      "}\n";
-  UnrollAnalyzerTest *P = new UnrollAnalyzerTest();
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleStr);
-  legacy::PassManager Passes;
-  Passes.add(P);
-  Passes.run(*M);
-
-  // Perform checks
-  Module::iterator MI = M->begin();
-  Function *F = &*MI++;
-  Function::iterator FI = F->begin();
-  FI++; // First basic block is entry - skip it.
-  BasicBlock *Header = &*FI++;
-
-  BasicBlock::iterator BBI = Header->begin();
-  BBI++;
-  Instruction *Y1 = &*BBI++;
-  Instruction *Y2 = &*BBI++;
-  // Check simplification expected on the 5th iteration.
-  // Check that "%tmp2 = trunc i64 %indvars.iv to i32" is simplified to 5
-  // and "%cmp3 = icmp eq i32 %tmp2, 5" is simplified to 1 (i.e. true).
-  auto I1 = SimplifiedValuesVector[5].find(Y1);
-  EXPECT_TRUE(I1 != SimplifiedValuesVector[5].end());
-  EXPECT_EQ(cast<ConstantInt>((*I1).second)->getZExtValue(), 5U);
-  auto I2 = SimplifiedValuesVector[5].find(Y2);
-  EXPECT_TRUE(I2 != SimplifiedValuesVector[5].end());
-  EXPECT_EQ(cast<ConstantInt>((*I2).second)->getZExtValue(), 1U);
-}
-TEST(UnrollAnalyzerTest, PtrCmpSimplifications) {
-  const char *ModuleStr =
-      "target datalayout = \"e-m:o-i64:64-f80:128-n8:16:32:64-S128\"\n"
-      "define void @ptr_cmp(i8 *%a) {\n"
-      "entry:\n"
-      "  %limit = getelementptr i8, i8* %a, i64 40\n"
-      "  %start.iv2 = getelementptr i8, i8* %a, i64 7\n"
-      "  br label %loop.body\n"
-      "loop.body:\n"
-      "  %iv.0 = phi i8* [ %a, %entry ], [ %iv.1, %loop.body ]\n"
-      "  %iv2.0 = phi i8* [ %start.iv2, %entry ], [ %iv2.1, %loop.body ]\n"
-      "  %cmp = icmp eq i8* %iv2.0, %iv.0\n"
-      "  %iv.1 = getelementptr inbounds i8, i8* %iv.0, i64 1\n"
-      "  %iv2.1 = getelementptr inbounds i8, i8* %iv2.0, i64 1\n"
-      "  %exitcond = icmp ne i8* %iv.1, %limit\n"
-      "  br i1 %exitcond, label %loop.body, label %loop.exit\n"
-      "loop.exit:\n"
-      "  ret void\n"
-      "}\n";
-  UnrollAnalyzerTest *P = new UnrollAnalyzerTest();
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleStr);
-  legacy::PassManager Passes;
-  Passes.add(P);
-  Passes.run(*M);
-
-  // Perform checks
-  Module::iterator MI = M->begin();
-  Function *F = &*MI++;
-  Function::iterator FI = F->begin();
-  FI++; // First basic block is entry - skip it.
-  BasicBlock *Header = &*FI;
-
-  BasicBlock::iterator BBI = Header->begin();
-  std::advance(BBI, 2);
-  Instruction *Y1 = &*BBI;
-  // Check simplification expected on the 5th iteration.
-  // Check that "%cmp = icmp eq i8* %iv2.0, %iv.0" is simplified to 0.
-  auto I1 = SimplifiedValuesVector[5].find(Y1);
-  EXPECT_TRUE(I1 != SimplifiedValuesVector[5].end());
-  EXPECT_EQ(cast<ConstantInt>((*I1).second)->getZExtValue(), 0U);
-}
-TEST(UnrollAnalyzerTest, CastSimplifications) {
-  const char *ModuleStr =
-      "target datalayout = \"e-m:o-i64:64-f80:128-n8:16:32:64-S128\"\n"
-      "@known_constant = internal unnamed_addr constant [10 x i32] [i32 0, i32 1, i32 0, i32 1, i32 0, i32 259, i32 0, i32 1, i32 0, i32 1], align 16\n"
-      "define void @const_load_cast() {\n"
-      "entry:\n"
-      "  br label %loop\n"
-      "\n"
-      "loop:\n"
-      "  %iv = phi i64 [ 0, %entry ], [ %inc, %loop ]\n"
-      "  %array_const_idx = getelementptr inbounds [10 x i32], [10 x i32]* @known_constant, i64 0, i64 %iv\n"
-      "  %const_array_element = load i32, i32* %array_const_idx, align 4\n"
-      "  %se = sext i32 %const_array_element to i64\n"
-      "  %ze = zext i32 %const_array_element to i64\n"
-      "  %tr = trunc i32 %const_array_element to i8\n"
-      "  %inc = add nuw nsw i64 %iv, 1\n"
-      "  %exitcond86.i = icmp eq i64 %inc, 10\n"
-      "  br i1 %exitcond86.i, label %loop.end, label %loop\n"
-      "\n"
-      "loop.end:\n"
-      "  ret void\n"
-      "}\n";
-
-  UnrollAnalyzerTest *P = new UnrollAnalyzerTest();
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleStr);
-  legacy::PassManager Passes;
-  Passes.add(P);
-  Passes.run(*M);
-
-  // Perform checks
-  Module::iterator MI = M->begin();
-  Function *F = &*MI++;
-  Function::iterator FI = F->begin();
-  FI++; // First basic block is entry - skip it.
-  BasicBlock *Header = &*FI++;
-
-  BasicBlock::iterator BBI = Header->begin();
-  std::advance(BBI, 3);
-  Instruction *Y1 = &*BBI++;
-  Instruction *Y2 = &*BBI++;
-  Instruction *Y3 = &*BBI++;
-  // Check simplification expected on the 5th iteration.
-  // "%se = sext i32 %const_array_element to i64" should be simplified to 259,
-  // "%ze = zext i32 %const_array_element to i64" should be simplified to 259,
-  // "%tr = trunc i32 %const_array_element to i8" should be simplified to 3.
-  auto I1 = SimplifiedValuesVector[5].find(Y1);
-  EXPECT_TRUE(I1 != SimplifiedValuesVector[5].end());
-  EXPECT_EQ(cast<ConstantInt>((*I1).second)->getZExtValue(), 259U);
-  auto I2 = SimplifiedValuesVector[5].find(Y2);
-  EXPECT_TRUE(I2 != SimplifiedValuesVector[5].end());
-  EXPECT_EQ(cast<ConstantInt>((*I2).second)->getZExtValue(), 259U);
-  auto I3 = SimplifiedValuesVector[5].find(Y3);
-  EXPECT_TRUE(I3 != SimplifiedValuesVector[5].end());
-  EXPECT_EQ(cast<ConstantInt>((*I3).second)->getZExtValue(), 3U);
-}
-
-} // end namespace llvm
-
-INITIALIZE_PASS_BEGIN(UnrollAnalyzerTest, "unrollanalyzertestpass",
-                      "unrollanalyzertestpass", false, false)
-INITIALIZE_PASS_DEPENDENCY(DominatorTreeWrapperPass)
-INITIALIZE_PASS_DEPENDENCY(LoopInfoWrapperPass)
-INITIALIZE_PASS_DEPENDENCY(ScalarEvolutionWrapperPass)
-INITIALIZE_PASS_END(UnrollAnalyzerTest, "unrollanalyzertestpass",
-                    "unrollanalyzertestpass", false, false)
diff --git a/gnu/llvm/llvm/unittests/Analysis/ValueLatticeTest.cpp b/gnu/llvm/llvm/unittests/Analysis/ValueLatticeTest.cpp
deleted file mode 100644
index 8ee2cf1ba34..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/ValueLatticeTest.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-//===- ValueLatticeTest.cpp - ScalarEvolution unit tests --------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/ValueLattice.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/IR/ConstantRange.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-namespace {
-
-// We use this fixture to ensure that we clean up ScalarEvolution before
-// deleting the PassManager.
-class ValueLatticeTest : public testing::Test {
-protected:
-  LLVMContext Context;
-};
-
-TEST_F(ValueLatticeTest, ValueLatticeGetters) {
-  auto I32Ty = IntegerType::get(Context, 32);
-  auto *C1 = ConstantInt::get(I32Ty, 1);
-
-  EXPECT_TRUE(ValueLatticeElement::get(C1).isConstantRange());
-  EXPECT_TRUE(
-      ValueLatticeElement::getRange({C1->getValue()}).isConstantRange());
-  EXPECT_TRUE(ValueLatticeElement::getOverdefined().isOverdefined());
-
-  auto FloatTy = Type::getFloatTy(Context);
-  auto *C2 = ConstantFP::get(FloatTy, 1.1);
-  EXPECT_TRUE(ValueLatticeElement::get(C2).isConstant());
-  EXPECT_TRUE(ValueLatticeElement::getNot(C2).isNotConstant());
-}
-
-TEST_F(ValueLatticeTest, MarkConstantRange) {
-  auto LV1 =
-      ValueLatticeElement::getRange({APInt(32, 10, true), APInt(32, 20, true)});
-
-  // Test markConstantRange() with an equal range.
-  EXPECT_FALSE(
-      LV1.markConstantRange({APInt(32, 10, true), APInt(32, 20, true)}));
-
-  // Test markConstantRange() with supersets of existing range.
-  EXPECT_TRUE(LV1.markConstantRange({APInt(32, 5, true), APInt(32, 20, true)}));
-  EXPECT_EQ(LV1.getConstantRange().getLower().getLimitedValue(), 5U);
-  EXPECT_EQ(LV1.getConstantRange().getUpper().getLimitedValue(), 20U);
-  EXPECT_TRUE(LV1.markConstantRange({APInt(32, 5, true), APInt(32, 23, true)}));
-  EXPECT_EQ(LV1.getConstantRange().getLower().getLimitedValue(), 5U);
-  EXPECT_EQ(LV1.getConstantRange().getUpper().getLimitedValue(), 23U);
-}
-
-TEST_F(ValueLatticeTest, MergeIn) {
-  auto I32Ty = IntegerType::get(Context, 32);
-  auto *C1 = ConstantInt::get(I32Ty, 1);
-
-  // Merge to lattice values with equal integer constant.
-  auto LV1 = ValueLatticeElement::get(C1);
-  EXPECT_FALSE(LV1.mergeIn(ValueLatticeElement::get(C1)));
-  EXPECT_TRUE(LV1.isConstantRange());
-  EXPECT_EQ(LV1.asConstantInteger().getValue().getLimitedValue(), 1U);
-
-  // Merge LV1 with different integer constant.
-  EXPECT_TRUE(
-      LV1.mergeIn(ValueLatticeElement::get(ConstantInt::get(I32Ty, 99))));
-  EXPECT_TRUE(LV1.isConstantRange());
-  EXPECT_EQ(LV1.getConstantRange().getLower().getLimitedValue(), 1U);
-  EXPECT_EQ(LV1.getConstantRange().getUpper().getLimitedValue(), 100U);
-
-  // Merge constant range with same constant range.
-  EXPECT_FALSE(LV1.mergeIn(LV1));
-  EXPECT_TRUE(LV1.isConstantRange());
-  EXPECT_EQ(LV1.getConstantRange().getLower().getLimitedValue(), 1U);
-  EXPECT_EQ(LV1.getConstantRange().getUpper().getLimitedValue(), 100U);
-
-  // Merge LV1 in undefined value.
-  ValueLatticeElement LV2;
-  EXPECT_TRUE(LV2.mergeIn(LV1));
-  EXPECT_TRUE(LV1.isConstantRange());
-  EXPECT_EQ(LV1.getConstantRange().getLower().getLimitedValue(), 1U);
-  EXPECT_EQ(LV1.getConstantRange().getUpper().getLimitedValue(), 100U);
-  EXPECT_TRUE(LV2.isConstantRange());
-  EXPECT_EQ(LV2.getConstantRange().getLower().getLimitedValue(), 1U);
-  EXPECT_EQ(LV2.getConstantRange().getUpper().getLimitedValue(), 100U);
-
-  // Merge LV1 with overdefined.
-  EXPECT_TRUE(LV1.mergeIn(ValueLatticeElement::getOverdefined()));
-  EXPECT_TRUE(LV1.isOverdefined());
-
-  // Merge overdefined with overdefined.
-  EXPECT_FALSE(LV1.mergeIn(ValueLatticeElement::getOverdefined()));
-  EXPECT_TRUE(LV1.isOverdefined());
-}
-
-TEST_F(ValueLatticeTest, getCompareIntegers) {
-  auto *I32Ty = IntegerType::get(Context, 32);
-  auto *I1Ty = IntegerType::get(Context, 1);
-  auto *C1 = ConstantInt::get(I32Ty, 1);
-  auto LV1 = ValueLatticeElement::get(C1);
-
-  // Check getCompare for equal integer constants.
-  EXPECT_TRUE(LV1.getCompare(CmpInst::ICMP_EQ, I1Ty, LV1)->isOneValue());
-  EXPECT_TRUE(LV1.getCompare(CmpInst::ICMP_SGE, I1Ty, LV1)->isOneValue());
-  EXPECT_TRUE(LV1.getCompare(CmpInst::ICMP_SLE, I1Ty, LV1)->isOneValue());
-  EXPECT_TRUE(LV1.getCompare(CmpInst::ICMP_NE, I1Ty, LV1)->isZeroValue());
-  EXPECT_TRUE(LV1.getCompare(CmpInst::ICMP_SLT, I1Ty, LV1)->isZeroValue());
-  EXPECT_TRUE(LV1.getCompare(CmpInst::ICMP_SGT, I1Ty, LV1)->isZeroValue());
-
-  auto LV2 =
-      ValueLatticeElement::getRange({APInt(32, 10, true), APInt(32, 20, true)});
-  // Check getCompare with distinct integer ranges.
-  EXPECT_TRUE(LV1.getCompare(CmpInst::ICMP_SLT, I1Ty, LV2)->isOneValue());
-  EXPECT_TRUE(LV1.getCompare(CmpInst::ICMP_SLE, I1Ty, LV2)->isOneValue());
-  EXPECT_TRUE(LV1.getCompare(CmpInst::ICMP_NE, I1Ty, LV2)->isOneValue());
-  EXPECT_TRUE(LV1.getCompare(CmpInst::ICMP_EQ, I1Ty, LV2)->isZeroValue());
-  EXPECT_TRUE(LV1.getCompare(CmpInst::ICMP_SGE, I1Ty, LV2)->isZeroValue());
-  EXPECT_TRUE(LV1.getCompare(CmpInst::ICMP_SGT, I1Ty, LV2)->isZeroValue());
-
-  auto LV3 =
-      ValueLatticeElement::getRange({APInt(32, 15, true), APInt(32, 19, true)});
-  // Check getCompare with a subset integer ranges.
-  EXPECT_EQ(LV2.getCompare(CmpInst::ICMP_SLT, I1Ty, LV3), nullptr);
-  EXPECT_EQ(LV2.getCompare(CmpInst::ICMP_SLE, I1Ty, LV3), nullptr);
-  EXPECT_EQ(LV2.getCompare(CmpInst::ICMP_NE, I1Ty, LV3), nullptr);
-  EXPECT_EQ(LV2.getCompare(CmpInst::ICMP_EQ, I1Ty, LV3), nullptr);
-  EXPECT_EQ(LV2.getCompare(CmpInst::ICMP_SGE, I1Ty, LV3), nullptr);
-  EXPECT_EQ(LV2.getCompare(CmpInst::ICMP_SGT, I1Ty, LV3), nullptr);
-
-  auto LV4 =
-      ValueLatticeElement::getRange({APInt(32, 15, true), APInt(32, 25, true)});
-  // Check getCompare with overlapping integer ranges.
-  EXPECT_EQ(LV3.getCompare(CmpInst::ICMP_SLT, I1Ty, LV4), nullptr);
-  EXPECT_EQ(LV3.getCompare(CmpInst::ICMP_SLE, I1Ty, LV4), nullptr);
-  EXPECT_EQ(LV3.getCompare(CmpInst::ICMP_NE, I1Ty, LV4), nullptr);
-  EXPECT_EQ(LV3.getCompare(CmpInst::ICMP_EQ, I1Ty, LV4), nullptr);
-  EXPECT_EQ(LV3.getCompare(CmpInst::ICMP_SGE, I1Ty, LV4), nullptr);
-  EXPECT_EQ(LV3.getCompare(CmpInst::ICMP_SGT, I1Ty, LV4), nullptr);
-}
-
-TEST_F(ValueLatticeTest, getCompareFloat) {
-  auto *FloatTy = IntegerType::getFloatTy(Context);
-  auto *I1Ty = IntegerType::get(Context, 1);
-  auto *C1 = ConstantFP::get(FloatTy, 1.0);
-  auto LV1 = ValueLatticeElement::get(C1);
-  auto LV2 = ValueLatticeElement::get(C1);
-
-  // Check getCompare for equal floating point constants.
-  EXPECT_TRUE(LV1.getCompare(CmpInst::FCMP_OEQ, I1Ty, LV2)->isOneValue());
-  EXPECT_TRUE(LV1.getCompare(CmpInst::FCMP_OGE, I1Ty, LV2)->isOneValue());
-  EXPECT_TRUE(LV1.getCompare(CmpInst::FCMP_OLE, I1Ty, LV2)->isOneValue());
-  EXPECT_TRUE(LV1.getCompare(CmpInst::FCMP_ONE, I1Ty, LV2)->isZeroValue());
-  EXPECT_TRUE(LV1.getCompare(CmpInst::FCMP_OLT, I1Ty, LV2)->isZeroValue());
-  EXPECT_TRUE(LV1.getCompare(CmpInst::FCMP_OGT, I1Ty, LV2)->isZeroValue());
-
-  EXPECT_TRUE(
-      LV1.mergeIn(ValueLatticeElement::get(ConstantFP::get(FloatTy, 2.2))));
-  EXPECT_EQ(LV1.getCompare(CmpInst::FCMP_OEQ, I1Ty, LV2), nullptr);
-  EXPECT_EQ(LV1.getCompare(CmpInst::FCMP_OGE, I1Ty, LV2), nullptr);
-  EXPECT_EQ(LV1.getCompare(CmpInst::FCMP_OLE, I1Ty, LV2), nullptr);
-  EXPECT_EQ(LV1.getCompare(CmpInst::FCMP_ONE, I1Ty, LV2), nullptr);
-  EXPECT_EQ(LV1.getCompare(CmpInst::FCMP_OLT, I1Ty, LV2), nullptr);
-  EXPECT_EQ(LV1.getCompare(CmpInst::FCMP_OGT, I1Ty, LV2), nullptr);
-}
-
-TEST_F(ValueLatticeTest, getCompareUndef) {
-  auto *I32Ty = IntegerType::get(Context, 32);
-  auto *I1Ty = IntegerType::get(Context, 1);
-
-  auto LV1 = ValueLatticeElement::get(UndefValue::get(I32Ty));
-  auto LV2 =
-      ValueLatticeElement::getRange({APInt(32, 10, true), APInt(32, 20, true)});
-  EXPECT_TRUE(isa<UndefValue>(LV1.getCompare(CmpInst::ICMP_SLT, I1Ty, LV2)));
-  EXPECT_TRUE(isa<UndefValue>(LV1.getCompare(CmpInst::ICMP_SLE, I1Ty, LV2)));
-  EXPECT_TRUE(isa<UndefValue>(LV1.getCompare(CmpInst::ICMP_NE, I1Ty, LV2)));
-  EXPECT_TRUE(isa<UndefValue>(LV1.getCompare(CmpInst::ICMP_EQ, I1Ty, LV2)));
-  EXPECT_TRUE(isa<UndefValue>(LV1.getCompare(CmpInst::ICMP_SGE, I1Ty, LV2)));
-  EXPECT_TRUE(isa<UndefValue>(LV1.getCompare(CmpInst::ICMP_SGT, I1Ty, LV2)));
-
-  auto *FloatTy = IntegerType::getFloatTy(Context);
-  auto LV3 = ValueLatticeElement::get(ConstantFP::get(FloatTy, 1.0));
-  EXPECT_TRUE(isa<UndefValue>(LV1.getCompare(CmpInst::FCMP_OEQ, I1Ty, LV3)));
-  EXPECT_TRUE(isa<UndefValue>(LV1.getCompare(CmpInst::FCMP_OGE, I1Ty, LV3)));
-  EXPECT_TRUE(isa<UndefValue>(LV1.getCompare(CmpInst::FCMP_OLE, I1Ty, LV3)));
-  EXPECT_TRUE(isa<UndefValue>(LV1.getCompare(CmpInst::FCMP_ONE, I1Ty, LV3)));
-  EXPECT_TRUE(isa<UndefValue>(LV1.getCompare(CmpInst::FCMP_OLT, I1Ty, LV3)));
-  EXPECT_TRUE(isa<UndefValue>(LV1.getCompare(CmpInst::FCMP_OGT, I1Ty, LV3)));
-}
-
-} // end anonymous namespace
-} // end namespace llvm
diff --git a/gnu/llvm/llvm/unittests/Analysis/ValueTrackingTest.cpp b/gnu/llvm/llvm/unittests/Analysis/ValueTrackingTest.cpp
deleted file mode 100644
index e8b1a189531..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/ValueTrackingTest.cpp
+++ /dev/null
@@ -1,2250 +0,0 @@
-//===- ValueTrackingTest.cpp - ValueTracking tests ------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/ValueTracking.h"
-#include "llvm/Analysis/AssumptionCache.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/ConstantRange.h"
-#include "llvm/IR/Dominators.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/InstIterator.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Support/ErrorHandling.h"
-#include "llvm/Support/KnownBits.h"
-#include "llvm/Support/SourceMgr.h"
-#include "llvm/Transforms/Utils/Local.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-static Instruction *findInstructionByNameOrNull(Function *F, StringRef Name) {
-  for (Instruction &I : instructions(F))
-    if (I.getName() == Name)
-      return &I;
-
-  return nullptr;
-}
-
-static Instruction &findInstructionByName(Function *F, StringRef Name) {
-  auto *I = findInstructionByNameOrNull(F, Name);
-  if (I)
-    return *I;
-
-  llvm_unreachable("Expected value not found");
-}
-
-class ValueTrackingTest : public testing::Test {
-protected:
-  std::unique_ptr<Module> parseModule(StringRef Assembly) {
-    SMDiagnostic Error;
-    std::unique_ptr<Module> M = parseAssemblyString(Assembly, Error, Context);
-
-    std::string errMsg;
-    raw_string_ostream os(errMsg);
-    Error.print("", os);
-    EXPECT_TRUE(M) << os.str();
-
-    return M;
-  }
-
-  void parseAssembly(StringRef Assembly) {
-    M = parseModule(Assembly);
-    ASSERT_TRUE(M);
-
-    F = M->getFunction("test");
-    ASSERT_TRUE(F) << "Test must have a function @test";
-    if (!F)
-      return;
-
-    A = findInstructionByNameOrNull(F, "A");
-    ASSERT_TRUE(A) << "@test must have an instruction %A";
-    A2 = findInstructionByNameOrNull(F, "A2");
-    A3 = findInstructionByNameOrNull(F, "A3");
-    A4 = findInstructionByNameOrNull(F, "A4");
-
-    CxtI = findInstructionByNameOrNull(F, "CxtI");
-    CxtI2 = findInstructionByNameOrNull(F, "CxtI2");
-    CxtI3 = findInstructionByNameOrNull(F, "CxtI3");
-  }
-
-  LLVMContext Context;
-  std::unique_ptr<Module> M;
-  Function *F = nullptr;
-  Instruction *A = nullptr;
-  // Instructions (optional)
-  Instruction *A2 = nullptr, *A3 = nullptr, *A4 = nullptr;
-
-  // Context instructions (optional)
-  Instruction *CxtI = nullptr, *CxtI2 = nullptr, *CxtI3 = nullptr;
-};
-
-class MatchSelectPatternTest : public ValueTrackingTest {
-protected:
-  void expectPattern(const SelectPatternResult &P) {
-    Value *LHS, *RHS;
-    Instruction::CastOps CastOp;
-    SelectPatternResult R = matchSelectPattern(A, LHS, RHS, &CastOp);
-    EXPECT_EQ(P.Flavor, R.Flavor);
-    EXPECT_EQ(P.NaNBehavior, R.NaNBehavior);
-    EXPECT_EQ(P.Ordered, R.Ordered);
-  }
-};
-
-class ComputeKnownBitsTest : public ValueTrackingTest {
-protected:
-  void expectKnownBits(uint64_t Zero, uint64_t One) {
-    auto Known = computeKnownBits(A, M->getDataLayout());
-    ASSERT_FALSE(Known.hasConflict());
-    EXPECT_EQ(Known.One.getZExtValue(), One);
-    EXPECT_EQ(Known.Zero.getZExtValue(), Zero);
-  }
-};
-
-}
-
-TEST_F(MatchSelectPatternTest, SimpleFMin) {
-  parseAssembly(
-      "define float @test(float %a) {\n"
-      "  %1 = fcmp ult float %a, 5.0\n"
-      "  %A = select i1 %1, float %a, float 5.0\n"
-      "  ret float %A\n"
-      "}\n");
-  expectPattern({SPF_FMINNUM, SPNB_RETURNS_NAN, false});
-}
-
-TEST_F(MatchSelectPatternTest, SimpleFMax) {
-  parseAssembly(
-      "define float @test(float %a) {\n"
-      "  %1 = fcmp ogt float %a, 5.0\n"
-      "  %A = select i1 %1, float %a, float 5.0\n"
-      "  ret float %A\n"
-      "}\n");
-  expectPattern({SPF_FMAXNUM, SPNB_RETURNS_OTHER, true});
-}
-
-TEST_F(MatchSelectPatternTest, SwappedFMax) {
-  parseAssembly(
-      "define float @test(float %a) {\n"
-      "  %1 = fcmp olt float 5.0, %a\n"
-      "  %A = select i1 %1, float %a, float 5.0\n"
-      "  ret float %A\n"
-      "}\n");
-  expectPattern({SPF_FMAXNUM, SPNB_RETURNS_OTHER, false});
-}
-
-TEST_F(MatchSelectPatternTest, SwappedFMax2) {
-  parseAssembly(
-      "define float @test(float %a) {\n"
-      "  %1 = fcmp olt float %a, 5.0\n"
-      "  %A = select i1 %1, float 5.0, float %a\n"
-      "  ret float %A\n"
-      "}\n");
-  expectPattern({SPF_FMAXNUM, SPNB_RETURNS_NAN, false});
-}
-
-TEST_F(MatchSelectPatternTest, SwappedFMax3) {
-  parseAssembly(
-      "define float @test(float %a) {\n"
-      "  %1 = fcmp ult float %a, 5.0\n"
-      "  %A = select i1 %1, float 5.0, float %a\n"
-      "  ret float %A\n"
-      "}\n");
-  expectPattern({SPF_FMAXNUM, SPNB_RETURNS_OTHER, true});
-}
-
-TEST_F(MatchSelectPatternTest, FastFMin) {
-  parseAssembly(
-      "define float @test(float %a) {\n"
-      "  %1 = fcmp nnan olt float %a, 5.0\n"
-      "  %A = select i1 %1, float %a, float 5.0\n"
-      "  ret float %A\n"
-      "}\n");
-  expectPattern({SPF_FMINNUM, SPNB_RETURNS_ANY, false});
-}
-
-TEST_F(MatchSelectPatternTest, FMinConstantZero) {
-  parseAssembly(
-      "define float @test(float %a) {\n"
-      "  %1 = fcmp ole float %a, 0.0\n"
-      "  %A = select i1 %1, float %a, float 0.0\n"
-      "  ret float %A\n"
-      "}\n");
-  // This shouldn't be matched, as %a could be -0.0.
-  expectPattern({SPF_UNKNOWN, SPNB_NA, false});
-}
-
-TEST_F(MatchSelectPatternTest, FMinConstantZeroNsz) {
-  parseAssembly(
-      "define float @test(float %a) {\n"
-      "  %1 = fcmp nsz ole float %a, 0.0\n"
-      "  %A = select i1 %1, float %a, float 0.0\n"
-      "  ret float %A\n"
-      "}\n");
-  // But this should be, because we've ignored signed zeroes.
-  expectPattern({SPF_FMINNUM, SPNB_RETURNS_OTHER, true});
-}
-
-TEST_F(MatchSelectPatternTest, FMinMismatchConstantZero1) {
-  parseAssembly(
-      "define float @test(float %a) {\n"
-      "  %1 = fcmp olt float -0.0, %a\n"
-      "  %A = select i1 %1, float 0.0, float %a\n"
-      "  ret float %A\n"
-      "}\n");
-  // The sign of zero doesn't matter in fcmp.
-  expectPattern({SPF_FMINNUM, SPNB_RETURNS_NAN, true});
-}
-
-TEST_F(MatchSelectPatternTest, FMinMismatchConstantZero2) {
-  parseAssembly(
-      "define float @test(float %a) {\n"
-      "  %1 = fcmp ogt float %a, -0.0\n"
-      "  %A = select i1 %1, float 0.0, float %a\n"
-      "  ret float %A\n"
-      "}\n");
-  // The sign of zero doesn't matter in fcmp.
-  expectPattern({SPF_FMINNUM, SPNB_RETURNS_NAN, false});
-}
-
-TEST_F(MatchSelectPatternTest, FMinMismatchConstantZero3) {
-  parseAssembly(
-      "define float @test(float %a) {\n"
-      "  %1 = fcmp olt float 0.0, %a\n"
-      "  %A = select i1 %1, float -0.0, float %a\n"
-      "  ret float %A\n"
-      "}\n");
-  // The sign of zero doesn't matter in fcmp.
-  expectPattern({SPF_FMINNUM, SPNB_RETURNS_NAN, true});
-}
-
-TEST_F(MatchSelectPatternTest, FMinMismatchConstantZero4) {
-  parseAssembly(
-      "define float @test(float %a) {\n"
-      "  %1 = fcmp ogt float %a, 0.0\n"
-      "  %A = select i1 %1, float -0.0, float %a\n"
-      "  ret float %A\n"
-      "}\n");
-  // The sign of zero doesn't matter in fcmp.
-  expectPattern({SPF_FMINNUM, SPNB_RETURNS_NAN, false});
-}
-
-TEST_F(MatchSelectPatternTest, FMinMismatchConstantZero5) {
-  parseAssembly(
-      "define float @test(float %a) {\n"
-      "  %1 = fcmp ogt float -0.0, %a\n"
-      "  %A = select i1 %1, float %a, float 0.0\n"
-      "  ret float %A\n"
-      "}\n");
-  // The sign of zero doesn't matter in fcmp.
-  expectPattern({SPF_FMINNUM, SPNB_RETURNS_OTHER, false});
-}
-
-TEST_F(MatchSelectPatternTest, FMinMismatchConstantZero6) {
-  parseAssembly(
-      "define float @test(float %a) {\n"
-      "  %1 = fcmp olt float %a, -0.0\n"
-      "  %A = select i1 %1, float %a, float 0.0\n"
-      "  ret float %A\n"
-      "}\n");
-  // The sign of zero doesn't matter in fcmp.
-  expectPattern({SPF_FMINNUM, SPNB_RETURNS_OTHER, true});
-}
-
-TEST_F(MatchSelectPatternTest, FMinMismatchConstantZero7) {
-  parseAssembly(
-      "define float @test(float %a) {\n"
-      "  %1 = fcmp ogt float 0.0, %a\n"
-      "  %A = select i1 %1, float %a, float -0.0\n"
-      "  ret float %A\n"
-      "}\n");
-  // The sign of zero doesn't matter in fcmp.
-  expectPattern({SPF_FMINNUM, SPNB_RETURNS_OTHER, false});
-}
-
-TEST_F(MatchSelectPatternTest, FMinMismatchConstantZero8) {
-  parseAssembly(
-      "define float @test(float %a) {\n"
-      "  %1 = fcmp olt float %a, 0.0\n"
-      "  %A = select i1 %1, float %a, float -0.0\n"
-      "  ret float %A\n"
-      "}\n");
-  // The sign of zero doesn't matter in fcmp.
-  expectPattern({SPF_FMINNUM, SPNB_RETURNS_OTHER, true});
-}
-
-TEST_F(MatchSelectPatternTest, FMaxMismatchConstantZero1) {
-  parseAssembly(
-      "define float @test(float %a) {\n"
-      "  %1 = fcmp ogt float -0.0, %a\n"
-      "  %A = select i1 %1, float 0.0, float %a\n"
-      "  ret float %A\n"
-      "}\n");
-  // The sign of zero doesn't matter in fcmp.
-  expectPattern({SPF_FMAXNUM, SPNB_RETURNS_NAN, true});
-}
-
-TEST_F(MatchSelectPatternTest, FMaxMismatchConstantZero2) {
-  parseAssembly(
-      "define float @test(float %a) {\n"
-      "  %1 = fcmp olt float %a, -0.0\n"
-      "  %A = select i1 %1, float 0.0, float %a\n"
-      "  ret float %A\n"
-      "}\n");
-  // The sign of zero doesn't matter in fcmp.
-  expectPattern({SPF_FMAXNUM, SPNB_RETURNS_NAN, false});
-}
-
-TEST_F(MatchSelectPatternTest, FMaxMismatchConstantZero3) {
-  parseAssembly(
-      "define float @test(float %a) {\n"
-      "  %1 = fcmp ogt float 0.0, %a\n"
-      "  %A = select i1 %1, float -0.0, float %a\n"
-      "  ret float %A\n"
-      "}\n");
-  // The sign of zero doesn't matter in fcmp.
-  expectPattern({SPF_FMAXNUM, SPNB_RETURNS_NAN, true});
-}
-
-TEST_F(MatchSelectPatternTest, FMaxMismatchConstantZero4) {
-  parseAssembly(
-      "define float @test(float %a) {\n"
-      "  %1 = fcmp olt float %a, 0.0\n"
-      "  %A = select i1 %1, float -0.0, float %a\n"
-      "  ret float %A\n"
-      "}\n");
-  // The sign of zero doesn't matter in fcmp.
-  expectPattern({SPF_FMAXNUM, SPNB_RETURNS_NAN, false});
-}
-
-TEST_F(MatchSelectPatternTest, FMaxMismatchConstantZero5) {
-  parseAssembly(
-      "define float @test(float %a) {\n"
-      "  %1 = fcmp olt float -0.0, %a\n"
-      "  %A = select i1 %1, float %a, float 0.0\n"
-      "  ret float %A\n"
-      "}\n");
-  // The sign of zero doesn't matter in fcmp.
-  expectPattern({SPF_FMAXNUM, SPNB_RETURNS_OTHER, false});
-}
-
-TEST_F(MatchSelectPatternTest, FMaxMismatchConstantZero6) {
-  parseAssembly(
-      "define float @test(float %a) {\n"
-      "  %1 = fcmp ogt float %a, -0.0\n"
-      "  %A = select i1 %1, float %a, float 0.0\n"
-      "  ret float %A\n"
-      "}\n");
-  // The sign of zero doesn't matter in fcmp.
-  expectPattern({SPF_FMAXNUM, SPNB_RETURNS_OTHER, true});
-}
-
-TEST_F(MatchSelectPatternTest, FMaxMismatchConstantZero7) {
-  parseAssembly(
-      "define float @test(float %a) {\n"
-      "  %1 = fcmp olt float 0.0, %a\n"
-      "  %A = select i1 %1, float %a, float -0.0\n"
-      "  ret float %A\n"
-      "}\n");
-  // The sign of zero doesn't matter in fcmp.
-  expectPattern({SPF_FMAXNUM, SPNB_RETURNS_OTHER, false});
-}
-
-TEST_F(MatchSelectPatternTest, FMaxMismatchConstantZero8) {
-  parseAssembly(
-      "define float @test(float %a) {\n"
-      "  %1 = fcmp ogt float %a, 0.0\n"
-      "  %A = select i1 %1, float %a, float -0.0\n"
-      "  ret float %A\n"
-      "}\n");
-  // The sign of zero doesn't matter in fcmp.
-  expectPattern({SPF_FMAXNUM, SPNB_RETURNS_OTHER, true});
-}
-
-TEST_F(MatchSelectPatternTest, FMinMismatchConstantZeroVecUndef) {
-  parseAssembly(
-      "define <2 x float> @test(<2 x float> %a) {\n"
-      "  %1 = fcmp ogt <2 x float> %a, <float -0.0, float -0.0>\n"
-      "  %A = select <2 x i1> %1, <2 x float> <float undef, float 0.0>, <2 x float> %a\n"
-      "  ret <2 x float> %A\n"
-      "}\n");
-  // An undef in a vector constant can not be back-propagated for this analysis.
-  expectPattern({SPF_UNKNOWN, SPNB_NA, false});
-}
-
-TEST_F(MatchSelectPatternTest, FMaxMismatchConstantZeroVecUndef) {
-  parseAssembly(
-      "define <2 x float> @test(<2 x float> %a) {\n"
-      "  %1 = fcmp ogt <2 x float> %a, zeroinitializer\n"
-      "  %A = select <2 x i1> %1, <2 x float> %a, <2 x float> <float -0.0, float undef>\n"
-      "  ret <2 x float> %A\n"
-      "}\n");
-  // An undef in a vector constant can not be back-propagated for this analysis.
-  expectPattern({SPF_UNKNOWN, SPNB_NA, false});
-}
-
-TEST_F(MatchSelectPatternTest, VectorFMinimum) {
-  parseAssembly(
-      "define <4 x float> @test(<4 x float> %a) {\n"
-      "  %1 = fcmp ule <4 x float> %a, \n"
-      "    <float 5.0, float 5.0, float 5.0, float 5.0>\n"
-      "  %A = select <4 x i1> %1, <4 x float> %a,\n"
-      "     <4 x float> <float 5.0, float 5.0, float 5.0, float 5.0>\n"
-      "  ret <4 x float> %A\n"
-      "}\n");
-  // Check that pattern matching works on vectors where each lane has the same
-  // unordered pattern.
-  expectPattern({SPF_FMINNUM, SPNB_RETURNS_NAN, false});
-}
-
-TEST_F(MatchSelectPatternTest, VectorFMinOtherOrdered) {
-  parseAssembly(
-      "define <4 x float> @test(<4 x float> %a) {\n"
-      "  %1 = fcmp ole <4 x float> %a, \n"
-      "    <float 5.0, float 5.0, float 5.0, float 5.0>\n"
-      "  %A = select <4 x i1> %1, <4 x float> %a,\n"
-      "     <4 x float> <float 5.0, float 5.0, float 5.0, float 5.0>\n"
-      "  ret <4 x float> %A\n"
-      "}\n");
-  // Check that pattern matching works on vectors where each lane has the same
-  // ordered pattern.
-  expectPattern({SPF_FMINNUM, SPNB_RETURNS_OTHER, true});
-}
-
-TEST_F(MatchSelectPatternTest, VectorNotFMinimum) {
-  parseAssembly(
-      "define <4 x float> @test(<4 x float> %a) {\n"
-      "  %1 = fcmp ule <4 x float> %a, \n"
-      "    <float 5.0, float 0x7ff8000000000000, float 5.0, float 5.0>\n"
-      "  %A = select <4 x i1> %1, <4 x float> %a,\n"
-      "     <4 x float> <float 5.0, float 0x7ff8000000000000, float 5.0, float "
-      "5.0>\n"
-      "  ret <4 x float> %A\n"
-      "}\n");
-  // The lane that contains a NaN (0x7ff80...) behaves like a
-  // non-NaN-propagating min and the other lines behave like a NaN-propagating
-  // min, so check that neither is returned.
-  expectPattern({SPF_UNKNOWN, SPNB_NA, false});
-}
-
-TEST_F(MatchSelectPatternTest, VectorNotFMinZero) {
-  parseAssembly(
-      "define <4 x float> @test(<4 x float> %a) {\n"
-      "  %1 = fcmp ule <4 x float> %a, \n"
-      "    <float 5.0, float -0.0, float 5.0, float 5.0>\n"
-      "  %A = select <4 x i1> %1, <4 x float> %a,\n"
-      "     <4 x float> <float 5.0, float 0.0, float 5.0, float 5.0>\n"
-      "  ret <4 x float> %A\n"
-      "}\n");
-  // Always selects the second lane of %a if it is positive or negative zero, so
-  // this is stricter than a min.
-  expectPattern({SPF_UNKNOWN, SPNB_NA, false});
-}
-
-TEST_F(MatchSelectPatternTest, DoubleCastU) {
-  parseAssembly(
-      "define i32 @test(i8 %a, i8 %b) {\n"
-      "  %1 = icmp ult i8 %a, %b\n"
-      "  %2 = zext i8 %a to i32\n"
-      "  %3 = zext i8 %b to i32\n"
-      "  %A = select i1 %1, i32 %2, i32 %3\n"
-      "  ret i32 %A\n"
-      "}\n");
-  // We should be able to look through the situation where we cast both operands
-  // to the select.
-  expectPattern({SPF_UMIN, SPNB_NA, false});
-}
-
-TEST_F(MatchSelectPatternTest, DoubleCastS) {
-  parseAssembly(
-      "define i32 @test(i8 %a, i8 %b) {\n"
-      "  %1 = icmp slt i8 %a, %b\n"
-      "  %2 = sext i8 %a to i32\n"
-      "  %3 = sext i8 %b to i32\n"
-      "  %A = select i1 %1, i32 %2, i32 %3\n"
-      "  ret i32 %A\n"
-      "}\n");
-  // We should be able to look through the situation where we cast both operands
-  // to the select.
-  expectPattern({SPF_SMIN, SPNB_NA, false});
-}
-
-TEST_F(MatchSelectPatternTest, DoubleCastBad) {
-  parseAssembly(
-      "define i32 @test(i8 %a, i8 %b) {\n"
-      "  %1 = icmp ult i8 %a, %b\n"
-      "  %2 = zext i8 %a to i32\n"
-      "  %3 = sext i8 %b to i32\n"
-      "  %A = select i1 %1, i32 %2, i32 %3\n"
-      "  ret i32 %A\n"
-      "}\n");
-  // The cast types here aren't the same, so we cannot match an UMIN.
-  expectPattern({SPF_UNKNOWN, SPNB_NA, false});
-}
-
-TEST_F(MatchSelectPatternTest, NotNotSMin) {
-  parseAssembly(
-      "define i8 @test(i8 %a, i8 %b) {\n"
-      "  %cmp = icmp sgt i8 %a, %b\n"
-      "  %an = xor i8 %a, -1\n"
-      "  %bn = xor i8 %b, -1\n"
-      "  %A = select i1 %cmp, i8 %an, i8 %bn\n"
-      "  ret i8 %A\n"
-      "}\n");
-  expectPattern({SPF_SMIN, SPNB_NA, false});
-}
-
-TEST_F(MatchSelectPatternTest, NotNotSMinSwap) {
-  parseAssembly(
-      "define <2 x i8> @test(<2 x i8> %a, <2 x i8> %b) {\n"
-      "  %cmp = icmp slt <2 x i8> %a, %b\n"
-      "  %an = xor <2 x i8> %a, <i8 -1, i8-1>\n"
-      "  %bn = xor <2 x i8> %b, <i8 -1, i8-1>\n"
-      "  %A = select <2 x i1> %cmp, <2 x i8> %bn, <2 x i8> %an\n"
-      "  ret <2 x i8> %A\n"
-      "}\n");
-  expectPattern({SPF_SMIN, SPNB_NA, false});
-}
-
-TEST_F(MatchSelectPatternTest, NotNotSMax) {
-  parseAssembly(
-      "define i8 @test(i8 %a, i8 %b) {\n"
-      "  %cmp = icmp slt i8 %a, %b\n"
-      "  %an = xor i8 %a, -1\n"
-      "  %bn = xor i8 %b, -1\n"
-      "  %A = select i1 %cmp, i8 %an, i8 %bn\n"
-      "  ret i8 %A\n"
-      "}\n");
-  expectPattern({SPF_SMAX, SPNB_NA, false});
-}
-
-TEST_F(MatchSelectPatternTest, NotNotSMaxSwap) {
-  parseAssembly(
-      "define <2 x i8> @test(<2 x i8> %a, <2 x i8> %b) {\n"
-      "  %cmp = icmp sgt <2 x i8> %a, %b\n"
-      "  %an = xor <2 x i8> %a, <i8 -1, i8-1>\n"
-      "  %bn = xor <2 x i8> %b, <i8 -1, i8-1>\n"
-      "  %A = select <2 x i1> %cmp, <2 x i8> %bn, <2 x i8> %an\n"
-      "  ret <2 x i8> %A\n"
-      "}\n");
-  expectPattern({SPF_SMAX, SPNB_NA, false});
-}
-
-TEST_F(MatchSelectPatternTest, NotNotUMin) {
-  parseAssembly(
-      "define <2 x i8> @test(<2 x i8> %a, <2 x i8> %b) {\n"
-      "  %cmp = icmp ugt <2 x i8> %a, %b\n"
-      "  %an = xor <2 x i8> %a, <i8 -1, i8-1>\n"
-      "  %bn = xor <2 x i8> %b, <i8 -1, i8-1>\n"
-      "  %A = select <2 x i1> %cmp, <2 x i8> %an, <2 x i8> %bn\n"
-      "  ret <2 x i8> %A\n"
-      "}\n");
-  expectPattern({SPF_UMIN, SPNB_NA, false});
-}
-
-TEST_F(MatchSelectPatternTest, NotNotUMinSwap) {
-  parseAssembly(
-      "define i8 @test(i8 %a, i8 %b) {\n"
-      "  %cmp = icmp ult i8 %a, %b\n"
-      "  %an = xor i8 %a, -1\n"
-      "  %bn = xor i8 %b, -1\n"
-      "  %A = select i1 %cmp, i8 %bn, i8 %an\n"
-      "  ret i8 %A\n"
-      "}\n");
-  expectPattern({SPF_UMIN, SPNB_NA, false});
-}
-
-TEST_F(MatchSelectPatternTest, NotNotUMax) {
-  parseAssembly(
-      "define <2 x i8> @test(<2 x i8> %a, <2 x i8> %b) {\n"
-      "  %cmp = icmp ult <2 x i8> %a, %b\n"
-      "  %an = xor <2 x i8> %a, <i8 -1, i8-1>\n"
-      "  %bn = xor <2 x i8> %b, <i8 -1, i8-1>\n"
-      "  %A = select <2 x i1> %cmp, <2 x i8> %an, <2 x i8> %bn\n"
-      "  ret <2 x i8> %A\n"
-      "}\n");
-  expectPattern({SPF_UMAX, SPNB_NA, false});
-}
-
-TEST_F(MatchSelectPatternTest, NotNotUMaxSwap) {
-  parseAssembly(
-      "define i8 @test(i8 %a, i8 %b) {\n"
-      "  %cmp = icmp ugt i8 %a, %b\n"
-      "  %an = xor i8 %a, -1\n"
-      "  %bn = xor i8 %b, -1\n"
-      "  %A = select i1 %cmp, i8 %bn, i8 %an\n"
-      "  ret i8 %A\n"
-      "}\n");
-  expectPattern({SPF_UMAX, SPNB_NA, false});
-}
-
-TEST_F(MatchSelectPatternTest, NotNotEq) {
-  parseAssembly(
-      "define i8 @test(i8 %a, i8 %b) {\n"
-      "  %cmp = icmp eq i8 %a, %b\n"
-      "  %an = xor i8 %a, -1\n"
-      "  %bn = xor i8 %b, -1\n"
-      "  %A = select i1 %cmp, i8 %bn, i8 %an\n"
-      "  ret i8 %A\n"
-      "}\n");
-  expectPattern({SPF_UNKNOWN, SPNB_NA, false});
-}
-
-TEST_F(MatchSelectPatternTest, NotNotNe) {
-  parseAssembly(
-      "define i8 @test(i8 %a, i8 %b) {\n"
-      "  %cmp = icmp ne i8 %a, %b\n"
-      "  %an = xor i8 %a, -1\n"
-      "  %bn = xor i8 %b, -1\n"
-      "  %A = select i1 %cmp, i8 %bn, i8 %an\n"
-      "  ret i8 %A\n"
-      "}\n");
-  expectPattern({SPF_UNKNOWN, SPNB_NA, false});
-}
-
-TEST(ValueTracking, GuaranteedToTransferExecutionToSuccessor) {
-  StringRef Assembly =
-      "declare void @nounwind_readonly(i32*) nounwind readonly "
-      "declare void @nounwind_argmemonly(i32*) nounwind argmemonly "
-      "declare void @nounwind_willreturn(i32*) nounwind willreturn "
-      "declare void @throws_but_readonly(i32*) readonly "
-      "declare void @throws_but_argmemonly(i32*) argmemonly "
-      "declare void @throws_but_willreturn(i32*) willreturn "
-      " "
-      "declare void @unknown(i32*) "
-      " "
-      "define void @f(i32* %p) { "
-      "  call void @nounwind_readonly(i32* %p) "
-      "  call void @nounwind_argmemonly(i32* %p) "
-      "  call void @nounwind_willreturn(i32* %p)"
-      "  call void @throws_but_readonly(i32* %p) "
-      "  call void @throws_but_argmemonly(i32* %p) "
-      "  call void @throws_but_willreturn(i32* %p) "
-      "  call void @unknown(i32* %p) nounwind readonly "
-      "  call void @unknown(i32* %p) nounwind argmemonly "
-      "  call void @unknown(i32* %p) nounwind willreturn "
-      "  call void @unknown(i32* %p) readonly "
-      "  call void @unknown(i32* %p) argmemonly "
-      "  call void @unknown(i32* %p) willreturn "
-      "  ret void "
-      "} ";
-
-  LLVMContext Context;
-  SMDiagnostic Error;
-  auto M = parseAssemblyString(Assembly, Error, Context);
-  assert(M && "Bad assembly?");
-
-  auto *F = M->getFunction("f");
-  assert(F && "Bad assembly?");
-
-  auto &BB = F->getEntryBlock();
-  bool ExpectedAnswers[] = {
-      false, // call void @nounwind_readonly(i32* %p)
-      false, // call void @nounwind_argmemonly(i32* %p)
-      true,  // call void @nounwind_willreturn(i32* %p)
-      false, // call void @throws_but_readonly(i32* %p)
-      false, // call void @throws_but_argmemonly(i32* %p)
-      false, // call void @throws_but_willreturn(i32* %p)
-      false, // call void @unknown(i32* %p) nounwind readonly
-      false, // call void @unknown(i32* %p) nounwind argmemonly
-      true,  // call void @unknown(i32* %p) nounwind willreturn
-      false, // call void @unknown(i32* %p) readonly
-      false, // call void @unknown(i32* %p) argmemonly
-      false, // call void @unknown(i32* %p) willreturn
-      false, // ret void
-  };
-
-  int Index = 0;
-  for (auto &I : BB) {
-    EXPECT_EQ(isGuaranteedToTransferExecutionToSuccessor(&I),
-              ExpectedAnswers[Index])
-        << "Incorrect answer at instruction " << Index << " = " << I;
-    Index++;
-  }
-}
-
-TEST_F(ValueTrackingTest, ComputeNumSignBits_PR32045) {
-  parseAssembly(
-      "define i32 @test(i32 %a) {\n"
-      "  %A = ashr i32 %a, -1\n"
-      "  ret i32 %A\n"
-      "}\n");
-  EXPECT_EQ(ComputeNumSignBits(A, M->getDataLayout()), 1u);
-}
-
-// No guarantees for canonical IR in this analysis, so this just bails out.
-TEST_F(ValueTrackingTest, ComputeNumSignBits_Shuffle) {
-  parseAssembly(
-      "define <2 x i32> @test() {\n"
-      "  %A = shufflevector <2 x i32> undef, <2 x i32> undef, <2 x i32> <i32 0, i32 0>\n"
-      "  ret <2 x i32> %A\n"
-      "}\n");
-  EXPECT_EQ(ComputeNumSignBits(A, M->getDataLayout()), 1u);
-}
-
-// No guarantees for canonical IR in this analysis, so a shuffle element that
-// references an undef value means this can't return any extra information.
-TEST_F(ValueTrackingTest, ComputeNumSignBits_Shuffle2) {
-  parseAssembly(
-      "define <2 x i32> @test(<2 x i1> %x) {\n"
-      "  %sext = sext <2 x i1> %x to <2 x i32>\n"
-      "  %A = shufflevector <2 x i32> %sext, <2 x i32> undef, <2 x i32> <i32 0, i32 2>\n"
-      "  ret <2 x i32> %A\n"
-      "}\n");
-  EXPECT_EQ(ComputeNumSignBits(A, M->getDataLayout()), 1u);
-}
-
-TEST_F(ValueTrackingTest, impliesPoisonTest_Identity) {
-  parseAssembly("define void @test(i32 %x, i32 %y) {\n"
-                "  %A = add i32 %x, %y\n"
-                "  ret void\n"
-                "}");
-  EXPECT_TRUE(impliesPoison(A, A));
-}
-
-TEST_F(ValueTrackingTest, impliesPoisonTest_ICmp) {
-  parseAssembly("define void @test(i32 %x) {\n"
-                "  %A2 = icmp eq i32 %x, 0\n"
-                "  %A = icmp eq i32 %x, 1\n"
-                "  ret void\n"
-                "}");
-  EXPECT_TRUE(impliesPoison(A2, A));
-}
-
-TEST_F(ValueTrackingTest, impliesPoisonTest_ICmpUnknown) {
-  parseAssembly("define void @test(i32 %x, i32 %y) {\n"
-                "  %A2 = icmp eq i32 %x, %y\n"
-                "  %A = icmp eq i32 %x, 1\n"
-                "  ret void\n"
-                "}");
-  EXPECT_FALSE(impliesPoison(A2, A));
-}
-
-TEST_F(ValueTrackingTest, impliesPoisonTest_AddNswOkay) {
-  parseAssembly("define void @test(i32 %x) {\n"
-                "  %A2 = add nsw i32 %x, 1\n"
-                "  %A = add i32 %A2, 1\n"
-                "  ret void\n"
-                "}");
-  EXPECT_TRUE(impliesPoison(A2, A));
-}
-
-TEST_F(ValueTrackingTest, impliesPoisonTest_AddNswOkay2) {
-  parseAssembly("define void @test(i32 %x) {\n"
-                "  %A2 = add i32 %x, 1\n"
-                "  %A = add nsw i32 %A2, 1\n"
-                "  ret void\n"
-                "}");
-  EXPECT_TRUE(impliesPoison(A2, A));
-}
-
-TEST_F(ValueTrackingTest, impliesPoisonTest_AddNsw) {
-  parseAssembly("define void @test(i32 %x) {\n"
-                "  %A2 = add nsw i32 %x, 1\n"
-                "  %A = add i32 %x, 1\n"
-                "  ret void\n"
-                "}");
-  EXPECT_FALSE(impliesPoison(A2, A));
-}
-
-TEST_F(ValueTrackingTest, impliesPoisonTest_Cmp) {
-  parseAssembly("define void @test(i32 %x, i32 %y, i1 %c) {\n"
-                "  %A2 = icmp eq i32 %x, %y\n"
-                "  %A0 = icmp ult i32 %x, %y\n"
-                "  %A = or i1 %A0, %c\n"
-                "  ret void\n"
-                "}");
-  EXPECT_TRUE(impliesPoison(A2, A));
-}
-
-TEST_F(ValueTrackingTest, impliesPoisonTest_FCmpFMF) {
-  parseAssembly("define void @test(float %x, float %y, i1 %c) {\n"
-                "  %A2 = fcmp nnan oeq float %x, %y\n"
-                "  %A0 = fcmp olt float %x, %y\n"
-                "  %A = or i1 %A0, %c\n"
-                "  ret void\n"
-                "}");
-  EXPECT_FALSE(impliesPoison(A2, A));
-}
-
-TEST_F(ValueTrackingTest, impliesPoisonTest_AddSubSameOps) {
-  parseAssembly("define void @test(i32 %x, i32 %y, i1 %c) {\n"
-                "  %A2 = add i32 %x, %y\n"
-                "  %A = sub i32 %x, %y\n"
-                "  ret void\n"
-                "}");
-  EXPECT_TRUE(impliesPoison(A2, A));
-}
-
-TEST_F(ValueTrackingTest, impliesPoisonTest_MaskCmp) {
-  parseAssembly("define void @test(i32 %x, i32 %y, i1 %c) {\n"
-                "  %M2 = and i32 %x, 7\n"
-                "  %A2 = icmp eq i32 %M2, 1\n"
-                "  %M = and i32 %x, 15\n"
-                "  %A = icmp eq i32 %M, 3\n"
-                "  ret void\n"
-                "}");
-  EXPECT_TRUE(impliesPoison(A2, A));
-}
-
-TEST_F(ValueTrackingTest, ComputeNumSignBits_Shuffle_Pointers) {
-  parseAssembly(
-      "define <2 x i32*> @test(<2 x i32*> %x) {\n"
-      "  %A = shufflevector <2 x i32*> zeroinitializer, <2 x i32*> undef, <2 x i32> zeroinitializer\n"
-      "  ret <2 x i32*> %A\n"
-      "}\n");
-  EXPECT_EQ(ComputeNumSignBits(A, M->getDataLayout()), 64u);
-}
-
-TEST(ValueTracking, propagatesPoison) {
-  std::string AsmHead =
-      "declare i32 @g(i32)\n"
-      "declare {i32, i1} @llvm.sadd.with.overflow.i32(i32 %a, i32 %b)\n"
-      "declare {i32, i1} @llvm.ssub.with.overflow.i32(i32 %a, i32 %b)\n"
-      "declare {i32, i1} @llvm.smul.with.overflow.i32(i32 %a, i32 %b)\n"
-      "declare {i32, i1} @llvm.uadd.with.overflow.i32(i32 %a, i32 %b)\n"
-      "declare {i32, i1} @llvm.usub.with.overflow.i32(i32 %a, i32 %b)\n"
-      "declare {i32, i1} @llvm.umul.with.overflow.i32(i32 %a, i32 %b)\n"
-      "declare float @llvm.sqrt.f32(float)\n"
-      "declare float @llvm.powi.f32.i32(float, i32)\n"
-      "declare float @llvm.sin.f32(float)\n"
-      "declare float @llvm.cos.f32(float)\n"
-      "declare float @llvm.pow.f32(float, float)\n"
-      "declare float @llvm.exp.f32(float)\n"
-      "declare float @llvm.exp2.f32(float)\n"
-      "declare float @llvm.log.f32(float)\n"
-      "declare float @llvm.log10.f32(float)\n"
-      "declare float @llvm.log2.f32(float)\n"
-      "declare float @llvm.fma.f32(float, float, float)\n"
-      "declare float @llvm.fabs.f32(float)\n"
-      "declare float @llvm.minnum.f32(float, float)\n"
-      "declare float @llvm.maxnum.f32(float, float)\n"
-      "declare float @llvm.minimum.f32(float, float)\n"
-      "declare float @llvm.maximum.f32(float, float)\n"
-      "declare float @llvm.copysign.f32(float, float)\n"
-      "declare float @llvm.floor.f32(float)\n"
-      "declare float @llvm.ceil.f32(float)\n"
-      "declare float @llvm.trunc.f32(float)\n"
-      "declare float @llvm.rint.f32(float)\n"
-      "declare float @llvm.nearbyint.f32(float)\n"
-      "declare float @llvm.round.f32(float)\n"
-      "declare float @llvm.roundeven.f32(float)\n"
-      "declare i32 @llvm.lround.f32(float)\n"
-      "declare i64 @llvm.llround.f32(float)\n"
-      "declare i32 @llvm.lrint.f32(float)\n"
-      "declare i64 @llvm.llrint.f32(float)\n"
-      "declare float @llvm.fmuladd.f32(float, float, float)\n"
-      "define void @f(i32 %x, i32 %y, float %fx, float %fy, "
-      "i1 %cond, i8* %p) {\n";
-  std::string AsmTail = "  ret void\n}";
-  // (propagates poison?, IR instruction)
-  SmallVector<std::pair<bool, std::string>, 32> Data = {
-      {true, "add i32 %x, %y"},
-      {true, "add nsw nuw i32 %x, %y"},
-      {true, "ashr i32 %x, %y"},
-      {true, "lshr exact i32 %x, 31"},
-      {true, "fadd float %fx, %fy"},
-      {true, "fsub float %fx, %fy"},
-      {true, "fmul float %fx, %fy"},
-      {true, "fdiv float %fx, %fy"},
-      {true, "frem float %fx, %fy"},
-      {true, "fneg float %fx"},
-      {true, "fcmp oeq float %fx, %fy"},
-      {true, "icmp eq i32 %x, %y"},
-      {true, "getelementptr i8, i8* %p, i32 %x"},
-      {true, "getelementptr inbounds i8, i8* %p, i32 %x"},
-      {true, "bitcast float %fx to i32"},
-      {false, "select i1 %cond, i32 %x, i32 %y"},
-      {false, "freeze i32 %x"},
-      {true, "udiv i32 %x, %y"},
-      {true, "urem i32 %x, %y"},
-      {true, "sdiv exact i32 %x, %y"},
-      {true, "srem i32 %x, %y"},
-      {false, "call i32 @g(i32 %x)"},
-      {true, "call {i32, i1} @llvm.sadd.with.overflow.i32(i32 %x, i32 %y)"},
-      {true, "call {i32, i1} @llvm.ssub.with.overflow.i32(i32 %x, i32 %y)"},
-      {true, "call {i32, i1} @llvm.smul.with.overflow.i32(i32 %x, i32 %y)"},
-      {true, "call {i32, i1} @llvm.uadd.with.overflow.i32(i32 %x, i32 %y)"},
-      {true, "call {i32, i1} @llvm.usub.with.overflow.i32(i32 %x, i32 %y)"},
-      {true, "call {i32, i1} @llvm.umul.with.overflow.i32(i32 %x, i32 %y)"},
-      {false, "call float @llvm.sqrt.f32(float %fx)"},
-      {false, "call float @llvm.powi.f32.i32(float %fx, i32 %x)"},
-      {false, "call float @llvm.sin.f32(float %fx)"},
-      {false, "call float @llvm.cos.f32(float %fx)"},
-      {false, "call float @llvm.pow.f32(float %fx, float %fy)"},
-      {false, "call float @llvm.exp.f32(float %fx)"},
-      {false, "call float @llvm.exp2.f32(float %fx)"},
-      {false, "call float @llvm.log.f32(float %fx)"},
-      {false, "call float @llvm.log10.f32(float %fx)"},
-      {false, "call float @llvm.log2.f32(float %fx)"},
-      {false, "call float @llvm.fma.f32(float %fx, float %fx, float %fy)"},
-      {false, "call float @llvm.fabs.f32(float %fx)"},
-      {false, "call float @llvm.minnum.f32(float %fx, float %fy)"},
-      {false, "call float @llvm.maxnum.f32(float %fx, float %fy)"},
-      {false, "call float @llvm.minimum.f32(float %fx, float %fy)"},
-      {false, "call float @llvm.maximum.f32(float %fx, float %fy)"},
-      {false, "call float @llvm.copysign.f32(float %fx, float %fy)"},
-      {false, "call float @llvm.floor.f32(float %fx)"},
-      {false, "call float @llvm.ceil.f32(float %fx)"},
-      {false, "call float @llvm.trunc.f32(float %fx)"},
-      {false, "call float @llvm.rint.f32(float %fx)"},
-      {false, "call float @llvm.nearbyint.f32(float %fx)"},
-      {false, "call float @llvm.round.f32(float %fx)"},
-      {false, "call float @llvm.roundeven.f32(float %fx)"},
-      {false, "call i32 @llvm.lround.f32(float %fx)"},
-      {false, "call i64 @llvm.llround.f32(float %fx)"},
-      {false, "call i32 @llvm.lrint.f32(float %fx)"},
-      {false, "call i64 @llvm.llrint.f32(float %fx)"},
-      {false, "call float @llvm.fmuladd.f32(float %fx, float %fx, float %fy)"}};
-
-  std::string AssemblyStr = AsmHead;
-  for (auto &Itm : Data)
-    AssemblyStr += Itm.second + "\n";
-  AssemblyStr += AsmTail;
-
-  LLVMContext Context;
-  SMDiagnostic Error;
-  auto M = parseAssemblyString(AssemblyStr, Error, Context);
-  assert(M && "Bad assembly?");
-
-  auto *F = M->getFunction("f");
-  assert(F && "Bad assembly?");
-
-  auto &BB = F->getEntryBlock();
-
-  int Index = 0;
-  for (auto &I : BB) {
-    if (isa<ReturnInst>(&I))
-      break;
-    EXPECT_EQ(propagatesPoison(cast<Operator>(&I)), Data[Index].first)
-        << "Incorrect answer at instruction " << Index << " = " << I;
-    Index++;
-  }
-}
-
-TEST_F(ValueTrackingTest, programUndefinedIfPoison) {
-  parseAssembly("declare i32 @any_num()"
-                "define void @test(i32 %mask) {\n"
-                "  %A = call i32 @any_num()\n"
-                "  %B = or i32 %A, %mask\n"
-                "  udiv i32 1, %B"
-                "  ret void\n"
-                "}\n");
-  // If %A was poison, udiv raises UB regardless of %mask's value
-  EXPECT_EQ(programUndefinedIfPoison(A), true);
-}
-
-TEST_F(ValueTrackingTest, programUndefinedIfUndefOrPoison) {
-  parseAssembly("declare i32 @any_num()"
-                "define void @test(i32 %mask) {\n"
-                "  %A = call i32 @any_num()\n"
-                "  %B = or i32 %A, %mask\n"
-                "  udiv i32 1, %B"
-                "  ret void\n"
-                "}\n");
-  // If %A was undef and %mask was 1, udiv does not raise UB
-  EXPECT_EQ(programUndefinedIfUndefOrPoison(A), false);
-}
-
-TEST_F(ValueTrackingTest, isGuaranteedNotToBePoison_exploitBranchCond) {
-  parseAssembly("declare i1 @any_bool()"
-                "define void @test(i1 %y) {\n"
-                "  %A = call i1 @any_bool()\n"
-                "  %cond = and i1 %A, %y\n"
-                "  br i1 %cond, label %BB1, label %BB2\n"
-                "BB1:\n"
-                "  ret void\n"
-                "BB2:\n"
-                "  ret void\n"
-                "}\n");
-  DominatorTree DT(*F);
-  for (auto &BB : *F) {
-    if (&BB == &F->getEntryBlock())
-      continue;
-
-    EXPECT_EQ(isGuaranteedNotToBePoison(A, nullptr, BB.getTerminator(), &DT),
-              true)
-        << "isGuaranteedNotToBePoison does not hold at " << *BB.getTerminator();
-  }
-}
-
-TEST_F(ValueTrackingTest, isGuaranteedNotToBePoison_phi) {
-  parseAssembly("declare i32 @any_i32(i32)"
-                "define void @test() {\n"
-                "ENTRY:\n"
-                "  br label %LOOP\n"
-                "LOOP:\n"
-                "  %A = phi i32 [0, %ENTRY], [%A.next, %NEXT]\n"
-                "  %A.next = call i32 @any_i32(i32 %A)\n"
-                "  %cond = icmp eq i32 %A.next, 0\n"
-                "  br i1 %cond, label %NEXT, label %EXIT\n"
-                "NEXT:\n"
-                "  br label %LOOP\n"
-                "EXIT:\n"
-                "  ret void\n"
-                "}\n");
-  DominatorTree DT(*F);
-  for (auto &BB : *F) {
-    if (BB.getName() == "LOOP") {
-      EXPECT_EQ(isGuaranteedNotToBePoison(A, nullptr, A, &DT), true)
-          << "isGuaranteedNotToBePoison does not hold";
-    }
-  }
-}
-
-TEST_F(ValueTrackingTest, isGuaranteedNotToBeUndefOrPoison) {
-  parseAssembly("declare void @f(i32 noundef)"
-                "define void @test(i32 %x) {\n"
-                "  %A = bitcast i32 %x to i32\n"
-                "  call void @f(i32 noundef %x)\n"
-                "  ret void\n"
-                "}\n");
-  EXPECT_EQ(isGuaranteedNotToBeUndefOrPoison(A), true);
-  EXPECT_EQ(isGuaranteedNotToBeUndefOrPoison(UndefValue::get(IntegerType::get(Context, 8))), false);
-  EXPECT_EQ(isGuaranteedNotToBeUndefOrPoison(PoisonValue::get(IntegerType::get(Context, 8))), false);
-  EXPECT_EQ(isGuaranteedNotToBePoison(UndefValue::get(IntegerType::get(Context, 8))), true);
-  EXPECT_EQ(isGuaranteedNotToBePoison(PoisonValue::get(IntegerType::get(Context, 8))), false);
-
-  Type *Int32Ty = Type::getInt32Ty(Context);
-  Constant *CU = UndefValue::get(Int32Ty);
-  Constant *CP = PoisonValue::get(Int32Ty);
-  Constant *C1 = ConstantInt::get(Int32Ty, 1);
-  Constant *C2 = ConstantInt::get(Int32Ty, 2);
-
-  {
-    Constant *V1 = ConstantVector::get({C1, C2});
-    EXPECT_TRUE(isGuaranteedNotToBeUndefOrPoison(V1));
-    EXPECT_TRUE(isGuaranteedNotToBePoison(V1));
-  }
-
-  {
-    Constant *V2 = ConstantVector::get({C1, CU});
-    EXPECT_FALSE(isGuaranteedNotToBeUndefOrPoison(V2));
-    EXPECT_TRUE(isGuaranteedNotToBePoison(V2));
-  }
-
-  {
-    Constant *V3 = ConstantVector::get({C1, CP});
-    EXPECT_FALSE(isGuaranteedNotToBeUndefOrPoison(V3));
-    EXPECT_FALSE(isGuaranteedNotToBePoison(V3));
-  }
-}
-
-TEST_F(ValueTrackingTest, isGuaranteedNotToBeUndefOrPoison_assume) {
-  parseAssembly("declare i1 @f_i1()\n"
-                "declare i32 @f_i32()\n"
-                "declare void @llvm.assume(i1)\n"
-                "define void @test() {\n"
-                "  %A = call i32 @f_i32()\n"
-                "  %cond = call i1 @f_i1()\n"
-                "  %CxtI = add i32 0, 0\n"
-                "  br i1 %cond, label %BB1, label %EXIT\n"
-                "BB1:\n"
-                "  %CxtI2 = add i32 0, 0\n"
-                "  %cond2 = call i1 @f_i1()\n"
-                "  call void @llvm.assume(i1 true) [ \"noundef\"(i32 %A) ]\n"
-                "  br i1 %cond2, label %BB2, label %EXIT\n"
-                "BB2:\n"
-                "  %CxtI3 = add i32 0, 0\n"
-                "  ret void\n"
-                "EXIT:\n"
-                "  ret void\n"
-                "}");
-  AssumptionCache AC(*F);
-  DominatorTree DT(*F);
-  EXPECT_FALSE(isGuaranteedNotToBeUndefOrPoison(A, &AC, CxtI, &DT));
-  EXPECT_FALSE(isGuaranteedNotToBeUndefOrPoison(A, &AC, CxtI2, &DT));
-  EXPECT_TRUE(isGuaranteedNotToBeUndefOrPoison(A, &AC, CxtI3, &DT));
-}
-
-TEST(ValueTracking, canCreatePoisonOrUndef) {
-  std::string AsmHead =
-      "@s = external dso_local global i32, align 1\n"
-      "declare i32 @g(i32)\n"
-      "declare {i32, i1} @llvm.sadd.with.overflow.i32(i32 %a, i32 %b)\n"
-      "declare {i32, i1} @llvm.ssub.with.overflow.i32(i32 %a, i32 %b)\n"
-      "declare {i32, i1} @llvm.smul.with.overflow.i32(i32 %a, i32 %b)\n"
-      "declare {i32, i1} @llvm.uadd.with.overflow.i32(i32 %a, i32 %b)\n"
-      "declare {i32, i1} @llvm.usub.with.overflow.i32(i32 %a, i32 %b)\n"
-      "declare {i32, i1} @llvm.umul.with.overflow.i32(i32 %a, i32 %b)\n"
-      "define void @f(i32 %x, i32 %y, float %fx, float %fy, i1 %cond, "
-      "<4 x i32> %vx, <4 x i32> %vx2, <vscale x 4 x i32> %svx, i8* %p) {\n";
-  std::string AsmTail = "  ret void\n}";
-  // (can create poison?, can create undef?, IR instruction)
-  SmallVector<std::pair<std::pair<bool, bool>, std::string>, 32> Data = {
-      {{false, false}, "add i32 %x, %y"},
-      {{true, false}, "add nsw nuw i32 %x, %y"},
-      {{true, false}, "shl i32 %x, %y"},
-      {{true, false}, "shl <4 x i32> %vx, %vx2"},
-      {{true, false}, "shl nsw i32 %x, %y"},
-      {{true, false}, "shl nsw <4 x i32> %vx, <i32 0, i32 1, i32 2, i32 3>"},
-      {{false, false}, "shl i32 %x, 31"},
-      {{true, false}, "shl i32 %x, 32"},
-      {{false, false}, "shl <4 x i32> %vx, <i32 0, i32 1, i32 2, i32 3>"},
-      {{true, false}, "shl <4 x i32> %vx, <i32 0, i32 1, i32 2, i32 32>"},
-      {{true, false}, "ashr i32 %x, %y"},
-      {{true, false}, "ashr exact i32 %x, %y"},
-      {{false, false}, "ashr i32 %x, 31"},
-      {{true, false}, "ashr exact i32 %x, 31"},
-      {{false, false}, "ashr <4 x i32> %vx, <i32 0, i32 1, i32 2, i32 3>"},
-      {{true, false}, "ashr <4 x i32> %vx, <i32 0, i32 1, i32 2, i32 32>"},
-      {{true, false}, "ashr exact <4 x i32> %vx, <i32 0, i32 1, i32 2, i32 3>"},
-      {{true, false}, "lshr i32 %x, %y"},
-      {{true, false}, "lshr exact i32 %x, 31"},
-      {{false, false}, "udiv i32 %x, %y"},
-      {{true, false}, "udiv exact i32 %x, %y"},
-      {{false, false}, "getelementptr i8, i8* %p, i32 %x"},
-      {{true, false}, "getelementptr inbounds i8, i8* %p, i32 %x"},
-      {{true, false}, "fneg nnan float %fx"},
-      {{false, false}, "fneg float %fx"},
-      {{false, false}, "fadd float %fx, %fy"},
-      {{true, false}, "fadd nnan float %fx, %fy"},
-      {{false, false}, "urem i32 %x, %y"},
-      {{true, false}, "fptoui float %fx to i32"},
-      {{true, false}, "fptosi float %fx to i32"},
-      {{false, false}, "bitcast float %fx to i32"},
-      {{false, false}, "select i1 %cond, i32 %x, i32 %y"},
-      {{true, false}, "select nnan i1 %cond, float %fx, float %fy"},
-      {{true, false}, "extractelement <4 x i32> %vx, i32 %x"},
-      {{false, false}, "extractelement <4 x i32> %vx, i32 3"},
-      {{true, false}, "extractelement <vscale x 4 x i32> %svx, i32 4"},
-      {{true, false}, "insertelement <4 x i32> %vx, i32 %x, i32 %y"},
-      {{false, false}, "insertelement <4 x i32> %vx, i32 %x, i32 3"},
-      {{true, false}, "insertelement <vscale x 4 x i32> %svx, i32 %x, i32 4"},
-      {{false, false}, "freeze i32 %x"},
-      {{false, false},
-       "shufflevector <4 x i32> %vx, <4 x i32> %vx2, "
-       "<4 x i32> <i32 0, i32 1, i32 2, i32 3>"},
-      {{false, true},
-       "shufflevector <4 x i32> %vx, <4 x i32> %vx2, "
-       "<4 x i32> <i32 0, i32 1, i32 2, i32 undef>"},
-      {{false, true},
-       "shufflevector <vscale x 4 x i32> %svx, "
-       "<vscale x 4 x i32> %svx, <vscale x 4 x i32> undef"},
-      {{true, false}, "call i32 @g(i32 %x)"},
-      {{false, false}, "call noundef i32 @g(i32 %x)"},
-      {{true, false}, "fcmp nnan oeq float %fx, %fy"},
-      {{false, false}, "fcmp oeq float %fx, %fy"},
-      {{true, false},
-       "ashr <4 x i32> %vx, select (i1 icmp sgt (i32 ptrtoint (i32* @s to "
-       "i32), i32 1), <4 x i32> zeroinitializer, <4 x i32> <i32 0, i32 1, i32 "
-       "2, i32 3>)"},
-      {{false, false},
-       "call {i32, i1} @llvm.sadd.with.overflow.i32(i32 %x, i32 %y)"},
-      {{false, false},
-       "call {i32, i1} @llvm.ssub.with.overflow.i32(i32 %x, i32 %y)"},
-      {{false, false},
-       "call {i32, i1} @llvm.smul.with.overflow.i32(i32 %x, i32 %y)"},
-      {{false, false},
-       "call {i32, i1} @llvm.uadd.with.overflow.i32(i32 %x, i32 %y)"},
-      {{false, false},
-       "call {i32, i1} @llvm.usub.with.overflow.i32(i32 %x, i32 %y)"},
-      {{false, false},
-       "call {i32, i1} @llvm.umul.with.overflow.i32(i32 %x, i32 %y)"}};
-
-  std::string AssemblyStr = AsmHead;
-  for (auto &Itm : Data)
-    AssemblyStr += Itm.second + "\n";
-  AssemblyStr += AsmTail;
-
-  LLVMContext Context;
-  SMDiagnostic Error;
-  auto M = parseAssemblyString(AssemblyStr, Error, Context);
-  assert(M && "Bad assembly?");
-
-  auto *F = M->getFunction("f");
-  assert(F && "Bad assembly?");
-
-  auto &BB = F->getEntryBlock();
-
-  int Index = 0;
-  for (auto &I : BB) {
-    if (isa<ReturnInst>(&I))
-      break;
-    bool Poison = Data[Index].first.first;
-    bool Undef = Data[Index].first.second;
-    EXPECT_EQ(canCreatePoison(cast<Operator>(&I)), Poison)
-        << "Incorrect answer of canCreatePoison at instruction " << Index
-        << " = " << I;
-    EXPECT_EQ(canCreateUndefOrPoison(cast<Operator>(&I)), Undef || Poison)
-        << "Incorrect answer of canCreateUndef at instruction " << Index
-        << " = " << I;
-    Index++;
-  }
-}
-
-TEST_F(ValueTrackingTest, computePtrAlignment) {
-  parseAssembly("declare i1 @f_i1()\n"
-                "declare i8* @f_i8p()\n"
-                "declare void @llvm.assume(i1)\n"
-                "define void @test() {\n"
-                "  %A = call i8* @f_i8p()\n"
-                "  %cond = call i1 @f_i1()\n"
-                "  %CxtI = add i32 0, 0\n"
-                "  br i1 %cond, label %BB1, label %EXIT\n"
-                "BB1:\n"
-                "  %CxtI2 = add i32 0, 0\n"
-                "  %cond2 = call i1 @f_i1()\n"
-                "  call void @llvm.assume(i1 true) [ \"align\"(i8* %A, i64 16) ]\n"
-                "  br i1 %cond2, label %BB2, label %EXIT\n"
-                "BB2:\n"
-                "  %CxtI3 = add i32 0, 0\n"
-                "  ret void\n"
-                "EXIT:\n"
-                "  ret void\n"
-                "}");
-  AssumptionCache AC(*F);
-  DominatorTree DT(*F);
-  const DataLayout &DL = M->getDataLayout();
-  EXPECT_EQ(getKnownAlignment(A, DL, CxtI, &AC, &DT), Align(1));
-  EXPECT_EQ(getKnownAlignment(A, DL, CxtI2, &AC, &DT), Align(1));
-  EXPECT_EQ(getKnownAlignment(A, DL, CxtI3, &AC, &DT), Align(16));
-}
-
-TEST_F(ComputeKnownBitsTest, ComputeKnownBits) {
-  parseAssembly(
-      "define i32 @test(i32 %a, i32 %b) {\n"
-      "  %ash = mul i32 %a, 8\n"
-      "  %aad = add i32 %ash, 7\n"
-      "  %aan = and i32 %aad, 4095\n"
-      "  %bsh = shl i32 %b, 4\n"
-      "  %bad = or i32 %bsh, 6\n"
-      "  %ban = and i32 %bad, 4095\n"
-      "  %A = mul i32 %aan, %ban\n"
-      "  ret i32 %A\n"
-      "}\n");
-  expectKnownBits(/*zero*/ 4278190085u, /*one*/ 10u);
-}
-
-TEST_F(ComputeKnownBitsTest, ComputeKnownMulBits) {
-  parseAssembly(
-      "define i32 @test(i32 %a, i32 %b) {\n"
-      "  %aa = shl i32 %a, 5\n"
-      "  %bb = shl i32 %b, 5\n"
-      "  %aaa = or i32 %aa, 24\n"
-      "  %bbb = or i32 %bb, 28\n"
-      "  %A = mul i32 %aaa, %bbb\n"
-      "  ret i32 %A\n"
-      "}\n");
-  expectKnownBits(/*zero*/ 95u, /*one*/ 32u);
-}
-
-TEST_F(ValueTrackingTest, isNonZeroRecurrence) {
-  parseAssembly(R"(
-    define i1 @test(i8 %n, i8 %r) {
-    entry:
-      br label %loop
-    loop:
-      %p = phi i8 [ -1, %entry ], [ %next, %loop ]
-      %next = add nsw i8 %p, -1
-      %cmp1 = icmp eq i8 %p, %n
-      br i1 %cmp1, label %exit, label %loop
-    exit:
-      %A = or i8 %p, %r
-      %CxtI = icmp eq i8 %A, 0
-      ret i1 %CxtI
-    }
-  )");
-  const DataLayout &DL = M->getDataLayout();
-  AssumptionCache AC(*F);
-  EXPECT_TRUE(isKnownNonZero(A, DL, 0, &AC, CxtI));
-}
-
-TEST_F(ValueTrackingTest, KnownNonZeroFromDomCond) {
-  parseAssembly(R"(
-    declare i8* @f_i8()
-    define void @test(i1 %c) {
-      %A = call i8* @f_i8()
-      %B = call i8* @f_i8()
-      %c1 = icmp ne i8* %A, null
-      %cond = and i1 %c1, %c
-      br i1 %cond, label %T, label %Q
-    T:
-      %CxtI = add i32 0, 0
-      ret void
-    Q:
-      %CxtI2 = add i32 0, 0
-      ret void
-    }
-  )");
-  AssumptionCache AC(*F);
-  DominatorTree DT(*F);
-  const DataLayout &DL = M->getDataLayout();
-  EXPECT_EQ(isKnownNonZero(A, DL, 0, &AC, CxtI, &DT), true);
-  EXPECT_EQ(isKnownNonZero(A, DL, 0, &AC, CxtI2, &DT), false);
-}
-
-TEST_F(ValueTrackingTest, KnownNonZeroFromDomCond2) {
-  parseAssembly(R"(
-    declare i8* @f_i8()
-    define void @test(i1 %c) {
-      %A = call i8* @f_i8()
-      %B = call i8* @f_i8()
-      %c1 = icmp ne i8* %A, null
-      %cond = select i1 %c, i1 %c1, i1 false
-      br i1 %cond, label %T, label %Q
-    T:
-      %CxtI = add i32 0, 0
-      ret void
-    Q:
-      %CxtI2 = add i32 0, 0
-      ret void
-    }
-  )");
-  AssumptionCache AC(*F);
-  DominatorTree DT(*F);
-  const DataLayout &DL = M->getDataLayout();
-  EXPECT_EQ(isKnownNonZero(A, DL, 0, &AC, CxtI, &DT), true);
-  EXPECT_EQ(isKnownNonZero(A, DL, 0, &AC, CxtI2, &DT), false);
-}
-
-TEST_F(ValueTrackingTest, IsImpliedConditionAnd) {
-  parseAssembly(R"(
-    define void @test(i32 %x, i32 %y) {
-      %c1 = icmp ult i32 %x, 10
-      %c2 = icmp ult i32 %y, 15
-      %A = and i1 %c1, %c2
-      ; x < 10 /\ y < 15
-      %A2 = icmp ult i32 %x, 20
-      %A3 = icmp uge i32 %y, 20
-      %A4 = icmp ult i32 %x, 5
-      ret void
-    }
-  )");
-  const DataLayout &DL = M->getDataLayout();
-  EXPECT_EQ(isImpliedCondition(A, A2, DL), true);
-  EXPECT_EQ(isImpliedCondition(A, A3, DL), false);
-  EXPECT_EQ(isImpliedCondition(A, A4, DL), None);
-}
-
-TEST_F(ValueTrackingTest, IsImpliedConditionAnd2) {
-  parseAssembly(R"(
-    define void @test(i32 %x, i32 %y) {
-      %c1 = icmp ult i32 %x, 10
-      %c2 = icmp ult i32 %y, 15
-      %A = select i1 %c1, i1 %c2, i1 false
-      ; x < 10 /\ y < 15
-      %A2 = icmp ult i32 %x, 20
-      %A3 = icmp uge i32 %y, 20
-      %A4 = icmp ult i32 %x, 5
-      ret void
-    }
-  )");
-  const DataLayout &DL = M->getDataLayout();
-  EXPECT_EQ(isImpliedCondition(A, A2, DL), true);
-  EXPECT_EQ(isImpliedCondition(A, A3, DL), false);
-  EXPECT_EQ(isImpliedCondition(A, A4, DL), None);
-}
-
-TEST_F(ValueTrackingTest, IsImpliedConditionOr) {
-  parseAssembly(R"(
-    define void @test(i32 %x, i32 %y) {
-      %c1 = icmp ult i32 %x, 10
-      %c2 = icmp ult i32 %y, 15
-      %A = or i1 %c1, %c2 ; negated
-      ; x >= 10 /\ y >= 15
-      %A2 = icmp ult i32 %x, 5
-      %A3 = icmp uge i32 %y, 10
-      %A4 = icmp ult i32 %x, 15
-      ret void
-    }
-  )");
-  const DataLayout &DL = M->getDataLayout();
-  EXPECT_EQ(isImpliedCondition(A, A2, DL, false), false);
-  EXPECT_EQ(isImpliedCondition(A, A3, DL, false), true);
-  EXPECT_EQ(isImpliedCondition(A, A4, DL, false), None);
-}
-
-TEST_F(ValueTrackingTest, IsImpliedConditionOr2) {
-  parseAssembly(R"(
-    define void @test(i32 %x, i32 %y) {
-      %c1 = icmp ult i32 %x, 10
-      %c2 = icmp ult i32 %y, 15
-      %A = select i1 %c1, i1 true, i1 %c2 ; negated
-      ; x >= 10 /\ y >= 15
-      %A2 = icmp ult i32 %x, 5
-      %A3 = icmp uge i32 %y, 10
-      %A4 = icmp ult i32 %x, 15
-      ret void
-    }
-  )");
-  const DataLayout &DL = M->getDataLayout();
-  EXPECT_EQ(isImpliedCondition(A, A2, DL, false), false);
-  EXPECT_EQ(isImpliedCondition(A, A3, DL, false), true);
-  EXPECT_EQ(isImpliedCondition(A, A4, DL, false), None);
-}
-
-TEST_F(ComputeKnownBitsTest, KnownNonZeroShift) {
-  // %q is known nonzero without known bits.
-  // Because %q is nonzero, %A[0] is known to be zero.
-  parseAssembly(
-      "define i8 @test(i8 %p, i8* %pq) {\n"
-      "  %q = load i8, i8* %pq, !range !0\n"
-      "  %A = shl i8 %p, %q\n"
-      "  ret i8 %A\n"
-      "}\n"
-      "!0 = !{ i8 1, i8 5 }\n");
-  expectKnownBits(/*zero*/ 1u, /*one*/ 0u);
-}
-
-TEST_F(ComputeKnownBitsTest, ComputeKnownFshl) {
-  // fshl(....1111....0000, 00..1111........, 6)
-  // = 11....000000..11
-  parseAssembly(
-      "define i16 @test(i16 %a, i16 %b) {\n"
-      "  %aa = shl i16 %a, 4\n"
-      "  %bb = lshr i16 %b, 2\n"
-      "  %aaa = or i16 %aa, 3840\n"
-      "  %bbb = or i16 %bb, 3840\n"
-      "  %A = call i16 @llvm.fshl.i16(i16 %aaa, i16 %bbb, i16 6)\n"
-      "  ret i16 %A\n"
-      "}\n"
-      "declare i16 @llvm.fshl.i16(i16, i16, i16)\n");
-  expectKnownBits(/*zero*/ 1008u, /*one*/ 49155u);
-}
-
-TEST_F(ComputeKnownBitsTest, ComputeKnownFshr) {
-  // fshr(....1111....0000, 00..1111........, 26)
-  // = 11....000000..11
-  parseAssembly(
-      "define i16 @test(i16 %a, i16 %b) {\n"
-      "  %aa = shl i16 %a, 4\n"
-      "  %bb = lshr i16 %b, 2\n"
-      "  %aaa = or i16 %aa, 3840\n"
-      "  %bbb = or i16 %bb, 3840\n"
-      "  %A = call i16 @llvm.fshr.i16(i16 %aaa, i16 %bbb, i16 26)\n"
-      "  ret i16 %A\n"
-      "}\n"
-      "declare i16 @llvm.fshr.i16(i16, i16, i16)\n");
-  expectKnownBits(/*zero*/ 1008u, /*one*/ 49155u);
-}
-
-TEST_F(ComputeKnownBitsTest, ComputeKnownFshlZero) {
-  // fshl(....1111....0000, 00..1111........, 0)
-  // = ....1111....0000
-  parseAssembly(
-      "define i16 @test(i16 %a, i16 %b) {\n"
-      "  %aa = shl i16 %a, 4\n"
-      "  %bb = lshr i16 %b, 2\n"
-      "  %aaa = or i16 %aa, 3840\n"
-      "  %bbb = or i16 %bb, 3840\n"
-      "  %A = call i16 @llvm.fshl.i16(i16 %aaa, i16 %bbb, i16 0)\n"
-      "  ret i16 %A\n"
-      "}\n"
-      "declare i16 @llvm.fshl.i16(i16, i16, i16)\n");
-  expectKnownBits(/*zero*/ 15u, /*one*/ 3840u);
-}
-
-TEST_F(ComputeKnownBitsTest, ComputeKnownUAddSatLeadingOnes) {
-  // uadd.sat(1111...1, ........)
-  // = 1111....
-  parseAssembly(
-      "define i8 @test(i8 %a, i8 %b) {\n"
-      "  %aa = or i8 %a, 241\n"
-      "  %A = call i8 @llvm.uadd.sat.i8(i8 %aa, i8 %b)\n"
-      "  ret i8 %A\n"
-      "}\n"
-      "declare i8 @llvm.uadd.sat.i8(i8, i8)\n");
-  expectKnownBits(/*zero*/ 0u, /*one*/ 240u);
-}
-
-TEST_F(ComputeKnownBitsTest, ComputeKnownUAddSatOnesPreserved) {
-  // uadd.sat(00...011, .1...110)
-  // = .......1
-  parseAssembly(
-      "define i8 @test(i8 %a, i8 %b) {\n"
-      "  %aa = or i8 %a, 3\n"
-      "  %aaa = and i8 %aa, 59\n"
-      "  %bb = or i8 %b, 70\n"
-      "  %bbb = and i8 %bb, 254\n"
-      "  %A = call i8 @llvm.uadd.sat.i8(i8 %aaa, i8 %bbb)\n"
-      "  ret i8 %A\n"
-      "}\n"
-      "declare i8 @llvm.uadd.sat.i8(i8, i8)\n");
-  expectKnownBits(/*zero*/ 0u, /*one*/ 1u);
-}
-
-TEST_F(ComputeKnownBitsTest, ComputeKnownUSubSatLHSLeadingZeros) {
-  // usub.sat(0000...0, ........)
-  // = 0000....
-  parseAssembly(
-      "define i8 @test(i8 %a, i8 %b) {\n"
-      "  %aa = and i8 %a, 14\n"
-      "  %A = call i8 @llvm.usub.sat.i8(i8 %aa, i8 %b)\n"
-      "  ret i8 %A\n"
-      "}\n"
-      "declare i8 @llvm.usub.sat.i8(i8, i8)\n");
-  expectKnownBits(/*zero*/ 240u, /*one*/ 0u);
-}
-
-TEST_F(ComputeKnownBitsTest, ComputeKnownUSubSatRHSLeadingOnes) {
-  // usub.sat(........, 1111...1)
-  // = 0000....
-  parseAssembly(
-      "define i8 @test(i8 %a, i8 %b) {\n"
-      "  %bb = or i8 %a, 241\n"
-      "  %A = call i8 @llvm.usub.sat.i8(i8 %a, i8 %bb)\n"
-      "  ret i8 %A\n"
-      "}\n"
-      "declare i8 @llvm.usub.sat.i8(i8, i8)\n");
-  expectKnownBits(/*zero*/ 240u, /*one*/ 0u);
-}
-
-TEST_F(ComputeKnownBitsTest, ComputeKnownUSubSatZerosPreserved) {
-  // usub.sat(11...011, .1...110)
-  // = ......0.
-  parseAssembly(
-      "define i8 @test(i8 %a, i8 %b) {\n"
-      "  %aa = or i8 %a, 195\n"
-      "  %aaa = and i8 %aa, 251\n"
-      "  %bb = or i8 %b, 70\n"
-      "  %bbb = and i8 %bb, 254\n"
-      "  %A = call i8 @llvm.usub.sat.i8(i8 %aaa, i8 %bbb)\n"
-      "  ret i8 %A\n"
-      "}\n"
-      "declare i8 @llvm.usub.sat.i8(i8, i8)\n");
-  expectKnownBits(/*zero*/ 2u, /*one*/ 0u);
-}
-
-TEST_F(ComputeKnownBitsTest, ComputeKnownBitsPtrToIntTrunc) {
-  // ptrtoint truncates the pointer type.
-  parseAssembly(
-      "define void @test(i8** %p) {\n"
-      "  %A = load i8*, i8** %p\n"
-      "  %i = ptrtoint i8* %A to i32\n"
-      "  %m = and i32 %i, 31\n"
-      "  %c = icmp eq i32 %m, 0\n"
-      "  call void @llvm.assume(i1 %c)\n"
-      "  ret void\n"
-      "}\n"
-      "declare void @llvm.assume(i1)\n");
-  AssumptionCache AC(*F);
-  KnownBits Known = computeKnownBits(
-      A, M->getDataLayout(), /* Depth */ 0, &AC, F->front().getTerminator());
-  EXPECT_EQ(Known.Zero.getZExtValue(), 31u);
-  EXPECT_EQ(Known.One.getZExtValue(), 0u);
-}
-
-TEST_F(ComputeKnownBitsTest, ComputeKnownBitsPtrToIntZext) {
-  // ptrtoint zero extends the pointer type.
-  parseAssembly(
-      "define void @test(i8** %p) {\n"
-      "  %A = load i8*, i8** %p\n"
-      "  %i = ptrtoint i8* %A to i128\n"
-      "  %m = and i128 %i, 31\n"
-      "  %c = icmp eq i128 %m, 0\n"
-      "  call void @llvm.assume(i1 %c)\n"
-      "  ret void\n"
-      "}\n"
-      "declare void @llvm.assume(i1)\n");
-  AssumptionCache AC(*F);
-  KnownBits Known = computeKnownBits(
-      A, M->getDataLayout(), /* Depth */ 0, &AC, F->front().getTerminator());
-  EXPECT_EQ(Known.Zero.getZExtValue(), 31u);
-  EXPECT_EQ(Known.One.getZExtValue(), 0u);
-}
-
-TEST_F(ComputeKnownBitsTest, ComputeKnownBitsFreeze) {
-  parseAssembly("define void @test() {\n"
-                "  %m = call i32 @any_num()\n"
-                "  %A = freeze i32 %m\n"
-                "  %n = and i32 %m, 31\n"
-                "  %c = icmp eq i32 %n, 0\n"
-                "  call void @llvm.assume(i1 %c)\n"
-                "  ret void\n"
-                "}\n"
-                "declare void @llvm.assume(i1)\n"
-                "declare i32 @any_num()\n");
-  AssumptionCache AC(*F);
-  KnownBits Known = computeKnownBits(A, M->getDataLayout(), /* Depth */ 0, &AC,
-                                     F->front().getTerminator());
-  EXPECT_EQ(Known.Zero.getZExtValue(), 31u);
-  EXPECT_EQ(Known.One.getZExtValue(), 0u);
-}
-
-TEST_F(ComputeKnownBitsTest, ComputeKnownBitsAddWithRange) {
-  parseAssembly("define void @test(i64* %p) {\n"
-                "  %A = load i64, i64* %p, !range !{i64 64, i64 65536}\n"
-                "  %APlus512 = add i64 %A, 512\n"
-                "  %c = icmp ugt i64 %APlus512, 523\n"
-                "  call void @llvm.assume(i1 %c)\n"
-                "  ret void\n"
-                "}\n"
-                "declare void @llvm.assume(i1)\n");
-  AssumptionCache AC(*F);
-  KnownBits Known = computeKnownBits(A, M->getDataLayout(), /* Depth */ 0, &AC,
-                                     F->front().getTerminator());
-  EXPECT_EQ(Known.Zero.getZExtValue(), ~(65536llu - 1));
-  EXPECT_EQ(Known.One.getZExtValue(), 0u);
-  Instruction &APlus512 = findInstructionByName(F, "APlus512");
-  Known = computeKnownBits(&APlus512, M->getDataLayout(), /* Depth */ 0, &AC,
-                           F->front().getTerminator());
-  // We know of one less zero because 512 may have produced a 1 that
-  // got carried all the way to the first trailing zero.
-  EXPECT_EQ(Known.Zero.getZExtValue(), (~(65536llu - 1)) << 1);
-  EXPECT_EQ(Known.One.getZExtValue(), 0u);
-  // The known range is not precise given computeKnownBits works
-  // with the masks of zeros and ones, not the ranges.
-  EXPECT_EQ(Known.getMinValue(), 0u);
-  EXPECT_EQ(Known.getMaxValue(), 131071);
-}
-
-// 512 + [32, 64) doesn't produce overlapping bits.
-// Make sure we get all the individual bits properly.
-TEST_F(ComputeKnownBitsTest, ComputeKnownBitsAddWithRangeNoOverlap) {
-  parseAssembly("define void @test(i64* %p) {\n"
-                "  %A = load i64, i64* %p, !range !{i64 32, i64 64}\n"
-                "  %APlus512 = add i64 %A, 512\n"
-                "  %c = icmp ugt i64 %APlus512, 523\n"
-                "  call void @llvm.assume(i1 %c)\n"
-                "  ret void\n"
-                "}\n"
-                "declare void @llvm.assume(i1)\n");
-  AssumptionCache AC(*F);
-  KnownBits Known = computeKnownBits(A, M->getDataLayout(), /* Depth */ 0, &AC,
-                                     F->front().getTerminator());
-  EXPECT_EQ(Known.Zero.getZExtValue(), ~(64llu - 1));
-  EXPECT_EQ(Known.One.getZExtValue(), 32u);
-  Instruction &APlus512 = findInstructionByName(F, "APlus512");
-  Known = computeKnownBits(&APlus512, M->getDataLayout(), /* Depth */ 0, &AC,
-                           F->front().getTerminator());
-  EXPECT_EQ(Known.Zero.getZExtValue(), ~512llu & ~(64llu - 1));
-  EXPECT_EQ(Known.One.getZExtValue(), 512u | 32u);
-  // The known range is not precise given computeKnownBits works
-  // with the masks of zeros and ones, not the ranges.
-  EXPECT_EQ(Known.getMinValue(), 544);
-  EXPECT_EQ(Known.getMaxValue(), 575);
-}
-
-TEST_F(ComputeKnownBitsTest, ComputeKnownBitsGEPWithRange) {
-  parseAssembly(
-      "define void @test(i64* %p) {\n"
-      "  %A = load i64, i64* %p, !range !{i64 64, i64 65536}\n"
-      "  %APtr = inttoptr i64 %A to float*"
-      "  %APtrPlus512 = getelementptr float, float* %APtr, i32 128\n"
-      "  %c = icmp ugt float* %APtrPlus512, inttoptr (i32 523 to float*)\n"
-      "  call void @llvm.assume(i1 %c)\n"
-      "  ret void\n"
-      "}\n"
-      "declare void @llvm.assume(i1)\n");
-  AssumptionCache AC(*F);
-  KnownBits Known = computeKnownBits(A, M->getDataLayout(), /* Depth */ 0, &AC,
-                                     F->front().getTerminator());
-  EXPECT_EQ(Known.Zero.getZExtValue(), ~(65536llu - 1));
-  EXPECT_EQ(Known.One.getZExtValue(), 0u);
-  Instruction &APtrPlus512 = findInstructionByName(F, "APtrPlus512");
-  Known = computeKnownBits(&APtrPlus512, M->getDataLayout(), /* Depth */ 0, &AC,
-                           F->front().getTerminator());
-  // We know of one less zero because 512 may have produced a 1 that
-  // got carried all the way to the first trailing zero.
-  EXPECT_EQ(Known.Zero.getZExtValue(), ~(65536llu - 1) << 1);
-  EXPECT_EQ(Known.One.getZExtValue(), 0u);
-  // The known range is not precise given computeKnownBits works
-  // with the masks of zeros and ones, not the ranges.
-  EXPECT_EQ(Known.getMinValue(), 0u);
-  EXPECT_EQ(Known.getMaxValue(), 131071);
-}
-
-// 4*128 + [32, 64) doesn't produce overlapping bits.
-// Make sure we get all the individual bits properly.
-// This test is useful to check that we account for the scaling factor
-// in the gep. Indeed, gep float, [32,64), 128 is not 128 + [32,64).
-TEST_F(ComputeKnownBitsTest, ComputeKnownBitsGEPWithRangeNoOverlap) {
-  parseAssembly(
-      "define void @test(i64* %p) {\n"
-      "  %A = load i64, i64* %p, !range !{i64 32, i64 64}\n"
-      "  %APtr = inttoptr i64 %A to float*"
-      "  %APtrPlus512 = getelementptr float, float* %APtr, i32 128\n"
-      "  %c = icmp ugt float* %APtrPlus512, inttoptr (i32 523 to float*)\n"
-      "  call void @llvm.assume(i1 %c)\n"
-      "  ret void\n"
-      "}\n"
-      "declare void @llvm.assume(i1)\n");
-  AssumptionCache AC(*F);
-  KnownBits Known = computeKnownBits(A, M->getDataLayout(), /* Depth */ 0, &AC,
-                                     F->front().getTerminator());
-  EXPECT_EQ(Known.Zero.getZExtValue(), ~(64llu - 1));
-  EXPECT_EQ(Known.One.getZExtValue(), 32u);
-  Instruction &APtrPlus512 = findInstructionByName(F, "APtrPlus512");
-  Known = computeKnownBits(&APtrPlus512, M->getDataLayout(), /* Depth */ 0, &AC,
-                           F->front().getTerminator());
-  EXPECT_EQ(Known.Zero.getZExtValue(), ~512llu & ~(64llu - 1));
-  EXPECT_EQ(Known.One.getZExtValue(), 512u | 32u);
-  // The known range is not precise given computeKnownBits works
-  // with the masks of zeros and ones, not the ranges.
-  EXPECT_EQ(Known.getMinValue(), 544);
-  EXPECT_EQ(Known.getMaxValue(), 575);
-}
-
-class IsBytewiseValueTest : public ValueTrackingTest,
-                            public ::testing::WithParamInterface<
-                                std::pair<const char *, const char *>> {
-protected:
-};
-
-const std::pair<const char *, const char *> IsBytewiseValueTests[] = {
-    {
-        "i8 0",
-        "i48* null",
-    },
-    {
-        "i8 undef",
-        "i48* undef",
-    },
-    {
-        "i8 0",
-        "i8 zeroinitializer",
-    },
-    {
-        "i8 0",
-        "i8 0",
-    },
-    {
-        "i8 -86",
-        "i8 -86",
-    },
-    {
-        "i8 -1",
-        "i8 -1",
-    },
-    {
-        "i8 undef",
-        "i16 undef",
-    },
-    {
-        "i8 0",
-        "i16 0",
-    },
-    {
-        "",
-        "i16 7",
-    },
-    {
-        "i8 -86",
-        "i16 -21846",
-    },
-    {
-        "i8 -1",
-        "i16 -1",
-    },
-    {
-        "i8 0",
-        "i48 0",
-    },
-    {
-        "i8 -1",
-        "i48 -1",
-    },
-    {
-        "i8 0",
-        "i49 0",
-    },
-    {
-        "",
-        "i49 -1",
-    },
-    {
-        "i8 0",
-        "half 0xH0000",
-    },
-    {
-        "i8 -85",
-        "half 0xHABAB",
-    },
-    {
-        "i8 0",
-        "float 0.0",
-    },
-    {
-        "i8 -1",
-        "float 0xFFFFFFFFE0000000",
-    },
-    {
-        "i8 0",
-        "double 0.0",
-    },
-    {
-        "i8 -15",
-        "double 0xF1F1F1F1F1F1F1F1",
-    },
-    {
-        "i8 undef",
-        "i16* undef",
-    },
-    {
-        "i8 0",
-        "i16* inttoptr (i64 0 to i16*)",
-    },
-    {
-        "i8 -1",
-        "i16* inttoptr (i64 -1 to i16*)",
-    },
-    {
-        "i8 -86",
-        "i16* inttoptr (i64 -6148914691236517206 to i16*)",
-    },
-    {
-        "",
-        "i16* inttoptr (i48 -1 to i16*)",
-    },
-    {
-        "i8 -1",
-        "i16* inttoptr (i96 -1 to i16*)",
-    },
-    {
-        "i8 undef",
-        "[0 x i8] zeroinitializer",
-    },
-    {
-        "i8 undef",
-        "[0 x i8] undef",
-    },
-    {
-        "i8 undef",
-        "[5 x [0 x i8]] zeroinitializer",
-    },
-    {
-        "i8 undef",
-        "[5 x [0 x i8]] undef",
-    },
-    {
-        "i8 0",
-        "[6 x i8] zeroinitializer",
-    },
-    {
-        "i8 undef",
-        "[6 x i8] undef",
-    },
-    {
-        "i8 1",
-        "[5 x i8] [i8 1, i8 1, i8 1, i8 1, i8 1]",
-    },
-    {
-        "",
-        "[5 x i64] [i64 1, i64 1, i64 1, i64 1, i64 1]",
-    },
-    {
-        "i8 -1",
-        "[5 x i64] [i64 -1, i64 -1, i64 -1, i64 -1, i64 -1]",
-    },
-    {
-        "",
-        "[4 x i8] [i8 1, i8 2, i8 1, i8 1]",
-    },
-    {
-        "i8 1",
-        "[4 x i8] [i8 1, i8 undef, i8 1, i8 1]",
-    },
-    {
-        "i8 0",
-        "<6 x i8> zeroinitializer",
-    },
-    {
-        "i8 undef",
-        "<6 x i8> undef",
-    },
-    {
-        "i8 1",
-        "<5 x i8> <i8 1, i8 1, i8 1, i8 1, i8 1>",
-    },
-    {
-        "",
-        "<5 x i64> <i64 1, i64 1, i64 1, i64 1, i64 1>",
-    },
-    {
-        "i8 -1",
-        "<5 x i64> <i64 -1, i64 -1, i64 -1, i64 -1, i64 -1>",
-    },
-    {
-        "",
-        "<4 x i8> <i8 1, i8 1, i8 2, i8 1>",
-    },
-    {
-        "i8 5",
-        "<2 x i8> < i8 5, i8 undef >",
-    },
-    {
-        "i8 0",
-        "[2 x [2 x i16]] zeroinitializer",
-    },
-    {
-        "i8 undef",
-        "[2 x [2 x i16]] undef",
-    },
-    {
-        "i8 -86",
-        "[2 x [2 x i16]] [[2 x i16] [i16 -21846, i16 -21846], "
-        "[2 x i16] [i16 -21846, i16 -21846]]",
-    },
-    {
-        "",
-        "[2 x [2 x i16]] [[2 x i16] [i16 -21846, i16 -21846], "
-        "[2 x i16] [i16 -21836, i16 -21846]]",
-    },
-    {
-        "i8 undef",
-        "{ } zeroinitializer",
-    },
-    {
-        "i8 undef",
-        "{ } undef",
-    },
-    {
-        "i8 undef",
-        "{ {}, {} } zeroinitializer",
-    },
-    {
-        "i8 undef",
-        "{ {}, {} } undef",
-    },
-    {
-        "i8 0",
-        "{i8, i64, i16*} zeroinitializer",
-    },
-    {
-        "i8 undef",
-        "{i8, i64, i16*} undef",
-    },
-    {
-        "i8 -86",
-        "{i8, i64, i16*} {i8 -86, i64 -6148914691236517206, i16* undef}",
-    },
-    {
-        "",
-        "{i8, i64, i16*} {i8 86, i64 -6148914691236517206, i16* undef}",
-    },
-};
-
-INSTANTIATE_TEST_SUITE_P(IsBytewiseValueParamTests, IsBytewiseValueTest,
-                         ::testing::ValuesIn(IsBytewiseValueTests));
-
-TEST_P(IsBytewiseValueTest, IsBytewiseValue) {
-  auto M = parseModule(std::string("@test = global ") + GetParam().second);
-  GlobalVariable *GV = dyn_cast<GlobalVariable>(M->getNamedValue("test"));
-  Value *Actual = isBytewiseValue(GV->getInitializer(), M->getDataLayout());
-  std::string Buff;
-  raw_string_ostream S(Buff);
-  if (Actual)
-    S << *Actual;
-  EXPECT_EQ(GetParam().first, S.str());
-}
-
-TEST_F(ValueTrackingTest, ComputeConstantRange) {
-  {
-    // Assumptions:
-    //  * stride >= 5
-    //  * stride < 10
-    //
-    // stride = [5, 10)
-    auto M = parseModule(R"(
-  declare void @llvm.assume(i1)
-
-  define i32 @test(i32 %stride) {
-    %gt = icmp uge i32 %stride, 5
-    call void @llvm.assume(i1 %gt)
-    %lt = icmp ult i32 %stride, 10
-    call void @llvm.assume(i1 %lt)
-    %stride.plus.one = add nsw nuw i32 %stride, 1
-    ret i32 %stride.plus.one
-  })");
-    Function *F = M->getFunction("test");
-
-    AssumptionCache AC(*F);
-    Value *Stride = &*F->arg_begin();
-    ConstantRange CR1 = computeConstantRange(Stride, true, &AC, nullptr);
-    EXPECT_TRUE(CR1.isFullSet());
-
-    Instruction *I = &findInstructionByName(F, "stride.plus.one");
-    ConstantRange CR2 = computeConstantRange(Stride, true, &AC, I);
-    EXPECT_EQ(5, CR2.getLower());
-    EXPECT_EQ(10, CR2.getUpper());
-  }
-
-  {
-    // Assumptions:
-    //  * stride >= 5
-    //  * stride < 200
-    //  * stride == 99
-    //
-    // stride = [99, 100)
-    auto M = parseModule(R"(
-  declare void @llvm.assume(i1)
-
-  define i32 @test(i32 %stride) {
-    %gt = icmp uge i32 %stride, 5
-    call void @llvm.assume(i1 %gt)
-    %lt = icmp ult i32 %stride, 200
-    call void @llvm.assume(i1 %lt)
-    %eq = icmp eq i32 %stride, 99
-    call void @llvm.assume(i1 %eq)
-    %stride.plus.one = add nsw nuw i32 %stride, 1
-    ret i32 %stride.plus.one
-  })");
-    Function *F = M->getFunction("test");
-
-    AssumptionCache AC(*F);
-    Value *Stride = &*F->arg_begin();
-    Instruction *I = &findInstructionByName(F, "stride.plus.one");
-    ConstantRange CR = computeConstantRange(Stride, true, &AC, I);
-    EXPECT_EQ(99, *CR.getSingleElement());
-  }
-
-  {
-    // Assumptions:
-    //  * stride >= 5
-    //  * stride >= 50
-    //  * stride < 100
-    //  * stride < 200
-    //
-    // stride = [50, 100)
-    auto M = parseModule(R"(
-  declare void @llvm.assume(i1)
-
-  define i32 @test(i32 %stride, i1 %cond) {
-    %gt = icmp uge i32 %stride, 5
-    call void @llvm.assume(i1 %gt)
-    %gt.2 = icmp uge i32 %stride, 50
-    call void @llvm.assume(i1 %gt.2)
-    br i1 %cond, label %bb1, label %bb2
-
-  bb1:
-    %lt = icmp ult i32 %stride, 200
-    call void @llvm.assume(i1 %lt)
-    %lt.2 = icmp ult i32 %stride, 100
-    call void @llvm.assume(i1 %lt.2)
-    %stride.plus.one = add nsw nuw i32 %stride, 1
-    ret i32 %stride.plus.one
-
-  bb2:
-    ret i32 0
-  })");
-    Function *F = M->getFunction("test");
-
-    AssumptionCache AC(*F);
-    Value *Stride = &*F->arg_begin();
-    Instruction *GT2 = &findInstructionByName(F, "gt.2");
-    ConstantRange CR = computeConstantRange(Stride, true, &AC, GT2);
-    EXPECT_EQ(5, CR.getLower());
-    EXPECT_EQ(0, CR.getUpper());
-
-    Instruction *I = &findInstructionByName(F, "stride.plus.one");
-    ConstantRange CR2 = computeConstantRange(Stride, true, &AC, I);
-    EXPECT_EQ(50, CR2.getLower());
-    EXPECT_EQ(100, CR2.getUpper());
-  }
-
-  {
-    // Assumptions:
-    //  * stride > 5
-    //  * stride < 5
-    //
-    // stride = empty range, as the assumptions contradict each other.
-    auto M = parseModule(R"(
-  declare void @llvm.assume(i1)
-
-  define i32 @test(i32 %stride, i1 %cond) {
-    %gt = icmp ugt i32 %stride, 5
-    call void @llvm.assume(i1 %gt)
-    %lt = icmp ult i32 %stride, 5
-    call void @llvm.assume(i1 %lt)
-    %stride.plus.one = add nsw nuw i32 %stride, 1
-    ret i32 %stride.plus.one
-  })");
-    Function *F = M->getFunction("test");
-
-    AssumptionCache AC(*F);
-    Value *Stride = &*F->arg_begin();
-
-    Instruction *I = &findInstructionByName(F, "stride.plus.one");
-    ConstantRange CR = computeConstantRange(Stride, true, &AC, I);
-    EXPECT_TRUE(CR.isEmptySet());
-  }
-
-  {
-    // Assumptions:
-    //  * x.1 >= 5
-    //  * x.2 < x.1
-    //
-    // stride = [0, 5)
-    auto M = parseModule(R"(
-  declare void @llvm.assume(i1)
-
-  define i32 @test(i32 %x.1, i32 %x.2) {
-    %gt = icmp uge i32 %x.1, 5
-    call void @llvm.assume(i1 %gt)
-    %lt = icmp ult i32 %x.2, %x.1
-    call void @llvm.assume(i1 %lt)
-    %stride.plus.one = add nsw nuw i32 %x.1, 1
-    ret i32 %stride.plus.one
-  })");
-    Function *F = M->getFunction("test");
-
-    AssumptionCache AC(*F);
-    Value *X2 = &*std::next(F->arg_begin());
-
-    Instruction *I = &findInstructionByName(F, "stride.plus.one");
-    ConstantRange CR1 = computeConstantRange(X2, true, &AC, I);
-    EXPECT_EQ(0, CR1.getLower());
-    EXPECT_EQ(5, CR1.getUpper());
-
-    // Check the depth cutoff results in a conservative result (full set) by
-    // passing Depth == MaxDepth == 6.
-    ConstantRange CR2 = computeConstantRange(X2, true, &AC, I, 6);
-    EXPECT_TRUE(CR2.isFullSet());
-  }
-}
-
-struct FindAllocaForValueTestParams {
-  const char *IR;
-  bool AnyOffsetResult;
-  bool ZeroOffsetResult;
-};
-
-class FindAllocaForValueTest
-    : public ValueTrackingTest,
-      public ::testing::WithParamInterface<FindAllocaForValueTestParams> {
-protected:
-};
-
-const FindAllocaForValueTestParams FindAllocaForValueTests[] = {
-    {R"(
-      define void @test() {
-        %a = alloca i64
-        %r = bitcast i64* %a to i32*
-        ret void
-      })",
-     true, true},
-
-    {R"(
-      define void @test() {
-        %a = alloca i32
-        %r = getelementptr i32, i32* %a, i32 1
-        ret void
-      })",
-     true, false},
-
-    {R"(
-      define void @test() {
-        %a = alloca i32
-        %r = getelementptr i32, i32* %a, i32 0
-        ret void
-      })",
-     true, true},
-
-    {R"(
-      define void @test(i1 %cond) {
-      entry:
-        %a = alloca i32
-        br label %bb1
-
-      bb1:
-        %r = phi i32* [ %a, %entry ], [ %r, %bb1 ]
-        br i1 %cond, label %bb1, label %exit
-
-      exit:
-        ret void
-      })",
-     true, true},
-
-    {R"(
-      define void @test(i1 %cond) {
-        %a = alloca i32
-        %r = select i1 %cond, i32* %a, i32* %a
-        ret void
-      })",
-     true, true},
-
-    {R"(
-      define void @test(i1 %cond) {
-        %a = alloca i32
-        %b = alloca i32
-        %r = select i1 %cond, i32* %a, i32* %b
-        ret void
-      })",
-     false, false},
-
-    {R"(
-      define void @test(i1 %cond) {
-      entry:
-        %a = alloca i64
-        %a32 = bitcast i64* %a to i32*
-        br label %bb1
-
-      bb1:
-        %x = phi i32* [ %a32, %entry ], [ %x, %bb1 ]
-        %r = getelementptr i32, i32* %x, i32 1
-        br i1 %cond, label %bb1, label %exit
-
-      exit:
-        ret void
-      })",
-     true, false},
-
-    {R"(
-      define void @test(i1 %cond) {
-      entry:
-        %a = alloca i64
-        %a32 = bitcast i64* %a to i32*
-        br label %bb1
-
-      bb1:
-        %x = phi i32* [ %a32, %entry ], [ %r, %bb1 ]
-        %r = getelementptr i32, i32* %x, i32 1
-        br i1 %cond, label %bb1, label %exit
-
-      exit:
-        ret void
-      })",
-     true, false},
-
-    {R"(
-      define void @test(i1 %cond, i64* %a) {
-      entry:
-        %r = bitcast i64* %a to i32*
-        ret void
-      })",
-     false, false},
-
-    {R"(
-      define void @test(i1 %cond) {
-      entry:
-        %a = alloca i32
-        %b = alloca i32
-        br label %bb1
-
-      bb1:
-        %r = phi i32* [ %a, %entry ], [ %b, %bb1 ]
-        br i1 %cond, label %bb1, label %exit
-
-      exit:
-        ret void
-      })",
-     false, false},
-};
-
-TEST_P(FindAllocaForValueTest, findAllocaForValue) {
-  auto M = parseModule(GetParam().IR);
-  Function *F = M->getFunction("test");
-  Instruction *I = &findInstructionByName(F, "r");
-  const AllocaInst *AI = findAllocaForValue(I);
-  EXPECT_EQ(!!AI, GetParam().AnyOffsetResult);
-}
-
-TEST_P(FindAllocaForValueTest, findAllocaForValueZeroOffset) {
-  auto M = parseModule(GetParam().IR);
-  Function *F = M->getFunction("test");
-  Instruction *I = &findInstructionByName(F, "r");
-  const AllocaInst *AI = findAllocaForValue(I, true);
-  EXPECT_EQ(!!AI, GetParam().ZeroOffsetResult);
-}
-
-INSTANTIATE_TEST_SUITE_P(FindAllocaForValueTest, FindAllocaForValueTest,
-                         ::testing::ValuesIn(FindAllocaForValueTests));
diff --git a/gnu/llvm/llvm/unittests/Analysis/VectorFunctionABITest.cpp b/gnu/llvm/llvm/unittests/Analysis/VectorFunctionABITest.cpp
deleted file mode 100644
index 7ac1b0384f8..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/VectorFunctionABITest.cpp
+++ /dev/null
@@ -1,633 +0,0 @@
-//===------- VectorFunctionABITest.cpp - VFABI Unittests  ---------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/VectorUtils.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/InstIterator.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-// Test fixture needed that holds the veariables needed by the parser.
-class VFABIParserTest : public ::testing::Test {
-private:
-  // Parser output.
-  VFInfo Info;
-  // Reset the data needed for the test.
-  void reset(const StringRef Name, const StringRef IRType) {
-    M = parseAssemblyString("declare void @dummy()", Err, Ctx);
-    EXPECT_NE(M.get(), nullptr) << "Loading an invalid module.\n "
-                                << Err.getMessage() << "\n";
-    Type *Ty = parseType(IRType, Err, *(M.get()));
-    FunctionType *FTy = dyn_cast<FunctionType>(Ty);
-    EXPECT_NE(FTy, nullptr) << "Invalid function type string: " << IRType
-                            << "\n"
-                            << Err.getMessage() << "\n";
-    FunctionCallee F = M->getOrInsertFunction(Name, FTy);
-    EXPECT_NE(F.getCallee(), nullptr)
-        << "The function must be present in the module\n";
-    // Reset the VFInfo
-    Info = VFInfo();
-  }
-
-  // Data needed to load the optional IR passed to invokeParser
-  LLVMContext Ctx;
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M;
-  //  CallInst *CI;
-protected:
-  // Referencies to the parser output field.
-  ElementCount &VF = Info.Shape.VF;
-  VFISAKind &ISA = Info.ISA;
-  SmallVector<VFParameter, 8> &Parameters = Info.Shape.Parameters;
-  std::string &ScalarName = Info.ScalarName;
-  std::string &VectorName = Info.VectorName;
-  // Invoke the parser. We need to make sure that a function exist in
-  // the module because the parser fails if such function don't
-  // exists. Every time this method is invoked the state of the test
-  // is reset.
-  //
-  // \p MangledName -> the string the parser has to demangle.
-  //
-  // \p VectorName -> optional vector name that the method needs to
-  // use to create the function in the module if it differs from the
-  // standard mangled name.
-  //
-  // \p IRType -> FunctionType string to be used for the signature of
-  // the vector function.  The correct signature is needed by the
-  // parser only for scalable functions. For the sake of testing, the
-  // generic fixed-length case can use as signature `void()`.
-  //
-  bool invokeParser(const StringRef MangledName,
-                    const StringRef VectorName = "",
-                    const StringRef IRType = "void()") {
-    StringRef Name = MangledName;
-    if (!VectorName.empty())
-      Name = VectorName;
-    // Reset the VFInfo and the Module to be able to invoke
-    // `invokeParser` multiple times in the same test.
-    reset(Name, IRType);
-
-    const auto OptInfo = VFABI::tryDemangleForVFABI(MangledName, *(M.get()));
-    if (OptInfo.hasValue()) {
-      Info = OptInfo.getValue();
-      return true;
-    }
-
-    return false;
-  }
-
-  // Checks that 1. the last Parameter in the Shape is of type
-  // VFParamKind::GlobalPredicate and 2. it is the only one of such
-  // type.
-  bool IsMasked() const {
-    const auto NGlobalPreds =
-        std::count_if(Info.Shape.Parameters.begin(),
-                      Info.Shape.Parameters.end(), [](const VFParameter PK) {
-                        return PK.ParamKind == VFParamKind::GlobalPredicate;
-                      });
-    return NGlobalPreds == 1 && Info.Shape.Parameters.back().ParamKind ==
-                                    VFParamKind::GlobalPredicate;
-  }
-};
-} // unnamed namespace
-
-// This test makes sure correct mangling occurs for given string.
-TEST_F(VFABIParserTest, ManglingVectorTLINames) {
-  EXPECT_EQ(
-      VFABI::mangleTLIVectorName("vec", "scalar", 3, ElementCount::getFixed(4)),
-      "_ZGV_LLVM_N4vvv_scalar(vec)");
-  EXPECT_EQ(VFABI::mangleTLIVectorName("vec", "scalar", 3,
-                                       ElementCount::getScalable(4)),
-            "_ZGV_LLVM_Nxvvv_scalar(vec)");
-  EXPECT_EQ(VFABI::mangleTLIVectorName("custom.call.v5", "custom.call", 1,
-                                       ElementCount::getFixed(5)),
-            "_ZGV_LLVM_N5v_custom.call(custom.call.v5)");
-}
-
-// This test makes sure that the demangling method succeeds only on
-// valid values of the string.
-TEST_F(VFABIParserTest, OnlyValidNames) {
-  // Incomplete string.
-  EXPECT_FALSE(invokeParser(""));
-  EXPECT_FALSE(invokeParser("_ZGV"));
-  EXPECT_FALSE(invokeParser("_ZGVn"));
-  EXPECT_FALSE(invokeParser("_ZGVnN"));
-  EXPECT_FALSE(invokeParser("_ZGVnN2"));
-  EXPECT_FALSE(invokeParser("_ZGVnN2v"));
-  EXPECT_FALSE(invokeParser("_ZGVnN2v_"));
-  // Missing parameters.
-  EXPECT_FALSE(invokeParser("_ZGVnN2_foo"));
-  // Missing _ZGV prefix.
-  EXPECT_FALSE(invokeParser("_ZVnN2v_foo"));
-  // Missing <isa>.
-  EXPECT_FALSE(invokeParser("_ZGVN2v_foo"));
-  // Missing <mask>.
-  EXPECT_FALSE(invokeParser("_ZGVn2v_foo"));
-  // Missing <vlen>.
-  EXPECT_FALSE(invokeParser("_ZGVnNv_foo"));
-  // Missing <scalarname>.
-  EXPECT_FALSE(invokeParser("_ZGVnN2v_"));
-  // Missing _ separator.
-  EXPECT_FALSE(invokeParser("_ZGVnN2vfoo"));
-  // Missing <vectorname>. Using `fakename` because the string being
-  // parsed is not a valid function name that `invokeParser` can add.
-  EXPECT_FALSE(invokeParser("_ZGVnN2v_foo()", "fakename"));
-  // Unterminated name. Using `fakename` because the string being
-  // parsed is not a valid function name that `invokeParser` can add.
-  EXPECT_FALSE(invokeParser("_ZGVnN2v_foo(bar", "fakename"));
-}
-
-TEST_F(VFABIParserTest, ParamListParsing) {
-  EXPECT_TRUE(invokeParser("_ZGVnN2vl16Ls32R3l_foo"));
-  EXPECT_EQ(Parameters.size(), (unsigned)5);
-  EXPECT_EQ(Parameters[0], VFParameter({0, VFParamKind::Vector, 0}));
-  EXPECT_EQ(Parameters[1], VFParameter({1, VFParamKind::OMP_Linear, 16}));
-  EXPECT_EQ(Parameters[2], VFParameter({2, VFParamKind::OMP_LinearValPos, 32}));
-  EXPECT_EQ(Parameters[3], VFParameter({3, VFParamKind::OMP_LinearRef, 3}));
-  EXPECT_EQ(Parameters[4], VFParameter({4, VFParamKind::OMP_Linear, 1}));
-}
-
-TEST_F(VFABIParserTest, ScalarNameAndVectorName_01) {
-  EXPECT_TRUE(invokeParser("_ZGVnM2v_sin"));
-  EXPECT_EQ(ScalarName, "sin");
-  EXPECT_EQ(VectorName, "_ZGVnM2v_sin");
-}
-
-TEST_F(VFABIParserTest, ScalarNameAndVectorName_02) {
-  EXPECT_TRUE(invokeParser("_ZGVnM2v_sin(UserFunc)", "UserFunc"));
-  EXPECT_EQ(ScalarName, "sin");
-  EXPECT_EQ(VectorName, "UserFunc");
-}
-
-TEST_F(VFABIParserTest, ScalarNameAndVectorName_03) {
-  EXPECT_TRUE(invokeParser("_ZGVnM2v___sin_sin_sin"));
-  EXPECT_EQ(ScalarName, "__sin_sin_sin");
-  EXPECT_EQ(VectorName, "_ZGVnM2v___sin_sin_sin");
-}
-
-TEST_F(VFABIParserTest, Parse) {
-  EXPECT_TRUE(invokeParser("_ZGVnN2vls2Ls27Us4Rs5l1L10U100R1000_sin"));
-  EXPECT_EQ(VF, ElementCount::getFixed(2));
-  EXPECT_FALSE(IsMasked());
-  EXPECT_EQ(ISA, VFISAKind::AdvancedSIMD);
-  EXPECT_EQ(Parameters.size(), (unsigned)9);
-  EXPECT_EQ(Parameters[0], VFParameter({0, VFParamKind::Vector, 0}));
-  EXPECT_EQ(Parameters[1], VFParameter({1, VFParamKind::OMP_LinearPos, 2}));
-  EXPECT_EQ(Parameters[2], VFParameter({2, VFParamKind::OMP_LinearValPos, 27}));
-  EXPECT_EQ(Parameters[3], VFParameter({3, VFParamKind::OMP_LinearUValPos, 4}));
-  EXPECT_EQ(Parameters[4], VFParameter({4, VFParamKind::OMP_LinearRefPos, 5}));
-  EXPECT_EQ(Parameters[5], VFParameter({5, VFParamKind::OMP_Linear, 1}));
-  EXPECT_EQ(Parameters[6], VFParameter({6, VFParamKind::OMP_LinearVal, 10}));
-  EXPECT_EQ(Parameters[7], VFParameter({7, VFParamKind::OMP_LinearUVal, 100}));
-  EXPECT_EQ(Parameters[8], VFParameter({8, VFParamKind::OMP_LinearRef, 1000}));
-  EXPECT_EQ(ScalarName, "sin");
-  EXPECT_EQ(VectorName, "_ZGVnN2vls2Ls27Us4Rs5l1L10U100R1000_sin");
-}
-
-TEST_F(VFABIParserTest, ParseVectorName) {
-  EXPECT_TRUE(invokeParser("_ZGVnN2v_sin(my_v_sin)", "my_v_sin"));
-  EXPECT_EQ(VF, ElementCount::getFixed(2));
-  EXPECT_FALSE(IsMasked());
-  EXPECT_EQ(ISA, VFISAKind::AdvancedSIMD);
-  EXPECT_EQ(Parameters.size(), (unsigned)1);
-  EXPECT_EQ(Parameters[0], VFParameter({0, VFParamKind::Vector, 0}));
-  EXPECT_EQ(ScalarName, "sin");
-  EXPECT_EQ(VectorName, "my_v_sin");
-}
-
-TEST_F(VFABIParserTest, LinearWithCompileTimeNegativeStep) {
-  EXPECT_TRUE(invokeParser("_ZGVnN2ln1Ln10Un100Rn1000_sin"));
-  EXPECT_EQ(VF, ElementCount::getFixed(2));
-  EXPECT_FALSE(IsMasked());
-  EXPECT_EQ(ISA, VFISAKind::AdvancedSIMD);
-  EXPECT_EQ(Parameters.size(), (unsigned)4);
-  EXPECT_EQ(Parameters[0], VFParameter({0, VFParamKind::OMP_Linear, -1}));
-  EXPECT_EQ(Parameters[1], VFParameter({1, VFParamKind::OMP_LinearVal, -10}));
-  EXPECT_EQ(Parameters[2], VFParameter({2, VFParamKind::OMP_LinearUVal, -100}));
-  EXPECT_EQ(Parameters[3], VFParameter({3, VFParamKind::OMP_LinearRef, -1000}));
-  EXPECT_EQ(ScalarName, "sin");
-  EXPECT_EQ(VectorName, "_ZGVnN2ln1Ln10Un100Rn1000_sin");
-}
-
-TEST_F(VFABIParserTest, ParseScalableSVE) {
-  EXPECT_TRUE(invokeParser(
-      "_ZGVsMxv_sin(custom_vg)", "custom_vg",
-      "<vscale x 2 x i32>(<vscale x 2 x i32>, <vscale x 2 x i1>)"));
-  EXPECT_EQ(VF, ElementCount::getScalable(2));
-  EXPECT_TRUE(IsMasked());
-  EXPECT_EQ(ISA, VFISAKind::SVE);
-  EXPECT_EQ(ScalarName, "sin");
-  EXPECT_EQ(VectorName, "custom_vg");
-}
-
-TEST_F(VFABIParserTest, ParseFixedWidthSVE) {
-  EXPECT_TRUE(invokeParser("_ZGVsM2v_sin"));
-  EXPECT_EQ(VF, ElementCount::getFixed(2));
-  EXPECT_TRUE(IsMasked());
-  EXPECT_EQ(ISA, VFISAKind::SVE);
-  EXPECT_EQ(ScalarName, "sin");
-  EXPECT_EQ(VectorName, "_ZGVsM2v_sin");
-}
-
-TEST_F(VFABIParserTest, NotAVectorFunctionABIName) {
-  // Vector names should start with `_ZGV`.
-  EXPECT_FALSE(invokeParser("ZGVnN2v_sin"));
-}
-
-TEST_F(VFABIParserTest, LinearWithRuntimeStep) {
-  EXPECT_FALSE(invokeParser("_ZGVnN2ls_sin"))
-      << "A number should be present after \"ls\".";
-  EXPECT_TRUE(invokeParser("_ZGVnN2ls2_sin"));
-  EXPECT_FALSE(invokeParser("_ZGVnN2Rs_sin"))
-      << "A number should be present after \"Rs\".";
-  EXPECT_TRUE(invokeParser("_ZGVnN2Rs4_sin"));
-  EXPECT_FALSE(invokeParser("_ZGVnN2Ls_sin"))
-      << "A number should be present after \"Ls\".";
-  EXPECT_TRUE(invokeParser("_ZGVnN2Ls6_sin"));
-  EXPECT_FALSE(invokeParser("_ZGVnN2Us_sin"))
-      << "A number should be present after \"Us\".";
-  EXPECT_TRUE(invokeParser("_ZGVnN2Us8_sin"));
-}
-
-TEST_F(VFABIParserTest, LinearWithoutCompileTime) {
-  EXPECT_TRUE(invokeParser("_ZGVnN3lLRUlnLnRnUn_sin"));
-  EXPECT_EQ(Parameters.size(), (unsigned)8);
-  EXPECT_EQ(Parameters[0], VFParameter({0, VFParamKind::OMP_Linear, 1}));
-  EXPECT_EQ(Parameters[1], VFParameter({1, VFParamKind::OMP_LinearVal, 1}));
-  EXPECT_EQ(Parameters[2], VFParameter({2, VFParamKind::OMP_LinearRef, 1}));
-  EXPECT_EQ(Parameters[3], VFParameter({3, VFParamKind::OMP_LinearUVal, 1}));
-  EXPECT_EQ(Parameters[4], VFParameter({4, VFParamKind::OMP_Linear, -1}));
-  EXPECT_EQ(Parameters[5], VFParameter({5, VFParamKind::OMP_LinearVal, -1}));
-  EXPECT_EQ(Parameters[6], VFParameter({6, VFParamKind::OMP_LinearRef, -1}));
-  EXPECT_EQ(Parameters[7], VFParameter({7, VFParamKind::OMP_LinearUVal, -1}));
-}
-
-TEST_F(VFABIParserTest, ISA) {
-  EXPECT_TRUE(invokeParser("_ZGVqN2v_sin"));
-  EXPECT_EQ(ISA, VFISAKind::Unknown);
-
-  EXPECT_TRUE(invokeParser("_ZGVnN2v_sin"));
-  EXPECT_EQ(ISA, VFISAKind::AdvancedSIMD);
-
-  EXPECT_TRUE(invokeParser("_ZGVsN2v_sin"));
-  EXPECT_EQ(ISA, VFISAKind::SVE);
-
-  EXPECT_TRUE(invokeParser("_ZGVbN2v_sin"));
-  EXPECT_EQ(ISA, VFISAKind::SSE);
-
-  EXPECT_TRUE(invokeParser("_ZGVcN2v_sin"));
-  EXPECT_EQ(ISA, VFISAKind::AVX);
-
-  EXPECT_TRUE(invokeParser("_ZGVdN2v_sin"));
-  EXPECT_EQ(ISA, VFISAKind::AVX2);
-
-  EXPECT_TRUE(invokeParser("_ZGVeN2v_sin"));
-  EXPECT_EQ(ISA, VFISAKind::AVX512);
-}
-
-TEST_F(VFABIParserTest, LLVM_ISA) {
-  EXPECT_FALSE(invokeParser("_ZGV_LLVM_N2v_sin"));
-  EXPECT_TRUE(invokeParser("_ZGV_LLVM_N2v_sin_(vector_name)", "vector_name"));
-  EXPECT_EQ(ISA, VFISAKind::LLVM);
-}
-
-TEST_F(VFABIParserTest, InvalidMask) {
-  EXPECT_FALSE(invokeParser("_ZGVsK2v_sin"));
-}
-
-TEST_F(VFABIParserTest, InvalidParameter) {
-  EXPECT_FALSE(invokeParser("_ZGVsM2vX_sin"));
-}
-
-TEST_F(VFABIParserTest, Align) {
-  EXPECT_TRUE(invokeParser("_ZGVsN2l2a2_sin"));
-  EXPECT_EQ(Parameters.size(), (unsigned)1);
-  EXPECT_EQ(Parameters[0].Alignment, Align(2));
-
-  // Missing alignment value.
-  EXPECT_FALSE(invokeParser("_ZGVsM2l2a_sin"));
-  // Invalid alignment token "x".
-  EXPECT_FALSE(invokeParser("_ZGVsM2l2ax_sin"));
-  // Alignment MUST be associated to a paramater.
-  EXPECT_FALSE(invokeParser("_ZGVsM2a2_sin"));
-  // Alignment must be a power of 2.
-  EXPECT_FALSE(invokeParser("_ZGVsN2l2a0_sin"));
-  EXPECT_TRUE(invokeParser("_ZGVsN2l2a1_sin"));
-  EXPECT_FALSE(invokeParser("_ZGVsN2l2a3_sin"));
-  EXPECT_FALSE(invokeParser("_ZGVsN2l2a6_sin"));
-}
-
-TEST_F(VFABIParserTest, ParseUniform) {
-  EXPECT_TRUE(invokeParser("_ZGVnN2u_sin"));
-  EXPECT_EQ(VF, ElementCount::getFixed(2));
-  EXPECT_FALSE(IsMasked());
-  EXPECT_EQ(ISA, VFISAKind::AdvancedSIMD);
-  EXPECT_EQ(Parameters.size(), (unsigned)1);
-  EXPECT_EQ(Parameters[0], VFParameter({0, VFParamKind::OMP_Uniform, 0}));
-  EXPECT_EQ(ScalarName, "sin");
-  EXPECT_EQ(VectorName, "_ZGVnN2u_sin");
-
-  // Uniform doesn't expect extra data.
-  EXPECT_FALSE(invokeParser("_ZGVnN2u0_sin"));
-}
-
-TEST_F(VFABIParserTest, ISAIndependentMangling) {
-  // This test makes sure that the mangling of the parameters in
-  // independent on the <isa> token.
-  const SmallVector<VFParameter, 8> ExpectedParams = {
-      VFParameter({0, VFParamKind::Vector, 0}),
-      VFParameter({1, VFParamKind::OMP_LinearPos, 2}),
-      VFParameter({2, VFParamKind::OMP_LinearValPos, 27}),
-      VFParameter({3, VFParamKind::OMP_LinearUValPos, 4}),
-      VFParameter({4, VFParamKind::OMP_LinearRefPos, 5}),
-      VFParameter({5, VFParamKind::OMP_Linear, 1}),
-      VFParameter({6, VFParamKind::OMP_LinearVal, 10}),
-      VFParameter({7, VFParamKind::OMP_LinearUVal, 100}),
-      VFParameter({8, VFParamKind::OMP_LinearRef, 1000}),
-      VFParameter({9, VFParamKind::OMP_Uniform, 0}),
-  };
-
-#define __COMMON_CHECKS                                                        \
-  do {                                                                         \
-    EXPECT_EQ(VF, ElementCount::getFixed(2));                                  \
-    EXPECT_FALSE(IsMasked());                                                  \
-    EXPECT_EQ(Parameters.size(), (unsigned)10);                                \
-    EXPECT_EQ(Parameters, ExpectedParams);                                     \
-    EXPECT_EQ(ScalarName, "sin");                                              \
-  } while (0)
-
-  // Advanced SIMD: <isa> = "n"
-  EXPECT_TRUE(invokeParser("_ZGVnN2vls2Ls27Us4Rs5l1L10U100R1000u_sin"));
-  EXPECT_EQ(ISA, VFISAKind::AdvancedSIMD);
-  __COMMON_CHECKS;
-  EXPECT_EQ(VectorName, "_ZGVnN2vls2Ls27Us4Rs5l1L10U100R1000u_sin");
-
-  // SVE: <isa> = "s"
-  EXPECT_TRUE(invokeParser("_ZGVsN2vls2Ls27Us4Rs5l1L10U100R1000u_sin"));
-  EXPECT_EQ(ISA, VFISAKind::SVE);
-  __COMMON_CHECKS;
-  EXPECT_EQ(VectorName, "_ZGVsN2vls2Ls27Us4Rs5l1L10U100R1000u_sin");
-
-  // SSE: <isa> = "b"
-  EXPECT_TRUE(invokeParser("_ZGVbN2vls2Ls27Us4Rs5l1L10U100R1000u_sin"));
-  EXPECT_EQ(ISA, VFISAKind::SSE);
-  __COMMON_CHECKS;
-  EXPECT_EQ(VectorName, "_ZGVbN2vls2Ls27Us4Rs5l1L10U100R1000u_sin");
-
-  // AVX: <isa> = "c"
-  EXPECT_TRUE(invokeParser("_ZGVcN2vls2Ls27Us4Rs5l1L10U100R1000u_sin"));
-  EXPECT_EQ(ISA, VFISAKind::AVX);
-  __COMMON_CHECKS;
-  EXPECT_EQ(VectorName, "_ZGVcN2vls2Ls27Us4Rs5l1L10U100R1000u_sin");
-
-  // AVX2: <isa> = "d"
-  EXPECT_TRUE(invokeParser("_ZGVdN2vls2Ls27Us4Rs5l1L10U100R1000u_sin"));
-  EXPECT_EQ(ISA, VFISAKind::AVX2);
-  __COMMON_CHECKS;
-  EXPECT_EQ(VectorName, "_ZGVdN2vls2Ls27Us4Rs5l1L10U100R1000u_sin");
-
-  // AVX512: <isa> = "e"
-  EXPECT_TRUE(invokeParser("_ZGVeN2vls2Ls27Us4Rs5l1L10U100R1000u_sin"));
-  EXPECT_EQ(ISA, VFISAKind::AVX512);
-  __COMMON_CHECKS;
-  EXPECT_EQ(VectorName, "_ZGVeN2vls2Ls27Us4Rs5l1L10U100R1000u_sin");
-
-  // LLVM: <isa> = "_LLVM_" internal vector function.
-  EXPECT_TRUE(invokeParser(
-      "_ZGV_LLVM_N2vls2Ls27Us4Rs5l1L10U100R1000u_sin(vectorf)", "vectorf"));
-  EXPECT_EQ(ISA, VFISAKind::LLVM);
-  __COMMON_CHECKS;
-  EXPECT_EQ(VectorName, "vectorf");
-
-  // Unknown ISA (randomly using "q"). This test will need update if
-  // some targets decide to use "q" as their ISA token.
-  EXPECT_TRUE(invokeParser("_ZGVqN2vls2Ls27Us4Rs5l1L10U100R1000u_sin"));
-  EXPECT_EQ(ISA, VFISAKind::Unknown);
-  __COMMON_CHECKS;
-  EXPECT_EQ(VectorName, "_ZGVqN2vls2Ls27Us4Rs5l1L10U100R1000u_sin");
-
-#undef __COMMON_CHECKS
-}
-
-TEST_F(VFABIParserTest, MissingScalarName) {
-  EXPECT_FALSE(invokeParser("_ZGVnN2v_"));
-}
-
-TEST_F(VFABIParserTest, MissingVectorName) {
-  EXPECT_FALSE(invokeParser("_ZGVnN2v_foo()"));
-}
-
-TEST_F(VFABIParserTest, MissingVectorNameTermination) {
-  EXPECT_FALSE(invokeParser("_ZGVnN2v_foo(bar"));
-}
-
-TEST_F(VFABIParserTest, ParseMaskingNEON) {
-  EXPECT_TRUE(invokeParser("_ZGVnM2v_sin"));
-  EXPECT_EQ(VF, ElementCount::getFixed(2));
-  EXPECT_TRUE(IsMasked());
-  EXPECT_EQ(ISA, VFISAKind::AdvancedSIMD);
-  EXPECT_EQ(Parameters.size(), (unsigned)2);
-  EXPECT_EQ(Parameters[0], VFParameter({0, VFParamKind::Vector}));
-  EXPECT_EQ(Parameters[1], VFParameter({1, VFParamKind::GlobalPredicate}));
-  EXPECT_EQ(ScalarName, "sin");
-}
-
-TEST_F(VFABIParserTest, ParseMaskingSVE) {
-  EXPECT_TRUE(invokeParser("_ZGVsM2v_sin"));
-  EXPECT_EQ(VF, ElementCount::getFixed(2));
-  EXPECT_TRUE(IsMasked());
-  EXPECT_EQ(ISA, VFISAKind::SVE);
-  EXPECT_EQ(Parameters.size(), (unsigned)2);
-  EXPECT_EQ(Parameters[0], VFParameter({0, VFParamKind::Vector}));
-  EXPECT_EQ(Parameters[1], VFParameter({1, VFParamKind::GlobalPredicate}));
-  EXPECT_EQ(ScalarName, "sin");
-}
-
-TEST_F(VFABIParserTest, ParseMaskingSSE) {
-  EXPECT_TRUE(invokeParser("_ZGVbM2v_sin"));
-  EXPECT_EQ(VF, ElementCount::getFixed(2));
-  EXPECT_TRUE(IsMasked());
-  EXPECT_EQ(ISA, VFISAKind::SSE);
-  EXPECT_EQ(Parameters.size(), (unsigned)2);
-  EXPECT_EQ(Parameters[0], VFParameter({0, VFParamKind::Vector}));
-  EXPECT_EQ(Parameters[1], VFParameter({1, VFParamKind::GlobalPredicate}));
-  EXPECT_EQ(ScalarName, "sin");
-}
-
-TEST_F(VFABIParserTest, ParseMaskingAVX) {
-  EXPECT_TRUE(invokeParser("_ZGVcM2v_sin"));
-  EXPECT_EQ(VF, ElementCount::getFixed(2));
-  EXPECT_TRUE(IsMasked());
-  EXPECT_EQ(ISA, VFISAKind::AVX);
-  EXPECT_EQ(Parameters.size(), (unsigned)2);
-  EXPECT_EQ(Parameters[0], VFParameter({0, VFParamKind::Vector}));
-  EXPECT_EQ(Parameters[1], VFParameter({1, VFParamKind::GlobalPredicate}));
-  EXPECT_EQ(ScalarName, "sin");
-}
-
-TEST_F(VFABIParserTest, ParseMaskingAVX2) {
-  EXPECT_TRUE(invokeParser("_ZGVdM2v_sin"));
-  EXPECT_EQ(VF, ElementCount::getFixed(2));
-  EXPECT_TRUE(IsMasked());
-  EXPECT_EQ(ISA, VFISAKind::AVX2);
-  EXPECT_EQ(Parameters.size(), (unsigned)2);
-  EXPECT_EQ(Parameters[0], VFParameter({0, VFParamKind::Vector}));
-  EXPECT_EQ(Parameters[1], VFParameter({1, VFParamKind::GlobalPredicate}));
-  EXPECT_EQ(ScalarName, "sin");
-}
-
-TEST_F(VFABIParserTest, ParseMaskingAVX512) {
-  EXPECT_TRUE(invokeParser("_ZGVeM2v_sin"));
-  EXPECT_EQ(VF, ElementCount::getFixed(2));
-  EXPECT_TRUE(IsMasked());
-  EXPECT_EQ(ISA, VFISAKind::AVX512);
-  EXPECT_EQ(Parameters.size(), (unsigned)2);
-  EXPECT_EQ(Parameters[0], VFParameter({0, VFParamKind::Vector}));
-  EXPECT_EQ(Parameters[1], VFParameter({1, VFParamKind::GlobalPredicate}));
-  EXPECT_EQ(ScalarName, "sin");
-}
-
-TEST_F(VFABIParserTest, ParseMaskingLLVM) {
-  EXPECT_TRUE(invokeParser("_ZGV_LLVM_M2v_sin(custom_vector_sin)",
-                           "custom_vector_sin"));
-  EXPECT_EQ(VF, ElementCount::getFixed(2));
-  EXPECT_TRUE(IsMasked());
-  EXPECT_EQ(ISA, VFISAKind::LLVM);
-  EXPECT_EQ(Parameters.size(), (unsigned)2);
-  EXPECT_EQ(Parameters[0], VFParameter({0, VFParamKind::Vector}));
-  EXPECT_EQ(Parameters[1], VFParameter({1, VFParamKind::GlobalPredicate}));
-  EXPECT_EQ(ScalarName, "sin");
-  EXPECT_EQ(VectorName, "custom_vector_sin");
-}
-
-TEST_F(VFABIParserTest, ParseScalableMaskingLLVM) {
-  EXPECT_TRUE(invokeParser(
-      "_ZGV_LLVM_Mxv_sin(custom_vector_sin)", "custom_vector_sin",
-      "<vscale x 2 x i32> (<vscale x 2 x i32>, <vscale x 2 x i1>)"));
-  EXPECT_TRUE(IsMasked());
-  EXPECT_EQ(VF, ElementCount::getScalable(2));
-  EXPECT_EQ(ISA, VFISAKind::LLVM);
-  EXPECT_EQ(Parameters.size(), (unsigned)2);
-  EXPECT_EQ(Parameters[0], VFParameter({0, VFParamKind::Vector}));
-  EXPECT_EQ(Parameters[1], VFParameter({1, VFParamKind::GlobalPredicate}));
-  EXPECT_EQ(ScalarName, "sin");
-  EXPECT_EQ(VectorName, "custom_vector_sin");
-}
-
-TEST_F(VFABIParserTest, ParseScalableMaskingLLVMSincos) {
-  EXPECT_TRUE(invokeParser("_ZGV_LLVM_Mxvl8l8_sincos(custom_vector_sincos)",
-                           "custom_vector_sincos",
-                           "void(<vscale x 2 x double>, double *, double *)"));
-  EXPECT_EQ(VF, ElementCount::getScalable(2));
-  EXPECT_TRUE(IsMasked());
-  EXPECT_EQ(ISA, VFISAKind::LLVM);
-  EXPECT_EQ(Parameters.size(), (unsigned)4);
-  EXPECT_EQ(Parameters[0], VFParameter({0, VFParamKind::Vector}));
-  EXPECT_EQ(Parameters[1], VFParameter({1, VFParamKind::OMP_Linear, 8}));
-  EXPECT_EQ(Parameters[2], VFParameter({2, VFParamKind::OMP_Linear, 8}));
-  EXPECT_EQ(Parameters[3], VFParameter({3, VFParamKind::GlobalPredicate}));
-  EXPECT_EQ(ScalarName, "sincos");
-  EXPECT_EQ(VectorName, "custom_vector_sincos");
-}
-
-class VFABIAttrTest : public testing::Test {
-protected:
-  void SetUp() override {
-    M = parseAssemblyString(IR, Err, Ctx);
-    // Get the only call instruction in the block, which is the first
-    // instruction.
-    CI = dyn_cast<CallInst>(&*(instructions(M->getFunction("f")).begin()));
-  }
-  const char *IR = "define i32 @f(i32 %a) {\n"
-                   " %1 = call i32 @g(i32 %a) #0\n"
-                   "  ret i32 %1\n"
-                   "}\n"
-                   "declare i32 @g(i32)\n"
-                   "declare <2 x i32> @custom_vg(<2 x i32>)"
-                   "declare <4 x i32> @_ZGVnN4v_g(<4 x i32>)"
-                   "declare <8 x i32> @_ZGVnN8v_g(<8 x i32>)"
-                   "attributes #0 = { "
-                   "\"vector-function-abi-variant\"=\""
-                   "_ZGVnN2v_g(custom_vg),_ZGVnN4v_g\" }";
-  LLVMContext Ctx;
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M;
-  CallInst *CI;
-  SmallVector<std::string, 8> Mappings;
-};
-
-TEST_F(VFABIAttrTest, Read) {
-  VFABI::getVectorVariantNames(*CI, Mappings);
-  SmallVector<std::string, 8> Exp;
-  Exp.push_back("_ZGVnN2v_g(custom_vg)");
-  Exp.push_back("_ZGVnN4v_g");
-  EXPECT_EQ(Mappings, Exp);
-}
-
-TEST_F(VFABIParserTest, LLVM_InternalISA) {
-  EXPECT_FALSE(invokeParser("_ZGV_LLVM_N2v_sin"));
-  EXPECT_TRUE(invokeParser("_ZGV_LLVM_N2v_sin_(vector_name)", "vector_name"));
-  EXPECT_EQ(ISA, VFISAKind::LLVM);
-}
-
-TEST_F(VFABIParserTest, IntrinsicsInLLVMIsa) {
-  EXPECT_TRUE(invokeParser("_ZGV_LLVM_N4vv_llvm.pow.f32(__svml_powf4)",
-                           "__svml_powf4"));
-  EXPECT_EQ(VF, ElementCount::getFixed(4));
-  EXPECT_FALSE(IsMasked());
-  EXPECT_EQ(ISA, VFISAKind::LLVM);
-  EXPECT_EQ(Parameters.size(), (unsigned)2);
-  EXPECT_EQ(Parameters[0], VFParameter({0, VFParamKind::Vector}));
-  EXPECT_EQ(Parameters[1], VFParameter({1, VFParamKind::Vector}));
-  EXPECT_EQ(ScalarName, "llvm.pow.f32");
-}
-
-TEST_F(VFABIParserTest, ParseScalableRequiresDeclaration) {
-  const char *MangledName = "_ZGVsMxv_sin(custom_vg)";
-  // The parser succeds only when the correct function definition of
-  // `custom_vg` is added to the module.
-  EXPECT_FALSE(invokeParser(MangledName));
-  EXPECT_TRUE(invokeParser(
-      MangledName, "custom_vg",
-      "<vscale x 4 x double>(<vscale x 4 x double>, <vscale x 4 x i1>)"));
-}
-
-TEST_F(VFABIParserTest, ZeroIsInvalidVLEN) {
-  EXPECT_FALSE(invokeParser("_ZGVeM0v_sin"));
-  EXPECT_FALSE(invokeParser("_ZGVeN0v_sin"));
-  EXPECT_FALSE(invokeParser("_ZGVsM0v_sin"));
-  EXPECT_FALSE(invokeParser("_ZGVsN0v_sin"));
-}
-
-static std::unique_ptr<Module> parseIR(LLVMContext &C, const char *IR) {
-  SMDiagnostic Err;
-  std::unique_ptr<Module> Mod = parseAssemblyString(IR, Err, C);
-  if (!Mod)
-    Err.print("VectorFunctionABITests", errs());
-  return Mod;
-}
-
-TEST(VFABIGetMappingsTest, IndirectCallInst) {
-  LLVMContext C;
-  std::unique_ptr<Module> M = parseIR(C, R"IR(
-define void @call(void () * %f) {
-entry:
-  call void %f()
-  ret void
-}
-)IR");
-  auto F = dyn_cast_or_null<Function>(M->getNamedValue("call"));
-  ASSERT_TRUE(F);
-  auto CI = dyn_cast<CallInst>(&F->front().front());
-  ASSERT_TRUE(CI);
-  ASSERT_TRUE(CI->isIndirectCall());
-  auto Mappings = VFDatabase::getMappings(*CI);
-  EXPECT_EQ(Mappings.size(), (unsigned)0);
-}
diff --git a/gnu/llvm/llvm/unittests/Analysis/VectorUtilsTest.cpp b/gnu/llvm/llvm/unittests/Analysis/VectorUtilsTest.cpp
deleted file mode 100644
index a98db913303..00000000000
--- a/gnu/llvm/llvm/unittests/Analysis/VectorUtilsTest.cpp
+++ /dev/null
@@ -1,712 +0,0 @@
-//===- VectorUtilsTest.cpp - VectorUtils tests ------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/VectorUtils.h"
-#include "llvm/Analysis/ValueTracking.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/InstIterator.h"
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/NoFolder.h"
-#include "llvm/Support/ErrorHandling.h"
-#include "llvm/Support/SourceMgr.h"
-#include "llvm/Support/KnownBits.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-class VectorUtilsTest : public testing::Test {
-protected:
-  void parseAssembly(const char *Assembly) {
-    SMDiagnostic Error;
-    M = parseAssemblyString(Assembly, Error, Context);
-
-    std::string errMsg;
-    raw_string_ostream os(errMsg);
-    Error.print("", os);
-
-    // A failure here means that the test itself is buggy.
-    if (!M)
-      report_fatal_error(os.str());
-
-    Function *F = M->getFunction("test");
-    if (F == nullptr)
-      report_fatal_error("Test must have a function named @test");
-
-    A = nullptr;
-    for (inst_iterator I = inst_begin(F), E = inst_end(F); I != E; ++I) {
-      if (I->hasName()) {
-        if (I->getName() == "A")
-          A = &*I;
-      }
-    }
-    if (A == nullptr)
-      report_fatal_error("@test must have an instruction %A");
-  }
-
-  LLVMContext Context;
-  std::unique_ptr<Module> M;
-  Instruction *A;
-};
-
-struct BasicTest : public testing::Test {
-  LLVMContext Ctx;
-  std::unique_ptr<Module> M;
-  Function *F;
-  BasicBlock *BB;
-  IRBuilder<NoFolder> IRB;
-
-  BasicTest()
-      : M(new Module("VectorUtils", Ctx)),
-        F(Function::Create(
-            FunctionType::get(Type::getVoidTy(Ctx), /* IsVarArg */ false),
-            Function::ExternalLinkage, "f", M.get())),
-        BB(BasicBlock::Create(Ctx, "entry", F)), IRB(BB) {}
-};
-
-
-} // namespace
-
-TEST_F(BasicTest, isSplat) {
-  Value *UndefVec = UndefValue::get(FixedVectorType::get(IRB.getInt8Ty(), 4));
-  EXPECT_TRUE(isSplatValue(UndefVec));
-
-  Constant *UndefScalar = UndefValue::get(IRB.getInt8Ty());
-  EXPECT_FALSE(isSplatValue(UndefScalar));
-
-  Constant *ScalarC = IRB.getInt8(42);
-  EXPECT_FALSE(isSplatValue(ScalarC));
-
-  Constant *OtherScalarC = IRB.getInt8(-42);
-  Constant *NonSplatC = ConstantVector::get({ScalarC, OtherScalarC});
-  EXPECT_FALSE(isSplatValue(NonSplatC));
-
-  Value *SplatC = IRB.CreateVectorSplat(5, ScalarC);
-  EXPECT_TRUE(isSplatValue(SplatC));
-
-  Value *SplatC_SVE =
-      IRB.CreateVectorSplat(ElementCount::getScalable(5), ScalarC);
-  EXPECT_TRUE(isSplatValue(SplatC_SVE));
-
-  // FIXME: Constant splat analysis does not allow undef elements.
-  Constant *SplatWithUndefC = ConstantVector::get({ScalarC, UndefScalar});
-  EXPECT_FALSE(isSplatValue(SplatWithUndefC));
-}
-
-TEST_F(BasicTest, narrowShuffleMaskElts) {
-  SmallVector<int, 16> ScaledMask;
-  narrowShuffleMaskElts(1, {3,2,0,-2}, ScaledMask);
-  EXPECT_EQ(makeArrayRef(ScaledMask), makeArrayRef({3,2,0,-2}));
-  narrowShuffleMaskElts(4, {3,2,0,-1}, ScaledMask);
-  EXPECT_EQ(makeArrayRef(ScaledMask), makeArrayRef({12,13,14,15,8,9,10,11,0,1,2,3,-1,-1,-1,-1}));
-}
-
-TEST_F(BasicTest, widenShuffleMaskElts) {
-  SmallVector<int, 16> WideMask;
-  SmallVector<int, 16> NarrowMask;
-
-  // scale == 1 is a copy
-  EXPECT_TRUE(widenShuffleMaskElts(1, {3,2,0,-1}, WideMask));
-  EXPECT_EQ(makeArrayRef(WideMask), makeArrayRef({3,2,0,-1}));
-
-  // back to original mask
-  narrowShuffleMaskElts(1, makeArrayRef(WideMask), NarrowMask);
-  EXPECT_EQ(makeArrayRef(NarrowMask), makeArrayRef({3,2,0,-1}));
-
-  // can't widen non-consecutive 3/2
-  EXPECT_FALSE(widenShuffleMaskElts(2, {3,2,0,-1}, WideMask));
-
-  // can't widen if not evenly divisible
-  EXPECT_FALSE(widenShuffleMaskElts(2, {0,1,2}, WideMask));
-
-  // can always widen identity to single element
-  EXPECT_TRUE(widenShuffleMaskElts(3, {0,1,2}, WideMask));
-  EXPECT_EQ(makeArrayRef(WideMask), makeArrayRef({0}));
-
-  // back to original mask
-  narrowShuffleMaskElts(3, makeArrayRef(WideMask), NarrowMask);
-  EXPECT_EQ(makeArrayRef(NarrowMask), makeArrayRef({0,1,2}));
-
-  // groups of 4 must be consecutive/undef
-  EXPECT_TRUE(widenShuffleMaskElts(4, {12,13,14,15,8,9,10,11,0,1,2,3,-1,-1,-1,-1}, WideMask));
-  EXPECT_EQ(makeArrayRef(WideMask), makeArrayRef({3,2,0,-1}));
-
-  // back to original mask
-  narrowShuffleMaskElts(4, makeArrayRef(WideMask), NarrowMask);
-  EXPECT_EQ(makeArrayRef(NarrowMask), makeArrayRef({12,13,14,15,8,9,10,11,0,1,2,3,-1,-1,-1,-1}));
-
-  // groups of 2 must be consecutive/undef
-  EXPECT_FALSE(widenShuffleMaskElts(2, {12,12,14,15,8,9,10,11,0,1,2,3,-1,-1,-1,-1}, WideMask));
-
-  // groups of 3 must be consecutive/undef
-  EXPECT_TRUE(widenShuffleMaskElts(3, {6,7,8,0,1,2,-1,-1,-1}, WideMask));
-  EXPECT_EQ(makeArrayRef(WideMask), makeArrayRef({2,0,-1}));
-
-  // back to original mask
-  narrowShuffleMaskElts(3, makeArrayRef(WideMask), NarrowMask);
-  EXPECT_EQ(makeArrayRef(NarrowMask), makeArrayRef({6,7,8,0,1,2,-1,-1,-1}));
-
-  // groups of 3 must be consecutive/undef (partial undefs are not ok)
-  EXPECT_FALSE(widenShuffleMaskElts(3, {-1,7,8,0,-1,2,-1,-1,-1}, WideMask));
-
-  // negative indexes must match across a wide element
-  EXPECT_FALSE(widenShuffleMaskElts(2, {-1,-2,-1,-1}, WideMask));
-
-  // negative indexes must match across a wide element
-  EXPECT_TRUE(widenShuffleMaskElts(2, {-2,-2,-3,-3}, WideMask));
-  EXPECT_EQ(makeArrayRef(WideMask), makeArrayRef({-2,-3}));
-}
-
-TEST_F(BasicTest, getSplatIndex) {
-  EXPECT_EQ(getSplatIndex({0,0,0}), 0);
-  EXPECT_EQ(getSplatIndex({1,0,0}), -1);     // no splat
-  EXPECT_EQ(getSplatIndex({0,1,1}), -1);     // no splat
-  EXPECT_EQ(getSplatIndex({42,42,42}), 42);  // array size is independent of splat index
-  EXPECT_EQ(getSplatIndex({42,42,-1}), 42);  // ignore negative
-  EXPECT_EQ(getSplatIndex({-1,42,-1}), 42);  // ignore negatives
-  EXPECT_EQ(getSplatIndex({-4,42,-42}), 42); // ignore all negatives
-  EXPECT_EQ(getSplatIndex({-4,-1,-42}), -1); // all negative values map to -1
-}
-
-TEST_F(VectorUtilsTest, isSplatValue_00) {
-  parseAssembly(
-      "define <2 x i8> @test(<2 x i8> %x) {\n"
-      "  %A = shufflevector <2 x i8> %x, <2 x i8> undef, <2 x i32> zeroinitializer\n"
-      "  ret <2 x i8> %A\n"
-      "}\n");
-  EXPECT_TRUE(isSplatValue(A));
-}
-
-TEST_F(VectorUtilsTest, isSplatValue_00_index0) {
-  parseAssembly(
-      "define <2 x i8> @test(<2 x i8> %x) {\n"
-      "  %A = shufflevector <2 x i8> %x, <2 x i8> undef, <2 x i32> zeroinitializer\n"
-      "  ret <2 x i8> %A\n"
-      "}\n");
-  EXPECT_TRUE(isSplatValue(A, 0));
-}
-
-TEST_F(VectorUtilsTest, isSplatValue_00_index1) {
-  parseAssembly(
-      "define <2 x i8> @test(<2 x i8> %x) {\n"
-      "  %A = shufflevector <2 x i8> %x, <2 x i8> undef, <2 x i32> zeroinitializer\n"
-      "  ret <2 x i8> %A\n"
-      "}\n");
-  EXPECT_FALSE(isSplatValue(A, 1));
-}
-
-TEST_F(VectorUtilsTest, isSplatValue_11) {
-  parseAssembly(
-      "define <2 x i8> @test(<2 x i8> %x) {\n"
-      "  %A = shufflevector <2 x i8> %x, <2 x i8> undef, <2 x i32> <i32 1, i32 1>\n"
-      "  ret <2 x i8> %A\n"
-      "}\n");
-  EXPECT_TRUE(isSplatValue(A));
-}
-
-TEST_F(VectorUtilsTest, isSplatValue_11_index0) {
-  parseAssembly(
-      "define <2 x i8> @test(<2 x i8> %x) {\n"
-      "  %A = shufflevector <2 x i8> %x, <2 x i8> undef, <2 x i32> <i32 1, i32 1>\n"
-      "  ret <2 x i8> %A\n"
-      "}\n");
-  EXPECT_FALSE(isSplatValue(A, 0));
-}
-
-TEST_F(VectorUtilsTest, isSplatValue_11_index1) {
-  parseAssembly(
-      "define <2 x i8> @test(<2 x i8> %x) {\n"
-      "  %A = shufflevector <2 x i8> %x, <2 x i8> undef, <2 x i32> <i32 1, i32 1>\n"
-      "  ret <2 x i8> %A\n"
-      "}\n");
-  EXPECT_TRUE(isSplatValue(A, 1));
-}
-
-TEST_F(VectorUtilsTest, isSplatValue_01) {
-  parseAssembly(
-      "define <2 x i8> @test(<2 x i8> %x) {\n"
-      "  %A = shufflevector <2 x i8> %x, <2 x i8> undef, <2 x i32> <i32 0, i32 1>\n"
-      "  ret <2 x i8> %A\n"
-      "}\n");
-  EXPECT_FALSE(isSplatValue(A));
-}
-
-TEST_F(VectorUtilsTest, isSplatValue_01_index0) {
-  parseAssembly(
-      "define <2 x i8> @test(<2 x i8> %x) {\n"
-      "  %A = shufflevector <2 x i8> %x, <2 x i8> undef, <2 x i32> <i32 0, i32 1>\n"
-      "  ret <2 x i8> %A\n"
-      "}\n");
-  EXPECT_FALSE(isSplatValue(A, 0));
-}
-
-TEST_F(VectorUtilsTest, isSplatValue_01_index1) {
-  parseAssembly(
-      "define <2 x i8> @test(<2 x i8> %x) {\n"
-      "  %A = shufflevector <2 x i8> %x, <2 x i8> undef, <2 x i32> <i32 0, i32 1>\n"
-      "  ret <2 x i8> %A\n"
-      "}\n");
-  EXPECT_FALSE(isSplatValue(A, 1));
-}
-
-// FIXME: Allow undef matching with Constant (mask) splat analysis.
-
-TEST_F(VectorUtilsTest, isSplatValue_0u) {
-  parseAssembly(
-      "define <2 x i8> @test(<2 x i8> %x) {\n"
-      "  %A = shufflevector <2 x i8> %x, <2 x i8> undef, <2 x i32> <i32 0, i32 undef>\n"
-      "  ret <2 x i8> %A\n"
-      "}\n");
-  EXPECT_FALSE(isSplatValue(A));
-}
-
-// FIXME: Allow undef matching with Constant (mask) splat analysis.
-
-TEST_F(VectorUtilsTest, isSplatValue_0u_index0) {
-  parseAssembly(
-      "define <2 x i8> @test(<2 x i8> %x) {\n"
-      "  %A = shufflevector <2 x i8> %x, <2 x i8> undef, <2 x i32> <i32 0, i32 undef>\n"
-      "  ret <2 x i8> %A\n"
-      "}\n");
-  EXPECT_FALSE(isSplatValue(A, 0));
-}
-
-TEST_F(VectorUtilsTest, isSplatValue_0u_index1) {
-  parseAssembly(
-      "define <2 x i8> @test(<2 x i8> %x) {\n"
-      "  %A = shufflevector <2 x i8> %x, <2 x i8> undef, <2 x i32> <i32 0, i32 undef>\n"
-      "  ret <2 x i8> %A\n"
-      "}\n");
-  EXPECT_FALSE(isSplatValue(A, 1));
-}
-
-TEST_F(VectorUtilsTest, isSplatValue_Binop) {
-  parseAssembly(
-      "define <2 x i8> @test(<2 x i8> %x) {\n"
-      "  %v0 = shufflevector <2 x i8> %x, <2 x i8> undef, <2 x i32> <i32 0, i32 0>\n"
-      "  %v1 = shufflevector <2 x i8> %x, <2 x i8> undef, <2 x i32> <i32 1, i32 1>\n"
-      "  %A = udiv <2 x i8> %v0, %v1\n"
-      "  ret <2 x i8> %A\n"
-      "}\n");
-  EXPECT_TRUE(isSplatValue(A));
-}
-
-TEST_F(VectorUtilsTest, isSplatValue_Binop_index0) {
-  parseAssembly(
-      "define <2 x i8> @test(<2 x i8> %x) {\n"
-      "  %v0 = shufflevector <2 x i8> %x, <2 x i8> undef, <2 x i32> <i32 0, i32 0>\n"
-      "  %v1 = shufflevector <2 x i8> %x, <2 x i8> undef, <2 x i32> <i32 1, i32 1>\n"
-      "  %A = udiv <2 x i8> %v0, %v1\n"
-      "  ret <2 x i8> %A\n"
-      "}\n");
-  EXPECT_FALSE(isSplatValue(A, 0));
-}
-
-TEST_F(VectorUtilsTest, isSplatValue_Binop_index1) {
-  parseAssembly(
-      "define <2 x i8> @test(<2 x i8> %x) {\n"
-      "  %v0 = shufflevector <2 x i8> %x, <2 x i8> undef, <2 x i32> <i32 0, i32 0>\n"
-      "  %v1 = shufflevector <2 x i8> %x, <2 x i8> undef, <2 x i32> <i32 1, i32 1>\n"
-      "  %A = udiv <2 x i8> %v0, %v1\n"
-      "  ret <2 x i8> %A\n"
-      "}\n");
-  EXPECT_FALSE(isSplatValue(A, 1));
-}
-
-TEST_F(VectorUtilsTest, isSplatValue_Binop_ConstantOp0) {
-  parseAssembly(
-      "define <2 x i8> @test(<2 x i8> %x) {\n"
-      "  %v1 = shufflevector <2 x i8> %x, <2 x i8> undef, <2 x i32> <i32 1, i32 1>\n"
-      "  %A = ashr <2 x i8> <i8 42, i8 42>, %v1\n"
-      "  ret <2 x i8> %A\n"
-      "}\n");
-  EXPECT_TRUE(isSplatValue(A));
-}
-
-TEST_F(VectorUtilsTest, isSplatValue_Binop_ConstantOp0_index0) {
-  parseAssembly(
-      "define <2 x i8> @test(<2 x i8> %x) {\n"
-      "  %v1 = shufflevector <2 x i8> %x, <2 x i8> undef, <2 x i32> <i32 1, i32 1>\n"
-      "  %A = ashr <2 x i8> <i8 42, i8 42>, %v1\n"
-      "  ret <2 x i8> %A\n"
-      "}\n");
-  EXPECT_FALSE(isSplatValue(A, 0));
-}
-
-TEST_F(VectorUtilsTest, isSplatValue_Binop_ConstantOp0_index1) {
-  parseAssembly(
-      "define <2 x i8> @test(<2 x i8> %x) {\n"
-      "  %v1 = shufflevector <2 x i8> %x, <2 x i8> undef, <2 x i32> <i32 1, i32 1>\n"
-      "  %A = ashr <2 x i8> <i8 42, i8 42>, %v1\n"
-      "  ret <2 x i8> %A\n"
-      "}\n");
-  EXPECT_TRUE(isSplatValue(A, 1));
-}
-
-TEST_F(VectorUtilsTest, isSplatValue_Binop_Not_Op0) {
-  parseAssembly(
-      "define <2 x i8> @test(<2 x i8> %x) {\n"
-      "  %v0 = shufflevector <2 x i8> %x, <2 x i8> undef, <2 x i32> <i32 1, i32 0>\n"
-      "  %v1 = shufflevector <2 x i8> %x, <2 x i8> undef, <2 x i32> <i32 1, i32 1>\n"
-      "  %A = add <2 x i8> %v0, %v1\n"
-      "  ret <2 x i8> %A\n"
-      "}\n");
-  EXPECT_FALSE(isSplatValue(A));
-}
-
-TEST_F(VectorUtilsTest, isSplatValue_Binop_Not_Op1) {
-  parseAssembly(
-      "define <2 x i8> @test(<2 x i8> %x) {\n"
-      "  %v0 = shufflevector <2 x i8> %x, <2 x i8> undef, <2 x i32> <i32 1, i32 1>\n"
-      "  %v1 = shufflevector <2 x i8> %x, <2 x i8> undef, <2 x i32> <i32 0, i32 1>\n"
-      "  %A = shl <2 x i8> %v0, %v1\n"
-      "  ret <2 x i8> %A\n"
-      "}\n");
-  EXPECT_FALSE(isSplatValue(A));
-}
-
-TEST_F(VectorUtilsTest, isSplatValue_Select) {
-  parseAssembly(
-      "define <2 x i8> @test(<2 x i1> %x, <2 x i8> %y, <2 x i8> %z) {\n"
-      "  %v0 = shufflevector <2 x i1> %x, <2 x i1> undef, <2 x i32> <i32 1, i32 1>\n"
-      "  %v1 = shufflevector <2 x i8> %y, <2 x i8> undef, <2 x i32> <i32 0, i32 0>\n"
-      "  %v2 = shufflevector <2 x i8> %z, <2 x i8> undef, <2 x i32> <i32 1, i32 1>\n"
-      "  %A = select <2 x i1> %v0, <2 x i8> %v1, <2 x i8> %v2\n"
-      "  ret <2 x i8> %A\n"
-      "}\n");
-  EXPECT_TRUE(isSplatValue(A));
-}
-
-TEST_F(VectorUtilsTest, isSplatValue_Select_ConstantOp) {
-  parseAssembly(
-      "define <2 x i8> @test(<2 x i1> %x, <2 x i8> %y, <2 x i8> %z) {\n"
-      "  %v0 = shufflevector <2 x i1> %x, <2 x i1> undef, <2 x i32> <i32 1, i32 1>\n"
-      "  %v2 = shufflevector <2 x i8> %z, <2 x i8> undef, <2 x i32> <i32 1, i32 1>\n"
-      "  %A = select <2 x i1> %v0, <2 x i8> <i8 42, i8 42>, <2 x i8> %v2\n"
-      "  ret <2 x i8> %A\n"
-      "}\n");
-  EXPECT_TRUE(isSplatValue(A));
-}
-
-TEST_F(VectorUtilsTest, isSplatValue_Select_NotCond) {
-  parseAssembly(
-      "define <2 x i8> @test(<2 x i1> %x, <2 x i8> %y, <2 x i8> %z) {\n"
-      "  %v1 = shufflevector <2 x i8> %y, <2 x i8> undef, <2 x i32> <i32 0, i32 0>\n"
-      "  %v2 = shufflevector <2 x i8> %z, <2 x i8> undef, <2 x i32> <i32 1, i32 1>\n"
-      "  %A = select <2 x i1> %x, <2 x i8> %v1, <2 x i8> %v2\n"
-      "  ret <2 x i8> %A\n"
-      "}\n");
-  EXPECT_FALSE(isSplatValue(A));
-}
-
-TEST_F(VectorUtilsTest, isSplatValue_Select_NotOp1) {
-  parseAssembly(
-      "define <2 x i8> @test(<2 x i1> %x, <2 x i8> %y, <2 x i8> %z) {\n"
-      "  %v0 = shufflevector <2 x i1> %x, <2 x i1> undef, <2 x i32> <i32 1, i32 1>\n"
-      "  %v2 = shufflevector <2 x i8> %z, <2 x i8> undef, <2 x i32> <i32 1, i32 1>\n"
-      "  %A = select <2 x i1> %v0, <2 x i8> %y, <2 x i8> %v2\n"
-      "  ret <2 x i8> %A\n"
-      "}\n");
-  EXPECT_FALSE(isSplatValue(A));
-}
-
-TEST_F(VectorUtilsTest, isSplatValue_Select_NotOp2) {
-  parseAssembly(
-      "define <2 x i8> @test(<2 x i1> %x, <2 x i8> %y, <2 x i8> %z) {\n"
-      "  %v0 = shufflevector <2 x i1> %x, <2 x i1> undef, <2 x i32> <i32 1, i32 1>\n"
-      "  %v1 = shufflevector <2 x i8> %y, <2 x i8> undef, <2 x i32> <i32 0, i32 0>\n"
-      "  %A = select <2 x i1> %v0, <2 x i8> %v1, <2 x i8> %z\n"
-      "  ret <2 x i8> %A\n"
-      "}\n");
-  EXPECT_FALSE(isSplatValue(A));
-}
-
-TEST_F(VectorUtilsTest, isSplatValue_SelectBinop) {
-  parseAssembly(
-      "define <2 x i8> @test(<2 x i1> %x, <2 x i8> %y, <2 x i8> %z) {\n"
-      "  %v0 = shufflevector <2 x i1> %x, <2 x i1> undef, <2 x i32> <i32 1, i32 1>\n"
-      "  %v1 = shufflevector <2 x i8> %y, <2 x i8> undef, <2 x i32> <i32 0, i32 0>\n"
-      "  %v2 = shufflevector <2 x i8> %z, <2 x i8> undef, <2 x i32> <i32 1, i32 1>\n"
-      "  %bo = xor <2 x i8> %v1, %v2\n"
-      "  %A = select <2 x i1> %v0, <2 x i8> %bo, <2 x i8> %v2\n"
-      "  ret <2 x i8> %A\n"
-      "}\n");
-  EXPECT_TRUE(isSplatValue(A));
-}
-
-TEST_F(VectorUtilsTest, getSplatValueElt0) {
-  parseAssembly(
-      "define <2 x i8> @test(i8 %x) {\n"
-      "  %ins = insertelement <2 x i8> undef, i8 %x, i32 0\n"
-      "  %A = shufflevector <2 x i8> %ins, <2 x i8> undef, <2 x i32> zeroinitializer\n"
-      "  ret <2 x i8> %A\n"
-      "}\n");
-  EXPECT_EQ(getSplatValue(A)->getName(), "x");
-}
-
-TEST_F(VectorUtilsTest, getSplatValueEltMismatch) {
-  parseAssembly(
-      "define <2 x i8> @test(i8 %x) {\n"
-      "  %ins = insertelement <2 x i8> undef, i8 %x, i32 1\n"
-      "  %A = shufflevector <2 x i8> %ins, <2 x i8> undef, <2 x i32> zeroinitializer\n"
-      "  ret <2 x i8> %A\n"
-      "}\n");
-  EXPECT_EQ(getSplatValue(A), nullptr);
-}
-
-// TODO: This is a splat, but we don't recognize it.
-
-TEST_F(VectorUtilsTest, getSplatValueElt1) {
-  parseAssembly(
-      "define <2 x i8> @test(i8 %x) {\n"
-      "  %ins = insertelement <2 x i8> undef, i8 %x, i32 1\n"
-      "  %A = shufflevector <2 x i8> %ins, <2 x i8> undef, <2 x i32> <i32 1, i32 1>\n"
-      "  ret <2 x i8> %A\n"
-      "}\n");
-  EXPECT_EQ(getSplatValue(A), nullptr);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// VFShape API tests.
-////////////////////////////////////////////////////////////////////////////////
-
-class VFShapeAPITest : public testing::Test {
-protected:
-  void SetUp() override {
-    M = parseAssemblyString(IR, Err, Ctx);
-    // Get the only call instruction in the block, which is the first
-    // instruction.
-    CI = dyn_cast<CallInst>(&*(instructions(M->getFunction("f")).begin()));
-  }
-
-  const char *IR = "define i32 @f(i32 %a, i64 %b, double %c) {\n"
-                   " %1 = call i32 @g(i32 %a, i64 %b, double %c)\n"
-                   "  ret i32 %1\n"
-                   "}\n"
-                   "declare i32 @g(i32, i64, double)\n";
-  LLVMContext Ctx;
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M;
-  CallInst *CI;
-  // Dummy shape with no parameters, overwritten by buildShape when invoked.
-  VFShape Shape = {/*VF*/ ElementCount::getFixed(2), /*Parameters*/ {}};
-  VFShape Expected;
-  SmallVector<VFParameter, 8> &ExpectedParams = Expected.Parameters;
-
-  void buildShape(ElementCount VF, bool HasGlobalPred) {
-    Shape = VFShape::get(*CI, VF, HasGlobalPred);
-  }
-
-  bool validParams(ArrayRef<VFParameter> Parameters) {
-    Shape.Parameters =
-        SmallVector<VFParameter, 8>(Parameters.begin(), Parameters.end());
-    return Shape.hasValidParameterList();
-  }
-};
-
-TEST_F(VFShapeAPITest, API_buildVFShape) {
-  buildShape(/*VF*/ ElementCount::getFixed(2), /*HasGlobalPred*/ false);
-  Expected = {/*VF*/ ElementCount::getFixed(2), /*Parameters*/ {
-                  {0, VFParamKind::Vector},
-                  {1, VFParamKind::Vector},
-                  {2, VFParamKind::Vector},
-              }};
-  EXPECT_EQ(Shape, Expected);
-
-  buildShape(/*VF*/ ElementCount::getFixed(4), /*HasGlobalPred*/ true);
-  Expected = {/*VF*/ ElementCount::getFixed(4), /*Parameters*/ {
-                  {0, VFParamKind::Vector},
-                  {1, VFParamKind::Vector},
-                  {2, VFParamKind::Vector},
-                  {3, VFParamKind::GlobalPredicate},
-              }};
-  EXPECT_EQ(Shape, Expected);
-
-  buildShape(/*VF*/ ElementCount::getScalable(16), /*HasGlobalPred*/ false);
-  Expected = {/*VF*/ ElementCount::getScalable(16), /*Parameters*/ {
-                  {0, VFParamKind::Vector},
-                  {1, VFParamKind::Vector},
-                  {2, VFParamKind::Vector},
-              }};
-  EXPECT_EQ(Shape, Expected);
-}
-
-TEST_F(VFShapeAPITest, API_getScalarShape) {
-  buildShape(/*VF*/ ElementCount::getFixed(1), /*HasGlobalPred*/ false);
-  EXPECT_EQ(VFShape::getScalarShape(*CI), Shape);
-}
-
-TEST_F(VFShapeAPITest, API_getVectorizedFunction) {
-  VFShape ScalarShape = VFShape::getScalarShape(*CI);
-  EXPECT_EQ(VFDatabase(*CI).getVectorizedFunction(ScalarShape),
-            M->getFunction("g"));
-
-  buildShape(/*VF*/ ElementCount::getScalable(1), /*HasGlobalPred*/ false);
-  EXPECT_EQ(VFDatabase(*CI).getVectorizedFunction(Shape), nullptr);
-  buildShape(/*VF*/ ElementCount::getFixed(1), /*HasGlobalPred*/ true);
-  EXPECT_EQ(VFDatabase(*CI).getVectorizedFunction(Shape), nullptr);
-  buildShape(/*VF*/ ElementCount::getScalable(1), /*HasGlobalPred*/ true);
-  EXPECT_EQ(VFDatabase(*CI).getVectorizedFunction(Shape), nullptr);
-}
-
-TEST_F(VFShapeAPITest, API_updateVFShape) {
-
-  buildShape(/*VF*/ ElementCount::getFixed(2), /*HasGlobalPred*/ false);
-  Shape.updateParam({0 /*Pos*/, VFParamKind::OMP_Linear, 1, Align(4)});
-  Expected = {/*VF*/ ElementCount::getFixed(2), /*Parameters*/ {
-                  {0, VFParamKind::OMP_Linear, 1, Align(4)},
-                  {1, VFParamKind::Vector},
-                  {2, VFParamKind::Vector},
-              }};
-  EXPECT_EQ(Shape, Expected);
-
-  // From this point on, we update only the parameters of the VFShape,
-  // so we update only the reference of the expected Parameters.
-  Shape.updateParam({1 /*Pos*/, VFParamKind::OMP_Uniform});
-  ExpectedParams = {
-      {0, VFParamKind::OMP_Linear, 1, Align(4)},
-      {1, VFParamKind::OMP_Uniform},
-      {2, VFParamKind::Vector},
-  };
-  EXPECT_EQ(Shape, Expected);
-
-  Shape.updateParam({2 /*Pos*/, VFParamKind::OMP_LinearRefPos, 1});
-  ExpectedParams = {
-      {0, VFParamKind::OMP_Linear, 1, Align(4)},
-      {1, VFParamKind::OMP_Uniform},
-      {2, VFParamKind::OMP_LinearRefPos, 1},
-  };
-  EXPECT_EQ(Shape, Expected);
-}
-
-TEST_F(VFShapeAPITest, API_updateVFShape_GlobalPredicate) {
-
-  buildShape(/*VF*/ ElementCount::getScalable(2), /*HasGlobalPred*/ true);
-  Shape.updateParam({1 /*Pos*/, VFParamKind::OMP_Uniform});
-  Expected = {/*VF*/ ElementCount::getScalable(2),
-              /*Parameters*/ {{0, VFParamKind::Vector},
-                              {1, VFParamKind::OMP_Uniform},
-                              {2, VFParamKind::Vector},
-                              {3, VFParamKind::GlobalPredicate}}};
-  EXPECT_EQ(Shape, Expected);
-}
-
-TEST_F(VFShapeAPITest, Parameters_Valid) {
-  // ParamPos in order.
-  EXPECT_TRUE(validParams({{0, VFParamKind::Vector}}));
-  EXPECT_TRUE(
-      validParams({{0, VFParamKind::Vector}, {1, VFParamKind::Vector}}));
-  EXPECT_TRUE(validParams({{0, VFParamKind::Vector},
-                           {1, VFParamKind::Vector},
-                           {2, VFParamKind::Vector}}));
-
-  // GlocalPredicate is unique.
-  EXPECT_TRUE(validParams({{0, VFParamKind::Vector},
-                           {1, VFParamKind::Vector},
-                           {2, VFParamKind::Vector},
-                           {3, VFParamKind::GlobalPredicate}}));
-
-  EXPECT_TRUE(validParams({{0, VFParamKind::Vector},
-                           {1, VFParamKind::GlobalPredicate},
-                           {2, VFParamKind::Vector}}));
-}
-
-TEST_F(VFShapeAPITest, Parameters_ValidOpenMPLinear) {
-// Valid linear constant step (>0).
-#define __BUILD_PARAMETERS(Kind, Val)                                          \
-  {                                                                            \
-    { 0, Kind, Val }                                                           \
-  }
-  EXPECT_TRUE(validParams(__BUILD_PARAMETERS(VFParamKind::OMP_Linear, 1)));
-  EXPECT_TRUE(validParams(__BUILD_PARAMETERS(VFParamKind::OMP_LinearRef, 2)));
-  EXPECT_TRUE(validParams(__BUILD_PARAMETERS(VFParamKind::OMP_LinearVal, 4)));
-  EXPECT_TRUE(validParams(__BUILD_PARAMETERS(VFParamKind::OMP_LinearUVal, 33)));
-#undef __BUILD_PARAMETERS
-
-// Valid linear runtime step (the step parameter is marked uniform).
-#define __BUILD_PARAMETERS(Kind)                                               \
-  {                                                                            \
-    {0, VFParamKind::OMP_Uniform}, {1, VFParamKind::Vector}, { 2, Kind, 0 }    \
-  }
-  EXPECT_TRUE(validParams(__BUILD_PARAMETERS(VFParamKind::OMP_LinearPos)));
-  EXPECT_TRUE(validParams(__BUILD_PARAMETERS(VFParamKind::OMP_LinearRefPos)));
-  EXPECT_TRUE(validParams(__BUILD_PARAMETERS(VFParamKind::OMP_LinearValPos)));
-  EXPECT_TRUE(validParams(__BUILD_PARAMETERS(VFParamKind::OMP_LinearUValPos)));
-#undef __BUILD_PARAMETERS
-}
-
-TEST_F(VFShapeAPITest, Parameters_Invalid) {
-#ifndef NDEBUG
-  // Wrong order is checked by an assertion: make sure that the
-  // assertion is not removed.
-  EXPECT_DEATH(validParams({{1, VFParamKind::Vector}}),
-               "Broken parameter list.");
-  EXPECT_DEATH(
-      validParams({{1, VFParamKind::Vector}, {0, VFParamKind::Vector}}),
-      "Broken parameter list.");
-#endif
-
-  // GlobalPredicate is not unique
-  EXPECT_FALSE(validParams({{0, VFParamKind::Vector},
-                            {1, VFParamKind::GlobalPredicate},
-                            {2, VFParamKind::GlobalPredicate}}));
-  EXPECT_FALSE(validParams({{0, VFParamKind::GlobalPredicate},
-                            {1, VFParamKind::Vector},
-                            {2, VFParamKind::GlobalPredicate}}));
-}
-
-TEST_F(VFShapeAPITest, Parameters_InvalidOpenMPLinear) {
-// Compile time linear steps must be non-zero (compile time invariant).
-#define __BUILD_PARAMETERS(Kind)                                               \
-  {                                                                            \
-    { 0, Kind, 0 }                                                             \
-  }
-  EXPECT_FALSE(validParams(__BUILD_PARAMETERS(VFParamKind::OMP_Linear)));
-  EXPECT_FALSE(validParams(__BUILD_PARAMETERS(VFParamKind::OMP_LinearRef)));
-  EXPECT_FALSE(validParams(__BUILD_PARAMETERS(VFParamKind::OMP_LinearVal)));
-  EXPECT_FALSE(validParams(__BUILD_PARAMETERS(VFParamKind::OMP_LinearUVal)));
-#undef __BUILD_PARAMETERS
-
-// The step of a runtime linear parameter must be marked
-// as uniform (runtime invariant).
-#define __BUILD_PARAMETERS(Kind)                                               \
-  {                                                                            \
-    {0, VFParamKind::OMP_Uniform}, {1, VFParamKind::Vector}, { 2, Kind, 1 }    \
-  }
-  EXPECT_FALSE(validParams(__BUILD_PARAMETERS(VFParamKind::OMP_LinearPos)));
-  EXPECT_FALSE(validParams(__BUILD_PARAMETERS(VFParamKind::OMP_LinearRefPos)));
-  EXPECT_FALSE(validParams(__BUILD_PARAMETERS(VFParamKind::OMP_LinearValPos)));
-  EXPECT_FALSE(validParams(__BUILD_PARAMETERS(VFParamKind::OMP_LinearUValPos)));
-#undef __BUILD_PARAMETERS
-
-// The linear step parameter can't point at itself.
-#define __BUILD_PARAMETERS(Kind)                                               \
-  {                                                                            \
-    {0, VFParamKind::Vector}, {1, VFParamKind::Vector}, { 2, Kind, 2 }         \
-  }
-  EXPECT_FALSE(validParams(__BUILD_PARAMETERS(VFParamKind::OMP_LinearPos)));
-  EXPECT_FALSE(validParams(__BUILD_PARAMETERS(VFParamKind::OMP_LinearRefPos)));
-  EXPECT_FALSE(validParams(__BUILD_PARAMETERS(VFParamKind::OMP_LinearValPos)));
-  EXPECT_FALSE(validParams(__BUILD_PARAMETERS(VFParamKind::OMP_LinearUValPos)));
-#undef __BUILD_PARAMETERS
-
-// Linear parameter (runtime) is out of range.
-#define __BUILD_PARAMETERS(Kind)                                               \
-  {                                                                            \
-    {0, VFParamKind::Vector}, {1, VFParamKind::Vector}, { 2, Kind, 3 }         \
-  }
-  EXPECT_FALSE(validParams(__BUILD_PARAMETERS(VFParamKind::OMP_LinearPos)));
-  EXPECT_FALSE(validParams(__BUILD_PARAMETERS(VFParamKind::OMP_LinearRefPos)));
-  EXPECT_FALSE(validParams(__BUILD_PARAMETERS(VFParamKind::OMP_LinearValPos)));
-  EXPECT_FALSE(validParams(__BUILD_PARAMETERS(VFParamKind::OMP_LinearUValPos)));
-#undef __BUILD_PARAMETERS
-}
diff --git a/gnu/llvm/llvm/unittests/AsmParser/AsmParserTest.cpp b/gnu/llvm/llvm/unittests/AsmParser/AsmParserTest.cpp
deleted file mode 100644
index 9a7d70ad1ed..00000000000
--- a/gnu/llvm/llvm/unittests/AsmParser/AsmParserTest.cpp
+++ /dev/null
@@ -1,417 +0,0 @@
-//===- llvm/unittest/AsmParser/AsmParserTest.cpp - asm parser unittests ---===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/StringRef.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/AsmParser/SlotMapping.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST(AsmParserTest, NullTerminatedInput) {
-  LLVMContext Ctx;
-  StringRef Source = "; Empty module \n";
-  SMDiagnostic Error;
-  auto Mod = parseAssemblyString(Source, Error, Ctx);
-
-  EXPECT_TRUE(Mod != nullptr);
-  EXPECT_TRUE(Error.getMessage().empty());
-}
-
-#ifdef GTEST_HAS_DEATH_TEST
-#ifndef NDEBUG
-
-TEST(AsmParserTest, NonNullTerminatedInput) {
-  LLVMContext Ctx;
-  StringRef Source = "; Empty module \n\1\2";
-  SMDiagnostic Error;
-  std::unique_ptr<Module> Mod;
-  EXPECT_DEATH(Mod = parseAssemblyString(Source.substr(0, Source.size() - 2),
-                                         Error, Ctx),
-               "Buffer is not null terminated!");
-}
-
-#endif
-#endif
-
-TEST(AsmParserTest, SlotMappingTest) {
-  LLVMContext Ctx;
-  StringRef Source = "@0 = global i32 0\n !0 = !{}\n !42 = !{i32 42}";
-  SMDiagnostic Error;
-  SlotMapping Mapping;
-  auto Mod = parseAssemblyString(Source, Error, Ctx, &Mapping);
-
-  EXPECT_TRUE(Mod != nullptr);
-  EXPECT_TRUE(Error.getMessage().empty());
-
-  ASSERT_EQ(Mapping.GlobalValues.size(), 1u);
-  EXPECT_TRUE(isa<GlobalVariable>(Mapping.GlobalValues[0]));
-
-  EXPECT_EQ(Mapping.MetadataNodes.size(), 2u);
-  EXPECT_EQ(Mapping.MetadataNodes.count(0), 1u);
-  EXPECT_EQ(Mapping.MetadataNodes.count(42), 1u);
-  EXPECT_EQ(Mapping.MetadataNodes.count(1), 0u);
-}
-
-TEST(AsmParserTest, TypeAndConstantValueParsing) {
-  LLVMContext Ctx;
-  SMDiagnostic Error;
-  StringRef Source = "define void @test() {\n  entry:\n  ret void\n}";
-  auto Mod = parseAssemblyString(Source, Error, Ctx);
-  ASSERT_TRUE(Mod != nullptr);
-  auto &M = *Mod;
-
-  const Value *V;
-  V = parseConstantValue("double 3.5", Error, M);
-  ASSERT_TRUE(V);
-  EXPECT_TRUE(V->getType()->isDoubleTy());
-  ASSERT_TRUE(isa<ConstantFP>(V));
-  EXPECT_TRUE(cast<ConstantFP>(V)->isExactlyValue(3.5));
-
-  V = parseConstantValue("i32 42", Error, M);
-  ASSERT_TRUE(V);
-  EXPECT_TRUE(V->getType()->isIntegerTy());
-  ASSERT_TRUE(isa<ConstantInt>(V));
-  EXPECT_TRUE(cast<ConstantInt>(V)->equalsInt(42));
-
-  V = parseConstantValue("<4 x i32> <i32 0, i32 1, i32 2, i32 3>", Error, M);
-  ASSERT_TRUE(V);
-  EXPECT_TRUE(V->getType()->isVectorTy());
-  ASSERT_TRUE(isa<ConstantDataVector>(V));
-
-  V = parseConstantValue("i32 add (i32 1, i32 2)", Error, M);
-  ASSERT_TRUE(V);
-  ASSERT_TRUE(isa<ConstantInt>(V));
-
-  V = parseConstantValue("i8* blockaddress(@test, %entry)", Error, M);
-  ASSERT_TRUE(V);
-  ASSERT_TRUE(isa<BlockAddress>(V));
-
-  V = parseConstantValue("i8** undef", Error, M);
-  ASSERT_TRUE(V);
-  ASSERT_TRUE(isa<UndefValue>(V));
-
-  EXPECT_FALSE(parseConstantValue("duble 3.25", Error, M));
-  EXPECT_EQ(Error.getMessage(), "expected type");
-
-  EXPECT_FALSE(parseConstantValue("i32 3.25", Error, M));
-  EXPECT_EQ(Error.getMessage(), "floating point constant invalid for type");
-
-  EXPECT_FALSE(parseConstantValue("i32* @foo", Error, M));
-  EXPECT_EQ(Error.getMessage(), "expected a constant value");
-
-  EXPECT_FALSE(parseConstantValue("i32 3, ", Error, M));
-  EXPECT_EQ(Error.getMessage(), "expected end of string");
-}
-
-TEST(AsmParserTest, TypeAndConstantValueWithSlotMappingParsing) {
-  LLVMContext Ctx;
-  SMDiagnostic Error;
-  StringRef Source =
-      "%st = type { i32, i32 }\n"
-      "@v = common global [50 x %st] zeroinitializer, align 16\n"
-      "%0 = type { i32, i32, i32, i32 }\n"
-      "@g = common global [50 x %0] zeroinitializer, align 16\n"
-      "define void @marker4(i64 %d) {\n"
-      "entry:\n"
-      "  %conv = trunc i64 %d to i32\n"
-      "  store i32 %conv, i32* getelementptr inbounds "
-      "    ([50 x %st], [50 x %st]* @v, i64 0, i64 0, i32 0), align 16\n"
-      "  store i32 %conv, i32* getelementptr inbounds "
-      "    ([50 x %0], [50 x %0]* @g, i64 0, i64 0, i32 0), align 16\n"
-      "  ret void\n"
-      "}";
-  SlotMapping Mapping;
-  auto Mod = parseAssemblyString(Source, Error, Ctx, &Mapping);
-  ASSERT_TRUE(Mod != nullptr);
-  auto &M = *Mod;
-
-  const Value *V;
-  V = parseConstantValue("i32* getelementptr inbounds ([50 x %st], [50 x %st]* "
-                         "@v, i64 0, i64 0, i32 0)",
-                         Error, M, &Mapping);
-  ASSERT_TRUE(V);
-  ASSERT_TRUE(isa<ConstantExpr>(V));
-
-  V = parseConstantValue("i32* getelementptr inbounds ([50 x %0], [50 x %0]* "
-                         "@g, i64 0, i64 0, i32 0)",
-                         Error, M, &Mapping);
-  ASSERT_TRUE(V);
-  ASSERT_TRUE(isa<ConstantExpr>(V));
-}
-
-TEST(AsmParserTest, TypeWithSlotMappingParsing) {
-  LLVMContext Ctx;
-  SMDiagnostic Error;
-  StringRef Source =
-      "%st = type { i32, i32 }\n"
-      "@v = common global [50 x %st] zeroinitializer, align 16\n"
-      "%0 = type { i32, i32, i32, i32 }\n"
-      "@g = common global [50 x %0] zeroinitializer, align 16\n"
-      "define void @marker4(i64 %d) {\n"
-      "entry:\n"
-      "  %conv = trunc i64 %d to i32\n"
-      "  store i32 %conv, i32* getelementptr inbounds "
-      "    ([50 x %st], [50 x %st]* @v, i64 0, i64 0, i32 0), align 16\n"
-      "  store i32 %conv, i32* getelementptr inbounds "
-      "    ([50 x %0], [50 x %0]* @g, i64 0, i64 0, i32 0), align 16\n"
-      "  ret void\n"
-      "}";
-  SlotMapping Mapping;
-  auto Mod = parseAssemblyString(Source, Error, Ctx, &Mapping);
-  ASSERT_TRUE(Mod != nullptr);
-  auto &M = *Mod;
-
-  // Check we properly parse integer types.
-  Type *Ty;
-  Ty = parseType("i32", Error, M, &Mapping);
-  ASSERT_TRUE(Ty);
-  ASSERT_TRUE(Ty->isIntegerTy());
-  ASSERT_TRUE(Ty->getPrimitiveSizeInBits() == 32);
-
-  // Check we properly parse integer types with exotic size.
-  Ty = parseType("i13", Error, M, &Mapping);
-  ASSERT_TRUE(Ty);
-  ASSERT_TRUE(Ty->isIntegerTy());
-  ASSERT_TRUE(Ty->getPrimitiveSizeInBits() == 13);
-
-  // Check we properly parse floating point types.
-  Ty = parseType("float", Error, M, &Mapping);
-  ASSERT_TRUE(Ty);
-  ASSERT_TRUE(Ty->isFloatTy());
-
-  Ty = parseType("double", Error, M, &Mapping);
-  ASSERT_TRUE(Ty);
-  ASSERT_TRUE(Ty->isDoubleTy());
-
-  // Check we properly parse struct types.
-  // Named struct.
-  Ty = parseType("%st", Error, M, &Mapping);
-  ASSERT_TRUE(Ty);
-  ASSERT_TRUE(Ty->isStructTy());
-
-  // Check the details of the struct.
-  StructType *ST = cast<StructType>(Ty);
-  ASSERT_TRUE(ST->getNumElements() == 2);
-  for (unsigned i = 0, e = ST->getNumElements(); i != e; ++i) {
-    Ty = ST->getElementType(i);
-    ASSERT_TRUE(Ty->isIntegerTy());
-    ASSERT_TRUE(Ty->getPrimitiveSizeInBits() == 32);
-  }
-
-  // Anonymous struct.
-  Ty = parseType("%0", Error, M, &Mapping);
-  ASSERT_TRUE(Ty);
-  ASSERT_TRUE(Ty->isStructTy());
-
-  // Check the details of the struct.
-  ST = cast<StructType>(Ty);
-  ASSERT_TRUE(ST->getNumElements() == 4);
-  for (unsigned i = 0, e = ST->getNumElements(); i != e; ++i) {
-    Ty = ST->getElementType(i);
-    ASSERT_TRUE(Ty->isIntegerTy());
-    ASSERT_TRUE(Ty->getPrimitiveSizeInBits() == 32);
-  }
-
-  // Check we properly parse vector types.
-  Ty = parseType("<5 x i32>", Error, M, &Mapping);
-  ASSERT_TRUE(Ty);
-  ASSERT_TRUE(Ty->isVectorTy());
-
-  // Check the details of the vector.
-  auto *VT = cast<FixedVectorType>(Ty);
-  ASSERT_TRUE(VT->getNumElements() == 5);
-  ASSERT_TRUE(VT->getPrimitiveSizeInBits().getFixedSize() == 160);
-  Ty = VT->getElementType();
-  ASSERT_TRUE(Ty->isIntegerTy());
-  ASSERT_TRUE(Ty->getPrimitiveSizeInBits() == 32);
-
-  // Opaque struct.
-  Ty = parseType("%opaque", Error, M, &Mapping);
-  ASSERT_TRUE(Ty);
-  ASSERT_TRUE(Ty->isStructTy());
-
-  ST = cast<StructType>(Ty);
-  ASSERT_TRUE(ST->isOpaque());
-
-  // Check we properly parse pointer types.
-  // One indirection.
-  Ty = parseType("i32*", Error, M, &Mapping);
-  ASSERT_TRUE(Ty);
-  ASSERT_TRUE(Ty->isPointerTy());
-
-  PointerType *PT = cast<PointerType>(Ty);
-  Ty = PT->getElementType();
-  ASSERT_TRUE(Ty->isIntegerTy());
-  ASSERT_TRUE(Ty->getPrimitiveSizeInBits() == 32);
-
-  // Two indirections.
-  Ty = parseType("i32**", Error, M, &Mapping);
-  ASSERT_TRUE(Ty);
-  ASSERT_TRUE(Ty->isPointerTy());
-
-  PT = cast<PointerType>(Ty);
-  Ty = PT->getElementType();
-  ASSERT_TRUE(Ty->isPointerTy());
-
-  PT = cast<PointerType>(Ty);
-  Ty = PT->getElementType();
-  ASSERT_TRUE(Ty->isIntegerTy());
-  ASSERT_TRUE(Ty->getPrimitiveSizeInBits() == 32);
-
-  // Check that we reject types with garbage.
-  Ty = parseType("i32 garbage", Error, M, &Mapping);
-  ASSERT_TRUE(!Ty);
-}
-
-TEST(AsmParserTest, TypeAtBeginningWithSlotMappingParsing) {
-  LLVMContext Ctx;
-  SMDiagnostic Error;
-  StringRef Source =
-      "%st = type { i32, i32 }\n"
-      "@v = common global [50 x %st] zeroinitializer, align 16\n"
-      "%0 = type { i32, i32, i32, i32 }\n"
-      "@g = common global [50 x %0] zeroinitializer, align 16\n"
-      "define void @marker4(i64 %d) {\n"
-      "entry:\n"
-      "  %conv = trunc i64 %d to i32\n"
-      "  store i32 %conv, i32* getelementptr inbounds "
-      "    ([50 x %st], [50 x %st]* @v, i64 0, i64 0, i32 0), align 16\n"
-      "  store i32 %conv, i32* getelementptr inbounds "
-      "    ([50 x %0], [50 x %0]* @g, i64 0, i64 0, i32 0), align 16\n"
-      "  ret void\n"
-      "}";
-  SlotMapping Mapping;
-  auto Mod = parseAssemblyString(Source, Error, Ctx, &Mapping);
-  ASSERT_TRUE(Mod != nullptr);
-  auto &M = *Mod;
-  unsigned Read;
-
-  // Check we properly parse integer types.
-  Type *Ty;
-  Ty = parseTypeAtBeginning("i32", Read, Error, M, &Mapping);
-  ASSERT_TRUE(Ty);
-  ASSERT_TRUE(Ty->isIntegerTy());
-  ASSERT_TRUE(Ty->getPrimitiveSizeInBits() == 32);
-  ASSERT_TRUE(Read == 3);
-
-  // Check we properly parse integer types with exotic size.
-  Ty = parseTypeAtBeginning("i13", Read, Error, M, &Mapping);
-  ASSERT_TRUE(Ty);
-  ASSERT_TRUE(Ty->isIntegerTy());
-  ASSERT_TRUE(Ty->getPrimitiveSizeInBits() == 13);
-  ASSERT_TRUE(Read == 3);
-
-  // Check we properly parse floating point types.
-  Ty = parseTypeAtBeginning("float", Read, Error, M, &Mapping);
-  ASSERT_TRUE(Ty);
-  ASSERT_TRUE(Ty->isFloatTy());
-  ASSERT_TRUE(Read == 5);
-
-  Ty = parseTypeAtBeginning("double", Read, Error, M, &Mapping);
-  ASSERT_TRUE(Ty);
-  ASSERT_TRUE(Ty->isDoubleTy());
-  ASSERT_TRUE(Read == 6);
-
-  // Check we properly parse struct types.
-  // Named struct.
-  Ty = parseTypeAtBeginning("%st", Read, Error, M, &Mapping);
-  ASSERT_TRUE(Ty);
-  ASSERT_TRUE(Ty->isStructTy());
-  ASSERT_TRUE(Read == 3);
-
-  // Check the details of the struct.
-  StructType *ST = cast<StructType>(Ty);
-  ASSERT_TRUE(ST->getNumElements() == 2);
-  for (unsigned i = 0, e = ST->getNumElements(); i != e; ++i) {
-    Ty = ST->getElementType(i);
-    ASSERT_TRUE(Ty->isIntegerTy());
-    ASSERT_TRUE(Ty->getPrimitiveSizeInBits() == 32);
-  }
-
-  // Anonymous struct.
-  Ty = parseTypeAtBeginning("%0", Read, Error, M, &Mapping);
-  ASSERT_TRUE(Ty);
-  ASSERT_TRUE(Ty->isStructTy());
-  ASSERT_TRUE(Read == 2);
-
-  // Check the details of the struct.
-  ST = cast<StructType>(Ty);
-  ASSERT_TRUE(ST->getNumElements() == 4);
-  for (unsigned i = 0, e = ST->getNumElements(); i != e; ++i) {
-    Ty = ST->getElementType(i);
-    ASSERT_TRUE(Ty->isIntegerTy());
-    ASSERT_TRUE(Ty->getPrimitiveSizeInBits() == 32);
-  }
-
-  // Check we properly parse vector types.
-  Ty = parseTypeAtBeginning("<5 x i32>", Read, Error, M, &Mapping);
-  ASSERT_TRUE(Ty);
-  ASSERT_TRUE(Ty->isVectorTy());
-  ASSERT_TRUE(Read == 9);
-
-  // Check the details of the vector.
-  auto *VT = cast<FixedVectorType>(Ty);
-  ASSERT_TRUE(VT->getNumElements() == 5);
-  ASSERT_TRUE(VT->getPrimitiveSizeInBits().getFixedSize() == 160);
-  Ty = VT->getElementType();
-  ASSERT_TRUE(Ty->isIntegerTy());
-  ASSERT_TRUE(Ty->getPrimitiveSizeInBits() == 32);
-
-  // Opaque struct.
-  Ty = parseTypeAtBeginning("%opaque", Read, Error, M, &Mapping);
-  ASSERT_TRUE(Ty);
-  ASSERT_TRUE(Ty->isStructTy());
-  ASSERT_TRUE(Read == 7);
-
-  ST = cast<StructType>(Ty);
-  ASSERT_TRUE(ST->isOpaque());
-
-  // Check we properly parse pointer types.
-  // One indirection.
-  Ty = parseTypeAtBeginning("i32*", Read, Error, M, &Mapping);
-  ASSERT_TRUE(Ty);
-  ASSERT_TRUE(Ty->isPointerTy());
-  ASSERT_TRUE(Read == 4);
-
-  PointerType *PT = cast<PointerType>(Ty);
-  Ty = PT->getElementType();
-  ASSERT_TRUE(Ty->isIntegerTy());
-  ASSERT_TRUE(Ty->getPrimitiveSizeInBits() == 32);
-
-  // Two indirections.
-  Ty = parseTypeAtBeginning("i32**", Read, Error, M, &Mapping);
-  ASSERT_TRUE(Ty);
-  ASSERT_TRUE(Ty->isPointerTy());
-  ASSERT_TRUE(Read == 5);
-
-  PT = cast<PointerType>(Ty);
-  Ty = PT->getElementType();
-  ASSERT_TRUE(Ty->isPointerTy());
-
-  PT = cast<PointerType>(Ty);
-  Ty = PT->getElementType();
-  ASSERT_TRUE(Ty->isIntegerTy());
-  ASSERT_TRUE(Ty->getPrimitiveSizeInBits() == 32);
-
-  // Check that we reject types with garbage.
-  Ty = parseTypeAtBeginning("i32 garbage", Read, Error, M, &Mapping);
-  ASSERT_TRUE(Ty);
-  ASSERT_TRUE(Ty->isIntegerTy());
-  ASSERT_TRUE(Ty->getPrimitiveSizeInBits() == 32);
-  // We go to the next token, i.e., we read "i32" + ' '.
-  ASSERT_TRUE(Read == 4);
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/AsmParser/CMakeLists.txt b/gnu/llvm/llvm/unittests/AsmParser/CMakeLists.txt
deleted file mode 100644
index 1920bfaa3aa..00000000000
--- a/gnu/llvm/llvm/unittests/AsmParser/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  AsmParser
-  Core
-  Support
-  )
-
-add_llvm_unittest(AsmParserTests
-  AsmParserTest.cpp
-  )
diff --git a/gnu/llvm/llvm/unittests/BinaryFormat/CMakeLists.txt b/gnu/llvm/llvm/unittests/BinaryFormat/CMakeLists.txt
deleted file mode 100644
index c058402638b..00000000000
--- a/gnu/llvm/llvm/unittests/BinaryFormat/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  BinaryFormat
-  )
-
-add_llvm_unittest(BinaryFormatTests
-  DwarfTest.cpp
-  MachOTest.cpp
-  MsgPackDocumentTest.cpp
-  MsgPackReaderTest.cpp
-  MsgPackWriterTest.cpp
-  TestFileMagic.cpp
-  )
-
diff --git a/gnu/llvm/llvm/unittests/BinaryFormat/DwarfTest.cpp b/gnu/llvm/llvm/unittests/BinaryFormat/DwarfTest.cpp
deleted file mode 100644
index 5e49a5cc2ee..00000000000
--- a/gnu/llvm/llvm/unittests/BinaryFormat/DwarfTest.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-//===- unittest/BinaryFormat/DwarfTest.cpp - Dwarf support tests ----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/BinaryFormat/Dwarf.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/FormatVariadic.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::dwarf;
-
-namespace {
-
-TEST(DwarfTest, TagStringOnInvalid) {
-  // This is invalid, so it shouldn't be stringified.
-  EXPECT_EQ(StringRef(), TagString(DW_TAG_invalid));
-
-  // These aren't really tags: they describe ranges within tags.  They
-  // shouldn't be stringified either.
-  EXPECT_EQ(StringRef(), TagString(DW_TAG_lo_user));
-  EXPECT_EQ(StringRef(), TagString(DW_TAG_hi_user));
-  EXPECT_EQ(StringRef(), TagString(DW_TAG_user_base));
-}
-
-TEST(DwarfTest, getTag) {
-  // A couple of valid tags.
-  EXPECT_EQ(DW_TAG_array_type, getTag("DW_TAG_array_type"));
-  EXPECT_EQ(DW_TAG_module, getTag("DW_TAG_module"));
-
-  // Invalid tags.
-  EXPECT_EQ(DW_TAG_invalid, getTag("DW_TAG_invalid"));
-  EXPECT_EQ(DW_TAG_invalid, getTag("DW_TAG_madeuptag"));
-  EXPECT_EQ(DW_TAG_invalid, getTag("something else"));
-
-  // Tag range markers should not be recognized.
-  EXPECT_EQ(DW_TAG_invalid, getTag("DW_TAG_lo_user"));
-  EXPECT_EQ(DW_TAG_invalid, getTag("DW_TAG_hi_user"));
-  EXPECT_EQ(DW_TAG_invalid, getTag("DW_TAG_user_base"));
-}
-
-TEST(DwarfTest, getOperationEncoding) {
-  // Some valid ops.
-  EXPECT_EQ(DW_OP_deref, getOperationEncoding("DW_OP_deref"));
-  EXPECT_EQ(DW_OP_bit_piece, getOperationEncoding("DW_OP_bit_piece"));
-
-  // Invalid ops.
-  EXPECT_EQ(0u, getOperationEncoding("DW_OP_otherthings"));
-  EXPECT_EQ(0u, getOperationEncoding("other"));
-
-  // Markers shouldn't be recognized.
-  EXPECT_EQ(0u, getOperationEncoding("DW_OP_lo_user"));
-  EXPECT_EQ(0u, getOperationEncoding("DW_OP_hi_user"));
-}
-
-TEST(DwarfTest, LanguageStringOnInvalid) {
-  // This is invalid, so it shouldn't be stringified.
-  EXPECT_EQ(StringRef(), LanguageString(0));
-
-  // These aren't really tags: they describe ranges within tags.  They
-  // shouldn't be stringified either.
-  EXPECT_EQ(StringRef(), LanguageString(DW_LANG_lo_user));
-  EXPECT_EQ(StringRef(), LanguageString(DW_LANG_hi_user));
-}
-
-TEST(DwarfTest, getLanguage) {
-  // A couple of valid languages.
-  EXPECT_EQ(DW_LANG_C89, getLanguage("DW_LANG_C89"));
-  EXPECT_EQ(DW_LANG_C_plus_plus_11, getLanguage("DW_LANG_C_plus_plus_11"));
-  EXPECT_EQ(DW_LANG_OCaml, getLanguage("DW_LANG_OCaml"));
-  EXPECT_EQ(DW_LANG_Mips_Assembler, getLanguage("DW_LANG_Mips_Assembler"));
-
-  // Invalid languages.
-  EXPECT_EQ(0u, getLanguage("DW_LANG_invalid"));
-  EXPECT_EQ(0u, getLanguage("DW_TAG_array_type"));
-  EXPECT_EQ(0u, getLanguage("something else"));
-
-  // Language range markers should not be recognized.
-  EXPECT_EQ(0u, getLanguage("DW_LANG_lo_user"));
-  EXPECT_EQ(0u, getLanguage("DW_LANG_hi_user"));
-}
-
-TEST(DwarfTest, AttributeEncodingStringOnInvalid) {
-  // This is invalid, so it shouldn't be stringified.
-  EXPECT_EQ(StringRef(), AttributeEncodingString(0));
-
-  // These aren't really tags: they describe ranges within tags.  They
-  // shouldn't be stringified either.
-  EXPECT_EQ(StringRef(), AttributeEncodingString(DW_ATE_lo_user));
-  EXPECT_EQ(StringRef(), AttributeEncodingString(DW_ATE_hi_user));
-}
-
-TEST(DwarfTest, getAttributeEncoding) {
-  // A couple of valid languages.
-  EXPECT_EQ(DW_ATE_boolean, getAttributeEncoding("DW_ATE_boolean"));
-  EXPECT_EQ(DW_ATE_imaginary_float,
-            getAttributeEncoding("DW_ATE_imaginary_float"));
-
-  // Invalid languages.
-  EXPECT_EQ(0u, getAttributeEncoding("DW_ATE_invalid"));
-  EXPECT_EQ(0u, getAttributeEncoding("DW_TAG_array_type"));
-  EXPECT_EQ(0u, getAttributeEncoding("something else"));
-
-  // AttributeEncoding range markers should not be recognized.
-  EXPECT_EQ(0u, getAttributeEncoding("DW_ATE_lo_user"));
-  EXPECT_EQ(0u, getAttributeEncoding("DW_ATE_hi_user"));
-}
-
-TEST(DwarfTest, VirtualityString) {
-  EXPECT_EQ(StringRef("DW_VIRTUALITY_none"),
-            VirtualityString(DW_VIRTUALITY_none));
-  EXPECT_EQ(StringRef("DW_VIRTUALITY_virtual"),
-            VirtualityString(DW_VIRTUALITY_virtual));
-  EXPECT_EQ(StringRef("DW_VIRTUALITY_pure_virtual"),
-            VirtualityString(DW_VIRTUALITY_pure_virtual));
-
-  // DW_VIRTUALITY_max should be pure virtual.
-  EXPECT_EQ(StringRef("DW_VIRTUALITY_pure_virtual"),
-            VirtualityString(DW_VIRTUALITY_max));
-
-  // Invalid numbers shouldn't be stringified.
-  EXPECT_EQ(StringRef(), VirtualityString(DW_VIRTUALITY_max + 1));
-  EXPECT_EQ(StringRef(), VirtualityString(DW_VIRTUALITY_max + 77));
-}
-
-TEST(DwarfTest, getVirtuality) {
-  EXPECT_EQ(DW_VIRTUALITY_none, getVirtuality("DW_VIRTUALITY_none"));
-  EXPECT_EQ(DW_VIRTUALITY_virtual, getVirtuality("DW_VIRTUALITY_virtual"));
-  EXPECT_EQ(DW_VIRTUALITY_pure_virtual,
-            getVirtuality("DW_VIRTUALITY_pure_virtual"));
-
-  // Invalid strings.
-  EXPECT_EQ(DW_VIRTUALITY_invalid, getVirtuality("DW_VIRTUALITY_invalid"));
-  EXPECT_EQ(DW_VIRTUALITY_invalid, getVirtuality("DW_VIRTUALITY_max"));
-  EXPECT_EQ(DW_VIRTUALITY_invalid, getVirtuality("something else"));
-}
-
-TEST(DwarfTest, FixedFormSizes) {
-  Optional<uint8_t> RefSize;
-  Optional<uint8_t> AddrSize;
-
-  // Test 32 bit DWARF version 2 with 4 byte addresses.
-  FormParams Params_2_4_32 = {2, 4, DWARF32};
-  RefSize = getFixedFormByteSize(DW_FORM_ref_addr, Params_2_4_32);
-  AddrSize = getFixedFormByteSize(DW_FORM_ref_addr, Params_2_4_32);
-  EXPECT_TRUE(RefSize.hasValue());
-  EXPECT_TRUE(AddrSize.hasValue());
-  EXPECT_EQ(*RefSize, *AddrSize);
-
-  // Test 32 bit DWARF version 2 with 8 byte addresses.
-  FormParams Params_2_8_32 = {2, 8, DWARF32};
-  RefSize = getFixedFormByteSize(DW_FORM_ref_addr, Params_2_8_32);
-  AddrSize = getFixedFormByteSize(DW_FORM_ref_addr, Params_2_8_32);
-  EXPECT_TRUE(RefSize.hasValue());
-  EXPECT_TRUE(AddrSize.hasValue());
-  EXPECT_EQ(*RefSize, *AddrSize);
-
-  // DW_FORM_ref_addr is 4 bytes in DWARF 32 in DWARF version 3 and beyond.
-  FormParams Params_3_4_32 = {3, 4, DWARF32};
-  RefSize = getFixedFormByteSize(DW_FORM_ref_addr, Params_3_4_32);
-  EXPECT_TRUE(RefSize.hasValue());
-  EXPECT_EQ(*RefSize, 4);
-
-  FormParams Params_4_4_32 = {4, 4, DWARF32};
-  RefSize = getFixedFormByteSize(DW_FORM_ref_addr, Params_4_4_32);
-  EXPECT_TRUE(RefSize.hasValue());
-  EXPECT_EQ(*RefSize, 4);
-
-  FormParams Params_5_4_32 = {5, 4, DWARF32};
-  RefSize = getFixedFormByteSize(DW_FORM_ref_addr, Params_5_4_32);
-  EXPECT_TRUE(RefSize.hasValue());
-  EXPECT_EQ(*RefSize, 4);
-
-  // DW_FORM_ref_addr is 8 bytes in DWARF 64 in DWARF version 3 and beyond.
-  FormParams Params_3_8_64 = {3, 8, DWARF64};
-  RefSize = getFixedFormByteSize(DW_FORM_ref_addr, Params_3_8_64);
-  EXPECT_TRUE(RefSize.hasValue());
-  EXPECT_EQ(*RefSize, 8);
-
-  FormParams Params_4_8_64 = {4, 8, DWARF64};
-  RefSize = getFixedFormByteSize(DW_FORM_ref_addr, Params_4_8_64);
-  EXPECT_TRUE(RefSize.hasValue());
-  EXPECT_EQ(*RefSize, 8);
-
-  FormParams Params_5_8_64 = {5, 8, DWARF64};
-  RefSize = getFixedFormByteSize(DW_FORM_ref_addr, Params_5_8_64);
-  EXPECT_TRUE(RefSize.hasValue());
-  EXPECT_EQ(*RefSize, 8);
-}
-
-TEST(DwarfTest, format_provider) {
-  EXPECT_EQ("DW_AT_name", formatv("{0}", DW_AT_name).str());
-  EXPECT_EQ("DW_AT_unknown_3fff", formatv("{0}", DW_AT_hi_user).str());
-  EXPECT_EQ("DW_FORM_addr", formatv("{0}", DW_FORM_addr).str());
-  EXPECT_EQ("DW_FORM_unknown_1f00", formatv("{0}", DW_FORM_lo_user).str());
-  EXPECT_EQ("DW_IDX_compile_unit", formatv("{0}", DW_IDX_compile_unit).str());
-  EXPECT_EQ("DW_IDX_unknown_3fff", formatv("{0}", DW_IDX_hi_user).str());
-  EXPECT_EQ("DW_TAG_compile_unit", formatv("{0}", DW_TAG_compile_unit).str());
-  EXPECT_EQ("DW_TAG_unknown_ffff", formatv("{0}", DW_TAG_hi_user).str());
-  EXPECT_EQ("DW_OP_lit0", formatv("{0}", DW_OP_lit0).str());
-  EXPECT_EQ("DW_OP_unknown_ff", formatv("{0}", DW_OP_hi_user).str());
-}
-} // end namespace
diff --git a/gnu/llvm/llvm/unittests/BinaryFormat/MachOTest.cpp b/gnu/llvm/llvm/unittests/BinaryFormat/MachOTest.cpp
deleted file mode 100644
index a3caf85d406..00000000000
--- a/gnu/llvm/llvm/unittests/BinaryFormat/MachOTest.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-//===- unittest/BinaryFormat/MachOTest.cpp - MachO support tests ----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/BinaryFormat/MachO.h"
-#include "llvm/ADT/Triple.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::MachO;
-
-TEST(MachOTest, UnalignedLC) {
-  unsigned char Valid32BitMachO[] = {
-      0xCE, 0xFA, 0xED, 0xFE, 0x07, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
-      0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00,
-      0x85, 0x80, 0x21, 0x01, 0x01, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00,
-      0x5F, 0x5F, 0x50, 0x41, 0x47, 0x45, 0x5A, 0x45, 0x52, 0x4F, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x01, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x5F, 0x5F, 0x4C, 0x49,
-      0x4E, 0x4B, 0x45, 0x44, 0x49, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x40, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00,
-      0x8C, 0x0B, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-  mach_header *Header =
-      reinterpret_cast<mach_header *>(Valid32BitMachO);
-  if (!sys::IsLittleEndianHost)
-    swapStruct(*Header);
-  ASSERT_EQ(Header->magic, MH_MAGIC);
-  unsigned char *Current = Valid32BitMachO + sizeof(mach_header);
-  unsigned char *BufferEnd =
-      Valid32BitMachO + sizeof(mach_header) + Header->sizeofcmds;
-  while (Current < BufferEnd) {
-    macho_load_command *LC =
-        reinterpret_cast<macho_load_command *>(Current);
-    if (!sys::IsLittleEndianHost)
-      swapStruct(LC->load_command_data);
-    ASSERT_EQ(LC->load_command_data.cmd, LC_SEGMENT);
-    Current += LC->load_command_data.cmdsize;
-  }
-}
-
-TEST(MachOTest, CPUType) {
-#define CHECK_CPUTYPE(StrTriple, ExpectedCPUType)                              \
-  ASSERT_EQ((MachO::CPUType)cantFail(MachO::getCPUType(Triple(StrTriple))),    \
-            (ExpectedCPUType))
-  CHECK_CPUTYPE("x86_64-apple-darwin", MachO::CPU_TYPE_X86_64);
-  CHECK_CPUTYPE("x86_64h-apple-darwin", MachO::CPU_TYPE_X86_64);
-  CHECK_CPUTYPE("i386-apple-darwin", MachO::CPU_TYPE_X86);
-  CHECK_CPUTYPE("armv7-apple-darwin", MachO::CPU_TYPE_ARM);
-  CHECK_CPUTYPE("thumbv7-apple-darwin", MachO::CPU_TYPE_ARM);
-  CHECK_CPUTYPE("arm64-apple-darwin", MachO::CPU_TYPE_ARM64);
-  CHECK_CPUTYPE("arm64e-apple-darwin", MachO::CPU_TYPE_ARM64);
-  CHECK_CPUTYPE("arm64_32-apple-darwin", MachO::CPU_TYPE_ARM64_32);
-
-  {
-    // Not a mach-o.
-    Expected<uint32_t> Type = MachO::getCPUType(Triple("x86_64-linux-unknown"));
-    ASSERT_EQ(toString(Type.takeError()),
-              "Unsupported triple for mach-o cpu type: x86_64-linux-unknown");
-  }
-  {
-    // Not a valid mach-o architecture.
-    Expected<uint32_t> Type = MachO::getCPUType(Triple("mips-apple-darwin"));
-    ASSERT_EQ(toString(Type.takeError()),
-              "Unsupported triple for mach-o cpu type: mips-apple-darwin");
-  }
-#undef CHECK_CPUTYPE
-}
-
-TEST(MachOTest, CPUSubType) {
-#define CHECK_CPUSUBTYPE(StrTriple, ExpectedCPUSubType)                        \
-  ASSERT_EQ(cantFail(MachO::getCPUSubType(Triple(StrTriple))),                 \
-            ((uint32_t)ExpectedCPUSubType))
-  CHECK_CPUSUBTYPE("x86_64-apple-darwin", MachO::CPU_SUBTYPE_X86_64_ALL);
-  CHECK_CPUSUBTYPE("x86_64h-apple-darwin", MachO::CPU_SUBTYPE_X86_64_H);
-  CHECK_CPUSUBTYPE("i386-apple-darwin", MachO::CPU_SUBTYPE_I386_ALL);
-  CHECK_CPUSUBTYPE("arm-apple-darwin", MachO::CPU_SUBTYPE_ARM_V7); // Default
-  CHECK_CPUSUBTYPE("armv4t-apple-darwin", MachO::CPU_SUBTYPE_ARM_V4T);
-  CHECK_CPUSUBTYPE("armv5t-apple-darwin", MachO::CPU_SUBTYPE_ARM_V5);
-  CHECK_CPUSUBTYPE("armv5te-apple-darwin", MachO::CPU_SUBTYPE_ARM_V5);
-  CHECK_CPUSUBTYPE("armv5tej-apple-darwin", MachO::CPU_SUBTYPE_ARM_V5);
-  CHECK_CPUSUBTYPE("armv6-apple-darwin", MachO::CPU_SUBTYPE_ARM_V6);
-  CHECK_CPUSUBTYPE("armv6k-apple-darwin", MachO::CPU_SUBTYPE_ARM_V6);
-  CHECK_CPUSUBTYPE("armv7a-apple-darwin", MachO::CPU_SUBTYPE_ARM_V7);
-  CHECK_CPUSUBTYPE("armv7s-apple-darwin", MachO::CPU_SUBTYPE_ARM_V7S);
-  CHECK_CPUSUBTYPE("armv7k-apple-darwin", MachO::CPU_SUBTYPE_ARM_V7K);
-  CHECK_CPUSUBTYPE("armv6m-apple-darwin", MachO::CPU_SUBTYPE_ARM_V6M);
-  CHECK_CPUSUBTYPE("armv7m-apple-darwin", MachO::CPU_SUBTYPE_ARM_V7M);
-  CHECK_CPUSUBTYPE("armv7em-apple-darwin", MachO::CPU_SUBTYPE_ARM_V7EM);
-  CHECK_CPUSUBTYPE("thumbv7-apple-darwin", MachO::CPU_SUBTYPE_ARM_V7);
-  CHECK_CPUSUBTYPE("thumbv6-apple-darwin", MachO::CPU_SUBTYPE_ARM_V6);
-  CHECK_CPUSUBTYPE("arm64-apple-darwin", MachO::CPU_SUBTYPE_ARM64_ALL);
-  CHECK_CPUSUBTYPE("arm64e-apple-darwin", MachO::CPU_SUBTYPE_ARM64E);
-  CHECK_CPUSUBTYPE("arm64_32-apple-darwin", MachO::CPU_SUBTYPE_ARM64_32_V8);
-
-  {
-    // Not a mach-o.
-    Expected<uint32_t> Type =
-        MachO::getCPUSubType(Triple("x86_64-linux-unknown"));
-    ASSERT_EQ(
-        toString(Type.takeError()),
-        "Unsupported triple for mach-o cpu subtype: x86_64-linux-unknown");
-  }
-  {
-    // Not a valid mach-o architecture.
-    Expected<uint32_t> Type = MachO::getCPUSubType(Triple("mips-apple-darwin"));
-    ASSERT_EQ(toString(Type.takeError()),
-              "Unsupported triple for mach-o cpu subtype: mips-apple-darwin");
-  }
-#undef CHECK_CPUSUBTYPE
-}
diff --git a/gnu/llvm/llvm/unittests/BinaryFormat/MsgPackDocumentTest.cpp b/gnu/llvm/llvm/unittests/BinaryFormat/MsgPackDocumentTest.cpp
deleted file mode 100644
index 0a7b59afe72..00000000000
--- a/gnu/llvm/llvm/unittests/BinaryFormat/MsgPackDocumentTest.cpp
+++ /dev/null
@@ -1,314 +0,0 @@
-//===- MsgPackDocumentTest.cpp --------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/BinaryFormat/MsgPackDocument.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace msgpack;
-
-TEST(MsgPackDocument, DocNodeTest) {
-  Document Doc;
-
-  DocNode Int1 = Doc.getNode(1), Int2 = Doc.getNode(2);
-  DocNode Str1 = Doc.getNode("ab"), Str2 = Doc.getNode("ab");
-
-  ASSERT_TRUE(Int1 != Int2);
-  ASSERT_TRUE(Str1 == Str2);
-}
-
-TEST(MsgPackDocument, TestReadInt) {
-  Document Doc;
-  bool Ok = Doc.readFromBlob(StringRef("\xd0\x00", 2), /*Multi=*/false);
-  ASSERT_TRUE(Ok);
-  ASSERT_EQ(Doc.getRoot().getKind(), Type::Int);
-  ASSERT_EQ(Doc.getRoot().getInt(), 0);
-}
-
-TEST(MsgPackDocument, TestReadMergeArray) {
-  Document Doc;
-  bool Ok = Doc.readFromBlob(StringRef("\x92\xd0\x01\xc0"), /*Multi=*/false);
-  ASSERT_TRUE(Ok);
-  ASSERT_EQ(Doc.getRoot().getKind(), Type::Array);
-  auto A = Doc.getRoot().getArray();
-  ASSERT_EQ(A.size(), 2u);
-  auto SI = A[0];
-  ASSERT_EQ(SI.getKind(), Type::Int);
-  ASSERT_EQ(SI.getInt(), 1);
-  auto SN = A[1];
-  ASSERT_EQ(SN.getKind(), Type::Nil);
-
-  Ok = Doc.readFromBlob(StringRef("\x91\xd0\x2a"), /*Multi=*/false,
-                        [](DocNode *DestNode, DocNode SrcNode, DocNode MapKey) {
-                          // Allow array, merging into existing elements, ORing
-                          // ints.
-                          if (DestNode->getKind() == Type::Int &&
-                              SrcNode.getKind() == Type::Int) {
-                            *DestNode = DestNode->getDocument()->getNode(
-                                DestNode->getInt() | SrcNode.getInt());
-                            return 0;
-                          }
-                          return DestNode->isArray() && SrcNode.isArray() ? 0
-                                                                          : -1;
-                        });
-  ASSERT_TRUE(Ok);
-  A = Doc.getRoot().getArray();
-  ASSERT_EQ(A.size(), 2u);
-  SI = A[0];
-  ASSERT_EQ(SI.getKind(), Type::Int);
-  ASSERT_EQ(SI.getInt(), 43);
-  SN = A[1];
-  ASSERT_EQ(SN.getKind(), Type::Nil);
-}
-
-TEST(MsgPackDocument, TestReadAppendArray) {
-  Document Doc;
-  bool Ok = Doc.readFromBlob(StringRef("\x92\xd0\x01\xc0"), /*Multi=*/false);
-  ASSERT_TRUE(Ok);
-  ASSERT_EQ(Doc.getRoot().getKind(), Type::Array);
-  auto A = Doc.getRoot().getArray();
-  ASSERT_EQ(A.size(), 2u);
-  auto SI = A[0];
-  ASSERT_EQ(SI.getKind(), Type::Int);
-  ASSERT_EQ(SI.getInt(), 1);
-  auto SN = A[1];
-  ASSERT_EQ(SN.getKind(), Type::Nil);
-
-  Ok = Doc.readFromBlob(StringRef("\x91\xd0\x2a"), /*Multi=*/false,
-                        [](DocNode *DestNode, DocNode SrcNode, DocNode MapKey) {
-                          // Allow array, appending after existing elements
-                          return DestNode->isArray() && SrcNode.isArray()
-                                     ? DestNode->getArray().size()
-                                     : -1;
-                        });
-  ASSERT_TRUE(Ok);
-  A = Doc.getRoot().getArray();
-  ASSERT_EQ(A.size(), 3u);
-  SI = A[0];
-  ASSERT_EQ(SI.getKind(), Type::Int);
-  ASSERT_EQ(SI.getInt(), 1);
-  SN = A[1];
-  ASSERT_EQ(SN.getKind(), Type::Nil);
-  SI = A[2];
-  ASSERT_EQ(SI.getKind(), Type::Int);
-  ASSERT_EQ(SI.getInt(), 42);
-}
-
-TEST(MsgPackDocument, TestReadMergeMap) {
-  Document Doc;
-  bool Ok = Doc.readFromBlob(StringRef("\x82\xa3"
-                                       "foo"
-                                       "\xd0\x01\xa3"
-                                       "bar"
-                                       "\xd0\x02"),
-                             /*Multi=*/false);
-  ASSERT_TRUE(Ok);
-  ASSERT_EQ(Doc.getRoot().getKind(), Type::Map);
-  auto M = Doc.getRoot().getMap();
-  ASSERT_EQ(M.size(), 2u);
-  auto FooS = M["foo"];
-  ASSERT_EQ(FooS.getKind(), Type::Int);
-  ASSERT_EQ(FooS.getInt(), 1);
-  auto BarS = M["bar"];
-  ASSERT_EQ(BarS.getKind(), Type::Int);
-  ASSERT_EQ(BarS.getInt(), 2);
-
-  Ok = Doc.readFromBlob(StringRef("\x82\xa3"
-                                  "foz"
-                                  "\xd0\x03\xa3"
-                                  "baz"
-                                  "\xd0\x04"),
-                        /*Multi=*/false,
-                        [](DocNode *DestNode, DocNode SrcNode, DocNode MapKey) {
-                          return DestNode->isMap() && SrcNode.isMap() ? 0 : -1;
-                        });
-  ASSERT_TRUE(Ok);
-  ASSERT_EQ(M.size(), 4u);
-  FooS = M["foo"];
-  ASSERT_EQ(FooS.getKind(), Type::Int);
-  ASSERT_EQ(FooS.getInt(), 1);
-  BarS = M["bar"];
-  ASSERT_EQ(BarS.getKind(), Type::Int);
-  ASSERT_EQ(BarS.getInt(), 2);
-  auto FozS = M["foz"];
-  ASSERT_EQ(FozS.getKind(), Type::Int);
-  ASSERT_EQ(FozS.getInt(), 3);
-  auto BazS = M["baz"];
-  ASSERT_EQ(BazS.getKind(), Type::Int);
-  ASSERT_EQ(BazS.getInt(), 4);
-
-  Ok = Doc.readFromBlob(
-      StringRef("\x82\xa3"
-                "foz"
-                "\xd0\x06\xa3"
-                "bay"
-                "\xd0\x08"),
-      /*Multi=*/false, [](DocNode *Dest, DocNode Src, DocNode MapKey) {
-        // Merger function that merges two ints by ORing their values, as long
-        // as the map key is "foz".
-        if (Src.isMap())
-          return Dest->isMap();
-        if (Src.isArray())
-          return Dest->isArray();
-        if (MapKey.isString() && MapKey.getString() == "foz" &&
-            Dest->getKind() == Type::Int && Src.getKind() == Type::Int) {
-          *Dest = Src.getDocument()->getNode(Dest->getInt() | Src.getInt());
-          return true;
-        }
-        return false;
-      });
-  ASSERT_TRUE(Ok);
-  ASSERT_EQ(M.size(), 5u);
-  FooS = M["foo"];
-  ASSERT_EQ(FooS.getKind(), Type::Int);
-  ASSERT_EQ(FooS.getInt(), 1);
-  BarS = M["bar"];
-  ASSERT_EQ(BarS.getKind(), Type::Int);
-  ASSERT_EQ(BarS.getInt(), 2);
-  FozS = M["foz"];
-  ASSERT_EQ(FozS.getKind(), Type::Int);
-  ASSERT_EQ(FozS.getInt(), 7);
-  BazS = M["baz"];
-  ASSERT_EQ(BazS.getKind(), Type::Int);
-  ASSERT_EQ(BazS.getInt(), 4);
-  auto BayS = M["bay"];
-  ASSERT_EQ(BayS.getKind(), Type::Int);
-  ASSERT_EQ(BayS.getInt(), 8);
-}
-
-TEST(MsgPackDocument, TestWriteInt) {
-  Document Doc;
-  Doc.getRoot() = 1;
-  std::string Buffer;
-  Doc.writeToBlob(Buffer);
-  ASSERT_EQ(Buffer, "\x01");
-}
-
-TEST(MsgPackDocument, TestWriteArray) {
-  Document Doc;
-  auto A = Doc.getRoot().getArray(/*Convert=*/true);
-  A.push_back(Doc.getNode(int64_t(1)));
-  A.push_back(Doc.getNode());
-  std::string Buffer;
-  Doc.writeToBlob(Buffer);
-  ASSERT_EQ(Buffer, "\x92\x01\xc0");
-}
-
-TEST(MsgPackDocument, TestWriteMap) {
-  Document Doc;
-  auto M = Doc.getRoot().getMap(/*Convert=*/true);
-  M["foo"] = 1;
-  M["bar"] = 2;
-  std::string Buffer;
-  Doc.writeToBlob(Buffer);
-  ASSERT_EQ(Buffer, "\x82\xa3"
-                    "bar"
-                    "\x02\xa3"
-                    "foo"
-                    "\x01");
-}
-
-TEST(MsgPackDocument, TestOutputYAMLArray) {
-  Document Doc;
-  auto A = Doc.getRoot().getArray(/*Convert=*/true);
-  A.push_back(Doc.getNode(int64_t(1)));
-  A.push_back(Doc.getNode(int64_t(2)));
-  std::string Buffer;
-  raw_string_ostream OStream(Buffer);
-  Doc.toYAML(OStream);
-  ASSERT_EQ(OStream.str(), "---\n- 1\n- 2\n...\n");
-}
-
-TEST(MsgPackDocument, TestInputYAMLArray) {
-  Document Doc;
-  bool Ok = Doc.fromYAML("---\n- !int 0x1\n- !str 2\n...\n");
-  ASSERT_TRUE(Ok);
-  ASSERT_EQ(Doc.getRoot().getKind(), Type::Array);
-  auto A = Doc.getRoot().getArray();
-  ASSERT_EQ(A.size(), 2u);
-  auto SI = A[0];
-  ASSERT_EQ(SI.getKind(), Type::UInt);
-  ASSERT_EQ(SI.getUInt(), 1u);
-  auto SS = A[1];
-  ASSERT_EQ(SS.getKind(), Type::String);
-  ASSERT_EQ(SS.getString(), "2");
-}
-
-TEST(MsgPackDocument, TestOutputYAMLMap) {
-  Document Doc;
-  auto M = Doc.getRoot().getMap(/*Convert=*/true);
-  M["foo"] = 1;
-  M["bar"] = 2U;
-  auto N = Doc.getMapNode();
-  M["qux"] = N;
-  N["baz"] = true;
-  std::string Buffer;
-  raw_string_ostream OStream(Buffer);
-  Doc.toYAML(OStream);
-  ASSERT_EQ(OStream.str(), "---\n"
-                           "bar:             2\n"
-                           "foo:             1\n"
-                           "qux:\n"
-                           "  baz:             true\n"
-                           "...\n");
-}
-
-TEST(MsgPackDocument, TestOutputYAMLMapWithErase) {
-  Document Doc;
-  auto M = Doc.getRoot().getMap(/*Convert=*/true);
-  M["foo"] = 1;
-  M["bar"] = 2U;
-  auto N = Doc.getMapNode();
-  M["qux"] = N;
-  N["baz"] = true;
-  M.erase(Doc.getNode("bar"));
-  std::string Buffer;
-  raw_string_ostream OStream(Buffer);
-  Doc.toYAML(OStream);
-  ASSERT_EQ(OStream.str(), "---\n"
-                           "foo:             1\n"
-                           "qux:\n"
-                           "  baz:             true\n"
-                           "...\n");
-}
-
-TEST(MsgPackDocument, TestOutputYAMLMapHex) {
-  Document Doc;
-  Doc.setHexMode();
-  auto M = Doc.getRoot().getMap(/*Convert=*/true);
-  M["foo"] = 1;
-  M["bar"] = 2U;
-  auto N = Doc.getMapNode();
-  M["qux"] = N;
-  N["baz"] = true;
-  std::string Buffer;
-  raw_string_ostream OStream(Buffer);
-  Doc.toYAML(OStream);
-  ASSERT_EQ(OStream.str(), "---\n"
-                           "bar:             0x2\n"
-                           "foo:             1\n"
-                           "qux:\n"
-                           "  baz:             true\n"
-                           "...\n");
-}
-
-TEST(MsgPackDocument, TestInputYAMLMap) {
-  Document Doc;
-  bool Ok = Doc.fromYAML("---\nfoo: !int 0x1\nbaz: !str 2\n...\n");
-  ASSERT_TRUE(Ok);
-  ASSERT_EQ(Doc.getRoot().getKind(), Type::Map);
-  auto M = Doc.getRoot().getMap();
-  ASSERT_EQ(M.size(), 2u);
-  auto SI = M["foo"];
-  ASSERT_EQ(SI.getKind(), Type::UInt);
-  ASSERT_EQ(SI.getUInt(), 1u);
-  auto SS = M["baz"];
-  ASSERT_EQ(SS.getKind(), Type::String);
-  ASSERT_EQ(SS.getString(), "2");
-}
diff --git a/gnu/llvm/llvm/unittests/BinaryFormat/MsgPackReaderTest.cpp b/gnu/llvm/llvm/unittests/BinaryFormat/MsgPackReaderTest.cpp
deleted file mode 100644
index 06ae8b080d3..00000000000
--- a/gnu/llvm/llvm/unittests/BinaryFormat/MsgPackReaderTest.cpp
+++ /dev/null
@@ -1,890 +0,0 @@
-//===- MsgPackReaderTest.cpp ------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/BinaryFormat/MsgPackReader.h"
-#include "llvm/BinaryFormat/MsgPack.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::msgpack;
-
-struct MsgPackReader : testing::Test {
-  std::string Buffer;
-  Object Obj;
-};
-
-TEST_F(MsgPackReader, TestReadMultiple) {
-  Buffer = "\xc0\xc2";
-  Reader MPReader(Buffer);
-  {
-    auto ContinueOrErr = MPReader.read(Obj);
-    EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-    EXPECT_TRUE(*ContinueOrErr);
-    EXPECT_EQ(Obj.Kind, Type::Nil);
-  }
-  {
-    auto ContinueOrErr = MPReader.read(Obj);
-    EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-    EXPECT_TRUE(*ContinueOrErr);
-    EXPECT_EQ(Obj.Kind, Type::Boolean);
-    EXPECT_EQ(Obj.Bool, false);
-  }
-  {
-    auto ContinueOrErr = MPReader.read(Obj);
-    EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-    EXPECT_FALSE(*ContinueOrErr);
-  }
-}
-
-TEST_F(MsgPackReader, TestReadNil) {
-  Buffer = "\xc0";
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Nil);
-}
-
-TEST_F(MsgPackReader, TestReadBoolFalse) {
-  Buffer = "\xc2";
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Boolean);
-  EXPECT_EQ(Obj.Bool, false);
-}
-
-TEST_F(MsgPackReader, TestReadBoolTrue) {
-  Buffer = "\xc3";
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Boolean);
-  EXPECT_EQ(Obj.Bool, true);
-}
-
-TEST_F(MsgPackReader, TestReadFixNegativeInt) {
-  // Positive values will be written in a UInt form, so max FixNegativeInt is -1
-  //
-  // FixNegativeInt form bitpattern starts with 111, so min FixNegativeInt
-  // is 11100000 = -32
-  for (int8_t i = -1; i >= -32; --i) {
-    Buffer.assign(1, static_cast<char>(i));
-    Reader MPReader(Buffer);
-    auto ContinueOrErr = MPReader.read(Obj);
-    EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-    EXPECT_TRUE(*ContinueOrErr);
-    EXPECT_EQ(Obj.Kind, Type::Int);
-    EXPECT_EQ(Obj.Int, i);
-  }
-}
-
-TEST_F(MsgPackReader, TestReadInt8Max) {
-  Buffer = "\xd0\x7f";
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Int);
-  EXPECT_EQ(Obj.Int, INT8_MAX);
-}
-
-TEST_F(MsgPackReader, TestReadInt8Zero) {
-  Buffer.assign("\xd0\x00", 2);
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Int);
-  EXPECT_EQ(Obj.Int, 0);
-}
-
-TEST_F(MsgPackReader, TestReadInt8Min) {
-  Buffer = "\xd0\x80";
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Int);
-  EXPECT_EQ(Obj.Int, INT8_MIN);
-}
-
-TEST_F(MsgPackReader, TestReadInt16Max) {
-  Buffer = "\xd1\x7f\xff";
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Int);
-  EXPECT_EQ(Obj.Int, INT16_MAX);
-}
-
-TEST_F(MsgPackReader, TestReadInt16Zero) {
-  Buffer.assign("\xd1\x00\x00", 3);
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Int);
-  EXPECT_EQ(Obj.Int, 0);
-}
-
-TEST_F(MsgPackReader, TestReadInt16Min) {
-  Buffer.assign("\xd1\x80\x00", 3);
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Int);
-  EXPECT_EQ(Obj.Int, INT16_MIN);
-}
-
-TEST_F(MsgPackReader, TestReadInt32Max) {
-  Buffer = "\xd2\x7f\xff\xff\xff";
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Int);
-  EXPECT_EQ(Obj.Int, INT32_MAX);
-}
-
-TEST_F(MsgPackReader, TestReadInt32Zero) {
-  Buffer.assign("\xd2\x00\x00\x00\x00", 5);
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Int);
-  EXPECT_EQ(Obj.Int, 0);
-}
-
-TEST_F(MsgPackReader, TestReadInt32Min) {
-  Buffer.assign("\xd2\x80\x00\x00\x00", 5);
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Int);
-  EXPECT_EQ(Obj.Int, INT32_MIN);
-}
-
-TEST_F(MsgPackReader, TestReadInt64Max) {
-  Buffer = "\xd3\x7f\xff\xff\xff\xff\xff\xff\xff";
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Int);
-  EXPECT_EQ(Obj.Int, INT64_MAX);
-}
-
-TEST_F(MsgPackReader, TestReadInt64Zero) {
-  Buffer.assign("\xd3\x00\x00\x00\x00\x00\x00\x00\x00", 9);
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Int);
-  EXPECT_EQ(Obj.Int, 0);
-}
-
-TEST_F(MsgPackReader, TestReadInt64Min) {
-  Buffer.assign("\xd3\x80\x00\x00\x00\x00\x00\x00\x00", 9);
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Int);
-  EXPECT_EQ(Obj.Int, INT64_MIN);
-}
-
-TEST_F(MsgPackReader, TestReadFixPositiveInt) {
-  // FixPositiveInt form bitpattern starts with 0, so max FixPositiveInt
-  // is 01111111 = 127
-  for (uint64_t u = 0; u <= 127; ++u) {
-    Buffer.assign(1, static_cast<char>(u));
-    Reader MPReader(Buffer);
-    auto ContinueOrErr = MPReader.read(Obj);
-    EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-    EXPECT_TRUE(*ContinueOrErr);
-    EXPECT_EQ(Obj.Kind, Type::UInt);
-    EXPECT_EQ(Obj.UInt, u);
-  }
-}
-
-TEST_F(MsgPackReader, TestReadUInt8Zero) {
-  Buffer.assign("\xcc\x00", 2);
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::UInt);
-  EXPECT_EQ(Obj.UInt, 0u);
-}
-
-TEST_F(MsgPackReader, TestReadUInt8One) {
-  Buffer = "\xcc\x01";
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::UInt);
-  EXPECT_EQ(Obj.UInt, 1u);
-}
-
-TEST_F(MsgPackReader, TestReadUInt8Max) {
-  Buffer = "\xcc\xff";
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::UInt);
-  EXPECT_EQ(Obj.UInt, static_cast<uint8_t>(UINT8_MAX));
-}
-
-TEST_F(MsgPackReader, TestReadUInt16Zero) {
-  Buffer.assign("\xcd\x00\x00", 3);
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::UInt);
-  EXPECT_EQ(Obj.UInt, 0u);
-}
-
-TEST_F(MsgPackReader, TestReadUInt16One) {
-  Buffer.assign("\xcd\x00\x01", 3);
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::UInt);
-  EXPECT_EQ(Obj.UInt, 1u);
-}
-
-TEST_F(MsgPackReader, TestReadUInt16Max) {
-  Buffer = "\xcd\xff\xff";
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::UInt);
-  EXPECT_EQ(Obj.UInt, static_cast<uint16_t>(UINT16_MAX));
-}
-
-TEST_F(MsgPackReader, TestReadUInt32Zero) {
-  Buffer.assign("\xce\x00\x00\x00\x00", 5);
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::UInt);
-  EXPECT_EQ(Obj.UInt, 0u);
-}
-
-TEST_F(MsgPackReader, TestReadUInt32One) {
-  Buffer.assign("\xce\x00\x00\x00\x01", 5);
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::UInt);
-  EXPECT_EQ(Obj.UInt, 1u);
-}
-
-TEST_F(MsgPackReader, TestReadUInt32Max) {
-  Buffer = "\xce\xff\xff\xff\xff";
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::UInt);
-  EXPECT_EQ(Obj.UInt, static_cast<uint32_t>(UINT32_MAX));
-}
-
-TEST_F(MsgPackReader, TestReadUInt64Zero) {
-  Buffer.assign("\xcf\x00\x00\x00\x00\x00\x00\x00\x00", 9);
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::UInt);
-  EXPECT_EQ(Obj.UInt, 0u);
-}
-
-TEST_F(MsgPackReader, TestReadUInt64One) {
-  Buffer.assign("\xcf\x00\x00\x00\x00\x00\x00\x00\x01", 9);
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::UInt);
-  EXPECT_EQ(Obj.UInt, 1u);
-}
-
-TEST_F(MsgPackReader, TestReadUInt64Max) {
-  Buffer = "\xcf\xff\xff\xff\xff\xff\xff\xff\xff";
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::UInt);
-  EXPECT_EQ(Obj.UInt, static_cast<uint64_t>(UINT64_MAX));
-}
-
-TEST_F(MsgPackReader, TestReadFloat32) {
-  Buffer = "\xca\xee\xee\xee\xef";
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Float);
-  EXPECT_EQ(Obj.Float, -3.6973142664068907e+28f);
-}
-
-TEST_F(MsgPackReader, TestReadFloat64) {
-  Buffer = "\xcb\xee\xee\xee\xee\xee\xee\xee\xef";
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Float);
-  EXPECT_EQ(Obj.Float, -2.2899894549927042e+226);
-}
-
-TEST_F(MsgPackReader, TestReadFixStrZero) {
-  Buffer = "\xa0";
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::String);
-  EXPECT_EQ(Obj.Raw, StringRef());
-}
-
-TEST_F(MsgPackReader, TestReadFixStrOne) {
-  std::string Result(1, 'a');
-  Buffer = std::string("\xa1") + Result;
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::String);
-  EXPECT_EQ(Obj.Raw, Result);
-}
-
-TEST_F(MsgPackReader, TestReadFixStrMax) {
-  // FixStr format's size is a 5 bit unsigned integer, so max is 11111 = 31
-  std::string Result(31, 'a');
-  Buffer = std::string("\xbf") + Result;
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::String);
-  EXPECT_EQ(Obj.Raw, Result);
-}
-
-TEST_F(MsgPackReader, TestReadStr8Zero) {
-  Buffer.assign("\xd9\x00", 2);
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::String);
-  EXPECT_EQ(Obj.Raw, StringRef());
-}
-
-TEST_F(MsgPackReader, TestReadStr8One) {
-  std::string Result(1, 'a');
-  Buffer = std::string("\xd9\x01") + Result;
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::String);
-  EXPECT_EQ(Obj.Raw, Result);
-}
-
-TEST_F(MsgPackReader, TestReadStr8Max) {
-  std::string Result(UINT8_MAX, 'a');
-  Buffer = std::string("\xd9\xff") + Result;
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::String);
-  EXPECT_EQ(Obj.Raw, Result);
-}
-
-TEST_F(MsgPackReader, TestReadStr16Zero) {
-  Buffer.assign("\xda\x00\x00", 3);
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::String);
-  EXPECT_EQ(Obj.Raw, StringRef());
-}
-
-TEST_F(MsgPackReader, TestReadStr16One) {
-  std::string Result(1, 'a');
-  Buffer = std::string("\xda\x00\x01", 3) + Result;
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::String);
-  EXPECT_EQ(Obj.Raw, Result);
-}
-
-TEST_F(MsgPackReader, TestReadStr16Max) {
-  std::string Result(UINT16_MAX, 'a');
-  Buffer = std::string("\xda\xff\xff") + Result;
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::String);
-  EXPECT_EQ(Obj.Raw, Result);
-}
-
-TEST_F(MsgPackReader, TestReadStr32Zero) {
-  Buffer.assign("\xdb\x00\x00\x00\x00", 5);
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::String);
-  EXPECT_EQ(Obj.Raw, StringRef());
-}
-
-TEST_F(MsgPackReader, TestReadStr32One) {
-  std::string Result(1, 'a');
-  Buffer = std::string("\xdb\x00\x00\x00\x01", 5) + Result;
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::String);
-  EXPECT_EQ(Obj.Raw, Result);
-}
-
-TEST_F(MsgPackReader, TestReadStr32Max) {
-  std::string Result(static_cast<uint32_t>(UINT16_MAX) + 1, 'a');
-  Buffer = std::string("\xdb\x00\x01\x00\x00", 5) + Result;
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::String);
-  EXPECT_EQ(Obj.Raw, Result);
-}
-
-TEST_F(MsgPackReader, TestReadBin8Zero) {
-  Buffer.assign("\xc4\x00", 2);
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Binary);
-  EXPECT_EQ(Obj.Raw, StringRef());
-}
-
-TEST_F(MsgPackReader, TestReadBin8One) {
-  std::string Result(1, 'a');
-  Buffer = std::string("\xc4\x01") + Result;
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Binary);
-  EXPECT_EQ(Obj.Raw, Result);
-}
-
-TEST_F(MsgPackReader, TestReadBin8Max) {
-  std::string Result(UINT8_MAX, 'a');
-  Buffer = std::string("\xc4\xff") + Result;
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Binary);
-  EXPECT_EQ(Obj.Raw, Result);
-}
-
-TEST_F(MsgPackReader, TestReadBin16Zero) {
-  Buffer.assign("\xc5\x00\x00", 3);
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Binary);
-  EXPECT_EQ(Obj.Raw, StringRef());
-}
-
-TEST_F(MsgPackReader, TestReadBin16One) {
-  std::string Result(1, 'a');
-  Buffer = std::string("\xc5\x00\x01", 3) + Result;
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Binary);
-  EXPECT_EQ(Obj.Raw, Result);
-}
-
-TEST_F(MsgPackReader, TestReadBin16Max) {
-  std::string Result(UINT16_MAX, 'a');
-  Buffer = std::string("\xc5\xff\xff") + Result;
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Binary);
-  EXPECT_EQ(Obj.Raw, Result);
-}
-
-TEST_F(MsgPackReader, TestReadBin32Zero) {
-  Buffer.assign("\xc6\x00\x00\x00\x00", 5);
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Binary);
-  EXPECT_EQ(Obj.Raw, StringRef());
-}
-
-TEST_F(MsgPackReader, TestReadBin32One) {
-  std::string Result(1, 'a');
-  Buffer = std::string("\xc6\x00\x00\x00\x01", 5) + Result;
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Binary);
-  EXPECT_EQ(Obj.Raw, Result);
-}
-
-TEST_F(MsgPackReader, TestReadBin32Max) {
-  std::string Result(static_cast<uint32_t>(UINT16_MAX) + 1, 'a');
-  Buffer = std::string("\xc6\x00\x01\x00\x00", 5) + Result;
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Binary);
-  EXPECT_EQ(Obj.Raw, Result);
-}
-
-TEST_F(MsgPackReader, TestReadFixArrayZero) {
-  Buffer = "\x90";
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Array);
-  EXPECT_EQ(Obj.Length, 0u);
-}
-
-TEST_F(MsgPackReader, TestReadFixArrayOne) {
-  Buffer = "\x91";
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Array);
-  EXPECT_EQ(Obj.Length, 1u);
-}
-
-TEST_F(MsgPackReader, TestReadFixArrayMax) {
-  Buffer = "\x9f";
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Array);
-  // FixArray format's size is a 4 bit unsigned integer, so max is 1111 = 15
-  EXPECT_EQ(Obj.Length, 15u);
-}
-
-TEST_F(MsgPackReader, TestReadArray16Zero) {
-  Buffer.assign("\xdc\x00\x00", 3);
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Array);
-  EXPECT_EQ(Obj.Length, 0u);
-}
-
-TEST_F(MsgPackReader, TestReadArray16One) {
-  Buffer.assign("\xdc\x00\x01", 3);
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Array);
-  EXPECT_EQ(Obj.Length, 1u);
-}
-
-TEST_F(MsgPackReader, TestReadArray16Max) {
-  Buffer = "\xdc\xff\xff";
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Array);
-  EXPECT_EQ(Obj.Length, static_cast<uint16_t>(UINT16_MAX));
-}
-
-TEST_F(MsgPackReader, TestReadArray32Zero) {
-  Buffer.assign("\xdd\x00\x00\x00\x00", 5);
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Array);
-  EXPECT_EQ(Obj.Length, 0u);
-}
-
-TEST_F(MsgPackReader, TestReadArray32One) {
-  Buffer.assign("\xdd\x00\x00\x00\x01", 5);
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Array);
-  EXPECT_EQ(Obj.Length, 1u);
-}
-
-TEST_F(MsgPackReader, TestReadArray32Max) {
-  Buffer = "\xdd\xff\xff\xff\xff";
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Array);
-  EXPECT_EQ(Obj.Length, static_cast<uint32_t>(UINT32_MAX));
-}
-
-TEST_F(MsgPackReader, TestReadFixMapZero) {
-  Buffer = "\x80";
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Map);
-  EXPECT_EQ(Obj.Length, 0u);
-}
-
-TEST_F(MsgPackReader, TestReadFixMapOne) {
-  Buffer = "\x81";
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Map);
-  EXPECT_EQ(Obj.Length, 1u);
-}
-
-TEST_F(MsgPackReader, TestReadFixMapMax) {
-  Buffer = "\x8f";
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Map);
-  // FixMap format's size is a 4 bit unsigned integer, so max is 1111 = 15
-  EXPECT_EQ(Obj.Length, 15u);
-}
-
-TEST_F(MsgPackReader, TestReadMap16Zero) {
-  Buffer.assign("\xde\x00\x00", 3);
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Map);
-  EXPECT_EQ(Obj.Length, 0u);
-}
-
-TEST_F(MsgPackReader, TestReadMap16One) {
-  Buffer.assign("\xde\x00\x01", 3);
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Map);
-  EXPECT_EQ(Obj.Length, 1u);
-}
-
-TEST_F(MsgPackReader, TestReadMap16Max) {
-  Buffer = "\xde\xff\xff";
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Map);
-  EXPECT_EQ(Obj.Length, static_cast<uint16_t>(UINT16_MAX));
-}
-
-TEST_F(MsgPackReader, TestReadMap32Zero) {
-  Buffer.assign("\xdf\x00\x00\x00\x00", 5);
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Map);
-  EXPECT_EQ(Obj.Length, 0u);
-}
-
-TEST_F(MsgPackReader, TestReadMap32One) {
-  Buffer.assign("\xdf\x00\x00\x00\x01", 5);
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Map);
-  EXPECT_EQ(Obj.Length, 1u);
-}
-
-TEST_F(MsgPackReader, TestReadMap32Max) {
-  Buffer = "\xdf\xff\xff\xff\xff";
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Map);
-  EXPECT_EQ(Obj.Length, static_cast<uint32_t>(UINT32_MAX));
-}
-
-// FixExt formats are only available for these specific lengths: 1, 2, 4, 8, 16
-
-TEST_F(MsgPackReader, TestReadFixExt1) {
-  std::string Result(1, 'a');
-  Buffer = std::string("\xd4\x01") + Result;
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Extension);
-  EXPECT_EQ(Obj.Extension.Type, 0x01);
-  EXPECT_EQ(Obj.Extension.Bytes, Result);
-}
-
-TEST_F(MsgPackReader, TestReadFixExt2) {
-  std::string Result(2, 'a');
-  Buffer = std::string("\xd5\x01") + Result;
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Extension);
-  EXPECT_EQ(Obj.Extension.Type, 0x01);
-  EXPECT_EQ(Obj.Extension.Bytes, Result);
-}
-
-TEST_F(MsgPackReader, TestReadFixExt4) {
-  std::string Result(4, 'a');
-  Buffer = std::string("\xd6\x01") + Result;
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Extension);
-  EXPECT_EQ(Obj.Extension.Type, 0x01);
-  EXPECT_EQ(Obj.Extension.Bytes, Result);
-}
-
-TEST_F(MsgPackReader, TestReadFixExt8) {
-  std::string Result(8, 'a');
-  Buffer = std::string("\xd7\x01") + Result;
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Extension);
-  EXPECT_EQ(Obj.Extension.Type, 0x01);
-  EXPECT_EQ(Obj.Extension.Bytes, Result);
-}
-
-TEST_F(MsgPackReader, TestReadFixExt16) {
-  std::string Result(16, 'a');
-  Buffer = std::string("\xd8\x01") + Result;
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Extension);
-  EXPECT_EQ(Obj.Extension.Type, 0x01);
-  EXPECT_EQ(Obj.Extension.Bytes, Result);
-}
-
-TEST_F(MsgPackReader, TestReadExt8Min) {
-  // There are fix variants for sizes 1 and 2
-  Buffer.assign("\xc7\x00\x01", 3);
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Extension);
-  EXPECT_EQ(Obj.Extension.Type, 0x01);
-  EXPECT_EQ(Obj.Extension.Bytes, StringRef());
-}
-
-TEST_F(MsgPackReader, TestReadExt8Max) {
-  std::string Result(UINT8_MAX, 'a');
-  Buffer = std::string("\xc7\xff\x01", 3) + Result;
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Extension);
-  EXPECT_EQ(Obj.Extension.Type, 0x01);
-  EXPECT_EQ(Obj.Extension.Bytes, Result);
-}
-
-TEST_F(MsgPackReader, TestReadExt16Min) {
-  std::string Result(static_cast<uint16_t>(UINT8_MAX) + 1, 'a');
-  Buffer = std::string("\xc8\x01\x00\x01", 4) + Result;
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Extension);
-  EXPECT_EQ(Obj.Extension.Type, 0x01);
-  EXPECT_EQ(Obj.Extension.Bytes, Result);
-}
-
-TEST_F(MsgPackReader, TestReadExt16Max) {
-  std::string Result(UINT16_MAX, 'a');
-  Buffer = std::string("\xc8\xff\xff\x01") + Result;
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Extension);
-  EXPECT_EQ(Obj.Extension.Type, 0x01);
-  EXPECT_EQ(Obj.Extension.Bytes, Result);
-}
-
-TEST_F(MsgPackReader, TestReadExt32Min) {
-  std::string Result(static_cast<uint32_t>(UINT16_MAX) + 1, 'a');
-  Buffer = std::string("\xc9\x00\x01\x00\x00\x01", 6) + Result;
-  Reader MPReader(Buffer);
-  auto ContinueOrErr = MPReader.read(Obj);
-  EXPECT_TRUE(static_cast<bool>(ContinueOrErr));
-  EXPECT_TRUE(*ContinueOrErr);
-  EXPECT_EQ(Obj.Kind, Type::Extension);
-  EXPECT_EQ(Obj.Extension.Type, 0x01);
-  EXPECT_EQ(Obj.Extension.Bytes, Result);
-}
diff --git a/gnu/llvm/llvm/unittests/BinaryFormat/MsgPackWriterTest.cpp b/gnu/llvm/llvm/unittests/BinaryFormat/MsgPackWriterTest.cpp
deleted file mode 100644
index 3a5ba9af08f..00000000000
--- a/gnu/llvm/llvm/unittests/BinaryFormat/MsgPackWriterTest.cpp
+++ /dev/null
@@ -1,522 +0,0 @@
-//===- MsgPackWriterTest.cpp ------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/BinaryFormat/MsgPackWriter.h"
-#include "llvm/BinaryFormat/MsgPack.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::msgpack;
-
-struct MsgPackWriter : testing::Test {
-  std::string Buffer;
-  llvm::raw_string_ostream OStream;
-  Writer MPWriter;
-
-  MsgPackWriter() : OStream(Buffer), MPWriter(OStream) {}
-};
-
-TEST_F(MsgPackWriter, TestWriteNil) {
-  MPWriter.writeNil();
-  EXPECT_EQ(OStream.str(), "\xc0");
-}
-
-TEST_F(MsgPackWriter, TestWriteBool) {
-  MPWriter.write(true);
-  MPWriter.write(false);
-  EXPECT_EQ(OStream.str(), "\xc3\xc2");
-}
-
-TEST_F(MsgPackWriter, TestWriteFixPositiveInt) {
-  // FixPositiveInt form bitpattern starts with 0, so max FixPositiveInt
-  // is 01111111 = 127
-  for (uint64_t u = 0; u <= 127; ++u) {
-    Buffer.clear();
-    MPWriter.write(u);
-    std::string Output = OStream.str();
-    EXPECT_EQ(Output.size(), 1u);
-    EXPECT_EQ(Output.data()[0], static_cast<uint8_t>(u));
-  }
-}
-
-TEST_F(MsgPackWriter, TestWriteUInt8Min) {
-  // See TestWriteFixPositiveInt for why 128 is the min non-fix Int8
-  uint64_t u = 128;
-  MPWriter.write(u);
-  EXPECT_EQ(OStream.str(), "\xcc\x80");
-}
-
-TEST_F(MsgPackWriter, TestWriteUInt8) {
-  uint64_t u = 221;
-  MPWriter.write(u);
-  EXPECT_EQ(OStream.str(), "\xcc\xdd");
-}
-
-TEST_F(MsgPackWriter, TestWriteUInt8Max) {
-  uint64_t u = UINT8_MAX;
-  MPWriter.write(u);
-  EXPECT_EQ(OStream.str(), "\xcc\xff");
-}
-
-TEST_F(MsgPackWriter, TestWriteUInt16Min) {
-  uint64_t u = static_cast<uint64_t>(UINT8_MAX) + 1;
-  MPWriter.write(u);
-  EXPECT_EQ(OStream.str(), std::string("\xcd\x01\x00", 3));
-}
-
-TEST_F(MsgPackWriter, TestWriteUInt16) {
-  uint64_t u = 43981;
-  MPWriter.write(u);
-  EXPECT_EQ(OStream.str(), "\xcd\xab\xcd");
-}
-
-TEST_F(MsgPackWriter, TestWriteUInt16Max) {
-  uint64_t u = UINT16_MAX;
-  MPWriter.write(u);
-  EXPECT_EQ(OStream.str(), "\xcd\xff\xff");
-}
-
-TEST_F(MsgPackWriter, TestWriteUInt32Min) {
-  uint64_t u = static_cast<uint64_t>(UINT16_MAX) + 1;
-  MPWriter.write(u);
-  EXPECT_EQ(OStream.str(), std::string("\xce\x00\x01\x00\x00", 5));
-}
-
-TEST_F(MsgPackWriter, TestWriteUInt32) {
-  uint64_t u = 2882400186;
-  MPWriter.write(u);
-  EXPECT_EQ(OStream.str(), "\xce\xab\xcd\xef\xba");
-}
-
-TEST_F(MsgPackWriter, TestWriteUInt32Max) {
-  uint64_t u = UINT32_MAX;
-  MPWriter.write(u);
-  EXPECT_EQ(OStream.str(), "\xce\xff\xff\xff\xff");
-}
-
-TEST_F(MsgPackWriter, TestWriteUInt64Min) {
-  uint64_t u = static_cast<uint64_t>(UINT32_MAX) + 1;
-  MPWriter.write(u);
-  EXPECT_EQ(OStream.str(),
-            std::string("\xcf\x00\x00\x00\x01\x00\x00\x00\x00", 9));
-}
-
-TEST_F(MsgPackWriter, TestWriteUInt64) {
-  uint64_t u = 0x010203040506074a;
-  MPWriter.write(u);
-  EXPECT_EQ(OStream.str(), "\xcf\x01\x02\x03\x04\x05\x06\x07\x4a");
-}
-
-TEST_F(MsgPackWriter, TestWriteUInt64Max) {
-  uint64_t u = UINT64_MAX;
-  MPWriter.write(u);
-  EXPECT_EQ(OStream.str(), "\xcf\xff\xff\xff\xff\xff\xff\xff\xff");
-}
-
-TEST_F(MsgPackWriter, TestWriteFixNegativeInt) {
-  // Positive values will be written in a UInt form, so max FixNegativeInt is -1
-  //
-  // FixNegativeInt form bitpattern starts with 111, so min FixNegativeInt
-  // is 11100000 = -32
-  for (int64_t i = -1; i >= -32; --i) {
-    Buffer.clear();
-    MPWriter.write(i);
-    std::string Output = OStream.str();
-    EXPECT_EQ(Output.size(), 1u);
-    EXPECT_EQ(static_cast<int8_t>(Output.data()[0]), static_cast<int8_t>(i));
-  }
-}
-
-TEST_F(MsgPackWriter, TestWriteInt8Max) {
-  // See TestWriteFixNegativeInt for why -33 is the max non-fix Int8
-  int64_t i = -33;
-  MPWriter.write(i);
-  EXPECT_EQ(OStream.str(), "\xd0\xdf");
-}
-
-TEST_F(MsgPackWriter, TestWriteInt8) {
-  int64_t i = -40;
-  MPWriter.write(i);
-  EXPECT_EQ(OStream.str(), "\xd0\xd8");
-}
-
-TEST_F(MsgPackWriter, TestWriteInt8Min) {
-  int64_t i = INT8_MIN;
-  MPWriter.write(i);
-  EXPECT_EQ(OStream.str(), "\xd0\x80");
-}
-
-TEST_F(MsgPackWriter, TestWriteInt16Max) {
-  int64_t i = static_cast<int64_t>(INT8_MIN) - 1;
-  MPWriter.write(i);
-  EXPECT_EQ(OStream.str(), "\xd1\xff\x7f");
-}
-
-TEST_F(MsgPackWriter, TestWriteInt16) {
-  int64_t i = -4369;
-  MPWriter.write(i);
-  EXPECT_EQ(OStream.str(), "\xd1\xee\xef");
-}
-
-TEST_F(MsgPackWriter, TestWriteInt16Min) {
-  int64_t i = INT16_MIN;
-  MPWriter.write(i);
-  EXPECT_EQ(OStream.str(), std::string("\xd1\x80\x00", 3));
-}
-
-TEST_F(MsgPackWriter, TestWriteInt32Max) {
-  int64_t i = static_cast<int64_t>(INT16_MIN) - 1;
-  MPWriter.write(i);
-  EXPECT_EQ(OStream.str(), "\xd2\xff\xff\x7f\xff");
-}
-
-TEST_F(MsgPackWriter, TestWriteInt32) {
-  int64_t i = -286331153;
-  MPWriter.write(i);
-  EXPECT_EQ(OStream.str(), "\xd2\xee\xee\xee\xef");
-}
-
-TEST_F(MsgPackWriter, TestWriteInt32Min) {
-  int64_t i = INT32_MIN;
-  MPWriter.write(i);
-  EXPECT_EQ(OStream.str(), std::string("\xd2\x80\x00\x00\x00", 5));
-}
-
-TEST_F(MsgPackWriter, TestWriteInt64Max) {
-  int64_t i = static_cast<int64_t>(INT32_MIN) - 1;
-  MPWriter.write(i);
-  EXPECT_EQ(OStream.str(), "\xd3\xff\xff\xff\xff\x7f\xff\xff\xff");
-}
-
-TEST_F(MsgPackWriter, TestWriteInt64) {
-  int64_t i = -1229782938247303441;
-  MPWriter.write(i);
-  EXPECT_EQ(OStream.str(), "\xd3\xee\xee\xee\xee\xee\xee\xee\xef");
-}
-
-TEST_F(MsgPackWriter, TestWriteInt64Min) {
-  int64_t i = INT64_MIN;
-  MPWriter.write(i);
-  EXPECT_EQ(OStream.str(),
-            std::string("\xd3\x80\x00\x00\x00\x00\x00\x00\x00", 9));
-}
-
-TEST_F(MsgPackWriter, TestWriteFloat32) {
-  float f = -3.6973142664068907e+28;
-  MPWriter.write(f);
-  EXPECT_EQ(OStream.str(), "\xca\xee\xee\xee\xef");
-}
-
-TEST_F(MsgPackWriter, TestWriteFloat64) {
-  double d = -2.2899894549927042e+226;
-  MPWriter.write(d);
-  EXPECT_EQ(OStream.str(), "\xcb\xee\xee\xee\xee\xee\xee\xee\xef");
-}
-
-TEST_F(MsgPackWriter, TestWriteFixStrMin) {
-  std::string s;
-  MPWriter.write(s);
-  EXPECT_EQ(OStream.str(), "\xa0");
-}
-
-TEST_F(MsgPackWriter, TestWriteFixStr) {
-  std::string s = "foo";
-  MPWriter.write(s);
-  EXPECT_EQ(OStream.str(), "\xa3"
-                           "foo");
-}
-
-TEST_F(MsgPackWriter, TestWriteFixStrMax) {
-  // FixStr format's size is a 5 bit unsigned integer, so max is 11111 = 31
-  std::string s(31, 'a');
-  MPWriter.write(s);
-  EXPECT_EQ(OStream.str(), std::string("\xbf") + s);
-}
-
-TEST_F(MsgPackWriter, TestWriteStr8Min) {
-  // See TestWriteFixStrMax for why 32 is the min non-fix Str8
-  std::string s(32, 'a');
-  MPWriter.write(s);
-  EXPECT_EQ(OStream.str(), std::string("\xd9\x20") + s);
-}
-
-TEST_F(MsgPackWriter, TestWriteStr8) {
-  std::string s(33, 'a');
-  MPWriter.write(s);
-  EXPECT_EQ(OStream.str(), std::string("\xd9\x21") + s);
-}
-
-TEST_F(MsgPackWriter, TestWriteStr8Max) {
-  std::string s(UINT8_MAX, 'a');
-  MPWriter.write(s);
-  EXPECT_EQ(OStream.str(), std::string("\xd9\xff") + s);
-}
-
-TEST_F(MsgPackWriter, TestWriteStr16Min) {
-  std::string s(static_cast<uint64_t>(UINT8_MAX) + 1, 'a');
-  MPWriter.write(s);
-  EXPECT_EQ(OStream.str(), std::string("\xda\x01\x00", 3) + s);
-}
-
-TEST_F(MsgPackWriter, TestWriteStr16) {
-  std::string s(511, 'a');
-  MPWriter.write(s);
-  EXPECT_EQ(OStream.str(), std::string("\xda\x01\xff") + s);
-}
-
-TEST_F(MsgPackWriter, TestWriteStr16Max) {
-  std::string s(UINT16_MAX, 'a');
-  MPWriter.write(s);
-  EXPECT_EQ(OStream.str(), std::string("\xda\xff\xff") + s);
-}
-
-TEST_F(MsgPackWriter, TestWriteStr32Min) {
-  std::string s(static_cast<uint64_t>(UINT16_MAX) + 1, 'a');
-  MPWriter.write(s);
-  EXPECT_EQ(OStream.str(), std::string("\xdb\x00\x01\x00\x00", 5) + s);
-}
-
-TEST_F(MsgPackWriter, TestWriteStr32) {
-  std::string s(131071, 'a');
-  MPWriter.write(s);
-  EXPECT_EQ(OStream.str(), std::string("\xdb\x00\x01\xff\xff", 5) + s);
-}
-
-TEST_F(MsgPackWriter, TestWriteBin8Min) {
-  std::string s;
-  MPWriter.write(MemoryBufferRef(s, ""));
-  EXPECT_EQ(OStream.str(), std::string("\xc4\x00", 2) + s);
-}
-
-TEST_F(MsgPackWriter, TestWriteBin8) {
-  std::string s(5, 'a');
-  MPWriter.write(MemoryBufferRef(s, ""));
-  EXPECT_EQ(OStream.str(), std::string("\xc4\x05") + s);
-}
-
-TEST_F(MsgPackWriter, TestWriteBin8Max) {
-  std::string s(UINT8_MAX, 'a');
-  MPWriter.write(MemoryBufferRef(s, ""));
-  EXPECT_EQ(OStream.str(), std::string("\xc4\xff") + s);
-}
-
-TEST_F(MsgPackWriter, TestWriteBin16Min) {
-  std::string s(static_cast<uint64_t>(UINT8_MAX) + 1, 'a');
-  MPWriter.write(MemoryBufferRef(s, ""));
-  EXPECT_EQ(OStream.str(), std::string("\xc5\x01\x00", 3) + s);
-}
-
-TEST_F(MsgPackWriter, TestWriteBin16) {
-  std::string s(511, 'a');
-  MPWriter.write(MemoryBufferRef(s, ""));
-  EXPECT_EQ(OStream.str(), "\xc5\x01\xff" + s);
-}
-
-TEST_F(MsgPackWriter, TestWriteBin16Max) {
-  std::string s(UINT16_MAX, 'a');
-  MPWriter.write(MemoryBufferRef(s, ""));
-  EXPECT_EQ(OStream.str(), std::string("\xc5\xff\xff") + s);
-}
-
-TEST_F(MsgPackWriter, TestWriteBin32Min) {
-  std::string s(static_cast<uint64_t>(UINT16_MAX) + 1, 'a');
-  MPWriter.write(MemoryBufferRef(s, ""));
-  EXPECT_EQ(OStream.str(), std::string("\xc6\x00\x01\x00\x00", 5) + s);
-}
-
-TEST_F(MsgPackWriter, TestWriteBin32) {
-  std::string s(131071, 'a');
-  MPWriter.write(MemoryBufferRef(s, ""));
-  EXPECT_EQ(OStream.str(), std::string("\xc6\x00\x01\xff\xff", 5) + s);
-}
-
-TEST_F(MsgPackWriter, TestWriteFixArrayMin) {
-  MPWriter.writeArraySize(0);
-  EXPECT_EQ(OStream.str(), "\x90");
-}
-
-TEST_F(MsgPackWriter, TestWriteFixArray) {
-  MPWriter.writeArraySize(4);
-  EXPECT_EQ(OStream.str(), "\x94");
-}
-
-TEST_F(MsgPackWriter, TestWriteFixArrayMax) {
-  // FixArray format's size is a 4 bit unsigned integer, so max is 1111 = 15
-  MPWriter.writeArraySize(15);
-  EXPECT_EQ(OStream.str(), "\x9f");
-}
-
-TEST_F(MsgPackWriter, TestWriteArray16Min) {
-  // See TestWriteFixArrayMax for why 16 is the min non-fix Array16
-  MPWriter.writeArraySize(16);
-  EXPECT_EQ(OStream.str(), std::string("\xdc\x00\x10", 3));
-}
-
-TEST_F(MsgPackWriter, TestWriteArray16) {
-  MPWriter.writeArraySize(273);
-  EXPECT_EQ(OStream.str(), "\xdc\x01\x11");
-}
-
-TEST_F(MsgPackWriter, TestWriteArray16Max) {
-  MPWriter.writeArraySize(UINT16_MAX);
-  EXPECT_EQ(OStream.str(), "\xdc\xff\xff");
-}
-
-TEST_F(MsgPackWriter, TestWriteArray32Min) {
-  MPWriter.writeArraySize(static_cast<uint64_t>(UINT16_MAX) + 1);
-  EXPECT_EQ(OStream.str(), std::string("\xdd\x00\x01\x00\x00", 5));
-}
-
-TEST_F(MsgPackWriter, TestWriteArray32) {
-  MPWriter.writeArraySize(131071);
-  EXPECT_EQ(OStream.str(), std::string("\xdd\x00\x01\xff\xff", 5));
-}
-
-TEST_F(MsgPackWriter, TestWriteArray32Max) {
-  MPWriter.writeArraySize(UINT32_MAX);
-  EXPECT_EQ(OStream.str(), "\xdd\xff\xff\xff\xff");
-}
-
-TEST_F(MsgPackWriter, TestWriteFixMapMin) {
-  MPWriter.writeMapSize(0);
-  EXPECT_EQ(OStream.str(), "\x80");
-}
-
-TEST_F(MsgPackWriter, TestWriteFixMap) {
-  MPWriter.writeMapSize(4);
-  EXPECT_EQ(OStream.str(), "\x84");
-}
-
-TEST_F(MsgPackWriter, TestWriteFixMapMax) {
-  // FixMap format's size is a 4 bit unsigned integer, so max is 1111 = 15
-  MPWriter.writeMapSize(15);
-  EXPECT_EQ(OStream.str(), "\x8f");
-}
-
-TEST_F(MsgPackWriter, TestWriteMap16Min) {
-  // See TestWriteFixMapMax for why 16 is the min non-fix Map16
-  MPWriter.writeMapSize(16);
-  EXPECT_EQ(OStream.str(), std::string("\xde\x00\x10", 3));
-}
-
-TEST_F(MsgPackWriter, TestWriteMap16) {
-  MPWriter.writeMapSize(273);
-  EXPECT_EQ(OStream.str(), "\xde\x01\x11");
-}
-
-TEST_F(MsgPackWriter, TestWriteMap16Max) {
-  MPWriter.writeMapSize(UINT16_MAX);
-  EXPECT_EQ(OStream.str(), "\xde\xff\xff");
-}
-
-TEST_F(MsgPackWriter, TestWriteMap32Min) {
-  MPWriter.writeMapSize(static_cast<uint64_t>(UINT16_MAX) + 1);
-  EXPECT_EQ(OStream.str(), std::string("\xdf\x00\x01\x00\x00", 5));
-}
-
-TEST_F(MsgPackWriter, TestWriteMap32) {
-  MPWriter.writeMapSize(131071);
-  EXPECT_EQ(OStream.str(), std::string("\xdf\x00\x01\xff\xff", 5));
-}
-
-TEST_F(MsgPackWriter, TestWriteMap32Max) {
-  MPWriter.writeMapSize(UINT32_MAX);
-  EXPECT_EQ(OStream.str(), std::string("\xdf\xff\xff\xff\xff", 5));
-}
-
-// FixExt formats are only available for these specific lengths: 1, 2, 4, 8, 16
-
-TEST_F(MsgPackWriter, TestWriteFixExt1) {
-  std::string s(1, 'a');
-  MPWriter.writeExt(0x01, MemoryBufferRef(s, ""));
-  EXPECT_EQ(OStream.str(), std::string("\xd4\x01") + s);
-}
-
-TEST_F(MsgPackWriter, TestWriteFixExt2) {
-  std::string s(2, 'a');
-  MPWriter.writeExt(0x01, MemoryBufferRef(s, ""));
-  EXPECT_EQ(OStream.str(), std::string("\xd5\x01") + s);
-}
-
-TEST_F(MsgPackWriter, TestWriteFixExt4) {
-  std::string s(4, 'a');
-  MPWriter.writeExt(0x01, MemoryBufferRef(s, ""));
-  EXPECT_EQ(OStream.str(), std::string("\xd6\x01") + s);
-}
-
-TEST_F(MsgPackWriter, TestWriteFixExt8) {
-  std::string s(8, 'a');
-  MPWriter.writeExt(0x01, MemoryBufferRef(s, ""));
-  EXPECT_EQ(OStream.str(), std::string("\xd7\x01") + s);
-}
-
-TEST_F(MsgPackWriter, TestWriteFixExt16) {
-  std::string s(16, 'a');
-  MPWriter.writeExt(0x01, MemoryBufferRef(s, ""));
-  EXPECT_EQ(OStream.str(), std::string("\xd8\x01") + s);
-}
-
-TEST_F(MsgPackWriter, TestWriteExt8Min) {
-  std::string s;
-  MPWriter.writeExt(0x01, MemoryBufferRef(s, ""));
-  EXPECT_EQ(OStream.str(), std::string("\xc7\x00\x01", 3) + s);
-}
-
-TEST_F(MsgPackWriter, TestWriteExt8) {
-  std::string s(0x2a, 'a');
-  MPWriter.writeExt(0x01, MemoryBufferRef(s, ""));
-  EXPECT_EQ(OStream.str(), std::string("\xc7\x2a\x01") + s);
-}
-
-TEST_F(MsgPackWriter, TestWriteExt8Max) {
-  std::string s(UINT8_MAX, 'a');
-  MPWriter.writeExt(0x01, MemoryBufferRef(s, ""));
-  EXPECT_EQ(OStream.str(), std::string("\xc7\xff\x01") + s);
-}
-
-TEST_F(MsgPackWriter, TestWriteExt16Min) {
-  std::string s(static_cast<uint16_t>(UINT8_MAX) + 1, 'a');
-  MPWriter.writeExt(0x02, MemoryBufferRef(s, ""));
-  EXPECT_EQ(OStream.str(), std::string("\xc8\x01\x00\x02", 4) + s);
-}
-
-TEST_F(MsgPackWriter, TestWriteExt16) {
-  std::string s(273, 'a');
-  MPWriter.writeExt(0x01, MemoryBufferRef(s, ""));
-  EXPECT_EQ(OStream.str(), std::string("\xc8\x01\x11\x01") + s);
-}
-
-TEST_F(MsgPackWriter, TestWriteExt16Max) {
-  std::string s(UINT16_MAX, 'a');
-  MPWriter.writeExt(0x01, MemoryBufferRef(s, ""));
-  EXPECT_EQ(OStream.str(), std::string("\xc8\xff\xff\x01") + s);
-}
-
-TEST_F(MsgPackWriter, TestWriteExt32Min) {
-  std::string s(static_cast<uint32_t>(UINT16_MAX) + 1, 'a');
-  MPWriter.writeExt(0x02, MemoryBufferRef(s, ""));
-  EXPECT_EQ(OStream.str(), std::string("\xc9\x00\x01\x00\x00\x02", 6) + s);
-}
-
-TEST_F(MsgPackWriter, TestWriteCompatibleNoStr8) {
-  Writer CompatWriter(OStream, true);
-  std::string s(32, 'a');
-  CompatWriter.write(s);
-  EXPECT_EQ(OStream.str(), std::string("\xda\x00\x20", 3) + s);
-}
-
-TEST_F(MsgPackWriter, TestWriteCompatibleNoBin) {
-  Writer CompatWriter(OStream, true);
-  std::string s;
-
-#ifdef GTEST_HAS_DEATH_TEST
-#ifndef NDEBUG
-  EXPECT_DEATH(CompatWriter.write(MemoryBufferRef(s, "")), "compatible mode");
-#endif
-#endif
-}
diff --git a/gnu/llvm/llvm/unittests/BinaryFormat/TestFileMagic.cpp b/gnu/llvm/llvm/unittests/BinaryFormat/TestFileMagic.cpp
deleted file mode 100644
index 81c5f08cdaf..00000000000
--- a/gnu/llvm/llvm/unittests/BinaryFormat/TestFileMagic.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-//===- llvm/unittest/BinaryFormat/TestFileMagic.cpp - File magic tests ----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/SmallString.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/BinaryFormat/Magic.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/Path.h"
-
-#include "gtest/gtest.h"
-
-using namespace llvm;
-namespace fs = llvm::sys::fs;
-
-#define ASSERT_NO_ERROR(x)                                                     \
-  if (std::error_code ASSERT_NO_ERROR_ec = x) {                                \
-    SmallString<128> MessageStorage;                                           \
-    raw_svector_ostream Message(MessageStorage);                               \
-    Message << #x ": did not return errc::success.\n"                          \
-            << "error number: " << ASSERT_NO_ERROR_ec.value() << "\n"          \
-            << "error message: " << ASSERT_NO_ERROR_ec.message() << "\n";      \
-    GTEST_FATAL_FAILURE_(MessageStorage.c_str());                              \
-  } else {                                                                     \
-  }
-
-class MagicTest : public testing::Test {
-protected:
-  /// Unique temporary directory in which all created filesystem entities must
-  /// be placed. It is removed at the end of each test (must be empty).
-  SmallString<128> TestDirectory;
-
-  void SetUp() override {
-    ASSERT_NO_ERROR(
-        fs::createUniqueDirectory("file-system-test", TestDirectory));
-    // We don't care about this specific file.
-    errs() << "Test Directory: " << TestDirectory << '\n';
-    errs().flush();
-  }
-
-  void TearDown() override { ASSERT_NO_ERROR(fs::remove(TestDirectory.str())); }
-};
-
-const char archive[] = "!<arch>\x0A";
-const char bitcode[] = "\xde\xc0\x17\x0b";
-const char coff_object[] = "\x00\x00......";
-const char coff_bigobj[] =
-    "\x00\x00\xff\xff\x00\x02......"
-    "\xc7\xa1\xba\xd1\xee\xba\xa9\x4b\xaf\x20\xfa\xf6\x6a\xa4\xdc\xb8";
-const char coff_import_library[] = "\x00\x00\xff\xff....";
-const char elf_relocatable[] = {0x7f, 'E', 'L', 'F', 1, 2, 1, 0, 0,
-                                0,    0,   0,   0,   0, 0, 0, 0, 1};
-
-const char goff_object[] = "\x03\xF0\x00";
-const char macho_universal_binary[] = "\xca\xfe\xba\xbe...\x00";
-const char macho_object[] =
-    "\xfe\xed\xfa\xce........\x00\x00\x00\x01............";
-const char macho_executable[] =
-    "\xfe\xed\xfa\xce........\x00\x00\x00\x02............";
-const char macho_fixed_virtual_memory_shared_lib[] =
-    "\xfe\xed\xfa\xce........\x00\x00\x00\x03............";
-const char macho_core[] =
-    "\xfe\xed\xfa\xce........\x00\x00\x00\x04............";
-const char macho_preload_executable[] =
-    "\xfe\xed\xfa\xce........\x00\x00\x00\x05............";
-const char macho_dynamically_linked_shared_lib[] =
-    "\xfe\xed\xfa\xce........\x00\x00\x00\x06............";
-const char macho_dynamic_linker[] =
-    "\xfe\xed\xfa\xce........\x00\x00\x00\x07............";
-const char macho_bundle[] =
-    "\xfe\xed\xfa\xce........\x00\x00\x00\x08............";
-const char macho_dsym_companion[] =
-    "\xfe\xed\xfa\xce........\x00\x00\x00\x0a............";
-const char macho_kext_bundle[] =
-    "\xfe\xed\xfa\xce........\x00\x00\x00\x0b............";
-const char windows_resource[] =
-    "\x00\x00\x00\x00\x020\x00\x00\x00\xff\xff\x00\x00\xff\xff\x00\x00";
-const char macho_dynamically_linked_shared_lib_stub[] =
-    "\xfe\xed\xfa\xce........\x00\x00\x00\x09............";
-const char ms_dos_stub_broken[] = "\x4d\x5a\x20\x20";
-const char pdb[] = "Microsoft C/C++ MSF 7.00\r\n\x1a"
-                   "DS\x00\x00\x00";
-const char tapi_file[] = "--- !tapi-tbd-v1\n";
-const char tapi_file_tbd_v1[] = "---\narchs: [";
-
-TEST_F(MagicTest, Magic) {
-  struct type {
-    const char *filename;
-    const char *magic_str;
-    size_t magic_str_len;
-    file_magic magic;
-  } types[] = {
-#define DEFINE(magic) {#magic, magic, sizeof(magic), file_magic::magic}
-      DEFINE(archive),
-      DEFINE(bitcode),
-      DEFINE(coff_object),
-      {"coff_bigobj", coff_bigobj, sizeof(coff_bigobj),
-       file_magic::coff_object},
-      DEFINE(coff_import_library),
-      DEFINE(elf_relocatable),
-      DEFINE(goff_object),
-      DEFINE(macho_universal_binary),
-      DEFINE(macho_object),
-      DEFINE(macho_executable),
-      DEFINE(macho_fixed_virtual_memory_shared_lib),
-      DEFINE(macho_core),
-      DEFINE(macho_preload_executable),
-      DEFINE(macho_dynamically_linked_shared_lib),
-      DEFINE(macho_dynamic_linker),
-      DEFINE(macho_bundle),
-      DEFINE(macho_dynamically_linked_shared_lib_stub),
-      DEFINE(macho_dsym_companion),
-      DEFINE(macho_kext_bundle),
-      DEFINE(windows_resource),
-      DEFINE(pdb),
-      {"ms_dos_stub_broken", ms_dos_stub_broken, sizeof(ms_dos_stub_broken),
-       file_magic::unknown},
-      DEFINE(tapi_file),
-      {"tapi_file_tbd_v1", tapi_file_tbd_v1, sizeof(tapi_file_tbd_v1),
-       file_magic::tapi_file},
-#undef DEFINE
-  };
-
-  // Create some files filled with magic.
-  for (type *i = types, *e = types + (sizeof(types) / sizeof(type)); i != e;
-       ++i) {
-    SmallString<128> file_pathname(TestDirectory);
-    llvm::sys::path::append(file_pathname, i->filename);
-    std::error_code EC;
-    raw_fd_ostream file(file_pathname, EC, sys::fs::OF_None);
-    ASSERT_FALSE(file.has_error());
-    StringRef magic(i->magic_str, i->magic_str_len);
-    file << magic;
-    file.close();
-    EXPECT_EQ(i->magic, identify_magic(magic));
-    ASSERT_NO_ERROR(fs::remove(Twine(file_pathname)));
-  }
-}
diff --git a/gnu/llvm/llvm/unittests/Bitcode/BitReaderTest.cpp b/gnu/llvm/llvm/unittests/Bitcode/BitReaderTest.cpp
deleted file mode 100644
index c4f9b672ac9..00000000000
--- a/gnu/llvm/llvm/unittests/Bitcode/BitReaderTest.cpp
+++ /dev/null
@@ -1,258 +0,0 @@
-//===- llvm/unittest/Bitcode/BitReaderTest.cpp - Tests for BitReader ------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/SmallString.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/Bitcode/BitcodeReader.h"
-#include "llvm/Bitcode/BitcodeWriter.h"
-#include "llvm/IR/InstrTypes.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/Verifier.h"
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/Error.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-std::unique_ptr<Module> parseAssembly(LLVMContext &Context,
-                                      const char *Assembly) {
-  SMDiagnostic Error;
-  std::unique_ptr<Module> M = parseAssemblyString(Assembly, Error, Context);
-
-  std::string ErrMsg;
-  raw_string_ostream OS(ErrMsg);
-  Error.print("", OS);
-
-  // A failure here means that the test itself is buggy.
-  if (!M)
-    report_fatal_error(OS.str().c_str());
-
-  return M;
-}
-
-static void writeModuleToBuffer(std::unique_ptr<Module> Mod,
-                                SmallVectorImpl<char> &Buffer) {
-  raw_svector_ostream OS(Buffer);
-  WriteBitcodeToFile(*Mod, OS);
-}
-
-static std::unique_ptr<Module> getLazyModuleFromAssembly(LLVMContext &Context,
-                                                         SmallString<1024> &Mem,
-                                                         const char *Assembly) {
-  writeModuleToBuffer(parseAssembly(Context, Assembly), Mem);
-  Expected<std::unique_ptr<Module>> ModuleOrErr =
-      getLazyBitcodeModule(MemoryBufferRef(Mem.str(), "test"), Context);
-  if (!ModuleOrErr)
-    report_fatal_error("Could not parse bitcode module");
-  return std::move(ModuleOrErr.get());
-}
-
-// Tests that lazy evaluation can parse functions out of order.
-TEST(BitReaderTest, MaterializeFunctionsOutOfOrder) {
-  SmallString<1024> Mem;
-  LLVMContext Context;
-  std::unique_ptr<Module> M = getLazyModuleFromAssembly(
-      Context, Mem, "define void @f() {\n"
-                    "  unreachable\n"
-                    "}\n"
-                    "define void @g() {\n"
-                    "  unreachable\n"
-                    "}\n"
-                    "define void @h() {\n"
-                    "  unreachable\n"
-                    "}\n"
-                    "define void @j() {\n"
-                    "  unreachable\n"
-                    "}\n");
-  EXPECT_FALSE(verifyModule(*M, &dbgs()));
-
-  Function *F = M->getFunction("f");
-  Function *G = M->getFunction("g");
-  Function *H = M->getFunction("h");
-  Function *J = M->getFunction("j");
-
-  // Initially all functions are not materialized (no basic blocks).
-  EXPECT_TRUE(F->empty());
-  EXPECT_TRUE(G->empty());
-  EXPECT_TRUE(H->empty());
-  EXPECT_TRUE(J->empty());
-  EXPECT_FALSE(verifyModule(*M, &dbgs()));
-
-  // Materialize h.
-  ASSERT_FALSE(H->materialize());
-  EXPECT_TRUE(F->empty());
-  EXPECT_TRUE(G->empty());
-  EXPECT_FALSE(H->empty());
-  EXPECT_TRUE(J->empty());
-  EXPECT_FALSE(verifyModule(*M, &dbgs()));
-
-  // Materialize g.
-  ASSERT_FALSE(G->materialize());
-  EXPECT_TRUE(F->empty());
-  EXPECT_FALSE(G->empty());
-  EXPECT_FALSE(H->empty());
-  EXPECT_TRUE(J->empty());
-  EXPECT_FALSE(verifyModule(*M, &dbgs()));
-
-  // Materialize j.
-  ASSERT_FALSE(J->materialize());
-  EXPECT_TRUE(F->empty());
-  EXPECT_FALSE(G->empty());
-  EXPECT_FALSE(H->empty());
-  EXPECT_FALSE(J->empty());
-  EXPECT_FALSE(verifyModule(*M, &dbgs()));
-
-  // Materialize f.
-  ASSERT_FALSE(F->materialize());
-  EXPECT_FALSE(F->empty());
-  EXPECT_FALSE(G->empty());
-  EXPECT_FALSE(H->empty());
-  EXPECT_FALSE(J->empty());
-  EXPECT_FALSE(verifyModule(*M, &dbgs()));
-}
-
-TEST(BitReaderTest, MaterializeFunctionsStrictFP) {
-  SmallString<1024> Mem;
-
-  LLVMContext Context;
-  std::unique_ptr<Module> M = getLazyModuleFromAssembly(
-      Context, Mem, "define double @foo(double %a) {\n"
-                    "  %result = call double @bar(double %a) strictfp\n"
-                    "  ret double %result\n"
-                    "}\n"
-                    "declare double @bar(double)\n");
-  Function *Foo = M->getFunction("foo");
-  ASSERT_FALSE(Foo->materialize());
-  EXPECT_FALSE(Foo->empty());
-
-  for (auto &BB : *Foo) {
-    auto It = BB.begin();
-    while (It != BB.end()) {
-      Instruction &I = *It;
-      ++It;
-
-      if (auto *Call = dyn_cast<CallBase>(&I)) {
-        EXPECT_FALSE(Call->isStrictFP());
-        EXPECT_TRUE(Call->isNoBuiltin());
-      }
-    }
-  }
-
-  EXPECT_FALSE(verifyModule(*M, &dbgs()));
-}
-
-TEST(BitReaderTest, MaterializeConstrainedFPStrictFP) {
-  SmallString<1024> Mem;
-
-  LLVMContext Context;
-  std::unique_ptr<Module> M = getLazyModuleFromAssembly(
-      Context, Mem,
-      "define double @foo(double %a) {\n"
-      "  %result = call double @llvm.experimental.constrained.sqrt.f64(double "
-      "%a, metadata !\"round.tonearest\", metadata !\"fpexcept.strict\") "
-      "strictfp\n"
-      "  ret double %result\n"
-      "}\n"
-      "declare double @llvm.experimental.constrained.sqrt.f64(double, "
-      "metadata, metadata)\n");
-  Function *Foo = M->getFunction("foo");
-  ASSERT_FALSE(Foo->materialize());
-  EXPECT_FALSE(Foo->empty());
-
-  for (auto &BB : *Foo) {
-    auto It = BB.begin();
-    while (It != BB.end()) {
-      Instruction &I = *It;
-      ++It;
-
-      if (auto *Call = dyn_cast<CallBase>(&I)) {
-        EXPECT_TRUE(Call->isStrictFP());
-        EXPECT_FALSE(Call->isNoBuiltin());
-      }
-    }
-  }
-
-  EXPECT_FALSE(verifyModule(*M, &dbgs()));
-}
-
-TEST(BitReaderTest, MaterializeFunctionsForBlockAddr) { // PR11677
-  SmallString<1024> Mem;
-
-  LLVMContext Context;
-  std::unique_ptr<Module> M = getLazyModuleFromAssembly(
-      Context, Mem, "@table = constant i8* blockaddress(@func, %bb)\n"
-                    "define void @func() {\n"
-                    "  unreachable\n"
-                    "bb:\n"
-                    "  unreachable\n"
-                    "}\n");
-  EXPECT_FALSE(verifyModule(*M, &dbgs()));
-  EXPECT_FALSE(M->getFunction("func")->empty());
-}
-
-TEST(BitReaderTest, MaterializeFunctionsForBlockAddrInFunctionBefore) {
-  SmallString<1024> Mem;
-
-  LLVMContext Context;
-  std::unique_ptr<Module> M = getLazyModuleFromAssembly(
-      Context, Mem, "define i8* @before() {\n"
-                    "  ret i8* blockaddress(@func, %bb)\n"
-                    "}\n"
-                    "define void @other() {\n"
-                    "  unreachable\n"
-                    "}\n"
-                    "define void @func() {\n"
-                    "  unreachable\n"
-                    "bb:\n"
-                    "  unreachable\n"
-                    "}\n");
-  EXPECT_TRUE(M->getFunction("before")->empty());
-  EXPECT_TRUE(M->getFunction("func")->empty());
-  EXPECT_FALSE(verifyModule(*M, &dbgs()));
-
-  // Materialize @before, pulling in @func.
-  EXPECT_FALSE(M->getFunction("before")->materialize());
-  EXPECT_FALSE(M->getFunction("func")->empty());
-  EXPECT_TRUE(M->getFunction("other")->empty());
-  EXPECT_FALSE(verifyModule(*M, &dbgs()));
-}
-
-TEST(BitReaderTest, MaterializeFunctionsForBlockAddrInFunctionAfter) {
-  SmallString<1024> Mem;
-
-  LLVMContext Context;
-  std::unique_ptr<Module> M = getLazyModuleFromAssembly(
-      Context, Mem, "define void @func() {\n"
-                    "  unreachable\n"
-                    "bb:\n"
-                    "  unreachable\n"
-                    "}\n"
-                    "define void @other() {\n"
-                    "  unreachable\n"
-                    "}\n"
-                    "define i8* @after() {\n"
-                    "  ret i8* blockaddress(@func, %bb)\n"
-                    "}\n");
-  EXPECT_TRUE(M->getFunction("after")->empty());
-  EXPECT_TRUE(M->getFunction("func")->empty());
-  EXPECT_FALSE(verifyModule(*M, &dbgs()));
-
-  // Materialize @after, pulling in @func.
-  EXPECT_FALSE(M->getFunction("after")->materialize());
-  EXPECT_FALSE(M->getFunction("func")->empty());
-  EXPECT_TRUE(M->getFunction("other")->empty());
-  EXPECT_FALSE(verifyModule(*M, &dbgs()));
-}
-
-} // end namespace
diff --git a/gnu/llvm/llvm/unittests/Bitcode/CMakeLists.txt b/gnu/llvm/llvm/unittests/Bitcode/CMakeLists.txt
deleted file mode 100644
index e329e98226d..00000000000
--- a/gnu/llvm/llvm/unittests/Bitcode/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  AsmParser
-  BitReader
-  BitWriter
-  Core
-  Support
-  )
-
-add_llvm_unittest(BitcodeTests
-  BitReaderTest.cpp
-  DataLayoutUpgradeTest.cpp
-  )
diff --git a/gnu/llvm/llvm/unittests/Bitcode/DataLayoutUpgradeTest.cpp b/gnu/llvm/llvm/unittests/Bitcode/DataLayoutUpgradeTest.cpp
deleted file mode 100644
index ec900471a83..00000000000
--- a/gnu/llvm/llvm/unittests/Bitcode/DataLayoutUpgradeTest.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//===- DataLayoutUpgradeTest.cpp - Tests for DataLayout upgrades ----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/IR/AutoUpgrade.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST(DataLayoutUpgradeTest, ValidDataLayoutUpgrade) {
-  std::string DL1 =
-      UpgradeDataLayoutString("e-m:e-p:32:32-i64:64-f80:128-n8:16:32:64-S128",
-                              "x86_64-unknown-linux-gnu");
-  std::string DL2 = UpgradeDataLayoutString(
-      "e-m:w-p:32:32-i64:64-f80:32-n8:16:32-S32", "i686-pc-windows-msvc");
-  std::string DL3 = UpgradeDataLayoutString("e-m:o-i64:64-i128:128-n32:64-S128",
-                                            "x86_64-apple-macosx");
-  EXPECT_EQ(DL1, "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-i64:64"
-                 "-f80:128-n8:16:32:64-S128");
-  EXPECT_EQ(DL2, "e-m:w-p:32:32-p270:32:32-p271:32:32-p272:64:64-i64:64"
-                 "-f80:32-n8:16:32-S32");
-  EXPECT_EQ(DL3, "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128"
-                 "-n32:64-S128");
-
-  // Check that AMDGPU targets add -G1 if it's not present.
-  EXPECT_EQ(UpgradeDataLayoutString("e-p:32:32", "r600"), "e-p:32:32-G1");
-  EXPECT_EQ(UpgradeDataLayoutString("e-p:64:64", "amdgcn"), "e-p:64:64-G1");
-}
-
-TEST(DataLayoutUpgradeTest, NoDataLayoutUpgrade) {
-  std::string DL1 = UpgradeDataLayoutString(
-      "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32"
-      "-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128"
-      "-n8:16:32:64-S128",
-      "x86_64-unknown-linux-gnu");
-  std::string DL2 = UpgradeDataLayoutString("e-p:32:32", "i686-apple-darwin9");
-  std::string DL3 = UpgradeDataLayoutString("e-m:e-i64:64-n32:64",
-                                            "powerpc64le-unknown-linux-gnu");
-  std::string DL4 =
-      UpgradeDataLayoutString("e-m:o-i64:64-i128:128-n32:64-S128", "aarch64--");
-  EXPECT_EQ(DL1, "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64"
-                 "-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64"
-                 "-f80:128:128-n8:16:32:64-S128");
-  EXPECT_EQ(DL2, "e-p:32:32");
-  EXPECT_EQ(DL3, "e-m:e-i64:64-n32:64");
-  EXPECT_EQ(DL4, "e-m:o-i64:64-i128:128-n32:64-S128");
-
-  // Check that AMDGPU targets don't add -G1 if there is already a -G flag.
-  EXPECT_EQ(UpgradeDataLayoutString("e-p:32:32-G2", "r600"), "e-p:32:32-G2");
-  EXPECT_EQ(UpgradeDataLayoutString("G2", "r600"), "G2");
-  EXPECT_EQ(UpgradeDataLayoutString("e-p:64:64-G2", "amdgcn"), "e-p:64:64-G2");
-  EXPECT_EQ(UpgradeDataLayoutString("G2-e-p:64:64", "amdgcn"), "G2-e-p:64:64");
-  EXPECT_EQ(UpgradeDataLayoutString("e-p:64:64-G0", "amdgcn"), "e-p:64:64-G0");
-}
-
-TEST(DataLayoutUpgradeTest, EmptyDataLayout) {
-  std::string DL1 = UpgradeDataLayoutString("", "x86_64-unknown-linux-gnu");
-  std::string DL2 = UpgradeDataLayoutString(
-      "e-m:e-p:32:32-i64:64-f80:128-n8:16:32:64-S128", "");
-  EXPECT_EQ(DL1, "");
-  EXPECT_EQ(DL2, "e-m:e-p:32:32-i64:64-f80:128-n8:16:32:64-S128");
-
-  // Check that AMDGPU targets add G1 if it's not present.
-  EXPECT_EQ(UpgradeDataLayoutString("", "r600"), "G1");
-  EXPECT_EQ(UpgradeDataLayoutString("", "amdgcn"), "G1");
-}
-
-} // end namespace
diff --git a/gnu/llvm/llvm/unittests/Bitstream/BitstreamReaderTest.cpp b/gnu/llvm/llvm/unittests/Bitstream/BitstreamReaderTest.cpp
deleted file mode 100644
index 669288e4264..00000000000
--- a/gnu/llvm/llvm/unittests/Bitstream/BitstreamReaderTest.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-//===- BitstreamReaderTest.cpp - Tests for BitstreamReader ----------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Bitstream/BitstreamReader.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/Bitstream/BitstreamWriter.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST(BitstreamReaderTest, AtEndOfStream) {
-  uint8_t Bytes[4] = {
-    0x00, 0x01, 0x02, 0x03
-  };
-  BitstreamCursor Cursor(Bytes);
-
-  EXPECT_FALSE(Cursor.AtEndOfStream());
-  Expected<SimpleBitstreamCursor::word_t> MaybeRead = Cursor.Read(8);
-  EXPECT_TRUE((bool)MaybeRead);
-  EXPECT_FALSE(Cursor.AtEndOfStream());
-  MaybeRead = Cursor.Read(24);
-  EXPECT_TRUE((bool)MaybeRead);
-  EXPECT_TRUE(Cursor.AtEndOfStream());
-
-  EXPECT_FALSE(Cursor.JumpToBit(0));
-  EXPECT_FALSE(Cursor.AtEndOfStream());
-
-  EXPECT_FALSE(Cursor.JumpToBit(32));
-  EXPECT_TRUE(Cursor.AtEndOfStream());
-}
-
-TEST(BitstreamReaderTest, AtEndOfStreamJump) {
-  uint8_t Bytes[4] = {
-    0x00, 0x01, 0x02, 0x03
-  };
-  BitstreamCursor Cursor(Bytes);
-
-  EXPECT_FALSE(Cursor.JumpToBit(32));
-  EXPECT_TRUE(Cursor.AtEndOfStream());
-}
-
-TEST(BitstreamReaderTest, AtEndOfStreamEmpty) {
-  BitstreamCursor Cursor(ArrayRef<uint8_t>{});
-
-  EXPECT_TRUE(Cursor.AtEndOfStream());
-}
-
-TEST(BitstreamReaderTest, getCurrentByteNo) {
-  uint8_t Bytes[] = {0x00, 0x01, 0x02, 0x03};
-  SimpleBitstreamCursor Cursor(Bytes);
-
-  for (unsigned I = 0, E = 32; I != E; ++I) {
-    EXPECT_EQ(I / 8, Cursor.getCurrentByteNo());
-    Expected<SimpleBitstreamCursor::word_t> MaybeRead = Cursor.Read(1);
-    EXPECT_TRUE((bool)MaybeRead);
-  }
-  EXPECT_EQ(4u, Cursor.getCurrentByteNo());
-}
-
-TEST(BitstreamReaderTest, getPointerToByte) {
-  uint8_t Bytes[] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07};
-  SimpleBitstreamCursor Cursor(Bytes);
-
-  for (unsigned I = 0, E = 8; I != E; ++I) {
-    EXPECT_EQ(Bytes + I, Cursor.getPointerToByte(I, 1));
-  }
-}
-
-TEST(BitstreamReaderTest, getPointerToBit) {
-  uint8_t Bytes[] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07};
-  SimpleBitstreamCursor Cursor(Bytes);
-
-  for (unsigned I = 0, E = 8; I != E; ++I) {
-    EXPECT_EQ(Bytes + I, Cursor.getPointerToBit(I * 8, 1));
-  }
-}
-
-TEST(BitstreamReaderTest, readRecordWithBlobWhileStreaming) {
-  SmallVector<uint8_t, 1> BlobData;
-  for (unsigned I = 0, E = 1024; I != E; ++I)
-    BlobData.push_back(I);
-
-  // Try a bunch of different sizes.
-  const unsigned Magic = 0x12345678;
-  const unsigned BlockID = bitc::FIRST_APPLICATION_BLOCKID;
-  const unsigned RecordID = 1;
-  for (unsigned I = 0, BlobSize = 0, E = BlobData.size(); BlobSize < E;
-       BlobSize += ++I) {
-    StringRef BlobIn((const char *)BlobData.begin(), BlobSize);
-
-    // Write the bitcode.
-    SmallVector<char, 1> Buffer;
-    unsigned AbbrevID;
-    {
-      BitstreamWriter Stream(Buffer);
-      Stream.Emit(Magic, 32);
-      Stream.EnterSubblock(BlockID, 3);
-
-      auto Abbrev = std::make_shared<BitCodeAbbrev>();
-      Abbrev->Add(BitCodeAbbrevOp(RecordID));
-      Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Blob));
-      AbbrevID = Stream.EmitAbbrev(std::move(Abbrev));
-      unsigned Record[] = {RecordID};
-      Stream.EmitRecordWithBlob(AbbrevID, makeArrayRef(Record), BlobIn);
-
-      Stream.ExitBlock();
-    }
-
-    // Stream the buffer into the reader.
-    BitstreamCursor Stream(
-        ArrayRef<uint8_t>((const uint8_t *)Buffer.begin(), Buffer.size()));
-
-    // Header.  Included in test so that we can run llvm-bcanalyzer to debug
-    // when there are problems.
-    Expected<SimpleBitstreamCursor::word_t> MaybeRead = Stream.Read(32);
-    ASSERT_TRUE((bool)MaybeRead);
-    ASSERT_EQ(Magic, MaybeRead.get());
-
-    // Block.
-    Expected<BitstreamEntry> MaybeEntry =
-        Stream.advance(BitstreamCursor::AF_DontAutoprocessAbbrevs);
-    ASSERT_TRUE((bool)MaybeEntry);
-    BitstreamEntry Entry = MaybeEntry.get();
-    ASSERT_EQ(BitstreamEntry::SubBlock, Entry.Kind);
-    ASSERT_EQ(BlockID, Entry.ID);
-    ASSERT_FALSE(Stream.EnterSubBlock(BlockID));
-
-    // Abbreviation.
-    MaybeEntry = Stream.advance();
-    ASSERT_TRUE((bool)MaybeEntry);
-    Entry = MaybeEntry.get();
-    ASSERT_EQ(BitstreamEntry::Record, Entry.Kind);
-    ASSERT_EQ(AbbrevID, Entry.ID);
-
-    // Record.
-    StringRef BlobOut;
-    SmallVector<uint64_t, 1> Record;
-    Expected<unsigned> MaybeRecord =
-        Stream.readRecord(Entry.ID, Record, &BlobOut);
-    ASSERT_TRUE((bool)MaybeRecord);
-    ASSERT_EQ(RecordID, MaybeRecord.get());
-    EXPECT_TRUE(Record.empty());
-    EXPECT_EQ(BlobIn, BlobOut);
-  }
-}
-
-TEST(BitstreamReaderTest, shortRead) {
-  uint8_t Bytes[] = {8, 7, 6, 5, 4, 3, 2, 1};
-  for (unsigned I = 1; I != 8; ++I) {
-    SimpleBitstreamCursor Cursor(ArrayRef<uint8_t>(Bytes, I));
-    Expected<SimpleBitstreamCursor::word_t> MaybeRead = Cursor.Read(8);
-    ASSERT_TRUE((bool)MaybeRead);
-    EXPECT_EQ(8ull, MaybeRead.get());
-  }
-}
-
-static_assert(std::is_trivially_copyable<BitCodeAbbrevOp>::value,
-              "trivially copyable");
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/Bitstream/BitstreamWriterTest.cpp b/gnu/llvm/llvm/unittests/Bitstream/BitstreamWriterTest.cpp
deleted file mode 100644
index 054948e7e8b..00000000000
--- a/gnu/llvm/llvm/unittests/Bitstream/BitstreamWriterTest.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-//===- BitstreamWriterTest.cpp - Tests for BitstreamWriter ----------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Bitstream/BitstreamWriter.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/SmallString.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST(BitstreamWriterTest, emitBlob) {
-  SmallString<64> Buffer;
-  BitstreamWriter W(Buffer);
-  W.emitBlob("str", /* ShouldEmitSize */ false);
-  EXPECT_EQ(StringRef("str\0", 4), Buffer);
-}
-
-TEST(BitstreamWriterTest, emitBlobWithSize) {
-  SmallString<64> Buffer;
-  {
-    BitstreamWriter W(Buffer);
-    W.emitBlob("str");
-  }
-  SmallString<64> Expected;
-  {
-    BitstreamWriter W(Expected);
-    W.EmitVBR(3, 6);
-    W.FlushToWord();
-    W.Emit('s', 8);
-    W.Emit('t', 8);
-    W.Emit('r', 8);
-    W.Emit(0, 8);
-  }
-  EXPECT_EQ(Expected.str(), Buffer);
-}
-
-TEST(BitstreamWriterTest, emitBlobEmpty) {
-  SmallString<64> Buffer;
-  BitstreamWriter W(Buffer);
-  W.emitBlob("", /* ShouldEmitSize */ false);
-  EXPECT_EQ(StringRef(""), Buffer);
-}
-
-TEST(BitstreamWriterTest, emitBlob4ByteAligned) {
-  SmallString<64> Buffer;
-  BitstreamWriter W(Buffer);
-  W.emitBlob("str0", /* ShouldEmitSize */ false);
-  EXPECT_EQ(StringRef("str0"), Buffer);
-}
-
-} // end namespace
diff --git a/gnu/llvm/llvm/unittests/Bitstream/CMakeLists.txt b/gnu/llvm/llvm/unittests/Bitstream/CMakeLists.txt
deleted file mode 100644
index a62003417d4..00000000000
--- a/gnu/llvm/llvm/unittests/Bitstream/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  BitstreamReader
-  )
-
-add_llvm_unittest(BitstreamTests
-  BitstreamReaderTest.cpp
-  BitstreamWriterTest.cpp
-  )
diff --git a/gnu/llvm/llvm/unittests/CMakeLists.txt b/gnu/llvm/llvm/unittests/CMakeLists.txt
deleted file mode 100644
index 7b3804fb937..00000000000
--- a/gnu/llvm/llvm/unittests/CMakeLists.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-add_custom_target(UnitTests)
-set_target_properties(UnitTests PROPERTIES FOLDER "Tests")
-
-function(add_llvm_unittest test_dirname)
-  add_unittest(UnitTests ${test_dirname} ${ARGN})
-endfunction()
-function(add_llvm_unittest_with_input_files test_dirname)
-  add_unittest_with_input_files(UnitTests ${test_dirname} ${ARGN})
-endfunction()
-
-# The target unittests may test APIs that aren't exported in libLLVM.so, so
-# we need to always link against the static libraries.
-function(add_llvm_target_unittest test_dir_name)
-  add_llvm_unittest(${test_dir_name} DISABLE_LLVM_LINK_LLVM_DYLIB ${ARGN})
-endfunction()
-
-add_subdirectory(ADT)
-add_subdirectory(Analysis)
-add_subdirectory(AsmParser)
-add_subdirectory(BinaryFormat)
-add_subdirectory(Bitcode)
-add_subdirectory(Bitstream)
-add_subdirectory(CodeGen)
-add_subdirectory(DebugInfo)
-add_subdirectory(Demangle)
-add_subdirectory(ExecutionEngine)
-add_subdirectory(FileCheck)
-add_subdirectory(Frontend)
-add_subdirectory(FuzzMutate)
-add_subdirectory(InterfaceStub)
-add_subdirectory(IR)
-add_subdirectory(LineEditor)
-add_subdirectory(Linker)
-add_subdirectory(MC)
-add_subdirectory(MI)
-add_subdirectory(MIR)
-add_subdirectory(Object)
-add_subdirectory(ObjectYAML)
-add_subdirectory(Option)
-add_subdirectory(Remarks)
-add_subdirectory(Passes)
-add_subdirectory(ProfileData)
-add_subdirectory(Support)
-add_subdirectory(TableGen)
-add_subdirectory(Target)
-add_subdirectory(TextAPI)
-add_subdirectory(Transforms)
-add_subdirectory(XRay)
-add_subdirectory(tools)
diff --git a/gnu/llvm/llvm/unittests/CodeGen/AArch64SelectionDAGTest.cpp b/gnu/llvm/llvm/unittests/CodeGen/AArch64SelectionDAGTest.cpp
deleted file mode 100644
index 03f1fdcf37d..00000000000
--- a/gnu/llvm/llvm/unittests/CodeGen/AArch64SelectionDAGTest.cpp
+++ /dev/null
@@ -1,594 +0,0 @@
-//===- llvm/unittest/CodeGen/AArch64SelectionDAGTest.cpp -------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/OptimizationRemarkEmitter.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/CodeGen/MachineModuleInfo.h"
-#include "llvm/CodeGen/SelectionDAG.h"
-#include "llvm/CodeGen/TargetLowering.h"
-#include "llvm/Support/KnownBits.h"
-#include "llvm/Support/SourceMgr.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "llvm/Target/TargetMachine.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-
-class AArch64SelectionDAGTest : public testing::Test {
-protected:
-  static void SetUpTestCase() {
-    InitializeAllTargets();
-    InitializeAllTargetMCs();
-  }
-
-  void SetUp() override {
-    StringRef Assembly = "define void @f() { ret void }";
-
-    Triple TargetTriple("aarch64--");
-    std::string Error;
-    const Target *T = TargetRegistry::lookupTarget("", TargetTriple, Error);
-    // FIXME: These tests do not depend on AArch64 specifically, but we have to
-    // initialize a target. A skeleton Target for unittests would allow us to
-    // always run these tests.
-    if (!T)
-      GTEST_SKIP();
-
-    TargetOptions Options;
-    TM = std::unique_ptr<LLVMTargetMachine>(static_cast<LLVMTargetMachine *>(
-        T->createTargetMachine("AArch64", "", "+sve", Options, None, None,
-                               CodeGenOpt::Aggressive)));
-    if (!TM)
-      GTEST_SKIP();
-
-    SMDiagnostic SMError;
-    M = parseAssemblyString(Assembly, SMError, Context);
-    if (!M)
-      report_fatal_error(SMError.getMessage());
-    M->setDataLayout(TM->createDataLayout());
-
-    F = M->getFunction("f");
-    if (!F)
-      report_fatal_error("F?");
-
-    MachineModuleInfo MMI(TM.get());
-
-    MF = std::make_unique<MachineFunction>(*F, *TM, *TM->getSubtargetImpl(*F), 0,
-                                      MMI);
-
-    DAG = std::make_unique<SelectionDAG>(*TM, CodeGenOpt::None);
-    if (!DAG)
-      report_fatal_error("DAG?");
-    OptimizationRemarkEmitter ORE(F);
-    DAG->init(*MF, ORE, nullptr, nullptr, nullptr, nullptr, nullptr);
-  }
-
-  TargetLoweringBase::LegalizeTypeAction getTypeAction(EVT VT) {
-    return DAG->getTargetLoweringInfo().getTypeAction(Context, VT);
-  }
-
-  EVT getTypeToTransformTo(EVT VT) {
-    return DAG->getTargetLoweringInfo().getTypeToTransformTo(Context, VT);
-  }
-
-  LLVMContext Context;
-  std::unique_ptr<LLVMTargetMachine> TM;
-  std::unique_ptr<Module> M;
-  Function *F;
-  std::unique_ptr<MachineFunction> MF;
-  std::unique_ptr<SelectionDAG> DAG;
-};
-
-TEST_F(AArch64SelectionDAGTest, computeKnownBits_ZERO_EXTEND_VECTOR_INREG) {
-  SDLoc Loc;
-  auto Int8VT = EVT::getIntegerVT(Context, 8);
-  auto Int16VT = EVT::getIntegerVT(Context, 16);
-  auto InVecVT = EVT::getVectorVT(Context, Int8VT, 4);
-  auto OutVecVT = EVT::getVectorVT(Context, Int16VT, 2);
-  auto InVec = DAG->getConstant(0, Loc, InVecVT);
-  auto Op = DAG->getNode(ISD::ZERO_EXTEND_VECTOR_INREG, Loc, OutVecVT, InVec);
-  auto DemandedElts = APInt(2, 3);
-  KnownBits Known = DAG->computeKnownBits(Op, DemandedElts);
-  EXPECT_TRUE(Known.isZero());
-}
-
-TEST_F(AArch64SelectionDAGTest, computeKnownBitsSVE_ZERO_EXTEND_VECTOR_INREG) {
-  SDLoc Loc;
-  auto Int8VT = EVT::getIntegerVT(Context, 8);
-  auto Int16VT = EVT::getIntegerVT(Context, 16);
-  auto InVecVT = EVT::getVectorVT(Context, Int8VT, 4, true);
-  auto OutVecVT = EVT::getVectorVT(Context, Int16VT, 2, true);
-  auto InVec = DAG->getConstant(0, Loc, InVecVT);
-  auto Op = DAG->getNode(ISD::ZERO_EXTEND_VECTOR_INREG, Loc, OutVecVT, InVec);
-  auto DemandedElts = APInt(2, 3);
-  KnownBits Known = DAG->computeKnownBits(Op, DemandedElts);
-
-  // We don't know anything for SVE at the moment.
-  EXPECT_EQ(Known.Zero, APInt(16, 0u));
-  EXPECT_EQ(Known.One, APInt(16, 0u));
-  EXPECT_FALSE(Known.isZero());
-}
-
-TEST_F(AArch64SelectionDAGTest, computeKnownBits_EXTRACT_SUBVECTOR) {
-  SDLoc Loc;
-  auto IntVT = EVT::getIntegerVT(Context, 8);
-  auto VecVT = EVT::getVectorVT(Context, IntVT, 3);
-  auto IdxVT = EVT::getIntegerVT(Context, 64);
-  auto Vec = DAG->getConstant(0, Loc, VecVT);
-  auto ZeroIdx = DAG->getConstant(0, Loc, IdxVT);
-  auto Op = DAG->getNode(ISD::EXTRACT_SUBVECTOR, Loc, VecVT, Vec, ZeroIdx);
-  auto DemandedElts = APInt(3, 7);
-  KnownBits Known = DAG->computeKnownBits(Op, DemandedElts);
-  EXPECT_TRUE(Known.isZero());
-}
-
-TEST_F(AArch64SelectionDAGTest, ComputeNumSignBits_SIGN_EXTEND_VECTOR_INREG) {
-  SDLoc Loc;
-  auto Int8VT = EVT::getIntegerVT(Context, 8);
-  auto Int16VT = EVT::getIntegerVT(Context, 16);
-  auto InVecVT = EVT::getVectorVT(Context, Int8VT, 4);
-  auto OutVecVT = EVT::getVectorVT(Context, Int16VT, 2);
-  auto InVec = DAG->getConstant(1, Loc, InVecVT);
-  auto Op = DAG->getNode(ISD::SIGN_EXTEND_VECTOR_INREG, Loc, OutVecVT, InVec);
-  auto DemandedElts = APInt(2, 3);
-  EXPECT_EQ(DAG->ComputeNumSignBits(Op, DemandedElts), 15u);
-}
-
-TEST_F(AArch64SelectionDAGTest, ComputeNumSignBitsSVE_SIGN_EXTEND_VECTOR_INREG) {
-  SDLoc Loc;
-  auto Int8VT = EVT::getIntegerVT(Context, 8);
-  auto Int16VT = EVT::getIntegerVT(Context, 16);
-  auto InVecVT = EVT::getVectorVT(Context, Int8VT, 4, /*IsScalable=*/true);
-  auto OutVecVT = EVT::getVectorVT(Context, Int16VT, 2, /*IsScalable=*/true);
-  auto InVec = DAG->getConstant(1, Loc, InVecVT);
-  auto Op = DAG->getNode(ISD::SIGN_EXTEND_VECTOR_INREG, Loc, OutVecVT, InVec);
-  auto DemandedElts = APInt(2, 3);
-  EXPECT_EQ(DAG->ComputeNumSignBits(Op, DemandedElts), 1u);
-}
-
-TEST_F(AArch64SelectionDAGTest, ComputeNumSignBits_EXTRACT_SUBVECTOR) {
-  SDLoc Loc;
-  auto IntVT = EVT::getIntegerVT(Context, 8);
-  auto VecVT = EVT::getVectorVT(Context, IntVT, 3);
-  auto IdxVT = EVT::getIntegerVT(Context, 64);
-  auto Vec = DAG->getConstant(1, Loc, VecVT);
-  auto ZeroIdx = DAG->getConstant(0, Loc, IdxVT);
-  auto Op = DAG->getNode(ISD::EXTRACT_SUBVECTOR, Loc, VecVT, Vec, ZeroIdx);
-  auto DemandedElts = APInt(3, 7);
-  EXPECT_EQ(DAG->ComputeNumSignBits(Op, DemandedElts), 7u);
-}
-
-TEST_F(AArch64SelectionDAGTest, SimplifyDemandedVectorElts_EXTRACT_SUBVECTOR) {
-  TargetLowering TL(*TM);
-
-  SDLoc Loc;
-  auto IntVT = EVT::getIntegerVT(Context, 8);
-  auto VecVT = EVT::getVectorVT(Context, IntVT, 3);
-  auto IdxVT = EVT::getIntegerVT(Context, 64);
-  auto Vec = DAG->getConstant(1, Loc, VecVT);
-  auto ZeroIdx = DAG->getConstant(0, Loc, IdxVT);
-  auto Op = DAG->getNode(ISD::EXTRACT_SUBVECTOR, Loc, VecVT, Vec, ZeroIdx);
-  auto DemandedElts = APInt(3, 7);
-  auto KnownUndef = APInt(3, 0);
-  auto KnownZero = APInt(3, 0);
-  TargetLowering::TargetLoweringOpt TLO(*DAG, false, false);
-  EXPECT_EQ(TL.SimplifyDemandedVectorElts(Op, DemandedElts, KnownUndef,
-                                          KnownZero, TLO),
-            false);
-}
-
-TEST_F(AArch64SelectionDAGTest, SimplifyDemandedBitsNEON) {
-  TargetLowering TL(*TM);
-
-  SDLoc Loc;
-  auto Int8VT = EVT::getIntegerVT(Context, 8);
-  auto InVecVT = EVT::getVectorVT(Context, Int8VT, 16);
-  SDValue UnknownOp = DAG->getRegister(0, InVecVT);
-  SDValue Mask1S = DAG->getConstant(0x8A, Loc, Int8VT);
-  SDValue Mask1V = DAG->getSplatBuildVector(InVecVT, Loc, Mask1S);
-  SDValue N0 = DAG->getNode(ISD::AND, Loc, InVecVT, Mask1V, UnknownOp);
-
-  SDValue Mask2S = DAG->getConstant(0x55, Loc, Int8VT);
-  SDValue Mask2V = DAG->getSplatBuildVector(InVecVT, Loc, Mask2S);
-
-  SDValue Op = DAG->getNode(ISD::AND, Loc, InVecVT, N0, Mask2V);
-  // N0 = ?000?0?0
-  // Mask2V = 01010101
-  //  =>
-  // Known.Zero = 00100000 (0xAA)
-  KnownBits Known;
-  APInt DemandedBits = APInt(8, 0xFF);
-  TargetLowering::TargetLoweringOpt TLO(*DAG, false, false);
-  EXPECT_TRUE(TL.SimplifyDemandedBits(Op, DemandedBits, Known, TLO));
-  EXPECT_EQ(Known.Zero, APInt(8, 0xAA));
-}
-
-TEST_F(AArch64SelectionDAGTest, SimplifyDemandedBitsSVE) {
-  TargetLowering TL(*TM);
-
-  SDLoc Loc;
-  auto Int8VT = EVT::getIntegerVT(Context, 8);
-  auto InVecVT = EVT::getVectorVT(Context, Int8VT, 16, /*IsScalable=*/true);
-  SDValue UnknownOp = DAG->getRegister(0, InVecVT);
-  SDValue Mask1S = DAG->getConstant(0x8A, Loc, Int8VT);
-  SDValue Mask1V = DAG->getSplatVector(InVecVT, Loc, Mask1S);
-  SDValue N0 = DAG->getNode(ISD::AND, Loc, InVecVT, Mask1V, UnknownOp);
-
-  SDValue Mask2S = DAG->getConstant(0x55, Loc, Int8VT);
-  SDValue Mask2V = DAG->getSplatVector(InVecVT, Loc, Mask2S);
-
-  SDValue Op = DAG->getNode(ISD::AND, Loc, InVecVT, N0, Mask2V);
-
-  KnownBits Known;
-  APInt DemandedBits = APInt(8, 0xFF);
-  TargetLowering::TargetLoweringOpt TLO(*DAG, false, false);
-  EXPECT_FALSE(TL.SimplifyDemandedBits(Op, DemandedBits, Known, TLO));
-  EXPECT_EQ(Known.Zero, APInt(8, 0));
-}
-
-// Piggy-backing on the AArch64 tests to verify SelectionDAG::computeKnownBits.
-TEST_F(AArch64SelectionDAGTest, ComputeKnownBits_ADD) {
-  SDLoc Loc;
-  auto IntVT = EVT::getIntegerVT(Context, 8);
-  auto UnknownOp = DAG->getRegister(0, IntVT);
-  auto Mask = DAG->getConstant(0x8A, Loc, IntVT);
-  auto N0 = DAG->getNode(ISD::AND, Loc, IntVT, Mask, UnknownOp);
-  auto N1 = DAG->getConstant(0x55, Loc, IntVT);
-  auto Op = DAG->getNode(ISD::ADD, Loc, IntVT, N0, N1);
-  // N0 = ?000?0?0
-  // N1 = 01010101
-  //  =>
-  // Known.One  = 01010101 (0x55)
-  // Known.Zero = 00100000 (0x20)
-  KnownBits Known = DAG->computeKnownBits(Op);
-  EXPECT_EQ(Known.Zero, APInt(8, 0x20));
-  EXPECT_EQ(Known.One, APInt(8, 0x55));
-}
-
-// Piggy-backing on the AArch64 tests to verify SelectionDAG::computeKnownBits.
-TEST_F(AArch64SelectionDAGTest, ComputeKnownBits_SUB) {
-  SDLoc Loc;
-  auto IntVT = EVT::getIntegerVT(Context, 8);
-  auto N0 = DAG->getConstant(0x55, Loc, IntVT);
-  auto UnknownOp = DAG->getRegister(0, IntVT);
-  auto Mask = DAG->getConstant(0x2e, Loc, IntVT);
-  auto N1 = DAG->getNode(ISD::AND, Loc, IntVT, Mask, UnknownOp);
-  auto Op = DAG->getNode(ISD::SUB, Loc, IntVT, N0, N1);
-  // N0 = 01010101
-  // N1 = 00?0???0
-  //  =>
-  // Known.One  = 00000001 (0x1)
-  // Known.Zero = 10000000 (0x80)
-  KnownBits Known = DAG->computeKnownBits(Op);
-  EXPECT_EQ(Known.Zero, APInt(8, 0x80));
-  EXPECT_EQ(Known.One, APInt(8, 0x1));
-}
-
-TEST_F(AArch64SelectionDAGTest, isSplatValue_Fixed_BUILD_VECTOR) {
-  TargetLowering TL(*TM);
-
-  SDLoc Loc;
-  auto IntVT = EVT::getIntegerVT(Context, 8);
-  auto VecVT = EVT::getVectorVT(Context, IntVT, 16, false);
-  // Create a BUILD_VECTOR
-  SDValue Op = DAG->getConstant(1, Loc, VecVT);
-  EXPECT_EQ(Op->getOpcode(), ISD::BUILD_VECTOR);
-  EXPECT_TRUE(DAG->isSplatValue(Op, /*AllowUndefs=*/false));
-
-  APInt UndefElts;
-  APInt DemandedElts;
-  EXPECT_FALSE(DAG->isSplatValue(Op, DemandedElts, UndefElts));
-
-  // Width=16, Mask=3
-  DemandedElts = APInt(16, 3);
-  EXPECT_TRUE(DAG->isSplatValue(Op, DemandedElts, UndefElts));
-}
-
-TEST_F(AArch64SelectionDAGTest, isSplatValue_Fixed_ADD_of_BUILD_VECTOR) {
-  TargetLowering TL(*TM);
-
-  SDLoc Loc;
-  auto IntVT = EVT::getIntegerVT(Context, 8);
-  auto VecVT = EVT::getVectorVT(Context, IntVT, 16, false);
-
-  // Should create BUILD_VECTORs
-  SDValue Val1 = DAG->getConstant(1, Loc, VecVT);
-  SDValue Val2 = DAG->getConstant(3, Loc, VecVT);
-  EXPECT_EQ(Val1->getOpcode(), ISD::BUILD_VECTOR);
-  SDValue Op = DAG->getNode(ISD::ADD, Loc, VecVT, Val1, Val2);
-
-  EXPECT_TRUE(DAG->isSplatValue(Op, /*AllowUndefs=*/false));
-
-  APInt UndefElts;
-  APInt DemandedElts;
-  EXPECT_FALSE(DAG->isSplatValue(Op, DemandedElts, UndefElts));
-
-  // Width=16, Mask=3
-  DemandedElts = APInt(16, 3);
-  EXPECT_TRUE(DAG->isSplatValue(Op, DemandedElts, UndefElts));
-}
-
-TEST_F(AArch64SelectionDAGTest, isSplatValue_Scalable_SPLAT_VECTOR) {
-  TargetLowering TL(*TM);
-
-  SDLoc Loc;
-  auto IntVT = EVT::getIntegerVT(Context, 8);
-  auto VecVT = EVT::getVectorVT(Context, IntVT, 16, true);
-  // Create a SPLAT_VECTOR
-  SDValue Op = DAG->getConstant(1, Loc, VecVT);
-  EXPECT_EQ(Op->getOpcode(), ISD::SPLAT_VECTOR);
-  EXPECT_TRUE(DAG->isSplatValue(Op, /*AllowUndefs=*/false));
-
-  APInt UndefElts;
-  APInt DemandedElts;
-  EXPECT_TRUE(DAG->isSplatValue(Op, DemandedElts, UndefElts));
-
-  // Width=16, Mask=3. These bits should be ignored.
-  DemandedElts = APInt(16, 3);
-  EXPECT_TRUE(DAG->isSplatValue(Op, DemandedElts, UndefElts));
-}
-
-TEST_F(AArch64SelectionDAGTest, isSplatValue_Scalable_ADD_of_SPLAT_VECTOR) {
-  TargetLowering TL(*TM);
-
-  SDLoc Loc;
-  auto IntVT = EVT::getIntegerVT(Context, 8);
-  auto VecVT = EVT::getVectorVT(Context, IntVT, 16, true);
-
-  // Should create SPLAT_VECTORS
-  SDValue Val1 = DAG->getConstant(1, Loc, VecVT);
-  SDValue Val2 = DAG->getConstant(3, Loc, VecVT);
-  EXPECT_EQ(Val1->getOpcode(), ISD::SPLAT_VECTOR);
-  SDValue Op = DAG->getNode(ISD::ADD, Loc, VecVT, Val1, Val2);
-
-  EXPECT_TRUE(DAG->isSplatValue(Op, /*AllowUndefs=*/false));
-
-  APInt UndefElts;
-  APInt DemandedElts;
-  EXPECT_TRUE(DAG->isSplatValue(Op, DemandedElts, UndefElts));
-
-  // Width=16, Mask=3. These bits should be ignored.
-  DemandedElts = APInt(16, 3);
-  EXPECT_TRUE(DAG->isSplatValue(Op, DemandedElts, UndefElts));
-}
-
-TEST_F(AArch64SelectionDAGTest, getSplatSourceVector_Fixed_BUILD_VECTOR) {
-  TargetLowering TL(*TM);
-
-  SDLoc Loc;
-  auto IntVT = EVT::getIntegerVT(Context, 8);
-  auto VecVT = EVT::getVectorVT(Context, IntVT, 16, false);
-  // Create a BUILD_VECTOR
-  SDValue Op = DAG->getConstant(1, Loc, VecVT);
-  EXPECT_EQ(Op->getOpcode(), ISD::BUILD_VECTOR);
-
-  int SplatIdx = -1;
-  EXPECT_EQ(DAG->getSplatSourceVector(Op, SplatIdx), Op);
-  EXPECT_EQ(SplatIdx, 0);
-}
-
-TEST_F(AArch64SelectionDAGTest, getSplatSourceVector_Fixed_ADD_of_BUILD_VECTOR) {
-  TargetLowering TL(*TM);
-
-  SDLoc Loc;
-  auto IntVT = EVT::getIntegerVT(Context, 8);
-  auto VecVT = EVT::getVectorVT(Context, IntVT, 16, false);
-
-  // Should create BUILD_VECTORs
-  SDValue Val1 = DAG->getConstant(1, Loc, VecVT);
-  SDValue Val2 = DAG->getConstant(3, Loc, VecVT);
-  EXPECT_EQ(Val1->getOpcode(), ISD::BUILD_VECTOR);
-  SDValue Op = DAG->getNode(ISD::ADD, Loc, VecVT, Val1, Val2);
-
-  int SplatIdx = -1;
-  EXPECT_EQ(DAG->getSplatSourceVector(Op, SplatIdx), Op);
-  EXPECT_EQ(SplatIdx, 0);
-}
-
-TEST_F(AArch64SelectionDAGTest, getSplatSourceVector_Scalable_SPLAT_VECTOR) {
-  TargetLowering TL(*TM);
-
-  SDLoc Loc;
-  auto IntVT = EVT::getIntegerVT(Context, 8);
-  auto VecVT = EVT::getVectorVT(Context, IntVT, 16, true);
-  // Create a SPLAT_VECTOR
-  SDValue Op = DAG->getConstant(1, Loc, VecVT);
-  EXPECT_EQ(Op->getOpcode(), ISD::SPLAT_VECTOR);
-
-  int SplatIdx = -1;
-  EXPECT_EQ(DAG->getSplatSourceVector(Op, SplatIdx), Op);
-  EXPECT_EQ(SplatIdx, 0);
-}
-
-TEST_F(AArch64SelectionDAGTest, getSplatSourceVector_Scalable_ADD_of_SPLAT_VECTOR) {
-  TargetLowering TL(*TM);
-
-  SDLoc Loc;
-  auto IntVT = EVT::getIntegerVT(Context, 8);
-  auto VecVT = EVT::getVectorVT(Context, IntVT, 16, true);
-
-  // Should create SPLAT_VECTORS
-  SDValue Val1 = DAG->getConstant(1, Loc, VecVT);
-  SDValue Val2 = DAG->getConstant(3, Loc, VecVT);
-  EXPECT_EQ(Val1->getOpcode(), ISD::SPLAT_VECTOR);
-  SDValue Op = DAG->getNode(ISD::ADD, Loc, VecVT, Val1, Val2);
-
-  int SplatIdx = -1;
-  EXPECT_EQ(DAG->getSplatSourceVector(Op, SplatIdx), Op);
-  EXPECT_EQ(SplatIdx, 0);
-}
-
-TEST_F(AArch64SelectionDAGTest, getRepeatedSequence_Patterns) {
-  TargetLowering TL(*TM);
-
-  SDLoc Loc;
-  unsigned NumElts = 16;
-  MVT IntVT = MVT::i8;
-  MVT VecVT = MVT::getVectorVT(IntVT, NumElts);
-
-  // Base scalar constants.
-  SDValue Val0 = DAG->getConstant(0, Loc, IntVT);
-  SDValue Val1 = DAG->getConstant(1, Loc, IntVT);
-  SDValue Val2 = DAG->getConstant(2, Loc, IntVT);
-  SDValue Val3 = DAG->getConstant(3, Loc, IntVT);
-  SDValue UndefVal = DAG->getUNDEF(IntVT);
-
-  // Build some repeating sequences.
-  SmallVector<SDValue, 16> Pattern1111, Pattern1133, Pattern0123;
-  for(int I = 0; I != 4; ++I) {
-    Pattern1111.append(4, Val1);
-    Pattern1133.append(2, Val1);
-    Pattern1133.append(2, Val3);
-    Pattern0123.push_back(Val0);
-    Pattern0123.push_back(Val1);
-    Pattern0123.push_back(Val2);
-    Pattern0123.push_back(Val3);
-  }
-
-  // Build a non-pow2 repeating sequence.
-  SmallVector<SDValue, 16> Pattern022;
-  Pattern022.push_back(Val0);
-  Pattern022.append(2, Val2);
-  Pattern022.push_back(Val0);
-  Pattern022.append(2, Val2);
-  Pattern022.push_back(Val0);
-  Pattern022.append(2, Val2);
-  Pattern022.push_back(Val0);
-  Pattern022.append(2, Val2);
-  Pattern022.push_back(Val0);
-  Pattern022.append(2, Val2);
-  Pattern022.push_back(Val0);
-
-  // Build a non-repeating sequence.
-  SmallVector<SDValue, 16> Pattern1_3;
-  Pattern1_3.append(8, Val1);
-  Pattern1_3.append(8, Val3);
-
-  // Add some undefs to make it trickier.
-  Pattern1111[1] = Pattern1111[2] = Pattern1111[15] = UndefVal;
-  Pattern1133[0] = Pattern1133[2] = UndefVal;
-
-  auto *BV1111 =
-      cast<BuildVectorSDNode>(DAG->getBuildVector(VecVT, Loc, Pattern1111));
-  auto *BV1133 =
-      cast<BuildVectorSDNode>(DAG->getBuildVector(VecVT, Loc, Pattern1133));
-  auto *BV0123=
-      cast<BuildVectorSDNode>(DAG->getBuildVector(VecVT, Loc, Pattern0123));
-  auto *BV022 =
-      cast<BuildVectorSDNode>(DAG->getBuildVector(VecVT, Loc, Pattern022));
-  auto *BV1_3 =
-      cast<BuildVectorSDNode>(DAG->getBuildVector(VecVT, Loc, Pattern1_3));
-
-  // Check for sequences.
-  SmallVector<SDValue, 16> Seq1111, Seq1133, Seq0123, Seq022, Seq1_3;
-  BitVector Undefs1111, Undefs1133, Undefs0123, Undefs022, Undefs1_3;
-
-  EXPECT_TRUE(BV1111->getRepeatedSequence(Seq1111, &Undefs1111));
-  EXPECT_EQ(Undefs1111.count(), 3u);
-  EXPECT_EQ(Seq1111.size(), 1u);
-  EXPECT_EQ(Seq1111[0], Val1);
-
-  EXPECT_TRUE(BV1133->getRepeatedSequence(Seq1133, &Undefs1133));
-  EXPECT_EQ(Undefs1133.count(), 2u);
-  EXPECT_EQ(Seq1133.size(), 4u);
-  EXPECT_EQ(Seq1133[0], Val1);
-  EXPECT_EQ(Seq1133[1], Val1);
-  EXPECT_EQ(Seq1133[2], Val3);
-  EXPECT_EQ(Seq1133[3], Val3);
-
-  EXPECT_TRUE(BV0123->getRepeatedSequence(Seq0123, &Undefs0123));
-  EXPECT_EQ(Undefs0123.count(), 0u);
-  EXPECT_EQ(Seq0123.size(), 4u);
-  EXPECT_EQ(Seq0123[0], Val0);
-  EXPECT_EQ(Seq0123[1], Val1);
-  EXPECT_EQ(Seq0123[2], Val2);
-  EXPECT_EQ(Seq0123[3], Val3);
-
-  EXPECT_FALSE(BV022->getRepeatedSequence(Seq022, &Undefs022));
-  EXPECT_FALSE(BV1_3->getRepeatedSequence(Seq1_3, &Undefs1_3));
-
-  // Try again with DemandedElts masks.
-  APInt Mask1111_0 = APInt::getOneBitSet(NumElts, 0);
-  EXPECT_TRUE(BV1111->getRepeatedSequence(Mask1111_0, Seq1111, &Undefs1111));
-  EXPECT_EQ(Undefs1111.count(), 0u);
-  EXPECT_EQ(Seq1111.size(), 1u);
-  EXPECT_EQ(Seq1111[0], Val1);
-
-  APInt Mask1111_1 = APInt::getOneBitSet(NumElts, 2);
-  EXPECT_TRUE(BV1111->getRepeatedSequence(Mask1111_1, Seq1111, &Undefs1111));
-  EXPECT_EQ(Undefs1111.count(), 1u);
-  EXPECT_EQ(Seq1111.size(), 1u);
-  EXPECT_EQ(Seq1111[0], UndefVal);
-
-  APInt Mask0123 = APInt(NumElts, 0x7777);
-  EXPECT_TRUE(BV0123->getRepeatedSequence(Mask0123, Seq0123, &Undefs0123));
-  EXPECT_EQ(Undefs0123.count(), 0u);
-  EXPECT_EQ(Seq0123.size(), 4u);
-  EXPECT_EQ(Seq0123[0], Val0);
-  EXPECT_EQ(Seq0123[1], Val1);
-  EXPECT_EQ(Seq0123[2], Val2);
-  EXPECT_EQ(Seq0123[3], SDValue());
-
-  APInt Mask1_3 = APInt::getHighBitsSet(16, 8);
-  EXPECT_TRUE(BV1_3->getRepeatedSequence(Mask1_3, Seq1_3, &Undefs1_3));
-  EXPECT_EQ(Undefs1_3.count(), 0u);
-  EXPECT_EQ(Seq1_3.size(), 1u);
-  EXPECT_EQ(Seq1_3[0], Val3);
-}
-
-TEST_F(AArch64SelectionDAGTest, getTypeConversion_SplitScalableMVT) {
-  MVT VT = MVT::nxv4i64;
-  EXPECT_EQ(getTypeAction(VT), TargetLoweringBase::TypeSplitVector);
-  ASSERT_TRUE(getTypeToTransformTo(VT).isScalableVector());
-}
-
-TEST_F(AArch64SelectionDAGTest, getTypeConversion_PromoteScalableMVT) {
-  MVT VT = MVT::nxv2i32;
-  EXPECT_EQ(getTypeAction(VT), TargetLoweringBase::TypePromoteInteger);
-  ASSERT_TRUE(getTypeToTransformTo(VT).isScalableVector());
-}
-
-TEST_F(AArch64SelectionDAGTest, getTypeConversion_NoScalarizeMVT_nxv1f32) {
-  MVT VT = MVT::nxv1f32;
-  EXPECT_NE(getTypeAction(VT), TargetLoweringBase::TypeScalarizeVector);
-  ASSERT_TRUE(getTypeToTransformTo(VT).isScalableVector());
-}
-
-TEST_F(AArch64SelectionDAGTest, getTypeConversion_SplitScalableEVT) {
-  EVT VT = EVT::getVectorVT(Context, MVT::i64, 256, true);
-  EXPECT_EQ(getTypeAction(VT), TargetLoweringBase::TypeSplitVector);
-  EXPECT_EQ(getTypeToTransformTo(VT), VT.getHalfNumVectorElementsVT(Context));
-}
-
-TEST_F(AArch64SelectionDAGTest, getTypeConversion_WidenScalableEVT) {
-  EVT FromVT = EVT::getVectorVT(Context, MVT::i64, 6, true);
-  EVT ToVT = EVT::getVectorVT(Context, MVT::i64, 8, true);
-
-  EXPECT_EQ(getTypeAction(FromVT), TargetLoweringBase::TypeWidenVector);
-  EXPECT_EQ(getTypeToTransformTo(FromVT), ToVT);
-}
-
-TEST_F(AArch64SelectionDAGTest,
-       getTypeConversion_ScalarizeScalableEVT_nxv1f128) {
-  EVT VT = EVT::getVectorVT(Context, MVT::f128, ElementCount::getScalable(1));
-  EXPECT_EQ(getTypeAction(VT), TargetLoweringBase::TypeScalarizeScalableVector);
-  EXPECT_EQ(getTypeToTransformTo(VT), MVT::f128);
-}
-
-TEST_F(AArch64SelectionDAGTest, TestFold_STEP_VECTOR) {
-  SDLoc Loc;
-  auto IntVT = EVT::getIntegerVT(Context, 8);
-  auto VecVT = EVT::getVectorVT(Context, MVT::i8, 16, true);
-
-  // Should create SPLAT_VECTOR
-  SDValue Zero = DAG->getConstant(0, Loc, IntVT);
-  SDValue Op = DAG->getNode(ISD::STEP_VECTOR, Loc, VecVT, Zero);
-  EXPECT_EQ(Op.getOpcode(), ISD::SPLAT_VECTOR);
-}
-
-} // end namespace llvm
diff --git a/gnu/llvm/llvm/unittests/CodeGen/AllocationOrderTest.cpp b/gnu/llvm/llvm/unittests/CodeGen/AllocationOrderTest.cpp
deleted file mode 100644
index d4da8e28ae7..00000000000
--- a/gnu/llvm/llvm/unittests/CodeGen/AllocationOrderTest.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-//===- llvm/unittest/CodeGen/AllocationOrderTest.cpp - AllocationOrder tests =//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "../lib/CodeGen/AllocationOrder.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-std::vector<MCPhysReg> loadOrder(const AllocationOrder &O, unsigned Limit = 0) {
-  std::vector<MCPhysReg> Ret;
-  if (Limit == 0)
-    for (auto R : O)
-      Ret.push_back(R);
-  else
-    for (auto I = O.begin(), E = O.getOrderLimitEnd(Limit); I != E; ++I)
-      Ret.push_back(*I);
-  return Ret;
-}
-} // namespace
-
-TEST(AllocationOrderTest, Basic) {
-  SmallVector<MCPhysReg, 16> Hints = {1, 2, 3};
-  SmallVector<MCPhysReg, 16> Order = {4, 5, 6, 7};
-  AllocationOrder O(std::move(Hints), Order, false);
-  EXPECT_EQ((std::vector<MCPhysReg>{1, 2, 3, 4, 5, 6, 7}), loadOrder(O));
-}
-
-TEST(AllocationOrderTest, Duplicates) {
-  SmallVector<MCPhysReg, 16> Hints = {1, 2, 3};
-  SmallVector<MCPhysReg, 16> Order = {4, 1, 5, 6};
-  AllocationOrder O(std::move(Hints), Order, false);
-  EXPECT_EQ((std::vector<MCPhysReg>{1, 2, 3, 4, 5, 6}), loadOrder(O));
-}
-
-TEST(AllocationOrderTest, HardHints) {
-  SmallVector<MCPhysReg, 16> Hints = {1, 2, 3};
-  SmallVector<MCPhysReg, 16> Order = {4, 5, 6, 7};
-  AllocationOrder O(std::move(Hints), Order, true);
-  EXPECT_EQ((std::vector<MCPhysReg>{1, 2, 3}), loadOrder(O));
-}
-
-TEST(AllocationOrderTest, LimitsBasic) {
-  SmallVector<MCPhysReg, 16> Hints = {1, 2, 3};
-  SmallVector<MCPhysReg, 16> Order = {4, 5, 6, 7};
-  AllocationOrder O(std::move(Hints), Order, false);
-  EXPECT_EQ((std::vector<MCPhysReg>{1, 2, 3, 4, 5, 6, 7}), loadOrder(O, 0));
-  EXPECT_EQ((std::vector<MCPhysReg>{1, 2, 3, 4}), loadOrder(O, 1));
-  EXPECT_EQ(O.end(), O.getOrderLimitEnd(0));
-}
-
-TEST(AllocationOrderTest, LimitsDuplicates) {
-  SmallVector<MCPhysReg, 16> Hints = {1, 2, 3};
-  SmallVector<MCPhysReg, 16> Order = {4, 1, 5, 6};
-  AllocationOrder O(std::move(Hints), Order, false);
-  EXPECT_EQ((std::vector<MCPhysReg>{1, 2, 3, 4}), loadOrder(O, 1));
-  EXPECT_EQ((std::vector<MCPhysReg>{1, 2, 3, 4}), loadOrder(O, 2));
-  EXPECT_EQ((std::vector<MCPhysReg>{1, 2, 3, 4, 5}), loadOrder(O, 3));
-  EXPECT_EQ((std::vector<MCPhysReg>{1, 2, 3, 4, 5, 6}), loadOrder(O, 4));
-}
-
-TEST(AllocationOrderTest, LimitsHardHints) {
-  SmallVector<MCPhysReg, 16> Hints = {1, 2, 3};
-  SmallVector<MCPhysReg, 16> Order = {4, 1, 5, 6};
-  AllocationOrder O(std::move(Hints), Order, true);
-  EXPECT_EQ((std::vector<MCPhysReg>{1, 2, 3}), loadOrder(O, 1));
-}
-
-TEST(AllocationOrderTest, DuplicateIsFirst) {
-  SmallVector<MCPhysReg, 16> Hints = {1, 2, 3};
-  SmallVector<MCPhysReg, 16> Order = {1, 4, 5, 6};
-  AllocationOrder O(std::move(Hints), Order, false);
-  EXPECT_EQ((std::vector<MCPhysReg>{1, 2, 3, 4, 5, 6}), loadOrder(O));
-}
-
-TEST(AllocationOrderTest, DuplicateIsFirstWithLimits) {
-  SmallVector<MCPhysReg, 16> Hints = {1, 2, 3};
-  SmallVector<MCPhysReg, 16> Order = {1, 4, 5, 6};
-  AllocationOrder O(std::move(Hints), Order, false);
-  EXPECT_EQ((std::vector<MCPhysReg>{1, 2, 3}), loadOrder(O, 1));
-  EXPECT_EQ((std::vector<MCPhysReg>{1, 2, 3, 4}), loadOrder(O, 2));
-  EXPECT_EQ((std::vector<MCPhysReg>{1, 2, 3, 4, 5}), loadOrder(O, 3));
-}
-
-TEST(AllocationOrderTest, NoHints) {
-  SmallVector<MCPhysReg, 16> Hints;
-  SmallVector<MCPhysReg, 16> Order = {1, 2, 3, 4};
-  AllocationOrder O(std::move(Hints), Order, false);
-  EXPECT_EQ((std::vector<MCPhysReg>{1, 2, 3, 4}), loadOrder(O));
-  EXPECT_EQ((std::vector<MCPhysReg>{1, 2}), loadOrder(O, 2));
-  EXPECT_EQ((std::vector<MCPhysReg>{1, 2, 3}), loadOrder(O, 3));
-}
-
-TEST(AllocationOrderTest, IsHintTest) {
-  SmallVector<MCPhysReg, 16> Hints = {1, 2, 3};
-  SmallVector<MCPhysReg, 16> Order = {4, 1, 5, 6};
-  AllocationOrder O(std::move(Hints), Order, false);
-  auto I = O.begin();
-  auto V = *I;
-  EXPECT_TRUE(I.isHint());
-  EXPECT_EQ(V, 1U);
-  ++I;
-  EXPECT_TRUE(I.isHint());
-  ++I;
-  EXPECT_TRUE(I.isHint());
-  V = *(++I);
-  EXPECT_FALSE(I.isHint());
-  EXPECT_EQ(V, 4U);
-  V = *(++I);
-  EXPECT_TRUE(O.isHint(1));
-  EXPECT_FALSE(I.isHint());
-  EXPECT_EQ(V, 5U);
-}
diff --git a/gnu/llvm/llvm/unittests/CodeGen/AsmPrinterDwarfTest.cpp b/gnu/llvm/llvm/unittests/CodeGen/AsmPrinterDwarfTest.cpp
deleted file mode 100644
index 8d2d1fe9fe8..00000000000
--- a/gnu/llvm/llvm/unittests/CodeGen/AsmPrinterDwarfTest.cpp
+++ /dev/null
@@ -1,430 +0,0 @@
-//===- llvm/unittest/CodeGen/AsmPrinterDwarfTest.cpp ----------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestAsmPrinter.h"
-#include "llvm/CodeGen/AsmPrinter.h"
-#include "llvm/CodeGen/MachineModuleInfo.h"
-#include "llvm/IR/LegacyPassManager.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/PassManager.h"
-#include "llvm/MC/MCContext.h"
-#include "llvm/MC/MCSectionELF.h"
-#include "llvm/Target/TargetMachine.h"
-#include "llvm/Testing/Support/Error.h"
-
-using namespace llvm;
-using testing::_;
-using testing::InSequence;
-using testing::SaveArg;
-
-namespace {
-
-class AsmPrinterFixtureBase : public testing::Test {
-  void setupTestPrinter(const std::string &TripleStr, unsigned DwarfVersion,
-                        dwarf::DwarfFormat DwarfFormat) {
-    auto ExpectedTestPrinter =
-        TestAsmPrinter::create(TripleStr, DwarfVersion, DwarfFormat);
-    ASSERT_THAT_EXPECTED(ExpectedTestPrinter, Succeeded());
-    TestPrinter = std::move(ExpectedTestPrinter.get());
-  }
-
-protected:
-  bool init(const std::string &TripleStr, unsigned DwarfVersion,
-            dwarf::DwarfFormat DwarfFormat) {
-    setupTestPrinter(TripleStr, DwarfVersion, DwarfFormat);
-    return TestPrinter != nullptr;
-  }
-
-  std::unique_ptr<TestAsmPrinter> TestPrinter;
-};
-
-class AsmPrinterEmitDwarfSymbolReferenceTest : public AsmPrinterFixtureBase {
-protected:
-  bool init(const std::string &TripleStr, unsigned DwarfVersion,
-            dwarf::DwarfFormat DwarfFormat) {
-    if (!AsmPrinterFixtureBase::init(TripleStr, DwarfVersion, DwarfFormat))
-      return false;
-
-    // AsmPrinter::emitDwarfSymbolReference(Label, true) gets the associated
-    // section from `Label` to find its BeginSymbol.
-    // Prepare the test symbol `Val` accordingly.
-
-    Val = TestPrinter->getCtx().createTempSymbol();
-    MCSection *Sec =
-        TestPrinter->getCtx().getELFSection(".tst", ELF::SHT_PROGBITS, 0);
-    SecBeginSymbol = Sec->getBeginSymbol();
-    TestPrinter->getMS().SwitchSection(Sec);
-    Val->setFragment(&Sec->getDummyFragment());
-
-    return true;
-  }
-
-  MCSymbol *Val = nullptr;
-  MCSymbol *SecBeginSymbol = nullptr;
-};
-
-TEST_F(AsmPrinterEmitDwarfSymbolReferenceTest, COFF) {
-  if (!init("x86_64-pc-windows", /*DwarfVersion=*/4, dwarf::DWARF32))
-    GTEST_SKIP();
-
-  EXPECT_CALL(TestPrinter->getMS(), EmitCOFFSecRel32(Val, 0));
-  TestPrinter->getAP()->emitDwarfSymbolReference(Val, false);
-}
-
-TEST_F(AsmPrinterEmitDwarfSymbolReferenceTest, COFFForceOffset) {
-  if (!init("x86_64-pc-windows", /*DwarfVersion=*/4, dwarf::DWARF32))
-    GTEST_SKIP();
-
-  EXPECT_CALL(TestPrinter->getMS(),
-              emitAbsoluteSymbolDiff(Val, SecBeginSymbol, 4));
-  TestPrinter->getAP()->emitDwarfSymbolReference(Val, true);
-}
-
-TEST_F(AsmPrinterEmitDwarfSymbolReferenceTest, ELFDWARF32) {
-  if (!init("x86_64-pc-linux", /*DwarfVersion=*/4, dwarf::DWARF32))
-    GTEST_SKIP();
-
-  const MCExpr *Arg0 = nullptr;
-  EXPECT_CALL(TestPrinter->getMS(), emitValueImpl(_, 4, _))
-      .WillOnce(SaveArg<0>(&Arg0));
-  TestPrinter->getAP()->emitDwarfSymbolReference(Val, false);
-
-  const MCSymbolRefExpr *ActualArg0 = dyn_cast_or_null<MCSymbolRefExpr>(Arg0);
-  ASSERT_NE(ActualArg0, nullptr);
-  EXPECT_EQ(&(ActualArg0->getSymbol()), Val);
-}
-
-TEST_F(AsmPrinterEmitDwarfSymbolReferenceTest, ELFDWARF32ForceOffset) {
-  if (!init("x86_64-pc-linux", /*DwarfVersion=*/4, dwarf::DWARF32))
-    GTEST_SKIP();
-
-  EXPECT_CALL(TestPrinter->getMS(),
-              emitAbsoluteSymbolDiff(Val, SecBeginSymbol, 4));
-  TestPrinter->getAP()->emitDwarfSymbolReference(Val, true);
-}
-
-TEST_F(AsmPrinterEmitDwarfSymbolReferenceTest, ELFDWARF64) {
-  if (!init("x86_64-pc-linux", /*DwarfVersion=*/4, dwarf::DWARF64))
-    GTEST_SKIP();
-
-  const MCExpr *Arg0 = nullptr;
-  EXPECT_CALL(TestPrinter->getMS(), emitValueImpl(_, 8, _))
-      .WillOnce(SaveArg<0>(&Arg0));
-  TestPrinter->getAP()->emitDwarfSymbolReference(Val, false);
-
-  const MCSymbolRefExpr *ActualArg0 = dyn_cast_or_null<MCSymbolRefExpr>(Arg0);
-  ASSERT_NE(ActualArg0, nullptr);
-  EXPECT_EQ(&(ActualArg0->getSymbol()), Val);
-}
-
-TEST_F(AsmPrinterEmitDwarfSymbolReferenceTest, ELFDWARF64ForceOffset) {
-  if (!init("x86_64-pc-linux", /*DwarfVersion=*/4, dwarf::DWARF64))
-    GTEST_SKIP();
-
-  EXPECT_CALL(TestPrinter->getMS(),
-              emitAbsoluteSymbolDiff(Val, SecBeginSymbol, 8));
-  TestPrinter->getAP()->emitDwarfSymbolReference(Val, true);
-}
-
-class AsmPrinterEmitDwarfStringOffsetTest : public AsmPrinterFixtureBase {
-protected:
-  bool init(const std::string &TripleStr, unsigned DwarfVersion,
-            dwarf::DwarfFormat DwarfFormat) {
-    if (!AsmPrinterFixtureBase::init(TripleStr, DwarfVersion, DwarfFormat))
-      return false;
-
-    Val.Index = DwarfStringPoolEntry::NotIndexed;
-    Val.Symbol = TestPrinter->getCtx().createTempSymbol();
-    Val.Offset = 42;
-    return true;
-  }
-
-  DwarfStringPoolEntry Val;
-};
-
-TEST_F(AsmPrinterEmitDwarfStringOffsetTest, DWARF32) {
-  if (!init("x86_64-pc-linux", /*DwarfVersion=*/4, dwarf::DWARF32))
-    GTEST_SKIP();
-
-  const MCExpr *Arg0 = nullptr;
-  EXPECT_CALL(TestPrinter->getMS(), emitValueImpl(_, 4, _))
-      .WillOnce(SaveArg<0>(&Arg0));
-  TestPrinter->getAP()->emitDwarfStringOffset(Val);
-
-  const MCSymbolRefExpr *ActualArg0 = dyn_cast_or_null<MCSymbolRefExpr>(Arg0);
-  ASSERT_NE(ActualArg0, nullptr);
-  EXPECT_EQ(&(ActualArg0->getSymbol()), Val.Symbol);
-}
-
-TEST_F(AsmPrinterEmitDwarfStringOffsetTest,
-       DWARF32NoRelocationsAcrossSections) {
-  if (!init("x86_64-pc-linux", /*DwarfVersion=*/4, dwarf::DWARF32))
-    GTEST_SKIP();
-
-  TestPrinter->setDwarfUsesRelocationsAcrossSections(false);
-  EXPECT_CALL(TestPrinter->getMS(), emitIntValue(Val.Offset, 4));
-  TestPrinter->getAP()->emitDwarfStringOffset(Val);
-}
-
-TEST_F(AsmPrinterEmitDwarfStringOffsetTest, DWARF64) {
-  if (!init("x86_64-pc-linux", /*DwarfVersion=*/4, dwarf::DWARF64))
-    GTEST_SKIP();
-
-  const MCExpr *Arg0 = nullptr;
-  EXPECT_CALL(TestPrinter->getMS(), emitValueImpl(_, 8, _))
-      .WillOnce(SaveArg<0>(&Arg0));
-  TestPrinter->getAP()->emitDwarfStringOffset(Val);
-
-  const MCSymbolRefExpr *ActualArg0 = dyn_cast_or_null<MCSymbolRefExpr>(Arg0);
-  ASSERT_NE(ActualArg0, nullptr);
-  EXPECT_EQ(&(ActualArg0->getSymbol()), Val.Symbol);
-}
-
-TEST_F(AsmPrinterEmitDwarfStringOffsetTest,
-       DWARF64NoRelocationsAcrossSections) {
-  if (!init("x86_64-pc-linux", /*DwarfVersion=*/4, dwarf::DWARF64))
-    GTEST_SKIP();
-
-  TestPrinter->setDwarfUsesRelocationsAcrossSections(false);
-  EXPECT_CALL(TestPrinter->getMS(), emitIntValue(Val.Offset, 8));
-  TestPrinter->getAP()->emitDwarfStringOffset(Val);
-}
-
-class AsmPrinterEmitDwarfOffsetTest : public AsmPrinterFixtureBase {
-protected:
-  bool init(const std::string &TripleStr, unsigned DwarfVersion,
-            dwarf::DwarfFormat DwarfFormat) {
-    if (!AsmPrinterFixtureBase::init(TripleStr, DwarfVersion, DwarfFormat))
-      return false;
-
-    Label = TestPrinter->getCtx().createTempSymbol();
-    return true;
-  }
-
-  MCSymbol *Label = nullptr;
-  uint64_t Offset = 42;
-};
-
-TEST_F(AsmPrinterEmitDwarfOffsetTest, DWARF32) {
-  if (!init("x86_64-pc-linux", /*DwarfVersion=*/4, dwarf::DWARF32))
-    GTEST_SKIP();
-
-  const MCExpr *Arg0 = nullptr;
-  EXPECT_CALL(TestPrinter->getMS(), emitValueImpl(_, 4, _))
-      .WillOnce(SaveArg<0>(&Arg0));
-  TestPrinter->getAP()->emitDwarfOffset(Label, Offset);
-
-  const MCBinaryExpr *ActualArg0 = dyn_cast_or_null<MCBinaryExpr>(Arg0);
-  ASSERT_NE(ActualArg0, nullptr);
-  EXPECT_EQ(ActualArg0->getOpcode(), MCBinaryExpr::Add);
-
-  const MCSymbolRefExpr *ActualLHS =
-      dyn_cast_or_null<MCSymbolRefExpr>(ActualArg0->getLHS());
-  ASSERT_NE(ActualLHS, nullptr);
-  EXPECT_EQ(&(ActualLHS->getSymbol()), Label);
-
-  const MCConstantExpr *ActualRHS =
-      dyn_cast_or_null<MCConstantExpr>(ActualArg0->getRHS());
-  ASSERT_NE(ActualRHS, nullptr);
-  EXPECT_EQ(static_cast<uint64_t>(ActualRHS->getValue()), Offset);
-}
-
-TEST_F(AsmPrinterEmitDwarfOffsetTest, DWARF64) {
-  if (!init("x86_64-pc-linux", /*DwarfVersion=*/4, dwarf::DWARF64))
-    GTEST_SKIP();
-
-  const MCExpr *Arg0 = nullptr;
-  EXPECT_CALL(TestPrinter->getMS(), emitValueImpl(_, 8, _))
-      .WillOnce(SaveArg<0>(&Arg0));
-  TestPrinter->getAP()->emitDwarfOffset(Label, Offset);
-
-  const MCBinaryExpr *ActualArg0 = dyn_cast_or_null<MCBinaryExpr>(Arg0);
-  ASSERT_NE(ActualArg0, nullptr);
-  EXPECT_EQ(ActualArg0->getOpcode(), MCBinaryExpr::Add);
-
-  const MCSymbolRefExpr *ActualLHS =
-      dyn_cast_or_null<MCSymbolRefExpr>(ActualArg0->getLHS());
-  ASSERT_NE(ActualLHS, nullptr);
-  EXPECT_EQ(&(ActualLHS->getSymbol()), Label);
-
-  const MCConstantExpr *ActualRHS =
-      dyn_cast_or_null<MCConstantExpr>(ActualArg0->getRHS());
-  ASSERT_NE(ActualRHS, nullptr);
-  EXPECT_EQ(static_cast<uint64_t>(ActualRHS->getValue()), Offset);
-}
-
-class AsmPrinterEmitDwarfLengthOrOffsetTest : public AsmPrinterFixtureBase {
-protected:
-  uint64_t Val = 42;
-};
-
-TEST_F(AsmPrinterEmitDwarfLengthOrOffsetTest, DWARF32) {
-  if (!init("x86_64-pc-linux", /*DwarfVersion=*/4, dwarf::DWARF32))
-    GTEST_SKIP();
-
-  EXPECT_CALL(TestPrinter->getMS(), emitIntValue(Val, 4));
-  TestPrinter->getAP()->emitDwarfLengthOrOffset(Val);
-}
-
-TEST_F(AsmPrinterEmitDwarfLengthOrOffsetTest, DWARF64) {
-  if (!init("x86_64-pc-linux", /*DwarfVersion=*/4, dwarf::DWARF64))
-    GTEST_SKIP();
-
-  EXPECT_CALL(TestPrinter->getMS(), emitIntValue(Val, 8));
-  TestPrinter->getAP()->emitDwarfLengthOrOffset(Val);
-}
-
-class AsmPrinterGetUnitLengthFieldByteSizeTest : public AsmPrinterFixtureBase {
-};
-
-TEST_F(AsmPrinterGetUnitLengthFieldByteSizeTest, DWARF32) {
-  if (!init("x86_64-pc-linux", /*DwarfVersion=*/4, dwarf::DWARF32))
-    GTEST_SKIP();
-
-  EXPECT_EQ(TestPrinter->getAP()->getUnitLengthFieldByteSize(), 4u);
-}
-
-TEST_F(AsmPrinterGetUnitLengthFieldByteSizeTest, DWARF64) {
-  if (!init("x86_64-pc-linux", /*DwarfVersion=*/4, dwarf::DWARF64))
-    GTEST_SKIP();
-
-  EXPECT_EQ(TestPrinter->getAP()->getUnitLengthFieldByteSize(), 12u);
-}
-
-class AsmPrinterEmitDwarfUnitLengthAsIntTest : public AsmPrinterFixtureBase {
-protected:
-  uint64_t Val = 42;
-};
-
-TEST_F(AsmPrinterEmitDwarfUnitLengthAsIntTest, DWARF32) {
-  if (!init("x86_64-pc-linux", /*DwarfVersion=*/4, dwarf::DWARF32))
-    GTEST_SKIP();
-
-  EXPECT_CALL(TestPrinter->getMS(), emitIntValue(Val, 4));
-  TestPrinter->getAP()->emitDwarfUnitLength(Val, "");
-}
-
-TEST_F(AsmPrinterEmitDwarfUnitLengthAsIntTest, DWARF64) {
-  if (!init("x86_64-pc-linux", /*DwarfVersion=*/4, dwarf::DWARF64))
-    GTEST_SKIP();
-
-  InSequence S;
-  EXPECT_CALL(TestPrinter->getMS(), emitIntValue(dwarf::DW_LENGTH_DWARF64, 4));
-  EXPECT_CALL(TestPrinter->getMS(), emitIntValue(Val, 8));
-
-  TestPrinter->getAP()->emitDwarfUnitLength(Val, "");
-}
-
-class AsmPrinterEmitDwarfUnitLengthAsHiLoDiffTest
-    : public AsmPrinterFixtureBase {
-protected:
-  bool init(const std::string &TripleStr, unsigned DwarfVersion,
-            dwarf::DwarfFormat DwarfFormat) {
-    if (!AsmPrinterFixtureBase::init(TripleStr, DwarfVersion, DwarfFormat))
-      return false;
-
-    return true;
-  }
-};
-
-TEST_F(AsmPrinterEmitDwarfUnitLengthAsHiLoDiffTest, DWARF32) {
-  if (!init("x86_64-pc-linux", /*DwarfVersion=*/4, dwarf::DWARF32))
-    GTEST_SKIP();
-
-  InSequence S;
-  const MCSymbol *Hi = nullptr;
-  const MCSymbol *Lo = nullptr;
-  EXPECT_CALL(TestPrinter->getMS(), emitAbsoluteSymbolDiff(_, _, 4))
-      .WillOnce(DoAll(SaveArg<0>(&Hi), SaveArg<1>(&Lo)));
-  MCSymbol *LTmp = nullptr;
-  EXPECT_CALL(TestPrinter->getMS(), emitLabel(_, _))
-      .WillOnce(SaveArg<0>(&LTmp));
-
-  MCSymbol *HTmp = TestPrinter->getAP()->emitDwarfUnitLength("", "");
-  EXPECT_NE(Lo, nullptr);
-  EXPECT_EQ(Lo, LTmp);
-  EXPECT_NE(Hi, nullptr);
-  EXPECT_EQ(Hi, HTmp);
-}
-
-TEST_F(AsmPrinterEmitDwarfUnitLengthAsHiLoDiffTest, DWARF64) {
-  if (!init("x86_64-pc-linux", /*DwarfVersion=*/4, dwarf::DWARF64))
-    GTEST_SKIP();
-
-  InSequence S;
-  const MCSymbol *Hi = nullptr;
-  const MCSymbol *Lo = nullptr;
-  EXPECT_CALL(TestPrinter->getMS(), emitIntValue(dwarf::DW_LENGTH_DWARF64, 4));
-  EXPECT_CALL(TestPrinter->getMS(), emitAbsoluteSymbolDiff(_, _, 8))
-      .WillOnce(DoAll(SaveArg<0>(&Hi), SaveArg<1>(&Lo)));
-  MCSymbol *LTmp = nullptr;
-  EXPECT_CALL(TestPrinter->getMS(), emitLabel(_, _))
-      .WillOnce(SaveArg<0>(&LTmp));
-
-  MCSymbol *HTmp = TestPrinter->getAP()->emitDwarfUnitLength("", "");
-  EXPECT_NE(Lo, nullptr);
-  EXPECT_EQ(Lo, LTmp);
-  EXPECT_NE(Hi, nullptr);
-  EXPECT_EQ(Hi, HTmp);
-}
-
-class AsmPrinterHandlerTest : public AsmPrinterFixtureBase {
-  class TestHandler : public AsmPrinterHandler {
-    AsmPrinterHandlerTest &Test;
-
-  public:
-    TestHandler(AsmPrinterHandlerTest &Test) : Test(Test) {}
-    virtual ~TestHandler() {}
-    virtual void setSymbolSize(const MCSymbol *Sym, uint64_t Size) override {}
-    virtual void beginModule(Module *M) override { Test.BeginCount++; }
-    virtual void endModule() override { Test.EndCount++; }
-    virtual void beginFunction(const MachineFunction *MF) override {}
-    virtual void endFunction(const MachineFunction *MF) override {}
-    virtual void beginInstruction(const MachineInstr *MI) override {}
-    virtual void endInstruction() override {}
-  };
-
-protected:
-  bool init(const std::string &TripleStr, unsigned DwarfVersion,
-            dwarf::DwarfFormat DwarfFormat) {
-    if (!AsmPrinterFixtureBase::init(TripleStr, DwarfVersion, DwarfFormat))
-      return false;
-
-    auto *AP = TestPrinter->getAP();
-    AP->addAsmPrinterHandler(AsmPrinter::HandlerInfo(
-        std::unique_ptr<AsmPrinterHandler>(new TestHandler(*this)),
-        "TestTimerName", "TestTimerDesc", "TestGroupName", "TestGroupDesc"));
-    LLVMTargetMachine *LLVMTM = static_cast<LLVMTargetMachine *>(&AP->TM);
-    legacy::PassManager PM;
-    PM.add(new MachineModuleInfoWrapperPass(LLVMTM));
-    PM.add(TestPrinter->releaseAP()); // Takes ownership of destroying AP
-    LLVMContext Context;
-    std::unique_ptr<Module> M(new Module("TestModule", Context));
-    M->setDataLayout(LLVMTM->createDataLayout());
-    PM.run(*M);
-    // Now check that we can run it twice.
-    AP->addAsmPrinterHandler(AsmPrinter::HandlerInfo(
-        std::unique_ptr<AsmPrinterHandler>(new TestHandler(*this)),
-        "TestTimerName", "TestTimerDesc", "TestGroupName", "TestGroupDesc"));
-    PM.run(*M);
-    return true;
-  }
-
-  int BeginCount = 0;
-  int EndCount = 0;
-};
-
-TEST_F(AsmPrinterHandlerTest, Basic) {
-  if (!init("x86_64-pc-linux", /*DwarfVersion=*/4, dwarf::DWARF32))
-    GTEST_SKIP();
-
-  ASSERT_EQ(BeginCount, 3);
-  ASSERT_EQ(EndCount, 3);
-}
-
-} // end namespace
diff --git a/gnu/llvm/llvm/unittests/CodeGen/CMakeLists.txt b/gnu/llvm/llvm/unittests/CodeGen/CMakeLists.txt
deleted file mode 100644
index 4d784511404..00000000000
--- a/gnu/llvm/llvm/unittests/CodeGen/CMakeLists.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
-  Analysis
-  AsmParser
-  AsmPrinter
-  CodeGen
-  Core
-  FileCheck
-  MC
-  MIRParser
-  Passes
-  SelectionDAG
-  Support
-  Target
-  )
-
-add_llvm_unittest(CodeGenTests
-  AArch64SelectionDAGTest.cpp
-  AllocationOrderTest.cpp
-  AsmPrinterDwarfTest.cpp
-  DIEHashTest.cpp
-  DIETest.cpp
-  LowLevelTypeTest.cpp
-  LexicalScopesTest.cpp
-  MachineInstrBundleIteratorTest.cpp
-  MachineInstrTest.cpp
-  MachineOperandTest.cpp
-  PassManagerTest.cpp
-  ScalableVectorMVTsTest.cpp
-  SelectionDAGAddressAnalysisTest.cpp
-  TypeTraitsTest.cpp
-  TargetOptionsTest.cpp
-  TestAsmPrinter.cpp
-  )
-
-add_subdirectory(GlobalISel)
-
-target_link_libraries(CodeGenTests PRIVATE LLVMTestingSupport)
diff --git a/gnu/llvm/llvm/unittests/CodeGen/DIEHashTest.cpp b/gnu/llvm/llvm/unittests/CodeGen/DIEHashTest.cpp
deleted file mode 100644
index b6dbb7452aa..00000000000
--- a/gnu/llvm/llvm/unittests/CodeGen/DIEHashTest.cpp
+++ /dev/null
@@ -1,718 +0,0 @@
-//===- llvm/unittest/CodeGen/DIEHashTest.cpp ------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "../lib/CodeGen/AsmPrinter/DIEHash.h"
-#include "TestAsmPrinter.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/BinaryFormat/Dwarf.h"
-#include "llvm/CodeGen/DIE.h"
-#include "llvm/CodeGen/DwarfStringPoolEntry.h"
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/Format.h"
-#include "llvm/Support/Host.h"
-#include "llvm/Testing/Support/Error.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-// Test fixture
-class DIEHashTest : public testing::Test {
-public:
-  BumpPtrAllocator Alloc;
-
-private:
-  StringMap<DwarfStringPoolEntry> Pool;
-  std::unique_ptr<TestAsmPrinter> TestPrinter;
-
-  void setupTestPrinter() {
-    auto ExpectedTestPrinter = TestAsmPrinter::create(
-        sys::getDefaultTargetTriple(), /*DwarfVersion=*/4, dwarf::DWARF32);
-    ASSERT_THAT_EXPECTED(ExpectedTestPrinter, Succeeded());
-    TestPrinter = std::move(ExpectedTestPrinter.get());
-  }
-
-public:
-  DIEString getString(StringRef S) {
-    DwarfStringPoolEntry Entry = {nullptr, 1, 1};
-    return DIEString(DwarfStringPoolEntryRef(
-        *Pool.insert(std::make_pair(S, Entry)).first, Entry.isIndexed()));
-  }
-
-  AsmPrinter *getAsmPrinter() {
-    if (!TestPrinter)
-      setupTestPrinter();
-    return TestPrinter ? TestPrinter->getAP() : nullptr;
-  }
-};
-
-TEST_F(DIEHashTest, Data1) {
-  DIEHash Hash;
-  DIE &Die = *DIE::get(Alloc, dwarf::DW_TAG_base_type);
-  DIEInteger Size(4);
-  Die.addValue(Alloc, dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1, Size);
-  uint64_t MD5Res = Hash.computeTypeSignature(Die);
-  ASSERT_EQ(0x1AFE116E83701108ULL, MD5Res);
-}
-
-// struct {};
-TEST_F(DIEHashTest, TrivialType) {
-  DIE &Unnamed = *DIE::get(Alloc, dwarf::DW_TAG_structure_type);
-  DIEInteger One(1);
-  Unnamed.addValue(Alloc, dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1, One);
-
-  // Line and file number are ignored.
-  Unnamed.addValue(Alloc, dwarf::DW_AT_decl_file, dwarf::DW_FORM_data1, One);
-  Unnamed.addValue(Alloc, dwarf::DW_AT_decl_line, dwarf::DW_FORM_data1, One);
-  uint64_t MD5Res = DIEHash().computeTypeSignature(Unnamed);
-
-  // The exact same hash GCC produces for this DIE.
-  ASSERT_EQ(0x715305ce6cfd9ad1ULL, MD5Res);
-}
-
-// struct foo { };
-TEST_F(DIEHashTest, NamedType) {
-  DIE &Foo = *DIE::get(Alloc, dwarf::DW_TAG_structure_type);
-  DIEInteger One(1);
-  DIEString FooStr = getString("foo");
-  Foo.addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, FooStr);
-  Foo.addValue(Alloc, dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1, One);
-
-  uint64_t MD5Res = DIEHash().computeTypeSignature(Foo);
-
-  // The exact same hash GCC produces for this DIE.
-  ASSERT_EQ(0xd566dbd2ca5265ffULL, MD5Res);
-}
-
-// namespace space { struct foo { }; }
-TEST_F(DIEHashTest, NamespacedType) {
-  DIE &CU = *DIE::get(Alloc, dwarf::DW_TAG_compile_unit);
-
-  auto Space = DIE::get(Alloc, dwarf::DW_TAG_namespace);
-  DIEInteger One(1);
-  DIEString SpaceStr = getString("space");
-  Space->addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, SpaceStr);
-  // DW_AT_declaration is ignored.
-  Space->addValue(Alloc, dwarf::DW_AT_declaration, dwarf::DW_FORM_flag_present,
-                  One);
-  // sibling?
-
-  auto Foo = DIE::get(Alloc, dwarf::DW_TAG_structure_type);
-  DIEString FooStr = getString("foo");
-  Foo->addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, FooStr);
-  Foo->addValue(Alloc, dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1, One);
-
-  DIE &N = *Foo;
-  Space->addChild(std::move(Foo));
-  CU.addChild(std::move(Space));
-
-  uint64_t MD5Res = DIEHash().computeTypeSignature(N);
-
-  // The exact same hash GCC produces for this DIE.
-  ASSERT_EQ(0x7b80381fd17f1e33ULL, MD5Res);
-}
-
-// struct { int member; };
-TEST_F(DIEHashTest, TypeWithMember) {
-  DIE &Unnamed = *DIE::get(Alloc, dwarf::DW_TAG_structure_type);
-  DIEInteger Four(4);
-  Unnamed.addValue(Alloc, dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1, Four);
-
-  DIE &Int = *DIE::get(Alloc, dwarf::DW_TAG_base_type);
-  DIEString IntStr = getString("int");
-  Int.addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, IntStr);
-  Int.addValue(Alloc, dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1, Four);
-  DIEInteger Five(5);
-  Int.addValue(Alloc, dwarf::DW_AT_encoding, dwarf::DW_FORM_data1, Five);
-
-  DIEEntry IntRef(Int);
-
-  auto Member = DIE::get(Alloc, dwarf::DW_TAG_member);
-  DIEString MemberStr = getString("member");
-  Member->addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, MemberStr);
-  DIEInteger Zero(0);
-  Member->addValue(Alloc, dwarf::DW_AT_data_member_location,
-                   dwarf::DW_FORM_data1, Zero);
-  Member->addValue(Alloc, dwarf::DW_AT_type, dwarf::DW_FORM_ref4, IntRef);
-
-  Unnamed.addChild(std::move(Member));
-
-  uint64_t MD5Res = DIEHash().computeTypeSignature(Unnamed);
-
-  ASSERT_EQ(0x5646aa436b7e07c6ULL, MD5Res);
-}
-
-// struct foo { int mem1, mem2; };
-TEST_F(DIEHashTest, ReusedType) {
-  DIE &Unnamed = *DIE::get(Alloc, dwarf::DW_TAG_structure_type);
-  DIEInteger Eight(8);
-  Unnamed.addValue(Alloc, dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1, Eight);
-
-  DIEInteger Four(4);
-  DIE &Int = *DIE::get(Alloc, dwarf::DW_TAG_base_type);
-  DIEString IntStr = getString("int");
-  Int.addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, IntStr);
-  Int.addValue(Alloc, dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1, Four);
-  DIEInteger Five(5);
-  Int.addValue(Alloc, dwarf::DW_AT_encoding, dwarf::DW_FORM_data1, Five);
-
-  DIEEntry IntRef(Int);
-
-  auto Mem1 = DIE::get(Alloc, dwarf::DW_TAG_member);
-  DIEString Mem1Str = getString("mem1");
-  Mem1->addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, Mem1Str);
-  DIEInteger Zero(0);
-  Mem1->addValue(Alloc, dwarf::DW_AT_data_member_location, dwarf::DW_FORM_data1,
-                 Zero);
-  Mem1->addValue(Alloc, dwarf::DW_AT_type, dwarf::DW_FORM_ref4, IntRef);
-
-  Unnamed.addChild(std::move(Mem1));
-
-  auto Mem2 = DIE::get(Alloc, dwarf::DW_TAG_member);
-  DIEString Mem2Str = getString("mem2");
-  Mem2->addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, Mem2Str);
-  Mem2->addValue(Alloc, dwarf::DW_AT_data_member_location, dwarf::DW_FORM_data1,
-                 Four);
-  Mem2->addValue(Alloc, dwarf::DW_AT_type, dwarf::DW_FORM_ref4, IntRef);
-
-  Unnamed.addChild(std::move(Mem2));
-
-  uint64_t MD5Res = DIEHash().computeTypeSignature(Unnamed);
-
-  ASSERT_EQ(0x3a7dc3ed7b76b2f8ULL, MD5Res);
-}
-
-// struct foo { static foo f; };
-TEST_F(DIEHashTest, RecursiveType) {
-  DIE &Foo = *DIE::get(Alloc, dwarf::DW_TAG_structure_type);
-  DIEInteger One(1);
-  Foo.addValue(Alloc, dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1, One);
-  DIEString FooStr = getString("foo");
-  Foo.addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, FooStr);
-
-  auto Mem = DIE::get(Alloc, dwarf::DW_TAG_member);
-  DIEString MemStr = getString("mem");
-  Mem->addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, MemStr);
-  DIEEntry FooRef(Foo);
-  Mem->addValue(Alloc, dwarf::DW_AT_type, dwarf::DW_FORM_ref4, FooRef);
-  // DW_AT_external and DW_AT_declaration are ignored anyway, so skip them.
-
-  Foo.addChild(std::move(Mem));
-
-  uint64_t MD5Res = DIEHash().computeTypeSignature(Foo);
-
-  ASSERT_EQ(0x73d8b25aef227b06ULL, MD5Res);
-}
-
-// struct foo { foo *mem; };
-TEST_F(DIEHashTest, Pointer) {
-  DIE &Foo = *DIE::get(Alloc, dwarf::DW_TAG_structure_type);
-  DIEInteger Eight(8);
-  Foo.addValue(Alloc, dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1, Eight);
-  DIEString FooStr = getString("foo");
-  Foo.addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, FooStr);
-
-  auto Mem = DIE::get(Alloc, dwarf::DW_TAG_member);
-  DIEString MemStr = getString("mem");
-  Mem->addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, MemStr);
-  DIEInteger Zero(0);
-  Mem->addValue(Alloc, dwarf::DW_AT_data_member_location, dwarf::DW_FORM_data1,
-                Zero);
-
-  DIE &FooPtr = *DIE::get(Alloc, dwarf::DW_TAG_pointer_type);
-  FooPtr.addValue(Alloc, dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1, Eight);
-  DIEEntry FooRef(Foo);
-  FooPtr.addValue(Alloc, dwarf::DW_AT_type, dwarf::DW_FORM_ref4, FooRef);
-
-  DIEEntry FooPtrRef(FooPtr);
-  Mem->addValue(Alloc, dwarf::DW_AT_type, dwarf::DW_FORM_ref4, FooPtrRef);
-
-  Foo.addChild(std::move(Mem));
-
-  uint64_t MD5Res = DIEHash().computeTypeSignature(Foo);
-
-  ASSERT_EQ(0x74ea73862e8708d2ULL, MD5Res);
-}
-
-// struct foo { foo &mem; };
-TEST_F(DIEHashTest, Reference) {
-  DIE &Foo = *DIE::get(Alloc, dwarf::DW_TAG_structure_type);
-  DIEInteger Eight(8);
-  Foo.addValue(Alloc, dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1, Eight);
-  DIEString FooStr = getString("foo");
-  Foo.addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, FooStr);
-
-  auto Mem = DIE::get(Alloc, dwarf::DW_TAG_member);
-  DIEString MemStr = getString("mem");
-  Mem->addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, MemStr);
-  DIEInteger Zero(0);
-  Mem->addValue(Alloc, dwarf::DW_AT_data_member_location, dwarf::DW_FORM_data1,
-                Zero);
-
-  DIE &FooRef = *DIE::get(Alloc, dwarf::DW_TAG_reference_type);
-  FooRef.addValue(Alloc, dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1, Eight);
-  DIEEntry FooEntry(Foo);
-  FooRef.addValue(Alloc, dwarf::DW_AT_type, dwarf::DW_FORM_ref4, FooEntry);
-
-  DIE &FooRefConst = *DIE::get(Alloc, dwarf::DW_TAG_const_type);
-  DIEEntry FooRefRef(FooRef);
-  FooRefConst.addValue(Alloc, dwarf::DW_AT_type, dwarf::DW_FORM_ref4,
-                       FooRefRef);
-
-  DIEEntry FooRefConstRef(FooRefConst);
-  Mem->addValue(Alloc, dwarf::DW_AT_type, dwarf::DW_FORM_ref4, FooRefConstRef);
-
-  Foo.addChild(std::move(Mem));
-
-  uint64_t MD5Res = DIEHash().computeTypeSignature(Foo);
-
-  ASSERT_EQ(0xa0b15f467ad4525bULL, MD5Res);
-}
-
-// struct foo { foo &&mem; };
-TEST_F(DIEHashTest, RValueReference) {
-  DIE &Foo = *DIE::get(Alloc, dwarf::DW_TAG_structure_type);
-  DIEInteger Eight(8);
-  Foo.addValue(Alloc, dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1, Eight);
-  DIEString FooStr = getString("foo");
-  Foo.addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, FooStr);
-
-  auto Mem = DIE::get(Alloc, dwarf::DW_TAG_member);
-  DIEString MemStr = getString("mem");
-  Mem->addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, MemStr);
-  DIEInteger Zero(0);
-  Mem->addValue(Alloc, dwarf::DW_AT_data_member_location, dwarf::DW_FORM_data1,
-                Zero);
-
-  DIE &FooRef = *DIE::get(Alloc, dwarf::DW_TAG_rvalue_reference_type);
-  FooRef.addValue(Alloc, dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1, Eight);
-  DIEEntry FooEntry(Foo);
-  FooRef.addValue(Alloc, dwarf::DW_AT_type, dwarf::DW_FORM_ref4, FooEntry);
-
-  DIE &FooRefConst = *DIE::get(Alloc, dwarf::DW_TAG_const_type);
-  DIEEntry FooRefRef(FooRef);
-  FooRefConst.addValue(Alloc, dwarf::DW_AT_type, dwarf::DW_FORM_ref4,
-                       FooRefRef);
-
-  DIEEntry FooRefConstRef(FooRefConst);
-  Mem->addValue(Alloc, dwarf::DW_AT_type, dwarf::DW_FORM_ref4, FooRefConstRef);
-
-  Foo.addChild(std::move(Mem));
-
-  uint64_t MD5Res = DIEHash().computeTypeSignature(Foo);
-
-  ASSERT_EQ(0xad211c8c3b31e57ULL, MD5Res);
-}
-
-// struct foo { foo foo::*mem; };
-TEST_F(DIEHashTest, PtrToMember) {
-  DIE &Foo = *DIE::get(Alloc, dwarf::DW_TAG_structure_type);
-  DIEInteger Eight(8);
-  Foo.addValue(Alloc, dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1, Eight);
-  DIEString FooStr = getString("foo");
-  Foo.addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, FooStr);
-
-  auto Mem = DIE::get(Alloc, dwarf::DW_TAG_member);
-  DIEString MemStr = getString("mem");
-  Mem->addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, MemStr);
-  DIEInteger Zero(0);
-  Mem->addValue(Alloc, dwarf::DW_AT_data_member_location, dwarf::DW_FORM_data1,
-                Zero);
-
-  DIE &PtrToFooMem = *DIE::get(Alloc, dwarf::DW_TAG_ptr_to_member_type);
-  DIEEntry FooEntry(Foo);
-  PtrToFooMem.addValue(Alloc, dwarf::DW_AT_type, dwarf::DW_FORM_ref4, FooEntry);
-  PtrToFooMem.addValue(Alloc, dwarf::DW_AT_containing_type, dwarf::DW_FORM_ref4,
-                       FooEntry);
-
-  DIEEntry PtrToFooMemRef(PtrToFooMem);
-  Mem->addValue(Alloc, dwarf::DW_AT_type, dwarf::DW_FORM_ref4, PtrToFooMemRef);
-
-  Foo.addChild(std::move(Mem));
-
-  uint64_t MD5Res = DIEHash().computeTypeSignature(Foo);
-
-  ASSERT_EQ(0x852e0c9ff7c04ebULL, MD5Res);
-}
-
-// Check that the hash for a pointer-to-member matches regardless of whether the
-// pointed-to type is a declaration or a definition.
-//
-//   struct bar; // { };
-//   struct foo { bar foo::*mem; };
-TEST_F(DIEHashTest, PtrToMemberDeclDefMatch) {
-  DIEInteger Zero(0);
-  DIEInteger One(1);
-  DIEInteger Eight(8);
-  DIEString FooStr = getString("foo");
-  DIEString BarStr = getString("bar");
-  DIEString MemStr = getString("mem");
-  uint64_t MD5ResDecl;
-  {
-    DIE &Bar = *DIE::get(Alloc, dwarf::DW_TAG_structure_type);
-    Bar.addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, BarStr);
-    Bar.addValue(Alloc, dwarf::DW_AT_declaration, dwarf::DW_FORM_flag_present,
-                 One);
-
-    DIE &Foo = *DIE::get(Alloc, dwarf::DW_TAG_structure_type);
-    Foo.addValue(Alloc, dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1, Eight);
-    Foo.addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, FooStr);
-
-    auto Mem = DIE::get(Alloc, dwarf::DW_TAG_member);
-    Mem->addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, MemStr);
-    Mem->addValue(Alloc, dwarf::DW_AT_data_member_location,
-                  dwarf::DW_FORM_data1, Zero);
-
-    DIE &PtrToFooMem = *DIE::get(Alloc, dwarf::DW_TAG_ptr_to_member_type);
-    DIEEntry BarEntry(Bar);
-    PtrToFooMem.addValue(Alloc, dwarf::DW_AT_type, dwarf::DW_FORM_ref4,
-                         BarEntry);
-    DIEEntry FooEntry(Foo);
-    PtrToFooMem.addValue(Alloc, dwarf::DW_AT_containing_type,
-                         dwarf::DW_FORM_ref4, FooEntry);
-
-    DIEEntry PtrToFooMemRef(PtrToFooMem);
-    Mem->addValue(Alloc, dwarf::DW_AT_type, dwarf::DW_FORM_ref4,
-                  PtrToFooMemRef);
-
-    Foo.addChild(std::move(Mem));
-
-    MD5ResDecl = DIEHash().computeTypeSignature(Foo);
-  }
-  uint64_t MD5ResDef;
-  {
-    DIE &Bar = *DIE::get(Alloc, dwarf::DW_TAG_structure_type);
-    Bar.addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, BarStr);
-    Bar.addValue(Alloc, dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1, One);
-
-    DIE &Foo = *DIE::get(Alloc, dwarf::DW_TAG_structure_type);
-    Foo.addValue(Alloc, dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1, Eight);
-    Foo.addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, FooStr);
-
-    auto Mem = DIE::get(Alloc, dwarf::DW_TAG_member);
-    Mem->addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, MemStr);
-    Mem->addValue(Alloc, dwarf::DW_AT_data_member_location,
-                  dwarf::DW_FORM_data1, Zero);
-
-    DIE &PtrToFooMem = *DIE::get(Alloc, dwarf::DW_TAG_ptr_to_member_type);
-    DIEEntry BarEntry(Bar);
-    PtrToFooMem.addValue(Alloc, dwarf::DW_AT_type, dwarf::DW_FORM_ref4,
-                         BarEntry);
-    DIEEntry FooEntry(Foo);
-    PtrToFooMem.addValue(Alloc, dwarf::DW_AT_containing_type,
-                         dwarf::DW_FORM_ref4, FooEntry);
-
-    DIEEntry PtrToFooMemRef(PtrToFooMem);
-    Mem->addValue(Alloc, dwarf::DW_AT_type, dwarf::DW_FORM_ref4,
-                  PtrToFooMemRef);
-
-    Foo.addChild(std::move(Mem));
-
-    MD5ResDef = DIEHash().computeTypeSignature(Foo);
-  }
-  ASSERT_EQ(MD5ResDef, MD5ResDecl);
-}
-
-// Check that the hash for a pointer-to-member matches regardless of whether the
-// pointed-to type is a declaration or a definition.
-//
-//   struct bar; // { };
-//   struct foo { bar bar::*mem; };
-TEST_F(DIEHashTest, PtrToMemberDeclDefMisMatch) {
-  DIEInteger Zero(0);
-  DIEInteger One(1);
-  DIEInteger Eight(8);
-  DIEString FooStr = getString("foo");
-  DIEString BarStr = getString("bar");
-  DIEString MemStr = getString("mem");
-  uint64_t MD5ResDecl;
-  {
-    DIE &Bar = *DIE::get(Alloc, dwarf::DW_TAG_structure_type);
-    Bar.addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, BarStr);
-    Bar.addValue(Alloc, dwarf::DW_AT_declaration, dwarf::DW_FORM_flag_present,
-                 One);
-
-    DIE &Foo = *DIE::get(Alloc, dwarf::DW_TAG_structure_type);
-    Foo.addValue(Alloc, dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1, Eight);
-    Foo.addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, FooStr);
-
-    auto Mem = DIE::get(Alloc, dwarf::DW_TAG_member);
-    Mem->addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, MemStr);
-    Mem->addValue(Alloc, dwarf::DW_AT_data_member_location,
-                  dwarf::DW_FORM_data1, Zero);
-
-    DIE &PtrToFooMem = *DIE::get(Alloc, dwarf::DW_TAG_ptr_to_member_type);
-    DIEEntry BarEntry(Bar);
-    PtrToFooMem.addValue(Alloc, dwarf::DW_AT_type, dwarf::DW_FORM_ref4,
-                         BarEntry);
-    PtrToFooMem.addValue(Alloc, dwarf::DW_AT_containing_type,
-                         dwarf::DW_FORM_ref4, BarEntry);
-
-    DIEEntry PtrToFooMemRef(PtrToFooMem);
-    Mem->addValue(Alloc, dwarf::DW_AT_type, dwarf::DW_FORM_ref4,
-                  PtrToFooMemRef);
-
-    Foo.addChild(std::move(Mem));
-
-    MD5ResDecl = DIEHash().computeTypeSignature(Foo);
-  }
-  uint64_t MD5ResDef;
-  {
-    DIE &Bar = *DIE::get(Alloc, dwarf::DW_TAG_structure_type);
-    Bar.addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, BarStr);
-    Bar.addValue(Alloc, dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1, One);
-
-    DIE &Foo = *DIE::get(Alloc, dwarf::DW_TAG_structure_type);
-    Foo.addValue(Alloc, dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1, Eight);
-    Foo.addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, FooStr);
-
-    auto Mem = DIE::get(Alloc, dwarf::DW_TAG_member);
-    Mem->addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, MemStr);
-    Mem->addValue(Alloc, dwarf::DW_AT_data_member_location,
-                  dwarf::DW_FORM_data1, Zero);
-
-    DIE &PtrToFooMem = *DIE::get(Alloc, dwarf::DW_TAG_ptr_to_member_type);
-    DIEEntry BarEntry(Bar);
-    PtrToFooMem.addValue(Alloc, dwarf::DW_AT_type, dwarf::DW_FORM_ref4,
-                         BarEntry);
-    PtrToFooMem.addValue(Alloc, dwarf::DW_AT_containing_type,
-                         dwarf::DW_FORM_ref4, BarEntry);
-
-    DIEEntry PtrToFooMemRef(PtrToFooMem);
-    Mem->addValue(Alloc, dwarf::DW_AT_type, dwarf::DW_FORM_ref4,
-                  PtrToFooMemRef);
-
-    Foo.addChild(std::move(Mem));
-
-    MD5ResDef = DIEHash().computeTypeSignature(Foo);
-  }
-  // FIXME: This seems to be a bug in the DWARF type hashing specification that
-  // only uses the brief name hashing for types referenced via DW_AT_type. In
-  // this case the type is referenced via DW_AT_containing_type and full hashing
-  // causes a hash to differ when the containing type is a declaration in one TU
-  // and a definition in another.
-  ASSERT_NE(MD5ResDef, MD5ResDecl);
-}
-
-// struct { } a;
-// struct foo { decltype(a) mem; };
-TEST_F(DIEHashTest, RefUnnamedType) {
-  DIEInteger Zero(0);
-  DIEInteger One(1);
-  DIEInteger Eight(8);
-  DIEString FooStr = getString("foo");
-  DIEString MemStr = getString("mem");
-
-  DIE &Unnamed = *DIE::get(Alloc, dwarf::DW_TAG_structure_type);
-  Unnamed.addValue(Alloc, dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1, One);
-
-  DIE &Foo = *DIE::get(Alloc, dwarf::DW_TAG_structure_type);
-  Foo.addValue(Alloc, dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1, Eight);
-  Foo.addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, FooStr);
-
-  auto Mem = DIE::get(Alloc, dwarf::DW_TAG_member);
-  Mem->addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, MemStr);
-  Mem->addValue(Alloc, dwarf::DW_AT_data_member_location, dwarf::DW_FORM_data1,
-                Zero);
-
-  DIE &UnnamedPtr = *DIE::get(Alloc, dwarf::DW_TAG_pointer_type);
-  UnnamedPtr.addValue(Alloc, dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1,
-                      Eight);
-  DIEEntry UnnamedRef(Unnamed);
-  UnnamedPtr.addValue(Alloc, dwarf::DW_AT_type, dwarf::DW_FORM_ref4,
-                      UnnamedRef);
-
-  DIEEntry UnnamedPtrRef(UnnamedPtr);
-  Mem->addValue(Alloc, dwarf::DW_AT_type, dwarf::DW_FORM_ref4, UnnamedPtrRef);
-
-  Foo.addChild(std::move(Mem));
-
-  uint64_t MD5Res = DIEHash().computeTypeSignature(Foo);
-
-  ASSERT_EQ(0x954e026f01c02529ULL, MD5Res);
-}
-
-// struct { struct foo { }; };
-TEST_F(DIEHashTest, NestedType) {
-  DIE &Unnamed = *DIE::get(Alloc, dwarf::DW_TAG_structure_type);
-  DIEInteger One(1);
-  Unnamed.addValue(Alloc, dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1, One);
-
-  auto Foo = DIE::get(Alloc, dwarf::DW_TAG_structure_type);
-  DIEString FooStr = getString("foo");
-  Foo->addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, FooStr);
-  Foo->addValue(Alloc, dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1, One);
-
-  Unnamed.addChild(std::move(Foo));
-
-  uint64_t MD5Res = DIEHash().computeTypeSignature(Unnamed);
-
-  // The exact same hash GCC produces for this DIE.
-  ASSERT_EQ(0xde8a3b7b43807f4aULL, MD5Res);
-}
-
-// struct { static void func(); };
-TEST_F(DIEHashTest, MemberFunc) {
-  DIE &Unnamed = *DIE::get(Alloc, dwarf::DW_TAG_structure_type);
-  DIEInteger One(1);
-  Unnamed.addValue(Alloc, dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1, One);
-
-  auto Func = DIE::get(Alloc, dwarf::DW_TAG_subprogram);
-  DIEString FuncStr = getString("func");
-  Func->addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, FuncStr);
-
-  Unnamed.addChild(std::move(Func));
-
-  uint64_t MD5Res = DIEHash().computeTypeSignature(Unnamed);
-
-  // The exact same hash GCC produces for this DIE.
-  ASSERT_EQ(0xd36a1b6dfb604ba0ULL, MD5Res);
-}
-
-// struct A {
-//   static void func();
-// };
-TEST_F(DIEHashTest, MemberFuncFlag) {
-  DIE &A = *DIE::get(Alloc, dwarf::DW_TAG_structure_type);
-  DIEInteger One(1);
-  DIEString AStr = getString("A");
-  A.addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, AStr);
-  A.addValue(Alloc, dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1, One);
-  A.addValue(Alloc, dwarf::DW_AT_decl_file, dwarf::DW_FORM_data1, One);
-  A.addValue(Alloc, dwarf::DW_AT_decl_line, dwarf::DW_FORM_data1, One);
-
-  auto Func = DIE::get(Alloc, dwarf::DW_TAG_subprogram);
-  DIEString FuncStr = getString("func");
-  DIEString FuncLinkage = getString("_ZN1A4funcEv");
-  DIEInteger Two(2);
-  Func->addValue(Alloc, dwarf::DW_AT_external, dwarf::DW_FORM_flag_present,
-                 One);
-  Func->addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, FuncStr);
-  Func->addValue(Alloc, dwarf::DW_AT_decl_file, dwarf::DW_FORM_data1, One);
-  Func->addValue(Alloc, dwarf::DW_AT_decl_line, dwarf::DW_FORM_data1, Two);
-  Func->addValue(Alloc, dwarf::DW_AT_linkage_name, dwarf::DW_FORM_strp,
-                 FuncLinkage);
-  Func->addValue(Alloc, dwarf::DW_AT_declaration, dwarf::DW_FORM_flag_present,
-                 One);
-
-  A.addChild(std::move(Func));
-
-  uint64_t MD5Res = DIEHash().computeTypeSignature(A);
-
-  // The exact same hash GCC produces for this DIE.
-  ASSERT_EQ(0x8f78211ddce3df10ULL, MD5Res);
-}
-
-// Derived from:
-// struct A {
-//   const static int PI = -3;
-// };
-// A a;
-TEST_F(DIEHashTest, MemberSdata) {
-  DIE &A = *DIE::get(Alloc, dwarf::DW_TAG_structure_type);
-  DIEInteger One(1);
-  DIEString AStr = getString("A");
-  A.addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, AStr);
-  A.addValue(Alloc, dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1, One);
-  A.addValue(Alloc, dwarf::DW_AT_decl_file, dwarf::DW_FORM_data1, One);
-  A.addValue(Alloc, dwarf::DW_AT_decl_line, dwarf::DW_FORM_data1, One);
-
-  DIEInteger Four(4);
-  DIEInteger Five(5);
-  DIEString FStr = getString("int");
-  DIE &IntTyDIE = *DIE::get(Alloc, dwarf::DW_TAG_base_type);
-  IntTyDIE.addValue(Alloc, dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1, Four);
-  IntTyDIE.addValue(Alloc, dwarf::DW_AT_encoding, dwarf::DW_FORM_data1, Five);
-  IntTyDIE.addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, FStr);
-
-  DIEEntry IntTy(IntTyDIE);
-  auto PITyDIE = DIE::get(Alloc, dwarf::DW_TAG_const_type);
-  PITyDIE->addValue(Alloc, dwarf::DW_AT_type, dwarf::DW_FORM_ref4, IntTy);
-
-  DIEEntry PITy(*PITyDIE);
-  auto PI = DIE::get(Alloc, dwarf::DW_TAG_member);
-  DIEString PIStr = getString("PI");
-  DIEInteger Two(2);
-  DIEInteger NegThree(-3);
-  PI->addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, PIStr);
-  PI->addValue(Alloc, dwarf::DW_AT_decl_file, dwarf::DW_FORM_data1, One);
-  PI->addValue(Alloc, dwarf::DW_AT_decl_line, dwarf::DW_FORM_data1, Two);
-  PI->addValue(Alloc, dwarf::DW_AT_type, dwarf::DW_FORM_ref4, PITy);
-  PI->addValue(Alloc, dwarf::DW_AT_external, dwarf::DW_FORM_flag_present, One);
-  PI->addValue(Alloc, dwarf::DW_AT_declaration, dwarf::DW_FORM_flag_present,
-               One);
-  PI->addValue(Alloc, dwarf::DW_AT_const_value, dwarf::DW_FORM_sdata, NegThree);
-
-  A.addChild(std::move(PI));
-
-  uint64_t MD5Res = DIEHash().computeTypeSignature(A);
-  ASSERT_EQ(0x9a216000dd3788a7ULL, MD5Res);
-}
-
-// Derived from:
-// struct A {
-//   const static float PI = 3.14;
-// };
-// A a;
-TEST_F(DIEHashTest, MemberBlock) {
-  if (!this->getAsmPrinter())
-    GTEST_SKIP();
-
-  DIE &A = *DIE::get(Alloc, dwarf::DW_TAG_structure_type);
-  DIEInteger One(1);
-  DIEString AStr = getString("A");
-  A.addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, AStr);
-  A.addValue(Alloc, dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1, One);
-  A.addValue(Alloc, dwarf::DW_AT_decl_file, dwarf::DW_FORM_data1, One);
-  A.addValue(Alloc, dwarf::DW_AT_decl_line, dwarf::DW_FORM_data1, One);
-
-  DIEInteger Four(4);
-  DIEString FStr = getString("float");
-  auto FloatTyDIE = DIE::get(Alloc, dwarf::DW_TAG_base_type);
-  FloatTyDIE->addValue(Alloc, dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1,
-                       Four);
-  FloatTyDIE->addValue(Alloc, dwarf::DW_AT_encoding, dwarf::DW_FORM_data1,
-                       Four);
-  FloatTyDIE->addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, FStr);
-  DIEEntry FloatTy(*FloatTyDIE);
-  auto PITyDIE = DIE::get(Alloc, dwarf::DW_TAG_const_type);
-  PITyDIE->addValue(Alloc, dwarf::DW_AT_type, dwarf::DW_FORM_ref4, FloatTy);
-
-  DIEEntry PITy(*PITyDIE);
-  auto PI = DIE::get(Alloc, dwarf::DW_TAG_member);
-  DIEString PIStr = getString("PI");
-  DIEInteger Two(2);
-  PI->addValue(Alloc, dwarf::DW_AT_name, dwarf::DW_FORM_strp, PIStr);
-  PI->addValue(Alloc, dwarf::DW_AT_decl_file, dwarf::DW_FORM_data1, One);
-  PI->addValue(Alloc, dwarf::DW_AT_decl_line, dwarf::DW_FORM_data1, Two);
-  PI->addValue(Alloc, dwarf::DW_AT_type, dwarf::DW_FORM_ref4, PITy);
-  PI->addValue(Alloc, dwarf::DW_AT_external, dwarf::DW_FORM_flag_present, One);
-  PI->addValue(Alloc, dwarf::DW_AT_declaration, dwarf::DW_FORM_flag_present,
-               One);
-
-  DIEBlock PIBlock;
-  DIEInteger Blk1(0xc3);
-  DIEInteger Blk2(0xf5);
-  DIEInteger Blk3(0x48);
-  DIEInteger Blk4(0x40);
-
-  PIBlock.addValue(Alloc, (dwarf::Attribute)0, dwarf::DW_FORM_data1, Blk1);
-  PIBlock.addValue(Alloc, (dwarf::Attribute)0, dwarf::DW_FORM_data1, Blk2);
-  PIBlock.addValue(Alloc, (dwarf::Attribute)0, dwarf::DW_FORM_data1, Blk3);
-  PIBlock.addValue(Alloc, (dwarf::Attribute)0, dwarf::DW_FORM_data1, Blk4);
-
-  PI->addValue(Alloc, dwarf::DW_AT_const_value, dwarf::DW_FORM_block1,
-               &PIBlock);
-
-  A.addChild(std::move(PI));
-
-  uint64_t MD5Res = DIEHash(this->getAsmPrinter()).computeTypeSignature(A);
-  ASSERT_EQ(0x493af53ad3d3f651ULL, MD5Res);
-}
-}
diff --git a/gnu/llvm/llvm/unittests/CodeGen/DIETest.cpp b/gnu/llvm/llvm/unittests/CodeGen/DIETest.cpp
deleted file mode 100644
index 73754fe6df3..00000000000
--- a/gnu/llvm/llvm/unittests/CodeGen/DIETest.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-//===- llvm/unittest/CodeGen/DIETest.cpp ----------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/CodeGen/DIE.h"
-#include "TestAsmPrinter.h"
-#include "llvm/MC/MCContext.h"
-#include "llvm/MC/MCExpr.h"
-#include "llvm/Testing/Support/Error.h"
-
-using namespace llvm;
-using testing::_;
-using testing::SaveArg;
-
-namespace {
-
-using DIETestParams =
-    std::tuple<unsigned, dwarf::DwarfFormat, dwarf::Form, unsigned>;
-
-class DIEFixtureBase : public testing::TestWithParam<DIETestParams> {
-protected:
-  void SetUp() override {
-    unsigned Version;
-    dwarf::DwarfFormat Format;
-    std::tie(Version, Format, Form, Size) = GetParam();
-    auto ExpectedTestPrinter =
-        TestAsmPrinter::create("x86_64-pc-linux", Version, Format);
-    ASSERT_THAT_EXPECTED(ExpectedTestPrinter, Succeeded());
-    TestPrinter = std::move(ExpectedTestPrinter.get());
-    if (!TestPrinter)
-      GTEST_SKIP();
-  }
-
-  dwarf::Form Form;
-  unsigned Size;
-  std::unique_ptr<TestAsmPrinter> TestPrinter;
-};
-
-struct DIEExprFixture : public DIEFixtureBase {
-  void SetUp() override {
-    DIEFixtureBase::SetUp();
-    if (!TestPrinter)
-      return;
-
-    Val = MCConstantExpr::create(42, TestPrinter->getCtx());
-  }
-
-  const MCExpr *Val = nullptr;
-};
-
-TEST_P(DIEExprFixture, SizeOf) {
-  DIEExpr Tst(Val);
-  EXPECT_EQ(Size, Tst.SizeOf(TestPrinter->getAP(), Form));
-}
-
-TEST_P(DIEExprFixture, EmitValue) {
-  DIEExpr Tst(Val);
-  EXPECT_CALL(TestPrinter->getMS(), emitValueImpl(Val, Size, _));
-  Tst.emitValue(TestPrinter->getAP(), Form);
-}
-
-INSTANTIATE_TEST_SUITE_P(
-    DIETestParams, DIEExprFixture,
-    testing::Values(
-        DIETestParams{4, dwarf::DWARF32, dwarf::DW_FORM_data4, 4u},
-        DIETestParams{4, dwarf::DWARF32, dwarf::DW_FORM_data8, 8u},
-        DIETestParams{4, dwarf::DWARF32, dwarf::DW_FORM_sec_offset, 4u},
-        DIETestParams{4, dwarf::DWARF64, dwarf::DW_FORM_data4, 4u},
-        DIETestParams{4, dwarf::DWARF64, dwarf::DW_FORM_data8, 8u},
-        DIETestParams{4, dwarf::DWARF64, dwarf::DW_FORM_sec_offset, 8u}));
-
-struct DIELabelFixture : public DIEFixtureBase {
-  void SetUp() override {
-    DIEFixtureBase::SetUp();
-    if (!TestPrinter)
-      return;
-
-    Val = TestPrinter->getCtx().createTempSymbol();
-  }
-
-  const MCSymbol *Val = nullptr;
-};
-
-TEST_P(DIELabelFixture, SizeOf) {
-  DIELabel Tst(Val);
-  EXPECT_EQ(Size, Tst.SizeOf(TestPrinter->getAP(), Form));
-}
-
-TEST_P(DIELabelFixture, EmitValue) {
-  DIELabel Tst(Val);
-
-  const MCExpr *Arg0 = nullptr;
-  EXPECT_CALL(TestPrinter->getMS(), emitValueImpl(_, Size, _))
-      .WillOnce(SaveArg<0>(&Arg0));
-  Tst.emitValue(TestPrinter->getAP(), Form);
-
-  const MCSymbolRefExpr *ActualArg0 = dyn_cast_or_null<MCSymbolRefExpr>(Arg0);
-  ASSERT_NE(ActualArg0, nullptr);
-  EXPECT_EQ(&(ActualArg0->getSymbol()), Val);
-}
-
-INSTANTIATE_TEST_SUITE_P(
-    DIETestParams, DIELabelFixture,
-    testing::Values(
-        DIETestParams{4, dwarf::DWARF32, dwarf::DW_FORM_data4, 4u},
-        DIETestParams{4, dwarf::DWARF32, dwarf::DW_FORM_data8, 8u},
-        DIETestParams{4, dwarf::DWARF32, dwarf::DW_FORM_sec_offset, 4u},
-        DIETestParams{4, dwarf::DWARF32, dwarf::DW_FORM_strp, 4u},
-        DIETestParams{4, dwarf::DWARF32, dwarf::DW_FORM_addr, 8u},
-        DIETestParams{4, dwarf::DWARF64, dwarf::DW_FORM_data4, 4u},
-        DIETestParams{4, dwarf::DWARF64, dwarf::DW_FORM_data8, 8u},
-        DIETestParams{4, dwarf::DWARF64, dwarf::DW_FORM_sec_offset, 8u},
-        DIETestParams{4, dwarf::DWARF64, dwarf::DW_FORM_strp, 8u},
-        DIETestParams{4, dwarf::DWARF64, dwarf::DW_FORM_addr, 8u}));
-
-struct DIEDeltaFixture : public DIEFixtureBase {
-  void SetUp() override {
-    DIEFixtureBase::SetUp();
-    if (!TestPrinter)
-      return;
-
-    Hi = TestPrinter->getCtx().createTempSymbol();
-    Lo = TestPrinter->getCtx().createTempSymbol();
-  }
-
-  const MCSymbol *Hi = nullptr;
-  const MCSymbol *Lo = nullptr;
-};
-
-TEST_P(DIEDeltaFixture, SizeOf) {
-  DIEDelta Tst(Hi, Lo);
-  EXPECT_EQ(Size, Tst.SizeOf(TestPrinter->getAP(), Form));
-}
-
-TEST_P(DIEDeltaFixture, EmitValue) {
-  DIEDelta Tst(Hi, Lo);
-  EXPECT_CALL(TestPrinter->getMS(), emitAbsoluteSymbolDiff(Hi, Lo, Size));
-  Tst.emitValue(TestPrinter->getAP(), Form);
-}
-
-INSTANTIATE_TEST_SUITE_P(
-    DIETestParams, DIEDeltaFixture,
-    testing::Values(
-        DIETestParams{4, dwarf::DWARF32, dwarf::DW_FORM_data4, 4u},
-        DIETestParams{4, dwarf::DWARF32, dwarf::DW_FORM_data8, 8u},
-        DIETestParams{4, dwarf::DWARF32, dwarf::DW_FORM_sec_offset, 4u},
-        DIETestParams{4, dwarf::DWARF64, dwarf::DW_FORM_data4, 4u},
-        DIETestParams{4, dwarf::DWARF64, dwarf::DW_FORM_data8, 8u},
-        DIETestParams{4, dwarf::DWARF64, dwarf::DW_FORM_sec_offset, 8u}));
-
-struct DIELocListFixture : public DIEFixtureBase {
-  void SetUp() override { DIEFixtureBase::SetUp(); }
-};
-
-TEST_P(DIELocListFixture, SizeOf) {
-  DIELocList Tst(999);
-  EXPECT_EQ(Size, Tst.SizeOf(TestPrinter->getAP(), Form));
-}
-
-INSTANTIATE_TEST_SUITE_P(
-    DIETestParams, DIELocListFixture,
-    testing::Values(
-        DIETestParams{4, dwarf::DWARF32, dwarf::DW_FORM_loclistx, 2u},
-        DIETestParams{4, dwarf::DWARF32, dwarf::DW_FORM_data4, 4u},
-        DIETestParams{4, dwarf::DWARF32, dwarf::DW_FORM_sec_offset, 4u},
-        DIETestParams{4, dwarf::DWARF64, dwarf::DW_FORM_loclistx, 2u},
-        DIETestParams{4, dwarf::DWARF64, dwarf::DW_FORM_data8, 8u},
-        DIETestParams{4, dwarf::DWARF64, dwarf::DW_FORM_sec_offset, 8u}));
-
-} // end namespace
diff --git a/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/CMakeLists.txt b/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/CMakeLists.txt
deleted file mode 100644
index 5d43e4c8f88..00000000000
--- a/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
-  CodeGen
-  Core
-  FileCheck
-  GlobalISel
-  MC
-  MIRParser
-  Support
-  Target
-  )
-
-add_llvm_unittest(GlobalISelTests
-  ConstantFoldingTest.cpp
-  CSETest.cpp
-  LegalizerTest.cpp
-  LegalizerHelperTest.cpp
-  LegalizerInfoTest.cpp
-  MachineIRBuilderTest.cpp
-  GISelMITest.cpp
-  PatternMatchTest.cpp
-  KnownBitsTest.cpp
-  KnownBitsVectorTest.cpp
-  GISelUtilsTest.cpp
-  )
diff --git a/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/CSETest.cpp b/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/CSETest.cpp
deleted file mode 100644
index fa1d9171c76..00000000000
--- a/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/CSETest.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-//===- CSETest.cpp -----------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "GISelMITest.h"
-#include "llvm/CodeGen/GlobalISel/CSEMIRBuilder.h"
-#include "gtest/gtest.h"
-
-namespace {
-
-TEST_F(AArch64GISelMITest, TestCSE) {
-  setUp();
-  if (!TM)
-    return;
-
-  LLT s16{LLT::scalar(16)};
-  LLT s32{LLT::scalar(32)};
-  auto MIBInput = B.buildInstr(TargetOpcode::G_TRUNC, {s16}, {Copies[0]});
-  auto MIBInput1 = B.buildInstr(TargetOpcode::G_TRUNC, {s16}, {Copies[1]});
-  auto MIBAdd = B.buildInstr(TargetOpcode::G_ADD, {s16}, {MIBInput, MIBInput});
-  GISelCSEInfo CSEInfo;
-  CSEInfo.setCSEConfig(std::make_unique<CSEConfigFull>());
-  CSEInfo.analyze(*MF);
-  B.setCSEInfo(&CSEInfo);
-  CSEMIRBuilder CSEB(B.getState());
-
-  CSEB.setInsertPt(B.getMBB(), B.getInsertPt());
-  Register AddReg = MRI->createGenericVirtualRegister(s16);
-  auto MIBAddCopy =
-      CSEB.buildInstr(TargetOpcode::G_ADD, {AddReg}, {MIBInput, MIBInput});
-  EXPECT_EQ(MIBAddCopy->getOpcode(), TargetOpcode::COPY);
-  auto MIBAdd2 =
-      CSEB.buildInstr(TargetOpcode::G_ADD, {s16}, {MIBInput, MIBInput});
-  EXPECT_TRUE(&*MIBAdd == &*MIBAdd2);
-  auto MIBAdd4 =
-      CSEB.buildInstr(TargetOpcode::G_ADD, {s16}, {MIBInput, MIBInput});
-  EXPECT_TRUE(&*MIBAdd == &*MIBAdd4);
-  auto MIBAdd5 =
-      CSEB.buildInstr(TargetOpcode::G_ADD, {s16}, {MIBInput, MIBInput1});
-  EXPECT_TRUE(&*MIBAdd != &*MIBAdd5);
-
-  // Try building G_CONSTANTS.
-  auto MIBCst = CSEB.buildConstant(s32, 0);
-  auto MIBCst1 = CSEB.buildConstant(s32, 0);
-  EXPECT_TRUE(&*MIBCst == &*MIBCst1);
-  // Try the CFing of BinaryOps.
-  auto MIBCF1 = CSEB.buildInstr(TargetOpcode::G_ADD, {s32}, {MIBCst, MIBCst});
-  EXPECT_TRUE(&*MIBCF1 == &*MIBCst);
-
-  // Try out building FCONSTANTs.
-  auto MIBFP0 = CSEB.buildFConstant(s32, 1.0);
-  auto MIBFP0_1 = CSEB.buildFConstant(s32, 1.0);
-  EXPECT_TRUE(&*MIBFP0 == &*MIBFP0_1);
-  CSEInfo.print();
-
-  // Make sure buildConstant with a vector type doesn't crash, and the elements
-  // CSE.
-  auto Splat0 = CSEB.buildConstant(LLT::fixed_vector(2, s32), 0);
-  EXPECT_EQ(TargetOpcode::G_BUILD_VECTOR, Splat0->getOpcode());
-  EXPECT_EQ(Splat0.getReg(1), Splat0.getReg(2));
-  EXPECT_EQ(&*MIBCst, MRI->getVRegDef(Splat0.getReg(1)));
-
-  auto FSplat = CSEB.buildFConstant(LLT::fixed_vector(2, s32), 1.0);
-  EXPECT_EQ(TargetOpcode::G_BUILD_VECTOR, FSplat->getOpcode());
-  EXPECT_EQ(FSplat.getReg(1), FSplat.getReg(2));
-  EXPECT_EQ(&*MIBFP0, MRI->getVRegDef(FSplat.getReg(1)));
-
-  // Check G_UNMERGE_VALUES
-  auto MIBUnmerge = CSEB.buildUnmerge({s32, s32}, Copies[0]);
-  auto MIBUnmerge2 = CSEB.buildUnmerge({s32, s32}, Copies[0]);
-  EXPECT_TRUE(&*MIBUnmerge == &*MIBUnmerge2);
-
-  // Check G_IMPLICIT_DEF
-  auto Undef0 = CSEB.buildUndef(s32);
-  auto Undef1 = CSEB.buildUndef(s32);
-  EXPECT_EQ(&*Undef0, &*Undef1);
-
-  // If the observer is installed to the MF, CSE can also
-  // track new instructions built without the CSEBuilder and
-  // the newly built instructions are available for CSEing next
-  // time a build call is made through the CSEMIRBuilder.
-  // Additionally, the CSE implementation lazily hashes instructions
-  // (every build call) to give chance for the instruction to be fully
-  // built (say using .addUse().addDef().. so on).
-  GISelObserverWrapper WrapperObserver(&CSEInfo);
-  RAIIMFObsDelInstaller Installer(*MF, WrapperObserver);
-  MachineIRBuilder RegularBuilder(*MF);
-  RegularBuilder.setInsertPt(*EntryMBB, EntryMBB->begin());
-  auto NonCSEFMul = RegularBuilder.buildInstr(TargetOpcode::G_AND)
-                        .addDef(MRI->createGenericVirtualRegister(s32))
-                        .addUse(Copies[0])
-                        .addUse(Copies[1]);
-  auto CSEFMul =
-      CSEB.buildInstr(TargetOpcode::G_AND, {s32}, {Copies[0], Copies[1]});
-  EXPECT_EQ(&*CSEFMul, &*NonCSEFMul);
-
-  auto ExtractMIB = CSEB.buildInstr(TargetOpcode::G_EXTRACT, {s16},
-                                    {Copies[0], static_cast<uint64_t>(0)});
-  auto ExtractMIB1 = CSEB.buildInstr(TargetOpcode::G_EXTRACT, {s16},
-                                     {Copies[0], static_cast<uint64_t>(0)});
-  auto ExtractMIB2 = CSEB.buildInstr(TargetOpcode::G_EXTRACT, {s16},
-                                     {Copies[0], static_cast<uint64_t>(1)});
-  EXPECT_EQ(&*ExtractMIB, &*ExtractMIB1);
-  EXPECT_NE(&*ExtractMIB, &*ExtractMIB2);
-}
-
-TEST_F(AArch64GISelMITest, TestCSEConstantConfig) {
-  setUp();
-  if (!TM)
-    return;
-
-  LLT s16{LLT::scalar(16)};
-  auto MIBInput = B.buildInstr(TargetOpcode::G_TRUNC, {s16}, {Copies[0]});
-  auto MIBAdd = B.buildInstr(TargetOpcode::G_ADD, {s16}, {MIBInput, MIBInput});
-  auto MIBZero = B.buildConstant(s16, 0);
-  GISelCSEInfo CSEInfo;
-  CSEInfo.setCSEConfig(std::make_unique<CSEConfigConstantOnly>());
-  CSEInfo.analyze(*MF);
-  B.setCSEInfo(&CSEInfo);
-  CSEMIRBuilder CSEB(B.getState());
-  CSEB.setInsertPt(*EntryMBB, EntryMBB->begin());
-  auto MIBAdd1 =
-      CSEB.buildInstr(TargetOpcode::G_ADD, {s16}, {MIBInput, MIBInput});
-  // We should CSE constants only. Adds should not be CSEd.
-  EXPECT_TRUE(MIBAdd1->getOpcode() != TargetOpcode::COPY);
-  EXPECT_TRUE(&*MIBAdd1 != &*MIBAdd);
-  // We should CSE constant.
-  auto MIBZeroTmp = CSEB.buildConstant(s16, 0);
-  EXPECT_TRUE(&*MIBZero == &*MIBZeroTmp);
-
-  // Check G_IMPLICIT_DEF
-  auto Undef0 = CSEB.buildUndef(s16);
-  auto Undef1 = CSEB.buildUndef(s16);
-  EXPECT_EQ(&*Undef0, &*Undef1);
-}
-
-TEST_F(AArch64GISelMITest, TestCSEImmediateNextCSE) {
-  setUp();
-  if (!TM)
-    return;
-
-  LLT s32{LLT::scalar(32)};
-  // We want to check that when the CSE hit is on the next instruction, i.e. at
-  // the current insert pt, that the insertion point is moved ahead of the
-  // instruction.
-
-  GISelCSEInfo CSEInfo;
-  CSEInfo.setCSEConfig(std::make_unique<CSEConfigConstantOnly>());
-  CSEInfo.analyze(*MF);
-  B.setCSEInfo(&CSEInfo);
-  CSEMIRBuilder CSEB(B.getState());
-  CSEB.buildConstant(s32, 0);
-  auto MIBCst2 = CSEB.buildConstant(s32, 2);
-
-  // Move the insert point before the second constant.
-  CSEB.setInsertPt(CSEB.getMBB(), --CSEB.getInsertPt());
-  auto MIBCst3 = CSEB.buildConstant(s32, 2);
-  EXPECT_TRUE(&*MIBCst2 == &*MIBCst3);
-  EXPECT_TRUE(CSEB.getInsertPt() == CSEB.getMBB().end());
-}
-
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/ConstantFoldingTest.cpp b/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/ConstantFoldingTest.cpp
deleted file mode 100644
index 5053d542d2b..00000000000
--- a/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/ConstantFoldingTest.cpp
+++ /dev/null
@@ -1,239 +0,0 @@
-//===- ConstantFoldingTest.cpp -------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "GISelMITest.h"
-#include "llvm/CodeGen/GlobalISel/CSEMIRBuilder.h"
-#include "llvm/CodeGen/GlobalISel/MachineIRBuilder.h"
-#include "llvm/CodeGen/GlobalISel/Utils.h"
-#include "llvm/CodeGen/MachineFunction.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST_F(AArch64GISelMITest, FoldWithBuilder) {
-  setUp();
-  if (!TM)
-    return;
-  // Try to use the FoldableInstructionsBuilder to build binary ops.
-  CSEMIRBuilder CFB(B.getState());
-  LLT s32 = LLT::scalar(32);
-  int64_t Cst;
-  auto MIBCAdd =
-      CFB.buildAdd(s32, CFB.buildConstant(s32, 0), CFB.buildConstant(s32, 1));
-  // This should be a constant now.
-  bool match = mi_match(MIBCAdd.getReg(0), *MRI, m_ICst(Cst));
-  EXPECT_TRUE(match);
-  EXPECT_EQ(Cst, 1);
-  auto MIBCAdd1 =
-      CFB.buildInstr(TargetOpcode::G_ADD, {s32},
-                     {CFB.buildConstant(s32, 0), CFB.buildConstant(s32, 1)});
-  // This should be a constant now.
-  match = mi_match(MIBCAdd1.getReg(0), *MRI, m_ICst(Cst));
-  EXPECT_TRUE(match);
-  EXPECT_EQ(Cst, 1);
-
-  // Try one of the other constructors of MachineIRBuilder to make sure it's
-  // compatible.
-  CSEMIRBuilder CFB1(*MF);
-  CFB1.setInsertPt(*EntryMBB, EntryMBB->end());
-  auto MIBCSub =
-      CFB1.buildInstr(TargetOpcode::G_SUB, {s32},
-                      {CFB1.buildConstant(s32, 1), CFB1.buildConstant(s32, 1)});
-  // This should be a constant now.
-  match = mi_match(MIBCSub.getReg(0), *MRI, m_ICst(Cst));
-  EXPECT_TRUE(match);
-  EXPECT_EQ(Cst, 0);
-
-  auto MIBCSext1 =
-      CFB1.buildInstr(TargetOpcode::G_SEXT_INREG, {s32},
-                      {CFB1.buildConstant(s32, 0x01), uint64_t(8)});
-  // This should be a constant now.
-  match = mi_match(MIBCSext1.getReg(0), *MRI, m_ICst(Cst));
-  EXPECT_TRUE(match);
-  EXPECT_EQ(1, Cst);
-
-  auto MIBCSext2 =
-      CFB1.buildInstr(TargetOpcode::G_SEXT_INREG, {s32},
-                      {CFB1.buildConstant(s32, 0x80), uint64_t(8)});
-  // This should be a constant now.
-  match = mi_match(MIBCSext2.getReg(0), *MRI, m_ICst(Cst));
-  EXPECT_TRUE(match);
-  EXPECT_EQ(-0x80, Cst);
-}
-
-TEST_F(AArch64GISelMITest, FoldBinOp) {
-  setUp();
-  if (!TM)
-    return;
-
-  LLT s32{LLT::scalar(32)};
-  auto MIBCst1 = B.buildConstant(s32, 16);
-  auto MIBCst2 = B.buildConstant(s32, 9);
-  auto MIBFCst1 = B.buildFConstant(s32, 1.0000001);
-  auto MIBFCst2 = B.buildFConstant(s32, 2.0);
-
-  // Test G_ADD folding Integer + Mixed Int-Float cases
-  Optional<APInt> FoldGAddInt =
-      ConstantFoldBinOp(TargetOpcode::G_ADD, MIBCst1.getReg(0),
-                        MIBCst2.getReg(0), *MRI);
-  EXPECT_TRUE(FoldGAddInt.hasValue());
-  EXPECT_EQ(25ULL, FoldGAddInt.getValue().getLimitedValue());
-  Optional<APInt> FoldGAddMix =
-      ConstantFoldBinOp(TargetOpcode::G_ADD, MIBCst1.getReg(0),
-                        MIBFCst2.getReg(0), *MRI);
-  EXPECT_TRUE(FoldGAddMix.hasValue());
-  EXPECT_EQ(1073741840ULL, FoldGAddMix.getValue().getLimitedValue());
-
-  // Test G_AND folding Integer + Mixed Int-Float cases
-  Optional<APInt> FoldGAndInt =
-      ConstantFoldBinOp(TargetOpcode::G_AND, MIBCst1.getReg(0),
-                        MIBCst2.getReg(0), *MRI);
-  EXPECT_TRUE(FoldGAndInt.hasValue());
-  EXPECT_EQ(0ULL, FoldGAndInt.getValue().getLimitedValue());
-  Optional<APInt> FoldGAndMix =
-      ConstantFoldBinOp(TargetOpcode::G_AND, MIBCst2.getReg(0),
-                        MIBFCst1.getReg(0), *MRI);
-  EXPECT_TRUE(FoldGAndMix.hasValue());
-  EXPECT_EQ(1ULL, FoldGAndMix.getValue().getLimitedValue());
-
-  // Test G_ASHR folding Integer + Mixed cases
-  Optional<APInt> FoldGAShrInt =
-      ConstantFoldBinOp(TargetOpcode::G_ASHR, MIBCst1.getReg(0),
-                        MIBCst2.getReg(0), *MRI);
-  EXPECT_TRUE(FoldGAShrInt.hasValue());
-  EXPECT_EQ(0ULL, FoldGAShrInt.getValue().getLimitedValue());
-  Optional<APInt> FoldGAShrMix =
-      ConstantFoldBinOp(TargetOpcode::G_ASHR, MIBFCst2.getReg(0),
-                        MIBCst2.getReg(0), *MRI);
-  EXPECT_TRUE(FoldGAShrMix.hasValue());
-  EXPECT_EQ(2097152ULL, FoldGAShrMix.getValue().getLimitedValue());
-
-  // Test G_LSHR folding Integer + Mixed Int-Float cases
-  Optional<APInt> FoldGLShrInt =
-      ConstantFoldBinOp(TargetOpcode::G_LSHR, MIBCst1.getReg(0),
-                        MIBCst2.getReg(0), *MRI);
-  EXPECT_TRUE(FoldGLShrInt.hasValue());
-  EXPECT_EQ(0ULL, FoldGLShrInt.getValue().getLimitedValue());
-  Optional<APInt> FoldGLShrMix =
-      ConstantFoldBinOp(TargetOpcode::G_LSHR, MIBFCst1.getReg(0),
-                        MIBCst2.getReg(0), *MRI);
-  EXPECT_TRUE(FoldGLShrMix.hasValue());
-  EXPECT_EQ(2080768ULL, FoldGLShrMix.getValue().getLimitedValue());
-
-  // Test G_MUL folding Integer + Mixed Int-Float cases
-  Optional<APInt> FoldGMulInt =
-      ConstantFoldBinOp(TargetOpcode::G_MUL, MIBCst1.getReg(0),
-                        MIBCst2.getReg(0), *MRI);
-  EXPECT_TRUE(FoldGMulInt.hasValue());
-  EXPECT_EQ(144ULL, FoldGMulInt.getValue().getLimitedValue());
-  Optional<APInt> FoldGMulMix =
-      ConstantFoldBinOp(TargetOpcode::G_MUL, MIBCst1.getReg(0),
-                        MIBFCst2.getReg(0), *MRI);
-  EXPECT_TRUE(FoldGMulMix.hasValue());
-  EXPECT_EQ(0ULL, FoldGMulMix.getValue().getLimitedValue());
-
-  // Test G_OR folding Integer + Mixed Int-Float cases
-  Optional<APInt> FoldGOrInt =
-      ConstantFoldBinOp(TargetOpcode::G_OR, MIBCst1.getReg(0),
-                        MIBCst2.getReg(0), *MRI);
-  EXPECT_TRUE(FoldGOrInt.hasValue());
-  EXPECT_EQ(25ULL, FoldGOrInt.getValue().getLimitedValue());
-  Optional<APInt> FoldGOrMix =
-      ConstantFoldBinOp(TargetOpcode::G_OR, MIBCst1.getReg(0),
-                        MIBFCst2.getReg(0), *MRI);
-  EXPECT_TRUE(FoldGOrMix.hasValue());
-  EXPECT_EQ(1073741840ULL, FoldGOrMix.getValue().getLimitedValue());
-
-  // Test G_SHL folding Integer + Mixed Int-Float cases
-  Optional<APInt> FoldGShlInt =
-      ConstantFoldBinOp(TargetOpcode::G_SHL, MIBCst1.getReg(0),
-                        MIBCst2.getReg(0), *MRI);
-  EXPECT_TRUE(FoldGShlInt.hasValue());
-  EXPECT_EQ(8192ULL, FoldGShlInt.getValue().getLimitedValue());
-  Optional<APInt> FoldGShlMix =
-      ConstantFoldBinOp(TargetOpcode::G_SHL, MIBCst1.getReg(0),
-                        MIBFCst2.getReg(0), *MRI);
-  EXPECT_TRUE(FoldGShlMix.hasValue());
-  EXPECT_EQ(0ULL, FoldGShlMix.getValue().getLimitedValue());
-
-  // Test G_SUB folding Integer + Mixed Int-Float cases
-  Optional<APInt> FoldGSubInt =
-      ConstantFoldBinOp(TargetOpcode::G_SUB, MIBCst1.getReg(0),
-                        MIBCst2.getReg(0), *MRI);
-  EXPECT_TRUE(FoldGSubInt.hasValue());
-  EXPECT_EQ(7ULL, FoldGSubInt.getValue().getLimitedValue());
-  Optional<APInt> FoldGSubMix =
-      ConstantFoldBinOp(TargetOpcode::G_SUB, MIBCst1.getReg(0),
-                        MIBFCst2.getReg(0), *MRI);
-  EXPECT_TRUE(FoldGSubMix.hasValue());
-  EXPECT_EQ(3221225488ULL, FoldGSubMix.getValue().getLimitedValue());
-
-  // Test G_XOR folding Integer + Mixed Int-Float cases
-  Optional<APInt> FoldGXorInt =
-      ConstantFoldBinOp(TargetOpcode::G_XOR, MIBCst1.getReg(0),
-                        MIBCst2.getReg(0), *MRI);
-  EXPECT_TRUE(FoldGXorInt.hasValue());
-  EXPECT_EQ(25ULL, FoldGXorInt.getValue().getLimitedValue());
-  Optional<APInt> FoldGXorMix =
-      ConstantFoldBinOp(TargetOpcode::G_XOR, MIBCst1.getReg(0),
-                        MIBFCst2.getReg(0), *MRI);
-  EXPECT_TRUE(FoldGXorMix.hasValue());
-  EXPECT_EQ(1073741840ULL, FoldGXorMix.getValue().getLimitedValue());
-
-  // Test G_UDIV folding Integer + Mixed Int-Float cases
-  Optional<APInt> FoldGUdivInt =
-      ConstantFoldBinOp(TargetOpcode::G_UDIV, MIBCst1.getReg(0),
-                        MIBCst2.getReg(0), *MRI);
-  EXPECT_TRUE(FoldGUdivInt.hasValue());
-  EXPECT_EQ(1ULL, FoldGUdivInt.getValue().getLimitedValue());
-  Optional<APInt> FoldGUdivMix =
-      ConstantFoldBinOp(TargetOpcode::G_UDIV, MIBCst1.getReg(0),
-                        MIBFCst2.getReg(0), *MRI);
-  EXPECT_TRUE(FoldGUdivMix.hasValue());
-  EXPECT_EQ(0ULL, FoldGUdivMix.getValue().getLimitedValue());
-
-  // Test G_SDIV folding Integer + Mixed Int-Float cases
-  Optional<APInt> FoldGSdivInt =
-      ConstantFoldBinOp(TargetOpcode::G_SDIV, MIBCst1.getReg(0),
-                        MIBCst2.getReg(0), *MRI);
-  EXPECT_TRUE(FoldGSdivInt.hasValue());
-  EXPECT_EQ(1ULL, FoldGSdivInt.getValue().getLimitedValue());
-  Optional<APInt> FoldGSdivMix =
-      ConstantFoldBinOp(TargetOpcode::G_SDIV, MIBCst1.getReg(0),
-                        MIBFCst2.getReg(0), *MRI);
-  EXPECT_TRUE(FoldGSdivMix.hasValue());
-  EXPECT_EQ(0ULL, FoldGSdivMix.getValue().getLimitedValue());
-
-  // Test G_UREM folding Integer + Mixed Int-Float cases
-  Optional<APInt> FoldGUremInt =
-      ConstantFoldBinOp(TargetOpcode::G_UDIV, MIBCst1.getReg(0),
-                        MIBCst2.getReg(0), *MRI);
-  EXPECT_TRUE(FoldGUremInt.hasValue());
-  EXPECT_EQ(1ULL, FoldGUremInt.getValue().getLimitedValue());
-  Optional<APInt> FoldGUremMix =
-      ConstantFoldBinOp(TargetOpcode::G_UDIV, MIBCst1.getReg(0),
-                        MIBFCst2.getReg(0), *MRI);
-  EXPECT_TRUE(FoldGUremMix.hasValue());
-  EXPECT_EQ(0ULL, FoldGUremMix.getValue().getLimitedValue());
-
-  // Test G_SREM folding Integer + Mixed Int-Float cases
-  Optional<APInt> FoldGSremInt =
-      ConstantFoldBinOp(TargetOpcode::G_SREM, MIBCst1.getReg(0),
-                        MIBCst2.getReg(0), *MRI);
-  EXPECT_TRUE(FoldGSremInt.hasValue());
-  EXPECT_EQ(7ULL, FoldGSremInt.getValue().getLimitedValue());
-  Optional<APInt> FoldGSremMix =
-      ConstantFoldBinOp(TargetOpcode::G_SREM, MIBCst1.getReg(0),
-                        MIBFCst2.getReg(0), *MRI);
-  EXPECT_TRUE(FoldGSremMix.hasValue());
-  EXPECT_EQ(16ULL, FoldGSremMix.getValue().getLimitedValue());
-}
-
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/GISelMITest.cpp b/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/GISelMITest.cpp
deleted file mode 100644
index ef50a0f281f..00000000000
--- a/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/GISelMITest.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-//===------------------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "GISelMITest.h"
-
-namespace llvm {
-std::ostream &
-operator<<(std::ostream &OS, const LLT Ty) {
-  std::string Repr;
-  raw_string_ostream SS{Repr};
-  Ty.print(SS);
-  OS << SS.str();
-  return OS;
-}
-
-std::ostream &
-operator<<(std::ostream &OS, const MachineFunction &MF) {
-  std::string Repr;
-  raw_string_ostream SS{Repr};
-  MF.print(SS);
-  OS << SS.str();
-  return OS;
-}
-
-}
-
-std::unique_ptr<LLVMTargetMachine>
-AArch64GISelMITest::createTargetMachine() const {
-  Triple TargetTriple("aarch64--");
-  std::string Error;
-  const Target *T = TargetRegistry::lookupTarget("", TargetTriple, Error);
-  if (!T)
-    return nullptr;
-
-  TargetOptions Options;
-  return std::unique_ptr<LLVMTargetMachine>(
-      static_cast<LLVMTargetMachine *>(T->createTargetMachine(
-          "AArch64", "", "", Options, None, None, CodeGenOpt::Aggressive)));
-}
-
-void AArch64GISelMITest::getTargetTestModuleString(SmallString<512> &S,
-                                                   StringRef MIRFunc) const {
-  (Twine(R"MIR(
----
-...
-name: func
-tracksRegLiveness: true
-registers:
-  - { id: 0, class: _ }
-  - { id: 1, class: _ }
-  - { id: 2, class: _ }
-  - { id: 3, class: _ }
-body: |
-  bb.1:
-    liveins: $x0, $x1, $x2, $x4
-
-    %0(s64) = COPY $x0
-    %1(s64) = COPY $x1
-    %2(s64) = COPY $x2
-)MIR") +
-   Twine(MIRFunc) + Twine("...\n"))
-      .toNullTerminatedStringRef(S);
-}
-
-std::unique_ptr<LLVMTargetMachine>
-AMDGPUGISelMITest::createTargetMachine() const {
-  Triple TargetTriple("amdgcn-amd-amdhsa");
-  std::string Error;
-  const Target *T = TargetRegistry::lookupTarget("", TargetTriple, Error);
-  if (!T)
-    return nullptr;
-
-  TargetOptions Options;
-  return std::unique_ptr<LLVMTargetMachine>(
-      static_cast<LLVMTargetMachine *>(T->createTargetMachine(
-          "amdgcn-amd-amdhsa", "gfx900", "", Options, None, None,
-          CodeGenOpt::Aggressive)));
-}
-
-void AMDGPUGISelMITest::getTargetTestModuleString(
-  SmallString<512> &S, StringRef MIRFunc) const {
-  (Twine(R"MIR(
----
-...
-name: func
-tracksRegLiveness: true
-registers:
-  - { id: 0, class: _ }
-  - { id: 1, class: _ }
-  - { id: 2, class: _ }
-  - { id: 3, class: _ }
-body: |
-  bb.1:
-    liveins: $vgpr0, $vgpr1, $vgpr2
-
-    %0(s32) = COPY $vgpr0
-    %1(s32) = COPY $vgpr1
-    %2(s32) = COPY $vgpr2
-)MIR") + Twine(MIRFunc) + Twine("...\n"))
-                            .toNullTerminatedStringRef(S);
-}
diff --git a/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/GISelMITest.h b/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/GISelMITest.h
deleted file mode 100644
index 0eee92cffad..00000000000
--- a/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/GISelMITest.h
+++ /dev/null
@@ -1,200 +0,0 @@
-//===- GISelMITest.h --------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-#ifndef LLVM_UNITTEST_CODEGEN_GLOBALISEL_GISELMI_H
-#define LLVM_UNITTEST_CODEGEN_GLOBALISEL_GISELMI_H
-
-#include "llvm/CodeGen/GlobalISel/GISelChangeObserver.h"
-#include "llvm/CodeGen/GlobalISel/LegalizerHelper.h"
-#include "llvm/CodeGen/GlobalISel/LegalizerInfo.h"
-#include "llvm/CodeGen/GlobalISel/MIPatternMatch.h"
-#include "llvm/CodeGen/GlobalISel/MachineIRBuilder.h"
-#include "llvm/CodeGen/GlobalISel/Utils.h"
-#include "llvm/CodeGen/MIRParser/MIRParser.h"
-#include "llvm/CodeGen/MachineFunction.h"
-#include "llvm/CodeGen/MachineModuleInfo.h"
-#include "llvm/CodeGen/TargetFrameLowering.h"
-#include "llvm/CodeGen/TargetInstrInfo.h"
-#include "llvm/CodeGen/TargetLowering.h"
-#include "llvm/CodeGen/TargetSubtargetInfo.h"
-#include "llvm/FileCheck/FileCheck.h"
-#include "llvm/InitializePasses.h"
-#include "llvm/Support/SourceMgr.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "llvm/Target/TargetMachine.h"
-#include "llvm/Target/TargetOptions.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace MIPatternMatch;
-
-static inline void initLLVM() {
-  InitializeAllTargets();
-  InitializeAllTargetMCs();
-  InitializeAllAsmPrinters();
-  InitializeAllAsmParsers();
-
-  PassRegistry *Registry = PassRegistry::getPassRegistry();
-  initializeCore(*Registry);
-  initializeCodeGen(*Registry);
-}
-
-// Define a printers to help debugging when things go wrong.
-namespace llvm {
-std::ostream &
-operator<<(std::ostream &OS, const LLT Ty);
-
-std::ostream &
-operator<<(std::ostream &OS, const MachineFunction &MF);
-}
-
-static std::unique_ptr<Module> parseMIR(LLVMContext &Context,
-                                        std::unique_ptr<MIRParser> &MIR,
-                                        const TargetMachine &TM,
-                                        StringRef MIRCode, const char *FuncName,
-                                        MachineModuleInfo &MMI) {
-  SMDiagnostic Diagnostic;
-  std::unique_ptr<MemoryBuffer> MBuffer = MemoryBuffer::getMemBuffer(MIRCode);
-  MIR = createMIRParser(std::move(MBuffer), Context);
-  if (!MIR)
-    return nullptr;
-
-  std::unique_ptr<Module> M = MIR->parseIRModule();
-  if (!M)
-    return nullptr;
-
-  M->setDataLayout(TM.createDataLayout());
-
-  if (MIR->parseMachineFunctions(*M, MMI))
-    return nullptr;
-
-  return M;
-}
-static std::pair<std::unique_ptr<Module>, std::unique_ptr<MachineModuleInfo>>
-createDummyModule(LLVMContext &Context, const LLVMTargetMachine &TM,
-                  StringRef MIRString, const char *FuncName) {
-  std::unique_ptr<MIRParser> MIR;
-  auto MMI = std::make_unique<MachineModuleInfo>(&TM);
-  std::unique_ptr<Module> M =
-      parseMIR(Context, MIR, TM, MIRString, FuncName, *MMI);
-  return make_pair(std::move(M), std::move(MMI));
-}
-
-static MachineFunction *getMFFromMMI(const Module *M,
-                                     const MachineModuleInfo *MMI) {
-  Function *F = M->getFunction("func");
-  auto *MF = MMI->getMachineFunction(*F);
-  return MF;
-}
-
-static void collectCopies(SmallVectorImpl<Register> &Copies,
-                          MachineFunction *MF) {
-  for (auto &MBB : *MF)
-    for (MachineInstr &MI : MBB) {
-      if (MI.getOpcode() == TargetOpcode::COPY)
-        Copies.push_back(MI.getOperand(0).getReg());
-    }
-}
-
-class GISelMITest : public ::testing::Test {
-protected:
-  GISelMITest() : ::testing::Test() {}
-
-  /// Prepare a target specific LLVMTargetMachine.
-  virtual std::unique_ptr<LLVMTargetMachine> createTargetMachine() const = 0;
-
-  /// Get the stub sample MIR test function.
-  virtual void getTargetTestModuleString(SmallString<512> &S,
-                                         StringRef MIRFunc) const = 0;
-
-  void setUp(StringRef ExtraAssembly = "") {
-    TM = createTargetMachine();
-    if (!TM)
-      return;
-
-    SmallString<512> MIRString;
-    getTargetTestModuleString(MIRString, ExtraAssembly);
-
-    ModuleMMIPair = createDummyModule(Context, *TM, MIRString, "func");
-    MF = getMFFromMMI(ModuleMMIPair.first.get(), ModuleMMIPair.second.get());
-    collectCopies(Copies, MF);
-    EntryMBB = &*MF->begin();
-    B.setMF(*MF);
-    MRI = &MF->getRegInfo();
-    B.setInsertPt(*EntryMBB, EntryMBB->end());
-  }
-
-  LLVMContext Context;
-  std::unique_ptr<LLVMTargetMachine> TM;
-  MachineFunction *MF;
-  std::pair<std::unique_ptr<Module>, std::unique_ptr<MachineModuleInfo>>
-      ModuleMMIPair;
-  SmallVector<Register, 4> Copies;
-  MachineBasicBlock *EntryMBB;
-  MachineIRBuilder B;
-  MachineRegisterInfo *MRI;
-};
-
-class AArch64GISelMITest : public GISelMITest {
-  std::unique_ptr<LLVMTargetMachine> createTargetMachine() const override;
-  void getTargetTestModuleString(SmallString<512> &S,
-                                 StringRef MIRFunc) const override;
-};
-
-class AMDGPUGISelMITest : public GISelMITest {
-  std::unique_ptr<LLVMTargetMachine> createTargetMachine() const override;
-  void getTargetTestModuleString(SmallString<512> &S,
-                                 StringRef MIRFunc) const override;
-};
-
-#define DefineLegalizerInfo(Name, SettingUpActionsBlock)                       \
-  class Name##Info : public LegalizerInfo {                                    \
-  public:                                                                      \
-    Name##Info(const TargetSubtargetInfo &ST) {                                \
-      using namespace TargetOpcode;                                            \
-      const LLT s8 = LLT::scalar(8);                                           \
-      (void)s8;                                                                \
-      const LLT s16 = LLT::scalar(16);                                         \
-      (void)s16;                                                               \
-      const LLT s32 = LLT::scalar(32);                                         \
-      (void)s32;                                                               \
-      const LLT s64 = LLT::scalar(64);                                         \
-      (void)s64;                                                               \
-      const LLT s128 = LLT::scalar(128);                                       \
-      (void)s128;                                                              \
-      do                                                                       \
-        SettingUpActionsBlock while (0);                                       \
-      getLegacyLegalizerInfo().computeTables();                                \
-      verify(*ST.getInstrInfo());                                              \
-    }                                                                          \
-  };
-
-static inline bool CheckMachineFunction(const MachineFunction &MF,
-                                        StringRef CheckStr) {
-  SmallString<512> Msg;
-  raw_svector_ostream OS(Msg);
-  MF.print(OS);
-  auto OutputBuf = MemoryBuffer::getMemBuffer(Msg, "Output", false);
-  auto CheckBuf = MemoryBuffer::getMemBuffer(CheckStr, "");
-  SmallString<4096> CheckFileBuffer;
-  FileCheckRequest Req;
-  FileCheck FC(Req);
-  StringRef CheckFileText =
-      FC.CanonicalizeFile(*CheckBuf.get(), CheckFileBuffer);
-  SourceMgr SM;
-  SM.AddNewSourceBuffer(MemoryBuffer::getMemBuffer(CheckFileText, "CheckFile"),
-                        SMLoc());
-  Regex PrefixRE = FC.buildCheckPrefixRegex();
-  if (FC.readCheckFile(SM, CheckFileText, PrefixRE))
-    return false;
-
-  auto OutBuffer = OutputBuf->getBuffer();
-  SM.AddNewSourceBuffer(std::move(OutputBuf), SMLoc());
-  return FC.checkInput(SM, OutBuffer);
-}
-#endif
diff --git a/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/GISelUtilsTest.cpp b/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/GISelUtilsTest.cpp
deleted file mode 100644
index ab174403c13..00000000000
--- a/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/GISelUtilsTest.cpp
+++ /dev/null
@@ -1,248 +0,0 @@
-//===- GISelUtilsTest.cpp -------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/CodeGen/GlobalISel/Utils.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-static const LLT S1 = LLT::scalar(1);
-static const LLT S8 = LLT::scalar(8);
-static const LLT S16 = LLT::scalar(16);
-static const LLT S32 = LLT::scalar(32);
-static const LLT S64 = LLT::scalar(64);
-static const LLT P0 = LLT::pointer(0, 64);
-static const LLT P1 = LLT::pointer(1, 32);
-
-static const LLT V2S8 = LLT::fixed_vector(2, 8);
-static const LLT V4S8 = LLT::fixed_vector(4, 8);
-static const LLT V8S8 = LLT::fixed_vector(8, 8);
-
-static const LLT V2S16 = LLT::fixed_vector(2, 16);
-static const LLT V3S16 = LLT::fixed_vector(3, 16);
-static const LLT V4S16 = LLT::fixed_vector(4, 16);
-
-static const LLT V2S32 = LLT::fixed_vector(2, 32);
-static const LLT V3S32 = LLT::fixed_vector(3, 32);
-static const LLT V4S32 = LLT::fixed_vector(4, 32);
-static const LLT V6S32 = LLT::fixed_vector(6, 32);
-
-static const LLT V2S64 = LLT::fixed_vector(2, 64);
-static const LLT V3S64 = LLT::fixed_vector(3, 64);
-static const LLT V4S64 = LLT::fixed_vector(4, 64);
-
-static const LLT V2P0 = LLT::fixed_vector(2, P0);
-static const LLT V3P0 = LLT::fixed_vector(3, P0);
-static const LLT V4P0 = LLT::fixed_vector(4, P0);
-static const LLT V6P0 = LLT::fixed_vector(6, P0);
-
-static const LLT V2P1 = LLT::fixed_vector(2, P1);
-static const LLT V4P1 = LLT::fixed_vector(4, P1);
-
-TEST(GISelUtilsTest, getGCDType) {
-  EXPECT_EQ(S1, getGCDType(S1, S1));
-  EXPECT_EQ(S32, getGCDType(S32, S32));
-  EXPECT_EQ(S1, getGCDType(S1, S32));
-  EXPECT_EQ(S1, getGCDType(S32, S1));
-  EXPECT_EQ(S16, getGCDType(S16, S32));
-  EXPECT_EQ(S16, getGCDType(S32, S16));
-
-  EXPECT_EQ(V2S32, getGCDType(V2S32, V2S32));
-  EXPECT_EQ(S32, getGCDType(V3S32, V2S32));
-  EXPECT_EQ(S32, getGCDType(V2S32, V3S32));
-
-  EXPECT_EQ(V2S16, getGCDType(V4S16, V2S16));
-  EXPECT_EQ(V2S16, getGCDType(V2S16, V4S16));
-
-  EXPECT_EQ(V2S32, getGCDType(V4S32, V2S32));
-  EXPECT_EQ(V2S32, getGCDType(V2S32, V4S32));
-
-  EXPECT_EQ(S16, getGCDType(P0, S16));
-  EXPECT_EQ(S16, getGCDType(S16, P0));
-
-  EXPECT_EQ(S32, getGCDType(P0, S32));
-  EXPECT_EQ(S32, getGCDType(S32, P0));
-
-  EXPECT_EQ(P0, getGCDType(P0, S64));
-  EXPECT_EQ(S64, getGCDType(S64, P0));
-
-  EXPECT_EQ(S32, getGCDType(P0, P1));
-  EXPECT_EQ(S32, getGCDType(P1, P0));
-
-  EXPECT_EQ(P0, getGCDType(V3P0, V2P0));
-  EXPECT_EQ(P0, getGCDType(V2P0, V3P0));
-
-  EXPECT_EQ(P0, getGCDType(P0, V2P0));
-  EXPECT_EQ(P0, getGCDType(V2P0, P0));
-
-
-  EXPECT_EQ(V2P0, getGCDType(V2P0, V2P0));
-  EXPECT_EQ(P0, getGCDType(V3P0, V2P0));
-  EXPECT_EQ(P0, getGCDType(V2P0, V3P0));
-  EXPECT_EQ(V2P0, getGCDType(V4P0, V2P0));
-
-  EXPECT_EQ(V2P0, getGCDType(V2P0, V4P1));
-  EXPECT_EQ(V4P1, getGCDType(V4P1, V2P0));
-
-  EXPECT_EQ(V2P0, getGCDType(V4P0, V4P1));
-  EXPECT_EQ(V4P1, getGCDType(V4P1, V4P0));
-
-  // Elements have same size, but have different pointeriness, so prefer the
-  // original element type.
-  EXPECT_EQ(V2P0, getGCDType(V2P0, V4S64));
-  EXPECT_EQ(V2S64, getGCDType(V4S64, V2P0));
-
-  EXPECT_EQ(V2S16, getGCDType(V2S16, V4P1));
-  EXPECT_EQ(P1, getGCDType(V4P1, V2S16));
-  EXPECT_EQ(V2P1, getGCDType(V4P1, V4S16));
-  EXPECT_EQ(V4S16, getGCDType(V4S16, V2P1));
-
-  EXPECT_EQ(P0, getGCDType(P0, V2S64));
-  EXPECT_EQ(S64, getGCDType(V2S64, P0));
-
-  EXPECT_EQ(S16, getGCDType(V2S16, V3S16));
-  EXPECT_EQ(S16, getGCDType(V3S16, V2S16));
-  EXPECT_EQ(S16, getGCDType(V3S16, S16));
-  EXPECT_EQ(S16, getGCDType(S16, V3S16));
-
-  EXPECT_EQ(V2S16, getGCDType(V2S16, V2S32));
-  EXPECT_EQ(S32, getGCDType(V2S32, V2S16));
-
-  EXPECT_EQ(V4S8, getGCDType(V4S8, V2S32));
-  EXPECT_EQ(S32, getGCDType(V2S32, V4S8));
-
-  // Test cases where neither element type nicely divides.
-  EXPECT_EQ(LLT::scalar(3),
-            getGCDType(LLT::fixed_vector(3, 5), LLT::fixed_vector(2, 6)));
-  EXPECT_EQ(LLT::scalar(3),
-            getGCDType(LLT::fixed_vector(2, 6), LLT::fixed_vector(3, 5)));
-
-  // Have to go smaller than a pointer element.
-  EXPECT_EQ(LLT::scalar(3), getGCDType(LLT::fixed_vector(2, LLT::pointer(3, 6)),
-                                       LLT::fixed_vector(3, 5)));
-  EXPECT_EQ(LLT::scalar(3),
-            getGCDType(LLT::fixed_vector(3, 5),
-                       LLT::fixed_vector(2, LLT::pointer(3, 6))));
-
-  EXPECT_EQ(V4S8, getGCDType(V4S8, S32));
-  EXPECT_EQ(S32, getGCDType(S32, V4S8));
-  EXPECT_EQ(V4S8, getGCDType(V4S8, P1));
-  EXPECT_EQ(P1, getGCDType(P1, V4S8));
-
-  EXPECT_EQ(V2S8, getGCDType(V2S8, V4S16));
-  EXPECT_EQ(S16, getGCDType(V4S16, V2S8));
-
-  EXPECT_EQ(S8, getGCDType(V2S8, LLT::fixed_vector(4, 2)));
-  EXPECT_EQ(LLT::fixed_vector(4, 2), getGCDType(LLT::fixed_vector(4, 2), S8));
-
-  EXPECT_EQ(LLT::pointer(4, 8),
-            getGCDType(LLT::fixed_vector(2, LLT::pointer(4, 8)),
-                       LLT::fixed_vector(4, 2)));
-
-  EXPECT_EQ(LLT::fixed_vector(4, 2),
-            getGCDType(LLT::fixed_vector(4, 2),
-                       LLT::fixed_vector(2, LLT::pointer(4, 8))));
-
-  EXPECT_EQ(LLT::scalar(4), getGCDType(LLT::fixed_vector(3, 4), S8));
-  EXPECT_EQ(LLT::scalar(4), getGCDType(S8, LLT::fixed_vector(3, 4)));
-}
-
-TEST(GISelUtilsTest, getLCMType) {
-  EXPECT_EQ(S1, getLCMType(S1, S1));
-  EXPECT_EQ(S32, getLCMType(S32, S1));
-  EXPECT_EQ(S32, getLCMType(S1, S32));
-  EXPECT_EQ(S32, getLCMType(S32, S32));
-
-  EXPECT_EQ(S32, getLCMType(S32, S16));
-  EXPECT_EQ(S32, getLCMType(S16, S32));
-
-  EXPECT_EQ(S64, getLCMType(S64, P0));
-  EXPECT_EQ(P0, getLCMType(P0, S64));
-
-  EXPECT_EQ(P0, getLCMType(S32, P0));
-  EXPECT_EQ(P0, getLCMType(P0, S32));
-
-  EXPECT_EQ(S32, getLCMType(S32, P1));
-  EXPECT_EQ(P1, getLCMType(P1, S32));
-  EXPECT_EQ(P0, getLCMType(P0, P0));
-  EXPECT_EQ(P1, getLCMType(P1, P1));
-
-  EXPECT_EQ(P0, getLCMType(P0, P1));
-  EXPECT_EQ(P0, getLCMType(P1, P0));
-
-  EXPECT_EQ(V2S32, getLCMType(V2S32, V2S32));
-  EXPECT_EQ(V2S32, getLCMType(V2S32, S32));
-  EXPECT_EQ(V2S32, getLCMType(S32, V2S32));
-  EXPECT_EQ(V2S32, getLCMType(V2S32, V2S32));
-  EXPECT_EQ(V6S32, getLCMType(V2S32, V3S32));
-  EXPECT_EQ(V6S32, getLCMType(V3S32, V2S32));
-  EXPECT_EQ(LLT::fixed_vector(12, S32), getLCMType(V4S32, V3S32));
-  EXPECT_EQ(LLT::fixed_vector(12, S32), getLCMType(V3S32, V4S32));
-
-  EXPECT_EQ(V2P0, getLCMType(V2P0, V2P0));
-  EXPECT_EQ(V2P0, getLCMType(V2P0, P0));
-  EXPECT_EQ(V2P0, getLCMType(P0, V2P0));
-  EXPECT_EQ(V2P0, getLCMType(V2P0, V2P0));
-  EXPECT_EQ(V6P0, getLCMType(V2P0, V3P0));
-  EXPECT_EQ(V6P0, getLCMType(V3P0, V2P0));
-  EXPECT_EQ(LLT::fixed_vector(12, P0), getLCMType(V4P0, V3P0));
-  EXPECT_EQ(LLT::fixed_vector(12, P0), getLCMType(V3P0, V4P0));
-
-  EXPECT_EQ(LLT::fixed_vector(12, S64), getLCMType(V4S64, V3P0));
-  EXPECT_EQ(LLT::fixed_vector(12, P0), getLCMType(V3P0, V4S64));
-
-  EXPECT_EQ(LLT::fixed_vector(12, P0), getLCMType(V4P0, V3S64));
-  EXPECT_EQ(LLT::fixed_vector(12, S64), getLCMType(V3S64, V4P0));
-
-  EXPECT_EQ(V2P0, getLCMType(V2P0, S32));
-  EXPECT_EQ(V4S32, getLCMType(S32, V2P0));
-  EXPECT_EQ(V2P0, getLCMType(V2P0, S64));
-  EXPECT_EQ(V2S64, getLCMType(S64, V2P0));
-
-
-  EXPECT_EQ(V2P0, getLCMType(V2P0, V2P1));
-  EXPECT_EQ(V4P1, getLCMType(V2P1, V2P0));
-
-  EXPECT_EQ(V2P0, getLCMType(V2P0, V4P1));
-  EXPECT_EQ(V4P1, getLCMType(V4P1, V2P0));
-
-
-  EXPECT_EQ(V2S32, getLCMType(V2S32, S64));
-  EXPECT_EQ(S64, getLCMType(S64, V2S32));
-
-  EXPECT_EQ(V4S16, getLCMType(V4S16, V2S32));
-  EXPECT_EQ(V2S32, getLCMType(V2S32, V4S16));
-
-  EXPECT_EQ(V2S32, getLCMType(V2S32, V4S8));
-  EXPECT_EQ(V8S8, getLCMType(V4S8, V2S32));
-
-  EXPECT_EQ(V2S16, getLCMType(V2S16, V4S8));
-  EXPECT_EQ(V4S8, getLCMType(V4S8, V2S16));
-
-  EXPECT_EQ(LLT::fixed_vector(6, S16), getLCMType(V3S16, V4S8));
-  EXPECT_EQ(LLT::fixed_vector(12, S8), getLCMType(V4S8, V3S16));
-  EXPECT_EQ(V4S16, getLCMType(V4S16, V4S8));
-  EXPECT_EQ(V8S8, getLCMType(V4S8, V4S16));
-
-  EXPECT_EQ(LLT::fixed_vector(6, 4), getLCMType(LLT::fixed_vector(3, 4), S8));
-  EXPECT_EQ(LLT::fixed_vector(3, 8), getLCMType(S8, LLT::fixed_vector(3, 4)));
-
-  EXPECT_EQ(LLT::fixed_vector(6, 4),
-            getLCMType(LLT::fixed_vector(3, 4), LLT::pointer(4, 8)));
-  EXPECT_EQ(LLT::fixed_vector(3, LLT::pointer(4, 8)),
-            getLCMType(LLT::pointer(4, 8), LLT::fixed_vector(3, 4)));
-
-  EXPECT_EQ(V2S64, getLCMType(V2S64, P0));
-  EXPECT_EQ(V2P0, getLCMType(P0, V2S64));
-
-  EXPECT_EQ(V2S64, getLCMType(V2S64, P1));
-  EXPECT_EQ(V4P1, getLCMType(P1, V2S64));
-}
-
-}
diff --git a/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/KnownBitsTest.cpp b/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/KnownBitsTest.cpp
deleted file mode 100644
index e948f150e67..00000000000
--- a/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/KnownBitsTest.cpp
+++ /dev/null
@@ -1,1861 +0,0 @@
-//===- KnownBitsTest.cpp -------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "GISelMITest.h"
-#include "llvm/CodeGen/GlobalISel/GISelKnownBits.h"
-#include "llvm/CodeGen/GlobalISel/MachineIRBuilder.h"
-
-TEST_F(AArch64GISelMITest, TestKnownBitsCst) {
-  StringRef MIRString = "  %3:_(s8) = G_CONSTANT i8 1\n"
-                        "  %4:_(s8) = COPY %3\n";
-  setUp(MIRString);
-  if (!TM)
-    return;
-  unsigned CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  unsigned SrcReg = FinalCopy->getOperand(1).getReg();
-  unsigned DstReg = FinalCopy->getOperand(0).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res = Info.getKnownBits(SrcReg);
-  EXPECT_EQ((uint64_t)1, Res.One.getZExtValue());
-  EXPECT_EQ((uint64_t)0xfe, Res.Zero.getZExtValue());
-
-  KnownBits Res2 = Info.getKnownBits(DstReg);
-  EXPECT_EQ(Res.One.getZExtValue(), Res2.One.getZExtValue());
-  EXPECT_EQ(Res.Zero.getZExtValue(), Res2.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsCstWithClass) {
-  StringRef MIRString = "  %10:gpr32 = MOVi32imm 1\n"
-                        "  %4:_(s32) = COPY %10\n";
-  setUp(MIRString);
-  if (!TM)
-    return;
-  unsigned CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  unsigned SrcReg = FinalCopy->getOperand(1).getReg();
-  unsigned DstReg = FinalCopy->getOperand(0).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res = Info.getKnownBits(SrcReg);
-  // We can't analyze %3 due to the register class constraint. We will get a
-  // default-constructed KnownBits back.
-  EXPECT_EQ((uint64_t)1, Res.getBitWidth());
-  EXPECT_EQ((uint64_t)0, Res.One.getZExtValue());
-  EXPECT_EQ((uint64_t)0, Res.Zero.getZExtValue());
-
-  KnownBits Res2 = Info.getKnownBits(DstReg);
-  // We still don't know the values due to the register class constraint but %4
-  // did reveal the size of %3.
-  EXPECT_EQ((uint64_t)32, Res2.getBitWidth());
-  EXPECT_EQ(Res.One.getZExtValue(), Res2.One.getZExtValue());
-  EXPECT_EQ(Res.Zero.getZExtValue(), Res2.Zero.getZExtValue());
-}
-
-// Check that we are able to track bits through PHIs
-// and get the intersections of everything we know on each operand.
-TEST_F(AArch64GISelMITest, TestKnownBitsCstPHI) {
-  StringRef MIRString = "  bb.10:\n"
-                        "  %10:_(s8) = G_CONSTANT i8 3\n"
-                        "  %11:_(s1) = G_IMPLICIT_DEF\n"
-                        "  G_BRCOND %11(s1), %bb.11\n"
-                        "  G_BR %bb.12\n"
-                        "\n"
-                        "  bb.11:\n"
-                        "  %12:_(s8) = G_CONSTANT i8 2\n"
-                        "  G_BR %bb.12\n"
-                        "\n"
-                        "  bb.12:\n"
-                        "  %13:_(s8) = PHI %10(s8), %bb.10, %12(s8), %bb.11\n"
-                        "  %14:_(s8) = COPY %13\n";
-  setUp(MIRString);
-  if (!TM)
-    return;
-  Register CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  Register SrcReg = FinalCopy->getOperand(1).getReg();
-  Register DstReg = FinalCopy->getOperand(0).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res = Info.getKnownBits(SrcReg);
-  EXPECT_EQ((uint64_t)2, Res.One.getZExtValue());
-  EXPECT_EQ((uint64_t)0xfc, Res.Zero.getZExtValue());
-
-  KnownBits Res2 = Info.getKnownBits(DstReg);
-  EXPECT_EQ(Res.One.getZExtValue(), Res2.One.getZExtValue());
-  EXPECT_EQ(Res.Zero.getZExtValue(), Res2.Zero.getZExtValue());
-}
-
-// Check that we report we know nothing when we hit a
-// non-generic register.
-// Note: this could be improved though!
-TEST_F(AArch64GISelMITest, TestKnownBitsCstPHIToNonGenericReg) {
-  StringRef MIRString = "  bb.10:\n"
-                        "  %10:gpr32 = MOVi32imm 3\n"
-                        "  %11:_(s1) = G_IMPLICIT_DEF\n"
-                        "  G_BRCOND %11(s1), %bb.11\n"
-                        "  G_BR %bb.12\n"
-                        "\n"
-                        "  bb.11:\n"
-                        "  %12:_(s8) = G_CONSTANT i8 2\n"
-                        "  G_BR %bb.12\n"
-                        "\n"
-                        "  bb.12:\n"
-                        "  %13:_(s8) = PHI %10, %bb.10, %12(s8), %bb.11\n"
-                        "  %14:_(s8) = COPY %13\n";
-  setUp(MIRString);
-  if (!TM)
-    return;
-  Register CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  Register SrcReg = FinalCopy->getOperand(1).getReg();
-  Register DstReg = FinalCopy->getOperand(0).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res = Info.getKnownBits(SrcReg);
-  EXPECT_EQ((uint64_t)0, Res.One.getZExtValue());
-  EXPECT_EQ((uint64_t)0, Res.Zero.getZExtValue());
-
-  KnownBits Res2 = Info.getKnownBits(DstReg);
-  EXPECT_EQ(Res.One.getZExtValue(), Res2.One.getZExtValue());
-  EXPECT_EQ(Res.Zero.getZExtValue(), Res2.Zero.getZExtValue());
-}
-
-// Check that we know nothing when at least one value of a PHI
-// comes from something we cannot analysis.
-// This test is not particularly interesting, it is just
-// here to cover the code that stops the analysis of PHIs
-// earlier. In that case, we would not even look at the
-// second incoming value.
-TEST_F(AArch64GISelMITest, TestKnownBitsUnknownPHI) {
-  StringRef MIRString =
-      "  bb.10:\n"
-      "  %10:_(s64) = COPY %0\n"
-      "  %11:_(s1) = G_IMPLICIT_DEF\n"
-      "  G_BRCOND %11(s1), %bb.11\n"
-      "  G_BR %bb.12\n"
-      "\n"
-      "  bb.11:\n"
-      "  %12:_(s64) = G_CONSTANT i64 2\n"
-      "  G_BR %bb.12\n"
-      "\n"
-      "  bb.12:\n"
-      "  %13:_(s64) = PHI %10(s64), %bb.10, %12(s64), %bb.11\n"
-      "  %14:_(s64) = COPY %13\n";
-  setUp(MIRString);
-  if (!TM)
-    return;
-  Register CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  Register SrcReg = FinalCopy->getOperand(1).getReg();
-  Register DstReg = FinalCopy->getOperand(0).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res = Info.getKnownBits(SrcReg);
-  EXPECT_EQ((uint64_t)0, Res.One.getZExtValue());
-  EXPECT_EQ((uint64_t)0, Res.Zero.getZExtValue());
-
-  KnownBits Res2 = Info.getKnownBits(DstReg);
-  EXPECT_EQ(Res.One.getZExtValue(), Res2.One.getZExtValue());
-  EXPECT_EQ(Res.Zero.getZExtValue(), Res2.Zero.getZExtValue());
-}
-
-// Check that we manage to process PHIs that loop on themselves.
-// For now, the analysis just stops and assumes it knows nothing,
-// eventually we could teach it how to properly track phis that
-// loop back.
-TEST_F(AArch64GISelMITest, TestKnownBitsCstPHIWithLoop) {
-  StringRef MIRString =
-      "  bb.10:\n"
-      "  %10:_(s8) = G_CONSTANT i8 3\n"
-      "  %11:_(s1) = G_IMPLICIT_DEF\n"
-      "  G_BRCOND %11(s1), %bb.11\n"
-      "  G_BR %bb.12\n"
-      "\n"
-      "  bb.11:\n"
-      "  %12:_(s8) = G_CONSTANT i8 2\n"
-      "  G_BR %bb.12\n"
-      "\n"
-      "  bb.12:\n"
-      "  %13:_(s8) = PHI %10(s8), %bb.10, %12(s8), %bb.11, %14(s8), %bb.12\n"
-      "  %14:_(s8) = COPY %13\n"
-      "  G_BR %bb.12\n";
-  setUp(MIRString);
-  if (!TM)
-    return;
-  Register CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  Register SrcReg = FinalCopy->getOperand(1).getReg();
-  Register DstReg = FinalCopy->getOperand(0).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res = Info.getKnownBits(SrcReg);
-  EXPECT_EQ((uint64_t)0, Res.One.getZExtValue());
-  EXPECT_EQ((uint64_t)0, Res.Zero.getZExtValue());
-
-  KnownBits Res2 = Info.getKnownBits(DstReg);
-  EXPECT_EQ(Res.One.getZExtValue(), Res2.One.getZExtValue());
-  EXPECT_EQ(Res.Zero.getZExtValue(), Res2.Zero.getZExtValue());
-}
-
-// Check that we don't try to analysis PHIs progression.
-// Setting a deep enough max depth would allow to effectively simulate
-// what happens in the loop.
-// Thus, with a deep enough depth, we could actually figure out
-// that %14's zero known bits are actually at least what we know
-// for %10, right shifted by one.
-// However, this process is super expensive compile-time wise and
-// we don't want to reach that conclusion while playing with max depth.
-// For now, the analysis just stops and assumes it knows nothing
-// on PHIs, but eventually we could teach it how to properly track
-// phis that loop back without relying on the luck effect of max
-// depth.
-TEST_F(AArch64GISelMITest, TestKnownBitsDecreasingCstPHIWithLoop) {
-  StringRef MIRString = "  bb.10:\n"
-                        "  %10:_(s8) = G_CONSTANT i8 5\n"
-                        "  %11:_(s8) = G_CONSTANT i8 1\n"
-                        "\n"
-                        "  bb.12:\n"
-                        "  %13:_(s8) = PHI %10(s8), %bb.10, %14(s8), %bb.12\n"
-                        "  %14:_(s8) = G_LSHR %13, %11\n"
-                        "  %15:_(s8) = COPY %14\n"
-                        "  G_BR %bb.12\n";
-  setUp(MIRString);
-  if (!TM)
-    return;
-  Register CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  Register SrcReg = FinalCopy->getOperand(1).getReg();
-  Register DstReg = FinalCopy->getOperand(0).getReg();
-  GISelKnownBits Info(*MF, /*MaxDepth=*/24);
-  KnownBits Res = Info.getKnownBits(SrcReg);
-  EXPECT_EQ((uint64_t)0, Res.One.getZExtValue());
-  // A single iteration on the PHI (%13) gives:
-  // %10 has known zero of 0xFA
-  // %12 has known zero of 0x80 (we shift right by one so high bit is zero)
-  // Therefore, %14's known zero are 0x80 shifted by one 0xC0.
-  // If we had simulated the loop we could have more zero bits, basically
-  // up to 0xFC (count leading zero of 5, + 1).
-  EXPECT_EQ((uint64_t)0xC0, Res.Zero.getZExtValue());
-
-  KnownBits Res2 = Info.getKnownBits(DstReg);
-  EXPECT_EQ(Res.One.getZExtValue(), Res2.One.getZExtValue());
-  EXPECT_EQ(Res.Zero.getZExtValue(), Res2.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsPtrToIntViceVersa) {
-  StringRef MIRString = "  %3:_(s16) = G_CONSTANT i16 256\n"
-                        "  %4:_(p0) = G_INTTOPTR %3\n"
-                        "  %5:_(s32) = G_PTRTOINT %4\n"
-                        "  %6:_(s32) = COPY %5\n";
-  setUp(MIRString);
-  if (!TM)
-    return;
-  unsigned CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  unsigned SrcReg = FinalCopy->getOperand(1).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res = Info.getKnownBits(SrcReg);
-  EXPECT_EQ(256u, Res.One.getZExtValue());
-  EXPECT_EQ(0xfffffeffu, Res.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsAND) {
-  StringRef MIRString = R"(
-   %ptr:_(p0) = G_IMPLICIT_DEF
-   %unknown:_(s8) = G_LOAD %ptr(p0) :: (load (s8))
-   %mask0:_(s8) = G_CONSTANT i8 52
-   %mask1:_(s8) = G_CONSTANT i8 10
-   %tmp0:_(s8) = G_AND %unknown, %mask0
-   %val0:_(s8) = G_OR %tmp0, %mask1
-   %mask2:_(s8) = G_CONSTANT i8 32
-   %mask3:_(s8) = G_CONSTANT i8 24
-   %tmp1:_(s8) = G_AND %unknown, %mask2
-   %val1:_(s8) = G_OR %tmp1, %mask3
-   %and:_(s8) = G_AND %val0, %val1
-   %copy_and:_(s8) = COPY %and
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  Register SrcReg = FinalCopy->getOperand(1).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res = Info.getKnownBits(SrcReg);
-  //   00??1?10
-  // & 00?11000
-  // = 00??1000
-  EXPECT_EQ(0x08u, Res.One.getZExtValue());
-  EXPECT_EQ(0xC7u, Res.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsOR) {
-  StringRef MIRString = R"(
-   %ptr:_(p0) = G_IMPLICIT_DEF
-   %unknown:_(s8) = G_LOAD %ptr(p0) :: (load (s8))
-   %mask0:_(s8) = G_CONSTANT i8 52
-   %mask1:_(s8) = G_CONSTANT i8 10
-   %tmp0:_(s8) = G_AND %unknown, %mask0
-   %val0:_(s8) = G_OR %tmp0, %mask1
-   %mask2:_(s8) = G_CONSTANT i8 32
-   %mask3:_(s8) = G_CONSTANT i8 24
-   %tmp1:_(s8) = G_AND %unknown, %mask2
-   %val1:_(s8) = G_OR %tmp1, %mask3
-   %or:_(s8) = G_OR %val0, %val1
-   %copy_or:_(s8) = COPY %or
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  Register SrcReg = FinalCopy->getOperand(1).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res = Info.getKnownBits(SrcReg);
-  //   00??1?10
-  // | 00?11000
-  // = 00?11?10
-  EXPECT_EQ(0x1Au, Res.One.getZExtValue());
-  EXPECT_EQ(0xC1u, Res.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsXOR) {
-  StringRef MIRString = R"(
-   %ptr:_(p0) = G_IMPLICIT_DEF
-   %unknown:_(s8) = G_LOAD %ptr(p0) :: (load (s8))
-   %mask0:_(s8) = G_CONSTANT i8 52
-   %mask1:_(s8) = G_CONSTANT i8 10
-   %tmp0:_(s8) = G_AND %unknown, %mask0
-   %val0:_(s8) = G_OR %tmp0, %mask1
-   %mask2:_(s8) = G_CONSTANT i8 32
-   %mask3:_(s8) = G_CONSTANT i8 24
-   %tmp1:_(s8) = G_AND %unknown, %mask2
-   %val1:_(s8) = G_OR %tmp1, %mask3
-   %xor:_(s8) = G_XOR %val0, %val1
-   %copy_xor:_(s8) = COPY %xor
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  Register SrcReg = FinalCopy->getOperand(1).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res = Info.getKnownBits(SrcReg);
-  // Xor KnowBits does not track if we are doing xor of unknown bit with itself
-  // or negated itself.
-  //   00??1?10
-  // ^ 00?11000
-  // = 00??0?10
-  EXPECT_EQ(0x02u, Res.One.getZExtValue());
-  EXPECT_EQ(0xC9u, Res.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsXORConstant) {
-  StringRef MIRString = "  %3:_(s8) = G_CONSTANT i8 4\n"
-                        "  %4:_(s8) = G_CONSTANT i8 7\n"
-                        "  %5:_(s8) = G_XOR %3, %4\n"
-                        "  %6:_(s8) = COPY %5\n";
-  setUp(MIRString);
-  if (!TM)
-    return;
-  unsigned CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  unsigned SrcReg = FinalCopy->getOperand(1).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res = Info.getKnownBits(SrcReg);
-  EXPECT_EQ(3u, Res.One.getZExtValue());
-  EXPECT_EQ(252u, Res.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsASHR) {
-  StringRef MIRString = R"(
-   %ptr:_(p0) = G_IMPLICIT_DEF
-   %unknown:_(s8) = G_LOAD %ptr(p0) :: (load (s8))
-   %mask0:_(s8) = G_CONSTANT i8 38
-   %mask1:_(s8) = G_CONSTANT i8 202
-   %tmp0:_(s8) = G_AND %unknown, %mask0
-   %val0:_(s8) = G_OR %tmp0, %mask1
-   %cst0:_(s8) = G_CONSTANT i8 2
-   %ashr0:_(s8) = G_ASHR %val0, %cst0
-   %copy_ashr0:_(s8) = COPY %ashr0
-
-   %mask2:_(s8) = G_CONSTANT i8 204
-   %mask3:_(s8) = G_CONSTANT i8 18
-   %tmp1:_(s8) = G_AND %unknown, %mask2
-   %val1:_(s8) = G_OR %tmp1, %mask3
-   %ashr1:_(s8) = G_ASHR %val1, %cst0
-   %copy_ashr1:_(s8) = COPY %ashr1
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg0 = Copies[Copies.size() - 2];
-  MachineInstr *FinalCopy0 = MRI->getVRegDef(CopyReg0);
-  Register SrcReg0 = FinalCopy0->getOperand(1).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res0 = Info.getKnownBits(SrcReg0);
-  //   11?01??0 >> 2
-  // = 1111?01?
-  EXPECT_EQ(0xF2u, Res0.One.getZExtValue());
-  EXPECT_EQ(0x04u, Res0.Zero.getZExtValue());
-
-  Register CopyReg1 = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy1 = MRI->getVRegDef(CopyReg1);
-  Register SrcReg1 = FinalCopy1->getOperand(1).getReg();
-  KnownBits Res1 = Info.getKnownBits(SrcReg1);
-  //   ??01??10 >> 2
-  // = ????01??
-  EXPECT_EQ(0x04u, Res1.One.getZExtValue());
-  EXPECT_EQ(0x08u, Res1.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsLSHR) {
-  StringRef MIRString = R"(
-   %ptr:_(p0) = G_IMPLICIT_DEF
-   %unknown:_(s8) = G_LOAD %ptr(p0) :: (load (s8))
-   %mask0:_(s8) = G_CONSTANT i8 38
-   %mask1:_(s8) = G_CONSTANT i8 202
-   %tmp0:_(s8) = G_AND %unknown, %mask0
-   %val0:_(s8) = G_OR %tmp0, %mask1
-   %cst0:_(s8) = G_CONSTANT i8 2
-   %lshr0:_(s8) = G_LSHR %val0, %cst0
-   %copy_lshr0:_(s8) = COPY %lshr0
-
-   %mask2:_(s8) = G_CONSTANT i8 204
-   %mask3:_(s8) = G_CONSTANT i8 18
-   %tmp1:_(s8) = G_AND %unknown, %mask2
-   %val1:_(s8) = G_OR %tmp1, %mask3
-   %lshr1:_(s8) = G_LSHR %val1, %cst0
-   %copy_lshr1:_(s8) = COPY %lshr1
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg0 = Copies[Copies.size() - 2];
-  MachineInstr *FinalCopy0 = MRI->getVRegDef(CopyReg0);
-  Register SrcReg0 = FinalCopy0->getOperand(1).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res0 = Info.getKnownBits(SrcReg0);
-  //   11?01??0 >> 2
-  // = 0011?01?
-  EXPECT_EQ(0x32u, Res0.One.getZExtValue());
-  EXPECT_EQ(0xC4u, Res0.Zero.getZExtValue());
-
-  Register CopyReg1 = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy1 = MRI->getVRegDef(CopyReg1);
-  Register SrcReg1 = FinalCopy1->getOperand(1).getReg();
-  KnownBits Res1 = Info.getKnownBits(SrcReg1);
-  //   ??01??10 >> 2
-  // = 00??01??
-  EXPECT_EQ(0x04u, Res1.One.getZExtValue());
-  EXPECT_EQ(0xC8u, Res1.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsSHL) {
-  StringRef MIRString = R"(
-   %ptr:_(p0) = G_IMPLICIT_DEF
-   %unknown:_(s8) = G_LOAD %ptr(p0) :: (load (s8))
-   %mask0:_(s8) = G_CONSTANT i8 51
-   %mask1:_(s8) = G_CONSTANT i8 72
-   %tmp:_(s8) = G_AND %unknown, %mask0
-   %val:_(s8) = G_OR %tmp, %mask1
-   %cst:_(s8) = G_CONSTANT i8 3
-   %shl:_(s8) = G_SHL %val, %cst
-   %copy_shl:_(s8) = COPY %shl
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  Register SrcReg = FinalCopy->getOperand(1).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res = Info.getKnownBits(SrcReg);
-  //   01??10?? << 3
-  // = ?10??000
-  EXPECT_EQ(0x40u, Res.One.getZExtValue());
-  EXPECT_EQ(0x27u, Res.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsADD) {
-  StringRef MIRString = R"(
-   %ptr:_(p0) = G_IMPLICIT_DEF
-   %unknown:_(s16) = G_LOAD %ptr(p0) :: (load (s16))
-   %mask0:_(s16) = G_CONSTANT i16 4642
-   %mask1:_(s16) = G_CONSTANT i16 9536
-   %tmp0:_(s16) = G_AND %unknown, %mask0
-   %val0:_(s16) = G_OR %tmp0, %mask1
-   %mask2:_(s16) = G_CONSTANT i16 4096
-   %mask3:_(s16) = G_CONSTANT i16 371
-   %tmp1:_(s16) = G_AND %unknown, %mask2
-   %val1:_(s16) = G_OR %tmp1, %mask3
-   %add:_(s16) = G_ADD %val0, %val1
-   %copy_add:_(s16) = COPY %add
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  Register SrcReg = FinalCopy->getOperand(1).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res = Info.getKnownBits(SrcReg);
-  // Add KnowBits works out known carry bits first and then calculates result.
-  //   001?01?101?000?0
-  // + 000?000101110011
-  // = 0??????01??10??1
-  EXPECT_EQ(0x0091u, Res.One.getZExtValue());
-  EXPECT_EQ(0x8108u, Res.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsSUB) {
-  StringRef MIRString = R"(
-   %ptr:_(p0) = G_IMPLICIT_DEF
-   %unknown:_(s16) = G_LOAD %ptr(p0) :: (load (s16))
-   %mask0:_(s16) = G_CONSTANT i16 4642
-   %mask1:_(s16) = G_CONSTANT i16 9536
-   %tmp0:_(s16) = G_AND %unknown, %mask0
-   %val0:_(s16) = G_OR %tmp0, %mask1
-   %mask2:_(s16) = G_CONSTANT i16 4096
-   %mask3:_(s16) = G_CONSTANT i16 371
-   %tmp1:_(s16) = G_AND %unknown, %mask2
-   %val1:_(s16) = G_OR %tmp1, %mask3
-   %sub:_(s16) = G_SUB %val0, %val1
-   %copy_sub:_(s16) = COPY %sub
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  Register SrcReg = FinalCopy->getOperand(1).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res = Info.getKnownBits(SrcReg);
-  // Sub KnowBits for LHS - RHS use Add KnownBits for LHS + ~RHS + 1.
-  EXPECT_EQ(0x01CDu, Res.One.getZExtValue());
-  EXPECT_EQ(0xC810u, Res.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsMUL) {
-  StringRef MIRString = R"(
-   %ptr0:_(p0) = G_IMPLICIT_DEF
-   %load0:_(s16) = G_LOAD %ptr0(p0) :: (load (s16))
-   %mask0:_(s16) = G_CONSTANT i16 4
-   %mask1:_(s16) = G_CONSTANT i16 18
-   %tmp:_(s16) = G_AND %load0, %mask0
-   %val0:_(s16) = G_OR %tmp, %mask1
-   %cst:_(s16) = G_CONSTANT i16 12
-   %mul:_(s16) = G_MUL %val0, %cst
-   %copy_mul:_(s16) = COPY %mul
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  Register SrcReg = FinalCopy->getOperand(1).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res = Info.getKnownBits(SrcReg);
-  // Mul KnowBits are conservatively correct, but not guaranteed to be precise.
-  // Precise for trailing bits up to the first unknown bit.
-  // 00010?10 * 00001100 =
-  //          00010?1000
-  //  +      00010?10000
-  //  = 0000000010??1000
-  // KB 0000000?????1000
-  EXPECT_EQ(0x0008u, Res.One.getZExtValue());
-  EXPECT_EQ(0xFE07u, Res.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsICMP) {
-  StringRef MIRString = R"(
-   %cst0:_(s32) = G_CONSTANT i32 0
-   %cst1:_(s32) = G_CONSTANT i32 1
-   %icmp:_(s32) = G_ICMP intpred(ne), %cst0, %cst1
-   %copy_icmp:_(s32) = COPY %icmp
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  Register SrcReg = FinalCopy->getOperand(1).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res = Info.getKnownBits(SrcReg);
-  // For targets that use 0 or 1 as icmp result in large register set high bits
-  // to 0, does not analyze operands/compare predicate.
-  EXPECT_EQ(0x00000000u, Res.One.getZExtValue());
-  EXPECT_EQ(0xFFFFFFFEu, Res.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsFCMP) {
-  StringRef MIRString = R"(
-   %cst0:_(s32) = G_FCONSTANT float 0.0
-   %cst1:_(s32) = G_FCONSTANT float 1.0
-   %fcmp:_(s32) = G_FCMP floatpred(one), %cst0, %cst1
-   %copy_fcmp:_(s32) = COPY %fcmp
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  Register SrcReg = FinalCopy->getOperand(1).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res = Info.getKnownBits(SrcReg);
-  // For targets that use 0 or 1 as fcmp result in large register set high bits
-  // to 0, does not analyze operands/compare predicate.
-  EXPECT_EQ(0x00000000u, Res.One.getZExtValue());
-  EXPECT_EQ(0xFFFFFFFEu, Res.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsSelect) {
-  StringRef MIRString = R"(
-   %ptr:_(p0) = G_IMPLICIT_DEF
-   %unknown:_(s8) = G_LOAD %ptr(p0) :: (load (s8))
-   %mask0:_(s8) = G_CONSTANT i8 24
-   %mask1:_(s8) = G_CONSTANT i8 224
-   %tmp0:_(s8) = G_AND %unknown, %mask0
-   %val0:_(s8) = G_OR %tmp0, %mask1
-   %mask2:_(s8) = G_CONSTANT i8 146
-   %mask3:_(s8) = G_CONSTANT i8 36
-   %tmp1:_(s8) = G_AND %unknown, %mask2
-   %val1:_(s8) = G_OR %tmp1, %mask3
-   %cond:_(s1) = G_CONSTANT i1 false
-   %select:_(s8) = G_SELECT %cond, %val0, %val1
-   %copy_select:_(s8) = COPY %select
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  Register SrcReg = FinalCopy->getOperand(1).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res = Info.getKnownBits(SrcReg);
-  // Select KnownBits takes common bits of LHS and RHS, does not analyze
-  // condition operand.
-  //        111??000
-  // select ?01?01?0
-  //      = ??1????0
-  EXPECT_EQ(0x20u, Res.One.getZExtValue());
-  EXPECT_EQ(0x01u, Res.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBits) {
-
-  StringRef MIR = "  %3:_(s32) = G_TRUNC %0\n"
-                  "  %4:_(s32) = G_TRUNC %1\n"
-                  "  %5:_(s32) = G_CONSTANT i32 5\n"
-                  "  %6:_(s32) = G_CONSTANT i32 24\n"
-                  "  %7:_(s32) = G_CONSTANT i32 28\n"
-                  "  %14:_(p0) = G_INTTOPTR %7\n"
-                  "  %16:_(s32) = G_PTRTOINT %14\n"
-                  "  %8:_(s32) = G_SHL %3, %5\n"
-                  "  %9:_(s32) = G_SHL %4, %5\n"
-                  "  %10:_(s32) = G_OR %8, %6\n"
-                  "  %11:_(s32) = G_OR %9, %16\n"
-                  "  %12:_(s32) = G_MUL %10, %11\n"
-                  "  %13:_(s32) = COPY %12\n";
-  setUp(MIR);
-  if (!TM)
-    return;
-  unsigned CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  unsigned SrcReg = FinalCopy->getOperand(1).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Known = Info.getKnownBits(SrcReg);
-  EXPECT_FALSE(Known.hasConflict());
-  EXPECT_EQ(32u, Known.One.getZExtValue());
-  EXPECT_EQ(95u, Known.Zero.getZExtValue());
-  APInt Zeroes = Info.getKnownZeroes(SrcReg);
-  EXPECT_EQ(Known.Zero, Zeroes);
-}
-
-TEST_F(AArch64GISelMITest, TestSignBitIsZero) {
-  setUp();
-  if (!TM)
-    return;
-
-  const LLT S32 = LLT::scalar(32);
-  auto SignBit = B.buildConstant(S32, 0x80000000);
-  auto Zero = B.buildConstant(S32, 0);
-
-  GISelKnownBits KnownBits(*MF);
-
-  EXPECT_TRUE(KnownBits.signBitIsZero(Zero.getReg(0)));
-  EXPECT_FALSE(KnownBits.signBitIsZero(SignBit.getReg(0)));
-}
-
-TEST_F(AArch64GISelMITest, TestNumSignBitsConstant) {
-  StringRef MIRString = "  %3:_(s8) = G_CONSTANT i8 1\n"
-                        "  %4:_(s8) = COPY %3\n"
-
-                        "  %5:_(s8) = G_CONSTANT i8 -1\n"
-                        "  %6:_(s8) = COPY %5\n"
-
-                        "  %7:_(s8) = G_CONSTANT i8 127\n"
-                        "  %8:_(s8) = COPY %7\n"
-
-                        "  %9:_(s8) = G_CONSTANT i8 32\n"
-                        "  %10:_(s8) = COPY %9\n"
-
-                        "  %11:_(s8) = G_CONSTANT i8 -32\n"
-                        "  %12:_(s8) = COPY %11\n";
-  setUp(MIRString);
-  if (!TM)
-    return;
-  Register CopyReg1 = Copies[Copies.size() - 5];
-  Register CopyRegNeg1 = Copies[Copies.size() - 4];
-  Register CopyReg127 = Copies[Copies.size() - 3];
-  Register CopyReg32 = Copies[Copies.size() - 2];
-  Register CopyRegNeg32 = Copies[Copies.size() - 1];
-
-  GISelKnownBits Info(*MF);
-  EXPECT_EQ(7u, Info.computeNumSignBits(CopyReg1));
-  EXPECT_EQ(8u, Info.computeNumSignBits(CopyRegNeg1));
-  EXPECT_EQ(1u, Info.computeNumSignBits(CopyReg127));
-  EXPECT_EQ(2u, Info.computeNumSignBits(CopyReg32));
-  EXPECT_EQ(3u, Info.computeNumSignBits(CopyRegNeg32));
-}
-
-TEST_F(AArch64GISelMITest, TestNumSignBitsSext) {
-  StringRef MIRString = "  %3:_(p0) = G_IMPLICIT_DEF\n"
-                        "  %4:_(s8) = G_LOAD %3 :: (load (s8))\n"
-                        "  %5:_(s32) = G_SEXT %4\n"
-                        "  %6:_(s32) = COPY %5\n"
-
-                        "  %7:_(s8) = G_CONSTANT i8 -1\n"
-                        "  %8:_(s32) = G_SEXT %7\n"
-                        "  %9:_(s32) = COPY %8\n";
-  setUp(MIRString);
-  if (!TM)
-    return;
-  Register CopySextLoad = Copies[Copies.size() - 2];
-  Register CopySextNeg1 = Copies[Copies.size() - 1];
-
-  GISelKnownBits Info(*MF);
-  EXPECT_EQ(25u, Info.computeNumSignBits(CopySextLoad));
-  EXPECT_EQ(32u, Info.computeNumSignBits(CopySextNeg1));
-}
-
-TEST_F(AArch64GISelMITest, TestNumSignBitsSextInReg) {
-  StringRef MIRString = R"(
-   %ptr:_(p0) = G_IMPLICIT_DEF
-   %load4:_(s32) = G_LOAD %ptr :: (load (s32))
-
-   %inreg7:_(s32) = G_SEXT_INREG %load4, 7
-   %copy_inreg7:_(s32) = COPY %inreg7
-
-   %inreg8:_(s32) = G_SEXT_INREG %load4, 8
-   %copy_inreg8:_(s32) = COPY %inreg8
-
-   %inreg9:_(s32) = G_SEXT_INREG %load4, 9
-   %copy_inreg9:_(s32) = COPY %inreg9
-
-   %inreg31:_(s32) = G_SEXT_INREG %load4, 31
-   %copy_inreg31:_(s32) = COPY %inreg31
-
-   %load1:_(s8) = G_LOAD %ptr :: (load (s8))
-   %sext_load1:_(s32) = G_SEXT %load1
-
-   %inreg6_sext:_(s32) = G_SEXT_INREG %sext_load1, 6
-   %copy_inreg6_sext:_(s32) = COPY %inreg6_sext
-
-   %inreg7_sext:_(s32) = G_SEXT_INREG %sext_load1, 7
-   %copy_inreg7_sext:_(s32) = COPY %inreg7_sext
-
-   %inreg8_sext:_(s32) = G_SEXT_INREG %sext_load1, 8
-   %copy_inreg8_sext:_(s32) = COPY %inreg8_sext
-
-   %inreg9_sext:_(s32) = G_SEXT_INREG %sext_load1, 9
-   %copy_inreg9_sext:_(s32) = COPY %inreg9_sext
-
-   %inreg31_sext:_(s32) = G_SEXT_INREG %sext_load1, 31
-   %copy_inreg31_sext:_(s32) = COPY %inreg31_sext
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyInReg7 = Copies[Copies.size() - 9];
-  Register CopyInReg8 = Copies[Copies.size() - 8];
-  Register CopyInReg9 = Copies[Copies.size() - 7];
-  Register CopyInReg31 = Copies[Copies.size() - 6];
-
-  Register CopyInReg6Sext = Copies[Copies.size() - 5];
-  Register CopyInReg7Sext = Copies[Copies.size() - 4];
-  Register CopyInReg8Sext = Copies[Copies.size() - 3];
-  Register CopyInReg9Sext = Copies[Copies.size() - 2];
-  Register CopyInReg31Sext = Copies[Copies.size() - 1];
-
-  GISelKnownBits Info(*MF);
-  EXPECT_EQ(26u, Info.computeNumSignBits(CopyInReg7));
-  EXPECT_EQ(25u, Info.computeNumSignBits(CopyInReg8));
-  EXPECT_EQ(24u, Info.computeNumSignBits(CopyInReg9));
-  EXPECT_EQ(2u, Info.computeNumSignBits(CopyInReg31));
-
-  EXPECT_EQ(27u, Info.computeNumSignBits(CopyInReg6Sext));
-  EXPECT_EQ(26u, Info.computeNumSignBits(CopyInReg7Sext));
-  EXPECT_EQ(25u, Info.computeNumSignBits(CopyInReg8Sext));
-  EXPECT_EQ(25u, Info.computeNumSignBits(CopyInReg9Sext));
-  EXPECT_EQ(25u, Info.computeNumSignBits(CopyInReg31Sext));
-}
-
-TEST_F(AArch64GISelMITest, TestNumSignBitsAssertSext) {
-  StringRef MIRString = R"(
-   %ptr:_(p0) = G_IMPLICIT_DEF
-   %load4:_(s32) = G_LOAD %ptr :: (load (s32))
-
-   %assert_sext1:_(s32) = G_ASSERT_SEXT %load4, 1
-   %copy_assert_sext1:_(s32) = COPY %assert_sext1
-
-   %assert_sext7:_(s32) = G_ASSERT_SEXT %load4, 7
-   %copy_assert_sext7:_(s32) = COPY %assert_sext7
-
-   %assert_sext8:_(s32) = G_ASSERT_SEXT %load4, 8
-   %copy_assert_sext8:_(s32) = COPY %assert_sext8
-
-   %assert_sext9:_(s32) = G_ASSERT_SEXT %load4, 9
-   %copy_assert_sext9:_(s32) = COPY %assert_sext9
-
-   %assert_sext31:_(s32) = G_ASSERT_SEXT %load4, 31
-   %copy_assert_sext31:_(s32) = COPY %assert_sext31
-
-   %load1:_(s8) = G_LOAD %ptr :: (load (s8))
-   %sext_load1:_(s32) = G_SEXT %load1
-
-   %assert_sext6_sext:_(s32) = G_ASSERT_SEXT %sext_load1, 6
-   %copy_assert_sext6_sext:_(s32) = COPY %assert_sext6_sext
-
-   %assert_sext7_sext:_(s32) = G_ASSERT_SEXT %sext_load1, 7
-   %copy_assert_sext7_sext:_(s32) = COPY %assert_sext7_sext
-
-   %assert_sext8_sext:_(s32) = G_ASSERT_SEXT %sext_load1, 8
-   %copy_assert_sext8_sext:_(s32) = COPY %assert_sext8_sext
-
-   %assert_sext9_sext:_(s32) = G_ASSERT_SEXT %sext_load1, 9
-   %copy_assert_sext9_sext:_(s32) = COPY %assert_sext9_sext
-
-   %assert_sext31_sext:_(s32) = G_ASSERT_SEXT %sext_load1, 31
-   %copy_assert_sext31_sext:_(s32) = COPY %assert_sext31_sext
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyInReg1 = Copies[Copies.size() - 10];
-  Register CopyInReg7 = Copies[Copies.size() - 9];
-  Register CopyInReg8 = Copies[Copies.size() - 8];
-  Register CopyInReg9 = Copies[Copies.size() - 7];
-  Register CopyInReg31 = Copies[Copies.size() - 6];
-
-  Register CopyInReg6Sext = Copies[Copies.size() - 5];
-  Register CopyInReg7Sext = Copies[Copies.size() - 4];
-  Register CopyInReg8Sext = Copies[Copies.size() - 3];
-  Register CopyInReg9Sext = Copies[Copies.size() - 2];
-  Register CopyInReg31Sext = Copies[Copies.size() - 1];
-
-  GISelKnownBits Info(*MF);
-  EXPECT_EQ(32u, Info.computeNumSignBits(CopyInReg1));
-  EXPECT_EQ(26u, Info.computeNumSignBits(CopyInReg7));
-  EXPECT_EQ(25u, Info.computeNumSignBits(CopyInReg8));
-  EXPECT_EQ(24u, Info.computeNumSignBits(CopyInReg9));
-  EXPECT_EQ(2u, Info.computeNumSignBits(CopyInReg31));
-
-  EXPECT_EQ(27u, Info.computeNumSignBits(CopyInReg6Sext));
-  EXPECT_EQ(26u, Info.computeNumSignBits(CopyInReg7Sext));
-  EXPECT_EQ(25u, Info.computeNumSignBits(CopyInReg8Sext));
-  EXPECT_EQ(25u, Info.computeNumSignBits(CopyInReg9Sext));
-  EXPECT_EQ(25u, Info.computeNumSignBits(CopyInReg31Sext));
-}
-
-TEST_F(AArch64GISelMITest, TestNumSignBitsTrunc) {
-  StringRef MIRString = "  %3:_(p0) = G_IMPLICIT_DEF\n"
-                        "  %4:_(s32) = G_LOAD %3 :: (load (s32))\n"
-                        "  %5:_(s8) = G_TRUNC %4\n"
-                        "  %6:_(s8) = COPY %5\n"
-
-                        "  %7:_(s32) = G_CONSTANT i32 -1\n"
-                        "  %8:_(s8) = G_TRUNC %7\n"
-                        "  %9:_(s8) = COPY %8\n"
-
-                        "  %10:_(s32) = G_CONSTANT i32 7\n"
-                        "  %11:_(s8) = G_TRUNC %10\n"
-                        "  %12:_(s8) = COPY %11\n";
-  setUp(MIRString);
-  if (!TM)
-    return;
-  Register CopyTruncLoad = Copies[Copies.size() - 3];
-  Register CopyTruncNeg1 = Copies[Copies.size() - 2];
-  Register CopyTrunc7 = Copies[Copies.size() - 1];
-
-  GISelKnownBits Info(*MF);
-  EXPECT_EQ(1u, Info.computeNumSignBits(CopyTruncLoad));
-  EXPECT_EQ(8u, Info.computeNumSignBits(CopyTruncNeg1));
-  EXPECT_EQ(5u, Info.computeNumSignBits(CopyTrunc7));
-}
-
-TEST_F(AMDGPUGISelMITest, TestNumSignBitsTrunc) {
-  StringRef MIRString =
-    "  %3:_(<4 x s32>) = G_IMPLICIT_DEF\n"
-    "  %4:_(s32) = G_IMPLICIT_DEF\n"
-    "  %5:_(s32) = G_AMDGPU_BUFFER_LOAD_UBYTE %3, %4, %4, %4, 0, 0, 0 :: (load (s8))\n"
-    "  %6:_(s32) = COPY %5\n"
-
-    "  %7:_(s32) = G_AMDGPU_BUFFER_LOAD_SBYTE %3, %4, %4, %4, 0, 0, 0 :: (load (s8))\n"
-    "  %8:_(s32) = COPY %7\n"
-
-    "  %9:_(s32) = G_AMDGPU_BUFFER_LOAD_USHORT %3, %4, %4, %4, 0, 0, 0 :: (load (s16))\n"
-    "  %10:_(s32) = COPY %9\n"
-
-    "  %11:_(s32) = G_AMDGPU_BUFFER_LOAD_SSHORT %3, %4, %4, %4, 0, 0, 0 :: (load (s16))\n"
-    "  %12:_(s32) = COPY %11\n";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyLoadUByte = Copies[Copies.size() - 4];
-  Register CopyLoadSByte = Copies[Copies.size() - 3];
-  Register CopyLoadUShort = Copies[Copies.size() - 2];
-  Register CopyLoadSShort = Copies[Copies.size() - 1];
-
-  GISelKnownBits Info(*MF);
-
-  EXPECT_EQ(24u, Info.computeNumSignBits(CopyLoadUByte));
-  EXPECT_EQ(25u, Info.computeNumSignBits(CopyLoadSByte));
-  EXPECT_EQ(16u, Info.computeNumSignBits(CopyLoadUShort));
-  EXPECT_EQ(17u, Info.computeNumSignBits(CopyLoadSShort));
-}
-
-TEST_F(AMDGPUGISelMITest, TestTargetKnownAlign) {
-  StringRef MIRString =
-    "  %5:_(p4) = G_INTRINSIC intrinsic(@llvm.amdgcn.dispatch.ptr)\n"
-    "  %6:_(p4) = COPY %5\n"
-    "  %7:_(p4) = G_INTRINSIC intrinsic(@llvm.amdgcn.queue.ptr)\n"
-    "  %8:_(p4) = COPY %7\n"
-    "  %9:_(p4) = G_INTRINSIC intrinsic(@llvm.amdgcn.kernarg.segment.ptr)\n"
-    "  %10:_(p4) = COPY %9\n"
-    "  %11:_(p4) = G_INTRINSIC intrinsic(@llvm.amdgcn.implicitarg.ptr)\n"
-    "  %12:_(p4) = COPY %11\n"
-    "  %13:_(p4) = G_INTRINSIC intrinsic(@llvm.amdgcn.implicit.buffer.ptr)\n"
-    "  %14:_(p4) = COPY %13\n";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyDispatchPtr = Copies[Copies.size() - 5];
-  Register CopyQueuePtr = Copies[Copies.size() - 4];
-  Register CopyKernargSegmentPtr = Copies[Copies.size() - 3];
-  Register CopyImplicitArgPtr = Copies[Copies.size() - 2];
-  Register CopyImplicitBufferPtr = Copies[Copies.size() - 1];
-
-  GISelKnownBits Info(*MF);
-
-  EXPECT_EQ(Align(4), Info.computeKnownAlignment(CopyDispatchPtr));
-  EXPECT_EQ(Align(4), Info.computeKnownAlignment(CopyQueuePtr));
-  EXPECT_EQ(Align(4), Info.computeKnownAlignment(CopyKernargSegmentPtr));
-  EXPECT_EQ(Align(4), Info.computeKnownAlignment(CopyImplicitArgPtr));
-  EXPECT_EQ(Align(4), Info.computeKnownAlignment(CopyImplicitBufferPtr));
-}
-
-TEST_F(AMDGPUGISelMITest, TestIsKnownToBeAPowerOfTwo) {
-
-  StringRef MIRString = R"MIR(
-  %zero:_(s32) = G_CONSTANT i32 0
-  %one:_(s32) = G_CONSTANT i32 1
-  %two:_(s32) = G_CONSTANT i32 2
-  %three:_(s32) = G_CONSTANT i32 3
-  %five:_(s32) = G_CONSTANT i32 5
-  %copy_zero:_(s32) = COPY %zero
-  %copy_one:_(s32) = COPY %one
-  %copy_two:_(s32) = COPY %two
-  %copy_three:_(s32) = COPY %three
-
-  %trunc_two:_(s1) = G_TRUNC %two
-  %trunc_three:_(s1) = G_TRUNC %three
-  %trunc_five:_(s1) = G_TRUNC %five
-
-  %copy_trunc_two:_(s1) = COPY %trunc_two
-  %copy_trunc_three:_(s1) = COPY %trunc_three
-  %copy_trunc_five:_(s1) = COPY %trunc_five
-
-  %ptr:_(p1) = G_IMPLICIT_DEF
-  %shift_amt:_(s32) = G_LOAD %ptr :: (load (s32), addrspace 1)
-
-  %shl_1:_(s32) = G_SHL %one, %shift_amt
-  %copy_shl_1:_(s32) = COPY %shl_1
-
-  %shl_2:_(s32) = G_SHL %two, %shift_amt
-  %copy_shl_2:_(s32) = COPY %shl_2
-
-  %not_sign_mask:_(s32) = G_LOAD %ptr :: (load (s32), addrspace 1)
-  %sign_mask:_(s32) = G_CONSTANT i32 -2147483648
-
-  %lshr_not_sign_mask:_(s32) = G_LSHR %not_sign_mask, %shift_amt
-  %copy_lshr_not_sign_mask:_(s32) = COPY %lshr_not_sign_mask
-
-  %lshr_sign_mask:_(s32) = G_LSHR %sign_mask, %shift_amt
-  %copy_lshr_sign_mask:_(s32) = COPY %lshr_sign_mask
-
-  %or_pow2:_(s32) = G_OR %zero, %two
-  %copy_or_pow2:_(s32) = COPY %or_pow2
-
-)MIR";
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  GISelKnownBits KB(*MF);
-
-  Register CopyZero = Copies[Copies.size() - 12];
-  Register CopyOne = Copies[Copies.size() - 11];
-  Register CopyTwo = Copies[Copies.size() - 10];
-  Register CopyThree = Copies[Copies.size() - 9];
-  Register CopyTruncTwo = Copies[Copies.size() - 8];
-  Register CopyTruncThree = Copies[Copies.size() - 7];
-  Register CopyTruncFive = Copies[Copies.size() - 6];
-
-  Register CopyShl1 = Copies[Copies.size() - 5];
-  Register CopyShl2 = Copies[Copies.size() - 4];
-
-  Register CopyLShrNotSignMask = Copies[Copies.size() - 3];
-  Register CopyLShrSignMask = Copies[Copies.size() - 2];
-  Register CopyOrPow2 = Copies[Copies.size() - 1];
-
-  EXPECT_FALSE(isKnownToBeAPowerOfTwo(CopyZero, *MRI, &KB));
-  EXPECT_TRUE(isKnownToBeAPowerOfTwo(CopyOne, *MRI, &KB));
-  EXPECT_TRUE(isKnownToBeAPowerOfTwo(CopyTwo, *MRI, &KB));
-  EXPECT_FALSE(isKnownToBeAPowerOfTwo(CopyThree, *MRI, &KB));
-
-  EXPECT_FALSE(isKnownToBeAPowerOfTwo(CopyTruncTwo, *MRI, &KB));
-  EXPECT_TRUE(isKnownToBeAPowerOfTwo(CopyTruncThree, *MRI, &KB));
-  EXPECT_TRUE(isKnownToBeAPowerOfTwo(CopyTruncFive, *MRI, &KB));
-
-  EXPECT_TRUE(isKnownToBeAPowerOfTwo(CopyShl1, *MRI, &KB));
-  EXPECT_FALSE(isKnownToBeAPowerOfTwo(CopyShl2, *MRI, &KB));
-
-  EXPECT_FALSE(isKnownToBeAPowerOfTwo(CopyLShrNotSignMask, *MRI, &KB));
-  EXPECT_TRUE(isKnownToBeAPowerOfTwo(CopyLShrSignMask, *MRI, &KB));
-  EXPECT_TRUE(isKnownToBeAPowerOfTwo(CopyOrPow2, *MRI, &KB));
-}
-
-TEST_F(AArch64GISelMITest, TestMetadata) {
-  StringRef MIRString = "  %imp:_(p0) = G_IMPLICIT_DEF\n"
-                        "  %load:_(s8) = G_LOAD %imp(p0) :: (load (s8))\n"
-                        "  %ext:_(s32) = G_ZEXT %load(s8)\n"
-                        "  %cst:_(s32) = G_CONSTANT i32 1\n"
-                        "  %and:_(s32) = G_AND %ext, %cst\n"
-                        "  %copy:_(s32) = COPY %and(s32)\n";
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  Register SrcReg = FinalCopy->getOperand(1).getReg();
-
-  // We need a load with a metadata range for this to break. Fudge the load in
-  // the string and replace it with something we can work with.
-  MachineInstr *And = MRI->getVRegDef(SrcReg);
-  MachineInstr *Ext = MRI->getVRegDef(And->getOperand(1).getReg());
-  MachineInstr *Load = MRI->getVRegDef(Ext->getOperand(1).getReg());
-  IntegerType *Int8Ty = Type::getInt8Ty(Context);
-
-  // Value must be in [0, 2)
-  Metadata *LowAndHigh[] = {
-      ConstantAsMetadata::get(ConstantInt::get(Int8Ty, 0)),
-      ConstantAsMetadata::get(ConstantInt::get(Int8Ty, 2))};
-  auto NewMDNode = MDNode::get(Context, LowAndHigh);
-  const MachineMemOperand *OldMMO = *Load->memoperands_begin();
-  MachineMemOperand NewMMO(OldMMO->getPointerInfo(), OldMMO->getFlags(),
-                           OldMMO->getSizeInBits(), OldMMO->getAlign(),
-                           OldMMO->getAAInfo(), NewMDNode);
-  MachineIRBuilder MIB(*Load);
-  MIB.buildLoad(Load->getOperand(0), Load->getOperand(1), NewMMO);
-  Load->eraseFromParent();
-
-  GISelKnownBits Info(*MF);
-  KnownBits Res = Info.getKnownBits(And->getOperand(1).getReg());
-
-  // We don't know what the result of the load is, so we don't know any ones.
-  EXPECT_TRUE(Res.One.isNullValue());
-
-  // We know that the value is in [0, 2). So, we don't know if the first bit
-  // is 0 or not. However, we do know that every other bit must be 0.
-  APInt Mask(Res.getBitWidth(), 1);
-  Mask.flipAllBits();
-  EXPECT_EQ(Mask.getZExtValue(), Res.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsExt) {
-  StringRef MIRString = "  %c1:_(s16) = G_CONSTANT i16 1\n"
-                        "  %x:_(s16) = G_IMPLICIT_DEF\n"
-                        "  %y:_(s16) = G_AND %x, %c1\n"
-                        "  %anyext:_(s32) = G_ANYEXT %y(s16)\n"
-                        "  %r1:_(s32) = COPY %anyext\n"
-                        "  %zext:_(s32) = G_ZEXT %y(s16)\n"
-                        "  %r2:_(s32) = COPY %zext\n"
-                        "  %sext:_(s32) = G_SEXT %y(s16)\n"
-                        "  %r3:_(s32) = COPY %sext\n";
-  setUp(MIRString);
-  if (!TM)
-    return;
-  Register CopyRegAny = Copies[Copies.size() - 3];
-  Register CopyRegZ = Copies[Copies.size() - 2];
-  Register CopyRegS = Copies[Copies.size() - 1];
-
-  GISelKnownBits Info(*MF);
-  MachineInstr *Copy;
-  Register SrcReg;
-  KnownBits Res;
-
-  Copy = MRI->getVRegDef(CopyRegAny);
-  SrcReg = Copy->getOperand(1).getReg();
-  Res = Info.getKnownBits(SrcReg);
-  EXPECT_EQ((uint64_t)32, Res.getBitWidth());
-  EXPECT_EQ((uint64_t)0, Res.One.getZExtValue());
-  EXPECT_EQ((uint64_t)0x0000fffe, Res.Zero.getZExtValue());
-
-  Copy = MRI->getVRegDef(CopyRegZ);
-  SrcReg = Copy->getOperand(1).getReg();
-  Res = Info.getKnownBits(SrcReg);
-  EXPECT_EQ((uint64_t)32, Res.getBitWidth());
-  EXPECT_EQ((uint64_t)0, Res.One.getZExtValue());
-  EXPECT_EQ((uint64_t)0xfffffffe, Res.Zero.getZExtValue());
-
-  Copy = MRI->getVRegDef(CopyRegS);
-  SrcReg = Copy->getOperand(1).getReg();
-  Res = Info.getKnownBits(SrcReg);
-  EXPECT_EQ((uint64_t)32, Res.getBitWidth());
-  EXPECT_EQ((uint64_t)0, Res.One.getZExtValue());
-  EXPECT_EQ((uint64_t)0xfffffffe, Res.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsSextInReg) {
-  StringRef MIRString = R"(
-   ; 000...0001
-   %one:_(s32) = G_CONSTANT i32 1
-
-   ; 000...0010
-   %two:_(s32) = G_CONSTANT i32 2
-
-   ; 000...1010
-   %ten:_(s32) = G_CONSTANT i32 10
-
-   ; ???...????
-   %w0:_(s32) = COPY $w0
-
-   ; ???...?1?
-   %or:_(s32) = G_OR %w0, %two
-
-   ; All bits are known.
-   %inreg1:_(s32) = G_SEXT_INREG %one, 1
-   %copy_inreg1:_(s32) = COPY %inreg1
-
-   ; All bits unknown
-   %inreg2:_(s32) = G_SEXT_INREG %or, 1
-   %copy_inreg2:_(s32) = COPY %inreg2
-
-   ; Extending from the only (known) set bit
-   ; 111...11?
-   %inreg3:_(s32) = G_SEXT_INREG %or, 2
-   %copy_inreg3:_(s32) = COPY %inreg3
-
-   ; Extending from a known set bit, overwriting all of the high set bits.
-   ; 111...1110
-   %inreg4:_(s32) = G_SEXT_INREG %ten, 2
-   %copy_inreg4:_(s32) = COPY %inreg4
-
-)";
-  setUp(MIRString);
-  if (!TM)
-    return;
-  GISelKnownBits Info(*MF);
-  KnownBits Res;
-  auto GetKB = [&](unsigned Idx) {
-    Register CopyReg = Copies[Idx];
-    auto *Copy = MRI->getVRegDef(CopyReg);
-    return Info.getKnownBits(Copy->getOperand(1).getReg());
-  };
-
-  // Every bit is known to be a 1.
-  Res = GetKB(Copies.size() - 4);
-  EXPECT_EQ(32u, Res.getBitWidth());
-  EXPECT_TRUE(Res.isAllOnes());
-
-  // All bits are unknown
-  Res = GetKB(Copies.size() - 3);
-  EXPECT_EQ(32u, Res.getBitWidth());
-  EXPECT_TRUE(Res.isUnknown());
-
-  // Extending from the only known set bit
-  // 111...11?
-  Res = GetKB(Copies.size() - 2);
-  EXPECT_EQ(32u, Res.getBitWidth());
-  EXPECT_EQ(0xFFFFFFFEu, Res.One.getZExtValue());
-  EXPECT_EQ(0u, Res.Zero.getZExtValue());
-
-  // Extending from a known set bit, overwriting all of the high set bits.
-  // 111...1110
-  Res = GetKB(Copies.size() - 1);
-  EXPECT_EQ(32u, Res.getBitWidth());
-  EXPECT_EQ(0xFFFFFFFEu, Res.One.getZExtValue());
-  EXPECT_EQ(1u, Res.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsAssertSext) {
-  StringRef MIRString = R"(
-   ; 000...0001
-   %one:_(s32) = G_CONSTANT i32 1
-
-   ; 000...0010
-   %two:_(s32) = G_CONSTANT i32 2
-
-   ; 000...1010
-   %ten:_(s32) = G_CONSTANT i32 10
-
-   ; ???...????
-   %w0:_(s32) = COPY $w0
-
-   ; ???...?1?
-   %or:_(s32) = G_OR %w0, %two
-
-   ; All bits are known.
-   %assert_sext1:_(s32) = G_ASSERT_SEXT %one, 1
-   %copy_assert_sext1:_(s32) = COPY %assert_sext1
-
-   ; All bits unknown
-   %assert_sext2:_(s32) = G_ASSERT_SEXT %or, 1
-   %copy_assert_sext2:_(s32) = COPY %assert_sext2
-
-   ; Extending from the only (known) set bit
-   ; 111...11?
-   %assert_sext3:_(s32) = G_ASSERT_SEXT %or, 2
-   %copy_assert_sext3:_(s32) = COPY %assert_sext3
-
-   ; Extending from a known set bit, overwriting all of the high set bits.
-   ; 111...1110
-   %assert_sext4:_(s32) = G_ASSERT_SEXT %ten, 2
-   %copy_assert_sext4:_(s32) = COPY %assert_sext4
-)";
-  setUp(MIRString);
-  if (!TM)
-    return;
-  GISelKnownBits Info(*MF);
-  KnownBits Res;
-  auto GetKB = [&](unsigned Idx) {
-    Register CopyReg = Copies[Idx];
-    auto *Copy = MRI->getVRegDef(CopyReg);
-    return Info.getKnownBits(Copy->getOperand(1).getReg());
-  };
-
-  // Every bit is known to be a 1.
-  Res = GetKB(Copies.size() - 4);
-  EXPECT_EQ(32u, Res.getBitWidth());
-  EXPECT_TRUE(Res.isAllOnes());
-
-  // All bits are unknown
-  Res = GetKB(Copies.size() - 3);
-  EXPECT_EQ(32u, Res.getBitWidth());
-  EXPECT_TRUE(Res.isUnknown());
-
-  // Extending from the only known set bit
-  // 111...11?
-  Res = GetKB(Copies.size() - 2);
-  EXPECT_EQ(32u, Res.getBitWidth());
-  EXPECT_EQ(0xFFFFFFFEu, Res.One.getZExtValue());
-  EXPECT_EQ(0u, Res.Zero.getZExtValue());
-
-  // Extending from a known set bit, overwriting all of the high set bits.
-  // 111...1110
-  Res = GetKB(Copies.size() - 1);
-  EXPECT_EQ(32u, Res.getBitWidth());
-  EXPECT_EQ(0xFFFFFFFEu, Res.One.getZExtValue());
-  EXPECT_EQ(1u, Res.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsMergeValues) {
-  StringRef MIRString = R"(
-   %val0:_(s16) = G_CONSTANT i16 35224
-   %val1:_(s16) = G_CONSTANT i16 17494
-   %val2:_(s16) = G_CONSTANT i16 4659
-   %val3:_(s16) = G_CONSTANT i16 43981
-   %merge:_(s64) = G_MERGE_VALUES %val0, %val1, %val2, %val3
-   %mergecopy:_(s64) = COPY %merge
-)";
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  const uint64_t TestVal = UINT64_C(0xabcd123344568998);
-  Register CopyMerge = Copies[Copies.size() - 1];
-
-  GISelKnownBits Info(*MF);
-  KnownBits Res = Info.getKnownBits(CopyMerge);
-  EXPECT_EQ(64u, Res.getBitWidth());
-  EXPECT_EQ(TestVal, Res.One.getZExtValue());
-  EXPECT_EQ(~TestVal, Res.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsUnmergeValues) {
-  StringRef MIRString = R"(
-   %val:_(s64) = G_CONSTANT i64 12379570962110515608
-   %val0:_(s16), %val1:_(s16), %val2:_(s16), %val3:_(s16) = G_UNMERGE_VALUES %val
-   %part0:_(s16) = COPY %val0
-   %part1:_(s16) = COPY %val1
-   %part2:_(s16) = COPY %val2
-   %part3:_(s16) = COPY %val3
-
-)";
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  const uint64_t TestVal = UINT64_C(0xabcd123344568998);
-  GISelKnownBits Info(*MF);
-
-  int Offset = -4;
-  for (unsigned BitOffset = 0; BitOffset != 64; BitOffset += 16, ++Offset) {
-    Register Part = Copies[Copies.size() + Offset];
-    KnownBits PartKnown = Info.getKnownBits(Part);
-    EXPECT_EQ(16u, PartKnown.getBitWidth());
-
-    uint16_t PartTestVal = static_cast<uint16_t>(TestVal >> BitOffset);
-    EXPECT_EQ(PartTestVal, PartKnown.One.getZExtValue());
-    EXPECT_EQ(static_cast<uint16_t>(~PartTestVal), PartKnown.Zero.getZExtValue());
-  }
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsBSwapBitReverse) {
-  StringRef MIRString = R"(
-   %const:_(s32) = G_CONSTANT i32 287454020
-   %bswap:_(s32) = G_BSWAP %const
-   %bitreverse:_(s32) = G_BITREVERSE %const
-   %copy_bswap:_(s32) = COPY %bswap
-   %copy_bitreverse:_(s32) = COPY %bitreverse
-)";
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  const uint32_t ByteSwappedVal = 0x44332211;
-  const uint32_t BitSwappedVal = 0x22cc4488;
-
-  Register CopyBSwap = Copies[Copies.size() - 2];
-  Register CopyBitReverse = Copies[Copies.size() - 1];
-
-  GISelKnownBits Info(*MF);
-
-  KnownBits BSwapKnown = Info.getKnownBits(CopyBSwap);
-  EXPECT_EQ(32u, BSwapKnown.getBitWidth());
-  EXPECT_EQ(ByteSwappedVal, BSwapKnown.One.getZExtValue());
-  EXPECT_EQ(~ByteSwappedVal, BSwapKnown.Zero.getZExtValue());
-
-  KnownBits BitReverseKnown = Info.getKnownBits(CopyBitReverse);
-  EXPECT_EQ(32u, BitReverseKnown.getBitWidth());
-  EXPECT_EQ(BitSwappedVal, BitReverseKnown.One.getZExtValue());
-  EXPECT_EQ(~BitSwappedVal, BitReverseKnown.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsUMAX) {
-  StringRef MIRString = R"(
-   %ptr:_(p0) = G_IMPLICIT_DEF
-   %unknown:_(s8) = G_LOAD %ptr(p0) :: (load (s8))
-   %mask0:_(s8) = G_CONSTANT i8 10
-   %mask1:_(s8) = G_CONSTANT i8 1
-   %tmp0:_(s8) = G_AND %unknown, %mask0
-   %val0:_(s8) = G_OR %tmp0, %mask1
-   %mask2:_(s8) = G_CONSTANT i8 3
-   %mask3:_(s8) = G_CONSTANT i8 12
-   %tmp1:_(s8) = G_AND %unknown, %mask2
-   %val1:_(s8) = G_OR %tmp1, %mask3
-   %umax0:_(s8) = G_UMAX %val0, %val1
-   %copy_umax0:_(s8) = COPY %umax0
-
-   %mask4:_(s8) = G_CONSTANT i8 14
-   %mask5:_(s8) = G_CONSTANT i8 2
-   %tmp3:_(s8) = G_AND %unknown, %mask4
-   %val3:_(s8) = G_OR %tmp3, %mask5
-   %mask6:_(s8) = G_CONSTANT i8 4
-   %mask7:_(s8) = G_CONSTANT i8 11
-   %tmp4:_(s8) = G_AND %unknown, %mask6
-   %val4:_(s8) = G_OR %tmp4, %mask7
-   %umax1:_(s8) = G_UMAX %val3, %val4
-   %copy_umax1:_(s8) = COPY %umax1
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg0 = Copies[Copies.size() - 2];
-  MachineInstr *FinalCopy0 = MRI->getVRegDef(CopyReg0);
-  Register SrcReg0 = FinalCopy0->getOperand(1).getReg();
-  GISelKnownBits Info(*MF);
-  // Compares min/max of LHS and RHS, min uses 0 for unknown bits, max uses 1.
-  // If min(LHS) >= max(RHS) returns KnownBits for LHS, similar for RHS. If this
-  // fails tries to calculate individual bits: common bits for both operands and
-  // a few leading bits in some cases.
-  //      0000?0?1
-  // umax 000011??
-  //    = 000011??
-  KnownBits Res0 = Info.getKnownBits(SrcReg0);
-  EXPECT_EQ(0x0Cu, Res0.One.getZExtValue());
-  EXPECT_EQ(0xF0u, Res0.Zero.getZExtValue());
-
-  Register CopyReg1 = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy1 = MRI->getVRegDef(CopyReg1);
-  Register SrcReg1 = FinalCopy1->getOperand(1).getReg();
-  KnownBits Res1 = Info.getKnownBits(SrcReg1);
-  //      0000??10
-  // umax 00001?11
-  //    = 00001?1?
-  EXPECT_EQ(0x0Au, Res1.One.getZExtValue());
-  EXPECT_EQ(0xF0u, Res1.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsUMax) {
-  StringRef MIRString = R"(
-   %val:_(s32) = COPY $w0
-   %zext:_(s64) = G_ZEXT %val
-   %const:_(s64) = G_CONSTANT i64 -256
-   %umax:_(s64) = G_UMAX %zext, %const
-   %copy_umax:_(s64) = COPY %umax
-)";
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyUMax = Copies[Copies.size() - 1];
-  GISelKnownBits Info(*MF);
-
-  KnownBits KnownUmax = Info.getKnownBits(CopyUMax);
-  EXPECT_EQ(64u, KnownUmax.getBitWidth());
-  EXPECT_EQ(0xffu, KnownUmax.Zero.getZExtValue());
-  EXPECT_EQ(0xffffffffffffff00, KnownUmax.One.getZExtValue());
-
-  EXPECT_EQ(0xffu, KnownUmax.Zero.getZExtValue());
-  EXPECT_EQ(0xffffffffffffff00, KnownUmax.One.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsUMIN) {
-  StringRef MIRString = R"(
-   %ptr:_(p0) = G_IMPLICIT_DEF
-   %unknown:_(s8) = G_LOAD %ptr(p0) :: (load (s8))
-   %mask0:_(s8) = G_CONSTANT i8 10
-   %mask1:_(s8) = G_CONSTANT i8 1
-   %tmp0:_(s8) = G_AND %unknown, %mask0
-   %val0:_(s8) = G_OR %tmp0, %mask1
-   %mask2:_(s8) = G_CONSTANT i8 3
-   %mask3:_(s8) = G_CONSTANT i8 12
-   %tmp1:_(s8) = G_AND %unknown, %mask2
-   %val1:_(s8) = G_OR %tmp1, %mask3
-   %umin:_(s8) = G_UMIN %val0, %val1
-   %copy_umin:_(s8) = COPY %umin
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg0 = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy0 = MRI->getVRegDef(CopyReg0);
-  Register SrcReg0 = FinalCopy0->getOperand(1).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res0 = Info.getKnownBits(SrcReg0);
-  // Flips the range of operands: [0, 0xFFFFFFFF] <-> [0xFFFFFFFF, 0],
-  // uses umax and flips result back.
-  //      0000?0?1
-  // umin 000011??
-  //    = 0000?0?1
-  EXPECT_EQ(0x01u, Res0.One.getZExtValue());
-  EXPECT_EQ(0xF4u, Res0.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsSMAX) {
-  StringRef MIRString = R"(
-   %ptr:_(p0) = G_IMPLICIT_DEF
-   %unknown:_(s8) = G_LOAD %ptr(p0) :: (load (s8))
-   %mask0:_(s8) = G_CONSTANT i8 128
-   %mask1:_(s8) = G_CONSTANT i8 64
-   %tmp0:_(s8) = G_AND %unknown, %mask0
-   %val0:_(s8) = G_OR %tmp0, %mask1
-   %mask2:_(s8) = G_CONSTANT i8 1
-   %mask3:_(s8) = G_CONSTANT i8 128
-   %tmp1:_(s8) = G_AND %unknown, %mask2
-   %val1:_(s8) = G_OR %tmp1, %mask3
-   %smax:_(s8) = G_SMAX %val0, %val1
-   %copy_smax:_(s8) = COPY %smax
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg0 = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy0 = MRI->getVRegDef(CopyReg0);
-  Register SrcReg0 = FinalCopy0->getOperand(1).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res0 = Info.getKnownBits(SrcReg0);
-  // Flips the range of operands: [-0x80000000, 0x7FFFFFFF] <-> [0, 0xFFFFFFFF],
-  // uses umax and flips result back.
-  // RHS is negative, LHS is either positive or negative with smaller abs value.
-  //      ?1000000
-  // smax 1000000?
-  //    = ?1000000
-  EXPECT_EQ(0x40u, Res0.One.getZExtValue());
-  EXPECT_EQ(0x3Fu, Res0.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsSMIN) {
-  StringRef MIRString = R"(
-   %ptr:_(p0) = G_IMPLICIT_DEF
-   %unknown:_(s8) = G_LOAD %ptr(p0) :: (load (s8))
-   %mask0:_(s8) = G_CONSTANT i8 128
-   %mask1:_(s8) = G_CONSTANT i8 64
-   %tmp0:_(s8) = G_AND %unknown, %mask0
-   %val0:_(s8) = G_OR %tmp0, %mask1
-   %mask2:_(s8) = G_CONSTANT i8 1
-   %mask3:_(s8) = G_CONSTANT i8 128
-   %tmp1:_(s8) = G_AND %unknown, %mask2
-   %val1:_(s8) = G_OR %tmp1, %mask3
-   %smin:_(s8) = G_SMIN %val0, %val1
-   %copy_smin:_(s8) = COPY %smin
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg0 = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy0 = MRI->getVRegDef(CopyReg0);
-  Register SrcReg0 = FinalCopy0->getOperand(1).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res0 = Info.getKnownBits(SrcReg0);
-  // Flips the range of operands: [-0x80000000, 0x7FFFFFFF] <-> [0xFFFFFFFF, 0],
-  // uses umax and flips result back.
-  // RHS is negative, LHS is either positive or negative with smaller abs value.
-  //      ?1000000
-  // smin 1000000?
-  //    = 1000000?
-  EXPECT_EQ(0x80u, Res0.One.getZExtValue());
-  EXPECT_EQ(0x7Eu, Res0.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestInvalidQueries) {
-  StringRef MIRString = R"(
-   %src:_(s32) = COPY $w0
-   %thirty2:_(s32) = G_CONSTANT i32 32
-   %equalSized:_(s32) = G_SHL %src, %thirty2
-   %copy1:_(s32) = COPY %equalSized
-   %thirty3:_(s32) = G_CONSTANT i32 33
-   %biggerSized:_(s32) = G_SHL %src, %thirty3
-   %copy2:_(s32) = COPY %biggerSized
-)";
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register EqSizedCopyReg = Copies[Copies.size() - 2];
-  MachineInstr *EqSizedCopy = MRI->getVRegDef(EqSizedCopyReg);
-  Register EqSizedShl = EqSizedCopy->getOperand(1).getReg();
-
-  Register BiggerSizedCopyReg = Copies[Copies.size() - 1];
-  MachineInstr *BiggerSizedCopy = MRI->getVRegDef(BiggerSizedCopyReg);
-  Register BiggerSizedShl = BiggerSizedCopy->getOperand(1).getReg();
-
-  GISelKnownBits Info(*MF);
-  KnownBits EqSizeRes = Info.getKnownBits(EqSizedShl);
-  KnownBits BiggerSizeRes = Info.getKnownBits(BiggerSizedShl);
-
-
-  // We don't know what the result of the shift is, but we should not crash
-  EXPECT_TRUE(EqSizeRes.One.isNullValue());
-  EXPECT_TRUE(EqSizeRes.Zero.isNullValue());
-
-  EXPECT_TRUE(BiggerSizeRes.One.isNullValue());
-  EXPECT_TRUE(BiggerSizeRes.Zero.isNullValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsAssertZext) {
-  StringRef MIRString = R"(
-   %copy:_(s64) = COPY $x0
-
-   %assert8:_(s64) = G_ASSERT_ZEXT %copy, 8
-   %copy_assert8:_(s64) = COPY %assert8
-
-   %assert1:_(s64) = G_ASSERT_ZEXT %copy, 1
-   %copy_assert1:_(s64) = COPY %assert1
-
-   %assert63:_(s64) = G_ASSERT_ZEXT %copy, 63
-   %copy_assert63:_(s64) = COPY %assert63
-
-   %assert3:_(s64) = G_ASSERT_ZEXT %copy, 3
-   %copy_assert3:_(s64) = COPY %assert3
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyAssert8 = Copies[Copies.size() - 4];
-  Register CopyAssert1 = Copies[Copies.size() - 3];
-  Register CopyAssert63 = Copies[Copies.size() - 2];
-  Register CopyAssert3 = Copies[Copies.size() - 1];
-
-  GISelKnownBits Info(*MF);
-  MachineInstr *Copy;
-  Register SrcReg;
-  KnownBits Res;
-
-  // Assert zero-extension from an 8-bit value.
-  Copy = MRI->getVRegDef(CopyAssert8);
-  SrcReg = Copy->getOperand(1).getReg();
-  Res = Info.getKnownBits(SrcReg);
-  EXPECT_EQ(64u, Res.getBitWidth());
-  EXPECT_EQ(0u, Res.One.getZExtValue());
-  EXPECT_EQ(0xFFFFFFFFFFFFFF00u, Res.Zero.getZExtValue());
-
-  // Assert zero-extension from a 1-bit value.
-  Copy = MRI->getVRegDef(CopyAssert1);
-  SrcReg = Copy->getOperand(1).getReg();
-  Res = Info.getKnownBits(SrcReg);
-  EXPECT_EQ(64u, Res.getBitWidth());
-  EXPECT_EQ(0u, Res.One.getZExtValue());
-  EXPECT_EQ(0xFFFFFFFFFFFFFFFE, Res.Zero.getZExtValue());
-
-  // Assert zero-extension from a 63-bit value.
-  Copy = MRI->getVRegDef(CopyAssert63);
-  SrcReg = Copy->getOperand(1).getReg();
-  Res = Info.getKnownBits(SrcReg);
-  EXPECT_EQ(64u, Res.getBitWidth());
-  EXPECT_EQ(0u, Res.One.getZExtValue());
-  EXPECT_EQ(0x8000000000000000u, Res.Zero.getZExtValue());
-
-  // Assert zero-extension from a 3-bit value.
-  Copy = MRI->getVRegDef(CopyAssert3);
-  SrcReg = Copy->getOperand(1).getReg();
-  Res = Info.getKnownBits(SrcReg);
-  EXPECT_EQ(64u, Res.getBitWidth());
-  EXPECT_EQ(0u, Res.One.getZExtValue());
-  EXPECT_EQ(0xFFFFFFFFFFFFFFF8u, Res.Zero.getZExtValue());
-}
-
-TEST_F(AMDGPUGISelMITest, TestKnownBitsUBFX) {
-  StringRef MIRString = "  %3:_(s32) = G_IMPLICIT_DEF\n"
-                        "  %4:_(s32) = G_CONSTANT i32 12\n"
-                        "  %5:_(s32) = G_CONSTANT i32 8\n"
-                        "  %6:_(s32) = G_UBFX %3, %4(s32), %5\n"
-                        "  %ubfx_copy:_(s32) = COPY %6\n"
-                        "  %7:_(s32) = G_CONSTANT i32 28672\n"
-                        "  %8:_(s32) = G_UBFX %7, %4(s32), %5\n"
-                        "  %ubfx_copy_val:_(s32) = COPY %8\n"
-                        "  %9:_(s32) = G_IMPLICIT_DEF\n"
-                        "  %10:_(s32) = G_IMPLICIT_DEF\n"
-                        "  %11:_(s32) = G_UBFX %3, %9(s32), %10\n"
-                        "  %ubfx_copy_unk:_(s32) = COPY %11\n"
-                        "  %12:_(s32) = G_UBFX %3, %9(s32), %5\n"
-                        "  %ubfx_copy_unk_off:_(s32) = COPY %12\n"
-                        "  %13:_(s32) = G_UBFX %3, %4(s32), %10\n"
-                        "  %ubfx_copy_unk_width:_(s32) = COPY %13\n";
-  setUp(MIRString);
-  if (!TM)
-    return;
-  Register CopyBfxReg = Copies[Copies.size() - 5];
-  Register CopyValBfxReg = Copies[Copies.size() - 4];
-  Register CopyUnkBfxReg = Copies[Copies.size() - 3];
-  Register CopyUnkOffBfxReg = Copies[Copies.size() - 2];
-  Register CopyUnkWidthBfxReg = Copies[Copies.size() - 1];
-
-  MachineInstr *CopyBfx = MRI->getVRegDef(CopyBfxReg);
-  Register SrcReg = CopyBfx->getOperand(1).getReg();
-  MachineInstr *CopyValBfx = MRI->getVRegDef(CopyValBfxReg);
-  Register ValSrcReg = CopyValBfx->getOperand(1).getReg();
-  MachineInstr *CopyUnkBfx = MRI->getVRegDef(CopyUnkBfxReg);
-  Register UnkSrcReg = CopyUnkBfx->getOperand(1).getReg();
-  MachineInstr *CopyUnkOffBfx = MRI->getVRegDef(CopyUnkOffBfxReg);
-  Register UnkOffSrcReg = CopyUnkOffBfx->getOperand(1).getReg();
-  MachineInstr *CopyUnkWidthBfx = MRI->getVRegDef(CopyUnkWidthBfxReg);
-  Register UnkWidthSrcReg = CopyUnkWidthBfx->getOperand(1).getReg();
-
-  GISelKnownBits Info(*MF);
-
-  KnownBits Res1 = Info.getKnownBits(SrcReg);
-  EXPECT_EQ(0u, Res1.One.getZExtValue());
-  EXPECT_EQ(0xffffff00u, Res1.Zero.getZExtValue());
-
-  KnownBits Res2 = Info.getKnownBits(ValSrcReg);
-  EXPECT_EQ(7u, Res2.One.getZExtValue());
-  EXPECT_EQ(0xfffffff8u, Res2.Zero.getZExtValue());
-
-  KnownBits Res3 = Info.getKnownBits(UnkSrcReg);
-  EXPECT_EQ(0u, Res3.One.getZExtValue());
-  EXPECT_EQ(0u, Res3.Zero.getZExtValue());
-
-  KnownBits Res4 = Info.getKnownBits(UnkOffSrcReg);
-  EXPECT_EQ(0u, Res4.One.getZExtValue());
-  EXPECT_EQ(0xffffff00u, Res4.Zero.getZExtValue());
-
-  KnownBits Res5 = Info.getKnownBits(UnkWidthSrcReg);
-  EXPECT_EQ(0u, Res5.One.getZExtValue());
-  EXPECT_EQ(0xfff00000u, Res5.Zero.getZExtValue());
-}
-
-TEST_F(AMDGPUGISelMITest, TestKnownBitsSBFX) {
-  StringRef MIRString = "  %3:_(s32) = G_IMPLICIT_DEF\n"
-                        "  %4:_(s32) = G_CONSTANT i32 8\n"
-                        "  %5:_(s32) = G_CONSTANT i32 4\n"
-                        "  %6:_(s32) = G_SBFX %3, %4(s32), %5\n"
-                        "  %sbfx_copy:_(s32) = COPY %6\n"
-                        "  %7:_(s32) = G_CONSTANT i32 2047\n"
-                        "  %8:_(s32) = G_SBFX %7, %4(s32), %5\n"
-                        "  %sbfx_copy_val:_(s32) = COPY %8\n"
-                        "  %9:_(s32) = G_CONSTANT i32 2048\n"
-                        "  %10:_(s32) = G_SBFX %9, %4(s32), %5\n"
-                        "  %sbfx_copy_neg_val:_(s32) = COPY %10\n"
-                        "  %11:_(s32) = G_IMPLICIT_DEF\n"
-                        "  %12:_(s32) = G_SBFX %7, %11(s32), %5\n"
-                        "  %sbfx_copy_unk_off:_(s32) = COPY %12\n"
-                        "  %13:_(s32) = G_SBFX %9, %4(s32), %11\n"
-                        "  %sbfx_copy_unk_width:_(s32) = COPY %13\n";
-  setUp(MIRString);
-  if (!TM)
-    return;
-  Register CopyBfxReg = Copies[Copies.size() - 5];
-  Register CopyValBfxReg = Copies[Copies.size() - 4];
-  Register CopyNegValBfxReg = Copies[Copies.size() - 3];
-  Register CopyUnkOffBfxReg = Copies[Copies.size() - 2];
-  Register CopyUnkWidthBfxReg = Copies[Copies.size() - 1];
-
-  MachineInstr *CopyBfx = MRI->getVRegDef(CopyBfxReg);
-  Register SrcReg = CopyBfx->getOperand(1).getReg();
-  MachineInstr *CopyValBfx = MRI->getVRegDef(CopyValBfxReg);
-  Register ValSrcReg = CopyValBfx->getOperand(1).getReg();
-  MachineInstr *CopyNegValBfx = MRI->getVRegDef(CopyNegValBfxReg);
-  Register NegValSrcReg = CopyNegValBfx->getOperand(1).getReg();
-  MachineInstr *CopyUnkOffBfx = MRI->getVRegDef(CopyUnkOffBfxReg);
-  Register UnkOffSrcReg = CopyUnkOffBfx->getOperand(1).getReg();
-  MachineInstr *CopyUnkWidthBfx = MRI->getVRegDef(CopyUnkWidthBfxReg);
-  Register UnkWidthSrcReg = CopyUnkWidthBfx->getOperand(1).getReg();
-
-  GISelKnownBits Info(*MF);
-
-  KnownBits Res1 = Info.getKnownBits(SrcReg);
-  EXPECT_EQ(0u, Res1.One.getZExtValue());
-  EXPECT_EQ(0u, Res1.Zero.getZExtValue());
-
-  KnownBits Res2 = Info.getKnownBits(ValSrcReg);
-  EXPECT_EQ(7u, Res2.One.getZExtValue());
-  EXPECT_EQ(0xfffffff8u, Res2.Zero.getZExtValue());
-
-  KnownBits Res3 = Info.getKnownBits(NegValSrcReg);
-  EXPECT_EQ(0xfffffff8u, Res3.One.getZExtValue());
-  EXPECT_EQ(7u, Res3.Zero.getZExtValue());
-
-  KnownBits Res4 = Info.getKnownBits(UnkOffSrcReg);
-  EXPECT_EQ(0u, Res4.One.getZExtValue());
-  EXPECT_EQ(0u, Res4.Zero.getZExtValue());
-
-  KnownBits Res5 = Info.getKnownBits(UnkWidthSrcReg);
-  EXPECT_EQ(0u, Res5.One.getZExtValue());
-  EXPECT_EQ(0u, Res5.Zero.getZExtValue());
-}
-
-TEST_F(AMDGPUGISelMITest, TestNumSignBitsUBFX) {
-  StringRef MIRString = "  %3:_(s32) = G_IMPLICIT_DEF\n"
-                        "  %4:_(s32) = G_CONSTANT i32 12\n"
-                        "  %5:_(s32) = G_CONSTANT i32 8\n"
-                        "  %6:_(s32) = G_UBFX %3, %4(s32), %5\n"
-                        "  %ubfx_copy_unk:_(s32) = COPY %6\n"
-                        "  %7:_(s32) = G_CONSTANT i32 28672\n"
-                        "  %8:_(s32) = G_UBFX %7, %4(s32), %5\n"
-                        "  %ubfx_copy_pos:_(s32) = COPY %8\n"
-                        "  %9:_(s32) = G_CONSTANT i32 -1\n"
-                        "  %10:_(s32) = G_UBFX %9, %4(s32), %5\n"
-                        "  %ubfx_copy_neg:_(s32) = COPY %10\n"
-                        "  %11:_(s32) = G_IMPLICIT_DEF\n"
-                        "  %12:_(s32) = G_UBFX %7, %11(s32), %5\n"
-                        "  %ubfx_copy_unk_off:_(s32) = COPY %12\n"
-                        "  %13:_(s32) = G_UBFX %7, %4(s32), %11\n"
-                        "  %ubfx_copy_unk_width:_(s32) = COPY %13\n";
-  setUp(MIRString);
-  if (!TM)
-    return;
-  Register CopyUnkBfxReg = Copies[Copies.size() - 5];
-  Register CopyPosBfxReg = Copies[Copies.size() - 4];
-  Register CopyNegBfxReg = Copies[Copies.size() - 3];
-  Register CopyUnkOffBfxReg = Copies[Copies.size() - 2];
-  Register CopyUnkWidthBfxReg = Copies[Copies.size() - 1];
-
-  GISelKnownBits Info(*MF);
-  EXPECT_EQ(24u, Info.computeNumSignBits(CopyUnkBfxReg));
-  EXPECT_EQ(29u, Info.computeNumSignBits(CopyPosBfxReg));
-  EXPECT_EQ(24u, Info.computeNumSignBits(CopyNegBfxReg));
-  EXPECT_EQ(24u, Info.computeNumSignBits(CopyUnkOffBfxReg));
-  EXPECT_EQ(29u, Info.computeNumSignBits(CopyUnkWidthBfxReg));
-}
-
-TEST_F(AMDGPUGISelMITest, TestNumSignBitsSBFX) {
-  StringRef MIRString = "  %3:_(s32) = G_CONSTANT i32 -1\n"
-                        "  %4:_(s32) = G_CONSTANT i32 8\n"
-                        "  %5:_(s32) = G_CONSTANT i32 4\n"
-                        "  %6:_(s32) = G_SBFX %3, %4(s32), %5\n"
-                        "  %sbfx_copy_neg:_(s32) = COPY %6\n"
-                        "  %7:_(s32) = G_CONSTANT i32 2047\n"
-                        "  %8:_(s32) = G_SBFX %7, %4(s32), %5\n"
-                        "  %sbfx_copy_pos:_(s32) = COPY %8\n"
-                        "  %9:_(s32) = G_CONSTANT i32 2048\n"
-                        "  %10:_(s32) = G_SBFX %9, %4(s32), %5\n"
-                        "  %sbfx_copy_hiset:_(s32) = COPY %10\n"
-                        "  %11:_(s32) = G_IMPLICIT_DEF\n"
-                        "  %12:_(s32) = G_SBFX %11, %4(s32), %5\n"
-                        "  %sbfx_copy_unk:_(s32) = COPY %12\n"
-                        "  %13:_(s32) = G_SBFX %3, %11(s32), %5\n"
-                        "  %sbfx_copy_unk_off:_(s32) = COPY %13\n";
-  setUp(MIRString);
-  if (!TM)
-    return;
-  Register CopyNegBfxReg = Copies[Copies.size() - 5];
-  Register CopyPosBfxReg = Copies[Copies.size() - 4];
-  Register CopyHiSetBfxReg = Copies[Copies.size() - 3];
-  Register CopyUnkValBfxReg = Copies[Copies.size() - 2];
-  Register CopyUnkOffBfxReg = Copies[Copies.size() - 1];
-
-  GISelKnownBits Info(*MF);
-  EXPECT_EQ(32u, Info.computeNumSignBits(CopyNegBfxReg));
-  EXPECT_EQ(29u, Info.computeNumSignBits(CopyPosBfxReg));
-  EXPECT_EQ(29u, Info.computeNumSignBits(CopyHiSetBfxReg));
-  EXPECT_EQ(1u, Info.computeNumSignBits(CopyUnkValBfxReg));
-  EXPECT_EQ(1u, Info.computeNumSignBits(CopyUnkOffBfxReg));
-}
diff --git a/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/KnownBitsVectorTest.cpp b/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/KnownBitsVectorTest.cpp
deleted file mode 100644
index a4767ead1bf..00000000000
--- a/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/KnownBitsVectorTest.cpp
+++ /dev/null
@@ -1,1528 +0,0 @@
-//===- KnownBitsTest.cpp -------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "GISelMITest.h"
-#include "llvm/CodeGen/GlobalISel/GISelKnownBits.h"
-#include "llvm/CodeGen/GlobalISel/MachineIRBuilder.h"
-
-TEST_F(AArch64GISelMITest, TestKnownBitsBuildVector) {
-  StringRef MIRString = R"(
-   %ptr:_(p0) = G_IMPLICIT_DEF
-   %unknown:_(s8) = G_LOAD %ptr(p0) :: (load (s8))
-   %mask0:_(s8) = G_CONSTANT i8 24
-   %mask1:_(s8) = G_CONSTANT i8 224
-   %tmp0:_(s8) = G_AND %unknown, %mask0
-   %val0:_(s8) = G_OR %tmp0, %mask1
-   %mask2:_(s8) = G_CONSTANT i8 146
-   %mask3:_(s8) = G_CONSTANT i8 36
-   %tmp1:_(s8) = G_AND %unknown, %mask2
-   %val1:_(s8) = G_OR %tmp1, %mask3
-   %vector:_(<2 x s8>) = G_BUILD_VECTOR %val0, %val1
-   %copy_vector:_(<2 x s8>) = COPY %vector
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  Register SrcReg = FinalCopy->getOperand(1).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res = Info.getKnownBits(SrcReg);
-  // BuildVector KnownBits takes common bits of all elements.
-  //        111??000
-  // common ?01?01?0
-  //      = ??1????0
-  EXPECT_EQ(0x20u, Res.One.getZExtValue());
-  EXPECT_EQ(0x01u, Res.Zero.getZExtValue());
-}
-
-// Vector KnownBits track bits that are common for all vector scalar elements.
-// For tests below KnownBits analysis is same as for scalar/pointer types, tests
-// are mostly copied from KnownBitsTest.cpp using splat vectors and have the
-// same result.
-
-TEST_F(AArch64GISelMITest, TestKnownBitsVectorCstPHI) {
-  StringRef MIRString = R"(
-   bb.10:
-   %10:_(s8) = G_CONSTANT i8 3
-   %11:_(<2 x s8>) = G_BUILD_VECTOR %10:_(s8), %10:_(s8)
-   %12:_(s1) = G_IMPLICIT_DEF
-   G_BRCOND %12(s1), %bb.11
-   G_BR %bb.12
-
-   bb.11:
-   %13:_(s8) = G_CONSTANT i8 2
-   %14:_(<2 x s8>) = G_BUILD_VECTOR %13:_(s8), %13:_(s8)
-   G_BR %bb.12
-
-   bb.12:
-   %15:_(<2 x s8>) = PHI %11(<2 x s8>), %bb.10, %14(<2 x s8>), %bb.11
-   %16:_(<2 x s8>) = COPY %15
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  Register SrcReg = FinalCopy->getOperand(1).getReg();
-  Register DstReg = FinalCopy->getOperand(0).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res = Info.getKnownBits(SrcReg);
-  EXPECT_EQ((uint64_t)2, Res.One.getZExtValue());
-  EXPECT_EQ((uint64_t)0xfc, Res.Zero.getZExtValue());
-
-  KnownBits Res2 = Info.getKnownBits(DstReg);
-  EXPECT_EQ(Res.One.getZExtValue(), Res2.One.getZExtValue());
-  EXPECT_EQ(Res.Zero.getZExtValue(), Res2.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsVectorCstPHIToNonGenericReg) {
-  StringRef MIRString = R"(
-   bb.10:
-   %10:gpr32 = MOVi32imm 771
-   %11:_(s1) = G_IMPLICIT_DEF
-   G_BRCOND %11(s1), %bb.11
-   G_BR %bb.12
-
-   bb.11:
-   %12:_(s16) = G_CONSTANT i16 2
-   %13:_(<2 x s16>) = G_BUILD_VECTOR %12:_(s16), %12:_(s16)
-   G_BR %bb.12
-
-   bb.12:
-   %15:_(<2 x s16>) = PHI %10, %bb.10, %13(<2 x s16>), %bb.11
-   %16:_(<2 x s16>) = COPY %15
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  Register SrcReg = FinalCopy->getOperand(1).getReg();
-  Register DstReg = FinalCopy->getOperand(0).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res = Info.getKnownBits(SrcReg);
-  EXPECT_EQ((uint64_t)0, Res.One.getZExtValue());
-  EXPECT_EQ((uint64_t)0, Res.Zero.getZExtValue());
-
-  KnownBits Res2 = Info.getKnownBits(DstReg);
-  EXPECT_EQ(Res.One.getZExtValue(), Res2.One.getZExtValue());
-  EXPECT_EQ(Res.Zero.getZExtValue(), Res2.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsVectorUnknownPHI) {
-  StringRef MIRString = R"(
-   bb.10:
-   %10:_(<2 x s32>) = G_BITCAST %0
-   %11:_(s1) = G_IMPLICIT_DEF
-   G_BRCOND %11(s1), %bb.11
-   G_BR %bb.12
-
-   bb.11:
-   %12:_(s32) = G_CONSTANT i32 2
-   %13:_(<2 x s32>) = G_BUILD_VECTOR %12:_(s32), %12:_(s32)
-   G_BR %bb.12
-
-   bb.12:
-   %14:_(<2 x s32>) = PHI %10(<2 x s32>), %bb.10, %13(<2 x s32>), %bb.11
-   %15:_(<2 x s32>) = COPY %14
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  Register SrcReg = FinalCopy->getOperand(1).getReg();
-  Register DstReg = FinalCopy->getOperand(0).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res = Info.getKnownBits(SrcReg);
-  EXPECT_EQ((uint64_t)0, Res.One.getZExtValue());
-  EXPECT_EQ((uint64_t)0, Res.Zero.getZExtValue());
-
-  KnownBits Res2 = Info.getKnownBits(DstReg);
-  EXPECT_EQ(Res.One.getZExtValue(), Res2.One.getZExtValue());
-  EXPECT_EQ(Res.Zero.getZExtValue(), Res2.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsVectorCstPHIWithLoop) {
-  StringRef MIRString = R"(
-   bb.10:
-   %10:_(s8) = G_CONSTANT i8 3
-   %11:_(<2 x s8>) = G_BUILD_VECTOR %10:_(s8), %10:_(s8)
-   %12:_(s1) = G_IMPLICIT_DEF
-   G_BRCOND %12(s1), %bb.11
-   G_BR %bb.12
-
-   bb.11:
-   %13:_(s8) = G_CONSTANT i8 2
-   %14:_(<2 x s8>) = G_BUILD_VECTOR %13:_(s8), %13:_(s8)
-   G_BR %bb.12
-
-   bb.12:
-   %15:_(<2 x s8>) = PHI %11(<2 x s8>), %bb.10, %14(<2 x s8>), %bb.11, %16(<2 x s8>), %bb.12
-   %16:_(<2 x s8>) = COPY %15
-   G_BR %bb.12
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  Register SrcReg = FinalCopy->getOperand(1).getReg();
-  Register DstReg = FinalCopy->getOperand(0).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res = Info.getKnownBits(SrcReg);
-  EXPECT_EQ((uint64_t)0, Res.One.getZExtValue());
-  EXPECT_EQ((uint64_t)0, Res.Zero.getZExtValue());
-
-  KnownBits Res2 = Info.getKnownBits(DstReg);
-  EXPECT_EQ(Res.One.getZExtValue(), Res2.One.getZExtValue());
-  EXPECT_EQ(Res.Zero.getZExtValue(), Res2.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsVectorDecreasingCstPHIWithLoop) {
-  StringRef MIRString = R"(
-   bb.10:
-   %10:_(s8) = G_CONSTANT i8 5
-   %11:_(<2 x s8>) = G_BUILD_VECTOR %10:_(s8), %10:_(s8)
-   %12:_(s8) = G_CONSTANT i8 1
-
-   bb.12:
-   %13:_(<2 x s8>) = PHI %11(<2 x s8>), %bb.10, %14(<2 x s8>), %bb.12
-   %14:_(<2 x s8>) = G_LSHR %13, %12
-   %15:_(<2 x s8>) = COPY %14
-   G_BR %bb.12
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-  Register CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  Register SrcReg = FinalCopy->getOperand(1).getReg();
-  Register DstReg = FinalCopy->getOperand(0).getReg();
-  GISelKnownBits Info(*MF, /*MaxDepth=*/24);
-  KnownBits Res = Info.getKnownBits(SrcReg);
-  EXPECT_EQ((uint64_t)0, Res.One.getZExtValue());
-  EXPECT_EQ((uint64_t)0xC0, Res.Zero.getZExtValue());
-
-  KnownBits Res2 = Info.getKnownBits(DstReg);
-  EXPECT_EQ(Res.One.getZExtValue(), Res2.One.getZExtValue());
-  EXPECT_EQ(Res.Zero.getZExtValue(), Res2.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsVectorAND) {
-  StringRef MIRString = R"(
-   %ptr:_(p0) = G_IMPLICIT_DEF
-   %unknown:_(<2 x s8>) = G_LOAD %ptr(p0) :: (load (<2 x s8>))
-   %mask0:_(s8) = G_CONSTANT i8 52
-   %mask0_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask0, %mask0
-   %mask1:_(s8) = G_CONSTANT i8 10
-   %mask1_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask1, %mask1
-   %tmp0:_(<2 x s8>) = G_AND %unknown, %mask0_splat
-   %val0:_(<2 x s8>) = G_OR %tmp0, %mask1_splat
-   %mask2:_(s8) = G_CONSTANT i8 32
-   %mask2_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask2, %mask2
-   %mask3:_(s8) = G_CONSTANT i8 24
-   %mask3_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask3, %mask3
-   %tmp1:_(<2 x s8>) = G_AND %unknown, %mask2_splat
-   %val1:_(<2 x s8>) = G_OR %tmp1, %mask3_splat
-   %and:_(<2 x s8>) = G_AND %val0, %val1
-   %copy_and:_(<2 x s8>) = COPY %and
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  Register SrcReg = FinalCopy->getOperand(1).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res = Info.getKnownBits(SrcReg);
-  EXPECT_EQ(0x08u, Res.One.getZExtValue());
-  EXPECT_EQ(0xC7u, Res.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsVectorOR) {
-  StringRef MIRString = R"(
-   %ptr:_(p0) = G_IMPLICIT_DEF
-   %unknown:_(<2 x s8>) = G_LOAD %ptr(p0) :: (load (<2 x s8>))
-   %mask0:_(s8) = G_CONSTANT i8 52
-   %mask0_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask0, %mask0
-   %mask1:_(s8) = G_CONSTANT i8 10
-   %mask1_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask1, %mask1
-   %tmp0:_(<2 x s8>) = G_AND %unknown, %mask0_splat
-   %val0:_(<2 x s8>) = G_OR %tmp0, %mask1_splat
-   %mask2:_(s8) = G_CONSTANT i8 32
-   %mask2_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask2, %mask2
-   %mask3:_(s8) = G_CONSTANT i8 24
-   %mask3_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask3, %mask3
-   %tmp1:_(<2 x s8>) = G_AND %unknown, %mask2_splat
-   %val1:_(<2 x s8>) = G_OR %tmp1, %mask3_splat
-   %or:_(<2 x s8>) = G_OR %val0, %val1
-   %copy_or:_(<2 x s8>) = COPY %or
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  Register SrcReg = FinalCopy->getOperand(1).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res = Info.getKnownBits(SrcReg);
-  EXPECT_EQ(0x1Au, Res.One.getZExtValue());
-  EXPECT_EQ(0xC1u, Res.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsVectorXOR) {
-  StringRef MIRString = R"(
-   %ptr:_(p0) = G_IMPLICIT_DEF
-   %unknown:_(<2 x s8>) = G_LOAD %ptr(p0) :: (load (<2 x s8>))
-   %mask0:_(s8) = G_CONSTANT i8 52
-   %mask0_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask0, %mask0
-   %mask1:_(s8) = G_CONSTANT i8 10
-   %mask1_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask1, %mask1
-   %tmp0:_(<2 x s8>) = G_AND %unknown, %mask0_splat
-   %val0:_(<2 x s8>) = G_OR %tmp0, %mask1_splat
-   %mask2:_(s8) = G_CONSTANT i8 32
-   %mask2_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask2, %mask2
-   %mask3:_(s8) = G_CONSTANT i8 24
-   %mask3_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask3, %mask3
-   %tmp1:_(<2 x s8>) = G_AND %unknown, %mask2_splat
-   %val1:_(<2 x s8>) = G_OR %tmp1, %mask3_splat
-   %xor:_(<2 x s8>) = G_XOR %val0, %val1
-   %copy_xor:_(<2 x s8>) = COPY %xor
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  Register SrcReg = FinalCopy->getOperand(1).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res = Info.getKnownBits(SrcReg);
-  EXPECT_EQ(0x02u, Res.One.getZExtValue());
-  EXPECT_EQ(0xC9u, Res.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsVectorXORConstant) {
-  StringRef MIRString = R"(
-   %3:_(s8) = G_CONSTANT i8 4
-   %4:_(<2 x s8>) = G_BUILD_VECTOR %3:_(s8), %3:_(s8)
-   %5:_(s8) = G_CONSTANT i8 7
-   %6:_(<2 x s8>) = G_BUILD_VECTOR %5:_(s8), %5:_(s8)
-   %7:_(<2 x s8>) = G_XOR %4, %6
-   %8:_(<2 x s8>) = COPY %7
-
-   %9:_(s8) = G_CONSTANT i8 12
-   %10:_(<2 x s8>) = G_BUILD_VECTOR %3:_(s8), %9:_(s8)
-   %11:_(<2 x s8>) = G_XOR %10, %6
-   %12:_(<2 x s8>) = COPY %11
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  GISelKnownBits Info(*MF);
-  Register CopySplatReg = Copies[Copies.size() - 2];
-  MachineInstr *FinalSplatCopy = MRI->getVRegDef(CopySplatReg);
-  Register SrcSplatReg = FinalSplatCopy->getOperand(1).getReg();
-  KnownBits ResNonSplat = Info.getKnownBits(SrcSplatReg);
-  EXPECT_EQ(3u, ResNonSplat.One.getZExtValue());
-  EXPECT_EQ(252u, ResNonSplat.Zero.getZExtValue());
-
-  Register CopyNonSplatReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalNonSplatCopy = MRI->getVRegDef(CopyNonSplatReg);
-  Register SrcNonSplatReg = FinalNonSplatCopy->getOperand(1).getReg();
-  KnownBits ResSplat = Info.getKnownBits(SrcNonSplatReg);
-  EXPECT_EQ(3u, ResSplat.One.getZExtValue());
-  EXPECT_EQ(244u, ResSplat.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsVectorASHR) {
-  StringRef MIRString = R"(
-   %ptr:_(p0) = G_IMPLICIT_DEF
-   %unknown:_(<2 x s8>) = G_LOAD %ptr(p0) :: (load (<2 x s8>))
-   %mask0:_(s8) = G_CONSTANT i8 38
-   %mask0_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask0, %mask0
-   %mask1:_(s8) = G_CONSTANT i8 202
-   %mask1_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask1, %mask1
-   %tmp0:_(<2 x s8>) = G_AND %unknown, %mask0_splat
-   %val0:_(<2 x s8>) = G_OR %tmp0, %mask1_splat
-   %cst0:_(s8) = G_CONSTANT i8 2
-   %cst0_splat:_(<2 x s8>) = G_BUILD_VECTOR %cst0, %cst0
-   %ashr0:_(<2 x s8>) = G_ASHR %val0, %cst0_splat
-   %copy_ashr0:_(<2 x s8>) = COPY %ashr0
-
-   %mask2:_(s8) = G_CONSTANT i8 204
-   %mask2_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask2, %mask2
-   %mask3:_(s8) = G_CONSTANT i8 18
-   %mask3_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask3, %mask3
-   %tmp1:_(<2 x s8>) = G_AND %unknown, %mask2_splat
-   %val1:_(<2 x s8>) = G_OR %tmp1, %mask3_splat
-   %ashr1:_(<2 x s8>) = G_ASHR %val1, %cst0_splat
-   %copy_ashr1:_(<2 x s8>) = COPY %ashr1
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg0 = Copies[Copies.size() - 2];
-  MachineInstr *FinalCopy0 = MRI->getVRegDef(CopyReg0);
-  Register SrcReg0 = FinalCopy0->getOperand(1).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res0 = Info.getKnownBits(SrcReg0);
-  EXPECT_EQ(0xF2u, Res0.One.getZExtValue());
-  EXPECT_EQ(0x04u, Res0.Zero.getZExtValue());
-
-  Register CopyReg1 = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy1 = MRI->getVRegDef(CopyReg1);
-  Register SrcReg1 = FinalCopy1->getOperand(1).getReg();
-  KnownBits Res1 = Info.getKnownBits(SrcReg1);
-  EXPECT_EQ(0x04u, Res1.One.getZExtValue());
-  EXPECT_EQ(0x08u, Res1.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsVectorLSHR) {
-  StringRef MIRString = R"(
-   %ptr:_(p0) = G_IMPLICIT_DEF
-   %unknown:_(<2 x s8>) = G_LOAD %ptr(p0) :: (load (<2 x s8>))
-   %mask0:_(s8) = G_CONSTANT i8 38
-   %mask0_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask0, %mask0
-   %mask1:_(s8) = G_CONSTANT i8 202
-   %mask1_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask1, %mask1
-   %tmp0:_(<2 x s8>) = G_AND %unknown, %mask0_splat
-   %val0:_(<2 x s8>) = G_OR %tmp0, %mask1_splat
-   %cst0:_(s8) = G_CONSTANT i8 2
-   %cst0_splat:_(<2 x s8>) = G_BUILD_VECTOR %cst0, %cst0
-   %lshr0:_(<2 x s8>) = G_LSHR %val0, %cst0_splat
-   %copy_lshr0:_(<2 x s8>) = COPY %lshr0
-
-   %mask2:_(s8) = G_CONSTANT i8 204
-   %mask2_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask2, %mask2
-   %mask3:_(s8) = G_CONSTANT i8 18
-   %mask3_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask3, %mask3
-   %tmp1:_(<2 x s8>) = G_AND %unknown, %mask2_splat
-   %val1:_(<2 x s8>) = G_OR %tmp1, %mask3_splat
-   %lshr1:_(<2 x s8>) = G_LSHR %val1, %cst0_splat
-   %copy_lshr1:_(<2 x s8>) = COPY %lshr1
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg0 = Copies[Copies.size() - 2];
-  MachineInstr *FinalCopy0 = MRI->getVRegDef(CopyReg0);
-  Register SrcReg0 = FinalCopy0->getOperand(1).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res0 = Info.getKnownBits(SrcReg0);
-  EXPECT_EQ(0x32u, Res0.One.getZExtValue());
-  EXPECT_EQ(0xC4u, Res0.Zero.getZExtValue());
-
-  Register CopyReg1 = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy1 = MRI->getVRegDef(CopyReg1);
-  Register SrcReg1 = FinalCopy1->getOperand(1).getReg();
-  KnownBits Res1 = Info.getKnownBits(SrcReg1);
-  EXPECT_EQ(0x04u, Res1.One.getZExtValue());
-  EXPECT_EQ(0xC8u, Res1.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsVectorSHL) {
-  StringRef MIRString = R"(
-   %ptr:_(p0) = G_IMPLICIT_DEF
-   %unknown:_(<2 x s8>) = G_LOAD %ptr(p0) :: (load (<2 x s8>))
-   %mask0:_(s8) = G_CONSTANT i8 51
-   %mask0_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask0, %mask0
-   %mask1:_(s8) = G_CONSTANT i8 72
-   %mask1_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask1, %mask1
-   %tmp:_(<2 x s8>) = G_AND %unknown, %mask0_splat
-   %val:_(<2 x s8>) = G_OR %tmp, %mask1_splat
-   %cst:_(s8) = G_CONSTANT i8 3
-   %cst_splat:_(<2 x s8>) = G_BUILD_VECTOR %cst, %cst
-   %shl:_(<2 x s8>) = G_SHL %val, %cst_splat
-   %copy_shl:_(<2 x s8>) = COPY %shl
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  Register SrcReg = FinalCopy->getOperand(1).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res = Info.getKnownBits(SrcReg);
-  EXPECT_EQ(0x40u, Res.One.getZExtValue());
-  EXPECT_EQ(0x27u, Res.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsVectorADD) {
-  StringRef MIRString = R"(
-   %ptr:_(p0) = G_IMPLICIT_DEF
-   %unknown:_(<2 x s16>) = G_LOAD %ptr(p0) :: (load (<2 x s16>))
-   %mask0:_(s16) = G_CONSTANT i16 4642
-   %mask0_splat:_(<2 x s16>) = G_BUILD_VECTOR %mask0, %mask0
-   %mask1:_(s16) = G_CONSTANT i16 9536
-   %mask1_splat:_(<2 x s16>) = G_BUILD_VECTOR %mask1, %mask1
-   %tmp0:_(<2 x s16>) = G_AND %unknown, %mask0_splat
-   %val0:_(<2 x s16>) = G_OR %tmp0, %mask1_splat
-   %mask2:_(s16) = G_CONSTANT i16 4096
-   %mask2_splat:_(<2 x s16>) = G_BUILD_VECTOR %mask2, %mask2
-   %mask3:_(s16) = G_CONSTANT i16 371
-   %mask3_splat:_(<2 x s16>) = G_BUILD_VECTOR %mask3, %mask3
-   %tmp1:_(<2 x s16>) = G_AND %unknown, %mask2_splat
-   %val1:_(<2 x s16>) = G_OR %tmp1, %mask3_splat
-   %add:_(<2 x s16>) = G_ADD %val0, %val1
-   %copy_add:_(<2 x s16>) = COPY %add
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  Register SrcReg = FinalCopy->getOperand(1).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res = Info.getKnownBits(SrcReg);
-  EXPECT_EQ(0x0091u, Res.One.getZExtValue());
-  EXPECT_EQ(0x8108u, Res.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsVectorSUB) {
-  StringRef MIRString = R"(
-   %ptr:_(p0) = G_IMPLICIT_DEF
-   %unknown:_(<2 x s16>) = G_LOAD %ptr(p0) :: (load (<2 x s16>))
-   %mask0:_(s16) = G_CONSTANT i16 4642
-   %mask0_splat:_(<2 x s16>) = G_BUILD_VECTOR %mask0, %mask0
-   %mask1:_(s16) = G_CONSTANT i16 9536
-   %mask1_splat:_(<2 x s16>) = G_BUILD_VECTOR %mask1, %mask1
-   %tmp0:_(<2 x s16>) = G_AND %unknown, %mask0_splat
-   %val0:_(<2 x s16>) = G_OR %tmp0, %mask1_splat
-   %mask2:_(s16) = G_CONSTANT i16 4096
-   %mask2_splat:_(<2 x s16>) = G_BUILD_VECTOR %mask2, %mask2
-   %mask3:_(s16) = G_CONSTANT i16 371
-   %mask3_splat:_(<2 x s16>) = G_BUILD_VECTOR %mask3, %mask3
-   %tmp1:_(<2 x s16>) = G_AND %unknown, %mask2_splat
-   %val1:_(<2 x s16>) = G_OR %tmp1, %mask3_splat
-   %sub:_(<2 x s16>) = G_SUB %val0, %val1
-   %copy_sub:_(<2 x s16>) = COPY %sub
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  Register SrcReg = FinalCopy->getOperand(1).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res = Info.getKnownBits(SrcReg);
-  EXPECT_EQ(0x01CDu, Res.One.getZExtValue());
-  EXPECT_EQ(0xC810u, Res.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsVectorMUL) {
-  StringRef MIRString = R"(
-   %ptr:_(p0) = G_IMPLICIT_DEF
-   %unknown:_(<2 x s16>) = G_LOAD %ptr(p0) :: (load (<2 x s16>))
-   %mask0:_(s16) = G_CONSTANT i16 4
-   %mask0_splat:_(<2 x s16>) = G_BUILD_VECTOR %mask0, %mask0
-   %mask1:_(s16) = G_CONSTANT i16 18
-   %mask1_splat:_(<2 x s16>) = G_BUILD_VECTOR %mask1, %mask1
-   %tmp:_(<2 x s16>) = G_AND %unknown, %mask0_splat
-   %val0:_(<2 x s16>) = G_OR %tmp, %mask1_splat
-   %cst:_(s16) = G_CONSTANT i16 12
-   %cst_splat:_(<2 x s16>) = G_BUILD_VECTOR %cst, %cst
-   %mul:_(<2 x s16>) = G_MUL %val0, %cst_splat
-   %copy_mul:_(<2 x s16>) = COPY %mul
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  Register SrcReg = FinalCopy->getOperand(1).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res = Info.getKnownBits(SrcReg);
-  EXPECT_EQ(0x0008u, Res.One.getZExtValue());
-  EXPECT_EQ(0xFE07u, Res.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsVectorSelect) {
-  StringRef MIRString = R"(
-   %ptr:_(p0) = G_IMPLICIT_DEF
-   %unknown:_(<2 x s8>) = G_LOAD %ptr(p0) :: (load (<2 x s8>))
-   %mask0:_(s8) = G_CONSTANT i8 24
-   %mask0_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask0, %mask0
-   %mask1:_(s8) = G_CONSTANT i8 224
-   %mask1_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask1, %mask1
-   %tmp0:_(<2 x s8>) = G_AND %unknown, %mask0_splat
-   %val0:_(<2 x s8>) = G_OR %tmp0, %mask1_splat
-   %mask2:_(s8) = G_CONSTANT i8 146
-   %mask2_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask2, %mask2
-   %mask3:_(s8) = G_CONSTANT i8 36
-   %mask3_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask3, %mask3
-   %tmp1:_(<2 x s8>) = G_AND %unknown, %mask2_splat
-   %val1:_(<2 x s8>) = G_OR %tmp1, %mask3_splat
-   %cond:_(s1) = G_CONSTANT i1 false
-   %cond_splat:_(<2 x s1>) = G_BUILD_VECTOR %cond, %cond
-   %select:_(<2 x s8>) = G_SELECT %cond_splat, %val0, %val1
-   %copy_select:_(<2 x s8>) = COPY %select
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  Register SrcReg = FinalCopy->getOperand(1).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res = Info.getKnownBits(SrcReg);
-  EXPECT_EQ(0x20u, Res.One.getZExtValue());
-  EXPECT_EQ(0x01u, Res.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestVectorSignBitIsZero) {
-  setUp();
-  if (!TM)
-    return;
-
-  const LLT V2S32 = LLT::fixed_vector(2, 32);
-  // Vector buildConstant makes splat G_BUILD_VECTOR instruction.
-  auto SignBit = B.buildConstant(V2S32, 0x80000000);
-  auto Zero = B.buildConstant(V2S32, 0);
-
-  const LLT S32 = LLT::scalar(32);
-  auto NonSplat =
-      B.buildBuildVector(V2S32, {B.buildConstant(S32, 1).getReg(0),
-                                 B.buildConstant(S32, 2).getReg(0)});
-  auto NonSplat2 =
-      B.buildBuildVector(V2S32, {B.buildConstant(S32, 0x80000000).getReg(0),
-                                 B.buildConstant(S32, 0x80000004).getReg(0)});
-  // signBitIsZero is true for elt 0 and false for elt 1 GISelKnownBits takes
-  // common bits so this is false.
-  auto NonSplat3 =
-      B.buildBuildVector(V2S32, {B.buildConstant(S32, 0x80000000).getReg(0),
-                                 B.buildConstant(S32, 0x8).getReg(0)});
-  GISelKnownBits KnownBits(*MF);
-
-  EXPECT_TRUE(KnownBits.signBitIsZero(Zero.getReg(0)));
-  EXPECT_FALSE(KnownBits.signBitIsZero(SignBit.getReg(0)));
-  EXPECT_TRUE(KnownBits.signBitIsZero(NonSplat.getReg(0)));
-  EXPECT_FALSE(KnownBits.signBitIsZero(NonSplat2.getReg(0)));
-  EXPECT_FALSE(KnownBits.signBitIsZero(NonSplat3.getReg(0)));
-}
-
-TEST_F(AArch64GISelMITest, TestVectorNumSignBitsConstant) {
-  StringRef MIRString = R"(
-   %3:_(s8) = G_CONSTANT i8 1
-   %4:_(<2 x s8>) = G_BUILD_VECTOR %3:_(s8), %3:_(s8)
-   %5:_(<2 x s8>) = COPY %4
-
-   %6:_(s8) = G_CONSTANT i8 -1
-   %7:_(<2 x s8>) = G_BUILD_VECTOR %6:_(s8), %6:_(s8)
-   %8:_(<2 x s8>) = COPY %7
-
-   %9:_(s8) = G_CONSTANT i8 127
-   %10:_(<2 x s8>) = G_BUILD_VECTOR %9:_(s8), %9:_(s8)
-   %11:_(<2 x s8>) = COPY %10
-
-   %12:_(s8) = G_CONSTANT i8 32
-   %13:_(<2 x s8>) = G_BUILD_VECTOR %12:_(s8), %12:_(s8)
-   %14:_(<2 x s8>) = COPY %13
-
-   %15:_(s8) = G_CONSTANT i8 -32
-   %16:_(<2 x s8>) = G_BUILD_VECTOR %15:_(s8), %15:_(s8)
-   %17:_(<2 x s8>) = COPY %16
-
-   %18:_(<2 x s8>) = G_BUILD_VECTOR %6:_(s8), %15:_(s8)
-   %19:_(<2 x s8>) = COPY %18
-
-   %20:_(<2 x s8>) = G_BUILD_VECTOR %12:_(s8), %15:_(s8)
-   %21:_(<2 x s8>) = COPY %20
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg1 = Copies[Copies.size() - 7];
-  Register CopyRegNeg1 = Copies[Copies.size() - 6];
-  Register CopyReg127 = Copies[Copies.size() - 5];
-  Register CopyReg32 = Copies[Copies.size() - 4];
-  Register CopyRegNeg32 = Copies[Copies.size() - 3];
-  Register NonSplatSameSign = Copies[Copies.size() - 2];
-  Register NonSplatDifferentSign = Copies[Copies.size() - 1];
-
-  GISelKnownBits Info(*MF);
-  // If it is known that all elts have same sign looks at common bits and
-  // effectively returns smallest NumSignBits of all the elts. Otherwise returns
-  // default value 1.
-  EXPECT_EQ(7u, Info.computeNumSignBits(CopyReg1));
-  EXPECT_EQ(8u, Info.computeNumSignBits(CopyRegNeg1));
-  EXPECT_EQ(1u, Info.computeNumSignBits(CopyReg127));
-  EXPECT_EQ(2u, Info.computeNumSignBits(CopyReg32));
-  EXPECT_EQ(3u, Info.computeNumSignBits(CopyRegNeg32));
-  EXPECT_EQ(3u, Info.computeNumSignBits(NonSplatSameSign));
-  EXPECT_EQ(1u, Info.computeNumSignBits(NonSplatDifferentSign));
-}
-
-TEST_F(AArch64GISelMITest, TestVectorNumSignBitsSext) {
-  StringRef MIRString = R"(
-   %3:_(p0) = G_IMPLICIT_DEF
-   %4:_(<2 x s8>) = G_LOAD %3 :: (load (<2 x s8>))
-   %5:_(<2 x s32>) = G_SEXT %4
-   %6:_(<2 x s32>) = COPY %5
-
-   %7:_(s8) = G_CONSTANT i8 -1
-   %8:_(<2 x s8>) = G_BUILD_VECTOR %7:_(s8), %7:_(s8)
-   %9:_(<2 x s32>) = G_SEXT %8
-   %10:_(<2 x s32>) = COPY %9
-
-   %11:_(s8) = G_CONSTANT i8 -10
-   %12:_(<2 x s8>) = G_BUILD_VECTOR %7:_(s8), %11:_(s8)
-   %13:_(<2 x s32>) = G_SEXT %12
-   %14:_(<2 x s32>) = COPY %13
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-  Register CopySextLoad = Copies[Copies.size() - 3];
-  Register CopySextNeg1 = Copies[Copies.size() - 2];
-  Register CopySextNonSplat = Copies[Copies.size() - 1];
-
-  GISelKnownBits Info(*MF);
-  EXPECT_EQ(25u, Info.computeNumSignBits(CopySextLoad));
-  EXPECT_EQ(32u, Info.computeNumSignBits(CopySextNeg1));
-  EXPECT_EQ(28u, Info.computeNumSignBits(CopySextNonSplat));
-}
-
-TEST_F(AArch64GISelMITest, TestVectorNumSignBitsSextInReg) {
-  StringRef MIRString = R"(
-   %ptr:_(p0) = G_IMPLICIT_DEF
-   %load2x4:_(<2 x s32>) = G_LOAD %ptr :: (load (<2 x s32>))
-
-   %inreg7:_(<2 x s32>) = G_SEXT_INREG %load2x4, 7
-   %copy_inreg7:_(<2 x s32>) = COPY %inreg7
-
-   %inreg8:_(<2 x s32>) = G_SEXT_INREG %load2x4, 8
-   %copy_inreg8:_(<2 x s32>) = COPY %inreg8
-
-   %inreg9:_(<2 x s32>) = G_SEXT_INREG %load2x4, 9
-   %copy_inreg9:_(<2 x s32>) = COPY %inreg9
-
-   %inreg31:_(<2 x s32>) = G_SEXT_INREG %load2x4, 31
-   %copy_inreg31:_(<2 x s32>) = COPY %inreg31
-
-   %load2x1:_(<2 x s8>) = G_LOAD %ptr :: (load (<2 x s8>))
-   %sext_load2x1:_(<2 x s32>) = G_SEXT %load2x1
-
-   %inreg6_sext:_(<2 x s32>) = G_SEXT_INREG %sext_load2x1, 6
-   %copy_inreg6_sext:_(<2 x s32>) = COPY %inreg6_sext
-
-   %inreg7_sext:_(<2 x s32>) = G_SEXT_INREG %sext_load2x1, 7
-   %copy_inreg7_sext:_(<2 x s32>) = COPY %inreg7_sext
-
-   %inreg8_sext:_(<2 x s32>) = G_SEXT_INREG %sext_load2x1, 8
-   %copy_inreg8_sext:_(<2 x s32>) = COPY %inreg8_sext
-
-   %inreg9_sext:_(<2 x s32>) = G_SEXT_INREG %sext_load2x1, 9
-   %copy_inreg9_sext:_(<2 x s32>) = COPY %inreg9_sext
-
-   %inreg31_sext:_(<2 x s32>) = G_SEXT_INREG %sext_load2x1, 31
-   %copy_inreg31_sext:_(<2 x s32>) = COPY %inreg31_sext
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyInReg7 = Copies[Copies.size() - 9];
-  Register CopyInReg8 = Copies[Copies.size() - 8];
-  Register CopyInReg9 = Copies[Copies.size() - 7];
-  Register CopyInReg31 = Copies[Copies.size() - 6];
-
-  Register CopyInReg6Sext = Copies[Copies.size() - 5];
-  Register CopyInReg7Sext = Copies[Copies.size() - 4];
-  Register CopyInReg8Sext = Copies[Copies.size() - 3];
-  Register CopyInReg9Sext = Copies[Copies.size() - 2];
-  Register CopyInReg31Sext = Copies[Copies.size() - 1];
-
-  GISelKnownBits Info(*MF);
-  EXPECT_EQ(26u, Info.computeNumSignBits(CopyInReg7));
-  EXPECT_EQ(25u, Info.computeNumSignBits(CopyInReg8));
-  EXPECT_EQ(24u, Info.computeNumSignBits(CopyInReg9));
-  EXPECT_EQ(2u, Info.computeNumSignBits(CopyInReg31));
-
-  EXPECT_EQ(27u, Info.computeNumSignBits(CopyInReg6Sext));
-  EXPECT_EQ(26u, Info.computeNumSignBits(CopyInReg7Sext));
-  EXPECT_EQ(25u, Info.computeNumSignBits(CopyInReg8Sext));
-  EXPECT_EQ(25u, Info.computeNumSignBits(CopyInReg9Sext));
-  EXPECT_EQ(25u, Info.computeNumSignBits(CopyInReg31Sext));
-}
-
-TEST_F(AArch64GISelMITest, TestNumSignBitsVectorAssertSext) {
-  StringRef MIRString = R"(
-   %ptr:_(p0) = G_IMPLICIT_DEF
-   %load2x4:_(<2 x s32>) = G_LOAD %ptr :: (load (<2 x s32>))
-
-   %assert_sext1:_(<2 x s32>) = G_ASSERT_SEXT %load2x4, 1
-   %copy_assert_sext1:_(<2 x s32>) = COPY %assert_sext1
-
-   %assert_sext7:_(<2 x s32>) = G_ASSERT_SEXT %load2x4, 7
-   %copy_assert_sext7:_(<2 x s32>) = COPY %assert_sext7
-
-   %assert_sext8:_(<2 x s32>) = G_ASSERT_SEXT %load2x4, 8
-   %copy_assert_sext8:_(<2 x s32>) = COPY %assert_sext8
-
-   %assert_sext9:_(<2 x s32>) = G_ASSERT_SEXT %load2x4, 9
-   %copy_assert_sext9:_(<2 x s32>) = COPY %assert_sext9
-
-   %assert_sext31:_(<2 x s32>) = G_ASSERT_SEXT %load2x4, 31
-   %copy_assert_sext31:_(<2 x s32>) = COPY %assert_sext31
-
-   %load2x1:_(<2 x s8>) = G_LOAD %ptr :: (load (<2 x s8>))
-   %sext_load2x1:_(<2 x s32>) = G_SEXT %load2x1
-
-   %assert_sext6_sext:_(<2 x s32>) = G_ASSERT_SEXT %sext_load2x1, 6
-   %copy_assert_sext6_sext:_(<2 x s32>) = COPY %assert_sext6_sext
-
-   %assert_sext7_sext:_(<2 x s32>) = G_ASSERT_SEXT %sext_load2x1, 7
-   %copy_assert_sext7_sext:_(<2 x s32>) = COPY %assert_sext7_sext
-
-   %assert_sext8_sext:_(<2 x s32>) = G_ASSERT_SEXT %sext_load2x1, 8
-   %copy_assert_sext8_sext:_(<2 x s32>) = COPY %assert_sext8_sext
-
-   %assert_sext9_sext:_(<2 x s32>) = G_ASSERT_SEXT %sext_load2x1, 9
-   %copy_assert_sext9_sext:_(<2 x s32>) = COPY %assert_sext9_sext
-
-   %assert_sext31_sext:_(<2 x s32>) = G_ASSERT_SEXT %sext_load2x1, 31
-   %copy_assert_sext31_sext:_(<2 x s32>) = COPY %assert_sext31_sext
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyInReg1 = Copies[Copies.size() - 10];
-  Register CopyInReg7 = Copies[Copies.size() - 9];
-  Register CopyInReg8 = Copies[Copies.size() - 8];
-  Register CopyInReg9 = Copies[Copies.size() - 7];
-  Register CopyInReg31 = Copies[Copies.size() - 6];
-
-  Register CopyInReg6Sext = Copies[Copies.size() - 5];
-  Register CopyInReg7Sext = Copies[Copies.size() - 4];
-  Register CopyInReg8Sext = Copies[Copies.size() - 3];
-  Register CopyInReg9Sext = Copies[Copies.size() - 2];
-  Register CopyInReg31Sext = Copies[Copies.size() - 1];
-
-  GISelKnownBits Info(*MF);
-  EXPECT_EQ(32u, Info.computeNumSignBits(CopyInReg1));
-  EXPECT_EQ(26u, Info.computeNumSignBits(CopyInReg7));
-  EXPECT_EQ(25u, Info.computeNumSignBits(CopyInReg8));
-  EXPECT_EQ(24u, Info.computeNumSignBits(CopyInReg9));
-  EXPECT_EQ(2u, Info.computeNumSignBits(CopyInReg31));
-
-  EXPECT_EQ(27u, Info.computeNumSignBits(CopyInReg6Sext));
-  EXPECT_EQ(26u, Info.computeNumSignBits(CopyInReg7Sext));
-  EXPECT_EQ(25u, Info.computeNumSignBits(CopyInReg8Sext));
-  EXPECT_EQ(25u, Info.computeNumSignBits(CopyInReg9Sext));
-  EXPECT_EQ(25u, Info.computeNumSignBits(CopyInReg31Sext));
-}
-
-TEST_F(AArch64GISelMITest, TestVectorNumSignBitsTrunc) {
-  StringRef MIRString = R"(
-   %3:_(p0) = G_IMPLICIT_DEF
-   %4:_(<2 x s32>) = G_LOAD %3 :: (load (<2 x s32>))
-   %5:_(<2 x s8>) = G_TRUNC %4
-   %6:_(<2 x s8>) = COPY %5
-
-   %7:_(s32) = G_CONSTANT i32 -1
-   %8:_(<2 x s32>) = G_BUILD_VECTOR %7:_(s32), %7:_(s32)
-   %9:_(<2 x s8>) = G_TRUNC %8
-   %10:_(<2 x s8>) = COPY %9
-
-   %11:_(s32) = G_CONSTANT i32 7
-   %12:_(<2 x s32>) = G_BUILD_VECTOR %11:_(s32), %11:_(s32)
-   %13:_(<2 x s8>) = G_TRUNC %12
-   %14:_(<2 x s8>) = COPY %13
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyTruncLoad = Copies[Copies.size() - 3];
-  Register CopyTruncNeg1 = Copies[Copies.size() - 2];
-  Register CopyTrunc7 = Copies[Copies.size() - 1];
-
-  GISelKnownBits Info(*MF);
-  EXPECT_EQ(1u, Info.computeNumSignBits(CopyTruncLoad));
-  EXPECT_EQ(8u, Info.computeNumSignBits(CopyTruncNeg1));
-  EXPECT_EQ(5u, Info.computeNumSignBits(CopyTrunc7));
-}
-
-TEST_F(AMDGPUGISelMITest, TestVectorIsKnownToBeAPowerOfTwo) {
-
-  StringRef MIRString = R"(
-  %zero:_(s32) = G_CONSTANT i32 0
-  %zero_splat:_(<2 x s32>) = G_BUILD_VECTOR %zero:_(s32), %zero:_(s32)
-  %one:_(s32) = G_CONSTANT i32 1
-  %one_splat:_(<2 x s32>) = G_BUILD_VECTOR %one:_(s32), %one:_(s32)
-  %two:_(s32) = G_CONSTANT i32 2
-  %two_splat:_(<2 x s32>) = G_BUILD_VECTOR %two:_(s32), %two:_(s32)
-  %three:_(s32) = G_CONSTANT i32 3
-  %three_splat:_(<2 x s32>) = G_BUILD_VECTOR %three:_(s32), %three:_(s32)
-  %five:_(s32) = G_CONSTANT i32 5
-  %five_splat:_(<2 x s32>) = G_BUILD_VECTOR %five:_(s32), %five:_(s32)
-  %copy_zero_splat:_(<2 x s32>) = COPY %zero_splat
-  %copy_one_splat:_(<2 x s32>) = COPY %one_splat
-  %copy_two_splat:_(<2 x s32>) = COPY %two_splat
-  %copy_three_splat:_(<2 x s32>) = COPY %three_splat
-
-  %trunc_two_splat:_(<2 x s1>) = G_TRUNC %two_splat
-  %trunc_three_splat:_(<2 x s1>) = G_TRUNC %three_splat
-  %trunc_five_splat:_(<2 x s1>) = G_TRUNC %five_splat
-
-  %copy_trunc_two_splat:_(<2 x s1>) = COPY %trunc_two_splat
-  %copy_trunc_three_splat:_(<2 x s1>) = COPY %trunc_three_splat
-  %copy_trunc_five_splat:_(<2 x s1>) = COPY %trunc_five_splat
-
-  %ptr:_(p1) = G_IMPLICIT_DEF
-  %shift_amt:_(<2 x s32>) = G_LOAD %ptr :: (load (<2 x s32>), addrspace 1)
-
-  %shl_1:_(<2 x s32>) = G_SHL %one_splat, %shift_amt
-  %copy_shl_1:_(<2 x s32>) = COPY %shl_1
-
-  %shl_2:_(<2 x s32>) = G_SHL %two_splat, %shift_amt
-  %copy_shl_2:_(<2 x s32>) = COPY %shl_2
-
-  %not_sign_mask:_(<2 x s32>) = G_LOAD %ptr :: (load (<2 x s32>), addrspace 1)
-  %sign_mask:_(s32) = G_CONSTANT i32 -2147483648
-  %sign_mask_splat:_(<2 x s32>) = G_BUILD_VECTOR %sign_mask:_(s32), %sign_mask:_(s32)
-
-  %lshr_not_sign_mask:_(<2 x s32>) = G_LSHR %not_sign_mask, %shift_amt
-  %copy_lshr_not_sign_mask:_(<2 x s32>) = COPY %lshr_not_sign_mask
-
-  %lshr_sign_mask:_(<2 x s32>) = G_LSHR %sign_mask_splat, %shift_amt
-  %copy_lshr_sign_mask:_(<2 x s32>) = COPY %lshr_sign_mask
-
-  %or_pow2:_(<2 x s32>) = G_OR %zero_splat, %two_splat
-  %copy_or_pow2:_(<2 x s32>) = COPY %or_pow2
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  GISelKnownBits KB(*MF);
-
-  Register CopyZero = Copies[Copies.size() - 12];
-  Register CopyOne = Copies[Copies.size() - 11];
-  Register CopyTwo = Copies[Copies.size() - 10];
-  Register CopyThree = Copies[Copies.size() - 9];
-  Register CopyTruncTwo = Copies[Copies.size() - 8];
-  Register CopyTruncThree = Copies[Copies.size() - 7];
-  Register CopyTruncFive = Copies[Copies.size() - 6];
-
-  Register CopyShl1 = Copies[Copies.size() - 5];
-  Register CopyShl2 = Copies[Copies.size() - 4];
-
-  Register CopyLShrNotSignMask = Copies[Copies.size() - 3];
-  Register CopyLShrSignMask = Copies[Copies.size() - 2];
-  Register CopyOrPow2 = Copies[Copies.size() - 1];
-
-  EXPECT_FALSE(isKnownToBeAPowerOfTwo(CopyZero, *MRI, &KB));
-  EXPECT_TRUE(isKnownToBeAPowerOfTwo(CopyOne, *MRI, &KB));
-  EXPECT_TRUE(isKnownToBeAPowerOfTwo(CopyTwo, *MRI, &KB));
-  EXPECT_FALSE(isKnownToBeAPowerOfTwo(CopyThree, *MRI, &KB));
-
-  EXPECT_FALSE(isKnownToBeAPowerOfTwo(CopyTruncTwo, *MRI, &KB));
-  EXPECT_TRUE(isKnownToBeAPowerOfTwo(CopyTruncThree, *MRI, &KB));
-  EXPECT_TRUE(isKnownToBeAPowerOfTwo(CopyTruncFive, *MRI, &KB));
-  // TODO: check for vector(splat) shift amount.
-  EXPECT_FALSE(isKnownToBeAPowerOfTwo(CopyShl1, *MRI, &KB));
-  EXPECT_FALSE(isKnownToBeAPowerOfTwo(CopyShl2, *MRI, &KB));
-
-  EXPECT_FALSE(isKnownToBeAPowerOfTwo(CopyLShrNotSignMask, *MRI, &KB));
-  EXPECT_FALSE(isKnownToBeAPowerOfTwo(CopyLShrSignMask, *MRI, &KB));
-  EXPECT_TRUE(isKnownToBeAPowerOfTwo(CopyOrPow2, *MRI, &KB));
-}
-
-TEST_F(AArch64GISelMITest, TestVectorMetadata) {
-  StringRef MIRString = R"(
-   %imp:_(p0) = G_IMPLICIT_DEF
-   %load:_(<2 x s8>) = G_LOAD %imp(p0) :: (load (<2 x s8>))
-   %ext:_(<2 x s32>) = G_ZEXT %load(<2 x s8>)
-   %cst_elt:_(s32) = G_CONSTANT i32 1
-   %cst:_(<2 x s32>) = G_BUILD_VECTOR %cst_elt:_(s32), %cst_elt:_(s32)
-   %and:_(<2 x s32>) = G_AND %ext, %cst
-   %copy:_(<2 x s32>) = COPY %and(<2 x s32>)
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy = MRI->getVRegDef(CopyReg);
-  Register SrcReg = FinalCopy->getOperand(1).getReg();
-
-  MachineInstr *And = MRI->getVRegDef(SrcReg);
-  MachineInstr *Ext = MRI->getVRegDef(And->getOperand(1).getReg());
-  MachineInstr *Load = MRI->getVRegDef(Ext->getOperand(1).getReg());
-  IntegerType *Int8Ty = Type::getInt8Ty(Context);
-
-  Metadata *LowAndHigh[] = {
-      ConstantAsMetadata::get(ConstantInt::get(Int8Ty, 0)),
-      ConstantAsMetadata::get(ConstantInt::get(Int8Ty, 2))};
-  auto *NewMDNode = MDNode::get(Context, LowAndHigh);
-  const MachineMemOperand *OldMMO = *Load->memoperands_begin();
-  MachineMemOperand NewMMO(OldMMO->getPointerInfo(), OldMMO->getFlags(),
-                           OldMMO->getSizeInBits(), OldMMO->getAlign(),
-                           OldMMO->getAAInfo(), NewMDNode);
-  MachineIRBuilder MIB(*Load);
-  MIB.buildLoad(Load->getOperand(0), Load->getOperand(1), NewMMO);
-  Load->eraseFromParent();
-
-  GISelKnownBits Info(*MF);
-  KnownBits Res = Info.getKnownBits(And->getOperand(1).getReg());
-
-  EXPECT_TRUE(Res.One.isNullValue());
-
-  APInt Mask(Res.getBitWidth(), 1);
-  Mask.flipAllBits();
-  EXPECT_EQ(Mask.getZExtValue(), Res.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestVectorKnownBitsExt) {
-  StringRef MIRString = R"(
-   %c1:_(s16) = G_CONSTANT i16 1
-   %c1_splat:_(<2 x s16>) = G_BUILD_VECTOR %c1:_(s16), %c1:_(s16)
-   %x:_(<2 x s16>) = G_IMPLICIT_DEF
-   %y:_(<2 x s16>) = G_AND %x, %c1_splat
-   %anyext:_(<2 x s32>) = G_ANYEXT %y(<2 x s16>)
-   %r1:_(<2 x s32>) = COPY %anyext
-   %zext:_(<2 x s32>) = G_ZEXT %y(<2 x s16>)
-   %r2:_(<2 x s32>) = COPY %zext
-   %sext:_(<2 x s32>) = G_SEXT %y(<2 x s16>)
-   %r3:_(<2 x s32>) = COPY %sext
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-  Register CopyRegAny = Copies[Copies.size() - 3];
-  Register CopyRegZ = Copies[Copies.size() - 2];
-  Register CopyRegS = Copies[Copies.size() - 1];
-
-  GISelKnownBits Info(*MF);
-  MachineInstr *Copy;
-  Register SrcReg;
-  KnownBits Res;
-
-  Copy = MRI->getVRegDef(CopyRegAny);
-  SrcReg = Copy->getOperand(1).getReg();
-  Res = Info.getKnownBits(SrcReg);
-  EXPECT_EQ((uint64_t)32, Res.getBitWidth());
-  EXPECT_EQ((uint64_t)0, Res.One.getZExtValue());
-  EXPECT_EQ((uint64_t)0x0000fffe, Res.Zero.getZExtValue());
-
-  Copy = MRI->getVRegDef(CopyRegZ);
-  SrcReg = Copy->getOperand(1).getReg();
-  Res = Info.getKnownBits(SrcReg);
-  EXPECT_EQ((uint64_t)32, Res.getBitWidth());
-  EXPECT_EQ((uint64_t)0, Res.One.getZExtValue());
-  EXPECT_EQ((uint64_t)0xfffffffe, Res.Zero.getZExtValue());
-
-  Copy = MRI->getVRegDef(CopyRegS);
-  SrcReg = Copy->getOperand(1).getReg();
-  Res = Info.getKnownBits(SrcReg);
-  EXPECT_EQ((uint64_t)32, Res.getBitWidth());
-  EXPECT_EQ((uint64_t)0, Res.One.getZExtValue());
-  EXPECT_EQ((uint64_t)0xfffffffe, Res.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsVectorSextInReg) {
-  StringRef MIRString = R"(
-   ; 000...0001
-   %one:_(s32) = G_CONSTANT i32 1
-   %one_splat:_(<2 x s32>) = G_BUILD_VECTOR %one:_(s32), %one:_(s32)
-
-   ; 000...0010
-   %two:_(s32) = G_CONSTANT i32 2
-   %two_splat:_(<2 x s32>) = G_BUILD_VECTOR %two:_(s32), %two:_(s32)
-
-   ; 000...1010
-   %ten:_(s32) = G_CONSTANT i32 10
-   %ten_splat:_(<2 x s32>) = G_BUILD_VECTOR %ten:_(s32), %ten:_(s32)
-
-   ; ???...????
-   %x0:_(<2 x s32>) = COPY $x0
-
-   ; ???...?1?
-   %or:_(<2 x s32>) = G_OR %x0, %two_splat
-
-   ; All bits are known.
-   %inreg1:_(<2 x s32>) = G_SEXT_INREG %one_splat, 1
-   %copy_inreg1:_(<2 x s32>) = COPY %inreg1
-
-   ; All bits unknown
-   %inreg2:_(<2 x s32>) = G_SEXT_INREG %or, 1
-   %copy_inreg2:_(<2 x s32>) = COPY %inreg2
-
-   ; Extending from the only (known) set bit
-   ; 111...11?
-   %inreg3:_(<2 x s32>) = G_SEXT_INREG %or, 2
-   %copy_inreg3:_(<2 x s32>) = COPY %inreg3
-
-   ; Extending from a known set bit, overwriting all of the high set bits.
-   ; 111...1110
-   %inreg4:_(<2 x s32>) = G_SEXT_INREG %ten_splat, 2
-   %copy_inreg4:_(<2 x s32>) = COPY %inreg4
-
-)";
-  setUp(MIRString);
-  if (!TM)
-    return;
-  GISelKnownBits Info(*MF);
-  KnownBits Res;
-  auto GetKB = [&](unsigned Idx) {
-    Register CopyReg = Copies[Idx];
-    auto *Copy = MRI->getVRegDef(CopyReg);
-    return Info.getKnownBits(Copy->getOperand(1).getReg());
-  };
-
-  Res = GetKB(Copies.size() - 4);
-  EXPECT_EQ(32u, Res.getBitWidth());
-  EXPECT_TRUE(Res.isAllOnes());
-
-  Res = GetKB(Copies.size() - 3);
-  EXPECT_EQ(32u, Res.getBitWidth());
-  EXPECT_TRUE(Res.isUnknown());
-
-  Res = GetKB(Copies.size() - 2);
-  EXPECT_EQ(32u, Res.getBitWidth());
-  EXPECT_EQ(0xFFFFFFFEu, Res.One.getZExtValue());
-  EXPECT_EQ(0u, Res.Zero.getZExtValue());
-
-  Res = GetKB(Copies.size() - 1);
-  EXPECT_EQ(32u, Res.getBitWidth());
-  EXPECT_EQ(0xFFFFFFFEu, Res.One.getZExtValue());
-  EXPECT_EQ(1u, Res.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsVectorAssertSext) {
-  StringRef MIRString = R"(
-   ; 000...0001
-   %one:_(s32) = G_CONSTANT i32 1
-   %one_splat:_(<2 x s32>) = G_BUILD_VECTOR %one, %one
-
-   ; 000...0010
-   %two:_(s32) = G_CONSTANT i32 2
-   %two_splat:_(<2 x s32>) = G_BUILD_VECTOR %two, %two
-
-   ; 000...1010
-   %ten:_(s32) = G_CONSTANT i32 10
-   %ten_splat:_(<2 x s32>) = G_BUILD_VECTOR %ten, %ten
-
-   ; ???...????
-   %x0:_(<2 x s32>) = COPY $x0
-
-   ; ???...?1?
-   %or:_(<2 x s32>) = G_OR %x0, %two_splat
-
-   ; All bits are known.
-   %assert_sext1:_(<2 x s32>) = G_ASSERT_SEXT %one_splat, 1
-   %copy_assert_sext1:_(<2 x s32>) = COPY %assert_sext1
-
-   ; All bits unknown
-   %assert_sext2:_(<2 x s32>) = G_ASSERT_SEXT %or, 1
-   %copy_assert_sext2:_(<2 x s32>) = COPY %assert_sext2
-
-   ; Extending from the only (known) set bit
-   ; 111...11?
-   %assert_sext3:_(<2 x s32>) = G_ASSERT_SEXT %or, 2
-   %copy_assert_sext3:_(<2 x s32>) = COPY %assert_sext3
-
-   ; Extending from a known set bit, overwriting all of the high set bits.
-   ; 111...1110
-   %assert_sext4:_(<2 x s32>) = G_ASSERT_SEXT %ten_splat, 2
-   %copy_assert_sext4:_(<2 x s32>) = COPY %assert_sext4
-)";
-  setUp(MIRString);
-  if (!TM)
-    return;
-  GISelKnownBits Info(*MF);
-  KnownBits Res;
-  auto GetKB = [&](unsigned Idx) {
-    Register CopyReg = Copies[Idx];
-    auto *Copy = MRI->getVRegDef(CopyReg);
-    return Info.getKnownBits(Copy->getOperand(1).getReg());
-  };
-
-  // Every bit is known to be a 1.
-  Res = GetKB(Copies.size() - 4);
-  EXPECT_EQ(32u, Res.getBitWidth());
-  EXPECT_TRUE(Res.isAllOnes());
-
-  // All bits are unknown
-  Res = GetKB(Copies.size() - 3);
-  EXPECT_EQ(32u, Res.getBitWidth());
-  EXPECT_TRUE(Res.isUnknown());
-
-  // Extending from the only known set bit
-  // 111...11?
-  Res = GetKB(Copies.size() - 2);
-  EXPECT_EQ(32u, Res.getBitWidth());
-  EXPECT_EQ(0xFFFFFFFEu, Res.One.getZExtValue());
-  EXPECT_EQ(0u, Res.Zero.getZExtValue());
-
-  // Extending from a known set bit, overwriting all of the high set bits.
-  // 111...1110
-  Res = GetKB(Copies.size() - 1);
-  EXPECT_EQ(32u, Res.getBitWidth());
-  EXPECT_EQ(0xFFFFFFFEu, Res.One.getZExtValue());
-  EXPECT_EQ(1u, Res.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestVectorKnownBitsBSwapBitReverse) {
-  StringRef MIRString = R"(
-   %const:_(s32) = G_CONSTANT i32 287454020
-   %const_splat:_(<2 x s32>) = G_BUILD_VECTOR %const:_(s32), %const:_(s32)
-   %bswap:_(<2 x s32>) = G_BSWAP %const_splat
-   %bitreverse:_(<2 x s32>) = G_BITREVERSE %const_splat
-   %copy_bswap:_(<2 x s32>) = COPY %bswap
-   %copy_bitreverse:_(<2 x s32>) = COPY %bitreverse
-)";
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  const uint32_t ByteSwappedVal = 0x44332211;
-  const uint32_t BitSwappedVal = 0x22cc4488;
-
-  Register CopyBSwap = Copies[Copies.size() - 2];
-  Register CopyBitReverse = Copies[Copies.size() - 1];
-
-  GISelKnownBits Info(*MF);
-
-  KnownBits BSwapKnown = Info.getKnownBits(CopyBSwap);
-  EXPECT_EQ(32u, BSwapKnown.getBitWidth());
-  EXPECT_EQ(ByteSwappedVal, BSwapKnown.One.getZExtValue());
-  EXPECT_EQ(~ByteSwappedVal, BSwapKnown.Zero.getZExtValue());
-
-  KnownBits BitReverseKnown = Info.getKnownBits(CopyBitReverse);
-  EXPECT_EQ(32u, BitReverseKnown.getBitWidth());
-  EXPECT_EQ(BitSwappedVal, BitReverseKnown.One.getZExtValue());
-  EXPECT_EQ(~BitSwappedVal, BitReverseKnown.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsVectorUMAX) {
-  StringRef MIRString = R"(
-   %ptr:_(p0) = G_IMPLICIT_DEF
-   %unknown:_(<2 x s8>) = G_LOAD %ptr(p0) :: (load (<2 x s8>))
-   %mask0:_(s8) = G_CONSTANT i8 10
-   %mask0_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask0, %mask0
-   %mask1:_(s8) = G_CONSTANT i8 1
-   %mask1_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask1, %mask1
-   %tmp0:_(<2 x s8>) = G_AND %unknown, %mask0_splat
-   %val0:_(<2 x s8>) = G_OR %tmp0, %mask1_splat
-   %mask2:_(s8) = G_CONSTANT i8 3
-   %mask2_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask2, %mask2
-   %mask3:_(s8) = G_CONSTANT i8 12
-   %mask3_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask3, %mask3
-   %tmp1:_(<2 x s8>) = G_AND %unknown, %mask2_splat
-   %val1:_(<2 x s8>) = G_OR %tmp1, %mask3_splat
-   %umax0:_(<2 x s8>) = G_UMAX %val0, %val1
-   %copy_umax0:_(<2 x s8>) = COPY %umax0
-
-   %mask4:_(s8) = G_CONSTANT i8 14
-   %mask4_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask4, %mask4
-   %mask5:_(s8) = G_CONSTANT i8 2
-   %mask5_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask5, %mask5
-   %tmp3:_(<2 x s8>) = G_AND %unknown, %mask4_splat
-   %val3:_(<2 x s8>) = G_OR %tmp3, %mask5_splat
-   %mask6:_(s8) = G_CONSTANT i8 4
-   %mask6_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask6, %mask6
-   %mask7:_(s8) = G_CONSTANT i8 11
-   %mask7_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask7, %mask7
-   %tmp4:_(<2 x s8>) = G_AND %unknown, %mask6_splat
-   %val4:_(<2 x s8>) = G_OR %tmp4, %mask7_splat
-   %umax1:_(<2 x s8>) = G_UMAX %val3, %val4
-   %copy_umax1:_(<2 x s8>) = COPY %umax1
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg0 = Copies[Copies.size() - 2];
-  MachineInstr *FinalCopy0 = MRI->getVRegDef(CopyReg0);
-  Register SrcReg0 = FinalCopy0->getOperand(1).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res0 = Info.getKnownBits(SrcReg0);
-  EXPECT_EQ(0x0Cu, Res0.One.getZExtValue());
-  EXPECT_EQ(0xF0u, Res0.Zero.getZExtValue());
-
-  Register CopyReg1 = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy1 = MRI->getVRegDef(CopyReg1);
-  Register SrcReg1 = FinalCopy1->getOperand(1).getReg();
-  KnownBits Res1 = Info.getKnownBits(SrcReg1);
-  EXPECT_EQ(0x0Au, Res1.One.getZExtValue());
-  EXPECT_EQ(0xF0u, Res1.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestVectorKnownBitsUMax) {
-  StringRef MIRString = R"(
-   %val:_(<2 x s32>) = COPY $x0
-   %zext:_(<2 x s64>) = G_ZEXT %val
-   %const:_(s64) = G_CONSTANT i64 -256
-   %const_splat:_(<2 x s64>) = G_BUILD_VECTOR %const:_(s64), %const:_(s64)
-   %umax:_(<2 x s64>) = G_UMAX %zext, %const_splat
-   %copy_umax:_(<2 x s64>) = COPY %umax
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyUMax = Copies[Copies.size() - 1];
-  GISelKnownBits Info(*MF);
-
-  KnownBits KnownUmax = Info.getKnownBits(CopyUMax);
-  EXPECT_EQ(64u, KnownUmax.getBitWidth());
-  EXPECT_EQ(0xffu, KnownUmax.Zero.getZExtValue());
-  EXPECT_EQ(0xffffffffffffff00, KnownUmax.One.getZExtValue());
-
-  EXPECT_EQ(0xffu, KnownUmax.Zero.getZExtValue());
-  EXPECT_EQ(0xffffffffffffff00, KnownUmax.One.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsVectorUMIN) {
-  StringRef MIRString = R"(
-   %ptr:_(p0) = G_IMPLICIT_DEF
-   %unknown:_(<2 x s8>) = G_LOAD %ptr(p0) :: (load (<2 x s8>))
-   %mask0:_(s8) = G_CONSTANT i8 10
-   %mask0_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask0, %mask0
-   %mask1:_(s8) = G_CONSTANT i8 1
-   %mask1_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask1, %mask1
-   %tmp0:_(<2 x s8>) = G_AND %unknown, %mask0_splat
-   %val0:_(<2 x s8>) = G_OR %tmp0, %mask1_splat
-   %mask2:_(s8) = G_CONSTANT i8 3
-   %mask2_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask2, %mask2
-   %mask3:_(s8) = G_CONSTANT i8 12
-   %mask3_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask3, %mask3
-   %tmp1:_(<2 x s8>) = G_AND %unknown, %mask2_splat
-   %val1:_(<2 x s8>) = G_OR %tmp1, %mask3_splat
-   %umin:_(<2 x s8>) = G_UMIN %val0, %val1
-   %copy_umin:_(<2 x s8>) = COPY %umin
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg0 = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy0 = MRI->getVRegDef(CopyReg0);
-  Register SrcReg0 = FinalCopy0->getOperand(1).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res0 = Info.getKnownBits(SrcReg0);
-  EXPECT_EQ(0x01u, Res0.One.getZExtValue());
-  EXPECT_EQ(0xF4u, Res0.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsVectorSMAX) {
-  StringRef MIRString = R"(
-   %ptr:_(p0) = G_IMPLICIT_DEF
-   %unknown:_(<2 x s8>) = G_LOAD %ptr(p0) :: (load (<2 x s8>))
-   %mask0:_(s8) = G_CONSTANT i8 128
-   %mask0_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask0, %mask0
-   %mask1:_(s8) = G_CONSTANT i8 64
-   %mask1_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask1, %mask1
-   %tmp0:_(<2 x s8>) = G_AND %unknown, %mask0_splat
-   %val0:_(<2 x s8>) = G_OR %tmp0, %mask1_splat
-   %mask2:_(s8) = G_CONSTANT i8 1
-   %mask2_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask2, %mask2
-   %mask3:_(s8) = G_CONSTANT i8 128
-   %mask3_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask3, %mask3
-   %tmp1:_(<2 x s8>) = G_AND %unknown, %mask2_splat
-   %val1:_(<2 x s8>) = G_OR %tmp1, %mask3_splat
-   %smax:_(<2 x s8>) = G_SMAX %val0, %val1
-   %copy_smax:_(<2 x s8>) = COPY %smax
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg0 = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy0 = MRI->getVRegDef(CopyReg0);
-  Register SrcReg0 = FinalCopy0->getOperand(1).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res0 = Info.getKnownBits(SrcReg0);
-  EXPECT_EQ(0x40u, Res0.One.getZExtValue());
-  EXPECT_EQ(0x3Fu, Res0.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsVectorSMIN) {
-  StringRef MIRString = R"(
-   %ptr:_(p0) = G_IMPLICIT_DEF
-   %unknown:_(<2 x s8>) = G_LOAD %ptr(p0) :: (load (<2 x s8>))
-   %mask0:_(s8) = G_CONSTANT i8 128
-   %mask0_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask0, %mask0
-   %mask1:_(s8) = G_CONSTANT i8 64
-   %mask1_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask1, %mask1
-   %tmp0:_(<2 x s8>) = G_AND %unknown, %mask0_splat
-   %val0:_(<2 x s8>) = G_OR %tmp0, %mask1_splat
-   %mask2:_(s8) = G_CONSTANT i8 1
-   %mask2_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask2, %mask2
-   %mask3:_(s8) = G_CONSTANT i8 128
-   %mask3_splat:_(<2 x s8>) = G_BUILD_VECTOR %mask3, %mask3
-   %tmp1:_(<2 x s8>) = G_AND %unknown, %mask2_splat
-   %val1:_(<2 x s8>) = G_OR %tmp1, %mask3_splat
-   %smin:_(<2 x s8>) = G_SMIN %val0, %val1
-   %copy_smin:_(<2 x s8>) = COPY %smin
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyReg0 = Copies[Copies.size() - 1];
-  MachineInstr *FinalCopy0 = MRI->getVRegDef(CopyReg0);
-  Register SrcReg0 = FinalCopy0->getOperand(1).getReg();
-  GISelKnownBits Info(*MF);
-  KnownBits Res0 = Info.getKnownBits(SrcReg0);
-  EXPECT_EQ(0x80u, Res0.One.getZExtValue());
-  EXPECT_EQ(0x7Eu, Res0.Zero.getZExtValue());
-}
-
-TEST_F(AArch64GISelMITest, TestVectorInvalidQueries) {
-  StringRef MIRString = R"(
-   %src:_(<2 x s32>) = COPY $x0
-   %thirty2:_(s32) = G_CONSTANT i32 32
-   %thirty2_splat:_(<2 x s32>) = G_BUILD_VECTOR %thirty2:_(s32), %thirty2:_(s32)
-   %equalSized:_(<2 x s32>) = G_SHL %src, %thirty2_splat
-   %copy1:_(<2 x s32>) = COPY %equalSized
-   %thirty3:_(s32) = G_CONSTANT i32 33
-   %thirty3_splat:_(<2 x s32>) = G_BUILD_VECTOR %thirty3:_(s32), %thirty3:_(s32)
-   %biggerSized:_(<2 x s32>) = G_SHL %src, %thirty3_splat
-   %copy2:_(<2 x s32>) = COPY %biggerSized
-)";
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register EqSizedCopyReg = Copies[Copies.size() - 2];
-  MachineInstr *EqSizedCopy = MRI->getVRegDef(EqSizedCopyReg);
-  Register EqSizedShl = EqSizedCopy->getOperand(1).getReg();
-
-  Register BiggerSizedCopyReg = Copies[Copies.size() - 1];
-  MachineInstr *BiggerSizedCopy = MRI->getVRegDef(BiggerSizedCopyReg);
-  Register BiggerSizedShl = BiggerSizedCopy->getOperand(1).getReg();
-
-  GISelKnownBits Info(*MF);
-  KnownBits EqSizeRes = Info.getKnownBits(EqSizedShl);
-  KnownBits BiggerSizeRes = Info.getKnownBits(BiggerSizedShl);
-
-  EXPECT_TRUE(EqSizeRes.One.isNullValue());
-  EXPECT_TRUE(EqSizeRes.Zero.isNullValue());
-
-  EXPECT_TRUE(BiggerSizeRes.One.isNullValue());
-  EXPECT_TRUE(BiggerSizeRes.Zero.isNullValue());
-}
-
-TEST_F(AArch64GISelMITest, TestKnownBitsVectorAssertZext) {
-  StringRef MIRString = R"(
-   %copy_x0:_(s64) = COPY $x0
-   %copy_x1:_(s64) = COPY $x1
-   %x0_x1:_(<2 x s64>) = G_BUILD_VECTOR %copy_x0, %copy_x1
-
-   %assert8:_(<2 x s64>) = G_ASSERT_ZEXT %x0_x1, 8
-   %copy_assert8:_(<2 x s64>) = COPY %assert8
-
-   %assert1:_(<2 x s64>) = G_ASSERT_ZEXT %x0_x1, 1
-   %copy_assert1:_(<2 x s64>) = COPY %assert1
-
-   %assert63:_(<2 x s64>) = G_ASSERT_ZEXT %x0_x1, 63
-   %copy_assert63:_(<2 x s64>) = COPY %assert63
-
-   %assert3:_(<2 x s64>) = G_ASSERT_ZEXT %x0_x1, 3
-   %copy_assert3:_(<2 x s64>) = COPY %assert3
-)";
-
-  setUp(MIRString);
-  if (!TM)
-    return;
-
-  Register CopyAssert8 = Copies[Copies.size() - 4];
-  Register CopyAssert1 = Copies[Copies.size() - 3];
-  Register CopyAssert63 = Copies[Copies.size() - 2];
-  Register CopyAssert3 = Copies[Copies.size() - 1];
-
-  GISelKnownBits Info(*MF);
-  MachineInstr *Copy;
-  Register SrcReg;
-  KnownBits Res;
-
-  // Assert zero-extension from an 8-bit value.
-  Copy = MRI->getVRegDef(CopyAssert8);
-  SrcReg = Copy->getOperand(1).getReg();
-  Res = Info.getKnownBits(SrcReg);
-  EXPECT_EQ(64u, Res.getBitWidth());
-  EXPECT_EQ(0u, Res.One.getZExtValue());
-  EXPECT_EQ(0xFFFFFFFFFFFFFF00u, Res.Zero.getZExtValue());
-
-  // Assert zero-extension from a 1-bit value.
-  Copy = MRI->getVRegDef(CopyAssert1);
-  SrcReg = Copy->getOperand(1).getReg();
-  Res = Info.getKnownBits(SrcReg);
-  EXPECT_EQ(64u, Res.getBitWidth());
-  EXPECT_EQ(0u, Res.One.getZExtValue());
-  EXPECT_EQ(0xFFFFFFFFFFFFFFFE, Res.Zero.getZExtValue());
-
-  // Assert zero-extension from a 63-bit value.
-  Copy = MRI->getVRegDef(CopyAssert63);
-  SrcReg = Copy->getOperand(1).getReg();
-  Res = Info.getKnownBits(SrcReg);
-  EXPECT_EQ(64u, Res.getBitWidth());
-  EXPECT_EQ(0u, Res.One.getZExtValue());
-  EXPECT_EQ(0x8000000000000000u, Res.Zero.getZExtValue());
-
-  // Assert zero-extension from a 3-bit value.
-  Copy = MRI->getVRegDef(CopyAssert3);
-  SrcReg = Copy->getOperand(1).getReg();
-  Res = Info.getKnownBits(SrcReg);
-  EXPECT_EQ(64u, Res.getBitWidth());
-  EXPECT_EQ(0u, Res.One.getZExtValue());
-  EXPECT_EQ(0xFFFFFFFFFFFFFFF8u, Res.Zero.getZExtValue());
-}
diff --git a/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/LegalizerHelperTest.cpp b/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/LegalizerHelperTest.cpp
deleted file mode 100644
index b5f6e64b245..00000000000
--- a/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/LegalizerHelperTest.cpp
+++ /dev/null
@@ -1,4057 +0,0 @@
-//===- LegalizerHelperTest.cpp
-//-----------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "GISelMITest.h"
-#include "llvm/CodeGen/GlobalISel/LostDebugLocObserver.h"
-
-using namespace LegalizeActions;
-using namespace LegalizeMutations;
-using namespace LegalityPredicates;
-
-namespace {
-
-class DummyGISelObserver : public GISelChangeObserver {
-public:
-  void changingInstr(MachineInstr &MI) override {}
-  void changedInstr(MachineInstr &MI) override {}
-  void createdInstr(MachineInstr &MI) override {}
-  void erasingInstr(MachineInstr &MI) override {}
-};
-
-// Test G_ROTL/G_ROTR lowering.
-TEST_F(AArch64GISelMITest, LowerRotates) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder({G_ROTR, G_ROTL}).lower(); });
-
-  LLT S32 = LLT::scalar(32);
-  auto Src = B.buildTrunc(S32, Copies[0]);
-  auto Amt = B.buildTrunc(S32, Copies[1]);
-  auto ROTR = B.buildInstr(TargetOpcode::G_ROTR, {S32}, {Src, Amt});
-  auto ROTL = B.buildInstr(TargetOpcode::G_ROTL, {S32}, {Src, Amt});
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  // Perform Legalization
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*ROTR, 0, S32));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*ROTL, 0, S32));
-
-  auto CheckStr = R"(
-  ; Check G_ROTR
-  CHECK: [[SRC:%[0-9]+]]:_(s32) = G_TRUNC
-  CHECK: [[AMT:%[0-9]+]]:_(s32) = G_TRUNC
-  CHECK: [[C:%[0-9]+]]:_(s32) = G_CONSTANT i32 0
-  CHECK: [[C1:%[0-9]+]]:_(s32) = G_CONSTANT i32 31
-  CHECK: [[SUB:%[0-9]+]]:_(s32) = G_SUB [[C]]:_, [[AMT]]:_
-  CHECK: [[AND:%[0-9]+]]:_(s32) = G_AND [[AMT]]:_, [[C1]]:_
-  CHECK: [[LSHR:%[0-9]+]]:_(s32) = G_LSHR [[SRC]]:_, [[AND]]:_(s32)
-  CHECK: [[AND1:%[0-9]+]]:_(s32) = G_AND [[SUB]]:_, [[C1]]:_
-  CHECK: [[SHL:%[0-9]+]]:_(s32) = G_SHL [[SRC]]:_, [[AND1]]:_(s32)
-  CHECK: G_OR [[LSHR]]:_, [[SHL]]:_
-
-  ; Check G_ROTL
-  CHECK: [[C:%[0-9]+]]:_(s32) = G_CONSTANT i32 0
-  CHECK: [[C1:%[0-9]+]]:_(s32) = G_CONSTANT i32 31
-  CHECK: [[SUB:%[0-9]+]]:_(s32) = G_SUB [[C]]:_, [[AMT]]:_
-  CHECK: [[AND:%[0-9]+]]:_(s32) = G_AND [[AMT]]:_, [[C1]]:_
-  CHECK: [[SHL:%[0-9]+]]:_(s32) = G_SHL [[SRC]]:_, [[AND]]:_(s32)
-  CHECK: [[AND1:%[0-9]+]]:_(s32) = G_AND [[SUB]]:_, [[C1]]:_
-  CHECK: [[LSHR:%[0-9]+]]:_(s32) = G_LSHR [[SRC]]:_, [[AND1]]:_(s32)
-  CHECK: G_OR [[SHL]]:_, [[LSHR]]:_
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-// Test G_ROTL/G_ROTR non-pow2 lowering.
-TEST_F(AArch64GISelMITest, LowerRotatesNonPow2) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder({G_ROTR, G_ROTL}).lower(); });
-
-  LLT S24 = LLT::scalar(24);
-  auto Src = B.buildTrunc(S24, Copies[0]);
-  auto Amt = B.buildTrunc(S24, Copies[1]);
-  auto ROTR = B.buildInstr(TargetOpcode::G_ROTR, {S24}, {Src, Amt});
-  auto ROTL = B.buildInstr(TargetOpcode::G_ROTL, {S24}, {Src, Amt});
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  // Perform Legalization
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*ROTR, 0, S24));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*ROTL, 0, S24));
-
-  auto CheckStr = R"(
-  ; Check G_ROTR
-  CHECK: [[SRC:%[0-9]+]]:_(s24) = G_TRUNC
-  CHECK: [[AMT:%[0-9]+]]:_(s24) = G_TRUNC
-  CHECK: [[C:%[0-9]+]]:_(s24) = G_CONSTANT i24 0
-  CHECK: [[C1:%[0-9]+]]:_(s24) = G_CONSTANT i24 23
-  CHECK: [[C2:%[0-9]+]]:_(s24) = G_CONSTANT i24 24
-  CHECK: [[UREM:%[0-9]+]]:_(s24) = G_UREM [[AMT]]:_, [[C2]]:_
-  CHECK: [[LSHR:%[0-9]+]]:_(s24) = G_LSHR [[SRC]]:_, [[UREM]]:_(s24)
-  CHECK: [[SUB:%[0-9]+]]:_(s24) = G_SUB [[C1]]:_, [[UREM]]:_
-  CHECK: [[C4:%[0-9]+]]:_(s24) = G_CONSTANT i24 1
-  CHECK: [[SHL:%[0-9]+]]:_(s24) = G_SHL [[SRC]]:_, [[C4]]:_(s24)
-  CHECK: [[SHL2:%[0-9]+]]:_(s24) = G_SHL [[SHL]]:_, [[SUB]]:_(s24)
-  CHECK: G_OR [[LSHR]]:_, [[SHL2]]:_
-
-  ; Check G_ROTL
-  CHECK: [[C:%[0-9]+]]:_(s24) = G_CONSTANT i24 0
-  CHECK: [[C1:%[0-9]+]]:_(s24) = G_CONSTANT i24 23
-  CHECK: [[C2:%[0-9]+]]:_(s24) = G_CONSTANT i24 24
-  CHECK: [[UREM:%[0-9]+]]:_(s24) = G_UREM [[AMT]]:_, [[C2]]:_
-  CHECK: [[SHL:%[0-9]+]]:_(s24) = G_SHL [[SRC]]:_, [[UREM]]:_(s24)
-  CHECK: [[SUB:%[0-9]+]]:_(s24) = G_SUB [[C1]]:_, [[UREM]]:_
-  CHECK: [[C4:%[0-9]+]]:_(s24) = G_CONSTANT i24 1
-  CHECK: [[LSHR:%[0-9]+]]:_(s24) = G_LSHR [[SRC]]:_, [[C4]]:_(s24)
-  CHECK: [[LSHR2:%[0-9]+]]:_(s24) = G_LSHR [[LSHR]]:_, [[SUB]]:_(s24)
-  CHECK: G_OR [[SHL]]:_, [[LSHR2]]:_
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-// Test vector G_ROTR lowering.
-TEST_F(AArch64GISelMITest, LowerRotatesVector) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder({G_ROTR, G_ROTL}).lower(); });
-
-  LLT S32 = LLT::scalar(32);
-  LLT V4S32 = LLT::fixed_vector(4, S32);
-  auto SrcTrunc = B.buildTrunc(S32, Copies[0]);
-  auto Src = B.buildSplatVector(V4S32, SrcTrunc);
-  auto AmtTrunc = B.buildTrunc(S32, Copies[1]);
-  auto Amt = B.buildSplatVector(V4S32, AmtTrunc);
-  auto ROTR = B.buildInstr(TargetOpcode::G_ROTR, {V4S32}, {Src, Amt});
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  // Perform Legalization
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*ROTR, 0, V4S32));
-
-  auto CheckStr = R"(
-  CHECK: [[SRCTRUNC:%[0-9]+]]:_(s32) = G_TRUNC
-  CHECK: [[SRC:%[0-9]+]]:_(<4 x s32>) = G_BUILD_VECTOR [[SRCTRUNC]]
-  CHECK: [[AMTTRUNC:%[0-9]+]]:_(s32) = G_TRUNC
-  CHECK: [[AMT:%[0-9]+]]:_(<4 x s32>) = G_BUILD_VECTOR [[AMTTRUNC]]
-  CHECK: [[C:%[0-9]+]]:_(s32) = G_CONSTANT i32 0
-  CHECK: [[ZERO:%[0-9]+]]:_(<4 x s32>) = G_BUILD_VECTOR [[C]]
-  CHECK: [[C1:%[0-9]+]]:_(s32) = G_CONSTANT i32 31
-  CHECK: [[VEC31:%[0-9]+]]:_(<4 x s32>) = G_BUILD_VECTOR [[C1]]
-  CHECK: [[SUB:%[0-9]+]]:_(<4 x s32>) = G_SUB [[ZERO]]:_, [[AMT]]:_
-  CHECK: [[AND:%[0-9]+]]:_(<4 x s32>) = G_AND [[AMT]]:_, [[VEC31]]:_
-  CHECK: [[LSHR:%[0-9]+]]:_(<4 x s32>) = G_LSHR [[SRC]]:_, [[AND]]:_(<4 x s32>)
-  CHECK: [[AND1:%[0-9]+]]:_(<4 x s32>) = G_AND [[SUB]]:_, [[VEC31]]:_
-  CHECK: [[SHL:%[0-9]+]]:_(<4 x s32>) = G_SHL [[SRC]]:_, [[AND1]]:_(<4 x s32>)
-  CHECK: G_OR [[LSHR]]:_, [[SHL]]:_
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-// Test CTTZ expansion when CTTZ_ZERO_UNDEF is legal or custom,
-// in which case it becomes CTTZ_ZERO_UNDEF with select.
-TEST_F(AArch64GISelMITest, LowerBitCountingCTTZ0) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_CTTZ_ZERO_UNDEF).legalFor({{s32, s64}});
-  });
-  // Build Instr
-  auto MIBCTTZ =
-      B.buildInstr(TargetOpcode::G_CTTZ, {LLT::scalar(32)}, {Copies[0]});
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  // Perform Legalization
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*MIBCTTZ, 0, LLT::scalar(64)));
-
-  auto CheckStr = R"(
-  CHECK: [[CZU:%[0-9]+]]:_(s32) = G_CTTZ_ZERO_UNDEF %0
-  CHECK: [[ZERO:%[0-9]+]]:_(s64) = G_CONSTANT i64 0
-  CHECK: [[CMP:%[0-9]+]]:_(s1) = G_ICMP intpred(eq), %0:_(s64), [[ZERO]]
-  CHECK: [[SIXTY4:%[0-9]+]]:_(s32) = G_CONSTANT i32 64
-  CHECK: [[SEL:%[0-9]+]]:_(s32) = G_SELECT [[CMP]]:_(s1), [[SIXTY4]]:_, [[CZU]]
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-// CTTZ expansion in terms of CTLZ
-TEST_F(AArch64GISelMITest, LowerBitCountingCTTZ1) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_CTLZ).legalFor({{s64, s64}});
-  });
-  // Build Instr
-  auto MIBCTTZ =
-      B.buildInstr(TargetOpcode::G_CTTZ, {LLT::scalar(64)}, {Copies[0]});
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  // Perform Legalization
-  EXPECT_TRUE(Helper.lower(*MIBCTTZ, 0, LLT::scalar(64)) ==
-              LegalizerHelper::LegalizeResult::Legalized);
-
-  auto CheckStr = R"(
-  CHECK: [[NEG1:%[0-9]+]]:_(s64) = G_CONSTANT i64 -1
-  CHECK: [[NOT:%[0-9]+]]:_(s64) = G_XOR %0:_, [[NEG1]]
-  CHECK: [[SUB1:%[0-9]+]]:_(s64) = G_ADD %0:_, [[NEG1]]
-  CHECK: [[AND1:%[0-9]+]]:_(s64) = G_AND [[NOT]]:_, [[SUB1]]:_
-  CHECK: [[CST64:%[0-9]+]]:_(s64) = G_CONSTANT i64 64
-  CHECK: [[CTLZ:%[0-9]+]]:_(s64) = G_CTLZ [[AND1]]:_
-  CHECK: G_SUB [[CST64]]:_, [[CTLZ]]:_
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-// CTLZ scalar narrowing
-TEST_F(AArch64GISelMITest, NarrowScalarCTLZ) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_CTLZ).legalFor({{s32, s32}});
-  });
-  // Build Instr
-  auto CTLZ =
-      B.buildInstr(TargetOpcode::G_CTLZ, {LLT::scalar(32)}, {Copies[0]});
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  // Perform Legalization
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.narrowScalar(*CTLZ, 1, LLT::scalar(32)));
-
-  auto CheckStr = R"(
-  CHECK: [[UNMERGE_LO:%[0-9]+]]:_(s32), [[UNMERGE_HI:%[0-9]+]]:_(s32) = G_UNMERGE_VALUES %0:_(s64)
-  CHECK: [[ZERO:%[0-9]+]]:_(s32) = G_CONSTANT i32 0
-  CHECK: [[CMP:%[0-9]+]]:_(s1) = G_ICMP intpred(eq), [[UNMERGE_HI]]:_(s32), [[ZERO]]:_
-  CHECK: [[CTLZ_LO:%[0-9]+]]:_(s32) = G_CTLZ [[UNMERGE_LO]]:_(s32)
-  CHECK: [[THIRTYTWO:%[0-9]+]]:_(s32) = G_CONSTANT i32 32
-  CHECK: [[ADD:%[0-9]+]]:_(s32) = G_ADD [[CTLZ_LO]]:_, [[THIRTYTWO]]:_
-  CHECK: [[CTLZ_HI:%[0-9]+]]:_(s32) = G_CTLZ_ZERO_UNDEF [[UNMERGE_HI]]:_(s32)
-  CHECK: %{{[0-9]+}}:_(s32) = G_SELECT [[CMP]]:_(s1), [[ADD]]:_, [[CTLZ_HI]]:_
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-// CTTZ scalar narrowing
-TEST_F(AArch64GISelMITest, NarrowScalarCTTZ) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_CTTZ).legalFor({{s32, s64}});
-  });
-  // Build Instr
-  auto CTTZ =
-      B.buildInstr(TargetOpcode::G_CTTZ, {LLT::scalar(32)}, {Copies[0]});
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  // Perform Legalization
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.narrowScalar(*CTTZ, 1, LLT::scalar(32)));
-
-  auto CheckStr = R"(
-  CHECK: [[UNMERGE_LO:%[0-9]+]]:_(s32), [[UNMERGE_HI:%[0-9]+]]:_(s32) = G_UNMERGE_VALUES %0:_(s64)
-  CHECK: [[ZERO:%[0-9]+]]:_(s32) = G_CONSTANT i32 0
-  CHECK: [[CMP:%[0-9]+]]:_(s1) = G_ICMP intpred(eq), [[UNMERGE_LO]]:_(s32), [[ZERO]]:_
-  CHECK: [[CTTZ_HI:%[0-9]+]]:_(s32) = G_CTTZ [[UNMERGE_HI]]:_(s32)
-  CHECK: [[THIRTYTWO:%[0-9]+]]:_(s32) = G_CONSTANT i32 32
-  CHECK: [[ADD:%[0-9]+]]:_(s32) = G_ADD [[CTTZ_HI]]:_, [[THIRTYTWO]]:_
-  CHECK: [[CTTZ_LO:%[0-9]+]]:_(s32) = G_CTTZ_ZERO_UNDEF [[UNMERGE_LO]]:_(s32)
-  CHECK: %{{[0-9]+}}:_(s32) = G_SELECT [[CMP]]:_(s1), [[ADD]]:_, [[CTTZ_LO]]:_
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-// CTTZ expansion in terms of CTPOP
-TEST_F(AArch64GISelMITest, LowerBitCountingCTTZ2) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_CTPOP).legalFor({{s64, s64}});
-  });
-  // Build
-  auto MIBCTTZ =
-      B.buildInstr(TargetOpcode::G_CTTZ, {LLT::scalar(64)}, {Copies[0]});
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-
-  B.setInsertPt(*EntryMBB, MIBCTTZ->getIterator());
-  EXPECT_TRUE(Helper.lower(*MIBCTTZ, 0, LLT::scalar(64)) ==
-              LegalizerHelper::LegalizeResult::Legalized);
-
-  auto CheckStr = R"(
-  CHECK: [[NEG1:%[0-9]+]]:_(s64) = G_CONSTANT i64 -1
-  CHECK: [[NOT:%[0-9]+]]:_(s64) = G_XOR %0:_, [[NEG1]]
-  CHECK: [[SUB1:%[0-9]+]]:_(s64) = G_ADD %0:_, [[NEG1]]
-  CHECK: [[AND1:%[0-9]+]]:_(s64) = G_AND [[NOT]]:_, [[SUB1]]:_
-  CHECK: [[POP:%[0-9]+]]:_(s64) = G_CTPOP [[AND1]]
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-// CTPOP widening.
-TEST_F(AArch64GISelMITest, WidenBitCountingCTPOP1) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-      getActionDefinitionsBuilder(G_CTPOP).legalFor({{s16, s16}});
-    });
-
-  // Build
-  // Trunc it to s8.
-  LLT s8{LLT::scalar(8)};
-  LLT s16{LLT::scalar(16)};
-  auto MIBTrunc = B.buildTrunc(s8, Copies[0]);
-  auto MIBCTPOP = B.buildInstr(TargetOpcode::G_CTPOP, {s16}, {MIBTrunc});
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  B.setInstr(*MIBCTPOP);
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.widenScalar(*MIBCTPOP, 1, s16));
-
-  auto CheckStr = R"(
-  CHECK: [[TRUNC:%[0-9]+]]:_(s8) = G_TRUNC %0:_(s64)
-  CHECK: [[ZEXT:%[0-9]+]]:_(s16) = G_ZEXT [[TRUNC]]:_(s8)
-  CHECK: [[CTPOP:%[0-9]+]]:_(s16) = G_CTPOP [[ZEXT]]
-  CHECK: [[COPY:%[0-9]+]]:_(s16) = COPY [[CTPOP]]:_(s16)
-  )";
-
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-// Test a strange case where the result is wider than the source
-TEST_F(AArch64GISelMITest, WidenBitCountingCTPOP2) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-      getActionDefinitionsBuilder(G_CTPOP).legalFor({{s32, s16}});
-    });
-
-  // Build
-  // Trunc it to s8.
-  LLT s8{LLT::scalar(8)};
-  LLT s16{LLT::scalar(16)};
-  LLT s32{LLT::scalar(32)};
-  auto MIBTrunc = B.buildTrunc(s8, Copies[0]);
-  auto MIBCTPOP = B.buildInstr(TargetOpcode::G_CTPOP, {s32}, {MIBTrunc});
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  B.setInstr(*MIBCTPOP);
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.widenScalar(*MIBCTPOP, 1, s16));
-
-  auto CheckStr = R"(
-  CHECK: [[TRUNC:%[0-9]+]]:_(s8) = G_TRUNC %0:_(s64)
-  CHECK: [[ZEXT:%[0-9]+]]:_(s16) = G_ZEXT [[TRUNC]]:_(s8)
-  CHECK: [[CTPOP:%[0-9]+]]:_(s16) = G_CTPOP [[ZEXT]]
-  CHECK: [[COPY:%[0-9]+]]:_(s32) = G_ZEXT [[CTPOP]]:_(s16)
-  )";
-
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-// CTTZ_ZERO_UNDEF expansion in terms of CTTZ
-TEST_F(AArch64GISelMITest, LowerBitCountingCTTZ3) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_CTTZ).legalFor({{s64, s64}});
-  });
-  // Build
-  auto MIBCTTZ = B.buildInstr(TargetOpcode::G_CTTZ_ZERO_UNDEF,
-                              {LLT::scalar(64)}, {Copies[0]});
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  EXPECT_TRUE(Helper.lower(*MIBCTTZ, 0, LLT::scalar(64)) ==
-              LegalizerHelper::LegalizeResult::Legalized);
-
-  auto CheckStr = R"(
-  CHECK: CTTZ
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-// CTLZ expansion in terms of CTLZ_ZERO_UNDEF
-TEST_F(AArch64GISelMITest, LowerBitCountingCTLZ0) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_CTLZ_ZERO_UNDEF).legalFor({{s64, s64}});
-  });
-  // Build
-  auto MIBCTLZ =
-      B.buildInstr(TargetOpcode::G_CTLZ, {LLT::scalar(64)}, {Copies[0]});
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  EXPECT_TRUE(Helper.lower(*MIBCTLZ, 0, LLT::scalar(64)) ==
-              LegalizerHelper::LegalizeResult::Legalized);
-
-  auto CheckStr = R"(
-  CHECK: [[CZU:%[0-9]+]]:_(s64) = G_CTLZ_ZERO_UNDEF %0
-  CHECK: [[ZERO:%[0-9]+]]:_(s64) = G_CONSTANT i64 0
-  CHECK: [[CMP:%[0-9]+]]:_(s1) = G_ICMP intpred(eq), %0:_(s64), [[ZERO]]
-  CHECK: [[SIXTY4:%[0-9]+]]:_(s64) = G_CONSTANT i64 64
-  CHECK: [[SEL:%[0-9]+]]:_(s64) = G_SELECT [[CMP]]:_(s1), [[SIXTY4]]:_, [[CZU]]
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-// CTLZ expansion in terms of CTLZ_ZERO_UNDEF if the latter is a libcall
-TEST_F(AArch64GISelMITest, LowerBitCountingCTLZLibcall) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_CTLZ_ZERO_UNDEF).libcallFor({{s32, s64}});
-  });
-  // Build
-  auto MIBCTLZ =
-      B.buildInstr(TargetOpcode::G_CTLZ, {LLT::scalar(32)}, {Copies[0]});
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*MIBCTLZ, 0, LLT::scalar(32)));
-
-  auto CheckStr = R"(
-  CHECK: [[CZU:%[0-9]+]]:_(s32) = G_CTLZ_ZERO_UNDEF %0
-  CHECK: [[ZERO:%[0-9]+]]:_(s64) = G_CONSTANT i64 0
-  CHECK: [[CMP:%[0-9]+]]:_(s1) = G_ICMP intpred(eq), %0:_(s64), [[ZERO]]
-  CHECK: [[THIRTY2:%[0-9]+]]:_(s32) = G_CONSTANT i32 64
-  CHECK: [[SEL:%[0-9]+]]:_(s32) = G_SELECT [[CMP]]:_(s1), [[THIRTY2]]:_, [[CZU]]
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-// CTLZ expansion
-TEST_F(AArch64GISelMITest, LowerBitCountingCTLZ1) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_CTPOP).legalFor({{s8, s8}});
-  });
-  // Build
-  // Trunc it to s8.
-  LLT s8{LLT::scalar(8)};
-  auto MIBTrunc = B.buildTrunc(s8, Copies[0]);
-  auto MIBCTLZ = B.buildInstr(TargetOpcode::G_CTLZ, {s8}, {MIBTrunc});
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  EXPECT_TRUE(Helper.lower(*MIBCTLZ, 0, s8) ==
-              LegalizerHelper::LegalizeResult::Legalized);
-
-  auto CheckStr = R"(
-  CHECK: [[Trunc:%[0-9]+]]:_(s8) = G_TRUNC
-  CHECK: [[Cst1:%[0-9]+]]:_(s8) = G_CONSTANT i8 1
-  CHECK: [[Sh1:%[0-9]+]]:_(s8) = G_LSHR [[Trunc]]:_, [[Cst1]]:_
-  CHECK: [[Or1:%[0-9]+]]:_(s8) = G_OR [[Trunc]]:_, [[Sh1]]:_
-  CHECK: [[Cst2:%[0-9]+]]:_(s8) = G_CONSTANT i8 2
-  CHECK: [[Sh2:%[0-9]+]]:_(s8) = G_LSHR [[Or1]]:_, [[Cst2]]:_
-  CHECK: [[Or2:%[0-9]+]]:_(s8) = G_OR [[Or1]]:_, [[Sh2]]:_
-  CHECK: [[Cst4:%[0-9]+]]:_(s8) = G_CONSTANT i8 4
-  CHECK: [[Sh4:%[0-9]+]]:_(s8) = G_LSHR [[Or2]]:_, [[Cst4]]:_
-  CHECK: [[Or4:%[0-9]+]]:_(s8) = G_OR [[Or2]]:_, [[Sh4]]:_
-  CHECK: [[CTPOP:%[0-9]+]]:_(s8) = G_CTPOP [[Or4]]:_
-  CHECK: [[Len:%[0-9]+]]:_(s8) = G_CONSTANT i8 8
-  CHECK: [[Sub:%[0-9]+]]:_(s8) = G_SUB [[Len]]:_, [[CTPOP]]:_
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-// CTLZ widening.
-TEST_F(AArch64GISelMITest, WidenBitCountingCTLZ) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_CTLZ).legalFor({{s16, s16}});
-  });
-  // Build
-  // Trunc it to s8.
-  LLT s8{LLT::scalar(8)};
-  LLT s16{LLT::scalar(16)};
-  auto MIBTrunc = B.buildTrunc(s8, Copies[0]);
-  auto MIBCTLZ = B.buildInstr(TargetOpcode::G_CTLZ, {s8}, {MIBTrunc});
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  EXPECT_TRUE(Helper.widenScalar(*MIBCTLZ, 1, s16) ==
-              LegalizerHelper::LegalizeResult::Legalized);
-
-  auto CheckStr = R"(
-  CHECK: [[Trunc:%[0-9]+]]:_(s8) = G_TRUNC
-  CHECK: [[Zext:%[0-9]+]]:_(s16) = G_ZEXT [[Trunc]]
-  CHECK: [[Ctlz:%[0-9]+]]:_(s16) = G_CTLZ [[Zext]]
-  CHECK: [[Cst8:%[0-9]+]]:_(s16) = G_CONSTANT i16 8
-  CHECK: [[Sub:%[0-9]+]]:_(s16) = G_SUB [[Ctlz]]:_, [[Cst8]]:_
-  CHECK: [[Trunc:%[0-9]+]]:_(s8) = G_TRUNC [[Sub]]
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-// CTLZ_ZERO_UNDEF widening.
-TEST_F(AArch64GISelMITest, WidenBitCountingCTLZZeroUndef) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_CTLZ_ZERO_UNDEF).legalFor({{s16, s16}});
-  });
-  // Build
-  // Trunc it to s8.
-  LLT s8{LLT::scalar(8)};
-  LLT s16{LLT::scalar(16)};
-  auto MIBTrunc = B.buildTrunc(s8, Copies[0]);
-  auto MIBCTLZ_ZU =
-      B.buildInstr(TargetOpcode::G_CTLZ_ZERO_UNDEF, {s8}, {MIBTrunc});
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  EXPECT_TRUE(Helper.widenScalar(*MIBCTLZ_ZU, 1, s16) ==
-              LegalizerHelper::LegalizeResult::Legalized);
-
-  auto CheckStr = R"(
-  CHECK: [[Trunc:%[0-9]+]]:_(s8) = G_TRUNC
-  CHECK: [[Zext:%[0-9]+]]:_(s16) = G_ZEXT [[Trunc]]
-  CHECK: [[CtlzZu:%[0-9]+]]:_(s16) = G_CTLZ_ZERO_UNDEF [[Zext]]
-  CHECK: [[Cst8:%[0-9]+]]:_(s16) = G_CONSTANT i16 8
-  CHECK: [[Sub:%[0-9]+]]:_(s16) = G_SUB [[CtlzZu]]:_, [[Cst8]]:_
-  CHECK: [[Trunc:%[0-9]+]]:_(s8) = G_TRUNC [[Sub]]
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-// CTPOP widening.
-TEST_F(AArch64GISelMITest, WidenBitCountingCTPOP) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_CTPOP).legalFor({{s16, s16}});
-  });
-  // Build
-  // Trunc it to s8.
-  LLT s8{LLT::scalar(8)};
-  LLT s16{LLT::scalar(16)};
-  auto MIBTrunc = B.buildTrunc(s8, Copies[0]);
-  auto MIBCTPOP = B.buildInstr(TargetOpcode::G_CTPOP, {s8}, {MIBTrunc});
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  EXPECT_TRUE(Helper.widenScalar(*MIBCTPOP, 1, s16) ==
-              LegalizerHelper::LegalizeResult::Legalized);
-
-  auto CheckStr = R"(
-  CHECK: [[Trunc:%[0-9]+]]:_(s8) = G_TRUNC
-  CHECK: [[Zext:%[0-9]+]]:_(s16) = G_ZEXT [[Trunc]]
-  CHECK: [[Ctpop:%[0-9]+]]:_(s16) = G_CTPOP [[Zext]]
-  CHECK: [[Trunc:%[0-9]+]]:_(s8) = G_TRUNC [[Ctpop]]
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-// CTTZ_ZERO_UNDEF widening.
-TEST_F(AArch64GISelMITest, WidenBitCountingCTTZ_ZERO_UNDEF) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_CTTZ_ZERO_UNDEF).legalFor({{s16, s16}});
-  });
-  // Build
-  // Trunc it to s8.
-  LLT s8{LLT::scalar(8)};
-  LLT s16{LLT::scalar(16)};
-  auto MIBTrunc = B.buildTrunc(s8, Copies[0]);
-  auto MIBCTTZ_ZERO_UNDEF =
-      B.buildInstr(TargetOpcode::G_CTTZ_ZERO_UNDEF, {s8}, {MIBTrunc});
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  EXPECT_TRUE(Helper.widenScalar(*MIBCTTZ_ZERO_UNDEF, 1, s16) ==
-              LegalizerHelper::LegalizeResult::Legalized);
-
-  auto CheckStr = R"(
-  CHECK: [[Trunc:%[0-9]+]]:_(s8) = G_TRUNC
-  CHECK: [[Zext:%[0-9]+]]:_(s16) = G_ZEXT [[Trunc]]
-  CHECK: [[CttzZu:%[0-9]+]]:_(s16) = G_CTTZ_ZERO_UNDEF [[Zext]]
-  CHECK: [[Trunc:%[0-9]+]]:_(s8) = G_TRUNC [[CttzZu]]
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-// CTTZ widening.
-TEST_F(AArch64GISelMITest, WidenBitCountingCTTZ) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_CTTZ).legalFor({{s16, s16}});
-  });
-  // Build
-  // Trunc it to s8.
-  LLT s8{LLT::scalar(8)};
-  LLT s16{LLT::scalar(16)};
-  auto MIBTrunc = B.buildTrunc(s8, Copies[0]);
-  auto MIBCTTZ = B.buildInstr(TargetOpcode::G_CTTZ, {s8}, {MIBTrunc});
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  EXPECT_TRUE(Helper.widenScalar(*MIBCTTZ, 1, s16) ==
-              LegalizerHelper::LegalizeResult::Legalized);
-
-  auto CheckStr = R"(
-  CHECK: [[Trunc:%[0-9]+]]:_(s8) = G_TRUNC
-  CHECK: [[Zext:%[0-9]+]]:_(s16) = G_ZEXT [[Trunc]]
-  CHECK: [[Cst:%[0-9]+]]:_(s16) = G_CONSTANT i16 256
-  CHECK: [[Or:%[0-9]+]]:_(s16) = G_OR [[Zext]]:_, [[Cst]]
-  CHECK: [[Cttz:%[0-9]+]]:_(s16) = G_CTTZ [[Or]]
-  CHECK: [[Trunc:%[0-9]+]]:_(s8) = G_TRUNC [[Cttz]]
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-// UADDO widening.
-TEST_F(AArch64GISelMITest, WidenUADDO) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_ADD).legalFor({{s16, s16}});
-  });
-  // Build
-  // Trunc it to s8.
-  LLT s8{LLT::scalar(8)};
-  LLT s16{LLT::scalar(16)};
-  auto MIBTrunc = B.buildTrunc(s8, Copies[0]);
-  unsigned CarryReg = MRI->createGenericVirtualRegister(LLT::scalar(1));
-  auto MIBUAddO =
-      B.buildInstr(TargetOpcode::G_UADDO, {s8, CarryReg}, {MIBTrunc, MIBTrunc});
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  EXPECT_TRUE(Helper.widenScalar(*MIBUAddO, 0, s16) ==
-              LegalizerHelper::LegalizeResult::Legalized);
-
-  auto CheckStr = R"(
-  CHECK: [[Trunc:%[0-9]+]]:_(s8) = G_TRUNC
-  CHECK: [[LHS:%[0-9]+]]:_(s16) = G_ZEXT [[Trunc]]
-  CHECK: [[RHS:%[0-9]+]]:_(s16) = G_ZEXT [[Trunc]]
-  CHECK: [[ADD:%[0-9]+]]:_(s16) = G_ADD [[LHS]]:_, [[RHS]]:_
-  CHECK: [[TRUNC1:%[0-9]+]]:_(s8) = G_TRUNC [[ADD]]
-  CHECK: [[ZEXT:%[0-9]+]]:_(s16) = G_ZEXT [[TRUNC1]]
-  CHECK: G_ICMP intpred(ne), [[ADD]]:_(s16), [[ZEXT]]:_
-  CHECK: G_TRUNC [[ADD]]
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-// USUBO widening.
-TEST_F(AArch64GISelMITest, WidenUSUBO) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_SUB).legalFor({{s16, s16}});
-  });
-  // Build
-  // Trunc it to s8.
-  LLT s8{LLT::scalar(8)};
-  LLT s16{LLT::scalar(16)};
-  auto MIBTrunc = B.buildTrunc(s8, Copies[0]);
-  unsigned CarryReg = MRI->createGenericVirtualRegister(LLT::scalar(1));
-  auto MIBUSUBO =
-      B.buildInstr(TargetOpcode::G_USUBO, {s8, CarryReg}, {MIBTrunc, MIBTrunc});
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  EXPECT_TRUE(Helper.widenScalar(*MIBUSUBO, 0, s16) ==
-              LegalizerHelper::LegalizeResult::Legalized);
-
-  auto CheckStr = R"(
-  CHECK: [[Trunc:%[0-9]+]]:_(s8) = G_TRUNC
-  CHECK: [[LHS:%[0-9]+]]:_(s16) = G_ZEXT [[Trunc]]
-  CHECK: [[RHS:%[0-9]+]]:_(s16) = G_ZEXT [[Trunc]]
-  CHECK: [[SUB:%[0-9]+]]:_(s16) = G_SUB [[LHS]]:_, [[RHS]]:_
-  CHECK: [[TRUNC1:%[0-9]+]]:_(s8) = G_TRUNC [[SUB]]
-  CHECK: [[ZEXT:%[0-9]+]]:_(s16) = G_ZEXT [[TRUNC1]]
-  CHECK: G_ICMP intpred(ne), [[SUB]]:_(s16), [[ZEXT]]:_
-  CHECK: G_TRUNC [[SUB]]
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-// SADDO widening.
-TEST_F(AArch64GISelMITest, WidenSADDO) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_ADD).legalFor({{s16, s16}});
-  });
-  // Build
-  // Trunc it to s8.
-  LLT s8{LLT::scalar(8)};
-  LLT s16{LLT::scalar(16)};
-  auto MIBTrunc = B.buildTrunc(s8, Copies[0]);
-  unsigned CarryReg = MRI->createGenericVirtualRegister(LLT::scalar(1));
-  auto MIBSAddO =
-      B.buildInstr(TargetOpcode::G_SADDO, {s8, CarryReg}, {MIBTrunc, MIBTrunc});
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  EXPECT_TRUE(Helper.widenScalar(*MIBSAddO, 0, s16) ==
-              LegalizerHelper::LegalizeResult::Legalized);
-
-  auto CheckStr = R"(
-  CHECK: [[Trunc:%[0-9]+]]:_(s8) = G_TRUNC
-  CHECK: [[LHS:%[0-9]+]]:_(s16) = G_SEXT [[Trunc]]
-  CHECK: [[RHS:%[0-9]+]]:_(s16) = G_SEXT [[Trunc]]
-  CHECK: [[ADD:%[0-9]+]]:_(s16) = G_ADD [[LHS]]:_, [[RHS]]:_
-  CHECK: [[TRUNC1:%[0-9]+]]:_(s8) = G_TRUNC [[ADD]]
-  CHECK: [[SEXT:%[0-9]+]]:_(s16) = G_SEXT [[TRUNC1]]
-  CHECK: G_ICMP intpred(ne), [[ADD]]:_(s16), [[SEXT]]:_
-  CHECK: G_TRUNC [[ADD]]
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-// SSUBO widening.
-TEST_F(AArch64GISelMITest, WidenSSUBO) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_SUB).legalFor({{s16, s16}});
-  });
-  // Build
-  // Trunc it to s8.
-  LLT s8{LLT::scalar(8)};
-  LLT s16{LLT::scalar(16)};
-  auto MIBTrunc = B.buildTrunc(s8, Copies[0]);
-  unsigned CarryReg = MRI->createGenericVirtualRegister(LLT::scalar(1));
-  auto MIBSSUBO =
-      B.buildInstr(TargetOpcode::G_SSUBO, {s8, CarryReg}, {MIBTrunc, MIBTrunc});
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  EXPECT_TRUE(Helper.widenScalar(*MIBSSUBO, 0, s16) ==
-              LegalizerHelper::LegalizeResult::Legalized);
-
-  auto CheckStr = R"(
-  CHECK: [[Trunc:%[0-9]+]]:_(s8) = G_TRUNC
-  CHECK: [[LHS:%[0-9]+]]:_(s16) = G_SEXT [[Trunc]]
-  CHECK: [[RHS:%[0-9]+]]:_(s16) = G_SEXT [[Trunc]]
-  CHECK: [[SUB:%[0-9]+]]:_(s16) = G_SUB [[LHS]]:_, [[RHS]]:_
-  CHECK: [[TRUNC1:%[0-9]+]]:_(s8) = G_TRUNC [[SUB]]
-  CHECK: [[SEXT:%[0-9]+]]:_(s16) = G_SEXT [[TRUNC1]]
-  CHECK: G_ICMP intpred(ne), [[SUB]]:_(s16), [[SEXT]]:_
-  CHECK: G_TRUNC [[SUB]]
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, WidenUADDE) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_UADDE).legalFor({{s16, s16}});
-  });
-  // Build
-  // Trunc it to s8.
-  LLT s8{LLT::scalar(8)};
-  LLT s16{LLT::scalar(16)};
-  auto MIBTrunc = B.buildTrunc(s8, Copies[0]);
-  auto CarryIn = B.buildUndef(LLT::scalar(1));
-  Register CarryReg = MRI->createGenericVirtualRegister(LLT::scalar(1));
-  auto MIBUAddO = B.buildInstr(TargetOpcode::G_UADDE, {s8, CarryReg},
-                               {MIBTrunc, MIBTrunc, CarryIn});
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  EXPECT_TRUE(Helper.widenScalar(*MIBUAddO, 0, s16) ==
-              LegalizerHelper::LegalizeResult::Legalized);
-
-  const char *CheckStr = R"(
-  CHECK: [[Trunc:%[0-9]+]]:_(s8) = G_TRUNC
-  CHECK: [[Implicit:%[0-9]+]]:_(s1) = G_IMPLICIT_DEF
-  CHECK: [[LHS:%[0-9]+]]:_(s16) = G_ZEXT [[Trunc]]
-  CHECK: [[RHS:%[0-9]+]]:_(s16) = G_ZEXT [[Trunc]]
-  CHECK: [[UADDE:%[0-9]+]]:_(s16), [[CARRY:%[0-9]+]]:_(s1) = G_UADDE [[LHS]]:_, [[RHS]]:_, [[Implicit]]:_
-  CHECK: [[TRUNC1:%[0-9]+]]:_(s8) = G_TRUNC [[UADDE]]
-  CHECK: [[ZEXT:%[0-9]+]]:_(s16) = G_ZEXT [[TRUNC1]]
-  CHECK: G_ICMP intpred(ne), [[UADDE]]:_(s16), [[ZEXT]]:_
-  CHECK: G_TRUNC [[UADDE]]
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, WidenUSUBE) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_USUBE).legalFor({{s16, s16}});
-  });
-  // Build
-  // Trunc it to s8.
-  LLT s8{LLT::scalar(8)};
-  LLT s16{LLT::scalar(16)};
-  auto MIBTrunc = B.buildTrunc(s8, Copies[0]);
-  auto CarryIn = B.buildUndef(LLT::scalar(1));
-  Register CarryReg = MRI->createGenericVirtualRegister(LLT::scalar(1));
-  auto MIBUSUBE = B.buildInstr(TargetOpcode::G_USUBE, {s8, CarryReg},
-                               {MIBTrunc, MIBTrunc, CarryIn});
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  EXPECT_TRUE(Helper.widenScalar(*MIBUSUBE, 0, s16) ==
-              LegalizerHelper::LegalizeResult::Legalized);
-
-  const char *CheckStr = R"(
-  CHECK: [[Trunc:%[0-9]+]]:_(s8) = G_TRUNC
-  CHECK: [[Implicit:%[0-9]+]]:_(s1) = G_IMPLICIT_DEF
-  CHECK: [[LHS:%[0-9]+]]:_(s16) = G_ZEXT [[Trunc]]
-  CHECK: [[RHS:%[0-9]+]]:_(s16) = G_ZEXT [[Trunc]]
-  CHECK: [[USUBE:%[0-9]+]]:_(s16), [[CARRY:%[0-9]+]]:_(s1) = G_USUBE [[LHS]]:_, [[RHS]]:_, [[Implicit]]:_
-  CHECK: [[TRUNC1:%[0-9]+]]:_(s8) = G_TRUNC [[USUBE]]
-  CHECK: [[ZEXT:%[0-9]+]]:_(s16) = G_ZEXT [[TRUNC1]]
-  CHECK: G_ICMP intpred(ne), [[USUBE]]:_(s16), [[ZEXT]]:_
-  CHECK: G_TRUNC [[USUBE]]
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, WidenSADDE) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder({G_SADDE, G_UADDE}).legalFor({{s16, s16}});
-  });
-  // Build
-  // Trunc it to s8.
-  LLT s8{LLT::scalar(8)};
-  LLT s16{LLT::scalar(16)};
-  auto MIBTrunc = B.buildTrunc(s8, Copies[0]);
-  auto CarryIn = B.buildUndef(LLT::scalar(1));
-  Register CarryReg = MRI->createGenericVirtualRegister(LLT::scalar(1));
-  auto MIBUAddO = B.buildInstr(TargetOpcode::G_SADDE, {s8, CarryReg},
-                               {MIBTrunc, MIBTrunc, CarryIn});
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  EXPECT_TRUE(Helper.widenScalar(*MIBUAddO, 0, s16) ==
-              LegalizerHelper::LegalizeResult::Legalized);
-
-  const char *CheckStr = R"(
-  CHECK: [[Trunc:%[0-9]+]]:_(s8) = G_TRUNC
-  CHECK: [[Implicit:%[0-9]+]]:_(s1) = G_IMPLICIT_DEF
-  CHECK: [[LHS:%[0-9]+]]:_(s16) = G_SEXT [[Trunc]]
-  CHECK: [[RHS:%[0-9]+]]:_(s16) = G_SEXT [[Trunc]]
-  CHECK: [[SADDE:%[0-9]+]]:_(s16), [[CARRY:%[0-9]+]]:_(s1) = G_UADDE [[LHS]]:_, [[RHS]]:_, [[Implicit]]:_
-  CHECK: [[TRUNC1:%[0-9]+]]:_(s8) = G_TRUNC [[SADDE]]
-  CHECK: [[SEXT:%[0-9]+]]:_(s16) = G_SEXT [[TRUNC1]]
-  CHECK: G_ICMP intpred(ne), [[SADDE]]:_(s16), [[SEXT]]:_
-  CHECK: G_TRUNC [[SADDE]]
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, WidenSSUBE) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder({G_SSUBE, G_USUBE}).legalFor({{s16, s16}});
-  });
-  // Build
-  // Trunc it to s8.
-  LLT s8{LLT::scalar(8)};
-  LLT s16{LLT::scalar(16)};
-  auto MIBTrunc = B.buildTrunc(s8, Copies[0]);
-  auto CarryIn = B.buildUndef(LLT::scalar(1));
-  Register CarryReg = MRI->createGenericVirtualRegister(LLT::scalar(1));
-  auto MIBSSUBE = B.buildInstr(TargetOpcode::G_SSUBE, {s8, CarryReg},
-                               {MIBTrunc, MIBTrunc, CarryIn});
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  EXPECT_TRUE(Helper.widenScalar(*MIBSSUBE, 0, s16) ==
-              LegalizerHelper::LegalizeResult::Legalized);
-
-  const char *CheckStr = R"(
-  CHECK: [[Trunc:%[0-9]+]]:_(s8) = G_TRUNC
-  CHECK: [[Implicit:%[0-9]+]]:_(s1) = G_IMPLICIT_DEF
-  CHECK: [[LHS:%[0-9]+]]:_(s16) = G_SEXT [[Trunc]]
-  CHECK: [[RHS:%[0-9]+]]:_(s16) = G_SEXT [[Trunc]]
-  CHECK: [[SSUBE:%[0-9]+]]:_(s16), [[CARRY:%[0-9]+]]:_(s1) = G_USUBE [[LHS]]:_, [[RHS]]:_, [[Implicit]]:_
-  CHECK: [[TRUNC1:%[0-9]+]]:_(s8) = G_TRUNC [[SSUBE]]
-  CHECK: [[SEXT:%[0-9]+]]:_(s16) = G_SEXT [[TRUNC1]]
-  CHECK: G_ICMP intpred(ne), [[SSUBE]]:_(s16), [[SEXT]]:_
-  CHECK: G_TRUNC [[SSUBE]]
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, NarrowUADDO) {
-  setUp();
-  if (!TM)
-    return;
-
-  LLT S1 = LLT::scalar(1);
-  LLT S32 = LLT::scalar(32);
-  LLT S96 = LLT::scalar(96);
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder({G_UADDO, G_UADDE})
-        .legalFor({{LLT::scalar(32), LLT::scalar(1)}});
-  });
-
-  auto Op0 = B.buildUndef(S96);
-  auto Op1 = B.buildUndef(S96);
-  auto UADDO = B.buildUAddo(S96, S1, Op0, Op1);
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.narrowScalar(*UADDO, 0, S32));
-
-  const char *CheckStr = R"(
-  CHECK: [[IMP_DEF0:%[0-9]+]]:_(s96) = G_IMPLICIT_DEF
-  CHECK: [[IMP_DEF1:%[0-9]+]]:_(s96) = G_IMPLICIT_DEF
-  CHECK: [[OP0_0:%[0-9]+]]:_(s32), [[OP0_1:%[0-9]+]]:_(s32), [[OP0_2:%[0-9]+]]:_(s32) = G_UNMERGE_VALUES [[IMP_DEF0]]
-  CHECK: [[OP1_0:%[0-9]+]]:_(s32), [[OP1_1:%[0-9]+]]:_(s32), [[OP1_2:%[0-9]+]]:_(s32) = G_UNMERGE_VALUES [[IMP_DEF1]]
-  CHECK: [[UADDO0:%[0-9]+]]:_(s32), [[CARRY0:%[0-9]+]]:_(s1) = G_UADDO [[OP0_0]]:_, [[OP1_0]]:_
-  CHECK: [[UADDO1:%[0-9]+]]:_(s32), [[CARRY1:%[0-9]+]]:_(s1) = G_UADDE [[OP0_1]]:_, [[OP1_1]]:_, [[CARRY0]]:_
-  CHECK: [[UADDO2:%[0-9]+]]:_(s32), [[CARRY2:%[0-9]+]]:_(s1) = G_UADDE [[OP0_2]]:_, [[OP1_2]]:_, [[CARRY1]]:_
-  CHECK: [[UADDO:%[0-9]+]]:_(s96) = G_MERGE_VALUES [[UADDO0]]:_(s32), [[UADDO1]]:_(s32), [[UADDO2]]:_(s32)
-  )";
-
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, NarrowUSUBO) {
-  setUp();
-  if (!TM)
-    return;
-
-  LLT S1 = LLT::scalar(1);
-  LLT S32 = LLT::scalar(32);
-  LLT S96 = LLT::scalar(96);
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder({G_USUBO, G_USUBE})
-        .legalFor({{LLT::scalar(32), LLT::scalar(1)}});
-  });
-
-  auto Op0 = B.buildUndef(S96);
-  auto Op1 = B.buildUndef(S96);
-  auto USUBO = B.buildUSubo(S96, S1, Op0, Op1);
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.narrowScalar(*USUBO, 0, S32));
-
-  const char *CheckStr = R"(
-  CHECK: [[IMP_DEF0:%[0-9]+]]:_(s96) = G_IMPLICIT_DEF
-  CHECK: [[IMP_DEF1:%[0-9]+]]:_(s96) = G_IMPLICIT_DEF
-  CHECK: [[OP0_0:%[0-9]+]]:_(s32), [[OP0_1:%[0-9]+]]:_(s32), [[OP0_2:%[0-9]+]]:_(s32) = G_UNMERGE_VALUES [[IMP_DEF0]]
-  CHECK: [[OP1_0:%[0-9]+]]:_(s32), [[OP1_1:%[0-9]+]]:_(s32), [[OP1_2:%[0-9]+]]:_(s32) = G_UNMERGE_VALUES [[IMP_DEF1]]
-  CHECK: [[USUBO0:%[0-9]+]]:_(s32), [[CARRY0:%[0-9]+]]:_(s1) = G_USUBO [[OP0_0]]:_, [[OP1_0]]:_
-  CHECK: [[USUBO1:%[0-9]+]]:_(s32), [[CARRY1:%[0-9]+]]:_(s1) = G_USUBE [[OP0_1]]:_, [[OP1_1]]:_, [[CARRY0]]:_
-  CHECK: [[USUBO2:%[0-9]+]]:_(s32), [[CARRY2:%[0-9]+]]:_(s1) = G_USUBE [[OP0_2]]:_, [[OP1_2]]:_, [[CARRY1]]:_
-  CHECK: [[USUBO:%[0-9]+]]:_(s96) = G_MERGE_VALUES [[USUBO0]]:_(s32), [[USUBO1]]:_(s32), [[USUBO2]]:_(s32)
-  )";
-
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, NarrowSADDO) {
-  setUp();
-  if (!TM)
-    return;
-
-  LLT S1 = LLT::scalar(1);
-  LLT S32 = LLT::scalar(32);
-  LLT S96 = LLT::scalar(96);
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder({G_UADDO, G_UADDE, G_SADDE})
-        .legalFor({{LLT::scalar(32), LLT::scalar(1)}});
-  });
-
-  auto Op0 = B.buildUndef(S96);
-  auto Op1 = B.buildUndef(S96);
-  auto SADDO = B.buildSAddo(S96, S1, Op0, Op1);
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.narrowScalar(*SADDO, 0, S32));
-
-  const char *CheckStr = R"(
-  CHECK: [[IMP_DEF0:%[0-9]+]]:_(s96) = G_IMPLICIT_DEF
-  CHECK: [[IMP_DEF1:%[0-9]+]]:_(s96) = G_IMPLICIT_DEF
-  CHECK: [[OP0_0:%[0-9]+]]:_(s32), [[OP0_1:%[0-9]+]]:_(s32), [[OP0_2:%[0-9]+]]:_(s32) = G_UNMERGE_VALUES [[IMP_DEF0]]
-  CHECK: [[OP1_0:%[0-9]+]]:_(s32), [[OP1_1:%[0-9]+]]:_(s32), [[OP1_2:%[0-9]+]]:_(s32) = G_UNMERGE_VALUES [[IMP_DEF1]]
-  CHECK: [[SADDO0:%[0-9]+]]:_(s32), [[CARRY0:%[0-9]+]]:_(s1) = G_UADDO [[OP0_0]]:_, [[OP1_0]]:_
-  CHECK: [[SADDO1:%[0-9]+]]:_(s32), [[CARRY1:%[0-9]+]]:_(s1) = G_UADDE [[OP0_1]]:_, [[OP1_1]]:_, [[CARRY0]]:_
-  CHECK: [[SADDO2:%[0-9]+]]:_(s32), [[CARRY2:%[0-9]+]]:_(s1) = G_SADDE [[OP0_2]]:_, [[OP1_2]]:_, [[CARRY1]]:_
-  CHECK: [[SADDO:%[0-9]+]]:_(s96) = G_MERGE_VALUES [[SADDO0]]:_(s32), [[SADDO1]]:_(s32), [[SADDO2]]:_(s32)
-  )";
-
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, NarrowSSUBO) {
-  setUp();
-  if (!TM)
-    return;
-
-  LLT S1 = LLT::scalar(1);
-  LLT S32 = LLT::scalar(32);
-  LLT S96 = LLT::scalar(96);
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder({G_USUBO, G_USUBE, G_SSUBE})
-        .legalFor({{LLT::scalar(32), LLT::scalar(1)}});
-  });
-
-  auto Op0 = B.buildUndef(S96);
-  auto Op1 = B.buildUndef(S96);
-  auto SSUBO = B.buildSSubo(S96, S1, Op0, Op1);
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.narrowScalar(*SSUBO, 0, S32));
-
-  const char *CheckStr = R"(
-  CHECK: [[IMP_DEF0:%[0-9]+]]:_(s96) = G_IMPLICIT_DEF
-  CHECK: [[IMP_DEF1:%[0-9]+]]:_(s96) = G_IMPLICIT_DEF
-  CHECK: [[OP0_0:%[0-9]+]]:_(s32), [[OP0_1:%[0-9]+]]:_(s32), [[OP0_2:%[0-9]+]]:_(s32) = G_UNMERGE_VALUES [[IMP_DEF0]]
-  CHECK: [[OP1_0:%[0-9]+]]:_(s32), [[OP1_1:%[0-9]+]]:_(s32), [[OP1_2:%[0-9]+]]:_(s32) = G_UNMERGE_VALUES [[IMP_DEF1]]
-  CHECK: [[SSUBO0:%[0-9]+]]:_(s32), [[CARRY0:%[0-9]+]]:_(s1) = G_USUBO [[OP0_0]]:_, [[OP1_0]]:_
-  CHECK: [[SSUBO1:%[0-9]+]]:_(s32), [[CARRY1:%[0-9]+]]:_(s1) = G_USUBE [[OP0_1]]:_, [[OP1_1]]:_, [[CARRY0]]:_
-  CHECK: [[SSUBO2:%[0-9]+]]:_(s32), [[CARRY2:%[0-9]+]]:_(s1) = G_SSUBE [[OP0_2]]:_, [[OP1_2]]:_, [[CARRY1]]:_
-  CHECK: [[SSUBO:%[0-9]+]]:_(s96) = G_MERGE_VALUES [[SSUBO0]]:_(s32), [[SSUBO1]]:_(s32), [[SSUBO2]]:_(s32)
-  )";
-
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, NarrowUADDE) {
-  setUp();
-  if (!TM)
-    return;
-
-  LLT S1 = LLT::scalar(1);
-  LLT S32 = LLT::scalar(32);
-  LLT S96 = LLT::scalar(96);
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_UADDE).legalFor(
-        {{LLT::scalar(32), LLT::scalar(1)}});
-  });
-
-  auto Op0 = B.buildUndef(S96);
-  auto Op1 = B.buildUndef(S96);
-  auto Op2 = B.buildUndef(S1);
-  auto UADDE = B.buildUAdde(S96, S1, Op0, Op1, Op2);
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.narrowScalar(*UADDE, 0, S32));
-
-  const char *CheckStr = R"(
-  CHECK: [[IMP_DEF0:%[0-9]+]]:_(s96) = G_IMPLICIT_DEF
-  CHECK: [[IMP_DEF1:%[0-9]+]]:_(s96) = G_IMPLICIT_DEF
-  CHECK: [[IMP_DEF2:%[0-9]+]]:_(s1) = G_IMPLICIT_DEF
-  CHECK: [[OP0_0:%[0-9]+]]:_(s32), [[OP0_1:%[0-9]+]]:_(s32), [[OP0_2:%[0-9]+]]:_(s32) = G_UNMERGE_VALUES [[IMP_DEF0]]
-  CHECK: [[OP1_0:%[0-9]+]]:_(s32), [[OP1_1:%[0-9]+]]:_(s32), [[OP1_2:%[0-9]+]]:_(s32) = G_UNMERGE_VALUES [[IMP_DEF1]]
-  CHECK: [[UADDE0:%[0-9]+]]:_(s32), [[CARRY0:%[0-9]+]]:_(s1) = G_UADDE [[OP0_0]]:_, [[OP1_0]]:_, [[IMP_DEF2]]:_
-  CHECK: [[UADDE1:%[0-9]+]]:_(s32), [[CARRY1:%[0-9]+]]:_(s1) = G_UADDE [[OP0_1]]:_, [[OP1_1]]:_, [[CARRY0]]:_
-  CHECK: [[UADDE2:%[0-9]+]]:_(s32), [[CARRY2:%[0-9]+]]:_(s1) = G_UADDE [[OP0_2]]:_, [[OP1_2]]:_, [[CARRY1]]:_
-  CHECK: [[UADDE:%[0-9]+]]:_(s96) = G_MERGE_VALUES [[UADDE0]]:_(s32), [[UADDE1]]:_(s32), [[UADDE2]]:_(s32)
-  )";
-
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, NarrowUSUBE) {
-  setUp();
-  if (!TM)
-    return;
-
-  LLT S1 = LLT::scalar(1);
-  LLT S32 = LLT::scalar(32);
-  LLT S96 = LLT::scalar(96);
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_USUBE).legalFor(
-        {{LLT::scalar(32), LLT::scalar(1)}});
-  });
-
-  auto Op0 = B.buildUndef(S96);
-  auto Op1 = B.buildUndef(S96);
-  auto Op2 = B.buildUndef(S1);
-  auto USUBE = B.buildUSube(S96, S1, Op0, Op1, Op2);
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.narrowScalar(*USUBE, 0, S32));
-
-  const char *CheckStr = R"(
-  CHECK: [[IMP_DEF0:%[0-9]+]]:_(s96) = G_IMPLICIT_DEF
-  CHECK: [[IMP_DEF1:%[0-9]+]]:_(s96) = G_IMPLICIT_DEF
-  CHECK: [[IMP_DEF2:%[0-9]+]]:_(s1) = G_IMPLICIT_DEF
-  CHECK: [[OP0_0:%[0-9]+]]:_(s32), [[OP0_1:%[0-9]+]]:_(s32), [[OP0_2:%[0-9]+]]:_(s32) = G_UNMERGE_VALUES [[IMP_DEF0]]
-  CHECK: [[OP1_0:%[0-9]+]]:_(s32), [[OP1_1:%[0-9]+]]:_(s32), [[OP1_2:%[0-9]+]]:_(s32) = G_UNMERGE_VALUES [[IMP_DEF1]]
-  CHECK: [[USUBE0:%[0-9]+]]:_(s32), [[CARRY0:%[0-9]+]]:_(s1) = G_USUBE [[OP0_0]]:_, [[OP1_0]]:_, [[IMP_DEF2]]:_
-  CHECK: [[USUBE1:%[0-9]+]]:_(s32), [[CARRY1:%[0-9]+]]:_(s1) = G_USUBE [[OP0_1]]:_, [[OP1_1]]:_, [[CARRY0]]:_
-  CHECK: [[USUBE2:%[0-9]+]]:_(s32), [[CARRY2:%[0-9]+]]:_(s1) = G_USUBE [[OP0_2]]:_, [[OP1_2]]:_, [[CARRY1]]:_
-  CHECK: [[USUBE:%[0-9]+]]:_(s96) = G_MERGE_VALUES [[USUBE0]]:_(s32), [[USUBE1]]:_(s32), [[USUBE2]]:_(s32)
-  )";
-
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, NarrowSADDE) {
-  setUp();
-  if (!TM)
-    return;
-
-  LLT S1 = LLT::scalar(1);
-  LLT S32 = LLT::scalar(32);
-  LLT S96 = LLT::scalar(96);
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder({G_SADDE, G_UADDE})
-        .legalFor({{LLT::scalar(32), LLT::scalar(1)}});
-  });
-
-  auto Op0 = B.buildUndef(S96);
-  auto Op1 = B.buildUndef(S96);
-  auto Op2 = B.buildUndef(S1);
-  auto SADDE = B.buildSAdde(S96, S1, Op0, Op1, Op2);
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.narrowScalar(*SADDE, 0, S32));
-
-  const char *CheckStr = R"(
-  CHECK: [[IMP_DEF0:%[0-9]+]]:_(s96) = G_IMPLICIT_DEF
-  CHECK: [[IMP_DEF1:%[0-9]+]]:_(s96) = G_IMPLICIT_DEF
-  CHECK: [[IMP_DEF2:%[0-9]+]]:_(s1) = G_IMPLICIT_DEF
-  CHECK: [[OP0_0:%[0-9]+]]:_(s32), [[OP0_1:%[0-9]+]]:_(s32), [[OP0_2:%[0-9]+]]:_(s32) = G_UNMERGE_VALUES [[IMP_DEF0]]
-  CHECK: [[OP1_0:%[0-9]+]]:_(s32), [[OP1_1:%[0-9]+]]:_(s32), [[OP1_2:%[0-9]+]]:_(s32) = G_UNMERGE_VALUES [[IMP_DEF1]]
-  CHECK: [[SADDE0:%[0-9]+]]:_(s32), [[CARRY0:%[0-9]+]]:_(s1) = G_UADDE [[OP0_0]]:_, [[OP1_0]]:_, [[IMP_DEF2]]:_
-  CHECK: [[SADDE1:%[0-9]+]]:_(s32), [[CARRY1:%[0-9]+]]:_(s1) = G_UADDE [[OP0_1]]:_, [[OP1_1]]:_, [[CARRY0]]:_
-  CHECK: [[SADDE2:%[0-9]+]]:_(s32), [[CARRY2:%[0-9]+]]:_(s1) = G_SADDE [[OP0_2]]:_, [[OP1_2]]:_, [[CARRY1]]:_
-  CHECK: [[SADDE:%[0-9]+]]:_(s96) = G_MERGE_VALUES [[SADDE0]]:_(s32), [[SADDE1]]:_(s32), [[SADDE2]]:_(s32)
-  )";
-
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, NarrowSSUBE) {
-  setUp();
-  if (!TM)
-    return;
-
-  LLT S1 = LLT::scalar(1);
-  LLT S32 = LLT::scalar(32);
-  LLT S96 = LLT::scalar(96);
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder({G_SSUBE, G_USUBE})
-        .legalFor({{LLT::scalar(32), LLT::scalar(1)}});
-  });
-
-  auto Op0 = B.buildUndef(S96);
-  auto Op1 = B.buildUndef(S96);
-  auto Op2 = B.buildUndef(S1);
-  auto SSUBE = B.buildSSube(S96, S1, Op0, Op1, Op2);
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.narrowScalar(*SSUBE, 0, S32));
-
-  const char *CheckStr = R"(
-  CHECK: [[IMP_DEF0:%[0-9]+]]:_(s96) = G_IMPLICIT_DEF
-  CHECK: [[IMP_DEF1:%[0-9]+]]:_(s96) = G_IMPLICIT_DEF
-  CHECK: [[IMP_DEF2:%[0-9]+]]:_(s1) = G_IMPLICIT_DEF
-  CHECK: [[OP0_0:%[0-9]+]]:_(s32), [[OP0_1:%[0-9]+]]:_(s32), [[OP0_2:%[0-9]+]]:_(s32) = G_UNMERGE_VALUES [[IMP_DEF0]]
-  CHECK: [[OP1_0:%[0-9]+]]:_(s32), [[OP1_1:%[0-9]+]]:_(s32), [[OP1_2:%[0-9]+]]:_(s32) = G_UNMERGE_VALUES [[IMP_DEF1]]
-  CHECK: [[SSUBE0:%[0-9]+]]:_(s32), [[CARRY0:%[0-9]+]]:_(s1) = G_USUBE [[OP0_0]]:_, [[OP1_0]]:_, [[IMP_DEF2]]:_
-  CHECK: [[SSUBE1:%[0-9]+]]:_(s32), [[CARRY1:%[0-9]+]]:_(s1) = G_USUBE [[OP0_1]]:_, [[OP1_1]]:_, [[CARRY0]]:_
-  CHECK: [[SSUBE2:%[0-9]+]]:_(s32), [[CARRY2:%[0-9]+]]:_(s1) = G_SSUBE [[OP0_2]]:_, [[OP1_2]]:_, [[CARRY1]]:_
-  CHECK: [[SSUBE:%[0-9]+]]:_(s96) = G_MERGE_VALUES [[SSUBE0]]:_(s32), [[SSUBE1]]:_(s32), [[SSUBE2]]:_(s32)
-  )";
-
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, FewerElementsAnd) {
-  setUp();
-  if (!TM)
-    return;
-
-  const LLT V2S32 = LLT::fixed_vector(2, 32);
-  const LLT V5S32 = LLT::fixed_vector(5, 32);
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_AND)
-      .legalFor({s32});
-  });
-
-  auto Op0 = B.buildUndef(V5S32);
-  auto Op1 = B.buildUndef(V5S32);
-  auto And = B.buildAnd(V5S32, Op0, Op1);
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  B.setInstr(*And);
-  EXPECT_TRUE(Helper.fewerElementsVector(*And, 0, V2S32) ==
-              LegalizerHelper::LegalizeResult::Legalized);
-
-  auto CheckStr = R"(
-  CHECK: [[IMP_DEF0:%[0-9]+]]:_(<5 x s32>) = G_IMPLICIT_DEF
-  CHECK: [[IMP_DEF1:%[0-9]+]]:_(<5 x s32>) = G_IMPLICIT_DEF
-  CHECK: [[VALUE0:%[0-9]+]]:_(s32), [[VALUE1:%[0-9]+]]:_(s32), [[VALUE2:%[0-9]+]]:_(s32), [[VALUE3:%[0-9]+]]:_(s32), [[VALUE4:%[0-9]+]]:_(s32) = G_UNMERGE_VALUES [[IMP_DEF0]]:_(<5 x s32>)
-  CHECK: [[IMP_DEF2:%[0-9]+]]:_(s32) = G_IMPLICIT_DEF
-  CHECK: [[VECTOR0:%[0-9]+]]:_(<2 x s32>) = G_BUILD_VECTOR [[VALUE0]]:_(s32), [[VALUE1]]:_(s32)
-  CHECK: [[VECTOR1:%[0-9]+]]:_(<2 x s32>) = G_BUILD_VECTOR [[VALUE2]]:_(s32), [[VALUE3]]:_(s32)
-  CHECK: [[VECTOR2:%[0-9]+]]:_(<2 x s32>) = G_BUILD_VECTOR [[VALUE4]]:_(s32), [[IMP_DEF2]]:_(s32)
-  CHECK: [[IMP_DEF3:%[0-9]+]]:_(<2 x s32>) = G_IMPLICIT_DEF
-  CHECK: [[VALUE5:%[0-9]+]]:_(s32), [[VALUE6:%[0-9]+]]:_(s32), [[VALUE7:%[0-9]+]]:_(s32), [[VALUE8:%[0-9]+]]:_(s32), [[VALUE9:%[0-9]+]]:_(s32) = G_UNMERGE_VALUES [[IMP_DEF1]]:_(<5 x s32>)
-  CHECK: [[IMP_DEF4:%[0-9]+]]:_(s32) = G_IMPLICIT_DEF
-  CHECK: [[VECTOR3:%[0-9]+]]:_(<2 x s32>) = G_BUILD_VECTOR [[VALUE5]]:_(s32), [[VALUE6]]:_(s32)
-  CHECK: [[VECTOR4:%[0-9]+]]:_(<2 x s32>) = G_BUILD_VECTOR [[VALUE7]]:_(s32), [[VALUE8]]:_(s32)
-  CHECK: [[VECTOR5:%[0-9]+]]:_(<2 x s32>) = G_BUILD_VECTOR [[VALUE9]]:_(s32), [[IMP_DEF4]]:_(s32)
-  CHECK: [[IMP_DEF5:%[0-9]+]]:_(<2 x s32>) = G_IMPLICIT_DEF
-
-  CHECK: [[AND0:%[0-9]+]]:_(<2 x s32>) = G_AND [[VECTOR0]]:_, [[VECTOR3]]:_
-  CHECK: [[AND1:%[0-9]+]]:_(<2 x s32>) = G_AND [[VECTOR1]]:_, [[VECTOR4]]:_
-  CHECK: [[AND2:%[0-9]+]]:_(<2 x s32>) = G_AND [[VECTOR2]]:_, [[VECTOR5]]:_
-  CHECK: [[IMP_DEF6:%[0-9]+]]:_(<2 x s32>) = G_IMPLICIT_DEF
-
-  CHECK: [[VECTOR6:%[0-9]+]]:_(<10 x s32>) = G_CONCAT_VECTORS [[AND0]]:_(<2 x s32>), [[AND1]]:_(<2 x s32>), [[AND2]]:_(<2 x s32>), [[IMP_DEF6]]:_(<2 x s32>), [[IMP_DEF6]]:_(<2 x s32>)
-  CHECK: [[VECTOR7:%[0-9]+]]:_(<10 x s32>) = G_CONCAT_VECTORS [[AND0]]:_(<2 x s32>), [[AND1]]:_(<2 x s32>), [[AND2]]:_(<2 x s32>), [[IMP_DEF6]]:_(<2 x s32>), [[IMP_DEF6]]:_(<2 x s32>)
-  CHECK: [[VECTOR8:%[0-9]+]]:_(<5 x s32>), [[VECTOR9:%[0-9]+]]:_(<5 x s32>) = G_UNMERGE_VALUES [[VECTOR7]]:_(<10 x s32>)
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, MoreElementsAnd) {
-  setUp();
-  if (!TM)
-    return;
-
-  LLT s32 = LLT::scalar(32);
-  LLT v2s32 = LLT::fixed_vector(2, 32);
-  LLT v6s32 = LLT::fixed_vector(6, 32);
-
-  LegalizerInfo LI;
-  LI.getActionDefinitionsBuilder(TargetOpcode::G_AND)
-    .legalFor({v6s32})
-    .clampMinNumElements(0, s32, 6);
-  LI.getLegacyLegalizerInfo().computeTables();
-
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, LI, Observer, B);
-
-  B.setInsertPt(*EntryMBB, EntryMBB->end());
-
-  auto Val0 = B.buildBitcast(v2s32, Copies[0]);
-  auto Val1 = B.buildBitcast(v2s32, Copies[1]);
-
-  auto And = B.buildAnd(v2s32, Val0, Val1);
-
-  B.setInstr(*And);
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.moreElementsVector(*And, 0, v6s32));
-
-  auto CheckStr = R"(
-  CHECK: [[BITCAST0:%[0-9]+]]:_(<2 x s32>) = G_BITCAST
-  CHECK: [[BITCAST1:%[0-9]+]]:_(<2 x s32>) = G_BITCAST
-  CHECK: [[IMP_DEF0:%[0-9]+]]:_(<2 x s32>) = G_IMPLICIT_DEF
-  CHECK: [[CONCAT0:%[0-9]+]]:_(<6 x s32>) = G_CONCAT_VECTORS [[BITCAST0]]:_(<2 x s32>), [[IMP_DEF0]]:_(<2 x s32>), [[IMP_DEF0]]:_(<2 x s32>)
-  CHECK: [[IMP_DEF1:%[0-9]+]]:_(<2 x s32>) = G_IMPLICIT_DEF
-  CHECK: [[CONCAT1:%[0-9]+]]:_(<6 x s32>) = G_CONCAT_VECTORS [[BITCAST1]]:_(<2 x s32>), [[IMP_DEF1]]:_(<2 x s32>), [[IMP_DEF1]]:_(<2 x s32>)
-  CHECK: [[AND:%[0-9]+]]:_(<6 x s32>) = G_AND [[CONCAT0]]:_, [[CONCAT1]]:_
-  CHECK: (<2 x s32>) = G_UNMERGE_VALUES [[AND]]:_(<6 x s32>)
-  )";
-
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, FewerElementsPhi) {
-  setUp();
-  if (!TM)
-    return;
-
-  LLT s1 = LLT::scalar(1);
-  LLT s32 = LLT::scalar(32);
-  LLT s64 = LLT::scalar(64);
-  LLT v2s32 = LLT::fixed_vector(2, 32);
-  LLT v5s32 = LLT::fixed_vector(5, 32);
-
-  LegalizerInfo LI;
-  LI.getActionDefinitionsBuilder(TargetOpcode::G_PHI)
-    .legalFor({v2s32})
-    .clampMinNumElements(0, s32, 2);
-  LI.getLegacyLegalizerInfo().computeTables();
-
-  LLT PhiTy = v5s32;
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, LI, Observer, B);
-  B.setMBB(*EntryMBB);
-
-  MachineBasicBlock *MidMBB = MF->CreateMachineBasicBlock();
-  MachineBasicBlock *EndMBB = MF->CreateMachineBasicBlock();
-  MF->insert(MF->end(), MidMBB);
-  MF->insert(MF->end(), EndMBB);
-
-  EntryMBB->addSuccessor(MidMBB);
-  EntryMBB->addSuccessor(EndMBB);
-  MidMBB->addSuccessor(EndMBB);
-
-  auto InitVal = B.buildUndef(PhiTy);
-  auto InitOtherVal = B.buildConstant(s64, 999);
-
-  auto ICmp = B.buildICmp(CmpInst::ICMP_EQ, s1, Copies[0], Copies[1]);
-  B.buildBrCond(ICmp.getReg(0), *MidMBB);
-  B.buildBr(*EndMBB);
-
-
-  B.setMBB(*MidMBB);
-  auto MidVal = B.buildUndef(PhiTy);
-  auto MidOtherVal = B.buildConstant(s64, 345);
-  B.buildBr(*EndMBB);
-
-  B.setMBB(*EndMBB);
-  auto Phi = B.buildInstr(TargetOpcode::G_PHI)
-    .addDef(MRI->createGenericVirtualRegister(PhiTy))
-    .addUse(InitVal.getReg(0))
-    .addMBB(EntryMBB)
-    .addUse(MidVal.getReg(0))
-    .addMBB(MidMBB);
-
-  // Insert another irrelevant phi to make sure the rebuild is inserted after
-  // it.
-  B.buildInstr(TargetOpcode::G_PHI)
-    .addDef(MRI->createGenericVirtualRegister(s64))
-    .addUse(InitOtherVal.getReg(0))
-    .addMBB(EntryMBB)
-    .addUse(MidOtherVal.getReg(0))
-    .addMBB(MidMBB);
-
-  // Add some use instruction after the phis.
-  B.buildAnd(PhiTy, Phi.getReg(0), Phi.getReg(0));
-
-  B.setInstr(*Phi);
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.fewerElementsVector(*Phi, 0, v2s32));
-
-  auto CheckStr = R"(
-  CHECK: [[INITVAL:%[0-9]+]]:_(<5 x s32>) = G_IMPLICIT_DEF
-  CHECK: [[EXTRACT0:%[0-9]+]]:_(<2 x s32>) = G_EXTRACT [[INITVAL]]:_(<5 x s32>), 0
-  CHECK: [[EXTRACT1:%[0-9]+]]:_(<2 x s32>) = G_EXTRACT [[INITVAL]]:_(<5 x s32>), 64
-  CHECK: [[EXTRACT2:%[0-9]+]]:_(s32) = G_EXTRACT [[INITVAL]]:_(<5 x s32>), 128
-  CHECK: G_BRCOND
-
-  CHECK: [[MIDVAL:%[0-9]+]]:_(<5 x s32>) = G_IMPLICIT_DEF
-  CHECK: [[EXTRACT3:%[0-9]+]]:_(<2 x s32>) = G_EXTRACT [[MIDVAL]]:_(<5 x s32>), 0
-  CHECK: [[EXTRACT4:%[0-9]+]]:_(<2 x s32>) = G_EXTRACT [[MIDVAL]]:_(<5 x s32>), 64
-  CHECK: [[EXTRACT5:%[0-9]+]]:_(s32) = G_EXTRACT [[MIDVAL]]:_(<5 x s32>), 128
-  CHECK: G_BR
-
-  CHECK: [[PHI0:%[0-9]+]]:_(<2 x s32>) = G_PHI [[EXTRACT0]]:_(<2 x s32>), %bb.0, [[EXTRACT3]]:_(<2 x s32>), %bb.1
-  CHECK: [[PHI1:%[0-9]+]]:_(<2 x s32>) = G_PHI [[EXTRACT1]]:_(<2 x s32>), %bb.0, [[EXTRACT4]]:_(<2 x s32>), %bb.1
-  CHECK: [[PHI2:%[0-9]+]]:_(s32) = G_PHI [[EXTRACT2]]:_(s32), %bb.0, [[EXTRACT5]]:_(s32), %bb.1
-
-  CHECK: [[OTHER_PHI:%[0-9]+]]:_(s64) = G_PHI
-
-  CHECK: [[UNMERGE0:%[0-9]+]]:_(s32), [[UNMERGE1:%[0-9]+]]:_(s32) = G_UNMERGE_VALUES [[PHI0]]:_(<2 x s32>)
-  CHECK: [[UNMERGE2:%[0-9]+]]:_(s32), [[UNMERGE3:%[0-9]+]]:_(s32) = G_UNMERGE_VALUES [[PHI1]]:_(<2 x s32>)
-  CHECK: [[BV:%[0-9]+]]:_(<5 x s32>) = G_BUILD_VECTOR [[UNMERGE0]]:_(s32), [[UNMERGE1]]:_(s32), [[UNMERGE2]]:_(s32), [[UNMERGE3]]:_(s32), [[PHI2]]:_(s32)
-  CHECK: [[USE_OP:%[0-9]+]]:_(<5 x s32>) = G_AND [[BV]]:_, [[BV]]:_
-  )";
-
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-// FNEG expansion in terms of XOR
-TEST_F(AArch64GISelMITest, LowerFNEG) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_FSUB).legalFor({s64});
-  });
-
-  // Build Instr. Make sure FMF are preserved.
-  auto FAdd =
-    B.buildInstr(TargetOpcode::G_FADD, {LLT::scalar(64)}, {Copies[0], Copies[1]},
-                 MachineInstr::MIFlag::FmNsz);
-
-  // Should not propagate the flags of src instruction.
-  auto FNeg0 =
-    B.buildInstr(TargetOpcode::G_FNEG, {LLT::scalar(64)}, {FAdd.getReg(0)},
-                 {MachineInstr::MIFlag::FmArcp});
-
-  // Preserve the one flag.
-  auto FNeg1 =
-    B.buildInstr(TargetOpcode::G_FNEG, {LLT::scalar(64)}, {Copies[0]},
-                 MachineInstr::MIFlag::FmNoInfs);
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  // Perform Legalization
-  B.setInstr(*FNeg0);
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*FNeg0, 0, LLT::scalar(64)));
-  B.setInstr(*FNeg1);
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*FNeg1, 0, LLT::scalar(64)));
-
-  auto CheckStr = R"(
-  CHECK: [[FADD:%[0-9]+]]:_(s64) = nsz G_FADD %0:_, %1:_
-  CHECK: [[CONST0:%[0-9]+]]:_(s64) = G_CONSTANT i64 -9223372036854775808
-  CHECK: [[FSUB0:%[0-9]+]]:_(s64) = G_XOR [[FADD]]:_, [[CONST0]]:_
-  CHECK: [[CONST1:%[0-9]+]]:_(s64) = G_CONSTANT i64 -9223372036854775808
-  CHECK: [[FSUB1:%[0-9]+]]:_(s64) = G_XOR %0:_, [[CONST1]]:_
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, LowerMinMax) {
-  setUp();
-  if (!TM)
-    return;
-
-  LLT s64 = LLT::scalar(64);
-  LLT v2s32 = LLT::fixed_vector(2, 32);
-
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder({G_SMIN, G_SMAX, G_UMIN, G_UMAX})
-        .lowerFor({s64, LLT::fixed_vector(2, s32)});
-  });
-
-  auto SMin = B.buildSMin(s64, Copies[0], Copies[1]);
-  auto SMax = B.buildSMax(s64, Copies[0], Copies[1]);
-  auto UMin = B.buildUMin(s64, Copies[0], Copies[1]);
-  auto UMax = B.buildUMax(s64, Copies[0], Copies[1]);
-
-  auto VecVal0 = B.buildBitcast(v2s32, Copies[0]);
-  auto VecVal1 = B.buildBitcast(v2s32, Copies[1]);
-
-  auto SMinV = B.buildSMin(v2s32, VecVal0, VecVal1);
-  auto SMaxV = B.buildSMax(v2s32, VecVal0, VecVal1);
-  auto UMinV = B.buildUMin(v2s32, VecVal0, VecVal1);
-  auto UMaxV = B.buildUMax(v2s32, VecVal0, VecVal1);
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  B.setInstr(*SMin);
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*SMin, 0, s64));
-  B.setInstr(*SMax);
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*SMax, 0, s64));
-  B.setInstr(*UMin);
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*UMin, 0, s64));
-  B.setInstr(*UMax);
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*UMax, 0, s64));
-
-  B.setInstr(*SMinV);
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*SMinV, 0, v2s32));
-  B.setInstr(*SMaxV);
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*SMaxV, 0, v2s32));
-  B.setInstr(*UMinV);
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*UMinV, 0, v2s32));
-  B.setInstr(*UMaxV);
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*UMaxV, 0, v2s32));
-
-  auto CheckStr = R"(
-  CHECK: [[CMP0:%[0-9]+]]:_(s1) = G_ICMP intpred(slt), %0:_(s64), %1:_
-  CHECK: [[SMIN:%[0-9]+]]:_(s64) = G_SELECT [[CMP0]]:_(s1), %0:_, %1:_
-
-  CHECK: [[CMP1:%[0-9]+]]:_(s1) = G_ICMP intpred(sgt), %0:_(s64), %1:_
-  CHECK: [[SMAX:%[0-9]+]]:_(s64) = G_SELECT [[CMP1]]:_(s1), %0:_, %1:_
-
-  CHECK: [[CMP2:%[0-9]+]]:_(s1) = G_ICMP intpred(ult), %0:_(s64), %1:_
-  CHECK: [[UMIN:%[0-9]+]]:_(s64) = G_SELECT [[CMP2]]:_(s1), %0:_, %1:_
-
-  CHECK: [[CMP3:%[0-9]+]]:_(s1) = G_ICMP intpred(ugt), %0:_(s64), %1:_
-  CHECK: [[UMAX:%[0-9]+]]:_(s64) = G_SELECT [[CMP3]]:_(s1), %0:_, %1:_
-
-  CHECK: [[VEC0:%[0-9]+]]:_(<2 x s32>) = G_BITCAST %0:_(s64)
-  CHECK: [[VEC1:%[0-9]+]]:_(<2 x s32>) = G_BITCAST %1:_(s64)
-
-  CHECK: [[VCMP0:%[0-9]+]]:_(<2 x s1>) = G_ICMP intpred(slt), [[VEC0]]:_(<2 x s32>), [[VEC1]]:_
-  CHECK: [[SMINV:%[0-9]+]]:_(<2 x s32>) = G_SELECT [[VCMP0]]:_(<2 x s1>), [[VEC0]]:_, [[VEC1]]:_
-
-  CHECK: [[VCMP1:%[0-9]+]]:_(<2 x s1>) = G_ICMP intpred(sgt), [[VEC0]]:_(<2 x s32>), [[VEC1]]:_
-  CHECK: [[SMAXV:%[0-9]+]]:_(<2 x s32>) = G_SELECT [[VCMP1]]:_(<2 x s1>), [[VEC0]]:_, [[VEC1]]:_
-
-  CHECK: [[VCMP2:%[0-9]+]]:_(<2 x s1>) = G_ICMP intpred(ult), [[VEC0]]:_(<2 x s32>), [[VEC1]]:_
-  CHECK: [[UMINV:%[0-9]+]]:_(<2 x s32>) = G_SELECT [[VCMP2]]:_(<2 x s1>), [[VEC0]]:_, [[VEC1]]:_
-
-  CHECK: [[VCMP3:%[0-9]+]]:_(<2 x s1>) = G_ICMP intpred(ugt), [[VEC0]]:_(<2 x s32>), [[VEC1]]:_
-  CHECK: [[UMAXV:%[0-9]+]]:_(<2 x s32>) = G_SELECT [[VCMP3]]:_(<2 x s1>), [[VEC0]]:_, [[VEC1]]:_
-  )";
-
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, WidenScalarBuildVector) {
-  setUp();
-  if (!TM)
-    return;
-
-  LLT S32 = LLT::scalar(32);
-  LLT S16 = LLT::scalar(16);
-  LLT V2S16 = LLT::fixed_vector(2, S16);
-  LLT V2S32 = LLT::fixed_vector(2, S32);
-
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder({G_SMIN, G_SMAX, G_UMIN, G_UMAX})
-        .lowerFor({s64, LLT::fixed_vector(2, s32)});
-  });
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  B.setInsertPt(*EntryMBB, EntryMBB->end());
-
-  Register Constant0 = B.buildConstant(S16, 1).getReg(0);
-  Register Constant1 = B.buildConstant(S16, 2).getReg(0);
-  auto BV0 = B.buildBuildVector(V2S16, {Constant0, Constant1});
-  auto BV1 = B.buildBuildVector(V2S16, {Constant0, Constant1});
-
-  B.setInstr(*BV0);
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.widenScalar(*BV0, 0, V2S32));
-  B.setInstr(*BV1);
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.widenScalar(*BV1, 1, S32));
-
-  auto CheckStr = R"(
-  CHECK: [[K0:%[0-9]+]]:_(s16) = G_CONSTANT i16 1
-  CHECK-NEXT: [[K1:%[0-9]+]]:_(s16) = G_CONSTANT i16 2
-  CHECK-NEXT: [[EXT_K0_0:%[0-9]+]]:_(s32) = G_ANYEXT [[K0]]
-  CHECK-NEXT: [[EXT_K1_0:%[0-9]+]]:_(s32) = G_ANYEXT [[K1]]
-  CHECK-NEXT: [[BV0:%[0-9]+]]:_(<2 x s32>) = G_BUILD_VECTOR [[EXT_K0_0]]:_(s32), [[EXT_K1_0]]:_(s32)
-  CHECK-NEXT: [[BV0_TRUNC:%[0-9]+]]:_(<2 x s16>) = G_TRUNC [[BV0]]
-
-  CHECK: [[EXT_K0_1:%[0-9]+]]:_(s32) = G_ANYEXT [[K0]]
-  CHECK-NEXT: [[EXT_K1_1:%[0-9]+]]:_(s32) = G_ANYEXT [[K1]]
-
-  CHECK-NEXT: [[BV1:%[0-9]+]]:_(<2 x s16>) = G_BUILD_VECTOR_TRUNC [[EXT_K0_1]]:_(s32), [[EXT_K1_1]]:_(s32)
-  )";
-
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, LowerMergeValues) {
-  setUp();
-  if (!TM)
-    return;
-
-  const LLT S32 = LLT::scalar(32);
-  const LLT S24 = LLT::scalar(24);
-  const LLT S21 = LLT::scalar(21);
-  const LLT S16 = LLT::scalar(16);
-  const LLT S9 = LLT::scalar(9);
-  const LLT S8 = LLT::scalar(8);
-  const LLT S3 = LLT::scalar(3);
-
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_UNMERGE_VALUES)
-      .widenScalarIf(typeIs(1, LLT::scalar(3)), changeTo(1, LLT::scalar(9)));
-  });
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  B.setInsertPt(*EntryMBB, EntryMBB->end());
-
-  // 24 = 3 3 3   3 3 3   3 3
-  //     => 9
-  //
-  // This can do 3 merges, but need an extra implicit_def.
-  SmallVector<Register, 8> Merge0Ops;
-  for (int I = 0; I != 8; ++I)
-    Merge0Ops.push_back(B.buildConstant(S3, I).getReg(0));
-
-  auto Merge0 = B.buildMerge(S24, Merge0Ops);
-
-  // 21 = 3 3 3   3 3 3   3
-  //     => 9, 2 extra implicit_def needed
-  //
-  SmallVector<Register, 8> Merge1Ops;
-  for (int I = 0; I != 7; ++I)
-    Merge1Ops.push_back(B.buildConstant(S3, I).getReg(0));
-
-  auto Merge1 = B.buildMerge(S21, Merge1Ops);
-
-  SmallVector<Register, 8> Merge2Ops;
-  for (int I = 0; I != 2; ++I)
-    Merge2Ops.push_back(B.buildConstant(S8, I).getReg(0));
-
-  auto Merge2 = B.buildMerge(S16, Merge2Ops);
-
-  B.setInstr(*Merge0);
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.widenScalar(*Merge0, 1, S9));
-  B.setInstr(*Merge1);
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.widenScalar(*Merge1, 1, S9));
-
-  // Request a source size greater than the original destination size.
-  B.setInstr(*Merge2);
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.widenScalar(*Merge2, 1, S32));
-
-  auto CheckStr = R"(
-  CHECK: [[K0:%[0-9]+]]:_(s3) = G_CONSTANT i3 0
-  CHECK-NEXT: [[K1:%[0-9]+]]:_(s3) = G_CONSTANT i3 1
-  CHECK-NEXT: [[K2:%[0-9]+]]:_(s3) = G_CONSTANT i3 2
-  CHECK-NEXT: [[K3:%[0-9]+]]:_(s3) = G_CONSTANT i3 3
-  CHECK-NEXT: [[K4:%[0-9]+]]:_(s3) = G_CONSTANT i3 -4
-  CHECK-NEXT: [[K5:%[0-9]+]]:_(s3) = G_CONSTANT i3 -3
-  CHECK-NEXT: [[K6:%[0-9]+]]:_(s3) = G_CONSTANT i3 -2
-  CHECK-NEXT: [[K7:%[0-9]+]]:_(s3) = G_CONSTANT i3 -1
-  CHECK-NEXT: [[IMPDEF0:%[0-9]+]]:_(s3) = G_IMPLICIT_DEF
-  CHECK-NEXT: [[MERGE0:%[0-9]+]]:_(s9) = G_MERGE_VALUES [[K0]]:_(s3), [[K1]]:_(s3), [[K2]]:_(s3)
-  CHECK-NEXT: [[MERGE1:%[0-9]+]]:_(s9) = G_MERGE_VALUES [[K3]]:_(s3), [[K4]]:_(s3), [[K5]]:_(s3)
-  CHECK-NEXT: [[MERGE2:%[0-9]+]]:_(s9) = G_MERGE_VALUES [[K6]]:_(s3), [[K7]]:_(s3), [[IMPDEF0]]:_(s3)
-  CHECK-NEXT: [[MERGE3:%[0-9]+]]:_(s27) = G_MERGE_VALUES [[MERGE0]]:_(s9), [[MERGE1]]:_(s9), [[MERGE2]]:_(s9)
-  CHECK-NEXT: (s24) = G_TRUNC [[MERGE3]]:_(s27)
-
-
-  CHECK: [[K8:%[0-9]+]]:_(s3) = G_CONSTANT i3 0
-  CHECK-NEXT: [[K9:%[0-9]+]]:_(s3) = G_CONSTANT i3 1
-  CHECK-NEXT: [[K10:%[0-9]+]]:_(s3) = G_CONSTANT i3 2
-  CHECK-NEXT: [[K11:%[0-9]+]]:_(s3) = G_CONSTANT i3 3
-  CHECK-NEXT: [[K12:%[0-9]+]]:_(s3) = G_CONSTANT i3 -4
-  CHECK-NEXT: [[K13:%[0-9]+]]:_(s3) = G_CONSTANT i3 -3
-  CHECK-NEXT: [[K14:%[0-9]+]]:_(s3) = G_CONSTANT i3 -2
-  CHECK-NEXT: [[IMPDEF1:%[0-9]+]]:_(s3) = G_IMPLICIT_DEF
-  CHECK-NEXT: [[MERGE4:%[0-9]+]]:_(s9) = G_MERGE_VALUES [[K8]]:_(s3), [[K9]]:_(s3), [[K10]]:_(s3)
-  CHECK-NEXT: [[MERGE5:%[0-9]+]]:_(s9) = G_MERGE_VALUES [[K11]]:_(s3), [[K12]]:_(s3), [[K13]]:_(s3)
-  CHECK-NEXT: [[MERGE6:%[0-9]+]]:_(s9) = G_MERGE_VALUES [[K14]]:_(s3), [[IMPDEF1]]:_(s3), [[IMPDEF1]]:_(s3)
-  CHECK-NEXT: [[MERGE7:%[0-9]+]]:_(s27) = G_MERGE_VALUES [[MERGE4]]:_(s9), [[MERGE5]]:_(s9), [[MERGE6]]:_(s9)
-  CHECK-NEXT: (s21) = G_TRUNC [[MERGE7]]:_(s27)
-
-
-  CHECK: [[K15:%[0-9]+]]:_(s8) = G_CONSTANT i8 0
-  CHECK-NEXT: [[K16:%[0-9]+]]:_(s8) = G_CONSTANT i8 1
-  CHECK-NEXT: [[ZEXT_K15:[0-9]+]]:_(s32) = G_ZEXT [[K15]]:_(s8)
-  CHECK-NEXT: [[ZEXT_K16:[0-9]+]]:_(s32) = G_ZEXT [[K16]]:_(s8)
-  [[K16:%[0-9]+]]:_(s32) = G_CONSTANT i32 8
-  [[SHL:%[0-9]+]]:_(s32) = G_SHL [[ZEXT_K16]]:_, [[K16]]:_(s32)
-  [[OR:%[0-9]+]]:_(s32) = G_OR [[ZEXT_K16]]:_, [[SHL]]:_
-  (s16) = G_TRUNC [[OR]]:_(s32)
-  )";
-
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, WidenScalarMergeValuesPointer) {
-  setUp();
-  if (!TM)
-    return;
-
-  DefineLegalizerInfo(A, {});
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  B.setInsertPt(*EntryMBB, EntryMBB->end());
-
-  const LLT S32 = LLT::scalar(32);
-  const LLT S64 = LLT::scalar(64);
-  const LLT P0 = LLT::pointer(0, 64);
-
-  auto Lo = B.buildTrunc(S32, Copies[0]);
-  auto Hi = B.buildTrunc(S32, Copies[1]);
-
-  auto Merge = B.buildMerge(P0, {Lo, Hi});
-
-  B.setInstr(*Merge);
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.widenScalar(*Merge, 1, S64));
-
-  auto CheckStr = R"(
-   CHECK: [[TRUNC0:%[0-9]+]]:_(s32) = G_TRUNC
-   CHECK: [[TRUNC1:%[0-9]+]]:_(s32) = G_TRUNC
-   CHECK: [[ZEXT_TRUNC0:%[0-9]+]]:_(s64) = G_ZEXT [[TRUNC0]]
-   CHECK: [[ZEXT_TRUNC1:%[0-9]+]]:_(s64) = G_ZEXT [[TRUNC1]]
-   CHECK: [[SHIFT_AMT:%[0-9]+]]:_(s64) = G_CONSTANT i64 32
-   CHECK: [[SHL:%[0-9]+]]:_(s64) = G_SHL [[ZEXT_TRUNC1]]:_, [[SHIFT_AMT]]
-   CHECK: [[OR:%[0-9]+]]:_(s64) = G_OR [[ZEXT_TRUNC0]]:_, [[SHL]]
-   CHECK: [[INTTOPTR:%[0-9]+]]:_(p0) = G_INTTOPTR [[OR]]:_(s64)
-  )";
-
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, WidenSEXTINREG) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_SEXT_INREG).legalForTypeWithAnyImm({s64});
-  });
-  // Build Instr
-  auto MIB = B.buildInstr(
-      TargetOpcode::G_SEXT_INREG, {LLT::scalar(32)},
-      {B.buildInstr(TargetOpcode::G_TRUNC, {LLT::scalar(32)}, {Copies[0]}),
-       uint64_t(8)});
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  // Perform Legalization
-  B.setInstr(*MIB);
-  ASSERT_TRUE(Helper.widenScalar(*MIB, 0, LLT::scalar(64)) ==
-              LegalizerHelper::LegalizeResult::Legalized);
-
-  auto CheckStr = R"(
-  CHECK: [[T0:%[0-9]+]]:_(s32) = G_TRUNC
-  CHECK: [[T1:%[0-9]+]]:_(s64) = G_ANYEXT [[T0]]:_(s32)
-  CHECK: [[T2:%[0-9]+]]:_(s64) = G_SEXT_INREG [[T1]]:_, 8
-  CHECK: [[T3:%[0-9]+]]:_(s32) = G_TRUNC [[T2]]:_(s64)
-  )";
-
-  // Check
-  ASSERT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, NarrowSEXTINREG) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info, these aren't actually relevant to the test.
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_SEXT_INREG).legalForTypeWithAnyImm({s64});
-  });
-  // Build Instr
-  auto MIB = B.buildInstr(
-      TargetOpcode::G_SEXT_INREG, {LLT::scalar(16)},
-      {B.buildInstr(TargetOpcode::G_TRUNC, {LLT::scalar(16)}, {Copies[0]}),
-       uint64_t(8)});
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  // Perform Legalization
-  B.setInstr(*MIB);
-  ASSERT_TRUE(Helper.narrowScalar(*MIB, 0, LLT::scalar(10)) ==
-              LegalizerHelper::LegalizeResult::Legalized);
-
-  auto CheckStr = R"(
-  CHECK: [[T0:%[0-9]+]]:_(s16) = G_TRUNC
-  CHECK: [[T1:%[0-9]+]]:_(s10) = G_TRUNC [[T0]]:_(s16)
-  CHECK: [[T2:%[0-9]+]]:_(s10) = G_SEXT_INREG [[T1]]:_, 8
-  CHECK: [[T3:%[0-9]+]]:_(s16) = G_SEXT [[T2]]:_(s10)
-  )";
-
-  // Check
-  ASSERT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, NarrowSEXTINREG2) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info, these aren't actually relevant to the test.
-  DefineLegalizerInfo(
-      A, { getActionDefinitionsBuilder(G_SEXT_INREG).legalForTypeWithAnyImm({s64}); });
-  // Build Instr
-  auto MIB = B.buildInstr(
-      TargetOpcode::G_SEXT_INREG, {LLT::scalar(32)},
-      {B.buildInstr(TargetOpcode::G_TRUNC, {LLT::scalar(32)}, {Copies[0]}),
-       uint64_t(9)});
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  // Perform Legalization
-  B.setInstr(*MIB);
-  ASSERT_TRUE(Helper.narrowScalar(*MIB, 0, LLT::scalar(8)) ==
-              LegalizerHelper::LegalizeResult::Legalized);
-
-  auto CheckStr = R"(
-  CHECK: [[T0:%[0-9]+]]:_(s32) = G_TRUNC
-  CHECK: [[T1:%[0-9]+]]:_(s8), [[T2:%[0-9]+]]:_(s8), [[T3:%[0-9]+]]:_(s8), [[T4:%[0-9]+]]:_(s8) = G_UNMERGE_VALUES [[T0]]:_(s32)
-  CHECK: [[CST2:%[0-9]+]]:_(s8) = G_CONSTANT i8 7
-  CHECK: [[T5:%[0-9]+]]:_(s8) = G_SEXT_INREG [[T2]]:_, 1
-  CHECK: [[T6:%[0-9]+]]:_(s8) = G_ASHR [[T5]]:_, [[CST2]]:_
-  CHECK: [[T7:%[0-9]+]]:_(s32) = G_MERGE_VALUES [[T1]]:_(s8), [[T5]]:_(s8), [[T6]]:_(s8), [[T6]]:_(s8)
-  )";
-
-  // Check
-  ASSERT_TRUE(CheckMachineFunction(*MF, CheckStr));
-}
-
-TEST_F(AArch64GISelMITest, LowerSEXTINREG) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info, these aren't actually relevant to the test.
-  DefineLegalizerInfo(
-      A, { getActionDefinitionsBuilder(G_SEXT_INREG).legalForTypeWithAnyImm({s64}); });
-  // Build Instr
-  auto MIB = B.buildInstr(
-      TargetOpcode::G_SEXT_INREG, {LLT::scalar(32)},
-      {B.buildInstr(TargetOpcode::G_TRUNC, {LLT::scalar(32)}, {Copies[0]}),
-       uint64_t(8)});
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  // Perform Legalization
-  B.setInstr(*MIB);
-  ASSERT_TRUE(Helper.lower(*MIB, 0, LLT()) ==
-              LegalizerHelper::LegalizeResult::Legalized);
-
-  auto CheckStr = R"(
-  CHECK: [[T1:%[0-9]+]]:_(s32) = G_TRUNC
-  CHECK: [[CST:%[0-9]+]]:_(s32) = G_CONSTANT i32 24
-  CHECK: [[T2:%[0-9]+]]:_(s32) = G_SHL [[T1]]:_, [[CST]]:_
-  CHECK: [[T3:%[0-9]+]]:_(s32) = G_ASHR [[T2]]:_, [[CST]]:_
-  )";
-
-  // Check
-  ASSERT_TRUE(CheckMachineFunction(*MF, CheckStr));
-}
-
-TEST_F(AArch64GISelMITest, LibcallFPExt) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_FPEXT).libcallFor({{s32, s16}, {s128, s64}});
-  });
-
-  LLT S16{LLT::scalar(16)};
-  LLT S32{LLT::scalar(32)};
-  LLT S128{LLT::scalar(128)};
-  auto MIBTrunc = B.buildTrunc(S16, Copies[0]);
-  auto MIBFPExt1 =
-      B.buildInstr(TargetOpcode::G_FPEXT, {S32}, {MIBTrunc});
-
-  auto MIBFPExt2 =
-      B.buildInstr(TargetOpcode::G_FPEXT, {S128}, {Copies[1]});
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  LostDebugLocObserver DummyLocObserver("");
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-              Helper.libcall(*MIBFPExt1, DummyLocObserver));
-
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-              Helper.libcall(*MIBFPExt2, DummyLocObserver));
-  auto CheckStr = R"(
-  CHECK: [[TRUNC:%[0-9]+]]:_(s16) = G_TRUNC
-  CHECK: $h0 = COPY [[TRUNC]]
-  CHECK: BL &__gnu_h2f_ieee
-  CHECK: $d0 = COPY
-  CHECK: BL &__extenddftf2
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, LibcallFPTrunc) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_FPTRUNC).libcallFor({{s16, s32}, {s64, s128}});
-  });
-
-  LLT S16{LLT::scalar(16)};
-  LLT S32{LLT::scalar(32)};
-  LLT S64{LLT::scalar(64)};
-  LLT S128{LLT::scalar(128)};
-  auto MIBTrunc = B.buildTrunc(S32, Copies[0]);
-  auto MIBFPTrunc1 =
-      B.buildInstr(TargetOpcode::G_FPTRUNC, {S16}, {MIBTrunc});
-
-  auto MIBMerge = B.buildMerge(S128, {Copies[1], Copies[2]});
-
-  auto MIBFPTrunc2 =
-      B.buildInstr(TargetOpcode::G_FPTRUNC, {S64}, {MIBMerge});
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LostDebugLocObserver DummyLocObserver("");
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBFPTrunc1, DummyLocObserver));
-
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBFPTrunc2, DummyLocObserver));
-  auto CheckStr = R"(
-  CHECK: [[TRUNC:%[0-9]+]]:_(s32) = G_TRUNC
-  CHECK: $s0 = COPY [[TRUNC]]
-  CHECK: BL &__gnu_f2h_ieee
-  CHECK: $q0 = COPY
-  CHECK: BL &__trunctfdf2
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, LibcallSimple) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_FADD).libcallFor({s16});
-  });
-
-  LLT S16{LLT::scalar(16)};
-  auto MIBTrunc = B.buildTrunc(S16, Copies[0]);
-  auto MIBFADD =
-      B.buildInstr(TargetOpcode::G_FADD, {S16}, {MIBTrunc, MIBTrunc});
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LostDebugLocObserver DummyLocObserver("");
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  // Make sure we do not crash anymore
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::UnableToLegalize,
-            Helper.libcall(*MIBFADD, DummyLocObserver));
-}
-
-TEST_F(AArch64GISelMITest, LibcallSRem) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_SREM).libcallFor({s32, s64, s128});
-  });
-
-  LLT S32{LLT::scalar(32)};
-  LLT S64{LLT::scalar(64)};
-  LLT S128{LLT::scalar(128)};
-  auto MIBTrunc = B.buildTrunc(S32, Copies[0]);
-  auto MIBExt = B.buildAnyExt(S128, Copies[0]);
-
-  auto MIBSRem32 =
-      B.buildInstr(TargetOpcode::G_SREM, {S32}, {MIBTrunc, MIBTrunc});
-  auto MIBSRem64 =
-      B.buildInstr(TargetOpcode::G_SREM, {S64}, {Copies[0], Copies[0]});
-  auto MIBSRem128 =
-      B.buildInstr(TargetOpcode::G_SREM, {S128}, {MIBExt, MIBExt});
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LostDebugLocObserver DummyLocObserver("");
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBSRem32, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBSRem64, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBSRem128, DummyLocObserver));
-
-  auto CheckStr = R"(
-  CHECK: [[COPY:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[TRUNC:%[0-9]+]]:_(s32) = G_TRUNC
-  CHECK: [[ANYEXT:%[0-9]+]]:_(s128) = G_ANYEXT
-  CHECK: $w0 = COPY [[TRUNC]]
-  CHECK: $w1 = COPY [[TRUNC]]
-  CHECK: BL &__modsi3
-  CHECK: $x0 = COPY [[COPY]]
-  CHECK: $x1 = COPY [[COPY]]
-  CHECK: BL &__moddi3
-  CHECK: [[UV:%[0-9]+]]:_(s64), [[UV1:%[0-9]+]]:_(s64) = G_UNMERGE_VALUES [[ANYEXT]]
-  CHECK: $x0 = COPY [[UV]]
-  CHECK: $x1 = COPY [[UV1]]
-  CHECK: [[UV2:%[0-9]+]]:_(s64), [[UV3:%[0-9]+]]:_(s64) = G_UNMERGE_VALUES [[ANYEXT]]
-  CHECK: $x2 = COPY [[UV2]]
-  CHECK: $x3 = COPY [[UV3]]
-  CHECK: BL &__modti3
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, LibcallURem) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_UREM).libcallFor({s32, s64, s128});
-  });
-
-  LLT S32{LLT::scalar(32)};
-  LLT S64{LLT::scalar(64)};
-  LLT S128{LLT::scalar(128)};
-  auto MIBTrunc = B.buildTrunc(S32, Copies[0]);
-  auto MIBExt = B.buildAnyExt(S128, Copies[0]);
-
-  auto MIBURem32 =
-      B.buildInstr(TargetOpcode::G_UREM, {S32}, {MIBTrunc, MIBTrunc});
-  auto MIBURem64 =
-      B.buildInstr(TargetOpcode::G_UREM, {S64}, {Copies[0], Copies[0]});
-  auto MIBURem128 =
-      B.buildInstr(TargetOpcode::G_UREM, {S128}, {MIBExt, MIBExt});
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LostDebugLocObserver DummyLocObserver("");
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBURem32, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBURem64, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBURem128, DummyLocObserver));
-
-  const auto *CheckStr = R"(
-  CHECK: [[COPY:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[TRUNC:%[0-9]+]]:_(s32) = G_TRUNC
-  CHECK: [[ANYEXT:%[0-9]+]]:_(s128) = G_ANYEXT
-  CHECK: $w0 = COPY [[TRUNC]]
-  CHECK: $w1 = COPY [[TRUNC]]
-  CHECK: BL &__umodsi3
-  CHECK: $x0 = COPY [[COPY]]
-  CHECK: $x1 = COPY [[COPY]]
-  CHECK: BL &__umoddi3
-  CHECK: [[UV:%[0-9]+]]:_(s64), [[UV1:%[0-9]+]]:_(s64) = G_UNMERGE_VALUES [[ANYEXT]]
-  CHECK: $x0 = COPY [[UV]]
-  CHECK: $x1 = COPY [[UV1]]
-  CHECK: [[UV2:%[0-9]+]]:_(s64), [[UV3:%[0-9]+]]:_(s64) = G_UNMERGE_VALUES [[ANYEXT]]
-  CHECK: $x2 = COPY [[UV2]]
-  CHECK: $x3 = COPY [[UV3]]
-  CHECK: BL &__umodti3
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, LibcallCtlzZeroUndef) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_CTLZ_ZERO_UNDEF)
-        .libcallFor({{s32, s32}, {s64, s64}, {s128, s128}});
-  });
-
-  LLT S32{LLT::scalar(32)};
-  LLT S64{LLT::scalar(64)};
-  LLT S128{LLT::scalar(128)};
-  auto MIBTrunc = B.buildTrunc(S32, Copies[0]);
-  auto MIBExt = B.buildAnyExt(S128, Copies[0]);
-
-  auto MIBCtlz32 =
-      B.buildInstr(TargetOpcode::G_CTLZ_ZERO_UNDEF, {S32}, {MIBTrunc});
-  auto MIBCtlz64 =
-      B.buildInstr(TargetOpcode::G_CTLZ_ZERO_UNDEF, {S64}, {Copies[0]});
-  auto MIBCtlz128 =
-      B.buildInstr(TargetOpcode::G_CTLZ_ZERO_UNDEF, {S128}, {MIBExt});
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LostDebugLocObserver DummyLocObserver("");
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBCtlz32, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBCtlz64, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBCtlz128, DummyLocObserver));
-
-  const auto *CheckStr = R"(
-  CHECK: [[COPY:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[TRUNC:%[0-9]+]]:_(s32) = G_TRUNC
-  CHECK: [[ANYEXT:%[0-9]+]]:_(s128) = G_ANYEXT
-  CHECK: $w0 = COPY [[TRUNC]]
-  CHECK: BL &__clzsi2
-  CHECK: $x0 = COPY [[COPY]]
-  CHECK: BL &__clzdi2
-  CHECK: [[UV:%[0-9]+]]:_(s64), [[UV1:%[0-9]+]]:_(s64) = G_UNMERGE_VALUES [[ANYEXT]]
-  CHECK: $x0 = COPY [[UV]]
-  CHECK: $x1 = COPY [[UV1]]
-  CHECK: BL &__clzti2
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, LibcallFAdd) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_FADD).libcallFor({s32, s64, s128});
-  });
-
-  LLT S32{LLT::scalar(32)};
-  LLT S64{LLT::scalar(64)};
-  LLT S128{LLT::scalar(128)};
-  auto MIBTrunc = B.buildTrunc(S32, Copies[0]);
-  auto MIBExt = B.buildAnyExt(S128, Copies[0]);
-
-  auto MIBAdd32 =
-      B.buildInstr(TargetOpcode::G_FADD, {S32}, {MIBTrunc, MIBTrunc});
-  auto MIBAdd64 =
-      B.buildInstr(TargetOpcode::G_FADD, {S64}, {Copies[0], Copies[0]});
-  auto MIBAdd128 = B.buildInstr(TargetOpcode::G_FADD, {S128}, {MIBExt, MIBExt});
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LostDebugLocObserver DummyLocObserver("");
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBAdd32, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBAdd64, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBAdd128, DummyLocObserver));
-
-  const auto *CheckStr = R"(
-  CHECK: [[COPY:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[TRUNC:%[0-9]+]]:_(s32) = G_TRUNC
-  CHECK: [[ANYEXT:%[0-9]+]]:_(s128) = G_ANYEXT
-  CHECK: $s0 = COPY [[TRUNC]]
-  CHECK: $s1 = COPY [[TRUNC]]
-  CHECK: BL &__addsf3
-  CHECK: $d0 = COPY [[COPY]]
-  CHECK: $d1 = COPY [[COPY]]
-  CHECK: BL &__adddf3
-  CHECK: $q0 = COPY [[ANYEXT]]
-  CHECK: $q1 = COPY [[ANYEXT]]
-  CHECK: BL &__addtf3
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, LibcallFSub) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_FSUB).libcallFor({s32, s64, s128});
-  });
-
-  LLT S32{LLT::scalar(32)};
-  LLT S64{LLT::scalar(64)};
-  LLT S128{LLT::scalar(128)};
-  auto MIBTrunc = B.buildTrunc(S32, Copies[0]);
-  auto MIBExt = B.buildAnyExt(S128, Copies[0]);
-
-  auto MIBSub32 =
-      B.buildInstr(TargetOpcode::G_FSUB, {S32}, {MIBTrunc, MIBTrunc});
-  auto MIBSub64 =
-      B.buildInstr(TargetOpcode::G_FSUB, {S64}, {Copies[0], Copies[0]});
-  auto MIBSub128 = B.buildInstr(TargetOpcode::G_FSUB, {S128}, {MIBExt, MIBExt});
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LostDebugLocObserver DummyLocObserver("");
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBSub32, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBSub64, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBSub128, DummyLocObserver));
-
-  const auto *CheckStr = R"(
-  CHECK: [[COPY:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[TRUNC:%[0-9]+]]:_(s32) = G_TRUNC
-  CHECK: [[ANYEXT:%[0-9]+]]:_(s128) = G_ANYEXT
-  CHECK: $s0 = COPY [[TRUNC]]
-  CHECK: $s1 = COPY [[TRUNC]]
-  CHECK: BL &__subsf3
-  CHECK: $d0 = COPY [[COPY]]
-  CHECK: $d1 = COPY [[COPY]]
-  CHECK: BL &__subdf3
-  CHECK: $q0 = COPY [[ANYEXT]]
-  CHECK: $q1 = COPY [[ANYEXT]]
-  CHECK: BL &__subtf3
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, LibcallFMul) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_FMUL).libcallFor({s32, s64, s128});
-  });
-
-  LLT S32{LLT::scalar(32)};
-  LLT S64{LLT::scalar(64)};
-  LLT S128{LLT::scalar(128)};
-  auto MIBTrunc = B.buildTrunc(S32, Copies[0]);
-  auto MIBExt = B.buildAnyExt(S128, Copies[0]);
-
-  auto MIBMul32 =
-      B.buildInstr(TargetOpcode::G_FMUL, {S32}, {MIBTrunc, MIBTrunc});
-  auto MIBMul64 =
-      B.buildInstr(TargetOpcode::G_FMUL, {S64}, {Copies[0], Copies[0]});
-  auto MIBMul128 = B.buildInstr(TargetOpcode::G_FMUL, {S128}, {MIBExt, MIBExt});
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  LostDebugLocObserver DummyLocObserver("");
-
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBMul32, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBMul64, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBMul128, DummyLocObserver));
-
-  const auto *CheckStr = R"(
-  CHECK: [[COPY:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[TRUNC:%[0-9]+]]:_(s32) = G_TRUNC
-  CHECK: [[ANYEXT:%[0-9]+]]:_(s128) = G_ANYEXT
-  CHECK: $s0 = COPY [[TRUNC]]
-  CHECK: $s1 = COPY [[TRUNC]]
-  CHECK: BL &__mulsf3
-  CHECK: $d0 = COPY [[COPY]]
-  CHECK: $d1 = COPY [[COPY]]
-  CHECK: BL &__muldf3
-  CHECK: $q0 = COPY [[ANYEXT]]
-  CHECK: $q1 = COPY [[ANYEXT]]
-  CHECK: BL &__multf3
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, LibcallFDiv) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_FDIV).libcallFor({s32, s64, s128});
-  });
-
-  LLT S32{LLT::scalar(32)};
-  LLT S64{LLT::scalar(64)};
-  LLT S128{LLT::scalar(128)};
-  auto MIBTrunc = B.buildTrunc(S32, Copies[0]);
-  auto MIBExt = B.buildAnyExt(S128, Copies[0]);
-
-  auto MIBDiv32 =
-      B.buildInstr(TargetOpcode::G_FDIV, {S32}, {MIBTrunc, MIBTrunc});
-  auto MIBDiv64 =
-      B.buildInstr(TargetOpcode::G_FDIV, {S64}, {Copies[0], Copies[0]});
-  auto MIBDiv128 = B.buildInstr(TargetOpcode::G_FDIV, {S128}, {MIBExt, MIBExt});
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LostDebugLocObserver DummyLocObserver("");
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBDiv32, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBDiv64, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBDiv128, DummyLocObserver));
-
-  const auto *CheckStr = R"(
-  CHECK: [[COPY:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[TRUNC:%[0-9]+]]:_(s32) = G_TRUNC
-  CHECK: [[ANYEXT:%[0-9]+]]:_(s128) = G_ANYEXT
-  CHECK: $s0 = COPY [[TRUNC]]
-  CHECK: $s1 = COPY [[TRUNC]]
-  CHECK: BL &__divsf3
-  CHECK: $d0 = COPY [[COPY]]
-  CHECK: $d1 = COPY [[COPY]]
-  CHECK: BL &__divdf3
-  CHECK: $q0 = COPY [[ANYEXT]]
-  CHECK: $q1 = COPY [[ANYEXT]]
-  CHECK: BL &__divtf3
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, LibcallFExp) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_FEXP).libcallFor({s32, s64, s128});
-  });
-
-  LLT S32{LLT::scalar(32)};
-  LLT S64{LLT::scalar(64)};
-  LLT S128{LLT::scalar(128)};
-  auto MIBTrunc = B.buildTrunc(S32, Copies[0]);
-  auto MIBExt = B.buildAnyExt(S128, Copies[0]);
-
-  auto MIBExp32 = B.buildInstr(TargetOpcode::G_FEXP, {S32}, {MIBTrunc});
-  auto MIBExp64 = B.buildInstr(TargetOpcode::G_FEXP, {S64}, {Copies[0]});
-  auto MIBExp128 = B.buildInstr(TargetOpcode::G_FEXP, {S128}, {MIBExt});
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LostDebugLocObserver DummyLocObserver("");
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBExp32, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBExp64, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBExp128, DummyLocObserver));
-
-  const auto *CheckStr = R"(
-  CHECK: [[COPY:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[TRUNC:%[0-9]+]]:_(s32) = G_TRUNC
-  CHECK: [[ANYEXT:%[0-9]+]]:_(s128) = G_ANYEXT
-  CHECK: $s0 = COPY [[TRUNC]]
-  CHECK: BL &expf
-  CHECK: $d0 = COPY [[COPY]]
-  CHECK: BL &exp
-  CHECK: $q0 = COPY [[ANYEXT]]
-  CHECK: BL &expl
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, LibcallFExp2) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_FEXP2).libcallFor({s32, s64, s128});
-  });
-
-  LLT S32{LLT::scalar(32)};
-  LLT S64{LLT::scalar(64)};
-  LLT S128{LLT::scalar(128)};
-  auto MIBTrunc = B.buildTrunc(S32, Copies[0]);
-  auto MIBExt = B.buildAnyExt(S128, Copies[0]);
-
-  auto MIBExp232 = B.buildInstr(TargetOpcode::G_FEXP2, {S32}, {MIBTrunc});
-  auto MIBExp264 = B.buildInstr(TargetOpcode::G_FEXP2, {S64}, {Copies[0]});
-  auto MIBExp2128 = B.buildInstr(TargetOpcode::G_FEXP2, {S128}, {MIBExt});
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LostDebugLocObserver DummyLocObserver("");
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBExp232, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBExp264, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBExp2128, DummyLocObserver));
-
-  const auto *CheckStr = R"(
-  CHECK: [[COPY:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[TRUNC:%[0-9]+]]:_(s32) = G_TRUNC
-  CHECK: [[ANYEXT:%[0-9]+]]:_(s128) = G_ANYEXT
-  CHECK: $s0 = COPY [[TRUNC]]
-  CHECK: BL &exp2f
-  CHECK: $d0 = COPY [[COPY]]
-  CHECK: BL &exp2
-  CHECK: $q0 = COPY [[ANYEXT]]
-  CHECK: BL &exp2l
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, LibcallFRem) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_FREM).libcallFor({s32, s64, s128});
-  });
-
-  LLT S32{LLT::scalar(32)};
-  LLT S64{LLT::scalar(64)};
-  LLT S128{LLT::scalar(128)};
-  auto MIBTrunc = B.buildTrunc(S32, Copies[0]);
-  auto MIBExt = B.buildAnyExt(S128, Copies[0]);
-
-  auto MIBFRem32 = B.buildInstr(TargetOpcode::G_FREM, {S32}, {MIBTrunc});
-  auto MIBFRem64 = B.buildInstr(TargetOpcode::G_FREM, {S64}, {Copies[0]});
-  auto MIBFRem128 = B.buildInstr(TargetOpcode::G_FREM, {S128}, {MIBExt});
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LostDebugLocObserver DummyLocObserver("");
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBFRem32, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBFRem64, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBFRem128, DummyLocObserver));
-
-  const auto *CheckStr = R"(
-  CHECK: [[COPY:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[TRUNC:%[0-9]+]]:_(s32) = G_TRUNC
-  CHECK: [[ANYEXT:%[0-9]+]]:_(s128) = G_ANYEXT
-  CHECK: $s0 = COPY [[TRUNC]]
-  CHECK: BL &fmodf
-  CHECK: $d0 = COPY [[COPY]]
-  CHECK: BL &fmod
-  CHECK: $q0 = COPY [[ANYEXT]]
-  CHECK: BL &fmodl
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, LibcallFPow) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_FPOW).libcallFor({s32, s64, s128});
-  });
-
-  LLT S32{LLT::scalar(32)};
-  LLT S64{LLT::scalar(64)};
-  LLT S128{LLT::scalar(128)};
-  auto MIBTrunc = B.buildTrunc(S32, Copies[0]);
-  auto MIBExt = B.buildAnyExt(S128, Copies[0]);
-
-  auto MIBPow32 = B.buildInstr(TargetOpcode::G_FPOW, {S32}, {MIBTrunc});
-  auto MIBPow64 = B.buildInstr(TargetOpcode::G_FPOW, {S64}, {Copies[0]});
-  auto MIBPow128 = B.buildInstr(TargetOpcode::G_FPOW, {S128}, {MIBExt});
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LostDebugLocObserver DummyLocObserver("");
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBPow32, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBPow64, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBPow128, DummyLocObserver));
-
-  const auto *CheckStr = R"(
-  CHECK: [[COPY:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[TRUNC:%[0-9]+]]:_(s32) = G_TRUNC
-  CHECK: [[ANYEXT:%[0-9]+]]:_(s128) = G_ANYEXT
-  CHECK: $s0 = COPY [[TRUNC]]
-  CHECK: BL &powf
-  CHECK: $d0 = COPY [[COPY]]
-  CHECK: BL &pow
-  CHECK: $q0 = COPY [[ANYEXT]]
-  CHECK: BL &powl
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, LibcallFMa) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_FMA).libcallFor({s32, s64, s128});
-  });
-
-  LLT S32{LLT::scalar(32)};
-  LLT S64{LLT::scalar(64)};
-  LLT S128{LLT::scalar(128)};
-  auto MIBTrunc = B.buildTrunc(S32, Copies[0]);
-  auto MIBExt = B.buildAnyExt(S128, Copies[0]);
-
-  auto MIBMa32 = B.buildInstr(TargetOpcode::G_FMA, {S32}, {MIBTrunc, MIBTrunc});
-  auto MIBMa64 =
-      B.buildInstr(TargetOpcode::G_FMA, {S64}, {Copies[0], Copies[0]});
-  auto MIBMa128 = B.buildInstr(TargetOpcode::G_FMA, {S128}, {MIBExt, MIBExt});
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LostDebugLocObserver DummyLocObserver("");
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBMa32, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBMa64, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBMa128, DummyLocObserver));
-
-  const auto *CheckStr = R"(
-  CHECK: [[COPY:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[TRUNC:%[0-9]+]]:_(s32) = G_TRUNC
-  CHECK: [[ANYEXT:%[0-9]+]]:_(s128) = G_ANYEXT
-  CHECK: $s0 = COPY [[TRUNC]]
-  CHECK: BL &fmaf
-  CHECK: $d0 = COPY [[COPY]]
-  CHECK: BL &fma
-  CHECK: $q0 = COPY [[ANYEXT]]
-  CHECK: BL &fmal
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, LibcallFCeil) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_FCEIL).libcallFor({s32, s64, s128});
-  });
-
-  LLT S32{LLT::scalar(32)};
-  LLT S64{LLT::scalar(64)};
-  LLT S128{LLT::scalar(128)};
-  auto MIBTrunc = B.buildTrunc(S32, Copies[0]);
-  auto MIBExt = B.buildAnyExt(S128, Copies[0]);
-
-  auto MIBCeil32 = B.buildInstr(TargetOpcode::G_FCEIL, {S32}, {MIBTrunc});
-  auto MIBCeil64 = B.buildInstr(TargetOpcode::G_FCEIL, {S64}, {Copies[0]});
-  auto MIBCeil128 = B.buildInstr(TargetOpcode::G_FCEIL, {S128}, {MIBExt});
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  LostDebugLocObserver DummyLocObserver("");
-
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBCeil32, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBCeil64, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBCeil128, DummyLocObserver));
-
-  const auto *CheckStr = R"(
-  CHECK: [[COPY:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[TRUNC:%[0-9]+]]:_(s32) = G_TRUNC
-  CHECK: [[ANYEXT:%[0-9]+]]:_(s128) = G_ANYEXT
-  CHECK: $s0 = COPY [[TRUNC]]
-  CHECK: BL &ceilf
-  CHECK: $d0 = COPY [[COPY]]
-  CHECK: BL &ceil
-  CHECK: $q0 = COPY [[ANYEXT]]
-  CHECK: BL &ceill
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, LibcallFFloor) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_FFLOOR).libcallFor({s32, s64, s128});
-  });
-
-  LLT S32{LLT::scalar(32)};
-  LLT S64{LLT::scalar(64)};
-  LLT S128{LLT::scalar(128)};
-  auto MIBTrunc = B.buildTrunc(S32, Copies[0]);
-  auto MIBExt = B.buildAnyExt(S128, Copies[0]);
-
-  auto MIBFloor32 = B.buildInstr(TargetOpcode::G_FFLOOR, {S32}, {MIBTrunc});
-  auto MIBFloor64 = B.buildInstr(TargetOpcode::G_FFLOOR, {S64}, {Copies[0]});
-  auto MIBFloor128 = B.buildInstr(TargetOpcode::G_FFLOOR, {S128}, {MIBExt});
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  LostDebugLocObserver DummyLocObserver("");
-
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBFloor32, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBFloor64, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBFloor128, DummyLocObserver));
-
-  const auto *CheckStr = R"(
-  CHECK: [[COPY:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[TRUNC:%[0-9]+]]:_(s32) = G_TRUNC
-  CHECK: [[ANYEXT:%[0-9]+]]:_(s128) = G_ANYEXT
-  CHECK: $s0 = COPY [[TRUNC]]
-  CHECK: BL &floorf
-  CHECK: $d0 = COPY [[COPY]]
-  CHECK: BL &floor
-  CHECK: $q0 = COPY [[ANYEXT]]
-  CHECK: BL &floorl
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, LibcallFMinNum) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_FMINNUM).libcallFor({s32, s64, s128});
-  });
-
-  LLT S32{LLT::scalar(32)};
-  LLT S64{LLT::scalar(64)};
-  LLT S128{LLT::scalar(128)};
-  auto MIBTrunc = B.buildTrunc(S32, Copies[0]);
-  auto MIBExt = B.buildAnyExt(S128, Copies[0]);
-
-  auto MIBMin32 = B.buildFMinNum(S32, MIBTrunc, MIBTrunc);
-  auto MIBMin64 = B.buildFMinNum(S64, Copies[0], Copies[0]);
-  auto MIBMin128 = B.buildFMinNum(S128, MIBExt, MIBExt);
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  LostDebugLocObserver DummyLocObserver("");
-
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBMin32, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBMin64, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBMin128, DummyLocObserver));
-
-  const auto *CheckStr = R"(
-  CHECK: [[COPY:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[TRUNC:%[0-9]+]]:_(s32) = G_TRUNC
-  CHECK: [[ANYEXT:%[0-9]+]]:_(s128) = G_ANYEXT
-  CHECK: $s0 = COPY [[TRUNC]]
-  CHECK: $s1 = COPY [[TRUNC]]
-  CHECK: BL &fminf
-  CHECK: $d0 = COPY [[COPY]]
-  CHECK: $d1 = COPY [[COPY]]
-  CHECK: BL &fmin
-  CHECK: $q0 = COPY [[ANYEXT]]
-  CHECK: $q1 = COPY [[ANYEXT]]
-  CHECK: BL &fminl
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, LibcallFMaxNum) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_FMAXNUM).libcallFor({s32, s64, s128});
-  });
-
-  LLT S32{LLT::scalar(32)};
-  LLT S64{LLT::scalar(64)};
-  LLT S128{LLT::scalar(128)};
-  auto MIBTrunc = B.buildTrunc(S32, Copies[0]);
-  auto MIBExt = B.buildAnyExt(S128, Copies[0]);
-
-  auto MIBMax32 = B.buildFMaxNum(S32, MIBTrunc, MIBTrunc);
-  auto MIBMax64 = B.buildFMaxNum(S64, Copies[0], Copies[0]);
-  auto MIBMax128 = B.buildFMaxNum(S128, MIBExt, MIBExt);
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  LostDebugLocObserver DummyLocObserver("");
-
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBMax32, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBMax64, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBMax128, DummyLocObserver));
-
-  const auto *CheckStr = R"(
-  CHECK: [[COPY:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[TRUNC:%[0-9]+]]:_(s32) = G_TRUNC
-  CHECK: [[ANYEXT:%[0-9]+]]:_(s128) = G_ANYEXT
-  CHECK: $s0 = COPY [[TRUNC]]
-  CHECK: $s1 = COPY [[TRUNC]]
-  CHECK: BL &fmaxf
-  CHECK: $d0 = COPY [[COPY]]
-  CHECK: $d1 = COPY [[COPY]]
-  CHECK: BL &fmax
-  CHECK: $q0 = COPY [[ANYEXT]]
-  CHECK: $q1 = COPY [[ANYEXT]]
-  CHECK: BL &fmaxl
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, LibcallFSqrt) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_FSQRT).libcallFor({s32, s64, s128});
-  });
-
-  LLT S32{LLT::scalar(32)};
-  LLT S64{LLT::scalar(64)};
-  LLT S128{LLT::scalar(128)};
-  auto MIBTrunc = B.buildTrunc(S32, Copies[0]);
-  auto MIBExt = B.buildAnyExt(S128, Copies[0]);
-
-  auto MIBSqrt32 = B.buildInstr(TargetOpcode::G_FSQRT, {S32}, {MIBTrunc});
-  auto MIBSqrt64 = B.buildInstr(TargetOpcode::G_FSQRT, {S64}, {Copies[0]});
-  auto MIBSqrt128 = B.buildInstr(TargetOpcode::G_FSQRT, {S128}, {MIBExt});
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  LostDebugLocObserver DummyLocObserver("");
-
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBSqrt32, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBSqrt64, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBSqrt128, DummyLocObserver));
-
-  const auto *CheckStr = R"(
-  CHECK: [[COPY:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[TRUNC:%[0-9]+]]:_(s32) = G_TRUNC
-  CHECK: [[ANYEXT:%[0-9]+]]:_(s128) = G_ANYEXT
-  CHECK: $s0 = COPY [[TRUNC]]
-  CHECK: BL &sqrtf
-  CHECK: $d0 = COPY [[COPY]]
-  CHECK: BL &sqrt
-  CHECK: $q0 = COPY [[ANYEXT]]
-  CHECK: BL &sqrtl
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, LibcallFRint) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_FRINT).libcallFor({s32, s64, s128});
-  });
-
-  LLT S32{LLT::scalar(32)};
-  LLT S64{LLT::scalar(64)};
-  LLT S128{LLT::scalar(128)};
-  auto MIBTrunc = B.buildTrunc(S32, Copies[0]);
-  auto MIBExt = B.buildAnyExt(S128, Copies[0]);
-
-  auto MIBRint32 = B.buildInstr(TargetOpcode::G_FRINT, {S32}, {MIBTrunc});
-  auto MIBRint64 = B.buildInstr(TargetOpcode::G_FRINT, {S64}, {Copies[0]});
-  auto MIBRint128 = B.buildInstr(TargetOpcode::G_FRINT, {S128}, {MIBExt});
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  LostDebugLocObserver DummyLocObserver("");
-
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBRint32, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBRint64, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBRint128, DummyLocObserver));
-
-  const auto *CheckStr = R"(
-  CHECK: [[COPY:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[TRUNC:%[0-9]+]]:_(s32) = G_TRUNC
-  CHECK: [[ANYEXT:%[0-9]+]]:_(s128) = G_ANYEXT
-  CHECK: $s0 = COPY [[TRUNC]]
-  CHECK: BL &rintf
-  CHECK: $d0 = COPY [[COPY]]
-  CHECK: BL &rint
-  CHECK: $q0 = COPY [[ANYEXT]]
-  CHECK: BL &rintl
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, LibcallFNearbyInt) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_FNEARBYINT).libcallFor({s32, s64, s128});
-  });
-
-  LLT S32{LLT::scalar(32)};
-  LLT S64{LLT::scalar(64)};
-  LLT S128{LLT::scalar(128)};
-  auto MIBTrunc = B.buildTrunc(S32, Copies[0]);
-  auto MIBExt = B.buildAnyExt(S128, Copies[0]);
-
-  auto MIBNearbyInt32 =
-      B.buildInstr(TargetOpcode::G_FNEARBYINT, {S32}, {MIBTrunc});
-  auto MIBNearbyInt64 =
-      B.buildInstr(TargetOpcode::G_FNEARBYINT, {S64}, {Copies[0]});
-  auto MIBNearbyInt128 =
-      B.buildInstr(TargetOpcode::G_FNEARBYINT, {S128}, {MIBExt});
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  LostDebugLocObserver DummyLocObserver("");
-
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBNearbyInt32, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBNearbyInt64, DummyLocObserver));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.libcall(*MIBNearbyInt128, DummyLocObserver));
-
-  const auto *CheckStr = R"(
-  CHECK: [[COPY:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[TRUNC:%[0-9]+]]:_(s32) = G_TRUNC
-  CHECK: [[ANYEXT:%[0-9]+]]:_(s128) = G_ANYEXT
-  CHECK: $s0 = COPY [[TRUNC]]
-  CHECK: BL &nearbyintf
-  CHECK: $d0 = COPY [[COPY]]
-  CHECK: BL &nearbyint
-  CHECK: $q0 = COPY [[ANYEXT]]
-  CHECK: BL &nearbyintl
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, NarrowScalarExtract) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {
-    getActionDefinitionsBuilder(G_UNMERGE_VALUES).legalFor({{s32, s64}});
-    getActionDefinitionsBuilder(G_EXTRACT).legalForTypeWithAnyImm({{s16, s32}});
-  });
-
-  LLT S16{LLT::scalar(16)};
-  LLT S32{LLT::scalar(32)};
-
-  auto MIBExtractS32 = B.buildExtract(S32, Copies[1], 32);
-  auto MIBExtractS16 = B.buildExtract(S16, Copies[1], 0);
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.narrowScalar(*MIBExtractS32, 1, S32));
-
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.narrowScalar(*MIBExtractS16, 1, S32));
-
-  const auto *CheckStr = R"(
-  CHECK: [[UV:%[0-9]+]]:_(s32), [[UV1:%[0-9]+]]:_(s32) = G_UNMERGE_VALUES
-  CHECK: [[COPY:%[0-9]+]]:_(s32) = COPY [[UV1]]
-  CHECK: [[UV3:%[0-9]+]]:_(s32), [[UV4:%[0-9]+]]:_(s32) = G_UNMERGE_VALUES
-  CHECK: [[EXTR:%[0-9]+]]:_(s16) = G_EXTRACT [[UV3]]:_(s32), 0
-  CHECK: [[COPY:%[0-9]+]]:_(s16) = COPY [[EXTR]]
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, LowerInsert) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, { getActionDefinitionsBuilder(G_INSERT).lower(); });
-
-  LLT S32{LLT::scalar(32)};
-  LLT S64{LLT::scalar(64)};
-  LLT P0{LLT::pointer(0, 64)};
-  LLT P1{LLT::pointer(1, 32)};
-  LLT V2S32{LLT::fixed_vector(2, 32)};
-
-  auto TruncS32 = B.buildTrunc(S32, Copies[0]);
-  auto IntToPtrP0 = B.buildIntToPtr(P0, Copies[0]);
-  auto IntToPtrP1 = B.buildIntToPtr(P1, TruncS32);
-  auto BitcastV2S32 = B.buildBitcast(V2S32, Copies[0]);
-
-  auto InsertS64S32 = B.buildInsert(S64, Copies[0], TruncS32, 0);
-  auto InsertS64P1 = B.buildInsert(S64, Copies[0], IntToPtrP1, 8);
-  auto InsertP0S32 = B.buildInsert(P0, IntToPtrP0, TruncS32, 16);
-  auto InsertP0P1 = B.buildInsert(P0, IntToPtrP0, IntToPtrP1, 4);
-  auto InsertV2S32S32 = B.buildInsert(V2S32, BitcastV2S32, TruncS32, 32);
-  auto InsertV2S32P1 = B.buildInsert(V2S32, BitcastV2S32, IntToPtrP1, 0);
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*InsertS64S32, 0, LLT{}));
-
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*InsertS64P1, 0, LLT{}));
-
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*InsertP0S32, 0, LLT{}));
-
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*InsertP0P1, 0, LLT{}));
-
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*InsertV2S32S32, 0, LLT{}));
-
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::UnableToLegalize,
-            Helper.lower(*InsertV2S32P1, 0, LLT{}));
-
-  const auto *CheckStr = R"(
-  CHECK: [[S64:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[S32:%[0-9]+]]:_(s32) = G_TRUNC [[S64]]
-  CHECK: [[P0:%[0-9]+]]:_(p0) = G_INTTOPTR [[S64]]
-  CHECK: [[P1:%[0-9]+]]:_(p1) = G_INTTOPTR [[S32]]
-  CHECK: [[V2S32:%[0-9]+]]:_(<2 x s32>) = G_BITCAST [[S64]]
-  CHECK: [[ZEXT:%[0-9]+]]:_(s64) = G_ZEXT [[S32]]
-  CHECK: [[C:%[0-9]+]]:_(s64) = G_CONSTANT
-  CHECK: [[AND:%[0-9]+]]:_(s64) = G_AND [[S64]]:_, [[C]]:_
-  CHECK: [[OR:%[0-9]+]]:_(s64) = G_OR [[AND]]:_, [[ZEXT]]:_
-
-  CHECK: [[PTRTOINT:%[0-9]+]]:_(s32) = G_PTRTOINT [[P1]]
-  CHECK: [[ZEXT:%[0-9]+]]:_(s64) = G_ZEXT [[PTRTOINT]]
-  CHECK: [[C:%[0-9]+]]:_(s64) = G_CONSTANT
-  CHECK: [[SHL:%[0-9]+]]:_(s64) = G_SHL [[ZEXT]]:_, [[C]]:_(s64)
-  CHECK: [[C:%[0-9]+]]:_(s64) = G_CONSTANT
-  CHECK: [[AND:%[0-9]+]]:_(s64) = G_AND [[S64]]:_, [[C]]:_
-  CHECK: [[OR:%[0-9]+]]:_(s64) = G_OR [[AND]]:_, [[SHL]]:_
-
-  CHECK: [[PTRTOINT:%[0-9]+]]:_(s64) = G_PTRTOINT [[P0]]
-  CHECK: [[ZEXT:%[0-9]+]]:_(s64) = G_ZEXT [[S32]]
-  CHECK: [[C:%[0-9]+]]:_(s64) = G_CONSTANT
-  CHECK: [[SHL:%[0-9]+]]:_(s64) = G_SHL [[ZEXT]]:_, [[C]]:_(s64)
-  CHECK: [[C:%[0-9]+]]:_(s64) = G_CONSTANT
-  CHECK: [[AND:%[0-9]+]]:_(s64) = G_AND [[PTRTOINT]]:_, [[C]]:_
-  CHECK: [[OR:%[0-9]+]]:_(s64) = G_OR [[AND]]:_, [[SHL]]:_
-  CHECK: [[INTTOPTR:%[0-9]+]]:_(p0) = G_INTTOPTR [[OR]]
-
-  CHECK: [[PTRTOINT:%[0-9]+]]:_(s64) = G_PTRTOINT [[P0]]
-  CHECK: [[PTRTOINT1:%[0-9]+]]:_(s32) = G_PTRTOINT [[P1]]
-  CHECK: [[ZEXT:%[0-9]+]]:_(s64) = G_ZEXT [[PTRTOINT1]]
-  CHECK: [[C:%[0-9]+]]:_(s64) = G_CONSTANT
-  CHECK: [[SHL:%[0-9]+]]:_(s64) = G_SHL [[ZEXT]]:_, [[C]]:_(s64)
-  CHECK: [[C:%[0-9]+]]:_(s64) = G_CONSTANT
-  CHECK: [[AND:%[0-9]+]]:_(s64) = G_AND [[PTRTOINT]]:_, [[C]]:_
-  CHECK: [[OR:%[0-9]+]]:_(s64) = G_OR [[AND]]:_, [[SHL]]:_
-  CHECK: [[INTTOPTR:%[0-9]+]]:_(p0) = G_INTTOPTR [[OR]]
-
-  CHECK: [[BITCAST:%[0-9]+]]:_(s64) = G_BITCAST [[V2S32]]
-  CHECK: [[ZEXT:%[0-9]+]]:_(s64) = G_ZEXT [[S32]]
-  CHECK: [[C:%[0-9]+]]:_(s64) = G_CONSTANT
-  CHECK: [[SHL:%[0-9]+]]:_(s64) = G_SHL [[ZEXT]]:_, [[C]]:_(s64)
-  CHECK: [[C:%[0-9]+]]:_(s64) = G_CONSTANT
-  CHECK: [[AND:%[0-9]+]]:_(s64) = G_AND [[BITCAST]]:_, [[C]]:_
-  CHECK: [[OR:%[0-9]+]]:_(s64) = G_OR [[AND]]:_, [[SHL]]:_
-  CHECK: [[BITCAST:%[0-9]+]]:_(<2 x s32>) = G_BITCAST [[OR]]
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-// Test lowering of G_FFLOOR
-TEST_F(AArch64GISelMITest, LowerFFloor) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(A, {});
-  // Build Instr
-  auto Floor = B.buildFFloor(LLT::scalar(64), Copies[0], MachineInstr::MIFlag::FmNoInfs);
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  // Perform Legalization
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*Floor, 0, LLT()));
-
-  auto CheckStr = R"(
-  CHECK: [[COPY:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[TRUNC:%[0-9]+]]:_(s64) = ninf G_INTRINSIC_TRUNC [[COPY]]
-  CHECK: [[ZERO:%[0-9]+]]:_(s64) = G_FCONSTANT double 0.000000e+00
-  CHECK: [[CMP0:%[0-9]+]]:_(s1) = ninf G_FCMP floatpred(olt), [[COPY]]:_(s64), [[ZERO]]:_
-  CHECK: [[CMP1:%[0-9]+]]:_(s1) = ninf G_FCMP floatpred(one), [[COPY]]:_(s64), [[TRUNC]]:_
-  CHECK: [[AND:%[0-9]+]]:_(s1) = G_AND [[CMP0]]:_, [[CMP1]]:_
-  CHECK: [[ITOFP:%[0-9]+]]:_(s64) = G_SITOFP [[AND]]
-  = ninf G_FADD [[TRUNC]]:_, [[ITOFP]]:_
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-// Test lowering of G_BSWAP
-TEST_F(AArch64GISelMITest, LowerBSWAP) {
-  setUp();
-  if (!TM)
-    return;
-
-  DefineLegalizerInfo(A, {});
-
-  // Make sure vector lowering doesn't assert.
-  auto Cast = B.buildBitcast(LLT::fixed_vector(2, 32), Copies[0]);
-  auto BSwap = B.buildBSwap(LLT::fixed_vector(2, 32), Cast);
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  // Perform Legalization
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*BSwap, 0, LLT()));
-
-  auto CheckStr = R"(
-  CHECK: [[COPY:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[VEC:%[0-9]+]]:_(<2 x s32>) = G_BITCAST [[COPY]]
-  CHECK: [[K24:%[0-9]+]]:_(s32) = G_CONSTANT i32 24
-  CHECK: [[SPLAT24:%[0-9]+]]:_(<2 x s32>) = G_BUILD_VECTOR [[K24]]:_(s32), [[K24]]:_(s32)
-  CHECK: [[SHL0:%[0-9]+]]:_(<2 x s32>) = G_SHL [[VEC]]:_, [[SPLAT24]]
-  CHECK: [[SHR0:%[0-9]+]]:_(<2 x s32>) = G_LSHR [[VEC]]:_, [[SPLAT24]]
-  CHECK: [[OR0:%[0-9]+]]:_(<2 x s32>) = G_OR [[SHR0]]:_, [[SHL0]]:_
-  CHECK: [[KMASK:%[0-9]+]]:_(s32) = G_CONSTANT i32 65280
-  CHECK: [[SPLATMASK:%[0-9]+]]:_(<2 x s32>) = G_BUILD_VECTOR [[KMASK]]:_(s32), [[KMASK]]:_(s32)
-  CHECK: [[K8:%[0-9]+]]:_(s32) = G_CONSTANT i32 8
-  CHECK: [[SPLAT8:%[0-9]+]]:_(<2 x s32>) = G_BUILD_VECTOR [[K8]]:_(s32), [[K8]]:_(s32)
-  CHECK: [[AND0:%[0-9]+]]:_(<2 x s32>) = G_AND [[VEC]]:_, [[SPLATMASK]]:_
-  CHECK: [[SHL1:%[0-9]+]]:_(<2 x s32>) = G_SHL [[AND0]]:_, [[SPLAT8]]
-  CHECK: [[OR1:%[0-9]+]]:_(<2 x s32>) = G_OR [[OR0]]:_, [[SHL1]]:_
-  CHECK: [[SHR1:%[0-9]+]]:_(<2 x s32>) = G_LSHR [[VEC]]:_, [[SPLAT8]]
-  CHECK: [[AND1:%[0-9]+]]:_(<2 x s32>) = G_AND [[SHR1]]:_, [[SPLATMASK]]:_
-  CHECK: [[BSWAP:%[0-9]+]]:_(<2 x s32>) = G_OR [[OR1]]:_, [[AND1]]:_
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-// Test lowering of G_SDIVREM into G_SDIV and G_SREM
-TEST_F(AArch64GISelMITest, LowerSDIVREM) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(
-      A, { getActionDefinitionsBuilder(G_SDIVREM).lowerFor({s64}); });
-
-  LLT S64{LLT::scalar(64)};
-
-  // Build Instr
-  auto SDivrem =
-      B.buildInstr(TargetOpcode::G_SDIVREM, {S64, S64}, {Copies[0], Copies[1]});
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  // Perform Legalization
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*SDivrem, 0, S64));
-
-  const auto *CheckStr = R"(
-  CHECK: [[DIV:%[0-9]+]]:_(s64) = G_SDIV %0:_, %1:_
-  CHECK: [[REM:%[0-9]+]]:_(s64) = G_SREM %0:_, %1:_
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-// Test lowering of G_UDIVREM into G_UDIV and G_UREM
-TEST_F(AArch64GISelMITest, LowerUDIVREM) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Declare your legalization info
-  DefineLegalizerInfo(
-      A, { getActionDefinitionsBuilder(G_UDIVREM).lowerFor({s64}); });
-
-  LLT S64{LLT::scalar(64)};
-
-  // Build Instr
-  auto UDivrem =
-      B.buildInstr(TargetOpcode::G_UDIVREM, {S64, S64}, {Copies[0], Copies[1]});
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  // Perform Legalization
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*UDivrem, 0, S64));
-
-  const auto *CheckStr = R"(
-  CHECK: [[DIV:%[0-9]+]]:_(s64) = G_UDIV %0:_, %1:_
-  CHECK: [[REM:%[0-9]+]]:_(s64) = G_UREM %0:_, %1:_
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-// Test widening of G_UNMERGE_VALUES
-TEST_F(AArch64GISelMITest, WidenUnmerge) {
-  setUp();
-  if (!TM)
-    return;
-
-  DefineLegalizerInfo(A, {});
-
-  // Check that widening G_UNMERGE_VALUES to a larger type than the source type
-  // works as expected
-  LLT P0{LLT::pointer(0, 64)};
-  LLT S32{LLT::scalar(32)};
-  LLT S96{LLT::scalar(96)};
-
-  auto IntToPtr = B.buildIntToPtr(P0, Copies[0]);
-  auto UnmergePtr = B.buildUnmerge(S32, IntToPtr);
-  auto UnmergeScalar = B.buildUnmerge(S32, Copies[0]);
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-
-  // Perform Legalization
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.widenScalar(*UnmergePtr, 0, S96));
-
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.widenScalar(*UnmergeScalar, 0, S96));
-
-  const auto *CheckStr = R"(
-  CHECK: [[COPY:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[PTR:%[0-9]+]]:_(p0) = G_INTTOPTR [[COPY]]
-  CHECK: [[INT:%[0-9]+]]:_(s64) = G_PTRTOINT [[PTR]]
-  CHECK: [[ANYEXT:%[0-9]+]]:_(s96) = G_ANYEXT [[INT]]
-  CHECK: [[TRUNC:%[0-9]+]]:_(s32) = G_TRUNC [[ANYEXT]]
-  CHECK: [[C:%[0-9]+]]:_(s96) = G_CONSTANT i96 32
-  CHECK: [[LSHR:%[0-9]+]]:_(s96) = G_LSHR [[ANYEXT]]:_, [[C]]
-  CHECK: [[TRUNC:%[0-9]+]]:_(s32) = G_TRUNC [[LSHR]]
-  CHECK: [[ANYEXT:%[0-9]+]]:_(s96) = G_ANYEXT [[COPY]]
-  CHECK: [[TRUNC:%[0-9]+]]:_(s32) = G_TRUNC [[ANYEXT]]
-  CHECK: [[C:%[0-9]+]]:_(s96) = G_CONSTANT i96 32
-  CHECK: [[LSHR:%[0-9]+]]:_(s96) = G_LSHR [[ANYEXT]]:_, [[C]]
-  CHECK: [[TRUNC1:%[0-9]+]]:_(s32) = G_TRUNC [[LSHR]]
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, BitcastLoad) {
-  setUp();
-  if (!TM)
-    return;
-
-  LLT P0 = LLT::pointer(0, 64);
-  LLT S32 = LLT::scalar(32);
-  LLT V4S8 = LLT::fixed_vector(4, 8);
-  auto Ptr = B.buildUndef(P0);
-
-  DefineLegalizerInfo(A, {});
-
-  MachineMemOperand *MMO = B.getMF().getMachineMemOperand(
-      MachinePointerInfo(), MachineMemOperand::MOLoad, 4, Align(4));
-  auto Load = B.buildLoad(V4S8, Ptr, *MMO);
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  B.setInsertPt(*EntryMBB, Load->getIterator());
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.bitcast(*Load, 0, S32));
-
-  auto CheckStr = R"(
-  CHECK: [[PTR:%[0-9]+]]:_(p0) = G_IMPLICIT_DEF
-  CHECK: [[LOAD:%[0-9]+]]:_(s32) = G_LOAD
-  CHECK: [[CAST:%[0-9]+]]:_(<4 x s8>) = G_BITCAST [[LOAD]]
-
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, BitcastStore) {
-  setUp();
-  if (!TM)
-    return;
-
-  LLT P0 = LLT::pointer(0, 64);
-  LLT S32 = LLT::scalar(32);
-  LLT V4S8 = LLT::fixed_vector(4, 8);
-  auto Ptr = B.buildUndef(P0);
-
-  DefineLegalizerInfo(A, {});
-
-  MachineMemOperand *MMO = B.getMF().getMachineMemOperand(
-      MachinePointerInfo(), MachineMemOperand::MOStore, 4, Align(4));
-  auto Val = B.buildUndef(V4S8);
-  auto Store = B.buildStore(Val, Ptr, *MMO);
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  B.setInsertPt(*EntryMBB, Store->getIterator());
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.bitcast(*Store, 0, S32));
-
-  auto CheckStr = R"(
-  CHECK: [[VAL:%[0-9]+]]:_(<4 x s8>) = G_IMPLICIT_DEF
-  CHECK: [[CAST:%[0-9]+]]:_(s32) = G_BITCAST [[VAL]]
-  CHECK: G_STORE [[CAST]]
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, BitcastSelect) {
-  setUp();
-  if (!TM)
-    return;
-
-  LLT S1 = LLT::scalar(1);
-  LLT S32 = LLT::scalar(32);
-  LLT V4S8 = LLT::fixed_vector(4, 8);
-
-  DefineLegalizerInfo(A, {});
-
-  auto Cond = B.buildUndef(S1);
-  auto Val0 = B.buildConstant(V4S8, 123);
-  auto Val1 = B.buildConstant(V4S8, 99);
-
-  auto Select = B.buildSelect(V4S8, Cond, Val0, Val1);
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  B.setInsertPt(*EntryMBB, Select->getIterator());
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.bitcast(*Select, 0, S32));
-
-  auto CheckStr = R"(
-  CHECK: [[VAL0:%[0-9]+]]:_(<4 x s8>) = G_BUILD_VECTOR
-  CHECK: [[VAL1:%[0-9]+]]:_(<4 x s8>) = G_BUILD_VECTOR
-  CHECK: [[CAST0:%[0-9]+]]:_(s32) = G_BITCAST [[VAL0]]
-  CHECK: [[CAST1:%[0-9]+]]:_(s32) = G_BITCAST [[VAL1]]
-  CHECK: [[SELECT:%[0-9]+]]:_(s32) = G_SELECT %{{[0-9]+}}:_(s1), [[CAST0]]:_, [[CAST1]]:_
-  CHECK: [[CAST2:%[0-9]+]]:_(<4 x s8>) = G_BITCAST [[SELECT]]
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-
-  // Doesn't make sense
-  auto VCond = B.buildUndef(LLT::fixed_vector(4, 1));
-  auto VSelect = B.buildSelect(V4S8, VCond, Val0, Val1);
-
-  B.setInsertPt(*EntryMBB, VSelect->getIterator());
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::UnableToLegalize,
-            Helper.bitcast(*VSelect, 0, S32));
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::UnableToLegalize,
-            Helper.bitcast(*VSelect, 1, LLT::scalar(4)));
-}
-
-TEST_F(AArch64GISelMITest, BitcastBitOps) {
-  setUp();
-  if (!TM)
-    return;
-
-  LLT S32 = LLT::scalar(32);
-  LLT V4S8 = LLT::fixed_vector(4, 8);
-
-  DefineLegalizerInfo(A, {});
-
-  auto Val0 = B.buildConstant(V4S8, 123);
-  auto Val1 = B.buildConstant(V4S8, 99);
-  auto And = B.buildAnd(V4S8, Val0, Val1);
-  auto Or = B.buildOr(V4S8, Val0, Val1);
-  auto Xor = B.buildXor(V4S8, Val0, Val1);
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-  B.setInsertPt(*EntryMBB, And->getIterator());
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.bitcast(*And, 0, S32));
-
-  B.setInsertPt(*EntryMBB, Or->getIterator());
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.bitcast(*Or, 0, S32));
-
-  B.setInsertPt(*EntryMBB, Xor->getIterator());
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.bitcast(*Xor, 0, S32));
-
-  auto CheckStr = R"(
-  CHECK: [[VAL0:%[0-9]+]]:_(<4 x s8>) = G_BUILD_VECTOR
-  CHECK: [[VAL1:%[0-9]+]]:_(<4 x s8>) = G_BUILD_VECTOR
-  CHECK: [[CAST0:%[0-9]+]]:_(s32) = G_BITCAST [[VAL0]]
-  CHECK: [[CAST1:%[0-9]+]]:_(s32) = G_BITCAST [[VAL1]]
-  CHECK: [[AND:%[0-9]+]]:_(s32) = G_AND [[CAST0]]:_, [[CAST1]]:_
-  CHECK: [[CAST_AND:%[0-9]+]]:_(<4 x s8>) = G_BITCAST [[AND]]
-  CHECK: [[CAST2:%[0-9]+]]:_(s32) = G_BITCAST [[VAL0]]
-  CHECK: [[CAST3:%[0-9]+]]:_(s32) = G_BITCAST [[VAL1]]
-  CHECK: [[OR:%[0-9]+]]:_(s32) = G_OR [[CAST2]]:_, [[CAST3]]:_
-  CHECK: [[CAST_OR:%[0-9]+]]:_(<4 x s8>) = G_BITCAST [[OR]]
-  CHECK: [[CAST4:%[0-9]+]]:_(s32) = G_BITCAST [[VAL0]]
-  CHECK: [[CAST5:%[0-9]+]]:_(s32) = G_BITCAST [[VAL1]]
-  CHECK: [[XOR:%[0-9]+]]:_(s32) = G_XOR [[CAST4]]:_, [[CAST5]]:_
-  CHECK: [[CAST_XOR:%[0-9]+]]:_(<4 x s8>) = G_BITCAST [[XOR]]
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, CreateLibcall) {
-  setUp();
-  if (!TM)
-    return;
-
-  DefineLegalizerInfo(A, {});
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-
-  LLVMContext &Ctx = MF->getFunction().getContext();
-  auto *RetTy = Type::getVoidTy(Ctx);
-
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            createLibcall(B, "abort", {{}, RetTy, 0}, {}, CallingConv::C));
-
-  auto CheckStr = R"(
-  CHECK: ADJCALLSTACKDOWN 0, 0, implicit-def $sp, implicit $sp
-  CHECK: BL &abort
-  CHECK: ADJCALLSTACKUP 0, 0, implicit-def $sp, implicit $sp
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-// Test narrowing of G_IMPLICIT_DEF
-TEST_F(AArch64GISelMITest, NarrowImplicitDef) {
-  setUp();
-  if (!TM)
-    return;
-
-  DefineLegalizerInfo(A, {});
-
-  // Make sure that G_IMPLICIT_DEF can be narrowed if the original size is not a
-  // multiple of narrow size
-  LLT S32{LLT::scalar(32)};
-  LLT S48{LLT::scalar(48)};
-  LLT S64{LLT::scalar(64)};
-  LLT V2S64{{LLT::fixed_vector(2, 64)}};
-
-  auto Implicit1 = B.buildUndef(S64);
-  auto Implicit2 = B.buildUndef(S64);
-  auto Implicit3 = B.buildUndef(V2S64);
-  auto Implicit4 = B.buildUndef(V2S64);
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-
-  // Perform Legalization
-
-  B.setInsertPt(*EntryMBB, Implicit1->getIterator());
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.narrowScalar(*Implicit1, 0, S48));
-
-  B.setInsertPt(*EntryMBB, Implicit2->getIterator());
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.narrowScalar(*Implicit2, 0, S32));
-
-  B.setInsertPt(*EntryMBB, Implicit3->getIterator());
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.narrowScalar(*Implicit3, 0, S48));
-
-  B.setInsertPt(*EntryMBB, Implicit4->getIterator());
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.narrowScalar(*Implicit4, 0, S32));
-
-  const auto *CheckStr = R"(
-  CHECK: [[DEF:%[0-9]+]]:_(s48) = G_IMPLICIT_DEF
-  CHECK: [[ANYEXT:%[0-9]+]]:_(s64) = G_ANYEXT [[DEF]]
-
-  CHECK: [[DEF:%[0-9]+]]:_(s32) = G_IMPLICIT_DEF
-  CHECK: [[DEF1:%[0-9]+]]:_(s32) = G_IMPLICIT_DEF
-  CHECK: [[MV:%[0-9]+]]:_(s64) = G_MERGE_VALUES [[DEF]]:_(s32), [[DEF1]]
-
-  CHECK: [[DEF:%[0-9]+]]:_(<2 x s48>) = G_IMPLICIT_DEF
-  CHECK: [[ANYEXT:%[0-9]+]]:_(<2 x s64>) = G_ANYEXT [[DEF]]
-
-  CHECK: [[DEF:%[0-9]+]]:_(s32) = G_IMPLICIT_DEF
-  CHECK: [[DEF1:%[0-9]+]]:_(s32) = G_IMPLICIT_DEF
-  CHECK: [[DEF2:%[0-9]+]]:_(s32) = G_IMPLICIT_DEF
-  CHECK: [[DEF3:%[0-9]+]]:_(s32) = G_IMPLICIT_DEF
-  CHECK: [[BV:%[0-9]+]]:_(<2 x s64>) = G_BUILD_VECTOR [[DEF]]:_(s32), [[DEF1]]:_(s32), [[DEF2]]:_(s32), [[DEF3]]:_(s32)
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-// Test widening of G_FREEZE
-TEST_F(AArch64GISelMITest, WidenFreeze) {
-  setUp();
-  if (!TM)
-    return;
-
-  DefineLegalizerInfo(A, {});
-
-  // Make sure that G_FREEZE is widened with anyext
-  LLT S64{LLT::scalar(64)};
-  LLT S128{LLT::scalar(128)};
-  LLT V2S32{LLT::fixed_vector(2, 32)};
-  LLT V2S64{LLT::fixed_vector(2, 64)};
-
-  auto Vector = B.buildBitcast(V2S32, Copies[0]);
-
-  auto FreezeScalar = B.buildInstr(TargetOpcode::G_FREEZE, {S64}, {Copies[0]});
-  auto FreezeVector = B.buildInstr(TargetOpcode::G_FREEZE, {V2S32}, {Vector});
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-
-  // Perform Legalization
-
-  B.setInsertPt(*EntryMBB, FreezeScalar->getIterator());
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.widenScalar(*FreezeScalar, 0, S128));
-
-  B.setInsertPt(*EntryMBB, FreezeVector->getIterator());
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.widenScalar(*FreezeVector, 0, V2S64));
-
-  const auto *CheckStr = R"(
-  CHECK: [[COPY:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[BITCAST:%[0-9]+]]:_(<2 x s32>) = G_BITCAST [[COPY]]
-
-  CHECK: [[ANYEXT:%[0-9]+]]:_(s128) = G_ANYEXT [[COPY]]
-  CHECK: [[FREEZE:%[0-9]+]]:_(s128) = G_FREEZE [[ANYEXT]]
-  CHECK: [[TRUNC:%[0-9]+]]:_(s64) = G_TRUNC [[FREEZE]]
-
-  CHECK: [[ANYEXT1:%[0-9]+]]:_(<2 x s64>) = G_ANYEXT [[BITCAST]]
-  CHECK: [[FREEZE1:%[0-9]+]]:_(<2 x s64>) = G_FREEZE [[ANYEXT1]]
-  CHECK: [[TRUNC1:%[0-9]+]]:_(<2 x s32>) = G_TRUNC [[FREEZE1]]
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-// Test narrowing of G_FREEZE
-TEST_F(AArch64GISelMITest, NarrowFreeze) {
-  setUp();
-  if (!TM)
-    return;
-
-  DefineLegalizerInfo(A, {});
-
-  // Make sure that G_FREEZE is narrowed using unmerge/extract
-  LLT S16{LLT::scalar(16)};
-  LLT S32{LLT::scalar(32)};
-  LLT S33{LLT::scalar(33)};
-  LLT S64{LLT::scalar(64)};
-  LLT V2S16{LLT::fixed_vector(2, 16)};
-  LLT V2S32{LLT::fixed_vector(2, 32)};
-
-  auto Trunc = B.buildTrunc(S33, {Copies[0]});
-  auto Vector = B.buildBitcast(V2S32, Copies[0]);
-
-  auto FreezeScalar = B.buildInstr(TargetOpcode::G_FREEZE, {S64}, {Copies[0]});
-  auto FreezeOdd = B.buildInstr(TargetOpcode::G_FREEZE, {S33}, {Trunc});
-  auto FreezeVector = B.buildInstr(TargetOpcode::G_FREEZE, {V2S32}, {Vector});
-  auto FreezeVector1 = B.buildInstr(TargetOpcode::G_FREEZE, {V2S32}, {Vector});
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-
-  // Perform Legalization
-
-  B.setInsertPt(*EntryMBB, FreezeScalar->getIterator());
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.narrowScalar(*FreezeScalar, 0, S32));
-
-  B.setInsertPt(*EntryMBB, FreezeOdd->getIterator());
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.narrowScalar(*FreezeOdd, 0, S32));
-
-  B.setInsertPt(*EntryMBB, FreezeVector->getIterator());
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.narrowScalar(*FreezeVector, 0, V2S16));
-
-  B.setInsertPt(*EntryMBB, FreezeVector1->getIterator());
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.narrowScalar(*FreezeVector1, 0, S16));
-
-  const auto *CheckStr = R"(
-  CHECK: [[COPY:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[TRUNC:%[0-9]+]]:_(s33) = G_TRUNC [[COPY]]
-  CHECK: [[BITCAST:%[0-9]+]]:_(<2 x s32>) = G_BITCAST [[COPY]]
-
-  CHECK: [[UV:%[0-9]+]]:_(s32), [[UV1:%[0-9]+]]:_(s32) = G_UNMERGE_VALUES [[COPY]]
-  CHECK: [[FREEZE:%[0-9]+]]:_(s32) = G_FREEZE [[UV]]
-  CHECK: [[FREEZE1:%[0-9]+]]:_(s32) = G_FREEZE [[UV1]]
-  CHECK: [[MV:%[0-9]+]]:_(s64) = G_MERGE_VALUES [[FREEZE]]:_(s32), [[FREEZE1]]
-
-  CHECK: (s1) = G_UNMERGE_VALUES [[TRUNC]]:_(s33)
-  CHECK: [[UNDEF:%[0-9]+]]:_(s1) = G_IMPLICIT_DEF
-  CHECK: [[MV1:%[0-9]+]]:_(s32) = G_MERGE_VALUES
-  CHECK: [[MV2:%[0-9]+]]:_(s32) = G_MERGE_VALUES
-  CHECK: [[UNDEF1:%[0-9]+]]:_(s32) = G_IMPLICIT_DEF
-  CHECK: [[FREEZE2:%[0-9]+]]:_(s32) = G_FREEZE [[MV1]]
-  CHECK: [[FREEZE3:%[0-9]+]]:_(s32) = G_FREEZE [[MV2]]
-  CHECK: [[UNDEF2:%[0-9]+]]:_(s32) = G_IMPLICIT_DEF
-  CHECK: [[MV3:%[0-9]+]]:_(s1056) = G_MERGE_VALUES [[FREEZE2]]:_(s32), [[FREEZE3]]:_(s32), [[UNDEF2]]
-  CHECK: [[TRUNC1:%[0-9]+]]:_(s33) = G_TRUNC [[MV3]]
-
-  CHECK: [[BITCAST1:%[0-9]+]]:_(s64) = G_BITCAST [[BITCAST]]
-  CHECK: [[UV2:%[0-9]+]]:_(s32), [[UV3:%[0-9]+]]:_(s32) = G_UNMERGE_VALUES [[BITCAST1]]
-  CHECK: [[FREEZE4:%[0-9]+]]:_(s32) = G_FREEZE [[UV2]]
-  CHECK: [[FREEZE5:%[0-9]+]]:_(s32) = G_FREEZE [[UV3]]
-  CHECK: [[MV4:%[0-9]+]]:_(s64) = G_MERGE_VALUES [[FREEZE4]]:_(s32), [[FREEZE5]]:_(s32)
-  CHECK: [[BITCAST2:%[0-9]+]]:_(<2 x s32>) = G_BITCAST [[MV4]]
-
-  CHECK: [[BITCAST3:%[0-9]+]]:_(s64) = G_BITCAST [[BITCAST]]
-  CHECK: [[UV4:%[0-9]+]]:_(s16), [[UV5:%[0-9]+]]:_(s16), [[UV6:%[0-9]+]]:_(s16), [[UV7:%[0-9]+]]:_(s16) = G_UNMERGE_VALUES [[BITCAST3]]
-  CHECK: [[FREEZE6:%[0-9]+]]:_(s16) = G_FREEZE [[UV4]]
-  CHECK: [[FREEZE7:%[0-9]+]]:_(s16) = G_FREEZE [[UV5]]
-  CHECK: [[FREEZE8:%[0-9]+]]:_(s16) = G_FREEZE [[UV6]]
-  CHECK: [[FREEZE9:%[0-9]+]]:_(s16) = G_FREEZE [[UV7]]
-  CHECK: [[MV5:%[0-9]+]]:_(s64) = G_MERGE_VALUES [[FREEZE6]]:_(s16), [[FREEZE7]]:_(s16), [[FREEZE8]]:_(s16), [[FREEZE9]]
-  CHECK: [[BITCAST3:%[0-9]+]]:_(<2 x s32>) = G_BITCAST [[MV5]]
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-// Test fewer elements of G_FREEZE
-TEST_F(AArch64GISelMITest, FewerElementsFreeze) {
-  setUp();
-  if (!TM)
-    return;
-
-  DefineLegalizerInfo(A, {});
-
-  LLT S32{LLT::scalar(32)};
-  LLT V2S16{LLT::fixed_vector(2, 16)};
-  LLT V2S32{LLT::fixed_vector(2, 32)};
-  LLT V4S16{LLT::fixed_vector(4, 16)};
-
-  auto Vector1 = B.buildBitcast(V2S32, Copies[0]);
-  auto Vector2 = B.buildBitcast(V4S16, Copies[0]);
-
-  auto FreezeVector1 = B.buildInstr(TargetOpcode::G_FREEZE, {V2S32}, {Vector1});
-  auto FreezeVector2 = B.buildInstr(TargetOpcode::G_FREEZE, {V4S16}, {Vector2});
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-
-  // Perform Legalization
-
-  B.setInsertPt(*EntryMBB, FreezeVector1->getIterator());
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.fewerElementsVector(*FreezeVector1, 0, S32));
-
-  B.setInsertPt(*EntryMBB, FreezeVector2->getIterator());
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.fewerElementsVector(*FreezeVector2, 0, V2S16));
-
-  const auto *CheckStr = R"(
-  CHECK: [[COPY:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[BITCAST:%[0-9]+]]:_(<2 x s32>) = G_BITCAST [[COPY]]
-  CHECK: [[BITCAST1:%[0-9]+]]:_(<4 x s16>) = G_BITCAST [[COPY]]
-
-  CHECK: [[UV:%[0-9]+]]:_(s32), [[UV1:%[0-9]+]]:_(s32) = G_UNMERGE_VALUES [[BITCAST]]
-  CHECK: [[FREEZE:%[0-9]+]]:_(s32) = G_FREEZE [[UV]]
-  CHECK: [[FREEZE1:%[0-9]+]]:_(s32) = G_FREEZE [[UV1]]
-  CHECK: [[MV:%[0-9]+]]:_(<2 x s32>) = G_BUILD_VECTOR [[FREEZE]]:_(s32), [[FREEZE1]]
-
-  CHECK: [[UV:%[0-9]+]]:_(<2 x s16>), [[UV1:%[0-9]+]]:_(<2 x s16>) = G_UNMERGE_VALUES [[BITCAST1]]
-  CHECK: [[FREEZE2:%[0-9]+]]:_(<2 x s16>) = G_FREEZE [[UV]]
-  CHECK: [[FREEZE3:%[0-9]+]]:_(<2 x s16>) = G_FREEZE [[UV1]]
-  CHECK: [[MV:%[0-9]+]]:_(<4 x s16>) = G_CONCAT_VECTORS [[FREEZE2]]:_(<2 x s16>), [[FREEZE3]]
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-// Test more elements of G_FREEZE
-TEST_F(AArch64GISelMITest, MoreElementsFreeze) {
-  setUp();
-  if (!TM)
-    return;
-
-  DefineLegalizerInfo(A, {});
-
-  LLT V2S32{LLT::fixed_vector(2, 32)};
-  LLT V4S32{LLT::fixed_vector(4, 32)};
-
-  auto Vector1 = B.buildBitcast(V2S32, Copies[0]);
-  auto FreezeVector1 = B.buildInstr(TargetOpcode::G_FREEZE, {V2S32}, {Vector1});
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-
-  // Perform Legalization
-  B.setInsertPt(*EntryMBB, FreezeVector1->getIterator());
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.moreElementsVector(*FreezeVector1, 0, V4S32));
-
-  const auto *CheckStr = R"(
-  CHECK: [[COPY:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[BITCAST:%[0-9]+]]:_(<2 x s32>) = G_BITCAST [[COPY]]
-  CHECK: [[UNDEF:%[0-9]+]]:_(<2 x s32>) = G_IMPLICIT_DEF
-  CHECK: [[CV:%[0-9]+]]:_(<4 x s32>) = G_CONCAT_VECTORS [[BITCAST]]:_(<2 x s32>), [[UNDEF]]
-  CHECK: [[FREEZE:%[0-9]+]]:_(<4 x s32>) = G_FREEZE [[CV]]
-  CHECK: [[EXTR0:%[0-9]+]]:_(<2 x s32>), [[EXTR1:%[0-9]+]]:_(<2 x s32>) = G_UNMERGE_VALUES [[FREEZE]]:_(<4 x s32>)
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-// Test fewer elements of G_INSERT_VECTOR_ELEMENT
-TEST_F(AArch64GISelMITest, FewerElementsInsertVectorElt) {
-  setUp();
-  if (!TM)
-    return;
-
-  DefineLegalizerInfo(A, {});
-
-  LLT P0{LLT::pointer(0, 64)};
-  LLT S64{LLT::scalar(64)};
-  LLT S16{LLT::scalar(16)};
-  LLT V2S16{LLT::fixed_vector(2, 16)};
-  LLT V3S16{LLT::fixed_vector(3, 16)};
-  LLT V8S16{LLT::fixed_vector(8, 16)};
-
-  auto Ptr0 = B.buildIntToPtr(P0, Copies[0]);
-  auto VectorV8 = B.buildLoad(V8S16, Ptr0, MachinePointerInfo(), Align(8));
-  auto Value = B.buildTrunc(S16, Copies[1]);
-
-  auto Seven = B.buildConstant(S64, 7);
-  auto InsertV8Constant7_0 =
-      B.buildInsertVectorElement(V8S16, VectorV8, Value, Seven);
-  auto InsertV8Constant7_1 =
-      B.buildInsertVectorElement(V8S16, VectorV8, Value, Seven);
-
-  B.buildStore(InsertV8Constant7_0, Ptr0, MachinePointerInfo(), Align(8),
-               MachineMemOperand::MOVolatile);
-  B.buildStore(InsertV8Constant7_1, Ptr0, MachinePointerInfo(), Align(8),
-               MachineMemOperand::MOVolatile);
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-
-  // Perform Legalization
-  B.setInsertPt(*EntryMBB, InsertV8Constant7_0->getIterator());
-
-  // This should index the high element of the 4th piece of an unmerge.
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.fewerElementsVector(*InsertV8Constant7_0, 0, V2S16));
-
-  // This case requires extracting an intermediate vector type into the target
-  // v4s16.
-  B.setInsertPt(*EntryMBB, InsertV8Constant7_1->getIterator());
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.fewerElementsVector(*InsertV8Constant7_1, 0, V3S16));
-
-  const auto *CheckStr = R"(
-  CHECK: [[COPY0:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[COPY1:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[COPY2:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[PTR0:%[0-9]+]]:_(p0) = G_INTTOPTR [[COPY0]]
-  CHECK: [[VEC8:%[0-9]+]]:_(<8 x s16>) = G_LOAD [[PTR0]]:_(p0) :: (load (<8 x s16>), align 8)
-  CHECK: [[INSERT_VAL:%[0-9]+]]:_(s16) = G_TRUNC [[COPY1]]
-
-
-  CHECK: [[UNMERGE0:%[0-9]+]]:_(<2 x s16>), [[UNMERGE1:%[0-9]+]]:_(<2 x s16>), [[UNMERGE2:%[0-9]+]]:_(<2 x s16>), [[UNMERGE3:%[0-9]+]]:_(<2 x s16>) = G_UNMERGE_VALUES [[VEC8]]
-  CHECK: [[ONE:%[0-9]+]]:_(s64) = G_CONSTANT i64 1
-  CHECK: [[SUB_INSERT_7:%[0-9]+]]:_(<2 x s16>) = G_INSERT_VECTOR_ELT [[UNMERGE3]]:_, [[INSERT_VAL]]:_(s16), [[ONE]]
-  CHECK: [[INSERT_V8_7_0:%[0-9]+]]:_(<8 x s16>) = G_CONCAT_VECTORS [[UNMERGE0]]:_(<2 x s16>), [[UNMERGE1]]:_(<2 x s16>), [[UNMERGE2]]:_(<2 x s16>), [[SUB_INSERT_7]]:_(<2 x s16>)
-
-
-  CHECK: [[UNMERGE1_0:%[0-9]+]]:_(s16), [[UNMERGE1_1:%[0-9]+]]:_(s16), [[UNMERGE1_2:%[0-9]+]]:_(s16), [[UNMERGE1_3:%[0-9]+]]:_(s16), [[UNMERGE1_4:%[0-9]+]]:_(s16), [[UNMERGE1_5:%[0-9]+]]:_(s16), [[UNMERGE1_6:%[0-9]+]]:_(s16), [[UNMERGE1_7:%[0-9]+]]:_(s16) = G_UNMERGE_VALUES [[VEC8]]:_(<8 x s16>)
-  CHECK: [[IMPDEF_S16:%[0-9]+]]:_(s16) = G_IMPLICIT_DEF
-  CHECK: [[BUILD0:%[0-9]+]]:_(<3 x s16>) = G_BUILD_VECTOR [[UNMERGE1_0]]:_(s16), [[UNMERGE1_1]]:_(s16), [[UNMERGE1_2]]:_(s16)
-  CHECK: [[BUILD1:%[0-9]+]]:_(<3 x s16>) = G_BUILD_VECTOR [[UNMERGE1_3]]:_(s16), [[UNMERGE1_4]]:_(s16), [[UNMERGE1_5]]:_(s16)
-  CHECK: [[BUILD2:%[0-9]+]]:_(<3 x s16>) = G_BUILD_VECTOR [[UNMERGE1_6]]:_(s16), [[UNMERGE1_7]]:_(s16), [[IMPDEF_S16]]:_(s16)
-  CHECK: [[IMPDEF_V3S16:%[0-9]+]]:_(<3 x s16>) = G_IMPLICIT_DEF
-  CHECK: [[ONE_1:%[0-9]+]]:_(s64) = G_CONSTANT i64 1
-  CHECK: [[SUB_INSERT_7_V3S16:%[0-9]+]]:_(<3 x s16>) = G_INSERT_VECTOR_ELT [[BUILD2]]:_, [[INSERT_VAL]]:_(s16), [[ONE_1]]
-
-  CHECK: [[WIDE_CONCAT_DEAD:%[0-9]+]]:_(<24 x s16>) = G_CONCAT_VECTORS [[BUILD0]]:_(<3 x s16>), [[BUILD1]]:_(<3 x s16>), [[SUB_INSERT_7_V3S16]]:_(<3 x s16>), [[IMPDEF_V3S16]]:_(<3 x s16>), [[IMPDEF_V3S16]]:_(<3 x s16>), [[IMPDEF_V3S16]]:_(<3 x s16>), [[IMPDEF_V3S16]]:_(<3 x s16>), [[IMPDEF_V3S16]]:_(<3 x s16>)
-  CHECK: [[WIDE_CONCAT:%[0-9]+]]:_(<24 x s16>) = G_CONCAT_VECTORS [[BUILD0]]:_(<3 x s16>), [[BUILD1]]:_(<3 x s16>), [[SUB_INSERT_7_V3S16]]:_(<3 x s16>), [[IMPDEF_V3S16]]:_(<3 x s16>), [[IMPDEF_V3S16]]:_(<3 x s16>), [[IMPDEF_V3S16]]:_(<3 x s16>), [[IMPDEF_V3S16]]:_(<3 x s16>), [[IMPDEF_V3S16]]:_(<3 x s16>)
-  CHECK: [[INSERT_V8_7_1:%[0-9]+]]:_(<8 x s16>), %{{[0-9]+}}:_(<8 x s16>), %{{[0-9]+}}:_(<8 x s16>) = G_UNMERGE_VALUES [[WIDE_CONCAT]]:_(<24 x s16>)
-
-
-  CHECK: G_STORE [[INSERT_V8_7_0]]
-  CHECK: G_STORE [[INSERT_V8_7_1]]
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-// Test widen scalar of G_UNMERGE_VALUES
-TEST_F(AArch64GISelMITest, widenScalarUnmerge) {
-  setUp();
-  if (!TM)
-    return;
-
-  DefineLegalizerInfo(A, {});
-
-  LLT S96{LLT::scalar(96)};
-  LLT S64{LLT::scalar(64)};
-  LLT S48{LLT::scalar(48)};
-
-  auto Src = B.buildAnyExt(S96, Copies[0]);
-  auto Unmerge = B.buildUnmerge(S48, Src);
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-
-  // Perform Legalization
-  B.setInsertPt(*EntryMBB, Unmerge->getIterator());
-
-  // This should create unmerges to a GCD type (S16), then remerge to S48
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.widenScalar(*Unmerge, 0, S64));
-
-  const auto *CheckStr = R"(
-  CHECK: [[COPY0:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[COPY1:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[COPY2:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[ANYEXT:%[0-9]+]]:_(s96) = G_ANYEXT [[COPY0]]
-  CHECK: [[ANYEXT1:%[0-9]+]]:_(s192) = G_ANYEXT [[ANYEXT]]
-  CHECK: [[UNMERGE:%[0-9]+]]:_(s64), [[UNMERGE1:%[0-9]+]]:_(s64), [[UNMERGE2:%[0-9]+]]:_(s64) = G_UNMERGE_VALUES [[ANYEXT1]]
-  CHECK: [[UNMERGE3:%[0-9]+]]:_(s16), [[UNMERGE4:%[0-9]+]]:_(s16), [[UNMERGE5:%[0-9]+]]:_(s16), [[UNMERGE6:%[0-9]+]]:_(s16) = G_UNMERGE_VALUES [[UNMERGE]]
-  CHECK: [[UNMERGE7:%[0-9]+]]:_(s16), [[UNMERGE8:%[0-9]+]]:_(s16), [[UNMERGE9:%[0-9]+]]:_(s16), [[UNMERGE10:%[0-9]+]]:_(s16) = G_UNMERGE_VALUES [[UNMERGE1]]
-  CHECK: [[UNMERGE11:%[0-9]+]]:_(s16), [[UNMERGE12:%[0-9]+]]:_(s16), [[UNMERGE13:%[0-9]+]]:_(s16), [[UNMERGE14:%[0-9]+]]:_(s16) = G_UNMERGE_VALUES [[UNMERGE2]]
-  CHECK: [[MERGE:%[0-9]+]]:_(s48) = G_MERGE_VALUES [[UNMERGE3]]:_(s16), [[UNMERGE4]]:_(s16), [[UNMERGE5]]:_(s16)
-  CHECK: [[MERGE1:%[0-9]+]]:_(s48) = G_MERGE_VALUES [[UNMERGE6]]:_(s16), [[UNMERGE7]]:_(s16), [[UNMERGE8]]:_(s16)
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-// Test moreElements of G_SHUFFLE_VECTOR.
-TEST_F(AArch64GISelMITest, moreElementsShuffle) {
-  setUp();
-  if (!TM)
-    return;
-
-  DefineLegalizerInfo(A, {});
-
-  LLT S64{LLT::scalar(64)};
-  LLT V6S64 = LLT::fixed_vector(6, S64);
-
-  auto V1 = B.buildBuildVector(V6S64, {Copies[0], Copies[1], Copies[0],
-                                       Copies[1], Copies[0], Copies[1]});
-  auto V2 = B.buildBuildVector(V6S64, {Copies[0], Copies[1], Copies[0],
-                                       Copies[1], Copies[0], Copies[1]});
-  auto Shuffle = B.buildShuffleVector(V6S64, V1, V2, {3, 4, 7, 0, 1, 11});
-
-  AInfo Info(MF->getSubtarget());
-  DummyGISelObserver Observer;
-  LegalizerHelper Helper(*MF, Info, Observer, B);
-
-  // Perform Legalization
-  B.setInsertPt(*EntryMBB, Shuffle->getIterator());
-
-  EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.moreElementsVector(*Shuffle, 0, LLT::fixed_vector(8, S64)));
-
-  const auto *CheckStr = R"(
-  CHECK: [[COPY0:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[COPY1:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[COPY2:%[0-9]+]]:_(s64) = COPY
-  CHECK: [[BV1:%[0-9]+]]:_(<6 x s64>) = G_BUILD_VECTOR
-  CHECK: [[BV2:%[0-9]+]]:_(<6 x s64>) = G_BUILD_VECTOR
-  CHECK: [[IMPDEF1:%[0-9]+]]:_(<8 x s64>) = G_IMPLICIT_DEF
-  CHECK: [[INSERT1:%[0-9]+]]:_(<8 x s64>) = G_INSERT [[IMPDEF1]]:_, [[BV1]]:_(<6 x s64>), 0
-  CHECK: [[IMPDEF2:%[0-9]+]]:_(<8 x s64>) = G_IMPLICIT_DEF
-  CHECK: [[INSERT2:%[0-9]+]]:_(<8 x s64>) = G_INSERT [[IMPDEF2]]:_, [[BV2]]:_(<6 x s64>), 0
-  CHECK: [[SHUF:%[0-9]+]]:_(<8 x s64>) = G_SHUFFLE_VECTOR [[INSERT1]]:_(<8 x s64>), [[INSERT2]]:_, shufflemask(3, 4, 9, 0, 1, 13, undef, undef)
-  CHECK: [[IMPDEF3:%[0-9]+]]:_(<8 x s64>) = G_IMPLICIT_DEF
-  CHECK: [[CONCAT:%[0-9]+]]:_(<24 x s64>) = G_CONCAT_VECTORS [[SHUF]]:_(<8 x s64>), [[IMPDEF3]]:_(<8 x s64>), [[IMPDEF3]]:_(<8 x s64>)
-  CHECK: [[UNMERGE:%[0-9]+]]:_(<6 x s64>), [[UNMERGE2:%[0-9]+]]:_(<6 x s64>), [[UNMERGE3:%[0-9]+]]:_(<6 x s64>), [[UNMERGE4:%[0-9]+]]:_(<6 x s64>) = G_UNMERGE_VALUES [[CONCAT]]:_(<24 x s64>)
-  )";
-
-  // Check
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/LegalizerInfoTest.cpp b/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/LegalizerInfoTest.cpp
deleted file mode 100644
index 7ca4678e2c3..00000000000
--- a/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/LegalizerInfoTest.cpp
+++ /dev/null
@@ -1,443 +0,0 @@
-//===- llvm/unittest/CodeGen/GlobalISel/LegalizerInfoTest.cpp -------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/CodeGen/GlobalISel/LegalizerInfo.h"
-#include "llvm/CodeGen/TargetOpcodes.h"
-#include "GISelMITest.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace LegalizeActions;
-
-// Define a couple of pretty printers to help debugging when things go wrong.
-namespace llvm {
-std::ostream &
-operator<<(std::ostream &OS, const LegalizeAction Act) {
-  switch (Act) {
-  case Lower: OS << "Lower"; break;
-  case Legal: OS << "Legal"; break;
-  case NarrowScalar: OS << "NarrowScalar"; break;
-  case WidenScalar:  OS << "WidenScalar"; break;
-  case FewerElements:  OS << "FewerElements"; break;
-  case MoreElements:  OS << "MoreElements"; break;
-  case Libcall: OS << "Libcall"; break;
-  case Custom: OS << "Custom"; break;
-  case Bitcast: OS << "Bitcast"; break;
-  case Unsupported: OS << "Unsupported"; break;
-  case NotFound: OS << "NotFound"; break;
-  case UseLegacyRules: OS << "UseLegacyRules"; break;
-  }
-  return OS;
-}
-
-std::ostream &operator<<(std::ostream &OS, const llvm::LegalizeActionStep Ty) {
-  OS << "LegalizeActionStep(" << Ty.Action << ", " << Ty.TypeIdx << ", "
-     << Ty.NewType << ')';
-  return OS;
-}
-}
-
-namespace {
-
-
-TEST(LegalizerInfoTest, ScalarRISC) {
-  using namespace TargetOpcode;
-  LegalizerInfo L;
-  auto &LegacyInfo = L.getLegacyLegalizerInfo();
-  // Typical RISCy set of operations based on AArch64.
-  for (unsigned Op : {G_ADD, G_SUB}) {
-    for (unsigned Size : {32, 64})
-      LegacyInfo.setAction({Op, 0, LLT::scalar(Size)},
-                           LegacyLegalizeActions::Legal);
-    LegacyInfo.setLegalizeScalarToDifferentSizeStrategy(
-        Op, 0, LegacyLegalizerInfo::widenToLargerTypesAndNarrowToLargest);
-  }
-
-  LegacyInfo.computeTables();
-
-  for (unsigned opcode : {G_ADD, G_SUB}) {
-    // Check we infer the correct types and actually do what we're told.
-    EXPECT_EQ(L.getAction({opcode, {LLT::scalar(8)}}),
-              LegalizeActionStep(WidenScalar, 0, LLT::scalar(32)));
-    EXPECT_EQ(L.getAction({opcode, {LLT::scalar(16)}}),
-              LegalizeActionStep(WidenScalar, 0, LLT::scalar(32)));
-    EXPECT_EQ(L.getAction({opcode, {LLT::scalar(32)}}),
-              LegalizeActionStep(Legal, 0, LLT{}));
-    EXPECT_EQ(L.getAction({opcode, {LLT::scalar(64)}}),
-              LegalizeActionStep(Legal, 0, LLT{}));
-
-    // Make sure the default for over-sized types applies.
-    EXPECT_EQ(L.getAction({opcode, {LLT::scalar(128)}}),
-              LegalizeActionStep(NarrowScalar, 0, LLT::scalar(64)));
-    // Make sure we also handle unusual sizes
-    EXPECT_EQ(L.getAction({opcode, {LLT::scalar(1)}}),
-              LegalizeActionStep(WidenScalar, 0, LLT::scalar(32)));
-    EXPECT_EQ(L.getAction({opcode, {LLT::scalar(31)}}),
-              LegalizeActionStep(WidenScalar, 0, LLT::scalar(32)));
-    EXPECT_EQ(L.getAction({opcode, {LLT::scalar(33)}}),
-              LegalizeActionStep(WidenScalar, 0, LLT::scalar(64)));
-    EXPECT_EQ(L.getAction({opcode, {LLT::scalar(63)}}),
-              LegalizeActionStep(WidenScalar, 0, LLT::scalar(64)));
-    EXPECT_EQ(L.getAction({opcode, {LLT::scalar(65)}}),
-              LegalizeActionStep(NarrowScalar, 0, LLT::scalar(64)));
-  }
-}
-
-TEST(LegalizerInfoTest, VectorRISC) {
-  using namespace TargetOpcode;
-  LegalizerInfo L;
-  auto &LegacyInfo = L.getLegacyLegalizerInfo();
-  // Typical RISCy set of operations based on ARM.
-  LegacyInfo.setAction({G_ADD, LLT::fixed_vector(8, 8)},
-                       LegacyLegalizeActions::Legal);
-  LegacyInfo.setAction({G_ADD, LLT::fixed_vector(16, 8)},
-                       LegacyLegalizeActions::Legal);
-  LegacyInfo.setAction({G_ADD, LLT::fixed_vector(4, 16)},
-                       LegacyLegalizeActions::Legal);
-  LegacyInfo.setAction({G_ADD, LLT::fixed_vector(8, 16)},
-                       LegacyLegalizeActions::Legal);
-  LegacyInfo.setAction({G_ADD, LLT::fixed_vector(2, 32)},
-                       LegacyLegalizeActions::Legal);
-  LegacyInfo.setAction({G_ADD, LLT::fixed_vector(4, 32)},
-                       LegacyLegalizeActions::Legal);
-
-  LegacyInfo.setLegalizeVectorElementToDifferentSizeStrategy(
-      G_ADD, 0, LegacyLegalizerInfo::widenToLargerTypesUnsupportedOtherwise);
-
-  LegacyInfo.setAction({G_ADD, 0, LLT::scalar(32)},
-                       LegacyLegalizeActions::Legal);
-
-  LegacyInfo.computeTables();
-
-  // Check we infer the correct types and actually do what we're told for some
-  // simple cases.
-  EXPECT_EQ(L.getAction({G_ADD, {LLT::fixed_vector(8, 8)}}),
-            LegalizeActionStep(Legal, 0, LLT{}));
-  EXPECT_EQ(L.getAction({G_ADD, {LLT::fixed_vector(8, 7)}}),
-            LegalizeActionStep(WidenScalar, 0, LLT::fixed_vector(8, 8)));
-  EXPECT_EQ(L.getAction({G_ADD, {LLT::fixed_vector(2, 8)}}),
-            LegalizeActionStep(MoreElements, 0, LLT::fixed_vector(8, 8)));
-  EXPECT_EQ(L.getAction({G_ADD, {LLT::fixed_vector(8, 32)}}),
-            LegalizeActionStep(FewerElements, 0, LLT::fixed_vector(4, 32)));
-  // Check a few non-power-of-2 sizes:
-  EXPECT_EQ(L.getAction({G_ADD, {LLT::fixed_vector(3, 3)}}),
-            LegalizeActionStep(WidenScalar, 0, LLT::fixed_vector(3, 8)));
-  EXPECT_EQ(L.getAction({G_ADD, {LLT::fixed_vector(3, 8)}}),
-            LegalizeActionStep(MoreElements, 0, LLT::fixed_vector(8, 8)));
-}
-
-TEST(LegalizerInfoTest, MultipleTypes) {
-  using namespace TargetOpcode;
-  LegalizerInfo L;
-  auto &LegacyInfo = L.getLegacyLegalizerInfo();
-  LLT p0 = LLT::pointer(0, 64);
-  LLT s64 = LLT::scalar(64);
-
-  // Typical RISCy set of operations based on AArch64.
-  LegacyInfo.setAction({G_PTRTOINT, 0, s64}, LegacyLegalizeActions::Legal);
-  LegacyInfo.setAction({G_PTRTOINT, 1, p0}, LegacyLegalizeActions::Legal);
-
-  LegacyInfo.setLegalizeScalarToDifferentSizeStrategy(
-      G_PTRTOINT, 0, LegacyLegalizerInfo::widenToLargerTypesAndNarrowToLargest);
-
-  LegacyInfo.computeTables();
-
-  // Check we infer the correct types and actually do what we're told.
-  EXPECT_EQ(L.getAction({G_PTRTOINT, {s64, p0}}),
-            LegalizeActionStep(Legal, 0, LLT{}));
-
-  // Make sure we also handle unusual sizes
-  EXPECT_EQ(
-      L.getAction({G_PTRTOINT, {LLT::scalar(65), s64}}),
-      LegalizeActionStep(NarrowScalar, 0, s64));
-  EXPECT_EQ(
-      L.getAction({G_PTRTOINT, {s64, LLT::pointer(0, 32)}}),
-      LegalizeActionStep(Unsupported, 1, LLT::pointer(0, 32)));
-}
-
-TEST(LegalizerInfoTest, MultipleSteps) {
-  using namespace TargetOpcode;
-  LegalizerInfo L;
-  auto &LegacyInfo = L.getLegacyLegalizerInfo();
-  LLT s32 = LLT::scalar(32);
-  LLT s64 = LLT::scalar(64);
-
-  LegacyInfo.setLegalizeScalarToDifferentSizeStrategy(
-      G_UREM, 0, LegacyLegalizerInfo::widenToLargerTypesUnsupportedOtherwise);
-  LegacyInfo.setAction({G_UREM, 0, s32}, LegacyLegalizeActions::Lower);
-  LegacyInfo.setAction({G_UREM, 0, s64}, LegacyLegalizeActions::Lower);
-
-  LegacyInfo.computeTables();
-
-  EXPECT_EQ(L.getAction({G_UREM, {LLT::scalar(16)}}),
-            LegalizeActionStep(WidenScalar, 0, LLT::scalar(32)));
-  EXPECT_EQ(L.getAction({G_UREM, {LLT::scalar(32)}}),
-            LegalizeActionStep(Lower, 0, LLT::scalar(32)));
-}
-
-TEST(LegalizerInfoTest, SizeChangeStrategy) {
-  using namespace TargetOpcode;
-  LegalizerInfo L;
-  auto &LegacyInfo = L.getLegacyLegalizerInfo();
-  for (unsigned Size : {1, 8, 16, 32})
-    LegacyInfo.setAction({G_UREM, 0, LLT::scalar(Size)},
-                         LegacyLegalizeActions::Legal);
-
-  LegacyInfo.setLegalizeScalarToDifferentSizeStrategy(
-      G_UREM, 0, LegacyLegalizerInfo::widenToLargerTypesUnsupportedOtherwise);
-  LegacyInfo.computeTables();
-
-  // Check we infer the correct types and actually do what we're told.
-  for (unsigned Size : {1, 8, 16, 32}) {
-    EXPECT_EQ(L.getAction({G_UREM, {LLT::scalar(Size)}}),
-              LegalizeActionStep(Legal, 0, LLT{}));
-  }
-  EXPECT_EQ(L.getAction({G_UREM, {LLT::scalar(2)}}),
-            LegalizeActionStep(WidenScalar, 0, LLT::scalar(8)));
-  EXPECT_EQ(L.getAction({G_UREM, {LLT::scalar(7)}}),
-            LegalizeActionStep(WidenScalar, 0, LLT::scalar(8)));
-  EXPECT_EQ(L.getAction({G_UREM, {LLT::scalar(9)}}),
-            LegalizeActionStep(WidenScalar, 0, LLT::scalar(16)));
-  EXPECT_EQ(L.getAction({G_UREM, {LLT::scalar(17)}}),
-            LegalizeActionStep(WidenScalar, 0, LLT::scalar(32)));
-  EXPECT_EQ(L.getAction({G_UREM, {LLT::scalar(31)}}),
-            LegalizeActionStep(WidenScalar, 0, LLT::scalar(32)));
-  EXPECT_EQ(L.getAction({G_UREM, {LLT::scalar(33)}}),
-            LegalizeActionStep(Unsupported, 0, LLT::scalar(33)));
-}
-}
-
-#define EXPECT_ACTION(Action, Index, Type, Query)                              \
-  do {                                                                         \
-    auto A = LI.getAction(Query);                                              \
-    EXPECT_EQ(LegalizeActionStep(Action, Index, Type), A) << A;                \
-  } while (0)
-
-TEST(LegalizerInfoTest, RuleSets) {
-  using namespace TargetOpcode;
-
-  const LLT s5 = LLT::scalar(5);
-  const LLT s8 = LLT::scalar(8);
-  const LLT s16 = LLT::scalar(16);
-  const LLT s32 = LLT::scalar(32);
-  const LLT s33 = LLT::scalar(33);
-  const LLT s64 = LLT::scalar(64);
-
-  const LLT v2s5 = LLT::fixed_vector(2, 5);
-  const LLT v2s8 = LLT::fixed_vector(2, 8);
-  const LLT v2s16 = LLT::fixed_vector(2, 16);
-  const LLT v2s32 = LLT::fixed_vector(2, 32);
-  const LLT v3s32 = LLT::fixed_vector(3, 32);
-  const LLT v4s32 = LLT::fixed_vector(4, 32);
-  const LLT v2s33 = LLT::fixed_vector(2, 33);
-  const LLT v2s64 = LLT::fixed_vector(2, 64);
-
-  const LLT p0 = LLT::pointer(0, 32);
-  const LLT v3p0 = LLT::fixed_vector(3, p0);
-  const LLT v4p0 = LLT::fixed_vector(4, p0);
-
-  {
-    LegalizerInfo LI;
-    auto &LegacyInfo = LI.getLegacyLegalizerInfo();
-
-    LI.getActionDefinitionsBuilder(G_IMPLICIT_DEF)
-      .legalFor({v4s32, v4p0})
-      .moreElementsToNextPow2(0);
-    LegacyInfo.computeTables();
-
-    EXPECT_ACTION(Unsupported, 0, LLT(), LegalityQuery(G_IMPLICIT_DEF, {s32}));
-    EXPECT_ACTION(Unsupported, 0, LLT(), LegalityQuery(G_IMPLICIT_DEF, {v2s32}));
-    EXPECT_ACTION(MoreElements, 0, v4p0, LegalityQuery(G_IMPLICIT_DEF, {v3p0}));
-    EXPECT_ACTION(MoreElements, 0, v4s32, LegalityQuery(G_IMPLICIT_DEF, {v3s32}));
-  }
-
-  // Test minScalarOrElt
-  {
-    LegalizerInfo LI;
-    auto &LegacyInfo = LI.getLegacyLegalizerInfo();
-    LI.getActionDefinitionsBuilder(G_OR)
-      .legalFor({s32})
-      .minScalarOrElt(0, s32);
-    LegacyInfo.computeTables();
-
-    EXPECT_ACTION(WidenScalar, 0, s32, LegalityQuery(G_OR, {s16}));
-    EXPECT_ACTION(WidenScalar, 0, v2s32, LegalityQuery(G_OR, {v2s16}));
-  }
-
-  // Test maxScalarOrELt
-  {
-    LegalizerInfo LI;
-    auto &LegacyInfo = LI.getLegacyLegalizerInfo();
-    LI.getActionDefinitionsBuilder(G_AND)
-      .legalFor({s16})
-      .maxScalarOrElt(0, s16);
-    LegacyInfo.computeTables();
-
-    EXPECT_ACTION(NarrowScalar, 0, s16, LegalityQuery(G_AND, {s32}));
-    EXPECT_ACTION(NarrowScalar, 0, v2s16, LegalityQuery(G_AND, {v2s32}));
-  }
-
-  // Test clampScalarOrElt
-  {
-    LegalizerInfo LI;
-    auto &LegacyInfo = LI.getLegacyLegalizerInfo();
-    LI.getActionDefinitionsBuilder(G_XOR)
-      .legalFor({s16})
-      .clampScalarOrElt(0, s16, s32);
-    LegacyInfo.computeTables();
-
-    EXPECT_ACTION(NarrowScalar, 0, s32, LegalityQuery(G_XOR, {s64}));
-    EXPECT_ACTION(WidenScalar, 0, s16, LegalityQuery(G_XOR, {s8}));
-
-    // Make sure the number of elements is preserved.
-    EXPECT_ACTION(NarrowScalar, 0, v2s32, LegalityQuery(G_XOR, {v2s64}));
-    EXPECT_ACTION(WidenScalar, 0, v2s16, LegalityQuery(G_XOR, {v2s8}));
-  }
-
-  // Test minScalar
-  {
-    LegalizerInfo LI;
-    auto &LegacyInfo = LI.getLegacyLegalizerInfo();
-    LI.getActionDefinitionsBuilder(G_OR)
-      .legalFor({s32})
-      .minScalar(0, s32);
-    LegacyInfo.computeTables();
-
-    // Only handle scalars, ignore vectors.
-    EXPECT_ACTION(WidenScalar, 0, s32, LegalityQuery(G_OR, {s16}));
-    EXPECT_ACTION(Unsupported, 0, LLT(), LegalityQuery(G_OR, {v2s16}));
-  }
-
-  // Test maxScalar
-  {
-    LegalizerInfo LI;
-    auto &LegacyInfo = LI.getLegacyLegalizerInfo();
-    LI.getActionDefinitionsBuilder(G_AND)
-      .legalFor({s16})
-      .maxScalar(0, s16);
-    LegacyInfo.computeTables();
-
-    // Only handle scalars, ignore vectors.
-    EXPECT_ACTION(NarrowScalar, 0, s16, LegalityQuery(G_AND, {s32}));
-    EXPECT_ACTION(Unsupported, 0, LLT(), LegalityQuery(G_AND, {v2s32}));
-  }
-
-  // Test clampScalar
-  {
-    LegalizerInfo LI;
-    auto &LegacyInfo = LI.getLegacyLegalizerInfo();
-
-    LI.getActionDefinitionsBuilder(G_XOR)
-      .legalFor({s16})
-      .clampScalar(0, s16, s32);
-    LegacyInfo.computeTables();
-
-    EXPECT_ACTION(NarrowScalar, 0, s32, LegalityQuery(G_XOR, {s64}));
-    EXPECT_ACTION(WidenScalar, 0, s16, LegalityQuery(G_XOR, {s8}));
-
-    // Only handle scalars, ignore vectors.
-    EXPECT_ACTION(Unsupported, 0, LLT(), LegalityQuery(G_XOR, {v2s64}));
-    EXPECT_ACTION(Unsupported, 0, LLT(), LegalityQuery(G_XOR, {v2s8}));
-  }
-
-  // Test widenScalarOrEltToNextPow2
-  {
-    LegalizerInfo LI;
-    auto &LegacyInfo = LI.getLegacyLegalizerInfo();
-
-    LI.getActionDefinitionsBuilder(G_AND)
-      .legalFor({s32})
-      .widenScalarOrEltToNextPow2(0, 32);
-    LegacyInfo.computeTables();
-
-    // Handle scalars and vectors
-    EXPECT_ACTION(WidenScalar, 0, s32, LegalityQuery(G_AND, {s5}));
-    EXPECT_ACTION(WidenScalar, 0, v2s32, LegalityQuery(G_AND, {v2s5}));
-    EXPECT_ACTION(WidenScalar, 0, s64, LegalityQuery(G_AND, {s33}));
-    EXPECT_ACTION(WidenScalar, 0, v2s64, LegalityQuery(G_AND, {v2s33}));
-  }
-
-  // Test widenScalarToNextPow2
-  {
-    LegalizerInfo LI;
-    auto &LegacyInfo = LI.getLegacyLegalizerInfo();
-
-    LI.getActionDefinitionsBuilder(G_AND)
-      .legalFor({s32})
-      .widenScalarToNextPow2(0, 32);
-    LegacyInfo.computeTables();
-
-    EXPECT_ACTION(WidenScalar, 0, s32, LegalityQuery(G_AND, {s5}));
-    EXPECT_ACTION(WidenScalar, 0, s64, LegalityQuery(G_AND, {s33}));
-
-    // Do nothing for vectors.
-    EXPECT_ACTION(Unsupported, 0, LLT(), LegalityQuery(G_AND, {v2s5}));
-    EXPECT_ACTION(Unsupported, 0, LLT(), LegalityQuery(G_AND, {v2s33}));
-  }
-}
-
-TEST(LegalizerInfoTest, MMOAlignment) {
-  using namespace TargetOpcode;
-
-  const LLT s32 = LLT::scalar(32);
-  const LLT p0 = LLT::pointer(0, 64);
-
-  {
-    LegalizerInfo LI;
-    auto &LegacyInfo = LI.getLegacyLegalizerInfo();
-    LI.getActionDefinitionsBuilder(G_LOAD)
-      .legalForTypesWithMemDesc({{s32, p0, s32, 32}});
-
-    LegacyInfo.computeTables();
-
-    EXPECT_ACTION(Legal, 0, LLT(),
-                  LegalityQuery(G_LOAD, {s32, p0},
-                                LegalityQuery::MemDesc{
-                                  s32, 32, AtomicOrdering::NotAtomic}));
-    EXPECT_ACTION(Unsupported, 0, LLT(),
-                  LegalityQuery(G_LOAD, {s32, p0},
-                                LegalityQuery::MemDesc{
-                                  s32, 16, AtomicOrdering::NotAtomic }));
-    EXPECT_ACTION(Unsupported, 0, LLT(),
-                  LegalityQuery(G_LOAD, {s32, p0},
-                                LegalityQuery::MemDesc{
-                                  s32, 8, AtomicOrdering::NotAtomic}));
-  }
-
-  // Test that the maximum supported alignment value isn't truncated
-  {
-    // Maximum IR defined alignment in bytes.
-    const uint64_t MaxAlignment = UINT64_C(1) << 29;
-    const uint64_t MaxAlignInBits = 8 * MaxAlignment;
-    LegalizerInfo LI;
-    auto &LegacyInfo = LI.getLegacyLegalizerInfo();
-    LI.getActionDefinitionsBuilder(G_LOAD)
-      .legalForTypesWithMemDesc({{s32, p0, s32, MaxAlignInBits}});
-
-    LegacyInfo.computeTables();
-
-    EXPECT_ACTION(Legal, 0, LLT(),
-                  LegalityQuery(G_LOAD, {s32, p0},
-                                LegalityQuery::MemDesc{s32,
-                                    MaxAlignInBits, AtomicOrdering::NotAtomic}));
-    EXPECT_ACTION(Unsupported, 0, LLT(),
-                  LegalityQuery(G_LOAD, {s32, p0},
-                                LegalityQuery::MemDesc{
-                                  s32, 8, AtomicOrdering::NotAtomic }));
-  }
-}
-
-// This code sequence doesn't do anything, but it covers a previously uncovered
-// codepath that used to crash in MSVC x86_32 debug mode.
-TEST(LegalizerInfoTest, MSVCDebugMiscompile) {
-  const LLT S1 = LLT::scalar(1);
-  const LLT P0 = LLT::pointer(0, 32);
-  LegalizerInfo LI;
-  auto Builder = LI.getActionDefinitionsBuilder(TargetOpcode::G_PTRTOINT);
-  (void)Builder.legalForCartesianProduct({S1}, {P0});
-}
diff --git a/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/LegalizerTest.cpp b/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/LegalizerTest.cpp
deleted file mode 100644
index b759b5fecd6..00000000000
--- a/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/LegalizerTest.cpp
+++ /dev/null
@@ -1,228 +0,0 @@
-//===- LegalizerTest.cpp --------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/CodeGen/GlobalISel/Legalizer.h"
-#include "GISelMITest.h"
-#include "llvm/CodeGen/GlobalISel/LostDebugLocObserver.h"
-
-#define DEBUG_TYPE "legalizer-test"
-
-using namespace LegalizeActions;
-using namespace LegalizeMutations;
-using namespace LegalityPredicates;
-
-namespace {
-
-::testing::AssertionResult isNullMIPtr(const MachineInstr *MI) {
-  if (MI == nullptr)
-    return ::testing::AssertionSuccess();
-  std::string MIBuffer;
-  raw_string_ostream MISStream(MIBuffer);
-  MI->print(MISStream, /*IsStandalone=*/true, /*SkipOpers=*/false,
-            /*SkipDebugLoc=*/false, /*AddNewLine=*/false);
-  return ::testing::AssertionFailure()
-         << "unable to legalize instruction: " << MISStream.str();
-}
-
-DefineLegalizerInfo(ALegalizer, {
-  auto p0 = LLT::pointer(0, 64);
-  auto s8 = LLT::scalar(8);
-  auto v2s8 = LLT::fixed_vector(2, 8);
-  auto v2s16 = LLT::fixed_vector(2, 16);
-  getActionDefinitionsBuilder(G_LOAD)
-      .legalForTypesWithMemDesc({{s16, p0, s8, 8}})
-      .scalarize(0)
-      .clampScalar(0, s16, s16);
-  getActionDefinitionsBuilder(G_PTR_ADD).legalFor({{p0, s64}});
-  getActionDefinitionsBuilder(G_CONSTANT).legalFor({s32, s64});
-  getActionDefinitionsBuilder(G_BUILD_VECTOR)
-      .legalFor({{v2s16, s16}})
-      .clampScalar(1, s16, s16);
-  getActionDefinitionsBuilder(G_BUILD_VECTOR_TRUNC).legalFor({{v2s8, s16}});
-  getActionDefinitionsBuilder(G_ANYEXT).legalFor({{s32, s16}});
-  getActionDefinitionsBuilder(G_ZEXT).legalFor({{s32, s16}});
-  getActionDefinitionsBuilder(G_SEXT).legalFor({{s32, s16}});
-  getActionDefinitionsBuilder(G_AND).legalFor({s32});
-  getActionDefinitionsBuilder(G_SEXT_INREG).lower();
-  getActionDefinitionsBuilder(G_ASHR).legalFor({{s32, s32}});
-  getActionDefinitionsBuilder(G_SHL).legalFor({{s32, s32}});
-})
-
-TEST_F(AArch64GISelMITest, BasicLegalizerTest) {
-  StringRef MIRString = R"(
-    %vptr:_(p0) = COPY $x4
-    %v:_(<2 x s8>) = G_LOAD %vptr:_(p0) :: (load (<2 x s8>), align 1)
-    $h4 = COPY %v:_(<2 x s8>)
-  )";
-  setUp(MIRString.rtrim(' '));
-  if (!TM)
-    return;
-
-  ALegalizerInfo LI(MF->getSubtarget());
-  LostDebugLocObserver LocObserver(DEBUG_TYPE);
-
-  Legalizer::MFResult Result = Legalizer::legalizeMachineFunction(
-      *MF, LI, {&LocObserver}, LocObserver, B);
-
-  EXPECT_TRUE(isNullMIPtr(Result.FailedOn));
-  EXPECT_TRUE(Result.Changed);
-
-  StringRef CheckString = R"(
-    CHECK:      %vptr:_(p0) = COPY $x4
-    CHECK-NEXT: [[LOAD_0:%[0-9]+]]:_(s16) = G_LOAD %vptr:_(p0) :: (load (s8))
-    CHECK-NEXT: [[OFFSET_1:%[0-9]+]]:_(s64) = G_CONSTANT i64 1
-    CHECK-NEXT: [[VPTR_1:%[0-9]+]]:_(p0) = G_PTR_ADD %vptr:_, [[OFFSET_1]]:_(s64)
-    CHECK-NEXT: [[LOAD_1:%[0-9]+]]:_(s16) = G_LOAD [[VPTR_1]]:_(p0) :: (load (s8) from unknown-address + 1)
-    CHECK-NEXT: [[V0:%[0-9]+]]:_(s16) = COPY [[LOAD_0]]:_(s16)
-    CHECK-NEXT: [[V1:%[0-9]+]]:_(s16) = COPY [[LOAD_1]]:_(s16)
-    CHECK-NEXT: %v:_(<2 x s8>) = G_BUILD_VECTOR_TRUNC [[V0]]:_(s16), [[V1]]:_(s16)
-    CHECK-NEXT: $h4 = COPY %v:_(<2 x s8>)
-  )";
-
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckString)) << *MF;
-}
-
-// Making sure the legalization finishes successfully w/o failure to combine
-// away all the legalization artifacts regardless of the order of their
-// creation.
-TEST_F(AArch64GISelMITest, UnorderedArtifactCombiningTest) {
-  StringRef MIRString = R"(
-    %vptr:_(p0) = COPY $x4
-    %v:_(<2 x s8>) = G_LOAD %vptr:_(p0) :: (load (<2 x s8>), align 1)
-    %v0:_(s8), %v1:_(s8) = G_UNMERGE_VALUES %v:_(<2 x s8>)
-    %v0_ext:_(s16) = G_ANYEXT %v0:_(s8)
-    $h4 = COPY %v0_ext:_(s16)
-  )";
-  setUp(MIRString.rtrim(' '));
-  if (!TM)
-    return;
-
-  ALegalizerInfo LI(MF->getSubtarget());
-  LostDebugLocObserver LocObserver(DEBUG_TYPE);
-
-  // The events here unfold as follows:
-  // 1. First, the function is scanned pre-forming the worklist of artifacts:
-  //
-  //      UNMERGE  (1): pushed into the worklist first, will be processed last.
-  //         |
-  //       ANYEXT  (2)
-  //
-  // 2. Second, the load is scalarized, and then its destination is widened,
-  //    forming the following chain of legalization artifacts:
-  //
-  //        TRUNC  (4): created last, will be processed first.
-  //         |
-  // BUILD_VECTOR  (3)
-  //         |
-  //      UNMERGE  (1): pushed into the worklist first, will be processed last.
-  //         |
-  //       ANYEXT  (2)
-  //
-  // 3. Third, the artifacts are attempted to be combined in pairs, looking
-  //    through the def-use chain from the roots towards the leafs, visiting the
-  //    roots in order they happen to be in the worklist:
-  //      (4) - (trunc):                  can not be combined;
-  //      (3) - (build_vector (trunc)):   can not be combined;
-  //      (2) - (anyext (unmerge)):       can not be combined;
-  //      (1) - (unmerge (build_vector)): combined and eliminated;
-  //
-  //    leaving the function in the following state:
-  //
-  //        TRUNC  (1): moved to non-artifact instructions worklist first.
-  //         |
-  //       ANYEXT  (2): also moved to non-artifact instructions worklist.
-  //
-  //    Every other instruction is successfully legalized in full.
-  //    If combining (unmerge (build_vector)) does not re-insert every artifact
-  //    that had its def-use chain modified (shortened) into the artifact
-  //    worklist (here it's just ANYEXT), the process moves on onto the next
-  //    outer loop iteration of the top-level legalization algorithm here, w/o
-  //    performing all the artifact combines possible. Let's consider this
-  //    scenario first:
-  //  4.A. Neither TRUNC, nor ANYEXT can be legalized in isolation, both of them
-  //       get moved to the retry worklist, but no additional artifacts were
-  //       created in the process, thus algorithm concludes no progress could be
-  //       made, and fails.
-  //  4.B. If, however, combining (unmerge (build_vector)) had re-inserted
-  //       ANYEXT into the worklist (as ANYEXT's source changes, not by value,
-  //       but by implementation), (anyext (trunc)) combine happens next, which
-  //       fully eliminates all the artifacts and legalization succeeds.
-  //
-  //  We're looking into making sure that (4.B) happens here, not (4.A). Note
-  //  that in that case the first scan through the artifacts worklist, while not
-  //  being done in any guaranteed order, only needs to find the innermost
-  //  pair(s) of artifacts that could be immediately combined out. After that
-  //  the process follows def-use chains, making them shorter at each step, thus
-  //  combining everything that can be combined in O(n) time.
-  Legalizer::MFResult Result = Legalizer::legalizeMachineFunction(
-      *MF, LI, {&LocObserver}, LocObserver, B);
-
-  EXPECT_TRUE(isNullMIPtr(Result.FailedOn));
-  EXPECT_TRUE(Result.Changed);
-
-  StringRef CheckString = R"(
-    CHECK:      %vptr:_(p0) = COPY $x4
-    CHECK-NEXT: [[LOAD_0:%[0-9]+]]:_(s16) = G_LOAD %vptr:_(p0) :: (load (s8))
-    CHECK:      %v0_ext:_(s16) = COPY [[LOAD_0]]:_(s16)
-    CHECK-NEXT: $h4 = COPY %v0_ext:_(s16)
-  )";
-
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckString)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, UnorderedArtifactCombiningManyCopiesTest) {
-  StringRef MIRString = R"(
-    %vptr:_(p0) = COPY $x4
-    %v:_(<2 x s8>) = G_LOAD %vptr:_(p0) :: (load (<2 x s8>), align 1)
-    %vc0:_(<2 x s8>) = COPY %v:_(<2 x s8>)
-    %vc1:_(<2 x s8>) = COPY %v:_(<2 x s8>)
-    %vc00:_(s8), %vc01:_(s8) = G_UNMERGE_VALUES %vc0:_(<2 x s8>)
-    %vc10:_(s8), %vc11:_(s8) = G_UNMERGE_VALUES %vc1:_(<2 x s8>)
-    %v0t:_(s8) = COPY %vc00:_(s8)
-    %v0:_(s8) = COPY %v0t:_(s8)
-    %v1t:_(s8) = COPY %vc11:_(s8)
-    %v1:_(s8) = COPY %v1t:_(s8)
-    %v0_zext:_(s32) = G_ZEXT %v0:_(s8)
-    %v1_sext:_(s32) = G_SEXT %v1:_(s8)
-    $w4 = COPY %v0_zext:_(s32)
-    $w5 = COPY %v1_sext:_(s32)
-  )";
-  setUp(MIRString.rtrim(' '));
-  if (!TM)
-    return;
-
-  ALegalizerInfo LI(MF->getSubtarget());
-  LostDebugLocObserver LocObserver(DEBUG_TYPE);
-
-  Legalizer::MFResult Result = Legalizer::legalizeMachineFunction(
-      *MF, LI, {&LocObserver}, LocObserver, B);
-
-  EXPECT_TRUE(isNullMIPtr(Result.FailedOn));
-  EXPECT_TRUE(Result.Changed);
-
-  StringRef CheckString = R"(
-    CHECK:      %vptr:_(p0) = COPY $x4
-    CHECK-NEXT: [[LOAD_0:%[0-9]+]]:_(s16) = G_LOAD %vptr:_(p0) :: (load (s8))
-    CHECK-NEXT: [[OFFSET_1:%[0-9]+]]:_(s64) = G_CONSTANT i64 1
-    CHECK-NEXT: [[VPTR_1:%[0-9]+]]:_(p0) = G_PTR_ADD %vptr:_, [[OFFSET_1]]:_(s64)
-    CHECK-NEXT: [[LOAD_1:%[0-9]+]]:_(s16) = G_LOAD [[VPTR_1]]:_(p0) :: (load (s8) from unknown-address + 1)
-    CHECK-NEXT: [[FF_MASK:%[0-9]+]]:_(s32) = G_CONSTANT i32 255
-    CHECK-NEXT: [[V0_EXT:%[0-9]+]]:_(s32) = G_ANYEXT [[LOAD_0]]:_(s16)
-    CHECK-NEXT: %v0_zext:_(s32) = G_AND [[V0_EXT]]:_, [[FF_MASK]]:_
-    CHECK-NEXT: [[V1_EXT:%[0-9]+]]:_(s32) = G_ANYEXT [[LOAD_1]]:_(s16)
-    CHECK-NEXT: [[SHAMNT:%[0-9]+]]:_(s32) = G_CONSTANT i32 24
-    CHECK-NEXT: [[V1_SHL:%[0-9]+]]:_(s32) = G_SHL [[V1_EXT]]:_, [[SHAMNT]]:_(s32)
-    CHECK-NEXT: %v1_sext:_(s32) = G_ASHR [[V1_SHL]]:_, [[SHAMNT]]:_(s32)
-    CHECK-NEXT: $w4 = COPY %v0_zext:_(s32)
-    CHECK-NEXT: $w5 = COPY %v1_sext:_(s32)
-  )";
-
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckString)) << *MF;
-}
-
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/MachineIRBuilderTest.cpp b/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/MachineIRBuilderTest.cpp
deleted file mode 100644
index da807859648..00000000000
--- a/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/MachineIRBuilderTest.cpp
+++ /dev/null
@@ -1,422 +0,0 @@
-//===- MachineIRBuilderTest.cpp -------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "GISelMITest.h"
-#include "llvm/CodeGen/GlobalISel/MachineIRBuilder.h"
-
-TEST_F(AArch64GISelMITest, TestBuildConstantFConstant) {
-  setUp();
-  if (!TM)
-    return;
-
-  B.buildConstant(LLT::scalar(32), 42);
-  B.buildFConstant(LLT::scalar(32), 1.0);
-
-  B.buildConstant(LLT::fixed_vector(2, 32), 99);
-  B.buildFConstant(LLT::fixed_vector(2, 32), 2.0);
-
-  // Test APFloat overload.
-  APFloat KVal(APFloat::IEEEdouble(), "4.0");
-  B.buildFConstant(LLT::scalar(64), KVal);
-
-  auto CheckStr = R"(
-  CHECK: [[CONST0:%[0-9]+]]:_(s32) = G_CONSTANT i32 42
-  CHECK: [[FCONST0:%[0-9]+]]:_(s32) = G_FCONSTANT float 1.000000e+00
-  CHECK: [[CONST1:%[0-9]+]]:_(s32) = G_CONSTANT i32 99
-  CHECK: [[VEC0:%[0-9]+]]:_(<2 x s32>) = G_BUILD_VECTOR [[CONST1]]:_(s32), [[CONST1]]:_(s32)
-  CHECK: [[FCONST1:%[0-9]+]]:_(s32) = G_FCONSTANT float 2.000000e+00
-  CHECK: [[VEC1:%[0-9]+]]:_(<2 x s32>) = G_BUILD_VECTOR [[FCONST1]]:_(s32), [[FCONST1]]:_(s32)
-  CHECK: [[FCONST2:%[0-9]+]]:_(s64) = G_FCONSTANT double 4.000000e+00
-  )";
-
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-#ifdef GTEST_HAS_DEATH_TEST
-#ifndef NDEBUG
-
-TEST_F(AArch64GISelMITest, TestBuildConstantFConstantDeath) {
-  setUp();
-  if (!TM)
-    return;
-
-  LLVMContext &Ctx = MF->getFunction().getContext();
-  APInt APV32(32, 12345);
-
-  // Test APInt version breaks
-  EXPECT_DEATH(B.buildConstant(LLT::scalar(16), APV32),
-               "creating constant with the wrong size");
-  EXPECT_DEATH(B.buildConstant(LLT::fixed_vector(2, 16), APV32),
-               "creating constant with the wrong size");
-
-  // Test ConstantInt version breaks
-  ConstantInt *CI = ConstantInt::get(Ctx, APV32);
-  EXPECT_DEATH(B.buildConstant(LLT::scalar(16), *CI),
-               "creating constant with the wrong size");
-  EXPECT_DEATH(B.buildConstant(LLT::fixed_vector(2, 16), *CI),
-               "creating constant with the wrong size");
-
-  APFloat DoubleVal(APFloat::IEEEdouble());
-  ConstantFP *CF = ConstantFP::get(Ctx, DoubleVal);
-  EXPECT_DEATH(B.buildFConstant(LLT::scalar(16), *CF),
-               "creating fconstant with the wrong size");
-  EXPECT_DEATH(B.buildFConstant(LLT::fixed_vector(2, 16), *CF),
-               "creating fconstant with the wrong size");
-}
-
-#endif
-#endif
-
-TEST_F(AArch64GISelMITest, DstOpSrcOp) {
-  setUp();
-  if (!TM)
-    return;
-
-  SmallVector<Register, 4> Copies;
-  collectCopies(Copies, MF);
-
-  LLT s64 = LLT::scalar(64);
-  auto MIBAdd = B.buildAdd(s64, Copies[0], Copies[1]);
-
-  // Test SrcOp and DstOp can be constructed directly from MachineOperand by
-  // copying the instruction
-  B.buildAdd(MIBAdd->getOperand(0), MIBAdd->getOperand(1), MIBAdd->getOperand(2));
-
-
-  auto CheckStr = R"(
-  ; CHECK: [[COPY0:%[0-9]+]]:_(s64) = COPY $x0
-  ; CHECK: [[COPY1:%[0-9]+]]:_(s64) = COPY $x1
-  ; CHECK: [[ADD:%[0-9]+]]:_(s64) = G_ADD [[COPY0]]:_, [[COPY1]]:_
-  ; CHECK: [[ADD]]:_(s64) = G_ADD [[COPY0]]:_, [[COPY1]]:_
-  )";
-
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, BuildUnmerge) {
-  setUp();
-  if (!TM)
-    return;
-
-  SmallVector<Register, 4> Copies;
-  collectCopies(Copies, MF);
-  B.buildUnmerge(LLT::scalar(32), Copies[0]);
-  B.buildUnmerge(LLT::scalar(16), Copies[1]);
-
-  auto CheckStr = R"(
-  ; CHECK: [[COPY0:%[0-9]+]]:_(s64) = COPY $x0
-  ; CHECK: [[COPY1:%[0-9]+]]:_(s64) = COPY $x1
-  ; CHECK: [[UNMERGE32_0:%[0-9]+]]:_(s32), [[UNMERGE32_1:%[0-9]+]]:_(s32) = G_UNMERGE_VALUES [[COPY0]]
-  ; CHECK: [[UNMERGE16_0:%[0-9]+]]:_(s16), [[UNMERGE16_1:%[0-9]+]]:_(s16), [[UNMERGE16_2:%[0-9]+]]:_(s16), [[UNMERGE16_3:%[0-9]+]]:_(s16) = G_UNMERGE_VALUES [[COPY1]]
-
-  )";
-
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, TestBuildFPInsts) {
-  setUp();
-  if (!TM)
-    return;
-
-  SmallVector<Register, 4> Copies;
-  collectCopies(Copies, MF);
-
-  LLT S64 = LLT::scalar(64);
-
-  B.buildFAdd(S64, Copies[0], Copies[1]);
-  B.buildFSub(S64, Copies[0], Copies[1]);
-  B.buildFMA(S64, Copies[0], Copies[1], Copies[2]);
-  B.buildFMAD(S64, Copies[0], Copies[1], Copies[2]);
-  B.buildFMAD(S64, Copies[0], Copies[1], Copies[2], MachineInstr::FmNoNans);
-  B.buildFNeg(S64, Copies[0]);
-  B.buildFAbs(S64, Copies[0]);
-  B.buildFCopysign(S64, Copies[0], Copies[1]);
-
-  auto CheckStr = R"(
-  ; CHECK: [[COPY0:%[0-9]+]]:_(s64) = COPY $x0
-  ; CHECK: [[COPY1:%[0-9]+]]:_(s64) = COPY $x1
-  ; CHECK: [[COPY2:%[0-9]+]]:_(s64) = COPY $x2
-  ; CHECK: [[FADD:%[0-9]+]]:_(s64) = G_FADD [[COPY0]]:_, [[COPY1]]:_
-  ; CHECK: [[FSUB:%[0-9]+]]:_(s64) = G_FSUB [[COPY0]]:_, [[COPY1]]:_
-  ; CHECK: [[FMA:%[0-9]+]]:_(s64) = G_FMA [[COPY0]]:_, [[COPY1]]:_, [[COPY2]]:_
-  ; CHECK: [[FMAD0:%[0-9]+]]:_(s64) = G_FMAD [[COPY0]]:_, [[COPY1]]:_, [[COPY2]]:_
-  ; CHECK: [[FMAD1:%[0-9]+]]:_(s64) = nnan G_FMAD [[COPY0]]:_, [[COPY1]]:_, [[COPY2]]:_
-  ; CHECK: [[FNEG:%[0-9]+]]:_(s64) = G_FNEG [[COPY0]]:_
-  ; CHECK: [[FABS:%[0-9]+]]:_(s64) = G_FABS [[COPY0]]:_
-  ; CHECK: [[FCOPYSIGN:%[0-9]+]]:_(s64) = G_FCOPYSIGN [[COPY0]]:_, [[COPY1]]:_
-  )";
-
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, BuildIntrinsic) {
-  setUp();
-  if (!TM)
-    return;
-
-  LLT S64 = LLT::scalar(64);
-  SmallVector<Register, 4> Copies;
-  collectCopies(Copies, MF);
-
-  // Make sure DstOp version works. sqrt is just a placeholder intrinsic.
-  B.buildIntrinsic(Intrinsic::sqrt, {S64}, false)
-    .addUse(Copies[0]);
-
-  // Make sure register version works
-  SmallVector<Register, 1> Results;
-  Results.push_back(MRI->createGenericVirtualRegister(S64));
-  B.buildIntrinsic(Intrinsic::sqrt, Results, false)
-    .addUse(Copies[1]);
-
-  auto CheckStr = R"(
-  ; CHECK: [[COPY0:%[0-9]+]]:_(s64) = COPY $x0
-  ; CHECK: [[COPY1:%[0-9]+]]:_(s64) = COPY $x1
-  ; CHECK: [[SQRT0:%[0-9]+]]:_(s64) = G_INTRINSIC intrinsic(@llvm.sqrt), [[COPY0]]:_
-  ; CHECK: [[SQRT1:%[0-9]+]]:_(s64) = G_INTRINSIC intrinsic(@llvm.sqrt), [[COPY1]]:_
-  )";
-
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, BuildXor) {
-  setUp();
-  if (!TM)
-    return;
-
-  LLT S64 = LLT::scalar(64);
-  LLT S128 = LLT::scalar(128);
-  SmallVector<Register, 4> Copies;
-  collectCopies(Copies, MF);
-  B.buildXor(S64, Copies[0], Copies[1]);
-  B.buildNot(S64, Copies[0]);
-
-  // Make sure this works with > 64-bit types
-  auto Merge = B.buildMerge(S128, {Copies[0], Copies[1]});
-  B.buildNot(S128, Merge);
-  auto CheckStr = R"(
-  ; CHECK: [[COPY0:%[0-9]+]]:_(s64) = COPY $x0
-  ; CHECK: [[COPY1:%[0-9]+]]:_(s64) = COPY $x1
-  ; CHECK: [[XOR0:%[0-9]+]]:_(s64) = G_XOR [[COPY0]]:_, [[COPY1]]:_
-  ; CHECK: [[NEGONE64:%[0-9]+]]:_(s64) = G_CONSTANT i64 -1
-  ; CHECK: [[XOR1:%[0-9]+]]:_(s64) = G_XOR [[COPY0]]:_, [[NEGONE64]]:_
-  ; CHECK: [[MERGE:%[0-9]+]]:_(s128) = G_MERGE_VALUES [[COPY0]]:_(s64), [[COPY1]]:_(s64)
-  ; CHECK: [[NEGONE128:%[0-9]+]]:_(s128) = G_CONSTANT i128 -1
-  ; CHECK: [[XOR2:%[0-9]+]]:_(s128) = G_XOR [[MERGE]]:_, [[NEGONE128]]:_
-  )";
-
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, BuildBitCounts) {
-  setUp();
-  if (!TM)
-    return;
-
-  LLT S32 = LLT::scalar(32);
-  SmallVector<Register, 4> Copies;
-  collectCopies(Copies, MF);
-
-  B.buildCTPOP(S32, Copies[0]);
-  B.buildCTLZ(S32, Copies[0]);
-  B.buildCTLZ_ZERO_UNDEF(S32, Copies[1]);
-  B.buildCTTZ(S32, Copies[0]);
-  B.buildCTTZ_ZERO_UNDEF(S32, Copies[1]);
-
-  auto CheckStr = R"(
-  ; CHECK: [[COPY0:%[0-9]+]]:_(s64) = COPY $x0
-  ; CHECK: [[COPY1:%[0-9]+]]:_(s64) = COPY $x1
-  ; CHECK: [[CTPOP:%[0-9]+]]:_(s32) = G_CTPOP [[COPY0]]:_
-  ; CHECK: [[CTLZ0:%[0-9]+]]:_(s32) = G_CTLZ [[COPY0]]:_
-  ; CHECK: [[CTLZ_UNDEF0:%[0-9]+]]:_(s32) = G_CTLZ_ZERO_UNDEF [[COPY1]]:_
-  ; CHECK: [[CTTZ:%[0-9]+]]:_(s32) = G_CTTZ [[COPY0]]:_
-  ; CHECK: [[CTTZ_UNDEF0:%[0-9]+]]:_(s32) = G_CTTZ_ZERO_UNDEF [[COPY1]]:_
-  )";
-
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, BuildCasts) {
-  setUp();
-  if (!TM)
-    return;
-
-  LLT S32 = LLT::scalar(32);
-  SmallVector<Register, 4> Copies;
-  collectCopies(Copies, MF);
-
-  B.buildUITOFP(S32, Copies[0]);
-  B.buildSITOFP(S32, Copies[0]);
-  B.buildFPTOUI(S32, Copies[0]);
-  B.buildFPTOSI(S32, Copies[0]);
-
-  auto CheckStr = R"(
-  ; CHECK: [[COPY0:%[0-9]+]]:_(s64) = COPY $x0
-  ; CHECK: [[UITOFP:%[0-9]+]]:_(s32) = G_UITOFP [[COPY0]]:_
-  ; CHECK: [[SITOFP:%[0-9]+]]:_(s32) = G_SITOFP [[COPY0]]:_
-  ; CHECK: [[FPTOUI:%[0-9]+]]:_(s32) = G_FPTOUI [[COPY0]]:_
-  ; CHECK: [[FPTOSI:%[0-9]+]]:_(s32) = G_FPTOSI [[COPY0]]:_
-  )";
-
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, BuildMinMaxAbs) {
-  setUp();
-  if (!TM)
-    return;
-
-  LLT S64 = LLT::scalar(64);
-  SmallVector<Register, 4> Copies;
-  collectCopies(Copies, MF);
-
-  B.buildSMin(S64, Copies[0], Copies[1]);
-  B.buildSMax(S64, Copies[0], Copies[1]);
-  B.buildUMin(S64, Copies[0], Copies[1]);
-  B.buildUMax(S64, Copies[0], Copies[1]);
-  B.buildAbs(S64, Copies[0]);
-
-  auto CheckStr = R"(
-  ; CHECK: [[COPY0:%[0-9]+]]:_(s64) = COPY $x0
-  ; CHECK: [[COPY1:%[0-9]+]]:_(s64) = COPY $x1
-  ; CHECK: [[SMIN0:%[0-9]+]]:_(s64) = G_SMIN [[COPY0]]:_, [[COPY1]]:_
-  ; CHECK: [[SMAX0:%[0-9]+]]:_(s64) = G_SMAX [[COPY0]]:_, [[COPY1]]:_
-  ; CHECK: [[UMIN0:%[0-9]+]]:_(s64) = G_UMIN [[COPY0]]:_, [[COPY1]]:_
-  ; CHECK: [[UMAX0:%[0-9]+]]:_(s64) = G_UMAX [[COPY0]]:_, [[COPY1]]:_
-  ; CHECK: [[UABS0:%[0-9]+]]:_(s64) = G_ABS [[COPY0]]:_
-  )";
-
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, BuildAtomicRMW) {
-  setUp();
-  if (!TM)
-    return;
-
-  LLT S64 = LLT::scalar(64);
-  LLT P0 = LLT::pointer(0, 64);
-  SmallVector<Register, 4> Copies;
-  collectCopies(Copies, MF);
-
-  MachineMemOperand *MMO = MF->getMachineMemOperand(
-      MachinePointerInfo(),
-      MachineMemOperand::MOLoad | MachineMemOperand::MOStore, 8, Align(8),
-      AAMDNodes(), nullptr, SyncScope::System, AtomicOrdering::Unordered);
-
-  auto Ptr = B.buildUndef(P0);
-  B.buildAtomicRMWFAdd(S64, Ptr, Copies[0], *MMO);
-  B.buildAtomicRMWFSub(S64, Ptr, Copies[0], *MMO);
-
-  auto CheckStr = R"(
-  ; CHECK: [[COPY0:%[0-9]+]]:_(s64) = COPY $x0
-  ; CHECK: [[COPY1:%[0-9]+]]:_(s64) = COPY $x1
-  ; CHECK: [[PTR:%[0-9]+]]:_(p0) = G_IMPLICIT_DEF
-  ; CHECK: [[FADD:%[0-9]+]]:_(s64) = G_ATOMICRMW_FADD [[PTR]]:_(p0), [[COPY0]]:_ :: (load store unordered (s64))
-  ; CHECK: [[FSUB:%[0-9]+]]:_(s64) = G_ATOMICRMW_FSUB [[PTR]]:_(p0), [[COPY0]]:_ :: (load store unordered (s64))
-  )";
-
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, BuildMerge) {
-  setUp();
-  if (!TM)
-    return;
-
-  LLT S32 = LLT::scalar(32);
-  Register RegC0 = B.buildConstant(S32, 0).getReg(0);
-  Register RegC1 = B.buildConstant(S32, 1).getReg(0);
-  Register RegC2 = B.buildConstant(S32, 2).getReg(0);
-  Register RegC3 = B.buildConstant(S32, 3).getReg(0);
-
-  // Merging plain constants as one big blob of bit should produce a
-  // G_MERGE_VALUES.
-  B.buildMerge(LLT::scalar(128), {RegC0, RegC1, RegC2, RegC3});
-  // Merging plain constants to a vector should produce a G_BUILD_VECTOR.
-  LLT V2x32 = LLT::fixed_vector(2, 32);
-  Register RegC0C1 =
-      B.buildMerge(V2x32, {RegC0, RegC1}).getReg(0);
-  Register RegC2C3 =
-      B.buildMerge(V2x32, {RegC2, RegC3}).getReg(0);
-  // Merging vector constants to a vector should produce a G_CONCAT_VECTORS.
-  B.buildMerge(LLT::fixed_vector(4, 32), {RegC0C1, RegC2C3});
-  // Merging vector constants to a plain type is not allowed.
-  // Nothing else to test.
-
-  auto CheckStr = R"(
-  ; CHECK: [[C0:%[0-9]+]]:_(s32) = G_CONSTANT i32 0
-  ; CHECK: [[C1:%[0-9]+]]:_(s32) = G_CONSTANT i32 1
-  ; CHECK: [[C2:%[0-9]+]]:_(s32) = G_CONSTANT i32 2
-  ; CHECK: [[C3:%[0-9]+]]:_(s32) = G_CONSTANT i32 3
-  ; CHECK: {{%[0-9]+}}:_(s128) = G_MERGE_VALUES [[C0]]:_(s32), [[C1]]:_(s32), [[C2]]:_(s32), [[C3]]:_(s32)
-  ; CHECK: [[LOW2x32:%[0-9]+]]:_(<2 x s32>) = G_BUILD_VECTOR [[C0]]:_(s32), [[C1]]:_(s32)
-  ; CHECK: [[HIGH2x32:%[0-9]+]]:_(<2 x s32>) = G_BUILD_VECTOR [[C2]]:_(s32), [[C3]]:_(s32)
-  ; CHECK: {{%[0-9]+}}:_(<4 x s32>) = G_CONCAT_VECTORS [[LOW2x32]]:_(<2 x s32>), [[HIGH2x32]]:_(<2 x s32>)
-  )";
-
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, BuildAddoSubo) {
-  setUp();
-  if (!TM)
-    return;
-
-  LLT S1 = LLT::scalar(1);
-  LLT S64 = LLT::scalar(64);
-  SmallVector<Register, 4> Copies;
-  collectCopies(Copies, MF);
-
-  auto UAddo = B.buildUAddo(S64, S1, Copies[0], Copies[1]);
-  auto USubo = B.buildUSubo(S64, S1, Copies[0], Copies[1]);
-  auto SAddo = B.buildSAddo(S64, S1, Copies[0], Copies[1]);
-  auto SSubo = B.buildSSubo(S64, S1, Copies[0], Copies[1]);
-
-  B.buildUAdde(S64, S1, Copies[0], Copies[1], UAddo.getReg(1));
-  B.buildUSube(S64, S1, Copies[0], Copies[1], USubo.getReg(1));
-  B.buildSAdde(S64, S1, Copies[0], Copies[1], SAddo.getReg(1));
-  B.buildSSube(S64, S1, Copies[0], Copies[1], SSubo.getReg(1));
-
-  auto CheckStr = R"(
-  ; CHECK: [[COPY0:%[0-9]+]]:_(s64) = COPY $x0
-  ; CHECK: [[COPY1:%[0-9]+]]:_(s64) = COPY $x1
-  ; CHECK: [[UADDO:%[0-9]+]]:_(s64), [[UADDO_FLAG:%[0-9]+]]:_(s1) = G_UADDO [[COPY0]]:_, [[COPY1]]:_
-  ; CHECK: [[USUBO:%[0-9]+]]:_(s64), [[USUBO_FLAG:%[0-9]+]]:_(s1) = G_USUBO [[COPY0]]:_, [[COPY1]]:_
-  ; CHECK: [[SADDO:%[0-9]+]]:_(s64), [[SADDO_FLAG:%[0-9]+]]:_(s1) = G_SADDO [[COPY0]]:_, [[COPY1]]:_
-  ; CHECK: [[SSUBO:%[0-9]+]]:_(s64), [[SSUBO_FLAG:%[0-9]+]]:_(s1) = G_SSUBO [[COPY0]]:_, [[COPY1]]:_
-  ; CHECK: [[UADDE:%[0-9]+]]:_(s64), [[UADDE_FLAG:%[0-9]+]]:_(s1) = G_UADDE [[COPY0]]:_, [[COPY1]]:_, [[UADDO_FLAG]]
-  ; CHECK: [[USUBE:%[0-9]+]]:_(s64), [[USUBE_FLAG:%[0-9]+]]:_(s1) = G_USUBE [[COPY0]]:_, [[COPY1]]:_, [[USUBO_FLAG]]
-  ; CHECK: [[SADDE:%[0-9]+]]:_(s64), [[SADDE_FLAG:%[0-9]+]]:_(s1) = G_SADDE [[COPY0]]:_, [[COPY1]]:_, [[SADDO_FLAG]]
-  ; CHECK: [[SSUBE:%[0-9]+]]:_(s64), [[SSUBE_FLAG:%[0-9]+]]:_(s1) = G_SSUBE [[COPY0]]:_, [[COPY1]]:_, [[SSUBO_FLAG]]
-  )";
-
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
-
-TEST_F(AArch64GISelMITest, BuildBitfieldExtract) {
-  setUp();
-  if (!TM)
-    return;
-  LLT S64 = LLT::scalar(64);
-  SmallVector<Register, 4> Copies;
-  collectCopies(Copies, MF);
-
-  auto Ubfx = B.buildUbfx(S64, Copies[0], Copies[1], Copies[2]);
-  B.buildSbfx(S64, Ubfx, Copies[0], Copies[2]);
-
-  const auto *CheckStr = R"(
-  ; CHECK: [[COPY0:%[0-9]+]]:_(s64) = COPY $x0
-  ; CHECK: [[COPY1:%[0-9]+]]:_(s64) = COPY $x1
-  ; CHECK: [[COPY2:%[0-9]+]]:_(s64) = COPY $x2
-  ; CHECK: [[UBFX:%[0-9]+]]:_(s64) = G_UBFX [[COPY0]]:_, [[COPY1]]:_(s64), [[COPY2]]:_
-  ; CHECK: [[SBFX:%[0-9]+]]:_(s64) = G_SBFX [[UBFX]]:_, [[COPY0]]:_(s64), [[COPY2]]:_
-  )";
-
-  EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
-}
diff --git a/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/PatternMatchTest.cpp b/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/PatternMatchTest.cpp
deleted file mode 100644
index 24c13348ef1..00000000000
--- a/gnu/llvm/llvm/unittests/CodeGen/GlobalISel/PatternMatchTest.cpp
+++ /dev/null
@@ -1,628 +0,0 @@
-//===- PatternMatchTest.cpp -----------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "GISelMITest.h"
-#include "llvm/CodeGen/GlobalISel/MIPatternMatch.h"
-#include "llvm/CodeGen/GlobalISel/MachineIRBuilder.h"
-#include "llvm/CodeGen/GlobalISel/Utils.h"
-#include "llvm/CodeGen/MIRParser/MIRParser.h"
-#include "llvm/CodeGen/MachineFunction.h"
-#include "llvm/CodeGen/MachineModuleInfo.h"
-#include "llvm/CodeGen/TargetFrameLowering.h"
-#include "llvm/CodeGen/TargetInstrInfo.h"
-#include "llvm/CodeGen/TargetLowering.h"
-#include "llvm/CodeGen/TargetSubtargetInfo.h"
-#include "llvm/Support/SourceMgr.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "llvm/Target/TargetMachine.h"
-#include "llvm/Target/TargetOptions.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace MIPatternMatch;
-
-namespace {
-
-TEST_F(AArch64GISelMITest, MatchIntConstant) {
-  setUp();
-  if (!TM)
-    return;
-  auto MIBCst = B.buildConstant(LLT::scalar(64), 42);
-  int64_t Cst;
-  bool match = mi_match(MIBCst.getReg(0), *MRI, m_ICst(Cst));
-  EXPECT_TRUE(match);
-  EXPECT_EQ(Cst, 42);
-}
-
-TEST_F(AArch64GISelMITest, MatchIntConstantRegister) {
-  setUp();
-  if (!TM)
-    return;
-  auto MIBCst = B.buildConstant(LLT::scalar(64), 42);
-  Register Src0;
-  bool match = mi_match(MIBCst.getReg(0), *MRI, m_ICst(Src0));
-  EXPECT_TRUE(match);
-  EXPECT_EQ(Src0, MIBCst.getReg(0));
-}
-
-TEST_F(AArch64GISelMITest, MachineInstrPtrBind) {
-  setUp();
-  if (!TM)
-    return;
-  auto MIBAdd = B.buildAdd(LLT::scalar(64), Copies[0], Copies[1]);
-  // Test 'MachineInstr *' bind.
-  // Default mi_match.
-  MachineInstr *MIPtr = MIBAdd.getInstr();
-  bool match = mi_match(MIPtr, *MRI, m_GAdd(m_Reg(), m_Reg()));
-  EXPECT_TRUE(match);
-  // Specialized mi_match for MachineInstr &.
-  MachineInstr &MI = *MIBAdd.getInstr();
-  match = mi_match(MI, *MRI, m_GAdd(m_Reg(), m_Reg()));
-  EXPECT_TRUE(match);
-  // MachineInstrBuilder has automatic conversion to MachineInstr *.
-  match = mi_match(MIBAdd, *MRI, m_GAdd(m_Reg(), m_Reg()));
-  EXPECT_TRUE(match);
-  // Match instruction without def.
-  auto MIBBrcond = B.buildBrCond(Copies[0], B.getMBB());
-  MachineInstr *MatchedMI;
-  match = mi_match(MIBBrcond, *MRI, m_MInstr(MatchedMI));
-  EXPECT_TRUE(match);
-  EXPECT_TRUE(MIBBrcond.getInstr() == MatchedMI);
-  // Match instruction with two defs.
-  auto MIBUAddO =
-      B.buildUAddo(LLT::scalar(64), LLT::scalar(1), Copies[0], Copies[1]);
-  match = mi_match(MIBUAddO, *MRI, m_MInstr(MatchedMI));
-  EXPECT_TRUE(match);
-  EXPECT_TRUE(MIBUAddO.getInstr() == MatchedMI);
-}
-
-TEST_F(AArch64GISelMITest, MatchBinaryOp) {
-  setUp();
-  if (!TM)
-    return;
-  LLT s32 = LLT::scalar(32);
-  LLT s64 = LLT::scalar(64);
-  LLT p0 = LLT::pointer(0, 64);
-  auto MIBAdd = B.buildAdd(s64, Copies[0], Copies[1]);
-  // Test case for no bind.
-  bool match =
-      mi_match(MIBAdd.getReg(0), *MRI, m_GAdd(m_Reg(), m_Reg()));
-  EXPECT_TRUE(match);
-  Register Src0, Src1, Src2;
-  match = mi_match(MIBAdd.getReg(0), *MRI,
-                   m_GAdd(m_Reg(Src0), m_Reg(Src1)));
-  EXPECT_TRUE(match);
-  EXPECT_EQ(Src0, Copies[0]);
-  EXPECT_EQ(Src1, Copies[1]);
-
-  // Build MUL(ADD %0, %1), %2
-  auto MIBMul = B.buildMul(s64, MIBAdd, Copies[2]);
-
-  // Try to match MUL.
-  match = mi_match(MIBMul.getReg(0), *MRI,
-                   m_GMul(m_Reg(Src0), m_Reg(Src1)));
-  EXPECT_TRUE(match);
-  EXPECT_EQ(Src0, MIBAdd.getReg(0));
-  EXPECT_EQ(Src1, Copies[2]);
-
-  // Try to match MUL(ADD)
-  match = mi_match(MIBMul.getReg(0), *MRI,
-                   m_GMul(m_GAdd(m_Reg(Src0), m_Reg(Src1)), m_Reg(Src2)));
-  EXPECT_TRUE(match);
-  EXPECT_EQ(Src0, Copies[0]);
-  EXPECT_EQ(Src1, Copies[1]);
-  EXPECT_EQ(Src2, Copies[2]);
-
-  // Test Commutativity.
-  auto MIBMul2 = B.buildMul(s64, Copies[0], B.buildConstant(s64, 42));
-  // Try to match MUL(Cst, Reg) on src of MUL(Reg, Cst) to validate
-  // commutativity.
-  int64_t Cst;
-  match = mi_match(MIBMul2.getReg(0), *MRI,
-                   m_GMul(m_ICst(Cst), m_Reg(Src0)));
-  EXPECT_TRUE(match);
-  EXPECT_EQ(Cst, 42);
-  EXPECT_EQ(Src0, Copies[0]);
-
-  // Make sure commutative doesn't work with something like SUB.
-  auto MIBSub = B.buildSub(s64, Copies[0], B.buildConstant(s64, 42));
-  match = mi_match(MIBSub.getReg(0), *MRI,
-                   m_GSub(m_ICst(Cst), m_Reg(Src0)));
-  EXPECT_FALSE(match);
-
-  auto MIBFMul = B.buildInstr(TargetOpcode::G_FMUL, {s64},
-                              {Copies[0], B.buildConstant(s64, 42)});
-  // Match and test commutativity for FMUL.
-  match = mi_match(MIBFMul.getReg(0), *MRI,
-                   m_GFMul(m_ICst(Cst), m_Reg(Src0)));
-  EXPECT_TRUE(match);
-  EXPECT_EQ(Cst, 42);
-  EXPECT_EQ(Src0, Copies[0]);
-
-  // FSUB
-  auto MIBFSub = B.buildInstr(TargetOpcode::G_FSUB, {s64},
-                              {Copies[0], B.buildConstant(s64, 42)});
-  match = mi_match(MIBFSub.getReg(0), *MRI,
-                   m_GFSub(m_Reg(Src0), m_Reg()));
-  EXPECT_TRUE(match);
-  EXPECT_EQ(Src0, Copies[0]);
-
-  // Build AND %0, %1
-  auto MIBAnd = B.buildAnd(s64, Copies[0], Copies[1]);
-  // Try to match AND.
-  match = mi_match(MIBAnd.getReg(0), *MRI,
-                   m_GAnd(m_Reg(Src0), m_Reg(Src1)));
-  EXPECT_TRUE(match);
-  EXPECT_EQ(Src0, Copies[0]);
-  EXPECT_EQ(Src1, Copies[1]);
-
-  // Build OR %0, %1
-  auto MIBOr = B.buildOr(s64, Copies[0], Copies[1]);
-  // Try to match OR.
-  match = mi_match(MIBOr.getReg(0), *MRI,
-                   m_GOr(m_Reg(Src0), m_Reg(Src1)));
-  EXPECT_TRUE(match);
-  EXPECT_EQ(Src0, Copies[0]);
-  EXPECT_EQ(Src1, Copies[1]);
-
-  // Match lshr, and make sure a different shift amount type works.
-  auto TruncCopy1 = B.buildTrunc(s32, Copies[1]);
-  auto LShr = B.buildLShr(s64, Copies[0], TruncCopy1);
-  match = mi_match(LShr.getReg(0), *MRI,
-                   m_GLShr(m_Reg(Src0), m_Reg(Src1)));
-  EXPECT_TRUE(match);
-  EXPECT_EQ(Src0, Copies[0]);
-  EXPECT_EQ(Src1, TruncCopy1.getReg(0));
-
-  // Match shl, and make sure a different shift amount type works.
-  auto Shl = B.buildShl(s64, Copies[0], TruncCopy1);
-  match = mi_match(Shl.getReg(0), *MRI,
-                   m_GShl(m_Reg(Src0), m_Reg(Src1)));
-  EXPECT_TRUE(match);
-  EXPECT_EQ(Src0, Copies[0]);
-  EXPECT_EQ(Src1, TruncCopy1.getReg(0));
-
-  // Build a G_PTR_ADD and check that we can match it.
-  auto PtrAdd = B.buildPtrAdd(p0, {B.buildUndef(p0)}, Copies[0]);
-  match = mi_match(PtrAdd.getReg(0), *MRI, m_GPtrAdd(m_Reg(Src0), m_Reg(Src1)));
-  EXPECT_TRUE(match);
-  EXPECT_EQ(Src0, PtrAdd->getOperand(1).getReg());
-  EXPECT_EQ(Src1, Copies[0]);
-
-  auto MIBCst = B.buildConstant(s64, 42);
-  auto MIBAddCst = B.buildAdd(s64, MIBCst, Copies[0]);
-  auto MIBUnmerge = B.buildUnmerge({s32, s32}, B.buildConstant(s64, 42));
-
-  // m_BinOp with opcode.
-  // Match binary instruction, opcode and its non-commutative operands.
-  match = mi_match(MIBAddCst, *MRI,
-                   m_BinOp(TargetOpcode::G_ADD, m_ICst(Cst), m_Reg(Src0)));
-  EXPECT_TRUE(match);
-  EXPECT_EQ(Src0, Copies[0]);
-  EXPECT_EQ(Cst, 42);
-
-  // Opcode doesn't match.
-  match = mi_match(MIBAddCst, *MRI,
-                   m_BinOp(TargetOpcode::G_MUL, m_ICst(Cst), m_Reg(Src0)));
-  EXPECT_FALSE(match);
-
-  match = mi_match(MIBAddCst, *MRI,
-                   m_BinOp(TargetOpcode::G_ADD, m_Reg(Src0), m_ICst(Cst)));
-  EXPECT_FALSE(match);
-
-  // Instruction is not binary.
-  match = mi_match(MIBCst, *MRI,
-                   m_BinOp(TargetOpcode::G_MUL, m_Reg(Src0), m_Reg(Src1)));
-  EXPECT_FALSE(match);
-  match = mi_match(MIBUnmerge, *MRI,
-                   m_BinOp(TargetOpcode::G_MUL, m_Reg(Src0), m_Reg(Src1)));
-  EXPECT_FALSE(match);
-
-  // m_CommutativeBinOp with opcode.
-  match = mi_match(
-      MIBAddCst, *MRI,
-      m_CommutativeBinOp(TargetOpcode::G_ADD, m_ICst(Cst), m_Reg(Src0)));
-  EXPECT_TRUE(match);
-  EXPECT_EQ(Src0, Copies[0]);
-  EXPECT_EQ(Cst, 42);
-
-  match = mi_match(
-      MIBAddCst, *MRI,
-      m_CommutativeBinOp(TargetOpcode::G_MUL, m_ICst(Cst), m_Reg(Src0)));
-  EXPECT_FALSE(match);
-
-  match = mi_match(
-      MIBAddCst, *MRI,
-      m_CommutativeBinOp(TargetOpcode::G_ADD, m_Reg(Src0), m_ICst(Cst)));
-  EXPECT_TRUE(match);
-  EXPECT_EQ(Src0, Copies[0]);
-  EXPECT_EQ(Cst, 42);
-
-  match = mi_match(
-      MIBCst, *MRI,
-      m_CommutativeBinOp(TargetOpcode::G_MUL, m_Reg(Src0), m_Reg(Src1)));
-  EXPECT_FALSE(match);
-  match = mi_match(
-      MIBUnmerge, *MRI,
-      m_CommutativeBinOp(TargetOpcode::G_MUL, m_Reg(Src0), m_Reg(Src1)));
-  EXPECT_FALSE(match);
-}
-
-TEST_F(AArch64GISelMITest, MatchICmp) {
-  setUp();
-  if (!TM)
-    return;
-
-  const LLT s1 = LLT::scalar(1);
-  auto CmpEq = B.buildICmp(CmpInst::ICMP_EQ, s1, Copies[0], Copies[1]);
-
-  // Check match any predicate.
-  bool match =
-      mi_match(CmpEq.getReg(0), *MRI, m_GICmp(m_Pred(), m_Reg(), m_Reg()));
-  EXPECT_TRUE(match);
-
-  // Check we get the predicate and registers.
-  CmpInst::Predicate Pred;
-  Register Reg0;
-  Register Reg1;
-  match = mi_match(CmpEq.getReg(0), *MRI,
-                   m_GICmp(m_Pred(Pred), m_Reg(Reg0), m_Reg(Reg1)));
-  EXPECT_TRUE(match);
-  EXPECT_EQ(CmpInst::ICMP_EQ, Pred);
-  EXPECT_EQ(Copies[0], Reg0);
-  EXPECT_EQ(Copies[1], Reg1);
-}
-
-TEST_F(AArch64GISelMITest, MatchFCmp) {
-  setUp();
-  if (!TM)
-    return;
-
-  const LLT s1 = LLT::scalar(1);
-  auto CmpEq = B.buildFCmp(CmpInst::FCMP_OEQ, s1, Copies[0], Copies[1]);
-
-  // Check match any predicate.
-  bool match =
-      mi_match(CmpEq.getReg(0), *MRI, m_GFCmp(m_Pred(), m_Reg(), m_Reg()));
-  EXPECT_TRUE(match);
-
-  // Check we get the predicate and registers.
-  CmpInst::Predicate Pred;
-  Register Reg0;
-  Register Reg1;
-  match = mi_match(CmpEq.getReg(0), *MRI,
-                   m_GFCmp(m_Pred(Pred), m_Reg(Reg0), m_Reg(Reg1)));
-  EXPECT_TRUE(match);
-  EXPECT_EQ(CmpInst::FCMP_OEQ, Pred);
-  EXPECT_EQ(Copies[0], Reg0);
-  EXPECT_EQ(Copies[1], Reg1);
-}
-
-TEST_F(AArch64GISelMITest, MatchFPUnaryOp) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Truncate s64 to s32.
-  LLT s32 = LLT::scalar(32);
-  auto Copy0s32 = B.buildFPTrunc(s32, Copies[0]);
-
-  // Match G_FABS.
-  auto MIBFabs = B.buildInstr(TargetOpcode::G_FABS, {s32}, {Copy0s32});
-  bool match =
-      mi_match(MIBFabs.getReg(0), *MRI, m_GFabs(m_Reg()));
-  EXPECT_TRUE(match);
-
-  Register Src;
-  auto MIBFNeg = B.buildInstr(TargetOpcode::G_FNEG, {s32}, {Copy0s32});
-  match = mi_match(MIBFNeg.getReg(0), *MRI, m_GFNeg(m_Reg(Src)));
-  EXPECT_TRUE(match);
-  EXPECT_EQ(Src, Copy0s32.getReg(0));
-
-  match = mi_match(MIBFabs.getReg(0), *MRI, m_GFabs(m_Reg(Src)));
-  EXPECT_TRUE(match);
-  EXPECT_EQ(Src, Copy0s32.getReg(0));
-
-  // Build and match FConstant.
-  auto MIBFCst = B.buildFConstant(s32, .5);
-  const ConstantFP *TmpFP{};
-  match = mi_match(MIBFCst.getReg(0), *MRI, m_GFCst(TmpFP));
-  EXPECT_TRUE(match);
-  EXPECT_TRUE(TmpFP);
-  APFloat APF((float).5);
-  auto *CFP = ConstantFP::get(Context, APF);
-  EXPECT_EQ(CFP, TmpFP);
-
-  // Build double float.
-  LLT s64 = LLT::scalar(64);
-  auto MIBFCst64 = B.buildFConstant(s64, .5);
-  const ConstantFP *TmpFP64{};
-  match = mi_match(MIBFCst64.getReg(0), *MRI, m_GFCst(TmpFP64));
-  EXPECT_TRUE(match);
-  EXPECT_TRUE(TmpFP64);
-  APFloat APF64(.5);
-  auto CFP64 = ConstantFP::get(Context, APF64);
-  EXPECT_EQ(CFP64, TmpFP64);
-  EXPECT_NE(TmpFP64, TmpFP);
-
-  // Build half float.
-  LLT s16 = LLT::scalar(16);
-  auto MIBFCst16 = B.buildFConstant(s16, .5);
-  const ConstantFP *TmpFP16{};
-  match = mi_match(MIBFCst16.getReg(0), *MRI, m_GFCst(TmpFP16));
-  EXPECT_TRUE(match);
-  EXPECT_TRUE(TmpFP16);
-  bool Ignored;
-  APFloat APF16(.5);
-  APF16.convert(APFloat::IEEEhalf(), APFloat::rmNearestTiesToEven, &Ignored);
-  auto CFP16 = ConstantFP::get(Context, APF16);
-  EXPECT_EQ(TmpFP16, CFP16);
-  EXPECT_NE(TmpFP16, TmpFP);
-}
-
-TEST_F(AArch64GISelMITest, MatchExtendsTrunc) {
-  setUp();
-  if (!TM)
-    return;
-
-  LLT s64 = LLT::scalar(64);
-  LLT s32 = LLT::scalar(32);
-
-  auto MIBTrunc = B.buildTrunc(s32, Copies[0]);
-  auto MIBAExt = B.buildAnyExt(s64, MIBTrunc);
-  auto MIBZExt = B.buildZExt(s64, MIBTrunc);
-  auto MIBSExt = B.buildSExt(s64, MIBTrunc);
-  Register Src0;
-  bool match =
-      mi_match(MIBTrunc.getReg(0), *MRI, m_GTrunc(m_Reg(Src0)));
-  EXPECT_TRUE(match);
-  EXPECT_EQ(Src0, Copies[0]);
-  match =
-      mi_match(MIBAExt.getReg(0), *MRI, m_GAnyExt(m_Reg(Src0)));
-  EXPECT_TRUE(match);
-  EXPECT_EQ(Src0, MIBTrunc.getReg(0));
-
-  match = mi_match(MIBSExt.getReg(0), *MRI, m_GSExt(m_Reg(Src0)));
-  EXPECT_TRUE(match);
-  EXPECT_EQ(Src0, MIBTrunc.getReg(0));
-
-  match = mi_match(MIBZExt.getReg(0), *MRI, m_GZExt(m_Reg(Src0)));
-  EXPECT_TRUE(match);
-  EXPECT_EQ(Src0, MIBTrunc.getReg(0));
-
-  // Match ext(trunc src)
-  match = mi_match(MIBAExt.getReg(0), *MRI,
-                   m_GAnyExt(m_GTrunc(m_Reg(Src0))));
-  EXPECT_TRUE(match);
-  EXPECT_EQ(Src0, Copies[0]);
-
-  match = mi_match(MIBSExt.getReg(0), *MRI,
-                   m_GSExt(m_GTrunc(m_Reg(Src0))));
-  EXPECT_TRUE(match);
-  EXPECT_EQ(Src0, Copies[0]);
-
-  match = mi_match(MIBZExt.getReg(0), *MRI,
-                   m_GZExt(m_GTrunc(m_Reg(Src0))));
-  EXPECT_TRUE(match);
-  EXPECT_EQ(Src0, Copies[0]);
-}
-
-TEST_F(AArch64GISelMITest, MatchSpecificType) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Try to match a 64bit add.
-  LLT s64 = LLT::scalar(64);
-  LLT s32 = LLT::scalar(32);
-  auto MIBAdd = B.buildAdd(s64, Copies[0], Copies[1]);
-  EXPECT_FALSE(mi_match(MIBAdd.getReg(0), *MRI,
-                        m_GAdd(m_SpecificType(s32), m_Reg())));
-  EXPECT_TRUE(mi_match(MIBAdd.getReg(0), *MRI,
-                       m_GAdd(m_SpecificType(s64), m_Reg())));
-
-  // Try to match the destination type of a bitcast.
-  LLT v2s32 = LLT::fixed_vector(2, 32);
-  auto MIBCast = B.buildCast(v2s32, Copies[0]);
-  EXPECT_TRUE(
-      mi_match(MIBCast.getReg(0), *MRI, m_GBitcast(m_Reg())));
-  EXPECT_TRUE(
-      mi_match(MIBCast.getReg(0), *MRI, m_SpecificType(v2s32)));
-  EXPECT_TRUE(
-      mi_match(MIBCast.getReg(1), *MRI, m_SpecificType(s64)));
-
-  // Build a PTRToInt and INTTOPTR and match and test them.
-  LLT PtrTy = LLT::pointer(0, 64);
-  auto MIBIntToPtr = B.buildCast(PtrTy, Copies[0]);
-  auto MIBPtrToInt = B.buildCast(s64, MIBIntToPtr);
-  Register Src0;
-
-  // match the ptrtoint(inttoptr reg)
-  bool match = mi_match(MIBPtrToInt.getReg(0), *MRI,
-                        m_GPtrToInt(m_GIntToPtr(m_Reg(Src0))));
-  EXPECT_TRUE(match);
-  EXPECT_EQ(Src0, Copies[0]);
-}
-
-TEST_F(AArch64GISelMITest, MatchCombinators) {
-  setUp();
-  if (!TM)
-    return;
-
-  LLT s64 = LLT::scalar(64);
-  LLT s32 = LLT::scalar(32);
-  auto MIBAdd = B.buildAdd(s64, Copies[0], Copies[1]);
-  Register Src0, Src1;
-  bool match =
-      mi_match(MIBAdd.getReg(0), *MRI,
-               m_all_of(m_SpecificType(s64), m_GAdd(m_Reg(Src0), m_Reg(Src1))));
-  EXPECT_TRUE(match);
-  EXPECT_EQ(Src0, Copies[0]);
-  EXPECT_EQ(Src1, Copies[1]);
-  // Check for s32 (which should fail).
-  match =
-      mi_match(MIBAdd.getReg(0), *MRI,
-               m_all_of(m_SpecificType(s32), m_GAdd(m_Reg(Src0), m_Reg(Src1))));
-  EXPECT_FALSE(match);
-  match =
-      mi_match(MIBAdd.getReg(0), *MRI,
-               m_any_of(m_SpecificType(s32), m_GAdd(m_Reg(Src0), m_Reg(Src1))));
-  EXPECT_TRUE(match);
-  EXPECT_EQ(Src0, Copies[0]);
-  EXPECT_EQ(Src1, Copies[1]);
-
-  // Match a case where none of the predicates hold true.
-  match = mi_match(
-      MIBAdd.getReg(0), *MRI,
-      m_any_of(m_SpecificType(LLT::scalar(16)), m_GSub(m_Reg(), m_Reg())));
-  EXPECT_FALSE(match);
-}
-
-TEST_F(AArch64GISelMITest, MatchMiscellaneous) {
-  setUp();
-  if (!TM)
-    return;
-
-  LLT s64 = LLT::scalar(64);
-  auto MIBAdd = B.buildAdd(s64, Copies[0], Copies[1]);
-  Register Reg = MIBAdd.getReg(0);
-
-  // Only one use of Reg.
-  B.buildCast(LLT::pointer(0, 32), MIBAdd);
-  EXPECT_TRUE(mi_match(Reg, *MRI, m_OneUse(m_GAdd(m_Reg(), m_Reg()))));
-  EXPECT_TRUE(mi_match(Reg, *MRI, m_OneNonDBGUse(m_GAdd(m_Reg(), m_Reg()))));
-
-  // Add multiple debug uses of Reg.
-  B.buildInstr(TargetOpcode::DBG_VALUE, {}, {Reg})->getOperand(0).setIsDebug();
-  B.buildInstr(TargetOpcode::DBG_VALUE, {}, {Reg})->getOperand(0).setIsDebug();
-
-  EXPECT_FALSE(mi_match(Reg, *MRI, m_OneUse(m_GAdd(m_Reg(), m_Reg()))));
-  EXPECT_TRUE(mi_match(Reg, *MRI, m_OneNonDBGUse(m_GAdd(m_Reg(), m_Reg()))));
-
-  // Multiple non-debug uses of Reg.
-  B.buildCast(LLT::pointer(1, 32), MIBAdd);
-  EXPECT_FALSE(mi_match(Reg, *MRI, m_OneUse(m_GAdd(m_Reg(), m_Reg()))));
-  EXPECT_FALSE(mi_match(Reg, *MRI, m_OneNonDBGUse(m_GAdd(m_Reg(), m_Reg()))));
-}
-
-TEST_F(AArch64GISelMITest, MatchSpecificConstant) {
-  setUp();
-  if (!TM)
-    return;
-
-  // Basic case: Can we match a G_CONSTANT with a specific value?
-  auto FortyTwo = B.buildConstant(LLT::scalar(64), 42);
-  EXPECT_TRUE(mi_match(FortyTwo.getReg(0), *MRI, m_SpecificICst(42)));
-  EXPECT_FALSE(mi_match(FortyTwo.getReg(0), *MRI, m_SpecificICst(123)));
-
-  // Test that this works inside of a more complex pattern.
-  LLT s64 = LLT::scalar(64);
-  auto MIBAdd = B.buildAdd(s64, Copies[0], FortyTwo);
-  EXPECT_TRUE(mi_match(MIBAdd.getReg(2), *MRI, m_SpecificICst(42)));
-
-  // Wrong constant.
-  EXPECT_FALSE(mi_match(MIBAdd.getReg(2), *MRI, m_SpecificICst(123)));
-
-  // No constant on the LHS.
-  EXPECT_FALSE(mi_match(MIBAdd.getReg(1), *MRI, m_SpecificICst(42)));
-}
-
-TEST_F(AArch64GISelMITest, MatchZeroInt) {
-  setUp();
-  if (!TM)
-    return;
-  auto Zero = B.buildConstant(LLT::scalar(64), 0);
-  EXPECT_TRUE(mi_match(Zero.getReg(0), *MRI, m_ZeroInt()));
-
-  auto FortyTwo = B.buildConstant(LLT::scalar(64), 42);
-  EXPECT_FALSE(mi_match(FortyTwo.getReg(0), *MRI, m_ZeroInt()));
-}
-
-TEST_F(AArch64GISelMITest, MatchAllOnesInt) {
-  setUp();
-  if (!TM)
-    return;
-  auto AllOnes = B.buildConstant(LLT::scalar(64), -1);
-  EXPECT_TRUE(mi_match(AllOnes.getReg(0), *MRI, m_AllOnesInt()));
-
-  auto FortyTwo = B.buildConstant(LLT::scalar(64), 42);
-  EXPECT_FALSE(mi_match(FortyTwo.getReg(0), *MRI, m_AllOnesInt()));
-}
-
-TEST_F(AArch64GISelMITest, MatchNeg) {
-  setUp();
-  if (!TM)
-    return;
-
-  LLT s64 = LLT::scalar(64);
-  auto Zero = B.buildConstant(LLT::scalar(64), 0);
-  auto NegInst = B.buildSub(s64, Zero, Copies[0]);
-  Register NegatedReg;
-
-  // Match: G_SUB = 0, %Reg
-  EXPECT_TRUE(mi_match(NegInst.getReg(0), *MRI, m_Neg(m_Reg(NegatedReg))));
-  EXPECT_EQ(NegatedReg, Copies[0]);
-
-  // Don't match: G_SUB = %Reg, 0
-  auto NotNegInst1 = B.buildSub(s64, Copies[0], Zero);
-  EXPECT_FALSE(mi_match(NotNegInst1.getReg(0), *MRI, m_Neg(m_Reg(NegatedReg))));
-
-  // Don't match: G_SUB = 42, %Reg
-  auto FortyTwo = B.buildConstant(LLT::scalar(64), 42);
-  auto NotNegInst2 = B.buildSub(s64, FortyTwo, Copies[0]);
-  EXPECT_FALSE(mi_match(NotNegInst2.getReg(0), *MRI, m_Neg(m_Reg(NegatedReg))));
-
-  // Complex testcase.
-  // %sub = G_SUB = 0, %negated_reg
-  // %add = G_ADD = %x, %sub
-  auto AddInst = B.buildAdd(s64, Copies[1], NegInst);
-  NegatedReg = Register();
-  EXPECT_TRUE(mi_match(AddInst.getReg(2), *MRI, m_Neg(m_Reg(NegatedReg))));
-  EXPECT_EQ(NegatedReg, Copies[0]);
-}
-
-TEST_F(AArch64GISelMITest, MatchNot) {
-  setUp();
-  if (!TM)
-    return;
-
-  LLT s64 = LLT::scalar(64);
-  auto AllOnes = B.buildConstant(LLT::scalar(64), -1);
-  auto NotInst1 = B.buildXor(s64, Copies[0], AllOnes);
-  Register NotReg;
-
-  // Match: G_XOR %NotReg, -1
-  EXPECT_TRUE(mi_match(NotInst1.getReg(0), *MRI, m_Not(m_Reg(NotReg))));
-  EXPECT_EQ(NotReg, Copies[0]);
-
-  // Match: G_XOR -1, %NotReg
-  auto NotInst2 = B.buildXor(s64, AllOnes, Copies[1]);
-  EXPECT_TRUE(mi_match(NotInst2.getReg(0), *MRI, m_Not(m_Reg(NotReg))));
-  EXPECT_EQ(NotReg, Copies[1]);
-
-  // Don't match: G_XOR %NotReg, 42
-  auto FortyTwo = B.buildConstant(LLT::scalar(64), 42);
-  auto WrongCst = B.buildXor(s64, Copies[0], FortyTwo);
-  EXPECT_FALSE(mi_match(WrongCst.getReg(0), *MRI, m_Not(m_Reg(NotReg))));
-
-  // Complex testcase.
-  // %xor = G_XOR %NotReg, -1
-  // %add = G_ADD %x, %xor
-  auto AddInst = B.buildAdd(s64, Copies[1], NotInst1);
-  NotReg = Register();
-  EXPECT_TRUE(mi_match(AddInst.getReg(2), *MRI, m_Not(m_Reg(NotReg))));
-  EXPECT_EQ(NotReg, Copies[0]);
-}
-} // namespace
-
-int main(int argc, char **argv) {
-  ::testing::InitGoogleTest(&argc, argv);
-  initLLVM();
-  return RUN_ALL_TESTS();
-}
diff --git a/gnu/llvm/llvm/unittests/CodeGen/LexicalScopesTest.cpp b/gnu/llvm/llvm/unittests/CodeGen/LexicalScopesTest.cpp
deleted file mode 100644
index 3a0ff39648a..00000000000
--- a/gnu/llvm/llvm/unittests/CodeGen/LexicalScopesTest.cpp
+++ /dev/null
@@ -1,460 +0,0 @@
-//===----------- llvm/unittest/CodeGen/LexicalScopesTest.cpp --------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/CodeGen/LexicalScopes.h"
-#include "llvm/CodeGen/MachineBasicBlock.h"
-#include "llvm/CodeGen/MachineFunction.h"
-#include "llvm/CodeGen/MachineInstr.h"
-#include "llvm/CodeGen/MachineMemOperand.h"
-#include "llvm/CodeGen/MachineModuleInfo.h"
-#include "llvm/CodeGen/TargetFrameLowering.h"
-#include "llvm/CodeGen/TargetInstrInfo.h"
-#include "llvm/CodeGen/TargetLowering.h"
-#include "llvm/CodeGen/TargetSubtargetInfo.h"
-#include "llvm/IR/DIBuilder.h"
-#include "llvm/IR/DebugInfoMetadata.h"
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/ModuleSlotTracker.h"
-#include "llvm/MC/MCAsmInfo.h"
-#include "llvm/MC/MCSymbol.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "llvm/Target/TargetMachine.h"
-#include "llvm/Target/TargetOptions.h"
-
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-// Include helper functions to ease the manipulation of MachineFunctions
-#include "MFCommon.inc"
-
-class LexicalScopesTest : public testing::Test {
-public:
-  // Boilerplate,
-  LLVMContext Ctx;
-  Module Mod;
-  std::unique_ptr<MachineFunction> MF;
-  DICompileUnit *OurCU;
-  DIFile *OurFile;
-  DISubprogram *OurFunc;
-  DILexicalBlock *OurBlock, *AnotherBlock;
-  DISubprogram *ToInlineFunc;
-  DILexicalBlock *ToInlineBlock;
-  // DebugLocs that we'll used to create test environments.
-  DebugLoc OutermostLoc, InBlockLoc, NotNestedBlockLoc, InlinedLoc;
-
-  // Test environment blocks -- these form a diamond control flow pattern,
-  // MBB1 being the entry block, blocks two and three being the branches, and
-  // block four joining the branches and being an exit block.
-  MachineBasicBlock *MBB1, *MBB2, *MBB3, *MBB4;
-
-  // Some meaningless instructions -- the first is fully meaningless,
-  // while the second is supposed to impersonate DBG_VALUEs through its
-  // opcode.
-  MCInstrDesc BeanInst;
-  MCInstrDesc DbgValueInst;
-
-  LexicalScopesTest() : Ctx(), Mod("beehives", Ctx) {
-    memset(&BeanInst, 0, sizeof(BeanInst));
-    BeanInst.Opcode = 1;
-    BeanInst.Size = 1;
-
-    memset(&DbgValueInst, 0, sizeof(DbgValueInst));
-    DbgValueInst.Opcode = TargetOpcode::DBG_VALUE;
-    DbgValueInst.Size = 1;
-
-    // Boilerplate that creates a MachineFunction and associated blocks.
-    MF = createMachineFunction(Ctx, Mod);
-    llvm::Function &F = const_cast<llvm::Function &>(MF->getFunction());
-    auto BB1 = BasicBlock::Create(Ctx, "a", &F);
-    auto BB2 = BasicBlock::Create(Ctx, "b", &F);
-    auto BB3 = BasicBlock::Create(Ctx, "c", &F);
-    auto BB4 = BasicBlock::Create(Ctx, "d", &F);
-    IRBuilder<> IRB1(BB1), IRB2(BB2), IRB3(BB3), IRB4(BB4);
-    IRB1.CreateBr(BB2);
-    IRB2.CreateBr(BB3);
-    IRB3.CreateBr(BB4);
-    IRB4.CreateRetVoid();
-    MBB1 = MF->CreateMachineBasicBlock(BB1);
-    MF->insert(MF->end(), MBB1);
-    MBB2 = MF->CreateMachineBasicBlock(BB2);
-    MF->insert(MF->end(), MBB2);
-    MBB3 = MF->CreateMachineBasicBlock(BB3);
-    MF->insert(MF->end(), MBB3);
-    MBB4 = MF->CreateMachineBasicBlock(BB4);
-    MF->insert(MF->end(), MBB4);
-    MBB1->addSuccessor(MBB2);
-    MBB1->addSuccessor(MBB3);
-    MBB2->addSuccessor(MBB4);
-    MBB3->addSuccessor(MBB4);
-
-    // Create metadata: CU, subprogram, some blocks and an inline function
-    // scope.
-    DIBuilder DIB(Mod);
-    OurFile = DIB.createFile("xyzzy.c", "/cave");
-    OurCU =
-        DIB.createCompileUnit(dwarf::DW_LANG_C99, OurFile, "nou", false, "", 0);
-    auto OurSubT = DIB.createSubroutineType(DIB.getOrCreateTypeArray(None));
-    OurFunc =
-        DIB.createFunction(OurCU, "bees", "", OurFile, 1, OurSubT, 1,
-                           DINode::FlagZero, DISubprogram::SPFlagDefinition);
-    F.setSubprogram(OurFunc);
-    OurBlock = DIB.createLexicalBlock(OurFunc, OurFile, 2, 3);
-    AnotherBlock = DIB.createLexicalBlock(OurFunc, OurFile, 2, 6);
-    ToInlineFunc =
-        DIB.createFunction(OurFile, "shoes", "", OurFile, 10, OurSubT, 10,
-                           DINode::FlagZero, DISubprogram::SPFlagDefinition);
-
-    // Make some nested scopes.
-    OutermostLoc = DILocation::get(Ctx, 3, 1, OurFunc);
-    InBlockLoc = DILocation::get(Ctx, 4, 1, OurBlock);
-    InlinedLoc = DILocation::get(Ctx, 10, 1, ToInlineFunc, InBlockLoc.get());
-
-    // Make a scope that isn't nested within the others.
-    NotNestedBlockLoc = DILocation::get(Ctx, 4, 1, AnotherBlock);
-
-    DIB.finalize();
-  }
-};
-
-// Fill blocks with dummy instructions, test some base lexical scope
-// functionaliy.
-TEST_F(LexicalScopesTest, FlatLayout) {
-  BuildMI(*MBB1, MBB1->end(), OutermostLoc, BeanInst);
-  BuildMI(*MBB2, MBB2->end(), OutermostLoc, BeanInst);
-  BuildMI(*MBB3, MBB3->end(), OutermostLoc, BeanInst);
-  BuildMI(*MBB4, MBB4->end(), OutermostLoc, BeanInst);
-
-  LexicalScopes LS;
-  EXPECT_TRUE(LS.empty());
-  LS.reset();
-  EXPECT_EQ(LS.getCurrentFunctionScope(), nullptr);
-
-  LS.initialize(*MF);
-  EXPECT_FALSE(LS.empty());
-  LexicalScope *FuncScope = LS.getCurrentFunctionScope();
-  EXPECT_EQ(FuncScope->getParent(), nullptr);
-  EXPECT_EQ(FuncScope->getDesc(), OurFunc);
-  EXPECT_EQ(FuncScope->getInlinedAt(), nullptr);
-  EXPECT_EQ(FuncScope->getScopeNode(), OurFunc);
-  EXPECT_FALSE(FuncScope->isAbstractScope());
-  EXPECT_EQ(FuncScope->getChildren().size(), 0u);
-
-  // There should be one range, covering the whole function. Test that it
-  // points at the correct instructions.
-  auto &Ranges = FuncScope->getRanges();
-  ASSERT_EQ(Ranges.size(), 1u);
-  EXPECT_EQ(Ranges.front().first, &*MF->begin()->begin());
-  auto BBIt = MF->end();
-  BBIt = std::prev(BBIt);
-  EXPECT_EQ(Ranges.front().second, &*BBIt->begin());
-
-  EXPECT_TRUE(FuncScope->dominates(FuncScope));
-  SmallPtrSet<const MachineBasicBlock *, 4> MBBVec;
-  LS.getMachineBasicBlocks(OutermostLoc.get(), MBBVec);
-
-  EXPECT_EQ(MBBVec.size(), 4u);
-  // All the blocks should be in that set; the outermost loc should dominate
-  // them; and no other scope should.
-  for (auto &MBB : *MF) {
-    EXPECT_EQ(MBBVec.count(&MBB), 1u);
-    EXPECT_TRUE(LS.dominates(OutermostLoc.get(), &MBB));
-    EXPECT_FALSE(LS.dominates(InBlockLoc.get(), &MBB));
-    EXPECT_FALSE(LS.dominates(InlinedLoc.get(), &MBB));
-  }
-}
-
-// Examine relationship between two nested scopes inside the function, the
-// outer function and the lexical block within it.
-TEST_F(LexicalScopesTest, BlockScopes) {
-  BuildMI(*MBB1, MBB1->end(), InBlockLoc, BeanInst);
-  BuildMI(*MBB2, MBB2->end(), InBlockLoc, BeanInst);
-  BuildMI(*MBB3, MBB3->end(), InBlockLoc, BeanInst);
-  BuildMI(*MBB4, MBB4->end(), InBlockLoc, BeanInst);
-
-  LexicalScopes LS;
-  LS.initialize(*MF);
-  LexicalScope *FuncScope = LS.getCurrentFunctionScope();
-  EXPECT_EQ(FuncScope->getDesc(), OurFunc);
-  auto &Children = FuncScope->getChildren();
-  ASSERT_EQ(Children.size(), 1u);
-  auto *BlockScope = Children[0];
-  EXPECT_EQ(LS.findLexicalScope(InBlockLoc.get()), BlockScope);
-  EXPECT_EQ(BlockScope->getDesc(), InBlockLoc->getScope());
-  EXPECT_FALSE(BlockScope->isAbstractScope());
-
-  EXPECT_TRUE(FuncScope->dominates(BlockScope));
-  EXPECT_FALSE(BlockScope->dominates(FuncScope));
-  EXPECT_EQ(FuncScope->getParent(), nullptr);
-  EXPECT_EQ(BlockScope->getParent(), FuncScope);
-
-  SmallPtrSet<const MachineBasicBlock *, 4> MBBVec;
-  LS.getMachineBasicBlocks(OutermostLoc.get(), MBBVec);
-
-  EXPECT_EQ(MBBVec.size(), 4u);
-  for (auto &MBB : *MF) {
-    EXPECT_EQ(MBBVec.count(&MBB), 1u);
-    EXPECT_TRUE(LS.dominates(OutermostLoc.get(), &MBB));
-    EXPECT_TRUE(LS.dominates(InBlockLoc.get(), &MBB));
-    EXPECT_FALSE(LS.dominates(InlinedLoc.get(), &MBB));
-  }
-}
-
-// Test inlined scopes functionality and relationship with the outer scopes.
-TEST_F(LexicalScopesTest, InlinedScopes) {
-  BuildMI(*MBB1, MBB1->end(), InlinedLoc, BeanInst);
-  BuildMI(*MBB2, MBB2->end(), InlinedLoc, BeanInst);
-  BuildMI(*MBB3, MBB3->end(), InlinedLoc, BeanInst);
-  BuildMI(*MBB4, MBB4->end(), InlinedLoc, BeanInst);
-
-  LexicalScopes LS;
-  LS.initialize(*MF);
-  LexicalScope *FuncScope = LS.getCurrentFunctionScope();
-  auto &Children = FuncScope->getChildren();
-  ASSERT_EQ(Children.size(), 1u);
-  auto *BlockScope = Children[0];
-  auto &BlockChildren = BlockScope->getChildren();
-  ASSERT_EQ(BlockChildren.size(), 1u);
-  auto *InlinedScope = BlockChildren[0];
-
-  EXPECT_FALSE(InlinedScope->isAbstractScope());
-  EXPECT_EQ(InlinedScope->getInlinedAt(), InlinedLoc.getInlinedAt());
-  EXPECT_EQ(InlinedScope->getDesc(), InlinedLoc.getScope());
-  EXPECT_EQ(InlinedScope->getChildren().size(), 0u);
-
-  EXPECT_EQ(FuncScope->getParent(), nullptr);
-  EXPECT_EQ(BlockScope->getParent(), FuncScope);
-  EXPECT_EQ(InlinedScope->getParent(), BlockScope);
-
-  const auto &AbstractScopes = LS.getAbstractScopesList();
-  ASSERT_EQ(AbstractScopes.size(), 1u);
-  const auto &AbstractScope = *AbstractScopes[0];
-  EXPECT_TRUE(AbstractScope.isAbstractScope());
-  EXPECT_EQ(AbstractScope.getDesc(), InlinedLoc.getScope());
-  EXPECT_EQ(AbstractScope.getInlinedAt(), nullptr);
-  EXPECT_EQ(AbstractScope.getParent(), nullptr);
-}
-
-// Test behaviour in a function that has empty DebugLocs.
-TEST_F(LexicalScopesTest, FuncWithEmptyGap) {
-  BuildMI(*MBB1, MBB1->end(), OutermostLoc, BeanInst);
-  BuildMI(*MBB2, MBB2->end(), DebugLoc(), BeanInst);
-  BuildMI(*MBB3, MBB3->end(), DebugLoc(), BeanInst);
-  BuildMI(*MBB4, MBB4->end(), OutermostLoc, BeanInst);
-
-  LexicalScopes LS;
-  LS.initialize(*MF);
-  LexicalScope *FuncScope = LS.getCurrentFunctionScope();
-
-  // A gap in a range that contains no other location, is not actually a
-  // gap as far as lexical scopes are concerned.
-  auto &Ranges = FuncScope->getRanges();
-  ASSERT_EQ(Ranges.size(), 1u);
-  EXPECT_EQ(Ranges[0].first, &*MF->begin()->begin());
-  auto BBIt = MF->end();
-  BBIt = std::prev(BBIt);
-  EXPECT_EQ(Ranges[0].second, &*BBIt->begin());
-}
-
-// Now a function with intervening not-in-scope instructions.
-TEST_F(LexicalScopesTest, FuncWithRealGap) {
-  MachineInstr *FirstI = BuildMI(*MBB1, MBB1->end(), InBlockLoc, BeanInst);
-  BuildMI(*MBB2, MBB2->end(), OutermostLoc, BeanInst);
-  BuildMI(*MBB3, MBB3->end(), OutermostLoc, BeanInst);
-  MachineInstr *LastI = BuildMI(*MBB4, MBB4->end(), InBlockLoc, BeanInst);
-
-  LexicalScopes LS;
-  LS.initialize(*MF);
-  LexicalScope *BlockScope = LS.findLexicalScope(InBlockLoc.get());
-  ASSERT_NE(BlockScope, nullptr);
-
-  // Within the block scope, there's a gap between the first and last
-  // block / instruction, where it's only the outermost scope.
-  auto &Ranges = BlockScope->getRanges();
-  ASSERT_EQ(Ranges.size(), 2u);
-  EXPECT_EQ(Ranges[0].first, FirstI);
-  EXPECT_EQ(Ranges[0].second, FirstI);
-  EXPECT_EQ(Ranges[1].first, LastI);
-  EXPECT_EQ(Ranges[1].second, LastI);
-
-  // The outer function scope should cover the whole function, including
-  // blocks the lexicalblock covers.
-  LexicalScope *FuncScope = LS.getCurrentFunctionScope();
-  auto &FuncRanges = FuncScope->getRanges();
-  ASSERT_EQ(FuncRanges.size(), 1u);
-  EXPECT_NE(FuncRanges[0].first, FuncRanges[0].second);
-  EXPECT_EQ(FuncRanges[0].first, FirstI);
-  EXPECT_EQ(FuncRanges[0].second, LastI);
-}
-
-// Examine the relationship between two scopes that don't nest (are siblings).
-TEST_F(LexicalScopesTest, NotNested) {
-  MachineInstr *FirstI = BuildMI(*MBB1, MBB1->end(), InBlockLoc, BeanInst);
-  MachineInstr *SecondI =
-      BuildMI(*MBB2, MBB2->end(), NotNestedBlockLoc, BeanInst);
-  MachineInstr *ThirdI =
-      BuildMI(*MBB3, MBB3->end(), NotNestedBlockLoc, BeanInst);
-  MachineInstr *FourthI = BuildMI(*MBB4, MBB4->end(), InBlockLoc, BeanInst);
-
-  LexicalScopes LS;
-  LS.initialize(*MF);
-  LexicalScope *FuncScope = LS.getCurrentFunctionScope();
-  LexicalScope *BlockScope = LS.findLexicalScope(InBlockLoc.get());
-  LexicalScope *OtherBlockScope = LS.findLexicalScope(NotNestedBlockLoc.get());
-  ASSERT_NE(FuncScope, nullptr);
-  ASSERT_NE(BlockScope, nullptr);
-  ASSERT_NE(OtherBlockScope, nullptr);
-
-  // The function should cover everything; the two blocks are distinct and
-  // should not.
-  auto &FuncRanges = FuncScope->getRanges();
-  ASSERT_EQ(FuncRanges.size(), 1u);
-  EXPECT_EQ(FuncRanges[0].first, FirstI);
-  EXPECT_EQ(FuncRanges[0].second, FourthI);
-
-  // Two ranges, start and end instructions.
-  auto &BlockRanges = BlockScope->getRanges();
-  ASSERT_EQ(BlockRanges.size(), 2u);
-  EXPECT_EQ(BlockRanges[0].first, FirstI);
-  EXPECT_EQ(BlockRanges[0].second, FirstI);
-  EXPECT_EQ(BlockRanges[1].first, FourthI);
-  EXPECT_EQ(BlockRanges[1].second, FourthI);
-
-  // One inner range, covering the two inner blocks.
-  auto &OtherBlockRanges = OtherBlockScope->getRanges();
-  ASSERT_EQ(OtherBlockRanges.size(), 1u);
-  EXPECT_EQ(OtherBlockRanges[0].first, SecondI);
-  EXPECT_EQ(OtherBlockRanges[0].second, ThirdI);
-}
-
-// Test the scope-specific and block-specific dominates methods.
-TEST_F(LexicalScopesTest, TestDominates) {
-  BuildMI(*MBB1, MBB1->end(), InBlockLoc, BeanInst);
-  BuildMI(*MBB2, MBB2->end(), NotNestedBlockLoc, BeanInst);
-  BuildMI(*MBB3, MBB3->end(), NotNestedBlockLoc, BeanInst);
-  BuildMI(*MBB4, MBB4->end(), InBlockLoc, BeanInst);
-
-  LexicalScopes LS;
-  LS.initialize(*MF);
-  LexicalScope *FuncScope = LS.getCurrentFunctionScope();
-  LexicalScope *BlockScope = LS.findLexicalScope(InBlockLoc.get());
-  LexicalScope *OtherBlockScope = LS.findLexicalScope(NotNestedBlockLoc.get());
-  ASSERT_NE(FuncScope, nullptr);
-  ASSERT_NE(BlockScope, nullptr);
-  ASSERT_NE(OtherBlockScope, nullptr);
-
-  EXPECT_TRUE(FuncScope->dominates(BlockScope));
-  EXPECT_TRUE(FuncScope->dominates(OtherBlockScope));
-  EXPECT_FALSE(BlockScope->dominates(FuncScope));
-  EXPECT_FALSE(BlockScope->dominates(OtherBlockScope));
-  EXPECT_FALSE(OtherBlockScope->dominates(FuncScope));
-  EXPECT_FALSE(OtherBlockScope->dominates(BlockScope));
-
-  // Outermost scope dominates everything, as all insts are within it.
-  EXPECT_TRUE(LS.dominates(OutermostLoc.get(), MBB1));
-  EXPECT_TRUE(LS.dominates(OutermostLoc.get(), MBB2));
-  EXPECT_TRUE(LS.dominates(OutermostLoc.get(), MBB3));
-  EXPECT_TRUE(LS.dominates(OutermostLoc.get(), MBB4));
-
-  // One inner block dominates the outer pair of blocks,
-  EXPECT_TRUE(LS.dominates(InBlockLoc.get(), MBB1));
-  EXPECT_FALSE(LS.dominates(InBlockLoc.get(), MBB2));
-  EXPECT_FALSE(LS.dominates(InBlockLoc.get(), MBB3));
-  EXPECT_TRUE(LS.dominates(InBlockLoc.get(), MBB4));
-
-  // While the other dominates the inner two blocks.
-  EXPECT_FALSE(LS.dominates(NotNestedBlockLoc.get(), MBB1));
-  EXPECT_TRUE(LS.dominates(NotNestedBlockLoc.get(), MBB2));
-  EXPECT_TRUE(LS.dominates(NotNestedBlockLoc.get(), MBB3));
-  EXPECT_FALSE(LS.dominates(NotNestedBlockLoc.get(), MBB4));
-}
-
-// Test getMachineBasicBlocks returns all dominated blocks.
-TEST_F(LexicalScopesTest, TestGetBlocks) {
-  BuildMI(*MBB1, MBB1->end(), InBlockLoc, BeanInst);
-  BuildMI(*MBB2, MBB2->end(), NotNestedBlockLoc, BeanInst);
-  BuildMI(*MBB3, MBB3->end(), NotNestedBlockLoc, BeanInst);
-  BuildMI(*MBB4, MBB4->end(), InBlockLoc, BeanInst);
-
-  LexicalScopes LS;
-  LS.initialize(*MF);
-  LexicalScope *FuncScope = LS.getCurrentFunctionScope();
-  LexicalScope *BlockScope = LS.findLexicalScope(InBlockLoc.get());
-  LexicalScope *OtherBlockScope = LS.findLexicalScope(NotNestedBlockLoc.get());
-  ASSERT_NE(FuncScope, nullptr);
-  ASSERT_NE(BlockScope, nullptr);
-  ASSERT_NE(OtherBlockScope, nullptr);
-
-  SmallPtrSet<const MachineBasicBlock *, 4> OutermostBlocks, InBlockBlocks,
-      NotNestedBlockBlocks;
-  LS.getMachineBasicBlocks(OutermostLoc.get(), OutermostBlocks);
-  LS.getMachineBasicBlocks(InBlockLoc.get(), InBlockBlocks);
-  LS.getMachineBasicBlocks(NotNestedBlockLoc.get(), NotNestedBlockBlocks);
-
-  EXPECT_EQ(OutermostBlocks.count(MBB1), 1u);
-  EXPECT_EQ(OutermostBlocks.count(MBB2), 1u);
-  EXPECT_EQ(OutermostBlocks.count(MBB3), 1u);
-  EXPECT_EQ(OutermostBlocks.count(MBB4), 1u);
-
-  EXPECT_EQ(InBlockBlocks.count(MBB1), 1u);
-  EXPECT_EQ(InBlockBlocks.count(MBB2), 0u);
-  EXPECT_EQ(InBlockBlocks.count(MBB3), 0u);
-  EXPECT_EQ(InBlockBlocks.count(MBB4), 1u);
-
-  EXPECT_EQ(NotNestedBlockBlocks.count(MBB1), 0u);
-  EXPECT_EQ(NotNestedBlockBlocks.count(MBB2), 1u);
-  EXPECT_EQ(NotNestedBlockBlocks.count(MBB3), 1u);
-  EXPECT_EQ(NotNestedBlockBlocks.count(MBB4), 0u);
-}
-
-TEST_F(LexicalScopesTest, TestMetaInst) {
-  // Instruction Layout looks like this, where 'F' means funcscope, and
-  // 'B' blockscope:
-  // bb1:
-  //   F: bean
-  //   B: bean
-  // bb2:
-  //   F: bean
-  //   B: DBG_VALUE
-  // bb3:
-  //   F: bean
-  //   B: DBG_VALUE
-  // bb4:
-  //   F: bean
-  //   B: bean
-  // The block / 'B' should only dominate bb1 and bb4. DBG_VALUE is a meta
-  // instruction, and shouldn't contribute to scopes.
-  BuildMI(*MBB1, MBB1->end(), OutermostLoc, BeanInst);
-  BuildMI(*MBB1, MBB1->end(), InBlockLoc, BeanInst);
-  BuildMI(*MBB2, MBB2->end(), OutermostLoc, BeanInst);
-  BuildMI(*MBB2, MBB2->end(), InBlockLoc, DbgValueInst);
-  BuildMI(*MBB3, MBB3->end(), OutermostLoc, BeanInst);
-  BuildMI(*MBB3, MBB3->end(), InBlockLoc, DbgValueInst);
-  BuildMI(*MBB4, MBB4->end(), OutermostLoc, BeanInst);
-  BuildMI(*MBB4, MBB4->end(), InBlockLoc, BeanInst);
-
-  LexicalScopes LS;
-  LS.initialize(*MF);
-  LexicalScope *FuncScope = LS.getCurrentFunctionScope();
-  LexicalScope *BlockScope = LS.findLexicalScope(InBlockLoc.get());
-  ASSERT_NE(FuncScope, nullptr);
-  ASSERT_NE(BlockScope, nullptr);
-
-  EXPECT_TRUE(LS.dominates(OutermostLoc.get(), MBB1));
-  EXPECT_TRUE(LS.dominates(OutermostLoc.get(), MBB2));
-  EXPECT_TRUE(LS.dominates(OutermostLoc.get(), MBB3));
-  EXPECT_TRUE(LS.dominates(OutermostLoc.get(), MBB4));
-  EXPECT_TRUE(LS.dominates(InBlockLoc.get(), MBB1));
-  EXPECT_FALSE(LS.dominates(InBlockLoc.get(), MBB2));
-  EXPECT_FALSE(LS.dominates(InBlockLoc.get(), MBB3));
-  EXPECT_TRUE(LS.dominates(InBlockLoc.get(), MBB4));
-}
-
-} // anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/CodeGen/LowLevelTypeTest.cpp b/gnu/llvm/llvm/unittests/CodeGen/LowLevelTypeTest.cpp
deleted file mode 100644
index bf629c5d5e3..00000000000
--- a/gnu/llvm/llvm/unittests/CodeGen/LowLevelTypeTest.cpp
+++ /dev/null
@@ -1,322 +0,0 @@
-//===- llvm/unittest/CodeGen/GlobalISel/LowLevelTypeTest.cpp --------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/CodeGen/LowLevelType.h"
-#include "llvm/IR/DataLayout.h"
-#include "llvm/IR/DerivedTypes.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Type.h"
-#include "llvm/Support/TypeSize.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST(LowLevelTypeTest, Scalar) {
-  LLVMContext C;
-  DataLayout DL("");
-
-  for (unsigned S : {0U, 1U, 17U, 32U, 64U, 0xfffffU}) {
-    const LLT Ty = LLT::scalar(S);
-
-    // Test kind.
-    ASSERT_TRUE(Ty.isValid());
-    ASSERT_TRUE(Ty.isScalar());
-
-    ASSERT_FALSE(Ty.isPointer());
-    ASSERT_FALSE(Ty.isVector());
-
-    // Test sizes.
-    EXPECT_EQ(S, Ty.getSizeInBits());
-    EXPECT_EQ(S, Ty.getScalarSizeInBits());
-
-    // Test equality operators.
-    EXPECT_TRUE(Ty == Ty);
-    EXPECT_FALSE(Ty != Ty);
-
-    // Test Type->LLT conversion.
-    if (S != 0) {
-      Type *IRTy = IntegerType::get(C, S);
-      EXPECT_EQ(Ty, getLLTForType(*IRTy, DL));
-    }
-  }
-}
-
-TEST(LowLevelTypeTest, Vector) {
-  LLVMContext C;
-  DataLayout DL("");
-
-  for (unsigned S : {0U, 1U, 17U, 32U, 64U, 0xfffU}) {
-    for (auto EC :
-         {ElementCount::getFixed(2), ElementCount::getFixed(3),
-          ElementCount::getFixed(4), ElementCount::getFixed(32),
-          ElementCount::getFixed(0xff), ElementCount::getScalable(2),
-          ElementCount::getScalable(3), ElementCount::getScalable(4),
-          ElementCount::getScalable(32), ElementCount::getScalable(0xff)}) {
-      const LLT STy = LLT::scalar(S);
-      const LLT VTy = LLT::vector(EC, S);
-
-      // Test the alternative vector().
-      {
-        const LLT VSTy = LLT::vector(EC, STy);
-        EXPECT_EQ(VTy, VSTy);
-      }
-
-      // Test getElementType().
-      EXPECT_EQ(STy, VTy.getElementType());
-
-      // Test kind.
-      ASSERT_TRUE(VTy.isValid());
-      ASSERT_TRUE(VTy.isVector());
-
-      ASSERT_FALSE(VTy.isScalar());
-      ASSERT_FALSE(VTy.isPointer());
-
-      // Test sizes.
-      EXPECT_EQ(S, VTy.getScalarSizeInBits());
-      EXPECT_EQ(EC, VTy.getElementCount());
-      if (!EC.isScalable())
-        EXPECT_EQ(S * EC.getFixedValue(), VTy.getSizeInBits());
-      else
-        EXPECT_EQ(TypeSize::Scalable(S * EC.getKnownMinValue()),
-                  VTy.getSizeInBits());
-
-      // Test equality operators.
-      EXPECT_TRUE(VTy == VTy);
-      EXPECT_FALSE(VTy != VTy);
-
-      // Test inequality operators on..
-      // ..different kind.
-      EXPECT_NE(VTy, STy);
-
-      // Test Type->LLT conversion.
-      if (S != 0) {
-        Type *IRSTy = IntegerType::get(C, S);
-        Type *IRTy = VectorType::get(IRSTy, EC);
-        EXPECT_EQ(VTy, getLLTForType(*IRTy, DL));
-      }
-    }
-  }
-}
-
-TEST(LowLevelTypeTest, ScalarOrVector) {
-  // Test version with number of bits for scalar type.
-  EXPECT_EQ(LLT::scalar(32),
-            LLT::scalarOrVector(ElementCount::getFixed(1), 32));
-  EXPECT_EQ(LLT::fixed_vector(2, 32),
-            LLT::scalarOrVector(ElementCount::getFixed(2), 32));
-  EXPECT_EQ(LLT::scalable_vector(1, 32),
-            LLT::scalarOrVector(ElementCount::getScalable(1), 32));
-
-  // Test version with LLT for scalar type.
-  EXPECT_EQ(LLT::scalar(32),
-            LLT::scalarOrVector(ElementCount::getFixed(1), LLT::scalar(32)));
-  EXPECT_EQ(LLT::fixed_vector(2, 32),
-            LLT::scalarOrVector(ElementCount::getFixed(2), LLT::scalar(32)));
-
-  // Test with pointer elements.
-  EXPECT_EQ(LLT::pointer(1, 32), LLT::scalarOrVector(ElementCount::getFixed(1),
-                                                     LLT::pointer(1, 32)));
-  EXPECT_EQ(
-      LLT::fixed_vector(2, LLT::pointer(1, 32)),
-      LLT::scalarOrVector(ElementCount::getFixed(2), LLT::pointer(1, 32)));
-}
-
-TEST(LowLevelTypeTest, ChangeElementType) {
-  const LLT P0 = LLT::pointer(0, 32);
-  const LLT P1 = LLT::pointer(1, 64);
-
-  const LLT S32 = LLT::scalar(32);
-  const LLT S64 = LLT::scalar(64);
-
-  const LLT V2S32 = LLT::fixed_vector(2, 32);
-  const LLT V2S64 = LLT::fixed_vector(2, 64);
-
-  const LLT V2P0 = LLT::fixed_vector(2, P0);
-  const LLT V2P1 = LLT::fixed_vector(2, P1);
-
-  EXPECT_EQ(S64, S32.changeElementType(S64));
-  EXPECT_EQ(S32, S32.changeElementType(S32));
-
-  EXPECT_EQ(S32, S64.changeElementSize(32));
-  EXPECT_EQ(S32, S32.changeElementSize(32));
-
-  EXPECT_EQ(V2S64, V2S32.changeElementType(S64));
-  EXPECT_EQ(V2S32, V2S64.changeElementType(S32));
-
-  EXPECT_EQ(V2S64, V2S32.changeElementSize(64));
-  EXPECT_EQ(V2S32, V2S64.changeElementSize(32));
-
-  EXPECT_EQ(P0, S32.changeElementType(P0));
-  EXPECT_EQ(S32, P0.changeElementType(S32));
-
-  EXPECT_EQ(V2P1, V2P0.changeElementType(P1));
-  EXPECT_EQ(V2S32, V2P0.changeElementType(S32));
-
-  // Similar tests for for scalable vectors.
-  const LLT NXV2S32 = LLT::scalable_vector(2, 32);
-  const LLT NXV2S64 = LLT::scalable_vector(2, 64);
-
-  const LLT NXV2P0 = LLT::scalable_vector(2, P0);
-  const LLT NXV2P1 = LLT::scalable_vector(2, P1);
-
-  EXPECT_EQ(NXV2S64, NXV2S32.changeElementType(S64));
-  EXPECT_EQ(NXV2S32, NXV2S64.changeElementType(S32));
-
-  EXPECT_EQ(NXV2S64, NXV2S32.changeElementSize(64));
-  EXPECT_EQ(NXV2S32, NXV2S64.changeElementSize(32));
-
-  EXPECT_EQ(NXV2P1, NXV2P0.changeElementType(P1));
-  EXPECT_EQ(NXV2S32, NXV2P0.changeElementType(S32));
-}
-
-TEST(LowLevelTypeTest, ChangeNumElements) {
-  const LLT P0 = LLT::pointer(0, 32);
-  const LLT V2P0 = LLT::fixed_vector(2, P0);
-  const LLT V3P0 = LLT::fixed_vector(3, P0);
-
-  const LLT S64 = LLT::scalar(64);
-  const LLT V2S64 = LLT::fixed_vector(2, 64);
-  const LLT V3S64 = LLT::fixed_vector(3, 64);
-
-  // Vector to scalar
-  EXPECT_EQ(S64, V2S64.changeElementCount(ElementCount::getFixed(1)));
-
-  // Vector to vector
-  EXPECT_EQ(V3S64, V2S64.changeElementCount(ElementCount::getFixed(3)));
-
-  // Scalar to vector
-  EXPECT_EQ(V2S64, S64.changeElementCount(ElementCount::getFixed(2)));
-
-  EXPECT_EQ(P0, V2P0.changeElementCount(ElementCount::getFixed(1)));
-  EXPECT_EQ(V3P0, V2P0.changeElementCount(ElementCount::getFixed(3)));
-  EXPECT_EQ(V2P0, P0.changeElementCount(ElementCount::getFixed(2)));
-
-  const LLT NXV2S64 = LLT::scalable_vector(2, 64);
-  const LLT NXV3S64 = LLT::scalable_vector(3, 64);
-  const LLT NXV2P0 = LLT::scalable_vector(2, P0);
-
-  // Scalable vector to scalar
-  EXPECT_EQ(S64, NXV2S64.changeElementCount(ElementCount::getFixed(1)));
-  EXPECT_EQ(P0, NXV2P0.changeElementCount(ElementCount::getFixed(1)));
-
-  // Fixed-width vector to scalable vector
-  EXPECT_EQ(NXV3S64, V2S64.changeElementCount(ElementCount::getScalable(3)));
-
-  // Scalable vector to fixed-width vector
-  EXPECT_EQ(V3P0, NXV2P0.changeElementCount(ElementCount::getFixed(3)));
-
-  // Scalar to scalable vector
-  EXPECT_EQ(NXV2S64, S64.changeElementCount(ElementCount::getScalable(2)));
-  EXPECT_EQ(NXV2P0, P0.changeElementCount(ElementCount::getScalable(2)));
-}
-
-#ifdef GTEST_HAS_DEATH_TEST
-#ifndef NDEBUG
-
-// Invalid to directly change the element size for pointers.
-TEST(LowLevelTypeTest, ChangeElementTypeDeath) {
-  const LLT P0 = LLT::pointer(0, 32);
-  const LLT V2P0 = LLT::fixed_vector(2, P0);
-
-  EXPECT_DEATH(P0.changeElementSize(64),
-               "invalid to directly change element size for pointers");
-  EXPECT_DEATH(V2P0.changeElementSize(64),
-               "invalid to directly change element size for pointers");
-
-  // Make sure this still fails even without a change in size.
-  EXPECT_DEATH(P0.changeElementSize(32),
-               "invalid to directly change element size for pointers");
-  EXPECT_DEATH(V2P0.changeElementSize(32),
-               "invalid to directly change element size for pointers");
-}
-
-#endif
-#endif
-
-TEST(LowLevelTypeTest, Pointer) {
-  LLVMContext C;
-  DataLayout DL("p64:64:64-p127:512:512:512-p16777215:65528:8");
-
-  for (unsigned AS : {0U, 1U, 127U, 0xffffU,
-        static_cast<unsigned>(maxUIntN(23)),
-        static_cast<unsigned>(maxUIntN(24))}) {
-    for (ElementCount EC :
-         {ElementCount::getFixed(2), ElementCount::getFixed(3),
-          ElementCount::getFixed(4), ElementCount::getFixed(256),
-          ElementCount::getFixed(65535), ElementCount::getScalable(2),
-          ElementCount::getScalable(3), ElementCount::getScalable(4),
-          ElementCount::getScalable(256), ElementCount::getScalable(65535)}) {
-      const LLT Ty = LLT::pointer(AS, DL.getPointerSizeInBits(AS));
-      const LLT VTy = LLT::vector(EC, Ty);
-
-      // Test kind.
-      ASSERT_TRUE(Ty.isValid());
-      ASSERT_TRUE(Ty.isPointer());
-
-      ASSERT_FALSE(Ty.isScalar());
-      ASSERT_FALSE(Ty.isVector());
-
-      ASSERT_TRUE(VTy.isValid());
-      ASSERT_TRUE(VTy.isVector());
-      ASSERT_TRUE(VTy.getElementType().isPointer());
-
-      EXPECT_EQ(Ty, VTy.getElementType());
-      EXPECT_EQ(Ty.getSizeInBits(), VTy.getScalarSizeInBits());
-
-      // Test address space.
-      EXPECT_EQ(AS, Ty.getAddressSpace());
-      EXPECT_EQ(AS, VTy.getElementType().getAddressSpace());
-
-      // Test equality operators.
-      EXPECT_TRUE(Ty == Ty);
-      EXPECT_FALSE(Ty != Ty);
-      EXPECT_TRUE(VTy == VTy);
-      EXPECT_FALSE(VTy != VTy);
-
-      // Test Type->LLT conversion.
-      Type *IRTy = PointerType::get(IntegerType::get(C, 8), AS);
-      EXPECT_EQ(Ty, getLLTForType(*IRTy, DL));
-      Type *IRVTy =
-          VectorType::get(PointerType::get(IntegerType::get(C, 8), AS), EC);
-      EXPECT_EQ(VTy, getLLTForType(*IRVTy, DL));
-    }
-  }
-}
-
-TEST(LowLevelTypeTest, Invalid) {
-  const LLT Ty;
-
-  ASSERT_FALSE(Ty.isValid());
-  ASSERT_FALSE(Ty.isScalar());
-  ASSERT_FALSE(Ty.isPointer());
-  ASSERT_FALSE(Ty.isVector());
-}
-
-TEST(LowLevelTypeTest, Divide) {
-  // Test basic scalar->scalar cases.
-  EXPECT_EQ(LLT::scalar(16), LLT::scalar(32).divide(2));
-  EXPECT_EQ(LLT::scalar(8), LLT::scalar(32).divide(4));
-  EXPECT_EQ(LLT::scalar(8), LLT::scalar(32).divide(4));
-
-  // Test pointer->scalar
-  EXPECT_EQ(LLT::scalar(32), LLT::pointer(0, 64).divide(2));
-
-  // Test dividing vectors.
-  EXPECT_EQ(LLT::scalar(32), LLT::fixed_vector(2, 32).divide(2));
-  EXPECT_EQ(LLT::fixed_vector(2, 32), LLT::fixed_vector(4, 32).divide(2));
-
-  // Test vector of pointers
-  EXPECT_EQ(LLT::pointer(1, 64),
-            LLT::fixed_vector(4, LLT::pointer(1, 64)).divide(4));
-  EXPECT_EQ(LLT::fixed_vector(2, LLT::pointer(1, 64)),
-            LLT::fixed_vector(4, LLT::pointer(1, 64)).divide(2));
-}
-
-}
diff --git a/gnu/llvm/llvm/unittests/CodeGen/MFCommon.inc b/gnu/llvm/llvm/unittests/CodeGen/MFCommon.inc
deleted file mode 100644
index 32e1d206e6a..00000000000
--- a/gnu/llvm/llvm/unittests/CodeGen/MFCommon.inc
+++ /dev/null
@@ -1,135 +0,0 @@
-// Add a few Bogus backend classes so we can create MachineInstrs without
-// depending on a real target.
-class BogusTargetLowering : public TargetLowering {
-public:
-  BogusTargetLowering(TargetMachine &TM) : TargetLowering(TM) {}
-};
-
-class BogusFrameLowering : public TargetFrameLowering {
-public:
-  BogusFrameLowering()
-      : TargetFrameLowering(TargetFrameLowering::StackGrowsDown, Align(4), 4) {}
-
-  void emitPrologue(MachineFunction &MF,
-                    MachineBasicBlock &MBB) const override {}
-  void emitEpilogue(MachineFunction &MF,
-                    MachineBasicBlock &MBB) const override {}
-  bool hasFP(const MachineFunction &MF) const override { return false; }
-};
-
-static TargetRegisterClass *const BogusRegisterClasses[] = {nullptr};
-
-class BogusRegisterInfo : public TargetRegisterInfo {
-public:
-  BogusRegisterInfo()
-      : TargetRegisterInfo(nullptr, BogusRegisterClasses, BogusRegisterClasses,
-                           nullptr, nullptr, LaneBitmask(~0u), nullptr) {
-    InitMCRegisterInfo(nullptr, 0, 0, 0, nullptr, 0, nullptr, 0, nullptr,
-                       nullptr, nullptr, nullptr, nullptr, 0, nullptr, nullptr);
-  }
-
-  const MCPhysReg *
-  getCalleeSavedRegs(const MachineFunction *MF) const override {
-    return nullptr;
-  }
-  ArrayRef<const uint32_t *> getRegMasks() const override { return None; }
-  ArrayRef<const char *> getRegMaskNames() const override { return None; }
-  BitVector getReservedRegs(const MachineFunction &MF) const override {
-    return BitVector();
-  }
-  const RegClassWeight &
-  getRegClassWeight(const TargetRegisterClass *RC) const override {
-    static RegClassWeight Bogus{1, 16};
-    return Bogus;
-  }
-  unsigned getRegUnitWeight(unsigned RegUnit) const override { return 1; }
-  unsigned getNumRegPressureSets() const override { return 0; }
-  const char *getRegPressureSetName(unsigned Idx) const override {
-    return "bogus";
-  }
-  unsigned getRegPressureSetLimit(const MachineFunction &MF,
-                                  unsigned Idx) const override {
-    return 0;
-  }
-  const int *
-  getRegClassPressureSets(const TargetRegisterClass *RC) const override {
-    static const int Bogus[] = {0, -1};
-    return &Bogus[0];
-  }
-  const int *getRegUnitPressureSets(unsigned RegUnit) const override {
-    static const int Bogus[] = {0, -1};
-    return &Bogus[0];
-  }
-
-  Register getFrameRegister(const MachineFunction &MF) const override {
-    return 0;
-  }
-  void eliminateFrameIndex(MachineBasicBlock::iterator MI, int SPAdj,
-                           unsigned FIOperandNum,
-                           RegScavenger *RS = nullptr) const override {}
-};
-
-class BogusSubtarget : public TargetSubtargetInfo {
-public:
-  BogusSubtarget(TargetMachine &TM)
-      : TargetSubtargetInfo(Triple(""), "", "", "", {}, {}, nullptr, nullptr,
-                            nullptr, nullptr, nullptr, nullptr),
-        FL(), TL(TM) {}
-  ~BogusSubtarget() override {}
-
-  const TargetFrameLowering *getFrameLowering() const override { return &FL; }
-
-  const TargetLowering *getTargetLowering() const override { return &TL; }
-
-  const TargetInstrInfo *getInstrInfo() const override { return &TII; }
-
-  const TargetRegisterInfo *getRegisterInfo() const override { return &TRI; }
-
-private:
-  BogusFrameLowering FL;
-  BogusRegisterInfo TRI;
-  BogusTargetLowering TL;
-  TargetInstrInfo TII;
-};
-
-static TargetOptions getTargetOptionsForBogusMachine() {
-  TargetOptions Opts;
-  Opts.EmitCallSiteInfo = true;
-  return Opts;
-}
-
-class BogusTargetMachine : public LLVMTargetMachine {
-public:
-  BogusTargetMachine()
-      : LLVMTargetMachine(Target(), "", Triple(""), "", "",
-                          getTargetOptionsForBogusMachine(), Reloc::Static,
-                          CodeModel::Small, CodeGenOpt::Default),
-        ST(*this) {}
-
-  ~BogusTargetMachine() override {}
-
-  const TargetSubtargetInfo *getSubtargetImpl(const Function &) const override {
-    return &ST;
-  }
-
-private:
-  BogusSubtarget ST;
-};
-
-std::unique_ptr<BogusTargetMachine> createTargetMachine() {
-  return std::make_unique<BogusTargetMachine>();
-}
-
-std::unique_ptr<MachineFunction> createMachineFunction(LLVMContext &Ctx,
-                                                       Module &M) {
-  auto Type = FunctionType::get(Type::getVoidTy(Ctx), false);
-  auto F = Function::Create(Type, GlobalValue::ExternalLinkage, "Test", &M);
-
-  auto TM = createTargetMachine();
-  unsigned FunctionNum = 42;
-  MachineModuleInfo MMI(TM.get());
-  const TargetSubtargetInfo &STI = *TM->getSubtargetImpl(*F);
-
-  return std::make_unique<MachineFunction>(*F, *TM, STI, FunctionNum, MMI);
-}
-
diff --git a/gnu/llvm/llvm/unittests/CodeGen/MachineInstrBundleIteratorTest.cpp b/gnu/llvm/llvm/unittests/CodeGen/MachineInstrBundleIteratorTest.cpp
deleted file mode 100644
index 5ce0983ae3c..00000000000
--- a/gnu/llvm/llvm/unittests/CodeGen/MachineInstrBundleIteratorTest.cpp
+++ /dev/null
@@ -1,196 +0,0 @@
-//===- MachineInstrBundleIteratorTest.cpp ---------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/CodeGen/MachineInstrBundleIterator.h"
-#include "llvm/ADT/ilist_node.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-struct MyBundledInstr
-    : public ilist_node<MyBundledInstr, ilist_sentinel_tracking<true>> {
-  bool isBundledWithPred() const { return true; }
-  bool isBundledWithSucc() const { return true; }
-};
-typedef MachineInstrBundleIterator<MyBundledInstr> bundled_iterator;
-typedef MachineInstrBundleIterator<const MyBundledInstr> const_bundled_iterator;
-typedef MachineInstrBundleIterator<MyBundledInstr, true>
-    reverse_bundled_iterator;
-typedef MachineInstrBundleIterator<const MyBundledInstr, true>
-    const_reverse_bundled_iterator;
-
-#ifdef GTEST_HAS_DEATH_TEST
-#ifndef NDEBUG
-TEST(MachineInstrBundleIteratorTest, CheckForBundles) {
-  MyBundledInstr MBI;
-  auto I = MBI.getIterator();
-  auto RI = I.getReverse();
-
-  // Confirm that MBI is always considered bundled.
-  EXPECT_TRUE(MBI.isBundledWithPred());
-  EXPECT_TRUE(MBI.isBundledWithSucc());
-
-  // Confirm that iterators check in their constructor for bundled iterators.
-  EXPECT_DEATH((void)static_cast<bundled_iterator>(I),
-               "not legal to initialize");
-  EXPECT_DEATH((void)static_cast<bundled_iterator>(MBI),
-               "not legal to initialize");
-  EXPECT_DEATH((void)static_cast<bundled_iterator>(&MBI),
-               "not legal to initialize");
-  EXPECT_DEATH((void)static_cast<const_bundled_iterator>(I),
-               "not legal to initialize");
-  EXPECT_DEATH((void)static_cast<const_bundled_iterator>(MBI),
-               "not legal to initialize");
-  EXPECT_DEATH((void)static_cast<const_bundled_iterator>(&MBI),
-               "not legal to initialize");
-  EXPECT_DEATH((void)static_cast<reverse_bundled_iterator>(RI),
-               "not legal to initialize");
-  EXPECT_DEATH((void)static_cast<reverse_bundled_iterator>(MBI),
-               "not legal to initialize");
-  EXPECT_DEATH((void)static_cast<reverse_bundled_iterator>(&MBI),
-               "not legal to initialize");
-  EXPECT_DEATH((void)static_cast<const_reverse_bundled_iterator>(RI),
-               "not legal to initialize");
-  EXPECT_DEATH((void)static_cast<const_reverse_bundled_iterator>(MBI),
-               "not legal to initialize");
-  EXPECT_DEATH((void)static_cast<const_reverse_bundled_iterator>(&MBI),
-               "not legal to initialize");
-}
-#endif
-#endif
-
-TEST(MachineInstrBundleIteratorTest, CompareToBundledMI) {
-  MyBundledInstr MBI;
-  const MyBundledInstr &CMBI = MBI;
-  bundled_iterator I;
-  const_bundled_iterator CI;
-
-  // Confirm that MBI is always considered bundled.
-  EXPECT_TRUE(MBI.isBundledWithPred());
-  EXPECT_TRUE(MBI.isBundledWithSucc());
-
-  // These invocations will crash when !NDEBUG if a conversion is taking place.
-  // These checks confirm that comparison operators don't use any conversion
-  // operators.
-  ASSERT_FALSE(MBI == I);
-  ASSERT_FALSE(&MBI == I);
-  ASSERT_FALSE(CMBI == I);
-  ASSERT_FALSE(&CMBI == I);
-  ASSERT_FALSE(I == MBI);
-  ASSERT_FALSE(I == &MBI);
-  ASSERT_FALSE(I == CMBI);
-  ASSERT_FALSE(I == &CMBI);
-  ASSERT_FALSE(MBI == CI);
-  ASSERT_FALSE(&MBI == CI);
-  ASSERT_FALSE(CMBI == CI);
-  ASSERT_FALSE(&CMBI == CI);
-  ASSERT_FALSE(CI == MBI);
-  ASSERT_FALSE(CI == &MBI);
-  ASSERT_FALSE(CI == CMBI);
-  ASSERT_FALSE(CI == &CMBI);
-  ASSERT_FALSE(MBI.getIterator() == I);
-  ASSERT_FALSE(CMBI.getIterator() == I);
-  ASSERT_FALSE(I == MBI.getIterator());
-  ASSERT_FALSE(I == CMBI.getIterator());
-  ASSERT_FALSE(MBI.getIterator() == CI);
-  ASSERT_FALSE(CMBI.getIterator() == CI);
-  ASSERT_FALSE(CI == MBI.getIterator());
-  ASSERT_FALSE(CI == CMBI.getIterator());
-  ASSERT_TRUE(MBI != I);
-  ASSERT_TRUE(&MBI != I);
-  ASSERT_TRUE(CMBI != I);
-  ASSERT_TRUE(&CMBI != I);
-  ASSERT_TRUE(I != MBI);
-  ASSERT_TRUE(I != &MBI);
-  ASSERT_TRUE(I != CMBI);
-  ASSERT_TRUE(I != &CMBI);
-  ASSERT_TRUE(MBI != CI);
-  ASSERT_TRUE(&MBI != CI);
-  ASSERT_TRUE(CMBI != CI);
-  ASSERT_TRUE(&CMBI != CI);
-  ASSERT_TRUE(CI != MBI);
-  ASSERT_TRUE(CI != &MBI);
-  ASSERT_TRUE(CI != CMBI);
-  ASSERT_TRUE(CI != &CMBI);
-  ASSERT_TRUE(MBI.getIterator() != I);
-  ASSERT_TRUE(CMBI.getIterator() != I);
-  ASSERT_TRUE(I != MBI.getIterator());
-  ASSERT_TRUE(I != CMBI.getIterator());
-  ASSERT_TRUE(MBI.getIterator() != CI);
-  ASSERT_TRUE(CMBI.getIterator() != CI);
-  ASSERT_TRUE(CI != MBI.getIterator());
-  ASSERT_TRUE(CI != CMBI.getIterator());
-}
-
-struct MyUnbundledInstr
-    : ilist_node<MyUnbundledInstr, ilist_sentinel_tracking<true>> {
-  bool isBundledWithPred() const { return false; }
-  bool isBundledWithSucc() const { return false; }
-};
-typedef MachineInstrBundleIterator<MyUnbundledInstr> unbundled_iterator;
-typedef MachineInstrBundleIterator<const MyUnbundledInstr>
-    const_unbundled_iterator;
-typedef MachineInstrBundleIterator<MyUnbundledInstr, true>
-    reverse_unbundled_iterator;
-typedef MachineInstrBundleIterator<const MyUnbundledInstr, true>
-    const_reverse_unbundled_iterator;
-
-TEST(MachineInstrBundleIteratorTest, ReverseConstructor) {
-  simple_ilist<MyUnbundledInstr, ilist_sentinel_tracking<true>> L;
-  const auto &CL = L;
-  MyUnbundledInstr A, B;
-  L.insert(L.end(), A);
-  L.insert(L.end(), B);
-
-  // Save typing.
-  typedef MachineInstrBundleIterator<MyUnbundledInstr> iterator;
-  typedef MachineInstrBundleIterator<MyUnbundledInstr, true> reverse_iterator;
-  typedef MachineInstrBundleIterator<const MyUnbundledInstr> const_iterator;
-  typedef MachineInstrBundleIterator<const MyUnbundledInstr, true>
-      const_reverse_iterator;
-
-  // Convert to bundle iterators.
-  auto begin = [&]() -> iterator { return L.begin(); };
-  auto end = [&]() -> iterator { return L.end(); };
-  auto rbegin = [&]() -> reverse_iterator { return L.rbegin(); };
-  auto rend = [&]() -> reverse_iterator { return L.rend(); };
-  auto cbegin = [&]() -> const_iterator { return CL.begin(); };
-  auto cend = [&]() -> const_iterator { return CL.end(); };
-  auto crbegin = [&]() -> const_reverse_iterator { return CL.rbegin(); };
-  auto crend = [&]() -> const_reverse_iterator { return CL.rend(); };
-
-  // Check conversion values.
-  EXPECT_EQ(begin(), iterator(rend()));
-  EXPECT_EQ(++begin(), iterator(++rbegin()));
-  EXPECT_EQ(end(), iterator(rbegin()));
-  EXPECT_EQ(rbegin(), reverse_iterator(end()));
-  EXPECT_EQ(++rbegin(), reverse_iterator(++begin()));
-  EXPECT_EQ(rend(), reverse_iterator(begin()));
-
-  // Check const iterator constructors.
-  EXPECT_EQ(cbegin(), const_iterator(rend()));
-  EXPECT_EQ(cbegin(), const_iterator(crend()));
-  EXPECT_EQ(crbegin(), const_reverse_iterator(end()));
-  EXPECT_EQ(crbegin(), const_reverse_iterator(cend()));
-
-  // Confirm lack of implicit conversions.
-  static_assert(!std::is_convertible<iterator, reverse_iterator>::value,
-                "unexpected implicit conversion");
-  static_assert(!std::is_convertible<reverse_iterator, iterator>::value,
-                "unexpected implicit conversion");
-  static_assert(
-      !std::is_convertible<const_iterator, const_reverse_iterator>::value,
-      "unexpected implicit conversion");
-  static_assert(
-      !std::is_convertible<const_reverse_iterator, const_iterator>::value,
-      "unexpected implicit conversion");
-}
-
-} // end namespace
diff --git a/gnu/llvm/llvm/unittests/CodeGen/MachineInstrTest.cpp b/gnu/llvm/llvm/unittests/CodeGen/MachineInstrTest.cpp
deleted file mode 100644
index 82be17bac57..00000000000
--- a/gnu/llvm/llvm/unittests/CodeGen/MachineInstrTest.cpp
+++ /dev/null
@@ -1,392 +0,0 @@
-//===- MachineInstrTest.cpp -----------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/CodeGen/MachineInstr.h"
-#include "llvm/ADT/Triple.h"
-#include "llvm/CodeGen/MachineBasicBlock.h"
-#include "llvm/CodeGen/MachineFunction.h"
-#include "llvm/CodeGen/MachineMemOperand.h"
-#include "llvm/CodeGen/MachineModuleInfo.h"
-#include "llvm/CodeGen/TargetFrameLowering.h"
-#include "llvm/CodeGen/TargetInstrInfo.h"
-#include "llvm/CodeGen/TargetLowering.h"
-#include "llvm/CodeGen/TargetSubtargetInfo.h"
-#include "llvm/IR/DebugInfoMetadata.h"
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/ModuleSlotTracker.h"
-#include "llvm/MC/MCAsmInfo.h"
-#include "llvm/MC/MCSymbol.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "llvm/Target/TargetMachine.h"
-#include "llvm/Target/TargetOptions.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-// Include helper functions to ease the manipulation of MachineFunctions.
-#include "MFCommon.inc"
-
-std::unique_ptr<MCContext> createMCContext(MCAsmInfo *AsmInfo) {
-  Triple TheTriple(/*ArchStr=*/"", /*VendorStr=*/"", /*OSStr=*/"",
-                   /*EnvironmentStr=*/"elf");
-  return std::make_unique<MCContext>(TheTriple, AsmInfo, nullptr, nullptr,
-                                     nullptr, nullptr, false);
-}
-
-// This test makes sure that MachineInstr::isIdenticalTo handles Defs correctly
-// for various combinations of IgnoreDefs, and also that it is symmetrical.
-TEST(IsIdenticalToTest, DifferentDefs) {
-  LLVMContext Ctx;
-  Module Mod("Module", Ctx);
-  auto MF = createMachineFunction(Ctx, Mod);
-
-  unsigned short NumOps = 2;
-  unsigned char NumDefs = 1;
-  MCOperandInfo OpInfo[] = {
-      {0, 0, MCOI::OPERAND_REGISTER, 0},
-      {0, 1 << MCOI::OptionalDef, MCOI::OPERAND_REGISTER, 0}};
-  MCInstrDesc MCID = {
-      0, NumOps,  NumDefs, 0,     0, 1ULL << MCID::HasOptionalDef,
-      0, nullptr, nullptr, OpInfo};
-
-  // Create two MIs with different virtual reg defs and the same uses.
-  unsigned VirtualDef1 = -42; // The value doesn't matter, but the sign does.
-  unsigned VirtualDef2 = -43;
-  unsigned VirtualUse = -44;
-
-  auto MI1 = MF->CreateMachineInstr(MCID, DebugLoc());
-  MI1->addOperand(*MF, MachineOperand::CreateReg(VirtualDef1, /*isDef*/ true));
-  MI1->addOperand(*MF, MachineOperand::CreateReg(VirtualUse, /*isDef*/ false));
-
-  auto MI2 = MF->CreateMachineInstr(MCID, DebugLoc());
-  MI2->addOperand(*MF, MachineOperand::CreateReg(VirtualDef2, /*isDef*/ true));
-  MI2->addOperand(*MF, MachineOperand::CreateReg(VirtualUse, /*isDef*/ false));
-
-  // Check that they are identical when we ignore virtual register defs, but not
-  // when we check defs.
-  ASSERT_FALSE(MI1->isIdenticalTo(*MI2, MachineInstr::CheckDefs));
-  ASSERT_FALSE(MI2->isIdenticalTo(*MI1, MachineInstr::CheckDefs));
-
-  ASSERT_TRUE(MI1->isIdenticalTo(*MI2, MachineInstr::IgnoreVRegDefs));
-  ASSERT_TRUE(MI2->isIdenticalTo(*MI1, MachineInstr::IgnoreVRegDefs));
-
-  // Create two MIs with different virtual reg defs, and a def or use of a
-  // sentinel register.
-  unsigned SentinelReg = 0;
-
-  auto MI3 = MF->CreateMachineInstr(MCID, DebugLoc());
-  MI3->addOperand(*MF, MachineOperand::CreateReg(VirtualDef1, /*isDef*/ true));
-  MI3->addOperand(*MF, MachineOperand::CreateReg(SentinelReg, /*isDef*/ true));
-
-  auto MI4 = MF->CreateMachineInstr(MCID, DebugLoc());
-  MI4->addOperand(*MF, MachineOperand::CreateReg(VirtualDef2, /*isDef*/ true));
-  MI4->addOperand(*MF, MachineOperand::CreateReg(SentinelReg, /*isDef*/ false));
-
-  // Check that they are never identical.
-  ASSERT_FALSE(MI3->isIdenticalTo(*MI4, MachineInstr::CheckDefs));
-  ASSERT_FALSE(MI4->isIdenticalTo(*MI3, MachineInstr::CheckDefs));
-
-  ASSERT_FALSE(MI3->isIdenticalTo(*MI4, MachineInstr::IgnoreVRegDefs));
-  ASSERT_FALSE(MI4->isIdenticalTo(*MI3, MachineInstr::IgnoreVRegDefs));
-}
-
-// Check that MachineInstrExpressionTrait::isEqual is symmetric and in sync with
-// MachineInstrExpressionTrait::getHashValue
-void checkHashAndIsEqualMatch(MachineInstr *MI1, MachineInstr *MI2) {
-  bool IsEqual1 = MachineInstrExpressionTrait::isEqual(MI1, MI2);
-  bool IsEqual2 = MachineInstrExpressionTrait::isEqual(MI2, MI1);
-
-  ASSERT_EQ(IsEqual1, IsEqual2);
-
-  auto Hash1 = MachineInstrExpressionTrait::getHashValue(MI1);
-  auto Hash2 = MachineInstrExpressionTrait::getHashValue(MI2);
-
-  ASSERT_EQ(IsEqual1, Hash1 == Hash2);
-}
-
-// This test makes sure that MachineInstrExpressionTraits::isEqual is in sync
-// with MachineInstrExpressionTraits::getHashValue.
-TEST(MachineInstrExpressionTraitTest, IsEqualAgreesWithGetHashValue) {
-  LLVMContext Ctx;
-  Module Mod("Module", Ctx);
-  auto MF = createMachineFunction(Ctx, Mod);
-
-  unsigned short NumOps = 2;
-  unsigned char NumDefs = 1;
-  MCOperandInfo OpInfo[] = {
-      {0, 0, MCOI::OPERAND_REGISTER, 0},
-      {0, 1 << MCOI::OptionalDef, MCOI::OPERAND_REGISTER, 0}};
-  MCInstrDesc MCID = {
-      0, NumOps,  NumDefs, 0,     0, 1ULL << MCID::HasOptionalDef,
-      0, nullptr, nullptr, OpInfo};
-
-  // Define a series of instructions with different kinds of operands and make
-  // sure that the hash function is consistent with isEqual for various
-  // combinations of them.
-  unsigned VirtualDef1 = -42;
-  unsigned VirtualDef2 = -43;
-  unsigned VirtualReg = -44;
-  unsigned SentinelReg = 0;
-  unsigned PhysicalReg = 45;
-
-  auto VD1VU = MF->CreateMachineInstr(MCID, DebugLoc());
-  VD1VU->addOperand(*MF,
-                    MachineOperand::CreateReg(VirtualDef1, /*isDef*/ true));
-  VD1VU->addOperand(*MF,
-                    MachineOperand::CreateReg(VirtualReg, /*isDef*/ false));
-
-  auto VD2VU = MF->CreateMachineInstr(MCID, DebugLoc());
-  VD2VU->addOperand(*MF,
-                    MachineOperand::CreateReg(VirtualDef2, /*isDef*/ true));
-  VD2VU->addOperand(*MF,
-                    MachineOperand::CreateReg(VirtualReg, /*isDef*/ false));
-
-  auto VD1SU = MF->CreateMachineInstr(MCID, DebugLoc());
-  VD1SU->addOperand(*MF,
-                    MachineOperand::CreateReg(VirtualDef1, /*isDef*/ true));
-  VD1SU->addOperand(*MF,
-                    MachineOperand::CreateReg(SentinelReg, /*isDef*/ false));
-
-  auto VD1SD = MF->CreateMachineInstr(MCID, DebugLoc());
-  VD1SD->addOperand(*MF,
-                    MachineOperand::CreateReg(VirtualDef1, /*isDef*/ true));
-  VD1SD->addOperand(*MF,
-                    MachineOperand::CreateReg(SentinelReg, /*isDef*/ true));
-
-  auto VD2PU = MF->CreateMachineInstr(MCID, DebugLoc());
-  VD2PU->addOperand(*MF,
-                    MachineOperand::CreateReg(VirtualDef2, /*isDef*/ true));
-  VD2PU->addOperand(*MF,
-                    MachineOperand::CreateReg(PhysicalReg, /*isDef*/ false));
-
-  auto VD2PD = MF->CreateMachineInstr(MCID, DebugLoc());
-  VD2PD->addOperand(*MF,
-                    MachineOperand::CreateReg(VirtualDef2, /*isDef*/ true));
-  VD2PD->addOperand(*MF,
-                    MachineOperand::CreateReg(PhysicalReg, /*isDef*/ true));
-
-  checkHashAndIsEqualMatch(VD1VU, VD2VU);
-  checkHashAndIsEqualMatch(VD1VU, VD1SU);
-  checkHashAndIsEqualMatch(VD1VU, VD1SD);
-  checkHashAndIsEqualMatch(VD1VU, VD2PU);
-  checkHashAndIsEqualMatch(VD1VU, VD2PD);
-
-  checkHashAndIsEqualMatch(VD2VU, VD1SU);
-  checkHashAndIsEqualMatch(VD2VU, VD1SD);
-  checkHashAndIsEqualMatch(VD2VU, VD2PU);
-  checkHashAndIsEqualMatch(VD2VU, VD2PD);
-
-  checkHashAndIsEqualMatch(VD1SU, VD1SD);
-  checkHashAndIsEqualMatch(VD1SU, VD2PU);
-  checkHashAndIsEqualMatch(VD1SU, VD2PD);
-
-  checkHashAndIsEqualMatch(VD1SD, VD2PU);
-  checkHashAndIsEqualMatch(VD1SD, VD2PD);
-
-  checkHashAndIsEqualMatch(VD2PU, VD2PD);
-}
-
-TEST(MachineInstrPrintingTest, DebugLocPrinting) {
-  LLVMContext Ctx;
-  Module Mod("Module", Ctx);
-  auto MF = createMachineFunction(Ctx, Mod);
-
-  MCOperandInfo OpInfo{0, 0, MCOI::OPERAND_REGISTER, 0};
-  MCInstrDesc MCID = {0, 1, 1, 0, 0, 0, 0, nullptr, nullptr, &OpInfo};
-
-  DIFile *DIF = DIFile::getDistinct(Ctx, "filename", "");
-  DISubprogram *DIS = DISubprogram::getDistinct(
-      Ctx, nullptr, "", "", DIF, 0, nullptr, 0, nullptr, 0, 0, DINode::FlagZero,
-      DISubprogram::SPFlagZero, nullptr);
-  DILocation *DIL = DILocation::get(Ctx, 1, 5, DIS);
-  DebugLoc DL(DIL);
-  MachineInstr *MI = MF->CreateMachineInstr(MCID, DL);
-  MI->addOperand(*MF, MachineOperand::CreateReg(0, /*isDef*/ true));
-
-  std::string str;
-  raw_string_ostream OS(str);
-  MI->print(OS, /*IsStandalone*/true, /*SkipOpers*/false, /*SkipDebugLoc*/false,
-            /*AddNewLine*/false);
-  ASSERT_TRUE(
-      StringRef(OS.str()).startswith("$noreg = UNKNOWN debug-location "));
-  ASSERT_TRUE(
-      StringRef(OS.str()).endswith("filename:1:5"));
-}
-
-TEST(MachineInstrSpan, DistanceBegin) {
-  LLVMContext Ctx;
-  Module Mod("Module", Ctx);
-  auto MF = createMachineFunction(Ctx, Mod);
-  auto MBB = MF->CreateMachineBasicBlock();
-
-  MCInstrDesc MCID = {0, 0, 0, 0, 0, 0, 0, nullptr, nullptr, nullptr};
-
-  auto MII = MBB->begin();
-  MachineInstrSpan MIS(MII, MBB);
-  ASSERT_TRUE(MIS.empty());
-
-  auto MI = MF->CreateMachineInstr(MCID, DebugLoc());
-  MBB->insert(MII, MI);
-  ASSERT_TRUE(std::distance(MIS.begin(), MII) == 1);
-}
-
-TEST(MachineInstrSpan, DistanceEnd) {
-  LLVMContext Ctx;
-  Module Mod("Module", Ctx);
-  auto MF = createMachineFunction(Ctx, Mod);
-  auto MBB = MF->CreateMachineBasicBlock();
-
-  MCInstrDesc MCID = {0, 0, 0, 0, 0, 0, 0, nullptr, nullptr, nullptr};
-
-  auto MII = MBB->end();
-  MachineInstrSpan MIS(MII, MBB);
-  ASSERT_TRUE(MIS.empty());
-
-  auto MI = MF->CreateMachineInstr(MCID, DebugLoc());
-  MBB->insert(MII, MI);
-  ASSERT_TRUE(std::distance(MIS.begin(), MII) == 1);
-}
-
-TEST(MachineInstrExtraInfo, AddExtraInfo) {
-  LLVMContext Ctx;
-  Module Mod("Module", Ctx);
-  auto MF = createMachineFunction(Ctx, Mod);
-  MCInstrDesc MCID = {0, 0, 0, 0, 0, 0, 0, nullptr, nullptr, nullptr};
-
-  auto MI = MF->CreateMachineInstr(MCID, DebugLoc());
-  auto MAI = MCAsmInfo();
-  auto MC = createMCContext(&MAI);
-  auto MMO = MF->getMachineMemOperand(MachinePointerInfo(),
-                                      MachineMemOperand::MOLoad, 8, Align(8));
-  SmallVector<MachineMemOperand *, 2> MMOs;
-  MMOs.push_back(MMO);
-  MCSymbol *Sym1 = MC->createTempSymbol("pre_label", false);
-  MCSymbol *Sym2 = MC->createTempSymbol("post_label", false);
-  MDNode *MDN = MDNode::getDistinct(Ctx, None);
-
-  ASSERT_TRUE(MI->memoperands_empty());
-  ASSERT_FALSE(MI->getPreInstrSymbol());
-  ASSERT_FALSE(MI->getPostInstrSymbol());
-  ASSERT_FALSE(MI->getHeapAllocMarker());
-
-  MI->setMemRefs(*MF, MMOs);
-  ASSERT_TRUE(MI->memoperands().size() == 1);
-  ASSERT_FALSE(MI->getPreInstrSymbol());
-  ASSERT_FALSE(MI->getPostInstrSymbol());
-  ASSERT_FALSE(MI->getHeapAllocMarker());
-
-  MI->setPreInstrSymbol(*MF, Sym1);
-  ASSERT_TRUE(MI->memoperands().size() == 1);
-  ASSERT_TRUE(MI->getPreInstrSymbol() == Sym1);
-  ASSERT_FALSE(MI->getPostInstrSymbol());
-  ASSERT_FALSE(MI->getHeapAllocMarker());
-
-  MI->setPostInstrSymbol(*MF, Sym2);
-  ASSERT_TRUE(MI->memoperands().size() == 1);
-  ASSERT_TRUE(MI->getPreInstrSymbol() == Sym1);
-  ASSERT_TRUE(MI->getPostInstrSymbol() == Sym2);
-  ASSERT_FALSE(MI->getHeapAllocMarker());
-
-  MI->setHeapAllocMarker(*MF, MDN);
-  ASSERT_TRUE(MI->memoperands().size() == 1);
-  ASSERT_TRUE(MI->getPreInstrSymbol() == Sym1);
-  ASSERT_TRUE(MI->getPostInstrSymbol() == Sym2);
-  ASSERT_TRUE(MI->getHeapAllocMarker() == MDN);
-}
-
-TEST(MachineInstrExtraInfo, ChangeExtraInfo) {
-  LLVMContext Ctx;
-  Module Mod("Module", Ctx);
-  auto MF = createMachineFunction(Ctx, Mod);
-  MCInstrDesc MCID = {0, 0, 0, 0, 0, 0, 0, nullptr, nullptr, nullptr};
-
-  auto MI = MF->CreateMachineInstr(MCID, DebugLoc());
-  auto MAI = MCAsmInfo();
-  auto MC = createMCContext(&MAI);
-  auto MMO = MF->getMachineMemOperand(MachinePointerInfo(),
-                                      MachineMemOperand::MOLoad, 8, Align(8));
-  SmallVector<MachineMemOperand *, 2> MMOs;
-  MMOs.push_back(MMO);
-  MCSymbol *Sym1 = MC->createTempSymbol("pre_label", false);
-  MCSymbol *Sym2 = MC->createTempSymbol("post_label", false);
-  MDNode *MDN = MDNode::getDistinct(Ctx, None);
-
-  MI->setMemRefs(*MF, MMOs);
-  MI->setPreInstrSymbol(*MF, Sym1);
-  MI->setPostInstrSymbol(*MF, Sym2);
-  MI->setHeapAllocMarker(*MF, MDN);
-
-  MMOs.push_back(MMO);
-
-  MI->setMemRefs(*MF, MMOs);
-  ASSERT_TRUE(MI->memoperands().size() == 2);
-  ASSERT_TRUE(MI->getPreInstrSymbol() == Sym1);
-  ASSERT_TRUE(MI->getPostInstrSymbol() == Sym2);
-  ASSERT_TRUE(MI->getHeapAllocMarker() == MDN);
-
-  MI->setPostInstrSymbol(*MF, Sym1);
-  ASSERT_TRUE(MI->memoperands().size() == 2);
-  ASSERT_TRUE(MI->getPreInstrSymbol() == Sym1);
-  ASSERT_TRUE(MI->getPostInstrSymbol() == Sym1);
-  ASSERT_TRUE(MI->getHeapAllocMarker() == MDN);
-}
-
-TEST(MachineInstrExtraInfo, RemoveExtraInfo) {
-  LLVMContext Ctx;
-  Module Mod("Module", Ctx);
-  auto MF = createMachineFunction(Ctx, Mod);
-  MCInstrDesc MCID = {0, 0, 0, 0, 0, 0, 0, nullptr, nullptr, nullptr};
-
-  auto MI = MF->CreateMachineInstr(MCID, DebugLoc());
-  auto MAI = MCAsmInfo();
-  auto MC = createMCContext(&MAI);
-  auto MMO = MF->getMachineMemOperand(MachinePointerInfo(),
-                                      MachineMemOperand::MOLoad, 8, Align(8));
-  SmallVector<MachineMemOperand *, 2> MMOs;
-  MMOs.push_back(MMO);
-  MMOs.push_back(MMO);
-  MCSymbol *Sym1 = MC->createTempSymbol("pre_label", false);
-  MCSymbol *Sym2 = MC->createTempSymbol("post_label", false);
-  MDNode *MDN = MDNode::getDistinct(Ctx, None);
-
-  MI->setMemRefs(*MF, MMOs);
-  MI->setPreInstrSymbol(*MF, Sym1);
-  MI->setPostInstrSymbol(*MF, Sym2);
-  MI->setHeapAllocMarker(*MF, MDN);
-
-  MI->setPostInstrSymbol(*MF, nullptr);
-  ASSERT_TRUE(MI->memoperands().size() == 2);
-  ASSERT_TRUE(MI->getPreInstrSymbol() == Sym1);
-  ASSERT_FALSE(MI->getPostInstrSymbol());
-  ASSERT_TRUE(MI->getHeapAllocMarker() == MDN);
-
-  MI->setHeapAllocMarker(*MF, nullptr);
-  ASSERT_TRUE(MI->memoperands().size() == 2);
-  ASSERT_TRUE(MI->getPreInstrSymbol() == Sym1);
-  ASSERT_FALSE(MI->getPostInstrSymbol());
-  ASSERT_FALSE(MI->getHeapAllocMarker());
-
-  MI->setPreInstrSymbol(*MF, nullptr);
-  ASSERT_TRUE(MI->memoperands().size() == 2);
-  ASSERT_FALSE(MI->getPreInstrSymbol());
-  ASSERT_FALSE(MI->getPostInstrSymbol());
-  ASSERT_FALSE(MI->getHeapAllocMarker());
-
-  MI->setMemRefs(*MF, {});
-  ASSERT_TRUE(MI->memoperands_empty());
-  ASSERT_FALSE(MI->getPreInstrSymbol());
-  ASSERT_FALSE(MI->getPostInstrSymbol());
-  ASSERT_FALSE(MI->getHeapAllocMarker());
-}
-
-static_assert(std::is_trivially_copyable<MCOperand>::value,
-              "trivially copyable");
-
-} // end namespace
diff --git a/gnu/llvm/llvm/unittests/CodeGen/MachineOperandTest.cpp b/gnu/llvm/llvm/unittests/CodeGen/MachineOperandTest.cpp
deleted file mode 100644
index d6808f94be8..00000000000
--- a/gnu/llvm/llvm/unittests/CodeGen/MachineOperandTest.cpp
+++ /dev/null
@@ -1,412 +0,0 @@
-//===- MachineOperandTest.cpp ---------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/CodeGen/MachineOperand.h"
-#include "llvm/ADT/ilist_node.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/InstrTypes.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/ModuleSlotTracker.h"
-#include "llvm/MC/MCContext.h"
-#include "llvm/MC/MCAsmInfo.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST(MachineOperandTest, ChangeToTargetIndexTest) {
-  // Creating a MachineOperand to change it to TargetIndex
-  MachineOperand MO = MachineOperand::CreateImm(50);
-
-  // Checking some precondition on the newly created
-  // MachineOperand.
-  ASSERT_TRUE(MO.isImm());
-  ASSERT_TRUE(MO.getImm() == 50);
-  ASSERT_FALSE(MO.isTargetIndex());
-
-  // Changing to TargetIndex with some arbitrary values
-  // for index, offset and flags.
-  MO.ChangeToTargetIndex(74, 57, 12);
-
-  // Checking that the mutation to TargetIndex happened
-  // correctly.
-  ASSERT_TRUE(MO.isTargetIndex());
-  ASSERT_TRUE(MO.getIndex() == 74);
-  ASSERT_TRUE(MO.getOffset() == 57);
-  ASSERT_TRUE(MO.getTargetFlags() == 12);
-}
-
-TEST(MachineOperandTest, PrintRegisterMask) {
-  uint32_t Dummy;
-  MachineOperand MO = MachineOperand::CreateRegMask(&Dummy);
-
-  // Checking some preconditions on the newly created
-  // MachineOperand.
-  ASSERT_TRUE(MO.isRegMask());
-  ASSERT_TRUE(MO.getRegMask() == &Dummy);
-
-  // Print a MachineOperand containing a RegMask. Here we check that without a
-  // TRI and IntrinsicInfo we still print a less detailed regmask.
-  std::string str;
-  raw_string_ostream OS(str);
-  MO.print(OS, /*TRI=*/nullptr, /*IntrinsicInfo=*/nullptr);
-  ASSERT_TRUE(OS.str() == "<regmask ...>");
-}
-
-TEST(MachineOperandTest, PrintSubReg) {
-  // Create a MachineOperand with RegNum=1 and SubReg=5.
-  MachineOperand MO = MachineOperand::CreateReg(
-      /*Reg=*/1, /*isDef=*/false, /*isImp=*/false, /*isKill=*/false,
-      /*isDead=*/false, /*isUndef=*/false, /*isEarlyClobber=*/false,
-      /*SubReg=*/5, /*isDebug=*/false, /*isInternalRead=*/false);
-
-  // Checking some preconditions on the newly created
-  // MachineOperand.
-  ASSERT_TRUE(MO.isReg());
-  ASSERT_TRUE(MO.getReg() == 1);
-  ASSERT_TRUE(MO.getSubReg() == 5);
-
-  // Print a MachineOperand containing a SubReg. Here we check that without a
-  // TRI and IntrinsicInfo we can still print the subreg index.
-  std::string str;
-  raw_string_ostream OS(str);
-  MO.print(OS, /*TRI=*/nullptr, /*IntrinsicInfo=*/nullptr);
-  ASSERT_TRUE(OS.str() == "$physreg1.subreg5");
-}
-
-TEST(MachineOperandTest, PrintCImm) {
-  LLVMContext Context;
-  APInt Int(128, UINT64_MAX);
-  ++Int;
-  ConstantInt *CImm = ConstantInt::get(Context, Int);
-  // Create a MachineOperand with an Imm=(UINT64_MAX + 1)
-  MachineOperand MO = MachineOperand::CreateCImm(CImm);
-
-  // Checking some preconditions on the newly created
-  // MachineOperand.
-  ASSERT_TRUE(MO.isCImm());
-  ASSERT_TRUE(MO.getCImm() == CImm);
-  ASSERT_TRUE(MO.getCImm()->getValue() == Int);
-
-  // Print a MachineOperand containing a SubReg. Here we check that without a
-  // TRI and IntrinsicInfo we can still print the subreg index.
-  std::string str;
-  raw_string_ostream OS(str);
-  MO.print(OS, /*TRI=*/nullptr, /*IntrinsicInfo=*/nullptr);
-  ASSERT_TRUE(OS.str() == "i128 18446744073709551616");
-}
-
-TEST(MachineOperandTest, PrintSubRegIndex) {
-  // Create a MachineOperand with an immediate and print it as a subreg index.
-  MachineOperand MO = MachineOperand::CreateImm(3);
-
-  // Checking some preconditions on the newly created
-  // MachineOperand.
-  ASSERT_TRUE(MO.isImm());
-  ASSERT_TRUE(MO.getImm() == 3);
-
-  // Print a MachineOperand containing a SubRegIdx. Here we check that without a
-  // TRI and IntrinsicInfo we can print the operand as a subreg index.
-  std::string str;
-  raw_string_ostream OS(str);
-  MachineOperand::printSubRegIdx(OS, MO.getImm(), nullptr);
-  ASSERT_TRUE(OS.str() == "%subreg.3");
-}
-
-TEST(MachineOperandTest, PrintCPI) {
-  // Create a MachineOperand with a constant pool index and print it.
-  MachineOperand MO = MachineOperand::CreateCPI(0, 8);
-
-  // Checking some preconditions on the newly created
-  // MachineOperand.
-  ASSERT_TRUE(MO.isCPI());
-  ASSERT_TRUE(MO.getIndex() == 0);
-  ASSERT_TRUE(MO.getOffset() == 8);
-
-  // Print a MachineOperand containing a constant pool index and a positive
-  // offset.
-  std::string str;
-  {
-    raw_string_ostream OS(str);
-    MO.print(OS, /*TRI=*/nullptr, /*IntrinsicInfo=*/nullptr);
-    ASSERT_TRUE(OS.str() == "%const.0 + 8");
-  }
-
-  str.clear();
-
-  MO.setOffset(-12);
-
-  // Print a MachineOperand containing a constant pool index and a negative
-  // offset.
-  {
-    raw_string_ostream OS(str);
-    MO.print(OS, /*TRI=*/nullptr, /*IntrinsicInfo=*/nullptr);
-    ASSERT_TRUE(OS.str() == "%const.0 - 12");
-  }
-}
-
-TEST(MachineOperandTest, PrintTargetIndexName) {
-  // Create a MachineOperand with a target index and print it.
-  MachineOperand MO = MachineOperand::CreateTargetIndex(0, 8);
-
-  // Checking some preconditions on the newly created
-  // MachineOperand.
-  ASSERT_TRUE(MO.isTargetIndex());
-  ASSERT_TRUE(MO.getIndex() == 0);
-  ASSERT_TRUE(MO.getOffset() == 8);
-
-  // Print a MachineOperand containing a target index and a positive offset.
-  std::string str;
-  {
-    raw_string_ostream OS(str);
-    MO.print(OS, /*TRI=*/nullptr, /*IntrinsicInfo=*/nullptr);
-    ASSERT_TRUE(OS.str() == "target-index(<unknown>) + 8");
-  }
-
-  str.clear();
-
-  MO.setOffset(-12);
-
-  // Print a MachineOperand containing a target index and a negative offset.
-  {
-    raw_string_ostream OS(str);
-    MO.print(OS, /*TRI=*/nullptr, /*IntrinsicInfo=*/nullptr);
-    ASSERT_TRUE(OS.str() == "target-index(<unknown>) - 12");
-  }
-}
-
-TEST(MachineOperandTest, PrintJumpTableIndex) {
-  // Create a MachineOperand with a jump-table index and print it.
-  MachineOperand MO = MachineOperand::CreateJTI(3);
-
-  // Checking some preconditions on the newly created
-  // MachineOperand.
-  ASSERT_TRUE(MO.isJTI());
-  ASSERT_TRUE(MO.getIndex() == 3);
-
-  // Print a MachineOperand containing a jump-table index.
-  std::string str;
-  raw_string_ostream OS(str);
-  MO.print(OS, /*TRI=*/nullptr, /*IntrinsicInfo=*/nullptr);
-  ASSERT_TRUE(OS.str() == "%jump-table.3");
-}
-
-TEST(MachineOperandTest, PrintExternalSymbol) {
-  // Create a MachineOperand with an external symbol and print it.
-  MachineOperand MO = MachineOperand::CreateES("foo");
-
-  // Checking some preconditions on the newly created
-  // MachineOperand.
-  ASSERT_TRUE(MO.isSymbol());
-  ASSERT_TRUE(MO.getSymbolName() == StringRef("foo"));
-
-  // Print a MachineOperand containing an external symbol and no offset.
-  std::string str;
-  {
-    raw_string_ostream OS(str);
-    MO.print(OS, /*TRI=*/nullptr, /*IntrinsicInfo=*/nullptr);
-    ASSERT_TRUE(OS.str() == "&foo");
-  }
-
-  str.clear();
-  MO.setOffset(12);
-
-  // Print a MachineOperand containing an external symbol and a positive offset.
-  {
-    raw_string_ostream OS(str);
-    MO.print(OS, /*TRI=*/nullptr, /*IntrinsicInfo=*/nullptr);
-    ASSERT_TRUE(OS.str() == "&foo + 12");
-  }
-
-  str.clear();
-  MO.setOffset(-12);
-
-  // Print a MachineOperand containing an external symbol and a negative offset.
-  {
-    raw_string_ostream OS(str);
-    MO.print(OS, /*TRI=*/nullptr, /*IntrinsicInfo=*/nullptr);
-    ASSERT_TRUE(OS.str() == "&foo - 12");
-  }
-}
-
-TEST(MachineOperandTest, PrintGlobalAddress) {
-  LLVMContext Ctx;
-  Module M("MachineOperandGVTest", Ctx);
-  M.getOrInsertGlobal("foo", Type::getInt32Ty(Ctx));
-
-  GlobalValue *GV = M.getNamedValue("foo");
-
-  // Create a MachineOperand with a global address and a positive offset and
-  // print it.
-  MachineOperand MO = MachineOperand::CreateGA(GV, 12);
-
-  // Checking some preconditions on the newly created
-  // MachineOperand.
-  ASSERT_TRUE(MO.isGlobal());
-  ASSERT_TRUE(MO.getGlobal() == GV);
-  ASSERT_TRUE(MO.getOffset() == 12);
-
-  std::string str;
-  // Print a MachineOperand containing a global address and a positive offset.
-  {
-    raw_string_ostream OS(str);
-    MO.print(OS, /*TRI=*/nullptr, /*IntrinsicInfo=*/nullptr);
-    ASSERT_TRUE(OS.str() == "@foo + 12");
-  }
-
-  str.clear();
-  MO.setOffset(-12);
-
-  // Print a MachineOperand containing a global address and a negative offset.
-  {
-    raw_string_ostream OS(str);
-    MO.print(OS, /*TRI=*/nullptr, /*IntrinsicInfo=*/nullptr);
-    ASSERT_TRUE(OS.str() == "@foo - 12");
-  }
-}
-
-TEST(MachineOperandTest, PrintRegisterLiveOut) {
-  // Create a MachineOperand with a register live out list and print it.
-  uint32_t Mask = 0;
-  MachineOperand MO = MachineOperand::CreateRegLiveOut(&Mask);
-
-  // Checking some preconditions on the newly created
-  // MachineOperand.
-  ASSERT_TRUE(MO.isRegLiveOut());
-  ASSERT_TRUE(MO.getRegLiveOut() == &Mask);
-
-  std::string str;
-  // Print a MachineOperand containing a register live out list without a TRI.
-  raw_string_ostream OS(str);
-  MO.print(OS, /*TRI=*/nullptr, /*IntrinsicInfo=*/nullptr);
-  ASSERT_TRUE(OS.str() == "liveout(<unknown>)");
-}
-
-TEST(MachineOperandTest, PrintMetadata) {
-  LLVMContext Ctx;
-  Module M("MachineOperandMDNodeTest", Ctx);
-  NamedMDNode *MD = M.getOrInsertNamedMetadata("namedmd");
-  ModuleSlotTracker MST(&M);
-  Metadata *MDS = MDString::get(Ctx, "foo");
-  MDNode *Node = MDNode::get(Ctx, MDS);
-  MD->addOperand(Node);
-
-  // Create a MachineOperand with a metadata and print it.
-  MachineOperand MO = MachineOperand::CreateMetadata(Node);
-
-  // Checking some preconditions on the newly created
-  // MachineOperand.
-  ASSERT_TRUE(MO.isMetadata());
-  ASSERT_TRUE(MO.getMetadata() == Node);
-
-  std::string str;
-  // Print a MachineOperand containing a metadata node.
-  raw_string_ostream OS(str);
-  MO.print(OS, MST, LLT{}, /*OpIdx*/~0U, /*PrintDef=*/false, /*IsStandalone=*/false,
-           /*ShouldPrintRegisterTies=*/false, 0, /*TRI=*/nullptr,
-           /*IntrinsicInfo=*/nullptr);
-  ASSERT_TRUE(OS.str() == "!0");
-}
-
-TEST(MachineOperandTest, PrintMCSymbol) {
-  MCAsmInfo MAI;
-  Triple T = Triple("unknown-unknown-unknown");
-  MCContext Ctx(T, &MAI, /*MRI=*/nullptr, /*MSTI=*/nullptr);
-  MCSymbol *Sym = Ctx.getOrCreateSymbol("foo");
-
-  // Create a MachineOperand with a metadata and print it.
-  MachineOperand MO = MachineOperand::CreateMCSymbol(Sym);
-
-  // Checking some preconditions on the newly created
-  // MachineOperand.
-  ASSERT_TRUE(MO.isMCSymbol());
-  ASSERT_TRUE(MO.getMCSymbol() == Sym);
-
-  std::string str;
-  // Print a MachineOperand containing a metadata node.
-  raw_string_ostream OS(str);
-  MO.print(OS, /*TRI=*/nullptr, /*IntrinsicInfo=*/nullptr);
-  ASSERT_TRUE(OS.str() == "<mcsymbol foo>");
-}
-
-TEST(MachineOperandTest, PrintCFI) {
-  // Create a MachineOperand with a CFI index but no function and print it.
-  MachineOperand MO = MachineOperand::CreateCFIIndex(8);
-
-  // Checking some preconditions on the newly created
-  // MachineOperand.
-  ASSERT_TRUE(MO.isCFIIndex());
-  ASSERT_TRUE(MO.getCFIIndex() == 8);
-
-  std::string str;
-  // Print a MachineOperand containing a CFI Index node but no machine function
-  // attached to it.
-  raw_string_ostream OS(str);
-  MO.print(OS, /*TRI=*/nullptr, /*IntrinsicInfo=*/nullptr);
-  ASSERT_TRUE(OS.str() == "<cfi directive>");
-}
-
-TEST(MachineOperandTest, PrintIntrinsicID) {
-  // Create a MachineOperand with a generic intrinsic ID.
-  MachineOperand MO = MachineOperand::CreateIntrinsicID(Intrinsic::bswap);
-
-  // Checking some preconditions on the newly created
-  // MachineOperand.
-  ASSERT_TRUE(MO.isIntrinsicID());
-  ASSERT_TRUE(MO.getIntrinsicID() == Intrinsic::bswap);
-
-  std::string str;
-  {
-    // Print a MachineOperand containing a generic intrinsic ID.
-    raw_string_ostream OS(str);
-    MO.print(OS, /*TRI=*/nullptr, /*IntrinsicInfo=*/nullptr);
-    ASSERT_TRUE(OS.str() == "intrinsic(@llvm.bswap)");
-  }
-
-  str.clear();
-  // Set a target-specific intrinsic.
-  MO = MachineOperand::CreateIntrinsicID((Intrinsic::ID)-1);
-  {
-    // Print a MachineOperand containing a target-specific intrinsic ID but not
-    // IntrinsicInfo.
-    raw_string_ostream OS(str);
-    MO.print(OS, /*TRI=*/nullptr, /*IntrinsicInfo=*/nullptr);
-    ASSERT_TRUE(OS.str() == "intrinsic(4294967295)");
-  }
-}
-
-TEST(MachineOperandTest, PrintPredicate) {
-  // Create a MachineOperand with a generic intrinsic ID.
-  MachineOperand MO = MachineOperand::CreatePredicate(CmpInst::ICMP_EQ);
-
-  // Checking some preconditions on the newly created
-  // MachineOperand.
-  ASSERT_TRUE(MO.isPredicate());
-  ASSERT_TRUE(MO.getPredicate() == CmpInst::ICMP_EQ);
-
-  std::string str;
-  // Print a MachineOperand containing a int predicate ICMP_EQ.
-  raw_string_ostream OS(str);
-  MO.print(OS, /*TRI=*/nullptr, /*IntrinsicInfo=*/nullptr);
-  ASSERT_TRUE(OS.str() == "intpred(eq)");
-}
-
-TEST(MachineOperandTest, HashValue) {
-  char SymName1[] = "test";
-  char SymName2[] = "test";
-  MachineOperand MO1 = MachineOperand::CreateES(SymName1);
-  MachineOperand MO2 = MachineOperand::CreateES(SymName2);
-  ASSERT_NE(SymName1, SymName2);
-  ASSERT_EQ(hash_value(MO1), hash_value(MO2));
-  ASSERT_TRUE(MO1.isIdenticalTo(MO2));
-}
-
-} // end namespace
diff --git a/gnu/llvm/llvm/unittests/CodeGen/PassManagerTest.cpp b/gnu/llvm/llvm/unittests/CodeGen/PassManagerTest.cpp
deleted file mode 100644
index 7fe835d5a26..00000000000
--- a/gnu/llvm/llvm/unittests/CodeGen/PassManagerTest.cpp
+++ /dev/null
@@ -1,309 +0,0 @@
-//===- llvm/unittest/CodeGen/PassManager.cpp - PassManager tests ----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/Triple.h"
-#include "llvm/Analysis/CGSCCPassManager.h"
-#include "llvm/Analysis/LoopAnalysisManager.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/CodeGen/MachineModuleInfo.h"
-#include "llvm/CodeGen/MachinePassManager.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Passes/PassBuilder.h"
-#include "llvm/Support/Host.h"
-#include "llvm/Support/SourceMgr.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "llvm/Target/TargetMachine.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-class TestFunctionAnalysis : public AnalysisInfoMixin<TestFunctionAnalysis> {
-public:
-  struct Result {
-    Result(int Count) : InstructionCount(Count) {}
-    int InstructionCount;
-  };
-
-  /// Run the analysis pass over the function and return a result.
-  Result run(Function &F, FunctionAnalysisManager &AM) {
-    int Count = 0;
-    for (Function::iterator BBI = F.begin(), BBE = F.end(); BBI != BBE; ++BBI)
-      for (BasicBlock::iterator II = BBI->begin(), IE = BBI->end(); II != IE;
-           ++II)
-        ++Count;
-    return Result(Count);
-  }
-
-private:
-  friend AnalysisInfoMixin<TestFunctionAnalysis>;
-  static AnalysisKey Key;
-};
-
-AnalysisKey TestFunctionAnalysis::Key;
-
-class TestMachineFunctionAnalysis
-    : public AnalysisInfoMixin<TestMachineFunctionAnalysis> {
-public:
-  struct Result {
-    Result(int Count) : InstructionCount(Count) {}
-    int InstructionCount;
-  };
-
-  /// Run the analysis pass over the machine function and return a result.
-  Result run(MachineFunction &MF, MachineFunctionAnalysisManager::Base &AM) {
-    auto &MFAM = static_cast<MachineFunctionAnalysisManager &>(AM);
-    // Query function analysis result.
-    TestFunctionAnalysis::Result &FAR =
-        MFAM.getResult<TestFunctionAnalysis>(MF.getFunction());
-    // + 5
-    return FAR.InstructionCount;
-  }
-
-private:
-  friend AnalysisInfoMixin<TestMachineFunctionAnalysis>;
-  static AnalysisKey Key;
-};
-
-AnalysisKey TestMachineFunctionAnalysis::Key;
-
-const std::string DoInitErrMsg = "doInitialization failed";
-const std::string DoFinalErrMsg = "doFinalization failed";
-
-struct TestMachineFunctionPass : public PassInfoMixin<TestMachineFunctionPass> {
-  TestMachineFunctionPass(int &Count, std::vector<int> &BeforeInitialization,
-                          std::vector<int> &BeforeFinalization,
-                          std::vector<int> &MachineFunctionPassCount)
-      : Count(Count), BeforeInitialization(BeforeInitialization),
-        BeforeFinalization(BeforeFinalization),
-        MachineFunctionPassCount(MachineFunctionPassCount) {}
-
-  Error doInitialization(Module &M, MachineFunctionAnalysisManager &MFAM) {
-    // Force doInitialization fail by starting with big `Count`.
-    if (Count > 10000)
-      return make_error<StringError>(DoInitErrMsg, inconvertibleErrorCode());
-
-    // + 1
-    ++Count;
-    BeforeInitialization.push_back(Count);
-    return Error::success();
-  }
-  Error doFinalization(Module &M, MachineFunctionAnalysisManager &MFAM) {
-    // Force doFinalization fail by starting with big `Count`.
-    if (Count > 1000)
-      return make_error<StringError>(DoFinalErrMsg, inconvertibleErrorCode());
-
-    // + 1
-    ++Count;
-    BeforeFinalization.push_back(Count);
-    return Error::success();
-  }
-
-  PreservedAnalyses run(MachineFunction &MF,
-                        MachineFunctionAnalysisManager &MFAM) {
-    // Query function analysis result.
-    TestFunctionAnalysis::Result &FAR =
-        MFAM.getResult<TestFunctionAnalysis>(MF.getFunction());
-    // 3 + 1 + 1 = 5
-    Count += FAR.InstructionCount;
-
-    // Query module analysis result.
-    MachineModuleInfo &MMI =
-        MFAM.getResult<MachineModuleAnalysis>(*MF.getFunction().getParent());
-    // 1 + 1 + 1 = 3
-    Count += (MMI.getModule() == MF.getFunction().getParent());
-
-    // Query machine function analysis result.
-    TestMachineFunctionAnalysis::Result &MFAR =
-        MFAM.getResult<TestMachineFunctionAnalysis>(MF);
-    // 3 + 1 + 1 = 5
-    Count += MFAR.InstructionCount;
-
-    MachineFunctionPassCount.push_back(Count);
-
-    return PreservedAnalyses::none();
-  }
-
-  int &Count;
-  std::vector<int> &BeforeInitialization;
-  std::vector<int> &BeforeFinalization;
-  std::vector<int> &MachineFunctionPassCount;
-};
-
-struct TestMachineModulePass : public PassInfoMixin<TestMachineModulePass> {
-  TestMachineModulePass(int &Count, std::vector<int> &MachineModulePassCount)
-      : Count(Count), MachineModulePassCount(MachineModulePassCount) {}
-
-  Error run(Module &M, MachineFunctionAnalysisManager &MFAM) {
-    MachineModuleInfo &MMI = MFAM.getResult<MachineModuleAnalysis>(M);
-    // + 1
-    Count += (MMI.getModule() == &M);
-    MachineModulePassCount.push_back(Count);
-    return Error::success();
-  }
-
-  PreservedAnalyses run(MachineFunction &MF,
-                        MachineFunctionAnalysisManager &AM) {
-    llvm_unreachable(
-        "This should never be reached because this is machine module pass");
-  }
-
-  int &Count;
-  std::vector<int> &MachineModulePassCount;
-};
-
-std::unique_ptr<Module> parseIR(LLVMContext &Context, const char *IR) {
-  SMDiagnostic Err;
-  return parseAssemblyString(IR, Err, Context);
-}
-
-class PassManagerTest : public ::testing::Test {
-protected:
-  LLVMContext Context;
-  std::unique_ptr<Module> M;
-  std::unique_ptr<TargetMachine> TM;
-
-public:
-  PassManagerTest()
-      : M(parseIR(Context, "define void @f() {\n"
-                           "entry:\n"
-                           "  call void @g()\n"
-                           "  call void @h()\n"
-                           "  ret void\n"
-                           "}\n"
-                           "define void @g() {\n"
-                           "  ret void\n"
-                           "}\n"
-                           "define void @h() {\n"
-                           "  ret void\n"
-                           "}\n")) {
-    // MachineModuleAnalysis needs a TargetMachine instance.
-    llvm::InitializeAllTargets();
-
-    std::string TripleName = Triple::normalize(sys::getDefaultTargetTriple());
-    std::string Error;
-    const Target *TheTarget =
-        TargetRegistry::lookupTarget(TripleName, Error);
-    if (!TheTarget)
-      return;
-
-    TargetOptions Options;
-    TM.reset(TheTarget->createTargetMachine(TripleName, "", "",
-                                            Options, None));
-  }
-};
-
-TEST_F(PassManagerTest, Basic) {
-  if (!TM)
-    GTEST_SKIP();
-
-  LLVMTargetMachine *LLVMTM = static_cast<LLVMTargetMachine *>(TM.get());
-  M->setDataLayout(TM->createDataLayout());
-
-  LoopAnalysisManager LAM;
-  FunctionAnalysisManager FAM;
-  CGSCCAnalysisManager CGAM;
-  ModuleAnalysisManager MAM;
-  PassBuilder PB(TM.get());
-  PB.registerModuleAnalyses(MAM);
-  PB.registerFunctionAnalyses(FAM);
-  PB.crossRegisterProxies(LAM, FAM, CGAM, MAM);
-
-  FAM.registerPass([&] { return TestFunctionAnalysis(); });
-  FAM.registerPass([&] { return PassInstrumentationAnalysis(); });
-  MAM.registerPass([&] { return MachineModuleAnalysis(LLVMTM); });
-  MAM.registerPass([&] { return PassInstrumentationAnalysis(); });
-
-  MachineFunctionAnalysisManager MFAM;
-  {
-    // Test move assignment.
-    MachineFunctionAnalysisManager NestedMFAM(FAM, MAM);
-    NestedMFAM.registerPass([&] { return PassInstrumentationAnalysis(); });
-    NestedMFAM.registerPass([&] { return TestMachineFunctionAnalysis(); });
-    MFAM = std::move(NestedMFAM);
-  }
-
-  int Count = 0;
-  std::vector<int> BeforeInitialization[2];
-  std::vector<int> BeforeFinalization[2];
-  std::vector<int> TestMachineFunctionCount[2];
-  std::vector<int> TestMachineModuleCount[2];
-
-  MachineFunctionPassManager MFPM;
-  {
-    // Test move assignment.
-    MachineFunctionPassManager NestedMFPM;
-    NestedMFPM.addPass(TestMachineModulePass(Count, TestMachineModuleCount[0]));
-    NestedMFPM.addPass(TestMachineFunctionPass(Count, BeforeInitialization[0],
-                                               BeforeFinalization[0],
-                                               TestMachineFunctionCount[0]));
-    NestedMFPM.addPass(TestMachineModulePass(Count, TestMachineModuleCount[1]));
-    NestedMFPM.addPass(TestMachineFunctionPass(Count, BeforeInitialization[1],
-                                               BeforeFinalization[1],
-                                               TestMachineFunctionCount[1]));
-    MFPM = std::move(NestedMFPM);
-  }
-
-  ASSERT_FALSE(errorToBool(MFPM.run(*M, MFAM)));
-
-  // Check first machine module pass
-  EXPECT_EQ(1u, TestMachineModuleCount[0].size());
-  EXPECT_EQ(3, TestMachineModuleCount[0][0]);
-
-  // Check first machine function pass
-  EXPECT_EQ(1u, BeforeInitialization[0].size());
-  EXPECT_EQ(1, BeforeInitialization[0][0]);
-  EXPECT_EQ(3u, TestMachineFunctionCount[0].size());
-  EXPECT_EQ(10, TestMachineFunctionCount[0][0]);
-  EXPECT_EQ(13, TestMachineFunctionCount[0][1]);
-  EXPECT_EQ(16, TestMachineFunctionCount[0][2]);
-  EXPECT_EQ(1u, BeforeFinalization[0].size());
-  EXPECT_EQ(31, BeforeFinalization[0][0]);
-
-  // Check second machine module pass
-  EXPECT_EQ(1u, TestMachineModuleCount[1].size());
-  EXPECT_EQ(17, TestMachineModuleCount[1][0]);
-
-  // Check second machine function pass
-  EXPECT_EQ(1u, BeforeInitialization[1].size());
-  EXPECT_EQ(2, BeforeInitialization[1][0]);
-  EXPECT_EQ(3u, TestMachineFunctionCount[1].size());
-  EXPECT_EQ(24, TestMachineFunctionCount[1][0]);
-  EXPECT_EQ(27, TestMachineFunctionCount[1][1]);
-  EXPECT_EQ(30, TestMachineFunctionCount[1][2]);
-  EXPECT_EQ(1u, BeforeFinalization[1].size());
-  EXPECT_EQ(32, BeforeFinalization[1][0]);
-
-  EXPECT_EQ(32, Count);
-
-  // doInitialization returns error
-  Count = 10000;
-  MFPM.addPass(TestMachineFunctionPass(Count, BeforeInitialization[1],
-                                       BeforeFinalization[1],
-                                       TestMachineFunctionCount[1]));
-  std::string Message;
-  llvm::handleAllErrors(MFPM.run(*M, MFAM), [&](llvm::StringError &Error) {
-    Message = Error.getMessage();
-  });
-  EXPECT_EQ(Message, DoInitErrMsg);
-
-  // doFinalization returns error
-  Count = 1000;
-  MFPM.addPass(TestMachineFunctionPass(Count, BeforeInitialization[1],
-                                       BeforeFinalization[1],
-                                       TestMachineFunctionCount[1]));
-  llvm::handleAllErrors(MFPM.run(*M, MFAM), [&](llvm::StringError &Error) {
-    Message = Error.getMessage();
-  });
-  EXPECT_EQ(Message, DoFinalErrMsg);
-}
-
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/CodeGen/ScalableVectorMVTsTest.cpp b/gnu/llvm/llvm/unittests/CodeGen/ScalableVectorMVTsTest.cpp
deleted file mode 100644
index 1f6d2385918..00000000000
--- a/gnu/llvm/llvm/unittests/CodeGen/ScalableVectorMVTsTest.cpp
+++ /dev/null
@@ -1,187 +0,0 @@
-//===-------- llvm/unittest/CodeGen/ScalableVectorMVTsTest.cpp ------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/CodeGen/ValueTypes.h"
-#include "llvm/IR/DerivedTypes.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/Support/MachineValueType.h"
-#include "llvm/Support/TypeSize.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST(ScalableVectorMVTsTest, IntegerMVTs) {
-  for (MVT VecTy : MVT::integer_scalable_vector_valuetypes()) {
-    ASSERT_TRUE(VecTy.isValid());
-    ASSERT_TRUE(VecTy.isInteger());
-    ASSERT_TRUE(VecTy.isVector());
-    ASSERT_TRUE(VecTy.isScalableVector());
-    ASSERT_TRUE(VecTy.getScalarType().isValid());
-
-    ASSERT_FALSE(VecTy.isFloatingPoint());
-  }
-}
-
-TEST(ScalableVectorMVTsTest, FloatMVTs) {
-  for (MVT VecTy : MVT::fp_scalable_vector_valuetypes()) {
-    ASSERT_TRUE(VecTy.isValid());
-    ASSERT_TRUE(VecTy.isFloatingPoint());
-    ASSERT_TRUE(VecTy.isVector());
-    ASSERT_TRUE(VecTy.isScalableVector());
-    ASSERT_TRUE(VecTy.getScalarType().isValid());
-
-    ASSERT_FALSE(VecTy.isInteger());
-  }
-}
-
-TEST(ScalableVectorMVTsTest, HelperFuncs) {
-  LLVMContext Ctx;
-
-  // Create with scalable flag
-  EVT Vnx4i32 = EVT::getVectorVT(Ctx, MVT::i32, 4, /*Scalable=*/true);
-  ASSERT_TRUE(Vnx4i32.isScalableVector());
-
-  // Create with separate llvm::ElementCount
-  auto EltCnt = ElementCount::getScalable(2);
-  EVT Vnx2i32 = EVT::getVectorVT(Ctx, MVT::i32, EltCnt);
-  ASSERT_TRUE(Vnx2i32.isScalableVector());
-
-  // Create with inline llvm::ElementCount
-  EVT Vnx2i64 = EVT::getVectorVT(Ctx, MVT::i64, ElementCount::getScalable(2));
-  ASSERT_TRUE(Vnx2i64.isScalableVector());
-
-  // Check that changing scalar types/element count works
-  EXPECT_EQ(Vnx2i32.widenIntegerVectorElementType(Ctx), Vnx2i64);
-  EXPECT_EQ(Vnx4i32.getHalfNumVectorElementsVT(Ctx), Vnx2i32);
-
-  // Check that operators work
-  EXPECT_EQ(EVT::getVectorVT(Ctx, MVT::i64, EltCnt * 2), MVT::nxv4i64);
-  EXPECT_EQ(EVT::getVectorVT(Ctx, MVT::i64, EltCnt.divideCoefficientBy(2)),
-            MVT::nxv1i64);
-
-  // Check that float->int conversion works
-  EVT Vnx2f64 = EVT::getVectorVT(Ctx, MVT::f64, ElementCount::getScalable(2));
-  EXPECT_EQ(Vnx2f64.changeTypeToInteger(), Vnx2i64);
-
-  // Check fields inside llvm::ElementCount
-  EltCnt = Vnx4i32.getVectorElementCount();
-  EXPECT_EQ(EltCnt.getKnownMinValue(), 4U);
-  ASSERT_TRUE(EltCnt.isScalable());
-
-  // Check that fixed-length vector types aren't scalable.
-  EVT V8i32 = EVT::getVectorVT(Ctx, MVT::i32, 8);
-  ASSERT_FALSE(V8i32.isScalableVector());
-  EVT V4f64 = EVT::getVectorVT(Ctx, MVT::f64, ElementCount::getFixed(4));
-  ASSERT_FALSE(V4f64.isScalableVector());
-
-  // Check that llvm::ElementCount works for fixed-length types.
-  EltCnt = V8i32.getVectorElementCount();
-  EXPECT_EQ(EltCnt.getKnownMinValue(), 8U);
-  ASSERT_FALSE(EltCnt.isScalable());
-}
-
-TEST(ScalableVectorMVTsTest, IRToVTTranslation) {
-  LLVMContext Ctx;
-
-  Type *Int64Ty = Type::getInt64Ty(Ctx);
-  VectorType *ScV8Int64Ty =
-      VectorType::get(Int64Ty, ElementCount::getScalable(8));
-
-  // Check that we can map a scalable IR type to an MVT 
-  MVT Mnxv8i64 = MVT::getVT(ScV8Int64Ty);
-  ASSERT_TRUE(Mnxv8i64.isScalableVector());
-  ASSERT_EQ(ScV8Int64Ty->getElementCount(), Mnxv8i64.getVectorElementCount());
-  ASSERT_EQ(MVT::getVT(ScV8Int64Ty->getElementType()),
-            Mnxv8i64.getScalarType());
-
-  // Check that we can map a scalable IR type to an EVT
-  EVT Enxv8i64 = EVT::getEVT(ScV8Int64Ty);
-  ASSERT_TRUE(Enxv8i64.isScalableVector());
-  ASSERT_EQ(ScV8Int64Ty->getElementCount(), Enxv8i64.getVectorElementCount());
-  ASSERT_EQ(EVT::getEVT(ScV8Int64Ty->getElementType()),
-            Enxv8i64.getScalarType());
-}
-
-TEST(ScalableVectorMVTsTest, VTToIRTranslation) {
-  LLVMContext Ctx;
-
-  EVT Enxv4f64 = EVT::getVectorVT(Ctx, MVT::f64, ElementCount::getScalable(4));
-
-  Type *Ty = Enxv4f64.getTypeForEVT(Ctx);
-  VectorType *ScV4Float64Ty = cast<VectorType>(Ty);
-  ASSERT_TRUE(isa<ScalableVectorType>(ScV4Float64Ty));
-  ASSERT_EQ(Enxv4f64.getVectorElementCount(), ScV4Float64Ty->getElementCount());
-  ASSERT_EQ(Enxv4f64.getScalarType().getTypeForEVT(Ctx),
-            ScV4Float64Ty->getElementType());
-}
-
-TEST(ScalableVectorMVTsTest, SizeQueries) {
-  LLVMContext Ctx;
-
-  EVT nxv4i32 = EVT::getVectorVT(Ctx, MVT::i32, 4, /*Scalable=*/ true);
-  EVT nxv2i32 = EVT::getVectorVT(Ctx, MVT::i32, 2, /*Scalable=*/ true);
-  EVT nxv2i64 = EVT::getVectorVT(Ctx, MVT::i64, 2, /*Scalable=*/ true);
-  EVT nxv2f64 = EVT::getVectorVT(Ctx, MVT::f64, 2, /*Scalable=*/ true);
-
-  EVT v4i32 = EVT::getVectorVT(Ctx, MVT::i32, 4);
-  EVT v2i32 = EVT::getVectorVT(Ctx, MVT::i32, 2);
-  EVT v2i64 = EVT::getVectorVT(Ctx, MVT::i64, 2);
-  EVT v2f64 = EVT::getVectorVT(Ctx, MVT::f64, 2);
-
-  // Check equivalence and ordering on scalable types.
-  EXPECT_EQ(nxv4i32.getSizeInBits(), nxv2i64.getSizeInBits());
-  EXPECT_EQ(nxv2f64.getSizeInBits(), nxv2i64.getSizeInBits());
-  EXPECT_NE(nxv2i32.getSizeInBits(), nxv4i32.getSizeInBits());
-  EXPECT_LT(nxv2i32.getSizeInBits().getKnownMinSize(),
-            nxv2i64.getSizeInBits().getKnownMinSize());
-  EXPECT_LE(nxv4i32.getSizeInBits().getKnownMinSize(),
-            nxv2i64.getSizeInBits().getKnownMinSize());
-  EXPECT_GT(nxv4i32.getSizeInBits().getKnownMinSize(),
-            nxv2i32.getSizeInBits().getKnownMinSize());
-  EXPECT_GE(nxv2i64.getSizeInBits().getKnownMinSize(),
-            nxv4i32.getSizeInBits().getKnownMinSize());
-
-  // Check equivalence and ordering on fixed types.
-  EXPECT_EQ(v4i32.getSizeInBits(), v2i64.getSizeInBits());
-  EXPECT_EQ(v2f64.getSizeInBits(), v2i64.getSizeInBits());
-  EXPECT_NE(v2i32.getSizeInBits(), v4i32.getSizeInBits());
-  EXPECT_LT(v2i32.getFixedSizeInBits(), v2i64.getFixedSizeInBits());
-  EXPECT_LE(v4i32.getFixedSizeInBits(), v2i64.getFixedSizeInBits());
-  EXPECT_GT(v4i32.getFixedSizeInBits(), v2i32.getFixedSizeInBits());
-  EXPECT_GE(v2i64.getFixedSizeInBits(), v4i32.getFixedSizeInBits());
-
-  // Check that scalable and non-scalable types with the same minimum size
-  // are not considered equal.
-  ASSERT_TRUE(v4i32.getSizeInBits() != nxv4i32.getSizeInBits());
-  ASSERT_FALSE(v2i64.getSizeInBits() == nxv2f64.getSizeInBits());
-
-  // Check that we can obtain a known-exact size from a non-scalable type.
-  EXPECT_EQ(v4i32.getFixedSizeInBits(), 128U);
-  EXPECT_EQ(v2i64.getFixedSizeInBits(), 128U);
-
-  // Check that we can query the known minimum size for both scalable and
-  // fixed length types.
-  EXPECT_EQ(nxv2i32.getSizeInBits().getKnownMinSize(), 64U);
-  EXPECT_EQ(nxv2f64.getSizeInBits().getKnownMinSize(), 128U);
-  EXPECT_EQ(v2i32.getSizeInBits().getKnownMinSize(),
-            nxv2i32.getSizeInBits().getKnownMinSize());
-
-  // Check scalable property.
-  ASSERT_FALSE(v4i32.getSizeInBits().isScalable());
-  ASSERT_TRUE(nxv4i32.getSizeInBits().isScalable());
-
-  // Check convenience size scaling methods.
-  EXPECT_EQ(v2i32.getSizeInBits() * 2, v4i32.getSizeInBits());
-  EXPECT_EQ(2 * nxv2i32.getSizeInBits(), nxv4i32.getSizeInBits());
-  EXPECT_EQ(nxv2f64.getSizeInBits().divideCoefficientBy(2),
-            nxv2i32.getSizeInBits());
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/CodeGen/SelectionDAGAddressAnalysisTest.cpp b/gnu/llvm/llvm/unittests/CodeGen/SelectionDAGAddressAnalysisTest.cpp
deleted file mode 100644
index b7c51997158..00000000000
--- a/gnu/llvm/llvm/unittests/CodeGen/SelectionDAGAddressAnalysisTest.cpp
+++ /dev/null
@@ -1,321 +0,0 @@
-//===- llvm/unittest/CodeGen/SelectionDAGAddressAnalysisTest.cpp  ---------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/CodeGen/SelectionDAGAddressAnalysis.h"
-#include "llvm/Analysis/MemoryLocation.h"
-#include "llvm/Analysis/OptimizationRemarkEmitter.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/CodeGen/MachineModuleInfo.h"
-#include "llvm/CodeGen/SelectionDAG.h"
-#include "llvm/CodeGen/TargetLowering.h"
-#include "llvm/Support/SourceMgr.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "llvm/Target/TargetMachine.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-
-class SelectionDAGAddressAnalysisTest : public testing::Test {
-protected:
-  static void SetUpTestCase() {
-    InitializeAllTargets();
-    InitializeAllTargetMCs();
-  }
-
-  void SetUp() override {
-    StringRef Assembly = "@g = global i32 0\n"
-                         "define i32 @f() {\n"
-                         "  %1 = load i32, i32* @g\n"
-                         "  ret i32 %1\n"
-                         "}";
-
-    Triple TargetTriple("aarch64--");
-    std::string Error;
-    const Target *T = TargetRegistry::lookupTarget("", TargetTriple, Error);
-    // FIXME: These tests do not depend on AArch64 specifically, but we have to
-    // initialize a target. A skeleton Target for unittests would allow us to
-    // always run these tests.
-    if (!T)
-      GTEST_SKIP();
-
-    TargetOptions Options;
-    TM = std::unique_ptr<LLVMTargetMachine>(static_cast<LLVMTargetMachine *>(
-        T->createTargetMachine("AArch64", "", "+sve", Options, None, None,
-                               CodeGenOpt::Aggressive)));
-    if (!TM)
-      GTEST_SKIP();
-
-    SMDiagnostic SMError;
-    M = parseAssemblyString(Assembly, SMError, Context);
-    if (!M)
-      report_fatal_error(SMError.getMessage());
-    M->setDataLayout(TM->createDataLayout());
-
-    F = M->getFunction("f");
-    if (!F)
-      report_fatal_error("F?");
-    G = M->getGlobalVariable("g");
-    if (!G)
-      report_fatal_error("G?");
-
-    MachineModuleInfo MMI(TM.get());
-
-    MF = std::make_unique<MachineFunction>(*F, *TM, *TM->getSubtargetImpl(*F),
-                                           0, MMI);
-
-    DAG = std::make_unique<SelectionDAG>(*TM, CodeGenOpt::None);
-    if (!DAG)
-      report_fatal_error("DAG?");
-    OptimizationRemarkEmitter ORE(F);
-    DAG->init(*MF, ORE, nullptr, nullptr, nullptr, nullptr, nullptr);
-  }
-
-  TargetLoweringBase::LegalizeTypeAction getTypeAction(EVT VT) {
-    return DAG->getTargetLoweringInfo().getTypeAction(Context, VT);
-  }
-
-  EVT getTypeToTransformTo(EVT VT) {
-    return DAG->getTargetLoweringInfo().getTypeToTransformTo(Context, VT);
-  }
-
-  LLVMContext Context;
-  std::unique_ptr<LLVMTargetMachine> TM;
-  std::unique_ptr<Module> M;
-  Function *F;
-  GlobalVariable *G;
-  std::unique_ptr<MachineFunction> MF;
-  std::unique_ptr<SelectionDAG> DAG;
-};
-
-TEST_F(SelectionDAGAddressAnalysisTest, sameFrameObject) {
-  SDLoc Loc;
-  auto Int8VT = EVT::getIntegerVT(Context, 8);
-  auto VecVT = EVT::getVectorVT(Context, Int8VT, 4);
-  SDValue FIPtr = DAG->CreateStackTemporary(VecVT);
-  int FI = cast<FrameIndexSDNode>(FIPtr.getNode())->getIndex();
-  MachinePointerInfo PtrInfo = MachinePointerInfo::getFixedStack(*MF, FI);
-  TypeSize Offset = TypeSize::Fixed(0);
-  SDValue Value = DAG->getConstant(0, Loc, VecVT);
-  SDValue Index = DAG->getMemBasePlusOffset(FIPtr, Offset, Loc);
-  SDValue Store = DAG->getStore(DAG->getEntryNode(), Loc, Value, Index,
-                                PtrInfo.getWithOffset(Offset));
-  Optional<int64_t> NumBytes = MemoryLocation::getSizeOrUnknown(
-      cast<StoreSDNode>(Store)->getMemoryVT().getStoreSize());
-
-  bool IsAlias;
-  bool IsValid = BaseIndexOffset::computeAliasing(
-      Store.getNode(), NumBytes, Store.getNode(), NumBytes, *DAG, IsAlias);
-
-  EXPECT_TRUE(IsValid);
-  EXPECT_TRUE(IsAlias);
-}
-
-TEST_F(SelectionDAGAddressAnalysisTest, noAliasingFrameObjects) {
-  SDLoc Loc;
-  auto Int8VT = EVT::getIntegerVT(Context, 8);
-  // <4 x i8>
-  auto VecVT = EVT::getVectorVT(Context, Int8VT, 4);
-  // <2 x i8>
-  auto SubVecVT = EVT::getVectorVT(Context, Int8VT, 2);
-  SDValue FIPtr = DAG->CreateStackTemporary(VecVT);
-  int FI = cast<FrameIndexSDNode>(FIPtr.getNode())->getIndex();
-  MachinePointerInfo PtrInfo = MachinePointerInfo::getFixedStack(*MF, FI);
-  SDValue Value = DAG->getConstant(0, Loc, SubVecVT);
-  TypeSize Offset0 = TypeSize::Fixed(0);
-  TypeSize Offset1 = SubVecVT.getStoreSize();
-  SDValue Index0 = DAG->getMemBasePlusOffset(FIPtr, Offset0, Loc);
-  SDValue Index1 = DAG->getMemBasePlusOffset(FIPtr, Offset1, Loc);
-  SDValue Store0 = DAG->getStore(DAG->getEntryNode(), Loc, Value, Index0,
-                                 PtrInfo.getWithOffset(Offset0));
-  SDValue Store1 = DAG->getStore(DAG->getEntryNode(), Loc, Value, Index1,
-                                 PtrInfo.getWithOffset(Offset1));
-  Optional<int64_t> NumBytes0 = MemoryLocation::getSizeOrUnknown(
-      cast<StoreSDNode>(Store0)->getMemoryVT().getStoreSize());
-  Optional<int64_t> NumBytes1 = MemoryLocation::getSizeOrUnknown(
-      cast<StoreSDNode>(Store1)->getMemoryVT().getStoreSize());
-
-  bool IsAlias;
-  bool IsValid = BaseIndexOffset::computeAliasing(
-      Store0.getNode(), NumBytes0, Store1.getNode(), NumBytes1, *DAG, IsAlias);
-
-  EXPECT_TRUE(IsValid);
-  EXPECT_FALSE(IsAlias);
-}
-
-TEST_F(SelectionDAGAddressAnalysisTest, unknownSizeFrameObjects) {
-  SDLoc Loc;
-  auto Int8VT = EVT::getIntegerVT(Context, 8);
-  // <vscale x 4 x i8>
-  auto VecVT = EVT::getVectorVT(Context, Int8VT, 4, true);
-  // <vscale x 2 x i8>
-  auto SubVecVT = EVT::getVectorVT(Context, Int8VT, 2, true);
-  SDValue FIPtr = DAG->CreateStackTemporary(VecVT);
-  int FI = cast<FrameIndexSDNode>(FIPtr.getNode())->getIndex();
-  MachinePointerInfo PtrInfo = MachinePointerInfo::getFixedStack(*MF, FI);
-  SDValue Value = DAG->getConstant(0, Loc, SubVecVT);
-  TypeSize Offset1 = SubVecVT.getStoreSize();
-  SDValue Index1 = DAG->getMemBasePlusOffset(FIPtr, Offset1, Loc);
-  SDValue Store0 =
-      DAG->getStore(DAG->getEntryNode(), Loc, Value, FIPtr, PtrInfo);
-  SDValue Store1 = DAG->getStore(DAG->getEntryNode(), Loc, Value, Index1,
-                                 MachinePointerInfo(PtrInfo.getAddrSpace()));
-  Optional<int64_t> NumBytes0 = MemoryLocation::getSizeOrUnknown(
-      cast<StoreSDNode>(Store0)->getMemoryVT().getStoreSize());
-  Optional<int64_t> NumBytes1 = MemoryLocation::getSizeOrUnknown(
-      cast<StoreSDNode>(Store1)->getMemoryVT().getStoreSize());
-
-  bool IsAlias;
-  bool IsValid = BaseIndexOffset::computeAliasing(
-      Store0.getNode(), NumBytes0, Store1.getNode(), NumBytes1, *DAG, IsAlias);
-
-  EXPECT_FALSE(IsValid);
-}
-
-TEST_F(SelectionDAGAddressAnalysisTest, globalWithFrameObject) {
-  SDLoc Loc;
-  auto Int8VT = EVT::getIntegerVT(Context, 8);
-  // <vscale x 4 x i8>
-  auto VecVT = EVT::getVectorVT(Context, Int8VT, 4, true);
-  SDValue FIPtr = DAG->CreateStackTemporary(VecVT);
-  int FI = cast<FrameIndexSDNode>(FIPtr.getNode())->getIndex();
-  MachinePointerInfo PtrInfo = MachinePointerInfo::getFixedStack(*MF, FI);
-  SDValue Value = DAG->getConstant(0, Loc, VecVT);
-  TypeSize Offset = TypeSize::Fixed(0);
-  SDValue Index = DAG->getMemBasePlusOffset(FIPtr, Offset, Loc);
-  SDValue Store = DAG->getStore(DAG->getEntryNode(), Loc, Value, Index,
-                                PtrInfo.getWithOffset(Offset));
-  Optional<int64_t> NumBytes = MemoryLocation::getSizeOrUnknown(
-      cast<StoreSDNode>(Store)->getMemoryVT().getStoreSize());
-  EVT GTy = DAG->getTargetLoweringInfo().getValueType(DAG->getDataLayout(),
-                                                      G->getType());
-  SDValue GValue = DAG->getConstant(0, Loc, GTy);
-  SDValue GAddr = DAG->getGlobalAddress(G, Loc, GTy);
-  SDValue GStore = DAG->getStore(DAG->getEntryNode(), Loc, GValue, GAddr,
-                                 MachinePointerInfo(G, 0));
-  Optional<int64_t> GNumBytes = MemoryLocation::getSizeOrUnknown(
-      cast<StoreSDNode>(GStore)->getMemoryVT().getStoreSize());
-
-  bool IsAlias;
-  bool IsValid = BaseIndexOffset::computeAliasing(
-      Store.getNode(), NumBytes, GStore.getNode(), GNumBytes, *DAG, IsAlias);
-
-  EXPECT_TRUE(IsValid);
-  EXPECT_FALSE(IsAlias);
-}
-
-TEST_F(SelectionDAGAddressAnalysisTest, fixedSizeFrameObjectsWithinDiff) {
-  SDLoc Loc;
-  auto Int8VT = EVT::getIntegerVT(Context, 8);
-  // <vscale x 4 x i8>
-  auto VecVT = EVT::getVectorVT(Context, Int8VT, 4, true);
-  // <vscale x 2 x i8>
-  auto SubVecVT = EVT::getVectorVT(Context, Int8VT, 2, true);
-  // <2 x i8>
-  auto SubFixedVecVT2xi8 = EVT::getVectorVT(Context, Int8VT, 2);
-  SDValue FIPtr = DAG->CreateStackTemporary(VecVT);
-  int FI = cast<FrameIndexSDNode>(FIPtr.getNode())->getIndex();
-  MachinePointerInfo PtrInfo = MachinePointerInfo::getFixedStack(*MF, FI);
-  SDValue Value0 = DAG->getConstant(0, Loc, SubFixedVecVT2xi8);
-  SDValue Value1 = DAG->getConstant(0, Loc, SubVecVT);
-  TypeSize Offset0 = TypeSize::Fixed(0);
-  TypeSize Offset1 = SubFixedVecVT2xi8.getStoreSize();
-  SDValue Index0 = DAG->getMemBasePlusOffset(FIPtr, Offset0, Loc);
-  SDValue Index1 = DAG->getMemBasePlusOffset(FIPtr, Offset1, Loc);
-  SDValue Store0 = DAG->getStore(DAG->getEntryNode(), Loc, Value0, Index0,
-                                 PtrInfo.getWithOffset(Offset0));
-  SDValue Store1 = DAG->getStore(DAG->getEntryNode(), Loc, Value1, Index1,
-                                 PtrInfo.getWithOffset(Offset1));
-  Optional<int64_t> NumBytes0 = MemoryLocation::getSizeOrUnknown(
-      cast<StoreSDNode>(Store0)->getMemoryVT().getStoreSize());
-  Optional<int64_t> NumBytes1 = MemoryLocation::getSizeOrUnknown(
-      cast<StoreSDNode>(Store1)->getMemoryVT().getStoreSize());
-
-  bool IsAlias;
-  bool IsValid = BaseIndexOffset::computeAliasing(
-      Store0.getNode(), NumBytes0, Store1.getNode(), NumBytes1, *DAG, IsAlias);
-  EXPECT_TRUE(IsValid);
-  EXPECT_FALSE(IsAlias);
-
-  IsValid = BaseIndexOffset::computeAliasing(
-      Store1.getNode(), NumBytes1, Store0.getNode(), NumBytes0, *DAG, IsAlias);
-  EXPECT_TRUE(IsValid);
-  EXPECT_FALSE(IsAlias);
-}
-
-TEST_F(SelectionDAGAddressAnalysisTest, fixedSizeFrameObjectsOutOfDiff) {
-  SDLoc Loc;
-  auto Int8VT = EVT::getIntegerVT(Context, 8);
-  // <vscale x 4 x i8>
-  auto VecVT = EVT::getVectorVT(Context, Int8VT, 4, true);
-  // <vscale x 2 x i8>
-  auto SubVecVT = EVT::getVectorVT(Context, Int8VT, 2, true);
-  // <2 x i8>
-  auto SubFixedVecVT2xi8 = EVT::getVectorVT(Context, Int8VT, 2);
-  // <4 x i8>
-  auto SubFixedVecVT4xi8 = EVT::getVectorVT(Context, Int8VT, 4);
-  SDValue FIPtr = DAG->CreateStackTemporary(VecVT);
-  int FI = cast<FrameIndexSDNode>(FIPtr.getNode())->getIndex();
-  MachinePointerInfo PtrInfo = MachinePointerInfo::getFixedStack(*MF, FI);
-  SDValue Value0 = DAG->getConstant(0, Loc, SubFixedVecVT4xi8);
-  SDValue Value1 = DAG->getConstant(0, Loc, SubVecVT);
-  TypeSize Offset0 = TypeSize::Fixed(0);
-  TypeSize Offset1 = SubFixedVecVT2xi8.getStoreSize();
-  SDValue Index0 = DAG->getMemBasePlusOffset(FIPtr, Offset0, Loc);
-  SDValue Index1 = DAG->getMemBasePlusOffset(FIPtr, Offset1, Loc);
-  SDValue Store0 = DAG->getStore(DAG->getEntryNode(), Loc, Value0, Index0,
-                                 PtrInfo.getWithOffset(Offset0));
-  SDValue Store1 = DAG->getStore(DAG->getEntryNode(), Loc, Value1, Index1,
-                                 PtrInfo.getWithOffset(Offset1));
-  Optional<int64_t> NumBytes0 = MemoryLocation::getSizeOrUnknown(
-      cast<StoreSDNode>(Store0)->getMemoryVT().getStoreSize());
-  Optional<int64_t> NumBytes1 = MemoryLocation::getSizeOrUnknown(
-      cast<StoreSDNode>(Store1)->getMemoryVT().getStoreSize());
-
-  bool IsAlias;
-  bool IsValid = BaseIndexOffset::computeAliasing(
-      Store0.getNode(), NumBytes0, Store1.getNode(), NumBytes1, *DAG, IsAlias);
-  EXPECT_TRUE(IsValid);
-  EXPECT_TRUE(IsAlias);
-}
-
-TEST_F(SelectionDAGAddressAnalysisTest, twoFixedStackObjects) {
-  SDLoc Loc;
-  auto Int8VT = EVT::getIntegerVT(Context, 8);
-  // <vscale x 2 x i8>
-  auto VecVT = EVT::getVectorVT(Context, Int8VT, 2, true);
-  // <2 x i8>
-  auto FixedVecVT = EVT::getVectorVT(Context, Int8VT, 2);
-  SDValue FIPtr0 = DAG->CreateStackTemporary(FixedVecVT);
-  SDValue FIPtr1 = DAG->CreateStackTemporary(VecVT);
-  int FI0 = cast<FrameIndexSDNode>(FIPtr0.getNode())->getIndex();
-  int FI1 = cast<FrameIndexSDNode>(FIPtr1.getNode())->getIndex();
-  MachinePointerInfo PtrInfo0 = MachinePointerInfo::getFixedStack(*MF, FI0);
-  MachinePointerInfo PtrInfo1 = MachinePointerInfo::getFixedStack(*MF, FI1);
-  SDValue Value0 = DAG->getConstant(0, Loc, FixedVecVT);
-  SDValue Value1 = DAG->getConstant(0, Loc, VecVT);
-  TypeSize Offset0 = TypeSize::Fixed(0);
-  SDValue Index0 = DAG->getMemBasePlusOffset(FIPtr0, Offset0, Loc);
-  SDValue Index1 = DAG->getMemBasePlusOffset(FIPtr1, Offset0, Loc);
-  SDValue Store0 = DAG->getStore(DAG->getEntryNode(), Loc, Value0, Index0,
-                                 PtrInfo0.getWithOffset(Offset0));
-  SDValue Store1 = DAG->getStore(DAG->getEntryNode(), Loc, Value1, Index1,
-                                 PtrInfo1.getWithOffset(Offset0));
-  Optional<int64_t> NumBytes0 = MemoryLocation::getSizeOrUnknown(
-      cast<StoreSDNode>(Store0)->getMemoryVT().getStoreSize());
-  Optional<int64_t> NumBytes1 = MemoryLocation::getSizeOrUnknown(
-      cast<StoreSDNode>(Store1)->getMemoryVT().getStoreSize());
-
-  bool IsAlias;
-  bool IsValid = BaseIndexOffset::computeAliasing(
-      Store0.getNode(), NumBytes0, Store1.getNode(), NumBytes1, *DAG, IsAlias);
-  EXPECT_TRUE(IsValid);
-  EXPECT_FALSE(IsAlias);
-}
-
-} // end namespace llvm
diff --git a/gnu/llvm/llvm/unittests/CodeGen/TargetOptionsTest.cpp b/gnu/llvm/llvm/unittests/CodeGen/TargetOptionsTest.cpp
deleted file mode 100644
index bc71642aa6e..00000000000
--- a/gnu/llvm/llvm/unittests/CodeGen/TargetOptionsTest.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-#include "llvm/Target/TargetOptions.h"
-#include "llvm/CodeGen/TargetPassConfig.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/LegacyPassManager.h"
-#include "llvm/InitializePasses.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "llvm/Target/TargetMachine.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace llvm {
-  void initializeTestPassPass(PassRegistry &);
-}
-
-namespace {
-
-void initLLVM() {
-  InitializeAllTargets();
-  InitializeAllTargetMCs();
-  InitializeAllAsmPrinters();
-  InitializeAllAsmParsers();
-
-  PassRegistry *Registry = PassRegistry::getPassRegistry();
-  initializeCore(*Registry);
-  initializeCodeGen(*Registry);
-}
-
-/// Create a TargetMachine. We need a target that doesn't have IPRA enabled by
-/// default. That turns out to be all targets at the moment, so just use X86.
-std::unique_ptr<TargetMachine> createTargetMachine(bool EnableIPRA) {
-  Triple TargetTriple("x86_64--");
-  std::string Error;
-  const Target *T = TargetRegistry::lookupTarget("", TargetTriple, Error);
-  if (!T)
-    return nullptr;
-
-  TargetOptions Options;
-  Options.EnableIPRA = EnableIPRA;
-  return std::unique_ptr<TargetMachine>(T->createTargetMachine(
-      "X86", "", "", Options, None, None, CodeGenOpt::Aggressive));
-}
-
-typedef std::function<void(bool)> TargetOptionsTest;
-
-static void targetOptionsTest(bool EnableIPRA) {
-  std::unique_ptr<TargetMachine> TM = createTargetMachine(EnableIPRA);
-  // This test is designed for the X86 backend; stop if it is not available.
-  if (!TM)
-    GTEST_SKIP();
-  legacy::PassManager PM;
-  LLVMTargetMachine *LLVMTM = static_cast<LLVMTargetMachine *>(TM.get());
-
-  TargetPassConfig *TPC = LLVMTM->createPassConfig(PM);
-  (void)TPC;
-
-  ASSERT_TRUE(TM->Options.EnableIPRA == EnableIPRA);
-
-  delete TPC;
-}
-
-} // End of anonymous namespace.
-
-TEST(TargetOptionsTest, IPRASetToOff) {
-  targetOptionsTest(false);
-}
-
-TEST(TargetOptionsTest, IPRASetToOn) {
-  targetOptionsTest(true);
-}
-
-int main(int argc, char **argv) {
-  ::testing::InitGoogleTest(&argc, argv);
-  initLLVM();
-  return RUN_ALL_TESTS();
-}
diff --git a/gnu/llvm/llvm/unittests/CodeGen/TestAsmPrinter.cpp b/gnu/llvm/llvm/unittests/CodeGen/TestAsmPrinter.cpp
deleted file mode 100644
index 09154b36446..00000000000
--- a/gnu/llvm/llvm/unittests/CodeGen/TestAsmPrinter.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-//===--- unittests/CodeGen/TestAsmPrinter.cpp -------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestAsmPrinter.h"
-#include "llvm/ADT/Triple.h"
-#include "llvm/CodeGen/AsmPrinter.h"
-#include "llvm/MC/MCAsmInfo.h"
-#include "llvm/MC/MCContext.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Target/TargetLoweringObjectFile.h"
-#include "llvm/Target/TargetMachine.h"
-
-using namespace llvm;
-using ::testing::StrictMock;
-
-// Note: a non-const reference argument cannot be passed through
-// testing::StrictMock, thus, we pass a pointer and dereference it here.
-MockMCStreamer::MockMCStreamer(MCContext *Ctx) : MCStreamer(*Ctx) {}
-
-MockMCStreamer::~MockMCStreamer() = default;
-
-TestAsmPrinter::TestAsmPrinter() = default;
-
-TestAsmPrinter::~TestAsmPrinter() = default;
-
-llvm::Expected<std::unique_ptr<TestAsmPrinter>>
-TestAsmPrinter::create(const std::string &TripleStr, uint16_t DwarfVersion,
-                       dwarf::DwarfFormat DwarfFormat) {
-  std::string ErrorStr;
-  const Target *TheTarget = TargetRegistry::lookupTarget(TripleStr, ErrorStr);
-  if (!TheTarget)
-    return std::unique_ptr<TestAsmPrinter>();
-
-  std::unique_ptr<TestAsmPrinter> TestPrinter(new TestAsmPrinter);
-  if (llvm::Error E =
-          TestPrinter->init(TheTarget, TripleStr, DwarfVersion, DwarfFormat))
-    return std::move(E);
-
-  return std::move(TestPrinter);
-}
-
-// Note:: based on dwarfgen::Generator::init() from
-// llvm/unittests/DebugInfo/DWARF/DwarfGenerator.cpp
-llvm::Error TestAsmPrinter::init(const Target *TheTarget, StringRef TripleName,
-                                 uint16_t DwarfVersion,
-                                 dwarf::DwarfFormat DwarfFormat) {
-  TM.reset(TheTarget->createTargetMachine(TripleName, "", "", TargetOptions(),
-                                          None));
-  if (!TM)
-    return make_error<StringError>("no target machine for target " + TripleName,
-                                   inconvertibleErrorCode());
-
-  Triple TheTriple(TripleName);
-  MC.reset(new MCContext(TheTriple, TM->getMCAsmInfo(), TM->getMCRegisterInfo(),
-                         TM->getMCSubtargetInfo()));
-  TM->getObjFileLowering()->Initialize(*MC, *TM);
-  MC->setObjectFileInfo(TM->getObjFileLowering());
-
-  MS = new StrictMock<MockMCStreamer>(MC.get());
-
-  Asm.reset(
-      TheTarget->createAsmPrinter(*TM, std::unique_ptr<MockMCStreamer>(MS)));
-  if (!Asm)
-    return make_error<StringError>("no asm printer for target " + TripleName,
-                                   inconvertibleErrorCode());
-
-  // Set the DWARF version correctly on all classes that we use.
-  MC->setDwarfVersion(DwarfVersion);
-  Asm->setDwarfVersion(DwarfVersion);
-
-  // Set the DWARF format.
-  MC->setDwarfFormat(DwarfFormat);
-
-  return Error::success();
-}
-
-void TestAsmPrinter::setDwarfUsesRelocationsAcrossSections(bool Enable) {
-  struct HackMCAsmInfo : MCAsmInfo {
-    void setDwarfUsesRelocationsAcrossSections(bool Enable) {
-      DwarfUsesRelocationsAcrossSections = Enable;
-    }
-  };
-  static_cast<HackMCAsmInfo *>(const_cast<MCAsmInfo *>(TM->getMCAsmInfo()))
-      ->setDwarfUsesRelocationsAcrossSections(Enable);
-}
diff --git a/gnu/llvm/llvm/unittests/CodeGen/TestAsmPrinter.h b/gnu/llvm/llvm/unittests/CodeGen/TestAsmPrinter.h
deleted file mode 100644
index ce1d636b8dd..00000000000
--- a/gnu/llvm/llvm/unittests/CodeGen/TestAsmPrinter.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//===--- unittests/CodeGen/TestAsmPrinter.h ---------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_UNITTESTS_CODEGEN_TESTASMPRINTER_H
-#define LLVM_UNITTESTS_CODEGEN_TESTASMPRINTER_H
-
-#include "llvm/BinaryFormat/Dwarf.h"
-#include "llvm/MC/MCStreamer.h"
-#include "gmock/gmock.h"
-
-#include <memory>
-
-namespace llvm {
-class AsmPrinter;
-class MCContext;
-class Target;
-class TargetMachine;
-
-class MockMCStreamer : public MCStreamer {
-public:
-  explicit MockMCStreamer(MCContext *Ctx);
-  ~MockMCStreamer();
-
-  // These methods are pure virtual in MCStreamer, thus, have to be overridden:
-
-  MOCK_METHOD2(emitSymbolAttribute,
-               bool(MCSymbol *Symbol, MCSymbolAttr Attribute));
-  MOCK_METHOD3(emitCommonSymbol,
-               void(MCSymbol *Symbol, uint64_t Size, unsigned ByteAlignment));
-  MOCK_METHOD5(emitZerofill,
-               void(MCSection *Section, MCSymbol *Symbol, uint64_t Size,
-                    unsigned ByteAlignment, SMLoc Loc));
-
-  // The following are mock methods to be used in tests.
-
-  MOCK_METHOD2(emitLabel, void(MCSymbol *Symbol, SMLoc Loc));
-  MOCK_METHOD2(emitIntValue, void(uint64_t Value, unsigned Size));
-  MOCK_METHOD3(emitValueImpl,
-               void(const MCExpr *Value, unsigned Size, SMLoc Loc));
-  MOCK_METHOD3(emitAbsoluteSymbolDiff,
-               void(const MCSymbol *Hi, const MCSymbol *Lo, unsigned Size));
-  MOCK_METHOD2(EmitCOFFSecRel32, void(MCSymbol const *Symbol, uint64_t Offset));
-};
-
-class TestAsmPrinter {
-  std::unique_ptr<MCContext> MC;
-  MockMCStreamer *MS = nullptr; // Owned by AsmPrinter
-  std::unique_ptr<TargetMachine> TM;
-  std::unique_ptr<AsmPrinter> Asm;
-
-  /// Private constructor; call TestAsmPrinter::create(...)
-  /// to create an instance.
-  TestAsmPrinter();
-
-  /// Initialize an AsmPrinter instance with a mocked MCStreamer.
-  llvm::Error init(const Target *TheTarget, StringRef TripleStr,
-                   uint16_t DwarfVersion, dwarf::DwarfFormat DwarfFormat);
-
-public:
-  /// Create an AsmPrinter and accompanied objects.
-  /// Returns ErrorSuccess() with an empty value if the requested target is not
-  /// supported so that the corresponding test can be gracefully skipped.
-  static llvm::Expected<std::unique_ptr<TestAsmPrinter>>
-  create(const std::string &TripleStr, uint16_t DwarfVersion,
-         dwarf::DwarfFormat DwarfFormat);
-
-  ~TestAsmPrinter();
-
-  void setDwarfUsesRelocationsAcrossSections(bool Enable);
-
-  AsmPrinter *getAP() const { return Asm.get(); }
-  AsmPrinter *releaseAP() { return Asm.release(); }
-  MCContext &getCtx() const { return *MC; }
-  MockMCStreamer &getMS() const { return *MS; }
-};
-
-} // end namespace llvm
-
-#endif // LLVM_UNITTESTS_CODEGEN_TESTASMPRINTER_H
diff --git a/gnu/llvm/llvm/unittests/CodeGen/TypeTraitsTest.cpp b/gnu/llvm/llvm/unittests/CodeGen/TypeTraitsTest.cpp
deleted file mode 100644
index af1f36c1e94..00000000000
--- a/gnu/llvm/llvm/unittests/CodeGen/TypeTraitsTest.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-//===- llvm/unittest/CodeGen/TypeTraitsTest.cpp --------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/CodeGen/RegisterPressure.h"
-#include "llvm/CodeGen/ScheduleDAG.h"
-#include "llvm/CodeGen/SelectionDAGNodes.h"
-#include "llvm/CodeGen/SlotIndexes.h"
-#include "llvm/CodeGen/TargetPassConfig.h"
-#include "gtest/gtest.h"
-#include <type_traits>
-
-using namespace llvm;
-
-#if __has_feature(is_trivially_copyable) || (defined(__GNUC__) && __GNUC__ >= 5)
-static_assert(std::is_trivially_copyable<PressureChange>::value,
-              "trivially copyable");
-static_assert(std::is_trivially_copyable<SDep>::value, "trivially copyable");
-static_assert(std::is_trivially_copyable<SDValue>::value, "trivially copyable");
-static_assert(std::is_trivially_copyable<SlotIndex>::value,
-              "trivially copyable");
-static_assert(std::is_trivially_copyable<IdentifyingPassPtr>::value,
-              "trivially copyable");
-#endif
-
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/CMakeLists.txt b/gnu/llvm/llvm/unittests/DebugInfo/CMakeLists.txt
deleted file mode 100644
index 0a0a1141d92..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-add_subdirectory(CodeView)
-add_subdirectory(DWARF)
-add_subdirectory(GSYM)
-add_subdirectory(MSF)
-add_subdirectory(PDB)
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/CodeView/CMakeLists.txt b/gnu/llvm/llvm/unittests/DebugInfo/CodeView/CMakeLists.txt
deleted file mode 100644
index 5044b9bde29..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/CodeView/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  DebugInfoCodeView
-  )
-
-add_llvm_unittest(DebugInfoCodeViewTests
-  GUIDFormatTest.cpp
-  RandomAccessVisitorTest.cpp
-  TypeHashingTest.cpp
-  TypeIndexDiscoveryTest.cpp
-  )
-
-target_link_libraries(DebugInfoCodeViewTests PRIVATE LLVMTestingSupport)
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/CodeView/GUIDFormatTest.cpp b/gnu/llvm/llvm/unittests/DebugInfo/CodeView/GUIDFormatTest.cpp
deleted file mode 100755
index e9ac469de0e..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/CodeView/GUIDFormatTest.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-//===- unittest/DebugInfo/CodeView/GUIDFormatTest.cpp - GUID formatting ---===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/DebugInfo/CodeView/Formatters.h"
-#include "llvm/DebugInfo/CodeView/GUID.h"
-#include "llvm/Support/FormatVariadic.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::codeview;
-
-// Variant 1 UUIDs, nowadays the most common variant, are encoded in a
-// big-endian format.
-// For example, 00112233-4455-6677-8899-aabbccddeeff is encoded as the bytes
-// 00 11 22 33 44 55 66 77 88 99 aa bb cc dd ee ff
-//
-// Variant 2 UUIDs, historically used in Microsoft's COM/OLE libraries, use a
-// mixed-endian format, whereby the first three components of the UUID are
-// little-endian, and the last two are big-endian.
-// For example, 00112233-4455-6677-8899-aabbccddeeff is encoded as the bytes
-// 33 22 11 00 55 44 77 66 88 99 aa bb cc dd ee ff.
-//
-// Note: Only Variant 2 UUIDs are tested.
-namespace {
-
-using GuidPair = std::pair<StringRef, GUID>;
-using GuidData = SmallVector<GuidPair>;
-
-void checkData(GuidData &Data) {
-  for (auto Item : Data) {
-    std::string GuidText(formatv("{0}", Item.second).str());
-    StringRef Scalar(GuidText);
-
-    // GUID strings are 38 characters long.
-    EXPECT_EQ(Scalar.size(), size_t(38));
-
-    // GUID must be enclosed in {}
-    EXPECT_EQ(Scalar.front(), '{');
-    EXPECT_EQ(Scalar.back(), '}');
-
-    Scalar = Scalar.substr(1, Scalar.size() - 2);
-    SmallVector<StringRef, 6> Component;
-    Scalar.split(Component, '-', 5);
-
-    // GUID must have 5 components.
-    EXPECT_EQ(Component.size(), size_t(5));
-
-    // GUID components are properly delineated with dashes.
-    EXPECT_EQ(Scalar[8], '-');
-    EXPECT_EQ(Scalar[13], '-');
-    EXPECT_EQ(Scalar[18], '-');
-    EXPECT_EQ(Scalar[23], '-');
-
-    // GUID only contains hex digits.
-    struct {
-      support::ulittle32_t Data0;
-      support::ulittle16_t Data1;
-      support::ulittle16_t Data2;
-      support::ubig16_t Data3;
-      support::ubig64_t Data4;
-    } G = {};
-    EXPECT_TRUE(to_integer(Component[0], G.Data0, 16));
-    EXPECT_TRUE(to_integer(Component[1], G.Data1, 16));
-    EXPECT_TRUE(to_integer(Component[2], G.Data2, 16));
-    EXPECT_TRUE(to_integer(Component[3], G.Data3, 16));
-    EXPECT_TRUE(to_integer(Component[4], G.Data4, 16));
-
-    // Check the values are the same.
-    EXPECT_EQ(Scalar, Item.first);
-  }
-}
-
-TEST(GUIDFormatTest, ValidateFormat) {
-  // Shifting 2 (0x00)
-  GuidData Data = {
-      // Non-zero values in all components.
-      {"11223344-5566-7788-99AA-BBCCDDEEFFAA",
-       {0x44, 0x33, 0x22, 0x11, 0x66, 0x55, 0x88, 0x77, 0x99, 0xaa, 0xbb, 0xcc,
-        0xdd, 0xee, 0xff, 0xaa}},
-
-      // Zero values in all components.
-      {"00000000-0000-0000-0000-000000000000",
-       {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00}},
-
-      // Shift 2 (0x00) across all components
-      {"00003344-5566-7788-99AA-BBCCDDEEFFAA",
-       {0x44, 0x33, 0x00, 0x00, 0x66, 0x55, 0x88, 0x77, 0x99, 0xaa, 0xbb, 0xcc,
-        0xdd, 0xee, 0xff, 0xaa}},
-      {"11000044-5566-7788-99AA-BBCCDDEEFFAA",
-       {0x44, 0x00, 0x00, 0x11, 0x66, 0x55, 0x88, 0x77, 0x99, 0xaa, 0xbb, 0xcc,
-        0xdd, 0xee, 0xff, 0xaa}},
-      {"11220000-5566-7788-99AA-BBCCDDEEFFAA",
-       {0x00, 0x00, 0x22, 0x11, 0x66, 0x55, 0x88, 0x77, 0x99, 0xaa, 0xbb, 0xcc,
-        0xdd, 0xee, 0xff, 0xaa}},
-      {"11223300-0066-7788-99AA-BBCCDDEEFFAA",
-       {0x00, 0x33, 0x22, 0x11, 0x66, 0x00, 0x88, 0x77, 0x99, 0xaa, 0xbb, 0xcc,
-        0xdd, 0xee, 0xff, 0xaa}},
-      {"11223344-0000-7788-99AA-BBCCDDEEFFAA",
-       {0x44, 0x33, 0x22, 0x11, 0x00, 0x00, 0x88, 0x77, 0x99, 0xaa, 0xbb, 0xcc,
-        0xdd, 0xee, 0xff, 0xaa}},
-      {"11223344-5500-0088-99AA-BBCCDDEEFFAA",
-       {0x44, 0x33, 0x22, 0x11, 0x00, 0x55, 0x88, 0x00, 0x99, 0xaa, 0xbb, 0xcc,
-        0xdd, 0xee, 0xff, 0xaa}},
-      {"11223344-5566-0000-99AA-BBCCDDEEFFAA",
-       {0x44, 0x33, 0x22, 0x11, 0x66, 0x55, 0x00, 0x00, 0x99, 0xaa, 0xbb, 0xcc,
-        0xdd, 0xee, 0xff, 0xaa}},
-      {"11223344-5566-7700-00AA-BBCCDDEEFFAA",
-       {0x44, 0x33, 0x22, 0x11, 0x66, 0x55, 0x00, 0x77, 0x00, 0xaa, 0xbb, 0xcc,
-        0xdd, 0xee, 0xff, 0xaa}},
-      {"11223344-5566-7788-0000-BBCCDDEEFFAA",
-       {0x44, 0x33, 0x22, 0x11, 0x66, 0x55, 0x88, 0x77, 0x00, 0x00, 0xbb, 0xcc,
-        0xdd, 0xee, 0xff, 0xaa}},
-      {"11223344-5566-7788-9900-00CCDDEEFFAA",
-       {0x44, 0x33, 0x22, 0x11, 0x66, 0x55, 0x88, 0x77, 0x99, 0x00, 0x00, 0xcc,
-        0xdd, 0xee, 0xff, 0xaa}},
-      {"11223344-5566-7788-99AA-0000DDEEFFAA",
-       {0x44, 0x33, 0x22, 0x11, 0x66, 0x55, 0x88, 0x77, 0x99, 0xaa, 0x00, 0x00,
-        0xdd, 0xee, 0xff, 0xaa}},
-      {"11223344-5566-7788-99AA-BB0000EEFFAA",
-       {0x44, 0x33, 0x22, 0x11, 0x66, 0x55, 0x88, 0x77, 0x99, 0xaa, 0xbb, 0x00,
-        0x00, 0xee, 0xff, 0xaa}},
-      {"11223344-5566-7788-99AA-BBCC0000FFAA",
-       {0x44, 0x33, 0x22, 0x11, 0x66, 0x55, 0x88, 0x77, 0x99, 0xaa, 0xbb, 0xcc,
-        0x00, 0x00, 0xff, 0xaa}},
-      {"11223344-5566-7788-99AA-BBCCDD0000AA",
-       {0x44, 0x33, 0x22, 0x11, 0x66, 0x55, 0x88, 0x77, 0x99, 0xaa, 0xbb, 0xcc,
-        0xdd, 0x00, 0x00, 0xaa}},
-      {"11223344-5566-7788-99AA-BBCCDDEE0000",
-       {0x44, 0x33, 0x22, 0x11, 0x66, 0x55, 0x88, 0x77, 0x99, 0xaa, 0xbb, 0xcc,
-        0xdd, 0xee, 0x00, 0x00}},
-  };
-
-  checkData(Data);
-}
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/CodeView/RandomAccessVisitorTest.cpp b/gnu/llvm/llvm/unittests/DebugInfo/CodeView/RandomAccessVisitorTest.cpp
deleted file mode 100644
index cbf8d47c647..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/CodeView/RandomAccessVisitorTest.cpp
+++ /dev/null
@@ -1,399 +0,0 @@
-//===- llvm/unittest/DebugInfo/CodeView/RandomAccessVisitorTest.cpp -------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/DebugInfo/CodeView/AppendingTypeTableBuilder.h"
-#include "llvm/DebugInfo/CodeView/CVTypeVisitor.h"
-#include "llvm/DebugInfo/CodeView/LazyRandomTypeCollection.h"
-#include "llvm/DebugInfo/CodeView/TypeRecord.h"
-#include "llvm/DebugInfo/CodeView/TypeRecordMapping.h"
-#include "llvm/DebugInfo/CodeView/TypeVisitorCallbacks.h"
-#include "llvm/DebugInfo/PDB/Native/RawTypes.h"
-#include "llvm/Support/Allocator.h"
-#include "llvm/Support/BinaryByteStream.h"
-#include "llvm/Support/BinaryItemStream.h"
-#include "llvm/Support/Error.h"
-#include "llvm/Testing/Support/Error.h"
-
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::codeview;
-using namespace llvm::pdb;
-
-namespace llvm {
-namespace codeview {
-inline bool operator==(const ArrayRecord &R1, const ArrayRecord &R2) {
-  if (R1.ElementType != R2.ElementType)
-    return false;
-  if (R1.IndexType != R2.IndexType)
-    return false;
-  if (R1.Name != R2.Name)
-    return false;
-  if (R1.Size != R2.Size)
-    return false;
-  return true;
-}
-inline bool operator!=(const ArrayRecord &R1, const ArrayRecord &R2) {
-  return !(R1 == R2);
-}
-
-inline bool operator==(const CVType &R1, const CVType &R2) {
-  if (R1.RecordData != R2.RecordData)
-    return false;
-  return true;
-}
-inline bool operator!=(const CVType &R1, const CVType &R2) {
-  return !(R1 == R2);
-}
-}
-}
-
-namespace llvm {
-template <> struct BinaryItemTraits<CVType> {
-  static size_t length(const CVType &Item) { return Item.length(); }
-  static ArrayRef<uint8_t> bytes(const CVType &Item) { return Item.data(); }
-};
-}
-
-namespace {
-
-class MockCallbacks : public TypeVisitorCallbacks {
-public:
-  Error visitTypeBegin(CVType &CVR, TypeIndex Index) override {
-    Indices.push_back(Index);
-    return Error::success();
-  }
-  Error visitKnownRecord(CVType &CVR, ArrayRecord &AR) override {
-    VisitedRecords.push_back(AR);
-    RawRecords.push_back(CVR);
-    return Error::success();
-  }
-
-  uint32_t count() const {
-    assert(Indices.size() == RawRecords.size());
-    assert(Indices.size() == VisitedRecords.size());
-    return Indices.size();
-  }
-  std::vector<TypeIndex> Indices;
-  std::vector<CVType> RawRecords;
-  std::vector<ArrayRecord> VisitedRecords;
-};
-
-class RandomAccessVisitorTest : public testing::Test {
-public:
-  RandomAccessVisitorTest() {}
-
-  static void SetUpTestCase() {
-    GlobalState = std::make_unique<GlobalTestState>();
-
-    AppendingTypeTableBuilder Builder(GlobalState->Allocator);
-
-    uint32_t Offset = 0;
-    for (int I = 0; I < 11; ++I) {
-      ArrayRecord AR(TypeRecordKind::Array);
-      AR.ElementType = TypeIndex::Int32();
-      AR.IndexType = TypeIndex::UInt32();
-      AR.Size = I;
-      std::string Name;
-      raw_string_ostream Stream(Name);
-      Stream << "Array [" << I << "]";
-      AR.Name = GlobalState->Strings.save(Stream.str());
-      GlobalState->Records.push_back(AR);
-      GlobalState->Indices.push_back(Builder.writeLeafType(AR));
-
-      CVType Type(Builder.records().back());
-      GlobalState->TypeVector.push_back(Type);
-
-      GlobalState->AllOffsets.push_back(
-          {GlobalState->Indices.back(), ulittle32_t(Offset)});
-      Offset += Type.length();
-    }
-
-    GlobalState->ItemStream.setItems(GlobalState->TypeVector);
-    GlobalState->TypeArray = VarStreamArray<CVType>(GlobalState->ItemStream);
-  }
-
-  static void TearDownTestCase() { GlobalState.reset(); }
-
-  void SetUp() override {
-    TestState = std::make_unique<PerTestState>();
-  }
-
-  void TearDown() override { TestState.reset(); }
-
-protected:
-  bool ValidateDatabaseRecord(LazyRandomTypeCollection &Types, uint32_t Index) {
-    TypeIndex TI = TypeIndex::fromArrayIndex(Index);
-    if (!Types.contains(TI))
-      return false;
-    if (GlobalState->TypeVector[Index] != Types.getType(TI))
-      return false;
-    return true;
-  }
-
-  bool ValidateVisitedRecord(uint32_t VisitationOrder,
-                             uint32_t GlobalArrayIndex) {
-    TypeIndex TI = TypeIndex::fromArrayIndex(GlobalArrayIndex);
-    if (TI != TestState->Callbacks.Indices[VisitationOrder])
-      return false;
-
-    if (GlobalState->TypeVector[TI.toArrayIndex()] !=
-        TestState->Callbacks.RawRecords[VisitationOrder])
-      return false;
-
-    if (GlobalState->Records[TI.toArrayIndex()] !=
-        TestState->Callbacks.VisitedRecords[VisitationOrder])
-      return false;
-
-    return true;
-  }
-
-  struct GlobalTestState {
-    GlobalTestState() : Strings(Allocator), ItemStream(llvm::support::little) {}
-
-    BumpPtrAllocator Allocator;
-    StringSaver Strings;
-
-    std::vector<ArrayRecord> Records;
-    std::vector<TypeIndex> Indices;
-    std::vector<TypeIndexOffset> AllOffsets;
-    std::vector<CVType> TypeVector;
-    BinaryItemStream<CVType> ItemStream;
-    VarStreamArray<CVType> TypeArray;
-
-    MutableBinaryByteStream Stream;
-  };
-
-  struct PerTestState {
-    FixedStreamArray<TypeIndexOffset> Offsets;
-
-    MockCallbacks Callbacks;
-  };
-
-  FixedStreamArray<TypeIndexOffset>
-  createPartialOffsets(MutableBinaryByteStream &Storage,
-                       std::initializer_list<uint32_t> Indices) {
-
-    uint32_t Count = Indices.size();
-    uint32_t Size = Count * sizeof(TypeIndexOffset);
-    uint8_t *Buffer = GlobalState->Allocator.Allocate<uint8_t>(Size);
-    MutableArrayRef<uint8_t> Bytes(Buffer, Size);
-    Storage = MutableBinaryByteStream(Bytes, support::little);
-    BinaryStreamWriter Writer(Storage);
-    for (const auto I : Indices)
-      consumeError(Writer.writeObject(GlobalState->AllOffsets[I]));
-
-    BinaryStreamReader Reader(Storage);
-    FixedStreamArray<TypeIndexOffset> Result;
-    consumeError(Reader.readArray(Result, Count));
-    return Result;
-  }
-
-  static std::unique_ptr<GlobalTestState> GlobalState;
-  std::unique_ptr<PerTestState> TestState;
-};
-
-std::unique_ptr<RandomAccessVisitorTest::GlobalTestState>
-    RandomAccessVisitorTest::GlobalState;
-}
-
-TEST_F(RandomAccessVisitorTest, MultipleVisits) {
-  TestState->Offsets = createPartialOffsets(GlobalState->Stream, {0, 8});
-  LazyRandomTypeCollection Types(GlobalState->TypeArray,
-                                 GlobalState->TypeVector.size(),
-                                 TestState->Offsets);
-
-  std::vector<uint32_t> IndicesToVisit = {5, 5, 5};
-
-  for (uint32_t I : IndicesToVisit) {
-    TypeIndex TI = TypeIndex::fromArrayIndex(I);
-    CVType T = Types.getType(TI);
-    EXPECT_THAT_ERROR(codeview::visitTypeRecord(T, TI, TestState->Callbacks),
-                      Succeeded());
-  }
-
-  // [0,8) should be present
-  EXPECT_EQ(8u, Types.size());
-  for (uint32_t I = 0; I < 8; ++I)
-    EXPECT_TRUE(ValidateDatabaseRecord(Types, I));
-
-  // 5, 5, 5
-  EXPECT_EQ(3u, TestState->Callbacks.count());
-  for (auto I : enumerate(IndicesToVisit))
-    EXPECT_TRUE(ValidateVisitedRecord(I.index(), I.value()));
-}
-
-TEST_F(RandomAccessVisitorTest, DescendingWithinChunk) {
-  // Visit multiple items from the same "chunk" in reverse order.  In this
-  // example, it's 7 then 4 then 2.  At the end, all records from 0 to 7 should
-  // be known by the database, but only 2, 4, and 7 should have been visited.
-  TestState->Offsets = createPartialOffsets(GlobalState->Stream, {0, 8});
-
-  std::vector<uint32_t> IndicesToVisit = {7, 4, 2};
-
-  LazyRandomTypeCollection Types(GlobalState->TypeArray,
-                                 GlobalState->TypeVector.size(),
-                                 TestState->Offsets);
-  for (uint32_t I : IndicesToVisit) {
-    TypeIndex TI = TypeIndex::fromArrayIndex(I);
-    CVType T = Types.getType(TI);
-    EXPECT_THAT_ERROR(codeview::visitTypeRecord(T, TI, TestState->Callbacks),
-                      Succeeded());
-  }
-
-  // [0, 7]
-  EXPECT_EQ(8u, Types.size());
-  for (uint32_t I = 0; I < 8; ++I)
-    EXPECT_TRUE(ValidateDatabaseRecord(Types, I));
-
-  // 2, 4, 7
-  EXPECT_EQ(3u, TestState->Callbacks.count());
-  for (auto I : enumerate(IndicesToVisit))
-    EXPECT_TRUE(ValidateVisitedRecord(I.index(), I.value()));
-}
-
-TEST_F(RandomAccessVisitorTest, AscendingWithinChunk) {
-  // * Visit multiple items from the same chunk in ascending order, ensuring
-  //   that intermediate items are not visited.  In the below example, it's
-  //   5 -> 6 -> 7 which come from the [4,8) chunk.
-  TestState->Offsets = createPartialOffsets(GlobalState->Stream, {0, 8});
-
-  std::vector<uint32_t> IndicesToVisit = {2, 4, 7};
-
-  LazyRandomTypeCollection Types(GlobalState->TypeArray,
-                                 GlobalState->TypeVector.size(),
-                                 TestState->Offsets);
-  for (uint32_t I : IndicesToVisit) {
-    TypeIndex TI = TypeIndex::fromArrayIndex(I);
-    CVType T = Types.getType(TI);
-    EXPECT_THAT_ERROR(codeview::visitTypeRecord(T, TI, TestState->Callbacks),
-                      Succeeded());
-  }
-
-  // [0, 7]
-  EXPECT_EQ(8u, Types.size());
-  for (uint32_t I = 0; I < 8; ++I)
-    EXPECT_TRUE(ValidateDatabaseRecord(Types, I));
-
-  // 2, 4, 7
-  EXPECT_EQ(3u, TestState->Callbacks.count());
-  for (auto &I : enumerate(IndicesToVisit))
-    EXPECT_TRUE(ValidateVisitedRecord(I.index(), I.value()));
-}
-
-TEST_F(RandomAccessVisitorTest, StopPrematurelyInChunk) {
-  // * Don't visit the last item in one chunk, ensuring that visitation stops
-  //   at the record you specify, and the chunk is only partially visited.
-  //   In the below example, this is tested by visiting 0 and 1 but not 2,
-  //   all from the [0,3) chunk.
-  TestState->Offsets = createPartialOffsets(GlobalState->Stream, {0, 8});
-
-  std::vector<uint32_t> IndicesToVisit = {0, 1, 2};
-
-  LazyRandomTypeCollection Types(GlobalState->TypeArray,
-                                 GlobalState->TypeVector.size(),
-                                 TestState->Offsets);
-
-  for (uint32_t I : IndicesToVisit) {
-    TypeIndex TI = TypeIndex::fromArrayIndex(I);
-    CVType T = Types.getType(TI);
-    EXPECT_THAT_ERROR(codeview::visitTypeRecord(T, TI, TestState->Callbacks),
-                      Succeeded());
-  }
-
-  // [0, 8) should be visited.
-  EXPECT_EQ(8u, Types.size());
-  for (uint32_t I = 0; I < 8; ++I)
-    EXPECT_TRUE(ValidateDatabaseRecord(Types, I));
-
-  // [0, 2]
-  EXPECT_EQ(3u, TestState->Callbacks.count());
-  for (auto I : enumerate(IndicesToVisit))
-    EXPECT_TRUE(ValidateVisitedRecord(I.index(), I.value()));
-}
-
-TEST_F(RandomAccessVisitorTest, InnerChunk) {
-  // Test that when a request comes from a chunk in the middle of the partial
-  // offsets array, that items from surrounding chunks are not visited or
-  // added to the database.
-  TestState->Offsets = createPartialOffsets(GlobalState->Stream, {0, 4, 9});
-
-  std::vector<uint32_t> IndicesToVisit = {5, 7};
-
-  LazyRandomTypeCollection Types(GlobalState->TypeArray,
-                                 GlobalState->TypeVector.size(),
-                                 TestState->Offsets);
-
-  for (uint32_t I : IndicesToVisit) {
-    TypeIndex TI = TypeIndex::fromArrayIndex(I);
-    CVType T = Types.getType(TI);
-    EXPECT_THAT_ERROR(codeview::visitTypeRecord(T, TI, TestState->Callbacks),
-                      Succeeded());
-  }
-
-  // [4, 9)
-  EXPECT_EQ(5u, Types.size());
-  for (uint32_t I = 4; I < 9; ++I)
-    EXPECT_TRUE(ValidateDatabaseRecord(Types, I));
-
-  // 5, 7
-  EXPECT_EQ(2u, TestState->Callbacks.count());
-  for (auto &I : enumerate(IndicesToVisit))
-    EXPECT_TRUE(ValidateVisitedRecord(I.index(), I.value()));
-}
-
-TEST_F(RandomAccessVisitorTest, CrossChunkName) {
-  AppendingTypeTableBuilder Builder(GlobalState->Allocator);
-
-  // TypeIndex 0
-  ClassRecord Class(TypeRecordKind::Class);
-  Class.Name = "FooClass";
-  Class.Options = ClassOptions::None;
-  Class.MemberCount = 0;
-  Class.Size = 4U;
-  Class.DerivationList = TypeIndex::fromArrayIndex(0);
-  Class.FieldList = TypeIndex::fromArrayIndex(0);
-  Class.VTableShape = TypeIndex::fromArrayIndex(0);
-  TypeIndex IndexZero = Builder.writeLeafType(Class);
-
-  // TypeIndex 1 refers to type index 0.
-  ModifierRecord Modifier(TypeRecordKind::Modifier);
-  Modifier.ModifiedType = TypeIndex::fromArrayIndex(0);
-  Modifier.Modifiers = ModifierOptions::Const;
-  TypeIndex IndexOne = Builder.writeLeafType(Modifier);
-
-  // set up a type stream that refers to the above two serialized records.
-  std::vector<CVType> TypeArray = {
-      {Builder.records()[0]},
-      {Builder.records()[1]},
-  };
-  BinaryItemStream<CVType> ItemStream(llvm::support::little);
-  ItemStream.setItems(TypeArray);
-  VarStreamArray<CVType> TypeStream(ItemStream);
-
-  // Figure out the byte offset of the second item.
-  auto ItemOneIter = TypeStream.begin();
-  ++ItemOneIter;
-
-  // Set up a partial offsets buffer that contains the first and second items
-  // in separate chunks.
-  std::vector<TypeIndexOffset> TIO;
-  TIO.push_back({IndexZero, ulittle32_t(0u)});
-  TIO.push_back({IndexOne, ulittle32_t(ItemOneIter.offset())});
-  ArrayRef<uint8_t> Buffer(reinterpret_cast<const uint8_t *>(TIO.data()),
-                           TIO.size() * sizeof(TypeIndexOffset));
-
-  BinaryStreamReader Reader(Buffer, llvm::support::little);
-  FixedStreamArray<TypeIndexOffset> PartialOffsets;
-  ASSERT_THAT_ERROR(Reader.readArray(PartialOffsets, 2), Succeeded());
-
-  LazyRandomTypeCollection Types(TypeStream, 2, PartialOffsets);
-
-  StringRef Name = Types.getTypeName(IndexOne);
-  EXPECT_EQ("const FooClass", Name);
-}
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/CodeView/TypeHashingTest.cpp b/gnu/llvm/llvm/unittests/DebugInfo/CodeView/TypeHashingTest.cpp
deleted file mode 100644
index b4501c36fd2..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/CodeView/TypeHashingTest.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-//===- llvm/unittest/DebugInfo/CodeView/TypeHashingTest.cpp ---------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/DebugInfo/CodeView/TypeHashing.h"
-#include "llvm/DebugInfo/CodeView/AppendingTypeTableBuilder.h"
-#include "llvm/DebugInfo/CodeView/TypeRecord.h"
-
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::codeview;
-
-static TypeIndex createPointerRecord(AppendingTypeTableBuilder &Builder,
-                                     TypeIndex TI) {
-  PointerRecord PR(TypeRecordKind::Pointer);
-  PR.setAttrs(PointerKind::Near32, PointerMode::Pointer, PointerOptions::None,
-              4);
-  PR.ReferentType = TI;
-  return Builder.writeLeafType(PR);
-}
-
-static TypeIndex createArgListRecord(AppendingTypeTableBuilder &Builder,
-                                     TypeIndex Q, TypeIndex R) {
-  ArgListRecord AR(TypeRecordKind::ArgList);
-  AR.ArgIndices.push_back(Q);
-  AR.ArgIndices.push_back(R);
-  return Builder.writeLeafType(AR);
-}
-
-static TypeIndex createProcedureRecord(AppendingTypeTableBuilder &Builder,
-                                       uint32_t ParamCount, TypeIndex Return,
-                                       TypeIndex ArgList) {
-  ProcedureRecord PR(TypeRecordKind::Procedure);
-  PR.ArgumentList = ArgList;
-  PR.CallConv = CallingConvention::NearC;
-  PR.Options = FunctionOptions::None;
-  PR.ParameterCount = ParamCount;
-  PR.ReturnType = Return;
-  return Builder.writeLeafType(PR);
-}
-
-static ArrayRef<uint8_t> hash_of(ArrayRef<GloballyHashedType> Hashes,
-                                 TypeIndex TI) {
-  return Hashes[TI.toArrayIndex()].Hash;
-}
-
-static void verifyHashUniqueness(ArrayRef<GloballyHashedType> Hashes) {
-  assert(!Hashes.empty());
-
-  for (size_t I = 0; I < Hashes.size() - 1; ++I) {
-    for (size_t J = I + 1; J < Hashes.size(); ++J) {
-      EXPECT_NE(Hashes[I].Hash, Hashes[J].Hash);
-    }
-  }
-}
-
-TEST(TypeHashingTest, ContentHash) {
-  SimpleTypeSerializer Serializer;
-
-  TypeIndex CharStar(SimpleTypeKind::SignedCharacter,
-                     SimpleTypeMode::NearPointer32);
-
-  BumpPtrAllocator Alloc;
-  AppendingTypeTableBuilder Ordering1(Alloc);
-  AppendingTypeTableBuilder Ordering2(Alloc);
-
-  TypeIndex CharP(SimpleTypeKind::SignedCharacter, SimpleTypeMode::NearPointer);
-  TypeIndex IntP(SimpleTypeKind::Int32, SimpleTypeMode::NearPointer);
-  TypeIndex DoubleP(SimpleTypeKind::Float64, SimpleTypeMode::NearPointer);
-
-  // We're going to the same type sequence with two different orderings, and
-  // then confirm all records are hashed the same.
-
-  TypeIndex CharPP[2];
-  TypeIndex IntPP[2];
-  TypeIndex IntPPP[2];
-  TypeIndex DoublePP[2];
-  TypeIndex Args[2];
-  TypeIndex Proc[2];
-
-  // Ordering 1
-  // ----------------------------------------
-  // LF_POINTER             0x1000   {char**}
-  //   Referent = char*
-  // LF_POINTER             0x1001   {int**}
-  //   Referent = int*
-  // LF_POINTER             0x1002   {int***}
-  //   Referent = 0x1001
-  // LF_ARGLIST             0x1003   {(char**, int***)}
-  //   Arg[0] = 0x1000
-  //   Arg[1] = 0x1002
-  // LF_PROCEDURE           0x1004   {int** func(char**, int***)}
-  //   ArgList = 0x1003
-  //   ReturnType = 0x1001
-  std::vector<GloballyHashedType> Ordering1Hashes;
-  CharPP[0] = createPointerRecord(Ordering1, CharP);
-  IntPP[0] = createPointerRecord(Ordering1, IntP);
-  IntPPP[0] = createPointerRecord(Ordering1, IntPP[0]);
-  Args[0] = createArgListRecord(Ordering1, CharPP[0], IntPPP[0]);
-  Proc[0] = createProcedureRecord(Ordering1, 2, IntPP[0], Args[0]);
-
-  ASSERT_EQ(0x1000U, CharPP[0].getIndex());
-  ASSERT_EQ(0x1001U, IntPP[0].getIndex());
-  ASSERT_EQ(0x1002U, IntPPP[0].getIndex());
-  ASSERT_EQ(0x1003U, Args[0].getIndex());
-  ASSERT_EQ(0x1004U, Proc[0].getIndex());
-
-  auto Hashes1 = GloballyHashedType::hashTypes(Ordering1.records());
-
-  // Ordering 2
-  // ----------------------------------------
-  // LF_POINTER             0x1000   {int**}
-  //   Referent = int*
-  // LF_POINTER             0x1001   {int***}
-  //   Referent = 0x1000
-  // LF_POINTER             0x1002   {char**}
-  //   Referent = char*
-  // LF_POINTER             0x1003   {double**}
-  //   Referent = double*
-  // LF_ARGLIST             0x1004   {(char**, int***)}
-  //   Arg[0] = 0x1002
-  //   Arg[1] = 0x1001
-  // LF_PROCEDURE           0x1005   {int** func(char**, int***)}
-  //   ArgList = 0x1004
-  //   ReturnType = 0x1000
-  IntPP[1] = createPointerRecord(Ordering2, IntP);
-  IntPPP[1] = createPointerRecord(Ordering2, IntPP[1]);
-  CharPP[1] = createPointerRecord(Ordering2, CharP);
-  DoublePP[1] = createPointerRecord(Ordering2, DoubleP);
-  Args[1] = createArgListRecord(Ordering2, CharPP[1], IntPPP[1]);
-  Proc[1] = createProcedureRecord(Ordering2, 2, IntPP[1], Args[1]);
-  auto Hashes2 = GloballyHashedType::hashTypes(Ordering2.records());
-
-  ASSERT_EQ(0x1000U, IntPP[1].getIndex());
-  ASSERT_EQ(0x1001U, IntPPP[1].getIndex());
-  ASSERT_EQ(0x1002U, CharPP[1].getIndex());
-  ASSERT_EQ(0x1003U, DoublePP[1].getIndex());
-  ASSERT_EQ(0x1004U, Args[1].getIndex());
-  ASSERT_EQ(0x1005U, Proc[1].getIndex());
-
-  // Sanity check to make sure all same-ordering hashes are different
-  // from each other.
-  verifyHashUniqueness(Hashes1);
-  verifyHashUniqueness(Hashes2);
-
-  EXPECT_EQ(hash_of(Hashes1, IntPP[0]), hash_of(Hashes2, IntPP[1]));
-  EXPECT_EQ(hash_of(Hashes1, IntPPP[0]), hash_of(Hashes2, IntPPP[1]));
-  EXPECT_EQ(hash_of(Hashes1, CharPP[0]), hash_of(Hashes2, CharPP[1]));
-  EXPECT_EQ(hash_of(Hashes1, Args[0]), hash_of(Hashes2, Args[1]));
-  EXPECT_EQ(hash_of(Hashes1, Proc[0]), hash_of(Hashes2, Proc[1]));
-}
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/CodeView/TypeIndexDiscoveryTest.cpp b/gnu/llvm/llvm/unittests/DebugInfo/CodeView/TypeIndexDiscoveryTest.cpp
deleted file mode 100644
index e00240d7427..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/CodeView/TypeIndexDiscoveryTest.cpp
+++ /dev/null
@@ -1,609 +0,0 @@
-//===- llvm/unittest/DebugInfo/CodeView/TypeIndexDiscoveryTest.cpp --------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/DebugInfo/CodeView/TypeIndexDiscovery.h"
-
-#include "llvm/DebugInfo/CodeView/AppendingTypeTableBuilder.h"
-#include "llvm/DebugInfo/CodeView/ContinuationRecordBuilder.h"
-#include "llvm/DebugInfo/CodeView/SymbolSerializer.h"
-#include "llvm/Support/Allocator.h"
-
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::codeview;
-
-class TypeIndexIteratorTest : public testing::Test {
-public:
-  TypeIndexIteratorTest() {}
-
-  void SetUp() override {
-    Refs.clear();
-    TTB = std::make_unique<AppendingTypeTableBuilder>(Storage);
-    CRB = std::make_unique<ContinuationRecordBuilder>();
-    Symbols.clear();
-  }
-
-  void TearDown() override {
-    CRB.reset();
-    TTB.reset();
-  }
-
-protected:
-  template <typename... Indices>
-  bool checkTypeReferences(uint32_t RecordIndex, Indices &&... TIs) const {
-    EXPECT_EQ(sizeof...(Indices), countRefs(RecordIndex));
-
-    // Choose between type or symbol records. The checking code doesn't care
-    // which we have.
-    std::vector<ArrayRef<uint8_t>> CVRecords;
-    if (Symbols.empty()) {
-      CVRecords = TTB->records();
-    } else {
-      for (const CVSymbol &S : Symbols)
-        CVRecords.push_back(S.data());
-    }
-
-    return checkTypeReferencesImpl(RecordIndex, CVRecords,
-                                   std::forward<Indices>(TIs)...);
-  }
-
-  template <typename... T> void writeFieldList(T &&... MemberRecords) {
-    CRB->begin(ContinuationRecordKind::FieldList);
-    writeFieldListImpl(std::forward<T>(MemberRecords)...);
-    auto Records = CRB->end(TTB->nextTypeIndex());
-    ASSERT_EQ(1u, Records.size());
-    TTB->insertRecordBytes(Records.front().RecordData);
-    discoverAllTypeIndices();
-  }
-
-  template <typename... T> void writeTypeRecords(T &&... Records) {
-    writeTypeRecordsImpl(std::forward<T>(Records)...);
-    ASSERT_EQ(sizeof...(T), TTB->records().size());
-    discoverAllTypeIndices();
-  }
-
-  template <typename... T> void writeSymbolRecords(T &&... Records) {
-    writeSymbolRecordsImpl(std::forward<T>(Records)...);
-    ASSERT_EQ(sizeof...(T), Symbols.size());
-    discoverTypeIndicesInSymbols();
-  }
-
-  std::unique_ptr<AppendingTypeTableBuilder> TTB;
-
-private:
-  uint32_t countRefs(uint32_t RecordIndex) const {
-    auto &R = Refs[RecordIndex];
-    uint32_t Count = 0;
-    for (auto &Ref : R) {
-      Count += Ref.Count;
-    }
-    return Count;
-  }
-
-  bool checkOneTypeReference(uint32_t RecordIndex, ArrayRef<uint8_t> RecordData,
-                             TypeIndex TI) const {
-    RecordData = RecordData.drop_front(sizeof(RecordPrefix));
-    auto &RefList = Refs[RecordIndex];
-    for (auto &Ref : RefList) {
-      uint32_t Offset = Ref.Offset;
-      ArrayRef<uint8_t> Loc = RecordData.drop_front(Offset);
-      ArrayRef<TypeIndex> Indices(
-          reinterpret_cast<const TypeIndex *>(Loc.data()), Ref.Count);
-      if (llvm::any_of(Indices,
-                       [TI](const TypeIndex &Other) { return Other == TI; }))
-        return true;
-    }
-    return false;
-  }
-
-  template <typename... Indices>
-  bool checkTypeReferencesImpl(uint32_t RecordIndex,
-                               ArrayRef<ArrayRef<uint8_t>> CVRecords) const {
-    return true;
-  }
-
-  template <typename... Indices>
-  bool checkTypeReferencesImpl(uint32_t RecordIndex,
-                               ArrayRef<ArrayRef<uint8_t>> CVRecords,
-                               TypeIndex TI, Indices &&... Rest) const {
-    ArrayRef<uint8_t> Record = CVRecords[RecordIndex];
-    bool Success = checkOneTypeReference(RecordIndex, Record, TI);
-    EXPECT_TRUE(Success);
-    return Success & checkTypeReferencesImpl(RecordIndex, CVRecords,
-                                             std::forward<Indices>(Rest)...);
-  }
-
-  void discoverAllTypeIndices() {
-    Refs.resize(TTB->records().size());
-    for (uint32_t I = 0; I < TTB->records().size(); ++I) {
-      ArrayRef<uint8_t> Data = TTB->records()[I];
-      discoverTypeIndices(Data, Refs[I]);
-    }
-  }
-
-  void discoverTypeIndicesInSymbols() {
-    Refs.resize(Symbols.size());
-    for (uint32_t I = 0; I < Symbols.size(); ++I)
-      discoverTypeIndicesInSymbol(Symbols[I], Refs[I]);
-  }
-
-  // Helper function to write out a field list record with the given list
-  // of member records.
-  void writeFieldListImpl() {}
-
-  template <typename RecType, typename... Rest>
-  void writeFieldListImpl(RecType &&Record, Rest &&... Records) {
-    CRB->writeMemberType(Record);
-    writeFieldListImpl(std::forward<Rest>(Records)...);
-  }
-
-  // Helper function to write out a list of type records.
-  void writeTypeRecordsImpl() {}
-
-  template <typename RecType, typename... Rest>
-  void writeTypeRecordsImpl(RecType &&Record, Rest &&... Records) {
-    TTB->writeLeafType(Record);
-    writeTypeRecordsImpl(std::forward<Rest>(Records)...);
-  }
-
-  // Helper function to write out a list of symbol records.
-  void writeSymbolRecordsImpl() {}
-
-  template <typename RecType, typename... Rest>
-  void writeSymbolRecordsImpl(RecType &&Record, Rest &&... Records) {
-    Symbols.push_back(SymbolSerializer::writeOneSymbol(Record, Storage,
-                                                       CodeViewContainer::Pdb));
-    writeSymbolRecordsImpl(std::forward<Rest>(Records)...);
-  }
-
-  std::vector<SmallVector<TiReference, 4>> Refs;
-  std::unique_ptr<ContinuationRecordBuilder> CRB;
-  std::vector<CVSymbol> Symbols;
-  BumpPtrAllocator Storage;
-};
-
-namespace leafs {
-static FuncIdRecord FuncId(TypeIndex(1), TypeIndex(2), "FuncId");
-static MemberFuncIdRecord MemFuncId(TypeIndex(3), TypeIndex(4), "FuncId");
-static StringIdRecord StringId(TypeIndex(5), "TheString");
-static struct {
-  std::vector<TypeIndex> Ids = {TypeIndex(6), TypeIndex(7), TypeIndex(8)};
-  StringListRecord Record{TypeRecordKind::StringList, Ids};
-} StringList;
-static struct {
-  std::vector<TypeIndex> Ids = {TypeIndex(9), TypeIndex(10), TypeIndex(11)};
-  BuildInfoRecord Record{Ids};
-} BuildInfo;
-static UdtSourceLineRecord UdtSourceLine(TypeIndex(12), TypeIndex(13), 0);
-static UdtModSourceLineRecord UdtModSourceLine(TypeIndex(14), TypeIndex(15), 0,
-                                               0);
-static ModifierRecord Modifier(TypeIndex(16), ModifierOptions::None);
-static ProcedureRecord Procedure(TypeIndex(17), CallingConvention::PpcCall,
-                                 FunctionOptions::None, 0, TypeIndex(18));
-static MemberFunctionRecord MemberFunction(TypeIndex(19), TypeIndex(20),
-                                           TypeIndex(21),
-                                           CallingConvention::ThisCall,
-                                           FunctionOptions::None, 2,
-                                           TypeIndex(22), 0);
-static struct {
-  std::vector<TypeIndex> Ids = {TypeIndex(23), TypeIndex(24), TypeIndex(25)};
-  ArgListRecord Record{TypeRecordKind::ArgList, Ids};
-} ArgList;
-static ArrayRecord Array(TypeIndex(26), TypeIndex(27), 10, "MyArray");
-static ClassRecord Class(TypeRecordKind::Class, 3, ClassOptions::None,
-                         TypeIndex(28), TypeIndex(29), TypeIndex(30), 10,
-                         "MyClass", "MyClassUniqueName");
-static ClassRecord Struct(TypeRecordKind::Struct, 3, ClassOptions::None,
-                          TypeIndex(31), TypeIndex(32), TypeIndex(33), 10,
-                          "MyClass", "MyClassUniqueName");
-static UnionRecord Union(1, ClassOptions::None, TypeIndex(34), 10, "MyUnion",
-                         "MyUnionUniqueName");
-static EnumRecord Enum(1, ClassOptions::None, TypeIndex(35), "MyEnum",
-                       "EnumUniqueName", TypeIndex(36));
-static BitFieldRecord BitField(TypeIndex(37), 1, 0);
-static VFTableRecord VFTable(TypeIndex(38), TypeIndex(39), 1, "VFT", {});
-static VFTableShapeRecord VTableShape({});
-static struct {
-  const TypeIndex T1{40};
-  const TypeIndex T2{41};
-  const TypeIndex T3{42};
-  const TypeIndex T4{43};
-
-  std::vector<OneMethodRecord> Methods{
-      {T1, MemberAccess::Public, MethodKind::IntroducingVirtual,
-       MethodOptions::None, 0, "Method1"},
-      {T2, MemberAccess::Public, MethodKind::PureVirtual, MethodOptions::None,
-       0, "Method1"},
-      {T3, MemberAccess::Public, MethodKind::PureIntroducingVirtual,
-       MethodOptions::None, 0, "Method1"},
-      {T4, MemberAccess::Public, MethodKind::Static, MethodOptions::None, 0,
-       "Method1"}};
-
-  MethodOverloadListRecord Record{Methods};
-} MethodOverloadList;
-static PointerRecord Pointer(TypeIndex(44), PointerKind::Near32,
-                             PointerMode::Pointer, PointerOptions::Const, 3);
-static PointerRecord MemberPointer(
-    TypeIndex(45), PointerKind::Near32, PointerMode::PointerToDataMember,
-    PointerOptions::Const, 3,
-    MemberPointerInfo(TypeIndex(46),
-                      PointerToMemberRepresentation::GeneralData));
-}
-
-namespace members {
-static BaseClassRecord BaseClass(MemberAccess::Public, TypeIndex(47), 0);
-static EnumeratorRecord Enumerator(MemberAccess::Public,
-                                   APSInt(APInt(8, 3, false)), "Test");
-DataMemberRecord DataMember(MemberAccess::Public, TypeIndex(48), 0, "Test");
-OverloadedMethodRecord OverloadedMethod(3, TypeIndex(49), "MethodList");
-static struct {
-  const TypeIndex T1{50};
-  const TypeIndex T2{51};
-  const TypeIndex T3{52};
-  const TypeIndex T4{53};
-  OneMethodRecord R1{T1,
-                     MemberAccess::Public,
-                     MethodKind::IntroducingVirtual,
-                     MethodOptions::None,
-                     0,
-                     "M1"};
-  OneMethodRecord R2{T2,
-                     MemberAccess::Public,
-                     MethodKind::PureVirtual,
-                     MethodOptions::None,
-                     0,
-                     "M2"};
-  OneMethodRecord R3{T3,
-                     MemberAccess::Public,
-                     MethodKind::PureIntroducingVirtual,
-                     MethodOptions::None,
-                     0,
-                     "M3"};
-  OneMethodRecord R4{T4,
-                     MemberAccess::Protected,
-                     MethodKind::Vanilla,
-                     MethodOptions::CompilerGenerated,
-                     0,
-                     "M4"};
-} OneMethod;
-static NestedTypeRecord NestedType(TypeIndex(54), "MyClass");
-static StaticDataMemberRecord StaticDataMember(MemberAccess::Public,
-                                               TypeIndex(55), "Foo");
-static VirtualBaseClassRecord VirtualBaseClass(TypeRecordKind::VirtualBaseClass,
-                                               MemberAccess::Public,
-                                               TypeIndex(56), TypeIndex(57), 0,
-                                               0);
-static VFPtrRecord VFPtr(TypeIndex(58));
-static ListContinuationRecord Continuation(TypeIndex(59));
-}
-
-TEST_F(TypeIndexIteratorTest, FuncId) {
-  using namespace leafs;
-  writeTypeRecords(FuncId);
-  checkTypeReferences(0, FuncId.FunctionType, FuncId.ParentScope);
-}
-
-TEST_F(TypeIndexIteratorTest, MemFuncId) {
-  using namespace leafs;
-  writeTypeRecords(MemFuncId);
-  checkTypeReferences(0, MemFuncId.ClassType, MemFuncId.FunctionType);
-}
-
-TEST_F(TypeIndexIteratorTest, StringId) {
-  using namespace leafs;
-  writeTypeRecords(StringId);
-  checkTypeReferences(0, StringId.Id);
-}
-
-TEST_F(TypeIndexIteratorTest, SubstrList) {
-  using namespace leafs;
-  writeTypeRecords(StringList.Record);
-  checkTypeReferences(0, StringList.Ids[0], StringList.Ids[1],
-                      StringList.Ids[2]);
-}
-
-TEST_F(TypeIndexIteratorTest, BuildInfo) {
-  using namespace leafs;
-  writeTypeRecords(BuildInfo.Record);
-  checkTypeReferences(0, BuildInfo.Ids[0], BuildInfo.Ids[1], BuildInfo.Ids[2]);
-}
-
-TEST_F(TypeIndexIteratorTest, UdtSrcLine) {
-  using namespace leafs;
-  writeTypeRecords(UdtSourceLine);
-  checkTypeReferences(0, UdtSourceLine.UDT, UdtSourceLine.SourceFile);
-}
-
-TEST_F(TypeIndexIteratorTest, UdtModSrcLine) {
-  using namespace leafs;
-  writeTypeRecords(UdtModSourceLine);
-  checkTypeReferences(0, UdtModSourceLine.UDT, UdtModSourceLine.SourceFile);
-}
-
-TEST_F(TypeIndexIteratorTest, Modifier) {
-  using namespace leafs;
-  writeTypeRecords(Modifier);
-  checkTypeReferences(0, Modifier.ModifiedType);
-}
-
-TEST_F(TypeIndexIteratorTest, Procedure) {
-  using namespace leafs;
-  writeTypeRecords(Procedure);
-  checkTypeReferences(0, Procedure.ReturnType, Procedure.ArgumentList);
-}
-
-TEST_F(TypeIndexIteratorTest, MemFunc) {
-  using namespace leafs;
-  writeTypeRecords(MemberFunction);
-  checkTypeReferences(0, MemberFunction.ReturnType, MemberFunction.ClassType,
-                      MemberFunction.ThisType, MemberFunction.ArgumentList);
-}
-
-TEST_F(TypeIndexIteratorTest, ArgList) {
-  using namespace leafs;
-  writeTypeRecords(ArgList.Record);
-  checkTypeReferences(0, ArgList.Ids[0], ArgList.Ids[1], ArgList.Ids[2]);
-}
-
-TEST_F(TypeIndexIteratorTest, Array) {
-  using namespace leafs;
-  writeTypeRecords(Array);
-  checkTypeReferences(0, Array.ElementType, Array.IndexType);
-}
-
-TEST_F(TypeIndexIteratorTest, Class) {
-  using namespace leafs;
-  writeTypeRecords(Class);
-  checkTypeReferences(0, Class.FieldList, Class.DerivationList,
-                      Class.VTableShape);
-}
-
-TEST_F(TypeIndexIteratorTest, Struct) {
-  using namespace leafs;
-  writeTypeRecords(Struct);
-  checkTypeReferences(0, Struct.FieldList, Struct.DerivationList,
-                      Struct.VTableShape);
-}
-
-TEST_F(TypeIndexIteratorTest, Union) {
-  using namespace leafs;
-  writeTypeRecords(Union);
-  checkTypeReferences(0, Union.FieldList);
-}
-
-TEST_F(TypeIndexIteratorTest, Enum) {
-  using namespace leafs;
-  writeTypeRecords(Enum);
-  checkTypeReferences(0, Enum.FieldList, Enum.UnderlyingType);
-}
-
-TEST_F(TypeIndexIteratorTest, Bitfield) {
-  using namespace leafs;
-  writeTypeRecords(BitField);
-  checkTypeReferences(0, BitField.Type);
-}
-
-TEST_F(TypeIndexIteratorTest, VTable) {
-  using namespace leafs;
-  writeTypeRecords(VFTable);
-  checkTypeReferences(0, VFTable.CompleteClass, VFTable.OverriddenVFTable);
-}
-
-TEST_F(TypeIndexIteratorTest, VTShape) {
-  using namespace leafs;
-  writeTypeRecords(VTableShape);
-  checkTypeReferences(0);
-}
-
-TEST_F(TypeIndexIteratorTest, OverloadList) {
-  using namespace leafs;
-  writeTypeRecords(MethodOverloadList.Record);
-  checkTypeReferences(0, MethodOverloadList.T1, MethodOverloadList.T2,
-                      MethodOverloadList.T3, MethodOverloadList.T4);
-}
-
-TEST_F(TypeIndexIteratorTest, Pointer) {
-  using namespace leafs;
-  writeTypeRecords(Pointer);
-  checkTypeReferences(0, Pointer.ReferentType);
-}
-
-TEST_F(TypeIndexIteratorTest, MemberPointer) {
-  using namespace leafs;
-  writeTypeRecords(MemberPointer);
-  checkTypeReferences(0, MemberPointer.ReferentType,
-                      MemberPointer.MemberInfo->ContainingType);
-}
-
-TEST_F(TypeIndexIteratorTest, ManyTypes) {
-
-  using namespace leafs;
-  writeTypeRecords(FuncId, MemFuncId, StringId, StringList.Record,
-                   BuildInfo.Record, UdtSourceLine, UdtModSourceLine, Modifier,
-                   Procedure, MemberFunction, ArgList.Record, Array, Class,
-                   Union, Enum, BitField, VFTable, VTableShape,
-                   MethodOverloadList.Record, Pointer, MemberPointer);
-
-  checkTypeReferences(0, FuncId.FunctionType, FuncId.ParentScope);
-  checkTypeReferences(1, MemFuncId.ClassType, MemFuncId.FunctionType);
-  checkTypeReferences(2, StringId.Id);
-  checkTypeReferences(3, StringList.Ids[0], StringList.Ids[1],
-                      StringList.Ids[2]);
-  checkTypeReferences(4, BuildInfo.Ids[0], BuildInfo.Ids[1], BuildInfo.Ids[2]);
-  checkTypeReferences(5, UdtSourceLine.UDT, UdtSourceLine.SourceFile);
-  checkTypeReferences(6, UdtModSourceLine.UDT, UdtModSourceLine.SourceFile);
-  checkTypeReferences(7, Modifier.ModifiedType);
-  checkTypeReferences(8, Procedure.ReturnType, Procedure.ArgumentList);
-  checkTypeReferences(9, MemberFunction.ReturnType, MemberFunction.ClassType,
-                      MemberFunction.ThisType, MemberFunction.ArgumentList);
-  checkTypeReferences(10, ArgList.Ids[0], ArgList.Ids[1], ArgList.Ids[2]);
-  checkTypeReferences(11, Array.ElementType, Array.IndexType);
-  checkTypeReferences(12, Class.FieldList, Class.DerivationList,
-                      Class.VTableShape);
-  checkTypeReferences(13, Union.FieldList);
-  checkTypeReferences(14, Enum.FieldList, Enum.UnderlyingType);
-  checkTypeReferences(15, BitField.Type);
-  checkTypeReferences(16, VFTable.CompleteClass, VFTable.OverriddenVFTable);
-  checkTypeReferences(17);
-  checkTypeReferences(18, MethodOverloadList.T1, MethodOverloadList.T2,
-                      MethodOverloadList.T3, MethodOverloadList.T4);
-  checkTypeReferences(19, Pointer.ReferentType);
-  checkTypeReferences(20, MemberPointer.ReferentType,
-                      MemberPointer.MemberInfo->ContainingType);
-}
-
-TEST_F(TypeIndexIteratorTest, FieldListBaseClass) {
-  using namespace members;
-  writeFieldList(BaseClass);
-  checkTypeReferences(0, BaseClass.Type);
-}
-
-TEST_F(TypeIndexIteratorTest, FieldListEnumerator) {
-  using namespace members;
-  writeFieldList(Enumerator);
-  checkTypeReferences(0);
-}
-
-TEST_F(TypeIndexIteratorTest, FieldListMember) {
-  using namespace members;
-  writeFieldList(DataMember);
-  checkTypeReferences(0, DataMember.Type);
-}
-
-TEST_F(TypeIndexIteratorTest, FieldListMethod) {
-  using namespace members;
-  writeFieldList(OverloadedMethod);
-  checkTypeReferences(0, OverloadedMethod.MethodList);
-}
-
-TEST_F(TypeIndexIteratorTest, FieldListOneMethod) {
-  using namespace members;
-  writeFieldList(OneMethod.R1, OneMethod.R2, OneMethod.R3, OneMethod.R4);
-  checkTypeReferences(0, OneMethod.T1, OneMethod.T2, OneMethod.T3,
-                      OneMethod.T4);
-}
-
-TEST_F(TypeIndexIteratorTest, FieldListNestedType) {
-  using namespace members;
-  writeFieldList(NestedType);
-  checkTypeReferences(0, NestedType.Type);
-}
-
-TEST_F(TypeIndexIteratorTest, FieldListStaticMember) {
-  using namespace members;
-  writeFieldList(StaticDataMember);
-  checkTypeReferences(0, StaticDataMember.Type);
-}
-
-TEST_F(TypeIndexIteratorTest, FieldListVirtualBase) {
-  using namespace members;
-  writeFieldList(VirtualBaseClass);
-  checkTypeReferences(0, VirtualBaseClass.BaseType, VirtualBaseClass.VBPtrType);
-}
-
-TEST_F(TypeIndexIteratorTest, FieldListVFTable) {
-  using namespace members;
-  writeFieldList(VFPtr);
-  checkTypeReferences(0, VFPtr.Type);
-}
-
-TEST_F(TypeIndexIteratorTest, FieldListContinuation) {
-  using namespace members;
-  writeFieldList(Continuation);
-  checkTypeReferences(0, Continuation.ContinuationIndex);
-}
-
-TEST_F(TypeIndexIteratorTest, ManyMembers) {
-  using namespace members;
-  writeFieldList(BaseClass, Enumerator, DataMember, OverloadedMethod,
-                 OneMethod.R1, OneMethod.R2, OneMethod.R3, OneMethod.R4,
-                 NestedType, StaticDataMember, VirtualBaseClass, VFPtr,
-                 Continuation);
-
-  checkTypeReferences(
-      0, BaseClass.Type, DataMember.Type, OverloadedMethod.MethodList,
-      OneMethod.T1, OneMethod.T2, OneMethod.T3, OneMethod.T4, NestedType.Type,
-      StaticDataMember.Type, VirtualBaseClass.BaseType,
-      VirtualBaseClass.VBPtrType, VFPtr.Type, Continuation.ContinuationIndex);
-}
-
-TEST_F(TypeIndexIteratorTest, ProcSym) {
-  ProcSym GS(SymbolRecordKind::GlobalProcSym);
-  GS.FunctionType = TypeIndex::Float32();
-  ProcSym LS(SymbolRecordKind::ProcSym);
-  LS.FunctionType = TypeIndex::Float64();
-  writeSymbolRecords(GS, LS);
-  checkTypeReferences(0, GS.FunctionType);
-  checkTypeReferences(1, LS.FunctionType);
-}
-
-TEST_F(TypeIndexIteratorTest, DataSym) {
-  DataSym DS(SymbolRecordKind::GlobalData);
-  DS.Type = TypeIndex::Float32();
-  writeSymbolRecords(DS);
-  checkTypeReferences(0, DS.Type);
-}
-
-TEST_F(TypeIndexIteratorTest, RegisterSym) {
-  RegisterSym Reg(SymbolRecordKind::RegisterSym);
-  Reg.Index = TypeIndex::UInt32();
-  Reg.Register = RegisterId::EAX;
-  Reg.Name = "Target";
-  writeSymbolRecords(Reg);
-  checkTypeReferences(0, Reg.Index);
-}
-
-TEST_F(TypeIndexIteratorTest, CallerSym) {
-  CallerSym Callees(SymbolRecordKind::CalleeSym);
-  Callees.Indices.push_back(TypeIndex(1));
-  Callees.Indices.push_back(TypeIndex(2));
-  Callees.Indices.push_back(TypeIndex(3));
-  CallerSym Callers(SymbolRecordKind::CallerSym);
-  Callers.Indices.push_back(TypeIndex(4));
-  Callers.Indices.push_back(TypeIndex(5));
-  Callers.Indices.push_back(TypeIndex(6));
-  CallerSym Inlinees(SymbolRecordKind::InlineesSym);
-  Inlinees.Indices.push_back(TypeIndex(7));
-  Inlinees.Indices.push_back(TypeIndex(8));
-  Inlinees.Indices.push_back(TypeIndex(9));
-  writeSymbolRecords(Callees, Callers, Inlinees);
-  checkTypeReferences(0, TypeIndex(1), TypeIndex(2), TypeIndex(3));
-  checkTypeReferences(1, TypeIndex(4), TypeIndex(5), TypeIndex(6));
-  checkTypeReferences(2, TypeIndex(7), TypeIndex(8), TypeIndex(9));
-}
-
-TEST_F(TypeIndexIteratorTest, Precomp) {
-  PrecompRecord P(TypeRecordKind::Precomp);
-  P.StartTypeIndex = TypeIndex::FirstNonSimpleIndex;
-  P.TypesCount = 100;
-  P.Signature = 0x12345678;
-  P.PrecompFilePath = "C:/precomp.obj";
-
-  EndPrecompRecord EP(TypeRecordKind::EndPrecomp);
-  EP.Signature = P.Signature;
-
-  writeTypeRecords(P, EP);
-  checkTypeReferences(0);
-}
-
-// This is a test for getEncodedIntegerLength()
-TEST_F(TypeIndexIteratorTest, VariableSizeIntegers) {
-  BaseClassRecord BaseClass1(MemberAccess::Public, TypeIndex(47), (uint64_t)-1);
-  BaseClassRecord BaseClass2(MemberAccess::Public, TypeIndex(48), 1);
-  writeFieldList(BaseClass1, BaseClass2);
-  checkTypeReferences(0, TypeIndex(47), TypeIndex(48));
-}
-
-TEST_F(TypeIndexIteratorTest, UsingNamespace) {
-  UsingNamespaceSym UN(SymbolRecordKind::UsingNamespaceSym);
-  UN.Name = "std";
-  writeSymbolRecords(UN);
-  checkTypeReferences(0);
-}
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/DWARF/CMakeLists.txt b/gnu/llvm/llvm/unittests/DebugInfo/DWARF/CMakeLists.txt
deleted file mode 100644
index 29cdec9064f..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/DWARF/CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
-  AsmPrinter
-  BinaryFormat
-  DebugInfoDWARF
-  MC
-  Object
-  ObjectYAML
-  Support
-  )
-
-add_llvm_unittest(DebugInfoDWARFTests
-  DwarfGenerator.cpp
-  DwarfUtils.cpp
-  DWARFAcceleratorTableTest.cpp
-  DWARFDataExtractorTest.cpp
-  DWARFDebugArangeSetTest.cpp
-  DWARFDebugFrameTest.cpp
-  DWARFDebugInfoTest.cpp
-  DWARFDebugLineTest.cpp
-  DWARFDieTest.cpp
-  DWARFDieManualExtractTest.cpp
-  DWARFExpressionCompactPrinterTest.cpp
-  DWARFFormValueTest.cpp
-  DWARFListTableTest.cpp
-  DWARFLocationExpressionTest.cpp
-  )
-
-target_link_libraries(DebugInfoDWARFTests PRIVATE LLVMTestingSupport)
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFAcceleratorTableTest.cpp b/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFAcceleratorTableTest.cpp
deleted file mode 100644
index 38f3e076ace..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFAcceleratorTableTest.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-//===- DWARFAcceleratorTableTest.cpp --------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h"
-#include "llvm/DebugInfo/DWARF/DWARFContext.h"
-#include "llvm/Testing/Support/Error.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-static Error ExtractDebugNames(StringRef NamesSecData, StringRef StrSecData) {
-  DWARFDataExtractor NamesExtractor(NamesSecData,
-                                    /*isLittleEndian=*/true,
-                                    /*AddrSize=*/4);
-  DataExtractor StrExtractor(StrSecData,
-                             /*isLittleEndian=*/true,
-                             /*AddrSize=*/4);
-  DWARFDebugNames Table(NamesExtractor, StrExtractor);
-  return Table.extract();
-}
-
-namespace {
-
-TEST(DWARFDebugNames, ReservedUnitLength) {
-  static const char NamesSecData[64] =
-      "\xf0\xff\xff\xff"; // Reserved unit length value
-  EXPECT_THAT_ERROR(
-      ExtractDebugNames(StringRef(NamesSecData, sizeof(NamesSecData)),
-                        StringRef()),
-      FailedWithMessage("parsing .debug_names header at 0x0: unsupported "
-                        "reserved unit length of value 0xfffffff0"));
-}
-
-TEST(DWARFDebugNames, TooSmallForDWARF64) {
-  // DWARF64 header takes at least 44 bytes.
-  static const char NamesSecData[43] = "\xff\xff\xff\xff"; // DWARF64 mark
-  EXPECT_THAT_ERROR(
-      ExtractDebugNames(StringRef(NamesSecData, sizeof(NamesSecData)),
-                        StringRef()),
-      FailedWithMessage("parsing .debug_names header at 0x0: unexpected end of "
-                        "data at offset 0x2b while reading [0x28, 0x2c)"));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFDataExtractorTest.cpp b/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFDataExtractorTest.cpp
deleted file mode 100644
index 449442f36cf..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFDataExtractorTest.cpp
+++ /dev/null
@@ -1,227 +0,0 @@
-//===- DWARFDataExtractorTest.cpp -----------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/DebugInfo/DWARF/DWARFDataExtractor.h"
-#include "llvm/DebugInfo/DWARF/DWARFContext.h"
-#include "llvm/Object/ObjectFile.h"
-#include "llvm/ObjectYAML/yaml2obj.h"
-#include "llvm/Testing/Support/Error.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST(DWARFDataExtractorTest, getRelocatedValue) {
-  StringRef Yaml = R"(
-!ELF
-FileHeader:
-  Class:    ELFCLASS32
-  Data:     ELFDATA2LSB
-  Type:     ET_REL
-  Machine:  EM_386
-Sections:
-  - Name:     .text
-    Type:     SHT_PROGBITS
-    Size:     0x80
-  - Name:     .debug_line
-    Type:     SHT_PROGBITS
-    Content:  '000000000000'
-  - Name:     .rel.debug_line
-    Type:     SHT_REL
-    Info:     .debug_line
-    Relocations:
-      - Offset:   0
-        Symbol:   f
-        Type:     R_386_32
-      - Offset:   4
-        Symbol:   f
-        Type:     R_386_32
-Symbols:
-  - Name:     f
-    Type:     STT_SECTION
-    Section:  .text
-    Value:    0x42
-)";
-  SmallString<0> Storage;
-  std::unique_ptr<object::ObjectFile> Obj = yaml::yaml2ObjectFile(
-      Storage, Yaml, [](const Twine &Err) { errs() << Err; });
-  ASSERT_TRUE(Obj);
-  std::unique_ptr<DWARFContext> Ctx = DWARFContext::create(*Obj);
-  const DWARFObject &DObj = Ctx->getDWARFObj();
-  ASSERT_EQ(6u, DObj.getLineSection().Data.size());
-
-  DWARFDataExtractor Data(DObj, DObj.getLineSection(), Obj->isLittleEndian(),
-                          Obj->getBytesInAddress());
-  DataExtractor::Cursor C(0);
-  EXPECT_EQ(0x42u, Data.getRelocatedAddress(C));
-  EXPECT_EQ(0u, Data.getRelocatedAddress(C));
-  EXPECT_THAT_ERROR(
-      C.takeError(),
-      FailedWithMessage(
-          "unexpected end of data at offset 0x6 while reading [0x4, 0x8)"));
-}
-
-TEST(DWARFDataExtractorTest, getInitialLength) {
-  auto GetWithError = [](ArrayRef<uint8_t> Bytes)
-      -> Expected<std::tuple<uint64_t, dwarf::DwarfFormat, uint64_t>> {
-    DWARFDataExtractor Data(Bytes, /*IsLittleEndian=*/false, /*AddressSize=*/8);
-    DWARFDataExtractor::Cursor C(0);
-    uint64_t Length;
-    dwarf::DwarfFormat Format;
-    std::tie(Length, Format) = Data.getInitialLength(C);
-    if (C)
-      return std::make_tuple(Length, Format, C.tell());
-
-    EXPECT_EQ(Length, 0u);
-    EXPECT_EQ(Format, dwarf::DWARF32);
-    EXPECT_EQ(C.tell(), 0u);
-    return C.takeError();
-  };
-  auto GetWithoutError = [](ArrayRef<uint8_t> Bytes) {
-    DWARFDataExtractor Data(Bytes, /*IsLittleEndian=*/false, /*AddressSize=*/8);
-    uint64_t Offset = 0;
-    uint64_t Length;
-    dwarf::DwarfFormat Format;
-    std::tie(Length, Format) = Data.getInitialLength(&Offset);
-    return std::make_tuple(Length, Format, Offset);
-  };
-  auto ErrorResult = std::make_tuple(0, dwarf::DWARF32, 0);
-
-  // Empty data.
-  EXPECT_THAT_EXPECTED(
-      GetWithError({}),
-      FailedWithMessage(
-          "unexpected end of data at offset 0x0 while reading [0x0, 0x4)"));
-  EXPECT_EQ(GetWithoutError({}), ErrorResult);
-
-  // Not long enough for the U32 field.
-  EXPECT_THAT_EXPECTED(
-      GetWithError({0x00, 0x01, 0x02}),
-      FailedWithMessage(
-          "unexpected end of data at offset 0x3 while reading [0x0, 0x4)"));
-  EXPECT_EQ(GetWithoutError({0x00, 0x01, 0x02}), ErrorResult);
-
-  EXPECT_THAT_EXPECTED(
-      GetWithError({0x00, 0x01, 0x02, 0x03}),
-      HasValue(std::make_tuple(0x00010203, dwarf::DWARF32, 4)));
-  EXPECT_EQ(GetWithoutError({0x00, 0x01, 0x02, 0x03}),
-            std::make_tuple(0x00010203, dwarf::DWARF32, 4));
-
-  // Zeroes are not an error, but without the Error object it is hard to tell
-  // them apart from a failed read.
-  EXPECT_THAT_EXPECTED(
-      GetWithError({0x00, 0x00, 0x00, 0x00}),
-      HasValue(std::make_tuple(0x00000000, dwarf::DWARF32, 4)));
-  EXPECT_EQ(GetWithoutError({0x00, 0x00, 0x00, 0x00}),
-            std::make_tuple(0x00000000, dwarf::DWARF32, 4));
-
-  // Smallest invalid value.
-  EXPECT_THAT_EXPECTED(
-      GetWithError({0xff, 0xff, 0xff, 0xf0}),
-      FailedWithMessage(
-          "unsupported reserved unit length of value 0xfffffff0"));
-  EXPECT_EQ(GetWithoutError({0xff, 0xff, 0xff, 0xf0}), ErrorResult);
-
-  // DWARF64 marker without the subsequent length field.
-  EXPECT_THAT_EXPECTED(
-      GetWithError({0xff, 0xff, 0xff, 0xff}),
-      FailedWithMessage(
-          "unexpected end of data at offset 0x4 while reading [0x4, 0xc)"));
-  EXPECT_EQ(GetWithoutError({0xff, 0xff, 0xff, 0xff}), ErrorResult);
-
-  // Not enough data for the U64 length.
-  EXPECT_THAT_EXPECTED(
-      GetWithError({0xff, 0xff, 0xff, 0xff, 0x00, 0x01, 0x02, 0x03}),
-      FailedWithMessage(
-          "unexpected end of data at offset 0x8 while reading [0x4, 0xc)"));
-  EXPECT_EQ(GetWithoutError({0xff, 0xff, 0xff, 0xff, 0x00, 0x01, 0x02, 0x03}),
-            ErrorResult);
-
-  EXPECT_THAT_EXPECTED(
-      GetWithError({0xff, 0xff, 0xff, 0xff, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
-                    0x06, 0x07}),
-      HasValue(std::make_tuple(0x0001020304050607, dwarf::DWARF64, 12)));
-  EXPECT_EQ(GetWithoutError({0xff, 0xff, 0xff, 0xff, 0x00, 0x01, 0x02, 0x03,
-                             0x04, 0x05, 0x06, 0x07}),
-            std::make_tuple(0x0001020304050607, dwarf::DWARF64, 12));
-}
-
-TEST(DWARFDataExtractorTest, Truncation) {
-  StringRef Yaml = R"(
-!ELF
-FileHeader:
-  Class:    ELFCLASS32
-  Data:     ELFDATA2LSB
-  Type:     ET_REL
-  Machine:  EM_386
-Sections:
-  - Name:     .text
-    Type:     SHT_PROGBITS
-    Size:     0x80
-  - Name:     .debug_line
-    Type:     SHT_PROGBITS
-    Content:  '616263640000000065666768'
-  - Name:     .rel.debug_line
-    Type:     SHT_REL
-    Info:     .debug_line
-    Relocations:
-      - Offset:   4
-        Symbol:   f
-        Type:     R_386_32
-Symbols:
-  - Name:     f
-    Type:     STT_SECTION
-    Section:  .text
-    Value:    0x42
-)";
-  SmallString<0> Storage;
-  std::unique_ptr<object::ObjectFile> Obj = yaml::yaml2ObjectFile(
-      Storage, Yaml, [](const Twine &Err) { errs() << Err; });
-  ASSERT_TRUE(Obj);
-  std::unique_ptr<DWARFContext> Ctx = DWARFContext::create(*Obj);
-  const DWARFObject &DObj = Ctx->getDWARFObj();
-  ASSERT_EQ(12u, DObj.getLineSection().Data.size());
-
-  DWARFDataExtractor Data(DObj, DObj.getLineSection(), Obj->isLittleEndian(),
-                          Obj->getBytesInAddress());
-  DataExtractor::Cursor C(0);
-  EXPECT_EQ(0x64636261u, Data.getRelocatedAddress(C));
-  EXPECT_EQ(0x42u, Data.getRelocatedAddress(C));
-  EXPECT_EQ(0x68676665u, Data.getRelocatedAddress(C));
-  EXPECT_THAT_ERROR(C.takeError(), Succeeded());
-
-  C = DataExtractor::Cursor{0};
-  DWARFDataExtractor Truncated8(Data, 8);
-  EXPECT_EQ(0x64636261u, Truncated8.getRelocatedAddress(C));
-  EXPECT_EQ(0x42u, Truncated8.getRelocatedAddress(C));
-  EXPECT_EQ(0x0u, Truncated8.getRelocatedAddress(C));
-  EXPECT_THAT_ERROR(
-      C.takeError(),
-      FailedWithMessage(
-          "unexpected end of data at offset 0x8 while reading [0x8, 0xc)"));
-
-  C = DataExtractor::Cursor{0};
-  DWARFDataExtractor Truncated6(Data, 6);
-  EXPECT_EQ(0x64636261u, Truncated6.getRelocatedAddress(C));
-  EXPECT_EQ(0x0u, Truncated6.getRelocatedAddress(C));
-  EXPECT_THAT_ERROR(
-      C.takeError(),
-      FailedWithMessage(
-          "unexpected end of data at offset 0x6 while reading [0x4, 0x8)"));
-
-  C = DataExtractor::Cursor{0};
-  DWARFDataExtractor Truncated2(Data, 2);
-  EXPECT_EQ(0x0u, Truncated2.getRelocatedAddress(C));
-  EXPECT_THAT_ERROR(
-      C.takeError(),
-      FailedWithMessage(
-          "unexpected end of data at offset 0x2 while reading [0x0, 0x4)"));
-}
-
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFDebugArangeSetTest.cpp b/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFDebugArangeSetTest.cpp
deleted file mode 100644
index bdd4ca5b019..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFDebugArangeSetTest.cpp
+++ /dev/null
@@ -1,271 +0,0 @@
-//===- llvm/unittest/DebugInfo/DWARFDebugArangeSetTest.cpp-----------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/DebugInfo/DWARF/DWARFDebugArangeSet.h"
-#include "llvm/Testing/Support/Error.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-struct WarningHandler {
-  ~WarningHandler() { EXPECT_THAT_ERROR(std::move(Err), Succeeded()); }
-
-  void operator()(Error E) { Err = joinErrors(std::move(Err), std::move(E)); }
-
-  Error getWarning() { return std::move(Err); }
-
-  Error Err = Error::success();
-};
-
-template <size_t SecSize>
-void ExpectExtractError(const char (&SecDataRaw)[SecSize],
-                        const char *ErrorMessage) {
-  DWARFDataExtractor Extractor(StringRef(SecDataRaw, SecSize - 1),
-                               /* IsLittleEndian = */ true,
-                               /* AddressSize = */ 4);
-  DWARFDebugArangeSet Set;
-  uint64_t Offset = 0;
-  WarningHandler Warnings;
-  Error E = Set.extract(Extractor, &Offset, Warnings);
-  ASSERT_TRUE(E.operator bool());
-  EXPECT_STREQ(ErrorMessage, toString(std::move(E)).c_str());
-}
-
-TEST(DWARFDebugArangeSet, LengthExceedsSectionSize) {
-  static const char DebugArangesSecRaw[] =
-      "\x15\x00\x00\x00" // The length exceeds the section boundaries
-      "\x02\x00"         // Version
-      "\x00\x00\x00\x00" // Debug Info Offset
-      "\x04"             // Address Size
-      "\x00"             // Segment Selector Size
-      "\x00\x00\x00\x00" // Padding
-      "\x00\x00\x00\x00" // Termination tuple
-      "\x00\x00\x00\x00";
-  ExpectExtractError(
-      DebugArangesSecRaw,
-      "the length of address range table at offset 0x0 exceeds section size");
-}
-
-TEST(DWARFDebugArangeSet, LengthExceedsSectionSizeDWARF64) {
-  static const char DebugArangesSecRaw[] =
-      "\xff\xff\xff\xff"                 // DWARF64 mark
-      "\x15\x00\x00\x00\x00\x00\x00\x00" // The length exceeds the section
-                                         // boundaries
-      "\x02\x00"                         // Version
-      "\x00\x00\x00\x00\x00\x00\x00\x00" // Debug Info Offset
-      "\x04"                             // Address Size
-      "\x00"                             // Segment Selector Size
-                                         // No padding
-      "\x00\x00\x00\x00"                 // Termination tuple
-      "\x00\x00\x00\x00";
-  ExpectExtractError(
-      DebugArangesSecRaw,
-      "the length of address range table at offset 0x0 exceeds section size");
-}
-
-TEST(DWARFDebugArangeSet, UnsupportedAddressSize) {
-  static const char DebugArangesSecRaw[] =
-      "\x0c\x00\x00\x00"  // Length
-      "\x02\x00"          // Version
-      "\x00\x00\x00\x00"  // Debug Info Offset
-      "\x02"              // Address Size (not supported)
-      "\x00"              // Segment Selector Size
-                          // No padding
-      "\x00\x00\x00\x00"; // Termination tuple
-  ExpectExtractError(
-      DebugArangesSecRaw,
-      "address range table at offset 0x0 has unsupported address size: 2 "
-      "(4 and 8 supported)");
-}
-
-TEST(DWARFDebugArangeSet, UnsupportedSegmentSelectorSize) {
-  static const char DebugArangesSecRaw[] =
-      "\x14\x00\x00\x00" // Length
-      "\x02\x00"         // Version
-      "\x00\x00\x00\x00" // Debug Info Offset
-      "\x04"             // Address Size
-      "\x04"             // Segment Selector Size (not supported)
-                         // No padding
-      "\x00\x00\x00\x00" // Termination tuple
-      "\x00\x00\x00\x00"
-      "\x00\x00\x00\x00";
-  ExpectExtractError(
-      DebugArangesSecRaw,
-      "non-zero segment selector size in address range table at offset 0x0 "
-      "is not supported");
-}
-
-TEST(DWARFDebugArangeSet, NoTerminationEntry) {
-  static const char DebugArangesSecRaw[] =
-      "\x14\x00\x00\x00" // Length
-      "\x02\x00"         // Version
-      "\x00\x00\x00\x00" // Debug Info Offset
-      "\x04"             // Address Size
-      "\x00"             // Segment Selector Size
-      "\x00\x00\x00\x00" // Padding
-      "\x00\x00\x00\x00" // Entry: Address
-      "\x01\x00\x00\x00" //        Length
-      ;                  // No termination tuple
-  ExpectExtractError(
-      DebugArangesSecRaw,
-      "address range table at offset 0x0 is not terminated by null entry");
-}
-
-TEST(DWARFDebugArangeSet, ReservedUnitLength) {
-  // Note: 12 is the minimum length to pass the basic check for the size of
-  // the section. 1 will be automatically subtracted in ExpectExtractError().
-  static const char DebugArangesSecRaw[12 + 1] =
-      "\xf0\xff\xff\xff"; // Reserved unit length value
-  ExpectExtractError(DebugArangesSecRaw,
-                     "parsing address ranges table at offset 0x0: unsupported "
-                     "reserved unit length of value 0xfffffff0");
-}
-
-TEST(DWARFDebugArangeSet, SectionTooShort) {
-  // Note: 1 will be automatically subtracted in ExpectExtractError().
-  static const char DebugArangesSecRaw[11 + 1] = {0};
-  ExpectExtractError(DebugArangesSecRaw,
-                     "parsing address ranges table at offset 0x0: unexpected "
-                     "end of data at offset 0xb while reading [0xb, 0xc)");
-}
-
-TEST(DWARFDebugArangeSet, SectionTooShortDWARF64) {
-  // Note: 1 will be automatically subtracted in ExpectExtractError().
-  static const char DebugArangesSecRaw[23 + 1] =
-      "\xff\xff\xff\xff"; // DWARF64 mark
-  ExpectExtractError(DebugArangesSecRaw,
-                     "parsing address ranges table at offset 0x0: unexpected "
-                     "end of data at offset 0x17 while reading [0x17, 0x18)");
-}
-
-TEST(DWARFDebugArangeSet, NoSpaceForEntries) {
-  static const char DebugArangesSecRaw[] =
-      "\x0c\x00\x00\x00" // Length
-      "\x02\x00"         // Version
-      "\x00\x00\x00\x00" // Debug Info Offset
-      "\x04"             // Address Size
-      "\x00"             // Segment Selector Size
-      "\x00\x00\x00\x00" // Padding
-      ;                  // No entries
-  ExpectExtractError(
-      DebugArangesSecRaw,
-      "address range table at offset 0x0 has an insufficient length "
-      "to contain any entries");
-}
-
-TEST(DWARFDebugArangeSet, UnevenLength) {
-  static const char DebugArangesSecRaw[] =
-      "\x1b\x00\x00\x00" // Length (not a multiple of tuple size)
-      "\x02\x00"         // Version
-      "\x00\x00\x00\x00" // Debug Info Offset
-      "\x04"             // Address Size
-      "\x00"             // Segment Selector Size
-      "\x00\x00\x00\x00" // Padding
-      "\x00\x00\x00\x00" // Entry: Address
-      "\x01\x00\x00\x00" //        Length
-      "\x00\x00\x00\x00" // Termination tuple
-      "\x00\x00\x00\x00";
-  ExpectExtractError(
-      DebugArangesSecRaw,
-      "address range table at offset 0x0 has length that is not a multiple "
-      "of the tuple size");
-}
-
-TEST(DWARFDebugArangeSet, ZeroAddressEntry) {
-  static const char DebugArangesSecRaw[] =
-      "\x1c\x00\x00\x00" // Length
-      "\x02\x00"         // Version
-      "\x00\x00\x00\x00" // Debug Info Offset
-      "\x04"             // Address Size
-      "\x00"             // Segment Selector Size
-      "\x00\x00\x00\x00" // Padding
-      "\x00\x00\x00\x00" // Entry1: Address
-      "\x01\x00\x00\x00" //         Length
-      "\x00\x00\x00\x00" // Termination tuple
-      "\x00\x00\x00\x00";
-  DWARFDataExtractor Extractor(
-      StringRef(DebugArangesSecRaw, sizeof(DebugArangesSecRaw) - 1),
-      /*IsLittleEndian=*/true,
-      /*AddressSize=*/4);
-  DWARFDebugArangeSet Set;
-  uint64_t Offset = 0;
-  ASSERT_THAT_ERROR(Set.extract(Extractor, &Offset, WarningHandler()),
-                    Succeeded());
-  auto Range = Set.descriptors();
-  auto Iter = Range.begin();
-  ASSERT_EQ(std::distance(Iter, Range.end()), 1);
-  EXPECT_EQ(Iter->Address, 0u);
-  EXPECT_EQ(Iter->Length, 1u);
-}
-
-TEST(DWARFDebugArangeSet, ZeroLengthEntry) {
-  static const char DebugArangesSecRaw[] =
-      "\x1c\x00\x00\x00" // Length
-      "\x02\x00"         // Version
-      "\x00\x00\x00\x00" // Debug Info Offset
-      "\x04"             // Address Size
-      "\x00"             // Segment Selector Size
-      "\x00\x00\x00\x00" // Padding
-      "\x01\x00\x00\x00" // Entry1: Address
-      "\x00\x00\x00\x00" //         Length
-      "\x00\x00\x00\x00" // Termination tuple
-      "\x00\x00\x00\x00";
-  DWARFDataExtractor Extractor(
-      StringRef(DebugArangesSecRaw, sizeof(DebugArangesSecRaw) - 1),
-      /*IsLittleEndian=*/true,
-      /*AddressSize=*/4);
-  DWARFDebugArangeSet Set;
-  uint64_t Offset = 0;
-  ASSERT_THAT_ERROR(Set.extract(Extractor, &Offset, WarningHandler()),
-                    Succeeded());
-  auto Range = Set.descriptors();
-  auto Iter = Range.begin();
-  ASSERT_EQ(std::distance(Iter, Range.end()), 1);
-  EXPECT_EQ(Iter->Address, 1u);
-  EXPECT_EQ(Iter->Length, 0u);
-}
-
-TEST(DWARFDebugArangesSet, PrematureTerminator) {
-  static const char DebugArangesSecRaw[] =
-      "\x24\x00\x00\x00" // Length
-      "\x02\x00"         // Version
-      "\x00\x00\x00\x00" // Debug Info Offset
-      "\x04"             // Address Size
-      "\x00"             // Segment Selector Size
-      "\x00\x00\x00\x00" // Padding
-      "\x00\x00\x00\x00" // Entry1: Premature
-      "\x00\x00\x00\x00" //         terminator
-      "\x01\x00\x00\x00" // Entry2: Address
-      "\x01\x00\x00\x00" //         Length
-      "\x00\x00\x00\x00" // Termination tuple
-      "\x00\x00\x00\x00";
-  DWARFDataExtractor Extractor(
-      StringRef(DebugArangesSecRaw, sizeof(DebugArangesSecRaw) - 1),
-      /*IsLittleEndian=*/true,
-      /*AddressSize=*/4);
-  DWARFDebugArangeSet Set;
-  uint64_t Offset = 0;
-  WarningHandler Warnings;
-  ASSERT_THAT_ERROR(Set.extract(Extractor, &Offset, Warnings), Succeeded());
-  auto Range = Set.descriptors();
-  auto Iter = Range.begin();
-  ASSERT_EQ(std::distance(Iter, Range.end()), 2);
-  EXPECT_EQ(Iter->Address, 0u);
-  EXPECT_EQ(Iter->Length, 0u);
-  ++Iter;
-  EXPECT_EQ(Iter->Address, 1u);
-  EXPECT_EQ(Iter->Length, 1u);
-  EXPECT_THAT_ERROR(
-      Warnings.getWarning(),
-      FailedWithMessage("address range table at offset 0x0 has a premature "
-                        "terminator entry at offset 0x10"));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFDebugFrameTest.cpp b/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFDebugFrameTest.cpp
deleted file mode 100644
index 83cffe6a9e6..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFDebugFrameTest.cpp
+++ /dev/null
@@ -1,1650 +0,0 @@
-//===- llvm/unittest/DebugInfo/DWARFDebugFrameTest.cpp --------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/DenseSet.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/BinaryFormat/Dwarf.h"
-#include "llvm/DebugInfo/DWARF/DWARFDebugFrame.h"
-#include "llvm/Testing/Support/Error.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-dwarf::CIE createCIE(bool IsDWARF64, uint64_t Offset, uint64_t Length) {
-  return dwarf::CIE(IsDWARF64, Offset, Length,
-                    /*Version=*/3,
-                    /*Augmentation=*/StringRef(),
-                    /*AddressSize=*/8,
-                    /*SegmentDescriptorSize=*/0,
-                    /*CodeAlignmentFactor=*/1,
-                    /*DataAlignmentFactor=*/-8,
-                    /*ReturnAddressRegister=*/16,
-                    /*AugmentationData=*/StringRef(),
-                    /*FDEPointerEncoding=*/dwarf::DW_EH_PE_absptr,
-                    /*LSDAPointerEncoding=*/dwarf::DW_EH_PE_omit,
-                    /*Personality=*/None,
-                    /*PersonalityEnc=*/None,
-                    /*Arch=*/Triple::x86_64);
-}
-
-void expectDumpResult(const dwarf::CIE &TestCIE, bool IsEH,
-                      StringRef ExpectedFirstLine) {
-  std::string Output;
-  raw_string_ostream OS(Output);
-  TestCIE.dump(OS, DIDumpOptions(), /*MRI=*/nullptr, IsEH);
-  OS.flush();
-  StringRef FirstLine = StringRef(Output).split('\n').first;
-  EXPECT_EQ(FirstLine, ExpectedFirstLine);
-}
-
-void expectDumpResult(const dwarf::FDE &TestFDE, bool IsEH,
-                      StringRef ExpectedFirstLine) {
-  std::string Output;
-  raw_string_ostream OS(Output);
-  TestFDE.dump(OS, DIDumpOptions(), /*MRI=*/nullptr, IsEH);
-  OS.flush();
-  StringRef FirstLine = StringRef(Output).split('\n').first;
-  EXPECT_EQ(FirstLine, ExpectedFirstLine);
-}
-
-TEST(DWARFDebugFrame, DumpDWARF32CIE) {
-  dwarf::CIE TestCIE = createCIE(/*IsDWARF64=*/false,
-                                 /*Offset=*/0x1111abcd,
-                                 /*Length=*/0x2222abcd);
-  expectDumpResult(TestCIE, /*IsEH=*/false, "1111abcd 2222abcd ffffffff CIE");
-}
-
-TEST(DWARFDebugFrame, DumpDWARF64CIE) {
-  dwarf::CIE TestCIE = createCIE(/*IsDWARF64=*/true,
-                                 /*Offset=*/0x1111abcdabcd,
-                                 /*Length=*/0x2222abcdabcd);
-  expectDumpResult(TestCIE, /*IsEH=*/false,
-                   "1111abcdabcd 00002222abcdabcd ffffffffffffffff CIE");
-}
-
-TEST(DWARFDebugFrame, DumpEHCIE) {
-  dwarf::CIE TestCIE = createCIE(/*IsDWARF64=*/false,
-                                 /*Offset=*/0x1000,
-                                 /*Length=*/0x20);
-  expectDumpResult(TestCIE, /*IsEH=*/true, "00001000 00000020 00000000 CIE");
-}
-
-TEST(DWARFDebugFrame, DumpEH64CIE) {
-  dwarf::CIE TestCIE = createCIE(/*IsDWARF64=*/true,
-                                 /*Offset=*/0x1000,
-                                 /*Length=*/0x20);
-  expectDumpResult(TestCIE, /*IsEH=*/true,
-                   "00001000 0000000000000020 00000000 CIE");
-}
-
-TEST(DWARFDebugFrame, DumpDWARF64FDE) {
-  dwarf::CIE TestCIE = createCIE(/*IsDWARF64=*/true,
-                                 /*Offset=*/0x1111abcdabcd,
-                                 /*Length=*/0x2222abcdabcd);
-  dwarf::FDE TestFDE(/*IsDWARF64=*/true,
-                     /*Offset=*/0x3333abcdabcd,
-                     /*Length=*/0x4444abcdabcd,
-                     /*CIEPointer=*/0x1111abcdabcd,
-                     /*InitialLocation=*/0x5555abcdabcd,
-                     /*AddressRange=*/0x111111111111,
-                     /*Cie=*/&TestCIE,
-                     /*LSDAAddress=*/None,
-                     /*Arch=*/Triple::x86_64);
-  expectDumpResult(TestFDE, /*IsEH=*/false,
-                   "3333abcdabcd 00004444abcdabcd 00001111abcdabcd FDE "
-                   "cie=1111abcdabcd pc=5555abcdabcd...6666bcdebcde");
-}
-
-TEST(DWARFDebugFrame, DumpEH64FDE) {
-  dwarf::CIE TestCIE = createCIE(/*IsDWARF64=*/true,
-                                 /*Offset=*/0x1111ab9a000c,
-                                 /*Length=*/0x20);
-  dwarf::FDE TestFDE(/*IsDWARF64=*/true,
-                     /*Offset=*/0x1111abcdabcd,
-                     /*Length=*/0x2222abcdabcd,
-                     /*CIEPointer=*/0x33abcd,
-                     /*InitialLocation=*/0x4444abcdabcd,
-                     /*AddressRange=*/0x111111111111,
-                     /*Cie=*/&TestCIE,
-                     /*LSDAAddress=*/None,
-                     /*Arch=*/Triple::x86_64);
-  expectDumpResult(TestFDE, /*IsEH=*/true,
-                   "1111abcdabcd 00002222abcdabcd 0033abcd FDE "
-                   "cie=1111ab9a000c pc=4444abcdabcd...5555bcdebcde");
-}
-
-static Error parseCFI(dwarf::CIE &C, ArrayRef<uint8_t> Instructions,
-                      Optional<uint64_t> Size = None) {
-  DWARFDataExtractor Data(Instructions, /*IsLittleEndian=*/true,
-                          /*AddressSize=*/8);
-  uint64_t Offset = 0;
-  const uint64_t EndOffset = Size ? *Size : (uint64_t)Instructions.size();
-  return C.cfis().parse(Data, &Offset, EndOffset);
-}
-
-static Error parseCFI(dwarf::FDE &FDE, ArrayRef<uint8_t> Instructions) {
-  DWARFDataExtractor Data(Instructions, /*IsLittleEndian=*/true,
-                          /*AddressSize=*/8);
-  uint64_t Offset = 0;
-  return FDE.cfis().parse(Data, &Offset, Instructions.size());
-}
-
-TEST(DWARFDebugFrame, InvalidCFIOpcodesTest) {
-  llvm::DenseSet<uint8_t> ValidExtendedOpcodes = {
-      dwarf::DW_CFA_nop,
-      dwarf::DW_CFA_advance_loc,
-      dwarf::DW_CFA_offset,
-      dwarf::DW_CFA_restore,
-      dwarf::DW_CFA_set_loc,
-      dwarf::DW_CFA_advance_loc1,
-      dwarf::DW_CFA_advance_loc2,
-      dwarf::DW_CFA_advance_loc4,
-      dwarf::DW_CFA_offset_extended,
-      dwarf::DW_CFA_restore_extended,
-      dwarf::DW_CFA_undefined,
-      dwarf::DW_CFA_same_value,
-      dwarf::DW_CFA_register,
-      dwarf::DW_CFA_remember_state,
-      dwarf::DW_CFA_restore_state,
-      dwarf::DW_CFA_def_cfa,
-      dwarf::DW_CFA_def_cfa_register,
-      dwarf::DW_CFA_def_cfa_offset,
-      dwarf::DW_CFA_def_cfa_expression,
-      dwarf::DW_CFA_expression,
-      dwarf::DW_CFA_offset_extended_sf,
-      dwarf::DW_CFA_def_cfa_sf,
-      dwarf::DW_CFA_def_cfa_offset_sf,
-      dwarf::DW_CFA_LLVM_def_aspace_cfa,
-      dwarf::DW_CFA_LLVM_def_aspace_cfa_sf,
-      dwarf::DW_CFA_val_offset,
-      dwarf::DW_CFA_val_offset_sf,
-      dwarf::DW_CFA_val_expression,
-      dwarf::DW_CFA_MIPS_advance_loc8,
-      dwarf::DW_CFA_GNU_window_save,
-      dwarf::DW_CFA_AARCH64_negate_ra_state,
-      dwarf::DW_CFA_GNU_args_size};
-
-  dwarf::CIE TestCIE = createCIE(/*IsDWARF64=*/false,
-                                 /*Offset=*/0x0,
-                                 /*Length=*/0xff);
-
-  // See DWARF standard v3, section 7.23: low 6 bits are used to encode an
-  // extended opcode.
-  for (uint8_t Code = 0; Code <= 63; ++Code) {
-    if (ValidExtendedOpcodes.count(Code))
-      continue;
-
-    EXPECT_THAT_ERROR(parseCFI(TestCIE, Code),
-                      FailedWithMessage(("invalid extended CFI opcode 0x" +
-                                         Twine::utohexstr(Code))
-                                            .str()
-                                            .c_str()));
-  }
-}
-
-// Here we test how truncated Call Frame Instructions are parsed.
-TEST(DWARFDebugFrame, ParseTruncatedCFITest) {
-  dwarf::CIE TestCIE = createCIE(/*IsDWARF64=*/false,
-                                 /*Offset=*/0x0,
-                                 /*Length=*/0xff);
-
-  // Having an empty instructions list is fine.
-  EXPECT_THAT_ERROR(parseCFI(TestCIE, {}), Succeeded());
-
-  // Unable to read an opcode, because the instructions list is empty, but we
-  // say to the parser that it is not.
-  EXPECT_THAT_ERROR(
-      parseCFI(TestCIE, {}, /*Size=*/1),
-      FailedWithMessage(
-          "unexpected end of data at offset 0x0 while reading [0x0, 0x1)"));
-
-  // Unable to read a truncated DW_CFA_offset instruction.
-  EXPECT_THAT_ERROR(
-      parseCFI(TestCIE, {dwarf::DW_CFA_offset}),
-      FailedWithMessage("unable to decode LEB128 at offset 0x00000001: "
-                        "malformed uleb128, extends past end"));
-
-  // Unable to read a truncated DW_CFA_set_loc instruction.
-  EXPECT_THAT_ERROR(
-      parseCFI(TestCIE, {dwarf::DW_CFA_set_loc}),
-      FailedWithMessage(
-          "unexpected end of data at offset 0x1 while reading [0x1, 0x9)"));
-
-  // Unable to read a truncated DW_CFA_advance_loc1 instruction.
-  EXPECT_THAT_ERROR(
-      parseCFI(TestCIE, {dwarf::DW_CFA_advance_loc1}),
-      FailedWithMessage(
-          "unexpected end of data at offset 0x1 while reading [0x1, 0x2)"));
-
-  // Unable to read a truncated DW_CFA_advance_loc2 instruction.
-  EXPECT_THAT_ERROR(
-      parseCFI(TestCIE, {dwarf::DW_CFA_advance_loc2}),
-      FailedWithMessage(
-          "unexpected end of data at offset 0x1 while reading [0x1, 0x3)"));
-
-  // Unable to read a truncated DW_CFA_advance_loc4 instruction.
-  EXPECT_THAT_ERROR(
-      parseCFI(TestCIE, {dwarf::DW_CFA_advance_loc4}),
-      FailedWithMessage(
-          "unexpected end of data at offset 0x1 while reading [0x1, 0x5)"));
-
-  // A test for an instruction with a single ULEB128 operand.
-  auto CheckOp_ULEB128 = [&](uint8_t Inst) {
-    EXPECT_THAT_ERROR(
-        parseCFI(TestCIE, Inst),
-        FailedWithMessage("unable to decode LEB128 at offset 0x00000001: "
-                          "malformed uleb128, extends past end"));
-  };
-
-  for (uint8_t Inst :
-       {dwarf::DW_CFA_restore_extended, dwarf::DW_CFA_undefined,
-        dwarf::DW_CFA_same_value, dwarf::DW_CFA_def_cfa_register,
-        dwarf::DW_CFA_def_cfa_offset, dwarf::DW_CFA_GNU_args_size})
-    CheckOp_ULEB128(Inst);
-
-  // Unable to read a truncated DW_CFA_def_cfa_offset_sf instruction.
-  EXPECT_THAT_ERROR(
-      parseCFI(TestCIE, {dwarf::DW_CFA_def_cfa_offset_sf}),
-      FailedWithMessage("unable to decode LEB128 at offset 0x00000001: "
-                        "malformed sleb128, extends past end"));
-
-  // A test for an instruction with two ULEB128 operands.
-  auto CheckOp_ULEB128_ULEB128 = [&](uint8_t Inst) {
-    EXPECT_THAT_ERROR(
-        parseCFI(TestCIE, Inst),
-        FailedWithMessage("unable to decode LEB128 at offset 0x00000001: "
-                          "malformed uleb128, extends past end"));
-
-    EXPECT_THAT_ERROR(
-        parseCFI(TestCIE, {Inst, /*Op1=*/0}),
-        FailedWithMessage("unable to decode LEB128 at offset 0x00000002: "
-                          "malformed uleb128, extends past end"));
-  };
-
-  for (uint8_t Inst : {dwarf::DW_CFA_offset_extended, dwarf::DW_CFA_register,
-                       dwarf::DW_CFA_def_cfa, dwarf::DW_CFA_LLVM_def_aspace_cfa,
-                       dwarf::DW_CFA_val_offset})
-    CheckOp_ULEB128_ULEB128(Inst);
-
-  // A test for an instruction with two operands: ULEB128, SLEB128.
-  auto CheckOp_ULEB128_SLEB128 = [&](uint8_t Inst) {
-    EXPECT_THAT_ERROR(
-        parseCFI(TestCIE, Inst),
-        FailedWithMessage("unable to decode LEB128 at offset 0x00000001: "
-                          "malformed uleb128, extends past end"));
-
-    EXPECT_THAT_ERROR(
-        parseCFI(TestCIE, {Inst, /*Op1=*/0}),
-        FailedWithMessage("unable to decode LEB128 at offset 0x00000002: "
-                          "malformed sleb128, extends past end"));
-  };
-
-  for (uint8_t Inst :
-       {dwarf::DW_CFA_offset_extended_sf, dwarf::DW_CFA_def_cfa_sf,
-        dwarf::DW_CFA_LLVM_def_aspace_cfa_sf, dwarf::DW_CFA_val_offset_sf})
-    CheckOp_ULEB128_SLEB128(Inst);
-
-  // Unable to read a truncated DW_CFA_def_cfa_expression instruction.
-  EXPECT_THAT_ERROR(
-      parseCFI(TestCIE, {dwarf::DW_CFA_def_cfa_expression}),
-      FailedWithMessage("unable to decode LEB128 at offset 0x00000001: "
-                        "malformed uleb128, extends past end"));
-  EXPECT_THAT_ERROR(
-      parseCFI(TestCIE, {dwarf::DW_CFA_def_cfa_expression,
-                         /*expression length=*/0x1}),
-      FailedWithMessage(
-          "unexpected end of data at offset 0x2 while reading [0x2, 0x3)"));
-  // The DW_CFA_def_cfa_expression can contain a zero length expression.
-  EXPECT_THAT_ERROR(parseCFI(TestCIE, {dwarf::DW_CFA_def_cfa_expression,
-                                       /*ExprLen=*/0}),
-                    Succeeded());
-
-  // A test for an instruction with three operands: ULEB128, expression length
-  // (ULEB128) and expression bytes.
-  auto CheckOp_ULEB128_Expr = [&](uint8_t Inst) {
-    EXPECT_THAT_ERROR(
-        parseCFI(TestCIE, {Inst}),
-        FailedWithMessage("unable to decode LEB128 at offset 0x00000001: "
-                          "malformed uleb128, extends past end"));
-    EXPECT_THAT_ERROR(
-        parseCFI(TestCIE, {Inst, /*Op1=*/0}),
-        FailedWithMessage("unable to decode LEB128 at offset 0x00000002: "
-                          "malformed uleb128, extends past end"));
-    // A zero length expression is fine
-    EXPECT_THAT_ERROR(parseCFI(TestCIE, {Inst,
-                                         /*Op1=*/0, /*ExprLen=*/0}),
-                      Succeeded());
-    EXPECT_THAT_ERROR(
-        parseCFI(TestCIE, {Inst,
-                           /*Op1=*/0, /*ExprLen=*/1}),
-        FailedWithMessage(
-            "unexpected end of data at offset 0x3 while reading [0x3, 0x4)"));
-  };
-
-  for (uint8_t Inst : {dwarf::DW_CFA_expression, dwarf::DW_CFA_val_expression})
-    CheckOp_ULEB128_Expr(Inst);
-}
-
-void expectDumpResult(const dwarf::UnwindLocation &Loc,
-                      StringRef ExpectedFirstLine) {
-  std::string Output;
-  raw_string_ostream OS(Output);
-  OS << Loc;
-  OS.flush();
-  StringRef FirstLine = StringRef(Output).split('\n').first;
-  EXPECT_EQ(FirstLine, ExpectedFirstLine);
-}
-
-TEST(DWARFDebugFrame, DumpUnwindLocations) {
-  // Test constructing unwind locations and dumping each kind.
-  constexpr int32_t PlusOff = 8;
-  constexpr int32_t MinusOff = -8;
-  constexpr uint8_t RegNum = 12;
-  expectDumpResult(dwarf::UnwindLocation::createUnspecified(), "unspecified");
-  expectDumpResult(dwarf::UnwindLocation::createUndefined(), "undefined");
-  expectDumpResult(dwarf::UnwindLocation::createSame(), "same");
-  expectDumpResult(dwarf::UnwindLocation::createIsCFAPlusOffset(PlusOff),
-                   "CFA+8");
-  expectDumpResult(dwarf::UnwindLocation::createIsCFAPlusOffset(MinusOff),
-                   "CFA-8");
-  expectDumpResult(dwarf::UnwindLocation::createAtCFAPlusOffset(PlusOff),
-                   "[CFA+8]");
-  expectDumpResult(dwarf::UnwindLocation::createAtCFAPlusOffset(MinusOff),
-                   "[CFA-8]");
-
-  expectDumpResult(
-      dwarf::UnwindLocation::createIsRegisterPlusOffset(RegNum, PlusOff),
-      "reg12+8");
-  expectDumpResult(
-      dwarf::UnwindLocation::createIsRegisterPlusOffset(RegNum, MinusOff),
-      "reg12-8");
-  expectDumpResult(
-      dwarf::UnwindLocation::createAtRegisterPlusOffset(RegNum, PlusOff),
-      "[reg12+8]");
-  expectDumpResult(
-      dwarf::UnwindLocation::createAtRegisterPlusOffset(RegNum, MinusOff),
-      "[reg12-8]");
-  expectDumpResult(dwarf::UnwindLocation::createIsConstant(12), "12");
-  expectDumpResult(dwarf::UnwindLocation::createIsConstant(-32), "-32");
-}
-
-void expectDumpResult(const dwarf::RegisterLocations &Locs,
-                      StringRef ExpectedFirstLine) {
-  std::string Output;
-  raw_string_ostream OS(Output);
-  OS << Locs;
-  OS.flush();
-  StringRef FirstLine = StringRef(Output).split('\n').first;
-  EXPECT_EQ(FirstLine, ExpectedFirstLine);
-}
-
-TEST(DWARFDebugFrame, RegisterLocations) {
-  // Test the functionality of the RegisterLocations class.
-  dwarf::RegisterLocations Locs;
-  expectDumpResult(Locs, "");
-  EXPECT_FALSE(Locs.hasLocations());
-  // Set a register location for reg12 to unspecified and verify it dumps
-  // correctly.
-  Locs.setRegisterLocation(12, dwarf::UnwindLocation::createUnspecified());
-  EXPECT_TRUE(Locs.hasLocations());
-  expectDumpResult(Locs, "reg12=unspecified");
-
-  // Replace the register location for reg12 to "same" and verify it dumps
-  // correctly after it is modified
-  Locs.setRegisterLocation(12, dwarf::UnwindLocation::createSame());
-  EXPECT_TRUE(Locs.hasLocations());
-  expectDumpResult(Locs, "reg12=same");
-
-  // Remove the register location for reg12 verify it dumps correctly after it
-  // is removed.
-  Locs.removeRegisterLocation(12);
-  EXPECT_FALSE(Locs.hasLocations());
-  expectDumpResult(Locs, "");
-
-  // Verify multiple registers added to the list dump correctly.
-  auto Reg12Loc = dwarf::UnwindLocation::createAtCFAPlusOffset(4);
-  auto Reg13Loc = dwarf::UnwindLocation::createAtCFAPlusOffset(8);
-  auto Reg14Loc = dwarf::UnwindLocation::createSame();
-  Locs.setRegisterLocation(12, Reg12Loc);
-  Locs.setRegisterLocation(13, Reg13Loc);
-  Locs.setRegisterLocation(14, Reg14Loc);
-  EXPECT_TRUE(Locs.hasLocations());
-  expectDumpResult(Locs, "reg12=[CFA+4], reg13=[CFA+8], reg14=same");
-
-  // Verify RegisterLocations::getRegisterLocation() works as expected.
-  Optional<dwarf::UnwindLocation> OptionalLoc;
-  OptionalLoc = Locs.getRegisterLocation(0);
-  EXPECT_FALSE(OptionalLoc.hasValue());
-
-  OptionalLoc = Locs.getRegisterLocation(12);
-  EXPECT_TRUE(OptionalLoc.hasValue());
-  EXPECT_EQ(*OptionalLoc, Reg12Loc);
-
-  OptionalLoc = Locs.getRegisterLocation(13);
-  EXPECT_TRUE(OptionalLoc.hasValue());
-  EXPECT_EQ(*OptionalLoc, Reg13Loc);
-
-  OptionalLoc = Locs.getRegisterLocation(14);
-  EXPECT_TRUE(OptionalLoc.hasValue());
-  EXPECT_EQ(*OptionalLoc, Reg14Loc);
-
-  // Verify registers are correctly removed when multiple exist in the list.
-  Locs.removeRegisterLocation(13);
-  EXPECT_FALSE(Locs.getRegisterLocation(13).hasValue());
-  EXPECT_TRUE(Locs.hasLocations());
-  expectDumpResult(Locs, "reg12=[CFA+4], reg14=same");
-  Locs.removeRegisterLocation(14);
-  EXPECT_FALSE(Locs.getRegisterLocation(14).hasValue());
-  EXPECT_TRUE(Locs.hasLocations());
-  expectDumpResult(Locs, "reg12=[CFA+4]");
-  Locs.removeRegisterLocation(12);
-  EXPECT_FALSE(Locs.getRegisterLocation(12).hasValue());
-  EXPECT_FALSE(Locs.hasLocations());
-  expectDumpResult(Locs, "");
-}
-
-// Test that empty rows are not added to UnwindTable when
-// dwarf::CIE::CFIs or dwarf::FDE::CFIs is empty.
-TEST(DWARFDebugFrame, UnwindTableEmptyRows) {
-  dwarf::CIE TestCIE = createCIE(/*IsDWARF64=*/false,
-                                 /*Offset=*/0x0,
-                                 /*Length=*/0xff);
-
-  // Having an empty instructions list is fine.
-  EXPECT_THAT_ERROR(parseCFI(TestCIE, {}), Succeeded());
-  EXPECT_TRUE(TestCIE.cfis().empty());
-
-  // Verify dwarf::UnwindTable::create() won't result in errors and
-  // and empty rows are not added to CIE UnwindTable.
-  Expected<dwarf::UnwindTable> RowsOrErr = dwarf::UnwindTable::create(&TestCIE);
-  EXPECT_THAT_ERROR(RowsOrErr.takeError(), Succeeded());
-  const size_t ExpectedNumOfRows = 0;
-  EXPECT_EQ(RowsOrErr->size(), ExpectedNumOfRows);
-
-  dwarf::FDE TestFDE(/*IsDWARF64=*/true,
-                     /*Offset=*/0x3333abcdabcd,
-                     /*Length=*/0x4444abcdabcd,
-                     /*CIEPointer=*/0x1111abcdabcd,
-                     /*InitialLocation=*/0x1000,
-                     /*AddressRange=*/0x1000,
-                     /*Cie=*/&TestCIE,
-                     /*LSDAAddress=*/None,
-                     /*Arch=*/Triple::x86_64);
-
-  // Having an empty instructions list is fine.
-  EXPECT_THAT_ERROR(parseCFI(TestFDE, {}), Succeeded());
-  EXPECT_TRUE(TestFDE.cfis().empty());
-
-  // Verify dwarf::UnwindTable::create() won't result in errors and
-  // and empty rows are not added to FDE UnwindTable.
-  RowsOrErr = dwarf::UnwindTable::create(&TestFDE);
-  EXPECT_THAT_ERROR(RowsOrErr.takeError(), Succeeded());
-  EXPECT_EQ(RowsOrErr->size(), ExpectedNumOfRows);
-}
-
-// Test that empty rows are not added to UnwindTable when dwarf::CIE::CFIs
-// or dwarf::FDE::CFIs is not empty but has only DW_CFA_nop instructions.
-TEST(DWARFDebugFrame, UnwindTableEmptyRows_NOPs) {
-  dwarf::CIE TestCIE = createCIE(/*IsDWARF64=*/false,
-                                 /*Offset=*/0x0,
-                                 /*Length=*/0xff);
-
-  // Make a CIE that has only DW_CFA_nop instructions.
-  EXPECT_THAT_ERROR(parseCFI(TestCIE, {dwarf::DW_CFA_nop}), Succeeded());
-  EXPECT_TRUE(!TestCIE.cfis().empty());
-
-  // Verify dwarf::UnwindTable::create() won't result in errors and
-  // and empty rows are not added to CIE UnwindTable.
-  Expected<dwarf::UnwindTable> RowsOrErr = dwarf::UnwindTable::create(&TestCIE);
-  EXPECT_THAT_ERROR(RowsOrErr.takeError(), Succeeded());
-  const size_t ExpectedNumOfRows = 0;
-  EXPECT_EQ(RowsOrErr->size(), ExpectedNumOfRows);
-
-  dwarf::FDE TestFDE(/*IsDWARF64=*/true,
-                     /*Offset=*/0x3333abcdabcd,
-                     /*Length=*/0x4444abcdabcd,
-                     /*CIEPointer=*/0x1111abcdabcd,
-                     /*InitialLocation=*/0x1000,
-                     /*AddressRange=*/0x1000,
-                     /*Cie=*/&TestCIE,
-                     /*LSDAAddress=*/None,
-                     /*Arch=*/Triple::x86_64);
-
-  // Make an FDE that has only DW_CFA_nop instructions.
-  EXPECT_THAT_ERROR(parseCFI(TestFDE, {dwarf::DW_CFA_nop}), Succeeded());
-  EXPECT_TRUE(!TestFDE.cfis().empty());
-
-  // Verify dwarf::UnwindTable::create() won't result in errors and
-  // and empty rows are not added to FDE UnwindTable.
-  RowsOrErr = dwarf::UnwindTable::create(&TestFDE);
-  EXPECT_THAT_ERROR(RowsOrErr.takeError(), Succeeded());
-  EXPECT_EQ(RowsOrErr->size(), ExpectedNumOfRows);
-}
-
-TEST(DWARFDebugFrame, UnwindTableErrorNonAscendingFDERows) {
-  dwarf::CIE TestCIE = createCIE(/*IsDWARF64=*/false,
-                                 /*Offset=*/0x0,
-                                 /*Length=*/0xff);
-
-  dwarf::FDE TestFDE(/*IsDWARF64=*/true,
-                     /*Offset=*/0x3333abcdabcd,
-                     /*Length=*/0x4444abcdabcd,
-                     /*CIEPointer=*/0x1111abcdabcd,
-                     /*InitialLocation=*/0x1000,
-                     /*AddressRange=*/0x1000,
-                     /*Cie=*/&TestCIE,
-                     /*LSDAAddress=*/None,
-                     /*Arch=*/Triple::x86_64);
-
-  // Make a CIE that has a valid CFA definition.
-  constexpr uint8_t Reg = 12;
-  constexpr uint8_t Offset = 32;
-  EXPECT_THAT_ERROR(parseCFI(TestCIE, {dwarf::DW_CFA_def_cfa, Reg, Offset}),
-                    Succeeded());
-
-  // Make a FDE with DWARF call frame instruction opcodes that have valid
-  // syntax, but will cause an error when we parse them into a UnwindTable.
-  // Here we encode two DW_CFA_set_loc opcodes:
-  //   DW_CFA_set_loc(0x1100)
-  //   DW_CFA_set_loc(0x1000)
-  // These opcodes cause a new row to be appended to the rows in a UnwindTable
-  // and the resulting rows are not in ascending address order and should cause
-  // a state machine error.
-  EXPECT_THAT_ERROR(
-      parseCFI(TestFDE, {dwarf::DW_CFA_set_loc, 0x00, 0x11, 0, 0, 0, 0, 0, 0,
-                         dwarf::DW_CFA_set_loc, 0x00, 0x10, 0, 0, 0, 0, 0, 0}),
-      Succeeded());
-
-  // Verify we catch state machine error.
-  Expected<dwarf::UnwindTable> RowsOrErr = dwarf::UnwindTable::create(&TestFDE);
-  EXPECT_THAT_ERROR(RowsOrErr.takeError(),
-                    FailedWithMessage("DW_CFA_set_loc with adrress 0x1000 which"
-                                      " must be greater than the current row "
-                                      "address 0x1100"));
-}
-
-TEST(DWARFDebugFrame, UnwindTableError_DW_CFA_restore_state) {
-  dwarf::CIE TestCIE = createCIE(/*IsDWARF64=*/false,
-                                 /*Offset=*/0x0,
-                                 /*Length=*/0xff);
-
-  dwarf::FDE TestFDE(/*IsDWARF64=*/true,
-                     /*Offset=*/0x3333abcdabcd,
-                     /*Length=*/0x4444abcdabcd,
-                     /*CIEPointer=*/0x1111abcdabcd,
-                     /*InitialLocation=*/0x1000,
-                     /*AddressRange=*/0x1000,
-                     /*Cie=*/&TestCIE,
-                     /*LSDAAddress=*/None,
-                     /*Arch=*/Triple::x86_64);
-
-  // Make a CIE that has a valid CFA definition.
-  constexpr uint8_t Reg = 12;
-  constexpr uint8_t Offset = 32;
-  EXPECT_THAT_ERROR(parseCFI(TestCIE, {dwarf::DW_CFA_def_cfa, Reg, Offset}),
-                    Succeeded());
-
-  // Make a FDE with DWARF call frame instruction opcodes that have valid
-  // syntax, but will cause an error when we parse them into a UnwindTable.
-  // Here we encode a DW_CFA_restore_state opcode that was not preceded by a
-  // DW_CFA_remember_state, and an error should be returned.
-  EXPECT_THAT_ERROR(parseCFI(TestFDE, {dwarf::DW_CFA_restore_state}),
-                    Succeeded());
-
-  // Verify we catch state machine error.
-  Expected<dwarf::UnwindTable> RowsOrErr = dwarf::UnwindTable::create(&TestFDE);
-  EXPECT_THAT_ERROR(RowsOrErr.takeError(),
-                    FailedWithMessage("DW_CFA_restore_state without a matching "
-                                      "previous DW_CFA_remember_state"));
-}
-
-TEST(DWARFDebugFrame, UnwindTableError_DW_CFA_GNU_window_save) {
-  dwarf::CIE TestCIE = createCIE(/*IsDWARF64=*/false,
-                                 /*Offset=*/0x0,
-                                 /*Length=*/0xff);
-
-  dwarf::FDE TestFDE(/*IsDWARF64=*/true,
-                     /*Offset=*/0x3333abcdabcd,
-                     /*Length=*/0x4444abcdabcd,
-                     /*CIEPointer=*/0x1111abcdabcd,
-                     /*InitialLocation=*/0x1000,
-                     /*AddressRange=*/0x1000,
-                     /*Cie=*/&TestCIE,
-                     /*LSDAAddress=*/None,
-                     /*Arch=*/Triple::x86_64);
-
-  // Make a CIE that has a valid CFA definition.
-  constexpr uint8_t Reg = 12;
-  constexpr uint8_t Offset = 32;
-  EXPECT_THAT_ERROR(parseCFI(TestCIE, {dwarf::DW_CFA_def_cfa, Reg, Offset}),
-                    Succeeded());
-
-  // Make a FDE with DWARF call frame instruction opcodes that have valid
-  // syntax, but will cause an error when we parse them into a UnwindTable.
-  // Here we encode a DW_CFA_GNU_window_save that is not supported. I have not
-  // found any documentation that describes what this does after some brief
-  // searching.
-  EXPECT_THAT_ERROR(parseCFI(TestFDE, {dwarf::DW_CFA_GNU_window_save}),
-                    Succeeded());
-
-  // Verify we catch state machine error.
-  Expected<dwarf::UnwindTable> RowsOrErr = dwarf::UnwindTable::create(&TestFDE);
-  EXPECT_THAT_ERROR(RowsOrErr.takeError(),
-                    FailedWithMessage("DW_CFA opcode 0x2d is not supported for "
-                                      "architecture x86_64"));
-}
-
-TEST(DWARFDebugFrame, UnwindTableError_DW_CFA_def_cfa_offset) {
-  dwarf::CIE TestCIE = createCIE(/*IsDWARF64=*/false,
-                                 /*Offset=*/0x0,
-                                 /*Length=*/0xff);
-
-  dwarf::FDE TestFDE(/*IsDWARF64=*/true,
-                     /*Offset=*/0x3333abcdabcd,
-                     /*Length=*/0x4444abcdabcd,
-                     /*CIEPointer=*/0x1111abcdabcd,
-                     /*InitialLocation=*/0x1000,
-                     /*AddressRange=*/0x1000,
-                     /*Cie=*/&TestCIE,
-                     /*LSDAAddress=*/None,
-                     /*Arch=*/Triple::x86_64);
-
-  // Make a CIE that has an invalid CFA definition. We do this so we can try
-  // and use a DW_CFA_def_cfa_register opcode in the FDE and get an appropriate
-  // error back.
-  EXPECT_THAT_ERROR(parseCFI(TestCIE, {}), Succeeded());
-
-  // Make a FDE with DWARF call frame instruction opcodes that have valid
-  // syntax, but will cause an error when we parse them into a UnwindTable.
-  // Here we encode a DW_CFA_def_cfa_offset with a offset of 16, but our CIE
-  // didn't define the CFA in terms of a register plus offset, so this should
-  // cause an error.
-  EXPECT_THAT_ERROR(parseCFI(TestFDE, {dwarf::DW_CFA_def_cfa_offset, 16}),
-                    Succeeded());
-
-  // Verify we catch state machine error.
-  Expected<dwarf::UnwindTable> RowsOrErr = dwarf::UnwindTable::create(&TestFDE);
-  EXPECT_THAT_ERROR(RowsOrErr.takeError(),
-                    FailedWithMessage("DW_CFA_def_cfa_offset found when CFA "
-                                      "rule was not RegPlusOffset"));
-}
-
-TEST(DWARFDebugFrame, UnwindTableDefCFAOffsetSFCFAError) {
-  dwarf::CIE TestCIE = createCIE(/*IsDWARF64=*/false,
-                                 /*Offset=*/0x0,
-                                 /*Length=*/0xff);
-
-  dwarf::FDE TestFDE(/*IsDWARF64=*/true,
-                     /*Offset=*/0x3333abcdabcd,
-                     /*Length=*/0x4444abcdabcd,
-                     /*CIEPointer=*/0x1111abcdabcd,
-                     /*InitialLocation=*/0x1000,
-                     /*AddressRange=*/0x1000,
-                     /*Cie=*/&TestCIE,
-                     /*LSDAAddress=*/None,
-                     /*Arch=*/Triple::x86_64);
-
-  // Make a CIE that has an invalid CFA definition. We do this so we can try
-  // and use a DW_CFA_def_cfa_offset_sf opcode in the FDE and get an
-  // appropriate error back.
-  EXPECT_THAT_ERROR(parseCFI(TestCIE, {}), Succeeded());
-
-  // Make a FDE with DWARF call frame instruction opcodes that have valid
-  // syntax, but will cause an error when we parse them into a UnwindTable.
-  // Here we encode a DW_CFA_def_cfa_offset_sf with a offset of 4, but our CIE
-  // didn't define the CFA in terms of a register plus offset, so this should
-  // cause an error.
-  EXPECT_THAT_ERROR(parseCFI(TestFDE, {dwarf::DW_CFA_def_cfa_offset_sf, 4}),
-                    Succeeded());
-
-  // Verify we catch state machine error.
-  Expected<dwarf::UnwindTable> RowsOrErr = dwarf::UnwindTable::create(&TestFDE);
-  EXPECT_THAT_ERROR(RowsOrErr.takeError(),
-                    FailedWithMessage("DW_CFA_def_cfa_offset_sf found when CFA "
-                                      "rule was not RegPlusOffset"));
-}
-
-TEST(DWARFDebugFrame, UnwindTable_DW_CFA_def_cfa_register) {
-  dwarf::CIE TestCIE = createCIE(/*IsDWARF64=*/false,
-                                 /*Offset=*/0x0,
-                                 /*Length=*/0xff);
-
-  dwarf::FDE TestFDE(/*IsDWARF64=*/true,
-                     /*Offset=*/0x3333abcdabcd,
-                     /*Length=*/0x4444abcdabcd,
-                     /*CIEPointer=*/0x1111abcdabcd,
-                     /*InitialLocation=*/0x1000,
-                     /*AddressRange=*/0x1000,
-                     /*Cie=*/&TestCIE,
-                     /*LSDAAddress=*/None,
-                     /*Arch=*/Triple::x86_64);
-
-  // Make a CIE that has only defines the CFA register with no offset. Some
-  // architectures do this and we must ensure that we set the CFA value to be
-  // equal to that register with no offset.
-  constexpr uint8_t CFAReg = 12;
-  EXPECT_THAT_ERROR(parseCFI(TestCIE, {dwarf::DW_CFA_def_cfa_register, CFAReg}),
-                    Succeeded());
-
-  // Make a FDE with DWARF call frame instruction opcodes that have valid
-  // syntax, but will cause an error when we parse them into a UnwindTable.
-  // Here we encode a DW_CFA_def_cfa_register with a register number of 12, but
-  // our CIE didn't define the CFA in terms of a register plus offset, so this
-  // should cause an error.
-  EXPECT_THAT_ERROR(parseCFI(TestFDE, {}), Succeeded());
-
-  // Verify we catch state machine error.
-  Expected<dwarf::UnwindTable> RowsOrErr = dwarf::UnwindTable::create(&TestFDE);
-  EXPECT_THAT_ERROR(RowsOrErr.takeError(), Succeeded());
-  const dwarf::UnwindTable &Rows = RowsOrErr.get();
-  EXPECT_EQ(Rows.size(), 1u);
-  EXPECT_EQ(Rows[0].getAddress(), 0x1000u);
-  EXPECT_EQ(Rows[0].getCFAValue(),
-            dwarf::UnwindLocation::createIsRegisterPlusOffset(CFAReg, 0));
-}
-
-TEST(DWARFDebugFrame, UnwindTableRowPushingOpcodes) {
-  // Test all opcodes that should end up pushing a UnwindRow into a UnwindTable.
-  dwarf::CIE TestCIE = createCIE(/*IsDWARF64=*/false,
-                                 /*Offset=*/0x0,
-                                 /*Length=*/0xff);
-
-  dwarf::FDE TestFDE(/*IsDWARF64=*/true,
-                     /*Offset=*/0x3333abcdabcd,
-                     /*Length=*/0x4444abcdabcd,
-                     /*CIEPointer=*/0x1111abcdabcd,
-                     /*InitialLocation=*/0x1000,
-                     /*AddressRange=*/0x1000,
-                     /*Cie=*/&TestCIE,
-                     /*LSDAAddress=*/None,
-                     /*Arch=*/Triple::x86_64);
-
-  // Make a CIE that has a valid CFA definition and a single register unwind
-  // rule for register that we will verify is in all of the pushed rows.
-  constexpr uint8_t CFAReg = 12;
-  constexpr uint8_t CFAOffset = 32;
-  constexpr uint8_t Reg = 13;
-  constexpr uint8_t InReg = 14;
-
-  EXPECT_THAT_ERROR(parseCFI(TestCIE, {dwarf::DW_CFA_def_cfa, CFAReg, CFAOffset,
-                                       dwarf::DW_CFA_register, Reg, InReg}),
-                    Succeeded());
-
-  // Make a FDE with DWARF call frame instruction opcodes that use all of the
-  // row pushing opcodes. This will verify that all opcodes that should create
-  // a row are correctly working. Each opcode will push a row prior to
-  // advancing the address, and then a row will be automatically pushed at the
-  // end of the parsing, so we should end up with 6 rows starting at address
-  // 0x1000 (from the FDE) and incrementing each one by 4 * CodeAlignmentFactor
-  // from the CIE.
-  EXPECT_THAT_ERROR(parseCFI(TestFDE, {dwarf::DW_CFA_advance_loc | 4,
-                                       dwarf::DW_CFA_advance_loc1,
-                                       4,
-                                       dwarf::DW_CFA_advance_loc2,
-                                       4,
-                                       0,
-                                       dwarf::DW_CFA_advance_loc4,
-                                       4,
-                                       0,
-                                       0,
-                                       0,
-                                       dwarf::DW_CFA_set_loc,
-                                       0x14,
-                                       0x10,
-                                       0,
-                                       0,
-                                       0,
-                                       0,
-                                       0,
-                                       0}),
-                    Succeeded());
-
-  // Create locations that we expect the UnwindRow objects to contain after
-  // parsing the DWARF call frame instructions.
-  dwarf::RegisterLocations VerifyLocs;
-  VerifyLocs.setRegisterLocation(
-      Reg, dwarf::UnwindLocation::createIsRegisterPlusOffset(InReg, 0));
-
-  // Verify we catch state machine error.
-  Expected<dwarf::UnwindTable> RowsOrErr = dwarf::UnwindTable::create(&TestFDE);
-  ASSERT_THAT_ERROR(RowsOrErr.takeError(), Succeeded());
-  const dwarf::UnwindTable &Rows = RowsOrErr.get();
-  EXPECT_EQ(Rows.size(), 6u);
-  EXPECT_EQ(Rows[0].getAddress(), 0x1000u);
-  EXPECT_EQ(Rows[0].getRegisterLocations().size(), 1u);
-  EXPECT_EQ(Rows[0].getRegisterLocations(), VerifyLocs);
-  EXPECT_EQ(Rows[1].getAddress(), 0x1004u);
-  EXPECT_EQ(Rows[1].getRegisterLocations().size(), 1u);
-  EXPECT_EQ(Rows[1].getRegisterLocations(), VerifyLocs);
-  EXPECT_EQ(Rows[2].getAddress(), 0x1008u);
-  EXPECT_EQ(Rows[2].getRegisterLocations().size(), 1u);
-  EXPECT_EQ(Rows[2].getRegisterLocations(), VerifyLocs);
-  EXPECT_EQ(Rows[3].getAddress(), 0x100cu);
-  EXPECT_EQ(Rows[3].getRegisterLocations().size(), 1u);
-  EXPECT_EQ(Rows[3].getRegisterLocations(), VerifyLocs);
-  EXPECT_EQ(Rows[4].getAddress(), 0x1010u);
-  EXPECT_EQ(Rows[4].getRegisterLocations().size(), 1u);
-  EXPECT_EQ(Rows[4].getRegisterLocations(), VerifyLocs);
-  EXPECT_EQ(Rows[5].getAddress(), 0x1014u);
-  EXPECT_EQ(Rows[5].getRegisterLocations().size(), 1u);
-  EXPECT_EQ(Rows[5].getRegisterLocations(), VerifyLocs);
-}
-
-TEST(DWARFDebugFrame, UnwindTable_DW_CFA_restore) {
-  // Test that DW_CFA_restore works as expected when parsed in the state
-  // machine.
-  dwarf::CIE TestCIE = createCIE(/*IsDWARF64=*/false,
-                                 /*Offset=*/0x0,
-                                 /*Length=*/0xff);
-
-  dwarf::FDE TestFDE(/*IsDWARF64=*/true,
-                     /*Offset=*/0x3333abcdabcd,
-                     /*Length=*/0x4444abcdabcd,
-                     /*CIEPointer=*/0x1111abcdabcd,
-                     /*InitialLocation=*/0x1000,
-                     /*AddressRange=*/0x1000,
-                     /*Cie=*/&TestCIE,
-                     /*LSDAAddress=*/None,
-                     /*Arch=*/Triple::x86_64);
-
-  // Make a CIE that has a valid CFA definition and a single register unwind
-  // rule for register that we will verify is in all of the pushed rows.
-  constexpr uint8_t CFAReg = 12;
-  constexpr uint8_t CFAOffset = 32;
-  constexpr uint8_t Reg = 13;
-  constexpr uint8_t InReg = 14;
-  constexpr int32_t RegCFAOffset = -8;
-
-  EXPECT_THAT_ERROR(parseCFI(TestCIE, {dwarf::DW_CFA_def_cfa, CFAReg, CFAOffset,
-                                       dwarf::DW_CFA_register, Reg, InReg}),
-                    Succeeded());
-
-  // Make a FDE with DWARF call frame instruction opcodes that changes the rule
-  // for register "Reg" to be [CFA-8], then push a row, and then restore the
-  // register unwind rule for "Reg" using DW_CFA_restore. We should end up with
-  // two rows:
-  //   - one with Reg = [CFA-8]
-  //   - one with Reg = InReg
-  EXPECT_THAT_ERROR(parseCFI(TestFDE, {dwarf::DW_CFA_offset | Reg, 1,
-                                       dwarf::DW_CFA_advance_loc | 4,
-                                       dwarf::DW_CFA_restore | Reg}),
-                    Succeeded());
-
-  // Create locations that we expect the UnwindRow objects to contain after
-  // parsing the DWARF call frame instructions.
-  dwarf::RegisterLocations VerifyLocs1;
-  VerifyLocs1.setRegisterLocation(
-      Reg, dwarf::UnwindLocation::createAtCFAPlusOffset(RegCFAOffset));
-
-  dwarf::RegisterLocations VerifyLocs2;
-  VerifyLocs2.setRegisterLocation(
-      Reg, dwarf::UnwindLocation::createIsRegisterPlusOffset(InReg, 0));
-
-  // Verify we catch state machine error.
-  Expected<dwarf::UnwindTable> RowsOrErr = dwarf::UnwindTable::create(&TestFDE);
-  EXPECT_THAT_ERROR(RowsOrErr.takeError(), Succeeded());
-  const dwarf::UnwindTable &Rows = RowsOrErr.get();
-  EXPECT_EQ(Rows.size(), 2u);
-  EXPECT_EQ(Rows[0].getAddress(), 0x1000u);
-  EXPECT_EQ(Rows[0].getRegisterLocations().size(), 1u);
-  EXPECT_EQ(Rows[0].getRegisterLocations(), VerifyLocs1);
-  EXPECT_EQ(Rows[1].getAddress(), 0x1004u);
-  EXPECT_EQ(Rows[1].getRegisterLocations().size(), 1u);
-  EXPECT_EQ(Rows[1].getRegisterLocations(), VerifyLocs2);
-}
-
-TEST(DWARFDebugFrame, UnwindTable_DW_CFA_restore_extended) {
-  // Test that DW_CFA_restore works as expected when parsed in the state
-  // machine.
-  dwarf::CIE TestCIE = createCIE(/*IsDWARF64=*/false,
-                                 /*Offset=*/0x0,
-                                 /*Length=*/0xff);
-
-  dwarf::FDE TestFDE(/*IsDWARF64=*/true,
-                     /*Offset=*/0x3333abcdabcd,
-                     /*Length=*/0x4444abcdabcd,
-                     /*CIEPointer=*/0x1111abcdabcd,
-                     /*InitialLocation=*/0x1000,
-                     /*AddressRange=*/0x1000,
-                     /*Cie=*/&TestCIE,
-                     /*LSDAAddress=*/None,
-                     /*Arch=*/Triple::x86_64);
-
-  // Make a CIE that has a valid CFA definition and a single register unwind
-  // rule for register that we will verify is in all of the pushed rows.
-  constexpr uint8_t CFAReg = 12;
-  constexpr uint8_t CFAOffset = 32;
-  constexpr uint8_t Reg = 13;
-  constexpr uint8_t InReg = 14;
-  constexpr int32_t RegCFAOffset = -8;
-
-  EXPECT_THAT_ERROR(parseCFI(TestCIE, {dwarf::DW_CFA_def_cfa, CFAReg, CFAOffset,
-                                       dwarf::DW_CFA_register, Reg, InReg}),
-                    Succeeded());
-
-  // Make a FDE with DWARF call frame instruction opcodes that changes the rule
-  // for register "Reg" to be [CFA-8], then push a row, and then restore the
-  // register unwind rule for "Reg" using DW_CFA_restore_extended. We should
-  // end up with two rows:
-  //   - one with Reg = [CFA-8]
-  //   - one with Reg = InReg
-  EXPECT_THAT_ERROR(parseCFI(TestFDE, {dwarf::DW_CFA_offset | Reg, 1,
-                                       dwarf::DW_CFA_advance_loc | 4,
-                                       dwarf::DW_CFA_restore_extended, Reg}),
-                    Succeeded());
-
-  // Create locations that we expect the UnwindRow objects to contain after
-  // parsing the DWARF call frame instructions.
-  dwarf::RegisterLocations VerifyLocs1;
-  VerifyLocs1.setRegisterLocation(
-      Reg, dwarf::UnwindLocation::createAtCFAPlusOffset(RegCFAOffset));
-
-  dwarf::RegisterLocations VerifyLocs2;
-  VerifyLocs2.setRegisterLocation(
-      Reg, dwarf::UnwindLocation::createIsRegisterPlusOffset(InReg, 0));
-
-  // Verify we catch state machine error.
-  Expected<dwarf::UnwindTable> RowsOrErr = dwarf::UnwindTable::create(&TestFDE);
-  EXPECT_THAT_ERROR(RowsOrErr.takeError(), Succeeded());
-  const dwarf::UnwindTable &Rows = RowsOrErr.get();
-  EXPECT_EQ(Rows.size(), 2u);
-  EXPECT_EQ(Rows[0].getAddress(), 0x1000u);
-  EXPECT_EQ(Rows[0].getRegisterLocations().size(), 1u);
-  EXPECT_EQ(Rows[0].getRegisterLocations(), VerifyLocs1);
-  EXPECT_EQ(Rows[1].getAddress(), 0x1004u);
-  EXPECT_EQ(Rows[1].getRegisterLocations().size(), 1u);
-  EXPECT_EQ(Rows[1].getRegisterLocations(), VerifyLocs2);
-}
-
-TEST(DWARFDebugFrame, UnwindTable_DW_CFA_offset) {
-  // Test that DW_CFA_offset, DW_CFA_offset_extended and
-  // DW_CFA_offset_extended_sf work as expected when parsed in the state
-  // machine.
-  dwarf::CIE TestCIE = createCIE(/*IsDWARF64=*/false,
-                                 /*Offset=*/0x0,
-                                 /*Length=*/0xff);
-
-  dwarf::FDE TestFDE(/*IsDWARF64=*/true,
-                     /*Offset=*/0x3333abcdabcd,
-                     /*Length=*/0x4444abcdabcd,
-                     /*CIEPointer=*/0x1111abcdabcd,
-                     /*InitialLocation=*/0x1000,
-                     /*AddressRange=*/0x1000,
-                     /*Cie=*/&TestCIE,
-                     /*LSDAAddress=*/None,
-                     /*Arch=*/Triple::x86_64);
-
-  // Make a CIE that has a valid CFA definition and a single register unwind
-  // rule for register that we will verify is in all of the pushed rows.
-  EXPECT_THAT_ERROR(parseCFI(TestCIE, {dwarf::DW_CFA_def_cfa, 12, 32}),
-                    Succeeded());
-
-  // Make a FDE with DWARF call frame instruction opcodes that changes the
-  // unwind rules for the follwing registers:
-  //   Reg1 = [CFA-8]
-  //   Reg2 = [CFA-16]
-  //   Reg3 = [CFA+8]
-  constexpr uint8_t Reg1 = 14;
-  constexpr uint8_t Reg2 = 15;
-  constexpr uint8_t Reg3 = 16;
-  constexpr uint8_t Neg1SLEB = 0x7f;
-  EXPECT_THAT_ERROR(
-      parseCFI(TestFDE,
-               {dwarf::DW_CFA_offset | Reg1, 1, dwarf::DW_CFA_offset_extended,
-                Reg2, 2, dwarf::DW_CFA_offset_extended_sf, Reg3, Neg1SLEB}),
-      Succeeded());
-
-  // Create locations that we expect the UnwindRow objects to contain after
-  // parsing the DWARF call frame instructions.
-  dwarf::RegisterLocations VerifyLocs;
-  VerifyLocs.setRegisterLocation(
-      Reg1, dwarf::UnwindLocation::createAtCFAPlusOffset(-8));
-  VerifyLocs.setRegisterLocation(
-      Reg2, dwarf::UnwindLocation::createAtCFAPlusOffset(-16));
-  VerifyLocs.setRegisterLocation(
-      Reg3, dwarf::UnwindLocation::createAtCFAPlusOffset(8));
-
-  // Verify we catch state machine error.
-  Expected<dwarf::UnwindTable> RowsOrErr = dwarf::UnwindTable::create(&TestFDE);
-  EXPECT_THAT_ERROR(RowsOrErr.takeError(), Succeeded());
-  const dwarf::UnwindTable &Rows = RowsOrErr.get();
-  EXPECT_EQ(Rows.size(), 1u);
-  EXPECT_EQ(Rows[0].getAddress(), 0x1000u);
-  EXPECT_EQ(Rows[0].getRegisterLocations(), VerifyLocs);
-}
-
-TEST(DWARFDebugFrame, UnwindTable_DW_CFA_val_offset) {
-  // Test that DW_CFA_val_offset and DW_CFA_val_offset_sf work as expected when
-  // parsed in the state machine.
-  dwarf::CIE TestCIE = createCIE(/*IsDWARF64=*/false,
-                                 /*Offset=*/0x0,
-                                 /*Length=*/0xff);
-
-  dwarf::FDE TestFDE(/*IsDWARF64=*/true,
-                     /*Offset=*/0x3333abcdabcd,
-                     /*Length=*/0x4444abcdabcd,
-                     /*CIEPointer=*/0x1111abcdabcd,
-                     /*InitialLocation=*/0x1000,
-                     /*AddressRange=*/0x1000,
-                     /*Cie=*/&TestCIE,
-                     /*LSDAAddress=*/None,
-                     /*Arch=*/Triple::x86_64);
-
-  // Make a CIE that has a valid CFA definition and a single register unwind
-  // rule for register that we will verify is in all of the pushed rows.
-  EXPECT_THAT_ERROR(parseCFI(TestCIE, {dwarf::DW_CFA_def_cfa, 12, 32}),
-                    Succeeded());
-
-  // Make a FDE with DWARF call frame instruction opcodes that changes the
-  // unwind rules for the follwing registers:
-  //   Reg1 = [CFA-8]
-  //   Reg2 = [CFA-16]
-  //   Reg3 = [CFA+8]
-  constexpr uint8_t Reg1 = 14;
-  constexpr uint8_t Reg2 = 15;
-  constexpr uint8_t Neg1SLEB = 0x7f;
-  EXPECT_THAT_ERROR(
-      parseCFI(TestFDE, {dwarf::DW_CFA_val_offset, Reg1, 1,
-                         dwarf::DW_CFA_val_offset_sf, Reg2, Neg1SLEB}),
-      Succeeded());
-
-  // Create locations that we expect the UnwindRow objects to contain after
-  // parsing the DWARF call frame instructions.
-  dwarf::RegisterLocations VerifyLocs;
-  VerifyLocs.setRegisterLocation(
-      Reg1, dwarf::UnwindLocation::createIsCFAPlusOffset(-8));
-  VerifyLocs.setRegisterLocation(
-      Reg2, dwarf::UnwindLocation::createIsCFAPlusOffset(8));
-
-  // Verify we catch state machine error.
-  Expected<dwarf::UnwindTable> RowsOrErr = dwarf::UnwindTable::create(&TestFDE);
-  EXPECT_THAT_ERROR(RowsOrErr.takeError(), Succeeded());
-  const dwarf::UnwindTable &Rows = RowsOrErr.get();
-  EXPECT_EQ(Rows.size(), 1u);
-  EXPECT_EQ(Rows[0].getAddress(), 0x1000u);
-  EXPECT_EQ(Rows[0].getRegisterLocations(), VerifyLocs);
-}
-
-TEST(DWARFDebugFrame, UnwindTable_DW_CFA_nop) {
-  // Test that DW_CFA_nop works as expected when parsed in the state machine.
-  dwarf::CIE TestCIE = createCIE(/*IsDWARF64=*/false,
-                                 /*Offset=*/0x0,
-                                 /*Length=*/0xff);
-
-  dwarf::FDE TestFDE(/*IsDWARF64=*/true,
-                     /*Offset=*/0x3333abcdabcd,
-                     /*Length=*/0x4444abcdabcd,
-                     /*CIEPointer=*/0x1111abcdabcd,
-                     /*InitialLocation=*/0x1000,
-                     /*AddressRange=*/0x1000,
-                     /*Cie=*/&TestCIE,
-                     /*LSDAAddress=*/None,
-                     /*Arch=*/Triple::x86_64);
-
-  // Make a CIE that has a valid CFA definition and a single register unwind
-  // rule for register that we will verify is in all of the pushed rows.
-  EXPECT_THAT_ERROR(parseCFI(TestCIE, {dwarf::DW_CFA_def_cfa, 12, 32}),
-                    Succeeded());
-
-  // Make a FDE with DWARF call frame instruction opcodes that changes the
-  // unwind rules for the follwing registers:
-  //   Reg1 = [CFA-8]
-  // The opcodes for setting Reg1 are preceded by a DW_CFA_nop.
-  constexpr uint8_t Reg1 = 14;
-  EXPECT_THAT_ERROR(
-      parseCFI(TestFDE, {dwarf::DW_CFA_nop, dwarf::DW_CFA_offset | Reg1, 1}),
-      Succeeded());
-
-  // Create locations that we expect the UnwindRow objects to contain after
-  // parsing the DWARF call frame instructions.
-  dwarf::RegisterLocations VerifyLocs;
-  VerifyLocs.setRegisterLocation(
-      Reg1, dwarf::UnwindLocation::createAtCFAPlusOffset(-8));
-
-  // Verify we catch state machine error.
-  Expected<dwarf::UnwindTable> RowsOrErr = dwarf::UnwindTable::create(&TestFDE);
-  EXPECT_THAT_ERROR(RowsOrErr.takeError(), Succeeded());
-  const dwarf::UnwindTable &Rows = RowsOrErr.get();
-  EXPECT_EQ(Rows.size(), 1u);
-  EXPECT_EQ(Rows[0].getAddress(), 0x1000u);
-  EXPECT_EQ(Rows[0].getRegisterLocations(), VerifyLocs);
-}
-
-TEST(DWARFDebugFrame, UnwindTable_DW_CFA_remember_state) {
-  // Test that DW_CFA_remember_state and DW_CFA_restore_state work as expected
-  // when parsed in the state machine.
-  dwarf::CIE TestCIE = createCIE(/*IsDWARF64=*/false,
-                                 /*Offset=*/0x0,
-                                 /*Length=*/0xff);
-
-  dwarf::FDE TestFDE(/*IsDWARF64=*/true,
-                     /*Offset=*/0x3333abcdabcd,
-                     /*Length=*/0x4444abcdabcd,
-                     /*CIEPointer=*/0x1111abcdabcd,
-                     /*InitialLocation=*/0x1000,
-                     /*AddressRange=*/0x1000,
-                     /*Cie=*/&TestCIE,
-                     /*LSDAAddress=*/None,
-                     /*Arch=*/Triple::x86_64);
-
-  // Make a CIE that has a valid CFA definition and a single register unwind
-  // rule for register that we will verify is in all of the pushed rows.
-  EXPECT_THAT_ERROR(parseCFI(TestCIE, {dwarf::DW_CFA_def_cfa, 12, 32}),
-                    Succeeded());
-
-  // Make a FDE with DWARF call frame instruction opcodes that encodes the
-  // follwing rows:
-  // 0x1000: CFA=reg12+32: Reg1=[CFA-8]
-  // 0x1004: CFA=reg12+32: Reg1=[CFA-8] Reg2=[CFA-16]
-  // 0x1008: CFA=reg12+32: Reg1=[CFA-8] Reg2=[CFA-16] Reg3=[CFA-24]
-  // 0x100C: CFA=reg12+32: Reg1=[CFA-8] Reg2=[CFA-16]
-  // 0x1010: CFA=reg12+32: Reg1=[CFA-8]
-  // This state machine will:
-  //  - set Reg1 location
-  //  - push a row (from DW_CFA_advance_loc)
-  //  - remember the state
-  //  - set Reg2 location
-  //  - push a row (from DW_CFA_advance_loc)
-  //  - remember the state
-  //  - set Reg3 location
-  //  - push a row (from DW_CFA_advance_loc)
-  //  - remember the state where Reg1 and Reg2 were set
-  //  - push a row (from DW_CFA_advance_loc)
-  //  - remember the state where only Reg1 was set
-  //  - push a row (automatically at the end of instruction parsing)
-  // Then we verify that all registers are correct in all generated rows.
-  constexpr uint8_t Reg1 = 14;
-  constexpr uint8_t Reg2 = 15;
-  constexpr uint8_t Reg3 = 16;
-  EXPECT_THAT_ERROR(
-      parseCFI(TestFDE,
-               {dwarf::DW_CFA_offset | Reg1, 1, dwarf::DW_CFA_advance_loc | 4,
-                dwarf::DW_CFA_remember_state, dwarf::DW_CFA_offset | Reg2, 2,
-                dwarf::DW_CFA_advance_loc | 4, dwarf::DW_CFA_remember_state,
-                dwarf::DW_CFA_offset | Reg3, 3, dwarf::DW_CFA_advance_loc | 4,
-                dwarf::DW_CFA_restore_state, dwarf::DW_CFA_advance_loc | 4,
-                dwarf::DW_CFA_restore_state}),
-      Succeeded());
-
-  // Create locations that we expect the UnwindRow objects to contain after
-  // parsing the DWARF call frame instructions.
-  dwarf::RegisterLocations VerifyLocs1;
-  VerifyLocs1.setRegisterLocation(
-      Reg1, dwarf::UnwindLocation::createAtCFAPlusOffset(-8));
-
-  dwarf::RegisterLocations VerifyLocs2;
-  VerifyLocs2.setRegisterLocation(
-      Reg1, dwarf::UnwindLocation::createAtCFAPlusOffset(-8));
-  VerifyLocs2.setRegisterLocation(
-      Reg2, dwarf::UnwindLocation::createAtCFAPlusOffset(-16));
-
-  dwarf::RegisterLocations VerifyLocs3;
-  VerifyLocs3.setRegisterLocation(
-      Reg1, dwarf::UnwindLocation::createAtCFAPlusOffset(-8));
-  VerifyLocs3.setRegisterLocation(
-      Reg2, dwarf::UnwindLocation::createAtCFAPlusOffset(-16));
-  VerifyLocs3.setRegisterLocation(
-      Reg3, dwarf::UnwindLocation::createAtCFAPlusOffset(-24));
-
-  // Verify we catch state machine error.
-  Expected<dwarf::UnwindTable> RowsOrErr = dwarf::UnwindTable::create(&TestFDE);
-  EXPECT_THAT_ERROR(RowsOrErr.takeError(), Succeeded());
-  const dwarf::UnwindTable &Rows = RowsOrErr.get();
-  EXPECT_EQ(Rows.size(), 5u);
-  EXPECT_EQ(Rows[0].getAddress(), 0x1000u);
-  EXPECT_EQ(Rows[0].getRegisterLocations(), VerifyLocs1);
-
-  EXPECT_EQ(Rows[1].getAddress(), 0x1004u);
-  EXPECT_EQ(Rows[1].getRegisterLocations(), VerifyLocs2);
-
-  EXPECT_EQ(Rows[2].getAddress(), 0x1008u);
-  EXPECT_EQ(Rows[2].getRegisterLocations(), VerifyLocs3);
-
-  EXPECT_EQ(Rows[3].getAddress(), 0x100Cu);
-  EXPECT_EQ(Rows[3].getRegisterLocations(), VerifyLocs2);
-
-  EXPECT_EQ(Rows[4].getAddress(), 0x1010u);
-  EXPECT_EQ(Rows[4].getRegisterLocations(), VerifyLocs1);
-}
-
-TEST(DWARFDebugFrame, UnwindTable_DW_CFA_undefined) {
-  // Test that DW_CFA_undefined works as expected when parsed in the state
-  // machine.
-  dwarf::CIE TestCIE = createCIE(/*IsDWARF64=*/false,
-                                 /*Offset=*/0x0,
-                                 /*Length=*/0xff);
-
-  dwarf::FDE TestFDE(/*IsDWARF64=*/true,
-                     /*Offset=*/0x3333abcdabcd,
-                     /*Length=*/0x4444abcdabcd,
-                     /*CIEPointer=*/0x1111abcdabcd,
-                     /*InitialLocation=*/0x1000,
-                     /*AddressRange=*/0x1000,
-                     /*Cie=*/&TestCIE,
-                     /*LSDAAddress=*/None,
-                     /*Arch=*/Triple::x86_64);
-
-  // Make a CIE that has a valid CFA definition and a single register unwind
-  // rule for register that we will verify is in all of the pushed rows.
-  EXPECT_THAT_ERROR(parseCFI(TestCIE, {dwarf::DW_CFA_def_cfa, 12, 32}),
-                    Succeeded());
-
-  // Make a FDE with DWARF call frame instruction opcodes that encodes the
-  // follwing rows:
-  // 0x1000: CFA=reg12+32: Reg1=undefined
-  // Then we verify that all registers are correct in all generated rows.
-  constexpr uint8_t Reg1 = 14;
-  EXPECT_THAT_ERROR(parseCFI(TestFDE, {dwarf::DW_CFA_undefined, Reg1}),
-                    Succeeded());
-
-  // Create locations that we expect the UnwindRow objects to contain after
-  // parsing the DWARF call frame instructions.
-  dwarf::RegisterLocations VerifyLocs;
-  VerifyLocs.setRegisterLocation(Reg1,
-                                 dwarf::UnwindLocation::createUndefined());
-
-  // Verify we catch state machine error.
-  Expected<dwarf::UnwindTable> RowsOrErr = dwarf::UnwindTable::create(&TestFDE);
-  EXPECT_THAT_ERROR(RowsOrErr.takeError(), Succeeded());
-  const dwarf::UnwindTable &Rows = RowsOrErr.get();
-  EXPECT_EQ(Rows.size(), 1u);
-  EXPECT_EQ(Rows[0].getAddress(), 0x1000u);
-  EXPECT_EQ(Rows[0].getRegisterLocations(), VerifyLocs);
-}
-
-TEST(DWARFDebugFrame, UnwindTable_DW_CFA_same_value) {
-  // Test that DW_CFA_same_value works as expected when parsed in the state
-  // machine.
-  dwarf::CIE TestCIE = createCIE(/*IsDWARF64=*/false,
-                                 /*Offset=*/0x0,
-                                 /*Length=*/0xff);
-
-  dwarf::FDE TestFDE(/*IsDWARF64=*/true,
-                     /*Offset=*/0x3333abcdabcd,
-                     /*Length=*/0x4444abcdabcd,
-                     /*CIEPointer=*/0x1111abcdabcd,
-                     /*InitialLocation=*/0x1000,
-                     /*AddressRange=*/0x1000,
-                     /*Cie=*/&TestCIE,
-                     /*LSDAAddress=*/None,
-                     /*Arch=*/Triple::x86_64);
-
-  // Make a CIE that has a valid CFA definition and a single register unwind
-  // rule for register that we will verify is in all of the pushed rows.
-  EXPECT_THAT_ERROR(parseCFI(TestCIE, {dwarf::DW_CFA_def_cfa, 12, 32}),
-                    Succeeded());
-
-  // Make a FDE with DWARF call frame instruction opcodes that encodes the
-  // follwing rows:
-  // 0x1000: CFA=reg12+32: Reg1=same
-  // Then we verify that all registers are correct in all generated rows.
-  constexpr uint8_t Reg1 = 14;
-  EXPECT_THAT_ERROR(parseCFI(TestFDE, {dwarf::DW_CFA_same_value, Reg1}),
-                    Succeeded());
-
-  // Create locations that we expect the UnwindRow objects to contain after
-  // parsing the DWARF call frame instructions.
-  dwarf::RegisterLocations VerifyLocs;
-  VerifyLocs.setRegisterLocation(Reg1, dwarf::UnwindLocation::createSame());
-
-  // Verify we catch state machine error.
-  Expected<dwarf::UnwindTable> RowsOrErr = dwarf::UnwindTable::create(&TestFDE);
-  EXPECT_THAT_ERROR(RowsOrErr.takeError(), Succeeded());
-  const dwarf::UnwindTable &Rows = RowsOrErr.get();
-  EXPECT_EQ(Rows.size(), 1u);
-  EXPECT_EQ(Rows[0].getAddress(), 0x1000u);
-  EXPECT_EQ(Rows[0].getRegisterLocations(), VerifyLocs);
-}
-
-TEST(DWARFDebugFrame, UnwindTable_DW_CFA_register) {
-  // Test that DW_CFA_register works as expected when parsed in the state
-  // machine.
-  dwarf::CIE TestCIE = createCIE(/*IsDWARF64=*/false,
-                                 /*Offset=*/0x0,
-                                 /*Length=*/0xff);
-
-  dwarf::FDE TestFDE(/*IsDWARF64=*/true,
-                     /*Offset=*/0x3333abcdabcd,
-                     /*Length=*/0x4444abcdabcd,
-                     /*CIEPointer=*/0x1111abcdabcd,
-                     /*InitialLocation=*/0x1000,
-                     /*AddressRange=*/0x1000,
-                     /*Cie=*/&TestCIE,
-                     /*LSDAAddress=*/None,
-                     /*Arch=*/Triple::x86_64);
-
-  // Make a CIE that has a valid CFA definition and a single register unwind
-  // rule for register that we will verify is in all of the pushed rows.
-  EXPECT_THAT_ERROR(parseCFI(TestCIE, {dwarf::DW_CFA_def_cfa, 12, 32}),
-                    Succeeded());
-
-  // Make a FDE with DWARF call frame instruction opcodes that encodes the
-  // follwing rows:
-  // 0x1000: CFA=reg12+32: Reg1=same
-  // Then we verify that all registers are correct in all generated rows.
-  constexpr uint8_t Reg = 13;
-  constexpr uint8_t InReg = 14;
-  EXPECT_THAT_ERROR(parseCFI(TestFDE, {dwarf::DW_CFA_register, Reg, InReg}),
-                    Succeeded());
-
-  // Create locations that we expect the UnwindRow objects to contain after
-  // parsing the DWARF call frame instructions.
-  dwarf::RegisterLocations VerifyLocs;
-  VerifyLocs.setRegisterLocation(
-      Reg, dwarf::UnwindLocation::createIsRegisterPlusOffset(InReg, 0));
-
-  // Verify we catch state machine error.
-  Expected<dwarf::UnwindTable> RowsOrErr = dwarf::UnwindTable::create(&TestFDE);
-  EXPECT_THAT_ERROR(RowsOrErr.takeError(), Succeeded());
-  const dwarf::UnwindTable &Rows = RowsOrErr.get();
-  EXPECT_EQ(Rows.size(), 1u);
-  EXPECT_EQ(Rows[0].getAddress(), 0x1000u);
-  EXPECT_EQ(Rows[0].getRegisterLocations(), VerifyLocs);
-}
-
-TEST(DWARFDebugFrame, UnwindTable_DW_CFA_expression) {
-  // Test that DW_CFA_expression works as expected when parsed in the state
-  // machine.
-  dwarf::CIE TestCIE = createCIE(/*IsDWARF64=*/false,
-                                 /*Offset=*/0x0,
-                                 /*Length=*/0xff);
-
-  dwarf::FDE TestFDE(/*IsDWARF64=*/true,
-                     /*Offset=*/0x3333abcdabcd,
-                     /*Length=*/0x4444abcdabcd,
-                     /*CIEPointer=*/0x1111abcdabcd,
-                     /*InitialLocation=*/0x1000,
-                     /*AddressRange=*/0x1000,
-                     /*Cie=*/&TestCIE,
-                     /*LSDAAddress=*/None,
-                     /*Arch=*/Triple::x86_64);
-
-  // Make a CIE that has a valid CFA definition and a single register unwind
-  // rule for register that we will verify is in all of the pushed rows.
-  EXPECT_THAT_ERROR(parseCFI(TestCIE, {dwarf::DW_CFA_def_cfa, 12, 32}),
-                    Succeeded());
-
-  // Make a FDE with DWARF call frame instruction opcodes that encodes the
-  // follwing rows:
-  // 0x1000: CFA=reg12+32: Reg1=DWARFExpr(DW_OP_reg12)
-  // Then we verify that all registers are correct in all generated rows.
-  constexpr uint8_t Reg = 13;
-  constexpr uint8_t AddrSize = 8;
-  std::vector<uint8_t> CFIBytes = {dwarf::DW_CFA_expression, Reg, 1,
-                                   dwarf::DW_OP_reg12};
-
-  EXPECT_THAT_ERROR(parseCFI(TestFDE, CFIBytes), Succeeded());
-
-  // Create locations that we expect the UnwindRow objects to contain after
-  // parsing the DWARF call frame instructions.
-  dwarf::RegisterLocations VerifyLocs;
-
-  std::vector<uint8_t> ExprBytes = {dwarf::DW_OP_reg12};
-  DataExtractor ExprData(ExprBytes, true, AddrSize);
-  DWARFExpression Expr(ExprData, AddrSize);
-  VerifyLocs.setRegisterLocation(
-      Reg, dwarf::UnwindLocation::createAtDWARFExpression(Expr));
-
-  // Verify we catch state machine error.
-  Expected<dwarf::UnwindTable> RowsOrErr = dwarf::UnwindTable::create(&TestFDE);
-  EXPECT_THAT_ERROR(RowsOrErr.takeError(), Succeeded());
-  const dwarf::UnwindTable &Rows = RowsOrErr.get();
-  EXPECT_EQ(Rows.size(), 1u);
-  EXPECT_EQ(Rows[0].getAddress(), 0x1000u);
-  EXPECT_EQ(Rows[0].getRegisterLocations(), VerifyLocs);
-}
-
-TEST(DWARFDebugFrame, UnwindTable_DW_CFA_val_expression) {
-  // Test that DW_CFA_val_expression works as expected when parsed in the state
-  // machine.
-  dwarf::CIE TestCIE = createCIE(/*IsDWARF64=*/false,
-                                 /*Offset=*/0x0,
-                                 /*Length=*/0xff);
-
-  dwarf::FDE TestFDE(/*IsDWARF64=*/true,
-                     /*Offset=*/0x3333abcdabcd,
-                     /*Length=*/0x4444abcdabcd,
-                     /*CIEPointer=*/0x1111abcdabcd,
-                     /*InitialLocation=*/0x1000,
-                     /*AddressRange=*/0x1000,
-                     /*Cie=*/&TestCIE,
-                     /*LSDAAddress=*/None,
-                     /*Arch=*/Triple::x86_64);
-
-  // Make a CIE that has a valid CFA definition and a single register unwind
-  // rule for register that we will verify is in all of the pushed rows.
-  EXPECT_THAT_ERROR(parseCFI(TestCIE, {dwarf::DW_CFA_def_cfa, 12, 32}),
-                    Succeeded());
-
-  // Make a FDE with DWARF call frame instruction opcodes that encodes the
-  // follwing rows:
-  // 0x1000: CFA=reg12+32: Reg1=DWARFExpr(DW_OP_reg12)
-  // Then we verify that all registers are correct in all generated rows.
-  constexpr uint8_t Reg = 13;
-  constexpr uint8_t AddrSize = 8;
-  std::vector<uint8_t> CFIBytes = {dwarf::DW_CFA_val_expression, Reg, 1,
-                                   dwarf::DW_OP_reg12};
-
-  EXPECT_THAT_ERROR(parseCFI(TestFDE, CFIBytes), Succeeded());
-
-  // Create locations that we expect the UnwindRow objects to contain after
-  // parsing the DWARF call frame instructions.
-  dwarf::RegisterLocations VerifyLocs;
-
-  std::vector<uint8_t> ExprBytes = {dwarf::DW_OP_reg12};
-  DataExtractor ExprData(ExprBytes, true, AddrSize);
-  DWARFExpression Expr(ExprData, AddrSize);
-  VerifyLocs.setRegisterLocation(
-      Reg, dwarf::UnwindLocation::createIsDWARFExpression(Expr));
-
-  // Verify we catch state machine error.
-  Expected<dwarf::UnwindTable> RowsOrErr = dwarf::UnwindTable::create(&TestFDE);
-  EXPECT_THAT_ERROR(RowsOrErr.takeError(), Succeeded());
-  const dwarf::UnwindTable &Rows = RowsOrErr.get();
-  EXPECT_EQ(Rows.size(), 1u);
-  EXPECT_EQ(Rows[0].getAddress(), 0x1000u);
-  EXPECT_EQ(Rows[0].getRegisterLocations(), VerifyLocs);
-}
-
-TEST(DWARFDebugFrame, UnwindTable_DW_CFA_def_cfa) {
-  // Test that DW_CFA_def_cfa, DW_CFA_def_cfa_sf, DW_CFA_def_cfa_register,
-  // DW_CFA_def_cfa_offset, and DW_CFA_def_cfa_offset_sf works as expected when
-  // parsed in the state machine.
-  dwarf::CIE TestCIE = createCIE(/*IsDWARF64=*/false,
-                                 /*Offset=*/0x0,
-                                 /*Length=*/0xff);
-
-  dwarf::FDE TestFDE(/*IsDWARF64=*/true,
-                     /*Offset=*/0x3333abcdabcd,
-                     /*Length=*/0x4444abcdabcd,
-                     /*CIEPointer=*/0x1111abcdabcd,
-                     /*InitialLocation=*/0x1000,
-                     /*AddressRange=*/0x1000,
-                     /*Cie=*/&TestCIE,
-                     /*LSDAAddress=*/None,
-                     /*Arch=*/Triple::x86_64);
-
-  // Make a CIE that has a valid CFA definition and a single register unwind
-  // rule for register that we will verify is in all of the pushed rows.
-  constexpr uint8_t CFAReg1 = 12;
-  constexpr uint8_t CFAOff1 = 32;
-  constexpr uint8_t CFAReg2 = 13;
-  constexpr uint8_t CFAOff2 = 48;
-  constexpr uint8_t Reg = 13;
-  constexpr uint8_t InReg = 14;
-
-  EXPECT_THAT_ERROR(parseCFI(TestCIE, {dwarf::DW_CFA_def_cfa, CFAReg1, CFAOff1,
-                                       dwarf::DW_CFA_register, Reg, InReg}),
-                    Succeeded());
-
-  // Make a FDE with DWARF call frame instruction opcodes that use all of the
-  // DW_CFA_def_cfa* opcodes. This will verify that all opcodes that should
-  // create a row are correctly working.
-  EXPECT_THAT_ERROR(
-      parseCFI(
-          TestFDE,
-          {
-              dwarf::DW_CFA_advance_loc | 4, dwarf::DW_CFA_def_cfa_register,
-              CFAReg2, dwarf::DW_CFA_advance_loc | 4,
-              dwarf::DW_CFA_def_cfa_offset, CFAOff2,
-              dwarf::DW_CFA_advance_loc | 4, dwarf::DW_CFA_def_cfa_offset_sf,
-              0x7c, // -4 SLEB to make offset = 32 (CFAOff1)
-              dwarf::DW_CFA_advance_loc | 4, dwarf::DW_CFA_def_cfa_sf, CFAReg1,
-              0x7a, // -6 SLEB to make CFA offset 48 (CFAOff2)
-          }),
-      Succeeded());
-
-  // Create locations that we expect the UnwindRow objects to contain after
-  // parsing the DWARF call frame instructions.
-  dwarf::RegisterLocations VerifyLocs;
-  VerifyLocs.setRegisterLocation(
-      Reg, dwarf::UnwindLocation::createIsRegisterPlusOffset(InReg, 0));
-
-  // Verify we catch state machine error.
-  Expected<dwarf::UnwindTable> RowsOrErr = dwarf::UnwindTable::create(&TestFDE);
-  EXPECT_THAT_ERROR(RowsOrErr.takeError(), Succeeded());
-  const dwarf::UnwindTable &Rows = RowsOrErr.get();
-  EXPECT_EQ(Rows.size(), 5u);
-  EXPECT_EQ(Rows[0].getAddress(), 0x1000u);
-  EXPECT_EQ(
-      Rows[0].getCFAValue(),
-      dwarf::UnwindLocation::createIsRegisterPlusOffset(CFAReg1, CFAOff1));
-  EXPECT_EQ(Rows[0].getRegisterLocations().size(), 1u);
-  EXPECT_EQ(Rows[0].getRegisterLocations(), VerifyLocs);
-
-  EXPECT_EQ(Rows[1].getAddress(), 0x1004u);
-  EXPECT_EQ(
-      Rows[1].getCFAValue(),
-      dwarf::UnwindLocation::createIsRegisterPlusOffset(CFAReg2, CFAOff1));
-  EXPECT_EQ(Rows[1].getRegisterLocations().size(), 1u);
-  EXPECT_EQ(Rows[1].getRegisterLocations(), VerifyLocs);
-
-  EXPECT_EQ(Rows[2].getAddress(), 0x1008u);
-  EXPECT_EQ(
-      Rows[2].getCFAValue(),
-      dwarf::UnwindLocation::createIsRegisterPlusOffset(CFAReg2, CFAOff2));
-  EXPECT_EQ(Rows[2].getRegisterLocations().size(), 1u);
-  EXPECT_EQ(Rows[2].getRegisterLocations(), VerifyLocs);
-
-  EXPECT_EQ(Rows[3].getAddress(), 0x100cu);
-  EXPECT_EQ(
-      Rows[3].getCFAValue(),
-      dwarf::UnwindLocation::createIsRegisterPlusOffset(CFAReg2, CFAOff1));
-  EXPECT_EQ(Rows[3].getRegisterLocations().size(), 1u);
-  EXPECT_EQ(Rows[3].getRegisterLocations(), VerifyLocs);
-
-  EXPECT_EQ(Rows[4].getAddress(), 0x1010u);
-  EXPECT_EQ(
-      Rows[4].getCFAValue(),
-      dwarf::UnwindLocation::createIsRegisterPlusOffset(CFAReg1, CFAOff2));
-  EXPECT_EQ(Rows[4].getRegisterLocations().size(), 1u);
-  EXPECT_EQ(Rows[4].getRegisterLocations(), VerifyLocs);
-}
-
-TEST(DWARFDebugFrame, UnwindTable_DW_CFA_LLVM_def_aspace_cfa) {
-  // Test that DW_CFA_LLVM_def_aspace_cfa, DW_CFA_LLVM_def_aspace_cfa_sf,
-  // DW_CFA_def_cfa_register, DW_CFA_def_cfa_offset, and
-  // DW_CFA_def_cfa_offset_sf works as expected when parsed in the state
-  // machine.
-  dwarf::CIE TestCIE = createCIE(/*IsDWARF64=*/false,
-                                 /*Offset=*/0x0,
-                                 /*Length=*/0xff);
-
-  dwarf::FDE TestFDE(/*IsDWARF64=*/true,
-                     /*Offset=*/0x3333abcdabcd,
-                     /*Length=*/0x4444abcdabcd,
-                     /*CIEPointer=*/0x1111abcdabcd,
-                     /*InitialLocation=*/0x1000,
-                     /*AddressRange=*/0x1000,
-                     /*Cie=*/&TestCIE,
-                     /*LSDAAddress=*/None,
-                     /*Arch=*/Triple::x86_64);
-
-  // Make a CIE that has a valid CFA definition and a single register unwind
-  // rule for register that we will verify is in all of the pushed rows.
-  constexpr uint8_t CFAReg1 = 12;
-  constexpr uint8_t CFAOff1 = 32;
-  constexpr uint8_t CFAReg2 = 13;
-  constexpr uint8_t CFAOff2 = 48;
-  constexpr uint8_t Reg = 13;
-  constexpr uint8_t InReg = 14;
-  constexpr uint8_t AddrSpace = 2;
-
-  EXPECT_THAT_ERROR(
-      parseCFI(TestCIE, {dwarf::DW_CFA_LLVM_def_aspace_cfa, CFAReg1, CFAOff1,
-                         AddrSpace, dwarf::DW_CFA_register, Reg, InReg}),
-      Succeeded());
-
-  // Make a FDE with DWARF call frame instruction opcodes that use all of the
-  // DW_CFA_def_cfa* opcodes. This will verify that all opcodes that should
-  // create a row are correctly working.
-  EXPECT_THAT_ERROR(
-      parseCFI(
-          TestFDE,
-          {
-              dwarf::DW_CFA_advance_loc | 4, dwarf::DW_CFA_def_cfa_register,
-              CFAReg2, dwarf::DW_CFA_advance_loc | 4,
-              dwarf::DW_CFA_def_cfa_offset, CFAOff2,
-              dwarf::DW_CFA_advance_loc | 4, dwarf::DW_CFA_def_cfa_offset_sf,
-              0x7c, // -4 SLEB to make offset = 32 (CFAOff1)
-              dwarf::DW_CFA_advance_loc | 4, dwarf::DW_CFA_def_cfa_sf, CFAReg1,
-              0x7a, // -6 SLEB to make CFA offset 48 (CFAOff2)
-          }),
-      Succeeded());
-
-  // Create locations that we expect the UnwindRow objects to contain after
-  // parsing the DWARF call frame instructions.
-  dwarf::RegisterLocations VerifyLocs;
-  VerifyLocs.setRegisterLocation(
-      Reg, dwarf::UnwindLocation::createIsRegisterPlusOffset(InReg, 0));
-
-  // Verify we catch state machine error.
-  Expected<dwarf::UnwindTable> RowsOrErr = dwarf::UnwindTable::create(&TestFDE);
-  EXPECT_THAT_ERROR(RowsOrErr.takeError(), Succeeded());
-  const dwarf::UnwindTable &Rows = RowsOrErr.get();
-  EXPECT_EQ(Rows.size(), 5u);
-  EXPECT_EQ(Rows[0].getAddress(), 0x1000u);
-  EXPECT_EQ(Rows[0].getCFAValue(),
-            dwarf::UnwindLocation::createIsRegisterPlusOffset(CFAReg1, CFAOff1,
-                                                              AddrSpace));
-  EXPECT_EQ(Rows[0].getRegisterLocations().size(), 1u);
-  EXPECT_EQ(Rows[0].getRegisterLocations(), VerifyLocs);
-
-  EXPECT_EQ(Rows[1].getAddress(), 0x1004u);
-  EXPECT_EQ(Rows[1].getCFAValue(),
-            dwarf::UnwindLocation::createIsRegisterPlusOffset(CFAReg2, CFAOff1,
-                                                              AddrSpace));
-  EXPECT_EQ(Rows[1].getRegisterLocations().size(), 1u);
-  EXPECT_EQ(Rows[1].getRegisterLocations(), VerifyLocs);
-
-  EXPECT_EQ(Rows[2].getAddress(), 0x1008u);
-  EXPECT_EQ(Rows[2].getCFAValue(),
-            dwarf::UnwindLocation::createIsRegisterPlusOffset(CFAReg2, CFAOff2,
-                                                              AddrSpace));
-  EXPECT_EQ(Rows[2].getRegisterLocations().size(), 1u);
-  EXPECT_EQ(Rows[2].getRegisterLocations(), VerifyLocs);
-
-  EXPECT_EQ(Rows[3].getAddress(), 0x100cu);
-  EXPECT_EQ(Rows[3].getCFAValue(),
-            dwarf::UnwindLocation::createIsRegisterPlusOffset(CFAReg2, CFAOff1,
-                                                              AddrSpace));
-  EXPECT_EQ(Rows[3].getRegisterLocations().size(), 1u);
-  EXPECT_EQ(Rows[3].getRegisterLocations(), VerifyLocs);
-
-  EXPECT_EQ(Rows[4].getAddress(), 0x1010u);
-  EXPECT_EQ(Rows[4].getCFAValue(),
-            dwarf::UnwindLocation::createIsRegisterPlusOffset(CFAReg1, CFAOff2,
-                                                              AddrSpace));
-  EXPECT_EQ(Rows[4].getRegisterLocations().size(), 1u);
-  EXPECT_EQ(Rows[4].getRegisterLocations(), VerifyLocs);
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp b/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp
deleted file mode 100644
index 4cafc9a9258..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp
+++ /dev/null
@@ -1,3154 +0,0 @@
-//===- llvm/unittest/DebugInfo/DWARFDebugInfoTest.cpp ---------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "DwarfGenerator.h"
-#include "DwarfUtils.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/Optional.h"
-#include "llvm/ADT/SmallString.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/ADT/Triple.h"
-#include "llvm/BinaryFormat/Dwarf.h"
-#include "llvm/CodeGen/AsmPrinter.h"
-#include "llvm/DebugInfo/DWARF/DWARFCompileUnit.h"
-#include "llvm/DebugInfo/DWARF/DWARFContext.h"
-#include "llvm/DebugInfo/DWARF/DWARFDie.h"
-#include "llvm/DebugInfo/DWARF/DWARFFormValue.h"
-#include "llvm/DebugInfo/DWARF/DWARFVerifier.h"
-#include "llvm/MC/MCContext.h"
-#include "llvm/MC/MCSectionELF.h"
-#include "llvm/MC/MCStreamer.h"
-#include "llvm/Object/ObjectFile.h"
-#include "llvm/ObjectYAML/DWARFEmitter.h"
-#include "llvm/Support/Error.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "llvm/Testing/Support/Error.h"
-#include "gtest/gtest.h"
-#include <string>
-
-using namespace llvm;
-using namespace dwarf;
-using namespace utils;
-
-namespace {
-
-template <uint16_t Version, class AddrType, class RefAddrType>
-void TestAllForms() {
-  Triple Triple = getDefaultTargetTripleForAddrSize(sizeof(AddrType));
-  if (!isObjectEmissionSupported(Triple))
-    return;
-
-  // Test that we can decode all DW_FORM values correctly.
-  const AddrType AddrValue = (AddrType)0x0123456789abcdefULL;
-  const uint8_t BlockData[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 0};
-  const uint32_t BlockSize = sizeof(BlockData);
-  const RefAddrType RefAddr = 0x12345678;
-  const uint8_t Data1 = 0x01U;
-  const uint16_t Data2 = 0x2345U;
-  const uint32_t Data4 = 0x6789abcdU;
-  const uint64_t Data8 = 0x0011223344556677ULL;
-  const uint64_t Data8_2 = 0xAABBCCDDEEFF0011ULL;
-  const uint8_t Data16[16] = {1, 2,  3,  4,  5,  6,  7,  8,
-                              9, 10, 11, 12, 13, 14, 15, 16};
-  const int64_t SData = INT64_MIN;
-  const int64_t ICSData = INT64_MAX; // DW_FORM_implicit_const SData
-  const uint64_t UData[] = {UINT64_MAX - 1, UINT64_MAX - 2, UINT64_MAX - 3,
-                            UINT64_MAX - 4, UINT64_MAX - 5, UINT64_MAX - 6,
-                            UINT64_MAX - 7, UINT64_MAX - 8, UINT64_MAX - 9};
-#define UDATA_1 18446744073709551614ULL
-  const uint32_t Dwarf32Values[] = {1, 2, 3, 4, 5, 6, 7, 8};
-  const char *StringValue = "Hello";
-  const char *StrpValue = "World";
-  const char *StrxValue = "Indexed";
-  const char *Strx1Value = "Indexed1";
-  const char *Strx2Value = "Indexed2";
-  const char *Strx3Value = "Indexed3";
-  const char *Strx4Value = "Indexed4";
-
-  auto ExpectedDG = dwarfgen::Generator::create(Triple, Version);
-  ASSERT_THAT_EXPECTED(ExpectedDG, Succeeded());
-  dwarfgen::Generator *DG = ExpectedDG.get().get();
-  dwarfgen::CompileUnit &CU = DG->addCompileUnit();
-  dwarfgen::DIE CUDie = CU.getUnitDIE();
-
-  if (Version >= 5)
-    CUDie.addStrOffsetsBaseAttribute();
-
-  uint16_t Attr = DW_AT_lo_user;
-
-  //----------------------------------------------------------------------
-  // Test address forms
-  //----------------------------------------------------------------------
-  const auto Attr_DW_FORM_addr = static_cast<dwarf::Attribute>(Attr++);
-  CUDie.addAttribute(Attr_DW_FORM_addr, DW_FORM_addr, AddrValue);
-
-  //----------------------------------------------------------------------
-  // Test block forms
-  //----------------------------------------------------------------------
-  const auto Attr_DW_FORM_block = static_cast<dwarf::Attribute>(Attr++);
-  CUDie.addAttribute(Attr_DW_FORM_block, DW_FORM_block, BlockData, BlockSize);
-
-  const auto Attr_DW_FORM_block1 = static_cast<dwarf::Attribute>(Attr++);
-  CUDie.addAttribute(Attr_DW_FORM_block1, DW_FORM_block1, BlockData, BlockSize);
-
-  const auto Attr_DW_FORM_block2 = static_cast<dwarf::Attribute>(Attr++);
-  CUDie.addAttribute(Attr_DW_FORM_block2, DW_FORM_block2, BlockData, BlockSize);
-
-  const auto Attr_DW_FORM_block4 = static_cast<dwarf::Attribute>(Attr++);
-  CUDie.addAttribute(Attr_DW_FORM_block4, DW_FORM_block4, BlockData, BlockSize);
-
-  // We handle data16 as a block form.
-  const auto Attr_DW_FORM_data16 = static_cast<dwarf::Attribute>(Attr++);
-  if (Version >= 5)
-    CUDie.addAttribute(Attr_DW_FORM_data16, DW_FORM_data16, Data16, 16);
-
-  //----------------------------------------------------------------------
-  // Test data forms
-  //----------------------------------------------------------------------
-  const auto Attr_DW_FORM_data1 = static_cast<dwarf::Attribute>(Attr++);
-  CUDie.addAttribute(Attr_DW_FORM_data1, DW_FORM_data1, Data1);
-
-  const auto Attr_DW_FORM_data2 = static_cast<dwarf::Attribute>(Attr++);
-  CUDie.addAttribute(Attr_DW_FORM_data2, DW_FORM_data2, Data2);
-
-  const auto Attr_DW_FORM_data4 = static_cast<dwarf::Attribute>(Attr++);
-  CUDie.addAttribute(Attr_DW_FORM_data4, DW_FORM_data4, Data4);
-
-  const auto Attr_DW_FORM_data8 = static_cast<dwarf::Attribute>(Attr++);
-  CUDie.addAttribute(Attr_DW_FORM_data8, DW_FORM_data8, Data8);
-
-  //----------------------------------------------------------------------
-  // Test string forms
-  //----------------------------------------------------------------------
-  const auto Attr_DW_FORM_string = static_cast<dwarf::Attribute>(Attr++);
-  CUDie.addAttribute(Attr_DW_FORM_string, DW_FORM_string, StringValue);
-
-  const auto Attr_DW_FORM_strx = static_cast<dwarf::Attribute>(Attr++);
-  const auto Attr_DW_FORM_strx1 = static_cast<dwarf::Attribute>(Attr++);
-  const auto Attr_DW_FORM_strx2 = static_cast<dwarf::Attribute>(Attr++);
-  const auto Attr_DW_FORM_strx3 = static_cast<dwarf::Attribute>(Attr++);
-  const auto Attr_DW_FORM_strx4 = static_cast<dwarf::Attribute>(Attr++);
-  if (Version >= 5) {
-    CUDie.addAttribute(Attr_DW_FORM_strx, DW_FORM_strx, StrxValue);
-    CUDie.addAttribute(Attr_DW_FORM_strx1, DW_FORM_strx1, Strx1Value);
-    CUDie.addAttribute(Attr_DW_FORM_strx2, DW_FORM_strx2, Strx2Value);
-    CUDie.addAttribute(Attr_DW_FORM_strx3, DW_FORM_strx3, Strx3Value);
-    CUDie.addAttribute(Attr_DW_FORM_strx4, DW_FORM_strx4, Strx4Value);
-  }
-
-  const auto Attr_DW_FORM_strp = static_cast<dwarf::Attribute>(Attr++);
-  CUDie.addAttribute(Attr_DW_FORM_strp, DW_FORM_strp, StrpValue);
-
-  //----------------------------------------------------------------------
-  // Test reference forms
-  //----------------------------------------------------------------------
-  const auto Attr_DW_FORM_ref_addr = static_cast<dwarf::Attribute>(Attr++);
-  CUDie.addAttribute(Attr_DW_FORM_ref_addr, DW_FORM_ref_addr, RefAddr);
-
-  const auto Attr_DW_FORM_ref1 = static_cast<dwarf::Attribute>(Attr++);
-  CUDie.addAttribute(Attr_DW_FORM_ref1, DW_FORM_ref1, Data1);
-
-  const auto Attr_DW_FORM_ref2 = static_cast<dwarf::Attribute>(Attr++);
-  CUDie.addAttribute(Attr_DW_FORM_ref2, DW_FORM_ref2, Data2);
-
-  const auto Attr_DW_FORM_ref4 = static_cast<dwarf::Attribute>(Attr++);
-  CUDie.addAttribute(Attr_DW_FORM_ref4, DW_FORM_ref4, Data4);
-
-  const auto Attr_DW_FORM_ref8 = static_cast<dwarf::Attribute>(Attr++);
-  CUDie.addAttribute(Attr_DW_FORM_ref8, DW_FORM_ref8, Data8);
-
-  const auto Attr_DW_FORM_ref_sig8 = static_cast<dwarf::Attribute>(Attr++);
-  if (Version >= 4)
-    CUDie.addAttribute(Attr_DW_FORM_ref_sig8, DW_FORM_ref_sig8, Data8_2);
-
-  const auto Attr_DW_FORM_ref_udata = static_cast<dwarf::Attribute>(Attr++);
-  CUDie.addAttribute(Attr_DW_FORM_ref_udata, DW_FORM_ref_udata, UData[0]);
-
-  //----------------------------------------------------------------------
-  // Test flag forms
-  //----------------------------------------------------------------------
-  const auto Attr_DW_FORM_flag_true = static_cast<dwarf::Attribute>(Attr++);
-  CUDie.addAttribute(Attr_DW_FORM_flag_true, DW_FORM_flag, true);
-
-  const auto Attr_DW_FORM_flag_false = static_cast<dwarf::Attribute>(Attr++);
-  CUDie.addAttribute(Attr_DW_FORM_flag_false, DW_FORM_flag, false);
-
-  const auto Attr_DW_FORM_flag_present = static_cast<dwarf::Attribute>(Attr++);
-  if (Version >= 4)
-    CUDie.addAttribute(Attr_DW_FORM_flag_present, DW_FORM_flag_present);
-
-  //----------------------------------------------------------------------
-  // Test SLEB128 based forms
-  //----------------------------------------------------------------------
-  const auto Attr_DW_FORM_sdata = static_cast<dwarf::Attribute>(Attr++);
-  CUDie.addAttribute(Attr_DW_FORM_sdata, DW_FORM_sdata, SData);
-
-  const auto Attr_DW_FORM_implicit_const =
-    static_cast<dwarf::Attribute>(Attr++);
-  if (Version >= 5)
-    CUDie.addAttribute(Attr_DW_FORM_implicit_const, DW_FORM_implicit_const,
-                       ICSData);
-
-  //----------------------------------------------------------------------
-  // Test ULEB128 based forms
-  //----------------------------------------------------------------------
-  const auto Attr_DW_FORM_udata = static_cast<dwarf::Attribute>(Attr++);
-  CUDie.addAttribute(Attr_DW_FORM_udata, DW_FORM_udata, UData[0]);
-
-  //----------------------------------------------------------------------
-  // Test DWARF32/DWARF64 forms
-  //----------------------------------------------------------------------
-  const auto Attr_DW_FORM_GNU_ref_alt = static_cast<dwarf::Attribute>(Attr++);
-  CUDie.addAttribute(Attr_DW_FORM_GNU_ref_alt, DW_FORM_GNU_ref_alt,
-                     Dwarf32Values[0]);
-
-  const auto Attr_DW_FORM_sec_offset = static_cast<dwarf::Attribute>(Attr++);
-  if (Version >= 4)
-    CUDie.addAttribute(Attr_DW_FORM_sec_offset, DW_FORM_sec_offset,
-                       Dwarf32Values[1]);
-
-  //----------------------------------------------------------------------
-  // Add an address at the end to make sure we can decode this value
-  //----------------------------------------------------------------------
-  const auto Attr_Last = static_cast<dwarf::Attribute>(Attr++);
-  CUDie.addAttribute(Attr_Last, DW_FORM_addr, AddrValue);
-
-  //----------------------------------------------------------------------
-  // Generate the DWARF
-  //----------------------------------------------------------------------
-  StringRef FileBytes = DG->generate();
-  MemoryBufferRef FileBuffer(FileBytes, "dwarf");
-  auto Obj = object::ObjectFile::createObjectFile(FileBuffer);
-  EXPECT_TRUE((bool)Obj);
-  std::unique_ptr<DWARFContext> DwarfContext = DWARFContext::create(**Obj);
-  uint32_t NumCUs = DwarfContext->getNumCompileUnits();
-  EXPECT_EQ(NumCUs, 1u);
-  DWARFCompileUnit *U =
-      cast<DWARFCompileUnit>(DwarfContext->getUnitAtIndex(0));
-  auto DieDG = U->getUnitDIE(false);
-  EXPECT_TRUE(DieDG.isValid());
-
-  //----------------------------------------------------------------------
-  // Test address forms
-  //----------------------------------------------------------------------
-  EXPECT_EQ(AddrValue, toAddress(DieDG.find(Attr_DW_FORM_addr), 0));
-
-  //----------------------------------------------------------------------
-  // Test block forms
-  //----------------------------------------------------------------------
-  Optional<DWARFFormValue> FormValue;
-  ArrayRef<uint8_t> ExtractedBlockData;
-  Optional<ArrayRef<uint8_t>> BlockDataOpt;
-
-  FormValue = DieDG.find(Attr_DW_FORM_block);
-  EXPECT_TRUE((bool)FormValue);
-  BlockDataOpt = FormValue->getAsBlock();
-  EXPECT_TRUE(BlockDataOpt.hasValue());
-  ExtractedBlockData = BlockDataOpt.getValue();
-  EXPECT_EQ(ExtractedBlockData.size(), BlockSize);
-  EXPECT_TRUE(memcmp(ExtractedBlockData.data(), BlockData, BlockSize) == 0);
-
-  FormValue = DieDG.find(Attr_DW_FORM_block1);
-  EXPECT_TRUE((bool)FormValue);
-  BlockDataOpt = FormValue->getAsBlock();
-  EXPECT_TRUE(BlockDataOpt.hasValue());
-  ExtractedBlockData = BlockDataOpt.getValue();
-  EXPECT_EQ(ExtractedBlockData.size(), BlockSize);
-  EXPECT_TRUE(memcmp(ExtractedBlockData.data(), BlockData, BlockSize) == 0);
-
-  FormValue = DieDG.find(Attr_DW_FORM_block2);
-  EXPECT_TRUE((bool)FormValue);
-  BlockDataOpt = FormValue->getAsBlock();
-  EXPECT_TRUE(BlockDataOpt.hasValue());
-  ExtractedBlockData = BlockDataOpt.getValue();
-  EXPECT_EQ(ExtractedBlockData.size(), BlockSize);
-  EXPECT_TRUE(memcmp(ExtractedBlockData.data(), BlockData, BlockSize) == 0);
-
-  FormValue = DieDG.find(Attr_DW_FORM_block4);
-  EXPECT_TRUE((bool)FormValue);
-  BlockDataOpt = FormValue->getAsBlock();
-  EXPECT_TRUE(BlockDataOpt.hasValue());
-  ExtractedBlockData = BlockDataOpt.getValue();
-  EXPECT_EQ(ExtractedBlockData.size(), BlockSize);
-  EXPECT_TRUE(memcmp(ExtractedBlockData.data(), BlockData, BlockSize) == 0);
-
-  // Data16 is handled like a block.
-  if (Version >= 5) {
-    FormValue = DieDG.find(Attr_DW_FORM_data16);
-    EXPECT_TRUE((bool)FormValue);
-    BlockDataOpt = FormValue->getAsBlock();
-    EXPECT_TRUE(BlockDataOpt.hasValue());
-    ExtractedBlockData = BlockDataOpt.getValue();
-    EXPECT_EQ(ExtractedBlockData.size(), 16u);
-    EXPECT_TRUE(memcmp(ExtractedBlockData.data(), Data16, 16) == 0);
-  }
-
-  //----------------------------------------------------------------------
-  // Test data forms
-  //----------------------------------------------------------------------
-  EXPECT_EQ(Data1, toUnsigned(DieDG.find(Attr_DW_FORM_data1), 0));
-  EXPECT_EQ(Data2, toUnsigned(DieDG.find(Attr_DW_FORM_data2), 0));
-  EXPECT_EQ(Data4, toUnsigned(DieDG.find(Attr_DW_FORM_data4), 0));
-  EXPECT_EQ(Data8, toUnsigned(DieDG.find(Attr_DW_FORM_data8), 0));
-
-  //----------------------------------------------------------------------
-  // Test string forms
-  //----------------------------------------------------------------------
-  auto ExtractedStringValue = toString(DieDG.find(Attr_DW_FORM_string));
-  EXPECT_TRUE((bool)ExtractedStringValue);
-  EXPECT_STREQ(StringValue, *ExtractedStringValue);
-
-  if (Version >= 5) {
-    auto ExtractedStrxValue = toString(DieDG.find(Attr_DW_FORM_strx));
-    EXPECT_TRUE((bool)ExtractedStrxValue);
-    EXPECT_STREQ(StrxValue, *ExtractedStrxValue);
-
-    auto ExtractedStrx1Value = toString(DieDG.find(Attr_DW_FORM_strx1));
-    EXPECT_TRUE((bool)ExtractedStrx1Value);
-    EXPECT_STREQ(Strx1Value, *ExtractedStrx1Value);
-
-    auto ExtractedStrx2Value = toString(DieDG.find(Attr_DW_FORM_strx2));
-    EXPECT_TRUE((bool)ExtractedStrx2Value);
-    EXPECT_STREQ(Strx2Value, *ExtractedStrx2Value);
-
-    auto ExtractedStrx3Value = toString(DieDG.find(Attr_DW_FORM_strx3));
-    EXPECT_TRUE((bool)ExtractedStrx3Value);
-    EXPECT_STREQ(Strx3Value, *ExtractedStrx3Value);
-
-    auto ExtractedStrx4Value = toString(DieDG.find(Attr_DW_FORM_strx4));
-    EXPECT_TRUE((bool)ExtractedStrx4Value);
-    EXPECT_STREQ(Strx4Value, *ExtractedStrx4Value);
-  }
-
-  auto ExtractedStrpValue = toString(DieDG.find(Attr_DW_FORM_strp));
-  EXPECT_TRUE((bool)ExtractedStrpValue);
-  EXPECT_STREQ(StrpValue, *ExtractedStrpValue);
-
-  //----------------------------------------------------------------------
-  // Test reference forms
-  //----------------------------------------------------------------------
-  EXPECT_EQ(RefAddr, toReference(DieDG.find(Attr_DW_FORM_ref_addr), 0));
-  EXPECT_EQ(Data1, toReference(DieDG.find(Attr_DW_FORM_ref1), 0));
-  EXPECT_EQ(Data2, toReference(DieDG.find(Attr_DW_FORM_ref2), 0));
-  EXPECT_EQ(Data4, toReference(DieDG.find(Attr_DW_FORM_ref4), 0));
-  EXPECT_EQ(Data8, toReference(DieDG.find(Attr_DW_FORM_ref8), 0));
-  if (Version >= 4) {
-    EXPECT_EQ(Data8_2, toReference(DieDG.find(Attr_DW_FORM_ref_sig8), 0));
-  }
-  EXPECT_EQ(UData[0], toReference(DieDG.find(Attr_DW_FORM_ref_udata), 0));
-
-  //----------------------------------------------------------------------
-  // Test flag forms
-  //----------------------------------------------------------------------
-  EXPECT_EQ(1ULL, toUnsigned(DieDG.find(Attr_DW_FORM_flag_true), 0));
-  EXPECT_EQ(0ULL, toUnsigned(DieDG.find(Attr_DW_FORM_flag_false), 1));
-  if (Version >= 4) {
-    EXPECT_EQ(1ULL, toUnsigned(DieDG.find(Attr_DW_FORM_flag_present), 0));
-  }
-
-  //----------------------------------------------------------------------
-  // Test SLEB128 based forms
-  //----------------------------------------------------------------------
-  EXPECT_EQ(SData, toSigned(DieDG.find(Attr_DW_FORM_sdata), 0));
-  if (Version >= 5) {
-    EXPECT_EQ(ICSData, toSigned(DieDG.find(Attr_DW_FORM_implicit_const), 0));
-  }
-
-  //----------------------------------------------------------------------
-  // Test ULEB128 based forms
-  //----------------------------------------------------------------------
-  EXPECT_EQ(UData[0], toUnsigned(DieDG.find(Attr_DW_FORM_udata), 0));
-
-  //----------------------------------------------------------------------
-  // Test DWARF32/DWARF64 forms
-  //----------------------------------------------------------------------
-  EXPECT_EQ(Dwarf32Values[0],
-            toReference(DieDG.find(Attr_DW_FORM_GNU_ref_alt), 0));
-  if (Version >= 4) {
-    EXPECT_EQ(Dwarf32Values[1],
-              toSectionOffset(DieDG.find(Attr_DW_FORM_sec_offset), 0));
-  }
-
-  //----------------------------------------------------------------------
-  // Add an address at the end to make sure we can decode this value
-  //----------------------------------------------------------------------
-  EXPECT_EQ(AddrValue, toAddress(DieDG.find(Attr_Last), 0));
-}
-
-TEST(DWARFDebugInfo, TestDWARF32Version2Addr4AllForms) {
-  // Test that we can decode all forms for DWARF32, version 2, with 4 byte
-  // addresses.
-  typedef uint32_t AddrType;
-  // DW_FORM_ref_addr are the same as the address type in DWARF32 version 2.
-  typedef AddrType RefAddrType;
-  TestAllForms<2, AddrType, RefAddrType>();
-}
-
-TEST(DWARFDebugInfo, TestDWARF32Version2Addr8AllForms) {
-  // Test that we can decode all forms for DWARF32, version 2, with 4 byte
-  // addresses.
-  typedef uint64_t AddrType;
-  // DW_FORM_ref_addr are the same as the address type in DWARF32 version 2.
-  typedef AddrType RefAddrType;
-  TestAllForms<2, AddrType, RefAddrType>();
-}
-
-TEST(DWARFDebugInfo, TestDWARF32Version3Addr4AllForms) {
-  // Test that we can decode all forms for DWARF32, version 3, with 4 byte
-  // addresses.
-  typedef uint32_t AddrType;
-  // DW_FORM_ref_addr are 4 bytes in DWARF32 for version 3 and later.
-  typedef uint32_t RefAddrType;
-  TestAllForms<3, AddrType, RefAddrType>();
-}
-
-TEST(DWARFDebugInfo, TestDWARF32Version3Addr8AllForms) {
-  // Test that we can decode all forms for DWARF32, version 3, with 8 byte
-  // addresses.
-  typedef uint64_t AddrType;
-  // DW_FORM_ref_addr are 4 bytes in DWARF32 for version 3 and later
-  typedef uint32_t RefAddrType;
-  TestAllForms<3, AddrType, RefAddrType>();
-}
-
-TEST(DWARFDebugInfo, TestDWARF32Version4Addr4AllForms) {
-  // Test that we can decode all forms for DWARF32, version 4, with 4 byte
-  // addresses.
-  typedef uint32_t AddrType;
-  // DW_FORM_ref_addr are 4 bytes in DWARF32 for version 3 and later
-  typedef uint32_t RefAddrType;
-  TestAllForms<4, AddrType, RefAddrType>();
-}
-
-TEST(DWARFDebugInfo, TestDWARF32Version4Addr8AllForms) {
-  // Test that we can decode all forms for DWARF32, version 4, with 8 byte
-  // addresses.
-  typedef uint64_t AddrType;
-  // DW_FORM_ref_addr are 4 bytes in DWARF32 for version 3 and later
-  typedef uint32_t RefAddrType;
-  TestAllForms<4, AddrType, RefAddrType>();
-}
-
-TEST(DWARFDebugInfo, TestDWARF32Version5Addr4AllForms) {
-  // Test that we can decode all forms for DWARF32, version 5, with 4 byte
-  // addresses.
-  typedef uint32_t AddrType;
-  // DW_FORM_ref_addr are 4 bytes in DWARF32 for version 3 and later
-  typedef uint32_t RefAddrType;
-  TestAllForms<5, AddrType, RefAddrType>();
-}
-
-TEST(DWARFDebugInfo, TestDWARF32Version5Addr8AllForms) {
-  // Test that we can decode all forms for DWARF32, version 5, with 8 byte
-  // addresses.
-  typedef uint64_t AddrType;
-  // DW_FORM_ref_addr are 4 bytes in DWARF32 for version 3 and later
-  typedef uint32_t RefAddrType;
-  TestAllForms<5, AddrType, RefAddrType>();
-}
-
-template <uint16_t Version, class AddrType> void TestChildren() {
-  Triple Triple = getDefaultTargetTripleForAddrSize(sizeof(AddrType));
-  if (!isObjectEmissionSupported(Triple))
-    return;
-
-  // Test that we can decode DW_FORM_ref_addr values correctly in DWARF 2 with
-  // 4 byte addresses. DW_FORM_ref_addr values should be 4 bytes when using
-  // 8 byte addresses.
-
-  auto ExpectedDG = dwarfgen::Generator::create(Triple, Version);
-  ASSERT_THAT_EXPECTED(ExpectedDG, Succeeded());
-  dwarfgen::Generator *DG = ExpectedDG.get().get();
-  dwarfgen::CompileUnit &CU = DG->addCompileUnit();
-  dwarfgen::DIE CUDie = CU.getUnitDIE();
-
-  CUDie.addAttribute(DW_AT_name, DW_FORM_strp, "/tmp/main.c");
-  CUDie.addAttribute(DW_AT_language, DW_FORM_data2, DW_LANG_C);
-
-  dwarfgen::DIE SubprogramDie = CUDie.addChild(DW_TAG_subprogram);
-  SubprogramDie.addAttribute(DW_AT_name, DW_FORM_strp, "main");
-  SubprogramDie.addAttribute(DW_AT_low_pc, DW_FORM_addr, 0x1000U);
-  SubprogramDie.addAttribute(DW_AT_high_pc, DW_FORM_addr, 0x2000U);
-
-  dwarfgen::DIE IntDie = CUDie.addChild(DW_TAG_base_type);
-  IntDie.addAttribute(DW_AT_name, DW_FORM_strp, "int");
-  IntDie.addAttribute(DW_AT_encoding, DW_FORM_data1, DW_ATE_signed);
-  IntDie.addAttribute(DW_AT_byte_size, DW_FORM_data1, 4);
-
-  dwarfgen::DIE ArgcDie = SubprogramDie.addChild(DW_TAG_formal_parameter);
-  ArgcDie.addAttribute(DW_AT_name, DW_FORM_strp, "argc");
-  // ArgcDie.addAttribute(DW_AT_type, DW_FORM_ref4, IntDie);
-  ArgcDie.addAttribute(DW_AT_type, DW_FORM_ref_addr, IntDie);
-
-  StringRef FileBytes = DG->generate();
-  MemoryBufferRef FileBuffer(FileBytes, "dwarf");
-  auto Obj = object::ObjectFile::createObjectFile(FileBuffer);
-  EXPECT_TRUE((bool)Obj);
-  std::unique_ptr<DWARFContext> DwarfContext = DWARFContext::create(**Obj);
-
-  // Verify the number of compile units is correct.
-  uint32_t NumCUs = DwarfContext->getNumCompileUnits();
-  EXPECT_EQ(NumCUs, 1u);
-  DWARFCompileUnit *U =
-      cast<DWARFCompileUnit>(DwarfContext->getUnitAtIndex(0));
-
-  // Get the compile unit DIE is valid.
-  auto DieDG = U->getUnitDIE(false);
-  EXPECT_TRUE(DieDG.isValid());
-
-  // Verify the first child of the compile unit DIE is our subprogram.
-  auto SubprogramDieDG = DieDG.getFirstChild();
-  EXPECT_TRUE(SubprogramDieDG.isValid());
-  EXPECT_EQ(SubprogramDieDG.getTag(), DW_TAG_subprogram);
-
-  // Verify the first child of the subprogram is our formal parameter.
-  auto ArgcDieDG = SubprogramDieDG.getFirstChild();
-  EXPECT_TRUE(ArgcDieDG.isValid());
-  EXPECT_EQ(ArgcDieDG.getTag(), DW_TAG_formal_parameter);
-
-  // Verify our formal parameter has a NULL tag sibling.
-  auto NullDieDG = ArgcDieDG.getSibling();
-  EXPECT_TRUE(NullDieDG.isValid());
-  if (NullDieDG) {
-    EXPECT_EQ(NullDieDG.getTag(), DW_TAG_null);
-    EXPECT_TRUE(!NullDieDG.getSibling().isValid());
-    EXPECT_TRUE(!NullDieDG.getFirstChild().isValid());
-  }
-
-  // Verify the sibling of our subprogram is our integer base type.
-  auto IntDieDG = SubprogramDieDG.getSibling();
-  EXPECT_TRUE(IntDieDG.isValid());
-  EXPECT_EQ(IntDieDG.getTag(), DW_TAG_base_type);
-
-  // Verify the sibling of our subprogram is our integer base is a NULL tag.
-  NullDieDG = IntDieDG.getSibling();
-  EXPECT_TRUE(NullDieDG.isValid());
-  if (NullDieDG) {
-    EXPECT_EQ(NullDieDG.getTag(), DW_TAG_null);
-    EXPECT_TRUE(!NullDieDG.getSibling().isValid());
-    EXPECT_TRUE(!NullDieDG.getFirstChild().isValid());
-  }
-
-  // Verify the previous sibling of our subprogram is our integer base type.
-  IntDieDG = NullDieDG.getPreviousSibling();
-  EXPECT_TRUE(IntDieDG.isValid());
-  EXPECT_EQ(IntDieDG.getTag(), DW_TAG_base_type);
-}
-
-TEST(DWARFDebugInfo, TestDWARF32Version2Addr4Children) {
-  // Test that we can decode all forms for DWARF32, version 2, with 4 byte
-  // addresses.
-  typedef uint32_t AddrType;
-  TestChildren<2, AddrType>();
-}
-
-TEST(DWARFDebugInfo, TestDWARF32Version2Addr8Children) {
-  // Test that we can decode all forms for DWARF32, version 2, with 8 byte
-  // addresses.
-  typedef uint64_t AddrType;
-  TestChildren<2, AddrType>();
-}
-
-TEST(DWARFDebugInfo, TestDWARF32Version3Addr4Children) {
-  // Test that we can decode all forms for DWARF32, version 3, with 4 byte
-  // addresses.
-  typedef uint32_t AddrType;
-  TestChildren<3, AddrType>();
-}
-
-TEST(DWARFDebugInfo, TestDWARF32Version3Addr8Children) {
-  // Test that we can decode all forms for DWARF32, version 3, with 8 byte
-  // addresses.
-  typedef uint64_t AddrType;
-  TestChildren<3, AddrType>();
-}
-
-TEST(DWARFDebugInfo, TestDWARF32Version4Addr4Children) {
-  // Test that we can decode all forms for DWARF32, version 4, with 4 byte
-  // addresses.
-  typedef uint32_t AddrType;
-  TestChildren<4, AddrType>();
-}
-
-TEST(DWARFDebugInfo, TestDWARF32Version4Addr8Children) {
-  // Test that we can decode all forms for DWARF32, version 4, with 8 byte
-  // addresses.
-  typedef uint64_t AddrType;
-  TestChildren<4, AddrType>();
-}
-
-template <uint16_t Version, class AddrType> void TestReferences() {
-  Triple Triple = getDefaultTargetTripleForAddrSize(sizeof(AddrType));
-  if (!isObjectEmissionSupported(Triple))
-    return;
-
-  // Test that we can decode DW_FORM_refXXX values correctly in DWARF.
-  auto ExpectedDG = dwarfgen::Generator::create(Triple, Version);
-  ASSERT_THAT_EXPECTED(ExpectedDG, Succeeded());
-  dwarfgen::Generator *DG = ExpectedDG.get().get();
-  dwarfgen::CompileUnit &CU1 = DG->addCompileUnit();
-  dwarfgen::CompileUnit &CU2 = DG->addCompileUnit();
-
-  dwarfgen::DIE CU1Die = CU1.getUnitDIE();
-  CU1Die.addAttribute(DW_AT_name, DW_FORM_strp, "/tmp/main.c");
-  CU1Die.addAttribute(DW_AT_language, DW_FORM_data2, DW_LANG_C);
-
-  dwarfgen::DIE CU1TypeDie = CU1Die.addChild(DW_TAG_base_type);
-  CU1TypeDie.addAttribute(DW_AT_name, DW_FORM_strp, "int");
-  CU1TypeDie.addAttribute(DW_AT_encoding, DW_FORM_data1, DW_ATE_signed);
-  CU1TypeDie.addAttribute(DW_AT_byte_size, DW_FORM_data1, 4);
-
-  dwarfgen::DIE CU1Ref1Die = CU1Die.addChild(DW_TAG_variable);
-  CU1Ref1Die.addAttribute(DW_AT_name, DW_FORM_strp, "CU1Ref1");
-  CU1Ref1Die.addAttribute(DW_AT_type, DW_FORM_ref1, CU1TypeDie);
-
-  dwarfgen::DIE CU1Ref2Die = CU1Die.addChild(DW_TAG_variable);
-  CU1Ref2Die.addAttribute(DW_AT_name, DW_FORM_strp, "CU1Ref2");
-  CU1Ref2Die.addAttribute(DW_AT_type, DW_FORM_ref2, CU1TypeDie);
-
-  dwarfgen::DIE CU1Ref4Die = CU1Die.addChild(DW_TAG_variable);
-  CU1Ref4Die.addAttribute(DW_AT_name, DW_FORM_strp, "CU1Ref4");
-  CU1Ref4Die.addAttribute(DW_AT_type, DW_FORM_ref4, CU1TypeDie);
-
-  dwarfgen::DIE CU1Ref8Die = CU1Die.addChild(DW_TAG_variable);
-  CU1Ref8Die.addAttribute(DW_AT_name, DW_FORM_strp, "CU1Ref8");
-  CU1Ref8Die.addAttribute(DW_AT_type, DW_FORM_ref8, CU1TypeDie);
-
-  dwarfgen::DIE CU1RefAddrDie = CU1Die.addChild(DW_TAG_variable);
-  CU1RefAddrDie.addAttribute(DW_AT_name, DW_FORM_strp, "CU1RefAddr");
-  CU1RefAddrDie.addAttribute(DW_AT_type, DW_FORM_ref_addr, CU1TypeDie);
-
-  dwarfgen::DIE CU2Die = CU2.getUnitDIE();
-  CU2Die.addAttribute(DW_AT_name, DW_FORM_strp, "/tmp/foo.c");
-  CU2Die.addAttribute(DW_AT_language, DW_FORM_data2, DW_LANG_C);
-
-  dwarfgen::DIE CU2TypeDie = CU2Die.addChild(DW_TAG_base_type);
-  CU2TypeDie.addAttribute(DW_AT_name, DW_FORM_strp, "float");
-  CU2TypeDie.addAttribute(DW_AT_encoding, DW_FORM_data1, DW_ATE_float);
-  CU2TypeDie.addAttribute(DW_AT_byte_size, DW_FORM_data1, 4);
-
-  dwarfgen::DIE CU2Ref1Die = CU2Die.addChild(DW_TAG_variable);
-  CU2Ref1Die.addAttribute(DW_AT_name, DW_FORM_strp, "CU2Ref1");
-  CU2Ref1Die.addAttribute(DW_AT_type, DW_FORM_ref1, CU2TypeDie);
-
-  dwarfgen::DIE CU2Ref2Die = CU2Die.addChild(DW_TAG_variable);
-  CU2Ref2Die.addAttribute(DW_AT_name, DW_FORM_strp, "CU2Ref2");
-  CU2Ref2Die.addAttribute(DW_AT_type, DW_FORM_ref2, CU2TypeDie);
-
-  dwarfgen::DIE CU2Ref4Die = CU2Die.addChild(DW_TAG_variable);
-  CU2Ref4Die.addAttribute(DW_AT_name, DW_FORM_strp, "CU2Ref4");
-  CU2Ref4Die.addAttribute(DW_AT_type, DW_FORM_ref4, CU2TypeDie);
-
-  dwarfgen::DIE CU2Ref8Die = CU2Die.addChild(DW_TAG_variable);
-  CU2Ref8Die.addAttribute(DW_AT_name, DW_FORM_strp, "CU2Ref8");
-  CU2Ref8Die.addAttribute(DW_AT_type, DW_FORM_ref8, CU2TypeDie);
-
-  dwarfgen::DIE CU2RefAddrDie = CU2Die.addChild(DW_TAG_variable);
-  CU2RefAddrDie.addAttribute(DW_AT_name, DW_FORM_strp, "CU2RefAddr");
-  CU2RefAddrDie.addAttribute(DW_AT_type, DW_FORM_ref_addr, CU2TypeDie);
-
-  // Refer to a type in CU1 from CU2
-  dwarfgen::DIE CU2ToCU1RefAddrDie = CU2Die.addChild(DW_TAG_variable);
-  CU2ToCU1RefAddrDie.addAttribute(DW_AT_name, DW_FORM_strp, "CU2ToCU1RefAddr");
-  CU2ToCU1RefAddrDie.addAttribute(DW_AT_type, DW_FORM_ref_addr, CU1TypeDie);
-
-  // Refer to a type in CU2 from CU1
-  dwarfgen::DIE CU1ToCU2RefAddrDie = CU1Die.addChild(DW_TAG_variable);
-  CU1ToCU2RefAddrDie.addAttribute(DW_AT_name, DW_FORM_strp, "CU1ToCU2RefAddr");
-  CU1ToCU2RefAddrDie.addAttribute(DW_AT_type, DW_FORM_ref_addr, CU2TypeDie);
-
-  StringRef FileBytes = DG->generate();
-  MemoryBufferRef FileBuffer(FileBytes, "dwarf");
-  auto Obj = object::ObjectFile::createObjectFile(FileBuffer);
-  EXPECT_TRUE((bool)Obj);
-  std::unique_ptr<DWARFContext> DwarfContext = DWARFContext::create(**Obj);
-
-  // Verify the number of compile units is correct.
-  uint32_t NumCUs = DwarfContext->getNumCompileUnits();
-  EXPECT_EQ(NumCUs, 2u);
-  DWARFCompileUnit *U1 =
-      cast<DWARFCompileUnit>(DwarfContext->getUnitAtIndex(0));
-  DWARFCompileUnit *U2 =
-      cast<DWARFCompileUnit>(DwarfContext->getUnitAtIndex(1));
-
-  // Get the compile unit DIE is valid.
-  auto Unit1DieDG = U1->getUnitDIE(false);
-  EXPECT_TRUE(Unit1DieDG.isValid());
-
-  auto Unit2DieDG = U2->getUnitDIE(false);
-  EXPECT_TRUE(Unit2DieDG.isValid());
-
-  // Verify the first child of the compile unit 1 DIE is our int base type.
-  auto CU1TypeDieDG = Unit1DieDG.getFirstChild();
-  EXPECT_TRUE(CU1TypeDieDG.isValid());
-  EXPECT_EQ(CU1TypeDieDG.getTag(), DW_TAG_base_type);
-  EXPECT_EQ(DW_ATE_signed, toUnsigned(CU1TypeDieDG.find(DW_AT_encoding), 0));
-
-  // Verify the first child of the compile unit 2 DIE is our float base type.
-  auto CU2TypeDieDG = Unit2DieDG.getFirstChild();
-  EXPECT_TRUE(CU2TypeDieDG.isValid());
-  EXPECT_EQ(CU2TypeDieDG.getTag(), DW_TAG_base_type);
-  EXPECT_EQ(DW_ATE_float, toUnsigned(CU2TypeDieDG.find(DW_AT_encoding), 0));
-
-  // Verify the sibling of the base type DIE is our Ref1 DIE and that its
-  // DW_AT_type points to our base type DIE.
-  auto CU1Ref1DieDG = CU1TypeDieDG.getSibling();
-  EXPECT_TRUE(CU1Ref1DieDG.isValid());
-  EXPECT_EQ(CU1Ref1DieDG.getTag(), DW_TAG_variable);
-  EXPECT_EQ(CU1TypeDieDG.getOffset(),
-            toReference(CU1Ref1DieDG.find(DW_AT_type), -1ULL));
-  // Verify the sibling is our Ref2 DIE and that its DW_AT_type points to our
-  // base type DIE in CU1.
-  auto CU1Ref2DieDG = CU1Ref1DieDG.getSibling();
-  EXPECT_TRUE(CU1Ref2DieDG.isValid());
-  EXPECT_EQ(CU1Ref2DieDG.getTag(), DW_TAG_variable);
-  EXPECT_EQ(CU1TypeDieDG.getOffset(),
-            toReference(CU1Ref2DieDG.find(DW_AT_type), -1ULL));
-
-  // Verify the sibling is our Ref4 DIE and that its DW_AT_type points to our
-  // base type DIE in CU1.
-  auto CU1Ref4DieDG = CU1Ref2DieDG.getSibling();
-  EXPECT_TRUE(CU1Ref4DieDG.isValid());
-  EXPECT_EQ(CU1Ref4DieDG.getTag(), DW_TAG_variable);
-  EXPECT_EQ(CU1TypeDieDG.getOffset(),
-            toReference(CU1Ref4DieDG.find(DW_AT_type), -1ULL));
-
-  // Verify the sibling is our Ref8 DIE and that its DW_AT_type points to our
-  // base type DIE in CU1.
-  auto CU1Ref8DieDG = CU1Ref4DieDG.getSibling();
-  EXPECT_TRUE(CU1Ref8DieDG.isValid());
-  EXPECT_EQ(CU1Ref8DieDG.getTag(), DW_TAG_variable);
-  EXPECT_EQ(CU1TypeDieDG.getOffset(),
-            toReference(CU1Ref8DieDG.find(DW_AT_type), -1ULL));
-
-  // Verify the sibling is our RefAddr DIE and that its DW_AT_type points to our
-  // base type DIE in CU1.
-  auto CU1RefAddrDieDG = CU1Ref8DieDG.getSibling();
-  EXPECT_TRUE(CU1RefAddrDieDG.isValid());
-  EXPECT_EQ(CU1RefAddrDieDG.getTag(), DW_TAG_variable);
-  EXPECT_EQ(CU1TypeDieDG.getOffset(),
-            toReference(CU1RefAddrDieDG.find(DW_AT_type), -1ULL));
-
-  // Verify the sibling of the Ref4 DIE is our RefAddr DIE and that its
-  // DW_AT_type points to our base type DIE.
-  auto CU1ToCU2RefAddrDieDG = CU1RefAddrDieDG.getSibling();
-  EXPECT_TRUE(CU1ToCU2RefAddrDieDG.isValid());
-  EXPECT_EQ(CU1ToCU2RefAddrDieDG.getTag(), DW_TAG_variable);
-  EXPECT_EQ(CU2TypeDieDG.getOffset(),
-            toReference(CU1ToCU2RefAddrDieDG.find(DW_AT_type), -1ULL));
-
-  // Verify the sibling of the base type DIE is our Ref1 DIE and that its
-  // DW_AT_type points to our base type DIE.
-  auto CU2Ref1DieDG = CU2TypeDieDG.getSibling();
-  EXPECT_TRUE(CU2Ref1DieDG.isValid());
-  EXPECT_EQ(CU2Ref1DieDG.getTag(), DW_TAG_variable);
-  EXPECT_EQ(CU2TypeDieDG.getOffset(),
-            toReference(CU2Ref1DieDG.find(DW_AT_type), -1ULL));
-  // Verify the sibling is our Ref2 DIE and that its DW_AT_type points to our
-  // base type DIE in CU2.
-  auto CU2Ref2DieDG = CU2Ref1DieDG.getSibling();
-  EXPECT_TRUE(CU2Ref2DieDG.isValid());
-  EXPECT_EQ(CU2Ref2DieDG.getTag(), DW_TAG_variable);
-  EXPECT_EQ(CU2TypeDieDG.getOffset(),
-            toReference(CU2Ref2DieDG.find(DW_AT_type), -1ULL));
-
-  // Verify the sibling is our Ref4 DIE and that its DW_AT_type points to our
-  // base type DIE in CU2.
-  auto CU2Ref4DieDG = CU2Ref2DieDG.getSibling();
-  EXPECT_TRUE(CU2Ref4DieDG.isValid());
-  EXPECT_EQ(CU2Ref4DieDG.getTag(), DW_TAG_variable);
-  EXPECT_EQ(CU2TypeDieDG.getOffset(),
-            toReference(CU2Ref4DieDG.find(DW_AT_type), -1ULL));
-
-  // Verify the sibling is our Ref8 DIE and that its DW_AT_type points to our
-  // base type DIE in CU2.
-  auto CU2Ref8DieDG = CU2Ref4DieDG.getSibling();
-  EXPECT_TRUE(CU2Ref8DieDG.isValid());
-  EXPECT_EQ(CU2Ref8DieDG.getTag(), DW_TAG_variable);
-  EXPECT_EQ(CU2TypeDieDG.getOffset(),
-            toReference(CU2Ref8DieDG.find(DW_AT_type), -1ULL));
-
-  // Verify the sibling is our RefAddr DIE and that its DW_AT_type points to our
-  // base type DIE in CU2.
-  auto CU2RefAddrDieDG = CU2Ref8DieDG.getSibling();
-  EXPECT_TRUE(CU2RefAddrDieDG.isValid());
-  EXPECT_EQ(CU2RefAddrDieDG.getTag(), DW_TAG_variable);
-  EXPECT_EQ(CU2TypeDieDG.getOffset(),
-            toReference(CU2RefAddrDieDG.find(DW_AT_type), -1ULL));
-
-  // Verify the sibling of the Ref4 DIE is our RefAddr DIE and that its
-  // DW_AT_type points to our base type DIE.
-  auto CU2ToCU1RefAddrDieDG = CU2RefAddrDieDG.getSibling();
-  EXPECT_TRUE(CU2ToCU1RefAddrDieDG.isValid());
-  EXPECT_EQ(CU2ToCU1RefAddrDieDG.getTag(), DW_TAG_variable);
-  EXPECT_EQ(CU1TypeDieDG.getOffset(),
-            toReference(CU2ToCU1RefAddrDieDG.find(DW_AT_type), -1ULL));
-}
-
-TEST(DWARFDebugInfo, TestDWARF32Version2Addr4References) {
-  // Test that we can decode all forms for DWARF32, version 2, with 4 byte
-  // addresses.
-  typedef uint32_t AddrType;
-  TestReferences<2, AddrType>();
-}
-
-TEST(DWARFDebugInfo, TestDWARF32Version2Addr8References) {
-  // Test that we can decode all forms for DWARF32, version 2, with 8 byte
-  // addresses.
-  typedef uint64_t AddrType;
-  TestReferences<2, AddrType>();
-}
-
-TEST(DWARFDebugInfo, TestDWARF32Version3Addr4References) {
-  // Test that we can decode all forms for DWARF32, version 3, with 4 byte
-  // addresses.
-  typedef uint32_t AddrType;
-  TestReferences<3, AddrType>();
-}
-
-TEST(DWARFDebugInfo, TestDWARF32Version3Addr8References) {
-  // Test that we can decode all forms for DWARF32, version 3, with 8 byte
-  // addresses.
-  typedef uint64_t AddrType;
-  TestReferences<3, AddrType>();
-}
-
-TEST(DWARFDebugInfo, TestDWARF32Version4Addr4References) {
-  // Test that we can decode all forms for DWARF32, version 4, with 4 byte
-  // addresses.
-  typedef uint32_t AddrType;
-  TestReferences<4, AddrType>();
-}
-
-TEST(DWARFDebugInfo, TestDWARF32Version4Addr8References) {
-  // Test that we can decode all forms for DWARF32, version 4, with 8 byte
-  // addresses.
-  typedef uint64_t AddrType;
-  TestReferences<4, AddrType>();
-}
-
-template <uint16_t Version, class AddrType> void TestAddresses() {
-  Triple Triple = getDefaultTargetTripleForAddrSize(sizeof(AddrType));
-  if (!isObjectEmissionSupported(Triple))
-    return;
-
-  // Test the DWARF APIs related to accessing the DW_AT_low_pc and
-  // DW_AT_high_pc.
-  const bool SupportsHighPCAsOffset = Version >= 4;
-  auto ExpectedDG = dwarfgen::Generator::create(Triple, Version);
-  ASSERT_THAT_EXPECTED(ExpectedDG, Succeeded());
-  dwarfgen::Generator *DG = ExpectedDG.get().get();
-  dwarfgen::CompileUnit &CU = DG->addCompileUnit();
-  dwarfgen::DIE CUDie = CU.getUnitDIE();
-
-  CUDie.addAttribute(DW_AT_name, DW_FORM_strp, "/tmp/main.c");
-  CUDie.addAttribute(DW_AT_language, DW_FORM_data2, DW_LANG_C);
-
-  // Create a subprogram DIE with no low or high PC.
-  dwarfgen::DIE SubprogramNoPC = CUDie.addChild(DW_TAG_subprogram);
-  SubprogramNoPC.addAttribute(DW_AT_name, DW_FORM_strp, "no_pc");
-
-  // Create a subprogram DIE with a low PC only.
-  dwarfgen::DIE SubprogramLowPC = CUDie.addChild(DW_TAG_subprogram);
-  SubprogramLowPC.addAttribute(DW_AT_name, DW_FORM_strp, "low_pc");
-  const uint64_t ActualLowPC = 0x1000;
-  const uint64_t ActualHighPC = 0x2000;
-  const uint64_t ActualHighPCOffset = ActualHighPC - ActualLowPC;
-  SubprogramLowPC.addAttribute(DW_AT_low_pc, DW_FORM_addr, ActualLowPC);
-
-  // Create a subprogram DIE with a low and high PC.
-  dwarfgen::DIE SubprogramLowHighPC = CUDie.addChild(DW_TAG_subprogram);
-  SubprogramLowHighPC.addAttribute(DW_AT_name, DW_FORM_strp, "low_high_pc");
-  SubprogramLowHighPC.addAttribute(DW_AT_low_pc, DW_FORM_addr, ActualLowPC);
-  // Encode the high PC as an offset from the low PC if supported.
-  if (SupportsHighPCAsOffset)
-    SubprogramLowHighPC.addAttribute(DW_AT_high_pc, DW_FORM_data4,
-                                     ActualHighPCOffset);
-  else
-    SubprogramLowHighPC.addAttribute(DW_AT_high_pc, DW_FORM_addr, ActualHighPC);
-
-  StringRef FileBytes = DG->generate();
-  MemoryBufferRef FileBuffer(FileBytes, "dwarf");
-  auto Obj = object::ObjectFile::createObjectFile(FileBuffer);
-  EXPECT_TRUE((bool)Obj);
-  std::unique_ptr<DWARFContext> DwarfContext = DWARFContext::create(**Obj);
-
-  // Verify the number of compile units is correct.
-  uint32_t NumCUs = DwarfContext->getNumCompileUnits();
-  EXPECT_EQ(NumCUs, 1u);
-  DWARFCompileUnit *U =
-      cast<DWARFCompileUnit>(DwarfContext->getUnitAtIndex(0));
-
-  // Get the compile unit DIE is valid.
-  auto DieDG = U->getUnitDIE(false);
-  EXPECT_TRUE(DieDG.isValid());
-
-  uint64_t LowPC, HighPC, SectionIndex;
-  Optional<uint64_t> OptU64;
-  // Verify the that our subprogram with no PC value fails appropriately when
-  // asked for any PC values.
-  auto SubprogramDieNoPC = DieDG.getFirstChild();
-  EXPECT_TRUE(SubprogramDieNoPC.isValid());
-  EXPECT_EQ(SubprogramDieNoPC.getTag(), DW_TAG_subprogram);
-  OptU64 = toAddress(SubprogramDieNoPC.find(DW_AT_low_pc));
-  EXPECT_FALSE((bool)OptU64);
-  OptU64 = toAddress(SubprogramDieNoPC.find(DW_AT_high_pc));
-  EXPECT_FALSE((bool)OptU64);
-  EXPECT_FALSE(SubprogramDieNoPC.getLowAndHighPC(LowPC, HighPC, SectionIndex));
-  OptU64 = toAddress(SubprogramDieNoPC.find(DW_AT_high_pc));
-  EXPECT_FALSE((bool)OptU64);
-  OptU64 = toUnsigned(SubprogramDieNoPC.find(DW_AT_high_pc));
-  EXPECT_FALSE((bool)OptU64);
-  OptU64 = SubprogramDieNoPC.getHighPC(ActualLowPC);
-  EXPECT_FALSE((bool)OptU64);
-  EXPECT_FALSE(SubprogramDieNoPC.getLowAndHighPC(LowPC, HighPC, SectionIndex));
-
-  // Verify the that our subprogram with only a low PC value succeeds when
-  // we ask for the Low PC, but fails appropriately when asked for the high PC
-  // or both low and high PC values.
-  auto SubprogramDieLowPC = SubprogramDieNoPC.getSibling();
-  EXPECT_TRUE(SubprogramDieLowPC.isValid());
-  EXPECT_EQ(SubprogramDieLowPC.getTag(), DW_TAG_subprogram);
-  OptU64 = toAddress(SubprogramDieLowPC.find(DW_AT_low_pc));
-  EXPECT_TRUE((bool)OptU64);
-  EXPECT_EQ(OptU64.getValue(), ActualLowPC);
-  OptU64 = toAddress(SubprogramDieLowPC.find(DW_AT_high_pc));
-  EXPECT_FALSE((bool)OptU64);
-  OptU64 = toUnsigned(SubprogramDieLowPC.find(DW_AT_high_pc));
-  EXPECT_FALSE((bool)OptU64);
-  OptU64 = SubprogramDieLowPC.getHighPC(ActualLowPC);
-  EXPECT_FALSE((bool)OptU64);
-  EXPECT_FALSE(SubprogramDieLowPC.getLowAndHighPC(LowPC, HighPC, SectionIndex));
-
-  // Verify the that our subprogram with only a low PC value succeeds when
-  // we ask for the Low PC, but fails appropriately when asked for the high PC
-  // or both low and high PC values.
-  auto SubprogramDieLowHighPC = SubprogramDieLowPC.getSibling();
-  EXPECT_TRUE(SubprogramDieLowHighPC.isValid());
-  EXPECT_EQ(SubprogramDieLowHighPC.getTag(), DW_TAG_subprogram);
-  OptU64 = toAddress(SubprogramDieLowHighPC.find(DW_AT_low_pc));
-  EXPECT_TRUE((bool)OptU64);
-  EXPECT_EQ(OptU64.getValue(), ActualLowPC);
-  // Get the high PC as an address. This should succeed if the high PC was
-  // encoded as an address and fail if the high PC was encoded as an offset.
-  OptU64 = toAddress(SubprogramDieLowHighPC.find(DW_AT_high_pc));
-  if (SupportsHighPCAsOffset) {
-    EXPECT_FALSE((bool)OptU64);
-  } else {
-    EXPECT_TRUE((bool)OptU64);
-    EXPECT_EQ(OptU64.getValue(), ActualHighPC);
-  }
-  // Get the high PC as an unsigned constant. This should succeed if the high PC
-  // was encoded as an offset and fail if the high PC was encoded as an address.
-  OptU64 = toUnsigned(SubprogramDieLowHighPC.find(DW_AT_high_pc));
-  if (SupportsHighPCAsOffset) {
-    EXPECT_TRUE((bool)OptU64);
-    EXPECT_EQ(OptU64.getValue(), ActualHighPCOffset);
-  } else {
-    EXPECT_FALSE((bool)OptU64);
-  }
-
-  OptU64 = SubprogramDieLowHighPC.getHighPC(ActualLowPC);
-  EXPECT_TRUE((bool)OptU64);
-  EXPECT_EQ(OptU64.getValue(), ActualHighPC);
-
-  EXPECT_TRUE(SubprogramDieLowHighPC.getLowAndHighPC(LowPC, HighPC, SectionIndex));
-  EXPECT_EQ(LowPC, ActualLowPC);
-  EXPECT_EQ(HighPC, ActualHighPC);
-}
-
-TEST(DWARFDebugInfo, TestDWARF32Version2Addr4Addresses) {
-  // Test that we can decode address values in DWARF32, version 2, with 4 byte
-  // addresses.
-  typedef uint32_t AddrType;
-  TestAddresses<2, AddrType>();
-}
-
-TEST(DWARFDebugInfo, TestDWARF32Version2Addr8Addresses) {
-  // Test that we can decode address values in DWARF32, version 2, with 8 byte
-  // addresses.
-  typedef uint64_t AddrType;
-  TestAddresses<2, AddrType>();
-}
-
-TEST(DWARFDebugInfo, TestDWARF32Version3Addr4Addresses) {
-  // Test that we can decode address values in DWARF32, version 3, with 4 byte
-  // addresses.
-  typedef uint32_t AddrType;
-  TestAddresses<3, AddrType>();
-}
-
-TEST(DWARFDebugInfo, TestDWARF32Version3Addr8Addresses) {
-  // Test that we can decode address values in DWARF32, version 3, with 8 byte
-  // addresses.
-  typedef uint64_t AddrType;
-  TestAddresses<3, AddrType>();
-}
-
-TEST(DWARFDebugInfo, TestDWARF32Version4Addr4Addresses) {
-  // Test that we can decode address values in DWARF32, version 4, with 4 byte
-  // addresses.
-  typedef uint32_t AddrType;
-  TestAddresses<4, AddrType>();
-}
-
-TEST(DWARFDebugInfo, TestDWARF32Version4Addr8Addresses) {
-  // Test that we can decode address values in DWARF32, version 4, with 8 byte
-  // addresses.
-  typedef uint64_t AddrType;
-  TestAddresses<4, AddrType>();
-}
-
-TEST(DWARFDebugInfo, TestStringOffsets) {
-  Triple Triple = getNormalizedDefaultTargetTriple();
-  if (!isObjectEmissionSupported(Triple))
-    return;
-
-  const char *String1 = "Hello";
-  const char *String2 = "World";
-
-  auto ExpectedDG = dwarfgen::Generator::create(Triple, 5);
-  ASSERT_THAT_EXPECTED(ExpectedDG, Succeeded());
-  dwarfgen::Generator *DG = ExpectedDG.get().get();
-  dwarfgen::CompileUnit &CU = DG->addCompileUnit();
-  dwarfgen::DIE CUDie = CU.getUnitDIE();
-
-  CUDie.addStrOffsetsBaseAttribute();
-
-  uint16_t Attr = DW_AT_lo_user;
-
-  // Create our strings. First we create a non-indexed reference to String1,
-  // followed by an indexed String2. Finally, we add an indexed reference to
-  // String1.
-  const auto Attr1 = static_cast<dwarf::Attribute>(Attr++);
-  CUDie.addAttribute(Attr1, DW_FORM_strp, String1);
-
-  const auto Attr2 = static_cast<dwarf::Attribute>(Attr++);
-  CUDie.addAttribute(Attr2, DW_FORM_strx, String2);
-
-  const auto Attr3 = static_cast<dwarf::Attribute>(Attr++);
-  CUDie.addAttribute(Attr3, DW_FORM_strx, String1);
-
-  // Generate the DWARF
-  StringRef FileBytes = DG->generate();
-  MemoryBufferRef FileBuffer(FileBytes, "dwarf");
-  auto Obj = object::ObjectFile::createObjectFile(FileBuffer);
-  ASSERT_TRUE((bool)Obj);
-  std::unique_ptr<DWARFContext> DwarfContext = DWARFContext::create(**Obj);
-  uint32_t NumCUs = DwarfContext->getNumCompileUnits();
-  ASSERT_EQ(NumCUs, 1u);
-  DWARFUnit *U = DwarfContext->getUnitAtIndex(0);
-  auto DieDG = U->getUnitDIE(false);
-  ASSERT_TRUE(DieDG.isValid());
-
-  // Now make sure the string offsets came out properly. Attr2 should have index
-  // 0 (because it was the first indexed string) even though the string itself
-  // was added eariler.
-  auto Extracted1 = toString(DieDG.find(Attr1));
-  ASSERT_TRUE((bool)Extracted1);
-  EXPECT_STREQ(String1, *Extracted1);
-
-  Optional<DWARFFormValue> Form2 = DieDG.find(Attr2);
-  ASSERT_TRUE((bool)Form2);
-  EXPECT_EQ(0u, Form2->getRawUValue());
-  auto Extracted2 = toString(Form2);
-  ASSERT_TRUE((bool)Extracted2);
-  EXPECT_STREQ(String2, *Extracted2);
-
-  Optional<DWARFFormValue> Form3 = DieDG.find(Attr3);
-  ASSERT_TRUE((bool)Form3);
-  EXPECT_EQ(1u, Form3->getRawUValue());
-  auto Extracted3 = toString(Form3);
-  ASSERT_TRUE((bool)Extracted3);
-  EXPECT_STREQ(String1, *Extracted3);
-}
-
-TEST(DWARFDebugInfo, TestEmptyStringOffsets) {
-  Triple Triple = getNormalizedDefaultTargetTriple();
-  if (!isObjectEmissionSupported(Triple))
-    return;
-
-  const char *String1 = "Hello";
-
-  auto ExpectedDG = dwarfgen::Generator::create(Triple, 5);
-  ASSERT_THAT_EXPECTED(ExpectedDG, Succeeded());
-  dwarfgen::Generator *DG = ExpectedDG.get().get();
-  dwarfgen::CompileUnit &CU = DG->addCompileUnit();
-  dwarfgen::DIE CUDie = CU.getUnitDIE();
-
-  uint16_t Attr = DW_AT_lo_user;
-
-  // We shall insert only one string. It will be referenced directly.
-  const auto Attr1 = static_cast<dwarf::Attribute>(Attr++);
-  CUDie.addAttribute(Attr1, DW_FORM_strp, String1);
-
-  // Generate the DWARF
-  StringRef FileBytes = DG->generate();
-  MemoryBufferRef FileBuffer(FileBytes, "dwarf");
-  auto Obj = object::ObjectFile::createObjectFile(FileBuffer);
-  ASSERT_TRUE((bool)Obj);
-  std::unique_ptr<DWARFContext> DwarfContext = DWARFContext::create(**Obj);
-  EXPECT_TRUE(
-      DwarfContext->getDWARFObj().getStrOffsetsSection().Data.empty());
-}
-
-TEST(DWARFDebugInfo, TestRelations) {
-  Triple Triple = getNormalizedDefaultTargetTriple();
-  if (!isObjectEmissionSupported(Triple))
-    return;
-
-  // Test the DWARF APIs related to accessing the DW_AT_low_pc and
-  // DW_AT_high_pc.
-  uint16_t Version = 4;
-  auto ExpectedDG = dwarfgen::Generator::create(Triple, Version);
-  ASSERT_THAT_EXPECTED(ExpectedDG, Succeeded());
-  dwarfgen::Generator *DG = ExpectedDG.get().get();
-  dwarfgen::CompileUnit &CU = DG->addCompileUnit();
-
-  enum class Tag: uint16_t  {
-    A = dwarf::DW_TAG_lo_user,
-    B,
-    C,
-    C1,
-    C2,
-    D,
-    D1
-  };
-
-  // Scope to allow us to re-use the same DIE names
-  {
-    // Create DWARF tree that looks like:
-    //
-    // CU
-    //   A
-    //     B
-    //     C
-    //       C1
-    //       C2
-    //     D
-    //       D1
-    dwarfgen::DIE CUDie = CU.getUnitDIE();
-    dwarfgen::DIE A = CUDie.addChild((dwarf::Tag)Tag::A);
-    A.addChild((dwarf::Tag)Tag::B);
-    dwarfgen::DIE C = A.addChild((dwarf::Tag)Tag::C);
-    dwarfgen::DIE D = A.addChild((dwarf::Tag)Tag::D);
-    C.addChild((dwarf::Tag)Tag::C1);
-    C.addChild((dwarf::Tag)Tag::C2);
-    D.addChild((dwarf::Tag)Tag::D1);
-  }
-
-  MemoryBufferRef FileBuffer(DG->generate(), "dwarf");
-  auto Obj = object::ObjectFile::createObjectFile(FileBuffer);
-  EXPECT_TRUE((bool)Obj);
-  std::unique_ptr<DWARFContext> DwarfContext = DWARFContext::create(**Obj);
-
-  // Verify the number of compile units is correct.
-  uint32_t NumCUs = DwarfContext->getNumCompileUnits();
-  EXPECT_EQ(NumCUs, 1u);
-  DWARFCompileUnit *U =
-      cast<DWARFCompileUnit>(DwarfContext->getUnitAtIndex(0));
-
-  // Get the compile unit DIE is valid.
-  auto CUDie = U->getUnitDIE(false);
-  EXPECT_TRUE(CUDie.isValid());
-
-  // The compile unit doesn't have a parent or a sibling.
-  auto ParentDie = CUDie.getParent();
-  EXPECT_FALSE(ParentDie.isValid());
-  auto SiblingDie = CUDie.getSibling();
-  EXPECT_FALSE(SiblingDie.isValid());
-
-  // Get the children of the compile unit
-  auto A = CUDie.getFirstChild();
-  auto B = A.getFirstChild();
-  auto C = B.getSibling();
-  auto D = C.getSibling();
-  auto Null = D.getSibling();
-
-  // Verify NULL Die is NULL and has no children or siblings
-  EXPECT_TRUE(Null.isNULL());
-  EXPECT_FALSE(Null.getSibling().isValid());
-  EXPECT_FALSE(Null.getFirstChild().isValid());
-
-  // Verify all children of the compile unit DIE are correct.
-  EXPECT_EQ(A.getTag(), (dwarf::Tag)Tag::A);
-  EXPECT_EQ(B.getTag(), (dwarf::Tag)Tag::B);
-  EXPECT_EQ(C.getTag(), (dwarf::Tag)Tag::C);
-  EXPECT_EQ(D.getTag(), (dwarf::Tag)Tag::D);
-
-  // Verify who has children
-  EXPECT_TRUE(A.hasChildren());
-  EXPECT_FALSE(B.hasChildren());
-  EXPECT_TRUE(C.hasChildren());
-  EXPECT_TRUE(D.hasChildren());
-
-  // Make sure the parent of all the children of the compile unit are the
-  // compile unit.
-  EXPECT_EQ(A.getParent(), CUDie);
-
-  // Make sure the parent of all the children of A are the A.
-  // B is the first child in A, so we need to verify we can get the previous
-  // DIE as the parent.
-  EXPECT_EQ(B.getParent(), A);
-  // C is the second child in A, so we need to make sure we can backup across
-  // other DIE (B) at the same level to get the correct parent.
-  EXPECT_EQ(C.getParent(), A);
-  // D is the third child of A. We need to verify we can backup across other DIE
-  // (B and C) including DIE that have children (D) to get the correct parent.
-  EXPECT_EQ(D.getParent(), A);
-
-  // Verify that a DIE with no children returns an invalid DWARFDie.
-  EXPECT_FALSE(B.getFirstChild().isValid());
-
-  // Verify the children of the B DIE
-  auto C1 = C.getFirstChild();
-  auto C2 = C1.getSibling();
-  EXPECT_TRUE(C2.getSibling().isNULL());
-
-  // Verify all children of the B DIE correctly valid or invalid.
-  EXPECT_EQ(C1.getTag(), (dwarf::Tag)Tag::C1);
-  EXPECT_EQ(C2.getTag(), (dwarf::Tag)Tag::C2);
-
-  // Make sure the parent of all the children of the B are the B.
-  EXPECT_EQ(C1.getParent(), C);
-  EXPECT_EQ(C2.getParent(), C);
-
-  // Make sure iterators work as expected.
-  EXPECT_THAT(std::vector<DWARFDie>(A.begin(), A.end()),
-              testing::ElementsAre(B, C, D));
-  EXPECT_THAT(std::vector<DWARFDie>(A.rbegin(), A.rend()),
-              testing::ElementsAre(D, C, B));
-
-  // Make sure conversion from reverse iterator works as expected.
-  EXPECT_EQ(A.rbegin().base(), A.end());
-  EXPECT_EQ(A.rend().base(), A.begin());
-
-  // Make sure iterator is bidirectional.
-  {
-    auto Begin = A.begin();
-    auto End = A.end();
-    auto It = A.begin();
-
-    EXPECT_EQ(It, Begin);
-    EXPECT_EQ(*It, B);
-    ++It;
-    EXPECT_EQ(*It, C);
-    ++It;
-    EXPECT_EQ(*It, D);
-    ++It;
-    EXPECT_EQ(It, End);
-    --It;
-    EXPECT_EQ(*It, D);
-    --It;
-    EXPECT_EQ(*It, C);
-    --It;
-    EXPECT_EQ(*It, B);
-    EXPECT_EQ(It, Begin);
-  }
-
-  // Make sure reverse iterator is bidirectional.
-  {
-    auto Begin = A.rbegin();
-    auto End = A.rend();
-    auto It = A.rbegin();
-
-    EXPECT_EQ(It, Begin);
-    EXPECT_EQ(*It, D);
-    ++It;
-    EXPECT_EQ(*It, C);
-    ++It;
-    EXPECT_EQ(*It, B);
-    ++It;
-    EXPECT_EQ(It, End);
-    --It;
-    EXPECT_EQ(*It, B);
-    --It;
-    EXPECT_EQ(*It, C);
-    --It;
-    EXPECT_EQ(*It, D);
-    EXPECT_EQ(It, Begin);
-  }
-}
-
-TEST(DWARFDebugInfo, TestDWARFDie) {
-  // Make sure a default constructed DWARFDie doesn't have any parent, sibling
-  // or child;
-  DWARFDie DefaultDie;
-  EXPECT_FALSE(DefaultDie.getParent().isValid());
-  EXPECT_FALSE(DefaultDie.getFirstChild().isValid());
-  EXPECT_FALSE(DefaultDie.getSibling().isValid());
-}
-
-TEST(DWARFDebugInfo, TestChildIterators) {
-  Triple Triple = getNormalizedDefaultTargetTriple();
-  if (!isObjectEmissionSupported(Triple))
-    return;
-
-  // Test the DWARF APIs related to iterating across the children of a DIE using
-  // the DWARFDie::iterator class.
-  uint16_t Version = 4;
-  auto ExpectedDG = dwarfgen::Generator::create(Triple, Version);
-  ASSERT_THAT_EXPECTED(ExpectedDG, Succeeded());
-  dwarfgen::Generator *DG = ExpectedDG.get().get();
-  dwarfgen::CompileUnit &CU = DG->addCompileUnit();
-
-  enum class Tag: uint16_t  {
-    A = dwarf::DW_TAG_lo_user,
-    B,
-  };
-
-  // Scope to allow us to re-use the same DIE names
-  {
-    // Create DWARF tree that looks like:
-    //
-    // CU
-    //   A
-    //   B
-    auto CUDie = CU.getUnitDIE();
-    CUDie.addChild((dwarf::Tag)Tag::A);
-    CUDie.addChild((dwarf::Tag)Tag::B);
-  }
-
-  MemoryBufferRef FileBuffer(DG->generate(), "dwarf");
-  auto Obj = object::ObjectFile::createObjectFile(FileBuffer);
-  EXPECT_TRUE((bool)Obj);
-  std::unique_ptr<DWARFContext> DwarfContext = DWARFContext::create(**Obj);
-
-  // Verify the number of compile units is correct.
-  uint32_t NumCUs = DwarfContext->getNumCompileUnits();
-  EXPECT_EQ(NumCUs, 1u);
-  DWARFCompileUnit *U =
-      cast<DWARFCompileUnit>(DwarfContext->getUnitAtIndex(0));
-
-  // Get the compile unit DIE is valid.
-  auto CUDie = U->getUnitDIE(false);
-  EXPECT_TRUE(CUDie.isValid());
-  uint32_t Index;
-  DWARFDie A;
-  DWARFDie B;
-
-  // Verify the compile unit DIE's children.
-  Index = 0;
-  for (auto Die : CUDie.children()) {
-    switch (Index++) {
-      case 0: A = Die; break;
-      case 1: B = Die; break;
-    }
-  }
-
-  EXPECT_EQ(A.getTag(), (dwarf::Tag)Tag::A);
-  EXPECT_EQ(B.getTag(), (dwarf::Tag)Tag::B);
-
-  // Verify that A has no children by verifying that the begin and end contain
-  // invalid DIEs and also that the iterators are equal.
-  EXPECT_EQ(A.begin(), A.end());
-}
-
-TEST(DWARFDebugInfo, TestChildIteratorsOnInvalidDie) {
-  // Verify that an invalid DIE has no children.
-  DWARFDie Invalid;
-  auto begin = Invalid.begin();
-  auto end = Invalid.end();
-  EXPECT_FALSE(begin->isValid());
-  EXPECT_FALSE(end->isValid());
-  EXPECT_EQ(begin, end);
-}
-
-TEST(DWARFDebugInfo, TestEmptyChildren) {
-  const char *yamldata = "debug_abbrev:\n"
-                         "  - Table:\n"
-                         "      - Code:            0x00000001\n"
-                         "        Tag:             DW_TAG_compile_unit\n"
-                         "        Children:        DW_CHILDREN_yes\n"
-                         "debug_info:\n"
-                         "  - Version:         4\n"
-                         "    AddrSize:        8\n"
-                         "    Entries:\n"
-                         "      - AbbrCode:        0x00000001\n"
-                         "      - AbbrCode:        0x00000000\n";
-
-  auto ErrOrSections = DWARFYAML::emitDebugSections(StringRef(yamldata));
-  ASSERT_TRUE((bool)ErrOrSections);
-  std::unique_ptr<DWARFContext> DwarfContext =
-      DWARFContext::create(*ErrOrSections, 8);
-
-  // Verify the number of compile units is correct.
-  uint32_t NumCUs = DwarfContext->getNumCompileUnits();
-  EXPECT_EQ(NumCUs, 1u);
-  DWARFCompileUnit *U =
-      cast<DWARFCompileUnit>(DwarfContext->getUnitAtIndex(0));
-
-  // Get the compile unit DIE is valid.
-  auto CUDie = U->getUnitDIE(false);
-  EXPECT_TRUE(CUDie.isValid());
-
-  // Verify that the CU Die that says it has children, but doesn't, actually
-  // has begin and end iterators that are equal. We want to make sure we don't
-  // see the Null DIEs during iteration.
-  EXPECT_EQ(CUDie.begin(), CUDie.end());
-}
-
-TEST(DWARFDebugInfo, TestAttributeIterators) {
-  Triple Triple = getNormalizedDefaultTargetTriple();
-  if (!isObjectEmissionSupported(Triple))
-    return;
-
-  // Test the DWARF APIs related to iterating across all attribute values in a
-  // a DWARFDie.
-  uint16_t Version = 4;
-  auto ExpectedDG = dwarfgen::Generator::create(Triple, Version);
-  ASSERT_THAT_EXPECTED(ExpectedDG, Succeeded());
-  dwarfgen::Generator *DG = ExpectedDG.get().get();
-  dwarfgen::CompileUnit &CU = DG->addCompileUnit();
-  const uint64_t CULowPC = 0x1000;
-  StringRef CUPath("/tmp/main.c");
-
-  // Scope to allow us to re-use the same DIE names
-  {
-    auto CUDie = CU.getUnitDIE();
-    // Encode an attribute value before an attribute with no data.
-    CUDie.addAttribute(DW_AT_name, DW_FORM_strp, CUPath.data());
-    // Encode an attribute value with no data in .debug_info/types to ensure
-    // the iteration works correctly.
-    CUDie.addAttribute(DW_AT_declaration, DW_FORM_flag_present);
-    // Encode an attribute value after an attribute with no data.
-    CUDie.addAttribute(DW_AT_low_pc, DW_FORM_addr, CULowPC);
-  }
-
-  MemoryBufferRef FileBuffer(DG->generate(), "dwarf");
-  auto Obj = object::ObjectFile::createObjectFile(FileBuffer);
-  EXPECT_TRUE((bool)Obj);
-  std::unique_ptr<DWARFContext> DwarfContext = DWARFContext::create(**Obj);
-
-  // Verify the number of compile units is correct.
-  uint32_t NumCUs = DwarfContext->getNumCompileUnits();
-  EXPECT_EQ(NumCUs, 1u);
-  DWARFCompileUnit *U =
-      cast<DWARFCompileUnit>(DwarfContext->getUnitAtIndex(0));
-
-  // Get the compile unit DIE is valid.
-  auto CUDie = U->getUnitDIE(false);
-  EXPECT_TRUE(CUDie.isValid());
-
-  auto R = CUDie.attributes();
-  auto I = R.begin();
-  auto E = R.end();
-
-  ASSERT_NE(E, I);
-  EXPECT_EQ(I->Attr, DW_AT_name);
-  auto ActualCUPath = I->Value.getAsCString();
-  EXPECT_EQ(CUPath, *ActualCUPath);
-
-  ASSERT_NE(E, ++I);
-  EXPECT_EQ(I->Attr, DW_AT_declaration);
-  EXPECT_EQ(1ull, *I->Value.getAsUnsignedConstant());
-
-  ASSERT_NE(E, ++I);
-  EXPECT_EQ(I->Attr, DW_AT_low_pc);
-  EXPECT_EQ(CULowPC, *I->Value.getAsAddress());
-
-  EXPECT_EQ(E, ++I);
-}
-
-TEST(DWARFDebugInfo, TestFindRecurse) {
-  Triple Triple = getNormalizedDefaultTargetTriple();
-  if (!isObjectEmissionSupported(Triple))
-    return;
-
-  uint16_t Version = 4;
-  auto ExpectedDG = dwarfgen::Generator::create(Triple, Version);
-  ASSERT_THAT_EXPECTED(ExpectedDG, Succeeded());
-  dwarfgen::Generator *DG = ExpectedDG.get().get();
-  dwarfgen::CompileUnit &CU = DG->addCompileUnit();
-
-  StringRef SpecDieName = "spec";
-  StringRef SpecLinkageName = "spec_linkage";
-  StringRef AbsDieName = "abs";
-  // Scope to allow us to re-use the same DIE names
-  {
-    auto CUDie = CU.getUnitDIE();
-    auto FuncSpecDie = CUDie.addChild(DW_TAG_subprogram);
-    auto FuncAbsDie = CUDie.addChild(DW_TAG_subprogram);
-    // Put the linkage name in a second abstract origin DIE to ensure we
-    // recurse through more than just one DIE when looking for attributes.
-    auto FuncAbsDie2 = CUDie.addChild(DW_TAG_subprogram);
-    auto FuncDie = CUDie.addChild(DW_TAG_subprogram);
-    auto VarAbsDie = CUDie.addChild(DW_TAG_variable);
-    auto VarDie = CUDie.addChild(DW_TAG_variable);
-    FuncSpecDie.addAttribute(DW_AT_name, DW_FORM_strp, SpecDieName);
-    FuncAbsDie2.addAttribute(DW_AT_linkage_name, DW_FORM_strp, SpecLinkageName);
-    FuncAbsDie.addAttribute(DW_AT_specification, DW_FORM_ref4, FuncSpecDie);
-    FuncAbsDie.addAttribute(DW_AT_abstract_origin, DW_FORM_ref4, FuncAbsDie2);
-    FuncDie.addAttribute(DW_AT_abstract_origin, DW_FORM_ref4, FuncAbsDie);
-    VarAbsDie.addAttribute(DW_AT_name, DW_FORM_strp, AbsDieName);
-    VarDie.addAttribute(DW_AT_abstract_origin, DW_FORM_ref4, VarAbsDie);
-  }
-
-  MemoryBufferRef FileBuffer(DG->generate(), "dwarf");
-  auto Obj = object::ObjectFile::createObjectFile(FileBuffer);
-  EXPECT_TRUE((bool)Obj);
-  std::unique_ptr<DWARFContext> DwarfContext = DWARFContext::create(**Obj);
-
-  // Verify the number of compile units is correct.
-  uint32_t NumCUs = DwarfContext->getNumCompileUnits();
-  EXPECT_EQ(NumCUs, 1u);
-  DWARFCompileUnit *U =
-      cast<DWARFCompileUnit>(DwarfContext->getUnitAtIndex(0));
-
-  // Get the compile unit DIE is valid.
-  auto CUDie = U->getUnitDIE(false);
-  EXPECT_TRUE(CUDie.isValid());
-
-  auto FuncSpecDie = CUDie.getFirstChild();
-  auto FuncAbsDie = FuncSpecDie.getSibling();
-  auto FuncAbsDie2 = FuncAbsDie.getSibling();
-  auto FuncDie = FuncAbsDie2.getSibling();
-  auto VarAbsDie = FuncDie.getSibling();
-  auto VarDie = VarAbsDie.getSibling();
-
-  // Make sure we can't extract the name from the specification die when using
-  // DWARFDie::find() since it won't check the DW_AT_specification DIE.
-  EXPECT_FALSE(FuncDie.find(DW_AT_name));
-
-  // Make sure we can extract the name from the specification die when using
-  // DWARFDie::findRecursively() since it should recurse through the
-  // DW_AT_specification DIE.
-  auto NameOpt = FuncDie.findRecursively(DW_AT_name);
-  EXPECT_TRUE(NameOpt);
-  // Test the dwarf::toString() helper function.
-  auto StringOpt = toString(NameOpt);
-  EXPECT_TRUE(StringOpt);
-  EXPECT_EQ(SpecDieName, StringOpt.getValueOr(nullptr));
-  // Test the dwarf::toString() helper function with a default value specified.
-  EXPECT_EQ(SpecDieName, toString(NameOpt, nullptr));
-
-  auto LinkageNameOpt = FuncDie.findRecursively(DW_AT_linkage_name);
-  EXPECT_EQ(SpecLinkageName, toString(LinkageNameOpt).getValueOr(nullptr));
-
-  // Make sure we can't extract the name from the abstract origin die when using
-  // DWARFDie::find() since it won't check the DW_AT_abstract_origin DIE.
-  EXPECT_FALSE(VarDie.find(DW_AT_name));
-
-  // Make sure we can extract the name from the abstract origin die when using
-  // DWARFDie::findRecursively() since it should recurse through the
-  // DW_AT_abstract_origin DIE.
-  NameOpt = VarDie.findRecursively(DW_AT_name);
-  EXPECT_TRUE(NameOpt);
-  // Test the dwarf::toString() helper function.
-  StringOpt = toString(NameOpt);
-  EXPECT_TRUE(StringOpt);
-  EXPECT_EQ(AbsDieName, StringOpt.getValueOr(nullptr));
-}
-
-TEST(DWARFDebugInfo, TestDwarfToFunctions) {
-  // Test all of the dwarf::toXXX functions that take a
-  // Optional<DWARFFormValue> and extract the values from it.
-  uint64_t InvalidU64 = 0xBADBADBADBADBADB;
-  int64_t InvalidS64 = 0xBADBADBADBADBADB;
-
-  // First test that we don't get valid values back when using an optional with
-  // no value.
-  Optional<DWARFFormValue> FormValOpt1 = DWARFFormValue();
-  EXPECT_FALSE(toString(FormValOpt1).hasValue());
-  EXPECT_FALSE(toUnsigned(FormValOpt1).hasValue());
-  EXPECT_FALSE(toReference(FormValOpt1).hasValue());
-  EXPECT_FALSE(toSigned(FormValOpt1).hasValue());
-  EXPECT_FALSE(toAddress(FormValOpt1).hasValue());
-  EXPECT_FALSE(toSectionOffset(FormValOpt1).hasValue());
-  EXPECT_FALSE(toBlock(FormValOpt1).hasValue());
-  EXPECT_EQ(nullptr, toString(FormValOpt1, nullptr));
-  EXPECT_EQ(InvalidU64, toUnsigned(FormValOpt1, InvalidU64));
-  EXPECT_EQ(InvalidU64, toReference(FormValOpt1, InvalidU64));
-  EXPECT_EQ(InvalidU64, toAddress(FormValOpt1, InvalidU64));
-  EXPECT_EQ(InvalidU64, toSectionOffset(FormValOpt1, InvalidU64));
-  EXPECT_EQ(InvalidS64, toSigned(FormValOpt1, InvalidS64));
-
-  // Test successful and unsuccessful address decoding.
-  uint64_t Address = 0x100000000ULL;
-  Optional<DWARFFormValue> FormValOpt2 =
-      DWARFFormValue::createFromUValue(DW_FORM_addr, Address);
-
-  EXPECT_FALSE(toString(FormValOpt2).hasValue());
-  EXPECT_FALSE(toUnsigned(FormValOpt2).hasValue());
-  EXPECT_FALSE(toReference(FormValOpt2).hasValue());
-  EXPECT_FALSE(toSigned(FormValOpt2).hasValue());
-  EXPECT_TRUE(toAddress(FormValOpt2).hasValue());
-  EXPECT_FALSE(toSectionOffset(FormValOpt2).hasValue());
-  EXPECT_FALSE(toBlock(FormValOpt2).hasValue());
-  EXPECT_EQ(nullptr, toString(FormValOpt2, nullptr));
-  EXPECT_EQ(InvalidU64, toUnsigned(FormValOpt2, InvalidU64));
-  EXPECT_EQ(InvalidU64, toReference(FormValOpt2, InvalidU64));
-  EXPECT_EQ(Address, toAddress(FormValOpt2, InvalidU64));
-  EXPECT_EQ(InvalidU64, toSectionOffset(FormValOpt2, InvalidU64));
-  EXPECT_EQ(InvalidS64, toSigned(FormValOpt2, InvalidU64));
-
-  // Test successful and unsuccessful unsigned constant decoding.
-  uint64_t UData8 = 0x1020304050607080ULL;
-  Optional<DWARFFormValue> FormValOpt3 =
-      DWARFFormValue::createFromUValue(DW_FORM_udata, UData8);
-
-  EXPECT_FALSE(toString(FormValOpt3).hasValue());
-  EXPECT_TRUE(toUnsigned(FormValOpt3).hasValue());
-  EXPECT_FALSE(toReference(FormValOpt3).hasValue());
-  EXPECT_TRUE(toSigned(FormValOpt3).hasValue());
-  EXPECT_FALSE(toAddress(FormValOpt3).hasValue());
-  EXPECT_FALSE(toSectionOffset(FormValOpt3).hasValue());
-  EXPECT_FALSE(toBlock(FormValOpt3).hasValue());
-  EXPECT_EQ(nullptr, toString(FormValOpt3, nullptr));
-  EXPECT_EQ(UData8, toUnsigned(FormValOpt3, InvalidU64));
-  EXPECT_EQ(InvalidU64, toReference(FormValOpt3, InvalidU64));
-  EXPECT_EQ(InvalidU64, toAddress(FormValOpt3, InvalidU64));
-  EXPECT_EQ(InvalidU64, toSectionOffset(FormValOpt3, InvalidU64));
-  EXPECT_EQ((int64_t)UData8, toSigned(FormValOpt3, InvalidU64));
-
-  // Test successful and unsuccessful reference decoding.
-  uint32_t RefData = 0x11223344U;
-  Optional<DWARFFormValue> FormValOpt4 =
-      DWARFFormValue::createFromUValue(DW_FORM_ref_addr, RefData);
-
-  EXPECT_FALSE(toString(FormValOpt4).hasValue());
-  EXPECT_FALSE(toUnsigned(FormValOpt4).hasValue());
-  EXPECT_TRUE(toReference(FormValOpt4).hasValue());
-  EXPECT_FALSE(toSigned(FormValOpt4).hasValue());
-  EXPECT_FALSE(toAddress(FormValOpt4).hasValue());
-  EXPECT_FALSE(toSectionOffset(FormValOpt4).hasValue());
-  EXPECT_FALSE(toBlock(FormValOpt4).hasValue());
-  EXPECT_EQ(nullptr, toString(FormValOpt4, nullptr));
-  EXPECT_EQ(InvalidU64, toUnsigned(FormValOpt4, InvalidU64));
-  EXPECT_EQ(RefData, toReference(FormValOpt4, InvalidU64));
-  EXPECT_EQ(InvalidU64, toAddress(FormValOpt4, InvalidU64));
-  EXPECT_EQ(InvalidU64, toSectionOffset(FormValOpt4, InvalidU64));
-  EXPECT_EQ(InvalidS64, toSigned(FormValOpt4, InvalidU64));
-
-  // Test successful and unsuccessful signed constant decoding.
-  int64_t SData8 = 0x1020304050607080ULL;
-  Optional<DWARFFormValue> FormValOpt5 =
-      DWARFFormValue::createFromSValue(DW_FORM_udata, SData8);
-
-  EXPECT_FALSE(toString(FormValOpt5).hasValue());
-  EXPECT_TRUE(toUnsigned(FormValOpt5).hasValue());
-  EXPECT_FALSE(toReference(FormValOpt5).hasValue());
-  EXPECT_TRUE(toSigned(FormValOpt5).hasValue());
-  EXPECT_FALSE(toAddress(FormValOpt5).hasValue());
-  EXPECT_FALSE(toSectionOffset(FormValOpt5).hasValue());
-  EXPECT_FALSE(toBlock(FormValOpt5).hasValue());
-  EXPECT_EQ(nullptr, toString(FormValOpt5, nullptr));
-  EXPECT_EQ((uint64_t)SData8, toUnsigned(FormValOpt5, InvalidU64));
-  EXPECT_EQ(InvalidU64, toReference(FormValOpt5, InvalidU64));
-  EXPECT_EQ(InvalidU64, toAddress(FormValOpt5, InvalidU64));
-  EXPECT_EQ(InvalidU64, toSectionOffset(FormValOpt5, InvalidU64));
-  EXPECT_EQ(SData8, toSigned(FormValOpt5, InvalidU64));
-
-  // Test successful and unsuccessful block decoding.
-  uint8_t Data[] = { 2, 3, 4 };
-  ArrayRef<uint8_t> Array(Data);
-  Optional<DWARFFormValue> FormValOpt6 =
-      DWARFFormValue::createFromBlockValue(DW_FORM_block1, Array);
-
-  EXPECT_FALSE(toString(FormValOpt6).hasValue());
-  EXPECT_FALSE(toUnsigned(FormValOpt6).hasValue());
-  EXPECT_FALSE(toReference(FormValOpt6).hasValue());
-  EXPECT_FALSE(toSigned(FormValOpt6).hasValue());
-  EXPECT_FALSE(toAddress(FormValOpt6).hasValue());
-  EXPECT_FALSE(toSectionOffset(FormValOpt6).hasValue());
-  auto BlockOpt = toBlock(FormValOpt6);
-  EXPECT_TRUE(BlockOpt.hasValue());
-  EXPECT_EQ(*BlockOpt, Array);
-  EXPECT_EQ(nullptr, toString(FormValOpt6, nullptr));
-  EXPECT_EQ(InvalidU64, toUnsigned(FormValOpt6, InvalidU64));
-  EXPECT_EQ(InvalidU64, toReference(FormValOpt6, InvalidU64));
-  EXPECT_EQ(InvalidU64, toAddress(FormValOpt6, InvalidU64));
-  EXPECT_EQ(InvalidU64, toSectionOffset(FormValOpt6, InvalidU64));
-  EXPECT_EQ(InvalidS64, toSigned(FormValOpt6, InvalidU64));
-
-  // Test
-}
-
-TEST(DWARFDebugInfo, TestFindAttrs) {
-  Triple Triple = getNormalizedDefaultTargetTriple();
-  if (!isObjectEmissionSupported(Triple))
-    return;
-
-  // Test the DWARFDie::find() and DWARFDie::findRecursively() that take an
-  // ArrayRef<dwarf::Attribute> value to make sure they work correctly.
-  uint16_t Version = 4;
-  auto ExpectedDG = dwarfgen::Generator::create(Triple, Version);
-  ASSERT_THAT_EXPECTED(ExpectedDG, Succeeded());
-  dwarfgen::Generator *DG = ExpectedDG.get().get();
-  dwarfgen::CompileUnit &CU = DG->addCompileUnit();
-
-  StringRef DieMangled("_Z3fooi");
-  // Scope to allow us to re-use the same DIE names
-  {
-    auto CUDie = CU.getUnitDIE();
-    auto FuncSpecDie = CUDie.addChild(DW_TAG_subprogram);
-    auto FuncDie = CUDie.addChild(DW_TAG_subprogram);
-    FuncSpecDie.addAttribute(DW_AT_MIPS_linkage_name, DW_FORM_strp, DieMangled);
-    FuncDie.addAttribute(DW_AT_specification, DW_FORM_ref4, FuncSpecDie);
-  }
-
-  MemoryBufferRef FileBuffer(DG->generate(), "dwarf");
-  auto Obj = object::ObjectFile::createObjectFile(FileBuffer);
-  EXPECT_TRUE((bool)Obj);
-  std::unique_ptr<DWARFContext> DwarfContext = DWARFContext::create(**Obj);
-
-  // Verify the number of compile units is correct.
-  uint32_t NumCUs = DwarfContext->getNumCompileUnits();
-  EXPECT_EQ(NumCUs, 1u);
-  DWARFCompileUnit *U =
-      cast<DWARFCompileUnit>(DwarfContext->getUnitAtIndex(0));
-
-  // Get the compile unit DIE is valid.
-  auto CUDie = U->getUnitDIE(false);
-  EXPECT_TRUE(CUDie.isValid());
-
-  auto FuncSpecDie = CUDie.getFirstChild();
-  auto FuncDie = FuncSpecDie.getSibling();
-
-  // Make sure that passing in an empty attribute list behave correctly.
-  EXPECT_FALSE(FuncDie.find(ArrayRef<dwarf::Attribute>()).hasValue());
-
-  // Make sure that passing in a list of attribute that are not contained
-  // in the DIE returns nothing.
-  EXPECT_FALSE(FuncDie.find({DW_AT_low_pc, DW_AT_entry_pc}).hasValue());
-
-  const dwarf::Attribute Attrs[] = {DW_AT_linkage_name,
-                                    DW_AT_MIPS_linkage_name};
-
-  // Make sure we can't extract the linkage name attributes when using
-  // DWARFDie::find() since it won't check the DW_AT_specification DIE.
-  EXPECT_FALSE(FuncDie.find(Attrs).hasValue());
-
-  // Make sure we can extract the name from the specification die when using
-  // DWARFDie::findRecursively() since it should recurse through the
-  // DW_AT_specification DIE.
-  auto NameOpt = FuncDie.findRecursively(Attrs);
-  EXPECT_TRUE(NameOpt.hasValue());
-  EXPECT_EQ(DieMangled, toString(NameOpt, ""));
-}
-
-TEST(DWARFDebugInfo, TestImplicitConstAbbrevs) {
-  Triple Triple = getNormalizedDefaultTargetTriple();
-  if (!isObjectEmissionSupported(Triple))
-    return;
-
-  uint16_t Version = 5;
-  auto ExpectedDG = dwarfgen::Generator::create(Triple, Version);
-  ASSERT_THAT_EXPECTED(ExpectedDG, Succeeded());
-  dwarfgen::Generator *DG = ExpectedDG.get().get();
-  dwarfgen::CompileUnit &CU = DG->addCompileUnit();
-  dwarfgen::DIE CUDie = CU.getUnitDIE();
-  const dwarf::Attribute Attr = DW_AT_lo_user;
-  const int64_t Val1 = 42;
-  const int64_t Val2 = 43;
-
-  auto FirstVal1DIE = CUDie.addChild(DW_TAG_class_type);
-  FirstVal1DIE.addAttribute(Attr, DW_FORM_implicit_const, Val1);
-
-  auto SecondVal1DIE = CUDie.addChild(DW_TAG_class_type);
-  SecondVal1DIE.addAttribute(Attr, DW_FORM_implicit_const, Val1);
-
-  auto Val2DIE = CUDie.addChild(DW_TAG_class_type);
-  Val2DIE.addAttribute(Attr, DW_FORM_implicit_const, Val2);
-
-  MemoryBufferRef FileBuffer(DG->generate(), "dwarf");
-  auto Obj = object::ObjectFile::createObjectFile(FileBuffer);
-  EXPECT_TRUE((bool)Obj);
-  std::unique_ptr<DWARFContext> DwarfContext = DWARFContext::create(**Obj);
-  DWARFCompileUnit *U =
-      cast<DWARFCompileUnit>(DwarfContext->getUnitAtIndex(0));
-  EXPECT_TRUE((bool)U);
-
-  const auto *Abbrevs = U->getAbbreviations();
-  EXPECT_TRUE((bool)Abbrevs);
-
-  // Let's find implicit_const abbrevs and verify,
-  // that there are exactly two of them and both of them
-  // can be dumped correctly.
-  typedef decltype(Abbrevs->begin()) AbbrevIt;
-  AbbrevIt Val1Abbrev = Abbrevs->end();
-  AbbrevIt Val2Abbrev = Abbrevs->end();
-  for(auto it = Abbrevs->begin(); it != Abbrevs->end(); ++it) {
-    if (it->getNumAttributes() == 0)
-      continue; // root abbrev for DW_TAG_compile_unit
-
-    auto A = it->getAttrByIndex(0);
-    EXPECT_EQ(A, Attr);
-
-    auto FormValue = it->getAttributeValue(/* offset */ 0, A, *U);
-    EXPECT_TRUE((bool)FormValue);
-    EXPECT_EQ(FormValue->getForm(), dwarf::DW_FORM_implicit_const);
-
-    const auto V = FormValue->getAsSignedConstant();
-    EXPECT_TRUE((bool)V);
-
-    auto VerifyAbbrevDump = [&V](AbbrevIt it) {
-      std::string S;
-      llvm::raw_string_ostream OS(S);
-      it->dump(OS);
-      auto FormPos = OS.str().find("DW_FORM_implicit_const");
-      EXPECT_NE(FormPos, std::string::npos);
-      auto ValPos = S.find_first_of("-0123456789", FormPos);
-      EXPECT_NE(ValPos, std::string::npos);
-      int64_t Val = std::atoll(S.substr(ValPos).c_str());
-      EXPECT_EQ(Val, *V);
-    };
-
-    switch(*V) {
-    case Val1:
-      EXPECT_EQ(Val1Abbrev, Abbrevs->end());
-      Val1Abbrev = it;
-      VerifyAbbrevDump(it);
-      break;
-    case Val2:
-      EXPECT_EQ(Val2Abbrev, Abbrevs->end());
-      Val2Abbrev = it;
-      VerifyAbbrevDump(it);
-      break;
-    default:
-      FAIL() << "Unexpected attribute value: " << *V;
-    }
-  }
-
-  // Now let's make sure that two Val1-DIEs refer to the same abbrev,
-  // and Val2-DIE refers to another one.
-  auto DieDG = U->getUnitDIE(false);
-  auto it = DieDG.begin();
-  std::multimap<int64_t, decltype(it->getAbbreviationDeclarationPtr())> DIEs;
-  const DWARFAbbreviationDeclaration *AbbrevPtrVal1 = nullptr;
-  const DWARFAbbreviationDeclaration *AbbrevPtrVal2 = nullptr;
-  for (; it != DieDG.end(); ++it) {
-    const auto *AbbrevPtr = it->getAbbreviationDeclarationPtr();
-    EXPECT_TRUE((bool)AbbrevPtr);
-    auto FormValue = it->find(Attr);
-    EXPECT_TRUE((bool)FormValue);
-    const auto V = FormValue->getAsSignedConstant();
-    EXPECT_TRUE((bool)V);
-    switch(*V) {
-    case Val1:
-      AbbrevPtrVal1 = AbbrevPtr;
-      break;
-    case Val2:
-      AbbrevPtrVal2 = AbbrevPtr;
-      break;
-    default:
-      FAIL() << "Unexpected attribute value: " << *V;
-    }
-    DIEs.insert(std::make_pair(*V, AbbrevPtr));
-  }
-  EXPECT_EQ(DIEs.count(Val1), 2u);
-  EXPECT_EQ(DIEs.count(Val2), 1u);
-  auto Val1Range = DIEs.equal_range(Val1);
-  for (auto it = Val1Range.first; it != Val1Range.second; ++it)
-    EXPECT_EQ(it->second, AbbrevPtrVal1);
-  EXPECT_EQ(DIEs.find(Val2)->second, AbbrevPtrVal2);
-}
-
-void VerifyWarning(DWARFContext &DwarfContext, StringRef Error) {
-  SmallString<1024> Str;
-  raw_svector_ostream Strm(Str);
-  EXPECT_TRUE(DwarfContext.verify(Strm));
-  EXPECT_TRUE(Str.str().contains(Error));
-}
-
-void VerifyError(DWARFContext &DwarfContext, StringRef Error) {
-  SmallString<1024> Str;
-  raw_svector_ostream Strm(Str);
-  EXPECT_FALSE(DwarfContext.verify(Strm));
-  EXPECT_TRUE(Str.str().contains(Error));
-}
-
-void VerifySuccess(DWARFContext &DwarfContext) {
-  SmallString<1024> Str;
-  raw_svector_ostream Strm(Str);
-  EXPECT_TRUE(DwarfContext.verify(Strm));
-}
-
-TEST(DWARFDebugInfo, TestDwarfVerifyInvalidCURef) {
-  // Create a single compile unit with a single function that has a DW_AT_type
-  // that is CU relative. The CU offset is not valid because it is larger than
-  // the compile unit itself.
-
-  const char *yamldata = R"(
-    debug_str:
-      - ''
-      - /tmp/main.c
-      - main
-    debug_abbrev:
-      - Table:
-          - Code:            0x00000001
-            Tag:             DW_TAG_compile_unit
-            Children:        DW_CHILDREN_yes
-            Attributes:
-              - Attribute:       DW_AT_name
-                Form:            DW_FORM_strp
-          - Code:            0x00000002
-            Tag:             DW_TAG_subprogram
-            Children:        DW_CHILDREN_no
-            Attributes:
-              - Attribute:       DW_AT_name
-                Form:            DW_FORM_strp
-              - Attribute:       DW_AT_type
-                Form:            DW_FORM_ref4
-    debug_info:
-      - Version:         4
-        AddrSize:        8
-        Entries:
-          - AbbrCode:        0x00000001
-            Values:
-              - Value:           0x0000000000000001
-          - AbbrCode:        0x00000002
-            Values:
-              - Value:           0x000000000000000D
-              - Value:           0x0000000000001234
-          - AbbrCode:        0x00000000
-  )";
-  auto ErrOrSections = DWARFYAML::emitDebugSections(StringRef(yamldata));
-  ASSERT_TRUE((bool)ErrOrSections);
-  std::unique_ptr<DWARFContext> DwarfContext =
-      DWARFContext::create(*ErrOrSections, 8);
-  VerifyError(*DwarfContext, "error: DW_FORM_ref4 CU offset 0x00001234 is "
-                             "invalid (must be less than CU size of "
-                             "0x0000001a):");
-}
-
-TEST(DWARFDebugInfo, TestDwarfVerifyInvalidRefAddr) {
-  // Create a single compile unit with a single function that has an invalid
-  // DW_AT_type with an invalid .debug_info offset in its DW_FORM_ref_addr.
-  const char *yamldata = R"(
-    debug_str:
-      - ''
-      - /tmp/main.c
-      - main
-    debug_abbrev:
-      - Table:
-          - Code:            0x00000001
-            Tag:             DW_TAG_compile_unit
-            Children:        DW_CHILDREN_yes
-            Attributes:
-              - Attribute:       DW_AT_name
-                Form:            DW_FORM_strp
-          - Code:            0x00000002
-            Tag:             DW_TAG_subprogram
-            Children:        DW_CHILDREN_no
-            Attributes:
-              - Attribute:       DW_AT_name
-                Form:            DW_FORM_strp
-              - Attribute:       DW_AT_type
-                Form:            DW_FORM_ref_addr
-    debug_info:
-      - Version:         4
-        AddrSize:        8
-        Entries:
-          - AbbrCode:        0x00000001
-            Values:
-              - Value:           0x0000000000000001
-          - AbbrCode:        0x00000002
-            Values:
-              - Value:           0x000000000000000D
-              - Value:           0x0000000000001234
-          - AbbrCode:        0x00000000
-  )";
-  auto ErrOrSections = DWARFYAML::emitDebugSections(StringRef(yamldata));
-  ASSERT_TRUE((bool)ErrOrSections);
-  std::unique_ptr<DWARFContext> DwarfContext =
-      DWARFContext::create(*ErrOrSections, 8);
-  VerifyError(*DwarfContext,
-              "error: DW_FORM_ref_addr offset beyond .debug_info bounds:");
-}
-
-TEST(DWARFDebugInfo, TestDwarfVerifyInvalidRanges) {
-  // Create a single compile unit with a DW_AT_ranges whose section offset
-  // isn't valid.
-  const char *yamldata = R"(
-    debug_str:
-      - ''
-      - /tmp/main.c
-    debug_abbrev:
-      - Table:
-          - Code:            0x00000001
-            Tag:             DW_TAG_compile_unit
-            Children:        DW_CHILDREN_no
-            Attributes:
-              - Attribute:       DW_AT_name
-                Form:            DW_FORM_strp
-              - Attribute:       DW_AT_ranges
-                Form:            DW_FORM_sec_offset
-    debug_info:
-      - Version:         4
-        AddrSize:        8
-        Entries:
-          - AbbrCode:        0x00000001
-            Values:
-              - Value:           0x0000000000000001
-              - Value:           0x0000000000001000
-  )";
-  auto ErrOrSections = DWARFYAML::emitDebugSections(StringRef(yamldata));
-  ASSERT_TRUE((bool)ErrOrSections);
-  std::unique_ptr<DWARFContext> DwarfContext =
-      DWARFContext::create(*ErrOrSections, 8);
-  VerifyError(
-      *DwarfContext,
-      "error: DW_AT_ranges offset is beyond .debug_ranges bounds: 0x00001000");
-}
-
-TEST(DWARFDebugInfo, TestDwarfVerifyInvalidRnglists) {
-  // Create a single compile unit with a DW_AT_ranges whose section offset
-  // isn't valid.
-  const char *yamldata = R"(
-    debug_str:
-      - ''
-      - /tmp/main.c
-    debug_abbrev:
-      - Table:
-          - Code:            0x00000001
-            Tag:             DW_TAG_compile_unit
-            Children:        DW_CHILDREN_no
-            Attributes:
-              - Attribute:       DW_AT_name
-                Form:            DW_FORM_strp
-              - Attribute:       DW_AT_ranges
-                Form:            DW_FORM_sec_offset
-    debug_info:
-      - Version:         5
-        UnitType:        DW_UT_compile
-        AddrSize:        8
-        Entries:
-          - AbbrCode:        0x00000001
-            Values:
-              - Value:           0x0000000000000001
-              - Value:           0x0000000000001000
-  )";
-  auto ErrOrSections = DWARFYAML::emitDebugSections(StringRef(yamldata));
-  ASSERT_TRUE((bool)ErrOrSections);
-  std::unique_ptr<DWARFContext> DwarfContext =
-      DWARFContext::create(*ErrOrSections, 8);
-  VerifyError(*DwarfContext, "error: DW_AT_ranges offset is beyond "
-                             ".debug_rnglists bounds: 0x00001000");
-}
-
-TEST(DWARFDebugInfo, TestDwarfVerifyInvalidStmtList) {
-  // Create a single compile unit with a DW_AT_stmt_list whose section offset
-  // isn't valid.
-  const char *yamldata = R"(
-    debug_str:
-      - ''
-      - /tmp/main.c
-    debug_abbrev:
-      - Table:
-          - Code:            0x00000001
-            Tag:             DW_TAG_compile_unit
-            Children:        DW_CHILDREN_no
-            Attributes:
-              - Attribute:       DW_AT_name
-                Form:            DW_FORM_strp
-              - Attribute:       DW_AT_stmt_list
-                Form:            DW_FORM_sec_offset
-    debug_info:
-      - Version:         4
-        AddrSize:        8
-        Entries:
-          - AbbrCode:        0x00000001
-            Values:
-              - Value:           0x0000000000000001
-              - Value:           0x0000000000001000
-  )";
-  auto ErrOrSections = DWARFYAML::emitDebugSections(StringRef(yamldata));
-  ASSERT_TRUE((bool)ErrOrSections);
-  std::unique_ptr<DWARFContext> DwarfContext =
-      DWARFContext::create(*ErrOrSections, 8);
-  VerifyError(
-      *DwarfContext,
-      "error: DW_AT_stmt_list offset is beyond .debug_line bounds: 0x00001000");
-}
-
-TEST(DWARFDebugInfo, TestDwarfVerifyInvalidStrp) {
-  // Create a single compile unit with a single function that has an invalid
-  // DW_FORM_strp for the DW_AT_name.
-  const char *yamldata = R"(
-    debug_str:
-      - ''
-    debug_abbrev:
-      - Table:
-          - Code:            0x00000001
-            Tag:             DW_TAG_compile_unit
-            Children:        DW_CHILDREN_no
-            Attributes:
-              - Attribute:       DW_AT_name
-                Form:            DW_FORM_strp
-    debug_info:
-      - Version:         4
-        AddrSize:        8
-        Entries:
-          - AbbrCode:        0x00000001
-            Values:
-              - Value:           0x0000000000001234
-  )";
-  auto ErrOrSections = DWARFYAML::emitDebugSections(StringRef(yamldata));
-  ASSERT_TRUE((bool)ErrOrSections);
-  std::unique_ptr<DWARFContext> DwarfContext =
-      DWARFContext::create(*ErrOrSections, 8);
-  VerifyError(*DwarfContext,
-              "error: DW_FORM_strp offset beyond .debug_str bounds:");
-}
-
-TEST(DWARFDebugInfo, TestDwarfVerifyInvalidRefAddrBetween) {
-  // Create a single compile unit with a single function that has a DW_AT_type
-  // with a valid .debug_info offset, but the offset is between two DIEs.
-  const char *yamldata = R"(
-    debug_str:
-      - ''
-      - /tmp/main.c
-      - main
-    debug_abbrev:
-      - Table:
-          - Code:            0x00000001
-            Tag:             DW_TAG_compile_unit
-            Children:        DW_CHILDREN_yes
-            Attributes:
-              - Attribute:       DW_AT_name
-                Form:            DW_FORM_strp
-          - Code:            0x00000002
-            Tag:             DW_TAG_subprogram
-            Children:        DW_CHILDREN_no
-            Attributes:
-              - Attribute:       DW_AT_name
-                Form:            DW_FORM_strp
-              - Attribute:       DW_AT_type
-                Form:            DW_FORM_ref_addr
-    debug_info:
-      - Version:         4
-        AddrSize:        8
-        Entries:
-          - AbbrCode:        0x00000001
-            Values:
-              - Value:           0x0000000000000001
-          - AbbrCode:        0x00000002
-            Values:
-              - Value:           0x000000000000000D
-              - Value:           0x0000000000000011
-          - AbbrCode:        0x00000000
-  )";
-  auto ErrOrSections = DWARFYAML::emitDebugSections(StringRef(yamldata));
-  ASSERT_TRUE((bool)ErrOrSections);
-  std::unique_ptr<DWARFContext> DwarfContext =
-      DWARFContext::create(*ErrOrSections, 8);
-  VerifyError(
-      *DwarfContext,
-      "error: invalid DIE reference 0x00000011. Offset is in between DIEs:");
-}
-
-TEST(DWARFDebugInfo, TestDwarfVerifyInvalidLineSequence) {
-  // Create a single compile unit whose line table has a sequence in it where
-  // the address decreases.
-  StringRef yamldata = R"(
-    debug_str:
-      - ''
-      - /tmp/main.c
-    debug_abbrev:
-      - Table:
-          - Code:            0x00000001
-            Tag:             DW_TAG_compile_unit
-            Children:        DW_CHILDREN_no
-            Attributes:
-              - Attribute:       DW_AT_name
-                Form:            DW_FORM_strp
-              - Attribute:       DW_AT_stmt_list
-                Form:            DW_FORM_sec_offset
-    debug_info:
-      - Version:         4
-        AddrSize:        8
-        Entries:
-          - AbbrCode:        0x00000001
-            Values:
-              - Value:           0x0000000000000001
-              - Value:           0x0000000000000000
-    debug_line:
-      - Version:         2
-        MinInstLength:   1
-        DefaultIsStmt:   1
-        LineBase:        251
-        LineRange:       14
-        OpcodeBase:      13
-        StandardOpcodeLengths: [ 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1 ]
-        IncludeDirs:
-          - /tmp
-        Files:
-          - Name:            main.c
-            DirIdx:          1
-            ModTime:         0
-            Length:          0
-        Opcodes:
-          - Opcode:          DW_LNS_extended_op
-            ExtLen:          9
-            SubOpcode:       DW_LNE_set_address
-            Data:            4112
-          - Opcode:          DW_LNS_advance_line
-            SData:           9
-            Data:            4112
-          - Opcode:          DW_LNS_copy
-            Data:            4112
-          - Opcode:          DW_LNS_advance_pc
-            Data:            18446744073709551600
-          - Opcode:          DW_LNS_extended_op
-            ExtLen:          1
-            SubOpcode:       DW_LNE_end_sequence
-            Data:            18446744073709551600
-  )";
-  auto ErrOrSections = DWARFYAML::emitDebugSections(yamldata);
-  ASSERT_TRUE((bool)ErrOrSections);
-  std::unique_ptr<DWARFContext> DwarfContext =
-      DWARFContext::create(*ErrOrSections, 8);
-  VerifyError(*DwarfContext, "error: .debug_line[0x00000000] row[1] decreases "
-                             "in address from previous row:");
-}
-
-TEST(DWARFDebugInfo, TestDwarfVerifyInvalidLineFileIndex) {
-  // Create a single compile unit whose line table has a line table row with
-  // an invalid file index.
-  StringRef yamldata = R"(
-    debug_str:
-      - ''
-      - /tmp/main.c
-    debug_abbrev:
-      - Table:
-          - Code:            0x00000001
-            Tag:             DW_TAG_compile_unit
-            Children:        DW_CHILDREN_no
-            Attributes:
-              - Attribute:       DW_AT_name
-                Form:            DW_FORM_strp
-              - Attribute:       DW_AT_stmt_list
-                Form:            DW_FORM_sec_offset
-    debug_info:
-      - Version:         4
-        AddrSize:        8
-        Entries:
-          - AbbrCode:        0x00000001
-            Values:
-              - Value:           0x0000000000000001
-              - Value:           0x0000000000000000
-    debug_line:
-      - Version:         2
-        MinInstLength:   1
-        DefaultIsStmt:   1
-        LineBase:        251
-        LineRange:       14
-        OpcodeBase:      13
-        StandardOpcodeLengths: [ 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1 ]
-        IncludeDirs:
-          - /tmp
-        Files:
-          - Name:            main.c
-            DirIdx:          1
-            ModTime:         0
-            Length:          0
-        Opcodes:
-          - Opcode:          DW_LNS_extended_op
-            ExtLen:          9
-            SubOpcode:       DW_LNE_set_address
-            Data:            4096
-          - Opcode:          DW_LNS_advance_line
-            SData:           9
-            Data:            4096
-          - Opcode:          DW_LNS_copy
-            Data:            4096
-          - Opcode:          DW_LNS_advance_pc
-            Data:            16
-          - Opcode:          DW_LNS_set_file
-            Data:            5
-          - Opcode:          DW_LNS_extended_op
-            ExtLen:          1
-            SubOpcode:       DW_LNE_end_sequence
-            Data:            5
-  )";
-  auto ErrOrSections = DWARFYAML::emitDebugSections(yamldata);
-  ASSERT_TRUE((bool)ErrOrSections);
-  std::unique_ptr<DWARFContext> DwarfContext =
-      DWARFContext::create(*ErrOrSections, 8);
-  VerifyError(*DwarfContext, "error: .debug_line[0x00000000][1] has invalid "
-                             "file index 5 (valid values are [1,1]):");
-}
-
-TEST(DWARFDebugInfo, TestDwarfVerifyInvalidLineTablePorlogueDirIndex) {
-  // Create a single compile unit whose line table has a prologue with an
-  // invalid dir index.
-  StringRef yamldata = R"(
-    debug_str:
-      - ''
-      - /tmp/main.c
-    debug_abbrev:
-      - Table:
-          - Code:            0x00000001
-            Tag:             DW_TAG_compile_unit
-            Children:        DW_CHILDREN_no
-            Attributes:
-              - Attribute:       DW_AT_name
-                Form:            DW_FORM_strp
-              - Attribute:       DW_AT_stmt_list
-                Form:            DW_FORM_sec_offset
-    debug_info:
-      - Version:         4
-        AddrSize:        8
-        Entries:
-          - AbbrCode:        0x00000001
-            Values:
-              - Value:           0x0000000000000001
-              - Value:           0x0000000000000000
-    debug_line:
-      - Version:         2
-        MinInstLength:   1
-        DefaultIsStmt:   1
-        LineBase:        251
-        LineRange:       14
-        OpcodeBase:      13
-        StandardOpcodeLengths: [ 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1 ]
-        IncludeDirs:
-          - /tmp
-        Files:
-          - Name:            main.c
-            DirIdx:          2
-            ModTime:         0
-            Length:          0
-        Opcodes:
-          - Opcode:          DW_LNS_extended_op
-            ExtLen:          9
-            SubOpcode:       DW_LNE_set_address
-            Data:            4096
-          - Opcode:          DW_LNS_advance_line
-            SData:           9
-            Data:            4096
-          - Opcode:          DW_LNS_copy
-            Data:            4096
-          - Opcode:          DW_LNS_advance_pc
-            Data:            16
-          - Opcode:          DW_LNS_set_file
-            Data:            1
-          - Opcode:          DW_LNS_extended_op
-            ExtLen:          1
-            SubOpcode:       DW_LNE_end_sequence
-            Data:            1
-  )";
-  auto ErrOrSections = DWARFYAML::emitDebugSections(yamldata);
-  ASSERT_TRUE((bool)ErrOrSections);
-  std::unique_ptr<DWARFContext> DwarfContext =
-      DWARFContext::create(*ErrOrSections, 8);
-  VerifyError(*DwarfContext,
-              "error: .debug_line[0x00000000].prologue."
-              "file_names[1].dir_idx contains an invalid index: 2");
-}
-
-TEST(DWARFDebugInfo, TestDwarfVerifyDuplicateFileWarning) {
-  // Create a single compile unit whose line table has a prologue with an
-  // invalid dir index.
-  StringRef yamldata = R"(
-    debug_str:
-      - ''
-      - /tmp/main.c
-    debug_abbrev:
-      - Table:
-          - Code:            0x00000001
-            Tag:             DW_TAG_compile_unit
-            Children:        DW_CHILDREN_no
-            Attributes:
-              - Attribute:       DW_AT_name
-                Form:            DW_FORM_strp
-              - Attribute:       DW_AT_stmt_list
-                Form:            DW_FORM_sec_offset
-    debug_info:
-      - Version:         4
-        AddrSize:        8
-        Entries:
-          - AbbrCode:        0x00000001
-            Values:
-              - Value:           0x0000000000000001
-              - Value:           0x0000000000000000
-    debug_line:
-      - Version:         2
-        MinInstLength:   1
-        DefaultIsStmt:   1
-        LineBase:        251
-        LineRange:       14
-        OpcodeBase:      13
-        StandardOpcodeLengths: [ 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1 ]
-        IncludeDirs:
-          - /tmp
-        Files:
-          - Name:            main.c
-            DirIdx:          1
-            ModTime:         0
-            Length:          0
-          - Name:            main.c
-            DirIdx:          1
-            ModTime:         0
-            Length:          0
-        Opcodes:
-          - Opcode:          DW_LNS_extended_op
-            ExtLen:          9
-            SubOpcode:       DW_LNE_set_address
-            Data:            4096
-          - Opcode:          DW_LNS_advance_line
-            SData:           9
-            Data:            4096
-          - Opcode:          DW_LNS_copy
-            Data:            4096
-          - Opcode:          DW_LNS_advance_pc
-            Data:            16
-          - Opcode:          DW_LNS_set_file
-            Data:            1
-          - Opcode:          DW_LNS_extended_op
-            ExtLen:          1
-            SubOpcode:       DW_LNE_end_sequence
-            Data:            2
-  )";
-  auto ErrOrSections = DWARFYAML::emitDebugSections(yamldata);
-  ASSERT_TRUE((bool)ErrOrSections);
-  std::unique_ptr<DWARFContext> DwarfContext =
-      DWARFContext::create(*ErrOrSections, 8);
-  VerifyWarning(*DwarfContext,
-                "warning: .debug_line[0x00000000].prologue.file_names[2] is "
-                "a duplicate of file_names[1]");
-}
-
-TEST(DWARFDebugInfo, TestDwarfVerifyCUDontShareLineTable) {
-  // Create a two compile units where both compile units share the same
-  // DW_AT_stmt_list value and verify we report the error correctly.
-  StringRef yamldata = R"(
-    debug_str:
-      - ''
-      - /tmp/main.c
-      - /tmp/foo.c
-    debug_abbrev:
-      - Table:
-          - Code:            0x00000001
-            Tag:             DW_TAG_compile_unit
-            Children:        DW_CHILDREN_no
-            Attributes:
-              - Attribute:       DW_AT_name
-                Form:            DW_FORM_strp
-              - Attribute:       DW_AT_stmt_list
-                Form:            DW_FORM_sec_offset
-    debug_info:
-      - Version:         4
-        AddrSize:        8
-        Entries:
-          - AbbrCode:        0x00000001
-            Values:
-              - Value:           0x0000000000000001
-              - Value:           0x0000000000000000
-      - Length:          16
-        Version:         4
-        AbbrevTableID:   0
-        AddrSize:        8
-        Entries:
-          - AbbrCode:        0x00000001
-            Values:
-              - Value:           0x000000000000000D
-              - Value:           0x0000000000000000
-    debug_line:
-      - Version:         2
-        MinInstLength:   1
-        DefaultIsStmt:   1
-        LineBase:        251
-        LineRange:       14
-        OpcodeBase:      13
-        StandardOpcodeLengths: [ 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1 ]
-        IncludeDirs:
-          - /tmp
-        Files:
-          - Name:            main.c
-            DirIdx:          1
-            ModTime:         0
-            Length:          0
-        Opcodes:
-          - Opcode:          DW_LNS_extended_op
-            ExtLen:          9
-            SubOpcode:       DW_LNE_set_address
-            Data:            4096
-          - Opcode:          DW_LNS_advance_line
-            SData:           9
-            Data:            4096
-          - Opcode:          DW_LNS_copy
-            Data:            4096
-          - Opcode:          DW_LNS_advance_pc
-            Data:            256
-          - Opcode:          DW_LNS_extended_op
-            ExtLen:          1
-            SubOpcode:       DW_LNE_end_sequence
-            Data:            256
-  )";
-  auto ErrOrSections = DWARFYAML::emitDebugSections(yamldata);
-  ASSERT_TRUE((bool)ErrOrSections);
-  std::unique_ptr<DWARFContext> DwarfContext =
-      DWARFContext::create(*ErrOrSections, 8);
-  VerifyError(*DwarfContext,
-              "error: two compile unit DIEs, 0x0000000b and "
-              "0x0000001f, have the same DW_AT_stmt_list section "
-              "offset:");
-}
-
-TEST(DWARFDebugInfo, TestErrorReporting) {
-  Triple Triple("x86_64-pc-linux");
-  if (!isConfigurationSupported(Triple))
-      return;
-
-  auto ExpectedDG = dwarfgen::Generator::create(Triple, 4 /*DwarfVersion*/);
-  ASSERT_THAT_EXPECTED(ExpectedDG, Succeeded());
-  dwarfgen::Generator *DG = ExpectedDG.get().get();
-  AsmPrinter *AP = DG->getAsmPrinter();
-  MCContext *MC = DG->getMCContext();
-
-  // Emit two compressed sections with broken headers.
-  AP->OutStreamer->SwitchSection(
-      MC->getELFSection(".zdebug_foo", 0 /*Type*/, 0 /*Flags*/));
-  AP->OutStreamer->emitBytes("0");
-  AP->OutStreamer->SwitchSection(
-      MC->getELFSection(".zdebug_bar", 0 /*Type*/, 0 /*Flags*/));
-  AP->OutStreamer->emitBytes("0");
-
-  MemoryBufferRef FileBuffer(DG->generate(), "dwarf");
-  auto Obj = object::ObjectFile::createObjectFile(FileBuffer);
-  EXPECT_TRUE((bool)Obj);
-
-  // DWARFContext parses whole file and finds the two errors we expect.
-  int Errors = 0;
-  std::unique_ptr<DWARFContext> Ctx1 =
-      DWARFContext::create(**Obj, nullptr, "", [&](Error E) {
-        ++Errors;
-        consumeError(std::move(E));
-      });
-  EXPECT_TRUE(Errors == 2);
-}
-
-TEST(DWARFDebugInfo, TestDwarfVerifyCURangesIncomplete) {
-  // Create a single compile unit with a single function. The compile
-  // unit has a DW_AT_ranges attribute that doesn't fully contain the
-  // address range of the function. The verification should fail due to
-  // the CU ranges not containing all of the address ranges of all of the
-  // functions.
-  StringRef yamldata = R"(
-    debug_str:
-      - ''
-      - /tmp/main.c
-    debug_abbrev:
-      - Table:
-          - Code:            0x00000001
-            Tag:             DW_TAG_compile_unit
-            Children:        DW_CHILDREN_yes
-            Attributes:
-              - Attribute:       DW_AT_low_pc
-                Form:            DW_FORM_addr
-              - Attribute:       DW_AT_high_pc
-                Form:            DW_FORM_addr
-              - Attribute:       DW_AT_name
-                Form:            DW_FORM_strp
-          - Code:            0x00000002
-            Tag:             DW_TAG_subprogram
-            Children:        DW_CHILDREN_no
-            Attributes:
-              - Attribute:       DW_AT_low_pc
-                Form:            DW_FORM_addr
-              - Attribute:       DW_AT_high_pc
-                Form:            DW_FORM_addr
-    debug_info:
-      - Version:         4
-        AddrSize:        8
-        Entries:
-          - AbbrCode:        0x00000001
-            Values:
-              - Value:           0x0000000000001000
-              - Value:           0x0000000000001500
-              - Value:           0x0000000000000001
-          - AbbrCode:        0x00000002
-            Values:
-              - Value:           0x0000000000001000
-              - Value:           0x0000000000002000
-          - AbbrCode:        0x00000000
-  )";
-  auto ErrOrSections = DWARFYAML::emitDebugSections(yamldata);
-  ASSERT_TRUE((bool)ErrOrSections);
-  std::unique_ptr<DWARFContext> DwarfContext =
-      DWARFContext::create(*ErrOrSections, 8);
-  VerifyError(*DwarfContext, "error: DIE address ranges are not "
-                             "contained in its parent's ranges:");
-}
-
-TEST(DWARFDebugInfo, TestDwarfVerifyLexicalBlockRanges) {
-  // Create a single compile unit with a single function that has a lexical
-  // block whose address range is not contained in the function address range.
-  StringRef yamldata = R"(
-    debug_str:
-      - ''
-      - /tmp/main.c
-      - main
-    debug_abbrev:
-      - Table:
-          - Code:            0x00000001
-            Tag:             DW_TAG_compile_unit
-            Children:        DW_CHILDREN_yes
-            Attributes:
-              - Attribute:       DW_AT_name
-                Form:            DW_FORM_strp
-          - Code:            0x00000002
-            Tag:             DW_TAG_subprogram
-            Children:        DW_CHILDREN_yes
-            Attributes:
-              - Attribute:       DW_AT_name
-                Form:            DW_FORM_strp
-              - Attribute:       DW_AT_low_pc
-                Form:            DW_FORM_addr
-              - Attribute:       DW_AT_high_pc
-                Form:            DW_FORM_addr
-          - Code:            0x00000003
-            Tag:             DW_TAG_lexical_block
-            Children:        DW_CHILDREN_no
-            Attributes:
-              - Attribute:       DW_AT_low_pc
-                Form:            DW_FORM_addr
-              - Attribute:       DW_AT_high_pc
-                Form:            DW_FORM_addr
-    debug_info:
-      - Version:         4
-        AddrSize:        8
-        Entries:
-          - AbbrCode:        0x00000001
-            Values:
-              - Value:           0x0000000000000001
-          - AbbrCode:        0x00000002
-            Values:
-              - Value:           0x000000000000000D
-              - Value:           0x0000000000001000
-              - Value:           0x0000000000002000
-          - AbbrCode:        0x00000003
-            Values:
-              - Value:           0x0000000000001000
-              - Value:           0x0000000000002001
-          - AbbrCode:        0x00000000
-          - AbbrCode:        0x00000000
-  )";
-  auto ErrOrSections = DWARFYAML::emitDebugSections(yamldata);
-  ASSERT_TRUE((bool)ErrOrSections);
-  std::unique_ptr<DWARFContext> DwarfContext =
-      DWARFContext::create(*ErrOrSections, 8);
-  VerifyError(*DwarfContext, "error: DIE address ranges are not "
-                             "contained in its parent's ranges:");
-}
-
-TEST(DWARFDebugInfo, TestDwarfVerifyOverlappingFunctionRanges) {
-  // Create a single compile unit with a two functions that have overlapping
-  // address ranges.
-  StringRef yamldata = R"(
-    debug_str:
-      - ''
-      - /tmp/main.c
-      - main
-      - foo
-    debug_abbrev:
-      - Table:
-          - Code:            0x00000001
-            Tag:             DW_TAG_compile_unit
-            Children:        DW_CHILDREN_yes
-            Attributes:
-              - Attribute:       DW_AT_name
-                Form:            DW_FORM_strp
-          - Code:            0x00000002
-            Tag:             DW_TAG_subprogram
-            Children:        DW_CHILDREN_no
-            Attributes:
-              - Attribute:       DW_AT_name
-                Form:            DW_FORM_strp
-              - Attribute:       DW_AT_low_pc
-                Form:            DW_FORM_addr
-              - Attribute:       DW_AT_high_pc
-                Form:            DW_FORM_addr
-    debug_info:
-      - Version:         4
-        AddrSize:        8
-        Entries:
-          - AbbrCode:        0x00000001
-            Values:
-              - Value:           0x0000000000000001
-          - AbbrCode:        0x00000002
-            Values:
-              - Value:           0x000000000000000D
-              - Value:           0x0000000000001000
-              - Value:           0x0000000000002000
-          - AbbrCode:        0x00000002
-            Values:
-              - Value:           0x0000000000000012
-              - Value:           0x0000000000001FFF
-              - Value:           0x0000000000002000
-          - AbbrCode:        0x00000000
-  )";
-  auto ErrOrSections = DWARFYAML::emitDebugSections(yamldata);
-  ASSERT_TRUE((bool)ErrOrSections);
-  std::unique_ptr<DWARFContext> DwarfContext =
-      DWARFContext::create(*ErrOrSections, 8);
-  VerifyError(*DwarfContext, "error: DIEs have overlapping address ranges:");
-}
-
-TEST(DWARFDebugInfo, TestDwarfVerifyOverlappingLexicalBlockRanges) {
-  // Create a single compile unit with a one function that has two lexical
-  // blocks with overlapping address ranges.
-  StringRef yamldata = R"(
-    debug_str:
-      - ''
-      - /tmp/main.c
-      - main
-    debug_abbrev:
-      - Table:
-          - Code:            0x00000001
-            Tag:             DW_TAG_compile_unit
-            Children:        DW_CHILDREN_yes
-            Attributes:
-              - Attribute:       DW_AT_low_pc
-                Form:            DW_FORM_addr
-              - Attribute:       DW_AT_high_pc
-                Form:            DW_FORM_addr
-              - Attribute:       DW_AT_name
-                Form:            DW_FORM_strp
-          - Code:            0x00000002
-            Tag:             DW_TAG_subprogram
-            Children:        DW_CHILDREN_yes
-            Attributes:
-              - Attribute:       DW_AT_name
-                Form:            DW_FORM_strp
-              - Attribute:       DW_AT_low_pc
-                Form:            DW_FORM_addr
-              - Attribute:       DW_AT_high_pc
-                Form:            DW_FORM_addr
-          - Code:            0x00000003
-            Tag:             DW_TAG_lexical_block
-            Children:        DW_CHILDREN_no
-            Attributes:
-              - Attribute:       DW_AT_low_pc
-                Form:            DW_FORM_addr
-              - Attribute:       DW_AT_high_pc
-                Form:            DW_FORM_addr
-    debug_info:
-      - Version:         4
-        AddrSize:        8
-        Entries:
-          - AbbrCode:        0x00000001
-            Values:
-              - Value:           0x0000000000001000
-              - Value:           0x0000000000002000
-              - Value:           0x0000000000000001
-          - AbbrCode:        0x00000002
-            Values:
-              - Value:           0x000000000000000D
-              - Value:           0x0000000000001000
-              - Value:           0x0000000000002000
-          - AbbrCode:        0x00000003
-            Values:
-              - Value:           0x0000000000001100
-              - Value:           0x0000000000001300
-          - AbbrCode:        0x00000003
-            Values:
-              - Value:           0x00000000000012FF
-              - Value:           0x0000000000001300
-          - AbbrCode:        0x00000000
-          - AbbrCode:        0x00000000
-  )";
-  auto ErrOrSections = DWARFYAML::emitDebugSections(yamldata);
-  ASSERT_TRUE((bool)ErrOrSections);
-  std::unique_ptr<DWARFContext> DwarfContext =
-      DWARFContext::create(*ErrOrSections, 8);
-  VerifyError(*DwarfContext, "error: DIEs have overlapping address ranges:");
-}
-
-TEST(DWARFDebugInfo, TestDwarfVerifyInvalidDIERange) {
-  // Create a single compile unit with a single function that has an invalid
-  // address range where the high PC is smaller than the low PC.
-  StringRef yamldata = R"(
-    debug_str:
-      - ''
-      - /tmp/main.c
-      - main
-    debug_abbrev:
-      - Table:
-          - Code:            0x00000001
-            Tag:             DW_TAG_compile_unit
-            Children:        DW_CHILDREN_yes
-            Attributes:
-              - Attribute:       DW_AT_name
-                Form:            DW_FORM_strp
-          - Code:            0x00000002
-            Tag:             DW_TAG_subprogram
-            Children:        DW_CHILDREN_no
-            Attributes:
-              - Attribute:       DW_AT_name
-                Form:            DW_FORM_strp
-              - Attribute:       DW_AT_low_pc
-                Form:            DW_FORM_addr
-              - Attribute:       DW_AT_high_pc
-                Form:            DW_FORM_addr
-    debug_info:
-      - Version:         4
-        AddrSize:        8
-        Entries:
-          - AbbrCode:        0x00000001
-            Values:
-              - Value:           0x0000000000000001
-          - AbbrCode:        0x00000002
-            Values:
-              - Value:           0x000000000000000D
-              - Value:           0x0000000000001000
-              - Value:           0x0000000000000900
-          - AbbrCode:        0x00000000
-  )";
-  auto ErrOrSections = DWARFYAML::emitDebugSections(yamldata);
-  ASSERT_TRUE((bool)ErrOrSections);
-  std::unique_ptr<DWARFContext> DwarfContext =
-      DWARFContext::create(*ErrOrSections, 8);
-  VerifyError(*DwarfContext, "error: Invalid address range");
-}
-
-TEST(DWARFDebugInfo, TestDwarfVerifyElidedDoesntFail) {
-  // Create a single compile unit with two functions: one that has a valid range
-  // and one whose low and high PC are the same. When the low and high PC are
-  // the same, this indicates the function was dead code stripped. We want to
-  // ensure that verification succeeds.
-  StringRef yamldata = R"(
-    debug_str:
-      - ''
-      - /tmp/main.c
-      - main
-      - elided
-    debug_abbrev:
-      - Table:
-          - Code:            0x00000001
-            Tag:             DW_TAG_compile_unit
-            Children:        DW_CHILDREN_yes
-            Attributes:
-              - Attribute:       DW_AT_low_pc
-                Form:            DW_FORM_addr
-              - Attribute:       DW_AT_high_pc
-                Form:            DW_FORM_addr
-              - Attribute:       DW_AT_name
-                Form:            DW_FORM_strp
-          - Code:            0x00000002
-            Tag:             DW_TAG_subprogram
-            Children:        DW_CHILDREN_no
-            Attributes:
-              - Attribute:       DW_AT_name
-                Form:            DW_FORM_strp
-              - Attribute:       DW_AT_low_pc
-                Form:            DW_FORM_addr
-              - Attribute:       DW_AT_high_pc
-                Form:            DW_FORM_addr
-    debug_info:
-      - Version:         4
-        AddrSize:        8
-        Entries:
-          - AbbrCode:        0x00000001
-            Values:
-              - Value:           0x0000000000001000
-              - Value:           0x0000000000002000
-              - Value:           0x0000000000000001
-          - AbbrCode:        0x00000002
-            Values:
-              - Value:           0x000000000000000D
-              - Value:           0x0000000000001000
-              - Value:           0x0000000000002000
-          - AbbrCode:        0x00000002
-            Values:
-              - Value:           0x0000000000000012
-              - Value:           0x0000000000002000
-              - Value:           0x0000000000002000
-          - AbbrCode:        0x00000000
-  )";
-  auto ErrOrSections = DWARFYAML::emitDebugSections(yamldata);
-  ASSERT_TRUE((bool)ErrOrSections);
-  std::unique_ptr<DWARFContext> DwarfContext =
-      DWARFContext::create(*ErrOrSections, 8);
-  VerifySuccess(*DwarfContext);
-}
-
-TEST(DWARFDebugInfo, TestDwarfVerifyNestedFunctions) {
-  // Create a single compile unit with a nested function which is not contained
-  // in its parent. Although LLVM doesn't generate this, it is valid accoridng
-  // to the DWARF standard.
-  StringRef yamldata = R"(
-    debug_str:
-      - ''
-      - /tmp/main.c
-      - main
-      - nested
-    debug_abbrev:
-      - Table:
-          - Code:            0x00000001
-            Tag:             DW_TAG_compile_unit
-            Children:        DW_CHILDREN_yes
-            Attributes:
-              - Attribute:       DW_AT_low_pc
-                Form:            DW_FORM_addr
-              - Attribute:       DW_AT_high_pc
-                Form:            DW_FORM_addr
-              - Attribute:       DW_AT_name
-                Form:            DW_FORM_strp
-          - Code:            0x00000002
-            Tag:             DW_TAG_subprogram
-            Children:        DW_CHILDREN_yes
-            Attributes:
-              - Attribute:       DW_AT_name
-                Form:            DW_FORM_strp
-              - Attribute:       DW_AT_low_pc
-                Form:            DW_FORM_addr
-              - Attribute:       DW_AT_high_pc
-                Form:            DW_FORM_addr
-    debug_info:
-      - Version:         4
-        AddrSize:        8
-        Entries:
-          - AbbrCode:        0x00000001
-            Values:
-              - Value:           0x0000000000001000
-              - Value:           0x0000000000002000
-              - Value:           0x0000000000000001
-          - AbbrCode:        0x00000002
-            Values:
-              - Value:           0x000000000000000D
-              - Value:           0x0000000000001000
-              - Value:           0x0000000000001500
-          - AbbrCode:        0x00000002
-            Values:
-              - Value:           0x0000000000000012
-              - Value:           0x0000000000001500
-              - Value:           0x0000000000002000
-          - AbbrCode:        0x00000000
-          - AbbrCode:        0x00000000
-          - AbbrCode:        0x00000000
-  )";
-  auto ErrOrSections = DWARFYAML::emitDebugSections(yamldata);
-  ASSERT_TRUE((bool)ErrOrSections);
-  std::unique_ptr<DWARFContext> DwarfContext =
-      DWARFContext::create(*ErrOrSections, 8);
-  VerifySuccess(*DwarfContext);
-}
-
-TEST(DWARFDebugInfo, TestDWARFDieRangeInfoContains) {
-  DWARFVerifier::DieRangeInfo Empty;
-  ASSERT_TRUE(Empty.contains(Empty));
-
-  DWARFVerifier::DieRangeInfo Ranges(
-      {{0x10, 0x20}, {0x30, 0x40}, {0x40, 0x50}});
-
-  ASSERT_TRUE(Ranges.contains(Empty));
-  ASSERT_FALSE(Ranges.contains({{{0x0f, 0x10}}}));
-  ASSERT_FALSE(Ranges.contains({{{0x0f, 0x20}}}));
-  ASSERT_FALSE(Ranges.contains({{{0x0f, 0x21}}}));
-
-  // Test ranges that start at R's start address
-  ASSERT_TRUE(Ranges.contains({{{0x10, 0x10}}}));
-  ASSERT_TRUE(Ranges.contains({{{0x10, 0x11}}}));
-  ASSERT_TRUE(Ranges.contains({{{0x10, 0x20}}}));
-  ASSERT_FALSE(Ranges.contains({{{0x10, 0x21}}}));
-
-  ASSERT_TRUE(Ranges.contains({{{0x11, 0x12}}}));
-
-  // Test ranges that start at last bytes of Range
-  ASSERT_TRUE(Ranges.contains({{{0x1f, 0x20}}}));
-  ASSERT_FALSE(Ranges.contains({{{0x1f, 0x21}}}));
-
-  // Test ranges that start after Range
-  ASSERT_TRUE(Ranges.contains({{{0x20, 0x20}}}));
-  ASSERT_FALSE(Ranges.contains({{{0x20, 0x21}}}));
-
-  ASSERT_TRUE(Ranges.contains({{{0x31, 0x32}}}));
-  ASSERT_TRUE(Ranges.contains({{{0x3f, 0x40}}}));
-  ASSERT_TRUE(Ranges.contains({{{0x10, 0x20}, {0x30, 0x40}}}));
-  ASSERT_TRUE(Ranges.contains({{{0x11, 0x12}, {0x31, 0x32}}}));
-  ASSERT_TRUE(Ranges.contains(
-      {{{0x11, 0x12}, {0x12, 0x13}, {0x31, 0x32}, {0x32, 0x33}}}));
-  ASSERT_FALSE(Ranges.contains({{{0x11, 0x12},
-                                 {0x12, 0x13},
-                                 {0x20, 0x21},
-                                 {0x31, 0x32},
-                                 {0x32, 0x33}}}));
-  ASSERT_FALSE(Ranges.contains(
-      {{{0x11, 0x12}, {0x12, 0x13}, {0x31, 0x32}, {0x32, 0x51}}}));
-  ASSERT_TRUE(Ranges.contains({{{0x11, 0x12}, {0x30, 0x50}}}));
-  ASSERT_FALSE(Ranges.contains({{{0x30, 0x51}}}));
-  ASSERT_FALSE(Ranges.contains({{{0x50, 0x51}}}));
-}
-
-namespace {
-
-void AssertRangesIntersect(const DWARFAddressRange &LHS,
-                           const DWARFAddressRange &RHS) {
-  ASSERT_TRUE(LHS.intersects(RHS));
-  ASSERT_TRUE(RHS.intersects(LHS));
-}
-void AssertRangesDontIntersect(const DWARFAddressRange &LHS,
-                               const DWARFAddressRange &RHS) {
-  ASSERT_FALSE(LHS.intersects(RHS));
-  ASSERT_FALSE(RHS.intersects(LHS));
-}
-
-void AssertRangesIntersect(const DWARFVerifier::DieRangeInfo &LHS,
-                           const DWARFAddressRangesVector &Ranges) {
-  DWARFVerifier::DieRangeInfo RHS(Ranges);
-  ASSERT_TRUE(LHS.intersects(RHS));
-  ASSERT_TRUE(RHS.intersects(LHS));
-}
-
-void AssertRangesDontIntersect(const DWARFVerifier::DieRangeInfo &LHS,
-                               const DWARFAddressRangesVector &Ranges) {
-  DWARFVerifier::DieRangeInfo RHS(Ranges);
-  ASSERT_FALSE(LHS.intersects(RHS));
-  ASSERT_FALSE(RHS.intersects(LHS));
-}
-
-} // namespace
-TEST(DWARFDebugInfo, TestDwarfRangesIntersect) {
-  DWARFAddressRange R(0x10, 0x20);
-
-  //----------------------------------------------------------------------
-  // Test ranges that start before R...
-  //----------------------------------------------------------------------
-  // Other range ends before start of R
-  AssertRangesDontIntersect(R, {0x00, 0x10});
-  // Other range end address is start of a R
-  AssertRangesIntersect(R, {0x00, 0x11});
-  // Other range end address is in R
-  AssertRangesIntersect(R, {0x00, 0x15});
-  // Other range end address is at and of R
-  AssertRangesIntersect(R, {0x00, 0x20});
-  // Other range end address is past end of R
-  AssertRangesIntersect(R, {0x00, 0x40});
-
-  //----------------------------------------------------------------------
-  // Test ranges that start at R's start address
-  //----------------------------------------------------------------------
-  // Ensure empty ranges doesn't match
-  AssertRangesDontIntersect(R, {0x10, 0x10});
-  // 1 byte of Range
-  AssertRangesIntersect(R, {0x10, 0x11});
-  // same as Range
-  AssertRangesIntersect(R, {0x10, 0x20});
-  // 1 byte past Range
-  AssertRangesIntersect(R, {0x10, 0x21});
-
-  //----------------------------------------------------------------------
-  // Test ranges that start inside Range
-  //----------------------------------------------------------------------
-  // empty in range
-  AssertRangesDontIntersect(R, {0x11, 0x11});
-  // all in Range
-  AssertRangesIntersect(R, {0x11, 0x1f});
-  // ends at end of Range
-  AssertRangesIntersect(R, {0x11, 0x20});
-  // ends past Range
-  AssertRangesIntersect(R, {0x11, 0x21});
-
-  //----------------------------------------------------------------------
-  // Test ranges that start at last bytes of Range
-  //----------------------------------------------------------------------
-  // ends at end of Range
-  AssertRangesIntersect(R, {0x1f, 0x20});
-  // ends past Range
-  AssertRangesIntersect(R, {0x1f, 0x21});
-
-  //----------------------------------------------------------------------
-  // Test ranges that start after Range
-  //----------------------------------------------------------------------
-  // empty just past in Range
-  AssertRangesDontIntersect(R, {0x20, 0x20});
-  // valid past Range
-  AssertRangesDontIntersect(R, {0x20, 0x21});
-}
-
-TEST(DWARFDebugInfo, TestDWARFDieRangeInfoIntersects) {
-
-  DWARFVerifier::DieRangeInfo Ranges({{0x10, 0x20}, {0x30, 0x40}});
-
-  // Test empty range
-  AssertRangesDontIntersect(Ranges, {});
-  // Test range that appears before all ranges in Ranges
-  AssertRangesDontIntersect(Ranges, {{0x00, 0x10}});
-  // Test range that appears between ranges in Ranges
-  AssertRangesDontIntersect(Ranges, {{0x20, 0x30}});
-  // Test range that appears after ranges in Ranges
-  AssertRangesDontIntersect(Ranges, {{0x40, 0x50}});
-
-  // Test range that start before first range
-  AssertRangesIntersect(Ranges, {{0x00, 0x11}});
-  // Test range that start at first range
-  AssertRangesIntersect(Ranges, {{0x10, 0x11}});
-  // Test range that start in first range
-  AssertRangesIntersect(Ranges, {{0x11, 0x12}});
-  // Test range that start at end of first range
-  AssertRangesIntersect(Ranges, {{0x1f, 0x20}});
-  // Test range that starts at end of first range
-  AssertRangesDontIntersect(Ranges, {{0x20, 0x21}});
-  // Test range that starts at end of first range
-  AssertRangesIntersect(Ranges, {{0x20, 0x31}});
-
-  // Test range that start before second range and ends before second
-  AssertRangesDontIntersect(Ranges, {{0x2f, 0x30}});
-  // Test range that start before second range and ends in second
-  AssertRangesIntersect(Ranges, {{0x2f, 0x31}});
-  // Test range that start at second range
-  AssertRangesIntersect(Ranges, {{0x30, 0x31}});
-  // Test range that start in second range
-  AssertRangesIntersect(Ranges, {{0x31, 0x32}});
-  // Test range that start at end of second range
-  AssertRangesIntersect(Ranges, {{0x3f, 0x40}});
-  // Test range that starts at end of second range
-  AssertRangesDontIntersect(Ranges, {{0x40, 0x41}});
-
-  AssertRangesDontIntersect(Ranges, {{0x20, 0x21}, {0x2f, 0x30}});
-  AssertRangesIntersect(Ranges, {{0x20, 0x21}, {0x2f, 0x31}});
-}
-
-TEST(DWARFDebugInfo, TestDWARF64UnitLength) {
-  static const char DebugInfoSecRaw[] =
-      "\xff\xff\xff\xff"                 // DWARF64 mark
-      "\x88\x77\x66\x55\x44\x33\x22\x11" // Length
-      "\x05\x00"                         // Version
-      "\x01"                             // DW_UT_compile
-      "\x04"                             // Address size
-      "\0\0\0\0\0\0\0\0";                // Offset Into Abbrev. Sec.
-  StringMap<std::unique_ptr<MemoryBuffer>> Sections;
-  Sections.insert(std::make_pair(
-      "debug_info", MemoryBuffer::getMemBuffer(StringRef(
-                        DebugInfoSecRaw, sizeof(DebugInfoSecRaw) - 1))));
-  auto Context = DWARFContext::create(Sections, /* AddrSize = */ 4,
-                                      /* isLittleEndian = */ true);
-  const auto &Obj = Context->getDWARFObj();
-  Obj.forEachInfoSections([&](const DWARFSection &Sec) {
-    DWARFUnitHeader Header;
-    DWARFDataExtractor Data(Obj, Sec, /* IsLittleEndian = */ true,
-                            /* AddressSize = */ 4);
-    uint64_t Offset = 0;
-    EXPECT_FALSE(Header.extract(*Context, Data, &Offset, DW_SECT_INFO));
-    // Header.extract() returns false because there is not enough space
-    // in the section for the declared length. Anyway, we can check that
-    // the properties are read correctly.
-    ASSERT_EQ(DwarfFormat::DWARF64, Header.getFormat());
-    ASSERT_EQ(0x1122334455667788ULL, Header.getLength());
-    ASSERT_EQ(5, Header.getVersion());
-    ASSERT_EQ(DW_UT_compile, Header.getUnitType());
-    ASSERT_EQ(4, Header.getAddressByteSize());
-
-    // Check that the length can be correctly read in the unit class.
-    DWARFUnitVector DummyUnitVector;
-    DWARFSection DummySec;
-    DWARFCompileUnit CU(*Context, Sec, Header, /* DA = */ 0, /* RS = */ 0,
-                        /* LocSection = */ 0, /* SS = */ StringRef(),
-                        /* SOS = */ DummySec, /* AOS = */ 0,
-                        /* LS = */ DummySec, /* LE = */ true,
-                        /* isDWO= */ false, DummyUnitVector);
-    ASSERT_EQ(0x1122334455667788ULL, CU.getLength());
-  });
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFDebugLineTest.cpp b/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFDebugLineTest.cpp
deleted file mode 100644
index 9de6c83f5cc..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFDebugLineTest.cpp
+++ /dev/null
@@ -1,1762 +0,0 @@
-//===- DWARFDebugLineTest.cpp ---------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "DwarfGenerator.h"
-#include "DwarfUtils.h"
-#include "llvm/DebugInfo/DWARF/DWARFContext.h"
-#include "llvm/DebugInfo/DWARF/DWARFDebugLine.h"
-#include "llvm/Object/ObjectFile.h"
-#include "llvm/Testing/Support/Error.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace dwarf;
-using namespace dwarfgen;
-using namespace object;
-using namespace utils;
-using namespace testing;
-
-namespace {
-struct CommonFixture {
-  CommonFixture()
-      : LineData("", true, 0), Recoverable(Error::success()),
-        RecordRecoverable(std::bind(&CommonFixture::recordRecoverable, this,
-                                    std::placeholders::_1)),
-        Unrecoverable(Error::success()),
-        RecordUnrecoverable(std::bind(&CommonFixture::recordUnrecoverable, this,
-                                      std::placeholders::_1)){};
-
-  ~CommonFixture() {
-    EXPECT_FALSE(Recoverable);
-    EXPECT_FALSE(Unrecoverable);
-  }
-
-  bool setupGenerator(uint16_t Version = 4, uint8_t AddrSize = 8) {
-    AddressSize = AddrSize;
-    Triple T =
-        getDefaultTargetTripleForAddrSize(AddressSize == 0 ? 8 : AddressSize);
-    if (!isConfigurationSupported(T))
-      return false;
-    auto ExpectedGenerator = Generator::create(T, Version);
-    if (ExpectedGenerator)
-      Gen.reset(ExpectedGenerator->release());
-    return true;
-  }
-
-  void generate() {
-    Context = createContext();
-    assert(Context != nullptr && "test state is not valid");
-    const DWARFObject &Obj = Context->getDWARFObj();
-    uint8_t TargetAddrSize = AddressSize == 0 ? 8 : AddressSize;
-    LineData = DWARFDataExtractor(
-        Obj, Obj.getLineSection(),
-        getDefaultTargetTripleForAddrSize(TargetAddrSize).isLittleEndian(),
-        AddressSize);
-  }
-
-  std::unique_ptr<DWARFContext> createContext() {
-    if (!Gen)
-      return nullptr;
-    StringRef FileBytes = Gen->generate();
-    MemoryBufferRef FileBuffer(FileBytes, "dwarf");
-    auto Obj = object::ObjectFile::createObjectFile(FileBuffer);
-    if (Obj)
-      return DWARFContext::create(**Obj);
-    return nullptr;
-  }
-
-  DWARFDebugLine::SectionParser setupParser() {
-    LineTable &LT = Gen->addLineTable(DWARF32);
-    LT.addExtendedOpcode(9, DW_LNE_set_address, {{0xadd4e55, LineTable::Quad}});
-    LT.addStandardOpcode(DW_LNS_copy, {});
-    LT.addByte(0xaa);
-    LT.addExtendedOpcode(1, DW_LNE_end_sequence, {});
-
-    LineTable &LT2 = Gen->addLineTable(DWARF64);
-    LT2.addExtendedOpcode(9, DW_LNE_set_address,
-                          {{0x11223344, LineTable::Quad}});
-    LT2.addStandardOpcode(DW_LNS_copy, {});
-    LT2.addByte(0xbb);
-    LT2.addExtendedOpcode(1, DW_LNE_end_sequence, {});
-
-    generate();
-
-    return DWARFDebugLine::SectionParser(LineData, *Context, Units);
-  }
-
-  void recordRecoverable(Error Err) {
-    Recoverable = joinErrors(std::move(Recoverable), std::move(Err));
-  }
-  void recordUnrecoverable(Error Err) {
-    Unrecoverable = joinErrors(std::move(Unrecoverable), std::move(Err));
-  }
-
-  Expected<const DWARFDebugLine::LineTable *>
-  getOrParseLineTableFatalErrors(uint64_t Offset = 0) {
-    auto ExpectedLineTable = Line.getOrParseLineTable(
-        LineData, Offset, *Context, nullptr, RecordRecoverable);
-    EXPECT_THAT_ERROR(std::move(Recoverable), Succeeded());
-    return ExpectedLineTable;
-  }
-
-  uint8_t AddressSize;
-  std::unique_ptr<Generator> Gen;
-  std::unique_ptr<DWARFContext> Context;
-  DWARFDataExtractor LineData;
-  DWARFDebugLine Line;
-  Error Recoverable;
-  std::function<void(Error)> RecordRecoverable;
-  Error Unrecoverable;
-  std::function<void(Error)> RecordUnrecoverable;
-
-  SmallVector<std::unique_ptr<DWARFUnit>, 2> Units;
-};
-
-// Fixtures must derive from "Test", but parameterised fixtures from
-// "TestWithParam". It does not seem possible to inherit from both, so we share
-// the common state in a separate class, inherited by the two fixture classes.
-struct DebugLineBasicFixture : public Test, public CommonFixture {};
-
-struct DebugLineParameterisedFixture
-    : public TestWithParam<std::pair<uint16_t, DwarfFormat>>,
-      public CommonFixture {
-  void SetUp() override { std::tie(Version, Format) = GetParam(); }
-
-  uint16_t Version;
-  DwarfFormat Format;
-};
-
-void checkDefaultPrologue(uint16_t Version, DwarfFormat Format,
-                          DWARFDebugLine::Prologue Prologue,
-                          uint64_t BodyLength) {
-  // Check version specific fields and values.
-  uint64_t UnitLength;
-  uint64_t PrologueLength;
-  switch (Version) {
-  case 4:
-    PrologueLength = 36;
-    UnitLength = PrologueLength + 2;
-    EXPECT_EQ(Prologue.MaxOpsPerInst, 1u);
-    break;
-  case 2:
-  case 3:
-    PrologueLength = 35;
-    UnitLength = PrologueLength + 2;
-    break;
-  case 5:
-    PrologueLength = 42;
-    UnitLength = PrologueLength + 4;
-    EXPECT_EQ(Prologue.getAddressSize(), 8u);
-    EXPECT_EQ(Prologue.SegSelectorSize, 0u);
-    break;
-  default:
-    llvm_unreachable("unsupported DWARF version");
-  }
-  UnitLength += BodyLength + (Format == DWARF32 ? 4 : 8);
-
-  EXPECT_EQ(Prologue.TotalLength, UnitLength);
-  EXPECT_EQ(Prologue.PrologueLength, PrologueLength);
-  EXPECT_EQ(Prologue.MinInstLength, 1u);
-  EXPECT_EQ(Prologue.DefaultIsStmt, 1u);
-  EXPECT_EQ(Prologue.LineBase, -5);
-  EXPECT_EQ(Prologue.LineRange, 14u);
-  EXPECT_EQ(Prologue.OpcodeBase, 13u);
-  std::vector<uint8_t> ExpectedLengths = {0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1};
-  EXPECT_EQ(Prologue.StandardOpcodeLengths, ExpectedLengths);
-  ASSERT_EQ(Prologue.IncludeDirectories.size(), 1u);
-  ASSERT_EQ(Prologue.IncludeDirectories[0].getForm(), DW_FORM_string);
-  EXPECT_STREQ(*Prologue.IncludeDirectories[0].getAsCString(), "a dir");
-  ASSERT_EQ(Prologue.FileNames.size(), 1u);
-  ASSERT_EQ(Prologue.FileNames[0].Name.getForm(), DW_FORM_string);
-  ASSERT_EQ(Prologue.FileNames[0].DirIdx, 0u);
-  EXPECT_STREQ(*Prologue.FileNames[0].Name.getAsCString(), "a file");
-}
-
-TEST_F(DebugLineBasicFixture, GetOrParseLineTableAtInvalidOffset) {
-  if (!setupGenerator())
-    return;
-  generate();
-
-  EXPECT_THAT_EXPECTED(
-      getOrParseLineTableFatalErrors(0),
-      FailedWithMessage(
-          "offset 0x00000000 is not a valid debug line section offset"));
-  // Repeat to show that an error is reported each time.
-  EXPECT_THAT_EXPECTED(
-      getOrParseLineTableFatalErrors(0),
-      FailedWithMessage(
-          "offset 0x00000000 is not a valid debug line section offset"));
-
-  // Show that an error is reported for later offsets too.
-  EXPECT_THAT_EXPECTED(
-      getOrParseLineTableFatalErrors(1),
-      FailedWithMessage(
-          "offset 0x00000001 is not a valid debug line section offset"));
-}
-
-TEST_F(DebugLineBasicFixture, GetOrParseLineTableAtInvalidOffsetAfterData) {
-  if (!setupGenerator())
-    return;
-
-  LineTable &LT = Gen->addLineTable();
-  LT.setCustomPrologue({{0, LineTable::Byte}});
-
-  generate();
-
-  EXPECT_THAT_EXPECTED(
-      getOrParseLineTableFatalErrors(0),
-      FailedWithMessage(
-          "parsing line table prologue at offset 0x00000000: "
-          "unexpected end of data at offset 0x1 while reading [0x0, 0x4)"));
-
-  EXPECT_THAT_EXPECTED(
-      getOrParseLineTableFatalErrors(1),
-      FailedWithMessage(
-          "offset 0x00000001 is not a valid debug line section offset"));
-}
-
-TEST_P(DebugLineParameterisedFixture, PrologueGetLength) {
-  if (!setupGenerator(Version))
-    return;
-  LineTable &LT = Gen->addLineTable(Format);
-  DWARFDebugLine::Prologue Prologue = LT.createBasicPrologue();
-  LT.setPrologue(Prologue);
-  generate();
-
-  // + 10 for sizes of DWARF-32 unit length, version, prologue length.
-  uint64_t ExpectedLength = Prologue.PrologueLength + 10;
-  if (Version == 5)
-    // Add address and segment selector size fields.
-    ExpectedLength += 2;
-  if (Format == DWARF64)
-    // Unit length grows by 8, prologue length by 4.
-    ExpectedLength += 12;
-
-  auto ExpectedLineTable = Line.getOrParseLineTable(LineData, 0, *Context,
-                                                    nullptr, RecordRecoverable);
-  ASSERT_THAT_EXPECTED(ExpectedLineTable, Succeeded());
-  EXPECT_EQ((*ExpectedLineTable)->Prologue.getLength(), ExpectedLength);
-}
-
-TEST_P(DebugLineParameterisedFixture, GetOrParseLineTableValidTable) {
-  if (!setupGenerator(Version))
-    return;
-
-  SCOPED_TRACE("Checking Version " + std::to_string(Version) + ", Format " +
-               (Format == DWARF64 ? "DWARF64" : "DWARF32"));
-
-  LineTable &LT = Gen->addLineTable(Format);
-  LT.addExtendedOpcode(9, DW_LNE_set_address, {{0xadd4e55, LineTable::Quad}});
-  LT.addStandardOpcode(DW_LNS_copy, {});
-  LT.addByte(0xaa);
-  LT.addExtendedOpcode(1, DW_LNE_end_sequence, {});
-
-  LineTable &LT2 = Gen->addLineTable(Format);
-  LT2.addExtendedOpcode(9, DW_LNE_set_address, {{0x11223344, LineTable::Quad}});
-  LT2.addStandardOpcode(DW_LNS_copy, {});
-  LT2.addByte(0xbb);
-  LT2.addExtendedOpcode(1, DW_LNE_end_sequence, {});
-  LT2.addExtendedOpcode(9, DW_LNE_set_address, {{0x55667788, LineTable::Quad}});
-  LT2.addStandardOpcode(DW_LNS_copy, {});
-  LT2.addByte(0xcc);
-  LT2.addExtendedOpcode(1, DW_LNE_end_sequence, {});
-
-  generate();
-
-  auto ExpectedLineTable = Line.getOrParseLineTable(LineData, 0, *Context,
-                                                    nullptr, RecordRecoverable);
-  ASSERT_TRUE(ExpectedLineTable.operator bool());
-  EXPECT_FALSE(Recoverable);
-  const DWARFDebugLine::LineTable *Expected = *ExpectedLineTable;
-  checkDefaultPrologue(Version, Format, Expected->Prologue, 16);
-  EXPECT_EQ(Expected->Sequences.size(), 1u);
-
-  uint64_t SecondOffset =
-      Expected->Prologue.sizeofTotalLength() + Expected->Prologue.TotalLength;
-  Recoverable = Error::success();
-  auto ExpectedLineTable2 = Line.getOrParseLineTable(
-      LineData, SecondOffset, *Context, nullptr, RecordRecoverable);
-  ASSERT_TRUE(ExpectedLineTable2.operator bool());
-  EXPECT_FALSE(Recoverable);
-  const DWARFDebugLine::LineTable *Expected2 = *ExpectedLineTable2;
-  checkDefaultPrologue(Version, Format, Expected2->Prologue, 32);
-  EXPECT_EQ(Expected2->Sequences.size(), 2u);
-
-  EXPECT_NE(Expected, Expected2);
-
-  // Check that if the same offset is requested, the exact same pointer is
-  // returned.
-  Recoverable = Error::success();
-  auto ExpectedLineTable3 = Line.getOrParseLineTable(
-      LineData, 0, *Context, nullptr, RecordRecoverable);
-  ASSERT_TRUE(ExpectedLineTable3.operator bool());
-  EXPECT_FALSE(Recoverable);
-  EXPECT_EQ(Expected, *ExpectedLineTable3);
-
-  Recoverable = Error::success();
-  auto ExpectedLineTable4 = Line.getOrParseLineTable(
-      LineData, SecondOffset, *Context, nullptr, RecordRecoverable);
-  ASSERT_TRUE(ExpectedLineTable4.operator bool());
-  EXPECT_FALSE(Recoverable);
-  EXPECT_EQ(Expected2, *ExpectedLineTable4);
-
-  // TODO: Add tests that show that the body of the programs have been read
-  // correctly.
-}
-
-TEST_F(DebugLineBasicFixture, ErrorForReservedLength) {
-  if (!setupGenerator())
-    return;
-
-  LineTable &LT = Gen->addLineTable();
-  LT.setCustomPrologue({{0xfffffff0, LineTable::Long}});
-
-  generate();
-
-  EXPECT_THAT_EXPECTED(
-      getOrParseLineTableFatalErrors(),
-      FailedWithMessage(
-          "parsing line table prologue at offset 0x00000000: unsupported "
-          "reserved unit length of value 0xfffffff0"));
-}
-
-struct DebugLineUnsupportedVersionFixture : public TestWithParam<uint16_t>,
-                                            public CommonFixture {
-  void SetUp() override { Version = GetParam(); }
-
-  uint16_t Version;
-};
-
-TEST_P(DebugLineUnsupportedVersionFixture, ErrorForUnsupportedVersion) {
-  if (!setupGenerator())
-    return;
-
-  LineTable &LT = Gen->addLineTable();
-  LT.setCustomPrologue(
-      {{LineTable::Half, LineTable::Long}, {Version, LineTable::Half}});
-
-  generate();
-
-  EXPECT_THAT_EXPECTED(
-      getOrParseLineTableFatalErrors(),
-      FailedWithMessage("parsing line table prologue at offset 0x00000000: "
-                        "unsupported version " +
-                        std::to_string(Version)));
-}
-
-INSTANTIATE_TEST_SUITE_P(UnsupportedVersionTestParams,
-                         DebugLineUnsupportedVersionFixture,
-                         Values(/*1 below min */ 1, /* 1 above max */ 6,
-                                /* Maximum possible */ 0xffff));
-
-TEST_F(DebugLineBasicFixture, ErrorForInvalidV5IncludeDirTable) {
-  if (!setupGenerator(5))
-    return;
-
-  LineTable &LT = Gen->addLineTable();
-  LT.setCustomPrologue({
-      {19, LineTable::Long}, // unit length
-      {5, LineTable::Half},  // version
-      {8, LineTable::Byte},  // addr size
-      {0, LineTable::Byte},  // segment selector size
-      {11, LineTable::Long}, // prologue length
-      {1, LineTable::Byte},  // min instruction length
-      {1, LineTable::Byte},  // max ops per instruction
-      {1, LineTable::Byte},  // default is_stmt
-      {0, LineTable::Byte},  // line base
-      {14, LineTable::Byte}, // line range
-      {2, LineTable::Byte},  // opcode base (small to reduce the amount of
-                             // setup required).
-      {0, LineTable::Byte},  // standard opcode lengths
-      {0, LineTable::Byte},  // directory entry format count (should not be
-                             // zero).
-      {0, LineTable::ULEB},  // directories count
-      {0, LineTable::Byte},  // file name entry format count
-      {0, LineTable::ULEB}   // file name entry count
-  });
-
-  generate();
-
-  auto ExpectedLineTable = Line.getOrParseLineTable(LineData, 0, *Context,
-                                                    nullptr, RecordRecoverable);
-  EXPECT_THAT_EXPECTED(ExpectedLineTable, Succeeded());
-
-  EXPECT_THAT_ERROR(
-      std::move(Recoverable),
-      FailedWithMessage(
-          "parsing line table prologue at 0x00000000 found an invalid "
-          "directory or file table description at 0x00000014",
-          "failed to parse entry content descriptions because no path was "
-          "found"));
-}
-
-TEST_P(DebugLineParameterisedFixture, ErrorForTooLargePrologueLength) {
-  if (!setupGenerator(Version))
-    return;
-
-  SCOPED_TRACE("Checking Version " + std::to_string(Version) + ", Format " +
-               (Format == DWARF64 ? "DWARF64" : "DWARF32"));
-
-  LineTable &LT = Gen->addLineTable(Format);
-  DWARFDebugLine::Prologue Prologue = LT.createBasicPrologue();
-  ++Prologue.PrologueLength;
-  LT.setPrologue(Prologue);
-
-  generate();
-
-  auto ExpectedLineTable = Line.getOrParseLineTable(LineData, 0, *Context,
-                                                    nullptr, RecordRecoverable);
-  ASSERT_THAT_EXPECTED(ExpectedLineTable, Succeeded());
-  DWARFDebugLine::LineTable Result(**ExpectedLineTable);
-  // Undo the earlier modification so that it can be compared against a
-  // "default" prologue.
-  --Result.Prologue.PrologueLength;
-  checkDefaultPrologue(Version, Format, Result.Prologue, 0);
-
-  uint64_t ExpectedEnd =
-      Prologue.TotalLength + 1 + Prologue.sizeofTotalLength();
-  EXPECT_THAT_ERROR(
-      std::move(Recoverable),
-      FailedWithMessage(
-          ("unknown data in line table prologue at offset 0x00000000: "
-           "parsing ended (at offset 0x000000" +
-           Twine::utohexstr(ExpectedEnd - 1) +
-           ") before reaching the prologue end at offset 0x000000" +
-           Twine::utohexstr(ExpectedEnd))
-              .str()));
-}
-
-TEST_P(DebugLineParameterisedFixture, ErrorForTooShortPrologueLength) {
-  if (!setupGenerator(Version))
-    return;
-
-  SCOPED_TRACE("Checking Version " + std::to_string(Version) + ", Format " +
-               (Format == DWARF64 ? "DWARF64" : "DWARF32"));
-
-  LineTable &LT = Gen->addLineTable(Format);
-  DWARFDebugLine::Prologue Prologue = LT.createBasicPrologue();
-  Prologue.PrologueLength -= 2;
-  LT.setPrologue(Prologue);
-
-  generate();
-
-  auto ExpectedLineTable = Line.getOrParseLineTable(LineData, 0, *Context,
-                                                    nullptr, RecordRecoverable);
-  ASSERT_THAT_EXPECTED(ExpectedLineTable, Succeeded());
-  DWARFDebugLine::LineTable Result(**ExpectedLineTable);
-
-  // Parsing will stop before reading a complete file entry.
-  ASSERT_EQ(Result.Prologue.IncludeDirectories.size(), 1u);
-  EXPECT_EQ(toStringRef(Result.Prologue.IncludeDirectories[0]), "a dir");
-  EXPECT_EQ(Result.Prologue.FileNames.size(), 0u);
-
-  // The exact place where the parsing will stop depends on the structure of the
-  // prologue and the last complete field we are able to read. Before V5 we stop
-  // before reading the file length. In V5, we stop before the filename.
-  uint64_t ExpectedEnd = Prologue.TotalLength + Prologue.sizeofTotalLength() -
-                         (Version < 5 ? 2 : 8);
-  std::vector<std::string> Errs;
-  Errs.emplace_back(
-      (Twine("parsing line table prologue at 0x00000000 found an invalid "
-             "directory or file table description at 0x000000") +
-       Twine::utohexstr(ExpectedEnd))
-          .str());
-  if (Version < 5) {
-    Errs.emplace_back("file names table was not null terminated before the end "
-                      "of the prologue");
-  } else {
-    Errs.emplace_back(
-        "failed to parse file entry because extracting the form value failed");
-  }
-  EXPECT_THAT_ERROR(std::move(Recoverable),
-                    FailedWithMessageArray(testing::ElementsAreArray(Errs)));
-}
-
-INSTANTIATE_TEST_SUITE_P(
-    LineTableTestParams, DebugLineParameterisedFixture,
-    Values(std::make_pair(
-               2, DWARF32), // Test lower-bound of v2-3 fields and DWARF32.
-           std::make_pair(3, DWARF32), // Test upper-bound of v2-3 fields.
-           std::make_pair(4, DWARF64), // Test v4 fields and DWARF64.
-           std::make_pair(5, DWARF32), std::make_pair(5, DWARF64)));
-
-TEST_F(DebugLineBasicFixture, ErrorForExtendedOpcodeLengthSmallerThanExpected) {
-  if (!setupGenerator())
-    return;
-
-  LineTable &LT = Gen->addLineTable();
-  LT.addByte(0xaa);
-  // The Length should be 1 + sizeof(ULEB) for a set discriminator opcode.
-  // The operand will be read for both the discriminator opcode and then parsed
-  // again as DW_LNS_negate_stmt, to respect the claimed length.
-  LT.addExtendedOpcode(1, DW_LNE_set_discriminator,
-                       {{DW_LNS_negate_stmt, LineTable::ULEB}});
-  LT.addByte(0xbb);
-  LT.addStandardOpcode(DW_LNS_const_add_pc, {});
-  LT.addExtendedOpcode(1, DW_LNE_end_sequence, {});
-
-  generate();
-
-  auto ExpectedLineTable = Line.getOrParseLineTable(LineData, 0, *Context,
-                                                    nullptr, RecordRecoverable);
-  EXPECT_THAT_ERROR(std::move(Recoverable),
-                    FailedWithMessage("unexpected line op length at offset "
-                                      "0x00000031 expected 0x01 found 0x02"));
-  ASSERT_THAT_EXPECTED(ExpectedLineTable, Succeeded());
-  ASSERT_EQ((*ExpectedLineTable)->Rows.size(), 3u);
-  EXPECT_EQ((*ExpectedLineTable)->Sequences.size(), 1u);
-  EXPECT_EQ((*ExpectedLineTable)->Rows[1].IsStmt, 0u);
-  EXPECT_EQ((*ExpectedLineTable)->Rows[1].Discriminator, DW_LNS_negate_stmt);
-}
-
-TEST_F(DebugLineBasicFixture, ErrorForExtendedOpcodeLengthLargerThanExpected) {
-  if (!setupGenerator())
-    return;
-
-  LineTable &LT = Gen->addLineTable();
-  LT.addByte(0xaa);
-  LT.addStandardOpcode(DW_LNS_const_add_pc, {});
-  // The Length should be 1 for an end sequence opcode.
-  LT.addExtendedOpcode(2, DW_LNE_end_sequence, {});
-  // The negate statement opcode will be skipped.
-  LT.addStandardOpcode(DW_LNS_negate_stmt, {});
-  LT.addByte(0xbb);
-  LT.addStandardOpcode(DW_LNS_const_add_pc, {});
-  LT.addExtendedOpcode(1, DW_LNE_end_sequence, {});
-
-  generate();
-
-  auto ExpectedLineTable = Line.getOrParseLineTable(LineData, 0, *Context,
-                                                    nullptr, RecordRecoverable);
-  EXPECT_THAT_ERROR(std::move(Recoverable),
-                    FailedWithMessage("unexpected line op length at offset "
-                                      "0x00000032 expected 0x02 found 0x01"));
-  ASSERT_THAT_EXPECTED(ExpectedLineTable, Succeeded());
-  ASSERT_EQ((*ExpectedLineTable)->Rows.size(), 4u);
-  EXPECT_EQ((*ExpectedLineTable)->Sequences.size(), 2u);
-  ASSERT_EQ((*ExpectedLineTable)->Sequences[1].FirstRowIndex, 2u);
-  EXPECT_EQ((*ExpectedLineTable)->Rows[2].IsStmt, 1u);
-}
-
-TEST_F(DebugLineBasicFixture, ErrorForUnitLengthTooLarge) {
-  if (!setupGenerator())
-    return;
-
-  LineTable &Padding = Gen->addLineTable();
-  // Add some padding to show that a non-zero offset is handled correctly.
-  Padding.setCustomPrologue({{0, LineTable::Byte}});
-  LineTable &LT = Gen->addLineTable();
-  LT.addStandardOpcode(DW_LNS_copy, {});
-  LT.addStandardOpcode(DW_LNS_const_add_pc, {});
-  LT.addExtendedOpcode(1, DW_LNE_end_sequence, {});
-  DWARFDebugLine::Prologue Prologue = LT.createBasicPrologue();
-  // Set the total length to 1 higher than the actual length.
-  ++Prologue.TotalLength;
-  LT.setPrologue(Prologue);
-
-  generate();
-
-  auto ExpectedLineTable = Line.getOrParseLineTable(LineData, 1, *Context,
-                                                    nullptr, RecordRecoverable);
-  EXPECT_THAT_ERROR(
-      std::move(Recoverable),
-      FailedWithMessage("line table program with offset 0x00000001 has length "
-                        "0x00000034 but only 0x00000033 bytes are available"));
-  ASSERT_THAT_EXPECTED(ExpectedLineTable, Succeeded());
-  EXPECT_EQ((*ExpectedLineTable)->Rows.size(), 2u);
-  EXPECT_EQ((*ExpectedLineTable)->Sequences.size(), 1u);
-}
-
-TEST_F(DebugLineBasicFixture, ErrorForMismatchedAddressSize) {
-  if (!setupGenerator(4, 8))
-    return;
-
-  LineTable &LT = Gen->addLineTable();
-  // The line data extractor expects size 8 (Quad) addresses.
-  uint64_t Addr1 = 0x11223344;
-  LT.addExtendedOpcode(5, DW_LNE_set_address, {{Addr1, LineTable::Long}});
-  LT.addStandardOpcode(DW_LNS_copy, {});
-  // Show that the expected address size is unchanged, so later valid lines
-  // don't cause a problem.
-  uint64_t Addr2 = 0x1122334455667788;
-  LT.addExtendedOpcode(9, DW_LNE_set_address, {{Addr2, LineTable::Quad}});
-  LT.addExtendedOpcode(1, DW_LNE_end_sequence, {});
-
-  generate();
-
-  auto ExpectedLineTable = Line.getOrParseLineTable(LineData, 0, *Context,
-                                                    nullptr, RecordRecoverable);
-  EXPECT_THAT_ERROR(std::move(Recoverable),
-                    FailedWithMessage("mismatching address size at offset "
-                                      "0x00000030 expected 0x08 found 0x04"));
-  ASSERT_THAT_EXPECTED(ExpectedLineTable, Succeeded());
-  ASSERT_EQ((*ExpectedLineTable)->Rows.size(), 2u);
-  EXPECT_EQ((*ExpectedLineTable)->Sequences.size(), 1u);
-  EXPECT_EQ((*ExpectedLineTable)->Rows[0].Address.Address, Addr1);
-  EXPECT_EQ((*ExpectedLineTable)->Rows[1].Address.Address, Addr2);
-}
-
-TEST_F(DebugLineBasicFixture,
-       ErrorForMismatchedAddressSizeUnsetInitialAddress) {
-  if (!setupGenerator(4, 0))
-    return;
-
-  LineTable &LT = Gen->addLineTable();
-  uint64_t Addr1 = 0x11223344;
-  LT.addExtendedOpcode(5, DW_LNE_set_address, {{Addr1, LineTable::Long}});
-  LT.addStandardOpcode(DW_LNS_copy, {});
-  uint64_t Addr2 = 0x1122334455667788;
-  LT.addExtendedOpcode(9, DW_LNE_set_address, {{Addr2, LineTable::Quad}});
-  LT.addExtendedOpcode(1, DW_LNE_end_sequence, {});
-
-  generate();
-
-  auto ExpectedLineTable = Line.getOrParseLineTable(LineData, 0, *Context,
-                                                    nullptr, RecordRecoverable);
-  EXPECT_THAT_ERROR(std::move(Recoverable),
-                    FailedWithMessage("mismatching address size at offset "
-                                      "0x00000038 expected 0x04 found 0x08"));
-  ASSERT_THAT_EXPECTED(ExpectedLineTable, Succeeded());
-  ASSERT_EQ((*ExpectedLineTable)->Rows.size(), 2u);
-  EXPECT_EQ((*ExpectedLineTable)->Sequences.size(), 1u);
-  EXPECT_EQ((*ExpectedLineTable)->Rows[0].Address.Address, Addr1);
-  EXPECT_EQ((*ExpectedLineTable)->Rows[1].Address.Address, Addr2);
-}
-
-TEST_F(DebugLineBasicFixture,
-       ErrorForUnsupportedAddressSizeInSetAddressLength) {
-  // Use DWARF v4, and 0 for data extractor address size so that the address
-  // size is derived from the opcode length.
-  if (!setupGenerator(4, 0))
-    return;
-
-  LineTable &LT = Gen->addLineTable();
-  // 4 == length of the extended opcode, i.e. 1 for the opcode itself and 3 for
-  // the Half (2) + Byte (1) operand, representing the unsupported address size.
-  LT.addExtendedOpcode(4, DW_LNE_set_address,
-                       {{0x1234, LineTable::Half}, {0x56, LineTable::Byte}});
-  LT.addStandardOpcode(DW_LNS_copy, {});
-  // Special opcode to ensure the address has changed between the first and last
-  // row in the sequence. Without this, the sequence will not be recorded.
-  LT.addByte(0xaa);
-  LT.addExtendedOpcode(1, DW_LNE_end_sequence, {});
-
-  generate();
-
-  auto ExpectedLineTable = Line.getOrParseLineTable(LineData, 0, *Context,
-                                                    nullptr, RecordRecoverable);
-  EXPECT_THAT_ERROR(
-      std::move(Recoverable),
-      FailedWithMessage("address size 0x03 of DW_LNE_set_address opcode at "
-                        "offset 0x00000030 is unsupported"));
-  ASSERT_THAT_EXPECTED(ExpectedLineTable, Succeeded());
-  ASSERT_EQ((*ExpectedLineTable)->Rows.size(), 3u);
-  EXPECT_EQ((*ExpectedLineTable)->Sequences.size(), 1u);
-  // Show that the set address opcode is ignored in this case.
-  EXPECT_EQ((*ExpectedLineTable)->Rows[0].Address.Address, 0u);
-}
-
-TEST_F(DebugLineBasicFixture, ErrorForAddressSizeGreaterThanByteSize) {
-  // Use DWARF v4, and 0 for data extractor address size so that the address
-  // size is derived from the opcode length.
-  if (!setupGenerator(4, 0))
-    return;
-
-  LineTable &LT = Gen->addLineTable();
-  // Specifically use an operand size that has a trailing byte of a supported
-  // size (8), so that any potential truncation would result in a valid size.
-  std::vector<LineTable::ValueAndLength> Operands(0x108);
-  LT.addExtendedOpcode(Operands.size() + 1, DW_LNE_set_address, Operands);
-  LT.addExtendedOpcode(1, DW_LNE_end_sequence, {});
-
-  generate();
-
-  auto ExpectedLineTable = Line.getOrParseLineTable(LineData, 0, *Context,
-                                                    nullptr, RecordRecoverable);
-  EXPECT_THAT_ERROR(
-      std::move(Recoverable),
-      FailedWithMessage("address size 0x108 of DW_LNE_set_address opcode at "
-                        "offset 0x00000031 is unsupported"));
-  ASSERT_THAT_EXPECTED(ExpectedLineTable, Succeeded());
-}
-
-TEST_F(DebugLineBasicFixture, ErrorForUnsupportedAddressSizeDefinedInHeader) {
-  // Use 0 for data extractor address size so that it does not clash with the
-  // header address size.
-  if (!setupGenerator(5, 0))
-    return;
-
-  LineTable &LT = Gen->addLineTable();
-  // AddressSize + 1 == length of the extended opcode, i.e. 1 for the opcode
-  // itself and 9 for the Quad (8) + Byte (1) operand representing the
-  // unsupported address size.
-  uint8_t AddressSize = 9;
-  LT.addExtendedOpcode(AddressSize + 1, DW_LNE_set_address,
-                       {{0x12345678, LineTable::Quad}, {0, LineTable::Byte}});
-  LT.addStandardOpcode(DW_LNS_copy, {});
-  // Special opcode to ensure the address has changed between the first and last
-  // row in the sequence. Without this, the sequence will not be recorded.
-  LT.addByte(0xaa);
-  LT.addExtendedOpcode(1, DW_LNE_end_sequence, {});
-  DWARFDebugLine::Prologue Prologue = LT.createBasicPrologue();
-  Prologue.FormParams.AddrSize = AddressSize;
-  LT.setPrologue(Prologue);
-
-  generate();
-
-  auto ExpectedLineTable = Line.getOrParseLineTable(LineData, 0, *Context,
-                                                    nullptr, RecordRecoverable);
-  EXPECT_THAT_ERROR(
-      std::move(Recoverable),
-      FailedWithMessage("address size 0x09 of DW_LNE_set_address opcode at "
-                        "offset 0x00000038 is unsupported"));
-  ASSERT_THAT_EXPECTED(ExpectedLineTable, Succeeded());
-  ASSERT_EQ((*ExpectedLineTable)->Rows.size(), 3u);
-  EXPECT_EQ((*ExpectedLineTable)->Sequences.size(), 1u);
-  // Show that the set address opcode is ignored in this case.
-  EXPECT_EQ((*ExpectedLineTable)->Rows[0].Address.Address, 0u);
-}
-
-TEST_F(DebugLineBasicFixture, CallbackUsedForUnterminatedSequence) {
-  if (!setupGenerator())
-    return;
-
-  LineTable &LT = Gen->addLineTable();
-  LT.addExtendedOpcode(9, DW_LNE_set_address,
-                       {{0x1122334455667788, LineTable::Quad}});
-  LT.addStandardOpcode(DW_LNS_copy, {});
-  LT.addByte(0xaa);
-  LT.addExtendedOpcode(1, DW_LNE_end_sequence, {});
-  LT.addExtendedOpcode(9, DW_LNE_set_address,
-                       {{0x99aabbccddeeff00, LineTable::Quad}});
-  LT.addStandardOpcode(DW_LNS_copy, {});
-  LT.addByte(0xbb);
-  LT.addByte(0xcc);
-
-  generate();
-
-  auto ExpectedLineTable = Line.getOrParseLineTable(LineData, 0, *Context,
-                                                    nullptr, RecordRecoverable);
-  EXPECT_THAT_ERROR(std::move(Recoverable),
-                    FailedWithMessage("last sequence in debug line table at "
-                                      "offset 0x00000000 is not terminated"));
-  ASSERT_THAT_EXPECTED(ExpectedLineTable, Succeeded());
-  EXPECT_EQ((*ExpectedLineTable)->Rows.size(), 6u);
-  // The unterminated sequence is not added to the sequence list.
-  EXPECT_EQ((*ExpectedLineTable)->Sequences.size(), 1u);
-}
-
-struct AdjustAddressFixtureBase : public CommonFixture {
-  virtual ~AdjustAddressFixtureBase() {}
-
-  // Create and update the prologue as specified by the subclass, then return
-  // the length of the table.
-  virtual uint64_t editPrologue(LineTable &LT) = 0;
-
-  virtual uint64_t getAdjustedAddr(uint64_t Base, uint64_t ConstIncrs,
-                                   uint64_t SpecialIncrs,
-                                   uint64_t AdvanceIncrs) {
-    return Base + ConstIncrs + SpecialIncrs + AdvanceIncrs;
-  }
-
-  virtual uint64_t getAdjustedLine(uint64_t Base, uint64_t Incr) {
-    return Base + Incr;
-  }
-
-  uint64_t setupNoProblemTable() {
-    LineTable &NoProblem = Gen->addLineTable();
-    NoProblem.addExtendedOpcode(9, DW_LNE_set_address,
-                                {{0xabcd, LineTable::Quad}});
-    NoProblem.addExtendedOpcode(1, DW_LNE_end_sequence, {});
-    return editPrologue(NoProblem);
-  }
-
-  uint64_t setupConstAddPcFirstTable() {
-    LineTable &ConstAddPCFirst = Gen->addLineTable();
-    ConstAddPCFirst.addExtendedOpcode(9, DW_LNE_set_address,
-                                      {{ConstAddPCAddr, LineTable::Quad}});
-    ConstAddPCFirst.addStandardOpcode(DW_LNS_const_add_pc, {});
-    ConstAddPCFirst.addStandardOpcode(DW_LNS_const_add_pc, {});
-    ConstAddPCFirst.addStandardOpcode(DW_LNS_advance_pc,
-                                      {{0x10, LineTable::ULEB}});
-    ConstAddPCFirst.addByte(0x21); // Special opcode, +1 op, +1 line.
-    ConstAddPCFirst.addExtendedOpcode(1, DW_LNE_end_sequence, {});
-    return editPrologue(ConstAddPCFirst);
-  }
-
-  uint64_t setupSpecialFirstTable() {
-    LineTable &SpecialFirst = Gen->addLineTable();
-    SpecialFirst.addExtendedOpcode(9, DW_LNE_set_address,
-                                   {{SpecialAddr, LineTable::Quad}});
-    SpecialFirst.addByte(0x22); // Special opcode, +1 op, +2 line.
-    SpecialFirst.addStandardOpcode(DW_LNS_const_add_pc, {});
-    SpecialFirst.addStandardOpcode(DW_LNS_advance_pc,
-                                   {{0x20, LineTable::ULEB}});
-    SpecialFirst.addByte(0x23); // Special opcode, +1 op, +3 line.
-    SpecialFirst.addExtendedOpcode(1, DW_LNE_end_sequence, {});
-    return editPrologue(SpecialFirst);
-  }
-
-  uint64_t setupAdvancePcFirstTable() {
-    LineTable &AdvancePCFirst = Gen->addLineTable();
-    AdvancePCFirst.addExtendedOpcode(9, DW_LNE_set_address,
-                                     {{AdvancePCAddr, LineTable::Quad}});
-    AdvancePCFirst.addStandardOpcode(DW_LNS_advance_pc,
-                                     {{0x30, LineTable::ULEB}});
-    AdvancePCFirst.addStandardOpcode(DW_LNS_const_add_pc, {});
-    AdvancePCFirst.addStandardOpcode(DW_LNS_advance_pc,
-                                     {{0x40, LineTable::ULEB}});
-    AdvancePCFirst.addByte(0x24); // Special opcode, +1 op, +4 line.
-    AdvancePCFirst.addExtendedOpcode(1, DW_LNE_end_sequence, {});
-    return editPrologue(AdvancePCFirst);
-  }
-
-  void setupTables(bool AddAdvancePCFirstTable) {
-    LineTable &Padding = Gen->addLineTable();
-    Padding.setCustomPrologue({{0, LineTable::Byte}});
-    NoProblemOffset = 1;
-
-    // Show that no warning is generated for the case where no
-    // DW_LNS_const_add_pc or special opcode is used.
-    ConstAddPCOffset = setupNoProblemTable() + NoProblemOffset;
-
-    // Show that the warning is emitted for the first DW_LNS_const_add_pc opcode
-    // and then not again.
-    SpecialOffset = setupConstAddPcFirstTable() + ConstAddPCOffset;
-
-    // Show that the warning is emitted for the first special opcode and then
-    // not again.
-    AdvancePCOffset = setupSpecialFirstTable() + SpecialOffset;
-
-    // Show that the warning is emitted for the first DW_LNS_advance_pc opcode
-    // (if requested) and then not again.
-    if (AddAdvancePCFirstTable)
-      setupAdvancePcFirstTable();
-  }
-
-  Expected<const DWARFDebugLine::LineTable *>
-  checkTable(uint64_t Offset, StringRef OpcodeType, const Twine &MsgSuffix) {
-    auto ExpectedTable = Line.getOrParseLineTable(LineData, Offset, *Context,
-                                                  nullptr, RecordRecoverable);
-    EXPECT_THAT_ERROR(std::move(Unrecoverable), Succeeded());
-    if (!IsErrorExpected) {
-      EXPECT_THAT_ERROR(std::move(Recoverable), Succeeded());
-    } else {
-      if (!ExpectedTable)
-        return ExpectedTable;
-      uint64_t ExpectedOffset = Offset +
-                                (*ExpectedTable)->Prologue.getLength() +
-                                11; // 11 == size of DW_LNE_set_address.
-      std::string OffsetHex = Twine::utohexstr(Offset).str();
-      std::string OffsetZeroes = std::string(8 - OffsetHex.size(), '0');
-      std::string ExpectedHex = Twine::utohexstr(ExpectedOffset).str();
-      std::string ExpectedZeroes = std::string(8 - ExpectedHex.size(), '0');
-      EXPECT_THAT_ERROR(
-          std::move(Recoverable),
-          FailedWithMessage(("line table program at offset 0x" + OffsetZeroes +
-                             OffsetHex + " contains a " + OpcodeType +
-                             " opcode at offset 0x" + ExpectedZeroes +
-                             ExpectedHex + ", " + MsgSuffix)
-                                .str()));
-    }
-    return ExpectedTable;
-  }
-
-  void runTest(bool CheckAdvancePC, Twine MsgSuffix) {
-    if (!setupGenerator(Version))
-      return;
-
-    setupTables(/*AddAdvancePCFirstTable=*/CheckAdvancePC);
-
-    generate();
-
-    auto ExpectedNoProblem = Line.getOrParseLineTable(
-        LineData, NoProblemOffset, *Context, nullptr, RecordRecoverable);
-    EXPECT_THAT_ERROR(std::move(Recoverable), Succeeded());
-    EXPECT_THAT_ERROR(std::move(Unrecoverable), Succeeded());
-    ASSERT_THAT_EXPECTED(ExpectedNoProblem, Succeeded());
-
-    auto ExpectedConstAddPC =
-        checkTable(ConstAddPCOffset, "DW_LNS_const_add_pc", MsgSuffix);
-    ASSERT_THAT_EXPECTED(ExpectedConstAddPC, Succeeded());
-    ASSERT_EQ((*ExpectedConstAddPC)->Rows.size(), 2u);
-    EXPECT_EQ((*ExpectedConstAddPC)->Rows[0].Address.Address,
-              getAdjustedAddr(ConstAddPCAddr, ConstIncr * 2, 0x1, 0x10));
-    EXPECT_EQ((*ExpectedConstAddPC)->Rows[0].Line, getAdjustedLine(1, 1));
-    EXPECT_THAT_ERROR(std::move(Unrecoverable), Succeeded());
-
-    auto ExpectedSpecial = checkTable(SpecialOffset, "special", MsgSuffix);
-    ASSERT_THAT_EXPECTED(ExpectedSpecial, Succeeded());
-    ASSERT_EQ((*ExpectedSpecial)->Rows.size(), 3u);
-    EXPECT_EQ((*ExpectedSpecial)->Rows[0].Address.Address,
-              getAdjustedAddr(SpecialAddr, 0, 1, 0));
-    EXPECT_EQ((*ExpectedSpecial)->Rows[0].Line, getAdjustedLine(1, 2));
-    EXPECT_EQ((*ExpectedSpecial)->Rows[1].Address.Address,
-              getAdjustedAddr(SpecialAddr, ConstIncr, 0x2, 0x20));
-    EXPECT_EQ((*ExpectedSpecial)->Rows[1].Line, getAdjustedLine(1, 5));
-    EXPECT_THAT_ERROR(std::move(Unrecoverable), Succeeded());
-
-    if (!CheckAdvancePC)
-      return;
-
-    auto ExpectedAdvancePC =
-        checkTable(AdvancePCOffset, "DW_LNS_advance_pc", MsgSuffix);
-    ASSERT_THAT_EXPECTED(ExpectedAdvancePC, Succeeded());
-    ASSERT_EQ((*ExpectedAdvancePC)->Rows.size(), 2u);
-    EXPECT_EQ((*ExpectedAdvancePC)->Rows[0].Address.Address,
-              getAdjustedAddr(AdvancePCAddr, ConstIncr, 0x1, 0x70));
-    EXPECT_EQ((*ExpectedAdvancePC)->Rows[0].Line, getAdjustedLine(1, 4));
-  }
-
-  uint64_t ConstIncr = 0x11;
-  uint64_t ConstAddPCAddr = 0x1234;
-  uint64_t SpecialAddr = 0x5678;
-  uint64_t AdvancePCAddr = 0xabcd;
-  uint64_t NoProblemOffset;
-  uint64_t ConstAddPCOffset;
-  uint64_t SpecialOffset;
-  uint64_t AdvancePCOffset;
-
-  uint16_t Version = 4;
-  bool IsErrorExpected;
-};
-
-struct MaxOpsPerInstFixture
-    : TestWithParam<std::tuple<uint16_t, uint8_t, bool>>,
-      AdjustAddressFixtureBase {
-  void SetUp() override {
-    std::tie(Version, MaxOpsPerInst, IsErrorExpected) = GetParam();
-  }
-
-  uint64_t editPrologue(LineTable &LT) override {
-    DWARFDebugLine::Prologue Prologue = LT.createBasicPrologue();
-    Prologue.MaxOpsPerInst = MaxOpsPerInst;
-    LT.setPrologue(Prologue);
-    return Prologue.TotalLength + Prologue.sizeofTotalLength();
-  }
-
-  uint8_t MaxOpsPerInst;
-};
-
-TEST_P(MaxOpsPerInstFixture, MaxOpsPerInstProblemsReportedCorrectly) {
-  runTest(/*CheckAdvancePC=*/true,
-          "but the prologue maximum_operations_per_instruction value is " +
-              Twine(unsigned(MaxOpsPerInst)) +
-              ", which is unsupported. Assuming a value of 1 instead");
-}
-
-INSTANTIATE_TEST_SUITE_P(
-    MaxOpsPerInstParams, MaxOpsPerInstFixture,
-    Values(std::make_tuple(3, 0, false), // Test for version < 4 (no error).
-           std::make_tuple(4, 0, true),  // Test zero value for V4 (error).
-           std::make_tuple(4, 1, false), // Test good value for V4 (no error).
-           std::make_tuple(
-               4, 2, true))); // Test one higher than permitted V4 (error).
-
-struct LineRangeFixture : TestWithParam<std::tuple<uint8_t, bool>>,
-                          AdjustAddressFixtureBase {
-  void SetUp() override { std::tie(LineRange, IsErrorExpected) = GetParam(); }
-
-  uint64_t editPrologue(LineTable &LT) override {
-    DWARFDebugLine::Prologue Prologue = LT.createBasicPrologue();
-    Prologue.LineRange = LineRange;
-    LT.setPrologue(Prologue);
-    return Prologue.TotalLength + Prologue.sizeofTotalLength();
-  }
-
-  uint64_t getAdjustedAddr(uint64_t Base, uint64_t ConstIncr,
-                           uint64_t SpecialIncr,
-                           uint64_t AdvanceIncr) override {
-    if (LineRange == 0)
-      return Base + AdvanceIncr;
-    return AdjustAddressFixtureBase::getAdjustedAddr(Base, ConstIncr,
-                                                     SpecialIncr, AdvanceIncr);
-  }
-
-  uint64_t getAdjustedLine(uint64_t Base, uint64_t Incr) override {
-    return LineRange != 0
-               ? AdjustAddressFixtureBase::getAdjustedLine(Base, Incr)
-               : Base;
-  }
-
-  uint8_t LineRange;
-};
-
-TEST_P(LineRangeFixture, LineRangeProblemsReportedCorrectly) {
-  runTest(/*CheckAdvancePC=*/false,
-          "but the prologue line_range value is 0. The address and line will "
-          "not be adjusted");
-}
-
-INSTANTIATE_TEST_SUITE_P(
-    LineRangeParams, LineRangeFixture,
-    Values(std::make_tuple(0, true),     // Test zero value (error).
-           std::make_tuple(14, false))); // Test non-zero value (no error).
-
-struct BadMinInstLenFixture : TestWithParam<std::tuple<uint8_t, bool>>,
-                              AdjustAddressFixtureBase {
-  void SetUp() override {
-    std::tie(MinInstLength, IsErrorExpected) = GetParam();
-  }
-
-  uint64_t editPrologue(LineTable &LT) override {
-    DWARFDebugLine::Prologue Prologue = LT.createBasicPrologue();
-    Prologue.MinInstLength = MinInstLength;
-    LT.setPrologue(Prologue);
-    return Prologue.TotalLength + Prologue.sizeofTotalLength();
-  }
-
-  uint64_t getAdjustedAddr(uint64_t Base, uint64_t ConstIncr,
-                           uint64_t SpecialIncr,
-                           uint64_t AdvanceIncr) override {
-    return MinInstLength != 0 ? AdjustAddressFixtureBase::getAdjustedAddr(
-                                    Base, ConstIncr, SpecialIncr, AdvanceIncr)
-                              : Base;
-  }
-
-  uint8_t MinInstLength;
-};
-
-TEST_P(BadMinInstLenFixture, MinInstLengthProblemsReportedCorrectly) {
-  runTest(/*CheckAdvancePC=*/true,
-          "but the prologue minimum_instruction_length value is 0, which "
-          "prevents any address advancing");
-}
-
-INSTANTIATE_TEST_SUITE_P(
-    BadMinInstLenParams, BadMinInstLenFixture,
-    Values(std::make_tuple(0, true),    // Test zero value (error).
-           std::make_tuple(1, false))); // Test non-zero value (no error).
-
-TEST_F(DebugLineBasicFixture, ParserParsesCorrectly) {
-  if (!setupGenerator())
-    return;
-
-  DWARFDebugLine::SectionParser Parser = setupParser();
-
-  EXPECT_EQ(Parser.getOffset(), 0u);
-  ASSERT_FALSE(Parser.done());
-
-  DWARFDebugLine::LineTable Parsed =
-      Parser.parseNext(RecordRecoverable, RecordUnrecoverable);
-  checkDefaultPrologue(4, DWARF32, Parsed.Prologue, 16);
-  EXPECT_EQ(Parsed.Sequences.size(), 1u);
-  EXPECT_EQ(Parser.getOffset(), 62u);
-  ASSERT_FALSE(Parser.done());
-
-  DWARFDebugLine::LineTable Parsed2 =
-      Parser.parseNext(RecordRecoverable, RecordUnrecoverable);
-  checkDefaultPrologue(4, DWARF64, Parsed2.Prologue, 16);
-  EXPECT_EQ(Parsed2.Sequences.size(), 1u);
-  EXPECT_EQ(Parser.getOffset(), 136u);
-  EXPECT_TRUE(Parser.done());
-
-  EXPECT_FALSE(Recoverable);
-  EXPECT_FALSE(Unrecoverable);
-}
-
-TEST_F(DebugLineBasicFixture, ParserSkipsCorrectly) {
-  if (!setupGenerator())
-    return;
-
-  DWARFDebugLine::SectionParser Parser = setupParser();
-
-  EXPECT_EQ(Parser.getOffset(), 0u);
-  ASSERT_FALSE(Parser.done());
-
-  Parser.skip(RecordRecoverable, RecordUnrecoverable);
-  EXPECT_EQ(Parser.getOffset(), 62u);
-  ASSERT_FALSE(Parser.done());
-
-  Parser.skip(RecordRecoverable, RecordUnrecoverable);
-  EXPECT_EQ(Parser.getOffset(), 136u);
-  EXPECT_TRUE(Parser.done());
-
-  EXPECT_FALSE(Recoverable);
-  EXPECT_FALSE(Unrecoverable);
-}
-
-TEST_F(DebugLineBasicFixture, ParserAlwaysDoneForEmptySection) {
-  if (!setupGenerator())
-    return;
-
-  generate();
-  DWARFDebugLine::SectionParser Parser(LineData, *Context, Units);
-
-  EXPECT_TRUE(Parser.done());
-}
-
-TEST_F(DebugLineBasicFixture, ParserMarkedAsDoneForBadLengthWhenParsing) {
-  if (!setupGenerator())
-    return;
-
-  LineTable &LT = Gen->addLineTable();
-  LT.setCustomPrologue({{0xfffffff0, LineTable::Long}});
-  Gen->addLineTable();
-  generate();
-
-  DWARFDebugLine::SectionParser Parser(LineData, *Context, Units);
-  Parser.parseNext(RecordRecoverable, RecordUnrecoverable);
-
-  EXPECT_EQ(Parser.getOffset(), 0u);
-  EXPECT_TRUE(Parser.done());
-  EXPECT_FALSE(Recoverable);
-
-  EXPECT_THAT_ERROR(
-      std::move(Unrecoverable),
-      FailedWithMessage(
-          "parsing line table prologue at offset 0x00000000: unsupported "
-          "reserved unit length of value 0xfffffff0"));
-}
-
-TEST_F(DebugLineBasicFixture, ParserMarkedAsDoneForBadLengthWhenSkipping) {
-  if (!setupGenerator())
-    return;
-
-  LineTable &LT = Gen->addLineTable();
-  LT.setCustomPrologue({{0xfffffff0, LineTable::Long}});
-  Gen->addLineTable();
-  generate();
-
-  DWARFDebugLine::SectionParser Parser(LineData, *Context, Units);
-  Parser.skip(RecordRecoverable, RecordUnrecoverable);
-
-  EXPECT_EQ(Parser.getOffset(), 0u);
-  EXPECT_TRUE(Parser.done());
-  EXPECT_FALSE(Recoverable);
-
-  EXPECT_THAT_ERROR(
-      std::move(Unrecoverable),
-      FailedWithMessage(
-          "parsing line table prologue at offset 0x00000000: unsupported "
-          "reserved unit length of value 0xfffffff0"));
-}
-
-TEST_F(DebugLineBasicFixture, ParserReportsFirstErrorInEachTableWhenParsing) {
-  if (!setupGenerator())
-    return;
-
-  LineTable &LT = Gen->addLineTable(DWARF32);
-  LT.setCustomPrologue({{2, LineTable::Long}, {0, LineTable::Half}});
-  LineTable &LT2 = Gen->addLineTable(DWARF32);
-  LT2.setCustomPrologue({{2, LineTable::Long}, {1, LineTable::Half}});
-  generate();
-
-  DWARFDebugLine::SectionParser Parser(LineData, *Context, Units);
-  Parser.parseNext(RecordRecoverable, RecordUnrecoverable);
-  ASSERT_FALSE(Parser.done());
-  Parser.parseNext(RecordRecoverable, RecordUnrecoverable);
-
-  EXPECT_TRUE(Parser.done());
-  EXPECT_THAT_ERROR(std::move(Recoverable), Succeeded());
-
-  EXPECT_THAT_ERROR(
-      std::move(Unrecoverable),
-      FailedWithMessage("parsing line table prologue at offset 0x00000000: "
-                        "unsupported version 0",
-                        "parsing line table prologue at offset 0x00000006: "
-                        "unsupported version 1"));
-}
-
-TEST_F(DebugLineBasicFixture, ParserReportsNonPrologueProblemsWhenParsing) {
-  if (!setupGenerator())
-    return;
-
-  LineTable &LT = Gen->addLineTable(DWARF32);
-  LT.addExtendedOpcode(0x42, DW_LNE_end_sequence, {});
-  LineTable &LT2 = Gen->addLineTable(DWARF32);
-  LT2.addExtendedOpcode(9, DW_LNE_set_address,
-                        {{0x1234567890abcdef, LineTable::Quad}});
-  LT2.addStandardOpcode(DW_LNS_copy, {});
-  LT2.addByte(0xbb);
-  generate();
-
-  DWARFDebugLine::SectionParser Parser(LineData, *Context, Units);
-  Parser.parseNext(RecordRecoverable, RecordUnrecoverable);
-  EXPECT_FALSE(Unrecoverable);
-  ASSERT_FALSE(Parser.done());
-  EXPECT_THAT_ERROR(std::move(Recoverable),
-                    FailedWithMessage("unexpected line op length at offset "
-                                      "0x00000030 expected 0x42 found 0x01"));
-
-  // Reset the error state so that it does not confuse the next set of checks.
-  Unrecoverable = Error::success();
-  Parser.parseNext(RecordRecoverable, RecordUnrecoverable);
-
-  EXPECT_TRUE(Parser.done());
-  EXPECT_THAT_ERROR(std::move(Recoverable),
-                    FailedWithMessage("last sequence in debug line table at "
-                                      "offset 0x00000031 is not terminated"));
-  EXPECT_FALSE(Unrecoverable);
-}
-
-TEST_F(DebugLineBasicFixture,
-       ParserReportsPrologueErrorsInEachTableWhenSkipping) {
-  if (!setupGenerator())
-    return;
-
-  LineTable &LT = Gen->addLineTable(DWARF32);
-  LT.setCustomPrologue({{2, LineTable::Long}, {0, LineTable::Half}});
-  LineTable &LT2 = Gen->addLineTable(DWARF32);
-  LT2.setCustomPrologue({{2, LineTable::Long}, {1, LineTable::Half}});
-  generate();
-
-  DWARFDebugLine::SectionParser Parser(LineData, *Context, Units);
-  Parser.skip(RecordRecoverable, RecordUnrecoverable);
-  ASSERT_FALSE(Parser.done());
-  Parser.skip(RecordRecoverable, RecordUnrecoverable);
-
-  EXPECT_TRUE(Parser.done());
-  EXPECT_FALSE(Recoverable);
-
-  EXPECT_THAT_ERROR(
-      std::move(Unrecoverable),
-      FailedWithMessage("parsing line table prologue at offset 0x00000000: "
-                        "unsupported version 0",
-                        "parsing line table prologue at offset 0x00000006: "
-                        "unsupported version 1"));
-}
-
-TEST_F(DebugLineBasicFixture, ParserIgnoresNonPrologueErrorsWhenSkipping) {
-  if (!setupGenerator())
-    return;
-
-  LineTable &LT = Gen->addLineTable(DWARF32);
-  LT.addExtendedOpcode(42, DW_LNE_end_sequence, {});
-  generate();
-
-  DWARFDebugLine::SectionParser Parser(LineData, *Context, Units);
-  Parser.skip(RecordRecoverable, RecordUnrecoverable);
-
-  EXPECT_TRUE(Parser.done());
-  EXPECT_FALSE(Recoverable);
-  EXPECT_FALSE(Unrecoverable);
-}
-
-TEST_F(DebugLineBasicFixture, VerboseOutput) {
-  if (!setupGenerator(5))
-    return;
-
-  LineTable &LT = Gen->addLineTable();
-  LT.addByte(0); // Extended opcode with zero length.
-  LT.addByte(0);
-  // Zero-value extended opcode.
-  LT.addExtendedOpcode(2, 0, {{1, LineTable::Byte}});
-  // Unknown extended opcode.
-  LT.addExtendedOpcode(2, 0x42, {{1, LineTable::Byte}});
-  LT.addExtendedOpcode(9, DW_LNE_set_address,
-                       {{0x123456789abcdef, LineTable::Quad}});
-  LT.addExtendedOpcode(6, DW_LNE_define_file,
-                       {{'a', LineTable::Byte},
-                        {'\0', LineTable::Byte},
-                        {2, LineTable::ULEB},
-                        {3, LineTable::ULEB},
-                        {4, LineTable::ULEB}});
-  LT.addExtendedOpcode(2, DW_LNE_set_discriminator, {{0x7f, LineTable::ULEB}});
-  LT.addStandardOpcode(DW_LNS_copy, {});
-  LT.addStandardOpcode(DW_LNS_advance_pc, {{11, LineTable::ULEB}});
-  LT.addStandardOpcode(DW_LNS_advance_line, {{22, LineTable::SLEB}});
-  LT.addStandardOpcode(DW_LNS_set_file, {{33, LineTable::ULEB}});
-  LT.addStandardOpcode(DW_LNS_set_column, {{44, LineTable::ULEB}});
-  LT.addStandardOpcode(DW_LNS_negate_stmt, {});
-  LT.addStandardOpcode(DW_LNS_set_basic_block, {});
-  LT.addStandardOpcode(DW_LNS_const_add_pc, {});
-  LT.addStandardOpcode(DW_LNS_fixed_advance_pc, {{55, LineTable::Half}});
-  LT.addStandardOpcode(DW_LNS_set_prologue_end, {});
-  LT.addStandardOpcode(DW_LNS_set_epilogue_begin, {});
-  LT.addStandardOpcode(DW_LNS_set_isa, {{66, LineTable::ULEB}});
-  // Add unknown standard opcode with operands.
-  LT.addStandardOpcode(
-      0xd, {{1, LineTable::ULEB}, {0x123456789abcdef, LineTable::ULEB}});
-  // Add unknown standard opcode without operands.
-  LT.addStandardOpcode(0xe, {});
-  LT.addByte(0xff); // Special opcode.
-  LT.addExtendedOpcode(1, DW_LNE_end_sequence, {});
-
-  // Adjust the prologue to account for the extra standard opcode.
-  DWARFDebugLine::Prologue Prologue = LT.createBasicPrologue();
-  Prologue.TotalLength += 2;
-  Prologue.PrologueLength += 2;
-  Prologue.OpcodeBase += 2;
-  Prologue.StandardOpcodeLengths.push_back(2);
-  Prologue.StandardOpcodeLengths.push_back(0);
-  LT.setPrologue(Prologue);
-
-  generate();
-
-  DWARFDebugLine::SectionParser Parser(LineData, *Context, Units);
-  std::string Output;
-  raw_string_ostream OS(Output);
-  Parser.parseNext(RecordRecoverable, RecordUnrecoverable, &OS,
-                   /*Verbose=*/true);
-  OS.flush();
-  StringRef OutputRef(Output);
-
-  size_t Pos = 0;
-  auto NextLine = [&Pos, &OutputRef]() {
-    size_t EOL = OutputRef.find_first_of('\n', Pos);
-    StringRef Line = OutputRef.substr(Pos, EOL - Pos);
-    Pos = EOL + 1;
-    return Line;
-  };
-  EXPECT_EQ(NextLine(), "Line table prologue:");
-  EXPECT_EQ(NextLine(), "    total_length: 0x00000078");
-  EXPECT_EQ(NextLine(), "          format: DWARF32");
-  EXPECT_EQ(NextLine(), "         version: 5");
-  EXPECT_EQ(NextLine(), "    address_size: 8");
-  EXPECT_EQ(NextLine(), " seg_select_size: 0");
-  EXPECT_EQ(NextLine(), " prologue_length: 0x0000002c");
-  EXPECT_EQ(NextLine(), " min_inst_length: 1");
-  EXPECT_EQ(NextLine(), "max_ops_per_inst: 1");
-  EXPECT_EQ(NextLine(), " default_is_stmt: 1");
-  EXPECT_EQ(NextLine(), "       line_base: -5");
-  EXPECT_EQ(NextLine(), "      line_range: 14");
-  EXPECT_EQ(NextLine(), "     opcode_base: 15");
-  EXPECT_EQ(NextLine(), "standard_opcode_lengths[DW_LNS_copy] = 0");
-  EXPECT_EQ(NextLine(), "standard_opcode_lengths[DW_LNS_advance_pc] = 1");
-  EXPECT_EQ(NextLine(), "standard_opcode_lengths[DW_LNS_advance_line] = 1");
-  EXPECT_EQ(NextLine(), "standard_opcode_lengths[DW_LNS_set_file] = 1");
-  EXPECT_EQ(NextLine(), "standard_opcode_lengths[DW_LNS_set_column] = 1");
-  EXPECT_EQ(NextLine(), "standard_opcode_lengths[DW_LNS_negate_stmt] = 0");
-  EXPECT_EQ(NextLine(), "standard_opcode_lengths[DW_LNS_set_basic_block] = 0");
-  EXPECT_EQ(NextLine(), "standard_opcode_lengths[DW_LNS_const_add_pc] = 0");
-  EXPECT_EQ(NextLine(), "standard_opcode_lengths[DW_LNS_fixed_advance_pc] = 1");
-  EXPECT_EQ(NextLine(), "standard_opcode_lengths[DW_LNS_set_prologue_end] = 0");
-  EXPECT_EQ(NextLine(),
-            "standard_opcode_lengths[DW_LNS_set_epilogue_begin] = 0");
-  EXPECT_EQ(NextLine(), "standard_opcode_lengths[DW_LNS_set_isa] = 1");
-  EXPECT_EQ(NextLine(), "standard_opcode_lengths[DW_LNS_unknown_d] = 2");
-  EXPECT_EQ(NextLine(), "standard_opcode_lengths[DW_LNS_unknown_e] = 0");
-  EXPECT_EQ(NextLine(), "include_directories[  0] = \"a dir\"");
-  EXPECT_EQ(NextLine(), "file_names[  0]:");
-  EXPECT_EQ(NextLine(), "           name: \"a file\"");
-  EXPECT_EQ(NextLine(), "      dir_index: 0");
-  EXPECT_EQ(NextLine(), "");
-  EXPECT_EQ(NextLine(), "            Address            Line   Column File   ISA Discriminator Flags");
-  EXPECT_EQ(NextLine(), "            ------------------ ------ ------ ------ --- ------------- -------------");
-  EXPECT_EQ(NextLine(),
-            "0x00000038: 00 Badly formed extended line op (length 0)");
-  EXPECT_EQ(NextLine(),
-            "0x0000003a: 00 Unrecognized extended op 0x00 length 2");
-  EXPECT_EQ(NextLine(),
-            "0x0000003e: 00 Unrecognized extended op 0x42 length 2");
-  EXPECT_EQ(NextLine(),
-            "0x00000042: 00 DW_LNE_set_address (0x0123456789abcdef)");
-  EXPECT_EQ(NextLine(), "0x0000004d: 00 DW_LNE_define_file (a, dir=2, "
-                        "mod_time=(0x0000000000000003), length=4)");
-  EXPECT_EQ(NextLine(), "0x00000055: 00 DW_LNE_set_discriminator (127)");
-  EXPECT_EQ(NextLine(), "0x00000059: 01 DW_LNS_copy");
-  EXPECT_EQ(NextLine(), "            0x0123456789abcdef      1      0      1   "
-                        "0           127  is_stmt");
-  EXPECT_EQ(NextLine(), "0x0000005a: 02 DW_LNS_advance_pc (11)");
-  EXPECT_EQ(NextLine(), "0x0000005c: 03 DW_LNS_advance_line (23)");
-  EXPECT_EQ(NextLine(), "0x0000005e: 04 DW_LNS_set_file (33)");
-  EXPECT_EQ(NextLine(), "0x00000060: 05 DW_LNS_set_column (44)");
-  EXPECT_EQ(NextLine(), "0x00000062: 06 DW_LNS_negate_stmt");
-  EXPECT_EQ(NextLine(), "0x00000063: 07 DW_LNS_set_basic_block");
-  EXPECT_EQ(NextLine(),
-            "0x00000064: 08 DW_LNS_const_add_pc (0x0000000000000011)");
-  EXPECT_EQ(NextLine(), "0x00000065: 09 DW_LNS_fixed_advance_pc (0x0037)");
-  EXPECT_EQ(NextLine(), "0x00000068: 0a DW_LNS_set_prologue_end");
-  EXPECT_EQ(NextLine(), "0x00000069: 0b DW_LNS_set_epilogue_begin");
-  EXPECT_EQ(NextLine(), "0x0000006a: 0c DW_LNS_set_isa (66)");
-  EXPECT_EQ(NextLine(), "0x0000006c: 0d Unrecognized standard opcode "
-                        "(operands: 0x0000000000000001, 0x0123456789abcdef)");
-  EXPECT_EQ(NextLine(), "0x00000077: 0e Unrecognized standard opcode");
-  EXPECT_EQ(NextLine(), "0x00000078: ff address += 17,  line += -3");
-  EXPECT_EQ(NextLine(),
-            "            0x0123456789abce53     20     44     33  66           "
-            "  0  basic_block prologue_end epilogue_begin");
-  EXPECT_EQ(NextLine(), "0x00000079: 00 DW_LNE_end_sequence");
-  EXPECT_EQ(NextLine(), "            0x0123456789abce53     20     44     33  "
-                        "66             0  end_sequence");
-  EXPECT_EQ(NextLine(), "");
-  EXPECT_EQ(Output.size(), Pos);
-}
-
-struct TruncatedPrologueFixture
-    : public TestWithParam<
-          std::tuple<uint64_t, uint64_t, uint16_t, DwarfFormat, StringRef>>,
-      public CommonFixture {
-  void SetUp() override {
-    std::tie(Length, ExpectedOffset, Version, Format, ExpectedErr) = GetParam();
-  }
-
-  uint64_t Length;
-  uint64_t ExpectedOffset;
-  uint16_t Version;
-  DwarfFormat Format;
-  StringRef ExpectedErr;
-};
-
-TEST_P(TruncatedPrologueFixture, ErrorForTruncatedPrologue) {
-  if (!setupGenerator(Version))
-    return;
-
-  LineTable &Padding = Gen->addLineTable();
-  // Add some padding to show that a non-zero offset is handled correctly.
-  Padding.setCustomPrologue({{0, LineTable::Byte}});
-
-  // Add a table with only two standard opcodes - we don't need to test the full
-  // set.
-  LineTable &Table = Gen->addLineTable(Format);
-  DWARFDebugLine::Prologue InputPrologue = Table.createBasicPrologue();
-  InputPrologue.OpcodeBase = 3;
-  InputPrologue.StandardOpcodeLengths.resize(2);
-  Table.setPrologue(InputPrologue);
-
-  generate();
-  // Truncate the data extractor to the specified length.
-  LineData = DWARFDataExtractor(LineData, Length);
-
-  DWARFDebugLine::Prologue Prologue;
-  uint64_t Offset = 1;
-  Error Err = Prologue.parse(LineData, &Offset, RecordRecoverable, *Context);
-
-  EXPECT_THAT_ERROR(std::move(Err), FailedWithMessage(ExpectedErr.str()));
-  EXPECT_EQ(Offset, ExpectedOffset);
-}
-
-INSTANTIATE_TEST_SUITE_P(
-    TruncatedPrologueParams, TruncatedPrologueFixture,
-    Values(
-        // Truncated length:
-        std::make_tuple(
-            4, 1, 4, DWARF32,
-            "parsing line table prologue at offset 0x00000001: unexpected end "
-            "of data at offset 0x4 while reading [0x1, 0x5)"),
-        std::make_tuple(
-            4, 1, 4, DWARF64,
-            "parsing line table prologue at offset 0x00000001: unexpected end "
-            "of data at offset 0x4 while reading [0x1, 0x5)"),
-        std::make_tuple(
-            0xc, 1, 4, DWARF64,
-            "parsing line table prologue at offset 0x00000001: unexpected end "
-            "of data at offset 0xc while reading [0x5, 0xd)"),
-        // Truncated version:
-        std::make_tuple(
-            6, 5, 4, DWARF32,
-            "parsing line table prologue at offset 0x00000001: unexpected end "
-            "of data at offset 0x6 while reading [0x5, 0x7)"),
-        // Truncated address size:
-        std::make_tuple(
-            7, 7, 5, DWARF32,
-            "parsing line table prologue at offset 0x00000001: unexpected end "
-            "of data at offset 0x7 while reading [0x7, 0x8)"),
-        // Truncated segment selector size:
-        std::make_tuple(
-            8, 8, 5, DWARF32,
-            "parsing line table prologue at offset 0x00000001: unexpected end "
-            "of data at offset 0x8 while reading [0x8, 0x9)"),
-        // Truncated prologue length:
-        std::make_tuple(
-            0xa, 7, 4, DWARF32,
-            "parsing line table prologue at offset 0x00000001: unexpected end "
-            "of data at offset 0xa while reading [0x7, 0xb)"),
-        std::make_tuple(
-            0x16, 0xf, 4, DWARF64,
-            "parsing line table prologue at offset 0x00000001: unexpected end "
-            "of data at offset 0x16 while reading [0xf, 0x17)"),
-        // Truncated min instruction length:
-        std::make_tuple(
-            0xb, 0xb, 4, DWARF32,
-            "parsing line table prologue at offset 0x00000001: unexpected end "
-            "of data at offset 0xb while reading [0xb, 0xc)"),
-        // Truncated max ops per inst:
-        std::make_tuple(
-            0xc, 0xc, 4, DWARF32,
-            "parsing line table prologue at offset 0x00000001: unexpected end "
-            "of data at offset 0xc while reading [0xc, 0xd)"),
-        // Truncated default is stmt:
-        std::make_tuple(
-            0xd, 0xd, 4, DWARF32,
-            "parsing line table prologue at offset 0x00000001: unexpected end "
-            "of data at offset 0xd while reading [0xd, 0xe)"),
-        // Truncated line base:
-        std::make_tuple(
-            0xe, 0xe, 4, DWARF32,
-            "parsing line table prologue at offset 0x00000001: unexpected end "
-            "of data at offset 0xe while reading [0xe, 0xf)"),
-        // Truncated line range:
-        std::make_tuple(
-            0xf, 0xf, 4, DWARF32,
-            "parsing line table prologue at offset 0x00000001: unexpected end "
-            "of data at offset 0xf while reading [0xf, 0x10)"),
-        // Truncated opcode base:
-        std::make_tuple(
-            0x10, 0x10, 4, DWARF32,
-            "parsing line table prologue at offset 0x00000001: unexpected end "
-            "of data at offset 0x10 while reading [0x10, 0x11)"),
-        // Truncated first standard opcode:
-        std::make_tuple(
-            0x11, 0x11, 4, DWARF32,
-            "parsing line table prologue at offset 0x00000001: unexpected end "
-            "of data at offset 0x11 while reading [0x11, 0x12)"),
-        // Truncated second standard opcode:
-        std::make_tuple(
-            0x12, 0x12, 4, DWARF32,
-            "parsing line table prologue at offset 0x00000001: unexpected end "
-            "of data at offset 0x12 while reading [0x12, 0x13)")));
-
-using ValueAndLengths = std::vector<LineTable::ValueAndLength>;
-
-struct TruncatedOpcodeFixtureBase : public CommonFixture {
-  LineTable &setupTable() {
-    LineTable &LT = Gen->addLineTable();
-
-    // Creating the prologue before adding any opcodes ensures that the unit
-    // length does not include the table body.
-    DWARFDebugLine::Prologue Prologue = LT.createBasicPrologue();
-
-    // Add an unrecognised standard opcode, and adjust prologue properties
-    // accordingly.
-    Prologue.TotalLength += BodyLength + 1;
-    ++Prologue.PrologueLength;
-    ++Prologue.OpcodeBase;
-    Prologue.StandardOpcodeLengths.push_back(2);
-    LT.setPrologue(Prologue);
-
-    return LT;
-  }
-
-  void runTest(uint8_t OpcodeValue) {
-    generate();
-    DWARFDebugLine::SectionParser Parser(LineData, *Context, Units);
-    std::string Output;
-    raw_string_ostream OS(Output);
-    Parser.parseNext(RecordRecoverable, RecordUnrecoverable, &OS,
-                     /*Verbose=*/true);
-    OS.flush();
-
-    std::string LinePrefix =
-        ("0x0000002f: 0" + Twine::utohexstr(OpcodeValue) + " ").str();
-    StringRef OutputRef(Output);
-    StringRef OutputToCheck = OutputRef.split(LinePrefix).second;
-    // Each extended opcode ends with a new line and then the table ends with an
-    // additional blank line.
-    EXPECT_EQ((ExpectedOutput + "\n\n").str(), OutputToCheck);
-  }
-
-  uint64_t BodyLength;
-  uint8_t Opcode;
-  ValueAndLengths Operands;
-  StringRef ExpectedOutput;
-  StringRef ExpectedErr;
-};
-
-struct TruncatedStandardOpcodeFixture
-    : public TestWithParam<
-          std::tuple<uint64_t, uint8_t, ValueAndLengths, StringRef, StringRef>>,
-      public TruncatedOpcodeFixtureBase {
-  void SetUp() override {
-    std::tie(BodyLength, Opcode, Operands, ExpectedOutput, ExpectedErr) =
-        GetParam();
-  }
-};
-
-struct TruncatedExtendedOpcodeFixture
-    : public TestWithParam<std::tuple<uint64_t, uint64_t, uint8_t,
-                                      ValueAndLengths, StringRef, StringRef>>,
-      public TruncatedOpcodeFixtureBase {
-  void SetUp() override {
-    std::tie(BodyLength, OpcodeLength, Opcode, Operands, ExpectedOutput,
-             ExpectedErr) = GetParam();
-  }
-
-  uint64_t OpcodeLength;
-};
-
-TEST_P(TruncatedExtendedOpcodeFixture, ErrorForTruncatedExtendedOpcode) {
-  if (!setupGenerator())
-    return;
-  LineTable &LT = setupTable();
-  LT.addExtendedOpcode(OpcodeLength, Opcode, Operands);
-  runTest(0);
-  EXPECT_THAT_ERROR(std::move(Recoverable),
-                    FailedWithMessage(ExpectedErr.str()));
-}
-
-INSTANTIATE_TEST_SUITE_P(
-    TruncatedExtendedOpcodeParams, TruncatedExtendedOpcodeFixture,
-    Values(
-        // Truncated length:
-        std::make_tuple(1, 1, /*ArbitraryOpcode=*/0x7f, ValueAndLengths(), "",
-                        "unable to decode LEB128 at offset 0x00000030: "
-                        "malformed uleb128, extends past end"),
-        // Truncated opcode:
-        std::make_tuple(
-            2, 9, /*ArbitraryOpcode=*/0x7f, ValueAndLengths(), "",
-            "unexpected end of data at offset 0x31 while reading [0x31, 0x32)"),
-        // Truncated operands:
-        std::make_tuple(
-            3, 9, DW_LNE_set_address,
-            ValueAndLengths{{0x1234567890abcdef, LineTable::Quad}},
-            "DW_LNE_set_address",
-            "unexpected end of data at offset 0x32 while reading [0x32, 0x3a)"),
-        std::make_tuple(
-            10, 9, DW_LNE_set_address,
-            ValueAndLengths{{0x1234567878563412, LineTable::Quad}},
-            "DW_LNE_set_address (<parsing error> 12 34 56 78 78 56 34)",
-            "unexpected end of data at offset 0x39 while reading [0x32, 0x3a)"),
-        std::make_tuple(3, 6, DW_LNE_define_file,
-                        ValueAndLengths{{'a', LineTable::Byte},
-                                        {'\0', LineTable::Byte},
-                                        {1, LineTable::ULEB},
-                                        {1, LineTable::ULEB},
-                                        {1, LineTable::ULEB}},
-                        "DW_LNE_define_file",
-                        "no null terminated string at offset 0x32"),
-        std::make_tuple(5, 6, DW_LNE_define_file,
-                        ValueAndLengths{{'a', LineTable::Byte},
-                                        {'\0', LineTable::Byte},
-                                        {1, LineTable::ULEB},
-                                        {1, LineTable::ULEB},
-                                        {1, LineTable::ULEB}},
-                        "DW_LNE_define_file (<parsing error> 61 00)",
-                        "unable to decode LEB128 at offset 0x00000034: "
-                        "malformed uleb128, extends past end"),
-        std::make_tuple(6, 6, DW_LNE_define_file,
-                        ValueAndLengths{{'a', LineTable::Byte},
-                                        {'\0', LineTable::Byte},
-                                        {1, LineTable::ULEB},
-                                        {1, LineTable::ULEB},
-                                        {1, LineTable::ULEB}},
-                        "DW_LNE_define_file (<parsing error> 61 00 01)",
-                        "unable to decode LEB128 at offset 0x00000035: "
-                        "malformed uleb128, extends past end"),
-        std::make_tuple(7, 6, DW_LNE_define_file,
-                        ValueAndLengths{{'a', LineTable::Byte},
-                                        {'\0', LineTable::Byte},
-                                        {1, LineTable::ULEB},
-                                        {1, LineTable::ULEB},
-                                        {1, LineTable::ULEB}},
-                        "DW_LNE_define_file (<parsing error> 61 00 01 01)",
-                        "unable to decode LEB128 at offset 0x00000036: "
-                        "malformed uleb128, extends past end"),
-        std::make_tuple(3, 2, DW_LNE_set_discriminator,
-                        ValueAndLengths{{1, LineTable::ULEB}},
-                        "DW_LNE_set_discriminator",
-                        "unable to decode LEB128 at offset 0x00000032: "
-                        "malformed uleb128, extends past end"),
-        std::make_tuple(
-            6, 5, /*Unknown=*/0x7f,
-            ValueAndLengths{{0x12343412, LineTable::Long}},
-            "Unrecognized extended op 0x7f length 5 (<parsing error> 12 34 34)",
-            "unexpected end of data at offset 0x35 while reading [0x32, "
-            "0x36)")));
-
-TEST_P(TruncatedStandardOpcodeFixture, ErrorForTruncatedStandardOpcode) {
-  if (!setupGenerator())
-    return;
-  LineTable &LT = setupTable();
-  LT.addStandardOpcode(Opcode, Operands);
-  runTest(Opcode);
-  EXPECT_THAT_ERROR(std::move(Unrecoverable),
-                    FailedWithMessage(ExpectedErr.str()));
-}
-
-INSTANTIATE_TEST_SUITE_P(
-    TruncatedStandardOpcodeParams, TruncatedStandardOpcodeFixture,
-    Values(
-        std::make_tuple(2, DW_LNS_advance_pc,
-                        ValueAndLengths{{0x100, LineTable::ULEB}},
-                        "DW_LNS_advance_pc",
-                        "unable to decode LEB128 at offset 0x00000030: "
-                        "malformed uleb128, extends past end"),
-        std::make_tuple(2, DW_LNS_advance_line,
-                        ValueAndLengths{{0x200, LineTable::SLEB}},
-                        "DW_LNS_advance_line",
-                        "unable to decode LEB128 at offset 0x00000030: "
-                        "malformed sleb128, extends past end"),
-        std::make_tuple(2, DW_LNS_set_file,
-                        ValueAndLengths{{0x300, LineTable::ULEB}},
-                        "DW_LNS_set_file",
-                        "unable to decode LEB128 at offset 0x00000030: "
-                        "malformed uleb128, extends past end"),
-        std::make_tuple(2, DW_LNS_set_column,
-                        ValueAndLengths{{0x400, LineTable::ULEB}},
-                        "DW_LNS_set_column",
-                        "unable to decode LEB128 at offset 0x00000030: "
-                        "malformed uleb128, extends past end"),
-        std::make_tuple(
-            2, DW_LNS_fixed_advance_pc,
-            ValueAndLengths{{0x500, LineTable::Half}},
-            "DW_LNS_fixed_advance_pc",
-            "unexpected end of data at offset 0x31 while reading [0x30, 0x32)"),
-        std::make_tuple(2, DW_LNS_set_isa,
-                        ValueAndLengths{{0x600, LineTable::ULEB}},
-                        "DW_LNS_set_isa",
-                        "unable to decode LEB128 at offset 0x00000030: "
-                        "malformed uleb128, extends past end"),
-        std::make_tuple(2, 0xd,
-                        ValueAndLengths{{0x700, LineTable::ULEB},
-                                        {0x800, LineTable::ULEB}},
-                        "Unrecognized standard opcode",
-                        "unable to decode LEB128 at offset 0x00000030: "
-                        "malformed uleb128, extends past end"),
-        std::make_tuple(
-            4, 0xd,
-            ValueAndLengths{{0x900, LineTable::ULEB}, {0xa00, LineTable::ULEB}},
-            "Unrecognized standard opcode (operands: 0x0000000000000900)",
-            "unable to decode LEB128 at offset 0x00000032: "
-            "malformed uleb128, extends past end")));
-
-TEST_F(DebugLineBasicFixture, PrintPathsProperly) {
-  if (!setupGenerator(5))
-    return;
-
-  LineTable &LT = Gen->addLineTable();
-  DWARFDebugLine::Prologue P = LT.createBasicPrologue();
-  P.IncludeDirectories.push_back(
-      DWARFFormValue::createFromPValue(DW_FORM_string, "b dir"));
-  P.FileNames.push_back(DWARFDebugLine::FileNameEntry());
-  P.FileNames.back().Name =
-      DWARFFormValue::createFromPValue(DW_FORM_string, "b file");
-  P.FileNames.back().DirIdx = 1;
-  P.TotalLength += 14;
-  P.PrologueLength += 14;
-  LT.setPrologue(P);
-  generate();
-
-  auto ExpectedLineTable = Line.getOrParseLineTable(LineData, 0, *Context,
-                                                    nullptr, RecordRecoverable);
-  EXPECT_THAT_EXPECTED(ExpectedLineTable, Succeeded());
-  std::string Result;
-  // DWARF 5 stores the compilation directory in two places: the Compilation
-  // Unit and the directory table entry 0, and implementations are free to use
-  // one or the other. This copy serves as the one stored in the CU.
-  StringRef CompDir = "a dir";
-  EXPECT_FALSE(
-      (*ExpectedLineTable)
-          ->Prologue.getFileNameByIndex(
-              1, CompDir, DILineInfoSpecifier::FileLineInfoKind::None, Result));
-  EXPECT_TRUE((*ExpectedLineTable)
-                  ->Prologue.getFileNameByIndex(
-                      1, CompDir,
-                      DILineInfoSpecifier::FileLineInfoKind::RawValue, Result));
-  EXPECT_TRUE((*ExpectedLineTable)
-                  ->Prologue.getFileNameByIndex(
-                      1, CompDir,
-                      DILineInfoSpecifier::FileLineInfoKind::BaseNameOnly,
-                      Result));
-  EXPECT_STREQ(Result.c_str(), "b file");
-  EXPECT_TRUE((*ExpectedLineTable)
-                  ->Prologue.getFileNameByIndex(
-                      1, CompDir,
-                      DILineInfoSpecifier::FileLineInfoKind::RelativeFilePath,
-                      Result));
-  EXPECT_THAT(Result.c_str(), MatchesRegex("b dir.b file"));
-  EXPECT_TRUE((*ExpectedLineTable)
-                  ->Prologue.getFileNameByIndex(
-                      1, CompDir,
-                      DILineInfoSpecifier::FileLineInfoKind::AbsoluteFilePath,
-                      Result));
-  EXPECT_THAT(Result.c_str(), MatchesRegex("a dir.b dir.b file"));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFDieManualExtractTest.cpp b/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFDieManualExtractTest.cpp
deleted file mode 100644
index d41e0ffa501..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFDieManualExtractTest.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-//===-llvm/unittest/DebugInfo/DWARFDieManualExtractTest.cpp---------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "DwarfGenerator.h"
-#include "DwarfUtils.h"
-#include "llvm/BinaryFormat/Dwarf.h"
-#include "llvm/DebugInfo/DWARF/DWARFContext.h"
-#include "llvm/ObjectYAML/DWARFEmitter.h"
-#include "llvm/Testing/Support/Error.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::dwarf;
-using namespace utils;
-
-namespace {
-
-TEST(DWARFDie, manualExtractDump) {
-  typedef uint32_t AddrType;
-  uint16_t Version = 4;
-  Triple Triple = getDefaultTargetTripleForAddrSize(sizeof(AddrType));
-  if (!isObjectEmissionSupported(Triple))
-    return;
-
-  auto ExpectedDG = dwarfgen::Generator::create(Triple, Version);
-  ASSERT_THAT_EXPECTED(ExpectedDG, Succeeded());
-  dwarfgen::Generator *DG = ExpectedDG.get().get();
-  dwarfgen::CompileUnit &DGCU = DG->addCompileUnit();
-  dwarfgen::DIE CUDie = DGCU.getUnitDIE();
-
-  CUDie.addAttribute(DW_AT_name, DW_FORM_strp, "/tmp/main.c");
-  CUDie.addAttribute(DW_AT_language, DW_FORM_data2, DW_LANG_C);
-
-  dwarfgen::DIE SubprogramDie = CUDie.addChild(DW_TAG_subprogram);
-  SubprogramDie.addAttribute(DW_AT_name, DW_FORM_strp, "main");
-  SubprogramDie.addAttribute(DW_AT_low_pc, DW_FORM_addr, 0x1000U);
-  SubprogramDie.addAttribute(DW_AT_high_pc, DW_FORM_addr, 0x2000U);
-
-  StringRef FileBytes = DG->generate();
-  MemoryBufferRef FileBuffer(FileBytes, "dwarf");
-  auto Obj = object::ObjectFile::createObjectFile(FileBuffer);
-  EXPECT_TRUE((bool)Obj);
-  std::unique_ptr<DWARFContext> Ctx = DWARFContext::create(**Obj);
-
-  DWARFCompileUnit *CU = Ctx->getCompileUnitForOffset(0);
-  ASSERT_NE(nullptr, CU);
-  // Manually extracting DWARF DIE.
-  uint64_t DIEOffset = CU->getOffset() + CU->getHeaderSize();
-  uint64_t NextCUOffset = CU->getNextUnitOffset();
-  DWARFDebugInfoEntry DieInfo;
-  DWARFDataExtractor DebugInfoData = CU->getDebugInfoExtractor();
-  uint32_t Depth = 0;
-  ASSERT_TRUE(
-      DieInfo.extractFast(*CU, &DIEOffset, DebugInfoData, NextCUOffset, Depth));
-  DWARFDie Die(CU, &DieInfo);
-  ASSERT_TRUE(Die.isValid());
-  ASSERT_TRUE(Die.hasChildren());
-  // Since we have extracted manually DieArray is empty.
-  // Dump function should respect the default flags and print just current DIE,
-  // and not explore children.
-  SmallString<512> Output;
-  raw_svector_ostream OS(Output);
-  Die.dump(OS);
-  constexpr size_t NumOfLines = 3;
-  SmallVector<StringRef, NumOfLines> Strings;
-  SmallVector<StringRef, NumOfLines> ValidStrings = {
-      "0x0000000b: DW_TAG_compile_unit",
-      "              DW_AT_name	(\"/tmp/main.c\")",
-      "              DW_AT_language	(DW_LANG_C)"};
-  Output.str().split(Strings, '\n', -1, false);
-  ASSERT_EQ(Strings.size(), NumOfLines);
-  for (size_t I = 0; I < NumOfLines; ++I)
-    EXPECT_EQ(ValidStrings[I], Strings[I]);
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFDieTest.cpp b/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFDieTest.cpp
deleted file mode 100644
index 5525ae6b788..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFDieTest.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-//===- llvm/unittest/DebugInfo/DWARFDieTest.cpp ---------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/BinaryFormat/Dwarf.h"
-#include "llvm/DebugInfo/DWARF/DWARFContext.h"
-#include "llvm/ObjectYAML/DWARFEmitter.h"
-#include "llvm/Testing/Support/Error.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::dwarf;
-using object::SectionedAddress;
-
-namespace {
-
-TEST(DWARFDie, getLocations) {
-  const char *yamldata = R"(
-    debug_abbrev:
-      - Table:
-          - Code:            0x00000001
-            Tag:             DW_TAG_compile_unit
-            Children:        DW_CHILDREN_no
-            Attributes:
-              - Attribute:       DW_AT_location
-                Form:            DW_FORM_sec_offset
-              - Attribute:       DW_AT_data_member_location
-                Form:            DW_FORM_exprloc
-              - Attribute:       DW_AT_vtable_elem_location
-                Form:            DW_FORM_sec_offset
-              - Attribute:       DW_AT_call_data_location
-                Form:            DW_FORM_sec_offset
-    debug_info:
-      - Version:         5
-        UnitType:        DW_UT_compile
-        AddrSize:        4
-        Entries:
-          - AbbrCode:        0x00000001
-            Values:
-              - Value:           12
-              - Value:           0x0000000000000001
-                BlockData:       [ 0x47 ]
-              - Value:           20
-              - Value:           25
-    debug_loclists:
-      - AddressSize:      4
-        OffsetEntryCount: 0
-        Lists:
-          - Entries:
-              - Operator: DW_LLE_start_length
-                Values:   [ 0x01, 0x02 ]
-              - Operator: DW_LLE_end_of_list
-          - Entries:
-              - Operator: DW_LLE_startx_length
-                Values:   [ 0x01, 0x02 ]
-              - Operator: DW_LLE_end_of_list
-          - Entries:
-              - Operator: DW_LLE_start_length
-                Values:   [ 0x01, 0x02 ]
-              ## end_of_list intentionally missing.
-  )";
-  Expected<StringMap<std::unique_ptr<MemoryBuffer>>> Sections =
-      DWARFYAML::emitDebugSections(StringRef(yamldata),
-                                   /*IsLittleEndian=*/true,
-                                   /*Is64BitAddrSize=*/false);
-  ASSERT_THAT_EXPECTED(Sections, Succeeded());
-  std::unique_ptr<DWARFContext> Ctx =
-      DWARFContext::create(*Sections, 4, /*isLittleEndian=*/true);
-  DWARFCompileUnit *CU = Ctx->getCompileUnitForOffset(0);
-  ASSERT_NE(nullptr, CU);
-  DWARFDie Die = CU->getUnitDIE();
-  ASSERT_TRUE(Die.isValid());
-
-  EXPECT_THAT_EXPECTED(Die.getLocations(DW_AT_location),
-                       HasValue(testing::ElementsAre(DWARFLocationExpression{
-                           DWARFAddressRange{1, 3}, {}})));
-
-  EXPECT_THAT_EXPECTED(
-      Die.getLocations(DW_AT_data_member_location),
-      HasValue(testing::ElementsAre(DWARFLocationExpression{None, {0x47}})));
-
-  EXPECT_THAT_EXPECTED(
-      Die.getLocations(DW_AT_vtable_elem_location),
-      Failed<ErrorInfoBase>(testing::Property(
-          &ErrorInfoBase::message,
-          "Unable to resolve indirect address 1 for: DW_LLE_startx_length")));
-
-  EXPECT_THAT_EXPECTED(
-      Die.getLocations(DW_AT_call_data_location),
-      FailedWithMessage(
-          "unexpected end of data at offset 0x20 while reading [0x20, 0x21)"));
-
-  EXPECT_THAT_EXPECTED(
-      Die.getLocations(DW_AT_call_data_value),
-      Failed<ErrorInfoBase>(testing::Property(&ErrorInfoBase::message,
-                                              "No DW_AT_call_data_value")));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFExpressionCompactPrinterTest.cpp b/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFExpressionCompactPrinterTest.cpp
deleted file mode 100644
index 6fa97794218..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFExpressionCompactPrinterTest.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-//===- llvm/unittest/DebugInfo/DWARFExpressionCompactPrinterTest.cpp ------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/DebugInfo/DWARF/DWARFContext.h"
-#include "llvm/DebugInfo/DWARF/DWARFDie.h"
-#include "llvm/DebugInfo/DWARF/DWARFExpression.h"
-#include "llvm/MC/MCInstrInfo.h"
-#include "llvm/Support/DataExtractor.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "llvm/Testing/Support/Error.h"
-#include "gtest/gtest.h"
-#include "DwarfGenerator.h"
-
-using namespace llvm;
-using namespace dwarf;
-
-namespace {
-class DWARFExpressionCompactPrinterTest : public ::testing::Test {
-public:
-  std::unique_ptr<MCRegisterInfo> MRI;
-
-  DWARFExpressionCompactPrinterTest() {
-    InitializeAllTargets();
-    InitializeAllTargetMCs();
-    InitializeAllAsmPrinters();
-
-    std::string TripleName = "armv8a-linux-gnueabi";
-    std::string ErrorStr;
-
-    const Target *TheTarget =
-        TargetRegistry::lookupTarget(TripleName, ErrorStr);
-
-    if (!TheTarget)
-      return;
-
-    MRI.reset(TheTarget->createMCRegInfo(TripleName));
-  }
-
-  void TestExprPrinter(ArrayRef<uint8_t> ExprData, StringRef Expected);
-};
-} // namespace
-
-void DWARFExpressionCompactPrinterTest::TestExprPrinter(
-    ArrayRef<uint8_t> ExprData, StringRef Expected) {
-  // If we didn't build ARM, do not run the test.
-  if (!MRI)
-    return;
-
-  // Print the expression, passing in the subprogram DIE, and check that the
-  // result is as expected.
-  std::string Result;
-  raw_string_ostream OS(Result);
-  DataExtractor DE(ExprData, true, 8);
-  DWARFExpression Expr(DE, 8);
-  Expr.printCompact(OS, *MRI);
-  EXPECT_EQ(OS.str(), Expected);
-}
-
-TEST_F(DWARFExpressionCompactPrinterTest, Test_OP_reg0) {
-  TestExprPrinter({DW_OP_reg0}, "R0");
-}
-
-TEST_F(DWARFExpressionCompactPrinterTest, Test_OP_reg10) {
-  TestExprPrinter({DW_OP_reg10}, "R10");
-}
-
-TEST_F(DWARFExpressionCompactPrinterTest, Test_OP_regx) {
-  TestExprPrinter({DW_OP_regx, 0x80, 0x02}, "D0");
-}
-
-TEST_F(DWARFExpressionCompactPrinterTest, Test_OP_breg0) {
-  TestExprPrinter({DW_OP_breg0, 0x04}, "[R0+4]");
-}
-
-TEST_F(DWARFExpressionCompactPrinterTest, Test_OP_breg0_large_offset) {
-  TestExprPrinter({DW_OP_breg0, 0x80, 0x02}, "[R0+256]");
-}
-
-TEST_F(DWARFExpressionCompactPrinterTest, Test_OP_breg13) {
-  TestExprPrinter({DW_OP_breg13, 0x10}, "[SP+16]");
-}
-
-TEST_F(DWARFExpressionCompactPrinterTest, Test_OP_breg13_zero_offset) {
-  TestExprPrinter({DW_OP_breg13, 0x00}, "[SP]");
-}
-
-TEST_F(DWARFExpressionCompactPrinterTest, Test_OP_breg0_negative) {
-  TestExprPrinter({DW_OP_breg0, 0x70}, "[R0-16]");
-}
-
-TEST_F(DWARFExpressionCompactPrinterTest, Test_OP_bregx) {
-  TestExprPrinter({DW_OP_bregx, 0x0d, 0x28}, "[SP+40]");
-}
-
-TEST_F(DWARFExpressionCompactPrinterTest, Test_OP_stack_value) {
-  TestExprPrinter({DW_OP_breg13, 0x04, DW_OP_stack_value}, "SP+4");
-}
-
-TEST_F(DWARFExpressionCompactPrinterTest, Test_OP_entry_value) {
-  TestExprPrinter({DW_OP_entry_value, 0x01, DW_OP_reg0, DW_OP_stack_value},
-                  "entry(R0)");
-}
-
-TEST_F(DWARFExpressionCompactPrinterTest, Test_OP_entry_value_mem) {
-  TestExprPrinter(
-      {DW_OP_entry_value, 0x02, DW_OP_breg13, 0x10, DW_OP_stack_value},
-      "entry([SP+16])");
-}
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFFormValueTest.cpp b/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFFormValueTest.cpp
deleted file mode 100644
index 954abb76912..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFFormValueTest.cpp
+++ /dev/null
@@ -1,396 +0,0 @@
-//===- llvm/unittest/DebugInfo/DWARFFormValueTest.cpp ---------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/DebugInfo/DWARF/DWARFFormValue.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/SmallString.h"
-#include "llvm/BinaryFormat/Dwarf.h"
-#include "llvm/Support/FormatVariadic.h"
-#include "llvm/Support/Host.h"
-#include "llvm/Support/LEB128.h"
-#include "gtest/gtest.h"
-#include <climits>
-using namespace llvm;
-using namespace dwarf;
-
-namespace {
-
-bool isFormClass(dwarf::Form Form, DWARFFormValue::FormClass FC) {
-  return DWARFFormValue(Form).isFormClass(FC);
-}
-
-TEST(DWARFFormValue, FormClass) {
-  EXPECT_TRUE(isFormClass(DW_FORM_addr, DWARFFormValue::FC_Address));
-  EXPECT_FALSE(isFormClass(DW_FORM_data8, DWARFFormValue::FC_Address));
-  EXPECT_TRUE(isFormClass(DW_FORM_data8, DWARFFormValue::FC_Constant));
-  EXPECT_TRUE(isFormClass(DW_FORM_data8, DWARFFormValue::FC_SectionOffset));
-  EXPECT_TRUE(
-      isFormClass(DW_FORM_sec_offset, DWARFFormValue::FC_SectionOffset));
-  EXPECT_TRUE(isFormClass(DW_FORM_GNU_str_index, DWARFFormValue::FC_String));
-  EXPECT_TRUE(isFormClass(DW_FORM_GNU_addr_index, DWARFFormValue::FC_Address));
-  EXPECT_FALSE(isFormClass(DW_FORM_ref_addr, DWARFFormValue::FC_Address));
-  EXPECT_TRUE(isFormClass(DW_FORM_ref_addr, DWARFFormValue::FC_Reference));
-  EXPECT_TRUE(isFormClass(DW_FORM_ref_sig8, DWARFFormValue::FC_Reference));
-}
-
-template<typename RawTypeT>
-DWARFFormValue createDataXFormValue(dwarf::Form Form, RawTypeT Value) {
-  char Raw[sizeof(RawTypeT)];
-  memcpy(Raw, &Value, sizeof(RawTypeT));
-  uint64_t Offset = 0;
-  DWARFFormValue Result(Form);
-  DWARFDataExtractor Data(StringRef(Raw, sizeof(RawTypeT)),
-                          sys::IsLittleEndianHost, sizeof(void *));
-  Result.extractValue(Data, &Offset, {0, 0, dwarf::DwarfFormat::DWARF32});
-  return Result;
-}
-
-DWARFFormValue createULEBFormValue(uint64_t Value) {
-  SmallString<10> RawData;
-  raw_svector_ostream OS(RawData);
-  encodeULEB128(Value, OS);
-  uint64_t Offset = 0;
-  DWARFFormValue Result(DW_FORM_udata);
-  DWARFDataExtractor Data(OS.str(), sys::IsLittleEndianHost, sizeof(void *));
-  Result.extractValue(Data, &Offset, {0, 0, dwarf::DwarfFormat::DWARF32});
-  return Result;
-}
-
-DWARFFormValue createSLEBFormValue(int64_t Value) {
-  SmallString<10> RawData;
-  raw_svector_ostream OS(RawData);
-  encodeSLEB128(Value, OS);
-  uint64_t Offset = 0;
-  DWARFFormValue Result(DW_FORM_sdata);
-  DWARFDataExtractor Data(OS.str(), sys::IsLittleEndianHost, sizeof(void *));
-  Result.extractValue(Data, &Offset, {0, 0, dwarf::DwarfFormat::DWARF32});
-  return Result;
-}
-
-TEST(DWARFFormValue, SignedConstantForms) {
-  // Check that we correctly sign extend fixed size forms.
-  auto Sign1 = createDataXFormValue<uint8_t>(DW_FORM_data1, -123);
-  auto Sign2 = createDataXFormValue<uint16_t>(DW_FORM_data2, -12345);
-  auto Sign4 = createDataXFormValue<uint32_t>(DW_FORM_data4, -123456789);
-  auto Sign8 = createDataXFormValue<uint64_t>(DW_FORM_data8, -1);
-  EXPECT_EQ(Sign1.getAsSignedConstant().getValue(), -123);
-  EXPECT_EQ(Sign2.getAsSignedConstant().getValue(), -12345);
-  EXPECT_EQ(Sign4.getAsSignedConstant().getValue(), -123456789);
-  EXPECT_EQ(Sign8.getAsSignedConstant().getValue(), -1);
-
-  // Check that we can handle big positive values, but that we return
-  // an error just over the limit.
-  auto UMax = createULEBFormValue(LLONG_MAX);
-  auto TooBig = createULEBFormValue(uint64_t(LLONG_MAX) + 1);
-  EXPECT_EQ(UMax.getAsSignedConstant().getValue(), LLONG_MAX);
-  EXPECT_EQ(TooBig.getAsSignedConstant().hasValue(), false);
-
-  // Sanity check some other forms.
-  auto Data1 = createDataXFormValue<uint8_t>(DW_FORM_data1, 120);
-  auto Data2 = createDataXFormValue<uint16_t>(DW_FORM_data2, 32000);
-  auto Data4 = createDataXFormValue<uint32_t>(DW_FORM_data4, 2000000000);
-  auto Data8 = createDataXFormValue<uint64_t>(DW_FORM_data8, 0x1234567812345678LL);
-  auto LEBMin = createSLEBFormValue(LLONG_MIN);
-  auto LEBMax = createSLEBFormValue(LLONG_MAX);
-  auto LEB1 = createSLEBFormValue(-42);
-  auto LEB2 = createSLEBFormValue(42);
-  EXPECT_EQ(Data1.getAsSignedConstant().getValue(), 120);
-  EXPECT_EQ(Data2.getAsSignedConstant().getValue(), 32000);
-  EXPECT_EQ(Data4.getAsSignedConstant().getValue(), 2000000000);
-  EXPECT_EQ(Data8.getAsSignedConstant().getValue(), 0x1234567812345678LL);
-  EXPECT_EQ(LEBMin.getAsSignedConstant().getValue(), LLONG_MIN);
-  EXPECT_EQ(LEBMax.getAsSignedConstant().getValue(), LLONG_MAX);
-  EXPECT_EQ(LEB1.getAsSignedConstant().getValue(), -42);
-  EXPECT_EQ(LEB2.getAsSignedConstant().getValue(), 42);
-
-  // Data16 is a little tricky.
-  char Cksum[16] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
-  DWARFFormValue Data16(DW_FORM_data16);
-  DWARFDataExtractor DE16(StringRef(Cksum, 16), sys::IsLittleEndianHost,
-                          sizeof(void *));
-  uint64_t Offset = 0;
-  Data16.extractValue(DE16, &Offset, {0, 0, dwarf::DwarfFormat::DWARF32});
-  SmallString<32> Str;
-  raw_svector_ostream Res(Str);
-  Data16.dump(Res, DIDumpOptions());
-  EXPECT_EQ(memcmp(Str.data(), "000102030405060708090a0b0c0d0e0f", 32), 0);
-}
-
-using ParamType = std::tuple<Form, uint16_t, uint8_t, DwarfFormat,
-                             ArrayRef<uint8_t>, uint64_t, bool>;
-
-struct FormSkipValueFixtureBase : public testing::TestWithParam<ParamType> {
-  void SetUp() override {
-    std::tie(Fm, Version, AddrSize, Dwarf, InitialData, ExpectedSkipped,
-             ExpectedResult) = GetParam();
-  }
-
-  void doSkipValueTest() {
-    SCOPED_TRACE("Inputs: Form = " + std::to_string(Fm) +
-                 ", Version = " + std::to_string(Version) +
-                 ", AddrSize = " + std::to_string(uint32_t(AddrSize)) +
-                 ", DwarfFormat = " + std::to_string(Dwarf));
-    std::vector<uint8_t> Buf(InitialData.data(),
-                             InitialData.data() + InitialData.size());
-    // The data extractor only adjusts the offset to the end of the buffer when
-    // attempting to read past the end, so the buffer must be bigger than the
-    // expected amount to be skipped to identify cases where more data than
-    // expected is skipped.
-    Buf.resize(ExpectedSkipped + 1);
-    DWARFDataExtractor Data(Buf, sys::IsLittleEndianHost, AddrSize);
-    uint64_t Offset = 0;
-    EXPECT_EQ(DWARFFormValue::skipValue(Fm, Data, &Offset,
-                                        {Version, AddrSize, Dwarf}),
-              ExpectedResult);
-    EXPECT_EQ(Offset, ExpectedSkipped);
-  }
-
-  Form Fm;
-  uint16_t Version;
-  uint8_t AddrSize;
-  DwarfFormat Dwarf;
-  ArrayRef<uint8_t> InitialData;
-  uint64_t ExpectedSkipped;
-  bool ExpectedResult;
-};
-
-template <typename T> static ArrayRef<uint8_t> toBytes(const T &Input) {
-  return ArrayRef<uint8_t>(reinterpret_cast<const uint8_t *>(&Input),
-                           sizeof(Input));
-}
-
-const uint8_t LEBData[] = {0x80, 0x1};
-ArrayRef<uint8_t> SampleLEB(LEBData, sizeof(LEBData));
-const uint8_t SampleLength8 = 0x80;
-const uint16_t SampleLength16 = 0x80;
-const uint32_t SampleLength = 0x80;
-ArrayRef<uint8_t> SampleU8 = toBytes(SampleLength8);
-ArrayRef<uint8_t> SampleU16 = toBytes(SampleLength16);
-ArrayRef<uint8_t> SampleU32 = toBytes(SampleLength);
-const uint8_t StringData[] = "abcdef";
-ArrayRef<uint8_t> SampleString(StringData, sizeof(StringData));
-const uint8_t IndirectData8[] = {DW_FORM_data8};
-const uint8_t IndirectData16[] = {DW_FORM_data16};
-const uint8_t IndirectAddr[] = {DW_FORM_addr};
-const uint8_t IndirectIndirectData1[] = {DW_FORM_indirect, DW_FORM_data1};
-const uint8_t IndirectIndirectEnd[] = {DW_FORM_indirect};
-
-// Gtest's paramterised tests only allow a maximum of 50 cases, so split the
-// test into multiple identical parts to share the cases.
-struct FormSkipValueFixture1 : FormSkipValueFixtureBase {};
-struct FormSkipValueFixture2 : FormSkipValueFixtureBase {};
-TEST_P(FormSkipValueFixture1, skipValuePart1) { doSkipValueTest(); }
-TEST_P(FormSkipValueFixture2, skipValuePart2) { doSkipValueTest(); }
-
-INSTANTIATE_TEST_SUITE_P(
-    SkipValueTestParams1, FormSkipValueFixture1,
-    testing::Values(
-        // Form, Version, AddrSize, DwarfFormat, InitialData, ExpectedSize,
-        // ExpectedResult.
-        ParamType(DW_FORM_exprloc, 0, 0, DWARF32, SampleLEB,
-                  SampleLength + SampleLEB.size(), true),
-        ParamType(DW_FORM_block, 0, 0, DWARF32, SampleLEB,
-                  SampleLength + SampleLEB.size(), true),
-        ParamType(DW_FORM_block1, 0, 0, DWARF32, SampleU8, SampleLength8 + 1,
-                  true),
-        ParamType(DW_FORM_block2, 0, 0, DWARF32, SampleU16, SampleLength16 + 2,
-                  true),
-        ParamType(DW_FORM_block4, 0, 0, DWARF32, SampleU32, SampleLength + 4,
-                  true),
-        ParamType(DW_FORM_string, 0, 0, DWARF32, SampleString,
-                  SampleString.size(), true),
-        ParamType(DW_FORM_addr, 0, 42, DWARF32, SampleU32, 0, false),
-        ParamType(DW_FORM_addr, 4, 0, DWARF32, SampleU32, 0, false),
-        ParamType(DW_FORM_addr, 4, 42, DWARF32, SampleU32, 42, true),
-        ParamType(DW_FORM_ref_addr, 0, 1, DWARF32, SampleU32, 0, false),
-        ParamType(DW_FORM_ref_addr, 1, 0, DWARF32, SampleU32, 0, false),
-        ParamType(DW_FORM_ref_addr, 1, 1, DWARF32, SampleU32, 4, true),
-        ParamType(DW_FORM_ref_addr, 1, 1, DWARF64, SampleU32, 8, true),
-        ParamType(DW_FORM_ref_addr, 2, 42, DWARF32, SampleU32, 42, true),
-        ParamType(DW_FORM_ref_addr, 2, 42, DWARF64, SampleU32, 42, true),
-        ParamType(DW_FORM_ref_addr, 3, 3, DWARF32, SampleU32, 4, true),
-        ParamType(DW_FORM_ref_addr, 3, 3, DWARF64, SampleU32, 8, true),
-        ParamType(DW_FORM_flag_present, 4, 4, DWARF32, SampleU32, 0, true),
-        ParamType(DW_FORM_data1, 0, 0, DWARF32, SampleU32, 1, true),
-        ParamType(DW_FORM_data2, 0, 0, DWARF32, SampleU32, 2, true),
-        ParamType(DW_FORM_data4, 0, 0, DWARF32, SampleU32, 4, true),
-        ParamType(DW_FORM_data8, 0, 0, DWARF32, SampleU32, 8, true),
-        ParamType(DW_FORM_data16, 0, 0, DWARF32, SampleU32, 16, true),
-        ParamType(DW_FORM_flag, 0, 0, DWARF32, SampleU32, 1, true),
-        ParamType(DW_FORM_ref1, 0, 0, DWARF32, SampleU32, 1, true),
-        ParamType(DW_FORM_ref2, 0, 0, DWARF32, SampleU32, 2, true),
-        ParamType(DW_FORM_ref4, 0, 0, DWARF32, SampleU32, 4, true),
-        ParamType(DW_FORM_ref8, 0, 0, DWARF32, SampleU32, 8, true),
-        ParamType(DW_FORM_ref_sig8, 0, 0, DWARF32, SampleU32, 8, true),
-        ParamType(DW_FORM_ref_sup4, 0, 0, DWARF32, SampleU32, 4, true),
-        ParamType(DW_FORM_ref_sup8, 0, 0, DWARF32, SampleU32, 8, true),
-        ParamType(DW_FORM_strx1, 0, 0, DWARF32, SampleU32, 1, true),
-        ParamType(DW_FORM_strx2, 0, 0, DWARF32, SampleU32, 2, true),
-        ParamType(DW_FORM_strx4, 0, 0, DWARF32, SampleU32, 4, true),
-        ParamType(DW_FORM_addrx1, 0, 0, DWARF32, SampleU32, 1, true),
-        ParamType(DW_FORM_addrx2, 0, 0, DWARF32, SampleU32, 2, true),
-        ParamType(DW_FORM_addrx4, 0, 0, DWARF32, SampleU32, 4, true),
-        ParamType(DW_FORM_sec_offset, 0, 1, DWARF32, SampleU32, 0, false),
-        ParamType(DW_FORM_sec_offset, 1, 0, DWARF32, SampleU32, 0, false),
-        ParamType(DW_FORM_sec_offset, 1, 1, DWARF32, SampleU32, 4, true),
-        ParamType(DW_FORM_sec_offset, 1, 1, DWARF64, SampleU32, 8, true),
-        ParamType(DW_FORM_strp, 0, 1, DWARF32, SampleU32, 0, false),
-        ParamType(DW_FORM_strp, 1, 0, DWARF32, SampleU32, 0, false),
-        ParamType(DW_FORM_strp, 1, 1, DWARF32, SampleU32, 4, true),
-        ParamType(DW_FORM_strp, 1, 1, DWARF64, SampleU32, 8, true),
-        ParamType(DW_FORM_strp_sup, 0, 1, DWARF32, SampleU32, 0, false),
-        ParamType(DW_FORM_strp_sup, 1, 0, DWARF32, SampleU32, 0, false),
-        ParamType(DW_FORM_strp_sup, 1, 1, DWARF32, SampleU32, 4, true),
-        ParamType(DW_FORM_strp_sup, 1, 1, DWARF64, SampleU32, 8, true)));
-
-INSTANTIATE_TEST_SUITE_P(
-    SkipValueTestParams2, FormSkipValueFixture2,
-    testing::Values(
-        ParamType(DW_FORM_line_strp, 0, 1, DWARF32, SampleU32, 0, false),
-        ParamType(DW_FORM_line_strp, 1, 0, DWARF32, SampleU32, 0, false),
-        ParamType(DW_FORM_line_strp, 1, 1, DWARF32, SampleU32, 4, true),
-        ParamType(DW_FORM_line_strp, 1, 1, DWARF64, SampleU32, 8, true),
-        ParamType(DW_FORM_GNU_ref_alt, 0, 1, DWARF32, SampleU32, 0, false),
-        ParamType(DW_FORM_GNU_ref_alt, 1, 0, DWARF32, SampleU32, 0, false),
-        ParamType(DW_FORM_GNU_ref_alt, 1, 1, DWARF32, SampleU32, 4, true),
-        ParamType(DW_FORM_GNU_ref_alt, 1, 1, DWARF64, SampleU32, 8, true),
-        ParamType(DW_FORM_GNU_strp_alt, 0, 1, DWARF32, SampleU32, 0, false),
-        ParamType(DW_FORM_GNU_strp_alt, 1, 0, DWARF32, SampleU32, 0, false),
-        ParamType(DW_FORM_GNU_strp_alt, 1, 1, DWARF32, SampleU32, 4, true),
-        ParamType(DW_FORM_GNU_strp_alt, 1, 1, DWARF64, SampleU32, 8, true),
-        ParamType(DW_FORM_sdata, 0, 0, DWARF32, SampleLEB, SampleLEB.size(),
-                  true),
-        ParamType(DW_FORM_udata, 0, 0, DWARF32, SampleLEB, SampleLEB.size(),
-                  true),
-        ParamType(DW_FORM_ref_udata, 0, 0, DWARF32, SampleLEB, SampleLEB.size(),
-                  true),
-        ParamType(DW_FORM_strx, 0, 0, DWARF32, SampleLEB, SampleLEB.size(),
-                  true),
-        ParamType(DW_FORM_addrx, 0, 0, DWARF32, SampleLEB, SampleLEB.size(),
-                  true),
-        ParamType(DW_FORM_loclistx, 0, 0, DWARF32, SampleLEB, SampleLEB.size(),
-                  true),
-        ParamType(DW_FORM_rnglistx, 0, 0, DWARF32, SampleLEB, SampleLEB.size(),
-                  true),
-        ParamType(DW_FORM_GNU_addr_index, 0, 0, DWARF32, SampleLEB,
-                  SampleLEB.size(), true),
-        ParamType(DW_FORM_GNU_str_index, 0, 0, DWARF32, SampleLEB,
-                  SampleLEB.size(), true),
-        ParamType(DW_FORM_indirect, 0, 0, DWARF32,
-                  ArrayRef<uint8_t>(IndirectData8, sizeof(IndirectData8)), 9,
-                  true),
-        ParamType(DW_FORM_indirect, 0, 0, DWARF32,
-                  ArrayRef<uint8_t>(IndirectData16, sizeof(IndirectData16)), 17,
-                  true),
-        ParamType(DW_FORM_indirect, 4, 0, DWARF32,
-                  ArrayRef<uint8_t>(IndirectAddr, sizeof(IndirectAddr)), 1,
-                  false),
-        ParamType(DW_FORM_indirect, 4, 4, DWARF32,
-                  ArrayRef<uint8_t>(IndirectAddr, sizeof(IndirectAddr)), 5,
-                  true),
-        ParamType(DW_FORM_indirect, 4, 4, DWARF32,
-                  ArrayRef<uint8_t>(IndirectIndirectData1,
-                                    sizeof(IndirectIndirectData1)),
-                  3, true),
-        ParamType(DW_FORM_indirect, 4, 4, DWARF32,
-                  ArrayRef<uint8_t>(IndirectIndirectEnd,
-                                    sizeof(IndirectIndirectEnd)),
-                  2, false),
-        ParamType(/*Unknown=*/Form(0xff), 4, 4, DWARF32, SampleU32, 0, false)));
-
-using ErrorParams = std::tuple<Form, std::vector<uint8_t>>;
-struct ExtractValueErrorFixture : public testing::TestWithParam<ErrorParams> {
-  void SetUp() override { std::tie(Fm, InitialData) = GetParam(); }
-
-  Form Fm;
-  ArrayRef<uint8_t> InitialData;
-};
-
-TEST_P(ExtractValueErrorFixture, Test) {
-  SCOPED_TRACE(formatv("Fm = {0}, InitialData = {1}", Fm,
-                       make_range(InitialData.begin(), InitialData.end()))
-                   .str());
-
-  DWARFDataExtractor Data(InitialData, sys::IsLittleEndianHost, 4);
-  DWARFFormValue Form(Fm);
-  uint64_t Offset = 0;
-  EXPECT_FALSE(Form.extractValue(Data, &Offset, {0, 0, DWARF32}));
-}
-
-INSTANTIATE_TEST_SUITE_P(
-    ExtractValueErrorParams, ExtractValueErrorFixture,
-    testing::Values(
-        ErrorParams{DW_FORM_ref_addr, {}}, ErrorParams{DW_FORM_block, {}},
-        ErrorParams{DW_FORM_block, {1}}, ErrorParams{DW_FORM_block, {2, 0}},
-        ErrorParams{DW_FORM_block1, {}}, ErrorParams{DW_FORM_block2, {}},
-        ErrorParams{DW_FORM_block4, {}}, ErrorParams{DW_FORM_data1, {}},
-        ErrorParams{DW_FORM_data2, {}}, ErrorParams{DW_FORM_strx3, {}},
-        ErrorParams{DW_FORM_data4, {}}, ErrorParams{DW_FORM_data8, {}},
-        ErrorParams{DW_FORM_data16, {}}, ErrorParams{DW_FORM_sdata, {}},
-        ErrorParams{DW_FORM_udata, {}}, ErrorParams{DW_FORM_string, {}},
-        ErrorParams{DW_FORM_indirect, {}},
-        ErrorParams{DW_FORM_indirect, {DW_FORM_data1}},
-        ErrorParams{DW_FORM_strp_sup, {}}, ErrorParams{DW_FORM_ref_sig8, {}}));
-
-using DumpValueParams =
-    std::tuple<Form, ArrayRef<uint8_t>, DwarfFormat, StringRef>;
-struct DumpValueFixture : public testing::TestWithParam<DumpValueParams> {
-  void SetUp() override {
-    std::tie(Fm, InitialData, Format, ExpectedResult) = GetParam();
-  }
-
-  Form Fm;
-  ArrayRef<uint8_t> InitialData;
-  DwarfFormat Format;
-  StringRef ExpectedResult;
-};
-
-TEST_P(DumpValueFixture, Test) {
-  SCOPED_TRACE(formatv("Fm = {0}, InitialData = [{1}], Format = {2}", Fm,
-                       toHex(InitialData),
-                       Format == DWARF64 ? "DWARF64" : "DWARF32"));
-  DWARFDataExtractor Data(InitialData, sys::IsLittleEndianHost, 8);
-  DWARFFormValue Form(Fm);
-  uint64_t Offset = 0;
-  Form.extractValue(Data, &Offset, {0, 0, Format});
-
-  std::string Output;
-  raw_string_ostream OS(Output);
-
-  DIDumpOptions Opts;
-  Opts.Verbose = true;
-  Opts.ShowAddresses = true;
-
-  Form.dump(OS, Opts);
-  OS.flush();
-
-  EXPECT_EQ(Output, ExpectedResult);
-}
-
-const uint32_t DumpTestSample32Val = 0x112233;
-ArrayRef<uint8_t> DumpTestSample32 = toBytes(DumpTestSample32Val);
-const uint64_t DumpTestSample64Val = 0x11223344556677;
-ArrayRef<uint8_t> DumpTestSample64 = toBytes(DumpTestSample64Val);
-
-INSTANTIATE_TEST_SUITE_P(
-    DumpValueParams, DumpValueFixture,
-    testing::Values(DumpValueParams{DW_FORM_strp, DumpTestSample32, DWARF32,
-                                    " .debug_str[0x00112233] = "},
-                    DumpValueParams{DW_FORM_strp, DumpTestSample64, DWARF64,
-                                    " .debug_str[0x0011223344556677] = "},
-                    DumpValueParams{DW_FORM_line_strp, DumpTestSample32,
-                                    DWARF32, " .debug_line_str[0x00112233] = "},
-                    DumpValueParams{DW_FORM_line_strp, DumpTestSample64,
-                                    DWARF64,
-                                    " .debug_line_str[0x0011223344556677] = "},
-                    DumpValueParams{DW_FORM_sec_offset, DumpTestSample32,
-                                    DWARF32, "0x00112233"},
-                    DumpValueParams{DW_FORM_sec_offset, DumpTestSample64,
-                                    DWARF64, "0x0011223344556677"}));
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFListTableTest.cpp b/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFListTableTest.cpp
deleted file mode 100644
index 8bb4d0fe59b..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFListTableTest.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-//===- DWARFListTableTest.cpp ---------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/DebugInfo/DWARF/DWARFListTable.h"
-#include "llvm/Testing/Support/Error.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST(DWARFListTableHeader, TruncatedLength) {
-  static const char SecData[] = "\x33\x22\x11"; // Truncated DWARF32 length
-  DWARFDataExtractor Extractor(StringRef(SecData, sizeof(SecData) - 1),
-                               /*isLittleEndian=*/true,
-                               /*AddrSize=*/4);
-  DWARFListTableHeader Header(/*SectionName=*/".debug_rnglists",
-                              /*ListTypeString=*/"range");
-  uint64_t Offset = 0;
-  EXPECT_THAT_ERROR(
-      Header.extract(Extractor, &Offset),
-      FailedWithMessage(
-          "parsing .debug_rnglists table at offset 0x0: unexpected end of data "
-          "at offset 0x3 while reading [0x0, 0x4)"));
-  // length() is expected to return 0 to indicate that the unit length field
-  // can not be parsed and so we can not, for example, skip the current set
-  // to continue parsing from the next one.
-  EXPECT_EQ(Header.length(), 0u);
-}
-
-TEST(DWARFListTableHeader, TruncatedLengthDWARF64) {
-  static const char SecData[] =
-      "\xff\xff\xff\xff"      // DWARF64 mark
-      "\x55\x44\x33\x22\x11"; // Truncated DWARF64 length
-  DWARFDataExtractor Extractor(StringRef(SecData, sizeof(SecData) - 1),
-                               /*isLittleEndian=*/true,
-                               /*AddrSize=*/4);
-  DWARFListTableHeader Header(/*SectionName=*/".debug_rnglists",
-                              /*ListTypeString=*/"range");
-  uint64_t Offset = 0;
-  EXPECT_THAT_ERROR(
-      Header.extract(Extractor, &Offset),
-      FailedWithMessage(
-          "parsing .debug_rnglists table at offset 0x0: unexpected end of data "
-          "at offset 0x9 while reading [0x4, 0xc)"));
-  // length() is expected to return 0 to indicate that the unit length field
-  // can not be parsed and so we can not, for example, skip the current set
-  // to continue parsing from the next one.
-  EXPECT_EQ(Header.length(), 0u);
-}
-
-TEST(DWARFListTableHeader, TruncatedHeader) {
-  static const char SecData[] = "\x02\x00\x00\x00" // Length
-                                "\x05\x00";        // Version
-  DWARFDataExtractor Extractor(StringRef(SecData, sizeof(SecData) - 1),
-                               /*isLittleEndian=*/true,
-                               /*AddrSize=*/4);
-  DWARFListTableHeader Header(/*SectionName=*/".debug_rnglists",
-                              /*ListTypeString=*/"range");
-  uint64_t Offset = 0;
-  EXPECT_THAT_ERROR(
-      Header.extract(Extractor, &Offset),
-      FailedWithMessage(".debug_rnglists table at offset 0x0 has too small "
-                        "length (0x6) to contain a complete header"));
-  // length() is expected to return the full length of the set if the unit
-  // length field is read, even if an error occurred during the parsing,
-  // to allow skipping the current set and continue parsing from the next one.
-  EXPECT_EQ(Header.length(), 6u);
-}
-
-TEST(DWARFListTableHeader, OffsetEntryCount) {
-  static const char SecData[] = "\x10\x00\x00\x00" // Length
-                                "\x05\x00"         // Version
-                                "\x08"             // Address size
-                                "\x00"             // Segment selector size
-                                "\x01\x00\x00\x00" // Offset entry count
-                                "\x04\x00\x00\x00" // offset[0]
-                                "\x04"             // DW_RLE_offset_pair
-                                "\x01"             // ULEB128 starting offset
-                                "\x02"             // ULEB128 ending offset
-                                "\x00";            // DW_RLE_end_of_list
-  DWARFDataExtractor Extractor(StringRef(SecData, sizeof(SecData) - 1),
-                               /*isLittleEndian=*/true,
-                               /*AddrSize=*/4);
-  DWARFListTableHeader Header(/*SectionName=*/".debug_rnglists",
-                              /*ListTypeString=*/"range");
-  uint64_t Offset = 0;
-  EXPECT_FALSE(!!Header.extract(Extractor, &Offset));
-  Optional<uint64_t> Offset0 = Header.getOffsetEntry(Extractor, 0);
-  EXPECT_TRUE(!!Offset0);
-  EXPECT_EQ(Offset0, uint64_t(4));
-  Optional<uint64_t> Offset1 = Header.getOffsetEntry(Extractor, 1);
-  EXPECT_FALSE(!!Offset1);
-  EXPECT_EQ(Header.length(), sizeof(SecData) - 1);
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFLocationExpressionTest.cpp b/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFLocationExpressionTest.cpp
deleted file mode 100644
index fb1dc3bd280..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DWARFLocationExpressionTest.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-//===- llvm/unittest/DebugInfo/DWARFLocationExpressionTest.cpp ------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/DebugInfo/DWARF/DWARFLocationExpression.h"
-#include "llvm/Support/ScopedPrinter.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using object::SectionedAddress;
-
-TEST(DWARFLocationExpression, Equality) {
-  EXPECT_EQ((DWARFLocationExpression{None, {}}),
-            (DWARFLocationExpression{None, {}}));
-  EXPECT_NE((DWARFLocationExpression{DWARFAddressRange{1, 47}, {}}),
-            (DWARFLocationExpression{DWARFAddressRange{1, 48}, {}}));
-  EXPECT_NE((DWARFLocationExpression{DWARFAddressRange{1, 47}, {}}),
-            (DWARFLocationExpression{DWARFAddressRange{1, 47}, {42}}));
-}
-
-TEST(DWARFLocationExpression, StreamingOperator) {
-  EXPECT_EQ("None: 1, 2", to_string(DWARFLocationExpression{None, {1, 2}}));
-  EXPECT_EQ(
-      "[0x0000000000000042, 0x0000000000000047): 1",
-      to_string(DWARFLocationExpression{DWARFAddressRange{0x42, 0x47}, {1}}));
-}
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DwarfGenerator.cpp b/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DwarfGenerator.cpp
deleted file mode 100644
index 8fe3d2d74d1..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DwarfGenerator.cpp
+++ /dev/null
@@ -1,580 +0,0 @@
-//===--- unittests/DebugInfo/DWARF/DwarfGenerator.cpp -----------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "DwarfGenerator.h"
-#include "../lib/CodeGen/AsmPrinter/DwarfStringPool.h"
-#include "llvm/ADT/Triple.h"
-#include "llvm/BinaryFormat/Dwarf.h"
-#include "llvm/CodeGen/AsmPrinter.h"
-#include "llvm/CodeGen/DIE.h"
-#include "llvm/DebugInfo/DWARF/DWARFDebugLine.h"
-#include "llvm/DebugInfo/DWARF/DWARFFormValue.h"
-#include "llvm/MC/MCAsmBackend.h"
-#include "llvm/MC/MCAsmInfo.h"
-#include "llvm/MC/MCCodeEmitter.h"
-#include "llvm/MC/MCContext.h"
-#include "llvm/MC/MCDwarf.h"
-#include "llvm/MC/MCInstrInfo.h"
-#include "llvm/MC/MCObjectFileInfo.h"
-#include "llvm/MC/MCObjectWriter.h"
-#include "llvm/MC/MCRegisterInfo.h"
-#include "llvm/MC/MCStreamer.h"
-#include "llvm/MC/MCSubtargetInfo.h"
-#include "llvm/MC/MCTargetOptionsCommandFlags.h"
-#include "llvm/Pass.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/LEB128.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/Target/TargetLoweringObjectFile.h"
-#include "llvm/Target/TargetMachine.h"
-#include "llvm/Target/TargetOptions.h"
-
-using namespace llvm;
-using namespace dwarf;
-
-mc::RegisterMCTargetOptionsFlags MOF;
-
-namespace {} // end anonymous namespace
-
-//===----------------------------------------------------------------------===//
-/// dwarfgen::DIE implementation.
-//===----------------------------------------------------------------------===//
-unsigned dwarfgen::DIE::computeSizeAndOffsets(unsigned Offset) {
-  auto &DG = CU->getGenerator();
-  return Die->computeOffsetsAndAbbrevs(DG.getAsmPrinter(), DG.getAbbrevSet(),
-                                       Offset);
-}
-
-void dwarfgen::DIE::addAttribute(uint16_t A, dwarf::Form Form, uint64_t U) {
-  auto &DG = CU->getGenerator();
-  Die->addValue(DG.getAllocator(), static_cast<dwarf::Attribute>(A), Form,
-                DIEInteger(U));
-}
-
-void dwarfgen::DIE::addAttribute(uint16_t A, dwarf::Form Form, const MCExpr &Expr) {
-  auto &DG = CU->getGenerator();
-  Die->addValue(DG.getAllocator(), static_cast<dwarf::Attribute>(A), Form,
-                DIEExpr(&Expr));
-}
-
-void dwarfgen::DIE::addAttribute(uint16_t A, dwarf::Form Form,
-                                 StringRef String) {
-  auto &DG = CU->getGenerator();
-  switch (Form) {
-  case DW_FORM_string:
-    Die->addValue(DG.getAllocator(), static_cast<dwarf::Attribute>(A), Form,
-                  new (DG.getAllocator())
-                      DIEInlineString(String, DG.getAllocator()));
-    break;
-
-  case DW_FORM_strp:
-    Die->addValue(
-        DG.getAllocator(), static_cast<dwarf::Attribute>(A), Form,
-        DIEString(DG.getStringPool().getEntry(*DG.getAsmPrinter(), String)));
-    break;
-
-  case DW_FORM_GNU_str_index:
-  case DW_FORM_strx:
-  case DW_FORM_strx1:
-  case DW_FORM_strx2:
-  case DW_FORM_strx3:
-  case DW_FORM_strx4:
-    Die->addValue(DG.getAllocator(), static_cast<dwarf::Attribute>(A), Form,
-                  DIEString(DG.getStringPool().getIndexedEntry(
-                      *DG.getAsmPrinter(), String)));
-    break;
-
-  default:
-    llvm_unreachable("Unhandled form!");
-  }
-}
-
-void dwarfgen::DIE::addAttribute(uint16_t A, dwarf::Form Form,
-                                 dwarfgen::DIE &RefDie) {
-  auto &DG = CU->getGenerator();
-  Die->addValue(DG.getAllocator(), static_cast<dwarf::Attribute>(A), Form,
-                DIEEntry(*RefDie.Die));
-}
-
-void dwarfgen::DIE::addAttribute(uint16_t A, dwarf::Form Form, const void *P,
-                                 size_t S) {
-  auto &DG = CU->getGenerator();
-  DIEBlock *Block = new (DG.getAllocator()) DIEBlock;
-  for (size_t I = 0; I < S; ++I)
-    Block->addValue(
-        DG.getAllocator(), (dwarf::Attribute)0, dwarf::DW_FORM_data1,
-        DIEInteger(
-            (const_cast<uint8_t *>(static_cast<const uint8_t *>(P)))[I]));
-
-  Block->ComputeSize(DG.getAsmPrinter());
-  Die->addValue(DG.getAllocator(), static_cast<dwarf::Attribute>(A), Form,
-                Block);
-}
-
-void dwarfgen::DIE::addAttribute(uint16_t A, dwarf::Form Form) {
-  auto &DG = CU->getGenerator();
-  assert(Form == DW_FORM_flag_present);
-  Die->addValue(DG.getAllocator(), static_cast<dwarf::Attribute>(A), Form,
-                DIEInteger(1));
-}
-
-void dwarfgen::DIE::addStrOffsetsBaseAttribute() {
-  auto &DG = CU->getGenerator();
-  auto &MC = *DG.getMCContext();
-  AsmPrinter *Asm = DG.getAsmPrinter();
-
-  const MCSymbol *SectionStart =
-      Asm->getObjFileLowering().getDwarfStrOffSection()->getBeginSymbol();
-
-  const MCExpr *Expr =
-      MCSymbolRefExpr::create(DG.getStringOffsetsStartSym(), MC);
-
-  if (!Asm->MAI->doesDwarfUseRelocationsAcrossSections())
-    Expr = MCBinaryExpr::createSub(
-        Expr, MCSymbolRefExpr::create(SectionStart, MC), MC);
-
-  addAttribute(dwarf::DW_AT_str_offsets_base, DW_FORM_sec_offset, *Expr);
-}
-
-dwarfgen::DIE dwarfgen::DIE::addChild(dwarf::Tag Tag) {
-  auto &DG = CU->getGenerator();
-  return dwarfgen::DIE(CU,
-                       &Die->addChild(llvm::DIE::get(DG.getAllocator(), Tag)));
-}
-
-dwarfgen::DIE dwarfgen::CompileUnit::getUnitDIE() {
-  return dwarfgen::DIE(this, &DU.getUnitDie());
-}
-
-//===----------------------------------------------------------------------===//
-/// dwarfgen::LineTable implementation.
-//===----------------------------------------------------------------------===//
-DWARFDebugLine::Prologue dwarfgen::LineTable::createBasicPrologue() const {
-  DWARFDebugLine::Prologue P;
-  switch (Version) {
-  case 2:
-  case 3:
-    P.TotalLength = 41;
-    P.PrologueLength = 35;
-    break;
-  case 4:
-    P.TotalLength = 42;
-    P.PrologueLength = 36;
-    break;
-  case 5:
-    P.TotalLength = 50;
-    P.PrologueLength = 42;
-    P.FormParams.AddrSize = AddrSize;
-    break;
-  default:
-    llvm_unreachable("unsupported version");
-  }
-  if (Format == DWARF64) {
-    P.TotalLength += 4;
-    P.FormParams.Format = DWARF64;
-  }
-  P.TotalLength += getContentsSize();
-  P.FormParams.Version = Version;
-  P.MinInstLength = 1;
-  P.MaxOpsPerInst = 1;
-  P.DefaultIsStmt = 1;
-  P.LineBase = -5;
-  P.LineRange = 14;
-  P.OpcodeBase = 13;
-  P.StandardOpcodeLengths = {0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1};
-  P.IncludeDirectories.push_back(
-      DWARFFormValue::createFromPValue(DW_FORM_string, "a dir"));
-  P.FileNames.push_back(DWARFDebugLine::FileNameEntry());
-  P.FileNames.back().Name =
-      DWARFFormValue::createFromPValue(DW_FORM_string, "a file");
-  return P;
-}
-
-void dwarfgen::LineTable::setPrologue(DWARFDebugLine::Prologue NewPrologue) {
-  Prologue = NewPrologue;
-  CustomPrologue.clear();
-}
-
-void dwarfgen::LineTable::setCustomPrologue(
-    ArrayRef<ValueAndLength> NewPrologue) {
-  Prologue.reset();
-  CustomPrologue = NewPrologue;
-}
-
-void dwarfgen::LineTable::addByte(uint8_t Value) {
-  Contents.push_back({Value, Byte});
-}
-
-void dwarfgen::LineTable::addStandardOpcode(uint8_t Opcode,
-                                            ArrayRef<ValueAndLength> Operands) {
-  Contents.push_back({Opcode, Byte});
-  Contents.insert(Contents.end(), Operands.begin(), Operands.end());
-}
-
-void dwarfgen::LineTable::addExtendedOpcode(uint64_t Length, uint8_t Opcode,
-                                            ArrayRef<ValueAndLength> Operands) {
-  Contents.push_back({0, Byte});
-  Contents.push_back({Length, ULEB});
-  Contents.push_back({Opcode, Byte});
-  Contents.insert(Contents.end(), Operands.begin(), Operands.end());
-}
-
-void dwarfgen::LineTable::generate(MCContext &MC, AsmPrinter &Asm) const {
-  MC.setDwarfVersion(Version);
-
-  MCSymbol *EndSymbol = nullptr;
-  if (!CustomPrologue.empty()) {
-    writeData(CustomPrologue, Asm);
-  } else if (!Prologue) {
-    EndSymbol = writeDefaultPrologue(Asm);
-  } else {
-    writePrologue(Asm);
-  }
-
-  writeData(Contents, Asm);
-  if (EndSymbol != nullptr)
-    Asm.OutStreamer->emitLabel(EndSymbol);
-}
-
-void dwarfgen::LineTable::writeData(ArrayRef<ValueAndLength> Data,
-                                    AsmPrinter &Asm) const {
-  for (auto Entry : Data) {
-    switch (Entry.Length) {
-    case Byte:
-    case Half:
-    case Long:
-    case Quad:
-      Asm.OutStreamer->emitIntValue(Entry.Value, Entry.Length);
-      continue;
-    case ULEB:
-      Asm.emitULEB128(Entry.Value);
-      continue;
-    case SLEB:
-      Asm.emitSLEB128(Entry.Value);
-      continue;
-    }
-    llvm_unreachable("unsupported ValueAndLength Length value");
-  }
-}
-
-size_t dwarfgen::LineTable::getContentsSize() const {
-  size_t Size = 0;
-  for (auto Entry : Contents) {
-    switch (Entry.Length) {
-    case ULEB:
-      Size += getULEB128Size(Entry.Value);
-      break;
-    case SLEB:
-      Size += getSLEB128Size(Entry.Value);
-      break;
-    default:
-      Size += Entry.Length;
-      break;
-    }
-  }
-  return Size;
-}
-
-MCSymbol *dwarfgen::LineTable::writeDefaultPrologue(AsmPrinter &Asm) const {
-  MCSymbol *UnitStart = Asm.createTempSymbol("line_unit_start");
-  MCSymbol *UnitEnd = Asm.createTempSymbol("line_unit_end");
-  if (Format == DwarfFormat::DWARF64) {
-    Asm.emitInt32((int)dwarf::DW_LENGTH_DWARF64);
-    Asm.emitLabelDifference(UnitEnd, UnitStart, 8);
-  } else {
-    Asm.emitLabelDifference(UnitEnd, UnitStart, 4);
-  }
-  Asm.OutStreamer->emitLabel(UnitStart);
-  Asm.emitInt16(Version);
-  if (Version == 5) {
-    Asm.emitInt8(AddrSize);
-    Asm.emitInt8(SegSize);
-  }
-
-  MCSymbol *PrologueStart = Asm.createTempSymbol("line_prologue_start");
-  MCSymbol *PrologueEnd = Asm.createTempSymbol("line_prologue_end");
-  Asm.emitLabelDifference(PrologueEnd, PrologueStart,
-                          Format == DwarfFormat::DWARF64 ? 8 : 4);
-  Asm.OutStreamer->emitLabel(PrologueStart);
-
-  DWARFDebugLine::Prologue DefaultPrologue = createBasicPrologue();
-  writeProloguePayload(DefaultPrologue, Asm);
-  Asm.OutStreamer->emitLabel(PrologueEnd);
-  return UnitEnd;
-}
-
-void dwarfgen::LineTable::writePrologue(AsmPrinter &Asm) const {
-  if (Format == DwarfFormat::DWARF64) {
-    Asm.emitInt32((int)dwarf::DW_LENGTH_DWARF64);
-    Asm.emitInt64(Prologue->TotalLength);
-  } else {
-    Asm.emitInt32(Prologue->TotalLength);
-  }
-  Asm.emitInt16(Prologue->getVersion());
-  if (Version == 5) {
-    Asm.emitInt8(Prologue->getAddressSize());
-    Asm.emitInt8(Prologue->SegSelectorSize);
-  }
-  if (Format == DwarfFormat::DWARF64)
-    Asm.emitInt64(Prologue->PrologueLength);
-  else
-    Asm.emitInt32(Prologue->PrologueLength);
-
-  writeProloguePayload(*Prologue, Asm);
-}
-
-static void writeCString(StringRef Str, AsmPrinter &Asm) {
-  Asm.OutStreamer->emitBytes(Str);
-  Asm.emitInt8(0);
-}
-
-static void writeV2IncludeAndFileTable(const DWARFDebugLine::Prologue &Prologue,
-                                       AsmPrinter &Asm) {
-  for (auto Include : Prologue.IncludeDirectories) {
-    assert(Include.getAsCString() && "expected a string form for include dir");
-    writeCString(*Include.getAsCString(), Asm);
-  }
-  Asm.emitInt8(0);
-
-  for (auto File : Prologue.FileNames) {
-    assert(File.Name.getAsCString() && "expected a string form for file name");
-    writeCString(*File.Name.getAsCString(), Asm);
-    Asm.emitULEB128(File.DirIdx);
-    Asm.emitULEB128(File.ModTime);
-    Asm.emitULEB128(File.Length);
-  }
-  Asm.emitInt8(0);
-}
-
-static void writeV5IncludeAndFileTable(const DWARFDebugLine::Prologue &Prologue,
-                                       AsmPrinter &Asm) {
-  Asm.emitInt8(1); // directory_entry_format_count.
-  // TODO: Add support for other content descriptions - we currently only
-  // support a single DW_LNCT_path/DW_FORM_string.
-  Asm.emitULEB128(DW_LNCT_path);
-  Asm.emitULEB128(DW_FORM_string);
-  Asm.emitULEB128(Prologue.IncludeDirectories.size());
-  for (auto Include : Prologue.IncludeDirectories) {
-    assert(Include.getAsCString() && "expected a string form for include dir");
-    writeCString(*Include.getAsCString(), Asm);
-  }
-
-  Asm.emitInt8(2); // file_name_entry_format_count.
-  Asm.emitULEB128(DW_LNCT_path);
-  Asm.emitULEB128(DW_FORM_string);
-  Asm.emitULEB128(DW_LNCT_directory_index);
-  Asm.emitULEB128(DW_FORM_data1);
-  Asm.emitULEB128(Prologue.FileNames.size());
-  for (auto File : Prologue.FileNames) {
-    assert(File.Name.getAsCString() && "expected a string form for file name");
-    writeCString(*File.Name.getAsCString(), Asm);
-    Asm.emitInt8(File.DirIdx);
-  }
-}
-
-void dwarfgen::LineTable::writeProloguePayload(
-    const DWARFDebugLine::Prologue &Prologue, AsmPrinter &Asm) const {
-  Asm.emitInt8(Prologue.MinInstLength);
-  if (Version >= 4)
-    Asm.emitInt8(Prologue.MaxOpsPerInst);
-  Asm.emitInt8(Prologue.DefaultIsStmt);
-  Asm.emitInt8(Prologue.LineBase);
-  Asm.emitInt8(Prologue.LineRange);
-  Asm.emitInt8(Prologue.OpcodeBase);
-  for (auto Length : Prologue.StandardOpcodeLengths) {
-    Asm.emitInt8(Length);
-  }
-
-  if (Version < 5)
-    writeV2IncludeAndFileTable(Prologue, Asm);
-  else
-    writeV5IncludeAndFileTable(Prologue, Asm);
-}
-
-//===----------------------------------------------------------------------===//
-/// dwarfgen::Generator implementation.
-//===----------------------------------------------------------------------===//
-
-dwarfgen::Generator::Generator()
-    : MAB(nullptr), MCE(nullptr), MS(nullptr), TLOF(nullptr),
-      StringPool(nullptr), Abbreviations(Allocator),
-      StringOffsetsStartSym(nullptr), Version(0) {}
-dwarfgen::Generator::~Generator() = default;
-
-llvm::Expected<std::unique_ptr<dwarfgen::Generator>>
-dwarfgen::Generator::create(Triple TheTriple, uint16_t DwarfVersion) {
-  std::unique_ptr<dwarfgen::Generator> GenUP(new dwarfgen::Generator());
-  llvm::Error error = GenUP->init(TheTriple, DwarfVersion);
-  if (error)
-    return Expected<std::unique_ptr<dwarfgen::Generator>>(std::move(error));
-  return Expected<std::unique_ptr<dwarfgen::Generator>>(std::move(GenUP));
-}
-
-llvm::Error dwarfgen::Generator::init(Triple TheTriple, uint16_t V) {
-  Version = V;
-  std::string ErrorStr;
-  std::string TripleName;
-
-  // Get the target.
-  const Target *TheTarget =
-      TargetRegistry::lookupTarget(TripleName, TheTriple, ErrorStr);
-  if (!TheTarget)
-    return make_error<StringError>(ErrorStr, inconvertibleErrorCode());
-
-  TripleName = TheTriple.getTriple();
-
-  // Create all the MC Objects.
-  MRI.reset(TheTarget->createMCRegInfo(TripleName));
-  if (!MRI)
-    return make_error<StringError>(Twine("no register info for target ") +
-                                       TripleName,
-                                   inconvertibleErrorCode());
-
-  MCTargetOptions MCOptions = mc::InitMCTargetOptionsFromFlags();
-  MAI.reset(TheTarget->createMCAsmInfo(*MRI, TripleName, MCOptions));
-  if (!MAI)
-    return make_error<StringError>("no asm info for target " + TripleName,
-                                   inconvertibleErrorCode());
-
-  MSTI.reset(TheTarget->createMCSubtargetInfo(TripleName, "", ""));
-  if (!MSTI)
-    return make_error<StringError>("no subtarget info for target " + TripleName,
-                                   inconvertibleErrorCode());
-
-  MAB = TheTarget->createMCAsmBackend(*MSTI, *MRI, MCOptions);
-  if (!MAB)
-    return make_error<StringError>("no asm backend for target " + TripleName,
-                                   inconvertibleErrorCode());
-
-  MII.reset(TheTarget->createMCInstrInfo());
-  if (!MII)
-    return make_error<StringError>("no instr info info for target " +
-                                       TripleName,
-                                   inconvertibleErrorCode());
-
-  TM.reset(TheTarget->createTargetMachine(TripleName, "", "", TargetOptions(),
-                                          None));
-  if (!TM)
-    return make_error<StringError>("no target machine for target " + TripleName,
-                                   inconvertibleErrorCode());
-
-  MC.reset(new MCContext(TheTriple, MAI.get(), MRI.get(), MSTI.get()));
-  TLOF = TM->getObjFileLowering();
-  TLOF->Initialize(*MC, *TM);
-  MC->setObjectFileInfo(TLOF);
-
-  MCE = TheTarget->createMCCodeEmitter(*MII, *MRI, *MC);
-  if (!MCE)
-    return make_error<StringError>("no code emitter for target " + TripleName,
-                                   inconvertibleErrorCode());
-
-  Stream = std::make_unique<raw_svector_ostream>(FileBytes);
-
-  MS = TheTarget->createMCObjectStreamer(
-      TheTriple, *MC, std::unique_ptr<MCAsmBackend>(MAB),
-      MAB->createObjectWriter(*Stream), std::unique_ptr<MCCodeEmitter>(MCE),
-      *MSTI, MCOptions.MCRelaxAll, MCOptions.MCIncrementalLinkerCompatible,
-      /*DWARFMustBeAtTheEnd*/ false);
-  if (!MS)
-    return make_error<StringError>("no object streamer for target " +
-                                       TripleName,
-                                   inconvertibleErrorCode());
-
-
-  // Finally create the AsmPrinter we'll use to emit the DIEs.
-  Asm.reset(TheTarget->createAsmPrinter(*TM, std::unique_ptr<MCStreamer>(MS)));
-  if (!Asm)
-    return make_error<StringError>("no asm printer for target " + TripleName,
-                                   inconvertibleErrorCode());
-
-  // Set the DWARF version correctly on all classes that we use.
-  MC->setDwarfVersion(Version);
-  Asm->setDwarfVersion(Version);
-
-  StringPool = std::make_unique<DwarfStringPool>(Allocator, *Asm, StringRef());
-  StringOffsetsStartSym = Asm->createTempSymbol("str_offsets_base");
-
-  return Error::success();
-}
-
-StringRef dwarfgen::Generator::generate() {
-  // Offset from the first CU in the debug info section is 0 initially.
-  uint64_t SecOffset = 0;
-
-  // Iterate over each compile unit and set the size and offsets for each
-  // DIE within each compile unit. All offsets are CU relative.
-  for (auto &CU : CompileUnits) {
-    // Set the absolute .debug_info offset for this compile unit.
-    CU->setOffset(SecOffset);
-    // The DIEs contain compile unit relative offsets.
-    unsigned CUOffset = 11;
-    CUOffset = CU->getUnitDIE().computeSizeAndOffsets(CUOffset);
-    // Update our absolute .debug_info offset.
-    SecOffset += CUOffset;
-    CU->setLength(CUOffset - 4);
-  }
-  Abbreviations.Emit(Asm.get(), TLOF->getDwarfAbbrevSection());
-
-  StringPool->emitStringOffsetsTableHeader(*Asm, TLOF->getDwarfStrOffSection(),
-                                           StringOffsetsStartSym);
-  StringPool->emit(*Asm, TLOF->getDwarfStrSection(),
-                   TLOF->getDwarfStrOffSection());
-
-  MS->SwitchSection(TLOF->getDwarfInfoSection());
-  for (auto &CU : CompileUnits) {
-    uint16_t Version = CU->getVersion();
-    auto Length = CU->getLength();
-    MC->setDwarfVersion(Version);
-    assert(Length != -1U);
-    Asm->emitInt32(Length);
-    Asm->emitInt16(Version);
-    if (Version <= 4) {
-      Asm->emitInt32(0);
-      Asm->emitInt8(CU->getAddressSize());
-    } else {
-      Asm->emitInt8(dwarf::DW_UT_compile);
-      Asm->emitInt8(CU->getAddressSize());
-      Asm->emitInt32(0);
-    }
-    Asm->emitDwarfDIE(*CU->getUnitDIE().Die);
-  }
-
-  MS->SwitchSection(TLOF->getDwarfLineSection());
-  for (auto &LT : LineTables)
-    LT->generate(*MC, *Asm);
-
-  MS->Finish();
-  if (FileBytes.empty())
-    return StringRef();
-  return StringRef(FileBytes.data(), FileBytes.size());
-}
-
-bool dwarfgen::Generator::saveFile(StringRef Path) {
-  if (FileBytes.empty())
-    return false;
-  std::error_code EC;
-  raw_fd_ostream Strm(Path, EC, sys::fs::OF_None);
-  if (EC)
-    return false;
-  Strm.write(FileBytes.data(), FileBytes.size());
-  Strm.close();
-  return true;
-}
-
-dwarfgen::CompileUnit &dwarfgen::Generator::addCompileUnit() {
-  CompileUnits.push_back(
-      std::make_unique<CompileUnit>(*this, Version, Asm->getPointerSize()));
-  return *CompileUnits.back();
-}
-
-dwarfgen::LineTable &dwarfgen::Generator::addLineTable(DwarfFormat Format) {
-  LineTables.push_back(
-      std::make_unique<LineTable>(Version, Format, Asm->getPointerSize()));
-  return *LineTables.back();
-}
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DwarfGenerator.h b/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DwarfGenerator.h
deleted file mode 100644
index e55dc073018..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DwarfGenerator.h
+++ /dev/null
@@ -1,326 +0,0 @@
-//===--- unittests/DebugInfo/DWARF/DwarfGenerator.h -------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// A file that can generate DWARF debug info for unit tests.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_UNITTESTS_DEBUG_INFO_DWARF_DWARFGENERATOR_H
-#define LLVM_UNITTESTS_DEBUG_INFO_DWARF_DWARFGENERATOR_H
-
-#include "llvm/ADT/StringRef.h"
-#include "llvm/CodeGen/DIE.h"
-#include "llvm/DebugInfo/DWARF/DWARFDebugLine.h"
-#include "llvm/Support/Error.h"
-
-#include <memory>
-#include <string>
-#include <tuple>
-#include <vector>
-
-namespace llvm {
-
-class AsmPrinter;
-class DIE;
-class DIEAbbrev;
-class DwarfStringPool;
-class MCAsmBackend;
-class MCAsmInfo;
-class MCCodeEmitter;
-class MCContext;
-struct MCDwarfLineTableParams;
-class MCInstrInfo;
-class MCRegisterInfo;
-class MCStreamer;
-class MCSubtargetInfo;
-class raw_fd_ostream;
-class TargetLoweringObjectFile;
-class TargetMachine;
-class Triple;
-
-namespace dwarfgen {
-
-class Generator;
-class CompileUnit;
-
-/// A DWARF debug information entry class used to generate DWARF DIEs.
-///
-/// This class is used to quickly generate DWARF debug information by creating
-/// child DIEs or adding attributes to the current DIE. Instances of this class
-/// are created from the compile unit (dwarfgen::CompileUnit::getUnitDIE()) or
-/// by calling dwarfgen::DIE::addChild(...) and using the returned DIE object.
-class DIE {
-  dwarfgen::CompileUnit *CU;
-  llvm::DIE *Die;
-
-protected:
-  friend class Generator;
-  friend class CompileUnit;
-
-  DIE(CompileUnit *U = nullptr, llvm::DIE *D = nullptr) : CU(U), Die(D) {}
-
-  /// Called with a compile/type unit relative offset prior to generating the
-  /// DWARF debug info.
-  ///
-  /// \param CUOffset the compile/type unit relative offset where the
-  /// abbreviation code for this DIE will be encoded.
-  unsigned computeSizeAndOffsets(unsigned CUOffset);
-
-public:
-  /// Add an attribute value that has no value.
-  ///
-  /// \param Attr a dwarf::Attribute enumeration value or any uint16_t that
-  /// represents a user defined DWARF attribute.
-  /// \param Form the dwarf::Form to use when encoding the attribute. This is
-  /// only used with the DW_FORM_flag_present form encoding.
-  void addAttribute(uint16_t Attr, dwarf::Form Form);
-
-  /// Add an attribute value to be encoded as a DIEInteger
-  ///
-  /// \param Attr a dwarf::Attribute enumeration value or any uint16_t that
-  /// represents a user defined DWARF attribute.
-  /// \param Form the dwarf::Form to use when encoding the attribute.
-  /// \param U the unsigned integer to encode.
-  void addAttribute(uint16_t Attr, dwarf::Form Form, uint64_t U);
-
-  /// Add an attribute value to be encoded as a DIEExpr
-  ///
-  /// \param Attr a dwarf::Attribute enumeration value or any uint16_t that
-  /// represents a user defined DWARF attribute.
-  /// \param Form the dwarf::Form to use when encoding the attribute.
-  /// \param Expr the MC expression used to compute the value.
-  void addAttribute(uint16_t Attr, dwarf::Form Form, const MCExpr &Expr);
-
-  /// Add an attribute value to be encoded as a DIEString or DIEInlinedString.
-  ///
-  /// \param Attr a dwarf::Attribute enumeration value or any uint16_t that
-  /// represents a user defined DWARF attribute.
-  /// \param Form the dwarf::Form to use when encoding the attribute. The form
-  /// must be one of DW_FORM_strp or DW_FORM_string.
-  /// \param String the string to encode.
-  void addAttribute(uint16_t Attr, dwarf::Form Form, StringRef String);
-
-  /// Add an attribute value to be encoded as a DIEEntry.
-  ///
-  /// DIEEntry attributes refer to other llvm::DIE objects that have been
-  /// created.
-  ///
-  /// \param Attr a dwarf::Attribute enumeration value or any uint16_t that
-  /// represents a user defined DWARF attribute.
-  /// \param Form the dwarf::Form to use when encoding the attribute. The form
-  /// must be one of DW_FORM_strp or DW_FORM_string.
-  /// \param RefDie the DIE that this attriute refers to.
-  void addAttribute(uint16_t Attr, dwarf::Form Form, dwarfgen::DIE &RefDie);
-
-  /// Add an attribute value to be encoded as a DIEBlock.
-  ///
-  /// DIEBlock attributes refers to binary data that is stored as the
-  /// attribute's value.
-  ///
-  /// \param Attr a dwarf::Attribute enumeration value or any uint16_t that
-  /// represents a user defined DWARF attribute.
-  /// \param Form the dwarf::Form to use when encoding the attribute. The form
-  /// must be one of DW_FORM_strp or DW_FORM_string.
-  /// \param P a pointer to the data to store as the attribute value.
-  /// \param S the size in bytes of the data pointed to by P .
-  void addAttribute(uint16_t Attr, dwarf::Form Form, const void *P, size_t S);
-
-  /// Add a DW_AT_str_offsets_base attribute to this DIE.
-  void addStrOffsetsBaseAttribute();
-
-  /// Add a new child to this DIE object.
-  ///
-  /// \param Tag the dwarf::Tag to assing to the llvm::DIE object.
-  /// \returns the newly created DIE object that is now a child owned by this
-  /// object.
-  dwarfgen::DIE addChild(dwarf::Tag Tag);
-};
-
-/// A DWARF compile unit used to generate DWARF compile/type units.
-///
-/// Instances of these classes are created by instances of the Generator
-/// class. All information required to generate a DWARF compile unit is
-/// contained inside this class.
-class CompileUnit {
-  Generator &DG;
-  BasicDIEUnit DU;
-  uint64_t Length; /// The length in bytes of all of the DIEs in this unit.
-  const uint16_t Version; /// The Dwarf version number for this unit.
-  const uint8_t AddrSize; /// The size in bytes of an address for this unit.
-
-public:
-  CompileUnit(Generator &D, uint16_t V, uint8_t A)
-      : DG(D), DU(dwarf::DW_TAG_compile_unit), Version(V), AddrSize(A) {}
-  DIE getUnitDIE();
-  Generator &getGenerator() { return DG; }
-  uint64_t getOffset() const { return DU.getDebugSectionOffset(); }
-  uint64_t getLength() const { return Length; }
-  uint16_t getVersion() const { return Version; }
-  uint16_t getAddressSize() const { return AddrSize; }
-  void setOffset(uint64_t Offset) { DU.setDebugSectionOffset(Offset); }
-  void setLength(uint64_t L) { Length = L; }
-};
-
-/// A DWARF line unit-like class used to generate DWARF line units.
-///
-/// Instances of this class are created by instances of the Generator class.
-class LineTable {
-public:
-  enum ValueLength { Byte = 1, Half = 2, Long = 4, Quad = 8, ULEB, SLEB };
-
-  struct ValueAndLength {
-    uint64_t Value = 0;
-    ValueLength Length = Byte;
-  };
-
-  LineTable(uint16_t Version, dwarf::DwarfFormat Format, uint8_t AddrSize,
-            uint8_t SegSize = 0)
-      : Version(Version), Format(Format), AddrSize(AddrSize), SegSize(SegSize) {
-    assert(Version >= 2 && Version <= 5 && "unsupported version");
-  }
-
-  // Create a Prologue suitable to pass to setPrologue, with a single file and
-  // include directory entry.
-  DWARFDebugLine::Prologue createBasicPrologue() const;
-
-  // Set or replace the current prologue with the specified prologue. If no
-  // prologue is set, a default one will be used when generating.
-  void setPrologue(DWARFDebugLine::Prologue NewPrologue);
-  // Used to write an arbitrary payload instead of the standard prologue. This
-  // is useful if you wish to test handling of corrupt .debug_line sections.
-  void setCustomPrologue(ArrayRef<ValueAndLength> NewPrologue);
-
-  // Add a byte to the program, with the given value. This can be used to
-  // specify a special opcode, or to add arbitrary contents to the section.
-  void addByte(uint8_t Value);
-  // Add a standard opcode to the program. The opcode and operands do not have
-  // to be valid.
-  void addStandardOpcode(uint8_t Opcode, ArrayRef<ValueAndLength> Operands);
-  // Add an extended opcode to the program with the specified length, opcode,
-  // and operands. These values do not have to be valid.
-  void addExtendedOpcode(uint64_t Length, uint8_t Opcode,
-                         ArrayRef<ValueAndLength> Operands);
-
-  // Write the contents of the LineUnit to the current section in the generator.
-  void generate(MCContext &MC, AsmPrinter &Asm) const;
-
-private:
-  void writeData(ArrayRef<ValueAndLength> Data, AsmPrinter &Asm) const;
-  MCSymbol *writeDefaultPrologue(AsmPrinter &Asm) const;
-  void writePrologue(AsmPrinter &Asm) const;
-
-  void writeProloguePayload(const DWARFDebugLine::Prologue &Prologue,
-                            AsmPrinter &Asm) const;
-
-  // Calculate the number of bytes the Contents will take up.
-  size_t getContentsSize() const;
-
-  llvm::Optional<DWARFDebugLine::Prologue> Prologue;
-  std::vector<ValueAndLength> CustomPrologue;
-  std::vector<ValueAndLength> Contents;
-
-  // The Version field is used for determining how to write the Prologue, if a
-  // non-custom prologue is used. The version value actually written, will be
-  // that specified in the Prologue, if a custom prologue has been passed in.
-  // Otherwise, it will be this value.
-  uint16_t Version;
-
-  dwarf::DwarfFormat Format;
-  uint8_t AddrSize;
-  uint8_t SegSize;
-};
-
-/// A DWARF generator.
-///
-/// Generate DWARF for unit tests by creating any instance of this class and
-/// calling Generator::addCompileUnit(), and then getting the dwarfgen::DIE from
-/// the returned compile unit and adding attributes and children to each DIE.
-class Generator {
-  std::unique_ptr<MCRegisterInfo> MRI;
-  std::unique_ptr<MCAsmInfo> MAI;
-  std::unique_ptr<MCContext> MC;
-  MCAsmBackend *MAB; // Owned by MCStreamer
-  std::unique_ptr<MCInstrInfo> MII;
-  std::unique_ptr<MCSubtargetInfo> MSTI;
-  MCCodeEmitter *MCE; // Owned by MCStreamer
-  MCStreamer *MS;     // Owned by AsmPrinter
-  std::unique_ptr<TargetMachine> TM;
-  TargetLoweringObjectFile *TLOF; // Owned by TargetMachine;
-  std::unique_ptr<AsmPrinter> Asm;
-  BumpPtrAllocator Allocator;
-  std::unique_ptr<DwarfStringPool> StringPool; // Entries owned by Allocator.
-  std::vector<std::unique_ptr<CompileUnit>> CompileUnits;
-  std::vector<std::unique_ptr<LineTable>> LineTables;
-  DIEAbbrevSet Abbreviations;
-
-  MCSymbol *StringOffsetsStartSym;
-
-  SmallString<4096> FileBytes;
-  /// The stream we use to generate the DWARF into as an ELF file.
-  std::unique_ptr<raw_svector_ostream> Stream;
-  /// The DWARF version to generate.
-  uint16_t Version;
-
-  /// Private constructor, call Generator::Create(...) to get a DWARF generator
-  /// expected.
-  Generator();
-
-  /// Create the streamer and setup the output buffer.
-  llvm::Error init(Triple TheTriple, uint16_t DwarfVersion);
-
-public:
-  /// Create a DWARF generator or get an appropriate error.
-  ///
-  /// \param TheTriple the triple to use when creating any required support
-  /// classes needed to emit the DWARF.
-  /// \param DwarfVersion the version of DWARF to emit.
-  ///
-  /// \returns a llvm::Expected that either contains a unique_ptr to a Generator
-  /// or a llvm::Error.
-  static llvm::Expected<std::unique_ptr<Generator>>
-  create(Triple TheTriple, uint16_t DwarfVersion);
-
-  ~Generator();
-
-  /// Generate all DWARF sections and return a memory buffer that
-  /// contains an ELF file that contains the DWARF.
-  StringRef generate();
-
-  /// Add a compile unit to be generated.
-  ///
-  /// \returns a dwarfgen::CompileUnit that can be used to retrieve the compile
-  /// unit dwarfgen::DIE that can be used to add attributes and add child DIE
-  /// objects to.
-  dwarfgen::CompileUnit &addCompileUnit();
-
-  /// Add a line table unit to be generated.
-  /// \param DwarfFormat the DWARF format to use (DWARF32 or DWARF64).
-  ///
-  /// \returns a dwarfgen::LineTable that can be used to customise the contents
-  /// of the line table.
-  LineTable &
-  addLineTable(dwarf::DwarfFormat DwarfFormat = dwarf::DwarfFormat::DWARF32);
-
-  BumpPtrAllocator &getAllocator() { return Allocator; }
-  AsmPrinter *getAsmPrinter() const { return Asm.get(); }
-  MCContext *getMCContext() const { return MC.get(); }
-  DIEAbbrevSet &getAbbrevSet() { return Abbreviations; }
-  DwarfStringPool &getStringPool() { return *StringPool; }
-  MCSymbol *getStringOffsetsStartSym() const { return StringOffsetsStartSym; }
-
-  /// Save the generated DWARF file to disk.
-  ///
-  /// \param Path the path to save the ELF file to.
-  bool saveFile(StringRef Path);
-};
-
-} // end namespace dwarfgen
-
-} // end namespace llvm
-
-#endif // LLVM_UNITTESTS_DEBUG_INFO_DWARF_DWARFGENERATOR_H
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DwarfUtils.cpp b/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DwarfUtils.cpp
deleted file mode 100644
index 20dc7bc8ff1..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DwarfUtils.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-//===--- unittests/DebugInfo/DWARF/DwarfUtils.cpp ---------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "DwarfUtils.h"
-#include "llvm/ADT/Triple.h"
-#include "llvm/Config/llvm-config.h"
-#include "llvm/Support/Host.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-
-using namespace llvm;
-
-static void initLLVMIfNeeded() {
-  static bool gInitialized = false;
-  if (!gInitialized) {
-    gInitialized = true;
-    InitializeAllTargets();
-    InitializeAllTargetMCs();
-    InitializeAllAsmPrinters();
-    InitializeAllAsmParsers();
-  }
-}
-
-Triple llvm::dwarf::utils::getNormalizedDefaultTargetTriple() {
-  Triple T(Triple::normalize(sys::getDefaultTargetTriple()));
-
-  return T;
-}
-
-Triple llvm::dwarf::utils::getDefaultTargetTripleForAddrSize(uint8_t AddrSize) {
-  Triple T = getNormalizedDefaultTargetTriple();
-
-  assert((AddrSize == 4 || AddrSize == 8) &&
-         "Only 32-bit/64-bit address size variants are supported");
-
-  // If a 32-bit/64-bit address size was specified, try to convert the triple
-  // if it is for the wrong variant.
-  if (AddrSize == 8 && T.isArch32Bit())
-    return T.get64BitArchVariant();
-  if (AddrSize == 4 && T.isArch64Bit())
-    return T.get32BitArchVariant();
-  return T;
-}
-
-bool llvm::dwarf::utils::isConfigurationSupported(Triple &T) {
-  initLLVMIfNeeded();
-  std::string Err;
-  return TargetRegistry::lookupTarget(T.getTriple(), Err);
-}
-
-bool llvm::dwarf::utils::isObjectEmissionSupported(Triple &T) {
-  initLLVMIfNeeded();
-  std::string Err;
-  const Target *TheTarget = TargetRegistry::lookupTarget(T.getTriple(), Err);
-  return TheTarget && TheTarget->hasMCAsmBackend();
-}
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DwarfUtils.h b/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DwarfUtils.h
deleted file mode 100644
index 00eaef25cfb..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/DWARF/DwarfUtils.h
+++ /dev/null
@@ -1,30 +0,0 @@
-//===--- unittests/DebugInfo/DWARF/DwarfUtils.h -----------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_UNITTESTS_DEBUG_INFO_DWARF_DWARFUTILS_H
-#define LLVM_UNITTESTS_DEBUG_INFO_DWARF_DWARFUTILS_H
-
-#include <cstdint>
-
-namespace llvm {
-
-class Triple;
-
-namespace dwarf {
-namespace utils {
-
-Triple getDefaultTargetTripleForAddrSize(uint8_t AddrSize);
-Triple getNormalizedDefaultTargetTriple();
-bool isConfigurationSupported(Triple &T);
-bool isObjectEmissionSupported(Triple &T);
-
-} // end namespace utils
-} // end namespace dwarf
-} // end namespace llvm
-
-#endif // LLVM_UNITTESTS_DEBUG_INFO_DWARF_DWARFUTILS_H
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/GSYM/CMakeLists.txt b/gnu/llvm/llvm/unittests/DebugInfo/GSYM/CMakeLists.txt
deleted file mode 100644
index 029767471c8..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/GSYM/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  DebugInfoDWARF
-  DebugInfoGSYM
-  MC
-  Support
-  ObjectYAML
-  )
-
-add_llvm_unittest(DebugInfoGSYMTests
-  GSYMTest.cpp
-  )
-
-target_link_libraries(DebugInfoGSYMTests PRIVATE LLVMTestingSupport)
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/GSYM/GSYMTest.cpp b/gnu/llvm/llvm/unittests/DebugInfo/GSYM/GSYMTest.cpp
deleted file mode 100644
index 2376b099990..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/GSYM/GSYMTest.cpp
+++ /dev/null
@@ -1,2544 +0,0 @@
-//===- llvm/unittest/DebugInfo/GSYMTest.cpp -------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/DenseMap.h"
-#include "llvm/ADT/SmallString.h"
-#include "llvm/DebugInfo/DWARF/DWARFContext.h"
-#include "llvm/DebugInfo/GSYM/DwarfTransformer.h"
-#include "llvm/DebugInfo/GSYM/Header.h"
-#include "llvm/DebugInfo/GSYM/FileEntry.h"
-#include "llvm/DebugInfo/GSYM/FileWriter.h"
-#include "llvm/DebugInfo/GSYM/FunctionInfo.h"
-#include "llvm/DebugInfo/GSYM/GsymCreator.h"
-#include "llvm/DebugInfo/GSYM/GsymReader.h"
-#include "llvm/DebugInfo/GSYM/InlineInfo.h"
-#include "llvm/DebugInfo/GSYM/Range.h"
-#include "llvm/DebugInfo/GSYM/StringTable.h"
-#include "llvm/ObjectYAML/DWARFEmitter.h"
-#include "llvm/Support/DataExtractor.h"
-#include "llvm/Support/Endian.h"
-#include "llvm/Testing/Support/Error.h"
-
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
-#include <string>
-
-using namespace llvm;
-using namespace gsym;
-
-void checkError(ArrayRef<std::string> ExpectedMsgs, Error Err) {
-  ASSERT_TRUE(bool(Err));
-  size_t WhichMsg = 0;
-  Error Remaining =
-      handleErrors(std::move(Err), [&](const ErrorInfoBase &Actual) {
-        ASSERT_LT(WhichMsg, ExpectedMsgs.size());
-        // Use .str(), because googletest doesn't visualise a StringRef
-        // properly.
-        EXPECT_EQ(Actual.message(), ExpectedMsgs[WhichMsg++]);
-      });
-  EXPECT_EQ(WhichMsg, ExpectedMsgs.size());
-  EXPECT_FALSE(Remaining);
-}
-
-void checkError(std::string ExpectedMsg, Error Err) {
-  checkError(ArrayRef<std::string>{ExpectedMsg}, std::move(Err));
-}
-TEST(GSYMTest, TestFileEntry) {
-  // Make sure default constructed GSYM FileEntry has zeroes in the
-  // directory and basename string table indexes.
-  FileEntry empty1;
-  FileEntry empty2;
-  EXPECT_EQ(empty1.Dir, 0u);
-  EXPECT_EQ(empty1.Base, 0u);
-  // Verify equality operator works
-  FileEntry a1(10, 30);
-  FileEntry a2(10, 30);
-  FileEntry b(10, 40);
-  EXPECT_EQ(empty1, empty2);
-  EXPECT_EQ(a1, a2);
-  EXPECT_NE(a1, b);
-  EXPECT_NE(a1, empty1);
-  // Test we can use llvm::gsym::FileEntry in llvm::DenseMap.
-  DenseMap<FileEntry, uint32_t> EntryToIndex;
-  constexpr uint32_t Index1 = 1;
-  constexpr uint32_t Index2 = 1;
-  auto R = EntryToIndex.insert(std::make_pair(a1, Index1));
-  EXPECT_TRUE(R.second);
-  EXPECT_EQ(R.first->second, Index1);
-  R = EntryToIndex.insert(std::make_pair(a1, Index1));
-  EXPECT_FALSE(R.second);
-  EXPECT_EQ(R.first->second, Index1);
-  R = EntryToIndex.insert(std::make_pair(b, Index2));
-  EXPECT_TRUE(R.second);
-  EXPECT_EQ(R.first->second, Index2);
-  R = EntryToIndex.insert(std::make_pair(a1, Index2));
-  EXPECT_FALSE(R.second);
-  EXPECT_EQ(R.first->second, Index2);
-}
-
-TEST(GSYMTest, TestFunctionInfo) {
-  // Test GSYM FunctionInfo structs and functionality.
-  FunctionInfo invalid;
-  EXPECT_FALSE(invalid.isValid());
-  EXPECT_FALSE(invalid.hasRichInfo());
-  const uint64_t StartAddr = 0x1000;
-  const uint64_t EndAddr = 0x1100;
-  const uint64_t Size = EndAddr - StartAddr;
-  const uint32_t NameOffset = 30;
-  FunctionInfo FI(StartAddr, Size, NameOffset);
-  EXPECT_TRUE(FI.isValid());
-  EXPECT_FALSE(FI.hasRichInfo());
-  EXPECT_EQ(FI.startAddress(), StartAddr);
-  EXPECT_EQ(FI.endAddress(), EndAddr);
-  EXPECT_EQ(FI.size(), Size);
-  const uint32_t FileIdx = 1;
-  const uint32_t Line = 12;
-  FI.OptLineTable = LineTable();
-  FI.OptLineTable->push(LineEntry(StartAddr,FileIdx,Line));
-  EXPECT_TRUE(FI.hasRichInfo());
-  FI.clear();
-  EXPECT_FALSE(FI.isValid());
-  EXPECT_FALSE(FI.hasRichInfo());
-
-  FunctionInfo A1(0x1000, 0x100, NameOffset);
-  FunctionInfo A2(0x1000, 0x100, NameOffset);
-  FunctionInfo B;
-  // Check == operator
-  EXPECT_EQ(A1, A2);
-  // Make sure things are not equal if they only differ by start address.
-  B = A2;
-  B.setStartAddress(0x2000);
-  EXPECT_NE(B, A2);
-  // Make sure things are not equal if they only differ by size.
-  B = A2;
-  B.setSize(0x101);
-  EXPECT_NE(B, A2);
-  // Make sure things are not equal if they only differ by name.
-  B = A2;
-  B.Name = 60;
-  EXPECT_NE(B, A2);
-  // Check < operator.
-  // Check less than where address differs.
-  B = A2;
-  B.setStartAddress(A2.startAddress() + 0x1000);
-  EXPECT_LT(A1, B);
-
-  // We use the < operator to take a variety of different FunctionInfo
-  // structs from a variety of sources: symtab, debug info, runtime info
-  // and we sort them and want the sorting to allow us to quickly get the
-  // best version of a function info.
-  FunctionInfo FISymtab(StartAddr, Size, NameOffset);
-  FunctionInfo FIWithLines(StartAddr, Size, NameOffset);
-  FIWithLines.OptLineTable = LineTable();
-  FIWithLines.OptLineTable->push(LineEntry(StartAddr,FileIdx,Line));
-  // Test that a FunctionInfo with just a name and size is less than one
-  // that has name, size and any number of line table entries
-  EXPECT_LT(FISymtab, FIWithLines);
-
-  FunctionInfo FIWithLinesAndInline = FIWithLines;
-  FIWithLinesAndInline.Inline = InlineInfo();
-  FIWithLinesAndInline.Inline->Ranges.insert(
-      AddressRange(StartAddr, StartAddr + 0x10));
-  // Test that a FunctionInfo with name, size, and line entries is less than
-  // the same one with valid inline info
-  EXPECT_LT(FIWithLines, FIWithLinesAndInline);
-
-  // Test if we have an entry with lines and one with more lines for the same
-  // range, the ones with more lines is greater than the one with less.
-  FunctionInfo FIWithMoreLines = FIWithLines;
-  FIWithMoreLines.OptLineTable->push(LineEntry(StartAddr,FileIdx,Line+5));
-  EXPECT_LT(FIWithLines, FIWithMoreLines);
-
-  // Test that if we have the same number of lines we compare the line entries
-  // in the FunctionInfo.OptLineTable.Lines vector.
-  FunctionInfo FIWithLinesWithHigherAddress = FIWithLines;
-  FIWithLinesWithHigherAddress.OptLineTable->get(0).Addr += 0x10;
-  EXPECT_LT(FIWithLines, FIWithLinesWithHigherAddress);
-}
-
-static void TestFunctionInfoDecodeError(llvm::support::endianness ByteOrder,
-                                        StringRef Bytes,
-                                        const uint64_t BaseAddr,
-                                        std::string ExpectedErrorMsg) {
-  uint8_t AddressSize = 4;
-  DataExtractor Data(Bytes, ByteOrder == llvm::support::little, AddressSize);
-  llvm::Expected<FunctionInfo> Decoded = FunctionInfo::decode(Data, BaseAddr);
-  // Make sure decoding fails.
-  ASSERT_FALSE((bool)Decoded);
-  // Make sure decoded object is the same as the one we encoded.
-  checkError(ExpectedErrorMsg, Decoded.takeError());
-}
-
-TEST(GSYMTest, TestFunctionInfoDecodeErrors) {
-  // Test decoding FunctionInfo objects that ensure we report an appropriate
-  // error message.
-  const llvm::support::endianness ByteOrder = llvm::support::little;
-  SmallString<512> Str;
-  raw_svector_ostream OutStrm(Str);
-  FileWriter FW(OutStrm, ByteOrder);
-  const uint64_t BaseAddr = 0x100;
-  TestFunctionInfoDecodeError(ByteOrder, OutStrm.str(), BaseAddr,
-      "0x00000000: missing FunctionInfo Size");
-  FW.writeU32(0x100); // Function size.
-  TestFunctionInfoDecodeError(ByteOrder, OutStrm.str(), BaseAddr,
-      "0x00000004: missing FunctionInfo Name");
-  // Write out an invalid Name string table offset of zero.
-  FW.writeU32(0);
-  TestFunctionInfoDecodeError(ByteOrder, OutStrm.str(), BaseAddr,
-      "0x00000004: invalid FunctionInfo Name value 0x00000000");
-  // Modify the Name to be 0x00000001, which is a valid value.
-  FW.fixup32(0x00000001, 4);
-  TestFunctionInfoDecodeError(ByteOrder, OutStrm.str(), BaseAddr,
-      "0x00000008: missing FunctionInfo InfoType value");
-  auto FixupOffset = FW.tell();
-  FW.writeU32(1); // InfoType::LineTableInfo.
-  TestFunctionInfoDecodeError(ByteOrder, OutStrm.str(), BaseAddr,
-      "0x0000000c: missing FunctionInfo InfoType length");
-  FW.fixup32(4, FixupOffset); // Write an invalid InfoType enumeration value
-  FW.writeU32(0); // LineTableInfo InfoType data length.
-  TestFunctionInfoDecodeError(ByteOrder, OutStrm.str(), BaseAddr,
-      "0x00000008: unsupported InfoType 4");
-}
-
-static void TestFunctionInfoEncodeError(llvm::support::endianness ByteOrder,
-                                      const FunctionInfo &FI,
-                                      std::string ExpectedErrorMsg) {
-  SmallString<512> Str;
-  raw_svector_ostream OutStrm(Str);
-  FileWriter FW(OutStrm, ByteOrder);
-  Expected<uint64_t> ExpectedOffset = FI.encode(FW);
-  ASSERT_FALSE(ExpectedOffset);
-  checkError(ExpectedErrorMsg, ExpectedOffset.takeError());
-}
-
-TEST(GSYMTest, TestFunctionInfoEncodeErrors) {
-  const uint64_t FuncAddr = 0x1000;
-  const uint64_t FuncSize = 0x100;
-  const uint32_t InvalidName = 0;
-  const uint32_t ValidName = 1;
-  FunctionInfo InvalidNameFI(FuncAddr, FuncSize, InvalidName);
-  TestFunctionInfoEncodeError(llvm::support::little, InvalidNameFI,
-      "attempted to encode invalid FunctionInfo object");
-
-  FunctionInfo InvalidLineTableFI(FuncAddr, FuncSize, ValidName);
-  // Empty line tables are not valid. Verify if the encoding of anything
-  // in our line table fails, that we see get the error propagated.
-  InvalidLineTableFI.OptLineTable = LineTable();
-  TestFunctionInfoEncodeError(llvm::support::little, InvalidLineTableFI,
-      "attempted to encode invalid LineTable object");
-
-  FunctionInfo InvalidInlineInfoFI(FuncAddr, FuncSize, ValidName);
-  // Empty line tables are not valid. Verify if the encoding of anything
-  // in our line table fails, that we see get the error propagated.
-  InvalidInlineInfoFI.Inline = InlineInfo();
-  TestFunctionInfoEncodeError(llvm::support::little, InvalidInlineInfoFI,
-      "attempted to encode invalid InlineInfo object");
-}
-
-static void TestFunctionInfoEncodeDecode(llvm::support::endianness ByteOrder,
-                                         const FunctionInfo &FI) {
-  // Test encoding and decoding FunctionInfo objects.
-  SmallString<512> Str;
-  raw_svector_ostream OutStrm(Str);
-  FileWriter FW(OutStrm, ByteOrder);
-  llvm::Expected<uint64_t> ExpectedOffset = FI.encode(FW);
-  ASSERT_TRUE(bool(ExpectedOffset));
-  // Verify we got the encoded offset back from the encode function.
-  ASSERT_EQ(ExpectedOffset.get(), 0ULL);
-  std::string Bytes(OutStrm.str());
-  uint8_t AddressSize = 4;
-  DataExtractor Data(Bytes, ByteOrder == llvm::support::little, AddressSize);
-  llvm::Expected<FunctionInfo> Decoded = FunctionInfo::decode(Data,
-                                                              FI.Range.Start);
-  // Make sure decoding succeeded.
-  ASSERT_TRUE((bool)Decoded);
-  // Make sure decoded object is the same as the one we encoded.
-  EXPECT_EQ(FI, Decoded.get());
-}
-
-static void AddLines(uint64_t FuncAddr, uint32_t FileIdx, FunctionInfo &FI) {
-    FI.OptLineTable = LineTable();
-    LineEntry Line0(FuncAddr + 0x000, FileIdx, 10);
-    LineEntry Line1(FuncAddr + 0x010, FileIdx, 11);
-    LineEntry Line2(FuncAddr + 0x100, FileIdx, 1000);
-    FI.OptLineTable->push(Line0);
-    FI.OptLineTable->push(Line1);
-    FI.OptLineTable->push(Line2);
-}
-
-
-static void AddInline(uint64_t FuncAddr, uint64_t FuncSize, FunctionInfo &FI) {
-    FI.Inline = InlineInfo();
-    FI.Inline->Ranges.insert(AddressRange(FuncAddr, FuncAddr + FuncSize));
-    InlineInfo Inline1;
-    Inline1.Ranges.insert(AddressRange(FuncAddr + 0x10, FuncAddr + 0x30));
-    Inline1.Name = 1;
-    Inline1.CallFile = 1;
-    Inline1.CallLine = 11;
-    FI.Inline->Children.push_back(Inline1);
-}
-
-TEST(GSYMTest, TestFunctionInfoEncoding) {
-  constexpr uint64_t FuncAddr = 0x1000;
-  constexpr uint64_t FuncSize = 0x100;
-  constexpr uint32_t FuncName = 1;
-  constexpr uint32_t FileIdx = 1;
-  // Make sure that we can encode and decode a FunctionInfo with no line table
-  // or inline info.
-  FunctionInfo FI(FuncAddr, FuncSize, FuncName);
-  TestFunctionInfoEncodeDecode(llvm::support::little, FI);
-  TestFunctionInfoEncodeDecode(llvm::support::big, FI);
-
-  // Make sure that we can encode and decode a FunctionInfo with a line table
-  // and no inline info.
-  FunctionInfo FILines(FuncAddr, FuncSize, FuncName);
-  AddLines(FuncAddr, FileIdx, FILines);
-  TestFunctionInfoEncodeDecode(llvm::support::little, FILines);
-  TestFunctionInfoEncodeDecode(llvm::support::big, FILines);
-
-  // Make sure that we can encode and decode a FunctionInfo with no line table
-  // and with inline info.
-  FunctionInfo FIInline(FuncAddr, FuncSize, FuncName);
-  AddInline(FuncAddr, FuncSize, FIInline);
-  TestFunctionInfoEncodeDecode(llvm::support::little, FIInline);
-  TestFunctionInfoEncodeDecode(llvm::support::big, FIInline);
-
-  // Make sure that we can encode and decode a FunctionInfo with no line table
-  // and with inline info.
-  FunctionInfo FIBoth(FuncAddr, FuncSize, FuncName);
-  AddLines(FuncAddr, FileIdx, FIBoth);
-  AddInline(FuncAddr, FuncSize, FIBoth);
-  TestFunctionInfoEncodeDecode(llvm::support::little, FIBoth);
-  TestFunctionInfoEncodeDecode(llvm::support::big, FIBoth);
-}
-
-static void TestInlineInfoEncodeDecode(llvm::support::endianness ByteOrder,
-                                       const InlineInfo &Inline) {
-  // Test encoding and decoding InlineInfo objects
-  SmallString<512> Str;
-  raw_svector_ostream OutStrm(Str);
-  FileWriter FW(OutStrm, ByteOrder);
-  const uint64_t BaseAddr = Inline.Ranges[0].Start;
-  llvm::Error Err = Inline.encode(FW, BaseAddr);
-  ASSERT_FALSE(Err);
-  std::string Bytes(OutStrm.str());
-  uint8_t AddressSize = 4;
-  DataExtractor Data(Bytes, ByteOrder == llvm::support::little, AddressSize);
-  llvm::Expected<InlineInfo> Decoded = InlineInfo::decode(Data, BaseAddr);
-  // Make sure decoding succeeded.
-  ASSERT_TRUE((bool)Decoded);
-  // Make sure decoded object is the same as the one we encoded.
-  EXPECT_EQ(Inline, Decoded.get());
-}
-
-static void TestInlineInfoDecodeError(llvm::support::endianness ByteOrder,
-                                      StringRef Bytes, const uint64_t BaseAddr,
-                                      std::string ExpectedErrorMsg) {
-  uint8_t AddressSize = 4;
-  DataExtractor Data(Bytes, ByteOrder == llvm::support::little, AddressSize);
-  llvm::Expected<InlineInfo> Decoded = InlineInfo::decode(Data, BaseAddr);
-  // Make sure decoding fails.
-  ASSERT_FALSE((bool)Decoded);
-  // Make sure decoded object is the same as the one we encoded.
-  checkError(ExpectedErrorMsg, Decoded.takeError());
-}
-
-static void TestInlineInfoEncodeError(llvm::support::endianness ByteOrder,
-                                      const InlineInfo &Inline,
-                                      std::string ExpectedErrorMsg) {
-  SmallString<512> Str;
-  raw_svector_ostream OutStrm(Str);
-  FileWriter FW(OutStrm, ByteOrder);
-  const uint64_t BaseAddr = Inline.Ranges.empty() ? 0 : Inline.Ranges[0].Start;
-  llvm::Error Err = Inline.encode(FW, BaseAddr);
-  checkError(ExpectedErrorMsg, std::move(Err));
-}
-
-TEST(GSYMTest, TestInlineInfo) {
-  // Test InlineInfo structs.
-  InlineInfo II;
-  EXPECT_FALSE(II.isValid());
-  II.Ranges.insert(AddressRange(0x1000, 0x2000));
-  // Make sure InlineInfo in valid with just an address range since
-  // top level InlineInfo objects have ranges with no name, call file
-  // or call line
-  EXPECT_TRUE(II.isValid());
-  // Make sure InlineInfo isn't after being cleared.
-  II.clear();
-  EXPECT_FALSE(II.isValid());
-
-  // Create an InlineInfo that contains the following data. The
-  // indentation of the address range indicates the parent child
-  // relationships of the InlineInfo objects:
-  //
-  // Variable    Range and values
-  // =========== ====================================================
-  // Root        [0x100-0x200) (no name, file, or line)
-  // Inline1       [0x150-0x160) Name = 1, File = 1, Line = 11
-  // Inline1Sub1     [0x152-0x155) Name = 2, File = 2, Line = 22
-  // Inline1Sub2     [0x157-0x158) Name = 3, File = 3, Line = 33
-  InlineInfo Root;
-  Root.Ranges.insert(AddressRange(0x100, 0x200));
-  InlineInfo Inline1;
-  Inline1.Ranges.insert(AddressRange(0x150, 0x160));
-  Inline1.Name = 1;
-  Inline1.CallFile = 1;
-  Inline1.CallLine = 11;
-  InlineInfo Inline1Sub1;
-  Inline1Sub1.Ranges.insert(AddressRange(0x152, 0x155));
-  Inline1Sub1.Name = 2;
-  Inline1Sub1.CallFile = 2;
-  Inline1Sub1.CallLine = 22;
-  InlineInfo Inline1Sub2;
-  Inline1Sub2.Ranges.insert(AddressRange(0x157, 0x158));
-  Inline1Sub2.Name = 3;
-  Inline1Sub2.CallFile = 3;
-  Inline1Sub2.CallLine = 33;
-  Inline1.Children.push_back(Inline1Sub1);
-  Inline1.Children.push_back(Inline1Sub2);
-  Root.Children.push_back(Inline1);
-
-  // Make sure an address that is out of range won't match
-  EXPECT_FALSE(Root.getInlineStack(0x50));
-
-  // Verify that we get no inline stacks for addresses out of [0x100-0x200)
-  EXPECT_FALSE(Root.getInlineStack(Root.Ranges[0].Start - 1));
-  EXPECT_FALSE(Root.getInlineStack(Root.Ranges[0].End));
-
-  // Verify we get no inline stack entries for addresses that are in
-  // [0x100-0x200) but not in [0x150-0x160)
-  EXPECT_FALSE(Root.getInlineStack(Inline1.Ranges[0].Start - 1));
-  EXPECT_FALSE(Root.getInlineStack(Inline1.Ranges[0].End));
-
-  // Verify we get one inline stack entry for addresses that are in
-  // [[0x150-0x160)) but not in [0x152-0x155) or [0x157-0x158)
-  auto InlineInfos = Root.getInlineStack(Inline1.Ranges[0].Start);
-  ASSERT_TRUE(InlineInfos);
-  ASSERT_EQ(InlineInfos->size(), 1u);
-  ASSERT_EQ(*InlineInfos->at(0), Inline1);
-  InlineInfos = Root.getInlineStack(Inline1.Ranges[0].End - 1);
-  EXPECT_TRUE(InlineInfos);
-  ASSERT_EQ(InlineInfos->size(), 1u);
-  ASSERT_EQ(*InlineInfos->at(0), Inline1);
-
-  // Verify we get two inline stack entries for addresses that are in
-  // [0x152-0x155)
-  InlineInfos = Root.getInlineStack(Inline1Sub1.Ranges[0].Start);
-  EXPECT_TRUE(InlineInfos);
-  ASSERT_EQ(InlineInfos->size(), 2u);
-  ASSERT_EQ(*InlineInfos->at(0), Inline1Sub1);
-  ASSERT_EQ(*InlineInfos->at(1), Inline1);
-  InlineInfos = Root.getInlineStack(Inline1Sub1.Ranges[0].End - 1);
-  EXPECT_TRUE(InlineInfos);
-  ASSERT_EQ(InlineInfos->size(), 2u);
-  ASSERT_EQ(*InlineInfos->at(0), Inline1Sub1);
-  ASSERT_EQ(*InlineInfos->at(1), Inline1);
-
-  // Verify we get two inline stack entries for addresses that are in
-  // [0x157-0x158)
-  InlineInfos = Root.getInlineStack(Inline1Sub2.Ranges[0].Start);
-  EXPECT_TRUE(InlineInfos);
-  ASSERT_EQ(InlineInfos->size(), 2u);
-  ASSERT_EQ(*InlineInfos->at(0), Inline1Sub2);
-  ASSERT_EQ(*InlineInfos->at(1), Inline1);
-  InlineInfos = Root.getInlineStack(Inline1Sub2.Ranges[0].End - 1);
-  EXPECT_TRUE(InlineInfos);
-  ASSERT_EQ(InlineInfos->size(), 2u);
-  ASSERT_EQ(*InlineInfos->at(0), Inline1Sub2);
-  ASSERT_EQ(*InlineInfos->at(1), Inline1);
-
-  // Test encoding and decoding InlineInfo objects
-  TestInlineInfoEncodeDecode(llvm::support::little, Root);
-  TestInlineInfoEncodeDecode(llvm::support::big, Root);
-}
-
-TEST(GSYMTest, TestInlineInfoEncodeErrors) {
-  // Test InlineInfo encoding errors.
-
-  // Test that we get an error when trying to encode an InlineInfo object
-  // that has no ranges.
-  InlineInfo Empty;
-  std::string EmptyErr("attempted to encode invalid InlineInfo object");
-  TestInlineInfoEncodeError(llvm::support::little, Empty, EmptyErr);
-  TestInlineInfoEncodeError(llvm::support::big, Empty, EmptyErr);
-
-  // Verify that we get an error trying to encode an InlineInfo object that has
-  // a child InlineInfo that has no ranges.
-  InlineInfo ContainsEmpty;
-  ContainsEmpty.Ranges.insert({0x100,200});
-  ContainsEmpty.Children.push_back(Empty);
-  TestInlineInfoEncodeError(llvm::support::little, ContainsEmpty, EmptyErr);
-  TestInlineInfoEncodeError(llvm::support::big, ContainsEmpty, EmptyErr);
-
-  // Verify that we get an error trying to encode an InlineInfo object that has
-  // a child whose address range is not contained in the parent address range.
-  InlineInfo ChildNotContained;
-  std::string ChildNotContainedErr("child range not contained in parent");
-  ChildNotContained.Ranges.insert({0x100,200});
-  InlineInfo ChildNotContainedChild;
-  ChildNotContainedChild.Ranges.insert({0x200,300});
-  ChildNotContained.Children.push_back(ChildNotContainedChild);
-  TestInlineInfoEncodeError(llvm::support::little, ChildNotContained,
-                            ChildNotContainedErr);
-  TestInlineInfoEncodeError(llvm::support::big, ChildNotContained,
-                            ChildNotContainedErr);
-
-}
-
-TEST(GSYMTest, TestInlineInfoDecodeErrors) {
-  // Test decoding InlineInfo objects that ensure we report an appropriate
-  // error message.
-  const llvm::support::endianness ByteOrder = llvm::support::little;
-  SmallString<512> Str;
-  raw_svector_ostream OutStrm(Str);
-  FileWriter FW(OutStrm, ByteOrder);
-  const uint64_t BaseAddr = 0x100;
-  TestInlineInfoDecodeError(ByteOrder, OutStrm.str(), BaseAddr,
-      "0x00000000: missing InlineInfo address ranges data");
-  AddressRanges Ranges;
-  Ranges.insert({BaseAddr, BaseAddr+0x100});
-  Ranges.encode(FW, BaseAddr);
-  TestInlineInfoDecodeError(ByteOrder, OutStrm.str(), BaseAddr,
-      "0x00000004: missing InlineInfo uint8_t indicating children");
-  FW.writeU8(0);
-  TestInlineInfoDecodeError(ByteOrder, OutStrm.str(), BaseAddr,
-      "0x00000005: missing InlineInfo uint32_t for name");
-  FW.writeU32(0);
-  TestInlineInfoDecodeError(ByteOrder, OutStrm.str(), BaseAddr,
-      "0x00000009: missing ULEB128 for InlineInfo call file");
-  FW.writeU8(0);
-  TestInlineInfoDecodeError(ByteOrder, OutStrm.str(), BaseAddr,
-      "0x0000000a: missing ULEB128 for InlineInfo call line");
-}
-
-TEST(GSYMTest, TestLineEntry) {
-  // test llvm::gsym::LineEntry structs.
-  const uint64_t ValidAddr = 0x1000;
-  const uint64_t InvalidFileIdx = 0;
-  const uint32_t ValidFileIdx = 1;
-  const uint32_t ValidLine = 5;
-
-  LineEntry Invalid;
-  EXPECT_FALSE(Invalid.isValid());
-  // Make sure that an entry is invalid if it has a bad file index.
-  LineEntry BadFile(ValidAddr, InvalidFileIdx, ValidLine);
-  EXPECT_FALSE(BadFile.isValid());
-  // Test operators
-  LineEntry E1(ValidAddr, ValidFileIdx, ValidLine);
-  LineEntry E2(ValidAddr, ValidFileIdx, ValidLine);
-  LineEntry DifferentAddr(ValidAddr + 1, ValidFileIdx, ValidLine);
-  LineEntry DifferentFile(ValidAddr, ValidFileIdx + 1, ValidLine);
-  LineEntry DifferentLine(ValidAddr, ValidFileIdx, ValidLine + 1);
-  EXPECT_TRUE(E1.isValid());
-  EXPECT_EQ(E1, E2);
-  EXPECT_NE(E1, DifferentAddr);
-  EXPECT_NE(E1, DifferentFile);
-  EXPECT_NE(E1, DifferentLine);
-  EXPECT_LT(E1, DifferentAddr);
-}
-
-TEST(GSYMTest, TestRanges) {
-  // test llvm::gsym::AddressRange.
-  const uint64_t StartAddr = 0x1000;
-  const uint64_t EndAddr = 0x2000;
-  // Verify constructor and API to ensure it takes start and end address.
-  const AddressRange Range(StartAddr, EndAddr);
-  EXPECT_EQ(Range.size(), EndAddr - StartAddr);
-
-  // Verify llvm::gsym::AddressRange::contains().
-  EXPECT_FALSE(Range.contains(0));
-  EXPECT_FALSE(Range.contains(StartAddr - 1));
-  EXPECT_TRUE(Range.contains(StartAddr));
-  EXPECT_TRUE(Range.contains(EndAddr - 1));
-  EXPECT_FALSE(Range.contains(EndAddr));
-  EXPECT_FALSE(Range.contains(UINT64_MAX));
-
-  const AddressRange RangeSame(StartAddr, EndAddr);
-  const AddressRange RangeDifferentStart(StartAddr + 1, EndAddr);
-  const AddressRange RangeDifferentEnd(StartAddr, EndAddr + 1);
-  const AddressRange RangeDifferentStartEnd(StartAddr + 1, EndAddr + 1);
-  // Test == and != with values that are the same
-  EXPECT_EQ(Range, RangeSame);
-  EXPECT_FALSE(Range != RangeSame);
-  // Test == and != with values that are the different
-  EXPECT_NE(Range, RangeDifferentStart);
-  EXPECT_NE(Range, RangeDifferentEnd);
-  EXPECT_NE(Range, RangeDifferentStartEnd);
-  EXPECT_FALSE(Range == RangeDifferentStart);
-  EXPECT_FALSE(Range == RangeDifferentEnd);
-  EXPECT_FALSE(Range == RangeDifferentStartEnd);
-
-  // Test "bool operator<(const AddressRange &, const AddressRange &)".
-  EXPECT_FALSE(Range < RangeSame);
-  EXPECT_FALSE(RangeSame < Range);
-  EXPECT_LT(Range, RangeDifferentStart);
-  EXPECT_LT(Range, RangeDifferentEnd);
-  EXPECT_LT(Range, RangeDifferentStartEnd);
-  // Test "bool operator<(const AddressRange &, uint64_t)"
-  EXPECT_LT(Range.Start, StartAddr + 1);
-  // Test "bool operator<(uint64_t, const AddressRange &)"
-  EXPECT_LT(StartAddr - 1, Range.Start);
-
-  // Verify llvm::gsym::AddressRange::isContiguousWith() and
-  // llvm::gsym::AddressRange::intersects().
-  const AddressRange EndsBeforeRangeStart(0, StartAddr - 1);
-  const AddressRange EndsAtRangeStart(0, StartAddr);
-  const AddressRange OverlapsRangeStart(StartAddr - 1, StartAddr + 1);
-  const AddressRange InsideRange(StartAddr + 1, EndAddr - 1);
-  const AddressRange OverlapsRangeEnd(EndAddr - 1, EndAddr + 1);
-  const AddressRange StartsAtRangeEnd(EndAddr, EndAddr + 0x100);
-  const AddressRange StartsAfterRangeEnd(EndAddr + 1, EndAddr + 0x100);
-
-  EXPECT_FALSE(Range.intersects(EndsBeforeRangeStart));
-  EXPECT_FALSE(Range.intersects(EndsAtRangeStart));
-  EXPECT_TRUE(Range.intersects(OverlapsRangeStart));
-  EXPECT_TRUE(Range.intersects(InsideRange));
-  EXPECT_TRUE(Range.intersects(OverlapsRangeEnd));
-  EXPECT_FALSE(Range.intersects(StartsAtRangeEnd));
-  EXPECT_FALSE(Range.intersects(StartsAfterRangeEnd));
-
-  // Test the functions that maintain GSYM address ranges:
-  //  "bool AddressRange::contains(uint64_t Addr) const;"
-  //  "void AddressRanges::insert(const AddressRange &R);"
-  AddressRanges Ranges;
-  Ranges.insert(AddressRange(0x1000, 0x2000));
-  Ranges.insert(AddressRange(0x2000, 0x3000));
-  Ranges.insert(AddressRange(0x4000, 0x5000));
-
-  EXPECT_FALSE(Ranges.contains(0));
-  EXPECT_FALSE(Ranges.contains(0x1000 - 1));
-  EXPECT_TRUE(Ranges.contains(0x1000));
-  EXPECT_TRUE(Ranges.contains(0x2000));
-  EXPECT_TRUE(Ranges.contains(0x4000));
-  EXPECT_TRUE(Ranges.contains(0x2000 - 1));
-  EXPECT_TRUE(Ranges.contains(0x3000 - 1));
-  EXPECT_FALSE(Ranges.contains(0x3000 + 1));
-  EXPECT_TRUE(Ranges.contains(0x5000 - 1));
-  EXPECT_FALSE(Ranges.contains(0x5000 + 1));
-  EXPECT_FALSE(Ranges.contains(UINT64_MAX));
-
-  EXPECT_FALSE(Ranges.contains(AddressRange()));
-  EXPECT_FALSE(Ranges.contains(AddressRange(0x1000-1, 0x1000)));
-  EXPECT_FALSE(Ranges.contains(AddressRange(0x1000, 0x1000)));
-  EXPECT_TRUE(Ranges.contains(AddressRange(0x1000, 0x1000+1)));
-  EXPECT_TRUE(Ranges.contains(AddressRange(0x1000, 0x2000)));
-  EXPECT_FALSE(Ranges.contains(AddressRange(0x1000, 0x2001)));
-  EXPECT_TRUE(Ranges.contains(AddressRange(0x2000, 0x3000)));
-  EXPECT_FALSE(Ranges.contains(AddressRange(0x2000, 0x3001)));
-  EXPECT_FALSE(Ranges.contains(AddressRange(0x3000, 0x3001)));
-  EXPECT_FALSE(Ranges.contains(AddressRange(0x1500, 0x4500)));
-  EXPECT_FALSE(Ranges.contains(AddressRange(0x5000, 0x5001)));
-
-  // Verify that intersecting ranges get combined
-  Ranges.clear();
-  Ranges.insert(AddressRange(0x1100, 0x1F00));
-  // Verify a wholy contained range that is added doesn't do anything.
-  Ranges.insert(AddressRange(0x1500, 0x1F00));
-  EXPECT_EQ(Ranges.size(), 1u);
-  EXPECT_EQ(Ranges[0], AddressRange(0x1100, 0x1F00));
-
-  // Verify a range that starts before and intersects gets combined.
-  Ranges.insert(AddressRange(0x1000, Ranges[0].Start + 1));
-  EXPECT_EQ(Ranges.size(), 1u);
-  EXPECT_EQ(Ranges[0], AddressRange(0x1000, 0x1F00));
-
-  // Verify a range that starts inside and extends ranges gets combined.
-  Ranges.insert(AddressRange(Ranges[0].End - 1, 0x2000));
-  EXPECT_EQ(Ranges.size(), 1u);
-  EXPECT_EQ(Ranges[0], AddressRange(0x1000, 0x2000));
-
-  // Verify that adjacent ranges don't get combined
-  Ranges.insert(AddressRange(0x2000, 0x3000));
-  EXPECT_EQ(Ranges.size(), 2u);
-  EXPECT_EQ(Ranges[0], AddressRange(0x1000, 0x2000));
-  EXPECT_EQ(Ranges[1], AddressRange(0x2000, 0x3000));
-  // Verify if we add an address range that intersects two ranges
-  // that they get combined
-  Ranges.insert(AddressRange(Ranges[0].End - 1, Ranges[1].Start + 1));
-  EXPECT_EQ(Ranges.size(), 1u);
-  EXPECT_EQ(Ranges[0], AddressRange(0x1000, 0x3000));
-
-  Ranges.insert(AddressRange(0x3000, 0x4000));
-  Ranges.insert(AddressRange(0x4000, 0x5000));
-  Ranges.insert(AddressRange(0x2000, 0x4500));
-  EXPECT_EQ(Ranges.size(), 1u);
-  EXPECT_EQ(Ranges[0], AddressRange(0x1000, 0x5000));
-}
-
-TEST(GSYMTest, TestStringTable) {
-  StringTable StrTab(StringRef("\0Hello\0World\0", 13));
-  // Test extracting strings from a string table.
-  EXPECT_EQ(StrTab.getString(0), "");
-  EXPECT_EQ(StrTab.getString(1), "Hello");
-  EXPECT_EQ(StrTab.getString(7), "World");
-  EXPECT_EQ(StrTab.getString(8), "orld");
-  // Test pointing to last NULL terminator gets empty string.
-  EXPECT_EQ(StrTab.getString(12), "");
-  // Test pointing to past end gets empty string.
-  EXPECT_EQ(StrTab.getString(13), "");
-}
-
-static void TestFileWriterHelper(llvm::support::endianness ByteOrder) {
-  SmallString<512> Str;
-  raw_svector_ostream OutStrm(Str);
-  FileWriter FW(OutStrm, ByteOrder);
-  const int64_t MinSLEB = INT64_MIN;
-  const int64_t MaxSLEB = INT64_MAX;
-  const uint64_t MinULEB = 0;
-  const uint64_t MaxULEB = UINT64_MAX;
-  const uint8_t U8 = 0x10;
-  const uint16_t U16 = 0x1122;
-  const uint32_t U32 = 0x12345678;
-  const uint64_t U64 = 0x33445566778899aa;
-  const char *Hello = "hello";
-  FW.writeU8(U8);
-  FW.writeU16(U16);
-  FW.writeU32(U32);
-  FW.writeU64(U64);
-  FW.alignTo(16);
-  const off_t FixupOffset = FW.tell();
-  FW.writeU32(0);
-  FW.writeSLEB(MinSLEB);
-  FW.writeSLEB(MaxSLEB);
-  FW.writeULEB(MinULEB);
-  FW.writeULEB(MaxULEB);
-  FW.writeNullTerminated(Hello);
-  // Test Seek, Tell using Fixup32.
-  FW.fixup32(U32, FixupOffset);
-
-  std::string Bytes(OutStrm.str());
-  uint8_t AddressSize = 4;
-  DataExtractor Data(Bytes, ByteOrder == llvm::support::little, AddressSize);
-  uint64_t Offset = 0;
-  EXPECT_EQ(Data.getU8(&Offset), U8);
-  EXPECT_EQ(Data.getU16(&Offset), U16);
-  EXPECT_EQ(Data.getU32(&Offset), U32);
-  EXPECT_EQ(Data.getU64(&Offset), U64);
-  Offset = alignTo(Offset, 16);
-  EXPECT_EQ(Data.getU32(&Offset), U32);
-  EXPECT_EQ(Data.getSLEB128(&Offset), MinSLEB);
-  EXPECT_EQ(Data.getSLEB128(&Offset), MaxSLEB);
-  EXPECT_EQ(Data.getULEB128(&Offset), MinULEB);
-  EXPECT_EQ(Data.getULEB128(&Offset), MaxULEB);
-  EXPECT_EQ(Data.getCStrRef(&Offset), StringRef(Hello));
-}
-
-TEST(GSYMTest, TestFileWriter) {
-  TestFileWriterHelper(llvm::support::little);
-  TestFileWriterHelper(llvm::support::big);
-}
-
-TEST(GSYMTest, TestAddressRangeEncodeDecode) {
-  // Test encoding and decoding AddressRange objects. AddressRange objects
-  // are always stored as offsets from the a base address. The base address
-  // is the FunctionInfo's base address for function level ranges, and is
-  // the base address of the parent range for subranges.
-  SmallString<512> Str;
-  raw_svector_ostream OutStrm(Str);
-  const auto ByteOrder = llvm::support::endian::system_endianness();
-  FileWriter FW(OutStrm, ByteOrder);
-  const uint64_t BaseAddr = 0x1000;
-  const AddressRange Range1(0x1000, 0x1010);
-  const AddressRange Range2(0x1020, 0x1030);
-  Range1.encode(FW, BaseAddr);
-  Range2.encode(FW, BaseAddr);
-  std::string Bytes(OutStrm.str());
-  uint8_t AddressSize = 4;
-  DataExtractor Data(Bytes, ByteOrder == llvm::support::little, AddressSize);
-
-  AddressRange DecodedRange1, DecodedRange2;
-  uint64_t Offset = 0;
-  DecodedRange1.decode(Data, BaseAddr, Offset);
-  DecodedRange2.decode(Data, BaseAddr, Offset);
-  EXPECT_EQ(Range1, DecodedRange1);
-  EXPECT_EQ(Range2, DecodedRange2);
-}
-
-static void TestAddressRangeEncodeDecodeHelper(const AddressRanges &Ranges,
-                                               const uint64_t BaseAddr) {
-  SmallString<512> Str;
-  raw_svector_ostream OutStrm(Str);
-  const auto ByteOrder = llvm::support::endian::system_endianness();
-  FileWriter FW(OutStrm, ByteOrder);
-  Ranges.encode(FW, BaseAddr);
-
-  std::string Bytes(OutStrm.str());
-  uint8_t AddressSize = 4;
-  DataExtractor Data(Bytes, ByteOrder == llvm::support::little, AddressSize);
-
-  AddressRanges DecodedRanges;
-  uint64_t Offset = 0;
-  DecodedRanges.decode(Data, BaseAddr, Offset);
-  EXPECT_EQ(Ranges, DecodedRanges);
-}
-
-TEST(GSYMTest, TestAddressRangesEncodeDecode) {
-  // Test encoding and decoding AddressRanges. AddressRanges objects contain
-  // ranges that are stored as offsets from the a base address. The base address
-  // is the FunctionInfo's base address for function level ranges, and is the
-  // base address of the parent range for subranges.
-  const uint64_t BaseAddr = 0x1000;
-
-  // Test encoding and decoding with no ranges.
-  AddressRanges Ranges;
-  TestAddressRangeEncodeDecodeHelper(Ranges, BaseAddr);
-
-  // Test encoding and decoding with 1 range.
-  Ranges.insert(AddressRange(0x1000, 0x1010));
-  TestAddressRangeEncodeDecodeHelper(Ranges, BaseAddr);
-
-  // Test encoding and decoding with multiple ranges.
-  Ranges.insert(AddressRange(0x1020, 0x1030));
-  Ranges.insert(AddressRange(0x1050, 0x1070));
-  TestAddressRangeEncodeDecodeHelper(Ranges, BaseAddr);
-}
-
-static void TestLineTableHelper(llvm::support::endianness ByteOrder,
-                                const LineTable &LT) {
-  SmallString<512> Str;
-  raw_svector_ostream OutStrm(Str);
-  FileWriter FW(OutStrm, ByteOrder);
-  const uint64_t BaseAddr = LT[0].Addr;
-  llvm::Error Err = LT.encode(FW, BaseAddr);
-  ASSERT_FALSE(Err);
-  std::string Bytes(OutStrm.str());
-  uint8_t AddressSize = 4;
-  DataExtractor Data(Bytes, ByteOrder == llvm::support::little, AddressSize);
-  llvm::Expected<LineTable> Decoded = LineTable::decode(Data, BaseAddr);
-  // Make sure decoding succeeded.
-  ASSERT_TRUE((bool)Decoded);
-  // Make sure decoded object is the same as the one we encoded.
-  EXPECT_EQ(LT, Decoded.get());
-}
-
-TEST(GSYMTest, TestLineTable) {
-  const uint64_t StartAddr = 0x1000;
-  const uint32_t FileIdx = 1;
-  LineTable LT;
-  LineEntry Line0(StartAddr+0x000, FileIdx, 10);
-  LineEntry Line1(StartAddr+0x010, FileIdx, 11);
-  LineEntry Line2(StartAddr+0x100, FileIdx, 1000);
-  ASSERT_TRUE(LT.empty());
-  ASSERT_EQ(LT.size(), (size_t)0);
-  LT.push(Line0);
-  ASSERT_EQ(LT.size(), (size_t)1);
-  LT.push(Line1);
-  LT.push(Line2);
-  LT.push(LineEntry(StartAddr+0x120, FileIdx, 900));
-  LT.push(LineEntry(StartAddr+0x120, FileIdx, 2000));
-  LT.push(LineEntry(StartAddr+0x121, FileIdx, 2001));
-  LT.push(LineEntry(StartAddr+0x122, FileIdx, 2002));
-  LT.push(LineEntry(StartAddr+0x123, FileIdx, 2003));
-  ASSERT_FALSE(LT.empty());
-  ASSERT_EQ(LT.size(), (size_t)8);
-  // Test operator[].
-  ASSERT_EQ(LT[0], Line0);
-  ASSERT_EQ(LT[1], Line1);
-  ASSERT_EQ(LT[2], Line2);
-
-  // Test encoding and decoding line tables.
-  TestLineTableHelper(llvm::support::little, LT);
-  TestLineTableHelper(llvm::support::big, LT);
-
-  // Verify the clear method works as expected.
-  LT.clear();
-  ASSERT_TRUE(LT.empty());
-  ASSERT_EQ(LT.size(), (size_t)0);
-
-  LineTable LT1;
-  LineTable LT2;
-
-  // Test that two empty line tables are equal and neither are less than
-  // each other.
-  ASSERT_EQ(LT1, LT2);
-  ASSERT_FALSE(LT1 < LT1);
-  ASSERT_FALSE(LT1 < LT2);
-  ASSERT_FALSE(LT2 < LT1);
-  ASSERT_FALSE(LT2 < LT2);
-
-  // Test that a line table with less number of line entries is less than a
-  // line table with more line entries and that they are not equal.
-  LT2.push(Line0);
-  ASSERT_LT(LT1, LT2);
-  ASSERT_NE(LT1, LT2);
-
-  // Test that two line tables with the same entries are equal.
-  LT1.push(Line0);
-  ASSERT_EQ(LT1, LT2);
-  ASSERT_FALSE(LT1 < LT2);
-  ASSERT_FALSE(LT2 < LT2);
-}
-
-static void TestLineTableDecodeError(llvm::support::endianness ByteOrder,
-                                     StringRef Bytes, const uint64_t BaseAddr,
-                                     std::string ExpectedErrorMsg) {
-  uint8_t AddressSize = 4;
-  DataExtractor Data(Bytes, ByteOrder == llvm::support::little, AddressSize);
-  llvm::Expected<LineTable> Decoded = LineTable::decode(Data, BaseAddr);
-  // Make sure decoding fails.
-  ASSERT_FALSE((bool)Decoded);
-  // Make sure decoded object is the same as the one we encoded.
-  checkError(ExpectedErrorMsg, Decoded.takeError());
-}
-
-TEST(GSYMTest, TestLineTableDecodeErrors) {
-  // Test decoding InlineInfo objects that ensure we report an appropriate
-  // error message.
-  const llvm::support::endianness ByteOrder = llvm::support::little;
-  SmallString<512> Str;
-  raw_svector_ostream OutStrm(Str);
-  FileWriter FW(OutStrm, ByteOrder);
-  const uint64_t BaseAddr = 0x100;
-  TestLineTableDecodeError(ByteOrder, OutStrm.str(), BaseAddr,
-      "0x00000000: missing LineTable MinDelta");
-  FW.writeU8(1); // MinDelta (ULEB)
-  TestLineTableDecodeError(ByteOrder, OutStrm.str(), BaseAddr,
-      "0x00000001: missing LineTable MaxDelta");
-  FW.writeU8(10); // MaxDelta (ULEB)
-  TestLineTableDecodeError(ByteOrder, OutStrm.str(), BaseAddr,
-      "0x00000002: missing LineTable FirstLine");
-  FW.writeU8(20); // FirstLine (ULEB)
-  TestLineTableDecodeError(ByteOrder, OutStrm.str(), BaseAddr,
-      "0x00000003: EOF found before EndSequence");
-  // Test a SetFile with the argument missing from the stream
-  FW.writeU8(1); // SetFile opcode (uint8_t)
-  TestLineTableDecodeError(ByteOrder, OutStrm.str(), BaseAddr,
-      "0x00000004: EOF found before SetFile value");
-  FW.writeU8(5); // SetFile value as index (ULEB)
-  // Test a AdvancePC with the argument missing from the stream
-  FW.writeU8(2); // AdvancePC opcode (uint8_t)
-  TestLineTableDecodeError(ByteOrder, OutStrm.str(), BaseAddr,
-      "0x00000006: EOF found before AdvancePC value");
-  FW.writeU8(20); // AdvancePC value as offset (ULEB)
-  // Test a AdvancePC with the argument missing from the stream
-  FW.writeU8(3); // AdvanceLine opcode (uint8_t)
-  TestLineTableDecodeError(ByteOrder, OutStrm.str(), BaseAddr,
-      "0x00000008: EOF found before AdvanceLine value");
-  FW.writeU8(20); // AdvanceLine value as offset (LLEB)
-}
-
-TEST(GSYMTest, TestLineTableEncodeErrors) {
-  const uint64_t BaseAddr = 0x1000;
-  const uint32_t FileIdx = 1;
-  const llvm::support::endianness ByteOrder = llvm::support::little;
-  SmallString<512> Str;
-  raw_svector_ostream OutStrm(Str);
-  FileWriter FW(OutStrm, ByteOrder);
-  LineTable LT;
-  checkError("attempted to encode invalid LineTable object",
-             LT.encode(FW, BaseAddr));
-
-  // Try to encode a line table where a line entry has an address that is less
-  // than BaseAddr and verify we get an appropriate error.
-  LineEntry Line0(BaseAddr+0x000, FileIdx, 10);
-  LineEntry Line1(BaseAddr+0x010, FileIdx, 11);
-  LT.push(Line0);
-  LT.push(Line1);
-  checkError("LineEntry has address 0x1000 which is less than the function "
-             "start address 0x1010", LT.encode(FW, BaseAddr+0x10));
-  LT.clear();
-
-  // Try to encode a line table where a line entries  has an address that is less
-  // than BaseAddr and verify we get an appropriate error.
-  LT.push(Line1);
-  LT.push(Line0);
-  checkError("LineEntry in LineTable not in ascending order",
-             LT.encode(FW, BaseAddr));
-  LT.clear();
-}
-
-static void TestHeaderEncodeError(const Header &H,
-                                  std::string ExpectedErrorMsg) {
-  const support::endianness ByteOrder = llvm::support::little;
-  SmallString<512> Str;
-  raw_svector_ostream OutStrm(Str);
-  FileWriter FW(OutStrm, ByteOrder);
-  llvm::Error Err = H.encode(FW);
-  checkError(ExpectedErrorMsg, std::move(Err));
-}
-
-static void TestHeaderDecodeError(StringRef Bytes,
-                                  std::string ExpectedErrorMsg) {
-  const support::endianness ByteOrder = llvm::support::little;
-  uint8_t AddressSize = 4;
-  DataExtractor Data(Bytes, ByteOrder == llvm::support::little, AddressSize);
-  llvm::Expected<Header> Decoded = Header::decode(Data);
-  // Make sure decoding fails.
-  ASSERT_FALSE((bool)Decoded);
-  // Make sure decoded object is the same as the one we encoded.
-  checkError(ExpectedErrorMsg, Decoded.takeError());
-}
-
-// Populate a GSYM header with valid values.
-static void InitHeader(Header &H) {
-  H.Magic = GSYM_MAGIC;
-  H.Version = GSYM_VERSION;
-  H.AddrOffSize = 4;
-  H.UUIDSize = 16;
-  H.BaseAddress = 0x1000;
-  H.NumAddresses = 1;
-  H.StrtabOffset= 0x2000;
-  H.StrtabSize = 0x1000;
-  for (size_t i=0; i<GSYM_MAX_UUID_SIZE; ++i) {
-    if (i < H.UUIDSize)
-      H.UUID[i] = i;
-    else
-      H.UUID[i] = 0;
-  }
-}
-
-TEST(GSYMTest, TestHeaderEncodeErrors) {
-  Header H;
-  InitHeader(H);
-  H.Magic = 12;
-  TestHeaderEncodeError(H, "invalid GSYM magic 0x0000000c");
-  InitHeader(H);
-  H.Version = 12;
-  TestHeaderEncodeError(H, "unsupported GSYM version 12");
-  InitHeader(H);
-  H.AddrOffSize = 12;
-  TestHeaderEncodeError(H, "invalid address offset size 12");
-  InitHeader(H);
-  H.UUIDSize = 128;
-  TestHeaderEncodeError(H, "invalid UUID size 128");
-}
-
-TEST(GSYMTest, TestHeaderDecodeErrors) {
-  const llvm::support::endianness ByteOrder = llvm::support::little;
-  SmallString<512> Str;
-  raw_svector_ostream OutStrm(Str);
-  FileWriter FW(OutStrm, ByteOrder);
-  Header H;
-  InitHeader(H);
-  llvm::Error Err = H.encode(FW);
-  ASSERT_FALSE(Err);
-  FW.fixup32(12, offsetof(Header, Magic));
-  TestHeaderDecodeError(OutStrm.str(), "invalid GSYM magic 0x0000000c");
-  FW.fixup32(GSYM_MAGIC, offsetof(Header, Magic));
-  FW.fixup32(12, offsetof(Header, Version));
-  TestHeaderDecodeError(OutStrm.str(), "unsupported GSYM version 12");
-  FW.fixup32(GSYM_VERSION, offsetof(Header, Version));
-  FW.fixup32(12, offsetof(Header, AddrOffSize));
-  TestHeaderDecodeError(OutStrm.str(), "invalid address offset size 12");
-  FW.fixup32(4, offsetof(Header, AddrOffSize));
-  FW.fixup32(128, offsetof(Header, UUIDSize));
-  TestHeaderDecodeError(OutStrm.str(), "invalid UUID size 128");
-}
-
-static void TestHeaderEncodeDecode(const Header &H,
-                                   support::endianness ByteOrder) {
-  uint8_t AddressSize = 4;
-  SmallString<512> Str;
-  raw_svector_ostream OutStrm(Str);
-  FileWriter FW(OutStrm, ByteOrder);
-  llvm::Error Err = H.encode(FW);
-  ASSERT_FALSE(Err);
-  std::string Bytes(OutStrm.str());
-  DataExtractor Data(Bytes, ByteOrder == llvm::support::little, AddressSize);
-  llvm::Expected<Header> Decoded = Header::decode(Data);
-  // Make sure decoding succeeded.
-  ASSERT_TRUE((bool)Decoded);
-  EXPECT_EQ(H, Decoded.get());
-
-}
-TEST(GSYMTest, TestHeaderEncodeDecode) {
-  Header H;
-  InitHeader(H);
-  TestHeaderEncodeDecode(H, llvm::support::little);
-  TestHeaderEncodeDecode(H, llvm::support::big);
-}
-
-static void TestGsymCreatorEncodeError(llvm::support::endianness ByteOrder,
-                                       const GsymCreator &GC,
-                                       std::string ExpectedErrorMsg) {
-  SmallString<512> Str;
-  raw_svector_ostream OutStrm(Str);
-  FileWriter FW(OutStrm, ByteOrder);
-  llvm::Error Err = GC.encode(FW);
-  ASSERT_TRUE(bool(Err));
-  checkError(ExpectedErrorMsg, std::move(Err));
-}
-
-TEST(GSYMTest, TestGsymCreatorEncodeErrors) {
-  const uint8_t ValidUUID[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
-                               14, 15, 16};
-  const uint8_t InvalidUUID[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
-                                 14, 15, 16, 17, 18, 19, 20, 21};
-  // Verify we get an error when trying to encode an GsymCreator with no
-  // function infos. We shouldn't be saving a GSYM file in this case since
-  // there is nothing inside of it.
-  GsymCreator GC;
-  TestGsymCreatorEncodeError(llvm::support::little, GC,
-                             "no functions to encode");
-  const uint64_t FuncAddr = 0x1000;
-  const uint64_t FuncSize = 0x100;
-  const uint32_t FuncName = GC.insertString("foo");
-  // Verify we get an error trying to encode a GsymCreator that isn't
-  // finalized.
-  GC.addFunctionInfo(FunctionInfo(FuncAddr, FuncSize, FuncName));
-  TestGsymCreatorEncodeError(llvm::support::little, GC,
-                             "GsymCreator wasn't finalized prior to encoding");
-  std::string finalizeIssues;
-  raw_string_ostream OS(finalizeIssues);
-  llvm::Error finalizeErr = GC.finalize(OS);
-  ASSERT_FALSE(bool(finalizeErr));
-  finalizeErr = GC.finalize(OS);
-  ASSERT_TRUE(bool(finalizeErr));
-  checkError("already finalized", std::move(finalizeErr));
-  // Verify we get an error trying to encode a GsymCreator with a UUID that is
-  // too long.
-  GC.setUUID(InvalidUUID);
-  TestGsymCreatorEncodeError(llvm::support::little, GC,
-                             "invalid UUID size 21");
-  GC.setUUID(ValidUUID);
-  // Verify errors are propagated when we try to encoding an invalid line
-  // table.
-  GC.forEachFunctionInfo([](FunctionInfo &FI) -> bool {
-    FI.OptLineTable = LineTable(); // Invalid line table.
-    return false; // Stop iterating
-  });
-  TestGsymCreatorEncodeError(llvm::support::little, GC,
-                             "attempted to encode invalid LineTable object");
-  // Verify errors are propagated when we try to encoding an invalid inline
-  // info.
-  GC.forEachFunctionInfo([](FunctionInfo &FI) -> bool {
-    FI.OptLineTable = llvm::None;
-    FI.Inline = InlineInfo(); // Invalid InlineInfo.
-    return false; // Stop iterating
-  });
-  TestGsymCreatorEncodeError(llvm::support::little, GC,
-                             "attempted to encode invalid InlineInfo object");
-}
-
-static void Compare(const GsymCreator &GC, const GsymReader &GR) {
-  // Verify that all of the data in a GsymCreator is correctly decoded from
-  // a GsymReader. To do this, we iterator over
-  GC.forEachFunctionInfo([&](const FunctionInfo &FI) -> bool {
-    auto DecodedFI = GR.getFunctionInfo(FI.Range.Start);
-    EXPECT_TRUE(bool(DecodedFI));
-    EXPECT_EQ(FI, *DecodedFI);
-    return true; // Keep iterating over all FunctionInfo objects.
-  });
-}
-
-static void TestEncodeDecode(const GsymCreator &GC,
-                             support::endianness ByteOrder, uint16_t Version,
-                             uint8_t AddrOffSize, uint64_t BaseAddress,
-                             uint32_t NumAddresses, ArrayRef<uint8_t> UUID) {
-  SmallString<512> Str;
-  raw_svector_ostream OutStrm(Str);
-  FileWriter FW(OutStrm, ByteOrder);
-  llvm::Error Err = GC.encode(FW);
-  ASSERT_FALSE((bool)Err);
-  Expected<GsymReader> GR = GsymReader::copyBuffer(OutStrm.str());
-  ASSERT_TRUE(bool(GR));
-  const Header &Hdr = GR->getHeader();
-  EXPECT_EQ(Hdr.Version, Version);
-  EXPECT_EQ(Hdr.AddrOffSize, AddrOffSize);
-  EXPECT_EQ(Hdr.UUIDSize, UUID.size());
-  EXPECT_EQ(Hdr.BaseAddress, BaseAddress);
-  EXPECT_EQ(Hdr.NumAddresses, NumAddresses);
-  EXPECT_EQ(ArrayRef<uint8_t>(Hdr.UUID, Hdr.UUIDSize), UUID);
-  Compare(GC, GR.get());
-}
-
-TEST(GSYMTest, TestGsymCreator1ByteAddrOffsets) {
-  uint8_t UUID[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
-  GsymCreator GC;
-  GC.setUUID(UUID);
-  constexpr uint64_t BaseAddr = 0x1000;
-  constexpr uint8_t AddrOffSize = 1;
-  const uint32_t Func1Name = GC.insertString("foo");
-  const uint32_t Func2Name = GC.insertString("bar");
-  GC.addFunctionInfo(FunctionInfo(BaseAddr+0x00, 0x10, Func1Name));
-  GC.addFunctionInfo(FunctionInfo(BaseAddr+0x20, 0x10, Func2Name));
-  Error Err = GC.finalize(llvm::nulls());
-  ASSERT_FALSE(Err);
-  TestEncodeDecode(GC, llvm::support::little,
-                   GSYM_VERSION,
-                   AddrOffSize,
-                   BaseAddr,
-                   2, // NumAddresses
-                   ArrayRef<uint8_t>(UUID));
-  TestEncodeDecode(GC, llvm::support::big,
-                   GSYM_VERSION,
-                   AddrOffSize,
-                   BaseAddr,
-                   2, // NumAddresses
-                   ArrayRef<uint8_t>(UUID));
-}
-
-TEST(GSYMTest, TestGsymCreator2ByteAddrOffsets) {
-  uint8_t UUID[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
-  GsymCreator GC;
-  GC.setUUID(UUID);
-  constexpr uint64_t BaseAddr = 0x1000;
-  constexpr uint8_t AddrOffSize = 2;
-  const uint32_t Func1Name = GC.insertString("foo");
-  const uint32_t Func2Name = GC.insertString("bar");
-  GC.addFunctionInfo(FunctionInfo(BaseAddr+0x000, 0x100, Func1Name));
-  GC.addFunctionInfo(FunctionInfo(BaseAddr+0x200, 0x100, Func2Name));
-  Error Err = GC.finalize(llvm::nulls());
-  ASSERT_FALSE(Err);
-  TestEncodeDecode(GC, llvm::support::little,
-                   GSYM_VERSION,
-                   AddrOffSize,
-                   BaseAddr,
-                   2, // NumAddresses
-                   ArrayRef<uint8_t>(UUID));
-  TestEncodeDecode(GC, llvm::support::big,
-                   GSYM_VERSION,
-                   AddrOffSize,
-                   BaseAddr,
-                   2, // NumAddresses
-                   ArrayRef<uint8_t>(UUID));
-}
-
-TEST(GSYMTest, TestGsymCreator4ByteAddrOffsets) {
-  uint8_t UUID[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
-  GsymCreator GC;
-  GC.setUUID(UUID);
-  constexpr uint64_t BaseAddr = 0x1000;
-  constexpr uint8_t AddrOffSize = 4;
-  const uint32_t Func1Name = GC.insertString("foo");
-  const uint32_t Func2Name = GC.insertString("bar");
-  GC.addFunctionInfo(FunctionInfo(BaseAddr+0x000, 0x100, Func1Name));
-  GC.addFunctionInfo(FunctionInfo(BaseAddr+0x20000, 0x100, Func2Name));
-  Error Err = GC.finalize(llvm::nulls());
-  ASSERT_FALSE(Err);
-  TestEncodeDecode(GC, llvm::support::little,
-                   GSYM_VERSION,
-                   AddrOffSize,
-                   BaseAddr,
-                   2, // NumAddresses
-                   ArrayRef<uint8_t>(UUID));
-  TestEncodeDecode(GC, llvm::support::big,
-                   GSYM_VERSION,
-                   AddrOffSize,
-                   BaseAddr,
-                   2, // NumAddresses
-                   ArrayRef<uint8_t>(UUID));
-}
-
-TEST(GSYMTest, TestGsymCreator8ByteAddrOffsets) {
-  uint8_t UUID[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
-  GsymCreator GC;
-  GC.setUUID(UUID);
-  constexpr uint64_t BaseAddr = 0x1000;
-  constexpr uint8_t AddrOffSize = 8;
-  const uint32_t Func1Name = GC.insertString("foo");
-  const uint32_t Func2Name = GC.insertString("bar");
-  GC.addFunctionInfo(FunctionInfo(BaseAddr+0x000, 0x100, Func1Name));
-  GC.addFunctionInfo(FunctionInfo(BaseAddr+0x100000000, 0x100, Func2Name));
-  Error Err = GC.finalize(llvm::nulls());
-  ASSERT_FALSE(Err);
-  TestEncodeDecode(GC, llvm::support::little,
-                   GSYM_VERSION,
-                   AddrOffSize,
-                   BaseAddr,
-                   2, // NumAddresses
-                   ArrayRef<uint8_t>(UUID));
-  TestEncodeDecode(GC, llvm::support::big,
-                   GSYM_VERSION,
-                   AddrOffSize,
-                   BaseAddr,
-                   2, // NumAddresses
-                   ArrayRef<uint8_t>(UUID));
-}
-
-static void VerifyFunctionInfo(const GsymReader &GR, uint64_t Addr,
-                               const FunctionInfo &FI) {
-  auto ExpFI = GR.getFunctionInfo(Addr);
-  ASSERT_TRUE(bool(ExpFI));
-  ASSERT_EQ(FI, ExpFI.get());
-}
-
-static void VerifyFunctionInfoError(const GsymReader &GR, uint64_t Addr,
-                                    std::string ErrMessage) {
-  auto ExpFI = GR.getFunctionInfo(Addr);
-  ASSERT_FALSE(bool(ExpFI));
-  checkError(ErrMessage, ExpFI.takeError());
-}
-
-TEST(GSYMTest, TestGsymReader) {
-  uint8_t UUID[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
-  GsymCreator GC;
-  GC.setUUID(UUID);
-  constexpr uint64_t BaseAddr = 0x1000;
-  constexpr uint64_t Func1Addr = BaseAddr;
-  constexpr uint64_t Func2Addr = BaseAddr+0x20;
-  constexpr uint64_t FuncSize = 0x10;
-  const uint32_t Func1Name = GC.insertString("foo");
-  const uint32_t Func2Name = GC.insertString("bar");
-  const auto ByteOrder = support::endian::system_endianness();
-  GC.addFunctionInfo(FunctionInfo(Func1Addr, FuncSize, Func1Name));
-  GC.addFunctionInfo(FunctionInfo(Func2Addr, FuncSize, Func2Name));
-  Error FinalizeErr = GC.finalize(llvm::nulls());
-  ASSERT_FALSE(FinalizeErr);
-  SmallString<512> Str;
-  raw_svector_ostream OutStrm(Str);
-  FileWriter FW(OutStrm, ByteOrder);
-  llvm::Error Err = GC.encode(FW);
-  ASSERT_FALSE((bool)Err);
-  if (auto ExpectedGR = GsymReader::copyBuffer(OutStrm.str())) {
-    const GsymReader &GR = ExpectedGR.get();
-    VerifyFunctionInfoError(GR, Func1Addr-1, "address 0xfff is not in GSYM");
-
-    FunctionInfo Func1(Func1Addr, FuncSize, Func1Name);
-    VerifyFunctionInfo(GR, Func1Addr, Func1);
-    VerifyFunctionInfo(GR, Func1Addr+1, Func1);
-    VerifyFunctionInfo(GR, Func1Addr+FuncSize-1, Func1);
-    VerifyFunctionInfoError(GR, Func1Addr+FuncSize,
-                            "address 0x1010 is not in GSYM");
-    VerifyFunctionInfoError(GR, Func2Addr-1, "address 0x101f is not in GSYM");
-    FunctionInfo Func2(Func2Addr, FuncSize, Func2Name);
-    VerifyFunctionInfo(GR, Func2Addr, Func2);
-    VerifyFunctionInfo(GR, Func2Addr+1, Func2);
-    VerifyFunctionInfo(GR, Func2Addr+FuncSize-1, Func2);
-    VerifyFunctionInfoError(GR, Func2Addr+FuncSize,
-                            "address 0x1030 is not in GSYM");
-  }
-}
-
-TEST(GSYMTest, TestGsymLookups) {
-  // Test creating a GSYM file with a function that has a inline information.
-  // Verify that lookups work correctly. Lookups do not decode the entire
-  // FunctionInfo or InlineInfo, they only extract information needed for the
-  // lookup to happen which avoids allocations which can slow down
-  // symbolication.
-  GsymCreator GC;
-  FunctionInfo FI(0x1000, 0x100, GC.insertString("main"));
-  const auto ByteOrder = support::endian::system_endianness();
-  FI.OptLineTable = LineTable();
-  const uint32_t MainFileIndex = GC.insertFile("/tmp/main.c");
-  const uint32_t FooFileIndex = GC.insertFile("/tmp/foo.h");
-  FI.OptLineTable->push(LineEntry(0x1000, MainFileIndex, 5));
-  FI.OptLineTable->push(LineEntry(0x1010, FooFileIndex, 10));
-  FI.OptLineTable->push(LineEntry(0x1012, FooFileIndex, 20));
-  FI.OptLineTable->push(LineEntry(0x1014, FooFileIndex, 11));
-  FI.OptLineTable->push(LineEntry(0x1016, FooFileIndex, 30));
-  FI.OptLineTable->push(LineEntry(0x1018, FooFileIndex, 12));
-  FI.OptLineTable->push(LineEntry(0x1020, MainFileIndex, 8));
-  FI.Inline = InlineInfo();
-
-  FI.Inline->Name = GC.insertString("inline1");
-  FI.Inline->CallFile = MainFileIndex;
-  FI.Inline->CallLine = 6;
-  FI.Inline->Ranges.insert(AddressRange(0x1010, 0x1020));
-  InlineInfo Inline2;
-  Inline2.Name = GC.insertString("inline2");
-  Inline2.CallFile = FooFileIndex;
-  Inline2.CallLine = 33;
-  Inline2.Ranges.insert(AddressRange(0x1012, 0x1014));
-  FI.Inline->Children.emplace_back(Inline2);
-  InlineInfo Inline3;
-  Inline3.Name = GC.insertString("inline3");
-  Inline3.CallFile = FooFileIndex;
-  Inline3.CallLine = 35;
-  Inline3.Ranges.insert(AddressRange(0x1016, 0x1018));
-  FI.Inline->Children.emplace_back(Inline3);
-  GC.addFunctionInfo(std::move(FI));
-  Error FinalizeErr = GC.finalize(llvm::nulls());
-  ASSERT_FALSE(FinalizeErr);
-  SmallString<512> Str;
-  raw_svector_ostream OutStrm(Str);
-  FileWriter FW(OutStrm, ByteOrder);
-  llvm::Error Err = GC.encode(FW);
-  ASSERT_FALSE((bool)Err);
-  Expected<GsymReader> GR = GsymReader::copyBuffer(OutStrm.str());
-  ASSERT_TRUE(bool(GR));
-
-  // Verify inline info is correct when doing lookups.
-  auto LR = GR->lookup(0x1000);
-  ASSERT_THAT_EXPECTED(LR, Succeeded());
-  EXPECT_THAT(LR->Locations,
-    testing::ElementsAre(SourceLocation{"main", "/tmp", "main.c", 5}));
-  LR = GR->lookup(0x100F);
-  ASSERT_THAT_EXPECTED(LR, Succeeded());
-  EXPECT_THAT(LR->Locations,
-    testing::ElementsAre(SourceLocation{"main", "/tmp", "main.c", 5, 15}));
-
-  LR = GR->lookup(0x1010);
-  ASSERT_THAT_EXPECTED(LR, Succeeded());
-
-  EXPECT_THAT(LR->Locations,
-    testing::ElementsAre(SourceLocation{"inline1", "/tmp", "foo.h", 10},
-                         SourceLocation{"main", "/tmp", "main.c", 6, 16}));
-
-  LR = GR->lookup(0x1012);
-  ASSERT_THAT_EXPECTED(LR, Succeeded());
-  EXPECT_THAT(LR->Locations,
-    testing::ElementsAre(SourceLocation{"inline2", "/tmp", "foo.h", 20},
-                         SourceLocation{"inline1", "/tmp", "foo.h", 33, 2},
-                         SourceLocation{"main", "/tmp", "main.c", 6, 18}));
-
-  LR = GR->lookup(0x1014);
-  ASSERT_THAT_EXPECTED(LR, Succeeded());
-  EXPECT_THAT(LR->Locations,
-    testing::ElementsAre(SourceLocation{"inline1", "/tmp", "foo.h", 11, 4},
-                         SourceLocation{"main", "/tmp", "main.c", 6, 20}));
-
-  LR = GR->lookup(0x1016);
-  ASSERT_THAT_EXPECTED(LR, Succeeded());
-  EXPECT_THAT(LR->Locations,
-    testing::ElementsAre(SourceLocation{"inline3", "/tmp", "foo.h", 30},
-                         SourceLocation{"inline1", "/tmp", "foo.h", 35, 6},
-                         SourceLocation{"main", "/tmp", "main.c", 6, 22}));
-
-  LR = GR->lookup(0x1018);
-  ASSERT_THAT_EXPECTED(LR, Succeeded());
-  EXPECT_THAT(LR->Locations,
-    testing::ElementsAre(SourceLocation{"inline1", "/tmp", "foo.h", 12, 8},
-                         SourceLocation{"main", "/tmp", "main.c", 6, 24}));
-
-  LR = GR->lookup(0x1020);
-  ASSERT_THAT_EXPECTED(LR, Succeeded());
-  EXPECT_THAT(LR->Locations,
-    testing::ElementsAre(SourceLocation{"main", "/tmp", "main.c", 8, 32}));
-}
-
-
-TEST(GSYMTest, TestDWARFFunctionWithAddresses) {
-  // Create a single compile unit with a single function and make sure it gets
-  // converted to DWARF correctly. The function's address range is in where
-  // DW_AT_low_pc and DW_AT_high_pc are both addresses.
-  StringRef yamldata = R"(
-  debug_str:
-    - ''
-    - /tmp/main.c
-    - main
-  debug_abbrev:
-    - Table:
-        - Code:            0x00000001
-          Tag:             DW_TAG_compile_unit
-          Children:        DW_CHILDREN_yes
-          Attributes:
-            - Attribute:       DW_AT_name
-              Form:            DW_FORM_strp
-            - Attribute:       DW_AT_low_pc
-              Form:            DW_FORM_addr
-            - Attribute:       DW_AT_high_pc
-              Form:            DW_FORM_addr
-            - Attribute:       DW_AT_language
-              Form:            DW_FORM_data2
-        - Code:            0x00000002
-          Tag:             DW_TAG_subprogram
-          Children:        DW_CHILDREN_no
-          Attributes:
-            - Attribute:       DW_AT_name
-              Form:            DW_FORM_strp
-            - Attribute:       DW_AT_low_pc
-              Form:            DW_FORM_addr
-            - Attribute:       DW_AT_high_pc
-              Form:            DW_FORM_addr
-  debug_info:
-    - Version:         4
-      AddrSize:        8
-      Entries:
-        - AbbrCode:        0x00000001
-          Values:
-            - Value:           0x0000000000000001
-            - Value:           0x0000000000001000
-            - Value:           0x0000000000002000
-            - Value:           0x0000000000000004
-        - AbbrCode:        0x00000002
-          Values:
-            - Value:           0x000000000000000D
-            - Value:           0x0000000000001000
-            - Value:           0x0000000000002000
-        - AbbrCode:        0x00000000
-  )";
-  auto ErrOrSections = DWARFYAML::emitDebugSections(yamldata);
-  ASSERT_THAT_EXPECTED(ErrOrSections, Succeeded());
-  std::unique_ptr<DWARFContext> DwarfContext =
-      DWARFContext::create(*ErrOrSections, 8);
-  ASSERT_TRUE(DwarfContext.get() != nullptr);
-  auto &OS = llvm::nulls();
-  GsymCreator GC;
-  DwarfTransformer DT(*DwarfContext, OS, GC);
-  const uint32_t ThreadCount = 1;
-  ASSERT_THAT_ERROR(DT.convert(ThreadCount), Succeeded());
-  ASSERT_THAT_ERROR(GC.finalize(OS), Succeeded());
-  SmallString<512> Str;
-  raw_svector_ostream OutStrm(Str);
-  const auto ByteOrder = support::endian::system_endianness();
-  FileWriter FW(OutStrm, ByteOrder);
-  ASSERT_THAT_ERROR(GC.encode(FW), Succeeded());
-  Expected<GsymReader> GR = GsymReader::copyBuffer(OutStrm.str());
-  ASSERT_THAT_EXPECTED(GR, Succeeded());
-  // There should only be one function in our GSYM.
-  EXPECT_EQ(GR->getNumAddresses(), 1u);
-  auto ExpFI = GR->getFunctionInfo(0x1000);
-  ASSERT_THAT_EXPECTED(ExpFI, Succeeded());
-  ASSERT_EQ(ExpFI->Range, AddressRange(0x1000, 0x2000));
-  EXPECT_FALSE(ExpFI->OptLineTable.hasValue());
-  EXPECT_FALSE(ExpFI->Inline.hasValue());
-}
-
-TEST(GSYMTest, TestDWARFFunctionWithAddressAndOffset) {
-  // Create a single compile unit with a single function and make sure it gets
-  // converted to DWARF correctly. The function's address range is in where
-  // DW_AT_low_pc is an address and the DW_AT_high_pc is an offset.
-  StringRef yamldata = R"(
-  debug_str:
-    - ''
-    - /tmp/main.c
-    - main
-  debug_abbrev:
-    - Table:
-        - Code:            0x00000001
-          Tag:             DW_TAG_compile_unit
-          Children:        DW_CHILDREN_yes
-          Attributes:
-            - Attribute:       DW_AT_name
-              Form:            DW_FORM_strp
-            - Attribute:       DW_AT_low_pc
-              Form:            DW_FORM_addr
-            - Attribute:       DW_AT_high_pc
-              Form:            DW_FORM_data4
-            - Attribute:       DW_AT_language
-              Form:            DW_FORM_data2
-        - Code:            0x00000002
-          Tag:             DW_TAG_subprogram
-          Children:        DW_CHILDREN_no
-          Attributes:
-            - Attribute:       DW_AT_name
-              Form:            DW_FORM_strp
-            - Attribute:       DW_AT_low_pc
-              Form:            DW_FORM_addr
-            - Attribute:       DW_AT_high_pc
-              Form:            DW_FORM_data4
-  debug_info:
-    - Version:         4
-      AddrSize:        8
-      Entries:
-        - AbbrCode:        0x00000001
-          Values:
-            - Value:           0x0000000000000001
-            - Value:           0x0000000000001000
-            - Value:           0x0000000000001000
-            - Value:           0x0000000000000004
-        - AbbrCode:        0x00000002
-          Values:
-            - Value:           0x000000000000000D
-            - Value:           0x0000000000001000
-            - Value:           0x0000000000001000
-        - AbbrCode:        0x00000000
-  )";
-  auto ErrOrSections = DWARFYAML::emitDebugSections(yamldata);
-  ASSERT_THAT_EXPECTED(ErrOrSections, Succeeded());
-  std::unique_ptr<DWARFContext> DwarfContext =
-      DWARFContext::create(*ErrOrSections, 8);
-  ASSERT_TRUE(DwarfContext.get() != nullptr);
-  auto &OS = llvm::nulls();
-  GsymCreator GC;
-  DwarfTransformer DT(*DwarfContext, OS, GC);
-  const uint32_t ThreadCount = 1;
-  ASSERT_THAT_ERROR(DT.convert(ThreadCount), Succeeded());
-  ASSERT_THAT_ERROR(GC.finalize(OS), Succeeded());
-  SmallString<512> Str;
-  raw_svector_ostream OutStrm(Str);
-  const auto ByteOrder = support::endian::system_endianness();
-  FileWriter FW(OutStrm, ByteOrder);
-  ASSERT_THAT_ERROR(GC.encode(FW), Succeeded());
-  Expected<GsymReader> GR = GsymReader::copyBuffer(OutStrm.str());
-  ASSERT_THAT_EXPECTED(GR, Succeeded());
-  // There should only be one function in our GSYM.
-  EXPECT_EQ(GR->getNumAddresses(), 1u);
-  auto ExpFI = GR->getFunctionInfo(0x1000);
-  ASSERT_THAT_EXPECTED(ExpFI, Succeeded());
-  ASSERT_EQ(ExpFI->Range, AddressRange(0x1000, 0x2000));
-  EXPECT_FALSE(ExpFI->OptLineTable.hasValue());
-  EXPECT_FALSE(ExpFI->Inline.hasValue());
-}
-
-TEST(GSYMTest, TestDWARFStructMethodNoMangled) {
-  // Sometimes the compiler will omit the mangled name in the DWARF for static
-  // and member functions of classes and structs. This test verifies that the
-  // fully qualified name of the method is computed and used as the string for
-  // the function in the GSYM in these cases. Otherwise we might just get a
-  // function name like "erase" instead of "std::vector<int>::erase".
-  StringRef yamldata = R"(
-  debug_str:
-    - ''
-    - /tmp/main.c
-    - Foo
-    - dump
-    - this
-  debug_abbrev:
-    - Table:
-        - Code:            0x00000001
-          Tag:             DW_TAG_compile_unit
-          Children:        DW_CHILDREN_yes
-          Attributes:
-            - Attribute:       DW_AT_name
-              Form:            DW_FORM_strp
-            - Attribute:       DW_AT_low_pc
-              Form:            DW_FORM_addr
-            - Attribute:       DW_AT_high_pc
-              Form:            DW_FORM_addr
-            - Attribute:       DW_AT_language
-              Form:            DW_FORM_data2
-        - Code:            0x00000002
-          Tag:             DW_TAG_structure_type
-          Children:        DW_CHILDREN_yes
-          Attributes:
-            - Attribute:       DW_AT_name
-              Form:            DW_FORM_strp
-        - Code:            0x00000003
-          Tag:             DW_TAG_subprogram
-          Children:        DW_CHILDREN_yes
-          Attributes:
-            - Attribute:       DW_AT_name
-              Form:            DW_FORM_strp
-            - Attribute:       DW_AT_low_pc
-              Form:            DW_FORM_addr
-            - Attribute:       DW_AT_high_pc
-              Form:            DW_FORM_addr
-        - Code:            0x00000004
-          Tag:             DW_TAG_formal_parameter
-          Children:        DW_CHILDREN_no
-          Attributes:
-            - Attribute:       DW_AT_name
-              Form:            DW_FORM_strp
-            - Attribute:       DW_AT_type
-              Form:            DW_FORM_ref4
-            - Attribute:       DW_AT_artificial
-              Form:            DW_FORM_flag_present
-  debug_info:
-    - Version:         4
-      AddrSize:        8
-      Entries:
-        - AbbrCode:        0x00000001
-          Values:
-            - Value:           0x0000000000000001
-            - Value:           0x0000000000001000
-            - Value:           0x0000000000002000
-            - Value:           0x0000000000000004
-        - AbbrCode:        0x00000002
-          Values:
-            - Value:           0x000000000000000D
-        - AbbrCode:        0x00000003
-          Values:
-            - Value:           0x0000000000000011
-            - Value:           0x0000000000001000
-            - Value:           0x0000000000002000
-        - AbbrCode:        0x00000004
-          Values:
-            - Value:           0x0000000000000016
-            - Value:           0x0000000000000022
-            - Value:           0x0000000000000001
-        - AbbrCode:        0x00000000
-        - AbbrCode:        0x00000000
-        - AbbrCode:        0x00000000
-  )";
-  auto ErrOrSections = DWARFYAML::emitDebugSections(yamldata);
-  ASSERT_THAT_EXPECTED(ErrOrSections, Succeeded());
-  std::unique_ptr<DWARFContext> DwarfContext =
-      DWARFContext::create(*ErrOrSections, 8);
-  ASSERT_TRUE(DwarfContext.get() != nullptr);
-  auto &OS = llvm::nulls();
-  GsymCreator GC;
-  DwarfTransformer DT(*DwarfContext, OS, GC);
-  const uint32_t ThreadCount = 1;
-  ASSERT_THAT_ERROR(DT.convert(ThreadCount), Succeeded());
-  ASSERT_THAT_ERROR(GC.finalize(OS), Succeeded());
-  SmallString<512> Str;
-  raw_svector_ostream OutStrm(Str);
-  const auto ByteOrder = support::endian::system_endianness();
-  FileWriter FW(OutStrm, ByteOrder);
-  ASSERT_THAT_ERROR(GC.encode(FW), Succeeded());
-  Expected<GsymReader> GR = GsymReader::copyBuffer(OutStrm.str());
-  ASSERT_THAT_EXPECTED(GR, Succeeded());
-  // There should only be one function in our GSYM.
-  EXPECT_EQ(GR->getNumAddresses(), 1u);
-  auto ExpFI = GR->getFunctionInfo(0x1000);
-  ASSERT_THAT_EXPECTED(ExpFI, Succeeded());
-  ASSERT_EQ(ExpFI->Range, AddressRange(0x1000, 0x2000));
-  EXPECT_FALSE(ExpFI->OptLineTable.hasValue());
-  EXPECT_FALSE(ExpFI->Inline.hasValue());
-  StringRef MethodName = GR->getString(ExpFI->Name);
-  EXPECT_EQ(MethodName, "Foo::dump");
-}
-
-TEST(GSYMTest, TestDWARFTextRanges) {
-  // Linkers don't understand DWARF, they just like to concatenate and
-  // relocate data within the DWARF sections. This means that if a function
-  // gets dead stripped, and if those functions use an offset as the
-  // DW_AT_high_pc, we can end up with many functions at address zero. The
-  // DwarfTransformer allows clients to specify valid .text address ranges
-  // and any addresses of any functions must fall within those ranges if any
-  // have been specified. This means that an object file can calcuate the
-  // address ranges within the binary where code lives and set these ranges
-  // as constraints in the DwarfTransformer. ObjectFile instances can
-  // add a address ranges of sections that have executable permissions. This
-  // keeps bad information from being added to a GSYM file and causing issues
-  // when symbolicating.
-  StringRef yamldata = R"(
-  debug_str:
-    - ''
-    - /tmp/main.c
-    - main
-    - dead_stripped
-    - dead_stripped2
-  debug_abbrev:
-    - Table:
-        - Code:            0x00000001
-          Tag:             DW_TAG_compile_unit
-          Children:        DW_CHILDREN_yes
-          Attributes:
-            - Attribute:       DW_AT_name
-              Form:            DW_FORM_strp
-            - Attribute:       DW_AT_low_pc
-              Form:            DW_FORM_addr
-            - Attribute:       DW_AT_high_pc
-              Form:            DW_FORM_data4
-            - Attribute:       DW_AT_language
-              Form:            DW_FORM_data2
-        - Code:            0x00000002
-          Tag:             DW_TAG_subprogram
-          Children:        DW_CHILDREN_no
-          Attributes:
-            - Attribute:       DW_AT_name
-              Form:            DW_FORM_strp
-            - Attribute:       DW_AT_low_pc
-              Form:            DW_FORM_addr
-            - Attribute:       DW_AT_high_pc
-              Form:            DW_FORM_data4
-  debug_info:
-    - Version:         4
-      AddrSize:        8
-      Entries:
-        - AbbrCode:        0x00000001
-          Values:
-            - Value:           0x0000000000000001
-            - Value:           0x0000000000001000
-            - Value:           0x0000000000001000
-            - Value:           0x0000000000000004
-        - AbbrCode:        0x00000002
-          Values:
-            - Value:           0x000000000000000D
-            - Value:           0x0000000000001000
-            - Value:           0x0000000000001000
-        - AbbrCode:        0x00000002
-          Values:
-            - Value:           0x0000000000000012
-            - Value:           0x0000000000000000
-            - Value:           0x0000000000000100
-        - AbbrCode:        0x00000002
-          Values:
-            - Value:           0x0000000000000020
-            - Value:           0x0000000000000000
-            - Value:           0x0000000000000040
-        - AbbrCode:        0x00000000
-  )";
-  auto ErrOrSections = DWARFYAML::emitDebugSections(yamldata);
-  ASSERT_THAT_EXPECTED(ErrOrSections, Succeeded());
-  std::unique_ptr<DWARFContext> DwarfContext =
-      DWARFContext::create(*ErrOrSections, 8);
-  ASSERT_TRUE(DwarfContext.get() != nullptr);
-  auto &OS = llvm::nulls();
-  GsymCreator GC;
-  DwarfTransformer DT(*DwarfContext, OS, GC);
-  // Only allow addresses between [0x1000 - 0x2000) to be linked into the
-  // GSYM.
-  AddressRanges TextRanges;
-  TextRanges.insert(AddressRange(0x1000, 0x2000));
-  GC.SetValidTextRanges(TextRanges);
-  const uint32_t ThreadCount = 1;
-  ASSERT_THAT_ERROR(DT.convert(ThreadCount), Succeeded());
-  ASSERT_THAT_ERROR(GC.finalize(OS), Succeeded());
-  SmallString<512> Str;
-  raw_svector_ostream OutStrm(Str);
-  const auto ByteOrder = support::endian::system_endianness();
-  FileWriter FW(OutStrm, ByteOrder);
-  ASSERT_THAT_ERROR(GC.encode(FW), Succeeded());
-  Expected<GsymReader> GR = GsymReader::copyBuffer(OutStrm.str());
-  ASSERT_THAT_EXPECTED(GR, Succeeded());
-  // There should only be one function in our GSYM.
-  EXPECT_EQ(GR->getNumAddresses(), 1u);
-  auto ExpFI = GR->getFunctionInfo(0x1000);
-  ASSERT_THAT_EXPECTED(ExpFI, Succeeded());
-  ASSERT_EQ(ExpFI->Range, AddressRange(0x1000, 0x2000));
-  EXPECT_FALSE(ExpFI->OptLineTable.hasValue());
-  EXPECT_FALSE(ExpFI->Inline.hasValue());
-  StringRef MethodName = GR->getString(ExpFI->Name);
-  EXPECT_EQ(MethodName, "main");
-}
-
-TEST(GSYMTest, TestDWARFInlineInfo) {
-  // Make sure we parse the line table and inline information correctly from
-  // DWARF.
-  StringRef yamldata = R"(
-  debug_str:
-    - ''
-    - /tmp/main.c
-    - main
-    - inline1
-  debug_abbrev:
-    - Table:
-        - Code:            0x00000001
-          Tag:             DW_TAG_compile_unit
-          Children:        DW_CHILDREN_yes
-          Attributes:
-            - Attribute:       DW_AT_name
-              Form:            DW_FORM_strp
-            - Attribute:       DW_AT_low_pc
-              Form:            DW_FORM_addr
-            - Attribute:       DW_AT_high_pc
-              Form:            DW_FORM_data4
-            - Attribute:       DW_AT_language
-              Form:            DW_FORM_data2
-            - Attribute:       DW_AT_stmt_list
-              Form:            DW_FORM_sec_offset
-        - Code:            0x00000002
-          Tag:             DW_TAG_subprogram
-          Children:        DW_CHILDREN_yes
-          Attributes:
-            - Attribute:       DW_AT_name
-              Form:            DW_FORM_strp
-            - Attribute:       DW_AT_low_pc
-              Form:            DW_FORM_addr
-            - Attribute:       DW_AT_high_pc
-              Form:            DW_FORM_data4
-        - Code:            0x00000003
-          Tag:             DW_TAG_inlined_subroutine
-          Children:        DW_CHILDREN_no
-          Attributes:
-            - Attribute:       DW_AT_name
-              Form:            DW_FORM_strp
-            - Attribute:       DW_AT_low_pc
-              Form:            DW_FORM_addr
-            - Attribute:       DW_AT_high_pc
-              Form:            DW_FORM_data4
-            - Attribute:       DW_AT_call_file
-              Form:            DW_FORM_data4
-            - Attribute:       DW_AT_call_line
-              Form:            DW_FORM_data4
-  debug_info:
-    - Version:         4
-      AddrSize:        8
-      Entries:
-        - AbbrCode:        0x00000001
-          Values:
-            - Value:           0x0000000000000001
-            - Value:           0x0000000000001000
-            - Value:           0x0000000000001000
-            - Value:           0x0000000000000004
-            - Value:           0x0000000000000000
-        - AbbrCode:        0x00000002
-          Values:
-            - Value:           0x000000000000000D
-            - Value:           0x0000000000001000
-            - Value:           0x0000000000001000
-        - AbbrCode:        0x00000003
-          Values:
-            - Value:           0x0000000000000012
-            - Value:           0x0000000000001100
-            - Value:           0x0000000000000100
-            - Value:           0x0000000000000001
-            - Value:           0x000000000000000A
-        - AbbrCode:        0x00000000
-        - AbbrCode:        0x00000000
-  debug_line:
-    - Length:          96
-      Version:         2
-      PrologueLength:  46
-      MinInstLength:   1
-      DefaultIsStmt:   1
-      LineBase:        251
-      LineRange:       14
-      OpcodeBase:      13
-      StandardOpcodeLengths: [ 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1 ]
-      IncludeDirs:
-        - /tmp
-      Files:
-        - Name:            main.c
-          DirIdx:          1
-          ModTime:         0
-          Length:          0
-        - Name:            inline.h
-          DirIdx:          1
-          ModTime:         0
-          Length:          0
-      Opcodes:
-        - Opcode:          DW_LNS_extended_op
-          ExtLen:          9
-          SubOpcode:       DW_LNE_set_address
-          Data:            4096
-        - Opcode:          DW_LNS_advance_line
-          SData:           9
-          Data:            4096
-        - Opcode:          DW_LNS_copy
-          Data:            4096
-        - Opcode:          DW_LNS_advance_pc
-          Data:            256
-        - Opcode:          DW_LNS_set_file
-          Data:            2
-        - Opcode:          DW_LNS_advance_line
-          SData:           10
-          Data:            2
-        - Opcode:          DW_LNS_copy
-          Data:            2
-        - Opcode:          DW_LNS_advance_pc
-          Data:            128
-        - Opcode:          DW_LNS_advance_line
-          SData:           1
-          Data:            128
-        - Opcode:          DW_LNS_copy
-          Data:            128
-        - Opcode:          DW_LNS_advance_pc
-          Data:            128
-        - Opcode:          DW_LNS_set_file
-          Data:            1
-        - Opcode:          DW_LNS_advance_line
-          SData:           -10
-          Data:            1
-        - Opcode:          DW_LNS_copy
-          Data:            1
-        - Opcode:          DW_LNS_advance_pc
-          Data:            3584
-        - Opcode:          DW_LNS_advance_line
-          SData:           1
-          Data:            3584
-        - Opcode:          DW_LNS_extended_op
-          ExtLen:          1
-          SubOpcode:       DW_LNE_end_sequence
-          Data:            3584
-  )";
-  auto ErrOrSections = DWARFYAML::emitDebugSections(yamldata);
-  ASSERT_THAT_EXPECTED(ErrOrSections, Succeeded());
-  std::unique_ptr<DWARFContext> DwarfContext =
-      DWARFContext::create(*ErrOrSections, 8);
-  ASSERT_TRUE(DwarfContext.get() != nullptr);
-  auto &OS = llvm::nulls();
-  GsymCreator GC;
-  DwarfTransformer DT(*DwarfContext, OS, GC);
-  const uint32_t ThreadCount = 1;
-  ASSERT_THAT_ERROR(DT.convert(ThreadCount), Succeeded());
-  ASSERT_THAT_ERROR(GC.finalize(OS), Succeeded());
-  SmallString<512> Str;
-  raw_svector_ostream OutStrm(Str);
-  const auto ByteOrder = support::endian::system_endianness();
-  FileWriter FW(OutStrm, ByteOrder);
-  ASSERT_THAT_ERROR(GC.encode(FW), Succeeded());
-  Expected<GsymReader> GR = GsymReader::copyBuffer(OutStrm.str());
-  ASSERT_THAT_EXPECTED(GR, Succeeded());
-  // There should only be one function in our GSYM.
-  EXPECT_EQ(GR->getNumAddresses(), 1u);
-  auto ExpFI = GR->getFunctionInfo(0x1000);
-  ASSERT_THAT_EXPECTED(ExpFI, Succeeded());
-  ASSERT_EQ(ExpFI->Range, AddressRange(0x1000, 0x2000));
-  EXPECT_TRUE(ExpFI->OptLineTable.hasValue());
-  EXPECT_TRUE(ExpFI->Inline.hasValue());
-  StringRef MethodName = GR->getString(ExpFI->Name);
-  EXPECT_EQ(MethodName, "main");
-
-    // Verify inline info is correct when doing lookups.
-  auto LR = GR->lookup(0x1000);
-  ASSERT_THAT_EXPECTED(LR, Succeeded());
-  EXPECT_THAT(LR->Locations,
-    testing::ElementsAre(SourceLocation{"main", "/tmp", "main.c", 10}));
-  LR = GR->lookup(0x1100-1);
-  ASSERT_THAT_EXPECTED(LR, Succeeded());
-  EXPECT_THAT(LR->Locations,
-    testing::ElementsAre(SourceLocation{"main", "/tmp", "main.c", 10, 255}));
-
-  LR = GR->lookup(0x1100);
-  ASSERT_THAT_EXPECTED(LR, Succeeded());
-  EXPECT_THAT(LR->Locations,
-    testing::ElementsAre(SourceLocation{"inline1", "/tmp", "inline.h", 20},
-                         SourceLocation{"main", "/tmp", "main.c", 10, 256}));
-  LR = GR->lookup(0x1180-1);
-  ASSERT_THAT_EXPECTED(LR, Succeeded());
-  EXPECT_THAT(LR->Locations,
-    testing::ElementsAre(SourceLocation{"inline1", "/tmp", "inline.h", 20, 127},
-                         SourceLocation{"main", "/tmp", "main.c", 10, 383}));
-  LR = GR->lookup(0x1180);
-  ASSERT_THAT_EXPECTED(LR, Succeeded());
-  EXPECT_THAT(LR->Locations,
-    testing::ElementsAre(SourceLocation{"inline1", "/tmp", "inline.h", 21, 128},
-                         SourceLocation{"main", "/tmp", "main.c", 10, 384}));
-  LR = GR->lookup(0x1200-1);
-  ASSERT_THAT_EXPECTED(LR, Succeeded());
-  EXPECT_THAT(LR->Locations,
-    testing::ElementsAre(SourceLocation{"inline1", "/tmp", "inline.h", 21, 255},
-                         SourceLocation{"main", "/tmp", "main.c", 10, 511}));
-  LR = GR->lookup(0x1200);
-  ASSERT_THAT_EXPECTED(LR, Succeeded());
-  EXPECT_THAT(LR->Locations,
-    testing::ElementsAre(SourceLocation{"main", "/tmp", "main.c", 11, 512}));
-}
-
-
-TEST(GSYMTest, TestDWARFNoLines) {
-  // Check that if a DW_TAG_subprogram doesn't have line table entries that
-  // we fall back and use the DW_AT_decl_file and DW_AT_decl_line to at least
-  // point to the function definition. This DWARF file has 4 functions:
-  //  "lines_no_decl": has line table entries, no DW_AT_decl_file/line attrs.
-  //  "lines_with_decl": has line table entries and has DW_AT_decl_file/line,
-  //                     make sure we don't use DW_AT_decl_file/line and make
-  //                     sure there is a line table.
-  //  "no_lines_no_decl": no line table entries and no DW_AT_decl_file/line,
-  //                      make sure there is no line table for this function.
-  //  "no_lines_with_decl": no line table and has DW_AT_decl_file/line, make
-  //                        sure we have one line table entry that starts at
-  //                        the function start address and the decl file and
-  //                        line.
-  //
-  // 0x0000000b: DW_TAG_compile_unit
-  //               DW_AT_name	("/tmp/main.c")
-  //               DW_AT_low_pc	(0x0000000000001000)
-  //               DW_AT_high_pc	(0x0000000000002000)
-  //               DW_AT_language	(DW_LANG_C_plus_plus)
-  //               DW_AT_stmt_list	(0x00000000)
-  //
-  // 0x00000022:   DW_TAG_subprogram
-  //                 DW_AT_name	("lines_no_decl")
-  //                 DW_AT_low_pc	(0x0000000000001000)
-  //                 DW_AT_high_pc	(0x0000000000002000)
-  //
-  // 0x00000033:   DW_TAG_subprogram
-  //                 DW_AT_name	("lines_with_decl")
-  //                 DW_AT_low_pc	(0x0000000000002000)
-  //                 DW_AT_high_pc	(0x0000000000003000)
-  //                 DW_AT_decl_file	("/tmp/main.c")
-  //                 DW_AT_decl_line	(20)
-  //
-  // 0x00000046:   DW_TAG_subprogram
-  //                 DW_AT_name	("no_lines_no_decl")
-  //                 DW_AT_low_pc	(0x0000000000003000)
-  //                 DW_AT_high_pc	(0x0000000000004000)
-  //
-  // 0x00000057:   DW_TAG_subprogram
-  //                 DW_AT_name	("no_lines_with_decl")
-  //                 DW_AT_low_pc	(0x0000000000004000)
-  //                 DW_AT_high_pc	(0x0000000000005000)
-  //                 DW_AT_decl_file	("/tmp/main.c")
-  //                 DW_AT_decl_line	(40)
-  //
-  // 0x0000006a:   NULL
-
-  StringRef yamldata = R"(
-  debug_str:
-    - ''
-    - '/tmp/main.c'
-    - lines_no_decl
-    - lines_with_decl
-    - no_lines_no_decl
-    - no_lines_with_decl
-  debug_abbrev:
-    - Table:
-        - Code:            0x00000001
-          Tag:             DW_TAG_compile_unit
-          Children:        DW_CHILDREN_yes
-          Attributes:
-            - Attribute:       DW_AT_name
-              Form:            DW_FORM_strp
-            - Attribute:       DW_AT_low_pc
-              Form:            DW_FORM_addr
-            - Attribute:       DW_AT_high_pc
-              Form:            DW_FORM_data4
-            - Attribute:       DW_AT_language
-              Form:            DW_FORM_data2
-            - Attribute:       DW_AT_stmt_list
-              Form:            DW_FORM_sec_offset
-        - Code:            0x00000002
-          Tag:             DW_TAG_subprogram
-          Children:        DW_CHILDREN_no
-          Attributes:
-            - Attribute:       DW_AT_name
-              Form:            DW_FORM_strp
-            - Attribute:       DW_AT_low_pc
-              Form:            DW_FORM_addr
-            - Attribute:       DW_AT_high_pc
-              Form:            DW_FORM_data4
-        - Code:            0x00000003
-          Tag:             DW_TAG_subprogram
-          Children:        DW_CHILDREN_no
-          Attributes:
-            - Attribute:       DW_AT_name
-              Form:            DW_FORM_strp
-            - Attribute:       DW_AT_low_pc
-              Form:            DW_FORM_addr
-            - Attribute:       DW_AT_high_pc
-              Form:            DW_FORM_data4
-            - Attribute:       DW_AT_decl_file
-              Form:            DW_FORM_data1
-            - Attribute:       DW_AT_decl_line
-              Form:            DW_FORM_data1
-  debug_info:
-    - Version:         4
-      AddrSize:        8
-      Entries:
-        - AbbrCode:        0x00000001
-          Values:
-            - Value:           0x0000000000000001
-            - Value:           0x0000000000001000
-            - Value:           0x0000000000001000
-            - Value:           0x0000000000000004
-            - Value:           0x0000000000000000
-        - AbbrCode:        0x00000002
-          Values:
-            - Value:           0x000000000000000D
-            - Value:           0x0000000000001000
-            - Value:           0x0000000000001000
-        - AbbrCode:        0x00000003
-          Values:
-            - Value:           0x000000000000001B
-            - Value:           0x0000000000002000
-            - Value:           0x0000000000001000
-            - Value:           0x0000000000000001
-            - Value:           0x0000000000000014
-        - AbbrCode:        0x00000002
-          Values:
-            - Value:           0x000000000000002B
-            - Value:           0x0000000000003000
-            - Value:           0x0000000000001000
-        - AbbrCode:        0x00000003
-          Values:
-            - Value:           0x000000000000003C
-            - Value:           0x0000000000004000
-            - Value:           0x0000000000001000
-            - Value:           0x0000000000000001
-            - Value:           0x0000000000000028
-        - AbbrCode:        0x00000000
-  debug_line:
-    - Length:          92
-      Version:         2
-      PrologueLength:  34
-      MinInstLength:   1
-      DefaultIsStmt:   1
-      LineBase:        251
-      LineRange:       14
-      OpcodeBase:      13
-      StandardOpcodeLengths: [ 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1 ]
-      IncludeDirs:
-        - '/tmp'
-      Files:
-        - Name:            main.c
-          DirIdx:          1
-          ModTime:         0
-          Length:          0
-      Opcodes:
-        - Opcode:          DW_LNS_extended_op
-          ExtLen:          9
-          SubOpcode:       DW_LNE_set_address
-          Data:            4096
-        - Opcode:          DW_LNS_advance_line
-          SData:           10
-          Data:            0
-        - Opcode:          DW_LNS_copy
-          Data:            0
-        - Opcode:          DW_LNS_advance_pc
-          Data:            512
-        - Opcode:          DW_LNS_advance_line
-          SData:           1
-          Data:            0
-        - Opcode:          DW_LNS_copy
-          Data:            0
-        - Opcode:          DW_LNS_advance_pc
-          Data:            3584
-        - Opcode:          DW_LNS_extended_op
-          ExtLen:          1
-          SubOpcode:       DW_LNE_end_sequence
-          Data:            0
-        - Opcode:          DW_LNS_extended_op
-          ExtLen:          9
-          SubOpcode:       DW_LNE_set_address
-          Data:            8192
-        - Opcode:          DW_LNS_advance_line
-          SData:           20
-          Data:            0
-        - Opcode:          DW_LNS_copy
-          Data:            0
-        - Opcode:          DW_LNS_advance_pc
-          Data:            512
-        - Opcode:          DW_LNS_advance_line
-          SData:           1
-          Data:            0
-        - Opcode:          DW_LNS_copy
-          Data:            0
-        - Opcode:          DW_LNS_advance_pc
-          Data:            3584
-        - Opcode:          DW_LNS_extended_op
-          ExtLen:          1
-          SubOpcode:       DW_LNE_end_sequence
-          Data:            0
-  )";
-  auto ErrOrSections = DWARFYAML::emitDebugSections(yamldata);
-  ASSERT_THAT_EXPECTED(ErrOrSections, Succeeded());
-  std::unique_ptr<DWARFContext> DwarfContext =
-      DWARFContext::create(*ErrOrSections, 8);
-  ASSERT_TRUE(DwarfContext.get() != nullptr);
-  auto &OS = llvm::nulls();
-  GsymCreator GC;
-  DwarfTransformer DT(*DwarfContext, OS, GC);
-  const uint32_t ThreadCount = 1;
-  ASSERT_THAT_ERROR(DT.convert(ThreadCount), Succeeded());
-  ASSERT_THAT_ERROR(GC.finalize(OS), Succeeded());
-  SmallString<512> Str;
-  raw_svector_ostream OutStrm(Str);
-  const auto ByteOrder = support::endian::system_endianness();
-  FileWriter FW(OutStrm, ByteOrder);
-  ASSERT_THAT_ERROR(GC.encode(FW), Succeeded());
-  Expected<GsymReader> GR = GsymReader::copyBuffer(OutStrm.str());
-  ASSERT_THAT_EXPECTED(GR, Succeeded());
-
-  EXPECT_EQ(GR->getNumAddresses(), 4u);
-
-  auto ExpFI = GR->getFunctionInfo(0x1000);
-  ASSERT_THAT_EXPECTED(ExpFI, Succeeded());
-  ASSERT_EQ(ExpFI->Range, AddressRange(0x1000, 0x2000));
-  EXPECT_TRUE(ExpFI->OptLineTable.hasValue());
-  StringRef MethodName = GR->getString(ExpFI->Name);
-  EXPECT_EQ(MethodName, "lines_no_decl");
-  // Make sure have two line table entries and that get the first line entry
-  // correct.
-  EXPECT_EQ(ExpFI->OptLineTable->size(), 2u);
-  EXPECT_EQ(ExpFI->OptLineTable->first()->Addr, 0x1000u);
-  EXPECT_EQ(ExpFI->OptLineTable->first()->Line, 11u);
-
-  ExpFI = GR->getFunctionInfo(0x2000);
-  ASSERT_THAT_EXPECTED(ExpFI, Succeeded());
-  ASSERT_EQ(ExpFI->Range, AddressRange(0x2000, 0x3000));
-  EXPECT_TRUE(ExpFI->OptLineTable.hasValue());
-  MethodName = GR->getString(ExpFI->Name);
-  EXPECT_EQ(MethodName, "lines_with_decl");
-  // Make sure have two line table entries and that we don't use line 20
-  // from the DW_AT_decl_file/line as a line table entry.
-  EXPECT_EQ(ExpFI->OptLineTable->size(), 2u);
-  EXPECT_EQ(ExpFI->OptLineTable->first()->Addr, 0x2000u);
-  EXPECT_EQ(ExpFI->OptLineTable->first()->Line, 21u);
-
-  ExpFI = GR->getFunctionInfo(0x3000);
-  ASSERT_THAT_EXPECTED(ExpFI, Succeeded());
-  ASSERT_EQ(ExpFI->Range, AddressRange(0x3000, 0x4000));
-  // Make sure we have no line table.
-  EXPECT_FALSE(ExpFI->OptLineTable.hasValue());
-  MethodName = GR->getString(ExpFI->Name);
-  EXPECT_EQ(MethodName, "no_lines_no_decl");
-
-  ExpFI = GR->getFunctionInfo(0x4000);
-  ASSERT_THAT_EXPECTED(ExpFI, Succeeded());
-  ASSERT_EQ(ExpFI->Range, AddressRange(0x4000, 0x5000));
-  EXPECT_TRUE(ExpFI->OptLineTable.hasValue());
-  MethodName = GR->getString(ExpFI->Name);
-  EXPECT_EQ(MethodName, "no_lines_with_decl");
-  // Make sure we have one line table entry that uses the DW_AT_decl_file/line
-  // as the one and only line entry.
-  EXPECT_EQ(ExpFI->OptLineTable->size(), 1u);
-  EXPECT_EQ(ExpFI->OptLineTable->first()->Addr, 0x4000u);
-  EXPECT_EQ(ExpFI->OptLineTable->first()->Line, 40u);
-}
-
-
-TEST(GSYMTest, TestDWARFDeadStripAddr4) {
-  // Check that various techniques that compilers use for dead code stripping
-  // work for 4 byte addresses. Make sure we keep the good functions and
-  // strip any functions whose name starts with "stripped".
-  //
-  // 1 - Compilers might set the low PC to -1 (UINT32_MAX) for compile unit
-  //     with 4 byte addresses ("stripped1")
-  // 2 - Set the low and high PC to the same value ("stripped2")
-  // 3 - Have the high PC lower than the low PC ("stripped3")
-  //
-  // 0x0000000b: DW_TAG_compile_unit
-  //               DW_AT_name	("/tmp/main.c")
-  //               DW_AT_low_pc	(0x0000000000001000)
-  //               DW_AT_high_pc	(0x0000000000002000)
-  //               DW_AT_language	(DW_LANG_C_plus_plus)
-  //
-  // 0x0000001a:   DW_TAG_subprogram
-  //                 DW_AT_name	("main")
-  //                 DW_AT_low_pc	(0x0000000000001000)
-  //                 DW_AT_high_pc	(0x0000000000002000)
-  //
-  // 0x00000027:   DW_TAG_subprogram
-  //                 DW_AT_name	("stripped1")
-  //                 DW_AT_low_pc	(0x00000000ffffffff)
-  //                 DW_AT_high_pc	(0x0000000100000000)
-  //
-  // 0x00000034:   DW_TAG_subprogram
-  //                 DW_AT_name	("stripped2")
-  //                 DW_AT_low_pc	(0x0000000000003000)
-  //                 DW_AT_high_pc	(0x0000000000003000)
-  //
-  // 0x00000041:   DW_TAG_subprogram
-  //                 DW_AT_name	("stripped3")
-  //                 DW_AT_low_pc	(0x0000000000004000)
-  //                 DW_AT_high_pc	(0x0000000000003fff)
-  //
-  // 0x0000004e:   NULL
-
-  StringRef yamldata = R"(
-  debug_str:
-    - ''
-    - '/tmp/main.c'
-    - main
-    - stripped1
-    - stripped2
-    - stripped3
-  debug_abbrev:
-    - Table:
-        - Code:            0x00000001
-          Tag:             DW_TAG_compile_unit
-          Children:        DW_CHILDREN_yes
-          Attributes:
-            - Attribute:       DW_AT_name
-              Form:            DW_FORM_strp
-            - Attribute:       DW_AT_low_pc
-              Form:            DW_FORM_addr
-            - Attribute:       DW_AT_high_pc
-              Form:            DW_FORM_data4
-            - Attribute:       DW_AT_language
-              Form:            DW_FORM_data2
-        - Code:            0x00000002
-          Tag:             DW_TAG_subprogram
-          Children:        DW_CHILDREN_no
-          Attributes:
-            - Attribute:       DW_AT_name
-              Form:            DW_FORM_strp
-            - Attribute:       DW_AT_low_pc
-              Form:            DW_FORM_addr
-            - Attribute:       DW_AT_high_pc
-              Form:            DW_FORM_data4
-        - Code:            0x00000003
-          Tag:             DW_TAG_subprogram
-          Children:        DW_CHILDREN_no
-          Attributes:
-            - Attribute:       DW_AT_name
-              Form:            DW_FORM_strp
-            - Attribute:       DW_AT_low_pc
-              Form:            DW_FORM_addr
-            - Attribute:       DW_AT_high_pc
-              Form:            DW_FORM_addr
-  debug_info:
-    - Version:         4
-      AddrSize:        4
-      Entries:
-        - AbbrCode:        0x00000001
-          Values:
-            - Value:           0x0000000000000001
-            - Value:           0x0000000000001000
-            - Value:           0x0000000000001000
-            - Value:           0x0000000000000004
-        - AbbrCode:        0x00000002
-          Values:
-            - Value:           0x000000000000000D
-            - Value:           0x0000000000001000
-            - Value:           0x0000000000001000
-        - AbbrCode:        0x00000002
-          Values:
-            - Value:           0x0000000000000012
-            - Value:           0x00000000FFFFFFFF
-            - Value:           0x0000000000000001
-        - AbbrCode:        0x00000003
-          Values:
-            - Value:           0x000000000000001C
-            - Value:           0x0000000000003000
-            - Value:           0x0000000000003000
-        - AbbrCode:        0x00000003
-          Values:
-            - Value:           0x0000000000000026
-            - Value:           0x0000000000004000
-            - Value:           0x0000000000003FFF
-        - AbbrCode:        0x00000000
-  )";
-  auto ErrOrSections = DWARFYAML::emitDebugSections(yamldata);
-  ASSERT_THAT_EXPECTED(ErrOrSections, Succeeded());
-  std::unique_ptr<DWARFContext> DwarfContext =
-      DWARFContext::create(*ErrOrSections, 4);
-  ASSERT_TRUE(DwarfContext.get() != nullptr);
-  auto &OS = llvm::nulls();
-  GsymCreator GC;
-  DwarfTransformer DT(*DwarfContext, OS, GC);
-  const uint32_t ThreadCount = 1;
-  ASSERT_THAT_ERROR(DT.convert(ThreadCount), Succeeded());
-  ASSERT_THAT_ERROR(GC.finalize(OS), Succeeded());
-  SmallString<512> Str;
-  raw_svector_ostream OutStrm(Str);
-  const auto ByteOrder = support::endian::system_endianness();
-  FileWriter FW(OutStrm, ByteOrder);
-  ASSERT_THAT_ERROR(GC.encode(FW), Succeeded());
-  Expected<GsymReader> GR = GsymReader::copyBuffer(OutStrm.str());
-  ASSERT_THAT_EXPECTED(GR, Succeeded());
-
-  // Test that the only function that made it was the "main" function.
-  EXPECT_EQ(GR->getNumAddresses(), 1u);
-  auto ExpFI = GR->getFunctionInfo(0x1000);
-  ASSERT_THAT_EXPECTED(ExpFI, Succeeded());
-  ASSERT_EQ(ExpFI->Range, AddressRange(0x1000, 0x2000));
-  StringRef MethodName = GR->getString(ExpFI->Name);
-  EXPECT_EQ(MethodName, "main");
-}
-
-TEST(GSYMTest, TestDWARFDeadStripAddr8) {
-  // Check that various techniques that compilers use for dead code stripping
-  // work for 4 byte addresses. Make sure we keep the good functions and
-  // strip any functions whose name starts with "stripped".
-  //
-  // 1 - Compilers might set the low PC to -1 (UINT64_MAX) for compile unit
-  //     with 8 byte addresses ("stripped1")
-  // 2 - Set the low and high PC to the same value ("stripped2")
-  // 3 - Have the high PC lower than the low PC ("stripped3")
-  //
-  // 0x0000000b: DW_TAG_compile_unit
-  //               DW_AT_name	("/tmp/main.c")
-  //               DW_AT_low_pc	(0x0000000000001000)
-  //               DW_AT_high_pc	(0x0000000000002000)
-  //               DW_AT_language	(DW_LANG_C_plus_plus)
-  //
-  // 0x0000001e:   DW_TAG_subprogram
-  //                 DW_AT_name	("main")
-  //                 DW_AT_low_pc	(0x0000000000001000)
-  //                 DW_AT_high_pc	(0x0000000000002000)
-  //
-  // 0x0000002f:   DW_TAG_subprogram
-  //                 DW_AT_name	("stripped1")
-  //                 DW_AT_low_pc	(0xffffffffffffffff)
-  //                 DW_AT_high_pc	(0x0000000000000000)
-  //
-  // 0x00000040:   DW_TAG_subprogram
-  //                 DW_AT_name	("stripped2")
-  //                 DW_AT_low_pc	(0x0000000000003000)
-  //                 DW_AT_high_pc	(0x0000000000003000)
-  //
-  // 0x00000055:   DW_TAG_subprogram
-  //                 DW_AT_name	("stripped3")
-  //                 DW_AT_low_pc	(0x0000000000004000)
-  //                 DW_AT_high_pc	(0x0000000000003fff)
-  //
-  // 0x0000006a:   NULL
-
-  StringRef yamldata = R"(
-  debug_str:
-    - ''
-    - '/tmp/main.c'
-    - main
-    - stripped1
-    - stripped2
-    - stripped3
-  debug_abbrev:
-    - Table:
-        - Code:            0x00000001
-          Tag:             DW_TAG_compile_unit
-          Children:        DW_CHILDREN_yes
-          Attributes:
-            - Attribute:       DW_AT_name
-              Form:            DW_FORM_strp
-            - Attribute:       DW_AT_low_pc
-              Form:            DW_FORM_addr
-            - Attribute:       DW_AT_high_pc
-              Form:            DW_FORM_data4
-            - Attribute:       DW_AT_language
-              Form:            DW_FORM_data2
-        - Code:            0x00000002
-          Tag:             DW_TAG_subprogram
-          Children:        DW_CHILDREN_no
-          Attributes:
-            - Attribute:       DW_AT_name
-              Form:            DW_FORM_strp
-            - Attribute:       DW_AT_low_pc
-              Form:            DW_FORM_addr
-            - Attribute:       DW_AT_high_pc
-              Form:            DW_FORM_data4
-        - Code:            0x00000003
-          Tag:             DW_TAG_subprogram
-          Children:        DW_CHILDREN_no
-          Attributes:
-            - Attribute:       DW_AT_name
-              Form:            DW_FORM_strp
-            - Attribute:       DW_AT_low_pc
-              Form:            DW_FORM_addr
-            - Attribute:       DW_AT_high_pc
-              Form:            DW_FORM_addr
-  debug_info:
-    - Version:         4
-      AddrSize:        8
-      Entries:
-        - AbbrCode:        0x00000001
-          Values:
-            - Value:           0x0000000000000001
-            - Value:           0x0000000000001000
-            - Value:           0x0000000000001000
-            - Value:           0x0000000000000004
-        - AbbrCode:        0x00000002
-          Values:
-            - Value:           0x000000000000000D
-            - Value:           0x0000000000001000
-            - Value:           0x0000000000001000
-        - AbbrCode:        0x00000002
-          Values:
-            - Value:           0x0000000000000012
-            - Value:           0xFFFFFFFFFFFFFFFF
-            - Value:           0x0000000000000001
-        - AbbrCode:        0x00000003
-          Values:
-            - Value:           0x000000000000001C
-            - Value:           0x0000000000003000
-            - Value:           0x0000000000003000
-        - AbbrCode:        0x00000003
-          Values:
-            - Value:           0x0000000000000026
-            - Value:           0x0000000000004000
-            - Value:           0x0000000000003FFF
-        - AbbrCode:        0x00000000
-  )";
-  auto ErrOrSections = DWARFYAML::emitDebugSections(yamldata);
-  ASSERT_THAT_EXPECTED(ErrOrSections, Succeeded());
-  std::unique_ptr<DWARFContext> DwarfContext =
-      DWARFContext::create(*ErrOrSections, 8);
-  ASSERT_TRUE(DwarfContext.get() != nullptr);
-  auto &OS = llvm::nulls();
-  GsymCreator GC;
-  DwarfTransformer DT(*DwarfContext, OS, GC);
-  const uint32_t ThreadCount = 1;
-  ASSERT_THAT_ERROR(DT.convert(ThreadCount), Succeeded());
-  ASSERT_THAT_ERROR(GC.finalize(OS), Succeeded());
-  SmallString<512> Str;
-  raw_svector_ostream OutStrm(Str);
-  const auto ByteOrder = support::endian::system_endianness();
-  FileWriter FW(OutStrm, ByteOrder);
-  ASSERT_THAT_ERROR(GC.encode(FW), Succeeded());
-  Expected<GsymReader> GR = GsymReader::copyBuffer(OutStrm.str());
-  ASSERT_THAT_EXPECTED(GR, Succeeded());
-
-  // Test that the only function that made it was the "main" function.
-  EXPECT_EQ(GR->getNumAddresses(), 1u);
-  auto ExpFI = GR->getFunctionInfo(0x1000);
-  ASSERT_THAT_EXPECTED(ExpFI, Succeeded());
-  ASSERT_EQ(ExpFI->Range, AddressRange(0x1000, 0x2000));
-  StringRef MethodName = GR->getString(ExpFI->Name);
-  EXPECT_EQ(MethodName, "main");
-}
-
-TEST(GSYMTest, TestGsymCreatorMultipleSymbolsWithNoSize) {
-  // Multiple symbols at the same address with zero size were being emitted
-  // instead of being combined into a single entry. This function tests to make
-  // sure we only get one symbol.
-  uint8_t UUID[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
-  GsymCreator GC;
-  GC.setUUID(UUID);
-  constexpr uint64_t BaseAddr = 0x1000;
-  constexpr uint8_t AddrOffSize = 1;
-  const uint32_t Func1Name = GC.insertString("foo");
-  const uint32_t Func2Name = GC.insertString("bar");
-  GC.addFunctionInfo(FunctionInfo(BaseAddr, 0, Func1Name));
-  GC.addFunctionInfo(FunctionInfo(BaseAddr, 0, Func2Name));
-  Error Err = GC.finalize(llvm::nulls());
-  ASSERT_FALSE(Err);
-  TestEncodeDecode(GC, llvm::support::little, GSYM_VERSION, AddrOffSize,
-                   BaseAddr,
-                   1, // NumAddresses
-                   ArrayRef<uint8_t>(UUID));
-  TestEncodeDecode(GC, llvm::support::big, GSYM_VERSION, AddrOffSize, BaseAddr,
-                   1, // NumAddresses
-                   ArrayRef<uint8_t>(UUID));
-}
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/MSF/CMakeLists.txt b/gnu/llvm/llvm/unittests/DebugInfo/MSF/CMakeLists.txt
deleted file mode 100644
index 0e48ab8f2f6..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/MSF/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  DebugInfoMSF
-  )
-
-add_llvm_unittest(DebugInfoMSFTests
-  MappedBlockStreamTest.cpp
-  MSFBuilderTest.cpp
-  MSFCommonTest.cpp
-  )
-
-target_link_libraries(DebugInfoMSFTests PRIVATE LLVMTestingSupport)
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/MSF/MSFBuilderTest.cpp b/gnu/llvm/llvm/unittests/DebugInfo/MSF/MSFBuilderTest.cpp
deleted file mode 100644
index f327fef52bc..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/MSF/MSFBuilderTest.cpp
+++ /dev/null
@@ -1,395 +0,0 @@
-//===- MSFBuilderTest.cpp  Tests manipulation of MSF stream metadata ------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/DebugInfo/MSF/MSFBuilder.h"
-#include "llvm/DebugInfo/MSF/MSFCommon.h"
-#include "llvm/Testing/Support/Error.h"
-
-#include "gmock/gmock-matchers.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::msf;
-using namespace testing;
-
-namespace {
-class MSFBuilderTest : public testing::Test {
-protected:
-  void initializeSimpleSuperBlock(msf::SuperBlock &SB) {
-    initializeSuperBlock(SB);
-    SB.NumBlocks = 1000;
-    SB.NumDirectoryBytes = 8192;
-  }
-
-  void initializeSuperBlock(msf::SuperBlock &SB) {
-    ::memset(&SB, 0, sizeof(SB));
-
-    ::memcpy(SB.MagicBytes, msf::Magic, sizeof(msf::Magic));
-    SB.FreeBlockMapBlock = 1;
-    SB.BlockMapAddr = 1;
-    SB.BlockSize = 4096;
-    SB.NumDirectoryBytes = 0;
-    SB.NumBlocks = 2; // one for the Super Block, one for the directory
-  }
-
-  BumpPtrAllocator Allocator;
-};
-} // namespace
-
-TEST_F(MSFBuilderTest, ValidateSuperBlockAccept) {
-  // Test that a known good super block passes validation.
-  SuperBlock SB;
-  initializeSuperBlock(SB);
-
-  EXPECT_THAT_ERROR(msf::validateSuperBlock(SB), Succeeded());
-}
-
-TEST_F(MSFBuilderTest, ValidateSuperBlockReject) {
-  // Test that various known problems cause a super block to be rejected.
-  SuperBlock SB;
-  initializeSimpleSuperBlock(SB);
-
-  // Mismatched magic
-  SB.MagicBytes[0] = 8;
-  EXPECT_THAT_ERROR(msf::validateSuperBlock(SB), Failed());
-  initializeSimpleSuperBlock(SB);
-
-  // Block 0 is reserved for super block, can't be occupied by the block map
-  SB.BlockMapAddr = 0;
-  EXPECT_THAT_ERROR(msf::validateSuperBlock(SB), Failed());
-  initializeSimpleSuperBlock(SB);
-
-  // Block sizes have to be powers of 2.
-  SB.BlockSize = 3120;
-  EXPECT_THAT_ERROR(msf::validateSuperBlock(SB), Failed());
-  initializeSimpleSuperBlock(SB);
-
-  // The directory itself has a maximum size.
-  SB.NumDirectoryBytes = SB.BlockSize * SB.BlockSize / 4;
-  EXPECT_THAT_ERROR(msf::validateSuperBlock(SB), Succeeded());
-  SB.NumDirectoryBytes = SB.NumDirectoryBytes + 4;
-  EXPECT_THAT_ERROR(msf::validateSuperBlock(SB), Failed());
-}
-
-TEST_F(MSFBuilderTest, TestUsedBlocksMarkedAsUsed) {
-  // Test that when assigning a stream to a known list of blocks, the blocks
-  // are correctly marked as used after adding, but no other incorrect blocks
-  // are accidentally marked as used.
-
-  std::vector<uint32_t> Blocks = {4, 5, 6, 7, 8, 9, 10, 11, 12};
-  // Allocate some extra blocks at the end so we can verify that they're free
-  // after the initialization.
-  uint32_t NumBlocks = msf::getMinimumBlockCount() + Blocks.size() + 10;
-  auto ExpectedMsf = MSFBuilder::create(Allocator, 4096, NumBlocks);
-  ASSERT_THAT_EXPECTED(ExpectedMsf, Succeeded());
-  auto &Msf = *ExpectedMsf;
-
-  EXPECT_THAT_EXPECTED(Msf.addStream(Blocks.size() * 4096, Blocks),
-                       Succeeded());
-
-  for (auto B : Blocks) {
-    EXPECT_FALSE(Msf.isBlockFree(B));
-  }
-
-  uint32_t FreeBlockStart = Blocks.back() + 1;
-  for (uint32_t I = FreeBlockStart; I < NumBlocks; ++I) {
-    EXPECT_TRUE(Msf.isBlockFree(I));
-  }
-}
-
-TEST_F(MSFBuilderTest, TestAddStreamNoDirectoryBlockIncrease) {
-  // Test that adding a new stream correctly updates the directory.  This only
-  // tests the case where the directory *DOES NOT* grow large enough that it
-  // crosses a Block boundary.
-  auto ExpectedMsf = MSFBuilder::create(Allocator, 4096);
-  EXPECT_THAT_EXPECTED(ExpectedMsf, Succeeded());
-  auto &Msf = *ExpectedMsf;
-
-  auto ExpectedL1 = Msf.generateLayout();
-  EXPECT_THAT_EXPECTED(ExpectedL1, Succeeded());
-  MSFLayout &L1 = *ExpectedL1;
-
-  auto OldDirBlocks = L1.DirectoryBlocks;
-  EXPECT_EQ(1U, OldDirBlocks.size());
-
-  auto ExpectedMsf2 = MSFBuilder::create(Allocator, 4096);
-  EXPECT_THAT_EXPECTED(ExpectedMsf2, Succeeded());
-  auto &Msf2 = *ExpectedMsf2;
-
-  EXPECT_THAT_EXPECTED(Msf2.addStream(4000), Succeeded());
-  EXPECT_EQ(1U, Msf2.getNumStreams());
-  EXPECT_EQ(4000U, Msf2.getStreamSize(0));
-  auto Blocks = Msf2.getStreamBlocks(0);
-  EXPECT_EQ(1U, Blocks.size());
-
-  auto ExpectedL2 = Msf2.generateLayout();
-  EXPECT_THAT_EXPECTED(ExpectedL2, Succeeded());
-  MSFLayout &L2 = *ExpectedL2;
-  auto NewDirBlocks = L2.DirectoryBlocks;
-  EXPECT_EQ(1U, NewDirBlocks.size());
-}
-
-TEST_F(MSFBuilderTest, TestAddStreamWithDirectoryBlockIncrease) {
-  // Test that adding a new stream correctly updates the directory.  This only
-  // tests the case where the directory *DOES* grow large enough that it
-  // crosses a Block boundary.  This is because the newly added stream occupies
-  // so many Blocks that need to be indexed in the directory that the directory
-  // crosses a Block boundary.
-  auto ExpectedMsf = MSFBuilder::create(Allocator, 4096);
-  EXPECT_THAT_EXPECTED(ExpectedMsf, Succeeded());
-  auto &Msf = *ExpectedMsf;
-
-  EXPECT_THAT_EXPECTED(Msf.addStream(4096 * 4096 / sizeof(uint32_t)),
-                       Succeeded());
-
-  auto ExpectedL1 = Msf.generateLayout();
-  EXPECT_THAT_EXPECTED(ExpectedL1, Succeeded());
-  MSFLayout &L1 = *ExpectedL1;
-  auto DirBlocks = L1.DirectoryBlocks;
-  EXPECT_EQ(2U, DirBlocks.size());
-}
-
-TEST_F(MSFBuilderTest, TestGrowStreamNoBlockIncrease) {
-  // Test growing an existing stream by a value that does not affect the number
-  // of blocks it occupies.
-  auto ExpectedMsf = MSFBuilder::create(Allocator, 4096);
-  EXPECT_THAT_EXPECTED(ExpectedMsf, Succeeded());
-  auto &Msf = *ExpectedMsf;
-
-  EXPECT_THAT_EXPECTED(Msf.addStream(1024), Succeeded());
-  EXPECT_EQ(1024U, Msf.getStreamSize(0));
-  auto OldStreamBlocks = Msf.getStreamBlocks(0);
-  EXPECT_EQ(1U, OldStreamBlocks.size());
-
-  EXPECT_THAT_ERROR(Msf.setStreamSize(0, 2048), Succeeded());
-  EXPECT_EQ(2048U, Msf.getStreamSize(0));
-  auto NewStreamBlocks = Msf.getStreamBlocks(0);
-  EXPECT_EQ(1U, NewStreamBlocks.size());
-
-  EXPECT_EQ(OldStreamBlocks, NewStreamBlocks);
-}
-
-TEST_F(MSFBuilderTest, TestGrowStreamWithBlockIncrease) {
-  // Test that growing an existing stream to a value large enough that it causes
-  // the need to allocate new Blocks to the stream correctly updates the
-  // stream's
-  // block list.
-  auto ExpectedMsf = MSFBuilder::create(Allocator, 4096);
-  EXPECT_THAT_EXPECTED(ExpectedMsf, Succeeded());
-  auto &Msf = *ExpectedMsf;
-
-  EXPECT_THAT_EXPECTED(Msf.addStream(2048), Succeeded());
-  EXPECT_EQ(2048U, Msf.getStreamSize(0));
-  std::vector<uint32_t> OldStreamBlocks = Msf.getStreamBlocks(0);
-  EXPECT_EQ(1U, OldStreamBlocks.size());
-
-  EXPECT_THAT_ERROR(Msf.setStreamSize(0, 6144), Succeeded());
-  EXPECT_EQ(6144U, Msf.getStreamSize(0));
-  std::vector<uint32_t> NewStreamBlocks = Msf.getStreamBlocks(0);
-  EXPECT_EQ(2U, NewStreamBlocks.size());
-
-  EXPECT_EQ(OldStreamBlocks[0], NewStreamBlocks[0]);
-  EXPECT_NE(NewStreamBlocks[0], NewStreamBlocks[1]);
-}
-
-TEST_F(MSFBuilderTest, TestShrinkStreamNoBlockDecrease) {
-  // Test that shrinking an existing stream by a value that does not affect the
-  // number of Blocks it occupies makes no changes to stream's block list.
-  auto ExpectedMsf = MSFBuilder::create(Allocator, 4096);
-  EXPECT_THAT_EXPECTED(ExpectedMsf, Succeeded());
-  auto &Msf = *ExpectedMsf;
-
-  EXPECT_THAT_EXPECTED(Msf.addStream(2048), Succeeded());
-  EXPECT_EQ(2048U, Msf.getStreamSize(0));
-  std::vector<uint32_t> OldStreamBlocks = Msf.getStreamBlocks(0);
-  EXPECT_EQ(1U, OldStreamBlocks.size());
-
-  EXPECT_THAT_ERROR(Msf.setStreamSize(0, 1024), Succeeded());
-  EXPECT_EQ(1024U, Msf.getStreamSize(0));
-  std::vector<uint32_t> NewStreamBlocks = Msf.getStreamBlocks(0);
-  EXPECT_EQ(1U, NewStreamBlocks.size());
-
-  EXPECT_EQ(OldStreamBlocks, NewStreamBlocks);
-}
-
-TEST_F(MSFBuilderTest, TestShrinkStreamWithBlockDecrease) {
-  // Test that shrinking an existing stream to a value large enough that it
-  // causes the need to deallocate new Blocks to the stream correctly updates
-  // the stream's block list.
-  auto ExpectedMsf = MSFBuilder::create(Allocator, 4096);
-  EXPECT_THAT_EXPECTED(ExpectedMsf, Succeeded());
-  auto &Msf = *ExpectedMsf;
-
-  EXPECT_THAT_EXPECTED(Msf.addStream(6144), Succeeded());
-  EXPECT_EQ(6144U, Msf.getStreamSize(0));
-  std::vector<uint32_t> OldStreamBlocks = Msf.getStreamBlocks(0);
-  EXPECT_EQ(2U, OldStreamBlocks.size());
-
-  EXPECT_THAT_ERROR(Msf.setStreamSize(0, 2048), Succeeded());
-  EXPECT_EQ(2048U, Msf.getStreamSize(0));
-  std::vector<uint32_t> NewStreamBlocks = Msf.getStreamBlocks(0);
-  EXPECT_EQ(1U, NewStreamBlocks.size());
-
-  EXPECT_EQ(OldStreamBlocks[0], NewStreamBlocks[0]);
-}
-
-TEST_F(MSFBuilderTest, TestRejectReusedStreamBlock) {
-  // Test that attempting to add a stream and assigning a block that is already
-  // in use by another stream fails.
-  auto ExpectedMsf = MSFBuilder::create(Allocator, 4096);
-  EXPECT_THAT_EXPECTED(ExpectedMsf, Succeeded());
-  auto &Msf = *ExpectedMsf;
-
-  EXPECT_THAT_EXPECTED(Msf.addStream(6144), Succeeded());
-
-  std::vector<uint32_t> Blocks = {2, 3};
-  EXPECT_THAT_EXPECTED(Msf.addStream(6144, Blocks), Failed());
-}
-
-TEST_F(MSFBuilderTest, TestBlockCountsWhenAddingStreams) {
-  // Test that when adding multiple streams, the number of used and free Blocks
-  // allocated to the MSF file are as expected.
-  auto ExpectedMsf = MSFBuilder::create(Allocator, 4096);
-  EXPECT_THAT_EXPECTED(ExpectedMsf, Succeeded());
-  auto &Msf = *ExpectedMsf;
-
-  // one for the super block, one for the directory block map
-  uint32_t NumUsedBlocks = Msf.getNumUsedBlocks();
-  EXPECT_EQ(msf::getMinimumBlockCount(), NumUsedBlocks);
-  EXPECT_EQ(0U, Msf.getNumFreeBlocks());
-
-  const uint32_t StreamSizes[] = {4000, 6193, 189723};
-  for (int I = 0; I < 3; ++I) {
-    EXPECT_THAT_EXPECTED(Msf.addStream(StreamSizes[I]), Succeeded());
-    NumUsedBlocks += bytesToBlocks(StreamSizes[I], 4096);
-    EXPECT_EQ(NumUsedBlocks, Msf.getNumUsedBlocks());
-    EXPECT_EQ(0U, Msf.getNumFreeBlocks());
-  }
-}
-
-TEST_F(MSFBuilderTest, BuildMsfLayout) {
-  // Test that we can generate an MSFLayout structure from a valid layout
-  // specification.
-  auto ExpectedMsf = MSFBuilder::create(Allocator, 4096);
-  EXPECT_THAT_EXPECTED(ExpectedMsf, Succeeded());
-  auto &Msf = *ExpectedMsf;
-
-  const uint32_t StreamSizes[] = {4000, 6193, 189723};
-  uint32_t ExpectedNumBlocks = msf::getMinimumBlockCount();
-  for (int I = 0; I < 3; ++I) {
-    EXPECT_THAT_EXPECTED(Msf.addStream(StreamSizes[I]), Succeeded());
-    ExpectedNumBlocks += bytesToBlocks(StreamSizes[I], 4096);
-  }
-  ++ExpectedNumBlocks; // The directory itself should use 1 block
-
-  auto ExpectedLayout = Msf.generateLayout();
-  EXPECT_THAT_EXPECTED(ExpectedLayout, Succeeded());
-  MSFLayout &L = *ExpectedLayout;
-  EXPECT_EQ(4096U, L.SB->BlockSize);
-  EXPECT_EQ(ExpectedNumBlocks, L.SB->NumBlocks);
-
-  EXPECT_EQ(1U, L.DirectoryBlocks.size());
-
-  EXPECT_EQ(3U, L.StreamMap.size());
-  EXPECT_EQ(3U, L.StreamSizes.size());
-  for (int I = 0; I < 3; ++I) {
-    EXPECT_EQ(StreamSizes[I], L.StreamSizes[I]);
-    uint32_t ExpectedNumBlocks = bytesToBlocks(StreamSizes[I], 4096);
-    EXPECT_EQ(ExpectedNumBlocks, L.StreamMap[I].size());
-  }
-}
-
-TEST_F(MSFBuilderTest, UseDirectoryBlockHint) {
-  Expected<MSFBuilder> ExpectedMsf = MSFBuilder::create(
-      Allocator, 4096, msf::getMinimumBlockCount() + 1, false);
-  EXPECT_THAT_EXPECTED(ExpectedMsf, Succeeded());
-  auto &Msf = *ExpectedMsf;
-
-  uint32_t B = msf::getFirstUnreservedBlock();
-  EXPECT_THAT_ERROR(Msf.setDirectoryBlocksHint({B + 1}), Succeeded());
-  EXPECT_THAT_EXPECTED(Msf.addStream(2048, {B + 2}), Succeeded());
-
-  auto ExpectedLayout = Msf.generateLayout();
-  EXPECT_THAT_EXPECTED(ExpectedLayout, Succeeded());
-  MSFLayout &L = *ExpectedLayout;
-  EXPECT_EQ(msf::getMinimumBlockCount() + 2, L.SB->NumBlocks);
-  EXPECT_EQ(1U, L.DirectoryBlocks.size());
-  EXPECT_EQ(1U, L.StreamMap[0].size());
-
-  EXPECT_EQ(B + 1, L.DirectoryBlocks[0]);
-  EXPECT_EQ(B + 2, L.StreamMap[0].front());
-}
-
-TEST_F(MSFBuilderTest, DirectoryBlockHintInsufficient) {
-  Expected<MSFBuilder> ExpectedMsf =
-      MSFBuilder::create(Allocator, 4096, msf::getMinimumBlockCount() + 2);
-  EXPECT_THAT_EXPECTED(ExpectedMsf, Succeeded());
-  auto &Msf = *ExpectedMsf;
-  uint32_t B = msf::getFirstUnreservedBlock();
-  EXPECT_THAT_ERROR(Msf.setDirectoryBlocksHint({B + 1}), Succeeded());
-
-  uint32_t Size = 4096 * 4096 / 4;
-  EXPECT_THAT_EXPECTED(Msf.addStream(Size), Succeeded());
-
-  auto ExpectedLayout = Msf.generateLayout();
-  EXPECT_THAT_EXPECTED(ExpectedLayout, Succeeded());
-  MSFLayout &L = *ExpectedLayout;
-  EXPECT_EQ(2U, L.DirectoryBlocks.size());
-  EXPECT_EQ(B + 1, L.DirectoryBlocks[0]);
-}
-
-TEST_F(MSFBuilderTest, DirectoryBlockHintOverestimated) {
-  Expected<MSFBuilder> ExpectedMsf =
-      MSFBuilder::create(Allocator, 4096, msf::getMinimumBlockCount() + 2);
-  EXPECT_THAT_EXPECTED(ExpectedMsf, Succeeded());
-  auto &Msf = *ExpectedMsf;
-
-  uint32_t B = msf::getFirstUnreservedBlock();
-  EXPECT_THAT_ERROR(Msf.setDirectoryBlocksHint({B + 1, B + 2}), Succeeded());
-
-  ASSERT_THAT_EXPECTED(Msf.addStream(2048), Succeeded());
-
-  auto ExpectedLayout = Msf.generateLayout();
-  ASSERT_THAT_EXPECTED(ExpectedLayout, Succeeded());
-  MSFLayout &L = *ExpectedLayout;
-  EXPECT_EQ(1U, L.DirectoryBlocks.size());
-  EXPECT_EQ(B + 1, L.DirectoryBlocks[0]);
-}
-
-TEST_F(MSFBuilderTest, StreamDoesntUseFpmBlocks) {
-  Expected<MSFBuilder> ExpectedMsf = MSFBuilder::create(Allocator, 4096);
-  ASSERT_THAT_EXPECTED(ExpectedMsf, Succeeded());
-  auto &Msf = *ExpectedMsf;
-
-  // A block is 4096 bytes, and every 4096 blocks we have 2 reserved FPM blocks.
-  // By creating add a stream that spans 4096*4096*3 bytes, we ensure that we
-  // cross over a couple of reserved FPM blocks, and that none of them are
-  // allocated to the stream.
-  constexpr uint32_t StreamSize = 4096 * 4096 * 3;
-  Expected<uint32_t> SN = Msf.addStream(StreamSize);
-  ASSERT_THAT_EXPECTED(SN, Succeeded());
-
-  auto ExpectedLayout = Msf.generateLayout();
-  ASSERT_THAT_EXPECTED(ExpectedLayout, Succeeded());
-  MSFLayout &L = *ExpectedLayout;
-  auto BlocksRef = L.StreamMap[*SN];
-  std::vector<uint32_t> Blocks(BlocksRef.begin(), BlocksRef.end());
-  EXPECT_EQ(StreamSize, L.StreamSizes[*SN]);
-
-  for (uint32_t I = 0; I <= 3; ++I) {
-    // Pages from both FPMs are always allocated.
-    EXPECT_FALSE(L.FreePageMap.test(2 + I * 4096));
-    EXPECT_FALSE(L.FreePageMap.test(1 + I * 4096));
-  }
-
-  for (uint32_t I = 1; I <= 3; ++I) {
-    EXPECT_THAT(Blocks, Not(Contains(1 + I * 4096)));
-    EXPECT_THAT(Blocks, Not(Contains(2 + I * 4096)));
-  }
-}
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/MSF/MSFCommonTest.cpp b/gnu/llvm/llvm/unittests/DebugInfo/MSF/MSFCommonTest.cpp
deleted file mode 100644
index 68d087526cc..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/MSF/MSFCommonTest.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-//===- MSFBuilderTest.cpp  Tests manipulation of MSF stream metadata ------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/DebugInfo/MSF/MSFCommon.h"
-#include "llvm/Testing/Support/Error.h"
-
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::msf;
-
-TEST(MSFCommonTest, BytesToBlocks) {
-  EXPECT_EQ(0ULL, bytesToBlocks(0, 4096));
-  EXPECT_EQ(1ULL, bytesToBlocks(12, 4096));
-  EXPECT_EQ(1ULL, bytesToBlocks(4096, 4096));
-  EXPECT_EQ(2ULL, bytesToBlocks(4097, 4096));
-  EXPECT_EQ(2ULL, bytesToBlocks(600, 512));
-}
-
-TEST(MSFCommonTest, FpmIntervals) {
-  SuperBlock SB;
-  SB.FreeBlockMapBlock = 1;
-  SB.BlockSize = 4096;
-
-  MSFLayout L;
-  L.SB = &SB;
-
-  SB.NumBlocks = 12;
-  EXPECT_EQ(1u, getNumFpmIntervals(L, false));
-  SB.NumBlocks = SB.BlockSize;
-  EXPECT_EQ(1u, getNumFpmIntervals(L, false));
-  SB.NumBlocks = SB.BlockSize + 1;
-  EXPECT_EQ(1u, getNumFpmIntervals(L, false));
-  SB.NumBlocks = SB.BlockSize * 8;
-  EXPECT_EQ(1u, getNumFpmIntervals(L, false));
-  SB.NumBlocks = SB.BlockSize * 8 + 1;
-  EXPECT_EQ(2u, getNumFpmIntervals(L, false));
-
-  SB.NumBlocks = 12;
-  EXPECT_EQ(1u, getNumFpmIntervals(L, true));
-  SB.NumBlocks = SB.BlockSize;
-  EXPECT_EQ(1u, getNumFpmIntervals(L, true));
-  SB.NumBlocks = SB.BlockSize * 8;
-  EXPECT_EQ(8u, getNumFpmIntervals(L, true));
-
-  // The FPM is going to look like this:
-  // |  0  |   1   |   2   |  ...  |  4096  |  4097  |  4098  | ... |
-  // | SB  |  FPM0 | FPM1  | Data  |  Data  |  FPM0  |  FPM1  | ... |
-  //
-  // So when there are up to 4097 blocks (last index 4096), the final blocks
-  // are data blocks.  When there are 4098 blocks (last index 4097), there is
-  // one terminating FPM block, and when there are 4099 blocks, there are two
-  // terminating FPM blocks.  Make sure all these cases are handled.
-
-  // With 4096 or 4097 blocks, the last block is a data block so we only have
-  // 1 interval.
-  for (uint32_t I : {4096, 4097}) {
-    // 1 FPM0 interval
-    EXPECT_EQ(1U, getNumFpmIntervals(4096, I, true, 1));
-    EXPECT_EQ(1U, getNumFpmIntervals(4096, I, false, 1));
-
-    // 1 FPM1 interval
-    EXPECT_EQ(1U, getNumFpmIntervals(4096, I, true, 2));
-    EXPECT_EQ(1U, getNumFpmIntervals(4096, I, false, 2));
-  }
-
-  // With 4098 blocks, the last block belongs to FPM0 so we should have 2 FPM0
-  // intervals.
-  EXPECT_EQ(2U, getNumFpmIntervals(4096, 4098, true, 1));
-  EXPECT_EQ(1U, getNumFpmIntervals(4096, 4098, false, 1));
-
-  // And 1 FPM1 interval.
-  EXPECT_EQ(1U, getNumFpmIntervals(4096, 4098, true, 2));
-  EXPECT_EQ(1U, getNumFpmIntervals(4096, 4098, false, 2));
-
-  // With 4099 blocks, the last block belongs to FPM1 so we should have 2
-  // FPM0 intervals.
-  EXPECT_EQ(2U, getNumFpmIntervals(4096, 4099, true, 1));
-  EXPECT_EQ(1U, getNumFpmIntervals(4096, 4099, false, 1));
-
-  // And 2 FPM1 intervals.
-  EXPECT_EQ(2U, getNumFpmIntervals(4096, 4099, true, 2));
-  EXPECT_EQ(1U, getNumFpmIntervals(4096, 4099, false, 2));
-}
-
-TEST(MSFCommonTest, FpmStreamLayout) {
-  SuperBlock SB;
-  MSFLayout L;
-  L.SB = &SB;
-  SB.FreeBlockMapBlock = 1;
-
-  // Each FPM block has 4096 bytes for a maximum of 4096*8 allocation states.
-  SB.BlockSize = 4096;
-
-  // 1. When we're not including unused FPM data, the length of the FPM stream
-  //    should be only long enough to contain 1 bit for each block.
-
-  // 1a. When the PDB has <= 4096*8 blocks, there should only be one FPM block.
-  SB.NumBlocks = 8000;
-  MSFStreamLayout SL = getFpmStreamLayout(L, false, false);
-  EXPECT_EQ(1000u, SL.Length);
-  EXPECT_EQ(1u, SL.Blocks.size());
-  EXPECT_EQ(SB.FreeBlockMapBlock, SL.Blocks.front());
-
-  SL = getFpmStreamLayout(L, false, true);
-  EXPECT_EQ(1000u, SL.Length);
-  EXPECT_EQ(1u, SL.Blocks.size());
-  EXPECT_EQ(3u - SB.FreeBlockMapBlock, SL.Blocks.front());
-
-  // 1b. When the PDB has > 4096*8 blocks, there should be multiple FPM blocks.
-  SB.NumBlocks = SB.BlockSize * 8 + 1;
-  SL = getFpmStreamLayout(L, false, false);
-  EXPECT_EQ(SB.BlockSize + 1, SL.Length);
-  EXPECT_EQ(2u, SL.Blocks.size());
-  EXPECT_EQ(SB.FreeBlockMapBlock, SL.Blocks[0]);
-  EXPECT_EQ(SB.FreeBlockMapBlock + SB.BlockSize, SL.Blocks[1]);
-
-  SL = getFpmStreamLayout(L, false, true);
-  EXPECT_EQ(SB.BlockSize + 1, SL.Length);
-  EXPECT_EQ(2u, SL.Blocks.size());
-  EXPECT_EQ(3u - SB.FreeBlockMapBlock, SL.Blocks[0]);
-  EXPECT_EQ(3u - SB.FreeBlockMapBlock + SB.BlockSize, SL.Blocks[1]);
-
-  // 2. When we are including unused FPM data, there should be one FPM block
-  //    at every BlockSize interval in the file, even if entire FPM blocks are
-  //    unused.
-  SB.NumBlocks = SB.BlockSize * 8 + 3;
-  SL = getFpmStreamLayout(L, true, false);
-  EXPECT_EQ(SB.BlockSize * 9, SL.Length);
-  EXPECT_EQ(9u, SL.Blocks.size());
-  for (int I = 0; I < 9; ++I)
-    EXPECT_EQ(I * SB.BlockSize + SB.FreeBlockMapBlock, SL.Blocks[I]);
-}
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/MSF/MappedBlockStreamTest.cpp b/gnu/llvm/llvm/unittests/DebugInfo/MSF/MappedBlockStreamTest.cpp
deleted file mode 100644
index bc127213a3a..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/MSF/MappedBlockStreamTest.cpp
+++ /dev/null
@@ -1,547 +0,0 @@
-//===- llvm/unittest/DebugInfo/MSF/MappedBlockStreamTest.cpp --------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/DebugInfo/MSF/MappedBlockStream.h"
-#include "llvm/Support/BinaryByteStream.h"
-#include "llvm/Support/BinaryStreamReader.h"
-#include "llvm/Support/BinaryStreamRef.h"
-#include "llvm/Support/BinaryStreamWriter.h"
-#include "llvm/Testing/Support/Error.h"
-
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-
-using namespace llvm;
-using namespace llvm::msf;
-using namespace llvm::support;
-
-namespace {
-
-static const uint32_t BlocksAry[] = {0, 1, 2, 5, 4, 3, 6, 7, 8, 9};
-static uint8_t DataAry[] = {'A', 'B', 'C', 'F', 'E', 'D', 'G', 'H', 'I', 'J'};
-
-class DiscontiguousStream : public WritableBinaryStream {
-public:
-  DiscontiguousStream(ArrayRef<uint32_t> Blocks, MutableArrayRef<uint8_t> Data)
-      : Blocks(Blocks.begin(), Blocks.end()), Data(Data.begin(), Data.end()) {}
-
-  uint32_t block_size() const { return 1; }
-  uint32_t block_count() const { return Blocks.size(); }
-
-  endianness getEndian() const override { return little; }
-
-  Error readBytes(uint32_t Offset, uint32_t Size,
-                  ArrayRef<uint8_t> &Buffer) override {
-    if (auto EC = checkOffsetForRead(Offset, Size))
-      return EC;
-    Buffer = Data.slice(Offset, Size);
-    return Error::success();
-  }
-
-  Error readLongestContiguousChunk(uint32_t Offset,
-                                   ArrayRef<uint8_t> &Buffer) override {
-    if (auto EC = checkOffsetForRead(Offset, 1))
-      return EC;
-    Buffer = Data.drop_front(Offset);
-    return Error::success();
-  }
-
-  uint32_t getLength() override { return Data.size(); }
-
-  Error writeBytes(uint32_t Offset, ArrayRef<uint8_t> SrcData) override {
-    if (auto EC = checkOffsetForWrite(Offset, SrcData.size()))
-      return EC;
-    ::memcpy(&Data[Offset], SrcData.data(), SrcData.size());
-    return Error::success();
-  }
-  Error commit() override { return Error::success(); }
-
-  MSFStreamLayout layout() const {
-    return MSFStreamLayout{static_cast<uint32_t>(Data.size()), Blocks};
-  }
-
-  BumpPtrAllocator Allocator;
-
-private:
-  std::vector<support::ulittle32_t> Blocks;
-  MutableArrayRef<uint8_t> Data;
-};
-
-TEST(MappedBlockStreamTest, NumBlocks) {
-  DiscontiguousStream F(BlocksAry, DataAry);
-  auto S = MappedBlockStream::createStream(F.block_size(), F.layout(), F,
-                                           F.Allocator);
-  EXPECT_EQ(F.block_size(), S->getBlockSize());
-  EXPECT_EQ(F.layout().Blocks.size(), S->getNumBlocks());
-}
-
-// Tests that a read which is entirely contained within a single block works
-// and does not allocate.
-TEST(MappedBlockStreamTest, ReadBeyondEndOfStreamRef) {
-  DiscontiguousStream F(BlocksAry, DataAry);
-  auto S = MappedBlockStream::createStream(F.block_size(), F.layout(), F,
-                                           F.Allocator);
-
-  BinaryStreamReader R(*S);
-  BinaryStreamRef SR;
-  EXPECT_THAT_ERROR(R.readStreamRef(SR, 0U), Succeeded());
-  ArrayRef<uint8_t> Buffer;
-  EXPECT_THAT_ERROR(SR.readBytes(0U, 1U, Buffer), Failed());
-  EXPECT_THAT_ERROR(R.readStreamRef(SR, 1U), Succeeded());
-  EXPECT_THAT_ERROR(SR.readBytes(1U, 1U, Buffer), Failed());
-}
-
-// Tests that a read which outputs into a full destination buffer works and
-// does not fail due to the length of the output buffer.
-TEST(MappedBlockStreamTest, ReadOntoNonEmptyBuffer) {
-  DiscontiguousStream F(BlocksAry, DataAry);
-  auto S = MappedBlockStream::createStream(F.block_size(), F.layout(), F,
-                                           F.Allocator);
-
-  BinaryStreamReader R(*S);
-  StringRef Str = "ZYXWVUTSRQPONMLKJIHGFEDCBA";
-  EXPECT_THAT_ERROR(R.readFixedString(Str, 1), Succeeded());
-  EXPECT_EQ(Str, StringRef("A"));
-  EXPECT_EQ(0U, F.Allocator.getBytesAllocated());
-}
-
-// Tests that a read which crosses a block boundary, but where the subsequent
-// blocks are still contiguous in memory to the previous block works and does
-// not allocate memory.
-TEST(MappedBlockStreamTest, ZeroCopyReadContiguousBreak) {
-  DiscontiguousStream F(BlocksAry, DataAry);
-  auto S = MappedBlockStream::createStream(F.block_size(), F.layout(), F,
-                                           F.Allocator);
-  BinaryStreamReader R(*S);
-  StringRef Str;
-  EXPECT_THAT_ERROR(R.readFixedString(Str, 2), Succeeded());
-  EXPECT_EQ(Str, StringRef("AB"));
-  EXPECT_EQ(0U, F.Allocator.getBytesAllocated());
-
-  R.setOffset(6);
-  EXPECT_THAT_ERROR(R.readFixedString(Str, 4), Succeeded());
-  EXPECT_EQ(Str, StringRef("GHIJ"));
-  EXPECT_EQ(0U, F.Allocator.getBytesAllocated());
-}
-
-// Tests that a read which crosses a block boundary and cannot be referenced
-// contiguously works and allocates only the precise amount of bytes
-// requested.
-TEST(MappedBlockStreamTest, CopyReadNonContiguousBreak) {
-  DiscontiguousStream F(BlocksAry, DataAry);
-  auto S = MappedBlockStream::createStream(F.block_size(), F.layout(), F,
-                                           F.Allocator);
-  BinaryStreamReader R(*S);
-  StringRef Str;
-  EXPECT_THAT_ERROR(R.readFixedString(Str, 10), Succeeded());
-  EXPECT_EQ(Str, StringRef("ABCDEFGHIJ"));
-  EXPECT_EQ(10U, F.Allocator.getBytesAllocated());
-}
-
-// Test that an out of bounds read which doesn't cross a block boundary
-// fails and allocates no memory.
-TEST(MappedBlockStreamTest, InvalidReadSizeNoBreak) {
-  DiscontiguousStream F(BlocksAry, DataAry);
-  auto S = MappedBlockStream::createStream(F.block_size(), F.layout(), F,
-                                           F.Allocator);
-  BinaryStreamReader R(*S);
-  StringRef Str;
-
-  R.setOffset(10);
-  EXPECT_THAT_ERROR(R.readFixedString(Str, 1), Failed());
-  EXPECT_EQ(0U, F.Allocator.getBytesAllocated());
-}
-
-// Test that an out of bounds read which crosses a contiguous block boundary
-// fails and allocates no memory.
-TEST(MappedBlockStreamTest, InvalidReadSizeContiguousBreak) {
-  DiscontiguousStream F(BlocksAry, DataAry);
-  auto S = MappedBlockStream::createStream(F.block_size(), F.layout(), F,
-                                           F.Allocator);
-  BinaryStreamReader R(*S);
-  StringRef Str;
-
-  R.setOffset(6);
-  EXPECT_THAT_ERROR(R.readFixedString(Str, 5), Failed());
-  EXPECT_EQ(0U, F.Allocator.getBytesAllocated());
-}
-
-// Test that an out of bounds read which crosses a discontiguous block
-// boundary fails and allocates no memory.
-TEST(MappedBlockStreamTest, InvalidReadSizeNonContiguousBreak) {
-  DiscontiguousStream F(BlocksAry, DataAry);
-  auto S = MappedBlockStream::createStream(F.block_size(), F.layout(), F,
-                                           F.Allocator);
-  BinaryStreamReader R(*S);
-  StringRef Str;
-
-  EXPECT_THAT_ERROR(R.readFixedString(Str, 11), Failed());
-  EXPECT_EQ(0U, F.Allocator.getBytesAllocated());
-}
-
-// Tests that a read which is entirely contained within a single block but
-// beyond the end of a StreamRef fails.
-TEST(MappedBlockStreamTest, ZeroCopyReadNoBreak) {
-  DiscontiguousStream F(BlocksAry, DataAry);
-  auto S = MappedBlockStream::createStream(F.block_size(), F.layout(), F,
-                                           F.Allocator);
-  BinaryStreamReader R(*S);
-  StringRef Str;
-  EXPECT_THAT_ERROR(R.readFixedString(Str, 1), Succeeded());
-  EXPECT_EQ(Str, StringRef("A"));
-  EXPECT_EQ(0U, F.Allocator.getBytesAllocated());
-}
-
-// Tests that a read which is not aligned on the same boundary as a previous
-// cached request, but which is known to overlap that request, shares the
-// previous allocation.
-TEST(MappedBlockStreamTest, UnalignedOverlappingRead) {
-  DiscontiguousStream F(BlocksAry, DataAry);
-  auto S = MappedBlockStream::createStream(F.block_size(), F.layout(), F,
-                                           F.Allocator);
-  BinaryStreamReader R(*S);
-  StringRef Str1;
-  StringRef Str2;
-  EXPECT_THAT_ERROR(R.readFixedString(Str1, 7), Succeeded());
-  EXPECT_EQ(Str1, StringRef("ABCDEFG"));
-  EXPECT_EQ(7U, F.Allocator.getBytesAllocated());
-
-  R.setOffset(2);
-  EXPECT_THAT_ERROR(R.readFixedString(Str2, 3), Succeeded());
-  EXPECT_EQ(Str2, StringRef("CDE"));
-  EXPECT_EQ(Str1.data() + 2, Str2.data());
-  EXPECT_EQ(7U, F.Allocator.getBytesAllocated());
-}
-
-// Tests that a read which is not aligned on the same boundary as a previous
-// cached request, but which only partially overlaps a previous cached request,
-// still works correctly and allocates again from the shared pool.
-TEST(MappedBlockStreamTest, UnalignedOverlappingReadFail) {
-  DiscontiguousStream F(BlocksAry, DataAry);
-  auto S = MappedBlockStream::createStream(F.block_size(), F.layout(), F,
-                                           F.Allocator);
-  BinaryStreamReader R(*S);
-  StringRef Str1;
-  StringRef Str2;
-  EXPECT_THAT_ERROR(R.readFixedString(Str1, 6), Succeeded());
-  EXPECT_EQ(Str1, StringRef("ABCDEF"));
-  EXPECT_EQ(6U, F.Allocator.getBytesAllocated());
-
-  R.setOffset(4);
-  EXPECT_THAT_ERROR(R.readFixedString(Str2, 4), Succeeded());
-  EXPECT_EQ(Str2, StringRef("EFGH"));
-  EXPECT_EQ(10U, F.Allocator.getBytesAllocated());
-}
-
-TEST(MappedBlockStreamTest, WriteBeyondEndOfStream) {
-  static uint8_t Data[] = {'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J'};
-  static uint8_t LargeBuffer[] = {'0', '1', '2', '3', '4', '5',
-                                  '6', '7', '8', '9', 'A'};
-  static uint8_t SmallBuffer[] = {'0', '1', '2'};
-  static_assert(sizeof(LargeBuffer) > sizeof(Data),
-                "LargeBuffer is not big enough");
-
-  DiscontiguousStream F(BlocksAry, Data);
-  auto S = WritableMappedBlockStream::createStream(F.block_size(), F.layout(),
-                                                   F, F.Allocator);
-  EXPECT_THAT_ERROR(S->writeBytes(0, ArrayRef<uint8_t>(LargeBuffer)), Failed());
-  EXPECT_THAT_ERROR(S->writeBytes(0, ArrayRef<uint8_t>(SmallBuffer)),
-                    Succeeded());
-  EXPECT_THAT_ERROR(S->writeBytes(7, ArrayRef<uint8_t>(SmallBuffer)),
-                    Succeeded());
-  EXPECT_THAT_ERROR(S->writeBytes(8, ArrayRef<uint8_t>(SmallBuffer)), Failed());
-}
-
-TEST(MappedBlockStreamTest, TestWriteBytesNoBreakBoundary) {
-  static uint8_t Data[] = {'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J'};
-  DiscontiguousStream F(BlocksAry, Data);
-  auto S = WritableMappedBlockStream::createStream(F.block_size(), F.layout(),
-                                                   F, F.Allocator);
-  ArrayRef<uint8_t> Buffer;
-
-  EXPECT_THAT_ERROR(S->readBytes(0, 1, Buffer), Succeeded());
-  EXPECT_EQ(Buffer, ArrayRef<uint8_t>('A'));
-  EXPECT_THAT_ERROR(S->readBytes(9, 1, Buffer), Succeeded());
-  EXPECT_EQ(Buffer, ArrayRef<uint8_t>('J'));
-
-  EXPECT_THAT_ERROR(S->writeBytes(0, ArrayRef<uint8_t>('J')), Succeeded());
-  EXPECT_THAT_ERROR(S->writeBytes(9, ArrayRef<uint8_t>('A')), Succeeded());
-
-  EXPECT_THAT_ERROR(S->readBytes(0, 1, Buffer), Succeeded());
-  EXPECT_EQ(Buffer, ArrayRef<uint8_t>('J'));
-  EXPECT_THAT_ERROR(S->readBytes(9, 1, Buffer), Succeeded());
-  EXPECT_EQ(Buffer, ArrayRef<uint8_t>('A'));
-
-  EXPECT_THAT_ERROR(S->writeBytes(0, ArrayRef<uint8_t>('A')), Succeeded());
-  EXPECT_THAT_ERROR(S->writeBytes(9, ArrayRef<uint8_t>('J')), Succeeded());
-
-  EXPECT_THAT_ERROR(S->readBytes(0, 1, Buffer), Succeeded());
-  EXPECT_EQ(Buffer, ArrayRef<uint8_t>('A'));
-  EXPECT_THAT_ERROR(S->readBytes(9, 1, Buffer), Succeeded());
-  EXPECT_EQ(Buffer, ArrayRef<uint8_t>('J'));
-}
-
-TEST(MappedBlockStreamTest, TestWriteBytesBreakBoundary) {
-  static uint8_t Data[] = {'0', '0', '0', '0', '0', '0', '0', '0', '0', '0'};
-  static uint8_t TestData[] = {'T', 'E', 'S', 'T', 'I', 'N', 'G', '.'};
-  static uint8_t Expected[] = {'T', 'E', 'S', 'N', 'I',
-                               'T', 'G', '.', '0', '0'};
-
-  DiscontiguousStream F(BlocksAry, Data);
-  auto S = WritableMappedBlockStream::createStream(F.block_size(), F.layout(),
-                                                   F, F.Allocator);
-  ArrayRef<uint8_t> Buffer;
-
-  EXPECT_THAT_ERROR(S->writeBytes(0, TestData), Succeeded());
-  // First just compare the memory, then compare the result of reading the
-  // string out.
-  EXPECT_EQ(ArrayRef<uint8_t>(Data), ArrayRef<uint8_t>(Expected));
-
-  EXPECT_THAT_ERROR(S->readBytes(0, 8, Buffer), Succeeded());
-  EXPECT_EQ(Buffer, ArrayRef<uint8_t>(TestData));
-}
-
-TEST(MappedBlockStreamTest, TestWriteThenRead) {
-  std::vector<uint8_t> DataBytes(10);
-  MutableArrayRef<uint8_t> Data(DataBytes);
-  const uint32_t Blocks[] = {2, 1, 0, 6, 3, 4, 5, 7, 9, 8};
-
-  DiscontiguousStream F(Blocks, Data);
-  auto S = WritableMappedBlockStream::createStream(F.block_size(), F.layout(),
-                                                   F, F.Allocator);
-
-  enum class MyEnum : uint32_t { Val1 = 2908234, Val2 = 120891234 };
-  using support::ulittle32_t;
-
-  uint16_t u16[] = {31468, 0};
-  uint32_t u32[] = {890723408, 0};
-  MyEnum Enum[] = {MyEnum::Val1, MyEnum::Val2};
-  StringRef ZStr[] = {"Zero Str", ""};
-  StringRef FStr[] = {"Fixed Str", ""};
-  uint8_t byteArray0[] = {'1', '2'};
-  uint8_t byteArray1[] = {'0', '0'};
-  ArrayRef<uint8_t> byteArrayRef0(byteArray0);
-  ArrayRef<uint8_t> byteArrayRef1(byteArray1);
-  ArrayRef<uint8_t> byteArray[] = {byteArrayRef0, byteArrayRef1};
-  uint32_t intArr0[] = {890723408, 29082234};
-  uint32_t intArr1[] = {890723408, 29082234};
-  ArrayRef<uint32_t> intArray[] = {intArr0, intArr1};
-
-  BinaryStreamReader Reader(*S);
-  BinaryStreamWriter Writer(*S);
-  EXPECT_THAT_ERROR(Writer.writeInteger(u16[0]), Succeeded());
-  EXPECT_THAT_ERROR(Reader.readInteger(u16[1]), Succeeded());
-  EXPECT_EQ(u16[0], u16[1]);
-  EXPECT_EQ(std::vector<uint8_t>({0, 0x7A, 0xEC, 0, 0, 0, 0, 0, 0, 0}),
-            DataBytes);
-
-  Reader.setOffset(0);
-  Writer.setOffset(0);
-  ::memset(DataBytes.data(), 0, 10);
-  EXPECT_THAT_ERROR(Writer.writeInteger(u32[0]), Succeeded());
-  EXPECT_THAT_ERROR(Reader.readInteger(u32[1]), Succeeded());
-  EXPECT_EQ(u32[0], u32[1]);
-  EXPECT_EQ(std::vector<uint8_t>({0x17, 0x5C, 0x50, 0, 0, 0, 0x35, 0, 0, 0}),
-            DataBytes);
-
-  Reader.setOffset(0);
-  Writer.setOffset(0);
-  ::memset(DataBytes.data(), 0, 10);
-  EXPECT_THAT_ERROR(Writer.writeEnum(Enum[0]), Succeeded());
-  EXPECT_THAT_ERROR(Reader.readEnum(Enum[1]), Succeeded());
-  EXPECT_EQ(Enum[0], Enum[1]);
-  EXPECT_EQ(std::vector<uint8_t>({0x2C, 0x60, 0x4A, 0, 0, 0, 0, 0, 0, 0}),
-            DataBytes);
-
-  Reader.setOffset(0);
-  Writer.setOffset(0);
-  ::memset(DataBytes.data(), 0, 10);
-  EXPECT_THAT_ERROR(Writer.writeCString(ZStr[0]), Succeeded());
-  EXPECT_THAT_ERROR(Reader.readCString(ZStr[1]), Succeeded());
-  EXPECT_EQ(ZStr[0], ZStr[1]);
-  EXPECT_EQ(
-      std::vector<uint8_t>({'r', 'e', 'Z', ' ', 'S', 't', 'o', 'r', 0, 0}),
-      DataBytes);
-
-  Reader.setOffset(0);
-  Writer.setOffset(0);
-  ::memset(DataBytes.data(), 0, 10);
-  EXPECT_THAT_ERROR(Writer.writeFixedString(FStr[0]), Succeeded());
-  EXPECT_THAT_ERROR(Reader.readFixedString(FStr[1], FStr[0].size()),
-                    Succeeded());
-  EXPECT_EQ(FStr[0], FStr[1]);
-  EXPECT_EQ(
-      std::vector<uint8_t>({'x', 'i', 'F', 'd', ' ', 'S', 'e', 't', 0, 'r'}),
-      DataBytes);
-
-  Reader.setOffset(0);
-  Writer.setOffset(0);
-  ::memset(DataBytes.data(), 0, 10);
-  EXPECT_THAT_ERROR(Writer.writeArray(byteArray[0]), Succeeded());
-  EXPECT_THAT_ERROR(Reader.readArray(byteArray[1], byteArray[0].size()),
-                    Succeeded());
-  EXPECT_EQ(byteArray[0], byteArray[1]);
-  EXPECT_EQ(std::vector<uint8_t>({0, 0x32, 0x31, 0, 0, 0, 0, 0, 0, 0}),
-            DataBytes);
-
-  Reader.setOffset(0);
-  Writer.setOffset(0);
-  ::memset(DataBytes.data(), 0, 10);
-  EXPECT_THAT_ERROR(Writer.writeArray(intArray[0]), Succeeded());
-  EXPECT_THAT_ERROR(Reader.readArray(intArray[1], intArray[0].size()),
-                    Succeeded());
-  EXPECT_EQ(intArray[0], intArray[1]);
-}
-
-TEST(MappedBlockStreamTest, TestWriteContiguousStreamRef) {
-  std::vector<uint8_t> DestDataBytes(10);
-  MutableArrayRef<uint8_t> DestData(DestDataBytes);
-  const uint32_t DestBlocks[] = {2, 1, 0, 6, 3, 4, 5, 7, 9, 8};
-
-  std::vector<uint8_t> SrcDataBytes(10);
-  MutableArrayRef<uint8_t> SrcData(SrcDataBytes);
-
-  DiscontiguousStream F(DestBlocks, DestData);
-  auto DestStream = WritableMappedBlockStream::createStream(
-      F.block_size(), F.layout(), F, F.Allocator);
-
-  // First write "Test Str" into the source stream.
-  MutableBinaryByteStream SourceStream(SrcData, little);
-  BinaryStreamWriter SourceWriter(SourceStream);
-  EXPECT_THAT_ERROR(SourceWriter.writeCString("Test Str"), Succeeded());
-  EXPECT_EQ(SrcDataBytes, std::vector<uint8_t>(
-                              {'T', 'e', 's', 't', ' ', 'S', 't', 'r', 0, 0}));
-
-  // Then write the source stream into the dest stream.
-  BinaryStreamWriter DestWriter(*DestStream);
-  EXPECT_THAT_ERROR(DestWriter.writeStreamRef(SourceStream), Succeeded());
-  EXPECT_EQ(DestDataBytes, std::vector<uint8_t>(
-                               {'s', 'e', 'T', ' ', 'S', 't', 't', 'r', 0, 0}));
-
-  // Then read the string back out of the dest stream.
-  StringRef Result;
-  BinaryStreamReader DestReader(*DestStream);
-  EXPECT_THAT_ERROR(DestReader.readCString(Result), Succeeded());
-  EXPECT_EQ(Result, "Test Str");
-}
-
-TEST(MappedBlockStreamTest, TestWriteDiscontiguousStreamRef) {
-  std::vector<uint8_t> DestDataBytes(10);
-  MutableArrayRef<uint8_t> DestData(DestDataBytes);
-  const uint32_t DestBlocks[] = {2, 1, 0, 6, 3, 4, 5, 7, 9, 8};
-
-  std::vector<uint8_t> SrcDataBytes(10);
-  MutableArrayRef<uint8_t> SrcData(SrcDataBytes);
-  const uint32_t SrcBlocks[] = {1, 0, 6, 3, 4, 5, 2, 7, 8, 9};
-
-  DiscontiguousStream DestF(DestBlocks, DestData);
-  DiscontiguousStream SrcF(SrcBlocks, SrcData);
-
-  auto Dest = WritableMappedBlockStream::createStream(
-      DestF.block_size(), DestF.layout(), DestF, DestF.Allocator);
-  auto Src = WritableMappedBlockStream::createStream(
-      SrcF.block_size(), SrcF.layout(), SrcF, SrcF.Allocator);
-
-  // First write "Test Str" into the source stream.
-  BinaryStreamWriter SourceWriter(*Src);
-  EXPECT_THAT_ERROR(SourceWriter.writeCString("Test Str"), Succeeded());
-  EXPECT_EQ(SrcDataBytes, std::vector<uint8_t>(
-                              {'e', 'T', 't', 't', ' ', 'S', 's', 'r', 0, 0}));
-
-  // Then write the source stream into the dest stream.
-  BinaryStreamWriter DestWriter(*Dest);
-  EXPECT_THAT_ERROR(DestWriter.writeStreamRef(*Src), Succeeded());
-  EXPECT_EQ(DestDataBytes, std::vector<uint8_t>(
-                               {'s', 'e', 'T', ' ', 'S', 't', 't', 'r', 0, 0}));
-
-  // Then read the string back out of the dest stream.
-  StringRef Result;
-  BinaryStreamReader DestReader(*Dest);
-  EXPECT_THAT_ERROR(DestReader.readCString(Result), Succeeded());
-  EXPECT_EQ(Result, "Test Str");
-}
-
-TEST(MappedBlockStreamTest, DataLivesAfterStreamDestruction) {
-  std::vector<uint8_t> DataBytes(10);
-  MutableArrayRef<uint8_t> Data(DataBytes);
-  const uint32_t Blocks[] = {2, 1, 0, 6, 3, 4, 5, 7, 9, 8};
-
-  StringRef Str[] = {"Zero Str", ""};
-
-  DiscontiguousStream F(Blocks, Data);
-  {
-    auto S = WritableMappedBlockStream::createStream(F.block_size(), F.layout(),
-                                                     F, F.Allocator);
-
-    BinaryStreamReader Reader(*S);
-    BinaryStreamWriter Writer(*S);
-    ::memset(DataBytes.data(), 0, 10);
-    EXPECT_THAT_ERROR(Writer.writeCString(Str[0]), Succeeded());
-    EXPECT_THAT_ERROR(Reader.readCString(Str[1]), Succeeded());
-    EXPECT_EQ(Str[0], Str[1]);
-  }
-
-  EXPECT_EQ(Str[0], Str[1]);
-}
-} // namespace
-
-MATCHER_P3(BlockIsFilledWith, Layout, BlockIndex, Byte, "succeeded") {
-  uint64_t Offset = msf::blockToOffset(BlockIndex, Layout.SB->BlockSize);
-  ArrayRef<uint8_t> BufferRef = makeArrayRef(arg);
-  BufferRef = BufferRef.slice(Offset, Layout.SB->BlockSize);
-  return llvm::all_of(BufferRef, [this](uint8_t B) { return B == Byte; });
-}
-
-namespace {
-TEST(MappedBlockStreamTest, CreateFpmStream) {
-  BumpPtrAllocator Allocator;
-  SuperBlock SB;
-  MSFLayout L;
-  L.SB = &SB;
-
-  SB.FreeBlockMapBlock = 1;
-  SB.BlockSize = 4096;
-
-  constexpr uint32_t NumFileBlocks = 4096 * 4;
-
-  std::vector<uint8_t> MsfBuffer(NumFileBlocks * SB.BlockSize);
-  MutableBinaryByteStream MsfStream(MsfBuffer, llvm::support::little);
-
-  SB.NumBlocks = NumFileBlocks;
-  auto FpmStream =
-      WritableMappedBlockStream::createFpmStream(L, MsfStream, Allocator);
-  // 4096 * 4 / 8 = 2048 bytes of FPM data is needed to describe 4096 * 4
-  // blocks.  This translates to 1 FPM block.
-  EXPECT_EQ(2048u, FpmStream->getLength());
-  EXPECT_EQ(1u, FpmStream->getStreamLayout().Blocks.size());
-  EXPECT_EQ(1u, FpmStream->getStreamLayout().Blocks[0]);
-  // All blocks from FPM1 should be 1 initialized, and all blocks from FPM2
-  // should be 0 initialized (since we requested the main FPM, not the alt FPM)
-  for (int I = 0; I < 4; ++I) {
-    EXPECT_THAT(MsfBuffer, BlockIsFilledWith(L, 1 + I * SB.BlockSize, 0xFF));
-    EXPECT_THAT(MsfBuffer, BlockIsFilledWith(L, 2 + I * SB.BlockSize, 0));
-  }
-
-  ::memset(MsfBuffer.data(), 0, MsfBuffer.size());
-  FpmStream =
-      WritableMappedBlockStream::createFpmStream(L, MsfStream, Allocator, true);
-  // 4096 * 4 / 8 = 2048 bytes of FPM data is needed to describe 4096 * 4
-  // blocks.  This translates to 1 FPM block.
-  EXPECT_EQ(2048u, FpmStream->getLength());
-  EXPECT_EQ(1u, FpmStream->getStreamLayout().Blocks.size());
-  EXPECT_EQ(2u, FpmStream->getStreamLayout().Blocks[0]);
-  // All blocks from FPM2 should be 1 initialized, and all blocks from FPM1
-  // should be 0 initialized (since we requested the alt FPM, not the main FPM)
-  for (int I = 0; I < 4; ++I) {
-    EXPECT_THAT(MsfBuffer, BlockIsFilledWith(L, 1 + I * SB.BlockSize, 0));
-    EXPECT_THAT(MsfBuffer, BlockIsFilledWith(L, 2 + I * SB.BlockSize, 0xFF));
-  }
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/PDB/CMakeLists.txt b/gnu/llvm/llvm/unittests/DebugInfo/PDB/CMakeLists.txt
deleted file mode 100644
index c8c2659277a..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/PDB/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  DebugInfoCodeView
-  DebugInfoMSF
-  DebugInfoPDB
-  )
-
-add_llvm_unittest_with_input_files(DebugInfoPDBTests
-  HashTableTest.cpp
-  NativeSessionTest.cpp
-  NativeSymbolReuseTest.cpp
-  StringTableBuilderTest.cpp
-  PDBApiTest.cpp
-  )
-
-target_link_libraries(DebugInfoPDBTests PRIVATE LLVMTestingSupport)
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/PDB/HashTableTest.cpp b/gnu/llvm/llvm/unittests/DebugInfo/PDB/HashTableTest.cpp
deleted file mode 100644
index 5f0695bc4cb..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/PDB/HashTableTest.cpp
+++ /dev/null
@@ -1,270 +0,0 @@
-//===- llvm/unittest/DebugInfo/PDB/HashTableTest.cpp ----------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/DebugInfo/PDB/Native/HashTable.h"
-
-#include "llvm/DebugInfo/PDB/Native/Hash.h"
-#include "llvm/DebugInfo/PDB/Native/NamedStreamMap.h"
-#include "llvm/Support/Allocator.h"
-#include "llvm/Support/BinaryByteStream.h"
-#include "llvm/Support/BinaryStreamReader.h"
-#include "llvm/Support/BinaryStreamWriter.h"
-#include "llvm/Support/StringSaver.h"
-#include "llvm/Testing/Support/Error.h"
-
-#include "gtest/gtest.h"
-
-#include <vector>
-
-using namespace llvm;
-using namespace llvm::pdb;
-using namespace llvm::support;
-
-namespace {
-
-struct IdentityHashTraits {
-  uint32_t hashLookupKey(uint32_t N) const { return N; }
-  uint32_t storageKeyToLookupKey(uint32_t N) const { return N; }
-  uint32_t lookupKeyToStorageKey(uint32_t N) { return N; }
-};
-
-template <class T = uint32_t>
-class HashTableInternals : public HashTable<T> {
-public:
-  using HashTable<T>::Buckets;
-  using HashTable<T>::Present;
-  using HashTable<T>::Deleted;
-};
-}
-
-TEST(HashTableTest, TestSimple) {
-  HashTableInternals<> Table;
-  EXPECT_EQ(0u, Table.size());
-  EXPECT_GT(Table.capacity(), 0u);
-
-  IdentityHashTraits Traits;
-  Table.set_as(3u, 7, Traits);
-  EXPECT_EQ(1u, Table.size());
-  ASSERT_NE(Table.end(), Table.find_as(3u, Traits));
-  EXPECT_EQ(7u, Table.get(3u, Traits));
-}
-
-TEST(HashTableTest, TestCollision) {
-  HashTableInternals<> Table;
-  EXPECT_EQ(0u, Table.size());
-  EXPECT_GT(Table.capacity(), 0u);
-
-  // We use knowledge of the hash table's implementation details to make sure
-  // to add another value that is the equivalent to the first value modulo the
-  // hash table's capacity.
-  uint32_t N1 = Table.capacity() + 1;
-  uint32_t N2 = 2 * N1;
-
-  IdentityHashTraits Traits;
-  Table.set_as(N1, 7, Traits);
-  Table.set_as(N2, 12, Traits);
-  EXPECT_EQ(2u, Table.size());
-  ASSERT_NE(Table.end(), Table.find_as(N1, Traits));
-  ASSERT_NE(Table.end(), Table.find_as(N2, Traits));
-
-  EXPECT_EQ(7u, Table.get(N1, Traits));
-  EXPECT_EQ(12u, Table.get(N2, Traits));
-}
-
-TEST(HashTableTest, TestRemove) {
-  HashTableInternals<> Table;
-  EXPECT_EQ(0u, Table.size());
-  EXPECT_GT(Table.capacity(), 0u);
-
-  IdentityHashTraits Traits;
-  Table.set_as(1u, 2, Traits);
-  Table.set_as(3u, 4, Traits);
-  EXPECT_EQ(2u, Table.size());
-  ASSERT_NE(Table.end(), Table.find_as(1u, Traits));
-  ASSERT_NE(Table.end(), Table.find_as(3u, Traits));
-
-  EXPECT_EQ(2u, Table.get(1u, Traits));
-  EXPECT_EQ(4u, Table.get(3u, Traits));
-}
-
-TEST(HashTableTest, TestCollisionAfterMultipleProbes) {
-  HashTableInternals<> Table;
-  EXPECT_EQ(0u, Table.size());
-  EXPECT_GT(Table.capacity(), 0u);
-
-  // Probing looks for the first available slot.  A slot may already be filled
-  // as a result of an item with a *different* hash value already being there.
-  // Test that when this happens, the probe still finds the value.
-  uint32_t N1 = Table.capacity() + 1;
-  uint32_t N2 = N1 + 1;
-  uint32_t N3 = 2 * N1;
-
-  IdentityHashTraits Traits;
-  Table.set_as(N1, 7, Traits);
-  Table.set_as(N2, 11, Traits);
-  Table.set_as(N3, 13, Traits);
-  EXPECT_EQ(3u, Table.size());
-  ASSERT_NE(Table.end(), Table.find_as(N1, Traits));
-  ASSERT_NE(Table.end(), Table.find_as(N2, Traits));
-  ASSERT_NE(Table.end(), Table.find_as(N3, Traits));
-
-  EXPECT_EQ(7u, Table.get(N1, Traits));
-  EXPECT_EQ(11u, Table.get(N2, Traits));
-  EXPECT_EQ(13u, Table.get(N3, Traits));
-}
-
-TEST(HashTableTest, Grow) {
-  // So that we are independent of the load factor, `capacity` items, which is
-  // guaranteed to trigger a grow.  Then verify that the size is the same, the
-  // capacity is larger, and all the original items are still in the table.
-
-  HashTableInternals<> Table;
-  IdentityHashTraits Traits;
-  uint32_t OldCapacity = Table.capacity();
-  for (uint32_t I = 0; I < OldCapacity; ++I) {
-    Table.set_as(OldCapacity + I * 2 + 1, I * 2 + 3, Traits);
-  }
-  EXPECT_EQ(OldCapacity, Table.size());
-  EXPECT_GT(Table.capacity(), OldCapacity);
-  for (uint32_t I = 0; I < OldCapacity; ++I) {
-    ASSERT_NE(Table.end(), Table.find_as(OldCapacity + I * 2 + 1, Traits));
-    EXPECT_EQ(I * 2 + 3, Table.get(OldCapacity + I * 2 + 1, Traits));
-  }
-}
-
-TEST(HashTableTest, Serialization) {
-  HashTableInternals<> Table;
-  IdentityHashTraits Traits;
-  uint32_t Cap = Table.capacity();
-  for (uint32_t I = 0; I < Cap; ++I) {
-    Table.set_as(Cap + I * 2 + 1, I * 2 + 3, Traits);
-  }
-
-  std::vector<uint8_t> Buffer(Table.calculateSerializedLength());
-  MutableBinaryByteStream Stream(Buffer, little);
-  BinaryStreamWriter Writer(Stream);
-  EXPECT_THAT_ERROR(Table.commit(Writer), Succeeded());
-  // We should have written precisely the number of bytes we calculated earlier.
-  EXPECT_EQ(Buffer.size(), Writer.getOffset());
-
-  HashTableInternals<> Table2;
-  BinaryStreamReader Reader(Stream);
-  EXPECT_THAT_ERROR(Table2.load(Reader), Succeeded());
-  // We should have read precisely the number of bytes we calculated earlier.
-  EXPECT_EQ(Buffer.size(), Reader.getOffset());
-
-  EXPECT_EQ(Table.size(), Table2.size());
-  EXPECT_EQ(Table.capacity(), Table2.capacity());
-  EXPECT_EQ(Table.Buckets, Table2.Buckets);
-  EXPECT_EQ(Table.Present, Table2.Present);
-  EXPECT_EQ(Table.Deleted, Table2.Deleted);
-}
-
-TEST(HashTableTest, NamedStreamMap) {
-  std::vector<StringRef> Streams = {"One",  "Two", "Three", "Four",
-                                    "Five", "Six", "Seven"};
-  StringMap<uint32_t> ExpectedIndices;
-  for (uint32_t I = 0; I < Streams.size(); ++I)
-    ExpectedIndices[Streams[I]] = I + 1;
-
-  // To verify the hash table actually works, we want to verify that insertion
-  // order doesn't matter.  So try inserting in every possible order of 7 items.
-  do {
-    NamedStreamMap NSM;
-    for (StringRef S : Streams)
-      NSM.set(S, ExpectedIndices[S]);
-
-    EXPECT_EQ(Streams.size(), NSM.size());
-
-    uint32_t N;
-    EXPECT_TRUE(NSM.get("One", N));
-    EXPECT_EQ(1U, N);
-
-    EXPECT_TRUE(NSM.get("Two", N));
-    EXPECT_EQ(2U, N);
-
-    EXPECT_TRUE(NSM.get("Three", N));
-    EXPECT_EQ(3U, N);
-
-    EXPECT_TRUE(NSM.get("Four", N));
-    EXPECT_EQ(4U, N);
-
-    EXPECT_TRUE(NSM.get("Five", N));
-    EXPECT_EQ(5U, N);
-
-    EXPECT_TRUE(NSM.get("Six", N));
-    EXPECT_EQ(6U, N);
-
-    EXPECT_TRUE(NSM.get("Seven", N));
-    EXPECT_EQ(7U, N);
-  } while (std::next_permutation(Streams.begin(), Streams.end()));
-}
-
-struct FooBar {
-  uint32_t X;
-  uint32_t Y;
-
-  bool operator==(const FooBar &RHS) const {
-    return X == RHS.X && Y == RHS.Y;
-  }
-};
-
-struct FooBarHashTraits {
-  std::vector<char> Buffer;
-
-  FooBarHashTraits() { Buffer.push_back(0); }
-
-  uint32_t hashLookupKey(StringRef S) const {
-    return llvm::pdb::hashStringV1(S);
-  }
-
-  StringRef storageKeyToLookupKey(uint32_t N) const {
-    if (N >= Buffer.size())
-      return StringRef();
-
-    return StringRef(Buffer.data() + N);
-  }
-
-  uint32_t lookupKeyToStorageKey(StringRef S) {
-    uint32_t N = Buffer.size();
-    Buffer.insert(Buffer.end(), S.begin(), S.end());
-    Buffer.push_back('\0');
-    return N;
-  }
-};
-
-TEST(HashTableTest, NonTrivialValueType) {
-  HashTableInternals<FooBar> Table;
-  FooBarHashTraits Traits;
-  uint32_t Cap = Table.capacity();
-  for (uint32_t I = 0; I < Cap; ++I) {
-    FooBar F;
-    F.X = I;
-    F.Y = I + 1;
-    Table.set_as(utostr(I), F, Traits);
-  }
-
-  std::vector<uint8_t> Buffer(Table.calculateSerializedLength());
-  MutableBinaryByteStream Stream(Buffer, little);
-  BinaryStreamWriter Writer(Stream);
-  EXPECT_THAT_ERROR(Table.commit(Writer), Succeeded());
-  // We should have written precisely the number of bytes we calculated earlier.
-  EXPECT_EQ(Buffer.size(), Writer.getOffset());
-
-  HashTableInternals<FooBar> Table2;
-  BinaryStreamReader Reader(Stream);
-  EXPECT_THAT_ERROR(Table2.load(Reader), Succeeded());
-  // We should have read precisely the number of bytes we calculated earlier.
-  EXPECT_EQ(Buffer.size(), Reader.getOffset());
-
-  EXPECT_EQ(Table.size(), Table2.size());
-  EXPECT_EQ(Table.capacity(), Table2.capacity());
-  EXPECT_EQ(Table.Buckets, Table2.Buckets);
-  EXPECT_EQ(Table.Present, Table2.Present);
-  EXPECT_EQ(Table.Deleted, Table2.Deleted);
-}
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/PDB/Inputs/SimpleTest.cpp b/gnu/llvm/llvm/unittests/DebugInfo/PDB/Inputs/SimpleTest.cpp
deleted file mode 100644
index 5cd4030802c..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/PDB/Inputs/SimpleTest.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-// Compile with "cl /c /Zi SimpleTest.cpp"
-// Link with "link SimpleTest.obj /debug /nodefaultlib /entry:main"
-
-int main() { return 0; }
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/PDB/Inputs/SimpleTest.pdb b/gnu/llvm/llvm/unittests/DebugInfo/PDB/Inputs/SimpleTest.pdb
deleted file mode 100644
index 30d00850488e474be05a79470dd3cd74c57a08c8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 94208
zcmeI*U2ogg83*u(lHZdkmfO09Q8Yy14PIK&qGY(P*A=$qI#FlUt}P^iK{SylCZ;V>
znnXEXFt{C1>}D?*hN8XcMKAURcF|q*YL`PWU<GzJ^a~6r5Xc#JQLN3LhZG&h@le=S
zGDrKL=$Pao&msA<9N@h0Fk_q5a;<#bRa0ZBmtR&hEA#5BT0DNHZ+LEnIP?>Rc=0^P
zpUF0dL4Sdt5P$##AOHafKmY;|fB*y_009U*B?5o?_k9EiKmY;|fB*y_009U<00Izz
z00i1xU^4uEo8KXB4+0Q?00bZa0SG_<0uX=z1Rwx`Q@3?xQpPIqIDaqlLR31uWte~Z
z+xwSYqzp(}gnIg2S&<-RAV2^D5P$##AOHafKmY;|fB*y_aN-1xTK^v)#hV5|;W~dQ
zXFGInr||}LdTFUCqgFMIVsWz+t5nPDmg#yMM%}Sp*Q&WSW6sLgZ={{;Wn*b>)<`>*
zx?7{w2l<zl7cVT&Y$uFNI<>sGvaK75xc-{K$@6c@)}@q@EtiWmBeTM*`nZ<h&ty^`
zH}bY)TrAhzt%-3%qFL0eEsN(Y@ULyfE>((FmM=mxD-~+I_28UGxn^V2)W_pmrI4qc
zMxWxJBW9|xRa=c^vT7{N7)QUEne0MlK4sXBS*#bV<Cb=CF_+WH)O><X^*H|`yc6-N
z7T5I2<U~S?8+Ehl?mP8&=Apo%ww9|}g~MjAmkyibrtKX5D)}35q<kAC<580fPW`g&
zBop3ue{~@}8`HOSEy>@D2z3m~92%Ycx6;Ki!r!@WUaGO|k{Y{0!xSFuB>77UaSU_p
z;Ml`)r*Y!`!@vbW00Izz00bZa0SG_<0#B{LhnlW@JoVAL3g1EWn{)47+73;Bb}w^h
z^eb~XxGC8uac}tYo#g(cy}Pjv0SG_<0uX=z1Rwwb2tWV=5P-l55|DBJZ<7+0OFCk|
zy|JfHy_{bsnxfaE$~B@d=ouQKPaN7^W_I5;FuME$b+O{wCHt1`+)z{HQpGM>RT`j?
z=+&#6=GC0*R_%P9hYN7u{YZ4pDpsuO-c;^O<@B6e^p-WZK<BC7yN{t}%Y^^*g8%*k
z>0RZIv}1U~6<(wP**qxBN+BUGwTl*_z0wQI+bYLqehSK!(>%*j0z1C{PhJjjl)m16
z<?A~y{CxC>fBbvTuWon#YkvJX@0i`=`49vMKmY;|fB*y_009U<00Izzz!MXY`ah55
z_v+2()dkzxu&U~LB8}_t-MsIM-7ASS>+%oR;TO_x|5y%*C_jpld9!fTMg)>U`o|h8
zzklF=k?+MD`Y(g?ThO#2#h9f6kJ@(11?zgQUUZ9gUX2yxQ3f?;Id1i*Q(oJGcnr`h
zY}(2Hf_4Li$9Ydg6*}!DJkN~@D$zB~wYFsbgkgF$8l>?iw^Mj~MoQdzBKbm+FHZDV
zZd{n=k5(<@+?=0pjvFE*jk8gRf<68|Nt@<RijU!amY<90MLypzoB1SvkZ<JHty_is
z4ey*`IVWfC@ynRis#dXV@&*C~AOHafKmY;|fB*y_009U*bpld9RXM)SQRV@Zx&LI@
z#ZmT2U$?XoAV2^D5P$##AOHafKmY;|fB*y_@bn5u-!1|KAOHafKmY;|fB*y_009U<
z00QkT5R5;UvFF|c?($Z@eI5R)j8kupH<$6}G7jB4#+&V**PCIQM~eqz#JzR}PT+y%
zG7$ZtFikZ3Py#j}009U<00Izz00bZa0SG_<0uXqt0y5rzxOc1}_4OXEtMfE<{Ooya
zg4&v5PznSf009U<00Izz00bZa0SG_<0>=~>pa{<`7tB%TPhU4c-}B}J{0pZm{&e|X
z+kmtSpl#ro;BA(@zd3G1;h7`a?ACBQ5P$##AOHafKmY;|fB*#AN<ihxzYO=6dcDl|
zw|BXJYyj&2ZS|{f$<3ht-x5X?0s#m>00Izz00bZa0SG|gu?t8Y|7NeQNZr1RhJMpc
zpE&X?zzdx4TV7^4Uf~!7dE~#qQK7;wf;7o1-N5p$0F{=m@q&JR?(@5{BsxVSasY>m
z9Gk1&w)|+pi}}j=^;Q+*UsiC9eY~mi+y}w7zxOna%Ycakf*iN^9g4BfwMLNlpt5A&
ze{%~?A@5?C=1))#Z+cTI$UFP4di&y!?E5|Md-i~R9o*7$#w$pA>;3+EnfIaBOAGC$
z$s7-UT6i}tcs@kVALNx~h$OS({gizz_<fp{3emTBzr8CZ%Xg*~h05C-#niji=2EWT
z4}IP}`Rj5*1PDL?0uX=z1Rwwb2tWV=?I#e_v(nzJwW#(M3@DH?gNkghY(GNW5d<Ir
z0SG_<0uX=z1Rwwb2teS(3!J*GE7Hd-9nm3<L%bT{-cYH+-@h+C`aCb-p2&xIp^FrG
zQve^^)9?C8erI;DjwJ*j009U<00Izz00bZa0SG_<0w+e`Lrqscp8Dur85bS>=G=Ri
zwnNjO-OJn={mLAEiPOdwY-c0wTrbm@lPg&@8mm>!u{A4Ku&ViD+1&6({de(^QbO>e
zKbbzTm!ph&Kf_Ui%q}3|%XgB&AZ$MYKOq1C2tWV=5P$##AOHafKmY;|c+3KO`~Um6
zbAOGy{Lk*|{~zURkSOB-;?3(BAVsDEAcgaIZw<J&(|ChAy|g1fML??$@-HnfURa*l
zP8gYVYI$*GTQ?GM{WXJ==iijAODQ8;E*EP?W`$SvaV^20$)rAR<ZZ{eSgyHS6XS+N
zv#42H77aGbUa?D+qLsC3t|rf!H{N=1PHxyRip9-RtWqtnTc+!67<I>XT|T^K%vt&R
z4QUE7mgZ)Sv{R{b;-;yO$2EDne5cW;`1c<()!3@7#xhwomS&8j-^@&QAv2#cY{x9t
z3)XQ<JGhw3>11j?!KQkgZ^}CnuWE5kpG;09w75|>tM0y2e`g*FENW}Hs#Q2__Il~C
zId0m{;jfav0Y}QWQ8FGix!}|<+fFiJ$oFV<Aw3(@w{<Pa--`%!49ep#o&2}b#WBL)
zxo%#nvFwr>yTYwz;lWPtFG)t=ggJI_?BTf6X#Tlj0Rad=00Izz00bZa0SG|g*a9Dn
zgy|pKTsz^~1_A^i009U<00Izz00bZa0SG_<0_`dA(hSe@9}3gjPeN4w8;|#YB}_Aa
zCQ5#w(An=R^t-Q#{;<gRj`o4}`~u*vAOHafKmY;|fB*y_009U<;QvBEs`WCqf0N@9
z#{nMy|EWLiAE`VnV1c9Tm$1dr<!ARNIjzL&k~hv#o(qsC{$)GDQ6>gF#ZjL8Kh05Q
z0gxF2x;dWZ_zXvRKOF)DAOHafKmY;|fB*y_009U<00K`&;JGJr8k_|J5P$##AOHaf
SKmY;|fB*y_0D=FZz<&Tlz5>z!

diff --git a/gnu/llvm/llvm/unittests/DebugInfo/PDB/Inputs/empty.pdb b/gnu/llvm/llvm/unittests/DebugInfo/PDB/Inputs/empty.pdb
deleted file mode 100644
index ae65c3a885cee86ab66e1e28ecfe2100eb617edf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 102400
zcmeI5e{3Abb;sZC9e-HV4~n*AM^>D*B0G{Lo{q9CD~uf<MM?>6(q=76R-J?B<=v1x
zXK(kgw?~Nv>avC7CTUQ>ZGtof0=W5s7H$7<e*s0DwocIglh$oo6i)h&8#^`X1Oc3r
z0~B>ryWh7vdtBYEq?25umiz`B&dr;dH?yC8H+%DAcc&{Q->Z8Ifi=Ewe9s<h`q)wH
z&RjmfVcoWgV+1!yWFmMU{HHk%cS97&e<2_Qgn$qb0zyCt2mv7=1cZPP5CTHr3L)^^
z&)*U!1cZPP5CTF#2nYcoAOwVf5D)@FKnPsr1P*2B&8z$n<?w`n5D)@FKnMr{As_^V
zfDjM@LO=+-=LrmaXT&(fdlj(HKlBI~N;V8L_#egF!(K9mShkV+2Lt}V4m$3o%#gVy
zLk8J3+YhSB4T$3=)hq6zqv-XsO^#=1!B>jH&slO+Bk*m9qO=~G_ktyAE>qu@9_lw)
zzX{!QbIYYUI|%&Bd?Qfx(a~VZS9TeC$6{eZHm4|e&)7o;TAAilq4l{{pwOnYP@v{K
z^=u(p<=Y+-t}SDtrj|0U@OXE1tiusyaZKx;fCozhHDwUrM%N57bx!MnA21E-MaZr*
z4MLqZM7={?t`Bhz`w<?-xfsNeu-;ayfMwGb6SX8{YX{KWz~=^OM9a3*P{b^<G-R#|
zWh_VAx;Yb<z#^w@hRC&p%5uv_3@Uk5Z4)L{ZP#8@WyIMoGTJWIqg@?mMlHka=6qFB
z(B`*}4ySCTrdoCpelDCRZ<<}W-Py%?G=@OVla^8&z9(!W8*zMWBO75OY>*oe&m)X&
zfzvm^511wmB4iia6X)&BXV8$&*O`XGt+dFVHY3jVbgd4rLwHKt73<eTo11V(wjh3<
z10=R9&L5Sa(9ZIRWy!HuyhborRyF08xw~jG=U&*{)-XSpfjxJ9mM@)i!v4^FKkTp2
ze>skKI<&W_|FWIa_DY@mFF#>_H=vCj_Gd3H`fAY*?0H9B*!og)rdUJs(e7+7RbNOX
zH6^7cZFk#nT*<!aeTc{Q!f7|cbKkTbA-m2r2z6TAH@zQmwxyd8#(fj(U9%yRK7e>?
zQ}MlL8{+)24KWk$o2*dA^3=X5T^)DTsVV79lIQ#aeNNqL_@#@S^XMzmmNTW+=C)S9
zSg$EqVsu@tS02N4^D)?<sr$eW;`lpkFtwJ^QLh$Ms?ZSkf@^Wz6L!(AE^RTj1&MFx
z#cR^Gcngj%X^T4$kL``qZiQ!C{18HRooNv2wAdDRA<nkA8{y-+KV!YIE%J49C*o^-
z2z{JMw?USEV3B>Yj@UlgURg)BrDd((>!-3RdA=RsTr$r-*zumQESD!*-{l#-RGtrO
zn=+{E#J{&pQfHLD&St2t{N+k1j%TUi!um>;g-W6?JaY0#EB~=051yDD=lB9_vRB*W
zFpj0eCaYe#aj_n;El=9_;#7BiVVkCqRGTbCySBM~Xur0(!5Yqof#c)r@d(RTx&JbT
zHbI_4e1F38Z`C|J%lLDg7R%!_mdAF=b>-m)%uRGVLU!>rob`9+Gw2STuQLsWTWQfX
z`~c!?>j!msC&GCn`fbSiW1Ht|_#wpGAcfa%&X=@nZa;pv+f~>v+d0Sk30Kd0#dE<b
zmaV5oqf(CYFoQvIN^v}o_;vV==LWvVwiuVWftHk0tK)aRyU5pDmUG$d2|1TiXM(V8
zT(^}-W6O?p?F{7$6^uMudUl1fSVN?r+p?FIDrNixiR)z9F!_pGQVL-Hx-DE^o=S~+
zfS;!c*#XWQUI6AoFl?vS;(PsJ<d5B<i+(G*x6`v`G}c0oH0G`xujA*jzDB5VZ``r#
z^)(s3<KquZPXe01V3$;sfVT5BrI%D&LL~1eHLa@i%8zn~c?Ve*EP3UG%u19`CbI6r
zIcaOkIBgYeirSg1CaRl^wY0VBbXrDz%<<-JCs~<37Ru_h3H<y@w2}H%f{4~LxOUt#
zwhvndon)E3KGwEGZaWp!<iyl;*r7#5BAw<ct>SEW?n>2bB=~1nxermZ7<81?LR5nF
zupH;+xQnk%QV+|sq>i|aY9!Xj$8wyP3AIph)vUePUIypqSl~BGL6i`UuTci)Xv!<u
zPJ8~#9sdte-_`-xHIG|g!awdGS$4gaeH-#vcC(g!0t1*>wpYuZ!9+tW8`ZMyiF}8(
z%t`3GSIZvJvK;kn#YZZS7VCbg=s3&OBIXBz;)I%SEKa%$UU6pPaB<SDHG(?Yd9Tht
zK3bgdy+xdO>nJ*iy0z=fp@X}N)2&A$oT$_rwqqR&8s&;-jqK0mizmj5hbQkZmYiI4
z%^cFYRJ9hY<Vv*~^dG#G_7s;(Bm48YT6vz{(B+07u2{p<v)1tBj>~M~<o)AQ$0v^L
zcpEClW~Zi)ju*So^iahud#CHxeU+eIJd_(LR@{=)D63+9$@W$GLXFTx!E7C6x3Vp<
zO`+f1%D=HYH8!eUXzMI?y5jl)O3uz$!zYP<S8weJXG(aMgl9r{c7sQ!XPazC;)H+@
z5CTF#2nYcoAOwVf5D)@aBZ1H7MvRyHUYQNYUU!@rd-Cb8On%1u(x=~eW#3QZ<K;B=
zNjLV?{&rC^Sw0H^As_^VfDjM@LO=)z0U;m+gn$qb0`DRMSbnF2WNhXpb+vw8j8?k6
z`A2D#?%Hfv*mF*NE5I+UP%B(pLf`e^ZtH<)&mng6SmR!`hNX6&Zll4l&c8uPcI)7I
zk5WIpft6VNVa~y*+7*{>YVBBt@Lcz+T(gNCEWI?fc_XjjBA$nj%13&+2<zU-AK-e3
zRyp2_kn8J1_%nq3UV{_xgT~We|H};@eg3z8zWblP{OYa${j+aI?c)0+rr^a10U;m+
zgn$qb0zyCt2mv7=1cZPPxY7vl_<u-`|8KLVD()whZ{3FbnlQG<xHud)N5`}t0gv&|
z9otV$-hUsb{{h{-nM$Y2-Ay8dH=JGO-ge%8@1ULG27KN&e<{-zoFB)#7jq9iJP#1h
zGvFSpgPRT9b;km}zttjoBp2Rc#P?s_xjB~cu^JSn?5w(+c5t)F<uK{+C%A8+fWMqy
z#?2>DxpC~0U>S;$NpVV)#<BwbI1kcPR0{XUqCQubn~2gvjXTSHKSNY!hU-LOK7R<F
z%jv>fQI=(^kRibN%gxv8QJE~4nTh5y3b=(W=PSo6aV~K}KnMr{As_^VfDjM@LO=)z
z0U>a;6W}qh1%DSjuW$3S|2V|jcsM@hb#fk0iW34tKnMr{As_^VfDjM@LO=)z0U;m+
zu3Q4V|6QCA5CTF#2nYcoAOwVf5D)@FKnMr{A#imQXzg*wp7(GwJl{~?w%~8^UU<Ey
zo%gthH`sHY@TvO<wJTsNdb|%kQ~^PngZR04?|C@?fIaEh0MDD$&v6BQ&5Af7AOwVf
z5D)@FKnMr{As_^VfDjM@Lf~x^;QjvFuG!b*;s1J!!9R=;x17_o4iUU<XT5C=?K2W@
zU!iEYGy-^XfH)x_1cZPP5CTF#2nYcoAOwVf5V(Q~?4XU|bNKlXGIY<}T&>}&lI=K!
z!tFC-C&ySmggm@F&vOI@&4th8AEH~ra%VzWD8lmnhRqqhcOXM+s*vSf=B#(1Jv?jj
z-gG=Suu~uUpx#Gf;7JniO&W64LO=)z0U;m+gn$qb0zyCt2!VGefxQ^mhwt1&^Y~eS
zJc^CO_Pqg|#{L!^BDg}G^$xUK#{Ude#{chtX^Bc9AOwVf5D)@FKnMr{As_^V!2baO
z9^;?BX2jspE1voPxjww(kLLq^0{=(wOYjBw*zqm@(Y*mvtpP88;AP)+@D|NHf`ASL
zU;G}2xT}D^8-1XY2s!U}@A#3H&?UXR&zpbrlJj##aYLi_(Ias@YQ#p$^5%vV$N7@)
zL>&G`u4(9f4{5qM|M@t?Rq(qN3iwO5fz$Xse;*Ii@*QcPL)vvIY5Z;mcD&_cmGaN=
z=h*Sv4L5|9@Jf8N7SHc6ye5>HEg3)0VIY)cS~Aub<;%8YY!m(ZAYy$Snju{y{LgiF
zyo@n?XJN%%@QQf%VzJ`Z8bQ6Ns<mJxSE|+M&DY+1jjJC?Ej+<5Je=ghGZTl4lgYyT
zCP!{h*mfOqgCe&sZ1`Jm4IpIA;)H+@5CTF#2nYcoAOwVf5D)_Ic>=s%%VXK3dlC_O
z?_ZLLd=>&iKnMr{As_^VfDjM@LO=)z0U>Z@6NuMe|C$e@yT#j@ugYqn;;OP$+Ox;9
zgTSxMHv(0+c9pzpt>P%(s<?sjUEA5+t<tp>;hnR2Yp0s8S$89-)GUr4u=ZG|LILC~
zh$8hUatNt+Thyn|1g{7mhd-g?9PpF|FKdev0zyCt2mv7=1cZPP5CTF#2nYco@SY@4
zAT{HAHRT5@$Lsc@qSwzh%`F+quJWF8b!1t&L6op2CqvC*yzbb6>L`P>X|LRHbV^GX
znQGE;)S~S~MdCUrtH$apZfVK)T(41Y)A!ad-$QE5U74Jiic*@NrM@jUVJCWkv-J_|
zU6`9&F3qh?L5z+rDF;V$j;O&0HWp7)jE;u!IYqg9#vVGLBZYG_6*|-u+G;8k=yB@V
z0!n&UJQ@_bwtQW*h#PYJGU{JP=HT7Df8z<>!(j~Z#76^u8(lNV`!_i4qwoW!LH8hJ
zH%ghILA3fV#A6PdalQ+2yv2!{8z5(WM9a3*P~q`rXviGXx;Q0!8E4>fkM}Uz&UQnj
z4tt)XY?ng&GDuBgzG+eUQQRbT)bZ>fw&e_|39m8lC_3BxP1sLX+s`<Tqnop}JThlH
zL9kLw8WBfh8;U*`Qu1|WN1wfHJ4&fBgqtGoswHQeY*R<TC23O=h{ra?X-DDNrap#{
z-AA=eaXyWu$u{+I#8X;AY*(B&%1!uA_dqgaPHKIe(w$wUY3DCfioDC?=eorS0U;m+
zgn$qb0zyCt2!X4Wz`%D#48A9wZ(P3*{`<Jmd=qY(=Ed^2-iq!p-;04Id%g$!01q<Z
zdNJPQa3l2(@>o1{D1WaWqZwq^Y(J=C`ha-MW>UT4E@B9#=NB@x;42l4*RtfQM&R2H
z#%G+jhvvOtiJHq8tM%xynhD(<W3^z(S9TeCTZ7io(Uz<=IEypQsX{BURUl<p-<<Dm
zJl3f!9D8+&)9T=HRu;#U9A{+^kH=Y@)&tMutX_odI@2K3X+zXI#AmAyaSr<t@_3oY
z`mDFrDqz{P#l#FjLe`=Yjrlo$JmzN>S&Yrrg))|>j?G%?*HrO1tW%uEBG($%yLM1n
zZrO-I*iWKu!lbJ0Vj8E6INL==+r@gctHUl7&sxplJr)Yu{8p1-9G!#q^W;ryr`w%f
zoJV759Op?(sSV!~wvmlEKDLpK_`dN((+0%z2xD8|^iA*srWrkZ5oz&U5a;d8XV4Jj
z>^jpRY^6o^v>9=>r)zb19l}%Eu2_FO-rs~XvIX(;9AG%+=lt=QpXUJbh-JyKSG-0r
zS5`IUmbtrVGUr~{+}1EZm*Kvr+p~P>oD=qk=KEoPh5pNNywjn*Mg5oUoVHi$+<*BA
z`?~>c>}Z+2xaec5Gq5q|bYbgD&6#2i%}2Yly;OZ6k<^rwnzY^VvqF-6)B6yQ?S<2B
zgy+6#J3@AyX%OnPxNmwt;%rMdA&mPb*1KjyCVc?$)TZKl&o;yPV;f>7+&5XFjOD3)
zQ@T3to>EiNnIzBo1^S%2*YHahIp@(=q%CJkt<7z%ez9Itutc^)1J}{VaNT?iHfZWT
z@Pj!14jW9ZWpvc51(hl^#8=0)cp<e!TD!Wm#Z-NXZ|B7cXj{Am$CtFl9f-&F#%Z_0
zvn_rIA-m2r2z6R)i@OkKTilKCaowM>-q;rTy15haH9pkj>*j5cr5{*ipR6OcPqtUq
zk!@*-uCICI=%=zOc|Mj<DEw~s!H)NYWw|^*HL1HZdZ|1g);48O*@=H|VZQtf&yBNv
zWvH(F<w_}zXQ|=B`bw3BN}?}3a`H$k|FI(vo|qix_yTOQSKH(;j-}%Ws^QAeg?q%d
zJZbiKs=L0hO;bp!O_riv+uT01U)$VZ4d=ta@$vO|gypN;e;GrYAkQJbKjHbea2}pz
z{5ejG<#8IzV>{)#^6&%ZCb}IVyZ9Q;`aAO(bcfE@nTEoxwCEas0CBeUgF3tu;k*(3
zHe~&=&GR+<5aMl+!fQ9@OWHNJAHUn}D(si-oa6n3t7pC9xnLE`)>ETVDMxvj!5}%M
zIG#uRI{e0S1K(p?jLY0Wy!uwhwqkdYueU7cvfC4KE~U-{VcWQFE0M;Q9qZZ|$``OH
zd94k*LRqXK($8(#OG}k9euBhxvTT@q#VsiXFn`?^t}joeMm@mK(}e5*=M66ab0HYE
z(`)g){xI^#?$AZQ72VtES+lhshBeaT;qq;CjZov>xMSD#a%%MZMU6i&&C6u|f?Yay
z-L^McKT9M;eL+8|X;qz9exy3=9|l<#EP3UG%u19`CUU)nbJEt7aoQ@y?Mzk^)s1yz
zeGEyBIxV9<=6LhAlT5;SV4YY`j?yOZ^DEIt>Q@OOI`3e(ZWtc-jP1jgK_^)zuaC7Y
zF|4PcuqZv9Sn7^+nya*m6>HC3skWB0Ie&JQ`w%sY0SGqFN0r2K^uNbld~G6Wq=)lo
zvHtEhs*zY9AIouGCc+K)v-V<p8JwSEf!`?UMf;Emm%%xj^6*~2_WYmEjTkTYy)w(g
z`hh!6j6M1ES0+E>ed*J0yt417J0ROPRdGMbPhg{cY}0kxSNBW%mN4vA{=DOrJ{k5b
zcyb_)j(e)e@v8x^f#)X+Y=}hRTLt*z*i-urzRt+_U&jBcUMNsAG5(VAe|RSisNnl9
z<A2?CAdvBYS9^_8N3`KDiqw?z|NfQne|%S4^j(zke{_!@_t!H1=jr9P=?gu6k@0`D
zH&e#{GXCdrvW)*_{2xy`BuDu?_LcE}G%xV~IsQ+s|MNQH_f4LoJ9qv6F8uyx&+Gpa
z@a%@DZ|eZ^^QiwN{NwpimR+x9--bMv-K=GwfbLkfSIeHsuE|EVY<nW#VJ&kK`tH@T
zN3<+QJ^WgN&c_#|Jw6`oyjSNRA1&hEheb^MSVu8Ii02oaIdpJ$ak^6Sy}Gv$SSKp=
zhV59#f=0RGStI*%`QnN3;^E2rizO!)&6y8rU2D%TINLmUDeWmPmqzyIbNo2_H*~q-
zhbz|b^sF^Jx#KdMIC=m0)bWWUJKlzhvDvBVqvORcG(A*t%iig_bzcQf_CJ&x!9)H_
zPNS@f^(7mRinvfCbWxm>b(Gy2&OzbaV%~Hsud#J%Y*f3@)>-Uy#q|S}oSm_TPZF=I
zZS4tnO7JcT-U-3G8+dj4Y?JLsoDdKKLO=)z0U;m+gn$qb0z%+wB=E$}4E^YFlfH^q
z@_EA<`mcMipYCrnbnAbb^!Go=(5nb1e#4~ce=+H2|7_4}Z)WH}dNTAE&tjbRLWcfq
zgGnzQHtFA=HR$AbiGKL6MAx6n(96j4=7dSF-eu66KPLL!nGF5P@0;}Fnn_Rp1MVxo
z&7^OAEkj3dAo`wf(3c)C>Fb+K`tnT}1+EzMiI*}obA;%3elJ6x`kF~U{U3wAa8rhU
z@YM|6e1}Q@_$`CJVP@!qucD2gHK_J$8T#hm5xwwNM7RI8Nl*Q$Nx%4%LAM_!`r`9w
z`>H|JU&o90zHHK&8#A=sGU+iq^l<nO@f?BcGxW?8Cf#@+bPt<!@OjjWmmj|I1%pog
zG469dO7w39>@C3vQJfGE0zyCt2mv7=1cZPP5CTF#2nc~Ik-*S)+>Z&r9{zgxo8c$n
ze*ylXj~F!eut|S@i$O2Gn4xE1H>s&I^!f`X&HhBj!&l<@mNp9kAs_^VfDjM@LO=)z
z0U;m+gur`~0N<&<3w{}%pLz2`?7a^k9*_85d@jN-;WN9Z;VpQ62H<N5`;o?<`JMp2
zH{e=$ekdU8+z5Xi`~W;Z0bo5mKMjDNnZi#C;H7kaVIQibaPvMwaY8@{2mv7=1cZPP
z5CTF#2nYcoAOwWKJ44|5cSfyf6#_y)2nYcoAOwVf5D)@FKnMr{As__aMFjpAzX7UC

diff --git a/gnu/llvm/llvm/unittests/DebugInfo/PDB/NativeSessionTest.cpp b/gnu/llvm/llvm/unittests/DebugInfo/PDB/NativeSessionTest.cpp
deleted file mode 100644
index 002dd6579a4..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/PDB/NativeSessionTest.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-//===- llvm/unittest/DebugInfo/PDB/NativeSessionTest.cpp ------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/DebugInfo/PDB/Native/NativeSession.h"
-#include "llvm/DebugInfo/PDB/IPDBSession.h"
-#include "llvm/DebugInfo/PDB/PDB.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolFunc.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolPublicSymbol.h"
-#include "llvm/Support/Path.h"
-
-#include "llvm/Testing/Support/Error.h"
-
-#include "gtest/gtest.h"
-
-#include <vector>
-
-using namespace llvm;
-using namespace llvm::pdb;
-
-extern const char *TestMainArgv0;
-
-static std::string getExePath() {
-  SmallString<128> InputsDir = unittest::getInputFileDirectory(TestMainArgv0);
-  llvm::sys::path::append(InputsDir, "SimpleTest.exe");
-  return std::string(InputsDir);
-}
-
-TEST(NativeSessionTest, TestCreateFromExe) {
-  std::unique_ptr<IPDBSession> S;
-  std::string ExePath = getExePath();
-  Expected<std::string> PdbPath = NativeSession::searchForPdb({ExePath});
-  ASSERT_TRUE((bool)PdbPath);
-
-  Error E = NativeSession::createFromPdbPath(PdbPath.get(), S);
-  ASSERT_THAT_ERROR(std::move(E), Succeeded());
-}
-
-TEST(NativeSessionTest, TestSetLoadAddress) {
-  std::unique_ptr<IPDBSession> S;
-  Error E = pdb::loadDataForEXE(PDB_ReaderType::Native, getExePath(), S);
-  ASSERT_THAT_ERROR(std::move(E), Succeeded());
-
-  S->setLoadAddress(123);
-  EXPECT_EQ(S->getLoadAddress(), 123U);
-}
-
-TEST(NativeSessionTest, TestAddressForVA) {
-  std::unique_ptr<IPDBSession> S;
-  Error E = pdb::loadDataForEXE(PDB_ReaderType::Native, getExePath(), S);
-  ASSERT_THAT_ERROR(std::move(E), Succeeded());
-
-  uint64_t LoadAddr = S->getLoadAddress();
-  uint32_t Section;
-  uint32_t Offset;
-  ASSERT_TRUE(S->addressForVA(LoadAddr + 5000, Section, Offset));
-  EXPECT_EQ(1U, Section);
-  EXPECT_EQ(904U, Offset);
-
-  ASSERT_TRUE(S->addressForVA(-1, Section, Offset));
-  EXPECT_EQ(0U, Section);
-  EXPECT_EQ(0U, Offset);
-
-  ASSERT_TRUE(S->addressForVA(4, Section, Offset));
-  EXPECT_EQ(0U, Section);
-  EXPECT_EQ(4U, Offset);
-
-  ASSERT_TRUE(S->addressForVA(LoadAddr + 100000, Section, Offset));
-  EXPECT_EQ(3U, Section);
-  EXPECT_EQ(83616U, Offset);
-}
-
-TEST(NativeSessionTest, TestAddressForRVA) {
-  std::unique_ptr<IPDBSession> S;
-  Error E = pdb::loadDataForEXE(PDB_ReaderType::Native, getExePath(), S);
-  ASSERT_THAT_ERROR(std::move(E), Succeeded());
-
-  uint32_t Section;
-  uint32_t Offset;
-  ASSERT_TRUE(S->addressForVA(5000, Section, Offset));
-  EXPECT_EQ(1U, Section);
-  EXPECT_EQ(904U, Offset);
-
-  ASSERT_TRUE(S->addressForVA(-1, Section, Offset));
-  EXPECT_EQ(0U, Section);
-  EXPECT_EQ(0U, Offset);
-
-  ASSERT_TRUE(S->addressForVA(4, Section, Offset));
-  EXPECT_EQ(0U, Section);
-  EXPECT_EQ(4U, Offset);
-
-  ASSERT_TRUE(S->addressForVA(100000, Section, Offset));
-  EXPECT_EQ(3U, Section);
-  EXPECT_EQ(83616U, Offset);
-}
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/PDB/NativeSymbolReuseTest.cpp b/gnu/llvm/llvm/unittests/DebugInfo/PDB/NativeSymbolReuseTest.cpp
deleted file mode 100644
index 91c7db4fc39..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/PDB/NativeSymbolReuseTest.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-//===- NativeSymbolReuseTest.cpp ------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/DebugInfo/PDB/PDB.h"
-
-#include "llvm/DebugInfo/PDB/IPDBSession.h"
-#include "llvm/DebugInfo/PDB/Native/NativeSession.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolCompiland.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolExe.h"
-#include "llvm/Support/Path.h"
-
-#include "llvm/Testing/Support/Error.h"
-#include "llvm/Testing/Support/SupportHelpers.h"
-
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::pdb;
-
-extern const char *TestMainArgv0;
-
-TEST(NativeSymbolReuseTest, GlobalSymbolReuse) {
-  SmallString<128> InputsDir = unittest::getInputFileDirectory(TestMainArgv0);
-  llvm::sys::path::append(InputsDir, "empty.pdb");
-
-  std::unique_ptr<IPDBSession> S;
-  Error E = pdb::loadDataForPDB(PDB_ReaderType::Native, InputsDir, S);
-
-  ASSERT_THAT_ERROR(std::move(E), Succeeded());
-
-  SymIndexId GlobalId;
-  {
-    auto GS1 = S->getGlobalScope();
-    auto GS2 = S->getGlobalScope();
-
-    GlobalId = GS1->getSymIndexId();
-    SymIndexId Id2 = GS1->getSymIndexId();
-    EXPECT_EQ(GlobalId, Id2);
-  }
-
-  {
-    auto GS3 = S->getGlobalScope();
-
-    SymIndexId Id3 = GS3->getSymIndexId();
-    EXPECT_EQ(GlobalId, Id3);
-  }
-}
-
-TEST(NativeSymbolReuseTest, CompilandSymbolReuse) {
-  SmallString<128> InputsDir = unittest::getInputFileDirectory(TestMainArgv0);
-  llvm::sys::path::append(InputsDir, "empty.pdb");
-
-  std::unique_ptr<IPDBSession> S;
-  Error E = pdb::loadDataForPDB(PDB_ReaderType::Native, InputsDir, S);
-
-  ASSERT_THAT_ERROR(std::move(E), Succeeded());
-
-  auto GS = S->getGlobalScope();
-
-  std::vector<SymIndexId> CompilandIds;
-  {
-    auto Compilands = GS->findAllChildren<PDBSymbolCompiland>();
-    ASSERT_NE(nullptr, Compilands);
-    ASSERT_EQ(2U, Compilands->getChildCount());
-    std::vector<SymIndexId> Ids2;
-
-    // First try resetting the enumerator, then try destroying the enumerator
-    // and constructing another one.
-    while (auto Compiland = Compilands->getNext())
-      CompilandIds.push_back(Compiland->getSymIndexId());
-    Compilands->reset();
-    while (auto Compiland = Compilands->getNext())
-      Ids2.push_back(Compiland->getSymIndexId());
-
-    EXPECT_EQ(CompilandIds, Ids2);
-  }
-
-  {
-    auto Compilands = GS->findAllChildren<PDBSymbolCompiland>();
-    ASSERT_NE(nullptr, Compilands);
-    ASSERT_EQ(2U, Compilands->getChildCount());
-
-    std::vector<SymIndexId> Ids3;
-    while (auto Compiland = Compilands->getNext())
-      Ids3.push_back(Compiland->getSymIndexId());
-
-    EXPECT_EQ(CompilandIds, Ids3);
-  }
-}
-
-TEST(NativeSymbolReuseTest, CompilandSymbolReuseBackwards) {
-  SmallString<128> InputsDir = unittest::getInputFileDirectory(TestMainArgv0);
-  llvm::sys::path::append(InputsDir, "empty.pdb");
-
-  std::unique_ptr<IPDBSession> S;
-  Error E = pdb::loadDataForPDB(PDB_ReaderType::Native, InputsDir, S);
-
-  ASSERT_THAT_ERROR(std::move(E), Succeeded());
-
-  auto GS = S->getGlobalScope();
-
-  // This time do the first iteration backwards, and make sure that when you
-  // then iterate them forwards, the IDs come out in reverse.
-  std::vector<SymIndexId> CompilandIds;
-  {
-    auto Compilands = GS->findAllChildren<PDBSymbolCompiland>();
-    ASSERT_NE(nullptr, Compilands);
-    ASSERT_EQ(2U, Compilands->getChildCount());
-
-    std::vector<SymIndexId> Ids2;
-
-    for (int I = Compilands->getChildCount() - 1; I >= 0; --I) {
-      auto Compiland = Compilands->getChildAtIndex(I);
-      CompilandIds.push_back(Compiland->getSymIndexId());
-    }
-
-    while (auto Compiland = Compilands->getNext())
-      Ids2.push_back(Compiland->getSymIndexId());
-
-    auto ReversedIter = llvm::reverse(Ids2);
-    std::vector<SymIndexId> Reversed{ReversedIter.begin(), ReversedIter.end()};
-    EXPECT_EQ(CompilandIds, Reversed);
-  }
-}
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/PDB/PDBApiTest.cpp b/gnu/llvm/llvm/unittests/DebugInfo/PDB/PDBApiTest.cpp
deleted file mode 100644
index eb3b696acde..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/PDB/PDBApiTest.cpp
+++ /dev/null
@@ -1,509 +0,0 @@
-//===- llvm/unittest/DebugInfo/PDB/PDBApiTest.cpp -------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include <unordered_map>
-
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/DebugInfo/PDB/IPDBEnumChildren.h"
-#include "llvm/DebugInfo/PDB/IPDBInjectedSource.h"
-#include "llvm/DebugInfo/PDB/IPDBLineNumber.h"
-#include "llvm/DebugInfo/PDB/IPDBRawSymbol.h"
-#include "llvm/DebugInfo/PDB/IPDBSectionContrib.h"
-#include "llvm/DebugInfo/PDB/IPDBSession.h"
-#include "llvm/DebugInfo/PDB/IPDBSourceFile.h"
-#include "llvm/DebugInfo/PDB/IPDBTable.h"
-
-#include "llvm/DebugInfo/PDB/PDBSymbol.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolAnnotation.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolBlock.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolCompiland.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolCompilandDetails.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolCompilandEnv.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolCustom.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolData.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolExe.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolFunc.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolFuncDebugEnd.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolFuncDebugStart.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolLabel.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolPublicSymbol.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolThunk.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolTypeArray.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolTypeBaseClass.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolTypeBuiltin.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolTypeCustom.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolTypeDimension.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolTypeEnum.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolTypeFriend.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolTypeFunctionArg.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolTypeFunctionSig.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolTypeManaged.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolTypePointer.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolTypeTypedef.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolTypeUDT.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolTypeVTable.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolTypeVTableShape.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolUnknown.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolUsingNamespace.h"
-#include "llvm/DebugInfo/PDB/PDBTypes.h"
-#include "gtest/gtest.h"
-using namespace llvm;
-using namespace llvm::pdb;
-
-namespace {
-
-#define MOCK_SYMBOL_ACCESSOR(Func)                                             \
-  decltype(std::declval<IPDBRawSymbol>().Func()) Func() const override {       \
-    typedef decltype(IPDBRawSymbol::Func()) ReturnType;                        \
-    return ReturnType();                                                       \
-  }
-
-class MockSession : public IPDBSession {
-  uint64_t getLoadAddress() const override { return 0; }
-  bool setLoadAddress(uint64_t Address) override { return false; }
-  std::unique_ptr<PDBSymbolExe> getGlobalScope() override { return nullptr; }
-  std::unique_ptr<PDBSymbol> getSymbolById(SymIndexId SymbolId) const override {
-    return nullptr;
-  }
-  std::unique_ptr<IPDBSourceFile>
-  getSourceFileById(uint32_t SymbolId) const override {
-    return nullptr;
-  }
-  bool addressForVA(uint64_t VA, uint32_t &Section,
-                    uint32_t &Offset) const override {
-    return false;
-  }
-  bool addressForRVA(uint32_t RVA, uint32_t &Section,
-                     uint32_t &Offset) const override {
-    return false;
-  }
-  std::unique_ptr<PDBSymbol> findSymbolByAddress(uint64_t Address,
-                                                 PDB_SymType Type) override {
-    return nullptr;
-  }
-  std::unique_ptr<PDBSymbol> findSymbolByRVA(uint32_t RVA,
-                                             PDB_SymType Type) override {
-    return nullptr;
-  }
-  std::unique_ptr<PDBSymbol> findSymbolBySectOffset(uint32_t Sect,
-                                                    uint32_t Offset,
-                                                    PDB_SymType Type) override {
-    return nullptr;
-  }
-  std::unique_ptr<IPDBEnumLineNumbers>
-  findLineNumbers(const PDBSymbolCompiland &Compiland,
-                  const IPDBSourceFile &File) const override {
-    return nullptr;
-  }
-  std::unique_ptr<IPDBEnumLineNumbers>
-  findLineNumbersByAddress(uint64_t Address, uint32_t Length) const override {
-    return nullptr;
-  }
-  std::unique_ptr<IPDBEnumLineNumbers>
-  findLineNumbersByRVA(uint32_t RVA, uint32_t Length) const override {
-    return nullptr;
-  }
-  std::unique_ptr<IPDBEnumLineNumbers>
-  findLineNumbersBySectOffset(uint32_t Section, uint32_t Offset,
-                              uint32_t Length) const override {
-    return nullptr;
-  }
-  std::unique_ptr<IPDBEnumSourceFiles>
-  findSourceFiles(const PDBSymbolCompiland *Compiland, llvm::StringRef Pattern,
-                  PDB_NameSearchFlags Flags) const override {
-    return nullptr;
-  }
-  std::unique_ptr<IPDBSourceFile>
-  findOneSourceFile(const PDBSymbolCompiland *Compiland,
-                    llvm::StringRef Pattern,
-                    PDB_NameSearchFlags Flags) const override {
-    return nullptr;
-  }
-  std::unique_ptr<IPDBEnumChildren<PDBSymbolCompiland>>
-  findCompilandsForSourceFile(llvm::StringRef Pattern,
-                              PDB_NameSearchFlags Flags) const override {
-    return nullptr;
-  }
-  std::unique_ptr<PDBSymbolCompiland>
-  findOneCompilandForSourceFile(llvm::StringRef Pattern,
-                                PDB_NameSearchFlags Flags) const override {
-    return nullptr;
-  }
-
-  std::unique_ptr<IPDBEnumSourceFiles> getAllSourceFiles() const override {
-    return nullptr;
-  }
-  std::unique_ptr<IPDBEnumSourceFiles> getSourceFilesForCompiland(
-      const PDBSymbolCompiland &Compiland) const override {
-    return nullptr;
-  }
-
-  std::unique_ptr<IPDBEnumDataStreams> getDebugStreams() const override {
-    return nullptr;
-  }
-
-  std::unique_ptr<IPDBEnumTables> getEnumTables() const override {
-    return nullptr;
-  }
-
-  std::unique_ptr<IPDBEnumInjectedSources> getInjectedSources() const override {
-    return nullptr;
-  }
-
-  std::unique_ptr<IPDBEnumSectionContribs> getSectionContribs() const override {
-    return nullptr;
-  }
-
-  std::unique_ptr<IPDBEnumFrameData> getFrameData() const override {
-    return nullptr;
-  }
-};
-
-class MockRawSymbol : public IPDBRawSymbol {
-public:
-  MockRawSymbol(PDB_SymType SymType)
-      : Type(SymType) {}
-
-  void dump(raw_ostream &OS, int Indent, PdbSymbolIdField ShowIdFields,
-    PdbSymbolIdField RecurseIdFields) const override {}
-
-  std::unique_ptr<IPDBEnumSymbols>
-  findChildren(PDB_SymType Type) const override {
-    return nullptr;
-  }
-  std::unique_ptr<IPDBEnumSymbols>
-  findChildren(PDB_SymType Type, StringRef Name,
-               PDB_NameSearchFlags Flags) const override {
-    return nullptr;
-  }
-  std::unique_ptr<IPDBEnumSymbols>
-  findChildrenByAddr(PDB_SymType Type, StringRef Name, PDB_NameSearchFlags Flags,
-                     uint32_t Section, uint32_t Offset) const override {
-    return nullptr;
-  }
-  std::unique_ptr<IPDBEnumSymbols>
-  findChildrenByVA(PDB_SymType Type, StringRef Name, PDB_NameSearchFlags Flags,
-                   uint64_t VA) const override {
-    return nullptr;
-  }
-  std::unique_ptr<IPDBEnumSymbols>
-  findChildrenByRVA(PDB_SymType Type, StringRef Name, PDB_NameSearchFlags Flags,
-                    uint32_t RVA) const override {
-    return nullptr;
-  }
-  std::unique_ptr<IPDBEnumSymbols>
-  findInlineFramesByAddr(uint32_t Section, uint32_t Offset) const override {
-    return nullptr;
-  }
-  std::unique_ptr<IPDBEnumSymbols>
-  findInlineFramesByRVA(uint32_t RVA) const override {
-    return nullptr;
-  }
-  std::unique_ptr<IPDBEnumSymbols>
-  findInlineFramesByVA(uint64_t VA) const override {
-    return nullptr;
-  }
-  std::unique_ptr<IPDBEnumLineNumbers> findInlineeLines() const override {
-    return nullptr;
-  }
-  std::unique_ptr<IPDBEnumLineNumbers>
-  findInlineeLinesByAddr(uint32_t Section, uint32_t Offset,
-                         uint32_t Length) const override {
-    return nullptr;
-  }
-  std::unique_ptr<IPDBEnumLineNumbers>
-  findInlineeLinesByRVA(uint32_t RVA, uint32_t Length) const override {
-    return nullptr;
-  }
-  std::unique_ptr<IPDBEnumLineNumbers>
-  findInlineeLinesByVA(uint64_t VA, uint32_t Length) const override {
-    return nullptr;
-  }
-
-  void getDataBytes(llvm::SmallVector<uint8_t, 32> &bytes) const override {}
-  void getFrontEndVersion(VersionInfo &Version) const override {}
-  void getBackEndVersion(VersionInfo &Version) const override {}
-
-  PDB_SymType getSymTag() const override { return Type; }
-
-  std::string getUndecoratedNameEx(PDB_UndnameFlags Flags) const override {
-    return {};
-  }
-
-  std::unique_ptr<IPDBLineNumber> getSrcLineOnTypeDefn() const override {
-    return nullptr;
-  }
-
-  MOCK_SYMBOL_ACCESSOR(getAccess)
-  MOCK_SYMBOL_ACCESSOR(getAddressOffset)
-  MOCK_SYMBOL_ACCESSOR(getAddressSection)
-  MOCK_SYMBOL_ACCESSOR(getAge)
-  MOCK_SYMBOL_ACCESSOR(getArrayIndexTypeId)
-  MOCK_SYMBOL_ACCESSOR(getBaseDataOffset)
-  MOCK_SYMBOL_ACCESSOR(getBaseDataSlot)
-  MOCK_SYMBOL_ACCESSOR(getBaseSymbolId)
-  MOCK_SYMBOL_ACCESSOR(getBuiltinType)
-  MOCK_SYMBOL_ACCESSOR(getBitPosition)
-  MOCK_SYMBOL_ACCESSOR(getCallingConvention)
-  MOCK_SYMBOL_ACCESSOR(getClassParentId)
-  MOCK_SYMBOL_ACCESSOR(getCompilerName)
-  MOCK_SYMBOL_ACCESSOR(getCount)
-  MOCK_SYMBOL_ACCESSOR(getCountLiveRanges)
-  MOCK_SYMBOL_ACCESSOR(getLanguage)
-  MOCK_SYMBOL_ACCESSOR(getLexicalParentId)
-  MOCK_SYMBOL_ACCESSOR(getLibraryName)
-  MOCK_SYMBOL_ACCESSOR(getLiveRangeStartAddressOffset)
-  MOCK_SYMBOL_ACCESSOR(getLiveRangeStartAddressSection)
-  MOCK_SYMBOL_ACCESSOR(getLiveRangeStartRelativeVirtualAddress)
-  MOCK_SYMBOL_ACCESSOR(getLocalBasePointerRegisterId)
-  MOCK_SYMBOL_ACCESSOR(getLowerBoundId)
-  MOCK_SYMBOL_ACCESSOR(getMemorySpaceKind)
-  MOCK_SYMBOL_ACCESSOR(getName)
-  MOCK_SYMBOL_ACCESSOR(getNumberOfAcceleratorPointerTags)
-  MOCK_SYMBOL_ACCESSOR(getNumberOfColumns)
-  MOCK_SYMBOL_ACCESSOR(getNumberOfModifiers)
-  MOCK_SYMBOL_ACCESSOR(getNumberOfRegisterIndices)
-  MOCK_SYMBOL_ACCESSOR(getNumberOfRows)
-  MOCK_SYMBOL_ACCESSOR(getObjectFileName)
-  MOCK_SYMBOL_ACCESSOR(getOemId)
-  MOCK_SYMBOL_ACCESSOR(getOemSymbolId)
-  MOCK_SYMBOL_ACCESSOR(getOffsetInUdt)
-  MOCK_SYMBOL_ACCESSOR(getPlatform)
-  MOCK_SYMBOL_ACCESSOR(getRank)
-  MOCK_SYMBOL_ACCESSOR(getRegisterId)
-  MOCK_SYMBOL_ACCESSOR(getRegisterType)
-  MOCK_SYMBOL_ACCESSOR(getRelativeVirtualAddress)
-  MOCK_SYMBOL_ACCESSOR(getSamplerSlot)
-  MOCK_SYMBOL_ACCESSOR(getSignature)
-  MOCK_SYMBOL_ACCESSOR(getSizeInUdt)
-  MOCK_SYMBOL_ACCESSOR(getSlot)
-  MOCK_SYMBOL_ACCESSOR(getSourceFileName)
-  MOCK_SYMBOL_ACCESSOR(getStride)
-  MOCK_SYMBOL_ACCESSOR(getSubTypeId)
-  MOCK_SYMBOL_ACCESSOR(getSymbolsFileName)
-  MOCK_SYMBOL_ACCESSOR(getSymIndexId)
-  MOCK_SYMBOL_ACCESSOR(getTargetOffset)
-  MOCK_SYMBOL_ACCESSOR(getTargetRelativeVirtualAddress)
-  MOCK_SYMBOL_ACCESSOR(getTargetVirtualAddress)
-  MOCK_SYMBOL_ACCESSOR(getTargetSection)
-  MOCK_SYMBOL_ACCESSOR(getTextureSlot)
-  MOCK_SYMBOL_ACCESSOR(getTimeStamp)
-  MOCK_SYMBOL_ACCESSOR(getToken)
-  MOCK_SYMBOL_ACCESSOR(getTypeId)
-  MOCK_SYMBOL_ACCESSOR(getUavSlot)
-  MOCK_SYMBOL_ACCESSOR(getUndecoratedName)
-  MOCK_SYMBOL_ACCESSOR(getUnmodifiedTypeId)
-  MOCK_SYMBOL_ACCESSOR(getUpperBoundId)
-  MOCK_SYMBOL_ACCESSOR(getVirtualBaseDispIndex)
-  MOCK_SYMBOL_ACCESSOR(getVirtualBaseOffset)
-  MOCK_SYMBOL_ACCESSOR(getVirtualTableShapeId)
-  MOCK_SYMBOL_ACCESSOR(getDataKind)
-  MOCK_SYMBOL_ACCESSOR(getGuid)
-  MOCK_SYMBOL_ACCESSOR(getOffset)
-  MOCK_SYMBOL_ACCESSOR(getThisAdjust)
-  MOCK_SYMBOL_ACCESSOR(getVirtualBasePointerOffset)
-  MOCK_SYMBOL_ACCESSOR(getLocationType)
-  MOCK_SYMBOL_ACCESSOR(getMachineType)
-  MOCK_SYMBOL_ACCESSOR(getThunkOrdinal)
-  MOCK_SYMBOL_ACCESSOR(getLength)
-  MOCK_SYMBOL_ACCESSOR(getVirtualBaseTableType)
-  MOCK_SYMBOL_ACCESSOR(getLiveRangeLength)
-  MOCK_SYMBOL_ACCESSOR(getVirtualAddress)
-  MOCK_SYMBOL_ACCESSOR(getUdtKind)
-  MOCK_SYMBOL_ACCESSOR(hasConstructor)
-  MOCK_SYMBOL_ACCESSOR(hasCustomCallingConvention)
-  MOCK_SYMBOL_ACCESSOR(hasFarReturn)
-  MOCK_SYMBOL_ACCESSOR(isCode)
-  MOCK_SYMBOL_ACCESSOR(isCompilerGenerated)
-  MOCK_SYMBOL_ACCESSOR(isConstType)
-  MOCK_SYMBOL_ACCESSOR(isEditAndContinueEnabled)
-  MOCK_SYMBOL_ACCESSOR(isFunction)
-  MOCK_SYMBOL_ACCESSOR(getAddressTaken)
-  MOCK_SYMBOL_ACCESSOR(getNoStackOrdering)
-  MOCK_SYMBOL_ACCESSOR(hasAlloca)
-  MOCK_SYMBOL_ACCESSOR(hasAssignmentOperator)
-  MOCK_SYMBOL_ACCESSOR(hasCTypes)
-  MOCK_SYMBOL_ACCESSOR(hasCastOperator)
-  MOCK_SYMBOL_ACCESSOR(hasDebugInfo)
-  MOCK_SYMBOL_ACCESSOR(hasEH)
-  MOCK_SYMBOL_ACCESSOR(hasEHa)
-  MOCK_SYMBOL_ACCESSOR(hasFramePointer)
-  MOCK_SYMBOL_ACCESSOR(hasInlAsm)
-  MOCK_SYMBOL_ACCESSOR(hasInlineAttribute)
-  MOCK_SYMBOL_ACCESSOR(hasInterruptReturn)
-  MOCK_SYMBOL_ACCESSOR(hasLongJump)
-  MOCK_SYMBOL_ACCESSOR(hasManagedCode)
-  MOCK_SYMBOL_ACCESSOR(hasNestedTypes)
-  MOCK_SYMBOL_ACCESSOR(hasNoInlineAttribute)
-  MOCK_SYMBOL_ACCESSOR(hasNoReturnAttribute)
-  MOCK_SYMBOL_ACCESSOR(hasOptimizedCodeDebugInfo)
-  MOCK_SYMBOL_ACCESSOR(hasOverloadedOperator)
-  MOCK_SYMBOL_ACCESSOR(hasSEH)
-  MOCK_SYMBOL_ACCESSOR(hasSecurityChecks)
-  MOCK_SYMBOL_ACCESSOR(hasSetJump)
-  MOCK_SYMBOL_ACCESSOR(hasStrictGSCheck)
-  MOCK_SYMBOL_ACCESSOR(isAcceleratorGroupSharedLocal)
-  MOCK_SYMBOL_ACCESSOR(isAcceleratorPointerTagLiveRange)
-  MOCK_SYMBOL_ACCESSOR(isAcceleratorStubFunction)
-  MOCK_SYMBOL_ACCESSOR(isAggregated)
-  MOCK_SYMBOL_ACCESSOR(isIntroVirtualFunction)
-  MOCK_SYMBOL_ACCESSOR(isCVTCIL)
-  MOCK_SYMBOL_ACCESSOR(isConstructorVirtualBase)
-  MOCK_SYMBOL_ACCESSOR(isCxxReturnUdt)
-  MOCK_SYMBOL_ACCESSOR(isDataAligned)
-  MOCK_SYMBOL_ACCESSOR(isHLSLData)
-  MOCK_SYMBOL_ACCESSOR(isHotpatchable)
-  MOCK_SYMBOL_ACCESSOR(isIndirectVirtualBaseClass)
-  MOCK_SYMBOL_ACCESSOR(isInterfaceUdt)
-  MOCK_SYMBOL_ACCESSOR(isIntrinsic)
-  MOCK_SYMBOL_ACCESSOR(isLTCG)
-  MOCK_SYMBOL_ACCESSOR(isLocationControlFlowDependent)
-  MOCK_SYMBOL_ACCESSOR(isMSILNetmodule)
-  MOCK_SYMBOL_ACCESSOR(isMatrixRowMajor)
-  MOCK_SYMBOL_ACCESSOR(isManagedCode)
-  MOCK_SYMBOL_ACCESSOR(isMSILCode)
-  MOCK_SYMBOL_ACCESSOR(isMultipleInheritance)
-  MOCK_SYMBOL_ACCESSOR(isNaked)
-  MOCK_SYMBOL_ACCESSOR(isNested)
-  MOCK_SYMBOL_ACCESSOR(isOptimizedAway)
-  MOCK_SYMBOL_ACCESSOR(isPacked)
-  MOCK_SYMBOL_ACCESSOR(isPointerBasedOnSymbolValue)
-  MOCK_SYMBOL_ACCESSOR(isPointerToDataMember)
-  MOCK_SYMBOL_ACCESSOR(isPointerToMemberFunction)
-  MOCK_SYMBOL_ACCESSOR(isPureVirtual)
-  MOCK_SYMBOL_ACCESSOR(isRValueReference)
-  MOCK_SYMBOL_ACCESSOR(isRefUdt)
-  MOCK_SYMBOL_ACCESSOR(isReference)
-  MOCK_SYMBOL_ACCESSOR(isRestrictedType)
-  MOCK_SYMBOL_ACCESSOR(isReturnValue)
-  MOCK_SYMBOL_ACCESSOR(isSafeBuffers)
-  MOCK_SYMBOL_ACCESSOR(isScoped)
-  MOCK_SYMBOL_ACCESSOR(isSdl)
-  MOCK_SYMBOL_ACCESSOR(isSingleInheritance)
-  MOCK_SYMBOL_ACCESSOR(isSplitted)
-  MOCK_SYMBOL_ACCESSOR(isStatic)
-  MOCK_SYMBOL_ACCESSOR(hasPrivateSymbols)
-  MOCK_SYMBOL_ACCESSOR(isUnalignedType)
-  MOCK_SYMBOL_ACCESSOR(isUnreached)
-  MOCK_SYMBOL_ACCESSOR(isValueUdt)
-  MOCK_SYMBOL_ACCESSOR(isVirtual)
-  MOCK_SYMBOL_ACCESSOR(isVirtualBaseClass)
-  MOCK_SYMBOL_ACCESSOR(isVirtualInheritance)
-  MOCK_SYMBOL_ACCESSOR(isVolatileType)
-  MOCK_SYMBOL_ACCESSOR(getValue)
-  MOCK_SYMBOL_ACCESSOR(wasInlined)
-  MOCK_SYMBOL_ACCESSOR(getUnused)
-
-private:
-  PDB_SymType Type;
-};
-
-class PDBApiTest : public testing::Test {
-public:
-  std::unordered_map<PDB_SymType, std::unique_ptr<PDBSymbol>> SymbolMap;
-
-  void SetUp() override {
-    Session.reset(new MockSession());
-
-    InsertItemWithTag(PDB_SymType::None);
-    InsertItemWithTag(PDB_SymType::Exe);
-    InsertItemWithTag(PDB_SymType::Compiland);
-    InsertItemWithTag(PDB_SymType::CompilandDetails);
-    InsertItemWithTag(PDB_SymType::CompilandEnv);
-    InsertItemWithTag(PDB_SymType::Function);
-    InsertItemWithTag(PDB_SymType::Block);
-    InsertItemWithTag(PDB_SymType::Data);
-    InsertItemWithTag(PDB_SymType::Annotation);
-    InsertItemWithTag(PDB_SymType::Label);
-    InsertItemWithTag(PDB_SymType::PublicSymbol);
-    InsertItemWithTag(PDB_SymType::UDT);
-    InsertItemWithTag(PDB_SymType::Enum);
-    InsertItemWithTag(PDB_SymType::FunctionSig);
-    InsertItemWithTag(PDB_SymType::PointerType);
-    InsertItemWithTag(PDB_SymType::ArrayType);
-    InsertItemWithTag(PDB_SymType::BuiltinType);
-    InsertItemWithTag(PDB_SymType::Typedef);
-    InsertItemWithTag(PDB_SymType::BaseClass);
-    InsertItemWithTag(PDB_SymType::Friend);
-    InsertItemWithTag(PDB_SymType::FunctionArg);
-    InsertItemWithTag(PDB_SymType::FuncDebugStart);
-    InsertItemWithTag(PDB_SymType::FuncDebugEnd);
-    InsertItemWithTag(PDB_SymType::UsingNamespace);
-    InsertItemWithTag(PDB_SymType::VTableShape);
-    InsertItemWithTag(PDB_SymType::VTable);
-    InsertItemWithTag(PDB_SymType::Custom);
-    InsertItemWithTag(PDB_SymType::Thunk);
-    InsertItemWithTag(PDB_SymType::CustomType);
-    InsertItemWithTag(PDB_SymType::ManagedType);
-    InsertItemWithTag(PDB_SymType::Dimension);
-    InsertItemWithTag(PDB_SymType::Max);
-  }
-
-  template <class ExpectedType> void VerifyDyncast(PDB_SymType Tag) {
-    for (auto item = SymbolMap.begin(); item != SymbolMap.end(); ++item) {
-      EXPECT_EQ(item->first == Tag, llvm::isa<ExpectedType>(*item->second));
-    }
-  }
-
-  void VerifyUnknownDyncasts() {
-    for (auto item = SymbolMap.begin(); item != SymbolMap.end(); ++item) {
-      bool should_match = false;
-      if (item->first == PDB_SymType::None || item->first >= PDB_SymType::Max)
-        should_match = true;
-
-      EXPECT_EQ(should_match, llvm::isa<PDBSymbolUnknown>(*item->second));
-    }
-  }
-
-private:
-  std::unique_ptr<IPDBSession> Session;
-
-  void InsertItemWithTag(PDB_SymType Tag) {
-    auto RawSymbol = std::make_unique<MockRawSymbol>(Tag);
-    auto Symbol = PDBSymbol::create(*Session, std::move(RawSymbol));
-    SymbolMap.insert(std::make_pair(Tag, std::move(Symbol)));
-  }
-};
-
-TEST_F(PDBApiTest, Dyncast) {
-
-  // Most of the types have a one-to-one mapping between Tag and concrete type.
-  VerifyDyncast<PDBSymbolExe>(PDB_SymType::Exe);
-  VerifyDyncast<PDBSymbolCompiland>(PDB_SymType::Compiland);
-  VerifyDyncast<PDBSymbolCompilandDetails>(PDB_SymType::CompilandDetails);
-  VerifyDyncast<PDBSymbolCompilandEnv>(PDB_SymType::CompilandEnv);
-  VerifyDyncast<PDBSymbolFunc>(PDB_SymType::Function);
-  VerifyDyncast<PDBSymbolBlock>(PDB_SymType::Block);
-  VerifyDyncast<PDBSymbolData>(PDB_SymType::Data);
-  VerifyDyncast<PDBSymbolAnnotation>(PDB_SymType::Annotation);
-  VerifyDyncast<PDBSymbolLabel>(PDB_SymType::Label);
-  VerifyDyncast<PDBSymbolPublicSymbol>(PDB_SymType::PublicSymbol);
-  VerifyDyncast<PDBSymbolTypeUDT>(PDB_SymType::UDT);
-  VerifyDyncast<PDBSymbolTypeEnum>(PDB_SymType::Enum);
-  VerifyDyncast<PDBSymbolTypeFunctionSig>(PDB_SymType::FunctionSig);
-  VerifyDyncast<PDBSymbolTypePointer>(PDB_SymType::PointerType);
-  VerifyDyncast<PDBSymbolTypeArray>(PDB_SymType::ArrayType);
-  VerifyDyncast<PDBSymbolTypeBuiltin>(PDB_SymType::BuiltinType);
-  VerifyDyncast<PDBSymbolTypeTypedef>(PDB_SymType::Typedef);
-  VerifyDyncast<PDBSymbolTypeBaseClass>(PDB_SymType::BaseClass);
-  VerifyDyncast<PDBSymbolTypeFriend>(PDB_SymType::Friend);
-  VerifyDyncast<PDBSymbolTypeFunctionArg>(PDB_SymType::FunctionArg);
-  VerifyDyncast<PDBSymbolFuncDebugStart>(PDB_SymType::FuncDebugStart);
-  VerifyDyncast<PDBSymbolFuncDebugEnd>(PDB_SymType::FuncDebugEnd);
-  VerifyDyncast<PDBSymbolUsingNamespace>(PDB_SymType::UsingNamespace);
-  VerifyDyncast<PDBSymbolTypeVTableShape>(PDB_SymType::VTableShape);
-  VerifyDyncast<PDBSymbolTypeVTable>(PDB_SymType::VTable);
-  VerifyDyncast<PDBSymbolCustom>(PDB_SymType::Custom);
-  VerifyDyncast<PDBSymbolThunk>(PDB_SymType::Thunk);
-  VerifyDyncast<PDBSymbolTypeCustom>(PDB_SymType::CustomType);
-  VerifyDyncast<PDBSymbolTypeManaged>(PDB_SymType::ManagedType);
-  VerifyDyncast<PDBSymbolTypeDimension>(PDB_SymType::Dimension);
-
-  VerifyUnknownDyncasts();
-}
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/DebugInfo/PDB/StringTableBuilderTest.cpp b/gnu/llvm/llvm/unittests/DebugInfo/PDB/StringTableBuilderTest.cpp
deleted file mode 100644
index 2f7c0619440..00000000000
--- a/gnu/llvm/llvm/unittests/DebugInfo/PDB/StringTableBuilderTest.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-//===- StringTableBuilderTest.cpp -----------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/DebugInfo/PDB/Native/PDBStringTable.h"
-#include "llvm/DebugInfo/PDB/Native/PDBStringTableBuilder.h"
-#include "llvm/Support/BinaryByteStream.h"
-#include "llvm/Support/BinaryStreamReader.h"
-#include "llvm/Support/BinaryStreamWriter.h"
-#include "llvm/Testing/Support/Error.h"
-
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::pdb;
-using namespace llvm::support;
-
-TEST(StringTableBuilderTest, Simple) {
-  // Create /names table contents.
-  PDBStringTableBuilder Builder;
-
-  // This test case is carefully constructed to ensure that at least one
-  // string gets bucketed into slot 0, *and* to ensure that at least one
-  // has a hash collision at the end of the bucket list so it has to
-  // wrap around.
-  uint32_t FooID = Builder.insert("foo");
-  uint32_t BarID = Builder.insert("bar");
-  uint32_t BazID = Builder.insert("baz");
-  uint32_t BuzzID = Builder.insert("buzz");
-  uint32_t BazzID = Builder.insert("bazz");
-  uint32_t BarrID = Builder.insert("barr");
-
-  // Re-inserting the same item should return the same id.
-  EXPECT_EQ(FooID, Builder.insert("foo"));
-  EXPECT_EQ(BarID, Builder.insert("bar"));
-  EXPECT_EQ(BazID, Builder.insert("baz"));
-  EXPECT_EQ(BuzzID, Builder.insert("buzz"));
-  EXPECT_EQ(BazzID, Builder.insert("bazz"));
-  EXPECT_EQ(BarrID, Builder.insert("barr"));
-
-  // Each ID should be distinct.
-  std::set<uint32_t> Distinct{FooID, BarID, BazID, BuzzID, BazzID, BarrID};
-  EXPECT_EQ(6U, Distinct.size());
-
-  std::vector<uint8_t> Buffer(Builder.calculateSerializedSize());
-  MutableBinaryByteStream OutStream(Buffer, little);
-  BinaryStreamWriter Writer(OutStream);
-  EXPECT_THAT_ERROR(Builder.commit(Writer), Succeeded());
-
-  // Reads the contents back.
-  BinaryByteStream InStream(Buffer, little);
-  BinaryStreamReader Reader(InStream);
-  PDBStringTable Table;
-  EXPECT_THAT_ERROR(Table.reload(Reader), Succeeded());
-
-  EXPECT_EQ(6U, Table.getNameCount());
-  EXPECT_EQ(1U, Table.getHashVersion());
-
-  EXPECT_THAT_EXPECTED(Table.getStringForID(FooID), HasValue("foo"));
-  EXPECT_THAT_EXPECTED(Table.getStringForID(BarID), HasValue("bar"));
-  EXPECT_THAT_EXPECTED(Table.getStringForID(BazID), HasValue("baz"));
-  EXPECT_THAT_EXPECTED(Table.getStringForID(BuzzID), HasValue("buzz"));
-  EXPECT_THAT_EXPECTED(Table.getStringForID(BazzID), HasValue("bazz"));
-  EXPECT_THAT_EXPECTED(Table.getStringForID(BarrID), HasValue("barr"));
-
-  EXPECT_THAT_EXPECTED(Table.getIDForString("foo"), HasValue(FooID));
-  EXPECT_THAT_EXPECTED(Table.getIDForString("bar"), HasValue(BarID));
-  EXPECT_THAT_EXPECTED(Table.getIDForString("baz"), HasValue(BazID));
-  EXPECT_THAT_EXPECTED(Table.getIDForString("buzz"), HasValue(BuzzID));
-  EXPECT_THAT_EXPECTED(Table.getIDForString("bazz"), HasValue(BazzID));
-  EXPECT_THAT_EXPECTED(Table.getIDForString("barr"), HasValue(BarrID));
-}
-
-TEST(StringTableHashTraitsTest, Simple) {
-  PDBStringTableBuilder Builder;
-
-  // Create more than 64kiB of dummy entries.
-  for (int i = 0; i < 320; ++i) {
-    std::string aaaaa = std::string(220, 'a') + std::to_string(i);
-    Builder.insert(aaaaa);
-  }
-
-  std::string S = "foo.natvis";
-  uint32_t Pos = Builder.insert(S);
-
-  EXPECT_GT(Pos, 0xFFFFu);
-
-  StringTableHashTraits Traits(Builder);
-  EXPECT_LE(Traits.hashLookupKey(S), 0xFFFFu);
-}
diff --git a/gnu/llvm/llvm/unittests/Demangle/CMakeLists.txt b/gnu/llvm/llvm/unittests/Demangle/CMakeLists.txt
deleted file mode 100644
index 4bcc9bb322e..00000000000
--- a/gnu/llvm/llvm/unittests/Demangle/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  Demangle
-  Support
-)
-
-add_llvm_unittest(DemangleTests
-  DemangleTest.cpp
-  ItaniumDemangleTest.cpp
-  PartialDemangleTest.cpp
-  RustDemangleTest.cpp
-  StringViewTest.cpp
-)
diff --git a/gnu/llvm/llvm/unittests/Demangle/DemangleTest.cpp b/gnu/llvm/llvm/unittests/Demangle/DemangleTest.cpp
deleted file mode 100644
index b7b31f9f2d2..00000000000
--- a/gnu/llvm/llvm/unittests/Demangle/DemangleTest.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-//===-- DemangleTest.cpp --------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Demangle/Demangle.h"
-#include "gmock/gmock.h"
-
-using namespace llvm;
-
-TEST(Demangle, demangleTest) {
-  EXPECT_EQ(demangle("_"), "_");
-  EXPECT_EQ(demangle("_Z3fooi"), "foo(int)");
-  EXPECT_EQ(demangle("__Z3fooi"), "foo(int)");
-  EXPECT_EQ(demangle("___Z3fooi_block_invoke"),
-            "invocation function for block in foo(int)");
-  EXPECT_EQ(demangle("____Z3fooi_block_invoke"),
-            "invocation function for block in foo(int)");
-  EXPECT_EQ(demangle("?foo@@YAXH@Z"), "void __cdecl foo(int)");
-  EXPECT_EQ(demangle("foo"), "foo");
-  EXPECT_EQ(demangle("_RNvC3foo3bar"), "foo::bar");
-
-  // Regression test for demangling of optional template-args for vendor
-  // extended type qualifier (https://bugs.llvm.org/show_bug.cgi?id=48009)
-  EXPECT_EQ(demangle("_Z3fooILi79EEbU7_ExtIntIXT_EEi"),
-            "bool foo<79>(int _ExtInt<79>)");
-}
diff --git a/gnu/llvm/llvm/unittests/Demangle/ItaniumDemangleTest.cpp b/gnu/llvm/llvm/unittests/Demangle/ItaniumDemangleTest.cpp
deleted file mode 100644
index 11bb78429a0..00000000000
--- a/gnu/llvm/llvm/unittests/Demangle/ItaniumDemangleTest.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-//===------------------ ItaniumDemangleTest.cpp ---------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Demangle/ItaniumDemangle.h"
-#include "llvm/Support/Allocator.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-#include <cstdlib>
-#include <vector>
-
-using namespace llvm;
-using namespace llvm::itanium_demangle;
-
-namespace {
-class TestAllocator {
-  BumpPtrAllocator Alloc;
-
-public:
-  void reset() { Alloc.Reset(); }
-
-  template <typename T, typename... Args> T *makeNode(Args &&... args) {
-    return new (Alloc.Allocate(sizeof(T), alignof(T)))
-        T(std::forward<Args>(args)...);
-  }
-
-  void *allocateNodeArray(size_t sz) {
-    return Alloc.Allocate(sizeof(Node *) * sz, alignof(Node *));
-  }
-};
-} // namespace
-
-TEST(ItaniumDemangle, MethodOverride) {
-  struct TestParser : AbstractManglingParser<TestParser, TestAllocator> {
-    std::vector<char> Types;
-
-    TestParser(const char *Str)
-        : AbstractManglingParser(Str, Str + strlen(Str)) {}
-
-    Node *parseType() {
-      Types.push_back(*First);
-      return AbstractManglingParser<TestParser, TestAllocator>::parseType();
-    }
-  };
-
-  TestParser Parser("_Z1fIiEjl");
-  ASSERT_NE(nullptr, Parser.parse());
-  EXPECT_THAT(Parser.Types, testing::ElementsAre('i', 'j', 'l'));
-}
diff --git a/gnu/llvm/llvm/unittests/Demangle/PartialDemangleTest.cpp b/gnu/llvm/llvm/unittests/Demangle/PartialDemangleTest.cpp
deleted file mode 100644
index 0379d8372f7..00000000000
--- a/gnu/llvm/llvm/unittests/Demangle/PartialDemangleTest.cpp
+++ /dev/null
@@ -1,193 +0,0 @@
-//===----------------------- PartialDemangleTest.cpp ----------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include <cstdlib>
-#include "llvm/Demangle/Demangle.h"
-#include "gtest/gtest.h"
-
-struct ChoppedName {
-  const char *Mangled;
-  const char *ContextName, *BaseName, *ReturnType, *Params;
-};
-
-static ChoppedName NamesToTest[] = {
-  {"_Z1fv", "", "f", "", "()"},
-  {"_ZN1a1b1cIiiiEEvm", "a::b", "c", "void", "(unsigned long)"},
-  {"_ZZ5OuterIiEivEN5Inner12inner_memberEv",
-   "int Outer<int>()::Inner", "inner_member", "", "()"},
-  {"_Z1fIiEPFvvEv", "", "f", "void (*)()", "()"},
-  {"_ZN1S1fIiEEvv", "S", "f", "void", "()"},
-
-  // Call operator for a lambda in f().
-  {"_ZZ1fvENK3$_0clEi", "f()::$_0", "operator()", "", "(int)"},
-
-  // A call operator for a lambda in a lambda in f().
-  {"_ZZZ1fvENK3$_0clEvENKUlvE_clEv",
-   "f()::$_0::operator()() const::'lambda'()", "operator()", "", "()"},
-
-  {"_ZZN1S1fEiiEd0_NKUlvE_clEv",
-   "S::f(int, int)::'lambda'()", "operator()", "", "()"},
-
-  {"_ZN1Scv7MuncherIJDpPT_EEIJFivEA_iEEEv",
-   "S", "operator Muncher<int (*)(), int (*) []>", "", "()"},
-
-  // Attributes.
-  {"_ZN5test4IdE1fEUa9enable_ifIXeqfL0p_Li1EEXeqfL0p0_Li2EEEi",
-   "test4<double>", "f", "", "(int)"},
-  {"_ZN1SC2B8ctor_tagEv", "S", "S", "", "()"},
-  {"_ZN1S1fB4MERPIiEEvv", "S", "f", "void", "()"},
-
-  {"_ZNSsC1EmcRKSaIcE",
-   "std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "basic_string", "", "(unsigned long, char, std::allocator<char> const&)"},
-  {"_ZNSsixEm", "std::string", "operator[]", "", "(unsigned long)"},
-  {"_ZSt17__throw_bad_allocv", "std", "__throw_bad_alloc", "", "()"},
-
-  {"_ZN1AI1BEC2Ev", "A<B>", "A", "", "()"},
-  {"_ZN1AI1BED2Ev", "A<B>", "~A", "", "()"},
-  {"_ZN1AI1BECI24BaseEi", "A<B>", "A", "", "(int)"},
-  {"_ZNKR1AI1BE1fIiEEiv", "A<B>", "f", "int", "()"},
-
-  {"_ZN1SIJicfEE3mfnIJjcdEEEvicfDpT_", "S<int, char, float>",
-   "mfn", "void", "(int, char, float, unsigned int, char, double)"},
-};
-
-TEST(PartialDemanglerTest, TestNameChopping) {
-  size_t Size = 1;
-  char *Buf = static_cast<char *>(std::malloc(Size));
-
-  llvm::ItaniumPartialDemangler D;
-
-  for (ChoppedName &N : NamesToTest) {
-    EXPECT_FALSE(D.partialDemangle(N.Mangled));
-    EXPECT_TRUE(D.isFunction());
-    EXPECT_FALSE(D.isData());
-    EXPECT_FALSE(D.isSpecialName());
-
-    Buf = D.getFunctionDeclContextName(Buf, &Size);
-    EXPECT_STREQ(Buf, N.ContextName);
-
-    Buf = D.getFunctionBaseName(Buf, &Size);
-    EXPECT_STREQ(Buf, N.BaseName);
-
-    Buf = D.getFunctionReturnType(Buf, &Size);
-    EXPECT_STREQ(Buf, N.ReturnType);
-
-    Buf = D.getFunctionParameters(Buf, &Size);
-    EXPECT_STREQ(Buf, N.Params);
-  }
-
-  std::free(Buf);
-}
-
-TEST(PartialDemanglerTest, TestNameMeta) {
-  llvm::ItaniumPartialDemangler Demangler;
-
-  EXPECT_FALSE(Demangler.partialDemangle("_ZNK1f1gEv"));
-  EXPECT_TRUE(Demangler.isFunction());
-  EXPECT_TRUE(Demangler.hasFunctionQualifiers());
-  EXPECT_FALSE(Demangler.isSpecialName());
-  EXPECT_FALSE(Demangler.isData());
-
-  EXPECT_FALSE(Demangler.partialDemangle("_Z1fv"));
-  EXPECT_FALSE(Demangler.hasFunctionQualifiers());
-
-  EXPECT_FALSE(Demangler.partialDemangle("_ZTV1S"));
-  EXPECT_TRUE(Demangler.isSpecialName());
-  EXPECT_FALSE(Demangler.isData());
-  EXPECT_FALSE(Demangler.isFunction());
-
-  EXPECT_FALSE(Demangler.partialDemangle("_ZN1aDC1a1b1cEE"));
-  EXPECT_FALSE(Demangler.isFunction());
-  EXPECT_FALSE(Demangler.isSpecialName());
-  EXPECT_TRUE(Demangler.isData());
-}
-
-TEST(PartialDemanglerTest, TestCtorOrDtor) {
-  static const char *Pos[] = {
-      "_ZN1AC1Ev",        // A::A()
-      "_ZN1AC1IiEET_",    // A::A<int>(int)
-      "_ZN1AD2Ev",        // A::~A()
-      "_ZN1BIiEC1IcEET_", // B<int>::B<char>(char)
-      "_ZN1AC1B1TEv",     // A::A[abi:T]()
-      "_ZNSt1AD2Ev",      // std::A::~A()
-      "_ZN2ns1AD1Ev",      // ns::A::~A()
-  };
-  static const char *Neg[] = {
-      "_Z1fv",
-      "_ZN1A1gIiEEvT_", // void A::g<int>(int)
-  };
-
-  llvm::ItaniumPartialDemangler D;
-  for (const char *N : Pos) {
-    EXPECT_FALSE(D.partialDemangle(N));
-    EXPECT_TRUE(D.isCtorOrDtor());
-  }
-  for (const char *N : Neg) {
-    EXPECT_FALSE(D.partialDemangle(N));
-    EXPECT_FALSE(D.isCtorOrDtor());
-  }
-}
-
-TEST(PartialDemanglerTest, TestMisc) {
-  llvm::ItaniumPartialDemangler D1, D2;
-
-  EXPECT_FALSE(D1.partialDemangle("_Z1fv"));
-  EXPECT_FALSE(D2.partialDemangle("_Z1g"));
-  std::swap(D1, D2);
-  EXPECT_FALSE(D1.isFunction());
-  EXPECT_TRUE(D2.isFunction());
-
-  EXPECT_TRUE(D1.partialDemangle("Not a mangled name!"));
-}
-
-TEST(PartialDemanglerTest, TestPrintCases) {
-  llvm::ItaniumPartialDemangler D;
-
-  const size_t OriginalSize = 4;
-  char *Buf = static_cast<char *>(std::malloc(OriginalSize));
-  const char *OriginalBuf = Buf;
-
-  // Default success case: Result fits into the given buffer.
-  // Res points to Buf. N returns string size including null termination.
-  {
-    EXPECT_FALSE(D.partialDemangle("_ZN1a1bEv"));
-
-    size_t N = OriginalSize;
-    char *Res = D.getFunctionDeclContextName(Buf, &N);
-    EXPECT_STREQ("a", Res);
-    EXPECT_EQ(OriginalBuf, Res);
-    EXPECT_EQ(strlen(Res) + 1, N);
-  }
-
-  // Realloc success case: Result does not fit into the given buffer.
-  // Res points to the new or extended buffer. N returns string size
-  // including null termination. Buf was extended or freed.
-  {
-    EXPECT_FALSE(D.partialDemangle("_ZN1a1b1cIiiiEEvm"));
-
-    size_t N = OriginalSize;
-    char *Res = D.finishDemangle(Buf, &N);
-    EXPECT_STREQ("void a::b::c<int, int, int>(unsigned long)", Res);
-    EXPECT_EQ(strlen(Res) + 1, N);
-    Buf = Res;
-  }
-
-  // Failure case: a::c is not a function.
-  // Res is nullptr. N remains unchanged.
-  {
-    EXPECT_FALSE(D.partialDemangle("_ZN1a1cE"));
-
-    size_t N = OriginalSize;
-    char *Res = D.getFunctionName(Buf, &N);
-    EXPECT_EQ(nullptr, Res);
-    EXPECT_EQ(OriginalSize, N);
-  }
-
-  std::free(Buf);
-}
diff --git a/gnu/llvm/llvm/unittests/Demangle/RustDemangleTest.cpp b/gnu/llvm/llvm/unittests/Demangle/RustDemangleTest.cpp
deleted file mode 100644
index 670e48ed216..00000000000
--- a/gnu/llvm/llvm/unittests/Demangle/RustDemangleTest.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-//===------------------ RustDemangleTest.cpp ------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Demangle/Demangle.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-#include <cstdlib>
-
-TEST(RustDemangle, Success) {
-  char *Demangled =
-      llvm::rustDemangle("_RNvC1a4main", nullptr, nullptr, nullptr);
-  EXPECT_STREQ(Demangled, "a::main");
-  std::free(Demangled);
-
-  // With status.
-  int Status = 0;
-  Demangled = llvm::rustDemangle("_RNvC1a4main", nullptr, nullptr, &Status);
-  EXPECT_EQ(Status, llvm::demangle_success);
-  EXPECT_STREQ(Demangled, "a::main");
-  std::free(Demangled);
-
-  // With status and length.
-  size_t N = 0;
-  Demangled = llvm::rustDemangle("_RNvC1a4main", nullptr, &N, &Status);
-  EXPECT_EQ(Status, llvm::demangle_success);
-  EXPECT_EQ(N, 8u);
-  EXPECT_STREQ(Demangled, "a::main");
-  std::free(Demangled);
-}
-
-TEST(RustDemangle, Invalid) {
-  int Status = 0;
-  char *Demangled = nullptr;
-
-  // Invalid prefix.
-  Demangled = llvm::rustDemangle("_ABCDEF", nullptr, nullptr, &Status);
-  EXPECT_EQ(Status, llvm::demangle_invalid_mangled_name);
-  EXPECT_EQ(Demangled, nullptr);
-
-  // Correct prefix but still invalid.
-  Demangled = llvm::rustDemangle("_RRR", nullptr, nullptr, &Status);
-  EXPECT_EQ(Status, llvm::demangle_invalid_mangled_name);
-  EXPECT_EQ(Demangled, nullptr);
-}
-
-TEST(RustDemangle, OutputBufferWithoutLength) {
-  char *Buffer = static_cast<char *>(std::malloc(1024));
-  ASSERT_NE(Buffer, nullptr);
-
-  int Status = 0;
-  char *Demangled =
-      llvm::rustDemangle("_RNvC1a4main", Buffer, nullptr, &Status);
-
-  EXPECT_EQ(Status, llvm::demangle_invalid_args);
-  EXPECT_EQ(Demangled, nullptr);
-  std::free(Buffer);
-}
-
-TEST(RustDemangle, OutputBuffer) {
-  size_t N = 1024;
-  char *Buffer = static_cast<char *>(std::malloc(N));
-  ASSERT_NE(Buffer, nullptr);
-
-  int Status = 0;
-  char *Demangled = llvm::rustDemangle("_RNvC1a4main", Buffer, &N, &Status);
-
-  EXPECT_EQ(Status, llvm::demangle_success);
-  EXPECT_EQ(Demangled, Buffer);
-  EXPECT_STREQ(Demangled, "a::main");
-  std::free(Demangled);
-}
-
-TEST(RustDemangle, SmallOutputBuffer) {
-  size_t N = 1;
-  char *Buffer = static_cast<char *>(std::malloc(N));
-  ASSERT_NE(Buffer, nullptr);
-
-  int Status = 0;
-  char *Demangled = llvm::rustDemangle("_RNvC1a4main", Buffer, &N, &Status);
-
-  EXPECT_EQ(Status, llvm::demangle_success);
-  EXPECT_STREQ(Demangled, "a::main");
-  std::free(Demangled);
-}
diff --git a/gnu/llvm/llvm/unittests/Demangle/StringViewTest.cpp b/gnu/llvm/llvm/unittests/Demangle/StringViewTest.cpp
deleted file mode 100644
index 8eaaaf62a4a..00000000000
--- a/gnu/llvm/llvm/unittests/Demangle/StringViewTest.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-//===- llvm/unittest/StringViewTest.cpp - StringView unit tests -----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Demangle/StringView.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using llvm::itanium_demangle::StringView;
-
-namespace llvm {
-namespace itanium_demangle {
-
-std::ostream &operator<<(std::ostream &OS, const StringView &S) {
-  return OS.write(S.begin(), S.size());
-}
-
-} // namespace itanium_demangle
-} // namespace llvm
-
-TEST(StringViewTest, EmptyInitializerList) {
-  StringView S = {};
-  EXPECT_TRUE(S.empty());
-
-  S = {};
-  EXPECT_TRUE(S.empty());
-}
-
-TEST(StringViewTest, Substr) {
-  StringView S("abcdef");
-
-  EXPECT_EQ("abcdef", S.substr(0));
-  EXPECT_EQ("f", S.substr(5));
-  EXPECT_EQ("", S.substr(6));
-
-  EXPECT_EQ("", S.substr(0, 0));
-  EXPECT_EQ("a", S.substr(0, 1));
-  EXPECT_EQ("abcde", S.substr(0, 5));
-  EXPECT_EQ("abcdef", S.substr(0, 6));
-  EXPECT_EQ("abcdef", S.substr(0, 7));
-
-  EXPECT_EQ("f", S.substr(5, 100));
-  EXPECT_EQ("", S.substr(6, 100));
-}
diff --git a/gnu/llvm/llvm/unittests/ExecutionEngine/CMakeLists.txt b/gnu/llvm/llvm/unittests/ExecutionEngine/CMakeLists.txt
deleted file mode 100644
index 1bf210556b6..00000000000
--- a/gnu/llvm/llvm/unittests/ExecutionEngine/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  Core
-  ExecutionEngine
-  Interpreter
-  MC
-  OrcJIT
-  RuntimeDyld
-  Support
-  )
-
-add_llvm_unittest(ExecutionEngineTests
-  ExecutionEngineTest.cpp
-  )
-
-add_subdirectory(JITLink)
-add_subdirectory(Orc)
-
-# Include MCJIT tests only if native arch is a built JIT target.
-list(FIND LLVM_TARGETS_TO_BUILD "${LLVM_NATIVE_ARCH}" build_idx)
-list(FIND LLVM_TARGETS_WITH_JIT "${LLVM_NATIVE_ARCH}" jit_idx)
-if (NOT build_idx LESS 0 AND NOT jit_idx LESS 0)
-  add_subdirectory(MCJIT)
-endif()
diff --git a/gnu/llvm/llvm/unittests/ExecutionEngine/ExecutionEngineTest.cpp b/gnu/llvm/llvm/unittests/ExecutionEngine/ExecutionEngineTest.cpp
deleted file mode 100644
index b92b3f6e984..00000000000
--- a/gnu/llvm/llvm/unittests/ExecutionEngine/ExecutionEngineTest.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-//===- ExecutionEngineTest.cpp - Unit tests for ExecutionEngine -----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ExecutionEngine/Interpreter.h"
-#include "llvm/ExecutionEngine/RTDyldMemoryManager.h"
-#include "llvm/IR/DerivedTypes.h"
-#include "llvm/IR/GlobalVariable.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Support/DynamicLibrary.h"
-#include "llvm/Support/ManagedStatic.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-class ExecutionEngineTest : public testing::Test {
-private:
-  llvm_shutdown_obj Y; // Call llvm_shutdown() on exit.
-
-protected:
-  ExecutionEngineTest() {
-    auto Owner = std::make_unique<Module>("<main>", Context);
-    M = Owner.get();
-    Engine.reset(EngineBuilder(std::move(Owner)).setErrorStr(&Error).create());
-  }
-
-  void SetUp() override {
-    ASSERT_TRUE(Engine.get() != nullptr) << "EngineBuilder returned error: '"
-      << Error << "'";
-  }
-
-  GlobalVariable *NewExtGlobal(Type *T, const Twine &Name) {
-    return new GlobalVariable(*M, T, false,  // Not constant.
-                              GlobalValue::ExternalLinkage, nullptr, Name);
-  }
-
-  std::string Error;
-  LLVMContext Context;
-  Module *M;  // Owned by ExecutionEngine.
-  std::unique_ptr<ExecutionEngine> Engine;
-};
-
-TEST_F(ExecutionEngineTest, ForwardGlobalMapping) {
-  GlobalVariable *G1 = NewExtGlobal(Type::getInt32Ty(Context), "Global1");
-  int32_t Mem1 = 3;
-  Engine->addGlobalMapping(G1, &Mem1);
-  EXPECT_EQ(&Mem1, Engine->getPointerToGlobalIfAvailable(G1));
-  EXPECT_EQ(&Mem1, Engine->getPointerToGlobalIfAvailable("Global1"));
-  int32_t Mem2 = 4;
-  Engine->updateGlobalMapping(G1, &Mem2);
-  EXPECT_EQ(&Mem2, Engine->getPointerToGlobalIfAvailable(G1));
-  Engine->updateGlobalMapping(G1, nullptr);
-  EXPECT_EQ(nullptr, Engine->getPointerToGlobalIfAvailable(G1));
-  Engine->updateGlobalMapping(G1, &Mem2);
-  EXPECT_EQ(&Mem2, Engine->getPointerToGlobalIfAvailable(G1));
-
-  GlobalVariable *G2 = NewExtGlobal(Type::getInt32Ty(Context), "Global1");
-  EXPECT_EQ(nullptr, Engine->getPointerToGlobalIfAvailable(G2))
-    << "The NULL return shouldn't depend on having called"
-    << " updateGlobalMapping(..., NULL)";
-  // Check that update...() can be called before add...().
-  Engine->updateGlobalMapping(G2, &Mem1);
-  EXPECT_EQ(&Mem1, Engine->getPointerToGlobalIfAvailable(G2));
-  EXPECT_EQ(&Mem2, Engine->getPointerToGlobalIfAvailable(G1))
-    << "A second mapping shouldn't affect the first.";
-}
-
-TEST_F(ExecutionEngineTest, ReverseGlobalMapping) {
-  GlobalVariable *G1 = NewExtGlobal(Type::getInt32Ty(Context), "Global1");
-
-  int32_t Mem1 = 3;
-  Engine->addGlobalMapping(G1, &Mem1);
-  EXPECT_EQ(G1, Engine->getGlobalValueAtAddress(&Mem1));
-  int32_t Mem2 = 4;
-  Engine->updateGlobalMapping(G1, &Mem2);
-  EXPECT_EQ(nullptr, Engine->getGlobalValueAtAddress(&Mem1));
-  EXPECT_EQ(G1, Engine->getGlobalValueAtAddress(&Mem2));
-
-  GlobalVariable *G2 = NewExtGlobal(Type::getInt32Ty(Context), "Global2");
-  Engine->updateGlobalMapping(G2, &Mem1);
-  EXPECT_EQ(G2, Engine->getGlobalValueAtAddress(&Mem1));
-  EXPECT_EQ(G1, Engine->getGlobalValueAtAddress(&Mem2));
-  Engine->updateGlobalMapping(G1, nullptr);
-  EXPECT_EQ(G2, Engine->getGlobalValueAtAddress(&Mem1))
-    << "Removing one mapping doesn't affect a different one.";
-  EXPECT_EQ(nullptr, Engine->getGlobalValueAtAddress(&Mem2));
-  Engine->updateGlobalMapping(G2, &Mem2);
-  EXPECT_EQ(nullptr, Engine->getGlobalValueAtAddress(&Mem1));
-  EXPECT_EQ(G2, Engine->getGlobalValueAtAddress(&Mem2))
-    << "Once a mapping is removed, we can point another GV at the"
-    << " now-free address.";
-}
-
-TEST_F(ExecutionEngineTest, ClearModuleMappings) {
-  GlobalVariable *G1 = NewExtGlobal(Type::getInt32Ty(Context), "Global1");
-
-  int32_t Mem1 = 3;
-  Engine->addGlobalMapping(G1, &Mem1);
-  EXPECT_EQ(G1, Engine->getGlobalValueAtAddress(&Mem1));
-
-  Engine->clearGlobalMappingsFromModule(M);
-
-  EXPECT_EQ(nullptr, Engine->getGlobalValueAtAddress(&Mem1));
-
-  GlobalVariable *G2 = NewExtGlobal(Type::getInt32Ty(Context), "Global2");
-  // After clearing the module mappings, we can assign a new GV to the
-  // same address.
-  Engine->addGlobalMapping(G2, &Mem1);
-  EXPECT_EQ(G2, Engine->getGlobalValueAtAddress(&Mem1));
-}
-
-TEST_F(ExecutionEngineTest, DestructionRemovesGlobalMapping) {
-  GlobalVariable *G1 = NewExtGlobal(Type::getInt32Ty(Context), "Global1");
-  int32_t Mem1 = 3;
-  Engine->addGlobalMapping(G1, &Mem1);
-  // Make sure the reverse mapping is enabled.
-  EXPECT_EQ(G1, Engine->getGlobalValueAtAddress(&Mem1));
-  // When the GV goes away, the ExecutionEngine should remove any
-  // mappings that refer to it.
-  G1->eraseFromParent();
-  EXPECT_EQ(nullptr, Engine->getGlobalValueAtAddress(&Mem1));
-}
-
-TEST_F(ExecutionEngineTest, LookupWithMangledAndDemangledSymbol) {
-  int x;
-  int _x;
-  llvm::sys::DynamicLibrary::AddSymbol("x", &x);
-  llvm::sys::DynamicLibrary::AddSymbol("_x", &_x);
-
-  // RTDyldMemoryManager::getSymbolAddressInProcess expects a mangled symbol,
-  // but DynamicLibrary is a wrapper for dlsym, which expects the unmangled C
-  // symbol name. This test verifies that getSymbolAddressInProcess strips the
-  // leading '_' on Darwin, but not on other platforms.
-#ifdef __APPLE__
-  EXPECT_EQ(reinterpret_cast<uint64_t>(&x),
-            RTDyldMemoryManager::getSymbolAddressInProcess("_x"));
-#else
-  EXPECT_EQ(reinterpret_cast<uint64_t>(&_x),
-            RTDyldMemoryManager::getSymbolAddressInProcess("_x"));
-#endif
-}
-
-}
diff --git a/gnu/llvm/llvm/unittests/ExecutionEngine/JITLink/CMakeLists.txt b/gnu/llvm/llvm/unittests/ExecutionEngine/JITLink/CMakeLists.txt
deleted file mode 100644
index 58aacfc25bf..00000000000
--- a/gnu/llvm/llvm/unittests/ExecutionEngine/JITLink/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
-  JITLink
-  Object
-  OrcShared
-  OrcTargetProcess
-  RuntimeDyld
-  Support
-  )
-
-add_llvm_unittest(JITLinkTests
-    LinkGraphTests.cpp
-  )
-
-target_link_libraries(JITLinkTests PRIVATE LLVMTestingSupport)
diff --git a/gnu/llvm/llvm/unittests/ExecutionEngine/JITLink/LinkGraphTests.cpp b/gnu/llvm/llvm/unittests/ExecutionEngine/JITLink/LinkGraphTests.cpp
deleted file mode 100644
index 2771176880f..00000000000
--- a/gnu/llvm/llvm/unittests/ExecutionEngine/JITLink/LinkGraphTests.cpp
+++ /dev/null
@@ -1,529 +0,0 @@
-//===------ LinkGraphTests.cpp - Unit tests for core JITLink classes ------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ExecutionEngine/JITLink/JITLink.h"
-#include "llvm/Support/Endian.h"
-#include "llvm/Support/Memory.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::jitlink;
-
-static auto RWFlags =
-    sys::Memory::ProtectionFlags(sys::Memory::MF_READ | sys::Memory::MF_WRITE);
-
-static const char BlockContentBytes[] = {
-    0x54, 0x68, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x73, 0x20, 0x6d, 0x6f,
-    0x76, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x20, 0x61, 0x74, 0x20, 0x74, 0x68,
-    0x65, 0x20, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2c, 0x20, 0x66,
-    0x6f, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, 0x77, 0x6f, 0x72, 0x64, 0x20,
-    0x68, 0x61, 0x64, 0x20, 0x70, 0x61, 0x73, 0x73, 0x65, 0x64, 0x20, 0x61,
-    0x72, 0x6f, 0x75, 0x6e, 0x64, 0x0a, 0x54, 0x68, 0x61, 0x74, 0x20, 0x74,
-    0x68, 0x65, 0x20, 0x63, 0x6f, 0x6c, 0x74, 0x20, 0x66, 0x72, 0x6f, 0x6d,
-    0x20, 0x4f, 0x6c, 0x64, 0x20, 0x52, 0x65, 0x67, 0x72, 0x65, 0x74, 0x20,
-    0x68, 0x61, 0x64, 0x20, 0x67, 0x6f, 0x74, 0x20, 0x61, 0x77, 0x61, 0x79,
-    0x2c, 0x0a, 0x41, 0x6e, 0x64, 0x20, 0x68, 0x61, 0x64, 0x20, 0x6a, 0x6f,
-    0x69, 0x6e, 0x65, 0x64, 0x20, 0x74, 0x68, 0x65, 0x20, 0x77, 0x69, 0x6c,
-    0x64, 0x20, 0x62, 0x75, 0x73, 0x68, 0x20, 0x68, 0x6f, 0x72, 0x73, 0x65,
-    0x73, 0x20, 0x2d, 0x2d, 0x20, 0x68, 0x65, 0x20, 0x77, 0x61, 0x73, 0x20,
-    0x77, 0x6f, 0x72, 0x74, 0x68, 0x20, 0x61, 0x20, 0x74, 0x68, 0x6f, 0x75,
-    0x73, 0x61, 0x6e, 0x64, 0x20, 0x70, 0x6f, 0x75, 0x6e, 0x64, 0x2c, 0x0a,
-    0x53, 0x6f, 0x20, 0x61, 0x6c, 0x6c, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63,
-    0x72, 0x61, 0x63, 0x6b, 0x73, 0x20, 0x68, 0x61, 0x64, 0x20, 0x67, 0x61,
-    0x74, 0x68, 0x65, 0x72, 0x65, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x74, 0x68,
-    0x65, 0x20, 0x66, 0x72, 0x61, 0x79, 0x2e, 0x0a, 0x41, 0x6c, 0x6c, 0x20,
-    0x74, 0x68, 0x65, 0x20, 0x74, 0x72, 0x69, 0x65, 0x64, 0x20, 0x61, 0x6e,
-    0x64, 0x20, 0x6e, 0x6f, 0x74, 0x65, 0x64, 0x20, 0x72, 0x69, 0x64, 0x65,
-    0x72, 0x73, 0x20, 0x66, 0x72, 0x6f, 0x6d, 0x20, 0x74, 0x68, 0x65, 0x20,
-    0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x6e, 0x65, 0x61,
-    0x72, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x66, 0x61, 0x72, 0x0a, 0x48, 0x61,
-    0x64, 0x20, 0x6d, 0x75, 0x73, 0x74, 0x65, 0x72, 0x65, 0x64, 0x20, 0x61,
-    0x74, 0x20, 0x74, 0x68, 0x65, 0x20, 0x68, 0x6f, 0x6d, 0x65, 0x73, 0x74,
-    0x65, 0x61, 0x64, 0x20, 0x6f, 0x76, 0x65, 0x72, 0x6e, 0x69, 0x67, 0x68,
-    0x74, 0x2c, 0x0a, 0x46, 0x6f, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, 0x62,
-    0x75, 0x73, 0x68, 0x6d, 0x65, 0x6e, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x20,
-    0x68, 0x61, 0x72, 0x64, 0x20, 0x72, 0x69, 0x64, 0x69, 0x6e, 0x67, 0x20,
-    0x77, 0x68, 0x65, 0x72, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x77, 0x69,
-    0x6c, 0x64, 0x20, 0x62, 0x75, 0x73, 0x68, 0x20, 0x68, 0x6f, 0x72, 0x73,
-    0x65, 0x73, 0x20, 0x61, 0x72, 0x65, 0x2c, 0x0a, 0x41, 0x6e, 0x64, 0x20,
-    0x74, 0x68, 0x65, 0x20, 0x73, 0x74, 0x6f, 0x63, 0x6b, 0x2d, 0x68, 0x6f,
-    0x72, 0x73, 0x65, 0x20, 0x73, 0x6e, 0x75, 0x66, 0x66, 0x73, 0x20, 0x74,
-    0x68, 0x65, 0x20, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x20, 0x77, 0x69,
-    0x74, 0x68, 0x20, 0x64, 0x65, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x2e, 0x00};
-
-static ArrayRef<char> BlockContent(BlockContentBytes);
-
-TEST(LinkGraphTest, Construction) {
-  // Check that LinkGraph construction works as expected.
-  LinkGraph G("foo", Triple("x86_64-apple-darwin"), 8, support::little,
-              getGenericEdgeKindName);
-  EXPECT_EQ(G.getName(), "foo");
-  EXPECT_EQ(G.getTargetTriple().str(), "x86_64-apple-darwin");
-  EXPECT_EQ(G.getPointerSize(), 8U);
-  EXPECT_EQ(G.getEndianness(), support::little);
-  EXPECT_TRUE(llvm::empty(G.external_symbols()));
-  EXPECT_TRUE(llvm::empty(G.absolute_symbols()));
-  EXPECT_TRUE(llvm::empty(G.defined_symbols()));
-  EXPECT_TRUE(llvm::empty(G.blocks()));
-}
-
-TEST(LinkGraphTest, AddressAccess) {
-  // Check that we can get addresses for blocks, symbols, and edges.
-  LinkGraph G("foo", Triple("x86_64-apple-darwin"), 8, support::little,
-              getGenericEdgeKindName);
-
-  auto &Sec1 = G.createSection("__data.1", RWFlags);
-  auto &B1 = G.createContentBlock(Sec1, BlockContent, 0x1000, 8, 0);
-  auto &S1 = G.addDefinedSymbol(B1, 4, "S1", 4, Linkage::Strong, Scope::Default,
-                                false, false);
-  B1.addEdge(Edge::FirstRelocation, 8, S1, 0);
-  auto &E1 = *B1.edges().begin();
-
-  EXPECT_EQ(B1.getAddress(), 0x1000U) << "Incorrect block address";
-  EXPECT_EQ(S1.getAddress(), 0x1004U) << "Incorrect symbol address";
-  EXPECT_EQ(B1.getFixupAddress(E1), 0x1008U) << "Incorrect fixup address";
-}
-
-TEST(LinkGraphTest, BlockAndSymbolIteration) {
-  // Check that we can iterate over blocks within Sections and across sections.
-  LinkGraph G("foo", Triple("x86_64-apple-darwin"), 8, support::little,
-              getGenericEdgeKindName);
-  auto &Sec1 = G.createSection("__data.1", RWFlags);
-  auto &B1 = G.createContentBlock(Sec1, BlockContent, 0x1000, 8, 0);
-  auto &B2 = G.createContentBlock(Sec1, BlockContent, 0x2000, 8, 0);
-  auto &S1 = G.addDefinedSymbol(B1, 0, "S1", 4, Linkage::Strong, Scope::Default,
-                                false, false);
-  auto &S2 = G.addDefinedSymbol(B2, 4, "S2", 4, Linkage::Strong, Scope::Default,
-                                false, false);
-
-  auto &Sec2 = G.createSection("__data.2", RWFlags);
-  auto &B3 = G.createContentBlock(Sec2, BlockContent, 0x3000, 8, 0);
-  auto &B4 = G.createContentBlock(Sec2, BlockContent, 0x4000, 8, 0);
-  auto &S3 = G.addDefinedSymbol(B3, 0, "S3", 4, Linkage::Strong, Scope::Default,
-                                false, false);
-  auto &S4 = G.addDefinedSymbol(B4, 4, "S4", 4, Linkage::Strong, Scope::Default,
-                                false, false);
-
-  // Check that iteration of blocks within a section behaves as expected.
-  EXPECT_EQ(std::distance(Sec1.blocks().begin(), Sec1.blocks().end()), 2);
-  EXPECT_TRUE(llvm::count(Sec1.blocks(), &B1));
-  EXPECT_TRUE(llvm::count(Sec1.blocks(), &B2));
-
-  // Check that iteration of symbols within a section behaves as expected.
-  EXPECT_EQ(std::distance(Sec1.symbols().begin(), Sec1.symbols().end()), 2);
-  EXPECT_TRUE(llvm::count(Sec1.symbols(), &S1));
-  EXPECT_TRUE(llvm::count(Sec1.symbols(), &S2));
-
-  // Check that iteration of blocks across sections behaves as expected.
-  EXPECT_EQ(std::distance(G.blocks().begin(), G.blocks().end()), 4);
-  EXPECT_TRUE(llvm::count(G.blocks(), &B1));
-  EXPECT_TRUE(llvm::count(G.blocks(), &B2));
-  EXPECT_TRUE(llvm::count(G.blocks(), &B3));
-  EXPECT_TRUE(llvm::count(G.blocks(), &B4));
-
-  // Check that iteration of defined symbols across sections behaves as
-  // expected.
-  EXPECT_EQ(
-      std::distance(G.defined_symbols().begin(), G.defined_symbols().end()), 4);
-  EXPECT_TRUE(llvm::count(G.defined_symbols(), &S1));
-  EXPECT_TRUE(llvm::count(G.defined_symbols(), &S2));
-  EXPECT_TRUE(llvm::count(G.defined_symbols(), &S3));
-  EXPECT_TRUE(llvm::count(G.defined_symbols(), &S4));
-}
-
-TEST(LinkGraphTest, ContentAccessAndUpdate) {
-  // Check that we can make a defined symbol external.
-  LinkGraph G("foo", Triple("x86_64-apple-darwin"), 8, support::little,
-              getGenericEdgeKindName);
-  auto &Sec = G.createSection("__data", RWFlags);
-
-  // Create an initial block.
-  auto &B = G.createContentBlock(Sec, BlockContent, 0x1000, 8, 0);
-
-  EXPECT_FALSE(B.isContentMutable()) << "Content unexpectedly mutable";
-  EXPECT_EQ(B.getContent().data(), BlockContent.data())
-      << "Unexpected block content data pointer";
-  EXPECT_EQ(B.getContent().size(), BlockContent.size())
-      << "Unexpected block content size";
-
-  // Expect that attempting to get already-mutable content fails if the
-  // content is not yet mutable (debug builds only).
-#ifndef NDEBUG
-  EXPECT_DEATH({ (void)B.getAlreadyMutableContent(); },
-               "Content is not mutable")
-      << "Unexpected mutable access allowed to immutable data";
-#endif
-
-  // Check that mutable content is copied on request as expected.
-  auto MutableContent = B.getMutableContent(G);
-  EXPECT_TRUE(B.isContentMutable()) << "Content unexpectedly immutable";
-  EXPECT_NE(MutableContent.data(), BlockContent.data())
-      << "Unexpected mutable content data pointer";
-  EXPECT_EQ(MutableContent.size(), BlockContent.size())
-      << "Unexpected mutable content size";
-  EXPECT_TRUE(std::equal(MutableContent.begin(), MutableContent.end(),
-                         BlockContent.begin()))
-      << "Unexpected mutable content value";
-
-  // Check that already-mutable content behaves as expected, with no
-  // further copies.
-  auto MutableContent2 = B.getMutableContent(G);
-  EXPECT_TRUE(B.isContentMutable()) << "Content unexpectedly immutable";
-  EXPECT_EQ(MutableContent2.data(), MutableContent.data())
-      << "Unexpected mutable content 2 data pointer";
-  EXPECT_EQ(MutableContent2.size(), MutableContent.size())
-      << "Unexpected mutable content 2 size";
-
-  // Check that getAlreadyMutableContent behaves as expected, with no
-  // further copies.
-  auto MutableContent3 = B.getMutableContent(G);
-  EXPECT_TRUE(B.isContentMutable()) << "Content unexpectedly immutable";
-  EXPECT_EQ(MutableContent3.data(), MutableContent.data())
-      << "Unexpected mutable content 2 data pointer";
-  EXPECT_EQ(MutableContent3.size(), MutableContent.size())
-      << "Unexpected mutable content 2 size";
-
-  // Set content back to immutable and check that everything behaves as
-  // expected again.
-  B.setContent(BlockContent);
-  EXPECT_FALSE(B.isContentMutable()) << "Content unexpectedly mutable";
-  EXPECT_EQ(B.getContent().data(), BlockContent.data())
-      << "Unexpected block content data pointer";
-  EXPECT_EQ(B.getContent().size(), BlockContent.size())
-      << "Unexpected block content size";
-
-  // Create an initially mutable block.
-  auto &B2 = G.createMutableContentBlock(Sec, MutableContent, 0x10000, 8, 0);
-
-  EXPECT_TRUE(B2.isContentMutable()) << "Expected B2 content to be mutable";
-}
-
-TEST(LinkGraphTest, MakeExternal) {
-  // Check that we can make a defined symbol external.
-  LinkGraph G("foo", Triple("x86_64-apple-darwin"), 8, support::little,
-              getGenericEdgeKindName);
-  auto &Sec = G.createSection("__data", RWFlags);
-
-  // Create an initial block.
-  auto &B1 = G.createContentBlock(Sec, BlockContent, 0x1000, 8, 0);
-
-  // Add a symbol to the block.
-  auto &S1 = G.addDefinedSymbol(B1, 0, "S1", 4, Linkage::Strong, Scope::Default,
-                                false, false);
-
-  EXPECT_TRUE(S1.isDefined()) << "Symbol should be defined";
-  EXPECT_FALSE(S1.isExternal()) << "Symbol should not be external";
-  EXPECT_FALSE(S1.isAbsolute()) << "Symbol should not be absolute";
-  EXPECT_TRUE(&S1.getBlock()) << "Symbol should have a non-null block";
-  EXPECT_EQ(S1.getAddress(), 0x1000U) << "Unexpected symbol address";
-
-  EXPECT_EQ(
-      std::distance(G.defined_symbols().begin(), G.defined_symbols().end()), 1U)
-      << "Unexpected number of defined symbols";
-  EXPECT_EQ(
-      std::distance(G.external_symbols().begin(), G.external_symbols().end()),
-      0U)
-      << "Unexpected number of external symbols";
-
-  // Make S1 external, confirm that the its flags are updated and that it is
-  // moved from the defined symbols to the externals list.
-  G.makeExternal(S1);
-
-  EXPECT_FALSE(S1.isDefined()) << "Symbol should not be defined";
-  EXPECT_TRUE(S1.isExternal()) << "Symbol should be external";
-  EXPECT_FALSE(S1.isAbsolute()) << "Symbol should not be absolute";
-  EXPECT_EQ(S1.getAddress(), 0U) << "Unexpected symbol address";
-
-  EXPECT_EQ(
-      std::distance(G.defined_symbols().begin(), G.defined_symbols().end()), 0U)
-      << "Unexpected number of defined symbols";
-  EXPECT_EQ(
-      std::distance(G.external_symbols().begin(), G.external_symbols().end()),
-      1U)
-      << "Unexpected number of external symbols";
-}
-
-TEST(LinkGraphTest, MakeDefined) {
-  // Check that we can make an external symbol defined.
-  LinkGraph G("foo", Triple("x86_64-apple-darwin"), 8, support::little,
-              getGenericEdgeKindName);
-  auto &Sec = G.createSection("__data", RWFlags);
-
-  // Create an initial block.
-  auto &B1 = G.createContentBlock(Sec, BlockContent, 0x1000, 8, 0);
-
-  // Add an external symbol.
-  auto &S1 = G.addExternalSymbol("S1", 4, Linkage::Strong);
-
-  EXPECT_FALSE(S1.isDefined()) << "Symbol should not be defined";
-  EXPECT_TRUE(S1.isExternal()) << "Symbol should be external";
-  EXPECT_FALSE(S1.isAbsolute()) << "Symbol should not be absolute";
-  EXPECT_EQ(S1.getAddress(), 0U) << "Unexpected symbol address";
-
-  EXPECT_EQ(
-      std::distance(G.defined_symbols().begin(), G.defined_symbols().end()), 0U)
-      << "Unexpected number of defined symbols";
-  EXPECT_EQ(
-      std::distance(G.external_symbols().begin(), G.external_symbols().end()),
-      1U)
-      << "Unexpected number of external symbols";
-
-  // Make S1 defined, confirm that its flags are updated and that it is
-  // moved from the defined symbols to the externals list.
-  G.makeDefined(S1, B1, 0, 4, Linkage::Strong, Scope::Default, false);
-
-  EXPECT_TRUE(S1.isDefined()) << "Symbol should be defined";
-  EXPECT_FALSE(S1.isExternal()) << "Symbol should not be external";
-  EXPECT_FALSE(S1.isAbsolute()) << "Symbol should not be absolute";
-  EXPECT_TRUE(&S1.getBlock()) << "Symbol should have a non-null block";
-  EXPECT_EQ(S1.getAddress(), 0x1000U) << "Unexpected symbol address";
-
-  EXPECT_EQ(
-      std::distance(G.defined_symbols().begin(), G.defined_symbols().end()), 1U)
-      << "Unexpected number of defined symbols";
-  EXPECT_EQ(
-      std::distance(G.external_symbols().begin(), G.external_symbols().end()),
-      0U)
-      << "Unexpected number of external symbols";
-}
-
-TEST(LinkGraphTest, TransferDefinedSymbol) {
-  // Check that we can transfer a defined symbol from one block to another.
-  LinkGraph G("foo", Triple("x86_64-apple-darwin"), 8, support::little,
-              getGenericEdgeKindName);
-  auto &Sec = G.createSection("__data", RWFlags);
-
-  // Create an initial block.
-  auto &B1 = G.createContentBlock(Sec, BlockContent, 0x1000, 8, 0);
-  auto &B2 = G.createContentBlock(Sec, BlockContent, 0x2000, 8, 0);
-  auto &B3 = G.createContentBlock(Sec, BlockContent.slice(0, 32), 0x3000, 8, 0);
-
-  // Add a symbol.
-  auto &S1 = G.addDefinedSymbol(B1, 0, "S1", B1.getSize(), Linkage::Strong,
-                                Scope::Default, false, false);
-
-  // Transfer with zero offset, explicit size.
-  G.transferDefinedSymbol(S1, B2, 0, 64);
-
-  EXPECT_EQ(&S1.getBlock(), &B2) << "Block was not updated";
-  EXPECT_EQ(S1.getOffset(), 0U) << "Unexpected offset";
-  EXPECT_EQ(S1.getSize(), 64U) << "Size was not updated";
-
-  // Transfer with non-zero offset, implicit truncation.
-  G.transferDefinedSymbol(S1, B3, 16, None);
-
-  EXPECT_EQ(&S1.getBlock(), &B3) << "Block was not updated";
-  EXPECT_EQ(S1.getOffset(), 16U) << "Offset was not updated";
-  EXPECT_EQ(S1.getSize(), 16U) << "Size was not updated";
-}
-
-TEST(LinkGraphTest, TransferBlock) {
-  // Check that we can transfer a block (and all associated symbols) from one
-  // section to another.
-  LinkGraph G("foo", Triple("x86_64-apple-darwin"), 8, support::little,
-              getGenericEdgeKindName);
-  auto &Sec1 = G.createSection("__data.1", RWFlags);
-  auto &Sec2 = G.createSection("__data.2", RWFlags);
-
-  // Create an initial block.
-  auto &B1 = G.createContentBlock(Sec1, BlockContent, 0x1000, 8, 0);
-  auto &B2 = G.createContentBlock(Sec1, BlockContent, 0x2000, 8, 0);
-
-  // Add some symbols on B1...
-  G.addDefinedSymbol(B1, 0, "S1", B1.getSize(), Linkage::Strong, Scope::Default,
-                     false, false);
-  G.addDefinedSymbol(B1, 1, "S2", B1.getSize() - 1, Linkage::Strong,
-                     Scope::Default, false, false);
-
-  // ... and on B2.
-  G.addDefinedSymbol(B2, 0, "S3", B2.getSize(), Linkage::Strong, Scope::Default,
-                     false, false);
-  G.addDefinedSymbol(B2, 1, "S4", B2.getSize() - 1, Linkage::Strong,
-                     Scope::Default, false, false);
-
-  EXPECT_EQ(Sec1.blocks_size(), 2U) << "Expected two blocks in Sec1 initially";
-  EXPECT_EQ(Sec1.symbols_size(), 4U)
-      << "Expected four symbols in Sec1 initially";
-  EXPECT_EQ(Sec2.blocks_size(), 0U) << "Expected zero blocks in Sec2 initially";
-  EXPECT_EQ(Sec2.symbols_size(), 0U)
-      << "Expected zero symbols in Sec2 initially";
-
-  // Transfer with zero offset, explicit size.
-  G.transferBlock(B1, Sec2);
-
-  EXPECT_EQ(Sec1.blocks_size(), 1U)
-      << "Expected one blocks in Sec1 after transfer";
-  EXPECT_EQ(Sec1.symbols_size(), 2U)
-      << "Expected two symbols in Sec1 after transfer";
-  EXPECT_EQ(Sec2.blocks_size(), 1U)
-      << "Expected one blocks in Sec2 after transfer";
-  EXPECT_EQ(Sec2.symbols_size(), 2U)
-      << "Expected two symbols in Sec2 after transfer";
-}
-
-TEST(LinkGraphTest, MergeSections) {
-  // Check that we can transfer a block (and all associated symbols) from one
-  // section to another.
-  LinkGraph G("foo", Triple("x86_64-apple-darwin"), 8, support::little,
-              getGenericEdgeKindName);
-  auto &Sec1 = G.createSection("__data.1", RWFlags);
-  auto &Sec2 = G.createSection("__data.2", RWFlags);
-  auto &Sec3 = G.createSection("__data.3", RWFlags);
-
-  // Create an initial block.
-  auto &B1 = G.createContentBlock(Sec1, BlockContent, 0x1000, 8, 0);
-  auto &B2 = G.createContentBlock(Sec2, BlockContent, 0x2000, 8, 0);
-  auto &B3 = G.createContentBlock(Sec3, BlockContent, 0x3000, 8, 0);
-
-  // Add a symbols for each block.
-  G.addDefinedSymbol(B1, 0, "S1", B1.getSize(), Linkage::Strong, Scope::Default,
-                     false, false);
-  G.addDefinedSymbol(B2, 0, "S2", B2.getSize(), Linkage::Strong, Scope::Default,
-                     false, false);
-  G.addDefinedSymbol(B3, 0, "S3", B2.getSize(), Linkage::Strong, Scope::Default,
-                     false, false);
-
-  EXPECT_EQ(G.sections_size(), 3U) << "Expected three sections initially";
-  EXPECT_EQ(Sec1.blocks_size(), 1U) << "Expected one block in Sec1 initially";
-  EXPECT_EQ(Sec1.symbols_size(), 1U) << "Expected one symbol in Sec1 initially";
-  EXPECT_EQ(Sec2.blocks_size(), 1U) << "Expected one block in Sec2 initially";
-  EXPECT_EQ(Sec2.symbols_size(), 1U) << "Expected one symbol in Sec2 initially";
-  EXPECT_EQ(Sec3.blocks_size(), 1U) << "Expected one block in Sec3 initially";
-  EXPECT_EQ(Sec3.symbols_size(), 1U) << "Expected one symbol in Sec3 initially";
-
-  // Check that self-merge is a no-op.
-  G.mergeSections(Sec1, Sec1);
-
-  EXPECT_EQ(G.sections_size(), 3U)
-      << "Expected three sections after first merge";
-  EXPECT_EQ(Sec1.blocks_size(), 1U)
-      << "Expected one block in Sec1 after first merge";
-  EXPECT_EQ(Sec1.symbols_size(), 1U)
-      << "Expected one symbol in Sec1 after first merge";
-  EXPECT_EQ(Sec2.blocks_size(), 1U)
-      << "Expected one block in Sec2 after first merge";
-  EXPECT_EQ(Sec2.symbols_size(), 1U)
-      << "Expected one symbol in Sec2 after first merge";
-  EXPECT_EQ(Sec3.blocks_size(), 1U)
-      << "Expected one block in Sec3 after first merge";
-  EXPECT_EQ(Sec3.symbols_size(), 1U)
-      << "Expected one symbol in Sec3 after first merge";
-
-  // Merge Sec2 into Sec1, removing Sec2.
-  G.mergeSections(Sec1, Sec2);
-
-  EXPECT_EQ(G.sections_size(), 2U)
-      << "Expected two sections after section merge";
-  EXPECT_EQ(Sec1.blocks_size(), 2U)
-      << "Expected two blocks in Sec1 after section merge";
-  EXPECT_EQ(Sec1.symbols_size(), 2U)
-      << "Expected two symbols in Sec1 after section merge";
-  EXPECT_EQ(Sec3.blocks_size(), 1U)
-      << "Expected one block in Sec3 after section merge";
-  EXPECT_EQ(Sec3.symbols_size(), 1U)
-      << "Expected one symbol in Sec3 after section merge";
-
-  G.mergeSections(Sec1, Sec3, true);
-
-  EXPECT_EQ(G.sections_size(), 2U) << "Expected two sections after third merge";
-  EXPECT_EQ(Sec1.blocks_size(), 3U)
-      << "Expected three blocks in Sec1 after third merge";
-  EXPECT_EQ(Sec1.symbols_size(), 3U)
-      << "Expected three symbols in Sec1 after third merge";
-  EXPECT_EQ(Sec3.blocks_size(), 0U)
-      << "Expected one block in Sec3 after third merge";
-  EXPECT_EQ(Sec3.symbols_size(), 0U)
-      << "Expected one symbol in Sec3 after third merge";
-}
-
-TEST(LinkGraphTest, SplitBlock) {
-  // Check that the LinkGraph::splitBlock test works as expected.
-  LinkGraph G("foo", Triple("x86_64-apple-darwin"), 8, support::little,
-              getGenericEdgeKindName);
-  auto &Sec = G.createSection("__data", RWFlags);
-
-  // Create the block to split.
-  auto &B1 = G.createContentBlock(Sec, BlockContent, 0x1000, 8, 0);
-
-  // Add some symbols to the block.
-  auto &S1 = G.addDefinedSymbol(B1, 0, "S1", 4, Linkage::Strong, Scope::Default,
-                                false, false);
-  auto &S2 = G.addDefinedSymbol(B1, 4, "S2", 4, Linkage::Strong, Scope::Default,
-                                false, false);
-  auto &S3 = G.addDefinedSymbol(B1, 8, "S3", 4, Linkage::Strong, Scope::Default,
-                                false, false);
-  auto &S4 = G.addDefinedSymbol(B1, 12, "S4", 4, Linkage::Strong,
-                                Scope::Default, false, false);
-
-  // Add an extra block, EB, and target symbols, and use these to add edges
-  // from B1 to EB.
-  auto &EB = G.createContentBlock(Sec, BlockContent, 0x2000, 8, 0);
-  auto &ES1 = G.addDefinedSymbol(EB, 0, "TS1", 4, Linkage::Strong,
-                                 Scope::Default, false, false);
-  auto &ES2 = G.addDefinedSymbol(EB, 4, "TS2", 4, Linkage::Strong,
-                                 Scope::Default, false, false);
-  auto &ES3 = G.addDefinedSymbol(EB, 8, "TS3", 4, Linkage::Strong,
-                                 Scope::Default, false, false);
-  auto &ES4 = G.addDefinedSymbol(EB, 12, "TS4", 4, Linkage::Strong,
-                                 Scope::Default, false, false);
-
-  // Add edges from B1 to EB.
-  B1.addEdge(Edge::FirstRelocation, 0, ES1, 0);
-  B1.addEdge(Edge::FirstRelocation, 4, ES2, 0);
-  B1.addEdge(Edge::FirstRelocation, 8, ES3, 0);
-  B1.addEdge(Edge::FirstRelocation, 12, ES4, 0);
-
-  // Split B1.
-  auto &B2 = G.splitBlock(B1, 8);
-
-  // Check that the block addresses and content matches what we would expect.
-  EXPECT_EQ(B1.getAddress(), 0x1008U);
-  EXPECT_EQ(B1.getContent(), BlockContent.slice(8));
-
-  EXPECT_EQ(B2.getAddress(), 0x1000U);
-  EXPECT_EQ(B2.getContent(), BlockContent.slice(0, 8));
-
-  // Check that symbols in B1 were transferred as expected:
-  // We expect S1 and S2 to have been transferred to B2, and S3 and S4 to have
-  // remained attached to B1. Symbols S3 and S4 should have had their offsets
-  // slid to account for the change in address of B2.
-  EXPECT_EQ(&S1.getBlock(), &B2);
-  EXPECT_EQ(S1.getOffset(), 0U);
-
-  EXPECT_EQ(&S2.getBlock(), &B2);
-  EXPECT_EQ(S2.getOffset(), 4U);
-
-  EXPECT_EQ(&S3.getBlock(), &B1);
-  EXPECT_EQ(S3.getOffset(), 0U);
-
-  EXPECT_EQ(&S4.getBlock(), &B1);
-  EXPECT_EQ(S4.getOffset(), 4U);
-
-  // Check that edges in B1 have been transferred as expected:
-  // Both blocks should now have two edges each at offsets 0 and 4.
-  EXPECT_EQ(llvm::size(B1.edges()), 2);
-  if (size(B1.edges()) == 2) {
-    auto *E1 = &*B1.edges().begin();
-    auto *E2 = &*(B1.edges().begin() + 1);
-    if (E2->getOffset() < E1->getOffset())
-      std::swap(E1, E2);
-    EXPECT_EQ(E1->getOffset(), 0U);
-    EXPECT_EQ(E2->getOffset(), 4U);
-  }
-
-  EXPECT_EQ(llvm::size(B2.edges()), 2);
-  if (size(B2.edges()) == 2) {
-    auto *E1 = &*B2.edges().begin();
-    auto *E2 = &*(B2.edges().begin() + 1);
-    if (E2->getOffset() < E1->getOffset())
-      std::swap(E1, E2);
-    EXPECT_EQ(E1->getOffset(), 0U);
-    EXPECT_EQ(E2->getOffset(), 4U);
-  }
-}
diff --git a/gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/CMakeLists.txt b/gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/CMakeLists.txt
deleted file mode 100644
index b5f8a14c41c..00000000000
--- a/gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/CMakeLists.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  Analysis
-  Core
-  ExecutionEngine
-  IPO
-  InstCombine
-  MC
-  MCJIT
-  RuntimeDyld
-  ScalarOpts
-  Support
-  Target
-  nativecodegen
-  )
-
-set(MCJITTestsSources
-  MCJITTest.cpp
-  MCJITCAPITest.cpp
-  MCJITMemoryManagerTest.cpp
-  MCJITMultipleModuleTest.cpp
-  MCJITObjectCacheTest.cpp
-  )
-
-if(MSVC)
-  list(APPEND MCJITTestsSources MCJITTests.def)
-endif()
-
-add_llvm_unittest(MCJITTests
-  ${MCJITTestsSources}
-  )
-
-if(MINGW OR CYGWIN)
-  set_property(TARGET MCJITTests PROPERTY LINK_FLAGS -Wl,--export-all-symbols)
-endif()
diff --git a/gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/MCJITCAPITest.cpp b/gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/MCJITCAPITest.cpp
deleted file mode 100644
index 09c48dfc865..00000000000
--- a/gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/MCJITCAPITest.cpp
+++ /dev/null
@@ -1,512 +0,0 @@
-//===- MCJITTest.cpp - Unit tests for the MCJIT -----------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This test suite verifies basic MCJIT functionality when invoked form the C
-// API.
-//
-//===----------------------------------------------------------------------===//
-
-#include "MCJITTestAPICommon.h"
-#include "llvm-c/Analysis.h"
-#include "llvm-c/Core.h"
-#include "llvm-c/ExecutionEngine.h"
-#include "llvm-c/Target.h"
-#include "llvm-c/Transforms/PassManagerBuilder.h"
-#include "llvm-c/Transforms/Scalar.h"
-#include "llvm/ExecutionEngine/SectionMemoryManager.h"
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/Host.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-static bool didCallAllocateCodeSection;
-static bool didAllocateCompactUnwindSection;
-static bool didCallYield;
-
-static uint8_t *roundTripAllocateCodeSection(void *object, uintptr_t size,
-                                             unsigned alignment,
-                                             unsigned sectionID,
-                                             const char *sectionName) {
-  didCallAllocateCodeSection = true;
-  return static_cast<SectionMemoryManager*>(object)->allocateCodeSection(
-    size, alignment, sectionID, sectionName);
-}
-
-static uint8_t *roundTripAllocateDataSection(void *object, uintptr_t size,
-                                             unsigned alignment,
-                                             unsigned sectionID,
-                                             const char *sectionName,
-                                             LLVMBool isReadOnly) {
-  if (!strcmp(sectionName, "__compact_unwind"))
-    didAllocateCompactUnwindSection = true;
-  return static_cast<SectionMemoryManager*>(object)->allocateDataSection(
-    size, alignment, sectionID, sectionName, isReadOnly);
-}
-
-static LLVMBool roundTripFinalizeMemory(void *object, char **errMsg) {
-  std::string errMsgString;
-  bool result =
-    static_cast<SectionMemoryManager*>(object)->finalizeMemory(&errMsgString);
-  if (result) {
-    *errMsg = LLVMCreateMessage(errMsgString.c_str());
-    return 1;
-  }
-  return 0;
-}
-
-static void roundTripDestroy(void *object) {
-  delete static_cast<SectionMemoryManager*>(object);
-}
-
-static void yield(LLVMContextRef, void *) {
-  didCallYield = true;
-}
-
-namespace {
-
-// memory manager to test reserve allocation space callback
-class TestReserveAllocationSpaceMemoryManager: public SectionMemoryManager {
-public:
-  uintptr_t ReservedCodeSize;
-  uintptr_t UsedCodeSize;
-  uintptr_t ReservedDataSizeRO;
-  uintptr_t UsedDataSizeRO;
-  uintptr_t ReservedDataSizeRW;
-  uintptr_t UsedDataSizeRW;
-  
-  TestReserveAllocationSpaceMemoryManager() : 
-    ReservedCodeSize(0), UsedCodeSize(0), ReservedDataSizeRO(0), 
-    UsedDataSizeRO(0), ReservedDataSizeRW(0), UsedDataSizeRW(0) {    
-  }
-
-  bool needsToReserveAllocationSpace() override { return true; }
-
-  void reserveAllocationSpace(uintptr_t CodeSize, uint32_t CodeAlign,
-                              uintptr_t DataSizeRO, uint32_t RODataAlign,
-                              uintptr_t DataSizeRW,
-                              uint32_t RWDataAlign) override {
-    ReservedCodeSize = CodeSize;
-    ReservedDataSizeRO = DataSizeRO;
-    ReservedDataSizeRW = DataSizeRW;
-  }
-
-  void useSpace(uintptr_t* UsedSize, uintptr_t Size, unsigned Alignment) {
-    uintptr_t AlignedSize = (Size + Alignment - 1) / Alignment * Alignment;
-    uintptr_t AlignedBegin = (*UsedSize + Alignment - 1) / Alignment * Alignment;
-    *UsedSize = AlignedBegin + AlignedSize;
-  }
-
-  uint8_t *allocateDataSection(uintptr_t Size, unsigned Alignment,
-                               unsigned SectionID, StringRef SectionName,
-                               bool IsReadOnly) override {
-    useSpace(IsReadOnly ? &UsedDataSizeRO : &UsedDataSizeRW, Size, Alignment);
-    return SectionMemoryManager::allocateDataSection(Size, Alignment, 
-      SectionID, SectionName, IsReadOnly);
-  }
-
-  uint8_t *allocateCodeSection(uintptr_t Size, unsigned Alignment,
-                               unsigned SectionID,
-                               StringRef SectionName) override {
-    useSpace(&UsedCodeSize, Size, Alignment);
-    return SectionMemoryManager::allocateCodeSection(Size, Alignment, 
-      SectionID, SectionName);
-  }
-};
-
-class MCJITCAPITest : public testing::Test, public MCJITTestAPICommon {
-protected:
-  MCJITCAPITest() {
-    // The architectures below are known to be compatible with MCJIT as they
-    // are copied from test/ExecutionEngine/MCJIT/lit.local.cfg and should be
-    // kept in sync.
-    SupportedArchs.push_back(Triple::aarch64);
-    SupportedArchs.push_back(Triple::arm);
-    SupportedArchs.push_back(Triple::mips);
-    SupportedArchs.push_back(Triple::mips64);
-    SupportedArchs.push_back(Triple::mips64el);
-    SupportedArchs.push_back(Triple::x86);
-    SupportedArchs.push_back(Triple::x86_64);
-
-    // Some architectures have sub-architectures in which tests will fail, like
-    // ARM. These two vectors will define if they do have sub-archs (to avoid
-    // extra work for those who don't), and if so, if they are listed to work
-    HasSubArchs.push_back(Triple::arm);
-    SupportedSubArchs.push_back("armv6");
-    SupportedSubArchs.push_back("armv7");
-
-    // The operating systems below are known to be sufficiently incompatible
-    // that they will fail the MCJIT C API tests.
-    UnsupportedEnvironments.push_back(Triple::Cygnus);
-  }
-
-  void SetUp() override {
-    didCallAllocateCodeSection = false;
-    didAllocateCompactUnwindSection = false;
-    didCallYield = false;
-    Module = nullptr;
-    Function = nullptr;
-    Engine = nullptr;
-    Error = nullptr;
-  }
-
-  void TearDown() override {
-    if (Engine)
-      LLVMDisposeExecutionEngine(Engine);
-    else if (Module)
-      LLVMDisposeModule(Module);
-  }
-  
-  void buildSimpleFunction() {
-    Module = LLVMModuleCreateWithName("simple_module");
-    
-    LLVMSetTarget(Module, HostTriple.c_str());
-    
-    Function = LLVMAddFunction(Module, "simple_function",
-                               LLVMFunctionType(LLVMInt32Type(), nullptr,0, 0));
-    LLVMSetFunctionCallConv(Function, LLVMCCallConv);
-    
-    LLVMBasicBlockRef entry = LLVMAppendBasicBlock(Function, "entry");
-    LLVMBuilderRef builder = LLVMCreateBuilder();
-    LLVMPositionBuilderAtEnd(builder, entry);
-    LLVMBuildRet(builder, LLVMConstInt(LLVMInt32Type(), 42, 0));
-    
-    LLVMVerifyModule(Module, LLVMAbortProcessAction, &Error);
-    LLVMDisposeMessage(Error);
-    
-    LLVMDisposeBuilder(builder);
-  }
-  
-  void buildFunctionThatUsesStackmap() {
-    Module = LLVMModuleCreateWithName("simple_module");
-    
-    LLVMSetTarget(Module, HostTriple.c_str());
-    
-    LLVMTypeRef stackmapParamTypes[] = { LLVMInt64Type(), LLVMInt32Type() };
-    LLVMValueRef stackmap = LLVMAddFunction(
-      Module, "llvm.experimental.stackmap",
-      LLVMFunctionType(LLVMVoidType(), stackmapParamTypes, 2, 1));
-    LLVMSetLinkage(stackmap, LLVMExternalLinkage);
-    
-    Function = LLVMAddFunction(Module, "simple_function",
-                              LLVMFunctionType(LLVMInt32Type(), nullptr, 0, 0));
-    
-    LLVMBasicBlockRef entry = LLVMAppendBasicBlock(Function, "entry");
-    LLVMBuilderRef builder = LLVMCreateBuilder();
-    LLVMPositionBuilderAtEnd(builder, entry);
-    LLVMValueRef stackmapArgs[] = {
-      LLVMConstInt(LLVMInt64Type(), 0, 0), LLVMConstInt(LLVMInt32Type(), 5, 0),
-      LLVMConstInt(LLVMInt32Type(), 42, 0)
-    };
-    LLVMBuildCall(builder, stackmap, stackmapArgs, 3, "");
-    LLVMBuildRet(builder, LLVMConstInt(LLVMInt32Type(), 42, 0));
-    
-    LLVMVerifyModule(Module, LLVMAbortProcessAction, &Error);
-    LLVMDisposeMessage(Error);
-    
-    LLVMDisposeBuilder(builder);
-  }
-  
-  void buildModuleWithCodeAndData() {
-    Module = LLVMModuleCreateWithName("simple_module");
-    
-    LLVMSetTarget(Module, HostTriple.c_str());
-    
-    // build a global int32 variable initialized to 42.
-    LLVMValueRef GlobalVar = LLVMAddGlobal(Module, LLVMInt32Type(), "intVal");    
-    LLVMSetInitializer(GlobalVar, LLVMConstInt(LLVMInt32Type(), 42, 0));
-    
-    {
-        Function = LLVMAddFunction(Module, "getGlobal",
-                              LLVMFunctionType(LLVMInt32Type(), nullptr, 0, 0));
-        LLVMSetFunctionCallConv(Function, LLVMCCallConv);
-        
-        LLVMBasicBlockRef Entry = LLVMAppendBasicBlock(Function, "entry");
-        LLVMBuilderRef Builder = LLVMCreateBuilder();
-        LLVMPositionBuilderAtEnd(Builder, Entry);
-        
-        LLVMValueRef IntVal = LLVMBuildLoad(Builder, GlobalVar, "intVal");
-        LLVMBuildRet(Builder, IntVal);
-        
-        LLVMVerifyModule(Module, LLVMAbortProcessAction, &Error);
-        LLVMDisposeMessage(Error);
-        
-        LLVMDisposeBuilder(Builder);
-    }
-    
-    {
-        LLVMTypeRef ParamTypes[] = { LLVMInt32Type() };
-        Function2 = LLVMAddFunction(
-          Module, "setGlobal", LLVMFunctionType(LLVMVoidType(), ParamTypes, 1, 0));
-        LLVMSetFunctionCallConv(Function2, LLVMCCallConv);
-        
-        LLVMBasicBlockRef Entry = LLVMAppendBasicBlock(Function2, "entry");
-        LLVMBuilderRef Builder = LLVMCreateBuilder();
-        LLVMPositionBuilderAtEnd(Builder, Entry);
-        
-        LLVMValueRef Arg = LLVMGetParam(Function2, 0);
-        LLVMBuildStore(Builder, Arg, GlobalVar);
-        LLVMBuildRetVoid(Builder);
-        
-        LLVMVerifyModule(Module, LLVMAbortProcessAction, &Error);
-        LLVMDisposeMessage(Error);
-        
-        LLVMDisposeBuilder(Builder);
-    }
-  }
-  
-  void buildMCJITOptions() {
-    LLVMInitializeMCJITCompilerOptions(&Options, sizeof(Options));
-    Options.OptLevel = 2;
-    
-    // Just ensure that this field still exists.
-    Options.NoFramePointerElim = false;
-  }
-  
-  void useRoundTripSectionMemoryManager() {
-    Options.MCJMM = LLVMCreateSimpleMCJITMemoryManager(
-      new SectionMemoryManager(),
-      roundTripAllocateCodeSection,
-      roundTripAllocateDataSection,
-      roundTripFinalizeMemory,
-      roundTripDestroy);
-  }
-
-  void buildMCJITEngine() {
-    ASSERT_EQ(
-      0, LLVMCreateMCJITCompilerForModule(&Engine, Module, &Options,
-                                          sizeof(Options), &Error));
-  }
-  
-  void buildAndRunPasses() {
-    LLVMPassManagerRef pass = LLVMCreatePassManager();
-    LLVMAddInstructionCombiningPass(pass);
-    LLVMRunPassManager(pass, Module);
-    LLVMDisposePassManager(pass);
-  }
-  
-  void buildAndRunOptPasses() {
-    LLVMPassManagerBuilderRef passBuilder;
-    
-    passBuilder = LLVMPassManagerBuilderCreate();
-    LLVMPassManagerBuilderSetOptLevel(passBuilder, 2);
-    LLVMPassManagerBuilderSetSizeLevel(passBuilder, 0);
-    
-    LLVMPassManagerRef functionPasses =
-      LLVMCreateFunctionPassManagerForModule(Module);
-    LLVMPassManagerRef modulePasses =
-      LLVMCreatePassManager();
-    
-    LLVMPassManagerBuilderPopulateFunctionPassManager(passBuilder,
-                                                      functionPasses);
-    LLVMPassManagerBuilderPopulateModulePassManager(passBuilder, modulePasses);
-    
-    LLVMPassManagerBuilderDispose(passBuilder);
-    
-    LLVMInitializeFunctionPassManager(functionPasses);
-    for (LLVMValueRef value = LLVMGetFirstFunction(Module);
-         value; value = LLVMGetNextFunction(value))
-      LLVMRunFunctionPassManager(functionPasses, value);
-    LLVMFinalizeFunctionPassManager(functionPasses);
-    
-    LLVMRunPassManager(modulePasses, Module);
-    
-    LLVMDisposePassManager(functionPasses);
-    LLVMDisposePassManager(modulePasses);
-  }
-  
-  LLVMModuleRef Module;
-  LLVMValueRef Function;
-  LLVMValueRef Function2;
-  LLVMMCJITCompilerOptions Options;
-  LLVMExecutionEngineRef Engine;
-  char *Error;
-};
-} // end anonymous namespace
-
-TEST_F(MCJITCAPITest, simple_function) {
-  SKIP_UNSUPPORTED_PLATFORM;
-  
-  buildSimpleFunction();
-  buildMCJITOptions();
-  buildMCJITEngine();
-  buildAndRunPasses();
-
-  auto *functionPointer = reinterpret_cast<int (*)()>(
-      reinterpret_cast<uintptr_t>(LLVMGetPointerToGlobal(Engine, Function)));
-
-  EXPECT_EQ(42, functionPointer());
-}
-
-TEST_F(MCJITCAPITest, gva) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  Module = LLVMModuleCreateWithName("simple_module");
-  LLVMSetTarget(Module, HostTriple.c_str());
-  LLVMValueRef GlobalVar = LLVMAddGlobal(Module, LLVMInt32Type(), "simple_value");
-  LLVMSetInitializer(GlobalVar, LLVMConstInt(LLVMInt32Type(), 42, 0));
-
-  buildMCJITOptions();
-  buildMCJITEngine();
-  buildAndRunPasses();
-
-  uint64_t raw = LLVMGetGlobalValueAddress(Engine, "simple_value");
-  int32_t *usable  = (int32_t *) raw;
-
-  EXPECT_EQ(42, *usable);
-}
-
-TEST_F(MCJITCAPITest, gfa) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  buildSimpleFunction();
-  buildMCJITOptions();
-  buildMCJITEngine();
-  buildAndRunPasses();
-
-  uint64_t raw = LLVMGetFunctionAddress(Engine, "simple_function");
-  int (*usable)() = (int (*)()) raw;
-
-  EXPECT_EQ(42, usable());
-}
-
-TEST_F(MCJITCAPITest, custom_memory_manager) {
-  SKIP_UNSUPPORTED_PLATFORM;
-  
-  buildSimpleFunction();
-  buildMCJITOptions();
-  useRoundTripSectionMemoryManager();
-  buildMCJITEngine();
-  buildAndRunPasses();
-
-  auto *functionPointer = reinterpret_cast<int (*)()>(
-      reinterpret_cast<uintptr_t>(LLVMGetPointerToGlobal(Engine, Function)));
-
-  EXPECT_EQ(42, functionPointer());
-  EXPECT_TRUE(didCallAllocateCodeSection);
-}
-
-TEST_F(MCJITCAPITest, stackmap_creates_compact_unwind_on_darwin) {
-  SKIP_UNSUPPORTED_PLATFORM;
-  
-  // This test is also not supported on non-x86 platforms.
-  if (Triple(HostTriple).getArch() != Triple::x86_64)
-    return;
-  
-  buildFunctionThatUsesStackmap();
-  buildMCJITOptions();
-  useRoundTripSectionMemoryManager();
-  buildMCJITEngine();
-  buildAndRunOptPasses();
-
-  auto *functionPointer = reinterpret_cast<int (*)()>(
-      reinterpret_cast<uintptr_t>(LLVMGetPointerToGlobal(Engine, Function)));
-
-  EXPECT_EQ(42, functionPointer());
-  EXPECT_TRUE(didCallAllocateCodeSection);
-  
-  // Up to this point, the test is specific only to X86-64. But this next
-  // expectation is only valid on Darwin because it assumes that unwind
-  // data is made available only through compact_unwind. It would be
-  // worthwhile to extend this to handle non-Darwin platforms, in which
-  // case you'd want to look for an eh_frame or something.
-  //
-  // FIXME: Currently, MCJIT relies on a configure-time check to determine which
-  // sections to emit. The JIT client should have runtime control over this.
-  EXPECT_TRUE(
-    Triple(HostTriple).getOS() != Triple::Darwin ||
-    Triple(HostTriple).isMacOSXVersionLT(10, 7) ||
-    didAllocateCompactUnwindSection);
-}
-
-#if defined(__APPLE__) && defined(__aarch64__)
-// FIXME: Figure out why this fails on mac/arm, PR46647
-#define MAYBE_reserve_allocation_space DISABLED_reserve_allocation_space
-#else
-#define MAYBE_reserve_allocation_space reserve_allocation_space
-#endif
-TEST_F(MCJITCAPITest, MAYBE_reserve_allocation_space) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  TestReserveAllocationSpaceMemoryManager* MM = new TestReserveAllocationSpaceMemoryManager();
-  
-  buildModuleWithCodeAndData();
-  buildMCJITOptions();
-  Options.MCJMM = wrap(MM);
-  buildMCJITEngine();
-  buildAndRunPasses();
-
-  auto GetGlobalFct = reinterpret_cast<int (*)()>(
-      reinterpret_cast<uintptr_t>(LLVMGetPointerToGlobal(Engine, Function)));
-
-  auto SetGlobalFct = reinterpret_cast<void (*)(int)>(
-      reinterpret_cast<uintptr_t>(LLVMGetPointerToGlobal(Engine, Function2)));
-
-  SetGlobalFct(789);
-  EXPECT_EQ(789, GetGlobalFct());
-  EXPECT_LE(MM->UsedCodeSize, MM->ReservedCodeSize);
-  EXPECT_LE(MM->UsedDataSizeRO, MM->ReservedDataSizeRO);
-  EXPECT_LE(MM->UsedDataSizeRW, MM->ReservedDataSizeRW);
-  EXPECT_TRUE(MM->UsedCodeSize > 0); 
-  EXPECT_TRUE(MM->UsedDataSizeRW > 0);
-}
-
-TEST_F(MCJITCAPITest, yield) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  buildSimpleFunction();
-  buildMCJITOptions();
-  buildMCJITEngine();
-  LLVMContextRef C = LLVMGetGlobalContext();
-  LLVMContextSetYieldCallback(C, yield, nullptr);
-  buildAndRunPasses();
-
-  auto *functionPointer = reinterpret_cast<int (*)()>(
-      reinterpret_cast<uintptr_t>(LLVMGetPointerToGlobal(Engine, Function)));
-
-  EXPECT_EQ(42, functionPointer());
-  EXPECT_TRUE(didCallYield);
-}
-
-static int localTestFunc() {
-  return 42;
-}
-
-TEST_F(MCJITCAPITest, addGlobalMapping) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  Module = LLVMModuleCreateWithName("testModule");
-  LLVMSetTarget(Module, HostTriple.c_str());
-  LLVMTypeRef FunctionType = LLVMFunctionType(LLVMInt32Type(), nullptr, 0, 0);
-  LLVMValueRef MappedFn = LLVMAddFunction(Module, "mapped_fn", FunctionType);
-
-  Function = LLVMAddFunction(Module, "test_fn", FunctionType);
-  LLVMBasicBlockRef Entry = LLVMAppendBasicBlock(Function, "");
-  LLVMBuilderRef Builder = LLVMCreateBuilder();
-  LLVMPositionBuilderAtEnd(Builder, Entry);
-  LLVMValueRef RetVal = LLVMBuildCall(Builder, MappedFn, nullptr, 0, "");
-  LLVMBuildRet(Builder, RetVal);
-  LLVMDisposeBuilder(Builder);
-
-  LLVMVerifyModule(Module, LLVMAbortProcessAction, &Error);
-  LLVMDisposeMessage(Error);
-
-  buildMCJITOptions();
-  buildMCJITEngine();
-
-  LLVMAddGlobalMapping(
-      Engine, MappedFn,
-      reinterpret_cast<void *>(reinterpret_cast<uintptr_t>(&localTestFunc)));
-
-  buildAndRunPasses();
-
-  uint64_t raw = LLVMGetFunctionAddress(Engine, "test_fn");
-  int (*usable)() = (int (*)()) raw;
-
-  EXPECT_EQ(42, usable());
-}
diff --git a/gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/MCJITMemoryManagerTest.cpp b/gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/MCJITMemoryManagerTest.cpp
deleted file mode 100644
index 7a756a70716..00000000000
--- a/gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/MCJITMemoryManagerTest.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-//===- MCJITMemoryManagerTest.cpp - Unit tests for the JIT memory manager -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ExecutionEngine/SectionMemoryManager.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST(MCJITMemoryManagerTest, BasicAllocations) {
-  std::unique_ptr<SectionMemoryManager> MemMgr(new SectionMemoryManager());
-
-  uint8_t *code1 = MemMgr->allocateCodeSection(256, 0, 1, "");
-  uint8_t *data1 = MemMgr->allocateDataSection(256, 0, 2, "", true);
-  uint8_t *code2 = MemMgr->allocateCodeSection(256, 0, 3, "");
-  uint8_t *data2 = MemMgr->allocateDataSection(256, 0, 4, "", false);
-
-  EXPECT_NE((uint8_t*)nullptr, code1);
-  EXPECT_NE((uint8_t*)nullptr, code2);
-  EXPECT_NE((uint8_t*)nullptr, data1);
-  EXPECT_NE((uint8_t*)nullptr, data2);
-
-  // Initialize the data
-  for (unsigned i = 0; i < 256; ++i) {
-    code1[i] = 1;
-    code2[i] = 2;
-    data1[i] = 3;
-    data2[i] = 4;
-  }
-
-  // Verify the data (this is checking for overlaps in the addresses)
-  for (unsigned i = 0; i < 256; ++i) {
-    EXPECT_EQ(1, code1[i]);
-    EXPECT_EQ(2, code2[i]);
-    EXPECT_EQ(3, data1[i]);
-    EXPECT_EQ(4, data2[i]);
-  }
-
-  std::string Error;
-  EXPECT_FALSE(MemMgr->finalizeMemory(&Error));
-}
-
-TEST(MCJITMemoryManagerTest, LargeAllocations) {
-  std::unique_ptr<SectionMemoryManager> MemMgr(new SectionMemoryManager());
-
-  uint8_t *code1 = MemMgr->allocateCodeSection(0x100000, 0, 1, "");
-  uint8_t *data1 = MemMgr->allocateDataSection(0x100000, 0, 2, "", true);
-  uint8_t *code2 = MemMgr->allocateCodeSection(0x100000, 0, 3, "");
-  uint8_t *data2 = MemMgr->allocateDataSection(0x100000, 0, 4, "", false);
-
-  EXPECT_NE((uint8_t*)nullptr, code1);
-  EXPECT_NE((uint8_t*)nullptr, code2);
-  EXPECT_NE((uint8_t*)nullptr, data1);
-  EXPECT_NE((uint8_t*)nullptr, data2);
-
-  // Initialize the data
-  for (unsigned i = 0; i < 0x100000; ++i) {
-    code1[i] = 1;
-    code2[i] = 2;
-    data1[i] = 3;
-    data2[i] = 4;
-  }
-
-  // Verify the data (this is checking for overlaps in the addresses)
-  for (unsigned i = 0; i < 0x100000; ++i) {
-    EXPECT_EQ(1, code1[i]);
-    EXPECT_EQ(2, code2[i]);
-    EXPECT_EQ(3, data1[i]);
-    EXPECT_EQ(4, data2[i]);
-  }
-
-  std::string Error;
-  EXPECT_FALSE(MemMgr->finalizeMemory(&Error));
-}
-
-TEST(MCJITMemoryManagerTest, ManyAllocations) {
-  std::unique_ptr<SectionMemoryManager> MemMgr(new SectionMemoryManager());
-
-  uint8_t* code[10000];
-  uint8_t* data[10000];
-
-  for (unsigned i = 0; i < 10000; ++i) {
-    const bool isReadOnly = i % 2 == 0;
-
-    code[i] = MemMgr->allocateCodeSection(32, 0, 1, "");
-    data[i] = MemMgr->allocateDataSection(32, 0, 2, "", isReadOnly);
-
-    for (unsigned j = 0; j < 32; j++) {
-      code[i][j] = 1 + (i % 254);
-      data[i][j] = 2 + (i % 254);
-    }
-
-    EXPECT_NE((uint8_t *)nullptr, code[i]);
-    EXPECT_NE((uint8_t *)nullptr, data[i]);
-  }
-
-  // Verify the data (this is checking for overlaps in the addresses)
-  for (unsigned i = 0; i < 10000; ++i) {
-    for (unsigned j = 0; j < 32;j++ ) {
-      uint8_t ExpectedCode = 1 + (i % 254);
-      uint8_t ExpectedData = 2 + (i % 254);
-      EXPECT_EQ(ExpectedCode, code[i][j]);
-      EXPECT_EQ(ExpectedData, data[i][j]);
-    }
-  }
-
-  std::string Error;
-  EXPECT_FALSE(MemMgr->finalizeMemory(&Error));
-}
-
-TEST(MCJITMemoryManagerTest, ManyVariedAllocations) {
-  std::unique_ptr<SectionMemoryManager> MemMgr(new SectionMemoryManager());
-
-  uint8_t* code[10000];
-  uint8_t* data[10000];
-
-  for (unsigned i = 0; i < 10000; ++i) {
-    uintptr_t CodeSize = i % 16 + 1;
-    uintptr_t DataSize = i % 8 + 1;
-
-    bool isReadOnly = i % 3 == 0;
-    unsigned Align = 8 << (i % 4);
-
-    code[i] = MemMgr->allocateCodeSection(CodeSize, Align, i, "");
-    data[i] = MemMgr->allocateDataSection(DataSize, Align, i + 10000, "",
-                                          isReadOnly);
-
-    for (unsigned j = 0; j < CodeSize; j++) {
-      code[i][j] = 1 + (i % 254);
-    }
-
-    for (unsigned j = 0; j < DataSize; j++) {
-      data[i][j] = 2 + (i % 254);
-    }
-
-    EXPECT_NE((uint8_t *)nullptr, code[i]);
-    EXPECT_NE((uint8_t *)nullptr, data[i]);
-
-    uintptr_t CodeAlign = Align ? (uintptr_t)code[i] % Align : 0;
-    uintptr_t DataAlign = Align ? (uintptr_t)data[i] % Align : 0;
-
-    EXPECT_EQ((uintptr_t)0, CodeAlign);
-    EXPECT_EQ((uintptr_t)0, DataAlign);
-  }
-
-  for (unsigned i = 0; i < 10000; ++i) {
-    uintptr_t CodeSize = i % 16 + 1;
-    uintptr_t DataSize = i % 8 + 1;
-
-    for (unsigned j = 0; j < CodeSize; j++) {
-      uint8_t ExpectedCode = 1 + (i % 254);
-      EXPECT_EQ(ExpectedCode, code[i][j]);
-    }
-
-    for (unsigned j = 0; j < DataSize; j++) {
-      uint8_t ExpectedData = 2 + (i % 254);
-      EXPECT_EQ(ExpectedData, data[i][j]); 
-    }
-  }
-}
-
-} // Namespace
-
diff --git a/gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/MCJITMultipleModuleTest.cpp b/gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/MCJITMultipleModuleTest.cpp
deleted file mode 100644
index 710ce6d5266..00000000000
--- a/gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/MCJITMultipleModuleTest.cpp
+++ /dev/null
@@ -1,425 +0,0 @@
-//===- MCJITMultipeModuleTest.cpp - Unit tests for the MCJIT ----*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This test suite verifies MCJIT for handling multiple modules in a single
-// ExecutionEngine by building multiple modules, making function calls across
-// modules, accessing global variables, etc.
-//===----------------------------------------------------------------------===//
-
-#include "MCJITTestBase.h"
-#include "llvm/ExecutionEngine/MCJIT.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-class MCJITMultipleModuleTest : public testing::Test, public MCJITTestBase {};
-
-// FIXME: ExecutionEngine has no support empty modules
-/*
-TEST_F(MCJITMultipleModuleTest, multiple_empty_modules) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  createJIT(M.take());
-  // JIT-compile
-  EXPECT_NE(0, TheJIT->getObjectImage())
-    << "Unable to generate executable loaded object image";
-
-  TheJIT->addModule(createEmptyModule("<other module>"));
-  TheJIT->addModule(createEmptyModule("<other other module>"));
-
-  // JIT again
-  EXPECT_NE(0, TheJIT->getObjectImage())
-    << "Unable to generate executable loaded object image";
-}
-*/
-
-// Helper Function to test add operation
-void checkAdd(uint64_t ptr) {
-  ASSERT_TRUE(ptr != 0) << "Unable to get pointer to function.";
-  int (*AddPtr)(int, int) = (int (*)(int, int))ptr;
-  EXPECT_EQ(0, AddPtr(0, 0));
-  EXPECT_EQ(1, AddPtr(1, 0));
-  EXPECT_EQ(3, AddPtr(1, 2));
-  EXPECT_EQ(-5, AddPtr(-2, -3));
-  EXPECT_EQ(30, AddPtr(10, 20));
-  EXPECT_EQ(-30, AddPtr(-10, -20));
-  EXPECT_EQ(-40, AddPtr(-10, -30));
-}
-
-void checkAccumulate(uint64_t ptr) {
-  ASSERT_TRUE(ptr != 0) << "Unable to get pointer to function.";
-  int32_t (*FPtr)(int32_t) = (int32_t (*)(int32_t))(intptr_t)ptr;
-  EXPECT_EQ(0, FPtr(0));
-  EXPECT_EQ(1, FPtr(1));
-  EXPECT_EQ(3, FPtr(2));
-  EXPECT_EQ(6, FPtr(3));
-  EXPECT_EQ(10, FPtr(4));
-  EXPECT_EQ(15, FPtr(5));
-}
-
-// FIXME: ExecutionEngine has no support empty modules
-/*
-TEST_F(MCJITMultipleModuleTest, multiple_empty_modules) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  createJIT(M.take());
-  // JIT-compile
-  EXPECT_NE(0, TheJIT->getObjectImage())
-    << "Unable to generate executable loaded object image";
-
-  TheJIT->addModule(createEmptyModule("<other module>"));
-  TheJIT->addModule(createEmptyModule("<other other module>"));
-
-  // JIT again
-  EXPECT_NE(0, TheJIT->getObjectImage())
-    << "Unable to generate executable loaded object image";
-}
-*/
-
-// Module A { Function FA },
-// Module B { Function FB },
-// execute FA then FB
-TEST_F(MCJITMultipleModuleTest, two_module_case) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  std::unique_ptr<Module> A, B;
-  Function *FA, *FB;
-  createTwoModuleCase(A, FA, B, FB);
-
-  createJIT(std::move(A));
-  TheJIT->addModule(std::move(B));
-
-  uint64_t ptr = TheJIT->getFunctionAddress(FA->getName().str());
-  checkAdd(ptr);
-
-  ptr = TheJIT->getFunctionAddress(FB->getName().str());
-  checkAdd(ptr);
-}
-
-// Module A { Function FA },
-// Module B { Function FB },
-// execute FB then FA
-TEST_F(MCJITMultipleModuleTest, two_module_reverse_case) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  std::unique_ptr<Module> A, B;
-  Function *FA, *FB;
-  createTwoModuleCase(A, FA, B, FB);
-
-  createJIT(std::move(A));
-  TheJIT->addModule(std::move(B));
-
-  uint64_t ptr = TheJIT->getFunctionAddress(FB->getName().str());
-  TheJIT->finalizeObject();
-  checkAdd(ptr);
-
-  ptr = TheJIT->getFunctionAddress(FA->getName().str());
-  checkAdd(ptr);
-}
-
-// Module A { Function FA },
-// Module B { Extern FA, Function FB which calls FA },
-// execute FB then FA
-TEST_F(MCJITMultipleModuleTest, two_module_extern_reverse_case) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  std::unique_ptr<Module> A, B;
-  Function *FA, *FB;
-  createTwoModuleExternCase(A, FA, B, FB);
-
-  createJIT(std::move(A));
-  TheJIT->addModule(std::move(B));
-
-  uint64_t ptr = TheJIT->getFunctionAddress(FB->getName().str());
-  TheJIT->finalizeObject();
-  checkAdd(ptr);
-
-  ptr = TheJIT->getFunctionAddress(FA->getName().str());
-  checkAdd(ptr);
-}
-
-// Module A { Function FA },
-// Module B { Extern FA, Function FB which calls FA },
-// execute FA then FB
-TEST_F(MCJITMultipleModuleTest, two_module_extern_case) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  std::unique_ptr<Module> A, B;
-  Function *FA, *FB;
-  createTwoModuleExternCase(A, FA, B, FB);
-
-  createJIT(std::move(A));
-  TheJIT->addModule(std::move(B));
-
-  uint64_t ptr = TheJIT->getFunctionAddress(FA->getName().str());
-  checkAdd(ptr);
-
-  ptr = TheJIT->getFunctionAddress(FB->getName().str());
-  checkAdd(ptr);
-}
-
-// Module A { Function FA1, Function FA2 which calls FA1 },
-// Module B { Extern FA1, Function FB which calls FA1 },
-// execute FB then FA2
-TEST_F(MCJITMultipleModuleTest, two_module_consecutive_call_case) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  std::unique_ptr<Module> A, B;
-  Function *FA1, *FA2, *FB;
-  createTwoModuleExternCase(A, FA1, B, FB);
-  FA2 = insertSimpleCallFunction(A.get(), FA1);
-
-  createJIT(std::move(A));
-  TheJIT->addModule(std::move(B));
-
-  uint64_t ptr = TheJIT->getFunctionAddress(FB->getName().str());
-  TheJIT->finalizeObject();
-  checkAdd(ptr);
-
-  ptr = TheJIT->getFunctionAddress(FA2->getName().str());
-  checkAdd(ptr);
-}
-
-// TODO:
-// Module A { Extern Global GVB, Global Variable GVA, Function FA loads GVB },
-// Module B { Extern Global GVA, Global Variable GVB, Function FB loads GVA },
-
-
-// Module A { Global Variable GVA, Function FA loads GVA },
-// Module B { Global Variable GVB, Internal Global GVC, Function FB loads GVB },
-// execute FB then FA, also check that the global variables are properly accesible
-// through the ExecutionEngine APIs
-TEST_F(MCJITMultipleModuleTest, two_module_global_variables_case) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  std::unique_ptr<Module> A, B;
-  Function *FA, *FB;
-  GlobalVariable *GVA, *GVB, *GVC;
-
-  A.reset(createEmptyModule("A"));
-  B.reset(createEmptyModule("B"));
-
-  int32_t initialNum = 7;
-  GVA = insertGlobalInt32(A.get(), "GVA", initialNum);
-  GVB = insertGlobalInt32(B.get(), "GVB", initialNum);
-  FA = startFunction(A.get(),
-                     FunctionType::get(Builder.getInt32Ty(), {}, false), "FA");
-  endFunctionWithRet(FA, Builder.CreateLoad(Builder.getInt32Ty(), GVA));
-  FB = startFunction(B.get(),
-                     FunctionType::get(Builder.getInt32Ty(), {}, false), "FB");
-  endFunctionWithRet(FB, Builder.CreateLoad(Builder.getInt32Ty(), GVB));
-
-  GVC = insertGlobalInt32(B.get(), "GVC", initialNum);
-  GVC->setLinkage(GlobalValue::InternalLinkage);
-
-  createJIT(std::move(A));
-  TheJIT->addModule(std::move(B));
-
-  EXPECT_EQ(GVA, TheJIT->FindGlobalVariableNamed("GVA"));
-  EXPECT_EQ(GVB, TheJIT->FindGlobalVariableNamed("GVB"));
-  EXPECT_EQ(GVC, TheJIT->FindGlobalVariableNamed("GVC",true));
-  EXPECT_EQ(nullptr, TheJIT->FindGlobalVariableNamed("GVC"));
-
-  uint64_t FBPtr = TheJIT->getFunctionAddress(FB->getName().str());
-  TheJIT->finalizeObject();
-  EXPECT_TRUE(0 != FBPtr);
-  int32_t(*FuncPtr)() = (int32_t(*)())FBPtr;
-  EXPECT_EQ(initialNum, FuncPtr())
-    << "Invalid value for global returned from JITted function in module B";
-
-  uint64_t FAPtr = TheJIT->getFunctionAddress(FA->getName().str());
-  EXPECT_TRUE(0 != FAPtr);
-  FuncPtr = (int32_t(*)())FAPtr;
-  EXPECT_EQ(initialNum, FuncPtr())
-    << "Invalid value for global returned from JITted function in module A";
-}
-
-// Module A { Function FA },
-// Module B { Extern FA, Function FB which calls FA },
-// Module C { Extern FA, Function FC which calls FA },
-// execute FC, FB, FA
-TEST_F(MCJITMultipleModuleTest, three_module_case) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  std::unique_ptr<Module> A, B, C;
-  Function *FA, *FB, *FC;
-  createThreeModuleCase(A, FA, B, FB, C, FC);
-
-  createJIT(std::move(A));
-  TheJIT->addModule(std::move(B));
-  TheJIT->addModule(std::move(C));
-
-  uint64_t ptr = TheJIT->getFunctionAddress(FC->getName().str());
-  checkAdd(ptr);
-
-  ptr = TheJIT->getFunctionAddress(FB->getName().str());
-  checkAdd(ptr);
-
-  ptr = TheJIT->getFunctionAddress(FA->getName().str());
-  checkAdd(ptr);
-}
-
-// Module A { Function FA },
-// Module B { Extern FA, Function FB which calls FA },
-// Module C { Extern FA, Function FC which calls FA },
-// execute FA, FB, FC
-TEST_F(MCJITMultipleModuleTest, three_module_case_reverse_order) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  std::unique_ptr<Module> A, B, C;
-  Function *FA, *FB, *FC;
-  createThreeModuleCase(A, FA, B, FB, C, FC);
-
-  createJIT(std::move(A));
-  TheJIT->addModule(std::move(B));
-  TheJIT->addModule(std::move(C));
-
-  uint64_t ptr = TheJIT->getFunctionAddress(FA->getName().str());
-  checkAdd(ptr);
-
-  ptr = TheJIT->getFunctionAddress(FB->getName().str());
-  checkAdd(ptr);
-
-  ptr = TheJIT->getFunctionAddress(FC->getName().str());
-  checkAdd(ptr);
-}
-
-// Module A { Function FA },
-// Module B { Extern FA, Function FB which calls FA },
-// Module C { Extern FB, Function FC which calls FB },
-// execute FC, FB, FA
-TEST_F(MCJITMultipleModuleTest, three_module_chain_case) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  std::unique_ptr<Module> A, B, C;
-  Function *FA, *FB, *FC;
-  createThreeModuleChainedCallsCase(A, FA, B, FB, C, FC);
-
-  createJIT(std::move(A));
-  TheJIT->addModule(std::move(B));
-  TheJIT->addModule(std::move(C));
-
-  uint64_t ptr = TheJIT->getFunctionAddress(FC->getName().str());
-  checkAdd(ptr);
-
-  ptr = TheJIT->getFunctionAddress(FB->getName().str());
-  checkAdd(ptr);
-
-  ptr = TheJIT->getFunctionAddress(FA->getName().str());
-  checkAdd(ptr);
-}
-
-// Module A { Function FA },
-// Module B { Extern FA, Function FB which calls FA },
-// Module C { Extern FB, Function FC which calls FB },
-// execute FA, FB, FC
-TEST_F(MCJITMultipleModuleTest, three_modules_chain_case_reverse_order) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  std::unique_ptr<Module> A, B, C;
-  Function *FA, *FB, *FC;
-  createThreeModuleChainedCallsCase(A, FA, B, FB, C, FC);
-
-  createJIT(std::move(A));
-  TheJIT->addModule(std::move(B));
-  TheJIT->addModule(std::move(C));
-
-  uint64_t ptr = TheJIT->getFunctionAddress(FA->getName().str());
-  checkAdd(ptr);
-
-  ptr = TheJIT->getFunctionAddress(FB->getName().str());
-  checkAdd(ptr);
-
-  ptr = TheJIT->getFunctionAddress(FC->getName().str());
-  checkAdd(ptr);
-}
-
-// Module A { Extern FB, Function FA which calls FB1 },
-// Module B { Extern FA, Function FB1, Function FB2 which calls FA },
-// execute FA, then FB1
-// FIXME: this test case is not supported by MCJIT
-TEST_F(MCJITMultipleModuleTest, cross_module_dependency_case) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  std::unique_ptr<Module> A, B;
-  Function *FA, *FB1, *FB2;
-  createCrossModuleRecursiveCase(A, FA, B, FB1, FB2);
-
-  createJIT(std::move(A));
-  TheJIT->addModule(std::move(B));
-
-  uint64_t ptr = TheJIT->getFunctionAddress(FA->getName().str());
-  checkAccumulate(ptr);
-
-  ptr = TheJIT->getFunctionAddress(FB1->getName().str());
-  checkAccumulate(ptr);
-}
-
-// Module A { Extern FB, Function FA which calls FB1 },
-// Module B { Extern FA, Function FB1, Function FB2 which calls FA },
-// execute FB1 then FA
-// FIXME: this test case is not supported by MCJIT
-TEST_F(MCJITMultipleModuleTest, cross_module_dependency_case_reverse_order) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  std::unique_ptr<Module> A, B;
-  Function *FA, *FB1, *FB2;
-  createCrossModuleRecursiveCase(A, FA, B, FB1, FB2);
-
-  createJIT(std::move(A));
-  TheJIT->addModule(std::move(B));
-
-  uint64_t ptr = TheJIT->getFunctionAddress(FB1->getName().str());
-  checkAccumulate(ptr);
-
-  ptr = TheJIT->getFunctionAddress(FA->getName().str());
-  checkAccumulate(ptr);
-}
-
-// Module A { Extern FB1, Function FA which calls FB1 },
-// Module B { Extern FA, Function FB1, Function FB2 which calls FA },
-// execute FB1 then FB2
-// FIXME: this test case is not supported by MCJIT
-TEST_F(MCJITMultipleModuleTest, cross_module_dependency_case3) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  std::unique_ptr<Module> A, B;
-  Function *FA, *FB1, *FB2;
-  createCrossModuleRecursiveCase(A, FA, B, FB1, FB2);
-
-  createJIT(std::move(A));
-  TheJIT->addModule(std::move(B));
-
-  uint64_t ptr = TheJIT->getFunctionAddress(FB1->getName().str());
-  checkAccumulate(ptr);
-
-  ptr = TheJIT->getFunctionAddress(FB2->getName().str());
-  checkAccumulate(ptr);
-}
-
-// Test that FindFunctionNamed finds the definition of
-// a function in the correct module. We check two functions
-// in two different modules, to make sure that for at least
-// one of them MCJIT had to ignore the extern declaration.
-TEST_F(MCJITMultipleModuleTest, FindFunctionNamed_test) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  std::unique_ptr<Module> A, B;
-  Function *FA, *FB1, *FB2;
-  createCrossModuleRecursiveCase(A, FA, B, FB1, FB2);
-
-  createJIT(std::move(A));
-  TheJIT->addModule(std::move(B));
-
-  EXPECT_EQ(FA, TheJIT->FindFunctionNamed(FA->getName().data()));
-  EXPECT_EQ(FB1, TheJIT->FindFunctionNamed(FB1->getName().data()));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/MCJITObjectCacheTest.cpp b/gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/MCJITObjectCacheTest.cpp
deleted file mode 100644
index 4ec2e1aaec1..00000000000
--- a/gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/MCJITObjectCacheTest.cpp
+++ /dev/null
@@ -1,228 +0,0 @@
-//===- MCJITObjectCacheTest.cpp - Unit tests for MCJIT object caching -----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "MCJITTestBase.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/StringMap.h"
-#include "llvm/ADT/StringSet.h"
-#include "llvm/ExecutionEngine/MCJIT.h"
-#include "llvm/ExecutionEngine/ObjectCache.h"
-#include "llvm/ExecutionEngine/SectionMemoryManager.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-class TestObjectCache : public ObjectCache {
-public:
-  TestObjectCache() : DuplicateInserted(false) { }
-
-  void notifyObjectCompiled(const Module *M, MemoryBufferRef Obj) override {
-    // If we've seen this module before, note that.
-    const std::string ModuleID = M->getModuleIdentifier();
-    if (ObjMap.find(ModuleID) != ObjMap.end())
-      DuplicateInserted = true;
-    // Store a copy of the buffer in our map.
-    ObjMap[ModuleID] = copyBuffer(Obj);
-  }
-
-  std::unique_ptr<MemoryBuffer> getObject(const Module *M) override {
-    const MemoryBuffer* BufferFound = getObjectInternal(M);
-    ModulesLookedUp.insert(M->getModuleIdentifier());
-    if (!BufferFound)
-      return nullptr;
-    // Our test cache wants to maintain ownership of its object buffers
-    // so we make a copy here for the execution engine.
-    return MemoryBuffer::getMemBufferCopy(BufferFound->getBuffer());
-  }
-
-  // Test-harness-specific functions
-  bool wereDuplicatesInserted() { return DuplicateInserted; }
-
-  bool wasModuleLookedUp(const Module *M) {
-    return ModulesLookedUp.find(M->getModuleIdentifier())
-                                      != ModulesLookedUp.end();
-  }
-
-  const MemoryBuffer* getObjectInternal(const Module* M) {
-    // Look for the module in our map.
-    const std::string ModuleID = M->getModuleIdentifier();
-    StringMap<const MemoryBuffer *>::iterator it = ObjMap.find(ModuleID);
-    if (it == ObjMap.end())
-      return nullptr;
-    return it->second;
-  }
-
-private:
-  MemoryBuffer *copyBuffer(MemoryBufferRef Buf) {
-    // Create a local copy of the buffer.
-    std::unique_ptr<MemoryBuffer> NewBuffer =
-        MemoryBuffer::getMemBufferCopy(Buf.getBuffer());
-    MemoryBuffer *Ret = NewBuffer.get();
-    AllocatedBuffers.push_back(std::move(NewBuffer));
-    return Ret;
-  }
-
-  StringMap<const MemoryBuffer *> ObjMap;
-  StringSet<>                     ModulesLookedUp;
-  SmallVector<std::unique_ptr<MemoryBuffer>, 2> AllocatedBuffers;
-  bool                            DuplicateInserted;
-};
-
-class MCJITObjectCacheTest : public testing::Test, public MCJITTestBase {
-protected:
-  enum {
-    OriginalRC = 6,
-    ReplacementRC = 7
-  };
-
-  void SetUp() override {
-    M.reset(createEmptyModule("<main>"));
-    Main = insertMainFunction(M.get(), OriginalRC);
-  }
-
-  void compileAndRun(int ExpectedRC = OriginalRC) {
-    // This function shouldn't be called until after SetUp.
-    ASSERT_TRUE(bool(TheJIT));
-    ASSERT_TRUE(nullptr != Main);
-
-    // We may be using a null cache, so ensure compilation is valid.
-    TheJIT->finalizeObject();
-    void *vPtr = TheJIT->getPointerToFunction(Main);
-
-    EXPECT_TRUE(nullptr != vPtr)
-      << "Unable to get pointer to main() from JIT";
-
-    int (*FuncPtr)() = (int(*)())(intptr_t)vPtr;
-    int returnCode = FuncPtr();
-    EXPECT_EQ(returnCode, ExpectedRC);
-  }
-
-  Function *Main;
-};
-
-TEST_F(MCJITObjectCacheTest, SetNullObjectCache) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  createJIT(std::move(M));
-
-  TheJIT->setObjectCache(nullptr);
-
-  compileAndRun();
-}
-
-TEST_F(MCJITObjectCacheTest, VerifyBasicObjectCaching) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  std::unique_ptr<TestObjectCache> Cache(new TestObjectCache);
-
-  // Save a copy of the module pointer before handing it off to MCJIT.
-  const Module * SavedModulePointer = M.get();
-
-  createJIT(std::move(M));
-
-  TheJIT->setObjectCache(Cache.get());
-
-  // Verify that our object cache does not contain the module yet.
-  const MemoryBuffer *ObjBuffer = Cache->getObjectInternal(SavedModulePointer);
-  EXPECT_EQ(nullptr, ObjBuffer);
-
-  compileAndRun();
-
-  // Verify that MCJIT tried to look-up this module in the cache.
-  EXPECT_TRUE(Cache->wasModuleLookedUp(SavedModulePointer));
-
-  // Verify that our object cache now contains the module.
-  ObjBuffer = Cache->getObjectInternal(SavedModulePointer);
-  EXPECT_TRUE(nullptr != ObjBuffer);
-
-  // Verify that the cache was only notified once.
-  EXPECT_FALSE(Cache->wereDuplicatesInserted());
-}
-
-TEST_F(MCJITObjectCacheTest, VerifyLoadFromCache) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  std::unique_ptr<TestObjectCache> Cache(new TestObjectCache);
-
-  // Compile this module with an MCJIT engine
-  createJIT(std::move(M));
-  TheJIT->setObjectCache(Cache.get());
-  TheJIT->finalizeObject();
-
-  // Destroy the MCJIT engine we just used
-  TheJIT.reset();
-
-  // Create a new memory manager.
-  MM.reset(new SectionMemoryManager());
-
-  // Create a new module and save it. Use a different return code so we can
-  // tell if MCJIT compiled this module or used the cache.
-  M.reset(createEmptyModule("<main>"));
-  Main = insertMainFunction(M.get(), ReplacementRC);
-  const Module * SecondModulePointer = M.get();
-
-  // Create a new MCJIT instance to load this module then execute it.
-  createJIT(std::move(M));
-  TheJIT->setObjectCache(Cache.get());
-  compileAndRun();
-
-  // Verify that MCJIT tried to look-up this module in the cache.
-  EXPECT_TRUE(Cache->wasModuleLookedUp(SecondModulePointer));
-
-  // Verify that MCJIT didn't try to cache this again.
-  EXPECT_FALSE(Cache->wereDuplicatesInserted());
-}
-
-TEST_F(MCJITObjectCacheTest, VerifyNonLoadFromCache) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  std::unique_ptr<TestObjectCache> Cache(new TestObjectCache);
-
-  // Compile this module with an MCJIT engine
-  createJIT(std::move(M));
-  TheJIT->setObjectCache(Cache.get());
-  TheJIT->finalizeObject();
-
-  // Destroy the MCJIT engine we just used
-  TheJIT.reset();
-
-  // Create a new memory manager.
-  MM.reset(new SectionMemoryManager());
-
-  // Create a new module and save it. Use a different return code so we can
-  // tell if MCJIT compiled this module or used the cache. Note that we use
-  // a new module name here so the module shouldn't be found in the cache.
-  M.reset(createEmptyModule("<not-main>"));
-  Main = insertMainFunction(M.get(), ReplacementRC);
-  const Module * SecondModulePointer = M.get();
-
-  // Create a new MCJIT instance to load this module then execute it.
-  createJIT(std::move(M));
-  TheJIT->setObjectCache(Cache.get());
-
-  // Verify that our object cache does not contain the module yet.
-  const MemoryBuffer *ObjBuffer = Cache->getObjectInternal(SecondModulePointer);
-  EXPECT_EQ(nullptr, ObjBuffer);
-
-  // Run the function and look for the replacement return code.
-  compileAndRun(ReplacementRC);
-
-  // Verify that MCJIT tried to look-up this module in the cache.
-  EXPECT_TRUE(Cache->wasModuleLookedUp(SecondModulePointer));
-
-  // Verify that our object cache now contains the module.
-  ObjBuffer = Cache->getObjectInternal(SecondModulePointer);
-  EXPECT_TRUE(nullptr != ObjBuffer);
-
-  // Verify that MCJIT didn't try to cache this again.
-  EXPECT_FALSE(Cache->wereDuplicatesInserted());
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/MCJITTest.cpp b/gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/MCJITTest.cpp
deleted file mode 100644
index 14099074598..00000000000
--- a/gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/MCJITTest.cpp
+++ /dev/null
@@ -1,294 +0,0 @@
-//===- MCJITTest.cpp - Unit tests for the MCJIT -----------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This test suite verifies basic MCJIT functionality such as making function
-// calls, using global variables, and compiling multpile modules.
-//
-//===----------------------------------------------------------------------===//
-
-#include "MCJITTestBase.h"
-#include "llvm/Support/DynamicLibrary.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-class MCJITTest : public testing::Test, public MCJITTestBase {
-protected:
-  void SetUp() override { M.reset(createEmptyModule("<main>")); }
-};
-
-// FIXME: Ensure creating an execution engine does not crash when constructed
-//        with a null module.
-/*
-TEST_F(MCJITTest, null_module) {
-  createJIT(0);
-}
-*/
-
-// FIXME: In order to JIT an empty module, there needs to be
-// an interface to ExecutionEngine that forces compilation but
-// does not require retrieval of a pointer to a function/global.
-/*
-TEST_F(MCJITTest, empty_module) {
-  createJIT(M.take());
-  //EXPECT_NE(0, TheJIT->getObjectImage())
-  //  << "Unable to generate executable loaded object image";
-}
-*/
-
-TEST_F(MCJITTest, global_variable) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  int initialValue = 5;
-  GlobalValue *Global = insertGlobalInt32(M.get(), "test_global", initialValue);
-  createJIT(std::move(M));
-  void *globalPtr =  TheJIT->getPointerToGlobal(Global);
-  EXPECT_TRUE(nullptr != globalPtr)
-    << "Unable to get pointer to global value from JIT";
-
-  EXPECT_EQ(initialValue, *(int32_t*)globalPtr)
-    << "Unexpected initial value of global";
-}
-
-TEST_F(MCJITTest, add_function) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  Function *F = insertAddFunction(M.get());
-  createJIT(std::move(M));
-  uint64_t addPtr = TheJIT->getFunctionAddress(F->getName().str());
-  EXPECT_TRUE(0 != addPtr)
-    << "Unable to get pointer to function from JIT";
-
-  ASSERT_TRUE(addPtr != 0) << "Unable to get pointer to function .";
-  int (*AddPtr)(int, int) = (int(*)(int, int))addPtr ;
-  EXPECT_EQ(0,   AddPtr(0, 0));
-  EXPECT_EQ(1,   AddPtr(1, 0));
-  EXPECT_EQ(3,   AddPtr(1, 2));
-  EXPECT_EQ(-5,  AddPtr(-2, -3));
-  EXPECT_EQ(30,  AddPtr(10, 20));
-  EXPECT_EQ(-30, AddPtr(-10, -20));
-  EXPECT_EQ(-40, AddPtr(-10, -30));
-}
-
-TEST_F(MCJITTest, run_main) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  int rc = 6;
-  Function *Main = insertMainFunction(M.get(), 6);
-  createJIT(std::move(M));
-  uint64_t ptr = TheJIT->getFunctionAddress(Main->getName().str());
-  EXPECT_TRUE(0 != ptr)
-    << "Unable to get pointer to main() from JIT";
-
-  int (*FuncPtr)() = (int(*)())ptr;
-  int returnCode = FuncPtr();
-  EXPECT_EQ(returnCode, rc);
-}
-
-TEST_F(MCJITTest, return_global) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  int32_t initialNum = 7;
-  GlobalVariable *GV = insertGlobalInt32(M.get(), "myglob", initialNum);
-
-  Function *ReturnGlobal =
-      startFunction(M.get(), FunctionType::get(Builder.getInt32Ty(), {}, false),
-                    "ReturnGlobal");
-  Value *ReadGlobal = Builder.CreateLoad(Builder.getInt32Ty(), GV);
-  endFunctionWithRet(ReturnGlobal, ReadGlobal);
-
-  createJIT(std::move(M));
-  uint64_t rgvPtr = TheJIT->getFunctionAddress(ReturnGlobal->getName().str());
-  EXPECT_TRUE(0 != rgvPtr);
-
-  int32_t(*FuncPtr)() = (int32_t(*)())rgvPtr;
-  EXPECT_EQ(initialNum, FuncPtr())
-    << "Invalid value for global returned from JITted function";
-}
-
-// FIXME: This case fails due to a bug with getPointerToGlobal().
-// The bug is due to MCJIT not having an implementation of getPointerToGlobal()
-// which results in falling back on the ExecutionEngine implementation that
-// allocates a new memory block for the global instead of using the same
-// global variable that is emitted by MCJIT. Hence, the pointer (gvPtr below)
-// has the correct initial value, but updates to the real global (accessed by
-// JITted code) are not propagated. Instead, getPointerToGlobal() should return
-// a pointer into the loaded ObjectImage to reference the emitted global.
-/*
-TEST_F(MCJITTest, increment_global) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  int32_t initialNum = 5;
-  Function *IncrementGlobal = startFunction(
-      M.get(),
-      FunctionType::get(Builder.getInt32Ty(), {}, false),
-      "IncrementGlobal");
-  GlobalVariable *GV = insertGlobalInt32(M.get(), "my_global", initialNum);
-  Value *DerefGV = Builder.CreateLoad(GV);
-  Value *AddResult = Builder.CreateAdd(DerefGV,
-                                       ConstantInt::get(Context, APInt(32, 1)));
-  Builder.CreateStore(AddResult, GV);
-  endFunctionWithRet(IncrementGlobal, AddResult);
-
-  createJIT(M.take());
-  void *gvPtr = TheJIT->getPointerToGlobal(GV);
-  EXPECT_EQ(initialNum, *(int32_t*)gvPtr);
-
-  void *vPtr = TheJIT->getFunctionAddress(IncrementGlobal->getName().str());
-  EXPECT_TRUE(0 != vPtr)
-    << "Unable to get pointer to main() from JIT";
-
-  int32_t(*FuncPtr)(void) = (int32_t(*)(void))(intptr_t)vPtr;
-
-  for(int i = 1; i < 3; ++i) {
-    int32_t result = FuncPtr();
-    EXPECT_EQ(initialNum + i, result);            // OK
-    EXPECT_EQ(initialNum + i, *(int32_t*)gvPtr);  // FAILS
-  }
-}
-*/
-
-// PR16013: XFAIL this test on ARM, which currently can't handle multiple relocations.
-#if !defined(__arm__)
-
-TEST_F(MCJITTest, multiple_functions) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  unsigned int numLevels = 23;
-  int32_t innerRetVal= 5;
-
-  Function *Inner = startFunction(
-      M.get(), FunctionType::get(Builder.getInt32Ty(), {}, false), "Inner");
-  endFunctionWithRet(Inner, ConstantInt::get(Context, APInt(32, innerRetVal)));
-
-  Function *Outer;
-  for (unsigned int i = 0; i < numLevels; ++i) {
-    std::stringstream funcName;
-    funcName << "level_" << i;
-    Outer = startFunction(M.get(),
-                          FunctionType::get(Builder.getInt32Ty(), {}, false),
-                          funcName.str());
-    Value *innerResult = Builder.CreateCall(Inner, {});
-    endFunctionWithRet(Outer, innerResult);
-
-    Inner = Outer;
-  }
-
-  createJIT(std::move(M));
-  uint64_t ptr = TheJIT->getFunctionAddress(Outer->getName().str());
-  EXPECT_TRUE(0 != ptr)
-    << "Unable to get pointer to outer function from JIT";
-
-  int32_t(*FuncPtr)() = (int32_t(*)())ptr;
-  EXPECT_EQ(innerRetVal, FuncPtr())
-    << "Incorrect result returned from function";
-}
-
-#endif /*!defined(__arm__)*/
-
-TEST_F(MCJITTest, multiple_decl_lookups) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  Function *Foo = insertExternalReferenceToFunction(
-      M.get(), FunctionType::get(Builder.getVoidTy(), {}, false), "_exit");
-  createJIT(std::move(M));
-  void *A = TheJIT->getPointerToFunction(Foo);
-  void *B = TheJIT->getPointerToFunction(Foo);
-
-  EXPECT_TRUE(A != nullptr) << "Failed lookup - test not correctly configured.";
-  EXPECT_EQ(A, B) << "Repeat calls to getPointerToFunction fail.";
-}
-
-typedef void * (*FunctionHandlerPtr)(const std::string &str);
-
-TEST_F(MCJITTest, lazy_function_creator_pointer) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  Function *Foo = insertExternalReferenceToFunction(
-      M.get(), FunctionType::get(Builder.getInt32Ty(), {}, false),
-      "\1Foo");
-  startFunction(M.get(), FunctionType::get(Builder.getInt32Ty(), {}, false),
-                "Parent");
-  CallInst *Call = Builder.CreateCall(Foo, {});
-  Builder.CreateRet(Call);
-  
-  createJIT(std::move(M));
-  
-  // Set up the lazy function creator that records the name of the last
-  // unresolved external function found in the module. Using a function pointer
-  // prevents us from capturing local variables, which is why this is static.
-  static std::string UnresolvedExternal;
-  FunctionHandlerPtr UnresolvedHandler = [] (const std::string &str) {
-    // Try to resolve the function in the current process before marking it as
-    // unresolved. This solves an issue on ARM where '__aeabi_*' function names
-    // are passed to this handler.
-    void *symbol =
-        llvm::sys::DynamicLibrary::SearchForAddressOfSymbol(str.c_str());
-    if (symbol) {
-      return symbol;
-    }
-    
-    UnresolvedExternal = str;
-    return (void *)(uintptr_t)-1;
-  };
-  TheJIT->InstallLazyFunctionCreator(UnresolvedHandler);
-  
-  // JIT the module.
-  TheJIT->finalizeObject();
-  
-  // Verify that our handler was called.
-  EXPECT_EQ(UnresolvedExternal, "Foo");
-}
-
-TEST_F(MCJITTest, lazy_function_creator_lambda) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  FunctionType *Int32VoidFnTy =
-      FunctionType::get(Builder.getInt32Ty(), {}, false);
-  Function *Foo1 =
-      insertExternalReferenceToFunction(M.get(), Int32VoidFnTy, "\1Foo1");
-  Function *Foo2 =
-      insertExternalReferenceToFunction(M.get(), Int32VoidFnTy, "\1Foo2");
-  startFunction(M.get(), Int32VoidFnTy, "Parent");
-  CallInst *Call1 = Builder.CreateCall(Foo1, {});
-  CallInst *Call2 = Builder.CreateCall(Foo2, {});
-  Value *Result = Builder.CreateAdd(Call1, Call2);
-  Builder.CreateRet(Result);
-  
-  createJIT(std::move(M));
-  
-  // Set up the lazy function creator that records the name of unresolved
-  // external functions in the module.
-  std::vector<std::string> UnresolvedExternals;
-  auto UnresolvedHandler = [&UnresolvedExternals] (const std::string &str) {
-    // Try to resolve the function in the current process before marking it as
-    // unresolved. This solves an issue on ARM where '__aeabi_*' function names
-    // are passed to this handler.
-    void *symbol =
-        llvm::sys::DynamicLibrary::SearchForAddressOfSymbol(str.c_str());
-    if (symbol) {
-      return symbol;
-    }
-    UnresolvedExternals.push_back(str);
-    return (void *)(uintptr_t)-1;
-  };
-  TheJIT->InstallLazyFunctionCreator(UnresolvedHandler);
-  
-  // JIT the module.
-  TheJIT->finalizeObject();
-  
-  // Verify that our handler was called for each unresolved function.
-  auto I = UnresolvedExternals.begin(), E = UnresolvedExternals.end();
-  EXPECT_EQ(UnresolvedExternals.size(), 2u);
-  EXPECT_FALSE(std::find(I, E, "Foo1") == E);
-  EXPECT_FALSE(std::find(I, E, "Foo2") == E);
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/MCJITTestAPICommon.h b/gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/MCJITTestAPICommon.h
deleted file mode 100644
index f47de56d3e4..00000000000
--- a/gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/MCJITTestAPICommon.h
+++ /dev/null
@@ -1,106 +0,0 @@
-//===- MCJITTestBase.h - Common base class for MCJIT Unit tests  ----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This class implements functionality shared by both MCJIT C API tests, and
-// the C++ API tests.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_UNITTESTS_EXECUTIONENGINE_MCJIT_MCJITTESTAPICOMMON_H
-#define LLVM_UNITTESTS_EXECUTIONENGINE_MCJIT_MCJITTESTAPICOMMON_H
-
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/Triple.h"
-#include "llvm/IR/LegacyPassManager.h"
-#include "llvm/InitializePasses.h"
-#include "llvm/Support/Host.h"
-#include "llvm/Support/TargetSelect.h"
-#include "llvm/Support/TargetRegistry.h"
-
-// Used to skip tests on unsupported architectures and operating systems.
-// To skip a test, add this macro at the top of a test-case in a suite that
-// inherits from MCJITTestBase. See MCJITTest.cpp for examples.
-#define SKIP_UNSUPPORTED_PLATFORM \
-  do \
-    if (!ArchSupportsMCJIT() || !OSSupportsMCJIT() || !HostCanBeTargeted()) \
-      return; \
-  while(0)
-
-namespace llvm {
-
-class MCJITTestAPICommon {
-protected:
-  MCJITTestAPICommon()
-    : HostTriple(sys::getProcessTriple())
-  {
-    InitializeNativeTarget();
-    InitializeNativeTargetAsmPrinter();
-
-    // FIXME: It isn't at all clear why this is necesasry, but without it we
-    // fail to initialize the AssumptionCacheTracker.
-    initializeAssumptionCacheTrackerPass(*PassRegistry::getPassRegistry());
-
-#ifdef _WIN32
-    // On Windows, generate ELF objects by specifying "-elf" in triple
-    HostTriple += "-elf";
-#endif // _WIN32
-    HostTriple = Triple::normalize(HostTriple);
-  }
-
-  bool HostCanBeTargeted() {
-    std::string Error;
-    return TargetRegistry::lookupTarget(HostTriple, Error) != nullptr;
-  }
-
-  /// Returns true if the host architecture is known to support MCJIT
-  bool ArchSupportsMCJIT() {
-    Triple Host(HostTriple);
-    // If ARCH is not supported, bail
-    if (!is_contained(SupportedArchs, Host.getArch()))
-      return false;
-
-    // If ARCH is supported and has no specific sub-arch support
-    if (!is_contained(HasSubArchs, Host.getArch()))
-      return true;
-
-    // If ARCH has sub-arch support, find it
-    SmallVectorImpl<std::string>::const_iterator I = SupportedSubArchs.begin();
-    for(; I != SupportedSubArchs.end(); ++I)
-      if (Host.getArchName().startswith(*I))
-        return true;
-
-    return false;
-  }
-
-  /// Returns true if the host OS is known to support MCJIT
-  bool OSSupportsMCJIT() {
-    Triple Host(HostTriple);
-
-    if (find(UnsupportedEnvironments, Host.getEnvironment()) !=
-        UnsupportedEnvironments.end())
-      return false;
-
-    if (!is_contained(UnsupportedOSs, Host.getOS()))
-      return true;
-
-    return false;
-  }
-
-  std::string HostTriple;
-  SmallVector<Triple::ArchType, 4> SupportedArchs;
-  SmallVector<Triple::ArchType, 1> HasSubArchs;
-  SmallVector<std::string, 2> SupportedSubArchs; // We need to own the memory
-  SmallVector<Triple::OSType, 4> UnsupportedOSs;
-  SmallVector<Triple::EnvironmentType, 1> UnsupportedEnvironments;
-};
-
-} // namespace llvm
-
-#endif
-
diff --git a/gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/MCJITTestBase.h b/gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/MCJITTestBase.h
deleted file mode 100644
index e0c4b07a71b..00000000000
--- a/gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/MCJITTestBase.h
+++ /dev/null
@@ -1,333 +0,0 @@
-//===- MCJITTestBase.h - Common base class for MCJIT Unit tests -*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This class implements common functionality required by the MCJIT unit tests,
-// as well as logic to skip tests on unsupported architectures and operating
-// systems.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_UNITTESTS_EXECUTIONENGINE_MCJIT_MCJITTESTBASE_H
-#define LLVM_UNITTESTS_EXECUTIONENGINE_MCJIT_MCJITTESTBASE_H
-
-#include "MCJITTestAPICommon.h"
-#include "llvm/Config/config.h"
-#include "llvm/ExecutionEngine/ExecutionEngine.h"
-#include "llvm/ExecutionEngine/SectionMemoryManager.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/Type.h"
-#include "llvm/Support/CodeGen.h"
-
-namespace llvm {
-
-/// Helper class that can build very simple Modules
-class TrivialModuleBuilder {
-protected:
-  LLVMContext Context;
-  IRBuilder<> Builder;
-  std::string BuilderTriple;
-
-  TrivialModuleBuilder(const std::string &Triple)
-    : Builder(Context), BuilderTriple(Triple) {}
-
-  Module *createEmptyModule(StringRef Name = StringRef()) {
-    Module * M = new Module(Name, Context);
-    M->setTargetTriple(Triple::normalize(BuilderTriple));
-    return M;
-  }
-
-  Function *startFunction(Module *M, FunctionType *FT, StringRef Name) {
-    Function *Result =
-        Function::Create(FT, GlobalValue::ExternalLinkage, Name, M);
-
-    BasicBlock *BB = BasicBlock::Create(Context, Name, Result);
-    Builder.SetInsertPoint(BB);
-
-    return Result;
-  }
-
-  void endFunctionWithRet(Function *Func, Value *RetValue) {
-    Builder.CreateRet(RetValue);
-  }
-
-  // Inserts a simple function that invokes Callee and takes the same arguments:
-  //    int Caller(...) { return Callee(...); }
-  Function *insertSimpleCallFunction(Module *M, Function *Callee) {
-    Function *Result = startFunction(M, Callee->getFunctionType(), "caller");
-
-    SmallVector<Value*, 1> CallArgs;
-
-    for (Argument &A : Result->args())
-      CallArgs.push_back(&A);
-
-    Value *ReturnCode = Builder.CreateCall(Callee, CallArgs);
-    Builder.CreateRet(ReturnCode);
-    return Result;
-  }
-
-  // Inserts a function named 'main' that returns a uint32_t:
-  //    int32_t main() { return X; }
-  // where X is given by returnCode
-  Function *insertMainFunction(Module *M, uint32_t returnCode) {
-    Function *Result = startFunction(
-        M, FunctionType::get(Type::getInt32Ty(Context), {}, false), "main");
-
-    Value *ReturnVal = ConstantInt::get(Context, APInt(32, returnCode));
-    endFunctionWithRet(Result, ReturnVal);
-
-    return Result;
-  }
-
-  // Inserts a function
-  //    int32_t add(int32_t a, int32_t b) { return a + b; }
-  // in the current module and returns a pointer to it.
-  Function *insertAddFunction(Module *M, StringRef Name = "add") {
-    Function *Result = startFunction(
-        M,
-        FunctionType::get(
-            Type::getInt32Ty(Context),
-            {Type::getInt32Ty(Context), Type::getInt32Ty(Context)}, false),
-        Name);
-
-    Function::arg_iterator args = Result->arg_begin();
-    Value *Arg1 = &*args;
-    Value *Arg2 = &*++args;
-    Value *AddResult = Builder.CreateAdd(Arg1, Arg2);
-
-    endFunctionWithRet(Result, AddResult);
-
-    return Result;
-  }
-
-  // Inserts a declaration to a function defined elsewhere
-  Function *insertExternalReferenceToFunction(Module *M, FunctionType *FTy,
-                                              StringRef Name) {
-    Function *Result =
-        Function::Create(FTy, GlobalValue::ExternalLinkage, Name, M);
-    return Result;
-  }
-
-  // Inserts an declaration to a function defined elsewhere
-  Function *insertExternalReferenceToFunction(Module *M, Function *Func) {
-    Function *Result = Function::Create(Func->getFunctionType(),
-                                        GlobalValue::ExternalLinkage,
-                                        Func->getName(), M);
-    return Result;
-  }
-
-  // Inserts a global variable of type int32
-  // FIXME: make this a template function to support any type
-  GlobalVariable *insertGlobalInt32(Module *M,
-                                    StringRef name,
-                                    int32_t InitialValue) {
-    Type *GlobalTy = Type::getInt32Ty(Context);
-    Constant *IV = ConstantInt::get(Context, APInt(32, InitialValue));
-    GlobalVariable *Global = new GlobalVariable(*M,
-                                                GlobalTy,
-                                                false,
-                                                GlobalValue::ExternalLinkage,
-                                                IV,
-                                                name);
-    return Global;
-  }
-
-  // Inserts a function
-  //   int32_t recursive_add(int32_t num) {
-  //     if (num == 0) {
-  //       return num;
-  //     } else {
-  //       int32_t recursive_param = num - 1;
-  //       return num + Helper(recursive_param);
-  //     }
-  //   }
-  // NOTE: if Helper is left as the default parameter, Helper == recursive_add.
-  Function *insertAccumulateFunction(Module *M,
-                                     Function *Helper = nullptr,
-                                     StringRef Name = "accumulate") {
-    Function *Result =
-        startFunction(M,
-                      FunctionType::get(Type::getInt32Ty(Context),
-                                        {Type::getInt32Ty(Context)}, false),
-                      Name);
-    if (!Helper)
-      Helper = Result;
-
-    BasicBlock *BaseCase = BasicBlock::Create(Context, "", Result);
-    BasicBlock *RecursiveCase = BasicBlock::Create(Context, "", Result);
-
-    // if (num == 0)
-    Value *Param = &*Result->arg_begin();
-    Value *Zero = ConstantInt::get(Context, APInt(32, 0));
-    Builder.CreateCondBr(Builder.CreateICmpEQ(Param, Zero),
-                         BaseCase, RecursiveCase);
-
-    //   return num;
-    Builder.SetInsertPoint(BaseCase);
-    Builder.CreateRet(Param);
-
-    //   int32_t recursive_param = num - 1;
-    //   return Helper(recursive_param);
-    Builder.SetInsertPoint(RecursiveCase);
-    Value *One = ConstantInt::get(Context, APInt(32, 1));
-    Value *RecursiveParam = Builder.CreateSub(Param, One);
-    Value *RecursiveReturn = Builder.CreateCall(Helper, RecursiveParam);
-    Value *Accumulator = Builder.CreateAdd(Param, RecursiveReturn);
-    Builder.CreateRet(Accumulator);
-
-    return Result;
-  }
-
-  // Populates Modules A and B:
-  // Module A { Extern FB1, Function FA which calls FB1 },
-  // Module B { Extern FA, Function FB1, Function FB2 which calls FA },
-  void createCrossModuleRecursiveCase(std::unique_ptr<Module> &A, Function *&FA,
-                                      std::unique_ptr<Module> &B,
-                                      Function *&FB1, Function *&FB2) {
-    // Define FB1 in B.
-    B.reset(createEmptyModule("B"));
-    FB1 = insertAccumulateFunction(B.get(), nullptr, "FB1");
-
-    // Declare FB1 in A (as an external).
-    A.reset(createEmptyModule("A"));
-    Function *FB1Extern = insertExternalReferenceToFunction(A.get(), FB1);
-
-    // Define FA in A (with a call to FB1).
-    FA = insertAccumulateFunction(A.get(), FB1Extern, "FA");
-
-    // Declare FA in B (as an external)
-    Function *FAExtern = insertExternalReferenceToFunction(B.get(), FA);
-
-    // Define FB2 in B (with a call to FA)
-    FB2 = insertAccumulateFunction(B.get(), FAExtern, "FB2");
-  }
-
-  // Module A { Function FA },
-  // Module B { Extern FA, Function FB which calls FA },
-  // Module C { Extern FB, Function FC which calls FB },
-  void
-  createThreeModuleChainedCallsCase(std::unique_ptr<Module> &A, Function *&FA,
-                                    std::unique_ptr<Module> &B, Function *&FB,
-                                    std::unique_ptr<Module> &C, Function *&FC) {
-    A.reset(createEmptyModule("A"));
-    FA = insertAddFunction(A.get());
-
-    B.reset(createEmptyModule("B"));
-    Function *FAExtern_in_B = insertExternalReferenceToFunction(B.get(), FA);
-    FB = insertSimpleCallFunction(B.get(), FAExtern_in_B);
-
-    C.reset(createEmptyModule("C"));
-    Function *FBExtern_in_C = insertExternalReferenceToFunction(C.get(), FB);
-    FC = insertSimpleCallFunction(C.get(), FBExtern_in_C);
-  }
-
-  // Module A { Function FA },
-  // Populates Modules A and B:
-  // Module B { Function FB }
-  void createTwoModuleCase(std::unique_ptr<Module> &A, Function *&FA,
-                           std::unique_ptr<Module> &B, Function *&FB) {
-    A.reset(createEmptyModule("A"));
-    FA = insertAddFunction(A.get());
-
-    B.reset(createEmptyModule("B"));
-    FB = insertAddFunction(B.get());
-  }
-
-  // Module A { Function FA },
-  // Module B { Extern FA, Function FB which calls FA }
-  void createTwoModuleExternCase(std::unique_ptr<Module> &A, Function *&FA,
-                                 std::unique_ptr<Module> &B, Function *&FB) {
-    A.reset(createEmptyModule("A"));
-    FA = insertAddFunction(A.get());
-
-    B.reset(createEmptyModule("B"));
-    Function *FAExtern_in_B = insertExternalReferenceToFunction(B.get(), FA);
-    FB = insertSimpleCallFunction(B.get(), FAExtern_in_B);
-  }
-
-  // Module A { Function FA },
-  // Module B { Extern FA, Function FB which calls FA },
-  // Module C { Extern FB, Function FC which calls FA },
-  void createThreeModuleCase(std::unique_ptr<Module> &A, Function *&FA,
-                             std::unique_ptr<Module> &B, Function *&FB,
-                             std::unique_ptr<Module> &C, Function *&FC) {
-    A.reset(createEmptyModule("A"));
-    FA = insertAddFunction(A.get());
-
-    B.reset(createEmptyModule("B"));
-    Function *FAExtern_in_B = insertExternalReferenceToFunction(B.get(), FA);
-    FB = insertSimpleCallFunction(B.get(), FAExtern_in_B);
-
-    C.reset(createEmptyModule("C"));
-    Function *FAExtern_in_C = insertExternalReferenceToFunction(C.get(), FA);
-    FC = insertSimpleCallFunction(C.get(), FAExtern_in_C);
-  }
-};
-
-class MCJITTestBase : public MCJITTestAPICommon, public TrivialModuleBuilder {
-protected:
-  MCJITTestBase()
-      : TrivialModuleBuilder(HostTriple), OptLevel(CodeGenOpt::None),
-        CodeModel(CodeModel::Small), MArch(""), MM(new SectionMemoryManager) {
-    // The architectures below are known to be compatible with MCJIT as they
-    // are copied from test/ExecutionEngine/MCJIT/lit.local.cfg and should be
-    // kept in sync.
-    SupportedArchs.push_back(Triple::aarch64);
-    SupportedArchs.push_back(Triple::arm);
-    SupportedArchs.push_back(Triple::mips);
-    SupportedArchs.push_back(Triple::mipsel);
-    SupportedArchs.push_back(Triple::mips64);
-    SupportedArchs.push_back(Triple::mips64el);
-    SupportedArchs.push_back(Triple::x86);
-    SupportedArchs.push_back(Triple::x86_64);
-
-    // Some architectures have sub-architectures in which tests will fail, like
-    // ARM. These two vectors will define if they do have sub-archs (to avoid
-    // extra work for those who don't), and if so, if they are listed to work
-    HasSubArchs.push_back(Triple::arm);
-    SupportedSubArchs.push_back("armv6");
-    SupportedSubArchs.push_back("armv7");
-
-    UnsupportedEnvironments.push_back(Triple::Cygnus);
-  }
-
-  void createJIT(std::unique_ptr<Module> M) {
-
-    // Due to the EngineBuilder constructor, it is required to have a Module
-    // in order to construct an ExecutionEngine (i.e. MCJIT)
-    assert(M != 0 && "a non-null Module must be provided to create MCJIT");
-
-    EngineBuilder EB(std::move(M));
-    std::string Error;
-    TheJIT.reset(EB.setEngineKind(EngineKind::JIT)
-                 .setMCJITMemoryManager(std::move(MM))
-                 .setErrorStr(&Error)
-                 .setOptLevel(CodeGenOpt::None)
-                 .setMArch(MArch)
-                 .setMCPU(sys::getHostCPUName())
-                 //.setMAttrs(MAttrs)
-                 .create());
-    // At this point, we cannot modify the module any more.
-    assert(TheJIT.get() != NULL && "error creating MCJIT with EngineBuilder");
-  }
-
-  CodeGenOpt::Level OptLevel;
-  CodeModel::Model CodeModel;
-  StringRef MArch;
-  SmallVector<std::string, 1> MAttrs;
-  std::unique_ptr<ExecutionEngine> TheJIT;
-  std::unique_ptr<RTDyldMemoryManager> MM;
-
-  std::unique_ptr<Module> M;
-};
-
-} // namespace llvm
-
-#endif // LLVM_UNITTESTS_EXECUTIONENGINE_MCJIT_MCJITTESTBASE_H
diff --git a/gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/MCJITTests.def b/gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/MCJITTests.def
deleted file mode 100644
index aabd2247c04..00000000000
--- a/gnu/llvm/llvm/unittests/ExecutionEngine/MCJIT/MCJITTests.def
+++ /dev/null
@@ -1 +0,0 @@
-EXPORTS
diff --git a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/CMakeLists.txt b/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/CMakeLists.txt
deleted file mode 100644
index 5c2a7879dcd..00000000000
--- a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/CMakeLists.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-
-set(LLVM_LINK_COMPONENTS
-  Core
-  ExecutionEngine
-  IRReader
-  JITLink
-  Object
-  OrcJIT
-  OrcShared
-  OrcTargetProcess
-  Passes
-  RuntimeDyld
-  Support
-  native
-  )
-
-add_llvm_unittest(OrcJITTests
-  CoreAPIsTest.cpp
-  ExecutionSessionWrapperFunctionCallsTest.cpp
-  IndirectionUtilsTest.cpp
-  JITTargetMachineBuilderTest.cpp
-  LazyCallThroughAndReexportsTest.cpp
-  ObjectLinkingLayerTest.cpp
-  OrcCAPITest.cpp
-  OrcTestCommon.cpp
-  QueueChannel.cpp
-  ResourceTrackerTest.cpp
-  RPCUtilsTest.cpp
-  RTDyldObjectLinkingLayerTest.cpp
-  SimplePackedSerializationTest.cpp
-  SymbolStringPoolTest.cpp
-  ThreadSafeModuleTest.cpp
-  WrapperFunctionUtilsTest.cpp
-  )
-
-target_link_libraries(OrcJITTests PRIVATE
-                        LLVMTestingSupport
-                        ${ORC_JIT_TEST_LIBS})
diff --git a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/CoreAPIsTest.cpp b/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/CoreAPIsTest.cpp
deleted file mode 100644
index 020a261ac23..00000000000
--- a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/CoreAPIsTest.cpp
+++ /dev/null
@@ -1,1499 +0,0 @@
-//===----------- CoreAPIsTest.cpp - Unit tests for Core ORC APIs ----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "OrcTestCommon.h"
-#include "llvm/Config/llvm-config.h"
-#include "llvm/ExecutionEngine/Orc/Core.h"
-#include "llvm/ExecutionEngine/Orc/Shared/OrcError.h"
-#include "llvm/Testing/Support/Error.h"
-
-#include <set>
-#include <thread>
-
-using namespace llvm;
-using namespace llvm::orc;
-
-class CoreAPIsStandardTest : public CoreAPIsBasedStandardTest {};
-
-namespace {
-
-TEST_F(CoreAPIsStandardTest, BasicSuccessfulLookup) {
-  bool OnCompletionRun = false;
-
-  auto OnCompletion = [&](Expected<SymbolMap> Result) {
-    EXPECT_TRUE(!!Result) << "Resolution unexpectedly returned error";
-    auto &Resolved = *Result;
-    auto I = Resolved.find(Foo);
-    EXPECT_NE(I, Resolved.end()) << "Could not find symbol definition";
-    EXPECT_EQ(I->second.getAddress(), FooAddr)
-        << "Resolution returned incorrect result";
-    OnCompletionRun = true;
-  };
-
-  std::unique_ptr<MaterializationResponsibility> FooMR;
-
-  cantFail(JD.define(std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Foo, FooSym.getFlags()}}),
-      [&](std::unique_ptr<MaterializationResponsibility> R) {
-        FooMR = std::move(R);
-      })));
-
-  ES.lookup(LookupKind::Static, makeJITDylibSearchOrder(&JD),
-            SymbolLookupSet(Foo), SymbolState::Ready, OnCompletion,
-            NoDependenciesToRegister);
-
-  EXPECT_FALSE(OnCompletionRun) << "Should not have been resolved yet";
-
-  cantFail(FooMR->notifyResolved({{Foo, FooSym}}));
-
-  EXPECT_FALSE(OnCompletionRun) << "Should not be ready yet";
-
-  cantFail(FooMR->notifyEmitted());
-
-  EXPECT_TRUE(OnCompletionRun) << "Should have been marked ready";
-}
-
-TEST_F(CoreAPIsStandardTest, EmptyLookup) {
-  bool OnCompletionRun = false;
-
-  auto OnCompletion = [&](Expected<SymbolMap> Result) {
-    cantFail(std::move(Result));
-    OnCompletionRun = true;
-  };
-
-  ES.lookup(LookupKind::Static, makeJITDylibSearchOrder(&JD), SymbolLookupSet(),
-            SymbolState::Ready, OnCompletion, NoDependenciesToRegister);
-
-  EXPECT_TRUE(OnCompletionRun) << "OnCompletion was not run for empty query";
-}
-
-TEST_F(CoreAPIsStandardTest, ResolveUnrequestedSymbol) {
-  // Test that all symbols in a MaterializationUnit materialize corretly when
-  // only a subset of symbols is looked up.
-  // The aim here is to ensure that we're not relying on the query to set up
-  // state needed to materialize the unrequested symbols.
-
-  cantFail(JD.define(std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Foo, FooSym.getFlags()}, {Bar, BarSym.getFlags()}}),
-      [this](std::unique_ptr<MaterializationResponsibility> R) {
-        cantFail(R->notifyResolved({{Foo, FooSym}, {Bar, BarSym}}));
-        cantFail(R->notifyEmitted());
-      })));
-
-  auto Result =
-      cantFail(ES.lookup(makeJITDylibSearchOrder(&JD), SymbolLookupSet({Foo})));
-  EXPECT_EQ(Result.size(), 1U) << "Unexpected number of results";
-  EXPECT_TRUE(Result.count(Foo)) << "Expected result for \"Foo\"";
-}
-
-TEST_F(CoreAPIsStandardTest, MaterializationSideEffctsOnlyBasic) {
-  // Test that basic materialization-side-effects-only symbols work as expected:
-  // that they can be emitted without being resolved, that queries for them
-  // don't return until they're emitted, and that they don't appear in query
-  // results.
-
-  std::unique_ptr<MaterializationResponsibility> FooR;
-  Optional<SymbolMap> Result;
-
-  cantFail(JD.define(std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap(
-          {{Foo, JITSymbolFlags::Exported |
-                     JITSymbolFlags::MaterializationSideEffectsOnly}}),
-      [&](std::unique_ptr<MaterializationResponsibility> R) {
-        FooR = std::move(R);
-      })));
-
-  ES.lookup(
-      LookupKind::Static, makeJITDylibSearchOrder(&JD),
-      SymbolLookupSet(Foo, SymbolLookupFlags::WeaklyReferencedSymbol),
-      SymbolState::Ready,
-      [&](Expected<SymbolMap> LookupResult) {
-        if (LookupResult)
-          Result = std::move(*LookupResult);
-        else
-          ADD_FAILURE() << "Unexpected lookup error: "
-                        << toString(LookupResult.takeError());
-      },
-      NoDependenciesToRegister);
-
-  EXPECT_FALSE(Result) << "Lookup returned unexpectedly";
-  EXPECT_TRUE(FooR) << "Lookup failed to trigger materialization";
-  EXPECT_THAT_ERROR(FooR->notifyEmitted(), Succeeded())
-      << "Emission of materialization-side-effects-only symbol failed";
-
-  EXPECT_TRUE(Result) << "Lookup failed to return";
-  EXPECT_TRUE(Result->empty()) << "Lookup result contained unexpected value";
-}
-
-TEST_F(CoreAPIsStandardTest, MaterializationSideEffectsOnlyFailuresPersist) {
-  // Test that when a MaterializationSideEffectsOnly symbol is failed it
-  // remains in the failure state rather than vanishing.
-
-  cantFail(JD.define(std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap(
-          {{Foo, JITSymbolFlags::Exported |
-                     JITSymbolFlags::MaterializationSideEffectsOnly}}),
-      [&](std::unique_ptr<MaterializationResponsibility> R) {
-        R->failMaterialization();
-      })));
-
-  EXPECT_THAT_EXPECTED(
-      ES.lookup(makeJITDylibSearchOrder(&JD), SymbolLookupSet({Foo})),
-      Failed());
-  EXPECT_THAT_EXPECTED(
-      ES.lookup(makeJITDylibSearchOrder(&JD), SymbolLookupSet({Foo})),
-      Failed());
-}
-
-TEST_F(CoreAPIsStandardTest, RemoveSymbolsTest) {
-  // Test that:
-  // (1) Missing symbols generate a SymbolsNotFound error.
-  // (2) Materializing symbols generate a SymbolCouldNotBeRemoved error.
-  // (3) Removal of unmaterialized symbols triggers discard on the
-  //     materialization unit.
-  // (4) Removal of symbols destroys empty materialization units.
-  // (5) Removal of materialized symbols works.
-
-  // Foo will be fully materialized.
-  cantFail(JD.define(absoluteSymbols({{Foo, FooSym}})));
-
-  // Bar will be unmaterialized.
-  bool BarDiscarded = false;
-  bool BarMaterializerDestructed = false;
-  cantFail(JD.define(std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Bar, BarSym.getFlags()}}),
-      [this](std::unique_ptr<MaterializationResponsibility> R) {
-        ADD_FAILURE() << "Unexpected materialization of \"Bar\"";
-        cantFail(R->notifyResolved({{Bar, BarSym}}));
-        cantFail(R->notifyEmitted());
-      },
-      nullptr,
-      [&](const JITDylib &JD, const SymbolStringPtr &Name) {
-        EXPECT_EQ(Name, Bar) << "Expected \"Bar\" to be discarded";
-        if (Name == Bar)
-          BarDiscarded = true;
-      },
-      [&]() { BarMaterializerDestructed = true; })));
-
-  // Baz will be in the materializing state initially, then
-  // materialized for the final removal attempt.
-  std::unique_ptr<MaterializationResponsibility> BazR;
-  cantFail(JD.define(std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Baz, BazSym.getFlags()}}),
-      [&](std::unique_ptr<MaterializationResponsibility> R) {
-        BazR = std::move(R);
-      },
-      nullptr,
-      [](const JITDylib &JD, const SymbolStringPtr &Name) {
-        ADD_FAILURE() << "\"Baz\" discarded unexpectedly";
-      })));
-
-  bool OnCompletionRun = false;
-  ES.lookup(
-      LookupKind::Static, makeJITDylibSearchOrder(&JD),
-      SymbolLookupSet({Foo, Baz}), SymbolState::Ready,
-      [&](Expected<SymbolMap> Result) {
-        cantFail(Result.takeError());
-        OnCompletionRun = true;
-      },
-      NoDependenciesToRegister);
-
-  {
-    // Attempt 1: Search for a missing symbol, Qux.
-    auto Err = JD.remove({Foo, Bar, Baz, Qux});
-    EXPECT_TRUE(!!Err) << "Expected failure";
-    EXPECT_TRUE(Err.isA<SymbolsNotFound>())
-        << "Expected a SymbolsNotFound error";
-    consumeError(std::move(Err));
-  }
-
-  {
-    // Attempt 2: Search for a symbol that is still materializing, Baz.
-    auto Err = JD.remove({Foo, Bar, Baz});
-    EXPECT_TRUE(!!Err) << "Expected failure";
-    EXPECT_TRUE(Err.isA<SymbolsCouldNotBeRemoved>())
-        << "Expected a SymbolsNotFound error";
-    consumeError(std::move(Err));
-  }
-
-  cantFail(BazR->notifyResolved({{Baz, BazSym}}));
-  cantFail(BazR->notifyEmitted());
-  {
-    // Attempt 3: Search now that all symbols are fully materialized
-    // (Foo, Baz), or not yet materialized (Bar).
-    auto Err = JD.remove({Foo, Bar, Baz});
-    EXPECT_FALSE(!!Err) << "Expected success";
-  }
-
-  EXPECT_TRUE(BarDiscarded) << "\"Bar\" should have been discarded";
-  EXPECT_TRUE(BarMaterializerDestructed)
-      << "\"Bar\"'s materializer should have been destructed";
-  EXPECT_TRUE(OnCompletionRun) << "OnCompletion should have been run";
-}
-
-TEST_F(CoreAPIsStandardTest, LookupWithHiddenSymbols) {
-  auto BarHiddenFlags = BarSym.getFlags() & ~JITSymbolFlags::Exported;
-  auto BarHiddenSym = JITEvaluatedSymbol(BarSym.getAddress(), BarHiddenFlags);
-
-  cantFail(JD.define(absoluteSymbols({{Foo, FooSym}, {Bar, BarHiddenSym}})));
-
-  auto &JD2 = ES.createBareJITDylib("JD2");
-  cantFail(JD2.define(absoluteSymbols({{Bar, QuxSym}})));
-
-  /// Try a blocking lookup.
-  auto Result = cantFail(ES.lookup(makeJITDylibSearchOrder({&JD, &JD2}),
-                                   SymbolLookupSet({Foo, Bar})));
-
-  EXPECT_EQ(Result.size(), 2U) << "Unexpected number of results";
-  EXPECT_EQ(Result.count(Foo), 1U) << "Missing result for \"Foo\"";
-  EXPECT_EQ(Result.count(Bar), 1U) << "Missing result for \"Bar\"";
-  EXPECT_EQ(Result[Bar].getAddress(), QuxSym.getAddress())
-      << "Wrong result for \"Bar\"";
-}
-
-TEST_F(CoreAPIsStandardTest, LookupFlagsTest) {
-  // Test that lookupFlags works on a predefined symbol, and does not trigger
-  // materialization of a lazy symbol. Make the lazy symbol weak to test that
-  // the weak flag is propagated correctly.
-
-  BarSym.setFlags(static_cast<JITSymbolFlags::FlagNames>(
-      JITSymbolFlags::Exported | JITSymbolFlags::Weak));
-  auto MU = std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Bar, BarSym.getFlags()}}),
-      [](std::unique_ptr<MaterializationResponsibility> R) {
-        llvm_unreachable("Symbol materialized on flags lookup");
-      });
-
-  cantFail(JD.define(absoluteSymbols({{Foo, FooSym}})));
-  cantFail(JD.define(std::move(MU)));
-
-  auto SymbolFlags = cantFail(ES.lookupFlags(
-      LookupKind::Static,
-      {{&JD, JITDylibLookupFlags::MatchExportedSymbolsOnly}},
-      SymbolLookupSet({Foo, Bar, Baz},
-                      SymbolLookupFlags::WeaklyReferencedSymbol)));
-
-  EXPECT_EQ(SymbolFlags.size(), 2U)
-      << "Returned symbol flags contains unexpected results";
-  EXPECT_EQ(SymbolFlags.count(Foo), 1U) << "Missing lookupFlags result for Foo";
-  EXPECT_EQ(SymbolFlags[Foo], FooSym.getFlags())
-      << "Incorrect flags returned for Foo";
-  EXPECT_EQ(SymbolFlags.count(Bar), 1U)
-      << "Missing  lookupFlags result for Bar";
-  EXPECT_EQ(SymbolFlags[Bar], BarSym.getFlags())
-      << "Incorrect flags returned for Bar";
-}
-
-TEST_F(CoreAPIsStandardTest, LookupWithGeneratorFailure) {
-
-  class BadGenerator : public DefinitionGenerator {
-  public:
-    Error tryToGenerate(LookupState &LS, LookupKind K, JITDylib &,
-                        JITDylibLookupFlags, const SymbolLookupSet &) override {
-      return make_error<StringError>("BadGenerator", inconvertibleErrorCode());
-    }
-  };
-
-  JD.addGenerator(std::make_unique<BadGenerator>());
-
-  EXPECT_THAT_ERROR(
-      ES.lookupFlags(LookupKind::Static,
-                     {{&JD, JITDylibLookupFlags::MatchExportedSymbolsOnly}},
-                     SymbolLookupSet(Foo))
-          .takeError(),
-      Failed<StringError>())
-      << "Generator failure did not propagate through lookupFlags";
-
-  EXPECT_THAT_ERROR(
-      ES.lookup(makeJITDylibSearchOrder(&JD), SymbolLookupSet(Foo)).takeError(),
-      Failed<StringError>())
-      << "Generator failure did not propagate through lookup";
-}
-
-TEST_F(CoreAPIsStandardTest, TestBasicAliases) {
-  cantFail(JD.define(absoluteSymbols({{Foo, FooSym}, {Bar, BarSym}})));
-  cantFail(JD.define(symbolAliases({{Baz, {Foo, JITSymbolFlags::Exported}},
-                                    {Qux, {Bar, JITSymbolFlags::Weak}}})));
-  cantFail(JD.define(absoluteSymbols({{Qux, QuxSym}})));
-
-  auto Result =
-      ES.lookup(makeJITDylibSearchOrder(&JD), SymbolLookupSet({Baz, Qux}));
-  EXPECT_TRUE(!!Result) << "Unexpected lookup failure";
-  EXPECT_EQ(Result->count(Baz), 1U) << "No result for \"baz\"";
-  EXPECT_EQ(Result->count(Qux), 1U) << "No result for \"qux\"";
-  EXPECT_EQ((*Result)[Baz].getAddress(), FooSym.getAddress())
-      << "\"Baz\"'s address should match \"Foo\"'s";
-  EXPECT_EQ((*Result)[Qux].getAddress(), QuxSym.getAddress())
-      << "The \"Qux\" alias should have been overriden";
-}
-
-TEST_F(CoreAPIsStandardTest, TestChainedAliases) {
-  cantFail(JD.define(absoluteSymbols({{Foo, FooSym}})));
-  cantFail(JD.define(symbolAliases(
-      {{Baz, {Bar, BazSym.getFlags()}}, {Bar, {Foo, BarSym.getFlags()}}})));
-
-  auto Result =
-      ES.lookup(makeJITDylibSearchOrder(&JD), SymbolLookupSet({Bar, Baz}));
-  EXPECT_TRUE(!!Result) << "Unexpected lookup failure";
-  EXPECT_EQ(Result->count(Bar), 1U) << "No result for \"bar\"";
-  EXPECT_EQ(Result->count(Baz), 1U) << "No result for \"baz\"";
-  EXPECT_EQ((*Result)[Bar].getAddress(), FooSym.getAddress())
-      << "\"Bar\"'s address should match \"Foo\"'s";
-  EXPECT_EQ((*Result)[Baz].getAddress(), FooSym.getAddress())
-      << "\"Baz\"'s address should match \"Foo\"'s";
-}
-
-TEST_F(CoreAPIsStandardTest, TestBasicReExports) {
-  // Test that the basic use case of re-exporting a single symbol from another
-  // JITDylib works.
-  cantFail(JD.define(absoluteSymbols({{Foo, FooSym}})));
-
-  auto &JD2 = ES.createBareJITDylib("JD2");
-
-  cantFail(JD2.define(reexports(JD, {{Bar, {Foo, BarSym.getFlags()}}})));
-
-  auto Result = cantFail(ES.lookup(makeJITDylibSearchOrder(&JD2), Bar));
-  EXPECT_EQ(Result.getAddress(), FooSym.getAddress())
-      << "Re-export Bar for symbol Foo should match FooSym's address";
-}
-
-TEST_F(CoreAPIsStandardTest, TestThatReExportsDontUnnecessarilyMaterialize) {
-  // Test that re-exports do not materialize symbols that have not been queried
-  // for.
-  cantFail(JD.define(absoluteSymbols({{Foo, FooSym}})));
-
-  bool BarMaterialized = false;
-  auto BarMU = std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Bar, BarSym.getFlags()}}),
-      [&](std::unique_ptr<MaterializationResponsibility> R) {
-        BarMaterialized = true;
-        cantFail(R->notifyResolved({{Bar, BarSym}}));
-        cantFail(R->notifyEmitted());
-      });
-
-  cantFail(JD.define(BarMU));
-
-  auto &JD2 = ES.createBareJITDylib("JD2");
-
-  cantFail(JD2.define(reexports(
-      JD, {{Baz, {Foo, BazSym.getFlags()}}, {Qux, {Bar, QuxSym.getFlags()}}})));
-
-  auto Result = cantFail(ES.lookup(makeJITDylibSearchOrder(&JD2), Baz));
-  EXPECT_EQ(Result.getAddress(), FooSym.getAddress())
-      << "Re-export Baz for symbol Foo should match FooSym's address";
-
-  EXPECT_FALSE(BarMaterialized) << "Bar should not have been materialized";
-}
-
-TEST_F(CoreAPIsStandardTest, TestReexportsGenerator) {
-  // Test that a re-exports generator can dynamically generate reexports.
-
-  auto &JD2 = ES.createBareJITDylib("JD2");
-  cantFail(JD2.define(absoluteSymbols({{Foo, FooSym}, {Bar, BarSym}})));
-
-  auto Filter = [this](SymbolStringPtr Name) { return Name != Bar; };
-
-  JD.addGenerator(std::make_unique<ReexportsGenerator>(
-      JD2, JITDylibLookupFlags::MatchExportedSymbolsOnly, Filter));
-
-  auto Flags = cantFail(ES.lookupFlags(
-      LookupKind::Static,
-      {{&JD, JITDylibLookupFlags::MatchExportedSymbolsOnly}},
-      SymbolLookupSet({Foo, Bar, Baz},
-                      SymbolLookupFlags::WeaklyReferencedSymbol)));
-  EXPECT_EQ(Flags.size(), 1U) << "Unexpected number of results";
-  EXPECT_EQ(Flags[Foo], FooSym.getFlags()) << "Unexpected flags for Foo";
-
-  auto Result = cantFail(ES.lookup(makeJITDylibSearchOrder(&JD), Foo));
-
-  EXPECT_EQ(Result.getAddress(), FooSym.getAddress())
-      << "Incorrect reexported symbol address";
-}
-
-TEST_F(CoreAPIsStandardTest, TestTrivialCircularDependency) {
-  std::unique_ptr<MaterializationResponsibility> FooR;
-  auto FooMU = std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Foo, FooSym.getFlags()}}),
-      [&](std::unique_ptr<MaterializationResponsibility> R) {
-        FooR = std::move(R);
-      });
-
-  cantFail(JD.define(FooMU));
-
-  bool FooReady = false;
-  auto OnCompletion = [&](Expected<SymbolMap> Result) {
-    cantFail(std::move(Result));
-    FooReady = true;
-  };
-
-  ES.lookup(LookupKind::Static, makeJITDylibSearchOrder(&JD),
-            SymbolLookupSet({Foo}), SymbolState::Ready, OnCompletion,
-            NoDependenciesToRegister);
-
-  FooR->addDependenciesForAll({{&JD, SymbolNameSet({Foo})}});
-  EXPECT_THAT_ERROR(FooR->notifyResolved({{Foo, FooSym}}), Succeeded())
-      << "No symbols marked failed, but Foo failed to resolve";
-  EXPECT_THAT_ERROR(FooR->notifyEmitted(), Succeeded())
-      << "No symbols marked failed, but Foo failed to emit";
-
-  EXPECT_TRUE(FooReady)
-    << "Self-dependency prevented symbol from being marked ready";
-}
-
-TEST_F(CoreAPIsStandardTest, TestCircularDependenceInOneJITDylib) {
-  // Test that a circular symbol dependency between three symbols in a JITDylib
-  // does not prevent any symbol from becoming 'ready' once all symbols are
-  // emitted.
-
-  std::unique_ptr<MaterializationResponsibility> FooR;
-  std::unique_ptr<MaterializationResponsibility> BarR;
-  std::unique_ptr<MaterializationResponsibility> BazR;
-
-  // Create a MaterializationUnit for each symbol that moves the
-  // MaterializationResponsibility into one of the locals above.
-  auto FooMU = std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Foo, FooSym.getFlags()}}),
-      [&](std::unique_ptr<MaterializationResponsibility> R) {
-        FooR = std::move(R);
-      });
-
-  auto BarMU = std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Bar, BarSym.getFlags()}}),
-      [&](std::unique_ptr<MaterializationResponsibility> R) {
-        BarR = std::move(R);
-      });
-
-  auto BazMU = std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Baz, BazSym.getFlags()}}),
-      [&](std::unique_ptr<MaterializationResponsibility> R) {
-        BazR = std::move(R);
-      });
-
-  // Define the symbols.
-  cantFail(JD.define(FooMU));
-  cantFail(JD.define(BarMU));
-  cantFail(JD.define(BazMU));
-
-  // Query each of the symbols to trigger materialization.
-  bool FooResolved = false;
-  bool FooReady = false;
-
-  auto OnFooResolution = [&](Expected<SymbolMap> Result) {
-    cantFail(std::move(Result));
-    FooResolved = true;
-  };
-
-  auto OnFooReady = [&](Expected<SymbolMap> Result) {
-    cantFail(std::move(Result));
-    FooReady = true;
-  };
-
-  // Issue lookups for Foo. Use NoDependenciesToRegister: We're going to add
-  // the dependencies manually below.
-  ES.lookup(LookupKind::Static, makeJITDylibSearchOrder(&JD),
-            SymbolLookupSet(Foo), SymbolState::Resolved,
-            std::move(OnFooResolution), NoDependenciesToRegister);
-
-  ES.lookup(LookupKind::Static, makeJITDylibSearchOrder(&JD),
-            SymbolLookupSet(Foo), SymbolState::Ready, std::move(OnFooReady),
-            NoDependenciesToRegister);
-
-  bool BarResolved = false;
-  bool BarReady = false;
-  auto OnBarResolution = [&](Expected<SymbolMap> Result) {
-    cantFail(std::move(Result));
-    BarResolved = true;
-  };
-
-  auto OnBarReady = [&](Expected<SymbolMap> Result) {
-    cantFail(std::move(Result));
-    BarReady = true;
-  };
-
-  ES.lookup(LookupKind::Static, makeJITDylibSearchOrder(&JD),
-            SymbolLookupSet(Bar), SymbolState::Resolved,
-            std::move(OnBarResolution), NoDependenciesToRegister);
-
-  ES.lookup(LookupKind::Static, makeJITDylibSearchOrder(&JD),
-            SymbolLookupSet(Bar), SymbolState::Ready, std::move(OnBarReady),
-            NoDependenciesToRegister);
-
-  bool BazResolved = false;
-  bool BazReady = false;
-
-  auto OnBazResolution = [&](Expected<SymbolMap> Result) {
-    cantFail(std::move(Result));
-    BazResolved = true;
-  };
-
-  auto OnBazReady = [&](Expected<SymbolMap> Result) {
-    cantFail(std::move(Result));
-    BazReady = true;
-  };
-
-  ES.lookup(LookupKind::Static, makeJITDylibSearchOrder(&JD),
-            SymbolLookupSet(Baz), SymbolState::Resolved,
-            std::move(OnBazResolution), NoDependenciesToRegister);
-
-  ES.lookup(LookupKind::Static, makeJITDylibSearchOrder(&JD),
-            SymbolLookupSet(Baz), SymbolState::Ready, std::move(OnBazReady),
-            NoDependenciesToRegister);
-
-  // Add a circular dependency: Foo -> Bar, Bar -> Baz, Baz -> Foo.
-  FooR->addDependenciesForAll({{&JD, SymbolNameSet({Bar})}});
-  BarR->addDependenciesForAll({{&JD, SymbolNameSet({Baz})}});
-  BazR->addDependenciesForAll({{&JD, SymbolNameSet({Foo})}});
-
-  // Add self-dependencies for good measure. This tests that the implementation
-  // of addDependencies filters these out.
-  FooR->addDependenciesForAll({{&JD, SymbolNameSet({Foo})}});
-  BarR->addDependenciesForAll({{&JD, SymbolNameSet({Bar})}});
-  BazR->addDependenciesForAll({{&JD, SymbolNameSet({Baz})}});
-
-  // Check that nothing has been resolved yet.
-  EXPECT_FALSE(FooResolved) << "\"Foo\" should not be resolved yet";
-  EXPECT_FALSE(BarResolved) << "\"Bar\" should not be resolved yet";
-  EXPECT_FALSE(BazResolved) << "\"Baz\" should not be resolved yet";
-
-  // Resolve the symbols (but do not emit them).
-  EXPECT_THAT_ERROR(FooR->notifyResolved({{Foo, FooSym}}), Succeeded())
-      << "No symbols failed, but Foo failed to resolve";
-  EXPECT_THAT_ERROR(BarR->notifyResolved({{Bar, BarSym}}), Succeeded())
-      << "No symbols failed, but Bar failed to resolve";
-  EXPECT_THAT_ERROR(BazR->notifyResolved({{Baz, BazSym}}), Succeeded())
-      << "No symbols failed, but Baz failed to resolve";
-
-  // Verify that the symbols have been resolved, but are not ready yet.
-  EXPECT_TRUE(FooResolved) << "\"Foo\" should be resolved now";
-  EXPECT_TRUE(BarResolved) << "\"Bar\" should be resolved now";
-  EXPECT_TRUE(BazResolved) << "\"Baz\" should be resolved now";
-
-  EXPECT_FALSE(FooReady) << "\"Foo\" should not be ready yet";
-  EXPECT_FALSE(BarReady) << "\"Bar\" should not be ready yet";
-  EXPECT_FALSE(BazReady) << "\"Baz\" should not be ready yet";
-
-  // Emit two of the symbols.
-  EXPECT_THAT_ERROR(FooR->notifyEmitted(), Succeeded())
-      << "No symbols failed, but Foo failed to emit";
-  EXPECT_THAT_ERROR(BarR->notifyEmitted(), Succeeded())
-      << "No symbols failed, but Bar failed to emit";
-
-  // Verify that nothing is ready until the circular dependence is resolved.
-  EXPECT_FALSE(FooReady) << "\"Foo\" still should not be ready";
-  EXPECT_FALSE(BarReady) << "\"Bar\" still should not be ready";
-  EXPECT_FALSE(BazReady) << "\"Baz\" still should not be ready";
-
-  // Emit the last symbol.
-  EXPECT_THAT_ERROR(BazR->notifyEmitted(), Succeeded())
-      << "No symbols failed, but Baz failed to emit";
-
-  // Verify that everything becomes ready once the circular dependence resolved.
-  EXPECT_TRUE(FooReady) << "\"Foo\" should be ready now";
-  EXPECT_TRUE(BarReady) << "\"Bar\" should be ready now";
-  EXPECT_TRUE(BazReady) << "\"Baz\" should be ready now";
-}
-
-TEST_F(CoreAPIsStandardTest, FailureInDependency) {
-  std::unique_ptr<MaterializationResponsibility> FooR;
-  std::unique_ptr<MaterializationResponsibility> BarR;
-
-  // Create a MaterializationUnit for each symbol that moves the
-  // MaterializationResponsibility into one of the locals above.
-  auto FooMU = std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Foo, FooSym.getFlags()}}),
-      [&](std::unique_ptr<MaterializationResponsibility> R) {
-        FooR = std::move(R);
-      });
-
-  auto BarMU = std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Bar, BarSym.getFlags()}}),
-      [&](std::unique_ptr<MaterializationResponsibility> R) {
-        BarR = std::move(R);
-      });
-
-  // Define the symbols.
-  cantFail(JD.define(FooMU));
-  cantFail(JD.define(BarMU));
-
-  bool OnFooReadyRun = false;
-  auto OnFooReady = [&](Expected<SymbolMap> Result) {
-    EXPECT_THAT_EXPECTED(std::move(Result), Failed());
-    OnFooReadyRun = true;
-  };
-
-  ES.lookup(LookupKind::Static, makeJITDylibSearchOrder(&JD),
-            SymbolLookupSet(Foo), SymbolState::Ready, std::move(OnFooReady),
-            NoDependenciesToRegister);
-
-  bool OnBarReadyRun = false;
-  auto OnBarReady = [&](Expected<SymbolMap> Result) {
-    EXPECT_THAT_EXPECTED(std::move(Result), Failed());
-    OnBarReadyRun = true;
-  };
-
-  ES.lookup(LookupKind::Static, makeJITDylibSearchOrder(&JD),
-            SymbolLookupSet(Bar), SymbolState::Ready, std::move(OnBarReady),
-            NoDependenciesToRegister);
-
-  // Add a dependency by Foo on Bar.
-  FooR->addDependenciesForAll({{&JD, SymbolNameSet({Bar})}});
-
-  // Fail bar.
-  BarR->failMaterialization();
-
-  // Verify that queries on Bar failed, but queries on Foo have not yet.
-  EXPECT_TRUE(OnBarReadyRun) << "Query for \"Bar\" was not run";
-  EXPECT_FALSE(OnFooReadyRun) << "Query for \"Foo\" was run unexpectedly";
-
-  // Check that we can still resolve Foo (even though it has been failed).
-  EXPECT_THAT_ERROR(FooR->notifyResolved({{Foo, FooSym}}), Failed())
-      << "Expected resolution for \"Foo\" to fail.";
-
-  FooR->failMaterialization();
-
-  // Verify that queries on Foo have now failed.
-  EXPECT_TRUE(OnFooReadyRun) << "Query for \"Foo\" was not run";
-
-  // Verify that subsequent lookups on Bar and Foo fail.
-  EXPECT_THAT_EXPECTED(ES.lookup({&JD}, {Bar}), Failed())
-      << "Lookup on failed symbol should fail";
-
-  EXPECT_THAT_EXPECTED(ES.lookup({&JD}, {Foo}), Failed())
-      << "Lookup on failed symbol should fail";
-}
-
-TEST_F(CoreAPIsStandardTest, FailureInCircularDependency) {
-  std::unique_ptr<MaterializationResponsibility> FooR;
-  std::unique_ptr<MaterializationResponsibility> BarR;
-
-  // Create a MaterializationUnit for each symbol that moves the
-  // MaterializationResponsibility into one of the locals above.
-  auto FooMU = std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Foo, FooSym.getFlags()}}),
-      [&](std::unique_ptr<MaterializationResponsibility> R) {
-        FooR = std::move(R);
-      });
-
-  auto BarMU = std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Bar, BarSym.getFlags()}}),
-      [&](std::unique_ptr<MaterializationResponsibility> R) {
-        BarR = std::move(R);
-      });
-
-  // Define the symbols.
-  cantFail(JD.define(FooMU));
-  cantFail(JD.define(BarMU));
-
-  bool OnFooReadyRun = false;
-  auto OnFooReady = [&](Expected<SymbolMap> Result) {
-    EXPECT_THAT_EXPECTED(std::move(Result), Failed());
-    OnFooReadyRun = true;
-  };
-
-  ES.lookup(LookupKind::Static, makeJITDylibSearchOrder(&JD),
-            SymbolLookupSet(Foo), SymbolState::Ready, std::move(OnFooReady),
-            NoDependenciesToRegister);
-
-  bool OnBarReadyRun = false;
-  auto OnBarReady = [&](Expected<SymbolMap> Result) {
-    EXPECT_THAT_EXPECTED(std::move(Result), Failed());
-    OnBarReadyRun = true;
-  };
-
-  ES.lookup(LookupKind::Static, makeJITDylibSearchOrder(&JD),
-            SymbolLookupSet(Bar), SymbolState::Ready, std::move(OnBarReady),
-            NoDependenciesToRegister);
-
-  // Add a dependency by Foo on Bar and vice-versa.
-  FooR->addDependenciesForAll({{&JD, SymbolNameSet({Bar})}});
-  BarR->addDependenciesForAll({{&JD, SymbolNameSet({Foo})}});
-
-  // Fail bar.
-  BarR->failMaterialization();
-
-  // Verify that queries on Bar failed, but queries on Foo have not yet.
-  EXPECT_TRUE(OnBarReadyRun) << "Query for \"Bar\" was not run";
-  EXPECT_FALSE(OnFooReadyRun) << "Query for \"Foo\" was run unexpectedly";
-
-  // Verify that trying to resolve Foo fails.
-  EXPECT_THAT_ERROR(FooR->notifyResolved({{Foo, FooSym}}), Failed())
-      << "Expected resolution for \"Foo\" to fail.";
-
-  FooR->failMaterialization();
-
-  // Verify that queries on Foo have now failed.
-  EXPECT_TRUE(OnFooReadyRun) << "Query for \"Foo\" was not run";
-
-  // Verify that subsequent lookups on Bar and Foo fail.
-  EXPECT_THAT_EXPECTED(ES.lookup({&JD}, {Bar}), Failed())
-      << "Lookup on failed symbol should fail";
-
-  EXPECT_THAT_EXPECTED(ES.lookup({&JD}, {Foo}), Failed())
-      << "Lookup on failed symbol should fail";
-}
-
-TEST_F(CoreAPIsStandardTest, AddDependencyOnFailedSymbol) {
-  std::unique_ptr<MaterializationResponsibility> FooR;
-  std::unique_ptr<MaterializationResponsibility> BarR;
-
-  // Create a MaterializationUnit for each symbol that moves the
-  // MaterializationResponsibility into one of the locals above.
-  auto FooMU = std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Foo, FooSym.getFlags()}}),
-      [&](std::unique_ptr<MaterializationResponsibility> R) {
-        FooR = std::move(R);
-      });
-
-  auto BarMU = std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Bar, BarSym.getFlags()}}),
-      [&](std::unique_ptr<MaterializationResponsibility> R) {
-        BarR = std::move(R);
-      });
-
-  // Define the symbols.
-  cantFail(JD.define(FooMU));
-  cantFail(JD.define(BarMU));
-
-  bool OnFooReadyRun = false;
-  auto OnFooReady = [&](Expected<SymbolMap> Result) {
-    EXPECT_THAT_EXPECTED(std::move(Result), Failed());
-    OnFooReadyRun = true;
-  };
-
-  ES.lookup(LookupKind::Static, makeJITDylibSearchOrder(&JD),
-            SymbolLookupSet(Foo), SymbolState::Ready, std::move(OnFooReady),
-            NoDependenciesToRegister);
-
-  bool OnBarReadyRun = false;
-  auto OnBarReady = [&](Expected<SymbolMap> Result) {
-    EXPECT_THAT_EXPECTED(std::move(Result), Failed());
-    OnBarReadyRun = true;
-  };
-
-  ES.lookup(LookupKind::Static, makeJITDylibSearchOrder(&JD),
-            SymbolLookupSet(Bar), SymbolState::Ready, std::move(OnBarReady),
-            NoDependenciesToRegister);
-
-  // Fail bar.
-  BarR->failMaterialization();
-
-  // We expect Bar's query to fail immediately, but Foo's query not to have run
-  // yet.
-  EXPECT_TRUE(OnBarReadyRun) << "Query for \"Bar\" was not run";
-  EXPECT_FALSE(OnFooReadyRun) << "Query for \"Foo\" should not have run yet";
-
-  // Add dependency of Foo on Bar.
-  FooR->addDependenciesForAll({{&JD, SymbolNameSet({Bar})}});
-
-  // Check that we can still resolve Foo (even though it has been failed).
-  EXPECT_THAT_ERROR(FooR->notifyResolved({{Foo, FooSym}}), Failed())
-      << "Expected resolution for \"Foo\" to fail.";
-
-  FooR->failMaterialization();
-
-  // Foo's query should have failed before we return from addDependencies.
-  EXPECT_TRUE(OnFooReadyRun) << "Query for \"Foo\" was not run";
-
-  // Verify that subsequent lookups on Bar and Foo fail.
-  EXPECT_THAT_EXPECTED(ES.lookup({&JD}, {Bar}), Failed())
-      << "Lookup on failed symbol should fail";
-
-  EXPECT_THAT_EXPECTED(ES.lookup({&JD}, {Foo}), Failed())
-      << "Lookup on failed symbol should fail";
-}
-
-TEST_F(CoreAPIsStandardTest, FailAfterMaterialization) {
-  std::unique_ptr<MaterializationResponsibility> FooR;
-  std::unique_ptr<MaterializationResponsibility> BarR;
-
-  // Create a MaterializationUnit for each symbol that moves the
-  // MaterializationResponsibility into one of the locals above.
-  auto FooMU = std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Foo, FooSym.getFlags()}}),
-      [&](std::unique_ptr<MaterializationResponsibility> R) {
-        FooR = std::move(R);
-      });
-
-  auto BarMU = std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Bar, BarSym.getFlags()}}),
-      [&](std::unique_ptr<MaterializationResponsibility> R) {
-        BarR = std::move(R);
-      });
-
-  // Define the symbols.
-  cantFail(JD.define(FooMU));
-  cantFail(JD.define(BarMU));
-
-  bool OnFooReadyRun = false;
-  auto OnFooReady = [&](Expected<SymbolMap> Result) {
-    EXPECT_THAT_EXPECTED(std::move(Result), Failed());
-    OnFooReadyRun = true;
-  };
-
-  ES.lookup(LookupKind::Static, makeJITDylibSearchOrder(&JD),
-            SymbolLookupSet(Foo), SymbolState::Ready, std::move(OnFooReady),
-            NoDependenciesToRegister);
-
-  bool OnBarReadyRun = false;
-  auto OnBarReady = [&](Expected<SymbolMap> Result) {
-    EXPECT_THAT_EXPECTED(std::move(Result), Failed());
-    OnBarReadyRun = true;
-  };
-
-  ES.lookup(LookupKind::Static, makeJITDylibSearchOrder(&JD),
-            SymbolLookupSet(Bar), SymbolState::Ready, std::move(OnBarReady),
-            NoDependenciesToRegister);
-
-  // Add a dependency by Foo on Bar and vice-versa.
-  FooR->addDependenciesForAll({{&JD, SymbolNameSet({Bar})}});
-  BarR->addDependenciesForAll({{&JD, SymbolNameSet({Foo})}});
-
-  // Materialize Foo.
-  EXPECT_THAT_ERROR(FooR->notifyResolved({{Foo, FooSym}}), Succeeded())
-      << "Expected resolution for \"Foo\" to succeed.";
-  EXPECT_THAT_ERROR(FooR->notifyEmitted(), Succeeded())
-      << "Expected emission for \"Foo\" to succeed.";
-
-  // Fail bar.
-  BarR->failMaterialization();
-
-  // Verify that both queries failed.
-  EXPECT_TRUE(OnFooReadyRun) << "Query for Foo did not run";
-  EXPECT_TRUE(OnBarReadyRun) << "Query for Bar did not run";
-}
-
-TEST_F(CoreAPIsStandardTest, FailMaterializerWithUnqueriedSymbols) {
-  // Make sure that symbols with no queries aganist them still
-  // fail correctly.
-
-  bool MaterializerRun = false;
-  auto MU = std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap(
-          {{Foo, JITSymbolFlags::Exported}, {Bar, JITSymbolFlags::Exported}}),
-      [&](std::unique_ptr<MaterializationResponsibility> R) {
-        MaterializerRun = true;
-        R->failMaterialization();
-      });
-
-  cantFail(JD.define(std::move(MU)));
-
-  // Issue a query for Foo, but not bar.
-  EXPECT_THAT_EXPECTED(ES.lookup({&JD}, {Foo}), Failed())
-      << "Expected lookup to fail.";
-
-  // Check that the materializer (and therefore failMaterialization) ran.
-  EXPECT_TRUE(MaterializerRun) << "Expected materializer to have run by now";
-
-  // Check that subsequent queries against both symbols fail.
-  EXPECT_THAT_EXPECTED(ES.lookup({&JD}, {Foo}), Failed())
-      << "Expected lookup for Foo to fail.";
-  EXPECT_THAT_EXPECTED(ES.lookup({&JD}, {Bar}), Failed())
-      << "Expected lookup for Bar to fail.";
-}
-
-TEST_F(CoreAPIsStandardTest, DropMaterializerWhenEmpty) {
-  bool DestructorRun = false;
-
-  JITSymbolFlags WeakExported(JITSymbolFlags::Exported);
-  WeakExported |= JITSymbolFlags::Weak;
-
-  auto MU = std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Foo, WeakExported}, {Bar, WeakExported}}),
-      [](std::unique_ptr<MaterializationResponsibility> R) {
-        llvm_unreachable("Unexpected call to materialize");
-      },
-      nullptr,
-      [&](const JITDylib &JD, SymbolStringPtr Name) {
-        EXPECT_TRUE(Name == Foo || Name == Bar)
-            << "Discard of unexpected symbol?";
-      },
-      [&]() { DestructorRun = true; });
-
-  cantFail(JD.define(MU));
-
-  cantFail(JD.define(absoluteSymbols({{Foo, FooSym}})));
-
-  EXPECT_FALSE(DestructorRun)
-      << "MaterializationUnit should not have been destroyed yet";
-
-  cantFail(JD.define(absoluteSymbols({{Bar, BarSym}})));
-
-  EXPECT_TRUE(DestructorRun)
-      << "MaterializationUnit should have been destroyed";
-}
-
-TEST_F(CoreAPIsStandardTest, AddAndMaterializeLazySymbol) {
-  bool FooMaterialized = false;
-  bool BarDiscarded = false;
-
-  JITSymbolFlags WeakExported(JITSymbolFlags::Exported);
-  WeakExported |= JITSymbolFlags::Weak;
-
-  auto MU = std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Foo, JITSymbolFlags::Exported}, {Bar, WeakExported}}),
-      [&](std::unique_ptr<MaterializationResponsibility> R) {
-        assert(BarDiscarded && "Bar should have been discarded by this point");
-        cantFail(R->notifyResolved(SymbolMap({{Foo, FooSym}})));
-        cantFail(R->notifyEmitted());
-        FooMaterialized = true;
-      },
-      nullptr,
-      [&](const JITDylib &JD, SymbolStringPtr Name) {
-        EXPECT_EQ(Name, Bar) << "Expected Name to be Bar";
-        BarDiscarded = true;
-      });
-
-  cantFail(JD.define(MU));
-  cantFail(JD.define(absoluteSymbols({{Bar, BarSym}})));
-
-  bool OnCompletionRun = false;
-
-  auto OnCompletion = [&](Expected<SymbolMap> Result) {
-    EXPECT_TRUE(!!Result) << "Resolution unexpectedly returned error";
-    auto I = Result->find(Foo);
-    EXPECT_NE(I, Result->end()) << "Could not find symbol definition";
-    EXPECT_EQ(I->second.getAddress(), FooSym.getAddress())
-        << "Resolution returned incorrect result";
-    OnCompletionRun = true;
-  };
-
-  ES.lookup(LookupKind::Static, makeJITDylibSearchOrder(&JD),
-            SymbolLookupSet(Foo), SymbolState::Ready, std::move(OnCompletion),
-            NoDependenciesToRegister);
-
-  EXPECT_TRUE(FooMaterialized) << "Foo was not materialized";
-  EXPECT_TRUE(BarDiscarded) << "Bar was not discarded";
-  EXPECT_TRUE(OnCompletionRun) << "OnResolutionCallback was not run";
-}
-
-TEST_F(CoreAPIsStandardTest, TestBasicWeakSymbolMaterialization) {
-  // Test that weak symbols are materialized correctly when we look them up.
-  BarSym.setFlags(BarSym.getFlags() | JITSymbolFlags::Weak);
-
-  bool BarMaterialized = false;
-  auto MU1 = std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Foo, FooSym.getFlags()}, {Bar, BarSym.getFlags()}}),
-      [&](std::unique_ptr<MaterializationResponsibility> R) {
-        cantFail(R->notifyResolved(SymbolMap({{Foo, FooSym}, {Bar, BarSym}})));
-        cantFail(R->notifyEmitted());
-        BarMaterialized = true;
-      });
-
-  bool DuplicateBarDiscarded = false;
-  auto MU2 = std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Bar, BarSym.getFlags()}}),
-      [&](std::unique_ptr<MaterializationResponsibility> R) {
-        ADD_FAILURE() << "Attempt to materialize Bar from the wrong unit";
-        R->failMaterialization();
-      },
-      nullptr,
-      [&](const JITDylib &JD, SymbolStringPtr Name) {
-        EXPECT_EQ(Name, Bar) << "Expected \"Bar\" to be discarded";
-        DuplicateBarDiscarded = true;
-      });
-
-  cantFail(JD.define(MU1));
-  cantFail(JD.define(MU2));
-
-  bool OnCompletionRun = false;
-
-  auto OnCompletion = [&](Expected<SymbolMap> Result) {
-    cantFail(std::move(Result));
-    OnCompletionRun = true;
-  };
-
-  ES.lookup(LookupKind::Static, makeJITDylibSearchOrder(&JD),
-            SymbolLookupSet(Bar), SymbolState::Ready, std::move(OnCompletion),
-            NoDependenciesToRegister);
-
-  EXPECT_TRUE(OnCompletionRun) << "OnCompletion not run";
-  EXPECT_TRUE(BarMaterialized) << "Bar was not materialized at all";
-  EXPECT_TRUE(DuplicateBarDiscarded)
-      << "Duplicate bar definition not discarded";
-}
-
-TEST_F(CoreAPIsStandardTest, DefineMaterializingSymbol) {
-  bool ExpectNoMoreMaterialization = false;
-  ES.setDispatchTask([&](std::unique_ptr<Task> T) {
-    if (ExpectNoMoreMaterialization && isa<MaterializationTask>(*T))
-      ADD_FAILURE() << "Unexpected materialization";
-    T->run();
-  });
-
-  auto MU = std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Foo, FooSym.getFlags()}}),
-      [&](std::unique_ptr<MaterializationResponsibility> R) {
-        cantFail(
-            R->defineMaterializing(SymbolFlagsMap({{Bar, BarSym.getFlags()}})));
-        cantFail(R->notifyResolved(SymbolMap({{Foo, FooSym}, {Bar, BarSym}})));
-        cantFail(R->notifyEmitted());
-      });
-
-  cantFail(JD.define(MU));
-  cantFail(ES.lookup(makeJITDylibSearchOrder(&JD), Foo));
-
-  // Assert that materialization is complete by now.
-  ExpectNoMoreMaterialization = true;
-
-  // Look up bar to verify that no further materialization happens.
-  auto BarResult = cantFail(ES.lookup(makeJITDylibSearchOrder(&JD), Bar));
-  EXPECT_EQ(BarResult.getAddress(), BarSym.getAddress())
-      << "Expected Bar == BarSym";
-}
-
-TEST_F(CoreAPIsStandardTest, GeneratorTest) {
-  JITEvaluatedSymbol BazHiddenSym(
-      BazSym.getAddress(), BazSym.getFlags() & ~JITSymbolFlags::Exported);
-  cantFail(JD.define(absoluteSymbols({{Foo, FooSym}, {Baz, BazHiddenSym}})));
-
-  class TestGenerator : public DefinitionGenerator {
-  public:
-    TestGenerator(SymbolMap Symbols) : Symbols(std::move(Symbols)) {}
-    Error tryToGenerate(LookupState &LS, LookupKind K, JITDylib &JD,
-                        JITDylibLookupFlags JDLookupFlags,
-                        const SymbolLookupSet &Names) override {
-      SymbolMap NewDefs;
-
-      for (const auto &KV : Names) {
-        const auto &Name = KV.first;
-        if (Symbols.count(Name))
-          NewDefs[Name] = Symbols[Name];
-      }
-
-      cantFail(JD.define(absoluteSymbols(std::move(NewDefs))));
-      return Error::success();
-    };
-
-  private:
-    SymbolMap Symbols;
-  };
-
-  JD.addGenerator(std::make_unique<TestGenerator>(
-      SymbolMap({{Bar, BarSym}, {Baz, BazSym}})));
-
-  auto Result = cantFail(
-      ES.lookup(makeJITDylibSearchOrder(&JD),
-                SymbolLookupSet({Foo, Bar})
-                    .add(Baz, SymbolLookupFlags::WeaklyReferencedSymbol)));
-
-  EXPECT_EQ(Result.count(Bar), 1U) << "Expected to find fallback def for 'bar'";
-  EXPECT_EQ(Result[Bar].getAddress(), BarSym.getAddress())
-      << "Expected fallback def for Bar to be equal to BarSym";
-}
-
-TEST_F(CoreAPIsStandardTest, AsynchronousGeneratorTest) {
-  class TestGenerator : public DefinitionGenerator {
-  public:
-    TestGenerator(LookupState &TLS) : TLS(TLS) {}
-    Error tryToGenerate(LookupState &LS, LookupKind K, JITDylib &JD,
-                        JITDylibLookupFlags JDLookupFlags,
-                        const SymbolLookupSet &Name) override {
-      TLS = std::move(LS);
-      return Error::success();
-    }
-
-  private:
-    LookupState &TLS;
-  };
-
-  LookupState LS;
-  JD.addGenerator(std::make_unique<TestGenerator>(LS));
-
-  bool LookupCompleted = false;
-
-  ES.lookup(
-      LookupKind::Static, makeJITDylibSearchOrder(&JD), SymbolLookupSet(Foo),
-      SymbolState::Ready,
-      [&](Expected<SymbolMap> Result) {
-        LookupCompleted = true;
-        if (!Result) {
-          ADD_FAILURE() << "Lookup failed unexpected";
-          logAllUnhandledErrors(Result.takeError(), errs(), "");
-          return;
-        }
-
-        EXPECT_EQ(Result->size(), 1U) << "Unexpected number of results";
-        EXPECT_EQ(Result->count(Foo), 1U) << "Expected result for Foo";
-        EXPECT_EQ((*Result)[Foo].getAddress(), FooSym.getAddress())
-            << "Bad result for Foo";
-      },
-      NoDependenciesToRegister);
-
-  EXPECT_FALSE(LookupCompleted);
-
-  cantFail(JD.define(absoluteSymbols({{Foo, FooSym}})));
-
-  LS.continueLookup(Error::success());
-
-  EXPECT_TRUE(LookupCompleted);
-}
-
-TEST_F(CoreAPIsStandardTest, FailResolution) {
-  auto MU = std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Foo, JITSymbolFlags::Exported | JITSymbolFlags::Weak},
-                      {Bar, JITSymbolFlags::Exported | JITSymbolFlags::Weak}}),
-      [&](std::unique_ptr<MaterializationResponsibility> R) {
-        R->failMaterialization();
-      });
-
-  cantFail(JD.define(MU));
-
-  SymbolNameSet Names({Foo, Bar});
-  auto Result = ES.lookup(makeJITDylibSearchOrder(&JD), SymbolLookupSet(Names));
-
-  EXPECT_FALSE(!!Result) << "Expected failure";
-  if (!Result) {
-    handleAllErrors(
-        Result.takeError(),
-        [&](FailedToMaterialize &F) {
-          EXPECT_TRUE(F.getSymbols().count(&JD))
-              << "Expected to fail on JITDylib JD";
-          EXPECT_EQ(F.getSymbols().find(&JD)->second, Names)
-              << "Expected to fail on symbols in Names";
-        },
-        [](ErrorInfoBase &EIB) {
-          std::string ErrMsg;
-          {
-            raw_string_ostream ErrOut(ErrMsg);
-            EIB.log(ErrOut);
-          }
-          ADD_FAILURE() << "Expected a FailedToResolve error. Got:\n" << ErrMsg;
-        });
-  }
-}
-
-TEST_F(CoreAPIsStandardTest, FailEmissionAfterResolution) {
-
-  cantFail(JD.define(absoluteSymbols({{Baz, BazSym}})));
-
-  auto MU = std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Foo, FooSym.getFlags()}, {Bar, BarSym.getFlags()}}),
-      [&](std::unique_ptr<MaterializationResponsibility> R) {
-        cantFail(R->notifyResolved(SymbolMap({{Foo, FooSym}, {Bar, BarSym}})));
-
-        ES.lookup(
-            LookupKind::Static, makeJITDylibSearchOrder(&JD),
-            SymbolLookupSet({Baz}), SymbolState::Resolved,
-            [&](Expected<SymbolMap> Result) {
-              // Called when "baz" is resolved. We don't actually depend
-              // on or care about baz, but use it to trigger failure of
-              // this materialization before Baz has been finalized in
-              // order to test that error propagation is correct in this
-              // scenario.
-              cantFail(std::move(Result));
-              R->failMaterialization();
-            },
-            [&](const SymbolDependenceMap &Deps) {
-              R->addDependenciesForAll(Deps);
-            });
-      });
-
-  cantFail(JD.define(MU));
-
-  auto Result =
-      ES.lookup(makeJITDylibSearchOrder(&JD), SymbolLookupSet({Foo, Bar}));
-
-  EXPECT_THAT_EXPECTED(std::move(Result), Failed())
-      << "Unexpected success while trying to test error propagation";
-}
-
-TEST_F(CoreAPIsStandardTest, FailAfterPartialResolution) {
-
-  cantFail(JD.define(absoluteSymbols({{Foo, FooSym}})));
-
-  // Fail materialization of bar.
-  auto BarMU = std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Bar, BarSym.getFlags()}}),
-      [&](std::unique_ptr<MaterializationResponsibility> R) {
-        R->failMaterialization();
-      });
-
-  cantFail(JD.define(std::move(BarMU)));
-
-  bool QueryHandlerRun = false;
-  ES.lookup(
-      LookupKind::Static, makeJITDylibSearchOrder(&JD),
-      SymbolLookupSet({Foo, Bar}), SymbolState::Resolved,
-      [&](Expected<SymbolMap> Result) {
-        EXPECT_THAT_EXPECTED(std::move(Result), Failed())
-            << "Expected query to fail";
-        QueryHandlerRun = true;
-      },
-      NoDependenciesToRegister);
-  EXPECT_TRUE(QueryHandlerRun) << "Query handler never ran";
-}
-
-TEST_F(CoreAPIsStandardTest, TestLookupWithUnthreadedMaterialization) {
-  auto MU = std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Foo, JITSymbolFlags::Exported}}),
-      [&](std::unique_ptr<MaterializationResponsibility> R) {
-        cantFail(R->notifyResolved({{Foo, FooSym}}));
-        cantFail(R->notifyEmitted());
-      });
-
-  cantFail(JD.define(MU));
-
-  auto FooLookupResult = cantFail(ES.lookup(makeJITDylibSearchOrder(&JD), Foo));
-
-  EXPECT_EQ(FooLookupResult.getAddress(), FooSym.getAddress())
-      << "lookup returned an incorrect address";
-  EXPECT_EQ(FooLookupResult.getFlags(), FooSym.getFlags())
-      << "lookup returned incorrect flags";
-}
-
-TEST_F(CoreAPIsStandardTest, TestLookupWithThreadedMaterialization) {
-#if LLVM_ENABLE_THREADS
-
-  std::mutex WorkThreadsMutex;
-  std::vector<std::thread> WorkThreads;
-  ES.setDispatchTask([&](std::unique_ptr<Task> T) {
-    std::promise<void> WaitP;
-    std::lock_guard<std::mutex> Lock(WorkThreadsMutex);
-    WorkThreads.push_back(
-        std::thread([T = std::move(T), WaitF = WaitP.get_future()]() mutable {
-          WaitF.get();
-          T->run();
-        }));
-    WaitP.set_value();
-  });
-
-  cantFail(JD.define(absoluteSymbols({{Foo, FooSym}})));
-
-  auto FooLookupResult = cantFail(ES.lookup(makeJITDylibSearchOrder(&JD), Foo));
-
-  EXPECT_EQ(FooLookupResult.getAddress(), FooSym.getAddress())
-      << "lookup returned an incorrect address";
-  EXPECT_EQ(FooLookupResult.getFlags(), FooSym.getFlags())
-      << "lookup returned incorrect flags";
-
-  for (auto &WT : WorkThreads)
-    WT.join();
-#endif
-}
-
-TEST_F(CoreAPIsStandardTest, TestGetRequestedSymbolsAndReplace) {
-  // Test that GetRequestedSymbols returns the set of symbols that currently
-  // have pending queries, and test that MaterializationResponsibility's
-  // replace method can be used to return definitions to the JITDylib in a new
-  // MaterializationUnit.
-  SymbolNameSet Names({Foo, Bar});
-
-  bool FooMaterialized = false;
-  bool BarMaterialized = false;
-
-  auto MU = std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Foo, FooSym.getFlags()}, {Bar, BarSym.getFlags()}}),
-      [&](std::unique_ptr<MaterializationResponsibility> R) {
-        auto Requested = R->getRequestedSymbols();
-        EXPECT_EQ(Requested.size(), 1U) << "Expected one symbol requested";
-        EXPECT_EQ(*Requested.begin(), Foo) << "Expected \"Foo\" requested";
-
-        auto NewMU = std::make_unique<SimpleMaterializationUnit>(
-            SymbolFlagsMap({{Bar, BarSym.getFlags()}}),
-            [&](std::unique_ptr<MaterializationResponsibility> R2) {
-              cantFail(R2->notifyResolved(SymbolMap({{Bar, BarSym}})));
-              cantFail(R2->notifyEmitted());
-              BarMaterialized = true;
-            });
-
-        cantFail(R->replace(std::move(NewMU)));
-
-        cantFail(R->notifyResolved(SymbolMap({{Foo, FooSym}})));
-        cantFail(R->notifyEmitted());
-
-        FooMaterialized = true;
-      });
-
-  cantFail(JD.define(MU));
-
-  EXPECT_FALSE(FooMaterialized) << "Foo should not be materialized yet";
-  EXPECT_FALSE(BarMaterialized) << "Bar should not be materialized yet";
-
-  auto FooSymResult = cantFail(ES.lookup(makeJITDylibSearchOrder(&JD), Foo));
-  EXPECT_EQ(FooSymResult.getAddress(), FooSym.getAddress())
-      << "Address mismatch for Foo";
-
-  EXPECT_TRUE(FooMaterialized) << "Foo should be materialized now";
-  EXPECT_FALSE(BarMaterialized) << "Bar still should not be materialized";
-
-  auto BarSymResult = cantFail(ES.lookup(makeJITDylibSearchOrder(&JD), Bar));
-  EXPECT_EQ(BarSymResult.getAddress(), BarSym.getAddress())
-      << "Address mismatch for Bar";
-  EXPECT_TRUE(BarMaterialized) << "Bar should be materialized now";
-}
-
-TEST_F(CoreAPIsStandardTest, TestMaterializationResponsibilityDelegation) {
-  auto MU = std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Foo, FooSym.getFlags()}, {Bar, BarSym.getFlags()}}),
-      [&](std::unique_ptr<MaterializationResponsibility> R) {
-        auto R2 = cantFail(R->delegate({Bar}));
-
-        cantFail(R->notifyResolved({{Foo, FooSym}}));
-        cantFail(R->notifyEmitted());
-        cantFail(R2->notifyResolved({{Bar, BarSym}}));
-        cantFail(R2->notifyEmitted());
-      });
-
-  cantFail(JD.define(MU));
-
-  auto Result =
-      ES.lookup(makeJITDylibSearchOrder(&JD), SymbolLookupSet({Foo, Bar}));
-
-  EXPECT_TRUE(!!Result) << "Result should be a success value";
-  EXPECT_EQ(Result->count(Foo), 1U) << "\"Foo\" entry missing";
-  EXPECT_EQ(Result->count(Bar), 1U) << "\"Bar\" entry missing";
-  EXPECT_EQ((*Result)[Foo].getAddress(), FooSym.getAddress())
-      << "Address mismatch for \"Foo\"";
-  EXPECT_EQ((*Result)[Bar].getAddress(), BarSym.getAddress())
-      << "Address mismatch for \"Bar\"";
-}
-
-TEST_F(CoreAPIsStandardTest, TestMaterializeWeakSymbol) {
-  // Confirm that once a weak definition is selected for materialization it is
-  // treated as strong.
-  JITSymbolFlags WeakExported = JITSymbolFlags::Exported;
-  WeakExported &= JITSymbolFlags::Weak;
-
-  std::unique_ptr<MaterializationResponsibility> FooR;
-  auto MU = std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Foo, FooSym.getFlags()}}),
-      [&](std::unique_ptr<MaterializationResponsibility> R) {
-        FooR = std::move(R);
-      });
-
-  cantFail(JD.define(MU));
-  auto OnCompletion = [](Expected<SymbolMap> Result) {
-    cantFail(std::move(Result));
-  };
-
-  ES.lookup(LookupKind::Static, makeJITDylibSearchOrder(&JD),
-            SymbolLookupSet({Foo}), SymbolState::Ready, std::move(OnCompletion),
-            NoDependenciesToRegister);
-
-  auto MU2 = std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Foo, JITSymbolFlags::Exported}}),
-      [](std::unique_ptr<MaterializationResponsibility> R) {
-        llvm_unreachable("This unit should never be materialized");
-      });
-
-  auto Err = JD.define(MU2);
-  EXPECT_TRUE(!!Err) << "Expected failure value";
-  EXPECT_TRUE(Err.isA<DuplicateDefinition>())
-      << "Expected a duplicate definition error";
-  consumeError(std::move(Err));
-
-  // No dependencies registered, can't fail:
-  cantFail(FooR->notifyResolved(SymbolMap({{Foo, FooSym}})));
-  cantFail(FooR->notifyEmitted());
-}
-
-static bool linkOrdersEqual(const std::vector<JITDylibSP> &LHS,
-                            ArrayRef<JITDylib *> RHS) {
-  if (LHS.size() != RHS.size())
-    return false;
-  auto *RHSE = RHS.begin();
-  for (auto &LHSE : LHS)
-    if (LHSE.get() != *RHSE)
-      return false;
-    else
-      ++RHSE;
-  return true;
-}
-
-TEST(JITDylibTest, GetDFSLinkOrderTree) {
-  // Test that DFS ordering behaves as expected when the linkage relationships
-  // form a tree.
-
-  ExecutionSession ES{std::make_unique<UnsupportedExecutorProcessControl>()};
-
-  auto &LibA = ES.createBareJITDylib("A");
-  auto &LibB = ES.createBareJITDylib("B");
-  auto &LibC = ES.createBareJITDylib("C");
-  auto &LibD = ES.createBareJITDylib("D");
-  auto &LibE = ES.createBareJITDylib("E");
-  auto &LibF = ES.createBareJITDylib("F");
-
-  // Linkage relationships:
-  // A --- B -- D
-  //  \      \- E
-  //    \- C -- F
-  LibA.setLinkOrder(makeJITDylibSearchOrder({&LibB, &LibC}));
-  LibB.setLinkOrder(makeJITDylibSearchOrder({&LibD, &LibE}));
-  LibC.setLinkOrder(makeJITDylibSearchOrder({&LibF}));
-
-  auto DFSOrderFromB = JITDylib::getDFSLinkOrder({&LibB});
-  EXPECT_TRUE(linkOrdersEqual(DFSOrderFromB, {&LibB, &LibD, &LibE}))
-      << "Incorrect DFS link order for LibB";
-
-  auto DFSOrderFromA = JITDylib::getDFSLinkOrder({&LibA});
-  EXPECT_TRUE(linkOrdersEqual(DFSOrderFromA,
-                              {&LibA, &LibB, &LibD, &LibE, &LibC, &LibF}))
-      << "Incorrect DFS link order for libA";
-
-  auto DFSOrderFromAB = JITDylib::getDFSLinkOrder({&LibA, &LibB});
-  EXPECT_TRUE(linkOrdersEqual(DFSOrderFromAB,
-                              {&LibA, &LibB, &LibD, &LibE, &LibC, &LibF}))
-      << "Incorrect DFS link order for { libA, libB }";
-
-  auto DFSOrderFromBA = JITDylib::getDFSLinkOrder({&LibB, &LibA});
-  EXPECT_TRUE(linkOrdersEqual(DFSOrderFromBA,
-                              {&LibB, &LibD, &LibE, &LibA, &LibC, &LibF}))
-      << "Incorrect DFS link order for { libB, libA }";
-}
-
-TEST(JITDylibTest, GetDFSLinkOrderDiamond) {
-  // Test that DFS ordering behaves as expected when the linkage relationships
-  // contain a diamond.
-
-  ExecutionSession ES{std::make_unique<UnsupportedExecutorProcessControl>()};
-  auto &LibA = ES.createBareJITDylib("A");
-  auto &LibB = ES.createBareJITDylib("B");
-  auto &LibC = ES.createBareJITDylib("C");
-  auto &LibD = ES.createBareJITDylib("D");
-
-  // Linkage relationships:
-  // A -- B --- D
-  //  \-- C --/
-  LibA.setLinkOrder(makeJITDylibSearchOrder({&LibB, &LibC}));
-  LibB.setLinkOrder(makeJITDylibSearchOrder({&LibD}));
-  LibC.setLinkOrder(makeJITDylibSearchOrder({&LibD}));
-
-  auto DFSOrderFromA = JITDylib::getDFSLinkOrder({&LibA});
-  EXPECT_TRUE(linkOrdersEqual(DFSOrderFromA, {&LibA, &LibB, &LibD, &LibC}))
-      << "Incorrect DFS link order for libA";
-}
-
-TEST(JITDylibTest, GetDFSLinkOrderCycle) {
-  // Test that DFS ordering behaves as expected when the linkage relationships
-  // contain a cycle.
-
-  ExecutionSession ES{std::make_unique<UnsupportedExecutorProcessControl>()};
-  auto &LibA = ES.createBareJITDylib("A");
-  auto &LibB = ES.createBareJITDylib("B");
-  auto &LibC = ES.createBareJITDylib("C");
-
-  // Linkage relationships:
-  // A -- B --- C -- A
-  LibA.setLinkOrder(makeJITDylibSearchOrder({&LibB}));
-  LibB.setLinkOrder(makeJITDylibSearchOrder({&LibC}));
-  LibC.setLinkOrder(makeJITDylibSearchOrder({&LibA}));
-
-  auto DFSOrderFromA = JITDylib::getDFSLinkOrder({&LibA});
-  EXPECT_TRUE(linkOrdersEqual(DFSOrderFromA, {&LibA, &LibB, &LibC}))
-      << "Incorrect DFS link order for libA";
-
-  auto DFSOrderFromB = JITDylib::getDFSLinkOrder({&LibB});
-  EXPECT_TRUE(linkOrdersEqual(DFSOrderFromB, {&LibB, &LibC, &LibA}))
-      << "Incorrect DFS link order for libB";
-
-  auto DFSOrderFromC = JITDylib::getDFSLinkOrder({&LibC});
-  EXPECT_TRUE(linkOrdersEqual(DFSOrderFromC, {&LibC, &LibA, &LibB}))
-      << "Incorrect DFS link order for libC";
-}
-
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/ExecutionSessionWrapperFunctionCallsTest.cpp b/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/ExecutionSessionWrapperFunctionCallsTest.cpp
deleted file mode 100644
index 9044ead6318..00000000000
--- a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/ExecutionSessionWrapperFunctionCallsTest.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-//===- ExecutionSessionWrapperFunctionCallsTest.cpp -- Test wrapper calls -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ExecutionEngine/Orc/Core.h"
-#include "llvm/ExecutionEngine/Orc/ExecutorProcessControl.h"
-#include "llvm/Support/MSVCErrorWorkarounds.h"
-#include "llvm/Testing/Support/Error.h"
-#include "gtest/gtest.h"
-
-#include <future>
-
-using namespace llvm;
-using namespace llvm::orc;
-using namespace llvm::orc::shared;
-
-static llvm::orc::shared::detail::CWrapperFunctionResult
-addWrapper(const char *ArgData, size_t ArgSize) {
-  return WrapperFunction<int32_t(int32_t, int32_t)>::handle(
-             ArgData, ArgSize, [](int32_t X, int32_t Y) { return X + Y; })
-      .release();
-}
-
-static void addAsyncWrapper(unique_function<void(int32_t)> SendResult,
-                            int32_t X, int32_t Y) {
-  SendResult(X + Y);
-}
-
-TEST(ExecutionSessionWrapperFunctionCalls, RunWrapperTemplate) {
-  ExecutionSession ES(cantFail(SelfExecutorProcessControl::Create()));
-
-  int32_t Result;
-  EXPECT_THAT_ERROR(ES.callSPSWrapper<int32_t(int32_t, int32_t)>(
-                        pointerToJITTargetAddress(addWrapper), Result, 2, 3),
-                    Succeeded());
-  EXPECT_EQ(Result, 5);
-}
-
-TEST(ExecutionSessionWrapperFunctionCalls, RunWrapperAsyncTemplate) {
-  ExecutionSession ES(cantFail(SelfExecutorProcessControl::Create()));
-
-  std::promise<MSVCPExpected<int32_t>> RP;
-  using Sig = int32_t(int32_t, int32_t);
-  ES.callSPSWrapperAsync<Sig>(
-      [&](Error SerializationErr, int32_t R) {
-        if (SerializationErr)
-          RP.set_value(std::move(SerializationErr));
-        RP.set_value(std::move(R));
-      },
-      pointerToJITTargetAddress(addWrapper), 2, 3);
-  Expected<int32_t> Result = RP.get_future().get();
-  EXPECT_THAT_EXPECTED(Result, HasValue(5));
-}
-
-TEST(ExecutionSessionWrapperFunctionCalls, RegisterAsyncHandlerAndRun) {
-
-  constexpr JITTargetAddress AddAsyncTagAddr = 0x01;
-
-  ExecutionSession ES(cantFail(SelfExecutorProcessControl::Create()));
-  auto &JD = ES.createBareJITDylib("JD");
-
-  auto AddAsyncTag = ES.intern("addAsync_tag");
-  cantFail(JD.define(absoluteSymbols(
-      {{AddAsyncTag,
-        JITEvaluatedSymbol(AddAsyncTagAddr, JITSymbolFlags::Exported)}})));
-
-  ExecutionSession::JITDispatchHandlerAssociationMap Associations;
-
-  Associations[AddAsyncTag] =
-      ES.wrapAsyncWithSPS<int32_t(int32_t, int32_t)>(addAsyncWrapper);
-
-  cantFail(ES.registerJITDispatchHandlers(JD, std::move(Associations)));
-
-  std::promise<int32_t> RP;
-  auto RF = RP.get_future();
-
-  using ArgSerialization = SPSArgList<int32_t, int32_t>;
-  size_t ArgBufferSize = ArgSerialization::size(1, 2);
-  WrapperFunctionResult ArgBuffer;
-  char *ArgBufferData =
-      WrapperFunctionResult::allocate(ArgBuffer, ArgBufferSize);
-  SPSOutputBuffer OB(ArgBufferData, ArgBufferSize);
-  EXPECT_TRUE(ArgSerialization::serialize(OB, 1, 2));
-
-  ES.runJITDispatchHandler(
-      [&](WrapperFunctionResult ResultBuffer) {
-        int32_t Result;
-        SPSInputBuffer IB(ResultBuffer.data(), ResultBuffer.size());
-        EXPECT_TRUE(SPSArgList<int32_t>::deserialize(IB, Result));
-        RP.set_value(Result);
-      },
-      AddAsyncTagAddr, ArrayRef<char>(ArgBuffer.data(), ArgBuffer.size()));
-
-  EXPECT_EQ(RF.get(), (int32_t)3);
-
-  cantFail(ES.endSession());
-}
diff --git a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/IndirectionUtilsTest.cpp b/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/IndirectionUtilsTest.cpp
deleted file mode 100644
index 860fc2f73fe..00000000000
--- a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/IndirectionUtilsTest.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-//===- LazyEmittingLayerTest.cpp - Unit tests for the lazy emitting layer -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ExecutionEngine/Orc/IndirectionUtils.h"
-#include "OrcTestCommon.h"
-#include "llvm/ADT/SmallVector.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST(IndirectionUtilsTest, MakeStub) {
-  LLVMContext Context;
-  ModuleBuilder MB(Context, "x86_64-apple-macosx10.10", "");
-  StructType *ArgTy = getDummyStructTy(Context);
-  Type *ArgPtrTy = PointerType::getUnqual(ArgTy);
-  FunctionType *FTy = FunctionType::get(
-      Type::getVoidTy(Context), {ArgPtrTy, ArgPtrTy}, false);
-  Function *F = MB.createFunctionDecl(FTy, "");
-  AttributeSet FnAttrs = AttributeSet::get(
-      Context, AttrBuilder().addAttribute(Attribute::NoUnwind));
-  AttributeSet RetAttrs; // None
-  AttributeSet ArgAttrs[2] = {
-      AttributeSet::get(Context, AttrBuilder().addStructRetAttr(ArgTy)),
-      AttributeSet::get(Context, AttrBuilder().addByValAttr(ArgTy)),
-  };
-  F->setAttributes(AttributeList::get(Context, FnAttrs, RetAttrs, ArgAttrs));
-
-  auto ImplPtr = orc::createImplPointer(*F->getType(), *MB.getModule(), "", nullptr);
-  orc::makeStub(*F, *ImplPtr);
-
-  auto II = F->getEntryBlock().begin();
-  EXPECT_TRUE(isa<LoadInst>(*II)) << "First instruction of stub should be a load.";
-  auto *Call = dyn_cast<CallInst>(std::next(II));
-  EXPECT_TRUE(Call != nullptr) << "Second instruction of stub should be a call.";
-  EXPECT_TRUE(Call->isTailCall()) << "Indirect call from stub should be tail call.";
-  EXPECT_TRUE(Call->hasStructRetAttr())
-    << "makeStub should propagate sret attr on 1st argument.";
-  EXPECT_TRUE(Call->paramHasAttr(1U, Attribute::ByVal))
-    << "makeStub should propagate byval attr on 2nd argument.";
-}
-
-}
diff --git a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/JITTargetMachineBuilderTest.cpp b/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/JITTargetMachineBuilderTest.cpp
deleted file mode 100644
index 1f3626e8af1..00000000000
--- a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/JITTargetMachineBuilderTest.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-//===----------- CoreAPIsTest.cpp - Unit tests for Core ORC APIs ----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ExecutionEngine/Orc/JITTargetMachineBuilder.h"
-#include "OrcTestCommon.h"
-
-using namespace llvm;
-using namespace llvm::orc;
-
-namespace {
-
-TEST(ExecutionUtilsTest, JITTargetMachineBuilder) {
-  // Tests basic API usage.
-  // Bails out on error, as it is valid to run this test without any targets
-  // built.
-
-  // Make sure LLVM has been initialized.
-  OrcNativeTarget::initialize();
-
-  auto JTMB = cantFail(JITTargetMachineBuilder::detectHost());
-
-  // Test API by performing a bunch of no-ops.
-  JTMB.setCPU("");
-  JTMB.setRelocationModel(None);
-  JTMB.setCodeModel(None);
-  JTMB.setCodeGenOptLevel(CodeGenOpt::None);
-  JTMB.addFeatures(std::vector<std::string>());
-  SubtargetFeatures &STF = JTMB.getFeatures();
-  (void)STF;
-  TargetOptions &TO = JTMB.getOptions();
-  (void)TO;
-  Triple &TT = JTMB.getTargetTriple();
-  (void)TT;
-
-  auto TM = JTMB.createTargetMachine();
-
-  if (!TM)
-    consumeError(TM.takeError());
-  else {
-    EXPECT_NE(TM.get(), nullptr)
-        << "JITTargetMachineBuilder should return a non-null TargetMachine "
-           "on success";
-  }
-}
-
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/LazyCallThroughAndReexportsTest.cpp b/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/LazyCallThroughAndReexportsTest.cpp
deleted file mode 100644
index 81ff3e7a87b..00000000000
--- a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/LazyCallThroughAndReexportsTest.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-#include "OrcTestCommon.h"
-#include "llvm/ExecutionEngine/Orc/JITTargetMachineBuilder.h"
-#include "llvm/ExecutionEngine/Orc/LazyReexports.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::orc;
-
-class LazyReexportsTest : public CoreAPIsBasedStandardTest {};
-
-static int dummyTarget() { return 42; }
-
-TEST_F(LazyReexportsTest, BasicLocalCallThroughManagerOperation) {
-  // Create a callthrough manager for the host (if possible) and verify that
-  // a call to the lazy call-through:
-  // (1) Materializes the MU. This verifies that the symbol was looked up, and
-  //     that we didn't arrive at the target via some other path
-  // (2) Returns the expected value (which we take as proof that the call
-  //     reached the target).
-
-  auto JTMB = JITTargetMachineBuilder::detectHost();
-
-  // Bail out if we can not detect the host.
-  if (!JTMB) {
-    consumeError(JTMB.takeError());
-    return;
-  }
-
-  // Bail out if we can not build a local call-through manager.
-  auto LCTM = createLocalLazyCallThroughManager(JTMB->getTargetTriple(), ES, 0);
-  if (!LCTM) {
-    consumeError(LCTM.takeError());
-    return;
-  }
-
-  auto DummyTarget = ES.intern("DummyTarget");
-
-  bool DummyTargetMaterialized = false;
-
-  cantFail(JD.define(std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{DummyTarget, JITSymbolFlags::Exported}}),
-      [&](std::unique_ptr<MaterializationResponsibility> R) {
-        DummyTargetMaterialized = true;
-        // No dependencies registered, can't fail.
-        cantFail(R->notifyResolved(
-            {{DummyTarget,
-              JITEvaluatedSymbol(static_cast<JITTargetAddress>(
-                                     reinterpret_cast<uintptr_t>(&dummyTarget)),
-                                 JITSymbolFlags::Exported)}}));
-        cantFail(R->notifyEmitted());
-      })));
-
-  unsigned NotifyResolvedCount = 0;
-  auto NotifyResolved = [&](JITTargetAddress ResolvedAddr) {
-    ++NotifyResolvedCount;
-    return Error::success();
-  };
-
-  auto CallThroughTrampoline = cantFail((*LCTM)->getCallThroughTrampoline(
-      JD, DummyTarget, std::move(NotifyResolved)));
-
-  auto CTTPtr = reinterpret_cast<int (*)()>(
-      static_cast<uintptr_t>(CallThroughTrampoline));
-
-  // Call twice to verify nothing unexpected happens on redundant calls.
-  auto Result = CTTPtr();
-  (void)CTTPtr();
-
-  EXPECT_TRUE(DummyTargetMaterialized)
-      << "CallThrough did not materialize target";
-  EXPECT_EQ(NotifyResolvedCount, 1U)
-      << "CallThrough should have generated exactly one 'NotifyResolved' call";
-  EXPECT_EQ(Result, 42) << "Failed to call through to target";
-}
diff --git a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/ObjectLinkingLayerTest.cpp b/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/ObjectLinkingLayerTest.cpp
deleted file mode 100644
index f6413316b69..00000000000
--- a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/ObjectLinkingLayerTest.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-//===-------- ObjectLinkingLayerTest.cpp - ObjectLinkingLayer tests -------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h"
-#include "llvm/ExecutionEngine/JITLink/JITLink.h"
-#include "llvm/ExecutionEngine/JITLink/JITLinkMemoryManager.h"
-#include "llvm/ExecutionEngine/JITLink/x86_64.h"
-#include "llvm/Testing/Support/Error.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::jitlink;
-using namespace llvm::orc;
-
-namespace {
-
-auto RWFlags =
-    sys::Memory::ProtectionFlags(sys::Memory::MF_READ | sys::Memory::MF_WRITE);
-
-const char BlockContentBytes[] = {0x01, 0x02, 0x03, 0x04,
-                                  0x05, 0x06, 0x07, 0x08};
-
-ArrayRef<char> BlockContent(BlockContentBytes);
-
-class ObjectLinkingLayerTest : public testing::Test {
-public:
-  ~ObjectLinkingLayerTest() {
-    if (auto Err = ES.endSession())
-      ES.reportError(std::move(Err));
-  }
-
-protected:
-  ExecutionSession ES{std::make_unique<UnsupportedExecutorProcessControl>()};
-  JITDylib &JD = ES.createBareJITDylib("main");
-  ObjectLinkingLayer ObjLinkingLayer{
-      ES, std::make_unique<InProcessMemoryManager>()};
-};
-
-TEST_F(ObjectLinkingLayerTest, AddLinkGraph) {
-  auto G =
-      std::make_unique<LinkGraph>("foo", Triple("x86_64-apple-darwin"), 8,
-                                  support::little, x86_64::getEdgeKindName);
-
-  auto &Sec1 = G->createSection("__data", RWFlags);
-  auto &B1 = G->createContentBlock(Sec1, BlockContent, 0x1000, 8, 0);
-  G->addDefinedSymbol(B1, 4, "_X", 4, Linkage::Strong, Scope::Default, false,
-                      false);
-
-  EXPECT_THAT_ERROR(ObjLinkingLayer.add(JD, std::move(G)), Succeeded());
-
-  EXPECT_THAT_EXPECTED(ES.lookup(&JD, "_X"), Succeeded());
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/OrcCAPITest.cpp b/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/OrcCAPITest.cpp
deleted file mode 100644
index 72faccd795b..00000000000
--- a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/OrcCAPITest.cpp
+++ /dev/null
@@ -1,518 +0,0 @@
-//===--- OrcCAPITest.cpp - Unit tests for the OrcJIT v2 C API ---*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm-c/Core.h"
-#include "llvm-c/Error.h"
-#include "llvm-c/LLJIT.h"
-#include "llvm-c/Orc.h"
-#include "gtest/gtest.h"
-
-#include "llvm/ADT/Triple.h"
-#include "llvm/ExecutionEngine/Orc/CompileUtils.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IRReader/IRReader.h"
-#include "llvm/Support/Error.h"
-#include "llvm/Support/SourceMgr.h"
-#include <string>
-
-using namespace llvm;
-using namespace llvm::orc;
-
-DEFINE_SIMPLE_CONVERSION_FUNCTIONS(ThreadSafeModule, LLVMOrcThreadSafeModuleRef)
-
-// OrcCAPITestBase contains several helper methods and pointers for unit tests
-// written for the LLVM-C API. It provides the following helpers:
-//
-// 1. Jit: an LLVMOrcLLJIT instance which is freed upon test exit
-// 2. ExecutionSession: the LLVMOrcExecutionSession for the JIT
-// 3. MainDylib: the main JITDylib for the LLJIT instance
-// 4. materializationUnitFn: function pointer to an empty function, used for
-//                           materialization unit testing
-// 5. definitionGeneratorFn: function pointer for a basic
-//                           LLVMOrcCAPIDefinitionGeneratorTryToGenerateFunction
-// 6. createTestModule: helper method for creating a basic thread-safe-module
-class OrcCAPITestBase : public testing::Test {
-protected:
-  LLVMOrcLLJITRef Jit = nullptr;
-  LLVMOrcExecutionSessionRef ExecutionSession = nullptr;
-  LLVMOrcJITDylibRef MainDylib = nullptr;
-
-public:
-  static void SetUpTestCase() {
-    LLVMInitializeNativeTarget();
-    LLVMInitializeNativeAsmParser();
-    LLVMInitializeNativeAsmPrinter();
-
-    // Attempt to set up a JIT instance once to verify that we can.
-    LLVMOrcJITTargetMachineBuilderRef JTMB = nullptr;
-    if (LLVMErrorRef E = LLVMOrcJITTargetMachineBuilderDetectHost(&JTMB)) {
-      // If setup fails then disable these tests.
-      LLVMConsumeError(E);
-      TargetSupported = false;
-      return;
-    }
-
-    // Capture the target triple. We'll use it for both verification that
-    // this target is *supposed* to be supported, and error messages in
-    // the case that it fails anyway.
-    char *TT = LLVMOrcJITTargetMachineBuilderGetTargetTriple(JTMB);
-    TargetTriple = TT;
-    LLVMDisposeMessage(TT);
-
-    if (!isSupported(TargetTriple)) {
-      // If this triple isn't supported then bail out.
-      TargetSupported = false;
-      LLVMOrcDisposeJITTargetMachineBuilder(JTMB);
-      return;
-    }
-
-    LLVMOrcLLJITBuilderRef Builder = LLVMOrcCreateLLJITBuilder();
-    LLVMOrcLLJITBuilderSetJITTargetMachineBuilder(Builder, JTMB);
-    LLVMOrcLLJITRef J;
-    if (LLVMErrorRef E = LLVMOrcCreateLLJIT(&J, Builder)) {
-      // If setup fails then disable these tests.
-      TargetSupported = false;
-      LLVMConsumeError(E);
-      return;
-    }
-
-    LLVMOrcDisposeLLJIT(J);
-    TargetSupported = true;
-  }
-
-  void SetUp() override {
-    if (!TargetSupported)
-      GTEST_SKIP();
-
-    LLVMOrcJITTargetMachineBuilderRef JTMB = nullptr;
-    LLVMErrorRef E1 = LLVMOrcJITTargetMachineBuilderDetectHost(&JTMB);
-    assert(E1 == LLVMErrorSuccess && "Expected call to detect host to succeed");
-    (void)E1;
-
-    LLVMOrcLLJITBuilderRef Builder = LLVMOrcCreateLLJITBuilder();
-    LLVMOrcLLJITBuilderSetJITTargetMachineBuilder(Builder, JTMB);
-    LLVMErrorRef E2 = LLVMOrcCreateLLJIT(&Jit, Builder);
-    assert(E2 == LLVMErrorSuccess &&
-           "Expected call to create LLJIT to succeed");
-    (void)E2;
-    ExecutionSession = LLVMOrcLLJITGetExecutionSession(Jit);
-    MainDylib = LLVMOrcLLJITGetMainJITDylib(Jit);
-  }
-  void TearDown() override {
-    LLVMOrcDisposeLLJIT(Jit);
-    Jit = nullptr;
-  }
-
-protected:
-  static bool isSupported(StringRef Triple) {
-    // TODO: Print error messages in failure logs, use them to audit this list.
-    // Some architectures may be unsupportable or missing key components, but
-    // some may just be failing due to bugs in this testcase.
-    if (Triple.startswith("armv7") || Triple.startswith("armv8l"))
-      return false;
-    llvm::Triple T(Triple);
-    if (T.isOSAIX() && T.isPPC64())
-      return false;
-    return true;
-  }
-
-  static void materializationUnitFn() {}
-
-  // Stub definition generator, where all Names are materialized from the
-  // materializationUnitFn() test function and defined into the JIT Dylib
-  static LLVMErrorRef
-  definitionGeneratorFn(LLVMOrcDefinitionGeneratorRef G, void *Ctx,
-                        LLVMOrcLookupStateRef *LS, LLVMOrcLookupKind K,
-                        LLVMOrcJITDylibRef JD, LLVMOrcJITDylibLookupFlags F,
-                        LLVMOrcCLookupSet Names, size_t NamesCount) {
-    for (size_t I = 0; I < NamesCount; I++) {
-      LLVMOrcCLookupSetElement Element = Names[I];
-      LLVMOrcJITTargetAddress Addr =
-          (LLVMOrcJITTargetAddress)(&materializationUnitFn);
-      LLVMJITSymbolFlags Flags = {LLVMJITSymbolGenericFlagsWeak, 0};
-      LLVMJITEvaluatedSymbol Sym = {Addr, Flags};
-      LLVMOrcRetainSymbolStringPoolEntry(Element.Name);
-      LLVMJITCSymbolMapPair Pair = {Element.Name, Sym};
-      LLVMJITCSymbolMapPair Pairs[] = {Pair};
-      LLVMOrcMaterializationUnitRef MU = LLVMOrcAbsoluteSymbols(Pairs, 1);
-      LLVMErrorRef Err = LLVMOrcJITDylibDefine(JD, MU);
-      if (Err)
-        return Err;
-    }
-    return LLVMErrorSuccess;
-  }
-
-  static Error createSMDiagnosticError(llvm::SMDiagnostic &Diag) {
-    std::string Msg;
-    {
-      raw_string_ostream OS(Msg);
-      Diag.print("", OS);
-    }
-    return make_error<StringError>(std::move(Msg), inconvertibleErrorCode());
-  }
-
-  // Create an LLVM IR module from the given StringRef.
-  static Expected<std::unique_ptr<Module>>
-  parseTestModule(LLVMContext &Ctx, StringRef Source, StringRef Name) {
-    assert(TargetSupported &&
-           "Attempted to create module for unsupported target");
-    SMDiagnostic Err;
-    if (auto M = parseIR(MemoryBufferRef(Source, Name), Err, Ctx))
-      return std::move(M);
-    return createSMDiagnosticError(Err);
-  }
-
-  // returns the sum of its two parameters
-  static LLVMOrcThreadSafeModuleRef createTestModule(StringRef Source,
-                                                     StringRef Name) {
-    auto Ctx = std::make_unique<LLVMContext>();
-    auto M = cantFail(parseTestModule(*Ctx, Source, Name));
-    return wrap(new ThreadSafeModule(std::move(M), std::move(Ctx)));
-  }
-
-  static LLVMMemoryBufferRef createTestObject(StringRef Source,
-                                              StringRef Name) {
-    auto Ctx = std::make_unique<LLVMContext>();
-    auto M = cantFail(parseTestModule(*Ctx, Source, Name));
-
-    auto JTMB = cantFail(JITTargetMachineBuilder::detectHost());
-    M->setDataLayout(cantFail(JTMB.getDefaultDataLayoutForTarget()));
-    auto TM = cantFail(JTMB.createTargetMachine());
-
-    SimpleCompiler SC(*TM);
-    auto ObjBuffer = cantFail(SC(*M));
-    return wrap(ObjBuffer.release());
-  }
-
-  static std::string TargetTriple;
-  static bool TargetSupported;
-};
-
-std::string OrcCAPITestBase::TargetTriple;
-bool OrcCAPITestBase::TargetSupported = false;
-
-namespace {
-
-constexpr StringRef SumExample =
-    R"(
-    define i32 @sum(i32 %x, i32 %y) {
-    entry:
-      %r = add nsw i32 %x, %y
-      ret i32 %r
-    }
-  )";
-
-} // end anonymous namespace.
-
-// Consumes the given error ref and returns the string error message.
-static std::string toString(LLVMErrorRef E) {
-  char *ErrMsg = LLVMGetErrorMessage(E);
-  std::string Result(ErrMsg);
-  LLVMDisposeErrorMessage(ErrMsg);
-  return Result;
-}
-
-TEST_F(OrcCAPITestBase, SymbolStringPoolUniquing) {
-  LLVMOrcSymbolStringPoolEntryRef E1 =
-      LLVMOrcExecutionSessionIntern(ExecutionSession, "aaa");
-  LLVMOrcSymbolStringPoolEntryRef E2 =
-      LLVMOrcExecutionSessionIntern(ExecutionSession, "aaa");
-  LLVMOrcSymbolStringPoolEntryRef E3 =
-      LLVMOrcExecutionSessionIntern(ExecutionSession, "bbb");
-  const char *SymbolName = LLVMOrcSymbolStringPoolEntryStr(E1);
-  ASSERT_EQ(E1, E2) << "String pool entries are not unique";
-  ASSERT_NE(E1, E3) << "Unique symbol pool entries are equal";
-  ASSERT_STREQ("aaa", SymbolName) << "String value of symbol is not equal";
-  LLVMOrcReleaseSymbolStringPoolEntry(E1);
-  LLVMOrcReleaseSymbolStringPoolEntry(E2);
-  LLVMOrcReleaseSymbolStringPoolEntry(E3);
-}
-
-TEST_F(OrcCAPITestBase, JITDylibLookup) {
-  LLVMOrcJITDylibRef DoesNotExist =
-      LLVMOrcExecutionSessionGetJITDylibByName(ExecutionSession, "test");
-  ASSERT_FALSE(!!DoesNotExist);
-  LLVMOrcJITDylibRef L1 =
-      LLVMOrcExecutionSessionCreateBareJITDylib(ExecutionSession, "test");
-  LLVMOrcJITDylibRef L2 =
-      LLVMOrcExecutionSessionGetJITDylibByName(ExecutionSession, "test");
-  ASSERT_EQ(L1, L2) << "Located JIT Dylib is not equal to original";
-}
-
-TEST_F(OrcCAPITestBase, MaterializationUnitCreation) {
-  LLVMOrcSymbolStringPoolEntryRef Name =
-      LLVMOrcLLJITMangleAndIntern(Jit, "test");
-  LLVMJITSymbolFlags Flags = {LLVMJITSymbolGenericFlagsWeak, 0};
-  LLVMOrcJITTargetAddress Addr =
-      (LLVMOrcJITTargetAddress)(&materializationUnitFn);
-  LLVMJITEvaluatedSymbol Sym = {Addr, Flags};
-  LLVMJITCSymbolMapPair Pair = {Name, Sym};
-  LLVMJITCSymbolMapPair Pairs[] = {Pair};
-  LLVMOrcMaterializationUnitRef MU = LLVMOrcAbsoluteSymbols(Pairs, 1);
-  LLVMOrcJITDylibDefine(MainDylib, MU);
-  LLVMOrcJITTargetAddress OutAddr;
-  if (LLVMErrorRef E = LLVMOrcLLJITLookup(Jit, &OutAddr, "test"))
-    FAIL() << "Failed to look up \"test\" symbol (triple = " << TargetTriple
-           << "): " << toString(E);
-  ASSERT_EQ(Addr, OutAddr);
-}
-
-TEST_F(OrcCAPITestBase, DefinitionGenerators) {
-  LLVMOrcDefinitionGeneratorRef Gen =
-      LLVMOrcCreateCustomCAPIDefinitionGenerator(&definitionGeneratorFn,
-                                                 nullptr);
-  LLVMOrcJITDylibAddGenerator(MainDylib, Gen);
-  LLVMOrcJITTargetAddress OutAddr;
-  if (LLVMErrorRef E = LLVMOrcLLJITLookup(Jit, &OutAddr, "test"))
-    FAIL() << "The DefinitionGenerator did not create symbol \"test\" "
-           << "(triple = " << TargetTriple << "): " << toString(E);
-  LLVMOrcJITTargetAddress ExpectedAddr =
-      (LLVMOrcJITTargetAddress)(&materializationUnitFn);
-  ASSERT_EQ(ExpectedAddr, OutAddr);
-}
-
-TEST_F(OrcCAPITestBase, ResourceTrackerDefinitionLifetime) {
-  // This test case ensures that all symbols loaded into a JITDylib with a
-  // ResourceTracker attached are cleared from the JITDylib once the RT is
-  // removed.
-  LLVMOrcResourceTrackerRef RT =
-      LLVMOrcJITDylibCreateResourceTracker(MainDylib);
-  LLVMOrcThreadSafeModuleRef TSM = createTestModule(SumExample, "sum.ll");
-  if (LLVMErrorRef E = LLVMOrcLLJITAddLLVMIRModuleWithRT(Jit, RT, TSM))
-    FAIL() << "Failed to add LLVM IR module to LLJIT (triple = " << TargetTriple
-           << "): " << toString(E);
-  LLVMOrcJITTargetAddress TestFnAddr;
-  if (LLVMErrorRef E = LLVMOrcLLJITLookup(Jit, &TestFnAddr, "sum"))
-    FAIL() << "Symbol \"sum\" was not added into JIT (triple = " << TargetTriple
-           << "): " << toString(E);
-  ASSERT_TRUE(!!TestFnAddr);
-  LLVMOrcResourceTrackerRemove(RT);
-  LLVMOrcJITTargetAddress OutAddr;
-  LLVMErrorRef Err = LLVMOrcLLJITLookup(Jit, &OutAddr, "sum");
-  ASSERT_TRUE(Err);
-  LLVMConsumeError(Err);
-
-  ASSERT_FALSE(OutAddr);
-  LLVMOrcReleaseResourceTracker(RT);
-}
-
-TEST_F(OrcCAPITestBase, ResourceTrackerTransfer) {
-  LLVMOrcResourceTrackerRef DefaultRT =
-      LLVMOrcJITDylibGetDefaultResourceTracker(MainDylib);
-  LLVMOrcResourceTrackerRef RT2 =
-      LLVMOrcJITDylibCreateResourceTracker(MainDylib);
-  LLVMOrcThreadSafeModuleRef TSM = createTestModule(SumExample, "sum.ll");
-  if (LLVMErrorRef E = LLVMOrcLLJITAddLLVMIRModuleWithRT(Jit, DefaultRT, TSM))
-    FAIL() << "Failed to add LLVM IR module to LLJIT (triple = " << TargetTriple
-           << "): " << toString(E);
-  LLVMOrcJITTargetAddress Addr;
-  if (LLVMErrorRef E = LLVMOrcLLJITLookup(Jit, &Addr, "sum"))
-    FAIL() << "Symbol \"sum\" was not added into JIT (triple = " << TargetTriple
-           << "): " << toString(E);
-  LLVMOrcResourceTrackerTransferTo(DefaultRT, RT2);
-  LLVMErrorRef Err = LLVMOrcLLJITLookup(Jit, &Addr, "sum");
-  ASSERT_FALSE(Err);
-  LLVMOrcReleaseResourceTracker(RT2);
-}
-
-TEST_F(OrcCAPITestBase, AddObjectBuffer) {
-  LLVMOrcObjectLayerRef ObjLinkingLayer = LLVMOrcLLJITGetObjLinkingLayer(Jit);
-  LLVMMemoryBufferRef ObjBuffer = createTestObject(SumExample, "sum.ll");
-
-  if (LLVMErrorRef E = LLVMOrcObjectLayerAddObjectFile(ObjLinkingLayer,
-                                                       MainDylib, ObjBuffer))
-    FAIL() << "Failed to add object file to ObjLinkingLayer (triple = "
-           << TargetTriple << "): " << toString(E);
-
-  LLVMOrcJITTargetAddress SumAddr;
-  if (LLVMErrorRef E = LLVMOrcLLJITLookup(Jit, &SumAddr, "sum"))
-    FAIL() << "Symbol \"sum\" was not added into JIT (triple = " << TargetTriple
-           << "): " << toString(E);
-  ASSERT_TRUE(!!SumAddr);
-}
-
-TEST_F(OrcCAPITestBase, ExecutionTest) {
-  using SumFunctionType = int32_t (*)(int32_t, int32_t);
-
-  // This test performs OrcJIT compilation of a simple sum module
-  LLVMInitializeNativeAsmPrinter();
-  LLVMOrcThreadSafeModuleRef TSM = createTestModule(SumExample, "sum.ll");
-  if (LLVMErrorRef E = LLVMOrcLLJITAddLLVMIRModule(Jit, MainDylib, TSM))
-    FAIL() << "Failed to add LLVM IR module to LLJIT (triple = " << TargetTriple
-           << ")" << toString(E);
-  LLVMOrcJITTargetAddress TestFnAddr;
-  if (LLVMErrorRef E = LLVMOrcLLJITLookup(Jit, &TestFnAddr, "sum"))
-    FAIL() << "Symbol \"sum\" was not added into JIT (triple = " << TargetTriple
-           << "): " << toString(E);
-  auto *SumFn = (SumFunctionType)(TestFnAddr);
-  int32_t Result = SumFn(1, 1);
-  ASSERT_EQ(2, Result);
-}
-
-void Destroy(void *Ctx) {}
-
-void TargetFn() {}
-
-void Materialize(void *Ctx, LLVMOrcMaterializationResponsibilityRef MR) {
-  LLVMOrcJITDylibRef JD =
-      LLVMOrcMaterializationResponsibilityGetTargetDylib(MR);
-  ASSERT_TRUE(!!JD);
-
-  LLVMOrcExecutionSessionRef ES =
-      LLVMOrcMaterializationResponsibilityGetExecutionSession(MR);
-  ASSERT_TRUE(!!ES);
-
-  LLVMOrcSymbolStringPoolEntryRef InitSym =
-      LLVMOrcMaterializationResponsibilityGetInitializerSymbol(MR);
-  ASSERT_TRUE(!InitSym);
-
-  size_t NumSymbols;
-  LLVMOrcCSymbolFlagsMapPairs Symbols =
-      LLVMOrcMaterializationResponsibilityGetSymbols(MR, &NumSymbols);
-
-  ASSERT_TRUE(!!Symbols);
-  ASSERT_EQ(NumSymbols, (size_t)1);
-
-  LLVMOrcSymbolStringPoolEntryRef *RequestedSymbols =
-      LLVMOrcMaterializationResponsibilityGetRequestedSymbols(MR, &NumSymbols);
-
-  ASSERT_TRUE(!!RequestedSymbols);
-  ASSERT_EQ(NumSymbols, (size_t)1);
-
-  LLVMOrcCSymbolFlagsMapPair TargetSym = Symbols[0];
-
-  ASSERT_EQ(RequestedSymbols[0], TargetSym.Name);
-  LLVMOrcRetainSymbolStringPoolEntry(TargetSym.Name);
-
-  LLVMOrcDisposeCSymbolFlagsMap(Symbols);
-  LLVMOrcDisposeSymbols(RequestedSymbols);
-
-  LLVMOrcJITTargetAddress Addr = (LLVMOrcJITTargetAddress)(&TargetFn);
-
-  LLVMJITSymbolFlags Flags = {
-      LLVMJITSymbolGenericFlagsExported | LLVMJITSymbolGenericFlagsCallable, 0};
-  ASSERT_EQ(TargetSym.Flags.GenericFlags, Flags.GenericFlags);
-  ASSERT_EQ(TargetSym.Flags.TargetFlags, Flags.TargetFlags);
-
-  LLVMJITEvaluatedSymbol Sym = {Addr, Flags};
-
-  LLVMOrcLLJITRef J = (LLVMOrcLLJITRef)Ctx;
-
-  LLVMOrcSymbolStringPoolEntryRef OtherSymbol =
-      LLVMOrcLLJITMangleAndIntern(J, "other");
-  LLVMOrcSymbolStringPoolEntryRef DependencySymbol =
-      LLVMOrcLLJITMangleAndIntern(J, "dependency");
-
-  LLVMOrcRetainSymbolStringPoolEntry(OtherSymbol);
-  LLVMOrcRetainSymbolStringPoolEntry(DependencySymbol);
-  LLVMOrcCSymbolFlagsMapPair NewSymbols[] = {
-      {OtherSymbol, Flags},
-      {DependencySymbol, Flags},
-  };
-  LLVMOrcMaterializationResponsibilityDefineMaterializing(MR, NewSymbols, 2);
-
-  LLVMOrcRetainSymbolStringPoolEntry(OtherSymbol);
-  LLVMOrcMaterializationResponsibilityRef OtherMR = NULL;
-  {
-    LLVMErrorRef Err = LLVMOrcMaterializationResponsibilityDelegate(
-        MR, &OtherSymbol, 1, &OtherMR);
-    if (Err) {
-      char *ErrMsg = LLVMGetErrorMessage(Err);
-      fprintf(stderr, "Error: %s\n", ErrMsg);
-      LLVMDisposeErrorMessage(ErrMsg);
-      LLVMOrcMaterializationResponsibilityFailMaterialization(MR);
-      LLVMOrcDisposeMaterializationResponsibility(MR);
-      return;
-    }
-  }
-  assert(OtherMR);
-
-  LLVMJITCSymbolMapPair OtherPair = {OtherSymbol, Sym};
-  LLVMOrcMaterializationUnitRef OtherMU = LLVMOrcAbsoluteSymbols(&OtherPair, 1);
-  // OtherSymbol is no longer owned by us
-  {
-    LLVMErrorRef Err =
-        LLVMOrcMaterializationResponsibilityReplace(OtherMR, OtherMU);
-    if (Err) {
-      char *ErrMsg = LLVMGetErrorMessage(Err);
-      fprintf(stderr, "Error: %s\n", ErrMsg);
-      LLVMDisposeErrorMessage(ErrMsg);
-
-      LLVMOrcMaterializationResponsibilityFailMaterialization(OtherMR);
-      LLVMOrcMaterializationResponsibilityFailMaterialization(MR);
-
-      LLVMOrcDisposeMaterializationResponsibility(OtherMR);
-      LLVMOrcDisposeMaterializationResponsibility(MR);
-      LLVMOrcDisposeMaterializationUnit(OtherMU);
-      return;
-    }
-  }
-  LLVMOrcDisposeMaterializationResponsibility(OtherMR);
-
-  // FIXME: Implement async lookup
-  // A real test of the dependence tracking in the success case would require
-  // async lookups. You could:
-  // 1. Materialize foo, making foo depend on other.
-  // 2. In the caller, verify that the lookup callback for foo has not run (due
-  // to the dependence)
-  // 3. Materialize other by looking it up.
-  // 4. In the caller, verify that the lookup callback for foo has now run.
-
-  LLVMOrcRetainSymbolStringPoolEntry(TargetSym.Name);
-  LLVMOrcRetainSymbolStringPoolEntry(DependencySymbol);
-  LLVMOrcCDependenceMapPair Dependency = {JD, {&DependencySymbol, 1}};
-  LLVMOrcMaterializationResponsibilityAddDependencies(MR, TargetSym.Name,
-                                                      &Dependency, 1);
-
-  LLVMOrcRetainSymbolStringPoolEntry(DependencySymbol);
-  LLVMOrcMaterializationResponsibilityAddDependenciesForAll(MR, &Dependency, 1);
-
-  // See FIXME above
-  LLVMJITCSymbolMapPair Pair = {DependencySymbol, Sym};
-  LLVMOrcMaterializationResponsibilityNotifyResolved(MR, &Pair, 1);
-  // DependencySymbol no longer owned by us
-
-  Pair = {TargetSym.Name, Sym};
-  LLVMOrcMaterializationResponsibilityNotifyResolved(MR, &Pair, 1);
-
-  LLVMOrcMaterializationResponsibilityNotifyEmitted(MR);
-  LLVMOrcDisposeMaterializationResponsibility(MR);
-  return;
-}
-
-TEST_F(OrcCAPITestBase, MaterializationResponsibility) {
-  LLVMJITSymbolFlags Flags = {
-      LLVMJITSymbolGenericFlagsExported | LLVMJITSymbolGenericFlagsCallable, 0};
-  LLVMOrcCSymbolFlagsMapPair Sym = {LLVMOrcLLJITMangleAndIntern(Jit, "foo"),
-                                    Flags};
-
-  LLVMOrcMaterializationUnitRef MU = LLVMOrcCreateCustomMaterializationUnit(
-      "MU", (void *)Jit, &Sym, 1, NULL, &Materialize, NULL, &Destroy);
-  LLVMOrcJITDylibRef JD = LLVMOrcLLJITGetMainJITDylib(Jit);
-  LLVMOrcJITDylibDefine(JD, MU);
-
-  LLVMOrcJITTargetAddress Addr;
-  if (LLVMErrorRef Err = LLVMOrcLLJITLookup(Jit, &Addr, "foo")) {
-    FAIL() << "foo was not materialized " << toString(Err);
-  }
-  ASSERT_TRUE(!!Addr);
-  ASSERT_EQ(Addr, (LLVMOrcJITTargetAddress)&TargetFn);
-
-  if (LLVMErrorRef Err = LLVMOrcLLJITLookup(Jit, &Addr, "other")) {
-    FAIL() << "other was not materialized " << toString(Err);
-  }
-  ASSERT_TRUE(!!Addr);
-  ASSERT_EQ(Addr, (LLVMOrcJITTargetAddress)&TargetFn);
-
-  if (LLVMErrorRef Err = LLVMOrcLLJITLookup(Jit, &Addr, "dependency")) {
-    FAIL() << "dependency was not materialized " << toString(Err);
-  }
-  ASSERT_TRUE(!!Addr);
-  ASSERT_EQ(Addr, (LLVMOrcJITTargetAddress)&TargetFn);
-}
diff --git a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/OrcTestCommon.cpp b/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/OrcTestCommon.cpp
deleted file mode 100644
index 2a3223a9731..00000000000
--- a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/OrcTestCommon.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-//===--------- OrcTestCommon.cpp - Utilities for Orc Unit Tests -----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Common utilities for Orc unit tests.
-//
-//===----------------------------------------------------------------------===//
-
-#include "OrcTestCommon.h"
-
-using namespace llvm;
-
-const JITTargetAddress llvm::orc::CoreAPIsBasedStandardTest::FooAddr;
-const JITTargetAddress llvm::orc::CoreAPIsBasedStandardTest::BarAddr;
-const JITTargetAddress llvm::orc::CoreAPIsBasedStandardTest::BazAddr;
-const JITTargetAddress llvm::orc::CoreAPIsBasedStandardTest::QuxAddr;
-
-bool OrcNativeTarget::NativeTargetInitialized = false;
-
-ModuleBuilder::ModuleBuilder(LLVMContext &Context, StringRef Triple,
-                             StringRef Name)
-  : M(new Module(Name, Context)) {
-  if (Triple != "")
-    M->setTargetTriple(Triple);
-}
diff --git a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/OrcTestCommon.h b/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/OrcTestCommon.h
deleted file mode 100644
index a4581394a6e..00000000000
--- a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/OrcTestCommon.h
+++ /dev/null
@@ -1,164 +0,0 @@
-//===------ OrcTestCommon.h - Utilities for Orc Unit Tests ------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Common utilities for the Orc unit tests.
-//
-//===----------------------------------------------------------------------===//
-
-
-#ifndef LLVM_UNITTESTS_EXECUTIONENGINE_ORC_ORCTESTCOMMON_H
-#define LLVM_UNITTESTS_EXECUTIONENGINE_ORC_ORCTESTCOMMON_H
-
-#include "llvm/ExecutionEngine/JITSymbol.h"
-#include "llvm/ExecutionEngine/Orc/Core.h"
-#include "llvm/ExecutionEngine/Orc/ExecutorProcessControl.h"
-#include "llvm/ExecutionEngine/Orc/IndirectionUtils.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Object/ObjectFile.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "gtest/gtest.h"
-
-#include <memory>
-
-namespace llvm {
-
-namespace orc {
-// CoreAPIsStandardTest that saves a bunch of boilerplate by providing the
-// following:
-//
-// (1) ES -- An ExecutionSession
-// (2) Foo, Bar, Baz, Qux -- SymbolStringPtrs for strings "foo", "bar", "baz",
-//     and "qux" respectively.
-// (3) FooAddr, BarAddr, BazAddr, QuxAddr -- Dummy addresses. Guaranteed
-//     distinct and non-null.
-// (4) FooSym, BarSym, BazSym, QuxSym -- JITEvaluatedSymbols with FooAddr,
-//     BarAddr, BazAddr, and QuxAddr respectively. All with default strong,
-//     linkage and non-hidden visibility.
-// (5) V -- A JITDylib associated with ES.
-class CoreAPIsBasedStandardTest : public testing::Test {
-public:
-  ~CoreAPIsBasedStandardTest() {
-    if (auto Err = ES.endSession())
-      ES.reportError(std::move(Err));
-  }
-
-protected:
-  std::shared_ptr<SymbolStringPool> SSP = std::make_shared<SymbolStringPool>();
-  ExecutionSession ES{std::make_unique<UnsupportedExecutorProcessControl>(SSP)};
-  JITDylib &JD = ES.createBareJITDylib("JD");
-  SymbolStringPtr Foo = ES.intern("foo");
-  SymbolStringPtr Bar = ES.intern("bar");
-  SymbolStringPtr Baz = ES.intern("baz");
-  SymbolStringPtr Qux = ES.intern("qux");
-  static const JITTargetAddress FooAddr = 1U;
-  static const JITTargetAddress BarAddr = 2U;
-  static const JITTargetAddress BazAddr = 3U;
-  static const JITTargetAddress QuxAddr = 4U;
-  JITEvaluatedSymbol FooSym =
-      JITEvaluatedSymbol(FooAddr, JITSymbolFlags::Exported);
-  JITEvaluatedSymbol BarSym =
-      JITEvaluatedSymbol(BarAddr, JITSymbolFlags::Exported);
-  JITEvaluatedSymbol BazSym =
-      JITEvaluatedSymbol(BazAddr, JITSymbolFlags::Exported);
-  JITEvaluatedSymbol QuxSym =
-      JITEvaluatedSymbol(QuxAddr, JITSymbolFlags::Exported);
-};
-
-} // end namespace orc
-
-class OrcNativeTarget {
-public:
-  static void initialize() {
-    if (!NativeTargetInitialized) {
-      InitializeNativeTarget();
-      InitializeNativeTargetAsmParser();
-      InitializeNativeTargetAsmPrinter();
-      NativeTargetInitialized = true;
-    }
-  }
-
-private:
-  static bool NativeTargetInitialized;
-};
-
-class SimpleMaterializationUnit : public orc::MaterializationUnit {
-public:
-  using MaterializeFunction =
-      std::function<void(std::unique_ptr<orc::MaterializationResponsibility>)>;
-  using DiscardFunction =
-      std::function<void(const orc::JITDylib &, orc::SymbolStringPtr)>;
-  using DestructorFunction = std::function<void()>;
-
-  SimpleMaterializationUnit(
-      orc::SymbolFlagsMap SymbolFlags, MaterializeFunction Materialize,
-      orc::SymbolStringPtr InitSym = nullptr,
-      DiscardFunction Discard = DiscardFunction(),
-      DestructorFunction Destructor = DestructorFunction())
-      : MaterializationUnit(std::move(SymbolFlags), std::move(InitSym)),
-        Materialize(std::move(Materialize)), Discard(std::move(Discard)),
-        Destructor(std::move(Destructor)) {}
-
-  ~SimpleMaterializationUnit() override {
-    if (Destructor)
-      Destructor();
-  }
-
-  StringRef getName() const override { return "<Simple>"; }
-
-  void
-  materialize(std::unique_ptr<orc::MaterializationResponsibility> R) override {
-    Materialize(std::move(R));
-  }
-
-  void discard(const orc::JITDylib &JD,
-               const orc::SymbolStringPtr &Name) override {
-    if (Discard)
-      Discard(JD, std::move(Name));
-    else
-      llvm_unreachable("Discard not supported");
-  }
-
-private:
-  MaterializeFunction Materialize;
-  DiscardFunction Discard;
-  DestructorFunction Destructor;
-};
-
-class ModuleBuilder {
-public:
-  ModuleBuilder(LLVMContext &Context, StringRef Triple,
-                StringRef Name);
-
-  Function *createFunctionDecl(FunctionType *FTy, StringRef Name) {
-    return Function::Create(FTy, GlobalValue::ExternalLinkage, Name, M.get());
-  }
-
-  Module* getModule() { return M.get(); }
-  const Module* getModule() const { return M.get(); }
-  std::unique_ptr<Module> takeModule() { return std::move(M); }
-
-private:
-  std::unique_ptr<Module> M;
-};
-
-// Dummy struct type.
-struct DummyStruct {
-  int X[256];
-};
-
-inline StructType *getDummyStructTy(LLVMContext &Context) {
-  return StructType::get(ArrayType::get(Type::getInt32Ty(Context), 256));
-}
-
-} // namespace llvm
-
-#endif
diff --git a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/QueueChannel.cpp b/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/QueueChannel.cpp
deleted file mode 100644
index 7556f8a15e7..00000000000
--- a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/QueueChannel.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-//===-------- QueueChannel.cpp - Unit tests the remote executors ----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "QueueChannel.h"
-
-char llvm::QueueChannelError::ID;
-char llvm::QueueChannelClosedError::ID;
-
diff --git a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/QueueChannel.h b/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/QueueChannel.h
deleted file mode 100644
index 6d011baf1ab..00000000000
--- a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/QueueChannel.h
+++ /dev/null
@@ -1,178 +0,0 @@
-//===----------------------- Queue.h - RPC Queue ------------------*-c++-*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_UNITTESTS_EXECUTIONENGINE_ORC_QUEUECHANNEL_H
-#define LLVM_UNITTESTS_EXECUTIONENGINE_ORC_QUEUECHANNEL_H
-
-#include "llvm/ExecutionEngine/Orc/Shared/RawByteChannel.h"
-#include "llvm/Support/Error.h"
-
-#include <atomic>
-#include <condition_variable>
-#include <queue>
-
-namespace llvm {
-
-class QueueChannelError : public ErrorInfo<QueueChannelError> {
-public:
-  static char ID;
-};
-
-class QueueChannelClosedError
-    : public ErrorInfo<QueueChannelClosedError, QueueChannelError> {
-public:
-  static char ID;
-  std::error_code convertToErrorCode() const override {
-    return inconvertibleErrorCode();
-  }
-
-  void log(raw_ostream &OS) const override {
-    OS << "Queue closed";
-  }
-};
-
-class Queue : public std::queue<char> {
-public:
-  using ErrorInjector = std::function<Error()>;
-
-  Queue()
-    : ReadError([]() { return Error::success(); }),
-      WriteError([]() { return Error::success(); }) {}
-
-  Queue(const Queue&) = delete;
-  Queue& operator=(const Queue&) = delete;
-  Queue(Queue&&) = delete;
-  Queue& operator=(Queue&&) = delete;
-
-  std::mutex &getMutex() { return M; }
-  std::condition_variable &getCondVar() { return CV; }
-  Error checkReadError() { return ReadError(); }
-  Error checkWriteError() { return WriteError(); }
-  void setReadError(ErrorInjector NewReadError) {
-    {
-      std::lock_guard<std::mutex> Lock(M);
-      ReadError = std::move(NewReadError);
-    }
-    CV.notify_one();
-  }
-  void setWriteError(ErrorInjector NewWriteError) {
-    std::lock_guard<std::mutex> Lock(M);
-    WriteError = std::move(NewWriteError);
-  }
-private:
-  std::mutex M;
-  std::condition_variable CV;
-  std::function<Error()> ReadError, WriteError;
-};
-
-class QueueChannel : public orc::shared::RawByteChannel {
-public:
-  QueueChannel(std::shared_ptr<Queue> InQueue,
-               std::shared_ptr<Queue> OutQueue)
-      : InQueue(InQueue), OutQueue(OutQueue) {}
-
-  QueueChannel(const QueueChannel&) = delete;
-  QueueChannel& operator=(const QueueChannel&) = delete;
-  QueueChannel(QueueChannel&&) = delete;
-  QueueChannel& operator=(QueueChannel&&) = delete;
-
-  template <typename FunctionIdT, typename SequenceIdT>
-  Error startSendMessage(const FunctionIdT &FnId, const SequenceIdT &SeqNo) {
-    ++InFlightOutgoingMessages;
-    return orc::shared::RawByteChannel::startSendMessage(FnId, SeqNo);
-  }
-
-  Error endSendMessage() {
-    --InFlightOutgoingMessages;
-    ++CompletedOutgoingMessages;
-    return orc::shared::RawByteChannel::endSendMessage();
-  }
-
-  template <typename FunctionIdT, typename SequenceNumberT>
-  Error startReceiveMessage(FunctionIdT &FnId, SequenceNumberT &SeqNo) {
-    ++InFlightIncomingMessages;
-    return orc::shared::RawByteChannel::startReceiveMessage(FnId, SeqNo);
-  }
-
-  Error endReceiveMessage() {
-    --InFlightIncomingMessages;
-    ++CompletedIncomingMessages;
-    return orc::shared::RawByteChannel::endReceiveMessage();
-  }
-
-  Error readBytes(char *Dst, unsigned Size) override {
-    std::unique_lock<std::mutex> Lock(InQueue->getMutex());
-    while (Size) {
-      {
-        Error Err = InQueue->checkReadError();
-        while (!Err && InQueue->empty()) {
-          InQueue->getCondVar().wait(Lock);
-          Err = InQueue->checkReadError();
-        }
-        if (Err)
-          return Err;
-      }
-      *Dst++ = InQueue->front();
-      --Size;
-      ++NumRead;
-      InQueue->pop();
-    }
-    return Error::success();
-  }
-
-  Error appendBytes(const char *Src, unsigned Size) override {
-    std::unique_lock<std::mutex> Lock(OutQueue->getMutex());
-    while (Size--) {
-      if (Error Err = OutQueue->checkWriteError())
-        return Err;
-      OutQueue->push(*Src++);
-      ++NumWritten;
-    }
-    OutQueue->getCondVar().notify_one();
-    return Error::success();
-  }
-
-  Error send() override {
-    ++SendCalls;
-    return Error::success();
-  }
-
-  void close() {
-    auto ChannelClosed = []() { return make_error<QueueChannelClosedError>(); };
-    InQueue->setReadError(ChannelClosed);
-    InQueue->setWriteError(ChannelClosed);
-    OutQueue->setReadError(ChannelClosed);
-    OutQueue->setWriteError(ChannelClosed);
-  }
-
-  uint64_t NumWritten = 0;
-  uint64_t NumRead = 0;
-  std::atomic<size_t> InFlightIncomingMessages{0};
-  std::atomic<size_t> CompletedIncomingMessages{0};
-  std::atomic<size_t> InFlightOutgoingMessages{0};
-  std::atomic<size_t> CompletedOutgoingMessages{0};
-  std::atomic<size_t> SendCalls{0};
-
-private:
-
-  std::shared_ptr<Queue> InQueue;
-  std::shared_ptr<Queue> OutQueue;
-};
-
-inline std::pair<std::unique_ptr<QueueChannel>, std::unique_ptr<QueueChannel>>
-createPairedQueueChannels() {
-  auto Q1 = std::make_shared<Queue>();
-  auto Q2 = std::make_shared<Queue>();
-  auto C1 = std::make_unique<QueueChannel>(Q1, Q2);
-  auto C2 = std::make_unique<QueueChannel>(Q2, Q1);
-  return std::make_pair(std::move(C1), std::move(C2));
-}
-
-}
-
-#endif
diff --git a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/RPCUtilsTest.cpp b/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/RPCUtilsTest.cpp
deleted file mode 100644
index 0f5cb14fec3..00000000000
--- a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/RPCUtilsTest.cpp
+++ /dev/null
@@ -1,890 +0,0 @@
-//===----------- RPCUtilsTest.cpp - Unit tests the Orc RPC utils ----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ExecutionEngine/Orc/Shared/RPCUtils.h"
-#include "QueueChannel.h"
-#include "gtest/gtest.h"
-
-#include <queue>
-
-using namespace llvm;
-using namespace llvm::orc;
-using namespace llvm::orc::shared;
-
-class RPCFoo {};
-
-namespace llvm {
-namespace orc {
-namespace shared {
-
-template <> class SerializationTypeName<RPCFoo> {
-public:
-  static const char *getName() { return "RPCFoo"; }
-};
-
-  template <>
-  class SerializationTraits<QueueChannel, RPCFoo, RPCFoo> {
-  public:
-    static Error serialize(QueueChannel&, const RPCFoo&) {
-      return Error::success();
-    }
-
-    static Error deserialize(QueueChannel&, RPCFoo&) {
-      return Error::success();
-    }
-  };
-
-  } // namespace shared
-} // end namespace orc
-} // end namespace llvm
-
-class RPCBar {};
-
-class DummyError : public ErrorInfo<DummyError> {
-public:
-
-  static char ID;
-
-  DummyError(uint32_t Val) : Val(Val) {}
-
-  std::error_code convertToErrorCode() const override {
-    // Use a nonsense error code - we want to verify that errors
-    // transmitted over the network are replaced with
-    // OrcErrorCode::UnknownErrorCodeFromRemote.
-    return orcError(OrcErrorCode::RemoteAllocatorDoesNotExist);
-  }
-
-  void log(raw_ostream &OS) const override {
-    OS << "Dummy error " << Val;
-  }
-
-  uint32_t getValue() const { return Val; }
-
-public:
-  uint32_t Val;
-};
-
-char DummyError::ID = 0;
-
-template <typename ChannelT>
-void registerDummyErrorSerialization() {
-  static bool AlreadyRegistered = false;
-  if (!AlreadyRegistered) {
-    SerializationTraits<ChannelT, Error>::
-      template registerErrorType<DummyError>(
-        "DummyError",
-        [](ChannelT &C, const DummyError &DE) {
-          return serializeSeq(C, DE.getValue());
-        },
-        [](ChannelT &C, Error &Err) -> Error {
-          ErrorAsOutParameter EAO(&Err);
-          uint32_t Val;
-          if (auto Err = deserializeSeq(C, Val))
-            return Err;
-          Err = make_error<DummyError>(Val);
-          return Error::success();
-        });
-    AlreadyRegistered = true;
-  }
-}
-
-namespace llvm {
-namespace orc {
-namespace shared {
-
-template <> class SerializationTraits<QueueChannel, RPCFoo, RPCBar> {
-public:
-  static Error serialize(QueueChannel &, const RPCBar &) {
-    return Error::success();
-  }
-
-  static Error deserialize(QueueChannel &, RPCBar &) {
-    return Error::success();
-  }
-};
-
-} // end namespace shared
-} // end namespace orc
-} // end namespace llvm
-
-namespace DummyRPCAPI {
-
-class VoidBool : public RPCFunction<VoidBool, void(bool)> {
-public:
-  static const char *getName() { return "VoidBool"; }
-};
-
-class IntInt : public RPCFunction<IntInt, int32_t(int32_t)> {
-public:
-  static const char *getName() { return "IntInt"; }
-};
-
-class VoidString : public RPCFunction<VoidString, void(std::string)> {
-public:
-  static const char *getName() { return "VoidString"; }
-};
-
-class AllTheTypes
-    : public RPCFunction<AllTheTypes,
-                         void(int8_t, uint8_t, int16_t, uint16_t, int32_t,
-                              uint32_t, int64_t, uint64_t, bool, std::string,
-                              std::vector<int>, std::set<int>,
-                              std::map<int, bool>)> {
-public:
-  static const char *getName() { return "AllTheTypes"; }
-};
-
-class CustomType : public RPCFunction<CustomType, RPCFoo(RPCFoo)> {
-public:
-  static const char *getName() { return "CustomType"; }
-};
-
-class ErrorFunc : public RPCFunction<ErrorFunc, Error()> {
-public:
-  static const char *getName() { return "ErrorFunc"; }
-};
-
-class ExpectedFunc : public RPCFunction<ExpectedFunc, Expected<uint32_t>()> {
-public:
-  static const char *getName() { return "ExpectedFunc"; }
-};
-}
-
-class DummyRPCEndpoint : public SingleThreadedRPCEndpoint<QueueChannel> {
-public:
-  DummyRPCEndpoint(QueueChannel &C)
-      : SingleThreadedRPCEndpoint(C, true) {}
-};
-
-
-void freeVoidBool(bool B) {
-}
-
-TEST(DummyRPC, TestFreeFunctionHandler) {
-  auto Channels = createPairedQueueChannels();
-  DummyRPCEndpoint Server(*Channels.first);
-  Server.addHandler<DummyRPCAPI::VoidBool>(freeVoidBool);
-}
-
-TEST(DummyRPC, TestCallAsyncVoidBool) {
-  auto Channels = createPairedQueueChannels();
-  DummyRPCEndpoint Client(*Channels.first);
-  DummyRPCEndpoint Server(*Channels.second);
-
-  std::thread ServerThread([&]() {
-      Server.addHandler<DummyRPCAPI::VoidBool>(
-          [](bool B) {
-            EXPECT_EQ(B, true)
-              << "Server void(bool) received unexpected result";
-          });
-
-      {
-        // Poke the server to handle the negotiate call.
-        auto Err = Server.handleOne();
-        EXPECT_FALSE(!!Err) << "Server failed to handle call to negotiate";
-      }
-
-      {
-        // Poke the server to handle the VoidBool call.
-        auto Err = Server.handleOne();
-        EXPECT_FALSE(!!Err) << "Server failed to handle call to void(bool)";
-      }
-  });
-
-  {
-    // Make an async call.
-    auto Err = Client.callAsync<DummyRPCAPI::VoidBool>(
-        [](Error Err) {
-          EXPECT_FALSE(!!Err) << "Async void(bool) response handler failed";
-          return Error::success();
-        }, true);
-    EXPECT_FALSE(!!Err) << "Client.callAsync failed for void(bool)";
-  }
-
-  {
-    // Poke the client to process the result of the void(bool) call.
-    auto Err = Client.handleOne();
-    EXPECT_FALSE(!!Err) << "Client failed to handle response from void(bool)";
-  }
-
-  ServerThread.join();
-
-  // The client should have made two calls to send: One implicit call to
-  // negotiate the VoidBool function key, and a second to make the VoidBool
-  // call.
-  EXPECT_EQ(Channels.first->SendCalls, 2U)
-      << "Expected one send call to have been made by client";
-
-  // The server should have made two calls to send: One to send the response to
-  // the negotiate call, and another to send the response to the VoidBool call.
-  EXPECT_EQ(Channels.second->SendCalls, 2U)
-      << "Expected two send calls to have been made by server";
-}
-
-TEST(DummyRPC, TestCallAsyncIntInt) {
-  auto Channels = createPairedQueueChannels();
-  DummyRPCEndpoint Client(*Channels.first);
-  DummyRPCEndpoint Server(*Channels.second);
-
-  std::thread ServerThread([&]() {
-      Server.addHandler<DummyRPCAPI::IntInt>(
-          [](int X) -> int {
-            EXPECT_EQ(X, 21) << "Server int(int) receieved unexpected result";
-            return 2 * X;
-          });
-
-      {
-        // Poke the server to handle the negotiate call.
-        auto Err = Server.handleOne();
-        EXPECT_FALSE(!!Err) << "Server failed to handle call to negotiate";
-      }
-
-      {
-        // Poke the server to handle the int(int) call.
-        auto Err = Server.handleOne();
-        EXPECT_FALSE(!!Err) << "Server failed to handle call to int(int)";
-      }
-    });
-
-  {
-    auto Err = Client.callAsync<DummyRPCAPI::IntInt>(
-        [](Expected<int> Result) {
-          EXPECT_TRUE(!!Result) << "Async int(int) response handler failed";
-          EXPECT_EQ(*Result, 42)
-            << "Async int(int) response handler received incorrect result";
-          return Error::success();
-        }, 21);
-    EXPECT_FALSE(!!Err) << "Client.callAsync failed for int(int)";
-  }
-
-  {
-    // Poke the client to process the result.
-    auto Err = Client.handleOne();
-    EXPECT_FALSE(!!Err) << "Client failed to handle response from void(bool)";
-  }
-
-  ServerThread.join();
-}
-
-TEST(DummyRPC, TestAsyncVoidBoolHandler) {
-  auto Channels = createPairedQueueChannels();
-  DummyRPCEndpoint Client(*Channels.first);
-  DummyRPCEndpoint Server(*Channels.second);
-
-  std::thread ServerThread([&]() {
-      Server.addAsyncHandler<DummyRPCAPI::VoidBool>(
-          [](std::function<Error(Error)> SendResult,
-             bool B) {
-            EXPECT_EQ(B, true) << "Server void(bool) receieved unexpected result";
-            cantFail(SendResult(Error::success()));
-            return Error::success();
-          });
-
-      {
-        // Poke the server to handle the negotiate call.
-        auto Err = Server.handleOne();
-        EXPECT_FALSE(!!Err) << "Server failed to handle call to negotiate";
-      }
-
-      {
-        // Poke the server to handle the VoidBool call.
-        auto Err = Server.handleOne();
-        EXPECT_FALSE(!!Err) << "Server failed to handle call to void(bool)";
-      }
-  });
-
-  {
-    auto Err = Client.callAsync<DummyRPCAPI::VoidBool>(
-        [](Error Result) {
-          EXPECT_FALSE(!!Result) << "Async void(bool) response handler failed";
-          return Error::success();
-        }, true);
-    EXPECT_FALSE(!!Err) << "Client.callAsync failed for void(bool)";
-  }
-
-  {
-    // Poke the client to process the result.
-    auto Err = Client.handleOne();
-    EXPECT_FALSE(!!Err) << "Client failed to handle response from void(bool)";
-  }
-
-  ServerThread.join();
-}
-
-TEST(DummyRPC, TestAsyncIntIntHandler) {
-  auto Channels = createPairedQueueChannels();
-  DummyRPCEndpoint Client(*Channels.first);
-  DummyRPCEndpoint Server(*Channels.second);
-
-  std::thread ServerThread([&]() {
-      Server.addAsyncHandler<DummyRPCAPI::IntInt>(
-          [](std::function<Error(Expected<int32_t>)> SendResult,
-             int32_t X) {
-            EXPECT_EQ(X, 21) << "Server int(int) receieved unexpected result";
-            return SendResult(2 * X);
-          });
-
-      {
-        // Poke the server to handle the negotiate call.
-        auto Err = Server.handleOne();
-        EXPECT_FALSE(!!Err) << "Server failed to handle call to negotiate";
-      }
-
-      {
-        // Poke the server to handle the VoidBool call.
-        auto Err = Server.handleOne();
-        EXPECT_FALSE(!!Err) << "Server failed to handle call to void(bool)";
-      }
-  });
-
-  {
-    auto Err = Client.callAsync<DummyRPCAPI::IntInt>(
-        [](Expected<int> Result) {
-          EXPECT_TRUE(!!Result) << "Async int(int) response handler failed";
-          EXPECT_EQ(*Result, 42)
-            << "Async int(int) response handler received incorrect result";
-          return Error::success();
-        }, 21);
-    EXPECT_FALSE(!!Err) << "Client.callAsync failed for int(int)";
-  }
-
-  {
-    // Poke the client to process the result.
-    auto Err = Client.handleOne();
-    EXPECT_FALSE(!!Err) << "Client failed to handle response from void(bool)";
-  }
-
-  ServerThread.join();
-}
-
-TEST(DummyRPC, TestAsyncIntIntHandlerMethod) {
-  auto Channels = createPairedQueueChannels();
-  DummyRPCEndpoint Client(*Channels.first);
-  DummyRPCEndpoint Server(*Channels.second);
-
-  class Dummy {
-  public:
-    Error handler(std::function<Error(Expected<int32_t>)> SendResult,
-             int32_t X) {
-      EXPECT_EQ(X, 21) << "Server int(int) receieved unexpected result";
-      return SendResult(2 * X);
-    }
-  };
-
-  std::thread ServerThread([&]() {
-      Dummy D;
-      Server.addAsyncHandler<DummyRPCAPI::IntInt>(D, &Dummy::handler);
-
-      {
-        // Poke the server to handle the negotiate call.
-        auto Err = Server.handleOne();
-        EXPECT_FALSE(!!Err) << "Server failed to handle call to negotiate";
-      }
-
-      {
-        // Poke the server to handle the VoidBool call.
-        auto Err = Server.handleOne();
-        EXPECT_FALSE(!!Err) << "Server failed to handle call to void(bool)";
-      }
-  });
-
-  {
-    auto Err = Client.callAsync<DummyRPCAPI::IntInt>(
-        [](Expected<int> Result) {
-          EXPECT_TRUE(!!Result) << "Async int(int) response handler failed";
-          EXPECT_EQ(*Result, 42)
-            << "Async int(int) response handler received incorrect result";
-          return Error::success();
-        }, 21);
-    EXPECT_FALSE(!!Err) << "Client.callAsync failed for int(int)";
-  }
-
-  {
-    // Poke the client to process the result.
-    auto Err = Client.handleOne();
-    EXPECT_FALSE(!!Err) << "Client failed to handle response from void(bool)";
-  }
-
-  ServerThread.join();
-}
-
-TEST(DummyRPC, TestCallAsyncVoidString) {
-  auto Channels = createPairedQueueChannels();
-  DummyRPCEndpoint Client(*Channels.first);
-  DummyRPCEndpoint Server(*Channels.second);
-
-  std::thread ServerThread([&]() {
-      Server.addHandler<DummyRPCAPI::VoidString>(
-          [](const std::string &S) {
-            EXPECT_EQ(S, "hello")
-              << "Server void(std::string) received unexpected result";
-          });
-
-      // Poke the server to handle the negotiate call.
-      for (int I = 0; I < 4; ++I) {
-        auto Err = Server.handleOne();
-        EXPECT_FALSE(!!Err) << "Server failed to handle call";
-      }
-  });
-
-  {
-    // Make an call using a std::string.
-    auto Err = Client.callB<DummyRPCAPI::VoidString>(std::string("hello"));
-    EXPECT_FALSE(!!Err) << "Client.callAsync failed for void(std::string)";
-  }
-
-  {
-    // Make an call using a std::string.
-    auto Err = Client.callB<DummyRPCAPI::VoidString>(StringRef("hello"));
-    EXPECT_FALSE(!!Err) << "Client.callAsync failed for void(std::string)";
-  }
-
-  {
-    // Make an call using a std::string.
-    auto Err = Client.callB<DummyRPCAPI::VoidString>("hello");
-    EXPECT_FALSE(!!Err) << "Client.callAsync failed for void(string)";
-  }
-
-  ServerThread.join();
-}
-
-TEST(DummyRPC, TestSerialization) {
-  auto Channels = createPairedQueueChannels();
-  DummyRPCEndpoint Client(*Channels.first);
-  DummyRPCEndpoint Server(*Channels.second);
-
-  std::thread ServerThread([&]() {
-    Server.addHandler<DummyRPCAPI::AllTheTypes>([&](int8_t S8, uint8_t U8,
-                                                    int16_t S16, uint16_t U16,
-                                                    int32_t S32, uint32_t U32,
-                                                    int64_t S64, uint64_t U64,
-                                                    bool B, std::string S,
-                                                    std::vector<int> V,
-                                                    std::set<int> S2,
-                                                    std::map<int, bool> M) {
-      EXPECT_EQ(S8, -101) << "int8_t serialization broken";
-      EXPECT_EQ(U8, 250) << "uint8_t serialization broken";
-      EXPECT_EQ(S16, -10000) << "int16_t serialization broken";
-      EXPECT_EQ(U16, 10000) << "uint16_t serialization broken";
-      EXPECT_EQ(S32, -1000000000) << "int32_t serialization broken";
-      EXPECT_EQ(U32, 1000000000ULL) << "uint32_t serialization broken";
-      EXPECT_EQ(S64, -10000000000) << "int64_t serialization broken";
-      EXPECT_EQ(U64, 10000000000ULL) << "uint64_t serialization broken";
-      EXPECT_EQ(B, true) << "bool serialization broken";
-      EXPECT_EQ(S, "foo") << "std::string serialization broken";
-      EXPECT_EQ(V, std::vector<int>({42, 7}))
-          << "std::vector serialization broken";
-      EXPECT_EQ(S2, std::set<int>({7, 42})) << "std::set serialization broken";
-      EXPECT_EQ(M, (std::map<int, bool>({{7, false}, {42, true}})))
-          << "std::map serialization broken";
-      return Error::success();
-    });
-
-    {
-      // Poke the server to handle the negotiate call.
-      auto Err = Server.handleOne();
-      EXPECT_FALSE(!!Err) << "Server failed to handle call to negotiate";
-    }
-
-    {
-      // Poke the server to handle the AllTheTypes call.
-      auto Err = Server.handleOne();
-      EXPECT_FALSE(!!Err) << "Server failed to handle call to void(bool)";
-    }
-  });
-
-  {
-    // Make an async call.
-    std::vector<int> V({42, 7});
-    std::set<int> S({7, 42});
-    std::map<int, bool> M({{7, false}, {42, true}});
-    auto Err = Client.callAsync<DummyRPCAPI::AllTheTypes>(
-        [](Error Err) {
-          EXPECT_FALSE(!!Err) << "Async AllTheTypes response handler failed";
-          return Error::success();
-        },
-        static_cast<int8_t>(-101), static_cast<uint8_t>(250),
-        static_cast<int16_t>(-10000), static_cast<uint16_t>(10000),
-        static_cast<int32_t>(-1000000000), static_cast<uint32_t>(1000000000),
-        static_cast<int64_t>(-10000000000), static_cast<uint64_t>(10000000000),
-        true, std::string("foo"), V, S, M);
-    EXPECT_FALSE(!!Err) << "Client.callAsync failed for AllTheTypes";
-  }
-
-  {
-    // Poke the client to process the result of the AllTheTypes call.
-    auto Err = Client.handleOne();
-    EXPECT_FALSE(!!Err) << "Client failed to handle response from AllTheTypes";
-  }
-
-  ServerThread.join();
-}
-
-TEST(DummyRPC, TestCustomType) {
-  auto Channels = createPairedQueueChannels();
-  DummyRPCEndpoint Client(*Channels.first);
-  DummyRPCEndpoint Server(*Channels.second);
-
-  std::thread ServerThread([&]() {
-      Server.addHandler<DummyRPCAPI::CustomType>(
-          [](RPCFoo F) {});
-
-      {
-        // Poke the server to handle the negotiate call.
-        auto Err = Server.handleOne();
-        EXPECT_FALSE(!!Err) << "Server failed to handle call to negotiate";
-      }
-
-      {
-        // Poke the server to handle the CustomType call.
-        auto Err = Server.handleOne();
-        EXPECT_FALSE(!!Err) << "Server failed to handle call to RPCFoo(RPCFoo)";
-      }
-  });
-
-  {
-    // Make an async call.
-    auto Err = Client.callAsync<DummyRPCAPI::CustomType>(
-        [](Expected<RPCFoo> FOrErr) {
-          EXPECT_TRUE(!!FOrErr)
-            << "Async RPCFoo(RPCFoo) response handler failed";
-          return Error::success();
-        }, RPCFoo());
-    EXPECT_FALSE(!!Err) << "Client.callAsync failed for RPCFoo(RPCFoo)";
-  }
-
-  {
-    // Poke the client to process the result of the RPCFoo() call.
-    auto Err = Client.handleOne();
-    EXPECT_FALSE(!!Err)
-      << "Client failed to handle response from RPCFoo(RPCFoo)";
-  }
-
-  ServerThread.join();
-}
-
-TEST(DummyRPC, TestWithAltCustomType) {
-  auto Channels = createPairedQueueChannels();
-  DummyRPCEndpoint Client(*Channels.first);
-  DummyRPCEndpoint Server(*Channels.second);
-
-  std::thread ServerThread([&]() {
-      Server.addHandler<DummyRPCAPI::CustomType>(
-          [](RPCBar F) {});
-
-      {
-        // Poke the server to handle the negotiate call.
-        auto Err = Server.handleOne();
-        EXPECT_FALSE(!!Err) << "Server failed to handle call to negotiate";
-      }
-
-      {
-        // Poke the server to handle the CustomType call.
-        auto Err = Server.handleOne();
-        EXPECT_FALSE(!!Err) << "Server failed to handle call to RPCFoo(RPCFoo)";
-      }
-  });
-
-  {
-    // Make an async call.
-    auto Err = Client.callAsync<DummyRPCAPI::CustomType>(
-        [](Expected<RPCBar> FOrErr) {
-          EXPECT_TRUE(!!FOrErr)
-            << "Async RPCFoo(RPCFoo) response handler failed";
-          return Error::success();
-        }, RPCBar());
-    EXPECT_FALSE(!!Err) << "Client.callAsync failed for RPCFoo(RPCFoo)";
-  }
-
-  {
-    // Poke the client to process the result of the RPCFoo() call.
-    auto Err = Client.handleOne();
-    EXPECT_FALSE(!!Err)
-      << "Client failed to handle response from RPCFoo(RPCFoo)";
-  }
-
-  ServerThread.join();
-}
-
-TEST(DummyRPC, ReturnErrorSuccess) {
-  registerDummyErrorSerialization<QueueChannel>();
-
-  auto Channels = createPairedQueueChannels();
-  DummyRPCEndpoint Client(*Channels.first);
-  DummyRPCEndpoint Server(*Channels.second);
-
-  std::thread ServerThread([&]() {
-      Server.addHandler<DummyRPCAPI::ErrorFunc>(
-        []() {
-          return Error::success();
-        });
-
-      // Handle the negotiate plus one call.
-      for (unsigned I = 0; I != 2; ++I)
-        cantFail(Server.handleOne());
-    });
-
-  cantFail(Client.callAsync<DummyRPCAPI::ErrorFunc>(
-             [&](Error Err) {
-               EXPECT_FALSE(!!Err) << "Expected success value";
-               return Error::success();
-             }));
-
-  cantFail(Client.handleOne());
-
-  ServerThread.join();
-}
-
-TEST(DummyRPC, ReturnErrorFailure) {
-  registerDummyErrorSerialization<QueueChannel>();
-
-  auto Channels = createPairedQueueChannels();
-  DummyRPCEndpoint Client(*Channels.first);
-  DummyRPCEndpoint Server(*Channels.second);
-
-  std::thread ServerThread([&]() {
-      Server.addHandler<DummyRPCAPI::ErrorFunc>(
-        []() {
-          return make_error<DummyError>(42);
-        });
-
-      // Handle the negotiate plus one call.
-      for (unsigned I = 0; I != 2; ++I)
-        cantFail(Server.handleOne());
-    });
-
-  cantFail(Client.callAsync<DummyRPCAPI::ErrorFunc>(
-             [&](Error Err) {
-               EXPECT_TRUE(Err.isA<DummyError>())
-                 << "Incorrect error type";
-               return handleErrors(
-                        std::move(Err),
-                        [](const DummyError &DE) {
-                          EXPECT_EQ(DE.getValue(), 42ULL)
-                            << "Incorrect DummyError serialization";
-                        });
-             }));
-
-  cantFail(Client.handleOne());
-
-  ServerThread.join();
-}
-
-TEST(DummyRPC, ReturnExpectedSuccess) {
-  registerDummyErrorSerialization<QueueChannel>();
-
-  auto Channels = createPairedQueueChannels();
-  DummyRPCEndpoint Client(*Channels.first);
-  DummyRPCEndpoint Server(*Channels.second);
-
-  std::thread ServerThread([&]() {
-      Server.addHandler<DummyRPCAPI::ExpectedFunc>(
-        []() -> uint32_t {
-          return 42;
-        });
-
-      // Handle the negotiate plus one call.
-      for (unsigned I = 0; I != 2; ++I)
-        cantFail(Server.handleOne());
-    });
-
-  cantFail(Client.callAsync<DummyRPCAPI::ExpectedFunc>(
-               [&](Expected<uint32_t> ValOrErr) {
-                 EXPECT_TRUE(!!ValOrErr)
-                   << "Expected success value";
-                 EXPECT_EQ(*ValOrErr, 42ULL)
-                   << "Incorrect Expected<uint32_t> deserialization";
-                 return Error::success();
-               }));
-
-  cantFail(Client.handleOne());
-
-  ServerThread.join();
-}
-
-TEST(DummyRPC, ReturnExpectedFailure) {
-  registerDummyErrorSerialization<QueueChannel>();
-
-  auto Channels = createPairedQueueChannels();
-  DummyRPCEndpoint Client(*Channels.first);
-  DummyRPCEndpoint Server(*Channels.second);
-
-  std::thread ServerThread([&]() {
-      Server.addHandler<DummyRPCAPI::ExpectedFunc>(
-        []() -> Expected<uint32_t> {
-          return make_error<DummyError>(7);
-        });
-
-      // Handle the negotiate plus one call.
-      for (unsigned I = 0; I != 2; ++I)
-        cantFail(Server.handleOne());
-    });
-
-  cantFail(Client.callAsync<DummyRPCAPI::ExpectedFunc>(
-               [&](Expected<uint32_t> ValOrErr) {
-                 EXPECT_FALSE(!!ValOrErr)
-                   << "Expected failure value";
-                 auto Err = ValOrErr.takeError();
-                 EXPECT_TRUE(Err.isA<DummyError>())
-                   << "Incorrect error type";
-                 return handleErrors(
-                          std::move(Err),
-                          [](const DummyError &DE) {
-                            EXPECT_EQ(DE.getValue(), 7ULL)
-                              << "Incorrect DummyError serialization";
-                          });
-               }));
-
-  cantFail(Client.handleOne());
-
-  ServerThread.join();
-}
-
-TEST(DummyRPC, TestParallelCallGroup) {
-  auto Channels = createPairedQueueChannels();
-  DummyRPCEndpoint Client(*Channels.first);
-  DummyRPCEndpoint Server(*Channels.second);
-
-  std::thread ServerThread([&]() {
-      Server.addHandler<DummyRPCAPI::IntInt>(
-          [](int X) -> int {
-            return 2 * X;
-          });
-
-      // Handle the negotiate, plus three calls.
-      for (unsigned I = 0; I != 4; ++I) {
-        auto Err = Server.handleOne();
-        EXPECT_FALSE(!!Err) << "Server failed to handle call to int(int)";
-      }
-    });
-
-  {
-    int A, B, C;
-    ParallelCallGroup PCG;
-
-    {
-      auto Err = PCG.call(
-        rpcAsyncDispatch<DummyRPCAPI::IntInt>(Client),
-        [&A](Expected<int> Result) {
-          EXPECT_TRUE(!!Result) << "Async int(int) response handler failed";
-          A = *Result;
-          return Error::success();
-        }, 1);
-      EXPECT_FALSE(!!Err) << "First parallel call failed for int(int)";
-    }
-
-    {
-      auto Err = PCG.call(
-        rpcAsyncDispatch<DummyRPCAPI::IntInt>(Client),
-        [&B](Expected<int> Result) {
-          EXPECT_TRUE(!!Result) << "Async int(int) response handler failed";
-          B = *Result;
-          return Error::success();
-        }, 2);
-      EXPECT_FALSE(!!Err) << "Second parallel call failed for int(int)";
-    }
-
-    {
-      auto Err = PCG.call(
-        rpcAsyncDispatch<DummyRPCAPI::IntInt>(Client),
-        [&C](Expected<int> Result) {
-          EXPECT_TRUE(!!Result) << "Async int(int) response handler failed";
-          C = *Result;
-          return Error::success();
-        }, 3);
-      EXPECT_FALSE(!!Err) << "Third parallel call failed for int(int)";
-    }
-
-    // Handle the three int(int) results.
-    for (unsigned I = 0; I != 3; ++I) {
-      auto Err = Client.handleOne();
-      EXPECT_FALSE(!!Err) << "Client failed to handle response from void(bool)";
-    }
-
-    PCG.wait();
-
-    EXPECT_EQ(A, 2) << "First parallel call returned bogus result";
-    EXPECT_EQ(B, 4) << "Second parallel call returned bogus result";
-    EXPECT_EQ(C, 6) << "Third parallel call returned bogus result";
-  }
-
-  ServerThread.join();
-}
-
-TEST(DummyRPC, TestAPICalls) {
-
-  using DummyCalls1 = APICalls<DummyRPCAPI::VoidBool, DummyRPCAPI::IntInt>;
-  using DummyCalls2 = APICalls<DummyRPCAPI::AllTheTypes>;
-  using DummyCalls3 = APICalls<DummyCalls1, DummyRPCAPI::CustomType>;
-  using DummyCallsAll = APICalls<DummyCalls1, DummyCalls2, DummyRPCAPI::CustomType>;
-
-  static_assert(DummyCalls1::Contains<DummyRPCAPI::VoidBool>::value,
-                "Contains<Func> template should return true here");
-  static_assert(!DummyCalls1::Contains<DummyRPCAPI::CustomType>::value,
-                "Contains<Func> template should return false here");
-
-  auto Channels = createPairedQueueChannels();
-  DummyRPCEndpoint Client(*Channels.first);
-  DummyRPCEndpoint Server(*Channels.second);
-
-  std::thread ServerThread(
-    [&]() {
-      Server.addHandler<DummyRPCAPI::VoidBool>([](bool b) { });
-      Server.addHandler<DummyRPCAPI::IntInt>([](int x) { return x; });
-      Server.addHandler<DummyRPCAPI::CustomType>([](RPCFoo F) {});
-
-      for (unsigned I = 0; I < 4; ++I) {
-        auto Err = Server.handleOne();
-        (void)!!Err;
-      }
-    });
-
-  {
-    auto Err = DummyCalls1::negotiate(Client);
-    EXPECT_FALSE(!!Err) << "DummyCalls1::negotiate failed";
-  }
-
-  {
-    auto Err = DummyCalls3::negotiate(Client);
-    EXPECT_FALSE(!!Err) << "DummyCalls3::negotiate failed";
-  }
-
-  {
-    auto Err = DummyCallsAll::negotiate(Client);
-    EXPECT_TRUE(Err.isA<CouldNotNegotiate>())
-      << "Expected CouldNotNegotiate error for attempted negotiate of "
-         "unsupported function";
-    consumeError(std::move(Err));
-  }
-
-  ServerThread.join();
-}
-
-TEST(DummyRPC, TestRemoveHandler) {
-  auto Channels = createPairedQueueChannels();
-  DummyRPCEndpoint Server(*Channels.second);
-
-  Server.addHandler<DummyRPCAPI::VoidBool>(
-    [](bool B) {
-      llvm_unreachable("Server void(bool) received unexpected result");
-    });
-
-  Server.removeHandler<DummyRPCAPI::VoidBool>();
-}
-
-TEST(DummyRPC, TestClearHandlers) {
-  auto Channels = createPairedQueueChannels();
-  DummyRPCEndpoint Server(*Channels.second);
-
-  Server.addHandler<DummyRPCAPI::VoidBool>(
-    [](bool B) {
-      llvm_unreachable("Server void(bool) received unexpected result");
-    });
-
-  Server.clearHandlers();
-}
diff --git a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/RTDyldObjectLinkingLayerTest.cpp b/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/RTDyldObjectLinkingLayerTest.cpp
deleted file mode 100644
index f3a4cd57e7d..00000000000
--- a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/RTDyldObjectLinkingLayerTest.cpp
+++ /dev/null
@@ -1,244 +0,0 @@
-//===--- RTDyldObjectLinkingLayerTest.cpp - RTDyld linking layer tests ---===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "OrcTestCommon.h"
-#include "llvm/ExecutionEngine/ExecutionEngine.h"
-#include "llvm/ExecutionEngine/Orc/CompileUtils.h"
-#include "llvm/ExecutionEngine/Orc/IRCompileLayer.h"
-#include "llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h"
-#include "llvm/ExecutionEngine/SectionMemoryManager.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/LLVMContext.h"
-#include "gtest/gtest.h"
-#include <string>
-
-using namespace llvm;
-using namespace llvm::orc;
-
-namespace {
-
-// Adds an object with a debug section to RuntimeDyld and then returns whether
-// the debug section was passed to the memory manager.
-static bool testSetProcessAllSections(std::unique_ptr<MemoryBuffer> Obj,
-                                      bool ProcessAllSections) {
-  class MemoryManagerWrapper : public SectionMemoryManager {
-  public:
-    MemoryManagerWrapper(bool &DebugSeen) : DebugSeen(DebugSeen) {}
-    uint8_t *allocateDataSection(uintptr_t Size, unsigned Alignment,
-                                 unsigned SectionID, StringRef SectionName,
-                                 bool IsReadOnly) override {
-      if (SectionName == ".debug_str")
-        DebugSeen = true;
-      return SectionMemoryManager::allocateDataSection(
-          Size, Alignment, SectionID, SectionName, IsReadOnly);
-    }
-
-  private:
-    bool &DebugSeen;
-  };
-
-  bool DebugSectionSeen = false;
-
-  ExecutionSession ES(std::make_unique<UnsupportedExecutorProcessControl>());
-  auto &JD = ES.createBareJITDylib("main");
-  auto Foo = ES.intern("foo");
-
-  RTDyldObjectLinkingLayer ObjLayer(ES, [&DebugSectionSeen]() {
-    return std::make_unique<MemoryManagerWrapper>(DebugSectionSeen);
-  });
-
-  auto OnResolveDoNothing = [](Expected<SymbolMap> R) {
-    cantFail(std::move(R));
-  };
-
-  ObjLayer.setProcessAllSections(ProcessAllSections);
-  cantFail(ObjLayer.add(JD, std::move(Obj)));
-  ES.lookup(LookupKind::Static, makeJITDylibSearchOrder(&JD),
-            SymbolLookupSet(Foo), SymbolState::Resolved, OnResolveDoNothing,
-            NoDependenciesToRegister);
-
-  if (auto Err = ES.endSession())
-    ES.reportError(std::move(Err));
-
-  return DebugSectionSeen;
-}
-
-TEST(RTDyldObjectLinkingLayerTest, TestSetProcessAllSections) {
-  LLVMContext Context;
-  auto M = std::make_unique<Module>("", Context);
-  M->setTargetTriple("x86_64-unknown-linux-gnu");
-  Constant *StrConstant = ConstantDataArray::getString(Context, "forty-two");
-  auto *GV =
-      new GlobalVariable(*M, StrConstant->getType(), true,
-                         GlobalValue::ExternalLinkage, StrConstant, "foo");
-  GV->setUnnamedAddr(GlobalValue::UnnamedAddr::Global);
-  GV->setAlignment(Align(1));
-
-  GV->setSection(".debug_str");
-
-  // Initialize the native target in case this is the first unit test
-  // to try to build a TM.
-  OrcNativeTarget::initialize();
-  std::unique_ptr<TargetMachine> TM(EngineBuilder().selectTarget(
-      Triple(M->getTargetTriple()), "", "", SmallVector<std::string, 1>()));
-  if (!TM)
-    return;
-
-  auto Obj = cantFail(SimpleCompiler(*TM)(*M));
-
-  EXPECT_FALSE(testSetProcessAllSections(
-      MemoryBuffer::getMemBufferCopy(Obj->getBuffer()), false))
-      << "Debug section seen despite ProcessAllSections being false";
-  EXPECT_TRUE(testSetProcessAllSections(std::move(Obj), true))
-      << "Expected to see debug section when ProcessAllSections is true";
-}
-
-TEST(RTDyldObjectLinkingLayerTest, TestOverrideObjectFlags) {
-
-  OrcNativeTarget::initialize();
-
-  std::unique_ptr<TargetMachine> TM(
-      EngineBuilder().selectTarget(Triple("x86_64-unknown-linux-gnu"), "", "",
-                                   SmallVector<std::string, 1>()));
-
-  if (!TM)
-    return;
-
-  // Our compiler is going to modify symbol visibility settings without telling
-  // ORC. This will test our ability to override the flags later.
-  class FunkySimpleCompiler : public SimpleCompiler {
-  public:
-    FunkySimpleCompiler(TargetMachine &TM) : SimpleCompiler(TM) {}
-
-    Expected<CompileResult> operator()(Module &M) override {
-      auto *Foo = M.getFunction("foo");
-      assert(Foo && "Expected function Foo not found");
-      Foo->setVisibility(GlobalValue::HiddenVisibility);
-      return SimpleCompiler::operator()(M);
-    }
-  };
-
-  // Create a module with two void() functions: foo and bar.
-  ThreadSafeContext TSCtx(std::make_unique<LLVMContext>());
-  ThreadSafeModule M;
-  {
-    ModuleBuilder MB(*TSCtx.getContext(), TM->getTargetTriple().str(), "dummy");
-    MB.getModule()->setDataLayout(TM->createDataLayout());
-
-    Function *FooImpl = MB.createFunctionDecl(
-        FunctionType::get(Type::getVoidTy(*TSCtx.getContext()), {}, false),
-        "foo");
-    BasicBlock *FooEntry =
-        BasicBlock::Create(*TSCtx.getContext(), "entry", FooImpl);
-    IRBuilder<> B1(FooEntry);
-    B1.CreateRetVoid();
-
-    Function *BarImpl = MB.createFunctionDecl(
-        FunctionType::get(Type::getVoidTy(*TSCtx.getContext()), {}, false),
-        "bar");
-    BasicBlock *BarEntry =
-        BasicBlock::Create(*TSCtx.getContext(), "entry", BarImpl);
-    IRBuilder<> B2(BarEntry);
-    B2.CreateRetVoid();
-
-    M = ThreadSafeModule(MB.takeModule(), std::move(TSCtx));
-  }
-
-  // Create a simple stack and set the override flags option.
-  ExecutionSession ES{std::make_unique<UnsupportedExecutorProcessControl>()};
-  auto &JD = ES.createBareJITDylib("main");
-  auto Foo = ES.intern("foo");
-  RTDyldObjectLinkingLayer ObjLayer(
-      ES, []() { return std::make_unique<SectionMemoryManager>(); });
-  IRCompileLayer CompileLayer(ES, ObjLayer,
-                              std::make_unique<FunkySimpleCompiler>(*TM));
-
-  ObjLayer.setOverrideObjectFlagsWithResponsibilityFlags(true);
-
-  cantFail(CompileLayer.add(JD, std::move(M)));
-  ES.lookup(
-      LookupKind::Static, makeJITDylibSearchOrder(&JD), SymbolLookupSet(Foo),
-      SymbolState::Resolved,
-      [](Expected<SymbolMap> R) { cantFail(std::move(R)); },
-      NoDependenciesToRegister);
-
-  if (auto Err = ES.endSession())
-    ES.reportError(std::move(Err));
-}
-
-TEST(RTDyldObjectLinkingLayerTest, TestAutoClaimResponsibilityForSymbols) {
-
-  OrcNativeTarget::initialize();
-
-  std::unique_ptr<TargetMachine> TM(
-      EngineBuilder().selectTarget(Triple("x86_64-unknown-linux-gnu"), "", "",
-                                   SmallVector<std::string, 1>()));
-
-  if (!TM)
-    return;
-
-  // Our compiler is going to add a new symbol without telling ORC.
-  // This will test our ability to auto-claim responsibility later.
-  class FunkySimpleCompiler : public SimpleCompiler {
-  public:
-    FunkySimpleCompiler(TargetMachine &TM) : SimpleCompiler(TM) {}
-
-    Expected<CompileResult> operator()(Module &M) override {
-      Function *BarImpl = Function::Create(
-          FunctionType::get(Type::getVoidTy(M.getContext()), {}, false),
-          GlobalValue::ExternalLinkage, "bar", &M);
-      BasicBlock *BarEntry =
-          BasicBlock::Create(M.getContext(), "entry", BarImpl);
-      IRBuilder<> B(BarEntry);
-      B.CreateRetVoid();
-
-      return SimpleCompiler::operator()(M);
-    }
-  };
-
-  // Create a module with two void() functions: foo and bar.
-  ThreadSafeContext TSCtx(std::make_unique<LLVMContext>());
-  ThreadSafeModule M;
-  {
-    ModuleBuilder MB(*TSCtx.getContext(), TM->getTargetTriple().str(), "dummy");
-    MB.getModule()->setDataLayout(TM->createDataLayout());
-
-    Function *FooImpl = MB.createFunctionDecl(
-        FunctionType::get(Type::getVoidTy(*TSCtx.getContext()), {}, false),
-        "foo");
-    BasicBlock *FooEntry =
-        BasicBlock::Create(*TSCtx.getContext(), "entry", FooImpl);
-    IRBuilder<> B(FooEntry);
-    B.CreateRetVoid();
-
-    M = ThreadSafeModule(MB.takeModule(), std::move(TSCtx));
-  }
-
-  // Create a simple stack and set the override flags option.
-  ExecutionSession ES{std::make_unique<UnsupportedExecutorProcessControl>()};
-  auto &JD = ES.createBareJITDylib("main");
-  auto Foo = ES.intern("foo");
-  RTDyldObjectLinkingLayer ObjLayer(
-      ES, []() { return std::make_unique<SectionMemoryManager>(); });
-  IRCompileLayer CompileLayer(ES, ObjLayer,
-                              std::make_unique<FunkySimpleCompiler>(*TM));
-
-  ObjLayer.setAutoClaimResponsibilityForObjectSymbols(true);
-
-  cantFail(CompileLayer.add(JD, std::move(M)));
-  ES.lookup(
-      LookupKind::Static, makeJITDylibSearchOrder(&JD), SymbolLookupSet(Foo),
-      SymbolState::Resolved,
-      [](Expected<SymbolMap> R) { cantFail(std::move(R)); },
-      NoDependenciesToRegister);
-
-  if (auto Err = ES.endSession())
-    ES.reportError(std::move(Err));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/ResourceTrackerTest.cpp b/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/ResourceTrackerTest.cpp
deleted file mode 100644
index 56362cdf03b..00000000000
--- a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/ResourceTrackerTest.cpp
+++ /dev/null
@@ -1,447 +0,0 @@
-//===------ ResourceTrackerTest.cpp - Unit tests ResourceTracker API ------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "OrcTestCommon.h"
-#include "llvm/ADT/FunctionExtras.h"
-#include "llvm/Config/llvm-config.h"
-#include "llvm/ExecutionEngine/Orc/Core.h"
-#include "llvm/ExecutionEngine/Orc/Shared/OrcError.h"
-#include "llvm/Testing/Support/Error.h"
-
-using namespace llvm;
-using namespace llvm::orc;
-
-class ResourceTrackerStandardTest : public CoreAPIsBasedStandardTest {};
-
-namespace {
-
-template <typename ResourceT = unsigned>
-class SimpleResourceManager : public ResourceManager {
-public:
-  using HandleRemoveFunction = unique_function<Error(ResourceKey)>;
-
-  using HandleTransferFunction =
-      unique_function<void(ResourceKey, ResourceKey)>;
-
-  using RecordedResourcesMap = DenseMap<ResourceKey, ResourceT>;
-
-  SimpleResourceManager(ExecutionSession &ES) : ES(ES) {
-    HandleRemove = [&](ResourceKey K) -> Error {
-      ES.runSessionLocked([&] { removeResource(K); });
-      return Error::success();
-    };
-
-    HandleTransfer = [this](ResourceKey DstKey, ResourceKey SrcKey) {
-      transferResources(DstKey, SrcKey);
-    };
-
-    ES.registerResourceManager(*this);
-  }
-
-  SimpleResourceManager(const SimpleResourceManager &) = delete;
-  SimpleResourceManager &operator=(const SimpleResourceManager &) = delete;
-  SimpleResourceManager(SimpleResourceManager &&) = delete;
-  SimpleResourceManager &operator=(SimpleResourceManager &&) = delete;
-
-  ~SimpleResourceManager() { ES.deregisterResourceManager(*this); }
-
-  /// Set the HandleRemove function object.
-  void setHandleRemove(HandleRemoveFunction HandleRemove) {
-    this->HandleRemove = std::move(HandleRemove);
-  }
-
-  /// Set the HandleTransfer function object.
-  void setHandleTransfer(HandleTransferFunction HandleTransfer) {
-    this->HandleTransfer = std::move(HandleTransfer);
-  }
-
-  /// Create an association between the given key and resource.
-  template <typename MergeOp = std::plus<ResourceT>>
-  void recordResource(ResourceKey K, ResourceT Val = ResourceT(),
-                      MergeOp Merge = MergeOp()) {
-    auto Tmp = std::move(Resources[K]);
-    Resources[K] = Merge(std::move(Tmp), std::move(Val));
-  }
-
-  /// Remove the resource associated with K from the map if present.
-  void removeResource(ResourceKey K) { Resources.erase(K); }
-
-  /// Transfer resources from DstKey to SrcKey.
-  template <typename MergeOp = std::plus<ResourceT>>
-  void transferResources(ResourceKey DstKey, ResourceKey SrcKey,
-                         MergeOp Merge = MergeOp()) {
-    auto &DstResourceRef = Resources[DstKey];
-    ResourceT DstResources;
-    std::swap(DstResourceRef, DstResources);
-
-    auto SI = Resources.find(SrcKey);
-    assert(SI != Resources.end() && "No resource associated with SrcKey");
-
-    DstResourceRef = Merge(std::move(DstResources), std::move(SI->second));
-    Resources.erase(SI);
-  }
-
-  /// Return a reference to the Resources map.
-  RecordedResourcesMap &getRecordedResources() { return Resources; }
-  const RecordedResourcesMap &getRecordedResources() const { return Resources; }
-
-  Error handleRemoveResources(ResourceKey K) override {
-    return HandleRemove(K);
-  }
-
-  void handleTransferResources(ResourceKey DstKey,
-                               ResourceKey SrcKey) override {
-    HandleTransfer(DstKey, SrcKey);
-  }
-
-  static void transferNotAllowed(ResourceKey DstKey, ResourceKey SrcKey) {
-    llvm_unreachable("Resource transfer not allowed");
-  }
-
-private:
-  ExecutionSession &ES;
-  HandleRemoveFunction HandleRemove;
-  HandleTransferFunction HandleTransfer;
-  RecordedResourcesMap Resources;
-};
-
-TEST_F(ResourceTrackerStandardTest,
-       BasicDefineAndRemoveAllBeforeMaterializing) {
-
-  bool ResourceManagerGotRemove = false;
-  SimpleResourceManager<> SRM(ES);
-  SRM.setHandleRemove([&](ResourceKey K) -> Error {
-    ResourceManagerGotRemove = true;
-    EXPECT_EQ(SRM.getRecordedResources().size(), 0U)
-        << "Unexpected resources recorded";
-    SRM.removeResource(K);
-    return Error::success();
-  });
-
-  bool MaterializationUnitDestroyed = false;
-  auto MU = std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Foo, FooSym.getFlags()}}),
-      [&](std::unique_ptr<MaterializationResponsibility> R) {
-        llvm_unreachable("Never called");
-      },
-      nullptr, SimpleMaterializationUnit::DiscardFunction(),
-      [&]() { MaterializationUnitDestroyed = true; });
-
-  auto RT = JD.createResourceTracker();
-  cantFail(JD.define(std::move(MU), RT));
-  cantFail(RT->remove());
-  auto SymFlags = cantFail(ES.lookupFlags(
-      LookupKind::Static,
-      {{&JD, JITDylibLookupFlags::MatchExportedSymbolsOnly}},
-      SymbolLookupSet(Foo, SymbolLookupFlags::WeaklyReferencedSymbol)));
-
-  EXPECT_EQ(SymFlags.size(), 0U)
-      << "Symbols should have been removed from the symbol table";
-  EXPECT_TRUE(ResourceManagerGotRemove)
-      << "ResourceManager did not receive handleRemoveResources";
-  EXPECT_TRUE(MaterializationUnitDestroyed)
-      << "MaterializationUnit not destroyed in response to removal";
-}
-
-TEST_F(ResourceTrackerStandardTest, BasicDefineAndRemoveAllAfterMaterializing) {
-
-  bool ResourceManagerGotRemove = false;
-  SimpleResourceManager<> SRM(ES);
-  SRM.setHandleRemove([&](ResourceKey K) -> Error {
-    ResourceManagerGotRemove = true;
-    EXPECT_EQ(SRM.getRecordedResources().size(), 1U)
-        << "Unexpected number of resources recorded";
-    EXPECT_EQ(SRM.getRecordedResources().count(K), 1U)
-        << "Unexpected recorded resource";
-    SRM.removeResource(K);
-    return Error::success();
-  });
-
-  auto MU = std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Foo, FooSym.getFlags()}}),
-      [&](std::unique_ptr<MaterializationResponsibility> R) {
-        cantFail(R->withResourceKeyDo(
-            [&](ResourceKey K) { SRM.recordResource(K); }));
-        cantFail(R->notifyResolved({{Foo, FooSym}}));
-        cantFail(R->notifyEmitted());
-      });
-
-  auto RT = JD.createResourceTracker();
-  cantFail(JD.define(std::move(MU), RT));
-  cantFail(ES.lookup({&JD}, Foo));
-  cantFail(RT->remove());
-  auto SymFlags = cantFail(ES.lookupFlags(
-      LookupKind::Static,
-      {{&JD, JITDylibLookupFlags::MatchExportedSymbolsOnly}},
-      SymbolLookupSet(Foo, SymbolLookupFlags::WeaklyReferencedSymbol)));
-
-  EXPECT_EQ(SymFlags.size(), 0U)
-      << "Symbols should have been removed from the symbol table";
-  EXPECT_TRUE(ResourceManagerGotRemove)
-      << "ResourceManager did not receive handleRemoveResources";
-}
-
-TEST_F(ResourceTrackerStandardTest, BasicDefineAndRemoveAllWhileMaterializing) {
-
-  bool ResourceManagerGotRemove = false;
-  SimpleResourceManager<> SRM(ES);
-  SRM.setHandleRemove([&](ResourceKey K) -> Error {
-    ResourceManagerGotRemove = true;
-    EXPECT_EQ(SRM.getRecordedResources().size(), 0U)
-        << "Unexpected resources recorded";
-    SRM.removeResource(K);
-    return Error::success();
-  });
-
-  std::unique_ptr<MaterializationResponsibility> MR;
-  auto MU = std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Foo, FooSym.getFlags()}}),
-      [&](std::unique_ptr<MaterializationResponsibility> R) {
-        MR = std::move(R);
-      });
-
-  auto RT = JD.createResourceTracker();
-  cantFail(JD.define(std::move(MU), RT));
-
-  ES.lookup(
-      LookupKind::Static, makeJITDylibSearchOrder(&JD), SymbolLookupSet(Foo),
-      SymbolState::Ready,
-      [](Expected<SymbolMap> Result) {
-        EXPECT_THAT_EXPECTED(Result, Failed<FailedToMaterialize>())
-            << "Lookup failed unexpectedly";
-      },
-      NoDependenciesToRegister);
-
-  cantFail(RT->remove());
-  auto SymFlags = cantFail(ES.lookupFlags(
-      LookupKind::Static,
-      {{&JD, JITDylibLookupFlags::MatchExportedSymbolsOnly}},
-      SymbolLookupSet(Foo, SymbolLookupFlags::WeaklyReferencedSymbol)));
-
-  EXPECT_EQ(SymFlags.size(), 0U)
-      << "Symbols should have been removed from the symbol table";
-  EXPECT_TRUE(ResourceManagerGotRemove)
-      << "ResourceManager did not receive handleRemoveResources";
-
-  EXPECT_THAT_ERROR(MR->withResourceKeyDo([](ResourceKey K) {
-    ADD_FAILURE() << "Should not reach withResourceKeyDo body for removed key";
-  }),
-                    Failed<ResourceTrackerDefunct>())
-      << "withResourceKeyDo on MR with removed tracker should have failed";
-  EXPECT_THAT_ERROR(MR->notifyResolved({{Foo, FooSym}}),
-                    Failed<ResourceTrackerDefunct>())
-      << "notifyResolved on MR with removed tracker should have failed";
-
-  MR->failMaterialization();
-}
-
-TEST_F(ResourceTrackerStandardTest, JITDylibClear) {
-  SimpleResourceManager<> SRM(ES);
-
-  // Add materializer for Foo.
-  cantFail(JD.define(std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Foo, FooSym.getFlags()}}),
-      [&](std::unique_ptr<MaterializationResponsibility> R) {
-        cantFail(R->withResourceKeyDo(
-            [&](ResourceKey K) { ++SRM.getRecordedResources()[K]; }));
-        cantFail(R->notifyResolved({{Foo, FooSym}}));
-        cantFail(R->notifyEmitted());
-      })));
-
-  // Add materializer for Bar.
-  cantFail(JD.define(std::make_unique<SimpleMaterializationUnit>(
-      SymbolFlagsMap({{Bar, BarSym.getFlags()}}),
-      [&](std::unique_ptr<MaterializationResponsibility> R) {
-        cantFail(R->withResourceKeyDo(
-            [&](ResourceKey K) { ++SRM.getRecordedResources()[K]; }));
-        cantFail(R->notifyResolved({{Bar, BarSym}}));
-        cantFail(R->notifyEmitted());
-      })));
-
-  EXPECT_TRUE(SRM.getRecordedResources().empty())
-      << "Expected no resources recorded yet.";
-
-  cantFail(
-      ES.lookup(makeJITDylibSearchOrder(&JD), SymbolLookupSet({Foo, Bar})));
-
-  auto JDResourceKey = JD.getDefaultResourceTracker()->getKeyUnsafe();
-  EXPECT_EQ(SRM.getRecordedResources().size(), 1U)
-      << "Expected exactly one entry (for JD's ResourceKey)";
-  EXPECT_EQ(SRM.getRecordedResources().count(JDResourceKey), 1U)
-      << "Expected an entry for JD's ResourceKey";
-  EXPECT_EQ(SRM.getRecordedResources()[JDResourceKey], 2U)
-      << "Expected value of 2 for JD's ResourceKey "
-         "(+1 for each of Foo and Bar)";
-
-  cantFail(JD.clear());
-
-  EXPECT_TRUE(SRM.getRecordedResources().empty())
-      << "Expected no resources recorded after clear";
-}
-
-TEST_F(ResourceTrackerStandardTest,
-       BasicDefineAndExplicitTransferBeforeMaterializing) {
-
-  bool ResourceManagerGotTransfer = false;
-  SimpleResourceManager<> SRM(ES);
-  SRM.setHandleTransfer([&](ResourceKey DstKey, ResourceKey SrcKey) {
-    ResourceManagerGotTransfer = true;
-    auto &RR = SRM.getRecordedResources();
-    EXPECT_EQ(RR.size(), 0U) << "Expected no resources recorded yet";
-  });
-
-  auto MakeMU = [&](SymbolStringPtr Name, JITEvaluatedSymbol Sym) {
-    return std::make_unique<SimpleMaterializationUnit>(
-        SymbolFlagsMap({{Name, Sym.getFlags()}}),
-        [=, &SRM](std::unique_ptr<MaterializationResponsibility> R) {
-          cantFail(R->withResourceKeyDo(
-              [&](ResourceKey K) { SRM.recordResource(K); }));
-          cantFail(R->notifyResolved({{Name, Sym}}));
-          cantFail(R->notifyEmitted());
-        });
-  };
-
-  auto FooRT = JD.createResourceTracker();
-  cantFail(JD.define(MakeMU(Foo, FooSym), FooRT));
-
-  auto BarRT = JD.createResourceTracker();
-  cantFail(JD.define(MakeMU(Bar, BarSym), BarRT));
-
-  BarRT->transferTo(*FooRT);
-
-  EXPECT_TRUE(ResourceManagerGotTransfer)
-      << "ResourceManager did not receive transfer";
-  EXPECT_TRUE(BarRT->isDefunct()) << "BarRT should now be defunct";
-
-  cantFail(
-      ES.lookup(makeJITDylibSearchOrder({&JD}), SymbolLookupSet({Foo, Bar})));
-
-  EXPECT_EQ(SRM.getRecordedResources().size(), 1U)
-      << "Expected exactly one entry (for FooRT's Key)";
-  EXPECT_EQ(SRM.getRecordedResources().count(FooRT->getKeyUnsafe()), 1U)
-      << "Expected an entry for FooRT's ResourceKey";
-  EXPECT_EQ(SRM.getRecordedResources().count(BarRT->getKeyUnsafe()), 0U)
-      << "Expected no entry for BarRT's ResourceKey";
-
-  // We need to explicitly destroy FooRT or its resources will be implicitly
-  // transferred to the default tracker triggering a second call to our
-  // transfer function above (which expects only one call).
-  cantFail(FooRT->remove());
-}
-
-TEST_F(ResourceTrackerStandardTest,
-       BasicDefineAndExplicitTransferAfterMaterializing) {
-
-  bool ResourceManagerGotTransfer = false;
-  SimpleResourceManager<> SRM(ES);
-  SRM.setHandleTransfer([&](ResourceKey DstKey, ResourceKey SrcKey) {
-    ResourceManagerGotTransfer = true;
-    SRM.transferResources(DstKey, SrcKey);
-  });
-
-  auto MakeMU = [&](SymbolStringPtr Name, JITEvaluatedSymbol Sym) {
-    return std::make_unique<SimpleMaterializationUnit>(
-        SymbolFlagsMap({{Name, Sym.getFlags()}}),
-        [=, &SRM](std::unique_ptr<MaterializationResponsibility> R) {
-          cantFail(R->withResourceKeyDo(
-              [&](ResourceKey K) { SRM.recordResource(K, 1); }));
-          cantFail(R->notifyResolved({{Name, Sym}}));
-          cantFail(R->notifyEmitted());
-        });
-  };
-
-  auto FooRT = JD.createResourceTracker();
-  cantFail(JD.define(MakeMU(Foo, FooSym), FooRT));
-
-  auto BarRT = JD.createResourceTracker();
-  cantFail(JD.define(MakeMU(Bar, BarSym), BarRT));
-
-  EXPECT_EQ(SRM.getRecordedResources().size(), 0U)
-      << "Expected no recorded resources yet";
-
-  cantFail(
-      ES.lookup(makeJITDylibSearchOrder({&JD}), SymbolLookupSet({Foo, Bar})));
-
-  EXPECT_EQ(SRM.getRecordedResources().size(), 2U)
-      << "Expected recorded resources for both Foo and Bar";
-
-  BarRT->transferTo(*FooRT);
-
-  EXPECT_TRUE(ResourceManagerGotTransfer)
-      << "ResourceManager did not receive transfer";
-  EXPECT_TRUE(BarRT->isDefunct()) << "BarRT should now be defunct";
-
-  EXPECT_EQ(SRM.getRecordedResources().size(), 1U)
-      << "Expected recorded resources for Foo only";
-  EXPECT_EQ(SRM.getRecordedResources().count(FooRT->getKeyUnsafe()), 1U)
-      << "Expected recorded resources for Foo";
-  EXPECT_EQ(SRM.getRecordedResources()[FooRT->getKeyUnsafe()], 2U)
-      << "Expected resources value for for Foo to be '2'";
-}
-
-TEST_F(ResourceTrackerStandardTest,
-       BasicDefineAndExplicitTransferWhileMaterializing) {
-
-  bool ResourceManagerGotTransfer = false;
-  SimpleResourceManager<> SRM(ES);
-  SRM.setHandleTransfer([&](ResourceKey DstKey, ResourceKey SrcKey) {
-    ResourceManagerGotTransfer = true;
-    SRM.transferResources(DstKey, SrcKey);
-  });
-
-  auto FooRT = JD.createResourceTracker();
-  std::unique_ptr<MaterializationResponsibility> FooMR;
-  cantFail(JD.define(std::make_unique<SimpleMaterializationUnit>(
-                         SymbolFlagsMap({{Foo, FooSym.getFlags()}}),
-                         [&](std::unique_ptr<MaterializationResponsibility> R) {
-                           FooMR = std::move(R);
-                         }),
-                     FooRT));
-
-  auto BarRT = JD.createResourceTracker();
-
-  ES.lookup(
-      LookupKind::Static, makeJITDylibSearchOrder(&JD), SymbolLookupSet(Foo),
-      SymbolState::Ready,
-      [](Expected<SymbolMap> Result) { cantFail(Result.takeError()); },
-      NoDependenciesToRegister);
-
-  cantFail(FooMR->withResourceKeyDo([&](ResourceKey K) {
-    EXPECT_EQ(FooRT->getKeyUnsafe(), K)
-        << "Expected FooRT's ResourceKey for Foo here";
-    SRM.recordResource(K, 1);
-  }));
-
-  EXPECT_EQ(SRM.getRecordedResources().size(), 1U)
-      << "Expected one recorded resource here";
-  EXPECT_EQ(SRM.getRecordedResources()[FooRT->getKeyUnsafe()], 1U)
-      << "Expected Resource value for FooRT to be '1' here";
-
-  FooRT->transferTo(*BarRT);
-
-  EXPECT_TRUE(ResourceManagerGotTransfer)
-      << "Expected resource manager to receive handleTransferResources call";
-
-  cantFail(FooMR->withResourceKeyDo([&](ResourceKey K) {
-    EXPECT_EQ(BarRT->getKeyUnsafe(), K)
-        << "Expected BarRT's ResourceKey for Foo here";
-    SRM.recordResource(K, 1);
-  }));
-
-  EXPECT_EQ(SRM.getRecordedResources().size(), 1U)
-      << "Expected one recorded resource here";
-  EXPECT_EQ(SRM.getRecordedResources().count(BarRT->getKeyUnsafe()), 1U)
-      << "Expected RecordedResources to contain an entry for BarRT";
-  EXPECT_EQ(SRM.getRecordedResources()[BarRT->getKeyUnsafe()], 2U)
-      << "Expected Resource value for BarRT to be '2' here";
-
-  cantFail(FooMR->notifyResolved({{Foo, FooSym}}));
-  cantFail(FooMR->notifyEmitted());
-}
-
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/SimplePackedSerializationTest.cpp b/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/SimplePackedSerializationTest.cpp
deleted file mode 100644
index f4a6b458889..00000000000
--- a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/SimplePackedSerializationTest.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-//===-------- SimplePackedSerializationTest.cpp - Test SPS scheme ---------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ExecutionEngine/Orc/Shared/SimplePackedSerialization.h"
-#include "llvm/ExecutionEngine/Orc/LLVMSPSSerializers.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::orc::shared;
-
-TEST(SimplePackedSerializationTest, SPSOutputBuffer) {
-  constexpr unsigned NumBytes = 8;
-  char Buffer[NumBytes];
-  char Zero = 0;
-  SPSOutputBuffer OB(Buffer, NumBytes);
-
-  // Expect that we can write NumBytes of content.
-  for (unsigned I = 0; I != NumBytes; ++I) {
-    char C = I;
-    EXPECT_TRUE(OB.write(&C, 1));
-  }
-
-  // Expect an error when we attempt to write an extra byte.
-  EXPECT_FALSE(OB.write(&Zero, 1));
-
-  // Check that the buffer contains the expected content.
-  for (unsigned I = 0; I != NumBytes; ++I)
-    EXPECT_EQ(Buffer[I], (char)I);
-}
-
-TEST(SimplePackedSerializationTest, SPSInputBuffer) {
-  char Buffer[] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07};
-  SPSInputBuffer IB(Buffer, sizeof(Buffer));
-
-  char C;
-  for (unsigned I = 0; I != sizeof(Buffer); ++I) {
-    EXPECT_TRUE(IB.read(&C, 1));
-    EXPECT_EQ(C, (char)I);
-  }
-
-  EXPECT_FALSE(IB.read(&C, 1));
-}
-
-template <typename SPSTagT, typename T>
-static void blobSerializationRoundTrip(const T &Value) {
-  using BST = SPSSerializationTraits<SPSTagT, T>;
-
-  size_t Size = BST::size(Value);
-  auto Buffer = std::make_unique<char[]>(Size);
-  SPSOutputBuffer OB(Buffer.get(), Size);
-
-  EXPECT_TRUE(BST::serialize(OB, Value));
-
-  SPSInputBuffer IB(Buffer.get(), Size);
-
-  T DSValue;
-  EXPECT_TRUE(BST::deserialize(IB, DSValue));
-
-  EXPECT_EQ(Value, DSValue)
-      << "Incorrect value after serialization/deserialization round-trip";
-}
-
-template <typename T> static void testFixedIntegralTypeSerialization() {
-  blobSerializationRoundTrip<T, T>(0);
-  blobSerializationRoundTrip<T, T>(static_cast<T>(1));
-  if (std::is_signed<T>::value) {
-    blobSerializationRoundTrip<T, T>(static_cast<T>(-1));
-    blobSerializationRoundTrip<T, T>(std::numeric_limits<T>::min());
-  }
-  blobSerializationRoundTrip<T, T>(std::numeric_limits<T>::max());
-}
-
-TEST(SimplePackedSerializationTest, BoolSerialization) {
-  blobSerializationRoundTrip<bool, bool>(true);
-  blobSerializationRoundTrip<bool, bool>(false);
-}
-
-TEST(SimplePackedSerializationTest, CharSerialization) {
-  blobSerializationRoundTrip<char, char>((char)0x00);
-  blobSerializationRoundTrip<char, char>((char)0xAA);
-  blobSerializationRoundTrip<char, char>((char)0xFF);
-}
-
-TEST(SimplePackedSerializationTest, Int8Serialization) {
-  testFixedIntegralTypeSerialization<int8_t>();
-}
-
-TEST(SimplePackedSerializationTest, UInt8Serialization) {
-  testFixedIntegralTypeSerialization<uint8_t>();
-}
-
-TEST(SimplePackedSerializationTest, Int16Serialization) {
-  testFixedIntegralTypeSerialization<int16_t>();
-}
-
-TEST(SimplePackedSerializationTest, UInt16Serialization) {
-  testFixedIntegralTypeSerialization<uint16_t>();
-}
-
-TEST(SimplePackedSerializationTest, Int32Serialization) {
-  testFixedIntegralTypeSerialization<int32_t>();
-}
-
-TEST(SimplePackedSerializationTest, UInt32Serialization) {
-  testFixedIntegralTypeSerialization<uint32_t>();
-}
-
-TEST(SimplePackedSerializationTest, Int64Serialization) {
-  testFixedIntegralTypeSerialization<int64_t>();
-}
-
-TEST(SimplePackedSerializationTest, UInt64Serialization) {
-  testFixedIntegralTypeSerialization<uint64_t>();
-}
-
-TEST(SimplePackedSerializationTest, SequenceSerialization) {
-  std::vector<int32_t> V({1, 2, -47, 139});
-  blobSerializationRoundTrip<SPSSequence<int32_t>, std::vector<int32_t>>(V);
-}
-
-TEST(SimplePackedSerializationTest, StringViewCharSequenceSerialization) {
-  const char *HW = "Hello, world!";
-  blobSerializationRoundTrip<SPSString, StringRef>(StringRef(HW));
-}
-
-TEST(SimplePackedSerializationTest, StdPairSerialization) {
-  std::pair<int32_t, std::string> P(42, "foo");
-  blobSerializationRoundTrip<SPSTuple<int32_t, SPSString>,
-                             std::pair<int32_t, std::string>>(P);
-}
-
-TEST(SimplePackedSerializationTest, ArgListSerialization) {
-  using BAL = SPSArgList<bool, int32_t, SPSString>;
-
-  bool Arg1 = true;
-  int32_t Arg2 = 42;
-  std::string Arg3 = "foo";
-
-  size_t Size = BAL::size(Arg1, Arg2, Arg3);
-  auto Buffer = std::make_unique<char[]>(Size);
-  SPSOutputBuffer OB(Buffer.get(), Size);
-
-  EXPECT_TRUE(BAL::serialize(OB, Arg1, Arg2, Arg3));
-
-  SPSInputBuffer IB(Buffer.get(), Size);
-
-  bool ArgOut1;
-  int32_t ArgOut2;
-  std::string ArgOut3;
-
-  EXPECT_TRUE(BAL::deserialize(IB, ArgOut1, ArgOut2, ArgOut3));
-
-  EXPECT_EQ(Arg1, ArgOut1);
-  EXPECT_EQ(Arg2, ArgOut2);
-  EXPECT_EQ(Arg3, ArgOut3);
-}
-
-TEST(SimplePackedSerialization, StringMap) {
-  StringMap<int32_t> M({{"A", 1}, {"B", 2}});
-  blobSerializationRoundTrip<SPSSequence<SPSTuple<SPSString, int32_t>>,
-                             StringMap<int32_t>>(M);
-}
diff --git a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/SymbolStringPoolTest.cpp b/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/SymbolStringPoolTest.cpp
deleted file mode 100644
index a68da0be960..00000000000
--- a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/SymbolStringPoolTest.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-//===----- SymbolStringPoolTest.cpp - Unit tests for SymbolStringPool -----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ExecutionEngine/Orc/SymbolStringPool.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::orc;
-
-namespace {
-
-TEST(SymbolStringPool, UniquingAndComparisons) {
-  SymbolStringPool SP;
-  auto P1 = SP.intern("hello");
-
-  std::string S("hel");
-  S += "lo";
-  auto P2 = SP.intern(S);
-
-  auto P3 = SP.intern("goodbye");
-
-  EXPECT_EQ(P1, P2) << "Failed to unique entries";
-  EXPECT_NE(P1, P3) << "Inequal pooled symbol strings comparing equal";
-
-  // We want to test that less-than comparison of SymbolStringPtrs compiles,
-  // however we can't test the actual result as this is a pointer comparison and
-  // SymbolStringPtr doesn't expose the underlying address of the string.
-  (void)(P1 < P3);
-}
-
-TEST(SymbolStringPool, Dereference) {
-  SymbolStringPool SP;
-  auto Foo = SP.intern("foo");
-  EXPECT_EQ(*Foo, "foo") << "Equality on dereferenced string failed";
-}
-
-TEST(SymbolStringPool, ClearDeadEntries) {
-  SymbolStringPool SP;
-  {
-    auto P1 = SP.intern("s1");
-    SP.clearDeadEntries();
-    EXPECT_FALSE(SP.empty()) << "\"s1\" entry in pool should still be retained";
-  }
-  SP.clearDeadEntries();
-  EXPECT_TRUE(SP.empty()) << "pool should be empty";
-}
-
-}
diff --git a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/ThreadSafeModuleTest.cpp b/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/ThreadSafeModuleTest.cpp
deleted file mode 100644
index 1ffb06db659..00000000000
--- a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/ThreadSafeModuleTest.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-//===--- ThreadSafeModuleTest.cpp - Test basic use of ThreadSafeModule ----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ExecutionEngine/Orc/ThreadSafeModule.h"
-#include "gtest/gtest.h"
-
-#include <atomic>
-#include <future>
-#include <thread>
-
-using namespace llvm;
-using namespace llvm::orc;
-
-namespace {
-
-TEST(ThreadSafeModuleTest, ContextWhollyOwnedByOneModule) {
-  // Test that ownership of a context can be transferred to a single
-  // ThreadSafeModule.
-  ThreadSafeContext TSCtx(std::make_unique<LLVMContext>());
-  auto M = std::make_unique<Module>("M", *TSCtx.getContext());
-  ThreadSafeModule TSM(std::move(M), std::move(TSCtx));
-}
-
-TEST(ThreadSafeModuleTest, ContextOwnershipSharedByTwoModules) {
-  // Test that ownership of a context can be shared between more than one
-  // ThreadSafeModule.
-  ThreadSafeContext TSCtx(std::make_unique<LLVMContext>());
-
-  auto M1 = std::make_unique<Module>("M1", *TSCtx.getContext());
-  ThreadSafeModule TSM1(std::move(M1), TSCtx);
-
-  auto M2 = std::make_unique<Module>("M2", *TSCtx.getContext());
-  ThreadSafeModule TSM2(std::move(M2), std::move(TSCtx));
-}
-
-TEST(ThreadSafeModuleTest, ContextOwnershipSharedWithClient) {
-  // Test that ownership of a context can be shared with a client-held
-  // ThreadSafeContext so that it can be re-used for new modules.
-  ThreadSafeContext TSCtx(std::make_unique<LLVMContext>());
-
-  {
-    // Create and destroy a module.
-    auto M1 = std::make_unique<Module>("M1", *TSCtx.getContext());
-    ThreadSafeModule TSM1(std::move(M1), TSCtx);
-  }
-
-  // Verify that the context is still available for re-use.
-  auto M2 = std::make_unique<Module>("M2", *TSCtx.getContext());
-  ThreadSafeModule TSM2(std::move(M2), std::move(TSCtx));
-}
-
-TEST(ThreadSafeModuleTest, ThreadSafeModuleMoveAssignment) {
-  // Move assignment needs to move the module before the context (opposite
-  // to the field order) to ensure that overwriting with an empty
-  // ThreadSafeModule does not destroy the context early.
-  ThreadSafeContext TSCtx(std::make_unique<LLVMContext>());
-  auto M = std::make_unique<Module>("M", *TSCtx.getContext());
-  ThreadSafeModule TSM(std::move(M), std::move(TSCtx));
-  TSM = ThreadSafeModule();
-}
-
-TEST(ThreadSafeModuleTest, BasicContextLockAPI) {
-  // Test that basic lock API calls work.
-  ThreadSafeContext TSCtx(std::make_unique<LLVMContext>());
-  auto M = std::make_unique<Module>("M", *TSCtx.getContext());
-  ThreadSafeModule TSM(std::move(M), TSCtx);
-
-  { auto L = TSCtx.getLock(); }
-
-  { auto L = TSM.getContext().getLock(); }
-}
-
-TEST(ThreadSafeModuleTest, ContextLockPreservesContext) {
-  // Test that the existence of a context lock preserves the attached
-  // context.
-  // The trick to verify this is a bit of a hack: We attach a Module
-  // (without the ThreadSafeModule wrapper) to the context, then verify
-  // that this Module destructs safely (which it will not if its context
-  // has been destroyed) even though all references to the context have
-  // been thrown away (apart from the lock).
-
-  ThreadSafeContext TSCtx(std::make_unique<LLVMContext>());
-  auto L = TSCtx.getLock();
-  auto &Ctx = *TSCtx.getContext();
-  auto M = std::make_unique<Module>("M", Ctx);
-  TSCtx = ThreadSafeContext();
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/WrapperFunctionUtilsTest.cpp b/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/WrapperFunctionUtilsTest.cpp
deleted file mode 100644
index 42051836506..00000000000
--- a/gnu/llvm/llvm/unittests/ExecutionEngine/Orc/WrapperFunctionUtilsTest.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-//===----- WrapperFunctionUtilsTest.cpp - Test Wrapper-Function utils -----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ExecutionEngine/Orc/Shared/WrapperFunctionUtils.h"
-#include "llvm/ADT/FunctionExtras.h"
-#include "gtest/gtest.h"
-
-#include <future>
-
-using namespace llvm;
-using namespace llvm::orc::shared;
-
-namespace {
-constexpr const char *TestString = "test string";
-} // end anonymous namespace
-
-TEST(WrapperFunctionUtilsTest, DefaultWrapperFunctionResult) {
-  WrapperFunctionResult R;
-  EXPECT_TRUE(R.empty());
-  EXPECT_EQ(R.size(), 0U);
-  EXPECT_EQ(R.getOutOfBandError(), nullptr);
-}
-
-TEST(WrapperFunctionUtilsTest, WrapperFunctionResultFromRange) {
-  auto R = WrapperFunctionResult::copyFrom(TestString, strlen(TestString) + 1);
-  EXPECT_EQ(R.size(), strlen(TestString) + 1);
-  EXPECT_TRUE(strcmp(R.data(), TestString) == 0);
-  EXPECT_FALSE(R.empty());
-  EXPECT_EQ(R.getOutOfBandError(), nullptr);
-}
-
-TEST(WrapperFunctionUtilsTest, WrapperFunctionResultFromCString) {
-  auto R = WrapperFunctionResult::copyFrom(TestString);
-  EXPECT_EQ(R.size(), strlen(TestString) + 1);
-  EXPECT_TRUE(strcmp(R.data(), TestString) == 0);
-  EXPECT_FALSE(R.empty());
-  EXPECT_EQ(R.getOutOfBandError(), nullptr);
-}
-
-TEST(WrapperFunctionUtilsTest, WrapperFunctionResultFromStdString) {
-  auto R = WrapperFunctionResult::copyFrom(std::string(TestString));
-  EXPECT_EQ(R.size(), strlen(TestString) + 1);
-  EXPECT_TRUE(strcmp(R.data(), TestString) == 0);
-  EXPECT_FALSE(R.empty());
-  EXPECT_EQ(R.getOutOfBandError(), nullptr);
-}
-
-TEST(WrapperFunctionUtilsTest, WrapperFunctionResultFromOutOfBandError) {
-  auto R = WrapperFunctionResult::createOutOfBandError(TestString);
-  EXPECT_FALSE(R.empty());
-  EXPECT_TRUE(strcmp(R.getOutOfBandError(), TestString) == 0);
-}
-
-static void voidNoop() {}
-
-static WrapperFunctionResult voidNoopWrapper(const char *ArgData,
-                                             size_t ArgSize) {
-  return WrapperFunction<void()>::handle(ArgData, ArgSize, voidNoop);
-}
-
-static WrapperFunctionResult addWrapper(const char *ArgData, size_t ArgSize) {
-  return WrapperFunction<int32_t(int32_t, int32_t)>::handle(
-      ArgData, ArgSize, [](int32_t X, int32_t Y) -> int32_t { return X + Y; });
-}
-
-TEST(WrapperFunctionUtilsTest, WrapperFunctionCallAndHandleVoid) {
-  EXPECT_FALSE(!!WrapperFunction<void()>::call(voidNoopWrapper));
-}
-
-TEST(WrapperFunctionUtilsTest, WrapperFunctionCallAndHandleRet) {
-  int32_t Result;
-  EXPECT_FALSE(!!WrapperFunction<int32_t(int32_t, int32_t)>::call(
-      addWrapper, Result, 1, 2));
-  EXPECT_EQ(Result, (int32_t)3);
-}
-
-static void voidNoopAsync(unique_function<void(SPSEmpty)> SendResult) {
-  SendResult(SPSEmpty());
-}
-
-static WrapperFunctionResult voidNoopAsyncWrapper(const char *ArgData,
-                                                  size_t ArgSize) {
-  std::promise<WrapperFunctionResult> RP;
-  auto RF = RP.get_future();
-
-  WrapperFunction<void()>::handleAsync(
-      ArgData, ArgSize, voidNoopAsync,
-      [&](WrapperFunctionResult R) { RP.set_value(std::move(R)); });
-
-  return RF.get();
-}
-
-static WrapperFunctionResult addAsyncWrapper(const char *ArgData,
-                                             size_t ArgSize) {
-  std::promise<WrapperFunctionResult> RP;
-  auto RF = RP.get_future();
-
-  WrapperFunction<int32_t(int32_t, int32_t)>::handleAsync(
-      ArgData, ArgSize,
-      [](unique_function<void(int32_t)> SendResult, int32_t X, int32_t Y) {
-        SendResult(X + Y);
-      },
-      [&](WrapperFunctionResult R) { RP.set_value(std::move(R)); });
-  return RF.get();
-}
-
-TEST(WrapperFunctionUtilsTest, WrapperFunctionCallAndHandleAsyncVoid) {
-  EXPECT_FALSE(!!WrapperFunction<void()>::call(voidNoopAsyncWrapper));
-}
-
-TEST(WrapperFunctionUtilsTest, WrapperFunctionCallAndHandleAsyncRet) {
-  int32_t Result;
-  EXPECT_FALSE(!!WrapperFunction<int32_t(int32_t, int32_t)>::call(
-      addAsyncWrapper, Result, 1, 2));
-  EXPECT_EQ(Result, (int32_t)3);
-}
diff --git a/gnu/llvm/llvm/unittests/FileCheck/CMakeLists.txt b/gnu/llvm/llvm/unittests/FileCheck/CMakeLists.txt
deleted file mode 100644
index 7fe4f0c009d..00000000000
--- a/gnu/llvm/llvm/unittests/FileCheck/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  FileCheck
-  Support
-)
-
-add_llvm_unittest(FileCheckTests
-  FileCheckTest.cpp
-)
-
-target_link_libraries(FileCheckTests PRIVATE LLVMTestingSupport)
diff --git a/gnu/llvm/llvm/unittests/FileCheck/FileCheckTest.cpp b/gnu/llvm/llvm/unittests/FileCheck/FileCheckTest.cpp
deleted file mode 100644
index f3b5d3d2aaa..00000000000
--- a/gnu/llvm/llvm/unittests/FileCheck/FileCheckTest.cpp
+++ /dev/null
@@ -1,1780 +0,0 @@
-//===- llvm/unittest/FileCheck/FileCheckTest.cpp - FileCheck tests --------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/FileCheck/FileCheck.h"
-#include "../lib/FileCheck/FileCheckImpl.h"
-#include "llvm/Support/Regex.h"
-#include "llvm/Testing/Support/Error.h"
-#include "gtest/gtest.h"
-#include <tuple>
-#include <unordered_set>
-
-using namespace llvm;
-
-namespace {
-
-class FileCheckTest : public ::testing::Test {};
-
-static StringRef bufferize(SourceMgr &SM, StringRef Str) {
-  std::unique_ptr<MemoryBuffer> Buffer =
-      MemoryBuffer::getMemBufferCopy(Str, "TestBuffer");
-  StringRef StrBufferRef = Buffer->getBuffer();
-  SM.AddNewSourceBuffer(std::move(Buffer), SMLoc());
-  return StrBufferRef;
-}
-
-static std::string toString(const std::unordered_set<std::string> &Set) {
-  bool First = true;
-  std::string Str;
-  for (StringRef S : Set) {
-    Str += Twine(First ? "{" + S : ", " + S).str();
-    First = false;
-  }
-  Str += '}';
-  return Str;
-}
-
-template <typename ErrorT>
-static void expectSameErrors(std::unordered_set<std::string> ExpectedMsgs,
-                             Error Err) {
-  auto AnyErrorMsgMatch = [&ExpectedMsgs](std::string &&ErrorMsg) -> bool {
-    for (auto ExpectedMsgItr = ExpectedMsgs.begin(),
-              ExpectedMsgEnd = ExpectedMsgs.end();
-         ExpectedMsgItr != ExpectedMsgEnd; ++ExpectedMsgItr) {
-      if (ErrorMsg.find(*ExpectedMsgItr) != std::string::npos) {
-        ExpectedMsgs.erase(ExpectedMsgItr);
-        return true;
-      }
-    }
-    return false;
-  };
-
-  Error RemainingErrors = std::move(Err);
-  do {
-    RemainingErrors =
-        handleErrors(std::move(RemainingErrors), [&](const ErrorT &E) {
-          EXPECT_TRUE(AnyErrorMsgMatch(E.message()))
-              << "Unexpected error message:" << std::endl
-              << E.message();
-        });
-  } while (RemainingErrors && !ExpectedMsgs.empty());
-  EXPECT_THAT_ERROR(std::move(RemainingErrors), Succeeded());
-  EXPECT_TRUE(ExpectedMsgs.empty())
-      << "Error message(s) not found:" << std::endl
-      << toString(ExpectedMsgs);
-}
-
-template <typename ErrorT>
-static void expectError(StringRef ExpectedMsg, Error Err) {
-  expectSameErrors<ErrorT>({ExpectedMsg.str()}, std::move(Err));
-}
-
-static void expectDiagnosticError(StringRef ExpectedMsg, Error Err) {
-  expectError<ErrorDiagnostic>(ExpectedMsg, std::move(Err));
-}
-
-constexpr uint64_t MaxUint64 = std::numeric_limits<uint64_t>::max();
-constexpr int64_t MaxInt64 = std::numeric_limits<int64_t>::max();
-constexpr int64_t MinInt64 = std::numeric_limits<int64_t>::min();
-constexpr uint64_t AbsoluteMinInt64 =
-    static_cast<uint64_t>(-(MinInt64 + 1)) + 1;
-constexpr uint64_t AbsoluteMaxInt64 = static_cast<uint64_t>(MaxInt64);
-
-struct ExpressionFormatParameterisedFixture
-    : public ::testing::TestWithParam<
-          std::tuple<ExpressionFormat::Kind, unsigned, bool>> {
-  bool AlternateForm;
-  unsigned Precision;
-  bool Signed;
-  bool AllowHex;
-  bool AllowUpperHex;
-  ExpressionFormat Format;
-  Regex WildcardRegex;
-
-  StringRef TenStr;
-  StringRef FifteenStr;
-  std::string MaxUint64Str;
-  std::string MaxInt64Str;
-  std::string MinInt64Str;
-  StringRef FirstInvalidCharDigits;
-  StringRef AcceptedHexOnlyDigits;
-  StringRef RefusedHexOnlyDigits;
-
-  SourceMgr SM;
-
-  void SetUp() override {
-    ExpressionFormat::Kind Kind;
-    std::tie(Kind, Precision, AlternateForm) = GetParam();
-    AllowHex = Kind == ExpressionFormat::Kind::HexLower ||
-               Kind == ExpressionFormat::Kind::HexUpper;
-    AllowUpperHex = Kind == ExpressionFormat::Kind::HexUpper;
-    Signed = Kind == ExpressionFormat::Kind::Signed;
-    Format = ExpressionFormat(Kind, Precision, AlternateForm);
-
-    if (!AllowHex) {
-      MaxUint64Str = std::to_string(MaxUint64);
-      MaxInt64Str = std::to_string(MaxInt64);
-      MinInt64Str = std::to_string(MinInt64);
-      TenStr = "10";
-      FifteenStr = "15";
-      FirstInvalidCharDigits = "aA";
-      AcceptedHexOnlyDigits = RefusedHexOnlyDigits = "N/A";
-      return;
-    }
-
-    MaxUint64Str = AllowUpperHex ? "FFFFFFFFFFFFFFFF" : "ffffffffffffffff";
-    MaxInt64Str = AllowUpperHex ? "7FFFFFFFFFFFFFFF" : "7fffffffffffffff";
-    TenStr = AllowUpperHex ? "A" : "a";
-    FifteenStr = AllowUpperHex ? "F" : "f";
-    AcceptedHexOnlyDigits = AllowUpperHex ? "ABCDEF" : "abcdef";
-    RefusedHexOnlyDigits = AllowUpperHex ? "abcdef" : "ABCDEF";
-    MinInt64Str = "N/A";
-    FirstInvalidCharDigits = "gG";
-  }
-
-  void checkWildcardRegexMatch(StringRef Input,
-                               unsigned TrailExtendTo = 0) const {
-    ASSERT_TRUE(TrailExtendTo == 0 || AllowHex);
-    SmallVector<StringRef, 4> Matches;
-    std::string ExtendedInput = Input.str();
-    size_t PrefixSize = AlternateForm ? 2 : 0;
-    if (TrailExtendTo > Input.size() - PrefixSize) {
-      size_t ExtensionSize = PrefixSize + TrailExtendTo - Input.size();
-      ExtendedInput.append(ExtensionSize, Input[PrefixSize]);
-    }
-    ASSERT_TRUE(WildcardRegex.match(ExtendedInput, &Matches))
-        << "Wildcard regex does not match " << ExtendedInput;
-    EXPECT_EQ(Matches[0], ExtendedInput);
-  }
-
-  void checkWildcardRegexMatchFailure(StringRef Input) const {
-    EXPECT_FALSE(WildcardRegex.match(Input));
-  }
-
-  std::string addBasePrefix(StringRef Num) const {
-    StringRef Prefix = AlternateForm ? "0x" : "";
-    return (Twine(Prefix) + Twine(Num)).str();
-  }
-
-  void checkPerCharWildcardRegexMatchFailure(StringRef Chars) const {
-    for (auto C : Chars) {
-      std::string Str = addBasePrefix(StringRef(&C, 1));
-      EXPECT_FALSE(WildcardRegex.match(Str));
-    }
-  }
-
-  std::string padWithLeadingZeros(StringRef NumStr) const {
-    bool Negative = NumStr.startswith("-");
-    if (NumStr.size() - unsigned(Negative) >= Precision)
-      return NumStr.str();
-
-    std::string PaddedStr;
-    if (Negative) {
-      PaddedStr = "-";
-      NumStr = NumStr.drop_front();
-    }
-    PaddedStr.append(Precision - NumStr.size(), '0');
-    PaddedStr.append(NumStr.str());
-    return PaddedStr;
-  }
-
-  template <class T> void checkMatchingString(T Val, StringRef ExpectedStr) {
-    Expected<std::string> MatchingString =
-        Format.getMatchingString(ExpressionValue(Val));
-    ASSERT_THAT_EXPECTED(MatchingString, Succeeded())
-        << "No matching string for " << Val;
-    EXPECT_EQ(*MatchingString, ExpectedStr);
-  }
-
-  template <class T> void checkMatchingStringFailure(T Val) {
-    Expected<std::string> MatchingString =
-        Format.getMatchingString(ExpressionValue(Val));
-    // Error message tested in ExpressionValue unit tests.
-    EXPECT_THAT_EXPECTED(MatchingString, Failed());
-  }
-
-  Expected<ExpressionValue> getValueFromStringReprFailure(StringRef Str) {
-    StringRef BufferizedStr = bufferize(SM, Str);
-    return Format.valueFromStringRepr(BufferizedStr, SM);
-  }
-
-  template <class T>
-  void checkValueFromStringRepr(StringRef Str, T ExpectedVal) {
-    Expected<ExpressionValue> ResultValue = getValueFromStringReprFailure(Str);
-    ASSERT_THAT_EXPECTED(ResultValue, Succeeded())
-        << "Failed to get value from " << Str;
-    ASSERT_EQ(ResultValue->isNegative(), ExpectedVal < 0)
-        << "Value for " << Str << " is not " << ExpectedVal;
-    if (ResultValue->isNegative())
-      EXPECT_EQ(cantFail(ResultValue->getSignedValue()),
-                static_cast<int64_t>(ExpectedVal));
-    else
-      EXPECT_EQ(cantFail(ResultValue->getUnsignedValue()),
-                static_cast<uint64_t>(ExpectedVal));
-  }
-
-  void checkValueFromStringReprFailure(
-      StringRef Str, StringRef ErrorStr = "unable to represent numeric value") {
-    Expected<ExpressionValue> ResultValue = getValueFromStringReprFailure(Str);
-    expectDiagnosticError(ErrorStr, ResultValue.takeError());
-  }
-};
-
-TEST_P(ExpressionFormatParameterisedFixture, FormatGetWildcardRegex) {
-  // Wildcard regex is valid.
-  Expected<std::string> WildcardPattern = Format.getWildcardRegex();
-  ASSERT_THAT_EXPECTED(WildcardPattern, Succeeded());
-  WildcardRegex = Regex((Twine("^") + *WildcardPattern + "$").str());
-  ASSERT_TRUE(WildcardRegex.isValid());
-
-  // Does not match empty string.
-  checkWildcardRegexMatchFailure("");
-
-  // Matches all decimal digits, matches several of them and match 0x prefix
-  // if and only if AlternateForm is true.
-  StringRef LongNumber = "12345678901234567890";
-  StringRef PrefixedLongNumber = "0x12345678901234567890";
-  if (AlternateForm) {
-    checkWildcardRegexMatch(PrefixedLongNumber);
-    checkWildcardRegexMatchFailure(LongNumber);
-  } else {
-    checkWildcardRegexMatch(LongNumber);
-    checkWildcardRegexMatchFailure(PrefixedLongNumber);
-  }
-
-  // Matches negative digits.
-  LongNumber = "-12345678901234567890";
-  if (Signed)
-    checkWildcardRegexMatch(LongNumber);
-  else
-    checkWildcardRegexMatchFailure(LongNumber);
-
-  // Check non digits or digits with wrong casing are not matched.
-  std::string LongNumberStr;
-  if (AllowHex) {
-    LongNumberStr = addBasePrefix(AcceptedHexOnlyDigits);
-    checkWildcardRegexMatch(LongNumberStr, 16);
-    checkPerCharWildcardRegexMatchFailure(RefusedHexOnlyDigits);
-  }
-  checkPerCharWildcardRegexMatchFailure(FirstInvalidCharDigits);
-
-  // Check leading zeros are only accepted if number of digits is less than the
-  // precision.
-  LongNumber = "01234567890123456789";
-  if (Precision) {
-    LongNumberStr = addBasePrefix(LongNumber.take_front(Precision));
-    checkWildcardRegexMatch(LongNumberStr);
-    LongNumberStr = addBasePrefix(LongNumber.take_front(Precision - 1));
-    checkWildcardRegexMatchFailure(LongNumberStr);
-    if (Precision < LongNumber.size()) {
-      LongNumberStr = addBasePrefix(LongNumber.take_front(Precision + 1));
-      checkWildcardRegexMatchFailure(LongNumberStr);
-    }
-  } else {
-    LongNumberStr = addBasePrefix(LongNumber);
-    checkWildcardRegexMatch(LongNumberStr);
-  }
-}
-
-TEST_P(ExpressionFormatParameterisedFixture, FormatGetMatchingString) {
-  checkMatchingString(0, addBasePrefix(padWithLeadingZeros("0")));
-  checkMatchingString(9, addBasePrefix(padWithLeadingZeros("9")));
-
-  if (Signed) {
-    checkMatchingString(-5, padWithLeadingZeros("-5"));
-    checkMatchingStringFailure(MaxUint64);
-    checkMatchingString(MaxInt64, padWithLeadingZeros(MaxInt64Str));
-    checkMatchingString(MinInt64, padWithLeadingZeros(MinInt64Str));
-  } else {
-    checkMatchingStringFailure(-5);
-    checkMatchingString(MaxUint64,
-                        addBasePrefix(padWithLeadingZeros(MaxUint64Str)));
-    checkMatchingString(MaxInt64,
-                        addBasePrefix(padWithLeadingZeros(MaxInt64Str)));
-    checkMatchingStringFailure(MinInt64);
-  }
-
-  checkMatchingString(10, addBasePrefix(padWithLeadingZeros(TenStr)));
-  checkMatchingString(15, addBasePrefix(padWithLeadingZeros(FifteenStr)));
-}
-
-TEST_P(ExpressionFormatParameterisedFixture, FormatValueFromStringRepr) {
-  checkValueFromStringRepr(addBasePrefix("0"), 0);
-  checkValueFromStringRepr(addBasePrefix("9"), 9);
-
-  if (Signed) {
-    checkValueFromStringRepr("-5", -5);
-    checkValueFromStringReprFailure(MaxUint64Str);
-  } else {
-    checkValueFromStringReprFailure("-" + addBasePrefix("5"));
-    checkValueFromStringRepr(addBasePrefix(MaxUint64Str), MaxUint64);
-  }
-
-  checkValueFromStringRepr(addBasePrefix(TenStr), 10);
-  checkValueFromStringRepr(addBasePrefix(FifteenStr), 15);
-
-  // Wrong casing is not tested because valueFromStringRepr() relies on
-  // StringRef's getAsInteger() which does not allow to restrict casing.
-  checkValueFromStringReprFailure(addBasePrefix("G"));
-
-  if (AlternateForm)
-    checkValueFromStringReprFailure("9", "missing alternate form prefix");
-}
-
-TEST_P(ExpressionFormatParameterisedFixture, FormatBoolOperator) {
-  EXPECT_TRUE(bool(Format));
-}
-
-INSTANTIATE_TEST_SUITE_P(
-    AllowedExplicitExpressionFormat, ExpressionFormatParameterisedFixture,
-    ::testing::Values(
-        std::make_tuple(ExpressionFormat::Kind::Unsigned, 0, false),
-        std::make_tuple(ExpressionFormat::Kind::Signed, 0, false),
-        std::make_tuple(ExpressionFormat::Kind::HexLower, 0, false),
-        std::make_tuple(ExpressionFormat::Kind::HexLower, 0, true),
-        std::make_tuple(ExpressionFormat::Kind::HexUpper, 0, false),
-        std::make_tuple(ExpressionFormat::Kind::HexUpper, 0, true),
-
-        std::make_tuple(ExpressionFormat::Kind::Unsigned, 1, false),
-        std::make_tuple(ExpressionFormat::Kind::Signed, 1, false),
-        std::make_tuple(ExpressionFormat::Kind::HexLower, 1, false),
-        std::make_tuple(ExpressionFormat::Kind::HexLower, 1, true),
-        std::make_tuple(ExpressionFormat::Kind::HexUpper, 1, false),
-        std::make_tuple(ExpressionFormat::Kind::HexUpper, 1, true),
-
-        std::make_tuple(ExpressionFormat::Kind::Unsigned, 16, false),
-        std::make_tuple(ExpressionFormat::Kind::Signed, 16, false),
-        std::make_tuple(ExpressionFormat::Kind::HexLower, 16, false),
-        std::make_tuple(ExpressionFormat::Kind::HexLower, 16, true),
-        std::make_tuple(ExpressionFormat::Kind::HexUpper, 16, false),
-        std::make_tuple(ExpressionFormat::Kind::HexUpper, 16, true),
-
-        std::make_tuple(ExpressionFormat::Kind::Unsigned, 20, false),
-        std::make_tuple(ExpressionFormat::Kind::Signed, 20, false)));
-
-TEST_F(FileCheckTest, NoFormatProperties) {
-  ExpressionFormat NoFormat(ExpressionFormat::Kind::NoFormat);
-  expectError<StringError>("trying to match value with invalid format",
-                           NoFormat.getWildcardRegex().takeError());
-  expectError<StringError>(
-      "trying to match value with invalid format",
-      NoFormat.getMatchingString(ExpressionValue(18u)).takeError());
-  EXPECT_FALSE(bool(NoFormat));
-}
-
-TEST_F(FileCheckTest, FormatEqualityOperators) {
-  ExpressionFormat UnsignedFormat(ExpressionFormat::Kind::Unsigned);
-  ExpressionFormat UnsignedFormat2(ExpressionFormat::Kind::Unsigned);
-  EXPECT_TRUE(UnsignedFormat == UnsignedFormat2);
-  EXPECT_FALSE(UnsignedFormat != UnsignedFormat2);
-
-  ExpressionFormat HexLowerFormat(ExpressionFormat::Kind::HexLower);
-  EXPECT_FALSE(UnsignedFormat == HexLowerFormat);
-  EXPECT_TRUE(UnsignedFormat != HexLowerFormat);
-
-  ExpressionFormat NoFormat(ExpressionFormat::Kind::NoFormat);
-  ExpressionFormat NoFormat2(ExpressionFormat::Kind::NoFormat);
-  EXPECT_FALSE(NoFormat == NoFormat2);
-  EXPECT_TRUE(NoFormat != NoFormat2);
-}
-
-TEST_F(FileCheckTest, FormatKindEqualityOperators) {
-  ExpressionFormat UnsignedFormat(ExpressionFormat::Kind::Unsigned);
-  EXPECT_TRUE(UnsignedFormat == ExpressionFormat::Kind::Unsigned);
-  EXPECT_FALSE(UnsignedFormat != ExpressionFormat::Kind::Unsigned);
-  EXPECT_FALSE(UnsignedFormat == ExpressionFormat::Kind::HexLower);
-  EXPECT_TRUE(UnsignedFormat != ExpressionFormat::Kind::HexLower);
-  ExpressionFormat NoFormat(ExpressionFormat::Kind::NoFormat);
-  EXPECT_TRUE(NoFormat == ExpressionFormat::Kind::NoFormat);
-  EXPECT_FALSE(NoFormat != ExpressionFormat::Kind::NoFormat);
-}
-
-template <class T1, class T2>
-static Expected<ExpressionValue> doValueOperation(binop_eval_t Operation,
-                                                  T1 LeftValue, T2 RightValue) {
-  ExpressionValue LeftOperand(LeftValue);
-  ExpressionValue RightOperand(RightValue);
-  return Operation(LeftOperand, RightOperand);
-}
-
-template <class T>
-static void expectValueEqual(ExpressionValue ActualValue, T ExpectedValue) {
-  EXPECT_EQ(ExpectedValue < 0, ActualValue.isNegative());
-  if (ExpectedValue < 0) {
-    Expected<int64_t> SignedActualValue = ActualValue.getSignedValue();
-    ASSERT_THAT_EXPECTED(SignedActualValue, Succeeded());
-    EXPECT_EQ(*SignedActualValue, static_cast<int64_t>(ExpectedValue));
-  } else {
-    Expected<uint64_t> UnsignedActualValue = ActualValue.getUnsignedValue();
-    ASSERT_THAT_EXPECTED(UnsignedActualValue, Succeeded());
-    EXPECT_EQ(*UnsignedActualValue, static_cast<uint64_t>(ExpectedValue));
-  }
-}
-
-template <class T1, class T2, class TR>
-static void expectOperationValueResult(binop_eval_t Operation, T1 LeftValue,
-                                       T2 RightValue, TR ResultValue) {
-  Expected<ExpressionValue> OperationResult =
-      doValueOperation(Operation, LeftValue, RightValue);
-  ASSERT_THAT_EXPECTED(OperationResult, Succeeded());
-  expectValueEqual(*OperationResult, ResultValue);
-}
-
-template <class T1, class T2>
-static void expectOperationValueResult(binop_eval_t Operation, T1 LeftValue,
-                                       T2 RightValue) {
-  expectError<OverflowError>(
-      "overflow error",
-      doValueOperation(Operation, LeftValue, RightValue).takeError());
-}
-
-TEST_F(FileCheckTest, ExpressionValueGetUnsigned) {
-  // Test positive value.
-  Expected<uint64_t> UnsignedValue = ExpressionValue(10).getUnsignedValue();
-  ASSERT_THAT_EXPECTED(UnsignedValue, Succeeded());
-  EXPECT_EQ(*UnsignedValue, 10U);
-
-  // Test 0.
-  UnsignedValue = ExpressionValue(0).getUnsignedValue();
-  ASSERT_THAT_EXPECTED(UnsignedValue, Succeeded());
-  EXPECT_EQ(*UnsignedValue, 0U);
-
-  // Test max positive value.
-  UnsignedValue = ExpressionValue(MaxUint64).getUnsignedValue();
-  ASSERT_THAT_EXPECTED(UnsignedValue, Succeeded());
-  EXPECT_EQ(*UnsignedValue, MaxUint64);
-
-  // Test failure with negative value.
-  expectError<OverflowError>(
-      "overflow error", ExpressionValue(-1).getUnsignedValue().takeError());
-
-  // Test failure with min negative value.
-  expectError<OverflowError>(
-      "overflow error",
-      ExpressionValue(MinInt64).getUnsignedValue().takeError());
-}
-
-TEST_F(FileCheckTest, ExpressionValueGetSigned) {
-  // Test positive value.
-  Expected<int64_t> SignedValue = ExpressionValue(10).getSignedValue();
-  ASSERT_THAT_EXPECTED(SignedValue, Succeeded());
-  EXPECT_EQ(*SignedValue, 10);
-
-  // Test 0.
-  SignedValue = ExpressionValue(0).getSignedValue();
-  ASSERT_THAT_EXPECTED(SignedValue, Succeeded());
-  EXPECT_EQ(*SignedValue, 0);
-
-  // Test max int64_t.
-  SignedValue = ExpressionValue(MaxInt64).getSignedValue();
-  ASSERT_THAT_EXPECTED(SignedValue, Succeeded());
-  EXPECT_EQ(*SignedValue, MaxInt64);
-
-  // Test failure with too big positive value.
-  expectError<OverflowError>(
-      "overflow error", ExpressionValue(static_cast<uint64_t>(MaxInt64) + 1)
-                            .getSignedValue()
-                            .takeError());
-
-  // Test failure with max uint64_t.
-  expectError<OverflowError>(
-      "overflow error",
-      ExpressionValue(MaxUint64).getSignedValue().takeError());
-
-  // Test negative value.
-  SignedValue = ExpressionValue(-10).getSignedValue();
-  ASSERT_THAT_EXPECTED(SignedValue, Succeeded());
-  EXPECT_EQ(*SignedValue, -10);
-
-  // Test min int64_t.
-  SignedValue = ExpressionValue(MinInt64).getSignedValue();
-  ASSERT_THAT_EXPECTED(SignedValue, Succeeded());
-  EXPECT_EQ(*SignedValue, MinInt64);
-}
-
-TEST_F(FileCheckTest, ExpressionValueAbsolute) {
-  // Test positive value.
-  expectValueEqual(ExpressionValue(10).getAbsolute(), 10);
-
-  // Test 0.
-  expectValueEqual(ExpressionValue(0).getAbsolute(), 0);
-
-  // Test max uint64_t.
-  expectValueEqual(ExpressionValue(MaxUint64).getAbsolute(), MaxUint64);
-
-  // Test negative value.
-  expectValueEqual(ExpressionValue(-10).getAbsolute(), 10);
-
-  // Test absence of overflow on min int64_t.
-  expectValueEqual(ExpressionValue(MinInt64).getAbsolute(),
-                   static_cast<uint64_t>(-(MinInt64 + 10)) + 10);
-}
-
-TEST_F(FileCheckTest, ExpressionValueAddition) {
-  // Test both negative values.
-  expectOperationValueResult(operator+, -10, -10, -20);
-
-  // Test both negative values with underflow.
-  expectOperationValueResult(operator+, MinInt64, -1);
-  expectOperationValueResult(operator+, MinInt64, MinInt64);
-
-  // Test negative and positive value.
-  expectOperationValueResult(operator+, -10, 10, 0);
-  expectOperationValueResult(operator+, -10, 11, 1);
-  expectOperationValueResult(operator+, -11, 10, -1);
-
-  // Test positive and negative value.
-  expectOperationValueResult(operator+, 10, -10, 0);
-  expectOperationValueResult(operator+, 10, -11, -1);
-  expectOperationValueResult(operator+, 11, -10, 1);
-
-  // Test both positive values.
-  expectOperationValueResult(operator+, 10, 10, 20);
-
-  // Test both positive values with overflow.
-  expectOperationValueResult(operator+, MaxUint64, 1);
-  expectOperationValueResult(operator+, MaxUint64, MaxUint64);
-}
-
-TEST_F(FileCheckTest, ExpressionValueSubtraction) {
-  // Test negative value and value bigger than int64_t max.
-  expectOperationValueResult(operator-, -10, MaxUint64);
-
-  // Test negative and positive value with underflow.
-  expectOperationValueResult(operator-, MinInt64, 1);
-
-  // Test negative and positive value.
-  expectOperationValueResult(operator-, -10, 10, -20);
-
-  // Test both negative values.
-  expectOperationValueResult(operator-, -10, -10, 0);
-  expectOperationValueResult(operator-, -11, -10, -1);
-  expectOperationValueResult(operator-, -10, -11, 1);
-
-  // Test positive and negative values.
-  expectOperationValueResult(operator-, 10, -10, 20);
-
-  // Test both positive values with result positive.
-  expectOperationValueResult(operator-, 10, 5, 5);
-
-  // Test both positive values with underflow.
-  expectOperationValueResult(operator-, 0, MaxUint64);
-  expectOperationValueResult(operator-, 0,
-                             static_cast<uint64_t>(-(MinInt64 + 10)) + 11);
-
-  // Test both positive values with result < -(max int64_t)
-  expectOperationValueResult(operator-, 10,
-                             static_cast<uint64_t>(MaxInt64) + 11,
-                             -MaxInt64 - 1);
-
-  // Test both positive values with 0 > result > -(max int64_t)
-  expectOperationValueResult(operator-, 10, 11, -1);
-}
-
-TEST_F(FileCheckTest, ExpressionValueMultiplication) {
-  // Test mixed signed values.
-  expectOperationValueResult(operator*, -3, 10, -30);
-  expectOperationValueResult(operator*, 2, -17, -34);
-  expectOperationValueResult(operator*, 0, MinInt64, 0);
-  expectOperationValueResult(operator*, MinInt64, 1, MinInt64);
-  expectOperationValueResult(operator*, 1, MinInt64, MinInt64);
-  expectOperationValueResult(operator*, MaxInt64, -1, -MaxInt64);
-  expectOperationValueResult(operator*, -1, MaxInt64, -MaxInt64);
-
-  // Test both negative values.
-  expectOperationValueResult(operator*, -3, -10, 30);
-  expectOperationValueResult(operator*, -2, -17, 34);
-  expectOperationValueResult(operator*, MinInt64, -1, AbsoluteMinInt64);
-
-  // Test both positive values.
-  expectOperationValueResult(operator*, 3, 10, 30);
-  expectOperationValueResult(operator*, 2, 17, 34);
-  expectOperationValueResult(operator*, 0, MaxUint64, 0);
-
-  // Test negative results that underflow.
-  expectOperationValueResult(operator*, -10, MaxInt64);
-  expectOperationValueResult(operator*, MaxInt64, -10);
-  expectOperationValueResult(operator*, 10, MinInt64);
-  expectOperationValueResult(operator*, MinInt64, 10);
-  expectOperationValueResult(operator*, -1, MaxUint64);
-  expectOperationValueResult(operator*, MaxUint64, -1);
-  expectOperationValueResult(operator*, -1, AbsoluteMaxInt64 + 2);
-  expectOperationValueResult(operator*, AbsoluteMaxInt64 + 2, -1);
-
-  // Test positive results that overflow.
-  expectOperationValueResult(operator*, 10, MaxUint64);
-  expectOperationValueResult(operator*, MaxUint64, 10);
-  expectOperationValueResult(operator*, MinInt64, -10);
-  expectOperationValueResult(operator*, -10, MinInt64);
-}
-
-TEST_F(FileCheckTest, ExpressionValueDivision) {
-  // Test mixed signed values.
-  expectOperationValueResult(operator/, -30, 10, -3);
-  expectOperationValueResult(operator/, 34, -17, -2);
-  expectOperationValueResult(operator/, 0, -10, 0);
-  expectOperationValueResult(operator/, MinInt64, 1, MinInt64);
-  expectOperationValueResult(operator/, MaxInt64, -1, -MaxInt64);
-  expectOperationValueResult(operator/, -MaxInt64, 1, -MaxInt64);
-
-  // Test both negative values.
-  expectOperationValueResult(operator/, -30, -10, 3);
-  expectOperationValueResult(operator/, -34, -17, 2);
-
-  // Test both positive values.
-  expectOperationValueResult(operator/, 30, 10, 3);
-  expectOperationValueResult(operator/, 34, 17, 2);
-  expectOperationValueResult(operator/, 0, 10, 0);
-
-  // Test divide by zero.
-  expectOperationValueResult(operator/, -10, 0);
-  expectOperationValueResult(operator/, 10, 0);
-  expectOperationValueResult(operator/, 0, 0);
-
-  // Test negative result that underflows.
-  expectOperationValueResult(operator/, MaxUint64, -1);
-  expectOperationValueResult(operator/, AbsoluteMaxInt64 + 2, -1);
-}
-
-TEST_F(FileCheckTest, ExpressionValueEquality) {
-  // Test negative and positive value.
-  EXPECT_FALSE(ExpressionValue(5) == ExpressionValue(-3));
-  EXPECT_TRUE(ExpressionValue(5) != ExpressionValue(-3));
-  EXPECT_FALSE(ExpressionValue(-2) == ExpressionValue(6));
-  EXPECT_TRUE(ExpressionValue(-2) != ExpressionValue(6));
-  EXPECT_FALSE(ExpressionValue(-7) == ExpressionValue(7));
-  EXPECT_TRUE(ExpressionValue(-7) != ExpressionValue(7));
-  EXPECT_FALSE(ExpressionValue(4) == ExpressionValue(-4));
-  EXPECT_TRUE(ExpressionValue(4) != ExpressionValue(-4));
-  EXPECT_FALSE(ExpressionValue(MaxUint64) == ExpressionValue(-1));
-  EXPECT_TRUE(ExpressionValue(MaxUint64) != ExpressionValue(-1));
-
-  // Test both negative values.
-  EXPECT_FALSE(ExpressionValue(-2) == ExpressionValue(-7));
-  EXPECT_TRUE(ExpressionValue(-2) != ExpressionValue(-7));
-  EXPECT_TRUE(ExpressionValue(-3) == ExpressionValue(-3));
-  EXPECT_FALSE(ExpressionValue(-3) != ExpressionValue(-3));
-  EXPECT_FALSE(ExpressionValue(MinInt64) == ExpressionValue(-1));
-  EXPECT_TRUE(ExpressionValue(MinInt64) != ExpressionValue(-1));
-  EXPECT_FALSE(ExpressionValue(MinInt64) == ExpressionValue(-0));
-  EXPECT_TRUE(ExpressionValue(MinInt64) != ExpressionValue(-0));
-
-  // Test both positive values.
-  EXPECT_FALSE(ExpressionValue(8) == ExpressionValue(9));
-  EXPECT_TRUE(ExpressionValue(8) != ExpressionValue(9));
-  EXPECT_TRUE(ExpressionValue(1) == ExpressionValue(1));
-  EXPECT_FALSE(ExpressionValue(1) != ExpressionValue(1));
-
-  // Check the signedness of zero doesn't affect equality.
-  EXPECT_TRUE(ExpressionValue(0) == ExpressionValue(0));
-  EXPECT_FALSE(ExpressionValue(0) != ExpressionValue(0));
-  EXPECT_TRUE(ExpressionValue(0) == ExpressionValue(-0));
-  EXPECT_FALSE(ExpressionValue(0) != ExpressionValue(-0));
-  EXPECT_TRUE(ExpressionValue(-0) == ExpressionValue(0));
-  EXPECT_FALSE(ExpressionValue(-0) != ExpressionValue(0));
-  EXPECT_TRUE(ExpressionValue(-0) == ExpressionValue(-0));
-  EXPECT_FALSE(ExpressionValue(-0) != ExpressionValue(-0));
-}
-
-TEST_F(FileCheckTest, Literal) {
-  SourceMgr SM;
-
-  // Eval returns the literal's value.
-  ExpressionLiteral Ten(bufferize(SM, "10"), 10u);
-  Expected<ExpressionValue> Value = Ten.eval();
-  ASSERT_THAT_EXPECTED(Value, Succeeded());
-  EXPECT_EQ(10, cantFail(Value->getSignedValue()));
-  Expected<ExpressionFormat> ImplicitFormat = Ten.getImplicitFormat(SM);
-  ASSERT_THAT_EXPECTED(ImplicitFormat, Succeeded());
-  EXPECT_EQ(*ImplicitFormat, ExpressionFormat::Kind::NoFormat);
-
-  // Min value can be correctly represented.
-  ExpressionLiteral Min(bufferize(SM, std::to_string(MinInt64)), MinInt64);
-  Value = Min.eval();
-  ASSERT_TRUE(bool(Value));
-  EXPECT_EQ(MinInt64, cantFail(Value->getSignedValue()));
-
-  // Max value can be correctly represented.
-  ExpressionLiteral Max(bufferize(SM, std::to_string(MaxUint64)), MaxUint64);
-  Value = Max.eval();
-  ASSERT_THAT_EXPECTED(Value, Succeeded());
-  EXPECT_EQ(MaxUint64, cantFail(Value->getUnsignedValue()));
-}
-
-TEST_F(FileCheckTest, Expression) {
-  SourceMgr SM;
-
-  std::unique_ptr<ExpressionLiteral> Ten =
-      std::make_unique<ExpressionLiteral>(bufferize(SM, "10"), 10u);
-  ExpressionLiteral *TenPtr = Ten.get();
-  Expression Expr(std::move(Ten),
-                  ExpressionFormat(ExpressionFormat::Kind::HexLower));
-  EXPECT_EQ(Expr.getAST(), TenPtr);
-  EXPECT_EQ(Expr.getFormat(), ExpressionFormat::Kind::HexLower);
-}
-
-static void
-expectUndefErrors(std::unordered_set<std::string> ExpectedUndefVarNames,
-                  Error Err) {
-  EXPECT_THAT_ERROR(handleErrors(std::move(Err),
-                                 [&](const UndefVarError &E) {
-                                   EXPECT_EQ(ExpectedUndefVarNames.erase(
-                                                 std::string(E.getVarName())),
-                                             1U);
-                                 }),
-                    Succeeded());
-  EXPECT_TRUE(ExpectedUndefVarNames.empty()) << toString(ExpectedUndefVarNames);
-}
-
-TEST_F(FileCheckTest, NumericVariable) {
-  SourceMgr SM;
-
-  // Undefined variable: getValue and eval fail, error returned by eval holds
-  // the name of the undefined variable.
-  NumericVariable FooVar("FOO",
-                         ExpressionFormat(ExpressionFormat::Kind::Unsigned), 1);
-  EXPECT_EQ("FOO", FooVar.getName());
-  EXPECT_EQ(FooVar.getImplicitFormat(), ExpressionFormat::Kind::Unsigned);
-  NumericVariableUse FooVarUse("FOO", &FooVar);
-  Expected<ExpressionFormat> ImplicitFormat = FooVarUse.getImplicitFormat(SM);
-  ASSERT_THAT_EXPECTED(ImplicitFormat, Succeeded());
-  EXPECT_EQ(*ImplicitFormat, ExpressionFormat::Kind::Unsigned);
-  EXPECT_FALSE(FooVar.getValue());
-  Expected<ExpressionValue> EvalResult = FooVarUse.eval();
-  expectUndefErrors({"FOO"}, EvalResult.takeError());
-
-  // Defined variable without string: only getValue and eval return value set.
-  FooVar.setValue(ExpressionValue(42u));
-  Optional<ExpressionValue> Value = FooVar.getValue();
-  ASSERT_TRUE(Value);
-  EXPECT_EQ(42, cantFail(Value->getSignedValue()));
-  EXPECT_FALSE(FooVar.getStringValue());
-  EvalResult = FooVarUse.eval();
-  ASSERT_THAT_EXPECTED(EvalResult, Succeeded());
-  EXPECT_EQ(42, cantFail(EvalResult->getSignedValue()));
-
-  // Defined variable with string: getValue, eval, and getStringValue return
-  // value set.
-  StringRef StringValue = "925";
-  FooVar.setValue(ExpressionValue(925u), StringValue);
-  Value = FooVar.getValue();
-  ASSERT_TRUE(Value);
-  EXPECT_EQ(925, cantFail(Value->getSignedValue()));
-  // getStringValue should return the same memory not just the same characters.
-  EXPECT_EQ(StringValue.begin(), FooVar.getStringValue().getValue().begin());
-  EXPECT_EQ(StringValue.end(), FooVar.getStringValue().getValue().end());
-  EvalResult = FooVarUse.eval();
-  ASSERT_THAT_EXPECTED(EvalResult, Succeeded());
-  EXPECT_EQ(925, cantFail(EvalResult->getSignedValue()));
-  EXPECT_EQ(925, cantFail(EvalResult->getSignedValue()));
-
-  // Clearing variable: getValue and eval fail. Error returned by eval holds
-  // the name of the cleared variable.
-  FooVar.clearValue();
-  EXPECT_FALSE(FooVar.getValue());
-  EXPECT_FALSE(FooVar.getStringValue());
-  EvalResult = FooVarUse.eval();
-  expectUndefErrors({"FOO"}, EvalResult.takeError());
-}
-
-TEST_F(FileCheckTest, Binop) {
-  SourceMgr SM;
-
-  StringRef ExprStr = bufferize(SM, "FOO+BAR");
-  StringRef FooStr = ExprStr.take_front(3);
-  NumericVariable FooVar(FooStr,
-                         ExpressionFormat(ExpressionFormat::Kind::Unsigned), 1);
-  FooVar.setValue(ExpressionValue(42u));
-  std::unique_ptr<NumericVariableUse> FooVarUse =
-      std::make_unique<NumericVariableUse>(FooStr, &FooVar);
-  StringRef BarStr = ExprStr.take_back(3);
-  NumericVariable BarVar(BarStr,
-                         ExpressionFormat(ExpressionFormat::Kind::Unsigned), 2);
-  BarVar.setValue(ExpressionValue(18u));
-  std::unique_ptr<NumericVariableUse> BarVarUse =
-      std::make_unique<NumericVariableUse>(BarStr, &BarVar);
-  binop_eval_t doAdd = operator+;
-  BinaryOperation Binop(ExprStr, doAdd, std::move(FooVarUse),
-                        std::move(BarVarUse));
-
-  // Defined variables: eval returns right value; implicit format is as
-  // expected.
-  Expected<ExpressionValue> Value = Binop.eval();
-  ASSERT_THAT_EXPECTED(Value, Succeeded());
-  EXPECT_EQ(60, cantFail(Value->getSignedValue()));
-  Expected<ExpressionFormat> ImplicitFormat = Binop.getImplicitFormat(SM);
-  ASSERT_THAT_EXPECTED(ImplicitFormat, Succeeded());
-  EXPECT_EQ(*ImplicitFormat, ExpressionFormat::Kind::Unsigned);
-
-  // 1 undefined variable: eval fails, error contains name of undefined
-  // variable.
-  FooVar.clearValue();
-  Value = Binop.eval();
-  expectUndefErrors({"FOO"}, Value.takeError());
-
-  // 2 undefined variables: eval fails, error contains names of all undefined
-  // variables.
-  BarVar.clearValue();
-  Value = Binop.eval();
-  expectUndefErrors({"FOO", "BAR"}, Value.takeError());
-
-  // Literal + Variable has format of variable.
-  ExprStr = bufferize(SM, "FOO+18");
-  FooStr = ExprStr.take_front(3);
-  StringRef EighteenStr = ExprStr.take_back(2);
-  FooVarUse = std::make_unique<NumericVariableUse>(FooStr, &FooVar);
-  std::unique_ptr<ExpressionLiteral> Eighteen =
-      std::make_unique<ExpressionLiteral>(EighteenStr, 18u);
-  Binop = BinaryOperation(ExprStr, doAdd, std::move(FooVarUse),
-                          std::move(Eighteen));
-  ImplicitFormat = Binop.getImplicitFormat(SM);
-  ASSERT_THAT_EXPECTED(ImplicitFormat, Succeeded());
-  EXPECT_EQ(*ImplicitFormat, ExpressionFormat::Kind::Unsigned);
-  ExprStr = bufferize(SM, "18+FOO");
-  FooStr = ExprStr.take_back(3);
-  EighteenStr = ExprStr.take_front(2);
-  FooVarUse = std::make_unique<NumericVariableUse>(FooStr, &FooVar);
-  Eighteen = std::make_unique<ExpressionLiteral>(EighteenStr, 18u);
-  Binop = BinaryOperation(ExprStr, doAdd, std::move(Eighteen),
-                          std::move(FooVarUse));
-  ImplicitFormat = Binop.getImplicitFormat(SM);
-  ASSERT_THAT_EXPECTED(ImplicitFormat, Succeeded());
-  EXPECT_EQ(*ImplicitFormat, ExpressionFormat::Kind::Unsigned);
-
-  // Variables with different implicit format conflict.
-  ExprStr = bufferize(SM, "FOO+BAZ");
-  FooStr = ExprStr.take_front(3);
-  StringRef BazStr = ExprStr.take_back(3);
-  NumericVariable BazVar(BazStr,
-                         ExpressionFormat(ExpressionFormat::Kind::HexLower), 3);
-  FooVarUse = std::make_unique<NumericVariableUse>(FooStr, &FooVar);
-  std::unique_ptr<NumericVariableUse> BazVarUse =
-      std::make_unique<NumericVariableUse>(BazStr, &BazVar);
-  Binop = BinaryOperation(ExprStr, doAdd, std::move(FooVarUse),
-                          std::move(BazVarUse));
-  ImplicitFormat = Binop.getImplicitFormat(SM);
-  expectDiagnosticError(
-      "implicit format conflict between 'FOO' (%u) and 'BAZ' (%x), "
-      "need an explicit format specifier",
-      ImplicitFormat.takeError());
-
-  // All variable conflicts are reported.
-  ExprStr = bufferize(SM, "(FOO+BAZ)+(FOO+QUUX)");
-  StringRef Paren1ExprStr = ExprStr.substr(1, 7);
-  FooStr = Paren1ExprStr.take_front(3);
-  BazStr = Paren1ExprStr.take_back(3);
-  StringRef Paren2ExprStr = ExprStr.substr(ExprStr.rfind('(') + 1, 8);
-  StringRef FooStr2 = Paren2ExprStr.take_front(3);
-  StringRef QuuxStr = Paren2ExprStr.take_back(4);
-  FooVarUse = std::make_unique<NumericVariableUse>(FooStr, &FooVar);
-  BazVarUse = std::make_unique<NumericVariableUse>(BazStr, &BazVar);
-  std::unique_ptr<NumericVariableUse> FooVarUse2 =
-      std::make_unique<NumericVariableUse>(FooStr2, &FooVar);
-  NumericVariable QuuxVar(
-      QuuxStr, ExpressionFormat(ExpressionFormat::Kind::HexLower), 4);
-  std::unique_ptr<NumericVariableUse> QuuxVarUse =
-      std::make_unique<NumericVariableUse>(QuuxStr, &QuuxVar);
-  std::unique_ptr<BinaryOperation> Binop1 = std::make_unique<BinaryOperation>(
-      ExprStr.take_front(9), doAdd, std::move(FooVarUse), std::move(BazVarUse));
-  std::unique_ptr<BinaryOperation> Binop2 = std::make_unique<BinaryOperation>(
-      ExprStr.take_back(10), doAdd, std::move(FooVarUse2),
-      std::move(QuuxVarUse));
-  std::unique_ptr<BinaryOperation> OuterBinop =
-      std::make_unique<BinaryOperation>(ExprStr, doAdd, std::move(Binop1),
-                                        std::move(Binop2));
-  ImplicitFormat = OuterBinop->getImplicitFormat(SM);
-  expectSameErrors<ErrorDiagnostic>(
-      {("implicit format conflict between 'FOO' (%u) and 'BAZ' (%x), need an "
-       "explicit format specifier"),
-       ("implicit format conflict between 'FOO' (%u) and 'QUUX' (%x), need an "
-       "explicit format specifier")},
-      ImplicitFormat.takeError());
-}
-
-TEST_F(FileCheckTest, ValidVarNameStart) {
-  EXPECT_TRUE(Pattern::isValidVarNameStart('a'));
-  EXPECT_TRUE(Pattern::isValidVarNameStart('G'));
-  EXPECT_TRUE(Pattern::isValidVarNameStart('_'));
-  EXPECT_FALSE(Pattern::isValidVarNameStart('2'));
-  EXPECT_FALSE(Pattern::isValidVarNameStart('$'));
-  EXPECT_FALSE(Pattern::isValidVarNameStart('@'));
-  EXPECT_FALSE(Pattern::isValidVarNameStart('+'));
-  EXPECT_FALSE(Pattern::isValidVarNameStart('-'));
-  EXPECT_FALSE(Pattern::isValidVarNameStart(':'));
-}
-
-TEST_F(FileCheckTest, ParseVar) {
-  SourceMgr SM;
-  StringRef OrigVarName = bufferize(SM, "GoodVar42");
-  StringRef VarName = OrigVarName;
-  Expected<Pattern::VariableProperties> ParsedVarResult =
-      Pattern::parseVariable(VarName, SM);
-  ASSERT_THAT_EXPECTED(ParsedVarResult, Succeeded());
-  EXPECT_EQ(ParsedVarResult->Name, OrigVarName);
-  EXPECT_TRUE(VarName.empty());
-  EXPECT_FALSE(ParsedVarResult->IsPseudo);
-
-  VarName = OrigVarName = bufferize(SM, "$GoodGlobalVar");
-  ParsedVarResult = Pattern::parseVariable(VarName, SM);
-  ASSERT_THAT_EXPECTED(ParsedVarResult, Succeeded());
-  EXPECT_EQ(ParsedVarResult->Name, OrigVarName);
-  EXPECT_TRUE(VarName.empty());
-  EXPECT_FALSE(ParsedVarResult->IsPseudo);
-
-  VarName = OrigVarName = bufferize(SM, "@GoodPseudoVar");
-  ParsedVarResult = Pattern::parseVariable(VarName, SM);
-  ASSERT_THAT_EXPECTED(ParsedVarResult, Succeeded());
-  EXPECT_EQ(ParsedVarResult->Name, OrigVarName);
-  EXPECT_TRUE(VarName.empty());
-  EXPECT_TRUE(ParsedVarResult->IsPseudo);
-
-  VarName = bufferize(SM, "42BadVar");
-  ParsedVarResult = Pattern::parseVariable(VarName, SM);
-  expectDiagnosticError("invalid variable name", ParsedVarResult.takeError());
-
-  VarName = bufferize(SM, "$@");
-  ParsedVarResult = Pattern::parseVariable(VarName, SM);
-  expectDiagnosticError("invalid variable name", ParsedVarResult.takeError());
-
-  VarName = OrigVarName = bufferize(SM, "B@dVar");
-  ParsedVarResult = Pattern::parseVariable(VarName, SM);
-  ASSERT_THAT_EXPECTED(ParsedVarResult, Succeeded());
-  EXPECT_EQ(VarName, OrigVarName.substr(1));
-  EXPECT_EQ(ParsedVarResult->Name, "B");
-  EXPECT_FALSE(ParsedVarResult->IsPseudo);
-
-  VarName = OrigVarName = bufferize(SM, "B$dVar");
-  ParsedVarResult = Pattern::parseVariable(VarName, SM);
-  ASSERT_THAT_EXPECTED(ParsedVarResult, Succeeded());
-  EXPECT_EQ(VarName, OrigVarName.substr(1));
-  EXPECT_EQ(ParsedVarResult->Name, "B");
-  EXPECT_FALSE(ParsedVarResult->IsPseudo);
-
-  VarName = bufferize(SM, "BadVar+");
-  ParsedVarResult = Pattern::parseVariable(VarName, SM);
-  ASSERT_THAT_EXPECTED(ParsedVarResult, Succeeded());
-  EXPECT_EQ(VarName, "+");
-  EXPECT_EQ(ParsedVarResult->Name, "BadVar");
-  EXPECT_FALSE(ParsedVarResult->IsPseudo);
-
-  VarName = bufferize(SM, "BadVar-");
-  ParsedVarResult = Pattern::parseVariable(VarName, SM);
-  ASSERT_THAT_EXPECTED(ParsedVarResult, Succeeded());
-  EXPECT_EQ(VarName, "-");
-  EXPECT_EQ(ParsedVarResult->Name, "BadVar");
-  EXPECT_FALSE(ParsedVarResult->IsPseudo);
-
-  VarName = bufferize(SM, "BadVar:");
-  ParsedVarResult = Pattern::parseVariable(VarName, SM);
-  ASSERT_THAT_EXPECTED(ParsedVarResult, Succeeded());
-  EXPECT_EQ(VarName, ":");
-  EXPECT_EQ(ParsedVarResult->Name, "BadVar");
-  EXPECT_FALSE(ParsedVarResult->IsPseudo);
-}
-
-static void expectNotFoundError(Error Err) {
-  expectError<NotFoundError>("String not found in input", std::move(Err));
-}
-
-class PatternTester {
-private:
-  size_t LineNumber = 1;
-  SourceMgr SM;
-  FileCheckRequest Req;
-  FileCheckPatternContext Context;
-  Pattern P{Check::CheckPlain, &Context, LineNumber};
-
-public:
-  PatternTester() {
-    std::vector<StringRef> GlobalDefines = {"#FOO=42", "BAR=BAZ", "#add=7"};
-    // An ASSERT_FALSE would make more sense but cannot be used in a
-    // constructor.
-    EXPECT_THAT_ERROR(Context.defineCmdlineVariables(GlobalDefines, SM),
-                      Succeeded());
-    Context.createLineVariable();
-    // Call parsePattern to have @LINE defined.
-    P.parsePattern("N/A", "CHECK", SM, Req);
-    // parsePattern does not expect to be called twice for the same line and
-    // will set FixedStr and RegExStr incorrectly if it is. Therefore prepare
-    // a pattern for a different line.
-    initNextPattern();
-  }
-
-  void initNextPattern() {
-    P = Pattern(Check::CheckPlain, &Context, ++LineNumber);
-  }
-
-  size_t getLineNumber() const { return LineNumber; }
-
-  Expected<std::unique_ptr<Expression>>
-  parseSubst(StringRef Expr, bool IsLegacyLineExpr = false) {
-    StringRef ExprBufferRef = bufferize(SM, Expr);
-    Optional<NumericVariable *> DefinedNumericVariable;
-    return P.parseNumericSubstitutionBlock(
-        ExprBufferRef, DefinedNumericVariable, IsLegacyLineExpr, LineNumber,
-        &Context, SM);
-  }
-
-  bool parsePattern(StringRef Pattern) {
-    StringRef PatBufferRef = bufferize(SM, Pattern);
-    return P.parsePattern(PatBufferRef, "CHECK", SM, Req);
-  }
-
-  Expected<size_t> match(StringRef Buffer) {
-    StringRef BufferRef = bufferize(SM, Buffer);
-    Pattern::MatchResult Res = P.match(BufferRef, SM);
-    if (Res.TheError)
-      return std::move(Res.TheError);
-    return Res.TheMatch->Pos;
-  }
-
-  void printVariableDefs(FileCheckDiag::MatchType MatchTy,
-                         std::vector<FileCheckDiag> &Diags) {
-    P.printVariableDefs(SM, MatchTy, &Diags);
-  }
-};
-
-TEST_F(FileCheckTest, ParseNumericSubstitutionBlock) {
-  PatternTester Tester;
-
-  // Variable definition.
-
-  expectDiagnosticError("invalid variable name",
-                        Tester.parseSubst("%VAR:").takeError());
-
-  expectDiagnosticError("definition of pseudo numeric variable unsupported",
-                        Tester.parseSubst("@LINE:").takeError());
-
-  expectDiagnosticError("string variable with name 'BAR' already exists",
-                        Tester.parseSubst("BAR:").takeError());
-
-  expectDiagnosticError("unexpected characters after numeric variable name",
-                        Tester.parseSubst("VAR GARBAGE:").takeError());
-
-  // Change of format.
-  expectDiagnosticError("format different from previous variable definition",
-                        Tester.parseSubst("%X,FOO:").takeError());
-
-  // Invalid format.
-  expectDiagnosticError("invalid matching format specification in expression",
-                        Tester.parseSubst("X,VAR1:").takeError());
-  expectDiagnosticError("invalid format specifier in expression",
-                        Tester.parseSubst("%F,VAR1:").takeError());
-  expectDiagnosticError("invalid matching format specification in expression",
-                        Tester.parseSubst("%X a,VAR1:").takeError());
-
-  // Acceptable variable definition.
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("VAR1:"), Succeeded());
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("  VAR2:"), Succeeded());
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("VAR3  :"), Succeeded());
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("VAR3:  "), Succeeded());
-
-  // Acceptable variable definition with format specifier. Use parsePattern for
-  // variables whose definition needs to be visible for later checks.
-  EXPECT_FALSE(Tester.parsePattern("[[#%u, VAR_UNSIGNED:]]"));
-  EXPECT_FALSE(Tester.parsePattern("[[#%x, VAR_LOWER_HEX:]]"));
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("%X, VAR_UPPER_HEX:"), Succeeded());
-
-  // Acceptable variable definition with precision specifier.
-  EXPECT_FALSE(Tester.parsePattern("[[#%.8X, PADDED_ADDR:]]"));
-  EXPECT_FALSE(Tester.parsePattern("[[#%.8, PADDED_NUM:]]"));
-
-  // Acceptable variable definition in alternate form.
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("%#x, PREFIXED_ADDR:"), Succeeded());
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("%#X, PREFIXED_ADDR:"), Succeeded());
-
-  // Acceptable variable definition in alternate form.
-  expectDiagnosticError("alternate form only supported for hex values",
-                        Tester.parseSubst("%#u, PREFIXED_UNSI:").takeError());
-  expectDiagnosticError("alternate form only supported for hex values",
-                        Tester.parseSubst("%#d, PREFIXED_UNSI:").takeError());
-
-  // Acceptable variable definition from a numeric expression.
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("FOOBAR: FOO+1"), Succeeded());
-
-  // Numeric expression. Switch to next line to make above valid definition
-  // available in expressions.
-  Tester.initNextPattern();
-
-  // Invalid variable name.
-  expectDiagnosticError("invalid matching constraint or operand format",
-                        Tester.parseSubst("%VAR").takeError());
-
-  expectDiagnosticError("invalid pseudo numeric variable '@FOO'",
-                        Tester.parseSubst("@FOO").takeError());
-
-  // parsePattern() is used here instead of parseSubst() for the variable to be
-  // recorded in GlobalNumericVariableTable and thus appear defined to
-  // parseNumericVariableUse(). Note that the same pattern object is used for
-  // the parsePattern() and parseSubst() since no initNextPattern() is called,
-  // thus appearing as being on the same line from the pattern's point of view.
-  ASSERT_FALSE(Tester.parsePattern("[[#SAME_LINE_VAR:]]"));
-  expectDiagnosticError("numeric variable 'SAME_LINE_VAR' defined earlier in "
-                        "the same CHECK directive",
-                        Tester.parseSubst("SAME_LINE_VAR").takeError());
-
-  // Invalid use of variable defined on the same line from an expression not
-  // using any variable defined on the same line.
-  ASSERT_FALSE(Tester.parsePattern("[[#SAME_LINE_EXPR_VAR:@LINE+1]]"));
-  expectDiagnosticError("numeric variable 'SAME_LINE_EXPR_VAR' defined earlier "
-                        "in the same CHECK directive",
-                        Tester.parseSubst("SAME_LINE_EXPR_VAR").takeError());
-
-  // Valid use of undefined variable which creates the variable and record it
-  // in GlobalNumericVariableTable.
-  ASSERT_THAT_EXPECTED(Tester.parseSubst("UNDEF"), Succeeded());
-  EXPECT_TRUE(Tester.parsePattern("[[UNDEF:.*]]"));
-
-  // Invalid literal.
-  expectDiagnosticError("unsupported operation 'U'",
-                        Tester.parseSubst("42U").takeError());
-
-  // Valid empty expression.
-  EXPECT_THAT_EXPECTED(Tester.parseSubst(""), Succeeded());
-
-  // Invalid equality matching constraint with empty expression.
-  expectDiagnosticError("empty numeric expression should not have a constraint",
-                        Tester.parseSubst("==").takeError());
-
-  // Valid single operand expression.
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("FOO"), Succeeded());
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("18"), Succeeded());
-  EXPECT_THAT_EXPECTED(Tester.parseSubst(std::to_string(MaxUint64)),
-                       Succeeded());
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("0x12"), Succeeded());
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("-30"), Succeeded());
-  EXPECT_THAT_EXPECTED(Tester.parseSubst(std::to_string(MinInt64)),
-                       Succeeded());
-
-  // Valid optional matching constraint.
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("==FOO"), Succeeded());
-
-  // Invalid matching constraint.
-  expectDiagnosticError("invalid matching constraint or operand format",
-                        Tester.parseSubst("+=FOO").takeError());
-
-  // Invalid format.
-  expectDiagnosticError("invalid matching format specification in expression",
-                        Tester.parseSubst("X,FOO:").takeError());
-  expectDiagnosticError("invalid format specifier in expression",
-                        Tester.parseSubst("%F,FOO").takeError());
-  expectDiagnosticError("invalid matching format specification in expression",
-                        Tester.parseSubst("%X a,FOO").takeError());
-
-  // Valid expression with 2 or more operands.
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("FOO+3"), Succeeded());
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("FOO+0xC"), Succeeded());
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("FOO-3+FOO"), Succeeded());
-
-  expectDiagnosticError("unsupported operation '/'",
-                        Tester.parseSubst("@LINE/2").takeError());
-
-  expectDiagnosticError("missing operand in expression",
-                        Tester.parseSubst("@LINE+").takeError());
-
-  // Errors in RHS operand are bubbled up by parseBinop() to
-  // parseNumericSubstitutionBlock().
-  expectDiagnosticError("invalid operand format",
-                        Tester.parseSubst("@LINE+%VAR").takeError());
-
-  // Invalid legacy @LINE expression with non literal rhs.
-  expectDiagnosticError(
-      "invalid operand format",
-      Tester.parseSubst("@LINE+@LINE", /*IsLegacyNumExpr=*/true).takeError());
-
-  // Invalid legacy @LINE expression made of a single literal.
-  expectDiagnosticError(
-      "invalid variable name",
-      Tester.parseSubst("2", /*IsLegacyNumExpr=*/true).takeError());
-
-  // Invalid hex literal in legacy @LINE expression.
-  expectDiagnosticError(
-      "unexpected characters at end of expression 'xC'",
-      Tester.parseSubst("@LINE+0xC", /*LegacyLineExpr=*/true).takeError());
-
-  // Valid expression with format specifier.
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("%u, FOO"), Succeeded());
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("%d, FOO"), Succeeded());
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("%x, FOO"), Succeeded());
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("%X, FOO"), Succeeded());
-
-  // Valid expression with precision specifier.
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("%.8u, FOO"), Succeeded());
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("%.8, FOO"), Succeeded());
-
-  // Valid legacy @LINE expression.
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("@LINE+2", /*IsLegacyNumExpr=*/true),
-                       Succeeded());
-
-  // Invalid legacy @LINE expression with more than 2 operands.
-  expectDiagnosticError(
-      "unexpected characters at end of expression '+@LINE'",
-      Tester.parseSubst("@LINE+2+@LINE", /*IsLegacyNumExpr=*/true).takeError());
-  expectDiagnosticError(
-      "unexpected characters at end of expression '+2'",
-      Tester.parseSubst("@LINE+2+2", /*IsLegacyNumExpr=*/true).takeError());
-
-  // Valid expression with several variables when their implicit formats do not
-  // conflict.
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("FOO+VAR_UNSIGNED"), Succeeded());
-
-  // Valid implicit format conflict in presence of explicit formats.
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("%X,FOO+VAR_LOWER_HEX"), Succeeded());
-
-  // Implicit format conflict.
-  expectDiagnosticError(
-      "implicit format conflict between 'FOO' (%u) and "
-      "'VAR_LOWER_HEX' (%x), need an explicit format specifier",
-      Tester.parseSubst("FOO+VAR_LOWER_HEX").takeError());
-
-  // Simple parenthesized expressions:
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("(1)"), Succeeded());
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("(1+1)"), Succeeded());
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("(1)+1"), Succeeded());
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("((1)+1)"), Succeeded());
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("((1)+X)"), Succeeded());
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("((X)+Y)"), Succeeded());
-
-  expectDiagnosticError("missing operand in expression",
-                        Tester.parseSubst("(").takeError());
-  expectDiagnosticError("missing ')' at end of nested expression",
-                        Tester.parseSubst("(1").takeError());
-  expectDiagnosticError("missing operand in expression",
-                        Tester.parseSubst("(1+").takeError());
-  expectDiagnosticError("missing ')' at end of nested expression",
-                        Tester.parseSubst("(1+1").takeError());
-  expectDiagnosticError("missing ')' at end of nested expression",
-                        Tester.parseSubst("((1+2+3").takeError());
-  expectDiagnosticError("missing ')' at end of nested expression",
-                        Tester.parseSubst("((1+2)+3").takeError());
-
-  // Test missing operation between operands:
-  expectDiagnosticError("unsupported operation '('",
-                        Tester.parseSubst("(1)(2)").takeError());
-  expectDiagnosticError("unsupported operation '('",
-                        Tester.parseSubst("2(X)").takeError());
-
-  // Test more closing than opening parentheses. The diagnostic messages are
-  // not ideal, but for now simply check that we reject invalid input.
-  expectDiagnosticError("invalid matching constraint or operand format",
-                        Tester.parseSubst(")").takeError());
-  expectDiagnosticError("unsupported operation ')'",
-                        Tester.parseSubst("1)").takeError());
-  expectDiagnosticError("unsupported operation ')'",
-                        Tester.parseSubst("(1+2))").takeError());
-  expectDiagnosticError("unsupported operation ')'",
-                        Tester.parseSubst("(2))").takeError());
-  expectDiagnosticError("unsupported operation ')'",
-                        Tester.parseSubst("(1))(").takeError());
-
-  // Valid expression with function call.
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("add(FOO,3)"), Succeeded());
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("add (FOO,3)"), Succeeded());
-  // Valid expression with nested function call.
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("add(FOO, min(BAR,10))"), Succeeded());
-  // Valid expression with function call taking expression as argument.
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("add(FOO, (BAR+10) + 3)"),
-                       Succeeded());
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("add(FOO, min (BAR,10) + 3)"),
-                       Succeeded());
-  // Valid expression with variable named the same as a function.
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("add"), Succeeded());
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("add+FOO"), Succeeded());
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("FOO+add"), Succeeded());
-  EXPECT_THAT_EXPECTED(Tester.parseSubst("add(add,add)+add"), Succeeded());
-
-  // Malformed call syntax.
-  expectDiagnosticError("missing ')' at end of call expression",
-                        Tester.parseSubst("add(FOO,(BAR+7)").takeError());
-  expectDiagnosticError("missing ')' at end of call expression",
-                        Tester.parseSubst("add(FOO,min(BAR,7)").takeError());
-  expectDiagnosticError("missing argument",
-                        Tester.parseSubst("add(FOO,)").takeError());
-  expectDiagnosticError("missing argument",
-                        Tester.parseSubst("add(,FOO)").takeError());
-  expectDiagnosticError("missing argument",
-                        Tester.parseSubst("add(FOO,,3)").takeError());
-
-  // Valid call, but to an unknown function.
-  expectDiagnosticError("call to undefined function 'bogus_function'",
-                        Tester.parseSubst("bogus_function(FOO,3)").takeError());
-  expectDiagnosticError("call to undefined function '@add'",
-                        Tester.parseSubst("@add(2,3)").takeError());
-  expectDiagnosticError("call to undefined function '$add'",
-                        Tester.parseSubst("$add(2,3)").takeError());
-  expectDiagnosticError("call to undefined function 'FOO'",
-                        Tester.parseSubst("FOO(2,3)").takeError());
-  expectDiagnosticError("call to undefined function 'FOO'",
-                        Tester.parseSubst("FOO (2,3)").takeError());
-
-  // Valid call, but with incorrect argument count.
-  expectDiagnosticError("function 'add' takes 2 arguments but 1 given",
-                        Tester.parseSubst("add(FOO)").takeError());
-  expectDiagnosticError("function 'add' takes 2 arguments but 3 given",
-                        Tester.parseSubst("add(FOO,3,4)").takeError());
-
-  // Valid call, but not part of a valid expression.
-  expectDiagnosticError("unsupported operation 'a'",
-                        Tester.parseSubst("2add(FOO,2)").takeError());
-  expectDiagnosticError("unsupported operation 'a'",
-                        Tester.parseSubst("FOO add(FOO,2)").takeError());
-  expectDiagnosticError("unsupported operation 'a'",
-                        Tester.parseSubst("add(FOO,2)add(FOO,2)").takeError());
-}
-
-TEST_F(FileCheckTest, ParsePattern) {
-  PatternTester Tester;
-
-  // Invalid space in string substitution.
-  EXPECT_TRUE(Tester.parsePattern("[[ BAR]]"));
-
-  // Invalid variable name in string substitution.
-  EXPECT_TRUE(Tester.parsePattern("[[42INVALID]]"));
-
-  // Invalid string variable definition.
-  EXPECT_TRUE(Tester.parsePattern("[[@PAT:]]"));
-  EXPECT_TRUE(Tester.parsePattern("[[PAT+2:]]"));
-
-  // Collision with numeric variable.
-  EXPECT_TRUE(Tester.parsePattern("[[FOO:]]"));
-
-  // Invalid use of string variable.
-  EXPECT_TRUE(Tester.parsePattern("[[FOO-BAR]]"));
-
-  // Valid use of string variable.
-  EXPECT_FALSE(Tester.parsePattern("[[BAR]]"));
-
-  // Valid string variable definition.
-  EXPECT_FALSE(Tester.parsePattern("[[PAT:[0-9]+]]"));
-
-  // Invalid numeric substitution.
-  EXPECT_TRUE(Tester.parsePattern("[[#42INVALID]]"));
-
-  // Valid numeric substitution.
-  EXPECT_FALSE(Tester.parsePattern("[[#FOO]]"));
-
-  // Valid legacy @LINE expression.
-  EXPECT_FALSE(Tester.parsePattern("[[@LINE+2]]"));
-
-  // Invalid legacy @LINE expression with non decimal literal.
-  EXPECT_TRUE(Tester.parsePattern("[[@LINE+0x3]]"));
-}
-
-TEST_F(FileCheckTest, Match) {
-  PatternTester Tester;
-
-  // Check a substitution error is diagnosed.
-  ASSERT_FALSE(Tester.parsePattern("[[#%u, -1]]"));
-  expectDiagnosticError(
-      "unable to substitute variable or numeric expression: overflow error",
-      Tester.match("").takeError());
-
-  // Check matching an empty expression only matches a number.
-  Tester.initNextPattern();
-  ASSERT_FALSE(Tester.parsePattern("[[#]]"));
-  expectNotFoundError(Tester.match("FAIL").takeError());
-  EXPECT_THAT_EXPECTED(Tester.match("18"), Succeeded());
-
-  // Check matching a definition only matches a number with the right format.
-  Tester.initNextPattern();
-  ASSERT_FALSE(Tester.parsePattern("[[#NUMVAR:]]"));
-  expectNotFoundError(Tester.match("FAIL").takeError());
-  expectNotFoundError(Tester.match("").takeError());
-  EXPECT_THAT_EXPECTED(Tester.match("18"), Succeeded());
-  Tester.initNextPattern();
-  Tester.parsePattern("[[#%u,NUMVAR_UNSIGNED:]]");
-  expectNotFoundError(Tester.match("C").takeError());
-  EXPECT_THAT_EXPECTED(Tester.match("20"), Succeeded());
-  Tester.initNextPattern();
-  Tester.parsePattern("[[#%x,NUMVAR_LOWER_HEX:]]");
-  expectNotFoundError(Tester.match("g").takeError());
-  expectNotFoundError(Tester.match("C").takeError());
-  EXPECT_THAT_EXPECTED(Tester.match("c"), Succeeded());
-  Tester.initNextPattern();
-  Tester.parsePattern("[[#%X,NUMVAR_UPPER_HEX:]]");
-  expectNotFoundError(Tester.match("H").takeError());
-  expectNotFoundError(Tester.match("b").takeError());
-  EXPECT_THAT_EXPECTED(Tester.match("B"), Succeeded());
-
-  // Check matching expressions with no explicit format matches the values in
-  // the right format.
-  Tester.initNextPattern();
-  Tester.parsePattern("[[#NUMVAR_UNSIGNED-5]]");
-  expectNotFoundError(Tester.match("f").takeError());
-  expectNotFoundError(Tester.match("F").takeError());
-  EXPECT_THAT_EXPECTED(Tester.match("15"), Succeeded());
-  Tester.initNextPattern();
-  Tester.parsePattern("[[#NUMVAR_LOWER_HEX+1]]");
-  expectNotFoundError(Tester.match("13").takeError());
-  expectNotFoundError(Tester.match("D").takeError());
-  EXPECT_THAT_EXPECTED(Tester.match("d"), Succeeded());
-  Tester.initNextPattern();
-  Tester.parsePattern("[[#NUMVAR_UPPER_HEX+1]]");
-  expectNotFoundError(Tester.match("12").takeError());
-  expectNotFoundError(Tester.match("c").takeError());
-  EXPECT_THAT_EXPECTED(Tester.match("C"), Succeeded());
-
-  // Check matching an undefined variable returns a NotFound error.
-  Tester.initNextPattern();
-  ASSERT_FALSE(Tester.parsePattern("100"));
-  expectNotFoundError(Tester.match("101").takeError());
-
-  // Check matching the defined variable matches the correct number only.
-  Tester.initNextPattern();
-  ASSERT_FALSE(Tester.parsePattern("[[#NUMVAR]]"));
-  EXPECT_THAT_EXPECTED(Tester.match("18"), Succeeded());
-
-  // Check matching several substitutions does not match them independently.
-  Tester.initNextPattern();
-  ASSERT_FALSE(Tester.parsePattern("[[#NUMVAR]] [[#NUMVAR+2]]"));
-  expectNotFoundError(Tester.match("19 21").takeError());
-  expectNotFoundError(Tester.match("18 21").takeError());
-  EXPECT_THAT_EXPECTED(Tester.match("18 20"), Succeeded());
-
-  // Check matching a numeric expression using @LINE after a match failure uses
-  // the correct value for @LINE.
-  Tester.initNextPattern();
-  ASSERT_FALSE(Tester.parsePattern("[[#@LINE]]"));
-  // Ok, @LINE matches the current line number.
-  EXPECT_THAT_EXPECTED(Tester.match(std::to_string(Tester.getLineNumber())),
-                       Succeeded());
-  Tester.initNextPattern();
-  // Match with substitution failure.
-  ASSERT_FALSE(Tester.parsePattern("[[#UNKNOWN1+UNKNOWN2]]"));
-  expectSameErrors<ErrorDiagnostic>(
-      {"undefined variable: UNKNOWN1", "undefined variable: UNKNOWN2"},
-      Tester.match("FOO").takeError());
-  Tester.initNextPattern();
-  // Check that @LINE matches the later (given the calls to initNextPattern())
-  // line number.
-  EXPECT_FALSE(Tester.parsePattern("[[#@LINE]]"));
-  EXPECT_THAT_EXPECTED(Tester.match(std::to_string(Tester.getLineNumber())),
-                       Succeeded());
-}
-
-TEST_F(FileCheckTest, MatchParen) {
-  PatternTester Tester;
-  // Check simple parenthesized expressions
-  Tester.initNextPattern();
-  ASSERT_FALSE(Tester.parsePattern("[[#NUMVAR:]]"));
-  expectNotFoundError(Tester.match("FAIL").takeError());
-  expectNotFoundError(Tester.match("").takeError());
-  EXPECT_THAT_EXPECTED(Tester.match("18"), Succeeded());
-
-  Tester.initNextPattern();
-  ASSERT_FALSE(Tester.parsePattern("[[#NUMVAR + (2 + 2)]]"));
-  expectNotFoundError(Tester.match("21").takeError());
-  EXPECT_THAT_EXPECTED(Tester.match("22"), Succeeded());
-  Tester.initNextPattern();
-  ASSERT_FALSE(Tester.parsePattern("[[#NUMVAR + (2)]]"));
-  EXPECT_THAT_EXPECTED(Tester.match("20"), Succeeded());
-  Tester.initNextPattern();
-  ASSERT_FALSE(Tester.parsePattern("[[#NUMVAR+(2)]]"));
-  EXPECT_THAT_EXPECTED(Tester.match("20"), Succeeded());
-  Tester.initNextPattern();
-  ASSERT_FALSE(Tester.parsePattern("[[#NUMVAR+(NUMVAR)]]"));
-  EXPECT_THAT_EXPECTED(Tester.match("36"), Succeeded());
-
-  // Check nested parenthesized expressions:
-  Tester.initNextPattern();
-  ASSERT_FALSE(Tester.parsePattern("[[#NUMVAR+(2+(2))]]"));
-  EXPECT_THAT_EXPECTED(Tester.match("22"), Succeeded());
-  Tester.initNextPattern();
-  ASSERT_FALSE(Tester.parsePattern("[[#NUMVAR+(2+(NUMVAR))]]"));
-  EXPECT_THAT_EXPECTED(Tester.match("38"), Succeeded());
-  Tester.initNextPattern();
-  ASSERT_FALSE(Tester.parsePattern("[[#NUMVAR+((((NUMVAR))))]]"));
-  EXPECT_THAT_EXPECTED(Tester.match("36"), Succeeded());
-  Tester.initNextPattern();
-  ASSERT_FALSE(Tester.parsePattern("[[#NUMVAR+((((NUMVAR)))-1)-1]]"));
-  EXPECT_THAT_EXPECTED(Tester.match("34"), Succeeded());
-
-  // Parentheses can also be the first character after the '#':
-  Tester.initNextPattern();
-  ASSERT_FALSE(Tester.parsePattern("[[#(NUMVAR)]]"));
-  EXPECT_THAT_EXPECTED(Tester.match("18"), Succeeded());
-  Tester.initNextPattern();
-  ASSERT_FALSE(Tester.parsePattern("[[#(NUMVAR+2)]]"));
-  EXPECT_THAT_EXPECTED(Tester.match("20"), Succeeded());
-}
-
-TEST_F(FileCheckTest, MatchBuiltinFunctions) {
-  PatternTester Tester;
-  // Esnure #NUMVAR has the expected value.
-  Tester.initNextPattern();
-  ASSERT_FALSE(Tester.parsePattern("[[#NUMVAR:]]"));
-  expectNotFoundError(Tester.match("FAIL").takeError());
-  expectNotFoundError(Tester.match("").takeError());
-  EXPECT_THAT_EXPECTED(Tester.match("18"), Succeeded());
-
-  // Check each builtin function generates the expected result.
-  Tester.initNextPattern();
-  ASSERT_FALSE(Tester.parsePattern("[[#add(NUMVAR,13)]]"));
-  EXPECT_THAT_EXPECTED(Tester.match("31"), Succeeded());
-  Tester.initNextPattern();
-  ASSERT_FALSE(Tester.parsePattern("[[#div(NUMVAR,3)]]"));
-  EXPECT_THAT_EXPECTED(Tester.match("6"), Succeeded());
-  Tester.initNextPattern();
-  ASSERT_FALSE(Tester.parsePattern("[[#max(NUMVAR,5)]]"));
-  EXPECT_THAT_EXPECTED(Tester.match("18"), Succeeded());
-  Tester.initNextPattern();
-  ASSERT_FALSE(Tester.parsePattern("[[#max(NUMVAR,99)]]"));
-  EXPECT_THAT_EXPECTED(Tester.match("99"), Succeeded());
-  Tester.initNextPattern();
-  ASSERT_FALSE(Tester.parsePattern("[[#min(NUMVAR,5)]]"));
-  EXPECT_THAT_EXPECTED(Tester.match("5"), Succeeded());
-  Tester.initNextPattern();
-  ASSERT_FALSE(Tester.parsePattern("[[#min(NUMVAR,99)]]"));
-  EXPECT_THAT_EXPECTED(Tester.match("18"), Succeeded());
-  Tester.initNextPattern();
-  ASSERT_FALSE(Tester.parsePattern("[[#mul(NUMVAR,3)]]"));
-  EXPECT_THAT_EXPECTED(Tester.match("54"), Succeeded());
-  Tester.initNextPattern();
-  ASSERT_FALSE(Tester.parsePattern("[[#sub(NUMVAR,7)]]"));
-  EXPECT_THAT_EXPECTED(Tester.match("11"), Succeeded());
-
-  // Check nested function calls.
-  Tester.initNextPattern();
-  ASSERT_FALSE(Tester.parsePattern("[[#add(min(7,2),max(4,10))]]"));
-  EXPECT_THAT_EXPECTED(Tester.match("12"), Succeeded());
-
-  // Check function call that uses a variable of the same name.
-  Tester.initNextPattern();
-  ASSERT_FALSE(Tester.parsePattern("[[#add(add,add)+min (add,3)+add]]"));
-  EXPECT_THAT_EXPECTED(Tester.match("24"), Succeeded());
-}
-
-TEST_F(FileCheckTest, Substitution) {
-  SourceMgr SM;
-  FileCheckPatternContext Context;
-  EXPECT_THAT_ERROR(Context.defineCmdlineVariables({"FOO=BAR"}, SM),
-                    Succeeded());
-
-  // Substitution of an undefined string variable fails and error holds that
-  // variable's name.
-  StringSubstitution StringSubstitution(&Context, "VAR404", 42);
-  Expected<std::string> SubstValue = StringSubstitution.getResult();
-  expectUndefErrors({"VAR404"}, SubstValue.takeError());
-
-  // Numeric substitution blocks constituted of defined numeric variables are
-  // substituted for the variable's value.
-  NumericVariable NVar("N", ExpressionFormat(ExpressionFormat::Kind::Unsigned),
-                       1);
-  NVar.setValue(ExpressionValue(10u));
-  auto NVarUse = std::make_unique<NumericVariableUse>("N", &NVar);
-  auto ExpressionN = std::make_unique<Expression>(
-      std::move(NVarUse), ExpressionFormat(ExpressionFormat::Kind::HexUpper));
-  NumericSubstitution SubstitutionN(&Context, "N", std::move(ExpressionN),
-                                    /*InsertIdx=*/30);
-  SubstValue = SubstitutionN.getResult();
-  ASSERT_THAT_EXPECTED(SubstValue, Succeeded());
-  EXPECT_EQ("A", *SubstValue);
-
-  // Substitution of an undefined numeric variable fails, error holds name of
-  // undefined variable.
-  NVar.clearValue();
-  SubstValue = SubstitutionN.getResult();
-  expectUndefErrors({"N"}, SubstValue.takeError());
-
-  // Substitution of a defined string variable returns the right value.
-  Pattern P(Check::CheckPlain, &Context, 1);
-  StringSubstitution = llvm::StringSubstitution(&Context, "FOO", 42);
-  SubstValue = StringSubstitution.getResult();
-  ASSERT_THAT_EXPECTED(SubstValue, Succeeded());
-  EXPECT_EQ("BAR", *SubstValue);
-}
-
-TEST_F(FileCheckTest, FileCheckContext) {
-  FileCheckPatternContext Cxt;
-  SourceMgr SM;
-
-  // No definition.
-  EXPECT_THAT_ERROR(Cxt.defineCmdlineVariables({}, SM), Succeeded());
-
-  // Missing equal sign.
-  expectDiagnosticError("missing equal sign in global definition",
-                        Cxt.defineCmdlineVariables({"LocalVar"}, SM));
-  expectDiagnosticError("missing equal sign in global definition",
-                        Cxt.defineCmdlineVariables({"#LocalNumVar"}, SM));
-
-  // Empty variable name.
-  expectDiagnosticError("empty variable name",
-                        Cxt.defineCmdlineVariables({"=18"}, SM));
-  expectDiagnosticError("empty variable name",
-                        Cxt.defineCmdlineVariables({"#=18"}, SM));
-
-  // Invalid variable name.
-  expectDiagnosticError("invalid variable name",
-                        Cxt.defineCmdlineVariables({"18LocalVar=18"}, SM));
-  expectDiagnosticError("invalid variable name",
-                        Cxt.defineCmdlineVariables({"#18LocalNumVar=18"}, SM));
-
-  // Name conflict between pattern and numeric variable.
-  expectDiagnosticError(
-      "string variable with name 'LocalVar' already exists",
-      Cxt.defineCmdlineVariables({"LocalVar=18", "#LocalVar=36"}, SM));
-  Cxt = FileCheckPatternContext();
-  expectDiagnosticError(
-      "numeric variable with name 'LocalNumVar' already exists",
-      Cxt.defineCmdlineVariables({"#LocalNumVar=18", "LocalNumVar=36"}, SM));
-  Cxt = FileCheckPatternContext();
-
-  // Invalid numeric value for numeric variable.
-  expectUndefErrors({"x"}, Cxt.defineCmdlineVariables({"#LocalNumVar=x"}, SM));
-
-  // Define local variables from command-line.
-  std::vector<StringRef> GlobalDefines;
-  // Clear local variables to remove dummy numeric variable x that
-  // parseNumericSubstitutionBlock would have created and stored in
-  // GlobalNumericVariableTable.
-  Cxt.clearLocalVars();
-  GlobalDefines.emplace_back("LocalVar=FOO");
-  GlobalDefines.emplace_back("EmptyVar=");
-  GlobalDefines.emplace_back("#LocalNumVar1=18");
-  GlobalDefines.emplace_back("#%x,LocalNumVar2=LocalNumVar1+2");
-  GlobalDefines.emplace_back("#LocalNumVar3=0xc");
-  ASSERT_THAT_ERROR(Cxt.defineCmdlineVariables(GlobalDefines, SM), Succeeded());
-
-  // Create @LINE pseudo numeric variable and check it is present by matching
-  // it.
-  size_t LineNumber = 1;
-  Pattern P(Check::CheckPlain, &Cxt, LineNumber);
-  FileCheckRequest Req;
-  Cxt.createLineVariable();
-  ASSERT_FALSE(P.parsePattern("[[@LINE]]", "CHECK", SM, Req));
-  Pattern::MatchResult Res = P.match("1", SM);
-  ASSERT_THAT_ERROR(std::move(Res.TheError), Succeeded());
-
-#ifndef NDEBUG
-  // Recreating @LINE pseudo numeric variable fails.
-  EXPECT_DEATH(Cxt.createLineVariable(),
-               "@LINE pseudo numeric variable already created");
-#endif
-
-  // Check defined variables are present and undefined ones are absent.
-  StringRef LocalVarStr = "LocalVar";
-  StringRef LocalNumVar1Ref = bufferize(SM, "LocalNumVar1");
-  StringRef LocalNumVar2Ref = bufferize(SM, "LocalNumVar2");
-  StringRef LocalNumVar3Ref = bufferize(SM, "LocalNumVar3");
-  StringRef EmptyVarStr = "EmptyVar";
-  StringRef UnknownVarStr = "UnknownVar";
-  Expected<StringRef> LocalVar = Cxt.getPatternVarValue(LocalVarStr);
-  P = Pattern(Check::CheckPlain, &Cxt, ++LineNumber);
-  Optional<NumericVariable *> DefinedNumericVariable;
-  Expected<std::unique_ptr<Expression>> ExpressionPointer =
-      P.parseNumericSubstitutionBlock(LocalNumVar1Ref, DefinedNumericVariable,
-                                      /*IsLegacyLineExpr=*/false, LineNumber,
-                                      &Cxt, SM);
-  ASSERT_THAT_EXPECTED(LocalVar, Succeeded());
-  EXPECT_EQ(*LocalVar, "FOO");
-  Expected<StringRef> EmptyVar = Cxt.getPatternVarValue(EmptyVarStr);
-  Expected<StringRef> UnknownVar = Cxt.getPatternVarValue(UnknownVarStr);
-  ASSERT_THAT_EXPECTED(ExpressionPointer, Succeeded());
-  Expected<ExpressionValue> ExpressionVal =
-      (*ExpressionPointer)->getAST()->eval();
-  ASSERT_THAT_EXPECTED(ExpressionVal, Succeeded());
-  EXPECT_EQ(cantFail(ExpressionVal->getSignedValue()), 18);
-  ExpressionPointer = P.parseNumericSubstitutionBlock(
-      LocalNumVar2Ref, DefinedNumericVariable,
-      /*IsLegacyLineExpr=*/false, LineNumber, &Cxt, SM);
-  ASSERT_THAT_EXPECTED(ExpressionPointer, Succeeded());
-  ExpressionVal = (*ExpressionPointer)->getAST()->eval();
-  ASSERT_THAT_EXPECTED(ExpressionVal, Succeeded());
-  EXPECT_EQ(cantFail(ExpressionVal->getSignedValue()), 20);
-  ExpressionPointer = P.parseNumericSubstitutionBlock(
-      LocalNumVar3Ref, DefinedNumericVariable,
-      /*IsLegacyLineExpr=*/false, LineNumber, &Cxt, SM);
-  ASSERT_THAT_EXPECTED(ExpressionPointer, Succeeded());
-  ExpressionVal = (*ExpressionPointer)->getAST()->eval();
-  ASSERT_THAT_EXPECTED(ExpressionVal, Succeeded());
-  EXPECT_EQ(cantFail(ExpressionVal->getSignedValue()), 12);
-  ASSERT_THAT_EXPECTED(EmptyVar, Succeeded());
-  EXPECT_EQ(*EmptyVar, "");
-  expectUndefErrors({std::string(UnknownVarStr)}, UnknownVar.takeError());
-
-  // Clear local variables and check they become absent.
-  Cxt.clearLocalVars();
-  LocalVar = Cxt.getPatternVarValue(LocalVarStr);
-  expectUndefErrors({std::string(LocalVarStr)}, LocalVar.takeError());
-  // Check a numeric expression's evaluation fails if called after clearing of
-  // local variables, if it was created before. This is important because local
-  // variable clearing due to --enable-var-scope happens after numeric
-  // expressions are linked to the numeric variables they use.
-  expectUndefErrors({"LocalNumVar3"},
-                    (*ExpressionPointer)->getAST()->eval().takeError());
-  P = Pattern(Check::CheckPlain, &Cxt, ++LineNumber);
-  ExpressionPointer = P.parseNumericSubstitutionBlock(
-      LocalNumVar1Ref, DefinedNumericVariable, /*IsLegacyLineExpr=*/false,
-      LineNumber, &Cxt, SM);
-  ASSERT_THAT_EXPECTED(ExpressionPointer, Succeeded());
-  ExpressionVal = (*ExpressionPointer)->getAST()->eval();
-  expectUndefErrors({"LocalNumVar1"}, ExpressionVal.takeError());
-  ExpressionPointer = P.parseNumericSubstitutionBlock(
-      LocalNumVar2Ref, DefinedNumericVariable, /*IsLegacyLineExpr=*/false,
-      LineNumber, &Cxt, SM);
-  ASSERT_THAT_EXPECTED(ExpressionPointer, Succeeded());
-  ExpressionVal = (*ExpressionPointer)->getAST()->eval();
-  expectUndefErrors({"LocalNumVar2"}, ExpressionVal.takeError());
-  EmptyVar = Cxt.getPatternVarValue(EmptyVarStr);
-  expectUndefErrors({"EmptyVar"}, EmptyVar.takeError());
-  // Clear again because parseNumericSubstitutionBlock would have created a
-  // dummy variable and stored it in GlobalNumericVariableTable.
-  Cxt.clearLocalVars();
-
-  // Redefine global variables and check variables are defined again.
-  GlobalDefines.emplace_back("$GlobalVar=BAR");
-  GlobalDefines.emplace_back("#$GlobalNumVar=36");
-  ASSERT_THAT_ERROR(Cxt.defineCmdlineVariables(GlobalDefines, SM), Succeeded());
-  StringRef GlobalVarStr = "$GlobalVar";
-  StringRef GlobalNumVarRef = bufferize(SM, "$GlobalNumVar");
-  Expected<StringRef> GlobalVar = Cxt.getPatternVarValue(GlobalVarStr);
-  ASSERT_THAT_EXPECTED(GlobalVar, Succeeded());
-  EXPECT_EQ(*GlobalVar, "BAR");
-  P = Pattern(Check::CheckPlain, &Cxt, ++LineNumber);
-  ExpressionPointer = P.parseNumericSubstitutionBlock(
-      GlobalNumVarRef, DefinedNumericVariable, /*IsLegacyLineExpr=*/false,
-      LineNumber, &Cxt, SM);
-  ASSERT_THAT_EXPECTED(ExpressionPointer, Succeeded());
-  ExpressionVal = (*ExpressionPointer)->getAST()->eval();
-  ASSERT_THAT_EXPECTED(ExpressionVal, Succeeded());
-  EXPECT_EQ(cantFail(ExpressionVal->getSignedValue()), 36);
-
-  // Clear local variables and check global variables remain defined.
-  Cxt.clearLocalVars();
-  EXPECT_THAT_EXPECTED(Cxt.getPatternVarValue(GlobalVarStr), Succeeded());
-  P = Pattern(Check::CheckPlain, &Cxt, ++LineNumber);
-  ExpressionPointer = P.parseNumericSubstitutionBlock(
-      GlobalNumVarRef, DefinedNumericVariable, /*IsLegacyLineExpr=*/false,
-      LineNumber, &Cxt, SM);
-  ASSERT_THAT_EXPECTED(ExpressionPointer, Succeeded());
-  ExpressionVal = (*ExpressionPointer)->getAST()->eval();
-  ASSERT_THAT_EXPECTED(ExpressionVal, Succeeded());
-  EXPECT_EQ(cantFail(ExpressionVal->getSignedValue()), 36);
-}
-
-TEST_F(FileCheckTest, CapturedVarDiags) {
-  PatternTester Tester;
-  ASSERT_FALSE(Tester.parsePattern("[[STRVAR:[a-z]+]] [[#NUMVAR:@LINE]]"));
-  EXPECT_THAT_EXPECTED(Tester.match("foobar 2"), Succeeded());
-  std::vector<FileCheckDiag> Diags;
-  Tester.printVariableDefs(FileCheckDiag::MatchFoundAndExpected, Diags);
-  EXPECT_EQ(Diags.size(), 2ul);
-  for (FileCheckDiag Diag : Diags) {
-    EXPECT_EQ(Diag.CheckTy, Check::CheckPlain);
-    EXPECT_EQ(Diag.MatchTy, FileCheckDiag::MatchFoundAndExpected);
-    EXPECT_EQ(Diag.InputStartLine, 1u);
-    EXPECT_EQ(Diag.InputEndLine, 1u);
-  }
-  EXPECT_EQ(Diags[0].InputStartCol, 1u);
-  EXPECT_EQ(Diags[0].InputEndCol, 7u);
-  EXPECT_EQ(Diags[1].InputStartCol, 8u);
-  EXPECT_EQ(Diags[1].InputEndCol, 9u);
-  EXPECT_EQ(Diags[0].Note, "captured var \"STRVAR\"");
-  EXPECT_EQ(Diags[1].Note, "captured var \"NUMVAR\"");
-}
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/Frontend/CMakeLists.txt b/gnu/llvm/llvm/unittests/Frontend/CMakeLists.txt
deleted file mode 100644
index 5e307c60ac7..00000000000
--- a/gnu/llvm/llvm/unittests/Frontend/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  Analysis
-  Core
-  FrontendOpenMP
-  FrontendOpenACC
-  Support
-  Passes
-  TransformUtils
-  )
-
-add_llvm_unittest(LLVMFrontendTests
-  OpenACCTest.cpp
-  OpenMPContextTest.cpp
-  OpenMPIRBuilderTest.cpp
-  OpenMPParsingTest.cpp
-
-  DEPENDS
-  acc_gen
-  omp_gen
-  )
-
-target_link_libraries(LLVMFrontendTests PRIVATE LLVMTestingSupport)
diff --git a/gnu/llvm/llvm/unittests/Frontend/OpenACCTest.cpp b/gnu/llvm/llvm/unittests/Frontend/OpenACCTest.cpp
deleted file mode 100644
index 1929a6338bb..00000000000
--- a/gnu/llvm/llvm/unittests/Frontend/OpenACCTest.cpp
+++ /dev/null
@@ -1,332 +0,0 @@
-//===- llvm/unittest/Frontend/OpenACCTest.cpp - OpenACC Frontend tests ----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/SmallSet.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/Frontend/OpenACC/ACC.h.inc"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace acc;
-
-namespace {
-
-static const Clause AllClauses[] = {ACCC_unknown,
-                                    ACCC_async,
-                                    ACCC_attach,
-                                    ACCC_auto,
-                                    ACCC_bind,
-                                    ACCC_capture,
-                                    ACCC_collapse,
-                                    ACCC_copy,
-                                    ACCC_copyin,
-                                    ACCC_copyout,
-                                    ACCC_create,
-                                    ACCC_default,
-                                    ACCC_default_async,
-                                    ACCC_delete,
-                                    ACCC_detach,
-                                    ACCC_device,
-                                    ACCC_device_num,
-                                    ACCC_deviceptr,
-                                    ACCC_device_resident,
-                                    ACCC_device_type,
-                                    ACCC_finalize,
-                                    ACCC_firstprivate,
-                                    ACCC_gang,
-                                    ACCC_host,
-                                    ACCC_if,
-                                    ACCC_if_present,
-                                    ACCC_independent,
-                                    ACCC_link,
-                                    ACCC_no_create,
-                                    ACCC_nohost,
-                                    ACCC_num_gangs,
-                                    ACCC_num_workers,
-                                    ACCC_present,
-                                    ACCC_private,
-                                    ACCC_read,
-                                    ACCC_reduction,
-                                    ACCC_self,
-                                    ACCC_seq,
-                                    ACCC_tile,
-                                    ACCC_unknown,
-                                    ACCC_use_device,
-                                    ACCC_vector,
-                                    ACCC_vector_length,
-                                    ACCC_wait,
-                                    ACCC_worker,
-                                    ACCC_write};
-
-TEST(OpenACCTest, DirectiveHelpers) {
-  EXPECT_EQ(getOpenACCDirectiveKind(""), ACCD_unknown);
-  EXPECT_EQ(getOpenACCDirectiveKind("dummy"), ACCD_unknown);
-  EXPECT_EQ(getOpenACCDirectiveKind("atomic"), ACCD_atomic);
-  EXPECT_EQ(getOpenACCDirectiveKind("cache"), ACCD_cache);
-  EXPECT_EQ(getOpenACCDirectiveKind("data"), ACCD_data);
-  EXPECT_EQ(getOpenACCDirectiveKind("declare"), ACCD_declare);
-  EXPECT_EQ(getOpenACCDirectiveKind("enter data"), ACCD_enter_data);
-  EXPECT_EQ(getOpenACCDirectiveKind("exit data"), ACCD_exit_data);
-  EXPECT_EQ(getOpenACCDirectiveKind("host_data"), ACCD_host_data);
-  EXPECT_EQ(getOpenACCDirectiveKind("init"), ACCD_init);
-  EXPECT_EQ(getOpenACCDirectiveKind("kernels"), ACCD_kernels);
-  EXPECT_EQ(getOpenACCDirectiveKind("kernels loop"), ACCD_kernels_loop);
-  EXPECT_EQ(getOpenACCDirectiveKind("loop"), ACCD_loop);
-  EXPECT_EQ(getOpenACCDirectiveKind("parallel"), ACCD_parallel);
-  EXPECT_EQ(getOpenACCDirectiveKind("parallel loop"), ACCD_parallel_loop);
-  EXPECT_EQ(getOpenACCDirectiveKind("routine"), ACCD_routine);
-  EXPECT_EQ(getOpenACCDirectiveKind("serial"), ACCD_serial);
-  EXPECT_EQ(getOpenACCDirectiveKind("serial loop"), ACCD_serial_loop);
-  EXPECT_EQ(getOpenACCDirectiveKind("set"), ACCD_set);
-  EXPECT_EQ(getOpenACCDirectiveKind("shutdown"), ACCD_shutdown);
-  EXPECT_EQ(getOpenACCDirectiveKind("unknown"), ACCD_unknown);
-  EXPECT_EQ(getOpenACCDirectiveKind("update"), ACCD_update);
-  EXPECT_EQ(getOpenACCDirectiveKind("wait"), ACCD_wait);
-
-  EXPECT_EQ(getOpenACCDirectiveName(ACCD_atomic), "atomic");
-  EXPECT_EQ(getOpenACCDirectiveName(ACCD_cache), "cache");
-  EXPECT_EQ(getOpenACCDirectiveName(ACCD_data), "data");
-  EXPECT_EQ(getOpenACCDirectiveName(ACCD_declare), "declare");
-  EXPECT_EQ(getOpenACCDirectiveName(ACCD_enter_data), "enter data");
-  EXPECT_EQ(getOpenACCDirectiveName(ACCD_exit_data), "exit data");
-  EXPECT_EQ(getOpenACCDirectiveName(ACCD_host_data), "host_data");
-  EXPECT_EQ(getOpenACCDirectiveName(ACCD_init), "init");
-  EXPECT_EQ(getOpenACCDirectiveName(ACCD_kernels), "kernels");
-  EXPECT_EQ(getOpenACCDirectiveName(ACCD_kernels_loop), "kernels loop");
-  EXPECT_EQ(getOpenACCDirectiveName(ACCD_loop), "loop");
-  EXPECT_EQ(getOpenACCDirectiveName(ACCD_parallel), "parallel");
-  EXPECT_EQ(getOpenACCDirectiveName(ACCD_parallel_loop), "parallel loop");
-  EXPECT_EQ(getOpenACCDirectiveName(ACCD_routine), "routine");
-  EXPECT_EQ(getOpenACCDirectiveName(ACCD_serial), "serial");
-  EXPECT_EQ(getOpenACCDirectiveName(ACCD_serial_loop), "serial loop");
-  EXPECT_EQ(getOpenACCDirectiveName(ACCD_set), "set");
-  EXPECT_EQ(getOpenACCDirectiveName(ACCD_shutdown), "shutdown");
-  EXPECT_EQ(getOpenACCDirectiveName(ACCD_unknown), "unknown");
-  EXPECT_EQ(getOpenACCDirectiveName(ACCD_update), "update");
-  EXPECT_EQ(getOpenACCDirectiveName(ACCD_wait), "wait");
-}
-
-TEST(OpenACCTest, ClauseHelpers) {
-  EXPECT_EQ(getOpenACCClauseKind(""), ACCC_unknown);
-  EXPECT_EQ(getOpenACCClauseKind("dummy"), ACCC_unknown);
-  EXPECT_EQ(getOpenACCClauseKind("async"), ACCC_async);
-  EXPECT_EQ(getOpenACCClauseKind("attach"), ACCC_attach);
-  EXPECT_EQ(getOpenACCClauseKind("auto"), ACCC_auto);
-  EXPECT_EQ(getOpenACCClauseKind("bind"), ACCC_bind);
-  EXPECT_EQ(getOpenACCClauseKind("capture"), ACCC_capture);
-  EXPECT_EQ(getOpenACCClauseKind("collapse"), ACCC_collapse);
-  EXPECT_EQ(getOpenACCClauseKind("copy"), ACCC_copy);
-  EXPECT_EQ(getOpenACCClauseKind("copyin"), ACCC_copyin);
-  EXPECT_EQ(getOpenACCClauseKind("copyout"), ACCC_copyout);
-  EXPECT_EQ(getOpenACCClauseKind("create"), ACCC_create);
-  EXPECT_EQ(getOpenACCClauseKind("default"), ACCC_default);
-  EXPECT_EQ(getOpenACCClauseKind("default_async"), ACCC_default_async);
-  EXPECT_EQ(getOpenACCClauseKind("delete"), ACCC_delete);
-  EXPECT_EQ(getOpenACCClauseKind("detach"), ACCC_detach);
-  EXPECT_EQ(getOpenACCClauseKind("device"), ACCC_device);
-  EXPECT_EQ(getOpenACCClauseKind("device_num"), ACCC_device_num);
-  EXPECT_EQ(getOpenACCClauseKind("deviceptr"), ACCC_deviceptr);
-  EXPECT_EQ(getOpenACCClauseKind("device_resident"), ACCC_device_resident);
-  EXPECT_EQ(getOpenACCClauseKind("device_type"), ACCC_device_type);
-  EXPECT_EQ(getOpenACCClauseKind("finalize"), ACCC_finalize);
-  EXPECT_EQ(getOpenACCClauseKind("firstprivate"), ACCC_firstprivate);
-  EXPECT_EQ(getOpenACCClauseKind("gang"), ACCC_gang);
-  EXPECT_EQ(getOpenACCClauseKind("host"), ACCC_host);
-  EXPECT_EQ(getOpenACCClauseKind("if"), ACCC_if);
-  EXPECT_EQ(getOpenACCClauseKind("if_present"), ACCC_if_present);
-  EXPECT_EQ(getOpenACCClauseKind("independent"), ACCC_independent);
-  EXPECT_EQ(getOpenACCClauseKind("link"), ACCC_link);
-  EXPECT_EQ(getOpenACCClauseKind("no_create"), ACCC_no_create);
-  EXPECT_EQ(getOpenACCClauseKind("nohost"), ACCC_nohost);
-  EXPECT_EQ(getOpenACCClauseKind("num_gangs"), ACCC_num_gangs);
-  EXPECT_EQ(getOpenACCClauseKind("num_workers"), ACCC_num_workers);
-  EXPECT_EQ(getOpenACCClauseKind("present"), ACCC_present);
-  EXPECT_EQ(getOpenACCClauseKind("private"), ACCC_private);
-  EXPECT_EQ(getOpenACCClauseKind("read"), ACCC_read);
-  EXPECT_EQ(getOpenACCClauseKind("reduction"), ACCC_reduction);
-  EXPECT_EQ(getOpenACCClauseKind("self"), ACCC_self);
-  EXPECT_EQ(getOpenACCClauseKind("seq"), ACCC_seq);
-  EXPECT_EQ(getOpenACCClauseKind("tile"), ACCC_tile);
-  EXPECT_EQ(getOpenACCClauseKind("unknown"), ACCC_unknown);
-  EXPECT_EQ(getOpenACCClauseKind("use_device"), ACCC_use_device);
-  EXPECT_EQ(getOpenACCClauseKind("vector"), ACCC_vector);
-  EXPECT_EQ(getOpenACCClauseKind("vector_length"), ACCC_vector_length);
-  EXPECT_EQ(getOpenACCClauseKind("wait"), ACCC_wait);
-  EXPECT_EQ(getOpenACCClauseKind("worker"), ACCC_worker);
-  EXPECT_EQ(getOpenACCClauseKind("write"), ACCC_write);
-
-  EXPECT_EQ(getOpenACCClauseName(ACCC_async), "async");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_attach), "attach");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_auto), "auto");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_bind), "bind");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_capture), "capture");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_collapse), "collapse");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_copy), "copy");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_copyin), "copyin");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_copyout), "copyout");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_create), "create");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_default), "default");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_default_async), "default_async");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_delete), "delete");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_detach), "detach");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_device), "device");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_device_num), "device_num");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_deviceptr), "deviceptr");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_device_resident), "device_resident");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_device_type), "device_type");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_finalize), "finalize");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_firstprivate), "firstprivate");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_gang), "gang");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_host), "host");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_if), "if");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_if_present), "if_present");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_independent), "independent");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_link), "link");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_no_create), "no_create");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_nohost), "nohost");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_num_gangs), "num_gangs");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_num_workers), "num_workers");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_present), "present");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_private), "private");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_read), "read");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_reduction), "reduction");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_self), "self");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_seq), "seq");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_tile), "tile");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_unknown), "unknown");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_use_device), "use_device");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_vector), "vector");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_vector_length), "vector_length");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_wait), "wait");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_worker), "worker");
-  EXPECT_EQ(getOpenACCClauseName(ACCC_write), "write");
-}
-
-static void expectAllowedClauses(Directive Dir, unsigned Version,
-                                 const ArrayRef<Clause> &AllowedClauses) {
-  SmallSet<Clause, 30> AllowedClausesSet;
-  for (Clause Cl : AllowedClauses) {
-    EXPECT_TRUE(isAllowedClauseForDirective(Dir, Cl, Version));
-    AllowedClausesSet.insert(Cl);
-  }
-
-  for (Clause Cl : AllClauses) {
-    if (!AllowedClausesSet.contains(Cl)) {
-      EXPECT_FALSE(isAllowedClauseForDirective(Dir, Cl, Version));
-    }
-  }
-}
-
-TEST(OpenACCTest, AllowedClause) {
-  expectAllowedClauses(ACCD_atomic, 3, {});
-  expectAllowedClauses(ACCD_cache, 3, {});
-  expectAllowedClauses(ACCD_unknown, 3, {});
-  expectAllowedClauses(ACCD_parallel, 0, {}); // Version starts at 1
-
-  expectAllowedClauses(ACCD_data, 3,
-                       {ACCC_if, ACCC_attach, ACCC_copy, ACCC_copyin,
-                        ACCC_copyout, ACCC_create, ACCC_default, ACCC_deviceptr,
-                        ACCC_no_create, ACCC_present});
-
-  expectAllowedClauses(ACCD_declare, 3,
-                       {ACCC_copy, ACCC_copyin, ACCC_copyout, ACCC_create,
-                        ACCC_present, ACCC_deviceptr, ACCC_device_resident,
-                        ACCC_link});
-
-  expectAllowedClauses(
-      ACCD_enter_data, 3,
-      {ACCC_async, ACCC_if, ACCC_wait, ACCC_attach, ACCC_create, ACCC_copyin});
-
-  expectAllowedClauses(ACCD_exit_data, 3,
-                       {ACCC_async, ACCC_if, ACCC_wait, ACCC_finalize,
-                        ACCC_copyout, ACCC_delete, ACCC_detach});
-
-  expectAllowedClauses(ACCD_host_data, 3,
-                       {ACCC_if, ACCC_if_present, ACCC_use_device});
-
-  expectAllowedClauses(ACCD_init, 3,
-                       {ACCC_device_num, ACCC_device_type, ACCC_if});
-
-  expectAllowedClauses(ACCD_kernels, 3,
-                       {ACCC_attach, ACCC_copy, ACCC_copyin, ACCC_copyout,
-                        ACCC_create, ACCC_device_type, ACCC_no_create,
-                        ACCC_present, ACCC_deviceptr, ACCC_async, ACCC_default,
-                        ACCC_if, ACCC_num_gangs, ACCC_num_workers, ACCC_self,
-                        ACCC_vector_length, ACCC_wait});
-
-  expectAllowedClauses(
-      ACCD_kernels_loop, 3,
-      {ACCC_copy,        ACCC_copyin,        ACCC_copyout, ACCC_create,
-       ACCC_device_type, ACCC_no_create,     ACCC_present, ACCC_private,
-       ACCC_deviceptr,   ACCC_attach,        ACCC_async,   ACCC_collapse,
-       ACCC_default,     ACCC_gang,          ACCC_if,      ACCC_num_gangs,
-       ACCC_num_workers, ACCC_reduction,     ACCC_self,    ACCC_tile,
-       ACCC_vector,      ACCC_vector_length, ACCC_wait,    ACCC_worker,
-       ACCC_auto,        ACCC_independent,   ACCC_seq});
-
-  expectAllowedClauses(ACCD_loop, 3,
-                       {ACCC_device_type, ACCC_private, ACCC_collapse,
-                        ACCC_gang, ACCC_reduction, ACCC_tile, ACCC_vector,
-                        ACCC_worker, ACCC_auto, ACCC_independent, ACCC_seq});
-
-  expectAllowedClauses(ACCD_parallel, 3,
-                       {ACCC_async,        ACCC_wait,          ACCC_num_gangs,
-                        ACCC_num_workers,  ACCC_vector_length, ACCC_device_type,
-                        ACCC_if,           ACCC_self,          ACCC_reduction,
-                        ACCC_copy,         ACCC_copyin,        ACCC_copyout,
-                        ACCC_create,       ACCC_no_create,     ACCC_present,
-                        ACCC_deviceptr,    ACCC_attach,        ACCC_private,
-                        ACCC_firstprivate, ACCC_default});
-
-  expectAllowedClauses(
-      ACCD_parallel_loop, 3,
-      {ACCC_attach,    ACCC_copy,      ACCC_copyin,      ACCC_copyout,
-       ACCC_create,    ACCC_deviceptr, ACCC_device_type, ACCC_firstprivate,
-       ACCC_no_create, ACCC_present,   ACCC_private,     ACCC_tile,
-       ACCC_wait,      ACCC_async,     ACCC_collapse,    ACCC_default,
-       ACCC_gang,      ACCC_if,        ACCC_num_gangs,   ACCC_num_workers,
-       ACCC_reduction, ACCC_self,      ACCC_vector,      ACCC_vector_length,
-       ACCC_worker,    ACCC_auto,      ACCC_independent, ACCC_seq});
-
-  expectAllowedClauses(ACCD_routine, 3,
-                       {ACCC_bind, ACCC_device_type, ACCC_nohost, ACCC_gang,
-                        ACCC_seq, ACCC_vector, ACCC_worker});
-
-  expectAllowedClauses(ACCD_serial, 3,
-                       {ACCC_attach, ACCC_copy, ACCC_copyin, ACCC_copyout,
-                        ACCC_create, ACCC_deviceptr, ACCC_device_type,
-                        ACCC_firstprivate, ACCC_no_create, ACCC_present,
-                        ACCC_private, ACCC_wait, ACCC_async, ACCC_default,
-                        ACCC_if, ACCC_reduction, ACCC_self});
-
-  expectAllowedClauses(
-      ACCD_serial_loop, 3,
-      {ACCC_attach,    ACCC_copy,      ACCC_copyin,      ACCC_copyout,
-       ACCC_create,    ACCC_deviceptr, ACCC_device_type, ACCC_firstprivate,
-       ACCC_no_create, ACCC_present,   ACCC_private,     ACCC_wait,
-       ACCC_async,     ACCC_collapse,  ACCC_default,     ACCC_gang,
-       ACCC_if,        ACCC_reduction, ACCC_self,        ACCC_tile,
-       ACCC_vector,    ACCC_worker,    ACCC_auto,        ACCC_independent,
-       ACCC_seq});
-
-  expectAllowedClauses(
-      ACCD_set, 3,
-      {ACCC_default_async, ACCC_device_num, ACCC_device_type, ACCC_if});
-
-  expectAllowedClauses(ACCD_shutdown, 3,
-                       {ACCC_device_num, ACCC_device_type, ACCC_if});
-
-  expectAllowedClauses(ACCD_update, 3,
-                       {ACCC_async, ACCC_wait, ACCC_device_type, ACCC_if,
-                        ACCC_if_present, ACCC_self, ACCC_host, ACCC_device});
-
-  expectAllowedClauses(ACCD_wait, 3, {ACCC_async, ACCC_if});
-}
-
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/Frontend/OpenMPContextTest.cpp b/gnu/llvm/llvm/unittests/Frontend/OpenMPContextTest.cpp
deleted file mode 100644
index 5938559aacb..00000000000
--- a/gnu/llvm/llvm/unittests/Frontend/OpenMPContextTest.cpp
+++ /dev/null
@@ -1,315 +0,0 @@
-//===- unittest/IR/OpenMPContextTest.cpp - OpenMP Context handling tests --===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Frontend/OpenMP/OMPConstants.h"
-#include "llvm/Frontend/OpenMP/OMPContext.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace omp;
-
-namespace {
-
-class OpenMPContextTest : public testing::Test {
-protected:
-  void SetUp() override {}
-
-  void TearDown() override {}
-};
-
-TEST_F(OpenMPContextTest, RoundTripAndAssociation) {
-#define OMP_TRAIT_SET(Enum, Str)                                               \
-  EXPECT_EQ(TraitSet::Enum,                                                    \
-            getOpenMPContextTraitSetKind(                                      \
-                getOpenMPContextTraitSetName(TraitSet::Enum)));                \
-  EXPECT_EQ(Str,                                                               \
-            getOpenMPContextTraitSetName(getOpenMPContextTraitSetKind(Str)));
-#define OMP_TRAIT_SELECTOR(Enum, TraitSetEnum, Str, RequiresProperty)          \
-  EXPECT_EQ(TraitSelector::Enum,                                               \
-            getOpenMPContextTraitSelectorKind(                                 \
-                getOpenMPContextTraitSelectorName(TraitSelector::Enum)));      \
-  EXPECT_EQ(Str, getOpenMPContextTraitSelectorName(                            \
-                     getOpenMPContextTraitSelectorKind(Str)));
-#define OMP_TRAIT_PROPERTY(Enum, TraitSetEnum, TraitSelectorEnum, Str)         \
-  EXPECT_EQ(TraitProperty::Enum,                                               \
-            getOpenMPContextTraitPropertyKind(                                 \
-                TraitSet::TraitSetEnum, TraitSelector::TraitSelectorEnum,      \
-                getOpenMPContextTraitPropertyName(TraitProperty::Enum, Str))); \
-  EXPECT_EQ(Str, getOpenMPContextTraitPropertyName(                            \
-                     getOpenMPContextTraitPropertyKind(                        \
-                         TraitSet::TraitSetEnum,                               \
-                         TraitSelector::TraitSelectorEnum, Str),               \
-                     Str));                                                    \
-  EXPECT_EQ(TraitSet::TraitSetEnum,                                            \
-            getOpenMPContextTraitSetForProperty(TraitProperty::Enum));         \
-  EXPECT_EQ(TraitSelector::TraitSelectorEnum,                                  \
-            getOpenMPContextTraitSelectorForProperty(TraitProperty::Enum));
-#include "llvm/Frontend/OpenMP/OMPKinds.def"
-}
-
-TEST_F(OpenMPContextTest, ValidNesting) {
-  bool AllowsTraitScore, ReqProperty;
-#define OMP_TRAIT_SELECTOR(Enum, TraitSetEnum, Str, RequiresProperty)          \
-  EXPECT_TRUE(isValidTraitSelectorForTraitSet(TraitSelector::Enum,             \
-                                              TraitSet::TraitSetEnum,          \
-                                              AllowsTraitScore, ReqProperty)); \
-  EXPECT_EQ(RequiresProperty, ReqProperty);
-#define OMP_TRAIT_PROPERTY(Enum, TraitSetEnum, TraitSelectorEnum, Str)         \
-  EXPECT_TRUE(isValidTraitPropertyForTraitSetAndSelector(                      \
-      TraitProperty::Enum, TraitSelector::TraitSelectorEnum,                   \
-      TraitSet::TraitSetEnum));
-#include "llvm/Frontend/OpenMP/OMPKinds.def"
-}
-
-TEST_F(OpenMPContextTest, ApplicabilityNonConstruct) {
-  OMPContext HostLinux(false, Triple("x86_64-unknown-linux"));
-  OMPContext DeviceLinux(true, Triple("x86_64-unknown-linux"));
-  OMPContext HostNVPTX(false, Triple("nvptx64-nvidia-cuda"));
-  OMPContext DeviceNVPTX(true, Triple("nvptx64-nvidia-cuda"));
-
-  VariantMatchInfo Empty;
-  EXPECT_TRUE(isVariantApplicableInContext(Empty, HostLinux));
-  EXPECT_TRUE(isVariantApplicableInContext(Empty, DeviceLinux));
-  EXPECT_TRUE(isVariantApplicableInContext(Empty, HostNVPTX));
-  EXPECT_TRUE(isVariantApplicableInContext(Empty, DeviceNVPTX));
-
-  VariantMatchInfo UserCondFalse;
-  UserCondFalse.addTrait(TraitProperty::user_condition_false, "");
-  EXPECT_FALSE(isVariantApplicableInContext(UserCondFalse, HostLinux));
-  EXPECT_FALSE(isVariantApplicableInContext(UserCondFalse, DeviceLinux));
-  EXPECT_FALSE(isVariantApplicableInContext(UserCondFalse, HostNVPTX));
-  EXPECT_FALSE(isVariantApplicableInContext(UserCondFalse, DeviceNVPTX));
-
-  VariantMatchInfo DeviceArchArm;
-  DeviceArchArm.addTrait(TraitProperty::device_arch_arm, "");
-  EXPECT_FALSE(isVariantApplicableInContext(DeviceArchArm, HostLinux));
-  EXPECT_FALSE(isVariantApplicableInContext(DeviceArchArm, DeviceLinux));
-  EXPECT_FALSE(isVariantApplicableInContext(DeviceArchArm, HostNVPTX));
-  EXPECT_FALSE(isVariantApplicableInContext(DeviceArchArm, DeviceNVPTX));
-
-  VariantMatchInfo LLVMHostUserCondTrue;
-  LLVMHostUserCondTrue.addTrait(TraitProperty::implementation_vendor_llvm, "");
-  LLVMHostUserCondTrue.addTrait(TraitProperty::device_kind_host, "");
-  LLVMHostUserCondTrue.addTrait(TraitProperty::device_kind_any, "");
-  LLVMHostUserCondTrue.addTrait(TraitProperty::user_condition_true, "");
-  EXPECT_TRUE(isVariantApplicableInContext(LLVMHostUserCondTrue, HostLinux));
-  EXPECT_FALSE(isVariantApplicableInContext(LLVMHostUserCondTrue, DeviceLinux));
-  EXPECT_TRUE(isVariantApplicableInContext(LLVMHostUserCondTrue, HostNVPTX));
-  EXPECT_FALSE(isVariantApplicableInContext(LLVMHostUserCondTrue, DeviceNVPTX));
-
-  VariantMatchInfo LLVMHostUserCondTrueCPU = LLVMHostUserCondTrue;
-  LLVMHostUserCondTrueCPU.addTrait(TraitProperty::device_kind_cpu, "");
-  EXPECT_TRUE(isVariantApplicableInContext(LLVMHostUserCondTrueCPU, HostLinux));
-  EXPECT_FALSE(
-      isVariantApplicableInContext(LLVMHostUserCondTrueCPU, DeviceLinux));
-  EXPECT_FALSE(
-      isVariantApplicableInContext(LLVMHostUserCondTrueCPU, HostNVPTX));
-  EXPECT_FALSE(
-      isVariantApplicableInContext(LLVMHostUserCondTrueCPU, DeviceNVPTX));
-
-  VariantMatchInfo GPU;
-  GPU.addTrait(TraitProperty::device_kind_gpu, "");
-  EXPECT_FALSE(isVariantApplicableInContext(GPU, HostLinux));
-  EXPECT_FALSE(isVariantApplicableInContext(GPU, DeviceLinux));
-  EXPECT_TRUE(isVariantApplicableInContext(GPU, HostNVPTX));
-  EXPECT_TRUE(isVariantApplicableInContext(GPU, DeviceNVPTX));
-
-  VariantMatchInfo NoHost;
-  NoHost.addTrait(TraitProperty::device_kind_nohost, "");
-  EXPECT_FALSE(isVariantApplicableInContext(NoHost, HostLinux));
-  EXPECT_TRUE(isVariantApplicableInContext(NoHost, DeviceLinux));
-  EXPECT_FALSE(isVariantApplicableInContext(NoHost, HostNVPTX));
-  EXPECT_TRUE(isVariantApplicableInContext(NoHost, DeviceNVPTX));
-}
-
-TEST_F(OpenMPContextTest, ApplicabilityAllTraits) {
-  OMPContext HostLinuxParallelParallel(false, Triple("x86_64-unknown-linux"));
-  HostLinuxParallelParallel.addTrait(
-      TraitProperty::construct_parallel_parallel);
-  HostLinuxParallelParallel.addTrait(
-      TraitProperty::construct_parallel_parallel);
-  OMPContext DeviceLinuxTargetParallel(true, Triple("x86_64-unknown-linux"));
-  DeviceLinuxTargetParallel.addTrait(TraitProperty::construct_target_target);
-  DeviceLinuxTargetParallel.addTrait(
-      TraitProperty::construct_parallel_parallel);
-  OMPContext HostNVPTXFor(false, Triple("nvptx64-nvidia-cuda"));
-  HostNVPTXFor.addTrait(TraitProperty::construct_for_for);
-  OMPContext DeviceNVPTXTargetTeamsParallel(true,
-                                            Triple("nvptx64-nvidia-cuda"));
-  DeviceNVPTXTargetTeamsParallel.addTrait(
-      TraitProperty::construct_target_target);
-  DeviceNVPTXTargetTeamsParallel.addTrait(TraitProperty::construct_teams_teams);
-  DeviceNVPTXTargetTeamsParallel.addTrait(
-      TraitProperty::construct_parallel_parallel);
-
-  { // non-construct variants
-    VariantMatchInfo Empty;
-    EXPECT_TRUE(isVariantApplicableInContext(Empty, HostLinuxParallelParallel));
-    EXPECT_TRUE(isVariantApplicableInContext(Empty, DeviceLinuxTargetParallel));
-    EXPECT_TRUE(isVariantApplicableInContext(Empty, HostNVPTXFor));
-    EXPECT_TRUE(
-        isVariantApplicableInContext(Empty, DeviceNVPTXTargetTeamsParallel));
-
-    VariantMatchInfo UserCondFalse;
-    UserCondFalse.addTrait(TraitProperty::user_condition_false, "");
-    EXPECT_FALSE(
-        isVariantApplicableInContext(UserCondFalse, HostLinuxParallelParallel));
-    EXPECT_FALSE(
-        isVariantApplicableInContext(UserCondFalse, DeviceLinuxTargetParallel));
-    EXPECT_FALSE(isVariantApplicableInContext(UserCondFalse, HostNVPTXFor));
-    EXPECT_FALSE(isVariantApplicableInContext(UserCondFalse,
-                                              DeviceNVPTXTargetTeamsParallel));
-
-    VariantMatchInfo DeviceArchArm;
-    DeviceArchArm.addTrait(TraitProperty::device_arch_arm, "");
-    EXPECT_FALSE(
-        isVariantApplicableInContext(DeviceArchArm, HostLinuxParallelParallel));
-    EXPECT_FALSE(
-        isVariantApplicableInContext(DeviceArchArm, DeviceLinuxTargetParallel));
-    EXPECT_FALSE(isVariantApplicableInContext(DeviceArchArm, HostNVPTXFor));
-    EXPECT_FALSE(isVariantApplicableInContext(DeviceArchArm,
-                                              DeviceNVPTXTargetTeamsParallel));
-
-    APInt Score(32, 1000);
-    VariantMatchInfo LLVMHostUserCondTrue;
-    LLVMHostUserCondTrue.addTrait(TraitProperty::implementation_vendor_llvm,
-                                  "");
-    LLVMHostUserCondTrue.addTrait(TraitProperty::device_kind_host, "");
-    LLVMHostUserCondTrue.addTrait(TraitProperty::device_kind_any, "");
-    LLVMHostUserCondTrue.addTrait(TraitProperty::user_condition_true, "",
-                                  &Score);
-    EXPECT_TRUE(isVariantApplicableInContext(LLVMHostUserCondTrue,
-                                             HostLinuxParallelParallel));
-    EXPECT_FALSE(isVariantApplicableInContext(LLVMHostUserCondTrue,
-                                              DeviceLinuxTargetParallel));
-    EXPECT_TRUE(
-        isVariantApplicableInContext(LLVMHostUserCondTrue, HostNVPTXFor));
-    EXPECT_FALSE(isVariantApplicableInContext(LLVMHostUserCondTrue,
-                                              DeviceNVPTXTargetTeamsParallel));
-
-    VariantMatchInfo LLVMHostUserCondTrueCPU = LLVMHostUserCondTrue;
-    LLVMHostUserCondTrueCPU.addTrait(TraitProperty::device_kind_cpu, "");
-    EXPECT_TRUE(isVariantApplicableInContext(LLVMHostUserCondTrueCPU,
-                                             HostLinuxParallelParallel));
-    EXPECT_FALSE(isVariantApplicableInContext(LLVMHostUserCondTrueCPU,
-                                              DeviceLinuxTargetParallel));
-    EXPECT_FALSE(
-        isVariantApplicableInContext(LLVMHostUserCondTrueCPU, HostNVPTXFor));
-    EXPECT_FALSE(isVariantApplicableInContext(LLVMHostUserCondTrueCPU,
-                                              DeviceNVPTXTargetTeamsParallel));
-
-    VariantMatchInfo GPU;
-    GPU.addTrait(TraitProperty::device_kind_gpu, "");
-    EXPECT_FALSE(isVariantApplicableInContext(GPU, HostLinuxParallelParallel));
-    EXPECT_FALSE(isVariantApplicableInContext(GPU, DeviceLinuxTargetParallel));
-    EXPECT_TRUE(isVariantApplicableInContext(GPU, HostNVPTXFor));
-    EXPECT_TRUE(
-        isVariantApplicableInContext(GPU, DeviceNVPTXTargetTeamsParallel));
-
-    VariantMatchInfo NoHost;
-    NoHost.addTrait(TraitProperty::device_kind_nohost, "");
-    EXPECT_FALSE(
-        isVariantApplicableInContext(NoHost, HostLinuxParallelParallel));
-    EXPECT_TRUE(
-        isVariantApplicableInContext(NoHost, DeviceLinuxTargetParallel));
-    EXPECT_FALSE(isVariantApplicableInContext(NoHost, HostNVPTXFor));
-    EXPECT_TRUE(
-        isVariantApplicableInContext(NoHost, DeviceNVPTXTargetTeamsParallel));
-  }
-  { // variants with all sets
-    VariantMatchInfo DeviceArchArmParallel;
-    DeviceArchArmParallel.addTrait(TraitProperty::construct_parallel_parallel,
-                                   "");
-    DeviceArchArmParallel.addTrait(TraitProperty::device_arch_arm, "");
-    EXPECT_FALSE(isVariantApplicableInContext(DeviceArchArmParallel,
-                                              HostLinuxParallelParallel));
-    EXPECT_FALSE(isVariantApplicableInContext(DeviceArchArmParallel,
-                                              DeviceLinuxTargetParallel));
-    EXPECT_FALSE(
-        isVariantApplicableInContext(DeviceArchArmParallel, HostNVPTXFor));
-    EXPECT_FALSE(isVariantApplicableInContext(DeviceArchArmParallel,
-                                              DeviceNVPTXTargetTeamsParallel));
-
-    VariantMatchInfo LLVMHostUserCondTrueParallel;
-    LLVMHostUserCondTrueParallel.addTrait(
-        TraitProperty::implementation_vendor_llvm, "");
-    LLVMHostUserCondTrueParallel.addTrait(TraitProperty::device_kind_host, "");
-    LLVMHostUserCondTrueParallel.addTrait(TraitProperty::device_kind_any, "");
-    LLVMHostUserCondTrueParallel.addTrait(TraitProperty::user_condition_true,
-                                          "");
-    LLVMHostUserCondTrueParallel.addTrait(
-        TraitProperty::construct_parallel_parallel, "");
-    EXPECT_TRUE(isVariantApplicableInContext(LLVMHostUserCondTrueParallel,
-                                             HostLinuxParallelParallel));
-    EXPECT_FALSE(isVariantApplicableInContext(LLVMHostUserCondTrueParallel,
-                                              DeviceLinuxTargetParallel));
-    EXPECT_FALSE(isVariantApplicableInContext(LLVMHostUserCondTrueParallel,
-                                              HostNVPTXFor));
-    EXPECT_FALSE(isVariantApplicableInContext(LLVMHostUserCondTrueParallel,
-                                              DeviceNVPTXTargetTeamsParallel));
-
-    VariantMatchInfo LLVMHostUserCondTrueParallelParallel =
-        LLVMHostUserCondTrueParallel;
-    LLVMHostUserCondTrueParallelParallel.addTrait(
-        TraitProperty::construct_parallel_parallel, "");
-    EXPECT_TRUE(isVariantApplicableInContext(
-        LLVMHostUserCondTrueParallelParallel, HostLinuxParallelParallel));
-    EXPECT_FALSE(isVariantApplicableInContext(
-        LLVMHostUserCondTrueParallelParallel, DeviceLinuxTargetParallel));
-    EXPECT_FALSE(isVariantApplicableInContext(
-        LLVMHostUserCondTrueParallelParallel, HostNVPTXFor));
-    EXPECT_FALSE(isVariantApplicableInContext(
-        LLVMHostUserCondTrueParallelParallel, DeviceNVPTXTargetTeamsParallel));
-
-    VariantMatchInfo LLVMHostUserCondTrueParallelParallelParallel =
-        LLVMHostUserCondTrueParallelParallel;
-    LLVMHostUserCondTrueParallelParallelParallel.addTrait(
-        TraitProperty::construct_parallel_parallel, "");
-    EXPECT_FALSE(isVariantApplicableInContext(
-        LLVMHostUserCondTrueParallelParallelParallel,
-        HostLinuxParallelParallel));
-    EXPECT_FALSE(isVariantApplicableInContext(
-        LLVMHostUserCondTrueParallelParallelParallel,
-        DeviceLinuxTargetParallel));
-    EXPECT_FALSE(isVariantApplicableInContext(
-        LLVMHostUserCondTrueParallelParallelParallel, HostNVPTXFor));
-    EXPECT_FALSE(isVariantApplicableInContext(
-        LLVMHostUserCondTrueParallelParallelParallel,
-        DeviceNVPTXTargetTeamsParallel));
-
-    VariantMatchInfo GPUTargetTeams;
-    GPUTargetTeams.addTrait(TraitProperty::construct_target_target, "");
-    GPUTargetTeams.addTrait(TraitProperty::construct_teams_teams, "");
-    GPUTargetTeams.addTrait(TraitProperty::device_kind_gpu, "");
-    EXPECT_FALSE(isVariantApplicableInContext(GPUTargetTeams,
-                                              HostLinuxParallelParallel));
-    EXPECT_FALSE(isVariantApplicableInContext(GPUTargetTeams,
-                                              DeviceLinuxTargetParallel));
-    EXPECT_FALSE(isVariantApplicableInContext(GPUTargetTeams, HostNVPTXFor));
-    EXPECT_TRUE(isVariantApplicableInContext(GPUTargetTeams,
-                                             DeviceNVPTXTargetTeamsParallel));
-
-    VariantMatchInfo GPUTargetParallel;
-    GPUTargetParallel.addTrait(TraitProperty::construct_target_target, "");
-    GPUTargetParallel.addTrait(TraitProperty::construct_parallel_parallel, "");
-    GPUTargetParallel.addTrait(TraitProperty::device_kind_gpu, "");
-    EXPECT_FALSE(isVariantApplicableInContext(GPUTargetParallel,
-                                              HostLinuxParallelParallel));
-    EXPECT_FALSE(isVariantApplicableInContext(GPUTargetParallel,
-                                              DeviceLinuxTargetParallel));
-    EXPECT_FALSE(isVariantApplicableInContext(GPUTargetParallel, HostNVPTXFor));
-    EXPECT_TRUE(isVariantApplicableInContext(GPUTargetParallel,
-                                             DeviceNVPTXTargetTeamsParallel));
-  }
-}
-
-TEST_F(OpenMPContextTest, ScoringSimple) {
-  // TODO: Add scoring tests (via getBestVariantMatchForContext).
-}
-
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/Frontend/OpenMPIRBuilderTest.cpp b/gnu/llvm/llvm/unittests/Frontend/OpenMPIRBuilderTest.cpp
deleted file mode 100644
index 50887611eaf..00000000000
--- a/gnu/llvm/llvm/unittests/Frontend/OpenMPIRBuilderTest.cpp
+++ /dev/null
@@ -1,2812 +0,0 @@
-//===- llvm/unittest/IR/OpenMPIRBuilderTest.cpp - OpenMPIRBuilder tests ---===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Frontend/OpenMP/OMPConstants.h"
-#include "llvm/Frontend/OpenMP/OMPIRBuilder.h"
-#include "llvm/IR/BasicBlock.h"
-#include "llvm/IR/DIBuilder.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/InstIterator.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/Verifier.h"
-#include "llvm/Transforms/Utils/BasicBlockUtils.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace omp;
-
-namespace {
-
-/// Create an instruction that uses the values in \p Values. We use "printf"
-/// just because it is often used for this purpose in test code, but it is never
-/// executed here.
-static CallInst *createPrintfCall(IRBuilder<> &Builder, StringRef FormatStr,
-                                  ArrayRef<Value *> Values) {
-  Module *M = Builder.GetInsertBlock()->getParent()->getParent();
-
-  GlobalVariable *GV = Builder.CreateGlobalString(FormatStr, "", 0, M);
-  Constant *Zero = ConstantInt::get(Type::getInt32Ty(M->getContext()), 0);
-  Constant *Indices[] = {Zero, Zero};
-  Constant *FormatStrConst =
-      ConstantExpr::getInBoundsGetElementPtr(GV->getValueType(), GV, Indices);
-
-  Function *PrintfDecl = M->getFunction("printf");
-  if (!PrintfDecl) {
-    GlobalValue::LinkageTypes Linkage = Function::ExternalLinkage;
-    FunctionType *Ty = FunctionType::get(Builder.getInt32Ty(), true);
-    PrintfDecl = Function::Create(Ty, Linkage, "printf", M);
-  }
-
-  SmallVector<Value *, 4> Args;
-  Args.push_back(FormatStrConst);
-  Args.append(Values.begin(), Values.end());
-  return Builder.CreateCall(PrintfDecl, Args);
-}
-
-/// Verify that blocks in \p RefOrder are corresponds to the depth-first visit
-/// order the control flow of \p F.
-///
-/// This is an easy way to verify the branching structure of the CFG without
-/// checking every branch instruction individually. For the CFG of a
-/// CanonicalLoopInfo, the Cond BB's terminating branch's first edge is entering
-/// the body, i.e. the DFS order corresponds to the execution order with one
-/// loop iteration.
-static testing::AssertionResult
-verifyDFSOrder(Function *F, ArrayRef<BasicBlock *> RefOrder) {
-  ArrayRef<BasicBlock *>::iterator It = RefOrder.begin();
-  ArrayRef<BasicBlock *>::iterator E = RefOrder.end();
-
-  df_iterator_default_set<BasicBlock *, 16> Visited;
-  auto DFS = llvm::depth_first_ext(&F->getEntryBlock(), Visited);
-
-  BasicBlock *Prev = nullptr;
-  for (BasicBlock *BB : DFS) {
-    if (It != E && BB == *It) {
-      Prev = *It;
-      ++It;
-    }
-  }
-
-  if (It == E)
-    return testing::AssertionSuccess();
-  if (!Prev)
-    return testing::AssertionFailure()
-           << "Did not find " << (*It)->getName() << " in control flow";
-  return testing::AssertionFailure()
-         << "Expected " << Prev->getName() << " before " << (*It)->getName()
-         << " in control flow";
-}
-
-/// Verify that blocks in \p RefOrder are in the same relative order in the
-/// linked lists of blocks in \p F. The linked list may contain additional
-/// blocks in-between.
-///
-/// While the order in the linked list is not relevant for semantics, keeping
-/// the order roughly in execution order makes its printout easier to read.
-static testing::AssertionResult
-verifyListOrder(Function *F, ArrayRef<BasicBlock *> RefOrder) {
-  ArrayRef<BasicBlock *>::iterator It = RefOrder.begin();
-  ArrayRef<BasicBlock *>::iterator E = RefOrder.end();
-
-  BasicBlock *Prev = nullptr;
-  for (BasicBlock &BB : *F) {
-    if (It != E && &BB == *It) {
-      Prev = *It;
-      ++It;
-    }
-  }
-
-  if (It == E)
-    return testing::AssertionSuccess();
-  if (!Prev)
-    return testing::AssertionFailure() << "Did not find " << (*It)->getName()
-                                       << " in function " << F->getName();
-  return testing::AssertionFailure()
-         << "Expected " << Prev->getName() << " before " << (*It)->getName()
-         << " in function " << F->getName();
-}
-
-class OpenMPIRBuilderTest : public testing::Test {
-protected:
-  void SetUp() override {
-    M.reset(new Module("MyModule", Ctx));
-    FunctionType *FTy =
-        FunctionType::get(Type::getVoidTy(Ctx), {Type::getInt32Ty(Ctx)},
-                          /*isVarArg=*/false);
-    F = Function::Create(FTy, Function::ExternalLinkage, "", M.get());
-    BB = BasicBlock::Create(Ctx, "", F);
-
-    DIBuilder DIB(*M);
-    auto File = DIB.createFile("test.dbg", "/src", llvm::None,
-                               Optional<StringRef>("/src/test.dbg"));
-    auto CU =
-        DIB.createCompileUnit(dwarf::DW_LANG_C, File, "llvm-C", true, "", 0);
-    auto Type = DIB.createSubroutineType(DIB.getOrCreateTypeArray(None));
-    auto SP = DIB.createFunction(
-        CU, "foo", "", File, 1, Type, 1, DINode::FlagZero,
-        DISubprogram::SPFlagDefinition | DISubprogram::SPFlagOptimized);
-    F->setSubprogram(SP);
-    auto Scope = DIB.createLexicalBlockFile(SP, File, 0);
-    DIB.finalize();
-    DL = DILocation::get(Ctx, 3, 7, Scope);
-  }
-
-  void TearDown() override {
-    BB = nullptr;
-    M.reset();
-  }
-
-  LLVMContext Ctx;
-  std::unique_ptr<Module> M;
-  Function *F;
-  BasicBlock *BB;
-  DebugLoc DL;
-};
-
-class OpenMPIRBuilderTestWithParams
-    : public OpenMPIRBuilderTest,
-      public ::testing::WithParamInterface<omp::OMPScheduleType> {};
-
-// Returns the value stored in the given allocation. Returns null if the given
-// value is not a result of an allocation, if no value is stored or if there is
-// more than one store.
-static Value *findStoredValue(Value *AllocaValue) {
-  Instruction *Alloca = dyn_cast<AllocaInst>(AllocaValue);
-  if (!Alloca)
-    return nullptr;
-  StoreInst *Store = nullptr;
-  for (Use &U : Alloca->uses()) {
-    if (auto *CandidateStore = dyn_cast<StoreInst>(U.getUser())) {
-      EXPECT_EQ(Store, nullptr);
-      Store = CandidateStore;
-    }
-  }
-  if (!Store)
-    return nullptr;
-  return Store->getValueOperand();
-}
-
-TEST_F(OpenMPIRBuilderTest, CreateBarrier) {
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-
-  IRBuilder<> Builder(BB);
-
-  OMPBuilder.createBarrier({IRBuilder<>::InsertPoint()}, OMPD_for);
-  EXPECT_TRUE(M->global_empty());
-  EXPECT_EQ(M->size(), 1U);
-  EXPECT_EQ(F->size(), 1U);
-  EXPECT_EQ(BB->size(), 0U);
-
-  OpenMPIRBuilder::LocationDescription Loc({Builder.saveIP()});
-  OMPBuilder.createBarrier(Loc, OMPD_for);
-  EXPECT_FALSE(M->global_empty());
-  EXPECT_EQ(M->size(), 3U);
-  EXPECT_EQ(F->size(), 1U);
-  EXPECT_EQ(BB->size(), 2U);
-
-  CallInst *GTID = dyn_cast<CallInst>(&BB->front());
-  EXPECT_NE(GTID, nullptr);
-  EXPECT_EQ(GTID->getNumArgOperands(), 1U);
-  EXPECT_EQ(GTID->getCalledFunction()->getName(), "__kmpc_global_thread_num");
-  EXPECT_FALSE(GTID->getCalledFunction()->doesNotAccessMemory());
-  EXPECT_FALSE(GTID->getCalledFunction()->doesNotFreeMemory());
-
-  CallInst *Barrier = dyn_cast<CallInst>(GTID->getNextNode());
-  EXPECT_NE(Barrier, nullptr);
-  EXPECT_EQ(Barrier->getNumArgOperands(), 2U);
-  EXPECT_EQ(Barrier->getCalledFunction()->getName(), "__kmpc_barrier");
-  EXPECT_FALSE(Barrier->getCalledFunction()->doesNotAccessMemory());
-  EXPECT_FALSE(Barrier->getCalledFunction()->doesNotFreeMemory());
-
-  EXPECT_EQ(cast<CallInst>(Barrier)->getArgOperand(1), GTID);
-
-  Builder.CreateUnreachable();
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-}
-
-TEST_F(OpenMPIRBuilderTest, CreateCancel) {
-  using InsertPointTy = OpenMPIRBuilder::InsertPointTy;
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-
-  BasicBlock *CBB = BasicBlock::Create(Ctx, "", F);
-  new UnreachableInst(Ctx, CBB);
-  auto FiniCB = [&](InsertPointTy IP) {
-    ASSERT_NE(IP.getBlock(), nullptr);
-    ASSERT_EQ(IP.getBlock()->end(), IP.getPoint());
-    BranchInst::Create(CBB, IP.getBlock());
-  };
-  OMPBuilder.pushFinalizationCB({FiniCB, OMPD_parallel, true});
-
-  IRBuilder<> Builder(BB);
-
-  OpenMPIRBuilder::LocationDescription Loc({Builder.saveIP()});
-  auto NewIP = OMPBuilder.createCancel(Loc, nullptr, OMPD_parallel);
-  Builder.restoreIP(NewIP);
-  EXPECT_FALSE(M->global_empty());
-  EXPECT_EQ(M->size(), 4U);
-  EXPECT_EQ(F->size(), 4U);
-  EXPECT_EQ(BB->size(), 4U);
-
-  CallInst *GTID = dyn_cast<CallInst>(&BB->front());
-  EXPECT_NE(GTID, nullptr);
-  EXPECT_EQ(GTID->getNumArgOperands(), 1U);
-  EXPECT_EQ(GTID->getCalledFunction()->getName(), "__kmpc_global_thread_num");
-  EXPECT_FALSE(GTID->getCalledFunction()->doesNotAccessMemory());
-  EXPECT_FALSE(GTID->getCalledFunction()->doesNotFreeMemory());
-
-  CallInst *Cancel = dyn_cast<CallInst>(GTID->getNextNode());
-  EXPECT_NE(Cancel, nullptr);
-  EXPECT_EQ(Cancel->getNumArgOperands(), 3U);
-  EXPECT_EQ(Cancel->getCalledFunction()->getName(), "__kmpc_cancel");
-  EXPECT_FALSE(Cancel->getCalledFunction()->doesNotAccessMemory());
-  EXPECT_FALSE(Cancel->getCalledFunction()->doesNotFreeMemory());
-  EXPECT_EQ(Cancel->getNumUses(), 1U);
-  Instruction *CancelBBTI = Cancel->getParent()->getTerminator();
-  EXPECT_EQ(CancelBBTI->getNumSuccessors(), 2U);
-  EXPECT_EQ(CancelBBTI->getSuccessor(0), NewIP.getBlock());
-  EXPECT_EQ(CancelBBTI->getSuccessor(1)->size(), 3U);
-  CallInst *GTID1 = dyn_cast<CallInst>(&CancelBBTI->getSuccessor(1)->front());
-  EXPECT_NE(GTID1, nullptr);
-  EXPECT_EQ(GTID1->getNumArgOperands(), 1U);
-  EXPECT_EQ(GTID1->getCalledFunction()->getName(), "__kmpc_global_thread_num");
-  EXPECT_FALSE(GTID1->getCalledFunction()->doesNotAccessMemory());
-  EXPECT_FALSE(GTID1->getCalledFunction()->doesNotFreeMemory());
-  CallInst *Barrier = dyn_cast<CallInst>(GTID1->getNextNode());
-  EXPECT_NE(Barrier, nullptr);
-  EXPECT_EQ(Barrier->getNumArgOperands(), 2U);
-  EXPECT_EQ(Barrier->getCalledFunction()->getName(), "__kmpc_cancel_barrier");
-  EXPECT_FALSE(Barrier->getCalledFunction()->doesNotAccessMemory());
-  EXPECT_FALSE(Barrier->getCalledFunction()->doesNotFreeMemory());
-  EXPECT_EQ(Barrier->getNumUses(), 0U);
-  EXPECT_EQ(CancelBBTI->getSuccessor(1)->getTerminator()->getNumSuccessors(),
-            1U);
-  EXPECT_EQ(CancelBBTI->getSuccessor(1)->getTerminator()->getSuccessor(0),
-            CBB);
-
-  EXPECT_EQ(cast<CallInst>(Cancel)->getArgOperand(1), GTID);
-
-  OMPBuilder.popFinalizationCB();
-
-  Builder.CreateUnreachable();
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-}
-
-TEST_F(OpenMPIRBuilderTest, CreateCancelIfCond) {
-  using InsertPointTy = OpenMPIRBuilder::InsertPointTy;
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-
-  BasicBlock *CBB = BasicBlock::Create(Ctx, "", F);
-  new UnreachableInst(Ctx, CBB);
-  auto FiniCB = [&](InsertPointTy IP) {
-    ASSERT_NE(IP.getBlock(), nullptr);
-    ASSERT_EQ(IP.getBlock()->end(), IP.getPoint());
-    BranchInst::Create(CBB, IP.getBlock());
-  };
-  OMPBuilder.pushFinalizationCB({FiniCB, OMPD_parallel, true});
-
-  IRBuilder<> Builder(BB);
-
-  OpenMPIRBuilder::LocationDescription Loc({Builder.saveIP()});
-  auto NewIP = OMPBuilder.createCancel(Loc, Builder.getTrue(), OMPD_parallel);
-  Builder.restoreIP(NewIP);
-  EXPECT_FALSE(M->global_empty());
-  EXPECT_EQ(M->size(), 4U);
-  EXPECT_EQ(F->size(), 7U);
-  EXPECT_EQ(BB->size(), 1U);
-  ASSERT_TRUE(isa<BranchInst>(BB->getTerminator()));
-  ASSERT_EQ(BB->getTerminator()->getNumSuccessors(), 2U);
-  BB = BB->getTerminator()->getSuccessor(0);
-  EXPECT_EQ(BB->size(), 4U);
-
-
-  CallInst *GTID = dyn_cast<CallInst>(&BB->front());
-  EXPECT_NE(GTID, nullptr);
-  EXPECT_EQ(GTID->getNumArgOperands(), 1U);
-  EXPECT_EQ(GTID->getCalledFunction()->getName(), "__kmpc_global_thread_num");
-  EXPECT_FALSE(GTID->getCalledFunction()->doesNotAccessMemory());
-  EXPECT_FALSE(GTID->getCalledFunction()->doesNotFreeMemory());
-
-  CallInst *Cancel = dyn_cast<CallInst>(GTID->getNextNode());
-  EXPECT_NE(Cancel, nullptr);
-  EXPECT_EQ(Cancel->getNumArgOperands(), 3U);
-  EXPECT_EQ(Cancel->getCalledFunction()->getName(), "__kmpc_cancel");
-  EXPECT_FALSE(Cancel->getCalledFunction()->doesNotAccessMemory());
-  EXPECT_FALSE(Cancel->getCalledFunction()->doesNotFreeMemory());
-  EXPECT_EQ(Cancel->getNumUses(), 1U);
-  Instruction *CancelBBTI = Cancel->getParent()->getTerminator();
-  EXPECT_EQ(CancelBBTI->getNumSuccessors(), 2U);
-  EXPECT_EQ(CancelBBTI->getSuccessor(0)->size(), 1U);
-  EXPECT_EQ(CancelBBTI->getSuccessor(0)->getUniqueSuccessor(), NewIP.getBlock());
-  EXPECT_EQ(CancelBBTI->getSuccessor(1)->size(), 3U);
-  CallInst *GTID1 = dyn_cast<CallInst>(&CancelBBTI->getSuccessor(1)->front());
-  EXPECT_NE(GTID1, nullptr);
-  EXPECT_EQ(GTID1->getNumArgOperands(), 1U);
-  EXPECT_EQ(GTID1->getCalledFunction()->getName(), "__kmpc_global_thread_num");
-  EXPECT_FALSE(GTID1->getCalledFunction()->doesNotAccessMemory());
-  EXPECT_FALSE(GTID1->getCalledFunction()->doesNotFreeMemory());
-  CallInst *Barrier = dyn_cast<CallInst>(GTID1->getNextNode());
-  EXPECT_NE(Barrier, nullptr);
-  EXPECT_EQ(Barrier->getNumArgOperands(), 2U);
-  EXPECT_EQ(Barrier->getCalledFunction()->getName(), "__kmpc_cancel_barrier");
-  EXPECT_FALSE(Barrier->getCalledFunction()->doesNotAccessMemory());
-  EXPECT_FALSE(Barrier->getCalledFunction()->doesNotFreeMemory());
-  EXPECT_EQ(Barrier->getNumUses(), 0U);
-  EXPECT_EQ(CancelBBTI->getSuccessor(1)->getTerminator()->getNumSuccessors(),
-            1U);
-  EXPECT_EQ(CancelBBTI->getSuccessor(1)->getTerminator()->getSuccessor(0),
-            CBB);
-
-  EXPECT_EQ(cast<CallInst>(Cancel)->getArgOperand(1), GTID);
-
-  OMPBuilder.popFinalizationCB();
-
-  Builder.CreateUnreachable();
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-}
-
-TEST_F(OpenMPIRBuilderTest, CreateCancelBarrier) {
-  using InsertPointTy = OpenMPIRBuilder::InsertPointTy;
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-
-  BasicBlock *CBB = BasicBlock::Create(Ctx, "", F);
-  new UnreachableInst(Ctx, CBB);
-  auto FiniCB = [&](InsertPointTy IP) {
-    ASSERT_NE(IP.getBlock(), nullptr);
-    ASSERT_EQ(IP.getBlock()->end(), IP.getPoint());
-    BranchInst::Create(CBB, IP.getBlock());
-  };
-  OMPBuilder.pushFinalizationCB({FiniCB, OMPD_parallel, true});
-
-  IRBuilder<> Builder(BB);
-
-  OpenMPIRBuilder::LocationDescription Loc({Builder.saveIP()});
-  auto NewIP = OMPBuilder.createBarrier(Loc, OMPD_for);
-  Builder.restoreIP(NewIP);
-  EXPECT_FALSE(M->global_empty());
-  EXPECT_EQ(M->size(), 3U);
-  EXPECT_EQ(F->size(), 4U);
-  EXPECT_EQ(BB->size(), 4U);
-
-  CallInst *GTID = dyn_cast<CallInst>(&BB->front());
-  EXPECT_NE(GTID, nullptr);
-  EXPECT_EQ(GTID->getNumArgOperands(), 1U);
-  EXPECT_EQ(GTID->getCalledFunction()->getName(), "__kmpc_global_thread_num");
-  EXPECT_FALSE(GTID->getCalledFunction()->doesNotAccessMemory());
-  EXPECT_FALSE(GTID->getCalledFunction()->doesNotFreeMemory());
-
-  CallInst *Barrier = dyn_cast<CallInst>(GTID->getNextNode());
-  EXPECT_NE(Barrier, nullptr);
-  EXPECT_EQ(Barrier->getNumArgOperands(), 2U);
-  EXPECT_EQ(Barrier->getCalledFunction()->getName(), "__kmpc_cancel_barrier");
-  EXPECT_FALSE(Barrier->getCalledFunction()->doesNotAccessMemory());
-  EXPECT_FALSE(Barrier->getCalledFunction()->doesNotFreeMemory());
-  EXPECT_EQ(Barrier->getNumUses(), 1U);
-  Instruction *BarrierBBTI = Barrier->getParent()->getTerminator();
-  EXPECT_EQ(BarrierBBTI->getNumSuccessors(), 2U);
-  EXPECT_EQ(BarrierBBTI->getSuccessor(0), NewIP.getBlock());
-  EXPECT_EQ(BarrierBBTI->getSuccessor(1)->size(), 1U);
-  EXPECT_EQ(BarrierBBTI->getSuccessor(1)->getTerminator()->getNumSuccessors(),
-            1U);
-  EXPECT_EQ(BarrierBBTI->getSuccessor(1)->getTerminator()->getSuccessor(0),
-            CBB);
-
-  EXPECT_EQ(cast<CallInst>(Barrier)->getArgOperand(1), GTID);
-
-  OMPBuilder.popFinalizationCB();
-
-  Builder.CreateUnreachable();
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-}
-
-TEST_F(OpenMPIRBuilderTest, DbgLoc) {
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-  F->setName("func");
-
-  IRBuilder<> Builder(BB);
-
-  OpenMPIRBuilder::LocationDescription Loc({Builder.saveIP(), DL});
-  OMPBuilder.createBarrier(Loc, OMPD_for);
-  CallInst *GTID = dyn_cast<CallInst>(&BB->front());
-  CallInst *Barrier = dyn_cast<CallInst>(GTID->getNextNode());
-  EXPECT_EQ(GTID->getDebugLoc(), DL);
-  EXPECT_EQ(Barrier->getDebugLoc(), DL);
-  EXPECT_TRUE(isa<GlobalVariable>(Barrier->getOperand(0)));
-  if (!isa<GlobalVariable>(Barrier->getOperand(0)))
-    return;
-  GlobalVariable *Ident = cast<GlobalVariable>(Barrier->getOperand(0));
-  EXPECT_TRUE(Ident->hasInitializer());
-  if (!Ident->hasInitializer())
-    return;
-  Constant *Initializer = Ident->getInitializer();
-  EXPECT_TRUE(
-      isa<GlobalVariable>(Initializer->getOperand(4)->stripPointerCasts()));
-  GlobalVariable *SrcStrGlob =
-      cast<GlobalVariable>(Initializer->getOperand(4)->stripPointerCasts());
-  if (!SrcStrGlob)
-    return;
-  EXPECT_TRUE(isa<ConstantDataArray>(SrcStrGlob->getInitializer()));
-  ConstantDataArray *SrcSrc =
-      dyn_cast<ConstantDataArray>(SrcStrGlob->getInitializer());
-  if (!SrcSrc)
-    return;
-  EXPECT_EQ(SrcSrc->getAsCString(), ";/src/test.dbg;foo;3;7;;");
-}
-
-TEST_F(OpenMPIRBuilderTest, ParallelSimple) {
-  using InsertPointTy = OpenMPIRBuilder::InsertPointTy;
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-  F->setName("func");
-  IRBuilder<> Builder(BB);
-
-  OpenMPIRBuilder::LocationDescription Loc({Builder.saveIP(), DL});
-
-  AllocaInst *PrivAI = nullptr;
-
-  unsigned NumBodiesGenerated = 0;
-  unsigned NumPrivatizedVars = 0;
-  unsigned NumFinalizationPoints = 0;
-
-  auto BodyGenCB = [&](InsertPointTy AllocaIP, InsertPointTy CodeGenIP,
-                       BasicBlock &ContinuationIP) {
-    ++NumBodiesGenerated;
-
-    Builder.restoreIP(AllocaIP);
-    PrivAI = Builder.CreateAlloca(F->arg_begin()->getType());
-    Builder.CreateStore(F->arg_begin(), PrivAI);
-
-    Builder.restoreIP(CodeGenIP);
-    Value *PrivLoad = Builder.CreateLoad(PrivAI->getAllocatedType(), PrivAI,
-                                         "local.use");
-    Value *Cmp = Builder.CreateICmpNE(F->arg_begin(), PrivLoad);
-    Instruction *ThenTerm, *ElseTerm;
-    SplitBlockAndInsertIfThenElse(Cmp, CodeGenIP.getBlock()->getTerminator(),
-                                  &ThenTerm, &ElseTerm);
-
-    Builder.SetInsertPoint(ThenTerm);
-    Builder.CreateBr(&ContinuationIP);
-    ThenTerm->eraseFromParent();
-  };
-
-  auto PrivCB = [&](InsertPointTy AllocaIP, InsertPointTy CodeGenIP,
-                    Value &Orig, Value &Inner,
-                    Value *&ReplacementValue) -> InsertPointTy {
-    ++NumPrivatizedVars;
-
-    if (!isa<AllocaInst>(Orig)) {
-      EXPECT_EQ(&Orig, F->arg_begin());
-      ReplacementValue = &Inner;
-      return CodeGenIP;
-    }
-
-    // Since the original value is an allocation, it has a pointer type and
-    // therefore no additional wrapping should happen.
-    EXPECT_EQ(&Orig, &Inner);
-
-    // Trivial copy (=firstprivate).
-    Builder.restoreIP(AllocaIP);
-    Type *VTy = Inner.getType()->getPointerElementType();
-    Value *V = Builder.CreateLoad(VTy, &Inner, Orig.getName() + ".reload");
-    ReplacementValue = Builder.CreateAlloca(VTy, 0, Orig.getName() + ".copy");
-    Builder.restoreIP(CodeGenIP);
-    Builder.CreateStore(V, ReplacementValue);
-    return CodeGenIP;
-  };
-
-  auto FiniCB = [&](InsertPointTy CodeGenIP) { ++NumFinalizationPoints; };
-
-  IRBuilder<>::InsertPoint AllocaIP(&F->getEntryBlock(),
-                                    F->getEntryBlock().getFirstInsertionPt());
-  IRBuilder<>::InsertPoint AfterIP =
-      OMPBuilder.createParallel(Loc, AllocaIP, BodyGenCB, PrivCB, FiniCB,
-                                nullptr, nullptr, OMP_PROC_BIND_default, false);
-  EXPECT_EQ(NumBodiesGenerated, 1U);
-  EXPECT_EQ(NumPrivatizedVars, 1U);
-  EXPECT_EQ(NumFinalizationPoints, 1U);
-
-  Builder.restoreIP(AfterIP);
-  Builder.CreateRetVoid();
-
-  OMPBuilder.finalize();
-
-  EXPECT_NE(PrivAI, nullptr);
-  Function *OutlinedFn = PrivAI->getFunction();
-  EXPECT_NE(F, OutlinedFn);
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-  EXPECT_TRUE(OutlinedFn->hasFnAttribute(Attribute::NoUnwind));
-  EXPECT_TRUE(OutlinedFn->hasFnAttribute(Attribute::NoRecurse));
-  EXPECT_TRUE(OutlinedFn->hasParamAttribute(0, Attribute::NoAlias));
-  EXPECT_TRUE(OutlinedFn->hasParamAttribute(1, Attribute::NoAlias));
-
-  EXPECT_TRUE(OutlinedFn->hasInternalLinkage());
-  EXPECT_EQ(OutlinedFn->arg_size(), 3U);
-
-  EXPECT_EQ(&OutlinedFn->getEntryBlock(), PrivAI->getParent());
-  EXPECT_EQ(OutlinedFn->getNumUses(), 1U);
-  User *Usr = OutlinedFn->user_back();
-  ASSERT_TRUE(isa<ConstantExpr>(Usr));
-  CallInst *ForkCI = dyn_cast<CallInst>(Usr->user_back());
-  ASSERT_NE(ForkCI, nullptr);
-
-  EXPECT_EQ(ForkCI->getCalledFunction()->getName(), "__kmpc_fork_call");
-  EXPECT_EQ(ForkCI->getNumArgOperands(), 4U);
-  EXPECT_TRUE(isa<GlobalVariable>(ForkCI->getArgOperand(0)));
-  EXPECT_EQ(ForkCI->getArgOperand(1),
-            ConstantInt::get(Type::getInt32Ty(Ctx), 1U));
-  EXPECT_EQ(ForkCI->getArgOperand(2), Usr);
-  EXPECT_EQ(findStoredValue(ForkCI->getArgOperand(3)), F->arg_begin());
-}
-
-TEST_F(OpenMPIRBuilderTest, ParallelNested) {
-  using InsertPointTy = OpenMPIRBuilder::InsertPointTy;
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-  F->setName("func");
-  IRBuilder<> Builder(BB);
-
-  OpenMPIRBuilder::LocationDescription Loc({Builder.saveIP(), DL});
-
-  unsigned NumInnerBodiesGenerated = 0;
-  unsigned NumOuterBodiesGenerated = 0;
-  unsigned NumFinalizationPoints = 0;
-
-  auto InnerBodyGenCB = [&](InsertPointTy AllocaIP, InsertPointTy CodeGenIP,
-                            BasicBlock &ContinuationIP) {
-    ++NumInnerBodiesGenerated;
-  };
-
-  auto PrivCB = [&](InsertPointTy AllocaIP, InsertPointTy CodeGenIP,
-                    Value &Orig, Value &Inner,
-                    Value *&ReplacementValue) -> InsertPointTy {
-    // Trivial copy (=firstprivate).
-    Builder.restoreIP(AllocaIP);
-    Type *VTy = Inner.getType()->getPointerElementType();
-    Value *V = Builder.CreateLoad(VTy, &Inner, Orig.getName() + ".reload");
-    ReplacementValue = Builder.CreateAlloca(VTy, 0, Orig.getName() + ".copy");
-    Builder.restoreIP(CodeGenIP);
-    Builder.CreateStore(V, ReplacementValue);
-    return CodeGenIP;
-  };
-
-  auto FiniCB = [&](InsertPointTy CodeGenIP) { ++NumFinalizationPoints; };
-
-  auto OuterBodyGenCB = [&](InsertPointTy AllocaIP, InsertPointTy CodeGenIP,
-                            BasicBlock &ContinuationIP) {
-    ++NumOuterBodiesGenerated;
-    Builder.restoreIP(CodeGenIP);
-    BasicBlock *CGBB = CodeGenIP.getBlock();
-    BasicBlock *NewBB = SplitBlock(CGBB, &*CodeGenIP.getPoint());
-    CGBB->getTerminator()->eraseFromParent();
-    ;
-
-    IRBuilder<>::InsertPoint AfterIP = OMPBuilder.createParallel(
-        InsertPointTy(CGBB, CGBB->end()), AllocaIP, InnerBodyGenCB, PrivCB,
-        FiniCB, nullptr, nullptr, OMP_PROC_BIND_default, false);
-
-    Builder.restoreIP(AfterIP);
-    Builder.CreateBr(NewBB);
-  };
-
-  IRBuilder<>::InsertPoint AllocaIP(&F->getEntryBlock(),
-                                    F->getEntryBlock().getFirstInsertionPt());
-  IRBuilder<>::InsertPoint AfterIP =
-      OMPBuilder.createParallel(Loc, AllocaIP, OuterBodyGenCB, PrivCB, FiniCB,
-                                nullptr, nullptr, OMP_PROC_BIND_default, false);
-
-  EXPECT_EQ(NumInnerBodiesGenerated, 1U);
-  EXPECT_EQ(NumOuterBodiesGenerated, 1U);
-  EXPECT_EQ(NumFinalizationPoints, 2U);
-
-  Builder.restoreIP(AfterIP);
-  Builder.CreateRetVoid();
-
-  OMPBuilder.finalize();
-
-  EXPECT_EQ(M->size(), 5U);
-  for (Function &OutlinedFn : *M) {
-    if (F == &OutlinedFn || OutlinedFn.isDeclaration())
-      continue;
-    EXPECT_FALSE(verifyModule(*M, &errs()));
-    EXPECT_TRUE(OutlinedFn.hasFnAttribute(Attribute::NoUnwind));
-    EXPECT_TRUE(OutlinedFn.hasFnAttribute(Attribute::NoRecurse));
-    EXPECT_TRUE(OutlinedFn.hasParamAttribute(0, Attribute::NoAlias));
-    EXPECT_TRUE(OutlinedFn.hasParamAttribute(1, Attribute::NoAlias));
-
-    EXPECT_TRUE(OutlinedFn.hasInternalLinkage());
-    EXPECT_EQ(OutlinedFn.arg_size(), 2U);
-
-    EXPECT_EQ(OutlinedFn.getNumUses(), 1U);
-    User *Usr = OutlinedFn.user_back();
-    ASSERT_TRUE(isa<ConstantExpr>(Usr));
-    CallInst *ForkCI = dyn_cast<CallInst>(Usr->user_back());
-    ASSERT_NE(ForkCI, nullptr);
-
-    EXPECT_EQ(ForkCI->getCalledFunction()->getName(), "__kmpc_fork_call");
-    EXPECT_EQ(ForkCI->getNumArgOperands(), 3U);
-    EXPECT_TRUE(isa<GlobalVariable>(ForkCI->getArgOperand(0)));
-    EXPECT_EQ(ForkCI->getArgOperand(1),
-              ConstantInt::get(Type::getInt32Ty(Ctx), 0U));
-    EXPECT_EQ(ForkCI->getArgOperand(2), Usr);
-  }
-}
-
-TEST_F(OpenMPIRBuilderTest, ParallelNested2Inner) {
-  using InsertPointTy = OpenMPIRBuilder::InsertPointTy;
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-  F->setName("func");
-  IRBuilder<> Builder(BB);
-
-  OpenMPIRBuilder::LocationDescription Loc({Builder.saveIP(), DL});
-
-  unsigned NumInnerBodiesGenerated = 0;
-  unsigned NumOuterBodiesGenerated = 0;
-  unsigned NumFinalizationPoints = 0;
-
-  auto InnerBodyGenCB = [&](InsertPointTy AllocaIP, InsertPointTy CodeGenIP,
-                            BasicBlock &ContinuationIP) {
-    ++NumInnerBodiesGenerated;
-  };
-
-  auto PrivCB = [&](InsertPointTy AllocaIP, InsertPointTy CodeGenIP,
-                    Value &Orig, Value &Inner,
-                    Value *&ReplacementValue) -> InsertPointTy {
-    // Trivial copy (=firstprivate).
-    Builder.restoreIP(AllocaIP);
-    Type *VTy = Inner.getType()->getPointerElementType();
-    Value *V = Builder.CreateLoad(VTy, &Inner, Orig.getName() + ".reload");
-    ReplacementValue = Builder.CreateAlloca(VTy, 0, Orig.getName() + ".copy");
-    Builder.restoreIP(CodeGenIP);
-    Builder.CreateStore(V, ReplacementValue);
-    return CodeGenIP;
-  };
-
-  auto FiniCB = [&](InsertPointTy CodeGenIP) { ++NumFinalizationPoints; };
-
-  auto OuterBodyGenCB = [&](InsertPointTy AllocaIP, InsertPointTy CodeGenIP,
-                            BasicBlock &ContinuationIP) {
-    ++NumOuterBodiesGenerated;
-    Builder.restoreIP(CodeGenIP);
-    BasicBlock *CGBB = CodeGenIP.getBlock();
-    BasicBlock *NewBB1 = SplitBlock(CGBB, &*CodeGenIP.getPoint());
-    BasicBlock *NewBB2 = SplitBlock(NewBB1, &*NewBB1->getFirstInsertionPt());
-    CGBB->getTerminator()->eraseFromParent();
-    ;
-    NewBB1->getTerminator()->eraseFromParent();
-    ;
-
-    IRBuilder<>::InsertPoint AfterIP1 = OMPBuilder.createParallel(
-        InsertPointTy(CGBB, CGBB->end()), AllocaIP, InnerBodyGenCB, PrivCB,
-        FiniCB, nullptr, nullptr, OMP_PROC_BIND_default, false);
-
-    Builder.restoreIP(AfterIP1);
-    Builder.CreateBr(NewBB1);
-
-    IRBuilder<>::InsertPoint AfterIP2 = OMPBuilder.createParallel(
-        InsertPointTy(NewBB1, NewBB1->end()), AllocaIP, InnerBodyGenCB, PrivCB,
-        FiniCB, nullptr, nullptr, OMP_PROC_BIND_default, false);
-
-    Builder.restoreIP(AfterIP2);
-    Builder.CreateBr(NewBB2);
-  };
-
-  IRBuilder<>::InsertPoint AllocaIP(&F->getEntryBlock(),
-                                    F->getEntryBlock().getFirstInsertionPt());
-  IRBuilder<>::InsertPoint AfterIP =
-      OMPBuilder.createParallel(Loc, AllocaIP, OuterBodyGenCB, PrivCB, FiniCB,
-                                nullptr, nullptr, OMP_PROC_BIND_default, false);
-
-  EXPECT_EQ(NumInnerBodiesGenerated, 2U);
-  EXPECT_EQ(NumOuterBodiesGenerated, 1U);
-  EXPECT_EQ(NumFinalizationPoints, 3U);
-
-  Builder.restoreIP(AfterIP);
-  Builder.CreateRetVoid();
-
-  OMPBuilder.finalize();
-
-  EXPECT_EQ(M->size(), 6U);
-  for (Function &OutlinedFn : *M) {
-    if (F == &OutlinedFn || OutlinedFn.isDeclaration())
-      continue;
-    EXPECT_FALSE(verifyModule(*M, &errs()));
-    EXPECT_TRUE(OutlinedFn.hasFnAttribute(Attribute::NoUnwind));
-    EXPECT_TRUE(OutlinedFn.hasFnAttribute(Attribute::NoRecurse));
-    EXPECT_TRUE(OutlinedFn.hasParamAttribute(0, Attribute::NoAlias));
-    EXPECT_TRUE(OutlinedFn.hasParamAttribute(1, Attribute::NoAlias));
-
-    EXPECT_TRUE(OutlinedFn.hasInternalLinkage());
-    EXPECT_EQ(OutlinedFn.arg_size(), 2U);
-
-    unsigned NumAllocas = 0;
-    for (Instruction &I : instructions(OutlinedFn))
-      NumAllocas += isa<AllocaInst>(I);
-    EXPECT_EQ(NumAllocas, 1U);
-
-    EXPECT_EQ(OutlinedFn.getNumUses(), 1U);
-    User *Usr = OutlinedFn.user_back();
-    ASSERT_TRUE(isa<ConstantExpr>(Usr));
-    CallInst *ForkCI = dyn_cast<CallInst>(Usr->user_back());
-    ASSERT_NE(ForkCI, nullptr);
-
-    EXPECT_EQ(ForkCI->getCalledFunction()->getName(), "__kmpc_fork_call");
-    EXPECT_EQ(ForkCI->getNumArgOperands(), 3U);
-    EXPECT_TRUE(isa<GlobalVariable>(ForkCI->getArgOperand(0)));
-    EXPECT_EQ(ForkCI->getArgOperand(1),
-              ConstantInt::get(Type::getInt32Ty(Ctx), 0U));
-    EXPECT_EQ(ForkCI->getArgOperand(2), Usr);
-  }
-}
-
-TEST_F(OpenMPIRBuilderTest, ParallelIfCond) {
-  using InsertPointTy = OpenMPIRBuilder::InsertPointTy;
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-  F->setName("func");
-  IRBuilder<> Builder(BB);
-
-  OpenMPIRBuilder::LocationDescription Loc({Builder.saveIP(), DL});
-
-  AllocaInst *PrivAI = nullptr;
-
-  unsigned NumBodiesGenerated = 0;
-  unsigned NumPrivatizedVars = 0;
-  unsigned NumFinalizationPoints = 0;
-
-  auto BodyGenCB = [&](InsertPointTy AllocaIP, InsertPointTy CodeGenIP,
-                       BasicBlock &ContinuationIP) {
-    ++NumBodiesGenerated;
-
-    Builder.restoreIP(AllocaIP);
-    PrivAI = Builder.CreateAlloca(F->arg_begin()->getType());
-    Builder.CreateStore(F->arg_begin(), PrivAI);
-
-    Builder.restoreIP(CodeGenIP);
-    Value *PrivLoad = Builder.CreateLoad(PrivAI->getAllocatedType(), PrivAI,
-                                         "local.use");
-    Value *Cmp = Builder.CreateICmpNE(F->arg_begin(), PrivLoad);
-    Instruction *ThenTerm, *ElseTerm;
-    SplitBlockAndInsertIfThenElse(Cmp, CodeGenIP.getBlock()->getTerminator(),
-                                  &ThenTerm, &ElseTerm);
-
-    Builder.SetInsertPoint(ThenTerm);
-    Builder.CreateBr(&ContinuationIP);
-    ThenTerm->eraseFromParent();
-  };
-
-  auto PrivCB = [&](InsertPointTy AllocaIP, InsertPointTy CodeGenIP,
-                    Value &Orig, Value &Inner,
-                    Value *&ReplacementValue) -> InsertPointTy {
-    ++NumPrivatizedVars;
-
-    if (!isa<AllocaInst>(Orig)) {
-      EXPECT_EQ(&Orig, F->arg_begin());
-      ReplacementValue = &Inner;
-      return CodeGenIP;
-    }
-
-    // Since the original value is an allocation, it has a pointer type and
-    // therefore no additional wrapping should happen.
-    EXPECT_EQ(&Orig, &Inner);
-
-    // Trivial copy (=firstprivate).
-    Builder.restoreIP(AllocaIP);
-    Type *VTy = Inner.getType()->getPointerElementType();
-    Value *V = Builder.CreateLoad(VTy, &Inner, Orig.getName() + ".reload");
-    ReplacementValue = Builder.CreateAlloca(VTy, 0, Orig.getName() + ".copy");
-    Builder.restoreIP(CodeGenIP);
-    Builder.CreateStore(V, ReplacementValue);
-    return CodeGenIP;
-  };
-
-  auto FiniCB = [&](InsertPointTy CodeGenIP) {
-    ++NumFinalizationPoints;
-    // No destructors.
-  };
-
-  IRBuilder<>::InsertPoint AllocaIP(&F->getEntryBlock(),
-                                    F->getEntryBlock().getFirstInsertionPt());
-  IRBuilder<>::InsertPoint AfterIP =
-      OMPBuilder.createParallel(Loc, AllocaIP, BodyGenCB, PrivCB, FiniCB,
-                                Builder.CreateIsNotNull(F->arg_begin()),
-                                nullptr, OMP_PROC_BIND_default, false);
-
-  EXPECT_EQ(NumBodiesGenerated, 1U);
-  EXPECT_EQ(NumPrivatizedVars, 1U);
-  EXPECT_EQ(NumFinalizationPoints, 1U);
-
-  Builder.restoreIP(AfterIP);
-  Builder.CreateRetVoid();
-  OMPBuilder.finalize();
-
-  EXPECT_NE(PrivAI, nullptr);
-  Function *OutlinedFn = PrivAI->getFunction();
-  EXPECT_NE(F, OutlinedFn);
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-
-  EXPECT_TRUE(OutlinedFn->hasInternalLinkage());
-  EXPECT_EQ(OutlinedFn->arg_size(), 3U);
-
-  EXPECT_EQ(&OutlinedFn->getEntryBlock(), PrivAI->getParent());
-  ASSERT_EQ(OutlinedFn->getNumUses(), 2U);
-
-  CallInst *DirectCI = nullptr;
-  CallInst *ForkCI = nullptr;
-  for (User *Usr : OutlinedFn->users()) {
-    if (isa<CallInst>(Usr)) {
-      ASSERT_EQ(DirectCI, nullptr);
-      DirectCI = cast<CallInst>(Usr);
-    } else {
-      ASSERT_TRUE(isa<ConstantExpr>(Usr));
-      ASSERT_EQ(Usr->getNumUses(), 1U);
-      ASSERT_TRUE(isa<CallInst>(Usr->user_back()));
-      ForkCI = cast<CallInst>(Usr->user_back());
-    }
-  }
-
-  EXPECT_EQ(ForkCI->getCalledFunction()->getName(), "__kmpc_fork_call");
-  EXPECT_EQ(ForkCI->getNumArgOperands(), 4U);
-  EXPECT_TRUE(isa<GlobalVariable>(ForkCI->getArgOperand(0)));
-  EXPECT_EQ(ForkCI->getArgOperand(1),
-            ConstantInt::get(Type::getInt32Ty(Ctx), 1));
-  Value *StoredForkArg = findStoredValue(ForkCI->getArgOperand(3));
-  EXPECT_EQ(StoredForkArg, F->arg_begin());
-
-  EXPECT_EQ(DirectCI->getCalledFunction(), OutlinedFn);
-  EXPECT_EQ(DirectCI->getNumArgOperands(), 3U);
-  EXPECT_TRUE(isa<AllocaInst>(DirectCI->getArgOperand(0)));
-  EXPECT_TRUE(isa<AllocaInst>(DirectCI->getArgOperand(1)));
-  Value *StoredDirectArg = findStoredValue(DirectCI->getArgOperand(2));
-  EXPECT_EQ(StoredDirectArg, F->arg_begin());
-}
-
-TEST_F(OpenMPIRBuilderTest, ParallelCancelBarrier) {
-  using InsertPointTy = OpenMPIRBuilder::InsertPointTy;
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-  F->setName("func");
-  IRBuilder<> Builder(BB);
-
-  OpenMPIRBuilder::LocationDescription Loc({Builder.saveIP(), DL});
-
-  unsigned NumBodiesGenerated = 0;
-  unsigned NumPrivatizedVars = 0;
-  unsigned NumFinalizationPoints = 0;
-
-  CallInst *CheckedBarrier = nullptr;
-  auto BodyGenCB = [&](InsertPointTy AllocaIP, InsertPointTy CodeGenIP,
-                       BasicBlock &ContinuationIP) {
-    ++NumBodiesGenerated;
-
-    Builder.restoreIP(CodeGenIP);
-
-    // Create three barriers, two cancel barriers but only one checked.
-    Function *CBFn, *BFn;
-
-    Builder.restoreIP(
-        OMPBuilder.createBarrier(Builder.saveIP(), OMPD_parallel));
-
-    CBFn = M->getFunction("__kmpc_cancel_barrier");
-    BFn = M->getFunction("__kmpc_barrier");
-    ASSERT_NE(CBFn, nullptr);
-    ASSERT_EQ(BFn, nullptr);
-    ASSERT_EQ(CBFn->getNumUses(), 1U);
-    ASSERT_TRUE(isa<CallInst>(CBFn->user_back()));
-    ASSERT_EQ(CBFn->user_back()->getNumUses(), 1U);
-    CheckedBarrier = cast<CallInst>(CBFn->user_back());
-
-    Builder.restoreIP(
-        OMPBuilder.createBarrier(Builder.saveIP(), OMPD_parallel, true));
-    CBFn = M->getFunction("__kmpc_cancel_barrier");
-    BFn = M->getFunction("__kmpc_barrier");
-    ASSERT_NE(CBFn, nullptr);
-    ASSERT_NE(BFn, nullptr);
-    ASSERT_EQ(CBFn->getNumUses(), 1U);
-    ASSERT_EQ(BFn->getNumUses(), 1U);
-    ASSERT_TRUE(isa<CallInst>(BFn->user_back()));
-    ASSERT_EQ(BFn->user_back()->getNumUses(), 0U);
-
-    Builder.restoreIP(OMPBuilder.createBarrier(Builder.saveIP(), OMPD_parallel,
-                                               false, false));
-    ASSERT_EQ(CBFn->getNumUses(), 2U);
-    ASSERT_EQ(BFn->getNumUses(), 1U);
-    ASSERT_TRUE(CBFn->user_back() != CheckedBarrier);
-    ASSERT_TRUE(isa<CallInst>(CBFn->user_back()));
-    ASSERT_EQ(CBFn->user_back()->getNumUses(), 0U);
-  };
-
-  auto PrivCB = [&](InsertPointTy, InsertPointTy, Value &V, Value &,
-                    Value *&) -> InsertPointTy {
-    ++NumPrivatizedVars;
-    llvm_unreachable("No privatization callback call expected!");
-  };
-
-  FunctionType *FakeDestructorTy =
-      FunctionType::get(Type::getVoidTy(Ctx), {Type::getInt32Ty(Ctx)},
-                        /*isVarArg=*/false);
-  auto *FakeDestructor = Function::Create(
-      FakeDestructorTy, Function::ExternalLinkage, "fakeDestructor", M.get());
-
-  auto FiniCB = [&](InsertPointTy IP) {
-    ++NumFinalizationPoints;
-    Builder.restoreIP(IP);
-    Builder.CreateCall(FakeDestructor,
-                       {Builder.getInt32(NumFinalizationPoints)});
-  };
-
-  IRBuilder<>::InsertPoint AllocaIP(&F->getEntryBlock(),
-                                    F->getEntryBlock().getFirstInsertionPt());
-  IRBuilder<>::InsertPoint AfterIP =
-      OMPBuilder.createParallel(Loc, AllocaIP, BodyGenCB, PrivCB, FiniCB,
-                                Builder.CreateIsNotNull(F->arg_begin()),
-                                nullptr, OMP_PROC_BIND_default, true);
-
-  EXPECT_EQ(NumBodiesGenerated, 1U);
-  EXPECT_EQ(NumPrivatizedVars, 0U);
-  EXPECT_EQ(NumFinalizationPoints, 2U);
-  EXPECT_EQ(FakeDestructor->getNumUses(), 2U);
-
-  Builder.restoreIP(AfterIP);
-  Builder.CreateRetVoid();
-  OMPBuilder.finalize();
-
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-
-  BasicBlock *ExitBB = nullptr;
-  for (const User *Usr : FakeDestructor->users()) {
-    const CallInst *CI = dyn_cast<CallInst>(Usr);
-    ASSERT_EQ(CI->getCalledFunction(), FakeDestructor);
-    ASSERT_TRUE(isa<BranchInst>(CI->getNextNode()));
-    ASSERT_EQ(CI->getNextNode()->getNumSuccessors(), 1U);
-    if (ExitBB)
-      ASSERT_EQ(CI->getNextNode()->getSuccessor(0), ExitBB);
-    else
-      ExitBB = CI->getNextNode()->getSuccessor(0);
-    ASSERT_EQ(ExitBB->size(), 1U);
-    if (!isa<ReturnInst>(ExitBB->front())) {
-      ASSERT_TRUE(isa<BranchInst>(ExitBB->front()));
-      ASSERT_EQ(cast<BranchInst>(ExitBB->front()).getNumSuccessors(), 1U);
-      ASSERT_TRUE(isa<ReturnInst>(
-          cast<BranchInst>(ExitBB->front()).getSuccessor(0)->front()));
-    }
-  }
-}
-
-TEST_F(OpenMPIRBuilderTest, ParallelForwardAsPointers) {
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-  F->setName("func");
-  IRBuilder<> Builder(BB);
-  OpenMPIRBuilder::LocationDescription Loc({Builder.saveIP(), DL});
-  using InsertPointTy = OpenMPIRBuilder::InsertPointTy;
-
-  Type *I32Ty = Type::getInt32Ty(M->getContext());
-  Type *I32PtrTy = Type::getInt32PtrTy(M->getContext());
-  Type *StructTy = StructType::get(I32Ty, I32PtrTy);
-  Type *StructPtrTy = StructTy->getPointerTo();
-  Type *VoidTy = Type::getVoidTy(M->getContext());
-  FunctionCallee RetI32Func = M->getOrInsertFunction("ret_i32", I32Ty);
-  FunctionCallee TakeI32Func =
-      M->getOrInsertFunction("take_i32", VoidTy, I32Ty);
-  FunctionCallee RetI32PtrFunc = M->getOrInsertFunction("ret_i32ptr", I32PtrTy);
-  FunctionCallee TakeI32PtrFunc =
-      M->getOrInsertFunction("take_i32ptr", VoidTy, I32PtrTy);
-  FunctionCallee RetStructFunc = M->getOrInsertFunction("ret_struct", StructTy);
-  FunctionCallee TakeStructFunc =
-      M->getOrInsertFunction("take_struct", VoidTy, StructTy);
-  FunctionCallee RetStructPtrFunc =
-      M->getOrInsertFunction("ret_structptr", StructPtrTy);
-  FunctionCallee TakeStructPtrFunc =
-      M->getOrInsertFunction("take_structPtr", VoidTy, StructPtrTy);
-  Value *I32Val = Builder.CreateCall(RetI32Func);
-  Value *I32PtrVal = Builder.CreateCall(RetI32PtrFunc);
-  Value *StructVal = Builder.CreateCall(RetStructFunc);
-  Value *StructPtrVal = Builder.CreateCall(RetStructPtrFunc);
-
-  Instruction *Internal;
-  auto BodyGenCB = [&](InsertPointTy AllocaIP, InsertPointTy CodeGenIP,
-                       BasicBlock &ContinuationBB) {
-    IRBuilder<>::InsertPointGuard Guard(Builder);
-    Builder.restoreIP(CodeGenIP);
-    Internal = Builder.CreateCall(TakeI32Func, I32Val);
-    Builder.CreateCall(TakeI32PtrFunc, I32PtrVal);
-    Builder.CreateCall(TakeStructFunc, StructVal);
-    Builder.CreateCall(TakeStructPtrFunc, StructPtrVal);
-  };
-  auto PrivCB = [&](InsertPointTy AllocaIP, InsertPointTy CodeGenIP, Value &,
-                    Value &Inner, Value *&ReplacementValue) {
-    ReplacementValue = &Inner;
-    return CodeGenIP;
-  };
-  auto FiniCB = [](InsertPointTy) {};
-
-  IRBuilder<>::InsertPoint AllocaIP(&F->getEntryBlock(),
-                                    F->getEntryBlock().getFirstInsertionPt());
-  IRBuilder<>::InsertPoint AfterIP =
-      OMPBuilder.createParallel(Loc, AllocaIP, BodyGenCB, PrivCB, FiniCB,
-                                nullptr, nullptr, OMP_PROC_BIND_default, false);
-  Builder.restoreIP(AfterIP);
-  Builder.CreateRetVoid();
-
-  OMPBuilder.finalize();
-
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-  Function *OutlinedFn = Internal->getFunction();
-
-  Type *Arg2Type = OutlinedFn->getArg(2)->getType();
-  EXPECT_TRUE(Arg2Type->isPointerTy());
-  EXPECT_EQ(Arg2Type->getPointerElementType(), I32Ty);
-
-  // Arguments that need to be passed through pointers and reloaded will get
-  // used earlier in the functions and therefore will appear first in the
-  // argument list after outlining.
-  Type *Arg3Type = OutlinedFn->getArg(3)->getType();
-  EXPECT_TRUE(Arg3Type->isPointerTy());
-  EXPECT_EQ(Arg3Type->getPointerElementType(), StructTy);
-
-  Type *Arg4Type = OutlinedFn->getArg(4)->getType();
-  EXPECT_EQ(Arg4Type, I32PtrTy);
-
-  Type *Arg5Type = OutlinedFn->getArg(5)->getType();
-  EXPECT_EQ(Arg5Type, StructPtrTy);
-}
-
-TEST_F(OpenMPIRBuilderTest, CanonicalLoopSimple) {
-  using InsertPointTy = OpenMPIRBuilder::InsertPointTy;
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-  IRBuilder<> Builder(BB);
-  OpenMPIRBuilder::LocationDescription Loc({Builder.saveIP(), DL});
-  Value *TripCount = F->getArg(0);
-
-  unsigned NumBodiesGenerated = 0;
-  auto LoopBodyGenCB = [&](InsertPointTy CodeGenIP, llvm::Value *LC) {
-    NumBodiesGenerated += 1;
-
-    Builder.restoreIP(CodeGenIP);
-
-    Value *Cmp = Builder.CreateICmpEQ(LC, TripCount);
-    Instruction *ThenTerm, *ElseTerm;
-    SplitBlockAndInsertIfThenElse(Cmp, CodeGenIP.getBlock()->getTerminator(),
-                                  &ThenTerm, &ElseTerm);
-  };
-
-  CanonicalLoopInfo *Loop =
-      OMPBuilder.createCanonicalLoop(Loc, LoopBodyGenCB, TripCount);
-
-  Builder.restoreIP(Loop->getAfterIP());
-  ReturnInst *RetInst = Builder.CreateRetVoid();
-  OMPBuilder.finalize();
-
-  Loop->assertOK();
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-
-  EXPECT_EQ(NumBodiesGenerated, 1U);
-
-  // Verify control flow structure (in addition to Loop->assertOK()).
-  EXPECT_EQ(Loop->getPreheader()->getSinglePredecessor(), &F->getEntryBlock());
-  EXPECT_EQ(Loop->getAfter(), Builder.GetInsertBlock());
-
-  Instruction *IndVar = Loop->getIndVar();
-  EXPECT_TRUE(isa<PHINode>(IndVar));
-  EXPECT_EQ(IndVar->getType(), TripCount->getType());
-  EXPECT_EQ(IndVar->getParent(), Loop->getHeader());
-
-  EXPECT_EQ(Loop->getTripCount(), TripCount);
-
-  BasicBlock *Body = Loop->getBody();
-  Instruction *CmpInst = &Body->getInstList().front();
-  EXPECT_TRUE(isa<ICmpInst>(CmpInst));
-  EXPECT_EQ(CmpInst->getOperand(0), IndVar);
-
-  BasicBlock *LatchPred = Loop->getLatch()->getSinglePredecessor();
-  EXPECT_TRUE(llvm::all_of(successors(Body), [=](BasicBlock *SuccBB) {
-    return SuccBB->getSingleSuccessor() == LatchPred;
-  }));
-
-  EXPECT_EQ(&Loop->getAfter()->front(), RetInst);
-}
-
-TEST_F(OpenMPIRBuilderTest, CanonicalLoopBounds) {
-  using InsertPointTy = OpenMPIRBuilder::InsertPointTy;
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-  IRBuilder<> Builder(BB);
-
-  // Check the trip count is computed correctly. We generate the canonical loop
-  // but rely on the IRBuilder's constant folder to compute the final result
-  // since all inputs are constant. To verify overflow situations, limit the
-  // trip count / loop counter widths to 16 bits.
-  auto EvalTripCount = [&](int64_t Start, int64_t Stop, int64_t Step,
-                           bool IsSigned, bool InclusiveStop) -> int64_t {
-    OpenMPIRBuilder::LocationDescription Loc({Builder.saveIP(), DL});
-    Type *LCTy = Type::getInt16Ty(Ctx);
-    Value *StartVal = ConstantInt::get(LCTy, Start);
-    Value *StopVal = ConstantInt::get(LCTy, Stop);
-    Value *StepVal = ConstantInt::get(LCTy, Step);
-    auto LoopBodyGenCB = [&](InsertPointTy CodeGenIP, llvm::Value *LC) {};
-    CanonicalLoopInfo *Loop =
-        OMPBuilder.createCanonicalLoop(Loc, LoopBodyGenCB, StartVal, StopVal,
-                                       StepVal, IsSigned, InclusiveStop);
-    Loop->assertOK();
-    Builder.restoreIP(Loop->getAfterIP());
-    Value *TripCount = Loop->getTripCount();
-    return cast<ConstantInt>(TripCount)->getValue().getZExtValue();
-  };
-
-  EXPECT_EQ(EvalTripCount(0, 0, 1, false, false), 0);
-  EXPECT_EQ(EvalTripCount(0, 1, 2, false, false), 1);
-  EXPECT_EQ(EvalTripCount(0, 42, 1, false, false), 42);
-  EXPECT_EQ(EvalTripCount(0, 42, 2, false, false), 21);
-  EXPECT_EQ(EvalTripCount(21, 42, 1, false, false), 21);
-  EXPECT_EQ(EvalTripCount(0, 5, 5, false, false), 1);
-  EXPECT_EQ(EvalTripCount(0, 9, 5, false, false), 2);
-  EXPECT_EQ(EvalTripCount(0, 11, 5, false, false), 3);
-  EXPECT_EQ(EvalTripCount(0, 0xFFFF, 1, false, false), 0xFFFF);
-  EXPECT_EQ(EvalTripCount(0xFFFF, 0, 1, false, false), 0);
-  EXPECT_EQ(EvalTripCount(0xFFFE, 0xFFFF, 1, false, false), 1);
-  EXPECT_EQ(EvalTripCount(0, 0xFFFF, 0x100, false, false), 0x100);
-  EXPECT_EQ(EvalTripCount(0, 0xFFFF, 0xFFFF, false, false), 1);
-
-  EXPECT_EQ(EvalTripCount(0, 6, 5, false, false), 2);
-  EXPECT_EQ(EvalTripCount(0, 0xFFFF, 0xFFFE, false, false), 2);
-  EXPECT_EQ(EvalTripCount(0, 0, 1, false, true), 1);
-  EXPECT_EQ(EvalTripCount(0, 0, 0xFFFF, false, true), 1);
-  EXPECT_EQ(EvalTripCount(0, 0xFFFE, 1, false, true), 0xFFFF);
-  EXPECT_EQ(EvalTripCount(0, 0xFFFE, 2, false, true), 0x8000);
-
-  EXPECT_EQ(EvalTripCount(0, 0, -1, true, false), 0);
-  EXPECT_EQ(EvalTripCount(0, 1, -1, true, true), 0);
-  EXPECT_EQ(EvalTripCount(20, 5, -5, true, false), 3);
-  EXPECT_EQ(EvalTripCount(20, 5, -5, true, true), 4);
-  EXPECT_EQ(EvalTripCount(-4, -2, 2, true, false), 1);
-  EXPECT_EQ(EvalTripCount(-4, -3, 2, true, false), 1);
-  EXPECT_EQ(EvalTripCount(-4, -2, 2, true, true), 2);
-
-  EXPECT_EQ(EvalTripCount(INT16_MIN, 0, 1, true, false), 0x8000);
-  EXPECT_EQ(EvalTripCount(INT16_MIN, 0, 1, true, true), 0x8001);
-  EXPECT_EQ(EvalTripCount(INT16_MIN, 0x7FFF, 1, true, false), 0xFFFF);
-  EXPECT_EQ(EvalTripCount(INT16_MIN + 1, 0x7FFF, 1, true, true), 0xFFFF);
-  EXPECT_EQ(EvalTripCount(INT16_MIN, 0, 0x7FFF, true, false), 2);
-  EXPECT_EQ(EvalTripCount(0x7FFF, 0, -1, true, false), 0x7FFF);
-  EXPECT_EQ(EvalTripCount(0, INT16_MIN, -1, true, false), 0x8000);
-  EXPECT_EQ(EvalTripCount(0, INT16_MIN, -16, true, false), 0x800);
-  EXPECT_EQ(EvalTripCount(0x7FFF, INT16_MIN, -1, true, false), 0xFFFF);
-  EXPECT_EQ(EvalTripCount(0x7FFF, 1, INT16_MIN, true, false), 1);
-  EXPECT_EQ(EvalTripCount(0x7FFF, -1, INT16_MIN, true, true), 2);
-
-  // Finalize the function and verify it.
-  Builder.CreateRetVoid();
-  OMPBuilder.finalize();
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-}
-
-TEST_F(OpenMPIRBuilderTest, CollapseNestedLoops) {
-  using InsertPointTy = OpenMPIRBuilder::InsertPointTy;
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-  F->setName("func");
-
-  IRBuilder<> Builder(BB);
-
-  Type *LCTy = F->getArg(0)->getType();
-  Constant *One = ConstantInt::get(LCTy, 1);
-  Constant *Two = ConstantInt::get(LCTy, 2);
-  Value *OuterTripCount =
-      Builder.CreateAdd(F->getArg(0), Two, "tripcount.outer");
-  Value *InnerTripCount =
-      Builder.CreateAdd(F->getArg(0), One, "tripcount.inner");
-
-  // Fix an insertion point for ComputeIP.
-  BasicBlock *LoopNextEnter =
-      BasicBlock::Create(M->getContext(), "loopnest.enter", F,
-                         Builder.GetInsertBlock()->getNextNode());
-  BranchInst *EnterBr = Builder.CreateBr(LoopNextEnter);
-  InsertPointTy ComputeIP{EnterBr->getParent(), EnterBr->getIterator()};
-
-  Builder.SetInsertPoint(LoopNextEnter);
-  OpenMPIRBuilder::LocationDescription OuterLoc(Builder.saveIP(), DL);
-
-  CanonicalLoopInfo *InnerLoop = nullptr;
-  CallInst *InbetweenLead = nullptr;
-  CallInst *InbetweenTrail = nullptr;
-  CallInst *Call = nullptr;
-  auto OuterLoopBodyGenCB = [&](InsertPointTy OuterCodeGenIP, Value *OuterLC) {
-    Builder.restoreIP(OuterCodeGenIP);
-    InbetweenLead =
-        createPrintfCall(Builder, "In-between lead i=%d\\n", {OuterLC});
-
-    auto InnerLoopBodyGenCB = [&](InsertPointTy InnerCodeGenIP,
-                                  Value *InnerLC) {
-      Builder.restoreIP(InnerCodeGenIP);
-      Call = createPrintfCall(Builder, "body i=%d j=%d\\n", {OuterLC, InnerLC});
-    };
-    InnerLoop = OMPBuilder.createCanonicalLoop(
-        Builder.saveIP(), InnerLoopBodyGenCB, InnerTripCount, "inner");
-
-    Builder.restoreIP(InnerLoop->getAfterIP());
-    InbetweenTrail =
-        createPrintfCall(Builder, "In-between trail i=%d\\n", {OuterLC});
-  };
-  CanonicalLoopInfo *OuterLoop = OMPBuilder.createCanonicalLoop(
-      OuterLoc, OuterLoopBodyGenCB, OuterTripCount, "outer");
-
-  // Finish the function.
-  Builder.restoreIP(OuterLoop->getAfterIP());
-  Builder.CreateRetVoid();
-
-  CanonicalLoopInfo *Collapsed =
-      OMPBuilder.collapseLoops(DL, {OuterLoop, InnerLoop}, ComputeIP);
-
-  OMPBuilder.finalize();
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-
-  // Verify control flow and BB order.
-  BasicBlock *RefOrder[] = {
-      Collapsed->getPreheader(),   Collapsed->getHeader(),
-      Collapsed->getCond(),        Collapsed->getBody(),
-      InbetweenLead->getParent(),  Call->getParent(),
-      InbetweenTrail->getParent(), Collapsed->getLatch(),
-      Collapsed->getExit(),        Collapsed->getAfter(),
-  };
-  EXPECT_TRUE(verifyDFSOrder(F, RefOrder));
-  EXPECT_TRUE(verifyListOrder(F, RefOrder));
-
-  // Verify the total trip count.
-  auto *TripCount = cast<MulOperator>(Collapsed->getTripCount());
-  EXPECT_EQ(TripCount->getOperand(0), OuterTripCount);
-  EXPECT_EQ(TripCount->getOperand(1), InnerTripCount);
-
-  // Verify the changed indvar.
-  auto *OuterIV = cast<BinaryOperator>(Call->getOperand(1));
-  EXPECT_EQ(OuterIV->getOpcode(), Instruction::UDiv);
-  EXPECT_EQ(OuterIV->getParent(), Collapsed->getBody());
-  EXPECT_EQ(OuterIV->getOperand(1), InnerTripCount);
-  EXPECT_EQ(OuterIV->getOperand(0), Collapsed->getIndVar());
-
-  auto *InnerIV = cast<BinaryOperator>(Call->getOperand(2));
-  EXPECT_EQ(InnerIV->getOpcode(), Instruction::URem);
-  EXPECT_EQ(InnerIV->getParent(), Collapsed->getBody());
-  EXPECT_EQ(InnerIV->getOperand(0), Collapsed->getIndVar());
-  EXPECT_EQ(InnerIV->getOperand(1), InnerTripCount);
-
-  EXPECT_EQ(InbetweenLead->getOperand(1), OuterIV);
-  EXPECT_EQ(InbetweenTrail->getOperand(1), OuterIV);
-}
-
-TEST_F(OpenMPIRBuilderTest, TileSingleLoop) {
-  using InsertPointTy = OpenMPIRBuilder::InsertPointTy;
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-  F->setName("func");
-
-  IRBuilder<> Builder(BB);
-  OpenMPIRBuilder::LocationDescription Loc({Builder.saveIP(), DL});
-  Value *TripCount = F->getArg(0);
-
-  BasicBlock *BodyCode = nullptr;
-  Instruction *Call = nullptr;
-  auto LoopBodyGenCB = [&](InsertPointTy CodeGenIP, llvm::Value *LC) {
-    Builder.restoreIP(CodeGenIP);
-    BodyCode = Builder.GetInsertBlock();
-
-    // Add something that consumes the induction variable to the body.
-    Call = createPrintfCall(Builder, "%d\\n", {LC});
-  };
-  CanonicalLoopInfo *Loop =
-      OMPBuilder.createCanonicalLoop(Loc, LoopBodyGenCB, TripCount);
-
-  // Finalize the function.
-  Builder.restoreIP(Loop->getAfterIP());
-  Builder.CreateRetVoid();
-
-  Instruction *OrigIndVar = Loop->getIndVar();
-  EXPECT_EQ(Call->getOperand(1), OrigIndVar);
-
-  // Tile the loop.
-  Constant *TileSize = ConstantInt::get(Loop->getIndVarType(), APInt(32, 7));
-  std::vector<CanonicalLoopInfo *> GenLoops =
-      OMPBuilder.tileLoops(DL, {Loop}, {TileSize});
-
-  OMPBuilder.finalize();
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-
-  EXPECT_EQ(GenLoops.size(), 2u);
-  CanonicalLoopInfo *Floor = GenLoops[0];
-  CanonicalLoopInfo *Tile = GenLoops[1];
-
-  BasicBlock *RefOrder[] = {
-      Floor->getPreheader(), Floor->getHeader(),   Floor->getCond(),
-      Floor->getBody(),      Tile->getPreheader(), Tile->getHeader(),
-      Tile->getCond(),       Tile->getBody(),      BodyCode,
-      Tile->getLatch(),      Tile->getExit(),      Tile->getAfter(),
-      Floor->getLatch(),     Floor->getExit(),     Floor->getAfter(),
-  };
-  EXPECT_TRUE(verifyDFSOrder(F, RefOrder));
-  EXPECT_TRUE(verifyListOrder(F, RefOrder));
-
-  // Check the induction variable.
-  EXPECT_EQ(Call->getParent(), BodyCode);
-  auto *Shift = cast<AddOperator>(Call->getOperand(1));
-  EXPECT_EQ(cast<Instruction>(Shift)->getParent(), Tile->getBody());
-  EXPECT_EQ(Shift->getOperand(1), Tile->getIndVar());
-  auto *Scale = cast<MulOperator>(Shift->getOperand(0));
-  EXPECT_EQ(cast<Instruction>(Scale)->getParent(), Tile->getBody());
-  EXPECT_EQ(Scale->getOperand(0), TileSize);
-  EXPECT_EQ(Scale->getOperand(1), Floor->getIndVar());
-}
-
-TEST_F(OpenMPIRBuilderTest, TileNestedLoops) {
-  using InsertPointTy = OpenMPIRBuilder::InsertPointTy;
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-  F->setName("func");
-
-  IRBuilder<> Builder(BB);
-  OpenMPIRBuilder::LocationDescription Loc({Builder.saveIP(), DL});
-  Value *TripCount = F->getArg(0);
-  Type *LCTy = TripCount->getType();
-
-  BasicBlock *BodyCode = nullptr;
-  CanonicalLoopInfo *InnerLoop = nullptr;
-  auto OuterLoopBodyGenCB = [&](InsertPointTy OuterCodeGenIP,
-                                llvm::Value *OuterLC) {
-    auto InnerLoopBodyGenCB = [&](InsertPointTy InnerCodeGenIP,
-                                  llvm::Value *InnerLC) {
-      Builder.restoreIP(InnerCodeGenIP);
-      BodyCode = Builder.GetInsertBlock();
-
-      // Add something that consumes the induction variables to the body.
-      createPrintfCall(Builder, "i=%d j=%d\\n", {OuterLC, InnerLC});
-    };
-    InnerLoop = OMPBuilder.createCanonicalLoop(
-        OuterCodeGenIP, InnerLoopBodyGenCB, TripCount, "inner");
-  };
-  CanonicalLoopInfo *OuterLoop = OMPBuilder.createCanonicalLoop(
-      Loc, OuterLoopBodyGenCB, TripCount, "outer");
-
-  // Finalize the function.
-  Builder.restoreIP(OuterLoop->getAfterIP());
-  Builder.CreateRetVoid();
-
-  // Tile to loop nest.
-  Constant *OuterTileSize = ConstantInt::get(LCTy, APInt(32, 11));
-  Constant *InnerTileSize = ConstantInt::get(LCTy, APInt(32, 7));
-  std::vector<CanonicalLoopInfo *> GenLoops = OMPBuilder.tileLoops(
-      DL, {OuterLoop, InnerLoop}, {OuterTileSize, InnerTileSize});
-
-  OMPBuilder.finalize();
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-
-  EXPECT_EQ(GenLoops.size(), 4u);
-  CanonicalLoopInfo *Floor1 = GenLoops[0];
-  CanonicalLoopInfo *Floor2 = GenLoops[1];
-  CanonicalLoopInfo *Tile1 = GenLoops[2];
-  CanonicalLoopInfo *Tile2 = GenLoops[3];
-
-  BasicBlock *RefOrder[] = {
-      Floor1->getPreheader(),
-      Floor1->getHeader(),
-      Floor1->getCond(),
-      Floor1->getBody(),
-      Floor2->getPreheader(),
-      Floor2->getHeader(),
-      Floor2->getCond(),
-      Floor2->getBody(),
-      Tile1->getPreheader(),
-      Tile1->getHeader(),
-      Tile1->getCond(),
-      Tile1->getBody(),
-      Tile2->getPreheader(),
-      Tile2->getHeader(),
-      Tile2->getCond(),
-      Tile2->getBody(),
-      BodyCode,
-      Tile2->getLatch(),
-      Tile2->getExit(),
-      Tile2->getAfter(),
-      Tile1->getLatch(),
-      Tile1->getExit(),
-      Tile1->getAfter(),
-      Floor2->getLatch(),
-      Floor2->getExit(),
-      Floor2->getAfter(),
-      Floor1->getLatch(),
-      Floor1->getExit(),
-      Floor1->getAfter(),
-  };
-  EXPECT_TRUE(verifyDFSOrder(F, RefOrder));
-  EXPECT_TRUE(verifyListOrder(F, RefOrder));
-}
-
-TEST_F(OpenMPIRBuilderTest, TileNestedLoopsWithBounds) {
-  using InsertPointTy = OpenMPIRBuilder::InsertPointTy;
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-  F->setName("func");
-
-  IRBuilder<> Builder(BB);
-  Value *TripCount = F->getArg(0);
-  Type *LCTy = TripCount->getType();
-
-  Value *OuterStartVal = ConstantInt::get(LCTy, 2);
-  Value *OuterStopVal = TripCount;
-  Value *OuterStep = ConstantInt::get(LCTy, 5);
-  Value *InnerStartVal = ConstantInt::get(LCTy, 13);
-  Value *InnerStopVal = TripCount;
-  Value *InnerStep = ConstantInt::get(LCTy, 3);
-
-  // Fix an insertion point for ComputeIP.
-  BasicBlock *LoopNextEnter =
-      BasicBlock::Create(M->getContext(), "loopnest.enter", F,
-                         Builder.GetInsertBlock()->getNextNode());
-  BranchInst *EnterBr = Builder.CreateBr(LoopNextEnter);
-  InsertPointTy ComputeIP{EnterBr->getParent(), EnterBr->getIterator()};
-
-  InsertPointTy LoopIP{LoopNextEnter, LoopNextEnter->begin()};
-  OpenMPIRBuilder::LocationDescription Loc({LoopIP, DL});
-
-  BasicBlock *BodyCode = nullptr;
-  CanonicalLoopInfo *InnerLoop = nullptr;
-  CallInst *Call = nullptr;
-  auto OuterLoopBodyGenCB = [&](InsertPointTy OuterCodeGenIP,
-                                llvm::Value *OuterLC) {
-    auto InnerLoopBodyGenCB = [&](InsertPointTy InnerCodeGenIP,
-                                  llvm::Value *InnerLC) {
-      Builder.restoreIP(InnerCodeGenIP);
-      BodyCode = Builder.GetInsertBlock();
-
-      // Add something that consumes the induction variable to the body.
-      Call = createPrintfCall(Builder, "i=%d j=%d\\n", {OuterLC, InnerLC});
-    };
-    InnerLoop = OMPBuilder.createCanonicalLoop(
-        OuterCodeGenIP, InnerLoopBodyGenCB, InnerStartVal, InnerStopVal,
-        InnerStep, false, false, ComputeIP, "inner");
-  };
-  CanonicalLoopInfo *OuterLoop = OMPBuilder.createCanonicalLoop(
-      Loc, OuterLoopBodyGenCB, OuterStartVal, OuterStopVal, OuterStep, false,
-      false, ComputeIP, "outer");
-
-  // Finalize the function
-  Builder.restoreIP(OuterLoop->getAfterIP());
-  Builder.CreateRetVoid();
-
-  // Tile the loop nest.
-  Constant *TileSize0 = ConstantInt::get(LCTy, APInt(32, 11));
-  Constant *TileSize1 = ConstantInt::get(LCTy, APInt(32, 7));
-  std::vector<CanonicalLoopInfo *> GenLoops =
-      OMPBuilder.tileLoops(DL, {OuterLoop, InnerLoop}, {TileSize0, TileSize1});
-
-  OMPBuilder.finalize();
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-
-  EXPECT_EQ(GenLoops.size(), 4u);
-  CanonicalLoopInfo *Floor0 = GenLoops[0];
-  CanonicalLoopInfo *Floor1 = GenLoops[1];
-  CanonicalLoopInfo *Tile0 = GenLoops[2];
-  CanonicalLoopInfo *Tile1 = GenLoops[3];
-
-  BasicBlock *RefOrder[] = {
-      Floor0->getPreheader(),
-      Floor0->getHeader(),
-      Floor0->getCond(),
-      Floor0->getBody(),
-      Floor1->getPreheader(),
-      Floor1->getHeader(),
-      Floor1->getCond(),
-      Floor1->getBody(),
-      Tile0->getPreheader(),
-      Tile0->getHeader(),
-      Tile0->getCond(),
-      Tile0->getBody(),
-      Tile1->getPreheader(),
-      Tile1->getHeader(),
-      Tile1->getCond(),
-      Tile1->getBody(),
-      BodyCode,
-      Tile1->getLatch(),
-      Tile1->getExit(),
-      Tile1->getAfter(),
-      Tile0->getLatch(),
-      Tile0->getExit(),
-      Tile0->getAfter(),
-      Floor1->getLatch(),
-      Floor1->getExit(),
-      Floor1->getAfter(),
-      Floor0->getLatch(),
-      Floor0->getExit(),
-      Floor0->getAfter(),
-  };
-  EXPECT_TRUE(verifyDFSOrder(F, RefOrder));
-  EXPECT_TRUE(verifyListOrder(F, RefOrder));
-
-  EXPECT_EQ(Call->getParent(), BodyCode);
-
-  auto *RangeShift0 = cast<AddOperator>(Call->getOperand(1));
-  EXPECT_EQ(RangeShift0->getOperand(1), OuterStartVal);
-  auto *RangeScale0 = cast<MulOperator>(RangeShift0->getOperand(0));
-  EXPECT_EQ(RangeScale0->getOperand(1), OuterStep);
-  auto *TileShift0 = cast<AddOperator>(RangeScale0->getOperand(0));
-  EXPECT_EQ(cast<Instruction>(TileShift0)->getParent(), Tile1->getBody());
-  EXPECT_EQ(TileShift0->getOperand(1), Tile0->getIndVar());
-  auto *TileScale0 = cast<MulOperator>(TileShift0->getOperand(0));
-  EXPECT_EQ(cast<Instruction>(TileScale0)->getParent(), Tile1->getBody());
-  EXPECT_EQ(TileScale0->getOperand(0), TileSize0);
-  EXPECT_EQ(TileScale0->getOperand(1), Floor0->getIndVar());
-
-  auto *RangeShift1 = cast<AddOperator>(Call->getOperand(2));
-  EXPECT_EQ(cast<Instruction>(RangeShift1)->getParent(), BodyCode);
-  EXPECT_EQ(RangeShift1->getOperand(1), InnerStartVal);
-  auto *RangeScale1 = cast<MulOperator>(RangeShift1->getOperand(0));
-  EXPECT_EQ(cast<Instruction>(RangeScale1)->getParent(), BodyCode);
-  EXPECT_EQ(RangeScale1->getOperand(1), InnerStep);
-  auto *TileShift1 = cast<AddOperator>(RangeScale1->getOperand(0));
-  EXPECT_EQ(cast<Instruction>(TileShift1)->getParent(), Tile1->getBody());
-  EXPECT_EQ(TileShift1->getOperand(1), Tile1->getIndVar());
-  auto *TileScale1 = cast<MulOperator>(TileShift1->getOperand(0));
-  EXPECT_EQ(cast<Instruction>(TileScale1)->getParent(), Tile1->getBody());
-  EXPECT_EQ(TileScale1->getOperand(0), TileSize1);
-  EXPECT_EQ(TileScale1->getOperand(1), Floor1->getIndVar());
-}
-
-TEST_F(OpenMPIRBuilderTest, TileSingleLoopCounts) {
-  using InsertPointTy = OpenMPIRBuilder::InsertPointTy;
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-  IRBuilder<> Builder(BB);
-
-  // Create a loop, tile it, and extract its trip count. All input values are
-  // constant and IRBuilder evaluates all-constant arithmetic inplace, such that
-  // the floor trip count itself will be a ConstantInt. Unfortunately we cannot
-  // do the same for the tile loop.
-  auto GetFloorCount = [&](int64_t Start, int64_t Stop, int64_t Step,
-                           bool IsSigned, bool InclusiveStop,
-                           int64_t TileSize) -> uint64_t {
-    OpenMPIRBuilder::LocationDescription Loc(Builder.saveIP(), DL);
-    Type *LCTy = Type::getInt16Ty(Ctx);
-    Value *StartVal = ConstantInt::get(LCTy, Start);
-    Value *StopVal = ConstantInt::get(LCTy, Stop);
-    Value *StepVal = ConstantInt::get(LCTy, Step);
-
-    // Generate a loop.
-    auto LoopBodyGenCB = [&](InsertPointTy CodeGenIP, llvm::Value *LC) {};
-    CanonicalLoopInfo *Loop =
-        OMPBuilder.createCanonicalLoop(Loc, LoopBodyGenCB, StartVal, StopVal,
-                                       StepVal, IsSigned, InclusiveStop);
-
-    // Tile the loop.
-    Value *TileSizeVal = ConstantInt::get(LCTy, TileSize);
-    std::vector<CanonicalLoopInfo *> GenLoops =
-        OMPBuilder.tileLoops(Loc.DL, {Loop}, {TileSizeVal});
-
-    // Set the insertion pointer to after loop, where the next loop will be
-    // emitted.
-    Builder.restoreIP(Loop->getAfterIP());
-
-    // Extract the trip count.
-    CanonicalLoopInfo *FloorLoop = GenLoops[0];
-    Value *FloorTripCount = FloorLoop->getTripCount();
-    return cast<ConstantInt>(FloorTripCount)->getValue().getZExtValue();
-  };
-
-  // Empty iteration domain.
-  EXPECT_EQ(GetFloorCount(0, 0, 1, false, false, 7), 0u);
-  EXPECT_EQ(GetFloorCount(0, -1, 1, false, true, 7), 0u);
-  EXPECT_EQ(GetFloorCount(-1, -1, -1, true, false, 7), 0u);
-  EXPECT_EQ(GetFloorCount(-1, 0, -1, true, true, 7), 0u);
-  EXPECT_EQ(GetFloorCount(-1, -1, 3, true, false, 7), 0u);
-
-  // Only complete tiles.
-  EXPECT_EQ(GetFloorCount(0, 14, 1, false, false, 7), 2u);
-  EXPECT_EQ(GetFloorCount(0, 14, 1, false, false, 7), 2u);
-  EXPECT_EQ(GetFloorCount(1, 15, 1, false, false, 7), 2u);
-  EXPECT_EQ(GetFloorCount(0, -14, -1, true, false, 7), 2u);
-  EXPECT_EQ(GetFloorCount(-1, -14, -1, true, true, 7), 2u);
-  EXPECT_EQ(GetFloorCount(0, 3 * 7 * 2, 3, false, false, 7), 2u);
-
-  // Only a partial tile.
-  EXPECT_EQ(GetFloorCount(0, 1, 1, false, false, 7), 1u);
-  EXPECT_EQ(GetFloorCount(0, 6, 1, false, false, 7), 1u);
-  EXPECT_EQ(GetFloorCount(-1, 1, 3, true, false, 7), 1u);
-  EXPECT_EQ(GetFloorCount(-1, -2, -1, true, false, 7), 1u);
-  EXPECT_EQ(GetFloorCount(0, 2, 3, false, false, 7), 1u);
-
-  // Complete and partial tiles.
-  EXPECT_EQ(GetFloorCount(0, 13, 1, false, false, 7), 2u);
-  EXPECT_EQ(GetFloorCount(0, 15, 1, false, false, 7), 3u);
-  EXPECT_EQ(GetFloorCount(-1, -14, -1, true, false, 7), 2u);
-  EXPECT_EQ(GetFloorCount(0, 3 * 7 * 5 - 1, 3, false, false, 7), 5u);
-  EXPECT_EQ(GetFloorCount(-1, -3 * 7 * 5, -3, true, false, 7), 5u);
-
-  // Close to 16-bit integer range.
-  EXPECT_EQ(GetFloorCount(0, 0xFFFF, 1, false, false, 1), 0xFFFFu);
-  EXPECT_EQ(GetFloorCount(0, 0xFFFF, 1, false, false, 7), 0xFFFFu / 7 + 1);
-  EXPECT_EQ(GetFloorCount(0, 0xFFFE, 1, false, true, 7), 0xFFFFu / 7 + 1);
-  EXPECT_EQ(GetFloorCount(-0x8000, 0x7FFF, 1, true, false, 7), 0xFFFFu / 7 + 1);
-  EXPECT_EQ(GetFloorCount(-0x7FFF, 0x7FFF, 1, true, true, 7), 0xFFFFu / 7 + 1);
-  EXPECT_EQ(GetFloorCount(0, 0xFFFE, 1, false, false, 0xFFFF), 1u);
-  EXPECT_EQ(GetFloorCount(-0x8000, 0x7FFF, 1, true, false, 0xFFFF), 1u);
-
-  // Finalize the function.
-  Builder.CreateRetVoid();
-  OMPBuilder.finalize();
-
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-}
-
-TEST_F(OpenMPIRBuilderTest, StaticWorkShareLoop) {
-  using InsertPointTy = OpenMPIRBuilder::InsertPointTy;
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-  IRBuilder<> Builder(BB);
-  OpenMPIRBuilder::LocationDescription Loc({Builder.saveIP(), DL});
-
-  Type *LCTy = Type::getInt32Ty(Ctx);
-  Value *StartVal = ConstantInt::get(LCTy, 10);
-  Value *StopVal = ConstantInt::get(LCTy, 52);
-  Value *StepVal = ConstantInt::get(LCTy, 2);
-  auto LoopBodyGen = [&](InsertPointTy, llvm::Value *) {};
-
-  CanonicalLoopInfo *CLI = OMPBuilder.createCanonicalLoop(
-      Loc, LoopBodyGen, StartVal, StopVal, StepVal,
-      /*IsSigned=*/false, /*InclusiveStop=*/false);
-
-  Builder.SetInsertPoint(BB, BB->getFirstInsertionPt());
-  InsertPointTy AllocaIP = Builder.saveIP();
-
-  CLI = OMPBuilder.createStaticWorkshareLoop(Loc, CLI, AllocaIP,
-                                             /*NeedsBarrier=*/true);
-  auto AllocaIter = BB->begin();
-  ASSERT_GE(std::distance(BB->begin(), BB->end()), 4);
-  AllocaInst *PLastIter = dyn_cast<AllocaInst>(&*(AllocaIter++));
-  AllocaInst *PLowerBound = dyn_cast<AllocaInst>(&*(AllocaIter++));
-  AllocaInst *PUpperBound = dyn_cast<AllocaInst>(&*(AllocaIter++));
-  AllocaInst *PStride = dyn_cast<AllocaInst>(&*(AllocaIter++));
-  EXPECT_NE(PLastIter, nullptr);
-  EXPECT_NE(PLowerBound, nullptr);
-  EXPECT_NE(PUpperBound, nullptr);
-  EXPECT_NE(PStride, nullptr);
-
-  auto PreheaderIter = CLI->getPreheader()->begin();
-  ASSERT_GE(
-      std::distance(CLI->getPreheader()->begin(), CLI->getPreheader()->end()),
-      7);
-  StoreInst *LowerBoundStore = dyn_cast<StoreInst>(&*(PreheaderIter++));
-  StoreInst *UpperBoundStore = dyn_cast<StoreInst>(&*(PreheaderIter++));
-  StoreInst *StrideStore = dyn_cast<StoreInst>(&*(PreheaderIter++));
-  ASSERT_NE(LowerBoundStore, nullptr);
-  ASSERT_NE(UpperBoundStore, nullptr);
-  ASSERT_NE(StrideStore, nullptr);
-
-  auto *OrigLowerBound =
-      dyn_cast<ConstantInt>(LowerBoundStore->getValueOperand());
-  auto *OrigUpperBound =
-      dyn_cast<ConstantInt>(UpperBoundStore->getValueOperand());
-  auto *OrigStride = dyn_cast<ConstantInt>(StrideStore->getValueOperand());
-  ASSERT_NE(OrigLowerBound, nullptr);
-  ASSERT_NE(OrigUpperBound, nullptr);
-  ASSERT_NE(OrigStride, nullptr);
-  EXPECT_EQ(OrigLowerBound->getValue(), 0);
-  EXPECT_EQ(OrigUpperBound->getValue(), 20);
-  EXPECT_EQ(OrigStride->getValue(), 1);
-
-  // Check that the loop IV is updated to account for the lower bound returned
-  // by the OpenMP runtime call.
-  BinaryOperator *Add = dyn_cast<BinaryOperator>(&CLI->getBody()->front());
-  EXPECT_EQ(Add->getOperand(0), CLI->getIndVar());
-  auto *LoadedLowerBound = dyn_cast<LoadInst>(Add->getOperand(1));
-  ASSERT_NE(LoadedLowerBound, nullptr);
-  EXPECT_EQ(LoadedLowerBound->getPointerOperand(), PLowerBound);
-
-  // Check that the trip count is updated to account for the lower and upper
-  // bounds return by the OpenMP runtime call.
-  auto *AddOne = dyn_cast<Instruction>(CLI->getTripCount());
-  ASSERT_NE(AddOne, nullptr);
-  ASSERT_TRUE(AddOne->isBinaryOp());
-  auto *One = dyn_cast<ConstantInt>(AddOne->getOperand(1));
-  ASSERT_NE(One, nullptr);
-  EXPECT_EQ(One->getValue(), 1);
-  auto *Difference = dyn_cast<Instruction>(AddOne->getOperand(0));
-  ASSERT_NE(Difference, nullptr);
-  ASSERT_TRUE(Difference->isBinaryOp());
-  EXPECT_EQ(Difference->getOperand(1), LoadedLowerBound);
-  auto *LoadedUpperBound = dyn_cast<LoadInst>(Difference->getOperand(0));
-  ASSERT_NE(LoadedUpperBound, nullptr);
-  EXPECT_EQ(LoadedUpperBound->getPointerOperand(), PUpperBound);
-
-  // The original loop iterator should only be used in the condition, in the
-  // increment and in the statement that adds the lower bound to it.
-  Value *IV = CLI->getIndVar();
-  EXPECT_EQ(std::distance(IV->use_begin(), IV->use_end()), 3);
-
-  // The exit block should contain the "fini" call and the barrier call,
-  // plus the call to obtain the thread ID.
-  BasicBlock *ExitBlock = CLI->getExit();
-  size_t NumCallsInExitBlock =
-      count_if(*ExitBlock, [](Instruction &I) { return isa<CallInst>(I); });
-  EXPECT_EQ(NumCallsInExitBlock, 3u);
-}
-
-TEST_P(OpenMPIRBuilderTestWithParams, DynamicWorkShareLoop) {
-  using InsertPointTy = OpenMPIRBuilder::InsertPointTy;
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-  IRBuilder<> Builder(BB);
-  OpenMPIRBuilder::LocationDescription Loc({Builder.saveIP(), DL});
-
-  omp::OMPScheduleType SchedType = GetParam();
-  uint32_t ChunkSize = 1;
-  switch (SchedType & ~omp::OMPScheduleType::ModifierMask) {
-  case omp::OMPScheduleType::DynamicChunked:
-  case omp::OMPScheduleType::GuidedChunked:
-    ChunkSize = 7;
-    break;
-  case omp::OMPScheduleType::Auto:
-  case omp::OMPScheduleType::Runtime:
-    ChunkSize = 1;
-    break;
-  default:
-    assert(0 && "unknown type for this test");
-    break;
-  }
-
-  Type *LCTy = Type::getInt32Ty(Ctx);
-  Value *StartVal = ConstantInt::get(LCTy, 10);
-  Value *StopVal = ConstantInt::get(LCTy, 52);
-  Value *StepVal = ConstantInt::get(LCTy, 2);
-  Value *ChunkVal = ConstantInt::get(LCTy, ChunkSize);
-  auto LoopBodyGen = [&](InsertPointTy, llvm::Value *) {};
-
-  CanonicalLoopInfo *CLI = OMPBuilder.createCanonicalLoop(
-      Loc, LoopBodyGen, StartVal, StopVal, StepVal,
-      /*IsSigned=*/false, /*InclusiveStop=*/false);
-
-  Builder.SetInsertPoint(BB, BB->getFirstInsertionPt());
-  InsertPointTy AllocaIP = Builder.saveIP();
-
-  // Collect all the info from CLI, as it isn't usable after the call to
-  // createDynamicWorkshareLoop.
-  InsertPointTy AfterIP = CLI->getAfterIP();
-  BasicBlock *Preheader = CLI->getPreheader();
-  BasicBlock *ExitBlock = CLI->getExit();
-  Value *IV = CLI->getIndVar();
-
-  InsertPointTy EndIP =
-      OMPBuilder.createDynamicWorkshareLoop(Loc, CLI, AllocaIP, SchedType,
-                                            /*NeedsBarrier=*/true, ChunkVal);
-  // The returned value should be the "after" point.
-  ASSERT_EQ(EndIP.getBlock(), AfterIP.getBlock());
-  ASSERT_EQ(EndIP.getPoint(), AfterIP.getPoint());
-
-  auto AllocaIter = BB->begin();
-  ASSERT_GE(std::distance(BB->begin(), BB->end()), 4);
-  AllocaInst *PLastIter = dyn_cast<AllocaInst>(&*(AllocaIter++));
-  AllocaInst *PLowerBound = dyn_cast<AllocaInst>(&*(AllocaIter++));
-  AllocaInst *PUpperBound = dyn_cast<AllocaInst>(&*(AllocaIter++));
-  AllocaInst *PStride = dyn_cast<AllocaInst>(&*(AllocaIter++));
-  EXPECT_NE(PLastIter, nullptr);
-  EXPECT_NE(PLowerBound, nullptr);
-  EXPECT_NE(PUpperBound, nullptr);
-  EXPECT_NE(PStride, nullptr);
-
-  auto PreheaderIter = Preheader->begin();
-  ASSERT_GE(std::distance(Preheader->begin(), Preheader->end()), 6);
-  StoreInst *LowerBoundStore = dyn_cast<StoreInst>(&*(PreheaderIter++));
-  StoreInst *UpperBoundStore = dyn_cast<StoreInst>(&*(PreheaderIter++));
-  StoreInst *StrideStore = dyn_cast<StoreInst>(&*(PreheaderIter++));
-  ASSERT_NE(LowerBoundStore, nullptr);
-  ASSERT_NE(UpperBoundStore, nullptr);
-  ASSERT_NE(StrideStore, nullptr);
-
-  CallInst *ThreadIdCall = dyn_cast<CallInst>(&*(PreheaderIter++));
-  ASSERT_NE(ThreadIdCall, nullptr);
-  EXPECT_EQ(ThreadIdCall->getCalledFunction()->getName(),
-            "__kmpc_global_thread_num");
-
-  CallInst *InitCall = dyn_cast<CallInst>(&*PreheaderIter);
-
-  ASSERT_NE(InitCall, nullptr);
-  EXPECT_EQ(InitCall->getCalledFunction()->getName(),
-            "__kmpc_dispatch_init_4u");
-  EXPECT_EQ(InitCall->getNumArgOperands(), 7U);
-  EXPECT_EQ(InitCall->getArgOperand(6), ConstantInt::get(LCTy, ChunkSize));
-  ConstantInt *SchedVal = cast<ConstantInt>(InitCall->getArgOperand(2));
-  EXPECT_EQ(SchedVal->getValue(), static_cast<uint64_t>(SchedType));
-
-  ConstantInt *OrigLowerBound =
-      dyn_cast<ConstantInt>(LowerBoundStore->getValueOperand());
-  ConstantInt *OrigUpperBound =
-      dyn_cast<ConstantInt>(UpperBoundStore->getValueOperand());
-  ConstantInt *OrigStride =
-      dyn_cast<ConstantInt>(StrideStore->getValueOperand());
-  ASSERT_NE(OrigLowerBound, nullptr);
-  ASSERT_NE(OrigUpperBound, nullptr);
-  ASSERT_NE(OrigStride, nullptr);
-  EXPECT_EQ(OrigLowerBound->getValue(), 1);
-  EXPECT_EQ(OrigUpperBound->getValue(), 21);
-  EXPECT_EQ(OrigStride->getValue(), 1);
-
-  // The original loop iterator should only be used in the condition, in the
-  // increment and in the statement that adds the lower bound to it.
-  EXPECT_EQ(std::distance(IV->use_begin(), IV->use_end()), 3);
-
-  // The exit block should contain the barrier call, plus the call to obtain
-  // the thread ID.
-  size_t NumCallsInExitBlock =
-      count_if(*ExitBlock, [](Instruction &I) { return isa<CallInst>(I); });
-  EXPECT_EQ(NumCallsInExitBlock, 2u);
-
-  // Add a termination to our block and check that it is internally consistent.
-  Builder.restoreIP(EndIP);
-  Builder.CreateRetVoid();
-  OMPBuilder.finalize();
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-}
-
-INSTANTIATE_TEST_SUITE_P(
-    OpenMPWSLoopSchedulingTypes, OpenMPIRBuilderTestWithParams,
-    ::testing::Values(omp::OMPScheduleType::DynamicChunked,
-                      omp::OMPScheduleType::GuidedChunked,
-                      omp::OMPScheduleType::Auto, omp::OMPScheduleType::Runtime,
-                      omp::OMPScheduleType::DynamicChunked |
-                          omp::OMPScheduleType::ModifierMonotonic,
-                      omp::OMPScheduleType::DynamicChunked |
-                          omp::OMPScheduleType::ModifierNonmonotonic,
-                      omp::OMPScheduleType::GuidedChunked |
-                          omp::OMPScheduleType::ModifierMonotonic,
-                      omp::OMPScheduleType::GuidedChunked |
-                          omp::OMPScheduleType::ModifierNonmonotonic,
-                      omp::OMPScheduleType::Auto |
-                          omp::OMPScheduleType::ModifierMonotonic,
-                      omp::OMPScheduleType::Runtime |
-                          omp::OMPScheduleType::ModifierMonotonic));
-
-TEST_F(OpenMPIRBuilderTest, MasterDirective) {
-  using InsertPointTy = OpenMPIRBuilder::InsertPointTy;
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-  F->setName("func");
-  IRBuilder<> Builder(BB);
-
-  OpenMPIRBuilder::LocationDescription Loc({Builder.saveIP(), DL});
-
-  AllocaInst *PrivAI = nullptr;
-
-  BasicBlock *EntryBB = nullptr;
-  BasicBlock *ExitBB = nullptr;
-  BasicBlock *ThenBB = nullptr;
-
-  auto BodyGenCB = [&](InsertPointTy AllocaIP, InsertPointTy CodeGenIP,
-                       BasicBlock &FiniBB) {
-    if (AllocaIP.isSet())
-      Builder.restoreIP(AllocaIP);
-    else
-      Builder.SetInsertPoint(&*(F->getEntryBlock().getFirstInsertionPt()));
-    PrivAI = Builder.CreateAlloca(F->arg_begin()->getType());
-    Builder.CreateStore(F->arg_begin(), PrivAI);
-
-    llvm::BasicBlock *CodeGenIPBB = CodeGenIP.getBlock();
-    llvm::Instruction *CodeGenIPInst = &*CodeGenIP.getPoint();
-    EXPECT_EQ(CodeGenIPBB->getTerminator(), CodeGenIPInst);
-
-    Builder.restoreIP(CodeGenIP);
-
-    // collect some info for checks later
-    ExitBB = FiniBB.getUniqueSuccessor();
-    ThenBB = Builder.GetInsertBlock();
-    EntryBB = ThenBB->getUniquePredecessor();
-
-    // simple instructions for body
-    Value *PrivLoad = Builder.CreateLoad(PrivAI->getAllocatedType(), PrivAI,
-                                         "local.use");
-    Builder.CreateICmpNE(F->arg_begin(), PrivLoad);
-  };
-
-  auto FiniCB = [&](InsertPointTy IP) {
-    BasicBlock *IPBB = IP.getBlock();
-    EXPECT_NE(IPBB->end(), IP.getPoint());
-  };
-
-  Builder.restoreIP(OMPBuilder.createMaster(Builder, BodyGenCB, FiniCB));
-  Value *EntryBBTI = EntryBB->getTerminator();
-  EXPECT_NE(EntryBBTI, nullptr);
-  EXPECT_TRUE(isa<BranchInst>(EntryBBTI));
-  BranchInst *EntryBr = cast<BranchInst>(EntryBB->getTerminator());
-  EXPECT_TRUE(EntryBr->isConditional());
-  EXPECT_EQ(EntryBr->getSuccessor(0), ThenBB);
-  EXPECT_EQ(ThenBB->getUniqueSuccessor(), ExitBB);
-  EXPECT_EQ(EntryBr->getSuccessor(1), ExitBB);
-
-  CmpInst *CondInst = cast<CmpInst>(EntryBr->getCondition());
-  EXPECT_TRUE(isa<CallInst>(CondInst->getOperand(0)));
-
-  CallInst *MasterEntryCI = cast<CallInst>(CondInst->getOperand(0));
-  EXPECT_EQ(MasterEntryCI->getNumArgOperands(), 2U);
-  EXPECT_EQ(MasterEntryCI->getCalledFunction()->getName(), "__kmpc_master");
-  EXPECT_TRUE(isa<GlobalVariable>(MasterEntryCI->getArgOperand(0)));
-
-  CallInst *MasterEndCI = nullptr;
-  for (auto &FI : *ThenBB) {
-    Instruction *cur = &FI;
-    if (isa<CallInst>(cur)) {
-      MasterEndCI = cast<CallInst>(cur);
-      if (MasterEndCI->getCalledFunction()->getName() == "__kmpc_end_master")
-        break;
-      MasterEndCI = nullptr;
-    }
-  }
-  EXPECT_NE(MasterEndCI, nullptr);
-  EXPECT_EQ(MasterEndCI->getNumArgOperands(), 2U);
-  EXPECT_TRUE(isa<GlobalVariable>(MasterEndCI->getArgOperand(0)));
-  EXPECT_EQ(MasterEndCI->getArgOperand(1), MasterEntryCI->getArgOperand(1));
-}
-
-TEST_F(OpenMPIRBuilderTest, MaskedDirective) {
-  using InsertPointTy = OpenMPIRBuilder::InsertPointTy;
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-  F->setName("func");
-  IRBuilder<> Builder(BB);
-
-  OpenMPIRBuilder::LocationDescription Loc({Builder.saveIP(), DL});
-
-  AllocaInst *PrivAI = nullptr;
-
-  BasicBlock *EntryBB = nullptr;
-  BasicBlock *ExitBB = nullptr;
-  BasicBlock *ThenBB = nullptr;
-
-  auto BodyGenCB = [&](InsertPointTy AllocaIP, InsertPointTy CodeGenIP,
-                       BasicBlock &FiniBB) {
-    if (AllocaIP.isSet())
-      Builder.restoreIP(AllocaIP);
-    else
-      Builder.SetInsertPoint(&*(F->getEntryBlock().getFirstInsertionPt()));
-    PrivAI = Builder.CreateAlloca(F->arg_begin()->getType());
-    Builder.CreateStore(F->arg_begin(), PrivAI);
-
-    llvm::BasicBlock *CodeGenIPBB = CodeGenIP.getBlock();
-    llvm::Instruction *CodeGenIPInst = &*CodeGenIP.getPoint();
-    EXPECT_EQ(CodeGenIPBB->getTerminator(), CodeGenIPInst);
-
-    Builder.restoreIP(CodeGenIP);
-
-    // collect some info for checks later
-    ExitBB = FiniBB.getUniqueSuccessor();
-    ThenBB = Builder.GetInsertBlock();
-    EntryBB = ThenBB->getUniquePredecessor();
-
-    // simple instructions for body
-    Value *PrivLoad =
-        Builder.CreateLoad(PrivAI->getAllocatedType(), PrivAI, "local.use");
-    Builder.CreateICmpNE(F->arg_begin(), PrivLoad);
-  };
-
-  auto FiniCB = [&](InsertPointTy IP) {
-    BasicBlock *IPBB = IP.getBlock();
-    EXPECT_NE(IPBB->end(), IP.getPoint());
-  };
-
-  Constant *Filter = ConstantInt::get(Type::getInt32Ty(M->getContext()), 0);
-  Builder.restoreIP(
-      OMPBuilder.createMasked(Builder, BodyGenCB, FiniCB, Filter));
-  Value *EntryBBTI = EntryBB->getTerminator();
-  EXPECT_NE(EntryBBTI, nullptr);
-  EXPECT_TRUE(isa<BranchInst>(EntryBBTI));
-  BranchInst *EntryBr = cast<BranchInst>(EntryBB->getTerminator());
-  EXPECT_TRUE(EntryBr->isConditional());
-  EXPECT_EQ(EntryBr->getSuccessor(0), ThenBB);
-  EXPECT_EQ(ThenBB->getUniqueSuccessor(), ExitBB);
-  EXPECT_EQ(EntryBr->getSuccessor(1), ExitBB);
-
-  CmpInst *CondInst = cast<CmpInst>(EntryBr->getCondition());
-  EXPECT_TRUE(isa<CallInst>(CondInst->getOperand(0)));
-
-  CallInst *MaskedEntryCI = cast<CallInst>(CondInst->getOperand(0));
-  EXPECT_EQ(MaskedEntryCI->getNumArgOperands(), 3U);
-  EXPECT_EQ(MaskedEntryCI->getCalledFunction()->getName(), "__kmpc_masked");
-  EXPECT_TRUE(isa<GlobalVariable>(MaskedEntryCI->getArgOperand(0)));
-
-  CallInst *MaskedEndCI = nullptr;
-  for (auto &FI : *ThenBB) {
-    Instruction *cur = &FI;
-    if (isa<CallInst>(cur)) {
-      MaskedEndCI = cast<CallInst>(cur);
-      if (MaskedEndCI->getCalledFunction()->getName() == "__kmpc_end_masked")
-        break;
-      MaskedEndCI = nullptr;
-    }
-  }
-  EXPECT_NE(MaskedEndCI, nullptr);
-  EXPECT_EQ(MaskedEndCI->getNumArgOperands(), 2U);
-  EXPECT_TRUE(isa<GlobalVariable>(MaskedEndCI->getArgOperand(0)));
-  EXPECT_EQ(MaskedEndCI->getArgOperand(1), MaskedEntryCI->getArgOperand(1));
-}
-
-TEST_F(OpenMPIRBuilderTest, CriticalDirective) {
-  using InsertPointTy = OpenMPIRBuilder::InsertPointTy;
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-  F->setName("func");
-  IRBuilder<> Builder(BB);
-
-  OpenMPIRBuilder::LocationDescription Loc({Builder.saveIP(), DL});
-
-  AllocaInst *PrivAI = Builder.CreateAlloca(F->arg_begin()->getType());
-
-  BasicBlock *EntryBB = nullptr;
-
-  auto BodyGenCB = [&](InsertPointTy AllocaIP, InsertPointTy CodeGenIP,
-                       BasicBlock &FiniBB) {
-    // collect some info for checks later
-    EntryBB = FiniBB.getUniquePredecessor();
-
-    // actual start for bodyCB
-    llvm::BasicBlock *CodeGenIPBB = CodeGenIP.getBlock();
-    llvm::Instruction *CodeGenIPInst = &*CodeGenIP.getPoint();
-    EXPECT_EQ(CodeGenIPBB->getTerminator(), CodeGenIPInst);
-    EXPECT_EQ(EntryBB, CodeGenIPBB);
-
-    // body begin
-    Builder.restoreIP(CodeGenIP);
-    Builder.CreateStore(F->arg_begin(), PrivAI);
-    Value *PrivLoad = Builder.CreateLoad(PrivAI->getAllocatedType(), PrivAI,
-                                         "local.use");
-    Builder.CreateICmpNE(F->arg_begin(), PrivLoad);
-  };
-
-  auto FiniCB = [&](InsertPointTy IP) {
-    BasicBlock *IPBB = IP.getBlock();
-    EXPECT_NE(IPBB->end(), IP.getPoint());
-  };
-
-  Builder.restoreIP(OMPBuilder.createCritical(Builder, BodyGenCB, FiniCB,
-                                              "testCRT", nullptr));
-
-  Value *EntryBBTI = EntryBB->getTerminator();
-  EXPECT_EQ(EntryBBTI, nullptr);
-
-  CallInst *CriticalEntryCI = nullptr;
-  for (auto &EI : *EntryBB) {
-    Instruction *cur = &EI;
-    if (isa<CallInst>(cur)) {
-      CriticalEntryCI = cast<CallInst>(cur);
-      if (CriticalEntryCI->getCalledFunction()->getName() == "__kmpc_critical")
-        break;
-      CriticalEntryCI = nullptr;
-    }
-  }
-  EXPECT_NE(CriticalEntryCI, nullptr);
-  EXPECT_EQ(CriticalEntryCI->getNumArgOperands(), 3U);
-  EXPECT_EQ(CriticalEntryCI->getCalledFunction()->getName(), "__kmpc_critical");
-  EXPECT_TRUE(isa<GlobalVariable>(CriticalEntryCI->getArgOperand(0)));
-
-  CallInst *CriticalEndCI = nullptr;
-  for (auto &FI : *EntryBB) {
-    Instruction *cur = &FI;
-    if (isa<CallInst>(cur)) {
-      CriticalEndCI = cast<CallInst>(cur);
-      if (CriticalEndCI->getCalledFunction()->getName() ==
-          "__kmpc_end_critical")
-        break;
-      CriticalEndCI = nullptr;
-    }
-  }
-  EXPECT_NE(CriticalEndCI, nullptr);
-  EXPECT_EQ(CriticalEndCI->getNumArgOperands(), 3U);
-  EXPECT_TRUE(isa<GlobalVariable>(CriticalEndCI->getArgOperand(0)));
-  EXPECT_EQ(CriticalEndCI->getArgOperand(1), CriticalEntryCI->getArgOperand(1));
-  PointerType *CriticalNamePtrTy =
-      PointerType::getUnqual(ArrayType::get(Type::getInt32Ty(Ctx), 8));
-  EXPECT_EQ(CriticalEndCI->getArgOperand(2), CriticalEntryCI->getArgOperand(2));
-  EXPECT_EQ(CriticalEndCI->getArgOperand(2)->getType(), CriticalNamePtrTy);
-}
-
-TEST_F(OpenMPIRBuilderTest, CopyinBlocks) {
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-  F->setName("func");
-  IRBuilder<> Builder(BB);
-
-  OpenMPIRBuilder::LocationDescription Loc({Builder.saveIP(), DL});
-
-  IntegerType* Int32 = Type::getInt32Ty(M->getContext());
-  AllocaInst* MasterAddress = Builder.CreateAlloca(Int32->getPointerTo());
-	AllocaInst* PrivAddress = Builder.CreateAlloca(Int32->getPointerTo());
-
-  BasicBlock *EntryBB = BB;
-
-  OMPBuilder.createCopyinClauseBlocks(Builder.saveIP(), MasterAddress,
-                                      PrivAddress, Int32, /*BranchtoEnd*/ true);
-
-  BranchInst* EntryBr = dyn_cast_or_null<BranchInst>(EntryBB->getTerminator());
-
-  EXPECT_NE(EntryBr, nullptr);
-  EXPECT_TRUE(EntryBr->isConditional());
-
-  BasicBlock* NotMasterBB = EntryBr->getSuccessor(0);
-  BasicBlock* CopyinEnd = EntryBr->getSuccessor(1);
-  CmpInst* CMP = dyn_cast_or_null<CmpInst>(EntryBr->getCondition());
-
-  EXPECT_NE(CMP, nullptr);
-  EXPECT_NE(NotMasterBB, nullptr);
-  EXPECT_NE(CopyinEnd, nullptr);
-
-  BranchInst* NotMasterBr = dyn_cast_or_null<BranchInst>(NotMasterBB->getTerminator());
-  EXPECT_NE(NotMasterBr, nullptr);
-  EXPECT_FALSE(NotMasterBr->isConditional());
-  EXPECT_EQ(CopyinEnd,NotMasterBr->getSuccessor(0));
-}
-
-TEST_F(OpenMPIRBuilderTest, SingleDirective) {
-  using InsertPointTy = OpenMPIRBuilder::InsertPointTy;
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-  F->setName("func");
-  IRBuilder<> Builder(BB);
-
-  OpenMPIRBuilder::LocationDescription Loc({Builder.saveIP(), DL});
-
-  AllocaInst *PrivAI = nullptr;
-
-  BasicBlock *EntryBB = nullptr;
-  BasicBlock *ExitBB = nullptr;
-  BasicBlock *ThenBB = nullptr;
-
-  auto BodyGenCB = [&](InsertPointTy AllocaIP, InsertPointTy CodeGenIP,
-                       BasicBlock &FiniBB) {
-    if (AllocaIP.isSet())
-      Builder.restoreIP(AllocaIP);
-    else
-      Builder.SetInsertPoint(&*(F->getEntryBlock().getFirstInsertionPt()));
-    PrivAI = Builder.CreateAlloca(F->arg_begin()->getType());
-    Builder.CreateStore(F->arg_begin(), PrivAI);
-
-    llvm::BasicBlock *CodeGenIPBB = CodeGenIP.getBlock();
-    llvm::Instruction *CodeGenIPInst = &*CodeGenIP.getPoint();
-    EXPECT_EQ(CodeGenIPBB->getTerminator(), CodeGenIPInst);
-
-    Builder.restoreIP(CodeGenIP);
-
-    // collect some info for checks later
-    ExitBB = FiniBB.getUniqueSuccessor();
-    ThenBB = Builder.GetInsertBlock();
-    EntryBB = ThenBB->getUniquePredecessor();
-
-    // simple instructions for body
-    Value *PrivLoad = Builder.CreateLoad(PrivAI->getAllocatedType(), PrivAI,
-                                         "local.use");
-    Builder.CreateICmpNE(F->arg_begin(), PrivLoad);
-  };
-
-  auto FiniCB = [&](InsertPointTy IP) {
-    BasicBlock *IPBB = IP.getBlock();
-    EXPECT_NE(IPBB->end(), IP.getPoint());
-  };
-
-  Builder.restoreIP(
-      OMPBuilder.createSingle(Builder, BodyGenCB, FiniCB, /*DidIt*/ nullptr));
-  Value *EntryBBTI = EntryBB->getTerminator();
-  EXPECT_NE(EntryBBTI, nullptr);
-  EXPECT_TRUE(isa<BranchInst>(EntryBBTI));
-  BranchInst *EntryBr = cast<BranchInst>(EntryBB->getTerminator());
-  EXPECT_TRUE(EntryBr->isConditional());
-  EXPECT_EQ(EntryBr->getSuccessor(0), ThenBB);
-  EXPECT_EQ(ThenBB->getUniqueSuccessor(), ExitBB);
-  EXPECT_EQ(EntryBr->getSuccessor(1), ExitBB);
-
-  CmpInst *CondInst = cast<CmpInst>(EntryBr->getCondition());
-  EXPECT_TRUE(isa<CallInst>(CondInst->getOperand(0)));
-
-  CallInst *SingleEntryCI = cast<CallInst>(CondInst->getOperand(0));
-  EXPECT_EQ(SingleEntryCI->getNumArgOperands(), 2U);
-  EXPECT_EQ(SingleEntryCI->getCalledFunction()->getName(), "__kmpc_single");
-  EXPECT_TRUE(isa<GlobalVariable>(SingleEntryCI->getArgOperand(0)));
-
-  CallInst *SingleEndCI = nullptr;
-  for (auto &FI : *ThenBB) {
-    Instruction *cur = &FI;
-    if (isa<CallInst>(cur)) {
-      SingleEndCI = cast<CallInst>(cur);
-      if (SingleEndCI->getCalledFunction()->getName() == "__kmpc_end_single")
-        break;
-      SingleEndCI = nullptr;
-    }
-  }
-  EXPECT_NE(SingleEndCI, nullptr);
-  EXPECT_EQ(SingleEndCI->getNumArgOperands(), 2U);
-  EXPECT_TRUE(isa<GlobalVariable>(SingleEndCI->getArgOperand(0)));
-  EXPECT_EQ(SingleEndCI->getArgOperand(1), SingleEntryCI->getArgOperand(1));
-}
-
-TEST_F(OpenMPIRBuilderTest, OMPAtomicReadFlt) {
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-  F->setName("func");
-  IRBuilder<> Builder(BB);
-
-  OpenMPIRBuilder::LocationDescription Loc({Builder.saveIP(), DL});
-
-  Type *Float32 = Type::getFloatTy(M->getContext());
-  AllocaInst *XVal = Builder.CreateAlloca(Float32);
-  XVal->setName("AtomicVar");
-  AllocaInst *VVal = Builder.CreateAlloca(Float32);
-  VVal->setName("AtomicRead");
-  AtomicOrdering AO = AtomicOrdering::Monotonic;
-  OpenMPIRBuilder::AtomicOpValue X = {XVal, false, false};
-  OpenMPIRBuilder::AtomicOpValue V = {VVal, false, false};
-
-  Builder.restoreIP(OMPBuilder.createAtomicRead(Loc, X, V, AO));
-
-  IntegerType *IntCastTy =
-      IntegerType::get(M->getContext(), Float32->getScalarSizeInBits());
-
-  BitCastInst *CastFrmFlt = cast<BitCastInst>(VVal->getNextNode());
-  EXPECT_EQ(CastFrmFlt->getSrcTy(), Float32->getPointerTo());
-  EXPECT_EQ(CastFrmFlt->getDestTy(), IntCastTy->getPointerTo());
-  EXPECT_EQ(CastFrmFlt->getOperand(0), XVal);
-
-  LoadInst *AtomicLoad = cast<LoadInst>(CastFrmFlt->getNextNode());
-  EXPECT_TRUE(AtomicLoad->isAtomic());
-  EXPECT_EQ(AtomicLoad->getPointerOperand(), CastFrmFlt);
-
-  BitCastInst *CastToFlt = cast<BitCastInst>(AtomicLoad->getNextNode());
-  EXPECT_EQ(CastToFlt->getSrcTy(), IntCastTy);
-  EXPECT_EQ(CastToFlt->getDestTy(), Float32);
-  EXPECT_EQ(CastToFlt->getOperand(0), AtomicLoad);
-
-  StoreInst *StoreofAtomic = cast<StoreInst>(CastToFlt->getNextNode());
-  EXPECT_EQ(StoreofAtomic->getValueOperand(), CastToFlt);
-  EXPECT_EQ(StoreofAtomic->getPointerOperand(), VVal);
-
-  Builder.CreateRetVoid();
-  OMPBuilder.finalize();
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-}
-
-TEST_F(OpenMPIRBuilderTest, OMPAtomicReadInt) {
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-  F->setName("func");
-  IRBuilder<> Builder(BB);
-
-  OpenMPIRBuilder::LocationDescription Loc({Builder.saveIP(), DL});
-
-  IntegerType *Int32 = Type::getInt32Ty(M->getContext());
-  AllocaInst *XVal = Builder.CreateAlloca(Int32);
-  XVal->setName("AtomicVar");
-  AllocaInst *VVal = Builder.CreateAlloca(Int32);
-  VVal->setName("AtomicRead");
-  AtomicOrdering AO = AtomicOrdering::Monotonic;
-  OpenMPIRBuilder::AtomicOpValue X = {XVal, false, false};
-  OpenMPIRBuilder::AtomicOpValue V = {VVal, false, false};
-
-  BasicBlock *EntryBB = BB;
-
-  Builder.restoreIP(OMPBuilder.createAtomicRead(Loc, X, V, AO));
-  LoadInst *AtomicLoad = nullptr;
-  StoreInst *StoreofAtomic = nullptr;
-
-  for (Instruction &Cur : *EntryBB) {
-    if (isa<LoadInst>(Cur)) {
-      AtomicLoad = cast<LoadInst>(&Cur);
-      if (AtomicLoad->getPointerOperand() == XVal)
-        continue;
-      AtomicLoad = nullptr;
-    } else if (isa<StoreInst>(Cur)) {
-      StoreofAtomic = cast<StoreInst>(&Cur);
-      if (StoreofAtomic->getPointerOperand() == VVal)
-        continue;
-      StoreofAtomic = nullptr;
-    }
-  }
-
-  EXPECT_NE(AtomicLoad, nullptr);
-  EXPECT_TRUE(AtomicLoad->isAtomic());
-
-  EXPECT_NE(StoreofAtomic, nullptr);
-  EXPECT_EQ(StoreofAtomic->getValueOperand(), AtomicLoad);
-
-  Builder.CreateRetVoid();
-  OMPBuilder.finalize();
-
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-}
-
-TEST_F(OpenMPIRBuilderTest, OMPAtomicWriteFlt) {
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-  F->setName("func");
-  IRBuilder<> Builder(BB);
-
-  OpenMPIRBuilder::LocationDescription Loc({Builder.saveIP(), DL});
-
-  LLVMContext &Ctx = M->getContext();
-  Type *Float32 = Type::getFloatTy(Ctx);
-  AllocaInst *XVal = Builder.CreateAlloca(Float32);
-  XVal->setName("AtomicVar");
-  OpenMPIRBuilder::AtomicOpValue X = {XVal, false, false};
-  AtomicOrdering AO = AtomicOrdering::Monotonic;
-  Constant *ValToWrite = ConstantFP::get(Float32, 1.0);
-
-  Builder.restoreIP(OMPBuilder.createAtomicWrite(Loc, X, ValToWrite, AO));
-
-  IntegerType *IntCastTy =
-      IntegerType::get(M->getContext(), Float32->getScalarSizeInBits());
-
-  BitCastInst *CastFrmFlt = cast<BitCastInst>(XVal->getNextNode());
-  EXPECT_EQ(CastFrmFlt->getSrcTy(), Float32->getPointerTo());
-  EXPECT_EQ(CastFrmFlt->getDestTy(), IntCastTy->getPointerTo());
-  EXPECT_EQ(CastFrmFlt->getOperand(0), XVal);
-
-  Value *ExprCast = Builder.CreateBitCast(ValToWrite, IntCastTy);
-
-  StoreInst *StoreofAtomic = cast<StoreInst>(CastFrmFlt->getNextNode());
-  EXPECT_EQ(StoreofAtomic->getValueOperand(), ExprCast);
-  EXPECT_EQ(StoreofAtomic->getPointerOperand(), CastFrmFlt);
-  EXPECT_TRUE(StoreofAtomic->isAtomic());
-
-  Builder.CreateRetVoid();
-  OMPBuilder.finalize();
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-}
-
-TEST_F(OpenMPIRBuilderTest, OMPAtomicWriteInt) {
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-  F->setName("func");
-  IRBuilder<> Builder(BB);
-
-  OpenMPIRBuilder::LocationDescription Loc({Builder.saveIP(), DL});
-
-  LLVMContext &Ctx = M->getContext();
-  IntegerType *Int32 = Type::getInt32Ty(Ctx);
-  AllocaInst *XVal = Builder.CreateAlloca(Int32);
-  XVal->setName("AtomicVar");
-  OpenMPIRBuilder::AtomicOpValue X = {XVal, false, false};
-  AtomicOrdering AO = AtomicOrdering::Monotonic;
-  ConstantInt *ValToWrite = ConstantInt::get(Type::getInt32Ty(Ctx), 1U);
-
-  BasicBlock *EntryBB = BB;
-
-  Builder.restoreIP(OMPBuilder.createAtomicWrite(Loc, X, ValToWrite, AO));
-
-  StoreInst *StoreofAtomic = nullptr;
-
-  for (Instruction &Cur : *EntryBB) {
-    if (isa<StoreInst>(Cur)) {
-      StoreofAtomic = cast<StoreInst>(&Cur);
-      if (StoreofAtomic->getPointerOperand() == XVal)
-        continue;
-      StoreofAtomic = nullptr;
-    }
-  }
-
-  EXPECT_NE(StoreofAtomic, nullptr);
-  EXPECT_TRUE(StoreofAtomic->isAtomic());
-  EXPECT_EQ(StoreofAtomic->getValueOperand(), ValToWrite);
-
-  Builder.CreateRetVoid();
-  OMPBuilder.finalize();
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-}
-
-TEST_F(OpenMPIRBuilderTest, OMPAtomicUpdate) {
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-  F->setName("func");
-  IRBuilder<> Builder(BB);
-
-  OpenMPIRBuilder::LocationDescription Loc({Builder.saveIP(), DL});
-
-  IntegerType *Int32 = Type::getInt32Ty(M->getContext());
-  AllocaInst *XVal = Builder.CreateAlloca(Int32);
-  XVal->setName("AtomicVar");
-  Builder.CreateStore(ConstantInt::get(Type::getInt32Ty(Ctx), 0U), XVal);
-  OpenMPIRBuilder::AtomicOpValue X = {XVal, false, false};
-  AtomicOrdering AO = AtomicOrdering::Monotonic;
-  ConstantInt *ConstVal = ConstantInt::get(Type::getInt32Ty(Ctx), 1U);
-  Value *Expr = nullptr;
-  AtomicRMWInst::BinOp RMWOp = AtomicRMWInst::Sub;
-  bool IsXLHSInRHSPart = false;
-
-  BasicBlock *EntryBB = BB;
-  Instruction *AllocIP = EntryBB->getFirstNonPHI();
-  Value *Sub = nullptr;
-
-  auto UpdateOp = [&](Value *Atomic, IRBuilder<> &IRB) {
-    Sub = IRB.CreateSub(ConstVal, Atomic);
-    return Sub;
-  };
-  Builder.restoreIP(OMPBuilder.createAtomicUpdate(
-      Builder, AllocIP, X, Expr, AO, RMWOp, UpdateOp, IsXLHSInRHSPart));
-  BasicBlock *ContBB = EntryBB->getSingleSuccessor();
-  BranchInst *ContTI = dyn_cast<BranchInst>(ContBB->getTerminator());
-  EXPECT_NE(ContTI, nullptr);
-  BasicBlock *EndBB = ContTI->getSuccessor(0);
-  EXPECT_TRUE(ContTI->isConditional());
-  EXPECT_EQ(ContTI->getSuccessor(1), ContBB);
-  EXPECT_NE(EndBB, nullptr);
-
-  PHINode *Phi = dyn_cast<PHINode>(&ContBB->front());
-  EXPECT_NE(Phi, nullptr);
-  EXPECT_EQ(Phi->getNumIncomingValues(), 2U);
-  EXPECT_EQ(Phi->getIncomingBlock(0), EntryBB);
-  EXPECT_EQ(Phi->getIncomingBlock(1), ContBB);
-
-  EXPECT_EQ(Sub->getNumUses(), 1U);
-  StoreInst *St = dyn_cast<StoreInst>(Sub->user_back());
-  AllocaInst *UpdateTemp = dyn_cast<AllocaInst>(St->getPointerOperand());
-
-  ExtractValueInst *ExVI1 =
-      dyn_cast<ExtractValueInst>(Phi->getIncomingValueForBlock(ContBB));
-  EXPECT_NE(ExVI1, nullptr);
-  AtomicCmpXchgInst *CmpExchg =
-      dyn_cast<AtomicCmpXchgInst>(ExVI1->getAggregateOperand());
-  EXPECT_NE(CmpExchg, nullptr);
-  EXPECT_EQ(CmpExchg->getPointerOperand(), XVal);
-  EXPECT_EQ(CmpExchg->getCompareOperand(), Phi);
-  EXPECT_EQ(CmpExchg->getSuccessOrdering(), AtomicOrdering::Monotonic);
-
-  LoadInst *Ld = dyn_cast<LoadInst>(CmpExchg->getNewValOperand());
-  EXPECT_NE(Ld, nullptr);
-  EXPECT_EQ(UpdateTemp, Ld->getPointerOperand());
-
-  Builder.CreateRetVoid();
-  OMPBuilder.finalize();
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-}
-
-TEST_F(OpenMPIRBuilderTest, OMPAtomicCapture) {
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-  F->setName("func");
-  IRBuilder<> Builder(BB);
-
-  OpenMPIRBuilder::LocationDescription Loc({Builder.saveIP(), DL});
-
-  LLVMContext &Ctx = M->getContext();
-  IntegerType *Int32 = Type::getInt32Ty(Ctx);
-  AllocaInst *XVal = Builder.CreateAlloca(Int32);
-  XVal->setName("AtomicVar");
-  AllocaInst *VVal = Builder.CreateAlloca(Int32);
-  VVal->setName("AtomicCapTar");
-  StoreInst *Init =
-      Builder.CreateStore(ConstantInt::get(Type::getInt32Ty(Ctx), 0U), XVal);
-
-  OpenMPIRBuilder::AtomicOpValue X = {XVal, false, false};
-  OpenMPIRBuilder::AtomicOpValue V = {VVal, false, false};
-  AtomicOrdering AO = AtomicOrdering::Monotonic;
-  ConstantInt *Expr = ConstantInt::get(Type::getInt32Ty(Ctx), 1U);
-  AtomicRMWInst::BinOp RMWOp = AtomicRMWInst::Add;
-  bool IsXLHSInRHSPart = true;
-  bool IsPostfixUpdate = true;
-  bool UpdateExpr = true;
-
-  BasicBlock *EntryBB = BB;
-  Instruction *AllocIP = EntryBB->getFirstNonPHI();
-
-  // integer update - not used
-  auto UpdateOp = [&](Value *Atomic, IRBuilder<> &IRB) { return nullptr; };
-
-  Builder.restoreIP(OMPBuilder.createAtomicCapture(
-      Builder, AllocIP, X, V, Expr, AO, RMWOp, UpdateOp, UpdateExpr,
-      IsPostfixUpdate, IsXLHSInRHSPart));
-  EXPECT_EQ(EntryBB->getParent()->size(), 1U);
-  AtomicRMWInst *ARWM = dyn_cast<AtomicRMWInst>(Init->getNextNode());
-  EXPECT_NE(ARWM, nullptr);
-  EXPECT_EQ(ARWM->getPointerOperand(), XVal);
-  EXPECT_EQ(ARWM->getOperation(), RMWOp);
-  StoreInst *St = dyn_cast<StoreInst>(ARWM->user_back());
-  EXPECT_NE(St, nullptr);
-  EXPECT_EQ(St->getPointerOperand(), VVal);
-
-  Builder.CreateRetVoid();
-  OMPBuilder.finalize();
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-}
-
-TEST_F(OpenMPIRBuilderTest, CreateSections) {
-  using InsertPointTy = OpenMPIRBuilder::InsertPointTy;
-  using BodyGenCallbackTy = llvm::OpenMPIRBuilder::StorableBodyGenCallbackTy;
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-  F->setName("func");
-  IRBuilder<> Builder(BB);
-
-  OpenMPIRBuilder::LocationDescription Loc({Builder.saveIP(), DL});
-  llvm::SmallVector<BodyGenCallbackTy, 4> SectionCBVector;
-  llvm::SmallVector<BasicBlock *, 4> CaseBBs;
-
-  BasicBlock *SwitchBB = nullptr;
-  BasicBlock *ForExitBB = nullptr;
-  BasicBlock *ForIncBB = nullptr;
-  AllocaInst *PrivAI = nullptr;
-  SwitchInst *Switch = nullptr;
-
-  unsigned NumBodiesGenerated = 0;
-  unsigned NumFiniCBCalls = 0;
-  PrivAI = Builder.CreateAlloca(F->arg_begin()->getType());
-
-  auto FiniCB = [&](InsertPointTy IP) {
-    ++NumFiniCBCalls;
-    BasicBlock *IPBB = IP.getBlock();
-    EXPECT_NE(IPBB->end(), IP.getPoint());
-  };
-
-  auto SectionCB = [&](InsertPointTy AllocaIP, InsertPointTy CodeGenIP,
-                       BasicBlock &FiniBB) {
-    ++NumBodiesGenerated;
-    CaseBBs.push_back(CodeGenIP.getBlock());
-    SwitchBB = CodeGenIP.getBlock()->getSinglePredecessor();
-    Builder.restoreIP(CodeGenIP);
-    Builder.CreateStore(F->arg_begin(), PrivAI);
-    Value *PrivLoad =
-        Builder.CreateLoad(F->arg_begin()->getType(), PrivAI, "local.alloca");
-    Builder.CreateICmpNE(F->arg_begin(), PrivLoad);
-    Builder.CreateBr(&FiniBB);
-    ForIncBB =
-        CodeGenIP.getBlock()->getSinglePredecessor()->getSingleSuccessor();
-  };
-  auto PrivCB = [](InsertPointTy AllocaIP, InsertPointTy CodeGenIP,
-                   llvm::Value &, llvm::Value &Val, llvm::Value *&ReplVal) {
-    // TODO: Privatization not implemented yet
-    return CodeGenIP;
-  };
-
-  SectionCBVector.push_back(SectionCB);
-  SectionCBVector.push_back(SectionCB);
-
-  IRBuilder<>::InsertPoint AllocaIP(&F->getEntryBlock(),
-                                    F->getEntryBlock().getFirstInsertionPt());
-  Builder.restoreIP(OMPBuilder.createSections(Loc, AllocaIP, SectionCBVector,
-                                              PrivCB, FiniCB, false, false));
-  Builder.CreateRetVoid(); // Required at the end of the function
-
-  // Switch BB's predecessor is loop condition BB, whose successor at index 1 is
-  // loop's exit BB
-  ForExitBB =
-      SwitchBB->getSinglePredecessor()->getTerminator()->getSuccessor(1);
-  EXPECT_NE(ForExitBB, nullptr);
-
-  EXPECT_NE(PrivAI, nullptr);
-  Function *OutlinedFn = PrivAI->getFunction();
-  EXPECT_EQ(F, OutlinedFn);
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-  EXPECT_EQ(OutlinedFn->arg_size(), 1U);
-  EXPECT_EQ(OutlinedFn->getBasicBlockList().size(), size_t(11));
-
-  BasicBlock *LoopPreheaderBB =
-      OutlinedFn->getEntryBlock().getSingleSuccessor();
-  // loop variables are 5 - lower bound, upper bound, stride, islastiter, and
-  // iterator/counter
-  bool FoundForInit = false;
-  for (Instruction &Inst : *LoopPreheaderBB) {
-    if (isa<CallInst>(Inst)) {
-      if (cast<CallInst>(&Inst)->getCalledFunction()->getName() ==
-          "__kmpc_for_static_init_4u") {
-        FoundForInit = true;
-      }
-    }
-  }
-  EXPECT_EQ(FoundForInit, true);
-
-  bool FoundForExit = false;
-  bool FoundBarrier = false;
-  for (Instruction &Inst : *ForExitBB) {
-    if (isa<CallInst>(Inst)) {
-      if (cast<CallInst>(&Inst)->getCalledFunction()->getName() ==
-          "__kmpc_for_static_fini") {
-        FoundForExit = true;
-      }
-      if (cast<CallInst>(&Inst)->getCalledFunction()->getName() ==
-          "__kmpc_barrier") {
-        FoundBarrier = true;
-      }
-      if (FoundForExit && FoundBarrier)
-        break;
-    }
-  }
-  EXPECT_EQ(FoundForExit, true);
-  EXPECT_EQ(FoundBarrier, true);
-
-  EXPECT_NE(SwitchBB, nullptr);
-  EXPECT_NE(SwitchBB->getTerminator(), nullptr);
-  EXPECT_EQ(isa<SwitchInst>(SwitchBB->getTerminator()), true);
-  Switch = cast<SwitchInst>(SwitchBB->getTerminator());
-  EXPECT_EQ(Switch->getNumCases(), 2U);
-  EXPECT_NE(ForIncBB, nullptr);
-  EXPECT_EQ(Switch->getSuccessor(0), ForIncBB);
-
-  EXPECT_EQ(CaseBBs.size(), 2U);
-  for (auto *&CaseBB : CaseBBs) {
-    EXPECT_EQ(CaseBB->getParent(), OutlinedFn);
-    EXPECT_EQ(CaseBB->getSingleSuccessor(), ForExitBB);
-  }
-
-  ASSERT_EQ(NumBodiesGenerated, 2U);
-  ASSERT_EQ(NumFiniCBCalls, 1U);
-}
-
-TEST_F(OpenMPIRBuilderTest, CreateOffloadMaptypes) {
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-
-  IRBuilder<> Builder(BB);
-
-  SmallVector<uint64_t> Mappings = {0, 1};
-  GlobalVariable *OffloadMaptypesGlobal =
-      OMPBuilder.createOffloadMaptypes(Mappings, "offload_maptypes");
-  EXPECT_FALSE(M->global_empty());
-  EXPECT_EQ(OffloadMaptypesGlobal->getName(), "offload_maptypes");
-  EXPECT_TRUE(OffloadMaptypesGlobal->isConstant());
-  EXPECT_TRUE(OffloadMaptypesGlobal->hasGlobalUnnamedAddr());
-  EXPECT_TRUE(OffloadMaptypesGlobal->hasPrivateLinkage());
-  EXPECT_TRUE(OffloadMaptypesGlobal->hasInitializer());
-  Constant *Initializer = OffloadMaptypesGlobal->getInitializer();
-  EXPECT_TRUE(isa<ConstantDataArray>(Initializer));
-  ConstantDataArray *MappingInit = dyn_cast<ConstantDataArray>(Initializer);
-  EXPECT_EQ(MappingInit->getNumElements(), Mappings.size());
-  EXPECT_TRUE(MappingInit->getType()->getElementType()->isIntegerTy(64));
-  Constant *CA = ConstantDataArray::get(Builder.getContext(), Mappings);
-  EXPECT_EQ(MappingInit, CA);
-}
-
-TEST_F(OpenMPIRBuilderTest, CreateOffloadMapnames) {
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-
-  IRBuilder<> Builder(BB);
-
-  Constant *Cst1 = OMPBuilder.getOrCreateSrcLocStr("array1", "file1", 2, 5);
-  Constant *Cst2 = OMPBuilder.getOrCreateSrcLocStr("array2", "file1", 3, 5);
-  SmallVector<llvm::Constant *> Names = {Cst1, Cst2};
-
-  GlobalVariable *OffloadMaptypesGlobal =
-      OMPBuilder.createOffloadMapnames(Names, "offload_mapnames");
-  EXPECT_FALSE(M->global_empty());
-  EXPECT_EQ(OffloadMaptypesGlobal->getName(), "offload_mapnames");
-  EXPECT_TRUE(OffloadMaptypesGlobal->isConstant());
-  EXPECT_FALSE(OffloadMaptypesGlobal->hasGlobalUnnamedAddr());
-  EXPECT_TRUE(OffloadMaptypesGlobal->hasPrivateLinkage());
-  EXPECT_TRUE(OffloadMaptypesGlobal->hasInitializer());
-  Constant *Initializer = OffloadMaptypesGlobal->getInitializer();
-  EXPECT_TRUE(isa<Constant>(Initializer->getOperand(0)->stripPointerCasts()));
-  EXPECT_TRUE(isa<Constant>(Initializer->getOperand(1)->stripPointerCasts()));
-
-  GlobalVariable *Name1Gbl =
-      cast<GlobalVariable>(Initializer->getOperand(0)->stripPointerCasts());
-  EXPECT_TRUE(isa<ConstantDataArray>(Name1Gbl->getInitializer()));
-  ConstantDataArray *Name1GblCA =
-      dyn_cast<ConstantDataArray>(Name1Gbl->getInitializer());
-  EXPECT_EQ(Name1GblCA->getAsCString(), ";file1;array1;2;5;;");
-
-  GlobalVariable *Name2Gbl =
-      cast<GlobalVariable>(Initializer->getOperand(1)->stripPointerCasts());
-  EXPECT_TRUE(isa<ConstantDataArray>(Name2Gbl->getInitializer()));
-  ConstantDataArray *Name2GblCA =
-      dyn_cast<ConstantDataArray>(Name2Gbl->getInitializer());
-  EXPECT_EQ(Name2GblCA->getAsCString(), ";file1;array2;3;5;;");
-
-  EXPECT_TRUE(Initializer->getType()->getArrayElementType()->isPointerTy());
-  EXPECT_EQ(Initializer->getType()->getArrayNumElements(), Names.size());
-}
-
-TEST_F(OpenMPIRBuilderTest, CreateMapperAllocas) {
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-  F->setName("func");
-  IRBuilder<> Builder(BB);
-
-  OpenMPIRBuilder::LocationDescription Loc({Builder.saveIP(), DL});
-
-  unsigned TotalNbOperand = 2;
-
-  OpenMPIRBuilder::MapperAllocas MapperAllocas;
-  IRBuilder<>::InsertPoint AllocaIP(&F->getEntryBlock(),
-                                    F->getEntryBlock().getFirstInsertionPt());
-  OMPBuilder.createMapperAllocas(Loc, AllocaIP, TotalNbOperand, MapperAllocas);
-  EXPECT_NE(MapperAllocas.ArgsBase, nullptr);
-  EXPECT_NE(MapperAllocas.Args, nullptr);
-  EXPECT_NE(MapperAllocas.ArgSizes, nullptr);
-  EXPECT_TRUE(MapperAllocas.ArgsBase->getAllocatedType()->isArrayTy());
-  ArrayType *ArrType =
-      dyn_cast<ArrayType>(MapperAllocas.ArgsBase->getAllocatedType());
-  EXPECT_EQ(ArrType->getNumElements(), TotalNbOperand);
-  EXPECT_TRUE(MapperAllocas.ArgsBase->getAllocatedType()
-                  ->getArrayElementType()
-                  ->isPointerTy());
-  EXPECT_TRUE(MapperAllocas.ArgsBase->getAllocatedType()
-                  ->getArrayElementType()
-                  ->getPointerElementType()
-                  ->isIntegerTy(8));
-
-  EXPECT_TRUE(MapperAllocas.Args->getAllocatedType()->isArrayTy());
-  ArrType = dyn_cast<ArrayType>(MapperAllocas.Args->getAllocatedType());
-  EXPECT_EQ(ArrType->getNumElements(), TotalNbOperand);
-  EXPECT_TRUE(MapperAllocas.Args->getAllocatedType()
-                  ->getArrayElementType()
-                  ->isPointerTy());
-  EXPECT_TRUE(MapperAllocas.Args->getAllocatedType()
-                  ->getArrayElementType()
-                  ->getPointerElementType()
-                  ->isIntegerTy(8));
-
-  EXPECT_TRUE(MapperAllocas.ArgSizes->getAllocatedType()->isArrayTy());
-  ArrType = dyn_cast<ArrayType>(MapperAllocas.ArgSizes->getAllocatedType());
-  EXPECT_EQ(ArrType->getNumElements(), TotalNbOperand);
-  EXPECT_TRUE(MapperAllocas.ArgSizes->getAllocatedType()
-                  ->getArrayElementType()
-                  ->isIntegerTy(64));
-}
-
-TEST_F(OpenMPIRBuilderTest, EmitMapperCall) {
-  OpenMPIRBuilder OMPBuilder(*M);
-  OMPBuilder.initialize();
-  F->setName("func");
-  IRBuilder<> Builder(BB);
-  LLVMContext &Ctx = M->getContext();
-
-  OpenMPIRBuilder::LocationDescription Loc({Builder.saveIP(), DL});
-
-  unsigned TotalNbOperand = 2;
-
-  OpenMPIRBuilder::MapperAllocas MapperAllocas;
-  IRBuilder<>::InsertPoint AllocaIP(&F->getEntryBlock(),
-                                    F->getEntryBlock().getFirstInsertionPt());
-  OMPBuilder.createMapperAllocas(Loc, AllocaIP, TotalNbOperand, MapperAllocas);
-
-  auto *BeginMapperFunc = OMPBuilder.getOrCreateRuntimeFunctionPtr(
-      omp::OMPRTL___tgt_target_data_begin_mapper);
-
-  SmallVector<uint64_t> Flags = {0, 2};
-
-  Constant *SrcLocCst = OMPBuilder.getOrCreateSrcLocStr("", "file1", 2, 5);
-  Value *SrcLocInfo = OMPBuilder.getOrCreateIdent(SrcLocCst);
-
-  Constant *Cst1 = OMPBuilder.getOrCreateSrcLocStr("array1", "file1", 2, 5);
-  Constant *Cst2 = OMPBuilder.getOrCreateSrcLocStr("array2", "file1", 3, 5);
-  SmallVector<llvm::Constant *> Names = {Cst1, Cst2};
-
-  GlobalVariable *Maptypes =
-      OMPBuilder.createOffloadMaptypes(Flags, ".offload_maptypes");
-  Value *MaptypesArg = Builder.CreateConstInBoundsGEP2_32(
-      ArrayType::get(Type::getInt64Ty(Ctx), TotalNbOperand), Maptypes,
-      /*Idx0=*/0, /*Idx1=*/0);
-
-  GlobalVariable *Mapnames =
-      OMPBuilder.createOffloadMapnames(Names, ".offload_mapnames");
-  Value *MapnamesArg = Builder.CreateConstInBoundsGEP2_32(
-      ArrayType::get(Type::getInt8PtrTy(Ctx), TotalNbOperand), Mapnames,
-      /*Idx0=*/0, /*Idx1=*/0);
-
-  OMPBuilder.emitMapperCall(Builder.saveIP(), BeginMapperFunc, SrcLocInfo,
-                            MaptypesArg, MapnamesArg, MapperAllocas, -1,
-                            TotalNbOperand);
-
-  CallInst *MapperCall = dyn_cast<CallInst>(&BB->back());
-  EXPECT_NE(MapperCall, nullptr);
-  EXPECT_EQ(MapperCall->getNumArgOperands(), 9U);
-  EXPECT_EQ(MapperCall->getCalledFunction()->getName(),
-            "__tgt_target_data_begin_mapper");
-  EXPECT_EQ(MapperCall->getOperand(0), SrcLocInfo);
-  EXPECT_TRUE(MapperCall->getOperand(1)->getType()->isIntegerTy(64));
-  EXPECT_TRUE(MapperCall->getOperand(2)->getType()->isIntegerTy(32));
-
-  EXPECT_EQ(MapperCall->getOperand(6), MaptypesArg);
-  EXPECT_EQ(MapperCall->getOperand(7), MapnamesArg);
-  EXPECT_TRUE(MapperCall->getOperand(8)->getType()->isPointerTy());
-}
-
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/Frontend/OpenMPParsingTest.cpp b/gnu/llvm/llvm/unittests/Frontend/OpenMPParsingTest.cpp
deleted file mode 100644
index ea06b34658c..00000000000
--- a/gnu/llvm/llvm/unittests/Frontend/OpenMPParsingTest.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-//===- llvm/unittest/IR/OpenMPIRParsingTest.cpp ---------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Frontend/OpenMP/OMPConstants.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::omp;
-
-namespace {
-
-TEST(OpenMPParsingTest, OpenMPDirectiveKind) {
-  EXPECT_EQ(getOpenMPDirectiveKind("foobar"), OMPD_unknown);
-
-  EXPECT_EQ(getOpenMPDirectiveKind("for"), OMPD_for);
-  EXPECT_EQ(getOpenMPDirectiveKind("simd"), OMPD_simd);
-  EXPECT_EQ(getOpenMPDirectiveKind("for simd"), OMPD_for_simd);
-}
-
-TEST(OpenMPParsingTest, getOpenMPDirectiveName) {
-  EXPECT_EQ(getOpenMPDirectiveName(OMPD_unknown), "unknown");
-
-  EXPECT_EQ(getOpenMPDirectiveName(OMPD_for), "for");
-  EXPECT_EQ(getOpenMPDirectiveName(OMPD_simd), "simd");
-  EXPECT_EQ(getOpenMPDirectiveName(OMPD_for_simd), "for simd");
-}
-
-TEST(OpenMPParsingTest, getOpenMPClauseKind) {
-  EXPECT_EQ(getOpenMPClauseKind("foobar"), OMPC_unknown);
-
-  EXPECT_EQ(getOpenMPClauseKind("schedule"), OMPC_schedule);
-  EXPECT_EQ(getOpenMPClauseKind("if"), OMPC_if);
-}
-
-TEST(OpenMPParsingTest, getOpenMPClauseName) {
-  EXPECT_EQ(getOpenMPClauseName(OMPC_unknown), "unknown");
-
-  EXPECT_EQ(getOpenMPClauseName(OMPC_schedule), "schedule");
-  EXPECT_EQ(getOpenMPClauseName(OMPC_if), "if");
-}
-
-TEST(OpenMPParsingTest, isAllowedClauseForDirective) {
-  EXPECT_TRUE(isAllowedClauseForDirective(OMPD_for, OMPC_schedule, 30));
-  EXPECT_FALSE(isAllowedClauseForDirective(OMPD_for, OMPC_num_teams, 30));
-
-  EXPECT_FALSE(isAllowedClauseForDirective(OMPD_for, OMPC_order, 30));
-  EXPECT_FALSE(isAllowedClauseForDirective(OMPD_for, OMPC_order, 45));
-  EXPECT_TRUE(isAllowedClauseForDirective(OMPD_for, OMPC_order, 50));
-  EXPECT_TRUE(isAllowedClauseForDirective(OMPD_for, OMPC_order, 51));
-}
-
-TEST(OpenMPParsingTest, getOrderKind) {
-  EXPECT_EQ(getOrderKind("foobar"), OMP_ORDER_concurrent);
-  EXPECT_EQ(getOrderKind("default"), OMP_ORDER_concurrent);
-}
-
-TEST(OpenMPParsingTest, getProcBindKind) {
-  EXPECT_EQ(getProcBindKind("foobar"), OMP_PROC_BIND_unknown);
-
-  EXPECT_EQ(getProcBindKind("master"), OMP_PROC_BIND_master);
-  EXPECT_EQ(getProcBindKind("close"), OMP_PROC_BIND_close);
-  EXPECT_EQ(getProcBindKind("spread"), OMP_PROC_BIND_spread);
-  EXPECT_EQ(getProcBindKind("default"), OMP_PROC_BIND_default);
-  EXPECT_EQ(getProcBindKind("unknown"), OMP_PROC_BIND_unknown);
-}
-
-TEST(OpenMPParsingTest, getScheduleKind) {
-  EXPECT_EQ(getScheduleKind("foobar"), OMP_SCHEDULE_Default);
-
-  // FIXME: Why are these not lower case?
-  EXPECT_EQ(getScheduleKind("Static"), OMP_SCHEDULE_Static);
-  EXPECT_EQ(getScheduleKind("Dynamic"), OMP_SCHEDULE_Dynamic);
-  EXPECT_EQ(getScheduleKind("Guided"), OMP_SCHEDULE_Guided);
-  EXPECT_EQ(getScheduleKind("Auto"), OMP_SCHEDULE_Auto);
-  EXPECT_EQ(getScheduleKind("Runtime"), OMP_SCHEDULE_Runtime);
-  EXPECT_EQ(getScheduleKind("Default"), OMP_SCHEDULE_Default);
-}
-
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/FuzzMutate/CMakeLists.txt b/gnu/llvm/llvm/unittests/FuzzMutate/CMakeLists.txt
deleted file mode 100644
index c4a5fcf4f14..00000000000
--- a/gnu/llvm/llvm/unittests/FuzzMutate/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  AsmParser
-  Core
-  FuzzMutate
-  Support
-  )
-
-add_llvm_unittest(FuzzMutateTests
-  OperationsTest.cpp
-  ReservoirSamplerTest.cpp
-  StrategiesTest.cpp
-  RandomIRBuilderTest.cpp
-  )
diff --git a/gnu/llvm/llvm/unittests/FuzzMutate/OperationsTest.cpp b/gnu/llvm/llvm/unittests/FuzzMutate/OperationsTest.cpp
deleted file mode 100644
index 4de3d43ba96..00000000000
--- a/gnu/llvm/llvm/unittests/FuzzMutate/OperationsTest.cpp
+++ /dev/null
@@ -1,404 +0,0 @@
-//===- OperationsTest.cpp - Tests for fuzzer operations -------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/FuzzMutate/Operations.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/FuzzMutate/OpDescriptor.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/Verifier.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-#include <iostream>
-
-// Define some pretty printers to help with debugging failures.
-namespace llvm {
-void PrintTo(Type *T, ::std::ostream *OS) {
-  raw_os_ostream ROS(*OS);
-  T->print(ROS);
-}
-
-void PrintTo(BasicBlock *BB, ::std::ostream *OS) {
-  raw_os_ostream ROS(*OS);
-  ROS << BB << " (" << BB->getName() << ")";
-}
-
-void PrintTo(Value *V, ::std::ostream *OS) {
-  raw_os_ostream ROS(*OS);
-  ROS << V << " (";
-  V->print(ROS);
-  ROS << ")";
-}
-void PrintTo(Constant *C, ::std::ostream *OS) { PrintTo(cast<Value>(C), OS); }
-
-} // namespace llvm
-
-using namespace llvm;
-
-using testing::AllOf;
-using testing::AnyOf;
-using testing::ElementsAre;
-using testing::Eq;
-using testing::Ge;
-using testing::Each;
-using testing::Truly;
-using testing::NotNull;
-using testing::PrintToString;
-using testing::SizeIs;
-
-namespace {
-std::unique_ptr<Module> parseAssembly(
-    const char *Assembly, LLVMContext &Context) {
-
-  SMDiagnostic Error;
-  std::unique_ptr<Module> M = parseAssemblyString(Assembly, Error, Context);
-
-  std::string ErrMsg;
-  raw_string_ostream OS(ErrMsg);
-  Error.print("", OS);
-
-  assert(M && !verifyModule(*M, &errs()));
-  return M;
-}
-
-MATCHER_P(TypesMatch, V, "has type " + PrintToString(V->getType())) {
-  return arg->getType() == V->getType();
-}
-
-MATCHER_P(HasType, T, "") { return arg->getType() == T; }
-
-TEST(OperationsTest, SourcePreds) {
-  using namespace llvm::fuzzerop;
-
-  LLVMContext Ctx;
-
-  Constant *i1 = ConstantInt::getFalse(Ctx);
-  Constant *i8 = ConstantInt::get(Type::getInt8Ty(Ctx), 3);
-  Constant *i16 = ConstantInt::get(Type::getInt16Ty(Ctx), 1 << 15);
-  Constant *i32 = ConstantInt::get(Type::getInt32Ty(Ctx), 0);
-  Constant *i64 = ConstantInt::get(Type::getInt64Ty(Ctx),
-                                   std::numeric_limits<uint64_t>::max());
-  Constant *f16 = ConstantFP::getInfinity(Type::getHalfTy(Ctx));
-  Constant *f32 = ConstantFP::get(Type::getFloatTy(Ctx), 0.0);
-  Constant *f64 = ConstantFP::get(Type::getDoubleTy(Ctx), 123.45);
-  Constant *s =
-      ConstantStruct::get(StructType::create(Ctx, "OpaqueStruct"));
-  Constant *a =
-      ConstantArray::get(ArrayType::get(i32->getType(), 2), {i32, i32});
-  Constant *v8i8 = ConstantVector::getSplat(ElementCount::getFixed(8), i8);
-  Constant *v4f16 = ConstantVector::getSplat(ElementCount::getFixed(4), f16);
-  Constant *p0i32 =
-      ConstantPointerNull::get(PointerType::get(i32->getType(), 0));
-
-  auto OnlyI32 = onlyType(i32->getType());
-  EXPECT_TRUE(OnlyI32.matches({}, i32));
-  EXPECT_FALSE(OnlyI32.matches({}, i64));
-  EXPECT_FALSE(OnlyI32.matches({}, p0i32));
-  EXPECT_FALSE(OnlyI32.matches({}, a));
-
-  EXPECT_THAT(OnlyI32.generate({}, {}),
-              AllOf(SizeIs(Ge(1u)), Each(TypesMatch(i32))));
-
-  auto AnyType = anyType();
-  EXPECT_TRUE(AnyType.matches({}, i1));
-  EXPECT_TRUE(AnyType.matches({}, f64));
-  EXPECT_TRUE(AnyType.matches({}, s));
-  EXPECT_TRUE(AnyType.matches({}, v8i8));
-  EXPECT_TRUE(AnyType.matches({}, p0i32));
-
-  EXPECT_THAT(
-      AnyType.generate({}, {i32->getType(), f16->getType(), v8i8->getType()}),
-      Each(AnyOf(TypesMatch(i32), TypesMatch(f16), TypesMatch(v8i8))));
-
-  auto AnyInt = anyIntType();
-  EXPECT_TRUE(AnyInt.matches({}, i1));
-  EXPECT_TRUE(AnyInt.matches({}, i64));
-  EXPECT_FALSE(AnyInt.matches({}, f32));
-  EXPECT_FALSE(AnyInt.matches({}, v4f16));
-
-  EXPECT_THAT(
-      AnyInt.generate({}, {i32->getType(), f16->getType(), v8i8->getType()}),
-      AllOf(SizeIs(Ge(1u)), Each(TypesMatch(i32))));
-
-  auto AnyFP = anyFloatType();
-  EXPECT_TRUE(AnyFP.matches({}, f16));
-  EXPECT_TRUE(AnyFP.matches({}, f32));
-  EXPECT_FALSE(AnyFP.matches({}, i16));
-  EXPECT_FALSE(AnyFP.matches({}, p0i32));
-  EXPECT_FALSE(AnyFP.matches({}, v4f16));
-
-  EXPECT_THAT(
-      AnyFP.generate({}, {i32->getType(), f16->getType(), v8i8->getType()}),
-      AllOf(SizeIs(Ge(1u)), Each(TypesMatch(f16))));
-
-  auto AnyPtr = anyPtrType();
-  EXPECT_TRUE(AnyPtr.matches({}, p0i32));
-  EXPECT_FALSE(AnyPtr.matches({}, i8));
-  EXPECT_FALSE(AnyPtr.matches({}, a));
-  EXPECT_FALSE(AnyPtr.matches({}, v8i8));
-
-  auto isPointer = [](Value *V) { return V->getType()->isPointerTy(); };
-  EXPECT_THAT(
-      AnyPtr.generate({}, {i32->getType(), f16->getType(), v8i8->getType()}),
-      AllOf(SizeIs(Ge(3u)), Each(Truly(isPointer))));
-
-  auto AnyVec = anyVectorType();
-  EXPECT_TRUE(AnyVec.matches({}, v8i8));
-  EXPECT_TRUE(AnyVec.matches({}, v4f16));
-  EXPECT_FALSE(AnyVec.matches({}, i8));
-  EXPECT_FALSE(AnyVec.matches({}, a));
-  EXPECT_FALSE(AnyVec.matches({}, s));
-
-  EXPECT_THAT(AnyVec.generate({}, {v8i8->getType()}),
-              ElementsAre(TypesMatch(v8i8)));
-
-  auto First = matchFirstType();
-  EXPECT_TRUE(First.matches({i8}, i8));
-  EXPECT_TRUE(First.matches({s, a}, s));
-  EXPECT_FALSE(First.matches({f16}, f32));
-  EXPECT_FALSE(First.matches({v4f16, f64}, f64));
-
-  EXPECT_THAT(First.generate({i8}, {}), Each(TypesMatch(i8)));
-  EXPECT_THAT(First.generate({f16}, {i8->getType()}),
-              Each(TypesMatch(f16)));
-  EXPECT_THAT(First.generate({v8i8, i32}, {}), Each(TypesMatch(v8i8)));
-}
-
-TEST(OperationsTest, SplitBlock) {
-  LLVMContext Ctx;
-
-  Module M("M", Ctx);
-  Function *F = Function::Create(FunctionType::get(Type::getVoidTy(Ctx), {},
-                                                   /*isVarArg=*/false),
-                                 GlobalValue::ExternalLinkage, "f", &M);
-  auto SBOp = fuzzerop::splitBlockDescriptor(1);
-
-  // Create a block with only a return and split it on the return.
-  auto *BB = BasicBlock::Create(Ctx, "BB", F);
-  auto *RI = ReturnInst::Create(Ctx, BB);
-  SBOp.BuilderFunc({UndefValue::get(Type::getInt1Ty(Ctx))}, RI);
-
-  // We should end up with an unconditional branch from BB to BB1, and the
-  // return ends up in BB1.
-  auto *UncondBr = cast<BranchInst>(BB->getTerminator());
-  ASSERT_TRUE(UncondBr->isUnconditional());
-  auto *BB1 = UncondBr->getSuccessor(0);
-  ASSERT_THAT(RI->getParent(), Eq(BB1));
-
-  // Now add an instruction to BB1 and split on that.
-  auto *AI = new AllocaInst(Type::getInt8Ty(Ctx), 0, "a", RI);
-  Value *Cond = ConstantInt::getFalse(Ctx);
-  SBOp.BuilderFunc({Cond}, AI);
-
-  // We should end up with a loop back on BB1 and the instruction we split on
-  // moves to BB2.
-  auto *CondBr = cast<BranchInst>(BB1->getTerminator());
-  EXPECT_THAT(CondBr->getCondition(), Eq(Cond));
-  ASSERT_THAT(CondBr->getNumSuccessors(), Eq(2u));
-  ASSERT_THAT(CondBr->getSuccessor(0), Eq(BB1));
-  auto *BB2 = CondBr->getSuccessor(1);
-  EXPECT_THAT(AI->getParent(), Eq(BB2));
-  EXPECT_THAT(RI->getParent(), Eq(BB2));
-
-  EXPECT_FALSE(verifyModule(M, &errs()));
-}
-
-TEST(OperationsTest, SplitEHBlock) {
-  // Check that we will not try to branch back to the landingpad block using
-  // regular branch instruction
-
-  LLVMContext Ctx;
-  const char *SourceCode =
-      "declare i32* @f()"
-      "declare i32 @personality_function()"
-      "define i32* @test() personality i32 ()* @personality_function {\n"
-      "entry:\n"
-      "  %val = invoke i32* @f()\n"
-      "          to label %normal unwind label %exceptional\n"
-      "normal:\n"
-      "  ret i32* %val\n"
-      "exceptional:\n"
-      "  %landing_pad4 = landingpad token cleanup\n"
-      "  ret i32* undef\n"
-      "}";
-  auto M = parseAssembly(SourceCode, Ctx);
-
-  // Get the landingpad block
-  BasicBlock &BB = *std::next(M->getFunction("test")->begin(), 2);
-
-  fuzzerop::OpDescriptor Descr = fuzzerop::splitBlockDescriptor(1);
-
-  Descr.BuilderFunc({ConstantInt::getTrue(Ctx)},&*BB.getFirstInsertionPt());
-  ASSERT_TRUE(!verifyModule(*M, &errs()));
-}
-
-TEST(OperationsTest, SplitBlockWithPhis) {
-  LLVMContext Ctx;
-
-  Type *Int8Ty = Type::getInt8Ty(Ctx);
-
-  Module M("M", Ctx);
-  Function *F = Function::Create(FunctionType::get(Type::getVoidTy(Ctx), {},
-                                                   /*isVarArg=*/false),
-                                 GlobalValue::ExternalLinkage, "f", &M);
-  auto SBOp = fuzzerop::splitBlockDescriptor(1);
-
-  // Create 3 blocks with an if-then branch.
-  auto *BB1 = BasicBlock::Create(Ctx, "BB1", F);
-  auto *BB2 = BasicBlock::Create(Ctx, "BB2", F);
-  auto *BB3 = BasicBlock::Create(Ctx, "BB3", F);
-  BranchInst::Create(BB2, BB3, ConstantInt::getFalse(Ctx), BB1);
-  BranchInst::Create(BB3, BB2);
-
-  // Set up phi nodes selecting values for the incoming edges.
-  auto *PHI1 = PHINode::Create(Int8Ty, /*NumReservedValues=*/2, "p1", BB3);
-  PHI1->addIncoming(ConstantInt::get(Int8Ty, 0), BB1);
-  PHI1->addIncoming(ConstantInt::get(Int8Ty, 1), BB2);
-  auto *PHI2 = PHINode::Create(Int8Ty, /*NumReservedValues=*/2, "p2", BB3);
-  PHI2->addIncoming(ConstantInt::get(Int8Ty, 1), BB1);
-  PHI2->addIncoming(ConstantInt::get(Int8Ty, 0), BB2);
-  auto *RI = ReturnInst::Create(Ctx, BB3);
-
-  // Now we split the block with PHI nodes, making sure they're all updated.
-  Value *Cond = ConstantInt::getFalse(Ctx);
-  SBOp.BuilderFunc({Cond}, RI);
-
-  // Make sure the PHIs are updated with a value for the third incoming edge.
-  EXPECT_THAT(PHI1->getNumIncomingValues(), Eq(3u));
-  EXPECT_THAT(PHI2->getNumIncomingValues(), Eq(3u));
-  EXPECT_FALSE(verifyModule(M, &errs()));
-}
-
-TEST(OperationsTest, GEP) {
-  LLVMContext Ctx;
-
-  Type *Int8PtrTy = Type::getInt8PtrTy(Ctx);
-  Type *Int32Ty = Type::getInt32Ty(Ctx);
-
-  Module M("M", Ctx);
-  Function *F = Function::Create(FunctionType::get(Type::getVoidTy(Ctx), {},
-                                                   /*isVarArg=*/false),
-                                 GlobalValue::ExternalLinkage, "f", &M);
-  auto *BB = BasicBlock::Create(Ctx, "BB", F);
-  auto *RI = ReturnInst::Create(Ctx, BB);
-
-  auto GEPOp = fuzzerop::gepDescriptor(1);
-  EXPECT_TRUE(GEPOp.SourcePreds[0].matches({}, UndefValue::get(Int8PtrTy)));
-  EXPECT_TRUE(GEPOp.SourcePreds[1].matches({UndefValue::get(Int8PtrTy)},
-                                           ConstantInt::get(Int32Ty, 0)));
-
-  GEPOp.BuilderFunc({UndefValue::get(Int8PtrTy), ConstantInt::get(Int32Ty, 0)},
-                    RI);
-  EXPECT_FALSE(verifyModule(M, &errs()));
-}
-
-
-TEST(OperationsTest, GEPPointerOperand) {
-  // Check that we only pick sized pointers for the GEP instructions
-
-  LLVMContext Ctx;
-  const char *SourceCode =
-      "declare void @f()\n"
-      "define void @test() {\n"
-      "  %v = bitcast void ()* @f to i64 (i8 addrspace(4)*)*\n"
-      "  %a = alloca i64, i32 10\n"
-      "  ret void\n"
-      "}";
-  auto M = parseAssembly(SourceCode, Ctx);
-
-  fuzzerop::OpDescriptor Descr = fuzzerop::gepDescriptor(1);
-
-  // Get first basic block of the test function
-  Function &F = *M->getFunction("test");
-  BasicBlock &BB = *F.begin();
-
-  // Don't match %v
-  ASSERT_FALSE(Descr.SourcePreds[0].matches({}, &*BB.begin()));
-
-  // Match %a
-  ASSERT_TRUE(Descr.SourcePreds[0].matches({}, &*std::next(BB.begin())));
-}
-
-TEST(OperationsTest, ExtractAndInsertValue) {
-  LLVMContext Ctx;
-
-  Type *Int8PtrTy = Type::getInt8PtrTy(Ctx);
-  Type *Int32Ty = Type::getInt32Ty(Ctx);
-  Type *Int64Ty = Type::getInt64Ty(Ctx);
-
-  Type *StructTy = StructType::create(Ctx, {Int8PtrTy, Int32Ty});
-  Type *OpaqueTy = StructType::create(Ctx, "OpaqueStruct");
-  Type *ZeroSizedArrayTy = ArrayType::get(Int64Ty, 0);
-  Type *ArrayTy = ArrayType::get(Int64Ty, 4);
-  Type *VectorTy = FixedVectorType::get(Int32Ty, 2);
-
-  auto EVOp = fuzzerop::extractValueDescriptor(1);
-  auto IVOp = fuzzerop::insertValueDescriptor(1);
-
-  // Sanity check the source preds.
-  Constant *SVal = UndefValue::get(StructTy);
-  Constant *OVal = UndefValue::get(OpaqueTy);
-  Constant *AVal = UndefValue::get(ArrayTy);
-  Constant *ZAVal = UndefValue::get(ZeroSizedArrayTy);
-  Constant *VVal = UndefValue::get(VectorTy);
-
-  EXPECT_TRUE(EVOp.SourcePreds[0].matches({}, SVal));
-  EXPECT_FALSE(EVOp.SourcePreds[0].matches({}, OVal));
-  EXPECT_TRUE(EVOp.SourcePreds[0].matches({}, AVal));
-  EXPECT_FALSE(EVOp.SourcePreds[0].matches({}, VVal));
-  EXPECT_TRUE(IVOp.SourcePreds[0].matches({}, SVal));
-  EXPECT_FALSE(IVOp.SourcePreds[0].matches({}, OVal));
-  EXPECT_TRUE(IVOp.SourcePreds[0].matches({}, AVal));
-  EXPECT_FALSE(IVOp.SourcePreds[0].matches({}, VVal));
-
-  // Don't consider zero sized arrays as viable sources
-  EXPECT_FALSE(EVOp.SourcePreds[0].matches({}, ZAVal));
-  EXPECT_FALSE(IVOp.SourcePreds[0].matches({}, ZAVal));
-
-  // Make sure we're range checking appropriately.
-  EXPECT_TRUE(
-      EVOp.SourcePreds[1].matches({SVal}, ConstantInt::get(Int32Ty, 0)));
-  EXPECT_TRUE(
-      EVOp.SourcePreds[1].matches({SVal}, ConstantInt::get(Int32Ty, 1)));
-  EXPECT_FALSE(
-      EVOp.SourcePreds[1].matches({SVal}, ConstantInt::get(Int32Ty, 2)));
-  EXPECT_FALSE(
-      EVOp.SourcePreds[1].matches({OVal}, ConstantInt::get(Int32Ty, 0)));
-  EXPECT_FALSE(
-      EVOp.SourcePreds[1].matches({OVal}, ConstantInt::get(Int32Ty, 65536)));
-  EXPECT_TRUE(
-      EVOp.SourcePreds[1].matches({AVal}, ConstantInt::get(Int32Ty, 0)));
-  EXPECT_TRUE(
-      EVOp.SourcePreds[1].matches({AVal}, ConstantInt::get(Int32Ty, 3)));
-  EXPECT_FALSE(
-      EVOp.SourcePreds[1].matches({AVal}, ConstantInt::get(Int32Ty, 4)));
-
-  EXPECT_THAT(
-      EVOp.SourcePreds[1].generate({SVal}, {}),
-      ElementsAre(ConstantInt::get(Int32Ty, 0), ConstantInt::get(Int32Ty, 1)));
-
-  // InsertValue should accept any type in the struct, but only in positions
-  // where it makes sense.
-  EXPECT_TRUE(IVOp.SourcePreds[1].matches({SVal}, UndefValue::get(Int8PtrTy)));
-  EXPECT_TRUE(IVOp.SourcePreds[1].matches({SVal}, UndefValue::get(Int32Ty)));
-  EXPECT_FALSE(IVOp.SourcePreds[1].matches({SVal}, UndefValue::get(Int64Ty)));
-  EXPECT_FALSE(IVOp.SourcePreds[2].matches({SVal, UndefValue::get(Int32Ty)},
-                                           ConstantInt::get(Int32Ty, 0)));
-  EXPECT_TRUE(IVOp.SourcePreds[2].matches({SVal, UndefValue::get(Int32Ty)},
-                                          ConstantInt::get(Int32Ty, 1)));
-
-  EXPECT_THAT(IVOp.SourcePreds[1].generate({SVal}, {}),
-              Each(AnyOf(HasType(Int32Ty), HasType(Int8PtrTy))));
-  EXPECT_THAT(
-      IVOp.SourcePreds[2].generate({SVal, ConstantInt::get(Int32Ty, 0)}, {}),
-      ElementsAre(ConstantInt::get(Int32Ty, 1)));
-}
-
-}
diff --git a/gnu/llvm/llvm/unittests/FuzzMutate/RandomIRBuilderTest.cpp b/gnu/llvm/llvm/unittests/FuzzMutate/RandomIRBuilderTest.cpp
deleted file mode 100644
index 1528be670fe..00000000000
--- a/gnu/llvm/llvm/unittests/FuzzMutate/RandomIRBuilderTest.cpp
+++ /dev/null
@@ -1,298 +0,0 @@
-//===- RandomIRBuilderTest.cpp - Tests for injector strategy --------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/FuzzMutate/RandomIRBuilder.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/AsmParser/SlotMapping.h"
-#include "llvm/FuzzMutate/IRMutator.h"
-#include "llvm/FuzzMutate/OpDescriptor.h"
-#include "llvm/FuzzMutate/Operations.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/Verifier.h"
-#include "llvm/Support/SourceMgr.h"
-
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-static constexpr int Seed = 5;
-
-namespace {
-
-std::unique_ptr<Module> parseAssembly(
-    const char *Assembly, LLVMContext &Context) {
-
-  SMDiagnostic Error;
-  std::unique_ptr<Module> M = parseAssemblyString(Assembly, Error, Context);
-
-  std::string ErrMsg;
-  raw_string_ostream OS(ErrMsg);
-  Error.print("", OS);
-
-  assert(M && !verifyModule(*M, &errs()));
-  return M;
-}
-
-TEST(RandomIRBuilderTest, ShuffleVectorIncorrectOperands) {
-  // Test that we don't create load instruction as a source for the shuffle
-  // vector operation.
-
-  LLVMContext Ctx;
-  const char *Source =
-      "define <2 x i32> @test(<2 x i1> %cond, <2 x i32> %a) {\n"
-      "  %A = alloca <2 x i32>\n"
-      "  %I = insertelement <2 x i32> %a, i32 1, i32 1\n"
-      "  ret <2 x i32> undef\n"
-      "}";
-  auto M = parseAssembly(Source, Ctx);
-
-  fuzzerop::OpDescriptor Descr = fuzzerop::shuffleVectorDescriptor(1);
-
-  // Empty known types since we ShuffleVector descriptor doesn't care about them
-  RandomIRBuilder IB(Seed, {});
-
-  // Get first basic block of the first function
-  Function &F = *M->begin();
-  BasicBlock &BB = *F.begin();
-
-  SmallVector<Instruction *, 32> Insts;
-  for (auto I = BB.getFirstInsertionPt(), E = BB.end(); I != E; ++I)
-    Insts.push_back(&*I);
-
-  // Pick first and second sources
-  SmallVector<Value *, 2> Srcs;
-  ASSERT_TRUE(Descr.SourcePreds[0].matches(Srcs, Insts[1]));
-  Srcs.push_back(Insts[1]);
-  ASSERT_TRUE(Descr.SourcePreds[1].matches(Srcs, Insts[1]));
-  Srcs.push_back(Insts[1]);
-
-  // Create new source. Check that it always matches with the descriptor.
-  // Run some iterations to account for random decisions.
-  for (int i = 0; i < 10; ++i) {
-    Value *LastSrc = IB.newSource(BB, Insts, Srcs, Descr.SourcePreds[2]);
-    ASSERT_TRUE(Descr.SourcePreds[2].matches(Srcs, LastSrc));
-  }
-}
-
-TEST(RandomIRBuilderTest, InsertValueIndexes) {
-  // Check that we will generate correct indexes for the insertvalue operation
-
-  LLVMContext Ctx;
-  const char *Source =
-      "%T = type {i8, i32, i64}\n"
-      "define void @test() {\n"
-      "  %A = alloca %T\n"
-      "  %L = load %T, %T* %A"
-      "  ret void\n"
-      "}";
-  auto M = parseAssembly(Source, Ctx);
-
-  fuzzerop::OpDescriptor IVDescr = fuzzerop::insertValueDescriptor(1);
-
-  std::vector<Type *> Types =
-      {Type::getInt8Ty(Ctx), Type::getInt32Ty(Ctx), Type::getInt64Ty(Ctx)};
-  RandomIRBuilder IB(Seed, Types);
-
-  // Get first basic block of the first function
-  Function &F = *M->begin();
-  BasicBlock &BB = *F.begin();
-
-  // Pick first source
-  Instruction *Src = &*std::next(BB.begin());
-
-  SmallVector<Value *, 2> Srcs(2);
-  ASSERT_TRUE(IVDescr.SourcePreds[0].matches({}, Src));
-  Srcs[0] = Src;
-
-  // Generate constants for each of the types and check that we pick correct
-  // index for the given type
-  for (auto *T: Types) {
-    // Loop to account for possible random decisions
-    for (int i = 0; i < 10; ++i) {
-      // Create value we want to insert. Only it's type matters.
-      Srcs[1] = ConstantInt::get(T, 5);
-
-      // Try to pick correct index
-      Value *Src = IB.findOrCreateSource(
-          BB, &*BB.begin(), Srcs, IVDescr.SourcePreds[2]);
-      ASSERT_TRUE(IVDescr.SourcePreds[2].matches(Srcs, Src));
-    }
-  }
-}
-
-TEST(RandomIRBuilderTest, ShuffleVectorSink) {
-  // Check that we will never use shuffle vector mask as a sink form the
-  // unrelated operation.
-
-  LLVMContext Ctx;
-  const char *SourceCode =
-      "define void @test(<4 x i32> %a) {\n"
-      "  %S1 = shufflevector <4 x i32> %a, <4 x i32> %a, <4 x i32> undef\n"
-      "  %S2 = shufflevector <4 x i32> %a, <4 x i32> %a, <4 x i32> undef\n"
-      "  ret void\n"
-      "}";
-  auto M = parseAssembly(SourceCode, Ctx);
-
-  fuzzerop::OpDescriptor IVDescr = fuzzerop::insertValueDescriptor(1);
-
-  RandomIRBuilder IB(Seed, {});
-
-  // Get first basic block of the first function
-  Function &F = *M->begin();
-  BasicBlock &BB = *F.begin();
-
-  // Source is %S1
-  Instruction *Source = &*BB.begin();
-  // Sink is %S2
-  SmallVector<Instruction *, 1> Sinks = {&*std::next(BB.begin())};
-
-  // Loop to account for random decisions
-  for (int i = 0; i < 10; ++i) {
-    // Try to connect S1 to S2. We should always create new sink.
-    IB.connectToSink(BB, Sinks, Source);
-    ASSERT_TRUE(!verifyModule(*M, &errs()));
-  }
-}
-
-TEST(RandomIRBuilderTest, InsertValueArray) {
-  // Check that we can generate insertvalue for the vector operations
-
-  LLVMContext Ctx;
-  const char *SourceCode =
-      "define void @test() {\n"
-      "  %A = alloca [8 x i32]\n"
-      "  %L = load [8 x i32], [8 x i32]* %A"
-      "  ret void\n"
-      "}";
-  auto M = parseAssembly(SourceCode, Ctx);
-
-  fuzzerop::OpDescriptor Descr = fuzzerop::insertValueDescriptor(1);
-
-  std::vector<Type *> Types =
-      {Type::getInt8Ty(Ctx), Type::getInt32Ty(Ctx), Type::getInt64Ty(Ctx)};
-  RandomIRBuilder IB(Seed, Types);
-
-  // Get first basic block of the first function
-  Function &F = *M->begin();
-  BasicBlock &BB = *F.begin();
-
-  // Pick first source
-  Instruction *Source = &*std::next(BB.begin());
-  ASSERT_TRUE(Descr.SourcePreds[0].matches({}, Source));
-
-  SmallVector<Value *, 2> Srcs(2);
-
-  // Check that we can always pick the last two operands.
-  for (int i = 0; i < 10; ++i) {
-    Srcs[0] = Source;
-    Srcs[1] = IB.findOrCreateSource(BB, {Source}, Srcs, Descr.SourcePreds[1]);
-    IB.findOrCreateSource(BB, {}, Srcs, Descr.SourcePreds[2]);
-  }
-}
-
-TEST(RandomIRBuilderTest, Invokes) {
-  // Check that we never generate load or store after invoke instruction
-
-  LLVMContext Ctx;
-  const char *SourceCode =
-      "declare i32* @f()"
-      "declare i32 @personality_function()"
-      "define i32* @test() personality i32 ()* @personality_function {\n"
-      "entry:\n"
-      "  %val = invoke i32* @f()\n"
-      "          to label %normal unwind label %exceptional\n"
-      "normal:\n"
-      "  ret i32* %val\n"
-      "exceptional:\n"
-      "  %landing_pad4 = landingpad token cleanup\n"
-      "  ret i32* undef\n"
-      "}";
-  auto M = parseAssembly(SourceCode, Ctx);
-
-
-  std::vector<Type *> Types = {Type::getInt8Ty(Ctx)};
-  RandomIRBuilder IB(Seed, Types);
-
-  // Get first basic block of the test function
-  Function &F = *M->getFunction("test");
-  BasicBlock &BB = *F.begin();
-
-  Instruction *Invoke = &*BB.begin();
-
-  // Find source but never insert new load after invoke
-  for (int i = 0; i < 10; ++i) {
-    (void)IB.findOrCreateSource(BB, {Invoke}, {}, fuzzerop::anyIntType());
-    ASSERT_TRUE(!verifyModule(*M, &errs()));
-  }
-}
-
-TEST(RandomIRBuilderTest, FirstClassTypes) {
-  // Check that we never insert new source as a load from non first class
-  // or unsized type.
-
-  LLVMContext Ctx;
-  const char *SourceCode = "%Opaque = type opaque\n"
-                           "define void @test(i8* %ptr) {\n"
-                           "entry:\n"
-                           "  %tmp = bitcast i8* %ptr to i32* (i32*)*\n"
-                           "  %tmp1 = bitcast i8* %ptr to %Opaque*\n"
-                           "  ret void\n"
-                           "}";
-  auto M = parseAssembly(SourceCode, Ctx);
-
-  std::vector<Type *> Types = {Type::getInt8Ty(Ctx)};
-  RandomIRBuilder IB(Seed, Types);
-
-  Function &F = *M->getFunction("test");
-  BasicBlock &BB = *F.begin();
-  // Non first class type
-  Instruction *FuncPtr = &*BB.begin();
-  // Unsized type
-  Instruction *OpaquePtr = &*std::next(BB.begin());
-
-  for (int i = 0; i < 10; ++i) {
-    Value *V = IB.findOrCreateSource(BB, {FuncPtr, OpaquePtr});
-    ASSERT_FALSE(isa<LoadInst>(V));
-  }
-}
-
-TEST(RandomIRBuilderTest, SwiftError) {
-  // Check that we never pick swifterror value as a source for operation
-  // other than load, store and call.
-
-  LLVMContext Ctx;
-  const char *SourceCode = "declare void @use(i8** swifterror %err)"
-                           "define void @test() {\n"
-                           "entry:\n"
-                           "  %err = alloca swifterror i8*, align 8\n"
-                           "  call void @use(i8** swifterror %err)\n"
-                           "  ret void\n"
-                           "}";
-  auto M = parseAssembly(SourceCode, Ctx);
-
-  std::vector<Type *> Types = {Type::getInt8Ty(Ctx)};
-  RandomIRBuilder IB(Seed, Types);
-
-  // Get first basic block of the test function
-  Function &F = *M->getFunction("test");
-  BasicBlock &BB = *F.begin();
-  Instruction *Alloca = &*BB.begin();
-
-  fuzzerop::OpDescriptor Descr = fuzzerop::gepDescriptor(1);
-
-  for (int i = 0; i < 10; ++i) {
-    Value *V = IB.findOrCreateSource(BB, {Alloca}, {}, Descr.SourcePreds[0]);
-    ASSERT_FALSE(isa<AllocaInst>(V));
-  }
-}
-
-}
diff --git a/gnu/llvm/llvm/unittests/FuzzMutate/ReservoirSamplerTest.cpp b/gnu/llvm/llvm/unittests/FuzzMutate/ReservoirSamplerTest.cpp
deleted file mode 100644
index ac9270a265e..00000000000
--- a/gnu/llvm/llvm/unittests/FuzzMutate/ReservoirSamplerTest.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-//===- ReservoirSampler.cpp - Tests for the ReservoirSampler --------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/FuzzMutate/Random.h"
-#include "gtest/gtest.h"
-#include <random>
-
-using namespace llvm;
-
-TEST(ReservoirSamplerTest, OneItem) {
-  std::mt19937 Rand;
-  auto Sampler = makeSampler(Rand, 7, 1);
-  ASSERT_FALSE(Sampler.isEmpty());
-  ASSERT_EQ(7, Sampler.getSelection());
-}
-
-TEST(ReservoirSamplerTest, NoWeight) {
-  std::mt19937 Rand;
-  auto Sampler = makeSampler(Rand, 7, 0);
-  ASSERT_TRUE(Sampler.isEmpty());
-}
-
-TEST(ReservoirSamplerTest, Uniform) {
-  std::mt19937 Rand;
-
-  // Run three chi-squared tests to check that the distribution is reasonably
-  // uniform.
-  std::vector<int> Items = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
-
-  int Failures = 0;
-  for (int Run = 0; Run < 3; ++Run) {
-    std::vector<int> Counts(Items.size(), 0);
-
-    // We need $np_s > 5$ at minimum, but we're better off going a couple of
-    // orders of magnitude larger.
-    int N = Items.size() * 5 * 100;
-    for (int I = 0; I < N; ++I) {
-      auto Sampler = makeSampler(Rand, Items);
-      Counts[Sampler.getSelection()] += 1;
-    }
-
-    // Knuth. TAOCP Vol. 2, 3.3.1 (8):
-    // $V = \frac{1}{n} \sum_{s=1}^{k} \left(\frac{Y_s^2}{p_s}\right) - n$
-    double Ps = 1.0 / Items.size();
-    double Sum = 0.0;
-    for (int Ys : Counts)
-      Sum += Ys * Ys / Ps;
-    double V = (Sum / N) - N;
-
-    assert(Items.size() == 10 && "Our chi-squared values assume 10 items");
-    // Since we have 10 items, there are 9 degrees of freedom and the table of
-    // chi-squared values is as follows:
-    //
-    //     | p=1%  |   5%  |  25%  |  50%  |  75%  |  95%  |  99%  |
-    // v=9 | 2.088 | 3.325 | 5.899 | 8.343 | 11.39 | 16.92 | 21.67 |
-    //
-    // Check that we're in the likely range of results.
-    //if (V < 2.088 || V > 21.67)
-    if (V < 2.088 || V > 21.67)
-      ++Failures;
-  }
-  EXPECT_LT(Failures, 3) << "Non-uniform distribution?";
-}
diff --git a/gnu/llvm/llvm/unittests/FuzzMutate/StrategiesTest.cpp b/gnu/llvm/llvm/unittests/FuzzMutate/StrategiesTest.cpp
deleted file mode 100644
index 562d08b9a1b..00000000000
--- a/gnu/llvm/llvm/unittests/FuzzMutate/StrategiesTest.cpp
+++ /dev/null
@@ -1,243 +0,0 @@
-//===- InjectorIRStrategyTest.cpp - Tests for injector strategy -----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/StringRef.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/AsmParser/SlotMapping.h"
-#include "llvm/FuzzMutate/IRMutator.h"
-#include "llvm/FuzzMutate/Operations.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/Verifier.h"
-#include "llvm/Support/SourceMgr.h"
-
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-static constexpr int Seed = 5;
-
-namespace {
-
-std::unique_ptr<IRMutator> createInjectorMutator() {
-  std::vector<TypeGetter> Types{
-      Type::getInt1Ty,  Type::getInt8Ty,  Type::getInt16Ty, Type::getInt32Ty,
-      Type::getInt64Ty, Type::getFloatTy, Type::getDoubleTy};
-
-  std::vector<std::unique_ptr<IRMutationStrategy>> Strategies;
-  Strategies.push_back(
-      std::make_unique<InjectorIRStrategy>(
-          InjectorIRStrategy::getDefaultOps()));
-
-  return std::make_unique<IRMutator>(std::move(Types), std::move(Strategies));
-}
-
-std::unique_ptr<IRMutator> createDeleterMutator() {
-  std::vector<TypeGetter> Types{
-      Type::getInt1Ty,  Type::getInt8Ty,  Type::getInt16Ty, Type::getInt32Ty,
-      Type::getInt64Ty, Type::getFloatTy, Type::getDoubleTy};
-
-  std::vector<std::unique_ptr<IRMutationStrategy>> Strategies;
-  Strategies.push_back(std::make_unique<InstDeleterIRStrategy>());
-
-  return std::make_unique<IRMutator>(std::move(Types), std::move(Strategies));
-}
-
-std::unique_ptr<IRMutator> createInstModifierMutator() {
-  std::vector<TypeGetter> Types{
-      Type::getInt1Ty,  Type::getInt8Ty,  Type::getInt16Ty, Type::getInt32Ty,
-      Type::getInt64Ty, Type::getFloatTy, Type::getDoubleTy};
-
-  std::vector<std::unique_ptr<IRMutationStrategy>> Strategies;
-  Strategies.push_back(std::make_unique<InstModificationIRStrategy>());
-
-  return std::make_unique<IRMutator>(std::move(Types), std::move(Strategies));
-}
-
-std::unique_ptr<Module> parseAssembly(
-    const char *Assembly, LLVMContext &Context) {
-
-  SMDiagnostic Error;
-  std::unique_ptr<Module> M = parseAssemblyString(Assembly, Error, Context);
-
-  std::string ErrMsg;
-  raw_string_ostream OS(ErrMsg);
-  Error.print("", OS);
-
-  assert(M && !verifyModule(*M, &errs()));
-  return M;
-}
-
-void IterateOnSource(StringRef Source, IRMutator &Mutator) {
-  LLVMContext Ctx;
-
-  for (int i = 0; i < 10; ++i) {
-    auto M = parseAssembly(Source.data(), Ctx);
-    ASSERT_TRUE(M && !verifyModule(*M, &errs()));
-
-    Mutator.mutateModule(*M, Seed, Source.size(), Source.size() + 100);
-    EXPECT_TRUE(!verifyModule(*M, &errs()));
-  }
-}
-
-TEST(InjectorIRStrategyTest, EmptyModule) {
-  // Test that we can inject into empty module
-
-  LLVMContext Ctx;
-  auto M = std::make_unique<Module>("M", Ctx);
-  ASSERT_TRUE(M && !verifyModule(*M, &errs()));
-
-  auto Mutator = createInjectorMutator();
-  ASSERT_TRUE(Mutator);
-
-  Mutator->mutateModule(*M, Seed, 1, 1);
-  EXPECT_TRUE(!verifyModule(*M, &errs()));
-}
-
-TEST(InstDeleterIRStrategyTest, EmptyFunction) {
-  // Test that we don't crash even if we can't remove from one of the functions.
-
-  StringRef Source = ""
-      "define <8 x i32> @func1() {\n"
-        "ret <8 x i32> undef\n"
-      "}\n"
-      "\n"
-      "define i32 @func2() {\n"
-        "%A9 = alloca i32\n"
-        "%L6 = load i32, i32* %A9\n"
-        "ret i32 %L6\n"
-      "}\n";
-
-  auto Mutator = createDeleterMutator();
-  ASSERT_TRUE(Mutator);
-
-  IterateOnSource(Source, *Mutator);
-}
-
-TEST(InstDeleterIRStrategyTest, PhiNodes) {
-  // Test that inst deleter works correctly with the phi nodes.
-
-  LLVMContext Ctx;
-  StringRef Source = "\n\
-      define i32 @earlyreturncrash(i32 %x) {\n\
-      entry:\n\
-        switch i32 %x, label %sw.epilog [\n\
-          i32 1, label %sw.bb1\n\
-        ]\n\
-      \n\
-      sw.bb1:\n\
-        br label %sw.epilog\n\
-      \n\
-      sw.epilog:\n\
-        %a.0 = phi i32 [ 7, %entry ],  [ 9, %sw.bb1 ]\n\
-        %b.0 = phi i32 [ 10, %entry ], [ 4, %sw.bb1 ]\n\
-        ret i32 %a.0\n\
-      }";
-
-  auto Mutator = createDeleterMutator();
-  ASSERT_TRUE(Mutator);
-
-  IterateOnSource(Source, *Mutator);
-}
-
-static void checkModifyNoUnsignedAndNoSignedWrap(StringRef Opc) {
-  LLVMContext Ctx;
-  std::string Source = std::string("\n\
-      define i32 @test(i32 %x) {\n\
-        %a = ") + Opc.str() +
-                       std::string(" i32 %x, 10\n\
-        ret i32 %a\n\
-      }");
-
-  auto Mutator = createInstModifierMutator();
-  ASSERT_TRUE(Mutator);
-
-  auto M = parseAssembly(Source.data(), Ctx);
-  auto &F = *M->begin();
-  auto *AddI = &*F.begin()->begin();
-  ASSERT_TRUE(M && !verifyModule(*M, &errs()));
-  bool FoundNUW = false;
-  bool FoundNSW = false;
-  for (int i = 0; i < 100; ++i) {
-    Mutator->mutateModule(*M, Seed + i, Source.size(), Source.size() + 100);
-    EXPECT_TRUE(!verifyModule(*M, &errs()));
-    FoundNUW |= AddI->hasNoUnsignedWrap();
-    FoundNSW |= AddI->hasNoSignedWrap();
-  }
-
-  // The mutator should have added nuw and nsw during some mutations.
-  EXPECT_TRUE(FoundNUW);
-  EXPECT_TRUE(FoundNSW);
-}
-TEST(InstModificationIRStrategyTest, Add) {
-  checkModifyNoUnsignedAndNoSignedWrap("add");
-}
-
-TEST(InstModificationIRStrategyTest, Sub) {
-  checkModifyNoUnsignedAndNoSignedWrap("sub");
-}
-
-TEST(InstModificationIRStrategyTest, Mul) {
-  checkModifyNoUnsignedAndNoSignedWrap("mul");
-}
-
-TEST(InstModificationIRStrategyTest, Shl) {
-  checkModifyNoUnsignedAndNoSignedWrap("shl");
-}
-
-TEST(InstModificationIRStrategyTest, ICmp) {
-  LLVMContext Ctx;
-  StringRef Source = "\n\
-      define i1 @test(i32 %x) {\n\
-        %a = icmp eq i32 %x, 10\n\
-        ret i1 %a\n\
-      }";
-
-  auto Mutator = createInstModifierMutator();
-  ASSERT_TRUE(Mutator);
-
-  auto M = parseAssembly(Source.data(), Ctx);
-  auto &F = *M->begin();
-  CmpInst *CI = cast<CmpInst>(&*F.begin()->begin());
-  ASSERT_TRUE(M && !verifyModule(*M, &errs()));
-  bool FoundNE = false;
-  for (int i = 0; i < 100; ++i) {
-    Mutator->mutateModule(*M, Seed + i, Source.size(), Source.size() + 100);
-    EXPECT_TRUE(!verifyModule(*M, &errs()));
-    FoundNE |= CI->getPredicate() == CmpInst::ICMP_NE;
-  }
-
-  EXPECT_TRUE(FoundNE);
-}
-
-TEST(InstModificationIRStrategyTest, GEP) {
-  LLVMContext Ctx;
-  StringRef Source = "\n\
-      define i32* @test(i32* %ptr) {\n\
-        %gep = getelementptr i32, i32* %ptr, i32 10\n\
-        ret i32* %gep\n\
-      }";
-
-  auto Mutator = createInstModifierMutator();
-  ASSERT_TRUE(Mutator);
-
-  auto M = parseAssembly(Source.data(), Ctx);
-  auto &F = *M->begin();
-  GetElementPtrInst *GEP = cast<GetElementPtrInst>(&*F.begin()->begin());
-  ASSERT_TRUE(M && !verifyModule(*M, &errs()));
-  bool FoundInbounds = false;
-  for (int i = 0; i < 100; ++i) {
-    Mutator->mutateModule(*M, Seed + i, Source.size(), Source.size() + 100);
-    EXPECT_TRUE(!verifyModule(*M, &errs()));
-    FoundInbounds |= GEP->isInBounds();
-  }
-
-  EXPECT_TRUE(FoundInbounds);
-}
-}
diff --git a/gnu/llvm/llvm/unittests/IR/AbstractCallSiteTest.cpp b/gnu/llvm/llvm/unittests/IR/AbstractCallSiteTest.cpp
deleted file mode 100644
index ddb10911ad0..00000000000
--- a/gnu/llvm/llvm/unittests/IR/AbstractCallSiteTest.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-//===----- AbstractCallSiteTest.cpp - AbstractCallSite Unittests ----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/AbstractCallSite.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-static std::unique_ptr<Module> parseIR(LLVMContext &C, const char *IR) {
-  SMDiagnostic Err;
-  std::unique_ptr<Module> Mod = parseAssemblyString(IR, Err, C);
-  if (!Mod)
-    Err.print("AbstractCallSiteTests", errs());
-  return Mod;
-}
-
-TEST(AbstractCallSite, CallbackCall) {
-  LLVMContext C;
-
-  const char *IR =
-      "define void @callback(i8* %X, i32* %A) {\n"
-      "  ret void\n"
-      "}\n"
-      "define void @foo(i32* %A) {\n"
-      "  call void (i32, void (i8*, ...)*, ...) @broker(i32 1, void (i8*, ...)* bitcast (void (i8*, i32*)* @callback to void (i8*, ...)*), i32* %A)\n"
-      "  ret void\n"
-      "}\n"
-      "declare !callback !0 void @broker(i32, void (i8*, ...)*, ...)\n"
-      "!0 = !{!1}\n"
-      "!1 = !{i64 1, i64 -1, i1 true}";
-
-  std::unique_ptr<Module> M = parseIR(C, IR);
-  ASSERT_TRUE(M);
-
-  Function *Callback = M->getFunction("callback");
-  ASSERT_NE(Callback, nullptr);
-
-  const Use *CallbackUse = Callback->getSingleUndroppableUse();
-  ASSERT_NE(CallbackUse, nullptr);
-
-  AbstractCallSite ACS(CallbackUse);
-  EXPECT_TRUE(ACS);
-  EXPECT_TRUE(ACS.isCallbackCall());
-  EXPECT_TRUE(ACS.isCallee(CallbackUse));
-  EXPECT_EQ(ACS.getCalledFunction(), Callback);
-}
diff --git a/gnu/llvm/llvm/unittests/IR/AsmWriterTest.cpp b/gnu/llvm/llvm/unittests/IR/AsmWriterTest.cpp
deleted file mode 100644
index 4fa18896591..00000000000
--- a/gnu/llvm/llvm/unittests/IR/AsmWriterTest.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-//===- llvm/unittest/IR/AsmWriter.cpp - AsmWriter tests -------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-#include "llvm/BinaryFormat/Dwarf.h"
-#include "llvm/IR/DebugInfoMetadata.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/MDBuilder.h"
-#include "llvm/IR/Module.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST(AsmWriterTest, DebugPrintDetachedInstruction) {
-
-  // PR24852: Ensure that an instruction can be printed even when it
-  // has metadata attached but no parent.
-  LLVMContext Ctx;
-  auto Ty = Type::getInt32Ty(Ctx);
-  auto Undef = UndefValue::get(Ty);
-  std::unique_ptr<BinaryOperator> Add(BinaryOperator::CreateAdd(Undef, Undef));
-  Add->setMetadata(
-      "", MDNode::get(Ctx, {ConstantAsMetadata::get(ConstantInt::get(Ty, 1))}));
-  std::string S;
-  raw_string_ostream OS(S);
-  Add->print(OS);
-  std::size_t r = OS.str().find("<badref> = add i32 undef, undef, !<empty");
-  EXPECT_TRUE(r != std::string::npos);
-}
-
-TEST(AsmWriterTest, DebugPrintDetachedArgument) {
-  LLVMContext Ctx;
-  auto Ty = Type::getInt32Ty(Ctx);
-  auto Arg = new Argument(Ty);
-
-  std::string S;
-  raw_string_ostream OS(S);
-  Arg->print(OS);
-  EXPECT_EQ(S, "i32 <badref>");
-  delete Arg;
-}
-
-TEST(AsmWriterTest, DumpDIExpression) {
-  LLVMContext Ctx;
-  uint64_t Ops[] = {
-    dwarf::DW_OP_constu, 4,
-    dwarf::DW_OP_minus,
-    dwarf::DW_OP_deref,
-  };
-  DIExpression *Expr = DIExpression::get(Ctx, Ops);
-  std::string S;
-  raw_string_ostream OS(S);
-  Expr->print(OS);
-  EXPECT_EQ("!DIExpression(DW_OP_constu, 4, DW_OP_minus, DW_OP_deref)",
-            OS.str());
-}
-
-}
diff --git a/gnu/llvm/llvm/unittests/IR/AttributesTest.cpp b/gnu/llvm/llvm/unittests/IR/AttributesTest.cpp
deleted file mode 100644
index d29df4cd342..00000000000
--- a/gnu/llvm/llvm/unittests/IR/AttributesTest.cpp
+++ /dev/null
@@ -1,299 +0,0 @@
-//===- llvm/unittest/IR/AttributesTest.cpp - Attributes unit tests --------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/IR/Attributes.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/DerivedTypes.h"
-#include "llvm/IR/InstrTypes.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-using namespace llvm;
-
-namespace {
-
-TEST(Attributes, Uniquing) {
-  LLVMContext C;
-
-  Attribute AttrA = Attribute::get(C, Attribute::AlwaysInline);
-  Attribute AttrB = Attribute::get(C, Attribute::AlwaysInline);
-  EXPECT_EQ(AttrA, AttrB);
-
-  AttributeList ASs[] = {AttributeList::get(C, 1, Attribute::ZExt),
-                         AttributeList::get(C, 2, Attribute::SExt)};
-
-  AttributeList SetA = AttributeList::get(C, ASs);
-  AttributeList SetB = AttributeList::get(C, ASs);
-  EXPECT_EQ(SetA, SetB);
-}
-
-TEST(Attributes, Ordering) {
-  LLVMContext C;
-
-  Attribute Align4 = Attribute::get(C, Attribute::Alignment, 4);
-  Attribute Align5 = Attribute::get(C, Attribute::Alignment, 5);
-  Attribute Deref4 = Attribute::get(C, Attribute::Dereferenceable, 4);
-  Attribute Deref5 = Attribute::get(C, Attribute::Dereferenceable, 5);
-  EXPECT_TRUE(Align4 < Align5);
-  EXPECT_TRUE(Align4 < Deref4);
-  EXPECT_TRUE(Align4 < Deref5);
-  EXPECT_TRUE(Align5 < Deref4);
-
-  Attribute ByVal = Attribute::get(C, Attribute::ByVal, Type::getInt32Ty(C));
-  EXPECT_FALSE(ByVal < Attribute::get(C, Attribute::ZExt));
-  EXPECT_TRUE(ByVal < Align4);
-  EXPECT_FALSE(ByVal < ByVal);
-
-  AttributeList ASs[] = {AttributeList::get(C, 2, Attribute::ZExt),
-                         AttributeList::get(C, 1, Attribute::SExt)};
-
-  AttributeList SetA = AttributeList::get(C, ASs);
-  AttributeList SetB = SetA.removeAttributes(C, 1, ASs[1].getAttributes(1));
-  EXPECT_NE(SetA, SetB);
-}
-
-TEST(Attributes, AddAttributes) {
-  LLVMContext C;
-  AttributeList AL;
-  AttrBuilder B;
-  B.addAttribute(Attribute::NoReturn);
-  AL = AL.addAttributes(C, AttributeList::FunctionIndex, AttributeSet::get(C, B));
-  EXPECT_TRUE(AL.hasFnAttribute(Attribute::NoReturn));
-  B.clear();
-  B.addAttribute(Attribute::SExt);
-  AL = AL.addAttributes(C, AttributeList::ReturnIndex, B);
-  EXPECT_TRUE(AL.hasAttribute(AttributeList::ReturnIndex, Attribute::SExt));
-  EXPECT_TRUE(AL.hasFnAttribute(Attribute::NoReturn));
-}
-
-TEST(Attributes, RemoveAlign) {
-  LLVMContext C;
-
-  Attribute AlignAttr = Attribute::getWithAlignment(C, Align(8));
-  Attribute StackAlignAttr = Attribute::getWithStackAlignment(C, Align(32));
-  AttrBuilder B_align_readonly;
-  B_align_readonly.addAttribute(AlignAttr);
-  B_align_readonly.addAttribute(Attribute::ReadOnly);
-  AttrBuilder B_align;
-  B_align.addAttribute(AlignAttr);
-  AttrBuilder B_stackalign_optnone;
-  B_stackalign_optnone.addAttribute(StackAlignAttr);
-  B_stackalign_optnone.addAttribute(Attribute::OptimizeNone);
-  AttrBuilder B_stackalign;
-  B_stackalign.addAttribute(StackAlignAttr);
-
-  AttributeSet AS = AttributeSet::get(C, B_align_readonly);
-  EXPECT_TRUE(AS.getAlignment() == 8);
-  EXPECT_TRUE(AS.hasAttribute(Attribute::ReadOnly));
-  AS = AS.removeAttribute(C, Attribute::Alignment);
-  EXPECT_FALSE(AS.hasAttribute(Attribute::Alignment));
-  EXPECT_TRUE(AS.hasAttribute(Attribute::ReadOnly));
-  AS = AttributeSet::get(C, B_align_readonly);
-  AS = AS.removeAttributes(C, B_align);
-  EXPECT_TRUE(AS.getAlignment() == 0);
-  EXPECT_TRUE(AS.hasAttribute(Attribute::ReadOnly));
-
-  AttributeList AL;
-  AL = AL.addParamAttributes(C, 0, B_align_readonly);
-  AL = AL.addAttributes(C, 0, B_stackalign_optnone);
-  EXPECT_TRUE(AL.hasAttributes(0));
-  EXPECT_TRUE(AL.hasAttribute(0, Attribute::StackAlignment));
-  EXPECT_TRUE(AL.hasAttribute(0, Attribute::OptimizeNone));
-  EXPECT_TRUE(AL.getStackAlignment(0) == 32);
-  EXPECT_TRUE(AL.hasParamAttrs(0));
-  EXPECT_TRUE(AL.hasParamAttr(0, Attribute::Alignment));
-  EXPECT_TRUE(AL.hasParamAttr(0, Attribute::ReadOnly));
-  EXPECT_TRUE(AL.getParamAlignment(0) == 8);
-
-  AL = AL.removeParamAttribute(C, 0, Attribute::Alignment);
-  EXPECT_FALSE(AL.hasParamAttr(0, Attribute::Alignment));
-  EXPECT_TRUE(AL.hasParamAttr(0, Attribute::ReadOnly));
-  EXPECT_TRUE(AL.hasAttribute(0, Attribute::StackAlignment));
-  EXPECT_TRUE(AL.hasAttribute(0, Attribute::OptimizeNone));
-  EXPECT_TRUE(AL.getStackAlignment(0) == 32);
-
-  AL = AL.removeAttribute(C, 0, Attribute::StackAlignment);
-  EXPECT_FALSE(AL.hasParamAttr(0, Attribute::Alignment));
-  EXPECT_TRUE(AL.hasParamAttr(0, Attribute::ReadOnly));
-  EXPECT_FALSE(AL.hasAttribute(0, Attribute::StackAlignment));
-  EXPECT_TRUE(AL.hasAttribute(0, Attribute::OptimizeNone));
-
-  AttributeList AL2;
-  AL2 = AL2.addParamAttributes(C, 0, B_align_readonly);
-  AL2 = AL2.addAttributes(C, 0, B_stackalign_optnone);
-
-  AL2 = AL2.removeParamAttributes(C, 0, B_align);
-  EXPECT_FALSE(AL2.hasParamAttr(0, Attribute::Alignment));
-  EXPECT_TRUE(AL2.hasParamAttr(0, Attribute::ReadOnly));
-  EXPECT_TRUE(AL2.hasAttribute(0, Attribute::StackAlignment));
-  EXPECT_TRUE(AL2.hasAttribute(0, Attribute::OptimizeNone));
-  EXPECT_TRUE(AL2.getStackAlignment(0) == 32);
-
-  AL2 = AL2.removeAttributes(C, 0, B_stackalign);
-  EXPECT_FALSE(AL2.hasParamAttr(0, Attribute::Alignment));
-  EXPECT_TRUE(AL2.hasParamAttr(0, Attribute::ReadOnly));
-  EXPECT_FALSE(AL2.hasAttribute(0, Attribute::StackAlignment));
-  EXPECT_TRUE(AL2.hasAttribute(0, Attribute::OptimizeNone));
-}
-
-TEST(Attributes, AddMatchingAlignAttr) {
-  LLVMContext C;
-  AttributeList AL;
-  AL = AL.addAttribute(C, AttributeList::FirstArgIndex,
-                       Attribute::getWithAlignment(C, Align(8)));
-  AL = AL.addAttribute(C, AttributeList::FirstArgIndex + 1,
-                       Attribute::getWithAlignment(C, Align(32)));
-  EXPECT_EQ(Align(8), AL.getParamAlignment(0));
-  EXPECT_EQ(Align(32), AL.getParamAlignment(1));
-
-  AttrBuilder B;
-  B.addAttribute(Attribute::NonNull);
-  B.addAlignmentAttr(8);
-  AL = AL.addAttributes(C, AttributeList::FirstArgIndex, B);
-  EXPECT_EQ(Align(8), AL.getParamAlignment(0));
-  EXPECT_EQ(Align(32), AL.getParamAlignment(1));
-  EXPECT_TRUE(AL.hasParamAttribute(0, Attribute::NonNull));
-}
-
-TEST(Attributes, EmptyGet) {
-  LLVMContext C;
-  AttributeList EmptyLists[] = {AttributeList(), AttributeList()};
-  AttributeList AL = AttributeList::get(C, EmptyLists);
-  EXPECT_TRUE(AL.isEmpty());
-}
-
-TEST(Attributes, OverflowGet) {
-  LLVMContext C;
-  std::pair<unsigned, Attribute> Attrs[] = { { AttributeList::ReturnIndex, Attribute::get(C, Attribute::SExt) },
-                                             { AttributeList::FunctionIndex, Attribute::get(C, Attribute::ReadOnly) } };
-  AttributeList AL = AttributeList::get(C, Attrs);
-  EXPECT_EQ(2U, AL.getNumAttrSets());
-}
-
-TEST(Attributes, StringRepresentation) {
-  LLVMContext C;
-  StructType *Ty = StructType::create(Type::getInt32Ty(C), "mystruct");
-
-  // Insufficiently careful printing can result in byval(%mystruct = { i32 })
-  Attribute A = Attribute::getWithByValType(C, Ty);
-  EXPECT_EQ(A.getAsString(), "byval(%mystruct)");
-
-  A = Attribute::getWithByValType(C, Type::getInt32Ty(C));
-  EXPECT_EQ(A.getAsString(), "byval(i32)");
-}
-
-TEST(Attributes, HasParentContext) {
-  LLVMContext C1, C2;
-
-  {
-    Attribute Attr1 = Attribute::get(C1, Attribute::AlwaysInline);
-    Attribute Attr2 = Attribute::get(C2, Attribute::AlwaysInline);
-    EXPECT_TRUE(Attr1.hasParentContext(C1));
-    EXPECT_FALSE(Attr1.hasParentContext(C2));
-    EXPECT_FALSE(Attr2.hasParentContext(C1));
-    EXPECT_TRUE(Attr2.hasParentContext(C2));
-  }
-
-  {
-    AttributeSet AS1 = AttributeSet::get(
-        C1, makeArrayRef(Attribute::get(C1, Attribute::NoReturn)));
-    AttributeSet AS2 = AttributeSet::get(
-        C2, makeArrayRef(Attribute::get(C2, Attribute::NoReturn)));
-    EXPECT_TRUE(AS1.hasParentContext(C1));
-    EXPECT_FALSE(AS1.hasParentContext(C2));
-    EXPECT_FALSE(AS2.hasParentContext(C1));
-    EXPECT_TRUE(AS2.hasParentContext(C2));
-  }
-
-  {
-    AttributeList AL1 = AttributeList::get(C1, 1, Attribute::ZExt);
-    AttributeList AL2 = AttributeList::get(C2, 1, Attribute::ZExt);
-    EXPECT_TRUE(AL1.hasParentContext(C1));
-    EXPECT_FALSE(AL1.hasParentContext(C2));
-    EXPECT_FALSE(AL2.hasParentContext(C1));
-    EXPECT_TRUE(AL2.hasParentContext(C2));
-  }
-}
-
-TEST(Attributes, AttributeListPrinting) {
-  LLVMContext C;
-
-  {
-    std::string S;
-    raw_string_ostream OS(S);
-    AttributeList AL;
-    AL.addAttribute(C, AttributeList::FunctionIndex, Attribute::AlwaysInline)
-        .print(OS);
-    EXPECT_EQ(S, "AttributeList[\n"
-                 "  { function => alwaysinline }\n"
-                 "]\n");
-  }
-
-  {
-    std::string S;
-    raw_string_ostream OS(S);
-    AttributeList AL;
-    AL.addAttribute(C, AttributeList::ReturnIndex, Attribute::SExt).print(OS);
-    EXPECT_EQ(S, "AttributeList[\n"
-                 "  { return => signext }\n"
-                 "]\n");
-  }
-
-  {
-    std::string S;
-    raw_string_ostream OS(S);
-    AttributeList AL;
-    AL.addParamAttribute(C, 5, Attribute::ZExt).print(OS);
-    EXPECT_EQ(S, "AttributeList[\n"
-                 "  { arg(5) => zeroext }\n"
-                 "]\n");
-  }
-}
-
-TEST(Attributes, MismatchedABIAttrs) {
-  const char *IRString = R"IR(
-    declare void @f1(i32* byval(i32))
-    define void @g() {
-      call void @f1(i32* null)
-      ret void
-    }
-    declare void @f2(i32* preallocated(i32))
-    define void @h() {
-      call void @f2(i32* null)
-      ret void
-    }
-    declare void @f3(i32* inalloca(i32))
-    define void @i() {
-      call void @f3(i32* null)
-      ret void
-    }
-  )IR";
-
-  SMDiagnostic Err;
-  LLVMContext Context;
-  std::unique_ptr<Module> M = parseAssemblyString(IRString, Err, Context);
-  ASSERT_TRUE(M);
-
-  {
-    auto *I = cast<CallBase>(&M->getFunction("g")->getEntryBlock().front());
-    ASSERT_TRUE(I->isByValArgument(0));
-    ASSERT_TRUE(I->getParamByValType(0));
-  }
-  {
-    auto *I = cast<CallBase>(&M->getFunction("h")->getEntryBlock().front());
-    ASSERT_TRUE(I->getParamPreallocatedType(0));
-  }
-  {
-    auto *I = cast<CallBase>(&M->getFunction("i")->getEntryBlock().front());
-    ASSERT_TRUE(I->isInAllocaArgument(0));
-    ASSERT_TRUE(I->getParamInAllocaType(0));
-  }
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/IR/BasicBlockTest.cpp b/gnu/llvm/llvm/unittests/IR/BasicBlockTest.cpp
deleted file mode 100644
index 40827573205..00000000000
--- a/gnu/llvm/llvm/unittests/IR/BasicBlockTest.cpp
+++ /dev/null
@@ -1,281 +0,0 @@
-//===- llvm/unittest/IR/BasicBlockTest.cpp - BasicBlock unit tests --------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/IR/BasicBlock.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/NoFolder.h"
-#include "llvm/IR/Verifier.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gmock/gmock-matchers.h"
-#include "gtest/gtest.h"
-#include <memory>
-
-namespace llvm {
-namespace {
-
-TEST(BasicBlockTest, PhiRange) {
-  LLVMContext Context;
-
-  // Create the main block.
-  std::unique_ptr<BasicBlock> BB(BasicBlock::Create(Context));
-
-  // Create some predecessors of it.
-  std::unique_ptr<BasicBlock> BB1(BasicBlock::Create(Context));
-  BranchInst::Create(BB.get(), BB1.get());
-  std::unique_ptr<BasicBlock> BB2(BasicBlock::Create(Context));
-  BranchInst::Create(BB.get(), BB2.get());
-
-  // Make sure this doesn't crash if there are no phis.
-  int PhiCount = 0;
-  for (auto &PN : BB->phis()) {
-    (void)PN;
-    PhiCount++;
-  }
-  ASSERT_EQ(PhiCount, 0) << "empty block should have no phis";
-
-  // Make it a cycle.
-  auto *BI = BranchInst::Create(BB.get(), BB.get());
-
-  // Now insert some PHI nodes.
-  auto *Int32Ty = Type::getInt32Ty(Context);
-  auto *P1 = PHINode::Create(Int32Ty, /*NumReservedValues*/ 3, "phi.1", BI);
-  auto *P2 = PHINode::Create(Int32Ty, /*NumReservedValues*/ 3, "phi.2", BI);
-  auto *P3 = PHINode::Create(Int32Ty, /*NumReservedValues*/ 3, "phi.3", BI);
-
-  // Some non-PHI nodes.
-  auto *Sum = BinaryOperator::CreateAdd(P1, P2, "sum", BI);
-
-  // Now wire up the incoming values that are interesting.
-  P1->addIncoming(P2, BB.get());
-  P2->addIncoming(P1, BB.get());
-  P3->addIncoming(Sum, BB.get());
-
-  // Finally, let's iterate them, which is the thing we're trying to test.
-  // We'll use this to wire up the rest of the incoming values.
-  for (auto &PN : BB->phis()) {
-    PN.addIncoming(UndefValue::get(Int32Ty), BB1.get());
-    PN.addIncoming(UndefValue::get(Int32Ty), BB2.get());
-  }
-
-  // Test that we can use const iterators and generally that the iterators
-  // behave like iterators.
-  BasicBlock::const_phi_iterator CI;
-  CI = BB->phis().begin();
-  EXPECT_NE(CI, BB->phis().end());
-
-  // Test that filtering iterators work with basic blocks.
-  auto isPhi = [](Instruction &I) { return isa<PHINode>(&I); };
-  auto Phis = make_filter_range(*BB, isPhi);
-  auto ReversedPhis = reverse(make_filter_range(*BB, isPhi));
-  EXPECT_EQ(std::distance(Phis.begin(), Phis.end()), 3);
-  EXPECT_EQ(&*Phis.begin(), P1);
-  EXPECT_EQ(std::distance(ReversedPhis.begin(), ReversedPhis.end()), 3);
-  EXPECT_EQ(&*ReversedPhis.begin(), P3);
-
-  // And iterate a const range.
-  for (const auto &PN : const_cast<const BasicBlock *>(BB.get())->phis()) {
-    EXPECT_EQ(BB.get(), PN.getIncomingBlock(0));
-    EXPECT_EQ(BB1.get(), PN.getIncomingBlock(1));
-    EXPECT_EQ(BB2.get(), PN.getIncomingBlock(2));
-  }
-}
-
-#define CHECK_ITERATORS(Range1, Range2)                                        \
-  EXPECT_EQ(std::distance(Range1.begin(), Range1.end()),                       \
-            std::distance(Range2.begin(), Range2.end()));                      \
-  for (auto Pair : zip(Range1, Range2))                                        \
-    EXPECT_EQ(&std::get<0>(Pair), std::get<1>(Pair));
-
-TEST(BasicBlockTest, TestInstructionsWithoutDebug) {
-  LLVMContext Ctx;
-
-  Module *M = new Module("MyModule", Ctx);
-  Type *ArgTy1[] = {Type::getInt32PtrTy(Ctx)};
-  FunctionType *FT = FunctionType::get(Type::getVoidTy(Ctx), ArgTy1, false);
-  Argument *V = new Argument(Type::getInt32Ty(Ctx));
-  Function *F = Function::Create(FT, Function::ExternalLinkage, "", M);
-
-  Function *DbgAddr = Intrinsic::getDeclaration(M, Intrinsic::dbg_addr);
-  Function *DbgDeclare = Intrinsic::getDeclaration(M, Intrinsic::dbg_declare);
-  Function *DbgValue = Intrinsic::getDeclaration(M, Intrinsic::dbg_value);
-  Value *DIV = MetadataAsValue::get(Ctx, (Metadata *)nullptr);
-  SmallVector<Value *, 3> Args = {DIV, DIV, DIV};
-
-  BasicBlock *BB1 = BasicBlock::Create(Ctx, "", F);
-  const BasicBlock *BBConst = BB1;
-  IRBuilder<> Builder1(BB1);
-
-  AllocaInst *Var = Builder1.CreateAlloca(Builder1.getInt8Ty());
-  Builder1.CreateCall(DbgValue, Args);
-  Instruction *AddInst = cast<Instruction>(Builder1.CreateAdd(V, V));
-  Instruction *MulInst = cast<Instruction>(Builder1.CreateMul(AddInst, V));
-  Builder1.CreateCall(DbgDeclare, Args);
-  Instruction *SubInst = cast<Instruction>(Builder1.CreateSub(MulInst, V));
-  Builder1.CreateCall(DbgAddr, Args);
-
-  SmallVector<Instruction *, 4> Exp = {Var, AddInst, MulInst, SubInst};
-  CHECK_ITERATORS(BB1->instructionsWithoutDebug(), Exp);
-  CHECK_ITERATORS(BBConst->instructionsWithoutDebug(), Exp);
-
-  EXPECT_EQ(static_cast<size_t>(BB1->sizeWithoutDebug()), Exp.size());
-  EXPECT_EQ(static_cast<size_t>(BBConst->sizeWithoutDebug()), Exp.size());
-
-  delete M;
-  delete V;
-}
-
-TEST(BasicBlockTest, ComesBefore) {
-  const char *ModuleString = R"(define i32 @f(i32 %x) {
-                                  %add = add i32 %x, 42
-                                  ret i32 %add
-                                })";
-  LLVMContext Ctx;
-  SMDiagnostic Err;
-  auto M = parseAssemblyString(ModuleString, Err, Ctx);
-  ASSERT_TRUE(M.get());
-
-  Function *F = M->getFunction("f");
-  BasicBlock &BB = F->front();
-  BasicBlock::iterator I = BB.begin();
-  Instruction *Add = &*I++;
-  Instruction *Ret = &*I++;
-
-  // Intentionally duplicated to verify cached and uncached are the same.
-  EXPECT_FALSE(BB.isInstrOrderValid());
-  EXPECT_FALSE(Add->comesBefore(Add));
-  EXPECT_TRUE(BB.isInstrOrderValid());
-  EXPECT_FALSE(Add->comesBefore(Add));
-  BB.invalidateOrders();
-  EXPECT_FALSE(BB.isInstrOrderValid());
-  EXPECT_TRUE(Add->comesBefore(Ret));
-  EXPECT_TRUE(BB.isInstrOrderValid());
-  EXPECT_TRUE(Add->comesBefore(Ret));
-  BB.invalidateOrders();
-  EXPECT_FALSE(Ret->comesBefore(Add));
-  EXPECT_FALSE(Ret->comesBefore(Add));
-  BB.invalidateOrders();
-  EXPECT_FALSE(Ret->comesBefore(Ret));
-  EXPECT_FALSE(Ret->comesBefore(Ret));
-}
-
-TEST(BasicBlockTest, EmptyPhi) {
-  LLVMContext Ctx;
-
-  Module *M = new Module("MyModule", Ctx);
-  FunctionType *FT = FunctionType::get(Type::getVoidTy(Ctx), {}, false);
-  Function *F = Function::Create(FT, Function::ExternalLinkage, "", M);
-
-  BasicBlock *BB1 = BasicBlock::Create(Ctx, "", F);
-  ReturnInst::Create(Ctx, BB1);
-
-  Type *Ty = Type::getInt32PtrTy(Ctx);
-  BasicBlock *BB2 = BasicBlock::Create(Ctx, "", F);
-  PHINode::Create(Ty, 0, "", BB2);
-  ReturnInst::Create(Ctx, BB2);
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-}
-
-class InstrOrderInvalidationTest : public ::testing::Test {
-protected:
-  void SetUp() override {
-    M.reset(new Module("MyModule", Ctx));
-    Nop = Intrinsic::getDeclaration(M.get(), Intrinsic::donothing);
-    FunctionType *FT = FunctionType::get(Type::getVoidTy(Ctx), {}, false);
-    Function *F = Function::Create(FT, Function::ExternalLinkage, "foo", *M);
-    BB = BasicBlock::Create(Ctx, "entry", F);
-
-    IRBuilder<> Builder(BB);
-    I1 = Builder.CreateCall(Nop);
-    I2 = Builder.CreateCall(Nop);
-    I3 = Builder.CreateCall(Nop);
-    Ret = Builder.CreateRetVoid();
-  }
-
-  LLVMContext Ctx;
-  std::unique_ptr<Module> M;
-  Function *Nop = nullptr;
-  BasicBlock *BB = nullptr;
-  Instruction *I1 = nullptr;
-  Instruction *I2 = nullptr;
-  Instruction *I3 = nullptr;
-  Instruction *Ret = nullptr;
-};
-
-TEST_F(InstrOrderInvalidationTest, InsertInvalidation) {
-  EXPECT_FALSE(BB->isInstrOrderValid());
-  EXPECT_TRUE(I1->comesBefore(I2));
-  EXPECT_TRUE(BB->isInstrOrderValid());
-  EXPECT_TRUE(I2->comesBefore(I3));
-  EXPECT_TRUE(I3->comesBefore(Ret));
-  EXPECT_TRUE(BB->isInstrOrderValid());
-
-  // Invalidate orders.
-  IRBuilder<> Builder(BB, I2->getIterator());
-  Instruction *I1a = Builder.CreateCall(Nop);
-  EXPECT_FALSE(BB->isInstrOrderValid());
-  EXPECT_TRUE(I1->comesBefore(I1a));
-  EXPECT_TRUE(BB->isInstrOrderValid());
-  EXPECT_TRUE(I1a->comesBefore(I2));
-  EXPECT_TRUE(I2->comesBefore(I3));
-  EXPECT_TRUE(I3->comesBefore(Ret));
-  EXPECT_TRUE(BB->isInstrOrderValid());
-}
-
-TEST_F(InstrOrderInvalidationTest, SpliceInvalidation) {
-  EXPECT_TRUE(I1->comesBefore(I2));
-  EXPECT_TRUE(I2->comesBefore(I3));
-  EXPECT_TRUE(I3->comesBefore(Ret));
-  EXPECT_TRUE(BB->isInstrOrderValid());
-
-  // Use Instruction::moveBefore, which uses splice.
-  I2->moveBefore(I1);
-  EXPECT_FALSE(BB->isInstrOrderValid());
-
-  EXPECT_TRUE(I2->comesBefore(I1));
-  EXPECT_TRUE(I1->comesBefore(I3));
-  EXPECT_TRUE(I3->comesBefore(Ret));
-  EXPECT_TRUE(BB->isInstrOrderValid());
-}
-
-TEST_F(InstrOrderInvalidationTest, RemoveNoInvalidation) {
-  // Cache the instruction order.
-  EXPECT_FALSE(BB->isInstrOrderValid());
-  EXPECT_TRUE(I1->comesBefore(I2));
-  EXPECT_TRUE(BB->isInstrOrderValid());
-
-  // Removing does not invalidate instruction order.
-  I2->removeFromParent();
-  I2->deleteValue();
-  I2 = nullptr;
-  EXPECT_TRUE(BB->isInstrOrderValid());
-  EXPECT_TRUE(I1->comesBefore(I3));
-  EXPECT_EQ(std::next(I1->getIterator()), I3->getIterator());
-}
-
-TEST_F(InstrOrderInvalidationTest, EraseNoInvalidation) {
-  // Cache the instruction order.
-  EXPECT_FALSE(BB->isInstrOrderValid());
-  EXPECT_TRUE(I1->comesBefore(I2));
-  EXPECT_TRUE(BB->isInstrOrderValid());
-
-  // Removing does not invalidate instruction order.
-  I2->eraseFromParent();
-  I2 = nullptr;
-  EXPECT_TRUE(BB->isInstrOrderValid());
-  EXPECT_TRUE(I1->comesBefore(I3));
-  EXPECT_EQ(std::next(I1->getIterator()), I3->getIterator());
-}
-
-} // End anonymous namespace.
-} // End llvm namespace.
diff --git a/gnu/llvm/llvm/unittests/IR/CFGBuilder.cpp b/gnu/llvm/llvm/unittests/IR/CFGBuilder.cpp
deleted file mode 100644
index c9bc52ca7a6..00000000000
--- a/gnu/llvm/llvm/unittests/IR/CFGBuilder.cpp
+++ /dev/null
@@ -1,277 +0,0 @@
-//===- llvm/Testing/Support/CFGBuilder.cpp --------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "CFGBuilder.h"
-
-#include "llvm/IR/CFG.h"
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gtest/gtest.h"
-
-#define DEBUG_TYPE "cfg-builder"
-
-using namespace llvm;
-
-CFGHolder::CFGHolder(StringRef ModuleName, StringRef FunctionName)
-    : Context(std::make_unique<LLVMContext>()),
-      M(std::make_unique<Module>(ModuleName, *Context)) {
-  FunctionType *FTy = FunctionType::get(Type::getVoidTy(*Context), {}, false);
-  F = Function::Create(FTy, Function::ExternalLinkage, FunctionName, M.get());
-}
-CFGHolder::~CFGHolder() = default;
-
-CFGBuilder::CFGBuilder(Function *F, const std::vector<Arc> &InitialArcs,
-                       std::vector<Update> Updates)
-    : F(F), Updates(std::move(Updates)) {
-  assert(F);
-  buildCFG(InitialArcs);
-}
-
-static void ConnectBlocks(BasicBlock *From, BasicBlock *To) {
-  LLVM_DEBUG(dbgs() << "Creating BB arc " << From->getName() << " -> "
-                    << To->getName() << "\n";
-             dbgs().flush());
-  auto *IntTy = IntegerType::get(From->getContext(), 32);
-
-  if (isa<UnreachableInst>(From->getTerminator()))
-    From->getTerminator()->eraseFromParent();
-  if (!From->getTerminator()) {
-    IRBuilder<> IRB(From);
-    IRB.CreateSwitch(ConstantInt::get(IntTy, 0), To);
-    return;
-  }
-
-  SwitchInst *SI = cast<SwitchInst>(From->getTerminator());
-  const auto Last = SI->getNumCases();
-
-  auto *IntVal = ConstantInt::get(IntTy, Last);
-  SI->addCase(IntVal, To);
-}
-
-static void DisconnectBlocks(BasicBlock *From, BasicBlock *To) {
-  LLVM_DEBUG(dbgs() << "Deleting BB arc " << From->getName() << " -> "
-                    << To->getName() << "\n";
-             dbgs().flush());
-  SwitchInst *SI = cast<SwitchInst>(From->getTerminator());
-
-  if (SI->getNumCases() == 0) {
-    SI->eraseFromParent();
-    IRBuilder<> IRB(From);
-    IRB.CreateUnreachable();
-    return;
-  }
-
-  if (SI->getDefaultDest() == To) {
-    auto FirstC = SI->case_begin();
-    SI->setDefaultDest(FirstC->getCaseSuccessor());
-    SI->removeCase(FirstC);
-    return;
-  }
-
-  for (auto CIt = SI->case_begin(); CIt != SI->case_end(); ++CIt)
-    if (CIt->getCaseSuccessor() == To) {
-      SI->removeCase(CIt);
-      return;
-    }
-}
-
-BasicBlock *CFGBuilder::getOrAddBlock(StringRef BlockName) {
-  auto BIt = NameToBlock.find(BlockName);
-  if (BIt != NameToBlock.end())
-    return BIt->second;
-
-  auto *BB = BasicBlock::Create(F->getParent()->getContext(), BlockName, F);
-  IRBuilder<> IRB(BB);
-  IRB.CreateUnreachable();
-  NameToBlock[BlockName] = BB;
-  return BB;
-}
-
-bool CFGBuilder::connect(const Arc &A) {
-  BasicBlock *From = getOrAddBlock(A.From);
-  BasicBlock *To = getOrAddBlock(A.To);
-  if (Arcs.count(A) != 0)
-    return false;
-
-  Arcs.insert(A);
-  ConnectBlocks(From, To);
-  return true;
-}
-
-bool CFGBuilder::disconnect(const Arc &A) {
-  assert(NameToBlock.count(A.From) != 0 && "No block to disconnect (From)");
-  assert(NameToBlock.count(A.To) != 0 && "No block to disconnect (To)");
-  if (Arcs.count(A) == 0)
-    return false;
-
-  BasicBlock *From = getOrAddBlock(A.From);
-  BasicBlock *To = getOrAddBlock(A.To);
-  Arcs.erase(A);
-  DisconnectBlocks(From, To);
-  return true;
-}
-
-void CFGBuilder::buildCFG(const std::vector<Arc> &NewArcs) {
-  for (const auto &A : NewArcs) {
-    const bool Connected = connect(A);
-    (void)Connected;
-    assert(Connected);
-  }
-}
-
-Optional<CFGBuilder::Update> CFGBuilder::getNextUpdate() const {
-  if (UpdateIdx == Updates.size())
-    return None;
-  return Updates[UpdateIdx];
-}
-
-Optional<CFGBuilder::Update> CFGBuilder::applyUpdate() {
-  if (UpdateIdx == Updates.size())
-    return None;
-  Update NextUpdate = Updates[UpdateIdx++];
-  if (NextUpdate.Action == ActionKind::Insert)
-    connect(NextUpdate.Edge);
-  else
-    disconnect(NextUpdate.Edge);
-
-  return NextUpdate;
-}
-
-void CFGBuilder::dump(raw_ostream &OS) const {
-  OS << "Arcs:\n";
-  size_t i = 0;
-  for (const auto &A : Arcs)
-    OS << "  " << i++ << ":\t" << A.From << " -> " << A.To << "\n";
-
-  OS << "Updates:\n";
-  i = 0;
-  for (const auto &U : Updates) {
-    OS << (i + 1 == UpdateIdx ? "->" : "  ") << i
-       << ((U.Action == ActionKind::Insert) ? "\tIns " : "\tDel ")
-       << U.Edge.From << " -> " << U.Edge.To << "\n";
-    ++i;
-  }
-}
-
-//---- CFGBuilder tests ---------------------------------------------------===//
-
-TEST(CFGBuilder, Construction) {
-  CFGHolder Holder;
-  std::vector<CFGBuilder::Arc> Arcs = {{"entry", "a"}, {"a", "b"}, {"a", "c"},
-                                       {"c", "d"},     {"d", "b"}, {"d", "e"},
-                                       {"d", "f"},     {"e", "f"}};
-  CFGBuilder B(Holder.F, Arcs, {});
-
-  EXPECT_TRUE(B.getOrAddBlock("entry") == &Holder.F->getEntryBlock());
-  EXPECT_TRUE(isa<SwitchInst>(B.getOrAddBlock("entry")->getTerminator()));
-  EXPECT_TRUE(isa<SwitchInst>(B.getOrAddBlock("a")->getTerminator()));
-  EXPECT_TRUE(isa<UnreachableInst>(B.getOrAddBlock("b")->getTerminator()));
-  EXPECT_TRUE(isa<SwitchInst>(B.getOrAddBlock("d")->getTerminator()));
-
-  auto *DSwitch = cast<SwitchInst>(B.getOrAddBlock("d")->getTerminator());
-  // d has 3 successors, but one of them if going to be a default case
-  EXPECT_EQ(DSwitch->getNumCases(), 2U);
-  EXPECT_FALSE(B.getNextUpdate()); // No updates to apply.
-}
-
-TEST(CFGBuilder, Insertions) {
-  CFGHolder Holder;
-  const auto Insert = CFGBuilder::ActionKind::Insert;
-  std::vector<CFGBuilder::Update> Updates = {
-      {Insert, {"entry", "a"}}, {Insert, {"a", "b"}}, {Insert, {"a", "c"}},
-      {Insert, {"c", "d"}},     {Insert, {"d", "b"}}, {Insert, {"d", "e"}},
-      {Insert, {"d", "f"}},     {Insert, {"e", "f"}}};
-  const size_t NumUpdates = Updates.size();
-
-  CFGBuilder B(Holder.F, {}, Updates);
-
-  size_t i = 0;
-  while (B.applyUpdate())
-    ++i;
-  EXPECT_EQ(i, NumUpdates);
-
-  EXPECT_TRUE(B.getOrAddBlock("entry") == &Holder.F->getEntryBlock());
-  EXPECT_TRUE(isa<SwitchInst>(B.getOrAddBlock("entry")->getTerminator()));
-  EXPECT_TRUE(isa<SwitchInst>(B.getOrAddBlock("a")->getTerminator()));
-  EXPECT_TRUE(isa<UnreachableInst>(B.getOrAddBlock("b")->getTerminator()));
-  EXPECT_TRUE(isa<SwitchInst>(B.getOrAddBlock("d")->getTerminator()));
-
-  auto *DSwitch = cast<SwitchInst>(B.getOrAddBlock("d")->getTerminator());
-  // d has 3 successors, but one of them if going to be a default case
-  EXPECT_EQ(DSwitch->getNumCases(), 2U);
-  EXPECT_FALSE(B.getNextUpdate()); // No updates to apply.
-}
-
-TEST(CFGBuilder, Deletions) {
-  CFGHolder Holder;
-  std::vector<CFGBuilder::Arc> Arcs = {
-      {"entry", "a"}, {"a", "b"}, {"a", "c"}, {"c", "d"}, {"d", "b"}};
-  const auto Delete = CFGBuilder::ActionKind::Delete;
-  std::vector<CFGBuilder::Update> Updates = {
-      {Delete, {"c", "d"}}, {Delete, {"a", "c"}}, {Delete, {"entry", "a"}},
-  };
-  const size_t NumUpdates = Updates.size();
-
-  CFGBuilder B(Holder.F, Arcs, Updates);
-
-  EXPECT_TRUE(isa<SwitchInst>(B.getOrAddBlock("entry")->getTerminator()));
-  EXPECT_TRUE(isa<SwitchInst>(B.getOrAddBlock("a")->getTerminator()));
-  EXPECT_TRUE(isa<SwitchInst>(B.getOrAddBlock("c")->getTerminator()));
-  EXPECT_TRUE(isa<SwitchInst>(B.getOrAddBlock("d")->getTerminator()));
-
-  auto UpdateC = B.applyUpdate();
-
-  EXPECT_TRUE(UpdateC);
-  EXPECT_EQ(UpdateC->Action, CFGBuilder::ActionKind::Delete);
-  EXPECT_EQ(UpdateC->Edge.From, "c");
-  EXPECT_EQ(UpdateC->Edge.To, "d");
-  EXPECT_TRUE(isa<UnreachableInst>(B.getOrAddBlock("c")->getTerminator()));
-
-  size_t i = 1;
-  while (B.applyUpdate())
-    ++i;
-  EXPECT_EQ(i, NumUpdates);
-
-  EXPECT_TRUE(isa<SwitchInst>(B.getOrAddBlock("a")->getTerminator()));
-  EXPECT_TRUE(isa<UnreachableInst>(B.getOrAddBlock("entry")->getTerminator()));
-}
-
-TEST(CFGBuilder, Rebuild) {
-  CFGHolder Holder;
-  std::vector<CFGBuilder::Arc> Arcs = {
-      {"entry", "a"}, {"a", "b"}, {"a", "c"}, {"c", "d"}, {"d", "b"}};
-  const auto Insert = CFGBuilder::ActionKind::Insert;
-  const auto Delete = CFGBuilder::ActionKind::Delete;
-  std::vector<CFGBuilder::Update> Updates = {
-      {Delete, {"c", "d"}}, {Delete, {"a", "c"}}, {Delete, {"entry", "a"}},
-      {Insert, {"c", "d"}}, {Insert, {"a", "c"}}, {Insert, {"entry", "a"}},
-  };
-  const size_t NumUpdates = Updates.size();
-
-  CFGBuilder B(Holder.F, Arcs, Updates);
-  size_t i = 0;
-  while (B.applyUpdate())
-    ++i;
-  EXPECT_EQ(i, NumUpdates);
-
-  EXPECT_TRUE(isa<SwitchInst>(B.getOrAddBlock("entry")->getTerminator()));
-  EXPECT_TRUE(isa<SwitchInst>(B.getOrAddBlock("a")->getTerminator()));
-  EXPECT_TRUE(isa<SwitchInst>(B.getOrAddBlock("c")->getTerminator()));
-  EXPECT_TRUE(isa<SwitchInst>(B.getOrAddBlock("d")->getTerminator()));
-}
-
-static_assert(std::is_trivially_copyable<succ_iterator>::value,
-              "trivially copyable");
-static_assert(std::is_trivially_copyable<const_succ_iterator>::value,
-              "trivially copyable");
-static_assert(std::is_trivially_copyable<succ_range>::value,
-              "trivially copyable");
-static_assert(std::is_trivially_copyable<const_succ_range>::value,
-              "trivially copyable");
diff --git a/gnu/llvm/llvm/unittests/IR/CFGBuilder.h b/gnu/llvm/llvm/unittests/IR/CFGBuilder.h
deleted file mode 100644
index 97be4a1641d..00000000000
--- a/gnu/llvm/llvm/unittests/IR/CFGBuilder.h
+++ /dev/null
@@ -1,93 +0,0 @@
-//===- CFGBuilder.h - CFG building and updating utility ----------*- C++ -*-==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-/// \file
-/// CFGBuilders provides utilities fo building and updating CFG for testing
-/// purposes.
-///
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_UNITTESTS_CFG_BUILDER_H
-#define LLVM_UNITTESTS_CFG_BUILDER_H
-
-#include "llvm/ADT/DenseMap.h"
-#include "llvm/ADT/Optional.h"
-#include "llvm/ADT/StringMap.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Debug.h"
-
-#include <memory>
-#include <set>
-#include <tuple>
-#include <vector>
-
-namespace llvm {
-
-class LLVMContext;
-class Module;
-class Function;
-class BasicBlock;
-class raw_ostream;
-
-struct CFGHolder {
-  std::unique_ptr<LLVMContext> Context;
-  std::unique_ptr<Module> M;
-  Function *F;
-
-  CFGHolder(StringRef ModuleName = "m", StringRef FunctionName = "foo");
-  ~CFGHolder(); // Defined in the .cpp file so we can use forward declarations.
-};
-
-/// \brief
-/// CFGBuilder builds IR with specific CFG, based on the supplied list of arcs.
-/// It's able to apply the provided updates and automatically modify the IR.
-///
-/// Internally it makes every basic block end with either SwitchInst or with
-/// UnreachableInst. When all arc to a BB are deleted, the BB remains in the
-/// function and doesn't get deleted.
-///
-class CFGBuilder {
-public:
-  struct Arc {
-    StringRef From;
-    StringRef To;
-
-    friend bool operator<(const Arc &LHS, const Arc &RHS) {
-      return std::tie(LHS.From, LHS.To) <
-             std::tie(RHS.From, RHS.To);
-    }
-  };
-
-  enum class ActionKind { Insert, Delete };
-  struct Update {
-    ActionKind Action;
-    Arc Edge;
-  };
-
-  CFGBuilder(Function *F, const std::vector<Arc> &InitialArcs,
-             std::vector<Update> Updates);
-
-  BasicBlock *getOrAddBlock(StringRef BlockName);
-  Optional<Update> getNextUpdate() const;
-  Optional<Update> applyUpdate();
-  void dump(raw_ostream &OS = dbgs()) const;
-
-private:
-  void buildCFG(const std::vector<Arc> &Arcs);
-  bool connect(const Arc &A);
-  bool disconnect(const Arc &A);
-
-  Function *F;
-  unsigned UpdateIdx = 0;
-  StringMap<BasicBlock *> NameToBlock;
-  std::set<Arc> Arcs;
-  std::vector<Update> Updates;
-};
-
-} // namespace llvm
-
-#endif
diff --git a/gnu/llvm/llvm/unittests/IR/CMakeLists.txt b/gnu/llvm/llvm/unittests/IR/CMakeLists.txt
deleted file mode 100644
index 42fa677b247..00000000000
--- a/gnu/llvm/llvm/unittests/IR/CMakeLists.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  Analysis
-  AsmParser
-  Core
-  Support
-  Passes
-  TransformUtils
-  ScalarOpts
-  )
-
-add_llvm_unittest(IRTests
-  AbstractCallSiteTest.cpp
-  AsmWriterTest.cpp
-  AttributesTest.cpp
-  BasicBlockTest.cpp
-  CFGBuilder.cpp
-  ConstantRangeTest.cpp
-  ConstantsTest.cpp
-  DataLayoutTest.cpp
-  DebugInfoTest.cpp
-  DebugTypeODRUniquingTest.cpp
-  DemandedBitsTest.cpp
-  DominatorTreeTest.cpp
-  DominatorTreeBatchUpdatesTest.cpp
-  FunctionTest.cpp
-  PassBuilderCallbacksTest.cpp
-  IRBuilderTest.cpp
-  InstructionsTest.cpp
-  IntrinsicsTest.cpp
-  LegacyPassManagerTest.cpp
-  MDBuilderTest.cpp
-  ManglerTest.cpp
-  MetadataTest.cpp
-  ModuleTest.cpp
-  PassManagerTest.cpp
-  PatternMatch.cpp
-  TimePassesTest.cpp
-  TypesTest.cpp
-  UseTest.cpp
-  UserTest.cpp
-  ValueHandleTest.cpp
-  ValueMapTest.cpp
-  ValueTest.cpp
-  VectorTypesTest.cpp
-  VerifierTest.cpp
-  VPIntrinsicTest.cpp
-  )
-
-target_link_libraries(IRTests PRIVATE LLVMTestingSupport)
diff --git a/gnu/llvm/llvm/unittests/IR/ConstantRangeTest.cpp b/gnu/llvm/llvm/unittests/IR/ConstantRangeTest.cpp
deleted file mode 100644
index 8eca261e65e..00000000000
--- a/gnu/llvm/llvm/unittests/IR/ConstantRangeTest.cpp
+++ /dev/null
@@ -1,2491 +0,0 @@
-//===- ConstantRangeTest.cpp - ConstantRange tests ------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/IR/ConstantRange.h"
-#include "llvm/ADT/BitVector.h"
-#include "llvm/ADT/Sequence.h"
-#include "llvm/ADT/SmallBitVector.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/Operator.h"
-#include "llvm/Support/KnownBits.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-class ConstantRangeTest : public ::testing::Test {
-protected:
-  static ConstantRange Full;
-  static ConstantRange Empty;
-  static ConstantRange One;
-  static ConstantRange Some;
-  static ConstantRange Wrap;
-};
-
-template<typename Fn>
-static void EnumerateConstantRanges(unsigned Bits, Fn TestFn) {
-  unsigned Max = 1 << Bits;
-  for (unsigned Lo = 0; Lo < Max; Lo++) {
-    for (unsigned Hi = 0; Hi < Max; Hi++) {
-      // Enforce ConstantRange invariant.
-      if (Lo == Hi && Lo != 0 && Lo != Max - 1)
-        continue;
-
-      ConstantRange CR(APInt(Bits, Lo), APInt(Bits, Hi));
-      TestFn(CR);
-    }
-  }
-}
-
-template<typename Fn>
-static void EnumerateTwoConstantRanges(unsigned Bits, Fn TestFn) {
-  EnumerateConstantRanges(Bits, [&](const ConstantRange &CR1) {
-    EnumerateConstantRanges(Bits, [&](const ConstantRange &CR2) {
-      TestFn(CR1, CR2);
-    });
-  });
-}
-
-template<typename Fn>
-static void ForeachNumInConstantRange(const ConstantRange &CR, Fn TestFn) {
-  if (!CR.isEmptySet()) {
-    APInt N = CR.getLower();
-    do TestFn(N);
-    while (++N != CR.getUpper());
-  }
-}
-
-using PreferFn = llvm::function_ref<bool(const ConstantRange &,
-                                         const ConstantRange &)>;
-
-bool PreferSmallest(const ConstantRange &CR1, const ConstantRange &CR2) {
-  return CR1.isSizeStrictlySmallerThan(CR2);
-}
-
-bool PreferSmallestUnsigned(const ConstantRange &CR1,
-                            const ConstantRange &CR2) {
-  if (CR1.isWrappedSet() != CR2.isWrappedSet())
-    return CR1.isWrappedSet() < CR2.isWrappedSet();
-  return PreferSmallest(CR1, CR2);
-}
-
-bool PreferSmallestSigned(const ConstantRange &CR1, const ConstantRange &CR2) {
-  if (CR1.isSignWrappedSet() != CR2.isSignWrappedSet())
-    return CR1.isSignWrappedSet() < CR2.isSignWrappedSet();
-  return PreferSmallest(CR1, CR2);
-}
-
-bool PreferSmallestNonFullUnsigned(const ConstantRange &CR1,
-                                   const ConstantRange &CR2) {
-  if (CR1.isFullSet() != CR2.isFullSet())
-    return CR1.isFullSet() < CR2.isFullSet();
-  return PreferSmallestUnsigned(CR1, CR2);
-}
-
-bool PreferSmallestNonFullSigned(const ConstantRange &CR1,
-                                 const ConstantRange &CR2) {
-  if (CR1.isFullSet() != CR2.isFullSet())
-    return CR1.isFullSet() < CR2.isFullSet();
-  return PreferSmallestSigned(CR1, CR2);
-}
-
-
-
-// Check whether constant range CR is an optimal approximation of the set
-// Elems under the given PreferenceFn. The preference function should return
-// true if the first range argument is strictly preferred to the second one.
-static void TestRange(const ConstantRange &CR, const SmallBitVector &Elems,
-                      PreferFn PreferenceFn, ArrayRef<ConstantRange> Inputs) {
-  unsigned BitWidth = CR.getBitWidth();
-
-  // Check conservative correctness.
-  for (unsigned Elem : Elems.set_bits()) {
-    EXPECT_TRUE(CR.contains(APInt(BitWidth, Elem)));
-  }
-
-  // Make sure we have at least one element for the code below.
-  if (Elems.none()) {
-    EXPECT_TRUE(CR.isEmptySet());
-    return;
-  }
-
-  auto NotPreferred = [&](const ConstantRange &PossibleCR) {
-    if (!PreferenceFn(PossibleCR, CR))
-      return testing::AssertionSuccess();
-
-    testing::AssertionResult Result = testing::AssertionFailure();
-    Result << "Inputs = ";
-    for (const ConstantRange &Input : Inputs)
-      Result << Input << ", ";
-    Result << "CR = " << CR << ", BetterCR = " << PossibleCR;
-    return Result;
-  };
-
-  // Look at all pairs of adjacent elements and the slack-free ranges
-  // [Elem, PrevElem] they imply. Check that none of the ranges are strictly
-  // preferred over the computed range (they may have equal preference).
-  int FirstElem = Elems.find_first();
-  int PrevElem = FirstElem, Elem;
-  do {
-    Elem = Elems.find_next(PrevElem);
-    if (Elem < 0)
-      Elem = FirstElem; // Wrap around to first element.
-
-    ConstantRange PossibleCR =
-        ConstantRange::getNonEmpty(APInt(BitWidth, Elem),
-                                   APInt(BitWidth, PrevElem) + 1);
-    // We get a full range any time PrevElem and Elem are adjacent. Avoid
-    // repeated checks by skipping here, and explicitly checking below instead.
-    if (!PossibleCR.isFullSet()) {
-      EXPECT_TRUE(NotPreferred(PossibleCR));
-    }
-
-    PrevElem = Elem;
-  } while (Elem != FirstElem);
-
-  EXPECT_TRUE(NotPreferred(ConstantRange::getFull(BitWidth)));
-}
-
-using UnaryRangeFn = llvm::function_ref<ConstantRange(const ConstantRange &)>;
-using UnaryIntFn = llvm::function_ref<Optional<APInt>(const APInt &)>;
-
-static void TestUnaryOpExhaustive(UnaryRangeFn RangeFn, UnaryIntFn IntFn,
-                                  PreferFn PreferenceFn = PreferSmallest) {
-  unsigned Bits = 4;
-  EnumerateConstantRanges(Bits, [&](const ConstantRange &CR) {
-    SmallBitVector Elems(1 << Bits);
-    ForeachNumInConstantRange(CR, [&](const APInt &N) {
-      if (Optional<APInt> ResultN = IntFn(N))
-        Elems.set(ResultN->getZExtValue());
-    });
-    TestRange(RangeFn(CR), Elems, PreferenceFn, {CR});
-  });
-}
-
-using BinaryRangeFn = llvm::function_ref<ConstantRange(const ConstantRange &,
-                                                       const ConstantRange &)>;
-using BinaryIntFn = llvm::function_ref<Optional<APInt>(const APInt &,
-                                                       const APInt &)>;
-
-static void TestBinaryOpExhaustive(BinaryRangeFn RangeFn, BinaryIntFn IntFn,
-                                   PreferFn PreferenceFn = PreferSmallest) {
-  unsigned Bits = 4;
-  EnumerateTwoConstantRanges(
-      Bits, [&](const ConstantRange &CR1, const ConstantRange &CR2) {
-        SmallBitVector Elems(1 << Bits);
-        ForeachNumInConstantRange(CR1, [&](const APInt &N1) {
-          ForeachNumInConstantRange(CR2, [&](const APInt &N2) {
-            if (Optional<APInt> ResultN = IntFn(N1, N2))
-              Elems.set(ResultN->getZExtValue());
-          });
-        });
-        TestRange(RangeFn(CR1, CR2), Elems, PreferenceFn, {CR1, CR2});
-      });
-}
-
-static void TestBinaryOpExhaustiveCorrectnessOnly(BinaryRangeFn RangeFn,
-                                                  BinaryIntFn IntFn) {
-  unsigned Bits = 4;
-  EnumerateTwoConstantRanges(
-      Bits, [&](const ConstantRange &CR1, const ConstantRange &CR2) {
-        ConstantRange ResultCR = RangeFn(CR1, CR2);
-        ForeachNumInConstantRange(CR1, [&](const APInt &N1) {
-          ForeachNumInConstantRange(CR2, [&](const APInt &N2) {
-            if (Optional<APInt> ResultN = IntFn(N1, N2)) {
-              EXPECT_TRUE(ResultCR.contains(*ResultN));
-            }
-          });
-        });
-      });
-}
-
-struct OpRangeGathererBase {
-  void account(const APInt &N);
-  ConstantRange getRange();
-};
-
-struct UnsignedOpRangeGatherer : public OpRangeGathererBase {
-  APInt Min;
-  APInt Max;
-
-  UnsignedOpRangeGatherer(unsigned Bits)
-      : Min(APInt::getMaxValue(Bits)), Max(APInt::getMinValue(Bits)) {}
-
-  void account(const APInt &N) {
-    if (N.ult(Min))
-      Min = N;
-    if (N.ugt(Max))
-      Max = N;
-  }
-
-  ConstantRange getRange() {
-    if (Min.ugt(Max))
-      return ConstantRange::getEmpty(Min.getBitWidth());
-    return ConstantRange::getNonEmpty(Min, Max + 1);
-  }
-};
-
-struct SignedOpRangeGatherer : public OpRangeGathererBase {
-  APInt Min;
-  APInt Max;
-
-  SignedOpRangeGatherer(unsigned Bits)
-      : Min(APInt::getSignedMaxValue(Bits)),
-        Max(APInt::getSignedMinValue(Bits)) {}
-
-  void account(const APInt &N) {
-    if (N.slt(Min))
-      Min = N;
-    if (N.sgt(Max))
-      Max = N;
-  }
-
-  ConstantRange getRange() {
-    if (Min.sgt(Max))
-      return ConstantRange::getEmpty(Min.getBitWidth());
-    return ConstantRange::getNonEmpty(Min, Max + 1);
-  }
-};
-
-ConstantRange ConstantRangeTest::Full(16, true);
-ConstantRange ConstantRangeTest::Empty(16, false);
-ConstantRange ConstantRangeTest::One(APInt(16, 0xa));
-ConstantRange ConstantRangeTest::Some(APInt(16, 0xa), APInt(16, 0xaaa));
-ConstantRange ConstantRangeTest::Wrap(APInt(16, 0xaaa), APInt(16, 0xa));
-
-TEST_F(ConstantRangeTest, Basics) {
-  EXPECT_TRUE(Full.isFullSet());
-  EXPECT_FALSE(Full.isEmptySet());
-  EXPECT_TRUE(Full.inverse().isEmptySet());
-  EXPECT_FALSE(Full.isWrappedSet());
-  EXPECT_TRUE(Full.contains(APInt(16, 0x0)));
-  EXPECT_TRUE(Full.contains(APInt(16, 0x9)));
-  EXPECT_TRUE(Full.contains(APInt(16, 0xa)));
-  EXPECT_TRUE(Full.contains(APInt(16, 0xaa9)));
-  EXPECT_TRUE(Full.contains(APInt(16, 0xaaa)));
-
-  EXPECT_FALSE(Empty.isFullSet());
-  EXPECT_TRUE(Empty.isEmptySet());
-  EXPECT_TRUE(Empty.inverse().isFullSet());
-  EXPECT_FALSE(Empty.isWrappedSet());
-  EXPECT_FALSE(Empty.contains(APInt(16, 0x0)));
-  EXPECT_FALSE(Empty.contains(APInt(16, 0x9)));
-  EXPECT_FALSE(Empty.contains(APInt(16, 0xa)));
-  EXPECT_FALSE(Empty.contains(APInt(16, 0xaa9)));
-  EXPECT_FALSE(Empty.contains(APInt(16, 0xaaa)));
-
-  EXPECT_FALSE(One.isFullSet());
-  EXPECT_FALSE(One.isEmptySet());
-  EXPECT_FALSE(One.isWrappedSet());
-  EXPECT_FALSE(One.contains(APInt(16, 0x0)));
-  EXPECT_FALSE(One.contains(APInt(16, 0x9)));
-  EXPECT_TRUE(One.contains(APInt(16, 0xa)));
-  EXPECT_FALSE(One.contains(APInt(16, 0xaa9)));
-  EXPECT_FALSE(One.contains(APInt(16, 0xaaa)));
-  EXPECT_FALSE(One.inverse().contains(APInt(16, 0xa)));
-
-  EXPECT_FALSE(Some.isFullSet());
-  EXPECT_FALSE(Some.isEmptySet());
-  EXPECT_FALSE(Some.isWrappedSet());
-  EXPECT_FALSE(Some.contains(APInt(16, 0x0)));
-  EXPECT_FALSE(Some.contains(APInt(16, 0x9)));
-  EXPECT_TRUE(Some.contains(APInt(16, 0xa)));
-  EXPECT_TRUE(Some.contains(APInt(16, 0xaa9)));
-  EXPECT_FALSE(Some.contains(APInt(16, 0xaaa)));
-
-  EXPECT_FALSE(Wrap.isFullSet());
-  EXPECT_FALSE(Wrap.isEmptySet());
-  EXPECT_TRUE(Wrap.isWrappedSet());
-  EXPECT_TRUE(Wrap.contains(APInt(16, 0x0)));
-  EXPECT_TRUE(Wrap.contains(APInt(16, 0x9)));
-  EXPECT_FALSE(Wrap.contains(APInt(16, 0xa)));
-  EXPECT_FALSE(Wrap.contains(APInt(16, 0xaa9)));
-  EXPECT_TRUE(Wrap.contains(APInt(16, 0xaaa)));
-}
-
-TEST_F(ConstantRangeTest, Equality) {
-  EXPECT_EQ(Full, Full);
-  EXPECT_EQ(Empty, Empty);
-  EXPECT_EQ(One, One);
-  EXPECT_EQ(Some, Some);
-  EXPECT_EQ(Wrap, Wrap);
-  EXPECT_NE(Full, Empty);
-  EXPECT_NE(Full, One);
-  EXPECT_NE(Full, Some);
-  EXPECT_NE(Full, Wrap);
-  EXPECT_NE(Empty, One);
-  EXPECT_NE(Empty, Some);
-  EXPECT_NE(Empty, Wrap);
-  EXPECT_NE(One, Some);
-  EXPECT_NE(One, Wrap);
-  EXPECT_NE(Some, Wrap);
-}
-
-TEST_F(ConstantRangeTest, SingleElement) {
-  EXPECT_EQ(Full.getSingleElement(), static_cast<APInt *>(nullptr));
-  EXPECT_EQ(Empty.getSingleElement(), static_cast<APInt *>(nullptr));
-  EXPECT_EQ(Full.getSingleMissingElement(), static_cast<APInt *>(nullptr));
-  EXPECT_EQ(Empty.getSingleMissingElement(), static_cast<APInt *>(nullptr));
-
-  EXPECT_EQ(*One.getSingleElement(), APInt(16, 0xa));
-  EXPECT_EQ(Some.getSingleElement(), static_cast<APInt *>(nullptr));
-  EXPECT_EQ(Wrap.getSingleElement(), static_cast<APInt *>(nullptr));
-
-  EXPECT_EQ(One.getSingleMissingElement(), static_cast<APInt *>(nullptr));
-  EXPECT_EQ(Some.getSingleMissingElement(), static_cast<APInt *>(nullptr));
-
-  ConstantRange OneInverse = One.inverse();
-  EXPECT_EQ(*OneInverse.getSingleMissingElement(), *One.getSingleElement());
-
-  EXPECT_FALSE(Full.isSingleElement());
-  EXPECT_FALSE(Empty.isSingleElement());
-  EXPECT_TRUE(One.isSingleElement());
-  EXPECT_FALSE(Some.isSingleElement());
-  EXPECT_FALSE(Wrap.isSingleElement());
-}
-
-TEST_F(ConstantRangeTest, GetMinsAndMaxes) {
-  EXPECT_EQ(Full.getUnsignedMax(), APInt(16, UINT16_MAX));
-  EXPECT_EQ(One.getUnsignedMax(), APInt(16, 0xa));
-  EXPECT_EQ(Some.getUnsignedMax(), APInt(16, 0xaa9));
-  EXPECT_EQ(Wrap.getUnsignedMax(), APInt(16, UINT16_MAX));
-
-  EXPECT_EQ(Full.getUnsignedMin(), APInt(16, 0));
-  EXPECT_EQ(One.getUnsignedMin(), APInt(16, 0xa));
-  EXPECT_EQ(Some.getUnsignedMin(), APInt(16, 0xa));
-  EXPECT_EQ(Wrap.getUnsignedMin(), APInt(16, 0));
-
-  EXPECT_EQ(Full.getSignedMax(), APInt(16, INT16_MAX));
-  EXPECT_EQ(One.getSignedMax(), APInt(16, 0xa));
-  EXPECT_EQ(Some.getSignedMax(), APInt(16, 0xaa9));
-  EXPECT_EQ(Wrap.getSignedMax(), APInt(16, INT16_MAX));
-
-  EXPECT_EQ(Full.getSignedMin(), APInt(16, (uint64_t)INT16_MIN));
-  EXPECT_EQ(One.getSignedMin(), APInt(16, 0xa));
-  EXPECT_EQ(Some.getSignedMin(), APInt(16, 0xa));
-  EXPECT_EQ(Wrap.getSignedMin(), APInt(16, (uint64_t)INT16_MIN));
-
-  // Found by Klee
-  EXPECT_EQ(ConstantRange(APInt(4, 7), APInt(4, 0)).getSignedMax(),
-            APInt(4, 7));
-}
-
-TEST_F(ConstantRangeTest, SignWrapped) {
-  EXPECT_FALSE(Full.isSignWrappedSet());
-  EXPECT_FALSE(Empty.isSignWrappedSet());
-  EXPECT_FALSE(One.isSignWrappedSet());
-  EXPECT_FALSE(Some.isSignWrappedSet());
-  EXPECT_TRUE(Wrap.isSignWrappedSet());
-
-  EXPECT_FALSE(ConstantRange(APInt(8, 127), APInt(8, 128)).isSignWrappedSet());
-  EXPECT_TRUE(ConstantRange(APInt(8, 127), APInt(8, 129)).isSignWrappedSet());
-  EXPECT_FALSE(ConstantRange(APInt(8, 128), APInt(8, 129)).isSignWrappedSet());
-  EXPECT_TRUE(ConstantRange(APInt(8, 10), APInt(8, 9)).isSignWrappedSet());
-  EXPECT_TRUE(ConstantRange(APInt(8, 10), APInt(8, 250)).isSignWrappedSet());
-  EXPECT_FALSE(ConstantRange(APInt(8, 250), APInt(8, 10)).isSignWrappedSet());
-  EXPECT_FALSE(ConstantRange(APInt(8, 250), APInt(8, 251)).isSignWrappedSet());
-}
-
-TEST_F(ConstantRangeTest, UpperWrapped) {
-  // The behavior here is the same as for isWrappedSet() / isSignWrappedSet().
-  EXPECT_FALSE(Full.isUpperWrapped());
-  EXPECT_FALSE(Empty.isUpperWrapped());
-  EXPECT_FALSE(One.isUpperWrapped());
-  EXPECT_FALSE(Some.isUpperWrapped());
-  EXPECT_TRUE(Wrap.isUpperWrapped());
-  EXPECT_FALSE(Full.isUpperSignWrapped());
-  EXPECT_FALSE(Empty.isUpperSignWrapped());
-  EXPECT_FALSE(One.isUpperSignWrapped());
-  EXPECT_FALSE(Some.isUpperSignWrapped());
-  EXPECT_TRUE(Wrap.isUpperSignWrapped());
-
-  // The behavior differs if Upper is the Min/SignedMin value.
-  ConstantRange CR1(APInt(8, 42), APInt::getMinValue(8));
-  EXPECT_FALSE(CR1.isWrappedSet());
-  EXPECT_TRUE(CR1.isUpperWrapped());
-
-  ConstantRange CR2(APInt(8, 42), APInt::getSignedMinValue(8));
-  EXPECT_FALSE(CR2.isSignWrappedSet());
-  EXPECT_TRUE(CR2.isUpperSignWrapped());
-}
-
-TEST_F(ConstantRangeTest, Trunc) {
-  ConstantRange TFull = Full.truncate(10);
-  ConstantRange TEmpty = Empty.truncate(10);
-  ConstantRange TOne = One.truncate(10);
-  ConstantRange TSome = Some.truncate(10);
-  ConstantRange TWrap = Wrap.truncate(10);
-  EXPECT_TRUE(TFull.isFullSet());
-  EXPECT_TRUE(TEmpty.isEmptySet());
-  EXPECT_EQ(TOne, ConstantRange(One.getLower().trunc(10),
-                                One.getUpper().trunc(10)));
-  EXPECT_TRUE(TSome.isFullSet());
-  EXPECT_TRUE(TWrap.isFullSet());
-
-  // trunc([2, 5), 3->2) = [2, 1)
-  ConstantRange TwoFive(APInt(3, 2), APInt(3, 5));
-  EXPECT_EQ(TwoFive.truncate(2), ConstantRange(APInt(2, 2), APInt(2, 1)));
-
-  // trunc([2, 6), 3->2) = full
-  ConstantRange TwoSix(APInt(3, 2), APInt(3, 6));
-  EXPECT_TRUE(TwoSix.truncate(2).isFullSet());
-
-  // trunc([5, 7), 3->2) = [1, 3)
-  ConstantRange FiveSeven(APInt(3, 5), APInt(3, 7));
-  EXPECT_EQ(FiveSeven.truncate(2), ConstantRange(APInt(2, 1), APInt(2, 3)));
-
-  // trunc([7, 1), 3->2) = [3, 1)
-  ConstantRange SevenOne(APInt(3, 7), APInt(3, 1));
-  EXPECT_EQ(SevenOne.truncate(2), ConstantRange(APInt(2, 3), APInt(2, 1)));
-}
-
-TEST_F(ConstantRangeTest, ZExt) {
-  ConstantRange ZFull = Full.zeroExtend(20);
-  ConstantRange ZEmpty = Empty.zeroExtend(20);
-  ConstantRange ZOne = One.zeroExtend(20);
-  ConstantRange ZSome = Some.zeroExtend(20);
-  ConstantRange ZWrap = Wrap.zeroExtend(20);
-  EXPECT_EQ(ZFull, ConstantRange(APInt(20, 0), APInt(20, 0x10000)));
-  EXPECT_TRUE(ZEmpty.isEmptySet());
-  EXPECT_EQ(ZOne, ConstantRange(One.getLower().zext(20),
-                                One.getUpper().zext(20)));
-  EXPECT_EQ(ZSome, ConstantRange(Some.getLower().zext(20),
-                                 Some.getUpper().zext(20)));
-  EXPECT_EQ(ZWrap, ConstantRange(APInt(20, 0), APInt(20, 0x10000)));
-
-  // zext([5, 0), 3->7) = [5, 8)
-  ConstantRange FiveZero(APInt(3, 5), APInt(3, 0));
-  EXPECT_EQ(FiveZero.zeroExtend(7), ConstantRange(APInt(7, 5), APInt(7, 8)));
-}
-
-TEST_F(ConstantRangeTest, SExt) {
-  ConstantRange SFull = Full.signExtend(20);
-  ConstantRange SEmpty = Empty.signExtend(20);
-  ConstantRange SOne = One.signExtend(20);
-  ConstantRange SSome = Some.signExtend(20);
-  ConstantRange SWrap = Wrap.signExtend(20);
-  EXPECT_EQ(SFull, ConstantRange(APInt(20, (uint64_t)INT16_MIN, true),
-                                 APInt(20, INT16_MAX + 1, true)));
-  EXPECT_TRUE(SEmpty.isEmptySet());
-  EXPECT_EQ(SOne, ConstantRange(One.getLower().sext(20),
-                                One.getUpper().sext(20)));
-  EXPECT_EQ(SSome, ConstantRange(Some.getLower().sext(20),
-                                 Some.getUpper().sext(20)));
-  EXPECT_EQ(SWrap, ConstantRange(APInt(20, (uint64_t)INT16_MIN, true),
-                                 APInt(20, INT16_MAX + 1, true)));
-
-  EXPECT_EQ(ConstantRange(APInt(8, 120), APInt(8, 140)).signExtend(16),
-            ConstantRange(APInt(16, -128), APInt(16, 128)));
-
-  EXPECT_EQ(ConstantRange(APInt(16, 0x0200), APInt(16, 0x8000)).signExtend(19),
-            ConstantRange(APInt(19, 0x0200), APInt(19, 0x8000)));
-}
-
-TEST_F(ConstantRangeTest, IntersectWith) {
-  EXPECT_EQ(Empty.intersectWith(Full), Empty);
-  EXPECT_EQ(Empty.intersectWith(Empty), Empty);
-  EXPECT_EQ(Empty.intersectWith(One), Empty);
-  EXPECT_EQ(Empty.intersectWith(Some), Empty);
-  EXPECT_EQ(Empty.intersectWith(Wrap), Empty);
-  EXPECT_EQ(Full.intersectWith(Full), Full);
-  EXPECT_EQ(Some.intersectWith(Some), Some);
-  EXPECT_EQ(Some.intersectWith(One), One);
-  EXPECT_EQ(Full.intersectWith(One), One);
-  EXPECT_EQ(Full.intersectWith(Some), Some);
-  EXPECT_EQ(Some.intersectWith(Wrap), Empty);
-  EXPECT_EQ(One.intersectWith(Wrap), Empty);
-  EXPECT_EQ(One.intersectWith(Wrap), Wrap.intersectWith(One));
-
-  // Klee generated testcase from PR4545.
-  // The intersection of i16 [4, 2) and [6, 5) is disjoint, looking like
-  // 01..4.6789ABCDEF where the dots represent values not in the intersection.
-  ConstantRange LHS(APInt(16, 4), APInt(16, 2));
-  ConstantRange RHS(APInt(16, 6), APInt(16, 5));
-  EXPECT_TRUE(LHS.intersectWith(RHS) == LHS);
-
-  // previous bug: intersection of [min, 3) and [2, max) should be 2
-  LHS = ConstantRange(APInt(32, -2147483646), APInt(32, 3));
-  RHS = ConstantRange(APInt(32, 2), APInt(32, 2147483646));
-  EXPECT_EQ(LHS.intersectWith(RHS), ConstantRange(APInt(32, 2)));
-
-  // [2, 0) /\ [4, 3) = [2, 0)
-  LHS = ConstantRange(APInt(32, 2), APInt(32, 0));
-  RHS = ConstantRange(APInt(32, 4), APInt(32, 3));
-  EXPECT_EQ(LHS.intersectWith(RHS), ConstantRange(APInt(32, 2), APInt(32, 0)));
-
-  // [2, 0) /\ [4, 2) = [4, 0)
-  LHS = ConstantRange(APInt(32, 2), APInt(32, 0));
-  RHS = ConstantRange(APInt(32, 4), APInt(32, 2));
-  EXPECT_EQ(LHS.intersectWith(RHS), ConstantRange(APInt(32, 4), APInt(32, 0)));
-
-  // [4, 2) /\ [5, 1) = [5, 1)
-  LHS = ConstantRange(APInt(32, 4), APInt(32, 2));
-  RHS = ConstantRange(APInt(32, 5), APInt(32, 1));
-  EXPECT_EQ(LHS.intersectWith(RHS), ConstantRange(APInt(32, 5), APInt(32, 1)));
-
-  // [2, 0) /\ [7, 4) = [7, 4)
-  LHS = ConstantRange(APInt(32, 2), APInt(32, 0));
-  RHS = ConstantRange(APInt(32, 7), APInt(32, 4));
-  EXPECT_EQ(LHS.intersectWith(RHS), ConstantRange(APInt(32, 7), APInt(32, 4)));
-
-  // [4, 2) /\ [1, 0) = [1, 0)
-  LHS = ConstantRange(APInt(32, 4), APInt(32, 2));
-  RHS = ConstantRange(APInt(32, 1), APInt(32, 0));
-  EXPECT_EQ(LHS.intersectWith(RHS), ConstantRange(APInt(32, 4), APInt(32, 2)));
-
-  // [15, 0) /\ [7, 6) = [15, 0)
-  LHS = ConstantRange(APInt(32, 15), APInt(32, 0));
-  RHS = ConstantRange(APInt(32, 7), APInt(32, 6));
-  EXPECT_EQ(LHS.intersectWith(RHS), ConstantRange(APInt(32, 15), APInt(32, 0)));
-}
-
-template<typename Fn1, typename Fn2>
-void testBinarySetOperationExhaustive(Fn1 OpFn, Fn2 InResultFn) {
-  unsigned Bits = 4;
-  EnumerateTwoConstantRanges(Bits,
-      [=](const ConstantRange &CR1, const ConstantRange &CR2) {
-        SmallBitVector Elems(1 << Bits);
-        APInt Num(Bits, 0);
-        for (unsigned I = 0, Limit = 1 << Bits; I < Limit; ++I, ++Num)
-          if (InResultFn(CR1, CR2, Num))
-            Elems.set(Num.getZExtValue());
-
-        ConstantRange SmallestCR = OpFn(CR1, CR2, ConstantRange::Smallest);
-        TestRange(SmallestCR, Elems, PreferSmallest, {CR1, CR2});
-
-        ConstantRange UnsignedCR = OpFn(CR1, CR2, ConstantRange::Unsigned);
-        TestRange(UnsignedCR, Elems, PreferSmallestNonFullUnsigned, {CR1, CR2});
-
-        ConstantRange SignedCR = OpFn(CR1, CR2, ConstantRange::Signed);
-        TestRange(SignedCR, Elems, PreferSmallestNonFullSigned, {CR1, CR2});
-      });
-}
-
-TEST_F(ConstantRangeTest, IntersectWithExhaustive) {
-  testBinarySetOperationExhaustive(
-      [](const ConstantRange &CR1, const ConstantRange &CR2,
-         ConstantRange::PreferredRangeType Type) {
-        return CR1.intersectWith(CR2, Type);
-      },
-      [](const ConstantRange &CR1, const ConstantRange &CR2, const APInt &N) {
-        return CR1.contains(N) && CR2.contains(N);
-      });
-}
-
-TEST_F(ConstantRangeTest, UnionWithExhaustive) {
-  testBinarySetOperationExhaustive(
-      [](const ConstantRange &CR1, const ConstantRange &CR2,
-         ConstantRange::PreferredRangeType Type) {
-        return CR1.unionWith(CR2, Type);
-      },
-      [](const ConstantRange &CR1, const ConstantRange &CR2, const APInt &N) {
-        return CR1.contains(N) || CR2.contains(N);
-      });
-}
-
-TEST_F(ConstantRangeTest, UnionWith) {
-  EXPECT_EQ(Wrap.unionWith(One),
-            ConstantRange(APInt(16, 0xaaa), APInt(16, 0xb)));
-  EXPECT_EQ(One.unionWith(Wrap), Wrap.unionWith(One));
-  EXPECT_EQ(Empty.unionWith(Empty), Empty);
-  EXPECT_EQ(Full.unionWith(Full), Full);
-  EXPECT_EQ(Some.unionWith(Wrap), Full);
-
-  // PR4545
-  EXPECT_EQ(ConstantRange(APInt(16, 14), APInt(16, 1)).unionWith(
-                                    ConstantRange(APInt(16, 0), APInt(16, 8))),
-            ConstantRange(APInt(16, 14), APInt(16, 8)));
-  EXPECT_EQ(ConstantRange(APInt(16, 6), APInt(16, 4)).unionWith(
-                                    ConstantRange(APInt(16, 4), APInt(16, 0))),
-            ConstantRange::getFull(16));
-  EXPECT_EQ(ConstantRange(APInt(16, 1), APInt(16, 0)).unionWith(
-                                    ConstantRange(APInt(16, 2), APInt(16, 1))),
-            ConstantRange::getFull(16));
-}
-
-TEST_F(ConstantRangeTest, SetDifference) {
-  EXPECT_EQ(Full.difference(Empty), Full);
-  EXPECT_EQ(Full.difference(Full), Empty);
-  EXPECT_EQ(Empty.difference(Empty), Empty);
-  EXPECT_EQ(Empty.difference(Full), Empty);
-
-  ConstantRange A(APInt(16, 3), APInt(16, 7));
-  ConstantRange B(APInt(16, 5), APInt(16, 9));
-  ConstantRange C(APInt(16, 3), APInt(16, 5));
-  ConstantRange D(APInt(16, 7), APInt(16, 9));
-  ConstantRange E(APInt(16, 5), APInt(16, 4));
-  ConstantRange F(APInt(16, 7), APInt(16, 3));
-  EXPECT_EQ(A.difference(B), C);
-  EXPECT_EQ(B.difference(A), D);
-  EXPECT_EQ(E.difference(A), F);
-}
-
-TEST_F(ConstantRangeTest, getActiveBits) {
-  unsigned Bits = 4;
-  EnumerateConstantRanges(Bits, [&](const ConstantRange &CR) {
-    unsigned Exact = 0;
-    ForeachNumInConstantRange(CR, [&](const APInt &N) {
-      Exact = std::max(Exact, N.getActiveBits());
-    });
-
-    unsigned ResultCR = CR.getActiveBits();
-    EXPECT_EQ(Exact, ResultCR);
-  });
-}
-TEST_F(ConstantRangeTest, losslessUnsignedTruncationZeroext) {
-  unsigned Bits = 4;
-  EnumerateConstantRanges(Bits, [&](const ConstantRange &CR) {
-    unsigned MinBitWidth = CR.getActiveBits();
-    if (MinBitWidth == 0) {
-      EXPECT_TRUE(CR.isEmptySet() || (CR.isSingleElement() &&
-                                      CR.getSingleElement()->isNullValue()));
-      return;
-    }
-    if (MinBitWidth == Bits)
-      return;
-    EXPECT_EQ(CR, CR.truncate(MinBitWidth).zeroExtend(Bits));
-  });
-}
-
-TEST_F(ConstantRangeTest, getMinSignedBits) {
-  unsigned Bits = 4;
-  EnumerateConstantRanges(Bits, [&](const ConstantRange &CR) {
-    unsigned Exact = 0;
-    ForeachNumInConstantRange(CR, [&](const APInt &N) {
-      Exact = std::max(Exact, N.getMinSignedBits());
-    });
-
-    unsigned ResultCR = CR.getMinSignedBits();
-    EXPECT_EQ(Exact, ResultCR);
-  });
-}
-TEST_F(ConstantRangeTest, losslessSignedTruncationSignext) {
-  unsigned Bits = 4;
-  EnumerateConstantRanges(Bits, [&](const ConstantRange &CR) {
-    unsigned MinBitWidth = CR.getMinSignedBits();
-    if (MinBitWidth == 0) {
-      EXPECT_TRUE(CR.isEmptySet());
-      return;
-    }
-    if (MinBitWidth == Bits)
-      return;
-    EXPECT_EQ(CR, CR.truncate(MinBitWidth).signExtend(Bits));
-  });
-}
-
-TEST_F(ConstantRangeTest, SubtractAPInt) {
-  EXPECT_EQ(Full.subtract(APInt(16, 4)), Full);
-  EXPECT_EQ(Empty.subtract(APInt(16, 4)), Empty);
-  EXPECT_EQ(Some.subtract(APInt(16, 4)),
-            ConstantRange(APInt(16, 0x6), APInt(16, 0xaa6)));
-  EXPECT_EQ(Wrap.subtract(APInt(16, 4)),
-            ConstantRange(APInt(16, 0xaa6), APInt(16, 0x6)));
-  EXPECT_EQ(One.subtract(APInt(16, 4)),
-            ConstantRange(APInt(16, 0x6)));
-}
-
-TEST_F(ConstantRangeTest, Add) {
-  EXPECT_EQ(Full.add(APInt(16, 4)), Full);
-  EXPECT_EQ(Full.add(Full), Full);
-  EXPECT_EQ(Full.add(Empty), Empty);
-  EXPECT_EQ(Full.add(One), Full);
-  EXPECT_EQ(Full.add(Some), Full);
-  EXPECT_EQ(Full.add(Wrap), Full);
-  EXPECT_EQ(Empty.add(Empty), Empty);
-  EXPECT_EQ(Empty.add(One), Empty);
-  EXPECT_EQ(Empty.add(Some), Empty);
-  EXPECT_EQ(Empty.add(Wrap), Empty);
-  EXPECT_EQ(Empty.add(APInt(16, 4)), Empty);
-  EXPECT_EQ(Some.add(APInt(16, 4)),
-            ConstantRange(APInt(16, 0xe), APInt(16, 0xaae)));
-  EXPECT_EQ(Wrap.add(APInt(16, 4)),
-            ConstantRange(APInt(16, 0xaae), APInt(16, 0xe)));
-  EXPECT_EQ(One.add(APInt(16, 4)),
-            ConstantRange(APInt(16, 0xe)));
-
-  TestBinaryOpExhaustive(
-      [](const ConstantRange &CR1, const ConstantRange &CR2) {
-        return CR1.add(CR2);
-      },
-      [](const APInt &N1, const APInt &N2) {
-        return N1 + N2;
-      });
-}
-
-template <typename Fn1, typename Fn2>
-static void TestAddWithNoSignedWrapExhaustive(Fn1 RangeFn, Fn2 IntFn) {
-  unsigned Bits = 4;
-  EnumerateTwoConstantRanges(Bits, [&](const ConstantRange &CR1,
-                                       const ConstantRange &CR2) {
-    ConstantRange CR = RangeFn(CR1, CR2);
-    SignedOpRangeGatherer R(CR.getBitWidth());
-    bool AllOverflow = true;
-    ForeachNumInConstantRange(CR1, [&](const APInt &N1) {
-      ForeachNumInConstantRange(CR2, [&](const APInt &N2) {
-        bool IsOverflow = false;
-        APInt N = IntFn(IsOverflow, N1, N2);
-        if (!IsOverflow) {
-          AllOverflow = false;
-          R.account(N);
-          EXPECT_TRUE(CR.contains(N));
-        }
-      });
-    });
-
-    EXPECT_EQ(CR.isEmptySet(), AllOverflow);
-
-    if (CR1.isSignWrappedSet() || CR2.isSignWrappedSet())
-      return;
-
-    ConstantRange Exact = R.getRange();
-    EXPECT_EQ(Exact, CR);
-  });
-}
-
-template <typename Fn1, typename Fn2>
-static void TestAddWithNoUnsignedWrapExhaustive(Fn1 RangeFn, Fn2 IntFn) {
-  unsigned Bits = 4;
-  EnumerateTwoConstantRanges(Bits, [&](const ConstantRange &CR1,
-                                       const ConstantRange &CR2) {
-    ConstantRange CR = RangeFn(CR1, CR2);
-    UnsignedOpRangeGatherer R(CR.getBitWidth());
-    bool AllOverflow = true;
-    ForeachNumInConstantRange(CR1, [&](const APInt &N1) {
-      ForeachNumInConstantRange(CR2, [&](const APInt &N2) {
-        bool IsOverflow = false;
-        APInt N = IntFn(IsOverflow, N1, N2);
-        if (!IsOverflow) {
-          AllOverflow = false;
-          R.account(N);
-          EXPECT_TRUE(CR.contains(N));
-        }
-      });
-    });
-
-    EXPECT_EQ(CR.isEmptySet(), AllOverflow);
-
-    if (CR1.isWrappedSet() || CR2.isWrappedSet())
-      return;
-
-    ConstantRange Exact = R.getRange();
-    EXPECT_EQ(Exact, CR);
-  });
-}
-
-template <typename Fn1, typename Fn2, typename Fn3>
-static void TestAddWithNoSignedUnsignedWrapExhaustive(Fn1 RangeFn,
-                                                      Fn2 IntFnSigned,
-                                                      Fn3 IntFnUnsigned) {
-  unsigned Bits = 4;
-  EnumerateTwoConstantRanges(
-      Bits, [&](const ConstantRange &CR1, const ConstantRange &CR2) {
-        ConstantRange CR = RangeFn(CR1, CR2);
-        UnsignedOpRangeGatherer UR(CR.getBitWidth());
-        SignedOpRangeGatherer SR(CR.getBitWidth());
-        bool AllOverflow = true;
-        ForeachNumInConstantRange(CR1, [&](const APInt &N1) {
-          ForeachNumInConstantRange(CR2, [&](const APInt &N2) {
-            bool IsOverflow = false, IsSignedOverflow = false;
-            APInt N = IntFnSigned(IsSignedOverflow, N1, N2);
-            (void) IntFnUnsigned(IsOverflow, N1, N2);
-            if (!IsSignedOverflow && !IsOverflow) {
-              AllOverflow = false;
-              UR.account(N);
-              SR.account(N);
-              EXPECT_TRUE(CR.contains(N));
-            }
-          });
-        });
-
-        EXPECT_EQ(CR.isEmptySet(), AllOverflow);
-
-        if (CR1.isWrappedSet() || CR2.isWrappedSet() ||
-            CR1.isSignWrappedSet() || CR2.isSignWrappedSet())
-          return;
-
-        ConstantRange ExactUnsignedCR = UR.getRange();
-        ConstantRange ExactSignedCR = SR.getRange();
-
-        if (ExactUnsignedCR.isEmptySet() || ExactSignedCR.isEmptySet()) {
-          EXPECT_TRUE(CR.isEmptySet());
-          return;
-        }
-
-        ConstantRange Exact = ExactSignedCR.intersectWith(ExactUnsignedCR);
-        EXPECT_EQ(Exact, CR);
-      });
-}
-
-TEST_F(ConstantRangeTest, AddWithNoWrap) {
-  typedef OverflowingBinaryOperator OBO;
-  EXPECT_EQ(Empty.addWithNoWrap(Some, OBO::NoSignedWrap), Empty);
-  EXPECT_EQ(Some.addWithNoWrap(Empty, OBO::NoSignedWrap), Empty);
-  EXPECT_EQ(Full.addWithNoWrap(Full, OBO::NoSignedWrap), Full);
-  EXPECT_NE(Full.addWithNoWrap(Some, OBO::NoSignedWrap), Full);
-  EXPECT_NE(Some.addWithNoWrap(Full, OBO::NoSignedWrap), Full);
-  EXPECT_EQ(Full.addWithNoWrap(ConstantRange(APInt(16, 1), APInt(16, 2)),
-                               OBO::NoSignedWrap),
-            ConstantRange(APInt(16, INT16_MIN + 1), APInt(16, INT16_MIN)));
-  EXPECT_EQ(ConstantRange(APInt(16, 1), APInt(16, 2))
-                .addWithNoWrap(Full, OBO::NoSignedWrap),
-            ConstantRange(APInt(16, INT16_MIN + 1), APInt(16, INT16_MIN)));
-  EXPECT_EQ(Full.addWithNoWrap(ConstantRange(APInt(16, -1), APInt(16, 0)),
-                               OBO::NoSignedWrap),
-            ConstantRange(APInt(16, INT16_MIN), APInt(16, INT16_MAX)));
-  EXPECT_EQ(ConstantRange(APInt(8, 100), APInt(8, 120))
-                .addWithNoWrap(ConstantRange(APInt(8, 120), APInt(8, 123)),
-                               OBO::NoSignedWrap),
-            ConstantRange(8, false));
-  EXPECT_EQ(ConstantRange(APInt(8, -120), APInt(8, -100))
-                .addWithNoWrap(ConstantRange(APInt(8, -110), APInt(8, -100)),
-                               OBO::NoSignedWrap),
-            ConstantRange(8, false));
-  EXPECT_EQ(ConstantRange(APInt(8, 0), APInt(8, 101))
-                .addWithNoWrap(ConstantRange(APInt(8, -128), APInt(8, 28)),
-                               OBO::NoSignedWrap),
-            ConstantRange(8, true));
-  EXPECT_EQ(ConstantRange(APInt(8, 0), APInt(8, 101))
-                .addWithNoWrap(ConstantRange(APInt(8, -120), APInt(8, 29)),
-                               OBO::NoSignedWrap),
-            ConstantRange(APInt(8, -120), APInt(8, -128)));
-  EXPECT_EQ(ConstantRange(APInt(8, -50), APInt(8, 50))
-                .addWithNoWrap(ConstantRange(APInt(8, 10), APInt(8, 20)),
-                               OBO::NoSignedWrap),
-            ConstantRange(APInt(8, -40), APInt(8, 69)));
-  EXPECT_EQ(ConstantRange(APInt(8, 10), APInt(8, 20))
-                .addWithNoWrap(ConstantRange(APInt(8, -50), APInt(8, 50)),
-                               OBO::NoSignedWrap),
-            ConstantRange(APInt(8, -40), APInt(8, 69)));
-  EXPECT_EQ(ConstantRange(APInt(8, 120), APInt(8, -10))
-                .addWithNoWrap(ConstantRange(APInt(8, 5), APInt(8, 20)),
-                               OBO::NoSignedWrap),
-            ConstantRange(APInt(8, 125), APInt(8, 9)));
-  EXPECT_EQ(ConstantRange(APInt(8, 5), APInt(8, 20))
-                .addWithNoWrap(ConstantRange(APInt(8, 120), APInt(8, -10)),
-                               OBO::NoSignedWrap),
-            ConstantRange(APInt(8, 125), APInt(8, 9)));
-
-  TestAddWithNoSignedWrapExhaustive(
-      [](const ConstantRange &CR1, const ConstantRange &CR2) {
-        return CR1.addWithNoWrap(CR2, OBO::NoSignedWrap);
-      },
-      [](bool &IsOverflow, const APInt &N1, const APInt &N2) {
-        return N1.sadd_ov(N2, IsOverflow);
-      });
-
-  EXPECT_EQ(Empty.addWithNoWrap(Some, OBO::NoUnsignedWrap), Empty);
-  EXPECT_EQ(Some.addWithNoWrap(Empty, OBO::NoUnsignedWrap), Empty);
-  EXPECT_EQ(Full.addWithNoWrap(Full, OBO::NoUnsignedWrap), Full);
-  EXPECT_NE(Full.addWithNoWrap(Some, OBO::NoUnsignedWrap), Full);
-  EXPECT_NE(Some.addWithNoWrap(Full, OBO::NoUnsignedWrap), Full);
-  EXPECT_EQ(Full.addWithNoWrap(ConstantRange(APInt(16, 1), APInt(16, 2)),
-                               OBO::NoUnsignedWrap),
-            ConstantRange(APInt(16, 1), APInt(16, 0)));
-  EXPECT_EQ(ConstantRange(APInt(16, 1), APInt(16, 2))
-                .addWithNoWrap(Full, OBO::NoUnsignedWrap),
-            ConstantRange(APInt(16, 1), APInt(16, 0)));
-  EXPECT_EQ(ConstantRange(APInt(8, 200), APInt(8, 220))
-                .addWithNoWrap(ConstantRange(APInt(8, 100), APInt(8, 123)),
-                               OBO::NoUnsignedWrap),
-            ConstantRange(8, false));
-  EXPECT_EQ(ConstantRange(APInt(8, 0), APInt(8, 101))
-                .addWithNoWrap(ConstantRange(APInt(8, 0), APInt(8, 156)),
-                               OBO::NoUnsignedWrap),
-            ConstantRange(8, true));
-  EXPECT_EQ(ConstantRange(APInt(8, 0), APInt(8, 101))
-                .addWithNoWrap(ConstantRange(APInt(8, 10), APInt(8, 29)),
-                               OBO::NoUnsignedWrap),
-            ConstantRange(APInt(8, 10), APInt(8, 129)));
-  EXPECT_EQ(ConstantRange(APInt(8, 20), APInt(8, 10))
-                .addWithNoWrap(ConstantRange(APInt(8, 50), APInt(8, 200)),
-                               OBO::NoUnsignedWrap),
-            ConstantRange(APInt(8, 50), APInt(8, 0)));
-  EXPECT_EQ(ConstantRange(APInt(8, 10), APInt(8, 20))
-                .addWithNoWrap(ConstantRange(APInt(8, 50), APInt(8, 200)),
-                               OBO::NoUnsignedWrap),
-            ConstantRange(APInt(8, 60), APInt(8, -37)));
-  EXPECT_EQ(ConstantRange(APInt(8, 20), APInt(8, -30))
-                .addWithNoWrap(ConstantRange(APInt(8, 5), APInt(8, 20)),
-                               OBO::NoUnsignedWrap),
-            ConstantRange(APInt(8, 25), APInt(8, -11)));
-  EXPECT_EQ(ConstantRange(APInt(8, 5), APInt(8, 20))
-                .addWithNoWrap(ConstantRange(APInt(8, 20), APInt(8, -30)),
-                               OBO::NoUnsignedWrap),
-            ConstantRange(APInt(8, 25), APInt(8, -11)));
-
-  TestAddWithNoUnsignedWrapExhaustive(
-      [](const ConstantRange &CR1, const ConstantRange &CR2) {
-        return CR1.addWithNoWrap(CR2, OBO::NoUnsignedWrap);
-      },
-      [](bool &IsOverflow, const APInt &N1, const APInt &N2) {
-        return N1.uadd_ov(N2, IsOverflow);
-      });
-
-  EXPECT_EQ(ConstantRange(APInt(8, 50), APInt(8, 100))
-                .addWithNoWrap(ConstantRange(APInt(8, 20), APInt(8, 70)),
-                               OBO::NoSignedWrap),
-            ConstantRange(APInt(8, 70), APInt(8, -128)));
-  EXPECT_EQ(ConstantRange(APInt(8, 50), APInt(8, 100))
-                .addWithNoWrap(ConstantRange(APInt(8, 20), APInt(8, 70)),
-                               OBO::NoUnsignedWrap),
-            ConstantRange(APInt(8, 70), APInt(8, 169)));
-  EXPECT_EQ(ConstantRange(APInt(8, 50), APInt(8, 100))
-                .addWithNoWrap(ConstantRange(APInt(8, 20), APInt(8, 70)),
-                               OBO::NoUnsignedWrap | OBO::NoSignedWrap),
-            ConstantRange(APInt(8, 70), APInt(8, -128)));
-
-  EXPECT_EQ(ConstantRange(APInt(8, -100), APInt(8, -50))
-                .addWithNoWrap(ConstantRange(APInt(8, 20), APInt(8, 30)),
-                               OBO::NoSignedWrap),
-            ConstantRange(APInt(8, -80), APInt(8, -21)));
-  EXPECT_EQ(ConstantRange(APInt(8, -100), APInt(8, -50))
-                .addWithNoWrap(ConstantRange(APInt(8, 20), APInt(8, 30)),
-                               OBO::NoUnsignedWrap),
-            ConstantRange(APInt(8, 176), APInt(8, 235)));
-  EXPECT_EQ(ConstantRange(APInt(8, -100), APInt(8, -50))
-                .addWithNoWrap(ConstantRange(APInt(8, 20), APInt(8, 30)),
-                               OBO::NoUnsignedWrap | OBO::NoSignedWrap),
-            ConstantRange(APInt(8, 176), APInt(8, 235)));
-
-  TestAddWithNoSignedUnsignedWrapExhaustive(
-      [](const ConstantRange &CR1, const ConstantRange &CR2) {
-        return CR1.addWithNoWrap(CR2, OBO::NoUnsignedWrap | OBO::NoSignedWrap);
-      },
-      [](bool &IsOverflow, const APInt &N1, const APInt &N2) {
-        return N1.sadd_ov(N2, IsOverflow);
-      },
-      [](bool &IsOverflow, const APInt &N1, const APInt &N2) {
-        return N1.uadd_ov(N2, IsOverflow);
-      });
-}
-
-TEST_F(ConstantRangeTest, Sub) {
-  EXPECT_EQ(Full.sub(APInt(16, 4)), Full);
-  EXPECT_EQ(Full.sub(Full), Full);
-  EXPECT_EQ(Full.sub(Empty), Empty);
-  EXPECT_EQ(Full.sub(One), Full);
-  EXPECT_EQ(Full.sub(Some), Full);
-  EXPECT_EQ(Full.sub(Wrap), Full);
-  EXPECT_EQ(Empty.sub(Empty), Empty);
-  EXPECT_EQ(Empty.sub(One), Empty);
-  EXPECT_EQ(Empty.sub(Some), Empty);
-  EXPECT_EQ(Empty.sub(Wrap), Empty);
-  EXPECT_EQ(Empty.sub(APInt(16, 4)), Empty);
-  EXPECT_EQ(Some.sub(APInt(16, 4)),
-            ConstantRange(APInt(16, 0x6), APInt(16, 0xaa6)));
-  EXPECT_EQ(Some.sub(Some),
-            ConstantRange(APInt(16, 0xf561), APInt(16, 0xaa0)));
-  EXPECT_EQ(Wrap.sub(APInt(16, 4)),
-            ConstantRange(APInt(16, 0xaa6), APInt(16, 0x6)));
-  EXPECT_EQ(One.sub(APInt(16, 4)),
-            ConstantRange(APInt(16, 0x6)));
-
-  TestBinaryOpExhaustive(
-      [](const ConstantRange &CR1, const ConstantRange &CR2) {
-        return CR1.sub(CR2);
-      },
-      [](const APInt &N1, const APInt &N2) {
-        return N1 - N2;
-      });
-}
-
-TEST_F(ConstantRangeTest, SubWithNoWrap) {
-  typedef OverflowingBinaryOperator OBO;
-  TestAddWithNoSignedWrapExhaustive(
-      [](const ConstantRange &CR1, const ConstantRange &CR2) {
-        return CR1.subWithNoWrap(CR2, OBO::NoSignedWrap);
-      },
-      [](bool &IsOverflow, const APInt &N1, const APInt &N2) {
-        return N1.ssub_ov(N2, IsOverflow);
-      });
-  TestAddWithNoUnsignedWrapExhaustive(
-      [](const ConstantRange &CR1, const ConstantRange &CR2) {
-        return CR1.subWithNoWrap(CR2, OBO::NoUnsignedWrap);
-      },
-      [](bool &IsOverflow, const APInt &N1, const APInt &N2) {
-        return N1.usub_ov(N2, IsOverflow);
-      });
-  TestAddWithNoSignedUnsignedWrapExhaustive(
-      [](const ConstantRange &CR1, const ConstantRange &CR2) {
-        return CR1.subWithNoWrap(CR2, OBO::NoUnsignedWrap | OBO::NoSignedWrap);
-      },
-      [](bool &IsOverflow, const APInt &N1, const APInt &N2) {
-        return N1.ssub_ov(N2, IsOverflow);
-      },
-      [](bool &IsOverflow, const APInt &N1, const APInt &N2) {
-        return N1.usub_ov(N2, IsOverflow);
-      });
-}
-
-TEST_F(ConstantRangeTest, Multiply) {
-  EXPECT_EQ(Full.multiply(Full), Full);
-  EXPECT_EQ(Full.multiply(Empty), Empty);
-  EXPECT_EQ(Full.multiply(One), Full);
-  EXPECT_EQ(Full.multiply(Some), Full);
-  EXPECT_EQ(Full.multiply(Wrap), Full);
-  EXPECT_EQ(Empty.multiply(Empty), Empty);
-  EXPECT_EQ(Empty.multiply(One), Empty);
-  EXPECT_EQ(Empty.multiply(Some), Empty);
-  EXPECT_EQ(Empty.multiply(Wrap), Empty);
-  EXPECT_EQ(One.multiply(One), ConstantRange(APInt(16, 0xa*0xa),
-                                             APInt(16, 0xa*0xa + 1)));
-  EXPECT_EQ(One.multiply(Some), ConstantRange(APInt(16, 0xa*0xa),
-                                              APInt(16, 0xa*0xaa9 + 1)));
-  EXPECT_EQ(One.multiply(Wrap), Full);
-  EXPECT_EQ(Some.multiply(Some), Full);
-  EXPECT_EQ(Some.multiply(Wrap), Full);
-  EXPECT_EQ(Wrap.multiply(Wrap), Full);
-
-  ConstantRange Zero(APInt(16, 0));
-  EXPECT_EQ(Zero.multiply(Full), Zero);
-  EXPECT_EQ(Zero.multiply(Some), Zero);
-  EXPECT_EQ(Zero.multiply(Wrap), Zero);
-  EXPECT_EQ(Full.multiply(Zero), Zero);
-  EXPECT_EQ(Some.multiply(Zero), Zero);
-  EXPECT_EQ(Wrap.multiply(Zero), Zero);
-
-  // http://llvm.org/PR4545
-  EXPECT_EQ(ConstantRange(APInt(4, 1), APInt(4, 6)).multiply(
-                ConstantRange(APInt(4, 6), APInt(4, 2))),
-            ConstantRange(4, /*isFullSet=*/true));
-
-  EXPECT_EQ(ConstantRange(APInt(8, 254), APInt(8, 0)).multiply(
-              ConstantRange(APInt(8, 252), APInt(8, 4))),
-            ConstantRange(APInt(8, 250), APInt(8, 9)));
-  EXPECT_EQ(ConstantRange(APInt(8, 254), APInt(8, 255)).multiply(
-              ConstantRange(APInt(8, 2), APInt(8, 4))),
-            ConstantRange(APInt(8, 250), APInt(8, 253)));
-
-  // TODO: This should be return [-2, 0]
-  EXPECT_EQ(ConstantRange(APInt(8, -2)).multiply(
-              ConstantRange(APInt(8, 0), APInt(8, 2))),
-            ConstantRange(APInt(8, -2), APInt(8, 1)));
-}
-
-TEST_F(ConstantRangeTest, UMax) {
-  EXPECT_EQ(Full.umax(Full), Full);
-  EXPECT_EQ(Full.umax(Empty), Empty);
-  EXPECT_EQ(Full.umax(Some), ConstantRange(APInt(16, 0xa), APInt(16, 0)));
-  EXPECT_EQ(Full.umax(Wrap), Full);
-  EXPECT_EQ(Full.umax(Some), ConstantRange(APInt(16, 0xa), APInt(16, 0)));
-  EXPECT_EQ(Empty.umax(Empty), Empty);
-  EXPECT_EQ(Empty.umax(Some), Empty);
-  EXPECT_EQ(Empty.umax(Wrap), Empty);
-  EXPECT_EQ(Empty.umax(One), Empty);
-  EXPECT_EQ(Some.umax(Some), Some);
-  EXPECT_EQ(Some.umax(Wrap), ConstantRange(APInt(16, 0xa), APInt(16, 0)));
-  EXPECT_EQ(Some.umax(One), Some);
-  EXPECT_EQ(Wrap.umax(Wrap), Wrap);
-  EXPECT_EQ(Wrap.umax(One), ConstantRange(APInt(16, 0xa), APInt(16, 0)));
-  EXPECT_EQ(One.umax(One), One);
-
-  TestBinaryOpExhaustive(
-      [](const ConstantRange &CR1, const ConstantRange &CR2) {
-        return CR1.umax(CR2);
-      },
-      [](const APInt &N1, const APInt &N2) {
-        return APIntOps::umax(N1, N2);
-      },
-      PreferSmallestNonFullUnsigned);
-}
-
-TEST_F(ConstantRangeTest, SMax) {
-  EXPECT_EQ(Full.smax(Full), Full);
-  EXPECT_EQ(Full.smax(Empty), Empty);
-  EXPECT_EQ(Full.smax(Some), ConstantRange(APInt(16, 0xa),
-                                           APInt::getSignedMinValue(16)));
-  EXPECT_EQ(Full.smax(Wrap), Full);
-  EXPECT_EQ(Full.smax(One), ConstantRange(APInt(16, 0xa),
-                                          APInt::getSignedMinValue(16)));
-  EXPECT_EQ(Empty.smax(Empty), Empty);
-  EXPECT_EQ(Empty.smax(Some), Empty);
-  EXPECT_EQ(Empty.smax(Wrap), Empty);
-  EXPECT_EQ(Empty.smax(One), Empty);
-  EXPECT_EQ(Some.smax(Some), Some);
-  EXPECT_EQ(Some.smax(Wrap), ConstantRange(APInt(16, 0xa),
-                                           APInt(16, (uint64_t)INT16_MIN)));
-  EXPECT_EQ(Some.smax(One), Some);
-  EXPECT_EQ(Wrap.smax(One), ConstantRange(APInt(16, 0xa),
-                                          APInt(16, (uint64_t)INT16_MIN)));
-  EXPECT_EQ(One.smax(One), One);
-
-  TestBinaryOpExhaustive(
-      [](const ConstantRange &CR1, const ConstantRange &CR2) {
-        return CR1.smax(CR2);
-      },
-      [](const APInt &N1, const APInt &N2) {
-        return APIntOps::smax(N1, N2);
-      },
-      PreferSmallestNonFullSigned);
-}
-
-TEST_F(ConstantRangeTest, UMin) {
-  EXPECT_EQ(Full.umin(Full), Full);
-  EXPECT_EQ(Full.umin(Empty), Empty);
-  EXPECT_EQ(Full.umin(Some), ConstantRange(APInt(16, 0), APInt(16, 0xaaa)));
-  EXPECT_EQ(Full.umin(Wrap), Full);
-  EXPECT_EQ(Empty.umin(Empty), Empty);
-  EXPECT_EQ(Empty.umin(Some), Empty);
-  EXPECT_EQ(Empty.umin(Wrap), Empty);
-  EXPECT_EQ(Empty.umin(One), Empty);
-  EXPECT_EQ(Some.umin(Some), Some);
-  EXPECT_EQ(Some.umin(Wrap), ConstantRange(APInt(16, 0), APInt(16, 0xaaa)));
-  EXPECT_EQ(Some.umin(One), One);
-  EXPECT_EQ(Wrap.umin(Wrap), Wrap);
-  EXPECT_EQ(Wrap.umin(One), ConstantRange(APInt(16, 0), APInt(16, 0xb)));
-  EXPECT_EQ(One.umin(One), One);
-
-  TestBinaryOpExhaustive(
-      [](const ConstantRange &CR1, const ConstantRange &CR2) {
-        return CR1.umin(CR2);
-      },
-      [](const APInt &N1, const APInt &N2) {
-        return APIntOps::umin(N1, N2);
-      },
-      PreferSmallestNonFullUnsigned);
-}
-
-TEST_F(ConstantRangeTest, SMin) {
-  EXPECT_EQ(Full.smin(Full), Full);
-  EXPECT_EQ(Full.smin(Empty), Empty);
-  EXPECT_EQ(Full.smin(Some), ConstantRange(APInt(16, (uint64_t)INT16_MIN),
-                                           APInt(16, 0xaaa)));
-  EXPECT_EQ(Full.smin(Wrap), Full);
-  EXPECT_EQ(Empty.smin(Empty), Empty);
-  EXPECT_EQ(Empty.smin(Some), Empty);
-  EXPECT_EQ(Empty.smin(Wrap), Empty);
-  EXPECT_EQ(Empty.smin(One), Empty);
-  EXPECT_EQ(Some.smin(Some), Some);
-  EXPECT_EQ(Some.smin(Wrap), ConstantRange(APInt(16, (uint64_t)INT16_MIN),
-                                           APInt(16, 0xaaa)));
-  EXPECT_EQ(Some.smin(One), One);
-  EXPECT_EQ(Wrap.smin(Wrap), Wrap);
-  EXPECT_EQ(Wrap.smin(One), ConstantRange(APInt(16, (uint64_t)INT16_MIN),
-                                          APInt(16, 0xb)));
-  EXPECT_EQ(One.smin(One), One);
-
-  TestBinaryOpExhaustive(
-      [](const ConstantRange &CR1, const ConstantRange &CR2) {
-        return CR1.smin(CR2);
-      },
-      [](const APInt &N1, const APInt &N2) {
-        return APIntOps::smin(N1, N2);
-      },
-      PreferSmallestNonFullSigned);
-}
-
-TEST_F(ConstantRangeTest, UDiv) {
-  EXPECT_EQ(Full.udiv(Full), Full);
-  EXPECT_EQ(Full.udiv(Empty), Empty);
-  EXPECT_EQ(Full.udiv(One), ConstantRange(APInt(16, 0),
-                                          APInt(16, 0xffff / 0xa + 1)));
-  EXPECT_EQ(Full.udiv(Some), ConstantRange(APInt(16, 0),
-                                           APInt(16, 0xffff / 0xa + 1)));
-  EXPECT_EQ(Full.udiv(Wrap), Full);
-  EXPECT_EQ(Empty.udiv(Empty), Empty);
-  EXPECT_EQ(Empty.udiv(One), Empty);
-  EXPECT_EQ(Empty.udiv(Some), Empty);
-  EXPECT_EQ(Empty.udiv(Wrap), Empty);
-  EXPECT_EQ(One.udiv(One), ConstantRange(APInt(16, 1)));
-  EXPECT_EQ(One.udiv(Some), ConstantRange(APInt(16, 0), APInt(16, 2)));
-  EXPECT_EQ(One.udiv(Wrap), ConstantRange(APInt(16, 0), APInt(16, 0xb)));
-  EXPECT_EQ(Some.udiv(Some), ConstantRange(APInt(16, 0), APInt(16, 0x111)));
-  EXPECT_EQ(Some.udiv(Wrap), ConstantRange(APInt(16, 0), APInt(16, 0xaaa)));
-  EXPECT_EQ(Wrap.udiv(Wrap), Full);
-
-
-  ConstantRange Zero(APInt(16, 0));
-  EXPECT_EQ(Zero.udiv(One), Zero);
-  EXPECT_EQ(Zero.udiv(Full), Zero);
-
-  EXPECT_EQ(ConstantRange(APInt(16, 0), APInt(16, 99)).udiv(Full),
-            ConstantRange(APInt(16, 0), APInt(16, 99)));
-  EXPECT_EQ(ConstantRange(APInt(16, 10), APInt(16, 99)).udiv(Full),
-            ConstantRange(APInt(16, 0), APInt(16, 99)));
-}
-
-TEST_F(ConstantRangeTest, SDiv) {
-  unsigned Bits = 4;
-  EnumerateTwoConstantRanges(Bits, [&](const ConstantRange &CR1,
-                                       const ConstantRange &CR2) {
-    // Collect possible results in a bit vector. We store the signed value plus
-    // a bias to make it unsigned.
-    int Bias = 1 << (Bits - 1);
-    BitVector Results(1 << Bits);
-    ForeachNumInConstantRange(CR1, [&](const APInt &N1) {
-      ForeachNumInConstantRange(CR2, [&](const APInt &N2) {
-        // Division by zero is UB.
-        if (N2 == 0)
-          return;
-
-        // SignedMin / -1 is UB.
-        if (N1.isMinSignedValue() && N2.isAllOnesValue())
-          return;
-
-        APInt N = N1.sdiv(N2);
-        Results.set(N.getSExtValue() + Bias);
-      });
-    });
-
-    ConstantRange CR = CR1.sdiv(CR2);
-    if (Results.none()) {
-      EXPECT_TRUE(CR.isEmptySet());
-      return;
-    }
-
-    // If there is a non-full signed envelope, that should be the result.
-    APInt SMin(Bits, Results.find_first() - Bias);
-    APInt SMax(Bits, Results.find_last() - Bias);
-    ConstantRange Envelope = ConstantRange::getNonEmpty(SMin, SMax + 1);
-    if (!Envelope.isFullSet()) {
-      EXPECT_EQ(Envelope, CR);
-      return;
-    }
-
-    // If the signed envelope is a full set, try to find a smaller sign wrapped
-    // set that is separated in negative and positive components (or one which
-    // can also additionally contain zero).
-    int LastNeg = Results.find_last_in(0, Bias) - Bias;
-    int LastPos = Results.find_next(Bias) - Bias;
-    if (Results[Bias]) {
-      if (LastNeg == -1)
-        ++LastNeg;
-      else if (LastPos == 1)
-        --LastPos;
-    }
-
-    APInt WMax(Bits, LastNeg);
-    APInt WMin(Bits, LastPos);
-    ConstantRange Wrapped = ConstantRange::getNonEmpty(WMin, WMax + 1);
-    EXPECT_EQ(Wrapped, CR);
-  });
-}
-
-TEST_F(ConstantRangeTest, URem) {
-  EXPECT_EQ(Full.urem(Empty), Empty);
-  EXPECT_EQ(Empty.urem(Full), Empty);
-  // urem by zero is poison.
-  EXPECT_EQ(Full.urem(ConstantRange(APInt(16, 0))), Empty);
-  // urem by full range doesn't contain MaxValue.
-  EXPECT_EQ(Full.urem(Full), ConstantRange(APInt(16, 0), APInt(16, 0xffff)));
-  // urem is upper bounded by maximum RHS minus one.
-  EXPECT_EQ(Full.urem(ConstantRange(APInt(16, 0), APInt(16, 123))),
-            ConstantRange(APInt(16, 0), APInt(16, 122)));
-  // urem is upper bounded by maximum LHS.
-  EXPECT_EQ(ConstantRange(APInt(16, 0), APInt(16, 123)).urem(Full),
-            ConstantRange(APInt(16, 0), APInt(16, 123)));
-  // If the LHS is always lower than the RHS, the result is the LHS.
-  EXPECT_EQ(ConstantRange(APInt(16, 10), APInt(16, 20))
-                .urem(ConstantRange(APInt(16, 20), APInt(16, 30))),
-            ConstantRange(APInt(16, 10), APInt(16, 20)));
-  // It has to be strictly lower, otherwise the top value may wrap to zero.
-  EXPECT_EQ(ConstantRange(APInt(16, 10), APInt(16, 20))
-                .urem(ConstantRange(APInt(16, 19), APInt(16, 30))),
-            ConstantRange(APInt(16, 0), APInt(16, 20)));
-  // [12, 14] % 10 is [2, 4], but we conservatively compute [0, 9].
-  EXPECT_EQ(ConstantRange(APInt(16, 12), APInt(16, 15))
-                .urem(ConstantRange(APInt(16, 10))),
-            ConstantRange(APInt(16, 0), APInt(16, 10)));
-
-  TestBinaryOpExhaustiveCorrectnessOnly(
-      [](const ConstantRange &CR1, const ConstantRange &CR2) {
-        return CR1.urem(CR2);
-      },
-      [](const APInt &N1, const APInt &N2) -> Optional<APInt> {
-        if (N2.isNullValue())
-          return None;
-        return N1.urem(N2);
-      });
-}
-
-TEST_F(ConstantRangeTest, SRem) {
-  EXPECT_EQ(Full.srem(Empty), Empty);
-  EXPECT_EQ(Empty.srem(Full), Empty);
-  // srem by zero is UB.
-  EXPECT_EQ(Full.srem(ConstantRange(APInt(16, 0))), Empty);
-  // srem by full range doesn't contain SignedMinValue.
-  EXPECT_EQ(Full.srem(Full), ConstantRange(APInt::getSignedMinValue(16) + 1,
-                                           APInt::getSignedMinValue(16)));
-
-  ConstantRange PosMod(APInt(16, 10), APInt(16, 21));  // [10, 20]
-  ConstantRange NegMod(APInt(16, -20), APInt(16, -9)); // [-20, -10]
-  ConstantRange IntMinMod(APInt::getSignedMinValue(16));
-
-  ConstantRange Expected(16, true);
-
-  // srem is bounded by abs(RHS) minus one.
-  ConstantRange PosLargeLHS(APInt(16, 0), APInt(16, 41));
-  Expected = ConstantRange(APInt(16, 0), APInt(16, 20));
-  EXPECT_EQ(PosLargeLHS.srem(PosMod), Expected);
-  EXPECT_EQ(PosLargeLHS.srem(NegMod), Expected);
-  ConstantRange NegLargeLHS(APInt(16, -40), APInt(16, 1));
-  Expected = ConstantRange(APInt(16, -19), APInt(16, 1));
-  EXPECT_EQ(NegLargeLHS.srem(PosMod), Expected);
-  EXPECT_EQ(NegLargeLHS.srem(NegMod), Expected);
-  ConstantRange PosNegLargeLHS(APInt(16, -32), APInt(16, 38));
-  Expected = ConstantRange(APInt(16, -19), APInt(16, 20));
-  EXPECT_EQ(PosNegLargeLHS.srem(PosMod), Expected);
-  EXPECT_EQ(PosNegLargeLHS.srem(NegMod), Expected);
-
-  // srem is bounded by LHS.
-  ConstantRange PosLHS(APInt(16, 0), APInt(16, 16));
-  EXPECT_EQ(PosLHS.srem(PosMod), PosLHS);
-  EXPECT_EQ(PosLHS.srem(NegMod), PosLHS);
-  EXPECT_EQ(PosLHS.srem(IntMinMod), PosLHS);
-  ConstantRange NegLHS(APInt(16, -15), APInt(16, 1));
-  EXPECT_EQ(NegLHS.srem(PosMod), NegLHS);
-  EXPECT_EQ(NegLHS.srem(NegMod), NegLHS);
-  EXPECT_EQ(NegLHS.srem(IntMinMod), NegLHS);
-  ConstantRange PosNegLHS(APInt(16, -12), APInt(16, 18));
-  EXPECT_EQ(PosNegLHS.srem(PosMod), PosNegLHS);
-  EXPECT_EQ(PosNegLHS.srem(NegMod), PosNegLHS);
-  EXPECT_EQ(PosNegLHS.srem(IntMinMod), PosNegLHS);
-
-  // srem is LHS if it is smaller than RHS.
-  ConstantRange PosSmallLHS(APInt(16, 3), APInt(16, 8));
-  EXPECT_EQ(PosSmallLHS.srem(PosMod), PosSmallLHS);
-  EXPECT_EQ(PosSmallLHS.srem(NegMod), PosSmallLHS);
-  EXPECT_EQ(PosSmallLHS.srem(IntMinMod), PosSmallLHS);
-  ConstantRange NegSmallLHS(APInt(16, -7), APInt(16, -2));
-  EXPECT_EQ(NegSmallLHS.srem(PosMod), NegSmallLHS);
-  EXPECT_EQ(NegSmallLHS.srem(NegMod), NegSmallLHS);
-  EXPECT_EQ(NegSmallLHS.srem(IntMinMod), NegSmallLHS);
-  ConstantRange PosNegSmallLHS(APInt(16, -3), APInt(16, 8));
-  EXPECT_EQ(PosNegSmallLHS.srem(PosMod), PosNegSmallLHS);
-  EXPECT_EQ(PosNegSmallLHS.srem(NegMod), PosNegSmallLHS);
-  EXPECT_EQ(PosNegSmallLHS.srem(IntMinMod), PosNegSmallLHS);
-
-  // Example of a suboptimal result:
-  // [12, 14] srem 10 is [2, 4], but we conservatively compute [0, 9].
-  EXPECT_EQ(ConstantRange(APInt(16, 12), APInt(16, 15))
-                .srem(ConstantRange(APInt(16, 10))),
-            ConstantRange(APInt(16, 0), APInt(16, 10)));
-
-  TestBinaryOpExhaustiveCorrectnessOnly(
-      [](const ConstantRange &CR1, const ConstantRange &CR2) {
-        return CR1.srem(CR2);
-      },
-      [](const APInt &N1, const APInt &N2) -> Optional<APInt> {
-        if (N2.isNullValue())
-          return None;
-        return N1.srem(N2);
-      });
-}
-
-TEST_F(ConstantRangeTest, Shl) {
-  ConstantRange Some2(APInt(16, 0xfff), APInt(16, 0x8000));
-  ConstantRange WrapNullMax(APInt(16, 0x1), APInt(16, 0x0));
-  EXPECT_EQ(Full.shl(Full), Full);
-  EXPECT_EQ(Full.shl(Empty), Empty);
-  EXPECT_EQ(Full.shl(One), Full);    // TODO: [0, (-1 << 0xa) + 1)
-  EXPECT_EQ(Full.shl(Some), Full);   // TODO: [0, (-1 << 0xa) + 1)
-  EXPECT_EQ(Full.shl(Wrap), Full);
-  EXPECT_EQ(Empty.shl(Empty), Empty);
-  EXPECT_EQ(Empty.shl(One), Empty);
-  EXPECT_EQ(Empty.shl(Some), Empty);
-  EXPECT_EQ(Empty.shl(Wrap), Empty);
-  EXPECT_EQ(One.shl(One), ConstantRange(APInt(16, 0xa << 0xa),
-                                        APInt(16, (0xa << 0xa) + 1)));
-  EXPECT_EQ(One.shl(Some), Full);    // TODO: [0xa << 0xa, 0)
-  EXPECT_EQ(One.shl(Wrap), Full);    // TODO: [0xa, 0xa << 14 + 1)
-  EXPECT_EQ(Some.shl(Some), Full);   // TODO: [0xa << 0xa, 0xfc01)
-  EXPECT_EQ(Some.shl(Wrap), Full);   // TODO: [0xa, 0x7ff << 0x5 + 1)
-  EXPECT_EQ(Wrap.shl(Wrap), Full);
-  EXPECT_EQ(
-      Some2.shl(ConstantRange(APInt(16, 0x1))),
-      ConstantRange(APInt(16, 0xfff << 0x1), APInt(16, 0x7fff << 0x1) + 1));
-  EXPECT_EQ(One.shl(WrapNullMax), Full);
-}
-
-TEST_F(ConstantRangeTest, Lshr) {
-  EXPECT_EQ(Full.lshr(Full), Full);
-  EXPECT_EQ(Full.lshr(Empty), Empty);
-  EXPECT_EQ(Full.lshr(One), ConstantRange(APInt(16, 0),
-                                          APInt(16, (0xffff >> 0xa) + 1)));
-  EXPECT_EQ(Full.lshr(Some), ConstantRange(APInt(16, 0),
-                                           APInt(16, (0xffff >> 0xa) + 1)));
-  EXPECT_EQ(Full.lshr(Wrap), Full);
-  EXPECT_EQ(Empty.lshr(Empty), Empty);
-  EXPECT_EQ(Empty.lshr(One), Empty);
-  EXPECT_EQ(Empty.lshr(Some), Empty);
-  EXPECT_EQ(Empty.lshr(Wrap), Empty);
-  EXPECT_EQ(One.lshr(One), ConstantRange(APInt(16, 0)));
-  EXPECT_EQ(One.lshr(Some), ConstantRange(APInt(16, 0)));
-  EXPECT_EQ(One.lshr(Wrap), ConstantRange(APInt(16, 0), APInt(16, 0xb)));
-  EXPECT_EQ(Some.lshr(Some), ConstantRange(APInt(16, 0),
-                                           APInt(16, (0xaaa >> 0xa) + 1)));
-  EXPECT_EQ(Some.lshr(Wrap), ConstantRange(APInt(16, 0), APInt(16, 0xaaa)));
-  EXPECT_EQ(Wrap.lshr(Wrap), Full);
-}
-
-TEST_F(ConstantRangeTest, Ashr) {
-  EXPECT_EQ(Full.ashr(Full), Full);
-  EXPECT_EQ(Full.ashr(Empty), Empty);
-  EXPECT_EQ(Full.ashr(One), ConstantRange(APInt(16, 0xffe0),
-                                          APInt(16, (0x7fff >> 0xa) + 1 )));
-  ConstantRange Small(APInt(16, 0xa), APInt(16, 0xb));
-  EXPECT_EQ(Full.ashr(Small), ConstantRange(APInt(16, 0xffe0),
-                                           APInt(16, (0x7fff >> 0xa) + 1 )));
-  EXPECT_EQ(Full.ashr(Some), ConstantRange(APInt(16, 0xffe0),
-                                           APInt(16, (0x7fff >> 0xa) + 1 )));
-  EXPECT_EQ(Full.ashr(Wrap), Full);
-  EXPECT_EQ(Empty.ashr(Empty), Empty);
-  EXPECT_EQ(Empty.ashr(One), Empty);
-  EXPECT_EQ(Empty.ashr(Some), Empty);
-  EXPECT_EQ(Empty.ashr(Wrap), Empty);
-  EXPECT_EQ(One.ashr(One), ConstantRange(APInt(16, 0)));
-  EXPECT_EQ(One.ashr(Some), ConstantRange(APInt(16, 0)));
-  EXPECT_EQ(One.ashr(Wrap), ConstantRange(APInt(16, 0), APInt(16, 0xb)));
-  EXPECT_EQ(Some.ashr(Some), ConstantRange(APInt(16, 0),
-                                           APInt(16, (0xaaa >> 0xa) + 1)));
-  EXPECT_EQ(Some.ashr(Wrap), ConstantRange(APInt(16, 0), APInt(16, 0xaaa)));
-  EXPECT_EQ(Wrap.ashr(Wrap), Full);
-  ConstantRange Neg(APInt(16, 0xf3f0, true), APInt(16, 0xf7f8, true));
-  EXPECT_EQ(Neg.ashr(Small), ConstantRange(APInt(16, 0xfffc, true),
-                                           APInt(16, 0xfffe, true)));
-}
-
-TEST(ConstantRange, MakeAllowedICmpRegion) {
-  // PR8250
-  ConstantRange SMax = ConstantRange(APInt::getSignedMaxValue(32));
-  EXPECT_TRUE(ConstantRange::makeAllowedICmpRegion(ICmpInst::ICMP_SGT, SMax)
-                  .isEmptySet());
-}
-
-TEST(ConstantRange, MakeSatisfyingICmpRegion) {
-  ConstantRange LowHalf(APInt(8, 0), APInt(8, 128));
-  ConstantRange HighHalf(APInt(8, 128), APInt(8, 0));
-  ConstantRange EmptySet(8, /* isFullSet = */ false);
-
-  EXPECT_EQ(ConstantRange::makeSatisfyingICmpRegion(ICmpInst::ICMP_NE, LowHalf),
-            HighHalf);
-
-  EXPECT_EQ(
-      ConstantRange::makeSatisfyingICmpRegion(ICmpInst::ICMP_NE, HighHalf),
-      LowHalf);
-
-  EXPECT_TRUE(ConstantRange::makeSatisfyingICmpRegion(ICmpInst::ICMP_EQ,
-                                                      HighHalf).isEmptySet());
-
-  ConstantRange UnsignedSample(APInt(8, 5), APInt(8, 200));
-
-  EXPECT_EQ(ConstantRange::makeSatisfyingICmpRegion(ICmpInst::ICMP_ULT,
-                                                    UnsignedSample),
-            ConstantRange(APInt(8, 0), APInt(8, 5)));
-
-  EXPECT_EQ(ConstantRange::makeSatisfyingICmpRegion(ICmpInst::ICMP_ULE,
-                                                    UnsignedSample),
-            ConstantRange(APInt(8, 0), APInt(8, 6)));
-
-  EXPECT_EQ(ConstantRange::makeSatisfyingICmpRegion(ICmpInst::ICMP_UGT,
-                                                    UnsignedSample),
-            ConstantRange(APInt(8, 200), APInt(8, 0)));
-
-  EXPECT_EQ(ConstantRange::makeSatisfyingICmpRegion(ICmpInst::ICMP_UGE,
-                                                    UnsignedSample),
-            ConstantRange(APInt(8, 199), APInt(8, 0)));
-
-  ConstantRange SignedSample(APInt(8, -5), APInt(8, 5));
-
-  EXPECT_EQ(
-      ConstantRange::makeSatisfyingICmpRegion(ICmpInst::ICMP_SLT, SignedSample),
-      ConstantRange(APInt(8, -128), APInt(8, -5)));
-
-  EXPECT_EQ(
-      ConstantRange::makeSatisfyingICmpRegion(ICmpInst::ICMP_SLE, SignedSample),
-      ConstantRange(APInt(8, -128), APInt(8, -4)));
-
-  EXPECT_EQ(
-      ConstantRange::makeSatisfyingICmpRegion(ICmpInst::ICMP_SGT, SignedSample),
-      ConstantRange(APInt(8, 5), APInt(8, -128)));
-
-  EXPECT_EQ(
-      ConstantRange::makeSatisfyingICmpRegion(ICmpInst::ICMP_SGE, SignedSample),
-      ConstantRange(APInt(8, 4), APInt(8, -128)));
-}
-
-static bool icmp(CmpInst::Predicate Pred, const APInt &LHS, const APInt &RHS) {
-  switch (Pred) {
-  case CmpInst::Predicate::ICMP_EQ:
-    return LHS.eq(RHS);
-  case CmpInst::Predicate::ICMP_NE:
-    return LHS.ne(RHS);
-  case CmpInst::Predicate::ICMP_UGT:
-    return LHS.ugt(RHS);
-  case CmpInst::Predicate::ICMP_UGE:
-    return LHS.uge(RHS);
-  case CmpInst::Predicate::ICMP_ULT:
-    return LHS.ult(RHS);
-  case CmpInst::Predicate::ICMP_ULE:
-    return LHS.ule(RHS);
-  case CmpInst::Predicate::ICMP_SGT:
-    return LHS.sgt(RHS);
-  case CmpInst::Predicate::ICMP_SGE:
-    return LHS.sge(RHS);
-  case CmpInst::Predicate::ICMP_SLT:
-    return LHS.slt(RHS);
-  case CmpInst::Predicate::ICMP_SLE:
-    return LHS.sle(RHS);
-  default:
-    llvm_unreachable("Not an ICmp predicate!");
-  }
-}
-
-void ICmpTestImpl(CmpInst::Predicate Pred) {
-  unsigned Bits = 4;
-  EnumerateTwoConstantRanges(
-      Bits, [&](const ConstantRange &CR1, const ConstantRange &CR2) {
-        bool Exhaustive = true;
-        ForeachNumInConstantRange(CR1, [&](const APInt &N1) {
-          ForeachNumInConstantRange(
-              CR2, [&](const APInt &N2) { Exhaustive &= icmp(Pred, N1, N2); });
-        });
-        EXPECT_EQ(CR1.icmp(Pred, CR2), Exhaustive);
-      });
-}
-
-TEST(ConstantRange, ICmp) {
-  for (auto Pred : seq_inclusive(CmpInst::Predicate::FIRST_ICMP_PREDICATE,
-                                 CmpInst::Predicate::LAST_ICMP_PREDICATE))
-    ICmpTestImpl(Pred);
-}
-
-TEST(ConstantRange, MakeGuaranteedNoWrapRegion) {
-  const int IntMin4Bits = 8;
-  const int IntMax4Bits = 7;
-  typedef OverflowingBinaryOperator OBO;
-
-  for (int Const : {0, -1, -2, 1, 2, IntMin4Bits, IntMax4Bits}) {
-    APInt C(4, Const, true /* = isSigned */);
-
-    auto NUWRegion = ConstantRange::makeGuaranteedNoWrapRegion(
-        Instruction::Add, C, OBO::NoUnsignedWrap);
-
-    EXPECT_FALSE(NUWRegion.isEmptySet());
-
-    auto NSWRegion = ConstantRange::makeGuaranteedNoWrapRegion(
-        Instruction::Add, C, OBO::NoSignedWrap);
-
-    EXPECT_FALSE(NSWRegion.isEmptySet());
-
-    for (APInt I = NUWRegion.getLower(), E = NUWRegion.getUpper(); I != E;
-         ++I) {
-      bool Overflow = false;
-      (void)I.uadd_ov(C, Overflow);
-      EXPECT_FALSE(Overflow);
-    }
-
-    for (APInt I = NSWRegion.getLower(), E = NSWRegion.getUpper(); I != E;
-         ++I) {
-      bool Overflow = false;
-      (void)I.sadd_ov(C, Overflow);
-      EXPECT_FALSE(Overflow);
-    }
-  }
-
-  for (int Const : {0, -1, -2, 1, 2, IntMin4Bits, IntMax4Bits}) {
-    APInt C(4, Const, true /* = isSigned */);
-
-    auto NUWRegion = ConstantRange::makeGuaranteedNoWrapRegion(
-        Instruction::Sub, C, OBO::NoUnsignedWrap);
-
-    EXPECT_FALSE(NUWRegion.isEmptySet());
-
-    auto NSWRegion = ConstantRange::makeGuaranteedNoWrapRegion(
-        Instruction::Sub, C, OBO::NoSignedWrap);
-
-    EXPECT_FALSE(NSWRegion.isEmptySet());
-
-    for (APInt I = NUWRegion.getLower(), E = NUWRegion.getUpper(); I != E;
-         ++I) {
-      bool Overflow = false;
-      (void)I.usub_ov(C, Overflow);
-      EXPECT_FALSE(Overflow);
-    }
-
-    for (APInt I = NSWRegion.getLower(), E = NSWRegion.getUpper(); I != E;
-         ++I) {
-      bool Overflow = false;
-      (void)I.ssub_ov(C, Overflow);
-      EXPECT_FALSE(Overflow);
-    }
-  }
-
-  auto NSWForAllValues = ConstantRange::makeGuaranteedNoWrapRegion(
-      Instruction::Add, ConstantRange(32, /* isFullSet = */ true),
-      OBO::NoSignedWrap);
-  EXPECT_TRUE(NSWForAllValues.isSingleElement() &&
-              NSWForAllValues.getSingleElement()->isMinValue());
-
-  NSWForAllValues = ConstantRange::makeGuaranteedNoWrapRegion(
-      Instruction::Sub, ConstantRange(32, /* isFullSet = */ true),
-      OBO::NoSignedWrap);
-  EXPECT_TRUE(NSWForAllValues.isSingleElement() &&
-              NSWForAllValues.getSingleElement()->isMaxValue());
-
-  auto NUWForAllValues = ConstantRange::makeGuaranteedNoWrapRegion(
-      Instruction::Add, ConstantRange(32, /* isFullSet = */ true),
-      OBO::NoUnsignedWrap);
-  EXPECT_TRUE(NUWForAllValues.isSingleElement() &&
-              NUWForAllValues.getSingleElement()->isMinValue());
-
-  NUWForAllValues = ConstantRange::makeGuaranteedNoWrapRegion(
-      Instruction::Sub, ConstantRange(32, /* isFullSet = */ true),
-      OBO::NoUnsignedWrap);
-  EXPECT_TRUE(NUWForAllValues.isSingleElement() &&
-              NUWForAllValues.getSingleElement()->isMaxValue());
-
-  EXPECT_TRUE(ConstantRange::makeGuaranteedNoWrapRegion(
-      Instruction::Add, APInt(32, 0), OBO::NoUnsignedWrap).isFullSet());
-  EXPECT_TRUE(ConstantRange::makeGuaranteedNoWrapRegion(
-      Instruction::Add, APInt(32, 0), OBO::NoSignedWrap).isFullSet());
-  EXPECT_TRUE(ConstantRange::makeGuaranteedNoWrapRegion(
-      Instruction::Sub, APInt(32, 0), OBO::NoUnsignedWrap).isFullSet());
-  EXPECT_TRUE(ConstantRange::makeGuaranteedNoWrapRegion(
-      Instruction::Sub, APInt(32, 0), OBO::NoSignedWrap).isFullSet());
-
-  ConstantRange OneToFive(APInt(32, 1), APInt(32, 6));
-  EXPECT_EQ(ConstantRange::makeGuaranteedNoWrapRegion(
-                Instruction::Add, OneToFive, OBO::NoSignedWrap),
-            ConstantRange(APInt::getSignedMinValue(32),
-                          APInt::getSignedMaxValue(32) - 4));
-  EXPECT_EQ(ConstantRange::makeGuaranteedNoWrapRegion(
-                Instruction::Add, OneToFive, OBO::NoUnsignedWrap),
-            ConstantRange(APInt::getMinValue(32), APInt::getMinValue(32) - 5));
-  EXPECT_EQ(ConstantRange::makeGuaranteedNoWrapRegion(
-                Instruction::Sub, OneToFive, OBO::NoSignedWrap),
-            ConstantRange(APInt::getSignedMinValue(32) + 5,
-                          APInt::getSignedMinValue(32)));
-  EXPECT_EQ(ConstantRange::makeGuaranteedNoWrapRegion(
-                Instruction::Sub, OneToFive, OBO::NoUnsignedWrap),
-            ConstantRange(APInt::getMinValue(32) + 5, APInt::getMinValue(32)));
-
-  ConstantRange MinusFiveToMinusTwo(APInt(32, -5), APInt(32, -1));
-  EXPECT_EQ(ConstantRange::makeGuaranteedNoWrapRegion(
-                Instruction::Add, MinusFiveToMinusTwo, OBO::NoSignedWrap),
-            ConstantRange(APInt::getSignedMinValue(32) + 5,
-                          APInt::getSignedMinValue(32)));
-  EXPECT_EQ(ConstantRange::makeGuaranteedNoWrapRegion(
-                Instruction::Add, MinusFiveToMinusTwo, OBO::NoUnsignedWrap),
-            ConstantRange(APInt(32, 0), APInt(32, 2)));
-  EXPECT_EQ(ConstantRange::makeGuaranteedNoWrapRegion(
-                Instruction::Sub, MinusFiveToMinusTwo, OBO::NoSignedWrap),
-            ConstantRange(APInt::getSignedMinValue(32),
-                          APInt::getSignedMaxValue(32) - 4));
-  EXPECT_EQ(ConstantRange::makeGuaranteedNoWrapRegion(
-                Instruction::Sub, MinusFiveToMinusTwo, OBO::NoUnsignedWrap),
-            ConstantRange(APInt::getMaxValue(32) - 1,
-                          APInt::getMinValue(32)));
-
-  ConstantRange MinusOneToOne(APInt(32, -1), APInt(32, 2));
-  EXPECT_EQ(ConstantRange::makeGuaranteedNoWrapRegion(
-                Instruction::Add, MinusOneToOne, OBO::NoSignedWrap),
-            ConstantRange(APInt::getSignedMinValue(32) + 1,
-                          APInt::getSignedMinValue(32) - 1));
-  EXPECT_EQ(ConstantRange::makeGuaranteedNoWrapRegion(
-                Instruction::Add, MinusOneToOne, OBO::NoUnsignedWrap),
-            ConstantRange(APInt(32, 0), APInt(32, 1)));
-  EXPECT_EQ(ConstantRange::makeGuaranteedNoWrapRegion(
-                Instruction::Sub, MinusOneToOne, OBO::NoSignedWrap),
-            ConstantRange(APInt::getSignedMinValue(32) + 1,
-                          APInt::getSignedMinValue(32) - 1));
-  EXPECT_EQ(ConstantRange::makeGuaranteedNoWrapRegion(
-                Instruction::Sub, MinusOneToOne, OBO::NoUnsignedWrap),
-            ConstantRange(APInt::getMaxValue(32),
-                          APInt::getMinValue(32)));
-
-  ConstantRange One(APInt(32, 1), APInt(32, 2));
-  EXPECT_EQ(ConstantRange::makeGuaranteedNoWrapRegion(
-                Instruction::Add, One, OBO::NoSignedWrap),
-            ConstantRange(APInt::getSignedMinValue(32),
-                          APInt::getSignedMaxValue(32)));
-  EXPECT_EQ(ConstantRange::makeGuaranteedNoWrapRegion(
-                Instruction::Add, One, OBO::NoUnsignedWrap),
-            ConstantRange(APInt::getMinValue(32), APInt::getMaxValue(32)));
-  EXPECT_EQ(ConstantRange::makeGuaranteedNoWrapRegion(
-                Instruction::Sub, One, OBO::NoSignedWrap),
-            ConstantRange(APInt::getSignedMinValue(32) + 1,
-                          APInt::getSignedMinValue(32)));
-  EXPECT_EQ(ConstantRange::makeGuaranteedNoWrapRegion(
-                Instruction::Sub, One, OBO::NoUnsignedWrap),
-            ConstantRange(APInt::getMinValue(32) + 1, APInt::getMinValue(32)));
-
-  ConstantRange OneLessThanBitWidth(APInt(32, 0), APInt(32, 31) + 1);
-  ConstantRange UpToBitWidth(APInt(32, 0), APInt(32, 32) + 1);
-  EXPECT_EQ(ConstantRange::makeGuaranteedNoWrapRegion(
-                Instruction::Shl, UpToBitWidth, OBO::NoUnsignedWrap),
-            ConstantRange::makeGuaranteedNoWrapRegion(
-                Instruction::Shl, OneLessThanBitWidth, OBO::NoUnsignedWrap));
-  EXPECT_EQ(ConstantRange::makeGuaranteedNoWrapRegion(
-                Instruction::Shl, UpToBitWidth, OBO::NoSignedWrap),
-            ConstantRange::makeGuaranteedNoWrapRegion(
-                Instruction::Shl, OneLessThanBitWidth, OBO::NoSignedWrap));
-  EXPECT_EQ(ConstantRange::makeGuaranteedNoWrapRegion(
-                Instruction::Shl, UpToBitWidth, OBO::NoUnsignedWrap),
-            ConstantRange(APInt(32, 0), APInt(32, 1) + 1));
-  EXPECT_EQ(ConstantRange::makeGuaranteedNoWrapRegion(
-                Instruction::Shl, UpToBitWidth, OBO::NoSignedWrap),
-            ConstantRange(APInt(32, -1), APInt(32, 0) + 1));
-
-  EXPECT_EQ(
-      ConstantRange::makeGuaranteedNoWrapRegion(
-          Instruction::Shl, ConstantRange::getFull(32), OBO::NoUnsignedWrap),
-      ConstantRange::makeGuaranteedNoWrapRegion(
-          Instruction::Shl, OneLessThanBitWidth, OBO::NoUnsignedWrap));
-  EXPECT_EQ(
-      ConstantRange::makeGuaranteedNoWrapRegion(
-          Instruction::Shl, ConstantRange::getFull(32), OBO::NoSignedWrap),
-      ConstantRange::makeGuaranteedNoWrapRegion(
-          Instruction::Shl, OneLessThanBitWidth, OBO::NoSignedWrap));
-
-  ConstantRange IllegalShAmt(APInt(32, 32), APInt(32, 0) + 1);
-  EXPECT_EQ(ConstantRange::makeGuaranteedNoWrapRegion(
-                Instruction::Shl, IllegalShAmt, OBO::NoUnsignedWrap),
-            ConstantRange::getFull(32));
-  EXPECT_EQ(ConstantRange::makeGuaranteedNoWrapRegion(
-                Instruction::Shl, IllegalShAmt, OBO::NoSignedWrap),
-            ConstantRange::getFull(32));
-
-  EXPECT_EQ(
-      ConstantRange::makeGuaranteedNoWrapRegion(
-          Instruction::Shl, ConstantRange(APInt(32, -32), APInt(32, 16) + 1),
-          OBO::NoUnsignedWrap),
-      ConstantRange::makeGuaranteedNoWrapRegion(
-          Instruction::Shl, ConstantRange(APInt(32, 0), APInt(32, 16) + 1),
-          OBO::NoUnsignedWrap));
-  EXPECT_EQ(
-      ConstantRange::makeGuaranteedNoWrapRegion(
-          Instruction::Shl, ConstantRange(APInt(32, -32), APInt(32, 16) + 1),
-          OBO::NoSignedWrap),
-      ConstantRange::makeGuaranteedNoWrapRegion(
-          Instruction::Shl, ConstantRange(APInt(32, 0), APInt(32, 16) + 1),
-          OBO::NoSignedWrap));
-
-  EXPECT_EQ(ConstantRange::makeGuaranteedNoWrapRegion(
-                Instruction::Shl,
-                ConstantRange(APInt(32, -32), APInt(32, 16) + 1),
-                OBO::NoUnsignedWrap),
-            ConstantRange(APInt(32, 0), APInt(32, 65535) + 1));
-  EXPECT_EQ(ConstantRange::makeGuaranteedNoWrapRegion(
-                Instruction::Shl,
-                ConstantRange(APInt(32, -32), APInt(32, 16) + 1),
-                OBO::NoSignedWrap),
-            ConstantRange(APInt(32, -32768), APInt(32, 32767) + 1));
-}
-
-template<typename Fn>
-void TestNoWrapRegionExhaustive(Instruction::BinaryOps BinOp,
-                                unsigned NoWrapKind, Fn OverflowFn) {
-  unsigned Bits = 5;
-  EnumerateConstantRanges(Bits, [&](const ConstantRange &CR) {
-    if (CR.isEmptySet())
-      return;
-    if (Instruction::isShift(BinOp) && CR.getUnsignedMax().uge(Bits))
-      return;
-
-    ConstantRange NoWrap =
-        ConstantRange::makeGuaranteedNoWrapRegion(BinOp, CR, NoWrapKind);
-    ConstantRange Full = ConstantRange::getFull(Bits);
-    ForeachNumInConstantRange(Full, [&](const APInt &N1) {
-      bool NoOverflow = true;
-      bool Overflow = true;
-      ForeachNumInConstantRange(CR, [&](const APInt &N2) {
-        if (OverflowFn(N1, N2))
-          NoOverflow = false;
-        else
-          Overflow = false;
-      });
-      EXPECT_EQ(NoOverflow, NoWrap.contains(N1));
-
-      // The no-wrap range is exact for single-element ranges.
-      if (CR.isSingleElement()) {
-        EXPECT_EQ(Overflow, !NoWrap.contains(N1));
-      }
-    });
-  });
-}
-
-// Show that makeGuaranteedNoWrapRegion() is maximal, and for single-element
-// ranges also exact.
-TEST(ConstantRange, NoWrapRegionExhaustive) {
-  TestNoWrapRegionExhaustive(
-      Instruction::Add, OverflowingBinaryOperator::NoUnsignedWrap,
-      [](const APInt &N1, const APInt &N2) {
-        bool Overflow;
-        (void) N1.uadd_ov(N2, Overflow);
-        return Overflow;
-      });
-  TestNoWrapRegionExhaustive(
-      Instruction::Add, OverflowingBinaryOperator::NoSignedWrap,
-      [](const APInt &N1, const APInt &N2) {
-        bool Overflow;
-        (void) N1.sadd_ov(N2, Overflow);
-        return Overflow;
-      });
-  TestNoWrapRegionExhaustive(
-      Instruction::Sub, OverflowingBinaryOperator::NoUnsignedWrap,
-      [](const APInt &N1, const APInt &N2) {
-        bool Overflow;
-        (void) N1.usub_ov(N2, Overflow);
-        return Overflow;
-      });
-  TestNoWrapRegionExhaustive(
-      Instruction::Sub, OverflowingBinaryOperator::NoSignedWrap,
-      [](const APInt &N1, const APInt &N2) {
-        bool Overflow;
-        (void) N1.ssub_ov(N2, Overflow);
-        return Overflow;
-      });
-  TestNoWrapRegionExhaustive(
-      Instruction::Mul, OverflowingBinaryOperator::NoUnsignedWrap,
-      [](const APInt &N1, const APInt &N2) {
-        bool Overflow;
-        (void) N1.umul_ov(N2, Overflow);
-        return Overflow;
-      });
-  TestNoWrapRegionExhaustive(
-      Instruction::Mul, OverflowingBinaryOperator::NoSignedWrap,
-      [](const APInt &N1, const APInt &N2) {
-        bool Overflow;
-        (void) N1.smul_ov(N2, Overflow);
-        return Overflow;
-      });
-  TestNoWrapRegionExhaustive(Instruction::Shl,
-                             OverflowingBinaryOperator::NoUnsignedWrap,
-                             [](const APInt &N1, const APInt &N2) {
-                               bool Overflow;
-                               (void)N1.ushl_ov(N2, Overflow);
-                               return Overflow;
-                             });
-  TestNoWrapRegionExhaustive(Instruction::Shl,
-                             OverflowingBinaryOperator::NoSignedWrap,
-                             [](const APInt &N1, const APInt &N2) {
-                               bool Overflow;
-                               (void)N1.sshl_ov(N2, Overflow);
-                               return Overflow;
-                             });
-}
-
-TEST(ConstantRange, GetEquivalentICmp) {
-  APInt RHS;
-  CmpInst::Predicate Pred;
-
-  EXPECT_TRUE(ConstantRange(APInt::getMinValue(32), APInt(32, 100))
-                  .getEquivalentICmp(Pred, RHS));
-  EXPECT_EQ(Pred, CmpInst::ICMP_ULT);
-  EXPECT_EQ(RHS, APInt(32, 100));
-
-  EXPECT_TRUE(ConstantRange(APInt::getSignedMinValue(32), APInt(32, 100))
-                  .getEquivalentICmp(Pred, RHS));
-  EXPECT_EQ(Pred, CmpInst::ICMP_SLT);
-  EXPECT_EQ(RHS, APInt(32, 100));
-
-  EXPECT_TRUE(ConstantRange(APInt(32, 100), APInt::getMinValue(32))
-                  .getEquivalentICmp(Pred, RHS));
-  EXPECT_EQ(Pred, CmpInst::ICMP_UGE);
-  EXPECT_EQ(RHS, APInt(32, 100));
-
-  EXPECT_TRUE(ConstantRange(APInt(32, 100), APInt::getSignedMinValue(32))
-                  .getEquivalentICmp(Pred, RHS));
-  EXPECT_EQ(Pred, CmpInst::ICMP_SGE);
-  EXPECT_EQ(RHS, APInt(32, 100));
-
-  EXPECT_TRUE(
-      ConstantRange(32, /*isFullSet=*/true).getEquivalentICmp(Pred, RHS));
-  EXPECT_EQ(Pred, CmpInst::ICMP_UGE);
-  EXPECT_EQ(RHS, APInt(32, 0));
-
-  EXPECT_TRUE(
-      ConstantRange(32, /*isFullSet=*/false).getEquivalentICmp(Pred, RHS));
-  EXPECT_EQ(Pred, CmpInst::ICMP_ULT);
-  EXPECT_EQ(RHS, APInt(32, 0));
-
-  EXPECT_FALSE(ConstantRange(APInt(32, 100), APInt(32, 200))
-                   .getEquivalentICmp(Pred, RHS));
-
-  EXPECT_FALSE(ConstantRange(APInt::getSignedMinValue(32) - APInt(32, 100),
-                             APInt::getSignedMinValue(32) + APInt(32, 100))
-                   .getEquivalentICmp(Pred, RHS));
-
-  EXPECT_FALSE(ConstantRange(APInt::getMinValue(32) - APInt(32, 100),
-                             APInt::getMinValue(32) + APInt(32, 100))
-                   .getEquivalentICmp(Pred, RHS));
-
-  EXPECT_TRUE(ConstantRange(APInt(32, 100)).getEquivalentICmp(Pred, RHS));
-  EXPECT_EQ(Pred, CmpInst::ICMP_EQ);
-  EXPECT_EQ(RHS, APInt(32, 100));
-
-  EXPECT_TRUE(
-      ConstantRange(APInt(32, 100)).inverse().getEquivalentICmp(Pred, RHS));
-  EXPECT_EQ(Pred, CmpInst::ICMP_NE);
-  EXPECT_EQ(RHS, APInt(32, 100));
-
-  EXPECT_TRUE(
-      ConstantRange(APInt(512, 100)).inverse().getEquivalentICmp(Pred, RHS));
-  EXPECT_EQ(Pred, CmpInst::ICMP_NE);
-  EXPECT_EQ(RHS, APInt(512, 100));
-
-  // NB!  It would be correct for the following four calls to getEquivalentICmp
-  // to return ordered predicates like CmpInst::ICMP_ULT or CmpInst::ICMP_UGT.
-  // However, that's not the case today.
-
-  EXPECT_TRUE(ConstantRange(APInt(32, 0)).getEquivalentICmp(Pred, RHS));
-  EXPECT_EQ(Pred, CmpInst::ICMP_EQ);
-  EXPECT_EQ(RHS, APInt(32, 0));
-
-  EXPECT_TRUE(
-      ConstantRange(APInt(32, 0)).inverse().getEquivalentICmp(Pred, RHS));
-  EXPECT_EQ(Pred, CmpInst::ICMP_NE);
-  EXPECT_EQ(RHS, APInt(32, 0));
-
-  EXPECT_TRUE(ConstantRange(APInt(32, -1)).getEquivalentICmp(Pred, RHS));
-  EXPECT_EQ(Pred, CmpInst::ICMP_EQ);
-  EXPECT_EQ(RHS, APInt(32, -1));
-
-  EXPECT_TRUE(
-      ConstantRange(APInt(32, -1)).inverse().getEquivalentICmp(Pred, RHS));
-  EXPECT_EQ(Pred, CmpInst::ICMP_NE);
-  EXPECT_EQ(RHS, APInt(32, -1));
-}
-
-#define EXPECT_MAY_OVERFLOW(op) \
-  EXPECT_EQ(ConstantRange::OverflowResult::MayOverflow, (op))
-#define EXPECT_ALWAYS_OVERFLOWS_LOW(op) \
-  EXPECT_EQ(ConstantRange::OverflowResult::AlwaysOverflowsLow, (op))
-#define EXPECT_ALWAYS_OVERFLOWS_HIGH(op) \
-  EXPECT_EQ(ConstantRange::OverflowResult::AlwaysOverflowsHigh, (op))
-#define EXPECT_NEVER_OVERFLOWS(op) \
-  EXPECT_EQ(ConstantRange::OverflowResult::NeverOverflows, (op))
-
-TEST_F(ConstantRangeTest, UnsignedAddOverflow) {
-  // Ill-defined - may overflow is a conservative result.
-  EXPECT_MAY_OVERFLOW(Some.unsignedAddMayOverflow(Empty));
-  EXPECT_MAY_OVERFLOW(Empty.unsignedAddMayOverflow(Some));
-
-  // Never overflow despite one full/wrap set.
-  ConstantRange Zero(APInt::getNullValue(16));
-  EXPECT_NEVER_OVERFLOWS(Full.unsignedAddMayOverflow(Zero));
-  EXPECT_NEVER_OVERFLOWS(Wrap.unsignedAddMayOverflow(Zero));
-  EXPECT_NEVER_OVERFLOWS(Zero.unsignedAddMayOverflow(Full));
-  EXPECT_NEVER_OVERFLOWS(Zero.unsignedAddMayOverflow(Wrap));
-
-  // But usually full/wrap always may overflow.
-  EXPECT_MAY_OVERFLOW(Full.unsignedAddMayOverflow(One));
-  EXPECT_MAY_OVERFLOW(Wrap.unsignedAddMayOverflow(One));
-  EXPECT_MAY_OVERFLOW(One.unsignedAddMayOverflow(Full));
-  EXPECT_MAY_OVERFLOW(One.unsignedAddMayOverflow(Wrap));
-
-  ConstantRange A(APInt(16, 0xfd00), APInt(16, 0xfe00));
-  ConstantRange B1(APInt(16, 0x0100), APInt(16, 0x0201));
-  ConstantRange B2(APInt(16, 0x0100), APInt(16, 0x0202));
-  EXPECT_NEVER_OVERFLOWS(A.unsignedAddMayOverflow(B1));
-  EXPECT_MAY_OVERFLOW(A.unsignedAddMayOverflow(B2));
-  EXPECT_NEVER_OVERFLOWS(B1.unsignedAddMayOverflow(A));
-  EXPECT_MAY_OVERFLOW(B2.unsignedAddMayOverflow(A));
-
-  ConstantRange C1(APInt(16, 0x0299), APInt(16, 0x0400));
-  ConstantRange C2(APInt(16, 0x0300), APInt(16, 0x0400));
-  EXPECT_MAY_OVERFLOW(A.unsignedAddMayOverflow(C1));
-  EXPECT_ALWAYS_OVERFLOWS_HIGH(A.unsignedAddMayOverflow(C2));
-  EXPECT_MAY_OVERFLOW(C1.unsignedAddMayOverflow(A));
-  EXPECT_ALWAYS_OVERFLOWS_HIGH(C2.unsignedAddMayOverflow(A));
-}
-
-TEST_F(ConstantRangeTest, UnsignedSubOverflow) {
-  // Ill-defined - may overflow is a conservative result.
-  EXPECT_MAY_OVERFLOW(Some.unsignedSubMayOverflow(Empty));
-  EXPECT_MAY_OVERFLOW(Empty.unsignedSubMayOverflow(Some));
-
-  // Never overflow despite one full/wrap set.
-  ConstantRange Zero(APInt::getNullValue(16));
-  ConstantRange Max(APInt::getAllOnesValue(16));
-  EXPECT_NEVER_OVERFLOWS(Full.unsignedSubMayOverflow(Zero));
-  EXPECT_NEVER_OVERFLOWS(Wrap.unsignedSubMayOverflow(Zero));
-  EXPECT_NEVER_OVERFLOWS(Max.unsignedSubMayOverflow(Full));
-  EXPECT_NEVER_OVERFLOWS(Max.unsignedSubMayOverflow(Wrap));
-
-  // But usually full/wrap always may overflow.
-  EXPECT_MAY_OVERFLOW(Full.unsignedSubMayOverflow(One));
-  EXPECT_MAY_OVERFLOW(Wrap.unsignedSubMayOverflow(One));
-  EXPECT_MAY_OVERFLOW(One.unsignedSubMayOverflow(Full));
-  EXPECT_MAY_OVERFLOW(One.unsignedSubMayOverflow(Wrap));
-
-  ConstantRange A(APInt(16, 0x0000), APInt(16, 0x0100));
-  ConstantRange B(APInt(16, 0x0100), APInt(16, 0x0200));
-  EXPECT_NEVER_OVERFLOWS(B.unsignedSubMayOverflow(A));
-  EXPECT_ALWAYS_OVERFLOWS_LOW(A.unsignedSubMayOverflow(B));
-
-  ConstantRange A1(APInt(16, 0x0000), APInt(16, 0x0101));
-  ConstantRange B1(APInt(16, 0x0100), APInt(16, 0x0201));
-  EXPECT_NEVER_OVERFLOWS(B1.unsignedSubMayOverflow(A1));
-  EXPECT_MAY_OVERFLOW(A1.unsignedSubMayOverflow(B1));
-
-  ConstantRange A2(APInt(16, 0x0000), APInt(16, 0x0102));
-  ConstantRange B2(APInt(16, 0x0100), APInt(16, 0x0202));
-  EXPECT_MAY_OVERFLOW(B2.unsignedSubMayOverflow(A2));
-  EXPECT_MAY_OVERFLOW(A2.unsignedSubMayOverflow(B2));
-}
-
-TEST_F(ConstantRangeTest, SignedAddOverflow) {
-  // Ill-defined - may overflow is a conservative result.
-  EXPECT_MAY_OVERFLOW(Some.signedAddMayOverflow(Empty));
-  EXPECT_MAY_OVERFLOW(Empty.signedAddMayOverflow(Some));
-
-  // Never overflow despite one full/wrap set.
-  ConstantRange Zero(APInt::getNullValue(16));
-  EXPECT_NEVER_OVERFLOWS(Full.signedAddMayOverflow(Zero));
-  EXPECT_NEVER_OVERFLOWS(Wrap.signedAddMayOverflow(Zero));
-  EXPECT_NEVER_OVERFLOWS(Zero.signedAddMayOverflow(Full));
-  EXPECT_NEVER_OVERFLOWS(Zero.signedAddMayOverflow(Wrap));
-
-  // But usually full/wrap always may overflow.
-  EXPECT_MAY_OVERFLOW(Full.signedAddMayOverflow(One));
-  EXPECT_MAY_OVERFLOW(Wrap.signedAddMayOverflow(One));
-  EXPECT_MAY_OVERFLOW(One.signedAddMayOverflow(Full));
-  EXPECT_MAY_OVERFLOW(One.signedAddMayOverflow(Wrap));
-
-  ConstantRange A(APInt(16, 0x7d00), APInt(16, 0x7e00));
-  ConstantRange B1(APInt(16, 0x0100), APInt(16, 0x0201));
-  ConstantRange B2(APInt(16, 0x0100), APInt(16, 0x0202));
-  EXPECT_NEVER_OVERFLOWS(A.signedAddMayOverflow(B1));
-  EXPECT_MAY_OVERFLOW(A.signedAddMayOverflow(B2));
-  ConstantRange B3(APInt(16, 0x8000), APInt(16, 0x0201));
-  ConstantRange B4(APInt(16, 0x8000), APInt(16, 0x0202));
-  EXPECT_NEVER_OVERFLOWS(A.signedAddMayOverflow(B3));
-  EXPECT_MAY_OVERFLOW(A.signedAddMayOverflow(B4));
-  ConstantRange B5(APInt(16, 0x0299), APInt(16, 0x0400));
-  ConstantRange B6(APInt(16, 0x0300), APInt(16, 0x0400));
-  EXPECT_MAY_OVERFLOW(A.signedAddMayOverflow(B5));
-  EXPECT_ALWAYS_OVERFLOWS_HIGH(A.signedAddMayOverflow(B6));
-
-  ConstantRange C(APInt(16, 0x8200), APInt(16, 0x8300));
-  ConstantRange D1(APInt(16, 0xfe00), APInt(16, 0xff00));
-  ConstantRange D2(APInt(16, 0xfd99), APInt(16, 0xff00));
-  EXPECT_NEVER_OVERFLOWS(C.signedAddMayOverflow(D1));
-  EXPECT_MAY_OVERFLOW(C.signedAddMayOverflow(D2));
-  ConstantRange D3(APInt(16, 0xfe00), APInt(16, 0x8000));
-  ConstantRange D4(APInt(16, 0xfd99), APInt(16, 0x8000));
-  EXPECT_NEVER_OVERFLOWS(C.signedAddMayOverflow(D3));
-  EXPECT_MAY_OVERFLOW(C.signedAddMayOverflow(D4));
-  ConstantRange D5(APInt(16, 0xfc00), APInt(16, 0xfd02));
-  ConstantRange D6(APInt(16, 0xfc00), APInt(16, 0xfd01));
-  EXPECT_MAY_OVERFLOW(C.signedAddMayOverflow(D5));
-  EXPECT_ALWAYS_OVERFLOWS_LOW(C.signedAddMayOverflow(D6));
-
-  ConstantRange E(APInt(16, 0xff00), APInt(16, 0x0100));
-  EXPECT_NEVER_OVERFLOWS(E.signedAddMayOverflow(E));
-  ConstantRange F(APInt(16, 0xf000), APInt(16, 0x7000));
-  EXPECT_MAY_OVERFLOW(F.signedAddMayOverflow(F));
-}
-
-TEST_F(ConstantRangeTest, SignedSubOverflow) {
-  // Ill-defined - may overflow is a conservative result.
-  EXPECT_MAY_OVERFLOW(Some.signedSubMayOverflow(Empty));
-  EXPECT_MAY_OVERFLOW(Empty.signedSubMayOverflow(Some));
-
-  // Never overflow despite one full/wrap set.
-  ConstantRange Zero(APInt::getNullValue(16));
-  EXPECT_NEVER_OVERFLOWS(Full.signedSubMayOverflow(Zero));
-  EXPECT_NEVER_OVERFLOWS(Wrap.signedSubMayOverflow(Zero));
-
-  // But usually full/wrap always may overflow.
-  EXPECT_MAY_OVERFLOW(Full.signedSubMayOverflow(One));
-  EXPECT_MAY_OVERFLOW(Wrap.signedSubMayOverflow(One));
-  EXPECT_MAY_OVERFLOW(One.signedSubMayOverflow(Full));
-  EXPECT_MAY_OVERFLOW(One.signedSubMayOverflow(Wrap));
-
-  ConstantRange A(APInt(16, 0x7d00), APInt(16, 0x7e00));
-  ConstantRange B1(APInt(16, 0xfe00), APInt(16, 0xff00));
-  ConstantRange B2(APInt(16, 0xfd99), APInt(16, 0xff00));
-  EXPECT_NEVER_OVERFLOWS(A.signedSubMayOverflow(B1));
-  EXPECT_MAY_OVERFLOW(A.signedSubMayOverflow(B2));
-  ConstantRange B3(APInt(16, 0xfc00), APInt(16, 0xfd02));
-  ConstantRange B4(APInt(16, 0xfc00), APInt(16, 0xfd01));
-  EXPECT_MAY_OVERFLOW(A.signedSubMayOverflow(B3));
-  EXPECT_ALWAYS_OVERFLOWS_HIGH(A.signedSubMayOverflow(B4));
-
-  ConstantRange C(APInt(16, 0x8200), APInt(16, 0x8300));
-  ConstantRange D1(APInt(16, 0x0100), APInt(16, 0x0201));
-  ConstantRange D2(APInt(16, 0x0100), APInt(16, 0x0202));
-  EXPECT_NEVER_OVERFLOWS(C.signedSubMayOverflow(D1));
-  EXPECT_MAY_OVERFLOW(C.signedSubMayOverflow(D2));
-  ConstantRange D3(APInt(16, 0x0299), APInt(16, 0x0400));
-  ConstantRange D4(APInt(16, 0x0300), APInt(16, 0x0400));
-  EXPECT_MAY_OVERFLOW(C.signedSubMayOverflow(D3));
-  EXPECT_ALWAYS_OVERFLOWS_LOW(C.signedSubMayOverflow(D4));
-
-  ConstantRange E(APInt(16, 0xff00), APInt(16, 0x0100));
-  EXPECT_NEVER_OVERFLOWS(E.signedSubMayOverflow(E));
-  ConstantRange F(APInt(16, 0xf000), APInt(16, 0x7001));
-  EXPECT_MAY_OVERFLOW(F.signedSubMayOverflow(F));
-}
-
-template<typename Fn1, typename Fn2>
-static void TestOverflowExhaustive(Fn1 OverflowFn, Fn2 MayOverflowFn) {
-  // Constant range overflow checks are tested exhaustively on 4-bit numbers.
-  unsigned Bits = 4;
-  EnumerateTwoConstantRanges(Bits, [=](const ConstantRange &CR1,
-                                       const ConstantRange &CR2) {
-    // Loop over all N1 in CR1 and N2 in CR2 and check whether any of the
-    // operations have overflow / have no overflow.
-    bool RangeHasOverflowLow = false;
-    bool RangeHasOverflowHigh = false;
-    bool RangeHasNoOverflow = false;
-    ForeachNumInConstantRange(CR1, [&](const APInt &N1) {
-      ForeachNumInConstantRange(CR2, [&](const APInt &N2) {
-        bool IsOverflowHigh;
-        if (!OverflowFn(IsOverflowHigh, N1, N2)) {
-          RangeHasNoOverflow = true;
-          return;
-        }
-
-        if (IsOverflowHigh)
-          RangeHasOverflowHigh = true;
-        else
-          RangeHasOverflowLow = true;
-      });
-    });
-
-    ConstantRange::OverflowResult OR = MayOverflowFn(CR1, CR2);
-    switch (OR) {
-    case ConstantRange::OverflowResult::AlwaysOverflowsLow:
-      EXPECT_TRUE(RangeHasOverflowLow);
-      EXPECT_FALSE(RangeHasOverflowHigh);
-      EXPECT_FALSE(RangeHasNoOverflow);
-      break;
-    case ConstantRange::OverflowResult::AlwaysOverflowsHigh:
-      EXPECT_TRUE(RangeHasOverflowHigh);
-      EXPECT_FALSE(RangeHasOverflowLow);
-      EXPECT_FALSE(RangeHasNoOverflow);
-      break;
-    case ConstantRange::OverflowResult::NeverOverflows:
-      EXPECT_FALSE(RangeHasOverflowLow);
-      EXPECT_FALSE(RangeHasOverflowHigh);
-      EXPECT_TRUE(RangeHasNoOverflow);
-      break;
-    case ConstantRange::OverflowResult::MayOverflow:
-      // We return MayOverflow for empty sets as a conservative result,
-      // but of course neither the RangeHasOverflow nor the
-      // RangeHasNoOverflow flags will be set.
-      if (CR1.isEmptySet() || CR2.isEmptySet())
-        break;
-
-      EXPECT_TRUE(RangeHasOverflowLow || RangeHasOverflowHigh);
-      EXPECT_TRUE(RangeHasNoOverflow);
-      break;
-    }
-  });
-}
-
-TEST_F(ConstantRangeTest, UnsignedAddOverflowExhaustive) {
-  TestOverflowExhaustive(
-      [](bool &IsOverflowHigh, const APInt &N1, const APInt &N2) {
-        bool Overflow;
-        (void) N1.uadd_ov(N2, Overflow);
-        IsOverflowHigh = true;
-        return Overflow;
-      },
-      [](const ConstantRange &CR1, const ConstantRange &CR2) {
-        return CR1.unsignedAddMayOverflow(CR2);
-      });
-}
-
-TEST_F(ConstantRangeTest, UnsignedSubOverflowExhaustive) {
-  TestOverflowExhaustive(
-      [](bool &IsOverflowHigh, const APInt &N1, const APInt &N2) {
-        bool Overflow;
-        (void) N1.usub_ov(N2, Overflow);
-        IsOverflowHigh = false;
-        return Overflow;
-      },
-      [](const ConstantRange &CR1, const ConstantRange &CR2) {
-        return CR1.unsignedSubMayOverflow(CR2);
-      });
-}
-
-TEST_F(ConstantRangeTest, UnsignedMulOverflowExhaustive) {
-  TestOverflowExhaustive(
-      [](bool &IsOverflowHigh, const APInt &N1, const APInt &N2) {
-        bool Overflow;
-        (void) N1.umul_ov(N2, Overflow);
-        IsOverflowHigh = true;
-        return Overflow;
-      },
-      [](const ConstantRange &CR1, const ConstantRange &CR2) {
-        return CR1.unsignedMulMayOverflow(CR2);
-      });
-}
-
-TEST_F(ConstantRangeTest, SignedAddOverflowExhaustive) {
-  TestOverflowExhaustive(
-      [](bool &IsOverflowHigh, const APInt &N1, const APInt &N2) {
-        bool Overflow;
-        (void) N1.sadd_ov(N2, Overflow);
-        IsOverflowHigh = N1.isNonNegative();
-        return Overflow;
-      },
-      [](const ConstantRange &CR1, const ConstantRange &CR2) {
-        return CR1.signedAddMayOverflow(CR2);
-      });
-}
-
-TEST_F(ConstantRangeTest, SignedSubOverflowExhaustive) {
-  TestOverflowExhaustive(
-      [](bool &IsOverflowHigh, const APInt &N1, const APInt &N2) {
-        bool Overflow;
-        (void) N1.ssub_ov(N2, Overflow);
-        IsOverflowHigh = N1.isNonNegative();
-        return Overflow;
-      },
-      [](const ConstantRange &CR1, const ConstantRange &CR2) {
-        return CR1.signedSubMayOverflow(CR2);
-      });
-}
-
-TEST_F(ConstantRangeTest, FromKnownBits) {
-  KnownBits Unknown(16);
-  EXPECT_EQ(Full, ConstantRange::fromKnownBits(Unknown, /*signed*/false));
-  EXPECT_EQ(Full, ConstantRange::fromKnownBits(Unknown, /*signed*/true));
-
-  // .10..01. -> unsigned 01000010 (66)  to 11011011 (219)
-  //          -> signed   11000010 (194) to 01011011 (91)
-  KnownBits Known(8);
-  Known.Zero = 36;
-  Known.One = 66;
-  ConstantRange Unsigned(APInt(8, 66), APInt(8, 219 + 1));
-  ConstantRange Signed(APInt(8, 194), APInt(8, 91 + 1));
-  EXPECT_EQ(Unsigned, ConstantRange::fromKnownBits(Known, /*signed*/false));
-  EXPECT_EQ(Signed, ConstantRange::fromKnownBits(Known, /*signed*/true));
-
-  // 1.10.10. -> 10100100 (164) to 11101101 (237)
-  Known.Zero = 18;
-  Known.One = 164;
-  ConstantRange CR1(APInt(8, 164), APInt(8, 237 + 1));
-  EXPECT_EQ(CR1, ConstantRange::fromKnownBits(Known, /*signed*/false));
-  EXPECT_EQ(CR1, ConstantRange::fromKnownBits(Known, /*signed*/true));
-
-  // 01.0.1.0 -> 01000100 (68) to 01101110 (110)
-  Known.Zero = 145;
-  Known.One = 68;
-  ConstantRange CR2(APInt(8, 68), APInt(8, 110 + 1));
-  EXPECT_EQ(CR2, ConstantRange::fromKnownBits(Known, /*signed*/false));
-  EXPECT_EQ(CR2, ConstantRange::fromKnownBits(Known, /*signed*/true));
-}
-
-TEST_F(ConstantRangeTest, FromKnownBitsExhaustive) {
-  unsigned Bits = 4;
-  unsigned Max = 1 << Bits;
-  KnownBits Known(Bits);
-  for (unsigned Zero = 0; Zero < Max; ++Zero) {
-    for (unsigned One = 0; One < Max; ++One) {
-      Known.Zero = Zero;
-      Known.One = One;
-      if (Known.hasConflict() || Known.isUnknown())
-        continue;
-
-      UnsignedOpRangeGatherer UR(Bits);
-      SignedOpRangeGatherer SR(Bits);
-      for (unsigned N = 0; N < Max; ++N) {
-        APInt Num(Bits, N);
-        if ((Num & Known.Zero) != 0 || (~Num & Known.One) != 0)
-          continue;
-
-        UR.account(Num);
-        SR.account(Num);
-      }
-
-      ConstantRange UnsignedCR = UR.getRange();
-      ConstantRange SignedCR = SR.getRange();
-      EXPECT_EQ(UnsignedCR, ConstantRange::fromKnownBits(Known, false));
-      EXPECT_EQ(SignedCR, ConstantRange::fromKnownBits(Known, true));
-    }
-  }
-}
-
-TEST_F(ConstantRangeTest, Negative) {
-  // All elements in an empty set (of which there are none) are both negative
-  // and non-negative. Empty & full sets checked explicitly for clarity, but
-  // they are also covered by the exhaustive test below.
-  EXPECT_TRUE(Empty.isAllNegative());
-  EXPECT_TRUE(Empty.isAllNonNegative());
-  EXPECT_FALSE(Full.isAllNegative());
-  EXPECT_FALSE(Full.isAllNonNegative());
-
-  unsigned Bits = 4;
-  EnumerateConstantRanges(Bits, [](const ConstantRange &CR) {
-    bool AllNegative = true;
-    bool AllNonNegative = true;
-    ForeachNumInConstantRange(CR, [&](const APInt &N) {
-      if (!N.isNegative())
-        AllNegative = false;
-      if (!N.isNonNegative())
-        AllNonNegative = false;
-    });
-    assert((CR.isEmptySet() || !AllNegative || !AllNonNegative) &&
-           "Only empty set can be both all negative and all non-negative");
-
-    EXPECT_EQ(AllNegative, CR.isAllNegative());
-    EXPECT_EQ(AllNonNegative, CR.isAllNonNegative());
-  });
-}
-
-TEST_F(ConstantRangeTest, UAddSat) {
-  TestBinaryOpExhaustive(
-      [](const ConstantRange &CR1, const ConstantRange &CR2) {
-        return CR1.uadd_sat(CR2);
-      },
-      [](const APInt &N1, const APInt &N2) {
-        return N1.uadd_sat(N2);
-      },
-      PreferSmallestUnsigned);
-}
-
-TEST_F(ConstantRangeTest, USubSat) {
-  TestBinaryOpExhaustive(
-      [](const ConstantRange &CR1, const ConstantRange &CR2) {
-        return CR1.usub_sat(CR2);
-      },
-      [](const APInt &N1, const APInt &N2) {
-        return N1.usub_sat(N2);
-      },
-      PreferSmallestUnsigned);
-}
-
-TEST_F(ConstantRangeTest, UMulSat) {
-  TestBinaryOpExhaustive(
-      [](const ConstantRange &CR1, const ConstantRange &CR2) {
-        return CR1.umul_sat(CR2);
-      },
-      [](const APInt &N1, const APInt &N2) { return N1.umul_sat(N2); },
-      PreferSmallestUnsigned);
-}
-
-TEST_F(ConstantRangeTest, UShlSat) {
-  TestBinaryOpExhaustive(
-      [](const ConstantRange &CR1, const ConstantRange &CR2) {
-        return CR1.ushl_sat(CR2);
-      },
-      [](const APInt &N1, const APInt &N2) { return N1.ushl_sat(N2); },
-      PreferSmallestUnsigned);
-}
-
-TEST_F(ConstantRangeTest, SAddSat) {
-  TestBinaryOpExhaustive(
-      [](const ConstantRange &CR1, const ConstantRange &CR2) {
-        return CR1.sadd_sat(CR2);
-      },
-      [](const APInt &N1, const APInt &N2) {
-        return N1.sadd_sat(N2);
-      },
-      PreferSmallestSigned);
-}
-
-TEST_F(ConstantRangeTest, SSubSat) {
-  TestBinaryOpExhaustive(
-      [](const ConstantRange &CR1, const ConstantRange &CR2) {
-        return CR1.ssub_sat(CR2);
-      },
-      [](const APInt &N1, const APInt &N2) {
-        return N1.ssub_sat(N2);
-      },
-      PreferSmallestSigned);
-}
-
-TEST_F(ConstantRangeTest, SMulSat) {
-  TestBinaryOpExhaustive(
-      [](const ConstantRange &CR1, const ConstantRange &CR2) {
-        return CR1.smul_sat(CR2);
-      },
-      [](const APInt &N1, const APInt &N2) { return N1.smul_sat(N2); },
-      PreferSmallestSigned);
-}
-
-TEST_F(ConstantRangeTest, SShlSat) {
-  TestBinaryOpExhaustive(
-      [](const ConstantRange &CR1, const ConstantRange &CR2) {
-        return CR1.sshl_sat(CR2);
-      },
-      [](const APInt &N1, const APInt &N2) { return N1.sshl_sat(N2); },
-      PreferSmallestSigned);
-}
-
-TEST_F(ConstantRangeTest, Abs) {
-  TestUnaryOpExhaustive(
-      [](const ConstantRange &CR) { return CR.abs(); },
-      [](const APInt &N) { return N.abs(); });
-
-  TestUnaryOpExhaustive(
-      [](const ConstantRange &CR) { return CR.abs(/*IntMinIsPoison=*/true); },
-      [](const APInt &N) -> Optional<APInt> {
-        if (N.isMinSignedValue())
-          return None;
-        return N.abs();
-      });
-}
-
-TEST_F(ConstantRangeTest, castOps) {
-  ConstantRange A(APInt(16, 66), APInt(16, 128));
-  ConstantRange FpToI8 = A.castOp(Instruction::FPToSI, 8);
-  EXPECT_EQ(8u, FpToI8.getBitWidth());
-  EXPECT_TRUE(FpToI8.isFullSet());
-
-  ConstantRange FpToI16 = A.castOp(Instruction::FPToSI, 16);
-  EXPECT_EQ(16u, FpToI16.getBitWidth());
-  EXPECT_EQ(A, FpToI16);
-
-  ConstantRange FPExtToDouble = A.castOp(Instruction::FPExt, 64);
-  EXPECT_EQ(64u, FPExtToDouble.getBitWidth());
-  EXPECT_TRUE(FPExtToDouble.isFullSet());
-
-  ConstantRange PtrToInt = A.castOp(Instruction::PtrToInt, 64);
-  EXPECT_EQ(64u, PtrToInt.getBitWidth());
-  EXPECT_TRUE(PtrToInt.isFullSet());
-
-  ConstantRange IntToPtr = A.castOp(Instruction::IntToPtr, 64);
-  EXPECT_EQ(64u, IntToPtr.getBitWidth());
-  EXPECT_TRUE(IntToPtr.isFullSet());
-}
-
-TEST_F(ConstantRangeTest, binaryXor) {
-  // Single element ranges.
-  ConstantRange R16(APInt(8, 16));
-  ConstantRange R20(APInt(8, 20));
-  EXPECT_EQ(*R16.binaryXor(R16).getSingleElement(), APInt(8, 0));
-  EXPECT_EQ(*R16.binaryXor(R20).getSingleElement(), APInt(8, 16 ^ 20));
-
-  // Ranges with more than a single element. Handled conservatively for now.
-  ConstantRange R16_35(APInt(8, 16), APInt(8, 35));
-  ConstantRange R0_99(APInt(8, 0), APInt(8, 99));
-  EXPECT_TRUE(R16_35.binaryXor(R16_35).isFullSet());
-  EXPECT_TRUE(R16_35.binaryXor(R0_99).isFullSet());
-  EXPECT_TRUE(R0_99.binaryXor(R16_35).isFullSet());
-}
-
-TEST_F(ConstantRangeTest, binaryNot) {
-  TestUnaryOpExhaustive(
-      [](const ConstantRange &CR) { return CR.binaryNot(); },
-      [](const APInt &N) { return ~N; },
-      PreferSmallest);
-  TestUnaryOpExhaustive(
-      [](const ConstantRange &CR) {
-        return CR.binaryXor(
-            ConstantRange(APInt::getAllOnesValue(CR.getBitWidth())));
-      },
-      [](const APInt &N) { return ~N; },
-      PreferSmallest);
-  TestUnaryOpExhaustive(
-      [](const ConstantRange &CR) {
-        return ConstantRange(APInt::getAllOnesValue(CR.getBitWidth()))
-            .binaryXor(CR);
-      },
-      [](const APInt &N) { return ~N; },
-      PreferSmallest);
-}
-
-}  // anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/IR/ConstantsTest.cpp b/gnu/llvm/llvm/unittests/IR/ConstantsTest.cpp
deleted file mode 100644
index 7a2488b1756..00000000000
--- a/gnu/llvm/llvm/unittests/IR/ConstantsTest.cpp
+++ /dev/null
@@ -1,762 +0,0 @@
-//===- llvm/unittest/IR/ConstantsTest.cpp - Constants unit tests ----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/IR/Constants.h"
-#include "llvm-c/Core.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/DerivedTypes.h"
-#include "llvm/IR/InstrTypes.h"
-#include "llvm/IR/Instruction.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-namespace {
-
-TEST(ConstantsTest, Integer_i1) {
-  LLVMContext Context;
-  IntegerType *Int1 = IntegerType::get(Context, 1);
-  Constant *One = ConstantInt::get(Int1, 1, true);
-  Constant *Zero = ConstantInt::get(Int1, 0);
-  Constant *NegOne = ConstantInt::get(Int1, static_cast<uint64_t>(-1), true);
-  EXPECT_EQ(NegOne, ConstantInt::getSigned(Int1, -1));
-  Constant *Poison = PoisonValue::get(Int1);
-
-  // Input:  @b = constant i1 add(i1 1 , i1 1)
-  // Output: @b = constant i1 false
-  EXPECT_EQ(Zero, ConstantExpr::getAdd(One, One));
-
-  // @c = constant i1 add(i1 -1, i1 1)
-  // @c = constant i1 false
-  EXPECT_EQ(Zero, ConstantExpr::getAdd(NegOne, One));
-
-  // @d = constant i1 add(i1 -1, i1 -1)
-  // @d = constant i1 false
-  EXPECT_EQ(Zero, ConstantExpr::getAdd(NegOne, NegOne));
-
-  // @e = constant i1 sub(i1 -1, i1 1)
-  // @e = constant i1 false
-  EXPECT_EQ(Zero, ConstantExpr::getSub(NegOne, One));
-
-  // @f = constant i1 sub(i1 1 , i1 -1)
-  // @f = constant i1 false
-  EXPECT_EQ(Zero, ConstantExpr::getSub(One, NegOne));
-
-  // @g = constant i1 sub(i1 1 , i1 1)
-  // @g = constant i1 false
-  EXPECT_EQ(Zero, ConstantExpr::getSub(One, One));
-
-  // @h = constant i1 shl(i1 1 , i1 1)  ; poison
-  // @h = constant i1 poison
-  EXPECT_EQ(Poison, ConstantExpr::getShl(One, One));
-
-  // @i = constant i1 shl(i1 1 , i1 0)
-  // @i = constant i1 true
-  EXPECT_EQ(One, ConstantExpr::getShl(One, Zero));
-
-  // @j = constant i1 lshr(i1 1, i1 1)  ; poison
-  // @j = constant i1 poison
-  EXPECT_EQ(Poison, ConstantExpr::getLShr(One, One));
-
-  // @m = constant i1 ashr(i1 1, i1 1)  ; poison
-  // @m = constant i1 poison
-  EXPECT_EQ(Poison, ConstantExpr::getAShr(One, One));
-
-  // @n = constant i1 mul(i1 -1, i1 1)
-  // @n = constant i1 true
-  EXPECT_EQ(One, ConstantExpr::getMul(NegOne, One));
-
-  // @o = constant i1 sdiv(i1 -1, i1 1) ; overflow
-  // @o = constant i1 true
-  EXPECT_EQ(One, ConstantExpr::getSDiv(NegOne, One));
-
-  // @p = constant i1 sdiv(i1 1 , i1 -1); overflow
-  // @p = constant i1 true
-  EXPECT_EQ(One, ConstantExpr::getSDiv(One, NegOne));
-
-  // @q = constant i1 udiv(i1 -1, i1 1)
-  // @q = constant i1 true
-  EXPECT_EQ(One, ConstantExpr::getUDiv(NegOne, One));
-
-  // @r = constant i1 udiv(i1 1, i1 -1)
-  // @r = constant i1 true
-  EXPECT_EQ(One, ConstantExpr::getUDiv(One, NegOne));
-
-  // @s = constant i1 srem(i1 -1, i1 1) ; overflow
-  // @s = constant i1 false
-  EXPECT_EQ(Zero, ConstantExpr::getSRem(NegOne, One));
-
-  // @t = constant i1 urem(i1 -1, i1 1)
-  // @t = constant i1 false
-  EXPECT_EQ(Zero, ConstantExpr::getURem(NegOne, One));
-
-  // @u = constant i1 srem(i1  1, i1 -1) ; overflow
-  // @u = constant i1 false
-  EXPECT_EQ(Zero, ConstantExpr::getSRem(One, NegOne));
-}
-
-TEST(ConstantsTest, IntSigns) {
-  LLVMContext Context;
-  IntegerType *Int8Ty = Type::getInt8Ty(Context);
-  EXPECT_EQ(100, ConstantInt::get(Int8Ty, 100, false)->getSExtValue());
-  EXPECT_EQ(100, ConstantInt::get(Int8Ty, 100, true)->getSExtValue());
-  EXPECT_EQ(100, ConstantInt::getSigned(Int8Ty, 100)->getSExtValue());
-  EXPECT_EQ(-50, ConstantInt::get(Int8Ty, 206)->getSExtValue());
-  EXPECT_EQ(-50, ConstantInt::getSigned(Int8Ty, -50)->getSExtValue());
-  EXPECT_EQ(206U, ConstantInt::getSigned(Int8Ty, -50)->getZExtValue());
-
-  // Overflow is handled by truncation.
-  EXPECT_EQ(0x3b, ConstantInt::get(Int8Ty, 0x13b)->getSExtValue());
-}
-
-TEST(ConstantsTest, FP128Test) {
-  LLVMContext Context;
-  Type *FP128Ty = Type::getFP128Ty(Context);
-
-  IntegerType *Int128Ty = Type::getIntNTy(Context, 128);
-  Constant *Zero128 = Constant::getNullValue(Int128Ty);
-  Constant *X = ConstantExpr::getUIToFP(Zero128, FP128Ty);
-  EXPECT_TRUE(isa<ConstantFP>(X));
-}
-
-TEST(ConstantsTest, PointerCast) {
-  LLVMContext C;
-  Type *Int8PtrTy = Type::getInt8PtrTy(C);
-  Type *Int32PtrTy = Type::getInt32PtrTy(C);
-  Type *Int64Ty = Type::getInt64Ty(C);
-  VectorType *Int8PtrVecTy = FixedVectorType::get(Int8PtrTy, 4);
-  VectorType *Int32PtrVecTy = FixedVectorType::get(Int32PtrTy, 4);
-  VectorType *Int64VecTy = FixedVectorType::get(Int64Ty, 4);
-
-  // ptrtoint i8* to i64
-  EXPECT_EQ(
-      Constant::getNullValue(Int64Ty),
-      ConstantExpr::getPointerCast(Constant::getNullValue(Int8PtrTy), Int64Ty));
-
-  // bitcast i8* to i32*
-  EXPECT_EQ(Constant::getNullValue(Int32PtrTy),
-            ConstantExpr::getPointerCast(Constant::getNullValue(Int8PtrTy),
-                                         Int32PtrTy));
-
-  // ptrtoint <4 x i8*> to <4 x i64>
-  EXPECT_EQ(Constant::getNullValue(Int64VecTy),
-            ConstantExpr::getPointerCast(Constant::getNullValue(Int8PtrVecTy),
-                                         Int64VecTy));
-
-  // bitcast <4 x i8*> to <4 x i32*>
-  EXPECT_EQ(Constant::getNullValue(Int32PtrVecTy),
-            ConstantExpr::getPointerCast(Constant::getNullValue(Int8PtrVecTy),
-                                         Int32PtrVecTy));
-
-  Type *Int32Ptr1Ty = Type::getInt32PtrTy(C, 1);
-  ConstantInt *K = ConstantInt::get(Type::getInt64Ty(C), 1234);
-
-  // Make sure that addrspacecast of inttoptr is not folded away.
-  EXPECT_NE(K, ConstantExpr::getAddrSpaceCast(
-                   ConstantExpr::getIntToPtr(K, Int32PtrTy), Int32Ptr1Ty));
-  EXPECT_NE(K, ConstantExpr::getAddrSpaceCast(
-                   ConstantExpr::getIntToPtr(K, Int32Ptr1Ty), Int32PtrTy));
-
-  Constant *NullInt32Ptr0 = Constant::getNullValue(Int32PtrTy);
-  Constant *NullInt32Ptr1 = Constant::getNullValue(Int32Ptr1Ty);
-
-  // Make sure that addrspacecast of null is not folded away.
-  EXPECT_NE(Constant::getNullValue(Int32PtrTy),
-            ConstantExpr::getAddrSpaceCast(NullInt32Ptr0, Int32Ptr1Ty));
-
-  EXPECT_NE(Constant::getNullValue(Int32Ptr1Ty),
-            ConstantExpr::getAddrSpaceCast(NullInt32Ptr1, Int32PtrTy));
-}
-
-#define CHECK(x, y)                                                            \
-  {                                                                            \
-    std::string __s;                                                           \
-    raw_string_ostream __o(__s);                                               \
-    Instruction *__I = cast<ConstantExpr>(x)->getAsInstruction();              \
-    __I->print(__o);                                                           \
-    __I->deleteValue();                                                        \
-    __o.flush();                                                               \
-    EXPECT_EQ(std::string("  <badref> = " y), __s);                            \
-  }
-
-TEST(ConstantsTest, AsInstructionsTest) {
-  LLVMContext Context;
-  std::unique_ptr<Module> M(new Module("MyModule", Context));
-
-  Type *Int64Ty = Type::getInt64Ty(Context);
-  Type *Int32Ty = Type::getInt32Ty(Context);
-  Type *Int16Ty = Type::getInt16Ty(Context);
-  Type *Int1Ty = Type::getInt1Ty(Context);
-  Type *FloatTy = Type::getFloatTy(Context);
-  Type *DoubleTy = Type::getDoubleTy(Context);
-
-  Constant *Global =
-      M->getOrInsertGlobal("dummy", PointerType::getUnqual(Int32Ty));
-  Constant *Global2 =
-      M->getOrInsertGlobal("dummy2", PointerType::getUnqual(Int32Ty));
-
-  Constant *P0 = ConstantExpr::getPtrToInt(Global, Int32Ty);
-  Constant *P1 = ConstantExpr::getUIToFP(P0, FloatTy);
-  Constant *P2 = ConstantExpr::getUIToFP(P0, DoubleTy);
-  Constant *P3 = ConstantExpr::getTrunc(P0, Int1Ty);
-  Constant *P4 = ConstantExpr::getPtrToInt(Global2, Int32Ty);
-  Constant *P5 = ConstantExpr::getUIToFP(P4, FloatTy);
-  Constant *P6 = ConstantExpr::getBitCast(P4, FixedVectorType::get(Int16Ty, 2));
-
-  Constant *One = ConstantInt::get(Int32Ty, 1);
-  Constant *Two = ConstantInt::get(Int64Ty, 2);
-  Constant *Big = ConstantInt::get(Context, APInt{256, uint64_t(-1), true});
-  Constant *Elt = ConstantInt::get(Int16Ty, 2015);
-  Constant *Poison16 = PoisonValue::get(Int16Ty);
-  Constant *Undef64 = UndefValue::get(Int64Ty);
-  Constant *PoisonV16 = PoisonValue::get(P6->getType());
-
-#define P0STR "ptrtoint (i32** @dummy to i32)"
-#define P1STR "uitofp (i32 ptrtoint (i32** @dummy to i32) to float)"
-#define P2STR "uitofp (i32 ptrtoint (i32** @dummy to i32) to double)"
-#define P3STR "ptrtoint (i32** @dummy to i1)"
-#define P4STR "ptrtoint (i32** @dummy2 to i32)"
-#define P5STR "uitofp (i32 ptrtoint (i32** @dummy2 to i32) to float)"
-#define P6STR "bitcast (i32 ptrtoint (i32** @dummy2 to i32) to <2 x i16>)"
-
-  CHECK(ConstantExpr::getNeg(P0), "sub i32 0, " P0STR);
-  CHECK(ConstantExpr::getFNeg(P1), "fneg float " P1STR);
-  CHECK(ConstantExpr::getNot(P0), "xor i32 " P0STR ", -1");
-  CHECK(ConstantExpr::getAdd(P0, P0), "add i32 " P0STR ", " P0STR);
-  CHECK(ConstantExpr::getAdd(P0, P0, false, true),
-        "add nsw i32 " P0STR ", " P0STR);
-  CHECK(ConstantExpr::getAdd(P0, P0, true, true),
-        "add nuw nsw i32 " P0STR ", " P0STR);
-  CHECK(ConstantExpr::getFAdd(P1, P1), "fadd float " P1STR ", " P1STR);
-  CHECK(ConstantExpr::getSub(P0, P0), "sub i32 " P0STR ", " P0STR);
-  CHECK(ConstantExpr::getFSub(P1, P1), "fsub float " P1STR ", " P1STR);
-  CHECK(ConstantExpr::getMul(P0, P0), "mul i32 " P0STR ", " P0STR);
-  CHECK(ConstantExpr::getFMul(P1, P1), "fmul float " P1STR ", " P1STR);
-  CHECK(ConstantExpr::getUDiv(P0, P0), "udiv i32 " P0STR ", " P0STR);
-  CHECK(ConstantExpr::getSDiv(P0, P0), "sdiv i32 " P0STR ", " P0STR);
-  CHECK(ConstantExpr::getFDiv(P1, P1), "fdiv float " P1STR ", " P1STR);
-  CHECK(ConstantExpr::getURem(P0, P0), "urem i32 " P0STR ", " P0STR);
-  CHECK(ConstantExpr::getSRem(P0, P0), "srem i32 " P0STR ", " P0STR);
-  CHECK(ConstantExpr::getFRem(P1, P1), "frem float " P1STR ", " P1STR);
-  CHECK(ConstantExpr::getAnd(P0, P0), "and i32 " P0STR ", " P0STR);
-  CHECK(ConstantExpr::getOr(P0, P0), "or i32 " P0STR ", " P0STR);
-  CHECK(ConstantExpr::getXor(P0, P0), "xor i32 " P0STR ", " P0STR);
-  CHECK(ConstantExpr::getShl(P0, P0), "shl i32 " P0STR ", " P0STR);
-  CHECK(ConstantExpr::getShl(P0, P0, true), "shl nuw i32 " P0STR ", " P0STR);
-  CHECK(ConstantExpr::getShl(P0, P0, false, true),
-        "shl nsw i32 " P0STR ", " P0STR);
-  CHECK(ConstantExpr::getLShr(P0, P0, false), "lshr i32 " P0STR ", " P0STR);
-  CHECK(ConstantExpr::getLShr(P0, P0, true),
-        "lshr exact i32 " P0STR ", " P0STR);
-  CHECK(ConstantExpr::getAShr(P0, P0, false), "ashr i32 " P0STR ", " P0STR);
-  CHECK(ConstantExpr::getAShr(P0, P0, true),
-        "ashr exact i32 " P0STR ", " P0STR);
-
-  CHECK(ConstantExpr::getSExt(P0, Int64Ty), "sext i32 " P0STR " to i64");
-  CHECK(ConstantExpr::getZExt(P0, Int64Ty), "zext i32 " P0STR " to i64");
-  CHECK(ConstantExpr::getFPTrunc(P2, FloatTy),
-        "fptrunc double " P2STR " to float");
-  CHECK(ConstantExpr::getFPExtend(P1, DoubleTy),
-        "fpext float " P1STR " to double");
-
-  CHECK(ConstantExpr::getExactUDiv(P0, P0), "udiv exact i32 " P0STR ", " P0STR);
-
-  CHECK(ConstantExpr::getSelect(P3, P0, P4),
-        "select i1 " P3STR ", i32 " P0STR ", i32 " P4STR);
-  CHECK(ConstantExpr::getICmp(CmpInst::ICMP_EQ, P0, P4),
-        "icmp eq i32 " P0STR ", " P4STR);
-  CHECK(ConstantExpr::getFCmp(CmpInst::FCMP_ULT, P1, P5),
-        "fcmp ult float " P1STR ", " P5STR);
-
-  std::vector<Constant *> V;
-  V.push_back(One);
-  // FIXME: getGetElementPtr() actually creates an inbounds ConstantGEP,
-  //        not a normal one!
-  // CHECK(ConstantExpr::getGetElementPtr(Global, V, false),
-  //      "getelementptr i32*, i32** @dummy, i32 1");
-  CHECK(ConstantExpr::getInBoundsGetElementPtr(PointerType::getUnqual(Int32Ty),
-                                               Global, V),
-        "getelementptr inbounds i32*, i32** @dummy, i32 1");
-
-  CHECK(ConstantExpr::getExtractElement(P6, One),
-        "extractelement <2 x i16> " P6STR ", i32 1");
-
-  EXPECT_EQ(Poison16, ConstantExpr::getExtractElement(P6, Two));
-  EXPECT_EQ(Poison16, ConstantExpr::getExtractElement(P6, Big));
-  EXPECT_EQ(Poison16, ConstantExpr::getExtractElement(P6, Undef64));
-
-  EXPECT_EQ(Elt, ConstantExpr::getExtractElement(
-                 ConstantExpr::getInsertElement(P6, Elt, One), One));
-  EXPECT_EQ(PoisonV16, ConstantExpr::getInsertElement(P6, Elt, Two));
-  EXPECT_EQ(PoisonV16, ConstantExpr::getInsertElement(P6, Elt, Big));
-  EXPECT_EQ(PoisonV16, ConstantExpr::getInsertElement(P6, Elt, Undef64));
-}
-
-#ifdef GTEST_HAS_DEATH_TEST
-#ifndef NDEBUG
-TEST(ConstantsTest, ReplaceWithConstantTest) {
-  LLVMContext Context;
-  std::unique_ptr<Module> M(new Module("MyModule", Context));
-
-  Type *Int32Ty = Type::getInt32Ty(Context);
-  Constant *One = ConstantInt::get(Int32Ty, 1);
-
-  Constant *Global =
-      M->getOrInsertGlobal("dummy", PointerType::getUnqual(Int32Ty));
-  Constant *GEP = ConstantExpr::getGetElementPtr(
-      PointerType::getUnqual(Int32Ty), Global, One);
-  EXPECT_DEATH(Global->replaceAllUsesWith(GEP),
-               "this->replaceAllUsesWith\\(expr\\(this\\)\\) is NOT valid!");
-}
-
-#endif
-#endif
-
-#undef CHECK
-
-TEST(ConstantsTest, ConstantArrayReplaceWithConstant) {
-  LLVMContext Context;
-  std::unique_ptr<Module> M(new Module("MyModule", Context));
-
-  Type *IntTy = Type::getInt8Ty(Context);
-  ArrayType *ArrayTy = ArrayType::get(IntTy, 2);
-  Constant *A01Vals[2] = {ConstantInt::get(IntTy, 0),
-                          ConstantInt::get(IntTy, 1)};
-  Constant *A01 = ConstantArray::get(ArrayTy, A01Vals);
-
-  Constant *Global = new GlobalVariable(*M, IntTy, false,
-                                        GlobalValue::ExternalLinkage, nullptr);
-  Constant *GlobalInt = ConstantExpr::getPtrToInt(Global, IntTy);
-  Constant *A0GVals[2] = {ConstantInt::get(IntTy, 0), GlobalInt};
-  Constant *A0G = ConstantArray::get(ArrayTy, A0GVals);
-  ASSERT_NE(A01, A0G);
-
-  GlobalVariable *RefArray =
-      new GlobalVariable(*M, ArrayTy, false, GlobalValue::ExternalLinkage, A0G);
-  ASSERT_EQ(A0G, RefArray->getInitializer());
-
-  GlobalInt->replaceAllUsesWith(ConstantInt::get(IntTy, 1));
-  ASSERT_EQ(A01, RefArray->getInitializer());
-}
-
-TEST(ConstantsTest, ConstantExprReplaceWithConstant) {
-  LLVMContext Context;
-  std::unique_ptr<Module> M(new Module("MyModule", Context));
-
-  Type *IntTy = Type::getInt8Ty(Context);
-  Constant *G1 = new GlobalVariable(*M, IntTy, false,
-                                    GlobalValue::ExternalLinkage, nullptr);
-  Constant *G2 = new GlobalVariable(*M, IntTy, false,
-                                    GlobalValue::ExternalLinkage, nullptr);
-  ASSERT_NE(G1, G2);
-
-  Constant *Int1 = ConstantExpr::getPtrToInt(G1, IntTy);
-  Constant *Int2 = ConstantExpr::getPtrToInt(G2, IntTy);
-  ASSERT_NE(Int1, Int2);
-
-  GlobalVariable *Ref =
-      new GlobalVariable(*M, IntTy, false, GlobalValue::ExternalLinkage, Int1);
-  ASSERT_EQ(Int1, Ref->getInitializer());
-
-  G1->replaceAllUsesWith(G2);
-  ASSERT_EQ(Int2, Ref->getInitializer());
-}
-
-TEST(ConstantsTest, GEPReplaceWithConstant) {
-  LLVMContext Context;
-  std::unique_ptr<Module> M(new Module("MyModule", Context));
-
-  Type *IntTy = Type::getInt32Ty(Context);
-  Type *PtrTy = PointerType::get(IntTy, 0);
-  auto *C1 = ConstantInt::get(IntTy, 1);
-  auto *Placeholder = new GlobalVariable(
-      *M, IntTy, false, GlobalValue::ExternalWeakLinkage, nullptr);
-  auto *GEP = ConstantExpr::getGetElementPtr(IntTy, Placeholder, C1);
-  ASSERT_EQ(GEP->getOperand(0), Placeholder);
-
-  auto *Ref =
-      new GlobalVariable(*M, PtrTy, false, GlobalValue::ExternalLinkage, GEP);
-  ASSERT_EQ(GEP, Ref->getInitializer());
-
-  auto *Global = new GlobalVariable(*M, PtrTy, false,
-                                    GlobalValue::ExternalLinkage, nullptr);
-  auto *Alias = GlobalAlias::create(IntTy, 0, GlobalValue::ExternalLinkage,
-                                    "alias", Global, M.get());
-  Placeholder->replaceAllUsesWith(Alias);
-  ASSERT_EQ(GEP, Ref->getInitializer());
-  ASSERT_EQ(GEP->getOperand(0), Alias);
-}
-
-TEST(ConstantsTest, AliasCAPI) {
-  LLVMContext Context;
-  SMDiagnostic Error;
-  std::unique_ptr<Module> M =
-      parseAssemblyString("@g = global i32 42", Error, Context);
-  GlobalVariable *G = M->getGlobalVariable("g");
-  Type *I16Ty = Type::getInt16Ty(Context);
-  Type *I16PTy = PointerType::get(I16Ty, 0);
-  Constant *Aliasee = ConstantExpr::getBitCast(G, I16PTy);
-  LLVMValueRef AliasRef =
-      LLVMAddAlias(wrap(M.get()), wrap(I16PTy), wrap(Aliasee), "a");
-  ASSERT_EQ(unwrap<GlobalAlias>(AliasRef)->getAliasee(), Aliasee);
-}
-
-static std::string getNameOfType(Type *T) {
-  std::string S;
-  raw_string_ostream RSOS(S);
-  T->print(RSOS);
-  return S;
-}
-
-TEST(ConstantsTest, BuildConstantDataArrays) {
-  LLVMContext Context;
-
-  for (Type *T : {Type::getInt8Ty(Context), Type::getInt16Ty(Context),
-                  Type::getInt32Ty(Context), Type::getInt64Ty(Context)}) {
-    ArrayType *ArrayTy = ArrayType::get(T, 2);
-    Constant *Vals[] = {ConstantInt::get(T, 0), ConstantInt::get(T, 1)};
-    Constant *CA = ConstantArray::get(ArrayTy, Vals);
-    ASSERT_TRUE(isa<ConstantDataArray>(CA)) << " T = " << getNameOfType(T);
-    auto *CDA = cast<ConstantDataArray>(CA);
-    Constant *CA2 = ConstantDataArray::getRaw(
-        CDA->getRawDataValues(), CDA->getNumElements(), CDA->getElementType());
-    ASSERT_TRUE(CA == CA2) << " T = " << getNameOfType(T);
-  }
-
-  for (Type *T : {Type::getHalfTy(Context), Type::getBFloatTy(Context),
-                  Type::getFloatTy(Context), Type::getDoubleTy(Context)}) {
-    ArrayType *ArrayTy = ArrayType::get(T, 2);
-    Constant *Vals[] = {ConstantFP::get(T, 0), ConstantFP::get(T, 1)};
-    Constant *CA = ConstantArray::get(ArrayTy, Vals);
-    ASSERT_TRUE(isa<ConstantDataArray>(CA)) << " T = " << getNameOfType(T);
-    auto *CDA = cast<ConstantDataArray>(CA);
-    Constant *CA2 = ConstantDataArray::getRaw(
-        CDA->getRawDataValues(), CDA->getNumElements(), CDA->getElementType());
-    ASSERT_TRUE(CA == CA2) << " T = " << getNameOfType(T);
-  }
-}
-
-TEST(ConstantsTest, BuildConstantDataVectors) {
-  LLVMContext Context;
-
-  for (Type *T : {Type::getInt8Ty(Context), Type::getInt16Ty(Context),
-                  Type::getInt32Ty(Context), Type::getInt64Ty(Context)}) {
-    Constant *Vals[] = {ConstantInt::get(T, 0), ConstantInt::get(T, 1)};
-    Constant *CV = ConstantVector::get(Vals);
-    ASSERT_TRUE(isa<ConstantDataVector>(CV)) << " T = " << getNameOfType(T);
-    auto *CDV = cast<ConstantDataVector>(CV);
-    Constant *CV2 = ConstantDataVector::getRaw(
-        CDV->getRawDataValues(), CDV->getNumElements(), CDV->getElementType());
-    ASSERT_TRUE(CV == CV2) << " T = " << getNameOfType(T);
-  }
-
-  for (Type *T : {Type::getHalfTy(Context), Type::getBFloatTy(Context),
-                  Type::getFloatTy(Context), Type::getDoubleTy(Context)}) {
-    Constant *Vals[] = {ConstantFP::get(T, 0), ConstantFP::get(T, 1)};
-    Constant *CV = ConstantVector::get(Vals);
-    ASSERT_TRUE(isa<ConstantDataVector>(CV)) << " T = " << getNameOfType(T);
-    auto *CDV = cast<ConstantDataVector>(CV);
-    Constant *CV2 = ConstantDataVector::getRaw(
-        CDV->getRawDataValues(), CDV->getNumElements(), CDV->getElementType());
-    ASSERT_TRUE(CV == CV2) << " T = " << getNameOfType(T);
-  }
-}
-
-TEST(ConstantsTest, BitcastToGEP) {
-  LLVMContext Context;
-  std::unique_ptr<Module> M(new Module("MyModule", Context));
-
-  auto *i32 = Type::getInt32Ty(Context);
-  auto *U = StructType::create(Context, "Unsized");
-  Type *EltTys[] = {i32, U};
-  auto *S = StructType::create(EltTys);
-
-  auto *G =
-      new GlobalVariable(*M, S, false, GlobalValue::ExternalLinkage, nullptr);
-  auto *PtrTy = PointerType::get(i32, 0);
-  auto *C = ConstantExpr::getBitCast(G, PtrTy);
-  ASSERT_EQ(cast<ConstantExpr>(C)->getOpcode(), Instruction::BitCast);
-}
-
-bool foldFuncPtrAndConstToNull(LLVMContext &Context, Module *TheModule,
-                               uint64_t AndValue,
-                               MaybeAlign FunctionAlign = llvm::None) {
-  Type *VoidType(Type::getVoidTy(Context));
-  FunctionType *FuncType(FunctionType::get(VoidType, false));
-  Function *Func(
-      Function::Create(FuncType, GlobalValue::ExternalLinkage, "", TheModule));
-
-  if (FunctionAlign)
-    Func->setAlignment(*FunctionAlign);
-
-  IntegerType *ConstantIntType(Type::getInt32Ty(Context));
-  ConstantInt *TheConstant(ConstantInt::get(ConstantIntType, AndValue));
-
-  Constant *TheConstantExpr(ConstantExpr::getPtrToInt(Func, ConstantIntType));
-
-  bool Result =
-      ConstantExpr::get(Instruction::And, TheConstantExpr, TheConstant)
-          ->isNullValue();
-
-  if (!TheModule) {
-    // If the Module exists then it will delete the Function.
-    delete Func;
-  }
-
-  return Result;
-}
-
-TEST(ConstantsTest, FoldFunctionPtrAlignUnknownAnd2) {
-  LLVMContext Context;
-  Module TheModule("TestModule", Context);
-  // When the DataLayout doesn't specify a function pointer alignment we
-  // assume in this case that it is 4 byte aligned. This is a bug but we can't
-  // fix it directly because it causes a code size regression on X86.
-  // FIXME: This test should be changed once existing targets have
-  // appropriate defaults. See associated FIXME in ConstantFoldBinaryInstruction
-  ASSERT_TRUE(foldFuncPtrAndConstToNull(Context, &TheModule, 2));
-}
-
-TEST(ConstantsTest, DontFoldFunctionPtrAlignUnknownAnd4) {
-  LLVMContext Context;
-  Module TheModule("TestModule", Context);
-  ASSERT_FALSE(foldFuncPtrAndConstToNull(Context, &TheModule, 4));
-}
-
-TEST(ConstantsTest, FoldFunctionPtrAlign4) {
-  LLVMContext Context;
-  Module TheModule("TestModule", Context);
-  const char *AlignmentStrings[] = {"Fi32", "Fn32"};
-
-  for (unsigned AndValue = 1; AndValue <= 2; ++AndValue) {
-    for (const char *AlignmentString : AlignmentStrings) {
-      TheModule.setDataLayout(AlignmentString);
-      ASSERT_TRUE(foldFuncPtrAndConstToNull(Context, &TheModule, AndValue));
-    }
-  }
-}
-
-TEST(ConstantsTest, DontFoldFunctionPtrAlign1) {
-  LLVMContext Context;
-  Module TheModule("TestModule", Context);
-  const char *AlignmentStrings[] = {"Fi8", "Fn8"};
-
-  for (const char *AlignmentString : AlignmentStrings) {
-    TheModule.setDataLayout(AlignmentString);
-    ASSERT_FALSE(foldFuncPtrAndConstToNull(Context, &TheModule, 2));
-  }
-}
-
-TEST(ConstantsTest, FoldFunctionAlign4PtrAlignMultiple) {
-  LLVMContext Context;
-  Module TheModule("TestModule", Context);
-  TheModule.setDataLayout("Fn8");
-  ASSERT_TRUE(foldFuncPtrAndConstToNull(Context, &TheModule, 2, Align(4)));
-}
-
-TEST(ConstantsTest, DontFoldFunctionAlign4PtrAlignIndependent) {
-  LLVMContext Context;
-  Module TheModule("TestModule", Context);
-  TheModule.setDataLayout("Fi8");
-  ASSERT_FALSE(foldFuncPtrAndConstToNull(Context, &TheModule, 2, Align(4)));
-}
-
-TEST(ConstantsTest, DontFoldFunctionPtrIfNoModule) {
-  LLVMContext Context;
-  // Even though the function is explicitly 4 byte aligned, in the absence of a
-  // DataLayout we can't assume that the function pointer is aligned.
-  ASSERT_FALSE(foldFuncPtrAndConstToNull(Context, nullptr, 2, Align(4)));
-}
-
-TEST(ConstantsTest, FoldGlobalVariablePtr) {
-  LLVMContext Context;
-
-  IntegerType *IntType(Type::getInt32Ty(Context));
-
-  std::unique_ptr<GlobalVariable> Global(
-      new GlobalVariable(IntType, true, GlobalValue::ExternalLinkage));
-
-  Global->setAlignment(Align(4));
-
-  ConstantInt *TheConstant(ConstantInt::get(IntType, 2));
-
-  Constant *TheConstantExpr(ConstantExpr::getPtrToInt(Global.get(), IntType));
-
-  ASSERT_TRUE(ConstantExpr::get(Instruction::And, TheConstantExpr, TheConstant)
-                  ->isNullValue());
-}
-
-// Check that containsUndefOrPoisonElement and containsPoisonElement is working
-// great
-
-TEST(ConstantsTest, containsUndefElemTest) {
-  LLVMContext Context;
-
-  Type *Int32Ty = Type::getInt32Ty(Context);
-  Constant *CU = UndefValue::get(Int32Ty);
-  Constant *CP = PoisonValue::get(Int32Ty);
-  Constant *C1 = ConstantInt::get(Int32Ty, 1);
-  Constant *C2 = ConstantInt::get(Int32Ty, 2);
-
-  {
-    Constant *V1 = ConstantVector::get({C1, C2});
-    EXPECT_FALSE(V1->containsUndefOrPoisonElement());
-    EXPECT_FALSE(V1->containsPoisonElement());
-  }
-
-  {
-    Constant *V2 = ConstantVector::get({C1, CU});
-    EXPECT_TRUE(V2->containsUndefOrPoisonElement());
-    EXPECT_FALSE(V2->containsPoisonElement());
-  }
-
-  {
-    Constant *V3 = ConstantVector::get({C1, CP});
-    EXPECT_TRUE(V3->containsUndefOrPoisonElement());
-    EXPECT_TRUE(V3->containsPoisonElement());
-  }
-
-  {
-    Constant *V4 = ConstantVector::get({CU, CP});
-    EXPECT_TRUE(V4->containsUndefOrPoisonElement());
-    EXPECT_TRUE(V4->containsPoisonElement());
-  }
-}
-
-// Check that undefined elements in vector constants are matched
-// correctly for both integer and floating-point types. Just don't
-// crash on vectors of pointers (could be handled?).
-
-TEST(ConstantsTest, isElementWiseEqual) {
-  LLVMContext Context;
-
-  Type *Int32Ty = Type::getInt32Ty(Context);
-  Constant *CU = UndefValue::get(Int32Ty);
-  Constant *C1 = ConstantInt::get(Int32Ty, 1);
-  Constant *C2 = ConstantInt::get(Int32Ty, 2);
-
-  Constant *C1211 = ConstantVector::get({C1, C2, C1, C1});
-  Constant *C12U1 = ConstantVector::get({C1, C2, CU, C1});
-  Constant *C12U2 = ConstantVector::get({C1, C2, CU, C2});
-  Constant *C12U21 = ConstantVector::get({C1, C2, CU, C2, C1});
-
-  EXPECT_TRUE(C1211->isElementWiseEqual(C12U1));
-  EXPECT_TRUE(C12U1->isElementWiseEqual(C1211));
-  EXPECT_FALSE(C12U2->isElementWiseEqual(C12U1));
-  EXPECT_FALSE(C12U1->isElementWiseEqual(C12U2));
-  EXPECT_FALSE(C12U21->isElementWiseEqual(C12U2));
-
-  Type *FltTy = Type::getFloatTy(Context);
-  Constant *CFU = UndefValue::get(FltTy);
-  Constant *CF1 = ConstantFP::get(FltTy, 1.0);
-  Constant *CF2 = ConstantFP::get(FltTy, 2.0);
-
-  Constant *CF1211 = ConstantVector::get({CF1, CF2, CF1, CF1});
-  Constant *CF12U1 = ConstantVector::get({CF1, CF2, CFU, CF1});
-  Constant *CF12U2 = ConstantVector::get({CF1, CF2, CFU, CF2});
-  Constant *CFUU1U = ConstantVector::get({CFU, CFU, CF1, CFU});
-
-  EXPECT_TRUE(CF1211->isElementWiseEqual(CF12U1));
-  EXPECT_TRUE(CF12U1->isElementWiseEqual(CF1211));
-  EXPECT_TRUE(CFUU1U->isElementWiseEqual(CF12U1));
-  EXPECT_FALSE(CF12U2->isElementWiseEqual(CF12U1));
-  EXPECT_FALSE(CF12U1->isElementWiseEqual(CF12U2));
-
-  PointerType *PtrTy = Type::getInt8PtrTy(Context);
-  Constant *CPU = UndefValue::get(PtrTy);
-  Constant *CP0 = ConstantPointerNull::get(PtrTy);
-
-  Constant *CP0000 = ConstantVector::get({CP0, CP0, CP0, CP0});
-  Constant *CP00U0 = ConstantVector::get({CP0, CP0, CPU, CP0});
-  Constant *CP00U = ConstantVector::get({CP0, CP0, CPU});
-
-  EXPECT_FALSE(CP0000->isElementWiseEqual(CP00U0));
-  EXPECT_FALSE(CP00U0->isElementWiseEqual(CP0000));
-  EXPECT_FALSE(CP0000->isElementWiseEqual(CP00U));
-  EXPECT_FALSE(CP00U->isElementWiseEqual(CP00U0));
-}
-
-// Check that vector/aggregate constants correctly store undef and poison
-// elements.
-
-TEST(ConstantsTest, CheckElementWiseUndefPoison) {
-  LLVMContext Context;
-
-  Type *Int32Ty = Type::getInt32Ty(Context);
-  StructType *STy = StructType::get(Int32Ty, Int32Ty);
-  ArrayType *ATy = ArrayType::get(Int32Ty, 2);
-  Constant *CU = UndefValue::get(Int32Ty);
-  Constant *CP = PoisonValue::get(Int32Ty);
-
-  {
-    Constant *CUU = ConstantVector::get({CU, CU});
-    Constant *CPP = ConstantVector::get({CP, CP});
-    Constant *CUP = ConstantVector::get({CU, CP});
-    Constant *CPU = ConstantVector::get({CP, CU});
-    EXPECT_EQ(CUU, UndefValue::get(CUU->getType()));
-    EXPECT_EQ(CPP, PoisonValue::get(CPP->getType()));
-    EXPECT_NE(CUP, UndefValue::get(CUP->getType()));
-    EXPECT_NE(CPU, UndefValue::get(CPU->getType()));
-  }
-
-  {
-    Constant *CUU = ConstantStruct::get(STy, {CU, CU});
-    Constant *CPP = ConstantStruct::get(STy, {CP, CP});
-    Constant *CUP = ConstantStruct::get(STy, {CU, CP});
-    Constant *CPU = ConstantStruct::get(STy, {CP, CU});
-    EXPECT_EQ(CUU, UndefValue::get(CUU->getType()));
-    EXPECT_EQ(CPP, PoisonValue::get(CPP->getType()));
-    EXPECT_NE(CUP, UndefValue::get(CUP->getType()));
-    EXPECT_NE(CPU, UndefValue::get(CPU->getType()));
-  }
-
-  {
-    Constant *CUU = ConstantArray::get(ATy, {CU, CU});
-    Constant *CPP = ConstantArray::get(ATy, {CP, CP});
-    Constant *CUP = ConstantArray::get(ATy, {CU, CP});
-    Constant *CPU = ConstantArray::get(ATy, {CP, CU});
-    EXPECT_EQ(CUU, UndefValue::get(CUU->getType()));
-    EXPECT_EQ(CPP, PoisonValue::get(CPP->getType()));
-    EXPECT_NE(CUP, UndefValue::get(CUP->getType()));
-    EXPECT_NE(CPU, UndefValue::get(CPU->getType()));
-  }
-}
-
-TEST(ConstantsTest, GetSplatValueRoundTrip) {
-  LLVMContext Context;
-
-  Type *FloatTy = Type::getFloatTy(Context);
-  Type *Int32Ty = Type::getInt32Ty(Context);
-  Type *Int8Ty = Type::getInt8Ty(Context);
-
-  for (unsigned Min : {1, 2, 8}) {
-    auto ScalableEC = ElementCount::getScalable(Min);
-    auto FixedEC = ElementCount::getFixed(Min);
-
-    for (auto EC : {ScalableEC, FixedEC}) {
-      for (auto *Ty : {FloatTy, Int32Ty, Int8Ty}) {
-        Constant *Zero = Constant::getNullValue(Ty);
-        Constant *One = Constant::getAllOnesValue(Ty);
-
-        for (auto *C : {Zero, One}) {
-          Constant *Splat = ConstantVector::getSplat(EC, C);
-          ASSERT_NE(nullptr, Splat);
-
-          Constant *SplatVal = Splat->getSplatValue();
-          EXPECT_NE(nullptr, SplatVal);
-          EXPECT_EQ(SplatVal, C);
-        }
-      }
-    }
-  }
-}
-
-} // end anonymous namespace
-} // end namespace llvm
diff --git a/gnu/llvm/llvm/unittests/IR/DataLayoutTest.cpp b/gnu/llvm/llvm/unittests/IR/DataLayoutTest.cpp
deleted file mode 100644
index 3f860c8eaad..00000000000
--- a/gnu/llvm/llvm/unittests/IR/DataLayoutTest.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-//===- ConstantRangeTest.cpp - ConstantRange tests ------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/IR/DataLayout.h"
-#include "llvm/IR/GlobalVariable.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/Type.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST(DataLayoutTest, FunctionPtrAlign) {
-  EXPECT_EQ(MaybeAlign(0), DataLayout("").getFunctionPtrAlign());
-  EXPECT_EQ(MaybeAlign(1), DataLayout("Fi8").getFunctionPtrAlign());
-  EXPECT_EQ(MaybeAlign(2), DataLayout("Fi16").getFunctionPtrAlign());
-  EXPECT_EQ(MaybeAlign(4), DataLayout("Fi32").getFunctionPtrAlign());
-  EXPECT_EQ(MaybeAlign(8), DataLayout("Fi64").getFunctionPtrAlign());
-  EXPECT_EQ(MaybeAlign(1), DataLayout("Fn8").getFunctionPtrAlign());
-  EXPECT_EQ(MaybeAlign(2), DataLayout("Fn16").getFunctionPtrAlign());
-  EXPECT_EQ(MaybeAlign(4), DataLayout("Fn32").getFunctionPtrAlign());
-  EXPECT_EQ(MaybeAlign(8), DataLayout("Fn64").getFunctionPtrAlign());
-  EXPECT_EQ(DataLayout::FunctionPtrAlignType::Independent, \
-      DataLayout("").getFunctionPtrAlignType());
-  EXPECT_EQ(DataLayout::FunctionPtrAlignType::Independent, \
-      DataLayout("Fi8").getFunctionPtrAlignType());
-  EXPECT_EQ(DataLayout::FunctionPtrAlignType::MultipleOfFunctionAlign, \
-      DataLayout("Fn8").getFunctionPtrAlignType());
-  EXPECT_EQ(DataLayout("Fi8"), DataLayout("Fi8"));
-  EXPECT_NE(DataLayout("Fi8"), DataLayout("Fi16"));
-  EXPECT_NE(DataLayout("Fi8"), DataLayout("Fn8"));
-
-  DataLayout a(""), b("Fi8"), c("Fn8");
-  EXPECT_NE(a, b);
-  EXPECT_NE(a, c);
-  EXPECT_NE(b, c);
-
-  a = b;
-  EXPECT_EQ(a, b);
-  a = c;
-  EXPECT_EQ(a, c);
-}
-
-TEST(DataLayoutTest, ValueOrABITypeAlignment) {
-  const DataLayout DL("Fi8");
-  LLVMContext Context;
-  Type *const FourByteAlignType = Type::getInt32Ty(Context);
-  EXPECT_EQ(Align(16),
-            DL.getValueOrABITypeAlignment(MaybeAlign(16), FourByteAlignType));
-  EXPECT_EQ(Align(4),
-            DL.getValueOrABITypeAlignment(MaybeAlign(), FourByteAlignType));
-}
-
-TEST(DataLayoutTest, GlobalsAddressSpace) {
-  // When not explicitly defined the globals address space should be zero:
-  EXPECT_EQ(DataLayout("").getDefaultGlobalsAddressSpace(), 0u);
-  EXPECT_EQ(DataLayout("P1-A2").getDefaultGlobalsAddressSpace(), 0u);
-  EXPECT_EQ(DataLayout("G2").getDefaultGlobalsAddressSpace(), 2u);
-  // Check that creating a GlobalVariable without an explicit address space
-  // in a module with a default globals address space respects that default:
-  LLVMContext Context;
-  std::unique_ptr<Module> M(new Module("MyModule", Context));
-  // Default is globals in address space zero:
-  auto *Int32 = Type::getInt32Ty(Context);
-  auto *DefaultGlobal1 = new GlobalVariable(
-      *M, Int32, false, GlobalValue::ExternalLinkage, nullptr);
-  EXPECT_EQ(DefaultGlobal1->getAddressSpace(), 0u);
-  auto *ExplicitGlobal1 = new GlobalVariable(
-      *M, Int32, false, GlobalValue::ExternalLinkage, nullptr, "", nullptr,
-      GlobalValue::NotThreadLocal, 123);
-  EXPECT_EQ(ExplicitGlobal1->getAddressSpace(), 123u);
-
-  // When using a datalayout with the global address space set to 200, global
-  // variables should default to 200
-  M->setDataLayout("G200");
-  auto *DefaultGlobal2 = new GlobalVariable(
-      *M, Int32, false, GlobalValue::ExternalLinkage, nullptr);
-  EXPECT_EQ(DefaultGlobal2->getAddressSpace(), 200u);
-  auto *ExplicitGlobal2 = new GlobalVariable(
-      *M, Int32, false, GlobalValue::ExternalLinkage, nullptr, "", nullptr,
-      GlobalValue::NotThreadLocal, 123);
-  EXPECT_EQ(ExplicitGlobal2->getAddressSpace(), 123u);
-}
-
-} // anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/IR/DebugInfoTest.cpp b/gnu/llvm/llvm/unittests/IR/DebugInfoTest.cpp
deleted file mode 100644
index 060a5c2b08b..00000000000
--- a/gnu/llvm/llvm/unittests/IR/DebugInfoTest.cpp
+++ /dev/null
@@ -1,247 +0,0 @@
-//===- llvm/unittest/IR/DebugInfo.cpp - DebugInfo tests -------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/IR/DebugInfo.h"
-#include "llvm/IR/DIBuilder.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/DebugInfoMetadata.h"
-#include "llvm/IR/IntrinsicInst.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/Verifier.h"
-#include "llvm/Support/SourceMgr.h"
-#include "llvm/Transforms/Utils/Local.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-static std::unique_ptr<Module> parseIR(LLVMContext &C, const char *IR) {
-  SMDiagnostic Err;
-  std::unique_ptr<Module> Mod = parseAssemblyString(IR, Err, C);
-  if (!Mod)
-    Err.print("DebugInfoTest", errs());
-  return Mod;
-}
-
-namespace {
-
-TEST(DINodeTest, getFlag) {
-  // Some valid flags.
-  EXPECT_EQ(DINode::FlagPublic, DINode::getFlag("DIFlagPublic"));
-  EXPECT_EQ(DINode::FlagProtected, DINode::getFlag("DIFlagProtected"));
-  EXPECT_EQ(DINode::FlagPrivate, DINode::getFlag("DIFlagPrivate"));
-  EXPECT_EQ(DINode::FlagVector, DINode::getFlag("DIFlagVector"));
-  EXPECT_EQ(DINode::FlagRValueReference,
-            DINode::getFlag("DIFlagRValueReference"));
-
-  // FlagAccessibility shouldn't work.
-  EXPECT_EQ(0u, DINode::getFlag("DIFlagAccessibility"));
-
-  // Some other invalid strings.
-  EXPECT_EQ(0u, DINode::getFlag("FlagVector"));
-  EXPECT_EQ(0u, DINode::getFlag("Vector"));
-  EXPECT_EQ(0u, DINode::getFlag("other things"));
-  EXPECT_EQ(0u, DINode::getFlag("DIFlagOther"));
-}
-
-TEST(DINodeTest, getFlagString) {
-  // Some valid flags.
-  EXPECT_EQ(StringRef("DIFlagPublic"),
-            DINode::getFlagString(DINode::FlagPublic));
-  EXPECT_EQ(StringRef("DIFlagProtected"),
-            DINode::getFlagString(DINode::FlagProtected));
-  EXPECT_EQ(StringRef("DIFlagPrivate"),
-            DINode::getFlagString(DINode::FlagPrivate));
-  EXPECT_EQ(StringRef("DIFlagVector"),
-            DINode::getFlagString(DINode::FlagVector));
-  EXPECT_EQ(StringRef("DIFlagRValueReference"),
-            DINode::getFlagString(DINode::FlagRValueReference));
-
-  // FlagAccessibility actually equals FlagPublic.
-  EXPECT_EQ(StringRef("DIFlagPublic"),
-            DINode::getFlagString(DINode::FlagAccessibility));
-
-  // Some other invalid flags.
-  EXPECT_EQ(StringRef(),
-            DINode::getFlagString(DINode::FlagPublic | DINode::FlagVector));
-  EXPECT_EQ(StringRef(), DINode::getFlagString(DINode::FlagFwdDecl |
-                                               DINode::FlagArtificial));
-  EXPECT_EQ(StringRef(),
-            DINode::getFlagString(static_cast<DINode::DIFlags>(0xffff)));
-}
-
-TEST(DINodeTest, splitFlags) {
-// Some valid flags.
-#define CHECK_SPLIT(FLAGS, VECTOR, REMAINDER)                                  \
-  {                                                                            \
-    SmallVector<DINode::DIFlags, 8> V;                                         \
-    EXPECT_EQ(REMAINDER, DINode::splitFlags(FLAGS, V));                        \
-    EXPECT_TRUE(makeArrayRef(V).equals(VECTOR));                               \
-  }
-  CHECK_SPLIT(DINode::FlagPublic, {DINode::FlagPublic}, DINode::FlagZero);
-  CHECK_SPLIT(DINode::FlagProtected, {DINode::FlagProtected}, DINode::FlagZero);
-  CHECK_SPLIT(DINode::FlagPrivate, {DINode::FlagPrivate}, DINode::FlagZero);
-  CHECK_SPLIT(DINode::FlagVector, {DINode::FlagVector}, DINode::FlagZero);
-  CHECK_SPLIT(DINode::FlagRValueReference, {DINode::FlagRValueReference},
-              DINode::FlagZero);
-  DINode::DIFlags Flags[] = {DINode::FlagFwdDecl, DINode::FlagVector};
-  CHECK_SPLIT(DINode::FlagFwdDecl | DINode::FlagVector, Flags,
-              DINode::FlagZero);
-  CHECK_SPLIT(DINode::FlagZero, {}, DINode::FlagZero);
-#undef CHECK_SPLIT
-}
-
-TEST(StripTest, LoopMetadata) {
-  LLVMContext C;
-  std::unique_ptr<Module> M = parseIR(C, R"(
-    define void @f() !dbg !5 {
-      ret void, !dbg !10, !llvm.loop !11
-    }
-
-    !llvm.dbg.cu = !{!0}
-    !llvm.debugify = !{!3, !3}
-    !llvm.module.flags = !{!4}
-
-    !0 = distinct !DICompileUnit(language: DW_LANG_C, file: !1, producer: "debugify", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2)
-    !1 = !DIFile(filename: "loop.ll", directory: "/")
-    !2 = !{}
-    !3 = !{i32 1}
-    !4 = !{i32 2, !"Debug Info Version", i32 3}
-    !5 = distinct !DISubprogram(name: "f", linkageName: "f", scope: null, file: !1, line: 1, type: !6, scopeLine: 1, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !7)
-    !6 = !DISubroutineType(types: !2)
-    !7 = !{!8}
-    !8 = !DILocalVariable(name: "1", scope: !5, file: !1, line: 1, type: !9)
-    !9 = !DIBasicType(name: "ty32", size: 32, encoding: DW_ATE_unsigned)
-    !10 = !DILocation(line: 1, column: 1, scope: !5)
-    !11 = distinct !{!11, !10, !10}
-)");
-
-  // Look up the debug info emission kind for the CU via the loop metadata
-  // attached to the terminator. If, when stripping non-line table debug info,
-  // we update the terminator's metadata correctly, we should be able to
-  // observe the change in emission kind for the CU.
-  auto getEmissionKind = [&]() {
-    Instruction &I = *M->getFunction("f")->getEntryBlock().getFirstNonPHI();
-    MDNode *LoopMD = I.getMetadata(LLVMContext::MD_loop);
-    return cast<DILocation>(LoopMD->getOperand(1))
-        ->getScope()
-        ->getSubprogram()
-        ->getUnit()
-        ->getEmissionKind();
-  };
-
-  EXPECT_EQ(getEmissionKind(), DICompileUnit::FullDebug);
-
-  bool Changed = stripNonLineTableDebugInfo(*M);
-  EXPECT_TRUE(Changed);
-
-  EXPECT_EQ(getEmissionKind(), DICompileUnit::LineTablesOnly);
-
-  bool BrokenDebugInfo = false;
-  bool HardError = verifyModule(*M, &errs(), &BrokenDebugInfo);
-  EXPECT_FALSE(HardError);
-  EXPECT_FALSE(BrokenDebugInfo);
-}
-
-TEST(MetadataTest, DeleteInstUsedByDbgValue) {
-  LLVMContext C;
-  std::unique_ptr<Module> M = parseIR(C, R"(
-    define i16 @f(i16 %a) !dbg !6 {
-      %b = add i16 %a, 1, !dbg !11
-      call void @llvm.dbg.value(metadata i16 %b, metadata !9, metadata !DIExpression()), !dbg !11
-      ret i16 0, !dbg !11
-    }
-    declare void @llvm.dbg.value(metadata, metadata, metadata) #0
-    attributes #0 = { nounwind readnone speculatable willreturn }
-
-    !llvm.dbg.cu = !{!0}
-    !llvm.module.flags = !{!5}
-
-    !0 = distinct !DICompileUnit(language: DW_LANG_C, file: !1, producer: "debugify", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2)
-    !1 = !DIFile(filename: "t.ll", directory: "/")
-    !2 = !{}
-    !5 = !{i32 2, !"Debug Info Version", i32 3}
-    !6 = distinct !DISubprogram(name: "foo", linkageName: "foo", scope: null, file: !1, line: 1, type: !7, scopeLine: 1, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !8)
-    !7 = !DISubroutineType(types: !2)
-    !8 = !{!9}
-    !9 = !DILocalVariable(name: "1", scope: !6, file: !1, line: 1, type: !10)
-    !10 = !DIBasicType(name: "ty16", size: 16, encoding: DW_ATE_unsigned)
-    !11 = !DILocation(line: 1, column: 1, scope: !6)
-)");
-
-  // Find %b = add ...
-  Instruction &I = *M->getFunction("f")->getEntryBlock().getFirstNonPHI();
-
-  // Find the dbg.value using %b.
-  SmallVector<DbgValueInst *, 1> DVIs;
-  findDbgValues(DVIs, &I);
-
-  // Delete %b. The dbg.value should now point to undef.
-  I.eraseFromParent();
-  EXPECT_EQ(DVIs[0]->getNumVariableLocationOps(), 1u);
-  EXPECT_TRUE(isa<UndefValue>(DVIs[0]->getValue(0)));
-}
-
-TEST(DIBuilder, CreateFortranArrayTypeWithAttributes) {
-  LLVMContext Ctx;
-  std::unique_ptr<Module> M(new Module("MyModule", Ctx));
-  DIBuilder DIB(*M);
-
-  DISubrange *Subrange = DIB.getOrCreateSubrange(1,1);
-  SmallVector<Metadata*, 4> Subranges;
-  Subranges.push_back(Subrange);
-  DINodeArray Subscripts = DIB.getOrCreateArray(Subranges);
-
-  auto getDIExpression = [&DIB](int offset) {
-    SmallVector<uint64_t, 4> ops;
-    ops.push_back(llvm::dwarf::DW_OP_push_object_address);
-    DIExpression::appendOffset(ops, offset);
-    ops.push_back(llvm::dwarf::DW_OP_deref);
-
-    return DIB.createExpression(ops);
-  };
-
-  DIFile *F = DIB.createFile("main.c", "/");
-  DICompileUnit *CU = DIB.createCompileUnit(
-      dwarf::DW_LANG_C, DIB.createFile("main.c", "/"), "llvm-c", true, "", 0);
-
-  DIVariable *DataLocation =
-      DIB.createTempGlobalVariableFwdDecl(CU, "dl", "_dl", F, 1, nullptr, true);
-  DIExpression *Associated = getDIExpression(1);
-  DIExpression *Allocated = getDIExpression(2);
-  DIExpression *Rank = DIB.createConstantValueExpression(3);
-
-  DICompositeType *ArrayType = DIB.createArrayType(0, 0, nullptr, Subscripts,
-                                                   DataLocation, Associated,
-                                                   Allocated, Rank);
-
-  EXPECT_TRUE(isa_and_nonnull<DICompositeType>(ArrayType));
-  EXPECT_EQ(ArrayType->getRawDataLocation(), DataLocation);
-  EXPECT_EQ(ArrayType->getRawAssociated(), Associated);
-  EXPECT_EQ(ArrayType->getRawAllocated(), Allocated);
-  EXPECT_EQ(ArrayType->getRawRank(), Rank);
-
-  // Avoid memory leak.
-  DIVariable::deleteTemporary(DataLocation);
-}
-
-TEST(DIBuilder, CreateSetType) {
-  LLVMContext Ctx;
-  std::unique_ptr<Module> M(new Module("MyModule", Ctx));
-  DIBuilder DIB(*M);
-  DIScope *Scope = DISubprogram::getDistinct(
-      Ctx, nullptr, "", "", nullptr, 0, nullptr, 0, nullptr, 0, 0,
-      DINode::FlagZero, DISubprogram::SPFlagZero, nullptr);
-  DIType *Type = DIB.createBasicType("Int", 64, dwarf::DW_ATE_signed);
-  DIFile *F = DIB.createFile("main.c", "/");
-
-  DIDerivedType *SetType = DIB.createSetType(Scope, "set1", F, 1, 64, 64, Type);
-  EXPECT_TRUE(isa_and_nonnull<DIDerivedType>(SetType));
-}
-
-} // end namespace
diff --git a/gnu/llvm/llvm/unittests/IR/DebugTypeODRUniquingTest.cpp b/gnu/llvm/llvm/unittests/IR/DebugTypeODRUniquingTest.cpp
deleted file mode 100644
index fa314e1cb41..00000000000
--- a/gnu/llvm/llvm/unittests/IR/DebugTypeODRUniquingTest.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-//===- DebugTypeODRUniquingTest.cpp - Debug type ODR uniquing tests -------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/IR/DebugInfoMetadata.h"
-#include "llvm/IR/LLVMContext.h"
-#include "gtest/gtest.h"
-using namespace llvm;
-
-namespace {
-
-TEST(DebugTypeODRUniquingTest, enableDebugTypeODRUniquing) {
-  LLVMContext Context;
-  EXPECT_FALSE(Context.isODRUniquingDebugTypes());
-  Context.enableDebugTypeODRUniquing();
-  EXPECT_TRUE(Context.isODRUniquingDebugTypes());
-  Context.disableDebugTypeODRUniquing();
-  EXPECT_FALSE(Context.isODRUniquingDebugTypes());
-}
-
-TEST(DebugTypeODRUniquingTest, getODRType) {
-  LLVMContext Context;
-  MDString &UUID = *MDString::get(Context, "string");
-
-  // Without a type map, this should return null.
-  EXPECT_FALSE(DICompositeType::getODRType(
-      Context, UUID, dwarf::DW_TAG_class_type, nullptr, nullptr, 0, nullptr,
-      nullptr, 0, 0, 0, DINode::FlagZero, nullptr, 0, nullptr, nullptr, nullptr,
-      nullptr, nullptr, nullptr, nullptr));
-
-  // Enable the mapping.  There still shouldn't be a type.
-  Context.enableDebugTypeODRUniquing();
-  EXPECT_FALSE(DICompositeType::getODRTypeIfExists(Context, UUID));
-
-  // Create some ODR-uniqued type.
-  auto &CT = *DICompositeType::getODRType(
-      Context, UUID, dwarf::DW_TAG_class_type, nullptr, nullptr, 0, nullptr,
-      nullptr, 0, 0, 0, DINode::FlagZero, nullptr, 0, nullptr, nullptr, nullptr,
-      nullptr, nullptr, nullptr, nullptr);
-  EXPECT_EQ(UUID.getString(), CT.getIdentifier());
-
-  // Check that we get it back, even if we change a field.
-  EXPECT_EQ(&CT, DICompositeType::getODRTypeIfExists(Context, UUID));
-  EXPECT_EQ(&CT,
-            DICompositeType::getODRType(
-                Context, UUID, dwarf::DW_TAG_class_type, nullptr, nullptr, 0,
-                nullptr, nullptr, 0, 0, 0, DINode::FlagZero, nullptr, 0,
-                nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr));
-  EXPECT_EQ(&CT, DICompositeType::getODRType(
-                     Context, UUID, dwarf::DW_TAG_class_type,
-                     MDString::get(Context, "name"), nullptr, 0, nullptr,
-                     nullptr, 0, 0, 0, DINode::FlagZero, nullptr, 0, nullptr,
-                     nullptr, nullptr, nullptr, nullptr, nullptr, nullptr));
-
-  // Check that it's discarded with the type map.
-  Context.disableDebugTypeODRUniquing();
-  EXPECT_FALSE(DICompositeType::getODRTypeIfExists(Context, UUID));
-
-  // And it shouldn't magically reappear...
-  Context.enableDebugTypeODRUniquing();
-  EXPECT_FALSE(DICompositeType::getODRTypeIfExists(Context, UUID));
-}
-
-TEST(DebugTypeODRUniquingTest, buildODRType) {
-  LLVMContext Context;
-  Context.enableDebugTypeODRUniquing();
-
-  // Build an ODR type that's a forward decl.
-  MDString &UUID = *MDString::get(Context, "Type");
-  auto &CT = *DICompositeType::buildODRType(
-      Context, UUID, dwarf::DW_TAG_class_type, nullptr, nullptr, 0, nullptr,
-      nullptr, 0, 0, 0, DINode::FlagFwdDecl, nullptr, 0, nullptr, nullptr,
-      nullptr, nullptr, nullptr, nullptr, nullptr);
-  EXPECT_EQ(&CT, DICompositeType::getODRTypeIfExists(Context, UUID));
-  EXPECT_EQ(dwarf::DW_TAG_class_type, CT.getTag());
-
-  // Update with another forward decl.  This should be a no-op.
-  EXPECT_EQ(&CT,
-            DICompositeType::buildODRType(
-                Context, UUID, dwarf::DW_TAG_structure_type, nullptr, nullptr,
-                0, nullptr, nullptr, 0, 0, 0, DINode::FlagFwdDecl, nullptr, 0,
-                nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr));
-  EXPECT_EQ(dwarf::DW_TAG_class_type, CT.getTag());
-
-  // Update with a definition.  This time we should see a change.
-  EXPECT_EQ(&CT,
-            DICompositeType::buildODRType(
-                Context, UUID, dwarf::DW_TAG_structure_type, nullptr, nullptr,
-                0, nullptr, nullptr, 0, 0, 0, DINode::FlagZero, nullptr, 0,
-                nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr));
-  EXPECT_EQ(dwarf::DW_TAG_structure_type, CT.getTag());
-
-  // Further updates should be ignored.
-  EXPECT_EQ(&CT,
-            DICompositeType::buildODRType(
-                Context, UUID, dwarf::DW_TAG_class_type, nullptr, nullptr, 0,
-                nullptr, nullptr, 0, 0, 0, DINode::FlagFwdDecl, nullptr, 0,
-                nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr));
-  EXPECT_EQ(dwarf::DW_TAG_structure_type, CT.getTag());
-  EXPECT_EQ(&CT,
-            DICompositeType::buildODRType(
-                Context, UUID, dwarf::DW_TAG_class_type, nullptr, nullptr, 0,
-                nullptr, nullptr, 0, 0, 0, DINode::FlagZero, nullptr, 0,
-                nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr));
-  EXPECT_EQ(dwarf::DW_TAG_structure_type, CT.getTag());
-}
-
-TEST(DebugTypeODRUniquingTest, buildODRTypeFields) {
-  LLVMContext Context;
-  Context.enableDebugTypeODRUniquing();
-
-  // Build an ODR type that's a forward decl with no other fields set.
-  MDString &UUID = *MDString::get(Context, "UUID");
-  auto &CT = *DICompositeType::buildODRType(
-      Context, UUID, 0, nullptr, nullptr, 0, nullptr, nullptr, 0, 0, 0,
-      DINode::FlagFwdDecl, nullptr, 0, nullptr, nullptr, nullptr, nullptr,
-      nullptr, nullptr, nullptr);
-
-// Create macros for running through all the fields except Identifier and Flags.
-#define FOR_EACH_MDFIELD()                                                     \
-  DO_FOR_FIELD(Name)                                                           \
-  DO_FOR_FIELD(File)                                                           \
-  DO_FOR_FIELD(Scope)                                                          \
-  DO_FOR_FIELD(BaseType)                                                       \
-  DO_FOR_FIELD(Elements)                                                       \
-  DO_FOR_FIELD(VTableHolder)                                                   \
-  DO_FOR_FIELD(TemplateParams)
-#define FOR_EACH_INLINEFIELD()                                                 \
-  DO_FOR_FIELD(Tag)                                                            \
-  DO_FOR_FIELD(Line)                                                           \
-  DO_FOR_FIELD(SizeInBits)                                                     \
-  DO_FOR_FIELD(AlignInBits)                                                    \
-  DO_FOR_FIELD(OffsetInBits)                                                   \
-  DO_FOR_FIELD(RuntimeLang)
-
-// Create all the fields.
-#define DO_FOR_FIELD(X) auto *X = MDString::get(Context, #X);
-  FOR_EACH_MDFIELD();
-#undef DO_FOR_FIELD
-  unsigned NonZeroInit = 0;
-#define DO_FOR_FIELD(X) auto X = ++NonZeroInit;
-  FOR_EACH_INLINEFIELD();
-#undef DO_FOR_FIELD
-
-  // Replace all the fields with new values that are distinct from each other.
-  EXPECT_EQ(&CT,
-            DICompositeType::buildODRType(
-                Context, UUID, Tag, Name, File, Line, Scope, BaseType,
-                SizeInBits, AlignInBits, OffsetInBits, DINode::FlagArtificial,
-                Elements, RuntimeLang, VTableHolder, TemplateParams, nullptr,
-                nullptr, nullptr, nullptr, nullptr));
-
-  // Confirm that all the right fields got updated.
-#define DO_FOR_FIELD(X) EXPECT_EQ(X, CT.getRaw##X());
-  FOR_EACH_MDFIELD();
-#undef DO_FOR_FIELD
-#undef FOR_EACH_MDFIELD
-#define DO_FOR_FIELD(X) EXPECT_EQ(X, CT.get##X());
-  FOR_EACH_INLINEFIELD();
-#undef DO_FOR_FIELD
-#undef FOR_EACH_INLINEFIELD
-  EXPECT_EQ(DINode::FlagArtificial, CT.getFlags());
-  EXPECT_EQ(&UUID, CT.getRawIdentifier());
-}
-
-} // end namespace
diff --git a/gnu/llvm/llvm/unittests/IR/DemandedBitsTest.cpp b/gnu/llvm/llvm/unittests/IR/DemandedBitsTest.cpp
deleted file mode 100644
index 4d15e818996..00000000000
--- a/gnu/llvm/llvm/unittests/IR/DemandedBitsTest.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-//===- DemandedBitsTest.cpp - DemandedBits tests --------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/DemandedBits.h"
-#include "../Support/KnownBitsTest.h"
-#include "llvm/Support/KnownBits.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-template <typename Fn1, typename Fn2>
-static void TestBinOpExhaustive(Fn1 PropagateFn, Fn2 EvalFn) {
-  unsigned Bits = 4;
-  unsigned Max = 1 << Bits;
-  ForeachKnownBits(Bits, [&](const KnownBits &Known1) {
-    ForeachKnownBits(Bits, [&](const KnownBits &Known2) {
-      for (unsigned AOut_ = 0; AOut_ < Max; AOut_++) {
-        APInt AOut(Bits, AOut_);
-        APInt AB1 = PropagateFn(0, AOut, Known1, Known2);
-        APInt AB2 = PropagateFn(1, AOut, Known1, Known2);
-        {
-          // If the propagator claims that certain known bits
-          // didn't matter, check it doesn't change its mind
-          // when they become unknown.
-          KnownBits Known1Redacted;
-          KnownBits Known2Redacted;
-          Known1Redacted.Zero = Known1.Zero & AB1;
-          Known1Redacted.One = Known1.One & AB1;
-          Known2Redacted.Zero = Known2.Zero & AB2;
-          Known2Redacted.One = Known2.One & AB2;
-
-          APInt AB1R = PropagateFn(0, AOut, Known1Redacted, Known2Redacted);
-          APInt AB2R = PropagateFn(1, AOut, Known1Redacted, Known2Redacted);
-          EXPECT_EQ(AB1, AB1R);
-          EXPECT_EQ(AB2, AB2R);
-        }
-        ForeachNumInKnownBits(Known1, [&](APInt Value1) {
-          ForeachNumInKnownBits(Known2, [&](APInt Value2) {
-            APInt ReferenceResult = EvalFn((Value1 & AB1), (Value2 & AB2));
-            APInt Result = EvalFn(Value1, Value2);
-            EXPECT_EQ(Result & AOut, ReferenceResult & AOut);
-          });
-        });
-      }
-    });
-  });
-}
-
-TEST(DemandedBitsTest, Add) {
-  TestBinOpExhaustive(DemandedBits::determineLiveOperandBitsAdd,
-                      [](APInt N1, APInt N2) -> APInt { return N1 + N2; });
-}
-
-TEST(DemandedBitsTest, Sub) {
-  TestBinOpExhaustive(DemandedBits::determineLiveOperandBitsSub,
-                      [](APInt N1, APInt N2) -> APInt { return N1 - N2; });
-}
-
-} // anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/IR/DominatorTreeBatchUpdatesTest.cpp b/gnu/llvm/llvm/unittests/IR/DominatorTreeBatchUpdatesTest.cpp
deleted file mode 100644
index a2d5805a987..00000000000
--- a/gnu/llvm/llvm/unittests/IR/DominatorTreeBatchUpdatesTest.cpp
+++ /dev/null
@@ -1,351 +0,0 @@
-//===- llvm/unittests/IR/DominatorTreeBatchUpdatesTest.cpp ----------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include <random>
-#include "CFGBuilder.h"
-#include "gtest/gtest.h"
-#include "llvm/Analysis/PostDominators.h"
-#include "llvm/IR/Dominators.h"
-#include "llvm/Support/GenericDomTreeConstruction.h"
-
-#define DEBUG_TYPE "batch-update-tests"
-
-using namespace llvm;
-
-namespace {
-const auto CFGInsert = CFGBuilder::ActionKind::Insert;
-const auto CFGDelete = CFGBuilder::ActionKind::Delete;
-
-
-using DomUpdate = DominatorTree::UpdateType;
-static_assert(
-    std::is_same<DomUpdate, PostDominatorTree::UpdateType>::value,
-    "Trees differing only in IsPostDom should have the same update types");
-using DomSNCA = DomTreeBuilder::SemiNCAInfo<DomTreeBuilder::BBDomTree>;
-using PostDomSNCA = DomTreeBuilder::SemiNCAInfo<DomTreeBuilder::BBPostDomTree>;
-const auto Insert = DominatorTree::Insert;
-const auto Delete = DominatorTree::Delete;
-
-std::vector<DomUpdate> ToDomUpdates(CFGBuilder &B,
-                                    std::vector<CFGBuilder::Update> &In) {
-  std::vector<DomUpdate> Res;
-  Res.reserve(In.size());
-
-  for (const auto &CFGU : In)
-    Res.push_back({CFGU.Action == CFGInsert ? Insert : Delete,
-                   B.getOrAddBlock(CFGU.Edge.From),
-                   B.getOrAddBlock(CFGU.Edge.To)});
-  return Res;
-}
-}  // namespace
-
-TEST(DominatorTreeBatchUpdates, LegalizeDomUpdates) {
-  CFGHolder Holder;
-  CFGBuilder Builder(Holder.F, {{"A", "B"}}, {});
-
-  BasicBlock *A = Builder.getOrAddBlock("A");
-  BasicBlock *B = Builder.getOrAddBlock("B");
-  BasicBlock *C = Builder.getOrAddBlock("C");
-  BasicBlock *D = Builder.getOrAddBlock("D");
-
-  std::vector<DomUpdate> Updates = {
-      {Insert, B, C}, {Insert, C, D}, {Delete, B, C}, {Insert, B, C},
-      {Insert, B, D}, {Delete, C, D}, {Delete, A, B}};
-  SmallVector<DomUpdate, 4> Legalized;
-  cfg::LegalizeUpdates<BasicBlock *>(Updates, Legalized, false);
-  LLVM_DEBUG(dbgs() << "Legalized updates:\t");
-  LLVM_DEBUG(for (auto &U : Legalized) { U.dump(); dbgs() << ", "; });
-  LLVM_DEBUG(dbgs() << "\n");
-  EXPECT_EQ(Legalized.size(), 3UL);
-  EXPECT_NE(llvm::find(Legalized, DomUpdate{Insert, B, C}), Legalized.end());
-  EXPECT_NE(llvm::find(Legalized, DomUpdate{Insert, B, D}), Legalized.end());
-  EXPECT_NE(llvm::find(Legalized, DomUpdate{Delete, A, B}), Legalized.end());
-}
-
-TEST(DominatorTreeBatchUpdates, LegalizePostDomUpdates) {
-  CFGHolder Holder;
-  CFGBuilder Builder(Holder.F, {{"A", "B"}}, {});
-
-  BasicBlock *A = Builder.getOrAddBlock("A");
-  BasicBlock *B = Builder.getOrAddBlock("B");
-  BasicBlock *C = Builder.getOrAddBlock("C");
-  BasicBlock *D = Builder.getOrAddBlock("D");
-
-  std::vector<DomUpdate> Updates = {
-      {Insert, B, C}, {Insert, C, D}, {Delete, B, C}, {Insert, B, C},
-      {Insert, B, D}, {Delete, C, D}, {Delete, A, B}};
-  SmallVector<DomUpdate, 4> Legalized;
-  cfg::LegalizeUpdates<BasicBlock *>(Updates, Legalized, true);
-  LLVM_DEBUG(dbgs() << "Legalized postdom updates:\t");
-  LLVM_DEBUG(for (auto &U : Legalized) { U.dump(); dbgs() << ", "; });
-  LLVM_DEBUG(dbgs() << "\n");
-  EXPECT_EQ(Legalized.size(), 3UL);
-  EXPECT_NE(llvm::find(Legalized, DomUpdate{Insert, C, B}), Legalized.end());
-  EXPECT_NE(llvm::find(Legalized, DomUpdate{Insert, D, B}), Legalized.end());
-  EXPECT_NE(llvm::find(Legalized, DomUpdate{Delete, B, A}), Legalized.end());
-}
-
-TEST(DominatorTreeBatchUpdates, SingleInsertion) {
-  CFGHolder Holder;
-  CFGBuilder Builder(Holder.F, {{"A", "B"}}, {{CFGInsert, {"B", "C"}}});
-
-  DominatorTree DT(*Holder.F);
-  EXPECT_TRUE(DT.verify());
-  PostDominatorTree PDT(*Holder.F);
-  EXPECT_TRUE(PDT.verify());
-
-  BasicBlock *B = Builder.getOrAddBlock("B");
-  BasicBlock *C = Builder.getOrAddBlock("C");
-  std::vector<DomUpdate> Updates = {{Insert, B, C}};
-
-  ASSERT_TRUE(Builder.applyUpdate());
-
-  DT.applyUpdates(Updates);
-  EXPECT_TRUE(DT.verify());
-  PDT.applyUpdates(Updates);
-  EXPECT_TRUE(PDT.verify());
-}
-
-TEST(DominatorTreeBatchUpdates, SingleDeletion) {
-  CFGHolder Holder;
-  CFGBuilder Builder(Holder.F, {{"A", "B"}, {"B", "C"}},
-                     {{CFGDelete, {"B", "C"}}});
-
-  DominatorTree DT(*Holder.F);
-  EXPECT_TRUE(DT.verify());
-  PostDominatorTree PDT(*Holder.F);
-  EXPECT_TRUE(PDT.verify());
-
-  BasicBlock *B = Builder.getOrAddBlock("B");
-  BasicBlock *C = Builder.getOrAddBlock("C");
-  std::vector<DomUpdate> Updates = {{Delete, B, C}};
-
-  ASSERT_TRUE(Builder.applyUpdate());
-
-  DT.applyUpdates(Updates);
-  EXPECT_TRUE(DT.verify());
-  PDT.applyUpdates(Updates);
-  EXPECT_TRUE(PDT.verify());
-}
-
-TEST(DominatorTreeBatchUpdates, FewInsertion) {
-  std::vector<CFGBuilder::Update> CFGUpdates = {{CFGInsert, {"B", "C"}},
-                                                {CFGInsert, {"C", "B"}},
-                                                {CFGInsert, {"C", "D"}},
-                                                {CFGInsert, {"D", "E"}}};
-
-  CFGHolder Holder;
-  CFGBuilder Builder(Holder.F, {{"A", "B"}}, CFGUpdates);
-
-  DominatorTree DT(*Holder.F);
-  EXPECT_TRUE(DT.verify());
-  PostDominatorTree PDT(*Holder.F);
-  EXPECT_TRUE(PDT.verify());
-
-  BasicBlock *B = Builder.getOrAddBlock("B");
-  BasicBlock *C = Builder.getOrAddBlock("C");
-  BasicBlock *D = Builder.getOrAddBlock("D");
-  BasicBlock *E = Builder.getOrAddBlock("E");
-
-  std::vector<DomUpdate> Updates = {
-      {Insert, B, C}, {Insert, C, B}, {Insert, C, D}, {Insert, D, E}};
-
-  while (Builder.applyUpdate())
-    ;
-
-  DT.applyUpdates(Updates);
-  EXPECT_TRUE(DT.verify());
-  PDT.applyUpdates(Updates);
-  EXPECT_TRUE(PDT.verify());
-}
-
-TEST(DominatorTreeBatchUpdates, FewDeletions) {
-  std::vector<CFGBuilder::Update> CFGUpdates = {{CFGDelete, {"B", "C"}},
-                                                {CFGDelete, {"C", "B"}},
-                                                {CFGDelete, {"B", "D"}},
-                                                {CFGDelete, {"D", "E"}}};
-
-  CFGHolder Holder;
-  CFGBuilder Builder(
-      Holder.F, {{"A", "B"}, {"B", "C"}, {"B", "D"}, {"D", "E"}, {"C", "B"}},
-      CFGUpdates);
-
-  DominatorTree DT(*Holder.F);
-  EXPECT_TRUE(DT.verify());
-  PostDominatorTree PDT(*Holder.F);
-  EXPECT_TRUE(PDT.verify());
-
-  auto Updates = ToDomUpdates(Builder, CFGUpdates);
-
-  while (Builder.applyUpdate())
-    ;
-
-  DT.applyUpdates(Updates);
-  EXPECT_TRUE(DT.verify());
-  PDT.applyUpdates(Updates);
-  EXPECT_TRUE(PDT.verify());
-}
-
-TEST(DominatorTreeBatchUpdates, InsertDelete) {
-  std::vector<CFGBuilder::Arc> Arcs = {
-      {"1", "2"}, {"2", "3"}, {"3", "4"},  {"4", "5"},  {"5", "6"},  {"5", "7"},
-      {"3", "8"}, {"8", "9"}, {"9", "10"}, {"8", "11"}, {"11", "12"}};
-
-  std::vector<CFGBuilder::Update> Updates = {
-      {CFGInsert, {"2", "4"}},  {CFGInsert, {"12", "10"}},
-      {CFGInsert, {"10", "9"}}, {CFGInsert, {"7", "6"}},
-      {CFGInsert, {"7", "5"}},  {CFGDelete, {"3", "8"}},
-      {CFGInsert, {"10", "7"}}, {CFGInsert, {"2", "8"}},
-      {CFGDelete, {"3", "4"}},  {CFGDelete, {"8", "9"}},
-      {CFGDelete, {"11", "12"}}};
-
-  CFGHolder Holder;
-  CFGBuilder B(Holder.F, Arcs, Updates);
-  DominatorTree DT(*Holder.F);
-  EXPECT_TRUE(DT.verify());
-  PostDominatorTree PDT(*Holder.F);
-  EXPECT_TRUE(PDT.verify());
-
-  while (B.applyUpdate())
-    ;
-
-  auto DomUpdates = ToDomUpdates(B, Updates);
-  DT.applyUpdates(DomUpdates);
-  EXPECT_TRUE(DT.verify());
-  PDT.applyUpdates(DomUpdates);
-  EXPECT_TRUE(PDT.verify());
-}
-
-TEST(DominatorTreeBatchUpdates, InsertDeleteExhaustive) {
-  std::vector<CFGBuilder::Arc> Arcs = {
-      {"1", "2"}, {"2", "3"}, {"3", "4"},  {"4", "5"},  {"5", "6"},  {"5", "7"},
-      {"3", "8"}, {"8", "9"}, {"9", "10"}, {"8", "11"}, {"11", "12"}};
-
-  std::vector<CFGBuilder::Update> Updates = {
-      {CFGInsert, {"2", "4"}},  {CFGInsert, {"12", "10"}},
-      {CFGInsert, {"10", "9"}}, {CFGInsert, {"7", "6"}},
-      {CFGInsert, {"7", "5"}},  {CFGDelete, {"3", "8"}},
-      {CFGInsert, {"10", "7"}}, {CFGInsert, {"2", "8"}},
-      {CFGDelete, {"3", "4"}},  {CFGDelete, {"8", "9"}},
-      {CFGDelete, {"11", "12"}}};
-
-  std::mt19937 Generator(0);
-  for (unsigned i = 0; i < 16; ++i) {
-    std::shuffle(Updates.begin(), Updates.end(), Generator);
-    CFGHolder Holder;
-    CFGBuilder B(Holder.F, Arcs, Updates);
-    DominatorTree DT(*Holder.F);
-    EXPECT_TRUE(DT.verify());
-    PostDominatorTree PDT(*Holder.F);
-    EXPECT_TRUE(PDT.verify());
-
-    while (B.applyUpdate())
-      ;
-
-    auto DomUpdates = ToDomUpdates(B, Updates);
-    DT.applyUpdates(DomUpdates);
-    EXPECT_TRUE(DT.verify());
-    PDT.applyUpdates(DomUpdates);
-    EXPECT_TRUE(PDT.verify());
-  }
-}
-
-// These are some odd flowgraphs, usually generated from csmith cases,
-// which are difficult on post dom trees.
-TEST(DominatorTreeBatchUpdates, InfiniteLoop) {
-  std::vector<CFGBuilder::Arc> Arcs = {
-      {"1", "2"},
-      {"2", "3"},
-      {"3", "6"}, {"3", "5"},
-      {"4", "5"},
-      {"5", "2"},
-      {"6", "3"}, {"6", "4"}};
-
-  // SplitBlock on 3 -> 5
-  std::vector<CFGBuilder::Update> Updates = {
-      {CFGInsert, {"N", "5"}},  {CFGInsert, {"3", "N"}}, {CFGDelete, {"3", "5"}}};
-
-  CFGHolder Holder;
-  CFGBuilder B(Holder.F, Arcs, Updates);
-  DominatorTree DT(*Holder.F);
-  EXPECT_TRUE(DT.verify());
-  PostDominatorTree PDT(*Holder.F);
-  EXPECT_TRUE(PDT.verify());
-
-  while (B.applyUpdate())
-    ;
-
-  auto DomUpdates = ToDomUpdates(B, Updates);
-  DT.applyUpdates(DomUpdates);
-  EXPECT_TRUE(DT.verify());
-  PDT.applyUpdates(DomUpdates);
-  EXPECT_TRUE(PDT.verify());
-}
-
-TEST(DominatorTreeBatchUpdates, DeadBlocks) {
-  std::vector<CFGBuilder::Arc> Arcs = {
-      {"1", "2"},
-      {"2", "3"},
-      {"3", "4"}, {"3", "7"},
-      {"4", "4"},
-      {"5", "6"}, {"5", "7"},
-      {"6", "7"},
-      {"7", "2"}, {"7", "8"}};
-
-  // Remove dead 5 and 7,
-  // plus SplitBlock on 7 -> 8
-  std::vector<CFGBuilder::Update> Updates = {
-      {CFGDelete, {"6", "7"}},  {CFGDelete, {"5", "7"}}, {CFGDelete, {"5", "6"}},
-      {CFGInsert, {"N", "8"}},  {CFGInsert, {"7", "N"}}, {CFGDelete, {"7", "8"}}};
-
-  CFGHolder Holder;
-  CFGBuilder B(Holder.F, Arcs, Updates);
-  DominatorTree DT(*Holder.F);
-  EXPECT_TRUE(DT.verify());
-  PostDominatorTree PDT(*Holder.F);
-  EXPECT_TRUE(PDT.verify());
-
-  while (B.applyUpdate())
-    ;
-
-  auto DomUpdates = ToDomUpdates(B, Updates);
-  DT.applyUpdates(DomUpdates);
-  EXPECT_TRUE(DT.verify());
-  PDT.applyUpdates(DomUpdates);
-  EXPECT_TRUE(PDT.verify());
-}
-
-TEST(DominatorTreeBatchUpdates, InfiniteLoop2) {
-  std::vector<CFGBuilder::Arc> Arcs = {
-      {"1", "2"},
-      {"2", "6"}, {"2", "3"},
-      {"3", "4"},
-      {"4", "5"}, {"4", "6"},
-      {"5", "4"},
-      {"6", "2"}};
-
-  // SplitBlock on 4 -> 6
-  std::vector<CFGBuilder::Update> Updates = {
-      {CFGInsert, {"N", "6"}},  {CFGInsert, {"4", "N"}}, {CFGDelete, {"4", "6"}}};
-
-  CFGHolder Holder;
-  CFGBuilder B(Holder.F, Arcs, Updates);
-  DominatorTree DT(*Holder.F);
-  EXPECT_TRUE(DT.verify());
-  PostDominatorTree PDT(*Holder.F);
-  EXPECT_TRUE(PDT.verify());
-
-  while (B.applyUpdate())
-    ;
-
-  auto DomUpdates = ToDomUpdates(B, Updates);
-  DT.applyUpdates(DomUpdates);
-  EXPECT_TRUE(DT.verify());
-  PDT.applyUpdates(DomUpdates);
-  EXPECT_TRUE(PDT.verify());
-}
diff --git a/gnu/llvm/llvm/unittests/IR/DominatorTreeTest.cpp b/gnu/llvm/llvm/unittests/IR/DominatorTreeTest.cpp
deleted file mode 100644
index 21f11c8d645..00000000000
--- a/gnu/llvm/llvm/unittests/IR/DominatorTreeTest.cpp
+++ /dev/null
@@ -1,1102 +0,0 @@
-//===- llvm/unittests/IR/DominatorTreeTest.cpp - Constants unit tests -----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include <random>
-#include "llvm/Analysis/PostDominators.h"
-#include "llvm/Analysis/IteratedDominanceFrontier.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/Dominators.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Support/SourceMgr.h"
-#include "CFGBuilder.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-
-/// Build the dominator tree for the function and run the Test.
-static void runWithDomTree(
-    Module &M, StringRef FuncName,
-    function_ref<void(Function &F, DominatorTree *DT, PostDominatorTree *PDT)>
-        Test) {
-  auto *F = M.getFunction(FuncName);
-  ASSERT_NE(F, nullptr) << "Could not find " << FuncName;
-  // Compute the dominator tree for the function.
-  DominatorTree DT(*F);
-  PostDominatorTree PDT(*F);
-  Test(*F, &DT, &PDT);
-}
-
-static std::unique_ptr<Module> makeLLVMModule(LLVMContext &Context,
-                                              StringRef ModuleStr) {
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M = parseAssemblyString(ModuleStr, Err, Context);
-  assert(M && "Bad assembly?");
-  return M;
-}
-
-TEST(DominatorTree, PHIs) {
-  StringRef ModuleString = R"(
-      define void @f() {
-      bb1:
-        br label %bb1
-      bb2:
-        %a = phi i32 [0, %bb1], [1, %bb2]
-        %b = phi i32 [2, %bb1], [%a, %bb2]
-        br label %bb2
-      };
-  )";
-
-  // Parse the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  runWithDomTree(*M, "f",
-                 [&](Function &F, DominatorTree *DT, PostDominatorTree *PDT) {
-                   auto FI = F.begin();
-                   ++FI;
-                   BasicBlock *BB2 = &*FI;
-                   auto BI = BB2->begin();
-                   Instruction *PhiA = &*BI++;
-                   Instruction *PhiB = &*BI;
-
-                   // Phis are thought to execute "instantly, together".
-                   EXPECT_TRUE(DT->dominates(PhiA, PhiB));
-                   EXPECT_TRUE(DT->dominates(PhiB, PhiA));
-                 });
-}
-
-TEST(DominatorTree, Unreachable) {
-  StringRef ModuleString =
-      "declare i32 @g()\n"
-      "define void @f(i32 %x) personality i32 ()* @g {\n"
-      "bb0:\n"
-      "  %y1 = add i32 %x, 1\n"
-      "  %y2 = add i32 %x, 1\n"
-      "  %y3 = invoke i32 @g() to label %bb1 unwind label %bb2\n"
-      "bb1:\n"
-      "  %y4 = add i32 %x, 1\n"
-      "  br label %bb4\n"
-      "bb2:\n"
-      "  %y5 = landingpad i32\n"
-      "          cleanup\n"
-      "  br label %bb4\n"
-      "bb3:\n"
-      "  %y6 = add i32 %x, 1\n"
-      "  %y7 = add i32 %x, 1\n"
-      "  ret void\n"
-      "bb4:\n"
-      "  %y8 = phi i32 [0, %bb2], [%y4, %bb1]\n"
-      "  %y9 = phi i32 [0, %bb2], [%y4, %bb1]\n"
-      "  ret void\n"
-      "}\n";
-
-  // Parse the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  runWithDomTree(
-      *M, "f", [&](Function &F, DominatorTree *DT, PostDominatorTree *PDT) {
-        Function::iterator FI = F.begin();
-
-        BasicBlock *BB0 = &*FI++;
-        BasicBlock::iterator BBI = BB0->begin();
-        Instruction *Y1 = &*BBI++;
-        Instruction *Y2 = &*BBI++;
-        Instruction *Y3 = &*BBI++;
-
-        BasicBlock *BB1 = &*FI++;
-        BBI = BB1->begin();
-        Instruction *Y4 = &*BBI++;
-
-        BasicBlock *BB2 = &*FI++;
-        BBI = BB2->begin();
-        Instruction *Y5 = &*BBI++;
-
-        BasicBlock *BB3 = &*FI++;
-        BBI = BB3->begin();
-        Instruction *Y6 = &*BBI++;
-        Instruction *Y7 = &*BBI++;
-
-        BasicBlock *BB4 = &*FI++;
-        BBI = BB4->begin();
-        Instruction *Y8 = &*BBI++;
-        Instruction *Y9 = &*BBI++;
-
-        // Reachability
-        EXPECT_TRUE(DT->isReachableFromEntry(BB0));
-        EXPECT_TRUE(DT->isReachableFromEntry(BB1));
-        EXPECT_TRUE(DT->isReachableFromEntry(BB2));
-        EXPECT_FALSE(DT->isReachableFromEntry(BB3));
-        EXPECT_TRUE(DT->isReachableFromEntry(BB4));
-
-        // BB dominance
-        EXPECT_TRUE(DT->dominates(BB0, BB0));
-        EXPECT_TRUE(DT->dominates(BB0, BB1));
-        EXPECT_TRUE(DT->dominates(BB0, BB2));
-        EXPECT_TRUE(DT->dominates(BB0, BB3));
-        EXPECT_TRUE(DT->dominates(BB0, BB4));
-
-        EXPECT_FALSE(DT->dominates(BB1, BB0));
-        EXPECT_TRUE(DT->dominates(BB1, BB1));
-        EXPECT_FALSE(DT->dominates(BB1, BB2));
-        EXPECT_TRUE(DT->dominates(BB1, BB3));
-        EXPECT_FALSE(DT->dominates(BB1, BB4));
-
-        EXPECT_FALSE(DT->dominates(BB2, BB0));
-        EXPECT_FALSE(DT->dominates(BB2, BB1));
-        EXPECT_TRUE(DT->dominates(BB2, BB2));
-        EXPECT_TRUE(DT->dominates(BB2, BB3));
-        EXPECT_FALSE(DT->dominates(BB2, BB4));
-
-        EXPECT_FALSE(DT->dominates(BB3, BB0));
-        EXPECT_FALSE(DT->dominates(BB3, BB1));
-        EXPECT_FALSE(DT->dominates(BB3, BB2));
-        EXPECT_TRUE(DT->dominates(BB3, BB3));
-        EXPECT_FALSE(DT->dominates(BB3, BB4));
-
-        // BB proper dominance
-        EXPECT_FALSE(DT->properlyDominates(BB0, BB0));
-        EXPECT_TRUE(DT->properlyDominates(BB0, BB1));
-        EXPECT_TRUE(DT->properlyDominates(BB0, BB2));
-        EXPECT_TRUE(DT->properlyDominates(BB0, BB3));
-
-        EXPECT_FALSE(DT->properlyDominates(BB1, BB0));
-        EXPECT_FALSE(DT->properlyDominates(BB1, BB1));
-        EXPECT_FALSE(DT->properlyDominates(BB1, BB2));
-        EXPECT_TRUE(DT->properlyDominates(BB1, BB3));
-
-        EXPECT_FALSE(DT->properlyDominates(BB2, BB0));
-        EXPECT_FALSE(DT->properlyDominates(BB2, BB1));
-        EXPECT_FALSE(DT->properlyDominates(BB2, BB2));
-        EXPECT_TRUE(DT->properlyDominates(BB2, BB3));
-
-        EXPECT_FALSE(DT->properlyDominates(BB3, BB0));
-        EXPECT_FALSE(DT->properlyDominates(BB3, BB1));
-        EXPECT_FALSE(DT->properlyDominates(BB3, BB2));
-        EXPECT_FALSE(DT->properlyDominates(BB3, BB3));
-
-        // Instruction dominance in the same reachable BB
-        EXPECT_FALSE(DT->dominates(Y1, Y1));
-        EXPECT_TRUE(DT->dominates(Y1, Y2));
-        EXPECT_FALSE(DT->dominates(Y2, Y1));
-        EXPECT_FALSE(DT->dominates(Y2, Y2));
-
-        // Instruction dominance in the same unreachable BB
-        EXPECT_TRUE(DT->dominates(Y6, Y6));
-        EXPECT_TRUE(DT->dominates(Y6, Y7));
-        EXPECT_TRUE(DT->dominates(Y7, Y6));
-        EXPECT_TRUE(DT->dominates(Y7, Y7));
-
-        // Invoke
-        EXPECT_TRUE(DT->dominates(Y3, Y4));
-        EXPECT_FALSE(DT->dominates(Y3, Y5));
-
-        // Phi
-        EXPECT_TRUE(DT->dominates(Y2, Y9));
-        EXPECT_FALSE(DT->dominates(Y3, Y9));
-        EXPECT_FALSE(DT->dominates(Y8, Y9));
-
-        // Anything dominates unreachable
-        EXPECT_TRUE(DT->dominates(Y1, Y6));
-        EXPECT_TRUE(DT->dominates(Y3, Y6));
-
-        // Unreachable doesn't dominate reachable
-        EXPECT_FALSE(DT->dominates(Y6, Y1));
-
-        // Instruction, BB dominance
-        EXPECT_FALSE(DT->dominates(Y1, BB0));
-        EXPECT_TRUE(DT->dominates(Y1, BB1));
-        EXPECT_TRUE(DT->dominates(Y1, BB2));
-        EXPECT_TRUE(DT->dominates(Y1, BB3));
-        EXPECT_TRUE(DT->dominates(Y1, BB4));
-
-        EXPECT_FALSE(DT->dominates(Y3, BB0));
-        EXPECT_TRUE(DT->dominates(Y3, BB1));
-        EXPECT_FALSE(DT->dominates(Y3, BB2));
-        EXPECT_TRUE(DT->dominates(Y3, BB3));
-        EXPECT_FALSE(DT->dominates(Y3, BB4));
-
-        EXPECT_TRUE(DT->dominates(Y6, BB3));
-
-        // Post dominance.
-        EXPECT_TRUE(PDT->dominates(BB0, BB0));
-        EXPECT_FALSE(PDT->dominates(BB1, BB0));
-        EXPECT_FALSE(PDT->dominates(BB2, BB0));
-        EXPECT_FALSE(PDT->dominates(BB3, BB0));
-        EXPECT_TRUE(PDT->dominates(BB4, BB1));
-
-        // Dominance descendants.
-        SmallVector<BasicBlock *, 8> DominatedBBs, PostDominatedBBs;
-
-        DT->getDescendants(BB0, DominatedBBs);
-        PDT->getDescendants(BB0, PostDominatedBBs);
-        EXPECT_EQ(DominatedBBs.size(), 4UL);
-        EXPECT_EQ(PostDominatedBBs.size(), 1UL);
-
-        // BB3 is unreachable. It should have no dominators nor postdominators.
-        DominatedBBs.clear();
-        PostDominatedBBs.clear();
-        DT->getDescendants(BB3, DominatedBBs);
-        DT->getDescendants(BB3, PostDominatedBBs);
-        EXPECT_EQ(DominatedBBs.size(), 0UL);
-        EXPECT_EQ(PostDominatedBBs.size(), 0UL);
-
-        // Check DFS Numbers before
-        DT->updateDFSNumbers();
-        EXPECT_EQ(DT->getNode(BB0)->getDFSNumIn(), 0UL);
-        EXPECT_EQ(DT->getNode(BB0)->getDFSNumOut(), 7UL);
-        EXPECT_EQ(DT->getNode(BB1)->getDFSNumIn(), 1UL);
-        EXPECT_EQ(DT->getNode(BB1)->getDFSNumOut(), 2UL);
-        EXPECT_EQ(DT->getNode(BB2)->getDFSNumIn(), 5UL);
-        EXPECT_EQ(DT->getNode(BB2)->getDFSNumOut(), 6UL);
-        EXPECT_EQ(DT->getNode(BB4)->getDFSNumIn(), 3UL);
-        EXPECT_EQ(DT->getNode(BB4)->getDFSNumOut(), 4UL);
-
-        // Check levels before
-        EXPECT_EQ(DT->getNode(BB0)->getLevel(), 0U);
-        EXPECT_EQ(DT->getNode(BB1)->getLevel(), 1U);
-        EXPECT_EQ(DT->getNode(BB2)->getLevel(), 1U);
-        EXPECT_EQ(DT->getNode(BB4)->getLevel(), 1U);
-
-        // Reattach block 3 to block 1 and recalculate
-        BB1->getTerminator()->eraseFromParent();
-        BranchInst::Create(BB4, BB3, ConstantInt::getTrue(F.getContext()), BB1);
-        DT->recalculate(F);
-
-        // Check DFS Numbers after
-        DT->updateDFSNumbers();
-        EXPECT_EQ(DT->getNode(BB0)->getDFSNumIn(), 0UL);
-        EXPECT_EQ(DT->getNode(BB0)->getDFSNumOut(), 9UL);
-        EXPECT_EQ(DT->getNode(BB1)->getDFSNumIn(), 1UL);
-        EXPECT_EQ(DT->getNode(BB1)->getDFSNumOut(), 4UL);
-        EXPECT_EQ(DT->getNode(BB2)->getDFSNumIn(), 7UL);
-        EXPECT_EQ(DT->getNode(BB2)->getDFSNumOut(), 8UL);
-        EXPECT_EQ(DT->getNode(BB3)->getDFSNumIn(), 2UL);
-        EXPECT_EQ(DT->getNode(BB3)->getDFSNumOut(), 3UL);
-        EXPECT_EQ(DT->getNode(BB4)->getDFSNumIn(), 5UL);
-        EXPECT_EQ(DT->getNode(BB4)->getDFSNumOut(), 6UL);
-
-        // Check levels after
-        EXPECT_EQ(DT->getNode(BB0)->getLevel(), 0U);
-        EXPECT_EQ(DT->getNode(BB1)->getLevel(), 1U);
-        EXPECT_EQ(DT->getNode(BB2)->getLevel(), 1U);
-        EXPECT_EQ(DT->getNode(BB3)->getLevel(), 2U);
-        EXPECT_EQ(DT->getNode(BB4)->getLevel(), 1U);
-
-        // Change root node
-        EXPECT_TRUE(DT->verify());
-        BasicBlock *NewEntry =
-            BasicBlock::Create(F.getContext(), "new_entry", &F, BB0);
-        BranchInst::Create(BB0, NewEntry);
-        EXPECT_EQ(F.begin()->getName(), NewEntry->getName());
-        EXPECT_TRUE(&F.getEntryBlock() == NewEntry);
-        DT->setNewRoot(NewEntry);
-        EXPECT_TRUE(DT->verify());
-      });
-}
-
-TEST(DominatorTree, NonUniqueEdges) {
-  StringRef ModuleString =
-      "define i32 @f(i32 %i, i32 *%p) {\n"
-      "bb0:\n"
-      "   store i32 %i, i32 *%p\n"
-      "   switch i32 %i, label %bb2 [\n"
-      "     i32 0, label %bb1\n"
-      "     i32 1, label %bb1\n"
-      "   ]\n"
-      " bb1:\n"
-      "   ret i32 1\n"
-      " bb2:\n"
-      "   ret i32 4\n"
-      "}\n";
-
-  // Parse the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  runWithDomTree(
-      *M, "f", [&](Function &F, DominatorTree *DT, PostDominatorTree *PDT) {
-        Function::iterator FI = F.begin();
-
-        BasicBlock *BB0 = &*FI++;
-        BasicBlock *BB1 = &*FI++;
-        BasicBlock *BB2 = &*FI++;
-
-        const Instruction *TI = BB0->getTerminator();
-        assert(TI->getNumSuccessors() == 3 && "Switch has three successors");
-
-        BasicBlockEdge Edge_BB0_BB2(BB0, TI->getSuccessor(0));
-        assert(Edge_BB0_BB2.getEnd() == BB2 &&
-               "Default label is the 1st successor");
-
-        BasicBlockEdge Edge_BB0_BB1_a(BB0, TI->getSuccessor(1));
-        assert(Edge_BB0_BB1_a.getEnd() == BB1 && "BB1 is the 2nd successor");
-
-        BasicBlockEdge Edge_BB0_BB1_b(BB0, TI->getSuccessor(2));
-        assert(Edge_BB0_BB1_b.getEnd() == BB1 && "BB1 is the 3rd successor");
-
-        EXPECT_TRUE(DT->dominates(Edge_BB0_BB2, BB2));
-        EXPECT_FALSE(DT->dominates(Edge_BB0_BB2, BB1));
-
-        EXPECT_FALSE(DT->dominates(Edge_BB0_BB1_a, BB1));
-        EXPECT_FALSE(DT->dominates(Edge_BB0_BB1_b, BB1));
-
-        EXPECT_FALSE(DT->dominates(Edge_BB0_BB1_a, BB2));
-        EXPECT_FALSE(DT->dominates(Edge_BB0_BB1_b, BB2));
-      });
-}
-
-// Verify that the PDT is correctly updated in case an edge removal results
-// in a new unreachable CFG node. Also make sure that the updated PDT is the
-// same as a freshly recalculated one.
-//
-// For the following input code and initial PDT:
-//
-//          CFG                   PDT
-//
-//           A                    Exit
-//           |                     |
-//          _B                     D
-//         / | \                   |
-//        ^  v  \                  B
-//        \ /    D                / \
-//         C      \              C   A
-//                v
-//                Exit
-//
-// we verify that CFG' and PDT-updated is obtained after removal of edge C -> B.
-//
-//          CFG'               PDT-updated
-//
-//           A                    Exit
-//           |                   / | \
-//           B                  C  B  D
-//           | \                   |
-//           v  \                  A
-//          /    D
-//         C      \
-//         |       \
-// unreachable    Exit
-//
-// Both the blocks that end with ret and with unreachable become trivial
-// PostDominatorTree roots, as they have no successors.
-//
-TEST(DominatorTree, DeletingEdgesIntroducesUnreachables) {
-  StringRef ModuleString =
-      "define void @f() {\n"
-      "A:\n"
-      "  br label %B\n"
-      "B:\n"
-      "  br i1 undef, label %D, label %C\n"
-      "C:\n"
-      "  br label %B\n"
-      "D:\n"
-      "  ret void\n"
-      "}\n";
-
-  // Parse the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  runWithDomTree(
-      *M, "f", [&](Function &F, DominatorTree *DT, PostDominatorTree *PDT) {
-        Function::iterator FI = F.begin();
-
-        FI++;
-        BasicBlock *B = &*FI++;
-        BasicBlock *C = &*FI++;
-        BasicBlock *D = &*FI++;
-
-        ASSERT_TRUE(PDT->dominates(PDT->getNode(D), PDT->getNode(B)));
-        EXPECT_TRUE(DT->verify());
-        EXPECT_TRUE(PDT->verify());
-
-        C->getTerminator()->eraseFromParent();
-        new UnreachableInst(C->getContext(), C);
-
-        DT->deleteEdge(C, B);
-        PDT->deleteEdge(C, B);
-
-        EXPECT_TRUE(DT->verify());
-        EXPECT_TRUE(PDT->verify());
-
-        EXPECT_FALSE(PDT->dominates(PDT->getNode(D), PDT->getNode(B)));
-        EXPECT_NE(PDT->getNode(C), nullptr);
-
-        DominatorTree NDT(F);
-        EXPECT_EQ(DT->compare(NDT), 0);
-
-        PostDominatorTree NPDT(F);
-        EXPECT_EQ(PDT->compare(NPDT), 0);
-      });
-}
-
-// Verify that the PDT is correctly updated in case an edge removal results
-// in an infinite loop. Also make sure that the updated PDT is the
-// same as a freshly recalculated one.
-//
-// Test case:
-//
-//          CFG                   PDT
-//
-//           A                    Exit
-//           |                     |
-//          _B                     D
-//         / | \                   |
-//        ^  v  \                  B
-//        \ /    D                / \
-//         C      \              C   A
-//        / \      v
-//       ^  v      Exit
-//        \_/
-//
-// After deleting the edge C->B, C is part of an infinite reverse-unreachable
-// loop:
-//
-//          CFG'                  PDT'
-//
-//           A                    Exit
-//           |                   / | \
-//           B                  C  B  D
-//           | \                   |
-//           v  \                  A
-//          /    D
-//         C      \
-//        / \      v
-//       ^  v      Exit
-//        \_/
-//
-// As C now becomes reverse-unreachable, it forms a new non-trivial root and
-// gets connected to the virtual exit.
-// D does not postdominate B anymore, because there are two forward paths from
-// B to the virtual exit:
-//  - B -> C -> VirtualExit
-//  - B -> D -> VirtualExit.
-//
-TEST(DominatorTree, DeletingEdgesIntroducesInfiniteLoop) {
-  StringRef ModuleString =
-      "define void @f() {\n"
-      "A:\n"
-      "  br label %B\n"
-      "B:\n"
-      "  br i1 undef, label %D, label %C\n"
-      "C:\n"
-      "  switch i32 undef, label %C [\n"
-      "    i32 0, label %B\n"
-      "  ]\n"
-      "D:\n"
-      "  ret void\n"
-      "}\n";
-
-  // Parse the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  runWithDomTree(
-      *M, "f", [&](Function &F, DominatorTree *DT, PostDominatorTree *PDT) {
-        Function::iterator FI = F.begin();
-
-        FI++;
-        BasicBlock *B = &*FI++;
-        BasicBlock *C = &*FI++;
-        BasicBlock *D = &*FI++;
-
-        ASSERT_TRUE(PDT->dominates(PDT->getNode(D), PDT->getNode(B)));
-        EXPECT_TRUE(DT->verify());
-        EXPECT_TRUE(PDT->verify());
-
-        auto SwitchC = cast<SwitchInst>(C->getTerminator());
-        SwitchC->removeCase(SwitchC->case_begin());
-        DT->deleteEdge(C, B);
-        EXPECT_TRUE(DT->verify());
-        PDT->deleteEdge(C, B);
-        EXPECT_TRUE(PDT->verify());
-
-        EXPECT_FALSE(PDT->dominates(PDT->getNode(D), PDT->getNode(B)));
-        EXPECT_NE(PDT->getNode(C), nullptr);
-
-        DominatorTree NDT(F);
-        EXPECT_EQ(DT->compare(NDT), 0);
-
-        PostDominatorTree NPDT(F);
-        EXPECT_EQ(PDT->compare(NPDT), 0);
-      });
-}
-
-// Verify that the PDT is correctly updated in case an edge removal results
-// in an infinite loop.
-//
-// Test case:
-//
-//          CFG                   PDT
-//
-//           A                    Exit
-//           |                   / | \
-//           B--               C2  B  D
-//           |  \              /   |
-//           v   \            C    A
-//          /     D
-//         C--C2   \
-//        / \  \    v
-//       ^  v  --Exit
-//        \_/
-//
-// After deleting the edge C->E, C is part of an infinite reverse-unreachable
-// loop:
-//
-//          CFG'                  PDT'
-//
-//           A                    Exit
-//           |                   / | \
-//           B                  C  B  D
-//           | \                   |
-//           v  \                  A
-//          /    D
-//         C      \
-//        / \      v
-//       ^  v      Exit
-//        \_/
-//
-// In PDT, D does not post-dominate B. After the edge C -> C2 is removed,
-// C becomes a new nontrivial PDT root.
-//
-TEST(DominatorTree, DeletingEdgesIntroducesInfiniteLoop2) {
-  StringRef ModuleString =
-      "define void @f() {\n"
-      "A:\n"
-      "  br label %B\n"
-      "B:\n"
-      "  br i1 undef, label %D, label %C\n"
-      "C:\n"
-      "  switch i32 undef, label %C [\n"
-      "    i32 0, label %C2\n"
-      "  ]\n"
-      "C2:\n"
-      "  ret void\n"
-      "D:\n"
-      "  ret void\n"
-      "}\n";
-
-  // Parse the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  runWithDomTree(
-      *M, "f", [&](Function &F, DominatorTree *DT, PostDominatorTree *PDT) {
-        Function::iterator FI = F.begin();
-
-        FI++;
-        BasicBlock *B = &*FI++;
-        BasicBlock *C = &*FI++;
-        BasicBlock *C2 = &*FI++;
-        BasicBlock *D = &*FI++;
-
-        EXPECT_TRUE(DT->verify());
-        EXPECT_TRUE(PDT->verify());
-
-        auto SwitchC = cast<SwitchInst>(C->getTerminator());
-        SwitchC->removeCase(SwitchC->case_begin());
-        DT->deleteEdge(C, C2);
-        PDT->deleteEdge(C, C2);
-        C2->removeFromParent();
-
-        EXPECT_EQ(DT->getNode(C2), nullptr);
-        PDT->eraseNode(C2);
-        delete C2;
-
-        EXPECT_TRUE(DT->verify());
-        EXPECT_TRUE(PDT->verify());
-
-        EXPECT_FALSE(PDT->dominates(PDT->getNode(D), PDT->getNode(B)));
-        EXPECT_NE(PDT->getNode(C), nullptr);
-
-        DominatorTree NDT(F);
-        EXPECT_EQ(DT->compare(NDT), 0);
-
-        PostDominatorTree NPDT(F);
-        EXPECT_EQ(PDT->compare(NPDT), 0);
-      });
-}
-
-// Verify that the IDF returns blocks in a deterministic way.
-//
-// Test case:
-//
-//          CFG
-//
-//          (A)
-//          / \
-//         /   \
-//       (B)   (C)
-//        |\   /|
-//        |  X  |
-//        |/   \|
-//       (D)   (E)
-//
-// IDF for block B is {D, E}, and the order of blocks in this list is defined by
-// their 1) level in dom-tree and 2) DFSIn number if the level is the same.
-//
-TEST(DominatorTree, IDFDeterminismTest) {
-  StringRef ModuleString =
-      "define void @f() {\n"
-      "A:\n"
-      "  br i1 undef, label %B, label %C\n"
-      "B:\n"
-      "  br i1 undef, label %D, label %E\n"
-      "C:\n"
-      "  br i1 undef, label %D, label %E\n"
-      "D:\n"
-      "  ret void\n"
-      "E:\n"
-      "  ret void\n"
-      "}\n";
-
-  // Parse the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  runWithDomTree(
-      *M, "f", [&](Function &F, DominatorTree *DT, PostDominatorTree *PDT) {
-        Function::iterator FI = F.begin();
-
-        BasicBlock *A = &*FI++;
-        BasicBlock *B = &*FI++;
-        BasicBlock *C = &*FI++;
-        BasicBlock *D = &*FI++;
-        BasicBlock *E = &*FI++;
-        (void)C;
-
-        DT->updateDFSNumbers();
-        ForwardIDFCalculator IDF(*DT);
-        SmallPtrSet<BasicBlock *, 1> DefBlocks;
-        DefBlocks.insert(B);
-        IDF.setDefiningBlocks(DefBlocks);
-
-        SmallVector<BasicBlock *, 32> IDFBlocks;
-        SmallPtrSet<BasicBlock *, 32> LiveInBlocks;
-        IDF.resetLiveInBlocks();
-        IDF.calculate(IDFBlocks);
-
-
-        EXPECT_EQ(IDFBlocks.size(), 2UL);
-        EXPECT_EQ(DT->getNode(A)->getDFSNumIn(), 0UL);
-        EXPECT_EQ(IDFBlocks[0], D);
-        EXPECT_EQ(IDFBlocks[1], E);
-        EXPECT_TRUE(DT->getNode(IDFBlocks[0])->getDFSNumIn() <
-                    DT->getNode(IDFBlocks[1])->getDFSNumIn());
-      });
-}
-
-namespace {
-const auto Insert = CFGBuilder::ActionKind::Insert;
-const auto Delete = CFGBuilder::ActionKind::Delete;
-
-bool CompUpdates(const CFGBuilder::Update &A, const CFGBuilder::Update &B) {
-  return std::tie(A.Action, A.Edge.From, A.Edge.To) <
-         std::tie(B.Action, B.Edge.From, B.Edge.To);
-}
-}  // namespace
-
-TEST(DominatorTree, InsertReachable) {
-  CFGHolder Holder;
-  std::vector<CFGBuilder::Arc> Arcs = {
-      {"1", "2"}, {"2", "3"}, {"3", "4"},  {"4", "5"},  {"5", "6"},  {"5", "7"},
-      {"3", "8"}, {"8", "9"}, {"9", "10"}, {"8", "11"}, {"11", "12"}};
-
-  std::vector<CFGBuilder::Update> Updates = {{Insert, {"12", "10"}},
-                                             {Insert, {"10", "9"}},
-                                             {Insert, {"7", "6"}},
-                                             {Insert, {"7", "5"}}};
-  CFGBuilder B(Holder.F, Arcs, Updates);
-  DominatorTree DT(*Holder.F);
-  EXPECT_TRUE(DT.verify());
-  PostDominatorTree PDT(*Holder.F);
-  EXPECT_TRUE(PDT.verify());
-
-  Optional<CFGBuilder::Update> LastUpdate;
-  while ((LastUpdate = B.applyUpdate())) {
-    EXPECT_EQ(LastUpdate->Action, Insert);
-    BasicBlock *From = B.getOrAddBlock(LastUpdate->Edge.From);
-    BasicBlock *To = B.getOrAddBlock(LastUpdate->Edge.To);
-    DT.insertEdge(From, To);
-    EXPECT_TRUE(DT.verify());
-    PDT.insertEdge(From, To);
-    EXPECT_TRUE(PDT.verify());
-  }
-}
-
-TEST(DominatorTree, InsertReachable2) {
-  CFGHolder Holder;
-  std::vector<CFGBuilder::Arc> Arcs = {
-      {"1", "2"}, {"2", "3"}, {"3", "4"},  {"4", "5"},  {"5", "6"},  {"5", "7"},
-      {"7", "5"}, {"2", "8"}, {"8", "11"}, {"11", "12"}, {"12", "10"},
-      {"10", "9"}, {"9", "10"}};
-
-  std::vector<CFGBuilder::Update> Updates = {{Insert, {"10", "7"}}};
-  CFGBuilder B(Holder.F, Arcs, Updates);
-  DominatorTree DT(*Holder.F);
-  EXPECT_TRUE(DT.verify());
-  PostDominatorTree PDT(*Holder.F);
-  EXPECT_TRUE(PDT.verify());
-
-  Optional<CFGBuilder::Update> LastUpdate = B.applyUpdate();
-  EXPECT_TRUE(LastUpdate);
-
-  EXPECT_EQ(LastUpdate->Action, Insert);
-  BasicBlock *From = B.getOrAddBlock(LastUpdate->Edge.From);
-  BasicBlock *To = B.getOrAddBlock(LastUpdate->Edge.To);
-  DT.insertEdge(From, To);
-  EXPECT_TRUE(DT.verify());
-  PDT.insertEdge(From, To);
-  EXPECT_TRUE(PDT.verify());
-}
-
-TEST(DominatorTree, InsertUnreachable) {
-  CFGHolder Holder;
-  std::vector<CFGBuilder::Arc> Arcs = {{"1", "2"},  {"2", "3"},  {"3", "4"},
-                                       {"5", "6"},  {"5", "7"},  {"3", "8"},
-                                       {"9", "10"}, {"11", "12"}};
-
-  std::vector<CFGBuilder::Update> Updates = {{Insert, {"4", "5"}},
-                                             {Insert, {"8", "9"}},
-                                             {Insert, {"10", "12"}},
-                                             {Insert, {"10", "11"}}};
-  CFGBuilder B(Holder.F, Arcs, Updates);
-  DominatorTree DT(*Holder.F);
-  EXPECT_TRUE(DT.verify());
-  PostDominatorTree PDT(*Holder.F);
-  EXPECT_TRUE(PDT.verify());
-
-  Optional<CFGBuilder::Update> LastUpdate;
-  while ((LastUpdate = B.applyUpdate())) {
-    EXPECT_EQ(LastUpdate->Action, Insert);
-    BasicBlock *From = B.getOrAddBlock(LastUpdate->Edge.From);
-    BasicBlock *To = B.getOrAddBlock(LastUpdate->Edge.To);
-    DT.insertEdge(From, To);
-    EXPECT_TRUE(DT.verify());
-    PDT.insertEdge(From, To);
-    EXPECT_TRUE(PDT.verify());
-  }
-}
-
-TEST(DominatorTree, InsertFromUnreachable) {
-  CFGHolder Holder;
-  std::vector<CFGBuilder::Arc> Arcs = {{"1", "2"}, {"2", "3"}, {"3", "4"}};
-
-  std::vector<CFGBuilder::Update> Updates = {{Insert, {"3", "5"}}};
-  CFGBuilder B(Holder.F, Arcs, Updates);
-  PostDominatorTree PDT(*Holder.F);
-  EXPECT_TRUE(PDT.verify());
-
-  Optional<CFGBuilder::Update> LastUpdate = B.applyUpdate();
-  EXPECT_TRUE(LastUpdate);
-
-  EXPECT_EQ(LastUpdate->Action, Insert);
-  BasicBlock *From = B.getOrAddBlock(LastUpdate->Edge.From);
-  BasicBlock *To = B.getOrAddBlock(LastUpdate->Edge.To);
-  PDT.insertEdge(From, To);
-  EXPECT_TRUE(PDT.verify());
-  EXPECT_EQ(PDT.root_size(), 2UL);
-  // Make sure we can use a const pointer with getNode.
-  const BasicBlock *BB5 = B.getOrAddBlock("5");
-  EXPECT_NE(PDT.getNode(BB5), nullptr);
-}
-
-TEST(DominatorTree, InsertMixed) {
-  CFGHolder Holder;
-  std::vector<CFGBuilder::Arc> Arcs = {
-      {"1", "2"}, {"2", "3"},  {"3", "4"},  {"5", "6"},   {"5", "7"},
-      {"8", "9"}, {"9", "10"}, {"8", "11"}, {"11", "12"}, {"7", "3"}};
-
-  std::vector<CFGBuilder::Update> Updates = {
-      {Insert, {"4", "5"}},   {Insert, {"2", "5"}},   {Insert, {"10", "9"}},
-      {Insert, {"12", "10"}}, {Insert, {"12", "10"}}, {Insert, {"7", "8"}},
-      {Insert, {"7", "5"}}};
-  CFGBuilder B(Holder.F, Arcs, Updates);
-  DominatorTree DT(*Holder.F);
-  EXPECT_TRUE(DT.verify());
-  PostDominatorTree PDT(*Holder.F);
-  EXPECT_TRUE(PDT.verify());
-
-  Optional<CFGBuilder::Update> LastUpdate;
-  while ((LastUpdate = B.applyUpdate())) {
-    EXPECT_EQ(LastUpdate->Action, Insert);
-    BasicBlock *From = B.getOrAddBlock(LastUpdate->Edge.From);
-    BasicBlock *To = B.getOrAddBlock(LastUpdate->Edge.To);
-    DT.insertEdge(From, To);
-    EXPECT_TRUE(DT.verify());
-    PDT.insertEdge(From, To);
-    EXPECT_TRUE(PDT.verify());
-  }
-}
-
-TEST(DominatorTree, InsertPermut) {
-  std::vector<CFGBuilder::Arc> Arcs = {
-      {"1", "2"}, {"2", "3"},  {"3", "4"},  {"5", "6"},   {"5", "7"},
-      {"8", "9"}, {"9", "10"}, {"8", "11"}, {"11", "12"}, {"7", "3"}};
-
-  std::vector<CFGBuilder::Update> Updates = {{Insert, {"4", "5"}},
-                                             {Insert, {"2", "5"}},
-                                             {Insert, {"10", "9"}},
-                                             {Insert, {"12", "10"}}};
-
-  while (std::next_permutation(Updates.begin(), Updates.end(), CompUpdates)) {
-    CFGHolder Holder;
-    CFGBuilder B(Holder.F, Arcs, Updates);
-    DominatorTree DT(*Holder.F);
-    EXPECT_TRUE(DT.verify());
-    PostDominatorTree PDT(*Holder.F);
-    EXPECT_TRUE(PDT.verify());
-
-    Optional<CFGBuilder::Update> LastUpdate;
-    while ((LastUpdate = B.applyUpdate())) {
-      EXPECT_EQ(LastUpdate->Action, Insert);
-      BasicBlock *From = B.getOrAddBlock(LastUpdate->Edge.From);
-      BasicBlock *To = B.getOrAddBlock(LastUpdate->Edge.To);
-      DT.insertEdge(From, To);
-      EXPECT_TRUE(DT.verify());
-      PDT.insertEdge(From, To);
-      EXPECT_TRUE(PDT.verify());
-    }
-  }
-}
-
-TEST(DominatorTree, DeleteReachable) {
-  CFGHolder Holder;
-  std::vector<CFGBuilder::Arc> Arcs = {
-      {"1", "2"}, {"2", "3"}, {"2", "4"}, {"3", "4"}, {"4", "5"},  {"5", "6"},
-      {"5", "7"}, {"7", "8"}, {"3", "8"}, {"8", "9"}, {"9", "10"}, {"10", "2"}};
-
-  std::vector<CFGBuilder::Update> Updates = {
-      {Delete, {"2", "4"}}, {Delete, {"7", "8"}}, {Delete, {"10", "2"}}};
-  CFGBuilder B(Holder.F, Arcs, Updates);
-  DominatorTree DT(*Holder.F);
-  EXPECT_TRUE(DT.verify());
-  PostDominatorTree PDT(*Holder.F);
-  EXPECT_TRUE(PDT.verify());
-
-  Optional<CFGBuilder::Update> LastUpdate;
-  while ((LastUpdate = B.applyUpdate())) {
-    EXPECT_EQ(LastUpdate->Action, Delete);
-    BasicBlock *From = B.getOrAddBlock(LastUpdate->Edge.From);
-    BasicBlock *To = B.getOrAddBlock(LastUpdate->Edge.To);
-    DT.deleteEdge(From, To);
-    EXPECT_TRUE(DT.verify());
-    PDT.deleteEdge(From, To);
-    EXPECT_TRUE(PDT.verify());
-  }
-}
-
-TEST(DominatorTree, DeleteUnreachable) {
-  CFGHolder Holder;
-  std::vector<CFGBuilder::Arc> Arcs = {
-      {"1", "2"}, {"2", "3"}, {"3", "4"}, {"4", "5"},  {"5", "6"}, {"5", "7"},
-      {"7", "8"}, {"3", "8"}, {"8", "9"}, {"9", "10"}, {"10", "2"}};
-
-  std::vector<CFGBuilder::Update> Updates = {
-      {Delete, {"8", "9"}}, {Delete, {"7", "8"}}, {Delete, {"3", "4"}}};
-  CFGBuilder B(Holder.F, Arcs, Updates);
-  DominatorTree DT(*Holder.F);
-  EXPECT_TRUE(DT.verify());
-  PostDominatorTree PDT(*Holder.F);
-  EXPECT_TRUE(PDT.verify());
-
-  Optional<CFGBuilder::Update> LastUpdate;
-  while ((LastUpdate = B.applyUpdate())) {
-    EXPECT_EQ(LastUpdate->Action, Delete);
-    BasicBlock *From = B.getOrAddBlock(LastUpdate->Edge.From);
-    BasicBlock *To = B.getOrAddBlock(LastUpdate->Edge.To);
-    DT.deleteEdge(From, To);
-    EXPECT_TRUE(DT.verify());
-    PDT.deleteEdge(From, To);
-    EXPECT_TRUE(PDT.verify());
-  }
-}
-
-TEST(DominatorTree, InsertDelete) {
-  std::vector<CFGBuilder::Arc> Arcs = {
-      {"1", "2"}, {"2", "3"}, {"3", "4"},  {"4", "5"},  {"5", "6"},  {"5", "7"},
-      {"3", "8"}, {"8", "9"}, {"9", "10"}, {"8", "11"}, {"11", "12"}};
-
-  std::vector<CFGBuilder::Update> Updates = {
-      {Insert, {"2", "4"}},  {Insert, {"12", "10"}}, {Insert, {"10", "9"}},
-      {Insert, {"7", "6"}},  {Insert, {"7", "5"}},   {Delete, {"3", "8"}},
-      {Insert, {"10", "7"}}, {Insert, {"2", "8"}},   {Delete, {"3", "4"}},
-      {Delete, {"8", "9"}},  {Delete, {"11", "12"}}};
-
-  CFGHolder Holder;
-  CFGBuilder B(Holder.F, Arcs, Updates);
-  DominatorTree DT(*Holder.F);
-  EXPECT_TRUE(DT.verify());
-  PostDominatorTree PDT(*Holder.F);
-  EXPECT_TRUE(PDT.verify());
-
-  Optional<CFGBuilder::Update> LastUpdate;
-  while ((LastUpdate = B.applyUpdate())) {
-    BasicBlock *From = B.getOrAddBlock(LastUpdate->Edge.From);
-    BasicBlock *To = B.getOrAddBlock(LastUpdate->Edge.To);
-    if (LastUpdate->Action == Insert) {
-      DT.insertEdge(From, To);
-      PDT.insertEdge(From, To);
-    } else {
-      DT.deleteEdge(From, To);
-      PDT.deleteEdge(From, To);
-    }
-
-    EXPECT_TRUE(DT.verify());
-    EXPECT_TRUE(PDT.verify());
-  }
-}
-
-TEST(DominatorTree, InsertDeleteExhaustive) {
-  std::vector<CFGBuilder::Arc> Arcs = {
-      {"1", "2"}, {"2", "3"}, {"3", "4"},  {"4", "5"},  {"5", "6"},  {"5", "7"},
-      {"3", "8"}, {"8", "9"}, {"9", "10"}, {"8", "11"}, {"11", "12"}};
-
-  std::vector<CFGBuilder::Update> Updates = {
-      {Insert, {"2", "4"}},  {Insert, {"12", "10"}}, {Insert, {"10", "9"}},
-      {Insert, {"7", "6"}},  {Insert, {"7", "5"}},   {Delete, {"3", "8"}},
-      {Insert, {"10", "7"}}, {Insert, {"2", "8"}},   {Delete, {"3", "4"}},
-      {Delete, {"8", "9"}},  {Delete, {"11", "12"}}};
-
-  std::mt19937 Generator(0);
-  for (unsigned i = 0; i < 16; ++i) {
-    std::shuffle(Updates.begin(), Updates.end(), Generator);
-    CFGHolder Holder;
-    CFGBuilder B(Holder.F, Arcs, Updates);
-    DominatorTree DT(*Holder.F);
-    EXPECT_TRUE(DT.verify());
-    PostDominatorTree PDT(*Holder.F);
-    EXPECT_TRUE(PDT.verify());
-
-    Optional<CFGBuilder::Update> LastUpdate;
-    while ((LastUpdate = B.applyUpdate())) {
-      BasicBlock *From = B.getOrAddBlock(LastUpdate->Edge.From);
-      BasicBlock *To = B.getOrAddBlock(LastUpdate->Edge.To);
-      if (LastUpdate->Action == Insert) {
-        DT.insertEdge(From, To);
-        PDT.insertEdge(From, To);
-      } else {
-        DT.deleteEdge(From, To);
-        PDT.deleteEdge(From, To);
-      }
-
-      EXPECT_TRUE(DT.verify());
-      EXPECT_TRUE(PDT.verify());
-    }
-  }
-}
-
-TEST(DominatorTree, InsertIntoIrreducible) {
-  std::vector<CFGBuilder::Arc> Arcs = {
-      {"0", "1"},
-      {"1", "27"}, {"1", "7"},
-      {"10", "18"},
-      {"13", "10"},
-      {"18", "13"}, {"18", "23"},
-      {"23", "13"}, {"23", "24"},
-      {"24", "1"}, {"24", "18"},
-      {"27", "24"}};
-
-  CFGHolder Holder;
-  CFGBuilder B(Holder.F, Arcs, {{Insert, {"7", "23"}}});
-  DominatorTree DT(*Holder.F);
-  EXPECT_TRUE(DT.verify());
-
-  B.applyUpdate();
-  BasicBlock *From = B.getOrAddBlock("7");
-  BasicBlock *To = B.getOrAddBlock("23");
-  DT.insertEdge(From, To);
-
-  EXPECT_TRUE(DT.verify());
-}
-
-TEST(DominatorTree, EdgeDomination) {
-  StringRef ModuleString = "define i32 @f(i1 %cond) {\n"
-                           " bb0:\n"
-                           "   br i1 %cond, label %bb1, label %bb2\n"
-                           " bb1:\n"
-                           "   br label %bb3\n"
-                           " bb2:\n"
-                           "   br label %bb3\n"
-                           " bb3:\n"
-                           "   ret i32 4"
-                           "}\n";
-
-  // Parse the module.
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  runWithDomTree(*M, "f",
-                 [&](Function &F, DominatorTree *DT, PostDominatorTree *PDT) {
-    Function::iterator FI = F.begin();
-
-    BasicBlock *BB0 = &*FI++;
-    BasicBlock *BB1 = &*FI++;
-    BasicBlock *BB2 = &*FI++;
-    BasicBlock *BB3 = &*FI++;
-
-    BasicBlockEdge E01(BB0, BB1);
-    BasicBlockEdge E02(BB0, BB2);
-    BasicBlockEdge E13(BB1, BB3);
-    BasicBlockEdge E23(BB2, BB3);
-
-    EXPECT_TRUE(DT->dominates(E01, E01));
-    EXPECT_FALSE(DT->dominates(E01, E02));
-    EXPECT_TRUE(DT->dominates(E01, E13));
-    EXPECT_FALSE(DT->dominates(E01, E23));
-
-    EXPECT_FALSE(DT->dominates(E02, E01));
-    EXPECT_TRUE(DT->dominates(E02, E02));
-    EXPECT_FALSE(DT->dominates(E02, E13));
-    EXPECT_TRUE(DT->dominates(E02, E23));
-
-    EXPECT_FALSE(DT->dominates(E13, E01));
-    EXPECT_FALSE(DT->dominates(E13, E02));
-    EXPECT_TRUE(DT->dominates(E13, E13));
-    EXPECT_FALSE(DT->dominates(E13, E23));
-
-    EXPECT_FALSE(DT->dominates(E23, E01));
-    EXPECT_FALSE(DT->dominates(E23, E02));
-    EXPECT_FALSE(DT->dominates(E23, E13));
-    EXPECT_TRUE(DT->dominates(E23, E23));
-  });
-}
-
-TEST(DominatorTree, ValueDomination) {
-  StringRef ModuleString = R"(
-    @foo = global i8 0
-    define i8 @f(i8 %arg) {
-      ret i8 %arg
-    }
-  )";
-
-  LLVMContext Context;
-  std::unique_ptr<Module> M = makeLLVMModule(Context, ModuleString);
-
-  runWithDomTree(*M, "f",
-                 [&](Function &F, DominatorTree *DT, PostDominatorTree *PDT) {
-    Argument *A = F.getArg(0);
-    GlobalValue *G = M->getNamedValue("foo");
-    Constant *C = ConstantInt::getNullValue(Type::getInt8Ty(Context));
-
-    Instruction *I = F.getEntryBlock().getTerminator();
-    EXPECT_TRUE(DT->dominates(A, I));
-    EXPECT_TRUE(DT->dominates(G, I));
-    EXPECT_TRUE(DT->dominates(C, I));
-
-    const Use &U = I->getOperandUse(0);
-    EXPECT_TRUE(DT->dominates(A, U));
-    EXPECT_TRUE(DT->dominates(G, U));
-    EXPECT_TRUE(DT->dominates(C, U));
-  });
-}
diff --git a/gnu/llvm/llvm/unittests/IR/FunctionTest.cpp b/gnu/llvm/llvm/unittests/IR/FunctionTest.cpp
deleted file mode 100644
index 0ecba35c329..00000000000
--- a/gnu/llvm/llvm/unittests/IR/FunctionTest.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-//===- FunctionTest.cpp - Function unit tests -----------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/IR/Function.h"
-#include "llvm/IR/Module.h"
-#include "gtest/gtest.h"
-using namespace llvm;
-
-namespace {
-
-TEST(FunctionTest, hasLazyArguments) {
-  LLVMContext C;
-
-  Type *ArgTypes[] = {Type::getInt8Ty(C), Type::getInt32Ty(C)};
-  FunctionType *FTy = FunctionType::get(Type::getVoidTy(C), ArgTypes, false);
-
-  // Functions start out with lazy arguments.
-  std::unique_ptr<Function> F(
-      Function::Create(FTy, GlobalValue::ExternalLinkage, "F"));
-  EXPECT_TRUE(F->hasLazyArguments());
-
-  // Checking for empty or size shouldn't force arguments to be instantiated.
-  EXPECT_FALSE(F->arg_empty());
-  EXPECT_TRUE(F->hasLazyArguments());
-  EXPECT_EQ(2u, F->arg_size());
-  EXPECT_TRUE(F->hasLazyArguments());
-
-  // The argument list should be populated at first access.
-  (void)F->arg_begin();
-  EXPECT_FALSE(F->hasLazyArguments());
-
-  // Checking that getArg gets the arguments from F1 in the correct order.
-  unsigned i = 0;
-  for (Argument &A : F->args()) {
-    EXPECT_EQ(&A, F->getArg(i));
-    ++i;
-  }
-  EXPECT_FALSE(F->hasLazyArguments());
-}
-
-TEST(FunctionTest, stealArgumentListFrom) {
-  LLVMContext C;
-
-  Type *ArgTypes[] = {Type::getInt8Ty(C), Type::getInt32Ty(C)};
-  FunctionType *FTy = FunctionType::get(Type::getVoidTy(C), ArgTypes, false);
-  std::unique_ptr<Function> F1(
-      Function::Create(FTy, GlobalValue::ExternalLinkage, "F1"));
-  std::unique_ptr<Function> F2(
-      Function::Create(FTy, GlobalValue::ExternalLinkage, "F1"));
-  EXPECT_TRUE(F1->hasLazyArguments());
-  EXPECT_TRUE(F2->hasLazyArguments());
-
-  // Steal arguments before they've been accessed.  Nothing should change; both
-  // functions should still have lazy arguments.
-  //
-  //   steal(empty); drop (empty)
-  F1->stealArgumentListFrom(*F2);
-  EXPECT_TRUE(F1->hasLazyArguments());
-  EXPECT_TRUE(F2->hasLazyArguments());
-
-  // Save arguments from F1 for later assertions.  F1 won't have lazy arguments
-  // anymore.
-  SmallVector<Argument *, 4> Args;
-  for (Argument &A : F1->args())
-    Args.push_back(&A);
-  EXPECT_EQ(2u, Args.size());
-  EXPECT_FALSE(F1->hasLazyArguments());
-
-  // Steal arguments from F1 to F2.  F1's arguments should be lazy again.
-  //
-  //   steal(real); drop (empty)
-  F2->stealArgumentListFrom(*F1);
-  EXPECT_TRUE(F1->hasLazyArguments());
-  EXPECT_FALSE(F2->hasLazyArguments());
-  unsigned I = 0;
-  for (Argument &A : F2->args()) {
-    EXPECT_EQ(Args[I], &A);
-    I++;
-  }
-  EXPECT_EQ(2u, I);
-
-  // Check that arguments in F1 don't have pointer equality with the saved ones.
-  // This also instantiates F1's arguments.
-  I = 0;
-  for (Argument &A : F1->args()) {
-    EXPECT_NE(Args[I], &A);
-    I++;
-  }
-  EXPECT_EQ(2u, I);
-  EXPECT_FALSE(F1->hasLazyArguments());
-  EXPECT_FALSE(F2->hasLazyArguments());
-
-  // Steal back from F2.  F2's arguments should be lazy again.
-  //
-  //   steal(real); drop (real)
-  F1->stealArgumentListFrom(*F2);
-  EXPECT_FALSE(F1->hasLazyArguments());
-  EXPECT_TRUE(F2->hasLazyArguments());
-  I = 0;
-  for (Argument &A : F1->args()) {
-    EXPECT_EQ(Args[I], &A);
-    I++;
-  }
-  EXPECT_EQ(2u, I);
-
-  // Steal from F2 a second time.  Now both functions should have lazy
-  // arguments.
-  //
-  //   steal(empty); drop (real)
-  F1->stealArgumentListFrom(*F2);
-  EXPECT_TRUE(F1->hasLazyArguments());
-  EXPECT_TRUE(F2->hasLazyArguments());
-}
-
-// Test setting and removing section information
-TEST(FunctionTest, setSection) {
-  LLVMContext C;
-  Module M("test", C);
-
-  llvm::Function *F =
-      Function::Create(llvm::FunctionType::get(llvm::Type::getVoidTy(C), false),
-                       llvm::GlobalValue::ExternalLinkage, "F", &M);
-
-  F->setSection(".text.test");
-  EXPECT_TRUE(F->getSection() == ".text.test");
-  EXPECT_TRUE(F->hasSection());
-  F->setSection("");
-  EXPECT_FALSE(F->hasSection());
-  F->setSection(".text.test");
-  F->setSection(".text.test2");
-  EXPECT_TRUE(F->getSection() == ".text.test2");
-  EXPECT_TRUE(F->hasSection());
-}
-
-TEST(FunctionTest, GetPointerAlignment) {
-  LLVMContext Context;
-  Type *VoidType(Type::getVoidTy(Context));
-  FunctionType *FuncType(FunctionType::get(VoidType, false));
-  std::unique_ptr<Function> Func(Function::Create(
-      FuncType, GlobalValue::ExternalLinkage));
-  EXPECT_EQ(Align(1), Func->getPointerAlignment(DataLayout("")));
-  EXPECT_EQ(Align(1), Func->getPointerAlignment(DataLayout("Fi8")));
-  EXPECT_EQ(Align(1), Func->getPointerAlignment(DataLayout("Fn8")));
-  EXPECT_EQ(Align(2), Func->getPointerAlignment(DataLayout("Fi16")));
-  EXPECT_EQ(Align(2), Func->getPointerAlignment(DataLayout("Fn16")));
-  EXPECT_EQ(Align(4), Func->getPointerAlignment(DataLayout("Fi32")));
-  EXPECT_EQ(Align(4), Func->getPointerAlignment(DataLayout("Fn32")));
-
-  Func->setAlignment(Align(4));
-
-  EXPECT_EQ(Align(1), Func->getPointerAlignment(DataLayout("")));
-  EXPECT_EQ(Align(1), Func->getPointerAlignment(DataLayout("Fi8")));
-  EXPECT_EQ(Align(4), Func->getPointerAlignment(DataLayout("Fn8")));
-  EXPECT_EQ(Align(2), Func->getPointerAlignment(DataLayout("Fi16")));
-  EXPECT_EQ(Align(4), Func->getPointerAlignment(DataLayout("Fn16")));
-  EXPECT_EQ(Align(4), Func->getPointerAlignment(DataLayout("Fi32")));
-  EXPECT_EQ(Align(4), Func->getPointerAlignment(DataLayout("Fn32")));
-}
-
-} // end namespace
diff --git a/gnu/llvm/llvm/unittests/IR/IRBuilderTest.cpp b/gnu/llvm/llvm/unittests/IR/IRBuilderTest.cpp
deleted file mode 100644
index a11b75fc881..00000000000
--- a/gnu/llvm/llvm/unittests/IR/IRBuilderTest.cpp
+++ /dev/null
@@ -1,1032 +0,0 @@
-//===- llvm/unittest/IR/IRBuilderTest.cpp - IRBuilder tests ---------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/BasicBlock.h"
-#include "llvm/IR/DIBuilder.h"
-#include "llvm/IR/DataLayout.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/IntrinsicInst.h"
-#include "llvm/IR/IntrinsicsAArch64.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/MDBuilder.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/NoFolder.h"
-#include "llvm/IR/Verifier.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-class IRBuilderTest : public testing::Test {
-protected:
-  void SetUp() override {
-    M.reset(new Module("MyModule", Ctx));
-    FunctionType *FTy = FunctionType::get(Type::getVoidTy(Ctx),
-                                          /*isVarArg=*/false);
-    F = Function::Create(FTy, Function::ExternalLinkage, "", M.get());
-    BB = BasicBlock::Create(Ctx, "", F);
-    GV = new GlobalVariable(*M, Type::getFloatTy(Ctx), true,
-                            GlobalValue::ExternalLinkage, nullptr);
-  }
-
-  void TearDown() override {
-    BB = nullptr;
-    M.reset();
-  }
-
-  LLVMContext Ctx;
-  std::unique_ptr<Module> M;
-  Function *F;
-  BasicBlock *BB;
-  GlobalVariable *GV;
-};
-
-TEST_F(IRBuilderTest, Intrinsics) {
-  IRBuilder<> Builder(BB);
-  Value *V;
-  Instruction *I;
-  CallInst *Call;
-  IntrinsicInst *II;
-
-  V = Builder.CreateLoad(GV->getValueType(), GV);
-  I = cast<Instruction>(Builder.CreateFAdd(V, V));
-  I->setHasNoInfs(true);
-  I->setHasNoNaNs(false);
-
-  Call = Builder.CreateMinNum(V, V);
-  II = cast<IntrinsicInst>(Call);
-  EXPECT_EQ(II->getIntrinsicID(), Intrinsic::minnum);
-
-  Call = Builder.CreateMaxNum(V, V);
-  II = cast<IntrinsicInst>(Call);
-  EXPECT_EQ(II->getIntrinsicID(), Intrinsic::maxnum);
-
-  Call = Builder.CreateMinimum(V, V);
-  II = cast<IntrinsicInst>(Call);
-  EXPECT_EQ(II->getIntrinsicID(), Intrinsic::minimum);
-
-  Call = Builder.CreateMaximum(V, V);
-  II = cast<IntrinsicInst>(Call);
-  EXPECT_EQ(II->getIntrinsicID(), Intrinsic::maximum);
-
-  Call = Builder.CreateIntrinsic(Intrinsic::readcyclecounter, {}, {});
-  II = cast<IntrinsicInst>(Call);
-  EXPECT_EQ(II->getIntrinsicID(), Intrinsic::readcyclecounter);
-
-  Call = Builder.CreateUnaryIntrinsic(Intrinsic::fabs, V);
-  II = cast<IntrinsicInst>(Call);
-  EXPECT_EQ(II->getIntrinsicID(), Intrinsic::fabs);
-  EXPECT_FALSE(II->hasNoInfs());
-  EXPECT_FALSE(II->hasNoNaNs());
-
-  Call = Builder.CreateUnaryIntrinsic(Intrinsic::fabs, V, I);
-  II = cast<IntrinsicInst>(Call);
-  EXPECT_EQ(II->getIntrinsicID(), Intrinsic::fabs);
-  EXPECT_TRUE(II->hasNoInfs());
-  EXPECT_FALSE(II->hasNoNaNs());
-
-  Call = Builder.CreateBinaryIntrinsic(Intrinsic::pow, V, V);
-  II = cast<IntrinsicInst>(Call);
-  EXPECT_EQ(II->getIntrinsicID(), Intrinsic::pow);
-  EXPECT_FALSE(II->hasNoInfs());
-  EXPECT_FALSE(II->hasNoNaNs());
-
-  Call = Builder.CreateBinaryIntrinsic(Intrinsic::pow, V, V, I);
-  II = cast<IntrinsicInst>(Call);
-  EXPECT_EQ(II->getIntrinsicID(), Intrinsic::pow);
-  EXPECT_TRUE(II->hasNoInfs());
-  EXPECT_FALSE(II->hasNoNaNs());
-
-  Call = Builder.CreateIntrinsic(Intrinsic::fma, {V->getType()}, {V, V, V});
-  II = cast<IntrinsicInst>(Call);
-  EXPECT_EQ(II->getIntrinsicID(), Intrinsic::fma);
-  EXPECT_FALSE(II->hasNoInfs());
-  EXPECT_FALSE(II->hasNoNaNs());
-
-  Call = Builder.CreateIntrinsic(Intrinsic::fma, {V->getType()}, {V, V, V}, I);
-  II = cast<IntrinsicInst>(Call);
-  EXPECT_EQ(II->getIntrinsicID(), Intrinsic::fma);
-  EXPECT_TRUE(II->hasNoInfs());
-  EXPECT_FALSE(II->hasNoNaNs());
-
-  Call = Builder.CreateIntrinsic(Intrinsic::fma, {V->getType()}, {V, V, V}, I);
-  II = cast<IntrinsicInst>(Call);
-  EXPECT_EQ(II->getIntrinsicID(), Intrinsic::fma);
-  EXPECT_TRUE(II->hasNoInfs());
-  EXPECT_FALSE(II->hasNoNaNs());
-
-  Call = Builder.CreateUnaryIntrinsic(Intrinsic::roundeven, V);
-  II = cast<IntrinsicInst>(Call);
-  EXPECT_EQ(II->getIntrinsicID(), Intrinsic::roundeven);
-  EXPECT_FALSE(II->hasNoInfs());
-  EXPECT_FALSE(II->hasNoNaNs());
-
-  Call = Builder.CreateIntrinsic(
-      Intrinsic::set_rounding, {},
-      {Builder.getInt32(static_cast<uint32_t>(RoundingMode::TowardZero))});
-  II = cast<IntrinsicInst>(Call);
-  EXPECT_EQ(II->getIntrinsicID(), Intrinsic::set_rounding);
-}
-
-TEST_F(IRBuilderTest, IntrinsicsWithScalableVectors) {
-  IRBuilder<> Builder(BB);
-  CallInst *Call;
-  FunctionType *FTy;
-
-  // Test scalable flag isn't dropped for intrinsic that is explicitly defined
-  // with scalable vectors, e.g. LLVMType<nxv4i32>.
-  Type *SrcVecTy = VectorType::get(Builder.getHalfTy(), 8, true);
-  Type *DstVecTy = VectorType::get(Builder.getInt32Ty(), 4, true);
-  Type *PredTy = VectorType::get(Builder.getInt1Ty(), 4, true);
-
-  SmallVector<Value*, 3> ArgTys;
-  ArgTys.push_back(UndefValue::get(DstVecTy));
-  ArgTys.push_back(UndefValue::get(PredTy));
-  ArgTys.push_back(UndefValue::get(SrcVecTy));
-
-  Call = Builder.CreateIntrinsic(Intrinsic::aarch64_sve_fcvtzs_i32f16, {},
-                                 ArgTys, nullptr, "aarch64.sve.fcvtzs.i32f16");
-  FTy = Call->getFunctionType();
-  EXPECT_EQ(FTy->getReturnType(), DstVecTy);
-  for (unsigned i = 0; i != ArgTys.size(); ++i)
-    EXPECT_EQ(FTy->getParamType(i), ArgTys[i]->getType());
-
-  // Test scalable flag isn't dropped for intrinsic defined with
-  // LLVMScalarOrSameVectorWidth.
-
-  Type *VecTy = VectorType::get(Builder.getInt32Ty(), 4, true);
-  Type *PtrToVecTy = VecTy->getPointerTo();
-  PredTy = VectorType::get(Builder.getInt1Ty(), 4, true);
-
-  ArgTys.clear();
-  ArgTys.push_back(UndefValue::get(PtrToVecTy));
-  ArgTys.push_back(UndefValue::get(Builder.getInt32Ty()));
-  ArgTys.push_back(UndefValue::get(PredTy));
-  ArgTys.push_back(UndefValue::get(VecTy));
-
-  Call = Builder.CreateIntrinsic(Intrinsic::masked_load,
-                                 {VecTy, PtrToVecTy}, ArgTys,
-                                 nullptr, "masked.load");
-  FTy = Call->getFunctionType();
-  EXPECT_EQ(FTy->getReturnType(), VecTy);
-  for (unsigned i = 0; i != ArgTys.size(); ++i)
-    EXPECT_EQ(FTy->getParamType(i), ArgTys[i]->getType());
-}
-
-TEST_F(IRBuilderTest, CreateVScale) {
-  IRBuilder<> Builder(BB);
-
-  Constant *Zero = Builder.getInt32(0);
-  Value *VScale = Builder.CreateVScale(Zero);
-  EXPECT_TRUE(isa<ConstantInt>(VScale) && cast<ConstantInt>(VScale)->isZero());
-}
-
-TEST_F(IRBuilderTest, CreateStepVector) {
-  IRBuilder<> Builder(BB);
-
-  // Fixed width vectors
-  Type *DstVecTy = VectorType::get(Builder.getInt32Ty(), 4, false);
-  Value *StepVec = Builder.CreateStepVector(DstVecTy);
-  EXPECT_TRUE(isa<Constant>(StepVec));
-  EXPECT_EQ(StepVec->getType(), DstVecTy);
-
-  const auto *VectorValue = cast<Constant>(StepVec);
-  for (unsigned i = 0; i < 4; i++) {
-    EXPECT_TRUE(isa<ConstantInt>(VectorValue->getAggregateElement(i)));
-    ConstantInt *El = cast<ConstantInt>(VectorValue->getAggregateElement(i));
-    EXPECT_EQ(El->getValue(), i);
-  }
-
-  // Scalable vectors
-  DstVecTy = VectorType::get(Builder.getInt32Ty(), 4, true);
-  StepVec = Builder.CreateStepVector(DstVecTy);
-  EXPECT_TRUE(isa<CallInst>(StepVec));
-  CallInst *Call = cast<CallInst>(StepVec);
-  FunctionType *FTy = Call->getFunctionType();
-  EXPECT_EQ(FTy->getReturnType(), DstVecTy);
-  EXPECT_EQ(Call->getIntrinsicID(), Intrinsic::experimental_stepvector);
-}
-
-TEST_F(IRBuilderTest, ConstrainedFP) {
-  IRBuilder<> Builder(BB);
-  Value *V;
-  Value *VDouble;
-  Value *VInt;
-  CallInst *Call;
-  IntrinsicInst *II;
-  GlobalVariable *GVDouble = new GlobalVariable(*M, Type::getDoubleTy(Ctx),
-                            true, GlobalValue::ExternalLinkage, nullptr);
-
-  V = Builder.CreateLoad(GV->getValueType(), GV);
-  VDouble = Builder.CreateLoad(GVDouble->getValueType(), GVDouble);
-
-  // See if we get constrained intrinsics instead of non-constrained
-  // instructions.
-  Builder.setIsFPConstrained(true);
-  auto Parent = BB->getParent();
-  Parent->addFnAttr(Attribute::StrictFP);
-
-  V = Builder.CreateFAdd(V, V);
-  ASSERT_TRUE(isa<IntrinsicInst>(V));
-  II = cast<IntrinsicInst>(V);
-  EXPECT_EQ(II->getIntrinsicID(), Intrinsic::experimental_constrained_fadd);
-
-  V = Builder.CreateFSub(V, V);
-  ASSERT_TRUE(isa<IntrinsicInst>(V));
-  II = cast<IntrinsicInst>(V);
-  EXPECT_EQ(II->getIntrinsicID(), Intrinsic::experimental_constrained_fsub);
-
-  V = Builder.CreateFMul(V, V);
-  ASSERT_TRUE(isa<IntrinsicInst>(V));
-  II = cast<IntrinsicInst>(V);
-  EXPECT_EQ(II->getIntrinsicID(), Intrinsic::experimental_constrained_fmul);
-  
-  V = Builder.CreateFDiv(V, V);
-  ASSERT_TRUE(isa<IntrinsicInst>(V));
-  II = cast<IntrinsicInst>(V);
-  EXPECT_EQ(II->getIntrinsicID(), Intrinsic::experimental_constrained_fdiv);
-  
-  V = Builder.CreateFRem(V, V);
-  ASSERT_TRUE(isa<IntrinsicInst>(V));
-  II = cast<IntrinsicInst>(V);
-  EXPECT_EQ(II->getIntrinsicID(), Intrinsic::experimental_constrained_frem);
-
-  VInt = Builder.CreateFPToUI(VDouble, Builder.getInt32Ty());
-  ASSERT_TRUE(isa<IntrinsicInst>(VInt));
-  II = cast<IntrinsicInst>(VInt);
-  EXPECT_EQ(II->getIntrinsicID(), Intrinsic::experimental_constrained_fptoui);
-
-  VInt = Builder.CreateFPToSI(VDouble, Builder.getInt32Ty());
-  ASSERT_TRUE(isa<IntrinsicInst>(VInt));
-  II = cast<IntrinsicInst>(VInt);
-  EXPECT_EQ(II->getIntrinsicID(), Intrinsic::experimental_constrained_fptosi);
-
-  VDouble = Builder.CreateUIToFP(VInt, Builder.getDoubleTy());
-  ASSERT_TRUE(isa<IntrinsicInst>(VDouble));
-  II = cast<IntrinsicInst>(VDouble);
-  EXPECT_EQ(II->getIntrinsicID(), Intrinsic::experimental_constrained_uitofp);
-
-  VDouble = Builder.CreateSIToFP(VInt, Builder.getDoubleTy());
-  ASSERT_TRUE(isa<IntrinsicInst>(VDouble));
-  II = cast<IntrinsicInst>(VDouble);
-  EXPECT_EQ(II->getIntrinsicID(), Intrinsic::experimental_constrained_sitofp);
-
-  V = Builder.CreateFPTrunc(VDouble, Type::getFloatTy(Ctx));
-  ASSERT_TRUE(isa<IntrinsicInst>(V));
-  II = cast<IntrinsicInst>(V);
-  EXPECT_EQ(II->getIntrinsicID(), Intrinsic::experimental_constrained_fptrunc);
-
-  VDouble = Builder.CreateFPExt(V, Type::getDoubleTy(Ctx));
-  ASSERT_TRUE(isa<IntrinsicInst>(VDouble));
-  II = cast<IntrinsicInst>(VDouble);
-  EXPECT_EQ(II->getIntrinsicID(), Intrinsic::experimental_constrained_fpext);
-
-  // Verify attributes on the call are created automatically.
-  AttributeSet CallAttrs = II->getAttributes().getFnAttributes();
-  EXPECT_EQ(CallAttrs.hasAttribute(Attribute::StrictFP), true);
-
-  // Verify attributes on the containing function are created when requested.
-  Builder.setConstrainedFPFunctionAttr();
-  AttributeList Attrs = BB->getParent()->getAttributes();
-  AttributeSet FnAttrs = Attrs.getFnAttributes();
-  EXPECT_EQ(FnAttrs.hasAttribute(Attribute::StrictFP), true);
-
-  // Verify the codepaths for setting and overriding the default metadata.
-  V = Builder.CreateFAdd(V, V);
-  ASSERT_TRUE(isa<ConstrainedFPIntrinsic>(V));
-  auto *CII = cast<ConstrainedFPIntrinsic>(V);
-  EXPECT_EQ(fp::ebStrict, CII->getExceptionBehavior());
-  EXPECT_EQ(RoundingMode::Dynamic, CII->getRoundingMode());
-
-  Builder.setDefaultConstrainedExcept(fp::ebIgnore);
-  Builder.setDefaultConstrainedRounding(RoundingMode::TowardPositive);
-  V = Builder.CreateFAdd(V, V);
-  CII = cast<ConstrainedFPIntrinsic>(V);
-  EXPECT_EQ(fp::ebIgnore, CII->getExceptionBehavior());
-  EXPECT_EQ(CII->getRoundingMode(), RoundingMode::TowardPositive);
-
-  Builder.setDefaultConstrainedExcept(fp::ebIgnore);
-  Builder.setDefaultConstrainedRounding(RoundingMode::NearestTiesToEven);
-  V = Builder.CreateFAdd(V, V);
-  CII = cast<ConstrainedFPIntrinsic>(V);
-  EXPECT_EQ(fp::ebIgnore, CII->getExceptionBehavior());
-  EXPECT_EQ(RoundingMode::NearestTiesToEven, CII->getRoundingMode());
-
-  Builder.setDefaultConstrainedExcept(fp::ebMayTrap);
-  Builder.setDefaultConstrainedRounding(RoundingMode::TowardNegative);
-  V = Builder.CreateFAdd(V, V);
-  CII = cast<ConstrainedFPIntrinsic>(V);
-  EXPECT_EQ(fp::ebMayTrap, CII->getExceptionBehavior());
-  EXPECT_EQ(RoundingMode::TowardNegative, CII->getRoundingMode());
-
-  Builder.setDefaultConstrainedExcept(fp::ebStrict);
-  Builder.setDefaultConstrainedRounding(RoundingMode::TowardZero);
-  V = Builder.CreateFAdd(V, V);
-  CII = cast<ConstrainedFPIntrinsic>(V);
-  EXPECT_EQ(fp::ebStrict, CII->getExceptionBehavior());
-  EXPECT_EQ(RoundingMode::TowardZero, CII->getRoundingMode());
-
-  Builder.setDefaultConstrainedExcept(fp::ebIgnore);
-  Builder.setDefaultConstrainedRounding(RoundingMode::Dynamic);
-  V = Builder.CreateFAdd(V, V);
-  CII = cast<ConstrainedFPIntrinsic>(V);
-  EXPECT_EQ(fp::ebIgnore, CII->getExceptionBehavior());
-  EXPECT_EQ(RoundingMode::Dynamic, CII->getRoundingMode());
-
-  // Now override the defaults.
-  Call = Builder.CreateConstrainedFPBinOp(
-        Intrinsic::experimental_constrained_fadd, V, V, nullptr, "", nullptr,
-        RoundingMode::TowardNegative, fp::ebMayTrap);
-  CII = cast<ConstrainedFPIntrinsic>(Call);
-  EXPECT_EQ(CII->getIntrinsicID(), Intrinsic::experimental_constrained_fadd);
-  EXPECT_EQ(fp::ebMayTrap, CII->getExceptionBehavior());
-  EXPECT_EQ(RoundingMode::TowardNegative, CII->getRoundingMode());
-
-  Builder.CreateRetVoid();
-  EXPECT_FALSE(verifyModule(*M));
-}
-
-TEST_F(IRBuilderTest, ConstrainedFPIntrinsics) {
-  IRBuilder<> Builder(BB);
-  Value *V;
-  Value *VDouble;
-  ConstrainedFPIntrinsic *CII;
-  GlobalVariable *GVDouble = new GlobalVariable(
-      *M, Type::getDoubleTy(Ctx), true, GlobalValue::ExternalLinkage, nullptr);
-  VDouble = Builder.CreateLoad(GVDouble->getValueType(), GVDouble);
-
-  Builder.setDefaultConstrainedExcept(fp::ebStrict);
-  Builder.setDefaultConstrainedRounding(RoundingMode::TowardZero);
-  Function *Fn = Intrinsic::getDeclaration(M.get(),
-      Intrinsic::experimental_constrained_roundeven, { Type::getDoubleTy(Ctx) });
-  V = Builder.CreateConstrainedFPCall(Fn, { VDouble });
-  CII = cast<ConstrainedFPIntrinsic>(V);
-  EXPECT_EQ(Intrinsic::experimental_constrained_roundeven, CII->getIntrinsicID());
-  EXPECT_EQ(fp::ebStrict, CII->getExceptionBehavior());
-}
-
-TEST_F(IRBuilderTest, ConstrainedFPFunctionCall) {
-  IRBuilder<> Builder(BB);
-
-  // Create an empty constrained FP function.
-  FunctionType *FTy = FunctionType::get(Type::getVoidTy(Ctx),
-                                        /*isVarArg=*/false);
-  Function *Callee =
-      Function::Create(FTy, Function::ExternalLinkage, "", M.get());
-  BasicBlock *CalleeBB = BasicBlock::Create(Ctx, "", Callee);
-  IRBuilder<> CalleeBuilder(CalleeBB);
-  CalleeBuilder.setIsFPConstrained(true);
-  CalleeBuilder.setConstrainedFPFunctionAttr();
-  CalleeBuilder.CreateRetVoid();
-
-  // Now call the empty constrained FP function.
-  Builder.setIsFPConstrained(true);
-  Builder.setConstrainedFPFunctionAttr();
-  CallInst *FCall = Builder.CreateCall(Callee, None);
-
-  // Check the attributes to verify the strictfp attribute is on the call.
-  EXPECT_TRUE(FCall->getAttributes().getFnAttributes().hasAttribute(
-      Attribute::StrictFP));
-
-  Builder.CreateRetVoid();
-  EXPECT_FALSE(verifyModule(*M));
-}
-
-TEST_F(IRBuilderTest, Lifetime) {
-  IRBuilder<> Builder(BB);
-  AllocaInst *Var1 = Builder.CreateAlloca(Builder.getInt8Ty());
-  AllocaInst *Var2 = Builder.CreateAlloca(Builder.getInt32Ty());
-  AllocaInst *Var3 = Builder.CreateAlloca(Builder.getInt8Ty(),
-                                          Builder.getInt32(123));
-
-  CallInst *Start1 = Builder.CreateLifetimeStart(Var1);
-  CallInst *Start2 = Builder.CreateLifetimeStart(Var2);
-  CallInst *Start3 = Builder.CreateLifetimeStart(Var3, Builder.getInt64(100));
-
-  EXPECT_EQ(Start1->getArgOperand(0), Builder.getInt64(-1));
-  EXPECT_EQ(Start2->getArgOperand(0), Builder.getInt64(-1));
-  EXPECT_EQ(Start3->getArgOperand(0), Builder.getInt64(100));
-
-  EXPECT_EQ(Start1->getArgOperand(1), Var1);
-  EXPECT_NE(Start2->getArgOperand(1), Var2);
-  EXPECT_EQ(Start3->getArgOperand(1), Var3);
-
-  Value *End1 = Builder.CreateLifetimeEnd(Var1);
-  Builder.CreateLifetimeEnd(Var2);
-  Builder.CreateLifetimeEnd(Var3);
-
-  IntrinsicInst *II_Start1 = dyn_cast<IntrinsicInst>(Start1);
-  IntrinsicInst *II_End1 = dyn_cast<IntrinsicInst>(End1);
-  ASSERT_TRUE(II_Start1 != nullptr);
-  EXPECT_EQ(II_Start1->getIntrinsicID(), Intrinsic::lifetime_start);
-  ASSERT_TRUE(II_End1 != nullptr);
-  EXPECT_EQ(II_End1->getIntrinsicID(), Intrinsic::lifetime_end);
-}
-
-TEST_F(IRBuilderTest, CreateCondBr) {
-  IRBuilder<> Builder(BB);
-  BasicBlock *TBB = BasicBlock::Create(Ctx, "", F);
-  BasicBlock *FBB = BasicBlock::Create(Ctx, "", F);
-
-  BranchInst *BI = Builder.CreateCondBr(Builder.getTrue(), TBB, FBB);
-  Instruction *TI = BB->getTerminator();
-  EXPECT_EQ(BI, TI);
-  EXPECT_EQ(2u, TI->getNumSuccessors());
-  EXPECT_EQ(TBB, TI->getSuccessor(0));
-  EXPECT_EQ(FBB, TI->getSuccessor(1));
-
-  BI->eraseFromParent();
-  MDNode *Weights = MDBuilder(Ctx).createBranchWeights(42, 13);
-  BI = Builder.CreateCondBr(Builder.getTrue(), TBB, FBB, Weights);
-  TI = BB->getTerminator();
-  EXPECT_EQ(BI, TI);
-  EXPECT_EQ(2u, TI->getNumSuccessors());
-  EXPECT_EQ(TBB, TI->getSuccessor(0));
-  EXPECT_EQ(FBB, TI->getSuccessor(1));
-  EXPECT_EQ(Weights, TI->getMetadata(LLVMContext::MD_prof));
-}
-
-TEST_F(IRBuilderTest, LandingPadName) {
-  IRBuilder<> Builder(BB);
-  LandingPadInst *LP = Builder.CreateLandingPad(Builder.getInt32Ty(), 0, "LP");
-  EXPECT_EQ(LP->getName(), "LP");
-}
-
-TEST_F(IRBuilderTest, DataLayout) {
-  std::unique_ptr<Module> M(new Module("test", Ctx));
-  M->setDataLayout("e-n32");
-  EXPECT_TRUE(M->getDataLayout().isLegalInteger(32));
-  M->setDataLayout("e");
-  EXPECT_FALSE(M->getDataLayout().isLegalInteger(32));
-}
-
-TEST_F(IRBuilderTest, GetIntTy) {
-  IRBuilder<> Builder(BB);
-  IntegerType *Ty1 = Builder.getInt1Ty();
-  EXPECT_EQ(Ty1, IntegerType::get(Ctx, 1));
-
-  DataLayout* DL = new DataLayout(M.get());
-  IntegerType *IntPtrTy = Builder.getIntPtrTy(*DL);
-  unsigned IntPtrBitSize =  DL->getPointerSizeInBits(0);
-  EXPECT_EQ(IntPtrTy, IntegerType::get(Ctx, IntPtrBitSize));
-  delete DL;
-}
-
-TEST_F(IRBuilderTest, UnaryOperators) {
-  IRBuilder<NoFolder> Builder(BB);
-  Value *V = Builder.CreateLoad(GV->getValueType(), GV);
-
-  // Test CreateUnOp(X)
-  Value *U = Builder.CreateUnOp(Instruction::FNeg, V);
-  ASSERT_TRUE(isa<Instruction>(U));
-  ASSERT_TRUE(isa<FPMathOperator>(U));
-  ASSERT_TRUE(isa<UnaryOperator>(U));
-  ASSERT_FALSE(isa<BinaryOperator>(U));
-
-  // Test CreateFNegFMF(X)
-  Instruction *I = cast<Instruction>(U);
-  I->setHasNoSignedZeros(true);
-  I->setHasNoNaNs(true);
-  Value *VFMF = Builder.CreateFNegFMF(V, I);
-  Instruction *IFMF = cast<Instruction>(VFMF);
-  EXPECT_TRUE(IFMF->hasNoSignedZeros());
-  EXPECT_TRUE(IFMF->hasNoNaNs());
-  EXPECT_FALSE(IFMF->hasAllowReassoc());
-}
-
-TEST_F(IRBuilderTest, FastMathFlags) {
-  IRBuilder<> Builder(BB);
-  Value *F, *FC;
-  Instruction *FDiv, *FAdd, *FCmp, *FCall;
-
-  F = Builder.CreateLoad(GV->getValueType(), GV);
-  F = Builder.CreateFAdd(F, F);
-
-  EXPECT_FALSE(Builder.getFastMathFlags().any());
-  ASSERT_TRUE(isa<Instruction>(F));
-  FAdd = cast<Instruction>(F);
-  EXPECT_FALSE(FAdd->hasNoNaNs());
-
-  FastMathFlags FMF;
-  Builder.setFastMathFlags(FMF);
-
-  // By default, no flags are set.
-  F = Builder.CreateFAdd(F, F);
-  EXPECT_FALSE(Builder.getFastMathFlags().any());
-  ASSERT_TRUE(isa<Instruction>(F));
-  FAdd = cast<Instruction>(F);
-  EXPECT_FALSE(FAdd->hasNoNaNs());
-  EXPECT_FALSE(FAdd->hasNoInfs());
-  EXPECT_FALSE(FAdd->hasNoSignedZeros());
-  EXPECT_FALSE(FAdd->hasAllowReciprocal());
-  EXPECT_FALSE(FAdd->hasAllowContract());
-  EXPECT_FALSE(FAdd->hasAllowReassoc());
-  EXPECT_FALSE(FAdd->hasApproxFunc());
-
-  // Set all flags in the instruction.
-  FAdd->setFast(true);
-  EXPECT_TRUE(FAdd->hasNoNaNs());
-  EXPECT_TRUE(FAdd->hasNoInfs());
-  EXPECT_TRUE(FAdd->hasNoSignedZeros());
-  EXPECT_TRUE(FAdd->hasAllowReciprocal());
-  EXPECT_TRUE(FAdd->hasAllowContract());
-  EXPECT_TRUE(FAdd->hasAllowReassoc());
-  EXPECT_TRUE(FAdd->hasApproxFunc());
-
-  // All flags are set in the builder.
-  FMF.setFast();
-  Builder.setFastMathFlags(FMF);
-
-  F = Builder.CreateFAdd(F, F);
-  EXPECT_TRUE(Builder.getFastMathFlags().any());
-  EXPECT_TRUE(Builder.getFastMathFlags().all());
-  ASSERT_TRUE(isa<Instruction>(F));
-  FAdd = cast<Instruction>(F);
-  EXPECT_TRUE(FAdd->hasNoNaNs());
-  EXPECT_TRUE(FAdd->isFast());
-
-  // Now, try it with CreateBinOp
-  F = Builder.CreateBinOp(Instruction::FAdd, F, F);
-  EXPECT_TRUE(Builder.getFastMathFlags().any());
-  ASSERT_TRUE(isa<Instruction>(F));
-  FAdd = cast<Instruction>(F);
-  EXPECT_TRUE(FAdd->hasNoNaNs());
-  EXPECT_TRUE(FAdd->isFast());
-
-  F = Builder.CreateFDiv(F, F);
-  EXPECT_TRUE(Builder.getFastMathFlags().all());
-  ASSERT_TRUE(isa<Instruction>(F));
-  FDiv = cast<Instruction>(F);
-  EXPECT_TRUE(FDiv->hasAllowReciprocal());
-
-  // Clear all FMF in the builder.
-  Builder.clearFastMathFlags();
-
-  F = Builder.CreateFDiv(F, F);
-  ASSERT_TRUE(isa<Instruction>(F));
-  FDiv = cast<Instruction>(F);
-  EXPECT_FALSE(FDiv->hasAllowReciprocal());
- 
-  // Try individual flags.
-  FMF.clear();
-  FMF.setAllowReciprocal();
-  Builder.setFastMathFlags(FMF);
-
-  F = Builder.CreateFDiv(F, F);
-  EXPECT_TRUE(Builder.getFastMathFlags().any());
-  EXPECT_TRUE(Builder.getFastMathFlags().AllowReciprocal);
-  ASSERT_TRUE(isa<Instruction>(F));
-  FDiv = cast<Instruction>(F);
-  EXPECT_TRUE(FDiv->hasAllowReciprocal());
-
-  Builder.clearFastMathFlags();
-
-  FC = Builder.CreateFCmpOEQ(F, F);
-  ASSERT_TRUE(isa<Instruction>(FC));
-  FCmp = cast<Instruction>(FC);
-  EXPECT_FALSE(FCmp->hasAllowReciprocal());
-
-  FMF.clear();
-  FMF.setAllowReciprocal();
-  Builder.setFastMathFlags(FMF);
-
-  FC = Builder.CreateFCmpOEQ(F, F);
-  EXPECT_TRUE(Builder.getFastMathFlags().any());
-  EXPECT_TRUE(Builder.getFastMathFlags().AllowReciprocal);
-  ASSERT_TRUE(isa<Instruction>(FC));
-  FCmp = cast<Instruction>(FC);
-  EXPECT_TRUE(FCmp->hasAllowReciprocal());
-
-  Builder.clearFastMathFlags();
-
-  // Test FP-contract
-  FC = Builder.CreateFAdd(F, F);
-  ASSERT_TRUE(isa<Instruction>(FC));
-  FAdd = cast<Instruction>(FC);
-  EXPECT_FALSE(FAdd->hasAllowContract());
-
-  FMF.clear();
-  FMF.setAllowContract(true);
-  Builder.setFastMathFlags(FMF);
-
-  FC = Builder.CreateFAdd(F, F);
-  EXPECT_TRUE(Builder.getFastMathFlags().any());
-  EXPECT_TRUE(Builder.getFastMathFlags().AllowContract);
-  ASSERT_TRUE(isa<Instruction>(FC));
-  FAdd = cast<Instruction>(FC);
-  EXPECT_TRUE(FAdd->hasAllowContract());
-
-  FMF.setApproxFunc();
-  Builder.clearFastMathFlags();
-  Builder.setFastMathFlags(FMF);
-  // Now 'aml' and 'contract' are set.
-  F = Builder.CreateFMul(F, F);
-  FAdd = cast<Instruction>(F);
-  EXPECT_TRUE(FAdd->hasApproxFunc());
-  EXPECT_TRUE(FAdd->hasAllowContract());
-  EXPECT_FALSE(FAdd->hasAllowReassoc());
-  
-  FMF.setAllowReassoc();
-  Builder.clearFastMathFlags();
-  Builder.setFastMathFlags(FMF);
-  // Now 'aml' and 'contract' and 'reassoc' are set.
-  F = Builder.CreateFMul(F, F);
-  FAdd = cast<Instruction>(F);
-  EXPECT_TRUE(FAdd->hasApproxFunc());
-  EXPECT_TRUE(FAdd->hasAllowContract());
-  EXPECT_TRUE(FAdd->hasAllowReassoc());
-
-  // Test a call with FMF.
-  auto CalleeTy = FunctionType::get(Type::getFloatTy(Ctx),
-                                    /*isVarArg=*/false);
-  auto Callee =
-      Function::Create(CalleeTy, Function::ExternalLinkage, "", M.get());
-
-  FCall = Builder.CreateCall(Callee, None);
-  EXPECT_FALSE(FCall->hasNoNaNs());
-
-  Function *V =
-      Function::Create(CalleeTy, Function::ExternalLinkage, "", M.get());
-  FCall = Builder.CreateCall(V, None);
-  EXPECT_FALSE(FCall->hasNoNaNs());
-
-  FMF.clear();
-  FMF.setNoNaNs();
-  Builder.setFastMathFlags(FMF);
-
-  FCall = Builder.CreateCall(Callee, None);
-  EXPECT_TRUE(Builder.getFastMathFlags().any());
-  EXPECT_TRUE(Builder.getFastMathFlags().NoNaNs);
-  EXPECT_TRUE(FCall->hasNoNaNs());
-
-  FCall = Builder.CreateCall(V, None);
-  EXPECT_TRUE(Builder.getFastMathFlags().any());
-  EXPECT_TRUE(Builder.getFastMathFlags().NoNaNs);
-  EXPECT_TRUE(FCall->hasNoNaNs());
-
-  Builder.clearFastMathFlags();
-
-  // To test a copy, make sure that a '0' and a '1' change state.
-  F = Builder.CreateFDiv(F, F);
-  ASSERT_TRUE(isa<Instruction>(F));
-  FDiv = cast<Instruction>(F);
-  EXPECT_FALSE(FDiv->getFastMathFlags().any());
-  FDiv->setHasAllowReciprocal(true);
-  FAdd->setHasAllowReciprocal(false);
-  FAdd->setHasNoNaNs(true);
-  FDiv->copyFastMathFlags(FAdd);
-  EXPECT_TRUE(FDiv->hasNoNaNs());
-  EXPECT_FALSE(FDiv->hasAllowReciprocal());
-
-}
-
-TEST_F(IRBuilderTest, WrapFlags) {
-  IRBuilder<NoFolder> Builder(BB);
-
-  // Test instructions.
-  GlobalVariable *G = new GlobalVariable(*M, Builder.getInt32Ty(), true,
-                                         GlobalValue::ExternalLinkage, nullptr);
-  Value *V = Builder.CreateLoad(G->getValueType(), G);
-  EXPECT_TRUE(
-      cast<BinaryOperator>(Builder.CreateNSWAdd(V, V))->hasNoSignedWrap());
-  EXPECT_TRUE(
-      cast<BinaryOperator>(Builder.CreateNSWMul(V, V))->hasNoSignedWrap());
-  EXPECT_TRUE(
-      cast<BinaryOperator>(Builder.CreateNSWSub(V, V))->hasNoSignedWrap());
-  EXPECT_TRUE(cast<BinaryOperator>(
-                  Builder.CreateShl(V, V, "", /* NUW */ false, /* NSW */ true))
-                  ->hasNoSignedWrap());
-
-  EXPECT_TRUE(
-      cast<BinaryOperator>(Builder.CreateNUWAdd(V, V))->hasNoUnsignedWrap());
-  EXPECT_TRUE(
-      cast<BinaryOperator>(Builder.CreateNUWMul(V, V))->hasNoUnsignedWrap());
-  EXPECT_TRUE(
-      cast<BinaryOperator>(Builder.CreateNUWSub(V, V))->hasNoUnsignedWrap());
-  EXPECT_TRUE(cast<BinaryOperator>(
-                  Builder.CreateShl(V, V, "", /* NUW */ true, /* NSW */ false))
-                  ->hasNoUnsignedWrap());
-
-  // Test operators created with constants.
-  Constant *C = Builder.getInt32(42);
-  EXPECT_TRUE(cast<OverflowingBinaryOperator>(Builder.CreateNSWAdd(C, C))
-                  ->hasNoSignedWrap());
-  EXPECT_TRUE(cast<OverflowingBinaryOperator>(Builder.CreateNSWSub(C, C))
-                  ->hasNoSignedWrap());
-  EXPECT_TRUE(cast<OverflowingBinaryOperator>(Builder.CreateNSWMul(C, C))
-                  ->hasNoSignedWrap());
-  EXPECT_TRUE(cast<OverflowingBinaryOperator>(
-                  Builder.CreateShl(C, C, "", /* NUW */ false, /* NSW */ true))
-                  ->hasNoSignedWrap());
-
-  EXPECT_TRUE(cast<OverflowingBinaryOperator>(Builder.CreateNUWAdd(C, C))
-                  ->hasNoUnsignedWrap());
-  EXPECT_TRUE(cast<OverflowingBinaryOperator>(Builder.CreateNUWSub(C, C))
-                  ->hasNoUnsignedWrap());
-  EXPECT_TRUE(cast<OverflowingBinaryOperator>(Builder.CreateNUWMul(C, C))
-                  ->hasNoUnsignedWrap());
-  EXPECT_TRUE(cast<OverflowingBinaryOperator>(
-                  Builder.CreateShl(C, C, "", /* NUW */ true, /* NSW */ false))
-                  ->hasNoUnsignedWrap());
-}
-
-TEST_F(IRBuilderTest, RAIIHelpersTest) {
-  IRBuilder<> Builder(BB);
-  EXPECT_FALSE(Builder.getFastMathFlags().allowReciprocal());
-  MDBuilder MDB(M->getContext());
-
-  MDNode *FPMathA = MDB.createFPMath(0.01f);
-  MDNode *FPMathB = MDB.createFPMath(0.1f);
-
-  Builder.setDefaultFPMathTag(FPMathA);
-
-  {
-    IRBuilder<>::FastMathFlagGuard Guard(Builder);
-    FastMathFlags FMF;
-    FMF.setAllowReciprocal();
-    Builder.setFastMathFlags(FMF);
-    Builder.setDefaultFPMathTag(FPMathB);
-    EXPECT_TRUE(Builder.getFastMathFlags().allowReciprocal());
-    EXPECT_EQ(FPMathB, Builder.getDefaultFPMathTag());
-  }
-
-  EXPECT_FALSE(Builder.getFastMathFlags().allowReciprocal());
-  EXPECT_EQ(FPMathA, Builder.getDefaultFPMathTag());
-
-  Value *F = Builder.CreateLoad(GV->getValueType(), GV);
-
-  {
-    IRBuilder<>::InsertPointGuard Guard(Builder);
-    Builder.SetInsertPoint(cast<Instruction>(F));
-    EXPECT_EQ(F, &*Builder.GetInsertPoint());
-  }
-
-  EXPECT_EQ(BB->end(), Builder.GetInsertPoint());
-  EXPECT_EQ(BB, Builder.GetInsertBlock());
-}
-
-TEST_F(IRBuilderTest, createFunction) {
-  IRBuilder<> Builder(BB);
-  DIBuilder DIB(*M);
-  auto File = DIB.createFile("error.swift", "/");
-  auto CU =
-      DIB.createCompileUnit(dwarf::DW_LANG_Swift, File, "swiftc", true, "", 0);
-  auto Type = DIB.createSubroutineType(DIB.getOrCreateTypeArray(None));
-  auto NoErr = DIB.createFunction(
-      CU, "noerr", "", File, 1, Type, 1, DINode::FlagZero,
-      DISubprogram::SPFlagDefinition | DISubprogram::SPFlagOptimized);
-  EXPECT_TRUE(!NoErr->getThrownTypes());
-  auto Int = DIB.createBasicType("Int", 64, dwarf::DW_ATE_signed);
-  auto Error = DIB.getOrCreateArray({Int});
-  auto Err = DIB.createFunction(
-      CU, "err", "", File, 1, Type, 1, DINode::FlagZero,
-      DISubprogram::SPFlagDefinition | DISubprogram::SPFlagOptimized, nullptr,
-      nullptr, Error.get());
-  EXPECT_TRUE(Err->getThrownTypes().get() == Error.get());
-  DIB.finalize();
-}
-
-TEST_F(IRBuilderTest, DIBuilder) {
-  IRBuilder<> Builder(BB);
-  DIBuilder DIB(*M);
-  auto File = DIB.createFile("F.CBL", "/");
-  auto CU = DIB.createCompileUnit(dwarf::DW_LANG_Cobol74,
-                                  DIB.createFile("F.CBL", "/"), "llvm-cobol74",
-                                  true, "", 0);
-  auto Type = DIB.createSubroutineType(DIB.getOrCreateTypeArray(None));
-  auto SP = DIB.createFunction(
-      CU, "foo", "", File, 1, Type, 1, DINode::FlagZero,
-      DISubprogram::SPFlagDefinition | DISubprogram::SPFlagOptimized);
-  F->setSubprogram(SP);
-  AllocaInst *I = Builder.CreateAlloca(Builder.getInt8Ty());
-  auto BarSP = DIB.createFunction(
-      CU, "bar", "", File, 1, Type, 1, DINode::FlagZero,
-      DISubprogram::SPFlagDefinition | DISubprogram::SPFlagOptimized);
-  auto BadScope = DIB.createLexicalBlockFile(BarSP, File, 0);
-  I->setDebugLoc(DILocation::get(Ctx, 2, 0, BadScope));
-  DIB.finalize();
-  EXPECT_TRUE(verifyModule(*M));
-}
-
-TEST_F(IRBuilderTest, createArtificialSubprogram) {
-  IRBuilder<> Builder(BB);
-  DIBuilder DIB(*M);
-  auto File = DIB.createFile("main.c", "/");
-  auto CU = DIB.createCompileUnit(dwarf::DW_LANG_C, File, "clang",
-                                  /*isOptimized=*/true, /*Flags=*/"",
-                                  /*Runtime Version=*/0);
-  auto Type = DIB.createSubroutineType(DIB.getOrCreateTypeArray(None));
-  auto SP = DIB.createFunction(
-      CU, "foo", /*LinkageName=*/"", File,
-      /*LineNo=*/1, Type, /*ScopeLine=*/2, DINode::FlagZero,
-      DISubprogram::SPFlagDefinition | DISubprogram::SPFlagOptimized);
-  EXPECT_TRUE(SP->isDistinct());
-
-  F->setSubprogram(SP);
-  AllocaInst *I = Builder.CreateAlloca(Builder.getInt8Ty());
-  ReturnInst *R = Builder.CreateRetVoid();
-  I->setDebugLoc(DILocation::get(Ctx, 3, 2, SP));
-  R->setDebugLoc(DILocation::get(Ctx, 4, 2, SP));
-  DIB.finalize();
-  EXPECT_FALSE(verifyModule(*M));
-
-  Function *G = Function::Create(F->getFunctionType(),
-                                 Function::ExternalLinkage, "", M.get());
-  BasicBlock *GBB = BasicBlock::Create(Ctx, "", G);
-  Builder.SetInsertPoint(GBB);
-  I->removeFromParent();
-  Builder.Insert(I);
-  Builder.CreateRetVoid();
-  EXPECT_FALSE(verifyModule(*M));
-
-  DISubprogram *GSP = DIBuilder::createArtificialSubprogram(F->getSubprogram());
-  EXPECT_EQ(SP->getFile(), GSP->getFile());
-  EXPECT_EQ(SP->getType(), GSP->getType());
-  EXPECT_EQ(SP->getLine(), GSP->getLine());
-  EXPECT_EQ(SP->getScopeLine(), GSP->getScopeLine());
-  EXPECT_TRUE(GSP->isDistinct());
-
-  G->setSubprogram(GSP);
-  EXPECT_TRUE(verifyModule(*M));
-
-  auto *InlinedAtNode =
-      DILocation::getDistinct(Ctx, GSP->getScopeLine(), 0, GSP);
-  DebugLoc DL = I->getDebugLoc();
-  DenseMap<const MDNode *, MDNode *> IANodes;
-  auto IA = DebugLoc::appendInlinedAt(DL, InlinedAtNode, Ctx, IANodes);
-  auto NewDL =
-      DILocation::get(Ctx, DL.getLine(), DL.getCol(), DL.getScope(), IA);
-  I->setDebugLoc(NewDL);
-  EXPECT_FALSE(verifyModule(*M));
-
-  EXPECT_EQ("foo", SP->getName());
-  EXPECT_EQ("foo", GSP->getName());
-  EXPECT_FALSE(SP->isArtificial());
-  EXPECT_TRUE(GSP->isArtificial());
-}
-
-TEST_F(IRBuilderTest, InsertExtractElement) {
-  IRBuilder<> Builder(BB);
-
-  auto VecTy = FixedVectorType::get(Builder.getInt64Ty(), 4);
-  auto Elt1 = Builder.getInt64(-1);
-  auto Elt2 = Builder.getInt64(-2);
-  Value *Vec = UndefValue::get(VecTy);
-  Vec = Builder.CreateInsertElement(Vec, Elt1, Builder.getInt8(1));
-  Vec = Builder.CreateInsertElement(Vec, Elt2, 2);
-  auto X1 = Builder.CreateExtractElement(Vec, 1);
-  auto X2 = Builder.CreateExtractElement(Vec, Builder.getInt32(2));
-  EXPECT_EQ(Elt1, X1);
-  EXPECT_EQ(Elt2, X2);
-}
-
-TEST_F(IRBuilderTest, CreateGlobalStringPtr) {
-  IRBuilder<> Builder(BB);
-
-  auto String1a = Builder.CreateGlobalStringPtr("TestString", "String1a");
-  auto String1b = Builder.CreateGlobalStringPtr("TestString", "String1b", 0);
-  auto String2 = Builder.CreateGlobalStringPtr("TestString", "String2", 1);
-  auto String3 = Builder.CreateGlobalString("TestString", "String3", 2);
-
-  EXPECT_TRUE(String1a->getType()->getPointerAddressSpace() == 0);
-  EXPECT_TRUE(String1b->getType()->getPointerAddressSpace() == 0);
-  EXPECT_TRUE(String2->getType()->getPointerAddressSpace() == 1);
-  EXPECT_TRUE(String3->getType()->getPointerAddressSpace() == 2);
-}
-
-TEST_F(IRBuilderTest, DebugLoc) {
-  auto CalleeTy = FunctionType::get(Type::getVoidTy(Ctx),
-                                    /*isVarArg=*/false);
-  auto Callee =
-      Function::Create(CalleeTy, Function::ExternalLinkage, "", M.get());
-
-  DIBuilder DIB(*M);
-  auto File = DIB.createFile("tmp.cpp", "/");
-  auto CU = DIB.createCompileUnit(dwarf::DW_LANG_C_plus_plus_11,
-                                  DIB.createFile("tmp.cpp", "/"), "", true, "",
-                                  0);
-  auto SPType = DIB.createSubroutineType(DIB.getOrCreateTypeArray(None));
-  auto SP =
-      DIB.createFunction(CU, "foo", "foo", File, 1, SPType, 1, DINode::FlagZero,
-                         DISubprogram::SPFlagDefinition);
-  DebugLoc DL1 = DILocation::get(Ctx, 2, 0, SP);
-  DebugLoc DL2 = DILocation::get(Ctx, 3, 0, SP);
-
-  auto BB2 = BasicBlock::Create(Ctx, "bb2", F);
-  auto Br = BranchInst::Create(BB2, BB);
-  Br->setDebugLoc(DL1);
-
-  IRBuilder<> Builder(Ctx);
-  Builder.SetInsertPoint(Br);
-  EXPECT_EQ(DL1, Builder.getCurrentDebugLocation());
-  auto Call1 = Builder.CreateCall(Callee, None);
-  EXPECT_EQ(DL1, Call1->getDebugLoc());
-
-  Call1->setDebugLoc(DL2);
-  Builder.SetInsertPoint(Call1->getParent(), Call1->getIterator());
-  EXPECT_EQ(DL2, Builder.getCurrentDebugLocation());
-  auto Call2 = Builder.CreateCall(Callee, None);
-  EXPECT_EQ(DL2, Call2->getDebugLoc());
-
-  DIB.finalize();
-}
-
-TEST_F(IRBuilderTest, DIImportedEntity) {
-  IRBuilder<> Builder(BB);
-  DIBuilder DIB(*M);
-  auto F = DIB.createFile("F.CBL", "/");
-  auto CU = DIB.createCompileUnit(dwarf::DW_LANG_Cobol74,
-                                  F, "llvm-cobol74",
-                                  true, "", 0);
-  DIB.createImportedDeclaration(CU, nullptr, F, 1);
-  DIB.createImportedDeclaration(CU, nullptr, F, 1);
-  DIB.createImportedModule(CU, (DIImportedEntity *)nullptr, F, 2);
-  DIB.createImportedModule(CU, (DIImportedEntity *)nullptr, F, 2);
-  DIB.finalize();
-  EXPECT_TRUE(verifyModule(*M));
-  EXPECT_TRUE(CU->getImportedEntities().size() == 2);
-}
-
-//  0: #define M0 V0          <-- command line definition
-//  0: main.c                 <-- main file
-//     3:   #define M1 V1     <-- M1 definition in main.c
-//     5:   #include "file.h" <-- inclusion of file.h from main.c
-//          1: #define M2     <-- M2 definition in file.h with no value
-//     7:   #undef M1 V1      <-- M1 un-definition in main.c
-TEST_F(IRBuilderTest, DIBuilderMacro) {
-  IRBuilder<> Builder(BB);
-  DIBuilder DIB(*M);
-  auto File1 = DIB.createFile("main.c", "/");
-  auto File2 = DIB.createFile("file.h", "/");
-  auto CU = DIB.createCompileUnit(
-      dwarf::DW_LANG_C, DIB.createFile("main.c", "/"), "llvm-c", true, "", 0);
-  auto MDef0 =
-      DIB.createMacro(nullptr, 0, dwarf::DW_MACINFO_define, "M0", "V0");
-  auto TMF1 = DIB.createTempMacroFile(nullptr, 0, File1);
-  auto MDef1 = DIB.createMacro(TMF1, 3, dwarf::DW_MACINFO_define, "M1", "V1");
-  auto TMF2 = DIB.createTempMacroFile(TMF1, 5, File2);
-  auto MDef2 = DIB.createMacro(TMF2, 1, dwarf::DW_MACINFO_define, "M2");
-  auto MUndef1 = DIB.createMacro(TMF1, 7, dwarf::DW_MACINFO_undef, "M1");
-
-  EXPECT_EQ(dwarf::DW_MACINFO_define, MDef1->getMacinfoType());
-  EXPECT_EQ(3u, MDef1->getLine());
-  EXPECT_EQ("M1", MDef1->getName());
-  EXPECT_EQ("V1", MDef1->getValue());
-
-  EXPECT_EQ(dwarf::DW_MACINFO_undef, MUndef1->getMacinfoType());
-  EXPECT_EQ(7u, MUndef1->getLine());
-  EXPECT_EQ("M1", MUndef1->getName());
-  EXPECT_EQ("", MUndef1->getValue());
-
-  EXPECT_EQ(dwarf::DW_MACINFO_start_file, TMF2->getMacinfoType());
-  EXPECT_EQ(5u, TMF2->getLine());
-  EXPECT_EQ(File2, TMF2->getFile());
-
-  DIB.finalize();
-
-  SmallVector<Metadata *, 4> Elements;
-  Elements.push_back(MDef2);
-  auto MF2 = DIMacroFile::get(Ctx, dwarf::DW_MACINFO_start_file, 5, File2,
-                              DIB.getOrCreateMacroArray(Elements));
-
-  Elements.clear();
-  Elements.push_back(MDef1);
-  Elements.push_back(MF2);
-  Elements.push_back(MUndef1);
-  auto MF1 = DIMacroFile::get(Ctx, dwarf::DW_MACINFO_start_file, 0, File1,
-                              DIB.getOrCreateMacroArray(Elements));
-
-  Elements.clear();
-  Elements.push_back(MDef0);
-  Elements.push_back(MF1);
-  auto MN0 = MDTuple::get(Ctx, Elements);
-  EXPECT_EQ(MN0, CU->getRawMacros());
-
-  Elements.clear();
-  Elements.push_back(MDef1);
-  Elements.push_back(MF2);
-  Elements.push_back(MUndef1);
-  auto MN1 = MDTuple::get(Ctx, Elements);
-  EXPECT_EQ(MN1, MF1->getRawElements());
-
-  Elements.clear();
-  Elements.push_back(MDef2);
-  auto MN2 = MDTuple::get(Ctx, Elements);
-  EXPECT_EQ(MN2, MF2->getRawElements());
-  EXPECT_TRUE(verifyModule(*M));
-}
-
-TEST_F(IRBuilderTest, NoFolderNames) {
-  IRBuilder<NoFolder> Builder(BB);
-  auto *Add =
-      Builder.CreateAdd(Builder.getInt32(1), Builder.getInt32(2), "add");
-  EXPECT_EQ(Add->getName(), "add");
-}
-}
diff --git a/gnu/llvm/llvm/unittests/IR/InstructionsTest.cpp b/gnu/llvm/llvm/unittests/IR/InstructionsTest.cpp
deleted file mode 100644
index c9d6d846cba..00000000000
--- a/gnu/llvm/llvm/unittests/IR/InstructionsTest.cpp
+++ /dev/null
@@ -1,1485 +0,0 @@
-//===- llvm/unittest/IR/InstructionsTest.cpp - Instructions unit tests ----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/Analysis/ValueTracking.h"
-#include "llvm/IR/BasicBlock.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/DataLayout.h"
-#include "llvm/IR/DebugInfoMetadata.h"
-#include "llvm/IR/DerivedTypes.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/MDBuilder.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/NoFolder.h"
-#include "llvm/IR/Operator.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gmock/gmock-matchers.h"
-#include "gtest/gtest.h"
-#include <memory>
-
-namespace llvm {
-namespace {
-
-static std::unique_ptr<Module> parseIR(LLVMContext &C, const char *IR) {
-  SMDiagnostic Err;
-  std::unique_ptr<Module> Mod = parseAssemblyString(IR, Err, C);
-  if (!Mod)
-    Err.print("InstructionsTests", errs());
-  return Mod;
-}
-
-TEST(InstructionsTest, ReturnInst) {
-  LLVMContext C;
-
-  // test for PR6589
-  const ReturnInst* r0 = ReturnInst::Create(C);
-  EXPECT_EQ(r0->getNumOperands(), 0U);
-  EXPECT_EQ(r0->op_begin(), r0->op_end());
-
-  IntegerType* Int1 = IntegerType::get(C, 1);
-  Constant* One = ConstantInt::get(Int1, 1, true);
-  const ReturnInst* r1 = ReturnInst::Create(C, One);
-  EXPECT_EQ(1U, r1->getNumOperands());
-  User::const_op_iterator b(r1->op_begin());
-  EXPECT_NE(r1->op_end(), b);
-  EXPECT_EQ(One, *b);
-  EXPECT_EQ(One, r1->getOperand(0));
-  ++b;
-  EXPECT_EQ(r1->op_end(), b);
-
-  // clean up
-  delete r0;
-  delete r1;
-}
-
-// Test fixture that provides a module and a single function within it. Useful
-// for tests that need to refer to the function in some way.
-class ModuleWithFunctionTest : public testing::Test {
-protected:
-  ModuleWithFunctionTest() : M(new Module("MyModule", Ctx)) {
-    FArgTypes.push_back(Type::getInt8Ty(Ctx));
-    FArgTypes.push_back(Type::getInt32Ty(Ctx));
-    FArgTypes.push_back(Type::getInt64Ty(Ctx));
-    FunctionType *FTy =
-        FunctionType::get(Type::getVoidTy(Ctx), FArgTypes, false);
-    F = Function::Create(FTy, Function::ExternalLinkage, "", M.get());
-  }
-
-  LLVMContext Ctx;
-  std::unique_ptr<Module> M;
-  SmallVector<Type *, 3> FArgTypes;
-  Function *F;
-};
-
-TEST_F(ModuleWithFunctionTest, CallInst) {
-  Value *Args[] = {ConstantInt::get(Type::getInt8Ty(Ctx), 20),
-                   ConstantInt::get(Type::getInt32Ty(Ctx), 9999),
-                   ConstantInt::get(Type::getInt64Ty(Ctx), 42)};
-  std::unique_ptr<CallInst> Call(CallInst::Create(F, Args));
-
-  // Make sure iteration over a call's arguments works as expected.
-  unsigned Idx = 0;
-  for (Value *Arg : Call->arg_operands()) {
-    EXPECT_EQ(FArgTypes[Idx], Arg->getType());
-    EXPECT_EQ(Call->getArgOperand(Idx)->getType(), Arg->getType());
-    Idx++;
-  }
-
-  Call->addAttribute(llvm::AttributeList::ReturnIndex,
-                     Attribute::get(Call->getContext(), "test-str-attr"));
-  EXPECT_TRUE(Call->hasRetAttr("test-str-attr"));
-  EXPECT_FALSE(Call->hasRetAttr("not-on-call"));
-}
-
-TEST_F(ModuleWithFunctionTest, InvokeInst) {
-  BasicBlock *BB1 = BasicBlock::Create(Ctx, "", F);
-  BasicBlock *BB2 = BasicBlock::Create(Ctx, "", F);
-
-  Value *Args[] = {ConstantInt::get(Type::getInt8Ty(Ctx), 20),
-                   ConstantInt::get(Type::getInt32Ty(Ctx), 9999),
-                   ConstantInt::get(Type::getInt64Ty(Ctx), 42)};
-  std::unique_ptr<InvokeInst> Invoke(InvokeInst::Create(F, BB1, BB2, Args));
-
-  // Make sure iteration over invoke's arguments works as expected.
-  unsigned Idx = 0;
-  for (Value *Arg : Invoke->arg_operands()) {
-    EXPECT_EQ(FArgTypes[Idx], Arg->getType());
-    EXPECT_EQ(Invoke->getArgOperand(Idx)->getType(), Arg->getType());
-    Idx++;
-  }
-}
-
-TEST(InstructionsTest, BranchInst) {
-  LLVMContext C;
-
-  // Make a BasicBlocks
-  BasicBlock* bb0 = BasicBlock::Create(C);
-  BasicBlock* bb1 = BasicBlock::Create(C);
-
-  // Mandatory BranchInst
-  const BranchInst* b0 = BranchInst::Create(bb0);
-
-  EXPECT_TRUE(b0->isUnconditional());
-  EXPECT_FALSE(b0->isConditional());
-  EXPECT_EQ(1U, b0->getNumSuccessors());
-
-  // check num operands
-  EXPECT_EQ(1U, b0->getNumOperands());
-
-  EXPECT_NE(b0->op_begin(), b0->op_end());
-  EXPECT_EQ(b0->op_end(), std::next(b0->op_begin()));
-
-  EXPECT_EQ(b0->op_end(), std::next(b0->op_begin()));
-
-  IntegerType* Int1 = IntegerType::get(C, 1);
-  Constant* One = ConstantInt::get(Int1, 1, true);
-
-  // Conditional BranchInst
-  BranchInst* b1 = BranchInst::Create(bb0, bb1, One);
-
-  EXPECT_FALSE(b1->isUnconditional());
-  EXPECT_TRUE(b1->isConditional());
-  EXPECT_EQ(2U, b1->getNumSuccessors());
-
-  // check num operands
-  EXPECT_EQ(3U, b1->getNumOperands());
-
-  User::const_op_iterator b(b1->op_begin());
-
-  // check COND
-  EXPECT_NE(b, b1->op_end());
-  EXPECT_EQ(One, *b);
-  EXPECT_EQ(One, b1->getOperand(0));
-  EXPECT_EQ(One, b1->getCondition());
-  ++b;
-
-  // check ELSE
-  EXPECT_EQ(bb1, *b);
-  EXPECT_EQ(bb1, b1->getOperand(1));
-  EXPECT_EQ(bb1, b1->getSuccessor(1));
-  ++b;
-
-  // check THEN
-  EXPECT_EQ(bb0, *b);
-  EXPECT_EQ(bb0, b1->getOperand(2));
-  EXPECT_EQ(bb0, b1->getSuccessor(0));
-  ++b;
-
-  EXPECT_EQ(b1->op_end(), b);
-
-  // clean up
-  delete b0;
-  delete b1;
-
-  delete bb0;
-  delete bb1;
-}
-
-TEST(InstructionsTest, CastInst) {
-  LLVMContext C;
-
-  Type *Int8Ty = Type::getInt8Ty(C);
-  Type *Int16Ty = Type::getInt16Ty(C);
-  Type *Int32Ty = Type::getInt32Ty(C);
-  Type *Int64Ty = Type::getInt64Ty(C);
-  Type *V8x8Ty = FixedVectorType::get(Int8Ty, 8);
-  Type *V8x64Ty = FixedVectorType::get(Int64Ty, 8);
-  Type *X86MMXTy = Type::getX86_MMXTy(C);
-
-  Type *HalfTy = Type::getHalfTy(C);
-  Type *FloatTy = Type::getFloatTy(C);
-  Type *DoubleTy = Type::getDoubleTy(C);
-
-  Type *V2Int32Ty = FixedVectorType::get(Int32Ty, 2);
-  Type *V2Int64Ty = FixedVectorType::get(Int64Ty, 2);
-  Type *V4Int16Ty = FixedVectorType::get(Int16Ty, 4);
-  Type *V1Int16Ty = FixedVectorType::get(Int16Ty, 1);
-
-  Type *VScaleV2Int32Ty = ScalableVectorType::get(Int32Ty, 2);
-  Type *VScaleV2Int64Ty = ScalableVectorType::get(Int64Ty, 2);
-  Type *VScaleV4Int16Ty = ScalableVectorType::get(Int16Ty, 4);
-  Type *VScaleV1Int16Ty = ScalableVectorType::get(Int16Ty, 1);
-
-  Type *Int32PtrTy = PointerType::get(Int32Ty, 0);
-  Type *Int64PtrTy = PointerType::get(Int64Ty, 0);
-
-  Type *Int32PtrAS1Ty = PointerType::get(Int32Ty, 1);
-  Type *Int64PtrAS1Ty = PointerType::get(Int64Ty, 1);
-
-  Type *V2Int32PtrAS1Ty = FixedVectorType::get(Int32PtrAS1Ty, 2);
-  Type *V2Int64PtrAS1Ty = FixedVectorType::get(Int64PtrAS1Ty, 2);
-  Type *V4Int32PtrAS1Ty = FixedVectorType::get(Int32PtrAS1Ty, 4);
-  Type *VScaleV4Int32PtrAS1Ty = ScalableVectorType::get(Int32PtrAS1Ty, 4);
-  Type *V4Int64PtrAS1Ty = FixedVectorType::get(Int64PtrAS1Ty, 4);
-
-  Type *V2Int64PtrTy = FixedVectorType::get(Int64PtrTy, 2);
-  Type *V2Int32PtrTy = FixedVectorType::get(Int32PtrTy, 2);
-  Type *VScaleV2Int32PtrTy = ScalableVectorType::get(Int32PtrTy, 2);
-  Type *V4Int32PtrTy = FixedVectorType::get(Int32PtrTy, 4);
-  Type *VScaleV4Int32PtrTy = ScalableVectorType::get(Int32PtrTy, 4);
-  Type *VScaleV4Int64PtrTy = ScalableVectorType::get(Int64PtrTy, 4);
-
-  const Constant* c8 = Constant::getNullValue(V8x8Ty);
-  const Constant* c64 = Constant::getNullValue(V8x64Ty);
-
-  const Constant *v2ptr32 = Constant::getNullValue(V2Int32PtrTy);
-
-  EXPECT_EQ(CastInst::Trunc, CastInst::getCastOpcode(c64, true, V8x8Ty, true));
-  EXPECT_EQ(CastInst::SExt, CastInst::getCastOpcode(c8, true, V8x64Ty, true));
-
-  EXPECT_FALSE(CastInst::isBitCastable(V8x8Ty, X86MMXTy));
-  EXPECT_FALSE(CastInst::isBitCastable(X86MMXTy, V8x8Ty));
-  EXPECT_FALSE(CastInst::isBitCastable(Int64Ty, X86MMXTy));
-  EXPECT_FALSE(CastInst::isBitCastable(V8x64Ty, V8x8Ty));
-  EXPECT_FALSE(CastInst::isBitCastable(V8x8Ty, V8x64Ty));
-
-  // Check address space casts are rejected since we don't know the sizes here
-  EXPECT_FALSE(CastInst::isBitCastable(Int32PtrTy, Int32PtrAS1Ty));
-  EXPECT_FALSE(CastInst::isBitCastable(Int32PtrAS1Ty, Int32PtrTy));
-  EXPECT_FALSE(CastInst::isBitCastable(V2Int32PtrTy, V2Int32PtrAS1Ty));
-  EXPECT_FALSE(CastInst::isBitCastable(V2Int32PtrAS1Ty, V2Int32PtrTy));
-  EXPECT_TRUE(CastInst::isBitCastable(V2Int32PtrAS1Ty, V2Int64PtrAS1Ty));
-  EXPECT_EQ(CastInst::AddrSpaceCast, CastInst::getCastOpcode(v2ptr32, true,
-                                                             V2Int32PtrAS1Ty,
-                                                             true));
-
-  // Test mismatched number of elements for pointers
-  EXPECT_FALSE(CastInst::isBitCastable(V2Int32PtrAS1Ty, V4Int64PtrAS1Ty));
-  EXPECT_FALSE(CastInst::isBitCastable(V4Int64PtrAS1Ty, V2Int32PtrAS1Ty));
-  EXPECT_FALSE(CastInst::isBitCastable(V2Int32PtrAS1Ty, V4Int32PtrAS1Ty));
-  EXPECT_FALSE(CastInst::isBitCastable(Int32PtrTy, V2Int32PtrTy));
-  EXPECT_FALSE(CastInst::isBitCastable(V2Int32PtrTy, Int32PtrTy));
-
-  EXPECT_TRUE(CastInst::isBitCastable(Int32PtrTy, Int64PtrTy));
-  EXPECT_FALSE(CastInst::isBitCastable(DoubleTy, FloatTy));
-  EXPECT_FALSE(CastInst::isBitCastable(FloatTy, DoubleTy));
-  EXPECT_TRUE(CastInst::isBitCastable(FloatTy, FloatTy));
-  EXPECT_TRUE(CastInst::isBitCastable(FloatTy, FloatTy));
-  EXPECT_TRUE(CastInst::isBitCastable(FloatTy, Int32Ty));
-  EXPECT_TRUE(CastInst::isBitCastable(Int16Ty, HalfTy));
-  EXPECT_TRUE(CastInst::isBitCastable(Int32Ty, FloatTy));
-  EXPECT_TRUE(CastInst::isBitCastable(V2Int32Ty, Int64Ty));
-
-  EXPECT_TRUE(CastInst::isBitCastable(V2Int32Ty, V4Int16Ty));
-  EXPECT_FALSE(CastInst::isBitCastable(Int32Ty, Int64Ty));
-  EXPECT_FALSE(CastInst::isBitCastable(Int64Ty, Int32Ty));
-
-  EXPECT_FALSE(CastInst::isBitCastable(V2Int32PtrTy, Int64Ty));
-  EXPECT_FALSE(CastInst::isBitCastable(Int64Ty, V2Int32PtrTy));
-  EXPECT_TRUE(CastInst::isBitCastable(V2Int64PtrTy, V2Int32PtrTy));
-  EXPECT_TRUE(CastInst::isBitCastable(V2Int32PtrTy, V2Int64PtrTy));
-  EXPECT_FALSE(CastInst::isBitCastable(V2Int32Ty, V2Int64Ty));
-  EXPECT_FALSE(CastInst::isBitCastable(V2Int64Ty, V2Int32Ty));
-
-
-  EXPECT_FALSE(CastInst::castIsValid(Instruction::BitCast,
-                                     Constant::getNullValue(V4Int32PtrTy),
-                                     V2Int32PtrTy));
-  EXPECT_FALSE(CastInst::castIsValid(Instruction::BitCast,
-                                     Constant::getNullValue(V2Int32PtrTy),
-                                     V4Int32PtrTy));
-
-  EXPECT_FALSE(CastInst::castIsValid(Instruction::AddrSpaceCast,
-                                     Constant::getNullValue(V4Int32PtrAS1Ty),
-                                     V2Int32PtrTy));
-  EXPECT_FALSE(CastInst::castIsValid(Instruction::AddrSpaceCast,
-                                     Constant::getNullValue(V2Int32PtrTy),
-                                     V4Int32PtrAS1Ty));
-
-  // Address space cast of fixed/scalable vectors of pointers to scalable/fixed
-  // vector of pointers.
-  EXPECT_FALSE(CastInst::castIsValid(
-      Instruction::AddrSpaceCast, Constant::getNullValue(VScaleV4Int32PtrAS1Ty),
-      V4Int32PtrTy));
-  EXPECT_FALSE(CastInst::castIsValid(Instruction::AddrSpaceCast,
-                                     Constant::getNullValue(V4Int32PtrTy),
-                                     VScaleV4Int32PtrAS1Ty));
-  // Address space cast of scalable vectors of pointers to scalable vector of
-  // pointers.
-  EXPECT_FALSE(CastInst::castIsValid(
-      Instruction::AddrSpaceCast, Constant::getNullValue(VScaleV4Int32PtrAS1Ty),
-      VScaleV2Int32PtrTy));
-  EXPECT_FALSE(CastInst::castIsValid(Instruction::AddrSpaceCast,
-                                     Constant::getNullValue(VScaleV2Int32PtrTy),
-                                     VScaleV4Int32PtrAS1Ty));
-  EXPECT_TRUE(CastInst::castIsValid(Instruction::AddrSpaceCast,
-                                    Constant::getNullValue(VScaleV4Int64PtrTy),
-                                    VScaleV4Int32PtrAS1Ty));
-  // Same number of lanes, different address space.
-  EXPECT_TRUE(CastInst::castIsValid(
-      Instruction::AddrSpaceCast, Constant::getNullValue(VScaleV4Int32PtrAS1Ty),
-      VScaleV4Int32PtrTy));
-  // Same number of lanes, same address space.
-  EXPECT_FALSE(CastInst::castIsValid(Instruction::AddrSpaceCast,
-                                     Constant::getNullValue(VScaleV4Int64PtrTy),
-                                     VScaleV4Int32PtrTy));
-
-  // Bit casting fixed/scalable vector to scalable/fixed vectors.
-  EXPECT_FALSE(CastInst::castIsValid(Instruction::BitCast,
-                                     Constant::getNullValue(V2Int32Ty),
-                                     VScaleV2Int32Ty));
-  EXPECT_FALSE(CastInst::castIsValid(Instruction::BitCast,
-                                     Constant::getNullValue(V2Int64Ty),
-                                     VScaleV2Int64Ty));
-  EXPECT_FALSE(CastInst::castIsValid(Instruction::BitCast,
-                                     Constant::getNullValue(V4Int16Ty),
-                                     VScaleV4Int16Ty));
-  EXPECT_FALSE(CastInst::castIsValid(Instruction::BitCast,
-                                     Constant::getNullValue(VScaleV2Int32Ty),
-                                     V2Int32Ty));
-  EXPECT_FALSE(CastInst::castIsValid(Instruction::BitCast,
-                                     Constant::getNullValue(VScaleV2Int64Ty),
-                                     V2Int64Ty));
-  EXPECT_FALSE(CastInst::castIsValid(Instruction::BitCast,
-                                     Constant::getNullValue(VScaleV4Int16Ty),
-                                     V4Int16Ty));
-
-  // Bit casting scalable vectors to scalable vectors.
-  EXPECT_TRUE(CastInst::castIsValid(Instruction::BitCast,
-                                    Constant::getNullValue(VScaleV4Int16Ty),
-                                    VScaleV2Int32Ty));
-  EXPECT_TRUE(CastInst::castIsValid(Instruction::BitCast,
-                                    Constant::getNullValue(VScaleV2Int32Ty),
-                                    VScaleV4Int16Ty));
-  EXPECT_FALSE(CastInst::castIsValid(Instruction::BitCast,
-                                     Constant::getNullValue(VScaleV2Int64Ty),
-                                     VScaleV2Int32Ty));
-  EXPECT_FALSE(CastInst::castIsValid(Instruction::BitCast,
-                                     Constant::getNullValue(VScaleV2Int32Ty),
-                                     VScaleV2Int64Ty));
-
-  // Bitcasting to/from <vscale x 1 x Ty>
-  EXPECT_FALSE(CastInst::castIsValid(Instruction::BitCast,
-                                     Constant::getNullValue(VScaleV1Int16Ty),
-                                     V1Int16Ty));
-  EXPECT_FALSE(CastInst::castIsValid(Instruction::BitCast,
-                                     Constant::getNullValue(V1Int16Ty),
-                                     VScaleV1Int16Ty));
-
-  // Check that assertion is not hit when creating a cast with a vector of
-  // pointers
-  // First form
-  BasicBlock *BB = BasicBlock::Create(C);
-  Constant *NullV2I32Ptr = Constant::getNullValue(V2Int32PtrTy);
-  auto Inst1 = CastInst::CreatePointerCast(NullV2I32Ptr, V2Int32Ty, "foo", BB);
-
-  Constant *NullVScaleV2I32Ptr = Constant::getNullValue(VScaleV2Int32PtrTy);
-  auto Inst1VScale = CastInst::CreatePointerCast(
-      NullVScaleV2I32Ptr, VScaleV2Int32Ty, "foo.vscale", BB);
-
-  // Second form
-  auto Inst2 = CastInst::CreatePointerCast(NullV2I32Ptr, V2Int32Ty);
-  auto Inst2VScale =
-      CastInst::CreatePointerCast(NullVScaleV2I32Ptr, VScaleV2Int32Ty);
-
-  delete Inst2;
-  delete Inst2VScale;
-  Inst1->eraseFromParent();
-  Inst1VScale->eraseFromParent();
-  delete BB;
-}
-
-TEST(InstructionsTest, VectorGep) {
-  LLVMContext C;
-
-  // Type Definitions
-  Type *I8Ty = IntegerType::get(C, 8);
-  Type *I32Ty = IntegerType::get(C, 32);
-  PointerType *Ptri8Ty = PointerType::get(I8Ty, 0);
-  PointerType *Ptri32Ty = PointerType::get(I32Ty, 0);
-
-  VectorType *V2xi8PTy = FixedVectorType::get(Ptri8Ty, 2);
-  VectorType *V2xi32PTy = FixedVectorType::get(Ptri32Ty, 2);
-
-  // Test different aspects of the vector-of-pointers type
-  // and GEPs which use this type.
-  ConstantInt *Ci32a = ConstantInt::get(C, APInt(32, 1492));
-  ConstantInt *Ci32b = ConstantInt::get(C, APInt(32, 1948));
-  std::vector<Constant*> ConstVa(2, Ci32a);
-  std::vector<Constant*> ConstVb(2, Ci32b);
-  Constant *C2xi32a = ConstantVector::get(ConstVa);
-  Constant *C2xi32b = ConstantVector::get(ConstVb);
-
-  CastInst *PtrVecA = new IntToPtrInst(C2xi32a, V2xi32PTy);
-  CastInst *PtrVecB = new IntToPtrInst(C2xi32b, V2xi32PTy);
-
-  ICmpInst *ICmp0 = new ICmpInst(ICmpInst::ICMP_SGT, PtrVecA, PtrVecB);
-  ICmpInst *ICmp1 = new ICmpInst(ICmpInst::ICMP_ULT, PtrVecA, PtrVecB);
-  EXPECT_NE(ICmp0, ICmp1); // suppress warning.
-
-  BasicBlock* BB0 = BasicBlock::Create(C);
-  // Test InsertAtEnd ICmpInst constructor.
-  ICmpInst *ICmp2 = new ICmpInst(*BB0, ICmpInst::ICMP_SGE, PtrVecA, PtrVecB);
-  EXPECT_NE(ICmp0, ICmp2); // suppress warning.
-
-  GetElementPtrInst *Gep0 = GetElementPtrInst::Create(I32Ty, PtrVecA, C2xi32a);
-  GetElementPtrInst *Gep1 = GetElementPtrInst::Create(I32Ty, PtrVecA, C2xi32b);
-  GetElementPtrInst *Gep2 = GetElementPtrInst::Create(I32Ty, PtrVecB, C2xi32a);
-  GetElementPtrInst *Gep3 = GetElementPtrInst::Create(I32Ty, PtrVecB, C2xi32b);
-
-  CastInst *BTC0 = new BitCastInst(Gep0, V2xi8PTy);
-  CastInst *BTC1 = new BitCastInst(Gep1, V2xi8PTy);
-  CastInst *BTC2 = new BitCastInst(Gep2, V2xi8PTy);
-  CastInst *BTC3 = new BitCastInst(Gep3, V2xi8PTy);
-
-  Value *S0 = BTC0->stripPointerCasts();
-  Value *S1 = BTC1->stripPointerCasts();
-  Value *S2 = BTC2->stripPointerCasts();
-  Value *S3 = BTC3->stripPointerCasts();
-
-  EXPECT_NE(S0, Gep0);
-  EXPECT_NE(S1, Gep1);
-  EXPECT_NE(S2, Gep2);
-  EXPECT_NE(S3, Gep3);
-
-  int64_t Offset;
-  DataLayout TD("e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f3"
-                "2:32:32-f64:64:64-v64:64:64-v128:128:128-a:0:64-s:64:64-f80"
-                ":128:128-n8:16:32:64-S128");
-  // Make sure we don't crash
-  GetPointerBaseWithConstantOffset(Gep0, Offset, TD);
-  GetPointerBaseWithConstantOffset(Gep1, Offset, TD);
-  GetPointerBaseWithConstantOffset(Gep2, Offset, TD);
-  GetPointerBaseWithConstantOffset(Gep3, Offset, TD);
-
-  // Gep of Geps
-  GetElementPtrInst *GepII0 = GetElementPtrInst::Create(I32Ty, Gep0, C2xi32b);
-  GetElementPtrInst *GepII1 = GetElementPtrInst::Create(I32Ty, Gep1, C2xi32a);
-  GetElementPtrInst *GepII2 = GetElementPtrInst::Create(I32Ty, Gep2, C2xi32b);
-  GetElementPtrInst *GepII3 = GetElementPtrInst::Create(I32Ty, Gep3, C2xi32a);
-
-  EXPECT_EQ(GepII0->getNumIndices(), 1u);
-  EXPECT_EQ(GepII1->getNumIndices(), 1u);
-  EXPECT_EQ(GepII2->getNumIndices(), 1u);
-  EXPECT_EQ(GepII3->getNumIndices(), 1u);
-
-  EXPECT_FALSE(GepII0->hasAllZeroIndices());
-  EXPECT_FALSE(GepII1->hasAllZeroIndices());
-  EXPECT_FALSE(GepII2->hasAllZeroIndices());
-  EXPECT_FALSE(GepII3->hasAllZeroIndices());
-
-  delete GepII0;
-  delete GepII1;
-  delete GepII2;
-  delete GepII3;
-
-  delete BTC0;
-  delete BTC1;
-  delete BTC2;
-  delete BTC3;
-
-  delete Gep0;
-  delete Gep1;
-  delete Gep2;
-  delete Gep3;
-
-  ICmp2->eraseFromParent();
-  delete BB0;
-
-  delete ICmp0;
-  delete ICmp1;
-  delete PtrVecA;
-  delete PtrVecB;
-}
-
-TEST(InstructionsTest, FPMathOperator) {
-  LLVMContext Context;
-  IRBuilder<> Builder(Context);
-  MDBuilder MDHelper(Context);
-  Instruction *I = Builder.CreatePHI(Builder.getDoubleTy(), 0);
-  MDNode *MD1 = MDHelper.createFPMath(1.0);
-  Value *V1 = Builder.CreateFAdd(I, I, "", MD1);
-  EXPECT_TRUE(isa<FPMathOperator>(V1));
-  FPMathOperator *O1 = cast<FPMathOperator>(V1);
-  EXPECT_EQ(O1->getFPAccuracy(), 1.0);
-  V1->deleteValue();
-  I->deleteValue();
-}
-
-
-TEST(InstructionsTest, isEliminableCastPair) {
-  LLVMContext C;
-
-  Type* Int16Ty = Type::getInt16Ty(C);
-  Type* Int32Ty = Type::getInt32Ty(C);
-  Type* Int64Ty = Type::getInt64Ty(C);
-  Type* Int64PtrTy = Type::getInt64PtrTy(C);
-
-  // Source and destination pointers have same size -> bitcast.
-  EXPECT_EQ(CastInst::isEliminableCastPair(CastInst::PtrToInt,
-                                           CastInst::IntToPtr,
-                                           Int64PtrTy, Int64Ty, Int64PtrTy,
-                                           Int32Ty, nullptr, Int32Ty),
-            CastInst::BitCast);
-
-  // Source and destination have unknown sizes, but the same address space and
-  // the intermediate int is the maximum pointer size -> bitcast
-  EXPECT_EQ(CastInst::isEliminableCastPair(CastInst::PtrToInt,
-                                           CastInst::IntToPtr,
-                                           Int64PtrTy, Int64Ty, Int64PtrTy,
-                                           nullptr, nullptr, nullptr),
-            CastInst::BitCast);
-
-  // Source and destination have unknown sizes, but the same address space and
-  // the intermediate int is not the maximum pointer size -> nothing
-  EXPECT_EQ(CastInst::isEliminableCastPair(CastInst::PtrToInt,
-                                           CastInst::IntToPtr,
-                                           Int64PtrTy, Int32Ty, Int64PtrTy,
-                                           nullptr, nullptr, nullptr),
-            0U);
-
-  // Middle pointer big enough -> bitcast.
-  EXPECT_EQ(CastInst::isEliminableCastPair(CastInst::IntToPtr,
-                                           CastInst::PtrToInt,
-                                           Int64Ty, Int64PtrTy, Int64Ty,
-                                           nullptr, Int64Ty, nullptr),
-            CastInst::BitCast);
-
-  // Middle pointer too small -> fail.
-  EXPECT_EQ(CastInst::isEliminableCastPair(CastInst::IntToPtr,
-                                           CastInst::PtrToInt,
-                                           Int64Ty, Int64PtrTy, Int64Ty,
-                                           nullptr, Int32Ty, nullptr),
-            0U);
-
-  // Test that we don't eliminate bitcasts between different address spaces,
-  // or if we don't have available pointer size information.
-  DataLayout DL("e-p:32:32:32-p1:16:16:16-p2:64:64:64-i1:8:8-i8:8:8-i16:16:16"
-                "-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64"
-                "-v128:128:128-a:0:64-s:64:64-f80:128:128-n8:16:32:64-S128");
-
-  Type* Int64PtrTyAS1 = Type::getInt64PtrTy(C, 1);
-  Type* Int64PtrTyAS2 = Type::getInt64PtrTy(C, 2);
-
-  IntegerType *Int16SizePtr = DL.getIntPtrType(C, 1);
-  IntegerType *Int64SizePtr = DL.getIntPtrType(C, 2);
-
-  // Cannot simplify inttoptr, addrspacecast
-  EXPECT_EQ(CastInst::isEliminableCastPair(CastInst::IntToPtr,
-                                           CastInst::AddrSpaceCast,
-                                           Int16Ty, Int64PtrTyAS1, Int64PtrTyAS2,
-                                           nullptr, Int16SizePtr, Int64SizePtr),
-            0U);
-
-  // Cannot simplify addrspacecast, ptrtoint
-  EXPECT_EQ(CastInst::isEliminableCastPair(CastInst::AddrSpaceCast,
-                                           CastInst::PtrToInt,
-                                           Int64PtrTyAS1, Int64PtrTyAS2, Int16Ty,
-                                           Int64SizePtr, Int16SizePtr, nullptr),
-            0U);
-
-  // Pass since the bitcast address spaces are the same
-  EXPECT_EQ(CastInst::isEliminableCastPair(CastInst::IntToPtr,
-                                           CastInst::BitCast,
-                                           Int16Ty, Int64PtrTyAS1, Int64PtrTyAS1,
-                                           nullptr, nullptr, nullptr),
-            CastInst::IntToPtr);
-
-}
-
-TEST(InstructionsTest, CloneCall) {
-  LLVMContext C;
-  Type *Int32Ty = Type::getInt32Ty(C);
-  Type *ArgTys[] = {Int32Ty, Int32Ty, Int32Ty};
-  FunctionType *FnTy = FunctionType::get(Int32Ty, ArgTys, /*isVarArg=*/false);
-  Value *Callee = Constant::getNullValue(FnTy->getPointerTo());
-  Value *Args[] = {
-    ConstantInt::get(Int32Ty, 1),
-    ConstantInt::get(Int32Ty, 2),
-    ConstantInt::get(Int32Ty, 3)
-  };
-  std::unique_ptr<CallInst> Call(
-      CallInst::Create(FnTy, Callee, Args, "result"));
-
-  // Test cloning the tail call kind.
-  CallInst::TailCallKind Kinds[] = {CallInst::TCK_None, CallInst::TCK_Tail,
-                                    CallInst::TCK_MustTail};
-  for (CallInst::TailCallKind TCK : Kinds) {
-    Call->setTailCallKind(TCK);
-    std::unique_ptr<CallInst> Clone(cast<CallInst>(Call->clone()));
-    EXPECT_EQ(Call->getTailCallKind(), Clone->getTailCallKind());
-  }
-  Call->setTailCallKind(CallInst::TCK_None);
-
-  // Test cloning an attribute.
-  {
-    AttrBuilder AB;
-    AB.addAttribute(Attribute::ReadOnly);
-    Call->setAttributes(
-        AttributeList::get(C, AttributeList::FunctionIndex, AB));
-    std::unique_ptr<CallInst> Clone(cast<CallInst>(Call->clone()));
-    EXPECT_TRUE(Clone->onlyReadsMemory());
-  }
-}
-
-TEST(InstructionsTest, AlterCallBundles) {
-  LLVMContext C;
-  Type *Int32Ty = Type::getInt32Ty(C);
-  FunctionType *FnTy = FunctionType::get(Int32Ty, Int32Ty, /*isVarArg=*/false);
-  Value *Callee = Constant::getNullValue(FnTy->getPointerTo());
-  Value *Args[] = {ConstantInt::get(Int32Ty, 42)};
-  OperandBundleDef OldBundle("before", UndefValue::get(Int32Ty));
-  std::unique_ptr<CallInst> Call(
-      CallInst::Create(FnTy, Callee, Args, OldBundle, "result"));
-  Call->setTailCallKind(CallInst::TailCallKind::TCK_NoTail);
-  AttrBuilder AB;
-  AB.addAttribute(Attribute::Cold);
-  Call->setAttributes(AttributeList::get(C, AttributeList::FunctionIndex, AB));
-  Call->setDebugLoc(DebugLoc(MDNode::get(C, None)));
-
-  OperandBundleDef NewBundle("after", ConstantInt::get(Int32Ty, 7));
-  std::unique_ptr<CallInst> Clone(CallInst::Create(Call.get(), NewBundle));
-  EXPECT_EQ(Call->getNumArgOperands(), Clone->getNumArgOperands());
-  EXPECT_EQ(Call->getArgOperand(0), Clone->getArgOperand(0));
-  EXPECT_EQ(Call->getCallingConv(), Clone->getCallingConv());
-  EXPECT_EQ(Call->getTailCallKind(), Clone->getTailCallKind());
-  EXPECT_TRUE(Clone->hasFnAttr(Attribute::AttrKind::Cold));
-  EXPECT_EQ(Call->getDebugLoc(), Clone->getDebugLoc());
-  EXPECT_EQ(Clone->getNumOperandBundles(), 1U);
-  EXPECT_TRUE(Clone->getOperandBundle("after").hasValue());
-}
-
-TEST(InstructionsTest, AlterInvokeBundles) {
-  LLVMContext C;
-  Type *Int32Ty = Type::getInt32Ty(C);
-  FunctionType *FnTy = FunctionType::get(Int32Ty, Int32Ty, /*isVarArg=*/false);
-  Value *Callee = Constant::getNullValue(FnTy->getPointerTo());
-  Value *Args[] = {ConstantInt::get(Int32Ty, 42)};
-  std::unique_ptr<BasicBlock> NormalDest(BasicBlock::Create(C));
-  std::unique_ptr<BasicBlock> UnwindDest(BasicBlock::Create(C));
-  OperandBundleDef OldBundle("before", UndefValue::get(Int32Ty));
-  std::unique_ptr<InvokeInst> Invoke(
-      InvokeInst::Create(FnTy, Callee, NormalDest.get(), UnwindDest.get(), Args,
-                         OldBundle, "result"));
-  AttrBuilder AB;
-  AB.addAttribute(Attribute::Cold);
-  Invoke->setAttributes(
-      AttributeList::get(C, AttributeList::FunctionIndex, AB));
-  Invoke->setDebugLoc(DebugLoc(MDNode::get(C, None)));
-
-  OperandBundleDef NewBundle("after", ConstantInt::get(Int32Ty, 7));
-  std::unique_ptr<InvokeInst> Clone(
-      InvokeInst::Create(Invoke.get(), NewBundle));
-  EXPECT_EQ(Invoke->getNormalDest(), Clone->getNormalDest());
-  EXPECT_EQ(Invoke->getUnwindDest(), Clone->getUnwindDest());
-  EXPECT_EQ(Invoke->getNumArgOperands(), Clone->getNumArgOperands());
-  EXPECT_EQ(Invoke->getArgOperand(0), Clone->getArgOperand(0));
-  EXPECT_EQ(Invoke->getCallingConv(), Clone->getCallingConv());
-  EXPECT_TRUE(Clone->hasFnAttr(Attribute::AttrKind::Cold));
-  EXPECT_EQ(Invoke->getDebugLoc(), Clone->getDebugLoc());
-  EXPECT_EQ(Clone->getNumOperandBundles(), 1U);
-  EXPECT_TRUE(Clone->getOperandBundle("after").hasValue());
-}
-
-TEST_F(ModuleWithFunctionTest, DropPoisonGeneratingFlags) {
-  auto *OnlyBB = BasicBlock::Create(Ctx, "bb", F);
-  auto *Arg0 = &*F->arg_begin();
-
-  IRBuilder<NoFolder> B(Ctx);
-  B.SetInsertPoint(OnlyBB);
-
-  {
-    auto *UI =
-        cast<Instruction>(B.CreateUDiv(Arg0, Arg0, "", /*isExact*/ true));
-    ASSERT_TRUE(UI->isExact());
-    UI->dropPoisonGeneratingFlags();
-    ASSERT_FALSE(UI->isExact());
-  }
-
-  {
-    auto *ShrI =
-        cast<Instruction>(B.CreateLShr(Arg0, Arg0, "", /*isExact*/ true));
-    ASSERT_TRUE(ShrI->isExact());
-    ShrI->dropPoisonGeneratingFlags();
-    ASSERT_FALSE(ShrI->isExact());
-  }
-
-  {
-    auto *AI = cast<Instruction>(
-        B.CreateAdd(Arg0, Arg0, "", /*HasNUW*/ true, /*HasNSW*/ false));
-    ASSERT_TRUE(AI->hasNoUnsignedWrap());
-    AI->dropPoisonGeneratingFlags();
-    ASSERT_FALSE(AI->hasNoUnsignedWrap());
-    ASSERT_FALSE(AI->hasNoSignedWrap());
-  }
-
-  {
-    auto *SI = cast<Instruction>(
-        B.CreateAdd(Arg0, Arg0, "", /*HasNUW*/ false, /*HasNSW*/ true));
-    ASSERT_TRUE(SI->hasNoSignedWrap());
-    SI->dropPoisonGeneratingFlags();
-    ASSERT_FALSE(SI->hasNoUnsignedWrap());
-    ASSERT_FALSE(SI->hasNoSignedWrap());
-  }
-
-  {
-    auto *ShlI = cast<Instruction>(
-        B.CreateShl(Arg0, Arg0, "", /*HasNUW*/ true, /*HasNSW*/ true));
-    ASSERT_TRUE(ShlI->hasNoSignedWrap());
-    ASSERT_TRUE(ShlI->hasNoUnsignedWrap());
-    ShlI->dropPoisonGeneratingFlags();
-    ASSERT_FALSE(ShlI->hasNoUnsignedWrap());
-    ASSERT_FALSE(ShlI->hasNoSignedWrap());
-  }
-
-  {
-    Value *GEPBase = Constant::getNullValue(B.getInt8PtrTy());
-    auto *GI = cast<GetElementPtrInst>(
-        B.CreateInBoundsGEP(B.getInt8Ty(), GEPBase, Arg0));
-    ASSERT_TRUE(GI->isInBounds());
-    GI->dropPoisonGeneratingFlags();
-    ASSERT_FALSE(GI->isInBounds());
-  }
-}
-
-TEST(InstructionsTest, GEPIndices) {
-  LLVMContext Context;
-  IRBuilder<NoFolder> Builder(Context);
-  Type *ElementTy = Builder.getInt8Ty();
-  Type *ArrTy = ArrayType::get(ArrayType::get(ElementTy, 64), 64);
-  Value *Indices[] = {
-    Builder.getInt32(0),
-    Builder.getInt32(13),
-    Builder.getInt32(42) };
-
-  Value *V = Builder.CreateGEP(ArrTy, UndefValue::get(PointerType::getUnqual(ArrTy)),
-                               Indices);
-  ASSERT_TRUE(isa<GetElementPtrInst>(V));
-
-  auto *GEPI = cast<GetElementPtrInst>(V);
-  ASSERT_NE(GEPI->idx_begin(), GEPI->idx_end());
-  ASSERT_EQ(GEPI->idx_end(), std::next(GEPI->idx_begin(), 3));
-  EXPECT_EQ(Indices[0], GEPI->idx_begin()[0]);
-  EXPECT_EQ(Indices[1], GEPI->idx_begin()[1]);
-  EXPECT_EQ(Indices[2], GEPI->idx_begin()[2]);
-  EXPECT_EQ(GEPI->idx_begin(), GEPI->indices().begin());
-  EXPECT_EQ(GEPI->idx_end(), GEPI->indices().end());
-
-  const auto *CGEPI = GEPI;
-  ASSERT_NE(CGEPI->idx_begin(), CGEPI->idx_end());
-  ASSERT_EQ(CGEPI->idx_end(), std::next(CGEPI->idx_begin(), 3));
-  EXPECT_EQ(Indices[0], CGEPI->idx_begin()[0]);
-  EXPECT_EQ(Indices[1], CGEPI->idx_begin()[1]);
-  EXPECT_EQ(Indices[2], CGEPI->idx_begin()[2]);
-  EXPECT_EQ(CGEPI->idx_begin(), CGEPI->indices().begin());
-  EXPECT_EQ(CGEPI->idx_end(), CGEPI->indices().end());
-
-  delete GEPI;
-}
-
-TEST(InstructionsTest, SwitchInst) {
-  LLVMContext C;
-
-  std::unique_ptr<BasicBlock> BB1, BB2, BB3;
-  BB1.reset(BasicBlock::Create(C));
-  BB2.reset(BasicBlock::Create(C));
-  BB3.reset(BasicBlock::Create(C));
-
-  // We create block 0 after the others so that it gets destroyed first and
-  // clears the uses of the other basic blocks.
-  std::unique_ptr<BasicBlock> BB0(BasicBlock::Create(C));
-
-  auto *Int32Ty = Type::getInt32Ty(C);
-
-  SwitchInst *SI =
-      SwitchInst::Create(UndefValue::get(Int32Ty), BB0.get(), 3, BB0.get());
-  SI->addCase(ConstantInt::get(Int32Ty, 1), BB1.get());
-  SI->addCase(ConstantInt::get(Int32Ty, 2), BB2.get());
-  SI->addCase(ConstantInt::get(Int32Ty, 3), BB3.get());
-
-  auto CI = SI->case_begin();
-  ASSERT_NE(CI, SI->case_end());
-  EXPECT_EQ(1, CI->getCaseValue()->getSExtValue());
-  EXPECT_EQ(BB1.get(), CI->getCaseSuccessor());
-  EXPECT_EQ(2, (CI + 1)->getCaseValue()->getSExtValue());
-  EXPECT_EQ(BB2.get(), (CI + 1)->getCaseSuccessor());
-  EXPECT_EQ(3, (CI + 2)->getCaseValue()->getSExtValue());
-  EXPECT_EQ(BB3.get(), (CI + 2)->getCaseSuccessor());
-  EXPECT_EQ(CI + 1, std::next(CI));
-  EXPECT_EQ(CI + 2, std::next(CI, 2));
-  EXPECT_EQ(CI + 3, std::next(CI, 3));
-  EXPECT_EQ(SI->case_end(), CI + 3);
-  EXPECT_EQ(0, CI - CI);
-  EXPECT_EQ(1, (CI + 1) - CI);
-  EXPECT_EQ(2, (CI + 2) - CI);
-  EXPECT_EQ(3, SI->case_end() - CI);
-  EXPECT_EQ(3, std::distance(CI, SI->case_end()));
-
-  auto CCI = const_cast<const SwitchInst *>(SI)->case_begin();
-  SwitchInst::ConstCaseIt CCE = SI->case_end();
-  ASSERT_NE(CCI, SI->case_end());
-  EXPECT_EQ(1, CCI->getCaseValue()->getSExtValue());
-  EXPECT_EQ(BB1.get(), CCI->getCaseSuccessor());
-  EXPECT_EQ(2, (CCI + 1)->getCaseValue()->getSExtValue());
-  EXPECT_EQ(BB2.get(), (CCI + 1)->getCaseSuccessor());
-  EXPECT_EQ(3, (CCI + 2)->getCaseValue()->getSExtValue());
-  EXPECT_EQ(BB3.get(), (CCI + 2)->getCaseSuccessor());
-  EXPECT_EQ(CCI + 1, std::next(CCI));
-  EXPECT_EQ(CCI + 2, std::next(CCI, 2));
-  EXPECT_EQ(CCI + 3, std::next(CCI, 3));
-  EXPECT_EQ(CCE, CCI + 3);
-  EXPECT_EQ(0, CCI - CCI);
-  EXPECT_EQ(1, (CCI + 1) - CCI);
-  EXPECT_EQ(2, (CCI + 2) - CCI);
-  EXPECT_EQ(3, CCE - CCI);
-  EXPECT_EQ(3, std::distance(CCI, CCE));
-
-  // Make sure that the const iterator is compatible with a const auto ref.
-  const auto &Handle = *CCI;
-  EXPECT_EQ(1, Handle.getCaseValue()->getSExtValue());
-  EXPECT_EQ(BB1.get(), Handle.getCaseSuccessor());
-}
-
-TEST(InstructionsTest, SwitchInstProfUpdateWrapper) {
-  LLVMContext C;
-
-  std::unique_ptr<BasicBlock> BB1, BB2, BB3;
-  BB1.reset(BasicBlock::Create(C));
-  BB2.reset(BasicBlock::Create(C));
-  BB3.reset(BasicBlock::Create(C));
-
-  // We create block 0 after the others so that it gets destroyed first and
-  // clears the uses of the other basic blocks.
-  std::unique_ptr<BasicBlock> BB0(BasicBlock::Create(C));
-
-  auto *Int32Ty = Type::getInt32Ty(C);
-
-  SwitchInst *SI =
-      SwitchInst::Create(UndefValue::get(Int32Ty), BB0.get(), 4, BB0.get());
-  SI->addCase(ConstantInt::get(Int32Ty, 1), BB1.get());
-  SI->addCase(ConstantInt::get(Int32Ty, 2), BB2.get());
-  SI->setMetadata(LLVMContext::MD_prof,
-                  MDBuilder(C).createBranchWeights({ 9, 1, 22 }));
-
-  {
-    SwitchInstProfUpdateWrapper SIW(*SI);
-    EXPECT_EQ(*SIW.getSuccessorWeight(0), 9u);
-    EXPECT_EQ(*SIW.getSuccessorWeight(1), 1u);
-    EXPECT_EQ(*SIW.getSuccessorWeight(2), 22u);
-    SIW.setSuccessorWeight(0, 99u);
-    SIW.setSuccessorWeight(1, 11u);
-    EXPECT_EQ(*SIW.getSuccessorWeight(0), 99u);
-    EXPECT_EQ(*SIW.getSuccessorWeight(1), 11u);
-    EXPECT_EQ(*SIW.getSuccessorWeight(2), 22u);
-  }
-
-  { // Create another wrapper and check that the data persist.
-    SwitchInstProfUpdateWrapper SIW(*SI);
-    EXPECT_EQ(*SIW.getSuccessorWeight(0), 99u);
-    EXPECT_EQ(*SIW.getSuccessorWeight(1), 11u);
-    EXPECT_EQ(*SIW.getSuccessorWeight(2), 22u);
-  }
-}
-
-TEST(InstructionsTest, CommuteShuffleMask) {
-  SmallVector<int, 16> Indices({-1, 0, 7});
-  ShuffleVectorInst::commuteShuffleMask(Indices, 4);
-  EXPECT_THAT(Indices, testing::ContainerEq(ArrayRef<int>({-1, 4, 3})));
-}
-
-TEST(InstructionsTest, ShuffleMaskQueries) {
-  // Create the elements for various constant vectors.
-  LLVMContext Ctx;
-  Type *Int32Ty = Type::getInt32Ty(Ctx);
-  Constant *CU = UndefValue::get(Int32Ty);
-  Constant *C0 = ConstantInt::get(Int32Ty, 0);
-  Constant *C1 = ConstantInt::get(Int32Ty, 1);
-  Constant *C2 = ConstantInt::get(Int32Ty, 2);
-  Constant *C3 = ConstantInt::get(Int32Ty, 3);
-  Constant *C4 = ConstantInt::get(Int32Ty, 4);
-  Constant *C5 = ConstantInt::get(Int32Ty, 5);
-  Constant *C6 = ConstantInt::get(Int32Ty, 6);
-  Constant *C7 = ConstantInt::get(Int32Ty, 7);
-
-  Constant *Identity = ConstantVector::get({C0, CU, C2, C3, C4});
-  EXPECT_TRUE(ShuffleVectorInst::isIdentityMask(Identity));
-  EXPECT_FALSE(ShuffleVectorInst::isSelectMask(Identity)); // identity is distinguished from select
-  EXPECT_FALSE(ShuffleVectorInst::isReverseMask(Identity));
-  EXPECT_TRUE(ShuffleVectorInst::isSingleSourceMask(Identity)); // identity is always single source
-  EXPECT_FALSE(ShuffleVectorInst::isZeroEltSplatMask(Identity));
-  EXPECT_FALSE(ShuffleVectorInst::isTransposeMask(Identity));
-
-  Constant *Select = ConstantVector::get({CU, C1, C5});
-  EXPECT_FALSE(ShuffleVectorInst::isIdentityMask(Select));
-  EXPECT_TRUE(ShuffleVectorInst::isSelectMask(Select));
-  EXPECT_FALSE(ShuffleVectorInst::isReverseMask(Select));
-  EXPECT_FALSE(ShuffleVectorInst::isSingleSourceMask(Select));
-  EXPECT_FALSE(ShuffleVectorInst::isZeroEltSplatMask(Select));
-  EXPECT_FALSE(ShuffleVectorInst::isTransposeMask(Select));
-  
-  Constant *Reverse = ConstantVector::get({C3, C2, C1, CU});
-  EXPECT_FALSE(ShuffleVectorInst::isIdentityMask(Reverse));
-  EXPECT_FALSE(ShuffleVectorInst::isSelectMask(Reverse));
-  EXPECT_TRUE(ShuffleVectorInst::isReverseMask(Reverse));
-  EXPECT_TRUE(ShuffleVectorInst::isSingleSourceMask(Reverse)); // reverse is always single source
-  EXPECT_FALSE(ShuffleVectorInst::isZeroEltSplatMask(Reverse));
-  EXPECT_FALSE(ShuffleVectorInst::isTransposeMask(Reverse));
-
-  Constant *SingleSource = ConstantVector::get({C2, C2, C0, CU});
-  EXPECT_FALSE(ShuffleVectorInst::isIdentityMask(SingleSource));
-  EXPECT_FALSE(ShuffleVectorInst::isSelectMask(SingleSource));
-  EXPECT_FALSE(ShuffleVectorInst::isReverseMask(SingleSource));
-  EXPECT_TRUE(ShuffleVectorInst::isSingleSourceMask(SingleSource));
-  EXPECT_FALSE(ShuffleVectorInst::isZeroEltSplatMask(SingleSource));
-  EXPECT_FALSE(ShuffleVectorInst::isTransposeMask(SingleSource));
-
-  Constant *ZeroEltSplat = ConstantVector::get({C0, C0, CU, C0});
-  EXPECT_FALSE(ShuffleVectorInst::isIdentityMask(ZeroEltSplat));
-  EXPECT_FALSE(ShuffleVectorInst::isSelectMask(ZeroEltSplat));
-  EXPECT_FALSE(ShuffleVectorInst::isReverseMask(ZeroEltSplat));
-  EXPECT_TRUE(ShuffleVectorInst::isSingleSourceMask(ZeroEltSplat)); // 0-splat is always single source
-  EXPECT_TRUE(ShuffleVectorInst::isZeroEltSplatMask(ZeroEltSplat));
-  EXPECT_FALSE(ShuffleVectorInst::isTransposeMask(ZeroEltSplat));
-
-  Constant *Transpose = ConstantVector::get({C0, C4, C2, C6});
-  EXPECT_FALSE(ShuffleVectorInst::isIdentityMask(Transpose));
-  EXPECT_FALSE(ShuffleVectorInst::isSelectMask(Transpose));
-  EXPECT_FALSE(ShuffleVectorInst::isReverseMask(Transpose));
-  EXPECT_FALSE(ShuffleVectorInst::isSingleSourceMask(Transpose));
-  EXPECT_FALSE(ShuffleVectorInst::isZeroEltSplatMask(Transpose));
-  EXPECT_TRUE(ShuffleVectorInst::isTransposeMask(Transpose));
-
-  // More tests to make sure the logic is/stays correct...
-  EXPECT_TRUE(ShuffleVectorInst::isIdentityMask(ConstantVector::get({CU, C1, CU, C3})));
-  EXPECT_TRUE(ShuffleVectorInst::isIdentityMask(ConstantVector::get({C4, CU, C6, CU})));
-
-  EXPECT_TRUE(ShuffleVectorInst::isSelectMask(ConstantVector::get({C4, C1, C6, CU})));
-  EXPECT_TRUE(ShuffleVectorInst::isSelectMask(ConstantVector::get({CU, C1, C6, C3})));
-
-  EXPECT_TRUE(ShuffleVectorInst::isReverseMask(ConstantVector::get({C7, C6, CU, C4})));
-  EXPECT_TRUE(ShuffleVectorInst::isReverseMask(ConstantVector::get({C3, CU, C1, CU})));
-
-  EXPECT_TRUE(ShuffleVectorInst::isSingleSourceMask(ConstantVector::get({C7, C5, CU, C7})));
-  EXPECT_TRUE(ShuffleVectorInst::isSingleSourceMask(ConstantVector::get({C3, C0, CU, C3})));
-
-  EXPECT_TRUE(ShuffleVectorInst::isZeroEltSplatMask(ConstantVector::get({C4, CU, CU, C4})));
-  EXPECT_TRUE(ShuffleVectorInst::isZeroEltSplatMask(ConstantVector::get({CU, C0, CU, C0})));
-
-  EXPECT_TRUE(ShuffleVectorInst::isTransposeMask(ConstantVector::get({C1, C5, C3, C7})));
-  EXPECT_TRUE(ShuffleVectorInst::isTransposeMask(ConstantVector::get({C1, C3})));
-
-  // Nothing special about the values here - just re-using inputs to reduce code. 
-  Constant *V0 = ConstantVector::get({C0, C1, C2, C3});
-  Constant *V1 = ConstantVector::get({C3, C2, C1, C0});
-
-  // Identity with undef elts.
-  ShuffleVectorInst *Id1 = new ShuffleVectorInst(V0, V1,
-                                                 ConstantVector::get({C0, C1, CU, CU}));
-  EXPECT_TRUE(Id1->isIdentity());
-  EXPECT_FALSE(Id1->isIdentityWithPadding());
-  EXPECT_FALSE(Id1->isIdentityWithExtract());
-  EXPECT_FALSE(Id1->isConcat());
-  delete Id1;
-
-  // Result has less elements than operands.
-  ShuffleVectorInst *Id2 = new ShuffleVectorInst(V0, V1,
-                                                 ConstantVector::get({C0, C1, C2}));
-  EXPECT_FALSE(Id2->isIdentity());
-  EXPECT_FALSE(Id2->isIdentityWithPadding());
-  EXPECT_TRUE(Id2->isIdentityWithExtract());
-  EXPECT_FALSE(Id2->isConcat());
-  delete Id2;
-
-  // Result has less elements than operands; choose from Op1.
-  ShuffleVectorInst *Id3 = new ShuffleVectorInst(V0, V1,
-                                                 ConstantVector::get({C4, CU, C6}));
-  EXPECT_FALSE(Id3->isIdentity());
-  EXPECT_FALSE(Id3->isIdentityWithPadding());
-  EXPECT_TRUE(Id3->isIdentityWithExtract());
-  EXPECT_FALSE(Id3->isConcat());
-  delete Id3;
-
-  // Result has less elements than operands; choose from Op0 and Op1 is not identity.
-  ShuffleVectorInst *Id4 = new ShuffleVectorInst(V0, V1,
-                                                 ConstantVector::get({C4, C1, C6}));
-  EXPECT_FALSE(Id4->isIdentity());
-  EXPECT_FALSE(Id4->isIdentityWithPadding());
-  EXPECT_FALSE(Id4->isIdentityWithExtract());
-  EXPECT_FALSE(Id4->isConcat());
-  delete Id4;
-
-  // Result has more elements than operands, and extra elements are undef.
-  ShuffleVectorInst *Id5 = new ShuffleVectorInst(V0, V1,
-                                                 ConstantVector::get({CU, C1, C2, C3, CU, CU}));
-  EXPECT_FALSE(Id5->isIdentity());
-  EXPECT_TRUE(Id5->isIdentityWithPadding());
-  EXPECT_FALSE(Id5->isIdentityWithExtract());
-  EXPECT_FALSE(Id5->isConcat());
-  delete Id5;
-
-  // Result has more elements than operands, and extra elements are undef; choose from Op1.
-  ShuffleVectorInst *Id6 = new ShuffleVectorInst(V0, V1,
-                                                 ConstantVector::get({C4, C5, C6, CU, CU, CU}));
-  EXPECT_FALSE(Id6->isIdentity());
-  EXPECT_TRUE(Id6->isIdentityWithPadding());
-  EXPECT_FALSE(Id6->isIdentityWithExtract());
-  EXPECT_FALSE(Id6->isConcat());
-  delete Id6;
-  
-  // Result has more elements than operands, but extra elements are not undef.
-  ShuffleVectorInst *Id7 = new ShuffleVectorInst(V0, V1,
-                                                 ConstantVector::get({C0, C1, C2, C3, CU, C1}));
-  EXPECT_FALSE(Id7->isIdentity());
-  EXPECT_FALSE(Id7->isIdentityWithPadding());
-  EXPECT_FALSE(Id7->isIdentityWithExtract());
-  EXPECT_FALSE(Id7->isConcat());
-  delete Id7;
-  
-  // Result has more elements than operands; choose from Op0 and Op1 is not identity.
-  ShuffleVectorInst *Id8 = new ShuffleVectorInst(V0, V1,
-                                                 ConstantVector::get({C4, CU, C2, C3, CU, CU}));
-  EXPECT_FALSE(Id8->isIdentity());
-  EXPECT_FALSE(Id8->isIdentityWithPadding());
-  EXPECT_FALSE(Id8->isIdentityWithExtract());
-  EXPECT_FALSE(Id8->isConcat());
-  delete Id8;
-
-  // Result has twice as many elements as operands; choose consecutively from Op0 and Op1 is concat.
-  ShuffleVectorInst *Id9 = new ShuffleVectorInst(V0, V1,
-                                                 ConstantVector::get({C0, CU, C2, C3, CU, CU, C6, C7}));
-  EXPECT_FALSE(Id9->isIdentity());
-  EXPECT_FALSE(Id9->isIdentityWithPadding());
-  EXPECT_FALSE(Id9->isIdentityWithExtract());
-  EXPECT_TRUE(Id9->isConcat());
-  delete Id9;
-
-  // Result has less than twice as many elements as operands, so not a concat.
-  ShuffleVectorInst *Id10 = new ShuffleVectorInst(V0, V1,
-                                                  ConstantVector::get({C0, CU, C2, C3, CU, CU, C6}));
-  EXPECT_FALSE(Id10->isIdentity());
-  EXPECT_FALSE(Id10->isIdentityWithPadding());
-  EXPECT_FALSE(Id10->isIdentityWithExtract());
-  EXPECT_FALSE(Id10->isConcat());
-  delete Id10;
-
-  // Result has more than twice as many elements as operands, so not a concat.
-  ShuffleVectorInst *Id11 = new ShuffleVectorInst(V0, V1,
-                                                  ConstantVector::get({C0, CU, C2, C3, CU, CU, C6, C7, CU}));
-  EXPECT_FALSE(Id11->isIdentity());
-  EXPECT_FALSE(Id11->isIdentityWithPadding());
-  EXPECT_FALSE(Id11->isIdentityWithExtract());
-  EXPECT_FALSE(Id11->isConcat());
-  delete Id11;
-
-  // If an input is undef, it's not a concat.
-  // TODO: IdentityWithPadding should be true here even though the high mask values are not undef.
-  ShuffleVectorInst *Id12 = new ShuffleVectorInst(V0, ConstantVector::get({CU, CU, CU, CU}),
-                                                  ConstantVector::get({C0, CU, C2, C3, CU, CU, C6, C7}));
-  EXPECT_FALSE(Id12->isIdentity());
-  EXPECT_FALSE(Id12->isIdentityWithPadding());
-  EXPECT_FALSE(Id12->isIdentityWithExtract());
-  EXPECT_FALSE(Id12->isConcat());
-  delete Id12;
-
-  // Not possible to express shuffle mask for scalable vector for extract
-  // subvector.
-  Type *VScaleV4Int32Ty = ScalableVectorType::get(Int32Ty, 4);
-  ShuffleVectorInst *Id13 =
-      new ShuffleVectorInst(Constant::getAllOnesValue(VScaleV4Int32Ty),
-                            UndefValue::get(VScaleV4Int32Ty),
-                            Constant::getNullValue(VScaleV4Int32Ty));
-  int Index = 0;
-  EXPECT_FALSE(Id13->isExtractSubvectorMask(Index));
-  EXPECT_FALSE(Id13->changesLength());
-  EXPECT_FALSE(Id13->increasesLength());
-  delete Id13;
-
-  // Result has twice as many operands.
-  Type *VScaleV2Int32Ty = ScalableVectorType::get(Int32Ty, 2);
-  ShuffleVectorInst *Id14 =
-      new ShuffleVectorInst(Constant::getAllOnesValue(VScaleV2Int32Ty),
-                            UndefValue::get(VScaleV2Int32Ty),
-                            Constant::getNullValue(VScaleV4Int32Ty));
-  EXPECT_TRUE(Id14->changesLength());
-  EXPECT_TRUE(Id14->increasesLength());
-  delete Id14;
-
-  // Not possible to express these masks for scalable vectors, make sure we
-  // don't crash.
-  ShuffleVectorInst *Id15 =
-      new ShuffleVectorInst(Constant::getAllOnesValue(VScaleV2Int32Ty),
-                            Constant::getNullValue(VScaleV2Int32Ty),
-                            Constant::getNullValue(VScaleV2Int32Ty));
-  EXPECT_FALSE(Id15->isIdentityWithPadding());
-  EXPECT_FALSE(Id15->isIdentityWithExtract());
-  EXPECT_FALSE(Id15->isConcat());
-  delete Id15;
-}
-
-TEST(InstructionsTest, GetSplat) {
-  // Create the elements for various constant vectors.
-  LLVMContext Ctx;
-  Type *Int32Ty = Type::getInt32Ty(Ctx);
-  Constant *CU = UndefValue::get(Int32Ty);
-  Constant *C0 = ConstantInt::get(Int32Ty, 0);
-  Constant *C1 = ConstantInt::get(Int32Ty, 1);
-
-  Constant *Splat0 = ConstantVector::get({C0, C0, C0, C0});
-  Constant *Splat1 = ConstantVector::get({C1, C1, C1, C1 ,C1});
-  Constant *Splat0Undef = ConstantVector::get({C0, CU, C0, CU});
-  Constant *Splat1Undef = ConstantVector::get({CU, CU, C1, CU});
-  Constant *NotSplat = ConstantVector::get({C1, C1, C0, C1 ,C1});
-  Constant *NotSplatUndef = ConstantVector::get({CU, C1, CU, CU ,C0});
-
-  // Default - undefs are not allowed.
-  EXPECT_EQ(Splat0->getSplatValue(), C0);
-  EXPECT_EQ(Splat1->getSplatValue(), C1);
-  EXPECT_EQ(Splat0Undef->getSplatValue(), nullptr);
-  EXPECT_EQ(Splat1Undef->getSplatValue(), nullptr);
-  EXPECT_EQ(NotSplat->getSplatValue(), nullptr);
-  EXPECT_EQ(NotSplatUndef->getSplatValue(), nullptr);
-
-  // Disallow undefs explicitly.
-  EXPECT_EQ(Splat0->getSplatValue(false), C0);
-  EXPECT_EQ(Splat1->getSplatValue(false), C1);
-  EXPECT_EQ(Splat0Undef->getSplatValue(false), nullptr);
-  EXPECT_EQ(Splat1Undef->getSplatValue(false), nullptr);
-  EXPECT_EQ(NotSplat->getSplatValue(false), nullptr);
-  EXPECT_EQ(NotSplatUndef->getSplatValue(false), nullptr);
-
-  // Allow undefs.
-  EXPECT_EQ(Splat0->getSplatValue(true), C0);
-  EXPECT_EQ(Splat1->getSplatValue(true), C1);
-  EXPECT_EQ(Splat0Undef->getSplatValue(true), C0);
-  EXPECT_EQ(Splat1Undef->getSplatValue(true), C1);
-  EXPECT_EQ(NotSplat->getSplatValue(true), nullptr);
-  EXPECT_EQ(NotSplatUndef->getSplatValue(true), nullptr);
-}
-
-TEST(InstructionsTest, SkipDebug) {
-  LLVMContext C;
-  std::unique_ptr<Module> M = parseIR(C,
-                                      R"(
-      declare void @llvm.dbg.value(metadata, metadata, metadata)
-
-      define void @f() {
-      entry:
-        call void @llvm.dbg.value(metadata i32 0, metadata !11, metadata !DIExpression()), !dbg !13
-        ret void
-      }
-
-      !llvm.dbg.cu = !{!0}
-      !llvm.module.flags = !{!3, !4}
-      !0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 6.0.0", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !2)
-      !1 = !DIFile(filename: "t2.c", directory: "foo")
-      !2 = !{}
-      !3 = !{i32 2, !"Dwarf Version", i32 4}
-      !4 = !{i32 2, !"Debug Info Version", i32 3}
-      !8 = distinct !DISubprogram(name: "f", scope: !1, file: !1, line: 1, type: !9, isLocal: false, isDefinition: true, scopeLine: 1, isOptimized: false, unit: !0, retainedNodes: !2)
-      !9 = !DISubroutineType(types: !10)
-      !10 = !{null}
-      !11 = !DILocalVariable(name: "x", scope: !8, file: !1, line: 2, type: !12)
-      !12 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
-      !13 = !DILocation(line: 2, column: 7, scope: !8)
-  )");
-  ASSERT_TRUE(M);
-  Function *F = cast<Function>(M->getNamedValue("f"));
-  BasicBlock &BB = F->front();
-
-  // The first non-debug instruction is the terminator.
-  auto *Term = BB.getTerminator();
-  EXPECT_EQ(Term, BB.begin()->getNextNonDebugInstruction());
-  EXPECT_EQ(Term->getIterator(), skipDebugIntrinsics(BB.begin()));
-
-  // After the terminator, there are no non-debug instructions.
-  EXPECT_EQ(nullptr, Term->getNextNonDebugInstruction());
-}
-
-TEST(InstructionsTest, PhiMightNotBeFPMathOperator) {
-  LLVMContext Context;
-  IRBuilder<> Builder(Context);
-  MDBuilder MDHelper(Context);
-  Instruction *I = Builder.CreatePHI(Builder.getInt32Ty(), 0);
-  EXPECT_FALSE(isa<FPMathOperator>(I));
-  I->deleteValue();
-  Instruction *FP = Builder.CreatePHI(Builder.getDoubleTy(), 0);
-  EXPECT_TRUE(isa<FPMathOperator>(FP));
-  FP->deleteValue();
-}
-
-TEST(InstructionsTest, FPCallIsFPMathOperator) {
-  LLVMContext C;
-
-  Type *ITy = Type::getInt32Ty(C);
-  FunctionType *IFnTy = FunctionType::get(ITy, {});
-  Value *ICallee = Constant::getNullValue(IFnTy->getPointerTo());
-  std::unique_ptr<CallInst> ICall(CallInst::Create(IFnTy, ICallee, {}, ""));
-  EXPECT_FALSE(isa<FPMathOperator>(ICall));
-
-  Type *VITy = FixedVectorType::get(ITy, 2);
-  FunctionType *VIFnTy = FunctionType::get(VITy, {});
-  Value *VICallee = Constant::getNullValue(VIFnTy->getPointerTo());
-  std::unique_ptr<CallInst> VICall(CallInst::Create(VIFnTy, VICallee, {}, ""));
-  EXPECT_FALSE(isa<FPMathOperator>(VICall));
-
-  Type *AITy = ArrayType::get(ITy, 2);
-  FunctionType *AIFnTy = FunctionType::get(AITy, {});
-  Value *AICallee = Constant::getNullValue(AIFnTy->getPointerTo());
-  std::unique_ptr<CallInst> AICall(CallInst::Create(AIFnTy, AICallee, {}, ""));
-  EXPECT_FALSE(isa<FPMathOperator>(AICall));
-
-  Type *FTy = Type::getFloatTy(C);
-  FunctionType *FFnTy = FunctionType::get(FTy, {});
-  Value *FCallee = Constant::getNullValue(FFnTy->getPointerTo());
-  std::unique_ptr<CallInst> FCall(CallInst::Create(FFnTy, FCallee, {}, ""));
-  EXPECT_TRUE(isa<FPMathOperator>(FCall));
-
-  Type *VFTy = FixedVectorType::get(FTy, 2);
-  FunctionType *VFFnTy = FunctionType::get(VFTy, {});
-  Value *VFCallee = Constant::getNullValue(VFFnTy->getPointerTo());
-  std::unique_ptr<CallInst> VFCall(CallInst::Create(VFFnTy, VFCallee, {}, ""));
-  EXPECT_TRUE(isa<FPMathOperator>(VFCall));
-
-  Type *AFTy = ArrayType::get(FTy, 2);
-  FunctionType *AFFnTy = FunctionType::get(AFTy, {});
-  Value *AFCallee = Constant::getNullValue(AFFnTy->getPointerTo());
-  std::unique_ptr<CallInst> AFCall(CallInst::Create(AFFnTy, AFCallee, {}, ""));
-  EXPECT_TRUE(isa<FPMathOperator>(AFCall));
-
-  Type *AVFTy = ArrayType::get(VFTy, 2);
-  FunctionType *AVFFnTy = FunctionType::get(AVFTy, {});
-  Value *AVFCallee = Constant::getNullValue(AVFFnTy->getPointerTo());
-  std::unique_ptr<CallInst> AVFCall(
-      CallInst::Create(AVFFnTy, AVFCallee, {}, ""));
-  EXPECT_TRUE(isa<FPMathOperator>(AVFCall));
-
-  Type *AAVFTy = ArrayType::get(AVFTy, 2);
-  FunctionType *AAVFFnTy = FunctionType::get(AAVFTy, {});
-  Value *AAVFCallee = Constant::getNullValue(AAVFFnTy->getPointerTo());
-  std::unique_ptr<CallInst> AAVFCall(
-      CallInst::Create(AAVFFnTy, AAVFCallee, {}, ""));
-  EXPECT_TRUE(isa<FPMathOperator>(AAVFCall));
-}
-
-TEST(InstructionsTest, FNegInstruction) {
-  LLVMContext Context;
-  Type *FltTy = Type::getFloatTy(Context);
-  Constant *One = ConstantFP::get(FltTy, 1.0);
-  BinaryOperator *FAdd = BinaryOperator::CreateFAdd(One, One);
-  FAdd->setHasNoNaNs(true);
-  UnaryOperator *FNeg = UnaryOperator::CreateFNegFMF(One, FAdd);
-  EXPECT_TRUE(FNeg->hasNoNaNs());
-  EXPECT_FALSE(FNeg->hasNoInfs());
-  EXPECT_FALSE(FNeg->hasNoSignedZeros());
-  EXPECT_FALSE(FNeg->hasAllowReciprocal());
-  EXPECT_FALSE(FNeg->hasAllowContract());
-  EXPECT_FALSE(FNeg->hasAllowReassoc());
-  EXPECT_FALSE(FNeg->hasApproxFunc());
-  FAdd->deleteValue();
-  FNeg->deleteValue();
-}
-
-TEST(InstructionsTest, CallBrInstruction) {
-  LLVMContext Context;
-  std::unique_ptr<Module> M = parseIR(Context, R"(
-define void @foo() {
-entry:
-  callbr void asm sideeffect "// XXX: ${0:l}", "X"(i8* blockaddress(@foo, %branch_test.exit))
-          to label %land.rhs.i [label %branch_test.exit]
-
-land.rhs.i:
-  br label %branch_test.exit
-
-branch_test.exit:
-  %0 = phi i1 [ true, %entry ], [ false, %land.rhs.i ]
-  br i1 %0, label %if.end, label %if.then
-
-if.then:
-  ret void
-
-if.end:
-  ret void
-}
-)");
-  Function *Foo = M->getFunction("foo");
-  auto BBs = Foo->getBasicBlockList().begin();
-  CallBrInst &CBI = cast<CallBrInst>(BBs->front());
-  ++BBs;
-  ++BBs;
-  BasicBlock &BranchTestExit = *BBs;
-  ++BBs;
-  BasicBlock &IfThen = *BBs;
-
-  // Test that setting the first indirect destination of callbr updates the dest
-  EXPECT_EQ(&BranchTestExit, CBI.getIndirectDest(0));
-  CBI.setIndirectDest(0, &IfThen);
-  EXPECT_EQ(&IfThen, CBI.getIndirectDest(0));
-
-  // Further, test that changing the indirect destination updates the arg
-  // operand to use the block address of the new indirect destination basic
-  // block. This is a critical invariant of CallBrInst.
-  BlockAddress *IndirectBA = BlockAddress::get(CBI.getIndirectDest(0));
-  BlockAddress *ArgBA = cast<BlockAddress>(CBI.getArgOperand(0));
-  EXPECT_EQ(IndirectBA, ArgBA)
-      << "After setting the indirect destination, callbr had an indirect "
-         "destination of '"
-      << CBI.getIndirectDest(0)->getName() << "', but a argument of '"
-      << ArgBA->getBasicBlock()->getName() << "'. These should always match:\n"
-      << CBI;
-  EXPECT_EQ(IndirectBA->getBasicBlock(), &IfThen);
-  EXPECT_EQ(ArgBA->getBasicBlock(), &IfThen);
-}
-
-TEST(InstructionsTest, UnaryOperator) {
-  LLVMContext Context;
-  IRBuilder<> Builder(Context);
-  Instruction *I = Builder.CreatePHI(Builder.getDoubleTy(), 0);
-  Value *F = Builder.CreateFNeg(I);
-
-  EXPECT_TRUE(isa<Value>(F));
-  EXPECT_TRUE(isa<Instruction>(F));
-  EXPECT_TRUE(isa<UnaryInstruction>(F));
-  EXPECT_TRUE(isa<UnaryOperator>(F));
-  EXPECT_FALSE(isa<BinaryOperator>(F));
-
-  F->deleteValue();
-  I->deleteValue();
-}
-
-TEST(InstructionsTest, DropLocation) {
-  LLVMContext C;
-  std::unique_ptr<Module> M = parseIR(C,
-                                      R"(
-      declare void @callee()
-
-      define void @no_parent_scope() {
-        call void @callee()           ; I1: Call with no location.
-        call void @callee(), !dbg !11 ; I2: Call with location.
-        ret void, !dbg !11            ; I3: Non-call with location.
-      }
-
-      define void @with_parent_scope() !dbg !8 {
-        call void @callee()           ; I1: Call with no location.
-        call void @callee(), !dbg !11 ; I2: Call with location.
-        ret void, !dbg !11            ; I3: Non-call with location.
-      }
-
-      !llvm.dbg.cu = !{!0}
-      !llvm.module.flags = !{!3, !4}
-      !0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !2)
-      !1 = !DIFile(filename: "t2.c", directory: "foo")
-      !2 = !{}
-      !3 = !{i32 2, !"Dwarf Version", i32 4}
-      !4 = !{i32 2, !"Debug Info Version", i32 3}
-      !8 = distinct !DISubprogram(name: "f", scope: !1, file: !1, line: 1, type: !9, isLocal: false, isDefinition: true, scopeLine: 1, isOptimized: false, unit: !0, retainedNodes: !2)
-      !9 = !DISubroutineType(types: !10)
-      !10 = !{null}
-      !11 = !DILocation(line: 2, column: 7, scope: !8, inlinedAt: !12)
-      !12 = !DILocation(line: 3, column: 8, scope: !8)
-  )");
-  ASSERT_TRUE(M);
-
-  {
-    Function *NoParentScopeF =
-        cast<Function>(M->getNamedValue("no_parent_scope"));
-    BasicBlock &BB = NoParentScopeF->front();
-
-    auto *I1 = BB.getFirstNonPHI();
-    auto *I2 = I1->getNextNode();
-    auto *I3 = BB.getTerminator();
-
-    EXPECT_EQ(I1->getDebugLoc(), DebugLoc());
-    I1->dropLocation();
-    EXPECT_EQ(I1->getDebugLoc(), DebugLoc());
-
-    EXPECT_EQ(I2->getDebugLoc().getLine(), 2U);
-    I2->dropLocation();
-    EXPECT_EQ(I1->getDebugLoc(), DebugLoc());
-
-    EXPECT_EQ(I3->getDebugLoc().getLine(), 2U);
-    I3->dropLocation();
-    EXPECT_EQ(I3->getDebugLoc(), DebugLoc());
-  }
-
-  {
-    Function *WithParentScopeF =
-        cast<Function>(M->getNamedValue("with_parent_scope"));
-    BasicBlock &BB = WithParentScopeF->front();
-
-    auto *I2 = BB.getFirstNonPHI()->getNextNode();
-
-    MDNode *Scope = cast<MDNode>(WithParentScopeF->getSubprogram());
-    EXPECT_EQ(I2->getDebugLoc().getLine(), 2U);
-    I2->dropLocation();
-    EXPECT_EQ(I2->getDebugLoc().getLine(), 0U);
-    EXPECT_EQ(I2->getDebugLoc().getScope(), Scope);
-    EXPECT_EQ(I2->getDebugLoc().getInlinedAt(), nullptr);
-  }
-}
-
-TEST(InstructionsTest, BranchWeightOverflow) {
-  LLVMContext C;
-  std::unique_ptr<Module> M = parseIR(C,
-                                      R"(
-      declare void @callee()
-
-      define void @caller() {
-        call void @callee(), !prof !1
-        ret void
-      }
-
-      !1 = !{!"branch_weights", i32 20000}
-  )");
-  ASSERT_TRUE(M);
-  CallInst *CI =
-      cast<CallInst>(&M->getFunction("caller")->getEntryBlock().front());
-  uint64_t ProfWeight;
-  CI->extractProfTotalWeight(ProfWeight);
-  ASSERT_EQ(ProfWeight, 20000U);
-  CI->updateProfWeight(10000000, 1);
-  CI->extractProfTotalWeight(ProfWeight);
-  ASSERT_EQ(ProfWeight, UINT32_MAX);
-}
-
-TEST(InstructionsTest, AllocaInst) {
-  LLVMContext Ctx;
-  std::unique_ptr<Module> M = parseIR(Ctx, R"(
-      %T = type { i64, [3 x i32]}
-      define void @f(i32 %n) {
-      entry:
-        %A = alloca i32, i32 1
-        %B = alloca i32, i32 4
-        %C = alloca i32, i32 %n
-        %D = alloca <8 x double>
-        %E = alloca <vscale x 8 x double>
-        %F = alloca [2 x half]
-        %G = alloca [2 x [3 x i128]]
-        %H = alloca %T
-        ret void
-      }
-    )");
-  const DataLayout &DL = M->getDataLayout();
-  ASSERT_TRUE(M);
-  Function *Fun = cast<Function>(M->getNamedValue("f"));
-  BasicBlock &BB = Fun->front();
-  auto It = BB.begin();
-  AllocaInst &A = cast<AllocaInst>(*It++);
-  AllocaInst &B = cast<AllocaInst>(*It++);
-  AllocaInst &C = cast<AllocaInst>(*It++);
-  AllocaInst &D = cast<AllocaInst>(*It++);
-  AllocaInst &E = cast<AllocaInst>(*It++);
-  AllocaInst &F = cast<AllocaInst>(*It++);
-  AllocaInst &G = cast<AllocaInst>(*It++);
-  AllocaInst &H = cast<AllocaInst>(*It++);
-  EXPECT_EQ(A.getAllocationSizeInBits(DL), TypeSize::getFixed(32));
-  EXPECT_EQ(B.getAllocationSizeInBits(DL), TypeSize::getFixed(128));
-  EXPECT_FALSE(C.getAllocationSizeInBits(DL));
-  EXPECT_EQ(D.getAllocationSizeInBits(DL), TypeSize::getFixed(512));
-  EXPECT_EQ(E.getAllocationSizeInBits(DL), TypeSize::getScalable(512));
-  EXPECT_EQ(F.getAllocationSizeInBits(DL), TypeSize::getFixed(32));
-  EXPECT_EQ(G.getAllocationSizeInBits(DL), TypeSize::getFixed(768));
-  EXPECT_EQ(H.getAllocationSizeInBits(DL), TypeSize::getFixed(160));
-}
-
-} // end anonymous namespace
-} // end namespace llvm
diff --git a/gnu/llvm/llvm/unittests/IR/IntrinsicsTest.cpp b/gnu/llvm/llvm/unittests/IR/IntrinsicsTest.cpp
deleted file mode 100644
index a500346b66a..00000000000
--- a/gnu/llvm/llvm/unittests/IR/IntrinsicsTest.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-//===- llvm/unittest/IR/IntrinsicsTest.cpp - ------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/IR/IntrinsicInst.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-static const char *const NameTable1[] = {
-  "llvm.foo",
-  "llvm.foo.a",
-  "llvm.foo.b",
-  "llvm.foo.b.a",
-  "llvm.foo.c",
-};
-
-TEST(IntrinNameLookup, Basic) {
-  int I = Intrinsic::lookupLLVMIntrinsicByName(NameTable1, "llvm.foo");
-  EXPECT_EQ(0, I);
-  I = Intrinsic::lookupLLVMIntrinsicByName(NameTable1, "llvm.foo.f64");
-  EXPECT_EQ(0, I);
-  I = Intrinsic::lookupLLVMIntrinsicByName(NameTable1, "llvm.foo.b");
-  EXPECT_EQ(2, I);
-  I = Intrinsic::lookupLLVMIntrinsicByName(NameTable1, "llvm.foo.b.a");
-  EXPECT_EQ(3, I);
-  I = Intrinsic::lookupLLVMIntrinsicByName(NameTable1, "llvm.foo.c");
-  EXPECT_EQ(4, I);
-  I = Intrinsic::lookupLLVMIntrinsicByName(NameTable1, "llvm.foo.c.f64");
-  EXPECT_EQ(4, I);
-}
-
-} // end namespace
diff --git a/gnu/llvm/llvm/unittests/IR/LegacyPassManagerTest.cpp b/gnu/llvm/llvm/unittests/IR/LegacyPassManagerTest.cpp
deleted file mode 100644
index f461bcc8c77..00000000000
--- a/gnu/llvm/llvm/unittests/IR/LegacyPassManagerTest.cpp
+++ /dev/null
@@ -1,793 +0,0 @@
-//===- llvm/unittest/IR/LegacyPassManager.cpp - Legacy PassManager tests --===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This unit test exercises the legacy pass manager infrastructure. We use the
-// old names as well to ensure that the source-level compatibility is preserved
-// where possible.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/IR/LegacyPassManager.h"
-#include "llvm/Analysis/CallGraphSCCPass.h"
-#include "llvm/Analysis/LoopInfo.h"
-#include "llvm/Analysis/LoopPass.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/AbstractCallSite.h"
-#include "llvm/IR/BasicBlock.h"
-#include "llvm/IR/CallingConv.h"
-#include "llvm/IR/DataLayout.h"
-#include "llvm/IR/DerivedTypes.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/GlobalVariable.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/OptBisect.h"
-#include "llvm/InitializePasses.h"
-#include "llvm/Support/MathExtras.h"
-#include "llvm/Support/SourceMgr.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/Transforms/Utils/CallGraphUpdater.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace llvm {
-  void initializeModuleNDMPass(PassRegistry&);
-  void initializeFPassPass(PassRegistry&);
-  void initializeCGPassPass(PassRegistry&);
-  void initializeLPassPass(PassRegistry&);
-
-  namespace {
-    // ND = no deps
-    // NM = no modifications
-    struct ModuleNDNM: public ModulePass {
-    public:
-      static char run;
-      static char ID;
-      ModuleNDNM() : ModulePass(ID) { }
-      bool runOnModule(Module &M) override {
-        run++;
-        return false;
-      }
-      void getAnalysisUsage(AnalysisUsage &AU) const override {
-        AU.setPreservesAll();
-      }
-    };
-    char ModuleNDNM::ID=0;
-    char ModuleNDNM::run=0;
-
-    struct ModuleNDM : public ModulePass {
-    public:
-      static char run;
-      static char ID;
-      ModuleNDM() : ModulePass(ID) {}
-      bool runOnModule(Module &M) override {
-        run++;
-        return true;
-      }
-    };
-    char ModuleNDM::ID=0;
-    char ModuleNDM::run=0;
-
-    struct ModuleNDM2 : public ModulePass {
-    public:
-      static char run;
-      static char ID;
-      ModuleNDM2() : ModulePass(ID) {}
-      bool runOnModule(Module &M) override {
-        run++;
-        return true;
-      }
-    };
-    char ModuleNDM2::ID=0;
-    char ModuleNDM2::run=0;
-
-    struct ModuleDNM : public ModulePass {
-    public:
-      static char run;
-      static char ID;
-      ModuleDNM() : ModulePass(ID) {
-        initializeModuleNDMPass(*PassRegistry::getPassRegistry());
-      }
-      bool runOnModule(Module &M) override {
-        run++;
-        return false;
-      }
-      void getAnalysisUsage(AnalysisUsage &AU) const override {
-        AU.addRequired<ModuleNDM>();
-        AU.setPreservesAll();
-      }
-    };
-    char ModuleDNM::ID=0;
-    char ModuleDNM::run=0;
-
-    template<typename P>
-    struct PassTestBase : public P {
-    protected:
-      static int runc;
-      static bool initialized;
-      static bool finalized;
-      int allocated;
-      void run() {
-        EXPECT_TRUE(initialized);
-        EXPECT_FALSE(finalized);
-        EXPECT_EQ(0, allocated);
-        allocated++;
-        runc++;
-      }
-    public:
-      static char ID;
-      static void finishedOK(int run) {
-        EXPECT_GT(runc, 0);
-        EXPECT_TRUE(initialized);
-        EXPECT_TRUE(finalized);
-        EXPECT_EQ(run, runc);
-      }
-      PassTestBase() : P(ID), allocated(0) {
-        initialized = false;
-        finalized = false;
-        runc = 0;
-      }
-
-      void releaseMemory() override {
-        EXPECT_GT(runc, 0);
-        EXPECT_GT(allocated, 0);
-        allocated--;
-      }
-    };
-    template<typename P> char PassTestBase<P>::ID;
-    template<typename P> int PassTestBase<P>::runc;
-    template<typename P> bool PassTestBase<P>::initialized;
-    template<typename P> bool PassTestBase<P>::finalized;
-
-    template<typename T, typename P>
-    struct PassTest : public PassTestBase<P> {
-    public:
-#ifndef _MSC_VER // MSVC complains that Pass is not base class.
-      using llvm::Pass::doInitialization;
-      using llvm::Pass::doFinalization;
-#endif
-      bool doInitialization(T &t) override {
-        EXPECT_FALSE(PassTestBase<P>::initialized);
-        PassTestBase<P>::initialized = true;
-        return false;
-      }
-      bool doFinalization(T &t) override {
-        EXPECT_FALSE(PassTestBase<P>::finalized);
-        PassTestBase<P>::finalized = true;
-        EXPECT_EQ(0, PassTestBase<P>::allocated);
-        return false;
-      }
-    };
-
-    struct CGPass : public PassTest<CallGraph, CallGraphSCCPass> {
-    public:
-      CGPass() {
-        initializeCGPassPass(*PassRegistry::getPassRegistry());
-      }
-      bool runOnSCC(CallGraphSCC &SCMM) override {
-        run();
-        return false;
-      }
-    };
-
-    struct FPass : public PassTest<Module, FunctionPass> {
-    public:
-      bool runOnFunction(Function &F) override {
-        // FIXME: PR4112
-        // EXPECT_TRUE(getAnalysisIfAvailable<DataLayout>());
-        run();
-        return false;
-      }
-    };
-
-    struct LPass : public PassTestBase<LoopPass> {
-    private:
-      static int initcount;
-      static int fincount;
-    public:
-      LPass() {
-        initializeLPassPass(*PassRegistry::getPassRegistry());
-        initcount = 0; fincount=0;
-        EXPECT_FALSE(initialized);
-      }
-      static void finishedOK(int run, int finalized) {
-        PassTestBase<LoopPass>::finishedOK(run);
-        EXPECT_EQ(run, initcount);
-        EXPECT_EQ(finalized, fincount);
-      }
-      using llvm::Pass::doInitialization;
-      using llvm::Pass::doFinalization;
-      bool doInitialization(Loop* L, LPPassManager &LPM) override {
-        initialized = true;
-        initcount++;
-        return false;
-      }
-      bool runOnLoop(Loop *L, LPPassManager &LPM) override {
-        run();
-        return false;
-      }
-      bool doFinalization() override {
-        fincount++;
-        finalized = true;
-        return false;
-      }
-    };
-    int LPass::initcount=0;
-    int LPass::fincount=0;
-
-    struct OnTheFlyTest: public ModulePass {
-    public:
-      static char ID;
-      OnTheFlyTest() : ModulePass(ID) {
-        initializeFPassPass(*PassRegistry::getPassRegistry());
-      }
-      bool runOnModule(Module &M) override {
-        for (Module::iterator I=M.begin(),E=M.end(); I != E; ++I) {
-          Function &F = *I;
-          {
-            SCOPED_TRACE("Running on the fly function pass");
-            getAnalysis<FPass>(F);
-          }
-        }
-        return false;
-      }
-      void getAnalysisUsage(AnalysisUsage &AU) const override {
-        AU.addRequired<FPass>();
-      }
-    };
-    char OnTheFlyTest::ID=0;
-
-    TEST(PassManager, RunOnce) {
-      LLVMContext Context;
-      Module M("test-once", Context);
-      struct ModuleNDNM *mNDNM = new ModuleNDNM();
-      struct ModuleDNM *mDNM = new ModuleDNM();
-      struct ModuleNDM *mNDM = new ModuleNDM();
-      struct ModuleNDM2 *mNDM2 = new ModuleNDM2();
-
-      mNDM->run = mNDNM->run = mDNM->run = mNDM2->run = 0;
-
-      legacy::PassManager Passes;
-      Passes.add(mNDM2);
-      Passes.add(mNDM);
-      Passes.add(mNDNM);
-      Passes.add(mDNM);
-
-      Passes.run(M);
-      // each pass must be run exactly once, since nothing invalidates them
-      EXPECT_EQ(1, mNDM->run);
-      EXPECT_EQ(1, mNDNM->run);
-      EXPECT_EQ(1, mDNM->run);
-      EXPECT_EQ(1, mNDM2->run);
-    }
-
-    TEST(PassManager, ReRun) {
-      LLVMContext Context;
-      Module M("test-rerun", Context);
-      struct ModuleNDNM *mNDNM = new ModuleNDNM();
-      struct ModuleDNM *mDNM = new ModuleDNM();
-      struct ModuleNDM *mNDM = new ModuleNDM();
-      struct ModuleNDM2 *mNDM2 = new ModuleNDM2();
-
-      mNDM->run = mNDNM->run = mDNM->run = mNDM2->run = 0;
-
-      legacy::PassManager Passes;
-      Passes.add(mNDM);
-      Passes.add(mNDNM);
-      Passes.add(mNDM2);// invalidates mNDM needed by mDNM
-      Passes.add(mDNM);
-
-      Passes.run(M);
-      // Some passes must be rerun because a pass that modified the
-      // module/function was run in between
-      EXPECT_EQ(2, mNDM->run);
-      EXPECT_EQ(1, mNDNM->run);
-      EXPECT_EQ(1, mNDM2->run);
-      EXPECT_EQ(1, mDNM->run);
-    }
-
-    Module *makeLLVMModule(LLVMContext &Context);
-
-    template<typename T>
-    void MemoryTestHelper(int run) {
-      LLVMContext Context;
-      std::unique_ptr<Module> M(makeLLVMModule(Context));
-      T *P = new T();
-      legacy::PassManager Passes;
-      Passes.add(P);
-      Passes.run(*M);
-      T::finishedOK(run);
-    }
-
-    template<typename T>
-    void MemoryTestHelper(int run, int N) {
-      LLVMContext Context;
-      Module *M = makeLLVMModule(Context);
-      T *P = new T();
-      legacy::PassManager Passes;
-      Passes.add(P);
-      Passes.run(*M);
-      T::finishedOK(run, N);
-      delete M;
-    }
-
-    TEST(PassManager, Memory) {
-      // SCC#1: test1->test2->test3->test1
-      // SCC#2: test4
-      // SCC#3: indirect call node
-      {
-        SCOPED_TRACE("Callgraph pass");
-        MemoryTestHelper<CGPass>(3);
-      }
-
-      {
-        SCOPED_TRACE("Function pass");
-        MemoryTestHelper<FPass>(4);// 4 functions
-      }
-
-      {
-        SCOPED_TRACE("Loop pass");
-        MemoryTestHelper<LPass>(2, 1); //2 loops, 1 function
-      }
-
-    }
-
-    TEST(PassManager, MemoryOnTheFly) {
-      LLVMContext Context;
-      Module *M = makeLLVMModule(Context);
-      {
-        SCOPED_TRACE("Running OnTheFlyTest");
-        struct OnTheFlyTest *O = new OnTheFlyTest();
-        legacy::PassManager Passes;
-        Passes.add(O);
-        Passes.run(*M);
-
-        FPass::finishedOK(4);
-      }
-      delete M;
-    }
-
-    // Skips or runs optional passes.
-    struct CustomOptPassGate : public OptPassGate {
-      bool Skip;
-      CustomOptPassGate(bool Skip) : Skip(Skip) { }
-      bool shouldRunPass(const Pass *P, StringRef IRDescription) override {
-        if (P->getPassKind() == PT_Module)
-          return !Skip;
-        return OptPassGate::shouldRunPass(P, IRDescription);
-      }
-      bool isEnabled() const override { return true; }
-    };
-
-    // Optional module pass.
-    struct ModuleOpt: public ModulePass {
-      char run = 0;
-      static char ID;
-      ModuleOpt() : ModulePass(ID) { }
-      bool runOnModule(Module &M) override {
-        if (!skipModule(M))
-          run++;
-        return false;
-      }
-    };
-    char ModuleOpt::ID=0;
-
-    TEST(PassManager, CustomOptPassGate) {
-      LLVMContext Context0;
-      LLVMContext Context1;
-      LLVMContext Context2;
-      CustomOptPassGate SkipOptionalPasses(true);
-      CustomOptPassGate RunOptionalPasses(false);
-
-      Module M0("custom-opt-bisect", Context0);
-      Module M1("custom-opt-bisect", Context1);
-      Module M2("custom-opt-bisect2", Context2);
-      struct ModuleOpt *mOpt0 = new ModuleOpt();
-      struct ModuleOpt *mOpt1 = new ModuleOpt();
-      struct ModuleOpt *mOpt2 = new ModuleOpt();
-
-      mOpt0->run = mOpt1->run = mOpt2->run = 0;
-
-      legacy::PassManager Passes0;
-      legacy::PassManager Passes1;
-      legacy::PassManager Passes2;
-
-      Passes0.add(mOpt0);
-      Passes1.add(mOpt1);
-      Passes2.add(mOpt2);
-
-      Context1.setOptPassGate(SkipOptionalPasses);
-      Context2.setOptPassGate(RunOptionalPasses);
-
-      Passes0.run(M0);
-      Passes1.run(M1);
-      Passes2.run(M2);
-
-      // By default optional passes are run.
-      EXPECT_EQ(1, mOpt0->run);
-
-      // The first context skips optional passes.
-      EXPECT_EQ(0, mOpt1->run);
-
-      // The second context runs optional passes.
-      EXPECT_EQ(1, mOpt2->run);
-    }
-
-    Module *makeLLVMModule(LLVMContext &Context) {
-      // Module Construction
-      Module *mod = new Module("test-mem", Context);
-      mod->setDataLayout("e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-"
-                         "i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-"
-                         "a:0:64-s:64:64-f80:128:128");
-      mod->setTargetTriple("x86_64-unknown-linux-gnu");
-
-      // Type Definitions
-      std::vector<Type*>FuncTy_0_args;
-      FunctionType *FuncTy_0 = FunctionType::get(
-          /*Result=*/IntegerType::get(Context, 32),
-          /*Params=*/FuncTy_0_args,
-          /*isVarArg=*/false);
-
-      std::vector<Type*>FuncTy_2_args;
-      FuncTy_2_args.push_back(IntegerType::get(Context, 1));
-      FunctionType *FuncTy_2 = FunctionType::get(
-          /*Result=*/Type::getVoidTy(Context),
-          /*Params=*/FuncTy_2_args,
-          /*isVarArg=*/false);
-
-      // Function Declarations
-
-      Function* func_test1 = Function::Create(
-        /*Type=*/FuncTy_0,
-        /*Linkage=*/GlobalValue::ExternalLinkage,
-        /*Name=*/"test1", mod);
-      func_test1->setCallingConv(CallingConv::C);
-      AttributeList func_test1_PAL;
-      func_test1->setAttributes(func_test1_PAL);
-
-      Function* func_test2 = Function::Create(
-        /*Type=*/FuncTy_0,
-        /*Linkage=*/GlobalValue::ExternalLinkage,
-        /*Name=*/"test2", mod);
-      func_test2->setCallingConv(CallingConv::C);
-      AttributeList func_test2_PAL;
-      func_test2->setAttributes(func_test2_PAL);
-
-      Function* func_test3 = Function::Create(
-        /*Type=*/FuncTy_0,
-        /*Linkage=*/GlobalValue::InternalLinkage,
-        /*Name=*/"test3", mod);
-      func_test3->setCallingConv(CallingConv::C);
-      AttributeList func_test3_PAL;
-      func_test3->setAttributes(func_test3_PAL);
-
-      Function* func_test4 = Function::Create(
-        /*Type=*/FuncTy_2,
-        /*Linkage=*/GlobalValue::ExternalLinkage,
-        /*Name=*/"test4", mod);
-      func_test4->setCallingConv(CallingConv::C);
-      AttributeList func_test4_PAL;
-      func_test4->setAttributes(func_test4_PAL);
-
-      // Global Variable Declarations
-
-
-      // Constant Definitions
-
-      // Global Variable Definitions
-
-      // Function Definitions
-
-      // Function: test1 (func_test1)
-      {
-
-        BasicBlock *label_entry =
-            BasicBlock::Create(Context, "entry", func_test1, nullptr);
-
-        // Block entry (label_entry)
-        CallInst* int32_3 = CallInst::Create(func_test2, "", label_entry);
-        int32_3->setCallingConv(CallingConv::C);
-        int32_3->setTailCall(false);
-        AttributeList int32_3_PAL;
-        int32_3->setAttributes(int32_3_PAL);
-
-        ReturnInst::Create(Context, int32_3, label_entry);
-      }
-
-      // Function: test2 (func_test2)
-      {
-
-        BasicBlock *label_entry_5 =
-            BasicBlock::Create(Context, "entry", func_test2, nullptr);
-
-        // Block entry (label_entry_5)
-        CallInst* int32_6 = CallInst::Create(func_test3, "", label_entry_5);
-        int32_6->setCallingConv(CallingConv::C);
-        int32_6->setTailCall(false);
-        AttributeList int32_6_PAL;
-        int32_6->setAttributes(int32_6_PAL);
-
-        ReturnInst::Create(Context, int32_6, label_entry_5);
-      }
-
-      // Function: test3 (func_test3)
-      {
-
-        BasicBlock *label_entry_8 =
-            BasicBlock::Create(Context, "entry", func_test3, nullptr);
-
-        // Block entry (label_entry_8)
-        CallInst* int32_9 = CallInst::Create(func_test1, "", label_entry_8);
-        int32_9->setCallingConv(CallingConv::C);
-        int32_9->setTailCall(false);
-        AttributeList int32_9_PAL;
-        int32_9->setAttributes(int32_9_PAL);
-
-        ReturnInst::Create(Context, int32_9, label_entry_8);
-      }
-
-      // Function: test4 (func_test4)
-      {
-        Function::arg_iterator args = func_test4->arg_begin();
-        Value *int1_f = &*args++;
-        int1_f->setName("f");
-
-        BasicBlock *label_entry_11 =
-            BasicBlock::Create(Context, "entry", func_test4, nullptr);
-        BasicBlock *label_bb =
-            BasicBlock::Create(Context, "bb", func_test4, nullptr);
-        BasicBlock *label_bb1 =
-            BasicBlock::Create(Context, "bb1", func_test4, nullptr);
-        BasicBlock *label_return =
-            BasicBlock::Create(Context, "return", func_test4, nullptr);
-
-        // Block entry (label_entry_11)
-        auto *AI = new AllocaInst(func_test3->getType(), 0, "func3ptr",
-                                  label_entry_11);
-        new StoreInst(func_test3, AI, label_entry_11);
-        BranchInst::Create(label_bb, label_entry_11);
-
-        // Block bb (label_bb)
-        BranchInst::Create(label_bb, label_bb1, int1_f, label_bb);
-
-        // Block bb1 (label_bb1)
-        BranchInst::Create(label_bb1, label_return, int1_f, label_bb1);
-
-        // Block return (label_return)
-        ReturnInst::Create(Context, label_return);
-      }
-      return mod;
-    }
-
-    /// Split a simple function which contains only a call and a return into two
-    /// such that the first calls the second and the second whoever was called
-    /// initially.
-    Function *splitSimpleFunction(Function &F) {
-      LLVMContext &Context = F.getContext();
-      Function *SF = Function::Create(F.getFunctionType(), F.getLinkage(),
-                                      F.getName() + "b", F.getParent());
-      F.setName(F.getName() + "a");
-      BasicBlock *Entry = BasicBlock::Create(Context, "entry", SF, nullptr);
-      CallInst &CI = cast<CallInst>(F.getEntryBlock().front());
-      CI.clone()->insertBefore(ReturnInst::Create(Context, Entry));
-      CI.setCalledFunction(SF);
-      return SF;
-    }
-
-    struct CGModifierPass : public CGPass {
-      unsigned NumSCCs = 0;
-      unsigned NumFns = 0;
-      unsigned NumFnDecls = 0;
-      unsigned SetupWorked = 0;
-      unsigned NumExtCalledBefore = 0;
-      unsigned NumExtCalledAfter = 0;
-
-      CallGraphUpdater CGU;
-
-      bool runOnSCC(CallGraphSCC &SCMM) override {
-        ++NumSCCs;
-        for (CallGraphNode *N : SCMM) {
-          if (N->getFunction()){
-            ++NumFns;
-            NumFnDecls += N->getFunction()->isDeclaration();
-          }
-        }
-        CGPass::run();
-
-        CallGraph &CG = const_cast<CallGraph &>(SCMM.getCallGraph());
-        CallGraphNode *ExtCallingNode = CG.getExternalCallingNode();
-        NumExtCalledBefore = ExtCallingNode->size();
-
-        if (SCMM.size() <= 1)
-          return false;
-
-        CallGraphNode *N = *(SCMM.begin());
-        Function *F = N->getFunction();
-        Module *M = F->getParent();
-        Function *Test1F = M->getFunction("test1");
-        Function *Test2aF = M->getFunction("test2a");
-        Function *Test2bF = M->getFunction("test2b");
-        Function *Test3F = M->getFunction("test3");
-
-        auto InSCC = [&](Function *Fn) {
-          return llvm::any_of(SCMM, [Fn](CallGraphNode *CGN) {
-            return CGN->getFunction() == Fn;
-          });
-        };
-
-        if (!Test1F || !Test2aF || !Test2bF || !Test3F || !InSCC(Test1F) ||
-            !InSCC(Test2aF) || !InSCC(Test2bF) || !InSCC(Test3F))
-          return false;
-
-        CallInst *CI = dyn_cast<CallInst>(&Test1F->getEntryBlock().front());
-        if (!CI || CI->getCalledFunction() != Test2aF)
-          return false;
-
-        SetupWorked += 1;
-
-        // Create a replica of test3 and just move the blocks there.
-        Function *Test3FRepl = Function::Create(
-            /*Type=*/Test3F->getFunctionType(),
-            /*Linkage=*/GlobalValue::InternalLinkage,
-            /*Name=*/"test3repl", Test3F->getParent());
-        while (!Test3F->empty()) {
-          BasicBlock &BB = Test3F->front();
-          BB.removeFromParent();
-          BB.insertInto(Test3FRepl);
-        }
-
-        CGU.initialize(CG, SCMM);
-
-        // Replace test3 with the replica. This is legal as it is actually
-        // internal and the "capturing use" is not really capturing anything.
-        CGU.replaceFunctionWith(*Test3F, *Test3FRepl);
-        Test3F->replaceAllUsesWith(Test3FRepl);
-
-        // Rewrite the call in test1 to point to the replica of 3 not test2.
-        CI->setCalledFunction(Test3FRepl);
-
-        // Delete test2a and test2b and reanalyze 1 as we changed calls inside.
-        CGU.removeFunction(*Test2aF);
-        CGU.removeFunction(*Test2bF);
-        CGU.reanalyzeFunction(*Test1F);
-
-        return true;
-      }
-
-      bool doFinalization(CallGraph &CG) override {
-        CGU.finalize();
-        // We removed test2 and replaced the internal test3.
-        NumExtCalledAfter = CG.getExternalCallingNode()->size();
-        return true;
-      }
-    };
-
-    TEST(PassManager, CallGraphUpdater0) {
-      // SCC#1: test1->test2a->test2b->test3->test1
-      // SCC#2: test4
-      // SCC#3: test3 (the empty function declaration as we replaced it with
-      //               test3repl when we visited SCC#1)
-      // SCC#4: test2a->test2b (the empty function declarations as we deleted
-      //                        these functions when we visited SCC#1)
-      // SCC#5: indirect call node
-
-      LLVMContext Context;
-      std::unique_ptr<Module> M(makeLLVMModule(Context));
-      ASSERT_EQ(M->getFunctionList().size(), 4U);
-      Function *F = M->getFunction("test2");
-      Function *SF = splitSimpleFunction(*F);
-      CallInst::Create(F, "", &*SF->getEntryBlock().getFirstInsertionPt());
-      ASSERT_EQ(M->getFunctionList().size(), 5U);
-      CGModifierPass *P = new CGModifierPass();
-      legacy::PassManager Passes;
-      Passes.add(P);
-      Passes.run(*M);
-      ASSERT_EQ(P->SetupWorked, 1U);
-      ASSERT_EQ(P->NumSCCs, 4U);
-      ASSERT_EQ(P->NumFns, 6U);
-      ASSERT_EQ(P->NumFnDecls, 1U);
-      ASSERT_EQ(M->getFunctionList().size(), 3U);
-      ASSERT_EQ(P->NumExtCalledBefore, /* test1, 2a, 2b, 3, 4 */ 5U);
-      ASSERT_EQ(P->NumExtCalledAfter, /* test1, 3repl, 4 */ 3U);
-    }
-
-    // Test for call graph SCC pass that replaces all callback call instructions
-    // with clones and updates CallGraph by calling CallGraph::replaceCallEdge()
-    // method. Test is expected to complete successfully after running pass on
-    // all SCCs in the test module.
-    struct CallbackCallsModifierPass : public CGPass {
-      bool runOnSCC(CallGraphSCC &SCC) override {
-        CGPass::run();
-
-        CallGraph &CG = const_cast<CallGraph &>(SCC.getCallGraph());
-
-        bool Changed = false;
-        for (CallGraphNode *CGN : SCC) {
-          Function *F = CGN->getFunction();
-          if (!F || F->isDeclaration())
-            continue;
-
-          SmallVector<CallBase *, 4u> Calls;
-          for (Use &U : F->uses()) {
-            AbstractCallSite ACS(&U);
-            if (!ACS || !ACS.isCallbackCall() || !ACS.isCallee(&U))
-              continue;
-            Calls.push_back(cast<CallBase>(ACS.getInstruction()));
-          }
-          if (Calls.empty())
-            continue;
-
-          for (CallBase *OldCB : Calls) {
-            CallGraphNode *CallerCGN = CG[OldCB->getParent()->getParent()];
-            assert(any_of(*CallerCGN,
-                          [CGN](const CallGraphNode::CallRecord &CallRecord) {
-                            return CallRecord.second == CGN;
-                          }) &&
-                   "function is not a callee");
-
-            CallBase *NewCB = cast<CallBase>(OldCB->clone());
-
-            NewCB->insertBefore(OldCB);
-            NewCB->takeName(OldCB);
-
-            CallerCGN->replaceCallEdge(*OldCB, *NewCB, CG[F]);
-
-            OldCB->replaceAllUsesWith(NewCB);
-            OldCB->eraseFromParent();
-          }
-          Changed = true;
-        }
-        return Changed;
-      }
-    };
-
-    TEST(PassManager, CallbackCallsModifier0) {
-      LLVMContext Context;
-
-      const char *IR = "define void @foo() {\n"
-                       "  call void @broker(void (i8*)* @callback0, i8* null)\n"
-                       "  call void @broker(void (i8*)* @callback1, i8* null)\n"
-                       "  ret void\n"
-                       "}\n"
-                       "\n"
-                       "declare !callback !0 void @broker(void (i8*)*, i8*)\n"
-                       "\n"
-                       "define internal void @callback0(i8* %arg) {\n"
-                       "  ret void\n"
-                       "}\n"
-                       "\n"
-                       "define internal void @callback1(i8* %arg) {\n"
-                       "  ret void\n"
-                       "}\n"
-                       "\n"
-                       "!0 = !{!1}\n"
-                       "!1 = !{i64 0, i64 1, i1 false}";
-
-      SMDiagnostic Err;
-      std::unique_ptr<Module> M = parseAssemblyString(IR, Err, Context);
-      if (!M)
-        Err.print("LegacyPassManagerTest", errs());
-
-      CallbackCallsModifierPass *P = new CallbackCallsModifierPass();
-      legacy::PassManager Passes;
-      Passes.add(P);
-      Passes.run(*M);
-    }
-  }
-}
-
-INITIALIZE_PASS(ModuleNDM, "mndm", "mndm", false, false)
-INITIALIZE_PASS_BEGIN(CGPass, "cgp","cgp", false, false)
-INITIALIZE_PASS_DEPENDENCY(CallGraphWrapperPass)
-INITIALIZE_PASS_END(CGPass, "cgp","cgp", false, false)
-INITIALIZE_PASS(FPass, "fp","fp", false, false)
-INITIALIZE_PASS_BEGIN(LPass, "lp","lp", false, false)
-INITIALIZE_PASS_DEPENDENCY(LoopInfoWrapperPass)
-INITIALIZE_PASS_END(LPass, "lp","lp", false, false)
diff --git a/gnu/llvm/llvm/unittests/IR/MDBuilderTest.cpp b/gnu/llvm/llvm/unittests/IR/MDBuilderTest.cpp
deleted file mode 100644
index f8d08b5f3ea..00000000000
--- a/gnu/llvm/llvm/unittests/IR/MDBuilderTest.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-//===- llvm/unittests/MDBuilderTest.cpp - MDBuilder unit tests ------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/IR/MDBuilder.h"
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/Metadata.h"
-#include "llvm/IR/Operator.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-class MDBuilderTest : public testing::Test {
-protected:
-  LLVMContext Context;
-};
-
-TEST_F(MDBuilderTest, createString) {
-  MDBuilder MDHelper(Context);
-  MDString *Str0 = MDHelper.createString("");
-  MDString *Str1 = MDHelper.createString("string");
-  EXPECT_EQ(Str0->getString(), StringRef(""));
-  EXPECT_EQ(Str1->getString(), StringRef("string"));
-}
-TEST_F(MDBuilderTest, createFPMath) {
-  MDBuilder MDHelper(Context);
-  MDNode *MD0 = MDHelper.createFPMath(0.0);
-  MDNode *MD1 = MDHelper.createFPMath(1.0);
-  EXPECT_EQ(MD0, (MDNode *)nullptr);
-  EXPECT_NE(MD1, (MDNode *)nullptr);
-  EXPECT_EQ(MD1->getNumOperands(), 1U);
-  Metadata *Op = MD1->getOperand(0);
-  EXPECT_TRUE(mdconst::hasa<ConstantFP>(Op));
-  ConstantFP *Val = mdconst::extract<ConstantFP>(Op);
-  EXPECT_TRUE(Val->getType()->isFloatingPointTy());
-  EXPECT_TRUE(Val->isExactlyValue(1.0));
-}
-TEST_F(MDBuilderTest, createRangeMetadata) {
-  MDBuilder MDHelper(Context);
-  APInt A(8, 1), B(8, 2);
-  MDNode *R0 = MDHelper.createRange(A, A);
-  MDNode *R1 = MDHelper.createRange(A, B);
-  EXPECT_EQ(R0, (MDNode *)nullptr);
-  EXPECT_NE(R1, (MDNode *)nullptr);
-  EXPECT_EQ(R1->getNumOperands(), 2U);
-  EXPECT_TRUE(mdconst::hasa<ConstantInt>(R1->getOperand(0)));
-  EXPECT_TRUE(mdconst::hasa<ConstantInt>(R1->getOperand(1)));
-  ConstantInt *C0 = mdconst::extract<ConstantInt>(R1->getOperand(0));
-  ConstantInt *C1 = mdconst::extract<ConstantInt>(R1->getOperand(1));
-  EXPECT_EQ(C0->getValue(), A);
-  EXPECT_EQ(C1->getValue(), B);
-}
-TEST_F(MDBuilderTest, createAnonymousTBAARoot) {
-  MDBuilder MDHelper(Context);
-  MDNode *R0 = MDHelper.createAnonymousTBAARoot();
-  MDNode *R1 = MDHelper.createAnonymousTBAARoot();
-  EXPECT_NE(R0, R1);
-  EXPECT_GE(R0->getNumOperands(), 1U);
-  EXPECT_GE(R1->getNumOperands(), 1U);
-  EXPECT_EQ(R0->getOperand(0), R0);
-  EXPECT_EQ(R1->getOperand(0), R1);
-  EXPECT_TRUE(R0->getNumOperands() == 1 || R0->getOperand(1) == nullptr);
-  EXPECT_TRUE(R1->getNumOperands() == 1 || R1->getOperand(1) == nullptr);
-}
-TEST_F(MDBuilderTest, createTBAARoot) {
-  MDBuilder MDHelper(Context);
-  MDNode *R0 = MDHelper.createTBAARoot("Root");
-  MDNode *R1 = MDHelper.createTBAARoot("Root");
-  EXPECT_EQ(R0, R1);
-  EXPECT_GE(R0->getNumOperands(), 1U);
-  EXPECT_TRUE(isa<MDString>(R0->getOperand(0)));
-  EXPECT_EQ(cast<MDString>(R0->getOperand(0))->getString(), "Root");
-  EXPECT_TRUE(R0->getNumOperands() == 1 || R0->getOperand(1) == nullptr);
-}
-TEST_F(MDBuilderTest, createTBAANode) {
-  MDBuilder MDHelper(Context);
-  MDNode *R = MDHelper.createTBAARoot("Root");
-  MDNode *N0 = MDHelper.createTBAANode("Node", R);
-  MDNode *N1 = MDHelper.createTBAANode("edoN", R);
-  MDNode *N2 = MDHelper.createTBAANode("Node", R, true);
-  MDNode *N3 = MDHelper.createTBAANode("Node", R);
-  EXPECT_EQ(N0, N3);
-  EXPECT_NE(N0, N1);
-  EXPECT_NE(N0, N2);
-  EXPECT_GE(N0->getNumOperands(), 2U);
-  EXPECT_GE(N1->getNumOperands(), 2U);
-  EXPECT_GE(N2->getNumOperands(), 3U);
-  EXPECT_TRUE(isa<MDString>(N0->getOperand(0)));
-  EXPECT_TRUE(isa<MDString>(N1->getOperand(0)));
-  EXPECT_TRUE(isa<MDString>(N2->getOperand(0)));
-  EXPECT_EQ(cast<MDString>(N0->getOperand(0))->getString(), "Node");
-  EXPECT_EQ(cast<MDString>(N1->getOperand(0))->getString(), "edoN");
-  EXPECT_EQ(cast<MDString>(N2->getOperand(0))->getString(), "Node");
-  EXPECT_EQ(N0->getOperand(1), R);
-  EXPECT_EQ(N1->getOperand(1), R);
-  EXPECT_EQ(N2->getOperand(1), R);
-  EXPECT_TRUE(mdconst::hasa<ConstantInt>(N2->getOperand(2)));
-  EXPECT_EQ(mdconst::extract<ConstantInt>(N2->getOperand(2))->getZExtValue(),
-            1U);
-}
-}
diff --git a/gnu/llvm/llvm/unittests/IR/ManglerTest.cpp b/gnu/llvm/llvm/unittests/IR/ManglerTest.cpp
deleted file mode 100644
index 641e34628f5..00000000000
--- a/gnu/llvm/llvm/unittests/IR/ManglerTest.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-//===- llvm/unittest/IR/ManglerTest.cpp - Mangler unit tests --------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/IR/Mangler.h"
-#include "llvm/IR/CallingConv.h"
-#include "llvm/IR/DataLayout.h"
-#include "llvm/IR/GlobalValue.h"
-#include "llvm/IR/Module.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-static std::string mangleStr(StringRef IRName, Mangler &Mang,
-                             const DataLayout &DL) {
-  std::string Mangled;
-  raw_string_ostream SS(Mangled);
-  Mang.getNameWithPrefix(SS, IRName, DL);
-  SS.flush();
-  return Mangled;
-}
-
-static std::string mangleFunc(StringRef IRName,
-                              GlobalValue::LinkageTypes Linkage,
-                              llvm::CallingConv::ID CC, Module &Mod,
-                              Mangler &Mang) {
-  Type *VoidTy = Type::getVoidTy(Mod.getContext());
-  Type *I32Ty = Type::getInt32Ty(Mod.getContext());
-  FunctionType *FTy =
-      FunctionType::get(VoidTy, {I32Ty, I32Ty, I32Ty}, /*isVarArg=*/false);
-  Function *F = Function::Create(FTy, Linkage, IRName, &Mod);
-  F->setCallingConv(CC);
-  std::string Mangled;
-  raw_string_ostream SS(Mangled);
-  Mang.getNameWithPrefix(SS, F, false);
-  SS.flush();
-  F->eraseFromParent();
-  return Mangled;
-}
-
-namespace {
-
-TEST(ManglerTest, MachO) {
-  LLVMContext Ctx;
-  DataLayout DL("m:o"); // macho
-  Module Mod("test", Ctx);
-  Mod.setDataLayout(DL);
-  Mangler Mang;
-  EXPECT_EQ(mangleStr("foo", Mang, DL), "_foo");
-  EXPECT_EQ(mangleStr("\01foo", Mang, DL), "foo");
-  EXPECT_EQ(mangleStr("?foo", Mang, DL), "_?foo");
-  EXPECT_EQ(mangleFunc("foo", llvm::GlobalValue::ExternalLinkage,
-                       llvm::CallingConv::C, Mod, Mang),
-            "_foo");
-  EXPECT_EQ(mangleFunc("?foo", llvm::GlobalValue::ExternalLinkage,
-                       llvm::CallingConv::C, Mod, Mang),
-            "_?foo");
-  EXPECT_EQ(mangleFunc("foo", llvm::GlobalValue::PrivateLinkage,
-                       llvm::CallingConv::C, Mod, Mang),
-            "L_foo");
-}
-
-TEST(ManglerTest, WindowsX86) {
-  LLVMContext Ctx;
-  DataLayout DL("m:x-p:32:32"); // 32-bit windows
-  Module Mod("test", Ctx);
-  Mod.setDataLayout(DL);
-  Mangler Mang;
-  EXPECT_EQ(mangleStr("foo", Mang, DL), "_foo");
-  EXPECT_EQ(mangleStr("\01foo", Mang, DL), "foo");
-  EXPECT_EQ(mangleStr("?foo", Mang, DL), "?foo");
-  EXPECT_EQ(mangleFunc("foo", llvm::GlobalValue::ExternalLinkage,
-                       llvm::CallingConv::C, Mod, Mang),
-            "_foo");
-  EXPECT_EQ(mangleFunc("?foo", llvm::GlobalValue::ExternalLinkage,
-                       llvm::CallingConv::C, Mod, Mang),
-            "?foo");
-  EXPECT_EQ(mangleFunc("foo", llvm::GlobalValue::PrivateLinkage,
-                       llvm::CallingConv::C, Mod, Mang),
-            "L_foo");
-
-  // Test calling conv mangling.
-  EXPECT_EQ(mangleFunc("stdcall", llvm::GlobalValue::ExternalLinkage,
-                       llvm::CallingConv::X86_StdCall, Mod, Mang),
-            "_stdcall@12");
-  EXPECT_EQ(mangleFunc("fastcall", llvm::GlobalValue::ExternalLinkage,
-                       llvm::CallingConv::X86_FastCall, Mod, Mang),
-            "@fastcall@12");
-  EXPECT_EQ(mangleFunc("vectorcall", llvm::GlobalValue::ExternalLinkage,
-                       llvm::CallingConv::X86_VectorCall, Mod, Mang),
-            "vectorcall@@12");
-
-  // Adding a '?' prefix blocks calling convention mangling.
-  EXPECT_EQ(mangleFunc("?fastcall", llvm::GlobalValue::ExternalLinkage,
-                       llvm::CallingConv::X86_FastCall, Mod, Mang),
-            "?fastcall");
-}
-
-TEST(ManglerTest, WindowsX64) {
-  LLVMContext Ctx;
-  DataLayout DL("m:w-p:64:64"); // windows
-  Module Mod("test", Ctx);
-  Mod.setDataLayout(DL);
-  Mangler Mang;
-  EXPECT_EQ(mangleStr("foo", Mang, DL), "foo");
-  EXPECT_EQ(mangleStr("\01foo", Mang, DL), "foo");
-  EXPECT_EQ(mangleStr("?foo", Mang, DL), "?foo");
-  EXPECT_EQ(mangleFunc("foo", llvm::GlobalValue::ExternalLinkage,
-                       llvm::CallingConv::C, Mod, Mang),
-            "foo");
-  EXPECT_EQ(mangleFunc("?foo", llvm::GlobalValue::ExternalLinkage,
-                       llvm::CallingConv::C, Mod, Mang),
-            "?foo");
-  EXPECT_EQ(mangleFunc("foo", llvm::GlobalValue::PrivateLinkage,
-                       llvm::CallingConv::C, Mod, Mang),
-            ".Lfoo");
-
-  // Test calling conv mangling.
-  EXPECT_EQ(mangleFunc("stdcall", llvm::GlobalValue::ExternalLinkage,
-                       llvm::CallingConv::X86_StdCall, Mod, Mang),
-            "stdcall");
-  EXPECT_EQ(mangleFunc("fastcall", llvm::GlobalValue::ExternalLinkage,
-                       llvm::CallingConv::X86_FastCall, Mod, Mang),
-            "fastcall");
-  EXPECT_EQ(mangleFunc("vectorcall", llvm::GlobalValue::ExternalLinkage,
-                       llvm::CallingConv::X86_VectorCall, Mod, Mang),
-            "vectorcall@@24");
-
-  // Adding a '?' prefix blocks calling convention mangling.
-  EXPECT_EQ(mangleFunc("?vectorcall", llvm::GlobalValue::ExternalLinkage,
-                       llvm::CallingConv::X86_VectorCall, Mod, Mang),
-            "?vectorcall");
-}
-
-TEST(ManglerTest, XCOFF) {
-  LLVMContext Ctx;
-  DataLayout DL("m:a"); // XCOFF/AIX
-  Module Mod("test", Ctx);
-  Mod.setDataLayout(DL);
-  Mangler Mang;
-  EXPECT_EQ(mangleStr("foo", Mang, DL), "foo");
-  EXPECT_EQ(mangleStr("\01foo", Mang, DL), "foo");
-  EXPECT_EQ(mangleStr("?foo", Mang, DL), "?foo");
-  EXPECT_EQ(mangleFunc("foo", llvm::GlobalValue::ExternalLinkage,
-                       llvm::CallingConv::C, Mod, Mang),
-            "foo");
-  EXPECT_EQ(mangleFunc("?foo", llvm::GlobalValue::ExternalLinkage,
-                       llvm::CallingConv::C, Mod, Mang),
-            "?foo");
-  EXPECT_EQ(mangleFunc("foo", llvm::GlobalValue::PrivateLinkage,
-                       llvm::CallingConv::C, Mod, Mang),
-            "L..foo");
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/IR/MetadataTest.cpp b/gnu/llvm/llvm/unittests/IR/MetadataTest.cpp
deleted file mode 100644
index 02856aecc54..00000000000
--- a/gnu/llvm/llvm/unittests/IR/MetadataTest.cpp
+++ /dev/null
@@ -1,3430 +0,0 @@
-//===- unittests/IR/MetadataTest.cpp - Metadata unit tests ----------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/IR/Metadata.h"
-#include "llvm/ADT/DenseMap.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/DIBuilder.h"
-#include "llvm/IR/DebugInfo.h"
-#include "llvm/IR/DebugInfoMetadata.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/ModuleSlotTracker.h"
-#include "llvm/IR/Type.h"
-#include "llvm/IR/Verifier.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gtest/gtest.h"
-using namespace llvm;
-
-namespace {
-
-TEST(ContextAndReplaceableUsesTest, FromContext) {
-  LLVMContext Context;
-  ContextAndReplaceableUses CRU(Context);
-  EXPECT_EQ(&Context, &CRU.getContext());
-  EXPECT_FALSE(CRU.hasReplaceableUses());
-  EXPECT_FALSE(CRU.getReplaceableUses());
-}
-
-TEST(ContextAndReplaceableUsesTest, FromReplaceableUses) {
-  LLVMContext Context;
-  ContextAndReplaceableUses CRU(std::make_unique<ReplaceableMetadataImpl>(Context));
-  EXPECT_EQ(&Context, &CRU.getContext());
-  EXPECT_TRUE(CRU.hasReplaceableUses());
-  EXPECT_TRUE(CRU.getReplaceableUses());
-}
-
-TEST(ContextAndReplaceableUsesTest, makeReplaceable) {
-  LLVMContext Context;
-  ContextAndReplaceableUses CRU(Context);
-  CRU.makeReplaceable(std::make_unique<ReplaceableMetadataImpl>(Context));
-  EXPECT_EQ(&Context, &CRU.getContext());
-  EXPECT_TRUE(CRU.hasReplaceableUses());
-  EXPECT_TRUE(CRU.getReplaceableUses());
-}
-
-TEST(ContextAndReplaceableUsesTest, takeReplaceableUses) {
-  LLVMContext Context;
-  auto ReplaceableUses = std::make_unique<ReplaceableMetadataImpl>(Context);
-  auto *Ptr = ReplaceableUses.get();
-  ContextAndReplaceableUses CRU(std::move(ReplaceableUses));
-  ReplaceableUses = CRU.takeReplaceableUses();
-  EXPECT_EQ(&Context, &CRU.getContext());
-  EXPECT_FALSE(CRU.hasReplaceableUses());
-  EXPECT_FALSE(CRU.getReplaceableUses());
-  EXPECT_EQ(Ptr, ReplaceableUses.get());
-}
-
-class MetadataTest : public testing::Test {
-public:
-  MetadataTest() : M("test", Context), Counter(0) {}
-
-protected:
-  LLVMContext Context;
-  Module M;
-  int Counter;
-
-  MDNode *getNode() { return MDNode::get(Context, None); }
-  MDNode *getNode(Metadata *MD) { return MDNode::get(Context, MD); }
-  MDNode *getNode(Metadata *MD1, Metadata *MD2) {
-    Metadata *MDs[] = {MD1, MD2};
-    return MDNode::get(Context, MDs);
-  }
-
-  MDTuple *getTuple() { return MDTuple::getDistinct(Context, None); }
-  DISubroutineType *getSubroutineType() {
-    return DISubroutineType::getDistinct(Context, DINode::FlagZero, 0,
-                                         getNode(nullptr));
-  }
-  DISubprogram *getSubprogram() {
-    return DISubprogram::getDistinct(
-        Context, nullptr, "", "", nullptr, 0, nullptr, 0, nullptr, 0, 0,
-        DINode::FlagZero, DISubprogram::SPFlagZero, nullptr);
-  }
-  DIFile *getFile() {
-    return DIFile::getDistinct(Context, "file.c", "/path/to/dir");
-  }
-  DICompileUnit *getUnit() {
-    return DICompileUnit::getDistinct(
-        Context, 1, getFile(), "clang", false, "-g", 2, "",
-        DICompileUnit::FullDebug, getTuple(), getTuple(), getTuple(),
-        getTuple(), getTuple(), 0, true, false,
-        DICompileUnit::DebugNameTableKind::Default, false, "/", "");
-  }
-  DIType *getBasicType(StringRef Name) {
-    return DIBasicType::get(Context, dwarf::DW_TAG_unspecified_type, Name);
-  }
-  DIType *getDerivedType() {
-    return DIDerivedType::getDistinct(
-        Context, dwarf::DW_TAG_pointer_type, "", nullptr, 0, nullptr,
-        getBasicType("basictype"), 1, 2, 0, None, DINode::FlagZero);
-  }
-  Constant *getConstant() {
-    return ConstantInt::get(Type::getInt32Ty(Context), Counter++);
-  }
-  ConstantAsMetadata *getConstantAsMetadata() {
-    return ConstantAsMetadata::get(getConstant());
-  }
-  DIType *getCompositeType() {
-    return DICompositeType::getDistinct(
-        Context, dwarf::DW_TAG_structure_type, "", nullptr, 0, nullptr, nullptr,
-        32, 32, 0, DINode::FlagZero, nullptr, 0, nullptr, nullptr, "");
-  }
-  Function *getFunction(StringRef Name) {
-    return Function::Create(
-        FunctionType::get(Type::getVoidTy(Context), None, false),
-        Function::ExternalLinkage, Name, M);
-  }
-};
-typedef MetadataTest MDStringTest;
-
-// Test that construction of MDString with different value produces different
-// MDString objects, even with the same string pointer and nulls in the string.
-TEST_F(MDStringTest, CreateDifferent) {
-  char x[3] = { 'f', 0, 'A' };
-  MDString *s1 = MDString::get(Context, StringRef(&x[0], 3));
-  x[2] = 'B';
-  MDString *s2 = MDString::get(Context, StringRef(&x[0], 3));
-  EXPECT_NE(s1, s2);
-}
-
-// Test that creation of MDStrings with the same string contents produces the
-// same MDString object, even with different pointers.
-TEST_F(MDStringTest, CreateSame) {
-  char x[4] = { 'a', 'b', 'c', 'X' };
-  char y[4] = { 'a', 'b', 'c', 'Y' };
-
-  MDString *s1 = MDString::get(Context, StringRef(&x[0], 3));
-  MDString *s2 = MDString::get(Context, StringRef(&y[0], 3));
-  EXPECT_EQ(s1, s2);
-}
-
-// Test that MDString prints out the string we fed it.
-TEST_F(MDStringTest, PrintingSimple) {
-  char str[14] = "testing 1 2 3";
-  MDString *s = MDString::get(Context, StringRef(&str[0], 13));
-  strncpy(str, "aaaaaaaaaaaaa", 14);
-
-  std::string Str;
-  raw_string_ostream oss(Str);
-  s->print(oss);
-  EXPECT_STREQ("!\"testing 1 2 3\"", oss.str().c_str());
-}
-
-// Test printing of MDString with non-printable characters.
-TEST_F(MDStringTest, PrintingComplex) {
-  char str[5] = {0, '\n', '"', '\\', (char)-1};
-  MDString *s = MDString::get(Context, StringRef(str+0, 5));
-  std::string Str;
-  raw_string_ostream oss(Str);
-  s->print(oss);
-  EXPECT_STREQ("!\"\\00\\0A\\22\\\\\\FF\"", oss.str().c_str());
-}
-
-typedef MetadataTest MDNodeTest;
-
-// Test the two constructors, and containing other Constants.
-TEST_F(MDNodeTest, Simple) {
-  char x[3] = { 'a', 'b', 'c' };
-  char y[3] = { '1', '2', '3' };
-
-  MDString *s1 = MDString::get(Context, StringRef(&x[0], 3));
-  MDString *s2 = MDString::get(Context, StringRef(&y[0], 3));
-  ConstantAsMetadata *CI =
-      ConstantAsMetadata::get(ConstantInt::get(Context, APInt(8, 0)));
-
-  std::vector<Metadata *> V;
-  V.push_back(s1);
-  V.push_back(CI);
-  V.push_back(s2);
-
-  MDNode *n1 = MDNode::get(Context, V);
-  Metadata *const c1 = n1;
-  MDNode *n2 = MDNode::get(Context, c1);
-  Metadata *const c2 = n2;
-  MDNode *n3 = MDNode::get(Context, V);
-  MDNode *n4 = MDNode::getIfExists(Context, V);
-  MDNode *n5 = MDNode::getIfExists(Context, c1);
-  MDNode *n6 = MDNode::getIfExists(Context, c2);
-  EXPECT_NE(n1, n2);
-  EXPECT_EQ(n1, n3);
-  EXPECT_EQ(n4, n1);
-  EXPECT_EQ(n5, n2);
-  EXPECT_EQ(n6, (Metadata *)nullptr);
-
-  EXPECT_EQ(3u, n1->getNumOperands());
-  EXPECT_EQ(s1, n1->getOperand(0));
-  EXPECT_EQ(CI, n1->getOperand(1));
-  EXPECT_EQ(s2, n1->getOperand(2));
-
-  EXPECT_EQ(1u, n2->getNumOperands());
-  EXPECT_EQ(n1, n2->getOperand(0));
-}
-
-TEST_F(MDNodeTest, Delete) {
-  Constant *C = ConstantInt::get(Type::getInt32Ty(Context), 1);
-  Instruction *I = new BitCastInst(C, Type::getInt32Ty(Context));
-
-  Metadata *const V = LocalAsMetadata::get(I);
-  MDNode *n = MDNode::get(Context, V);
-  TrackingMDRef wvh(n);
-
-  EXPECT_EQ(n, wvh);
-
-  I->deleteValue();
-}
-
-TEST_F(MDNodeTest, SelfReference) {
-  // !0 = !{!0}
-  // !1 = !{!0}
-  {
-    auto Temp = MDNode::getTemporary(Context, None);
-    Metadata *Args[] = {Temp.get()};
-    MDNode *Self = MDNode::get(Context, Args);
-    Self->replaceOperandWith(0, Self);
-    ASSERT_EQ(Self, Self->getOperand(0));
-
-    // Self-references should be distinct, so MDNode::get() should grab a
-    // uniqued node that references Self, not Self.
-    Args[0] = Self;
-    MDNode *Ref1 = MDNode::get(Context, Args);
-    MDNode *Ref2 = MDNode::get(Context, Args);
-    EXPECT_NE(Self, Ref1);
-    EXPECT_EQ(Ref1, Ref2);
-  }
-
-  // !0 = !{!0, !{}}
-  // !1 = !{!0, !{}}
-  {
-    auto Temp = MDNode::getTemporary(Context, None);
-    Metadata *Args[] = {Temp.get(), MDNode::get(Context, None)};
-    MDNode *Self = MDNode::get(Context, Args);
-    Self->replaceOperandWith(0, Self);
-    ASSERT_EQ(Self, Self->getOperand(0));
-
-    // Self-references should be distinct, so MDNode::get() should grab a
-    // uniqued node that references Self, not Self itself.
-    Args[0] = Self;
-    MDNode *Ref1 = MDNode::get(Context, Args);
-    MDNode *Ref2 = MDNode::get(Context, Args);
-    EXPECT_NE(Self, Ref1);
-    EXPECT_EQ(Ref1, Ref2);
-  }
-}
-
-TEST_F(MDNodeTest, Print) {
-  Constant *C = ConstantInt::get(Type::getInt32Ty(Context), 7);
-  MDString *S = MDString::get(Context, "foo");
-  MDNode *N0 = getNode();
-  MDNode *N1 = getNode(N0);
-  MDNode *N2 = getNode(N0, N1);
-
-  Metadata *Args[] = {ConstantAsMetadata::get(C), S, nullptr, N0, N1, N2};
-  MDNode *N = MDNode::get(Context, Args);
-
-  std::string Expected;
-  {
-    raw_string_ostream OS(Expected);
-    OS << "<" << (void *)N << "> = !{";
-    C->printAsOperand(OS);
-    OS << ", ";
-    S->printAsOperand(OS);
-    OS << ", null";
-    MDNode *Nodes[] = {N0, N1, N2};
-    for (auto *Node : Nodes)
-      OS << ", <" << (void *)Node << ">";
-    OS << "}";
-  }
-
-  std::string Actual;
-  {
-    raw_string_ostream OS(Actual);
-    N->print(OS);
-  }
-
-  EXPECT_EQ(Expected, Actual);
-}
-
-#define EXPECT_PRINTER_EQ(EXPECTED, PRINT)                                     \
-  do {                                                                         \
-    std::string Actual_;                                                       \
-    raw_string_ostream OS(Actual_);                                            \
-    PRINT;                                                                     \
-    OS.flush();                                                                \
-    std::string Expected_(EXPECTED);                                           \
-    EXPECT_EQ(Expected_, Actual_);                                             \
-  } while (false)
-
-TEST_F(MDNodeTest, PrintTemporary) {
-  MDNode *Arg = getNode();
-  TempMDNode Temp = MDNode::getTemporary(Context, Arg);
-  MDNode *N = getNode(Temp.get());
-  Module M("test", Context);
-  NamedMDNode *NMD = M.getOrInsertNamedMetadata("named");
-  NMD->addOperand(N);
-
-  EXPECT_PRINTER_EQ("!0 = !{!1}", N->print(OS, &M));
-  EXPECT_PRINTER_EQ("!1 = <temporary!> !{!2}", Temp->print(OS, &M));
-  EXPECT_PRINTER_EQ("!2 = !{}", Arg->print(OS, &M));
-
-  // Cleanup.
-  Temp->replaceAllUsesWith(Arg);
-}
-
-TEST_F(MDNodeTest, PrintFromModule) {
-  Constant *C = ConstantInt::get(Type::getInt32Ty(Context), 7);
-  MDString *S = MDString::get(Context, "foo");
-  MDNode *N0 = getNode();
-  MDNode *N1 = getNode(N0);
-  MDNode *N2 = getNode(N0, N1);
-
-  Metadata *Args[] = {ConstantAsMetadata::get(C), S, nullptr, N0, N1, N2};
-  MDNode *N = MDNode::get(Context, Args);
-  Module M("test", Context);
-  NamedMDNode *NMD = M.getOrInsertNamedMetadata("named");
-  NMD->addOperand(N);
-
-  std::string Expected;
-  {
-    raw_string_ostream OS(Expected);
-    OS << "!0 = !{";
-    C->printAsOperand(OS);
-    OS << ", ";
-    S->printAsOperand(OS);
-    OS << ", null, !1, !2, !3}";
-  }
-
-  EXPECT_PRINTER_EQ(Expected, N->print(OS, &M));
-}
-
-TEST_F(MDNodeTest, PrintFromFunction) {
-  Module M("test", Context);
-  auto *FTy = FunctionType::get(Type::getVoidTy(Context), false);
-  auto *F0 = Function::Create(FTy, GlobalValue::ExternalLinkage, "F0", &M);
-  auto *F1 = Function::Create(FTy, GlobalValue::ExternalLinkage, "F1", &M);
-  auto *BB0 = BasicBlock::Create(Context, "entry", F0);
-  auto *BB1 = BasicBlock::Create(Context, "entry", F1);
-  auto *R0 = ReturnInst::Create(Context, BB0);
-  auto *R1 = ReturnInst::Create(Context, BB1);
-  auto *N0 = MDNode::getDistinct(Context, None);
-  auto *N1 = MDNode::getDistinct(Context, None);
-  R0->setMetadata("md", N0);
-  R1->setMetadata("md", N1);
-
-  EXPECT_PRINTER_EQ("!0 = distinct !{}", N0->print(OS, &M));
-  EXPECT_PRINTER_EQ("!1 = distinct !{}", N1->print(OS, &M));
-
-  ModuleSlotTracker MST(&M);
-  EXPECT_PRINTER_EQ("!0 = distinct !{}", N0->print(OS, MST));
-  EXPECT_PRINTER_EQ("!1 = distinct !{}", N1->print(OS, MST));
-}
-
-TEST_F(MDNodeTest, PrintFromMetadataAsValue) {
-  Module M("test", Context);
-
-  auto *Intrinsic =
-      Function::Create(FunctionType::get(Type::getVoidTy(Context),
-                                         Type::getMetadataTy(Context), false),
-                       GlobalValue::ExternalLinkage, "llvm.intrinsic", &M);
-
-  auto *FTy = FunctionType::get(Type::getVoidTy(Context), false);
-  auto *F0 = Function::Create(FTy, GlobalValue::ExternalLinkage, "F0", &M);
-  auto *F1 = Function::Create(FTy, GlobalValue::ExternalLinkage, "F1", &M);
-  auto *BB0 = BasicBlock::Create(Context, "entry", F0);
-  auto *BB1 = BasicBlock::Create(Context, "entry", F1);
-  auto *N0 = MDNode::getDistinct(Context, None);
-  auto *N1 = MDNode::getDistinct(Context, None);
-  auto *MAV0 = MetadataAsValue::get(Context, N0);
-  auto *MAV1 = MetadataAsValue::get(Context, N1);
-  CallInst::Create(Intrinsic, MAV0, "", BB0);
-  CallInst::Create(Intrinsic, MAV1, "", BB1);
-
-  EXPECT_PRINTER_EQ("!0 = distinct !{}", MAV0->print(OS));
-  EXPECT_PRINTER_EQ("!1 = distinct !{}", MAV1->print(OS));
-  EXPECT_PRINTER_EQ("!0", MAV0->printAsOperand(OS, false));
-  EXPECT_PRINTER_EQ("!1", MAV1->printAsOperand(OS, false));
-  EXPECT_PRINTER_EQ("metadata !0", MAV0->printAsOperand(OS, true));
-  EXPECT_PRINTER_EQ("metadata !1", MAV1->printAsOperand(OS, true));
-
-  ModuleSlotTracker MST(&M);
-  EXPECT_PRINTER_EQ("!0 = distinct !{}", MAV0->print(OS, MST));
-  EXPECT_PRINTER_EQ("!1 = distinct !{}", MAV1->print(OS, MST));
-  EXPECT_PRINTER_EQ("!0", MAV0->printAsOperand(OS, false, MST));
-  EXPECT_PRINTER_EQ("!1", MAV1->printAsOperand(OS, false, MST));
-  EXPECT_PRINTER_EQ("metadata !0", MAV0->printAsOperand(OS, true, MST));
-  EXPECT_PRINTER_EQ("metadata !1", MAV1->printAsOperand(OS, true, MST));
-}
-
-TEST_F(MDNodeTest, PrintWithDroppedCallOperand) {
-  Module M("test", Context);
-
-  auto *FTy = FunctionType::get(Type::getVoidTy(Context), false);
-  auto *F0 = Function::Create(FTy, GlobalValue::ExternalLinkage, "F0", &M);
-  auto *F1 = Function::Create(FTy, GlobalValue::ExternalLinkage, "F1", &M);
-  auto *BB0 = BasicBlock::Create(Context, "entry", F0);
-
-  CallInst *CI0 = CallInst::Create(F1, "", BB0);
-  CI0->dropAllReferences();
-
-  auto *R0 = ReturnInst::Create(Context, BB0);
-  auto *N0 = MDNode::getDistinct(Context, None);
-  R0->setMetadata("md", N0);
-
-  // Printing the metadata node would previously result in a failed assertion
-  // due to the call instruction's dropped function operand.
-  ModuleSlotTracker MST(&M);
-  EXPECT_PRINTER_EQ("!0 = distinct !{}", N0->print(OS, MST));
-}
-#undef EXPECT_PRINTER_EQ
-
-TEST_F(MDNodeTest, NullOperand) {
-  // metadata !{}
-  MDNode *Empty = MDNode::get(Context, None);
-
-  // metadata !{metadata !{}}
-  Metadata *Ops[] = {Empty};
-  MDNode *N = MDNode::get(Context, Ops);
-  ASSERT_EQ(Empty, N->getOperand(0));
-
-  // metadata !{metadata !{}} => metadata !{null}
-  N->replaceOperandWith(0, nullptr);
-  ASSERT_EQ(nullptr, N->getOperand(0));
-
-  // metadata !{null}
-  Ops[0] = nullptr;
-  MDNode *NullOp = MDNode::get(Context, Ops);
-  ASSERT_EQ(nullptr, NullOp->getOperand(0));
-  EXPECT_EQ(N, NullOp);
-}
-
-TEST_F(MDNodeTest, DistinctOnUniquingCollision) {
-  // !{}
-  MDNode *Empty = MDNode::get(Context, None);
-  ASSERT_TRUE(Empty->isResolved());
-  EXPECT_FALSE(Empty->isDistinct());
-
-  // !{!{}}
-  Metadata *Wrapped1Ops[] = {Empty};
-  MDNode *Wrapped1 = MDNode::get(Context, Wrapped1Ops);
-  ASSERT_EQ(Empty, Wrapped1->getOperand(0));
-  ASSERT_TRUE(Wrapped1->isResolved());
-  EXPECT_FALSE(Wrapped1->isDistinct());
-
-  // !{!{!{}}}
-  Metadata *Wrapped2Ops[] = {Wrapped1};
-  MDNode *Wrapped2 = MDNode::get(Context, Wrapped2Ops);
-  ASSERT_EQ(Wrapped1, Wrapped2->getOperand(0));
-  ASSERT_TRUE(Wrapped2->isResolved());
-  EXPECT_FALSE(Wrapped2->isDistinct());
-
-  // !{!{!{}}} => !{!{}}
-  Wrapped2->replaceOperandWith(0, Empty);
-  ASSERT_EQ(Empty, Wrapped2->getOperand(0));
-  EXPECT_TRUE(Wrapped2->isDistinct());
-  EXPECT_FALSE(Wrapped1->isDistinct());
-}
-
-TEST_F(MDNodeTest, UniquedOnDeletedOperand) {
-  // temp !{}
-  TempMDTuple T = MDTuple::getTemporary(Context, None);
-
-  // !{temp !{}}
-  Metadata *Ops[] = {T.get()};
-  MDTuple *N = MDTuple::get(Context, Ops);
-
-  // !{temp !{}} => !{null}
-  T.reset();
-  ASSERT_TRUE(N->isUniqued());
-  Metadata *NullOps[] = {nullptr};
-  ASSERT_EQ(N, MDTuple::get(Context, NullOps));
-}
-
-TEST_F(MDNodeTest, DistinctOnDeletedValueOperand) {
-  // i1* @GV
-  Type *Ty = Type::getInt1PtrTy(Context);
-  std::unique_ptr<GlobalVariable> GV(
-      new GlobalVariable(Ty, false, GlobalValue::ExternalLinkage));
-  ConstantAsMetadata *Op = ConstantAsMetadata::get(GV.get());
-
-  // !{i1* @GV}
-  Metadata *Ops[] = {Op};
-  MDTuple *N = MDTuple::get(Context, Ops);
-
-  // !{i1* @GV} => !{null}
-  GV.reset();
-  ASSERT_TRUE(N->isDistinct());
-  ASSERT_EQ(nullptr, N->getOperand(0));
-  Metadata *NullOps[] = {nullptr};
-  ASSERT_NE(N, MDTuple::get(Context, NullOps));
-}
-
-TEST_F(MDNodeTest, getDistinct) {
-  // !{}
-  MDNode *Empty = MDNode::get(Context, None);
-  ASSERT_TRUE(Empty->isResolved());
-  ASSERT_FALSE(Empty->isDistinct());
-  ASSERT_EQ(Empty, MDNode::get(Context, None));
-
-  // distinct !{}
-  MDNode *Distinct1 = MDNode::getDistinct(Context, None);
-  MDNode *Distinct2 = MDNode::getDistinct(Context, None);
-  EXPECT_TRUE(Distinct1->isResolved());
-  EXPECT_TRUE(Distinct2->isDistinct());
-  EXPECT_NE(Empty, Distinct1);
-  EXPECT_NE(Empty, Distinct2);
-  EXPECT_NE(Distinct1, Distinct2);
-
-  // !{}
-  ASSERT_EQ(Empty, MDNode::get(Context, None));
-}
-
-TEST_F(MDNodeTest, isUniqued) {
-  MDNode *U = MDTuple::get(Context, None);
-  MDNode *D = MDTuple::getDistinct(Context, None);
-  auto T = MDTuple::getTemporary(Context, None);
-  EXPECT_TRUE(U->isUniqued());
-  EXPECT_FALSE(D->isUniqued());
-  EXPECT_FALSE(T->isUniqued());
-}
-
-TEST_F(MDNodeTest, isDistinct) {
-  MDNode *U = MDTuple::get(Context, None);
-  MDNode *D = MDTuple::getDistinct(Context, None);
-  auto T = MDTuple::getTemporary(Context, None);
-  EXPECT_FALSE(U->isDistinct());
-  EXPECT_TRUE(D->isDistinct());
-  EXPECT_FALSE(T->isDistinct());
-}
-
-TEST_F(MDNodeTest, isTemporary) {
-  MDNode *U = MDTuple::get(Context, None);
-  MDNode *D = MDTuple::getDistinct(Context, None);
-  auto T = MDTuple::getTemporary(Context, None);
-  EXPECT_FALSE(U->isTemporary());
-  EXPECT_FALSE(D->isTemporary());
-  EXPECT_TRUE(T->isTemporary());
-}
-
-TEST_F(MDNodeTest, getDistinctWithUnresolvedOperands) {
-  // temporary !{}
-  auto Temp = MDTuple::getTemporary(Context, None);
-  ASSERT_FALSE(Temp->isResolved());
-
-  // distinct !{temporary !{}}
-  Metadata *Ops[] = {Temp.get()};
-  MDNode *Distinct = MDNode::getDistinct(Context, Ops);
-  EXPECT_TRUE(Distinct->isResolved());
-  EXPECT_EQ(Temp.get(), Distinct->getOperand(0));
-
-  // temporary !{} => !{}
-  MDNode *Empty = MDNode::get(Context, None);
-  Temp->replaceAllUsesWith(Empty);
-  EXPECT_EQ(Empty, Distinct->getOperand(0));
-}
-
-TEST_F(MDNodeTest, handleChangedOperandRecursion) {
-  // !0 = !{}
-  MDNode *N0 = MDNode::get(Context, None);
-
-  // !1 = !{!3, null}
-  auto Temp3 = MDTuple::getTemporary(Context, None);
-  Metadata *Ops1[] = {Temp3.get(), nullptr};
-  MDNode *N1 = MDNode::get(Context, Ops1);
-
-  // !2 = !{!3, !0}
-  Metadata *Ops2[] = {Temp3.get(), N0};
-  MDNode *N2 = MDNode::get(Context, Ops2);
-
-  // !3 = !{!2}
-  Metadata *Ops3[] = {N2};
-  MDNode *N3 = MDNode::get(Context, Ops3);
-  Temp3->replaceAllUsesWith(N3);
-
-  // !4 = !{!1}
-  Metadata *Ops4[] = {N1};
-  MDNode *N4 = MDNode::get(Context, Ops4);
-
-  // Confirm that the cycle prevented RAUW from getting dropped.
-  EXPECT_TRUE(N0->isResolved());
-  EXPECT_FALSE(N1->isResolved());
-  EXPECT_FALSE(N2->isResolved());
-  EXPECT_FALSE(N3->isResolved());
-  EXPECT_FALSE(N4->isResolved());
-
-  // Create a couple of distinct nodes to observe what's going on.
-  //
-  // !5 = distinct !{!2}
-  // !6 = distinct !{!3}
-  Metadata *Ops5[] = {N2};
-  MDNode *N5 = MDNode::getDistinct(Context, Ops5);
-  Metadata *Ops6[] = {N3};
-  MDNode *N6 = MDNode::getDistinct(Context, Ops6);
-
-  // Mutate !2 to look like !1, causing a uniquing collision (and an RAUW).
-  // This will ripple up, with !3 colliding with !4, and RAUWing.  Since !2
-  // references !3, this can cause a re-entry of handleChangedOperand() when !3
-  // is not ready for it.
-  //
-  // !2->replaceOperandWith(1, nullptr)
-  // !2: !{!3, !0} => !{!3, null}
-  // !2->replaceAllUsesWith(!1)
-  // !3: !{!2] => !{!1}
-  // !3->replaceAllUsesWith(!4)
-  N2->replaceOperandWith(1, nullptr);
-
-  // If all has gone well, N2 and N3 will have been RAUW'ed and deleted from
-  // under us.  Just check that the other nodes are sane.
-  //
-  // !1 = !{!4, null}
-  // !4 = !{!1}
-  // !5 = distinct !{!1}
-  // !6 = distinct !{!4}
-  EXPECT_EQ(N4, N1->getOperand(0));
-  EXPECT_EQ(N1, N4->getOperand(0));
-  EXPECT_EQ(N1, N5->getOperand(0));
-  EXPECT_EQ(N4, N6->getOperand(0));
-}
-
-TEST_F(MDNodeTest, replaceResolvedOperand) {
-  // Check code for replacing one resolved operand with another.  If doing this
-  // directly (via replaceOperandWith()) becomes illegal, change the operand to
-  // a global value that gets RAUW'ed.
-  //
-  // Use a temporary node to keep N from being resolved.
-  auto Temp = MDTuple::getTemporary(Context, None);
-  Metadata *Ops[] = {nullptr, Temp.get()};
-
-  MDNode *Empty = MDTuple::get(Context, ArrayRef<Metadata *>());
-  MDNode *N = MDTuple::get(Context, Ops);
-  EXPECT_EQ(nullptr, N->getOperand(0));
-  ASSERT_FALSE(N->isResolved());
-
-  // Check code for replacing resolved nodes.
-  N->replaceOperandWith(0, Empty);
-  EXPECT_EQ(Empty, N->getOperand(0));
-
-  // Check code for adding another unresolved operand.
-  N->replaceOperandWith(0, Temp.get());
-  EXPECT_EQ(Temp.get(), N->getOperand(0));
-
-  // Remove the references to Temp; required for teardown.
-  Temp->replaceAllUsesWith(nullptr);
-}
-
-TEST_F(MDNodeTest, replaceWithUniqued) {
-  auto *Empty = MDTuple::get(Context, None);
-  MDTuple *FirstUniqued;
-  {
-    Metadata *Ops[] = {Empty};
-    auto Temp = MDTuple::getTemporary(Context, Ops);
-    EXPECT_TRUE(Temp->isTemporary());
-
-    // Don't expect a collision.
-    auto *Current = Temp.get();
-    FirstUniqued = MDNode::replaceWithUniqued(std::move(Temp));
-    EXPECT_TRUE(FirstUniqued->isUniqued());
-    EXPECT_TRUE(FirstUniqued->isResolved());
-    EXPECT_EQ(Current, FirstUniqued);
-  }
-  {
-    Metadata *Ops[] = {Empty};
-    auto Temp = MDTuple::getTemporary(Context, Ops);
-    EXPECT_TRUE(Temp->isTemporary());
-
-    // Should collide with Uniqued above this time.
-    auto *Uniqued = MDNode::replaceWithUniqued(std::move(Temp));
-    EXPECT_TRUE(Uniqued->isUniqued());
-    EXPECT_TRUE(Uniqued->isResolved());
-    EXPECT_EQ(FirstUniqued, Uniqued);
-  }
-  {
-    auto Unresolved = MDTuple::getTemporary(Context, None);
-    Metadata *Ops[] = {Unresolved.get()};
-    auto Temp = MDTuple::getTemporary(Context, Ops);
-    EXPECT_TRUE(Temp->isTemporary());
-
-    // Shouldn't be resolved.
-    auto *Uniqued = MDNode::replaceWithUniqued(std::move(Temp));
-    EXPECT_TRUE(Uniqued->isUniqued());
-    EXPECT_FALSE(Uniqued->isResolved());
-
-    // Should be a different node.
-    EXPECT_NE(FirstUniqued, Uniqued);
-
-    // Should resolve when we update its node (note: be careful to avoid a
-    // collision with any other nodes above).
-    Uniqued->replaceOperandWith(0, nullptr);
-    EXPECT_TRUE(Uniqued->isResolved());
-  }
-}
-
-TEST_F(MDNodeTest, replaceWithUniquedResolvingOperand) {
-  // temp !{}
-  MDTuple *Op = MDTuple::getTemporary(Context, None).release();
-  EXPECT_FALSE(Op->isResolved());
-
-  // temp !{temp !{}}
-  Metadata *Ops[] = {Op};
-  MDTuple *N = MDTuple::getTemporary(Context, Ops).release();
-  EXPECT_FALSE(N->isResolved());
-
-  // temp !{temp !{}} => !{temp !{}}
-  ASSERT_EQ(N, MDNode::replaceWithUniqued(TempMDTuple(N)));
-  EXPECT_FALSE(N->isResolved());
-
-  // !{temp !{}} => !{!{}}
-  ASSERT_EQ(Op, MDNode::replaceWithUniqued(TempMDTuple(Op)));
-  EXPECT_TRUE(Op->isResolved());
-  EXPECT_TRUE(N->isResolved());
-}
-
-TEST_F(MDNodeTest, replaceWithUniquedDeletedOperand) {
-  // i1* @GV
-  Type *Ty = Type::getInt1PtrTy(Context);
-  std::unique_ptr<GlobalVariable> GV(
-      new GlobalVariable(Ty, false, GlobalValue::ExternalLinkage));
-  ConstantAsMetadata *Op = ConstantAsMetadata::get(GV.get());
-
-  // temp !{i1* @GV}
-  Metadata *Ops[] = {Op};
-  MDTuple *N = MDTuple::getTemporary(Context, Ops).release();
-
-  // temp !{i1* @GV} => !{i1* @GV}
-  ASSERT_EQ(N, MDNode::replaceWithUniqued(TempMDTuple(N)));
-  ASSERT_TRUE(N->isUniqued());
-
-  // !{i1* @GV} => !{null}
-  GV.reset();
-  ASSERT_TRUE(N->isDistinct());
-  ASSERT_EQ(nullptr, N->getOperand(0));
-  Metadata *NullOps[] = {nullptr};
-  ASSERT_NE(N, MDTuple::get(Context, NullOps));
-}
-
-TEST_F(MDNodeTest, replaceWithUniquedChangedOperand) {
-  // i1* @GV
-  Type *Ty = Type::getInt1PtrTy(Context);
-  std::unique_ptr<GlobalVariable> GV(
-      new GlobalVariable(Ty, false, GlobalValue::ExternalLinkage));
-  ConstantAsMetadata *Op = ConstantAsMetadata::get(GV.get());
-
-  // temp !{i1* @GV}
-  Metadata *Ops[] = {Op};
-  MDTuple *N = MDTuple::getTemporary(Context, Ops).release();
-
-  // temp !{i1* @GV} => !{i1* @GV}
-  ASSERT_EQ(N, MDNode::replaceWithUniqued(TempMDTuple(N)));
-  ASSERT_TRUE(N->isUniqued());
-
-  // !{i1* @GV} => !{i1* @GV2}
-  std::unique_ptr<GlobalVariable> GV2(
-      new GlobalVariable(Ty, false, GlobalValue::ExternalLinkage));
-  GV->replaceAllUsesWith(GV2.get());
-  ASSERT_TRUE(N->isUniqued());
-  Metadata *NullOps[] = {ConstantAsMetadata::get(GV2.get())};
-  ASSERT_EQ(N, MDTuple::get(Context, NullOps));
-}
-
-TEST_F(MDNodeTest, replaceWithDistinct) {
-  {
-    auto *Empty = MDTuple::get(Context, None);
-    Metadata *Ops[] = {Empty};
-    auto Temp = MDTuple::getTemporary(Context, Ops);
-    EXPECT_TRUE(Temp->isTemporary());
-
-    // Don't expect a collision.
-    auto *Current = Temp.get();
-    auto *Distinct = MDNode::replaceWithDistinct(std::move(Temp));
-    EXPECT_TRUE(Distinct->isDistinct());
-    EXPECT_TRUE(Distinct->isResolved());
-    EXPECT_EQ(Current, Distinct);
-  }
-  {
-    auto Unresolved = MDTuple::getTemporary(Context, None);
-    Metadata *Ops[] = {Unresolved.get()};
-    auto Temp = MDTuple::getTemporary(Context, Ops);
-    EXPECT_TRUE(Temp->isTemporary());
-
-    // Don't expect a collision.
-    auto *Current = Temp.get();
-    auto *Distinct = MDNode::replaceWithDistinct(std::move(Temp));
-    EXPECT_TRUE(Distinct->isDistinct());
-    EXPECT_TRUE(Distinct->isResolved());
-    EXPECT_EQ(Current, Distinct);
-
-    // Cleanup; required for teardown.
-    Unresolved->replaceAllUsesWith(nullptr);
-  }
-}
-
-TEST_F(MDNodeTest, replaceWithPermanent) {
-  Metadata *Ops[] = {nullptr};
-  auto Temp = MDTuple::getTemporary(Context, Ops);
-  auto *T = Temp.get();
-
-  // U is a normal, uniqued node that references T.
-  auto *U = MDTuple::get(Context, T);
-  EXPECT_TRUE(U->isUniqued());
-
-  // Make Temp self-referencing.
-  Temp->replaceOperandWith(0, T);
-
-  // Try to uniquify Temp.  This should, despite the name in the API, give a
-  // 'distinct' node, since self-references aren't allowed to be uniqued.
-  //
-  // Since it's distinct, N should have the same address as when it was a
-  // temporary (i.e., be equal to T not U).
-  auto *N = MDNode::replaceWithPermanent(std::move(Temp));
-  EXPECT_EQ(N, T);
-  EXPECT_TRUE(N->isDistinct());
-
-  // U should be the canonical unique node with N as the argument.
-  EXPECT_EQ(U, MDTuple::get(Context, N));
-  EXPECT_TRUE(U->isUniqued());
-
-  // This temporary should collide with U when replaced, but it should still be
-  // uniqued.
-  EXPECT_EQ(U, MDNode::replaceWithPermanent(MDTuple::getTemporary(Context, N)));
-  EXPECT_TRUE(U->isUniqued());
-
-  // This temporary should become a new uniqued node.
-  auto Temp2 = MDTuple::getTemporary(Context, U);
-  auto *V = Temp2.get();
-  EXPECT_EQ(V, MDNode::replaceWithPermanent(std::move(Temp2)));
-  EXPECT_TRUE(V->isUniqued());
-  EXPECT_EQ(U, V->getOperand(0));
-}
-
-TEST_F(MDNodeTest, deleteTemporaryWithTrackingRef) {
-  TrackingMDRef Ref;
-  EXPECT_EQ(nullptr, Ref.get());
-  {
-    auto Temp = MDTuple::getTemporary(Context, None);
-    Ref.reset(Temp.get());
-    EXPECT_EQ(Temp.get(), Ref.get());
-  }
-  EXPECT_EQ(nullptr, Ref.get());
-}
-
-typedef MetadataTest DILocationTest;
-
-TEST_F(DILocationTest, Overflow) {
-  DISubprogram *N = getSubprogram();
-  {
-    DILocation *L = DILocation::get(Context, 2, 7, N);
-    EXPECT_EQ(2u, L->getLine());
-    EXPECT_EQ(7u, L->getColumn());
-  }
-  unsigned U16 = 1u << 16;
-  {
-    DILocation *L = DILocation::get(Context, UINT32_MAX, U16 - 1, N);
-    EXPECT_EQ(UINT32_MAX, L->getLine());
-    EXPECT_EQ(U16 - 1, L->getColumn());
-  }
-  {
-    DILocation *L = DILocation::get(Context, UINT32_MAX, U16, N);
-    EXPECT_EQ(UINT32_MAX, L->getLine());
-    EXPECT_EQ(0u, L->getColumn());
-  }
-  {
-    DILocation *L = DILocation::get(Context, UINT32_MAX, U16 + 1, N);
-    EXPECT_EQ(UINT32_MAX, L->getLine());
-    EXPECT_EQ(0u, L->getColumn());
-  }
-}
-
-TEST_F(DILocationTest, Merge) {
-  DISubprogram *N = getSubprogram();
-  DIScope *S = DILexicalBlock::get(Context, N, getFile(), 3, 4);
-
-  {
-    // Identical.
-    auto *A = DILocation::get(Context, 2, 7, N);
-    auto *B = DILocation::get(Context, 2, 7, N);
-    auto *M = DILocation::getMergedLocation(A, B);
-    EXPECT_EQ(2u, M->getLine());
-    EXPECT_EQ(7u, M->getColumn());
-    EXPECT_EQ(N, M->getScope());
-  }
-
-  {
-    // Identical, different scopes.
-    auto *A = DILocation::get(Context, 2, 7, N);
-    auto *B = DILocation::get(Context, 2, 7, S);
-    auto *M = DILocation::getMergedLocation(A, B);
-    EXPECT_EQ(0u, M->getLine()); // FIXME: Should this be 2?
-    EXPECT_EQ(0u, M->getColumn()); // FIXME: Should this be 7?
-    EXPECT_EQ(N, M->getScope());
-  }
-
-  {
-    // Different lines, same scopes.
-    auto *A = DILocation::get(Context, 1, 6, N);
-    auto *B = DILocation::get(Context, 2, 7, N);
-    auto *M = DILocation::getMergedLocation(A, B);
-    EXPECT_EQ(0u, M->getLine());
-    EXPECT_EQ(0u, M->getColumn());
-    EXPECT_EQ(N, M->getScope());
-  }
-
-  {
-    // Twisty locations, all different, same function.
-    auto *A = DILocation::get(Context, 1, 6, N);
-    auto *B = DILocation::get(Context, 2, 7, S);
-    auto *M = DILocation::getMergedLocation(A, B);
-    EXPECT_EQ(0u, M->getLine());
-    EXPECT_EQ(0u, M->getColumn());
-    EXPECT_EQ(N, M->getScope());
-  }
-
-  {
-    // Different function, same inlined-at.
-    auto *F = getFile();
-    auto *SP1 = DISubprogram::getDistinct(Context, F, "a", "a", F, 0, nullptr,
-                                          0, nullptr, 0, 0, DINode::FlagZero,
-                                          DISubprogram::SPFlagZero, nullptr);
-    auto *SP2 = DISubprogram::getDistinct(Context, F, "b", "b", F, 0, nullptr,
-                                          0, nullptr, 0, 0, DINode::FlagZero,
-                                          DISubprogram::SPFlagZero, nullptr);
-
-    auto *I = DILocation::get(Context, 2, 7, N);
-    auto *A = DILocation::get(Context, 1, 6, SP1, I);
-    auto *B = DILocation::get(Context, 2, 7, SP2, I);
-    auto *M = DILocation::getMergedLocation(A, B);
-    EXPECT_EQ(0u, M->getLine());
-    EXPECT_EQ(0u, M->getColumn());
-    EXPECT_TRUE(isa<DILocalScope>(M->getScope()));
-    EXPECT_EQ(I, M->getInlinedAt());
-  }
-
-   {
-    // Completely different.
-    auto *I = DILocation::get(Context, 2, 7, N);
-    auto *A = DILocation::get(Context, 1, 6, S, I);
-    auto *B = DILocation::get(Context, 2, 7, getSubprogram());
-    auto *M = DILocation::getMergedLocation(A, B);
-    EXPECT_EQ(0u, M->getLine());
-    EXPECT_EQ(0u, M->getColumn());
-    EXPECT_TRUE(isa<DILocalScope>(M->getScope()));
-    EXPECT_EQ(S, M->getScope());
-    EXPECT_EQ(nullptr, M->getInlinedAt());
-  }
-}
-
-TEST_F(DILocationTest, getDistinct) {
-  MDNode *N = getSubprogram();
-  DILocation *L0 = DILocation::getDistinct(Context, 2, 7, N);
-  EXPECT_TRUE(L0->isDistinct());
-  DILocation *L1 = DILocation::get(Context, 2, 7, N);
-  EXPECT_FALSE(L1->isDistinct());
-  EXPECT_EQ(L1, DILocation::get(Context, 2, 7, N));
-}
-
-TEST_F(DILocationTest, getTemporary) {
-  MDNode *N = MDNode::get(Context, None);
-  auto L = DILocation::getTemporary(Context, 2, 7, N);
-  EXPECT_TRUE(L->isTemporary());
-  EXPECT_FALSE(L->isResolved());
-}
-
-TEST_F(DILocationTest, cloneTemporary) {
-  MDNode *N = MDNode::get(Context, None);
-  auto L = DILocation::getTemporary(Context, 2, 7, N);
-  EXPECT_TRUE(L->isTemporary());
-  auto L2 = L->clone();
-  EXPECT_TRUE(L2->isTemporary());
-}
-
-TEST_F(DILocationTest, discriminatorEncoding) {
-  EXPECT_EQ(0U, DILocation::encodeDiscriminator(0, 0, 0).getValue());
-
-  // Encode base discriminator as a component: lsb is 0, then the value.
-  // The other components are all absent, so we leave all the other bits 0.
-  EXPECT_EQ(2U, DILocation::encodeDiscriminator(1, 0, 0).getValue());
-
-  // Base discriminator component is empty, so lsb is 1. Next component is not
-  // empty, so its lsb is 0, then its value (1). Next component is empty.
-  // So the bit pattern is 101.
-  EXPECT_EQ(5U, DILocation::encodeDiscriminator(0, 1, 0).getValue());
-
-  // First 2 components are empty, so the bit pattern is 11. Then the
-  // next component - ending up with 1011.
-  EXPECT_EQ(0xbU, DILocation::encodeDiscriminator(0, 0, 1).getValue());
-
-  // The bit pattern for the first 2 components is 11. The next bit is 0,
-  // because the last component is not empty. We have 29 bits usable for
-  // encoding, but we cap it at 12 bits uniformously for all components. We
-  // encode the last component over 14 bits.
-  EXPECT_EQ(0xfffbU, DILocation::encodeDiscriminator(0, 0, 0xfff).getValue());
-
-  EXPECT_EQ(0x102U, DILocation::encodeDiscriminator(1, 1, 0).getValue());
-
-  EXPECT_EQ(0x13eU, DILocation::encodeDiscriminator(0x1f, 1, 0).getValue());
-
-  EXPECT_EQ(0x87feU, DILocation::encodeDiscriminator(0x1ff, 1, 0).getValue());
-
-  EXPECT_EQ(0x1f3eU, DILocation::encodeDiscriminator(0x1f, 0x1f, 0).getValue());
-
-  EXPECT_EQ(0x3ff3eU,
-            DILocation::encodeDiscriminator(0x1f, 0x1ff, 0).getValue());
-
-  EXPECT_EQ(0x1ff87feU,
-            DILocation::encodeDiscriminator(0x1ff, 0x1ff, 0).getValue());
-
-  EXPECT_EQ(0xfff9f3eU,
-            DILocation::encodeDiscriminator(0x1f, 0x1f, 0xfff).getValue());
-
-  EXPECT_EQ(0xffc3ff3eU,
-            DILocation::encodeDiscriminator(0x1f, 0x1ff, 0x1ff).getValue());
-
-  EXPECT_EQ(0xffcf87feU,
-            DILocation::encodeDiscriminator(0x1ff, 0x1f, 0x1ff).getValue());
-
-  EXPECT_EQ(0xe1ff87feU,
-            DILocation::encodeDiscriminator(0x1ff, 0x1ff, 7).getValue());
-}
-
-TEST_F(DILocationTest, discriminatorEncodingNegativeTests) {
-  EXPECT_EQ(None, DILocation::encodeDiscriminator(0, 0, 0x1000));
-  EXPECT_EQ(None, DILocation::encodeDiscriminator(0x1000, 0, 0));
-  EXPECT_EQ(None, DILocation::encodeDiscriminator(0, 0x1000, 0));
-  EXPECT_EQ(None, DILocation::encodeDiscriminator(0, 0, 0x1000));
-  EXPECT_EQ(None, DILocation::encodeDiscriminator(0x1ff, 0x1ff, 8));
-  EXPECT_EQ(None,
-            DILocation::encodeDiscriminator(std::numeric_limits<uint32_t>::max(),
-                                            std::numeric_limits<uint32_t>::max(),
-                                            0));
-}
-
-TEST_F(DILocationTest, discriminatorSpecialCases) {
-  // We don't test getCopyIdentifier here because the only way
-  // to set it is by constructing an encoded discriminator using
-  // encodeDiscriminator, which is already tested.
-  auto L1 = DILocation::get(Context, 1, 2, getSubprogram());
-  EXPECT_EQ(0U, L1->getBaseDiscriminator());
-  EXPECT_EQ(1U, L1->getDuplicationFactor());
-
-  EXPECT_EQ(L1, L1->cloneWithBaseDiscriminator(0).getValue());
-  EXPECT_EQ(L1, L1->cloneByMultiplyingDuplicationFactor(0).getValue());
-  EXPECT_EQ(L1, L1->cloneByMultiplyingDuplicationFactor(1).getValue());
-
-  auto L2 = L1->cloneWithBaseDiscriminator(1).getValue();
-  EXPECT_EQ(0U, L1->getBaseDiscriminator());
-  EXPECT_EQ(1U, L1->getDuplicationFactor());
-
-  EXPECT_EQ(1U, L2->getBaseDiscriminator());
-  EXPECT_EQ(1U, L2->getDuplicationFactor());
-
-  auto L3 = L2->cloneByMultiplyingDuplicationFactor(2).getValue();
-  EXPECT_EQ(1U, L3->getBaseDiscriminator());
-  EXPECT_EQ(2U, L3->getDuplicationFactor());
-
-  EXPECT_EQ(L2, L2->cloneByMultiplyingDuplicationFactor(1).getValue());
-
-  auto L4 = L3->cloneByMultiplyingDuplicationFactor(4).getValue();
-  EXPECT_EQ(1U, L4->getBaseDiscriminator());
-  EXPECT_EQ(8U, L4->getDuplicationFactor());
-
-  auto L5 = L4->cloneWithBaseDiscriminator(2).getValue();
-  EXPECT_EQ(2U, L5->getBaseDiscriminator());
-  EXPECT_EQ(8U, L5->getDuplicationFactor());
-
-  // Check extreme cases
-  auto L6 = L1->cloneWithBaseDiscriminator(0xfff).getValue();
-  EXPECT_EQ(0xfffU, L6->getBaseDiscriminator());
-  EXPECT_EQ(0xfffU, L6->cloneByMultiplyingDuplicationFactor(0xfff)
-                        .getValue()
-                        ->getDuplicationFactor());
-
-  // Check we return None for unencodable cases.
-  EXPECT_EQ(None, L4->cloneWithBaseDiscriminator(0x1000));
-  EXPECT_EQ(None, L4->cloneByMultiplyingDuplicationFactor(0x1000));
-}
-
-
-typedef MetadataTest GenericDINodeTest;
-
-TEST_F(GenericDINodeTest, get) {
-  StringRef Header = "header";
-  auto *Empty = MDNode::get(Context, None);
-  Metadata *Ops1[] = {Empty};
-  auto *N = GenericDINode::get(Context, 15, Header, Ops1);
-  EXPECT_EQ(15u, N->getTag());
-  EXPECT_EQ(2u, N->getNumOperands());
-  EXPECT_EQ(Header, N->getHeader());
-  EXPECT_EQ(MDString::get(Context, Header), N->getOperand(0));
-  EXPECT_EQ(1u, N->getNumDwarfOperands());
-  EXPECT_EQ(Empty, N->getDwarfOperand(0));
-  EXPECT_EQ(Empty, N->getOperand(1));
-  ASSERT_TRUE(N->isUniqued());
-
-  EXPECT_EQ(N, GenericDINode::get(Context, 15, Header, Ops1));
-
-  N->replaceOperandWith(1, nullptr);
-  EXPECT_EQ(15u, N->getTag());
-  EXPECT_EQ(Header, N->getHeader());
-  EXPECT_EQ(nullptr, N->getDwarfOperand(0));
-  ASSERT_TRUE(N->isUniqued());
-
-  Metadata *Ops2[] = {nullptr};
-  EXPECT_EQ(N, GenericDINode::get(Context, 15, Header, Ops2));
-
-  N->replaceDwarfOperandWith(0, Empty);
-  EXPECT_EQ(15u, N->getTag());
-  EXPECT_EQ(Header, N->getHeader());
-  EXPECT_EQ(Empty, N->getDwarfOperand(0));
-  ASSERT_TRUE(N->isUniqued());
-  EXPECT_EQ(N, GenericDINode::get(Context, 15, Header, Ops1));
-
-  TempGenericDINode Temp = N->clone();
-  EXPECT_EQ(N, MDNode::replaceWithUniqued(std::move(Temp)));
-}
-
-TEST_F(GenericDINodeTest, getEmptyHeader) {
-  // Canonicalize !"" to null.
-  auto *N = GenericDINode::get(Context, 15, StringRef(), None);
-  EXPECT_EQ(StringRef(), N->getHeader());
-  EXPECT_EQ(nullptr, N->getOperand(0));
-}
-
-typedef MetadataTest DISubrangeTest;
-
-TEST_F(DISubrangeTest, get) {
-  auto *N = DISubrange::get(Context, 5, 7);
-  auto Count = N->getCount();
-  auto Lower = N->getLowerBound();
-  EXPECT_EQ(dwarf::DW_TAG_subrange_type, N->getTag());
-  ASSERT_TRUE(Count);
-  ASSERT_TRUE(Count.is<ConstantInt*>());
-  EXPECT_EQ(5, Count.get<ConstantInt*>()->getSExtValue());
-  EXPECT_EQ(7, Lower.get<ConstantInt *>()->getSExtValue());
-  EXPECT_EQ(N, DISubrange::get(Context, 5, 7));
-  EXPECT_EQ(DISubrange::get(Context, 5, 0), DISubrange::get(Context, 5));
-
-  TempDISubrange Temp = N->clone();
-  EXPECT_EQ(N, MDNode::replaceWithUniqued(std::move(Temp)));
-}
-
-TEST_F(DISubrangeTest, getEmptyArray) {
-  auto *N = DISubrange::get(Context, -1, 0);
-  auto Count = N->getCount();
-  auto Lower = N->getLowerBound();
-  EXPECT_EQ(dwarf::DW_TAG_subrange_type, N->getTag());
-  ASSERT_TRUE(Count);
-  ASSERT_TRUE(Count.is<ConstantInt*>());
-  EXPECT_EQ(-1, Count.get<ConstantInt*>()->getSExtValue());
-  EXPECT_EQ(0, Lower.get<ConstantInt *>()->getSExtValue());
-  EXPECT_EQ(N, DISubrange::get(Context, -1, 0));
-}
-
-TEST_F(DISubrangeTest, getVariableCount) {
-  DILocalScope *Scope = getSubprogram();
-  DIFile *File = getFile();
-  DIType *Type = getDerivedType();
-  DINode::DIFlags Flags = static_cast<DINode::DIFlags>(7);
-  auto *VlaExpr = DILocalVariable::get(Context, Scope, "vla_expr", File, 8,
-                                       Type, 2, Flags, 8);
-
-  auto *N = DISubrange::get(Context, VlaExpr, 0);
-  auto Count = N->getCount();
-  auto Lower = N->getLowerBound();
-  ASSERT_TRUE(Count);
-  ASSERT_TRUE(Count.is<DIVariable*>());
-  EXPECT_EQ(VlaExpr, Count.get<DIVariable*>());
-  ASSERT_TRUE(isa<DIVariable>(N->getRawCountNode()));
-  EXPECT_EQ(0, Lower.get<ConstantInt *>()->getSExtValue());
-  EXPECT_EQ("vla_expr", Count.get<DIVariable*>()->getName());
-  EXPECT_EQ(N, DISubrange::get(Context, VlaExpr, 0));
-}
-
-TEST_F(DISubrangeTest, fortranAllocatableInt) {
-  DILocalScope *Scope = getSubprogram();
-  DIFile *File = getFile();
-  DIType *Type = getDerivedType();
-  DINode::DIFlags Flags = static_cast<DINode::DIFlags>(7);
-  auto *LI = ConstantAsMetadata::get(
-      ConstantInt::getSigned(Type::getInt64Ty(Context), -10));
-  auto *UI = ConstantAsMetadata::get(
-      ConstantInt::getSigned(Type::getInt64Ty(Context), 10));
-  auto *SI = ConstantAsMetadata::get(
-      ConstantInt::getSigned(Type::getInt64Ty(Context), 4));
-  auto *UIother = ConstantAsMetadata::get(
-      ConstantInt::getSigned(Type::getInt64Ty(Context), 20));
-  auto *UVother = DILocalVariable::get(Context, Scope, "ubother", File, 8, Type,
-                                       2, Flags, 8);
-  auto *UEother = DIExpression::get(Context, {5, 6});
-  auto *LIZero = ConstantAsMetadata::get(
-      ConstantInt::getSigned(Type::getInt64Ty(Context), 0));
-  auto *UIZero = ConstantAsMetadata::get(
-      ConstantInt::getSigned(Type::getInt64Ty(Context), 0));
-
-  auto *N = DISubrange::get(Context, nullptr, LI, UI, SI);
-
-  auto Lower = N->getLowerBound();
-  ASSERT_TRUE(Lower);
-  ASSERT_TRUE(Lower.is<ConstantInt *>());
-  EXPECT_EQ(cast<ConstantInt>(LI->getValue()), Lower.get<ConstantInt *>());
-
-  auto Upper = N->getUpperBound();
-  ASSERT_TRUE(Upper);
-  ASSERT_TRUE(Upper.is<ConstantInt *>());
-  EXPECT_EQ(cast<ConstantInt>(UI->getValue()), Upper.get<ConstantInt *>());
-
-  auto Stride = N->getStride();
-  ASSERT_TRUE(Stride);
-  ASSERT_TRUE(Stride.is<ConstantInt *>());
-  EXPECT_EQ(cast<ConstantInt>(SI->getValue()), Stride.get<ConstantInt *>());
-
-  EXPECT_EQ(N, DISubrange::get(Context, nullptr, LI, UI, SI));
-
-  EXPECT_NE(N, DISubrange::get(Context, nullptr, LI, UIother, SI));
-  EXPECT_NE(N, DISubrange::get(Context, nullptr, LI, UEother, SI));
-  EXPECT_NE(N, DISubrange::get(Context, nullptr, LI, UVother, SI));
-
-  auto *NZeroLower = DISubrange::get(Context, nullptr, LIZero, UI, SI);
-  EXPECT_NE(NZeroLower, DISubrange::get(Context, nullptr, nullptr, UI, SI));
-
-  auto *NZeroUpper = DISubrange::get(Context, nullptr, LI, UIZero, SI);
-  EXPECT_NE(NZeroUpper, DISubrange::get(Context, nullptr, LI, nullptr, SI));
-}
-
-TEST_F(DISubrangeTest, fortranAllocatableVar) {
-  DILocalScope *Scope = getSubprogram();
-  DIFile *File = getFile();
-  DIType *Type = getDerivedType();
-  DINode::DIFlags Flags = static_cast<DINode::DIFlags>(7);
-  auto *LV =
-      DILocalVariable::get(Context, Scope, "lb", File, 8, Type, 2, Flags, 8);
-  auto *UV =
-      DILocalVariable::get(Context, Scope, "ub", File, 8, Type, 2, Flags, 8);
-  auto *SV =
-      DILocalVariable::get(Context, Scope, "st", File, 8, Type, 2, Flags, 8);
-  auto *SVother = DILocalVariable::get(Context, Scope, "stother", File, 8, Type,
-                                       2, Flags, 8);
-  auto *SIother = ConstantAsMetadata::get(
-      ConstantInt::getSigned(Type::getInt64Ty(Context), 20));
-  auto *SEother = DIExpression::get(Context, {5, 6});
-
-  auto *N = DISubrange::get(Context, nullptr, LV, UV, SV);
-
-  auto Lower = N->getLowerBound();
-  ASSERT_TRUE(Lower);
-  ASSERT_TRUE(Lower.is<DIVariable *>());
-  EXPECT_EQ(LV, Lower.get<DIVariable *>());
-
-  auto Upper = N->getUpperBound();
-  ASSERT_TRUE(Upper);
-  ASSERT_TRUE(Upper.is<DIVariable *>());
-  EXPECT_EQ(UV, Upper.get<DIVariable *>());
-
-  auto Stride = N->getStride();
-  ASSERT_TRUE(Stride);
-  ASSERT_TRUE(Stride.is<DIVariable *>());
-  EXPECT_EQ(SV, Stride.get<DIVariable *>());
-
-  EXPECT_EQ(N, DISubrange::get(Context, nullptr, LV, UV, SV));
-
-  EXPECT_NE(N, DISubrange::get(Context, nullptr, LV, UV, SVother));
-  EXPECT_NE(N, DISubrange::get(Context, nullptr, LV, UV, SEother));
-  EXPECT_NE(N, DISubrange::get(Context, nullptr, LV, UV, SIother));
-}
-
-TEST_F(DISubrangeTest, fortranAllocatableExpr) {
-  DILocalScope *Scope = getSubprogram();
-  DIFile *File = getFile();
-  DIType *Type = getDerivedType();
-  DINode::DIFlags Flags = static_cast<DINode::DIFlags>(7);
-  auto *LE = DIExpression::get(Context, {1, 2});
-  auto *UE = DIExpression::get(Context, {2, 3});
-  auto *SE = DIExpression::get(Context, {3, 4});
-  auto *LEother = DIExpression::get(Context, {5, 6});
-  auto *LIother = ConstantAsMetadata::get(
-      ConstantInt::getSigned(Type::getInt64Ty(Context), 20));
-  auto *LVother = DILocalVariable::get(Context, Scope, "lbother", File, 8, Type,
-                                       2, Flags, 8);
-
-  auto *N = DISubrange::get(Context, nullptr, LE, UE, SE);
-
-  auto Lower = N->getLowerBound();
-  ASSERT_TRUE(Lower);
-  ASSERT_TRUE(Lower.is<DIExpression *>());
-  EXPECT_EQ(LE, Lower.get<DIExpression *>());
-
-  auto Upper = N->getUpperBound();
-  ASSERT_TRUE(Upper);
-  ASSERT_TRUE(Upper.is<DIExpression *>());
-  EXPECT_EQ(UE, Upper.get<DIExpression *>());
-
-  auto Stride = N->getStride();
-  ASSERT_TRUE(Stride);
-  ASSERT_TRUE(Stride.is<DIExpression *>());
-  EXPECT_EQ(SE, Stride.get<DIExpression *>());
-
-  EXPECT_EQ(N, DISubrange::get(Context, nullptr, LE, UE, SE));
-
-  EXPECT_NE(N, DISubrange::get(Context, nullptr, LEother, UE, SE));
-  EXPECT_NE(N, DISubrange::get(Context, nullptr, LIother, UE, SE));
-  EXPECT_NE(N, DISubrange::get(Context, nullptr, LVother, UE, SE));
-}
-
-typedef MetadataTest DIGenericSubrangeTest;
-
-TEST_F(DIGenericSubrangeTest, fortranAssumedRankInt) {
-  DILocalScope *Scope = getSubprogram();
-  DIFile *File = getFile();
-  DIType *Type = getDerivedType();
-  DINode::DIFlags Flags = static_cast<DINode::DIFlags>(7);
-  auto *LI = DIExpression::get(
-      Context, {dwarf::DW_OP_consts, static_cast<uint64_t>(-10)});
-  auto *UI = DIExpression::get(Context, {dwarf::DW_OP_consts, 10});
-  auto *SI = DIExpression::get(Context, {dwarf::DW_OP_consts, 4});
-  auto *UIother = DIExpression::get(Context, {dwarf::DW_OP_consts, 20});
-  auto *UVother = DILocalVariable::get(Context, Scope, "ubother", File, 8, Type,
-                                       2, Flags, 8);
-  auto *UEother = DIExpression::get(Context, {5, 6});
-  auto *LIZero = DIExpression::get(Context, {dwarf::DW_OP_consts, 0});
-  auto *UIZero = DIExpression::get(Context, {dwarf::DW_OP_consts, 0});
-
-  auto *N = DIGenericSubrange::get(Context, nullptr, LI, UI, SI);
-
-  auto Lower = N->getLowerBound();
-  ASSERT_TRUE(Lower);
-  ASSERT_TRUE(Lower.is<DIExpression *>());
-  EXPECT_EQ(dyn_cast_or_null<DIExpression>(LI), Lower.get<DIExpression *>());
-
-  auto Upper = N->getUpperBound();
-  ASSERT_TRUE(Upper);
-  ASSERT_TRUE(Upper.is<DIExpression *>());
-  EXPECT_EQ(dyn_cast_or_null<DIExpression>(UI), Upper.get<DIExpression *>());
-
-  auto Stride = N->getStride();
-  ASSERT_TRUE(Stride);
-  ASSERT_TRUE(Stride.is<DIExpression *>());
-  EXPECT_EQ(dyn_cast_or_null<DIExpression>(SI), Stride.get<DIExpression *>());
-
-  EXPECT_EQ(N, DIGenericSubrange::get(Context, nullptr, LI, UI, SI));
-
-  EXPECT_NE(N, DIGenericSubrange::get(Context, nullptr, LI, UIother, SI));
-  EXPECT_NE(N, DIGenericSubrange::get(Context, nullptr, LI, UEother, SI));
-  EXPECT_NE(N, DIGenericSubrange::get(Context, nullptr, LI, UVother, SI));
-
-  auto *NZeroLower = DIGenericSubrange::get(Context, nullptr, LIZero, UI, SI);
-  EXPECT_NE(NZeroLower,
-            DIGenericSubrange::get(Context, nullptr, nullptr, UI, SI));
-
-  auto *NZeroUpper = DIGenericSubrange::get(Context, nullptr, LI, UIZero, SI);
-  EXPECT_NE(NZeroUpper,
-            DIGenericSubrange::get(Context, nullptr, LI, nullptr, SI));
-}
-
-TEST_F(DIGenericSubrangeTest, fortranAssumedRankVar) {
-  DILocalScope *Scope = getSubprogram();
-  DIFile *File = getFile();
-  DIType *Type = getDerivedType();
-  DINode::DIFlags Flags = static_cast<DINode::DIFlags>(7);
-  auto *LV =
-      DILocalVariable::get(Context, Scope, "lb", File, 8, Type, 2, Flags, 8);
-  auto *UV =
-      DILocalVariable::get(Context, Scope, "ub", File, 8, Type, 2, Flags, 8);
-  auto *SV =
-      DILocalVariable::get(Context, Scope, "st", File, 8, Type, 2, Flags, 8);
-  auto *SVother = DILocalVariable::get(Context, Scope, "stother", File, 8, Type,
-                                       2, Flags, 8);
-  auto *SIother = DIExpression::get(
-      Context, {dwarf::DW_OP_consts, static_cast<uint64_t>(-1)});
-  auto *SEother = DIExpression::get(Context, {5, 6});
-
-  auto *N = DIGenericSubrange::get(Context, nullptr, LV, UV, SV);
-
-  auto Lower = N->getLowerBound();
-  ASSERT_TRUE(Lower);
-  ASSERT_TRUE(Lower.is<DIVariable *>());
-  EXPECT_EQ(LV, Lower.get<DIVariable *>());
-
-  auto Upper = N->getUpperBound();
-  ASSERT_TRUE(Upper);
-  ASSERT_TRUE(Upper.is<DIVariable *>());
-  EXPECT_EQ(UV, Upper.get<DIVariable *>());
-
-  auto Stride = N->getStride();
-  ASSERT_TRUE(Stride);
-  ASSERT_TRUE(Stride.is<DIVariable *>());
-  EXPECT_EQ(SV, Stride.get<DIVariable *>());
-
-  EXPECT_EQ(N, DIGenericSubrange::get(Context, nullptr, LV, UV, SV));
-
-  EXPECT_NE(N, DIGenericSubrange::get(Context, nullptr, LV, UV, SVother));
-  EXPECT_NE(N, DIGenericSubrange::get(Context, nullptr, LV, UV, SEother));
-  EXPECT_NE(N, DIGenericSubrange::get(Context, nullptr, LV, UV, SIother));
-}
-
-TEST_F(DIGenericSubrangeTest, useDIBuilder) {
-  DILocalScope *Scope = getSubprogram();
-  DIFile *File = getFile();
-  DIType *Type = getDerivedType();
-  DINode::DIFlags Flags = static_cast<DINode::DIFlags>(7);
-  auto *LV =
-      DILocalVariable::get(Context, Scope, "lb", File, 8, Type, 2, Flags, 8);
-  auto *UE = DIExpression::get(Context, {2, 3});
-  auto *SE = DIExpression::get(Context, {3, 4});
-
-  auto *LVother = DILocalVariable::get(Context, Scope, "lbother", File, 8, Type,
-                                       2, Flags, 8);
-  auto *LIother = DIExpression::get(
-      Context, {dwarf::DW_OP_consts, static_cast<uint64_t>(-1)});
-
-  Module M("M", Context);
-  DIBuilder DIB(M);
-
-  auto *N = DIB.getOrCreateGenericSubrange(
-      DIGenericSubrange::BoundType(nullptr), DIGenericSubrange::BoundType(LV),
-      DIGenericSubrange::BoundType(UE), DIGenericSubrange::BoundType(SE));
-
-  auto Lower = N->getLowerBound();
-  ASSERT_TRUE(Lower);
-  ASSERT_TRUE(Lower.is<DIVariable *>());
-  EXPECT_EQ(LV, Lower.get<DIVariable *>());
-
-  auto Upper = N->getUpperBound();
-  ASSERT_TRUE(Upper);
-  ASSERT_TRUE(Upper.is<DIExpression *>());
-  EXPECT_EQ(UE, Upper.get<DIExpression *>());
-
-  auto Stride = N->getStride();
-  ASSERT_TRUE(Stride);
-  ASSERT_TRUE(Stride.is<DIExpression *>());
-  EXPECT_EQ(SE, Stride.get<DIExpression *>());
-
-  EXPECT_EQ(
-      N, DIB.getOrCreateGenericSubrange(DIGenericSubrange::BoundType(nullptr),
-                                        DIGenericSubrange::BoundType(LV),
-                                        DIGenericSubrange::BoundType(UE),
-                                        DIGenericSubrange::BoundType(SE)));
-
-  EXPECT_NE(
-      N, DIB.getOrCreateGenericSubrange(DIGenericSubrange::BoundType(nullptr),
-                                        DIGenericSubrange::BoundType(LVother),
-                                        DIGenericSubrange::BoundType(UE),
-                                        DIGenericSubrange::BoundType(SE)));
-  EXPECT_NE(
-      N, DIB.getOrCreateGenericSubrange(DIGenericSubrange::BoundType(nullptr),
-                                        DIGenericSubrange::BoundType(LIother),
-                                        DIGenericSubrange::BoundType(UE),
-                                        DIGenericSubrange::BoundType(SE)));
-}
-typedef MetadataTest DIEnumeratorTest;
-
-TEST_F(DIEnumeratorTest, get) {
-  auto *N = DIEnumerator::get(Context, 7, false, "name");
-  EXPECT_EQ(dwarf::DW_TAG_enumerator, N->getTag());
-  EXPECT_EQ(7, N->getValue().getSExtValue());
-  EXPECT_FALSE(N->isUnsigned());
-  EXPECT_EQ("name", N->getName());
-  EXPECT_EQ(N, DIEnumerator::get(Context, 7, false, "name"));
-
-  EXPECT_NE(N, DIEnumerator::get(Context, 7, true, "name"));
-  EXPECT_NE(N, DIEnumerator::get(Context, 8, false, "name"));
-  EXPECT_NE(N, DIEnumerator::get(Context, 7, false, "nam"));
-
-  TempDIEnumerator Temp = N->clone();
-  EXPECT_EQ(N, MDNode::replaceWithUniqued(std::move(Temp)));
-}
-
-TEST_F(DIEnumeratorTest, getWithLargeValues) {
-  auto *N = DIEnumerator::get(Context, APInt::getMaxValue(128), false, "val");
-  EXPECT_EQ(128U, N->getValue().countPopulation());
-  EXPECT_EQ(N,
-            DIEnumerator::get(Context, APInt::getMaxValue(128), false, "val"));
-  EXPECT_NE(N,
-            DIEnumerator::get(Context, APInt::getMinValue(128), false, "val"));
-}
-
-typedef MetadataTest DIBasicTypeTest;
-
-TEST_F(DIBasicTypeTest, get) {
-  auto *N =
-      DIBasicType::get(Context, dwarf::DW_TAG_base_type, "special", 33, 26, 7,
-                        DINode::FlagZero);
-  EXPECT_EQ(dwarf::DW_TAG_base_type, N->getTag());
-  EXPECT_EQ("special", N->getName());
-  EXPECT_EQ(33u, N->getSizeInBits());
-  EXPECT_EQ(26u, N->getAlignInBits());
-  EXPECT_EQ(7u, N->getEncoding());
-  EXPECT_EQ(0u, N->getLine());
-  EXPECT_EQ(DINode::FlagZero, N->getFlags());
-  EXPECT_EQ(N, DIBasicType::get(Context, dwarf::DW_TAG_base_type, "special", 33,
-                                26, 7, DINode::FlagZero));
-
-  EXPECT_NE(N, DIBasicType::get(Context, dwarf::DW_TAG_unspecified_type,
-                                "special", 33, 26, 7, DINode::FlagZero));
-  EXPECT_NE(N,
-            DIBasicType::get(Context, dwarf::DW_TAG_base_type, "s", 33, 26, 7,
-                              DINode::FlagZero));
-  EXPECT_NE(N, DIBasicType::get(Context, dwarf::DW_TAG_base_type, "special", 32,
-                                26, 7, DINode::FlagZero));
-  EXPECT_NE(N, DIBasicType::get(Context, dwarf::DW_TAG_base_type, "special", 33,
-                                25, 7, DINode::FlagZero));
-  EXPECT_NE(N, DIBasicType::get(Context, dwarf::DW_TAG_base_type, "special", 33,
-                                26, 6, DINode::FlagZero));
-  EXPECT_NE(N, DIBasicType::get(Context, dwarf::DW_TAG_base_type, "special", 33,
-                                26, 7, DINode::FlagBigEndian));
-  EXPECT_NE(N, DIBasicType::get(Context, dwarf::DW_TAG_base_type, "special", 33,
-                                26, 7, DINode::FlagLittleEndian));
-
-  TempDIBasicType Temp = N->clone();
-  EXPECT_EQ(N, MDNode::replaceWithUniqued(std::move(Temp)));
-}
-
-TEST_F(DIBasicTypeTest, getWithLargeValues) {
-  auto *N = DIBasicType::get(Context, dwarf::DW_TAG_base_type, "special",
-                             UINT64_MAX, UINT32_MAX - 1, 7, DINode::FlagZero);
-  EXPECT_EQ(UINT64_MAX, N->getSizeInBits());
-  EXPECT_EQ(UINT32_MAX - 1, N->getAlignInBits());
-}
-
-TEST_F(DIBasicTypeTest, getUnspecified) {
-  auto *N =
-      DIBasicType::get(Context, dwarf::DW_TAG_unspecified_type, "unspecified");
-  EXPECT_EQ(dwarf::DW_TAG_unspecified_type, N->getTag());
-  EXPECT_EQ("unspecified", N->getName());
-  EXPECT_EQ(0u, N->getSizeInBits());
-  EXPECT_EQ(0u, N->getAlignInBits());
-  EXPECT_EQ(0u, N->getEncoding());
-  EXPECT_EQ(0u, N->getLine());
-  EXPECT_EQ(DINode::FlagZero, N->getFlags());
-}
-
-typedef MetadataTest DITypeTest;
-
-TEST_F(DITypeTest, clone) {
-  // Check that DIType has a specialized clone that returns TempDIType.
-  DIType *N = DIBasicType::get(Context, dwarf::DW_TAG_base_type, "int", 32, 32,
-                               dwarf::DW_ATE_signed, DINode::FlagZero);
-
-  TempDIType Temp = N->clone();
-  EXPECT_EQ(N, MDNode::replaceWithUniqued(std::move(Temp)));
-}
-
-TEST_F(DITypeTest, cloneWithFlags) {
-  // void (void)
-  Metadata *TypesOps[] = {nullptr};
-  Metadata *Types = MDTuple::get(Context, TypesOps);
-
-  DIType *D =
-      DISubroutineType::getDistinct(Context, DINode::FlagZero, 0, Types);
-  EXPECT_EQ(DINode::FlagZero, D->getFlags());
-  TempDIType D2 = D->cloneWithFlags(DINode::FlagRValueReference);
-  EXPECT_EQ(DINode::FlagRValueReference, D2->getFlags());
-  EXPECT_EQ(DINode::FlagZero, D->getFlags());
-
-  TempDIType T =
-      DISubroutineType::getTemporary(Context, DINode::FlagZero, 0, Types);
-  EXPECT_EQ(DINode::FlagZero, T->getFlags());
-  TempDIType T2 = T->cloneWithFlags(DINode::FlagRValueReference);
-  EXPECT_EQ(DINode::FlagRValueReference, T2->getFlags());
-  EXPECT_EQ(DINode::FlagZero, T->getFlags());
-}
-
-typedef MetadataTest DIDerivedTypeTest;
-
-TEST_F(DIDerivedTypeTest, get) {
-  DIFile *File = getFile();
-  DIScope *Scope = getSubprogram();
-  DIType *BaseType = getBasicType("basic");
-  MDTuple *ExtraData = getTuple();
-  unsigned DWARFAddressSpace = 8;
-  DINode::DIFlags Flags5 = static_cast<DINode::DIFlags>(5);
-  DINode::DIFlags Flags4 = static_cast<DINode::DIFlags>(4);
-
-  auto *N =
-      DIDerivedType::get(Context, dwarf::DW_TAG_pointer_type, "something", File,
-                         1, Scope, BaseType, 2, 3, 4, DWARFAddressSpace, Flags5,
-                         ExtraData);
-  EXPECT_EQ(dwarf::DW_TAG_pointer_type, N->getTag());
-  EXPECT_EQ("something", N->getName());
-  EXPECT_EQ(File, N->getFile());
-  EXPECT_EQ(1u, N->getLine());
-  EXPECT_EQ(Scope, N->getScope());
-  EXPECT_EQ(BaseType, N->getBaseType());
-  EXPECT_EQ(2u, N->getSizeInBits());
-  EXPECT_EQ(3u, N->getAlignInBits());
-  EXPECT_EQ(4u, N->getOffsetInBits());
-  EXPECT_EQ(DWARFAddressSpace, N->getDWARFAddressSpace().getValue());
-  EXPECT_EQ(5u, N->getFlags());
-  EXPECT_EQ(ExtraData, N->getExtraData());
-  EXPECT_EQ(N, DIDerivedType::get(Context, dwarf::DW_TAG_pointer_type,
-                                  "something", File, 1, Scope, BaseType, 2, 3,
-                                  4, DWARFAddressSpace, Flags5, ExtraData));
-
-  EXPECT_NE(N, DIDerivedType::get(Context, dwarf::DW_TAG_reference_type,
-                                  "something", File, 1, Scope, BaseType, 2, 3,
-                                  4, DWARFAddressSpace, Flags5, ExtraData));
-  EXPECT_NE(N, DIDerivedType::get(Context, dwarf::DW_TAG_pointer_type, "else",
-                                  File, 1, Scope, BaseType, 2, 3,
-                                  4, DWARFAddressSpace, Flags5, ExtraData));
-  EXPECT_NE(N, DIDerivedType::get(Context, dwarf::DW_TAG_pointer_type,
-                                  "something", getFile(), 1, Scope, BaseType, 2,
-                                  3, 4, DWARFAddressSpace, Flags5, ExtraData));
-  EXPECT_NE(N, DIDerivedType::get(Context, dwarf::DW_TAG_pointer_type,
-                                  "something", File, 2, Scope, BaseType, 2, 3,
-                                  4, DWARFAddressSpace, Flags5, ExtraData));
-  EXPECT_NE(N, DIDerivedType::get(Context, dwarf::DW_TAG_pointer_type,
-                                  "something", File, 1, getSubprogram(),
-                                  BaseType, 2, 3, 4, DWARFAddressSpace, Flags5,
-                                  ExtraData));
-  EXPECT_NE(N, DIDerivedType::get(
-                   Context, dwarf::DW_TAG_pointer_type, "something", File, 1,
-                   Scope, getBasicType("basic2"), 2, 3, 4, DWARFAddressSpace,
-                   Flags5, ExtraData));
-  EXPECT_NE(N, DIDerivedType::get(Context, dwarf::DW_TAG_pointer_type,
-                                  "something", File, 1, Scope, BaseType, 3, 3,
-                                  4, DWARFAddressSpace, Flags5, ExtraData));
-  EXPECT_NE(N, DIDerivedType::get(Context, dwarf::DW_TAG_pointer_type,
-                                  "something", File, 1, Scope, BaseType, 2, 2,
-                                  4, DWARFAddressSpace, Flags5, ExtraData));
-  EXPECT_NE(N, DIDerivedType::get(Context, dwarf::DW_TAG_pointer_type,
-                                  "something", File, 1, Scope, BaseType, 2, 3,
-                                  5, DWARFAddressSpace, Flags5, ExtraData));
-  EXPECT_NE(N, DIDerivedType::get(Context, dwarf::DW_TAG_pointer_type,
-                                  "something", File, 1, Scope, BaseType, 2, 3,
-                                  4, DWARFAddressSpace + 1, Flags5, ExtraData));
-  EXPECT_NE(N, DIDerivedType::get(Context, dwarf::DW_TAG_pointer_type,
-                                  "something", File, 1, Scope, BaseType, 2, 3,
-                                  4, DWARFAddressSpace, Flags4, ExtraData));
-  EXPECT_NE(N, DIDerivedType::get(Context, dwarf::DW_TAG_pointer_type,
-                                  "something", File, 1, Scope, BaseType, 2, 3,
-                                  4, DWARFAddressSpace, Flags5, getTuple()));
-
-  TempDIDerivedType Temp = N->clone();
-  EXPECT_EQ(N, MDNode::replaceWithUniqued(std::move(Temp)));
-}
-
-TEST_F(DIDerivedTypeTest, getWithLargeValues) {
-  DIFile *File = getFile();
-  DIScope *Scope = getSubprogram();
-  DIType *BaseType = getBasicType("basic");
-  MDTuple *ExtraData = getTuple();
-  DINode::DIFlags Flags = static_cast<DINode::DIFlags>(5);
-
-  auto *N = DIDerivedType::get(
-      Context, dwarf::DW_TAG_pointer_type, "something", File, 1, Scope,
-      BaseType, UINT64_MAX, UINT32_MAX - 1, UINT64_MAX - 2, UINT32_MAX - 3,
-      Flags, ExtraData);
-  EXPECT_EQ(UINT64_MAX, N->getSizeInBits());
-  EXPECT_EQ(UINT32_MAX - 1, N->getAlignInBits());
-  EXPECT_EQ(UINT64_MAX - 2, N->getOffsetInBits());
-  EXPECT_EQ(UINT32_MAX - 3, N->getDWARFAddressSpace().getValue());
-}
-
-typedef MetadataTest DICompositeTypeTest;
-
-TEST_F(DICompositeTypeTest, get) {
-  unsigned Tag = dwarf::DW_TAG_structure_type;
-  StringRef Name = "some name";
-  DIFile *File = getFile();
-  unsigned Line = 1;
-  DIScope *Scope = getSubprogram();
-  DIType *BaseType = getCompositeType();
-  uint64_t SizeInBits = 2;
-  uint32_t AlignInBits = 3;
-  uint64_t OffsetInBits = 4;
-  DINode::DIFlags Flags = static_cast<DINode::DIFlags>(5);
-  MDTuple *Elements = getTuple();
-  unsigned RuntimeLang = 6;
-  DIType *VTableHolder = getCompositeType();
-  MDTuple *TemplateParams = getTuple();
-  StringRef Identifier = "some id";
-
-  auto *N = DICompositeType::get(Context, Tag, Name, File, Line, Scope,
-                                 BaseType, SizeInBits, AlignInBits,
-                                 OffsetInBits, Flags, Elements, RuntimeLang,
-                                 VTableHolder, TemplateParams, Identifier);
-  EXPECT_EQ(Tag, N->getTag());
-  EXPECT_EQ(Name, N->getName());
-  EXPECT_EQ(File, N->getFile());
-  EXPECT_EQ(Line, N->getLine());
-  EXPECT_EQ(Scope, N->getScope());
-  EXPECT_EQ(BaseType, N->getBaseType());
-  EXPECT_EQ(SizeInBits, N->getSizeInBits());
-  EXPECT_EQ(AlignInBits, N->getAlignInBits());
-  EXPECT_EQ(OffsetInBits, N->getOffsetInBits());
-  EXPECT_EQ(Flags, N->getFlags());
-  EXPECT_EQ(Elements, N->getElements().get());
-  EXPECT_EQ(RuntimeLang, N->getRuntimeLang());
-  EXPECT_EQ(VTableHolder, N->getVTableHolder());
-  EXPECT_EQ(TemplateParams, N->getTemplateParams().get());
-  EXPECT_EQ(Identifier, N->getIdentifier());
-
-  EXPECT_EQ(N, DICompositeType::get(Context, Tag, Name, File, Line, Scope,
-                                    BaseType, SizeInBits, AlignInBits,
-                                    OffsetInBits, Flags, Elements, RuntimeLang,
-                                    VTableHolder, TemplateParams, Identifier));
-
-  EXPECT_NE(N, DICompositeType::get(Context, Tag + 1, Name, File, Line, Scope,
-                                    BaseType, SizeInBits, AlignInBits,
-                                    OffsetInBits, Flags, Elements, RuntimeLang,
-                                    VTableHolder, TemplateParams, Identifier));
-  EXPECT_NE(N, DICompositeType::get(Context, Tag, "abc", File, Line, Scope,
-                                    BaseType, SizeInBits, AlignInBits,
-                                    OffsetInBits, Flags, Elements, RuntimeLang,
-                                    VTableHolder, TemplateParams, Identifier));
-  EXPECT_NE(N, DICompositeType::get(Context, Tag, Name, getFile(), Line, Scope,
-                                    BaseType, SizeInBits, AlignInBits,
-                                    OffsetInBits, Flags, Elements, RuntimeLang,
-                                    VTableHolder, TemplateParams, Identifier));
-  EXPECT_NE(N, DICompositeType::get(Context, Tag, Name, File, Line + 1, Scope,
-                                    BaseType, SizeInBits, AlignInBits,
-                                    OffsetInBits, Flags, Elements, RuntimeLang,
-                                    VTableHolder, TemplateParams, Identifier));
-  EXPECT_NE(N, DICompositeType::get(
-                   Context, Tag, Name, File, Line, getSubprogram(), BaseType,
-                   SizeInBits, AlignInBits, OffsetInBits, Flags, Elements,
-                   RuntimeLang, VTableHolder, TemplateParams, Identifier));
-  EXPECT_NE(N, DICompositeType::get(
-                   Context, Tag, Name, File, Line, Scope, getBasicType("other"),
-                   SizeInBits, AlignInBits, OffsetInBits, Flags, Elements,
-                   RuntimeLang, VTableHolder, TemplateParams, Identifier));
-  EXPECT_NE(N, DICompositeType::get(Context, Tag, Name, File, Line, Scope,
-                                    BaseType, SizeInBits + 1, AlignInBits,
-                                    OffsetInBits, Flags, Elements, RuntimeLang,
-                                    VTableHolder, TemplateParams, Identifier));
-  EXPECT_NE(N, DICompositeType::get(Context, Tag, Name, File, Line, Scope,
-                                    BaseType, SizeInBits, AlignInBits + 1,
-                                    OffsetInBits, Flags, Elements, RuntimeLang,
-                                    VTableHolder, TemplateParams, Identifier));
-  EXPECT_NE(N, DICompositeType::get(
-                   Context, Tag, Name, File, Line, Scope, BaseType, SizeInBits,
-                   AlignInBits, OffsetInBits + 1, Flags, Elements, RuntimeLang,
-                   VTableHolder, TemplateParams, Identifier));
-  DINode::DIFlags FlagsPOne = static_cast<DINode::DIFlags>(Flags + 1);
-  EXPECT_NE(N, DICompositeType::get(
-                   Context, Tag, Name, File, Line, Scope, BaseType, SizeInBits,
-                   AlignInBits, OffsetInBits, FlagsPOne, Elements, RuntimeLang,
-                   VTableHolder, TemplateParams, Identifier));
-  EXPECT_NE(N, DICompositeType::get(
-                   Context, Tag, Name, File, Line, Scope, BaseType, SizeInBits,
-                   AlignInBits, OffsetInBits, Flags, getTuple(), RuntimeLang,
-                   VTableHolder, TemplateParams, Identifier));
-  EXPECT_NE(N, DICompositeType::get(
-                   Context, Tag, Name, File, Line, Scope, BaseType, SizeInBits,
-                   AlignInBits, OffsetInBits, Flags, Elements, RuntimeLang + 1,
-                   VTableHolder, TemplateParams, Identifier));
-  EXPECT_NE(N, DICompositeType::get(
-                   Context, Tag, Name, File, Line, Scope, BaseType, SizeInBits,
-                   AlignInBits, OffsetInBits, Flags, Elements, RuntimeLang,
-                   getCompositeType(), TemplateParams, Identifier));
-  EXPECT_NE(N, DICompositeType::get(Context, Tag, Name, File, Line, Scope,
-                                    BaseType, SizeInBits, AlignInBits,
-                                    OffsetInBits, Flags, Elements, RuntimeLang,
-                                    VTableHolder, getTuple(), Identifier));
-  EXPECT_NE(N, DICompositeType::get(Context, Tag, Name, File, Line, Scope,
-                                    BaseType, SizeInBits, AlignInBits,
-                                    OffsetInBits, Flags, Elements, RuntimeLang,
-                                    VTableHolder, TemplateParams, "other"));
-
-  // Be sure that missing identifiers get null pointers.
-  EXPECT_FALSE(DICompositeType::get(Context, Tag, Name, File, Line, Scope,
-                                    BaseType, SizeInBits, AlignInBits,
-                                    OffsetInBits, Flags, Elements, RuntimeLang,
-                                    VTableHolder, TemplateParams, "")
-                   ->getRawIdentifier());
-  EXPECT_FALSE(DICompositeType::get(Context, Tag, Name, File, Line, Scope,
-                                    BaseType, SizeInBits, AlignInBits,
-                                    OffsetInBits, Flags, Elements, RuntimeLang,
-                                    VTableHolder, TemplateParams)
-                   ->getRawIdentifier());
-
-  TempDICompositeType Temp = N->clone();
-  EXPECT_EQ(N, MDNode::replaceWithUniqued(std::move(Temp)));
-}
-
-TEST_F(DICompositeTypeTest, getWithLargeValues) {
-  unsigned Tag = dwarf::DW_TAG_structure_type;
-  StringRef Name = "some name";
-  DIFile *File = getFile();
-  unsigned Line = 1;
-  DIScope *Scope = getSubprogram();
-  DIType *BaseType = getCompositeType();
-  uint64_t SizeInBits = UINT64_MAX;
-  uint32_t AlignInBits = UINT32_MAX - 1;
-  uint64_t OffsetInBits = UINT64_MAX - 2;
-  DINode::DIFlags Flags = static_cast<DINode::DIFlags>(5);
-  MDTuple *Elements = getTuple();
-  unsigned RuntimeLang = 6;
-  DIType *VTableHolder = getCompositeType();
-  MDTuple *TemplateParams = getTuple();
-  StringRef Identifier = "some id";
-
-  auto *N = DICompositeType::get(Context, Tag, Name, File, Line, Scope,
-                                 BaseType, SizeInBits, AlignInBits,
-                                 OffsetInBits, Flags, Elements, RuntimeLang,
-                                 VTableHolder, TemplateParams, Identifier);
-  EXPECT_EQ(SizeInBits, N->getSizeInBits());
-  EXPECT_EQ(AlignInBits, N->getAlignInBits());
-  EXPECT_EQ(OffsetInBits, N->getOffsetInBits());
-}
-
-TEST_F(DICompositeTypeTest, replaceOperands) {
-  unsigned Tag = dwarf::DW_TAG_structure_type;
-  StringRef Name = "some name";
-  DIFile *File = getFile();
-  unsigned Line = 1;
-  DIScope *Scope = getSubprogram();
-  DIType *BaseType = getCompositeType();
-  uint64_t SizeInBits = 2;
-  uint32_t AlignInBits = 3;
-  uint64_t OffsetInBits = 4;
-  DINode::DIFlags Flags = static_cast<DINode::DIFlags>(5);
-  unsigned RuntimeLang = 6;
-  StringRef Identifier = "some id";
-
-  auto *N = DICompositeType::get(
-      Context, Tag, Name, File, Line, Scope, BaseType, SizeInBits, AlignInBits,
-      OffsetInBits, Flags, nullptr, RuntimeLang, nullptr, nullptr, Identifier);
-
-  auto *Elements = MDTuple::getDistinct(Context, None);
-  EXPECT_EQ(nullptr, N->getElements().get());
-  N->replaceElements(Elements);
-  EXPECT_EQ(Elements, N->getElements().get());
-  N->replaceElements(nullptr);
-  EXPECT_EQ(nullptr, N->getElements().get());
-
-  DIType *VTableHolder = getCompositeType();
-  EXPECT_EQ(nullptr, N->getVTableHolder());
-  N->replaceVTableHolder(VTableHolder);
-  EXPECT_EQ(VTableHolder, N->getVTableHolder());
-  // As an extension, the containing type can be anything.  This is
-  // used by Rust to associate vtables with their concrete type.
-  DIType *BasicType = getBasicType("basic");
-  N->replaceVTableHolder(BasicType);
-  EXPECT_EQ(BasicType, N->getVTableHolder());
-  N->replaceVTableHolder(nullptr);
-  EXPECT_EQ(nullptr, N->getVTableHolder());
-
-  auto *TemplateParams = MDTuple::getDistinct(Context, None);
-  EXPECT_EQ(nullptr, N->getTemplateParams().get());
-  N->replaceTemplateParams(TemplateParams);
-  EXPECT_EQ(TemplateParams, N->getTemplateParams().get());
-  N->replaceTemplateParams(nullptr);
-  EXPECT_EQ(nullptr, N->getTemplateParams().get());
-}
-
-TEST_F(DICompositeTypeTest, variant_part) {
-  unsigned Tag = dwarf::DW_TAG_variant_part;
-  StringRef Name = "some name";
-  DIFile *File = getFile();
-  unsigned Line = 1;
-  DIScope *Scope = getSubprogram();
-  DIType *BaseType = getCompositeType();
-  uint64_t SizeInBits = 2;
-  uint32_t AlignInBits = 3;
-  uint64_t OffsetInBits = 4;
-  DINode::DIFlags Flags = static_cast<DINode::DIFlags>(5);
-  unsigned RuntimeLang = 6;
-  StringRef Identifier = "some id";
-  DIDerivedType *Discriminator = cast<DIDerivedType>(getDerivedType());
-  DIDerivedType *Discriminator2 = cast<DIDerivedType>(getDerivedType());
-
-  EXPECT_NE(Discriminator, Discriminator2);
-
-  auto *N = DICompositeType::get(
-      Context, Tag, Name, File, Line, Scope, BaseType, SizeInBits, AlignInBits,
-      OffsetInBits, Flags, nullptr, RuntimeLang, nullptr, nullptr, Identifier,
-      Discriminator);
-
-  // Test the hashing.
-  auto *Same = DICompositeType::get(
-      Context, Tag, Name, File, Line, Scope, BaseType, SizeInBits, AlignInBits,
-      OffsetInBits, Flags, nullptr, RuntimeLang, nullptr, nullptr, Identifier,
-      Discriminator);
-  auto *Other = DICompositeType::get(
-      Context, Tag, Name, File, Line, Scope, BaseType, SizeInBits, AlignInBits,
-      OffsetInBits, Flags, nullptr, RuntimeLang, nullptr, nullptr, Identifier,
-      Discriminator2);
-  auto *NoDisc = DICompositeType::get(
-      Context, Tag, Name, File, Line, Scope, BaseType, SizeInBits, AlignInBits,
-      OffsetInBits, Flags, nullptr, RuntimeLang, nullptr, nullptr, Identifier,
-      nullptr);
-
-  EXPECT_EQ(N, Same);
-  EXPECT_NE(Same, Other);
-  EXPECT_NE(Same, NoDisc);
-  EXPECT_NE(Other, NoDisc);
-
-  EXPECT_EQ(N->getDiscriminator(), Discriminator);
-}
-
-TEST_F(DICompositeTypeTest, dynamicArray) {
-  unsigned Tag = dwarf::DW_TAG_array_type;
-  StringRef Name = "some name";
-  DIFile *File = getFile();
-  unsigned Line = 1;
-  DILocalScope *Scope = getSubprogram();
-  DIType *BaseType = getCompositeType();
-  uint64_t SizeInBits = 32;
-  uint32_t AlignInBits = 32;
-  uint64_t OffsetInBits = 4;
-  DINode::DIFlags Flags = static_cast<DINode::DIFlags>(3);
-  unsigned RuntimeLang = 6;
-  StringRef Identifier = "some id";
-  DIType *Type = getDerivedType();
-  Metadata *DlVar1 = DILocalVariable::get(Context, Scope, "dl_var1", File, 8,
-                                       Type, 2, Flags, 8);
-  Metadata *DlVar2 = DILocalVariable::get(Context, Scope, "dl_var2", File, 8,
-                                       Type, 2, Flags, 8);
-  uint64_t Elements1[] = {dwarf::DW_OP_push_object_address, dwarf::DW_OP_deref};
-  Metadata *DataLocation1 = DIExpression::get(Context, Elements1);
-
-  uint64_t Elements2[] = {dwarf::DW_OP_constu, 0};
-  Metadata *DataLocation2 = DIExpression::get(Context, Elements2);
-
-  uint64_t Elements3[] = {dwarf::DW_OP_constu, 3};
-  Metadata *Rank1 = DIExpression::get(Context, Elements3);
-
-  uint64_t Elements4[] = {dwarf::DW_OP_constu, 4};
-  Metadata *Rank2 = DIExpression::get(Context, Elements4);
-
-  ConstantInt *RankInt1 = ConstantInt::get(Context, APInt(7, 0));
-  ConstantAsMetadata *RankConst1 = ConstantAsMetadata::get(RankInt1);
-  ConstantInt *RankInt2 = ConstantInt::get(Context, APInt(6, 0));
-  ConstantAsMetadata *RankConst2 = ConstantAsMetadata::get(RankInt2);
-  auto *N1 = DICompositeType::get(
-      Context, Tag, Name, File, Line, Scope, BaseType, SizeInBits, AlignInBits,
-      OffsetInBits, Flags, nullptr, RuntimeLang, nullptr, nullptr, Identifier,
-      nullptr, DlVar1);
-
-  auto *Same1 = DICompositeType::get(
-      Context, Tag, Name, File, Line, Scope, BaseType, SizeInBits, AlignInBits,
-      OffsetInBits, Flags, nullptr, RuntimeLang, nullptr, nullptr, Identifier,
-      nullptr, DlVar1);
-
-  auto *Other1 = DICompositeType::get(
-      Context, Tag, Name, File, Line, Scope, BaseType, SizeInBits, AlignInBits,
-      OffsetInBits, Flags, nullptr, RuntimeLang, nullptr, nullptr, Identifier,
-      nullptr, DlVar2);
-
-  EXPECT_EQ(N1, Same1);
-  EXPECT_NE(Same1, Other1);
-  EXPECT_EQ(N1->getDataLocation(), DlVar1);
-
-  auto *N2 = DICompositeType::get(
-      Context, Tag, Name, File, Line, Scope, BaseType, SizeInBits, AlignInBits,
-      OffsetInBits, Flags, nullptr, RuntimeLang, nullptr, nullptr, Identifier,
-      nullptr, DataLocation1);
-
-  auto *Same2 = DICompositeType::get(
-      Context, Tag, Name, File, Line, Scope, BaseType, SizeInBits, AlignInBits,
-      OffsetInBits, Flags, nullptr, RuntimeLang, nullptr, nullptr, Identifier,
-      nullptr, DataLocation1);
-
-  auto *Other2 = DICompositeType::get(
-      Context, Tag, Name, File, Line, Scope, BaseType, SizeInBits, AlignInBits,
-      OffsetInBits, Flags, nullptr, RuntimeLang, nullptr, nullptr, Identifier,
-      nullptr, DataLocation2);
-
-  EXPECT_EQ(N2, Same2);
-  EXPECT_NE(Same2, Other2);
-  EXPECT_EQ(N2->getDataLocationExp(), DataLocation1);
-
-  auto *N3 = DICompositeType::get(
-      Context, Tag, Name, File, Line, Scope, BaseType, SizeInBits, AlignInBits,
-      OffsetInBits, Flags, nullptr, RuntimeLang, nullptr, nullptr, Identifier,
-      nullptr, DataLocation1, nullptr, nullptr, Rank1);
-
-  auto *Same3 = DICompositeType::get(
-      Context, Tag, Name, File, Line, Scope, BaseType, SizeInBits, AlignInBits,
-      OffsetInBits, Flags, nullptr, RuntimeLang, nullptr, nullptr, Identifier,
-      nullptr, DataLocation1, nullptr, nullptr, Rank1);
-
-  auto *Other3 = DICompositeType::get(
-      Context, Tag, Name, File, Line, Scope, BaseType, SizeInBits, AlignInBits,
-      OffsetInBits, Flags, nullptr, RuntimeLang, nullptr, nullptr, Identifier,
-      nullptr, DataLocation1, nullptr, nullptr, Rank2);
-
-  EXPECT_EQ(N3, Same3);
-  EXPECT_NE(Same3, Other3);
-  EXPECT_EQ(N3->getRankExp(), Rank1);
-
-  auto *N4 = DICompositeType::get(
-      Context, Tag, Name, File, Line, Scope, BaseType, SizeInBits, AlignInBits,
-      OffsetInBits, Flags, nullptr, RuntimeLang, nullptr, nullptr, Identifier,
-      nullptr, DataLocation1, nullptr, nullptr, RankConst1);
-
-  auto *Same4 = DICompositeType::get(
-      Context, Tag, Name, File, Line, Scope, BaseType, SizeInBits, AlignInBits,
-      OffsetInBits, Flags, nullptr, RuntimeLang, nullptr, nullptr, Identifier,
-      nullptr, DataLocation1, nullptr, nullptr, RankConst1);
-
-  auto *Other4 = DICompositeType::get(
-      Context, Tag, Name, File, Line, Scope, BaseType, SizeInBits, AlignInBits,
-      OffsetInBits, Flags, nullptr, RuntimeLang, nullptr, nullptr, Identifier,
-      nullptr, DataLocation1, nullptr, nullptr, RankConst2);
-
-  EXPECT_EQ(N4, Same4);
-  EXPECT_NE(Same4, Other4);
-  EXPECT_EQ(N4->getRankConst(), RankInt1);
-}
-
-typedef MetadataTest DISubroutineTypeTest;
-
-TEST_F(DISubroutineTypeTest, get) {
-  DINode::DIFlags Flags = static_cast<DINode::DIFlags>(1);
-  DINode::DIFlags FlagsPOne = static_cast<DINode::DIFlags>(Flags + 1);
-  MDTuple *TypeArray = getTuple();
-
-  auto *N = DISubroutineType::get(Context, Flags, 0, TypeArray);
-  EXPECT_EQ(dwarf::DW_TAG_subroutine_type, N->getTag());
-  EXPECT_EQ(Flags, N->getFlags());
-  EXPECT_EQ(TypeArray, N->getTypeArray().get());
-  EXPECT_EQ(N, DISubroutineType::get(Context, Flags, 0, TypeArray));
-
-  EXPECT_NE(N, DISubroutineType::get(Context, FlagsPOne, 0, TypeArray));
-  EXPECT_NE(N, DISubroutineType::get(Context, Flags, 0, getTuple()));
-
-  // Test the hashing of calling conventions.
-  auto *Fast = DISubroutineType::get(
-      Context, Flags, dwarf::DW_CC_BORLAND_msfastcall, TypeArray);
-  auto *Std = DISubroutineType::get(Context, Flags,
-                                    dwarf::DW_CC_BORLAND_stdcall, TypeArray);
-  EXPECT_EQ(Fast,
-            DISubroutineType::get(Context, Flags,
-                                  dwarf::DW_CC_BORLAND_msfastcall, TypeArray));
-  EXPECT_EQ(Std, DISubroutineType::get(
-                     Context, Flags, dwarf::DW_CC_BORLAND_stdcall, TypeArray));
-
-  EXPECT_NE(N, Fast);
-  EXPECT_NE(N, Std);
-  EXPECT_NE(Fast, Std);
-
-  TempDISubroutineType Temp = N->clone();
-  EXPECT_EQ(N, MDNode::replaceWithUniqued(std::move(Temp)));
-
-  // Test always-empty operands.
-  EXPECT_EQ(nullptr, N->getScope());
-  EXPECT_EQ(nullptr, N->getFile());
-  EXPECT_EQ("", N->getName());
-}
-
-typedef MetadataTest DIFileTest;
-
-TEST_F(DIFileTest, get) {
-  StringRef Filename = "file";
-  StringRef Directory = "dir";
-  DIFile::ChecksumKind CSKind = DIFile::ChecksumKind::CSK_MD5;
-  StringRef ChecksumString = "000102030405060708090a0b0c0d0e0f";
-  DIFile::ChecksumInfo<StringRef> Checksum(CSKind, ChecksumString);
-  StringRef Source = "source";
-  auto *N = DIFile::get(Context, Filename, Directory, Checksum, Source);
-
-  EXPECT_EQ(dwarf::DW_TAG_file_type, N->getTag());
-  EXPECT_EQ(Filename, N->getFilename());
-  EXPECT_EQ(Directory, N->getDirectory());
-  EXPECT_EQ(Checksum, N->getChecksum());
-  EXPECT_EQ(Source, N->getSource());
-  EXPECT_EQ(N, DIFile::get(Context, Filename, Directory, Checksum, Source));
-
-  EXPECT_NE(N, DIFile::get(Context, "other", Directory, Checksum, Source));
-  EXPECT_NE(N, DIFile::get(Context, Filename, "other", Checksum, Source));
-  DIFile::ChecksumInfo<StringRef> OtherChecksum(DIFile::ChecksumKind::CSK_SHA1, ChecksumString);
-  EXPECT_NE(
-      N, DIFile::get(Context, Filename, Directory, OtherChecksum));
-  StringRef OtherSource = "other";
-  EXPECT_NE(N, DIFile::get(Context, Filename, Directory, Checksum, OtherSource));
-  EXPECT_NE(N, DIFile::get(Context, Filename, Directory, Checksum));
-  EXPECT_NE(N, DIFile::get(Context, Filename, Directory));
-
-  TempDIFile Temp = N->clone();
-  EXPECT_EQ(N, MDNode::replaceWithUniqued(std::move(Temp)));
-}
-
-TEST_F(DIFileTest, ScopeGetFile) {
-  // Ensure that DIScope::getFile() returns itself.
-  DIScope *N = DIFile::get(Context, "file", "dir");
-  EXPECT_EQ(N, N->getFile());
-}
-
-typedef MetadataTest DICompileUnitTest;
-
-TEST_F(DICompileUnitTest, get) {
-  unsigned SourceLanguage = 1;
-  DIFile *File = getFile();
-  StringRef Producer = "some producer";
-  bool IsOptimized = false;
-  StringRef Flags = "flag after flag";
-  unsigned RuntimeVersion = 2;
-  StringRef SplitDebugFilename = "another/file";
-  auto EmissionKind = DICompileUnit::FullDebug;
-  MDTuple *EnumTypes = getTuple();
-  MDTuple *RetainedTypes = getTuple();
-  MDTuple *GlobalVariables = getTuple();
-  MDTuple *ImportedEntities = getTuple();
-  uint64_t DWOId = 0x10000000c0ffee;
-  MDTuple *Macros = getTuple();
-  StringRef SysRoot = "/";
-  StringRef SDK = "MacOSX.sdk";
-  auto *N = DICompileUnit::getDistinct(
-      Context, SourceLanguage, File, Producer, IsOptimized, Flags,
-      RuntimeVersion, SplitDebugFilename, EmissionKind, EnumTypes,
-      RetainedTypes, GlobalVariables, ImportedEntities, Macros, DWOId, true,
-      false, DICompileUnit::DebugNameTableKind::Default, false, SysRoot, SDK);
-
-  EXPECT_EQ(dwarf::DW_TAG_compile_unit, N->getTag());
-  EXPECT_EQ(SourceLanguage, N->getSourceLanguage());
-  EXPECT_EQ(File, N->getFile());
-  EXPECT_EQ(Producer, N->getProducer());
-  EXPECT_EQ(IsOptimized, N->isOptimized());
-  EXPECT_EQ(Flags, N->getFlags());
-  EXPECT_EQ(RuntimeVersion, N->getRuntimeVersion());
-  EXPECT_EQ(SplitDebugFilename, N->getSplitDebugFilename());
-  EXPECT_EQ(EmissionKind, N->getEmissionKind());
-  EXPECT_EQ(EnumTypes, N->getEnumTypes().get());
-  EXPECT_EQ(RetainedTypes, N->getRetainedTypes().get());
-  EXPECT_EQ(GlobalVariables, N->getGlobalVariables().get());
-  EXPECT_EQ(ImportedEntities, N->getImportedEntities().get());
-  EXPECT_EQ(Macros, N->getMacros().get());
-  EXPECT_EQ(DWOId, N->getDWOId());
-  EXPECT_EQ(SysRoot, N->getSysRoot());
-  EXPECT_EQ(SDK, N->getSDK());
-
-  TempDICompileUnit Temp = N->clone();
-  EXPECT_EQ(dwarf::DW_TAG_compile_unit, Temp->getTag());
-  EXPECT_EQ(SourceLanguage, Temp->getSourceLanguage());
-  EXPECT_EQ(File, Temp->getFile());
-  EXPECT_EQ(Producer, Temp->getProducer());
-  EXPECT_EQ(IsOptimized, Temp->isOptimized());
-  EXPECT_EQ(Flags, Temp->getFlags());
-  EXPECT_EQ(RuntimeVersion, Temp->getRuntimeVersion());
-  EXPECT_EQ(SplitDebugFilename, Temp->getSplitDebugFilename());
-  EXPECT_EQ(EmissionKind, Temp->getEmissionKind());
-  EXPECT_EQ(EnumTypes, Temp->getEnumTypes().get());
-  EXPECT_EQ(RetainedTypes, Temp->getRetainedTypes().get());
-  EXPECT_EQ(GlobalVariables, Temp->getGlobalVariables().get());
-  EXPECT_EQ(ImportedEntities, Temp->getImportedEntities().get());
-  EXPECT_EQ(Macros, Temp->getMacros().get());
-  EXPECT_EQ(SysRoot, Temp->getSysRoot());
-  EXPECT_EQ(SDK, Temp->getSDK());
-
-  auto *TempAddress = Temp.get();
-  auto *Clone = MDNode::replaceWithPermanent(std::move(Temp));
-  EXPECT_TRUE(Clone->isDistinct());
-  EXPECT_EQ(TempAddress, Clone);
-}
-
-TEST_F(DICompileUnitTest, replaceArrays) {
-  unsigned SourceLanguage = 1;
-  DIFile *File = getFile();
-  StringRef Producer = "some producer";
-  bool IsOptimized = false;
-  StringRef Flags = "flag after flag";
-  unsigned RuntimeVersion = 2;
-  StringRef SplitDebugFilename = "another/file";
-  auto EmissionKind = DICompileUnit::FullDebug;
-  MDTuple *EnumTypes = MDTuple::getDistinct(Context, None);
-  MDTuple *RetainedTypes = MDTuple::getDistinct(Context, None);
-  MDTuple *ImportedEntities = MDTuple::getDistinct(Context, None);
-  uint64_t DWOId = 0xc0ffee;
-  StringRef SysRoot = "/";
-  StringRef SDK = "MacOSX.sdk";
-  auto *N = DICompileUnit::getDistinct(
-      Context, SourceLanguage, File, Producer, IsOptimized, Flags,
-      RuntimeVersion, SplitDebugFilename, EmissionKind, EnumTypes,
-      RetainedTypes, nullptr, ImportedEntities, nullptr, DWOId, true, false,
-      DICompileUnit::DebugNameTableKind::Default, false, SysRoot, SDK);
-
-  auto *GlobalVariables = MDTuple::getDistinct(Context, None);
-  EXPECT_EQ(nullptr, N->getGlobalVariables().get());
-  N->replaceGlobalVariables(GlobalVariables);
-  EXPECT_EQ(GlobalVariables, N->getGlobalVariables().get());
-  N->replaceGlobalVariables(nullptr);
-  EXPECT_EQ(nullptr, N->getGlobalVariables().get());
-
-  auto *Macros = MDTuple::getDistinct(Context, None);
-  EXPECT_EQ(nullptr, N->getMacros().get());
-  N->replaceMacros(Macros);
-  EXPECT_EQ(Macros, N->getMacros().get());
-  N->replaceMacros(nullptr);
-  EXPECT_EQ(nullptr, N->getMacros().get());
-}
-
-typedef MetadataTest DISubprogramTest;
-
-TEST_F(DISubprogramTest, get) {
-  DIScope *Scope = getCompositeType();
-  StringRef Name = "name";
-  StringRef LinkageName = "linkage";
-  DIFile *File = getFile();
-  unsigned Line = 2;
-  DISubroutineType *Type = getSubroutineType();
-  bool IsLocalToUnit = false;
-  bool IsDefinition = true;
-  unsigned ScopeLine = 3;
-  DIType *ContainingType = getCompositeType();
-  unsigned Virtuality = 2;
-  unsigned VirtualIndex = 5;
-  int ThisAdjustment = -3;
-  DINode::DIFlags Flags = static_cast<DINode::DIFlags>(6);
-  bool IsOptimized = false;
-  MDTuple *TemplateParams = getTuple();
-  DISubprogram *Declaration = getSubprogram();
-  MDTuple *RetainedNodes = getTuple();
-  MDTuple *ThrownTypes = getTuple();
-  DICompileUnit *Unit = getUnit();
-  DISubprogram::DISPFlags SPFlags =
-      static_cast<DISubprogram::DISPFlags>(Virtuality);
-  assert(!IsLocalToUnit && IsDefinition && !IsOptimized &&
-         "bools and SPFlags have to match");
-  SPFlags |= DISubprogram::SPFlagDefinition;
-
-  auto *N = DISubprogram::get(
-      Context, Scope, Name, LinkageName, File, Line, Type, ScopeLine,
-      ContainingType, VirtualIndex, ThisAdjustment, Flags, SPFlags, Unit,
-      TemplateParams, Declaration, RetainedNodes, ThrownTypes);
-
-  EXPECT_EQ(dwarf::DW_TAG_subprogram, N->getTag());
-  EXPECT_EQ(Scope, N->getScope());
-  EXPECT_EQ(Name, N->getName());
-  EXPECT_EQ(LinkageName, N->getLinkageName());
-  EXPECT_EQ(File, N->getFile());
-  EXPECT_EQ(Line, N->getLine());
-  EXPECT_EQ(Type, N->getType());
-  EXPECT_EQ(IsLocalToUnit, N->isLocalToUnit());
-  EXPECT_EQ(IsDefinition, N->isDefinition());
-  EXPECT_EQ(ScopeLine, N->getScopeLine());
-  EXPECT_EQ(ContainingType, N->getContainingType());
-  EXPECT_EQ(Virtuality, N->getVirtuality());
-  EXPECT_EQ(VirtualIndex, N->getVirtualIndex());
-  EXPECT_EQ(ThisAdjustment, N->getThisAdjustment());
-  EXPECT_EQ(Flags, N->getFlags());
-  EXPECT_EQ(IsOptimized, N->isOptimized());
-  EXPECT_EQ(Unit, N->getUnit());
-  EXPECT_EQ(TemplateParams, N->getTemplateParams().get());
-  EXPECT_EQ(Declaration, N->getDeclaration());
-  EXPECT_EQ(RetainedNodes, N->getRetainedNodes().get());
-  EXPECT_EQ(ThrownTypes, N->getThrownTypes().get());
-  EXPECT_EQ(N, DISubprogram::get(Context, Scope, Name, LinkageName, File, Line,
-                                 Type, ScopeLine, ContainingType, VirtualIndex,
-                                 ThisAdjustment, Flags, SPFlags, Unit,
-                                 TemplateParams, Declaration, RetainedNodes,
-                                 ThrownTypes));
-
-  EXPECT_NE(N, DISubprogram::get(Context, getCompositeType(), Name, LinkageName,
-                                 File, Line, Type, ScopeLine, ContainingType,
-                                 VirtualIndex, ThisAdjustment, Flags, SPFlags,
-                                 Unit, TemplateParams, Declaration,
-                                 RetainedNodes, ThrownTypes));
-  EXPECT_NE(N, DISubprogram::get(Context, Scope, "other", LinkageName, File,
-                                 Line, Type, ScopeLine, ContainingType,
-                                 VirtualIndex, ThisAdjustment, Flags, SPFlags,
-                                 Unit, TemplateParams, Declaration,
-                                 RetainedNodes, ThrownTypes));
-  EXPECT_NE(N, DISubprogram::get(Context, Scope, Name, "other", File, Line,
-                                 Type, ScopeLine, ContainingType, VirtualIndex,
-                                 ThisAdjustment, Flags, SPFlags, Unit,
-                                 TemplateParams, Declaration, RetainedNodes,
-                                 ThrownTypes));
-  EXPECT_NE(N, DISubprogram::get(Context, Scope, Name, LinkageName, getFile(),
-                                 Line, Type, ScopeLine, ContainingType,
-                                 VirtualIndex, ThisAdjustment, Flags, SPFlags,
-                                 Unit, TemplateParams, Declaration,
-                                 RetainedNodes, ThrownTypes));
-  EXPECT_NE(N, DISubprogram::get(Context, Scope, Name, LinkageName, File,
-                                 Line + 1, Type, ScopeLine, ContainingType,
-                                 VirtualIndex, ThisAdjustment, Flags, SPFlags,
-                                 Unit, TemplateParams, Declaration,
-                                 RetainedNodes, ThrownTypes));
-  EXPECT_NE(N, DISubprogram::get(Context, Scope, Name, LinkageName, File, Line,
-                                 getSubroutineType(), ScopeLine, ContainingType,
-                                 VirtualIndex, ThisAdjustment, Flags, SPFlags,
-                                 Unit, TemplateParams, Declaration,
-                                 RetainedNodes, ThrownTypes));
-  EXPECT_NE(N, DISubprogram::get(
-                   Context, Scope, Name, LinkageName, File, Line, Type,
-                   ScopeLine, ContainingType, VirtualIndex, ThisAdjustment,
-                   Flags, SPFlags ^ DISubprogram::SPFlagLocalToUnit, Unit,
-                   TemplateParams, Declaration, RetainedNodes, ThrownTypes));
-  EXPECT_NE(N, DISubprogram::get(
-                   Context, Scope, Name, LinkageName, File, Line, Type,
-                   ScopeLine, ContainingType, VirtualIndex, ThisAdjustment,
-                   Flags, SPFlags ^ DISubprogram::SPFlagDefinition, Unit,
-                   TemplateParams, Declaration, RetainedNodes, ThrownTypes));
-  EXPECT_NE(N, DISubprogram::get(Context, Scope, Name, LinkageName, File, Line,
-                                 Type, ScopeLine + 1, ContainingType,
-                                 VirtualIndex, ThisAdjustment, Flags, SPFlags,
-                                 Unit, TemplateParams, Declaration,
-                                 RetainedNodes, ThrownTypes));
-  EXPECT_NE(N, DISubprogram::get(Context, Scope, Name, LinkageName, File, Line,
-                                 Type, ScopeLine, getCompositeType(),
-                                 VirtualIndex, ThisAdjustment, Flags, SPFlags,
-                                 Unit, TemplateParams, Declaration,
-                                 RetainedNodes, ThrownTypes));
-  EXPECT_NE(N, DISubprogram::get(
-                   Context, Scope, Name, LinkageName, File, Line, Type,
-                   ScopeLine, ContainingType, VirtualIndex, ThisAdjustment,
-                   Flags, SPFlags ^ DISubprogram::SPFlagVirtual, Unit,
-                   TemplateParams, Declaration, RetainedNodes, ThrownTypes));
-  EXPECT_NE(N, DISubprogram::get(Context, Scope, Name, LinkageName, File, Line,
-                                 Type, ScopeLine, ContainingType,
-                                 VirtualIndex + 1, ThisAdjustment, Flags,
-                                 SPFlags, Unit, TemplateParams, Declaration,
-                                 RetainedNodes, ThrownTypes));
-  EXPECT_NE(N, DISubprogram::get(
-                   Context, Scope, Name, LinkageName, File, Line, Type,
-                   ScopeLine, ContainingType, VirtualIndex, ThisAdjustment,
-                   Flags, SPFlags ^ DISubprogram::SPFlagOptimized, Unit,
-                   TemplateParams, Declaration, RetainedNodes, ThrownTypes));
-  EXPECT_NE(N, DISubprogram::get(Context, Scope, Name, LinkageName, File, Line,
-                                 Type, ScopeLine, ContainingType, VirtualIndex,
-                                 ThisAdjustment, Flags, SPFlags, nullptr,
-                                 TemplateParams, Declaration, RetainedNodes,
-                                 ThrownTypes));
-  EXPECT_NE(N,
-            DISubprogram::get(Context, Scope, Name, LinkageName, File, Line,
-                              Type, ScopeLine, ContainingType, VirtualIndex,
-                              ThisAdjustment, Flags, SPFlags, Unit, getTuple(),
-                              Declaration, RetainedNodes, ThrownTypes));
-  EXPECT_NE(N, DISubprogram::get(Context, Scope, Name, LinkageName, File, Line,
-                                 Type, ScopeLine, ContainingType, VirtualIndex,
-                                 ThisAdjustment, Flags, SPFlags, Unit,
-                                 TemplateParams, getSubprogram(), RetainedNodes,
-                                 ThrownTypes));
-  EXPECT_NE(N, DISubprogram::get(Context, Scope, Name, LinkageName, File, Line,
-                                 Type, ScopeLine, ContainingType, VirtualIndex,
-                                 ThisAdjustment, Flags, SPFlags, Unit,
-                                 TemplateParams, Declaration, getTuple()));
-  EXPECT_NE(N, DISubprogram::get(Context, Scope, Name, LinkageName, File, Line,
-                                 Type, ScopeLine, ContainingType, VirtualIndex,
-                                 ThisAdjustment, Flags, SPFlags, Unit,
-                                 TemplateParams, Declaration, RetainedNodes,
-                                 getTuple()));
-
-  TempDISubprogram Temp = N->clone();
-  EXPECT_EQ(N, MDNode::replaceWithUniqued(std::move(Temp)));
-}
-
-typedef MetadataTest DILexicalBlockTest;
-
-TEST_F(DILexicalBlockTest, get) {
-  DILocalScope *Scope = getSubprogram();
-  DIFile *File = getFile();
-  unsigned Line = 5;
-  unsigned Column = 8;
-
-  auto *N = DILexicalBlock::get(Context, Scope, File, Line, Column);
-
-  EXPECT_EQ(dwarf::DW_TAG_lexical_block, N->getTag());
-  EXPECT_EQ(Scope, N->getScope());
-  EXPECT_EQ(File, N->getFile());
-  EXPECT_EQ(Line, N->getLine());
-  EXPECT_EQ(Column, N->getColumn());
-  EXPECT_EQ(N, DILexicalBlock::get(Context, Scope, File, Line, Column));
-
-  EXPECT_NE(N,
-            DILexicalBlock::get(Context, getSubprogram(), File, Line, Column));
-  EXPECT_NE(N, DILexicalBlock::get(Context, Scope, getFile(), Line, Column));
-  EXPECT_NE(N, DILexicalBlock::get(Context, Scope, File, Line + 1, Column));
-  EXPECT_NE(N, DILexicalBlock::get(Context, Scope, File, Line, Column + 1));
-
-  TempDILexicalBlock Temp = N->clone();
-  EXPECT_EQ(N, MDNode::replaceWithUniqued(std::move(Temp)));
-}
-
-TEST_F(DILexicalBlockTest, Overflow) {
-  DISubprogram *SP = getSubprogram();
-  DIFile *F = getFile();
-  {
-    auto *LB = DILexicalBlock::get(Context, SP, F, 2, 7);
-    EXPECT_EQ(2u, LB->getLine());
-    EXPECT_EQ(7u, LB->getColumn());
-  }
-  unsigned U16 = 1u << 16;
-  {
-    auto *LB = DILexicalBlock::get(Context, SP, F, UINT32_MAX, U16 - 1);
-    EXPECT_EQ(UINT32_MAX, LB->getLine());
-    EXPECT_EQ(U16 - 1, LB->getColumn());
-  }
-  {
-    auto *LB = DILexicalBlock::get(Context, SP, F, UINT32_MAX, U16);
-    EXPECT_EQ(UINT32_MAX, LB->getLine());
-    EXPECT_EQ(0u, LB->getColumn());
-  }
-  {
-    auto *LB = DILexicalBlock::get(Context, SP, F, UINT32_MAX, U16 + 1);
-    EXPECT_EQ(UINT32_MAX, LB->getLine());
-    EXPECT_EQ(0u, LB->getColumn());
-  }
-}
-
-typedef MetadataTest DILexicalBlockFileTest;
-
-TEST_F(DILexicalBlockFileTest, get) {
-  DILocalScope *Scope = getSubprogram();
-  DIFile *File = getFile();
-  unsigned Discriminator = 5;
-
-  auto *N = DILexicalBlockFile::get(Context, Scope, File, Discriminator);
-
-  EXPECT_EQ(dwarf::DW_TAG_lexical_block, N->getTag());
-  EXPECT_EQ(Scope, N->getScope());
-  EXPECT_EQ(File, N->getFile());
-  EXPECT_EQ(Discriminator, N->getDiscriminator());
-  EXPECT_EQ(N, DILexicalBlockFile::get(Context, Scope, File, Discriminator));
-
-  EXPECT_NE(N, DILexicalBlockFile::get(Context, getSubprogram(), File,
-                                       Discriminator));
-  EXPECT_NE(N,
-            DILexicalBlockFile::get(Context, Scope, getFile(), Discriminator));
-  EXPECT_NE(N,
-            DILexicalBlockFile::get(Context, Scope, File, Discriminator + 1));
-
-  TempDILexicalBlockFile Temp = N->clone();
-  EXPECT_EQ(N, MDNode::replaceWithUniqued(std::move(Temp)));
-}
-
-typedef MetadataTest DINamespaceTest;
-
-TEST_F(DINamespaceTest, get) {
-  DIScope *Scope = getFile();
-  StringRef Name = "namespace";
-  bool ExportSymbols = true;
-
-  auto *N = DINamespace::get(Context, Scope, Name, ExportSymbols);
-
-  EXPECT_EQ(dwarf::DW_TAG_namespace, N->getTag());
-  EXPECT_EQ(Scope, N->getScope());
-  EXPECT_EQ(Name, N->getName());
-  EXPECT_EQ(N, DINamespace::get(Context, Scope, Name, ExportSymbols));
-  EXPECT_NE(N, DINamespace::get(Context, getFile(), Name, ExportSymbols));
-  EXPECT_NE(N, DINamespace::get(Context, Scope, "other", ExportSymbols));
-  EXPECT_NE(N, DINamespace::get(Context, Scope, Name, !ExportSymbols));
-
-  TempDINamespace Temp = N->clone();
-  EXPECT_EQ(N, MDNode::replaceWithUniqued(std::move(Temp)));
-}
-
-typedef MetadataTest DIModuleTest;
-
-TEST_F(DIModuleTest, get) {
-  DIFile *File = getFile();
-  DIScope *Scope = getFile();
-  StringRef Name = "module";
-  StringRef ConfigMacro = "-DNDEBUG";
-  StringRef Includes = "-I.";
-  StringRef APINotes = "/tmp/m.apinotes";
-  unsigned LineNo = 4;
-  bool IsDecl = true;
-
-  auto *N = DIModule::get(Context, File, Scope, Name, ConfigMacro, Includes,
-                          APINotes, LineNo, IsDecl);
-
-  EXPECT_EQ(dwarf::DW_TAG_module, N->getTag());
-  EXPECT_EQ(File, N->getFile());
-  EXPECT_EQ(Scope, N->getScope());
-  EXPECT_EQ(Name, N->getName());
-  EXPECT_EQ(ConfigMacro, N->getConfigurationMacros());
-  EXPECT_EQ(Includes, N->getIncludePath());
-  EXPECT_EQ(APINotes, N->getAPINotesFile());
-  EXPECT_EQ(LineNo, N->getLineNo());
-  EXPECT_EQ(IsDecl, N->getIsDecl());
-  EXPECT_EQ(N, DIModule::get(Context, File, Scope, Name, ConfigMacro, Includes,
-                             APINotes, LineNo, IsDecl));
-  EXPECT_NE(N, DIModule::get(Context, getFile(), getFile(), Name, ConfigMacro,
-                             Includes, APINotes, LineNo, IsDecl));
-  EXPECT_NE(N, DIModule::get(Context, File, Scope, "other", ConfigMacro,
-                             Includes, APINotes, LineNo, IsDecl));
-  EXPECT_NE(N, DIModule::get(Context, File, Scope, Name, "other", Includes,
-                             APINotes, LineNo, IsDecl));
-  EXPECT_NE(N, DIModule::get(Context, File, Scope, Name, ConfigMacro, "other",
-                             APINotes, LineNo, IsDecl));
-  EXPECT_NE(N, DIModule::get(Context, File, Scope, Name, ConfigMacro, Includes,
-                             "other", LineNo, IsDecl));
-  EXPECT_NE(N, DIModule::get(Context, getFile(), Scope, Name, ConfigMacro,
-                             Includes, APINotes, LineNo, IsDecl));
-  EXPECT_NE(N, DIModule::get(Context, File, Scope, Name, ConfigMacro, Includes,
-                             APINotes, 5, IsDecl));
-  EXPECT_NE(N, DIModule::get(Context, File, Scope, Name, ConfigMacro, Includes,
-                             APINotes, LineNo, false));
-
-  TempDIModule Temp = N->clone();
-  EXPECT_EQ(N, MDNode::replaceWithUniqued(std::move(Temp)));
-}
-
-typedef MetadataTest DITemplateTypeParameterTest;
-
-TEST_F(DITemplateTypeParameterTest, get) {
-  StringRef Name = "template";
-  DIType *Type = getBasicType("basic");
-  bool defaulted = false;
-
-  auto *N = DITemplateTypeParameter::get(Context, Name, Type, defaulted);
-
-  EXPECT_EQ(dwarf::DW_TAG_template_type_parameter, N->getTag());
-  EXPECT_EQ(Name, N->getName());
-  EXPECT_EQ(Type, N->getType());
-  EXPECT_EQ(N, DITemplateTypeParameter::get(Context, Name, Type, defaulted));
-
-  EXPECT_NE(N, DITemplateTypeParameter::get(Context, "other", Type, defaulted));
-  EXPECT_NE(N, DITemplateTypeParameter::get(Context, Name,
-                                            getBasicType("other"), defaulted));
-  EXPECT_NE(N, DITemplateTypeParameter::get(Context, Name, Type, true));
-
-  TempDITemplateTypeParameter Temp = N->clone();
-  EXPECT_EQ(N, MDNode::replaceWithUniqued(std::move(Temp)));
-}
-
-typedef MetadataTest DITemplateValueParameterTest;
-
-TEST_F(DITemplateValueParameterTest, get) {
-  unsigned Tag = dwarf::DW_TAG_template_value_parameter;
-  StringRef Name = "template";
-  DIType *Type = getBasicType("basic");
-  bool defaulted = false;
-  Metadata *Value = getConstantAsMetadata();
-
-  auto *N =
-      DITemplateValueParameter::get(Context, Tag, Name, Type, defaulted, Value);
-  EXPECT_EQ(Tag, N->getTag());
-  EXPECT_EQ(Name, N->getName());
-  EXPECT_EQ(Type, N->getType());
-  EXPECT_EQ(Value, N->getValue());
-  EXPECT_EQ(N, DITemplateValueParameter::get(Context, Tag, Name, Type,
-                                             defaulted, Value));
-
-  EXPECT_NE(N, DITemplateValueParameter::get(
-                   Context, dwarf::DW_TAG_GNU_template_template_param, Name,
-                   Type, defaulted, Value));
-  EXPECT_NE(N, DITemplateValueParameter::get(Context, Tag, "other", Type,
-                                             defaulted, Value));
-  EXPECT_NE(N, DITemplateValueParameter::get(Context, Tag, Name,
-                                             getBasicType("other"), defaulted,
-                                             Value));
-  EXPECT_NE(N,
-            DITemplateValueParameter::get(Context, Tag, Name, Type, defaulted,
-                                          getConstantAsMetadata()));
-  EXPECT_NE(
-      N, DITemplateValueParameter::get(Context, Tag, Name, Type, true, Value));
-
-  TempDITemplateValueParameter Temp = N->clone();
-  EXPECT_EQ(N, MDNode::replaceWithUniqued(std::move(Temp)));
-}
-
-typedef MetadataTest DIGlobalVariableTest;
-
-TEST_F(DIGlobalVariableTest, get) {
-  DIScope *Scope = getSubprogram();
-  StringRef Name = "name";
-  StringRef LinkageName = "linkage";
-  DIFile *File = getFile();
-  unsigned Line = 5;
-  DIType *Type = getDerivedType();
-  bool IsLocalToUnit = false;
-  bool IsDefinition = true;
-  MDTuple *templateParams = getTuple();
-  DIDerivedType *StaticDataMemberDeclaration =
-      cast<DIDerivedType>(getDerivedType());
-
-  uint32_t AlignInBits = 8;
-
-  auto *N = DIGlobalVariable::get(
-      Context, Scope, Name, LinkageName, File, Line, Type, IsLocalToUnit,
-      IsDefinition, StaticDataMemberDeclaration, templateParams, AlignInBits);
-
-  EXPECT_EQ(dwarf::DW_TAG_variable, N->getTag());
-  EXPECT_EQ(Scope, N->getScope());
-  EXPECT_EQ(Name, N->getName());
-  EXPECT_EQ(LinkageName, N->getLinkageName());
-  EXPECT_EQ(File, N->getFile());
-  EXPECT_EQ(Line, N->getLine());
-  EXPECT_EQ(Type, N->getType());
-  EXPECT_EQ(IsLocalToUnit, N->isLocalToUnit());
-  EXPECT_EQ(IsDefinition, N->isDefinition());
-  EXPECT_EQ(StaticDataMemberDeclaration, N->getStaticDataMemberDeclaration());
-  EXPECT_EQ(templateParams, N->getTemplateParams());
-  EXPECT_EQ(AlignInBits, N->getAlignInBits());
-  EXPECT_EQ(N, DIGlobalVariable::get(Context, Scope, Name, LinkageName, File,
-                                     Line, Type, IsLocalToUnit, IsDefinition,
-                                     StaticDataMemberDeclaration,
-                                     templateParams, AlignInBits));
-
-  EXPECT_NE(N, DIGlobalVariable::get(
-                   Context, getSubprogram(), Name, LinkageName, File, Line,
-                   Type, IsLocalToUnit, IsDefinition,
-                   StaticDataMemberDeclaration, templateParams, AlignInBits));
-  EXPECT_NE(N, DIGlobalVariable::get(Context, Scope, "other", LinkageName, File,
-                                     Line, Type, IsLocalToUnit, IsDefinition,
-                                     StaticDataMemberDeclaration,
-                                     templateParams, AlignInBits));
-  EXPECT_NE(N, DIGlobalVariable::get(Context, Scope, Name, "other", File, Line,
-                                     Type, IsLocalToUnit, IsDefinition,
-                                     StaticDataMemberDeclaration,
-                                     templateParams, AlignInBits));
-  EXPECT_NE(N, DIGlobalVariable::get(Context, Scope, Name, LinkageName,
-                                     getFile(), Line, Type, IsLocalToUnit,
-                                     IsDefinition, StaticDataMemberDeclaration,
-                                     templateParams, AlignInBits));
-  EXPECT_NE(N, DIGlobalVariable::get(Context, Scope, Name, LinkageName, File,
-                                     Line + 1, Type, IsLocalToUnit,
-                                     IsDefinition, StaticDataMemberDeclaration,
-                                     templateParams, AlignInBits));
-  EXPECT_NE(N, DIGlobalVariable::get(Context, Scope, Name, LinkageName, File,
-                                     Line, getDerivedType(), IsLocalToUnit,
-                                     IsDefinition, StaticDataMemberDeclaration,
-                                     templateParams, AlignInBits));
-  EXPECT_NE(N, DIGlobalVariable::get(Context, Scope, Name, LinkageName, File,
-                                     Line, Type, !IsLocalToUnit, IsDefinition,
-                                     StaticDataMemberDeclaration,
-                                     templateParams, AlignInBits));
-  EXPECT_NE(N, DIGlobalVariable::get(Context, Scope, Name, LinkageName, File,
-                                     Line, Type, IsLocalToUnit, !IsDefinition,
-                                     StaticDataMemberDeclaration,
-                                     templateParams, AlignInBits));
-  EXPECT_NE(N, DIGlobalVariable::get(Context, Scope, Name, LinkageName, File,
-                                     Line, Type, IsLocalToUnit, IsDefinition,
-                                     cast<DIDerivedType>(getDerivedType()),
-                                     templateParams, AlignInBits));
-  EXPECT_NE(N, DIGlobalVariable::get(Context, Scope, Name, LinkageName, File,
-                                     Line, Type, IsLocalToUnit, IsDefinition,
-                                     StaticDataMemberDeclaration, nullptr,
-                                     AlignInBits));
-  EXPECT_NE(N, DIGlobalVariable::get(Context, Scope, Name, LinkageName, File,
-                                     Line, Type, IsLocalToUnit, IsDefinition,
-                                     StaticDataMemberDeclaration,
-                                     templateParams, (AlignInBits << 1)));
-
-  TempDIGlobalVariable Temp = N->clone();
-  EXPECT_EQ(N, MDNode::replaceWithUniqued(std::move(Temp)));
-}
-
-typedef MetadataTest DIGlobalVariableExpressionTest;
-
-TEST_F(DIGlobalVariableExpressionTest, get) {
-  DIScope *Scope = getSubprogram();
-  StringRef Name = "name";
-  StringRef LinkageName = "linkage";
-  DIFile *File = getFile();
-  unsigned Line = 5;
-  DIType *Type = getDerivedType();
-  bool IsLocalToUnit = false;
-  bool IsDefinition = true;
-  MDTuple *templateParams = getTuple();
-  auto *Expr = DIExpression::get(Context, {1, 2});
-  auto *Expr2 = DIExpression::get(Context, {1, 2, 3});
-  DIDerivedType *StaticDataMemberDeclaration =
-      cast<DIDerivedType>(getDerivedType());
-  uint32_t AlignInBits = 8;
-
-  auto *Var = DIGlobalVariable::get(
-      Context, Scope, Name, LinkageName, File, Line, Type, IsLocalToUnit,
-      IsDefinition, StaticDataMemberDeclaration, templateParams, AlignInBits);
-  auto *Var2 = DIGlobalVariable::get(
-      Context, Scope, "other", LinkageName, File, Line, Type, IsLocalToUnit,
-      IsDefinition, StaticDataMemberDeclaration, templateParams, AlignInBits);
-  auto *N = DIGlobalVariableExpression::get(Context, Var, Expr);
-
-  EXPECT_EQ(Var, N->getVariable());
-  EXPECT_EQ(Expr, N->getExpression());
-  EXPECT_EQ(N, DIGlobalVariableExpression::get(Context, Var, Expr));
-  EXPECT_NE(N, DIGlobalVariableExpression::get(Context, Var2, Expr));
-  EXPECT_NE(N, DIGlobalVariableExpression::get(Context, Var, Expr2));
-
-  TempDIGlobalVariableExpression Temp = N->clone();
-  EXPECT_EQ(N, MDNode::replaceWithUniqued(std::move(Temp)));
-}
-
-typedef MetadataTest DILocalVariableTest;
-
-TEST_F(DILocalVariableTest, get) {
-  DILocalScope *Scope = getSubprogram();
-  StringRef Name = "name";
-  DIFile *File = getFile();
-  unsigned Line = 5;
-  DIType *Type = getDerivedType();
-  unsigned Arg = 6;
-  DINode::DIFlags Flags = static_cast<DINode::DIFlags>(7);
-  uint32_t AlignInBits = 8;
-
-  auto *N =
-      DILocalVariable::get(Context, Scope, Name, File, Line, Type, Arg, Flags,
-                           AlignInBits);
-  EXPECT_TRUE(N->isParameter());
-  EXPECT_EQ(Scope, N->getScope());
-  EXPECT_EQ(Name, N->getName());
-  EXPECT_EQ(File, N->getFile());
-  EXPECT_EQ(Line, N->getLine());
-  EXPECT_EQ(Type, N->getType());
-  EXPECT_EQ(Arg, N->getArg());
-  EXPECT_EQ(Flags, N->getFlags());
-  EXPECT_EQ(AlignInBits, N->getAlignInBits());
-  EXPECT_EQ(N, DILocalVariable::get(Context, Scope, Name, File, Line, Type, Arg,
-                                    Flags, AlignInBits));
-
-  EXPECT_FALSE(
-      DILocalVariable::get(Context, Scope, Name, File, Line, Type, 0, Flags,
-                           AlignInBits)->isParameter());
-  EXPECT_NE(N, DILocalVariable::get(Context, getSubprogram(), Name, File, Line,
-                                    Type, Arg, Flags, AlignInBits));
-  EXPECT_NE(N, DILocalVariable::get(Context, Scope, "other", File, Line, Type,
-                                    Arg, Flags, AlignInBits));
-  EXPECT_NE(N, DILocalVariable::get(Context, Scope, Name, getFile(), Line, Type,
-                                    Arg, Flags, AlignInBits));
-  EXPECT_NE(N, DILocalVariable::get(Context, Scope, Name, File, Line + 1, Type,
-                                    Arg, Flags, AlignInBits));
-  EXPECT_NE(N, DILocalVariable::get(Context, Scope, Name, File, Line,
-                                    getDerivedType(), Arg, Flags, AlignInBits));
-  EXPECT_NE(N, DILocalVariable::get(Context, Scope, Name, File, Line, Type,
-                                    Arg + 1, Flags, AlignInBits));
-  EXPECT_NE(N, DILocalVariable::get(Context, Scope, Name, File, Line, Type,
-                                    Arg, Flags, (AlignInBits << 1)));
-
-  TempDILocalVariable Temp = N->clone();
-  EXPECT_EQ(N, MDNode::replaceWithUniqued(std::move(Temp)));
-}
-
-TEST_F(DILocalVariableTest, getArg256) {
-  EXPECT_EQ(255u, DILocalVariable::get(Context, getSubprogram(), "", getFile(),
-                                       0, nullptr, 255, DINode::FlagZero, 0)
-                      ->getArg());
-  EXPECT_EQ(256u, DILocalVariable::get(Context, getSubprogram(), "", getFile(),
-                                       0, nullptr, 256, DINode::FlagZero, 0)
-                      ->getArg());
-  EXPECT_EQ(257u, DILocalVariable::get(Context, getSubprogram(), "", getFile(),
-                                       0, nullptr, 257, DINode::FlagZero, 0)
-                      ->getArg());
-  unsigned Max = UINT16_MAX;
-  EXPECT_EQ(Max, DILocalVariable::get(Context, getSubprogram(), "", getFile(),
-                                      0, nullptr, Max, DINode::FlagZero, 0)
-                     ->getArg());
-}
-
-typedef MetadataTest DIExpressionTest;
-
-TEST_F(DIExpressionTest, get) {
-  uint64_t Elements[] = {2, 6, 9, 78, 0};
-  auto *N = DIExpression::get(Context, Elements);
-  EXPECT_EQ(makeArrayRef(Elements), N->getElements());
-  EXPECT_EQ(N, DIExpression::get(Context, Elements));
-
-  EXPECT_EQ(5u, N->getNumElements());
-  EXPECT_EQ(2u, N->getElement(0));
-  EXPECT_EQ(6u, N->getElement(1));
-  EXPECT_EQ(9u, N->getElement(2));
-  EXPECT_EQ(78u, N->getElement(3));
-  EXPECT_EQ(0u, N->getElement(4));
-
-  TempDIExpression Temp = N->clone();
-  EXPECT_EQ(N, MDNode::replaceWithUniqued(std::move(Temp)));
-
-  // Test DIExpression::prepend().
-  uint64_t Elts0[] = {dwarf::DW_OP_LLVM_fragment, 0, 32};
-  auto *N0 = DIExpression::get(Context, Elts0);
-  uint8_t DIExprFlags = DIExpression::ApplyOffset;
-  DIExprFlags |= DIExpression::DerefBefore;
-  DIExprFlags |= DIExpression::DerefAfter;
-  DIExprFlags |= DIExpression::StackValue;
-  auto *N0WithPrependedOps = DIExpression::prepend(N0, DIExprFlags, 64);
-  uint64_t Elts1[] = {dwarf::DW_OP_deref,
-                      dwarf::DW_OP_plus_uconst, 64,
-                      dwarf::DW_OP_deref,
-                      dwarf::DW_OP_stack_value,
-                      dwarf::DW_OP_LLVM_fragment, 0, 32};
-  auto *N1 = DIExpression::get(Context, Elts1);
-  EXPECT_EQ(N0WithPrependedOps, N1);
-
-  // Test DIExpression::append().
-  uint64_t Elts2[] = {dwarf::DW_OP_deref, dwarf::DW_OP_plus_uconst, 64,
-                      dwarf::DW_OP_deref, dwarf::DW_OP_stack_value};
-  auto *N2 = DIExpression::append(N0, Elts2);
-  EXPECT_EQ(N0WithPrependedOps, N2);
-}
-
-TEST_F(DIExpressionTest, isValid) {
-#define EXPECT_VALID(...)                                                      \
-  do {                                                                         \
-    uint64_t Elements[] = {__VA_ARGS__};                                       \
-    EXPECT_TRUE(DIExpression::get(Context, Elements)->isValid());              \
-  } while (false)
-#define EXPECT_INVALID(...)                                                    \
-  do {                                                                         \
-    uint64_t Elements[] = {__VA_ARGS__};                                       \
-    EXPECT_FALSE(DIExpression::get(Context, Elements)->isValid());             \
-  } while (false)
-
-  // Empty expression should be valid.
-  EXPECT_TRUE(DIExpression::get(Context, None));
-
-  // Valid constructions.
-  EXPECT_VALID(dwarf::DW_OP_plus_uconst, 6);
-  EXPECT_VALID(dwarf::DW_OP_constu, 6, dwarf::DW_OP_plus);
-  EXPECT_VALID(dwarf::DW_OP_deref);
-  EXPECT_VALID(dwarf::DW_OP_LLVM_fragment, 3, 7);
-  EXPECT_VALID(dwarf::DW_OP_plus_uconst, 6, dwarf::DW_OP_deref);
-  EXPECT_VALID(dwarf::DW_OP_deref, dwarf::DW_OP_plus_uconst, 6);
-  EXPECT_VALID(dwarf::DW_OP_deref, dwarf::DW_OP_LLVM_fragment, 3, 7);
-  EXPECT_VALID(dwarf::DW_OP_deref, dwarf::DW_OP_plus_uconst, 6,
-               dwarf::DW_OP_LLVM_fragment, 3, 7);
-
-  // Invalid constructions.
-  EXPECT_INVALID(~0u);
-  EXPECT_INVALID(dwarf::DW_OP_plus, 0);
-  EXPECT_INVALID(dwarf::DW_OP_plus_uconst);
-  EXPECT_INVALID(dwarf::DW_OP_LLVM_fragment);
-  EXPECT_INVALID(dwarf::DW_OP_LLVM_fragment, 3);
-  EXPECT_INVALID(dwarf::DW_OP_LLVM_fragment, 3, 7, dwarf::DW_OP_plus_uconst, 3);
-  EXPECT_INVALID(dwarf::DW_OP_LLVM_fragment, 3, 7, dwarf::DW_OP_deref);
-
-#undef EXPECT_VALID
-#undef EXPECT_INVALID
-}
-
-TEST_F(DIExpressionTest, createFragmentExpression) {
-#define EXPECT_VALID_FRAGMENT(Offset, Size, ...)                               \
-  do {                                                                         \
-    uint64_t Elements[] = {__VA_ARGS__};                                       \
-    DIExpression* Expression = DIExpression::get(Context, Elements);           \
-    EXPECT_TRUE(DIExpression::createFragmentExpression(                        \
-      Expression, Offset, Size).hasValue());                                   \
-  } while (false)
-#define EXPECT_INVALID_FRAGMENT(Offset, Size, ...)                             \
-  do {                                                                         \
-    uint64_t Elements[] = {__VA_ARGS__};                                       \
-    DIExpression* Expression = DIExpression::get(Context, Elements);           \
-    EXPECT_FALSE(DIExpression::createFragmentExpression(                       \
-      Expression, Offset, Size).hasValue());                                   \
-  } while (false)
-
-  // createFragmentExpression adds correct ops.
-  Optional<DIExpression*> R = DIExpression::createFragmentExpression(
-    DIExpression::get(Context, {}), 0, 32);
-  EXPECT_EQ(R.hasValue(), true);
-  EXPECT_EQ(3u, (*R)->getNumElements());
-  EXPECT_EQ(dwarf::DW_OP_LLVM_fragment, (*R)->getElement(0));
-  EXPECT_EQ(0u, (*R)->getElement(1));
-  EXPECT_EQ(32u, (*R)->getElement(2));
-
-  // Valid fragment expressions.
-  EXPECT_VALID_FRAGMENT(0, 32, {});
-  EXPECT_VALID_FRAGMENT(0, 32, dwarf::DW_OP_deref);
-  EXPECT_VALID_FRAGMENT(0, 32, dwarf::DW_OP_LLVM_fragment, 0, 32);
-  EXPECT_VALID_FRAGMENT(16, 16, dwarf::DW_OP_LLVM_fragment, 0, 32);
-
-  // Invalid fragment expressions (incompatible ops).
-  EXPECT_INVALID_FRAGMENT(0, 32, dwarf::DW_OP_constu, 6, dwarf::DW_OP_plus);
-  EXPECT_INVALID_FRAGMENT(0, 32, dwarf::DW_OP_constu, 14, dwarf::DW_OP_minus);
-  EXPECT_INVALID_FRAGMENT(0, 32, dwarf::DW_OP_constu, 16, dwarf::DW_OP_shr);
-  EXPECT_INVALID_FRAGMENT(0, 32, dwarf::DW_OP_constu, 16, dwarf::DW_OP_shl);
-  EXPECT_INVALID_FRAGMENT(0, 32, dwarf::DW_OP_constu, 16, dwarf::DW_OP_shra);
-  EXPECT_INVALID_FRAGMENT(0, 32, dwarf::DW_OP_plus_uconst, 6);
-
-#undef EXPECT_VALID_FRAGMENT
-#undef EXPECT_INVALID_FRAGMENT
-}
-
-TEST_F(DIExpressionTest, replaceArg) {
-#define EXPECT_REPLACE_ARG_EQ(Expr, OldArg, NewArg, ...)                       \
-  do {                                                                         \
-    uint64_t Elements[] = {__VA_ARGS__};                                       \
-    ArrayRef<uint64_t> Expected = Elements;                                    \
-    DIExpression *Expression = DIExpression::replaceArg(Expr, OldArg, NewArg); \
-    EXPECT_EQ(Expression->getElements(), Expected);                            \
-  } while (false)
-
-  auto N = DIExpression::get(
-      Context, {dwarf::DW_OP_LLVM_arg, 0, dwarf::DW_OP_LLVM_arg, 1,
-                dwarf::DW_OP_plus, dwarf::DW_OP_LLVM_arg, 2, dwarf::DW_OP_mul});
-  EXPECT_REPLACE_ARG_EQ(N, 0, 1, dwarf::DW_OP_LLVM_arg, 0,
-                        dwarf::DW_OP_LLVM_arg, 0, dwarf::DW_OP_plus,
-                        dwarf::DW_OP_LLVM_arg, 1, dwarf::DW_OP_mul);
-  EXPECT_REPLACE_ARG_EQ(N, 0, 2, dwarf::DW_OP_LLVM_arg, 1,
-                        dwarf::DW_OP_LLVM_arg, 0, dwarf::DW_OP_plus,
-                        dwarf::DW_OP_LLVM_arg, 1, dwarf::DW_OP_mul);
-  EXPECT_REPLACE_ARG_EQ(N, 2, 0, dwarf::DW_OP_LLVM_arg, 0,
-                        dwarf::DW_OP_LLVM_arg, 1, dwarf::DW_OP_plus,
-                        dwarf::DW_OP_LLVM_arg, 0, dwarf::DW_OP_mul);
-  EXPECT_REPLACE_ARG_EQ(N, 2, 1, dwarf::DW_OP_LLVM_arg, 0,
-                        dwarf::DW_OP_LLVM_arg, 1, dwarf::DW_OP_plus,
-                        dwarf::DW_OP_LLVM_arg, 1, dwarf::DW_OP_mul);
-
-#undef EXPECT_REPLACE_ARG_EQ
-}
-
-typedef MetadataTest DIObjCPropertyTest;
-
-TEST_F(DIObjCPropertyTest, get) {
-  StringRef Name = "name";
-  DIFile *File = getFile();
-  unsigned Line = 5;
-  StringRef GetterName = "getter";
-  StringRef SetterName = "setter";
-  unsigned Attributes = 7;
-  DIType *Type = getBasicType("basic");
-
-  auto *N = DIObjCProperty::get(Context, Name, File, Line, GetterName,
-                                SetterName, Attributes, Type);
-
-  EXPECT_EQ(dwarf::DW_TAG_APPLE_property, N->getTag());
-  EXPECT_EQ(Name, N->getName());
-  EXPECT_EQ(File, N->getFile());
-  EXPECT_EQ(Line, N->getLine());
-  EXPECT_EQ(GetterName, N->getGetterName());
-  EXPECT_EQ(SetterName, N->getSetterName());
-  EXPECT_EQ(Attributes, N->getAttributes());
-  EXPECT_EQ(Type, N->getType());
-  EXPECT_EQ(N, DIObjCProperty::get(Context, Name, File, Line, GetterName,
-                                   SetterName, Attributes, Type));
-
-  EXPECT_NE(N, DIObjCProperty::get(Context, "other", File, Line, GetterName,
-                                   SetterName, Attributes, Type));
-  EXPECT_NE(N, DIObjCProperty::get(Context, Name, getFile(), Line, GetterName,
-                                   SetterName, Attributes, Type));
-  EXPECT_NE(N, DIObjCProperty::get(Context, Name, File, Line + 1, GetterName,
-                                   SetterName, Attributes, Type));
-  EXPECT_NE(N, DIObjCProperty::get(Context, Name, File, Line, "other",
-                                   SetterName, Attributes, Type));
-  EXPECT_NE(N, DIObjCProperty::get(Context, Name, File, Line, GetterName,
-                                   "other", Attributes, Type));
-  EXPECT_NE(N, DIObjCProperty::get(Context, Name, File, Line, GetterName,
-                                   SetterName, Attributes + 1, Type));
-  EXPECT_NE(N, DIObjCProperty::get(Context, Name, File, Line, GetterName,
-                                   SetterName, Attributes,
-                                   getBasicType("other")));
-
-  TempDIObjCProperty Temp = N->clone();
-  EXPECT_EQ(N, MDNode::replaceWithUniqued(std::move(Temp)));
-}
-
-typedef MetadataTest DIImportedEntityTest;
-
-TEST_F(DIImportedEntityTest, get) {
-  unsigned Tag = dwarf::DW_TAG_imported_module;
-  DIScope *Scope = getSubprogram();
-  DINode *Entity = getCompositeType();
-  DIFile *File = getFile();
-  unsigned Line = 5;
-  StringRef Name = "name";
-
-  auto *N =
-      DIImportedEntity::get(Context, Tag, Scope, Entity, File, Line, Name);
-
-  EXPECT_EQ(Tag, N->getTag());
-  EXPECT_EQ(Scope, N->getScope());
-  EXPECT_EQ(Entity, N->getEntity());
-  EXPECT_EQ(File, N->getFile());
-  EXPECT_EQ(Line, N->getLine());
-  EXPECT_EQ(Name, N->getName());
-  EXPECT_EQ(
-      N, DIImportedEntity::get(Context, Tag, Scope, Entity, File, Line, Name));
-
-  EXPECT_NE(N,
-            DIImportedEntity::get(Context, dwarf::DW_TAG_imported_declaration,
-                                  Scope, Entity, File, Line, Name));
-  EXPECT_NE(N, DIImportedEntity::get(Context, Tag, getSubprogram(), Entity,
-                                     File, Line, Name));
-  EXPECT_NE(N, DIImportedEntity::get(Context, Tag, Scope, getCompositeType(),
-                                     File, Line, Name));
-  EXPECT_NE(N, DIImportedEntity::get(Context, Tag, Scope, Entity, nullptr, Line,
-                                     Name));
-  EXPECT_NE(N, DIImportedEntity::get(Context, Tag, Scope, Entity, File,
-                                     Line + 1, Name));
-  EXPECT_NE(N, DIImportedEntity::get(Context, Tag, Scope, Entity, File, Line,
-                                     "other"));
-
-  TempDIImportedEntity Temp = N->clone();
-  EXPECT_EQ(N, MDNode::replaceWithUniqued(std::move(Temp)));
-}
-
-typedef MetadataTest MetadataAsValueTest;
-
-TEST_F(MetadataAsValueTest, MDNode) {
-  MDNode *N = MDNode::get(Context, None);
-  auto *V = MetadataAsValue::get(Context, N);
-  EXPECT_TRUE(V->getType()->isMetadataTy());
-  EXPECT_EQ(N, V->getMetadata());
-
-  auto *V2 = MetadataAsValue::get(Context, N);
-  EXPECT_EQ(V, V2);
-}
-
-TEST_F(MetadataAsValueTest, MDNodeMDNode) {
-  MDNode *N = MDNode::get(Context, None);
-  Metadata *Ops[] = {N};
-  MDNode *N2 = MDNode::get(Context, Ops);
-  auto *V = MetadataAsValue::get(Context, N2);
-  EXPECT_TRUE(V->getType()->isMetadataTy());
-  EXPECT_EQ(N2, V->getMetadata());
-
-  auto *V2 = MetadataAsValue::get(Context, N2);
-  EXPECT_EQ(V, V2);
-
-  auto *V3 = MetadataAsValue::get(Context, N);
-  EXPECT_TRUE(V3->getType()->isMetadataTy());
-  EXPECT_NE(V, V3);
-  EXPECT_EQ(N, V3->getMetadata());
-}
-
-TEST_F(MetadataAsValueTest, MDNodeConstant) {
-  auto *C = ConstantInt::getTrue(Context);
-  auto *MD = ConstantAsMetadata::get(C);
-  Metadata *Ops[] = {MD};
-  auto *N = MDNode::get(Context, Ops);
-
-  auto *V = MetadataAsValue::get(Context, MD);
-  EXPECT_TRUE(V->getType()->isMetadataTy());
-  EXPECT_EQ(MD, V->getMetadata());
-
-  auto *V2 = MetadataAsValue::get(Context, N);
-  EXPECT_EQ(MD, V2->getMetadata());
-  EXPECT_EQ(V, V2);
-}
-
-typedef MetadataTest ValueAsMetadataTest;
-
-TEST_F(ValueAsMetadataTest, UpdatesOnRAUW) {
-  Type *Ty = Type::getInt1PtrTy(Context);
-  std::unique_ptr<GlobalVariable> GV0(
-      new GlobalVariable(Ty, false, GlobalValue::ExternalLinkage));
-  auto *MD = ValueAsMetadata::get(GV0.get());
-  EXPECT_TRUE(MD->getValue() == GV0.get());
-  ASSERT_TRUE(GV0->use_empty());
-
-  std::unique_ptr<GlobalVariable> GV1(
-      new GlobalVariable(Ty, false, GlobalValue::ExternalLinkage));
-  GV0->replaceAllUsesWith(GV1.get());
-  EXPECT_TRUE(MD->getValue() == GV1.get());
-}
-
-TEST_F(ValueAsMetadataTest, TempTempReplacement) {
-  // Create a constant.
-  ConstantAsMetadata *CI =
-      ConstantAsMetadata::get(ConstantInt::get(Context, APInt(8, 0)));
-
-  auto Temp1 = MDTuple::getTemporary(Context, None);
-  auto Temp2 = MDTuple::getTemporary(Context, {CI});
-  auto *N = MDTuple::get(Context, {Temp1.get()});
-
-  // Test replacing a temporary node with another temporary node.
-  Temp1->replaceAllUsesWith(Temp2.get());
-  EXPECT_EQ(N->getOperand(0), Temp2.get());
-
-  // Clean up Temp2 for teardown.
-  Temp2->replaceAllUsesWith(nullptr);
-}
-
-TEST_F(ValueAsMetadataTest, CollidingDoubleUpdates) {
-  // Create a constant.
-  ConstantAsMetadata *CI =
-      ConstantAsMetadata::get(ConstantInt::get(Context, APInt(8, 0)));
-
-  // Create a temporary to prevent nodes from resolving.
-  auto Temp = MDTuple::getTemporary(Context, None);
-
-  // When the first operand of N1 gets reset to nullptr, it'll collide with N2.
-  Metadata *Ops1[] = {CI, CI, Temp.get()};
-  Metadata *Ops2[] = {nullptr, CI, Temp.get()};
-
-  auto *N1 = MDTuple::get(Context, Ops1);
-  auto *N2 = MDTuple::get(Context, Ops2);
-  ASSERT_NE(N1, N2);
-
-  // Tell metadata that the constant is getting deleted.
-  //
-  // After this, N1 will be invalid, so don't touch it.
-  ValueAsMetadata::handleDeletion(CI->getValue());
-  EXPECT_EQ(nullptr, N2->getOperand(0));
-  EXPECT_EQ(nullptr, N2->getOperand(1));
-  EXPECT_EQ(Temp.get(), N2->getOperand(2));
-
-  // Clean up Temp for teardown.
-  Temp->replaceAllUsesWith(nullptr);
-}
-
-typedef MetadataTest DIArgListTest;
-
-TEST_F(DIArgListTest, get) {
-  SmallVector<ValueAsMetadata *, 2> VMs;
-  VMs.push_back(
-      ConstantAsMetadata::get(ConstantInt::get(Context, APInt(8, 0))));
-  VMs.push_back(
-      ConstantAsMetadata::get(ConstantInt::get(Context, APInt(2, 0))));
-  DIArgList *DV0 = DIArgList::get(Context, VMs);
-  DIArgList *DV1 = DIArgList::get(Context, VMs);
-  EXPECT_EQ(DV0, DV1);
-}
-
-TEST_F(DIArgListTest, UpdatesOnRAUW) {
-  Type *Ty = Type::getInt1PtrTy(Context);
-  ConstantAsMetadata *CI =
-      ConstantAsMetadata::get(ConstantInt::get(Context, APInt(8, 0)));
-  std::unique_ptr<GlobalVariable> GV0(
-      new GlobalVariable(Ty, false, GlobalValue::ExternalLinkage));
-  auto *MD0 = ValueAsMetadata::get(GV0.get());
-
-  SmallVector<ValueAsMetadata *, 2> VMs;
-  VMs.push_back(CI);
-  VMs.push_back(MD0);
-  auto *AL = DIArgList::get(Context, VMs);
-  EXPECT_EQ(AL->getArgs()[0], CI);
-  EXPECT_EQ(AL->getArgs()[1], MD0);
-
-  std::unique_ptr<GlobalVariable> GV1(
-      new GlobalVariable(Ty, false, GlobalValue::ExternalLinkage));
-  auto *MD1 = ValueAsMetadata::get(GV1.get());
-  GV0->replaceAllUsesWith(GV1.get());
-  EXPECT_EQ(AL->getArgs()[0], CI);
-  EXPECT_EQ(AL->getArgs()[1], MD1);
-}
-
-typedef MetadataTest TrackingMDRefTest;
-
-TEST_F(TrackingMDRefTest, UpdatesOnRAUW) {
-  Type *Ty = Type::getInt1PtrTy(Context);
-  std::unique_ptr<GlobalVariable> GV0(
-      new GlobalVariable(Ty, false, GlobalValue::ExternalLinkage));
-  TypedTrackingMDRef<ValueAsMetadata> MD(ValueAsMetadata::get(GV0.get()));
-  EXPECT_TRUE(MD->getValue() == GV0.get());
-  ASSERT_TRUE(GV0->use_empty());
-
-  std::unique_ptr<GlobalVariable> GV1(
-      new GlobalVariable(Ty, false, GlobalValue::ExternalLinkage));
-  GV0->replaceAllUsesWith(GV1.get());
-  EXPECT_TRUE(MD->getValue() == GV1.get());
-
-  // Reset it, so we don't inadvertently test deletion.
-  MD.reset();
-}
-
-TEST_F(TrackingMDRefTest, UpdatesOnDeletion) {
-  Type *Ty = Type::getInt1PtrTy(Context);
-  std::unique_ptr<GlobalVariable> GV(
-      new GlobalVariable(Ty, false, GlobalValue::ExternalLinkage));
-  TypedTrackingMDRef<ValueAsMetadata> MD(ValueAsMetadata::get(GV.get()));
-  EXPECT_TRUE(MD->getValue() == GV.get());
-  ASSERT_TRUE(GV->use_empty());
-
-  GV.reset();
-  EXPECT_TRUE(!MD);
-}
-
-TEST(NamedMDNodeTest, Search) {
-  LLVMContext Context;
-  ConstantAsMetadata *C =
-      ConstantAsMetadata::get(ConstantInt::get(Type::getInt32Ty(Context), 1));
-  ConstantAsMetadata *C2 =
-      ConstantAsMetadata::get(ConstantInt::get(Type::getInt32Ty(Context), 2));
-
-  Metadata *const V = C;
-  Metadata *const V2 = C2;
-  MDNode *n = MDNode::get(Context, V);
-  MDNode *n2 = MDNode::get(Context, V2);
-
-  Module M("MyModule", Context);
-  const char *Name = "llvm.NMD1";
-  NamedMDNode *NMD = M.getOrInsertNamedMetadata(Name);
-  NMD->addOperand(n);
-  NMD->addOperand(n2);
-
-  std::string Str;
-  raw_string_ostream oss(Str);
-  NMD->print(oss);
-  EXPECT_STREQ("!llvm.NMD1 = !{!0, !1}\n",
-               oss.str().c_str());
-}
-
-typedef MetadataTest FunctionAttachmentTest;
-TEST_F(FunctionAttachmentTest, setMetadata) {
-  Function *F = getFunction("foo");
-  ASSERT_FALSE(F->hasMetadata());
-  EXPECT_EQ(nullptr, F->getMetadata(LLVMContext::MD_dbg));
-  EXPECT_EQ(nullptr, F->getMetadata("dbg"));
-  EXPECT_EQ(nullptr, F->getMetadata("other"));
-
-  DISubprogram *SP1 = getSubprogram();
-  DISubprogram *SP2 = getSubprogram();
-  ASSERT_NE(SP1, SP2);
-
-  F->setMetadata("dbg", SP1);
-  EXPECT_TRUE(F->hasMetadata());
-  EXPECT_EQ(SP1, F->getMetadata(LLVMContext::MD_dbg));
-  EXPECT_EQ(SP1, F->getMetadata("dbg"));
-  EXPECT_EQ(nullptr, F->getMetadata("other"));
-
-  F->setMetadata(LLVMContext::MD_dbg, SP2);
-  EXPECT_TRUE(F->hasMetadata());
-  EXPECT_EQ(SP2, F->getMetadata(LLVMContext::MD_dbg));
-  EXPECT_EQ(SP2, F->getMetadata("dbg"));
-  EXPECT_EQ(nullptr, F->getMetadata("other"));
-
-  F->setMetadata("dbg", nullptr);
-  EXPECT_FALSE(F->hasMetadata());
-  EXPECT_EQ(nullptr, F->getMetadata(LLVMContext::MD_dbg));
-  EXPECT_EQ(nullptr, F->getMetadata("dbg"));
-  EXPECT_EQ(nullptr, F->getMetadata("other"));
-
-  MDTuple *T1 = getTuple();
-  MDTuple *T2 = getTuple();
-  ASSERT_NE(T1, T2);
-
-  F->setMetadata("other1", T1);
-  F->setMetadata("other2", T2);
-  EXPECT_TRUE(F->hasMetadata());
-  EXPECT_EQ(T1, F->getMetadata("other1"));
-  EXPECT_EQ(T2, F->getMetadata("other2"));
-  EXPECT_EQ(nullptr, F->getMetadata("dbg"));
-
-  F->setMetadata("other1", T2);
-  F->setMetadata("other2", T1);
-  EXPECT_EQ(T2, F->getMetadata("other1"));
-  EXPECT_EQ(T1, F->getMetadata("other2"));
-
-  F->setMetadata("other1", nullptr);
-  F->setMetadata("other2", nullptr);
-  EXPECT_FALSE(F->hasMetadata());
-  EXPECT_EQ(nullptr, F->getMetadata("other1"));
-  EXPECT_EQ(nullptr, F->getMetadata("other2"));
-}
-
-TEST_F(FunctionAttachmentTest, getAll) {
-  Function *F = getFunction("foo");
-
-  MDTuple *T1 = getTuple();
-  MDTuple *T2 = getTuple();
-  MDTuple *P = getTuple();
-  DISubprogram *SP = getSubprogram();
-
-  F->setMetadata("other1", T2);
-  F->setMetadata(LLVMContext::MD_dbg, SP);
-  F->setMetadata("other2", T1);
-  F->setMetadata(LLVMContext::MD_prof, P);
-  F->setMetadata("other2", T2);
-  F->setMetadata("other1", T1);
-
-  SmallVector<std::pair<unsigned, MDNode *>, 4> MDs;
-  F->getAllMetadata(MDs);
-  ASSERT_EQ(4u, MDs.size());
-  EXPECT_EQ(LLVMContext::MD_dbg, MDs[0].first);
-  EXPECT_EQ(LLVMContext::MD_prof, MDs[1].first);
-  EXPECT_EQ(Context.getMDKindID("other1"), MDs[2].first);
-  EXPECT_EQ(Context.getMDKindID("other2"), MDs[3].first);
-  EXPECT_EQ(SP, MDs[0].second);
-  EXPECT_EQ(P, MDs[1].second);
-  EXPECT_EQ(T1, MDs[2].second);
-  EXPECT_EQ(T2, MDs[3].second);
-}
-
-TEST_F(FunctionAttachmentTest, Verifier) {
-  Function *F = getFunction("foo");
-  F->setMetadata("attach", getTuple());
-  F->setIsMaterializable(true);
-
-  // Confirm this is materializable.
-  ASSERT_TRUE(F->isMaterializable());
-
-  // Materializable functions cannot have metadata attachments.
-  EXPECT_TRUE(verifyFunction(*F));
-
-  // Function declarations can.
-  F->setIsMaterializable(false);
-  EXPECT_FALSE(verifyModule(*F->getParent()));
-  EXPECT_FALSE(verifyFunction(*F));
-
-  // So can definitions.
-  (void)new UnreachableInst(Context, BasicBlock::Create(Context, "bb", F));
-  EXPECT_FALSE(verifyModule(*F->getParent()));
-  EXPECT_FALSE(verifyFunction(*F));
-}
-
-TEST_F(FunctionAttachmentTest, EntryCount) {
-  Function *F = getFunction("foo");
-  EXPECT_FALSE(F->getEntryCount().hasValue());
-  F->setEntryCount(12304, Function::PCT_Real);
-  auto Count = F->getEntryCount();
-  EXPECT_TRUE(Count.hasValue());
-  EXPECT_EQ(12304u, Count.getCount());
-  EXPECT_EQ(Function::PCT_Real, Count.getType());
-
-  // Repeat the same for synthetic counts.
-  F = getFunction("bar");
-  EXPECT_FALSE(F->getEntryCount().hasValue());
-  F->setEntryCount(123, Function::PCT_Synthetic);
-  Count = F->getEntryCount(true /*allow synthetic*/);
-  EXPECT_TRUE(Count.hasValue());
-  EXPECT_EQ(123u, Count.getCount());
-  EXPECT_EQ(Function::PCT_Synthetic, Count.getType());
-}
-
-TEST_F(FunctionAttachmentTest, SubprogramAttachment) {
-  Function *F = getFunction("foo");
-  DISubprogram *SP = getSubprogram();
-  F->setSubprogram(SP);
-
-  // Note that the static_cast confirms that F->getSubprogram() actually
-  // returns an DISubprogram.
-  EXPECT_EQ(SP, static_cast<DISubprogram *>(F->getSubprogram()));
-  EXPECT_EQ(SP, F->getMetadata("dbg"));
-  EXPECT_EQ(SP, F->getMetadata(LLVMContext::MD_dbg));
-}
-
-typedef MetadataTest DistinctMDOperandPlaceholderTest;
-TEST_F(DistinctMDOperandPlaceholderTest, getID) {
-  EXPECT_EQ(7u, DistinctMDOperandPlaceholder(7).getID());
-}
-
-TEST_F(DistinctMDOperandPlaceholderTest, replaceUseWith) {
-  // Set up some placeholders.
-  DistinctMDOperandPlaceholder PH0(7);
-  DistinctMDOperandPlaceholder PH1(3);
-  DistinctMDOperandPlaceholder PH2(0);
-  Metadata *Ops[] = {&PH0, &PH1, &PH2};
-  auto *D = MDTuple::getDistinct(Context, Ops);
-  ASSERT_EQ(&PH0, D->getOperand(0));
-  ASSERT_EQ(&PH1, D->getOperand(1));
-  ASSERT_EQ(&PH2, D->getOperand(2));
-
-  // Replace them.
-  auto *N0 = MDTuple::get(Context, None);
-  auto *N1 = MDTuple::get(Context, N0);
-  PH0.replaceUseWith(N0);
-  PH1.replaceUseWith(N1);
-  PH2.replaceUseWith(nullptr);
-  EXPECT_EQ(N0, D->getOperand(0));
-  EXPECT_EQ(N1, D->getOperand(1));
-  EXPECT_EQ(nullptr, D->getOperand(2));
-}
-
-TEST_F(DistinctMDOperandPlaceholderTest, replaceUseWithNoUser) {
-  // There is no user, but we can still call replace.
-  DistinctMDOperandPlaceholder(7).replaceUseWith(MDTuple::get(Context, None));
-}
-
-// Test various assertions in metadata tracking. Don't run these tests if gtest
-// will use SEH to recover from them. Two of these tests get halfway through
-// inserting metadata into DenseMaps for tracking purposes, and then they
-// assert, and we attempt to destroy an LLVMContext with broken invariants,
-// leading to infinite loops.
-#if defined(GTEST_HAS_DEATH_TEST) && !defined(NDEBUG) && !defined(GTEST_HAS_SEH)
-TEST_F(DistinctMDOperandPlaceholderTest, MetadataAsValue) {
-  // This shouldn't crash.
-  DistinctMDOperandPlaceholder PH(7);
-  EXPECT_DEATH(MetadataAsValue::get(Context, &PH),
-               "Unexpected callback to owner");
-}
-
-TEST_F(DistinctMDOperandPlaceholderTest, UniquedMDNode) {
-  // This shouldn't crash.
-  DistinctMDOperandPlaceholder PH(7);
-  EXPECT_DEATH(MDTuple::get(Context, &PH), "Unexpected callback to owner");
-}
-
-TEST_F(DistinctMDOperandPlaceholderTest, SecondDistinctMDNode) {
-  // This shouldn't crash.
-  DistinctMDOperandPlaceholder PH(7);
-  MDTuple::getDistinct(Context, &PH);
-  EXPECT_DEATH(MDTuple::getDistinct(Context, &PH),
-               "Placeholders can only be used once");
-}
-
-TEST_F(DistinctMDOperandPlaceholderTest, TrackingMDRefAndDistinctMDNode) {
-  // TrackingMDRef doesn't install an owner callback, so it can't be detected
-  // as an invalid use.  However, using a placeholder in a TrackingMDRef *and*
-  // a distinct node isn't possible and we should assert.
-  //
-  // (There's no positive test for using TrackingMDRef because it's not a
-  // useful thing to do.)
-  {
-    DistinctMDOperandPlaceholder PH(7);
-    MDTuple::getDistinct(Context, &PH);
-    EXPECT_DEATH(TrackingMDRef Ref(&PH), "Placeholders can only be used once");
-  }
-  {
-    DistinctMDOperandPlaceholder PH(7);
-    TrackingMDRef Ref(&PH);
-    EXPECT_DEATH(MDTuple::getDistinct(Context, &PH),
-                 "Placeholders can only be used once");
-  }
-}
-#endif
-
-typedef MetadataTest DebugVariableTest;
-TEST_F(DebugVariableTest, DenseMap) {
-  DenseMap<DebugVariable, uint64_t> DebugVariableMap;
-
-  DILocalScope *Scope = getSubprogram();
-  DIFile *File = getFile();
-  DIType *Type = getDerivedType();
-  DINode::DIFlags Flags = static_cast<DINode::DIFlags>(7);
-
-  DILocation *InlinedLoc = DILocation::get(Context, 2, 7, Scope);
-
-  DILocalVariable *VarA =
-      DILocalVariable::get(Context, Scope, "A", File, 5, Type, 2, Flags, 8);
-  DILocalVariable *VarB =
-      DILocalVariable::get(Context, Scope, "B", File, 7, Type, 3, Flags, 8);
-
-  DebugVariable DebugVariableA(VarA, NoneType(), nullptr);
-  DebugVariable DebugVariableInlineA(VarA, NoneType(), InlinedLoc);
-  DebugVariable DebugVariableB(VarB, NoneType(), nullptr);
-  DebugVariable DebugVariableFragB(VarB, {{16, 16}}, nullptr);
-
-  DebugVariableMap.insert({DebugVariableA, 2});
-  DebugVariableMap.insert({DebugVariableInlineA, 3});
-  DebugVariableMap.insert({DebugVariableB, 6});
-  DebugVariableMap.insert({DebugVariableFragB, 12});
-
-  EXPECT_EQ(DebugVariableMap.count(DebugVariableA), 1u);
-  EXPECT_EQ(DebugVariableMap.count(DebugVariableInlineA), 1u);
-  EXPECT_EQ(DebugVariableMap.count(DebugVariableB), 1u);
-  EXPECT_EQ(DebugVariableMap.count(DebugVariableFragB), 1u);
-
-  EXPECT_EQ(DebugVariableMap.find(DebugVariableA)->second, 2u);
-  EXPECT_EQ(DebugVariableMap.find(DebugVariableInlineA)->second, 3u);
-  EXPECT_EQ(DebugVariableMap.find(DebugVariableB)->second, 6u);
-  EXPECT_EQ(DebugVariableMap.find(DebugVariableFragB)->second, 12u);
-}
-
-} // end namespace
diff --git a/gnu/llvm/llvm/unittests/IR/ModuleTest.cpp b/gnu/llvm/llvm/unittests/IR/ModuleTest.cpp
deleted file mode 100644
index 4e2e394a925..00000000000
--- a/gnu/llvm/llvm/unittests/IR/ModuleTest.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-//===- unittests/IR/ModuleTest.cpp - Module unit tests --------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/IR/Module.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/GlobalVariable.h"
-#include "llvm/IR/ModuleSummaryIndex.h"
-#include "llvm/Pass.h"
-#include "llvm/Support/RandomNumberGenerator.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-#include <random>
-
-using namespace llvm;
-
-namespace {
-
-bool sortByName(const GlobalVariable &L, const GlobalVariable &R) {
-  return L.getName() < R.getName();
-}
-
-bool sortByNameReverse(const GlobalVariable &L, const GlobalVariable &R) {
-  return sortByName(R, L);
-}
-
-TEST(ModuleTest, sortGlobalsByName) {
-  LLVMContext Context;
-  for (auto compare : {&sortByName, &sortByNameReverse}) {
-    Module M("M", Context);
-    Type *T = Type::getInt8Ty(Context);
-    GlobalValue::LinkageTypes L = GlobalValue::ExternalLinkage;
-    (void)new GlobalVariable(M, T, false, L, nullptr, "A");
-    (void)new GlobalVariable(M, T, false, L, nullptr, "F");
-    (void)new GlobalVariable(M, T, false, L, nullptr, "G");
-    (void)new GlobalVariable(M, T, false, L, nullptr, "E");
-    (void)new GlobalVariable(M, T, false, L, nullptr, "B");
-    (void)new GlobalVariable(M, T, false, L, nullptr, "H");
-    (void)new GlobalVariable(M, T, false, L, nullptr, "C");
-    (void)new GlobalVariable(M, T, false, L, nullptr, "D");
-
-    // Sort the globals by name.
-    EXPECT_FALSE(std::is_sorted(M.global_begin(), M.global_end(), compare));
-    M.getGlobalList().sort(compare);
-    EXPECT_TRUE(std::is_sorted(M.global_begin(), M.global_end(), compare));
-  }
-}
-
-TEST(ModuleTest, randomNumberGenerator) {
-  LLVMContext Context;
-  static char ID;
-  struct DummyPass : ModulePass {
-    DummyPass() : ModulePass(ID) {}
-    bool runOnModule(Module &) override { return true; }
-  } DP;
-
-  Module M("R", Context);
-
-  std::uniform_int_distribution<int> dist;
-  const size_t NBCheck = 10;
-
-  std::array<int, NBCheck> RandomStreams[2];
-  for (auto &RandomStream : RandomStreams) {
-    std::unique_ptr<RandomNumberGenerator> RNG = M.createRNG(DP.getPassName());
-    std::generate(RandomStream.begin(), RandomStream.end(),
-                  [&]() { return dist(*RNG); });
-  }
-
-  EXPECT_TRUE(std::equal(RandomStreams[0].begin(), RandomStreams[0].end(),
-                         RandomStreams[1].begin()));
-}
-
-TEST(ModuleTest, setModuleFlag) {
-  LLVMContext Context;
-  Module M("M", Context);
-  StringRef Key = "Key";
-  Metadata *Val1 = MDString::get(Context, "Val1");
-  Metadata *Val2 = MDString::get(Context, "Val2");
-  EXPECT_EQ(nullptr, M.getModuleFlag(Key));
-  M.setModuleFlag(Module::ModFlagBehavior::Error, Key, Val1);
-  EXPECT_EQ(Val1, M.getModuleFlag(Key));
-  M.setModuleFlag(Module::ModFlagBehavior::Error, Key, Val2);
-  EXPECT_EQ(Val2, M.getModuleFlag(Key));
-}
-
-const char *IRString = R"IR(
-  !llvm.module.flags = !{!0}
-
-  !0 = !{i32 1, !"ProfileSummary", !1}
-  !1 = !{!2, !3, !4, !5, !6, !7, !8, !9}
-  !2 = !{!"ProfileFormat", !"SampleProfile"}
-  !3 = !{!"TotalCount", i64 10000}
-  !4 = !{!"MaxCount", i64 10}
-  !5 = !{!"MaxInternalCount", i64 1}
-  !6 = !{!"MaxFunctionCount", i64 1000}
-  !7 = !{!"NumCounts", i64 200}
-  !8 = !{!"NumFunctions", i64 3}
-  !9 = !{!"DetailedSummary", !10}
-  !10 = !{!11, !12, !13}
-  !11 = !{i32 10000, i64 1000, i32 1}
-  !12 = !{i32 990000, i64 300, i32 10}
-  !13 = !{i32 999999, i64 5, i32 100}
-)IR";
-
-TEST(ModuleTest, setProfileSummary) {
-  SMDiagnostic Err;
-  LLVMContext Context;
-  std::unique_ptr<Module> M = parseAssemblyString(IRString, Err, Context);
-  auto *PS = ProfileSummary::getFromMD(M->getProfileSummary(/*IsCS*/ false));
-  EXPECT_NE(nullptr, PS);
-  EXPECT_FALSE(PS->isPartialProfile());
-  PS->setPartialProfile(true);
-  M->setProfileSummary(PS->getMD(Context), ProfileSummary::PSK_Sample);
-  delete PS;
-  PS = ProfileSummary::getFromMD(M->getProfileSummary(/*IsCS*/ false));
-  EXPECT_NE(nullptr, PS);
-  EXPECT_EQ(true, PS->isPartialProfile());
-  delete PS;
-}
-
-TEST(ModuleTest, setPartialSampleProfileRatio) {
-  const char *IRString = R"IR(
-  !llvm.module.flags = !{!0}
-
-  !0 = !{i32 1, !"ProfileSummary", !1}
-  !1 = !{!2, !3, !4, !5, !6, !7, !8, !9, !10, !11}
-  !2 = !{!"ProfileFormat", !"SampleProfile"}
-  !3 = !{!"TotalCount", i64 10000}
-  !4 = !{!"MaxCount", i64 10}
-  !5 = !{!"MaxInternalCount", i64 1}
-  !6 = !{!"MaxFunctionCount", i64 1000}
-  !7 = !{!"NumCounts", i64 200}
-  !8 = !{!"NumFunctions", i64 3}
-  !9 = !{!"IsPartialProfile", i64 1}
-  !10 = !{!"PartialProfileRatio", double 0.0}
-  !11 = !{!"DetailedSummary", !12}
-  !12 = !{!13, !14, !15}
-  !13 = !{i32 10000, i64 1000, i32 1}
-  !14 = !{i32 990000, i64 300, i32 10}
-  !15 = !{i32 999999, i64 5, i32 100}
-  )IR";
-
-  SMDiagnostic Err;
-  LLVMContext Context;
-  std::unique_ptr<Module> M = parseAssemblyString(IRString, Err, Context);
-  ModuleSummaryIndex Index(/*HaveGVs*/ false);
-  const unsigned BlockCount = 100;
-  const unsigned NumCounts = 200;
-  Index.setBlockCount(BlockCount);
-  M->setPartialSampleProfileRatio(Index);
-  double Ratio = (double)BlockCount / NumCounts;
-  std::unique_ptr<ProfileSummary> ProfileSummary(
-      ProfileSummary::getFromMD(M->getProfileSummary(/*IsCS*/ false)));
-  EXPECT_EQ(Ratio, ProfileSummary->getPartialProfileRatio());
-}
-
-} // end namespace
diff --git a/gnu/llvm/llvm/unittests/IR/PassBuilderCallbacksTest.cpp b/gnu/llvm/llvm/unittests/IR/PassBuilderCallbacksTest.cpp
deleted file mode 100644
index 7785c975645..00000000000
--- a/gnu/llvm/llvm/unittests/IR/PassBuilderCallbacksTest.cpp
+++ /dev/null
@@ -1,1310 +0,0 @@
-//===- unittests/IR/PassBuilderCallbacksTest.cpp - PB Callback Tests --===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Testing/Support/Error.h"
-#include <functional>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-#include <llvm/ADT/Any.h>
-#include <llvm/Analysis/CGSCCPassManager.h>
-#include <llvm/Analysis/LoopAnalysisManager.h>
-#include <llvm/AsmParser/Parser.h>
-#include <llvm/IR/LLVMContext.h>
-#include <llvm/IR/PassInstrumentation.h>
-#include <llvm/IR/PassManager.h>
-#include <llvm/Passes/PassBuilder.h>
-#include <llvm/Support/Regex.h>
-#include <llvm/Support/SourceMgr.h>
-#include <llvm/Transforms/Scalar/LoopPassManager.h>
-
-using namespace llvm;
-
-namespace {
-using testing::AnyNumber;
-using testing::DoAll;
-using testing::Not;
-using testing::Return;
-using testing::WithArgs;
-using testing::_;
-
-/// A CRTP base for analysis mock handles
-///
-/// This class reconciles mocking with the value semantics implementation of the
-/// AnalysisManager. Analysis mock handles should derive from this class and
-/// call \c setDefault() in their constroctur for wiring up the defaults defined
-/// by this base with their mock run() and invalidate() implementations.
-template <typename DerivedT, typename IRUnitT,
-          typename AnalysisManagerT = AnalysisManager<IRUnitT>,
-          typename... ExtraArgTs>
-class MockAnalysisHandleBase {
-public:
-  class Analysis : public AnalysisInfoMixin<Analysis> {
-    friend AnalysisInfoMixin<Analysis>;
-    friend MockAnalysisHandleBase;
-    static AnalysisKey Key;
-
-    DerivedT *Handle;
-
-    Analysis(DerivedT &Handle) : Handle(&Handle) {
-      static_assert(std::is_base_of<MockAnalysisHandleBase, DerivedT>::value,
-                    "Must pass the derived type to this template!");
-    }
-
-  public:
-    class Result {
-      friend MockAnalysisHandleBase;
-
-      DerivedT *Handle;
-
-      Result(DerivedT &Handle) : Handle(&Handle) {}
-
-    public:
-      // Forward invalidation events to the mock handle.
-      bool invalidate(IRUnitT &IR, const PreservedAnalyses &PA,
-                      typename AnalysisManagerT::Invalidator &Inv) {
-        return Handle->invalidate(IR, PA, Inv);
-      }
-    };
-
-    Result run(IRUnitT &IR, AnalysisManagerT &AM, ExtraArgTs... ExtraArgs) {
-      return Handle->run(IR, AM, ExtraArgs...);
-    }
-  };
-
-  Analysis getAnalysis() { return Analysis(static_cast<DerivedT &>(*this)); }
-  typename Analysis::Result getResult() {
-    return typename Analysis::Result(static_cast<DerivedT &>(*this));
-  }
-  static StringRef getName() { return llvm::getTypeName<DerivedT>(); }
-
-protected:
-  // FIXME: MSVC seems unable to handle a lambda argument to Invoke from within
-  // the template, so we use a boring static function.
-  static bool invalidateCallback(IRUnitT &IR, const PreservedAnalyses &PA,
-                                 typename AnalysisManagerT::Invalidator &Inv) {
-    auto PAC = PA.template getChecker<Analysis>();
-    return !PAC.preserved() &&
-           !PAC.template preservedSet<AllAnalysesOn<IRUnitT>>();
-  }
-
-  /// Derived classes should call this in their constructor to set up default
-  /// mock actions. (We can't do this in our constructor because this has to
-  /// run after the DerivedT is constructed.)
-  void setDefaults() {
-    ON_CALL(static_cast<DerivedT &>(*this),
-            run(_, _, testing::Matcher<ExtraArgTs>(_)...))
-        .WillByDefault(Return(this->getResult()));
-    ON_CALL(static_cast<DerivedT &>(*this), invalidate(_, _, _))
-        .WillByDefault(&invalidateCallback);
-  }
-};
-
-/// A CRTP base for pass mock handles
-///
-/// This class reconciles mocking with the value semantics implementation of the
-/// PassManager. Pass mock handles should derive from this class and
-/// call \c setDefault() in their constroctur for wiring up the defaults defined
-/// by this base with their mock run() and invalidate() implementations.
-template <typename DerivedT, typename IRUnitT, typename AnalysisManagerT,
-          typename... ExtraArgTs>
-AnalysisKey MockAnalysisHandleBase<DerivedT, IRUnitT, AnalysisManagerT,
-                                   ExtraArgTs...>::Analysis::Key;
-
-template <typename DerivedT, typename IRUnitT,
-          typename AnalysisManagerT = AnalysisManager<IRUnitT>,
-          typename... ExtraArgTs>
-class MockPassHandleBase {
-public:
-  class Pass : public PassInfoMixin<Pass> {
-    friend MockPassHandleBase;
-
-    DerivedT *Handle;
-
-    Pass(DerivedT &Handle) : Handle(&Handle) {
-      static_assert(std::is_base_of<MockPassHandleBase, DerivedT>::value,
-                    "Must pass the derived type to this template!");
-    }
-
-  public:
-    PreservedAnalyses run(IRUnitT &IR, AnalysisManagerT &AM,
-                          ExtraArgTs... ExtraArgs) {
-      return Handle->run(IR, AM, ExtraArgs...);
-    }
-  };
-
-  static StringRef getName() { return llvm::getTypeName<DerivedT>(); }
-
-  Pass getPass() { return Pass(static_cast<DerivedT &>(*this)); }
-
-protected:
-  /// Derived classes should call this in their constructor to set up default
-  /// mock actions. (We can't do this in our constructor because this has to
-  /// run after the DerivedT is constructed.)
-  void setDefaults() {
-    ON_CALL(static_cast<DerivedT &>(*this),
-            run(_, _, testing::Matcher<ExtraArgTs>(_)...))
-        .WillByDefault(Return(PreservedAnalyses::all()));
-  }
-};
-
-/// Mock handles for passes for the IRUnits Module, CGSCC, Function, Loop.
-/// These handles define the appropriate run() mock interface for the respective
-/// IRUnit type.
-template <typename IRUnitT> struct MockPassHandle;
-template <>
-struct MockPassHandle<Loop>
-    : MockPassHandleBase<MockPassHandle<Loop>, Loop, LoopAnalysisManager,
-                         LoopStandardAnalysisResults &, LPMUpdater &> {
-  MOCK_METHOD4(run,
-               PreservedAnalyses(Loop &, LoopAnalysisManager &,
-                                 LoopStandardAnalysisResults &, LPMUpdater &));
-  static void invalidateLoop(Loop &L, LoopAnalysisManager &,
-                             LoopStandardAnalysisResults &,
-                             LPMUpdater &Updater) {
-    Updater.markLoopAsDeleted(L, L.getName());
-  }
-  MockPassHandle() { setDefaults(); }
-};
-
-template <>
-struct MockPassHandle<LoopNest>
-    : MockPassHandleBase<MockPassHandle<LoopNest>, LoopNest,
-                         LoopAnalysisManager, LoopStandardAnalysisResults &,
-                         LPMUpdater &> {
-  MOCK_METHOD4(run,
-               PreservedAnalyses(LoopNest &, LoopAnalysisManager &,
-                                 LoopStandardAnalysisResults &, LPMUpdater &));
-  static void invalidateLoopNest(LoopNest &L, LoopAnalysisManager &,
-                                 LoopStandardAnalysisResults &,
-                                 LPMUpdater &Updater) {
-    Updater.markLoopAsDeleted(L.getOutermostLoop(), L.getName());
-  }
-  MockPassHandle() { setDefaults(); }
-};
-
-template <>
-struct MockPassHandle<Function>
-    : MockPassHandleBase<MockPassHandle<Function>, Function> {
-  MOCK_METHOD2(run, PreservedAnalyses(Function &, FunctionAnalysisManager &));
-
-  MockPassHandle() { setDefaults(); }
-};
-
-template <>
-struct MockPassHandle<LazyCallGraph::SCC>
-    : MockPassHandleBase<MockPassHandle<LazyCallGraph::SCC>, LazyCallGraph::SCC,
-                         CGSCCAnalysisManager, LazyCallGraph &,
-                         CGSCCUpdateResult &> {
-  MOCK_METHOD4(run,
-               PreservedAnalyses(LazyCallGraph::SCC &, CGSCCAnalysisManager &,
-                                 LazyCallGraph &G, CGSCCUpdateResult &UR));
-
-  static void invalidateSCC(LazyCallGraph::SCC &C, CGSCCAnalysisManager &,
-                            LazyCallGraph &, CGSCCUpdateResult &UR) {
-    UR.InvalidatedSCCs.insert(&C);
-  }
-
-  MockPassHandle() { setDefaults(); }
-};
-
-template <>
-struct MockPassHandle<Module>
-    : MockPassHandleBase<MockPassHandle<Module>, Module> {
-  MOCK_METHOD2(run, PreservedAnalyses(Module &, ModuleAnalysisManager &));
-
-  MockPassHandle() { setDefaults(); }
-};
-
-/// Mock handles for analyses for the IRUnits Module, CGSCC, Function, Loop.
-/// These handles define the appropriate run() and invalidate() mock interfaces
-/// for the respective IRUnit type.
-template <typename IRUnitT> struct MockAnalysisHandle;
-template <>
-struct MockAnalysisHandle<Loop>
-    : MockAnalysisHandleBase<MockAnalysisHandle<Loop>, Loop,
-                             LoopAnalysisManager,
-                             LoopStandardAnalysisResults &> {
-
-  MOCK_METHOD3_T(run, typename Analysis::Result(Loop &, LoopAnalysisManager &,
-                                                LoopStandardAnalysisResults &));
-
-  MOCK_METHOD3_T(invalidate, bool(Loop &, const PreservedAnalyses &,
-                                  LoopAnalysisManager::Invalidator &));
-
-  MockAnalysisHandle<Loop>() { this->setDefaults(); }
-};
-
-template <>
-struct MockAnalysisHandle<Function>
-    : MockAnalysisHandleBase<MockAnalysisHandle<Function>, Function> {
-  MOCK_METHOD2(run, Analysis::Result(Function &, FunctionAnalysisManager &));
-
-  MOCK_METHOD3(invalidate, bool(Function &, const PreservedAnalyses &,
-                                FunctionAnalysisManager::Invalidator &));
-
-  MockAnalysisHandle<Function>() { setDefaults(); }
-};
-
-template <>
-struct MockAnalysisHandle<LazyCallGraph::SCC>
-    : MockAnalysisHandleBase<MockAnalysisHandle<LazyCallGraph::SCC>,
-                             LazyCallGraph::SCC, CGSCCAnalysisManager,
-                             LazyCallGraph &> {
-  MOCK_METHOD3(run, Analysis::Result(LazyCallGraph::SCC &,
-                                     CGSCCAnalysisManager &, LazyCallGraph &));
-
-  MOCK_METHOD3(invalidate, bool(LazyCallGraph::SCC &, const PreservedAnalyses &,
-                                CGSCCAnalysisManager::Invalidator &));
-
-  MockAnalysisHandle<LazyCallGraph::SCC>() { setDefaults(); }
-};
-
-template <>
-struct MockAnalysisHandle<Module>
-    : MockAnalysisHandleBase<MockAnalysisHandle<Module>, Module> {
-  MOCK_METHOD2(run, Analysis::Result(Module &, ModuleAnalysisManager &));
-
-  MOCK_METHOD3(invalidate, bool(Module &, const PreservedAnalyses &,
-                                ModuleAnalysisManager::Invalidator &));
-
-  MockAnalysisHandle<Module>() { setDefaults(); }
-};
-
-static std::unique_ptr<Module> parseIR(LLVMContext &C, const char *IR) {
-  SMDiagnostic Err;
-  return parseAssemblyString(IR, Err, C);
-}
-
-/// Helper for HasName matcher that returns getName both for IRUnit and
-/// for IRUnit pointer wrapper into llvm::Any (wrapped by PassInstrumentation).
-template <typename IRUnitT> std::string getName(const IRUnitT &IR) {
-  return std::string(IR.getName());
-}
-
-template <> std::string getName(const StringRef &name) {
-  return std::string(name);
-}
-
-template <> std::string getName(const llvm::Any &WrappedIR) {
-  if (any_isa<const Module *>(WrappedIR))
-    return any_cast<const Module *>(WrappedIR)->getName().str();
-  if (any_isa<const Function *>(WrappedIR))
-    return any_cast<const Function *>(WrappedIR)->getName().str();
-  if (any_isa<const Loop *>(WrappedIR))
-    return any_cast<const Loop *>(WrappedIR)->getName().str();
-  if (any_isa<const LoopNest *>(WrappedIR))
-    return any_cast<const LoopNest *>(WrappedIR)->getName().str();
-  if (any_isa<const LazyCallGraph::SCC *>(WrappedIR))
-    return any_cast<const LazyCallGraph::SCC *>(WrappedIR)->getName();
-  return "<UNKNOWN>";
-}
-/// Define a custom matcher for objects which support a 'getName' method.
-///
-/// LLVM often has IR objects or analysis objects which expose a name
-/// and in tests it is convenient to match these by name for readability.
-/// Usually, this name is either a StringRef or a plain std::string. This
-/// matcher supports any type exposing a getName() method of this form whose
-/// return value is compatible with an std::ostream. For StringRef, this uses
-/// the shift operator defined above.
-///
-/// It should be used as:
-///
-///   HasName("my_function")
-///
-/// No namespace or other qualification is required.
-MATCHER_P(HasName, Name, "") {
-  *result_listener << "has name '" << getName(arg) << "'";
-  return Name == getName(arg);
-}
-
-MATCHER_P(HasNameRegex, Name, "") {
-  *result_listener << "has name '" << getName(arg) << "'";
-  llvm::Regex r(Name);
-  return r.match(getName(arg));
-}
-
-struct MockPassInstrumentationCallbacks {
-  PassInstrumentationCallbacks Callbacks;
-
-  MockPassInstrumentationCallbacks() {
-    ON_CALL(*this, runBeforePass(_, _)).WillByDefault(Return(true));
-  }
-  MOCK_METHOD2(runBeforePass, bool(StringRef PassID, llvm::Any));
-  MOCK_METHOD2(runBeforeSkippedPass, void(StringRef PassID, llvm::Any));
-  MOCK_METHOD2(runBeforeNonSkippedPass, void(StringRef PassID, llvm::Any));
-  MOCK_METHOD3(runAfterPass,
-               void(StringRef PassID, llvm::Any, const PreservedAnalyses &PA));
-  MOCK_METHOD2(runAfterPassInvalidated,
-               void(StringRef PassID, const PreservedAnalyses &PA));
-  MOCK_METHOD2(runBeforeAnalysis, void(StringRef PassID, llvm::Any));
-  MOCK_METHOD2(runAfterAnalysis, void(StringRef PassID, llvm::Any));
-
-  void registerPassInstrumentation() {
-    Callbacks.registerShouldRunOptionalPassCallback(
-        [this](StringRef P, llvm::Any IR) {
-          return this->runBeforePass(P, IR);
-        });
-    Callbacks.registerBeforeSkippedPassCallback(
-        [this](StringRef P, llvm::Any IR) {
-          this->runBeforeSkippedPass(P, IR);
-        });
-    Callbacks.registerBeforeNonSkippedPassCallback(
-        [this](StringRef P, llvm::Any IR) {
-          this->runBeforeNonSkippedPass(P, IR);
-        });
-    Callbacks.registerAfterPassCallback(
-        [this](StringRef P, llvm::Any IR, const PreservedAnalyses &PA) {
-          this->runAfterPass(P, IR, PA);
-        });
-    Callbacks.registerAfterPassInvalidatedCallback(
-        [this](StringRef P, const PreservedAnalyses &PA) {
-          this->runAfterPassInvalidated(P, PA);
-        });
-    Callbacks.registerBeforeAnalysisCallback([this](StringRef P, llvm::Any IR) {
-      return this->runBeforeAnalysis(P, IR);
-    });
-    Callbacks.registerAfterAnalysisCallback(
-        [this](StringRef P, llvm::Any IR) { this->runAfterAnalysis(P, IR); });
-  }
-
-  void ignoreNonMockPassInstrumentation(StringRef IRName) {
-    // Generic EXPECT_CALLs are needed to match instrumentation on unimportant
-    // parts of a pipeline that we do not care about (e.g. various passes added
-    // by default by PassBuilder - Verifier pass etc).
-    // Make sure to avoid ignoring Mock passes/analysis, we definitely want
-    // to check these explicitly.
-    EXPECT_CALL(*this,
-                runBeforePass(Not(HasNameRegex("Mock")), HasName(IRName)))
-        .Times(AnyNumber());
-    EXPECT_CALL(
-        *this, runBeforeSkippedPass(Not(HasNameRegex("Mock")), HasName(IRName)))
-        .Times(AnyNumber());
-    EXPECT_CALL(*this, runBeforeNonSkippedPass(Not(HasNameRegex("Mock")),
-                                               HasName(IRName)))
-        .Times(AnyNumber());
-    EXPECT_CALL(*this,
-                runAfterPass(Not(HasNameRegex("Mock")), HasName(IRName), _))
-        .Times(AnyNumber());
-    EXPECT_CALL(*this,
-                runBeforeAnalysis(Not(HasNameRegex("Mock")), HasName(IRName)))
-        .Times(AnyNumber());
-    EXPECT_CALL(*this,
-                runAfterAnalysis(Not(HasNameRegex("Mock")), HasName(IRName)))
-        .Times(AnyNumber());
-  }
-};
-
-template <typename IRUnitT>
-using ExtraMockPassHandle =
-    std::conditional_t<std::is_same<IRUnitT, Loop>::value,
-                       MockPassHandle<LoopNest>, MockPassHandle<IRUnitT>>;
-
-template <typename PassManagerT> class PassBuilderCallbacksTest;
-
-/// This test fixture is shared between all the actual tests below and
-/// takes care of setting up appropriate defaults.
-///
-/// The template specialization serves to extract the IRUnit and AM types from
-/// the given PassManagerT.
-template <typename TestIRUnitT, typename... ExtraPassArgTs,
-          typename... ExtraAnalysisArgTs>
-class PassBuilderCallbacksTest<PassManager<
-    TestIRUnitT, AnalysisManager<TestIRUnitT, ExtraAnalysisArgTs...>,
-    ExtraPassArgTs...>> : public testing::Test {
-protected:
-  using IRUnitT = TestIRUnitT;
-  using AnalysisManagerT = AnalysisManager<TestIRUnitT, ExtraAnalysisArgTs...>;
-  using PassManagerT =
-      PassManager<TestIRUnitT, AnalysisManagerT, ExtraPassArgTs...>;
-  using AnalysisT = typename MockAnalysisHandle<IRUnitT>::Analysis;
-
-  LLVMContext Context;
-  std::unique_ptr<Module> M;
-
-  MockPassInstrumentationCallbacks CallbacksHandle;
-
-  PassBuilder PB;
-  ModulePassManager PM;
-  LoopAnalysisManager LAM;
-  FunctionAnalysisManager FAM;
-  CGSCCAnalysisManager CGAM;
-  ModuleAnalysisManager AM;
-
-  MockPassHandle<IRUnitT> PassHandle;
-  ExtraMockPassHandle<IRUnitT> ExtraPassHandle;
-
-  MockAnalysisHandle<IRUnitT> AnalysisHandle;
-
-  static PreservedAnalyses getAnalysisResult(IRUnitT &U, AnalysisManagerT &AM,
-                                             ExtraAnalysisArgTs &&... Args) {
-    (void)AM.template getResult<AnalysisT>(
-        U, std::forward<ExtraAnalysisArgTs>(Args)...);
-    return PreservedAnalyses::all();
-  }
-
-  PassBuilderCallbacksTest()
-      : M(parseIR(Context,
-                  "declare void @bar()\n"
-                  "define void @foo(i32 %n) {\n"
-                  "entry:\n"
-                  "  br label %loop\n"
-                  "loop:\n"
-                  "  %iv = phi i32 [ 0, %entry ], [ %iv.next, %loop ]\n"
-                  "  %iv.next = add i32 %iv, 1\n"
-                  "  tail call void @bar()\n"
-                  "  %cmp = icmp eq i32 %iv, %n\n"
-                  "  br i1 %cmp, label %exit, label %loop\n"
-                  "exit:\n"
-                  "  ret void\n"
-                  "}\n")),
-        CallbacksHandle(),
-        PB(nullptr, PipelineTuningOptions(), None, &CallbacksHandle.Callbacks),
-        PM(), LAM(), FAM(), CGAM(), AM() {
-
-    EXPECT_TRUE(&CallbacksHandle.Callbacks ==
-                PB.getPassInstrumentationCallbacks());
-
-    /// Register a callback for analysis registration.
-    ///
-    /// The callback is a function taking a reference to an AnalyisManager
-    /// object. When called, the callee gets to register its own analyses with
-    /// this PassBuilder instance.
-    PB.registerAnalysisRegistrationCallback([this](AnalysisManagerT &AM) {
-      // Register our mock analysis
-      AM.registerPass([this] { return AnalysisHandle.getAnalysis(); });
-    });
-
-    /// Register a callback for pipeline parsing.
-    ///
-    /// During parsing of a textual pipeline, the PassBuilder will call these
-    /// callbacks for each encountered pass name that it does not know. This
-    /// includes both simple pass names as well as names of sub-pipelines. In
-    /// the latter case, the InnerPipeline is not empty.
-    PB.registerPipelineParsingCallback(
-        [this](StringRef Name, PassManagerT &PM,
-               ArrayRef<PassBuilder::PipelineElement> InnerPipeline) {
-          /// Handle parsing of the names of analysis utilities such as
-          /// require<test-analysis> and invalidate<test-analysis> for our
-          /// analysis mock handle
-          if (parseAnalysisUtilityPasses<AnalysisT>("test-analysis", Name, PM))
-            return true;
-
-          /// Parse the name of our pass mock handle
-          if (Name == "test-transform") {
-            PM.addPass(PassHandle.getPass());
-            if (std::is_same<IRUnitT, Loop>::value)
-              PM.addPass(ExtraPassHandle.getPass());
-            return true;
-          }
-          return false;
-        });
-
-    /// Register builtin analyses and cross-register the analysis proxies
-    PB.registerModuleAnalyses(AM);
-    PB.registerCGSCCAnalyses(CGAM);
-    PB.registerFunctionAnalyses(FAM);
-    PB.registerLoopAnalyses(LAM);
-    PB.crossRegisterProxies(LAM, FAM, CGAM, AM);
-  }
-};
-
-using ModuleCallbacksTest = PassBuilderCallbacksTest<ModulePassManager>;
-using CGSCCCallbacksTest = PassBuilderCallbacksTest<CGSCCPassManager>;
-using FunctionCallbacksTest = PassBuilderCallbacksTest<FunctionPassManager>;
-using LoopCallbacksTest = PassBuilderCallbacksTest<LoopPassManager>;
-
-/// Test parsing of the name of our mock pass for all IRUnits.
-///
-/// The pass should by default run our mock analysis and then preserve it.
-TEST_F(ModuleCallbacksTest, Passes) {
-  EXPECT_CALL(AnalysisHandle, run(HasName("<string>"), _));
-  EXPECT_CALL(PassHandle, run(HasName("<string>"), _))
-      .WillOnce(&getAnalysisResult);
-
-  StringRef PipelineText = "test-transform";
-  ASSERT_THAT_ERROR(PB.parsePassPipeline(PM, PipelineText), Succeeded())
-      << "Pipeline was: " << PipelineText;
-
-  PM.run(*M, AM);
-}
-
-TEST_F(ModuleCallbacksTest, InstrumentedPasses) {
-  EXPECT_CALL(AnalysisHandle, run(HasName("<string>"), _));
-  EXPECT_CALL(PassHandle, run(HasName("<string>"), _))
-      .WillOnce(&getAnalysisResult);
-
-  CallbacksHandle.registerPassInstrumentation();
-  // Non-mock instrumentation not specifically mentioned below can be ignored.
-  CallbacksHandle.ignoreNonMockPassInstrumentation("<string>");
-
-  // PassInstrumentation calls should happen in-sequence, in the same order
-  // as passes/analyses are scheduled.
-  ::testing::Sequence PISequence;
-  EXPECT_CALL(CallbacksHandle, runBeforePass(HasNameRegex("MockPassHandle"),
-                                             HasName("<string>")))
-      .InSequence(PISequence);
-  EXPECT_CALL(CallbacksHandle,
-              runBeforeNonSkippedPass(HasNameRegex("MockPassHandle"),
-                                      HasName("<string>")))
-      .InSequence(PISequence);
-  EXPECT_CALL(CallbacksHandle,
-              runBeforeAnalysis(HasNameRegex("MockAnalysisHandle"),
-                                HasName("<string>")))
-      .InSequence(PISequence);
-  EXPECT_CALL(
-      CallbacksHandle,
-      runAfterAnalysis(HasNameRegex("MockAnalysisHandle"), HasName("<string>")))
-      .InSequence(PISequence);
-  EXPECT_CALL(CallbacksHandle, runAfterPass(HasNameRegex("MockPassHandle"),
-                                            HasName("<string>"), _))
-      .InSequence(PISequence);
-
-  // No passes are skipped, so there should be no calls to
-  // runBeforeSkippedPass().
-  EXPECT_CALL(
-      CallbacksHandle,
-      runBeforeSkippedPass(HasNameRegex("MockPassHandle"), HasName("<string>")))
-      .Times(0);
-
-  StringRef PipelineText = "test-transform";
-  ASSERT_THAT_ERROR(PB.parsePassPipeline(PM, PipelineText), Succeeded())
-      << "Pipeline was: " << PipelineText;
-
-  PM.run(*M, AM);
-}
-
-TEST_F(ModuleCallbacksTest, InstrumentedSkippedPasses) {
-  CallbacksHandle.registerPassInstrumentation();
-  // Non-mock instrumentation run here can safely be ignored.
-  CallbacksHandle.ignoreNonMockPassInstrumentation("<string>");
-  CallbacksHandle.ignoreNonMockPassInstrumentation("foo");
-
-  // Skip all passes by returning false. Pass managers and adaptor passes are
-  // also passes that observed by the callbacks.
-  EXPECT_CALL(CallbacksHandle, runBeforePass(_, _))
-      .WillRepeatedly(Return(false));
-
-  EXPECT_CALL(CallbacksHandle,
-              runBeforeSkippedPass(HasNameRegex("MockPassHandle"), _))
-      .Times(3);
-
-  EXPECT_CALL(AnalysisHandle, run(HasName("<string>"), _)).Times(0);
-  EXPECT_CALL(PassHandle, run(HasName("<string>"), _)).Times(0);
-
-  // As the pass is skipped there is no nonskippedpass/afterPass,
-  // beforeAnalysis/afterAnalysis as well.
-  EXPECT_CALL(CallbacksHandle,
-              runBeforeNonSkippedPass(HasNameRegex("MockPassHandle"), _))
-      .Times(0);
-  EXPECT_CALL(CallbacksHandle,
-              runAfterPass(HasNameRegex("MockPassHandle"), _, _))
-      .Times(0);
-  EXPECT_CALL(CallbacksHandle,
-              runBeforeAnalysis(HasNameRegex("MockAnalysisHandle"), _))
-      .Times(0);
-  EXPECT_CALL(CallbacksHandle,
-              runAfterAnalysis(HasNameRegex("MockAnalysisHandle"), _))
-      .Times(0);
-
-  // Order is important here. `Adaptor` expectations should be checked first
-  // because the its argument contains 'PassManager' (for example:
-  // ModuleToFunctionPassAdaptor{{.*}}PassManager{{.*}}). Check
-  // `runBeforeNonSkippedPass` and `runAfterPass` to show that they are not
-  // skipped.
-  //
-  // Pass managers are not ignored.
-  // 5 = (1) ModulePassManager + (2) FunctionPassMangers + (1) LoopPassManager +
-  //     (1) CGSCCPassManager
-  EXPECT_CALL(CallbacksHandle,
-              runBeforeNonSkippedPass(HasNameRegex("PassManager"), _))
-      .Times(5);
-  EXPECT_CALL(
-      CallbacksHandle,
-      runBeforeNonSkippedPass(HasNameRegex("ModuleToFunctionPassAdaptor"), _))
-      .Times(1);
-  EXPECT_CALL(CallbacksHandle,
-              runBeforeNonSkippedPass(
-                  HasNameRegex("ModuleToPostOrderCGSCCPassAdaptor"), _))
-      .Times(1);
-  EXPECT_CALL(
-      CallbacksHandle,
-      runBeforeNonSkippedPass(HasNameRegex("CGSCCToFunctionPassAdaptor"), _))
-      .Times(1);
-  EXPECT_CALL(
-      CallbacksHandle,
-      runBeforeNonSkippedPass(HasNameRegex("FunctionToLoopPassAdaptor"), _))
-      .Times(1);
-
-  // The `runAfterPass` checks are the same as these of
-  // `runBeforeNonSkippedPass`.
-  EXPECT_CALL(CallbacksHandle, runAfterPass(HasNameRegex("PassManager"), _, _))
-      .Times(5);
-  EXPECT_CALL(CallbacksHandle,
-              runAfterPass(HasNameRegex("ModuleToFunctionPassAdaptor"), _, _))
-      .Times(1);
-  EXPECT_CALL(
-      CallbacksHandle,
-      runAfterPass(HasNameRegex("ModuleToPostOrderCGSCCPassAdaptor"), _, _))
-      .Times(1);
-  EXPECT_CALL(CallbacksHandle,
-              runAfterPass(HasNameRegex("CGSCCToFunctionPassAdaptor"), _, _))
-      .Times(1);
-  EXPECT_CALL(CallbacksHandle,
-              runAfterPass(HasNameRegex("FunctionToLoopPassAdaptor"), _, _))
-      .Times(1);
-
-  // Ignore analyses introduced by adaptor passes.
-  EXPECT_CALL(CallbacksHandle,
-              runBeforeAnalysis(Not(HasNameRegex("MockAnalysisHandle")), _))
-      .Times(AnyNumber());
-  EXPECT_CALL(CallbacksHandle,
-              runAfterAnalysis(Not(HasNameRegex("MockAnalysisHandle")), _))
-      .Times(AnyNumber());
-
-  // Register Funtion and Loop version of "test-transform" for testing
-  PB.registerPipelineParsingCallback(
-      [](StringRef Name, FunctionPassManager &FPM,
-         ArrayRef<PassBuilder::PipelineElement>) {
-        if (Name == "test-transform") {
-          FPM.addPass(MockPassHandle<Function>().getPass());
-          return true;
-        }
-        return false;
-      });
-  PB.registerPipelineParsingCallback(
-      [](StringRef Name, LoopPassManager &LPM,
-         ArrayRef<PassBuilder::PipelineElement>) {
-        if (Name == "test-transform") {
-          LPM.addPass(MockPassHandle<Loop>().getPass());
-          return true;
-        }
-        return false;
-      });
-
-  StringRef PipelineText = "test-transform,function(test-transform),cgscc("
-                           "function(loop(test-transform)))";
-  ASSERT_THAT_ERROR(PB.parsePassPipeline(PM, PipelineText), Succeeded())
-      << "Pipeline was: " << PipelineText;
-
-  PM.run(*M, AM);
-}
-
-TEST_F(FunctionCallbacksTest, Passes) {
-  EXPECT_CALL(AnalysisHandle, run(HasName("foo"), _));
-  EXPECT_CALL(PassHandle, run(HasName("foo"), _)).WillOnce(&getAnalysisResult);
-
-  StringRef PipelineText = "test-transform";
-  ASSERT_THAT_ERROR(PB.parsePassPipeline(PM, PipelineText), Succeeded())
-      << "Pipeline was: " << PipelineText;
-  PM.run(*M, AM);
-}
-
-TEST_F(FunctionCallbacksTest, InstrumentedPasses) {
-  CallbacksHandle.registerPassInstrumentation();
-  // Non-mock instrumentation not specifically mentioned below can be ignored.
-  CallbacksHandle.ignoreNonMockPassInstrumentation("<string>");
-  CallbacksHandle.ignoreNonMockPassInstrumentation("foo");
-
-  EXPECT_CALL(AnalysisHandle, run(HasName("foo"), _));
-  EXPECT_CALL(PassHandle, run(HasName("foo"), _)).WillOnce(&getAnalysisResult);
-
-  // PassInstrumentation calls should happen in-sequence, in the same order
-  // as passes/analyses are scheduled.
-  ::testing::Sequence PISequence;
-  EXPECT_CALL(CallbacksHandle,
-              runBeforePass(HasNameRegex("MockPassHandle"), HasName("foo")))
-      .InSequence(PISequence);
-  EXPECT_CALL(
-      CallbacksHandle,
-      runBeforeNonSkippedPass(HasNameRegex("MockPassHandle"), HasName("foo")))
-      .InSequence(PISequence);
-  EXPECT_CALL(
-      CallbacksHandle,
-      runBeforeAnalysis(HasNameRegex("MockAnalysisHandle"), HasName("foo")))
-      .InSequence(PISequence);
-  EXPECT_CALL(
-      CallbacksHandle,
-      runAfterAnalysis(HasNameRegex("MockAnalysisHandle"), HasName("foo")))
-      .InSequence(PISequence);
-  EXPECT_CALL(CallbacksHandle,
-              runAfterPass(HasNameRegex("MockPassHandle"), HasName("foo"), _))
-      .InSequence(PISequence);
-
-  // No passes are skipped, so there should be no calls to
-  // runBeforeSkippedPass().
-  EXPECT_CALL(
-      CallbacksHandle,
-      runBeforeSkippedPass(HasNameRegex("MockPassHandle"), HasName("foo")))
-      .Times(0);
-
-  // Our mock pass does not invalidate IR.
-  EXPECT_CALL(CallbacksHandle,
-              runAfterPassInvalidated(HasNameRegex("MockPassHandle"), _))
-      .Times(0);
-
-  StringRef PipelineText = "test-transform";
-  ASSERT_THAT_ERROR(PB.parsePassPipeline(PM, PipelineText), Succeeded())
-      << "Pipeline was: " << PipelineText;
-  PM.run(*M, AM);
-}
-
-TEST_F(FunctionCallbacksTest, InstrumentedSkippedPasses) {
-  CallbacksHandle.registerPassInstrumentation();
-  // Non-mock instrumentation run here can safely be ignored.
-  CallbacksHandle.ignoreNonMockPassInstrumentation("<string>");
-  CallbacksHandle.ignoreNonMockPassInstrumentation("foo");
-
-  // Skip the pass by returning false.
-  EXPECT_CALL(CallbacksHandle,
-              runBeforePass(HasNameRegex("MockPassHandle"), HasName("foo")))
-      .WillOnce(Return(false));
-
-  EXPECT_CALL(
-      CallbacksHandle,
-      runBeforeSkippedPass(HasNameRegex("MockPassHandle"), HasName("foo")))
-      .Times(1);
-
-  EXPECT_CALL(AnalysisHandle, run(HasName("foo"), _)).Times(0);
-  EXPECT_CALL(PassHandle, run(HasName("foo"), _)).Times(0);
-
-  // As the pass is skipped there is no afterPass, beforeAnalysis/afterAnalysis
-  // as well.
-  EXPECT_CALL(CallbacksHandle,
-              runBeforeNonSkippedPass(HasNameRegex("MockPassHandle"), _))
-      .Times(0);
-  EXPECT_CALL(CallbacksHandle,
-              runAfterPass(HasNameRegex("MockPassHandle"), _, _))
-      .Times(0);
-  EXPECT_CALL(CallbacksHandle,
-              runAfterPassInvalidated(HasNameRegex("MockPassHandle"), _))
-      .Times(0);
-  EXPECT_CALL(CallbacksHandle,
-              runAfterPass(HasNameRegex("MockPassHandle"), _, _))
-      .Times(0);
-  EXPECT_CALL(CallbacksHandle,
-              runBeforeAnalysis(HasNameRegex("MockAnalysisHandle"), _))
-      .Times(0);
-  EXPECT_CALL(CallbacksHandle,
-              runAfterAnalysis(HasNameRegex("MockAnalysisHandle"), _))
-      .Times(0);
-
-  StringRef PipelineText = "test-transform";
-  ASSERT_THAT_ERROR(PB.parsePassPipeline(PM, PipelineText), Succeeded())
-      << "Pipeline was: " << PipelineText;
-  PM.run(*M, AM);
-}
-
-TEST_F(LoopCallbacksTest, Passes) {
-  EXPECT_CALL(AnalysisHandle, run(HasName("loop"), _, _));
-  EXPECT_CALL(PassHandle, run(HasName("loop"), _, _, _))
-      .WillOnce(WithArgs<0, 1, 2>(&getAnalysisResult));
-  EXPECT_CALL(ExtraPassHandle, run(HasName("loop"), _, _, _));
-
-  StringRef PipelineText = "test-transform";
-  ASSERT_THAT_ERROR(PB.parsePassPipeline(PM, PipelineText), Succeeded())
-      << "Pipeline was: " << PipelineText;
-  PM.run(*M, AM);
-}
-
-TEST_F(LoopCallbacksTest, InstrumentedPasses) {
-  CallbacksHandle.registerPassInstrumentation();
-  // Non-mock instrumentation not specifically mentioned below can be ignored.
-  CallbacksHandle.ignoreNonMockPassInstrumentation("<string>");
-  CallbacksHandle.ignoreNonMockPassInstrumentation("foo");
-  CallbacksHandle.ignoreNonMockPassInstrumentation("loop");
-
-  EXPECT_CALL(AnalysisHandle, run(HasName("loop"), _, _));
-  EXPECT_CALL(PassHandle, run(HasName("loop"), _, _, _))
-      .WillOnce(WithArgs<0, 1, 2>(&getAnalysisResult));
-  EXPECT_CALL(ExtraPassHandle, run(HasName("loop"), _, _, _));
-
-  // PassInstrumentation calls should happen in-sequence, in the same order
-  // as passes/analyses are scheduled.
-  ::testing::Sequence PISequence;
-  EXPECT_CALL(CallbacksHandle,
-              runBeforePass(HasNameRegex("MockPassHandle"), HasName("loop")))
-      .InSequence(PISequence);
-  EXPECT_CALL(
-      CallbacksHandle,
-      runBeforeNonSkippedPass(HasNameRegex("MockPassHandle"), HasName("loop")))
-      .InSequence(PISequence);
-  EXPECT_CALL(
-      CallbacksHandle,
-      runBeforeAnalysis(HasNameRegex("MockAnalysisHandle"), HasName("loop")))
-      .InSequence(PISequence);
-  EXPECT_CALL(
-      CallbacksHandle,
-      runAfterAnalysis(HasNameRegex("MockAnalysisHandle"), HasName("loop")))
-      .InSequence(PISequence);
-  EXPECT_CALL(CallbacksHandle,
-              runAfterPass(HasNameRegex("MockPassHandle"), HasName("loop"), _))
-      .InSequence(PISequence);
-
-  EXPECT_CALL(CallbacksHandle,
-              runBeforePass(HasNameRegex("MockPassHandle<.*LoopNest>"),
-                            HasName("loop")))
-      .InSequence(PISequence);
-  EXPECT_CALL(CallbacksHandle,
-              runBeforeNonSkippedPass(
-                  HasNameRegex("MockPassHandle<.*LoopNest>"), HasName("loop")))
-      .InSequence(PISequence);
-  EXPECT_CALL(CallbacksHandle,
-              runAfterPass(HasNameRegex("MockPassHandle<.*LoopNest>"),
-                           HasName("loop"), _))
-      .InSequence(PISequence);
-
-  // Our mock pass does not invalidate IR.
-  EXPECT_CALL(CallbacksHandle,
-              runAfterPassInvalidated(HasNameRegex("MockPassHandle"), _))
-      .Times(0);
-
-  // No passes are skipped, so there should be no calls to
-  // runBeforeSkippedPass().
-  EXPECT_CALL(
-      CallbacksHandle,
-      runBeforeSkippedPass(HasNameRegex("MockPassHandle"), HasName("loop")))
-      .Times(0);
-
-  StringRef PipelineText = "test-transform";
-  ASSERT_THAT_ERROR(PB.parsePassPipeline(PM, PipelineText), Succeeded())
-      << "Pipeline was: " << PipelineText;
-  PM.run(*M, AM);
-}
-
-TEST_F(LoopCallbacksTest, InstrumentedInvalidatingPasses) {
-  CallbacksHandle.registerPassInstrumentation();
-  // Non-mock instrumentation not specifically mentioned below can be ignored.
-  CallbacksHandle.ignoreNonMockPassInstrumentation("<string>");
-  CallbacksHandle.ignoreNonMockPassInstrumentation("foo");
-  CallbacksHandle.ignoreNonMockPassInstrumentation("loop");
-
-  EXPECT_CALL(AnalysisHandle, run(HasName("loop"), _, _));
-  EXPECT_CALL(PassHandle, run(HasName("loop"), _, _, _))
-      .WillOnce(DoAll(WithArgs<0, 1, 2, 3>(&PassHandle.invalidateLoop),
-                      WithArgs<0, 1, 2>(&getAnalysisResult)));
-
-  // PassInstrumentation calls should happen in-sequence, in the same order
-  // as passes/analyses are scheduled.
-  ::testing::Sequence PISequence;
-  EXPECT_CALL(CallbacksHandle,
-              runBeforePass(HasNameRegex("MockPassHandle"), HasName("loop")))
-      .InSequence(PISequence);
-  EXPECT_CALL(
-      CallbacksHandle,
-      runBeforeNonSkippedPass(HasNameRegex("MockPassHandle"), HasName("loop")))
-      .InSequence(PISequence);
-  EXPECT_CALL(
-      CallbacksHandle,
-      runBeforeAnalysis(HasNameRegex("MockAnalysisHandle"), HasName("loop")))
-      .InSequence(PISequence);
-  EXPECT_CALL(
-      CallbacksHandle,
-      runAfterAnalysis(HasNameRegex("MockAnalysisHandle"), HasName("loop")))
-      .InSequence(PISequence);
-  EXPECT_CALL(CallbacksHandle,
-              runAfterPassInvalidated(HasNameRegex("MockPassHandle"), _))
-      .InSequence(PISequence);
-  EXPECT_CALL(CallbacksHandle,
-              runAfterPassInvalidated(HasNameRegex("^PassManager"), _))
-      .InSequence(PISequence);
-
-  // Our mock pass invalidates IR, thus normal runAfterPass is never called.
-  EXPECT_CALL(CallbacksHandle,
-              runAfterPass(HasNameRegex("MockPassHandle"), HasName("loop"), _))
-      .Times(0);
-
-  StringRef PipelineText = "test-transform";
-  ASSERT_THAT_ERROR(PB.parsePassPipeline(PM, PipelineText), Succeeded())
-      << "Pipeline was: " << PipelineText;
-  PM.run(*M, AM);
-}
-
-TEST_F(LoopCallbacksTest, InstrumentedInvalidatingLoopNestPasses) {
-  CallbacksHandle.registerPassInstrumentation();
-  // Non-mock instrumentation not specifically mentioned below can be ignored.
-  CallbacksHandle.ignoreNonMockPassInstrumentation("<string>");
-  CallbacksHandle.ignoreNonMockPassInstrumentation("foo");
-  CallbacksHandle.ignoreNonMockPassInstrumentation("loop");
-
-  EXPECT_CALL(AnalysisHandle, run(HasName("loop"), _, _));
-  EXPECT_CALL(PassHandle, run(HasName("loop"), _, _, _))
-      .WillOnce(WithArgs<0, 1, 2>(&getAnalysisResult));
-  EXPECT_CALL(ExtraPassHandle, run(HasName("loop"), _, _, _))
-      .WillOnce(DoAll(&ExtraPassHandle.invalidateLoopNest,
-                      [&](LoopNest &, LoopAnalysisManager &,
-                          LoopStandardAnalysisResults &,
-                          LPMUpdater &) { return PreservedAnalyses::all(); }));
-
-  // PassInstrumentation calls should happen in-sequence, in the same order
-  // as passes/analyses are scheduled.
-  ::testing::Sequence PISequence;
-  EXPECT_CALL(CallbacksHandle,
-              runBeforePass(HasNameRegex("MockPassHandle"), HasName("loop")))
-      .InSequence(PISequence);
-  EXPECT_CALL(
-      CallbacksHandle,
-      runBeforeNonSkippedPass(HasNameRegex("MockPassHandle"), HasName("loop")))
-      .InSequence(PISequence);
-  EXPECT_CALL(
-      CallbacksHandle,
-      runBeforeAnalysis(HasNameRegex("MockAnalysisHandle"), HasName("loop")))
-      .InSequence(PISequence);
-  EXPECT_CALL(
-      CallbacksHandle,
-      runAfterAnalysis(HasNameRegex("MockAnalysisHandle"), HasName("loop")))
-      .InSequence(PISequence);
-  EXPECT_CALL(CallbacksHandle,
-              runAfterPass(HasNameRegex("MockPassHandle"), HasName("loop"), _))
-      .InSequence(PISequence);
-
-  EXPECT_CALL(CallbacksHandle,
-              runBeforePass(HasNameRegex("MockPassHandle<.*LoopNest>"),
-                            HasName("loop")))
-      .InSequence(PISequence);
-  EXPECT_CALL(CallbacksHandle,
-              runBeforeNonSkippedPass(
-                  HasNameRegex("MockPassHandle<.*LoopNest>"), HasName("loop")))
-      .InSequence(PISequence);
-  EXPECT_CALL(
-      CallbacksHandle,
-      runAfterPassInvalidated(HasNameRegex("MockPassHandle<.*LoopNest>"), _))
-      .InSequence(PISequence);
-
-  EXPECT_CALL(CallbacksHandle,
-              runAfterPassInvalidated(HasNameRegex("^PassManager"), _))
-      .InSequence(PISequence);
-
-  // Our mock pass invalidates IR, thus normal runAfterPass is never called.
-  EXPECT_CALL(CallbacksHandle, runAfterPassInvalidated(
-                                   HasNameRegex("MockPassHandle<.*Loop>"), _))
-      .Times(0);
-  EXPECT_CALL(CallbacksHandle,
-              runAfterPass(HasNameRegex("MockPassHandle<.*LoopNest>"),
-                           HasName("loop"), _))
-      .Times(0);
-
-  StringRef PipelineText = "test-transform";
-  ASSERT_THAT_ERROR(PB.parsePassPipeline(PM, PipelineText), Succeeded())
-      << "Pipeline was: " << PipelineText;
-  PM.run(*M, AM);
-}
-
-TEST_F(LoopCallbacksTest, InstrumentedSkippedPasses) {
-  CallbacksHandle.registerPassInstrumentation();
-  // Non-mock instrumentation run here can safely be ignored.
-  CallbacksHandle.ignoreNonMockPassInstrumentation("<string>");
-  CallbacksHandle.ignoreNonMockPassInstrumentation("foo");
-  CallbacksHandle.ignoreNonMockPassInstrumentation("loop");
-
-  // Skip the pass by returning false.
-  EXPECT_CALL(
-      CallbacksHandle,
-      runBeforePass(HasNameRegex("MockPassHandle<.*Loop>"), HasName("loop")))
-      .WillOnce(Return(false));
-
-  EXPECT_CALL(CallbacksHandle,
-              runBeforeSkippedPass(HasNameRegex("MockPassHandle<.*Loop>"),
-                                   HasName("loop")))
-      .Times(1);
-
-  EXPECT_CALL(CallbacksHandle,
-              runBeforePass(HasNameRegex("MockPassHandle<.*LoopNest>"),
-                            HasName("loop")))
-      .WillOnce(Return(false));
-
-  EXPECT_CALL(CallbacksHandle,
-              runBeforeSkippedPass(HasNameRegex("MockPassHandle<.*LoopNest>"),
-                                   HasName("loop")))
-      .Times(1);
-
-  EXPECT_CALL(AnalysisHandle, run(HasName("loop"), _, _)).Times(0);
-  EXPECT_CALL(PassHandle, run(HasName("loop"), _, _, _)).Times(0);
-  EXPECT_CALL(ExtraPassHandle, run(HasName("loop"), _, _, _)).Times(0);
-
-  // As the pass is skipped there is no afterPass, beforeAnalysis/afterAnalysis
-  // as well.
-  EXPECT_CALL(CallbacksHandle, runBeforeNonSkippedPass(
-                                   HasNameRegex("MockPassHandle<.*Loop>"), _))
-      .Times(0);
-  EXPECT_CALL(CallbacksHandle,
-              runAfterPass(HasNameRegex("MockPassHandle<.*Loop>"), _, _))
-      .Times(0);
-  EXPECT_CALL(CallbacksHandle, runAfterPassInvalidated(
-                                   HasNameRegex("MockPassHandle<.*Loop>"), _))
-      .Times(0);
-  EXPECT_CALL(
-      CallbacksHandle,
-      runBeforeNonSkippedPass(HasNameRegex("MockPassHandle<.*LoopNest>"), _))
-      .Times(0);
-  EXPECT_CALL(CallbacksHandle,
-              runAfterPass(HasNameRegex("MockPassHandle<.*LoopNest>"), _, _))
-      .Times(0);
-  EXPECT_CALL(
-      CallbacksHandle,
-      runAfterPassInvalidated(HasNameRegex("MockPassHandle<.*LoopNest>"), _))
-      .Times(0);
-  EXPECT_CALL(CallbacksHandle,
-              runBeforeAnalysis(HasNameRegex("MockAnalysisHandle"), _))
-      .Times(0);
-  EXPECT_CALL(CallbacksHandle,
-              runAfterAnalysis(HasNameRegex("MockAnalysisHandle"), _))
-      .Times(0);
-
-  StringRef PipelineText = "test-transform";
-  ASSERT_THAT_ERROR(PB.parsePassPipeline(PM, PipelineText), Succeeded())
-      << "Pipeline was: " << PipelineText;
-  PM.run(*M, AM);
-}
-
-TEST_F(CGSCCCallbacksTest, Passes) {
-  EXPECT_CALL(AnalysisHandle, run(HasName("(foo)"), _, _));
-  EXPECT_CALL(PassHandle, run(HasName("(foo)"), _, _, _))
-      .WillOnce(WithArgs<0, 1, 2>(&getAnalysisResult));
-
-  StringRef PipelineText = "test-transform";
-  ASSERT_THAT_ERROR(PB.parsePassPipeline(PM, PipelineText), Succeeded())
-      << "Pipeline was: " << PipelineText;
-  PM.run(*M, AM);
-}
-
-TEST_F(CGSCCCallbacksTest, InstrumentedPasses) {
-  CallbacksHandle.registerPassInstrumentation();
-  // Non-mock instrumentation not specifically mentioned below can be ignored.
-  CallbacksHandle.ignoreNonMockPassInstrumentation("<string>");
-  CallbacksHandle.ignoreNonMockPassInstrumentation("foo");
-  CallbacksHandle.ignoreNonMockPassInstrumentation("(foo)");
-
-  EXPECT_CALL(AnalysisHandle, run(HasName("(foo)"), _, _));
-  EXPECT_CALL(PassHandle, run(HasName("(foo)"), _, _, _))
-      .WillOnce(WithArgs<0, 1, 2>(&getAnalysisResult));
-
-  // PassInstrumentation calls should happen in-sequence, in the same order
-  // as passes/analyses are scheduled.
-  ::testing::Sequence PISequence;
-  EXPECT_CALL(CallbacksHandle,
-              runBeforePass(HasNameRegex("MockPassHandle"), HasName("(foo)")))
-      .InSequence(PISequence);
-  EXPECT_CALL(
-      CallbacksHandle,
-      runBeforeNonSkippedPass(HasNameRegex("MockPassHandle"), HasName("(foo)")))
-      .InSequence(PISequence);
-  EXPECT_CALL(
-      CallbacksHandle,
-      runBeforeAnalysis(HasNameRegex("MockAnalysisHandle"), HasName("(foo)")))
-      .InSequence(PISequence);
-  EXPECT_CALL(
-      CallbacksHandle,
-      runAfterAnalysis(HasNameRegex("MockAnalysisHandle"), HasName("(foo)")))
-      .InSequence(PISequence);
-  EXPECT_CALL(CallbacksHandle,
-              runAfterPass(HasNameRegex("MockPassHandle"), HasName("(foo)"), _))
-      .InSequence(PISequence);
-
-  // Our mock pass does not invalidate IR.
-  EXPECT_CALL(CallbacksHandle,
-              runAfterPassInvalidated(HasNameRegex("MockPassHandle"), _))
-      .Times(0);
-
-  // No passes are skipped, so there should be no calls to
-  // runBeforeSkippedPass().
-  EXPECT_CALL(
-      CallbacksHandle,
-      runBeforeSkippedPass(HasNameRegex("MockPassHandle"), HasName("(foo)")))
-      .Times(0);
-
-  StringRef PipelineText = "test-transform";
-  ASSERT_THAT_ERROR(PB.parsePassPipeline(PM, PipelineText), Succeeded())
-      << "Pipeline was: " << PipelineText;
-  PM.run(*M, AM);
-}
-
-TEST_F(CGSCCCallbacksTest, InstrumentedInvalidatingPasses) {
-  CallbacksHandle.registerPassInstrumentation();
-  // Non-mock instrumentation not specifically mentioned below can be ignored.
-  CallbacksHandle.ignoreNonMockPassInstrumentation("<string>");
-  CallbacksHandle.ignoreNonMockPassInstrumentation("foo");
-  CallbacksHandle.ignoreNonMockPassInstrumentation("(foo)");
-
-  EXPECT_CALL(AnalysisHandle, run(HasName("(foo)"), _, _));
-  EXPECT_CALL(PassHandle, run(HasName("(foo)"), _, _, _))
-      .WillOnce(DoAll(WithArgs<0, 1, 2, 3>(&PassHandle.invalidateSCC),
-                      WithArgs<0, 1, 2>(&getAnalysisResult)));
-
-  // PassInstrumentation calls should happen in-sequence, in the same order
-  // as passes/analyses are scheduled.
-  ::testing::Sequence PISequence;
-  EXPECT_CALL(CallbacksHandle,
-              runBeforePass(HasNameRegex("MockPassHandle"), HasName("(foo)")))
-      .InSequence(PISequence);
-  EXPECT_CALL(
-      CallbacksHandle,
-      runBeforeNonSkippedPass(HasNameRegex("MockPassHandle"), HasName("(foo)")))
-      .InSequence(PISequence);
-  EXPECT_CALL(
-      CallbacksHandle,
-      runBeforeAnalysis(HasNameRegex("MockAnalysisHandle"), HasName("(foo)")))
-      .InSequence(PISequence);
-  EXPECT_CALL(
-      CallbacksHandle,
-      runAfterAnalysis(HasNameRegex("MockAnalysisHandle"), HasName("(foo)")))
-      .InSequence(PISequence);
-  EXPECT_CALL(CallbacksHandle,
-              runAfterPassInvalidated(HasNameRegex("MockPassHandle"), _))
-      .InSequence(PISequence);
-  EXPECT_CALL(CallbacksHandle,
-              runAfterPassInvalidated(HasNameRegex("^PassManager"), _))
-      .InSequence(PISequence);
-
-  // Our mock pass does invalidate IR, thus normal runAfterPass is never called.
-  EXPECT_CALL(CallbacksHandle,
-              runAfterPass(HasNameRegex("MockPassHandle"), HasName("(foo)"), _))
-      .Times(0);
-
-  StringRef PipelineText = "test-transform";
-  ASSERT_THAT_ERROR(PB.parsePassPipeline(PM, PipelineText), Succeeded())
-      << "Pipeline was: " << PipelineText;
-  PM.run(*M, AM);
-}
-
-TEST_F(CGSCCCallbacksTest, InstrumentedSkippedPasses) {
-  CallbacksHandle.registerPassInstrumentation();
-  // Non-mock instrumentation run here can safely be ignored.
-  CallbacksHandle.ignoreNonMockPassInstrumentation("<string>");
-  CallbacksHandle.ignoreNonMockPassInstrumentation("foo");
-  CallbacksHandle.ignoreNonMockPassInstrumentation("(foo)");
-
-  // Skip the pass by returning false.
-  EXPECT_CALL(CallbacksHandle,
-              runBeforePass(HasNameRegex("MockPassHandle"), HasName("(foo)")))
-      .WillOnce(Return(false));
-
-  EXPECT_CALL(
-      CallbacksHandle,
-      runBeforeSkippedPass(HasNameRegex("MockPassHandle"), HasName("(foo)")))
-      .Times(1);
-
-  // neither Analysis nor Pass are called.
-  EXPECT_CALL(AnalysisHandle, run(HasName("(foo)"), _, _)).Times(0);
-  EXPECT_CALL(PassHandle, run(HasName("(foo)"), _, _, _)).Times(0);
-
-  // As the pass is skipped there is no afterPass, beforeAnalysis/afterAnalysis
-  // as well.
-  EXPECT_CALL(CallbacksHandle,
-              runBeforeNonSkippedPass(HasNameRegex("MockPassHandle"), _))
-      .Times(0);
-  EXPECT_CALL(CallbacksHandle,
-              runAfterPass(HasNameRegex("MockPassHandle"), _, _))
-      .Times(0);
-  EXPECT_CALL(CallbacksHandle,
-              runAfterPassInvalidated(HasNameRegex("MockPassHandle"), _))
-      .Times(0);
-  EXPECT_CALL(CallbacksHandle,
-              runBeforeAnalysis(HasNameRegex("MockAnalysisHandle"), _))
-      .Times(0);
-  EXPECT_CALL(CallbacksHandle,
-              runAfterAnalysis(HasNameRegex("MockAnalysisHandle"), _))
-      .Times(0);
-
-  StringRef PipelineText = "test-transform";
-  ASSERT_THAT_ERROR(PB.parsePassPipeline(PM, PipelineText), Succeeded())
-      << "Pipeline was: " << PipelineText;
-  PM.run(*M, AM);
-}
-
-/// Test parsing of the names of analysis utilities for our mock analysis
-/// for all IRUnits.
-///
-/// We first require<>, then invalidate<> it, expecting the analysis to be run
-/// once and subsequently invalidated.
-TEST_F(ModuleCallbacksTest, AnalysisUtilities) {
-  EXPECT_CALL(AnalysisHandle, run(HasName("<string>"), _));
-  EXPECT_CALL(AnalysisHandle, invalidate(HasName("<string>"), _, _));
-
-  StringRef PipelineText = "require<test-analysis>,invalidate<test-analysis>";
-  ASSERT_THAT_ERROR(PB.parsePassPipeline(PM, PipelineText), Succeeded())
-      << "Pipeline was: " << PipelineText;
-  PM.run(*M, AM);
-}
-
-TEST_F(CGSCCCallbacksTest, PassUtilities) {
-  EXPECT_CALL(AnalysisHandle, run(HasName("(foo)"), _, _));
-  EXPECT_CALL(AnalysisHandle, invalidate(HasName("(foo)"), _, _));
-
-  StringRef PipelineText = "require<test-analysis>,invalidate<test-analysis>";
-  ASSERT_THAT_ERROR(PB.parsePassPipeline(PM, PipelineText), Succeeded())
-      << "Pipeline was: " << PipelineText;
-  PM.run(*M, AM);
-}
-
-TEST_F(FunctionCallbacksTest, AnalysisUtilities) {
-  EXPECT_CALL(AnalysisHandle, run(HasName("foo"), _));
-  EXPECT_CALL(AnalysisHandle, invalidate(HasName("foo"), _, _));
-
-  StringRef PipelineText = "require<test-analysis>,invalidate<test-analysis>";
-  ASSERT_THAT_ERROR(PB.parsePassPipeline(PM, PipelineText), Succeeded())
-      << "Pipeline was: " << PipelineText;
-  PM.run(*M, AM);
-}
-
-TEST_F(LoopCallbacksTest, PassUtilities) {
-  EXPECT_CALL(AnalysisHandle, run(HasName("loop"), _, _));
-  EXPECT_CALL(AnalysisHandle, invalidate(HasName("loop"), _, _));
-
-  StringRef PipelineText = "require<test-analysis>,invalidate<test-analysis>";
-
-  ASSERT_THAT_ERROR(PB.parsePassPipeline(PM, PipelineText), Succeeded())
-      << "Pipeline was: " << PipelineText;
-  PM.run(*M, AM);
-}
-
-/// Test parsing of the top-level pipeline.
-///
-/// The ParseTopLevelPipeline callback takes over parsing of the entire pipeline
-/// from PassBuilder if it encounters an unknown pipeline entry at the top level
-/// (i.e., the first entry on the pipeline).
-/// This test parses a pipeline named 'another-pipeline', whose only elements
-/// may be the test-transform pass or the analysis utilities
-TEST_F(ModuleCallbacksTest, ParseTopLevelPipeline) {
-  PB.registerParseTopLevelPipelineCallback(
-      [this](ModulePassManager &MPM,
-             ArrayRef<PassBuilder::PipelineElement> Pipeline) {
-        auto &FirstName = Pipeline.front().Name;
-        auto &InnerPipeline = Pipeline.front().InnerPipeline;
-        if (FirstName == "another-pipeline") {
-          for (auto &E : InnerPipeline) {
-            if (parseAnalysisUtilityPasses<AnalysisT>("test-analysis", E.Name,
-                                                      PM))
-              continue;
-
-            if (E.Name == "test-transform") {
-              PM.addPass(PassHandle.getPass());
-              continue;
-            }
-            return false;
-          }
-        }
-        return true;
-      });
-
-  EXPECT_CALL(AnalysisHandle, run(HasName("<string>"), _));
-  EXPECT_CALL(PassHandle, run(HasName("<string>"), _))
-      .WillOnce(&getAnalysisResult);
-  EXPECT_CALL(AnalysisHandle, invalidate(HasName("<string>"), _, _));
-
-  StringRef PipelineText =
-      "another-pipeline(test-transform,invalidate<test-analysis>)";
-  ASSERT_THAT_ERROR(PB.parsePassPipeline(PM, PipelineText), Succeeded())
-      << "Pipeline was: " << PipelineText;
-  PM.run(*M, AM);
-
-  /// Test the negative case
-  PipelineText = "another-pipeline(instcombine)";
-  ASSERT_THAT_ERROR(PB.parsePassPipeline(PM, PipelineText), Failed())
-      << "Pipeline was: " << PipelineText;
-}
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/IR/PassManagerTest.cpp b/gnu/llvm/llvm/unittests/IR/PassManagerTest.cpp
deleted file mode 100644
index 98f516f7bb3..00000000000
--- a/gnu/llvm/llvm/unittests/IR/PassManagerTest.cpp
+++ /dev/null
@@ -1,953 +0,0 @@
-//===- llvm/unittest/IR/PassManager.cpp - PassManager tests ---------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/IR/PassManager.h"
-#include "llvm/Analysis/AssumptionCache.h"
-#include "llvm/Analysis/TargetTransformInfo.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Dominators.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/PassManagerImpl.h"
-#include "llvm/Passes/StandardInstrumentations.h"
-#include "llvm/Support/SourceMgr.h"
-#include "llvm/Transforms/Scalar/SimplifyCFG.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-class TestFunctionAnalysis : public AnalysisInfoMixin<TestFunctionAnalysis> {
-public:
-  struct Result {
-    Result(int Count) : InstructionCount(Count) {}
-    int InstructionCount;
-    bool invalidate(Function &, const PreservedAnalyses &PA,
-                    FunctionAnalysisManager::Invalidator &) {
-      // Check whether the analysis or all analyses on functions have been
-      // preserved.
-      auto PAC = PA.getChecker<TestFunctionAnalysis>();
-      return !(PAC.preserved() || PAC.preservedSet<AllAnalysesOn<Function>>());
-    }
-  };
-
-  TestFunctionAnalysis(int &Runs) : Runs(Runs) {}
-
-  /// Run the analysis pass over the function and return a result.
-  Result run(Function &F, FunctionAnalysisManager &AM) {
-    ++Runs;
-    int Count = 0;
-    for (Function::iterator BBI = F.begin(), BBE = F.end(); BBI != BBE; ++BBI)
-      for (BasicBlock::iterator II = BBI->begin(), IE = BBI->end(); II != IE;
-           ++II)
-        ++Count;
-    return Result(Count);
-  }
-
-private:
-  friend AnalysisInfoMixin<TestFunctionAnalysis>;
-  static AnalysisKey Key;
-
-  int &Runs;
-};
-
-AnalysisKey TestFunctionAnalysis::Key;
-
-class TestModuleAnalysis : public AnalysisInfoMixin<TestModuleAnalysis> {
-public:
-  struct Result {
-    Result(int Count) : FunctionCount(Count) {}
-    int FunctionCount;
-    bool invalidate(Module &, const PreservedAnalyses &PA,
-                    ModuleAnalysisManager::Invalidator &) {
-      // Check whether the analysis or all analyses on modules have been
-      // preserved.
-      auto PAC = PA.getChecker<TestModuleAnalysis>();
-      return !(PAC.preserved() || PAC.preservedSet<AllAnalysesOn<Module>>());
-    }
-  };
-
-  TestModuleAnalysis(int &Runs) : Runs(Runs) {}
-
-  Result run(Module &M, ModuleAnalysisManager &AM) {
-    ++Runs;
-    int Count = 0;
-    for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I)
-      ++Count;
-    return Result(Count);
-  }
-
-private:
-  friend AnalysisInfoMixin<TestModuleAnalysis>;
-  static AnalysisKey Key;
-
-  int &Runs;
-};
-
-AnalysisKey TestModuleAnalysis::Key;
-
-struct TestModulePass : PassInfoMixin<TestModulePass> {
-  TestModulePass(int &RunCount) : RunCount(RunCount) {}
-
-  PreservedAnalyses run(Module &M, ModuleAnalysisManager &) {
-    ++RunCount;
-    return PreservedAnalyses::none();
-  }
-
-  int &RunCount;
-};
-
-struct TestPreservingModulePass : PassInfoMixin<TestPreservingModulePass> {
-  PreservedAnalyses run(Module &M, ModuleAnalysisManager &) {
-    return PreservedAnalyses::all();
-  }
-};
-
-struct TestFunctionPass : PassInfoMixin<TestFunctionPass> {
-  TestFunctionPass(int &RunCount, int &AnalyzedInstrCount,
-                   int &AnalyzedFunctionCount, ModuleAnalysisManager &MAM,
-                   bool OnlyUseCachedResults = false)
-      : RunCount(RunCount), AnalyzedInstrCount(AnalyzedInstrCount),
-        AnalyzedFunctionCount(AnalyzedFunctionCount), MAM(MAM),
-        OnlyUseCachedResults(OnlyUseCachedResults) {}
-
-  PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM) {
-    ++RunCount;
-
-    // Getting a cached result that isn't stateless through the proxy will
-    // trigger an assert:
-    // auto &ModuleProxy = AM.getResult<ModuleAnalysisManagerFunctionProxy>(F);
-    // Use MAM, for the purposes of this unittest.
-    if (TestModuleAnalysis::Result *TMA =
-            MAM.getCachedResult<TestModuleAnalysis>(*F.getParent())) {
-      AnalyzedFunctionCount += TMA->FunctionCount;
-    }
-
-    if (OnlyUseCachedResults) {
-      // Hack to force the use of the cached interface.
-      if (TestFunctionAnalysis::Result *AR =
-              AM.getCachedResult<TestFunctionAnalysis>(F))
-        AnalyzedInstrCount += AR->InstructionCount;
-    } else {
-      // Typical path just runs the analysis as needed.
-      TestFunctionAnalysis::Result &AR = AM.getResult<TestFunctionAnalysis>(F);
-      AnalyzedInstrCount += AR.InstructionCount;
-    }
-
-    return PreservedAnalyses::all();
-  }
-
-  int &RunCount;
-  int &AnalyzedInstrCount;
-  int &AnalyzedFunctionCount;
-  ModuleAnalysisManager &MAM;
-  bool OnlyUseCachedResults;
-};
-
-// A test function pass that invalidates all function analyses for a function
-// with a specific name.
-struct TestInvalidationFunctionPass
-    : PassInfoMixin<TestInvalidationFunctionPass> {
-  TestInvalidationFunctionPass(StringRef FunctionName) : Name(FunctionName) {}
-
-  PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM) {
-    return F.getName() == Name ? PreservedAnalyses::none()
-                               : PreservedAnalyses::all();
-  }
-
-  StringRef Name;
-};
-
-std::unique_ptr<Module> parseIR(LLVMContext &Context, const char *IR) {
-  SMDiagnostic Err;
-  return parseAssemblyString(IR, Err, Context);
-}
-
-class PassManagerTest : public ::testing::Test {
-protected:
-  LLVMContext Context;
-  std::unique_ptr<Module> M;
-
-public:
-  PassManagerTest()
-      : M(parseIR(Context, "define void @f() {\n"
-                           "entry:\n"
-                           "  call void @g()\n"
-                           "  call void @h()\n"
-                           "  ret void\n"
-                           "}\n"
-                           "define void @g() {\n"
-                           "  ret void\n"
-                           "}\n"
-                           "define void @h() {\n"
-                           "  ret void\n"
-                           "}\n")) {}
-};
-
-TEST(PreservedAnalysesTest, Basic) {
-  PreservedAnalyses PA1 = PreservedAnalyses();
-  {
-    auto PAC = PA1.getChecker<TestFunctionAnalysis>();
-    EXPECT_FALSE(PAC.preserved());
-    EXPECT_FALSE(PAC.preservedSet<AllAnalysesOn<Function>>());
-  }
-  {
-    auto PAC = PA1.getChecker<TestModuleAnalysis>();
-    EXPECT_FALSE(PAC.preserved());
-    EXPECT_FALSE(PAC.preservedSet<AllAnalysesOn<Module>>());
-  }
-  auto PA2 = PreservedAnalyses::none();
-  {
-    auto PAC = PA2.getChecker<TestFunctionAnalysis>();
-    EXPECT_FALSE(PAC.preserved());
-    EXPECT_FALSE(PAC.preservedSet<AllAnalysesOn<Function>>());
-  }
-  auto PA3 = PreservedAnalyses::all();
-  {
-    auto PAC = PA3.getChecker<TestFunctionAnalysis>();
-    EXPECT_TRUE(PAC.preserved());
-    EXPECT_TRUE(PAC.preservedSet<AllAnalysesOn<Function>>());
-  }
-  PreservedAnalyses PA4 = PA1;
-  {
-    auto PAC = PA4.getChecker<TestFunctionAnalysis>();
-    EXPECT_FALSE(PAC.preserved());
-    EXPECT_FALSE(PAC.preservedSet<AllAnalysesOn<Function>>());
-  }
-  PA4 = PA3;
-  {
-    auto PAC = PA4.getChecker<TestFunctionAnalysis>();
-    EXPECT_TRUE(PAC.preserved());
-    EXPECT_TRUE(PAC.preservedSet<AllAnalysesOn<Function>>());
-  }
-  PA4 = std::move(PA2);
-  {
-    auto PAC = PA4.getChecker<TestFunctionAnalysis>();
-    EXPECT_FALSE(PAC.preserved());
-    EXPECT_FALSE(PAC.preservedSet<AllAnalysesOn<Function>>());
-  }
-  auto PA5 = PreservedAnalyses::allInSet<AllAnalysesOn<Function>>();
-  {
-    auto PAC = PA5.getChecker<TestFunctionAnalysis>();
-    EXPECT_FALSE(PAC.preserved());
-    EXPECT_TRUE(PAC.preservedSet<AllAnalysesOn<Function>>());
-    EXPECT_FALSE(PAC.preservedSet<AllAnalysesOn<Module>>());
-  }
-}
-
-TEST(PreservedAnalysesTest, Preserve) {
-  auto PA = PreservedAnalyses::none();
-  PA.preserve<TestFunctionAnalysis>();
-  EXPECT_TRUE(PA.getChecker<TestFunctionAnalysis>().preserved());
-  EXPECT_FALSE(PA.getChecker<TestModuleAnalysis>().preserved());
-  PA.preserve<TestModuleAnalysis>();
-  EXPECT_TRUE(PA.getChecker<TestFunctionAnalysis>().preserved());
-  EXPECT_TRUE(PA.getChecker<TestModuleAnalysis>().preserved());
-
-  // Redundant calls are fine.
-  PA.preserve<TestFunctionAnalysis>();
-  EXPECT_TRUE(PA.getChecker<TestFunctionAnalysis>().preserved());
-  EXPECT_TRUE(PA.getChecker<TestModuleAnalysis>().preserved());
-}
-
-TEST(PreservedAnalysesTest, PreserveSets) {
-  auto PA = PreservedAnalyses::none();
-  PA.preserveSet<AllAnalysesOn<Function>>();
-  EXPECT_TRUE(PA.getChecker<TestFunctionAnalysis>()
-                  .preservedSet<AllAnalysesOn<Function>>());
-  EXPECT_FALSE(PA.getChecker<TestModuleAnalysis>()
-                   .preservedSet<AllAnalysesOn<Module>>());
-  PA.preserveSet<AllAnalysesOn<Module>>();
-  EXPECT_TRUE(PA.getChecker<TestFunctionAnalysis>()
-                  .preservedSet<AllAnalysesOn<Function>>());
-  EXPECT_TRUE(PA.getChecker<TestModuleAnalysis>()
-                  .preservedSet<AllAnalysesOn<Module>>());
-
-  // Mixing is fine.
-  PA.preserve<TestFunctionAnalysis>();
-  EXPECT_TRUE(PA.getChecker<TestFunctionAnalysis>()
-                  .preservedSet<AllAnalysesOn<Function>>());
-  EXPECT_TRUE(PA.getChecker<TestModuleAnalysis>()
-                  .preservedSet<AllAnalysesOn<Module>>());
-
-  // Redundant calls are fine.
-  PA.preserveSet<AllAnalysesOn<Module>>();
-  EXPECT_TRUE(PA.getChecker<TestFunctionAnalysis>()
-                  .preservedSet<AllAnalysesOn<Function>>());
-  EXPECT_TRUE(PA.getChecker<TestModuleAnalysis>()
-                  .preservedSet<AllAnalysesOn<Module>>());
-}
-
-TEST(PreservedAnalysisTest, Intersect) {
-  // Setup the initial sets.
-  auto PA1 = PreservedAnalyses::none();
-  PA1.preserve<TestFunctionAnalysis>();
-  PA1.preserveSet<AllAnalysesOn<Module>>();
-  auto PA2 = PreservedAnalyses::none();
-  PA2.preserve<TestFunctionAnalysis>();
-  PA2.preserveSet<AllAnalysesOn<Function>>();
-  PA2.preserve<TestModuleAnalysis>();
-  PA2.preserveSet<AllAnalysesOn<Module>>();
-  auto PA3 = PreservedAnalyses::none();
-  PA3.preserve<TestModuleAnalysis>();
-  PA3.preserveSet<AllAnalysesOn<Function>>();
-
-  // Self intersection is a no-op.
-  auto Intersected = PA1;
-  Intersected.intersect(PA1);
-  EXPECT_TRUE(Intersected.getChecker<TestFunctionAnalysis>().preserved());
-  EXPECT_FALSE(Intersected.getChecker<TestFunctionAnalysis>()
-                   .preservedSet<AllAnalysesOn<Function>>());
-  EXPECT_FALSE(Intersected.getChecker<TestModuleAnalysis>().preserved());
-  EXPECT_TRUE(Intersected.getChecker<TestModuleAnalysis>()
-                  .preservedSet<AllAnalysesOn<Module>>());
-
-  // Intersecting with all is a no-op.
-  Intersected.intersect(PreservedAnalyses::all());
-  EXPECT_TRUE(Intersected.getChecker<TestFunctionAnalysis>().preserved());
-  EXPECT_FALSE(Intersected.getChecker<TestFunctionAnalysis>()
-                   .preservedSet<AllAnalysesOn<Function>>());
-  EXPECT_FALSE(Intersected.getChecker<TestModuleAnalysis>().preserved());
-  EXPECT_TRUE(Intersected.getChecker<TestModuleAnalysis>()
-                  .preservedSet<AllAnalysesOn<Module>>());
-
-  // Intersecting a narrow set with a more broad set is the narrow set.
-  Intersected.intersect(PA2);
-  EXPECT_TRUE(Intersected.getChecker<TestFunctionAnalysis>().preserved());
-  EXPECT_FALSE(Intersected.getChecker<TestFunctionAnalysis>()
-                   .preservedSet<AllAnalysesOn<Function>>());
-  EXPECT_FALSE(Intersected.getChecker<TestModuleAnalysis>().preserved());
-  EXPECT_TRUE(Intersected.getChecker<TestModuleAnalysis>()
-                  .preservedSet<AllAnalysesOn<Module>>());
-
-  // Intersecting a broad set with a more narrow set is the narrow set.
-  Intersected = PA2;
-  Intersected.intersect(PA1);
-  EXPECT_TRUE(Intersected.getChecker<TestFunctionAnalysis>().preserved());
-  EXPECT_FALSE(Intersected.getChecker<TestFunctionAnalysis>()
-                   .preservedSet<AllAnalysesOn<Function>>());
-  EXPECT_FALSE(Intersected.getChecker<TestModuleAnalysis>().preserved());
-  EXPECT_TRUE(Intersected.getChecker<TestModuleAnalysis>()
-                  .preservedSet<AllAnalysesOn<Module>>());
-
-  // Intersecting with empty clears.
-  Intersected.intersect(PreservedAnalyses::none());
-  EXPECT_FALSE(Intersected.getChecker<TestFunctionAnalysis>().preserved());
-  EXPECT_FALSE(Intersected.getChecker<TestFunctionAnalysis>()
-                   .preservedSet<AllAnalysesOn<Function>>());
-  EXPECT_FALSE(Intersected.getChecker<TestModuleAnalysis>().preserved());
-  EXPECT_FALSE(Intersected.getChecker<TestModuleAnalysis>()
-                   .preservedSet<AllAnalysesOn<Module>>());
-
-  // Intersecting non-overlapping clears.
-  Intersected = PA1;
-  Intersected.intersect(PA3);
-  EXPECT_FALSE(Intersected.getChecker<TestFunctionAnalysis>().preserved());
-  EXPECT_FALSE(Intersected.getChecker<TestFunctionAnalysis>()
-                   .preservedSet<AllAnalysesOn<Function>>());
-  EXPECT_FALSE(Intersected.getChecker<TestModuleAnalysis>().preserved());
-  EXPECT_FALSE(Intersected.getChecker<TestModuleAnalysis>()
-                   .preservedSet<AllAnalysesOn<Module>>());
-
-  // Intersecting with moves works in when there is storage on both sides.
-  Intersected = PA1;
-  auto Tmp = PA2;
-  Intersected.intersect(std::move(Tmp));
-  EXPECT_TRUE(Intersected.getChecker<TestFunctionAnalysis>().preserved());
-  EXPECT_FALSE(Intersected.getChecker<TestFunctionAnalysis>()
-                   .preservedSet<AllAnalysesOn<Function>>());
-  EXPECT_FALSE(Intersected.getChecker<TestModuleAnalysis>().preserved());
-  EXPECT_TRUE(Intersected.getChecker<TestModuleAnalysis>()
-                  .preservedSet<AllAnalysesOn<Module>>());
-
-  // Intersecting with move works for incoming all and existing all.
-  auto Tmp2 = PreservedAnalyses::all();
-  Intersected.intersect(std::move(Tmp2));
-  EXPECT_TRUE(Intersected.getChecker<TestFunctionAnalysis>().preserved());
-  EXPECT_FALSE(Intersected.getChecker<TestFunctionAnalysis>()
-                   .preservedSet<AllAnalysesOn<Function>>());
-  EXPECT_FALSE(Intersected.getChecker<TestModuleAnalysis>().preserved());
-  EXPECT_TRUE(Intersected.getChecker<TestModuleAnalysis>()
-                  .preservedSet<AllAnalysesOn<Module>>());
-  Intersected = PreservedAnalyses::all();
-  auto Tmp3 = PA1;
-  Intersected.intersect(std::move(Tmp3));
-  EXPECT_TRUE(Intersected.getChecker<TestFunctionAnalysis>().preserved());
-  EXPECT_FALSE(Intersected.getChecker<TestFunctionAnalysis>()
-                   .preservedSet<AllAnalysesOn<Function>>());
-  EXPECT_FALSE(Intersected.getChecker<TestModuleAnalysis>().preserved());
-  EXPECT_TRUE(Intersected.getChecker<TestModuleAnalysis>()
-                  .preservedSet<AllAnalysesOn<Module>>());
-}
-
-TEST(PreservedAnalysisTest, Abandon) {
-  auto PA = PreservedAnalyses::none();
-
-  // We can abandon things after they are preserved.
-  PA.preserve<TestFunctionAnalysis>();
-  PA.abandon<TestFunctionAnalysis>();
-  EXPECT_FALSE(PA.getChecker<TestFunctionAnalysis>().preserved());
-
-  // Repeated is fine, and abandoning if they were never preserved is fine.
-  PA.abandon<TestFunctionAnalysis>();
-  EXPECT_FALSE(PA.getChecker<TestFunctionAnalysis>().preserved());
-  PA.abandon<TestModuleAnalysis>();
-  EXPECT_FALSE(PA.getChecker<TestModuleAnalysis>().preserved());
-
-  // Even if the sets are preserved, the abandoned analyses' checker won't
-  // return true for those sets.
-  PA.preserveSet<AllAnalysesOn<Function>>();
-  PA.preserveSet<AllAnalysesOn<Module>>();
-  EXPECT_FALSE(PA.getChecker<TestFunctionAnalysis>()
-                   .preservedSet<AllAnalysesOn<Function>>());
-  EXPECT_FALSE(PA.getChecker<TestModuleAnalysis>()
-                   .preservedSet<AllAnalysesOn<Module>>());
-
-  // But an arbitrary (opaque) analysis will still observe the sets as
-  // preserved. This also checks that we can use an explicit ID rather than
-  // a type.
-  AnalysisKey FakeKey, *FakeID = &FakeKey;
-  EXPECT_TRUE(PA.getChecker(FakeID).preservedSet<AllAnalysesOn<Function>>());
-  EXPECT_TRUE(PA.getChecker(FakeID).preservedSet<AllAnalysesOn<Module>>());
-}
-
-TEST_F(PassManagerTest, Basic) {
-  FunctionAnalysisManager FAM;
-  int FunctionAnalysisRuns = 0;
-  FAM.registerPass([&] { return TestFunctionAnalysis(FunctionAnalysisRuns); });
-
-  ModuleAnalysisManager MAM;
-  int ModuleAnalysisRuns = 0;
-  MAM.registerPass([&] { return TestModuleAnalysis(ModuleAnalysisRuns); });
-  MAM.registerPass([&] { return FunctionAnalysisManagerModuleProxy(FAM); });
-  FAM.registerPass([&] { return ModuleAnalysisManagerFunctionProxy(MAM); });
-
-  MAM.registerPass([&] { return PassInstrumentationAnalysis(); });
-  FAM.registerPass([&] { return PassInstrumentationAnalysis(); });
-
-  ModulePassManager MPM;
-
-  // Count the runs over a Function.
-  int FunctionPassRunCount1 = 0;
-  int AnalyzedInstrCount1 = 0;
-  int AnalyzedFunctionCount1 = 0;
-  {
-    // Pointless scoped copy to test move assignment.
-    ModulePassManager NestedMPM;
-    FunctionPassManager FPM;
-    {
-      // Pointless scope to test move assignment.
-      FunctionPassManager NestedFPM;
-      NestedFPM.addPass(TestFunctionPass(FunctionPassRunCount1,
-                                         AnalyzedInstrCount1,
-                                         AnalyzedFunctionCount1, MAM));
-      FPM = std::move(NestedFPM);
-    }
-    NestedMPM.addPass(createModuleToFunctionPassAdaptor(std::move(FPM)));
-    MPM = std::move(NestedMPM);
-  }
-
-  // Count the runs over a module.
-  int ModulePassRunCount = 0;
-  MPM.addPass(TestModulePass(ModulePassRunCount));
-
-  // Count the runs over a Function in a separate manager.
-  int FunctionPassRunCount2 = 0;
-  int AnalyzedInstrCount2 = 0;
-  int AnalyzedFunctionCount2 = 0;
-  {
-    FunctionPassManager FPM;
-    FPM.addPass(TestFunctionPass(FunctionPassRunCount2, AnalyzedInstrCount2,
-                                 AnalyzedFunctionCount2, MAM));
-    MPM.addPass(createModuleToFunctionPassAdaptor(std::move(FPM)));
-  }
-
-  // A third function pass manager but with only preserving intervening passes
-  // and with a function pass that invalidates exactly one analysis.
-  MPM.addPass(TestPreservingModulePass());
-  int FunctionPassRunCount3 = 0;
-  int AnalyzedInstrCount3 = 0;
-  int AnalyzedFunctionCount3 = 0;
-  {
-    FunctionPassManager FPM;
-    FPM.addPass(TestFunctionPass(FunctionPassRunCount3, AnalyzedInstrCount3,
-                                 AnalyzedFunctionCount3, MAM));
-    FPM.addPass(TestInvalidationFunctionPass("f"));
-    MPM.addPass(createModuleToFunctionPassAdaptor(std::move(FPM)));
-  }
-
-  // A fourth function pass manager but with only preserving intervening
-  // passes but triggering the module analysis.
-  MPM.addPass(RequireAnalysisPass<TestModuleAnalysis, Module>());
-  int FunctionPassRunCount4 = 0;
-  int AnalyzedInstrCount4 = 0;
-  int AnalyzedFunctionCount4 = 0;
-  {
-    FunctionPassManager FPM;
-    FPM.addPass(TestFunctionPass(FunctionPassRunCount4, AnalyzedInstrCount4,
-                                 AnalyzedFunctionCount4, MAM));
-    MPM.addPass(createModuleToFunctionPassAdaptor(std::move(FPM)));
-  }
-
-  // A fifth function pass manager which invalidates one function first but
-  // uses only cached results.
-  int FunctionPassRunCount5 = 0;
-  int AnalyzedInstrCount5 = 0;
-  int AnalyzedFunctionCount5 = 0;
-  {
-    FunctionPassManager FPM;
-    FPM.addPass(TestInvalidationFunctionPass("f"));
-    FPM.addPass(TestFunctionPass(FunctionPassRunCount5, AnalyzedInstrCount5,
-                                 AnalyzedFunctionCount5, MAM,
-                                 /*OnlyUseCachedResults=*/true));
-    MPM.addPass(createModuleToFunctionPassAdaptor(std::move(FPM)));
-  }
-
-  MPM.run(*M, MAM);
-
-  // Validate module pass counters.
-  EXPECT_EQ(1, ModulePassRunCount);
-
-  // Validate all function pass counter sets are the same.
-  EXPECT_EQ(3, FunctionPassRunCount1);
-  EXPECT_EQ(5, AnalyzedInstrCount1);
-  EXPECT_EQ(0, AnalyzedFunctionCount1);
-  EXPECT_EQ(3, FunctionPassRunCount2);
-  EXPECT_EQ(5, AnalyzedInstrCount2);
-  EXPECT_EQ(0, AnalyzedFunctionCount2);
-  EXPECT_EQ(3, FunctionPassRunCount3);
-  EXPECT_EQ(5, AnalyzedInstrCount3);
-  EXPECT_EQ(0, AnalyzedFunctionCount3);
-  EXPECT_EQ(3, FunctionPassRunCount4);
-  EXPECT_EQ(5, AnalyzedInstrCount4);
-  EXPECT_EQ(9, AnalyzedFunctionCount4);
-  EXPECT_EQ(3, FunctionPassRunCount5);
-  EXPECT_EQ(2, AnalyzedInstrCount5); // Only 'g' and 'h' were cached.
-  EXPECT_EQ(9, AnalyzedFunctionCount5);
-
-  // Validate the analysis counters:
-  //   first run over 3 functions, then module pass invalidates
-  //   second run over 3 functions, nothing invalidates
-  //   third run over 0 functions, but 1 function invalidated
-  //   fourth run over 1 function
-  //   fifth run invalidates 1 function first, but runs over 0 functions
-  EXPECT_EQ(7, FunctionAnalysisRuns);
-
-  EXPECT_EQ(1, ModuleAnalysisRuns);
-}
-
-// A customized pass manager that passes extra arguments through the
-// infrastructure.
-typedef AnalysisManager<Function, int> CustomizedAnalysisManager;
-typedef PassManager<Function, CustomizedAnalysisManager, int, int &>
-    CustomizedPassManager;
-
-class CustomizedAnalysis : public AnalysisInfoMixin<CustomizedAnalysis> {
-public:
-  struct Result {
-    Result(int I) : I(I) {}
-    int I;
-  };
-
-  Result run(Function &F, CustomizedAnalysisManager &AM, int I) {
-    return Result(I);
-  }
-
-private:
-  friend AnalysisInfoMixin<CustomizedAnalysis>;
-  static AnalysisKey Key;
-};
-
-AnalysisKey CustomizedAnalysis::Key;
-
-struct CustomizedPass : PassInfoMixin<CustomizedPass> {
-  std::function<void(CustomizedAnalysis::Result &, int &)> Callback;
-
-  template <typename CallbackT>
-  CustomizedPass(CallbackT Callback) : Callback(Callback) {}
-
-  PreservedAnalyses run(Function &F, CustomizedAnalysisManager &AM, int I,
-                        int &O) {
-    Callback(AM.getResult<CustomizedAnalysis>(F, I), O);
-    return PreservedAnalyses::none();
-  }
-};
-
-TEST_F(PassManagerTest, CustomizedPassManagerArgs) {
-  CustomizedAnalysisManager AM;
-  AM.registerPass([&] { return CustomizedAnalysis(); });
-  PassInstrumentationCallbacks PIC;
-  AM.registerPass([&] { return PassInstrumentationAnalysis(&PIC); });
-
-  CustomizedPassManager PM;
-
-  // Add an instance of the customized pass that just accumulates the input
-  // after it is round-tripped through the analysis.
-  int Result = 0;
-  PM.addPass(
-      CustomizedPass([](CustomizedAnalysis::Result &R, int &O) { O += R.I; }));
-
-  // Run this over every function with the input of 42.
-  for (Function &F : *M)
-    PM.run(F, AM, 42, Result);
-
-  // And ensure that we accumulated the correct result.
-  EXPECT_EQ(42 * (int)M->size(), Result);
-}
-
-/// A test analysis pass which caches in its result another analysis pass and
-/// uses it to serve queries. This requires the result to invalidate itself
-/// when its dependency is invalidated.
-struct TestIndirectFunctionAnalysis
-    : public AnalysisInfoMixin<TestIndirectFunctionAnalysis> {
-  struct Result {
-    Result(TestFunctionAnalysis::Result &FDep, TestModuleAnalysis::Result &MDep)
-        : FDep(FDep), MDep(MDep) {}
-    TestFunctionAnalysis::Result &FDep;
-    TestModuleAnalysis::Result &MDep;
-
-    bool invalidate(Function &F, const PreservedAnalyses &PA,
-                    FunctionAnalysisManager::Invalidator &Inv) {
-      auto PAC = PA.getChecker<TestIndirectFunctionAnalysis>();
-      return !(PAC.preserved() ||
-               PAC.preservedSet<AllAnalysesOn<Function>>()) ||
-             Inv.invalidate<TestFunctionAnalysis>(F, PA);
-    }
-  };
-
-  TestIndirectFunctionAnalysis(int &Runs, ModuleAnalysisManager &MAM)
-      : Runs(Runs), MAM(MAM) {}
-
-  /// Run the analysis pass over the function and return a result.
-  Result run(Function &F, FunctionAnalysisManager &AM) {
-    ++Runs;
-    auto &FDep = AM.getResult<TestFunctionAnalysis>(F);
-    auto &MAMProxy = AM.getResult<ModuleAnalysisManagerFunctionProxy>(F);
-    // For the test, we insist that the module analysis starts off in the
-    // cache. Getting a cached result that isn't stateless trigger an assert.
-    // Use MAM, for the purposes of this unittest.
-    auto &MDep = *MAM.getCachedResult<TestModuleAnalysis>(*F.getParent());
-    // And register the dependency as module analysis dependencies have to be
-    // pre-registered on the proxy.
-    MAMProxy.registerOuterAnalysisInvalidation<TestModuleAnalysis,
-                                               TestIndirectFunctionAnalysis>();
-    return Result(FDep, MDep);
-  }
-
-private:
-  friend AnalysisInfoMixin<TestIndirectFunctionAnalysis>;
-  static AnalysisKey Key;
-
-  int &Runs;
-  ModuleAnalysisManager &MAM;
-};
-
-AnalysisKey TestIndirectFunctionAnalysis::Key;
-
-/// A test analysis pass which chaches in its result the result from the above
-/// indirect analysis pass.
-///
-/// This allows us to ensure that whenever an analysis pass is invalidated due
-/// to dependencies (especially dependencies across IR units that trigger
-/// asynchronous invalidation) we correctly detect that this may in turn cause
-/// other analysis to be invalidated.
-struct TestDoublyIndirectFunctionAnalysis
-    : public AnalysisInfoMixin<TestDoublyIndirectFunctionAnalysis> {
-  struct Result {
-    Result(TestIndirectFunctionAnalysis::Result &IDep) : IDep(IDep) {}
-    TestIndirectFunctionAnalysis::Result &IDep;
-
-    bool invalidate(Function &F, const PreservedAnalyses &PA,
-                    FunctionAnalysisManager::Invalidator &Inv) {
-      auto PAC = PA.getChecker<TestDoublyIndirectFunctionAnalysis>();
-      return !(PAC.preserved() ||
-               PAC.preservedSet<AllAnalysesOn<Function>>()) ||
-             Inv.invalidate<TestIndirectFunctionAnalysis>(F, PA);
-    }
-  };
-
-  TestDoublyIndirectFunctionAnalysis(int &Runs) : Runs(Runs) {}
-
-  /// Run the analysis pass over the function and return a result.
-  Result run(Function &F, FunctionAnalysisManager &AM) {
-    ++Runs;
-    auto &IDep = AM.getResult<TestIndirectFunctionAnalysis>(F);
-    return Result(IDep);
-  }
-
-private:
-  friend AnalysisInfoMixin<TestDoublyIndirectFunctionAnalysis>;
-  static AnalysisKey Key;
-
-  int &Runs;
-};
-
-AnalysisKey TestDoublyIndirectFunctionAnalysis::Key;
-
-struct LambdaPass : public PassInfoMixin<LambdaPass> {
-  using FuncT = std::function<PreservedAnalyses(Function &, FunctionAnalysisManager &)>;
-
-  LambdaPass(FuncT Func) : Func(std::move(Func)) {}
-
-  PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM) {
-    return Func(F, AM);
-  }
-
-  FuncT Func;
-};
-
-TEST_F(PassManagerTest, IndirectAnalysisInvalidation) {
-  FunctionAnalysisManager FAM;
-  ModuleAnalysisManager MAM;
-  int FunctionAnalysisRuns = 0, ModuleAnalysisRuns = 0,
-      IndirectAnalysisRuns = 0, DoublyIndirectAnalysisRuns = 0;
-  FAM.registerPass([&] { return TestFunctionAnalysis(FunctionAnalysisRuns); });
-  FAM.registerPass(
-      [&] { return TestIndirectFunctionAnalysis(IndirectAnalysisRuns, MAM); });
-  FAM.registerPass([&] {
-    return TestDoublyIndirectFunctionAnalysis(DoublyIndirectAnalysisRuns);
-  });
-
-  MAM.registerPass([&] { return TestModuleAnalysis(ModuleAnalysisRuns); });
-  MAM.registerPass([&] { return FunctionAnalysisManagerModuleProxy(FAM); });
-  FAM.registerPass([&] { return ModuleAnalysisManagerFunctionProxy(MAM); });
-
-  PassInstrumentationCallbacks PIC;
-  MAM.registerPass([&] { return PassInstrumentationAnalysis(&PIC); });
-  FAM.registerPass([&] { return PassInstrumentationAnalysis(&PIC); });
-
-  int InstrCount = 0, FunctionCount = 0;
-  ModulePassManager MPM;
-  FunctionPassManager FPM;
-  // First just use the analysis to get the instruction count, and preserve
-  // everything.
-  FPM.addPass(LambdaPass([&](Function &F, FunctionAnalysisManager &AM) {
-    auto &DoublyIndirectResult =
-        AM.getResult<TestDoublyIndirectFunctionAnalysis>(F);
-    auto &IndirectResult = DoublyIndirectResult.IDep;
-    InstrCount += IndirectResult.FDep.InstructionCount;
-    FunctionCount += IndirectResult.MDep.FunctionCount;
-    return PreservedAnalyses::all();
-  }));
-  // Next, invalidate
-  //   - both analyses for "f",
-  //   - just the underlying (indirect) analysis for "g", and
-  //   - just the direct analysis for "h".
-  FPM.addPass(LambdaPass([&](Function &F, FunctionAnalysisManager &AM) {
-    auto &DoublyIndirectResult =
-        AM.getResult<TestDoublyIndirectFunctionAnalysis>(F);
-    auto &IndirectResult = DoublyIndirectResult.IDep;
-    InstrCount += IndirectResult.FDep.InstructionCount;
-    FunctionCount += IndirectResult.MDep.FunctionCount;
-    auto PA = PreservedAnalyses::none();
-    if (F.getName() == "g")
-      PA.preserve<TestFunctionAnalysis>();
-    else if (F.getName() == "h")
-      PA.preserve<TestIndirectFunctionAnalysis>();
-    return PA;
-  }));
-  // Finally, use the analysis again on each function, forcing re-computation
-  // for all of them.
-  FPM.addPass(LambdaPass([&](Function &F, FunctionAnalysisManager &AM) {
-    auto &DoublyIndirectResult =
-        AM.getResult<TestDoublyIndirectFunctionAnalysis>(F);
-    auto &IndirectResult = DoublyIndirectResult.IDep;
-    InstrCount += IndirectResult.FDep.InstructionCount;
-    FunctionCount += IndirectResult.MDep.FunctionCount;
-    return PreservedAnalyses::all();
-  }));
-
-  // Create a second function pass manager. This will cause the module-level
-  // invalidation to occur, which will force yet another invalidation of the
-  // indirect function-level analysis as the module analysis it depends on gets
-  // invalidated.
-  FunctionPassManager FPM2;
-  FPM2.addPass(LambdaPass([&](Function &F, FunctionAnalysisManager &AM) {
-    auto &DoublyIndirectResult =
-        AM.getResult<TestDoublyIndirectFunctionAnalysis>(F);
-    auto &IndirectResult = DoublyIndirectResult.IDep;
-    InstrCount += IndirectResult.FDep.InstructionCount;
-    FunctionCount += IndirectResult.MDep.FunctionCount;
-    return PreservedAnalyses::all();
-  }));
-
-  // Add a requires pass to populate the module analysis and then our function
-  // pass pipeline.
-  MPM.addPass(RequireAnalysisPass<TestModuleAnalysis, Module>());
-  MPM.addPass(createModuleToFunctionPassAdaptor(std::move(FPM)));
-  // Now require the module analysis again (it will have been invalidated once)
-  // and then use it again from a function pass manager.
-  MPM.addPass(RequireAnalysisPass<TestModuleAnalysis, Module>());
-  MPM.addPass(createModuleToFunctionPassAdaptor(std::move(FPM2)));
-  MPM.run(*M, MAM);
-
-  // There are generally two possible runs for each of the three functions. But
-  // for one function, we only invalidate the indirect analysis so the base one
-  // only gets run five times.
-  EXPECT_EQ(5, FunctionAnalysisRuns);
-  // The module analysis pass should be run twice here.
-  EXPECT_EQ(2, ModuleAnalysisRuns);
-  // The indirect analysis is invalidated for each function (either directly or
-  // indirectly) and run twice for each.
-  EXPECT_EQ(9, IndirectAnalysisRuns);
-  EXPECT_EQ(9, DoublyIndirectAnalysisRuns);
-
-  // There are five instructions in the module and we add the count four
-  // times.
-  EXPECT_EQ(5 * 4, InstrCount);
-
-  // There are three functions and we count them four times for each of the
-  // three functions.
-  EXPECT_EQ(3 * 4 * 3, FunctionCount);
-}
-
-// Run SimplifyCFGPass that makes CFG changes and reports PreservedAnalyses
-// without CFGAnalyses. So the CFGChecker does not complain.
-TEST_F(PassManagerTest, FunctionPassCFGChecker) {
-  LLVMContext Context;
-  // SimplifyCFG changes this function to
-  // define void @foo {next: ret void}
-  auto M = parseIR(Context, "define void @foo() {\n"
-                            "  br label %next\n"
-                            "next:\n"
-                            "  br label %exit\n"
-                            "exit:\n"
-                            "  ret void\n"
-                            "}\n");
-
-  auto *F = M->getFunction("foo");
-  FunctionAnalysisManager FAM;
-  FunctionPassManager FPM;
-  PassInstrumentationCallbacks PIC;
-  StandardInstrumentations SI(/*DebugLogging*/ true);
-  SI.registerCallbacks(PIC, &FAM);
-  FAM.registerPass([&] { return PassInstrumentationAnalysis(&PIC); });
-  FAM.registerPass([&] { return DominatorTreeAnalysis(); });
-  FAM.registerPass([&] { return AssumptionAnalysis(); });
-  FAM.registerPass([&] { return TargetIRAnalysis(); });
-
-  FPM.addPass(SimplifyCFGPass());
-  FPM.run(*F, FAM);
-}
-
-// FunctionPass that manually invalidates analyses and always returns
-// PreservedAnalyses::all().
-struct TestSimplifyCFGInvalidatingAnalysisPass
-    : PassInfoMixin<TestSimplifyCFGInvalidatingAnalysisPass> {
-  PreservedAnalyses run(Function &F, FunctionAnalysisManager &FAM) {
-    // Run SimplifyCFG and if it changes CFG then invalidate the CFG analysis.
-    // This allows to return PreserveAnalysis::all().
-    PreservedAnalyses PA = CFGSimplifier.run(F, FAM);
-    FAM.invalidate(F, PA);
-    return PreservedAnalyses::all();
-  }
-
-  SimplifyCFGPass CFGSimplifier;
-};
-
-// Run TestSimplifyCFGInvalidatingAnalysisPass which changes CFG by running
-// SimplifyCFGPass then manually invalidates analyses and always returns
-// PreservedAnalyses::all(). CFGChecker does not complain because it resets
-// its saved CFG snapshot when the analyses are invalidated manually.
-TEST_F(PassManagerTest, FunctionPassCFGCheckerInvalidateAnalysis) {
-  LLVMContext Context;
-  // SimplifyCFG changes this function to
-  // define void @foo {next: ret void}
-  auto M = parseIR(Context, "define void @foo() {\n"
-                            "  br label %next\n"
-                            "next:\n"
-                            "  br label %exit\n"
-                            "exit:\n"
-                            "  ret void\n"
-                            "}\n");
-
-  auto *F = M->getFunction("foo");
-  FunctionAnalysisManager FAM;
-  FunctionPassManager FPM;
-  PassInstrumentationCallbacks PIC;
-  StandardInstrumentations SI(/*DebugLogging*/ true);
-  SI.registerCallbacks(PIC, &FAM);
-  FAM.registerPass([&] { return PassInstrumentationAnalysis(&PIC); });
-  FAM.registerPass([&] { return DominatorTreeAnalysis(); });
-  FAM.registerPass([&] { return AssumptionAnalysis(); });
-  FAM.registerPass([&] { return TargetIRAnalysis(); });
-
-  FPM.addPass(TestSimplifyCFGInvalidatingAnalysisPass());
-  FPM.run(*F, FAM);
-}
-
-// Wrap a FunctionPassManager running SimplifyCFG pass with another
-// FunctionPassManager.
-struct TestSimplifyCFGWrapperPass : PassInfoMixin<TestSimplifyCFGWrapperPass> {
-  TestSimplifyCFGWrapperPass(FunctionPassManager &InnerPM) : InnerPM(InnerPM) {}
-
-  PreservedAnalyses run(Function &F, FunctionAnalysisManager &FAM) {
-    // Here we simulate exactly what FunctionPassManager::run() does but
-    // instead of running all passes from InnerPM.Passes we run them in bulk
-    // by calling InnerPM.run().
-    PreservedAnalyses PA = PreservedAnalyses::all();
-    PassInstrumentation PI = FAM.getResult<PassInstrumentationAnalysis>(F);
-
-    if (!PI.runBeforePass<Function>(InnerPM, F))
-      return PreservedAnalyses::all();
-
-    PreservedAnalyses PassPA = InnerPM.run(F, FAM);
-    PI.runAfterPass(InnerPM, F, PassPA);
-    FAM.invalidate(F, PassPA);
-    PA.intersect(PassPA);
-    PA.preserveSet<AllAnalysesOn<Function>>();
-    return PA;
-  }
-
-  FunctionPassManager &InnerPM;
-};
-
-// Run TestSimplifyCFGWrapperPass which simulates behavior of
-// FunctionPassManager::run() except that it runs all passes at once by calling
-// an inner pass manager's passes with PassManager::run(). This is how one pass
-// manager is expected to wrap another pass manager.
-// SimplifyCFGPass, which is called by the inner pass manager, changes the CFG.
-// The CFGChecker's AfterPassCallback, run right after SimplifyCFGPass, does not
-// complain because CFGAnalyses is not in the PreservedAnalises set returned by
-// SimplifyCFGPass. Then the CFG analysis is invalidated by the analysis manager
-// according to the PreservedAnalises set. Further calls to CFGChecker's
-// AfterPassCallback see that all analyses for the current function are
-// preserved but there is no CFG snapshot available (i.e.
-// AM.getCachedResult<PreservedCFGCheckerAnalysis>(F) returns nullptr).
-TEST_F(PassManagerTest, FunctionPassCFGCheckerWrapped) {
-  LLVMContext Context;
-  // SimplifyCFG changes this function to
-  // define void @foo {next: ret void}
-  auto M = parseIR(Context, "define void @foo() {\n"
-                            "  br label %next\n"
-                            "next:\n"
-                            "  br label %exit\n"
-                            "exit:\n"
-                            "  ret void\n"
-                            "}\n");
-
-  auto *F = M->getFunction("foo");
-  FunctionAnalysisManager FAM;
-  FunctionPassManager FPM;
-  PassInstrumentationCallbacks PIC;
-  StandardInstrumentations SI(/*DebugLogging*/ true);
-  SI.registerCallbacks(PIC, &FAM);
-  FAM.registerPass([&] { return PassInstrumentationAnalysis(&PIC); });
-  FAM.registerPass([&] { return DominatorTreeAnalysis(); });
-  FAM.registerPass([&] { return AssumptionAnalysis(); });
-  FAM.registerPass([&] { return TargetIRAnalysis(); });
-
-  FunctionPassManager InnerFPM;
-  InnerFPM.addPass(SimplifyCFGPass());
-
-  FPM.addPass(TestSimplifyCFGWrapperPass(InnerFPM));
-  FPM.run(*F, FAM);
-}
-}
diff --git a/gnu/llvm/llvm/unittests/IR/PatternMatch.cpp b/gnu/llvm/llvm/unittests/IR/PatternMatch.cpp
deleted file mode 100644
index 3406807fc25..00000000000
--- a/gnu/llvm/llvm/unittests/IR/PatternMatch.cpp
+++ /dev/null
@@ -1,1686 +0,0 @@
-//===---- llvm/unittest/IR/PatternMatch.cpp - PatternMatch unit tests ----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/IR/PatternMatch.h"
-#include "llvm/ADT/APSInt.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/Analysis/ValueTracking.h"
-#include "llvm/IR/BasicBlock.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/DataLayout.h"
-#include "llvm/IR/DerivedTypes.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/MDBuilder.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/NoFolder.h"
-#include "llvm/IR/Operator.h"
-#include "llvm/IR/Type.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::PatternMatch;
-
-namespace {
-
-struct PatternMatchTest : ::testing::Test {
-  LLVMContext Ctx;
-  std::unique_ptr<Module> M;
-  Function *F;
-  BasicBlock *BB;
-  IRBuilder<NoFolder> IRB;
-
-  PatternMatchTest()
-      : M(new Module("PatternMatchTestModule", Ctx)),
-        F(Function::Create(
-            FunctionType::get(Type::getVoidTy(Ctx), /* IsVarArg */ false),
-            Function::ExternalLinkage, "f", M.get())),
-        BB(BasicBlock::Create(Ctx, "entry", F)), IRB(BB) {}
-};
-
-TEST_F(PatternMatchTest, OneUse) {
-  // Build up a little tree of values:
-  //
-  //   One  = (1 + 2) + 42
-  //   Two  = One + 42
-  //   Leaf = (Two + 8) + (Two + 13)
-  Value *One = IRB.CreateAdd(IRB.CreateAdd(IRB.getInt32(1), IRB.getInt32(2)),
-                             IRB.getInt32(42));
-  Value *Two = IRB.CreateAdd(One, IRB.getInt32(42));
-  Value *Leaf = IRB.CreateAdd(IRB.CreateAdd(Two, IRB.getInt32(8)),
-                              IRB.CreateAdd(Two, IRB.getInt32(13)));
-  Value *V;
-
-  EXPECT_TRUE(m_OneUse(m_Value(V)).match(One));
-  EXPECT_EQ(One, V);
-
-  EXPECT_FALSE(m_OneUse(m_Value()).match(Two));
-  EXPECT_FALSE(m_OneUse(m_Value()).match(Leaf));
-}
-
-TEST_F(PatternMatchTest, SpecificIntEQ) {
-  Type *IntTy = IRB.getInt32Ty();
-  unsigned BitWidth = IntTy->getScalarSizeInBits();
-
-  Value *Zero = ConstantInt::get(IntTy, 0);
-  Value *One = ConstantInt::get(IntTy, 1);
-  Value *NegOne = ConstantInt::get(IntTy, -1);
-
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_EQ, APInt(BitWidth, 0))
-          .match(Zero));
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_EQ, APInt(BitWidth, 0))
-          .match(One));
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_EQ, APInt(BitWidth, 0))
-          .match(NegOne));
-
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_EQ, APInt(BitWidth, 1))
-          .match(Zero));
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_EQ, APInt(BitWidth, 1))
-          .match(One));
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_EQ, APInt(BitWidth, 1))
-          .match(NegOne));
-
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_EQ, APInt(BitWidth, -1))
-          .match(Zero));
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_EQ, APInt(BitWidth, -1))
-          .match(One));
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_EQ, APInt(BitWidth, -1))
-          .match(NegOne));
-}
-
-TEST_F(PatternMatchTest, SpecificIntNE) {
-  Type *IntTy = IRB.getInt32Ty();
-  unsigned BitWidth = IntTy->getScalarSizeInBits();
-
-  Value *Zero = ConstantInt::get(IntTy, 0);
-  Value *One = ConstantInt::get(IntTy, 1);
-  Value *NegOne = ConstantInt::get(IntTy, -1);
-
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_NE, APInt(BitWidth, 0))
-          .match(Zero));
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_NE, APInt(BitWidth, 0))
-          .match(One));
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_NE, APInt(BitWidth, 0))
-          .match(NegOne));
-
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_NE, APInt(BitWidth, 1))
-          .match(Zero));
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_NE, APInt(BitWidth, 1))
-          .match(One));
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_NE, APInt(BitWidth, 1))
-          .match(NegOne));
-
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_NE, APInt(BitWidth, -1))
-          .match(Zero));
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_NE, APInt(BitWidth, -1))
-          .match(One));
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_NE, APInt(BitWidth, -1))
-          .match(NegOne));
-}
-
-TEST_F(PatternMatchTest, SpecificIntUGT) {
-  Type *IntTy = IRB.getInt32Ty();
-  unsigned BitWidth = IntTy->getScalarSizeInBits();
-
-  Value *Zero = ConstantInt::get(IntTy, 0);
-  Value *One = ConstantInt::get(IntTy, 1);
-  Value *NegOne = ConstantInt::get(IntTy, -1);
-
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_UGT, APInt(BitWidth, 0))
-          .match(Zero));
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_UGT, APInt(BitWidth, 0))
-          .match(One));
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_UGT, APInt(BitWidth, 0))
-          .match(NegOne));
-
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_UGT, APInt(BitWidth, 1))
-          .match(Zero));
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_UGT, APInt(BitWidth, 1))
-          .match(One));
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_UGT, APInt(BitWidth, 1))
-          .match(NegOne));
-
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_UGT, APInt(BitWidth, -1))
-          .match(Zero));
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_UGT, APInt(BitWidth, -1))
-          .match(One));
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_UGT, APInt(BitWidth, -1))
-          .match(NegOne));
-}
-
-TEST_F(PatternMatchTest, SignbitZeroChecks) {
-  Type *IntTy = IRB.getInt32Ty();
-
-  Value *Zero = ConstantInt::get(IntTy, 0);
-  Value *One = ConstantInt::get(IntTy, 1);
-  Value *NegOne = ConstantInt::get(IntTy, -1);
-
-  EXPECT_TRUE(m_Negative().match(NegOne));
-  EXPECT_FALSE(m_NonNegative().match(NegOne));
-  EXPECT_FALSE(m_StrictlyPositive().match(NegOne));
-  EXPECT_TRUE(m_NonPositive().match(NegOne));
-
-  EXPECT_FALSE(m_Negative().match(Zero));
-  EXPECT_TRUE(m_NonNegative().match(Zero));
-  EXPECT_FALSE(m_StrictlyPositive().match(Zero));
-  EXPECT_TRUE(m_NonPositive().match(Zero));
-
-  EXPECT_FALSE(m_Negative().match(One));
-  EXPECT_TRUE(m_NonNegative().match(One));
-  EXPECT_TRUE(m_StrictlyPositive().match(One));
-  EXPECT_FALSE(m_NonPositive().match(One));
-}
-
-TEST_F(PatternMatchTest, SpecificIntUGE) {
-  Type *IntTy = IRB.getInt32Ty();
-  unsigned BitWidth = IntTy->getScalarSizeInBits();
-
-  Value *Zero = ConstantInt::get(IntTy, 0);
-  Value *One = ConstantInt::get(IntTy, 1);
-  Value *NegOne = ConstantInt::get(IntTy, -1);
-
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_UGE, APInt(BitWidth, 0))
-          .match(Zero));
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_UGE, APInt(BitWidth, 0))
-          .match(One));
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_UGE, APInt(BitWidth, 0))
-          .match(NegOne));
-
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_UGE, APInt(BitWidth, 1))
-          .match(Zero));
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_UGE, APInt(BitWidth, 1))
-          .match(One));
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_UGE, APInt(BitWidth, 1))
-          .match(NegOne));
-
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_UGE, APInt(BitWidth, -1))
-          .match(Zero));
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_UGE, APInt(BitWidth, -1))
-          .match(One));
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_UGE, APInt(BitWidth, -1))
-          .match(NegOne));
-}
-
-TEST_F(PatternMatchTest, SpecificIntULT) {
-  Type *IntTy = IRB.getInt32Ty();
-  unsigned BitWidth = IntTy->getScalarSizeInBits();
-
-  Value *Zero = ConstantInt::get(IntTy, 0);
-  Value *One = ConstantInt::get(IntTy, 1);
-  Value *NegOne = ConstantInt::get(IntTy, -1);
-
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_ULT, APInt(BitWidth, 0))
-          .match(Zero));
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_ULT, APInt(BitWidth, 0))
-          .match(One));
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_ULT, APInt(BitWidth, 0))
-          .match(NegOne));
-
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_ULT, APInt(BitWidth, 1))
-          .match(Zero));
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_ULT, APInt(BitWidth, 1))
-          .match(One));
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_ULT, APInt(BitWidth, 1))
-          .match(NegOne));
-
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_ULT, APInt(BitWidth, -1))
-          .match(Zero));
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_ULT, APInt(BitWidth, -1))
-          .match(One));
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_ULT, APInt(BitWidth, -1))
-          .match(NegOne));
-}
-
-TEST_F(PatternMatchTest, SpecificIntULE) {
-  Type *IntTy = IRB.getInt32Ty();
-  unsigned BitWidth = IntTy->getScalarSizeInBits();
-
-  Value *Zero = ConstantInt::get(IntTy, 0);
-  Value *One = ConstantInt::get(IntTy, 1);
-  Value *NegOne = ConstantInt::get(IntTy, -1);
-
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_ULE, APInt(BitWidth, 0))
-          .match(Zero));
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_ULE, APInt(BitWidth, 0))
-          .match(One));
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_ULE, APInt(BitWidth, 0))
-          .match(NegOne));
-
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_ULE, APInt(BitWidth, 1))
-          .match(Zero));
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_ULE, APInt(BitWidth, 1))
-          .match(One));
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_ULE, APInt(BitWidth, 1))
-          .match(NegOne));
-
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_ULE, APInt(BitWidth, -1))
-          .match(Zero));
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_ULE, APInt(BitWidth, -1))
-          .match(One));
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_ULE, APInt(BitWidth, -1))
-          .match(NegOne));
-}
-
-TEST_F(PatternMatchTest, SpecificIntSGT) {
-  Type *IntTy = IRB.getInt32Ty();
-  unsigned BitWidth = IntTy->getScalarSizeInBits();
-
-  Value *Zero = ConstantInt::get(IntTy, 0);
-  Value *One = ConstantInt::get(IntTy, 1);
-  Value *NegOne = ConstantInt::get(IntTy, -1);
-
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SGT, APInt(BitWidth, 0))
-          .match(Zero));
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SGT, APInt(BitWidth, 0))
-          .match(One));
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SGT, APInt(BitWidth, 0))
-          .match(NegOne));
-
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SGT, APInt(BitWidth, 1))
-          .match(Zero));
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SGT, APInt(BitWidth, 1))
-          .match(One));
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SGT, APInt(BitWidth, 1))
-          .match(NegOne));
-
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SGT, APInt(BitWidth, -1))
-          .match(Zero));
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SGT, APInt(BitWidth, -1))
-          .match(One));
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SGT, APInt(BitWidth, -1))
-          .match(NegOne));
-}
-
-TEST_F(PatternMatchTest, SpecificIntSGE) {
-  Type *IntTy = IRB.getInt32Ty();
-  unsigned BitWidth = IntTy->getScalarSizeInBits();
-
-  Value *Zero = ConstantInt::get(IntTy, 0);
-  Value *One = ConstantInt::get(IntTy, 1);
-  Value *NegOne = ConstantInt::get(IntTy, -1);
-
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SGE, APInt(BitWidth, 0))
-          .match(Zero));
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SGE, APInt(BitWidth, 0))
-          .match(One));
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SGE, APInt(BitWidth, 0))
-          .match(NegOne));
-
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SGE, APInt(BitWidth, 1))
-          .match(Zero));
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SGE, APInt(BitWidth, 1))
-          .match(One));
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SGE, APInt(BitWidth, 1))
-          .match(NegOne));
-
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SGE, APInt(BitWidth, -1))
-          .match(Zero));
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SGE, APInt(BitWidth, -1))
-          .match(One));
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SGE, APInt(BitWidth, -1))
-          .match(NegOne));
-}
-
-TEST_F(PatternMatchTest, SpecificIntSLT) {
-  Type *IntTy = IRB.getInt32Ty();
-  unsigned BitWidth = IntTy->getScalarSizeInBits();
-
-  Value *Zero = ConstantInt::get(IntTy, 0);
-  Value *One = ConstantInt::get(IntTy, 1);
-  Value *NegOne = ConstantInt::get(IntTy, -1);
-
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SLT, APInt(BitWidth, 0))
-          .match(Zero));
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SLT, APInt(BitWidth, 0))
-          .match(One));
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SLT, APInt(BitWidth, 0))
-          .match(NegOne));
-
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SLT, APInt(BitWidth, 1))
-          .match(Zero));
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SLT, APInt(BitWidth, 1))
-          .match(One));
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SLT, APInt(BitWidth, 1))
-          .match(NegOne));
-
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SLT, APInt(BitWidth, -1))
-          .match(Zero));
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SLT, APInt(BitWidth, -1))
-          .match(One));
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SLT, APInt(BitWidth, -1))
-          .match(NegOne));
-}
-
-TEST_F(PatternMatchTest, SpecificIntSLE) {
-  Type *IntTy = IRB.getInt32Ty();
-  unsigned BitWidth = IntTy->getScalarSizeInBits();
-
-  Value *Zero = ConstantInt::get(IntTy, 0);
-  Value *One = ConstantInt::get(IntTy, 1);
-  Value *NegOne = ConstantInt::get(IntTy, -1);
-
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SLE, APInt(BitWidth, 0))
-          .match(Zero));
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SLE, APInt(BitWidth, 0))
-          .match(One));
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SLE, APInt(BitWidth, 0))
-          .match(NegOne));
-
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SLE, APInt(BitWidth, 1))
-          .match(Zero));
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SLE, APInt(BitWidth, 1))
-          .match(One));
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SLE, APInt(BitWidth, 1))
-          .match(NegOne));
-
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SLE, APInt(BitWidth, -1))
-          .match(Zero));
-  EXPECT_FALSE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SLE, APInt(BitWidth, -1))
-          .match(One));
-  EXPECT_TRUE(
-      m_SpecificInt_ICMP(ICmpInst::Predicate::ICMP_SLE, APInt(BitWidth, -1))
-          .match(NegOne));
-}
-
-TEST_F(PatternMatchTest, Unless) {
-  Value *X = IRB.CreateAdd(IRB.getInt32(1), IRB.getInt32(0));
-
-  EXPECT_TRUE(m_Add(m_One(), m_Zero()).match(X));
-  EXPECT_FALSE(m_Add(m_Zero(), m_One()).match(X));
-
-  EXPECT_FALSE(m_Unless(m_Add(m_One(), m_Zero())).match(X));
-  EXPECT_TRUE(m_Unless(m_Add(m_Zero(), m_One())).match(X));
-
-  EXPECT_TRUE(m_c_Add(m_One(), m_Zero()).match(X));
-  EXPECT_TRUE(m_c_Add(m_Zero(), m_One()).match(X));
-
-  EXPECT_FALSE(m_Unless(m_c_Add(m_One(), m_Zero())).match(X));
-  EXPECT_FALSE(m_Unless(m_c_Add(m_Zero(), m_One())).match(X));
-}
-
-TEST_F(PatternMatchTest, ZExtSExtSelf) {
-  LLVMContext &Ctx = IRB.getContext();
-
-  Value *One32 = IRB.getInt32(1);
-  Value *One64Z = IRB.CreateZExt(One32, IntegerType::getInt64Ty(Ctx));
-  Value *One64S = IRB.CreateSExt(One32, IntegerType::getInt64Ty(Ctx));
-
-  EXPECT_TRUE(m_One().match(One32));
-  EXPECT_FALSE(m_One().match(One64Z));
-  EXPECT_FALSE(m_One().match(One64S));
-
-  EXPECT_FALSE(m_ZExt(m_One()).match(One32));
-  EXPECT_TRUE(m_ZExt(m_One()).match(One64Z));
-  EXPECT_FALSE(m_ZExt(m_One()).match(One64S));
-
-  EXPECT_FALSE(m_SExt(m_One()).match(One32));
-  EXPECT_FALSE(m_SExt(m_One()).match(One64Z));
-  EXPECT_TRUE(m_SExt(m_One()).match(One64S));
-
-  EXPECT_TRUE(m_ZExtOrSelf(m_One()).match(One32));
-  EXPECT_TRUE(m_ZExtOrSelf(m_One()).match(One64Z));
-  EXPECT_FALSE(m_ZExtOrSelf(m_One()).match(One64S));
-
-  EXPECT_TRUE(m_SExtOrSelf(m_One()).match(One32));
-  EXPECT_FALSE(m_SExtOrSelf(m_One()).match(One64Z));
-  EXPECT_TRUE(m_SExtOrSelf(m_One()).match(One64S));
-
-  EXPECT_FALSE(m_ZExtOrSExt(m_One()).match(One32));
-  EXPECT_TRUE(m_ZExtOrSExt(m_One()).match(One64Z));
-  EXPECT_TRUE(m_ZExtOrSExt(m_One()).match(One64S));
-
-  EXPECT_TRUE(m_ZExtOrSExtOrSelf(m_One()).match(One32));
-  EXPECT_TRUE(m_ZExtOrSExtOrSelf(m_One()).match(One64Z));
-  EXPECT_TRUE(m_ZExtOrSExtOrSelf(m_One()).match(One64S));
-}
-
-TEST_F(PatternMatchTest, Power2) {
-  Value *C128 = IRB.getInt32(128);
-  Value *CNeg128 = ConstantExpr::getNeg(cast<Constant>(C128));
-
-  EXPECT_TRUE(m_Power2().match(C128));
-  EXPECT_FALSE(m_Power2().match(CNeg128));
-
-  EXPECT_FALSE(m_NegatedPower2().match(C128));
-  EXPECT_TRUE(m_NegatedPower2().match(CNeg128));
-
-  Value *CIntMin = IRB.getInt64(APSInt::getSignedMinValue(64).getSExtValue());
-  Value *CNegIntMin = ConstantExpr::getNeg(cast<Constant>(CIntMin));
-
-  EXPECT_TRUE(m_Power2().match(CIntMin));
-  EXPECT_TRUE(m_Power2().match(CNegIntMin));
-
-  EXPECT_TRUE(m_NegatedPower2().match(CIntMin));
-  EXPECT_TRUE(m_NegatedPower2().match(CNegIntMin));
-}
-
-TEST_F(PatternMatchTest, CommutativeDeferredValue) {
-  Value *X = IRB.getInt32(1);
-  Value *Y = IRB.getInt32(2);
-
-  {
-    Value *tX = X;
-    EXPECT_TRUE(match(X, m_Deferred(tX)));
-    EXPECT_FALSE(match(Y, m_Deferred(tX)));
-  }
-  {
-    const Value *tX = X;
-    EXPECT_TRUE(match(X, m_Deferred(tX)));
-    EXPECT_FALSE(match(Y, m_Deferred(tX)));
-  }
-  {
-    Value *const tX = X;
-    EXPECT_TRUE(match(X, m_Deferred(tX)));
-    EXPECT_FALSE(match(Y, m_Deferred(tX)));
-  }
-  {
-    const Value *const tX = X;
-    EXPECT_TRUE(match(X, m_Deferred(tX)));
-    EXPECT_FALSE(match(Y, m_Deferred(tX)));
-  }
-
-  {
-    Value *tX = nullptr;
-    EXPECT_TRUE(match(IRB.CreateAnd(X, X), m_And(m_Value(tX), m_Deferred(tX))));
-    EXPECT_EQ(tX, X);
-  }
-  {
-    Value *tX = nullptr;
-    EXPECT_FALSE(
-        match(IRB.CreateAnd(X, Y), m_c_And(m_Value(tX), m_Deferred(tX))));
-  }
-
-  auto checkMatch = [X, Y](Value *Pattern) {
-    Value *tX = nullptr, *tY = nullptr;
-    EXPECT_TRUE(match(
-        Pattern, m_c_And(m_Value(tX), m_c_And(m_Deferred(tX), m_Value(tY)))));
-    EXPECT_EQ(tX, X);
-    EXPECT_EQ(tY, Y);
-  };
-
-  checkMatch(IRB.CreateAnd(X, IRB.CreateAnd(X, Y)));
-  checkMatch(IRB.CreateAnd(X, IRB.CreateAnd(Y, X)));
-  checkMatch(IRB.CreateAnd(IRB.CreateAnd(X, Y), X));
-  checkMatch(IRB.CreateAnd(IRB.CreateAnd(Y, X), X));
-}
-
-TEST_F(PatternMatchTest, FloatingPointOrderedMin) {
-  Type *FltTy = IRB.getFloatTy();
-  Value *L = ConstantFP::get(FltTy, 1.0);
-  Value *R = ConstantFP::get(FltTy, 2.0);
-  Value *MatchL, *MatchR;
-
-  // Test OLT.
-  EXPECT_TRUE(m_OrdFMin(m_Value(MatchL), m_Value(MatchR))
-                  .match(IRB.CreateSelect(IRB.CreateFCmpOLT(L, R), L, R)));
-  EXPECT_EQ(L, MatchL);
-  EXPECT_EQ(R, MatchR);
-
-  // Test OLE.
-  EXPECT_TRUE(m_OrdFMin(m_Value(MatchL), m_Value(MatchR))
-                  .match(IRB.CreateSelect(IRB.CreateFCmpOLE(L, R), L, R)));
-  EXPECT_EQ(L, MatchL);
-  EXPECT_EQ(R, MatchR);
-
-  // Test no match on OGE.
-  EXPECT_FALSE(m_OrdFMin(m_Value(MatchL), m_Value(MatchR))
-                   .match(IRB.CreateSelect(IRB.CreateFCmpOGE(L, R), L, R)));
-
-  // Test no match on OGT.
-  EXPECT_FALSE(m_OrdFMin(m_Value(MatchL), m_Value(MatchR))
-                   .match(IRB.CreateSelect(IRB.CreateFCmpOGT(L, R), L, R)));
-
-  // Test inverted selects. Note, that this "inverts" the ordering, e.g.:
-  // %cmp = fcmp oge L, R
-  // %min = select %cmp R, L
-  // Given L == NaN
-  // the above is expanded to %cmp == false ==> %min = L
-  // which is true for UnordFMin, not OrdFMin, so test that:
-
-  // [OU]GE with inverted select.
-  EXPECT_FALSE(m_OrdFMin(m_Value(MatchL), m_Value(MatchR))
-                  .match(IRB.CreateSelect(IRB.CreateFCmpOGE(L, R), R, L)));
-  EXPECT_TRUE(m_OrdFMin(m_Value(MatchL), m_Value(MatchR))
-                  .match(IRB.CreateSelect(IRB.CreateFCmpUGE(L, R), R, L)));
-  EXPECT_EQ(L, MatchL);
-  EXPECT_EQ(R, MatchR);
-
-  // [OU]GT with inverted select.
-  EXPECT_FALSE(m_OrdFMin(m_Value(MatchL), m_Value(MatchR))
-                  .match(IRB.CreateSelect(IRB.CreateFCmpOGT(L, R), R, L)));
-  EXPECT_TRUE(m_OrdFMin(m_Value(MatchL), m_Value(MatchR))
-                  .match(IRB.CreateSelect(IRB.CreateFCmpUGT(L, R), R, L)));
-  EXPECT_EQ(L, MatchL);
-  EXPECT_EQ(R, MatchR);
-}
-
-TEST_F(PatternMatchTest, FloatingPointOrderedMax) {
-  Type *FltTy = IRB.getFloatTy();
-  Value *L = ConstantFP::get(FltTy, 1.0);
-  Value *R = ConstantFP::get(FltTy, 2.0);
-  Value *MatchL, *MatchR;
-
-  // Test OGT.
-  EXPECT_TRUE(m_OrdFMax(m_Value(MatchL), m_Value(MatchR))
-                  .match(IRB.CreateSelect(IRB.CreateFCmpOGT(L, R), L, R)));
-  EXPECT_EQ(L, MatchL);
-  EXPECT_EQ(R, MatchR);
-
-  // Test OGE.
-  EXPECT_TRUE(m_OrdFMax(m_Value(MatchL), m_Value(MatchR))
-                  .match(IRB.CreateSelect(IRB.CreateFCmpOGE(L, R), L, R)));
-  EXPECT_EQ(L, MatchL);
-  EXPECT_EQ(R, MatchR);
-
-  // Test no match on OLE.
-  EXPECT_FALSE(m_OrdFMax(m_Value(MatchL), m_Value(MatchR))
-                   .match(IRB.CreateSelect(IRB.CreateFCmpOLE(L, R), L, R)));
-
-  // Test no match on OLT.
-  EXPECT_FALSE(m_OrdFMax(m_Value(MatchL), m_Value(MatchR))
-                   .match(IRB.CreateSelect(IRB.CreateFCmpOLT(L, R), L, R)));
-
-
-  // Test inverted selects. Note, that this "inverts" the ordering, e.g.:
-  // %cmp = fcmp ole L, R
-  // %max = select %cmp, R, L
-  // Given L == NaN,
-  // the above is expanded to %cmp == false ==> %max == L
-  // which is true for UnordFMax, not OrdFMax, so test that:
-
-  // [OU]LE with inverted select.
-  EXPECT_FALSE(m_OrdFMax(m_Value(MatchL), m_Value(MatchR))
-                   .match(IRB.CreateSelect(IRB.CreateFCmpOLE(L, R), R, L)));
-  EXPECT_TRUE(m_OrdFMax(m_Value(MatchL), m_Value(MatchR))
-                  .match(IRB.CreateSelect(IRB.CreateFCmpULE(L, R), R, L)));
-  EXPECT_EQ(L, MatchL);
-  EXPECT_EQ(R, MatchR);
-
-  // [OUT]LT with inverted select.
-  EXPECT_FALSE(m_OrdFMax(m_Value(MatchL), m_Value(MatchR))
-                   .match(IRB.CreateSelect(IRB.CreateFCmpOLT(L, R), R, L)));
-  EXPECT_TRUE(m_OrdFMax(m_Value(MatchL), m_Value(MatchR))
-                  .match(IRB.CreateSelect(IRB.CreateFCmpULT(L, R), R, L)));
-  EXPECT_EQ(L, MatchL);
-  EXPECT_EQ(R, MatchR);
-}
-
-TEST_F(PatternMatchTest, FloatingPointUnorderedMin) {
-  Type *FltTy = IRB.getFloatTy();
-  Value *L = ConstantFP::get(FltTy, 1.0);
-  Value *R = ConstantFP::get(FltTy, 2.0);
-  Value *MatchL, *MatchR;
-
-  // Test ULT.
-  EXPECT_TRUE(m_UnordFMin(m_Value(MatchL), m_Value(MatchR))
-                  .match(IRB.CreateSelect(IRB.CreateFCmpULT(L, R), L, R)));
-  EXPECT_EQ(L, MatchL);
-  EXPECT_EQ(R, MatchR);
-
-  // Test ULE.
-  EXPECT_TRUE(m_UnordFMin(m_Value(MatchL), m_Value(MatchR))
-                  .match(IRB.CreateSelect(IRB.CreateFCmpULE(L, R), L, R)));
-  EXPECT_EQ(L, MatchL);
-  EXPECT_EQ(R, MatchR);
-
-  // Test no match on UGE.
-  EXPECT_FALSE(m_UnordFMin(m_Value(MatchL), m_Value(MatchR))
-                   .match(IRB.CreateSelect(IRB.CreateFCmpUGE(L, R), L, R)));
-
-  // Test no match on UGT.
-  EXPECT_FALSE(m_UnordFMin(m_Value(MatchL), m_Value(MatchR))
-                   .match(IRB.CreateSelect(IRB.CreateFCmpUGT(L, R), L, R)));
-
-  // Test inverted selects. Note, that this "inverts" the ordering, e.g.:
-  // %cmp = fcmp uge L, R
-  // %min = select %cmp R, L
-  // Given L == NaN
-  // the above is expanded to %cmp == true ==> %min = R
-  // which is true for OrdFMin, not UnordFMin, so test that:
-
-  // [UO]GE with inverted select.
-  EXPECT_FALSE(m_UnordFMin(m_Value(MatchL), m_Value(MatchR))
-                  .match(IRB.CreateSelect(IRB.CreateFCmpUGE(L, R), R, L)));
-  EXPECT_TRUE(m_UnordFMin(m_Value(MatchL), m_Value(MatchR))
-                  .match(IRB.CreateSelect(IRB.CreateFCmpOGE(L, R), R, L)));
-  EXPECT_EQ(L, MatchL);
-  EXPECT_EQ(R, MatchR);
-
-  // [UO]GT with inverted select.
-  EXPECT_FALSE(m_UnordFMin(m_Value(MatchL), m_Value(MatchR))
-                  .match(IRB.CreateSelect(IRB.CreateFCmpUGT(L, R), R, L)));
-  EXPECT_TRUE(m_UnordFMin(m_Value(MatchL), m_Value(MatchR))
-                  .match(IRB.CreateSelect(IRB.CreateFCmpOGT(L, R), R, L)));
-  EXPECT_EQ(L, MatchL);
-  EXPECT_EQ(R, MatchR);
-}
-
-TEST_F(PatternMatchTest, FloatingPointUnorderedMax) {
-  Type *FltTy = IRB.getFloatTy();
-  Value *L = ConstantFP::get(FltTy, 1.0);
-  Value *R = ConstantFP::get(FltTy, 2.0);
-  Value *MatchL, *MatchR;
-
-  // Test UGT.
-  EXPECT_TRUE(m_UnordFMax(m_Value(MatchL), m_Value(MatchR))
-                  .match(IRB.CreateSelect(IRB.CreateFCmpUGT(L, R), L, R)));
-  EXPECT_EQ(L, MatchL);
-  EXPECT_EQ(R, MatchR);
-
-  // Test UGE.
-  EXPECT_TRUE(m_UnordFMax(m_Value(MatchL), m_Value(MatchR))
-                  .match(IRB.CreateSelect(IRB.CreateFCmpUGE(L, R), L, R)));
-  EXPECT_EQ(L, MatchL);
-  EXPECT_EQ(R, MatchR);
-
-  // Test no match on ULE.
-  EXPECT_FALSE(m_UnordFMax(m_Value(MatchL), m_Value(MatchR))
-                   .match(IRB.CreateSelect(IRB.CreateFCmpULE(L, R), L, R)));
-
-  // Test no match on ULT.
-  EXPECT_FALSE(m_UnordFMax(m_Value(MatchL), m_Value(MatchR))
-                   .match(IRB.CreateSelect(IRB.CreateFCmpULT(L, R), L, R)));
-
-  // Test inverted selects. Note, that this "inverts" the ordering, e.g.:
-  // %cmp = fcmp ule L, R
-  // %max = select %cmp R, L
-  // Given L == NaN
-  // the above is expanded to %cmp == true ==> %max = R
-  // which is true for OrdFMax, not UnordFMax, so test that:
-
-  // [UO]LE with inverted select.
-  EXPECT_FALSE(m_UnordFMax(m_Value(MatchL), m_Value(MatchR))
-                  .match(IRB.CreateSelect(IRB.CreateFCmpULE(L, R), R, L)));
-  EXPECT_TRUE(m_UnordFMax(m_Value(MatchL), m_Value(MatchR))
-                  .match(IRB.CreateSelect(IRB.CreateFCmpOLE(L, R), R, L)));
-  EXPECT_EQ(L, MatchL);
-  EXPECT_EQ(R, MatchR);
-
-  // [UO]LT with inverted select.
-  EXPECT_FALSE(m_UnordFMax(m_Value(MatchL), m_Value(MatchR))
-                  .match(IRB.CreateSelect(IRB.CreateFCmpULT(L, R), R, L)));
-  EXPECT_TRUE(m_UnordFMax(m_Value(MatchL), m_Value(MatchR))
-                  .match(IRB.CreateSelect(IRB.CreateFCmpOLT(L, R), R, L)));
-  EXPECT_EQ(L, MatchL);
-  EXPECT_EQ(R, MatchR);
-}
-
-TEST_F(PatternMatchTest, OverflowingBinOps) {
-  Value *L = IRB.getInt32(1);
-  Value *R = IRB.getInt32(2);
-  Value *MatchL, *MatchR;
-
-  EXPECT_TRUE(
-      m_NSWAdd(m_Value(MatchL), m_Value(MatchR)).match(IRB.CreateNSWAdd(L, R)));
-  EXPECT_EQ(L, MatchL);
-  EXPECT_EQ(R, MatchR);
-  MatchL = MatchR = nullptr;
-  EXPECT_TRUE(
-      m_NSWSub(m_Value(MatchL), m_Value(MatchR)).match(IRB.CreateNSWSub(L, R)));
-  EXPECT_EQ(L, MatchL);
-  EXPECT_EQ(R, MatchR);
-  MatchL = MatchR = nullptr;
-  EXPECT_TRUE(
-      m_NSWMul(m_Value(MatchL), m_Value(MatchR)).match(IRB.CreateNSWMul(L, R)));
-  EXPECT_EQ(L, MatchL);
-  EXPECT_EQ(R, MatchR);
-  MatchL = MatchR = nullptr;
-  EXPECT_TRUE(m_NSWShl(m_Value(MatchL), m_Value(MatchR)).match(
-      IRB.CreateShl(L, R, "", /* NUW */ false, /* NSW */ true)));
-  EXPECT_EQ(L, MatchL);
-  EXPECT_EQ(R, MatchR);
-
-  EXPECT_TRUE(
-      m_NUWAdd(m_Value(MatchL), m_Value(MatchR)).match(IRB.CreateNUWAdd(L, R)));
-  EXPECT_EQ(L, MatchL);
-  EXPECT_EQ(R, MatchR);
-  MatchL = MatchR = nullptr;
-  EXPECT_TRUE(
-      m_NUWSub(m_Value(MatchL), m_Value(MatchR)).match(IRB.CreateNUWSub(L, R)));
-  EXPECT_EQ(L, MatchL);
-  EXPECT_EQ(R, MatchR);
-  MatchL = MatchR = nullptr;
-  EXPECT_TRUE(
-      m_NUWMul(m_Value(MatchL), m_Value(MatchR)).match(IRB.CreateNUWMul(L, R)));
-  EXPECT_EQ(L, MatchL);
-  EXPECT_EQ(R, MatchR);
-  MatchL = MatchR = nullptr;
-  EXPECT_TRUE(m_NUWShl(m_Value(MatchL), m_Value(MatchR)).match(
-      IRB.CreateShl(L, R, "", /* NUW */ true, /* NSW */ false)));
-  EXPECT_EQ(L, MatchL);
-  EXPECT_EQ(R, MatchR);
-
-  EXPECT_FALSE(m_NSWAdd(m_Value(), m_Value()).match(IRB.CreateAdd(L, R)));
-  EXPECT_FALSE(m_NSWAdd(m_Value(), m_Value()).match(IRB.CreateNUWAdd(L, R)));
-  EXPECT_FALSE(m_NSWAdd(m_Value(), m_Value()).match(IRB.CreateNSWSub(L, R)));
-  EXPECT_FALSE(m_NSWSub(m_Value(), m_Value()).match(IRB.CreateSub(L, R)));
-  EXPECT_FALSE(m_NSWSub(m_Value(), m_Value()).match(IRB.CreateNUWSub(L, R)));
-  EXPECT_FALSE(m_NSWSub(m_Value(), m_Value()).match(IRB.CreateNSWAdd(L, R)));
-  EXPECT_FALSE(m_NSWMul(m_Value(), m_Value()).match(IRB.CreateMul(L, R)));
-  EXPECT_FALSE(m_NSWMul(m_Value(), m_Value()).match(IRB.CreateNUWMul(L, R)));
-  EXPECT_FALSE(m_NSWMul(m_Value(), m_Value()).match(IRB.CreateNSWAdd(L, R)));
-  EXPECT_FALSE(m_NSWShl(m_Value(), m_Value()).match(IRB.CreateShl(L, R)));
-  EXPECT_FALSE(m_NSWShl(m_Value(), m_Value()).match(
-      IRB.CreateShl(L, R, "", /* NUW */ true, /* NSW */ false)));
-  EXPECT_FALSE(m_NSWShl(m_Value(), m_Value()).match(IRB.CreateNSWAdd(L, R)));
-
-  EXPECT_FALSE(m_NUWAdd(m_Value(), m_Value()).match(IRB.CreateAdd(L, R)));
-  EXPECT_FALSE(m_NUWAdd(m_Value(), m_Value()).match(IRB.CreateNSWAdd(L, R)));
-  EXPECT_FALSE(m_NUWAdd(m_Value(), m_Value()).match(IRB.CreateNUWSub(L, R)));
-  EXPECT_FALSE(m_NUWSub(m_Value(), m_Value()).match(IRB.CreateSub(L, R)));
-  EXPECT_FALSE(m_NUWSub(m_Value(), m_Value()).match(IRB.CreateNSWSub(L, R)));
-  EXPECT_FALSE(m_NUWSub(m_Value(), m_Value()).match(IRB.CreateNUWAdd(L, R)));
-  EXPECT_FALSE(m_NUWMul(m_Value(), m_Value()).match(IRB.CreateMul(L, R)));
-  EXPECT_FALSE(m_NUWMul(m_Value(), m_Value()).match(IRB.CreateNSWMul(L, R)));
-  EXPECT_FALSE(m_NUWMul(m_Value(), m_Value()).match(IRB.CreateNUWAdd(L, R)));
-  EXPECT_FALSE(m_NUWShl(m_Value(), m_Value()).match(IRB.CreateShl(L, R)));
-  EXPECT_FALSE(m_NUWShl(m_Value(), m_Value()).match(
-      IRB.CreateShl(L, R, "", /* NUW */ false, /* NSW */ true)));
-  EXPECT_FALSE(m_NUWShl(m_Value(), m_Value()).match(IRB.CreateNUWAdd(L, R)));
-}
-
-TEST_F(PatternMatchTest, LoadStoreOps) {
-  // Create this load/store sequence:
-  //
-  //  %p = alloca i32*
-  //  %0 = load i32*, i32** %p
-  //  store i32 42, i32* %0
-
-  Value *Alloca = IRB.CreateAlloca(IRB.getInt32Ty());
-  Value *LoadInst = IRB.CreateLoad(IRB.getInt32Ty(), Alloca);
-  Value *FourtyTwo = IRB.getInt32(42);
-  Value *StoreInst = IRB.CreateStore(FourtyTwo, Alloca);
-  Value *MatchLoad, *MatchStoreVal, *MatchStorePointer;
-
-  EXPECT_TRUE(m_Load(m_Value(MatchLoad)).match(LoadInst));
-  EXPECT_EQ(Alloca, MatchLoad);
-
-  EXPECT_TRUE(m_Load(m_Specific(Alloca)).match(LoadInst));
-
-  EXPECT_FALSE(m_Load(m_Value(MatchLoad)).match(Alloca));
-
-  EXPECT_TRUE(m_Store(m_Value(MatchStoreVal), m_Value(MatchStorePointer))
-                .match(StoreInst));
-  EXPECT_EQ(FourtyTwo, MatchStoreVal);
-  EXPECT_EQ(Alloca, MatchStorePointer);
-
-  EXPECT_FALSE(m_Store(m_Value(MatchStoreVal), m_Value(MatchStorePointer))
-                .match(Alloca));
-
-  EXPECT_TRUE(m_Store(m_SpecificInt(42), m_Specific(Alloca))
-                .match(StoreInst));
-  EXPECT_FALSE(m_Store(m_SpecificInt(42), m_Specific(FourtyTwo))
-                .match(StoreInst));
-  EXPECT_FALSE(m_Store(m_SpecificInt(43), m_Specific(Alloca))
-                .match(StoreInst));
-}
-
-TEST_F(PatternMatchTest, VectorOps) {
-  // Build up small tree of vector operations
-  //
-  //   Val = 0 + 1
-  //   Val2 = Val + 3
-  //   VI1 = insertelement <2 x i8> undef, i8 1, i32 0 = <1, undef>
-  //   VI2 = insertelement <2 x i8> %VI1, i8 %Val2, i8 %Val = <1, 4>
-  //   VI3 = insertelement <2 x i8> %VI1, i8 %Val2, i32 1 = <1, 4>
-  //   VI4 = insertelement <2 x i8> %VI1, i8 2, i8 %Val = <1, 2>
-  //
-  //   SI1 = shufflevector <2 x i8> %VI1, <2 x i8> undef, zeroinitializer
-  //   SI2 = shufflevector <2 x i8> %VI3, <2 x i8> %VI4, <2 x i8> <i8 0, i8 2>
-  //   SI3 = shufflevector <2 x i8> %VI3, <2 x i8> undef, zeroinitializer
-  //   SI4 = shufflevector <2 x i8> %VI4, <2 x i8> undef, zeroinitializer
-  //
-  //   SP1 = VectorSplat(2, i8 2)
-  //   SP2 = VectorSplat(2, i8 %Val)
-  Type *VecTy = FixedVectorType::get(IRB.getInt8Ty(), 2);
-  Type *i32 = IRB.getInt32Ty();
-  Type *i32VecTy = FixedVectorType::get(i32, 2);
-
-  Value *Val = IRB.CreateAdd(IRB.getInt8(0), IRB.getInt8(1));
-  Value *Val2 = IRB.CreateAdd(Val, IRB.getInt8(3));
-
-  SmallVector<Constant *, 2> VecElemIdxs;
-  VecElemIdxs.push_back(ConstantInt::get(i32, 0));
-  VecElemIdxs.push_back(ConstantInt::get(i32, 2));
-  auto *IdxVec = ConstantVector::get(VecElemIdxs);
-
-  Value *UndefVec = UndefValue::get(VecTy);
-  Value *VI1 = IRB.CreateInsertElement(UndefVec, IRB.getInt8(1), (uint64_t)0);
-  Value *VI2 = IRB.CreateInsertElement(VI1, Val2, Val);
-  Value *VI3 = IRB.CreateInsertElement(VI1, Val2, (uint64_t)1);
-  Value *VI4 = IRB.CreateInsertElement(VI1, IRB.getInt8(2), Val);
-
-  Value *EX1 = IRB.CreateExtractElement(VI4, Val);
-  Value *EX2 = IRB.CreateExtractElement(VI4, (uint64_t)0);
-  Value *EX3 = IRB.CreateExtractElement(IdxVec, (uint64_t)1);
-
-  Constant *Zero = ConstantAggregateZero::get(i32VecTy);
-  SmallVector<int, 16> ZeroMask;
-  ShuffleVectorInst::getShuffleMask(Zero, ZeroMask);
-
-  Value *SI1 = IRB.CreateShuffleVector(VI1, ZeroMask);
-  Value *SI2 = IRB.CreateShuffleVector(VI3, VI4, IdxVec);
-  Value *SI3 = IRB.CreateShuffleVector(VI3, ZeroMask);
-  Value *SI4 = IRB.CreateShuffleVector(VI4, ZeroMask);
-
-  Value *SP1 = IRB.CreateVectorSplat(2, IRB.getInt8(2));
-  Value *SP2 = IRB.CreateVectorSplat(2, Val);
-
-  Value *A = nullptr, *B = nullptr, *C = nullptr;
-
-  // Test matching insertelement
-  EXPECT_TRUE(match(VI1, m_InsertElt(m_Value(), m_Value(), m_Value())));
-  EXPECT_TRUE(
-      match(VI1, m_InsertElt(m_Undef(), m_ConstantInt(), m_ConstantInt())));
-  EXPECT_TRUE(
-      match(VI1, m_InsertElt(m_Undef(), m_ConstantInt(), m_Zero())));
-  EXPECT_TRUE(
-      match(VI1, m_InsertElt(m_Undef(), m_SpecificInt(1), m_Zero())));
-  EXPECT_TRUE(match(VI2, m_InsertElt(m_Value(), m_Value(), m_Value())));
-  EXPECT_FALSE(
-      match(VI2, m_InsertElt(m_Value(), m_Value(), m_ConstantInt())));
-  EXPECT_FALSE(
-      match(VI2, m_InsertElt(m_Value(), m_ConstantInt(), m_Value())));
-  EXPECT_FALSE(match(VI2, m_InsertElt(m_Constant(), m_Value(), m_Value())));
-  EXPECT_TRUE(match(VI3, m_InsertElt(m_Value(A), m_Value(B), m_Value(C))));
-  EXPECT_TRUE(A == VI1);
-  EXPECT_TRUE(B == Val2);
-  EXPECT_TRUE(isa<ConstantInt>(C));
-  A = B = C = nullptr; // reset
-
-  // Test matching extractelement
-  EXPECT_TRUE(match(EX1, m_ExtractElt(m_Value(A), m_Value(B))));
-  EXPECT_TRUE(A == VI4);
-  EXPECT_TRUE(B == Val);
-  A = B = C = nullptr; // reset
-  EXPECT_FALSE(match(EX1, m_ExtractElt(m_Value(), m_ConstantInt())));
-  EXPECT_TRUE(match(EX2, m_ExtractElt(m_Value(), m_ConstantInt())));
-  EXPECT_TRUE(match(EX3, m_ExtractElt(m_Constant(), m_ConstantInt())));
-
-  // Test matching shufflevector
-  ArrayRef<int> Mask;
-  EXPECT_TRUE(match(SI1, m_Shuffle(m_Value(), m_Undef(), m_ZeroMask())));
-  EXPECT_TRUE(match(SI2, m_Shuffle(m_Value(A), m_Value(B), m_Mask(Mask))));
-  EXPECT_TRUE(A == VI3);
-  EXPECT_TRUE(B == VI4);
-  A = B = C = nullptr; // reset
-
-  // Test matching the vector splat pattern
-  EXPECT_TRUE(match(
-      SI1,
-      m_Shuffle(m_InsertElt(m_Undef(), m_SpecificInt(1), m_Zero()),
-                m_Undef(), m_ZeroMask())));
-  EXPECT_FALSE(match(
-      SI3, m_Shuffle(m_InsertElt(m_Undef(), m_Value(), m_Zero()),
-                     m_Undef(), m_ZeroMask())));
-  EXPECT_FALSE(match(
-      SI4, m_Shuffle(m_InsertElt(m_Undef(), m_Value(), m_Zero()),
-                     m_Undef(), m_ZeroMask())));
-  EXPECT_TRUE(match(
-      SP1,
-      m_Shuffle(m_InsertElt(m_Undef(), m_SpecificInt(2), m_Zero()),
-                m_Undef(), m_ZeroMask())));
-  EXPECT_TRUE(match(
-      SP2, m_Shuffle(m_InsertElt(m_Undef(), m_Value(A), m_Zero()),
-                     m_Undef(), m_ZeroMask())));
-  EXPECT_TRUE(A == Val);
-}
-
-TEST_F(PatternMatchTest, UndefPoisonMix) {
-  Type *ScalarTy = IRB.getInt8Ty();
-  ArrayType *ArrTy = ArrayType::get(ScalarTy, 2);
-  StructType *StTy = StructType::get(ScalarTy, ScalarTy);
-  StructType *StTy2 = StructType::get(ScalarTy, StTy);
-  StructType *StTy3 = StructType::get(StTy, ScalarTy);
-  Constant *Zero = ConstantInt::getNullValue(ScalarTy);
-  UndefValue *U = UndefValue::get(ScalarTy);
-  UndefValue *P = PoisonValue::get(ScalarTy);
-
-  EXPECT_TRUE(match(ConstantVector::get({U, P}), m_Undef()));
-  EXPECT_TRUE(match(ConstantVector::get({P, U}), m_Undef()));
-
-  EXPECT_TRUE(match(ConstantArray::get(ArrTy, {U, P}), m_Undef()));
-  EXPECT_TRUE(match(ConstantArray::get(ArrTy, {P, U}), m_Undef()));
-
-  auto *UP = ConstantStruct::get(StTy, {U, P});
-  EXPECT_TRUE(match(ConstantStruct::get(StTy2, {U, UP}), m_Undef()));
-  EXPECT_TRUE(match(ConstantStruct::get(StTy2, {P, UP}), m_Undef()));
-  EXPECT_TRUE(match(ConstantStruct::get(StTy3, {UP, U}), m_Undef()));
-  EXPECT_TRUE(match(ConstantStruct::get(StTy3, {UP, P}), m_Undef()));
-
-  EXPECT_FALSE(match(ConstantStruct::get(StTy, {U, Zero}), m_Undef()));
-  EXPECT_FALSE(match(ConstantStruct::get(StTy, {Zero, U}), m_Undef()));
-  EXPECT_FALSE(match(ConstantStruct::get(StTy, {P, Zero}), m_Undef()));
-  EXPECT_FALSE(match(ConstantStruct::get(StTy, {Zero, P}), m_Undef()));
-
-  EXPECT_FALSE(match(ConstantStruct::get(StTy2, {Zero, UP}), m_Undef()));
-  EXPECT_FALSE(match(ConstantStruct::get(StTy3, {UP, Zero}), m_Undef()));
-}
-
-TEST_F(PatternMatchTest, VectorUndefInt) {
-  Type *ScalarTy = IRB.getInt8Ty();
-  Type *VectorTy = FixedVectorType::get(ScalarTy, 4);
-  Constant *ScalarUndef = UndefValue::get(ScalarTy);
-  Constant *VectorUndef = UndefValue::get(VectorTy);
-  Constant *ScalarZero = Constant::getNullValue(ScalarTy);
-  Constant *VectorZero = Constant::getNullValue(VectorTy);
-
-  SmallVector<Constant *, 4> Elems;
-  Elems.push_back(ScalarUndef);
-  Elems.push_back(ScalarZero);
-  Elems.push_back(ScalarUndef);
-  Elems.push_back(ScalarZero);
-  Constant *VectorZeroUndef = ConstantVector::get(Elems);
-
-  EXPECT_TRUE(match(ScalarUndef, m_Undef()));
-  EXPECT_TRUE(match(VectorUndef, m_Undef()));
-  EXPECT_FALSE(match(ScalarZero, m_Undef()));
-  EXPECT_FALSE(match(VectorZero, m_Undef()));
-  EXPECT_FALSE(match(VectorZeroUndef, m_Undef()));
-
-  EXPECT_FALSE(match(ScalarUndef, m_Zero()));
-  EXPECT_FALSE(match(VectorUndef, m_Zero()));
-  EXPECT_TRUE(match(ScalarZero, m_Zero()));
-  EXPECT_TRUE(match(VectorZero, m_Zero()));
-  EXPECT_TRUE(match(VectorZeroUndef, m_Zero()));
-
-  const APInt *C;
-  // Regardless of whether undefs are allowed,
-  // a fully undef constant does not match.
-  EXPECT_FALSE(match(ScalarUndef, m_APInt(C)));
-  EXPECT_FALSE(match(ScalarUndef, m_APIntForbidUndef(C)));
-  EXPECT_FALSE(match(ScalarUndef, m_APIntAllowUndef(C)));
-  EXPECT_FALSE(match(VectorUndef, m_APInt(C)));
-  EXPECT_FALSE(match(VectorUndef, m_APIntForbidUndef(C)));
-  EXPECT_FALSE(match(VectorUndef, m_APIntAllowUndef(C)));
-
-  // We can always match simple constants and simple splats.
-  C = nullptr;
-  EXPECT_TRUE(match(ScalarZero, m_APInt(C)));
-  EXPECT_TRUE(C->isNullValue());
-  C = nullptr;
-  EXPECT_TRUE(match(ScalarZero, m_APIntForbidUndef(C)));
-  EXPECT_TRUE(C->isNullValue());
-  C = nullptr;
-  EXPECT_TRUE(match(ScalarZero, m_APIntAllowUndef(C)));
-  EXPECT_TRUE(C->isNullValue());
-  C = nullptr;
-  EXPECT_TRUE(match(VectorZero, m_APInt(C)));
-  EXPECT_TRUE(C->isNullValue());
-  C = nullptr;
-  EXPECT_TRUE(match(VectorZero, m_APIntForbidUndef(C)));
-  EXPECT_TRUE(C->isNullValue());
-  C = nullptr;
-  EXPECT_TRUE(match(VectorZero, m_APIntAllowUndef(C)));
-  EXPECT_TRUE(C->isNullValue());
-
-  // Whether splats with undef can be matched depends on the matcher.
-  EXPECT_FALSE(match(VectorZeroUndef, m_APInt(C)));
-  EXPECT_FALSE(match(VectorZeroUndef, m_APIntForbidUndef(C)));
-  C = nullptr;
-  EXPECT_TRUE(match(VectorZeroUndef, m_APIntAllowUndef(C)));
-  EXPECT_TRUE(C->isNullValue());
-}
-
-TEST_F(PatternMatchTest, VectorUndefFloat) {
-  Type *ScalarTy = IRB.getFloatTy();
-  Type *VectorTy = FixedVectorType::get(ScalarTy, 4);
-  Constant *ScalarUndef = UndefValue::get(ScalarTy);
-  Constant *VectorUndef = UndefValue::get(VectorTy);
-  Constant *ScalarZero = Constant::getNullValue(ScalarTy);
-  Constant *VectorZero = Constant::getNullValue(VectorTy);
-  Constant *ScalarPosInf = ConstantFP::getInfinity(ScalarTy, false);
-  Constant *ScalarNegInf = ConstantFP::getInfinity(ScalarTy, true);
-  Constant *ScalarNaN = ConstantFP::getNaN(ScalarTy, true);
-
-  Constant *VectorZeroUndef =
-      ConstantVector::get({ScalarUndef, ScalarZero, ScalarUndef, ScalarZero});
-
-  Constant *VectorInfUndef = ConstantVector::get(
-      {ScalarPosInf, ScalarNegInf, ScalarUndef, ScalarPosInf});
-
-  Constant *VectorNaNUndef =
-      ConstantVector::get({ScalarUndef, ScalarNaN, ScalarNaN, ScalarNaN});
-
-  EXPECT_TRUE(match(ScalarUndef, m_Undef()));
-  EXPECT_TRUE(match(VectorUndef, m_Undef()));
-  EXPECT_FALSE(match(ScalarZero, m_Undef()));
-  EXPECT_FALSE(match(VectorZero, m_Undef()));
-  EXPECT_FALSE(match(VectorZeroUndef, m_Undef()));
-  EXPECT_FALSE(match(VectorInfUndef, m_Undef()));
-  EXPECT_FALSE(match(VectorNaNUndef, m_Undef()));
-
-  EXPECT_FALSE(match(ScalarUndef, m_AnyZeroFP()));
-  EXPECT_FALSE(match(VectorUndef, m_AnyZeroFP()));
-  EXPECT_TRUE(match(ScalarZero, m_AnyZeroFP()));
-  EXPECT_TRUE(match(VectorZero, m_AnyZeroFP()));
-  EXPECT_TRUE(match(VectorZeroUndef, m_AnyZeroFP()));
-  EXPECT_FALSE(match(VectorInfUndef, m_AnyZeroFP()));
-  EXPECT_FALSE(match(VectorNaNUndef, m_AnyZeroFP()));
-
-  EXPECT_FALSE(match(ScalarUndef, m_NaN()));
-  EXPECT_FALSE(match(VectorUndef, m_NaN()));
-  EXPECT_FALSE(match(VectorZeroUndef, m_NaN()));
-  EXPECT_FALSE(match(ScalarPosInf, m_NaN()));
-  EXPECT_FALSE(match(ScalarNegInf, m_NaN()));
-  EXPECT_TRUE(match(ScalarNaN, m_NaN()));
-  EXPECT_FALSE(match(VectorInfUndef, m_NaN()));
-  EXPECT_TRUE(match(VectorNaNUndef, m_NaN()));
-
-  EXPECT_FALSE(match(ScalarUndef, m_NonNaN()));
-  EXPECT_FALSE(match(VectorUndef, m_NonNaN()));
-  EXPECT_TRUE(match(VectorZeroUndef, m_NonNaN()));
-  EXPECT_TRUE(match(ScalarPosInf, m_NonNaN()));
-  EXPECT_TRUE(match(ScalarNegInf, m_NonNaN()));
-  EXPECT_FALSE(match(ScalarNaN, m_NonNaN()));
-  EXPECT_TRUE(match(VectorInfUndef, m_NonNaN()));
-  EXPECT_FALSE(match(VectorNaNUndef, m_NonNaN()));
-
-  EXPECT_FALSE(match(ScalarUndef, m_Inf()));
-  EXPECT_FALSE(match(VectorUndef, m_Inf()));
-  EXPECT_FALSE(match(VectorZeroUndef, m_Inf()));
-  EXPECT_TRUE(match(ScalarPosInf, m_Inf()));
-  EXPECT_TRUE(match(ScalarNegInf, m_Inf()));
-  EXPECT_FALSE(match(ScalarNaN, m_Inf()));
-  EXPECT_TRUE(match(VectorInfUndef, m_Inf()));
-  EXPECT_FALSE(match(VectorNaNUndef, m_Inf()));
-
-  EXPECT_FALSE(match(ScalarUndef, m_NonInf()));
-  EXPECT_FALSE(match(VectorUndef, m_NonInf()));
-  EXPECT_TRUE(match(VectorZeroUndef, m_NonInf()));
-  EXPECT_FALSE(match(ScalarPosInf, m_NonInf()));
-  EXPECT_FALSE(match(ScalarNegInf, m_NonInf()));
-  EXPECT_TRUE(match(ScalarNaN, m_NonInf()));
-  EXPECT_FALSE(match(VectorInfUndef, m_NonInf()));
-  EXPECT_TRUE(match(VectorNaNUndef, m_NonInf()));
-
-  EXPECT_FALSE(match(ScalarUndef, m_Finite()));
-  EXPECT_FALSE(match(VectorUndef, m_Finite()));
-  EXPECT_TRUE(match(VectorZeroUndef, m_Finite()));
-  EXPECT_FALSE(match(ScalarPosInf, m_Finite()));
-  EXPECT_FALSE(match(ScalarNegInf, m_Finite()));
-  EXPECT_FALSE(match(ScalarNaN, m_Finite()));
-  EXPECT_FALSE(match(VectorInfUndef, m_Finite()));
-  EXPECT_FALSE(match(VectorNaNUndef, m_Finite()));
-
-  const APFloat *C;
-  // Regardless of whether undefs are allowed,
-  // a fully undef constant does not match.
-  EXPECT_FALSE(match(ScalarUndef, m_APFloat(C)));
-  EXPECT_FALSE(match(ScalarUndef, m_APFloatForbidUndef(C)));
-  EXPECT_FALSE(match(ScalarUndef, m_APFloatAllowUndef(C)));
-  EXPECT_FALSE(match(VectorUndef, m_APFloat(C)));
-  EXPECT_FALSE(match(VectorUndef, m_APFloatForbidUndef(C)));
-  EXPECT_FALSE(match(VectorUndef, m_APFloatAllowUndef(C)));
-
-  // We can always match simple constants and simple splats.
-  C = nullptr;
-  EXPECT_TRUE(match(ScalarZero, m_APFloat(C)));
-  EXPECT_TRUE(C->isZero());
-  C = nullptr;
-  EXPECT_TRUE(match(ScalarZero, m_APFloatForbidUndef(C)));
-  EXPECT_TRUE(C->isZero());
-  C = nullptr;
-  EXPECT_TRUE(match(ScalarZero, m_APFloatAllowUndef(C)));
-  EXPECT_TRUE(C->isZero());
-  C = nullptr;
-  EXPECT_TRUE(match(VectorZero, m_APFloat(C)));
-  EXPECT_TRUE(C->isZero());
-  C = nullptr;
-  EXPECT_TRUE(match(VectorZero, m_APFloatForbidUndef(C)));
-  EXPECT_TRUE(C->isZero());
-  C = nullptr;
-  EXPECT_TRUE(match(VectorZero, m_APFloatAllowUndef(C)));
-  EXPECT_TRUE(C->isZero());
-
-  // Whether splats with undef can be matched depends on the matcher.
-  EXPECT_FALSE(match(VectorZeroUndef, m_APFloat(C)));
-  EXPECT_FALSE(match(VectorZeroUndef, m_APFloatForbidUndef(C)));
-  C = nullptr;
-  EXPECT_TRUE(match(VectorZeroUndef, m_APFloatAllowUndef(C)));
-  EXPECT_TRUE(C->isZero());
-  C = nullptr;
-  EXPECT_TRUE(match(VectorZeroUndef, m_Finite(C)));
-  EXPECT_TRUE(C->isZero());
-}
-
-TEST_F(PatternMatchTest, FloatingPointFNeg) {
-  Type *FltTy = IRB.getFloatTy();
-  Value *One = ConstantFP::get(FltTy, 1.0);
-  Value *Z = ConstantFP::get(FltTy, 0.0);
-  Value *NZ = ConstantFP::get(FltTy, -0.0);
-  Value *V = IRB.CreateFNeg(One);
-  Value *V1 = IRB.CreateFSub(NZ, One);
-  Value *V2 = IRB.CreateFSub(Z, One);
-  Value *V3 = IRB.CreateFAdd(NZ, One);
-  Value *Match;
-
-  // Test FNeg(1.0)
-  EXPECT_TRUE(match(V, m_FNeg(m_Value(Match))));
-  EXPECT_EQ(One, Match);
-
-  // Test FSub(-0.0, 1.0)
-  EXPECT_TRUE(match(V1, m_FNeg(m_Value(Match))));
-  EXPECT_EQ(One, Match);
-
-  // Test FSub(0.0, 1.0)
-  EXPECT_FALSE(match(V2, m_FNeg(m_Value(Match))));
-  cast<Instruction>(V2)->setHasNoSignedZeros(true);
-  EXPECT_TRUE(match(V2, m_FNeg(m_Value(Match))));
-  EXPECT_EQ(One, Match);
-
-  // Test FAdd(-0.0, 1.0)
-  EXPECT_FALSE(match(V3, m_FNeg(m_Value(Match))));
-}
-
-TEST_F(PatternMatchTest, CondBranchTest) {
-  BasicBlock *TrueBB = BasicBlock::Create(Ctx, "TrueBB", F);
-  BasicBlock *FalseBB = BasicBlock::Create(Ctx, "FalseBB", F);
-  Value *Br1 = IRB.CreateCondBr(IRB.getTrue(), TrueBB, FalseBB);
-
-  EXPECT_TRUE(match(Br1, m_Br(m_Value(), m_BasicBlock(), m_BasicBlock())));
-
-  BasicBlock *A, *B;
-  EXPECT_TRUE(match(Br1, m_Br(m_Value(), m_BasicBlock(A), m_BasicBlock(B))));
-  EXPECT_EQ(TrueBB, A);
-  EXPECT_EQ(FalseBB, B);
-
-  EXPECT_FALSE(
-      match(Br1, m_Br(m_Value(), m_SpecificBB(FalseBB), m_BasicBlock())));
-  EXPECT_FALSE(
-      match(Br1, m_Br(m_Value(), m_BasicBlock(), m_SpecificBB(TrueBB))));
-  EXPECT_FALSE(
-      match(Br1, m_Br(m_Value(), m_SpecificBB(FalseBB), m_BasicBlock(TrueBB))));
-  EXPECT_TRUE(
-      match(Br1, m_Br(m_Value(), m_SpecificBB(TrueBB), m_BasicBlock(FalseBB))));
-
-  // Check we can use m_Deferred with branches.
-  EXPECT_FALSE(match(Br1, m_Br(m_Value(), m_BasicBlock(A), m_Deferred(A))));
-  Value *Br2 = IRB.CreateCondBr(IRB.getTrue(), TrueBB, TrueBB);
-  A = nullptr;
-  EXPECT_TRUE(match(Br2, m_Br(m_Value(), m_BasicBlock(A), m_Deferred(A))));
-}
-
-TEST_F(PatternMatchTest, WithOverflowInst) {
-  Value *Add = IRB.CreateBinaryIntrinsic(Intrinsic::uadd_with_overflow,
-                                         IRB.getInt32(0), IRB.getInt32(0));
-  Value *Add0 = IRB.CreateExtractValue(Add, 0);
-  Value *Add1 = IRB.CreateExtractValue(Add, 1);
-
-  EXPECT_TRUE(match(Add0, m_ExtractValue<0>(m_Value())));
-  EXPECT_FALSE(match(Add0, m_ExtractValue<1>(m_Value())));
-  EXPECT_FALSE(match(Add1, m_ExtractValue<0>(m_Value())));
-  EXPECT_TRUE(match(Add1, m_ExtractValue<1>(m_Value())));
-  EXPECT_FALSE(match(Add, m_ExtractValue<1>(m_Value())));
-  EXPECT_FALSE(match(Add, m_ExtractValue<1>(m_Value())));
-
-  WithOverflowInst *WOI;
-  EXPECT_FALSE(match(Add0, m_WithOverflowInst(WOI)));
-  EXPECT_FALSE(match(Add1, m_WithOverflowInst(WOI)));
-  EXPECT_TRUE(match(Add, m_WithOverflowInst(WOI)));
-
-  EXPECT_TRUE(match(Add0, m_ExtractValue<0>(m_WithOverflowInst(WOI))));
-  EXPECT_EQ(Add, WOI);
-  EXPECT_TRUE(match(Add1, m_ExtractValue<1>(m_WithOverflowInst(WOI))));
-  EXPECT_EQ(Add, WOI);
-}
-
-TEST_F(PatternMatchTest, MinMaxIntrinsics) {
-  Type *Ty = IRB.getInt32Ty();
-  Value *L = ConstantInt::get(Ty, 1);
-  Value *R = ConstantInt::get(Ty, 2);
-  Value *MatchL, *MatchR;
-
-  // Check for intrinsic ID match and capture of operands.
-  EXPECT_TRUE(m_SMax(m_Value(MatchL), m_Value(MatchR))
-                  .match(IRB.CreateBinaryIntrinsic(Intrinsic::smax, L, R)));
-  EXPECT_EQ(L, MatchL);
-  EXPECT_EQ(R, MatchR);
-
-  EXPECT_TRUE(m_SMin(m_Value(MatchL), m_Value(MatchR))
-                  .match(IRB.CreateBinaryIntrinsic(Intrinsic::smin, L, R)));
-  EXPECT_EQ(L, MatchL);
-  EXPECT_EQ(R, MatchR);
-
-  EXPECT_TRUE(m_UMax(m_Value(MatchL), m_Value(MatchR))
-                  .match(IRB.CreateBinaryIntrinsic(Intrinsic::umax, L, R)));
-  EXPECT_EQ(L, MatchL);
-  EXPECT_EQ(R, MatchR);
-
-  EXPECT_TRUE(m_UMin(m_Value(MatchL), m_Value(MatchR))
-                  .match(IRB.CreateBinaryIntrinsic(Intrinsic::umin, L, R)));
-  EXPECT_EQ(L, MatchL);
-  EXPECT_EQ(R, MatchR);
-
-  // Check for intrinsic ID mismatch.
-  EXPECT_FALSE(m_SMax(m_Value(MatchL), m_Value(MatchR))
-                  .match(IRB.CreateBinaryIntrinsic(Intrinsic::smin, L, R)));
-  EXPECT_FALSE(m_SMin(m_Value(MatchL), m_Value(MatchR))
-                  .match(IRB.CreateBinaryIntrinsic(Intrinsic::umax, L, R)));
-  EXPECT_FALSE(m_UMax(m_Value(MatchL), m_Value(MatchR))
-                  .match(IRB.CreateBinaryIntrinsic(Intrinsic::umin, L, R)));
-  EXPECT_FALSE(m_UMin(m_Value(MatchL), m_Value(MatchR))
-                  .match(IRB.CreateBinaryIntrinsic(Intrinsic::smax, L, R)));
-}
-
-TEST_F(PatternMatchTest, IntrinsicMatcher) {
-  Value *Name = IRB.CreateAlloca(IRB.getInt8Ty());
-  Value *Hash = IRB.getInt64(0);
-  Value *Num = IRB.getInt32(1);
-  Value *Index = IRB.getInt32(2);
-  Value *Step = IRB.getInt64(3);
-
-  Value *Ops[] = {Name, Hash, Num, Index, Step};
-  Module *M = BB->getParent()->getParent();
-  Function *TheFn =
-      Intrinsic::getDeclaration(M, Intrinsic::instrprof_increment_step);
-
-  Value *Intrinsic5 = CallInst::Create(TheFn, Ops, "", BB);
-
-  // Match without capturing.
-  EXPECT_TRUE(match(
-      Intrinsic5, m_Intrinsic<Intrinsic::instrprof_increment_step>(
-                      m_Value(), m_Value(), m_Value(), m_Value(), m_Value())));
-  EXPECT_FALSE(match(
-      Intrinsic5, m_Intrinsic<Intrinsic::memmove>(
-                      m_Value(), m_Value(), m_Value(), m_Value(), m_Value())));
-
-  // Match with capturing.
-  Value *Arg1 = nullptr;
-  Value *Arg2 = nullptr;
-  Value *Arg3 = nullptr;
-  Value *Arg4 = nullptr;
-  Value *Arg5 = nullptr;
-  EXPECT_TRUE(
-      match(Intrinsic5, m_Intrinsic<Intrinsic::instrprof_increment_step>(
-                            m_Value(Arg1), m_Value(Arg2), m_Value(Arg3),
-                            m_Value(Arg4), m_Value(Arg5))));
-  EXPECT_EQ(Arg1, Name);
-  EXPECT_EQ(Arg2, Hash);
-  EXPECT_EQ(Arg3, Num);
-  EXPECT_EQ(Arg4, Index);
-  EXPECT_EQ(Arg5, Step);
-
-  // Match specific second argument.
-  EXPECT_TRUE(
-      match(Intrinsic5,
-            m_Intrinsic<Intrinsic::instrprof_increment_step>(
-                m_Value(), m_SpecificInt(0), m_Value(), m_Value(), m_Value())));
-  EXPECT_FALSE(
-      match(Intrinsic5, m_Intrinsic<Intrinsic::instrprof_increment_step>(
-                            m_Value(), m_SpecificInt(10), m_Value(), m_Value(),
-                            m_Value())));
-
-  // Match specific third argument.
-  EXPECT_TRUE(
-      match(Intrinsic5,
-            m_Intrinsic<Intrinsic::instrprof_increment_step>(
-                m_Value(), m_Value(), m_SpecificInt(1), m_Value(), m_Value())));
-  EXPECT_FALSE(
-      match(Intrinsic5, m_Intrinsic<Intrinsic::instrprof_increment_step>(
-                            m_Value(), m_Value(), m_SpecificInt(10), m_Value(),
-                            m_Value())));
-
-  // Match specific fourth argument.
-  EXPECT_TRUE(
-      match(Intrinsic5,
-            m_Intrinsic<Intrinsic::instrprof_increment_step>(
-                m_Value(), m_Value(), m_Value(), m_SpecificInt(2), m_Value())));
-  EXPECT_FALSE(
-      match(Intrinsic5, m_Intrinsic<Intrinsic::instrprof_increment_step>(
-                            m_Value(), m_Value(), m_Value(), m_SpecificInt(10),
-                            m_Value())));
-
-  // Match specific fifth argument.
-  EXPECT_TRUE(
-      match(Intrinsic5,
-            m_Intrinsic<Intrinsic::instrprof_increment_step>(
-                m_Value(), m_Value(), m_Value(), m_Value(), m_SpecificInt(3))));
-  EXPECT_FALSE(
-      match(Intrinsic5, m_Intrinsic<Intrinsic::instrprof_increment_step>(
-                            m_Value(), m_Value(), m_Value(), m_Value(),
-                            m_SpecificInt(10))));
-}
-
-namespace {
-
-struct is_unsigned_zero_pred {
-  bool isValue(const APInt &C) { return C.isNullValue(); }
-};
-
-struct is_float_zero_pred {
-  bool isValue(const APFloat &C) { return C.isZero(); }
-};
-
-template <typename T> struct always_true_pred {
-  bool isValue(const T &) { return true; }
-};
-
-template <typename T> struct always_false_pred {
-  bool isValue(const T &) { return false; }
-};
-
-struct is_unsigned_max_pred {
-  bool isValue(const APInt &C) { return C.isMaxValue(); }
-};
-
-struct is_float_nan_pred {
-  bool isValue(const APFloat &C) { return C.isNaN(); }
-};
-
-} // namespace
-
-TEST_F(PatternMatchTest, ConstantPredicateType) {
-
-  // Scalar integer
-  APInt U32Max = APInt::getAllOnesValue(32);
-  APInt U32Zero = APInt::getNullValue(32);
-  APInt U32DeadBeef(32, 0xDEADBEEF);
-
-  Type *U32Ty = Type::getInt32Ty(Ctx);
-
-  Constant *CU32Max = Constant::getIntegerValue(U32Ty, U32Max);
-  Constant *CU32Zero = Constant::getIntegerValue(U32Ty, U32Zero);
-  Constant *CU32DeadBeef = Constant::getIntegerValue(U32Ty, U32DeadBeef);
-
-  EXPECT_TRUE(match(CU32Max, cst_pred_ty<is_unsigned_max_pred>()));
-  EXPECT_FALSE(match(CU32Max, cst_pred_ty<is_unsigned_zero_pred>()));
-  EXPECT_TRUE(match(CU32Max, cst_pred_ty<always_true_pred<APInt>>()));
-  EXPECT_FALSE(match(CU32Max, cst_pred_ty<always_false_pred<APInt>>()));
-
-  EXPECT_FALSE(match(CU32Zero, cst_pred_ty<is_unsigned_max_pred>()));
-  EXPECT_TRUE(match(CU32Zero, cst_pred_ty<is_unsigned_zero_pred>()));
-  EXPECT_TRUE(match(CU32Zero, cst_pred_ty<always_true_pred<APInt>>()));
-  EXPECT_FALSE(match(CU32Zero, cst_pred_ty<always_false_pred<APInt>>()));
-
-  EXPECT_FALSE(match(CU32DeadBeef, cst_pred_ty<is_unsigned_max_pred>()));
-  EXPECT_FALSE(match(CU32DeadBeef, cst_pred_ty<is_unsigned_zero_pred>()));
-  EXPECT_TRUE(match(CU32DeadBeef, cst_pred_ty<always_true_pred<APInt>>()));
-  EXPECT_FALSE(match(CU32DeadBeef, cst_pred_ty<always_false_pred<APInt>>()));
-
-  // Scalar float
-  APFloat F32NaN = APFloat::getNaN(APFloat::IEEEsingle());
-  APFloat F32Zero = APFloat::getZero(APFloat::IEEEsingle());
-  APFloat F32Pi(3.14f);
-
-  Type *F32Ty = Type::getFloatTy(Ctx);
-
-  Constant *CF32NaN = ConstantFP::get(F32Ty, F32NaN);
-  Constant *CF32Zero = ConstantFP::get(F32Ty, F32Zero);
-  Constant *CF32Pi = ConstantFP::get(F32Ty, F32Pi);
-
-  EXPECT_TRUE(match(CF32NaN, cstfp_pred_ty<is_float_nan_pred>()));
-  EXPECT_FALSE(match(CF32NaN, cstfp_pred_ty<is_float_zero_pred>()));
-  EXPECT_TRUE(match(CF32NaN, cstfp_pred_ty<always_true_pred<APFloat>>()));
-  EXPECT_FALSE(match(CF32NaN, cstfp_pred_ty<always_false_pred<APFloat>>()));
-
-  EXPECT_FALSE(match(CF32Zero, cstfp_pred_ty<is_float_nan_pred>()));
-  EXPECT_TRUE(match(CF32Zero, cstfp_pred_ty<is_float_zero_pred>()));
-  EXPECT_TRUE(match(CF32Zero, cstfp_pred_ty<always_true_pred<APFloat>>()));
-  EXPECT_FALSE(match(CF32Zero, cstfp_pred_ty<always_false_pred<APFloat>>()));
-
-  EXPECT_FALSE(match(CF32Pi, cstfp_pred_ty<is_float_nan_pred>()));
-  EXPECT_FALSE(match(CF32Pi, cstfp_pred_ty<is_float_zero_pred>()));
-  EXPECT_TRUE(match(CF32Pi, cstfp_pred_ty<always_true_pred<APFloat>>()));
-  EXPECT_FALSE(match(CF32Pi, cstfp_pred_ty<always_false_pred<APFloat>>()));
-
-  auto FixedEC = ElementCount::getFixed(4);
-  auto ScalableEC = ElementCount::getScalable(4);
-
-  // Vector splat
-
-  for (auto EC : {FixedEC, ScalableEC}) {
-    // integer
-
-    Constant *CSplatU32Max = ConstantVector::getSplat(EC, CU32Max);
-    Constant *CSplatU32Zero = ConstantVector::getSplat(EC, CU32Zero);
-    Constant *CSplatU32DeadBeef = ConstantVector::getSplat(EC, CU32DeadBeef);
-
-    EXPECT_TRUE(match(CSplatU32Max, cst_pred_ty<is_unsigned_max_pred>()));
-    EXPECT_FALSE(match(CSplatU32Max, cst_pred_ty<is_unsigned_zero_pred>()));
-    EXPECT_TRUE(match(CSplatU32Max, cst_pred_ty<always_true_pred<APInt>>()));
-    EXPECT_FALSE(match(CSplatU32Max, cst_pred_ty<always_false_pred<APInt>>()));
-
-    EXPECT_FALSE(match(CSplatU32Zero, cst_pred_ty<is_unsigned_max_pred>()));
-    EXPECT_TRUE(match(CSplatU32Zero, cst_pred_ty<is_unsigned_zero_pred>()));
-    EXPECT_TRUE(match(CSplatU32Zero, cst_pred_ty<always_true_pred<APInt>>()));
-    EXPECT_FALSE(match(CSplatU32Zero, cst_pred_ty<always_false_pred<APInt>>()));
-
-    EXPECT_FALSE(match(CSplatU32DeadBeef, cst_pred_ty<is_unsigned_max_pred>()));
-    EXPECT_FALSE(
-        match(CSplatU32DeadBeef, cst_pred_ty<is_unsigned_zero_pred>()));
-    EXPECT_TRUE(
-        match(CSplatU32DeadBeef, cst_pred_ty<always_true_pred<APInt>>()));
-    EXPECT_FALSE(
-        match(CSplatU32DeadBeef, cst_pred_ty<always_false_pred<APInt>>()));
-
-    // float
-
-    Constant *CSplatF32NaN = ConstantVector::getSplat(EC, CF32NaN);
-    Constant *CSplatF32Zero = ConstantVector::getSplat(EC, CF32Zero);
-    Constant *CSplatF32Pi = ConstantVector::getSplat(EC, CF32Pi);
-
-    EXPECT_TRUE(match(CSplatF32NaN, cstfp_pred_ty<is_float_nan_pred>()));
-    EXPECT_FALSE(match(CSplatF32NaN, cstfp_pred_ty<is_float_zero_pred>()));
-    EXPECT_TRUE(
-        match(CSplatF32NaN, cstfp_pred_ty<always_true_pred<APFloat>>()));
-    EXPECT_FALSE(
-        match(CSplatF32NaN, cstfp_pred_ty<always_false_pred<APFloat>>()));
-
-    EXPECT_FALSE(match(CSplatF32Zero, cstfp_pred_ty<is_float_nan_pred>()));
-    EXPECT_TRUE(match(CSplatF32Zero, cstfp_pred_ty<is_float_zero_pred>()));
-    EXPECT_TRUE(
-        match(CSplatF32Zero, cstfp_pred_ty<always_true_pred<APFloat>>()));
-    EXPECT_FALSE(
-        match(CSplatF32Zero, cstfp_pred_ty<always_false_pred<APFloat>>()));
-
-    EXPECT_FALSE(match(CSplatF32Pi, cstfp_pred_ty<is_float_nan_pred>()));
-    EXPECT_FALSE(match(CSplatF32Pi, cstfp_pred_ty<is_float_zero_pred>()));
-    EXPECT_TRUE(match(CSplatF32Pi, cstfp_pred_ty<always_true_pred<APFloat>>()));
-    EXPECT_FALSE(
-        match(CSplatF32Pi, cstfp_pred_ty<always_false_pred<APFloat>>()));
-  }
-
-  // Int arbitrary vector
-
-  Constant *CMixedU32 = ConstantVector::get({CU32Max, CU32Zero, CU32DeadBeef});
-  Constant *CU32Undef = UndefValue::get(U32Ty);
-  Constant *CU32MaxWithUndef =
-      ConstantVector::get({CU32Undef, CU32Max, CU32Undef});
-
-  EXPECT_FALSE(match(CMixedU32, cst_pred_ty<is_unsigned_max_pred>()));
-  EXPECT_FALSE(match(CMixedU32, cst_pred_ty<is_unsigned_zero_pred>()));
-  EXPECT_TRUE(match(CMixedU32, cst_pred_ty<always_true_pred<APInt>>()));
-  EXPECT_FALSE(match(CMixedU32, cst_pred_ty<always_false_pred<APInt>>()));
-
-  EXPECT_TRUE(match(CU32MaxWithUndef, cst_pred_ty<is_unsigned_max_pred>()));
-  EXPECT_FALSE(match(CU32MaxWithUndef, cst_pred_ty<is_unsigned_zero_pred>()));
-  EXPECT_TRUE(match(CU32MaxWithUndef, cst_pred_ty<always_true_pred<APInt>>()));
-  EXPECT_FALSE(
-      match(CU32MaxWithUndef, cst_pred_ty<always_false_pred<APInt>>()));
-
-  // Float arbitrary vector
-
-  Constant *CMixedF32 = ConstantVector::get({CF32NaN, CF32Zero, CF32Pi});
-  Constant *CF32Undef = UndefValue::get(F32Ty);
-  Constant *CF32NaNWithUndef =
-      ConstantVector::get({CF32Undef, CF32NaN, CF32Undef});
-
-  EXPECT_FALSE(match(CMixedF32, cstfp_pred_ty<is_float_nan_pred>()));
-  EXPECT_FALSE(match(CMixedF32, cstfp_pred_ty<is_float_zero_pred>()));
-  EXPECT_TRUE(match(CMixedF32, cstfp_pred_ty<always_true_pred<APFloat>>()));
-  EXPECT_FALSE(match(CMixedF32, cstfp_pred_ty<always_false_pred<APFloat>>()));
-
-  EXPECT_TRUE(match(CF32NaNWithUndef, cstfp_pred_ty<is_float_nan_pred>()));
-  EXPECT_FALSE(match(CF32NaNWithUndef, cstfp_pred_ty<is_float_zero_pred>()));
-  EXPECT_TRUE(
-      match(CF32NaNWithUndef, cstfp_pred_ty<always_true_pred<APFloat>>()));
-  EXPECT_FALSE(
-      match(CF32NaNWithUndef, cstfp_pred_ty<always_false_pred<APFloat>>()));
-}
-
-TEST_F(PatternMatchTest, InsertValue) {
-  Type *StructTy = StructType::create(IRB.getContext(),
-                                      {IRB.getInt32Ty(), IRB.getInt64Ty()});
-  Value *Ins0 =
-      IRB.CreateInsertValue(UndefValue::get(StructTy), IRB.getInt32(20), 0);
-  Value *Ins1 = IRB.CreateInsertValue(Ins0, IRB.getInt64(90), 1);
-
-  EXPECT_TRUE(match(Ins0, m_InsertValue<0>(m_Value(), m_Value())));
-  EXPECT_FALSE(match(Ins0, m_InsertValue<1>(m_Value(), m_Value())));
-  EXPECT_FALSE(match(Ins1, m_InsertValue<0>(m_Value(), m_Value())));
-  EXPECT_TRUE(match(Ins1, m_InsertValue<1>(m_Value(), m_Value())));
-
-  EXPECT_TRUE(match(Ins0, m_InsertValue<0>(m_Undef(), m_SpecificInt(20))));
-  EXPECT_FALSE(match(Ins0, m_InsertValue<0>(m_Undef(), m_SpecificInt(0))));
-
-  EXPECT_TRUE(
-      match(Ins1, m_InsertValue<1>(m_InsertValue<0>(m_Value(), m_Value()),
-                                   m_SpecificInt(90))));
-  EXPECT_FALSE(match(IRB.getInt64(99), m_InsertValue<0>(m_Value(), m_Value())));
-}
-
-TEST_F(PatternMatchTest, VScale) {
-  DataLayout DL = M->getDataLayout();
-
-  Type *VecTy = ScalableVectorType::get(IRB.getInt8Ty(), 1);
-  Type *VecPtrTy = VecTy->getPointerTo();
-  Value *NullPtrVec = Constant::getNullValue(VecPtrTy);
-  Value *GEP = IRB.CreateGEP(VecTy, NullPtrVec, IRB.getInt64(1));
-  Value *PtrToInt = IRB.CreatePtrToInt(GEP, DL.getIntPtrType(GEP->getType()));
-  EXPECT_TRUE(match(PtrToInt, m_VScale(DL)));
-
-  // Prior to this patch, this case would cause assertion failures when attempting to match m_VScale
-  Type *VecTy2 = ScalableVectorType::get(IRB.getInt8Ty(), 2);
-  Value *NullPtrVec2 = Constant::getNullValue(VecTy2->getPointerTo());
-  Value *BitCast = IRB.CreateBitCast(NullPtrVec2, VecPtrTy);
-  Value *GEP2 = IRB.CreateGEP(VecTy, BitCast, IRB.getInt64(1));
-  Value *PtrToInt2 =
-      IRB.CreatePtrToInt(GEP2, DL.getIntPtrType(GEP2->getType()));
-  EXPECT_FALSE(match(PtrToInt2, m_VScale(DL)));
-}
-
-template <typename T> struct MutableConstTest : PatternMatchTest { };
-
-typedef ::testing::Types<std::tuple<Value*, Instruction*>,
-                         std::tuple<const Value*, const Instruction *>>
-    MutableConstTestTypes;
-TYPED_TEST_SUITE(MutableConstTest, MutableConstTestTypes, );
-
-TYPED_TEST(MutableConstTest, ICmp) {
-  auto &IRB = PatternMatchTest::IRB;
-
-  typedef std::tuple_element_t<0, TypeParam> ValueType;
-  typedef std::tuple_element_t<1, TypeParam> InstructionType;
-
-  Value *L = IRB.getInt32(1);
-  Value *R = IRB.getInt32(2);
-  ICmpInst::Predicate Pred = ICmpInst::ICMP_UGT;
-
-  ValueType MatchL;
-  ValueType MatchR;
-  ICmpInst::Predicate MatchPred;
-
-  EXPECT_TRUE(m_ICmp(MatchPred, m_Value(MatchL), m_Value(MatchR))
-              .match((InstructionType)IRB.CreateICmp(Pred, L, R)));
-  EXPECT_EQ(L, MatchL);
-  EXPECT_EQ(R, MatchR);
-}
-
-} // anonymous namespace.
diff --git a/gnu/llvm/llvm/unittests/IR/TimePassesTest.cpp b/gnu/llvm/llvm/unittests/IR/TimePassesTest.cpp
deleted file mode 100644
index b9a99018169..00000000000
--- a/gnu/llvm/llvm/unittests/IR/TimePassesTest.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-//===- unittests/IR/TimePassesTest.cpp - TimePassesHandler tests ----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include <gtest/gtest.h>
-#include <llvm/ADT/SmallString.h>
-#include "llvm/IR/LegacyPassManager.h"
-#include <llvm/IR/LLVMContext.h>
-#include <llvm/IR/Module.h>
-#include <llvm/IR/PassInstrumentation.h>
-#include <llvm/IR/PassManager.h>
-#include <llvm/IR/PassTimingInfo.h>
-#include <llvm/Support/raw_ostream.h>
-
-using namespace llvm;
-
-//===----------------------------------------------------------------------===//
-// Define dummy passes for legacy pass manager run.
-
-namespace llvm {
-
-void initializePass1Pass(PassRegistry &);
-void initializePass2Pass(PassRegistry &);
-
-namespace {
-struct Pass1 : public ModulePass {
-  static char ID;
-
-public:
-  Pass1() : ModulePass(ID) {}
-  bool runOnModule(Module &M) override { return false; }
-  void getAnalysisUsage(AnalysisUsage &AU) const override {
-    AU.setPreservesAll();
-  }
-  StringRef getPassName() const override { return "Pass1"; }
-};
-char Pass1::ID;
-
-struct Pass2 : public ModulePass {
-  static char ID;
-
-public:
-  Pass2() : ModulePass(ID) {}
-  bool runOnModule(Module &M) override { return false; }
-  void getAnalysisUsage(AnalysisUsage &AU) const override {
-    AU.setPreservesAll();
-  }
-  StringRef getPassName() const override { return "Pass2"; }
-};
-char Pass2::ID;
-} // namespace
-} // namespace llvm
-
-INITIALIZE_PASS(Pass1, "Pass1", "Pass1", false, false)
-INITIALIZE_PASS(Pass2, "Pass2", "Pass2", false, false)
-
-namespace {
-
-TEST(TimePassesTest, LegacyCustomOut) {
-  PassInstrumentationCallbacks PIC;
-  PassInstrumentation PI(&PIC);
-
-  LLVMContext Context;
-  Module M("TestModule", Context);
-
-  SmallString<0> TimePassesStr;
-  raw_svector_ostream ReportStream(TimePassesStr);
-
-  // Setup pass manager
-  legacy::PassManager PM1;
-  PM1.add(new llvm::Pass1());
-  PM1.add(new llvm::Pass2());
-
-  // Enable time-passes and run passes.
-  TimePassesIsEnabled = true;
-  PM1.run(M);
-
-  // Generating report.
-  reportAndResetTimings(&ReportStream);
-
-  // There should be Pass1 and Pass2 in the report
-  EXPECT_FALSE(TimePassesStr.empty());
-  EXPECT_TRUE(TimePassesStr.str().contains("report"));
-  EXPECT_TRUE(TimePassesStr.str().contains("Pass1"));
-  EXPECT_TRUE(TimePassesStr.str().contains("Pass2"));
-
-  // Clear and generate report again.
-  TimePassesStr.clear();
-  reportAndResetTimings(&ReportStream);
-
-  // Since we did not run any passes since last print, report should be empty.
-  EXPECT_TRUE(TimePassesStr.empty());
-
-  // Now run just a single pass to populate timers again.
-  legacy::PassManager PM2;
-  PM2.add(new llvm::Pass2());
-  PM2.run(M);
-
-  // Generate report again.
-  reportAndResetTimings(&ReportStream);
-
-  // There should be Pass2 in this report and no Pass1.
-  EXPECT_FALSE(TimePassesStr.str().empty());
-  EXPECT_TRUE(TimePassesStr.str().contains("report"));
-  EXPECT_FALSE(TimePassesStr.str().contains("Pass1"));
-  EXPECT_TRUE(TimePassesStr.str().contains("Pass2"));
-}
-
-class MyPass1 : public PassInfoMixin<MyPass1> {};
-class MyPass2 : public PassInfoMixin<MyPass2> {};
-
-TEST(TimePassesTest, CustomOut) {
-  PassInstrumentationCallbacks PIC;
-  PassInstrumentation PI(&PIC);
-
-  LLVMContext Context;
-  Module M("TestModule", Context);
-  MyPass1 Pass1;
-  MyPass2 Pass2;
-
-  SmallString<0> TimePassesStr;
-  raw_svector_ostream ReportStream(TimePassesStr);
-
-  // Setup time-passes handler and redirect output to the stream.
-  std::unique_ptr<TimePassesHandler> TimePasses =
-      std::make_unique<TimePassesHandler>(true);
-  TimePasses->setOutStream(ReportStream);
-  TimePasses->registerCallbacks(PIC);
-
-  // Pretending that passes are running to trigger the timers.
-  PI.runBeforePass(Pass1, M);
-  PI.runBeforePass(Pass2, M);
-  PI.runAfterPass(Pass2, M, PreservedAnalyses::all());
-  PI.runAfterPass(Pass1, M, PreservedAnalyses::all());
-
-  // Generating report.
-  TimePasses->print();
-
-  // There should be Pass1 and Pass2 in the report
-  EXPECT_FALSE(TimePassesStr.empty());
-  EXPECT_TRUE(TimePassesStr.str().contains("report"));
-  EXPECT_TRUE(TimePassesStr.str().contains("Pass1"));
-  EXPECT_TRUE(TimePassesStr.str().contains("Pass2"));
-
-  // Clear and generate report again.
-  TimePassesStr.clear();
-  TimePasses->print();
-  // Since we did not run any passes since last print, report should be empty.
-  EXPECT_TRUE(TimePassesStr.empty());
-
-  // Now trigger just a single pass to populate timers again.
-  PI.runBeforePass(Pass2, M);
-  PI.runAfterPass(Pass2, M, PreservedAnalyses::all());
-
-  // Generate report by deleting the handler.
-  TimePasses.reset();
-
-  // There should be Pass2 in this report and no Pass1.
-  EXPECT_FALSE(TimePassesStr.str().empty());
-  EXPECT_TRUE(TimePassesStr.str().contains("report"));
-  EXPECT_FALSE(TimePassesStr.str().contains("Pass1"));
-  EXPECT_TRUE(TimePassesStr.str().contains("Pass2"));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/IR/TypesTest.cpp b/gnu/llvm/llvm/unittests/IR/TypesTest.cpp
deleted file mode 100644
index 03642d2340e..00000000000
--- a/gnu/llvm/llvm/unittests/IR/TypesTest.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-//===- llvm/unittest/IR/TypesTest.cpp - Type unit tests -------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/IR/DerivedTypes.h"
-#include "llvm/IR/LLVMContext.h"
-#include "gtest/gtest.h"
-using namespace llvm;
-
-namespace {
-
-TEST(TypesTest, StructType) {
-  LLVMContext C;
-
-  // PR13522
-  StructType *Struct = StructType::create(C, "FooBar");
-  EXPECT_EQ("FooBar", Struct->getName());
-  Struct->setName(Struct->getName().substr(0, 3));
-  EXPECT_EQ("Foo", Struct->getName());
-  Struct->setName("");
-  EXPECT_TRUE(Struct->getName().empty());
-  EXPECT_FALSE(Struct->hasName());
-}
-
-TEST(TypesTest, LayoutIdenticalEmptyStructs) {
-  LLVMContext C;
-
-  StructType *Foo = StructType::create(C, "Foo");
-  StructType *Bar = StructType::create(C, "Bar");
-  EXPECT_TRUE(Foo->isLayoutIdentical(Bar));
-}
-
-TEST(TypesTest, CopyPointerType) {
-  LLVMContext C;
-
-  PointerType *P1 = PointerType::get(C, 1);
-  EXPECT_TRUE(P1->isOpaque());
-  PointerType *P1C = PointerType::getWithSamePointeeType(P1, 1);
-  EXPECT_EQ(P1, P1C);
-  EXPECT_TRUE(P1C->isOpaque());
-  PointerType *P1C0 = PointerType::getWithSamePointeeType(P1, 0);
-  EXPECT_NE(P1, P1C0);
-  EXPECT_TRUE(P1C0->isOpaque());
-
-  Type *Int8 = Type::getInt8Ty(C);
-  PointerType *P2 = PointerType::get(Int8, 1);
-  EXPECT_FALSE(P2->isOpaque());
-  PointerType *P2C = PointerType::getWithSamePointeeType(P2, 1);
-  EXPECT_EQ(P2, P2C);
-  EXPECT_FALSE(P2C->isOpaque());
-  PointerType *P2C0 = PointerType::getWithSamePointeeType(P2, 0);
-  EXPECT_NE(P2, P2C0);
-  EXPECT_FALSE(P2C0->isOpaque());
-}
-
-}  // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/IR/UseTest.cpp b/gnu/llvm/llvm/unittests/IR/UseTest.cpp
deleted file mode 100644
index a647ec72108..00000000000
--- a/gnu/llvm/llvm/unittests/IR/UseTest.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-//===- llvm/unittest/IR/UseTest.cpp - Use unit tests ----------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/User.h"
-#include "llvm/Support/Format.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST(UseTest, sort) {
-  LLVMContext C;
-
-  const char *ModuleString = "define void @f(i32 %x) {\n"
-                             "entry:\n"
-                             "  %v0 = add i32 %x, 0\n"
-                             "  %v2 = add i32 %x, 2\n"
-                             "  %v5 = add i32 %x, 5\n"
-                             "  %v1 = add i32 %x, 1\n"
-                             "  %v3 = add i32 %x, 3\n"
-                             "  %v7 = add i32 %x, 7\n"
-                             "  %v6 = add i32 %x, 6\n"
-                             "  %v4 = add i32 %x, 4\n"
-                             "  ret void\n"
-                             "}\n";
-  SMDiagnostic Err;
-  char vnbuf[8];
-  std::unique_ptr<Module> M = parseAssemblyString(ModuleString, Err, C);
-  Function *F = M->getFunction("f");
-  ASSERT_TRUE(F);
-  ASSERT_TRUE(F->arg_begin() != F->arg_end());
-  Argument &X = *F->arg_begin();
-  ASSERT_EQ("x", X.getName());
-
-  X.sortUseList([](const Use &L, const Use &R) {
-    return L.getUser()->getName() < R.getUser()->getName();
-  });
-  unsigned I = 0;
-  for (User *U : X.users()) {
-    format("v%u", I++).snprint(vnbuf, sizeof(vnbuf));
-    EXPECT_EQ(vnbuf, U->getName());
-  }
-  ASSERT_EQ(8u, I);
-
-  X.sortUseList([](const Use &L, const Use &R) {
-    return L.getUser()->getName() > R.getUser()->getName();
-  });
-  I = 0;
-  for (User *U : X.users()) {
-    format("v%u", (7 - I++)).snprint(vnbuf, sizeof(vnbuf));
-    EXPECT_EQ(vnbuf, U->getName());
-  }
-  ASSERT_EQ(8u, I);
-}
-
-TEST(UseTest, reverse) {
-  LLVMContext C;
-
-  const char *ModuleString = "define void @f(i32 %x) {\n"
-                             "entry:\n"
-                             "  %v0 = add i32 %x, 0\n"
-                             "  %v2 = add i32 %x, 2\n"
-                             "  %v5 = add i32 %x, 5\n"
-                             "  %v1 = add i32 %x, 1\n"
-                             "  %v3 = add i32 %x, 3\n"
-                             "  %v7 = add i32 %x, 7\n"
-                             "  %v6 = add i32 %x, 6\n"
-                             "  %v4 = add i32 %x, 4\n"
-                             "  ret void\n"
-                             "}\n";
-  SMDiagnostic Err;
-  char vnbuf[8];
-  std::unique_ptr<Module> M = parseAssemblyString(ModuleString, Err, C);
-  Function *F = M->getFunction("f");
-  ASSERT_TRUE(F);
-  ASSERT_TRUE(F->arg_begin() != F->arg_end());
-  Argument &X = *F->arg_begin();
-  ASSERT_EQ("x", X.getName());
-
-  X.sortUseList([](const Use &L, const Use &R) {
-    return L.getUser()->getName() < R.getUser()->getName();
-  });
-  unsigned I = 0;
-  for (User *U : X.users()) {
-    format("v%u", I++).snprint(vnbuf, sizeof(vnbuf));
-    EXPECT_EQ(vnbuf, U->getName());
-  }
-  ASSERT_EQ(8u, I);
-
-  X.reverseUseList();
-  I = 0;
-  for (User *U : X.users()) {
-    format("v%u", (7 - I++)).snprint(vnbuf, sizeof(vnbuf));
-    EXPECT_EQ(vnbuf, U->getName());
-  }
-  ASSERT_EQ(8u, I);
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/IR/UserTest.cpp b/gnu/llvm/llvm/unittests/IR/UserTest.cpp
deleted file mode 100644
index 8fd435ecbc2..00000000000
--- a/gnu/llvm/llvm/unittests/IR/UserTest.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-//===- llvm/unittest/IR/UserTest.cpp - User unit tests --------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/IR/User.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-using namespace llvm;
-
-namespace {
-
-TEST(UserTest, ValueOpIteration) {
-  LLVMContext C;
-
-  const char *ModuleString = "define void @f(i32 %x, i32 %y) {\n"
-                             "entry:\n"
-                             "  switch i32 undef, label %s0\n"
-                             "      [ i32 1, label %s1\n"
-                             "        i32 2, label %s2\n"
-                             "        i32 3, label %s3\n"
-                             "        i32 4, label %s4\n"
-                             "        i32 5, label %s5\n"
-                             "        i32 6, label %s6\n"
-                             "        i32 7, label %s7\n"
-                             "        i32 8, label %s8\n"
-                             "        i32 9, label %s9 ]\n"
-                             "\n"
-                             "s0:\n"
-                             "  br label %exit\n"
-                             "s1:\n"
-                             "  br label %exit\n"
-                             "s2:\n"
-                             "  br label %exit\n"
-                             "s3:\n"
-                             "  br label %exit\n"
-                             "s4:\n"
-                             "  br label %exit\n"
-                             "s5:\n"
-                             "  br label %exit\n"
-                             "s6:\n"
-                             "  br label %exit\n"
-                             "s7:\n"
-                             "  br label %exit\n"
-                             "s8:\n"
-                             "  br label %exit\n"
-                             "s9:\n"
-                             "  br label %exit\n"
-                             "\n"
-                             "exit:\n"
-                             "  %phi = phi i32 [ 0, %s0 ], [ 1, %s1 ],\n"
-                             "                 [ 2, %s2 ], [ 3, %s3 ],\n"
-                             "                 [ 4, %s4 ], [ 5, %s5 ],\n"
-                             "                 [ 6, %s6 ], [ 7, %s7 ],\n"
-                             "                 [ 8, %s8 ], [ 9, %s9 ]\n"
-                             "  ret void\n"
-                             "}\n";
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M = parseAssemblyString(ModuleString, Err, C);
-
-  Function *F = M->getFunction("f");
-  BasicBlock &ExitBB = F->back();
-  PHINode &P = cast<PHINode>(ExitBB.front());
-  EXPECT_TRUE(P.value_op_begin() == P.value_op_begin());
-  EXPECT_FALSE(P.value_op_begin() == P.value_op_end());
-  EXPECT_TRUE(P.value_op_begin() != P.value_op_end());
-  EXPECT_FALSE(P.value_op_end() != P.value_op_end());
-  EXPECT_TRUE(P.value_op_begin() < P.value_op_end());
-  EXPECT_FALSE(P.value_op_begin() < P.value_op_begin());
-  EXPECT_TRUE(P.value_op_end() > P.value_op_begin());
-  EXPECT_FALSE(P.value_op_begin() > P.value_op_begin());
-  EXPECT_TRUE(P.value_op_begin() <= P.value_op_begin());
-  EXPECT_FALSE(P.value_op_end() <= P.value_op_begin());
-  EXPECT_TRUE(P.value_op_begin() >= P.value_op_begin());
-  EXPECT_FALSE(P.value_op_begin() >= P.value_op_end());
-  EXPECT_EQ(10, std::distance(P.value_op_begin(), P.value_op_end()));
-
-  // const value op iteration
-  const PHINode *IP = &P;
-  EXPECT_TRUE(IP->value_op_begin() == IP->value_op_begin());
-  EXPECT_FALSE(IP->value_op_begin() == IP->value_op_end());
-  EXPECT_TRUE(IP->value_op_begin() != IP->value_op_end());
-  EXPECT_FALSE(IP->value_op_end() != IP->value_op_end());
-  EXPECT_TRUE(IP->value_op_begin() < IP->value_op_end());
-  EXPECT_FALSE(IP->value_op_begin() < IP->value_op_begin());
-  EXPECT_TRUE(IP->value_op_end() > IP->value_op_begin());
-  EXPECT_FALSE(IP->value_op_begin() > IP->value_op_begin());
-  EXPECT_TRUE(IP->value_op_begin() <= IP->value_op_begin());
-  EXPECT_FALSE(IP->value_op_end() <= IP->value_op_begin());
-  EXPECT_TRUE(IP->value_op_begin() >= IP->value_op_begin());
-  EXPECT_FALSE(IP->value_op_begin() >= IP->value_op_end());
-  EXPECT_EQ(10, std::distance(IP->value_op_begin(), IP->value_op_end()));
-
-  User::value_op_iterator I = P.value_op_begin();
-  I += 3;
-  EXPECT_EQ(std::next(P.value_op_begin(), 3), I);
-  EXPECT_EQ(P.getOperand(3), *I);
-  I++;
-  EXPECT_EQ(P.getOperand(6), I[2]);
-  EXPECT_EQ(P.value_op_end(), (I - 2) + 8);
-
-  // const value op
-  User::const_value_op_iterator CI = IP->value_op_begin();
-  CI += 3;
-  EXPECT_EQ(std::next(IP->value_op_begin(), 3), CI);
-  EXPECT_EQ(IP->getOperand(3), *CI);
-  CI++;
-  EXPECT_EQ(IP->getOperand(6), CI[2]);
-  EXPECT_EQ(IP->value_op_end(), (CI - 2) + 8);
-}
-
-TEST(UserTest, replaceUseOfWith) {
-  LLVMContext C;
-
-  const char *ModuleString = "define void @f(i32 %x) {\n"
-                             "entry:\n"
-                             "  %v0 = add i32 1, 1\n"
-                             "  %v1 = add i32 %x, 2\n"
-                             "  ret void\n"
-                             "}\n";
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M = parseAssemblyString(ModuleString, Err, C);
-  Function *F = M->getFunction("f");
-  EXPECT_TRUE(F);
-  EXPECT_TRUE(F->arg_begin() != F->arg_end());
-  BasicBlock& entryBB = F->front();
-  Instruction& I0 = *(entryBB.begin());
-  Instruction& I1 = *(++(entryBB.begin()));
-
-  Argument &X = *F->arg_begin();
-  EXPECT_EQ("x", X.getName());
-  EXPECT_NE(X.user_begin() ,X.user_end());
-  EXPECT_EQ(I0.user_begin() ,I0.user_end());
-
-
-  auto XUser = find(X.users(), &(I1));
-  EXPECT_NE(XUser, X.user_end());
- 
-  XUser->replaceUsesOfWith(&X, &I0);
-  EXPECT_EQ(X.user_begin() ,X.user_end());
-  EXPECT_NE(I0.user_begin() ,I0.user_end());
-}
-
-TEST(UserTest, PersonalityUser) {
-  LLVMContext Context;
-  Module M("", Context);
-  FunctionType *RetVoidTy = FunctionType::get(Type::getVoidTy(Context), false);
-  Function *PersonalityF = Function::Create(
-      RetVoidTy, GlobalValue::ExternalLinkage, "PersonalityFn", &M);
-  Function *TestF =
-      Function::Create(RetVoidTy, GlobalValue::ExternalLinkage, "TestFn", &M);
-
-  // Set up the personality function
-  TestF->setPersonalityFn(PersonalityF);
-  auto PersonalityUsers = PersonalityF->user_begin();
-
-  // One user and that user is the Test function
-  EXPECT_EQ(*PersonalityUsers, TestF);
-  EXPECT_EQ(++PersonalityUsers, PersonalityF->user_end());
-
-  // Reset the personality function
-  TestF->setPersonalityFn(nullptr);
-
-  // No users should remain
-  EXPECT_TRUE(TestF->user_empty());
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/IR/VPIntrinsicTest.cpp b/gnu/llvm/llvm/unittests/IR/VPIntrinsicTest.cpp
deleted file mode 100644
index 0ca0da81a33..00000000000
--- a/gnu/llvm/llvm/unittests/IR/VPIntrinsicTest.cpp
+++ /dev/null
@@ -1,289 +0,0 @@
-//===- VPIntrinsicTest.cpp - VPIntrinsic unit tests ---------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/CodeGen/ISDOpcodes.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/IntrinsicInst.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/Verifier.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-#include <sstream>
-
-using namespace llvm;
-
-namespace {
-
-class VPIntrinsicTest : public testing::Test {
-protected:
-  LLVMContext Context;
-
-  VPIntrinsicTest() : Context() {}
-
-  LLVMContext C;
-  SMDiagnostic Err;
-
-  std::unique_ptr<Module> createVPDeclarationModule() {
-    const char *BinaryIntOpcodes[] = {"add",  "sub",  "mul", "sdiv", "srem",
-                                      "udiv", "urem", "and", "xor",  "or",
-                                      "ashr", "lshr", "shl"};
-    std::stringstream Str;
-    for (const char *BinaryIntOpcode : BinaryIntOpcodes)
-      Str << " declare <8 x i32> @llvm.vp." << BinaryIntOpcode
-          << ".v8i32(<8 x i32>, <8 x i32>, <8 x i1>, i32) ";
-
-    const char *BinaryFPOpcodes[] = {"fadd", "fsub", "fmul", "fdiv", "frem"};
-    for (const char *BinaryFPOpcode : BinaryFPOpcodes)
-      Str << " declare <8 x float> @llvm.vp." << BinaryFPOpcode
-          << ".v8f32(<8 x float>, <8 x float>, <8 x i1>, i32) ";
-
-    Str << " declare void @llvm.vp.store.v8i32.p0v8i32(<8 x i32>, <8 x i32>*, "
-           "<8 x i1>, i32) ";
-    Str << " declare void @llvm.vp.scatter.v8i32.v8p0i32(<8 x i32>, <8 x "
-           "i32*>, <8 x i1>, i32) ";
-    Str << " declare <8 x i32> @llvm.vp.load.v8i32.p0v8i32(<8 x i32>*, <8 x "
-           "i1>, i32) ";
-    Str << " declare <8 x i32> @llvm.vp.gather.v8i32.v8p0i32(<8 x i32*>, <8 x "
-           "i1>, i32) ";
-
-    return parseAssemblyString(Str.str(), Err, C);
-  }
-};
-
-/// Check that the property scopes include/llvm/IR/VPIntrinsics.def are closed.
-TEST_F(VPIntrinsicTest, VPIntrinsicsDefScopes) {
-  Optional<Intrinsic::ID> ScopeVPID;
-#define BEGIN_REGISTER_VP_INTRINSIC(VPID, ...)                                 \
-  ASSERT_FALSE(ScopeVPID.hasValue());                                          \
-  ScopeVPID = Intrinsic::VPID;
-#define END_REGISTER_VP_INTRINSIC(VPID)                                        \
-  ASSERT_TRUE(ScopeVPID.hasValue());                                           \
-  ASSERT_EQ(ScopeVPID.getValue(), Intrinsic::VPID);                            \
-  ScopeVPID = None;
-
-  Optional<ISD::NodeType> ScopeOPC;
-#define BEGIN_REGISTER_VP_SDNODE(SDOPC, ...)                                   \
-  ASSERT_FALSE(ScopeOPC.hasValue());                                           \
-  ScopeOPC = ISD::SDOPC;
-#define END_REGISTER_VP_SDNODE(SDOPC)                                          \
-  ASSERT_TRUE(ScopeOPC.hasValue());                                            \
-  ASSERT_EQ(ScopeOPC.getValue(), ISD::SDOPC);                                  \
-  ScopeOPC = None;
-#include "llvm/IR/VPIntrinsics.def"
-
-  ASSERT_FALSE(ScopeVPID.hasValue());
-  ASSERT_FALSE(ScopeOPC.hasValue());
-}
-
-/// Check that every VP intrinsic in the test module is recognized as a VP
-/// intrinsic.
-TEST_F(VPIntrinsicTest, VPModuleComplete) {
-  std::unique_ptr<Module> M = createVPDeclarationModule();
-  assert(M);
-
-  // Check that all @llvm.vp.* functions in the module are recognized vp
-  // intrinsics.
-  std::set<Intrinsic::ID> SeenIDs;
-  for (const auto &VPDecl : *M) {
-    ASSERT_TRUE(VPDecl.isIntrinsic());
-    ASSERT_TRUE(VPIntrinsic::isVPIntrinsic(VPDecl.getIntrinsicID()));
-    SeenIDs.insert(VPDecl.getIntrinsicID());
-  }
-
-  // Check that every registered VP intrinsic has an instance in the test
-  // module.
-#define BEGIN_REGISTER_VP_INTRINSIC(VPID, ...)                                 \
-  ASSERT_TRUE(SeenIDs.count(Intrinsic::VPID));
-#include "llvm/IR/VPIntrinsics.def"
-}
-
-/// Check that VPIntrinsic:canIgnoreVectorLengthParam() returns true
-/// if the vector length parameter does not mask off any lanes.
-TEST_F(VPIntrinsicTest, CanIgnoreVectorLength) {
-  LLVMContext C;
-  SMDiagnostic Err;
-
-  std::unique_ptr<Module> M =
-      parseAssemblyString(
-"declare <256 x i64> @llvm.vp.mul.v256i64(<256 x i64>, <256 x i64>, <256 x i1>, i32)"
-"declare <vscale x 2 x i64> @llvm.vp.mul.nxv2i64(<vscale x 2 x i64>, <vscale x 2 x i64>, <vscale x 2 x i1>, i32)"
-"declare <vscale x 1 x i64> @llvm.vp.mul.nxv1i64(<vscale x 1 x i64>, <vscale x 1 x i64>, <vscale x 1 x i1>, i32)"
-"declare i32 @llvm.vscale.i32()"
-"define void @test_static_vlen( "
-"      <256 x i64> %i0, <vscale x 2 x i64> %si0x2, <vscale x 1 x i64> %si0x1,"
-"      <256 x i64> %i1, <vscale x 2 x i64> %si1x2, <vscale x 1 x i64> %si1x1,"
-"      <256 x i1> %m, <vscale x 2 x i1> %smx2, <vscale x 1 x i1> %smx1, i32 %vl) { "
-"  %r0 = call <256 x i64> @llvm.vp.mul.v256i64(<256 x i64> %i0, <256 x i64> %i1, <256 x i1> %m, i32 %vl)"
-"  %r1 = call <256 x i64> @llvm.vp.mul.v256i64(<256 x i64> %i0, <256 x i64> %i1, <256 x i1> %m, i32 256)"
-"  %r2 = call <256 x i64> @llvm.vp.mul.v256i64(<256 x i64> %i0, <256 x i64> %i1, <256 x i1> %m, i32 0)"
-"  %r3 = call <256 x i64> @llvm.vp.mul.v256i64(<256 x i64> %i0, <256 x i64> %i1, <256 x i1> %m, i32 7)"
-"  %r4 = call <256 x i64> @llvm.vp.mul.v256i64(<256 x i64> %i0, <256 x i64> %i1, <256 x i1> %m, i32 123)"
-"  %vs = call i32 @llvm.vscale.i32()"
-"  %vs.x2 = mul i32 %vs, 2"
-"  %r5 = call <vscale x 2 x i64> @llvm.vp.mul.nxv2i64(<vscale x 2 x i64> %si0x2, <vscale x 2 x i64> %si1x2, <vscale x 2 x i1> %smx2, i32 %vs.x2)"
-"  %r6 = call <vscale x 2 x i64> @llvm.vp.mul.nxv2i64(<vscale x 2 x i64> %si0x2, <vscale x 2 x i64> %si1x2, <vscale x 2 x i1> %smx2, i32 %vs)"
-"  %r7 = call <vscale x 2 x i64> @llvm.vp.mul.nxv2i64(<vscale x 2 x i64> %si0x2, <vscale x 2 x i64> %si1x2, <vscale x 2 x i1> %smx2, i32 99999)"
-"  %r8 = call <vscale x 1 x i64> @llvm.vp.mul.nxv1i64(<vscale x 1 x i64> %si0x1, <vscale x 1 x i64> %si1x1, <vscale x 1 x i1> %smx1, i32 %vs)"
-"  %r9 = call <vscale x 1 x i64> @llvm.vp.mul.nxv1i64(<vscale x 1 x i64> %si0x1, <vscale x 1 x i64> %si1x1, <vscale x 1 x i1> %smx1, i32 1)"
-"  %r10 = call <vscale x 1 x i64> @llvm.vp.mul.nxv1i64(<vscale x 1 x i64> %si0x1, <vscale x 1 x i64> %si1x1, <vscale x 1 x i1> %smx1, i32 %vs.x2)"
-"  %vs.wat = add i32 %vs, 2"
-"  %r11 = call <vscale x 2 x i64> @llvm.vp.mul.nxv2i64(<vscale x 2 x i64> %si0x2, <vscale x 2 x i64> %si1x2, <vscale x 2 x i1> %smx2, i32 %vs.wat)"
-"  ret void "
-"}",
-          Err, C);
-
-  auto *F = M->getFunction("test_static_vlen");
-  assert(F);
-
-  const bool Expected[] = {false, true,  false, false, false, true,
-                           false, false, true,  false, true,  false};
-  const auto *ExpectedIt = std::begin(Expected);
-  for (auto &I : F->getEntryBlock()) {
-    VPIntrinsic *VPI = dyn_cast<VPIntrinsic>(&I);
-    if (!VPI)
-      continue;
-
-    ASSERT_NE(ExpectedIt, std::end(Expected));
-    ASSERT_EQ(*ExpectedIt, VPI->canIgnoreVectorLengthParam());
-    ++ExpectedIt;
-  }
-}
-
-/// Check that the argument returned by
-/// VPIntrinsic::get<X>ParamPos(Intrinsic::ID) has the expected type.
-TEST_F(VPIntrinsicTest, GetParamPos) {
-  std::unique_ptr<Module> M = createVPDeclarationModule();
-  assert(M);
-
-  for (Function &F : *M) {
-    ASSERT_TRUE(F.isIntrinsic());
-    Optional<unsigned> MaskParamPos =
-        VPIntrinsic::getMaskParamPos(F.getIntrinsicID());
-    if (MaskParamPos.hasValue()) {
-      Type *MaskParamType = F.getArg(MaskParamPos.getValue())->getType();
-      ASSERT_TRUE(MaskParamType->isVectorTy());
-      ASSERT_TRUE(
-          cast<VectorType>(MaskParamType)->getElementType()->isIntegerTy(1));
-    }
-
-    Optional<unsigned> VecLenParamPos =
-        VPIntrinsic::getVectorLengthParamPos(F.getIntrinsicID());
-    if (VecLenParamPos.hasValue()) {
-      Type *VecLenParamType = F.getArg(VecLenParamPos.getValue())->getType();
-      ASSERT_TRUE(VecLenParamType->isIntegerTy(32));
-    }
-  }
-}
-
-/// Check that going from Opcode to VP intrinsic and back results in the same
-/// Opcode.
-TEST_F(VPIntrinsicTest, OpcodeRoundTrip) {
-  std::vector<unsigned> Opcodes;
-  Opcodes.reserve(100);
-
-  {
-#define HANDLE_INST(OCNum, OCName, Class) Opcodes.push_back(OCNum);
-#include "llvm/IR/Instruction.def"
-  }
-
-  unsigned FullTripCounts = 0;
-  for (unsigned OC : Opcodes) {
-    Intrinsic::ID VPID = VPIntrinsic::getForOpcode(OC);
-    // No equivalent VP intrinsic available.
-    if (VPID == Intrinsic::not_intrinsic)
-      continue;
-
-    Optional<unsigned> RoundTripOC =
-        VPIntrinsic::getFunctionalOpcodeForVP(VPID);
-    // No equivalent Opcode available.
-    if (!RoundTripOC)
-      continue;
-
-    ASSERT_EQ(*RoundTripOC, OC);
-    ++FullTripCounts;
-  }
-  ASSERT_NE(FullTripCounts, 0u);
-}
-
-/// Check that going from VP intrinsic to Opcode and back results in the same
-/// intrinsic id.
-TEST_F(VPIntrinsicTest, IntrinsicIDRoundTrip) {
-  std::unique_ptr<Module> M = createVPDeclarationModule();
-  assert(M);
-
-  unsigned FullTripCounts = 0;
-  for (const auto &VPDecl : *M) {
-    auto VPID = VPDecl.getIntrinsicID();
-    Optional<unsigned> OC = VPIntrinsic::getFunctionalOpcodeForVP(VPID);
-
-    // no equivalent Opcode available
-    if (!OC)
-      continue;
-
-    Intrinsic::ID RoundTripVPID = VPIntrinsic::getForOpcode(*OC);
-
-    ASSERT_EQ(RoundTripVPID, VPID);
-    ++FullTripCounts;
-  }
-  ASSERT_NE(FullTripCounts, 0u);
-}
-
-/// Check that VPIntrinsic::getDeclarationForParams works.
-TEST_F(VPIntrinsicTest, VPIntrinsicDeclarationForParams) {
-  std::unique_ptr<Module> M = createVPDeclarationModule();
-  assert(M);
-
-  auto OutM = std::make_unique<Module>("", M->getContext());
-
-  for (auto &F : *M) {
-    auto *FuncTy = F.getFunctionType();
-
-    // Declare intrinsic anew with explicit types.
-    std::vector<Value *> Values;
-    for (auto *ParamTy : FuncTy->params())
-      Values.push_back(UndefValue::get(ParamTy));
-
-    ASSERT_NE(F.getIntrinsicID(), Intrinsic::not_intrinsic);
-    auto *NewDecl = VPIntrinsic::getDeclarationForParams(
-        OutM.get(), F.getIntrinsicID(), Values);
-    ASSERT_TRUE(NewDecl);
-
-    // Check that 'old decl' == 'new decl'.
-    ASSERT_EQ(F.getIntrinsicID(), NewDecl->getIntrinsicID());
-    FunctionType::param_iterator ItNewParams =
-        NewDecl->getFunctionType()->param_begin();
-    FunctionType::param_iterator EndItNewParams =
-        NewDecl->getFunctionType()->param_end();
-    for (auto *ParamTy : FuncTy->params()) {
-      ASSERT_NE(ItNewParams, EndItNewParams);
-      ASSERT_EQ(*ItNewParams, ParamTy);
-      ++ItNewParams;
-    }
-  }
-}
-
-/// Check that the HANDLE_VP_TO_CONSTRAINEDFP maps to an existing intrinsic with
-/// the right amount of metadata args.
-TEST_F(VPIntrinsicTest, HandleToConstrainedFP) {
-#define HANDLE_VP_TO_CONSTRAINEDFP(HASROUND, HASEXCEPT, CFPID)                 \
-  {                                                                            \
-    SmallVector<Intrinsic::IITDescriptor, 5> T;                                \
-    Intrinsic::getIntrinsicInfoTableEntries(Intrinsic::CFPID, T);              \
-    unsigned NumMetadataArgs = 0;                                              \
-    for (auto TD : T)                                                          \
-      NumMetadataArgs += (TD.Kind == Intrinsic::IITDescriptor::Metadata);      \
-    ASSERT_EQ(NumMetadataArgs, (unsigned)(HASROUND + HASEXCEPT));              \
-  }
-#include "llvm/IR/VPIntrinsics.def"
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/IR/ValueHandleTest.cpp b/gnu/llvm/llvm/unittests/IR/ValueHandleTest.cpp
deleted file mode 100644
index 8eb6b5f89a4..00000000000
--- a/gnu/llvm/llvm/unittests/IR/ValueHandleTest.cpp
+++ /dev/null
@@ -1,578 +0,0 @@
-//===- ValueHandleTest.cpp - ValueHandle tests ----------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/IR/ValueHandle.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/LLVMContext.h"
-#include "gtest/gtest.h"
-#include <memory>
-
-using namespace llvm;
-
-namespace {
-
-class ValueHandle : public testing::Test {
-protected:
-  LLVMContext Context;
-  Constant *ConstantV;
-  std::unique_ptr<BitCastInst> BitcastV;
-
-  ValueHandle()
-      : ConstantV(ConstantInt::get(Type::getInt32Ty(Context), 0)),
-        BitcastV(new BitCastInst(ConstantV, Type::getInt32Ty(Context))) {}
-};
-
-class ConcreteCallbackVH final : public CallbackVH {
-public:
-  ConcreteCallbackVH(Value *V) : CallbackVH(V) {}
-};
-
-TEST_F(ValueHandle, WeakVH_BasicOperation) {
-  WeakVH WVH(BitcastV.get());
-  EXPECT_EQ(BitcastV.get(), WVH);
-  WVH = ConstantV;
-  EXPECT_EQ(ConstantV, WVH);
-
-  // Make sure I can call a method on the underlying Value.  It
-  // doesn't matter which method.
-  EXPECT_EQ(Type::getInt32Ty(Context), WVH->getType());
-  EXPECT_EQ(Type::getInt32Ty(Context), (*WVH).getType());
-
-  WVH = BitcastV.get();
-  BitcastV->replaceAllUsesWith(ConstantV);
-  EXPECT_EQ(WVH, BitcastV.get());
-  BitcastV.reset();
-  EXPECT_EQ(WVH, nullptr);
-}
-
-TEST_F(ValueHandle, WeakTrackingVH_BasicOperation) {
-  WeakTrackingVH WVH(BitcastV.get());
-  EXPECT_EQ(BitcastV.get(), WVH);
-  WVH = ConstantV;
-  EXPECT_EQ(ConstantV, WVH);
-
-  // Make sure I can call a method on the underlying Value.  It
-  // doesn't matter which method.
-  EXPECT_EQ(Type::getInt32Ty(Context), WVH->getType());
-  EXPECT_EQ(Type::getInt32Ty(Context), (*WVH).getType());
-}
-
-TEST_F(ValueHandle, WeakTrackingVH_Comparisons) {
-  WeakTrackingVH BitcastWVH(BitcastV.get());
-  WeakTrackingVH ConstantWVH(ConstantV);
-
-  EXPECT_TRUE(BitcastWVH == BitcastWVH);
-  EXPECT_TRUE(BitcastV.get() == BitcastWVH);
-  EXPECT_TRUE(BitcastWVH == BitcastV.get());
-  EXPECT_FALSE(BitcastWVH == ConstantWVH);
-
-  EXPECT_TRUE(BitcastWVH != ConstantWVH);
-  EXPECT_TRUE(BitcastV.get() != ConstantWVH);
-  EXPECT_TRUE(BitcastWVH != ConstantV);
-  EXPECT_FALSE(BitcastWVH != BitcastWVH);
-
-  // Cast to Value* so comparisons work.
-  Value *BV = BitcastV.get();
-  Value *CV = ConstantV;
-  EXPECT_EQ(BV < CV, BitcastWVH < ConstantWVH);
-  EXPECT_EQ(BV <= CV, BitcastWVH <= ConstantWVH);
-  EXPECT_EQ(BV > CV, BitcastWVH > ConstantWVH);
-  EXPECT_EQ(BV >= CV, BitcastWVH >= ConstantWVH);
-
-  EXPECT_EQ(BV < CV, BitcastV.get() < ConstantWVH);
-  EXPECT_EQ(BV <= CV, BitcastV.get() <= ConstantWVH);
-  EXPECT_EQ(BV > CV, BitcastV.get() > ConstantWVH);
-  EXPECT_EQ(BV >= CV, BitcastV.get() >= ConstantWVH);
-
-  EXPECT_EQ(BV < CV, BitcastWVH < ConstantV);
-  EXPECT_EQ(BV <= CV, BitcastWVH <= ConstantV);
-  EXPECT_EQ(BV > CV, BitcastWVH > ConstantV);
-  EXPECT_EQ(BV >= CV, BitcastWVH >= ConstantV);
-}
-
-TEST_F(ValueHandle, WeakTrackingVH_FollowsRAUW) {
-  WeakTrackingVH WVH(BitcastV.get());
-  WeakTrackingVH WVH_Copy(WVH);
-  WeakTrackingVH WVH_Recreated(BitcastV.get());
-  BitcastV->replaceAllUsesWith(ConstantV);
-  EXPECT_EQ(ConstantV, WVH);
-  EXPECT_EQ(ConstantV, WVH_Copy);
-  EXPECT_EQ(ConstantV, WVH_Recreated);
-}
-
-TEST_F(ValueHandle, WeakTrackingVH_NullOnDeletion) {
-  WeakTrackingVH WVH(BitcastV.get());
-  WeakTrackingVH WVH_Copy(WVH);
-  WeakTrackingVH WVH_Recreated(BitcastV.get());
-  BitcastV.reset();
-  Value *null_value = nullptr;
-  EXPECT_EQ(null_value, WVH);
-  EXPECT_EQ(null_value, WVH_Copy);
-  EXPECT_EQ(null_value, WVH_Recreated);
-}
-
-
-TEST_F(ValueHandle, AssertingVH_BasicOperation) {
-  AssertingVH<CastInst> AVH(BitcastV.get());
-  CastInst *implicit_to_exact_type = AVH;
-  (void)implicit_to_exact_type;  // Avoid warning.
-
-  AssertingVH<Value> GenericAVH(BitcastV.get());
-  EXPECT_EQ(BitcastV.get(), GenericAVH);
-  GenericAVH = ConstantV;
-  EXPECT_EQ(ConstantV, GenericAVH);
-
-  // Make sure I can call a method on the underlying CastInst.  It
-  // doesn't matter which method.
-  EXPECT_FALSE(AVH->mayWriteToMemory());
-  EXPECT_FALSE((*AVH).mayWriteToMemory());
-}
-
-TEST_F(ValueHandle, AssertingVH_Const) {
-  const CastInst *ConstBitcast = BitcastV.get();
-  AssertingVH<const CastInst> AVH(ConstBitcast);
-  const CastInst *implicit_to_exact_type = AVH;
-  (void)implicit_to_exact_type;  // Avoid warning.
-}
-
-TEST_F(ValueHandle, AssertingVH_Comparisons) {
-  AssertingVH<Value> BitcastAVH(BitcastV.get());
-  AssertingVH<Value> ConstantAVH(ConstantV);
-
-  EXPECT_TRUE(BitcastAVH == BitcastAVH);
-  EXPECT_TRUE(BitcastV.get() == BitcastAVH);
-  EXPECT_TRUE(BitcastAVH == BitcastV.get());
-  EXPECT_FALSE(BitcastAVH == ConstantAVH);
-
-  EXPECT_TRUE(BitcastAVH != ConstantAVH);
-  EXPECT_TRUE(BitcastV.get() != ConstantAVH);
-  EXPECT_TRUE(BitcastAVH != ConstantV);
-  EXPECT_FALSE(BitcastAVH != BitcastAVH);
-
-  // Cast to Value* so comparisons work.
-  Value *BV = BitcastV.get();
-  Value *CV = ConstantV;
-  EXPECT_EQ(BV < CV, BitcastAVH < ConstantAVH);
-  EXPECT_EQ(BV <= CV, BitcastAVH <= ConstantAVH);
-  EXPECT_EQ(BV > CV, BitcastAVH > ConstantAVH);
-  EXPECT_EQ(BV >= CV, BitcastAVH >= ConstantAVH);
-
-  EXPECT_EQ(BV < CV, BitcastV.get() < ConstantAVH);
-  EXPECT_EQ(BV <= CV, BitcastV.get() <= ConstantAVH);
-  EXPECT_EQ(BV > CV, BitcastV.get() > ConstantAVH);
-  EXPECT_EQ(BV >= CV, BitcastV.get() >= ConstantAVH);
-
-  EXPECT_EQ(BV < CV, BitcastAVH < ConstantV);
-  EXPECT_EQ(BV <= CV, BitcastAVH <= ConstantV);
-  EXPECT_EQ(BV > CV, BitcastAVH > ConstantV);
-  EXPECT_EQ(BV >= CV, BitcastAVH >= ConstantV);
-}
-
-TEST_F(ValueHandle, AssertingVH_DoesNotFollowRAUW) {
-  AssertingVH<Value> AVH(BitcastV.get());
-  BitcastV->replaceAllUsesWith(ConstantV);
-  EXPECT_EQ(BitcastV.get(), AVH);
-}
-
-#ifdef NDEBUG
-
-TEST_F(ValueHandle, AssertingVH_ReducesToPointer) {
-  EXPECT_EQ(sizeof(CastInst *), sizeof(AssertingVH<CastInst>));
-}
-
-#elif LLVM_ENABLE_ABI_BREAKING_CHECKS // && !NDEBUG
-
-#ifdef GTEST_HAS_DEATH_TEST
-
-TEST_F(ValueHandle, AssertingVH_Asserts) {
-  AssertingVH<Value> AVH(BitcastV.get());
-  EXPECT_DEATH({BitcastV.reset();},
-               "An asserting value handle still pointed to this value!");
-  AssertingVH<Value> Copy(AVH);
-  AVH = nullptr;
-  EXPECT_DEATH({BitcastV.reset();},
-               "An asserting value handle still pointed to this value!");
-  Copy = nullptr;
-  BitcastV.reset();
-}
-
-#endif  // GTEST_HAS_DEATH_TEST
-
-#endif  // NDEBUG
-
-TEST_F(ValueHandle, CallbackVH_BasicOperation) {
-  ConcreteCallbackVH CVH(BitcastV.get());
-  EXPECT_EQ(BitcastV.get(), CVH);
-  CVH = ConstantV;
-  EXPECT_EQ(ConstantV, CVH);
-
-  // Make sure I can call a method on the underlying Value.  It
-  // doesn't matter which method.
-  EXPECT_EQ(Type::getInt32Ty(Context), CVH->getType());
-  EXPECT_EQ(Type::getInt32Ty(Context), (*CVH).getType());
-}
-
-TEST_F(ValueHandle, CallbackVH_Comparisons) {
-  ConcreteCallbackVH BitcastCVH(BitcastV.get());
-  ConcreteCallbackVH ConstantCVH(ConstantV);
-
-  EXPECT_TRUE(BitcastCVH == BitcastCVH);
-  EXPECT_TRUE(BitcastV.get() == BitcastCVH);
-  EXPECT_TRUE(BitcastCVH == BitcastV.get());
-  EXPECT_FALSE(BitcastCVH == ConstantCVH);
-
-  EXPECT_TRUE(BitcastCVH != ConstantCVH);
-  EXPECT_TRUE(BitcastV.get() != ConstantCVH);
-  EXPECT_TRUE(BitcastCVH != ConstantV);
-  EXPECT_FALSE(BitcastCVH != BitcastCVH);
-
-  // Cast to Value* so comparisons work.
-  Value *BV = BitcastV.get();
-  Value *CV = ConstantV;
-  EXPECT_EQ(BV < CV, BitcastCVH < ConstantCVH);
-  EXPECT_EQ(BV <= CV, BitcastCVH <= ConstantCVH);
-  EXPECT_EQ(BV > CV, BitcastCVH > ConstantCVH);
-  EXPECT_EQ(BV >= CV, BitcastCVH >= ConstantCVH);
-
-  EXPECT_EQ(BV < CV, BitcastV.get() < ConstantCVH);
-  EXPECT_EQ(BV <= CV, BitcastV.get() <= ConstantCVH);
-  EXPECT_EQ(BV > CV, BitcastV.get() > ConstantCVH);
-  EXPECT_EQ(BV >= CV, BitcastV.get() >= ConstantCVH);
-
-  EXPECT_EQ(BV < CV, BitcastCVH < ConstantV);
-  EXPECT_EQ(BV <= CV, BitcastCVH <= ConstantV);
-  EXPECT_EQ(BV > CV, BitcastCVH > ConstantV);
-  EXPECT_EQ(BV >= CV, BitcastCVH >= ConstantV);
-}
-
-TEST_F(ValueHandle, CallbackVH_CallbackOnDeletion) {
-  class RecordingVH final : public CallbackVH {
-  public:
-    int DeletedCalls;
-    int AURWCalls;
-
-    RecordingVH() : DeletedCalls(0), AURWCalls(0) {}
-    RecordingVH(Value *V) : CallbackVH(V), DeletedCalls(0), AURWCalls(0) {}
-
-  private:
-    void deleted() override {
-      DeletedCalls++;
-      CallbackVH::deleted();
-    }
-    void allUsesReplacedWith(Value *) override { AURWCalls++; }
-  };
-
-  RecordingVH RVH;
-  RVH = BitcastV.get();
-  EXPECT_EQ(0, RVH.DeletedCalls);
-  EXPECT_EQ(0, RVH.AURWCalls);
-  BitcastV.reset();
-  EXPECT_EQ(1, RVH.DeletedCalls);
-  EXPECT_EQ(0, RVH.AURWCalls);
-}
-
-TEST_F(ValueHandle, CallbackVH_CallbackOnRAUW) {
-  class RecordingVH final : public CallbackVH {
-  public:
-    int DeletedCalls;
-    Value *AURWArgument;
-
-    RecordingVH() : DeletedCalls(0), AURWArgument(nullptr) {}
-    RecordingVH(Value *V)
-      : CallbackVH(V), DeletedCalls(0), AURWArgument(nullptr) {}
-
-  private:
-    void deleted() override {
-      DeletedCalls++;
-      CallbackVH::deleted();
-    }
-    void allUsesReplacedWith(Value *new_value) override {
-      EXPECT_EQ(nullptr, AURWArgument);
-      AURWArgument = new_value;
-    }
-  };
-
-  RecordingVH RVH;
-  RVH = BitcastV.get();
-  EXPECT_EQ(0, RVH.DeletedCalls);
-  EXPECT_EQ(nullptr, RVH.AURWArgument);
-  BitcastV->replaceAllUsesWith(ConstantV);
-  EXPECT_EQ(0, RVH.DeletedCalls);
-  EXPECT_EQ(ConstantV, RVH.AURWArgument);
-}
-
-TEST_F(ValueHandle, CallbackVH_DeletionCanRAUW) {
-  class RecoveringVH final : public CallbackVH {
-  public:
-    int DeletedCalls;
-    Value *AURWArgument;
-    LLVMContext *Context;
-
-    RecoveringVH(LLVMContext &TheContext)
-        : DeletedCalls(0), AURWArgument(nullptr), Context(&TheContext) {}
-
-    RecoveringVH(LLVMContext &TheContext, Value *V)
-        : CallbackVH(V), DeletedCalls(0), AURWArgument(nullptr),
-          Context(&TheContext) {}
-
-  private:
-    void deleted() override {
-      getValPtr()->replaceAllUsesWith(
-          Constant::getNullValue(Type::getInt32Ty(*Context)));
-      setValPtr(nullptr);
-    }
-    void allUsesReplacedWith(Value *new_value) override {
-      ASSERT_TRUE(nullptr != getValPtr());
-      EXPECT_EQ(1U, getValPtr()->getNumUses());
-      EXPECT_EQ(nullptr, AURWArgument);
-      AURWArgument = new_value;
-    }
-  };
-
-  // Normally, if a value has uses, deleting it will crash.  However, we can use
-  // a CallbackVH to remove the uses before the check for no uses.
-  RecoveringVH RVH(Context);
-  RVH = RecoveringVH(Context, BitcastV.get());
-  std::unique_ptr<BinaryOperator> BitcastUser(BinaryOperator::CreateAdd(
-      RVH, Constant::getNullValue(Type::getInt32Ty(Context))));
-  EXPECT_EQ(BitcastV.get(), BitcastUser->getOperand(0));
-  BitcastV.reset();  // Would crash without the ValueHandler.
-  EXPECT_EQ(Constant::getNullValue(Type::getInt32Ty(Context)),
-            RVH.AURWArgument);
-  EXPECT_EQ(Constant::getNullValue(Type::getInt32Ty(Context)),
-            BitcastUser->getOperand(0));
-}
-
-TEST_F(ValueHandle, DestroyingOtherVHOnSameValueDoesntBreakIteration) {
-  // When a CallbackVH modifies other ValueHandles in its callbacks,
-  // that shouldn't interfere with non-modified ValueHandles receiving
-  // their appropriate callbacks.
-  //
-  // We create the active CallbackVH in the middle of a palindromic
-  // arrangement of other VHs so that the bad behavior would be
-  // triggered in whichever order callbacks run.
-
-  class DestroyingVH final : public CallbackVH {
-  public:
-    std::unique_ptr<WeakTrackingVH> ToClear[2];
-    DestroyingVH(Value *V) {
-      ToClear[0].reset(new WeakTrackingVH(V));
-      setValPtr(V);
-      ToClear[1].reset(new WeakTrackingVH(V));
-    }
-    void deleted() override {
-      ToClear[0].reset();
-      ToClear[1].reset();
-      CallbackVH::deleted();
-    }
-    void allUsesReplacedWith(Value *) override {
-      ToClear[0].reset();
-      ToClear[1].reset();
-    }
-  };
-
-  {
-    WeakTrackingVH ShouldBeVisited1(BitcastV.get());
-    DestroyingVH C(BitcastV.get());
-    WeakTrackingVH ShouldBeVisited2(BitcastV.get());
-
-    BitcastV->replaceAllUsesWith(ConstantV);
-    EXPECT_EQ(ConstantV, static_cast<Value*>(ShouldBeVisited1));
-    EXPECT_EQ(ConstantV, static_cast<Value*>(ShouldBeVisited2));
-  }
-
-  {
-    WeakTrackingVH ShouldBeVisited1(BitcastV.get());
-    DestroyingVH C(BitcastV.get());
-    WeakTrackingVH ShouldBeVisited2(BitcastV.get());
-
-    BitcastV.reset();
-    EXPECT_EQ(nullptr, static_cast<Value*>(ShouldBeVisited1));
-    EXPECT_EQ(nullptr, static_cast<Value*>(ShouldBeVisited2));
-  }
-}
-
-TEST_F(ValueHandle, AssertingVHCheckedLast) {
-  // If a CallbackVH exists to clear out a group of AssertingVHs on
-  // Value deletion, the CallbackVH should get a chance to do so
-  // before the AssertingVHs assert.
-
-  class ClearingVH final : public CallbackVH {
-  public:
-    AssertingVH<Value> *ToClear[2];
-    ClearingVH(Value *V,
-               AssertingVH<Value> &A0, AssertingVH<Value> &A1)
-      : CallbackVH(V) {
-      ToClear[0] = &A0;
-      ToClear[1] = &A1;
-    }
-
-    void deleted() override {
-      *ToClear[0] = nullptr;
-      *ToClear[1] = nullptr;
-      CallbackVH::deleted();
-    }
-  };
-
-  AssertingVH<Value> A1, A2;
-  A1 = BitcastV.get();
-  ClearingVH C(BitcastV.get(), A1, A2);
-  A2 = BitcastV.get();
-  // C.deleted() should run first, clearing the two AssertingVHs,
-  // which should prevent them from asserting.
-  BitcastV.reset();
-}
-
-TEST_F(ValueHandle, PoisoningVH_BasicOperation) {
-  PoisoningVH<CastInst> VH(BitcastV.get());
-  CastInst *implicit_to_exact_type = VH;
-  (void)implicit_to_exact_type; // Avoid warning.
-
-  PoisoningVH<Value> GenericVH(BitcastV.get());
-  EXPECT_EQ(BitcastV.get(), GenericVH);
-  GenericVH = ConstantV;
-  EXPECT_EQ(ConstantV, GenericVH);
-
-  // Make sure I can call a method on the underlying CastInst.  It
-  // doesn't matter which method.
-  EXPECT_FALSE(VH->mayWriteToMemory());
-  EXPECT_FALSE((*VH).mayWriteToMemory());
-}
-
-TEST_F(ValueHandle, PoisoningVH_Const) {
-  const CastInst *ConstBitcast = BitcastV.get();
-  PoisoningVH<const CastInst> VH(ConstBitcast);
-  const CastInst *implicit_to_exact_type = VH;
-  (void)implicit_to_exact_type; // Avoid warning.
-}
-
-TEST_F(ValueHandle, PoisoningVH_Comparisons) {
-  PoisoningVH<Value> BitcastVH(BitcastV.get());
-  PoisoningVH<Value> ConstantVH(ConstantV);
-
-  EXPECT_TRUE(BitcastVH == BitcastVH);
-  EXPECT_TRUE(BitcastV.get() == BitcastVH);
-  EXPECT_TRUE(BitcastVH == BitcastV.get());
-  EXPECT_FALSE(BitcastVH == ConstantVH);
-
-  EXPECT_TRUE(BitcastVH != ConstantVH);
-  EXPECT_TRUE(BitcastV.get() != ConstantVH);
-  EXPECT_TRUE(BitcastVH != ConstantV);
-  EXPECT_FALSE(BitcastVH != BitcastVH);
-
-  // Cast to Value* so comparisons work.
-  Value *BV = BitcastV.get();
-  Value *CV = ConstantV;
-  EXPECT_EQ(BV < CV, BitcastVH < ConstantVH);
-  EXPECT_EQ(BV <= CV, BitcastVH <= ConstantVH);
-  EXPECT_EQ(BV > CV, BitcastVH > ConstantVH);
-  EXPECT_EQ(BV >= CV, BitcastVH >= ConstantVH);
-
-  EXPECT_EQ(BV < CV, BitcastV.get() < ConstantVH);
-  EXPECT_EQ(BV <= CV, BitcastV.get() <= ConstantVH);
-  EXPECT_EQ(BV > CV, BitcastV.get() > ConstantVH);
-  EXPECT_EQ(BV >= CV, BitcastV.get() >= ConstantVH);
-
-  EXPECT_EQ(BV < CV, BitcastVH < ConstantV);
-  EXPECT_EQ(BV <= CV, BitcastVH <= ConstantV);
-  EXPECT_EQ(BV > CV, BitcastVH > ConstantV);
-  EXPECT_EQ(BV >= CV, BitcastVH >= ConstantV);
-}
-
-TEST_F(ValueHandle, PoisoningVH_DoesNotFollowRAUW) {
-  PoisoningVH<Value> VH(BitcastV.get());
-  BitcastV->replaceAllUsesWith(ConstantV);
-  EXPECT_TRUE(DenseMapInfo<PoisoningVH<Value>>::isEqual(VH, BitcastV.get()));
-}
-
-TEST_F(ValueHandle, AssertingVH_DenseMap) {
-  DenseMap<AssertingVH<Value>, int> Map;
-  Map.insert({BitcastV.get(), 1});
-  Map.insert({ConstantV, 2});
-  // These will create a temporary AssertingVH during lookup.
-  EXPECT_TRUE(Map.find(BitcastV.get()) != Map.end());
-  EXPECT_TRUE(Map.find(ConstantV) != Map.end());
-  // These will not create a temporary AssertingVH.
-  EXPECT_TRUE(Map.find_as(BitcastV.get()) != Map.end());
-  EXPECT_TRUE(Map.find_as(ConstantV) != Map.end());
-}
-
-TEST_F(ValueHandle, PoisoningVH_DenseMap) {
-  DenseMap<PoisoningVH<Value>, int> Map;
-  Map.insert({BitcastV.get(), 1});
-  Map.insert({ConstantV, 2});
-  // These will create a temporary PoisoningVH during lookup.
-  EXPECT_TRUE(Map.find(BitcastV.get()) != Map.end());
-  EXPECT_TRUE(Map.find(ConstantV) != Map.end());
-  // These will not create a temporary PoisoningVH.
-  EXPECT_TRUE(Map.find_as(BitcastV.get()) != Map.end());
-  EXPECT_TRUE(Map.find_as(ConstantV) != Map.end());
-}
-
-#ifdef NDEBUG
-
-TEST_F(ValueHandle, PoisoningVH_ReducesToPointer) {
-  EXPECT_EQ(sizeof(CastInst *), sizeof(PoisoningVH<CastInst>));
-}
-
-#else // !NDEBUG
-
-TEST_F(ValueHandle, TrackingVH_Tracks) {
-  TrackingVH<Value> VH(BitcastV.get());
-  BitcastV->replaceAllUsesWith(ConstantV);
-  EXPECT_EQ(VH, ConstantV);
-}
-
-#ifdef GTEST_HAS_DEATH_TEST
-#if LLVM_ENABLE_ABI_BREAKING_CHECKS
-
-TEST_F(ValueHandle, PoisoningVH_Asserts) {
-  PoisoningVH<Value> VH(BitcastV.get());
-
-  // The poisoned handle shouldn't assert when the value is deleted.
-  BitcastV.reset(new BitCastInst(ConstantV, Type::getInt32Ty(Context)));
-  // But should when we access the handle.
-  EXPECT_DEATH((void)*VH, "Accessed a poisoned value handle!");
-
-  // Now check that poison catches RAUW.
-  VH = BitcastV.get();
-  // The replace doesn't trigger anything immediately.
-  BitcastV->replaceAllUsesWith(ConstantV);
-  // But a use does.
-  EXPECT_DEATH((void)*VH, "Accessed a poisoned value handle!");
-
-  // Don't clear anything out here as destroying the handles should be fine.
-}
-
-#endif // LLVM_ENABLE_ABI_BREAKING_CHECKS
-
-TEST_F(ValueHandle, TrackingVH_Asserts) {
-  {
-    TrackingVH<Value> VH(BitcastV.get());
-
-    // The tracking handle shouldn't assert when the value is deleted.
-    BitcastV.reset(new BitCastInst(ConstantV, Type::getInt32Ty(Context)));
-    // But should when we access the handle.
-    EXPECT_DEATH((void)*VH,
-                 "TrackingVH must be non-null and valid on dereference!");
-  }
-
-  {
-    TrackingVH<Instruction> VH(BitcastV.get());
-
-    BitcastV->replaceAllUsesWith(ConstantV);
-    EXPECT_DEATH((void)*VH,
-                 "Tracked Value was replaced by one with an invalid type!");
-  }
-}
-
-#endif // GTEST_HAS_DEATH_TEST
-
-#endif // NDEBUG
-}
diff --git a/gnu/llvm/llvm/unittests/IR/ValueMapTest.cpp b/gnu/llvm/llvm/unittests/IR/ValueMapTest.cpp
deleted file mode 100644
index 06d53788553..00000000000
--- a/gnu/llvm/llvm/unittests/IR/ValueMapTest.cpp
+++ /dev/null
@@ -1,294 +0,0 @@
-//===- llvm/unittest/ADT/ValueMapTest.cpp - ValueMap unit tests -*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/IR/ValueMap.h"
-#include "llvm/Config/llvm-config.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/LLVMContext.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-// Test fixture
-template<typename T>
-class ValueMapTest : public testing::Test {
-protected:
-  LLVMContext Context;
-  Constant *ConstantV;
-  std::unique_ptr<BitCastInst> BitcastV;
-  std::unique_ptr<BinaryOperator> AddV;
-
-  ValueMapTest()
-      : ConstantV(ConstantInt::get(Type::getInt32Ty(Context), 0)),
-        BitcastV(new BitCastInst(ConstantV, Type::getInt32Ty(Context))),
-        AddV(BinaryOperator::CreateAdd(ConstantV, ConstantV)) {}
-};
-
-// Run everything on Value*, a subtype to make sure that casting works as
-// expected, and a const subtype to make sure we cast const correctly.
-typedef ::testing::Types<Value, Instruction, const Instruction> KeyTypes;
-TYPED_TEST_SUITE(ValueMapTest, KeyTypes, );
-
-TYPED_TEST(ValueMapTest, Null) {
-  ValueMap<TypeParam*, int> VM1;
-  VM1[nullptr] = 7;
-  EXPECT_EQ(7, VM1.lookup(nullptr));
-}
-
-TYPED_TEST(ValueMapTest, FollowsValue) {
-  ValueMap<TypeParam*, int> VM;
-  VM[this->BitcastV.get()] = 7;
-  EXPECT_EQ(7, VM.lookup(this->BitcastV.get()));
-  EXPECT_EQ(0u, VM.count(this->AddV.get()));
-  this->BitcastV->replaceAllUsesWith(this->AddV.get());
-  EXPECT_EQ(7, VM.lookup(this->AddV.get()));
-  EXPECT_EQ(0u, VM.count(this->BitcastV.get()));
-  this->AddV.reset();
-  EXPECT_EQ(0u, VM.count(this->AddV.get()));
-  EXPECT_EQ(0u, VM.count(this->BitcastV.get()));
-  EXPECT_EQ(0U, VM.size());
-}
-
-TYPED_TEST(ValueMapTest, OperationsWork) {
-  ValueMap<TypeParam*, int> VM;
-  ValueMap<TypeParam*, int> VM2(16);  (void)VM2;
-  typename ValueMapConfig<TypeParam*>::ExtraData Data;
-  ValueMap<TypeParam*, int> VM3(Data, 16);  (void)VM3;
-  EXPECT_TRUE(VM.empty());
-
-  VM[this->BitcastV.get()] = 7;
-
-  // Find:
-  typename ValueMap<TypeParam*, int>::iterator I =
-    VM.find(this->BitcastV.get());
-  ASSERT_TRUE(I != VM.end());
-  EXPECT_EQ(this->BitcastV.get(), I->first);
-  EXPECT_EQ(7, I->second);
-  EXPECT_TRUE(VM.find(this->AddV.get()) == VM.end());
-
-  // Const find:
-  const ValueMap<TypeParam*, int> &CVM = VM;
-  typename ValueMap<TypeParam*, int>::const_iterator CI =
-    CVM.find(this->BitcastV.get());
-  ASSERT_TRUE(CI != CVM.end());
-  EXPECT_EQ(this->BitcastV.get(), CI->first);
-  EXPECT_EQ(7, CI->second);
-  EXPECT_TRUE(CVM.find(this->AddV.get()) == CVM.end());
-
-  // Insert:
-  std::pair<typename ValueMap<TypeParam*, int>::iterator, bool> InsertResult1 =
-    VM.insert(std::make_pair(this->AddV.get(), 3));
-  EXPECT_EQ(this->AddV.get(), InsertResult1.first->first);
-  EXPECT_EQ(3, InsertResult1.first->second);
-  EXPECT_TRUE(InsertResult1.second);
-  EXPECT_EQ(1u, VM.count(this->AddV.get()));
-  std::pair<typename ValueMap<TypeParam*, int>::iterator, bool> InsertResult2 =
-    VM.insert(std::make_pair(this->AddV.get(), 5));
-  EXPECT_EQ(this->AddV.get(), InsertResult2.first->first);
-  EXPECT_EQ(3, InsertResult2.first->second);
-  EXPECT_FALSE(InsertResult2.second);
-
-  // Erase:
-  VM.erase(InsertResult2.first);
-  EXPECT_EQ(0U, VM.count(this->AddV.get()));
-  EXPECT_EQ(1U, VM.count(this->BitcastV.get()));
-  VM.erase(this->BitcastV.get());
-  EXPECT_EQ(0U, VM.count(this->BitcastV.get()));
-  EXPECT_EQ(0U, VM.size());
-
-  // Range insert:
-  SmallVector<std::pair<Instruction*, int>, 2> Elems;
-  Elems.push_back(std::make_pair(this->AddV.get(), 1));
-  Elems.push_back(std::make_pair(this->BitcastV.get(), 2));
-  VM.insert(Elems.begin(), Elems.end());
-  EXPECT_EQ(1, VM.lookup(this->AddV.get()));
-  EXPECT_EQ(2, VM.lookup(this->BitcastV.get()));
-}
-
-template<typename ExpectedType, typename VarType>
-void CompileAssertHasType(VarType) {
-  static_assert(std::is_same<ExpectedType, VarType>::value,
-                "Not the same type");
-}
-
-TYPED_TEST(ValueMapTest, Iteration) {
-  ValueMap<TypeParam*, int> VM;
-  VM[this->BitcastV.get()] = 2;
-  VM[this->AddV.get()] = 3;
-  size_t size = 0;
-  for (typename ValueMap<TypeParam*, int>::iterator I = VM.begin(), E = VM.end();
-       I != E; ++I) {
-    ++size;
-    std::pair<TypeParam*, int> value = *I; (void)value;
-    CompileAssertHasType<TypeParam*>(I->first);
-    if (I->second == 2) {
-      EXPECT_EQ(this->BitcastV.get(), I->first);
-      I->second = 5;
-    } else if (I->second == 3) {
-      EXPECT_EQ(this->AddV.get(), I->first);
-      I->second = 6;
-    } else {
-      ADD_FAILURE() << "Iterated through an extra value.";
-    }
-  }
-  EXPECT_EQ(2U, size);
-  EXPECT_EQ(5, VM[this->BitcastV.get()]);
-  EXPECT_EQ(6, VM[this->AddV.get()]);
-
-  size = 0;
-  // Cast to const ValueMap to avoid a bug in DenseMap's iterators.
-  const ValueMap<TypeParam*, int>& CVM = VM;
-  for (typename ValueMap<TypeParam*, int>::const_iterator I = CVM.begin(),
-         E = CVM.end(); I != E; ++I) {
-    ++size;
-    std::pair<TypeParam*, int> value = *I;  (void)value;
-    CompileAssertHasType<TypeParam*>(I->first);
-    if (I->second == 5) {
-      EXPECT_EQ(this->BitcastV.get(), I->first);
-    } else if (I->second == 6) {
-      EXPECT_EQ(this->AddV.get(), I->first);
-    } else {
-      ADD_FAILURE() << "Iterated through an extra value.";
-    }
-  }
-  EXPECT_EQ(2U, size);
-}
-
-TYPED_TEST(ValueMapTest, DefaultCollisionBehavior) {
-  // By default, we overwrite the old value with the replaced value.
-  ValueMap<TypeParam*, int> VM;
-  VM[this->BitcastV.get()] = 7;
-  VM[this->AddV.get()] = 9;
-  this->BitcastV->replaceAllUsesWith(this->AddV.get());
-  EXPECT_EQ(0u, VM.count(this->BitcastV.get()));
-  EXPECT_EQ(9, VM.lookup(this->AddV.get()));
-}
-
-TYPED_TEST(ValueMapTest, ConfiguredCollisionBehavior) {
-  // TODO: Implement this when someone needs it.
-}
-
-template<typename KeyT, typename MutexT>
-struct LockMutex : ValueMapConfig<KeyT, MutexT> {
-  struct ExtraData {
-    MutexT *M;
-    bool *CalledRAUW;
-    bool *CalledDeleted;
-  };
-  static void onRAUW(const ExtraData &Data, KeyT Old, KeyT New) {
-    *Data.CalledRAUW = true;
-    EXPECT_FALSE(Data.M->try_lock()) << "Mutex should already be locked.";
-  }
-  static void onDelete(const ExtraData &Data, KeyT Old) {
-    *Data.CalledDeleted = true;
-    EXPECT_FALSE(Data.M->try_lock()) << "Mutex should already be locked.";
-  }
-  static MutexT *getMutex(const ExtraData &Data) { return Data.M; }
-};
-// FIXME: These tests started failing on Windows.
-#if LLVM_ENABLE_THREADS && !defined(_WIN32)
-TYPED_TEST(ValueMapTest, LocksMutex) {
-  std::mutex M;
-  bool CalledRAUW = false, CalledDeleted = false;
-  typedef LockMutex<TypeParam*, std::mutex> ConfigType;
-  typename ConfigType::ExtraData Data = {&M, &CalledRAUW, &CalledDeleted};
-  ValueMap<TypeParam*, int, ConfigType> VM(Data);
-  VM[this->BitcastV.get()] = 7;
-  this->BitcastV->replaceAllUsesWith(this->AddV.get());
-  this->AddV.reset();
-  EXPECT_TRUE(CalledRAUW);
-  EXPECT_TRUE(CalledDeleted);
-}
-#endif
-
-template<typename KeyT>
-struct NoFollow : ValueMapConfig<KeyT> {
-  enum { FollowRAUW = false };
-};
-
-TYPED_TEST(ValueMapTest, NoFollowRAUW) {
-  ValueMap<TypeParam*, int, NoFollow<TypeParam*> > VM;
-  VM[this->BitcastV.get()] = 7;
-  EXPECT_EQ(7, VM.lookup(this->BitcastV.get()));
-  EXPECT_EQ(0u, VM.count(this->AddV.get()));
-  this->BitcastV->replaceAllUsesWith(this->AddV.get());
-  EXPECT_EQ(7, VM.lookup(this->BitcastV.get()));
-  EXPECT_EQ(0, VM.lookup(this->AddV.get()));
-  this->AddV.reset();
-  EXPECT_EQ(7, VM.lookup(this->BitcastV.get()));
-  EXPECT_EQ(0, VM.lookup(this->AddV.get()));
-  this->BitcastV.reset();
-  EXPECT_EQ(0, VM.lookup(this->BitcastV.get()));
-  EXPECT_EQ(0, VM.lookup(this->AddV.get()));
-  EXPECT_EQ(0U, VM.size());
-}
-
-template<typename KeyT>
-struct CountOps : ValueMapConfig<KeyT> {
-  struct ExtraData {
-    int *Deletions;
-    int *RAUWs;
-  };
-
-  static void onRAUW(const ExtraData &Data, KeyT Old, KeyT New) {
-    ++*Data.RAUWs;
-  }
-  static void onDelete(const ExtraData &Data, KeyT Old) {
-    ++*Data.Deletions;
-  }
-};
-
-TYPED_TEST(ValueMapTest, CallsConfig) {
-  int Deletions = 0, RAUWs = 0;
-  typename CountOps<TypeParam*>::ExtraData Data = {&Deletions, &RAUWs};
-  ValueMap<TypeParam*, int, CountOps<TypeParam*> > VM(Data);
-  VM[this->BitcastV.get()] = 7;
-  this->BitcastV->replaceAllUsesWith(this->AddV.get());
-  EXPECT_EQ(0, Deletions);
-  EXPECT_EQ(1, RAUWs);
-  this->AddV.reset();
-  EXPECT_EQ(1, Deletions);
-  EXPECT_EQ(1, RAUWs);
-  this->BitcastV.reset();
-  EXPECT_EQ(1, Deletions);
-  EXPECT_EQ(1, RAUWs);
-}
-
-template<typename KeyT>
-struct ModifyingConfig : ValueMapConfig<KeyT> {
-  // We'll put a pointer here back to the ValueMap this key is in, so
-  // that we can modify it (and clobber *this) before the ValueMap
-  // tries to do the same modification.  In previous versions of
-  // ValueMap, that exploded.
-  typedef ValueMap<KeyT, int, ModifyingConfig<KeyT> > **ExtraData;
-
-  static void onRAUW(ExtraData Map, KeyT Old, KeyT New) {
-    (*Map)->erase(Old);
-  }
-  static void onDelete(ExtraData Map, KeyT Old) {
-    (*Map)->erase(Old);
-  }
-};
-TYPED_TEST(ValueMapTest, SurvivesModificationByConfig) {
-  ValueMap<TypeParam*, int, ModifyingConfig<TypeParam*> > *MapAddress;
-  ValueMap<TypeParam*, int, ModifyingConfig<TypeParam*> > VM(&MapAddress);
-  MapAddress = &VM;
-  // Now the ModifyingConfig can modify the Map inside a callback.
-  VM[this->BitcastV.get()] = 7;
-  this->BitcastV->replaceAllUsesWith(this->AddV.get());
-  EXPECT_EQ(0u, VM.count(this->BitcastV.get()));
-  EXPECT_EQ(0u, VM.count(this->AddV.get()));
-  VM[this->AddV.get()] = 7;
-  this->AddV.reset();
-  EXPECT_EQ(0u, VM.count(this->AddV.get()));
-}
-
-} // end namespace
diff --git a/gnu/llvm/llvm/unittests/IR/ValueTest.cpp b/gnu/llvm/llvm/unittests/IR/ValueTest.cpp
deleted file mode 100644
index f94eec89ad6..00000000000
--- a/gnu/llvm/llvm/unittests/IR/ValueTest.cpp
+++ /dev/null
@@ -1,315 +0,0 @@
-//===- llvm/unittest/IR/ValueTest.cpp - Value unit tests ------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/IR/Value.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/IntrinsicInst.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/ModuleSlotTracker.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-using namespace llvm;
-
-namespace {
-
-TEST(ValueTest, UsedInBasicBlock) {
-  LLVMContext C;
-
-  const char *ModuleString = "define void @f(i32 %x, i32 %y) {\n"
-                             "bb0:\n"
-                             "  %y1 = add i32 %y, 1\n"
-                             "  %y2 = add i32 %y, 1\n"
-                             "  %y3 = add i32 %y, 1\n"
-                             "  %y4 = add i32 %y, 1\n"
-                             "  %y5 = add i32 %y, 1\n"
-                             "  %y6 = add i32 %y, 1\n"
-                             "  %y7 = add i32 %y, 1\n"
-                             "  %y8 = add i32 %x, 1\n"
-                             "  ret void\n"
-                             "}\n";
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M = parseAssemblyString(ModuleString, Err, C);
-
-  Function *F = M->getFunction("f");
-
-  EXPECT_FALSE(F->isUsedInBasicBlock(&F->front()));
-  EXPECT_TRUE(std::next(F->arg_begin())->isUsedInBasicBlock(&F->front()));
-  EXPECT_TRUE(F->arg_begin()->isUsedInBasicBlock(&F->front()));
-}
-
-TEST(GlobalTest, CreateAddressSpace) {
-  LLVMContext Ctx;
-  std::unique_ptr<Module> M(new Module("TestModule", Ctx));
-  Type *Int8Ty = Type::getInt8Ty(Ctx);
-  Type *Int32Ty = Type::getInt32Ty(Ctx);
-
-  GlobalVariable *Dummy0
-    = new GlobalVariable(*M,
-                         Int32Ty,
-                         true,
-                         GlobalValue::ExternalLinkage,
-                         Constant::getAllOnesValue(Int32Ty),
-                         "dummy",
-                         nullptr,
-                         GlobalVariable::NotThreadLocal,
-                         1);
-
-  EXPECT_TRUE(Value::MaximumAlignment == 536870912U);
-  Dummy0->setAlignment(Align(536870912));
-  EXPECT_EQ(Dummy0->getAlignment(), 536870912U);
-
-  // Make sure the address space isn't dropped when returning this.
-  Constant *Dummy1 = M->getOrInsertGlobal("dummy", Int32Ty);
-  EXPECT_EQ(Dummy0, Dummy1);
-  EXPECT_EQ(1u, Dummy1->getType()->getPointerAddressSpace());
-
-
-  // This one requires a bitcast, but the address space must also stay the same.
-  GlobalVariable *DummyCast0
-    = new GlobalVariable(*M,
-                         Int32Ty,
-                         true,
-                         GlobalValue::ExternalLinkage,
-                         Constant::getAllOnesValue(Int32Ty),
-                         "dummy_cast",
-                         nullptr,
-                         GlobalVariable::NotThreadLocal,
-                         1);
-
-  // Make sure the address space isn't dropped when returning this.
-  Constant *DummyCast1 = M->getOrInsertGlobal("dummy_cast", Int8Ty);
-  EXPECT_EQ(1u, DummyCast1->getType()->getPointerAddressSpace());
-  EXPECT_NE(DummyCast0, DummyCast1) << *DummyCast1;
-}
-
-#ifdef GTEST_HAS_DEATH_TEST
-#ifndef NDEBUG
-
-TEST(GlobalTest, AlignDeath) {
-  LLVMContext Ctx;
-  std::unique_ptr<Module> M(new Module("TestModule", Ctx));
-  Type *Int32Ty = Type::getInt32Ty(Ctx);
-  GlobalVariable *Var =
-      new GlobalVariable(*M, Int32Ty, true, GlobalValue::ExternalLinkage,
-                         Constant::getAllOnesValue(Int32Ty), "var", nullptr,
-                         GlobalVariable::NotThreadLocal, 1);
-
-  EXPECT_DEATH(Var->setAlignment(Align(1073741824U)),
-               "Alignment is greater than MaximumAlignment");
-}
-#endif
-#endif
-
-TEST(ValueTest, printSlots) {
-  // Check that Value::print() and Value::printAsOperand() work with and
-  // without a slot tracker.
-  LLVMContext C;
-
-  const char *ModuleString = "@g0 = external global %500\n"
-                             "@g1 = external global %900\n"
-                             "\n"
-                             "%900 = type { i32, i32 }\n"
-                             "%500 = type { i32 }\n"
-                             "\n"
-                             "define void @f(i32 %x, i32 %y) {\n"
-                             "entry:\n"
-                             "  %0 = add i32 %y, 1\n"
-                             "  %1 = add i32 %y, 1\n"
-                             "  ret void\n"
-                             "}\n";
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M = parseAssemblyString(ModuleString, Err, C);
-
-  Function *F = M->getFunction("f");
-  ASSERT_TRUE(F);
-  ASSERT_FALSE(F->empty());
-  BasicBlock &BB = F->getEntryBlock();
-  ASSERT_EQ(3u, BB.size());
-
-  Instruction *I0 = &*BB.begin();
-  ASSERT_TRUE(I0);
-  Instruction *I1 = &*++BB.begin();
-  ASSERT_TRUE(I1);
-
-  GlobalVariable *G0 = M->getGlobalVariable("g0");
-  ASSERT_TRUE(G0);
-  GlobalVariable *G1 = M->getGlobalVariable("g1");
-  ASSERT_TRUE(G1);
-
-  ModuleSlotTracker MST(M.get());
-
-#define CHECK_PRINT(INST, STR)                                                 \
-  do {                                                                         \
-    {                                                                          \
-      std::string S;                                                           \
-      raw_string_ostream OS(S);                                                \
-      INST->print(OS);                                                         \
-      EXPECT_EQ(STR, OS.str());                                                \
-    }                                                                          \
-    {                                                                          \
-      std::string S;                                                           \
-      raw_string_ostream OS(S);                                                \
-      INST->print(OS, MST);                                                    \
-      EXPECT_EQ(STR, OS.str());                                                \
-    }                                                                          \
-  } while (false)
-  CHECK_PRINT(I0, "  %0 = add i32 %y, 1");
-  CHECK_PRINT(I1, "  %1 = add i32 %y, 1");
-#undef CHECK_PRINT
-
-#define CHECK_PRINT_AS_OPERAND(INST, TYPE, STR)                                \
-  do {                                                                         \
-    {                                                                          \
-      std::string S;                                                           \
-      raw_string_ostream OS(S);                                                \
-      INST->printAsOperand(OS, TYPE);                                          \
-      EXPECT_EQ(StringRef(STR), StringRef(OS.str()));                          \
-    }                                                                          \
-    {                                                                          \
-      std::string S;                                                           \
-      raw_string_ostream OS(S);                                                \
-      INST->printAsOperand(OS, TYPE, MST);                                     \
-      EXPECT_EQ(StringRef(STR), StringRef(OS.str()));                          \
-    }                                                                          \
-  } while (false)
-  CHECK_PRINT_AS_OPERAND(I0, false, "%0");
-  CHECK_PRINT_AS_OPERAND(I1, false, "%1");
-  CHECK_PRINT_AS_OPERAND(I0, true, "i32 %0");
-  CHECK_PRINT_AS_OPERAND(I1, true, "i32 %1");
-  CHECK_PRINT_AS_OPERAND(G0, true, "%0* @g0");
-  CHECK_PRINT_AS_OPERAND(G1, true, "%1* @g1");
-#undef CHECK_PRINT_AS_OPERAND
-}
-
-TEST(ValueTest, getLocalSlots) {
-  // Verify that the getLocalSlot method returns the correct slot numbers.
-  LLVMContext C;
-  const char *ModuleString = "define void @f(i32 %x, i32 %y) {\n"
-                             "entry:\n"
-                             "  %0 = add i32 %y, 1\n"
-                             "  %1 = add i32 %y, 1\n"
-                             "  br label %2\n"
-                             "\n"
-                             "  ret void\n"
-                             "}\n";
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M = parseAssemblyString(ModuleString, Err, C);
-
-  Function *F = M->getFunction("f");
-  ASSERT_TRUE(F);
-  ASSERT_FALSE(F->empty());
-  BasicBlock &EntryBB = F->getEntryBlock();
-  ASSERT_EQ(3u, EntryBB.size());
-  BasicBlock *BB2 = &*++F->begin();
-  ASSERT_TRUE(BB2);
-
-  Instruction *I0 = &*EntryBB.begin();
-  ASSERT_TRUE(I0);
-  Instruction *I1 = &*++EntryBB.begin();
-  ASSERT_TRUE(I1);
-
-  ModuleSlotTracker MST(M.get());
-  MST.incorporateFunction(*F);
-  EXPECT_EQ(MST.getLocalSlot(I0), 0);
-  EXPECT_EQ(MST.getLocalSlot(I1), 1);
-  EXPECT_EQ(MST.getLocalSlot(&EntryBB), -1);
-  EXPECT_EQ(MST.getLocalSlot(BB2), 2);
-}
-
-#if defined(GTEST_HAS_DEATH_TEST) && !defined(NDEBUG)
-TEST(ValueTest, getLocalSlotDeath) {
-  LLVMContext C;
-  const char *ModuleString = "define void @f(i32 %x, i32 %y) {\n"
-                             "entry:\n"
-                             "  %0 = add i32 %y, 1\n"
-                             "  %1 = add i32 %y, 1\n"
-                             "  br label %2\n"
-                             "\n"
-                             "  ret void\n"
-                             "}\n";
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M = parseAssemblyString(ModuleString, Err, C);
-
-  Function *F = M->getFunction("f");
-  ASSERT_TRUE(F);
-  ASSERT_FALSE(F->empty());
-  BasicBlock *BB2 = &*++F->begin();
-  ASSERT_TRUE(BB2);
-
-  ModuleSlotTracker MST(M.get());
-  EXPECT_DEATH(MST.getLocalSlot(BB2), "No function incorporated");
-}
-#endif
-
-TEST(ValueTest, replaceUsesOutsideBlock) {
-  // Check that Value::replaceUsesOutsideBlock(New, BB) replaces uses outside
-  // BB, including dbg.* uses of MetadataAsValue(ValueAsMetadata(this)).
-  const auto *IR = R"(
-    define i32 @f() !dbg !6 {
-    entry:
-      %a = add i32 0, 1, !dbg !15
-      %b = add i32 0, 2, !dbg !15
-      %c = add i32 %a, 2, !dbg !15
-      call void @llvm.dbg.value(metadata i32 %a, metadata !9, metadata !DIExpression()), !dbg !15
-      br label %exit, !dbg !15
-
-    exit:
-      call void @llvm.dbg.value(metadata i32 %a, metadata !11, metadata !DIExpression()), !dbg !16
-      ret i32 %a, !dbg !16
-    }
-
-    declare void @llvm.dbg.value(metadata, metadata, metadata)
-
-    !llvm.dbg.cu = !{!0}
-    !llvm.module.flags = !{!5}
-
-    !0 = distinct !DICompileUnit(language: DW_LANG_C, file: !1, producer: "debugify", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2)
-    !1 = !DIFile(filename: "test.ll", directory: "/")
-    !2 = !{}
-    !5 = !{i32 2, !"Debug Info Version", i32 3}
-    !6 = distinct !DISubprogram(name: "f", linkageName: "f", scope: null, file: !1, line: 1, type: !7, isLocal: false, isDefinition: true, scopeLine: 1, isOptimized: true, unit: !0, retainedNodes: !8)
-    !7 = !DISubroutineType(types: !2)
-    !8 = !{!9, !11}
-    !9 = !DILocalVariable(name: "1", scope: !6, file: !1, line: 1, type: !10)
-    !10 = !DIBasicType(name: "ty32", size: 32, encoding: DW_ATE_signed)
-    !11 = !DILocalVariable(name: "2", scope: !6, file: !1, line: 2, type: !12)
-    !12 = !DIBasicType(name: "ty64", size: 64, encoding: DW_ATE_signed)
-    !15 = !DILocation(line: 1, column: 1, scope: !6)
-    !16 = !DILocation(line: 5, column: 1, scope: !6)
-  )";
-  LLVMContext Ctx;
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M = parseAssemblyString(IR, Err, Ctx);
-  if (!M)
-    Err.print("ValueTest", errs());
-
-  auto GetNext = [](auto *I) { return &*++I->getIterator(); };
-
-  Function *F = M->getFunction("f");
-  // Entry.
-  BasicBlock *Entry = &F->front();
-  Instruction *A = &Entry->front();
-  Instruction *B = GetNext(A);
-  Instruction *C = GetNext(B);
-  auto *EntryDbg = cast<DbgValueInst>(GetNext(C));
-  // Exit.
-  BasicBlock *Exit = GetNext(Entry);
-  auto *ExitDbg = cast<DbgValueInst>(&Exit->front());
-  Instruction *Ret = GetNext(ExitDbg);
-
-  A->replaceUsesOutsideBlock(B, Entry);
-  // These users are in Entry so shouldn't be changed.
-  ASSERT_TRUE(C->getOperand(0) == cast<Value>(A));
-  ASSERT_TRUE(EntryDbg->getValue(0) == cast<Value>(A));
-  // These users are outside Entry so should be changed.
-  ASSERT_TRUE(ExitDbg->getValue(0) == cast<Value>(B));
-  ASSERT_TRUE(Ret->getOperand(0) == cast<Value>(B));
-}
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/IR/VectorTypesTest.cpp b/gnu/llvm/llvm/unittests/IR/VectorTypesTest.cpp
deleted file mode 100644
index c8a09808428..00000000000
--- a/gnu/llvm/llvm/unittests/IR/VectorTypesTest.cpp
+++ /dev/null
@@ -1,381 +0,0 @@
-//===--- llvm/unittest/IR/VectorTypesTest.cpp - vector types unit tests ---===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/IR/DataLayout.h"
-#include "llvm/IR/DerivedTypes.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/Support/TypeSize.h"
-#include "gtest/gtest.h"
-using namespace llvm;
-
-namespace {
-
-#define EXPECT_VTY_EQ(LHS, RHS)                                                \
-  ASSERT_NE(LHS, nullptr) << #LHS << " must not be null";                      \
-  ASSERT_NE(RHS, nullptr) << #RHS << " must not be null";                      \
-  EXPECT_EQ(LHS, RHS) << "Expect that " << #LHS << " == " << #RHS << " where " \
-                      << #LHS << " = " << *LHS << " and " << #RHS << " = "     \
-                      << *RHS;
-
-#define EXPECT_VTY_NE(LHS, RHS)                                                \
-  ASSERT_NE(LHS, nullptr) << #LHS << " must not be null";                      \
-  ASSERT_NE(RHS, nullptr) << #RHS << " must not be null";                      \
-  EXPECT_NE(LHS, RHS) << "Expect that " << #LHS << " != " << #RHS << " where " \
-                      << #LHS << " = " << *LHS << " and " << #RHS << " = "     \
-                      << *RHS;
-
-TEST(VectorTypesTest, FixedLength) {
-  LLVMContext Ctx;
-
-  Type *Int8Ty = Type::getInt8Ty(Ctx);
-  Type *Int16Ty = Type::getInt16Ty(Ctx);
-  Type *Int32Ty = Type::getInt32Ty(Ctx);
-  Type *Int64Ty = Type::getInt64Ty(Ctx);
-  Type *Float64Ty = Type::getDoubleTy(Ctx);
-
-  auto *V16Int8Ty = FixedVectorType::get(Int8Ty, 16);
-  ASSERT_NE(nullptr, V16Int8Ty);
-  EXPECT_EQ(V16Int8Ty->getNumElements(), 16U);
-  EXPECT_EQ(V16Int8Ty->getElementType()->getScalarSizeInBits(), 8U);
-
-  auto *V8Int32Ty =
-      dyn_cast<FixedVectorType>(VectorType::get(Int32Ty, 8, false));
-  ASSERT_NE(nullptr, V8Int32Ty);
-  EXPECT_EQ(V8Int32Ty->getNumElements(), 8U);
-  EXPECT_EQ(V8Int32Ty->getElementType()->getScalarSizeInBits(), 32U);
-
-  auto *V8Int8Ty =
-      dyn_cast<FixedVectorType>(VectorType::get(Int8Ty, V8Int32Ty));
-  EXPECT_VTY_NE(V8Int32Ty, V8Int8Ty);
-  EXPECT_EQ(V8Int8Ty->getElementCount(), V8Int32Ty->getElementCount());
-  EXPECT_EQ(V8Int8Ty->getElementType()->getScalarSizeInBits(), 8U);
-
-  auto *V8Int32Ty2 =
-      dyn_cast<FixedVectorType>(VectorType::get(Int32Ty, V8Int32Ty));
-  EXPECT_VTY_EQ(V8Int32Ty, V8Int32Ty2);
-
-  auto *V8Int16Ty = dyn_cast<FixedVectorType>(
-      VectorType::get(Int16Ty, ElementCount::getFixed(8)));
-  ASSERT_NE(nullptr, V8Int16Ty);
-  EXPECT_EQ(V8Int16Ty->getNumElements(), 8U);
-  EXPECT_EQ(V8Int16Ty->getElementType()->getScalarSizeInBits(), 16U);
-
-  auto EltCnt = ElementCount::getFixed(4);
-  auto *V4Int64Ty = dyn_cast<FixedVectorType>(VectorType::get(Int64Ty, EltCnt));
-  ASSERT_NE(nullptr, V4Int64Ty);
-  EXPECT_EQ(V4Int64Ty->getNumElements(), 4U);
-  EXPECT_EQ(V4Int64Ty->getElementType()->getScalarSizeInBits(), 64U);
-
-  auto *V2Int64Ty = dyn_cast<FixedVectorType>(
-      VectorType::get(Int64Ty, EltCnt.divideCoefficientBy(2)));
-  ASSERT_NE(nullptr, V2Int64Ty);
-  EXPECT_EQ(V2Int64Ty->getNumElements(), 2U);
-  EXPECT_EQ(V2Int64Ty->getElementType()->getScalarSizeInBits(), 64U);
-
-  auto *V8Int64Ty =
-      dyn_cast<FixedVectorType>(VectorType::get(Int64Ty, EltCnt * 2));
-  ASSERT_NE(nullptr, V8Int64Ty);
-  EXPECT_EQ(V8Int64Ty->getNumElements(), 8U);
-  EXPECT_EQ(V8Int64Ty->getElementType()->getScalarSizeInBits(), 64U);
-
-  auto *V4Float64Ty =
-      dyn_cast<FixedVectorType>(VectorType::get(Float64Ty, EltCnt));
-  ASSERT_NE(nullptr, V4Float64Ty);
-  EXPECT_EQ(V4Float64Ty->getNumElements(), 4U);
-  EXPECT_EQ(V4Float64Ty->getElementType()->getScalarSizeInBits(), 64U);
-
-  auto *ExtTy = dyn_cast<FixedVectorType>(
-      VectorType::getExtendedElementVectorType(V8Int16Ty));
-  EXPECT_VTY_EQ(ExtTy, V8Int32Ty);
-  EXPECT_EQ(ExtTy->getNumElements(), 8U);
-  EXPECT_EQ(ExtTy->getElementType()->getScalarSizeInBits(), 32U);
-
-  auto *TruncTy = dyn_cast<FixedVectorType>(
-      VectorType::getTruncatedElementVectorType(V8Int32Ty));
-  EXPECT_VTY_EQ(TruncTy, V8Int16Ty);
-  EXPECT_EQ(TruncTy->getNumElements(), 8U);
-  EXPECT_EQ(TruncTy->getElementType()->getScalarSizeInBits(), 16U);
-
-  auto *HalvedTy = dyn_cast<FixedVectorType>(
-      VectorType::getHalfElementsVectorType(V4Int64Ty));
-  EXPECT_VTY_EQ(HalvedTy, V2Int64Ty);
-  EXPECT_EQ(HalvedTy->getNumElements(), 2U);
-  EXPECT_EQ(HalvedTy->getElementType()->getScalarSizeInBits(), 64U);
-
-  auto *DoubledTy = dyn_cast<FixedVectorType>(
-      VectorType::getDoubleElementsVectorType(V4Int64Ty));
-  EXPECT_VTY_EQ(DoubledTy, V8Int64Ty);
-  EXPECT_EQ(DoubledTy->getNumElements(), 8U);
-  EXPECT_EQ(DoubledTy->getElementType()->getScalarSizeInBits(), 64U);
-
-  auto *ConvTy = dyn_cast<FixedVectorType>(VectorType::getInteger(V4Float64Ty));
-  EXPECT_VTY_EQ(ConvTy, V4Int64Ty);
-  EXPECT_EQ(ConvTy->getNumElements(), 4U);
-  EXPECT_EQ(ConvTy->getElementType()->getScalarSizeInBits(), 64U);
-
-  EltCnt = V8Int64Ty->getElementCount();
-  EXPECT_EQ(EltCnt.getKnownMinValue(), 8U);
-  ASSERT_FALSE(EltCnt.isScalable());
-}
-
-TEST(VectorTypesTest, Scalable) {
-  LLVMContext Ctx;
-
-  Type *Int8Ty = Type::getInt8Ty(Ctx);
-  Type *Int16Ty = Type::getInt16Ty(Ctx);
-  Type *Int32Ty = Type::getInt32Ty(Ctx);
-  Type *Int64Ty = Type::getInt64Ty(Ctx);
-  Type *Float64Ty = Type::getDoubleTy(Ctx);
-
-  auto *ScV16Int8Ty = ScalableVectorType::get(Int8Ty, 16);
-  ASSERT_NE(nullptr, ScV16Int8Ty);
-  EXPECT_EQ(ScV16Int8Ty->getMinNumElements(), 16U);
-  EXPECT_EQ(ScV16Int8Ty->getScalarSizeInBits(), 8U);
-
-  auto *ScV8Int32Ty =
-      dyn_cast<ScalableVectorType>(VectorType::get(Int32Ty, 8, true));
-  ASSERT_NE(nullptr, ScV8Int32Ty);
-  EXPECT_EQ(ScV8Int32Ty->getMinNumElements(), 8U);
-  EXPECT_EQ(ScV8Int32Ty->getElementType()->getScalarSizeInBits(), 32U);
-
-  auto *ScV8Int8Ty =
-      dyn_cast<ScalableVectorType>(VectorType::get(Int8Ty, ScV8Int32Ty));
-  EXPECT_VTY_NE(ScV8Int32Ty, ScV8Int8Ty);
-  EXPECT_EQ(ScV8Int8Ty->getElementCount(), ScV8Int32Ty->getElementCount());
-  EXPECT_EQ(ScV8Int8Ty->getElementType()->getScalarSizeInBits(), 8U);
-
-  auto *ScV8Int32Ty2 =
-      dyn_cast<ScalableVectorType>(VectorType::get(Int32Ty, ScV8Int32Ty));
-  EXPECT_VTY_EQ(ScV8Int32Ty, ScV8Int32Ty2);
-
-  auto *ScV8Int16Ty = dyn_cast<ScalableVectorType>(
-      VectorType::get(Int16Ty, ElementCount::getScalable(8)));
-  ASSERT_NE(nullptr, ScV8Int16Ty);
-  EXPECT_EQ(ScV8Int16Ty->getMinNumElements(), 8U);
-  EXPECT_EQ(ScV8Int16Ty->getElementType()->getScalarSizeInBits(), 16U);
-
-  auto EltCnt = ElementCount::getScalable(4);
-  auto *ScV4Int64Ty =
-      dyn_cast<ScalableVectorType>(VectorType::get(Int64Ty, EltCnt));
-  ASSERT_NE(nullptr, ScV4Int64Ty);
-  EXPECT_EQ(ScV4Int64Ty->getMinNumElements(), 4U);
-  EXPECT_EQ(ScV4Int64Ty->getElementType()->getScalarSizeInBits(), 64U);
-
-  auto *ScV2Int64Ty = dyn_cast<ScalableVectorType>(
-      VectorType::get(Int64Ty, EltCnt.divideCoefficientBy(2)));
-  ASSERT_NE(nullptr, ScV2Int64Ty);
-  EXPECT_EQ(ScV2Int64Ty->getMinNumElements(), 2U);
-  EXPECT_EQ(ScV2Int64Ty->getElementType()->getScalarSizeInBits(), 64U);
-
-  auto *ScV8Int64Ty =
-      dyn_cast<ScalableVectorType>(VectorType::get(Int64Ty, EltCnt * 2));
-  ASSERT_NE(nullptr, ScV8Int64Ty);
-  EXPECT_EQ(ScV8Int64Ty->getMinNumElements(), 8U);
-  EXPECT_EQ(ScV8Int64Ty->getElementType()->getScalarSizeInBits(), 64U);
-
-  auto *ScV4Float64Ty =
-      dyn_cast<ScalableVectorType>(VectorType::get(Float64Ty, EltCnt));
-  ASSERT_NE(nullptr, ScV4Float64Ty);
-  EXPECT_EQ(ScV4Float64Ty->getMinNumElements(), 4U);
-  EXPECT_EQ(ScV4Float64Ty->getElementType()->getScalarSizeInBits(), 64U);
-
-  auto *ExtTy = dyn_cast<ScalableVectorType>(
-      VectorType::getExtendedElementVectorType(ScV8Int16Ty));
-  EXPECT_VTY_EQ(ExtTy, ScV8Int32Ty);
-  EXPECT_EQ(ExtTy->getMinNumElements(), 8U);
-  EXPECT_EQ(ExtTy->getElementType()->getScalarSizeInBits(), 32U);
-
-  auto *TruncTy = dyn_cast<ScalableVectorType>(
-      VectorType::getTruncatedElementVectorType(ScV8Int32Ty));
-  EXPECT_VTY_EQ(TruncTy, ScV8Int16Ty);
-  EXPECT_EQ(TruncTy->getMinNumElements(), 8U);
-  EXPECT_EQ(TruncTy->getElementType()->getScalarSizeInBits(), 16U);
-
-  auto *HalvedTy = dyn_cast<ScalableVectorType>(
-      VectorType::getHalfElementsVectorType(ScV4Int64Ty));
-  EXPECT_VTY_EQ(HalvedTy, ScV2Int64Ty);
-  EXPECT_EQ(HalvedTy->getMinNumElements(), 2U);
-  EXPECT_EQ(HalvedTy->getElementType()->getScalarSizeInBits(), 64U);
-
-  auto *DoubledTy = dyn_cast<ScalableVectorType>(
-      VectorType::getDoubleElementsVectorType(ScV4Int64Ty));
-  EXPECT_VTY_EQ(DoubledTy, ScV8Int64Ty);
-  EXPECT_EQ(DoubledTy->getMinNumElements(), 8U);
-  EXPECT_EQ(DoubledTy->getElementType()->getScalarSizeInBits(), 64U);
-
-  auto *ConvTy =
-      dyn_cast<ScalableVectorType>(VectorType::getInteger(ScV4Float64Ty));
-  EXPECT_VTY_EQ(ConvTy, ScV4Int64Ty);
-  EXPECT_EQ(ConvTy->getMinNumElements(), 4U);
-  EXPECT_EQ(ConvTy->getElementType()->getScalarSizeInBits(), 64U);
-
-  EltCnt = ScV8Int64Ty->getElementCount();
-  EXPECT_EQ(EltCnt.getKnownMinValue(), 8U);
-  ASSERT_TRUE(EltCnt.isScalable());
-}
-
-TEST(VectorTypesTest, BaseVectorType) {
-  LLVMContext Ctx;
-
-  Type *Int16Ty = Type::getInt16Ty(Ctx);
-  Type *Int32Ty = Type::getInt32Ty(Ctx);
-
-  std::array<VectorType *, 8> VTys = {
-      VectorType::get(Int16Ty, ElementCount::getScalable(4)),
-      VectorType::get(Int16Ty, ElementCount::getFixed(4)),
-      VectorType::get(Int16Ty, ElementCount::getScalable(2)),
-      VectorType::get(Int16Ty, ElementCount::getFixed(2)),
-      VectorType::get(Int32Ty, ElementCount::getScalable(4)),
-      VectorType::get(Int32Ty, ElementCount::getFixed(4)),
-      VectorType::get(Int32Ty, ElementCount::getScalable(2)),
-      VectorType::get(Int32Ty, ElementCount::getFixed(2))};
-
-  /*
-    The comparison matrix is symmetric, so we only check the upper triangle:
-
-    (0,0) (0,1) (0,2) ... (0,7)
-    (1,0) (1,1) (1,2)         .
-    (2,0) (2,1) (2,2)         .
-    .                 .       .
-    .                  .
-    .                   .
-    (7,0) ...             (7,7)
-  */
-  for (size_t I = 0, IEnd = VTys.size(); I < IEnd; ++I) {
-    // test I == J
-    VectorType *VI = VTys[I];
-    ElementCount ECI = VI->getElementCount();
-    EXPECT_EQ(isa<ScalableVectorType>(VI), ECI.isScalable());
-
-    for (size_t J = I + 1, JEnd = VTys.size(); J < JEnd; ++J) {
-      // test I < J
-      VectorType *VJ = VTys[J];
-      EXPECT_VTY_NE(VI, VJ);
-
-      VectorType *VJPrime = VectorType::get(VI->getElementType(), VJ);
-      if (VI->getElementType() == VJ->getElementType()) {
-        EXPECT_VTY_EQ(VJ, VJPrime);
-      } else {
-        EXPECT_VTY_NE(VJ, VJPrime);
-      }
-
-      EXPECT_EQ(VJ->getTypeID(), VJPrime->getTypeID())
-          << "VJ and VJPrime are the same sort of vector";
-    }
-  }
-}
-
-TEST(VectorTypesTest, FixedLenComparisons) {
-  LLVMContext Ctx;
-  DataLayout DL("");
-
-  Type *Int32Ty = Type::getInt32Ty(Ctx);
-  Type *Int64Ty = Type::getInt64Ty(Ctx);
-
-  auto *V2Int32Ty = FixedVectorType::get(Int32Ty, 2);
-  auto *V4Int32Ty = FixedVectorType::get(Int32Ty, 4);
-
-  auto *V2Int64Ty = FixedVectorType::get(Int64Ty, 2);
-
-  TypeSize V2I32Len = V2Int32Ty->getPrimitiveSizeInBits();
-  EXPECT_EQ(V2I32Len.getKnownMinSize(), 64U);
-  EXPECT_FALSE(V2I32Len.isScalable());
-
-  EXPECT_LT(V2Int32Ty->getPrimitiveSizeInBits().getFixedSize(),
-            V4Int32Ty->getPrimitiveSizeInBits().getFixedSize());
-  EXPECT_GT(V2Int64Ty->getPrimitiveSizeInBits().getFixedSize(),
-            V2Int32Ty->getPrimitiveSizeInBits().getFixedSize());
-  EXPECT_EQ(V4Int32Ty->getPrimitiveSizeInBits(),
-            V2Int64Ty->getPrimitiveSizeInBits());
-  EXPECT_NE(V2Int32Ty->getPrimitiveSizeInBits(),
-            V2Int64Ty->getPrimitiveSizeInBits());
-
-  // Check that a fixed-only comparison works for fixed size vectors.
-  EXPECT_EQ(V2Int64Ty->getPrimitiveSizeInBits().getFixedSize(),
-            V4Int32Ty->getPrimitiveSizeInBits().getFixedSize());
-
-  // Check the DataLayout interfaces.
-  EXPECT_EQ(DL.getTypeSizeInBits(V2Int64Ty), DL.getTypeSizeInBits(V4Int32Ty));
-  EXPECT_EQ(DL.getTypeSizeInBits(V2Int32Ty), 64U);
-  EXPECT_EQ(DL.getTypeSizeInBits(V2Int64Ty), 128U);
-  EXPECT_EQ(DL.getTypeStoreSize(V2Int64Ty), DL.getTypeStoreSize(V4Int32Ty));
-  EXPECT_NE(DL.getTypeStoreSizeInBits(V2Int32Ty),
-            DL.getTypeStoreSizeInBits(V2Int64Ty));
-  EXPECT_EQ(DL.getTypeStoreSizeInBits(V2Int32Ty), 64U);
-  EXPECT_EQ(DL.getTypeStoreSize(V2Int64Ty), 16U);
-  EXPECT_EQ(DL.getTypeAllocSize(V4Int32Ty), DL.getTypeAllocSize(V2Int64Ty));
-  EXPECT_NE(DL.getTypeAllocSizeInBits(V2Int32Ty),
-            DL.getTypeAllocSizeInBits(V2Int64Ty));
-  EXPECT_EQ(DL.getTypeAllocSizeInBits(V4Int32Ty), 128U);
-  EXPECT_EQ(DL.getTypeAllocSize(V2Int32Ty), 8U);
-  ASSERT_TRUE(DL.typeSizeEqualsStoreSize(V4Int32Ty));
-}
-
-TEST(VectorTypesTest, ScalableComparisons) {
-  LLVMContext Ctx;
-  DataLayout DL("");
-
-  Type *Int32Ty = Type::getInt32Ty(Ctx);
-  Type *Int64Ty = Type::getInt64Ty(Ctx);
-
-  auto *ScV2Int32Ty = ScalableVectorType::get(Int32Ty, 2);
-  auto *ScV4Int32Ty = ScalableVectorType::get(Int32Ty, 4);
-
-  auto *ScV2Int64Ty = ScalableVectorType::get(Int64Ty, 2);
-
-  TypeSize ScV2I32Len = ScV2Int32Ty->getPrimitiveSizeInBits();
-  EXPECT_EQ(ScV2I32Len.getKnownMinSize(), 64U);
-  EXPECT_TRUE(ScV2I32Len.isScalable());
-
-  EXPECT_LT(ScV2Int32Ty->getPrimitiveSizeInBits().getKnownMinSize(),
-            ScV4Int32Ty->getPrimitiveSizeInBits().getKnownMinSize());
-  EXPECT_GT(ScV2Int64Ty->getPrimitiveSizeInBits().getKnownMinSize(),
-            ScV2Int32Ty->getPrimitiveSizeInBits().getKnownMinSize());
-  EXPECT_EQ(ScV4Int32Ty->getPrimitiveSizeInBits().getKnownMinSize(),
-            ScV2Int64Ty->getPrimitiveSizeInBits().getKnownMinSize());
-  EXPECT_NE(ScV2Int32Ty->getPrimitiveSizeInBits().getKnownMinSize(),
-            ScV2Int64Ty->getPrimitiveSizeInBits().getKnownMinSize());
-
-  // Check the DataLayout interfaces.
-  EXPECT_EQ(DL.getTypeSizeInBits(ScV2Int64Ty),
-            DL.getTypeSizeInBits(ScV4Int32Ty));
-  EXPECT_EQ(DL.getTypeSizeInBits(ScV2Int32Ty).getKnownMinSize(), 64U);
-  EXPECT_EQ(DL.getTypeStoreSize(ScV2Int64Ty), DL.getTypeStoreSize(ScV4Int32Ty));
-  EXPECT_NE(DL.getTypeStoreSizeInBits(ScV2Int32Ty),
-            DL.getTypeStoreSizeInBits(ScV2Int64Ty));
-  EXPECT_EQ(DL.getTypeStoreSizeInBits(ScV2Int32Ty).getKnownMinSize(), 64U);
-  EXPECT_EQ(DL.getTypeStoreSize(ScV2Int64Ty).getKnownMinSize(), 16U);
-  EXPECT_EQ(DL.getTypeAllocSize(ScV4Int32Ty), DL.getTypeAllocSize(ScV2Int64Ty));
-  EXPECT_NE(DL.getTypeAllocSizeInBits(ScV2Int32Ty),
-            DL.getTypeAllocSizeInBits(ScV2Int64Ty));
-  EXPECT_EQ(DL.getTypeAllocSizeInBits(ScV4Int32Ty).getKnownMinSize(), 128U);
-  EXPECT_EQ(DL.getTypeAllocSize(ScV2Int32Ty).getKnownMinSize(), 8U);
-  ASSERT_TRUE(DL.typeSizeEqualsStoreSize(ScV4Int32Ty));
-}
-
-TEST(VectorTypesTest, CrossComparisons) {
-  LLVMContext Ctx;
-
-  Type *Int32Ty = Type::getInt32Ty(Ctx);
-
-  auto *V4Int32Ty = FixedVectorType::get(Int32Ty, 4);
-  auto *ScV4Int32Ty = ScalableVectorType::get(Int32Ty, 4);
-
-  // Even though the minimum size is the same, a scalable vector could be
-  // larger so we don't consider them to be the same size.
-  EXPECT_NE(V4Int32Ty->getPrimitiveSizeInBits(),
-            ScV4Int32Ty->getPrimitiveSizeInBits());
-  // If we are only checking the minimum, then they are the same size.
-  EXPECT_EQ(V4Int32Ty->getPrimitiveSizeInBits().getKnownMinSize(),
-            ScV4Int32Ty->getPrimitiveSizeInBits().getKnownMinSize());
-
-  // We can't use ordering comparisons (<,<=,>,>=) between scalable and
-  // non-scalable vector sizes.
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/IR/VerifierTest.cpp b/gnu/llvm/llvm/unittests/IR/VerifierTest.cpp
deleted file mode 100644
index 0e58bc4ed81..00000000000
--- a/gnu/llvm/llvm/unittests/IR/VerifierTest.cpp
+++ /dev/null
@@ -1,274 +0,0 @@
-//===- llvm/unittest/IR/VerifierTest.cpp - Verifier unit tests --*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/IR/Verifier.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/DIBuilder.h"
-#include "llvm/IR/DerivedTypes.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/GlobalAlias.h"
-#include "llvm/IR/GlobalVariable.h"
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-namespace {
-
-TEST(VerifierTest, Branch_i1) {
-  LLVMContext C;
-  Module M("M", C);
-  FunctionType *FTy = FunctionType::get(Type::getVoidTy(C), /*isVarArg=*/false);
-  Function *F = Function::Create(FTy, Function::ExternalLinkage, "foo", M);
-  BasicBlock *Entry = BasicBlock::Create(C, "entry", F);
-  BasicBlock *Exit = BasicBlock::Create(C, "exit", F);
-  ReturnInst::Create(C, Exit);
-
-  // To avoid triggering an assertion in BranchInst::Create, we first create
-  // a branch with an 'i1' condition ...
-
-  Constant *False = ConstantInt::getFalse(C);
-  BranchInst *BI = BranchInst::Create(Exit, Exit, False, Entry);
-
-  // ... then use setOperand to redirect it to a value of different type.
-
-  Constant *Zero32 = ConstantInt::get(IntegerType::get(C, 32), 0);
-  BI->setOperand(0, Zero32);
-
-  EXPECT_TRUE(verifyFunction(*F));
-}
-
-TEST(VerifierTest, Freeze) {
-  LLVMContext C;
-  Module M("M", C);
-  FunctionType *FTy = FunctionType::get(Type::getVoidTy(C), /*isVarArg=*/false);
-  Function *F = Function::Create(FTy, Function::ExternalLinkage, "foo", M);
-  BasicBlock *Entry = BasicBlock::Create(C, "entry", F);
-  ReturnInst *RI = ReturnInst::Create(C, Entry);
-
-  IntegerType *ITy = IntegerType::get(C, 32);
-  ConstantInt *CI = ConstantInt::get(ITy, 0);
-
-  // Valid type : freeze(<2 x i32>)
-  Constant *CV = ConstantVector::getSplat(ElementCount::getFixed(2), CI);
-  FreezeInst *FI_vec = new FreezeInst(CV);
-  FI_vec->insertBefore(RI);
-
-  EXPECT_FALSE(verifyFunction(*F));
-
-  FI_vec->eraseFromParent();
-
-  // Valid type : freeze(float)
-  Constant *CFP = ConstantFP::get(Type::getDoubleTy(C), 0.0);
-  FreezeInst *FI_dbl = new FreezeInst(CFP);
-  FI_dbl->insertBefore(RI);
-
-  EXPECT_FALSE(verifyFunction(*F));
-
-  FI_dbl->eraseFromParent();
-
-  // Valid type : freeze(i32*)
-  PointerType *PT = PointerType::get(ITy, 0);
-  ConstantPointerNull *CPN = ConstantPointerNull::get(PT);
-  FreezeInst *FI_ptr = new FreezeInst(CPN);
-  FI_ptr->insertBefore(RI);
-
-  EXPECT_FALSE(verifyFunction(*F));
-
-  FI_ptr->eraseFromParent();
-
-  // Valid type : freeze(int)
-  FreezeInst *FI = new FreezeInst(CI);
-  FI->insertBefore(RI);
-
-  EXPECT_FALSE(verifyFunction(*F));
-
-  FI->eraseFromParent();
-}
-
-TEST(VerifierTest, InvalidRetAttribute) {
-  LLVMContext C;
-  Module M("M", C);
-  FunctionType *FTy = FunctionType::get(Type::getInt32Ty(C), /*isVarArg=*/false);
-  Function *F = Function::Create(FTy, Function::ExternalLinkage, "foo", M);
-  AttributeList AS = F->getAttributes();
-  F->setAttributes(
-      AS.addAttribute(C, AttributeList::ReturnIndex, Attribute::UWTable));
-
-  std::string Error;
-  raw_string_ostream ErrorOS(Error);
-  EXPECT_TRUE(verifyModule(M, &ErrorOS));
-  EXPECT_TRUE(StringRef(ErrorOS.str()).startswith(
-      "Attribute 'uwtable' does not apply to function return values"));
-}
-
-TEST(VerifierTest, CrossModuleRef) {
-  LLVMContext C;
-  Module M1("M1", C);
-  Module M2("M2", C);
-  Module M3("M3", C);
-  FunctionType *FTy = FunctionType::get(Type::getInt32Ty(C), /*isVarArg=*/false);
-  Function *F1 = Function::Create(FTy, Function::ExternalLinkage, "foo1", M1);
-  Function *F2 = Function::Create(FTy, Function::ExternalLinkage, "foo2", M2);
-  Function *F3 = Function::Create(FTy, Function::ExternalLinkage, "foo3", M3);
-
-  BasicBlock *Entry1 = BasicBlock::Create(C, "entry", F1);
-  BasicBlock *Entry3 = BasicBlock::Create(C, "entry", F3);
-
-  // BAD: Referencing function in another module
-  CallInst::Create(F2,"call",Entry1);
-
-  // BAD: Referencing personality routine in another module
-  F3->setPersonalityFn(F2);
-
-  // Fill in the body
-  Constant *ConstZero = ConstantInt::get(Type::getInt32Ty(C), 0);
-  ReturnInst::Create(C, ConstZero, Entry1);
-  ReturnInst::Create(C, ConstZero, Entry3);
-
-  std::string Error;
-  raw_string_ostream ErrorOS(Error);
-  EXPECT_TRUE(verifyModule(M2, &ErrorOS));
-  EXPECT_TRUE(StringRef(ErrorOS.str())
-                  .equals("Global is used by function in a different module\n"
-                          "i32 ()* @foo2\n"
-                          "; ModuleID = 'M2'\n"
-                          "i32 ()* @foo3\n"
-                          "; ModuleID = 'M3'\n"
-                          "Global is referenced in a different module!\n"
-                          "i32 ()* @foo2\n"
-                          "; ModuleID = 'M2'\n"
-                          "  %call = call i32 @foo2()\n"
-                          "i32 ()* @foo1\n"
-                          "; ModuleID = 'M1'\n"));
-
-  Error.clear();
-  EXPECT_TRUE(verifyModule(M1, &ErrorOS));
-  EXPECT_TRUE(StringRef(ErrorOS.str()).equals(
-      "Referencing function in another module!\n"
-      "  %call = call i32 @foo2()\n"
-      "; ModuleID = 'M1'\n"
-      "i32 ()* @foo2\n"
-      "; ModuleID = 'M2'\n"));
-
-  Error.clear();
-  EXPECT_TRUE(verifyModule(M3, &ErrorOS));
-  EXPECT_TRUE(StringRef(ErrorOS.str()).startswith(
-      "Referencing personality function in another module!"));
-
-  // Erase bad methods to avoid triggering an assertion failure on destruction
-  F1->eraseFromParent();
-  F3->eraseFromParent();
-}
-
-TEST(VerifierTest, InvalidVariableLinkage) {
-  LLVMContext C;
-  Module M("M", C);
-  new GlobalVariable(M, Type::getInt8Ty(C), false,
-                     GlobalValue::LinkOnceODRLinkage, nullptr, "Some Global");
-  std::string Error;
-  raw_string_ostream ErrorOS(Error);
-  EXPECT_TRUE(verifyModule(M, &ErrorOS));
-  EXPECT_TRUE(
-      StringRef(ErrorOS.str()).startswith("Global is external, but doesn't "
-                                          "have external or weak linkage!"));
-}
-
-TEST(VerifierTest, InvalidFunctionLinkage) {
-  LLVMContext C;
-  Module M("M", C);
-
-  FunctionType *FTy = FunctionType::get(Type::getVoidTy(C), /*isVarArg=*/false);
-  Function::Create(FTy, GlobalValue::LinkOnceODRLinkage, "foo", &M);
-  std::string Error;
-  raw_string_ostream ErrorOS(Error);
-  EXPECT_TRUE(verifyModule(M, &ErrorOS));
-  EXPECT_TRUE(
-      StringRef(ErrorOS.str()).startswith("Global is external, but doesn't "
-                                          "have external or weak linkage!"));
-}
-
-TEST(VerifierTest, DetectInvalidDebugInfo) {
-  {
-    LLVMContext C;
-    Module M("M", C);
-    DIBuilder DIB(M);
-    DIB.createCompileUnit(dwarf::DW_LANG_C89, DIB.createFile("broken.c", "/"),
-                          "unittest", false, "", 0);
-    DIB.finalize();
-    EXPECT_FALSE(verifyModule(M));
-
-    // Now break it by inserting non-CU node to the list of CUs.
-    auto *File = DIB.createFile("not-a-CU.f", ".");
-    NamedMDNode *NMD = M.getOrInsertNamedMetadata("llvm.dbg.cu");
-    NMD->addOperand(File);
-    EXPECT_TRUE(verifyModule(M));
-  }
-  {
-    LLVMContext C;
-    Module M("M", C);
-    DIBuilder DIB(M);
-    auto *CU = DIB.createCompileUnit(dwarf::DW_LANG_C89,
-                                     DIB.createFile("broken.c", "/"),
-                                     "unittest", false, "", 0);
-    new GlobalVariable(M, Type::getInt8Ty(C), false,
-                       GlobalValue::ExternalLinkage, nullptr, "g");
-
-    auto *F = Function::Create(FunctionType::get(Type::getVoidTy(C), false),
-                               Function::ExternalLinkage, "f", M);
-    IRBuilder<> Builder(BasicBlock::Create(C, "", F));
-    Builder.CreateUnreachable();
-    F->setSubprogram(DIB.createFunction(
-        CU, "f", "f", DIB.createFile("broken.c", "/"), 1, nullptr, 1,
-        DINode::FlagZero,
-        DISubprogram::SPFlagLocalToUnit | DISubprogram::SPFlagDefinition));
-    DIB.finalize();
-    EXPECT_FALSE(verifyModule(M));
-
-    // Now break it by not listing the CU at all.
-    M.eraseNamedMetadata(M.getOrInsertNamedMetadata("llvm.dbg.cu"));
-    EXPECT_TRUE(verifyModule(M));
-  }
-}
-
-TEST(VerifierTest, MDNodeWrongContext) {
-  LLVMContext C1, C2;
-  auto *Node = MDNode::get(C1, None);
-
-  Module M("M", C2);
-  auto *NamedNode = M.getOrInsertNamedMetadata("test");
-  NamedNode->addOperand(Node);
-
-  std::string Error;
-  raw_string_ostream ErrorOS(Error);
-  EXPECT_TRUE(verifyModule(M, &ErrorOS));
-  EXPECT_TRUE(StringRef(ErrorOS.str())
-                  .startswith("MDNode context does not match Module context!"));
-}
-
-TEST(VerifierTest, AttributesWrongContext) {
-  LLVMContext C1, C2;
-  Module M1("M", C1);
-  FunctionType *FTy1 =
-      FunctionType::get(Type::getVoidTy(C1), /*isVarArg=*/false);
-  Function *F1 = Function::Create(FTy1, Function::ExternalLinkage, "foo", M1);
-  F1->setDoesNotReturn();
-
-  Module M2("M", C2);
-  FunctionType *FTy2 =
-      FunctionType::get(Type::getVoidTy(C2), /*isVarArg=*/false);
-  Function *F2 = Function::Create(FTy2, Function::ExternalLinkage, "foo", M2);
-  F2->copyAttributesFrom(F1);
-
-  EXPECT_TRUE(verifyFunction(*F2));
-}
-
-} // end anonymous namespace
-} // end namespace llvm
diff --git a/gnu/llvm/llvm/unittests/InterfaceStub/CMakeLists.txt b/gnu/llvm/llvm/unittests/InterfaceStub/CMakeLists.txt
deleted file mode 100644
index 22ff0af67a3..00000000000
--- a/gnu/llvm/llvm/unittests/InterfaceStub/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  InterfaceStub
-)
-
-add_llvm_unittest(InterfaceStubTests
-  ELFYAMLTest.cpp
-)
-
-target_link_libraries(InterfaceStubTests PRIVATE LLVMTestingSupport)
diff --git a/gnu/llvm/llvm/unittests/InterfaceStub/ELFYAMLTest.cpp b/gnu/llvm/llvm/unittests/InterfaceStub/ELFYAMLTest.cpp
deleted file mode 100644
index f6418f8f2a2..00000000000
--- a/gnu/llvm/llvm/unittests/InterfaceStub/ELFYAMLTest.cpp
+++ /dev/null
@@ -1,255 +0,0 @@
-//===- llvm/unittests/TextAPI/YAMLTest.cpp --------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===-----------------------------------------------------------------------===/
-
-#include "llvm/ADT/StringRef.h"
-#include "llvm/BinaryFormat/ELF.h"
-#include "llvm/InterfaceStub/IFSHandler.h"
-#include "llvm/InterfaceStub/IFSStub.h"
-#include "llvm/Support/Error.h"
-#include "llvm/Testing/Support/Error.h"
-#include "gtest/gtest.h"
-#include <string>
-
-using namespace llvm;
-using namespace llvm::ELF;
-using namespace llvm::ifs;
-
-void compareByLine(StringRef LHS, StringRef RHS) {
-  StringRef Line1;
-  StringRef Line2;
-  while (LHS.size() > 0 && RHS.size() > 0) {
-    std::tie(Line1, LHS) = LHS.split('\n');
-    std::tie(Line2, RHS) = RHS.split('\n');
-    // Comparing StringRef objects works, but has messy output when not equal.
-    // Using STREQ on StringRef.data() doesn't work since these substrings are
-    // not null terminated.
-    // This is inefficient, but forces null terminated strings that can be
-    // cleanly compared.
-    EXPECT_STREQ(Line1.str().data(), Line2.str().data());
-  }
-}
-
-TEST(ElfYamlTextAPI, YAMLReadableTBE) {
-  const char Data[] = "--- !ifs-v1\n"
-                      "IfsVersion: 1.0\n"
-                      "Target: { ObjectFormat: ELF, Arch: x86_64, Endianness: "
-                      "little, BitWidth: 64 }\n"
-                      "NeededLibs: [libc.so, libfoo.so, libbar.so]\n"
-                      "Symbols:\n"
-                      "  - { Name: foo, Type: Func, Undefined: true }\n"
-                      "...\n";
-  Expected<std::unique_ptr<IFSStub>> StubOrErr = readIFSFromBuffer(Data);
-  ASSERT_THAT_ERROR(StubOrErr.takeError(), Succeeded());
-  std::unique_ptr<IFSStub> Stub = std::move(StubOrErr.get());
-  EXPECT_NE(Stub.get(), nullptr);
-  EXPECT_FALSE(Stub->SoName.hasValue());
-  EXPECT_TRUE(Stub->Target.Arch.hasValue());
-  EXPECT_EQ(Stub->Target.Arch.getValue(), (uint16_t)llvm::ELF::EM_X86_64);
-  EXPECT_EQ(Stub->NeededLibs.size(), 3u);
-  EXPECT_STREQ(Stub->NeededLibs[0].c_str(), "libc.so");
-  EXPECT_STREQ(Stub->NeededLibs[1].c_str(), "libfoo.so");
-  EXPECT_STREQ(Stub->NeededLibs[2].c_str(), "libbar.so");
-}
-
-TEST(ElfYamlTextAPI, YAMLReadsTBESymbols) {
-  const char Data[] =
-      "--- !ifs-v1\n"
-      "IfsVersion: 1.0\n"
-      "SoName: test.so\n"
-      "Target: { ObjectFormat: ELF, Arch: x86_64, Endianness: little, "
-      "BitWidth: 64 }\n"
-      "Symbols:\n"
-      "  - { Name: bar, Type: Object, Size: 42 }\n"
-      "  - { Name: baz, Type: TLS, Size: 3 }\n"
-      "  - { Name: foo, Type: Func, Warning: \"Deprecated!\" }\n"
-      "  - { Name: nor, Type: NoType, Undefined: true }\n"
-      "  - { Name: not, Type: File, Undefined: true, Size: 111, "
-      "Weak: true, Warning: \'All fields populated!\' }\n"
-      "...\n";
-  Expected<std::unique_ptr<IFSStub>> StubOrErr = readIFSFromBuffer(Data);
-  ASSERT_THAT_ERROR(StubOrErr.takeError(), Succeeded());
-  std::unique_ptr<IFSStub> Stub = std::move(StubOrErr.get());
-  EXPECT_NE(Stub.get(), nullptr);
-  EXPECT_TRUE(Stub->SoName.hasValue());
-  EXPECT_STREQ(Stub->SoName->c_str(), "test.so");
-  EXPECT_EQ(Stub->Symbols.size(), 5u);
-
-  auto Iterator = Stub->Symbols.begin();
-  IFSSymbol const &SymBar = *Iterator++;
-  EXPECT_STREQ(SymBar.Name.c_str(), "bar");
-  EXPECT_EQ(SymBar.Size, 42u);
-  EXPECT_EQ(SymBar.Type, IFSSymbolType::Object);
-  EXPECT_FALSE(SymBar.Undefined);
-  EXPECT_FALSE(SymBar.Weak);
-  EXPECT_FALSE(SymBar.Warning.hasValue());
-
-  IFSSymbol const &SymBaz = *Iterator++;
-  EXPECT_STREQ(SymBaz.Name.c_str(), "baz");
-  EXPECT_EQ(SymBaz.Size, 3u);
-  EXPECT_EQ(SymBaz.Type, IFSSymbolType::TLS);
-  EXPECT_FALSE(SymBaz.Undefined);
-  EXPECT_FALSE(SymBaz.Weak);
-  EXPECT_FALSE(SymBaz.Warning.hasValue());
-
-  IFSSymbol const &SymFoo = *Iterator++;
-  EXPECT_STREQ(SymFoo.Name.c_str(), "foo");
-  EXPECT_EQ(SymFoo.Size, 0u);
-  EXPECT_EQ(SymFoo.Type, IFSSymbolType::Func);
-  EXPECT_FALSE(SymFoo.Undefined);
-  EXPECT_FALSE(SymFoo.Weak);
-  EXPECT_TRUE(SymFoo.Warning.hasValue());
-  EXPECT_STREQ(SymFoo.Warning->c_str(), "Deprecated!");
-
-  IFSSymbol const &SymNor = *Iterator++;
-  EXPECT_STREQ(SymNor.Name.c_str(), "nor");
-  EXPECT_EQ(SymNor.Size, 0u);
-  EXPECT_EQ(SymNor.Type, IFSSymbolType::NoType);
-  EXPECT_TRUE(SymNor.Undefined);
-  EXPECT_FALSE(SymNor.Weak);
-  EXPECT_FALSE(SymNor.Warning.hasValue());
-
-  IFSSymbol const &SymNot = *Iterator++;
-  EXPECT_STREQ(SymNot.Name.c_str(), "not");
-  EXPECT_EQ(SymNot.Size, 111u);
-  EXPECT_EQ(SymNot.Type, IFSSymbolType::Unknown);
-  EXPECT_TRUE(SymNot.Undefined);
-  EXPECT_TRUE(SymNot.Weak);
-  EXPECT_TRUE(SymNot.Warning.hasValue());
-  EXPECT_STREQ(SymNot.Warning->c_str(), "All fields populated!");
-}
-
-TEST(ElfYamlTextAPI, YAMLReadsNoTBESyms) {
-  const char Data[] = "--- !ifs-v1\n"
-                      "IfsVersion: 1.0\n"
-                      "SoName: test.so\n"
-                      "Target: { ObjectFormat: ELF, Arch: x86_64, Endianness: "
-                      "little, BitWidth: 64 }\n"
-                      "Symbols: []\n"
-                      "...\n";
-  Expected<std::unique_ptr<IFSStub>> StubOrErr = readIFSFromBuffer(Data);
-  ASSERT_THAT_ERROR(StubOrErr.takeError(), Succeeded());
-  std::unique_ptr<IFSStub> Stub = std::move(StubOrErr.get());
-  EXPECT_NE(Stub.get(), nullptr);
-  EXPECT_EQ(0u, Stub->Symbols.size());
-}
-
-TEST(ElfYamlTextAPI, YAMLUnreadableTBE) {
-  // Can't read: wrong format/version.
-  const char Data[] = "--- !tapi-tbz\n"
-                      "IfsVersion: z.3\n"
-                      "SoName: test.so\n"
-                      "Target: { ObjectFormat: ELF, Arch: x86_64, Endianness: "
-                      "little, BitWidth: 64 }\n"
-                      "Symbols:\n"
-                      "  foo: { Type: Func, Undefined: true }\n";
-  Expected<std::unique_ptr<IFSStub>> StubOrErr = readIFSFromBuffer(Data);
-  ASSERT_THAT_ERROR(StubOrErr.takeError(), Failed());
-}
-
-TEST(ElfYamlTextAPI, YAMLUnsupportedVersion) {
-  const char Data[] = "--- !ifs-v1\n"
-                      "IfsVersion: 9.9.9\n"
-                      "SoName: test.so\n"
-                      "Target: { ObjectFormat: ELF, Arch: x86_64, Endianness: "
-                      "little, BitWidth: 64 }\n"
-                      "Symbols: []\n"
-                      "...\n";
-  Expected<std::unique_ptr<IFSStub>> StubOrErr = readIFSFromBuffer(Data);
-  std::string ErrorMessage = toString(StubOrErr.takeError());
-  EXPECT_EQ("IFS version 9.9.9 is unsupported.", ErrorMessage);
-}
-
-TEST(ElfYamlTextAPI, YAMLWritesTBESymbols) {
-  const char Expected[] =
-      "--- !ifs-v1\n"
-      "IfsVersion:      1.0\n"
-      "Target:          { ObjectFormat: ELF, Arch: AArch64, Endianness: "
-      "little, BitWidth: 64 }\n"
-      "Symbols:\n"
-      "  - { Name: bar, Type: Func, Weak: true }\n"
-      "  - { Name: foo, Type: NoType, Size: 99, Warning: Does nothing }\n"
-      "  - { Name: nor, Type: Func, Undefined: true }\n"
-      "  - { Name: not, Type: Unknown, Size: 12345678901234 }\n"
-      "...\n";
-  IFSStub Stub;
-  Stub.IfsVersion = VersionTuple(1, 0);
-  Stub.Target.Arch = ELF::EM_AARCH64;
-  Stub.Target.BitWidth = IFSBitWidthType::IFS64;
-  Stub.Target.Endianness = IFSEndiannessType::Little;
-  Stub.Target.ObjectFormat = "ELF";
-
-  IFSSymbol SymBar("bar");
-  SymBar.Size = 128u;
-  SymBar.Type = IFSSymbolType::Func;
-  SymBar.Undefined = false;
-  SymBar.Weak = true;
-
-  IFSSymbol SymFoo("foo");
-  SymFoo.Size = 99u;
-  SymFoo.Type = IFSSymbolType::NoType;
-  SymFoo.Undefined = false;
-  SymFoo.Weak = false;
-  SymFoo.Warning = "Does nothing";
-
-  IFSSymbol SymNor("nor");
-  SymNor.Size = 1234u;
-  SymNor.Type = IFSSymbolType::Func;
-  SymNor.Undefined = true;
-  SymNor.Weak = false;
-
-  IFSSymbol SymNot("not");
-  SymNot.Size = 12345678901234u;
-  SymNot.Type = IFSSymbolType::Unknown;
-  SymNot.Undefined = false;
-  SymNot.Weak = false;
-
-  // Symbol order is preserved instead of being sorted.
-  Stub.Symbols.push_back(SymBar);
-  Stub.Symbols.push_back(SymFoo);
-  Stub.Symbols.push_back(SymNor);
-  Stub.Symbols.push_back(SymNot);
-
-  // Ensure move constructor works as expected.
-  IFSStub Moved = std::move(Stub);
-
-  std::string Result;
-  raw_string_ostream OS(Result);
-  ASSERT_THAT_ERROR(writeIFSToOutputStream(OS, Moved), Succeeded());
-  Result = OS.str();
-  compareByLine(Result.c_str(), Expected);
-}
-
-TEST(ElfYamlTextAPI, YAMLWritesNoTBESyms) {
-  const char Expected[] = "--- !ifs-v1\n"
-                          "IfsVersion:      1.0\n"
-                          "SoName:          nosyms.so\n"
-                          "Target:          { ObjectFormat: ELF, Arch: x86_64, "
-                          "Endianness: little, BitWidth: 64 }\n"
-                          "NeededLibs:\n"
-                          "  - libc.so\n"
-                          "  - libfoo.so\n"
-                          "  - libbar.so\n"
-                          "Symbols:         []\n"
-                          "...\n";
-  IFSStub Stub;
-  Stub.IfsVersion = VersionTuple(1, 0);
-  Stub.SoName = "nosyms.so";
-  Stub.Target.Arch = ELF::EM_X86_64;
-  Stub.Target.BitWidth = IFSBitWidthType::IFS64;
-  Stub.Target.Endianness = IFSEndiannessType::Little;
-  Stub.Target.ObjectFormat = "ELF";
-  Stub.NeededLibs.push_back("libc.so");
-  Stub.NeededLibs.push_back("libfoo.so");
-  Stub.NeededLibs.push_back("libbar.so");
-
-  std::string Result;
-  raw_string_ostream OS(Result);
-  ASSERT_THAT_ERROR(writeIFSToOutputStream(OS, Stub), Succeeded());
-  Result = OS.str();
-  compareByLine(Result.c_str(), Expected);
-}
diff --git a/gnu/llvm/llvm/unittests/LineEditor/CMakeLists.txt b/gnu/llvm/llvm/unittests/LineEditor/CMakeLists.txt
deleted file mode 100644
index 70d7497fed9..00000000000
--- a/gnu/llvm/llvm/unittests/LineEditor/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  LineEditor
-  Support
-  )
-
-add_llvm_unittest(LineEditorTests
-  LineEditor.cpp
-  )
diff --git a/gnu/llvm/llvm/unittests/LineEditor/LineEditor.cpp b/gnu/llvm/llvm/unittests/LineEditor/LineEditor.cpp
deleted file mode 100644
index 42e5c6c3c01..00000000000
--- a/gnu/llvm/llvm/unittests/LineEditor/LineEditor.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-//===-- LineEditor.cpp ----------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/LineEditor/LineEditor.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/Path.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-class LineEditorTest : public testing::Test {
-public:
-  SmallString<64> HistPath;
-  LineEditor *LE;
-
-  LineEditorTest() {
-    init();
-  }
-
-  void init() {
-    sys::fs::createTemporaryFile("temp", "history", HistPath);
-    ASSERT_FALSE(HistPath.empty());
-    LE = new LineEditor("test", HistPath);
-  }
-
-  ~LineEditorTest() override {
-    delete LE;
-    sys::fs::remove(HistPath.str());
-  }
-};
-
-TEST_F(LineEditorTest, HistorySaveLoad) {
-  LE->saveHistory();
-  LE->loadHistory();
-}
-
-struct TestListCompleter {
-  std::vector<LineEditor::Completion> Completions;
-
-  TestListCompleter(const std::vector<LineEditor::Completion> &Completions)
-      : Completions(Completions) {}
-
-  std::vector<LineEditor::Completion> operator()(StringRef Buffer,
-                                                 size_t Pos) const {
-    EXPECT_TRUE(Buffer.empty());
-    EXPECT_EQ(0u, Pos);
-    return Completions;
-  }
-};
-
-TEST_F(LineEditorTest, ListCompleters) {
-  std::vector<LineEditor::Completion> Comps;
-
-  Comps.push_back(LineEditor::Completion("foo", "int foo()"));
-  LE->setListCompleter(TestListCompleter(Comps));
-  LineEditor::CompletionAction CA = LE->getCompletionAction("", 0);
-  EXPECT_EQ(LineEditor::CompletionAction::AK_Insert, CA.Kind);
-  EXPECT_EQ("foo", CA.Text);
-
-  Comps.push_back(LineEditor::Completion("bar", "int bar()"));
-  LE->setListCompleter(TestListCompleter(Comps));
-  CA = LE->getCompletionAction("", 0);
-  EXPECT_EQ(LineEditor::CompletionAction::AK_ShowCompletions, CA.Kind);
-  ASSERT_EQ(2u, CA.Completions.size());
-  ASSERT_EQ("int foo()", CA.Completions[0]);
-  ASSERT_EQ("int bar()", CA.Completions[1]);
-
-  Comps.clear();
-  Comps.push_back(LineEditor::Completion("fee", "int fee()"));
-  Comps.push_back(LineEditor::Completion("fi", "int fi()"));
-  Comps.push_back(LineEditor::Completion("foe", "int foe()"));
-  Comps.push_back(LineEditor::Completion("fum", "int fum()"));
-  LE->setListCompleter(TestListCompleter(Comps));
-  CA = LE->getCompletionAction("", 0);
-  EXPECT_EQ(LineEditor::CompletionAction::AK_Insert, CA.Kind);
-  EXPECT_EQ("f", CA.Text);
-}
diff --git a/gnu/llvm/llvm/unittests/Linker/CMakeLists.txt b/gnu/llvm/llvm/unittests/Linker/CMakeLists.txt
deleted file mode 100644
index e94f4be8a2e..00000000000
--- a/gnu/llvm/llvm/unittests/Linker/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  AsmParser
-  core
-  linker
-  )
-
-add_llvm_unittest(LinkerTests
-  LinkModulesTest.cpp
-  )
diff --git a/gnu/llvm/llvm/unittests/Linker/LinkModulesTest.cpp b/gnu/llvm/llvm/unittests/Linker/LinkModulesTest.cpp
deleted file mode 100644
index 793c744a2df..00000000000
--- a/gnu/llvm/llvm/unittests/Linker/LinkModulesTest.cpp
+++ /dev/null
@@ -1,362 +0,0 @@
-//===- llvm/unittest/Linker/LinkModulesTest.cpp - IRBuilder tests ---------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm-c/Core.h"
-#include "llvm-c/Linker.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/BasicBlock.h"
-#include "llvm/IR/DataLayout.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Linker/Linker.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-class LinkModuleTest : public testing::Test {
-protected:
-  void SetUp() override {
-    M.reset(new Module("MyModule", Ctx));
-    FunctionType *FTy = FunctionType::get(
-        Type::getInt8PtrTy(Ctx), Type::getInt32Ty(Ctx), false /*=isVarArg*/);
-    F = Function::Create(FTy, Function::ExternalLinkage, "ba_func", M.get());
-    F->setCallingConv(CallingConv::C);
-
-    EntryBB = BasicBlock::Create(Ctx, "entry", F);
-    SwitchCase1BB = BasicBlock::Create(Ctx, "switch.case.1", F);
-    SwitchCase2BB = BasicBlock::Create(Ctx, "switch.case.2", F);
-    ExitBB = BasicBlock::Create(Ctx, "exit", F);
-
-    AT = ArrayType::get(Type::getInt8PtrTy(Ctx), 3);
-
-    GV = new GlobalVariable(*M.get(), AT, false /*=isConstant*/,
-                            GlobalValue::InternalLinkage, nullptr,"switch.bas");
-
-    // Global Initializer
-    std::vector<Constant *> Init;
-    Constant *SwitchCase1BA = BlockAddress::get(SwitchCase1BB);
-    Init.push_back(SwitchCase1BA);
-
-    Constant *SwitchCase2BA = BlockAddress::get(SwitchCase2BB);
-    Init.push_back(SwitchCase2BA);
-
-    ConstantInt *One = ConstantInt::get(Type::getInt32Ty(Ctx), 1);
-    Constant *OnePtr = ConstantExpr::getCast(Instruction::IntToPtr, One,
-                                             Type::getInt8PtrTy(Ctx));
-    Init.push_back(OnePtr);
-
-    GV->setInitializer(ConstantArray::get(AT, Init));
-  }
-
-  void TearDown() override { M.reset(); }
-
-  LLVMContext Ctx;
-  std::unique_ptr<Module> M;
-  Function *F;
-  ArrayType *AT;
-  GlobalVariable *GV;
-  BasicBlock *EntryBB;
-  BasicBlock *SwitchCase1BB;
-  BasicBlock *SwitchCase2BB;
-  BasicBlock *ExitBB;
-};
-
-static void expectNoDiags(const DiagnosticInfo &DI, void *C) {
-  llvm_unreachable("expectNoDiags called!");
-}
-
-TEST_F(LinkModuleTest, BlockAddress) {
-  IRBuilder<> Builder(EntryBB);
-
-  std::vector<Value *> GEPIndices;
-  GEPIndices.push_back(ConstantInt::get(Type::getInt32Ty(Ctx), 0));
-  GEPIndices.push_back(&*F->arg_begin());
-
-  Value *GEP = Builder.CreateGEP(AT, GV, GEPIndices, "switch.gep");
-  Value *Load = Builder.CreateLoad(AT->getElementType(), GEP, "switch.load");
-
-  Builder.CreateRet(Load);
-
-  Builder.SetInsertPoint(SwitchCase1BB);
-  Builder.CreateBr(ExitBB);
-
-  Builder.SetInsertPoint(SwitchCase2BB);
-  Builder.CreateBr(ExitBB);
-
-  Builder.SetInsertPoint(ExitBB);
-  Builder.CreateRet(ConstantPointerNull::get(Type::getInt8PtrTy(Ctx)));
-
-  Module *LinkedModule = new Module("MyModuleLinked", Ctx);
-  Ctx.setDiagnosticHandlerCallBack(expectNoDiags);
-  Linker::linkModules(*LinkedModule, std::move(M));
-
-  // Check that the global "@switch.bas" is well-formed.
-  const GlobalVariable *LinkedGV = LinkedModule->getNamedGlobal("switch.bas");
-  const Constant *Init = LinkedGV->getInitializer();
-
-  // @switch.bas = internal global [3 x i8*]
-  //   [i8* blockaddress(@ba_func, %switch.case.1),
-  //    i8* blockaddress(@ba_func, %switch.case.2),
-  //    i8* inttoptr (i32 1 to i8*)]
-
-  ArrayType *AT = ArrayType::get(Type::getInt8PtrTy(Ctx), 3);
-  EXPECT_EQ(AT, Init->getType());
-
-  Value *Elem = Init->getOperand(0);
-  ASSERT_TRUE(isa<BlockAddress>(Elem));
-  EXPECT_EQ(cast<BlockAddress>(Elem)->getFunction(),
-            LinkedModule->getFunction("ba_func"));
-  EXPECT_EQ(cast<BlockAddress>(Elem)->getBasicBlock()->getParent(),
-            LinkedModule->getFunction("ba_func"));
-
-  Elem = Init->getOperand(1);
-  ASSERT_TRUE(isa<BlockAddress>(Elem));
-  EXPECT_EQ(cast<BlockAddress>(Elem)->getFunction(),
-            LinkedModule->getFunction("ba_func"));
-  EXPECT_EQ(cast<BlockAddress>(Elem)->getBasicBlock()->getParent(),
-            LinkedModule->getFunction("ba_func"));
-
-  delete LinkedModule;
-}
-
-static Module *getExternal(LLVMContext &Ctx, StringRef FuncName) {
-  // Create a module with an empty externally-linked function
-  Module *M = new Module("ExternalModule", Ctx);
-  FunctionType *FTy = FunctionType::get(
-      Type::getVoidTy(Ctx), Type::getInt8PtrTy(Ctx), false /*=isVarArgs*/);
-
-  Function *F =
-      Function::Create(FTy, Function::ExternalLinkage, FuncName, M);
-  F->setCallingConv(CallingConv::C);
-
-  BasicBlock *BB = BasicBlock::Create(Ctx, "", F);
-  IRBuilder<> Builder(BB);
-  Builder.CreateRetVoid();
-  return M;
-}
-
-static Module *getInternal(LLVMContext &Ctx) {
-  Module *InternalM = new Module("InternalModule", Ctx);
-  FunctionType *FTy = FunctionType::get(
-      Type::getVoidTy(Ctx), Type::getInt8PtrTy(Ctx), false /*=isVarArgs*/);
-
-  Function *F =
-      Function::Create(FTy, Function::InternalLinkage, "bar", InternalM);
-  F->setCallingConv(CallingConv::C);
-
-  BasicBlock *BB = BasicBlock::Create(Ctx, "", F);
-  IRBuilder<> Builder(BB);
-  Builder.CreateRetVoid();
-
-  StructType *STy = StructType::create(Ctx, PointerType::get(FTy, 0));
-
-  GlobalVariable *GV =
-      new GlobalVariable(*InternalM, STy, false /*=isConstant*/,
-                         GlobalValue::InternalLinkage, nullptr, "g");
-
-  GV->setInitializer(ConstantStruct::get(STy, F));
-  return InternalM;
-}
-
-TEST_F(LinkModuleTest, EmptyModule) {
-  std::unique_ptr<Module> InternalM(getInternal(Ctx));
-  std::unique_ptr<Module> EmptyM(new Module("EmptyModule1", Ctx));
-  Ctx.setDiagnosticHandlerCallBack(expectNoDiags);
-  Linker::linkModules(*EmptyM, std::move(InternalM));
-}
-
-TEST_F(LinkModuleTest, EmptyModule2) {
-  std::unique_ptr<Module> InternalM(getInternal(Ctx));
-  std::unique_ptr<Module> EmptyM(new Module("EmptyModule1", Ctx));
-  Ctx.setDiagnosticHandlerCallBack(expectNoDiags);
-  Linker::linkModules(*InternalM, std::move(EmptyM));
-}
-
-TEST_F(LinkModuleTest, TypeMerge) {
-  LLVMContext C;
-  SMDiagnostic Err;
-
-  const char *M1Str = "%t = type {i32}\n"
-                      "@t1 = weak global %t zeroinitializer\n";
-  std::unique_ptr<Module> M1 = parseAssemblyString(M1Str, Err, C);
-
-  const char *M2Str = "%t = type {i32}\n"
-                      "@t2 = weak global %t zeroinitializer\n";
-  std::unique_ptr<Module> M2 = parseAssemblyString(M2Str, Err, C);
-
-  Ctx.setDiagnosticHandlerCallBack(expectNoDiags);
-  Linker::linkModules(*M1, std::move(M2));
-
-  EXPECT_EQ(M1->getNamedGlobal("t1")->getType(),
-            M1->getNamedGlobal("t2")->getType());
-}
-
-TEST_F(LinkModuleTest, NewCAPISuccess) {
-  std::unique_ptr<Module> DestM(getExternal(Ctx, "foo"));
-  std::unique_ptr<Module> SourceM(getExternal(Ctx, "bar"));
-  LLVMBool Result =
-      LLVMLinkModules2(wrap(DestM.get()), wrap(SourceM.release()));
-  EXPECT_EQ(0, Result);
-  // "bar" is present in destination module
-  EXPECT_NE(nullptr, DestM->getFunction("bar"));
-}
-
-static void diagnosticHandler(LLVMDiagnosticInfoRef DI, void *C) {
-  auto *Err = reinterpret_cast<std::string *>(C);
-  char *CErr = LLVMGetDiagInfoDescription(DI);
-  *Err = CErr;
-  LLVMDisposeMessage(CErr);
-}
-
-TEST_F(LinkModuleTest, NewCAPIFailure) {
-  // Symbol clash between two modules
-  LLVMContext Ctx;
-  std::string Err;
-  LLVMContextSetDiagnosticHandler(wrap(&Ctx), diagnosticHandler, &Err);
-
-  std::unique_ptr<Module> DestM(getExternal(Ctx, "foo"));
-  std::unique_ptr<Module> SourceM(getExternal(Ctx, "foo"));
-  LLVMBool Result =
-      LLVMLinkModules2(wrap(DestM.get()), wrap(SourceM.release()));
-  EXPECT_EQ(1, Result);
-  EXPECT_EQ("Linking globals named 'foo': symbol multiply defined!", Err);
-}
-
-TEST_F(LinkModuleTest, MoveDistinctMDs) {
-  LLVMContext C;
-  SMDiagnostic Err;
-
-  const char *SrcStr = "define void @foo() !attach !0 {\n"
-                       "entry:\n"
-                       "  call void @llvm.md(metadata !1)\n"
-                       "  ret void, !attach !2\n"
-                       "}\n"
-                       "declare void @llvm.md(metadata)\n"
-                       "!named = !{!3, !4}\n"
-                       "!0 = distinct !{}\n"
-                       "!1 = distinct !{}\n"
-                       "!2 = distinct !{}\n"
-                       "!3 = distinct !{}\n"
-                       "!4 = !{!3}\n";
-
-  std::unique_ptr<Module> Src = parseAssemblyString(SrcStr, Err, C);
-  assert(Src);
-  ASSERT_TRUE(Src.get());
-
-  // Get the addresses of the Metadata before merging.
-  Function *F = &*Src->begin();
-  ASSERT_EQ("foo", F->getName());
-  BasicBlock *BB = &F->getEntryBlock();
-  auto *CI = cast<CallInst>(&BB->front());
-  auto *RI = cast<ReturnInst>(BB->getTerminator());
-  NamedMDNode *NMD = &*Src->named_metadata_begin();
-
-  MDNode *M0 = F->getMetadata("attach");
-  MDNode *M1 =
-      cast<MDNode>(cast<MetadataAsValue>(CI->getArgOperand(0))->getMetadata());
-  MDNode *M2 = RI->getMetadata("attach");
-  MDNode *M3 = NMD->getOperand(0);
-  MDNode *M4 = NMD->getOperand(1);
-
-  // Confirm a few things about the IR.
-  EXPECT_TRUE(M0->isDistinct());
-  EXPECT_TRUE(M1->isDistinct());
-  EXPECT_TRUE(M2->isDistinct());
-  EXPECT_TRUE(M3->isDistinct());
-  EXPECT_TRUE(M4->isUniqued());
-  EXPECT_EQ(M3, M4->getOperand(0));
-
-  // Link into destination module.
-  auto Dst = std::make_unique<Module>("Linked", C);
-  ASSERT_TRUE(Dst.get());
-  Ctx.setDiagnosticHandlerCallBack(expectNoDiags);
-  Linker::linkModules(*Dst, std::move(Src));
-
-  // Check that distinct metadata was moved, not cloned.  Even !4, the uniqued
-  // node, should effectively be moved, since its only operand hasn't changed.
-  F = &*Dst->begin();
-  BB = &F->getEntryBlock();
-  CI = cast<CallInst>(&BB->front());
-  RI = cast<ReturnInst>(BB->getTerminator());
-  NMD = &*Dst->named_metadata_begin();
-
-  EXPECT_EQ(M0, F->getMetadata("attach"));
-  EXPECT_EQ(M1, cast<MetadataAsValue>(CI->getArgOperand(0))->getMetadata());
-  EXPECT_EQ(M2, RI->getMetadata("attach"));
-  EXPECT_EQ(M3, NMD->getOperand(0));
-  EXPECT_EQ(M4, NMD->getOperand(1));
-
-  // Confirm a few things about the IR.  This shouldn't have changed.
-  EXPECT_TRUE(M0->isDistinct());
-  EXPECT_TRUE(M1->isDistinct());
-  EXPECT_TRUE(M2->isDistinct());
-  EXPECT_TRUE(M3->isDistinct());
-  EXPECT_TRUE(M4->isUniqued());
-  EXPECT_EQ(M3, M4->getOperand(0));
-}
-
-TEST_F(LinkModuleTest, RemangleIntrinsics) {
-  LLVMContext C;
-  SMDiagnostic Err;
-
-  // We load two modules inside the same context C. In both modules there is a
-  // "struct.rtx_def" type. In the module loaded the second (Bar) this type will
-  // be renamed to "struct.rtx_def.0". Check that the intrinsics which have this
-  // type in the signature are properly remangled.
-  const char *FooStr =
-    "%struct.rtx_def = type { i16 }\n"
-    "define void @foo(%struct.rtx_def* %a, i8 %b, i32 %c) {\n"
-    "  call void  @llvm.memset.p0s_struct.rtx_defs.i32(%struct.rtx_def* %a, i8 %b, i32 %c, i32 4, i1 true)\n"
-    "  ret void\n"
-    "}\n"
-    "declare void @llvm.memset.p0s_struct.rtx_defs.i32(%struct.rtx_def*, i8, i32, i32, i1)\n";
-
-  const char *BarStr =
-    "%struct.rtx_def = type { i16 }\n"
-    "define void @bar(%struct.rtx_def* %a, i8 %b, i32 %c) {\n"
-    "  call void  @llvm.memset.p0s_struct.rtx_defs.i32(%struct.rtx_def* %a, i8 %b, i32 %c, i32 4, i1 true)\n"
-    "  ret void\n"
-    "}\n"
-    "declare void @llvm.memset.p0s_struct.rtx_defs.i32(%struct.rtx_def*, i8, i32, i32, i1)\n";
-
-  std::unique_ptr<Module> Foo = parseAssemblyString(FooStr, Err, C);
-  assert(Foo);
-  ASSERT_TRUE(Foo.get());
-  // Foo is loaded first, so the type and the intrinsic have theis original
-  // names.
-  ASSERT_TRUE(Foo->getFunction("llvm.memset.p0s_struct.rtx_defs.i32"));
-  ASSERT_FALSE(Foo->getFunction("llvm.memset.p0s_struct.rtx_defs.0.i32"));
-
-  std::unique_ptr<Module> Bar = parseAssemblyString(BarStr, Err, C);
-  assert(Bar);
-  ASSERT_TRUE(Bar.get());
-  // Bar is loaded after Foo, so the type is renamed to struct.rtx_def.0. Check
-  // that the intrinsic is also renamed.
-  ASSERT_FALSE(Bar->getFunction("llvm.memset.p0s_struct.rtx_defs.i32"));
-  ASSERT_TRUE(Bar->getFunction("llvm.memset.p0s_struct.rtx_def.0s.i32"));
-
-  // Link two modules together.
-  auto Dst = std::make_unique<Module>("Linked", C);
-  ASSERT_TRUE(Dst.get());
-  Ctx.setDiagnosticHandlerCallBack(expectNoDiags);
-  bool Failed = Linker::linkModules(*Foo, std::move(Bar));
-  ASSERT_FALSE(Failed);
-
-  // "struct.rtx_def" from Foo and "struct.rtx_def.0" from Bar are isomorphic
-  // types, so they must be uniquified by linker. Check that they use the same
-  // intrinsic definition.
-  Function *F = Foo->getFunction("llvm.memset.p0s_struct.rtx_defs.i32");
-  ASSERT_EQ(F->getNumUses(), (unsigned)2);
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/MC/AMDGPU/CMakeLists.txt b/gnu/llvm/llvm/unittests/MC/AMDGPU/CMakeLists.txt
deleted file mode 100644
index 9a77415590d..00000000000
--- a/gnu/llvm/llvm/unittests/MC/AMDGPU/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  AMDGPUCodeGen
-  AMDGPUDesc
-  AMDGPUInfo
-  MC
-  Support
-  )
-
-add_llvm_unittest(AMDGPUDwarfTests
-  DwarfRegMappings.cpp
-  )
diff --git a/gnu/llvm/llvm/unittests/MC/AMDGPU/DwarfRegMappings.cpp b/gnu/llvm/llvm/unittests/MC/AMDGPU/DwarfRegMappings.cpp
deleted file mode 100644
index aea69bb7297..00000000000
--- a/gnu/llvm/llvm/unittests/MC/AMDGPU/DwarfRegMappings.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-//===- llvm/unittests/MC/AMDGPU/DwarfRegMappings.cpp ----------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/MC/MCRegisterInfo.h"
-#include "llvm/MC/MCTargetOptions.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "llvm/Target/TargetMachine.h"
-#include "gtest/gtest.h"
-#include <thread>
-
-using namespace llvm;
-
-std::once_flag flag;
-
-void InitializeAMDGPUTarget() {
-  std::call_once(flag, []() {
-    LLVMInitializeAMDGPUTargetInfo();
-    LLVMInitializeAMDGPUTarget();
-    LLVMInitializeAMDGPUTargetMC();
-  });
-}
-
-std::unique_ptr<LLVMTargetMachine>
-createTargetMachine(std::string TStr, StringRef CPU, StringRef FS) {
-  InitializeAMDGPUTarget();
-
-  std::string Error;
-  const Target *T = TargetRegistry::lookupTarget(TStr, Error);
-  if (!T)
-    return nullptr;
-
-  TargetOptions Options;
-  return std::unique_ptr<LLVMTargetMachine>(static_cast<LLVMTargetMachine *>(
-      T->createTargetMachine(TStr, CPU, FS, Options, None, None)));
-}
-
-TEST(AMDGPUDwarfRegMappingTests, TestWave64DwarfRegMapping) {
-  for (auto Triple :
-       {"amdgcn-amd-", "amdgcn-amd-amdhsa", "amdgcn-amd-amdpal"}) {
-    auto TM = createTargetMachine(Triple, "gfx1010", "+wavefrontsize64");
-    if (TM && TM->getMCRegisterInfo()) {
-      auto MRI = TM->getMCRegisterInfo();
-      // Wave64 Dwarf register mapping test numbers
-      // PC_64 => 16, EXEC_MASK_64 => 17, S0 => 32, S63 => 95,
-      // S64 => 1088, S105 => 1129, V0 => 2560, V255 => 2815,
-      // A0 => 3072, A255 => 3327
-      for (int llvmReg : {16, 17, 32, 95, 1088, 1129, 2560, 2815, 3072, 3327}) {
-        MCRegister PCReg(*MRI->getLLVMRegNum(llvmReg, false));
-        EXPECT_EQ(llvmReg, MRI->getDwarfRegNum(PCReg, false));
-      }
-    }
-  }
-}
-
-TEST(AMDGPUDwarfRegMappingTests, TestWave32DwarfRegMapping) {
-  for (auto Triple :
-       {"amdgcn-amd-", "amdgcn-amd-amdhsa", "amdgcn-amd-amdpal"}) {
-    auto TM = createTargetMachine(Triple, "gfx1010", "+wavefrontsize32");
-    if (TM && TM->getMCRegisterInfo()) {
-      auto MRI = TM->getMCRegisterInfo();
-      // Wave32 Dwarf register mapping test numbers
-      // PC_64 => 16, EXEC_MASK_32 => 1, S0 => 32, S63 => 95,
-      // S64 => 1088, S105 => 1129, V0 => 1536, V255 => 1791,
-      // A0 => 2048, A255 => 2303
-      for (int llvmReg : {16, 1, 32, 95, 1088, 1129, 1536, 1791, 2048, 2303}) {
-        MCRegister PCReg(*MRI->getLLVMRegNum(llvmReg, false));
-        EXPECT_EQ(llvmReg, MRI->getDwarfRegNum(PCReg, false));
-      }
-    }
-  }
-}
diff --git a/gnu/llvm/llvm/unittests/MC/CMakeLists.txt b/gnu/llvm/llvm/unittests/MC/CMakeLists.txt
deleted file mode 100644
index 3827a2b4fc4..00000000000
--- a/gnu/llvm/llvm/unittests/MC/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-foreach(t ${LLVM_TARGETS_TO_BUILD})
-  if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${t})
-    add_subdirectory(${t})
-  endif()
-endforeach()
-
-set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
-  MC
-  MCDisassembler
-  Support
-  )
-
-add_llvm_unittest(MCTests
-  Disassembler.cpp
-  DwarfLineTables.cpp
-  MCInstPrinter.cpp
-  StringTableBuilderTest.cpp
-  TargetRegistry.cpp
-  MCDisassemblerTest.cpp
-  )
-
diff --git a/gnu/llvm/llvm/unittests/MC/Disassembler.cpp b/gnu/llvm/llvm/unittests/MC/Disassembler.cpp
deleted file mode 100644
index 3f9e6e5501e..00000000000
--- a/gnu/llvm/llvm/unittests/MC/Disassembler.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-//===- llvm/unittest/Object/Disassembler.cpp ------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm-c/Disassembler.h"
-#include "llvm/Support/TargetSelect.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-static const char *symbolLookupCallback(void *DisInfo, uint64_t ReferenceValue,
-                                        uint64_t *ReferenceType,
-                                        uint64_t ReferencePC,
-                                        const char **ReferenceName) {
-  *ReferenceType = LLVMDisassembler_ReferenceType_InOut_None;
-  return nullptr;
-}
-
-TEST(Disassembler, X86Test) {
-  llvm::InitializeAllTargetInfos();
-  llvm::InitializeAllTargetMCs();
-  llvm::InitializeAllDisassemblers();
-
-  uint8_t Bytes[] = {0x90, 0x90, 0xeb, 0xfd};
-  uint8_t *BytesP = Bytes;
-  const char OutStringSize = 100;
-  char OutString[OutStringSize];
-  LLVMDisasmContextRef DCR = LLVMCreateDisasm("x86_64-pc-linux", nullptr, 0,
-                                              nullptr, symbolLookupCallback);
-  if (!DCR)
-    return;
-
-  size_t InstSize;
-  unsigned NumBytes = sizeof(Bytes);
-  unsigned PC = 0;
-
-  InstSize =
-      LLVMDisasmInstruction(DCR, BytesP, 0, PC, OutString, OutStringSize);
-  EXPECT_EQ(InstSize, 0U);
-
-  InstSize = LLVMDisasmInstruction(DCR, BytesP, NumBytes, PC, OutString,
-                                   OutStringSize);
-  EXPECT_EQ(InstSize, 1U);
-  EXPECT_EQ(StringRef(OutString), "\tnop");
-  PC += InstSize;
-  BytesP += InstSize;
-  NumBytes -= InstSize;
-
-  InstSize = LLVMDisasmInstruction(DCR, BytesP, NumBytes, PC, OutString,
-                                   OutStringSize);
-  EXPECT_EQ(InstSize, 1U);
-  EXPECT_EQ(StringRef(OutString), "\tnop");
-  PC += InstSize;
-  BytesP += InstSize;
-  NumBytes -= InstSize;
-
-  InstSize = LLVMDisasmInstruction(DCR, BytesP, NumBytes, PC, OutString,
-                                   OutStringSize);
-  EXPECT_EQ(InstSize, 2U);
-  EXPECT_EQ(StringRef(OutString), "\tjmp\t0x1");
-
-  LLVMDisasmDispose(DCR);
-}
-
-TEST(Disassembler, WebAssemblyTest) {
-  llvm::InitializeAllTargetInfos();
-  llvm::InitializeAllTargetMCs();
-  llvm::InitializeAllDisassemblers();
-
-  uint8_t Bytes[] = {0x6a, 0x42, 0x7F, 0x35, 0x01, 0x10};
-  uint8_t *BytesP = Bytes;
-  const char OutStringSize = 100;
-  char OutString[OutStringSize];
-  LLVMDisasmContextRef DCR = LLVMCreateDisasm("wasm32-unknown-unknown", nullptr,
-                                              0, nullptr, symbolLookupCallback);
-  if (!DCR)
-    return;
-
-  size_t InstSize;
-  unsigned NumBytes = sizeof(Bytes);
-  unsigned PC = 0;
-
-  InstSize = LLVMDisasmInstruction(DCR, BytesP, NumBytes, PC, OutString,
-                                   OutStringSize);
-  EXPECT_EQ(InstSize, 1U);
-  EXPECT_EQ(StringRef(OutString), "\ti32.add ");
-  PC += InstSize;
-  BytesP += InstSize;
-  NumBytes -= InstSize;
-
-  InstSize = LLVMDisasmInstruction(DCR, BytesP, NumBytes, PC, OutString,
-                                   OutStringSize);
-  EXPECT_EQ(InstSize, 2U);
-  EXPECT_EQ(StringRef(OutString), "\ti64.const\t-1");
-
-  PC += InstSize;
-  BytesP += InstSize;
-  NumBytes -= InstSize;
-
-  InstSize = LLVMDisasmInstruction(DCR, BytesP, NumBytes, PC, OutString,
-                                   OutStringSize);
-  EXPECT_EQ(InstSize, 3U);
-  EXPECT_EQ(StringRef(OutString), "\ti64.load32_u\t16:p2align=1");
-
-  LLVMDisasmDispose(DCR);
-}
diff --git a/gnu/llvm/llvm/unittests/MC/DwarfLineTables.cpp b/gnu/llvm/llvm/unittests/MC/DwarfLineTables.cpp
deleted file mode 100644
index 8206bc55c6a..00000000000
--- a/gnu/llvm/llvm/unittests/MC/DwarfLineTables.cpp
+++ /dev/null
@@ -1,183 +0,0 @@
-//===- llvm/unittest/MC/DwarfLineTables.cpp ------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/BinaryFormat/Dwarf.h"
-#include "llvm/MC/MCAsmInfo.h"
-#include "llvm/MC/MCContext.h"
-#include "llvm/MC/MCDwarf.h"
-#include "llvm/MC/MCRegisterInfo.h"
-#include "llvm/MC/MCTargetOptions.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-struct Context {
-  const char *TripleName = "x86_64-pc-linux";
-  std::unique_ptr<MCRegisterInfo> MRI;
-  std::unique_ptr<MCAsmInfo> MAI;
-  std::unique_ptr<MCContext> Ctx;
-
-  Context() {
-    llvm::InitializeAllTargetInfos();
-    llvm::InitializeAllTargetMCs();
-    llvm::InitializeAllDisassemblers();
-
-    // If we didn't build x86, do not run the test.
-    std::string Error;
-    const Target *TheTarget = TargetRegistry::lookupTarget(TripleName, Error);
-    if (!TheTarget)
-      return;
-
-    MRI.reset(TheTarget->createMCRegInfo(TripleName));
-    MCTargetOptions MCOptions;
-    MAI.reset(TheTarget->createMCAsmInfo(*MRI, TripleName, MCOptions));
-    Ctx = std::make_unique<MCContext>(Triple(TripleName), MAI.get(), MRI.get(),
-                                      /*MSTI=*/nullptr);
-  }
-
-  operator bool() { return Ctx.get(); }
-  operator MCContext &() { return *Ctx; };
-};
-
-Context &getContext() {
-  static Context Ctxt;
-  return Ctxt;
-}
-}
-
-void verifyEncoding(MCDwarfLineTableParams Params, int LineDelta, int AddrDelta,
-                    ArrayRef<uint8_t> ExpectedEncoding) {
-  SmallString<16> Buffer;
-  raw_svector_ostream EncodingOS(Buffer);
-  MCDwarfLineAddr::Encode(getContext(), Params, LineDelta, AddrDelta,
-                          EncodingOS);
-  EXPECT_EQ(ExpectedEncoding, arrayRefFromStringRef(Buffer));
-}
-
-TEST(DwarfLineTables, TestDefaultParams) {
-  if (!getContext())
-    return;
-
-  MCDwarfLineTableParams Params;
-
-  // Minimal line offset expressible through extended opcode, 0 addr delta
-  const uint8_t Encoding0[] = {13}; // Special opcode Addr += 0, Line += -5
-  verifyEncoding(Params, -5, 0, Encoding0);
-
-  // Maximal line offset expressible through extended opcode,
-  const uint8_t Encoding1[] = {26}; // Special opcode Addr += 0, Line += +8
-  verifyEncoding(Params, 8, 0, Encoding1);
-
-  // Random value in the middle of the special ocode range
-  const uint8_t Encoding2[] = {146}; // Special opcode Addr += 9, Line += 2
-  verifyEncoding(Params, 2, 9, Encoding2);
-
-  // Minimal line offset expressible through extended opcode, max addr delta
-  const uint8_t Encoding3[] = {251}; // Special opcode Addr += 17, Line += -5
-  verifyEncoding(Params, -5, 17, Encoding3);
-
-  // Biggest special opcode
-  const uint8_t Encoding4[] = {255}; // Special opcode Addr += 17, Line += -1
-  verifyEncoding(Params, -1, 17, Encoding4);
-
-  // Line delta outside of the special opcode range, address delta in range
-  const uint8_t Encoding5[] = {dwarf::DW_LNS_advance_line, 9,
-                               158}; // Special opcode Addr += 10, Line += 0
-  verifyEncoding(Params, 9, 10, Encoding5);
-
-  // Address delta outside of the special opcode range, but small
-  // enough to do DW_LNS_const_add_pc + special opcode.
-  const uint8_t Encoding6[] = {dwarf::DW_LNS_const_add_pc, // pc += 17
-                               62}; // Special opcode Addr += 3, Line += 2
-  verifyEncoding(Params, 2, 20, Encoding6);
-
-  // Address delta big enough to require the use of DW_LNS_advance_pc
-  // Line delta in special opcode range
-  const uint8_t Encoding7[] = {dwarf::DW_LNS_advance_pc, 100,
-                               20}; // Special opcode Addr += 0, Line += 2
-  verifyEncoding(Params, 2, 100, Encoding7);
-
-  // No special opcode possible.
-  const uint8_t Encoding8[] = {dwarf::DW_LNS_advance_line, 20,
-                               dwarf::DW_LNS_advance_pc, 100,
-                               dwarf::DW_LNS_copy};
-  verifyEncoding(Params, 20, 100, Encoding8);
-}
-
-TEST(DwarfLineTables, TestCustomParams) {
-  if (!getContext())
-    return;
-
-  // Some tests against the example values given in the standard.
-  MCDwarfLineTableParams Params;
-  Params.DWARF2LineOpcodeBase = 13;
-  Params.DWARF2LineBase = -3;
-  Params.DWARF2LineRange = 12;
-
-  // Minimal line offset expressible through extended opcode, 0 addr delta
-  const uint8_t Encoding0[] = {13}; // Special opcode Addr += 0, Line += -5
-  verifyEncoding(Params, -3, 0, Encoding0);
-
-  // Maximal line offset expressible through extended opcode,
-  const uint8_t Encoding1[] = {24}; // Special opcode Addr += 0, Line += +8
-  verifyEncoding(Params, 8, 0, Encoding1);
-
-  // Random value in the middle of the special ocode range
-  const uint8_t Encoding2[] = {126}; // Special opcode Addr += 9, Line += 2
-  verifyEncoding(Params, 2, 9, Encoding2);
-
-  // Minimal line offset expressible through extended opcode, max addr delta
-  const uint8_t Encoding3[] = {253}; // Special opcode Addr += 20, Line += -3
-  verifyEncoding(Params, -3, 20, Encoding3);
-
-  // Biggest special opcode
-  const uint8_t Encoding4[] = {255}; // Special opcode Addr += 17, Line += -1
-  verifyEncoding(Params, -1, 20, Encoding4);
-
-  // Line delta outside of the special opcode range, address delta in range
-  const uint8_t Encoding5[] = {dwarf::DW_LNS_advance_line, 9,
-                               136}; // Special opcode Addr += 10, Line += 0
-  verifyEncoding(Params, 9, 10, Encoding5);
-
-  // Address delta outside of the special opcode range, but small
-  // enough to do DW_LNS_const_add_pc + special opcode.
-  const uint8_t Encoding6[] = {dwarf::DW_LNS_const_add_pc, // pc += 20
-                               138}; // Special opcode Addr += 10, Line += 2
-  verifyEncoding(Params, 2, 30, Encoding6);
-
-  // Address delta big enough to require the use of DW_LNS_advance_pc
-  // Line delta in special opcode range
-  const uint8_t Encoding7[] = {dwarf::DW_LNS_advance_pc, 100,
-                               18}; // Special opcode Addr += 0, Line += 2
-  verifyEncoding(Params, 2, 100, Encoding7);
-
-  // No special opcode possible.
-  const uint8_t Encoding8[] = {dwarf::DW_LNS_advance_line, 20,
-                               dwarf::DW_LNS_advance_pc, 100,
-                               dwarf::DW_LNS_copy};
-  verifyEncoding(Params, 20, 100, Encoding8);
-}
-
-TEST(DwarfLineTables, TestCustomParams2) {
-  if (!getContext())
-    return;
-
-  // Corner case param values.
-  MCDwarfLineTableParams Params;
-  Params.DWARF2LineOpcodeBase = 13;
-  Params.DWARF2LineBase = 1;
-  Params.DWARF2LineRange = 255;
-
-  const uint8_t Encoding0[] = {dwarf::DW_LNS_advance_line, 248, 1,
-                               dwarf::DW_LNS_copy};
-  verifyEncoding(Params, 248, 0, Encoding0);
-}
diff --git a/gnu/llvm/llvm/unittests/MC/MCDisassemblerTest.cpp b/gnu/llvm/llvm/unittests/MC/MCDisassemblerTest.cpp
deleted file mode 100644
index 07d13cfa24c..00000000000
--- a/gnu/llvm/llvm/unittests/MC/MCDisassemblerTest.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-//===- MCDisassemblerTest.cpp - Tests for MCDisassembler.cpp --------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/MC/MCDisassembler/MCDisassembler.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-TEST(MCDisassembler, XCOFFSymbolPriorityTest) {
-
-  SymbolInfoTy SIT1(0x100000, "sym1", None, 1, false);
-  SymbolInfoTy SIT2(0x110000, "sym2", None, 2, false);
-  SymbolInfoTy SIT3(0x120000, ".func", XCOFF::XMC_PR, 3, true);
-  SymbolInfoTy SIT4(0x120000, ".text", XCOFF::XMC_PR, 4, false);
-  SymbolInfoTy SIT5(0x130000, "TOC", XCOFF::XMC_TC0, 5, false);
-  SymbolInfoTy SIT6(0x130000, "func", XCOFF::XMC_TC, 6, false);
-
-  // Test that higher addresses would appear later than lower ones when symbols
-  // are sorted in ascending order.
-  EXPECT_TRUE(SIT1 < SIT2);
-  EXPECT_FALSE(SIT2 < SIT1);
-
-  // Test that symbols with a StorageMappingClass have higher priority than those
-  // without.
-  EXPECT_TRUE(SIT2 < SIT5);
-  EXPECT_FALSE(SIT5 < SIT2);
-
-  // Test that symbols with a TC0 StorageMappingClass have lower priority than those
-  // with some other StorageMappingClass.
-  EXPECT_TRUE(SIT5 < SIT6);
-  EXPECT_FALSE(SIT6 < SIT5);
-
-  // Test label symbols have higher priorty than non-label symbols.
-  EXPECT_TRUE(SIT4 < SIT3);
-  EXPECT_FALSE(SIT3 < SIT4);
-
-  // Test symbols comparing with themselves.
-  EXPECT_FALSE(SIT1 < SIT1);
-  EXPECT_FALSE(SIT2 < SIT2);
-  EXPECT_FALSE(SIT3 < SIT3);
-  EXPECT_FALSE(SIT4 < SIT4);
-  EXPECT_FALSE(SIT5 < SIT5);
-  EXPECT_FALSE(SIT6 < SIT6);
-}
diff --git a/gnu/llvm/llvm/unittests/MC/MCInstPrinter.cpp b/gnu/llvm/llvm/unittests/MC/MCInstPrinter.cpp
deleted file mode 100644
index 14bbb03ee1d..00000000000
--- a/gnu/llvm/llvm/unittests/MC/MCInstPrinter.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-//===- llvm/unittest/MC/MCInstPrinter.cpp ---------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/MC/MCInstPrinter.h"
-#include "llvm/MC/MCAsmInfo.h"
-#include "llvm/MC/MCInstrInfo.h"
-#include "llvm/MC/MCTargetOptions.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "llvm/Target/TargetMachine.h"
-#include "llvm/Target/TargetOptions.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-class MCInstPrinterTest : public ::testing::Test {
-public:
-  std::unique_ptr<MCRegisterInfo> MRI;
-  std::unique_ptr<MCAsmInfo> MAI;
-  std::unique_ptr<const MCInstrInfo> MII;
-  std::unique_ptr<MCInstPrinter> Printer;
-
-  MCInstPrinterTest() {
-    llvm::InitializeAllTargetInfos();
-    llvm::InitializeAllTargetMCs();
-
-    std::string TripleName = "x86_64-pc-linux";
-    std::string ErrorStr;
-
-    const Target *TheTarget =
-        TargetRegistry::lookupTarget(TripleName, ErrorStr);
-
-    // If we didn't build x86, do not run the test.
-    if (!TheTarget)
-      return;
-
-    MRI.reset(TheTarget->createMCRegInfo(TripleName));
-    MCTargetOptions MCOptions;
-    MAI.reset(TheTarget->createMCAsmInfo(*MRI, TripleName, MCOptions));
-    MII.reset(TheTarget->createMCInstrInfo());
-    Printer.reset(TheTarget->createMCInstPrinter(
-        Triple(TripleName), MAI->getAssemblerDialect(), *MAI, *MII, *MRI));
-  }
-
-  template <typename T> std::string formatHex(T i) {
-    std::string Buffer;
-    raw_string_ostream OS(Buffer);
-    OS << Printer->formatHex(i);
-    OS.flush();
-    return Buffer;
-  }
-};
-} // namespace
-
-TEST_F(MCInstPrinterTest, formatHex) {
-  if (!Printer)
-    return;
-
-  EXPECT_EQ("0x1", formatHex<int64_t>(1));
-  EXPECT_EQ("0x7fffffffffffffff",
-            formatHex(std::numeric_limits<int64_t>::max()));
-  EXPECT_EQ("-0x8000000000000000",
-            formatHex(std::numeric_limits<int64_t>::min()));
-}
diff --git a/gnu/llvm/llvm/unittests/MC/StringTableBuilderTest.cpp b/gnu/llvm/llvm/unittests/MC/StringTableBuilderTest.cpp
deleted file mode 100644
index 91f2b3b97e1..00000000000
--- a/gnu/llvm/llvm/unittests/MC/StringTableBuilderTest.cpp
+++ /dev/null
@@ -1,239 +0,0 @@
-//===----------- StringTableBuilderTest.cpp -------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/MC/StringTableBuilder.h"
-#include "llvm/ADT/SmallString.h"
-#include "llvm/Support/Endian.h"
-#include "gtest/gtest.h"
-#include <string>
-
-using namespace llvm;
-
-namespace {
-
-TEST(StringTableBuilderTest, BasicELF) {
-  StringTableBuilder B(StringTableBuilder::ELF);
-
-  B.add("foo");
-  B.add("bar");
-  B.add("foobar");
-
-  B.finalize();
-
-  std::string Expected;
-  Expected += '\x00';
-  Expected += "foobar";
-  Expected += '\x00';
-  Expected += "foo";
-  Expected += '\x00';
-
-  SmallString<64> Data;
-  raw_svector_ostream OS(Data);
-  B.write(OS);
-
-  EXPECT_EQ(Expected, Data);
-  EXPECT_EQ(1U, B.getOffset("foobar"));
-  EXPECT_EQ(4U, B.getOffset("bar"));
-  EXPECT_EQ(8U, B.getOffset("foo"));
-}
-
-TEST(StringTableBuilderTest, BasicWinCOFF) {
-  StringTableBuilder B(StringTableBuilder::WinCOFF);
-
-  // Strings must be 9 chars or longer to go in the table.
-  B.add("hippopotamus");
-  B.add("pygmy hippopotamus");
-  B.add("river horse");
-
-  B.finalize();
-
-  // size_field + "pygmy hippopotamus\0" + "river horse\0"
-  uint32_t ExpectedSize = 4 + 19 + 12;
-  EXPECT_EQ(ExpectedSize, B.getSize());
-
-  std::string Expected;
-
-  ExpectedSize =
-      support::endian::byte_swap<uint32_t, support::little>(ExpectedSize);
-  Expected.append((const char*)&ExpectedSize, 4);
-  Expected += "pygmy hippopotamus";
-  Expected += '\x00';
-  Expected += "river horse";
-  Expected += '\x00';
-
-  SmallString<64> Data;
-  raw_svector_ostream OS(Data);
-  B.write(OS);
-
-  EXPECT_EQ(Expected, Data);
-  EXPECT_EQ(4U, B.getOffset("pygmy hippopotamus"));
-  EXPECT_EQ(10U, B.getOffset("hippopotamus"));
-  EXPECT_EQ(23U, B.getOffset("river horse"));
-}
-
-TEST(StringTableBuilderTest, ELFInOrder) {
-  StringTableBuilder B(StringTableBuilder::ELF);
-  EXPECT_EQ(1U, B.add("foo"));
-  EXPECT_EQ(5U, B.add("bar"));
-  EXPECT_EQ(9U, B.add("foobar"));
-
-  B.finalizeInOrder();
-
-  std::string Expected;
-  Expected += '\x00';
-  Expected += "foo";
-  Expected += '\x00';
-  Expected += "bar";
-  Expected += '\x00';
-  Expected += "foobar";
-  Expected += '\x00';
-
-  SmallString<64> Data;
-  raw_svector_ostream OS(Data);
-  B.write(OS);
-
-  EXPECT_EQ(Expected, Data);
-  EXPECT_EQ(1U, B.getOffset("foo"));
-  EXPECT_EQ(5U, B.getOffset("bar"));
-  EXPECT_EQ(9U, B.getOffset("foobar"));
-}
-
-TEST(StringTableBuilderTest, MachOInOrder) {
-  StringTableBuilder B(StringTableBuilder::MachO);
-
-  B.add("foo");
-  B.add("bar");
-  B.add("fooba");
-
-  B.finalizeInOrder();
-
-  std::string Expected;
-  Expected += '\x00';
-  Expected += "foo";
-  Expected += '\x00';
-  Expected += "bar";
-  Expected += '\x00';
-  Expected += "fooba";
-  Expected += '\x00';
-
-  // Mach-O pads to 4 bytes
-  Expected += '\x00';
-
-  SmallString<64> Data;
-  raw_svector_ostream OS(Data);
-  B.write(OS);
-
-  EXPECT_EQ(Expected, Data);
-  EXPECT_EQ(1U, B.getOffset("foo"));
-  EXPECT_EQ(5U, B.getOffset("bar"));
-  EXPECT_EQ(9U, B.getOffset("fooba"));
-}
-
-TEST(StringTableBuilderTest, MachO64InOrder) {
-  StringTableBuilder B(StringTableBuilder::MachO64);
-
-  B.add("foo");
-  B.add("bar");
-  B.add("f");
-
-  B.finalizeInOrder();
-
-  std::string Expected;
-  Expected += '\x00';
-  Expected += "foo";
-  Expected += '\x00';
-  Expected += "bar";
-  Expected += '\x00';
-  Expected += "f";
-  Expected += '\x00';
-
-  // 64 bit Mach-O pads to 8 bytes
-  Expected += '\x00';
-  Expected += '\x00';
-  Expected += '\x00';
-  Expected += '\x00';
-  Expected += '\x00';
-
-  SmallString<64> Data;
-  raw_svector_ostream OS(Data);
-  B.write(OS);
-
-  EXPECT_EQ(Expected, Data);
-  EXPECT_EQ(1U, B.getOffset("foo"));
-  EXPECT_EQ(5U, B.getOffset("bar"));
-  EXPECT_EQ(9U, B.getOffset("f"));
-}
-
-TEST(StringTableBuilderTest, MachOLinkedInOrder) {
-  StringTableBuilder B(StringTableBuilder::MachOLinked);
-
-  B.add("foo");
-  B.add("bar");
-  B.add("foob");
-
-  B.finalizeInOrder();
-
-  std::string Expected;
-  Expected += ' ';
-  Expected += '\x00';
-  Expected += "foo";
-  Expected += '\x00';
-  Expected += "bar";
-  Expected += '\x00';
-  Expected += "foob";
-  Expected += '\x00';
-
-  // Mach-O pads to 4 bytes
-  Expected += '\x00';
-
-  SmallString<64> Data;
-  raw_svector_ostream OS(Data);
-  B.write(OS);
-
-  EXPECT_EQ(Expected, Data);
-  EXPECT_EQ(2U, B.getOffset("foo"));
-  EXPECT_EQ(6U, B.getOffset("bar"));
-  EXPECT_EQ(10U, B.getOffset("foob"));
-}
-
-TEST(StringTableBuilderTest, MachO64LinkedInOrder) {
-  StringTableBuilder B(StringTableBuilder::MachO64Linked);
-
-  B.add("foo");
-  B.add("ba");
-  B.add("f");
-
-  B.finalizeInOrder();
-
-  std::string Expected;
-  Expected += ' ';
-  Expected += '\x00';
-  Expected += "foo";
-  Expected += '\x00';
-  Expected += "ba";
-  Expected += '\x00';
-  Expected += "f";
-  Expected += '\x00';
-
-  // 64 bit Mach-O pads to 8 bytes
-  Expected += '\x00';
-  Expected += '\x00';
-  Expected += '\x00';
-  Expected += '\x00';
-  Expected += '\x00';
-
-  SmallString<64> Data;
-  raw_svector_ostream OS(Data);
-  B.write(OS);
-
-  EXPECT_EQ(Expected, Data);
-  EXPECT_EQ(2U, B.getOffset("foo"));
-  EXPECT_EQ(6U, B.getOffset("ba"));
-  EXPECT_EQ(9U, B.getOffset("f"));
-}
-}
diff --git a/gnu/llvm/llvm/unittests/MC/SystemZ/CMakeLists.txt b/gnu/llvm/llvm/unittests/MC/SystemZ/CMakeLists.txt
deleted file mode 100644
index c50e7db265c..00000000000
--- a/gnu/llvm/llvm/unittests/MC/SystemZ/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-include_directories(
-  ${LLVM_MAIN_SRC_DIR}/lib/Target/SystemZ
-  )
-
-set(LLVM_LINK_COMPONENTS
-  SystemZ
-  MCParser
-  MC
-  Support
-  )
-
-add_llvm_unittest(SystemZAsmLexerTests
-  SystemZAsmLexerTest.cpp
-  )
diff --git a/gnu/llvm/llvm/unittests/MC/SystemZ/SystemZAsmLexerTest.cpp b/gnu/llvm/llvm/unittests/MC/SystemZ/SystemZAsmLexerTest.cpp
deleted file mode 100644
index 63d6b52deb9..00000000000
--- a/gnu/llvm/llvm/unittests/MC/SystemZ/SystemZAsmLexerTest.cpp
+++ /dev/null
@@ -1,786 +0,0 @@
-//===- llvm/unittests/MC/SystemZ/SystemZAsmLexerTest.cpp ----------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===--------------------------------------------------------------------===//
-#include "llvm/MC/MCAsmInfo.h"
-#include "llvm/MC/MCContext.h"
-#include "llvm/MC/MCObjectFileInfo.h"
-#include "llvm/MC/MCParser/MCTargetAsmParser.h"
-#include "llvm/MC/MCRegisterInfo.h"
-#include "llvm/MC/MCStreamer.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/SourceMgr.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-// Come up with our hacked version of MCAsmInfo.
-// This hacked version derives from the main MCAsmInfo instance.
-// Here, we're free to override whatever we want, without polluting
-// the main MCAsmInfo interface.
-class MockedUpMCAsmInfo : public MCAsmInfo {
-public:
-  void setRestrictCommentStringToStartOfStatement(bool Value) {
-    RestrictCommentStringToStartOfStatement = Value;
-  }
-  void setCommentString(StringRef Value) { CommentString = Value; }
-  void setAllowAdditionalComments(bool Value) {
-    AllowAdditionalComments = Value;
-  }
-  void setAllowQuestionAtStartOfIdentifier(bool Value) {
-    AllowQuestionAtStartOfIdentifier = Value;
-  }
-  void setAllowAtAtStartOfIdentifier(bool Value) {
-    AllowAtAtStartOfIdentifier = Value;
-  }
-  void setAllowDollarAtStartOfIdentifier(bool Value) {
-    AllowDollarAtStartOfIdentifier = Value;
-  }
-  void setAllowHashAtStartOfIdentifier(bool Value) {
-    AllowHashAtStartOfIdentifier = Value;
-  }
-  void setAllowDotIsPC(bool Value) { DotIsPC = Value; }
-  void setAssemblerDialect(unsigned Value) { AssemblerDialect = Value; }
-  void setEmitLabelsInUpperCase(bool Value) { EmitLabelsInUpperCase = Value; }
-};
-
-// Setup a testing class that the GTest framework can call.
-class SystemZAsmLexerTest : public ::testing::Test {
-protected:
-  static void SetUpTestCase() {
-    LLVMInitializeSystemZTargetInfo();
-    LLVMInitializeSystemZTargetMC();
-    LLVMInitializeSystemZAsmParser();
-  }
-
-  std::unique_ptr<MCRegisterInfo> MRI;
-  std::unique_ptr<MockedUpMCAsmInfo> MUPMAI;
-  std::unique_ptr<const MCInstrInfo> MII;
-  std::unique_ptr<MCObjectFileInfo> MOFI;
-  std::unique_ptr<MCStreamer> Str;
-  std::unique_ptr<MCAsmParser> Parser;
-  std::unique_ptr<MCContext> Ctx;
-  std::unique_ptr<MCSubtargetInfo> STI;
-  std::unique_ptr<MCTargetAsmParser> TargetAsmParser;
-
-  SourceMgr SrcMgr;
-  std::string TripleName;
-  llvm::Triple Triple;
-  const Target *TheTarget;
-
-  const MCTargetOptions MCOptions;
-
-  SystemZAsmLexerTest() {
-    // We will use the SystemZ triple, because of missing
-    // Object File and Streamer support for the z/OS target.
-    TripleName = "s390x-ibm-linux";
-    Triple = llvm::Triple(TripleName);
-
-    std::string Error;
-    TheTarget = TargetRegistry::lookupTarget(TripleName, Error);
-    EXPECT_NE(TheTarget, nullptr);
-
-    MRI.reset(TheTarget->createMCRegInfo(TripleName));
-    EXPECT_NE(MRI, nullptr);
-
-    MII.reset(TheTarget->createMCInstrInfo());
-    EXPECT_NE(MII, nullptr);
-
-    STI.reset(TheTarget->createMCSubtargetInfo(TripleName, "z10", ""));
-    EXPECT_NE(STI, nullptr);
-
-    std::unique_ptr<MCAsmInfo> MAI;
-    MAI.reset(TheTarget->createMCAsmInfo(*MRI, TripleName, MCOptions));
-    EXPECT_NE(MAI, nullptr);
-
-    // Now we cast to our mocked up version of MCAsmInfo.
-    MUPMAI.reset(static_cast<MockedUpMCAsmInfo *>(MAI.release()));
-    // MUPMAI should "hold" MAI.
-    EXPECT_NE(MUPMAI, nullptr);
-    // After releasing, MAI should now be null.
-    EXPECT_EQ(MAI, nullptr);
-  }
-
-  void setupCallToAsmParser(StringRef AsmStr) {
-    std::unique_ptr<MemoryBuffer> Buffer(MemoryBuffer::getMemBuffer(AsmStr));
-    SrcMgr.AddNewSourceBuffer(std::move(Buffer), SMLoc());
-    EXPECT_EQ(Buffer, nullptr);
-
-    Ctx.reset(new MCContext(Triple, MUPMAI.get(), MRI.get(), STI.get(), &SrcMgr,
-                            &MCOptions));
-    MOFI.reset(TheTarget->createMCObjectFileInfo(*Ctx, /*PIC=*/false,
-                                                 /*LargeCodeModel=*/false));
-    Ctx->setObjectFileInfo(MOFI.get());
-
-    Str.reset(TheTarget->createNullStreamer(*Ctx));
-
-    Parser.reset(createMCAsmParser(SrcMgr, *Ctx, *Str, *MUPMAI));
-
-    TargetAsmParser.reset(
-        TheTarget->createMCAsmParser(*STI, *Parser, *MII, MCOptions));
-    Parser->setTargetParser(*TargetAsmParser);
-  }
-
-  void lexAndCheckTokens(StringRef AsmStr,
-                         SmallVector<AsmToken::TokenKind> ExpectedTokens) {
-    // Get reference to AsmLexer.
-    MCAsmLexer &Lexer = Parser->getLexer();
-    // Loop through all expected tokens checking one by one.
-    for (size_t I = 0; I < ExpectedTokens.size(); ++I) {
-      EXPECT_EQ(Lexer.getTok().getKind(), ExpectedTokens[I]);
-      Lexer.Lex();
-    }
-  }
-
-  void lexAndCheckIntegerTokensAndValues(StringRef AsmStr,
-                                         SmallVector<int64_t> ExpectedValues) {
-    // Get reference to AsmLexer.
-    MCAsmLexer &Lexer = Parser->getLexer();
-    // Loop through all expected tokens and expected values.
-    for (size_t I = 0; I < ExpectedValues.size(); ++I) {
-      // Skip any EndOfStatement tokens, we're not concerned with them.
-      if (Lexer.getTok().getKind() == AsmToken::EndOfStatement)
-        continue;
-      EXPECT_EQ(Lexer.getTok().getKind(), AsmToken::Integer);
-      EXPECT_EQ(Lexer.getTok().getIntVal(), ExpectedValues[I]);
-      Lexer.Lex();
-    }
-  }
-};
-
-TEST_F(SystemZAsmLexerTest, CheckDontRestrictCommentStringToStartOfStatement) {
-  StringRef AsmStr = "jne #-4";
-
-  // Setup.
-  setupCallToAsmParser(AsmStr);
-
-  // Lex initially to get the string.
-  Parser->getLexer().Lex();
-
-  SmallVector<AsmToken::TokenKind> ExpectedTokens(
-      {AsmToken::Identifier, AsmToken::EndOfStatement});
-  lexAndCheckTokens(AsmStr /* "jne #-4" */, ExpectedTokens);
-}
-
-// Testing MCAsmInfo's RestrictCommentStringToStartOfStatement attribute.
-TEST_F(SystemZAsmLexerTest, CheckRestrictCommentStringToStartOfStatement) {
-  StringRef AsmStr = "jne #-4";
-
-  // Setup.
-  MUPMAI->setRestrictCommentStringToStartOfStatement(true);
-  setupCallToAsmParser(AsmStr);
-
-  // Lex initially to get the string.
-  Parser->getLexer().Lex();
-
-  // When we are restricting the comment string to only the start of the
-  // statement, The sequence of tokens we are expecting are: Identifier - "jne"
-  // Hash - '#'
-  // Minus - '-'
-  // Integer - '4'
-  SmallVector<AsmToken::TokenKind> ExpectedTokens(
-      {AsmToken::Identifier, AsmToken::Hash, AsmToken::Minus,
-       AsmToken::Integer});
-  lexAndCheckTokens(AsmStr /* "jne #-4" */, ExpectedTokens);
-}
-
-// Test HLASM Comment Syntax ('*')
-TEST_F(SystemZAsmLexerTest, CheckHLASMComment) {
-  StringRef AsmStr = "* lhi 1,10";
-
-  // Setup.
-  MUPMAI->setCommentString("*");
-  setupCallToAsmParser(AsmStr);
-
-  // Lex initially to get the string.
-  Parser->getLexer().Lex();
-
-  SmallVector<AsmToken::TokenKind> ExpectedTokens(
-      {AsmToken::EndOfStatement, AsmToken::Eof});
-  lexAndCheckTokens(AsmStr /* "* lhi 1,10" */, ExpectedTokens);
-}
-
-TEST_F(SystemZAsmLexerTest, CheckHashDefault) {
-  StringRef AsmStr = "lh#123";
-
-  // Setup.
-  setupCallToAsmParser(AsmStr);
-
-  // Lex initially to get the string.
-  Parser->getLexer().Lex();
-
-  // "lh" -> Identifier
-  // "#123" -> EndOfStatement (Lexed as a comment since CommentString is "#")
-  SmallVector<AsmToken::TokenKind> ExpectedTokens(
-      {AsmToken::Identifier, AsmToken::EndOfStatement, AsmToken::Eof});
-  lexAndCheckTokens(AsmStr, ExpectedTokens);
-}
-
-// Test if "#" is accepted as an Identifier
-TEST_F(SystemZAsmLexerTest, CheckAllowHashInIdentifier) {
-  StringRef AsmStr = "lh#123";
-
-  // Setup.
-  setupCallToAsmParser(AsmStr);
-  Parser->getLexer().setAllowHashInIdentifier(true);
-
-  // Lex initially to get the string.
-  Parser->getLexer().Lex();
-
-  // "lh123" -> Identifier
-  SmallVector<AsmToken::TokenKind> ExpectedTokens(
-      {AsmToken::Identifier, AsmToken::EndOfStatement, AsmToken::Eof});
-  lexAndCheckTokens(AsmStr, ExpectedTokens);
-}
-
-TEST_F(SystemZAsmLexerTest, CheckAllowHashInIdentifier2) {
-  StringRef AsmStr = "lh#12*3";
-
-  // Setup.
-  MUPMAI->setCommentString("*");
-  MUPMAI->setRestrictCommentStringToStartOfStatement(true);
-  setupCallToAsmParser(AsmStr);
-  Parser->getLexer().setAllowHashInIdentifier(true);
-
-  // Lex initially to get the string.
-  Parser->getLexer().Lex();
-
-  // "lh#12" -> Identifier
-  // "*" -> Star
-  // "3" -> Integer
-  SmallVector<AsmToken::TokenKind> ExpectedTokens(
-      {AsmToken::Identifier, AsmToken::Star, AsmToken::Integer,
-       AsmToken::EndOfStatement, AsmToken::Eof});
-  lexAndCheckTokens(AsmStr, ExpectedTokens);
-}
-
-TEST_F(SystemZAsmLexerTest, DontCheckStrictCommentString) {
-  StringRef AsmStr = "# abc\n/* def *///  xyz";
-
-  // Setup.
-  setupCallToAsmParser(AsmStr);
-
-  // Lex initially to get the string.
-  Parser->getLexer().Lex();
-
-  SmallVector<AsmToken::TokenKind> ExpectedTokens(
-      {AsmToken::EndOfStatement, AsmToken::Comment, AsmToken::EndOfStatement,
-       AsmToken::Eof});
-  lexAndCheckTokens(AsmStr, ExpectedTokens);
-}
-
-TEST_F(SystemZAsmLexerTest, DontCheckStrictCommentString2) {
-  StringRef AsmStr = "# abc\n/* def *///  xyz\n* rst";
-
-  // Setup.
-  MUPMAI->setCommentString("*");
-  setupCallToAsmParser(AsmStr);
-
-  // Lex initially to get the string.
-  Parser->getLexer().Lex();
-
-  SmallVector<AsmToken::TokenKind> ExpectedTokens(
-      {AsmToken::EndOfStatement, AsmToken::Comment, AsmToken::EndOfStatement,
-       AsmToken::EndOfStatement, AsmToken::Eof});
-  lexAndCheckTokens(AsmStr, ExpectedTokens);
-}
-
-TEST_F(SystemZAsmLexerTest, CheckStrictCommentString) {
-  StringRef AsmStr = "# abc\n/* def *///  xyz";
-
-  // Setup.
-  MUPMAI->setAllowAdditionalComments(false);
-  setupCallToAsmParser(AsmStr);
-
-  // Lex initially to get the string.
-  Parser->getLexer().Lex();
-
-  // "# abc" -> still treated as a comment, since CommentString
-  //            is set to "#"
-  SmallVector<AsmToken::TokenKind> ExpectedTokens;
-  ExpectedTokens.push_back(AsmToken::EndOfStatement); // "# abc\n"
-  ExpectedTokens.push_back(AsmToken::Slash);          // "/"
-  ExpectedTokens.push_back(AsmToken::Star);           // "*"
-  ExpectedTokens.push_back(AsmToken::Identifier);     // "def"
-  ExpectedTokens.push_back(AsmToken::Star);           // "*"
-  ExpectedTokens.push_back(AsmToken::Slash);          // "/"
-  ExpectedTokens.push_back(AsmToken::Slash);          // "/"
-  ExpectedTokens.push_back(AsmToken::Slash);          // "/"
-  ExpectedTokens.push_back(AsmToken::Identifier);     // "xyz"
-  ExpectedTokens.push_back(AsmToken::EndOfStatement);
-  ExpectedTokens.push_back(AsmToken::Eof);
-
-  lexAndCheckTokens(AsmStr, ExpectedTokens);
-}
-
-TEST_F(SystemZAsmLexerTest, CheckStrictCommentString2) {
-  StringRef AsmStr = "// abc";
-
-  // Setup.
-  MUPMAI->setAllowAdditionalComments(false);
-  MUPMAI->setCommentString("//");
-  setupCallToAsmParser(AsmStr);
-
-  // Lex initially to get the string.
-  Parser->getLexer().Lex();
-
-  // "// abc" -> will still be treated as a comment because "//" is the
-  //             CommentString
-  SmallVector<AsmToken::TokenKind> ExpectedTokens(
-      {AsmToken::EndOfStatement, AsmToken::Eof});
-  lexAndCheckTokens(AsmStr /* "// abc" */, ExpectedTokens);
-}
-
-TEST_F(SystemZAsmLexerTest, CheckStrictCommentString3) {
-  StringRef AsmStr = "/* abc */";
-
-  // Setup.
-  MUPMAI->setAllowAdditionalComments(false);
-  setupCallToAsmParser(AsmStr);
-
-  // Lex initially to get the string.
-  Parser->getLexer().Lex();
-
-  SmallVector<AsmToken::TokenKind> ExpectedTokens;
-  ExpectedTokens.push_back(AsmToken::Slash);
-  ExpectedTokens.push_back(AsmToken::Star);
-  ExpectedTokens.push_back(AsmToken::Identifier);
-  ExpectedTokens.push_back(AsmToken::Star);
-  ExpectedTokens.push_back(AsmToken::Slash);
-  ExpectedTokens.push_back(AsmToken::EndOfStatement);
-  ExpectedTokens.push_back(AsmToken::Eof);
-
-  lexAndCheckTokens(AsmStr, ExpectedTokens);
-}
-
-TEST_F(SystemZAsmLexerTest, CheckStrictCommentString4) {
-  StringRef AsmStr = "# abc\n/* def *///  xyz";
-
-  // Setup.
-  MUPMAI->setCommentString("*");
-  MUPMAI->setAllowAdditionalComments(false);
-  MUPMAI->setRestrictCommentStringToStartOfStatement(true);
-  setupCallToAsmParser(AsmStr);
-
-  // Lex initially to get the string.
-  Parser->getLexer().Lex();
-
-  SmallVector<AsmToken::TokenKind> ExpectedTokens;
-  ExpectedTokens.push_back(AsmToken::Hash);           // "#"
-  ExpectedTokens.push_back(AsmToken::Identifier);     // "abc"
-  ExpectedTokens.push_back(AsmToken::EndOfStatement); // "\n"
-  ExpectedTokens.push_back(AsmToken::Slash);          // "/"
-  ExpectedTokens.push_back(AsmToken::Star);           // "*"
-  ExpectedTokens.push_back(AsmToken::Identifier);     // "def"
-  ExpectedTokens.push_back(AsmToken::Star);           // "*"
-  ExpectedTokens.push_back(AsmToken::Slash);          // "/"
-  ExpectedTokens.push_back(AsmToken::Slash);          // "/"
-  ExpectedTokens.push_back(AsmToken::Slash);          // "/"
-  ExpectedTokens.push_back(AsmToken::Identifier);     // "xyz"
-  ExpectedTokens.push_back(AsmToken::EndOfStatement);
-  ExpectedTokens.push_back(AsmToken::Eof);
-
-  lexAndCheckTokens(AsmStr, ExpectedTokens);
-}
-
-TEST_F(SystemZAsmLexerTest, CheckStrictCommentString5) {
-  StringRef AsmStr = "#abc\n/* def */// xyz";
-
-  // Setup.
-  MUPMAI->setCommentString("*");
-  MUPMAI->setAllowAdditionalComments(false);
-  setupCallToAsmParser(AsmStr);
-
-  // Lex initially to get the string.
-  Parser->getLexer().Lex();
-
-  SmallVector<AsmToken::TokenKind> ExpectedTokens;
-  ExpectedTokens.push_back(AsmToken::Hash);           // "#"
-  ExpectedTokens.push_back(AsmToken::Identifier);     // "abc"
-  ExpectedTokens.push_back(AsmToken::EndOfStatement); // "\n"
-  ExpectedTokens.push_back(AsmToken::Slash);          // "/"
-  ExpectedTokens.push_back(AsmToken::EndOfStatement); // "* def */// xyz"
-  ExpectedTokens.push_back(AsmToken::Eof);
-
-  lexAndCheckTokens(AsmStr, ExpectedTokens);
-}
-
-TEST_F(SystemZAsmLexerTest, CheckValidHLASMIntegers) {
-  StringRef AsmStr = "123\n000123\n1999\n007\n12300\n12021\n";
-  // StringRef AsmStr = "123";
-  // Setup.
-  setupCallToAsmParser(AsmStr);
-  Parser->getLexer().setLexHLASMIntegers(true);
-
-  // Lex initially to get the string.
-  Parser->getLexer().Lex();
-
-  // SmallVector<int64_t> ExpectedValues({123});
-  SmallVector<int64_t> ExpectedValues({123, 123, 1999, 7, 12300, 12021});
-  lexAndCheckIntegerTokensAndValues(AsmStr, ExpectedValues);
-}
-
-TEST_F(SystemZAsmLexerTest, CheckInvalidHLASMIntegers) {
-  StringRef AsmStr = "0b0101\n0xDEADBEEF\nfffh\n.133\n";
-
-  // Setup.
-  setupCallToAsmParser(AsmStr);
-  Parser->getLexer().setLexHLASMIntegers(true);
-
-  // Lex initially to get the string.
-  Parser->getLexer().Lex();
-
-  SmallVector<AsmToken::TokenKind> ExpectedTokens;
-  ExpectedTokens.push_back(AsmToken::Integer);        // "0"
-  ExpectedTokens.push_back(AsmToken::Identifier);     // "b0101"
-  ExpectedTokens.push_back(AsmToken::EndOfStatement); // "\n"
-  ExpectedTokens.push_back(AsmToken::Integer);        // "0"
-  ExpectedTokens.push_back(AsmToken::Identifier);     // "xDEADBEEF"
-  ExpectedTokens.push_back(AsmToken::EndOfStatement); // "\n"
-  ExpectedTokens.push_back(AsmToken::Identifier);     // "fffh"
-  ExpectedTokens.push_back(AsmToken::EndOfStatement); // "\n"
-  ExpectedTokens.push_back(AsmToken::Real);           // ".133"
-  ExpectedTokens.push_back(AsmToken::EndOfStatement); // "\n"
-  ExpectedTokens.push_back(AsmToken::Eof);
-  lexAndCheckTokens(AsmStr, ExpectedTokens);
-}
-
-TEST_F(SystemZAsmLexerTest, CheckDefaultIntegers) {
-  StringRef AsmStr = "0b0101\n0xDEADBEEF\nfffh\n";
-
-  // Setup.
-  setupCallToAsmParser(AsmStr);
-
-  // Lex initially to get the string.
-  Parser->getLexer().Lex();
-
-  SmallVector<int64_t> ExpectedValues({5, 0xDEADBEEF, 0xFFF});
-  lexAndCheckIntegerTokensAndValues(AsmStr, ExpectedValues);
-}
-
-TEST_F(SystemZAsmLexerTest, CheckDefaultFloats) {
-  StringRef AsmStr = "0.333\n1.3\n2.5\n3.0\n";
-
-  // Setup.
-  setupCallToAsmParser(AsmStr);
-
-  // Lex initially to get the string.
-  Parser->getLexer().Lex();
-
-  SmallVector<AsmToken::TokenKind> ExpectedTokens;
-
-  for (int I = 0; I < 4; ++I)
-    ExpectedTokens.insert(ExpectedTokens.begin(),
-                          {AsmToken::Real, AsmToken::EndOfStatement});
-
-  ExpectedTokens.push_back(AsmToken::Eof);
-  lexAndCheckTokens(AsmStr, ExpectedTokens);
-}
-
-TEST_F(SystemZAsmLexerTest, CheckDefaultQuestionAtStartOfIdentifier) {
-  StringRef AsmStr = "?lh1?23";
-
-  // Setup.
-  setupCallToAsmParser(AsmStr);
-
-  // Lex initially to get the string.
-  Parser->getLexer().Lex();
-
-  SmallVector<AsmToken::TokenKind> ExpectedTokens(
-      {AsmToken::Error, AsmToken::Identifier, AsmToken::EndOfStatement,
-       AsmToken::Eof});
-  lexAndCheckTokens(AsmStr, ExpectedTokens);
-}
-
-TEST_F(SystemZAsmLexerTest, CheckAcceptQuestionAtStartOfIdentifier) {
-  StringRef AsmStr = "?????lh1?23";
-
-  // Setup.
-  MUPMAI->setAllowQuestionAtStartOfIdentifier(true);
-  setupCallToAsmParser(AsmStr);
-
-  // Lex initially to get the string.
-  Parser->getLexer().Lex();
-
-  SmallVector<AsmToken::TokenKind> ExpectedTokens(
-      {AsmToken::Identifier, AsmToken::EndOfStatement, AsmToken::Eof});
-  lexAndCheckTokens(AsmStr, ExpectedTokens);
-}
-
-TEST_F(SystemZAsmLexerTest, CheckDefaultAtAtStartOfIdentifier) {
-  StringRef AsmStr = "@@lh1?23";
-
-  // Setup.
-  MUPMAI->setAllowQuestionAtStartOfIdentifier(true);
-  setupCallToAsmParser(AsmStr);
-
-  // Lex initially to get the string.
-  Parser->getLexer().Lex();
-
-  SmallVector<AsmToken::TokenKind> ExpectedTokens(
-      {AsmToken::At, AsmToken::At, AsmToken::Identifier,
-       AsmToken::EndOfStatement, AsmToken::Eof});
-  lexAndCheckTokens(AsmStr, ExpectedTokens);
-}
-
-TEST_F(SystemZAsmLexerTest, CheckAcceptAtAtStartOfIdentifier) {
-  StringRef AsmStr = "@@lh1?23";
-
-  // Setup.
-  MUPMAI->setAllowAtAtStartOfIdentifier(true);
-  setupCallToAsmParser(AsmStr);
-
-  // Lex initially to get the string.
-  Parser->getLexer().Lex();
-
-  SmallVector<AsmToken::TokenKind> ExpectedTokens(
-      {AsmToken::Identifier, AsmToken::EndOfStatement, AsmToken::Eof});
-  lexAndCheckTokens(AsmStr, ExpectedTokens);
-}
-
-TEST_F(SystemZAsmLexerTest, CheckAccpetAtAtStartOfIdentifier2) {
-  StringRef AsmStr = "@@lj1?23";
-
-  // Setup.
-  MUPMAI->setCommentString("@");
-  MUPMAI->setAllowAtAtStartOfIdentifier(true);
-  setupCallToAsmParser(AsmStr);
-
-  // Lex initially to get the string.
-  Parser->getLexer().Lex();
-
-  // "@@lj1?23" -> still lexed as a comment as that takes precedence.
-  SmallVector<AsmToken::TokenKind> ExpectedTokens(
-      {AsmToken::EndOfStatement, AsmToken::Eof});
-  lexAndCheckTokens(AsmStr, ExpectedTokens);
-}
-
-TEST_F(SystemZAsmLexerTest, CheckDefaultDollarAtStartOfIdentifier) {
-  StringRef AsmStr = "$$ac$c";
-
-  // Setup.
-  setupCallToAsmParser(AsmStr);
-
-  // Lex initially to get the string.
-  Parser->getLexer().Lex();
-
-  SmallVector<AsmToken::TokenKind> ExpectedTokens(
-      {AsmToken::Dollar, AsmToken::Dollar, AsmToken::Identifier,
-       AsmToken::EndOfStatement, AsmToken::Eof});
-  lexAndCheckTokens(AsmStr, ExpectedTokens);
-}
-
-TEST_F(SystemZAsmLexerTest, CheckAcceptDollarAtStartOfIdentifier) {
-  StringRef AsmStr = "$$ab$c";
-
-  // Setup.
-  MUPMAI->setAllowDollarAtStartOfIdentifier(true);
-  setupCallToAsmParser(AsmStr);
-
-  // Lex initially to get the string.
-  Parser->getLexer().Lex();
-
-  SmallVector<AsmToken::TokenKind> ExpectedTokens(
-      {AsmToken::Identifier, AsmToken::EndOfStatement, AsmToken::Eof});
-  lexAndCheckTokens(AsmStr, ExpectedTokens);
-}
-
-TEST_F(SystemZAsmLexerTest, CheckAcceptHashAtStartOfIdentifier) {
-  StringRef AsmStr = "##a#b$c";
-
-  // Setup.
-  MUPMAI->setAllowHashAtStartOfIdentifier(true);
-  MUPMAI->setCommentString("*");
-  MUPMAI->setAllowAdditionalComments(false);
-  setupCallToAsmParser(AsmStr);
-  Parser->getLexer().setAllowHashInIdentifier(true);
-
-  // Lex initially to get the string.
-  Parser->getLexer().Lex();
-
-  SmallVector<AsmToken::TokenKind> ExpectedTokens(
-      {AsmToken::Identifier, AsmToken::EndOfStatement, AsmToken::Eof});
-  lexAndCheckTokens(AsmStr, ExpectedTokens);
-}
-
-TEST_F(SystemZAsmLexerTest, CheckAcceptHashAtStartOfIdentifier2) {
-  StringRef AsmStr = "##a#b$c";
-
-  // Setup.
-  MUPMAI->setAllowHashAtStartOfIdentifier(true);
-  setupCallToAsmParser(AsmStr);
-  Parser->getLexer().setAllowHashInIdentifier(true);
-
-  // Lex initially to get the string.
-  Parser->getLexer().Lex();
-
-  // By default, the CommentString attribute is set to "#".
-  // Hence, "##a#b$c" is lexed as a line comment irrespective
-  // of whether the AllowHashAtStartOfIdentifier attribute is set to true.
-  SmallVector<AsmToken::TokenKind> ExpectedTokens(
-      {AsmToken::EndOfStatement, AsmToken::Eof});
-  lexAndCheckTokens(AsmStr, ExpectedTokens);
-}
-
-TEST_F(SystemZAsmLexerTest, CheckAcceptHashAtStartOfIdentifier3) {
-  StringRef AsmStr = "##a#b$c";
-
-  // Setup.
-  MUPMAI->setAllowHashAtStartOfIdentifier(true);
-  MUPMAI->setCommentString("*");
-  setupCallToAsmParser(AsmStr);
-  Parser->getLexer().setAllowHashInIdentifier(true);
-
-  // Lex initially to get the string.
-  Parser->getLexer().Lex();
-
-  // By default, the AsmLexer treats strings that start with "#"
-  // as a line comment.
-  // Hence, "##a$b$c" is lexed as a line comment irrespective
-  // of whether the AllowHashAtStartOfIdentifier attribute is set to true.
-  SmallVector<AsmToken::TokenKind> ExpectedTokens(
-      {AsmToken::EndOfStatement, AsmToken::Eof});
-  lexAndCheckTokens(AsmStr, ExpectedTokens);
-}
-
-TEST_F(SystemZAsmLexerTest, CheckAcceptHashAtStartOfIdentifier4) {
-  StringRef AsmStr = "##a#b$c";
-
-  // Setup.
-  MUPMAI->setAllowHashAtStartOfIdentifier(true);
-  MUPMAI->setCommentString("*");
-  MUPMAI->setAllowAdditionalComments(false);
-  setupCallToAsmParser(AsmStr);
-  Parser->getLexer().setAllowHashInIdentifier(true);
-
-  // Lex initially to get the string.
-  Parser->getLexer().Lex();
-
-  // Since, the AllowAdditionalComments attribute is set to false,
-  // only strings starting with the CommentString attribute are
-  // lexed as possible comments.
-  // Hence, "##a$b$c" is lexed as an Identifier because the
-  // AllowHashAtStartOfIdentifier attribute is set to true.
-  SmallVector<AsmToken::TokenKind> ExpectedTokens(
-      {AsmToken::Identifier, AsmToken::EndOfStatement, AsmToken::Eof});
-  lexAndCheckTokens(AsmStr, ExpectedTokens);
-}
-
-TEST_F(SystemZAsmLexerTest, CheckRejectDotAsCurrentPC) {
-  StringRef AsmStr = ".-4";
-
-  // Setup.
-  MUPMAI->setAllowDotIsPC(false);
-  setupCallToAsmParser(AsmStr);
-
-  // Lex initially to get the string.
-  Parser->getLexer().Lex();
-
-  const MCExpr *Expr;
-  bool ParsePrimaryExpr = Parser->parseExpression(Expr);
-  EXPECT_EQ(ParsePrimaryExpr, true);
-  EXPECT_EQ(Parser->hasPendingError(), true);
-}
-
-TEST_F(SystemZAsmLexerTest, CheckRejectStarAsCurrentPC) {
-  StringRef AsmStr = "*-4";
-
-  // Setup.
-  setupCallToAsmParser(AsmStr);
-
-  // Lex initially to get the string.
-  Parser->getLexer().Lex();
-
-  const MCExpr *Expr;
-  bool ParsePrimaryExpr = Parser->parseExpression(Expr);
-  EXPECT_EQ(ParsePrimaryExpr, true);
-  EXPECT_EQ(Parser->hasPendingError(), true);
-}
-
-TEST_F(SystemZAsmLexerTest, CheckRejectCharLiterals) {
-  StringRef AsmStr = "abc 'd'";
-
-  // Setup.
-  setupCallToAsmParser(AsmStr);
-  Parser->getLexer().setLexHLASMStrings(true);
-
-  // Lex initially to get the string.
-  Parser->getLexer().Lex();
-
-  SmallVector<AsmToken::TokenKind> ExpectedTokens(
-      {AsmToken::Identifier, AsmToken::Error, AsmToken::Error,
-       AsmToken::EndOfStatement, AsmToken::Eof});
-  lexAndCheckTokens(AsmStr, ExpectedTokens);
-}
-
-TEST_F(SystemZAsmLexerTest, CheckRejectStringLiterals) {
-  StringRef AsmStr = "abc \"ef\"";
-
-  // Setup.
-  setupCallToAsmParser(AsmStr);
-  Parser->getLexer().setLexHLASMStrings(true);
-
-  // Lex initially to get the string.
-  Parser->getLexer().Lex();
-
-  SmallVector<AsmToken::TokenKind> ExpectedTokens(
-      {AsmToken::Identifier, AsmToken::Error, AsmToken::Identifier,
-       AsmToken::Error, AsmToken::EndOfStatement, AsmToken::Eof});
-  lexAndCheckTokens(AsmStr, ExpectedTokens);
-}
-
-TEST_F(SystemZAsmLexerTest, CheckPrintAcceptableSymbol) {
-  std::string AsmStr = "ab13_$.@";
-  EXPECT_EQ(true, MUPMAI->isValidUnquotedName(AsmStr));
-  AsmStr += "#";
-  EXPECT_EQ(false, MUPMAI->isValidUnquotedName(AsmStr));
-}
-
-TEST_F(SystemZAsmLexerTest, CheckPrintAcceptableSymbol2) {
-  MUPMAI->setAssemblerDialect(1);
-  std::string AsmStr = "ab13_$.@";
-  EXPECT_EQ(true, MUPMAI->isValidUnquotedName(AsmStr));
-  AsmStr += "#";
-  EXPECT_EQ(true, MUPMAI->isValidUnquotedName(AsmStr));
-}
-
-TEST_F(SystemZAsmLexerTest, CheckLabelCaseUpperCase2) {
-  StringRef AsmStr = "label\nlabel";
-
-  // Setup.
-  setupCallToAsmParser(AsmStr);
-
-  // Lex initially to get the string.
-  Parser->getLexer().Lex();
-
-  const MCExpr *Expr;
-  bool ParsePrimaryExpr = Parser->parseExpression(Expr);
-  EXPECT_EQ(ParsePrimaryExpr, false);
-
-  const MCSymbolRefExpr *SymbolExpr = dyn_cast<MCSymbolRefExpr>(Expr);
-  EXPECT_NE(SymbolExpr, nullptr);
-  EXPECT_NE(&SymbolExpr->getSymbol(), nullptr);
-  EXPECT_EQ((&SymbolExpr->getSymbol())->getName(), StringRef("label"));
-
-  // Lex the end of statement token.
-  Parser->getLexer().Lex();
-
-  MUPMAI->setEmitLabelsInUpperCase(true);
-
-  ParsePrimaryExpr = Parser->parseExpression(Expr);
-  EXPECT_EQ(ParsePrimaryExpr, false);
-
-  SymbolExpr = dyn_cast<MCSymbolRefExpr>(Expr);
-  EXPECT_NE(SymbolExpr, nullptr);
-  EXPECT_NE(&SymbolExpr->getSymbol(), nullptr);
-  EXPECT_EQ((&SymbolExpr->getSymbol())->getName(), StringRef("LABEL"));
-}
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/MC/TargetRegistry.cpp b/gnu/llvm/llvm/unittests/MC/TargetRegistry.cpp
deleted file mode 100644
index 587b2eeffdd..00000000000
--- a/gnu/llvm/llvm/unittests/MC/TargetRegistry.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-//===- unittests/MC/TargetRegistry.cpp ------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// The target registry code lives in Support, but it relies on linking in all
-// LLVM targets. We keep this test with the MC tests, which already do that, to
-// keep the SupportTests target small.
-
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST(TargetRegistry, TargetHasArchType) {
-  // Presence of at least one target will be asserted when done with the loop,
-  // else this would pass by accident if InitializeAllTargetInfos were omitted.
-  int Count = 0;
-
-  llvm::InitializeAllTargetInfos();
-
-  for (const Target &T : TargetRegistry::targets()) {
-    StringRef Name = T.getName();
-    // There is really no way (at present) to ask a Target whether it targets
-    // a specific architecture, because the logic for that is buried in a
-    // predicate.
-    // We can't ask the predicate "Are you a function that always returns
-    // false?"
-    // So given that the cpp backend truly has no target arch, it is skipped.
-    if (Name != "cpp") {
-      Triple::ArchType Arch = Triple::getArchTypeForLLVMName(Name);
-      EXPECT_NE(Arch, Triple::UnknownArch);
-      ++Count;
-    }
-  }
-  ASSERT_NE(Count, 0);
-}
-
-} // end namespace
diff --git a/gnu/llvm/llvm/unittests/MI/CMakeLists.txt b/gnu/llvm/llvm/unittests/MI/CMakeLists.txt
deleted file mode 100644
index 595497f3d96..00000000000
--- a/gnu/llvm/llvm/unittests/MI/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
-  CodeGen
-  Core
-  MC
-  MIRParser
-  Support
-  Target
-  )
-
-add_llvm_unittest(MITests
-  LiveIntervalTest.cpp
-  )
diff --git a/gnu/llvm/llvm/unittests/MI/LiveIntervalTest.cpp b/gnu/llvm/llvm/unittests/MI/LiveIntervalTest.cpp
deleted file mode 100644
index 70ca28dec56..00000000000
--- a/gnu/llvm/llvm/unittests/MI/LiveIntervalTest.cpp
+++ /dev/null
@@ -1,656 +0,0 @@
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/CodeGen/LiveIntervals.h"
-#include "llvm/CodeGen/MIRParser/MIRParser.h"
-#include "llvm/CodeGen/MachineFunction.h"
-#include "llvm/CodeGen/MachineModuleInfo.h"
-#include "llvm/CodeGen/TargetRegisterInfo.h"
-#include "llvm/IR/LegacyPassManager.h"
-#include "llvm/InitializePasses.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/SourceMgr.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "llvm/Target/TargetMachine.h"
-#include "llvm/Target/TargetOptions.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace llvm {
-  void initializeTestPassPass(PassRegistry &);
-}
-
-namespace {
-
-void initLLVM() {
-  InitializeAllTargets();
-  InitializeAllTargetMCs();
-  InitializeAllAsmPrinters();
-  InitializeAllAsmParsers();
-
-  PassRegistry *Registry = PassRegistry::getPassRegistry();
-  initializeCore(*Registry);
-  initializeCodeGen(*Registry);
-}
-
-/// Create a TargetMachine. As we lack a dedicated always available target for
-/// unittests, we go for "AMDGPU" to be able to test normal and subregister
-/// liveranges.
-std::unique_ptr<LLVMTargetMachine> createTargetMachine() {
-  Triple TargetTriple("amdgcn--");
-  std::string Error;
-  const Target *T = TargetRegistry::lookupTarget("", TargetTriple, Error);
-  if (!T)
-    return nullptr;
-
-  TargetOptions Options;
-  return std::unique_ptr<LLVMTargetMachine>(static_cast<LLVMTargetMachine*>(
-      T->createTargetMachine("AMDGPU", "gfx900", "", Options, None, None,
-                             CodeGenOpt::Aggressive)));
-}
-
-std::unique_ptr<Module> parseMIR(LLVMContext &Context,
-    legacy::PassManagerBase &PM, std::unique_ptr<MIRParser> &MIR,
-    const LLVMTargetMachine &TM, StringRef MIRCode, const char *FuncName) {
-  SMDiagnostic Diagnostic;
-  std::unique_ptr<MemoryBuffer> MBuffer = MemoryBuffer::getMemBuffer(MIRCode);
-  MIR = createMIRParser(std::move(MBuffer), Context);
-  if (!MIR)
-    return nullptr;
-
-  std::unique_ptr<Module> M = MIR->parseIRModule();
-  if (!M)
-    return nullptr;
-
-  M->setDataLayout(TM.createDataLayout());
-
-  MachineModuleInfoWrapperPass *MMIWP = new MachineModuleInfoWrapperPass(&TM);
-  if (MIR->parseMachineFunctions(*M, MMIWP->getMMI()))
-    return nullptr;
-  PM.add(MMIWP);
-
-  return M;
-}
-
-typedef std::function<void(MachineFunction&,LiveIntervals&)> LiveIntervalTest;
-
-struct TestPass : public MachineFunctionPass {
-  static char ID;
-  TestPass() : MachineFunctionPass(ID) {
-    // We should never call this but always use PM.add(new TestPass(...))
-    abort();
-  }
-  TestPass(LiveIntervalTest T) : MachineFunctionPass(ID), T(T) {
-    initializeTestPassPass(*PassRegistry::getPassRegistry());
-  }
-
-  bool runOnMachineFunction(MachineFunction &MF) override {
-    LiveIntervals &LIS = getAnalysis<LiveIntervals>();
-    T(MF, LIS);
-    EXPECT_TRUE(MF.verify(this));
-    return true;
-  }
-
-  void getAnalysisUsage(AnalysisUsage &AU) const override {
-    AU.setPreservesAll();
-    AU.addRequired<LiveIntervals>();
-    AU.addPreserved<LiveIntervals>();
-    MachineFunctionPass::getAnalysisUsage(AU);
-  }
-private:
-  LiveIntervalTest T;
-};
-
-static MachineInstr &getMI(MachineFunction &MF, unsigned At,
-                           unsigned BlockNum) {
-  MachineBasicBlock &MBB = *MF.getBlockNumbered(BlockNum);
-
-  unsigned I = 0;
-  for (MachineInstr &MI : MBB) {
-    if (I == At)
-      return MI;
-    ++I;
-  }
-  llvm_unreachable("Instruction not found");
-}
-
-/**
- * Move instruction number \p From in front of instruction number \p To and
- * update affected liveness intervals with LiveIntervalAnalysis::handleMove().
- */
-static void testHandleMove(MachineFunction &MF, LiveIntervals &LIS,
-                           unsigned From, unsigned To, unsigned BlockNum = 0) {
-  MachineInstr &FromInstr = getMI(MF, From, BlockNum);
-  MachineInstr &ToInstr = getMI(MF, To, BlockNum);
-
-  MachineBasicBlock &MBB = *FromInstr.getParent();
-  MBB.splice(ToInstr.getIterator(), &MBB, FromInstr.getIterator());
-  LIS.handleMove(FromInstr, true);
-}
-
-/**
- * Move instructions numbered \p From inclusive through instruction number
- * \p To into a newly formed bundle and update affected liveness intervals
- * with LiveIntervalAnalysis::handleMoveIntoNewBundle().
- */
-static void testHandleMoveIntoNewBundle(MachineFunction &MF, LiveIntervals &LIS,
-                                        unsigned From, unsigned To,
-                                        unsigned BlockNum = 0) {
-  MachineInstr &FromInstr = getMI(MF, From, BlockNum);
-  MachineInstr &ToInstr = getMI(MF, To, BlockNum);
-  MachineBasicBlock &MBB = *FromInstr.getParent();
-  MachineBasicBlock::instr_iterator I = FromInstr.getIterator();
-
-  // Build bundle
-  finalizeBundle(MBB, I, std::next(ToInstr.getIterator()));
-
-  // Update LiveIntervals
-  MachineBasicBlock::instr_iterator BundleStart = std::prev(I);
-  LIS.handleMoveIntoNewBundle(*BundleStart, true);
-}
-
-/**
- * Split block numbered \p BlockNum at instruction \p SplitAt using
- * MachineBasicBlock::splitAt updating liveness intervals.
- */
-static void testSplitAt(MachineFunction &MF, LiveIntervals &LIS,
-                        unsigned SplitAt, unsigned BlockNum) {
-  MachineInstr &SplitInstr = getMI(MF, SplitAt, BlockNum);
-  MachineBasicBlock &MBB = *SplitInstr.getParent();
-
-  // Split block and update live intervals
-  MBB.splitAt(SplitInstr, false, &LIS);
-}
-
-static void liveIntervalTest(StringRef MIRFunc, LiveIntervalTest T) {
-  LLVMContext Context;
-  std::unique_ptr<LLVMTargetMachine> TM = createTargetMachine();
-  // This test is designed for the X86 backend; stop if it is not available.
-  if (!TM)
-    return;
-
-  legacy::PassManager PM;
-
-  SmallString<160> S;
-  StringRef MIRString = (Twine(R"MIR(
----
-...
-name: func
-registers:
-  - { id: 0, class: sreg_64 }
-body: |
-  bb.0:
-)MIR") + Twine(MIRFunc) + Twine("...\n")).toNullTerminatedStringRef(S);
-  std::unique_ptr<MIRParser> MIR;
-  std::unique_ptr<Module> M = parseMIR(Context, PM, MIR, *TM, MIRString,
-                                       "func");
-  ASSERT_TRUE(M);
-
-  PM.add(new TestPass(T));
-
-  PM.run(*M);
-}
-
-} // End of anonymous namespace.
-
-char TestPass::ID = 0;
-INITIALIZE_PASS(TestPass, "testpass", "testpass", false, false)
-
-TEST(LiveIntervalTest, MoveUpDef) {
-  // Value defined.
-  liveIntervalTest(R"MIR(
-    S_NOP 0
-    S_NOP 0
-    early-clobber %0 = IMPLICIT_DEF
-    S_NOP 0, implicit %0
-)MIR", [](MachineFunction &MF, LiveIntervals &LIS) {
-    testHandleMove(MF, LIS, 2, 1);
-  });
-}
-
-TEST(LiveIntervalTest, MoveUpRedef) {
-  liveIntervalTest(R"MIR(
-    %0 = IMPLICIT_DEF
-    S_NOP 0
-    %0 = IMPLICIT_DEF implicit %0(tied-def 0)
-    S_NOP 0, implicit %0
-)MIR", [](MachineFunction &MF, LiveIntervals &LIS) {
-    testHandleMove(MF, LIS, 2, 1);
-  });
-}
-
-TEST(LiveIntervalTest, MoveUpEarlyDef) {
-  liveIntervalTest(R"MIR(
-    S_NOP 0
-    S_NOP 0
-    early-clobber %0 = IMPLICIT_DEF
-    S_NOP 0, implicit %0
-)MIR", [](MachineFunction &MF, LiveIntervals &LIS) {
-    testHandleMove(MF, LIS, 2, 1);
-  });
-}
-
-TEST(LiveIntervalTest, MoveUpEarlyRedef) {
-  liveIntervalTest(R"MIR(
-    %0 = IMPLICIT_DEF
-    S_NOP 0
-    early-clobber %0 = IMPLICIT_DEF implicit %0(tied-def 0)
-    S_NOP 0, implicit %0
-)MIR", [](MachineFunction &MF, LiveIntervals &LIS) {
-    testHandleMove(MF, LIS, 2, 1);
-  });
-}
-
-TEST(LiveIntervalTest, MoveUpKill) {
-  liveIntervalTest(R"MIR(
-    %0 = IMPLICIT_DEF
-    S_NOP 0
-    S_NOP 0, implicit %0
-)MIR", [](MachineFunction &MF, LiveIntervals &LIS) {
-    testHandleMove(MF, LIS, 2, 1);
-  });
-}
-
-TEST(LiveIntervalTest, MoveUpKillFollowing) {
-  liveIntervalTest(R"MIR(
-    %0 = IMPLICIT_DEF
-    S_NOP 0
-    S_NOP 0, implicit %0
-    S_NOP 0, implicit %0
-)MIR", [](MachineFunction &MF, LiveIntervals &LIS) {
-    testHandleMove(MF, LIS, 2, 1);
-  });
-}
-
-// TODO: Construct a situation where we have intervals following a hole
-// while still having connected components.
-
-TEST(LiveIntervalTest, MoveDownDef) {
-  // Value defined.
-  liveIntervalTest(R"MIR(
-    S_NOP 0
-    early-clobber %0 = IMPLICIT_DEF
-    S_NOP 0
-    S_NOP 0, implicit %0
-)MIR", [](MachineFunction &MF, LiveIntervals &LIS) {
-    testHandleMove(MF, LIS, 1, 2);
-  });
-}
-
-TEST(LiveIntervalTest, MoveDownRedef) {
-  liveIntervalTest(R"MIR(
-    %0 = IMPLICIT_DEF
-    %0 = IMPLICIT_DEF implicit %0(tied-def 0)
-    S_NOP 0
-    S_NOP 0, implicit %0
-)MIR", [](MachineFunction &MF, LiveIntervals &LIS) {
-    testHandleMove(MF, LIS, 1, 2);
-  });
-}
-
-TEST(LiveIntervalTest, MoveDownEarlyDef) {
-  liveIntervalTest(R"MIR(
-    S_NOP 0
-    early-clobber %0 = IMPLICIT_DEF
-    S_NOP 0
-    S_NOP 0, implicit %0
-)MIR", [](MachineFunction &MF, LiveIntervals &LIS) {
-    testHandleMove(MF, LIS, 1, 2);
-  });
-}
-
-TEST(LiveIntervalTest, MoveDownEarlyRedef) {
-  liveIntervalTest(R"MIR(
-    %0 = IMPLICIT_DEF
-    early-clobber %0 = IMPLICIT_DEF implicit %0(tied-def 0)
-    S_NOP 0
-    S_NOP 0, implicit %0
-)MIR", [](MachineFunction &MF, LiveIntervals &LIS) {
-    testHandleMove(MF, LIS, 1, 2);
-  });
-}
-
-TEST(LiveIntervalTest, MoveDownKill) {
-  liveIntervalTest(R"MIR(
-    %0 = IMPLICIT_DEF
-    S_NOP 0, implicit %0
-    S_NOP 0
-)MIR", [](MachineFunction &MF, LiveIntervals &LIS) {
-    testHandleMove(MF, LIS, 1, 2);
-  });
-}
-
-TEST(LiveIntervalTest, MoveDownKillFollowing) {
-  liveIntervalTest(R"MIR(
-    %0 = IMPLICIT_DEF
-    S_NOP 0
-    S_NOP 0, implicit %0
-    S_NOP 0, implicit %0
-)MIR", [](MachineFunction &MF, LiveIntervals &LIS) {
-    testHandleMove(MF, LIS, 1, 2);
-  });
-}
-
-TEST(LiveIntervalTest, MoveUndefUse) {
-  liveIntervalTest(R"MIR(
-    %0 = IMPLICIT_DEF
-    S_NOP 0, implicit undef %0
-    S_NOP 0, implicit %0
-    S_NOP 0
-)MIR", [](MachineFunction &MF, LiveIntervals &LIS) {
-    testHandleMove(MF, LIS, 1, 3);
-  });
-}
-
-TEST(LiveIntervalTest, MoveUpValNos) {
-  // handleMoveUp() had a bug where it would reuse the value number of the
-  // destination segment, even though we have no guarantee that this valno
-  // wasn't used in other segments.
-  liveIntervalTest(R"MIR(
-    successors: %bb.1, %bb.2
-    %0 = IMPLICIT_DEF
-    S_CBRANCH_VCCNZ %bb.2, implicit undef $vcc
-    S_BRANCH %bb.1
-  bb.2:
-    S_NOP 0, implicit %0
-  bb.1:
-    successors: %bb.2
-    %0 = IMPLICIT_DEF implicit %0(tied-def 0)
-    %0 = IMPLICIT_DEF implicit %0(tied-def 0)
-    %0 = IMPLICIT_DEF implicit %0(tied-def 0)
-    S_BRANCH %bb.2
-)MIR", [](MachineFunction &MF, LiveIntervals &LIS) {
-    testHandleMove(MF, LIS, 2, 0, 2);
-  });
-}
-
-TEST(LiveIntervalTest, MoveOverUndefUse0) {
-  // findLastUseBefore() used by handleMoveUp() must ignore undef operands.
-  liveIntervalTest(R"MIR(
-    %0 = IMPLICIT_DEF
-    S_NOP 0
-    S_NOP 0, implicit undef %0
-    %0 = IMPLICIT_DEF implicit %0(tied-def 0)
-)MIR", [](MachineFunction &MF, LiveIntervals &LIS) {
-    testHandleMove(MF, LIS, 3, 1);
-  });
-}
-
-TEST(LiveIntervalTest, MoveOverUndefUse1) {
-  // findLastUseBefore() used by handleMoveUp() must ignore undef operands.
-  liveIntervalTest(R"MIR(
-    $sgpr0 = IMPLICIT_DEF
-    S_NOP 0
-    S_NOP 0, implicit undef $sgpr0
-    $sgpr0 = IMPLICIT_DEF implicit $sgpr0(tied-def 0)
-)MIR", [](MachineFunction &MF, LiveIntervals &LIS) {
-    testHandleMove(MF, LIS, 3, 1);
-  });
-}
-
-TEST(LiveIntervalTest, SubRegMoveDown) {
-  // Subregister ranges can have holes inside a basic block. Check for a
-  // movement of the form 32->150 in a liverange [16, 32) [100,200).
-  liveIntervalTest(R"MIR(
-    successors: %bb.1, %bb.2
-    %0 = IMPLICIT_DEF
-    S_CBRANCH_VCCNZ %bb.2, implicit undef $vcc
-    S_BRANCH %bb.1
-  bb.2:
-    successors: %bb.1
-    S_NOP 0, implicit %0.sub0
-    S_NOP 0, implicit %0.sub1
-    S_NOP 0
-    undef %0.sub0 = IMPLICIT_DEF
-    %0.sub1 = IMPLICIT_DEF
-  bb.1:
-    S_NOP 0, implicit %0
-)MIR", [](MachineFunction &MF, LiveIntervals &LIS) {
-    // Scheduler behaviour: Clear def,read-undef flag and move.
-    MachineInstr &MI = getMI(MF, 3, /*BlockNum=*/1);
-    MI.getOperand(0).setIsUndef(false);
-    testHandleMove(MF, LIS, 1, 4, /*BlockNum=*/1);
-  });
-}
-
-TEST(LiveIntervalTest, SubRegMoveUp) {
-  // handleMoveUp had a bug not updating valno of segment incoming to bb.2
-  // after swapping subreg definitions.
-  liveIntervalTest(R"MIR(
-    successors: %bb.1, %bb.2
-    undef %0.sub0 = IMPLICIT_DEF
-    %0.sub1 = IMPLICIT_DEF
-    S_CBRANCH_VCCNZ %bb.2, implicit undef $vcc
-    S_BRANCH %bb.1
-  bb.1:
-    S_NOP 0, implicit %0.sub1
-  bb.2:
-    S_NOP 0, implicit %0.sub1
-)MIR", [](MachineFunction &MF, LiveIntervals &LIS) {
-    testHandleMove(MF, LIS, 1, 0);
-  });
-}
-
-TEST(LiveIntervalTest, DeadSubRegMoveUp) {
-  // handleMoveUp had a bug where moving a dead subreg def into the middle of
-  // an earlier segment resulted in an invalid live range.
-  liveIntervalTest(R"MIR(
-    undef %125.sub0:vreg_128 = V_MOV_B32_e32 0, implicit $exec
-    %125.sub1:vreg_128 = COPY %125.sub0
-    %125.sub2:vreg_128 = COPY %125.sub0
-    undef %51.sub0:vreg_128 = V_MOV_B32_e32 898625526, implicit $exec
-    %51.sub1:vreg_128 = COPY %51.sub0
-    %51.sub2:vreg_128 = COPY %51.sub0
-    %52:vgpr_32 = V_MOV_B32_e32 986714345, implicit $exec
-    %54:vgpr_32 = V_MOV_B32_e32 1742342378, implicit $exec
-    %57:vgpr_32 = V_MOV_B32_e32 3168768712, implicit $exec
-    %59:vgpr_32 = V_MOV_B32_e32 1039972644, implicit $exec
-    %60:vgpr_32 = nofpexcept V_MAD_F32_e64 0, %52, 0, undef %61:vgpr_32, 0, %59, 0, 0, implicit $mode, implicit $exec
-    %63:vgpr_32 = nofpexcept V_ADD_F32_e32 %51.sub3, undef %64:vgpr_32, implicit $mode, implicit $exec
-    dead %66:vgpr_32 = nofpexcept V_MAD_F32_e64 0, %60, 0, undef %67:vgpr_32, 0, %125.sub2, 0, 0, implicit $mode, implicit $exec
-    undef %124.sub1:vreg_128 = nofpexcept V_MAD_F32_e64 0, %57, 0, undef %70:vgpr_32, 0, %125.sub1, 0, 0, implicit $mode, implicit $exec
-    %124.sub0:vreg_128 = nofpexcept V_MAD_F32_e64 0, %54, 0, undef %73:vgpr_32, 0, %125.sub0, 0, 0, implicit $mode, implicit $exec
-    dead undef %125.sub3:vreg_128 = nofpexcept V_MAC_F32_e32 %63, undef %76:vgpr_32, %125.sub3, implicit $mode, implicit $exec
-)MIR", [](MachineFunction &MF, LiveIntervals &LIS) {
-    testHandleMove(MF, LIS, 15, 12);
-  });
-}
-
-TEST(LiveIntervalTest, EarlyClobberSubRegMoveUp) {
-  // handleMoveUp had a bug where moving an early-clobber subreg def into the
-  // middle of an earlier segment resulted in an invalid live range.
-  liveIntervalTest(R"MIR(
-    %4:sreg_32 = IMPLICIT_DEF
-    %6:sreg_32 = IMPLICIT_DEF
-    undef early-clobber %9.sub0:sreg_64 = STRICT_WWM %4:sreg_32, implicit $exec
-    %5:sreg_32 = S_FLBIT_I32_B32 %9.sub0:sreg_64
-    early-clobber %9.sub1:sreg_64 = STRICT_WWM %6:sreg_32, implicit $exec
-    %7:sreg_32 = S_FLBIT_I32_B32 %9.sub1:sreg_64
-)MIR", [](MachineFunction &MF, LiveIntervals &LIS) {
-    testHandleMove(MF, LIS, 4, 3);
-  });
-}
-
-TEST(LiveIntervalTest, TestMoveSubRegDefAcrossUseDef) {
-  liveIntervalTest(R"MIR(
-    %1:vreg_64 = IMPLICIT_DEF
-
-  bb.1:
-    %2:vgpr_32 = V_MOV_B32_e32 2, implicit $exec
-    %3:vgpr_32 = V_ADD_U32_e32 %2, %1.sub0, implicit $exec
-    undef %1.sub0:vreg_64 = V_ADD_U32_e32 %2, %2, implicit $exec
-    %1.sub1:vreg_64 = COPY %2
-    S_NOP 0, implicit %1.sub1
-    S_BRANCH %bb.1
-
-)MIR", [](MachineFunction &MF, LiveIntervals &LIS) {
-     MachineInstr &UndefSubregDef = getMI(MF, 2, 1);
-     // The scheduler clears undef from subregister defs before moving
-     UndefSubregDef.getOperand(0).setIsUndef(false);
-     testHandleMove(MF, LIS, 3, 1, 1);
-  });
-}
-
-TEST(LiveIntervalTest, TestMoveSubRegDefAcrossUseDefMulti) {
-  liveIntervalTest(R"MIR(
-    %1:vreg_96 = IMPLICIT_DEF
-
-  bb.1:
-    %2:vgpr_32 = V_MOV_B32_e32 2, implicit $exec
-    %3:vgpr_32 = V_ADD_U32_e32 %2, %1.sub0, implicit $exec
-    undef %1.sub0:vreg_96 = V_ADD_U32_e32 %2, %2, implicit $exec
-    %1.sub1:vreg_96 = COPY %2
-    %1.sub2:vreg_96 = COPY %2
-    S_NOP 0, implicit %1.sub1, implicit %1.sub2
-    S_BRANCH %bb.1
-
-)MIR", [](MachineFunction &MF, LiveIntervals &LIS) {
-     MachineInstr &UndefSubregDef = getMI(MF, 2, 1);
-     // The scheduler clears undef from subregister defs before moving
-     UndefSubregDef.getOperand(0).setIsUndef(false);
-     testHandleMove(MF, LIS, 4, 1, 1);
-  });
-}
-
-TEST(LiveIntervalTest, TestMoveSubRegUseAcrossMainRangeHole) {
-  liveIntervalTest(R"MIR(
-    %1:sgpr_128 = IMPLICIT_DEF
-  bb.1:
-    %2:sgpr_32 = COPY %1.sub2
-    %3:sgpr_32 = COPY %1.sub1
-    %1.sub2 = COPY %2
-    undef %1.sub0 = IMPLICIT_DEF
-    %1.sub2 = IMPLICIT_DEF
-    S_CBRANCH_SCC1 %bb.1, implicit undef $scc
-    S_BRANCH %bb.2
-  bb.2:
-)MIR", [](MachineFunction &MF, LiveIntervals &LIS) {
-    MachineInstr &MI = getMI(MF, 3, /*BlockNum=*/1);
-    MI.getOperand(0).setIsUndef(false);
-    testHandleMove(MF, LIS, 4, 3, 1);
-    testHandleMove(MF, LIS, 1, 4, 1);
-  });
-}
-
-TEST(LiveIntervalTest, BundleUse) {
-  liveIntervalTest(R"MIR(
-    %0 = IMPLICIT_DEF
-    S_NOP 0
-    S_NOP 0, implicit %0
-    S_NOP 0
-)MIR", [](MachineFunction &MF, LiveIntervals &LIS) {
-    testHandleMoveIntoNewBundle(MF, LIS, 1, 2);
-  });
-}
-
-TEST(LiveIntervalTest, BundleDef) {
-  liveIntervalTest(R"MIR(
-    %0 = IMPLICIT_DEF
-    S_NOP 0
-    S_NOP 0, implicit %0
-    S_NOP 0
-)MIR", [](MachineFunction &MF, LiveIntervals &LIS) {
-    testHandleMoveIntoNewBundle(MF, LIS, 0, 1);
-  });
-}
-
-TEST(LiveIntervalTest, BundleRedef) {
-  liveIntervalTest(R"MIR(
-    %0 = IMPLICIT_DEF
-    S_NOP 0
-    %0 = IMPLICIT_DEF implicit %0(tied-def 0)
-    S_NOP 0, implicit %0
-)MIR", [](MachineFunction &MF, LiveIntervals &LIS) {
-    testHandleMoveIntoNewBundle(MF, LIS, 1, 2);
-  });
-}
-
-TEST(LiveIntervalTest, BundleInternalUse) {
-  liveIntervalTest(R"MIR(
-    %0 = IMPLICIT_DEF
-    S_NOP 0
-    S_NOP 0, implicit %0
-    S_NOP 0
-)MIR", [](MachineFunction &MF, LiveIntervals &LIS) {
-    testHandleMoveIntoNewBundle(MF, LIS, 0, 2);
-  });
-}
-
-TEST(LiveIntervalTest, BundleUndefUse) {
-  liveIntervalTest(R"MIR(
-    %0 = IMPLICIT_DEF
-    S_NOP 0
-    S_NOP 0, implicit undef %0
-    S_NOP 0
-)MIR", [](MachineFunction &MF, LiveIntervals &LIS) {
-    testHandleMoveIntoNewBundle(MF, LIS, 1, 2);
-  });
-}
-
-TEST(LiveIntervalTest, BundleSubRegUse) {
-  liveIntervalTest(R"MIR(
-    successors: %bb.1, %bb.2
-    undef %0.sub0 = IMPLICIT_DEF
-    %0.sub1 = IMPLICIT_DEF
-    S_CBRANCH_VCCNZ %bb.2, implicit undef $vcc
-    S_BRANCH %bb.1
-  bb.1:
-    S_NOP 0
-    S_NOP 0, implicit %0.sub1
-  bb.2:
-    S_NOP 0, implicit %0.sub1
-)MIR", [](MachineFunction &MF, LiveIntervals &LIS) {
-    testHandleMoveIntoNewBundle(MF, LIS, 0, 1, 1);
-  });
-}
-
-TEST(LiveIntervalTest, BundleSubRegDef) {
-  liveIntervalTest(R"MIR(
-    successors: %bb.1, %bb.2
-    undef %0.sub0 = IMPLICIT_DEF
-    %0.sub1 = IMPLICIT_DEF
-    S_CBRANCH_VCCNZ %bb.2, implicit undef $vcc
-    S_BRANCH %bb.1
-  bb.1:
-    S_NOP 0
-    S_NOP 0, implicit %0.sub1
-  bb.2:
-    S_NOP 0, implicit %0.sub1
-)MIR", [](MachineFunction &MF, LiveIntervals &LIS) {
-    testHandleMoveIntoNewBundle(MF, LIS, 0, 1, 0);
-  });
-}
-
-TEST(LiveIntervalTest, SplitAtOneInstruction) {
-  liveIntervalTest(R"MIR(
-    successors: %bb.1
-    %0 = IMPLICIT_DEF
-    S_BRANCH %bb.1
-  bb.1:
-    S_NOP 0
-)MIR", [](MachineFunction &MF, LiveIntervals &LIS) {
-    testSplitAt(MF, LIS, 1, 0);
-  });
-}
-
-TEST(LiveIntervalTest, SplitAtMultiInstruction) {
-  liveIntervalTest(R"MIR(
-    successors: %bb.1
-    %0 = IMPLICIT_DEF
-    S_NOP 0
-    S_NOP 0
-    S_NOP 0
-    S_NOP 0
-    S_BRANCH %bb.1
-  bb.1:
-    S_NOP 0
-)MIR", [](MachineFunction &MF, LiveIntervals &LIS) {
-    testSplitAt(MF, LIS, 0, 0);
-  });
-}
-
-int main(int argc, char **argv) {
-  ::testing::InitGoogleTest(&argc, argv);
-  initLLVM();
-  return RUN_ALL_TESTS();
-}
diff --git a/gnu/llvm/llvm/unittests/MIR/CMakeLists.txt b/gnu/llvm/llvm/unittests/MIR/CMakeLists.txt
deleted file mode 100644
index 024317acba3..00000000000
--- a/gnu/llvm/llvm/unittests/MIR/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
-  CodeGen
-  Core
-  FileCheck
-  MC
-  MIRParser
-  Support
-  Target
-  )
-
-add_llvm_unittest(MIRTests
-  MachineMetadata.cpp
-  )
-
-target_link_libraries(MIRTests PRIVATE LLVMTestingSupport)
diff --git a/gnu/llvm/llvm/unittests/MIR/MachineMetadata.cpp b/gnu/llvm/llvm/unittests/MIR/MachineMetadata.cpp
deleted file mode 100644
index 9c1ac9bb879..00000000000
--- a/gnu/llvm/llvm/unittests/MIR/MachineMetadata.cpp
+++ /dev/null
@@ -1,481 +0,0 @@
-//===- MachineInstrBundleIteratorTest.cpp ---------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/CodeGen/MIRParser/MIRParser.h"
-#include "llvm/CodeGen/MIRPrinter.h"
-#include "llvm/CodeGen/MachineFunction.h"
-#include "llvm/CodeGen/MachineMemOperand.h"
-#include "llvm/CodeGen/MachineModuleInfo.h"
-#include "llvm/CodeGen/MachineModuleSlotTracker.h"
-#include "llvm/CodeGen/MachineOperand.h"
-#include "llvm/CodeGen/TargetFrameLowering.h"
-#include "llvm/CodeGen/TargetInstrInfo.h"
-#include "llvm/CodeGen/TargetLowering.h"
-#include "llvm/CodeGen/TargetSubtargetInfo.h"
-#include "llvm/FileCheck/FileCheck.h"
-#include "llvm/IR/MDBuilder.h"
-#include "llvm/IR/ModuleSlotTracker.h"
-#include "llvm/MC/MCAsmInfo.h"
-#include "llvm/Support/SourceMgr.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "llvm/Target/TargetMachine.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-class MachineMetadataTest : public testing::Test {
-public:
-  MachineMetadataTest() {}
-
-protected:
-  LLVMContext Context;
-  std::unique_ptr<Module> M;
-  std::unique_ptr<MIRParser> MIR;
-
-  static void SetUpTestCase() {
-    InitializeAllTargetInfos();
-    InitializeAllTargets();
-    InitializeAllTargetMCs();
-  }
-
-  void SetUp() override { M = std::make_unique<Module>("Dummy", Context); }
-
-  void addHooks(ModuleSlotTracker &MST, const MachineOperand &MO) {
-    // Setup hooks to assign slot numbers for the specified machine metadata.
-    MST.setProcessHook([&MO](AbstractSlotTrackerStorage *AST, const Module *M,
-                             bool ShouldInitializeAllMetadata) {
-      if (ShouldInitializeAllMetadata) {
-        if (MO.isMetadata())
-          AST->createMetadataSlot(MO.getMetadata());
-      }
-    });
-    MST.setProcessHook([&MO](AbstractSlotTrackerStorage *AST, const Function *F,
-                             bool ShouldInitializeAllMetadata) {
-      if (!ShouldInitializeAllMetadata) {
-        if (MO.isMetadata())
-          AST->createMetadataSlot(MO.getMetadata());
-      }
-    });
-  }
-
-  std::unique_ptr<LLVMTargetMachine>
-  createTargetMachine(std::string TT, StringRef CPU, StringRef FS) {
-    std::string Error;
-    const Target *T = TargetRegistry::lookupTarget(TT, Error);
-    if (!T)
-      return nullptr;
-    TargetOptions Options;
-    return std::unique_ptr<LLVMTargetMachine>(static_cast<LLVMTargetMachine *>(
-        T->createTargetMachine(TT, CPU, FS, Options, None, None)));
-  }
-
-  std::unique_ptr<Module> parseMIR(const TargetMachine &TM, StringRef MIRCode,
-                                   const char *FnName, MachineModuleInfo &MMI) {
-    SMDiagnostic Diagnostic;
-    std::unique_ptr<MemoryBuffer> MBuffer = MemoryBuffer::getMemBuffer(MIRCode);
-    MIR = createMIRParser(std::move(MBuffer), Context);
-    if (!MIR)
-      return nullptr;
-
-    std::unique_ptr<Module> Mod = MIR->parseIRModule();
-    if (!Mod)
-      return nullptr;
-
-    Mod->setDataLayout(TM.createDataLayout());
-
-    if (MIR->parseMachineFunctions(*Mod, MMI)) {
-      M.reset();
-      return nullptr;
-    }
-
-    return Mod;
-  }
-};
-
-// Helper to dump the printer output into a string.
-static std::string print(std::function<void(raw_ostream &OS)> PrintFn) {
-  std::string Str;
-  raw_string_ostream OS(Str);
-  PrintFn(OS);
-  OS.flush();
-  return Str;
-}
-
-TEST_F(MachineMetadataTest, TrivialHook) {
-  // Verify that post-process hook is invoked to assign slot numbers for
-  // machine metadata.
-  ASSERT_TRUE(M);
-
-  // Create a MachineOperand with a metadata and print it.
-  Metadata *MDS = MDString::get(Context, "foo");
-  MDNode *Node = MDNode::get(Context, MDS);
-  MachineOperand MO = MachineOperand::CreateMetadata(Node);
-
-  // Checking some preconditions on the newly created
-  // MachineOperand.
-  ASSERT_TRUE(MO.isMetadata());
-  ASSERT_EQ(MO.getMetadata(), Node);
-
-  ModuleSlotTracker MST(M.get());
-  addHooks(MST, MO);
-
-  // Print a MachineOperand containing a metadata node.
-  EXPECT_EQ("!0", print([&](raw_ostream &OS) {
-              MO.print(OS, MST, LLT{}, /*OpIdx*/ ~0U, /*PrintDef=*/false,
-                       /*IsStandalone=*/false,
-                       /*ShouldPrintRegisterTies=*/false, /*TiedOperandIdx=*/0,
-                       /*TRI=*/nullptr,
-                       /*IntrinsicInfo=*/nullptr);
-            }));
-  // Print the definition of that metadata node.
-  EXPECT_EQ("!0 = !{!\"foo\"}",
-            print([&](raw_ostream &OS) { Node->print(OS, MST); }));
-}
-
-TEST_F(MachineMetadataTest, BasicHook) {
-  // Verify that post-process hook is invoked to assign slot numbers for
-  // machine metadata. When both LLVM IR and machine IR contain metadata,
-  // ensure that machine metadata is always assigned after LLVM IR.
-  ASSERT_TRUE(M);
-
-  // Create a MachineOperand with a metadata and print it.
-  Metadata *MachineMDS = MDString::get(Context, "foo");
-  MDNode *MachineNode = MDNode::get(Context, MachineMDS);
-  MachineOperand MO = MachineOperand::CreateMetadata(MachineNode);
-
-  // Checking some preconditions on the newly created
-  // MachineOperand.
-  ASSERT_TRUE(MO.isMetadata());
-  ASSERT_EQ(MO.getMetadata(), MachineNode);
-
-  // Create metadata in LLVM IR.
-  NamedMDNode *MD = M->getOrInsertNamedMetadata("namedmd");
-  Metadata *MDS = MDString::get(Context, "bar");
-  MDNode *Node = MDNode::get(Context, MDS);
-  MD->addOperand(Node);
-
-  ModuleSlotTracker MST(M.get());
-  addHooks(MST, MO);
-
-  // Print a MachineOperand containing a metadata node.
-  EXPECT_EQ("!1", print([&](raw_ostream &OS) {
-              MO.print(OS, MST, LLT{}, /*OpIdx*/ ~0U, /*PrintDef=*/false,
-                       /*IsStandalone=*/false,
-                       /*ShouldPrintRegisterTies=*/false, /*TiedOperandIdx=*/0,
-                       /*TRI=*/nullptr,
-                       /*IntrinsicInfo=*/nullptr);
-            }));
-  // Print the definition of these unnamed metadata nodes.
-  EXPECT_EQ("!0 = !{!\"bar\"}",
-            print([&](raw_ostream &OS) { Node->print(OS, MST); }));
-  EXPECT_EQ("!1 = !{!\"foo\"}",
-            print([&](raw_ostream &OS) { MachineNode->print(OS, MST); }));
-}
-
-static bool checkOutput(std::string CheckString, std::string Output) {
-  auto CheckBuffer = MemoryBuffer::getMemBuffer(CheckString, "");
-  auto OutputBuffer = MemoryBuffer::getMemBuffer(Output, "Output", false);
-
-  SmallString<4096> CheckFileBuffer;
-  FileCheckRequest Req;
-  FileCheck FC(Req);
-  StringRef CheckFileText =
-      FC.CanonicalizeFile(*CheckBuffer.get(), CheckFileBuffer);
-
-  SourceMgr SM;
-  SM.AddNewSourceBuffer(MemoryBuffer::getMemBuffer(CheckFileText, "CheckFile"),
-                        SMLoc());
-  Regex PrefixRE = FC.buildCheckPrefixRegex();
-  if (FC.readCheckFile(SM, CheckFileText, PrefixRE))
-    return false;
-
-  auto OutBuffer = OutputBuffer->getBuffer();
-  SM.AddNewSourceBuffer(std::move(OutputBuffer), SMLoc());
-  return FC.checkInput(SM, OutBuffer);
-}
-
-TEST_F(MachineMetadataTest, MMSlotTrackerAArch64) {
-  auto TM = createTargetMachine(Triple::normalize("aarch64--"), "", "");
-  if (!TM)
-    GTEST_SKIP();
-
-  StringRef MIRString = R"MIR(
---- |
-  define i32 @test0(i32* %p) {
-    %r = load i32, i32* %p, align 4
-    ret i32 %r
-  }
-...
----
-name:            test0
-liveins:
-  - { reg: '$x0', virtual-reg: '%0' }
-body:             |
-  bb.0 (%ir-block.0):
-    liveins: $x0
-
-  %0:gpr64common = COPY $x0
-  %1:gpr32 = LDRWui %0, 0 :: (load (s32) from %ir.p)
-...
-)MIR";
-
-  MachineModuleInfo MMI(TM.get());
-  M = parseMIR(*TM, MIRString, "test0", MMI);
-  ASSERT_TRUE(M);
-
-  auto *MF = MMI.getMachineFunction(*M->getFunction("test0"));
-  auto *MBB = MF->getBlockNumbered(0);
-
-  auto &MI = MBB->back();
-  ASSERT_TRUE(MI.hasOneMemOperand());
-
-  // Create and attached scoped AA metadata on that instruction with one MMO.
-  MDBuilder MDB(Context);
-  MDNode *Domain = MDB.createAnonymousAliasScopeDomain("domain");
-  MDNode *Scope0 = MDB.createAnonymousAliasScope(Domain, "scope0");
-  MDNode *Scope1 = MDB.createAnonymousAliasScope(Domain, "scope1");
-  MDNode *Set0 = MDNode::get(Context, {Scope0});
-  MDNode *Set1 = MDNode::get(Context, {Scope1});
-
-  AAMDNodes AAInfo;
-  AAInfo.TBAA = AAInfo.TBAAStruct = nullptr;
-  AAInfo.Scope = Set0;
-  AAInfo.NoAlias = Set1;
-
-  auto *OldMMO = MI.memoperands().front();
-  auto *NewMMO = MF->getMachineMemOperand(OldMMO, AAInfo);
-  MI.setMemRefs(*MF, NewMMO);
-
-  MachineModuleSlotTracker MST(MF);
-  // Print that MI with new machine metadata, which slot numbers should be
-  // assigned.
-  EXPECT_EQ("%1:gpr32 = LDRWui %0, 0 :: (load (s32) from %ir.p, "
-            "!alias.scope !0, !noalias !3)",
-            print([&](raw_ostream &OS) {
-              MI.print(OS, MST, /*IsStandalone=*/false, /*SkipOpers=*/false,
-                       /*SkipDebugLoc=*/false, /*AddNewLine=*/false);
-            }));
-
-  std::vector<const MDNode *> Generated{Domain, Scope0, Scope1, Set0, Set1};
-  // Examine machine metadata collected. They should match ones
-  // afore-generated.
-  std::vector<const MDNode *> Collected;
-  MachineModuleSlotTracker::MachineMDNodeListType MDList;
-  MST.collectMachineMDNodes(MDList);
-  for (auto &MD : MDList)
-    Collected.push_back(MD.second);
-
-  std::sort(Generated.begin(), Generated.end());
-  std::sort(Collected.begin(), Collected.end());
-  EXPECT_EQ(Collected, Generated);
-
-  // FileCheck the output from MIR printer.
-  std::string Output = print([&](raw_ostream &OS) { printMIR(OS, *MF); });
-  std::string CheckString = R"(
-CHECK: machineMetadataNodes:
-CHECK-DAG: ![[MMDOMAIN:[0-9]+]] = distinct !{!{{[0-9]+}}, !"domain"}
-CHECK-DAG: ![[MMSCOPE0:[0-9]+]] = distinct !{!{{[0-9]+}}, ![[MMDOMAIN]], !"scope0"}
-CHECK-DAG: ![[MMSCOPE1:[0-9]+]] = distinct !{!{{[0-9]+}}, ![[MMDOMAIN]], !"scope1"}
-CHECK-DAG: ![[MMSET0:[0-9]+]] = !{![[MMSCOPE0]]}
-CHECK-DAG: ![[MMSET1:[0-9]+]] = !{![[MMSCOPE1]]}
-CHECK: body:
-CHECK: %1:gpr32 = LDRWui %0, 0 :: (load (s32) from %ir.p, !alias.scope ![[MMSET0]], !noalias ![[MMSET1]])
-)";
-  EXPECT_TRUE(checkOutput(CheckString, Output));
-}
-
-TEST_F(MachineMetadataTest, MMSlotTrackerX64) {
-  auto TM = createTargetMachine(Triple::normalize("x86_64--"), "", "");
-  if (!TM)
-    GTEST_SKIP();
-
-  StringRef MIRString = R"MIR(
---- |
-  define i32 @test0(i32* %p) {
-    %r = load i32, i32* %p, align 4
-    ret i32 %r
-  }
-...
----
-name:            test0
-liveins:
-  - { reg: '$rdi', virtual-reg: '%0' }
-body:             |
-  bb.0 (%ir-block.0):
-    liveins: $rdi
-
-  %0:gr64 = COPY $rdi
-  %1:gr32 = MOV32rm %0, 1, $noreg, 0, $noreg :: (load (s32) from %ir.p)
-...
-)MIR";
-
-  MachineModuleInfo MMI(TM.get());
-  M = parseMIR(*TM, MIRString, "test0", MMI);
-  ASSERT_TRUE(M);
-
-  auto *MF = MMI.getMachineFunction(*M->getFunction("test0"));
-  auto *MBB = MF->getBlockNumbered(0);
-
-  auto &MI = MBB->back();
-  ASSERT_FALSE(MI.memoperands_empty());
-  ASSERT_TRUE(MI.hasOneMemOperand());
-
-  // Create and attached scoped AA metadata on that instruction with one MMO.
-  MDBuilder MDB(Context);
-  MDNode *Domain = MDB.createAnonymousAliasScopeDomain("domain");
-  MDNode *Scope0 = MDB.createAnonymousAliasScope(Domain, "scope0");
-  MDNode *Scope1 = MDB.createAnonymousAliasScope(Domain, "scope1");
-  MDNode *Set0 = MDNode::get(Context, {Scope0});
-  MDNode *Set1 = MDNode::get(Context, {Scope1});
-
-  AAMDNodes AAInfo;
-  AAInfo.TBAA = AAInfo.TBAAStruct = nullptr;
-  AAInfo.Scope = Set0;
-  AAInfo.NoAlias = Set1;
-
-  auto *OldMMO = MI.memoperands().front();
-  auto *NewMMO = MF->getMachineMemOperand(OldMMO, AAInfo);
-  MI.setMemRefs(*MF, NewMMO);
-
-  MachineModuleSlotTracker MST(MF);
-  // Print that MI with new machine metadata, which slot numbers should be
-  // assigned.
-  EXPECT_EQ("%1:gr32 = MOV32rm %0, 1, $noreg, 0, $noreg :: (load (s32) from %ir.p, "
-            "!alias.scope !0, !noalias !3)",
-            print([&](raw_ostream &OS) {
-              MI.print(OS, MST, /*IsStandalone=*/false, /*SkipOpers=*/false,
-                       /*SkipDebugLoc=*/false, /*AddNewLine=*/false);
-            }));
-
-  std::vector<const MDNode *> Generated{Domain, Scope0, Scope1, Set0, Set1};
-  // Examine machine metadata collected. They should match ones
-  // afore-generated.
-  std::vector<const MDNode *> Collected;
-  MachineModuleSlotTracker::MachineMDNodeListType MDList;
-  MST.collectMachineMDNodes(MDList);
-  for (auto &MD : MDList)
-    Collected.push_back(MD.second);
-
-  std::sort(Generated.begin(), Generated.end());
-  std::sort(Collected.begin(), Collected.end());
-  EXPECT_EQ(Collected, Generated);
-
-  // FileCheck the output from MIR printer.
-  std::string Output = print([&](raw_ostream &OS) { printMIR(OS, *MF); });
-  std::string CheckString = R"(
-CHECK: machineMetadataNodes:
-CHECK-DAG: ![[MMDOMAIN:[0-9]+]] = distinct !{!{{[0-9]+}}, !"domain"}
-CHECK-DAG: ![[MMSCOPE0:[0-9]+]] = distinct !{!{{[0-9]+}}, ![[MMDOMAIN]], !"scope0"}
-CHECK-DAG: ![[MMSCOPE1:[0-9]+]] = distinct !{!{{[0-9]+}}, ![[MMDOMAIN]], !"scope1"}
-CHECK-DAG: ![[MMSET0:[0-9]+]] = !{![[MMSCOPE0]]}
-CHECK-DAG: ![[MMSET1:[0-9]+]] = !{![[MMSCOPE1]]}
-CHECK: body:
-CHECK: %1:gr32 = MOV32rm %0, 1, $noreg, 0, $noreg :: (load (s32) from %ir.p, !alias.scope ![[MMSET0]], !noalias ![[MMSET1]])
-)";
-  EXPECT_TRUE(checkOutput(CheckString, Output));
-}
-
-TEST_F(MachineMetadataTest, MMSlotTrackerAMDGPU) {
-  auto TM = createTargetMachine(Triple::normalize("amdgcn-amd-amdhsa"),
-                                "gfx1010", "");
-  if (!TM)
-    GTEST_SKIP();
-
-  StringRef MIRString = R"MIR(
---- |
-  define i32 @test0(i32* %p) {
-    %r = load i32, i32* %p, align 4
-    ret i32 %r
-  }
-...
----
-name:            test0
-liveins:
-  - { reg: '$vgpr0', virtual-reg: '%0' }
-  - { reg: '$vgpr1', virtual-reg: '%1' }
-  - { reg: '$sgpr30_sgpr31', virtual-reg: '%2' }
-body:             |
-  bb.0 (%ir-block.0):
-    liveins: $vgpr0, $vgpr1, $sgpr30_sgpr31
-
-    %2:sreg_64 = COPY $sgpr30_sgpr31
-    %1:vgpr_32 = COPY $vgpr1
-    %0:vgpr_32 = COPY $vgpr0
-    %8:vreg_64 = REG_SEQUENCE %0, %subreg.sub0, %1, %subreg.sub1
-    %6:vreg_64 = COPY %8
-    %5:vgpr_32 = FLAT_LOAD_DWORD killed %6, 0, 0, implicit $exec, implicit $flat_scr :: (load (s32) from %ir.p)
-...
-)MIR";
-
-  MachineModuleInfo MMI(TM.get());
-  M = parseMIR(*TM, MIRString, "test0", MMI);
-  ASSERT_TRUE(M);
-
-  auto *MF = MMI.getMachineFunction(*M->getFunction("test0"));
-  auto *MBB = MF->getBlockNumbered(0);
-
-  auto &MI = MBB->back();
-  ASSERT_FALSE(MI.memoperands_empty());
-  ASSERT_TRUE(MI.hasOneMemOperand());
-
-  // Create and attached scoped AA metadata on that instruction with one MMO.
-  MDBuilder MDB(Context);
-  MDNode *Domain = MDB.createAnonymousAliasScopeDomain("domain");
-  MDNode *Scope0 = MDB.createAnonymousAliasScope(Domain, "scope0");
-  MDNode *Scope1 = MDB.createAnonymousAliasScope(Domain, "scope1");
-  MDNode *Set0 = MDNode::get(Context, {Scope0});
-  MDNode *Set1 = MDNode::get(Context, {Scope1});
-
-  AAMDNodes AAInfo;
-  AAInfo.TBAA = AAInfo.TBAAStruct = nullptr;
-  AAInfo.Scope = Set0;
-  AAInfo.NoAlias = Set1;
-
-  auto *OldMMO = MI.memoperands().front();
-  auto *NewMMO = MF->getMachineMemOperand(OldMMO, AAInfo);
-  MI.setMemRefs(*MF, NewMMO);
-
-  MachineModuleSlotTracker MST(MF);
-  // Print that MI with new machine metadata, which slot numbers should be
-  // assigned.
-  EXPECT_EQ(
-      "%5:vgpr_32 = FLAT_LOAD_DWORD killed %4, 0, 0, implicit $exec, implicit "
-      "$flat_scr :: (load (s32) from %ir.p, !alias.scope !0, !noalias !3)",
-      print([&](raw_ostream &OS) {
-        MI.print(OS, MST, /*IsStandalone=*/false, /*SkipOpers=*/false,
-                 /*SkipDebugLoc=*/false, /*AddNewLine=*/false);
-      }));
-
-  std::vector<const MDNode *> Generated{Domain, Scope0, Scope1, Set0, Set1};
-  // Examine machine metadata collected. They should match ones
-  // afore-generated.
-  std::vector<const MDNode *> Collected;
-  MachineModuleSlotTracker::MachineMDNodeListType MDList;
-  MST.collectMachineMDNodes(MDList);
-  for (auto &MD : MDList)
-    Collected.push_back(MD.second);
-
-  std::sort(Generated.begin(), Generated.end());
-  std::sort(Collected.begin(), Collected.end());
-  EXPECT_EQ(Collected, Generated);
-
-  // FileCheck the output from MIR printer.
-  std::string Output = print([&](raw_ostream &OS) { printMIR(OS, *MF); });
-  std::string CheckString = R"(
-CHECK: machineMetadataNodes:
-CHECK-DAG: ![[MMDOMAIN:[0-9]+]] = distinct !{!{{[0-9]+}}, !"domain"}
-CHECK-DAG: ![[MMSCOPE0:[0-9]+]] = distinct !{!{{[0-9]+}}, ![[MMDOMAIN]], !"scope0"}
-CHECK-DAG: ![[MMSCOPE1:[0-9]+]] = distinct !{!{{[0-9]+}}, ![[MMDOMAIN]], !"scope1"}
-CHECK-DAG: ![[MMSET0:[0-9]+]] = !{![[MMSCOPE0]]}
-CHECK-DAG: ![[MMSET1:[0-9]+]] = !{![[MMSCOPE1]]}
-CHECK: body:
-CHECK: %5:vgpr_32 = FLAT_LOAD_DWORD killed %4, 0, 0, implicit $exec, implicit $flat_scr :: (load (s32) from %ir.p, !alias.scope ![[MMSET0]], !noalias ![[MMSET1]])
-)";
-  EXPECT_TRUE(checkOutput(CheckString, Output));
-}
diff --git a/gnu/llvm/llvm/unittests/Object/ArchiveTest.cpp b/gnu/llvm/llvm/unittests/Object/ArchiveTest.cpp
deleted file mode 100644
index 467ae69a9ed..00000000000
--- a/gnu/llvm/llvm/unittests/Object/ArchiveTest.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-//===- ArchiveTest.cpp ----------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Object/Archive.h"
-#include "llvm/Testing/Support/Error.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace object;
-using namespace testing;
-
-static const char ArchiveWithMember[] = "!<arch>\n"        // Global header
-                                        "test/           " // Member name
-                                        "0           "     // Timestamp
-                                        "0     "           // Owner ID
-                                        "0     "           // Group ID
-                                        "0       "         // File mode
-                                        "9999999999"       // Size
-                                        "`\n";
-
-static const char ThinArchiveWithMember[] = "!<thin>\n"        // Global header
-                                            "test/           " // Member name
-                                            "0           "     // Timestamp
-                                            "0     "           // Owner ID
-                                            "0     "           // Group ID
-                                            "0       "         // File mode
-                                            "9999999999"       // Size
-                                            "`\n";
-
-static const uint64_t MemberSize = 9999999999ull;
-
-struct ArchiveTestsFixture : Test {
-  Expected<Archive::child_iterator> createChild(StringRef Src) {
-    MemoryBufferRef Source(Src, "archive");
-    Expected<std::unique_ptr<Archive>> AOrErr = Archive::create(Source);
-    if (!AOrErr)
-      return AOrErr.takeError();
-    A = std::move(*AOrErr);
-
-    Error ChildErr = Error::success();
-    auto Child = A->child_begin(ChildErr);
-    if (ChildErr)
-      return std::move(ChildErr);
-    return Child;
-  }
-
-  std::unique_ptr<Archive> A;
-};
-
-TEST_F(ArchiveTestsFixture, ArchiveChildGetSizeRegularArchive) {
-  // This test relies on a StringRef being able to hold the appropriate amount
-  // of data.
-  if (std::numeric_limits<StringRef::size_type>::max() < MemberSize)
-    return;
-
-  auto Child = createChild(ArchiveWithMember);
-  ASSERT_THAT_EXPECTED(Child, Succeeded());
-
-  Expected<uint64_t> Size = (*Child)->getSize();
-  ASSERT_THAT_EXPECTED(Size, Succeeded());
-  EXPECT_EQ(MemberSize, *Size);
-}
-
-TEST_F(ArchiveTestsFixture, ArchiveChildGetSizeThinArchive) {
-  auto Child = createChild(ThinArchiveWithMember);
-  ASSERT_THAT_EXPECTED(Child, Succeeded());
-
-  Expected<uint64_t> Size = (*Child)->getSize();
-  ASSERT_THAT_EXPECTED(Size, Succeeded());
-  EXPECT_EQ(MemberSize, *Size);
-}
-
-TEST_F(ArchiveTestsFixture, ArchiveChildGetBuffer) {
-  // This test relies on a StringRef being able to hold the appropriate amount
-  // of data.
-  if (std::numeric_limits<StringRef::size_type>::max() < MemberSize)
-    return;
-
-  auto Child = createChild(ArchiveWithMember);
-  ASSERT_THAT_EXPECTED(Child, Succeeded());
-
-  Expected<StringRef> Buffer = (*Child)->getBuffer();
-  // Cannot use ASSERT_THAT_EXPECTED, as that will attempt to print the
-  // StringRef (which has an invalid size).
-  ASSERT_TRUE((bool)Buffer);
-  EXPECT_EQ(MemberSize, Buffer->size());
-  EXPECT_EQ(ArchiveWithMember + sizeof(ArchiveWithMember) - 1, Buffer->data());
-}
diff --git a/gnu/llvm/llvm/unittests/Object/CMakeLists.txt b/gnu/llvm/llvm/unittests/Object/CMakeLists.txt
deleted file mode 100644
index 559d02ea0ae..00000000000
--- a/gnu/llvm/llvm/unittests/Object/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  BinaryFormat
-  Object
-  ObjectYAML
-  )
-
-add_llvm_unittest(ObjectTests
-  ArchiveTest.cpp
-  ELFObjectFileTest.cpp
-  ELFTypesTest.cpp
-  ELFTest.cpp
-  MinidumpTest.cpp
-  ObjectFileTest.cpp
-  SymbolSizeTest.cpp
-  SymbolicFileTest.cpp
-  XCOFFObjectFileTest.cpp
-  )
-
-target_link_libraries(ObjectTests PRIVATE LLVMTestingSupport)
diff --git a/gnu/llvm/llvm/unittests/Object/ELFObjectFileTest.cpp b/gnu/llvm/llvm/unittests/Object/ELFObjectFileTest.cpp
deleted file mode 100644
index 246406ef6e4..00000000000
--- a/gnu/llvm/llvm/unittests/Object/ELFObjectFileTest.cpp
+++ /dev/null
@@ -1,657 +0,0 @@
-//===- ELFObjectFileTest.cpp - Tests for ELFObjectFile --------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Object/ELFObjectFile.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/ObjectYAML/yaml2obj.h"
-#include "llvm/Support/YAMLTraits.h"
-#include "llvm/Testing/Support/Error.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::object;
-
-namespace {
-
-// A struct to initialize a buffer to represent an ELF object file.
-struct DataForTest {
-  std::vector<uint8_t> Data;
-
-  template <typename T>
-  std::vector<uint8_t> makeElfData(uint8_t Class, uint8_t Encoding,
-                                   uint16_t Machine) {
-    T Ehdr{}; // Zero-initialise the header.
-    Ehdr.e_ident[ELF::EI_MAG0] = 0x7f;
-    Ehdr.e_ident[ELF::EI_MAG1] = 'E';
-    Ehdr.e_ident[ELF::EI_MAG2] = 'L';
-    Ehdr.e_ident[ELF::EI_MAG3] = 'F';
-    Ehdr.e_ident[ELF::EI_CLASS] = Class;
-    Ehdr.e_ident[ELF::EI_DATA] = Encoding;
-    Ehdr.e_ident[ELF::EI_VERSION] = 1;
-    Ehdr.e_type = ELF::ET_REL;
-    Ehdr.e_machine = Machine;
-    Ehdr.e_version = 1;
-    Ehdr.e_ehsize = sizeof(T);
-
-    bool IsLittleEndian = Encoding == ELF::ELFDATA2LSB;
-    if (sys::IsLittleEndianHost != IsLittleEndian) {
-      sys::swapByteOrder(Ehdr.e_type);
-      sys::swapByteOrder(Ehdr.e_machine);
-      sys::swapByteOrder(Ehdr.e_version);
-      sys::swapByteOrder(Ehdr.e_ehsize);
-    }
-
-    uint8_t *EhdrBytes = reinterpret_cast<uint8_t *>(&Ehdr);
-    std::vector<uint8_t> Bytes;
-    std::copy(EhdrBytes, EhdrBytes + sizeof(Ehdr), std::back_inserter(Bytes));
-    return Bytes;
-  }
-
-  DataForTest(uint8_t Class, uint8_t Encoding, uint16_t Machine) {
-    if (Class == ELF::ELFCLASS64)
-      Data = makeElfData<ELF::Elf64_Ehdr>(Class, Encoding, Machine);
-    else {
-      assert(Class == ELF::ELFCLASS32);
-      Data = makeElfData<ELF::Elf32_Ehdr>(Class, Encoding, Machine);
-    }
-  }
-};
-
-void checkFormatAndArch(const DataForTest &D, StringRef Fmt,
-                        Triple::ArchType Arch) {
-  Expected<std::unique_ptr<ObjectFile>> ELFObjOrErr =
-      object::ObjectFile::createELFObjectFile(
-          MemoryBufferRef(toStringRef(D.Data), "dummyELF"));
-  ASSERT_THAT_EXPECTED(ELFObjOrErr, Succeeded());
-
-  const ObjectFile &File = *(*ELFObjOrErr).get();
-  EXPECT_EQ(Fmt, File.getFileFormatName());
-  EXPECT_EQ(Arch, File.getArch());
-}
-
-std::array<DataForTest, 4> generateData(uint16_t Machine) {
-  return {DataForTest(ELF::ELFCLASS32, ELF::ELFDATA2LSB, Machine),
-          DataForTest(ELF::ELFCLASS32, ELF::ELFDATA2MSB, Machine),
-          DataForTest(ELF::ELFCLASS64, ELF::ELFDATA2LSB, Machine),
-          DataForTest(ELF::ELFCLASS64, ELF::ELFDATA2MSB, Machine)};
-}
-
-} // namespace
-
-TEST(ELFObjectFileTest, MachineTestForNoneOrUnused) {
-  std::array<StringRef, 4> Formats = {"elf32-unknown", "elf32-unknown",
-                                      "elf64-unknown", "elf64-unknown"};
-  size_t I = 0;
-  for (const DataForTest &D : generateData(ELF::EM_NONE))
-    checkFormatAndArch(D, Formats[I++], Triple::UnknownArch);
-
-  // Test an arbitrary unused EM_* value (255).
-  I = 0;
-  for (const DataForTest &D : generateData(255))
-    checkFormatAndArch(D, Formats[I++], Triple::UnknownArch);
-}
-
-TEST(ELFObjectFileTest, MachineTestForVE) {
-  std::array<StringRef, 4> Formats = {"elf32-unknown", "elf32-unknown",
-                                      "elf64-ve", "elf64-ve"};
-  size_t I = 0;
-  for (const DataForTest &D : generateData(ELF::EM_VE))
-    checkFormatAndArch(D, Formats[I++], Triple::ve);
-}
-
-TEST(ELFObjectFileTest, MachineTestForX86_64) {
-  std::array<StringRef, 4> Formats = {"elf32-x86-64", "elf32-x86-64",
-                                      "elf64-x86-64", "elf64-x86-64"};
-  size_t I = 0;
-  for (const DataForTest &D : generateData(ELF::EM_X86_64))
-    checkFormatAndArch(D, Formats[I++], Triple::x86_64);
-}
-
-TEST(ELFObjectFileTest, MachineTestFor386) {
-  std::array<StringRef, 4> Formats = {"elf32-i386", "elf32-i386", "elf64-i386",
-                                      "elf64-i386"};
-  size_t I = 0;
-  for (const DataForTest &D : generateData(ELF::EM_386))
-    checkFormatAndArch(D, Formats[I++], Triple::x86);
-}
-
-TEST(ELFObjectFileTest, MachineTestForMIPS) {
-  std::array<StringRef, 4> Formats = {"elf32-mips", "elf32-mips", "elf64-mips",
-                                      "elf64-mips"};
-  std::array<Triple::ArchType, 4> Archs = {Triple::mipsel, Triple::mips,
-                                           Triple::mips64el, Triple::mips64};
-  size_t I = 0;
-  for (const DataForTest &D : generateData(ELF::EM_MIPS)) {
-    checkFormatAndArch(D, Formats[I], Archs[I]);
-    ++I;
-  }
-}
-
-TEST(ELFObjectFileTest, MachineTestForAMDGPU) {
-  std::array<StringRef, 4> Formats = {"elf32-amdgpu", "elf32-amdgpu",
-                                      "elf64-amdgpu", "elf64-amdgpu"};
-  size_t I = 0;
-  for (const DataForTest &D : generateData(ELF::EM_AMDGPU))
-    checkFormatAndArch(D, Formats[I++], Triple::UnknownArch);
-}
-
-TEST(ELFObjectFileTest, MachineTestForIAMCU) {
-  std::array<StringRef, 4> Formats = {"elf32-iamcu", "elf32-iamcu",
-                                      "elf64-unknown", "elf64-unknown"};
-  size_t I = 0;
-  for (const DataForTest &D : generateData(ELF::EM_IAMCU))
-    checkFormatAndArch(D, Formats[I++], Triple::x86);
-}
-
-TEST(ELFObjectFileTest, MachineTestForAARCH64) {
-  std::array<StringRef, 4> Formats = {"elf32-unknown", "elf32-unknown",
-                                      "elf64-littleaarch64",
-                                      "elf64-bigaarch64"};
-  std::array<Triple::ArchType, 4> Archs = {Triple::aarch64, Triple::aarch64_be,
-                                           Triple::aarch64, Triple::aarch64_be};
-  size_t I = 0;
-  for (const DataForTest &D : generateData(ELF::EM_AARCH64)) {
-    checkFormatAndArch(D, Formats[I], Archs[I]);
-    ++I;
-  }
-}
-
-TEST(ELFObjectFileTest, MachineTestForPPC64) {
-  std::array<StringRef, 4> Formats = {"elf32-unknown", "elf32-unknown",
-                                      "elf64-powerpcle", "elf64-powerpc"};
-  std::array<Triple::ArchType, 4> Archs = {Triple::ppc64le, Triple::ppc64,
-                                           Triple::ppc64le, Triple::ppc64};
-  size_t I = 0;
-  for (const DataForTest &D : generateData(ELF::EM_PPC64)) {
-    checkFormatAndArch(D, Formats[I], Archs[I]);
-    ++I;
-  }
-}
-
-TEST(ELFObjectFileTest, MachineTestForPPC) {
-  std::array<StringRef, 4> Formats = {"elf32-powerpcle", "elf32-powerpc",
-                                      "elf64-unknown", "elf64-unknown"};
-  std::array<Triple::ArchType, 4> Archs = {Triple::ppcle, Triple::ppc,
-                                           Triple::ppcle, Triple::ppc};
-  size_t I = 0;
-  for (const DataForTest &D : generateData(ELF::EM_PPC)) {
-    checkFormatAndArch(D, Formats[I], Archs[I]);
-    ++I;
-  }
-}
-
-TEST(ELFObjectFileTest, MachineTestForRISCV) {
-  std::array<StringRef, 4> Formats = {"elf32-littleriscv", "elf32-littleriscv",
-                                      "elf64-littleriscv", "elf64-littleriscv"};
-  std::array<Triple::ArchType, 4> Archs = {Triple::riscv32, Triple::riscv32,
-                                           Triple::riscv64, Triple::riscv64};
-  size_t I = 0;
-  for (const DataForTest &D : generateData(ELF::EM_RISCV)) {
-    checkFormatAndArch(D, Formats[I], Archs[I]);
-    ++I;
-  }
-}
-
-TEST(ELFObjectFileTest, MachineTestForARM) {
-  std::array<StringRef, 4> Formats = {"elf32-littlearm", "elf32-bigarm",
-                                      "elf64-unknown", "elf64-unknown"};
-  size_t I = 0;
-  for (const DataForTest &D : generateData(ELF::EM_ARM))
-    checkFormatAndArch(D, Formats[I++], Triple::arm);
-}
-
-TEST(ELFObjectFileTest, MachineTestForS390) {
-  std::array<StringRef, 4> Formats = {"elf32-unknown", "elf32-unknown",
-                                      "elf64-s390", "elf64-s390"};
-  size_t I = 0;
-  for (const DataForTest &D : generateData(ELF::EM_S390))
-    checkFormatAndArch(D, Formats[I++], Triple::systemz);
-}
-
-TEST(ELFObjectFileTest, MachineTestForSPARCV9) {
-  std::array<StringRef, 4> Formats = {"elf32-unknown", "elf32-unknown",
-                                      "elf64-sparc", "elf64-sparc"};
-  size_t I = 0;
-  for (const DataForTest &D : generateData(ELF::EM_SPARCV9))
-    checkFormatAndArch(D, Formats[I++], Triple::sparcv9);
-}
-
-TEST(ELFObjectFileTest, MachineTestForSPARC) {
-  std::array<StringRef, 4> Formats = {"elf32-sparc", "elf32-sparc",
-                                      "elf64-unknown", "elf64-unknown"};
-  std::array<Triple::ArchType, 4> Archs = {Triple::sparcel, Triple::sparc,
-                                           Triple::sparcel, Triple::sparc};
-  size_t I = 0;
-  for (const DataForTest &D : generateData(ELF::EM_SPARC)) {
-    checkFormatAndArch(D, Formats[I], Archs[I]);
-    ++I;
-  }
-}
-
-TEST(ELFObjectFileTest, MachineTestForSPARC32PLUS) {
-  std::array<StringRef, 4> Formats = {"elf32-sparc", "elf32-sparc",
-                                      "elf64-unknown", "elf64-unknown"};
-  std::array<Triple::ArchType, 4> Archs = {Triple::sparcel, Triple::sparc,
-                                           Triple::sparcel, Triple::sparc};
-  size_t I = 0;
-  for (const DataForTest &D : generateData(ELF::EM_SPARC32PLUS)) {
-    checkFormatAndArch(D, Formats[I], Archs[I]);
-    ++I;
-  }
-}
-
-TEST(ELFObjectFileTest, MachineTestForBPF) {
-  std::array<StringRef, 4> Formats = {"elf32-unknown", "elf32-unknown",
-                                      "elf64-bpf", "elf64-bpf"};
-  std::array<Triple::ArchType, 4> Archs = {Triple::bpfel, Triple::bpfeb,
-                                           Triple::bpfel, Triple::bpfeb};
-  size_t I = 0;
-  for (const DataForTest &D : generateData(ELF::EM_BPF)) {
-    checkFormatAndArch(D, Formats[I], Archs[I]);
-    ++I;
-  }
-}
-
-TEST(ELFObjectFileTest, MachineTestForAVR) {
-  std::array<StringRef, 4> Formats = {"elf32-avr", "elf32-avr", "elf64-unknown",
-                                      "elf64-unknown"};
-  size_t I = 0;
-  for (const DataForTest &D : generateData(ELF::EM_AVR))
-    checkFormatAndArch(D, Formats[I++], Triple::avr);
-}
-
-TEST(ELFObjectFileTest, MachineTestForHEXAGON) {
-  std::array<StringRef, 4> Formats = {"elf32-hexagon", "elf32-hexagon",
-                                      "elf64-unknown", "elf64-unknown"};
-  size_t I = 0;
-  for (const DataForTest &D : generateData(ELF::EM_HEXAGON))
-    checkFormatAndArch(D, Formats[I++], Triple::hexagon);
-}
-
-TEST(ELFObjectFileTest, MachineTestForLANAI) {
-  std::array<StringRef, 4> Formats = {"elf32-lanai", "elf32-lanai",
-                                      "elf64-unknown", "elf64-unknown"};
-  size_t I = 0;
-  for (const DataForTest &D : generateData(ELF::EM_LANAI))
-    checkFormatAndArch(D, Formats[I++], Triple::lanai);
-}
-
-TEST(ELFObjectFileTest, MachineTestForMSP430) {
-  std::array<StringRef, 4> Formats = {"elf32-msp430", "elf32-msp430",
-                                      "elf64-unknown", "elf64-unknown"};
-  size_t I = 0;
-  for (const DataForTest &D : generateData(ELF::EM_MSP430))
-    checkFormatAndArch(D, Formats[I++], Triple::msp430);
-}
-
-TEST(ELFObjectFileTest, MachineTestForCSKY) {
-  std::array<StringRef, 4> Formats = {"elf32-csky", "elf32-csky",
-                                      "elf64-unknown", "elf64-unknown"};
-  size_t I = 0;
-  for (const DataForTest &D : generateData(ELF::EM_CSKY))
-    checkFormatAndArch(D, Formats[I++], Triple::csky);
-}
-
-// ELF relative relocation type test.
-TEST(ELFObjectFileTest, RelativeRelocationTypeTest) {
-  EXPECT_EQ(ELF::R_CKCORE_RELATIVE, getELFRelativeRelocationType(ELF::EM_CSKY));
-}
-
-template <class ELFT>
-static Expected<ELFObjectFile<ELFT>> toBinary(SmallVectorImpl<char> &Storage,
-                                              StringRef Yaml) {
-  raw_svector_ostream OS(Storage);
-  yaml::Input YIn(Yaml);
-  if (!yaml::convertYAML(YIn, OS, [](const Twine &Msg) {}))
-    return createStringError(std::errc::invalid_argument,
-                             "unable to convert YAML");
-  return ELFObjectFile<ELFT>::create(MemoryBufferRef(OS.str(), "dummyELF"));
-}
-
-// Check we are able to create an ELFObjectFile even when the content of the
-// SHT_SYMTAB_SHNDX section can't be read properly.
-TEST(ELFObjectFileTest, InvalidSymtabShndxTest) {
-  SmallString<0> Storage;
-  Expected<ELFObjectFile<ELF64LE>> ExpectedFile = toBinary<ELF64LE>(Storage, R"(
---- !ELF
-FileHeader:
-  Class: ELFCLASS64
-  Data:  ELFDATA2LSB
-  Type:  ET_REL
-Sections:
-  - Name:    .symtab_shndx
-    Type:    SHT_SYMTAB_SHNDX
-    Entries: [ 0 ]
-    ShSize: 0xFFFFFFFF
-)");
-
-  ASSERT_THAT_EXPECTED(ExpectedFile, Succeeded());
-}
-
-// Test that we are able to create an ELFObjectFile even when loadable segments
-// are unsorted by virtual address.
-// Test that ELFFile<ELFT>::toMappedAddr works properly in this case.
-
-TEST(ELFObjectFileTest, InvalidLoadSegmentsOrderTest) {
-  SmallString<0> Storage;
-  Expected<ELFObjectFile<ELF64LE>> ExpectedFile = toBinary<ELF64LE>(Storage, R"(
---- !ELF
-FileHeader:
-  Class: ELFCLASS64
-  Data:  ELFDATA2LSB
-  Type:  ET_EXEC
-Sections:
-  - Name:         .foo
-    Type:         SHT_PROGBITS
-    Address:      0x1000
-    Offset:       0x3000
-    ContentArray: [ 0x11 ]
-  - Name:         .bar
-    Type:         SHT_PROGBITS
-    Address:      0x2000
-    Offset:       0x4000
-    ContentArray: [ 0x99 ]
-ProgramHeaders:
-  - Type:     PT_LOAD
-    VAddr:    0x2000
-    FirstSec: .bar
-    LastSec:  .bar
-  - Type:     PT_LOAD
-    VAddr:    0x1000
-    FirstSec: .foo
-    LastSec:  .foo
-)");
-
-  ASSERT_THAT_EXPECTED(ExpectedFile, Succeeded());
-
-  std::string WarnString;
-  auto ToMappedAddr = [&](uint64_t Addr) -> const uint8_t * {
-    Expected<const uint8_t *> DataOrErr =
-        ExpectedFile->getELFFile().toMappedAddr(Addr, [&](const Twine &Msg) {
-          EXPECT_TRUE(WarnString.empty());
-          WarnString = Msg.str();
-          return Error::success();
-        });
-
-    if (!DataOrErr) {
-      ADD_FAILURE() << toString(DataOrErr.takeError());
-      return nullptr;
-    }
-
-    EXPECT_TRUE(WarnString ==
-                "loadable segments are unsorted by virtual address");
-    WarnString = "";
-    return *DataOrErr;
-  };
-
-  const uint8_t *Data = ToMappedAddr(0x1000);
-  ASSERT_TRUE(Data);
-  MemoryBufferRef Buf = ExpectedFile->getMemoryBufferRef();
-  EXPECT_EQ((const char *)Data - Buf.getBufferStart(), 0x3000);
-  EXPECT_EQ(Data[0], 0x11);
-
-  Data = ToMappedAddr(0x2000);
-  ASSERT_TRUE(Data);
-  Buf = ExpectedFile->getMemoryBufferRef();
-  EXPECT_EQ((const char *)Data - Buf.getBufferStart(), 0x4000);
-  EXPECT_EQ(Data[0], 0x99);
-}
-
-// This is a test for API that is related to symbols.
-// We check that errors are properly reported here.
-TEST(ELFObjectFileTest, InvalidSymbolTest) {
-  SmallString<0> Storage;
-  Expected<ELFObjectFile<ELF64LE>> ElfOrErr = toBinary<ELF64LE>(Storage, R"(
---- !ELF
-FileHeader:
-  Class:   ELFCLASS64
-  Data:    ELFDATA2LSB
-  Type:    ET_DYN
-  Machine: EM_X86_64
-Sections:
-  - Name: .symtab
-    Type: SHT_SYMTAB
-)");
-
-  ASSERT_THAT_EXPECTED(ElfOrErr, Succeeded());
-  const ELFFile<ELF64LE> &Elf = ElfOrErr->getELFFile();
-  const ELFObjectFile<ELF64LE> &Obj = *ElfOrErr;
-
-  Expected<const typename ELF64LE::Shdr *> SymtabSecOrErr = Elf.getSection(1);
-  ASSERT_THAT_EXPECTED(SymtabSecOrErr, Succeeded());
-  ASSERT_EQ((*SymtabSecOrErr)->sh_type, ELF::SHT_SYMTAB);
-
-  auto DoCheck = [&](unsigned BrokenSymIndex, const char *ErrMsg) {
-    ELFSymbolRef BrokenSym = Obj.toSymbolRef(*SymtabSecOrErr, BrokenSymIndex);
-
-    // 1) Check the behavior of ELFObjectFile<ELFT>::getSymbolName().
-    //    SymbolRef::getName() calls it internally. We can't test it directly,
-    //    because it is protected.
-    EXPECT_THAT_ERROR(BrokenSym.getName().takeError(),
-                      FailedWithMessage(ErrMsg));
-
-    // 2) Check the behavior of ELFObjectFile<ELFT>::getSymbol().
-    EXPECT_THAT_ERROR(Obj.getSymbol(BrokenSym.getRawDataRefImpl()).takeError(),
-                      FailedWithMessage(ErrMsg));
-
-    // 3) Check the behavior of ELFObjectFile<ELFT>::getSymbolSection().
-    //    SymbolRef::getSection() calls it internally. We can't test it
-    //    directly, because it is protected.
-    EXPECT_THAT_ERROR(BrokenSym.getSection().takeError(),
-                      FailedWithMessage(ErrMsg));
-
-    // 4) Check the behavior of ELFObjectFile<ELFT>::getSymbolFlags().
-    //    SymbolRef::getFlags() calls it internally. We can't test it directly,
-    //    because it is protected.
-    EXPECT_THAT_ERROR(BrokenSym.getFlags().takeError(),
-                      FailedWithMessage(ErrMsg));
-
-    // 5) Check the behavior of ELFObjectFile<ELFT>::getSymbolType().
-    //    SymbolRef::getType() calls it internally. We can't test it directly,
-    //    because it is protected.
-    EXPECT_THAT_ERROR(BrokenSym.getType().takeError(),
-                      FailedWithMessage(ErrMsg));
-
-    // 6) Check the behavior of ELFObjectFile<ELFT>::getSymbolAddress().
-    //    SymbolRef::getAddress() calls it internally. We can't test it
-    //    directly, because it is protected.
-    EXPECT_THAT_ERROR(BrokenSym.getAddress().takeError(),
-                      FailedWithMessage(ErrMsg));
-
-    // Finally, check the `ELFFile<ELFT>::getEntry` API. This is an underlying
-    // method that generates errors for all cases above.
-    EXPECT_THAT_EXPECTED(
-        Elf.getEntry<typename ELF64LE::Sym>(**SymtabSecOrErr, 0), Succeeded());
-    EXPECT_THAT_ERROR(
-        Elf.getEntry<typename ELF64LE::Sym>(**SymtabSecOrErr, BrokenSymIndex)
-            .takeError(),
-        FailedWithMessage(ErrMsg));
-  };
-
-  // We create a symbol with an index that is too large to exist in the symbol
-  // table.
-  DoCheck(0x1, "can't read an entry at 0x18: it goes past the end of the "
-               "section (0x18)");
-
-  // We create a symbol with an index that is too large to exist in the object.
-  DoCheck(0xFFFFFFFF, "can't read an entry at 0x17ffffffe8: it goes past the "
-                      "end of the section (0x18)");
-}
-
-// Tests for error paths of the ELFFile::decodeBBAddrMap API.
-TEST(ELFObjectFileTest, InvalidBBAddrMap) {
-  StringRef CommonYamlString(R"(
---- !ELF
-FileHeader:
-  Class: ELFCLASS64
-  Data:  ELFDATA2LSB
-  Type:  ET_EXEC
-Sections:
-  - Name: .llvm_bb_addr_map
-    Type: SHT_LLVM_BB_ADDR_MAP
-    Entries:
-      - Address: 0x11111
-        BBEntries:
-          - AddressOffset: 0x0
-            Size:          0x1
-            Metadata:      0x2
-)");
-
-  auto DoCheck = [&](StringRef YamlString, const char *ErrMsg) {
-    SmallString<0> Storage;
-    Expected<ELFObjectFile<ELF64LE>> ElfOrErr =
-        toBinary<ELF64LE>(Storage, YamlString);
-    ASSERT_THAT_EXPECTED(ElfOrErr, Succeeded());
-    const ELFFile<ELF64LE> &Elf = ElfOrErr->getELFFile();
-
-    Expected<const typename ELF64LE::Shdr *> BBAddrMapSecOrErr =
-        Elf.getSection(1);
-    ASSERT_THAT_EXPECTED(BBAddrMapSecOrErr, Succeeded());
-    EXPECT_THAT_ERROR(Elf.decodeBBAddrMap(**BBAddrMapSecOrErr).takeError(),
-                      FailedWithMessage(ErrMsg));
-  };
-
-  // Check that we can detect the malformed encoding when the section is
-  // truncated.
-  SmallString<128> TruncatedYamlString(CommonYamlString);
-  TruncatedYamlString += R"(
-    ShSize: 0x8
-)";
-  DoCheck(TruncatedYamlString, "unable to decode LEB128 at offset 0x00000008: "
-                               "malformed uleb128, extends past end");
-
-  // Check that we can detect when the encoded BB entry fields exceed the UINT32
-  // limit.
-  SmallVector<SmallString<128>, 3> OverInt32LimitYamlStrings(3,
-                                                             CommonYamlString);
-  OverInt32LimitYamlStrings[0] += R"(
-          - AddressOffset: 0x100000000
-            Size:          0xFFFFFFFF
-            Metadata:      0xFFFFFFFF
-)";
-
-  OverInt32LimitYamlStrings[1] += R"(
-          - AddressOffset: 0xFFFFFFFF
-            Size:          0x100000000
-            Metadata:      0xFFFFFFFF
-)";
-
-  OverInt32LimitYamlStrings[2] += R"(
-          - AddressOffset: 0xFFFFFFFF
-            Size:          0xFFFFFFFF
-            Metadata:      0x100000000
-)";
-
-  DoCheck(OverInt32LimitYamlStrings[0],
-          "ULEB128 value at offset 0xc exceeds UINT32_MAX (0x100000000)");
-  DoCheck(OverInt32LimitYamlStrings[1],
-          "ULEB128 value at offset 0x11 exceeds UINT32_MAX (0x100000000)");
-  DoCheck(OverInt32LimitYamlStrings[2],
-          "ULEB128 value at offset 0x16 exceeds UINT32_MAX (0x100000000)");
-
-  // Check the proper error handling when the section has fields exceeding
-  // UINT32 and is also truncated. This is for checking that we don't generate
-  // unhandled errors.
-  SmallVector<SmallString<128>, 3> OverInt32LimitAndTruncated(
-      3, OverInt32LimitYamlStrings[1]);
-  // Truncate before the end of the 5-byte field.
-  OverInt32LimitAndTruncated[0] += R"(
-    ShSize: 0x15
-)";
-  // Truncate at the end of the 5-byte field.
-  OverInt32LimitAndTruncated[1] += R"(
-    ShSize: 0x16
-)";
-  // Truncate after the end of the 5-byte field.
-  OverInt32LimitAndTruncated[2] += R"(
-    ShSize: 0x17
-)";
-
-  DoCheck(OverInt32LimitAndTruncated[0],
-          "unable to decode LEB128 at offset 0x00000011: malformed uleb128, "
-          "extends past end");
-  DoCheck(OverInt32LimitAndTruncated[1],
-          "ULEB128 value at offset 0x11 exceeds UINT32_MAX (0x100000000)");
-  DoCheck(OverInt32LimitAndTruncated[2],
-          "ULEB128 value at offset 0x11 exceeds UINT32_MAX (0x100000000)");
-
-  // Check for proper error handling when the 'NumBlocks' field is overridden
-  // with an out-of-range value.
-  SmallString<128> OverLimitNumBlocks(CommonYamlString);
-  OverLimitNumBlocks += R"(
-        NumBlocks: 0x100000000
-)";
-
-  DoCheck(OverLimitNumBlocks,
-          "ULEB128 value at offset 0x8 exceeds UINT32_MAX (0x100000000)");
-}
-
-// Test for ObjectFile::getRelocatedSection: check that it returns a relocated
-// section for executable and relocatable files.
-TEST(ELFObjectFileTest, ExecutableWithRelocs) {
-  StringRef HeaderString(R"(
---- !ELF
-FileHeader:
-  Class: ELFCLASS64
-  Data:  ELFDATA2LSB
-)");
-  StringRef ContentsString(R"(
-Sections:
-  - Name:  .text
-    Type:  SHT_PROGBITS
-    Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
-  - Name:  .rela.text
-    Type:  SHT_RELA
-    Flags: [ SHF_INFO_LINK ]
-    Info:  .text
-)");
-
-  auto DoCheck = [&](StringRef YamlString) {
-    SmallString<0> Storage;
-    Expected<ELFObjectFile<ELF64LE>> ElfOrErr =
-        toBinary<ELF64LE>(Storage, YamlString);
-    ASSERT_THAT_EXPECTED(ElfOrErr, Succeeded());
-    const ELFObjectFile<ELF64LE> &Obj = *ElfOrErr;
-
-    bool FoundRela;
-
-    for (SectionRef Sec : Obj.sections()) {
-      Expected<StringRef> SecNameOrErr = Sec.getName();
-      ASSERT_THAT_EXPECTED(SecNameOrErr, Succeeded());
-      StringRef SecName = *SecNameOrErr;
-      if (SecName != ".rela.text")
-        continue;
-      FoundRela = true;
-      Expected<section_iterator> RelSecOrErr = Sec.getRelocatedSection();
-      ASSERT_THAT_EXPECTED(RelSecOrErr, Succeeded());
-      section_iterator RelSec = *RelSecOrErr;
-      ASSERT_NE(RelSec, Obj.section_end());
-      Expected<StringRef> TextSecNameOrErr = RelSec->getName();
-      ASSERT_THAT_EXPECTED(TextSecNameOrErr, Succeeded());
-      StringRef TextSecName = *TextSecNameOrErr;
-      EXPECT_EQ(TextSecName, ".text");
-    }
-    ASSERT_TRUE(FoundRela);
-  };
-
-  // Check ET_EXEC file (`ld --emit-relocs` use-case).
-  SmallString<128> ExecFileYamlString(HeaderString);
-  ExecFileYamlString += R"(
-  Type:  ET_EXEC
-)";
-  ExecFileYamlString += ContentsString;
-  DoCheck(ExecFileYamlString);
-
-  // Check ET_REL file.
-  SmallString<128> RelocatableFileYamlString(HeaderString);
-  RelocatableFileYamlString += R"(
-  Type:  ET_REL
-)";
-  RelocatableFileYamlString += ContentsString;
-  DoCheck(RelocatableFileYamlString);
-}
diff --git a/gnu/llvm/llvm/unittests/Object/ELFTest.cpp b/gnu/llvm/llvm/unittests/Object/ELFTest.cpp
deleted file mode 100644
index f85e866deeb..00000000000
--- a/gnu/llvm/llvm/unittests/Object/ELFTest.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-//===- ELFTest.cpp - Tests for ELF.cpp ------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Object/ELF.h"
-#include "llvm/Testing/Support/Error.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::object;
-using namespace llvm::ELF;
-
-TEST(ELFTest, getELFRelocationTypeNameForVE) {
-  EXPECT_EQ("R_VE_NONE", getELFRelocationTypeName(EM_VE, R_VE_NONE));
-  EXPECT_EQ("R_VE_REFLONG", getELFRelocationTypeName(EM_VE, R_VE_REFLONG));
-  EXPECT_EQ("R_VE_REFQUAD", getELFRelocationTypeName(EM_VE, R_VE_REFQUAD));
-  EXPECT_EQ("R_VE_SREL32", getELFRelocationTypeName(EM_VE, R_VE_SREL32));
-  EXPECT_EQ("R_VE_HI32", getELFRelocationTypeName(EM_VE, R_VE_HI32));
-  EXPECT_EQ("R_VE_LO32", getELFRelocationTypeName(EM_VE, R_VE_LO32));
-  EXPECT_EQ("R_VE_PC_HI32", getELFRelocationTypeName(EM_VE, R_VE_PC_HI32));
-  EXPECT_EQ("R_VE_PC_LO32", getELFRelocationTypeName(EM_VE, R_VE_PC_LO32));
-  EXPECT_EQ("R_VE_GOT32", getELFRelocationTypeName(EM_VE, R_VE_GOT32));
-  EXPECT_EQ("R_VE_GOT_HI32", getELFRelocationTypeName(EM_VE, R_VE_GOT_HI32));
-  EXPECT_EQ("R_VE_GOT_LO32", getELFRelocationTypeName(EM_VE, R_VE_GOT_LO32));
-  EXPECT_EQ("R_VE_GOTOFF32", getELFRelocationTypeName(EM_VE, R_VE_GOTOFF32));
-  EXPECT_EQ("R_VE_GOTOFF_HI32",
-            getELFRelocationTypeName(EM_VE, R_VE_GOTOFF_HI32));
-  EXPECT_EQ("R_VE_GOTOFF_LO32",
-            getELFRelocationTypeName(EM_VE, R_VE_GOTOFF_LO32));
-  EXPECT_EQ("R_VE_PLT32", getELFRelocationTypeName(EM_VE, R_VE_PLT32));
-  EXPECT_EQ("R_VE_PLT_HI32", getELFRelocationTypeName(EM_VE, R_VE_PLT_HI32));
-  EXPECT_EQ("R_VE_PLT_LO32", getELFRelocationTypeName(EM_VE, R_VE_PLT_LO32));
-  EXPECT_EQ("R_VE_RELATIVE", getELFRelocationTypeName(EM_VE, R_VE_RELATIVE));
-  EXPECT_EQ("R_VE_GLOB_DAT", getELFRelocationTypeName(EM_VE, R_VE_GLOB_DAT));
-  EXPECT_EQ("R_VE_JUMP_SLOT", getELFRelocationTypeName(EM_VE, R_VE_JUMP_SLOT));
-  EXPECT_EQ("R_VE_COPY", getELFRelocationTypeName(EM_VE, R_VE_COPY));
-  EXPECT_EQ("R_VE_DTPMOD64", getELFRelocationTypeName(EM_VE, R_VE_DTPMOD64));
-  EXPECT_EQ("R_VE_DTPOFF64", getELFRelocationTypeName(EM_VE, R_VE_DTPOFF64));
-  EXPECT_EQ("R_VE_TLS_GD_HI32",
-            getELFRelocationTypeName(EM_VE, R_VE_TLS_GD_HI32));
-  EXPECT_EQ("R_VE_TLS_GD_LO32",
-            getELFRelocationTypeName(EM_VE, R_VE_TLS_GD_LO32));
-  EXPECT_EQ("R_VE_TPOFF_HI32",
-            getELFRelocationTypeName(EM_VE, R_VE_TPOFF_HI32));
-  EXPECT_EQ("R_VE_TPOFF_LO32",
-            getELFRelocationTypeName(EM_VE, R_VE_TPOFF_LO32));
-  EXPECT_EQ("R_VE_CALL_HI32", getELFRelocationTypeName(EM_VE, R_VE_CALL_HI32));
-  EXPECT_EQ("R_VE_CALL_LO32", getELFRelocationTypeName(EM_VE, R_VE_CALL_LO32));
-}
-
-TEST(ELFTest, getELFRelativeRelocationType) {
-  EXPECT_EQ(0U, getELFRelativeRelocationType(EM_VE));
-}
-
-// This is a test for the DataRegion helper struct, defined in ELF.h header.
-TEST(ELFTest, DataRegionTest) {
-  std::vector<uint8_t> Data = {0, 1, 2};
-
-  // Used to check that the operator[] works properly.
-  auto CheckOperator = [&](DataRegion<uint8_t> &R) {
-    for (size_t I = 0, E = Data.size(); I != E; ++I) {
-      Expected<uint8_t> ValOrErr = R[I];
-      ASSERT_THAT_EXPECTED(ValOrErr, Succeeded());
-      EXPECT_EQ(*ValOrErr, I);
-    }
-  };
-
-  // Check we can use the constructor that takes an ArrayRef<T>.
-  DataRegion<uint8_t> Region(Data);
-
-  CheckOperator(Region);
-  const char *ErrMsg1 =
-      "the index is greater than or equal to the number of entries (3)";
-  EXPECT_THAT_ERROR(Region[3].takeError(), FailedWithMessage(ErrMsg1));
-  EXPECT_THAT_ERROR(Region[4].takeError(), FailedWithMessage(ErrMsg1));
-
-  // Check we can use the constructor that takes the data begin and the
-  // data end pointers.
-  Region = {Data.data(), Data.data() + Data.size()};
-
-  CheckOperator(Region);
-  const char *ErrMsg2 = "can't read past the end of the file";
-  EXPECT_THAT_ERROR(Region[3].takeError(), FailedWithMessage(ErrMsg2));
-  EXPECT_THAT_ERROR(Region[4].takeError(), FailedWithMessage(ErrMsg2));
-}
diff --git a/gnu/llvm/llvm/unittests/Object/ELFTypesTest.cpp b/gnu/llvm/llvm/unittests/Object/ELFTypesTest.cpp
deleted file mode 100644
index 183ef3e97da..00000000000
--- a/gnu/llvm/llvm/unittests/Object/ELFTypesTest.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-//===----------------------- ELFTypesTest.cpp -----------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-#include "llvm/Object/ELFTypes.h"
-#include "gtest/gtest.h"
-#include <iostream>
-
-using namespace llvm;
-using namespace llvm::object;
-
-template <typename ELFT> using Elf_Note = typename ELFT::Note;
-
-template <class ELFT> struct NoteTestData {
-  std::vector<uint8_t> Data;
-
-  const Elf_Note_Impl<ELFT> getElfNote(StringRef Name, uint32_t Type,
-                                       ArrayRef<uint8_t> Desc) {
-    Data.resize(sizeof(Elf_Nhdr_Impl<ELFT>) +
-                    alignTo<Elf_Nhdr_Impl<ELFT>::Align>(Name.size()) +
-                    alignTo<Elf_Nhdr_Impl<ELFT>::Align>(Desc.size()),
-                0);
-
-    Elf_Nhdr_Impl<ELFT> *Nhdr =
-        reinterpret_cast<Elf_Nhdr_Impl<ELFT> *>(Data.data());
-    Nhdr->n_namesz = (Name == "") ? 0 : Name.size() + 1;
-    Nhdr->n_descsz = Desc.size();
-    Nhdr->n_type = Type;
-
-    auto NameOffset = Data.begin() + sizeof(*Nhdr);
-    std::copy(Name.begin(), Name.end(), NameOffset);
-
-    auto DescOffset =
-        NameOffset + alignTo<Elf_Nhdr_Impl<ELFT>::Align>(Nhdr->n_namesz);
-    std::copy(Desc.begin(), Desc.end(), DescOffset);
-
-    return Elf_Note_Impl<ELFT>(*Nhdr);
-  }
-};
-
-TEST(ELFTypesTest, NoteTest) {
-  static const uint8_t Random[] = {1, 2, 3, 4, 5, 6, 7, 8, 9};
-  ArrayRef<uint8_t> RandomData = makeArrayRef(Random);
-  NoteTestData<ELF64LE> TestData;
-
-  auto Note1 = TestData.getElfNote(StringRef("AMD"), ELF::NT_AMDGPU_METADATA,
-                                   RandomData);
-  EXPECT_EQ(Note1.getName(), "AMD");
-  EXPECT_EQ(Note1.getType(), ELF::NT_AMDGPU_METADATA);
-  EXPECT_EQ(Note1.getDesc(), RandomData);
-  EXPECT_EQ(Note1.getDescAsStringRef(),
-            StringRef(reinterpret_cast<const char *>(Random), sizeof(Random)));
-
-  auto Note2 = TestData.getElfNote("", ELF::NT_AMDGPU_METADATA, RandomData);
-  EXPECT_EQ(Note2.getName(), "");
-
-  auto Note3 =
-      TestData.getElfNote("AMD", ELF::NT_AMDGPU_METADATA, ArrayRef<uint8_t>());
-  EXPECT_EQ(Note3.getDescAsStringRef(), StringRef(""));
-}
diff --git a/gnu/llvm/llvm/unittests/Object/MinidumpTest.cpp b/gnu/llvm/llvm/unittests/Object/MinidumpTest.cpp
deleted file mode 100644
index 85ffa79c46d..00000000000
--- a/gnu/llvm/llvm/unittests/Object/MinidumpTest.cpp
+++ /dev/null
@@ -1,770 +0,0 @@
-//===- MinidumpTest.cpp - Tests for Minidump.cpp --------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Object/Minidump.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Testing/Support/Error.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::object;
-using namespace minidump;
-
-static Expected<std::unique_ptr<MinidumpFile>> create(ArrayRef<uint8_t> Data) {
-  return MinidumpFile::create(
-      MemoryBufferRef(toStringRef(Data), "Test buffer"));
-}
-
-TEST(MinidumpFile, BasicInterface) {
-  std::vector<uint8_t> Data{                        // Header
-                            'M', 'D', 'M', 'P',     // Signature
-                            0x93, 0xa7, 0, 0,       // Version
-                            1, 0, 0, 0,             // NumberOfStreams,
-                            0x20, 0, 0, 0,          // StreamDirectoryRVA
-                            0, 1, 2, 3, 4, 5, 6, 7, // Checksum, TimeDateStamp
-                            8, 9, 0, 1, 2, 3, 4, 5, // Flags
-                                                    // Stream Directory
-                            3, 0, 0x67, 0x47, 7, 0, 0, 0, // Type, DataSize,
-                            0x2c, 0, 0, 0,                // RVA
-                                                          // Stream
-                            'C', 'P', 'U', 'I', 'N', 'F', 'O'};
-  // A very simple minidump file which contains just a single stream.
-  auto ExpectedFile = create(Data);
-  ASSERT_THAT_EXPECTED(ExpectedFile, Succeeded());
-  const MinidumpFile &File = **ExpectedFile;
-  const Header &H = File.header();
-  EXPECT_EQ(Header::MagicSignature, H.Signature);
-  EXPECT_EQ(Header::MagicVersion, H.Version);
-  EXPECT_EQ(1u, H.NumberOfStreams);
-  EXPECT_EQ(0x20u, H.StreamDirectoryRVA);
-  EXPECT_EQ(0x03020100u, H.Checksum);
-  EXPECT_EQ(0x07060504u, H.TimeDateStamp);
-  EXPECT_EQ(uint64_t(0x0504030201000908), H.Flags);
-
-  ASSERT_EQ(1u, File.streams().size());
-  const Directory &Stream0 = File.streams()[0];
-  EXPECT_EQ(StreamType::LinuxCPUInfo, Stream0.Type);
-  EXPECT_EQ(7u, Stream0.Location.DataSize);
-  EXPECT_EQ(0x2cu, Stream0.Location.RVA);
-
-  EXPECT_EQ("CPUINFO", toStringRef(File.getRawStream(Stream0)));
-  EXPECT_EQ("CPUINFO",
-            toStringRef(*File.getRawStream(StreamType::LinuxCPUInfo)));
-
-  EXPECT_THAT_EXPECTED(File.getSystemInfo(), Failed<BinaryError>());
-}
-
-// Use the input from the previous test, but corrupt it in various ways
-TEST(MinidumpFile, create_ErrorCases) {
-  std::vector<uint8_t> FileTooShort{'M', 'D', 'M', 'P'};
-  EXPECT_THAT_EXPECTED(create(FileTooShort), Failed<BinaryError>());
-
-  std::vector<uint8_t> WrongSignature{
-      // Header
-      '!', 'D', 'M', 'P', 0x93, 0xa7, 0, 0, // Signature, Version
-      1, 0, 0, 0,                           // NumberOfStreams,
-      0x20, 0, 0, 0,                        // StreamDirectoryRVA
-      0, 1, 2, 3, 4, 5, 6, 7,               // Checksum, TimeDateStamp
-      8, 9, 0, 1, 2, 3, 4, 5,               // Flags
-                                            // Stream Directory
-      3, 0, 0x67, 0x47, 7, 0, 0, 0,         // Type, DataSize,
-      0x2c, 0, 0, 0,                        // RVA
-                                            // Stream
-      'C', 'P', 'U', 'I', 'N', 'F', 'O'};
-  EXPECT_THAT_EXPECTED(create(WrongSignature), Failed<BinaryError>());
-
-  std::vector<uint8_t> WrongVersion{
-      // Header
-      'M', 'D', 'M', 'P', 0x39, 0xa7, 0, 0, // Signature, Version
-      1, 0, 0, 0,                           // NumberOfStreams,
-      0x20, 0, 0, 0,                        // StreamDirectoryRVA
-      0, 1, 2, 3, 4, 5, 6, 7,               // Checksum, TimeDateStamp
-      8, 9, 0, 1, 2, 3, 4, 5,               // Flags
-                                            // Stream Directory
-      3, 0, 0x67, 0x47, 7, 0, 0, 0,         // Type, DataSize,
-      0x2c, 0, 0, 0,                        // RVA
-                                            // Stream
-      'C', 'P', 'U', 'I', 'N', 'F', 'O'};
-  EXPECT_THAT_EXPECTED(create(WrongVersion), Failed<BinaryError>());
-
-  std::vector<uint8_t> DirectoryAfterEOF{
-      // Header
-      'M', 'D', 'M', 'P', 0x93, 0xa7, 0, 0, // Signature, Version
-      1, 0, 0, 0,                           // NumberOfStreams,
-      0x20, 1, 0, 0,                        // StreamDirectoryRVA
-      0, 1, 2, 3, 4, 5, 6, 7,               // Checksum, TimeDateStamp
-      8, 9, 0, 1, 2, 3, 4, 5,               // Flags
-                                            // Stream Directory
-      3, 0, 0x67, 0x47, 7, 0, 0, 0,         // Type, DataSize,
-      0x2c, 0, 0, 0,                        // RVA
-                                            // Stream
-      'C', 'P', 'U', 'I', 'N', 'F', 'O'};
-  EXPECT_THAT_EXPECTED(create(DirectoryAfterEOF), Failed<BinaryError>());
-
-  std::vector<uint8_t> TruncatedDirectory{
-      // Header
-      'M', 'D', 'M', 'P', 0x93, 0xa7, 0, 0, // Signature, Version
-      1, 1, 0, 0,                           // NumberOfStreams,
-      0x20, 0, 0, 0,                        // StreamDirectoryRVA
-      0, 1, 2, 3, 4, 5, 6, 7,               // Checksum, TimeDateStamp
-      8, 9, 0, 1, 2, 3, 4, 5,               // Flags
-                                            // Stream Directory
-      3, 0, 0x67, 0x47, 7, 0, 0, 0,         // Type, DataSize,
-      0x2c, 0, 0, 0,                        // RVA
-                                            // Stream
-      'C', 'P', 'U', 'I', 'N', 'F', 'O'};
-  EXPECT_THAT_EXPECTED(create(TruncatedDirectory), Failed<BinaryError>());
-
-  std::vector<uint8_t> Stream0AfterEOF{
-      // Header
-      'M', 'D', 'M', 'P', 0x93, 0xa7, 0, 0, // Signature, Version
-      1, 0, 0, 0,                           // NumberOfStreams,
-      0x20, 0, 0, 0,                        // StreamDirectoryRVA
-      0, 1, 2, 3, 4, 5, 6, 7,               // Checksum, TimeDateStamp
-      8, 9, 0, 1, 2, 3, 4, 5,               // Flags
-                                            // Stream Directory
-      3, 0, 0x67, 0x47, 7, 0, 0, 0,         // Type, DataSize,
-      0x2c, 1, 0, 0,                        // RVA
-                                            // Stream
-      'C', 'P', 'U', 'I', 'N', 'F', 'O'};
-  EXPECT_THAT_EXPECTED(create(Stream0AfterEOF), Failed<BinaryError>());
-
-  std::vector<uint8_t> Stream0Truncated{
-      // Header
-      'M', 'D', 'M', 'P', 0x93, 0xa7, 0, 0, // Signature, Version
-      1, 0, 0, 0,                           // NumberOfStreams,
-      0x20, 0, 0, 0,                        // StreamDirectoryRVA
-      0, 1, 2, 3, 4, 5, 6, 7,               // Checksum, TimeDateStamp
-      8, 9, 0, 1, 2, 3, 4, 5,               // Flags
-                                            // Stream Directory
-      3, 0, 0x67, 0x47, 8, 0, 0, 0,         // Type, DataSize,
-      0x2c, 0, 0, 0,                        // RVA
-                                            // Stream
-      'C', 'P', 'U', 'I', 'N', 'F', 'O'};
-  EXPECT_THAT_EXPECTED(create(Stream0Truncated), Failed<BinaryError>());
-
-  std::vector<uint8_t> DuplicateStream{
-      // Header
-      'M', 'D', 'M', 'P', 0x93, 0xa7, 0, 0, // Signature, Version
-      2, 0, 0, 0,                           // NumberOfStreams,
-      0x20, 0, 0, 0,                        // StreamDirectoryRVA
-      0, 1, 2, 3, 4, 5, 6, 7,               // Checksum, TimeDateStamp
-      8, 9, 0, 1, 2, 3, 4, 5,               // Flags
-                                            // Stream Directory
-      3, 0, 0x67, 0x47, 7, 0, 0, 0,         // Type, DataSize,
-      0x40, 0, 0, 0,                        // RVA
-                                            // Stream
-      3, 0, 0x67, 0x47, 7, 0, 0, 0,         // Type, DataSize,
-      0x40, 0, 0, 0,                        // RVA
-                                            // Stream
-      'C', 'P', 'U', 'I', 'N', 'F', 'O'};
-  EXPECT_THAT_EXPECTED(create(DuplicateStream), Failed<BinaryError>());
-
-  std::vector<uint8_t> DenseMapInfoConflict{
-      // Header
-      'M', 'D', 'M', 'P', 0x93, 0xa7, 0, 0, // Signature, Version
-      1, 0, 0, 0,                           // NumberOfStreams,
-      0x20, 0, 0, 0,                        // StreamDirectoryRVA
-      0, 1, 2, 3, 4, 5, 6, 7,               // Checksum, TimeDateStamp
-      8, 9, 0, 1, 2, 3, 4, 5,               // Flags
-                                            // Stream Directory
-      0xff, 0xff, 0xff, 0xff, 7, 0, 0, 0,   // Type, DataSize,
-      0x2c, 0, 0, 0,                        // RVA
-                                            // Stream
-      'C', 'P', 'U', 'I', 'N', 'F', 'O'};
-  EXPECT_THAT_EXPECTED(create(DenseMapInfoConflict), Failed<BinaryError>());
-}
-
-TEST(MinidumpFile, IngoresDummyStreams) {
-  std::vector<uint8_t> TwoDummyStreams{
-      // Header
-      'M', 'D', 'M', 'P', 0x93, 0xa7, 0, 0, // Signature, Version
-      2, 0, 0, 0,                           // NumberOfStreams,
-      0x20, 0, 0, 0,                        // StreamDirectoryRVA
-      0, 1, 2, 3, 4, 5, 6, 7,               // Checksum, TimeDateStamp
-      8, 9, 0, 1, 2, 3, 4, 5,               // Flags
-                                            // Stream Directory
-      0, 0, 0, 0, 0, 0, 0, 0,               // Type, DataSize,
-      0x20, 0, 0, 0,                        // RVA
-      0, 0, 0, 0, 0, 0, 0, 0,               // Type, DataSize,
-      0x20, 0, 0, 0,                        // RVA
-  };
-  auto ExpectedFile = create(TwoDummyStreams);
-  ASSERT_THAT_EXPECTED(ExpectedFile, Succeeded());
-  const MinidumpFile &File = **ExpectedFile;
-  ASSERT_EQ(2u, File.streams().size());
-  EXPECT_EQ(StreamType::Unused, File.streams()[0].Type);
-  EXPECT_EQ(StreamType::Unused, File.streams()[1].Type);
-  EXPECT_EQ(None, File.getRawStream(StreamType::Unused));
-}
-
-TEST(MinidumpFile, getSystemInfo) {
-  std::vector<uint8_t> Data{
-      // Header
-      'M', 'D', 'M', 'P', 0x93, 0xa7, 0, 0, // Signature, Version
-      1, 0, 0, 0,                           // NumberOfStreams,
-      0x20, 0, 0, 0,                        // StreamDirectoryRVA
-      0, 1, 2, 3, 4, 5, 6, 7,               // Checksum, TimeDateStamp
-      8, 9, 0, 1, 2, 3, 4, 5,               // Flags
-                                            // Stream Directory
-      7, 0, 0, 0, 56, 0, 0, 0,              // Type, DataSize,
-      0x2c, 0, 0, 0,                        // RVA
-                                            // SystemInfo
-      0, 0, 1, 2,                           // ProcessorArch, ProcessorLevel
-      3, 4, 5, 6, // ProcessorRevision, NumberOfProcessors, ProductType
-      7, 8, 9, 0, 1, 2, 3, 4, // MajorVersion, MinorVersion
-      5, 6, 7, 8, 2, 0, 0, 0, // BuildNumber, PlatformId
-      1, 2, 3, 4, 5, 6, 7, 8, // CSDVersionRVA, SuiteMask, Reserved
-      'L', 'L', 'V', 'M', 'L', 'L', 'V', 'M', 'L', 'L', 'V', 'M', // VendorID
-      1, 2, 3, 4, 5, 6, 7, 8, // VersionInfo, FeatureInfo
-      9, 0, 1, 2,             // AMDExtendedFeatures
-  };
-  auto ExpectedFile = create(Data);
-  ASSERT_THAT_EXPECTED(ExpectedFile, Succeeded());
-  const MinidumpFile &File = **ExpectedFile;
-
-  auto ExpectedInfo = File.getSystemInfo();
-  ASSERT_THAT_EXPECTED(ExpectedInfo, Succeeded());
-  const SystemInfo &Info = *ExpectedInfo;
-  EXPECT_EQ(ProcessorArchitecture::X86, Info.ProcessorArch);
-  EXPECT_EQ(0x0201, Info.ProcessorLevel);
-  EXPECT_EQ(0x0403, Info.ProcessorRevision);
-  EXPECT_EQ(5, Info.NumberOfProcessors);
-  EXPECT_EQ(6, Info.ProductType);
-  EXPECT_EQ(0x00090807u, Info.MajorVersion);
-  EXPECT_EQ(0x04030201u, Info.MinorVersion);
-  EXPECT_EQ(0x08070605u, Info.BuildNumber);
-  EXPECT_EQ(OSPlatform::Win32NT, Info.PlatformId);
-  EXPECT_EQ(0x04030201u, Info.CSDVersionRVA);
-  EXPECT_EQ(0x0605u, Info.SuiteMask);
-  EXPECT_EQ(0x0807u, Info.Reserved);
-  EXPECT_EQ("LLVMLLVMLLVM", llvm::StringRef(Info.CPU.X86.VendorID,
-                                            sizeof(Info.CPU.X86.VendorID)));
-  EXPECT_EQ(0x04030201u, Info.CPU.X86.VersionInfo);
-  EXPECT_EQ(0x08070605u, Info.CPU.X86.FeatureInfo);
-  EXPECT_EQ(0x02010009u, Info.CPU.X86.AMDExtendedFeatures);
-}
-
-TEST(MinidumpFile, getString) {
-  std::vector<uint8_t> ManyStrings{
-      // Header
-      'M', 'D', 'M', 'P', 0x93, 0xa7, 0, 0, // Signature, Version
-      2, 0, 0, 0,                           // NumberOfStreams,
-      0x20, 0, 0, 0,                        // StreamDirectoryRVA
-      0, 1, 2, 3, 4, 5, 6, 7,               // Checksum, TimeDateStamp
-      8, 9, 0, 1, 2, 3, 4, 5,               // Flags
-                                            // Stream Directory
-      0, 0, 0, 0, 0, 0, 0, 0,               // Type, DataSize,
-      0x20, 0, 0, 0,                        // RVA
-      1, 0, 0, 0, 0, 0,                     // String1 - odd length
-      0, 0, 1, 0, 0, 0,                     // String2 - too long
-      2, 0, 0, 0, 0, 0xd8,                  // String3 - invalid utf16
-      0, 0, 0, 0, 0, 0,                     // String4 - ""
-      2, 0, 0, 0, 'a', 0,                   // String5 - "a"
-      0,                                    // Mis-align next string
-      2, 0, 0, 0, 'a', 0,                   // String6 - "a"
-
-  };
-  auto ExpectedFile = create(ManyStrings);
-  ASSERT_THAT_EXPECTED(ExpectedFile, Succeeded());
-  const MinidumpFile &File = **ExpectedFile;
-  EXPECT_THAT_EXPECTED(File.getString(44), Failed<BinaryError>());
-  EXPECT_THAT_EXPECTED(File.getString(50), Failed<BinaryError>());
-  EXPECT_THAT_EXPECTED(File.getString(56), Failed<BinaryError>());
-  EXPECT_THAT_EXPECTED(File.getString(62), HasValue(""));
-  EXPECT_THAT_EXPECTED(File.getString(68), HasValue("a"));
-  EXPECT_THAT_EXPECTED(File.getString(75), HasValue("a"));
-
-  // Check the case when the size field does not fit into the remaining data.
-  EXPECT_THAT_EXPECTED(File.getString(ManyStrings.size() - 2),
-                       Failed<BinaryError>());
-}
-
-TEST(MinidumpFile, getModuleList) {
-  std::vector<uint8_t> OneModule{
-      // Header
-      'M', 'D', 'M', 'P', 0x93, 0xa7, 0, 0, // Signature, Version
-      1, 0, 0, 0,                           // NumberOfStreams,
-      32, 0, 0, 0,                          // StreamDirectoryRVA
-      0, 1, 2, 3, 4, 5, 6, 7,               // Checksum, TimeDateStamp
-      0, 0, 0, 0, 0, 0, 0, 0,               // Flags
-                                            // Stream Directory
-      4, 0, 0, 0, 112, 0, 0, 0,             // Type, DataSize,
-      44, 0, 0, 0,                          // RVA
-      // ModuleList
-      1, 0, 0, 0,             // NumberOfModules
-      1, 2, 3, 4, 5, 6, 7, 8, // BaseOfImage
-      9, 0, 1, 2, 3, 4, 5, 6, // SizeOfImage, Checksum
-      7, 8, 9, 0, 1, 2, 3, 4, // TimeDateStamp, ModuleNameRVA
-      0, 0, 0, 0, 0, 0, 0, 0, // Signature, StructVersion
-      0, 0, 0, 0, 0, 0, 0, 0, // FileVersion
-      0, 0, 0, 0, 0, 0, 0, 0, // ProductVersion
-      0, 0, 0, 0, 0, 0, 0, 0, // FileFlagsMask, FileFlags
-      0, 0, 0, 0,             // FileOS
-      0, 0, 0, 0, 0, 0, 0, 0, // FileType, FileSubType
-      0, 0, 0, 0, 0, 0, 0, 0, // FileDate
-      1, 2, 3, 4, 5, 6, 7, 8, // CvRecord
-      9, 0, 1, 2, 3, 4, 5, 6, // MiscRecord
-      7, 8, 9, 0, 1, 2, 3, 4, // Reserved0
-      5, 6, 7, 8, 9, 0, 1, 2, // Reserved1
-  };
-  // Same as before, but with a padded module list.
-  std::vector<uint8_t> PaddedModule{
-      // Header
-      'M', 'D', 'M', 'P', 0x93, 0xa7, 0, 0, // Signature, Version
-      1, 0, 0, 0,                           // NumberOfStreams,
-      32, 0, 0, 0,                          // StreamDirectoryRVA
-      0, 1, 2, 3, 4, 5, 6, 7,               // Checksum, TimeDateStamp
-      0, 0, 0, 0, 0, 0, 0, 0,               // Flags
-                                            // Stream Directory
-      4, 0, 0, 0, 116, 0, 0, 0,             // Type, DataSize,
-      44, 0, 0, 0,                          // RVA
-      // ModuleList
-      1, 0, 0, 0,             // NumberOfModules
-      0, 0, 0, 0,             // Padding
-      1, 2, 3, 4, 5, 6, 7, 8, // BaseOfImage
-      9, 0, 1, 2, 3, 4, 5, 6, // SizeOfImage, Checksum
-      7, 8, 9, 0, 1, 2, 3, 4, // TimeDateStamp, ModuleNameRVA
-      0, 0, 0, 0, 0, 0, 0, 0, // Signature, StructVersion
-      0, 0, 0, 0, 0, 0, 0, 0, // FileVersion
-      0, 0, 0, 0, 0, 0, 0, 0, // ProductVersion
-      0, 0, 0, 0, 0, 0, 0, 0, // FileFlagsMask, FileFlags
-      0, 0, 0, 0,             // FileOS
-      0, 0, 0, 0, 0, 0, 0, 0, // FileType, FileSubType
-      0, 0, 0, 0, 0, 0, 0, 0, // FileDate
-      1, 2, 3, 4, 5, 6, 7, 8, // CvRecord
-      9, 0, 1, 2, 3, 4, 5, 6, // MiscRecord
-      7, 8, 9, 0, 1, 2, 3, 4, // Reserved0
-      5, 6, 7, 8, 9, 0, 1, 2, // Reserved1
-  };
-
-  for (ArrayRef<uint8_t> Data : {OneModule, PaddedModule}) {
-    auto ExpectedFile = create(Data);
-    ASSERT_THAT_EXPECTED(ExpectedFile, Succeeded());
-    const MinidumpFile &File = **ExpectedFile;
-    Expected<ArrayRef<Module>> ExpectedModule = File.getModuleList();
-    ASSERT_THAT_EXPECTED(ExpectedModule, Succeeded());
-    ASSERT_EQ(1u, ExpectedModule->size());
-    const Module &M = ExpectedModule.get()[0];
-    EXPECT_EQ(0x0807060504030201u, M.BaseOfImage);
-    EXPECT_EQ(0x02010009u, M.SizeOfImage);
-    EXPECT_EQ(0x06050403u, M.Checksum);
-    EXPECT_EQ(0x00090807u, M.TimeDateStamp);
-    EXPECT_EQ(0x04030201u, M.ModuleNameRVA);
-    EXPECT_EQ(0x04030201u, M.CvRecord.DataSize);
-    EXPECT_EQ(0x08070605u, M.CvRecord.RVA);
-    EXPECT_EQ(0x02010009u, M.MiscRecord.DataSize);
-    EXPECT_EQ(0x06050403u, M.MiscRecord.RVA);
-    EXPECT_EQ(0x0403020100090807u, M.Reserved0);
-    EXPECT_EQ(0x0201000908070605u, M.Reserved1);
-  }
-
-  std::vector<uint8_t> StreamTooShort{
-      // Header
-      'M', 'D', 'M', 'P', 0x93, 0xa7, 0, 0, // Signature, Version
-      1, 0, 0, 0,                           // NumberOfStreams,
-      32, 0, 0, 0,                          // StreamDirectoryRVA
-      0, 1, 2, 3, 4, 5, 6, 7,               // Checksum, TimeDateStamp
-      0, 0, 0, 0, 0, 0, 0, 0,               // Flags
-                                            // Stream Directory
-      4, 0, 0, 0, 111, 0, 0, 0,             // Type, DataSize,
-      44, 0, 0, 0,                          // RVA
-      // ModuleList
-      1, 0, 0, 0,             // NumberOfModules
-      1, 2, 3, 4, 5, 6, 7, 8, // BaseOfImage
-      9, 0, 1, 2, 3, 4, 5, 6, // SizeOfImage, Checksum
-      7, 8, 9, 0, 1, 2, 3, 4, // TimeDateStamp, ModuleNameRVA
-      0, 0, 0, 0, 0, 0, 0, 0, // Signature, StructVersion
-      0, 0, 0, 0, 0, 0, 0, 0, // FileVersion
-      0, 0, 0, 0, 0, 0, 0, 0, // ProductVersion
-      0, 0, 0, 0, 0, 0, 0, 0, // FileFlagsMask, FileFlags
-      0, 0, 0, 0,             // FileOS
-      0, 0, 0, 0, 0, 0, 0, 0, // FileType, FileSubType
-      0, 0, 0, 0, 0, 0, 0, 0, // FileDate
-      1, 2, 3, 4, 5, 6, 7, 8, // CvRecord
-      9, 0, 1, 2, 3, 4, 5, 6, // MiscRecord
-      7, 8, 9, 0, 1, 2, 3, 4, // Reserved0
-      5, 6, 7, 8, 9, 0, 1, 2, // Reserved1
-  };
-  auto ExpectedFile = create(StreamTooShort);
-  ASSERT_THAT_EXPECTED(ExpectedFile, Succeeded());
-  const MinidumpFile &File = **ExpectedFile;
-  EXPECT_THAT_EXPECTED(File.getModuleList(), Failed<BinaryError>());
-}
-
-TEST(MinidumpFile, getThreadList) {
-  std::vector<uint8_t> OneThread{
-      // Header
-      'M', 'D', 'M', 'P', 0x93, 0xa7, 0, 0, // Signature, Version
-      1, 0, 0, 0,                           // NumberOfStreams,
-      32, 0, 0, 0,                          // StreamDirectoryRVA
-      0, 1, 2, 3, 4, 5, 6, 7,               // Checksum, TimeDateStamp
-      0, 0, 0, 0, 0, 0, 0, 0,               // Flags
-                                            // Stream Directory
-      3, 0, 0, 0, 52, 0, 0, 0,              // Type, DataSize,
-      44, 0, 0, 0,                          // RVA
-      // ThreadList
-      1, 0, 0, 0,             // NumberOfThreads
-      1, 2, 3, 4, 5, 6, 7, 8, // ThreadId, SuspendCount
-      9, 0, 1, 2, 3, 4, 5, 6, // PriorityClass, Priority
-      7, 8, 9, 0, 1, 2, 3, 4, // EnvironmentBlock
-      // Stack
-      5, 6, 7, 8, 9, 0, 1, 2, // StartOfMemoryRange
-      3, 4, 5, 6, 7, 8, 9, 0, // DataSize, RVA
-      // Context
-      1, 2, 3, 4, 5, 6, 7, 8, // DataSize, RVA
-  };
-  // Same as before, but with a padded thread list.
-  std::vector<uint8_t> PaddedThread{
-      // Header
-      'M', 'D', 'M', 'P', 0x93, 0xa7, 0, 0, // Signature, Version
-      1, 0, 0, 0,                           // NumberOfStreams,
-      32, 0, 0, 0,                          // StreamDirectoryRVA
-      0, 1, 2, 3, 4, 5, 6, 7,               // Checksum, TimeDateStamp
-      0, 0, 0, 0, 0, 0, 0, 0,               // Flags
-                                            // Stream Directory
-      3, 0, 0, 0, 56, 0, 0, 0,              // Type, DataSize,
-      44, 0, 0, 0,                          // RVA
-      // ThreadList
-      1, 0, 0, 0,             // NumberOfThreads
-      0, 0, 0, 0,             // Padding
-      1, 2, 3, 4, 5, 6, 7, 8, // ThreadId, SuspendCount
-      9, 0, 1, 2, 3, 4, 5, 6, // PriorityClass, Priority
-      7, 8, 9, 0, 1, 2, 3, 4, // EnvironmentBlock
-      // Stack
-      5, 6, 7, 8, 9, 0, 1, 2, // StartOfMemoryRange
-      3, 4, 5, 6, 7, 8, 9, 0, // DataSize, RVA
-      // Context
-      1, 2, 3, 4, 5, 6, 7, 8, // DataSize, RVA
-  };
-
-  for (ArrayRef<uint8_t> Data : {OneThread, PaddedThread}) {
-    auto ExpectedFile = create(Data);
-    ASSERT_THAT_EXPECTED(ExpectedFile, Succeeded());
-    const MinidumpFile &File = **ExpectedFile;
-    Expected<ArrayRef<Thread>> ExpectedThread = File.getThreadList();
-    ASSERT_THAT_EXPECTED(ExpectedThread, Succeeded());
-    ASSERT_EQ(1u, ExpectedThread->size());
-    const Thread &T = ExpectedThread.get()[0];
-    EXPECT_EQ(0x04030201u, T.ThreadId);
-    EXPECT_EQ(0x08070605u, T.SuspendCount);
-    EXPECT_EQ(0x02010009u, T.PriorityClass);
-    EXPECT_EQ(0x06050403u, T.Priority);
-    EXPECT_EQ(0x0403020100090807u, T.EnvironmentBlock);
-    EXPECT_EQ(0x0201000908070605u, T.Stack.StartOfMemoryRange);
-    EXPECT_EQ(0x06050403u, T.Stack.Memory.DataSize);
-    EXPECT_EQ(0x00090807u, T.Stack.Memory.RVA);
-    EXPECT_EQ(0x04030201u, T.Context.DataSize);
-    EXPECT_EQ(0x08070605u, T.Context.RVA);
-  }
-}
-
-TEST(MinidumpFile, getMemoryList) {
-  std::vector<uint8_t> OneRange{
-      // Header
-      'M', 'D', 'M', 'P', 0x93, 0xa7, 0, 0, // Signature, Version
-      1, 0, 0, 0,                           // NumberOfStreams,
-      32, 0, 0, 0,                          // StreamDirectoryRVA
-      0, 1, 2, 3, 4, 5, 6, 7,               // Checksum, TimeDateStamp
-      0, 0, 0, 0, 0, 0, 0, 0,               // Flags
-                                            // Stream Directory
-      5, 0, 0, 0, 20, 0, 0, 0,              // Type, DataSize,
-      44, 0, 0, 0,                          // RVA
-      // MemoryDescriptor
-      1, 0, 0, 0,             // NumberOfMemoryRanges
-      5, 6, 7, 8, 9, 0, 1, 2, // StartOfMemoryRange
-      3, 4, 5, 6, 7, 8, 9, 0, // DataSize, RVA
-  };
-  // Same as before, but with a padded memory list.
-  std::vector<uint8_t> PaddedRange{
-      // Header
-      'M', 'D', 'M', 'P', 0x93, 0xa7, 0, 0, // Signature, Version
-      1, 0, 0, 0,                           // NumberOfStreams,
-      32, 0, 0, 0,                          // StreamDirectoryRVA
-      0, 1, 2, 3, 4, 5, 6, 7,               // Checksum, TimeDateStamp
-      0, 0, 0, 0, 0, 0, 0, 0,               // Flags
-                                            // Stream Directory
-      5, 0, 0, 0, 24, 0, 0, 0,              // Type, DataSize,
-      44, 0, 0, 0,                          // RVA
-      // MemoryDescriptor
-      1, 0, 0, 0,             // NumberOfMemoryRanges
-      0, 0, 0, 0,             // Padding
-      5, 6, 7, 8, 9, 0, 1, 2, // StartOfMemoryRange
-      3, 4, 5, 6, 7, 8, 9, 0, // DataSize, RVA
-  };
-
-  for (ArrayRef<uint8_t> Data : {OneRange, PaddedRange}) {
-    auto ExpectedFile = create(Data);
-    ASSERT_THAT_EXPECTED(ExpectedFile, Succeeded());
-    const MinidumpFile &File = **ExpectedFile;
-    Expected<ArrayRef<MemoryDescriptor>> ExpectedRanges = File.getMemoryList();
-    ASSERT_THAT_EXPECTED(ExpectedRanges, Succeeded());
-    ASSERT_EQ(1u, ExpectedRanges->size());
-    const MemoryDescriptor &MD = ExpectedRanges.get()[0];
-    EXPECT_EQ(0x0201000908070605u, MD.StartOfMemoryRange);
-    EXPECT_EQ(0x06050403u, MD.Memory.DataSize);
-    EXPECT_EQ(0x00090807u, MD.Memory.RVA);
-  }
-}
-
-TEST(MinidumpFile, getMemoryInfoList) {
-  std::vector<uint8_t> OneEntry{
-      // Header
-      'M', 'D', 'M', 'P', 0x93, 0xa7, 0, 0, // Signature, Version
-      1, 0, 0, 0,                           // NumberOfStreams,
-      32, 0, 0, 0,                          // StreamDirectoryRVA
-      0, 1, 2, 3, 4, 5, 6, 7,               // Checksum, TimeDateStamp
-      0, 0, 0, 0, 0, 0, 0, 0,               // Flags
-                                            // Stream Directory
-      16, 0, 0, 0, 64, 0, 0, 0,             // Type, DataSize,
-      44, 0, 0, 0,                          // RVA
-      // MemoryInfoListHeader
-      16, 0, 0, 0, 48, 0, 0, 0, // SizeOfHeader, SizeOfEntry
-      1, 0, 0, 0, 0, 0, 0, 0,   // NumberOfEntries
-      // MemoryInfo
-      0, 1, 2, 3, 4, 5, 6, 7,   // BaseAddress
-      8, 9, 0, 1, 2, 3, 4, 5,   // AllocationBase
-      16, 0, 0, 0, 6, 7, 8, 9,  // AllocationProtect, Reserved0
-      0, 1, 2, 3, 4, 5, 6, 7,   // RegionSize
-      0, 16, 0, 0, 32, 0, 0, 0, // State, Protect
-      0, 0, 2, 0, 8, 9, 0, 1,   // Type, Reserved1
-  };
-
-  // Same as before, but the list header is larger.
-  std::vector<uint8_t> BiggerHeader{
-      // Header
-      'M', 'D', 'M', 'P', 0x93, 0xa7, 0, 0, // Signature, Version
-      1, 0, 0, 0,                           // NumberOfStreams,
-      32, 0, 0, 0,                          // StreamDirectoryRVA
-      0, 1, 2, 3, 4, 5, 6, 7,               // Checksum, TimeDateStamp
-      0, 0, 0, 0, 0, 0, 0, 0,               // Flags
-                                            // Stream Directory
-      16, 0, 0, 0, 68, 0, 0, 0,             // Type, DataSize,
-      44, 0, 0, 0,                          // RVA
-      // MemoryInfoListHeader
-      20, 0, 0, 0, 48, 0, 0, 0, // SizeOfHeader, SizeOfEntry
-      1, 0, 0, 0, 0, 0, 0, 0,   // NumberOfEntries
-      0, 0, 0, 0,               // ???
-      // MemoryInfo
-      0, 1, 2, 3, 4, 5, 6, 7,   // BaseAddress
-      8, 9, 0, 1, 2, 3, 4, 5,   // AllocationBase
-      16, 0, 0, 0, 6, 7, 8, 9,  // AllocationProtect, Reserved0
-      0, 1, 2, 3, 4, 5, 6, 7,   // RegionSize
-      0, 16, 0, 0, 32, 0, 0, 0, // State, Protect
-      0, 0, 2, 0, 8, 9, 0, 1,   // Type, Reserved1
-  };
-
-  // Same as before, but the entry is larger.
-  std::vector<uint8_t> BiggerEntry{
-      // Header
-      'M', 'D', 'M', 'P', 0x93, 0xa7, 0, 0, // Signature, Version
-      1, 0, 0, 0,                           // NumberOfStreams,
-      32, 0, 0, 0,                          // StreamDirectoryRVA
-      0, 1, 2, 3, 4, 5, 6, 7,               // Checksum, TimeDateStamp
-      0, 0, 0, 0, 0, 0, 0, 0,               // Flags
-                                            // Stream Directory
-      16, 0, 0, 0, 68, 0, 0, 0,             // Type, DataSize,
-      44, 0, 0, 0,                          // RVA
-      // MemoryInfoListHeader
-      16, 0, 0, 0, 52, 0, 0, 0, // SizeOfHeader, SizeOfEntry
-      1, 0, 0, 0, 0, 0, 0, 0,   // NumberOfEntries
-      // MemoryInfo
-      0, 1, 2, 3, 4, 5, 6, 7,   // BaseAddress
-      8, 9, 0, 1, 2, 3, 4, 5,   // AllocationBase
-      16, 0, 0, 0, 6, 7, 8, 9,  // AllocationProtect, Reserved0
-      0, 1, 2, 3, 4, 5, 6, 7,   // RegionSize
-      0, 16, 0, 0, 32, 0, 0, 0, // State, Protect
-      0, 0, 2, 0, 8, 9, 0, 1,   // Type, Reserved1
-      0, 0, 0, 0,               // ???
-  };
-
-  for (ArrayRef<uint8_t> Data : {OneEntry, BiggerHeader, BiggerEntry}) {
-    auto ExpectedFile = create(Data);
-    ASSERT_THAT_EXPECTED(ExpectedFile, Succeeded());
-    const MinidumpFile &File = **ExpectedFile;
-    auto ExpectedInfo = File.getMemoryInfoList();
-    ASSERT_THAT_EXPECTED(ExpectedInfo, Succeeded());
-    ASSERT_EQ(1, std::distance(ExpectedInfo->begin(), ExpectedInfo->end()));
-    const MemoryInfo &Info = *ExpectedInfo.get().begin();
-    EXPECT_EQ(0x0706050403020100u, Info.BaseAddress);
-    EXPECT_EQ(0x0504030201000908u, Info.AllocationBase);
-    EXPECT_EQ(MemoryProtection::Execute, Info.AllocationProtect);
-    EXPECT_EQ(0x09080706u, Info.Reserved0);
-    EXPECT_EQ(0x0706050403020100u, Info.RegionSize);
-    EXPECT_EQ(MemoryState::Commit, Info.State);
-    EXPECT_EQ(MemoryProtection::ExecuteRead, Info.Protect);
-    EXPECT_EQ(MemoryType::Private, Info.Type);
-    EXPECT_EQ(0x01000908u, Info.Reserved1);
-  }
-
-  // Header does not fit into the stream.
-  std::vector<uint8_t> HeaderTooBig{
-      // Header
-      'M', 'D', 'M', 'P', 0x93, 0xa7, 0, 0, // Signature, Version
-      1, 0, 0, 0,                           // NumberOfStreams,
-      32, 0, 0, 0,                          // StreamDirectoryRVA
-      0, 1, 2, 3, 4, 5, 6, 7,               // Checksum, TimeDateStamp
-      0, 0, 0, 0, 0, 0, 0, 0,               // Flags
-                                            // Stream Directory
-      16, 0, 0, 0, 15, 0, 0, 0,             // Type, DataSize,
-      44, 0, 0, 0,                          // RVA
-      // MemoryInfoListHeader
-      16, 0, 0, 0, 48, 0, 0, 0, // SizeOfHeader, SizeOfEntry
-      1, 0, 0, 0, 0, 0, 0,      // ???
-  };
-  Expected<std::unique_ptr<MinidumpFile>> File = create(HeaderTooBig);
-  ASSERT_THAT_EXPECTED(File, Succeeded());
-  EXPECT_THAT_EXPECTED(File.get()->getMemoryInfoList(), Failed<BinaryError>());
-
-  // Header fits into the stream, but it is too small to contain the required
-  // entries.
-  std::vector<uint8_t> HeaderTooSmall{
-      // Header
-      'M', 'D', 'M', 'P', 0x93, 0xa7, 0, 0, // Signature, Version
-      1, 0, 0, 0,                           // NumberOfStreams,
-      32, 0, 0, 0,                          // StreamDirectoryRVA
-      0, 1, 2, 3, 4, 5, 6, 7,               // Checksum, TimeDateStamp
-      0, 0, 0, 0, 0, 0, 0, 0,               // Flags
-                                            // Stream Directory
-      16, 0, 0, 0, 15, 0, 0, 0,             // Type, DataSize,
-      44, 0, 0, 0,                          // RVA
-      // MemoryInfoListHeader
-      15, 0, 0, 0, 48, 0, 0, 0, // SizeOfHeader, SizeOfEntry
-      1, 0, 0, 0, 0, 0, 0,      // ???
-  };
-  File = create(HeaderTooSmall);
-  ASSERT_THAT_EXPECTED(File, Succeeded());
-  EXPECT_THAT_EXPECTED(File.get()->getMemoryInfoList(), Failed<BinaryError>());
-
-  std::vector<uint8_t> EntryTooBig{
-      // Header
-      'M', 'D', 'M', 'P', 0x93, 0xa7, 0, 0, // Signature, Version
-      1, 0, 0, 0,                           // NumberOfStreams,
-      32, 0, 0, 0,                          // StreamDirectoryRVA
-      0, 1, 2, 3, 4, 5, 6, 7,               // Checksum, TimeDateStamp
-      0, 0, 0, 0, 0, 0, 0, 0,               // Flags
-                                            // Stream Directory
-      16, 0, 0, 0, 64, 0, 0, 0,             // Type, DataSize,
-      44, 0, 0, 0,                          // RVA
-      // MemoryInfoListHeader
-      16, 0, 0, 0, 49, 0, 0, 0, // SizeOfHeader, SizeOfEntry
-      1, 0, 0, 0, 0, 0, 0, 0,   // NumberOfEntries
-      // MemoryInfo
-      0, 1, 2, 3, 4, 5, 6, 7,   // BaseAddress
-      8, 9, 0, 1, 2, 3, 4, 5,   // AllocationBase
-      16, 0, 0, 0, 6, 7, 8, 9,  // AllocationProtect, Reserved0
-      0, 1, 2, 3, 4, 5, 6, 7,   // RegionSize
-      0, 16, 0, 0, 32, 0, 0, 0, // State, Protect
-      0, 0, 2, 0, 8, 9, 0, 1,   // Type, Reserved1
-  };
-  File = create(EntryTooBig);
-  ASSERT_THAT_EXPECTED(File, Succeeded());
-  EXPECT_THAT_EXPECTED(File.get()->getMemoryInfoList(), Failed<BinaryError>());
-
-  std::vector<uint8_t> ThreeEntries{
-      // Header
-      'M', 'D', 'M', 'P', 0x93, 0xa7, 0, 0, // Signature, Version
-      1, 0, 0, 0,                           // NumberOfStreams,
-      32, 0, 0, 0,                          // StreamDirectoryRVA
-      0, 1, 2, 3, 4, 5, 6, 7,               // Checksum, TimeDateStamp
-      0, 0, 0, 0, 0, 0, 0, 0,               // Flags
-                                            // Stream Directory
-      16, 0, 0, 0, 160, 0, 0, 0,            // Type, DataSize,
-      44, 0, 0, 0,                          // RVA
-      // MemoryInfoListHeader
-      16, 0, 0, 0, 48, 0, 0, 0, // SizeOfHeader, SizeOfEntry
-      3, 0, 0, 0, 0, 0, 0, 0,   // NumberOfEntries
-      // MemoryInfo
-      0, 1, 2, 3, 0, 0, 0, 0, // BaseAddress
-      0, 0, 0, 0, 0, 0, 0, 0, // AllocationBase
-      0, 0, 0, 0, 0, 0, 0, 0, // AllocationProtect, Reserved0
-      0, 0, 0, 0, 0, 0, 0, 0, // RegionSize
-      0, 0, 0, 0, 0, 0, 0, 0, // State, Protect
-      0, 0, 0, 0, 0, 0, 0, 0, // Type, Reserved1
-      0, 0, 4, 5, 6, 7, 0, 0, // BaseAddress
-      0, 0, 0, 0, 0, 0, 0, 0, // AllocationBase
-      0, 0, 0, 0, 0, 0, 0, 0, // AllocationProtect, Reserved0
-      0, 0, 0, 0, 0, 0, 0, 0, // RegionSize
-      0, 0, 0, 0, 0, 0, 0, 0, // State, Protect
-      0, 0, 0, 0, 0, 0, 0, 0, // Type, Reserved1
-      0, 0, 0, 8, 9, 0, 1, 0, // BaseAddress
-      0, 0, 0, 0, 0, 0, 0, 0, // AllocationBase
-      0, 0, 0, 0, 0, 0, 0, 0, // AllocationProtect, Reserved0
-      0, 0, 0, 0, 0, 0, 0, 0, // RegionSize
-      0, 0, 0, 0, 0, 0, 0, 0, // State, Protect
-      0, 0, 0, 0, 0, 0, 0, 0, // Type, Reserved1
-  };
-  File = create(ThreeEntries);
-  ASSERT_THAT_EXPECTED(File, Succeeded());
-  auto ExpectedInfo = File.get()->getMemoryInfoList();
-  ASSERT_THAT_EXPECTED(ExpectedInfo, Succeeded());
-  EXPECT_THAT(to_vector<3>(map_range(*ExpectedInfo,
-                                     [](const MemoryInfo &Info) -> uint64_t {
-                                       return Info.BaseAddress;
-                                     })),
-              testing::ElementsAre(0x0000000003020100u, 0x0000070605040000u,
-                                   0x0001000908000000u));
-}
-
-TEST(MinidumpFile, getExceptionStream) {
-  std::vector<uint8_t> Data{
-      // Header
-      'M', 'D', 'M', 'P', 0x93, 0xa7, 0, 0, // Signature, Version
-      1, 0, 0, 0,                           // NumberOfStreams,
-      0x20, 0, 0, 0,                        // StreamDirectoryRVA
-      0, 1, 2, 3, 4, 5, 6, 7,               // Checksum, TimeDateStamp
-      8, 9, 0, 1, 2, 3, 4, 5,               // Flags
-      // Stream Directory
-      6, 0, 0, 0, 168, 0, 0, 0, // Type, DataSize,
-      0x2c, 0, 0, 0,            // RVA
-      // Exception Stream
-      1, 2, 3, 4, // Thread ID
-      0, 0, 0, 0, // Padding
-      // Exception Record
-      2, 3, 4, 2, 7, 8, 8, 9,  // Code, Flags
-      3, 4, 5, 6, 7, 8, 9, 10, // Inner exception record address
-      8, 7, 6, 5, 4, 3, 2, 1,  // Exception address
-      4, 0, 0, 0, 0, 0, 0, 0,  // Parameter count, padding
-      0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, // Parameter 0
-      0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, // Parameter 1
-      0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, // Parameter 2
-      0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, // Parameter 3
-      0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, // Parameter 4
-      0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, // Parameter 5
-      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, // Parameter 6
-      0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, // Parameter 7
-      0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, // Parameter 8
-      0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, // Parameter 9
-      0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, // Parameter 10
-      0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, // Parameter 11
-      0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, // Parameter 12
-      0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, // Parameter 13
-      0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, // Parameter 14
-      // Thread Context
-      0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, // DataSize, RVA
-  };
-  auto ExpectedFile = create(Data);
-  ASSERT_THAT_EXPECTED(ExpectedFile, Succeeded());
-  const MinidumpFile &File = **ExpectedFile;
-  Expected<const minidump::ExceptionStream &> ExpectedStream =
-      File.getExceptionStream();
-  ASSERT_THAT_EXPECTED(ExpectedStream, Succeeded());
-  EXPECT_EQ(0x04030201u, ExpectedStream->ThreadId);
-  const minidump::Exception &Exception = ExpectedStream->ExceptionRecord;
-  EXPECT_EQ(0x02040302u, Exception.ExceptionCode);
-  EXPECT_EQ(0x09080807u, Exception.ExceptionFlags);
-  EXPECT_EQ(0x0a09080706050403u, Exception.ExceptionRecord);
-  EXPECT_EQ(0x0102030405060708u, Exception.ExceptionAddress);
-  EXPECT_EQ(4u, Exception.NumberParameters);
-  for (uint64_t index = 0; index < Exception.MaxParameters; ++index) {
-    EXPECT_EQ(0x1716151413121110u + index * 0x1010101010101010u,
-              Exception.ExceptionInformation[index]);
-  }
-  EXPECT_EQ(0x84838281, ExpectedStream->ThreadContext.DataSize);
-  EXPECT_EQ(0x88878685, ExpectedStream->ThreadContext.RVA);
-}
diff --git a/gnu/llvm/llvm/unittests/Object/ObjectFileTest.cpp b/gnu/llvm/llvm/unittests/Object/ObjectFileTest.cpp
deleted file mode 100644
index 7309c2c2528..00000000000
--- a/gnu/llvm/llvm/unittests/Object/ObjectFileTest.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===- ObjectFileTest.cpp - Tests for ObjectFile.cpp ----------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Object/ObjectFile.h"
-#include "llvm/Support/ScopedPrinter.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::object;
-
-TEST(SectionedAddress, StreamingOperator) {
-  EXPECT_EQ("SectionedAddress{0x00000047}", to_string(SectionedAddress{0x47}));
-  EXPECT_EQ("SectionedAddress{0x00000047, 42}",
-            to_string(SectionedAddress{0x47, 42}));
-}
diff --git a/gnu/llvm/llvm/unittests/Object/SymbolSizeTest.cpp b/gnu/llvm/llvm/unittests/Object/SymbolSizeTest.cpp
deleted file mode 100644
index 41269a61116..00000000000
--- a/gnu/llvm/llvm/unittests/Object/SymbolSizeTest.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-//===- SymbolSizeTest.cpp - Tests for SymbolSize.cpp ----------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Object/SymbolSize.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::object;
-
-TEST(Object, SymbolSizeSort) {
-  auto it = symbol_iterator(SymbolRef());
-  std::vector<SymEntry> Syms{
-      SymEntry{it, 0xffffffff00000000ull, 1, 0},
-      SymEntry{it, 0x00ffffff00000000ull, 2, 0},
-      SymEntry{it, 0x00ffffff000000ffull, 3, 0},
-      SymEntry{it, 0x0000000100000000ull, 4, 0},
-      SymEntry{it, 0x00000000000000ffull, 5, 0},
-      SymEntry{it, 0x00000001000000ffull, 6, 0},
-      SymEntry{it, 0x000000010000ffffull, 7, 0},
-  };
-
-  array_pod_sort(Syms.begin(), Syms.end(), compareAddress);
-
-  for (unsigned I = 0, N = Syms.size(); I < N - 1; ++I) {
-    EXPECT_LE(Syms[I].Address, Syms[I + 1].Address);
-  }
-}
diff --git a/gnu/llvm/llvm/unittests/Object/SymbolicFileTest.cpp b/gnu/llvm/llvm/unittests/Object/SymbolicFileTest.cpp
deleted file mode 100644
index 3fc5d540e21..00000000000
--- a/gnu/llvm/llvm/unittests/Object/SymbolicFileTest.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-//===- SymbolicFileTest.cpp - Tests for SymbolicFile.cpp ------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Object/SymbolicFile.h"
-#include "llvm/Support/Host.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gtest/gtest.h"
-#include <sstream>
-
-TEST(Object, DataRefImplOstream) {
-  std::string s;
-  llvm::raw_string_ostream OS(s);
-  llvm::object::DataRefImpl Data;
-  Data.d.a = 0xeeee0000;
-  Data.d.b = 0x0000ffff;
-
-  static_assert(sizeof Data.p == sizeof(uint64_t) ||
-                    sizeof Data.p == sizeof(uint32_t),
-                "Test expected pointer type to be 32 or 64-bit.");
-
-  char const *Expected;
-
-  if (sizeof Data.p == sizeof(uint64_t)) {
-    Expected = llvm::sys::IsLittleEndianHost
-                             ? "(0xffffeeee0000 (0xeeee0000, 0x0000ffff))"
-                             : "(0xeeee00000000ffff (0xeeee0000, 0x0000ffff))";
-  }
-  else {
-    Expected = "(0xeeee0000 (0xeeee0000, 0x0000ffff))";
-  }
-
-  OS << Data;
-  OS.flush();
-
-  EXPECT_EQ(Expected, s);
-}
diff --git a/gnu/llvm/llvm/unittests/Object/XCOFFObjectFileTest.cpp b/gnu/llvm/llvm/unittests/Object/XCOFFObjectFileTest.cpp
deleted file mode 100644
index fc7e48100aa..00000000000
--- a/gnu/llvm/llvm/unittests/Object/XCOFFObjectFileTest.cpp
+++ /dev/null
@@ -1,558 +0,0 @@
-//===- XCOFFObjectFileTest.cpp - Tests for XCOFFObjectFile ----------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Object/ELFObjectFile.h"
-#include "llvm/Object/XCOFFObjectFile.h"
-#include "llvm/Testing/Support/Error.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::object;
-using namespace llvm::XCOFF;
-
-TEST(XCOFFObjectFileTest, XCOFFObjectType) {
-  // Create an arbitrary object of a non-XCOFF type and test that
-  // dyn_cast<XCOFFObjectFile> returns null for it.
-  char Buf[sizeof(typename ELF64LE::Ehdr)] = {};
-  memcpy(Buf, "\177ELF", 4);
-
-  auto *EHdr = reinterpret_cast<typename ELF64LE::Ehdr *>(Buf);
-  EHdr->e_ident[llvm::ELF::EI_CLASS] = llvm::ELF::ELFCLASS64;
-  EHdr->e_ident[llvm::ELF::EI_DATA] = llvm::ELF::ELFDATA2LSB;
-
-  MemoryBufferRef Source(StringRef(Buf, sizeof(Buf)), "non-XCOFF");
-  Expected<std::unique_ptr<ObjectFile>> ObjOrErr =
-      ObjectFile::createObjectFile(Source);
-  ASSERT_THAT_EXPECTED(ObjOrErr, Succeeded());
-
-  EXPECT_TRUE(dyn_cast<XCOFFObjectFile>((*ObjOrErr).get()) == nullptr);
-}
-
-TEST(XCOFFObjectFileTest, doesXCOFFTracebackTableBegin) {
-  EXPECT_TRUE(doesXCOFFTracebackTableBegin({0, 0, 0, 0}));
-  EXPECT_TRUE(doesXCOFFTracebackTableBegin({0, 0, 0, 0, 1}));
-  EXPECT_FALSE(doesXCOFFTracebackTableBegin({0, 0, 0, 1}));
-  EXPECT_FALSE(doesXCOFFTracebackTableBegin({0, 0, 0}));
-}
-
-TEST(XCOFFObjectFileTest, XCOFFTracebackTableAPIGeneral) {
-  uint8_t V[] = {0x00, 0x00, 0x22, 0x40, 0x80, 0x00, 0x01, 0x05, 0x58, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x07, 0x61, 0x64,
-                 0x64, 0x5f, 0x61, 0x6c, 0x6c, 0x00, 0x00, 0x00};
-  uint64_t Size = sizeof(V);
-  Expected<XCOFFTracebackTable> TTOrErr = XCOFFTracebackTable::create(V, Size);
-  ASSERT_THAT_EXPECTED(TTOrErr, Succeeded());
-  XCOFFTracebackTable TT = *TTOrErr;
-
-  EXPECT_EQ(TT.getVersion(), 0);
-
-  EXPECT_EQ(TT.getLanguageID(), 0);
-
-  EXPECT_FALSE(TT.isGlobalLinkage());
-  EXPECT_FALSE(TT.isOutOfLineEpilogOrPrologue());
-  EXPECT_TRUE(TT.hasTraceBackTableOffset());
-  EXPECT_FALSE(TT.isInternalProcedure());
-  EXPECT_FALSE(TT.hasControlledStorage());
-  EXPECT_FALSE(TT.isTOCless());
-  EXPECT_TRUE(TT.isFloatingPointPresent());
-  EXPECT_FALSE(TT.isFloatingPointOperationLogOrAbortEnabled());
-
-  EXPECT_FALSE(TT.isInterruptHandler());
-  EXPECT_TRUE(TT.isFuncNamePresent());
-  EXPECT_FALSE(TT.isAllocaUsed());
-  EXPECT_EQ(TT.getOnConditionDirective(), 0);
-  EXPECT_FALSE(TT.isCRSaved());
-  EXPECT_FALSE(TT.isLRSaved());
-
-  EXPECT_TRUE(TT.isBackChainStored());
-  EXPECT_FALSE(TT.isFixup());
-  EXPECT_EQ(TT.getNumOfFPRsSaved(), 0);
-
-  EXPECT_FALSE(TT.hasExtensionTable());
-  EXPECT_FALSE(TT.hasVectorInfo());
-  EXPECT_EQ(TT.getNumOfGPRsSaved(), 0);
-
-  EXPECT_EQ(TT.getNumberOfFixedParms(), 1);
-
-  EXPECT_EQ(TT.getNumberOfFPParms(), 2);
-  EXPECT_TRUE(TT.hasParmsOnStack());
-
-  ASSERT_TRUE(TT.getParmsType());
-  EXPECT_EQ(TT.getParmsType().getValue(), "i, f, d");
-
-  ASSERT_TRUE(TT.getTraceBackTableOffset());
-  EXPECT_EQ(TT.getTraceBackTableOffset().getValue(), 64u);
-
-  EXPECT_FALSE(TT.getHandlerMask());
-
-  ASSERT_TRUE(TT.getFunctionName());
-  EXPECT_EQ(TT.getFunctionName().getValue(), "add_all");
-  EXPECT_EQ(TT.getFunctionName().getValue().size(), 7u);
-
-  EXPECT_FALSE(TT.getAllocaRegister());
-  EXPECT_EQ(Size, 25u);
-}
-
-TEST(XCOFFObjectFileTest, XCOFFTracebackTableAPIParmsType) {
-  uint8_t V[] = {0x01, 0x02, 0xA2, 0x40, 0x80, 0x00, 0x02, 0x07, 0x2B, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x07, 0x61, 0x64,
-                 0x64, 0x5f, 0x61, 0x6c, 0x6c, 0x00, 0x00, 0x00};
-  uint64_t Size = sizeof(V);
-  Expected<XCOFFTracebackTable> TTOrErr = XCOFFTracebackTable::create(V, Size);
-
-  ASSERT_THAT_EXPECTED(TTOrErr, Succeeded());
-  XCOFFTracebackTable TT = *TTOrErr;
-  EXPECT_EQ(TT.getVersion(), 1);
-  EXPECT_EQ(TT.getLanguageID(), 2);
-
-  EXPECT_TRUE(TT.isGlobalLinkage());
-  EXPECT_EQ(TT.getNumberOfFixedParms(), 2);
-
-  EXPECT_EQ(TT.getNumberOfFPParms(), 3);
-
-  ASSERT_TRUE(TT.getParmsType());
-  EXPECT_EQ(TT.getParmsType().getValue(), "i, i, f, f, d");
-
-  V[8] = 0xAC;
-  Size = sizeof(V);
-  Expected<XCOFFTracebackTable> TTOrErr1 = XCOFFTracebackTable::create(V, Size);
-  ASSERT_THAT_EXPECTED(TTOrErr1, Succeeded());
-  XCOFFTracebackTable TT1 = *TTOrErr1;
-  ASSERT_TRUE(TT1.getParmsType());
-  EXPECT_EQ(TT1.getParmsType().getValue(), "f, f, d, i, i");
-
-  V[8] = 0xD4;
-  Size = sizeof(V);
-  Expected<XCOFFTracebackTable> TTOrErr2 = XCOFFTracebackTable::create(V, Size);
-  ASSERT_THAT_EXPECTED(TTOrErr2, Succeeded());
-  XCOFFTracebackTable TT2 = *TTOrErr2;
-  ASSERT_TRUE(TT2.getParmsType());
-  EXPECT_EQ(TT2.getParmsType().getValue(), "d, i, f, f, i");
-
-  V[6] = 0x01;
-  Size = sizeof(V);
-  Expected<XCOFFTracebackTable> TTOrErr3 = XCOFFTracebackTable::create(V, Size);
-  ASSERT_THAT_EXPECTED(TTOrErr3, Succeeded());
-  XCOFFTracebackTable TT3 = *TTOrErr3;
-  ASSERT_TRUE(TT3.getParmsType());
-  EXPECT_EQ(TT3.getParmsType().getValue(), "d, i, f, f");
-
-  V[6] = 0x04;
-  V[7] = 0x1E;
-  V[8] = 0xAC;
-  V[9] = 0xAA;
-  V[10] = 0xAA;
-  V[11] = 0xAA;
-  Size = sizeof(V);
-  Expected<XCOFFTracebackTable> TTOrErr4 = XCOFFTracebackTable::create(V, Size);
-  ASSERT_THAT_EXPECTED(TTOrErr4, Succeeded());
-  XCOFFTracebackTable TT4 = *TTOrErr4;
-  ASSERT_TRUE(TT4.getParmsType());
-  EXPECT_EQ(TT4.getParmsType().getValue(),
-            "f, f, d, i, i, f, f, f, f, f, f, f, f, f, f, f, f, ...");
-}
-
-const uint8_t TBTableData[] = {
-    0x00, 0x00, 0x2A, 0x60, 0x80, 0xc0, 0x03, 0x05, 0x48, 0xc4, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x02, 0x05, 0x05, 0x00, 0x00,
-    0x06, 0x06, 0x00, 0x00, 0x00, 0x07, 0x61, 0x64, 0x64, 0x5f, 0x61, 0x6c,
-    0x6c, 0x1f, 0x02, 0x05, 0xf0, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00};
-
-TEST(XCOFFObjectFileTest, XCOFFTracebackTableAPIControlledStorageInfoDisp) {
-  uint64_t Size = sizeof(TBTableData);
-  Expected<XCOFFTracebackTable> TTOrErr =
-      XCOFFTracebackTable::create(TBTableData, Size);
-  ASSERT_THAT_EXPECTED(TTOrErr, Succeeded());
-  XCOFFTracebackTable TT = *TTOrErr;
-  EXPECT_TRUE(TT.hasControlledStorage());
-  ASSERT_TRUE(TT.getNumOfCtlAnchors());
-  EXPECT_EQ(TT.getNumOfCtlAnchors().getValue(), 2u);
-
-  ASSERT_TRUE(TT.getControlledStorageInfoDisp());
-
-  SmallVector<uint32_t, 8> Disp = TT.getControlledStorageInfoDisp().getValue();
-
-  ASSERT_EQ(Disp.size(), 2UL);
-  EXPECT_EQ(Disp[0], 0x05050000u);
-  EXPECT_EQ(Disp[1], 0x06060000u);
-  EXPECT_EQ(Size, 45u);
-}
-
-TEST(XCOFFObjectFileTest, XCOFFTracebackTableAPIAllocaRegister) {
-  uint64_t Size = sizeof(TBTableData);
-  Expected<XCOFFTracebackTable> TTOrErr =
-      XCOFFTracebackTable::create(TBTableData, Size);
-  ASSERT_THAT_EXPECTED(TTOrErr, Succeeded());
-  XCOFFTracebackTable TT = *TTOrErr;
-  ASSERT_TRUE(TT.getAllocaRegister());
-  EXPECT_EQ(TT.getAllocaRegister().getValue(), 31u);
-}
-
-TEST(XCOFFObjectFileTest, XCOFFTracebackTableAPIHasVectorInfo) {
-
-  uint64_t Size = sizeof(TBTableData);
-  Expected<XCOFFTracebackTable> TTOrErr =
-      XCOFFTracebackTable::create(TBTableData, Size);
-  ASSERT_THAT_EXPECTED(TTOrErr, Succeeded());
-  XCOFFTracebackTable TT = *TTOrErr;
-
-  EXPECT_EQ(TT.getNumberOfFixedParms(), 3);
-  EXPECT_EQ(TT.getNumberOfFPParms(), 2);
-  EXPECT_TRUE(TT.hasVectorInfo());
-  EXPECT_TRUE(TT.hasExtensionTable());
-
-  ASSERT_TRUE(TT.getParmsType());
-  EXPECT_EQ(TT.getParmsType().getValue(), "v, i, f, i, d, i, v");
-
-  ASSERT_TRUE(TT.getVectorExt());
-  TBVectorExt VecExt = TT.getVectorExt().getValue();
-
-  EXPECT_EQ(VecExt.getNumberOfVRSaved(), 0);
-  EXPECT_TRUE(VecExt.isVRSavedOnStack());
-  EXPECT_FALSE(VecExt.hasVarArgs());
-
-  EXPECT_EQ(VecExt.getNumberOfVectorParms(), 2u);
-  EXPECT_TRUE(VecExt.hasVMXInstruction());
-
-  EXPECT_EQ(VecExt.getVectorParmsInfo(), "vf, vf");
-
-  ASSERT_TRUE(TT.getExtensionTable());
-  EXPECT_EQ(TT.getExtensionTable().getValue(),
-            ExtendedTBTableFlag::TB_SSP_CANARY);
-
-  EXPECT_EQ(Size, 45u);
-}
-
-TEST(XCOFFObjectFileTest, XCOFFTracebackTableAPIHasVectorInfo1) {
-  const uint8_t TBTableData[] = {
-      0x00, 0x00, 0x2A, 0x40, 0x80, 0xc0, 0x03, 0x05, 0x48, 0xc5, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x02, 0x05, 0x05, 0x00, 0x00,
-      0x06, 0x06, 0x00, 0x00, 0x00, 0x07, 0x61, 0x64, 0x64, 0x5f, 0x61, 0x6c,
-      0x6c, 0x11, 0x07, 0x90, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00};
-  uint64_t Size = sizeof(TBTableData);
-  Expected<XCOFFTracebackTable> TTOrErr =
-      XCOFFTracebackTable::create(TBTableData, Size);
-  ASSERT_THAT_EXPECTED(TTOrErr, Succeeded());
-  XCOFFTracebackTable TT = *TTOrErr;
-
-  ASSERT_TRUE(TT.getParmsType());
-  EXPECT_EQ(TT.getParmsType().getValue(), "v, i, f, i, d, i, v, v");
-
-  ASSERT_TRUE(TT.getVectorExt());
-  TBVectorExt VecExt = TT.getVectorExt().getValue();
-
-  EXPECT_EQ(VecExt.getNumberOfVRSaved(), 4);
-  EXPECT_FALSE(VecExt.isVRSavedOnStack());
-  EXPECT_TRUE(VecExt.hasVarArgs());
-
-  EXPECT_EQ(VecExt.getNumberOfVectorParms(), 3u);
-  EXPECT_TRUE(VecExt.hasVMXInstruction());
-
-  EXPECT_EQ(VecExt.getVectorParmsInfo(), "vi, vs, vc");
-
-  ASSERT_TRUE(TT.getExtensionTable());
-  EXPECT_EQ(TT.getExtensionTable().getValue(),
-            ExtendedTBTableFlag::TB_SSP_CANARY);
-
-  EXPECT_EQ(Size, 44u);
-}
-
-TEST(XCOFFObjectFileTest, XCOFFTracebackTableTruncatedAtMandatory) {
-  uint64_t Size = 6;
-  Expected<XCOFFTracebackTable> TTOrErr =
-      XCOFFTracebackTable::create(TBTableData, Size);
-  EXPECT_THAT_ERROR(
-      TTOrErr.takeError(),
-      FailedWithMessage(
-          "unexpected end of data at offset 0x6 while reading [0x0, 0x8)"));
-  EXPECT_EQ(Size, 0u);
-}
-
-TEST(XCOFFObjectFileTest, XCOFFTracebackTableTruncatedAtParmsType) {
-  uint64_t Size = 9;
-  Expected<XCOFFTracebackTable> TTOrErr =
-      XCOFFTracebackTable::create(TBTableData, Size);
-  EXPECT_THAT_ERROR(
-      TTOrErr.takeError(),
-      FailedWithMessage(
-          "unexpected end of data at offset 0x9 while reading [0x8, 0xc)"));
-  EXPECT_EQ(Size, 8u);
-}
-
-TEST(XCOFFObjectFileTest, XCOFFTracebackTableTruncatedAtTBOffset) {
-  uint64_t Size = 14;
-  Expected<XCOFFTracebackTable> TTOrErr =
-      XCOFFTracebackTable::create(TBTableData, Size);
-  EXPECT_THAT_ERROR(
-      TTOrErr.takeError(),
-      FailedWithMessage(
-          "unexpected end of data at offset 0xe while reading [0xc, 0x10)"));
-  EXPECT_EQ(Size, 12u);
-}
-
-TEST(XCOFFObjectFileTest, XCOFFTracebackTableTruncatedAtHandlerMask) {
-  uint8_t V[] = {0x00, 0x00, 0x22, 0xC0, 0x80, 0x00, 0x01, 0x05, 0x58,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x07};
-  uint64_t Size = sizeof(V);
-  Expected<XCOFFTracebackTable> TTOrErr = XCOFFTracebackTable::create(V, Size);
-  EXPECT_THAT_ERROR(
-      TTOrErr.takeError(),
-      FailedWithMessage(
-          "unexpected end of data at offset 0x12 while reading [0x10, 0x14)"));
-  EXPECT_EQ(Size, 16u);
-}
-
-TEST(XCOFFObjectFileTest, XCOFFTracebackTableTruncatedAtNumOfCtlAnchors) {
-  uint64_t Size = 19;
-  Expected<XCOFFTracebackTable> TTOrErr =
-      XCOFFTracebackTable::create(TBTableData, Size);
-  EXPECT_THAT_ERROR(
-      TTOrErr.takeError(),
-      FailedWithMessage(
-          "unexpected end of data at offset 0x13 while reading [0x10, 0x14)"));
-  EXPECT_EQ(Size, 16u);
-}
-
-TEST(XCOFFObjectFileTest,
-     XCOFFTracebackTableTruncatedAtControlledStorageInfoDisp) {
-  uint64_t Size = 21;
-  Expected<XCOFFTracebackTable> TTOrErr =
-      XCOFFTracebackTable::create(TBTableData, Size);
-  EXPECT_THAT_ERROR(
-      TTOrErr.takeError(),
-      FailedWithMessage(
-          "unexpected end of data at offset 0x15 while reading [0x14, 0x18)"));
-  EXPECT_EQ(Size, 20u);
-}
-
-TEST(XCOFFObjectFileTest, XCOFFTracebackTableTruncatedAtNameLen) {
-  uint64_t Size = 29;
-  Expected<XCOFFTracebackTable> TTOrErr =
-      XCOFFTracebackTable::create(TBTableData, Size);
-  EXPECT_THAT_ERROR(
-      TTOrErr.takeError(),
-      FailedWithMessage(
-          "unexpected end of data at offset 0x1d while reading [0x1c, 0x1e)"));
-  EXPECT_EQ(Size, 28u);
-}
-
-TEST(XCOFFObjectFileTest, XCOFFTracebackTableTruncatedAtFunctionName) {
-  uint64_t Size = 36;
-  Expected<XCOFFTracebackTable> TTOrErr =
-      XCOFFTracebackTable::create(TBTableData, Size);
-  EXPECT_THAT_ERROR(
-      TTOrErr.takeError(),
-      FailedWithMessage(
-          "unexpected end of data at offset 0x24 while reading [0x1e, 0x25)"));
-  EXPECT_EQ(Size, 30u);
-}
-
-TEST(XCOFFObjectFileTest, XCOFFTracebackTableTruncatedAtAllocaUsed) {
-  uint64_t Size = 37;
-  Expected<XCOFFTracebackTable> TTOrErr =
-      XCOFFTracebackTable::create(TBTableData, Size);
-  EXPECT_THAT_ERROR(
-      TTOrErr.takeError(),
-      FailedWithMessage(
-          "unexpected end of data at offset 0x25 while reading [0x25, 0x26)"));
-  EXPECT_EQ(Size, 37u);
-}
-
-TEST(XCOFFObjectFileTest, XCOFFTracebackTableTruncatedAtVectorInfoData) {
-  uint64_t Size = 39;
-  Expected<XCOFFTracebackTable> TTOrErr =
-      XCOFFTracebackTable::create(TBTableData, Size);
-
-  EXPECT_THAT_ERROR(
-      TTOrErr.takeError(),
-      FailedWithMessage(
-          "unexpected end of data at offset 0x27 while reading [0x26, 0x2c)"));
-  EXPECT_EQ(Size, 38u);
-}
-
-TEST(XCOFFObjectFileTest, XCOFFTracebackTableTruncatedAtVectorInfoParmsInfo) {
-  uint64_t Size = 43;
-  Expected<XCOFFTracebackTable> TTOrErr =
-      XCOFFTracebackTable::create(TBTableData, Size);
-
-  EXPECT_THAT_ERROR(
-      TTOrErr.takeError(),
-      FailedWithMessage(
-          "unexpected end of data at offset 0x2b while reading [0x26, 0x2c)"));
-  EXPECT_EQ(Size, 38u);
-}
-
-TEST(XCOFFObjectFileTest, XCOFFTracebackTableTruncatedAtExtLongTBTable) {
-  uint64_t Size = 44;
-  Expected<XCOFFTracebackTable> TTOrErr =
-      XCOFFTracebackTable::create(TBTableData, Size);
-
-  EXPECT_THAT_ERROR(
-      TTOrErr.takeError(),
-      FailedWithMessage(
-          "unexpected end of data at offset 0x2c while reading [0x2c, 0x2d)"));
-  EXPECT_EQ(Size, 44u);
-}
-
-TEST(XCOFFObjectFileTest, XCOFFGetCsectAuxRef32) {
-  uint8_t XCOFF32Binary[] = {
-      // File header.
-      0x01, 0xdf, 0x00, 0x01, 0x5f, 0x58, 0xf8, 0x95, 0x00, 0x00, 0x00, 0x3c,
-      0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
-
-      // Section header for empty .data section.
-      0x2e, 0x64, 0x61, 0x74, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x40,
-
-      // Start of symbol table.
-      // C_File symbol.
-      0x2e, 0x66, 0x69, 0x6c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0xff, 0xfe, 0x00, 0x03, 0x67, 0x01,
-      // File Auxiliary Entry.
-      0x61, 0x2e, 0x63, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-
-      // Csect symbol.
-      0x2e, 0x64, 0x61, 0x74, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x01, 0x00, 0x00, 0x6b, 0x01,
-      // Csect auxiliary entry.
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x05,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-  ArrayRef<uint8_t> XCOFF32Ref(XCOFF32Binary, sizeof(XCOFF32Binary));
-  Expected<std::unique_ptr<ObjectFile>> XCOFFObjOrErr =
-      object::ObjectFile::createObjectFile(
-          MemoryBufferRef(toStringRef(XCOFF32Ref), "dummyXCOFF"),
-          file_magic::xcoff_object_32);
-  ASSERT_THAT_EXPECTED(XCOFFObjOrErr, Succeeded());
-
-  const XCOFFObjectFile &File = *cast<XCOFFObjectFile>((*XCOFFObjOrErr).get());
-  DataRefImpl Ref;
-  Ref.p = File.getSymbolEntryAddressByIndex(2);
-  XCOFFSymbolRef SymRef = File.toSymbolRef(Ref);
-  Expected<XCOFFCsectAuxRef> CsectRefOrErr = SymRef.getXCOFFCsectAuxRef();
-  ASSERT_THAT_EXPECTED(CsectRefOrErr, Succeeded());
-
-  // Set csect symbol's auxiliary entry count to 0.
-  XCOFF32Binary[113] = 0;
-  Expected<XCOFFCsectAuxRef> ExpectErr = SymRef.getXCOFFCsectAuxRef();
-  EXPECT_THAT_ERROR(
-      ExpectErr.takeError(),
-      FailedWithMessage("csect symbol \".data\" contains no auxiliary entry"));
-}
-
-TEST(XCOFFObjectFileTest, XCOFFGetCsectAuxRef64) {
-  uint8_t XCOFF64Binary[] = {
-      // File header.
-      0x01, 0xf7, 0x00, 0x01, 0x5f, 0x59, 0x25, 0xeb, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,
-
-      // Section header for empty .data section.
-      0x2e, 0x64, 0x61, 0x74, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00,
-
-      // Start of symbol table.
-      // C_File symbol.
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,
-      0xff, 0xfe, 0x00, 0x02, 0x67, 0x01,
-      // File Auxiliary Entry.
-      0x61, 0x2e, 0x63, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0xfc,
-
-      // Csect symbol.
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a,
-      0x00, 0x01, 0x00, 0x00, 0x6b, 0x01,
-      // Csect auxiliary entry.
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x05,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0xfb,
-
-      // String table.
-      0x00, 0x00, 0x00, 0x10, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x00, 0x2e, 0x64,
-      0x61, 0x74, 0x61, 0x00};
-
-  ArrayRef<uint8_t> XCOFF64Ref(XCOFF64Binary, sizeof(XCOFF64Binary));
-  Expected<std::unique_ptr<ObjectFile>> XCOFFObjOrErr =
-      object::ObjectFile::createObjectFile(
-          MemoryBufferRef(toStringRef(XCOFF64Ref), "dummyXCOFF"),
-          file_magic::xcoff_object_64);
-  ASSERT_THAT_EXPECTED(XCOFFObjOrErr, Succeeded());
-
-  const XCOFFObjectFile &File = *cast<XCOFFObjectFile>((*XCOFFObjOrErr).get());
-  DataRefImpl Ref;
-  Ref.p = File.getSymbolEntryAddressByIndex(2);
-  XCOFFSymbolRef SymRef = File.toSymbolRef(Ref);
-  Expected<XCOFFCsectAuxRef> CsectRefOrErr = SymRef.getXCOFFCsectAuxRef();
-  ASSERT_THAT_EXPECTED(CsectRefOrErr, Succeeded());
-
-  // Inject incorrect auxiliary type value.
-  XCOFF64Binary[167] = static_cast<uint8_t>(XCOFF::AUX_SYM);
-  Expected<XCOFFCsectAuxRef> NotFoundErr = SymRef.getXCOFFCsectAuxRef();
-  EXPECT_THAT_ERROR(
-      NotFoundErr.takeError(),
-      FailedWithMessage(
-          "a csect auxiliary entry is not found for symbol \".data\""));
-
-  // Set csect symbol's auxiliary entry count to 0.
-  XCOFF64Binary[149] = 0;
-  Expected<XCOFFCsectAuxRef> ExpectErr = SymRef.getXCOFFCsectAuxRef();
-  EXPECT_THAT_ERROR(
-      ExpectErr.takeError(),
-      FailedWithMessage("csect symbol \".data\" contains no auxiliary entry"));
-}
-
-TEST(XCOFFObjectFileTest, XCOFFTracebackTableErrorAtParameterType) {
-  const uint8_t TBTableData[] = {0x00, 0x00, 0x22, 0x40, 0x80, 0x00, 0x01,
-                                 0x05, 0x58, 0x00, 0x10, 0x00, 0x00, 0x00,
-                                 0x00, 0x40, 0x00, 0x07, 0x61, 0x64, 0x64,
-                                 0x5f, 0x61, 0x6c, 0x6c, 0x00, 0x00, 0x00};
-  uint64_t Size = 28;
-  Expected<XCOFFTracebackTable> TTOrErr =
-      XCOFFTracebackTable::create(TBTableData, Size);
-
-  EXPECT_THAT_ERROR(
-      TTOrErr.takeError(),
-      FailedWithMessage("ParmsType encodes can not map to ParmsNum parameters "
-                        "in parseParmsType."));
-}
-
-TEST(XCOFFObjectFileTest, XCOFFTracebackTableErrorAtParameterTypeWithVecInfo) {
-  const uint8_t TBTableData[] = {
-      0x00, 0x00, 0x2A, 0x40, 0x80, 0xc0, 0x03, 0x05, 0x48, 0xc0, 0x00, 0x10,
-      0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x02, 0x05, 0x05, 0x00, 0x00,
-      0x06, 0x06, 0x00, 0x00, 0x00, 0x07, 0x61, 0x64, 0x64, 0x5f, 0x61, 0x6c,
-      0x6c, 0x11, 0x07, 0x90, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00};
-  uint64_t Size = 44;
-  Expected<XCOFFTracebackTable> TTOrErr =
-      XCOFFTracebackTable::create(TBTableData, Size);
-
-  EXPECT_THAT_ERROR(
-      TTOrErr.takeError(),
-      FailedWithMessage("ParmsType encodes can not map to ParmsNum parameters "
-                        "in parseParmsTypeWithVecInfo."));
-}
-
-TEST(XCOFFObjectFileTest, XCOFFTracebackTableErrorAtVecParameterType) {
-  const uint8_t TBTableData[] = {
-      0x00, 0x00, 0x2A, 0x40, 0x80, 0xc0, 0x03, 0x05, 0x48, 0xc0, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x02, 0x05, 0x05, 0x00, 0x00,
-      0x06, 0x06, 0x00, 0x00, 0x00, 0x07, 0x61, 0x64, 0x64, 0x5f, 0x61, 0x6c,
-      0x6c, 0x11, 0x07, 0x90, 0x00, 0x00, 0x20, 0x20, 0x00, 0x00, 0x00};
-  uint64_t Size = 44;
-  Expected<XCOFFTracebackTable> TTOrErr =
-      XCOFFTracebackTable::create(TBTableData, Size);
-
-  EXPECT_THAT_ERROR(TTOrErr.takeError(),
-                    FailedWithMessage("ParmsType encodes more than ParmsNum "
-                                      "parameters in parseVectorParmsType."));
-}
diff --git a/gnu/llvm/llvm/unittests/ObjectYAML/CMakeLists.txt b/gnu/llvm/llvm/unittests/ObjectYAML/CMakeLists.txt
deleted file mode 100644
index c20f7926576..00000000000
--- a/gnu/llvm/llvm/unittests/ObjectYAML/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  Object
-  ObjectYAML
-  )
-
-add_llvm_unittest(ObjectYAMLTests
-  DWARFYAMLTest.cpp
-  ELFYAMLTest.cpp
-  MinidumpYAMLTest.cpp
-  YAML2ObjTest.cpp
-  YAMLTest.cpp
-  )
-
-target_link_libraries(ObjectYAMLTests PRIVATE LLVMTestingSupport)
diff --git a/gnu/llvm/llvm/unittests/ObjectYAML/DWARFYAMLTest.cpp b/gnu/llvm/llvm/unittests/ObjectYAML/DWARFYAMLTest.cpp
deleted file mode 100644
index 91febffdfcc..00000000000
--- a/gnu/llvm/llvm/unittests/ObjectYAML/DWARFYAMLTest.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-//===- DWARFYAMLTest.cpp - Tests for DWARFYAML.cpp ------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ObjectYAML/DWARFYAML.h"
-#include "llvm/ObjectYAML/DWARFEmitter.h"
-#include "llvm/Support/Error.h"
-#include "llvm/Support/SourceMgr.h"
-#include "llvm/Support/YAMLTraits.h"
-#include "llvm/Testing/Support/Error.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-template <class T> static Error parseDWARFYAML(StringRef Yaml, T &Data) {
-  SMDiagnostic GenerateDiag;
-  yaml::Input YIn(
-      Yaml, /*Ctxt=*/nullptr,
-      [](const SMDiagnostic &Diag, void *DiagContext) {
-        *static_cast<SMDiagnostic *>(DiagContext) = Diag;
-      },
-      &GenerateDiag);
-
-  YIn >> Data;
-  if (YIn.error())
-    return createStringError(YIn.error(), GenerateDiag.getMessage());
-
-  return Error::success();
-}
-
-TEST(DebugAddrSection, TestParseDebugAddrYAML) {
-  StringRef Yaml = R"(
-debug_addr:
-  - Format:  DWARF64
-    Length:  0x1234
-    Version: 5
-)";
-  DWARFYAML::Data Data;
-  EXPECT_THAT_ERROR(parseDWARFYAML(Yaml, Data), Succeeded());
-}
-
-TEST(DebugAddrSection, TestMissingVersion) {
-  StringRef Yaml = R"(
-Format: DWARF64
-Length: 0x1234
-)";
-  DWARFYAML::AddrTableEntry AddrTableEntry;
-  EXPECT_THAT_ERROR(parseDWARFYAML(Yaml, AddrTableEntry),
-                    FailedWithMessage("missing required key 'Version'"));
-}
-
-TEST(DebugAddrSection, TestUnexpectedKey) {
-  StringRef Yaml = R"(
-Format:  DWARF64
-Length:  0x1234
-Version: 5
-Blah:    unexpected
-)";
-  DWARFYAML::AddrTableEntry AddrTableEntry;
-  EXPECT_THAT_ERROR(parseDWARFYAML(Yaml, AddrTableEntry),
-                    FailedWithMessage("unknown key 'Blah'"));
-}
-
-TEST(DebugPubSection, TestDebugPubSection) {
-  StringRef Yaml = R"(
-debug_pubnames:
-  Length:        0x1234
-  Version:       2
-  UnitOffset:    0x4321
-  UnitSize:      0x00
-  Entries:
-    - DieOffset:  0x1234
-      Name:       abc
-    - DieOffset:  0x4321
-      Name:       def
-debug_pubtypes:
-  Length:        0x1234
-  Version:       2
-  UnitOffset:    0x4321
-  UnitSize:      0x00
-  Entries:
-    - DieOffset:  0x1234
-      Name:       abc
-    - DieOffset:  0x4321
-      Name:       def
-)";
-  DWARFYAML::Data Data;
-  ASSERT_THAT_ERROR(parseDWARFYAML(Yaml, Data), Succeeded());
-
-  ASSERT_TRUE(Data.PubNames.hasValue());
-  DWARFYAML::PubSection PubNames = Data.PubNames.getValue();
-
-  ASSERT_EQ(PubNames.Entries.size(), 2u);
-  EXPECT_EQ((uint32_t)PubNames.Entries[0].DieOffset, 0x1234u);
-  EXPECT_EQ(PubNames.Entries[0].Name, "abc");
-  EXPECT_EQ((uint32_t)PubNames.Entries[1].DieOffset, 0x4321u);
-  EXPECT_EQ(PubNames.Entries[1].Name, "def");
-
-  ASSERT_TRUE(Data.PubTypes.hasValue());
-  DWARFYAML::PubSection PubTypes = Data.PubTypes.getValue();
-
-  ASSERT_EQ(PubTypes.Entries.size(), 2u);
-  EXPECT_EQ((uint32_t)PubTypes.Entries[0].DieOffset, 0x1234u);
-  EXPECT_EQ(PubTypes.Entries[0].Name, "abc");
-  EXPECT_EQ((uint32_t)PubTypes.Entries[1].DieOffset, 0x4321u);
-  EXPECT_EQ(PubTypes.Entries[1].Name, "def");
-}
-
-TEST(DebugPubSection, TestUnexpectedDescriptor) {
-  StringRef Yaml = R"(
-debug_pubnames:
-  Length:        0x1234
-  Version:       2
-  UnitOffset:    0x4321
-  UnitSize:      0x00
-  Entries:
-    - DieOffset:  0x1234
-      Descriptor: 0x12
-      Name:       abcd
-)";
-  DWARFYAML::Data Data;
-  EXPECT_THAT_ERROR(parseDWARFYAML(Yaml, Data),
-                    FailedWithMessage("unknown key 'Descriptor'"));
-}
-
-TEST(DebugGNUPubSection, TestDebugGNUPubSections) {
-  StringRef Yaml = R"(
-debug_gnu_pubnames:
-  Length:        0x1234
-  Version:       2
-  UnitOffset:    0x4321
-  UnitSize:      0x00
-  Entries:
-    - DieOffset:  0x1234
-      Descriptor: 0x12
-      Name:       abc
-    - DieOffset:  0x4321
-      Descriptor: 0x34
-      Name:       def
-debug_gnu_pubtypes:
-  Length:        0x1234
-  Version:       2
-  UnitOffset:    0x4321
-  UnitSize:      0x00
-  Entries:
-    - DieOffset:  0x1234
-      Descriptor: 0x12
-      Name:       abc
-    - DieOffset:  0x4321
-      Descriptor: 0x34
-      Name:       def
-)";
-  DWARFYAML::Data Data;
-  ASSERT_THAT_ERROR(parseDWARFYAML(Yaml, Data), Succeeded());
-
-  ASSERT_TRUE(Data.GNUPubNames.hasValue());
-  DWARFYAML::PubSection GNUPubNames = Data.GNUPubNames.getValue();
-
-  ASSERT_EQ(GNUPubNames.Entries.size(), 2u);
-  EXPECT_EQ((uint32_t)GNUPubNames.Entries[0].DieOffset, 0x1234u);
-  EXPECT_EQ((uint8_t)GNUPubNames.Entries[0].Descriptor, 0x12);
-  EXPECT_EQ(GNUPubNames.Entries[0].Name, "abc");
-  EXPECT_EQ((uint32_t)GNUPubNames.Entries[1].DieOffset, 0x4321u);
-  EXPECT_EQ((uint8_t)GNUPubNames.Entries[1].Descriptor, 0x34);
-  EXPECT_EQ(GNUPubNames.Entries[1].Name, "def");
-
-  ASSERT_TRUE(Data.GNUPubTypes.hasValue());
-  DWARFYAML::PubSection GNUPubTypes = Data.GNUPubTypes.getValue();
-
-  ASSERT_EQ(GNUPubTypes.Entries.size(), 2u);
-  EXPECT_EQ((uint32_t)GNUPubTypes.Entries[0].DieOffset, 0x1234u);
-  EXPECT_EQ((uint8_t)GNUPubTypes.Entries[0].Descriptor, 0x12);
-  EXPECT_EQ(GNUPubTypes.Entries[0].Name, "abc");
-  EXPECT_EQ((uint32_t)GNUPubTypes.Entries[1].DieOffset, 0x4321u);
-  EXPECT_EQ((uint8_t)GNUPubTypes.Entries[1].Descriptor, 0x34);
-  EXPECT_EQ(GNUPubTypes.Entries[1].Name, "def");
-}
-
-TEST(DebugGNUPubSection, TestMissingDescriptor) {
-  StringRef Yaml = R"(
-debug_gnu_pubnames:
-  Length:        0x1234
-  Version:       2
-  UnitOffset:    0x4321
-  UnitSize:      0x00
-  Entries:
-    - DieOffset: 0x1234
-      Name:      abcd
-)";
-  DWARFYAML::Data Data;
-  EXPECT_THAT_ERROR(parseDWARFYAML(Yaml, Data),
-                    FailedWithMessage("missing required key 'Descriptor'"));
-}
diff --git a/gnu/llvm/llvm/unittests/ObjectYAML/ELFYAMLTest.cpp b/gnu/llvm/llvm/unittests/ObjectYAML/ELFYAMLTest.cpp
deleted file mode 100644
index fdbafc28f0d..00000000000
--- a/gnu/llvm/llvm/unittests/ObjectYAML/ELFYAMLTest.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-//===- ELFYAMLTest.cpp - Tests for ELFYAML.cpp ----------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Object/ELF.h"
-#include "llvm/Object/ELFObjectFile.h"
-#include "llvm/Object/ELFTypes.h"
-#include "llvm/ObjectYAML/yaml2obj.h"
-#include "llvm/Support/YAMLTraits.h"
-#include "llvm/Testing/Support/Error.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::object;
-
-template <class ELFT>
-static Expected<ELFObjectFile<ELFT>> toBinary(SmallVectorImpl<char> &Storage,
-                                              StringRef Yaml) {
-  Storage.clear();
-  raw_svector_ostream OS(Storage);
-  yaml::Input YIn(Yaml);
-  if (!yaml::convertYAML(YIn, OS, [](const Twine &Msg) {}))
-    return createStringError(std::errc::invalid_argument,
-                             "unable to convert YAML");
-
-  return ELFObjectFile<ELFT>::create(MemoryBufferRef(OS.str(), "Binary"));
-}
-
-TEST(ELFRelocationTypeTest, RelocationTestForVE) {
-  SmallString<0> Storage;
-  Expected<ELFObjectFile<ELF64LE>> ExpectedFile = toBinary<ELF64LE>(Storage, R"(
---- !ELF
-FileHeader:
-  Class:   ELFCLASS64
-  Data:    ELFDATA2LSB
-  Type:    ET_REL
-  Machine: EM_VE
-Sections:
-  - Name: .rela.text
-    Type: SHT_RELA
-    Relocations:
-      - Type: R_VE_NONE
-      - Type: R_VE_REFLONG
-      - Type: R_VE_REFQUAD
-      - Type: R_VE_SREL32
-      - Type: R_VE_HI32
-      - Type: R_VE_LO32
-      - Type: R_VE_PC_HI32
-      - Type: R_VE_PC_LO32
-      - Type: R_VE_GOT32
-      - Type: R_VE_GOT_HI32
-      - Type: R_VE_GOT_LO32
-      - Type: R_VE_GOTOFF32
-      - Type: R_VE_GOTOFF_HI32
-      - Type: R_VE_GOTOFF_LO32
-      - Type: R_VE_PLT32
-      - Type: R_VE_PLT_HI32
-      - Type: R_VE_PLT_LO32
-      - Type: R_VE_RELATIVE
-      - Type: R_VE_GLOB_DAT
-      - Type: R_VE_JUMP_SLOT
-      - Type: R_VE_COPY
-      - Type: R_VE_DTPMOD64
-      - Type: R_VE_DTPOFF64
-      - Type: R_VE_TLS_GD_HI32
-      - Type: R_VE_TLS_GD_LO32
-      - Type: R_VE_TPOFF_HI32
-      - Type: R_VE_TPOFF_LO32
-      - Type: R_VE_CALL_HI32
-      - Type: R_VE_CALL_LO32)");
-  ASSERT_THAT_EXPECTED(ExpectedFile, Succeeded());
-  const ELFObjectFile<ELF64LE> &File = *ExpectedFile;
-  EXPECT_EQ("elf64-ve", File.getFileFormatName());
-  EXPECT_EQ(Triple::ve, File.getArch());
-
-  // Test relocation types.
-  for (SectionRef Sec : File.sections()) {
-    Expected<StringRef> NameOrErr = Sec.getName();
-    ASSERT_THAT_EXPECTED(NameOrErr, Succeeded());
-    StringRef SectionName = *NameOrErr;
-    if (SectionName != ".rela.text")
-      continue;
-
-    for (RelocationRef R : Sec.relocations()) {
-      SmallString<32> RelTypeName;
-      using namespace llvm::ELF;
-
-#define NAME_CHECK(ID)                                                         \
-  case ID:                                                                     \
-    R.getTypeName(RelTypeName);                                                \
-    EXPECT_EQ(#ID, RelTypeName);                                               \
-    break
-
-      switch (R.getType()) {
-        NAME_CHECK(R_VE_NONE);
-        NAME_CHECK(R_VE_REFLONG);
-        NAME_CHECK(R_VE_REFQUAD);
-        NAME_CHECK(R_VE_SREL32);
-        NAME_CHECK(R_VE_HI32);
-        NAME_CHECK(R_VE_LO32);
-        NAME_CHECK(R_VE_PC_HI32);
-        NAME_CHECK(R_VE_PC_LO32);
-        NAME_CHECK(R_VE_GOT32);
-        NAME_CHECK(R_VE_GOT_HI32);
-        NAME_CHECK(R_VE_GOT_LO32);
-        NAME_CHECK(R_VE_GOTOFF32);
-        NAME_CHECK(R_VE_GOTOFF_HI32);
-        NAME_CHECK(R_VE_GOTOFF_LO32);
-        NAME_CHECK(R_VE_PLT32);
-        NAME_CHECK(R_VE_PLT_HI32);
-        NAME_CHECK(R_VE_PLT_LO32);
-        NAME_CHECK(R_VE_RELATIVE);
-        NAME_CHECK(R_VE_GLOB_DAT);
-        NAME_CHECK(R_VE_JUMP_SLOT);
-        NAME_CHECK(R_VE_COPY);
-        NAME_CHECK(R_VE_DTPMOD64);
-        NAME_CHECK(R_VE_DTPOFF64);
-        NAME_CHECK(R_VE_TLS_GD_HI32);
-        NAME_CHECK(R_VE_TLS_GD_LO32);
-        NAME_CHECK(R_VE_TPOFF_HI32);
-        NAME_CHECK(R_VE_TPOFF_LO32);
-        NAME_CHECK(R_VE_CALL_HI32);
-        NAME_CHECK(R_VE_CALL_LO32);
-      default:
-        FAIL() << "Found unexpected relocation type: " + Twine(R.getType());
-        break;
-      }
-    }
-  }
-}
diff --git a/gnu/llvm/llvm/unittests/ObjectYAML/MinidumpYAMLTest.cpp b/gnu/llvm/llvm/unittests/ObjectYAML/MinidumpYAMLTest.cpp
deleted file mode 100644
index a3c9e7ef18e..00000000000
--- a/gnu/llvm/llvm/unittests/ObjectYAML/MinidumpYAMLTest.cpp
+++ /dev/null
@@ -1,338 +0,0 @@
-//===- MinidumpYAMLTest.cpp - Tests for Minidump<->YAML code --------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Object/Minidump.h"
-#include "llvm/ObjectYAML/yaml2obj.h"
-#include "llvm/Support/YAMLTraits.h"
-#include "llvm/Testing/Support/Error.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::minidump;
-
-static Expected<std::unique_ptr<object::MinidumpFile>>
-toBinary(SmallVectorImpl<char> &Storage, StringRef Yaml) {
-  Storage.clear();
-  raw_svector_ostream OS(Storage);
-  yaml::Input YIn(Yaml);
-  if (!yaml::convertYAML(YIn, OS, [](const Twine &Msg) {}))
-    return createStringError(std::errc::invalid_argument,
-                             "unable to convert YAML");
-
-  return object::MinidumpFile::create(MemoryBufferRef(OS.str(), "Binary"));
-}
-
-TEST(MinidumpYAML, Basic) {
-  SmallString<0> Storage;
-  auto ExpectedFile = toBinary(Storage, R"(
---- !minidump
-Streams:
-  - Type:            SystemInfo
-    Processor Arch:  ARM64
-    Platform ID:     Linux
-    CPU:
-      CPUID:           0x05060708
-  - Type:            LinuxMaps
-    Text:             |
-      400d9000-400db000 r-xp 00000000 b3:04 227        /system/bin/app_process
-      400db000-400dc000 r--p 00001000 b3:04 227        /system/bin/app_process
-
-  - Type:            LinuxAuxv
-    Content:         DEADBEEFBAADF00D)");
-  ASSERT_THAT_EXPECTED(ExpectedFile, Succeeded());
-  object::MinidumpFile &File = **ExpectedFile;
-
-  ASSERT_EQ(3u, File.streams().size());
-
-  EXPECT_EQ(StreamType::SystemInfo, File.streams()[0].Type);
-  auto ExpectedSysInfo = File.getSystemInfo();
-  ASSERT_THAT_EXPECTED(ExpectedSysInfo, Succeeded());
-  const SystemInfo &SysInfo = *ExpectedSysInfo;
-  EXPECT_EQ(ProcessorArchitecture::ARM64, SysInfo.ProcessorArch);
-  EXPECT_EQ(OSPlatform::Linux, SysInfo.PlatformId);
-  EXPECT_EQ(0x05060708u, SysInfo.CPU.Arm.CPUID);
-
-  EXPECT_EQ(StreamType::LinuxMaps, File.streams()[1].Type);
-  EXPECT_EQ("400d9000-400db000 r-xp 00000000 b3:04 227        "
-            "/system/bin/app_process\n"
-            "400db000-400dc000 r--p 00001000 b3:04 227        "
-            "/system/bin/app_process\n",
-            toStringRef(*File.getRawStream(StreamType::LinuxMaps)));
-
-  EXPECT_EQ(StreamType::LinuxAuxv, File.streams()[2].Type);
-  EXPECT_EQ((ArrayRef<uint8_t>{0xDE, 0xAD, 0xBE, 0xEF, 0xBA, 0xAD, 0xF0, 0x0D}),
-            File.getRawStream(StreamType::LinuxAuxv));
-}
-
-TEST(MinidumpYAML, RawContent) {
-  SmallString<0> Storage;
-  auto ExpectedFile = toBinary(Storage, R"(
---- !minidump
-Streams:
-  - Type:            LinuxAuxv
-    Size:            9
-    Content:         DEADBEEFBAADF00D)");
-  ASSERT_THAT_EXPECTED(ExpectedFile, Succeeded());
-  object::MinidumpFile &File = **ExpectedFile;
-
-  EXPECT_EQ(
-      (ArrayRef<uint8_t>{0xDE, 0xAD, 0xBE, 0xEF, 0xBA, 0xAD, 0xF0, 0x0D, 0x00}),
-      File.getRawStream(StreamType::LinuxAuxv));
-}
-
-TEST(MinidumpYAML, X86SystemInfo) {
-  SmallString<0> Storage;
-  auto ExpectedFile = toBinary(Storage, R"(
---- !minidump
-Streams:
-  - Type:            SystemInfo
-    Processor Arch:  X86
-    Platform ID:     Linux
-    CPU:
-      Vendor ID:       LLVMLLVMLLVM
-      Version Info:    0x01020304
-      Feature Info:    0x05060708
-      AMD Extended Features: 0x09000102)");
-  ASSERT_THAT_EXPECTED(ExpectedFile, Succeeded());
-  object::MinidumpFile &File = **ExpectedFile;
-
-  ASSERT_EQ(1u, File.streams().size());
-
-  auto ExpectedSysInfo = File.getSystemInfo();
-  ASSERT_THAT_EXPECTED(ExpectedSysInfo, Succeeded());
-  const SystemInfo &SysInfo = *ExpectedSysInfo;
-  EXPECT_EQ(ProcessorArchitecture::X86, SysInfo.ProcessorArch);
-  EXPECT_EQ(OSPlatform::Linux, SysInfo.PlatformId);
-  EXPECT_EQ("LLVMLLVMLLVM", StringRef(SysInfo.CPU.X86.VendorID,
-                                      sizeof(SysInfo.CPU.X86.VendorID)));
-  EXPECT_EQ(0x01020304u, SysInfo.CPU.X86.VersionInfo);
-  EXPECT_EQ(0x05060708u, SysInfo.CPU.X86.FeatureInfo);
-  EXPECT_EQ(0x09000102u, SysInfo.CPU.X86.AMDExtendedFeatures);
-}
-
-TEST(MinidumpYAML, OtherSystemInfo) {
-  SmallString<0> Storage;
-  auto ExpectedFile = toBinary(Storage, R"(
---- !minidump
-Streams:
-  - Type:            SystemInfo
-    Processor Arch:  PPC
-    Platform ID:     Linux
-    CPU:
-      Features:        000102030405060708090a0b0c0d0e0f)");
-  ASSERT_THAT_EXPECTED(ExpectedFile, Succeeded());
-  object::MinidumpFile &File = **ExpectedFile;
-
-  ASSERT_EQ(1u, File.streams().size());
-
-  auto ExpectedSysInfo = File.getSystemInfo();
-  ASSERT_THAT_EXPECTED(ExpectedSysInfo, Succeeded());
-  const SystemInfo &SysInfo = *ExpectedSysInfo;
-  EXPECT_EQ(ProcessorArchitecture::PPC, SysInfo.ProcessorArch);
-  EXPECT_EQ(OSPlatform::Linux, SysInfo.PlatformId);
-  EXPECT_EQ(
-      (ArrayRef<uint8_t>{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}),
-      makeArrayRef(SysInfo.CPU.Other.ProcessorFeatures));
-}
-
-// Test that we can parse a normal-looking ExceptionStream.
-TEST(MinidumpYAML, ExceptionStream) {
-  SmallString<0> Storage;
-  auto ExpectedFile = toBinary(Storage, R"(
---- !minidump
-Streams:
-  - Type:            Exception
-    Thread ID:  0x7
-    Exception Record:
-      Exception Code:  0x23
-      Exception Flags: 0x5
-      Exception Record: 0x0102030405060708
-      Exception Address: 0x0a0b0c0d0e0f1011
-      Number of Parameters: 2
-      Parameter 0: 0x22
-      Parameter 1: 0x24
-    Thread Context:  3DeadBeefDefacedABadCafe)");
-  ASSERT_THAT_EXPECTED(ExpectedFile, Succeeded());
-  object::MinidumpFile &File = **ExpectedFile;
-
-  ASSERT_EQ(1u, File.streams().size());
-
-  Expected<const minidump::ExceptionStream &> ExpectedStream =
-      File.getExceptionStream();
-
-  ASSERT_THAT_EXPECTED(ExpectedStream, Succeeded());
-
-  const minidump::ExceptionStream &Stream = *ExpectedStream;
-  EXPECT_EQ(0x7u, Stream.ThreadId);
-  const minidump::Exception &Exception = Stream.ExceptionRecord;
-  EXPECT_EQ(0x23u, Exception.ExceptionCode);
-  EXPECT_EQ(0x5u, Exception.ExceptionFlags);
-  EXPECT_EQ(0x0102030405060708u, Exception.ExceptionRecord);
-  EXPECT_EQ(0x0a0b0c0d0e0f1011u, Exception.ExceptionAddress);
-  EXPECT_EQ(2u, Exception.NumberParameters);
-  EXPECT_EQ(0x22u, Exception.ExceptionInformation[0]);
-  EXPECT_EQ(0x24u, Exception.ExceptionInformation[1]);
-
-  Expected<ArrayRef<uint8_t>> ExpectedContext =
-      File.getRawData(Stream.ThreadContext);
-  ASSERT_THAT_EXPECTED(ExpectedContext, Succeeded());
-  EXPECT_EQ((ArrayRef<uint8_t>{0x3d, 0xea, 0xdb, 0xee, 0xfd, 0xef, 0xac, 0xed,
-                               0xab, 0xad, 0xca, 0xfe}),
-            *ExpectedContext);
-}
-
-// Test that we can parse an exception stream with no ExceptionInformation.
-TEST(MinidumpYAML, ExceptionStream_NoParameters) {
-  SmallString<0> Storage;
-  auto ExpectedFile = toBinary(Storage, R"(
---- !minidump
-Streams:
-  - Type:            Exception
-    Thread ID:  0x7
-    Exception Record:
-      Exception Code:  0x23
-      Exception Flags: 0x5
-      Exception Record: 0x0102030405060708
-      Exception Address: 0x0a0b0c0d0e0f1011
-    Thread Context:  3DeadBeefDefacedABadCafe)");
-  ASSERT_THAT_EXPECTED(ExpectedFile, Succeeded());
-  object::MinidumpFile &File = **ExpectedFile;
-
-  ASSERT_EQ(1u, File.streams().size());
-
-  Expected<const minidump::ExceptionStream &> ExpectedStream =
-      File.getExceptionStream();
-
-  ASSERT_THAT_EXPECTED(ExpectedStream, Succeeded());
-
-  const minidump::ExceptionStream &Stream = *ExpectedStream;
-  EXPECT_EQ(0x7u, Stream.ThreadId);
-  const minidump::Exception &Exception = Stream.ExceptionRecord;
-  EXPECT_EQ(0x23u, Exception.ExceptionCode);
-  EXPECT_EQ(0x5u, Exception.ExceptionFlags);
-  EXPECT_EQ(0x0102030405060708u, Exception.ExceptionRecord);
-  EXPECT_EQ(0x0a0b0c0d0e0f1011u, Exception.ExceptionAddress);
-  EXPECT_EQ(0u, Exception.NumberParameters);
-
-  Expected<ArrayRef<uint8_t>> ExpectedContext =
-      File.getRawData(Stream.ThreadContext);
-  ASSERT_THAT_EXPECTED(ExpectedContext, Succeeded());
-  EXPECT_EQ((ArrayRef<uint8_t>{0x3d, 0xea, 0xdb, 0xee, 0xfd, 0xef, 0xac, 0xed,
-                               0xab, 0xad, 0xca, 0xfe}),
-            *ExpectedContext);
-}
-
-// Test that we can parse an ExceptionStream where the stated number of
-// parameters is greater than the actual size of the ExceptionInformation
-// array.
-TEST(MinidumpYAML, ExceptionStream_TooManyParameters) {
-  SmallString<0> Storage;
-  auto ExpectedFile = toBinary(Storage, R"(
---- !minidump
-Streams:
-  - Type:            Exception
-    Thread ID:  0x8
-    Exception Record:
-      Exception Code: 0
-      Number of Parameters: 16
-      Parameter 0: 0x0
-      Parameter 1: 0xff
-      Parameter 2: 0xee
-      Parameter 3: 0xdd
-      Parameter 4: 0xcc
-      Parameter 5: 0xbb
-      Parameter 6: 0xaa
-      Parameter 7: 0x99
-      Parameter 8: 0x88
-      Parameter 9: 0x77
-      Parameter 10: 0x66
-      Parameter 11: 0x55
-      Parameter 12: 0x44
-      Parameter 13: 0x33
-      Parameter 14: 0x22
-    Thread Context:  3DeadBeefDefacedABadCafe)");
-  ASSERT_THAT_EXPECTED(ExpectedFile, Succeeded());
-  object::MinidumpFile &File = **ExpectedFile;
-
-  ASSERT_EQ(1u, File.streams().size());
-
-  Expected<const minidump::ExceptionStream &> ExpectedStream =
-      File.getExceptionStream();
-
-  ASSERT_THAT_EXPECTED(ExpectedStream, Succeeded());
-
-  const minidump::ExceptionStream &Stream = *ExpectedStream;
-  EXPECT_EQ(0x8u, Stream.ThreadId);
-  const minidump::Exception &Exception = Stream.ExceptionRecord;
-  EXPECT_EQ(0x0u, Exception.ExceptionCode);
-  EXPECT_EQ(0x0u, Exception.ExceptionFlags);
-  EXPECT_EQ(0x00u, Exception.ExceptionRecord);
-  EXPECT_EQ(0x0u, Exception.ExceptionAddress);
-  EXPECT_EQ(16u, Exception.NumberParameters);
-  EXPECT_EQ(0x0u, Exception.ExceptionInformation[0]);
-  for (int Index = 1; Index < 15; ++Index) {
-    EXPECT_EQ(0x110u - Index * 0x11, Exception.ExceptionInformation[Index]);
-  }
-
-  Expected<ArrayRef<uint8_t>> ExpectedContext =
-      File.getRawData(Stream.ThreadContext);
-  ASSERT_THAT_EXPECTED(ExpectedContext, Succeeded());
-  EXPECT_EQ((ArrayRef<uint8_t>{0x3d, 0xea, 0xdb, 0xee, 0xfd, 0xef, 0xac, 0xed,
-                               0xab, 0xad, 0xca, 0xfe}),
-            *ExpectedContext);
-}
-
-// Test that we can parse an ExceptionStream where the number of
-// ExceptionInformation parameters provided is greater than the
-// specified Number of Parameters.
-TEST(MinidumpYAML, ExceptionStream_ExtraParameter) {
-  SmallString<0> Storage;
-  auto ExpectedFile = toBinary(Storage, R"(
---- !minidump
-Streams:
-  - Type:            Exception
-    Thread ID:  0x7
-    Exception Record:
-      Exception Code:  0x23
-      Exception Flags: 0x5
-      Exception Record: 0x0102030405060708
-      Exception Address: 0x0a0b0c0d0e0f1011
-      Number of Parameters: 2
-      Parameter 0: 0x99
-      Parameter 1: 0x23
-      Parameter 2: 0x42
-    Thread Context:  3DeadBeefDefacedABadCafe)");
-  ASSERT_THAT_EXPECTED(ExpectedFile, Succeeded());
-  object::MinidumpFile &File = **ExpectedFile;
-
-  ASSERT_EQ(1u, File.streams().size());
-
-  Expected<const minidump::ExceptionStream &> ExpectedStream =
-      File.getExceptionStream();
-
-  ASSERT_THAT_EXPECTED(ExpectedStream, Succeeded());
-
-  const minidump::ExceptionStream &Stream = *ExpectedStream;
-  EXPECT_EQ(0x7u, Stream.ThreadId);
-  const minidump::Exception &Exception = Stream.ExceptionRecord;
-  EXPECT_EQ(0x23u, Exception.ExceptionCode);
-  EXPECT_EQ(0x5u, Exception.ExceptionFlags);
-  EXPECT_EQ(0x0102030405060708u, Exception.ExceptionRecord);
-  EXPECT_EQ(0x0a0b0c0d0e0f1011u, Exception.ExceptionAddress);
-  EXPECT_EQ(2u, Exception.NumberParameters);
-  EXPECT_EQ(0x99u, Exception.ExceptionInformation[0]);
-  EXPECT_EQ(0x23u, Exception.ExceptionInformation[1]);
-  EXPECT_EQ(0x42u, Exception.ExceptionInformation[2]);
-
-  Expected<ArrayRef<uint8_t>> ExpectedContext =
-      File.getRawData(Stream.ThreadContext);
-  ASSERT_THAT_EXPECTED(ExpectedContext, Succeeded());
-  EXPECT_EQ((ArrayRef<uint8_t>{0x3d, 0xea, 0xdb, 0xee, 0xfd, 0xef, 0xac, 0xed,
-                               0xab, 0xad, 0xca, 0xfe}),
-            *ExpectedContext);
-}
diff --git a/gnu/llvm/llvm/unittests/ObjectYAML/YAML2ObjTest.cpp b/gnu/llvm/llvm/unittests/ObjectYAML/YAML2ObjTest.cpp
deleted file mode 100644
index 8fafca4f908..00000000000
--- a/gnu/llvm/llvm/unittests/ObjectYAML/YAML2ObjTest.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-//===- YAML2ObjTest.cpp --------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ObjectYAML/yaml2obj.h"
-#include "llvm/ADT/SmallString.h"
-#include "llvm/Object/ObjectFile.h"
-#include "llvm/Support/Error.h"
-#include "llvm/Support/YAMLTraits.h"
-#include "llvm/Testing/Support/Error.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace object;
-using namespace yaml;
-
-TEST(yaml2ObjectFile, ELF) {
-  bool ErrorReported = false;
-  auto ErrHandler = [&](const Twine &Msg) { ErrorReported = true; };
-
-  SmallString<0> Storage;
-  std::unique_ptr<ObjectFile> Obj = yaml2ObjectFile(Storage, R"(
---- !ELF
-FileHeader:
-  Class:    ELFCLASS64
-  Data:     ELFDATA2LSB
-  Type:     ET_REL
-  Machine:  EM_X86_64)", ErrHandler);
-
-  ASSERT_FALSE(ErrorReported);
-  ASSERT_TRUE(Obj);
-  ASSERT_TRUE(Obj->isELF());
-  ASSERT_TRUE(Obj->isRelocatableObject());
-}
-
-TEST(yaml2ObjectFile, Errors) {
-  std::vector<std::string> Errors;
-  auto ErrHandler = [&](const Twine &Msg) {
-    Errors.push_back("ObjectYAML: " + Msg.str());
-  };
-
-  SmallString<0> Storage;
-  StringRef Yaml = R"(
---- !ELF
-FileHeader:
-  Class:    ELFCLASS64
-  Data:     ELFDATA2LSB
-  Type:     ET_REL
-  Machine:  EM_X86_64
-Symbols:
-  - Name: foo
-  - Name: foo
-  - Name: foo
-)";
-
-  // 1. Test yaml2ObjectFile().
-
-  std::unique_ptr<ObjectFile> Obj = yaml2ObjectFile(Storage, Yaml, ErrHandler);
-
-  ASSERT_FALSE(Obj);
-  ASSERT_TRUE(Errors.size() == 2);
-  ASSERT_TRUE(Errors[0] == "ObjectYAML: repeated symbol name: 'foo'");
-  ASSERT_TRUE(Errors[1] == Errors[0]);
-
-  // 2. Test convertYAML(). 
-
-  Errors.clear();
-  Storage.clear();
-  raw_svector_ostream OS(Storage);
-
-  yaml::Input YIn(Yaml);
-  bool Res = convertYAML(YIn, OS, ErrHandler);
-  ASSERT_FALSE(Res);
-  ASSERT_TRUE(Errors.size() == 2);
-  ASSERT_TRUE(Errors[0] == "ObjectYAML: repeated symbol name: 'foo'");
-  ASSERT_TRUE(Errors[1] == Errors[0]);
-}
diff --git a/gnu/llvm/llvm/unittests/ObjectYAML/YAMLTest.cpp b/gnu/llvm/llvm/unittests/ObjectYAML/YAMLTest.cpp
deleted file mode 100644
index 53582a98721..00000000000
--- a/gnu/llvm/llvm/unittests/ObjectYAML/YAMLTest.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-//===- YAMLTest.cpp - Tests for Object YAML -------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ObjectYAML/YAML.h"
-#include "llvm/Support/YAMLTraits.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-struct BinaryHolder {
-  yaml::BinaryRef Binary;
-};
-
-namespace llvm {
-namespace yaml {
-template <>
-struct MappingTraits<BinaryHolder> {
-  static void mapping(IO &IO, BinaryHolder &BH) {
-    IO.mapRequired("Binary", BH.Binary);
-  }
-};
-} // end namespace yaml
-} // end namespace llvm
-
-TEST(ObjectYAML, BinaryRef) {
-  BinaryHolder BH;
-  SmallVector<char, 32> Buf;
-  llvm::raw_svector_ostream OS(Buf);
-  yaml::Output YOut(OS);
-  YOut << BH;
-  EXPECT_NE(OS.str().find("''"), StringRef::npos);
-}
-
-TEST(ObjectYAML, UnknownOption) {
-  StringRef InputYAML = "InvalidKey: InvalidValue\n"
-                        "Binary: AAAA\n";
-  BinaryHolder BH;
-  yaml::Input Input(InputYAML);
-  // test 1: default in trying to parse invalid key is an error case.
-  Input >> BH;
-  EXPECT_EQ(Input.error().value(), 22);
-
-  // test 2: only warn about invalid key if actively set.
-  yaml::Input Input2(InputYAML);
-  BinaryHolder BH2;
-  Input2.setAllowUnknownKeys(true);
-  Input2 >> BH2;
-  EXPECT_EQ(BH2.Binary, yaml::BinaryRef("AAAA"));
-  EXPECT_EQ(Input2.error().value(), 0);
-}
diff --git a/gnu/llvm/llvm/unittests/Option/CMakeLists.txt b/gnu/llvm/llvm/unittests/Option/CMakeLists.txt
deleted file mode 100644
index 7be4300c0f3..00000000000
--- a/gnu/llvm/llvm/unittests/Option/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  Option
-  Support
-  )
-
-set(LLVM_TARGET_DEFINITIONS Opts.td)
-
-tablegen(LLVM Opts.inc -gen-opt-parser-defs)
-add_public_tablegen_target(OptsTestTableGen)
-
-add_llvm_unittest(OptionTests
-  OptionParsingTest.cpp
-  OptionMarshallingTest.cpp
-  )
diff --git a/gnu/llvm/llvm/unittests/Option/OptionMarshallingTest.cpp b/gnu/llvm/llvm/unittests/Option/OptionMarshallingTest.cpp
deleted file mode 100644
index 85f0d86a869..00000000000
--- a/gnu/llvm/llvm/unittests/Option/OptionMarshallingTest.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-//===- unittest/Support/OptionMarshallingTest.cpp - OptParserEmitter tests ===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "gtest/gtest.h"
-
-struct OptionWithMarshallingInfo {
-  const char *Name;
-  const char *KeyPath;
-  const char *ImpliedCheck;
-  const char *ImpliedValue;
-};
-
-static const OptionWithMarshallingInfo MarshallingTable[] = {
-#define OPTION_WITH_MARSHALLING(                                               \
-    PREFIX_TYPE, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM,        \
-    HELPTEXT, METAVAR, VALUES, SPELLING, SHOULD_PARSE, ALWAYS_EMIT, KEYPATH,   \
-    DEFAULT_VALUE, IMPLIED_CHECK, IMPLIED_VALUE, NORMALIZER, DENORMALIZER,     \
-    MERGER, EXTRACTOR, TABLE_INDEX)                                            \
-  {NAME, #KEYPATH, #IMPLIED_CHECK, #IMPLIED_VALUE},
-#include "Opts.inc"
-#undef OPTION_WITH_MARSHALLING
-};
-
-TEST(OptionMarshalling, EmittedOrderSameAsDefinitionOrder) {
-  ASSERT_STREQ(MarshallingTable[0].Name, "marshalled-flag-d");
-  ASSERT_STREQ(MarshallingTable[1].Name, "marshalled-flag-c");
-  ASSERT_STREQ(MarshallingTable[2].Name, "marshalled-flag-b");
-  ASSERT_STREQ(MarshallingTable[3].Name, "marshalled-flag-a");
-}
-
-TEST(OptionMarshalling, EmittedSpecifiedKeyPath) {
-  ASSERT_STREQ(MarshallingTable[0].KeyPath, "X->MarshalledFlagD");
-  ASSERT_STREQ(MarshallingTable[1].KeyPath, "X->MarshalledFlagC");
-  ASSERT_STREQ(MarshallingTable[2].KeyPath, "X->MarshalledFlagB");
-  ASSERT_STREQ(MarshallingTable[3].KeyPath, "X->MarshalledFlagA");
-}
-
-TEST(OptionMarshalling, ImpliedCheckContainsDisjunctionOfKeypaths) {
-  ASSERT_STREQ(MarshallingTable[0].ImpliedCheck, "false");
-
-  ASSERT_STREQ(MarshallingTable[1].ImpliedCheck, "false || X->MarshalledFlagD");
-  ASSERT_STREQ(MarshallingTable[1].ImpliedValue, "true");
-
-  ASSERT_STREQ(MarshallingTable[2].ImpliedCheck, "false || X->MarshalledFlagD");
-  ASSERT_STREQ(MarshallingTable[2].ImpliedValue, "true");
-
-  ASSERT_STREQ(MarshallingTable[3].ImpliedCheck,
-               "false || X->MarshalledFlagC || X->MarshalledFlagB");
-  ASSERT_STREQ(MarshallingTable[3].ImpliedValue, "true");
-}
diff --git a/gnu/llvm/llvm/unittests/Option/OptionParsingTest.cpp b/gnu/llvm/llvm/unittests/Option/OptionParsingTest.cpp
deleted file mode 100644
index f0299d2d589..00000000000
--- a/gnu/llvm/llvm/unittests/Option/OptionParsingTest.cpp
+++ /dev/null
@@ -1,378 +0,0 @@
-//===- unittest/Support/OptionParsingTest.cpp - OptTable tests ------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/Option/Arg.h"
-#include "llvm/Option/ArgList.h"
-#include "llvm/Option/Option.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::opt;
-
-enum ID {
-  OPT_INVALID = 0, // This is not an option ID.
-#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM,  \
-               HELPTEXT, METAVAR, VALUES)                                      \
-  OPT_##ID,
-#include "Opts.inc"
-  LastOption
-#undef OPTION
-};
-
-#define PREFIX(NAME, VALUE) const char *const NAME[] = VALUE;
-#include "Opts.inc"
-#undef PREFIX
-
-enum OptionFlags {
-  OptFlag1 = (1 << 4),
-  OptFlag2 = (1 << 5),
-  OptFlag3 = (1 << 6)
-};
-
-static const OptTable::Info InfoTable[] = {
-#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM,  \
-               HELPTEXT, METAVAR, VALUES)                                      \
-  {PREFIX, NAME,  HELPTEXT,    METAVAR,     OPT_##ID,  Option::KIND##Class,    \
-   PARAM,  FLAGS, OPT_##GROUP, OPT_##ALIAS, ALIASARGS, VALUES},
-#include "Opts.inc"
-#undef OPTION
-};
-
-namespace {
-class TestOptTable : public OptTable {
-public:
-  TestOptTable(bool IgnoreCase = false)
-    : OptTable(InfoTable, IgnoreCase) {}
-};
-}
-
-const char *Args[] = {
-  "-A",
-  "-Bhi",
-  "--C=desu",
-  "-C", "bye",
-  "-D,adena",
-  "-E", "apple", "bloom",
-  "-Fblarg",
-  "-F", "42",
-  "-Gchuu", "2"
-  };
-
-TEST(Option, OptionParsing) {
-  TestOptTable T;
-  unsigned MAI, MAC;
-  InputArgList AL = T.ParseArgs(Args, MAI, MAC);
-
-  // Check they all exist.
-  EXPECT_TRUE(AL.hasArg(OPT_A));
-  EXPECT_TRUE(AL.hasArg(OPT_B));
-  EXPECT_TRUE(AL.hasArg(OPT_C));
-  EXPECT_TRUE(AL.hasArg(OPT_D));
-  EXPECT_TRUE(AL.hasArg(OPT_E));
-  EXPECT_TRUE(AL.hasArg(OPT_F));
-  EXPECT_TRUE(AL.hasArg(OPT_G));
-
-  // Check the values.
-  EXPECT_EQ("hi", AL.getLastArgValue(OPT_B));
-  EXPECT_EQ("bye", AL.getLastArgValue(OPT_C));
-  EXPECT_EQ("adena", AL.getLastArgValue(OPT_D));
-  std::vector<std::string> Es = AL.getAllArgValues(OPT_E);
-  EXPECT_EQ("apple", Es[0]);
-  EXPECT_EQ("bloom", Es[1]);
-  EXPECT_EQ("42", AL.getLastArgValue(OPT_F));
-  std::vector<std::string> Gs = AL.getAllArgValues(OPT_G);
-  EXPECT_EQ("chuu", Gs[0]);
-  EXPECT_EQ("2", Gs[1]);
-
-  // Check the help text.
-  std::string Help;
-  raw_string_ostream RSO(Help);
-  T.printHelp(RSO, "test", "title!");
-  EXPECT_NE(std::string::npos, Help.find("-A"));
-
-  // Check usage line.
-  T.printHelp(RSO, "name [options] file...", "title!");
-  EXPECT_NE(std::string::npos, Help.find("USAGE: name [options] file...\n"));
-
-  // Test aliases.
-  auto Cs = AL.filtered(OPT_C);
-  ASSERT_NE(Cs.begin(), Cs.end());
-  EXPECT_EQ("desu", StringRef((*Cs.begin())->getValue()));
-  ArgStringList ASL;
-  (*Cs.begin())->render(AL, ASL);
-  ASSERT_EQ(2u, ASL.size());
-  EXPECT_EQ("-C", StringRef(ASL[0]));
-  EXPECT_EQ("desu", StringRef(ASL[1]));
-}
-
-TEST(Option, ParseWithFlagExclusions) {
-  TestOptTable T;
-  unsigned MAI, MAC;
-
-  // Exclude flag3 to avoid parsing as OPT_SLASH_C.
-  InputArgList AL = T.ParseArgs(Args, MAI, MAC,
-                                /*FlagsToInclude=*/0,
-                                /*FlagsToExclude=*/OptFlag3);
-  EXPECT_TRUE(AL.hasArg(OPT_A));
-  EXPECT_TRUE(AL.hasArg(OPT_C));
-  EXPECT_FALSE(AL.hasArg(OPT_SLASH_C));
-
-  // Exclude flag1 to avoid parsing as OPT_C.
-  AL = T.ParseArgs(Args, MAI, MAC,
-                   /*FlagsToInclude=*/0,
-                   /*FlagsToExclude=*/OptFlag1);
-  EXPECT_TRUE(AL.hasArg(OPT_B));
-  EXPECT_FALSE(AL.hasArg(OPT_C));
-  EXPECT_TRUE(AL.hasArg(OPT_SLASH_C));
-
-  const char *NewArgs[] = { "/C", "foo", "--C=bar" };
-  AL = T.ParseArgs(NewArgs, MAI, MAC);
-  EXPECT_TRUE(AL.hasArg(OPT_SLASH_C));
-  EXPECT_TRUE(AL.hasArg(OPT_C));
-  EXPECT_EQ("foo", AL.getLastArgValue(OPT_SLASH_C));
-  EXPECT_EQ("bar", AL.getLastArgValue(OPT_C));
-}
-
-TEST(Option, ParseAliasInGroup) {
-  TestOptTable T;
-  unsigned MAI, MAC;
-
-  const char *MyArgs[] = { "-I" };
-  InputArgList AL = T.ParseArgs(MyArgs, MAI, MAC);
-  EXPECT_TRUE(AL.hasArg(OPT_H));
-}
-
-TEST(Option, AliasArgs) {
-  TestOptTable T;
-  unsigned MAI, MAC;
-
-  const char *MyArgs[] = { "-J", "-Joo" };
-  InputArgList AL = T.ParseArgs(MyArgs, MAI, MAC);
-  EXPECT_TRUE(AL.hasArg(OPT_B));
-  EXPECT_EQ("foo", AL.getAllArgValues(OPT_B)[0]);
-  EXPECT_EQ("bar", AL.getAllArgValues(OPT_B)[1]);
-}
-
-TEST(Option, IgnoreCase) {
-  TestOptTable T(true);
-  unsigned MAI, MAC;
-
-  const char *MyArgs[] = { "-a", "-joo" };
-  InputArgList AL = T.ParseArgs(MyArgs, MAI, MAC);
-  EXPECT_TRUE(AL.hasArg(OPT_A));
-  EXPECT_TRUE(AL.hasArg(OPT_B));
-}
-
-TEST(Option, DoNotIgnoreCase) {
-  TestOptTable T;
-  unsigned MAI, MAC;
-
-  const char *MyArgs[] = { "-a", "-joo" };
-  InputArgList AL = T.ParseArgs(MyArgs, MAI, MAC);
-  EXPECT_FALSE(AL.hasArg(OPT_A));
-  EXPECT_FALSE(AL.hasArg(OPT_B));
-}
-
-TEST(Option, SlurpEmpty) {
-  TestOptTable T;
-  unsigned MAI, MAC;
-
-  const char *MyArgs[] = { "-A", "-slurp" };
-  InputArgList AL = T.ParseArgs(MyArgs, MAI, MAC);
-  EXPECT_TRUE(AL.hasArg(OPT_A));
-  EXPECT_TRUE(AL.hasArg(OPT_Slurp));
-  EXPECT_EQ(0U, AL.getAllArgValues(OPT_Slurp).size());
-}
-
-TEST(Option, Slurp) {
-  TestOptTable T;
-  unsigned MAI, MAC;
-
-  const char *MyArgs[] = { "-A", "-slurp", "-B", "--", "foo" };
-  InputArgList AL = T.ParseArgs(MyArgs, MAI, MAC);
-  EXPECT_EQ(AL.size(), 2U);
-  EXPECT_TRUE(AL.hasArg(OPT_A));
-  EXPECT_FALSE(AL.hasArg(OPT_B));
-  EXPECT_TRUE(AL.hasArg(OPT_Slurp));
-  EXPECT_EQ(3U, AL.getAllArgValues(OPT_Slurp).size());
-  EXPECT_EQ("-B", AL.getAllArgValues(OPT_Slurp)[0]);
-  EXPECT_EQ("--", AL.getAllArgValues(OPT_Slurp)[1]);
-  EXPECT_EQ("foo", AL.getAllArgValues(OPT_Slurp)[2]);
-}
-
-TEST(Option, SlurpJoinedEmpty) {
-  TestOptTable T;
-  unsigned MAI, MAC;
-
-  const char *MyArgs[] = { "-A", "-slurpjoined" };
-  InputArgList AL = T.ParseArgs(MyArgs, MAI, MAC);
-  EXPECT_TRUE(AL.hasArg(OPT_A));
-  EXPECT_TRUE(AL.hasArg(OPT_SlurpJoined));
-  EXPECT_EQ(AL.getAllArgValues(OPT_SlurpJoined).size(), 0U);
-}
-
-TEST(Option, SlurpJoinedOneJoined) {
-  TestOptTable T;
-  unsigned MAI, MAC;
-
-  const char *MyArgs[] = { "-A", "-slurpjoinedfoo" };
-  InputArgList AL = T.ParseArgs(MyArgs, MAI, MAC);
-  EXPECT_TRUE(AL.hasArg(OPT_A));
-  EXPECT_TRUE(AL.hasArg(OPT_SlurpJoined));
-  EXPECT_EQ(AL.getAllArgValues(OPT_SlurpJoined).size(), 1U);
-  EXPECT_EQ(AL.getAllArgValues(OPT_SlurpJoined)[0], "foo");
-}
-
-TEST(Option, SlurpJoinedAndSeparate) {
-  TestOptTable T;
-  unsigned MAI, MAC;
-
-  const char *MyArgs[] = { "-A", "-slurpjoinedfoo", "bar", "baz" };
-  InputArgList AL = T.ParseArgs(MyArgs, MAI, MAC);
-  EXPECT_TRUE(AL.hasArg(OPT_A));
-  EXPECT_TRUE(AL.hasArg(OPT_SlurpJoined));
-  EXPECT_EQ(3U, AL.getAllArgValues(OPT_SlurpJoined).size());
-  EXPECT_EQ("foo", AL.getAllArgValues(OPT_SlurpJoined)[0]);
-  EXPECT_EQ("bar", AL.getAllArgValues(OPT_SlurpJoined)[1]);
-  EXPECT_EQ("baz", AL.getAllArgValues(OPT_SlurpJoined)[2]);
-}
-
-TEST(Option, SlurpJoinedButSeparate) {
-  TestOptTable T;
-  unsigned MAI, MAC;
-
-  const char *MyArgs[] = { "-A", "-slurpjoined", "foo", "bar", "baz" };
-  InputArgList AL = T.ParseArgs(MyArgs, MAI, MAC);
-  EXPECT_TRUE(AL.hasArg(OPT_A));
-  EXPECT_TRUE(AL.hasArg(OPT_SlurpJoined));
-  EXPECT_EQ(3U, AL.getAllArgValues(OPT_SlurpJoined).size());
-  EXPECT_EQ("foo", AL.getAllArgValues(OPT_SlurpJoined)[0]);
-  EXPECT_EQ("bar", AL.getAllArgValues(OPT_SlurpJoined)[1]);
-  EXPECT_EQ("baz", AL.getAllArgValues(OPT_SlurpJoined)[2]);
-}
-
-TEST(Option, FlagAliasToJoined) {
-  TestOptTable T;
-  unsigned MAI, MAC;
-
-  // Check that a flag alias provides an empty argument to a joined option.
-  const char *MyArgs[] = { "-K" };
-  InputArgList AL = T.ParseArgs(MyArgs, MAI, MAC);
-  EXPECT_EQ(AL.size(), 1U);
-  EXPECT_TRUE(AL.hasArg(OPT_B));
-  EXPECT_EQ(1U, AL.getAllArgValues(OPT_B).size());
-  EXPECT_EQ("", AL.getAllArgValues(OPT_B)[0]);
-}
-
-TEST(Option, FindNearest) {
-  TestOptTable T;
-  std::string Nearest;
-
-  // Options that are too short should not be considered
-  // "near" other short options.
-  EXPECT_GT(T.findNearest("-A", Nearest), 4U);
-  EXPECT_GT(T.findNearest("/C", Nearest), 4U);
-  EXPECT_GT(T.findNearest("--C=foo", Nearest), 4U);
-
-  // The nearest candidate should mirror the amount of prefix
-  // characters used in the original string.
-  EXPECT_EQ(1U, T.findNearest("-blorb", Nearest));
-  EXPECT_EQ(Nearest, "-blorp");
-  EXPECT_EQ(1U, T.findNearest("--blorm", Nearest));
-  EXPECT_EQ(Nearest, "--blorp");
-  EXPECT_EQ(1U, T.findNearest("-blarg", Nearest));
-  EXPECT_EQ(Nearest, "-blarn");
-  EXPECT_EQ(1U, T.findNearest("--blarm", Nearest));
-  EXPECT_EQ(Nearest, "--blarn");
-  EXPECT_EQ(1U, T.findNearest("-fjormp", Nearest));
-  EXPECT_EQ(Nearest, "--fjormp");
-
-  // The nearest candidate respects the prefix and value delimiter
-  // of the original string.
-  EXPECT_EQ(1U, T.findNearest("/framb:foo", Nearest));
-  EXPECT_EQ(Nearest, "/cramb:foo");
-
-  // `--glormp` should have an editing distance > 0 from `--glormp=`.
-  EXPECT_GT(T.findNearest("--glorrmp", Nearest), 0U);
-  EXPECT_EQ(Nearest, "--glorrmp=");
-  EXPECT_EQ(0U, T.findNearest("--glorrmp=foo", Nearest));
-
-  // `--blurmps` should correct to `--blurmp`, not `--blurmp=`, even though
-  // both naively have an editing distance of 1.
-  EXPECT_EQ(1U, T.findNearest("--blurmps", Nearest));
-  EXPECT_EQ(Nearest, "--blurmp");
-
-  // ...but `--blurmps=foo` should correct to `--blurmp=foo`.
-  EXPECT_EQ(1U, T.findNearest("--blurmps=foo", Nearest));
-  EXPECT_EQ(Nearest, "--blurmp=foo");
-
-  // Flags should be included and excluded as specified.
-  EXPECT_EQ(1U, T.findNearest("-doopf", Nearest, /*FlagsToInclude=*/OptFlag2));
-  EXPECT_EQ(Nearest, "-doopf2");
-  EXPECT_EQ(1U, T.findNearest("-doopf", Nearest,
-                              /*FlagsToInclude=*/0,
-                              /*FlagsToExclude=*/OptFlag2));
-  EXPECT_EQ(Nearest, "-doopf1");
-}
-
-TEST(DISABLED_Option, FindNearestFIXME) {
-  TestOptTable T;
-  std::string Nearest;
-
-  // FIXME: Options with joined values should not have those values considered
-  // when calculating distance. The test below would fail if run, but it should
-  // succeed.
-  EXPECT_EQ(1U, T.findNearest("--erbghFoo", Nearest));
-  EXPECT_EQ(Nearest, "--ermghFoo");
-
-}
-
-TEST(Option, ParseGroupedShortOptions) {
-  TestOptTable T;
-  T.setGroupedShortOptions(true);
-  unsigned MAI, MAC;
-
-  // Grouped short options can be followed by a long Flag (-Joo), or a non-Flag
-  // option (-C=1).
-  const char *Args1[] = {"-AIJ", "-AIJoo", "-AC=1"};
-  InputArgList AL = T.ParseArgs(Args1, MAI, MAC);
-  EXPECT_TRUE(AL.hasArg(OPT_A));
-  EXPECT_TRUE(AL.hasArg(OPT_H));
-  ASSERT_EQ((size_t)2, AL.getAllArgValues(OPT_B).size());
-  EXPECT_EQ("foo", AL.getAllArgValues(OPT_B)[0]);
-  EXPECT_EQ("bar", AL.getAllArgValues(OPT_B)[1]);
-  ASSERT_TRUE(AL.hasArg(OPT_C));
-  EXPECT_EQ("1", AL.getAllArgValues(OPT_C)[0]);
-
-  // Prefer a long option to a short option.
-  const char *Args2[] = {"-AB"};
-  InputArgList AL2 = T.ParseArgs(Args2, MAI, MAC);
-  EXPECT_TRUE(!AL2.hasArg(OPT_A));
-  EXPECT_TRUE(AL2.hasArg(OPT_AB));
-
-  // Short options followed by a long option. We probably should disallow this.
-  const char *Args3[] = {"-AIblorp"};
-  InputArgList AL3 = T.ParseArgs(Args3, MAI, MAC);
-  EXPECT_TRUE(AL3.hasArg(OPT_A));
-  EXPECT_TRUE(AL3.hasArg(OPT_Blorp));
-}
-
-TEST(Option, UnknownOptions) {
-  TestOptTable T;
-  unsigned MAI, MAC;
-  const char *Args[] = {"-u", "--long", "0"};
-  for (int I = 0; I < 2; ++I) {
-    T.setGroupedShortOptions(I != 0);
-    InputArgList AL = T.ParseArgs(Args, MAI, MAC);
-    const std::vector<std::string> Unknown = AL.getAllArgValues(OPT_UNKNOWN);
-    ASSERT_EQ((size_t)2, Unknown.size());
-    EXPECT_EQ("-u", Unknown[0]);
-    EXPECT_EQ("--long", Unknown[1]);
-  }
-}
diff --git a/gnu/llvm/llvm/unittests/Option/Opts.td b/gnu/llvm/llvm/unittests/Option/Opts.td
deleted file mode 100644
index 028ea366cbc..00000000000
--- a/gnu/llvm/llvm/unittests/Option/Opts.td
+++ /dev/null
@@ -1,60 +0,0 @@
-include "llvm/Option/OptParser.td"
-
-def OptFlag1 : OptionFlag;
-def OptFlag2 : OptionFlag;
-def OptFlag3 : OptionFlag;
-
-def A : Flag<["-"], "A">, HelpText<"The A option">, Flags<[OptFlag1]>;
-def AB : Flag<["-"], "AB">;
-def B : Joined<["-"], "B">, HelpText<"The B option">, MetaVarName<"B">, Flags<[OptFlag2]>;
-def C : Separate<["-"], "C">, HelpText<"The C option">, MetaVarName<"C">, Flags<[OptFlag1]>;
-def SLASH_C : Separate<["/", "-"], "C">, HelpText<"The C option">, MetaVarName<"C">, Flags<[OptFlag3]>;
-def D : CommaJoined<["-"], "D">, HelpText<"The D option">, MetaVarName<"D">;
-def E : MultiArg<["-"], "E", 2>, Flags<[OptFlag1, OptFlag2]>;
-def F : JoinedOrSeparate<["-"], "F">, HelpText<"The F option">, MetaVarName<"F">;
-def G : JoinedAndSeparate<["-"], "G">, HelpText<"The G option">, MetaVarName<"G">;
-
-def Ceq : Joined<["-", "--"], "C=">, Alias<C>, Flags<[OptFlag1]>;
-
-def H : Flag<["-"], "H">, Flags<[HelpHidden]>;
-
-def my_group : OptionGroup<"my group">;
-def I : Flag<["-"], "I">, Alias<H>, Group<my_group>;
-
-def J : Flag<["-"], "J">, Alias<B>, AliasArgs<["foo"]>;
-def Joo : Flag<["-"], "Joo">, Alias<B>, AliasArgs<["bar"]>;
-
-def K : Flag<["-"], "K">, Alias<B>;
-
-def Slurp : Option<["-"], "slurp", KIND_REMAINING_ARGS>;
-
-def SlurpJoined : Option<["-"], "slurpjoined", KIND_REMAINING_ARGS_JOINED>;
-
-def Blorp : Flag<["-", "--"], "blorp">, HelpText<"The blorp option">, Flags<[OptFlag1]>;
-def Blarn : Flag<["--", "-"], "blarn">, HelpText<"The blarn option">, Flags<[OptFlag1]>;
-def Cramb : Joined<["/"], "cramb:">, HelpText<"The cramb option">, MetaVarName<"CRAMB">, Flags<[OptFlag1]>;
-def Doopf1 : Flag<["-"], "doopf1">, HelpText<"The doopf1 option">, Flags<[OptFlag1]>;
-def Doopf2 : Flag<["-"], "doopf2">, HelpText<"The doopf2 option">, Flags<[OptFlag2]>;
-def Ermgh : Joined<["--"], "ermgh">, HelpText<"The ermgh option">, MetaVarName<"ERMGH">, Flags<[OptFlag1]>;
-def Fjormp : Flag<["--"], "fjormp">, HelpText<"The fjormp option">, Flags<[OptFlag1]>;
-
-def Glorrmp_eq : Flag<["--"], "glorrmp=">;
-
-def Blurmpq : Flag<["--"], "blurmp">;
-def Blurmpq_eq : Flag<["--"], "blurmp=">;
-
-def DashDash : Option<["--"], "", KIND_REMAINING_ARGS>;
-
-class XOpts<string base> : KeyPathAndMacro<"X->", base> {}
-
-def marshalled_flag_d : Flag<["-"], "marshalled-flag-d">,
-  MarshallingInfoFlag<XOpts<"MarshalledFlagD">>;
-def marshalled_flag_c : Flag<["-"], "marshalled-flag-c">,
-  MarshallingInfoFlag<XOpts<"MarshalledFlagC">>,
-  ImpliedByAnyOf<[marshalled_flag_d.KeyPath], "true">;
-def marshalled_flag_b : Flag<["-"], "marshalled-flag-b">,
-  MarshallingInfoFlag<XOpts<"MarshalledFlagB">>,
-  ImpliedByAnyOf<[marshalled_flag_d.KeyPath], "true">;
-def marshalled_flag_a : Flag<["-"], "marshalled-flag-a">,
-  MarshallingInfoFlag<XOpts<"MarshalledFlagA">>,
-  ImpliedByAnyOf<[marshalled_flag_c.KeyPath, marshalled_flag_b.KeyPath]>;
diff --git a/gnu/llvm/llvm/unittests/Passes/CMakeLists.txt b/gnu/llvm/llvm/unittests/Passes/CMakeLists.txt
deleted file mode 100644
index f9ab51c469d..00000000000
--- a/gnu/llvm/llvm/unittests/Passes/CMakeLists.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-# Needed by LLVM's CMake checks because this file defines multiple targets.
-set(LLVM_OPTIONAL_SOURCES PluginsTest.cpp TestPlugin.cpp DoublerPlugin.cpp PassBuilderBindingsTest.cpp)
-
-# If plugins are disabled, this test will disable itself at runtime. Otherwise,
-# reconfiguring with plugins disabled will leave behind a stale executable.
-if (LLVM_ENABLE_PLUGINS)
-  add_definitions(-DLLVM_ENABLE_PLUGINS)
-endif()
-
-# The plugin expects to not link against the Support and Core libraries,
-# but expects them to exist in the process loading the plugin. This doesn't
-# work with DLLs on Windows (where a shared library can't have undefined
-# references), so just skip this testcase on Windows.
-if (NOT WIN32)
-  set(LLVM_LINK_COMPONENTS Support Passes Core AsmParser)
-  add_llvm_unittest(PluginsTests
-    PluginsTest.cpp
-    )
-  export_executable_symbols_for_plugins(PluginsTests)
-  target_link_libraries(PluginsTests PRIVATE LLVMTestingSupport)
-
-  set(LLVM_LINK_COMPONENTS)
-  foreach(PLUGIN TestPlugin DoublerPlugin)
-    add_llvm_library(${PLUGIN} MODULE BUILDTREE_ONLY ${PLUGIN}.cpp)
-
-    # Put PLUGIN next to the unit test executable.
-    set_output_directory(${PLUGIN}
-      BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
-      LIBRARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
-      )
-    set_target_properties(${PLUGIN} PROPERTIES FOLDER "Tests")
-
-    add_dependencies(${PLUGIN} intrinsics_gen)
-    add_dependencies(PluginsTests ${PLUGIN})
-  endforeach()
-
-endif()
-
-set(LLVM_LINK_COMPONENTS Support Passes Core Target native AllTargetsInfos)
-add_llvm_unittest(PassesBindingsTests
-	PassBuilderBindingsTest.cpp
-	)
-target_link_libraries(PassesBindingsTests PRIVATE LLVMTestingSupport)
-
diff --git a/gnu/llvm/llvm/unittests/Passes/DoublerPlugin.cpp b/gnu/llvm/llvm/unittests/Passes/DoublerPlugin.cpp
deleted file mode 100644
index 57d48261796..00000000000
--- a/gnu/llvm/llvm/unittests/Passes/DoublerPlugin.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-//===- unittests/Passes/DoublerPlugin.cpp
-//--------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Passes/PassBuilder.h"
-#include "llvm/Passes/PassPlugin.h"
-
-using namespace llvm;
-
-struct DoublerModulePass : public PassInfoMixin<DoublerModulePass> {
-
-  // Double the value of the initializer
-  PreservedAnalyses run(Module &M, ModuleAnalysisManager &MAM) {
-    auto *GV = cast<GlobalVariable>(M.getNamedValue("doubleme"));
-    auto *Init = GV->getInitializer();
-    auto *Init2 = ConstantExpr::getAdd(Init, Init);
-    GV->setInitializer(Init2);
-
-    return PreservedAnalyses::none();
-  }
-
-  static void registerCallbacks(PassBuilder &PB) {
-    PB.registerPipelineParsingCallback(
-        [](StringRef Name, ModulePassManager &PM,
-           ArrayRef<PassBuilder::PipelineElement> InnerPipeline) {
-          if (Name == "doubler-pass") {
-            PM.addPass(DoublerModulePass());
-            return true;
-          }
-          return false;
-        });
-  }
-};
-
-extern "C" ::llvm::PassPluginLibraryInfo LLVM_ATTRIBUTE_WEAK
-llvmGetPassPluginInfo() {
-  return {LLVM_PLUGIN_API_VERSION, "DoublerPlugin", "2.2-unit",
-          DoublerModulePass::registerCallbacks};
-}
diff --git a/gnu/llvm/llvm/unittests/Passes/PassBuilderBindingsTest.cpp b/gnu/llvm/llvm/unittests/Passes/PassBuilderBindingsTest.cpp
deleted file mode 100644
index c55c882e608..00000000000
--- a/gnu/llvm/llvm/unittests/Passes/PassBuilderBindingsTest.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-//===- unittests/Passes/PassBuilderBindingsTest.cpp -----------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm-c/Core.h"
-#include "llvm-c/Transforms/PassBuilder.h"
-#include "llvm-c/Types.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-class PassBuilderCTest : public testing::Test {
-  void SetUp() override {
-    LLVMInitializeAllTargetInfos();
-    char *Triple = LLVMGetDefaultTargetTriple();
-    char *Err;
-    LLVMTargetRef Target;
-    if (LLVMGetTargetFromTriple(Triple, &Target, &Err)) {
-      FAIL() << "Failed to create target from default triple (" << Triple
-             << "): " << Err;
-    }
-    TM = LLVMCreateTargetMachine(Target, Triple, "generic", "",
-                                 LLVMCodeGenLevelDefault, LLVMRelocDefault,
-                                 LLVMCodeModelDefault);
-    LLVMDisposeMessage(Triple);
-    Context = LLVMContextCreate();
-    Module = LLVMModuleCreateWithNameInContext("test", Context);
-  }
-
-  void TearDown() override {
-    LLVMDisposeTargetMachine(TM);
-    LLVMDisposeModule(Module);
-    LLVMContextDispose(Context);
-  }
-
-public:
-  LLVMTargetMachineRef TM;
-  LLVMModuleRef Module;
-  LLVMContextRef Context;
-};
-
-TEST_F(PassBuilderCTest, Basic) {
-  LLVMPassBuilderOptionsRef Options = LLVMCreatePassBuilderOptions();
-  LLVMPassBuilderOptionsSetLoopUnrolling(Options, 1);
-  LLVMPassBuilderOptionsSetVerifyEach(Options, 1);
-  LLVMPassBuilderOptionsSetDebugLogging(Options, 0);
-  if (LLVMErrorRef E = LLVMRunPasses(Module, "default<O2>", TM, Options)) {
-    char *Msg = LLVMGetErrorMessage(E);
-    LLVMConsumeError(E);
-    LLVMDisposePassBuilderOptions(Options);
-    FAIL() << "Failed to run passes: " << Msg;
-  }
-  LLVMDisposePassBuilderOptions(Options);
-}
-
-TEST_F(PassBuilderCTest, InvalidPassIsError) {
-  LLVMPassBuilderOptionsRef Options = LLVMCreatePassBuilderOptions();
-  LLVMErrorRef E1 = LLVMRunPasses(Module, "", TM, Options);
-  LLVMErrorRef E2 = LLVMRunPasses(Module, "does-not-exist-pass", TM, Options);
-  ASSERT_TRUE(E1);
-  ASSERT_TRUE(E2);
-  LLVMConsumeError(E1);
-  LLVMConsumeError(E2);
-  LLVMDisposePassBuilderOptions(Options);
-}
diff --git a/gnu/llvm/llvm/unittests/Passes/PluginsTest.cpp b/gnu/llvm/llvm/unittests/Passes/PluginsTest.cpp
deleted file mode 100644
index 49fc8284f5e..00000000000
--- a/gnu/llvm/llvm/unittests/Passes/PluginsTest.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-//===- unittests/Passes/Plugins/PluginsTest.cpp ---------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/CGSCCPassManager.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/Config/config.h"
-#include "llvm/IR/GlobalVariable.h"
-#include "llvm/IR/PassManager.h"
-#include "llvm/Passes/PassBuilder.h"
-#include "llvm/Passes/PassPlugin.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/ManagedStatic.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Testing/Support/Error.h"
-#include "llvm/Transforms/Scalar/LoopPassManager.h"
-#include "gtest/gtest.h"
-
-#include "TestPlugin.h"
-
-#include <cstdint>
-
-using namespace llvm;
-
-void anchor() {}
-
-static std::string LibPath(const std::string Name = "TestPlugin") {
-  const auto &Argvs = testing::internal::GetArgvs();
-  const char *Argv0 = Argvs.size() > 0 ? Argvs[0].c_str() : "PluginsTests";
-  void *Ptr = (void *)(intptr_t)anchor;
-  std::string Path = sys::fs::getMainExecutable(Argv0, Ptr);
-  llvm::SmallString<256> Buf{sys::path::parent_path(Path)};
-  sys::path::append(Buf, (Name + LLVM_PLUGIN_EXT).c_str());
-  return std::string(Buf.str());
-}
-
-TEST(PluginsTests, LoadPlugin) {
-#if !defined(LLVM_ENABLE_PLUGINS)
-  // Disable the test if plugins are disabled.
-  return;
-#endif
-
-  auto PluginPath = LibPath();
-  ASSERT_NE("", PluginPath);
-
-  Expected<PassPlugin> Plugin = PassPlugin::Load(PluginPath);
-  ASSERT_TRUE(!!Plugin) << "Plugin path: " << PluginPath;
-
-  ASSERT_EQ(TEST_PLUGIN_NAME, Plugin->getPluginName());
-  ASSERT_EQ(TEST_PLUGIN_VERSION, Plugin->getPluginVersion());
-
-  PassBuilder PB;
-  ModulePassManager PM;
-  ASSERT_THAT_ERROR(PB.parsePassPipeline(PM, "plugin-pass"), Failed());
-
-  Plugin->registerPassBuilderCallbacks(PB);
-  ASSERT_THAT_ERROR(PB.parsePassPipeline(PM, "plugin-pass"), Succeeded());
-}
-
-// Test that llvmGetPassPluginInfo from DoublerPlugin is called twice with
-// -fpass-plugin=DoublerPlugin -fpass-plugin=TestPlugin
-// -fpass-plugin=DoublerPlugin.
-TEST(PluginsTests, LoadMultiplePlugins) {
-#if !defined(LLVM_ENABLE_PLUGINS)
-  // Disable the test if plugins are disabled.
-  return;
-#endif
-
-  auto DoublerPluginPath = LibPath("DoublerPlugin");
-  auto TestPluginPath = LibPath("TestPlugin");
-  ASSERT_NE("", DoublerPluginPath);
-  ASSERT_NE("", TestPluginPath);
-
-  Expected<PassPlugin> DoublerPlugin1 = PassPlugin::Load(DoublerPluginPath);
-  ASSERT_TRUE(!!DoublerPlugin1)
-      << "Plugin path: " << DoublerPlugin1->getFilename();
-
-  Expected<PassPlugin> TestPlugin = PassPlugin::Load(TestPluginPath);
-  ASSERT_TRUE(!!TestPlugin) << "Plugin path: " << TestPlugin->getFilename();
-
-  // If llvmGetPassPluginInfo is resolved as a weak symbol taking into account
-  // all loaded symbols, the second call to PassPlugin::Load will actually
-  // return the llvmGetPassPluginInfo from the most recently loaded plugin, in
-  // this case TestPlugin.
-  Expected<PassPlugin> DoublerPlugin2 = PassPlugin::Load(DoublerPluginPath);
-  ASSERT_TRUE(!!DoublerPlugin2)
-      << "Plugin path: " << DoublerPlugin2->getFilename();
-
-  ASSERT_EQ("DoublerPlugin", DoublerPlugin1->getPluginName());
-  ASSERT_EQ("2.2-unit", DoublerPlugin1->getPluginVersion());
-  ASSERT_EQ(TEST_PLUGIN_NAME, TestPlugin->getPluginName());
-  ASSERT_EQ(TEST_PLUGIN_VERSION, TestPlugin->getPluginVersion());
-  // Check that the plugin name/version is set correctly when loaded a second
-  // time
-  ASSERT_EQ("DoublerPlugin", DoublerPlugin2->getPluginName());
-  ASSERT_EQ("2.2-unit", DoublerPlugin2->getPluginVersion());
-
-  PassBuilder PB;
-  ModulePassManager PM;
-  const char *PipelineText = "module(doubler-pass,plugin-pass,doubler-pass)";
-  ASSERT_THAT_ERROR(PB.parsePassPipeline(PM, PipelineText), Failed());
-  TestPlugin->registerPassBuilderCallbacks(PB);
-  DoublerPlugin1->registerPassBuilderCallbacks(PB);
-  DoublerPlugin2->registerPassBuilderCallbacks(PB);
-  ASSERT_THAT_ERROR(PB.parsePassPipeline(PM, PipelineText), Succeeded());
-
-  LLVMContext C;
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M =
-      parseAssemblyString(R"IR(@doubleme = constant i32 7)IR", Err, C);
-
-  // Check that the initial value is 7
-  {
-    auto *GV = M->getNamedValue("doubleme");
-    auto *Init = cast<GlobalVariable>(GV)->getInitializer();
-    auto *CI = cast<ConstantInt>(Init);
-    ASSERT_EQ(CI->getSExtValue(), 7);
-  }
-
-  ModuleAnalysisManager MAM;
-  // Register required pass instrumentation analysis.
-  MAM.registerPass([&] { return PassInstrumentationAnalysis(); });
-  PM.run(*M, MAM);
-
-  // Check that the final value is 28 because DoublerPlugin::run was called
-  // twice, indicating that the llvmGetPassPluginInfo and registerCallbacks
-  // were correctly called.
-  {
-    // Check the value was doubled twice
-    auto *GV = M->getNamedValue("doubleme");
-    auto *Init = cast<GlobalVariable>(GV)->getInitializer();
-    auto *CI = cast<ConstantInt>(Init);
-    ASSERT_EQ(CI->getSExtValue(), 28);
-  }
-}
diff --git a/gnu/llvm/llvm/unittests/Passes/TestPlugin.cpp b/gnu/llvm/llvm/unittests/Passes/TestPlugin.cpp
deleted file mode 100644
index edc71aaf3ff..00000000000
--- a/gnu/llvm/llvm/unittests/Passes/TestPlugin.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-//===- unittests/Passes/TestPlugin.cpp --------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Passes/PassBuilder.h"
-#include "llvm/Passes/PassPlugin.h"
-
-#include "TestPlugin.h"
-
-using namespace llvm;
-
-struct TestModulePass : public PassInfoMixin<TestModulePass> {
-  PreservedAnalyses run(Module &M, ModuleAnalysisManager &MAM) {
-    return PreservedAnalyses::all();
-  }
-
-  static void registerCallbacks(PassBuilder &PB) {
-    PB.registerPipelineParsingCallback(
-        [](StringRef Name, ModulePassManager &PM,
-           ArrayRef<PassBuilder::PipelineElement> InnerPipeline) {
-          if (Name == "plugin-pass") {
-            PM.addPass(TestModulePass());
-            return true;
-          }
-          return false;
-        });
-  }
-};
-
-extern "C" ::llvm::PassPluginLibraryInfo LLVM_ATTRIBUTE_WEAK
-llvmGetPassPluginInfo() {
-  return {LLVM_PLUGIN_API_VERSION, TEST_PLUGIN_NAME, TEST_PLUGIN_VERSION,
-          TestModulePass::registerCallbacks};
-}
diff --git a/gnu/llvm/llvm/unittests/Passes/TestPlugin.h b/gnu/llvm/llvm/unittests/Passes/TestPlugin.h
deleted file mode 100644
index 801a89065cd..00000000000
--- a/gnu/llvm/llvm/unittests/Passes/TestPlugin.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define TEST_PLUGIN_NAME "TestPlugin"
-#define TEST_PLUGIN_VERSION "0.1-unit"
diff --git a/gnu/llvm/llvm/unittests/ProfileData/CMakeLists.txt b/gnu/llvm/llvm/unittests/ProfileData/CMakeLists.txt
deleted file mode 100644
index 00a0079e675..00000000000
--- a/gnu/llvm/llvm/unittests/ProfileData/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  Core
-  Coverage
-  ProfileData
-  Support
-  )
-
-add_llvm_unittest(ProfileDataTests
-  CoverageMappingTest.cpp
-  InstrProfDataTest.cpp
-  InstrProfTest.cpp
-  SampleProfTest.cpp
-  )
-
-target_link_libraries(ProfileDataTests PRIVATE LLVMTestingSupport)
diff --git a/gnu/llvm/llvm/unittests/ProfileData/CoverageMappingTest.cpp b/gnu/llvm/llvm/unittests/ProfileData/CoverageMappingTest.cpp
deleted file mode 100644
index f6f93cd8194..00000000000
--- a/gnu/llvm/llvm/unittests/ProfileData/CoverageMappingTest.cpp
+++ /dev/null
@@ -1,974 +0,0 @@
-//===- unittest/ProfileData/CoverageMappingTest.cpp -------------------------=//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ProfileData/Coverage/CoverageMapping.h"
-#include "llvm/ProfileData/Coverage/CoverageMappingReader.h"
-#include "llvm/ProfileData/Coverage/CoverageMappingWriter.h"
-#include "llvm/ProfileData/InstrProfReader.h"
-#include "llvm/ProfileData/InstrProfWriter.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/Testing/Support/Error.h"
-#include "llvm/Testing/Support/SupportHelpers.h"
-#include "gtest/gtest.h"
-
-#include <ostream>
-#include <utility>
-
-using namespace llvm;
-using namespace coverage;
-
-LLVM_NODISCARD static ::testing::AssertionResult
-ErrorEquals(coveragemap_error Expected, Error E) {
-  coveragemap_error Found;
-  std::string FoundMsg;
-  handleAllErrors(std::move(E), [&](const CoverageMapError &CME) {
-    Found = CME.get();
-    FoundMsg = CME.message();
-  });
-  if (Expected == Found)
-    return ::testing::AssertionSuccess();
-  return ::testing::AssertionFailure() << "error: " << FoundMsg << "\n";
-}
-
-namespace llvm {
-namespace coverage {
-void PrintTo(const Counter &C, ::std::ostream *os) {
-  if (C.isZero())
-    *os << "Zero";
-  else if (C.isExpression())
-    *os << "Expression " << C.getExpressionID();
-  else
-    *os << "Counter " << C.getCounterID();
-}
-
-void PrintTo(const CoverageSegment &S, ::std::ostream *os) {
-  *os << "CoverageSegment(" << S.Line << ", " << S.Col << ", ";
-  if (S.HasCount)
-    *os << S.Count << ", ";
-  *os << (S.IsRegionEntry ? "true" : "false") << ")";
-}
-}
-}
-
-namespace {
-
-struct OutputFunctionCoverageData {
-  StringRef Name;
-  uint64_t Hash;
-  std::vector<StringRef> Filenames;
-  std::vector<CounterMappingRegion> Regions;
-  std::vector<CounterExpression> Expressions;
-
-  OutputFunctionCoverageData() : Hash(0) {}
-
-  OutputFunctionCoverageData(OutputFunctionCoverageData &&OFCD)
-      : Name(OFCD.Name), Hash(OFCD.Hash), Filenames(std::move(OFCD.Filenames)),
-        Regions(std::move(OFCD.Regions)) {}
-
-  OutputFunctionCoverageData(const OutputFunctionCoverageData &) = delete;
-  OutputFunctionCoverageData &
-  operator=(const OutputFunctionCoverageData &) = delete;
-  OutputFunctionCoverageData &operator=(OutputFunctionCoverageData &&) = delete;
-
-  void fillCoverageMappingRecord(CoverageMappingRecord &Record) const {
-    Record.FunctionName = Name;
-    Record.FunctionHash = Hash;
-    Record.Filenames = Filenames;
-    Record.Expressions = Expressions;
-    Record.MappingRegions = Regions;
-  }
-};
-
-struct CoverageMappingReaderMock : CoverageMappingReader {
-  ArrayRef<OutputFunctionCoverageData> Functions;
-
-  CoverageMappingReaderMock(ArrayRef<OutputFunctionCoverageData> Functions)
-      : Functions(Functions) {}
-
-  Error readNextRecord(CoverageMappingRecord &Record) override {
-    if (Functions.empty())
-      return make_error<CoverageMapError>(coveragemap_error::eof);
-
-    Functions.front().fillCoverageMappingRecord(Record);
-    Functions = Functions.slice(1);
-
-    return Error::success();
-  }
-};
-
-struct InputFunctionCoverageData {
-  // Maps the global file index from CoverageMappingTest.Files
-  // to the index of that file within this function. We can't just use
-  // global file indexes here because local indexes have to be dense.
-  // This map is used during serialization to create the virtual file mapping
-  // (from local fileId to global Index) in the head of the per-function
-  // coverage mapping data.
-  SmallDenseMap<unsigned, unsigned> ReverseVirtualFileMapping;
-  std::string Name;
-  uint64_t Hash;
-  std::vector<CounterMappingRegion> Regions;
-  std::vector<CounterExpression> Expressions;
-
-  InputFunctionCoverageData(std::string Name, uint64_t Hash)
-      : Name(std::move(Name)), Hash(Hash) {}
-
-  InputFunctionCoverageData(InputFunctionCoverageData &&IFCD)
-      : ReverseVirtualFileMapping(std::move(IFCD.ReverseVirtualFileMapping)),
-        Name(std::move(IFCD.Name)), Hash(IFCD.Hash),
-        Regions(std::move(IFCD.Regions)) {}
-
-  InputFunctionCoverageData(const InputFunctionCoverageData &) = delete;
-  InputFunctionCoverageData &
-  operator=(const InputFunctionCoverageData &) = delete;
-  InputFunctionCoverageData &operator=(InputFunctionCoverageData &&) = delete;
-};
-
-struct CoverageMappingTest : ::testing::TestWithParam<std::tuple<bool, bool>> {
-  bool UseMultipleReaders;
-  StringMap<unsigned> Files;
-  std::vector<std::string> Filenames;
-  std::vector<InputFunctionCoverageData> InputFunctions;
-  std::vector<OutputFunctionCoverageData> OutputFunctions;
-
-  InstrProfWriter ProfileWriter;
-  std::unique_ptr<IndexedInstrProfReader> ProfileReader;
-
-  std::unique_ptr<CoverageMapping> LoadedCoverage;
-
-  void SetUp() override {
-    ProfileWriter.setOutputSparse(std::get<0>(GetParam()));
-    UseMultipleReaders = std::get<1>(GetParam());
-  }
-
-  unsigned getGlobalFileIndex(StringRef Name) {
-    auto R = Files.find(Name);
-    if (R != Files.end())
-      return R->second;
-    unsigned Index = Files.size() + 1;
-    Files.try_emplace(Name, Index);
-    return Index;
-  }
-
-  // Return the file index of file 'Name' for the current function.
-  // Add the file into the global map if necessary.
-  // See also InputFunctionCoverageData::ReverseVirtualFileMapping
-  // for additional comments.
-  unsigned getFileIndexForFunction(StringRef Name) {
-    unsigned GlobalIndex = getGlobalFileIndex(Name);
-    auto &CurrentFunctionFileMapping =
-        InputFunctions.back().ReverseVirtualFileMapping;
-    auto R = CurrentFunctionFileMapping.find(GlobalIndex);
-    if (R != CurrentFunctionFileMapping.end())
-      return R->second;
-    unsigned IndexInFunction = CurrentFunctionFileMapping.size();
-    CurrentFunctionFileMapping.insert(
-        std::make_pair(GlobalIndex, IndexInFunction));
-    return IndexInFunction;
-  }
-
-  void startFunction(StringRef FuncName, uint64_t Hash) {
-    InputFunctions.emplace_back(FuncName.str(), Hash);
-  }
-
-  void addCMR(Counter C, StringRef File, unsigned LS, unsigned CS, unsigned LE,
-              unsigned CE, bool Skipped = false) {
-    auto &Regions = InputFunctions.back().Regions;
-    unsigned FileID = getFileIndexForFunction(File);
-    Regions.push_back(
-        Skipped ? CounterMappingRegion::makeSkipped(FileID, LS, CS, LE, CE)
-                : CounterMappingRegion::makeRegion(C, FileID, LS, CS, LE, CE));
-  }
-
-  void addExpansionCMR(StringRef File, StringRef ExpandedFile, unsigned LS,
-                       unsigned CS, unsigned LE, unsigned CE) {
-    InputFunctions.back().Regions.push_back(CounterMappingRegion::makeExpansion(
-        getFileIndexForFunction(File), getFileIndexForFunction(ExpandedFile),
-        LS, CS, LE, CE));
-  }
-
-  void addExpression(CounterExpression CE) {
-    InputFunctions.back().Expressions.push_back(CE);
-  }
-
-  std::string writeCoverageRegions(InputFunctionCoverageData &Data) {
-    SmallVector<unsigned, 8> FileIDs(Data.ReverseVirtualFileMapping.size());
-    for (const auto &E : Data.ReverseVirtualFileMapping)
-      FileIDs[E.second] = E.first;
-    std::string Coverage;
-    llvm::raw_string_ostream OS(Coverage);
-    CoverageMappingWriter(FileIDs, Data.Expressions, Data.Regions).write(OS);
-    return OS.str();
-  }
-
-  void readCoverageRegions(const std::string &Coverage,
-                           OutputFunctionCoverageData &Data) {
-    // We will re-use the StringRef in duplicate tests, clear it to avoid
-    // clobber previous ones.
-    Filenames.clear();
-    Filenames.resize(Files.size() + 1);
-    for (const auto &E : Files)
-      Filenames[E.getValue()] = E.getKey().str();
-    ArrayRef<std::string> FilenameRefs = llvm::makeArrayRef(Filenames);
-    RawCoverageMappingReader Reader(Coverage, FilenameRefs, Data.Filenames,
-                                    Data.Expressions, Data.Regions);
-    EXPECT_THAT_ERROR(Reader.read(), Succeeded());
-  }
-
-  void writeAndReadCoverageRegions(bool EmitFilenames = true) {
-    OutputFunctions.resize(InputFunctions.size());
-    for (unsigned I = 0; I < InputFunctions.size(); ++I) {
-      std::string Regions = writeCoverageRegions(InputFunctions[I]);
-      readCoverageRegions(Regions, OutputFunctions[I]);
-      OutputFunctions[I].Name = InputFunctions[I].Name;
-      OutputFunctions[I].Hash = InputFunctions[I].Hash;
-      if (!EmitFilenames)
-        OutputFunctions[I].Filenames.clear();
-    }
-  }
-
-  void readProfCounts() {
-    auto Profile = ProfileWriter.writeBuffer();
-    auto ReaderOrErr = IndexedInstrProfReader::create(std::move(Profile));
-    EXPECT_THAT_ERROR(ReaderOrErr.takeError(), Succeeded());
-    ProfileReader = std::move(ReaderOrErr.get());
-  }
-
-  Expected<std::unique_ptr<CoverageMapping>> readOutputFunctions() {
-    std::vector<std::unique_ptr<CoverageMappingReader>> CoverageReaders;
-    if (UseMultipleReaders) {
-      for (const auto &OF : OutputFunctions) {
-        ArrayRef<OutputFunctionCoverageData> Funcs(OF);
-        CoverageReaders.push_back(
-            std::make_unique<CoverageMappingReaderMock>(Funcs));
-      }
-    } else {
-      ArrayRef<OutputFunctionCoverageData> Funcs(OutputFunctions);
-      CoverageReaders.push_back(
-          std::make_unique<CoverageMappingReaderMock>(Funcs));
-    }
-    return CoverageMapping::load(CoverageReaders, *ProfileReader);
-  }
-
-  Error loadCoverageMapping(bool EmitFilenames = true) {
-    readProfCounts();
-    writeAndReadCoverageRegions(EmitFilenames);
-    auto CoverageOrErr = readOutputFunctions();
-    if (!CoverageOrErr)
-      return CoverageOrErr.takeError();
-    LoadedCoverage = std::move(CoverageOrErr.get());
-    return Error::success();
-  }
-};
-
-TEST_P(CoverageMappingTest, basic_write_read) {
-  startFunction("func", 0x1234);
-  addCMR(Counter::getCounter(0), "foo", 1, 1, 1, 1);
-  addCMR(Counter::getCounter(1), "foo", 2, 1, 2, 2);
-  addCMR(Counter::getZero(),     "foo", 3, 1, 3, 4);
-  addCMR(Counter::getCounter(2), "foo", 4, 1, 4, 8);
-  addCMR(Counter::getCounter(3), "bar", 1, 2, 3, 4);
-
-  writeAndReadCoverageRegions();
-  ASSERT_EQ(1u, InputFunctions.size());
-  ASSERT_EQ(1u, OutputFunctions.size());
-  InputFunctionCoverageData &Input = InputFunctions.back();
-  OutputFunctionCoverageData &Output = OutputFunctions.back();
-
-  size_t N = makeArrayRef(Input.Regions).size();
-  ASSERT_EQ(N, Output.Regions.size());
-  for (size_t I = 0; I < N; ++I) {
-    ASSERT_EQ(Input.Regions[I].Count, Output.Regions[I].Count);
-    ASSERT_EQ(Input.Regions[I].FileID, Output.Regions[I].FileID);
-    ASSERT_EQ(Input.Regions[I].startLoc(), Output.Regions[I].startLoc());
-    ASSERT_EQ(Input.Regions[I].endLoc(), Output.Regions[I].endLoc());
-    ASSERT_EQ(Input.Regions[I].Kind, Output.Regions[I].Kind);
-  }
-}
-
-TEST_P(CoverageMappingTest, correct_deserialize_for_more_than_two_files) {
-  const char *FileNames[] = {"bar", "baz", "foo"};
-  static const unsigned N = array_lengthof(FileNames);
-
-  startFunction("func", 0x1234);
-  for (unsigned I = 0; I < N; ++I)
-    // Use LineStart to hold the index of the file name
-    // in order to preserve that information during possible sorting of CMRs.
-    addCMR(Counter::getCounter(0), FileNames[I], I, 1, I, 1);
-
-  writeAndReadCoverageRegions();
-  ASSERT_EQ(1u, OutputFunctions.size());
-  OutputFunctionCoverageData &Output = OutputFunctions.back();
-
-  ASSERT_EQ(N, Output.Regions.size());
-  ASSERT_EQ(N, Output.Filenames.size());
-
-  for (unsigned I = 0; I < N; ++I) {
-    ASSERT_GT(N, Output.Regions[I].FileID);
-    ASSERT_GT(N, Output.Regions[I].LineStart);
-    EXPECT_EQ(FileNames[Output.Regions[I].LineStart],
-              Output.Filenames[Output.Regions[I].FileID]);
-  }
-}
-
-static const auto Err = [](Error E) { FAIL(); };
-
-TEST_P(CoverageMappingTest, load_coverage_for_more_than_two_files) {
-  ProfileWriter.addRecord({"func", 0x1234, {0}}, Err);
-
-  const char *FileNames[] = {"bar", "baz", "foo"};
-  static const unsigned N = array_lengthof(FileNames);
-
-  startFunction("func", 0x1234);
-  for (unsigned I = 0; I < N; ++I)
-    // Use LineStart to hold the index of the file name
-    // in order to preserve that information during possible sorting of CMRs.
-    addCMR(Counter::getCounter(0), FileNames[I], I, 1, I, 1);
-
-  EXPECT_THAT_ERROR(loadCoverageMapping(), Succeeded());
-
-  for (unsigned I = 0; I < N; ++I) {
-    CoverageData Data = LoadedCoverage->getCoverageForFile(FileNames[I]);
-    ASSERT_TRUE(!Data.empty());
-    EXPECT_EQ(I, Data.begin()->Line);
-  }
-}
-
-TEST_P(CoverageMappingTest, load_coverage_with_bogus_function_name) {
-  ProfileWriter.addRecord({"", 0x1234, {10}}, Err);
-  startFunction("", 0x1234);
-  addCMR(Counter::getCounter(0), "foo", 1, 1, 5, 5);
-  EXPECT_TRUE(ErrorEquals(coveragemap_error::malformed, loadCoverageMapping()));
-}
-
-TEST_P(CoverageMappingTest, load_coverage_for_several_functions) {
-  ProfileWriter.addRecord({"func1", 0x1234, {10}}, Err);
-  ProfileWriter.addRecord({"func2", 0x2345, {20}}, Err);
-
-  startFunction("func1", 0x1234);
-  addCMR(Counter::getCounter(0), "foo", 1, 1, 5, 5);
-
-  startFunction("func2", 0x2345);
-  addCMR(Counter::getCounter(0), "bar", 2, 2, 6, 6);
-
-  EXPECT_THAT_ERROR(loadCoverageMapping(), Succeeded());
-
-  const auto FunctionRecords = LoadedCoverage->getCoveredFunctions();
-  EXPECT_EQ(2, std::distance(FunctionRecords.begin(), FunctionRecords.end()));
-  for (const auto &FunctionRecord : FunctionRecords) {
-    CoverageData Data = LoadedCoverage->getCoverageForFunction(FunctionRecord);
-    std::vector<CoverageSegment> Segments(Data.begin(), Data.end());
-    ASSERT_EQ(2U, Segments.size());
-    if (FunctionRecord.Name == "func1") {
-      EXPECT_EQ(CoverageSegment(1, 1, 10, true), Segments[0]);
-      EXPECT_EQ(CoverageSegment(5, 5, false), Segments[1]);
-    } else {
-      ASSERT_EQ("func2", FunctionRecord.Name);
-      EXPECT_EQ(CoverageSegment(2, 2, 20, true), Segments[0]);
-      EXPECT_EQ(CoverageSegment(6, 6, false), Segments[1]);
-    }
-  }
-}
-
-TEST_P(CoverageMappingTest, create_combined_regions) {
-  ProfileWriter.addRecord({"func1", 0x1234, {1, 2, 3}}, Err);
-  startFunction("func1", 0x1234);
-
-  // Given regions which start at the same location, emit a segment for the
-  // last region.
-  addCMR(Counter::getCounter(0), "file1", 1, 1, 2, 2);
-  addCMR(Counter::getCounter(1), "file1", 1, 1, 2, 2);
-  addCMR(Counter::getCounter(2), "file1", 1, 1, 2, 2);
-
-  EXPECT_THAT_ERROR(loadCoverageMapping(), Succeeded());
-  const auto FunctionRecords = LoadedCoverage->getCoveredFunctions();
-  const auto &FunctionRecord = *FunctionRecords.begin();
-  CoverageData Data = LoadedCoverage->getCoverageForFunction(FunctionRecord);
-  std::vector<CoverageSegment> Segments(Data.begin(), Data.end());
-
-  ASSERT_EQ(2U, Segments.size());
-  EXPECT_EQ(CoverageSegment(1, 1, 6, true), Segments[0]);
-  EXPECT_EQ(CoverageSegment(2, 2, false), Segments[1]);
-}
-
-TEST_P(CoverageMappingTest, skipped_segments_have_no_count) {
-  ProfileWriter.addRecord({"func1", 0x1234, {1}}, Err);
-  startFunction("func1", 0x1234);
-
-  addCMR(Counter::getCounter(0), "file1", 1, 1, 5, 5);
-  addCMR(Counter::getCounter(0), "file1", 5, 1, 5, 5, /*Skipped=*/true);
-
-  EXPECT_THAT_ERROR(loadCoverageMapping(), Succeeded());
-  const auto FunctionRecords = LoadedCoverage->getCoveredFunctions();
-  const auto &FunctionRecord = *FunctionRecords.begin();
-  CoverageData Data = LoadedCoverage->getCoverageForFunction(FunctionRecord);
-  std::vector<CoverageSegment> Segments(Data.begin(), Data.end());
-
-  ASSERT_EQ(3U, Segments.size());
-  EXPECT_EQ(CoverageSegment(1, 1, 1, true), Segments[0]);
-  EXPECT_EQ(CoverageSegment(5, 1, true), Segments[1]);
-  EXPECT_EQ(CoverageSegment(5, 5, false), Segments[2]);
-}
-
-TEST_P(CoverageMappingTest, multiple_regions_end_after_parent_ends) {
-  ProfileWriter.addRecord({"func1", 0x1234, {1, 0}}, Err);
-  startFunction("func1", 0x1234);
-
-  // 1| F{ a{
-  // 2|
-  // 3|    a} b{ c{
-  // 4|
-  // 5|    b}
-  // 6|
-  // 7| c} d{   e{
-  // 8|
-  // 9| d}      e} F}
-  addCMR(Counter::getCounter(0), "file1", 1, 1, 9, 9); // < F
-  addCMR(Counter::getCounter(0), "file1", 1, 1, 3, 5); // < a
-  addCMR(Counter::getCounter(0), "file1", 3, 5, 5, 4); // < b
-  addCMR(Counter::getCounter(1), "file1", 3, 5, 7, 3); // < c
-  addCMR(Counter::getCounter(1), "file1", 7, 3, 9, 2); // < d
-  addCMR(Counter::getCounter(1), "file1", 7, 7, 9, 7); // < e
-
-  EXPECT_THAT_ERROR(loadCoverageMapping(), Succeeded());
-  const auto FunctionRecords = LoadedCoverage->getCoveredFunctions();
-  const auto &FunctionRecord = *FunctionRecords.begin();
-  CoverageData Data = LoadedCoverage->getCoverageForFunction(FunctionRecord);
-  std::vector<CoverageSegment> Segments(Data.begin(), Data.end());
-
-  // Old output (not sorted or unique):
-  //   Segment at 1:1 with count 1
-  //   Segment at 1:1 with count 1
-  //   Segment at 3:5 with count 1
-  //   Segment at 3:5 with count 0
-  //   Segment at 3:5 with count 1
-  //   Segment at 5:4 with count 0
-  //   Segment at 7:3 with count 1
-  //   Segment at 7:3 with count 0
-  //   Segment at 7:7 with count 0
-  //   Segment at 9:7 with count 0
-  //   Segment at 9:2 with count 1
-  //   Top level segment at 9:9
-
-  // New output (sorted and unique):
-  //   Segment at 1:1 (count = 1), RegionEntry
-  //   Segment at 3:5 (count = 1), RegionEntry
-  //   Segment at 5:4 (count = 0)
-  //   Segment at 7:3 (count = 0), RegionEntry
-  //   Segment at 7:7 (count = 0), RegionEntry
-  //   Segment at 9:2 (count = 0)
-  //   Segment at 9:7 (count = 1)
-  //   Segment at 9:9 (count = 0), Skipped
-
-  ASSERT_EQ(8U, Segments.size());
-  EXPECT_EQ(CoverageSegment(1, 1, 1, true), Segments[0]);
-  EXPECT_EQ(CoverageSegment(3, 5, 1, true), Segments[1]);
-  EXPECT_EQ(CoverageSegment(5, 4, 0, false), Segments[2]);
-  EXPECT_EQ(CoverageSegment(7, 3, 0, true), Segments[3]);
-  EXPECT_EQ(CoverageSegment(7, 7, 0, true), Segments[4]);
-  EXPECT_EQ(CoverageSegment(9, 2, 0, false), Segments[5]);
-  EXPECT_EQ(CoverageSegment(9, 7, 1, false), Segments[6]);
-  EXPECT_EQ(CoverageSegment(9, 9, false), Segments[7]);
-}
-
-TEST_P(CoverageMappingTest, multiple_completed_segments_at_same_loc) {
-  ProfileWriter.addRecord({"func1", 0x1234, {0, 1, 2}}, Err);
-  startFunction("func1", 0x1234);
-
-  // PR35495
-  addCMR(Counter::getCounter(1), "file1", 2, 1, 18, 2);
-  addCMR(Counter::getCounter(0), "file1", 8, 10, 14, 6);
-  addCMR(Counter::getCounter(0), "file1", 8, 12, 14, 6);
-  addCMR(Counter::getCounter(1), "file1", 9, 1, 14, 6);
-  addCMR(Counter::getCounter(2), "file1", 11, 13, 11, 14);
-
-  EXPECT_THAT_ERROR(loadCoverageMapping(), Succeeded());
-  const auto FunctionRecords = LoadedCoverage->getCoveredFunctions();
-  const auto &FunctionRecord = *FunctionRecords.begin();
-  CoverageData Data = LoadedCoverage->getCoverageForFunction(FunctionRecord);
-  std::vector<CoverageSegment> Segments(Data.begin(), Data.end());
-
-  ASSERT_EQ(7U, Segments.size());
-  EXPECT_EQ(CoverageSegment(2, 1, 1, true), Segments[0]);
-  EXPECT_EQ(CoverageSegment(8, 10, 0, true), Segments[1]);
-  EXPECT_EQ(CoverageSegment(8, 12, 0, true), Segments[2]);
-  EXPECT_EQ(CoverageSegment(9, 1, 1, true), Segments[3]);
-  EXPECT_EQ(CoverageSegment(11, 13, 2, true), Segments[4]);
-  // Use count=1 (from 9:1 -> 14:6), not count=0 (from 8:12 -> 14:6).
-  EXPECT_EQ(CoverageSegment(11, 14, 1, false), Segments[5]);
-  EXPECT_EQ(CoverageSegment(18, 2, false), Segments[6]);
-}
-
-TEST_P(CoverageMappingTest, dont_emit_redundant_segments) {
-  ProfileWriter.addRecord({"func1", 0x1234, {1, 1}}, Err);
-  startFunction("func1", 0x1234);
-
-  addCMR(Counter::getCounter(0), "file1", 1, 1, 4, 4);
-  addCMR(Counter::getCounter(1), "file1", 2, 2, 5, 5);
-  addCMR(Counter::getCounter(0), "file1", 3, 3, 6, 6);
-
-  EXPECT_THAT_ERROR(loadCoverageMapping(), Succeeded());
-  const auto FunctionRecords = LoadedCoverage->getCoveredFunctions();
-  const auto &FunctionRecord = *FunctionRecords.begin();
-  CoverageData Data = LoadedCoverage->getCoverageForFunction(FunctionRecord);
-  std::vector<CoverageSegment> Segments(Data.begin(), Data.end());
-
-  ASSERT_EQ(5U, Segments.size());
-  EXPECT_EQ(CoverageSegment(1, 1, 1, true), Segments[0]);
-  EXPECT_EQ(CoverageSegment(2, 2, 1, true), Segments[1]);
-  EXPECT_EQ(CoverageSegment(3, 3, 1, true), Segments[2]);
-  EXPECT_EQ(CoverageSegment(4, 4, 1, false), Segments[3]);
-  // A closing segment starting at 5:5 would be redundant: it would have the
-  // same count as the segment starting at 4:4, and has all the same metadata.
-  EXPECT_EQ(CoverageSegment(6, 6, false), Segments[4]);
-}
-
-TEST_P(CoverageMappingTest, dont_emit_closing_segment_at_new_region_start) {
-  ProfileWriter.addRecord({"func1", 0x1234, {1}}, Err);
-  startFunction("func1", 0x1234);
-
-  addCMR(Counter::getCounter(0), "file1", 1, 1, 6, 5);
-  addCMR(Counter::getCounter(0), "file1", 2, 2, 6, 5);
-  addCMR(Counter::getCounter(0), "file1", 3, 3, 6, 5);
-  addCMR(Counter::getCounter(0), "file1", 6, 5, 7, 7);
-
-  EXPECT_THAT_ERROR(loadCoverageMapping(), Succeeded());
-  const auto FunctionRecords = LoadedCoverage->getCoveredFunctions();
-  const auto &FunctionRecord = *FunctionRecords.begin();
-  CoverageData Data = LoadedCoverage->getCoverageForFunction(FunctionRecord);
-  std::vector<CoverageSegment> Segments(Data.begin(), Data.end());
-
-  ASSERT_EQ(5U, Segments.size());
-  EXPECT_EQ(CoverageSegment(1, 1, 1, true), Segments[0]);
-  EXPECT_EQ(CoverageSegment(2, 2, 1, true), Segments[1]);
-  EXPECT_EQ(CoverageSegment(3, 3, 1, true), Segments[2]);
-  EXPECT_EQ(CoverageSegment(6, 5, 1, true), Segments[3]);
-  // The old segment builder would get this wrong by emitting multiple segments
-  // which start at 6:5 (a few of which were skipped segments). We should just
-  // get a segment for the region entry.
-  EXPECT_EQ(CoverageSegment(7, 7, false), Segments[4]);
-}
-
-TEST_P(CoverageMappingTest, handle_consecutive_regions_with_zero_length) {
-  ProfileWriter.addRecord({"func1", 0x1234, {1, 2}}, Err);
-  startFunction("func1", 0x1234);
-
-  addCMR(Counter::getCounter(0), "file1", 1, 1, 1, 1);
-  addCMR(Counter::getCounter(1), "file1", 1, 1, 1, 1);
-  addCMR(Counter::getCounter(0), "file1", 1, 1, 1, 1);
-  addCMR(Counter::getCounter(1), "file1", 1, 1, 1, 1);
-  addCMR(Counter::getCounter(0), "file1", 1, 1, 1, 1);
-
-  EXPECT_THAT_ERROR(loadCoverageMapping(), Succeeded());
-  const auto FunctionRecords = LoadedCoverage->getCoveredFunctions();
-  const auto &FunctionRecord = *FunctionRecords.begin();
-  CoverageData Data = LoadedCoverage->getCoverageForFunction(FunctionRecord);
-  std::vector<CoverageSegment> Segments(Data.begin(), Data.end());
-
-  ASSERT_EQ(1U, Segments.size());
-  EXPECT_EQ(CoverageSegment(1, 1, true), Segments[0]);
-  // We need to get a skipped segment starting at 1:1. In this case there is
-  // also a region entry at 1:1.
-}
-
-TEST_P(CoverageMappingTest, handle_sandwiched_zero_length_region) {
-  ProfileWriter.addRecord({"func1", 0x1234, {2, 1}}, Err);
-  startFunction("func1", 0x1234);
-
-  addCMR(Counter::getCounter(0), "file1", 1, 5, 4, 4);
-  addCMR(Counter::getCounter(1), "file1", 1, 9, 1, 50);
-  addCMR(Counter::getCounter(1), "file1", 2, 7, 2, 34);
-  addCMR(Counter::getCounter(1), "file1", 3, 5, 3, 21);
-  addCMR(Counter::getCounter(1), "file1", 3, 21, 3, 21);
-  addCMR(Counter::getCounter(1), "file1", 4, 12, 4, 17);
-
-  EXPECT_THAT_ERROR(loadCoverageMapping(), Succeeded());
-  const auto FunctionRecords = LoadedCoverage->getCoveredFunctions();
-  const auto &FunctionRecord = *FunctionRecords.begin();
-  CoverageData Data = LoadedCoverage->getCoverageForFunction(FunctionRecord);
-  std::vector<CoverageSegment> Segments(Data.begin(), Data.end());
-
-  ASSERT_EQ(10U, Segments.size());
-  EXPECT_EQ(CoverageSegment(1, 5, 2, true), Segments[0]);
-  EXPECT_EQ(CoverageSegment(1, 9, 1, true), Segments[1]);
-  EXPECT_EQ(CoverageSegment(1, 50, 2, false), Segments[2]);
-  EXPECT_EQ(CoverageSegment(2, 7, 1, true), Segments[3]);
-  EXPECT_EQ(CoverageSegment(2, 34, 2, false), Segments[4]);
-  EXPECT_EQ(CoverageSegment(3, 5, 1, true), Segments[5]);
-  EXPECT_EQ(CoverageSegment(3, 21, 2, true), Segments[6]);
-  // Handle the zero-length region by creating a segment with its predecessor's
-  // count (i.e the count from 1:5 -> 4:4).
-  EXPECT_EQ(CoverageSegment(4, 4, false), Segments[7]);
-  // The area between 4:4 and 4:12 is skipped.
-  EXPECT_EQ(CoverageSegment(4, 12, 1, true), Segments[8]);
-  EXPECT_EQ(CoverageSegment(4, 17, false), Segments[9]);
-}
-
-TEST_P(CoverageMappingTest, handle_last_completed_region) {
-  ProfileWriter.addRecord({"func1", 0x1234, {1, 2, 3, 4}}, Err);
-  startFunction("func1", 0x1234);
-
-  addCMR(Counter::getCounter(0), "file1", 1, 1, 8, 8);
-  addCMR(Counter::getCounter(1), "file1", 2, 2, 5, 5);
-  addCMR(Counter::getCounter(2), "file1", 3, 3, 4, 4);
-  addCMR(Counter::getCounter(3), "file1", 6, 6, 7, 7);
-
-  EXPECT_THAT_ERROR(loadCoverageMapping(), Succeeded());
-  const auto FunctionRecords = LoadedCoverage->getCoveredFunctions();
-  const auto &FunctionRecord = *FunctionRecords.begin();
-  CoverageData Data = LoadedCoverage->getCoverageForFunction(FunctionRecord);
-  std::vector<CoverageSegment> Segments(Data.begin(), Data.end());
-
-  ASSERT_EQ(8U, Segments.size());
-  EXPECT_EQ(CoverageSegment(1, 1, 1, true), Segments[0]);
-  EXPECT_EQ(CoverageSegment(2, 2, 2, true), Segments[1]);
-  EXPECT_EQ(CoverageSegment(3, 3, 3, true), Segments[2]);
-  EXPECT_EQ(CoverageSegment(4, 4, 2, false), Segments[3]);
-  EXPECT_EQ(CoverageSegment(5, 5, 1, false), Segments[4]);
-  EXPECT_EQ(CoverageSegment(6, 6, 4, true), Segments[5]);
-  EXPECT_EQ(CoverageSegment(7, 7, 1, false), Segments[6]);
-  EXPECT_EQ(CoverageSegment(8, 8, false), Segments[7]);
-}
-
-TEST_P(CoverageMappingTest, expansion_gets_first_counter) {
-  startFunction("func", 0x1234);
-  addCMR(Counter::getCounter(1), "foo", 10, 1, 10, 2);
-  // This starts earlier in "foo", so the expansion should get its counter.
-  addCMR(Counter::getCounter(2), "foo", 1, 1, 20, 1);
-  addExpansionCMR("bar", "foo", 3, 3, 3, 3);
-
-  writeAndReadCoverageRegions();
-  ASSERT_EQ(1u, OutputFunctions.size());
-  OutputFunctionCoverageData &Output = OutputFunctions.back();
-
-  ASSERT_EQ(CounterMappingRegion::ExpansionRegion, Output.Regions[2].Kind);
-  ASSERT_EQ(Counter::getCounter(2), Output.Regions[2].Count);
-  ASSERT_EQ(3U, Output.Regions[2].LineStart);
-}
-
-TEST_P(CoverageMappingTest, basic_coverage_iteration) {
-  ProfileWriter.addRecord({"func", 0x1234, {30, 20, 10, 0}}, Err);
-
-  startFunction("func", 0x1234);
-  addCMR(Counter::getCounter(0), "file1", 1, 1, 9, 9);
-  addCMR(Counter::getCounter(1), "file1", 1, 1, 4, 7);
-  addCMR(Counter::getCounter(2), "file1", 5, 8, 9, 1);
-  addCMR(Counter::getCounter(3), "file1", 10, 10, 11, 11);
-  EXPECT_THAT_ERROR(loadCoverageMapping(), Succeeded());
-
-  CoverageData Data = LoadedCoverage->getCoverageForFile("file1");
-  std::vector<CoverageSegment> Segments(Data.begin(), Data.end());
-  ASSERT_EQ(7U, Segments.size());
-  ASSERT_EQ(CoverageSegment(1, 1, 20, true),  Segments[0]);
-  ASSERT_EQ(CoverageSegment(4, 7, 30, false), Segments[1]);
-  ASSERT_EQ(CoverageSegment(5, 8, 10, true),  Segments[2]);
-  ASSERT_EQ(CoverageSegment(9, 1, 30, false), Segments[3]);
-  ASSERT_EQ(CoverageSegment(9, 9, false),     Segments[4]);
-  ASSERT_EQ(CoverageSegment(10, 10, 0, true), Segments[5]);
-  ASSERT_EQ(CoverageSegment(11, 11, false),   Segments[6]);
-}
-
-TEST_P(CoverageMappingTest, test_line_coverage_iterator) {
-  ProfileWriter.addRecord({"func", 0x1234, {30, 20, 10, 0}}, Err);
-
-  startFunction("func", 0x1234);
-  addCMR(Counter::getCounter(0), "file1", 1, 1, 9, 9);
-  addCMR(Counter::getCounter(1), "file1", 1, 1, 4, 7);
-  addCMR(Counter::getCounter(2), "file1", 5, 8, 9, 1);
-  addCMR(Counter::getCounter(3), "file1", 10, 10, 11, 11);
-  EXPECT_THAT_ERROR(loadCoverageMapping(), Succeeded());
-
-  CoverageData Data = LoadedCoverage->getCoverageForFile("file1");
-
-  unsigned Line = 0;
-  unsigned LineCounts[] = {20, 20, 20, 20, 30, 10, 10, 10, 10, 0, 0};
-  for (const auto &LCS : getLineCoverageStats(Data)) {
-    ASSERT_EQ(Line + 1, LCS.getLine());
-    errs() << "Line: " << Line + 1 << ", count = " << LCS.getExecutionCount() << "\n";
-    ASSERT_EQ(LineCounts[Line], LCS.getExecutionCount());
-    ++Line;
-  }
-  ASSERT_EQ(11U, Line);
-}
-
-TEST_P(CoverageMappingTest, uncovered_function) {
-  startFunction("func", 0x1234);
-  addCMR(Counter::getZero(), "file1", 1, 2, 3, 4);
-  EXPECT_THAT_ERROR(loadCoverageMapping(), Succeeded());
-
-  CoverageData Data = LoadedCoverage->getCoverageForFile("file1");
-  std::vector<CoverageSegment> Segments(Data.begin(), Data.end());
-  ASSERT_EQ(2U, Segments.size());
-  ASSERT_EQ(CoverageSegment(1, 2, 0, true), Segments[0]);
-  ASSERT_EQ(CoverageSegment(3, 4, false),   Segments[1]);
-}
-
-TEST_P(CoverageMappingTest, uncovered_function_with_mapping) {
-  startFunction("func", 0x1234);
-  addCMR(Counter::getCounter(0), "file1", 1, 1, 9, 9);
-  addCMR(Counter::getCounter(1), "file1", 1, 1, 4, 7);
-  EXPECT_THAT_ERROR(loadCoverageMapping(), Succeeded());
-
-  CoverageData Data = LoadedCoverage->getCoverageForFile("file1");
-  std::vector<CoverageSegment> Segments(Data.begin(), Data.end());
-  ASSERT_EQ(3U, Segments.size());
-  ASSERT_EQ(CoverageSegment(1, 1, 0, true),  Segments[0]);
-  ASSERT_EQ(CoverageSegment(4, 7, 0, false), Segments[1]);
-  ASSERT_EQ(CoverageSegment(9, 9, false),    Segments[2]);
-}
-
-TEST_P(CoverageMappingTest, combine_regions) {
-  ProfileWriter.addRecord({"func", 0x1234, {10, 20, 30}}, Err);
-
-  startFunction("func", 0x1234);
-  addCMR(Counter::getCounter(0), "file1", 1, 1, 9, 9);
-  addCMR(Counter::getCounter(1), "file1", 3, 3, 4, 4);
-  addCMR(Counter::getCounter(2), "file1", 3, 3, 4, 4);
-  EXPECT_THAT_ERROR(loadCoverageMapping(), Succeeded());
-
-  CoverageData Data = LoadedCoverage->getCoverageForFile("file1");
-  std::vector<CoverageSegment> Segments(Data.begin(), Data.end());
-  ASSERT_EQ(4U, Segments.size());
-  ASSERT_EQ(CoverageSegment(1, 1, 10, true), Segments[0]);
-  ASSERT_EQ(CoverageSegment(3, 3, 50, true), Segments[1]);
-  ASSERT_EQ(CoverageSegment(4, 4, 10, false), Segments[2]);
-  ASSERT_EQ(CoverageSegment(9, 9, false), Segments[3]);
-}
-
-TEST_P(CoverageMappingTest, restore_combined_counter_after_nested_region) {
-  ProfileWriter.addRecord({"func", 0x1234, {10, 20, 40}}, Err);
-
-  startFunction("func", 0x1234);
-  addCMR(Counter::getCounter(0), "file1", 1, 1, 9, 9);
-  addCMR(Counter::getCounter(1), "file1", 1, 1, 9, 9);
-  addCMR(Counter::getCounter(2), "file1", 3, 3, 5, 5);
-  EXPECT_THAT_ERROR(loadCoverageMapping(), Succeeded());
-
-  CoverageData Data = LoadedCoverage->getCoverageForFile("file1");
-  std::vector<CoverageSegment> Segments(Data.begin(), Data.end());
-  ASSERT_EQ(4U, Segments.size());
-  EXPECT_EQ(CoverageSegment(1, 1, 30, true), Segments[0]);
-  EXPECT_EQ(CoverageSegment(3, 3, 40, true), Segments[1]);
-  EXPECT_EQ(CoverageSegment(5, 5, 30, false), Segments[2]);
-  EXPECT_EQ(CoverageSegment(9, 9, false), Segments[3]);
-}
-
-// If CodeRegions and ExpansionRegions cover the same area,
-// only counts of CodeRegions should be used.
-TEST_P(CoverageMappingTest, dont_combine_expansions) {
-  ProfileWriter.addRecord({"func", 0x1234, {10, 20}}, Err);
-  ProfileWriter.addRecord({"func", 0x1234, {0, 0}}, Err);
-
-  startFunction("func", 0x1234);
-  addCMR(Counter::getCounter(0), "file1", 1, 1, 9, 9);
-  addCMR(Counter::getCounter(1), "file1", 3, 3, 4, 4);
-  addCMR(Counter::getCounter(1), "include1", 6, 6, 7, 7);
-  addExpansionCMR("file1", "include1", 3, 3, 4, 4);
-  EXPECT_THAT_ERROR(loadCoverageMapping(), Succeeded());
-
-  CoverageData Data = LoadedCoverage->getCoverageForFile("file1");
-  std::vector<CoverageSegment> Segments(Data.begin(), Data.end());
-  ASSERT_EQ(4U, Segments.size());
-  ASSERT_EQ(CoverageSegment(1, 1, 10, true), Segments[0]);
-  ASSERT_EQ(CoverageSegment(3, 3, 20, true), Segments[1]);
-  ASSERT_EQ(CoverageSegment(4, 4, 10, false), Segments[2]);
-  ASSERT_EQ(CoverageSegment(9, 9, false), Segments[3]);
-}
-
-// If an area is covered only by ExpansionRegions, they should be combinated.
-TEST_P(CoverageMappingTest, combine_expansions) {
-  ProfileWriter.addRecord({"func", 0x1234, {2, 3, 7}}, Err);
-
-  startFunction("func", 0x1234);
-  addCMR(Counter::getCounter(1), "include1", 1, 1, 1, 10);
-  addCMR(Counter::getCounter(2), "include2", 1, 1, 1, 10);
-  addCMR(Counter::getCounter(0), "file", 1, 1, 5, 5);
-  addExpansionCMR("file", "include1", 3, 1, 3, 5);
-  addExpansionCMR("file", "include2", 3, 1, 3, 5);
-
-  EXPECT_THAT_ERROR(loadCoverageMapping(), Succeeded());
-
-  CoverageData Data = LoadedCoverage->getCoverageForFile("file");
-  std::vector<CoverageSegment> Segments(Data.begin(), Data.end());
-  ASSERT_EQ(4U, Segments.size());
-  EXPECT_EQ(CoverageSegment(1, 1, 2, true), Segments[0]);
-  EXPECT_EQ(CoverageSegment(3, 1, 10, true), Segments[1]);
-  EXPECT_EQ(CoverageSegment(3, 5, 2, false), Segments[2]);
-  EXPECT_EQ(CoverageSegment(5, 5, false), Segments[3]);
-}
-
-// Test that counters not associated with any code regions are allowed.
-TEST_P(CoverageMappingTest, non_code_region_counters) {
-  // No records in profdata
-
-  startFunction("func", 0x1234);
-  addCMR(Counter::getCounter(0), "file", 1, 1, 5, 5);
-  addCMR(Counter::getExpression(0), "file", 6, 1, 6, 5);
-  addExpression(CounterExpression(
-      CounterExpression::Add, Counter::getCounter(1), Counter::getCounter(2)));
-
-  EXPECT_THAT_ERROR(loadCoverageMapping(), Succeeded());
-
-  std::vector<std::string> Names;
-  for (const auto &Func : LoadedCoverage->getCoveredFunctions()) {
-    Names.push_back(Func.Name);
-    ASSERT_EQ(2U, Func.CountedRegions.size());
-  }
-  ASSERT_EQ(1U, Names.size());
-}
-
-TEST_P(CoverageMappingTest, strip_filename_prefix) {
-  ProfileWriter.addRecord({"file1:func", 0x1234, {0}}, Err);
-
-  startFunction("file1:func", 0x1234);
-  addCMR(Counter::getCounter(0), "file1", 1, 1, 9, 9);
-  EXPECT_THAT_ERROR(loadCoverageMapping(), Succeeded());
-
-  std::vector<std::string> Names;
-  for (const auto &Func : LoadedCoverage->getCoveredFunctions())
-    Names.push_back(Func.Name);
-  ASSERT_EQ(1U, Names.size());
-  ASSERT_EQ("func", Names[0]);
-}
-
-TEST_P(CoverageMappingTest, strip_unknown_filename_prefix) {
-  ProfileWriter.addRecord({"<unknown>:func", 0x1234, {0}}, Err);
-
-  startFunction("<unknown>:func", 0x1234);
-  addCMR(Counter::getCounter(0), "", 1, 1, 9, 9);
-  EXPECT_THAT_ERROR(loadCoverageMapping(/*EmitFilenames=*/false), Succeeded());
-
-  std::vector<std::string> Names;
-  for (const auto &Func : LoadedCoverage->getCoveredFunctions())
-    Names.push_back(Func.Name);
-  ASSERT_EQ(1U, Names.size());
-  ASSERT_EQ("func", Names[0]);
-}
-
-TEST_P(CoverageMappingTest, dont_detect_false_instantiations) {
-  ProfileWriter.addRecord({"foo", 0x1234, {10}}, Err);
-  ProfileWriter.addRecord({"bar", 0x2345, {20}}, Err);
-
-  startFunction("foo", 0x1234);
-  addCMR(Counter::getCounter(0), "expanded", 1, 1, 1, 10);
-  addExpansionCMR("main", "expanded", 4, 1, 4, 5);
-
-  startFunction("bar", 0x2345);
-  addCMR(Counter::getCounter(0), "expanded", 1, 1, 1, 10);
-  addExpansionCMR("main", "expanded", 9, 1, 9, 5);
-
-  EXPECT_THAT_ERROR(loadCoverageMapping(), Succeeded());
-
-  std::vector<InstantiationGroup> InstantiationGroups =
-      LoadedCoverage->getInstantiationGroups("expanded");
-  ASSERT_TRUE(InstantiationGroups.empty());
-}
-
-TEST_P(CoverageMappingTest, load_coverage_for_expanded_file) {
-  ProfileWriter.addRecord({"func", 0x1234, {10}}, Err);
-
-  startFunction("func", 0x1234);
-  addCMR(Counter::getCounter(0), "expanded", 1, 1, 1, 10);
-  addExpansionCMR("main", "expanded", 4, 1, 4, 5);
-
-  EXPECT_THAT_ERROR(loadCoverageMapping(), Succeeded());
-
-  CoverageData Data = LoadedCoverage->getCoverageForFile("expanded");
-  std::vector<CoverageSegment> Segments(Data.begin(), Data.end());
-  ASSERT_EQ(2U, Segments.size());
-  EXPECT_EQ(CoverageSegment(1, 1, 10, true), Segments[0]);
-  EXPECT_EQ(CoverageSegment(1, 10, false), Segments[1]);
-}
-
-TEST_P(CoverageMappingTest, skip_duplicate_function_record) {
-  ProfileWriter.addRecord({"func", 0x1234, {1}}, Err);
-
-  // This record should be loaded.
-  startFunction("func", 0x1234);
-  addCMR(Counter::getCounter(0), "file1", 1, 1, 9, 9);
-
-  // This record should be loaded.
-  startFunction("func", 0x1234);
-  addCMR(Counter::getCounter(0), "file1", 1, 1, 9, 9);
-  addCMR(Counter::getCounter(0), "file2", 1, 1, 9, 9);
-
-  // This record should be skipped.
-  startFunction("func", 0x1234);
-  addCMR(Counter::getCounter(0), "file1", 1, 1, 9, 9);
-
-  // This record should be loaded.
-  startFunction("func", 0x1234);
-  addCMR(Counter::getCounter(0), "file2", 1, 1, 9, 9);
-  addCMR(Counter::getCounter(0), "file1", 1, 1, 9, 9);
-
-  // This record should be skipped.
-  startFunction("func", 0x1234);
-  addCMR(Counter::getCounter(0), "file1", 1, 1, 9, 9);
-  addCMR(Counter::getCounter(0), "file2", 1, 1, 9, 9);
-
-  EXPECT_THAT_ERROR(loadCoverageMapping(), Succeeded());
-
-  auto Funcs = LoadedCoverage->getCoveredFunctions();
-  unsigned NumFuncs = std::distance(Funcs.begin(), Funcs.end());
-  ASSERT_EQ(3U, NumFuncs);
-}
-
-INSTANTIATE_TEST_SUITE_P(ParameterizedCovMapTest, CoverageMappingTest,
-                         ::testing::Combine(::testing::Bool(),
-                                            ::testing::Bool()));
-
-TEST(CoverageMappingTest, filename_roundtrip) {
-  std::vector<std::string> Paths({"dir", "a", "b", "c", "d", "e"});
-
-  for (bool Compress : {false, true}) {
-    std::string EncodedFilenames;
-    {
-      raw_string_ostream OS(EncodedFilenames);
-      CoverageFilenamesSectionWriter Writer(Paths);
-      Writer.write(OS, Compress);
-    }
-
-    std::vector<std::string> ReadFilenames;
-    RawCoverageFilenamesReader Reader(EncodedFilenames, ReadFilenames);
-    EXPECT_THAT_ERROR(Reader.read(CovMapVersion::CurrentVersion), Succeeded());
-
-    ASSERT_EQ(ReadFilenames.size(), Paths.size());
-    for (unsigned I = 1; I < Paths.size(); ++I) {
-      SmallString<256> P(Paths[0]);
-      llvm::sys::path::append(P, Paths[I]);
-      ASSERT_TRUE(ReadFilenames[I] == P);
-    }
-  }
-}
-
-TEST(CoverageMappingTest, filename_compilation_dir) {
-  std::vector<std::string> Paths({"dir", "a", "b", "c", "d", "e"});
-
-  for (bool Compress : {false, true}) {
-    std::string EncodedFilenames;
-    {
-      raw_string_ostream OS(EncodedFilenames);
-      CoverageFilenamesSectionWriter Writer(Paths);
-      Writer.write(OS, Compress);
-    }
-
-    StringRef CompilationDir = "out";
-    std::vector<std::string> ReadFilenames;
-    RawCoverageFilenamesReader Reader(EncodedFilenames, ReadFilenames,
-                                      CompilationDir);
-    EXPECT_THAT_ERROR(Reader.read(CovMapVersion::CurrentVersion), Succeeded());
-
-    ASSERT_EQ(ReadFilenames.size(), Paths.size());
-    for (unsigned I = 1; I < Paths.size(); ++I) {
-      SmallString<256> P(CompilationDir);
-      llvm::sys::path::append(P, Paths[I]);
-      ASSERT_TRUE(ReadFilenames[I] == P);
-    }
-  }
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/ProfileData/InstrProfDataTest.cpp b/gnu/llvm/llvm/unittests/ProfileData/InstrProfDataTest.cpp
deleted file mode 100644
index af1a3de0657..00000000000
--- a/gnu/llvm/llvm/unittests/ProfileData/InstrProfDataTest.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-//===- unittest/ProfileData/InstProfDataTest.cpp ----------------------------=//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "gtest/gtest.h"
-
-#include <cstdint>
-
-#define INSTR_PROF_VALUE_PROF_MEMOP_API
-#include "llvm/ProfileData/InstrProfData.inc"
-
-namespace {
-
-TEST(InstrProfDataTest, MapValueToRangeRepValue) {
-  EXPECT_EQ(0ULL, InstrProfGetRangeRepValue(0));
-  EXPECT_EQ(1ULL, InstrProfGetRangeRepValue(1));
-  EXPECT_EQ(2ULL, InstrProfGetRangeRepValue(2));
-  EXPECT_EQ(3ULL, InstrProfGetRangeRepValue(3));
-  EXPECT_EQ(4ULL, InstrProfGetRangeRepValue(4));
-  EXPECT_EQ(5ULL, InstrProfGetRangeRepValue(5));
-  EXPECT_EQ(6ULL, InstrProfGetRangeRepValue(6));
-  EXPECT_EQ(7ULL, InstrProfGetRangeRepValue(7));
-  EXPECT_EQ(8ULL, InstrProfGetRangeRepValue(8));
-  EXPECT_EQ(9ULL, InstrProfGetRangeRepValue(9));
-  EXPECT_EQ(16ULL, InstrProfGetRangeRepValue(16));
-  EXPECT_EQ(17ULL, InstrProfGetRangeRepValue(30));
-  EXPECT_EQ(32ULL, InstrProfGetRangeRepValue(32));
-  EXPECT_EQ(33ULL, InstrProfGetRangeRepValue(54));
-  EXPECT_EQ(64ULL, InstrProfGetRangeRepValue(64));
-  EXPECT_EQ(65ULL, InstrProfGetRangeRepValue(127));
-  EXPECT_EQ(128ULL, InstrProfGetRangeRepValue(128));
-  EXPECT_EQ(129ULL, InstrProfGetRangeRepValue(200));
-  EXPECT_EQ(256ULL, InstrProfGetRangeRepValue(256));
-  EXPECT_EQ(257ULL, InstrProfGetRangeRepValue(397));
-  EXPECT_EQ(512ULL, InstrProfGetRangeRepValue(512));
-  EXPECT_EQ(513ULL, InstrProfGetRangeRepValue(2832048023));
-}
-
-TEST(InstrProfDataTest, IsInOneValueRange) {
-  EXPECT_EQ(true, InstrProfIsSingleValRange(0));
-  EXPECT_EQ(true, InstrProfIsSingleValRange(1));
-  EXPECT_EQ(true, InstrProfIsSingleValRange(2));
-  EXPECT_EQ(true, InstrProfIsSingleValRange(3));
-  EXPECT_EQ(true, InstrProfIsSingleValRange(4));
-  EXPECT_EQ(true, InstrProfIsSingleValRange(5));
-  EXPECT_EQ(true, InstrProfIsSingleValRange(6));
-  EXPECT_EQ(true, InstrProfIsSingleValRange(7));
-  EXPECT_EQ(true, InstrProfIsSingleValRange(8));
-  EXPECT_EQ(false, InstrProfIsSingleValRange(9));
-  EXPECT_EQ(true, InstrProfIsSingleValRange(16));
-  EXPECT_EQ(false, InstrProfIsSingleValRange(30));
-  EXPECT_EQ(true, InstrProfIsSingleValRange(32));
-  EXPECT_EQ(false, InstrProfIsSingleValRange(54));
-  EXPECT_EQ(true, InstrProfIsSingleValRange(64));
-  EXPECT_EQ(false, InstrProfIsSingleValRange(127));
-  EXPECT_EQ(true, InstrProfIsSingleValRange(128));
-  EXPECT_EQ(false, InstrProfIsSingleValRange(200));
-  EXPECT_EQ(true, InstrProfIsSingleValRange(256));
-  EXPECT_EQ(false, InstrProfIsSingleValRange(397));
-  EXPECT_EQ(true, InstrProfIsSingleValRange(512));
-  EXPECT_EQ(false, InstrProfIsSingleValRange(2832048023344));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/ProfileData/InstrProfTest.cpp b/gnu/llvm/llvm/unittests/ProfileData/InstrProfTest.cpp
deleted file mode 100644
index d7661776d75..00000000000
--- a/gnu/llvm/llvm/unittests/ProfileData/InstrProfTest.cpp
+++ /dev/null
@@ -1,1068 +0,0 @@
-//===- unittest/ProfileData/InstrProfTest.cpp -------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/IR/Function.h"
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/ProfileData/InstrProfReader.h"
-#include "llvm/ProfileData/InstrProfWriter.h"
-#include "llvm/Support/Compression.h"
-#include "llvm/Testing/Support/Error.h"
-#include "llvm/Testing/Support/SupportHelpers.h"
-#include "gtest/gtest.h"
-#include <cstdarg>
-
-using namespace llvm;
-
-LLVM_NODISCARD static ::testing::AssertionResult
-ErrorEquals(instrprof_error Expected, Error E) {
-  instrprof_error Found;
-  std::string FoundMsg;
-  handleAllErrors(std::move(E), [&](const InstrProfError &IPE) {
-    Found = IPE.get();
-    FoundMsg = IPE.message();
-  });
-  if (Expected == Found)
-    return ::testing::AssertionSuccess();
-  return ::testing::AssertionFailure() << "error: " << FoundMsg << "\n";
-}
-
-namespace {
-
-struct InstrProfTest : ::testing::Test {
-  InstrProfWriter Writer;
-  std::unique_ptr<IndexedInstrProfReader> Reader;
-
-  void SetUp() override { Writer.setOutputSparse(false); }
-
-  void readProfile(std::unique_ptr<MemoryBuffer> Profile,
-                   std::unique_ptr<MemoryBuffer> Remapping = nullptr) {
-    auto ReaderOrErr = IndexedInstrProfReader::create(std::move(Profile),
-                                                      std::move(Remapping));
-    EXPECT_THAT_ERROR(ReaderOrErr.takeError(), Succeeded());
-    Reader = std::move(ReaderOrErr.get());
-  }
-};
-
-struct SparseInstrProfTest : public InstrProfTest {
-  void SetUp() override { Writer.setOutputSparse(true); }
-};
-
-struct MaybeSparseInstrProfTest : public InstrProfTest,
-                                  public ::testing::WithParamInterface<bool> {
-  void SetUp() override { Writer.setOutputSparse(GetParam()); }
-};
-
-TEST_P(MaybeSparseInstrProfTest, write_and_read_empty_profile) {
-  auto Profile = Writer.writeBuffer();
-  readProfile(std::move(Profile));
-  ASSERT_TRUE(Reader->begin() == Reader->end());
-}
-
-static const auto Err = [](Error E) {
-  consumeError(std::move(E));
-  FAIL();
-};
-
-TEST_P(MaybeSparseInstrProfTest, write_and_read_one_function) {
-  Writer.addRecord({"foo", 0x1234, {1, 2, 3, 4}}, Err);
-  auto Profile = Writer.writeBuffer();
-  readProfile(std::move(Profile));
-
-  auto I = Reader->begin(), E = Reader->end();
-  ASSERT_TRUE(I != E);
-  ASSERT_EQ(StringRef("foo"), I->Name);
-  ASSERT_EQ(0x1234U, I->Hash);
-  ASSERT_EQ(4U, I->Counts.size());
-  ASSERT_EQ(1U, I->Counts[0]);
-  ASSERT_EQ(2U, I->Counts[1]);
-  ASSERT_EQ(3U, I->Counts[2]);
-  ASSERT_EQ(4U, I->Counts[3]);
-  ASSERT_TRUE(++I == E);
-}
-
-TEST_P(MaybeSparseInstrProfTest, get_instr_prof_record) {
-  Writer.addRecord({"foo", 0x1234, {1, 2}}, Err);
-  Writer.addRecord({"foo", 0x1235, {3, 4}}, Err);
-  auto Profile = Writer.writeBuffer();
-  readProfile(std::move(Profile));
-
-  Expected<InstrProfRecord> R = Reader->getInstrProfRecord("foo", 0x1234);
-  EXPECT_THAT_ERROR(R.takeError(), Succeeded());
-  ASSERT_EQ(2U, R->Counts.size());
-  ASSERT_EQ(1U, R->Counts[0]);
-  ASSERT_EQ(2U, R->Counts[1]);
-
-  R = Reader->getInstrProfRecord("foo", 0x1235);
-  EXPECT_THAT_ERROR(R.takeError(), Succeeded());
-  ASSERT_EQ(2U, R->Counts.size());
-  ASSERT_EQ(3U, R->Counts[0]);
-  ASSERT_EQ(4U, R->Counts[1]);
-
-  R = Reader->getInstrProfRecord("foo", 0x5678);
-  ASSERT_TRUE(ErrorEquals(instrprof_error::hash_mismatch, R.takeError()));
-
-  R = Reader->getInstrProfRecord("bar", 0x1234);
-  ASSERT_TRUE(ErrorEquals(instrprof_error::unknown_function, R.takeError()));
-}
-
-TEST_P(MaybeSparseInstrProfTest, get_function_counts) {
-  Writer.addRecord({"foo", 0x1234, {1, 2}}, Err);
-  Writer.addRecord({"foo", 0x1235, {3, 4}}, Err);
-  auto Profile = Writer.writeBuffer();
-  readProfile(std::move(Profile));
-
-  std::vector<uint64_t> Counts;
-  EXPECT_THAT_ERROR(Reader->getFunctionCounts("foo", 0x1234, Counts),
-                    Succeeded());
-  ASSERT_EQ(2U, Counts.size());
-  ASSERT_EQ(1U, Counts[0]);
-  ASSERT_EQ(2U, Counts[1]);
-
-  EXPECT_THAT_ERROR(Reader->getFunctionCounts("foo", 0x1235, Counts),
-                    Succeeded());
-  ASSERT_EQ(2U, Counts.size());
-  ASSERT_EQ(3U, Counts[0]);
-  ASSERT_EQ(4U, Counts[1]);
-
-  Error E1 = Reader->getFunctionCounts("foo", 0x5678, Counts);
-  ASSERT_TRUE(ErrorEquals(instrprof_error::hash_mismatch, std::move(E1)));
-
-  Error E2 = Reader->getFunctionCounts("bar", 0x1234, Counts);
-  ASSERT_TRUE(ErrorEquals(instrprof_error::unknown_function, std::move(E2)));
-}
-
-// Profile data is copied from general.proftext
-TEST_F(InstrProfTest, get_profile_summary) {
-  Writer.addRecord({"func1", 0x1234, {97531}}, Err);
-  Writer.addRecord({"func2", 0x1234, {0, 0}}, Err);
-  Writer.addRecord(
-      {"func3",
-       0x1234,
-       {2305843009213693952, 1152921504606846976, 576460752303423488,
-        288230376151711744, 144115188075855872, 72057594037927936}},
-      Err);
-  Writer.addRecord({"func4", 0x1234, {0}}, Err);
-  auto Profile = Writer.writeBuffer();
-  readProfile(std::move(Profile));
-
-  auto VerifySummary = [](ProfileSummary &IPS) mutable {
-    ASSERT_EQ(ProfileSummary::PSK_Instr, IPS.getKind());
-    ASSERT_EQ(2305843009213693952U, IPS.getMaxFunctionCount());
-    ASSERT_EQ(2305843009213693952U, IPS.getMaxCount());
-    ASSERT_EQ(10U, IPS.getNumCounts());
-    ASSERT_EQ(4539628424389557499U, IPS.getTotalCount());
-    std::vector<ProfileSummaryEntry> &Details = IPS.getDetailedSummary();
-    uint32_t Cutoff = 800000;
-    auto Predicate = [&Cutoff](const ProfileSummaryEntry &PE) {
-      return PE.Cutoff == Cutoff;
-    };
-    auto EightyPerc = find_if(Details, Predicate);
-    Cutoff = 900000;
-    auto NinetyPerc = find_if(Details, Predicate);
-    Cutoff = 950000;
-    auto NinetyFivePerc = find_if(Details, Predicate);
-    Cutoff = 990000;
-    auto NinetyNinePerc = find_if(Details, Predicate);
-    ASSERT_EQ(576460752303423488U, EightyPerc->MinCount);
-    ASSERT_EQ(288230376151711744U, NinetyPerc->MinCount);
-    ASSERT_EQ(288230376151711744U, NinetyFivePerc->MinCount);
-    ASSERT_EQ(72057594037927936U, NinetyNinePerc->MinCount);
-  };
-  ProfileSummary &PS = Reader->getSummary(/* IsCS */ false);
-  VerifySummary(PS);
-
-  // Test that conversion of summary to and from Metadata works.
-  LLVMContext Context;
-  Metadata *MD = PS.getMD(Context);
-  ASSERT_TRUE(MD);
-  ProfileSummary *PSFromMD = ProfileSummary::getFromMD(MD);
-  ASSERT_TRUE(PSFromMD);
-  VerifySummary(*PSFromMD);
-  delete PSFromMD;
-
-  // Test that summary can be attached to and read back from module.
-  Module M("my_module", Context);
-  M.setProfileSummary(MD, ProfileSummary::PSK_Instr);
-  MD = M.getProfileSummary(/* IsCS */ false);
-  ASSERT_TRUE(MD);
-  PSFromMD = ProfileSummary::getFromMD(MD);
-  ASSERT_TRUE(PSFromMD);
-  VerifySummary(*PSFromMD);
-  delete PSFromMD;
-}
-
-TEST_F(InstrProfTest, test_writer_merge) {
-  Writer.addRecord({"func1", 0x1234, {42}}, Err);
-
-  InstrProfWriter Writer2;
-  Writer2.addRecord({"func2", 0x1234, {0, 0}}, Err);
-
-  Writer.mergeRecordsFromWriter(std::move(Writer2), Err);
-
-  auto Profile = Writer.writeBuffer();
-  readProfile(std::move(Profile));
-
-  Expected<InstrProfRecord> R = Reader->getInstrProfRecord("func1", 0x1234);
-  EXPECT_THAT_ERROR(R.takeError(), Succeeded());
-  ASSERT_EQ(1U, R->Counts.size());
-  ASSERT_EQ(42U, R->Counts[0]);
-
-  R = Reader->getInstrProfRecord("func2", 0x1234);
-  EXPECT_THAT_ERROR(R.takeError(), Succeeded());
-  ASSERT_EQ(2U, R->Counts.size());
-  ASSERT_EQ(0U, R->Counts[0]);
-  ASSERT_EQ(0U, R->Counts[1]);
-}
-
-static const char callee1[] = "callee1";
-static const char callee2[] = "callee2";
-static const char callee3[] = "callee3";
-static const char callee4[] = "callee4";
-static const char callee5[] = "callee5";
-static const char callee6[] = "callee6";
-
-TEST_P(MaybeSparseInstrProfTest, get_icall_data_read_write) {
-  NamedInstrProfRecord Record1("caller", 0x1234, {1, 2});
-
-  // 4 value sites.
-  Record1.reserveSites(IPVK_IndirectCallTarget, 4);
-  InstrProfValueData VD0[] = {
-      {(uint64_t)callee1, 1}, {(uint64_t)callee2, 2}, {(uint64_t)callee3, 3}};
-  Record1.addValueData(IPVK_IndirectCallTarget, 0, VD0, 3, nullptr);
-  // No value profile data at the second site.
-  Record1.addValueData(IPVK_IndirectCallTarget, 1, nullptr, 0, nullptr);
-  InstrProfValueData VD2[] = {{(uint64_t)callee1, 1}, {(uint64_t)callee2, 2}};
-  Record1.addValueData(IPVK_IndirectCallTarget, 2, VD2, 2, nullptr);
-  InstrProfValueData VD3[] = {{(uint64_t)callee1, 1}};
-  Record1.addValueData(IPVK_IndirectCallTarget, 3, VD3, 1, nullptr);
-
-  Writer.addRecord(std::move(Record1), Err);
-  Writer.addRecord({"callee1", 0x1235, {3, 4}}, Err);
-  Writer.addRecord({"callee2", 0x1235, {3, 4}}, Err);
-  Writer.addRecord({"callee3", 0x1235, {3, 4}}, Err);
-  auto Profile = Writer.writeBuffer();
-  readProfile(std::move(Profile));
-
-  Expected<InstrProfRecord> R = Reader->getInstrProfRecord("caller", 0x1234);
-  EXPECT_THAT_ERROR(R.takeError(), Succeeded());
-  ASSERT_EQ(4U, R->getNumValueSites(IPVK_IndirectCallTarget));
-  ASSERT_EQ(3U, R->getNumValueDataForSite(IPVK_IndirectCallTarget, 0));
-  ASSERT_EQ(0U, R->getNumValueDataForSite(IPVK_IndirectCallTarget, 1));
-  ASSERT_EQ(2U, R->getNumValueDataForSite(IPVK_IndirectCallTarget, 2));
-  ASSERT_EQ(1U, R->getNumValueDataForSite(IPVK_IndirectCallTarget, 3));
-
-  uint64_t TotalC;
-  std::unique_ptr<InstrProfValueData[]> VD =
-      R->getValueForSite(IPVK_IndirectCallTarget, 0, &TotalC);
-
-  ASSERT_EQ(3U, VD[0].Count);
-  ASSERT_EQ(2U, VD[1].Count);
-  ASSERT_EQ(1U, VD[2].Count);
-  ASSERT_EQ(6U, TotalC);
-
-  ASSERT_EQ(StringRef((const char *)VD[0].Value, 7), StringRef("callee3"));
-  ASSERT_EQ(StringRef((const char *)VD[1].Value, 7), StringRef("callee2"));
-  ASSERT_EQ(StringRef((const char *)VD[2].Value, 7), StringRef("callee1"));
-}
-
-TEST_P(MaybeSparseInstrProfTest, annotate_vp_data) {
-  NamedInstrProfRecord Record("caller", 0x1234, {1, 2});
-  Record.reserveSites(IPVK_IndirectCallTarget, 1);
-  InstrProfValueData VD0[] = {{1000, 1}, {2000, 2}, {3000, 3}, {5000, 5},
-                              {4000, 4}, {6000, 6}};
-  Record.addValueData(IPVK_IndirectCallTarget, 0, VD0, 6, nullptr);
-  Writer.addRecord(std::move(Record), Err);
-  auto Profile = Writer.writeBuffer();
-  readProfile(std::move(Profile));
-  Expected<InstrProfRecord> R = Reader->getInstrProfRecord("caller", 0x1234);
-  EXPECT_THAT_ERROR(R.takeError(), Succeeded());
-
-  LLVMContext Ctx;
-  std::unique_ptr<Module> M(new Module("MyModule", Ctx));
-  FunctionType *FTy = FunctionType::get(Type::getVoidTy(Ctx),
-                                        /*isVarArg=*/false);
-  Function *F =
-      Function::Create(FTy, Function::ExternalLinkage, "caller", M.get());
-  BasicBlock *BB = BasicBlock::Create(Ctx, "", F);
-
-  IRBuilder<> Builder(BB);
-  BasicBlock *TBB = BasicBlock::Create(Ctx, "", F);
-  BasicBlock *FBB = BasicBlock::Create(Ctx, "", F);
-
-  // Use branch instruction to annotate with value profile data for simplicity
-  Instruction *Inst = Builder.CreateCondBr(Builder.getTrue(), TBB, FBB);
-  Instruction *Inst2 = Builder.CreateCondBr(Builder.getTrue(), TBB, FBB);
-  annotateValueSite(*M, *Inst, R.get(), IPVK_IndirectCallTarget, 0);
-
-  InstrProfValueData ValueData[5];
-  uint32_t N;
-  uint64_t T;
-  bool Res = getValueProfDataFromInst(*Inst, IPVK_IndirectCallTarget, 5,
-                                      ValueData, N, T);
-  ASSERT_TRUE(Res);
-  ASSERT_EQ(3U, N);
-  ASSERT_EQ(21U, T);
-  // The result should be sorted already:
-  ASSERT_EQ(6000U, ValueData[0].Value);
-  ASSERT_EQ(6U, ValueData[0].Count);
-  ASSERT_EQ(5000U, ValueData[1].Value);
-  ASSERT_EQ(5U, ValueData[1].Count);
-  ASSERT_EQ(4000U, ValueData[2].Value);
-  ASSERT_EQ(4U, ValueData[2].Count);
-  Res = getValueProfDataFromInst(*Inst, IPVK_IndirectCallTarget, 1, ValueData,
-                                 N, T);
-  ASSERT_TRUE(Res);
-  ASSERT_EQ(1U, N);
-  ASSERT_EQ(21U, T);
-
-  Res = getValueProfDataFromInst(*Inst2, IPVK_IndirectCallTarget, 5, ValueData,
-                                 N, T);
-  ASSERT_FALSE(Res);
-
-  // Remove the MD_prof metadata 
-  Inst->setMetadata(LLVMContext::MD_prof, 0);
-  // Annotate 5 records this time.
-  annotateValueSite(*M, *Inst, R.get(), IPVK_IndirectCallTarget, 0, 5);
-  Res = getValueProfDataFromInst(*Inst, IPVK_IndirectCallTarget, 5,
-                                      ValueData, N, T);
-  ASSERT_TRUE(Res);
-  ASSERT_EQ(5U, N);
-  ASSERT_EQ(21U, T);
-  ASSERT_EQ(6000U, ValueData[0].Value);
-  ASSERT_EQ(6U, ValueData[0].Count);
-  ASSERT_EQ(5000U, ValueData[1].Value);
-  ASSERT_EQ(5U, ValueData[1].Count);
-  ASSERT_EQ(4000U, ValueData[2].Value);
-  ASSERT_EQ(4U, ValueData[2].Count);
-  ASSERT_EQ(3000U, ValueData[3].Value);
-  ASSERT_EQ(3U, ValueData[3].Count);
-  ASSERT_EQ(2000U, ValueData[4].Value);
-  ASSERT_EQ(2U, ValueData[4].Count);
-
-  // Remove the MD_prof metadata 
-  Inst->setMetadata(LLVMContext::MD_prof, 0);
-  // Annotate with 4 records.
-  InstrProfValueData VD0Sorted[] = {{1000, 6}, {2000, 5}, {3000, 4}, {4000, 3},
-                              {5000, 2}, {6000, 1}};
-  annotateValueSite(*M, *Inst, makeArrayRef(VD0Sorted).slice(2), 10,
-                    IPVK_IndirectCallTarget, 5);
-  Res = getValueProfDataFromInst(*Inst, IPVK_IndirectCallTarget, 5,
-                                      ValueData, N, T);
-  ASSERT_TRUE(Res);
-  ASSERT_EQ(4U, N);
-  ASSERT_EQ(10U, T);
-  ASSERT_EQ(3000U, ValueData[0].Value);
-  ASSERT_EQ(4U, ValueData[0].Count);
-  ASSERT_EQ(4000U, ValueData[1].Value);
-  ASSERT_EQ(3U, ValueData[1].Count);
-  ASSERT_EQ(5000U, ValueData[2].Value);
-  ASSERT_EQ(2U, ValueData[2].Count);
-  ASSERT_EQ(6000U, ValueData[3].Value);
-  ASSERT_EQ(1U, ValueData[3].Count);
-}
-
-TEST_P(MaybeSparseInstrProfTest, get_icall_data_read_write_with_weight) {
-  NamedInstrProfRecord Record1("caller", 0x1234, {1, 2});
-
-  // 4 value sites.
-  Record1.reserveSites(IPVK_IndirectCallTarget, 4);
-  InstrProfValueData VD0[] = {
-      {(uint64_t)callee1, 1}, {(uint64_t)callee2, 2}, {(uint64_t)callee3, 3}};
-  Record1.addValueData(IPVK_IndirectCallTarget, 0, VD0, 3, nullptr);
-  // No value profile data at the second site.
-  Record1.addValueData(IPVK_IndirectCallTarget, 1, nullptr, 0, nullptr);
-  InstrProfValueData VD2[] = {{(uint64_t)callee1, 1}, {(uint64_t)callee2, 2}};
-  Record1.addValueData(IPVK_IndirectCallTarget, 2, VD2, 2, nullptr);
-  InstrProfValueData VD3[] = {{(uint64_t)callee1, 1}};
-  Record1.addValueData(IPVK_IndirectCallTarget, 3, VD3, 1, nullptr);
-
-  Writer.addRecord(std::move(Record1), 10, Err);
-  Writer.addRecord({"callee1", 0x1235, {3, 4}}, Err);
-  Writer.addRecord({"callee2", 0x1235, {3, 4}}, Err);
-  Writer.addRecord({"callee3", 0x1235, {3, 4}}, Err);
-  auto Profile = Writer.writeBuffer();
-  readProfile(std::move(Profile));
-
-  Expected<InstrProfRecord> R = Reader->getInstrProfRecord("caller", 0x1234);
-  EXPECT_THAT_ERROR(R.takeError(), Succeeded());
-  ASSERT_EQ(4U, R->getNumValueSites(IPVK_IndirectCallTarget));
-  ASSERT_EQ(3U, R->getNumValueDataForSite(IPVK_IndirectCallTarget, 0));
-  ASSERT_EQ(0U, R->getNumValueDataForSite(IPVK_IndirectCallTarget, 1));
-  ASSERT_EQ(2U, R->getNumValueDataForSite(IPVK_IndirectCallTarget, 2));
-  ASSERT_EQ(1U, R->getNumValueDataForSite(IPVK_IndirectCallTarget, 3));
-
-  uint64_t TotalC;
-  std::unique_ptr<InstrProfValueData[]> VD =
-      R->getValueForSite(IPVK_IndirectCallTarget, 0, &TotalC);
-  ASSERT_EQ(30U, VD[0].Count);
-  ASSERT_EQ(20U, VD[1].Count);
-  ASSERT_EQ(10U, VD[2].Count);
-  ASSERT_EQ(60U, TotalC);
-
-  ASSERT_EQ(StringRef((const char *)VD[0].Value, 7), StringRef("callee3"));
-  ASSERT_EQ(StringRef((const char *)VD[1].Value, 7), StringRef("callee2"));
-  ASSERT_EQ(StringRef((const char *)VD[2].Value, 7), StringRef("callee1"));
-}
-
-TEST_P(MaybeSparseInstrProfTest, get_icall_data_read_write_big_endian) {
-  NamedInstrProfRecord Record1("caller", 0x1234, {1, 2});
-
-  // 4 value sites.
-  Record1.reserveSites(IPVK_IndirectCallTarget, 4);
-  InstrProfValueData VD0[] = {
-      {(uint64_t)callee1, 1}, {(uint64_t)callee2, 2}, {(uint64_t)callee3, 3}};
-  Record1.addValueData(IPVK_IndirectCallTarget, 0, VD0, 3, nullptr);
-  // No value profile data at the second site.
-  Record1.addValueData(IPVK_IndirectCallTarget, 1, nullptr, 0, nullptr);
-  InstrProfValueData VD2[] = {{(uint64_t)callee1, 1}, {(uint64_t)callee2, 2}};
-  Record1.addValueData(IPVK_IndirectCallTarget, 2, VD2, 2, nullptr);
-  InstrProfValueData VD3[] = {{(uint64_t)callee1, 1}};
-  Record1.addValueData(IPVK_IndirectCallTarget, 3, VD3, 1, nullptr);
-
-  Writer.addRecord(std::move(Record1), Err);
-  Writer.addRecord({"callee1", 0x1235, {3, 4}}, Err);
-  Writer.addRecord({"callee2", 0x1235, {3, 4}}, Err);
-  Writer.addRecord({"callee3", 0x1235, {3, 4}}, Err);
-
-  // Set big endian output.
-  Writer.setValueProfDataEndianness(support::big);
-
-  auto Profile = Writer.writeBuffer();
-  readProfile(std::move(Profile));
-
-  // Set big endian input.
-  Reader->setValueProfDataEndianness(support::big);
-
-  Expected<InstrProfRecord> R = Reader->getInstrProfRecord("caller", 0x1234);
-  EXPECT_THAT_ERROR(R.takeError(), Succeeded());
-  ASSERT_EQ(4U, R->getNumValueSites(IPVK_IndirectCallTarget));
-  ASSERT_EQ(3U, R->getNumValueDataForSite(IPVK_IndirectCallTarget, 0));
-  ASSERT_EQ(0U, R->getNumValueDataForSite(IPVK_IndirectCallTarget, 1));
-  ASSERT_EQ(2U, R->getNumValueDataForSite(IPVK_IndirectCallTarget, 2));
-  ASSERT_EQ(1U, R->getNumValueDataForSite(IPVK_IndirectCallTarget, 3));
-
-  std::unique_ptr<InstrProfValueData[]> VD =
-      R->getValueForSite(IPVK_IndirectCallTarget, 0);
-  ASSERT_EQ(StringRef((const char *)VD[0].Value, 7), StringRef("callee3"));
-  ASSERT_EQ(StringRef((const char *)VD[1].Value, 7), StringRef("callee2"));
-  ASSERT_EQ(StringRef((const char *)VD[2].Value, 7), StringRef("callee1"));
-
-  // Restore little endian default:
-  Writer.setValueProfDataEndianness(support::little);
-}
-
-TEST_P(MaybeSparseInstrProfTest, get_icall_data_merge1) {
-  static const char caller[] = "caller";
-  NamedInstrProfRecord Record11(caller, 0x1234, {1, 2});
-  NamedInstrProfRecord Record12(caller, 0x1234, {1, 2});
-
-  // 5 value sites.
-  Record11.reserveSites(IPVK_IndirectCallTarget, 5);
-  InstrProfValueData VD0[] = {{uint64_t(callee1), 1},
-                              {uint64_t(callee2), 2},
-                              {uint64_t(callee3), 3},
-                              {uint64_t(callee4), 4}};
-  Record11.addValueData(IPVK_IndirectCallTarget, 0, VD0, 4, nullptr);
-
-  // No value profile data at the second site.
-  Record11.addValueData(IPVK_IndirectCallTarget, 1, nullptr, 0, nullptr);
-
-  InstrProfValueData VD2[] = {
-      {uint64_t(callee1), 1}, {uint64_t(callee2), 2}, {uint64_t(callee3), 3}};
-  Record11.addValueData(IPVK_IndirectCallTarget, 2, VD2, 3, nullptr);
-
-  InstrProfValueData VD3[] = {{uint64_t(callee1), 1}};
-  Record11.addValueData(IPVK_IndirectCallTarget, 3, VD3, 1, nullptr);
-
-  InstrProfValueData VD4[] = {{uint64_t(callee1), 1},
-                              {uint64_t(callee2), 2},
-                              {uint64_t(callee3), 3}};
-  Record11.addValueData(IPVK_IndirectCallTarget, 4, VD4, 3, nullptr);
-
-  // A different record for the same caller.
-  Record12.reserveSites(IPVK_IndirectCallTarget, 5);
-  InstrProfValueData VD02[] = {{uint64_t(callee2), 5}, {uint64_t(callee3), 3}};
-  Record12.addValueData(IPVK_IndirectCallTarget, 0, VD02, 2, nullptr);
-
-  // No value profile data at the second site.
-  Record12.addValueData(IPVK_IndirectCallTarget, 1, nullptr, 0, nullptr);
-
-  InstrProfValueData VD22[] = {
-      {uint64_t(callee2), 1}, {uint64_t(callee3), 3}, {uint64_t(callee4), 4}};
-  Record12.addValueData(IPVK_IndirectCallTarget, 2, VD22, 3, nullptr);
-
-  Record12.addValueData(IPVK_IndirectCallTarget, 3, nullptr, 0, nullptr);
-
-  InstrProfValueData VD42[] = {{uint64_t(callee1), 1},
-                               {uint64_t(callee2), 2},
-                               {uint64_t(callee3), 3}};
-  Record12.addValueData(IPVK_IndirectCallTarget, 4, VD42, 3, nullptr);
-
-  Writer.addRecord(std::move(Record11), Err);
-  // Merge profile data.
-  Writer.addRecord(std::move(Record12), Err);
-
-  Writer.addRecord({callee1, 0x1235, {3, 4}}, Err);
-  Writer.addRecord({callee2, 0x1235, {3, 4}}, Err);
-  Writer.addRecord({callee3, 0x1235, {3, 4}}, Err);
-  Writer.addRecord({callee3, 0x1235, {3, 4}}, Err);
-  Writer.addRecord({callee4, 0x1235, {3, 5}}, Err);
-  auto Profile = Writer.writeBuffer();
-  readProfile(std::move(Profile));
-
-  Expected<InstrProfRecord> R = Reader->getInstrProfRecord("caller", 0x1234);
-  EXPECT_THAT_ERROR(R.takeError(), Succeeded());
-  ASSERT_EQ(5U, R->getNumValueSites(IPVK_IndirectCallTarget));
-  ASSERT_EQ(4U, R->getNumValueDataForSite(IPVK_IndirectCallTarget, 0));
-  ASSERT_EQ(0U, R->getNumValueDataForSite(IPVK_IndirectCallTarget, 1));
-  ASSERT_EQ(4U, R->getNumValueDataForSite(IPVK_IndirectCallTarget, 2));
-  ASSERT_EQ(1U, R->getNumValueDataForSite(IPVK_IndirectCallTarget, 3));
-  ASSERT_EQ(3U, R->getNumValueDataForSite(IPVK_IndirectCallTarget, 4));
-
-  std::unique_ptr<InstrProfValueData[]> VD =
-      R->getValueForSite(IPVK_IndirectCallTarget, 0);
-  ASSERT_EQ(StringRef((const char *)VD[0].Value, 7), StringRef("callee2"));
-  ASSERT_EQ(7U, VD[0].Count);
-  ASSERT_EQ(StringRef((const char *)VD[1].Value, 7), StringRef("callee3"));
-  ASSERT_EQ(6U, VD[1].Count);
-  ASSERT_EQ(StringRef((const char *)VD[2].Value, 7), StringRef("callee4"));
-  ASSERT_EQ(4U, VD[2].Count);
-  ASSERT_EQ(StringRef((const char *)VD[3].Value, 7), StringRef("callee1"));
-  ASSERT_EQ(1U, VD[3].Count);
-
-  std::unique_ptr<InstrProfValueData[]> VD_2(
-      R->getValueForSite(IPVK_IndirectCallTarget, 2));
-  ASSERT_EQ(StringRef((const char *)VD_2[0].Value, 7), StringRef("callee3"));
-  ASSERT_EQ(6U, VD_2[0].Count);
-  ASSERT_EQ(StringRef((const char *)VD_2[1].Value, 7), StringRef("callee4"));
-  ASSERT_EQ(4U, VD_2[1].Count);
-  ASSERT_EQ(StringRef((const char *)VD_2[2].Value, 7), StringRef("callee2"));
-  ASSERT_EQ(3U, VD_2[2].Count);
-  ASSERT_EQ(StringRef((const char *)VD_2[3].Value, 7), StringRef("callee1"));
-  ASSERT_EQ(1U, VD_2[3].Count);
-
-  std::unique_ptr<InstrProfValueData[]> VD_3(
-      R->getValueForSite(IPVK_IndirectCallTarget, 3));
-  ASSERT_EQ(StringRef((const char *)VD_3[0].Value, 7), StringRef("callee1"));
-  ASSERT_EQ(1U, VD_3[0].Count);
-
-  std::unique_ptr<InstrProfValueData[]> VD_4(
-      R->getValueForSite(IPVK_IndirectCallTarget, 4));
-  ASSERT_EQ(StringRef((const char *)VD_4[0].Value, 7), StringRef("callee3"));
-  ASSERT_EQ(6U, VD_4[0].Count);
-  ASSERT_EQ(StringRef((const char *)VD_4[1].Value, 7), StringRef("callee2"));
-  ASSERT_EQ(4U, VD_4[1].Count);
-  ASSERT_EQ(StringRef((const char *)VD_4[2].Value, 7), StringRef("callee1"));
-  ASSERT_EQ(2U, VD_4[2].Count);
-}
-
-TEST_P(MaybeSparseInstrProfTest, get_icall_data_merge1_saturation) {
-  static const char bar[] = "bar";
-
-  const uint64_t Max = std::numeric_limits<uint64_t>::max();
-
-  instrprof_error Result;
-  auto Err = [&](Error E) { Result = InstrProfError::take(std::move(E)); };
-  Result = instrprof_error::success;
-  Writer.addRecord({"foo", 0x1234, {1}}, Err);
-  ASSERT_EQ(Result, instrprof_error::success);
-
-  // Verify counter overflow.
-  Result = instrprof_error::success;
-  Writer.addRecord({"foo", 0x1234, {Max}}, Err);
-  ASSERT_EQ(Result, instrprof_error::counter_overflow);
-
-  Result = instrprof_error::success;
-  Writer.addRecord({bar, 0x9012, {8}}, Err);
-  ASSERT_EQ(Result, instrprof_error::success);
-
-  NamedInstrProfRecord Record4("baz", 0x5678, {3, 4});
-  Record4.reserveSites(IPVK_IndirectCallTarget, 1);
-  InstrProfValueData VD4[] = {{uint64_t(bar), 1}};
-  Record4.addValueData(IPVK_IndirectCallTarget, 0, VD4, 1, nullptr);
-  Result = instrprof_error::success;
-  Writer.addRecord(std::move(Record4), Err);
-  ASSERT_EQ(Result, instrprof_error::success);
-
-  // Verify value data counter overflow.
-  NamedInstrProfRecord Record5("baz", 0x5678, {5, 6});
-  Record5.reserveSites(IPVK_IndirectCallTarget, 1);
-  InstrProfValueData VD5[] = {{uint64_t(bar), Max}};
-  Record5.addValueData(IPVK_IndirectCallTarget, 0, VD5, 1, nullptr);
-  Result = instrprof_error::success;
-  Writer.addRecord(std::move(Record5), Err);
-  ASSERT_EQ(Result, instrprof_error::counter_overflow);
-
-  auto Profile = Writer.writeBuffer();
-  readProfile(std::move(Profile));
-
-  // Verify saturation of counts.
-  Expected<InstrProfRecord> ReadRecord1 =
-      Reader->getInstrProfRecord("foo", 0x1234);
-  EXPECT_THAT_ERROR(ReadRecord1.takeError(), Succeeded());
-  ASSERT_EQ(Max, ReadRecord1->Counts[0]);
-
-  Expected<InstrProfRecord> ReadRecord2 =
-      Reader->getInstrProfRecord("baz", 0x5678);
-  ASSERT_TRUE(bool(ReadRecord2));
-  ASSERT_EQ(1U, ReadRecord2->getNumValueSites(IPVK_IndirectCallTarget));
-  std::unique_ptr<InstrProfValueData[]> VD =
-      ReadRecord2->getValueForSite(IPVK_IndirectCallTarget, 0);
-  ASSERT_EQ(StringRef("bar"), StringRef((const char *)VD[0].Value, 3));
-  ASSERT_EQ(Max, VD[0].Count);
-}
-
-// This test tests that when there are too many values
-// for a given site, the merged results are properly
-// truncated.
-TEST_P(MaybeSparseInstrProfTest, get_icall_data_merge_site_trunc) {
-  static const char caller[] = "caller";
-
-  NamedInstrProfRecord Record11(caller, 0x1234, {1, 2});
-  NamedInstrProfRecord Record12(caller, 0x1234, {1, 2});
-
-  // 2 value sites.
-  Record11.reserveSites(IPVK_IndirectCallTarget, 2);
-  InstrProfValueData VD0[255];
-  for (int I = 0; I < 255; I++) {
-    VD0[I].Value = 2 * I;
-    VD0[I].Count = 2 * I + 1000;
-  }
-
-  Record11.addValueData(IPVK_IndirectCallTarget, 0, VD0, 255, nullptr);
-  Record11.addValueData(IPVK_IndirectCallTarget, 1, nullptr, 0, nullptr);
-
-  Record12.reserveSites(IPVK_IndirectCallTarget, 2);
-  InstrProfValueData VD1[255];
-  for (int I = 0; I < 255; I++) {
-    VD1[I].Value = 2 * I + 1;
-    VD1[I].Count = 2 * I + 1001;
-  }
-
-  Record12.addValueData(IPVK_IndirectCallTarget, 0, VD1, 255, nullptr);
-  Record12.addValueData(IPVK_IndirectCallTarget, 1, nullptr, 0, nullptr);
-
-  Writer.addRecord(std::move(Record11), Err);
-  // Merge profile data.
-  Writer.addRecord(std::move(Record12), Err);
-
-  auto Profile = Writer.writeBuffer();
-  readProfile(std::move(Profile));
-
-  Expected<InstrProfRecord> R = Reader->getInstrProfRecord("caller", 0x1234);
-  EXPECT_THAT_ERROR(R.takeError(), Succeeded());
-  std::unique_ptr<InstrProfValueData[]> VD(
-      R->getValueForSite(IPVK_IndirectCallTarget, 0));
-  ASSERT_EQ(2U, R->getNumValueSites(IPVK_IndirectCallTarget));
-  ASSERT_EQ(255U, R->getNumValueDataForSite(IPVK_IndirectCallTarget, 0));
-  for (unsigned I = 0; I < 255; I++) {
-    ASSERT_EQ(VD[I].Value, 509 - I);
-    ASSERT_EQ(VD[I].Count, 1509 - I);
-  }
-}
-
-static void addValueProfData(InstrProfRecord &Record) {
-  Record.reserveSites(IPVK_IndirectCallTarget, 5);
-  InstrProfValueData VD0[] = {{uint64_t(callee1), 400},
-                              {uint64_t(callee2), 1000},
-                              {uint64_t(callee3), 500},
-                              {uint64_t(callee4), 300},
-                              {uint64_t(callee5), 100}};
-  Record.addValueData(IPVK_IndirectCallTarget, 0, VD0, 5, nullptr);
-  InstrProfValueData VD1[] = {{uint64_t(callee5), 800},
-                              {uint64_t(callee3), 1000},
-                              {uint64_t(callee2), 2500},
-                              {uint64_t(callee1), 1300}};
-  Record.addValueData(IPVK_IndirectCallTarget, 1, VD1, 4, nullptr);
-  InstrProfValueData VD2[] = {{uint64_t(callee6), 800},
-                              {uint64_t(callee3), 1000},
-                              {uint64_t(callee4), 5500}};
-  Record.addValueData(IPVK_IndirectCallTarget, 2, VD2, 3, nullptr);
-  InstrProfValueData VD3[] = {{uint64_t(callee2), 1800},
-                              {uint64_t(callee3), 2000}};
-  Record.addValueData(IPVK_IndirectCallTarget, 3, VD3, 2, nullptr);
-  Record.addValueData(IPVK_IndirectCallTarget, 4, nullptr, 0, nullptr);
-}
-
-TEST_P(MaybeSparseInstrProfTest, value_prof_data_read_write) {
-  InstrProfRecord SrcRecord({1ULL << 31, 2});
-  addValueProfData(SrcRecord);
-  std::unique_ptr<ValueProfData> VPData =
-      ValueProfData::serializeFrom(SrcRecord);
-
-  InstrProfRecord Record({1ULL << 31, 2});
-  VPData->deserializeTo(Record, nullptr);
-
-  // Now read data from Record and sanity check the data
-  ASSERT_EQ(5U, Record.getNumValueSites(IPVK_IndirectCallTarget));
-  ASSERT_EQ(5U, Record.getNumValueDataForSite(IPVK_IndirectCallTarget, 0));
-  ASSERT_EQ(4U, Record.getNumValueDataForSite(IPVK_IndirectCallTarget, 1));
-  ASSERT_EQ(3U, Record.getNumValueDataForSite(IPVK_IndirectCallTarget, 2));
-  ASSERT_EQ(2U, Record.getNumValueDataForSite(IPVK_IndirectCallTarget, 3));
-  ASSERT_EQ(0U, Record.getNumValueDataForSite(IPVK_IndirectCallTarget, 4));
-
-  auto Cmp = [](const InstrProfValueData &VD1, const InstrProfValueData &VD2) {
-    return VD1.Count > VD2.Count;
-  };
-  std::unique_ptr<InstrProfValueData[]> VD_0(
-      Record.getValueForSite(IPVK_IndirectCallTarget, 0));
-  llvm::sort(&VD_0[0], &VD_0[5], Cmp);
-  ASSERT_EQ(StringRef((const char *)VD_0[0].Value, 7), StringRef("callee2"));
-  ASSERT_EQ(1000U, VD_0[0].Count);
-  ASSERT_EQ(StringRef((const char *)VD_0[1].Value, 7), StringRef("callee3"));
-  ASSERT_EQ(500U, VD_0[1].Count);
-  ASSERT_EQ(StringRef((const char *)VD_0[2].Value, 7), StringRef("callee1"));
-  ASSERT_EQ(400U, VD_0[2].Count);
-  ASSERT_EQ(StringRef((const char *)VD_0[3].Value, 7), StringRef("callee4"));
-  ASSERT_EQ(300U, VD_0[3].Count);
-  ASSERT_EQ(StringRef((const char *)VD_0[4].Value, 7), StringRef("callee5"));
-  ASSERT_EQ(100U, VD_0[4].Count);
-
-  std::unique_ptr<InstrProfValueData[]> VD_1(
-      Record.getValueForSite(IPVK_IndirectCallTarget, 1));
-  llvm::sort(&VD_1[0], &VD_1[4], Cmp);
-  ASSERT_EQ(StringRef((const char *)VD_1[0].Value, 7), StringRef("callee2"));
-  ASSERT_EQ(2500U, VD_1[0].Count);
-  ASSERT_EQ(StringRef((const char *)VD_1[1].Value, 7), StringRef("callee1"));
-  ASSERT_EQ(1300U, VD_1[1].Count);
-  ASSERT_EQ(StringRef((const char *)VD_1[2].Value, 7), StringRef("callee3"));
-  ASSERT_EQ(1000U, VD_1[2].Count);
-  ASSERT_EQ(StringRef((const char *)VD_1[3].Value, 7), StringRef("callee5"));
-  ASSERT_EQ(800U, VD_1[3].Count);
-
-  std::unique_ptr<InstrProfValueData[]> VD_2(
-      Record.getValueForSite(IPVK_IndirectCallTarget, 2));
-  llvm::sort(&VD_2[0], &VD_2[3], Cmp);
-  ASSERT_EQ(StringRef((const char *)VD_2[0].Value, 7), StringRef("callee4"));
-  ASSERT_EQ(5500U, VD_2[0].Count);
-  ASSERT_EQ(StringRef((const char *)VD_2[1].Value, 7), StringRef("callee3"));
-  ASSERT_EQ(1000U, VD_2[1].Count);
-  ASSERT_EQ(StringRef((const char *)VD_2[2].Value, 7), StringRef("callee6"));
-  ASSERT_EQ(800U, VD_2[2].Count);
-
-  std::unique_ptr<InstrProfValueData[]> VD_3(
-      Record.getValueForSite(IPVK_IndirectCallTarget, 3));
-  llvm::sort(&VD_3[0], &VD_3[2], Cmp);
-  ASSERT_EQ(StringRef((const char *)VD_3[0].Value, 7), StringRef("callee3"));
-  ASSERT_EQ(2000U, VD_3[0].Count);
-  ASSERT_EQ(StringRef((const char *)VD_3[1].Value, 7), StringRef("callee2"));
-  ASSERT_EQ(1800U, VD_3[1].Count);
-}
-
-TEST_P(MaybeSparseInstrProfTest, value_prof_data_read_write_mapping) {
-
-  NamedInstrProfRecord SrcRecord("caller", 0x1234, {1ULL << 31, 2});
-  addValueProfData(SrcRecord);
-  std::unique_ptr<ValueProfData> VPData =
-      ValueProfData::serializeFrom(SrcRecord);
-
-  NamedInstrProfRecord Record("caller", 0x1234, {1ULL << 31, 2});
-  InstrProfSymtab Symtab;
-  Symtab.mapAddress(uint64_t(callee1), 0x1000ULL);
-  Symtab.mapAddress(uint64_t(callee2), 0x2000ULL);
-  Symtab.mapAddress(uint64_t(callee3), 0x3000ULL);
-  Symtab.mapAddress(uint64_t(callee4), 0x4000ULL);
-  // Missing mapping for callee5
-
-  VPData->deserializeTo(Record, &Symtab);
-
-  // Now read data from Record and sanity check the data
-  ASSERT_EQ(5U, Record.getNumValueSites(IPVK_IndirectCallTarget));
-  ASSERT_EQ(5U, Record.getNumValueDataForSite(IPVK_IndirectCallTarget, 0));
-
-  auto Cmp = [](const InstrProfValueData &VD1, const InstrProfValueData &VD2) {
-    return VD1.Count > VD2.Count;
-  };
-  std::unique_ptr<InstrProfValueData[]> VD_0(
-      Record.getValueForSite(IPVK_IndirectCallTarget, 0));
-  llvm::sort(&VD_0[0], &VD_0[5], Cmp);
-  ASSERT_EQ(VD_0[0].Value, 0x2000ULL);
-  ASSERT_EQ(1000U, VD_0[0].Count);
-  ASSERT_EQ(VD_0[1].Value, 0x3000ULL);
-  ASSERT_EQ(500U, VD_0[1].Count);
-  ASSERT_EQ(VD_0[2].Value, 0x1000ULL);
-  ASSERT_EQ(400U, VD_0[2].Count);
-
-  // callee5 does not have a mapped value -- default to 0.
-  ASSERT_EQ(VD_0[4].Value, 0ULL);
-}
-
-TEST_P(MaybeSparseInstrProfTest, get_max_function_count) {
-  Writer.addRecord({"foo", 0x1234, {1ULL << 31, 2}}, Err);
-  Writer.addRecord({"bar", 0, {1ULL << 63}}, Err);
-  Writer.addRecord({"baz", 0x5678, {0, 0, 0, 0}}, Err);
-  auto Profile = Writer.writeBuffer();
-  readProfile(std::move(Profile));
-
-  ASSERT_EQ(1ULL << 63, Reader->getMaximumFunctionCount(/* IsCS */ false));
-}
-
-TEST_P(MaybeSparseInstrProfTest, get_weighted_function_counts) {
-  Writer.addRecord({"foo", 0x1234, {1, 2}}, 3, Err);
-  Writer.addRecord({"foo", 0x1235, {3, 4}}, 5, Err);
-  auto Profile = Writer.writeBuffer();
-  readProfile(std::move(Profile));
-
-  std::vector<uint64_t> Counts;
-  EXPECT_THAT_ERROR(Reader->getFunctionCounts("foo", 0x1234, Counts),
-                    Succeeded());
-  ASSERT_EQ(2U, Counts.size());
-  ASSERT_EQ(3U, Counts[0]);
-  ASSERT_EQ(6U, Counts[1]);
-
-  EXPECT_THAT_ERROR(Reader->getFunctionCounts("foo", 0x1235, Counts),
-                    Succeeded());
-  ASSERT_EQ(2U, Counts.size());
-  ASSERT_EQ(15U, Counts[0]);
-  ASSERT_EQ(20U, Counts[1]);
-}
-
-// Testing symtab creator interface used by indexed profile reader.
-TEST_P(MaybeSparseInstrProfTest, instr_prof_symtab_test) {
-  std::vector<StringRef> FuncNames;
-  FuncNames.push_back("func1");
-  FuncNames.push_back("func2");
-  FuncNames.push_back("func3");
-  FuncNames.push_back("bar1");
-  FuncNames.push_back("bar2");
-  FuncNames.push_back("bar3");
-  InstrProfSymtab Symtab;
-  EXPECT_THAT_ERROR(Symtab.create(FuncNames), Succeeded());
-  StringRef R = Symtab.getFuncName(IndexedInstrProf::ComputeHash("func1"));
-  ASSERT_EQ(StringRef("func1"), R);
-  R = Symtab.getFuncName(IndexedInstrProf::ComputeHash("func2"));
-  ASSERT_EQ(StringRef("func2"), R);
-  R = Symtab.getFuncName(IndexedInstrProf::ComputeHash("func3"));
-  ASSERT_EQ(StringRef("func3"), R);
-  R = Symtab.getFuncName(IndexedInstrProf::ComputeHash("bar1"));
-  ASSERT_EQ(StringRef("bar1"), R);
-  R = Symtab.getFuncName(IndexedInstrProf::ComputeHash("bar2"));
-  ASSERT_EQ(StringRef("bar2"), R);
-  R = Symtab.getFuncName(IndexedInstrProf::ComputeHash("bar3"));
-  ASSERT_EQ(StringRef("bar3"), R);
-
-  // negative tests
-  R = Symtab.getFuncName(IndexedInstrProf::ComputeHash("bar4"));
-  ASSERT_EQ(StringRef(), R);
-  R = Symtab.getFuncName(IndexedInstrProf::ComputeHash("foo4"));
-  ASSERT_EQ(StringRef(), R);
-
-  // Now incrementally update the symtab
-  EXPECT_THAT_ERROR(Symtab.addFuncName("blah_1"), Succeeded());
-  EXPECT_THAT_ERROR(Symtab.addFuncName("blah_2"), Succeeded());
-  EXPECT_THAT_ERROR(Symtab.addFuncName("blah_3"), Succeeded());
-
-  // Check again
-  R = Symtab.getFuncName(IndexedInstrProf::ComputeHash("blah_1"));
-  ASSERT_EQ(StringRef("blah_1"), R);
-  R = Symtab.getFuncName(IndexedInstrProf::ComputeHash("blah_2"));
-  ASSERT_EQ(StringRef("blah_2"), R);
-  R = Symtab.getFuncName(IndexedInstrProf::ComputeHash("blah_3"));
-  ASSERT_EQ(StringRef("blah_3"), R);
-  R = Symtab.getFuncName(IndexedInstrProf::ComputeHash("func1"));
-  ASSERT_EQ(StringRef("func1"), R);
-  R = Symtab.getFuncName(IndexedInstrProf::ComputeHash("func2"));
-  ASSERT_EQ(StringRef("func2"), R);
-  R = Symtab.getFuncName(IndexedInstrProf::ComputeHash("func3"));
-  ASSERT_EQ(StringRef("func3"), R);
-  R = Symtab.getFuncName(IndexedInstrProf::ComputeHash("bar1"));
-  ASSERT_EQ(StringRef("bar1"), R);
-  R = Symtab.getFuncName(IndexedInstrProf::ComputeHash("bar2"));
-  ASSERT_EQ(StringRef("bar2"), R);
-  R = Symtab.getFuncName(IndexedInstrProf::ComputeHash("bar3"));
-  ASSERT_EQ(StringRef("bar3"), R);
-}
-
-// Test that we get an error when creating a bogus symtab.
-TEST_P(MaybeSparseInstrProfTest, instr_prof_bogus_symtab_empty_func_name) {
-  InstrProfSymtab Symtab;
-  EXPECT_TRUE(ErrorEquals(instrprof_error::malformed, Symtab.addFuncName("")));
-}
-
-// Testing symtab creator interface used by value profile transformer.
-TEST_P(MaybeSparseInstrProfTest, instr_prof_symtab_module_test) {
-  LLVMContext Ctx;
-  std::unique_ptr<Module> M = std::make_unique<Module>("MyModule.cpp", Ctx);
-  FunctionType *FTy = FunctionType::get(Type::getVoidTy(Ctx),
-                                        /*isVarArg=*/false);
-  Function::Create(FTy, Function::ExternalLinkage, "Gfoo", M.get());
-  Function::Create(FTy, Function::ExternalLinkage, "Gblah", M.get());
-  Function::Create(FTy, Function::ExternalLinkage, "Gbar", M.get());
-  Function::Create(FTy, Function::InternalLinkage, "Ifoo", M.get());
-  Function::Create(FTy, Function::InternalLinkage, "Iblah", M.get());
-  Function::Create(FTy, Function::InternalLinkage, "Ibar", M.get());
-  Function::Create(FTy, Function::PrivateLinkage, "Pfoo", M.get());
-  Function::Create(FTy, Function::PrivateLinkage, "Pblah", M.get());
-  Function::Create(FTy, Function::PrivateLinkage, "Pbar", M.get());
-  Function::Create(FTy, Function::WeakODRLinkage, "Wfoo", M.get());
-  Function::Create(FTy, Function::WeakODRLinkage, "Wblah", M.get());
-  Function::Create(FTy, Function::WeakODRLinkage, "Wbar", M.get());
-
-  InstrProfSymtab ProfSymtab;
-  EXPECT_THAT_ERROR(ProfSymtab.create(*M), Succeeded());
-
-  StringRef Funcs[] = {"Gfoo", "Gblah", "Gbar", "Ifoo", "Iblah", "Ibar",
-                       "Pfoo", "Pblah", "Pbar", "Wfoo", "Wblah", "Wbar"};
-
-  for (unsigned I = 0; I < sizeof(Funcs) / sizeof(*Funcs); I++) {
-    Function *F = M->getFunction(Funcs[I]);
-    ASSERT_TRUE(F != nullptr);
-    std::string PGOName = getPGOFuncName(*F);
-    uint64_t Key = IndexedInstrProf::ComputeHash(PGOName);
-    ASSERT_EQ(StringRef(PGOName),
-              ProfSymtab.getFuncName(Key));
-    ASSERT_EQ(StringRef(Funcs[I]), ProfSymtab.getOrigFuncName(Key));
-  }
-}
-
-// Testing symtab serialization and creator/deserialization interface
-// used by coverage map reader, and raw profile reader.
-TEST_P(MaybeSparseInstrProfTest, instr_prof_symtab_compression_test) {
-  std::vector<std::string> FuncNames1;
-  std::vector<std::string> FuncNames2;
-  for (int I = 0; I < 3; I++) {
-    std::string str;
-    raw_string_ostream OS(str);
-    OS << "func_" << I;
-    FuncNames1.push_back(OS.str());
-    str.clear();
-    OS << "f oooooooooooooo_" << I;
-    FuncNames1.push_back(OS.str());
-    str.clear();
-    OS << "BAR_" << I;
-    FuncNames2.push_back(OS.str());
-    str.clear();
-    OS << "BlahblahBlahblahBar_" << I;
-    FuncNames2.push_back(OS.str());
-  }
-
-  for (bool DoCompression : {false, true}) {
-    // Compressing:
-    std::string FuncNameStrings1;
-    EXPECT_THAT_ERROR(collectPGOFuncNameStrings(
-                          FuncNames1, (DoCompression && zlib::isAvailable()),
-                          FuncNameStrings1),
-                      Succeeded());
-
-    // Compressing:
-    std::string FuncNameStrings2;
-    EXPECT_THAT_ERROR(collectPGOFuncNameStrings(
-                          FuncNames2, (DoCompression && zlib::isAvailable()),
-                          FuncNameStrings2),
-                      Succeeded());
-
-    for (int Padding = 0; Padding < 2; Padding++) {
-      // Join with paddings :
-      std::string FuncNameStrings = FuncNameStrings1;
-      for (int P = 0; P < Padding; P++) {
-        FuncNameStrings.push_back('\0');
-      }
-      FuncNameStrings += FuncNameStrings2;
-
-      // Now decompress:
-      InstrProfSymtab Symtab;
-      EXPECT_THAT_ERROR(Symtab.create(StringRef(FuncNameStrings)), Succeeded());
-
-      // Now do the checks:
-      // First sampling some data points:
-      StringRef R = Symtab.getFuncName(IndexedInstrProf::ComputeHash(FuncNames1[0]));
-      ASSERT_EQ(StringRef("func_0"), R);
-      R = Symtab.getFuncName(IndexedInstrProf::ComputeHash(FuncNames1[1]));
-      ASSERT_EQ(StringRef("f oooooooooooooo_0"), R);
-      for (int I = 0; I < 3; I++) {
-        std::string N[4];
-        N[0] = FuncNames1[2 * I];
-        N[1] = FuncNames1[2 * I + 1];
-        N[2] = FuncNames2[2 * I];
-        N[3] = FuncNames2[2 * I + 1];
-        for (int J = 0; J < 4; J++) {
-          StringRef R = Symtab.getFuncName(IndexedInstrProf::ComputeHash(N[J]));
-          ASSERT_EQ(StringRef(N[J]), R);
-        }
-      }
-    }
-  }
-}
-
-TEST_P(MaybeSparseInstrProfTest, remapping_test) {
-  Writer.addRecord({"_Z3fooi", 0x1234, {1, 2, 3, 4}}, Err);
-  Writer.addRecord({"file:_Z3barf", 0x567, {5, 6, 7}}, Err);
-  auto Profile = Writer.writeBuffer();
-  readProfile(std::move(Profile), llvm::MemoryBuffer::getMemBuffer(R"(
-    type i l
-    name 3bar 4quux
-  )"));
-
-  std::vector<uint64_t> Counts;
-  for (StringRef FooName : {"_Z3fooi", "_Z3fool"}) {
-    EXPECT_THAT_ERROR(Reader->getFunctionCounts(FooName, 0x1234, Counts),
-                      Succeeded());
-    ASSERT_EQ(4u, Counts.size());
-    EXPECT_EQ(1u, Counts[0]);
-    EXPECT_EQ(2u, Counts[1]);
-    EXPECT_EQ(3u, Counts[2]);
-    EXPECT_EQ(4u, Counts[3]);
-  }
-
-  for (StringRef BarName : {"file:_Z3barf", "file:_Z4quuxf"}) {
-    EXPECT_THAT_ERROR(Reader->getFunctionCounts(BarName, 0x567, Counts),
-                      Succeeded());
-    ASSERT_EQ(3u, Counts.size());
-    EXPECT_EQ(5u, Counts[0]);
-    EXPECT_EQ(6u, Counts[1]);
-    EXPECT_EQ(7u, Counts[2]);
-  }
-
-  for (StringRef BadName : {"_Z3foof", "_Z4quuxi", "_Z3barl", "", "_ZZZ",
-                            "_Z3barf", "otherfile:_Z4quuxf"}) {
-    EXPECT_THAT_ERROR(Reader->getFunctionCounts(BadName, 0x1234, Counts),
-                      Failed());
-    EXPECT_THAT_ERROR(Reader->getFunctionCounts(BadName, 0x567, Counts),
-                      Failed());
-  }
-}
-
-TEST_F(SparseInstrProfTest, preserve_no_records) {
-  Writer.addRecord({"foo", 0x1234, {0}}, Err);
-  Writer.addRecord({"bar", 0x4321, {0, 0}}, Err);
-  Writer.addRecord({"baz", 0x4321, {0, 0, 0}}, Err);
-
-  auto Profile = Writer.writeBuffer();
-  readProfile(std::move(Profile));
-
-  auto I = Reader->begin(), E = Reader->end();
-  ASSERT_TRUE(I == E);
-}
-
-INSTANTIATE_TEST_SUITE_P(MaybeSparse, MaybeSparseInstrProfTest,
-                         ::testing::Bool());
-
-#if defined(_LP64) && defined(EXPENSIVE_CHECKS)
-TEST(ProfileReaderTest, ReadsLargeFiles) {
-  const size_t LargeSize = 1ULL << 32; // 4GB
-
-  auto RawProfile = WritableMemoryBuffer::getNewUninitMemBuffer(LargeSize);
-  if (!RawProfile)
-    return;
-  auto RawProfileReaderOrErr = InstrProfReader::create(std::move(RawProfile));
-  ASSERT_TRUE(InstrProfError::take(RawProfileReaderOrErr.takeError()) ==
-              instrprof_error::unrecognized_format);
-
-  auto IndexedProfile = WritableMemoryBuffer::getNewUninitMemBuffer(LargeSize);
-  if (!IndexedProfile)
-    return;
-  auto IndexedReaderOrErr =
-      IndexedInstrProfReader::create(std::move(IndexedProfile), nullptr);
-  ASSERT_TRUE(InstrProfError::take(IndexedReaderOrErr.takeError()) ==
-              instrprof_error::bad_magic);
-}
-#endif
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/ProfileData/SampleProfTest.cpp b/gnu/llvm/llvm/unittests/ProfileData/SampleProfTest.cpp
deleted file mode 100644
index eec59099c21..00000000000
--- a/gnu/llvm/llvm/unittests/ProfileData/SampleProfTest.cpp
+++ /dev/null
@@ -1,534 +0,0 @@
-//===- unittest/ProfileData/SampleProfTest.cpp ------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ProfileData/SampleProf.h"
-#include "llvm/ADT/StringMap.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/IR/DebugInfoMetadata.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Metadata.h"
-#include "llvm/IR/Module.h"
-#include "llvm/ProfileData/SampleProfReader.h"
-#include "llvm/ProfileData/SampleProfWriter.h"
-#include "llvm/Support/Casting.h"
-#include "llvm/Support/ErrorOr.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/Testing/Support/SupportHelpers.h"
-#include "gtest/gtest.h"
-#include <string>
-#include <vector>
-
-using namespace llvm;
-using namespace sampleprof;
-
-using llvm::unittest::TempFile;
-
-static ::testing::AssertionResult NoError(std::error_code EC) {
-  if (!EC)
-    return ::testing::AssertionSuccess();
-  return ::testing::AssertionFailure() << "error " << EC.value() << ": "
-                                       << EC.message();
-}
-
-namespace {
-
-struct SampleProfTest : ::testing::Test {
-  LLVMContext Context;
-  std::unique_ptr<SampleProfileWriter> Writer;
-  std::unique_ptr<SampleProfileReader> Reader;
-
-  SampleProfTest() : Writer(), Reader() {}
-
-  void createWriter(SampleProfileFormat Format, StringRef Profile) {
-    std::error_code EC;
-    std::unique_ptr<raw_ostream> OS(
-        new raw_fd_ostream(Profile, EC, sys::fs::OF_None));
-    auto WriterOrErr = SampleProfileWriter::create(OS, Format);
-    ASSERT_TRUE(NoError(WriterOrErr.getError()));
-    Writer = std::move(WriterOrErr.get());
-  }
-
-  void readProfile(const Module &M, StringRef Profile,
-                   StringRef RemapFile = "") {
-    auto ReaderOrErr = SampleProfileReader::create(
-        std::string(Profile), Context, FSDiscriminatorPass::Base,
-        std::string(RemapFile));
-    ASSERT_TRUE(NoError(ReaderOrErr.getError()));
-    Reader = std::move(ReaderOrErr.get());
-    Reader->setModule(&M);
-  }
-
-  TempFile createRemapFile() {
-    return TempFile("remapfile", "", R"(
-      # Types 'int' and 'long' are equivalent
-      type i l
-      # Function names 'foo' and 'faux' are equivalent
-      name 3foo 4faux
-    )",
-                    /*Unique*/ true);
-  }
-
-  // Verify profile summary is consistent in the roundtrip to and from
-  // Metadata. \p AddPartialField is to choose whether the Metadata
-  // contains the IsPartialProfile field which is optional.
-  void verifyProfileSummary(ProfileSummary &Summary, Module &M,
-                            const bool AddPartialField,
-                            const bool AddPartialProfileRatioField) {
-    LLVMContext &Context = M.getContext();
-    const bool IsPartialProfile = Summary.isPartialProfile();
-    const double PartialProfileRatio = Summary.getPartialProfileRatio();
-    auto VerifySummary = [IsPartialProfile, PartialProfileRatio](
-                             ProfileSummary &Summary) mutable {
-      ASSERT_EQ(ProfileSummary::PSK_Sample, Summary.getKind());
-      ASSERT_EQ(138211u, Summary.getTotalCount());
-      ASSERT_EQ(10u, Summary.getNumCounts());
-      ASSERT_EQ(4u, Summary.getNumFunctions());
-      ASSERT_EQ(1437u, Summary.getMaxFunctionCount());
-      ASSERT_EQ(60351u, Summary.getMaxCount());
-      ASSERT_EQ(IsPartialProfile, Summary.isPartialProfile());
-      ASSERT_EQ(PartialProfileRatio, Summary.getPartialProfileRatio());
-
-      uint32_t Cutoff = 800000;
-      auto Predicate = [&Cutoff](const ProfileSummaryEntry &PE) {
-        return PE.Cutoff == Cutoff;
-      };
-      std::vector<ProfileSummaryEntry> &Details = Summary.getDetailedSummary();
-      auto EightyPerc = find_if(Details, Predicate);
-      Cutoff = 900000;
-      auto NinetyPerc = find_if(Details, Predicate);
-      Cutoff = 950000;
-      auto NinetyFivePerc = find_if(Details, Predicate);
-      Cutoff = 990000;
-      auto NinetyNinePerc = find_if(Details, Predicate);
-      ASSERT_EQ(60000u, EightyPerc->MinCount);
-      ASSERT_EQ(12557u, NinetyPerc->MinCount);
-      ASSERT_EQ(12557u, NinetyFivePerc->MinCount);
-      ASSERT_EQ(600u, NinetyNinePerc->MinCount);
-    };
-    VerifySummary(Summary);
-
-    // Test that conversion of summary to and from Metadata works.
-    Metadata *MD =
-        Summary.getMD(Context, AddPartialField, AddPartialProfileRatioField);
-    ASSERT_TRUE(MD);
-    ProfileSummary *PS = ProfileSummary::getFromMD(MD);
-    ASSERT_TRUE(PS);
-    VerifySummary(*PS);
-    delete PS;
-
-    // Test that summary can be attached to and read back from module.
-    M.eraseNamedMetadata(M.getOrInsertModuleFlagsMetadata());
-    M.setProfileSummary(MD, ProfileSummary::PSK_Sample);
-    MD = M.getProfileSummary(/* IsCS */ false);
-    ASSERT_TRUE(MD);
-    PS = ProfileSummary::getFromMD(MD);
-    ASSERT_TRUE(PS);
-    VerifySummary(*PS);
-    delete PS;
-  }
-
-  void testRoundTrip(SampleProfileFormat Format, bool Remap, bool UseMD5) {
-    TempFile ProfileFile("profile", "", "", /*Unique*/ true);
-    createWriter(Format, ProfileFile.path());
-    if (Format == SampleProfileFormat::SPF_Ext_Binary && UseMD5)
-      static_cast<SampleProfileWriterExtBinary *>(Writer.get())->setUseMD5();
-
-    StringRef FooName("_Z3fooi");
-    FunctionSamples FooSamples;
-    FooSamples.setName(FooName);
-    FooSamples.addTotalSamples(7711);
-    FooSamples.addHeadSamples(610);
-    FooSamples.addBodySamples(1, 0, 610);
-    FooSamples.addBodySamples(2, 0, 600);
-    FooSamples.addBodySamples(4, 0, 60000);
-    FooSamples.addBodySamples(8, 0, 60351);
-    FooSamples.addBodySamples(10, 0, 605);
-
-    // Add inline instance with name "_Z3gooi".
-    StringRef GooName("_Z3gooi");
-    auto &GooSamples =
-        FooSamples.functionSamplesAt(LineLocation(7, 0))[GooName.str()];
-    GooSamples.setName(GooName);
-    GooSamples.addTotalSamples(502);
-    GooSamples.addBodySamples(3, 0, 502);
-
-    // Add inline instance with name "_Z3hooi".
-    StringRef HooName("_Z3hooi");
-    auto &HooSamples =
-        GooSamples.functionSamplesAt(LineLocation(9, 0))[HooName.str()];
-    HooSamples.setName(HooName);
-    HooSamples.addTotalSamples(317);
-    HooSamples.addBodySamples(4, 0, 317);
-
-    StringRef BarName("_Z3bari");
-    FunctionSamples BarSamples;
-    BarSamples.setName(BarName);
-    BarSamples.addTotalSamples(20301);
-    BarSamples.addHeadSamples(1437);
-    BarSamples.addBodySamples(1, 0, 1437);
-    // Test how reader/writer handles unmangled names.
-    StringRef MconstructName("_M_construct<char *>");
-    StringRef StringviewName("string_view<std::allocator<char> >");
-    BarSamples.addCalledTargetSamples(1, 0, MconstructName, 1000);
-    BarSamples.addCalledTargetSamples(1, 0, StringviewName, 437);
-
-    StringRef BazName("_Z3bazi");
-    FunctionSamples BazSamples;
-    BazSamples.setName(BazName);
-    BazSamples.addTotalSamples(12557);
-    BazSamples.addHeadSamples(1257);
-    BazSamples.addBodySamples(1, 0, 12557);
-
-    StringRef BooName("_Z3booi");
-    FunctionSamples BooSamples;
-    BooSamples.setName(BooName);
-    BooSamples.addTotalSamples(1232);
-    BooSamples.addHeadSamples(1);
-    BooSamples.addBodySamples(1, 0, 1232);
-
-    StringMap<FunctionSamples> Profiles;
-    Profiles[FooName] = std::move(FooSamples);
-    Profiles[BarName] = std::move(BarSamples);
-    Profiles[BazName] = std::move(BazSamples);
-    Profiles[BooName] = std::move(BooSamples);
-
-    Module M("my_module", Context);
-    FunctionType *fn_type =
-        FunctionType::get(Type::getVoidTy(Context), {}, false);
-
-    TempFile RemapFile(createRemapFile());
-    if (Remap) {
-      FooName = "_Z4fauxi";
-      BarName = "_Z3barl";
-      GooName = "_Z3gool";
-      HooName = "_Z3hool";
-    }
-
-    M.getOrInsertFunction(FooName, fn_type);
-    M.getOrInsertFunction(BarName, fn_type);
-    M.getOrInsertFunction(BooName, fn_type);
-
-    ProfileSymbolList List;
-    if (Format == SampleProfileFormat::SPF_Ext_Binary) {
-      List.add("zoo", true);
-      List.add("moo", true);
-    }
-    Writer->setProfileSymbolList(&List);
-
-    std::error_code EC;
-    EC = Writer->write(Profiles);
-    ASSERT_TRUE(NoError(EC));
-
-    Writer->getOutputStream().flush();
-
-    readProfile(M, ProfileFile.path(), RemapFile.path());
-    EC = Reader->read();
-    ASSERT_TRUE(NoError(EC));
-
-    if (Format == SampleProfileFormat::SPF_Ext_Binary) {
-      std::unique_ptr<ProfileSymbolList> ReaderList =
-          Reader->getProfileSymbolList();
-      ReaderList->contains("zoo");
-      ReaderList->contains("moo");
-    }
-
-    FunctionSamples *ReadFooSamples = Reader->getSamplesFor(FooName);
-    ASSERT_TRUE(ReadFooSamples != nullptr);
-    if (!UseMD5) {
-      ASSERT_EQ("_Z3fooi", ReadFooSamples->getName());
-    }
-    ASSERT_EQ(7711u, ReadFooSamples->getTotalSamples());
-    ASSERT_EQ(610u, ReadFooSamples->getHeadSamples());
-
-    // Try to find a FunctionSamples with GooName at given callsites containing
-    // inline instance for GooName. Test the correct FunctionSamples can be
-    // found with Remapper support.
-    const FunctionSamples *ReadGooSamples =
-        ReadFooSamples->findFunctionSamplesAt(LineLocation(7, 0), GooName,
-                                              Reader->getRemapper());
-    ASSERT_TRUE(ReadGooSamples != nullptr);
-    ASSERT_EQ(502u, ReadGooSamples->getTotalSamples());
-
-    // Try to find a FunctionSamples with GooName at given callsites containing
-    // no inline instance for GooName. Test no FunctionSamples will be
-    // found with Remapper support.
-    const FunctionSamples *ReadGooSamplesAgain =
-        ReadFooSamples->findFunctionSamplesAt(LineLocation(9, 0), GooName,
-                                              Reader->getRemapper());
-    ASSERT_TRUE(ReadGooSamplesAgain == nullptr);
-
-    // The inline instance of Hoo is inside of the inline instance of Goo.
-    // Try to find a FunctionSamples with HooName at given callsites containing
-    // inline instance for HooName. Test the correct FunctionSamples can be
-    // found with Remapper support.
-    const FunctionSamples *ReadHooSamples =
-        ReadGooSamples->findFunctionSamplesAt(LineLocation(9, 0), HooName,
-                                              Reader->getRemapper());
-    ASSERT_TRUE(ReadHooSamples != nullptr);
-    ASSERT_EQ(317u, ReadHooSamples->getTotalSamples());
-
-    FunctionSamples *ReadBarSamples = Reader->getSamplesFor(BarName);
-    ASSERT_TRUE(ReadBarSamples != nullptr);
-    if (!UseMD5) {
-      ASSERT_EQ("_Z3bari", ReadBarSamples->getName());
-    }
-    ASSERT_EQ(20301u, ReadBarSamples->getTotalSamples());
-    ASSERT_EQ(1437u, ReadBarSamples->getHeadSamples());
-    ErrorOr<SampleRecord::CallTargetMap> CTMap =
-        ReadBarSamples->findCallTargetMapAt(1, 0);
-    ASSERT_FALSE(CTMap.getError());
-
-    // Because _Z3bazi is not defined in module M, expect _Z3bazi's profile
-    // is not loaded when the profile is ExtBinary or Compact format because
-    // these formats support loading function profiles on demand.
-    FunctionSamples *ReadBazSamples = Reader->getSamplesFor(BazName);
-    if (Format == SampleProfileFormat::SPF_Ext_Binary ||
-        Format == SampleProfileFormat::SPF_Compact_Binary) {
-      ASSERT_TRUE(ReadBazSamples == nullptr);
-      ASSERT_EQ(3u, Reader->getProfiles().size());
-    } else {
-      ASSERT_TRUE(ReadBazSamples != nullptr);
-      ASSERT_EQ(12557u, ReadBazSamples->getTotalSamples());
-      ASSERT_EQ(4u, Reader->getProfiles().size());
-    }
-
-    FunctionSamples *ReadBooSamples = Reader->getSamplesFor(BooName);
-    ASSERT_TRUE(ReadBooSamples != nullptr);
-    ASSERT_EQ(1232u, ReadBooSamples->getTotalSamples());
-
-    std::string MconstructGUID;
-    StringRef MconstructRep =
-        getRepInFormat(MconstructName, UseMD5, MconstructGUID);
-    std::string StringviewGUID;
-    StringRef StringviewRep =
-        getRepInFormat(StringviewName, UseMD5, StringviewGUID);
-    ASSERT_EQ(1000u, CTMap.get()[MconstructRep]);
-    ASSERT_EQ(437u, CTMap.get()[StringviewRep]);
-
-
-    ProfileSummary &Summary = Reader->getSummary();
-    Summary.setPartialProfile(true);
-    verifyProfileSummary(Summary, M, true, false);
-
-    Summary.setPartialProfile(false);
-    verifyProfileSummary(Summary, M, true, false);
-
-    verifyProfileSummary(Summary, M, false, false);
-
-    Summary.setPartialProfile(true);
-    Summary.setPartialProfileRatio(0.5);
-    verifyProfileSummary(Summary, M, true, true);
-  }
-
-  void addFunctionSamples(StringMap<FunctionSamples> *Smap, const char *Fname,
-                          uint64_t TotalSamples, uint64_t HeadSamples) {
-    StringRef Name(Fname);
-    FunctionSamples FcnSamples;
-    FcnSamples.setName(Name);
-    FcnSamples.addTotalSamples(TotalSamples);
-    FcnSamples.addHeadSamples(HeadSamples);
-    FcnSamples.addBodySamples(1, 0, HeadSamples);
-    (*Smap)[Name] = FcnSamples;
-  }
-
-  StringMap<FunctionSamples> setupFcnSamplesForElisionTest(StringRef Policy) {
-    StringMap<FunctionSamples> Smap;
-    addFunctionSamples(&Smap, "foo", uint64_t(20301), uint64_t(1437));
-    if (Policy == "" || Policy == "all")
-      return Smap;
-    addFunctionSamples(&Smap, "foo.bar", uint64_t(20303), uint64_t(1439));
-    if (Policy == "selected")
-      return Smap;
-    addFunctionSamples(&Smap, "foo.llvm.2465", uint64_t(20305), uint64_t(1441));
-    return Smap;
-  }
-
-  void createFunctionWithSampleProfileElisionPolicy(Module *M,
-                                                    const char *Fname,
-                                                    StringRef Policy) {
-    FunctionType *FnType =
-        FunctionType::get(Type::getVoidTy(Context), {}, false);
-    auto Inserted = M->getOrInsertFunction(Fname, FnType);
-    auto Fcn = cast<Function>(Inserted.getCallee());
-    if (Policy != "")
-      Fcn->addFnAttr("sample-profile-suffix-elision-policy", Policy);
-  }
-
-  void setupModuleForElisionTest(Module *M, StringRef Policy) {
-    createFunctionWithSampleProfileElisionPolicy(M, "foo", Policy);
-    createFunctionWithSampleProfileElisionPolicy(M, "foo.bar", Policy);
-    createFunctionWithSampleProfileElisionPolicy(M, "foo.llvm.2465", Policy);
-  }
-
-  void testSuffixElisionPolicy(SampleProfileFormat Format, StringRef Policy,
-                               const StringMap<uint64_t> &Expected) {
-    TempFile ProfileFile("profile", "", "", /*Unique*/ true);
-
-    Module M("my_module", Context);
-    setupModuleForElisionTest(&M, Policy);
-    StringMap<FunctionSamples> ProfMap = setupFcnSamplesForElisionTest(Policy);
-
-    // write profile
-    createWriter(Format, ProfileFile.path());
-    std::error_code EC;
-    EC = Writer->write(ProfMap);
-    ASSERT_TRUE(NoError(EC));
-    Writer->getOutputStream().flush();
-
-    // read profile
-    readProfile(M, ProfileFile.path());
-    EC = Reader->read();
-    ASSERT_TRUE(NoError(EC));
-
-    for (auto I = Expected.begin(); I != Expected.end(); ++I) {
-      uint64_t Esamples = uint64_t(-1);
-      FunctionSamples *Samples = Reader->getSamplesFor(I->getKey());
-      if (Samples != nullptr)
-        Esamples = Samples->getTotalSamples();
-      ASSERT_EQ(I->getValue(), Esamples);
-    }
-  }
-};
-
-TEST_F(SampleProfTest, roundtrip_text_profile) {
-  testRoundTrip(SampleProfileFormat::SPF_Text, false, false);
-}
-
-TEST_F(SampleProfTest, roundtrip_raw_binary_profile) {
-  testRoundTrip(SampleProfileFormat::SPF_Binary, false, false);
-}
-
-TEST_F(SampleProfTest, roundtrip_compact_binary_profile) {
-  testRoundTrip(SampleProfileFormat::SPF_Compact_Binary, false, true);
-}
-
-TEST_F(SampleProfTest, roundtrip_ext_binary_profile) {
-  testRoundTrip(SampleProfileFormat::SPF_Ext_Binary, false, false);
-}
-
-TEST_F(SampleProfTest, roundtrip_md5_ext_binary_profile) {
-  testRoundTrip(SampleProfileFormat::SPF_Ext_Binary, false, true);
-}
-
-TEST_F(SampleProfTest, remap_text_profile) {
-  testRoundTrip(SampleProfileFormat::SPF_Text, true, false);
-}
-
-TEST_F(SampleProfTest, remap_raw_binary_profile) {
-  testRoundTrip(SampleProfileFormat::SPF_Binary, true, false);
-}
-
-TEST_F(SampleProfTest, remap_ext_binary_profile) {
-  testRoundTrip(SampleProfileFormat::SPF_Ext_Binary, true, false);
-}
-
-TEST_F(SampleProfTest, sample_overflow_saturation) {
-  const uint64_t Max = std::numeric_limits<uint64_t>::max();
-  sampleprof_error Result;
-
-  FunctionSamples FooSamples;
-  Result = FooSamples.addTotalSamples(1);
-  ASSERT_EQ(Result, sampleprof_error::success);
-
-  Result = FooSamples.addHeadSamples(1);
-  ASSERT_EQ(Result, sampleprof_error::success);
-
-  Result = FooSamples.addBodySamples(10, 0, 1);
-  ASSERT_EQ(Result, sampleprof_error::success);
-
-  Result = FooSamples.addTotalSamples(Max);
-  ASSERT_EQ(Result, sampleprof_error::counter_overflow);
-  ASSERT_EQ(FooSamples.getTotalSamples(), Max);
-
-  Result = FooSamples.addHeadSamples(Max);
-  ASSERT_EQ(Result, sampleprof_error::counter_overflow);
-  ASSERT_EQ(FooSamples.getHeadSamples(), Max);
-
-  Result = FooSamples.addBodySamples(10, 0, Max);
-  ASSERT_EQ(Result, sampleprof_error::counter_overflow);
-  ErrorOr<uint64_t> BodySamples = FooSamples.findSamplesAt(10, 0);
-  ASSERT_FALSE(BodySamples.getError());
-  ASSERT_EQ(BodySamples.get(), Max);
-}
-
-TEST_F(SampleProfTest, default_suffix_elision_text) {
-  // Default suffix elision policy: strip everything after first dot.
-  // This implies that all suffix variants will map to "foo", so
-  // we don't expect to see any entries for them in the sample
-  // profile.
-  StringMap<uint64_t> Expected;
-  Expected["foo"] = uint64_t(20301);
-  Expected["foo.bar"] = uint64_t(-1);
-  Expected["foo.llvm.2465"] = uint64_t(-1);
-  testSuffixElisionPolicy(SampleProfileFormat::SPF_Text, "", Expected);
-}
-
-TEST_F(SampleProfTest, default_suffix_elision_compact_binary) {
-  // Default suffix elision policy: strip everything after first dot.
-  // This implies that all suffix variants will map to "foo", so
-  // we don't expect to see any entries for them in the sample
-  // profile.
-  StringMap<uint64_t> Expected;
-  Expected["foo"] = uint64_t(20301);
-  Expected["foo.bar"] = uint64_t(-1);
-  Expected["foo.llvm.2465"] = uint64_t(-1);
-  testSuffixElisionPolicy(SampleProfileFormat::SPF_Compact_Binary, "",
-                          Expected);
-}
-
-TEST_F(SampleProfTest, selected_suffix_elision_text) {
-  // Profile is created and searched using the "selected"
-  // suffix elision policy: we only strip a .XXX suffix if
-  // it matches a pattern known to be generated by the compiler
-  // (e.g. ".llvm.<digits>").
-  StringMap<uint64_t> Expected;
-  Expected["foo"] = uint64_t(20301);
-  Expected["foo.bar"] = uint64_t(20303);
-  Expected["foo.llvm.2465"] = uint64_t(-1);
-  testSuffixElisionPolicy(SampleProfileFormat::SPF_Text, "selected", Expected);
-}
-
-TEST_F(SampleProfTest, selected_suffix_elision_compact_binary) {
-  // Profile is created and searched using the "selected"
-  // suffix elision policy: we only strip a .XXX suffix if
-  // it matches a pattern known to be generated by the compiler
-  // (e.g. ".llvm.<digits>").
-  StringMap<uint64_t> Expected;
-  Expected["foo"] = uint64_t(20301);
-  Expected["foo.bar"] = uint64_t(20303);
-  Expected["foo.llvm.2465"] = uint64_t(-1);
-  testSuffixElisionPolicy(SampleProfileFormat::SPF_Compact_Binary, "selected",
-                          Expected);
-}
-
-TEST_F(SampleProfTest, none_suffix_elision_text) {
-  // Profile is created and searched using the "none"
-  // suffix elision policy: no stripping of suffixes at all.
-  // Here we expect to see all variants in the profile.
-  StringMap<uint64_t> Expected;
-  Expected["foo"] = uint64_t(20301);
-  Expected["foo.bar"] = uint64_t(20303);
-  Expected["foo.llvm.2465"] = uint64_t(20305);
-  testSuffixElisionPolicy(SampleProfileFormat::SPF_Text, "none", Expected);
-}
-
-TEST_F(SampleProfTest, none_suffix_elision_compact_binary) {
-  // Profile is created and searched using the "none"
-  // suffix elision policy: no stripping of suffixes at all.
-  // Here we expect to see all variants in the profile.
-  StringMap<uint64_t> Expected;
-  Expected["foo"] = uint64_t(20301);
-  Expected["foo.bar"] = uint64_t(20303);
-  Expected["foo.llvm.2465"] = uint64_t(20305);
-  testSuffixElisionPolicy(SampleProfileFormat::SPF_Compact_Binary, "none",
-                          Expected);
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/Remarks/BitstreamRemarksFormatTest.cpp b/gnu/llvm/llvm/unittests/Remarks/BitstreamRemarksFormatTest.cpp
deleted file mode 100644
index ea61691f4c8..00000000000
--- a/gnu/llvm/llvm/unittests/Remarks/BitstreamRemarksFormatTest.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-//===- unittest/Support/BitstreamRemarksFormatTest.cpp - BitCodes tests ---===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Remarks/BitstreamRemarkContainer.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-// The goal for this test is to observe test failures and carefully update the
-// constants when they change.
-
-// This should not change over time.
-TEST(BitstreamRemarksFormat, Magic) {
-  EXPECT_EQ(remarks::ContainerMagic, "RMRK");
-}
-
-// This should be updated whenever any of the tests below are modified.
-TEST(BitstreamRemarksFormat, ContainerVersion) {
-  EXPECT_EQ(remarks::CurrentContainerVersion, 0UL);
-}
-
-// The values of the current blocks should not change over time.
-// When adding new blocks, make sure to append them to the enum.
-TEST(BitstreamRemarksFormat, BlockIDs) {
-  EXPECT_EQ(remarks::META_BLOCK_ID, 8);
-  EXPECT_EQ(remarks::REMARK_BLOCK_ID, 9);
-}
-
-// The values of the current records should not change over time.
-// When adding new records, make sure to append them to the enum.
-TEST(BitstreamRemarksFormat, RecordIDs) {
-  EXPECT_EQ(remarks::RECORD_FIRST, 1);
-  EXPECT_EQ(remarks::RECORD_META_CONTAINER_INFO, 1);
-  EXPECT_EQ(remarks::RECORD_META_REMARK_VERSION, 2);
-  EXPECT_EQ(remarks::RECORD_META_STRTAB, 3);
-  EXPECT_EQ(remarks::RECORD_META_EXTERNAL_FILE, 4);
-  EXPECT_EQ(remarks::RECORD_REMARK_HEADER, 5);
-  EXPECT_EQ(remarks::RECORD_REMARK_DEBUG_LOC, 6);
-  EXPECT_EQ(remarks::RECORD_REMARK_HOTNESS, 7);
-  EXPECT_EQ(remarks::RECORD_REMARK_ARG_WITH_DEBUGLOC, 8);
-  EXPECT_EQ(remarks::RECORD_REMARK_ARG_WITHOUT_DEBUGLOC, 9);
-  EXPECT_EQ(remarks::RECORD_LAST, 9);
-}
diff --git a/gnu/llvm/llvm/unittests/Remarks/BitstreamRemarksParsingTest.cpp b/gnu/llvm/llvm/unittests/Remarks/BitstreamRemarksParsingTest.cpp
deleted file mode 100644
index 6234931b3be..00000000000
--- a/gnu/llvm/llvm/unittests/Remarks/BitstreamRemarksParsingTest.cpp
+++ /dev/null
@@ -1,401 +0,0 @@
-//===- unittests/Support/BitstreamRemarksParsingTest.cpp - Parsing tests --===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm-c/Remarks.h"
-#include "llvm/Remarks/Remark.h"
-#include "llvm/Remarks/RemarkParser.h"
-#include "llvm/Remarks/RemarkSerializer.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-template <size_t N> void parseGood(const char (&Buf)[N]) {
-  // 1. Parse the YAML remark -> FromYAMLRemark
-  // 2. Serialize it to bitstream -> BSStream
-  // 3. Parse it back -> FromBSRemark
-  // 4. Compare the remark objects
-  //
-  // This testing methodology has the drawback of relying on both the YAML
-  // remark parser and the bitstream remark serializer. It does simplify
-  // testing a lot, since working directly with bitstream is not that easy.
-
-  // 1.
-  Expected<std::unique_ptr<remarks::RemarkParser>> MaybeParser =
-      remarks::createRemarkParser(remarks::Format::YAML, {Buf, N - 1});
-  EXPECT_FALSE(errorToBool(MaybeParser.takeError()));
-  EXPECT_TRUE(*MaybeParser != nullptr);
-
-  std::unique_ptr<remarks::Remark> FromYAMLRemark = nullptr;
-  remarks::RemarkParser &Parser = **MaybeParser;
-  Expected<std::unique_ptr<remarks::Remark>> Remark = Parser.next();
-  EXPECT_FALSE(errorToBool(Remark.takeError())); // Check for parsing errors.
-  EXPECT_TRUE(*Remark != nullptr);               // At least one remark.
-  // Keep the previous remark around.
-  FromYAMLRemark = std::move(*Remark);
-  Remark = Parser.next();
-  Error E = Remark.takeError();
-  EXPECT_TRUE(E.isA<remarks::EndOfFileError>());
-  EXPECT_TRUE(errorToBool(std::move(E))); // Check for parsing errors.
-
-  // 2.
-  remarks::StringTable BSStrTab;
-  BSStrTab.internalize(*FromYAMLRemark);
-  std::string BSBuf;
-  raw_string_ostream BSStream(BSBuf);
-  Expected<std::unique_ptr<remarks::RemarkSerializer>> BSSerializer =
-      remarks::createRemarkSerializer(remarks::Format::Bitstream,
-                                      remarks::SerializerMode::Standalone,
-                                      BSStream, std::move(BSStrTab));
-  EXPECT_FALSE(errorToBool(BSSerializer.takeError()));
-  (*BSSerializer)->emit(*FromYAMLRemark);
-
-  // 3.
-  Expected<std::unique_ptr<remarks::RemarkParser>> MaybeBSParser =
-      remarks::createRemarkParser(remarks::Format::Bitstream, BSStream.str());
-  EXPECT_FALSE(errorToBool(MaybeBSParser.takeError()));
-  EXPECT_TRUE(*MaybeBSParser != nullptr);
-
-  std::unique_ptr<remarks::Remark> FromBSRemark = nullptr;
-  remarks::RemarkParser &BSParser = **MaybeBSParser;
-  Expected<std::unique_ptr<remarks::Remark>> BSRemark = BSParser.next();
-  EXPECT_FALSE(errorToBool(BSRemark.takeError())); // Check for parsing errors.
-  EXPECT_TRUE(*BSRemark != nullptr);               // At least one remark.
-  // Keep the previous remark around.
-  FromBSRemark = std::move(*BSRemark);
-  BSRemark = BSParser.next();
-  Error BSE = BSRemark.takeError();
-  EXPECT_TRUE(BSE.isA<remarks::EndOfFileError>());
-  EXPECT_TRUE(errorToBool(std::move(BSE))); // Check for parsing errors.
-
-  EXPECT_EQ(*FromYAMLRemark, *FromBSRemark);
-}
-
-TEST(BitstreamRemarks, ParsingGood) {
-  parseGood("\n"
-            "--- !Missed\n"
-            "Pass: inline\n"
-            "Name: NoDefinition\n"
-            "DebugLoc: { File: file.c, Line: 3, Column: 12 }\n"
-            "Function: foo\n"
-            "Args:\n"
-            "  - Callee: bar\n"
-            "  - String: ' will not be inlined into '\n"
-            "  - Caller: foo\n"
-            "    DebugLoc: { File: file.c, Line: 2, Column: 0 }\n"
-            "  - String: ' because its definition is unavailable'\n"
-            "");
-
-  // No debug loc should also pass.
-  parseGood("\n"
-            "--- !Missed\n"
-            "Pass: inline\n"
-            "Name: NoDefinition\n"
-            "Function: foo\n"
-            "Args:\n"
-            "  - Callee: bar\n"
-            "  - String: ' will not be inlined into '\n"
-            "  - Caller: foo\n"
-            "    DebugLoc: { File: file.c, Line: 2, Column: 0 }\n"
-            "  - String: ' because its definition is unavailable'\n"
-            "");
-
-  // No args is also ok.
-  parseGood("\n"
-            "--- !Missed\n"
-            "Pass: inline\n"
-            "Name: NoDefinition\n"
-            "DebugLoc: { File: file.c, Line: 3, Column: 12 }\n"
-            "Function: foo\n"
-            "");
-}
-
-// Mandatory common part of a remark.
-#define COMMON_REMARK "\nPass: inline\nName: NoDefinition\nFunction: foo\n\n"
-// Test all the types.
-TEST(BitstreamRemarks, ParsingTypes) {
-  // Type: Passed
-  parseGood("--- !Passed" COMMON_REMARK);
-  // Type: Missed
-  parseGood("--- !Missed" COMMON_REMARK);
-  // Type: Analysis
-  parseGood("--- !Analysis" COMMON_REMARK);
-  // Type: AnalysisFPCommute
-  parseGood("--- !AnalysisFPCommute" COMMON_REMARK);
-  // Type: AnalysisAliasing
-  parseGood("--- !AnalysisAliasing" COMMON_REMARK);
-  // Type: Failure
-  parseGood("--- !Failure" COMMON_REMARK);
-}
-#undef COMMON_REMARK
-
-static inline StringRef checkStr(StringRef Str, unsigned ExpectedLen) {
-  const char *StrData = Str.data();
-  unsigned StrLen = Str.size();
-  EXPECT_EQ(StrLen, ExpectedLen);
-  return StringRef(StrData, StrLen);
-}
-
-TEST(BitstreamRemarks, Contents) {
-  StringRef Buf = "\n"
-                  "--- !Missed\n"
-                  "Pass: inline\n"
-                  "Name: NoDefinition\n"
-                  "DebugLoc: { File: file.c, Line: 3, Column: 12 }\n"
-                  "Function: foo\n"
-                  "Hotness: 4\n"
-                  "Args:\n"
-                  "  - Callee: bar\n"
-                  "  - String: ' will not be inlined into '\n"
-                  "  - Caller: foo\n"
-                  "    DebugLoc: { File: file.c, Line: 2, Column: 0 }\n"
-                  "  - String: ' because its definition is unavailable'\n"
-                  "\n";
-
-  Expected<std::unique_ptr<remarks::RemarkParser>> MaybeParser =
-      remarks::createRemarkParser(remarks::Format::YAML, Buf);
-  EXPECT_FALSE(errorToBool(MaybeParser.takeError()));
-  EXPECT_TRUE(*MaybeParser != nullptr);
-
-  remarks::RemarkParser &Parser = **MaybeParser;
-  Expected<std::unique_ptr<remarks::Remark>> MaybeRemark = Parser.next();
-  EXPECT_FALSE(
-      errorToBool(MaybeRemark.takeError())); // Check for parsing errors.
-  EXPECT_TRUE(*MaybeRemark != nullptr);      // At least one remark.
-
-  const remarks::Remark &Remark = **MaybeRemark;
-  EXPECT_EQ(Remark.RemarkType, remarks::Type::Missed);
-  EXPECT_EQ(checkStr(Remark.PassName, 6), "inline");
-  EXPECT_EQ(checkStr(Remark.RemarkName, 12), "NoDefinition");
-  EXPECT_EQ(checkStr(Remark.FunctionName, 3), "foo");
-  EXPECT_TRUE(Remark.Loc);
-  const remarks::RemarkLocation &RL = *Remark.Loc;
-  EXPECT_EQ(checkStr(RL.SourceFilePath, 6), "file.c");
-  EXPECT_EQ(RL.SourceLine, 3U);
-  EXPECT_EQ(RL.SourceColumn, 12U);
-  EXPECT_TRUE(Remark.Hotness);
-  EXPECT_EQ(*Remark.Hotness, 4U);
-  EXPECT_EQ(Remark.Args.size(), 4U);
-
-  unsigned ArgID = 0;
-  for (const remarks::Argument &Arg : Remark.Args) {
-    switch (ArgID) {
-    case 0:
-      EXPECT_EQ(checkStr(Arg.Key, 6), "Callee");
-      EXPECT_EQ(checkStr(Arg.Val, 3), "bar");
-      EXPECT_FALSE(Arg.Loc);
-      break;
-    case 1:
-      EXPECT_EQ(checkStr(Arg.Key, 6), "String");
-      EXPECT_EQ(checkStr(Arg.Val, 26), " will not be inlined into ");
-      EXPECT_FALSE(Arg.Loc);
-      break;
-    case 2: {
-      EXPECT_EQ(checkStr(Arg.Key, 6), "Caller");
-      EXPECT_EQ(checkStr(Arg.Val, 3), "foo");
-      EXPECT_TRUE(Arg.Loc);
-      const remarks::RemarkLocation &RL = *Arg.Loc;
-      EXPECT_EQ(checkStr(RL.SourceFilePath, 6), "file.c");
-      EXPECT_EQ(RL.SourceLine, 2U);
-      EXPECT_EQ(RL.SourceColumn, 0U);
-      break;
-    }
-    case 3:
-      EXPECT_EQ(checkStr(Arg.Key, 6), "String");
-      EXPECT_EQ(checkStr(Arg.Val, 38),
-                " because its definition is unavailable");
-      EXPECT_FALSE(Arg.Loc);
-      break;
-    default:
-      break;
-    }
-    ++ArgID;
-  }
-
-  MaybeRemark = Parser.next();
-  Error E = MaybeRemark.takeError();
-  EXPECT_TRUE(E.isA<remarks::EndOfFileError>());
-  EXPECT_TRUE(errorToBool(std::move(E))); // Check for parsing errors.
-}
-
-static inline StringRef checkStr(LLVMRemarkStringRef Str,
-                                 unsigned ExpectedLen) {
-  const char *StrData = LLVMRemarkStringGetData(Str);
-  unsigned StrLen = LLVMRemarkStringGetLen(Str);
-  EXPECT_EQ(StrLen, ExpectedLen);
-  return StringRef(StrData, StrLen);
-}
-
-TEST(BitstreamRemarks, ContentsCAPI) {
-  remarks::StringTable BSStrTab;
-  remarks::Remark ToSerializeRemark;
-  ToSerializeRemark.RemarkType = remarks::Type::Missed;
-  ToSerializeRemark.PassName = "inline";
-  ToSerializeRemark.RemarkName = "NoDefinition";
-  ToSerializeRemark.FunctionName = "foo";
-  ToSerializeRemark.Loc = remarks::RemarkLocation{"file.c", 3, 12};
-  ToSerializeRemark.Hotness = 0;
-  ToSerializeRemark.Args.emplace_back();
-  ToSerializeRemark.Args.back().Key = "Callee";
-  ToSerializeRemark.Args.back().Val = "bar";
-  ToSerializeRemark.Args.emplace_back();
-  ToSerializeRemark.Args.back().Key = "String";
-  ToSerializeRemark.Args.back().Val = " will not be inlined into ";
-  ToSerializeRemark.Args.emplace_back();
-  ToSerializeRemark.Args.back().Key = "Caller";
-  ToSerializeRemark.Args.back().Val = "foo";
-  ToSerializeRemark.Args.back().Loc = remarks::RemarkLocation{"file.c", 2, 0};
-  ToSerializeRemark.Args.emplace_back();
-  ToSerializeRemark.Args.back().Key = "String";
-  ToSerializeRemark.Args.back().Val = " because its definition is unavailable";
-  BSStrTab.internalize(ToSerializeRemark);
-  std::string BSBuf;
-  raw_string_ostream BSStream(BSBuf);
-  Expected<std::unique_ptr<remarks::RemarkSerializer>> BSSerializer =
-      remarks::createRemarkSerializer(remarks::Format::Bitstream,
-                                      remarks::SerializerMode::Standalone,
-                                      BSStream, std::move(BSStrTab));
-  EXPECT_FALSE(errorToBool(BSSerializer.takeError()));
-  (*BSSerializer)->emit(ToSerializeRemark);
-
-  StringRef Buf = BSStream.str();
-  LLVMRemarkParserRef Parser =
-      LLVMRemarkParserCreateBitstream(Buf.data(), Buf.size());
-  LLVMRemarkEntryRef Remark = LLVMRemarkParserGetNext(Parser);
-  EXPECT_FALSE(Remark == nullptr);
-  EXPECT_EQ(LLVMRemarkEntryGetType(Remark), LLVMRemarkTypeMissed);
-  EXPECT_EQ(checkStr(LLVMRemarkEntryGetPassName(Remark), 6), "inline");
-  EXPECT_EQ(checkStr(LLVMRemarkEntryGetRemarkName(Remark), 12), "NoDefinition");
-  EXPECT_EQ(checkStr(LLVMRemarkEntryGetFunctionName(Remark), 3), "foo");
-  LLVMRemarkDebugLocRef DL = LLVMRemarkEntryGetDebugLoc(Remark);
-  EXPECT_EQ(checkStr(LLVMRemarkDebugLocGetSourceFilePath(DL), 6), "file.c");
-  EXPECT_EQ(LLVMRemarkDebugLocGetSourceLine(DL), 3U);
-  EXPECT_EQ(LLVMRemarkDebugLocGetSourceColumn(DL), 12U);
-  EXPECT_EQ(LLVMRemarkEntryGetHotness(Remark), 0U);
-  EXPECT_EQ(LLVMRemarkEntryGetNumArgs(Remark), 4U);
-
-  unsigned ArgID = 0;
-  LLVMRemarkArgRef Arg = LLVMRemarkEntryGetFirstArg(Remark);
-  do {
-    switch (ArgID) {
-    case 0:
-      EXPECT_EQ(checkStr(LLVMRemarkArgGetKey(Arg), 6), "Callee");
-      EXPECT_EQ(checkStr(LLVMRemarkArgGetValue(Arg), 3), "bar");
-      EXPECT_EQ(LLVMRemarkArgGetDebugLoc(Arg), nullptr);
-      break;
-    case 1:
-      EXPECT_EQ(checkStr(LLVMRemarkArgGetKey(Arg), 6), "String");
-      EXPECT_EQ(checkStr(LLVMRemarkArgGetValue(Arg), 26),
-                " will not be inlined into ");
-      EXPECT_EQ(LLVMRemarkArgGetDebugLoc(Arg), nullptr);
-      break;
-    case 2: {
-      EXPECT_EQ(checkStr(LLVMRemarkArgGetKey(Arg), 6), "Caller");
-      EXPECT_EQ(checkStr(LLVMRemarkArgGetValue(Arg), 3), "foo");
-      LLVMRemarkDebugLocRef DL = LLVMRemarkArgGetDebugLoc(Arg);
-      EXPECT_EQ(checkStr(LLVMRemarkDebugLocGetSourceFilePath(DL), 6), "file.c");
-      EXPECT_EQ(LLVMRemarkDebugLocGetSourceLine(DL), 2U);
-      EXPECT_EQ(LLVMRemarkDebugLocGetSourceColumn(DL), 0U);
-      break;
-    }
-    case 3:
-      EXPECT_EQ(checkStr(LLVMRemarkArgGetKey(Arg), 6), "String");
-      EXPECT_EQ(checkStr(LLVMRemarkArgGetValue(Arg), 38),
-                " because its definition is unavailable");
-      EXPECT_EQ(LLVMRemarkArgGetDebugLoc(Arg), nullptr);
-      break;
-    default:
-      break;
-    }
-    ++ArgID;
-  } while ((Arg = LLVMRemarkEntryGetNextArg(Arg, Remark)));
-
-  LLVMRemarkEntryDispose(Remark);
-
-  EXPECT_EQ(LLVMRemarkParserGetNext(Parser), nullptr);
-
-  EXPECT_FALSE(LLVMRemarkParserHasError(Parser));
-  LLVMRemarkParserDispose(Parser);
-}
-
-static void parseBad(StringRef Input, const char *ErrorMsg) {
-  Expected<std::unique_ptr<remarks::RemarkParser>> MaybeBSParser =
-      remarks::createRemarkParser(remarks::Format::Bitstream, Input);
-  EXPECT_FALSE(errorToBool(MaybeBSParser.takeError()));
-  EXPECT_TRUE(*MaybeBSParser != nullptr);
-
-  remarks::RemarkParser &BSParser = **MaybeBSParser;
-  Expected<std::unique_ptr<remarks::Remark>> BSRemark = BSParser.next();
-  EXPECT_EQ(ErrorMsg, toString(BSRemark.takeError())); // Expect an error.
-}
-
-TEST(BitstreamRemarks, ParsingEmpty) {
-  parseBad(StringRef(), "End of file reached.");
-}
-
-TEST(BitstreamRemarks, ParsingBadMagic) {
-  parseBad("KRMR", "Unknown magic number: expecting RMRK, got KRMR.");
-}
-
-// Testing malformed bitstream is not easy. We would need to replace bytes in
-// the stream to create malformed and unknown records and blocks. There is no
-// textual format for bitstream that can be decoded, modified and encoded
-// back.
-
-// FIXME: Add tests for the following error messages:
-// * Error while parsing META_BLOCK: malformed record entry
-// (RECORD_META_CONTAINER_INFO).
-// * Error while parsing META_BLOCK: malformed record entry
-// (RECORD_META_REMARK_VERSION).
-// * Error while parsing META_BLOCK: malformed record entry
-// (RECORD_META_STRTAB).
-// * Error while parsing META_BLOCK: malformed record entry
-// (RECORD_META_EXTERNAL_FILE).
-// * Error while parsing META_BLOCK: unknown record entry (NUM).
-// * Error while parsing REMARK_BLOCK: malformed record entry
-// (RECORD_REMARK_HEADER).
-// * Error while parsing REMARK_BLOCK: malformed record entry
-// (RECORD_REMARK_DEBUG_LOC).
-// * Error while parsing REMARK_BLOCK: malformed record entry
-// (RECORD_REMARK_HOTNESS).
-// * Error while parsing REMARK_BLOCK: malformed record entry
-// (RECORD_REMARK_ARG_WITH_DEBUGLOC).
-// * Error while parsing REMARK_BLOCK: malformed record entry
-// (RECORD_REMARK_ARG_WITHOUT_DEBUGLOC).
-// * Error while parsing REMARK_BLOCK: unknown record entry (NUM).
-// * Error while parsing META_BLOCK: expecting [ENTER_SUBBLOCO, META_BLOCK,
-// ...].
-// * Error while entering META_BLOCK.
-// * Error while parsing META_BLOCK: expecting records.
-// * Error while parsing META_BLOCK: unterminated block.
-// * Error while parsing REMARK_BLOCK: expecting [ENTER_SUBBLOCO, REMARK_BLOCK,
-// ...].
-// * Error while entering REMARK_BLOCK.
-// * Error while parsing REMARK_BLOCK: expecting records.
-// * Error while parsing REMARK_BLOCK: unterminated block.
-// * Error while parsing BLOCKINFO_BLOCK: expecting [ENTER_SUBBLOCK,
-// BLOCKINFO_BLOCK, ...].
-// * Error while parsing BLOCKINFO_BLOCK.
-// * Unexpected error while parsing bitstream.
-// * Expecting META_BLOCK after the BLOCKINFO_BLOCK.
-// * Error while parsing BLOCK_META: missing container version.
-// * Error while parsing BLOCK_META: invalid container type.
-// * Error while parsing BLOCK_META: missing container type.
-// * Error while parsing BLOCK_META: missing string table.
-// * Error while parsing BLOCK_META: missing remark version.
-// * Error while parsing BLOCK_META: missing external file path.
-// * Error while parsing external file's BLOCK_META: wrong container type.
-// * Error while parsing external file's BLOCK_META: mismatching versions:
-// original meta: NUM, external file meta: NUM.
-// * Error while parsing BLOCK_REMARK: missing string table.
-// * Error while parsing BLOCK_REMARK: missing remark type.
-// * Error while parsing BLOCK_REMARK: unknown remark type.
-// * Error while parsing BLOCK_REMARK: missing remark name.
-// * Error while parsing BLOCK_REMARK: missing remark pass.
-// * Error while parsing BLOCK_REMARK: missing remark function name.
-// * Error while parsing BLOCK_REMARK: missing key in remark argument.
-// * Error while parsing BLOCK_REMARK: missing value in remark argument.
diff --git a/gnu/llvm/llvm/unittests/Remarks/BitstreamRemarksSerializerTest.cpp b/gnu/llvm/llvm/unittests/Remarks/BitstreamRemarksSerializerTest.cpp
deleted file mode 100644
index 4c6bf7f3292..00000000000
--- a/gnu/llvm/llvm/unittests/Remarks/BitstreamRemarksSerializerTest.cpp
+++ /dev/null
@@ -1,341 +0,0 @@
-//===- unittest/Support/BitstreamRemarksSerializerTest.cpp ----------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Bitcode/BitcodeAnalyzer.h"
-#include "llvm/Remarks/BitstreamRemarkSerializer.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gtest/gtest.h"
-#include <string>
-
-// We need to supprt Windows paths as well. In order to have paths with the same
-// length, use a different path according to the platform.
-#ifdef _WIN32
-#define EXTERNALFILETESTPATH "C:/externalfi"
-#else
-#define EXTERNALFILETESTPATH "/externalfile"
-#endif
-
-using namespace llvm;
-
-static void checkAnalyze(StringRef Input, StringRef Expected) {
-  std::string OutputBuf;
-  raw_string_ostream OutputOS(OutputBuf);
-  BCDumpOptions O(OutputOS);
-  O.ShowBinaryBlobs = true;
-  BitcodeAnalyzer BA(Input);
-  EXPECT_FALSE(BA.analyze(O)); // Expect no errors.
-  EXPECT_EQ(OutputOS.str(), Expected);
-}
-
-static void check(remarks::SerializerMode Mode, const remarks::Remark &R,
-                  StringRef ExpectedR, Optional<StringRef> ExpectedMeta,
-                  Optional<remarks::StringTable> StrTab) {
-  // Emit the remark.
-  std::string InputBuf;
-  raw_string_ostream InputOS(InputBuf);
-  Expected<std::unique_ptr<remarks::RemarkSerializer>> MaybeSerializer = [&] {
-    if (StrTab)
-      return createRemarkSerializer(remarks::Format::Bitstream, Mode, InputOS,
-                                    std::move(*StrTab));
-    else
-      return createRemarkSerializer(remarks::Format::Bitstream, Mode, InputOS);
-  }();
-  EXPECT_FALSE(errorToBool(MaybeSerializer.takeError()));
-  std::unique_ptr<remarks::RemarkSerializer> Serializer =
-      std::move(*MaybeSerializer);
-  Serializer->emit(R);
-
-  // Analyze the serialized remark.
-  checkAnalyze(InputOS.str(), ExpectedR);
-
-  // Analyze the serialized metadata if it's not in standalone mode.
-  if (ExpectedMeta) {
-    std::string MetaBuf;
-    raw_string_ostream MetaOS(MetaBuf);
-    std::unique_ptr<remarks::MetaSerializer> MetaSerializer =
-        Serializer->metaSerializer(MetaOS, StringRef(EXTERNALFILETESTPATH));
-    MetaSerializer->emit();
-    checkAnalyze(MetaOS.str(), *ExpectedMeta);
-  }
-}
-
-static void check(const remarks::Remark &R, StringRef ExpectedR,
-                  StringRef ExpectedMeta,
-                  Optional<remarks::StringTable> StrTab = None) {
-  return check(remarks::SerializerMode::Separate, R, ExpectedR, ExpectedMeta,
-               std::move(StrTab));
-}
-
-static void checkStandalone(const remarks::Remark &R, StringRef ExpectedR,
-                            Optional<remarks::StringTable> StrTab = None) {
-  return check(remarks::SerializerMode::Standalone, R, ExpectedR,
-               /*ExpectedMeta=*/None, std::move(StrTab));
-}
-
-TEST(BitstreamRemarkSerializer, SeparateRemarkFileNoOptionals) {
-  remarks::Remark R;
-  R.RemarkType = remarks::Type::Missed;
-  R.PassName = "pass";
-  R.RemarkName = "remark";
-  R.FunctionName = "function";
-  check(R,
-        "<BLOCKINFO_BLOCK/>\n"
-        "<Meta BlockID=8 NumWords=3 BlockCodeSize=3>\n"
-        "  <Container info codeid=1 abbrevid=4 op0=0 op1=1/>\n"
-        "  <Remark version codeid=2 abbrevid=5 op0=0/>\n"
-        "</Meta>\n"
-        "<Remark BlockID=9 NumWords=1 BlockCodeSize=4>\n"
-        "  <Remark header codeid=5 abbrevid=4 op0=2 op1=0 op2=1 op3=2/>\n"
-        "</Remark>\n",
-        "<BLOCKINFO_BLOCK/>\n"
-        "<Meta BlockID=8 NumWords=14 BlockCodeSize=3>\n"
-        "  <Container info codeid=1 abbrevid=4 op0=0 op1=0/>\n"
-        "  <String table codeid=3 abbrevid=5/> blob data = "
-        "'remark\\x00pass\\x00function\\x00'\n"
-        "  <External File codeid=4 abbrevid=6/> blob data = "
-        "'" EXTERNALFILETESTPATH"'\n"
-        "</Meta>\n");
-}
-
-TEST(BitstreamRemarkSerializer, SeparateRemarkFileNoOptionalsSeparateStrTab) {
-  remarks::StringTable StrTab;
-  StrTab.add("function");
-  StrTab.add("pass");
-  StrTab.add("remark");
-  remarks::Remark R;
-  R.RemarkType = remarks::Type::Missed;
-  R.PassName = "pass";
-  R.RemarkName = "remark";
-  R.FunctionName = "function";
-  check(R,
-        "<BLOCKINFO_BLOCK/>\n"
-        "<Meta BlockID=8 NumWords=3 BlockCodeSize=3>\n"
-        "  <Container info codeid=1 abbrevid=4 op0=0 op1=1/>\n"
-        "  <Remark version codeid=2 abbrevid=5 op0=0/>\n"
-        "</Meta>\n"
-        "<Remark BlockID=9 NumWords=1 BlockCodeSize=4>\n"
-        "  <Remark header codeid=5 abbrevid=4 op0=2 op1=2 op2=1 op3=0/>\n"
-        "</Remark>\n",
-        "<BLOCKINFO_BLOCK/>\n"
-        "<Meta BlockID=8 NumWords=14 BlockCodeSize=3>\n"
-        "  <Container info codeid=1 abbrevid=4 op0=0 op1=0/>\n"
-        "  <String table codeid=3 abbrevid=5/> blob data = "
-        "'function\\x00pass\\x00remark\\x00'\n"
-        "  <External File codeid=4 abbrevid=6/> blob data = "
-        "'" EXTERNALFILETESTPATH"'\n"
-        "</Meta>\n",
-        std::move(StrTab));
-}
-
-TEST(BitstreamRemarkSerializer, SeparateRemarkFileDebugLoc) {
-  remarks::Remark R;
-  R.RemarkType = remarks::Type::Missed;
-  R.PassName = "pass";
-  R.RemarkName = "remark";
-  R.FunctionName = "function";
-  R.Loc.emplace();
-  R.Loc->SourceFilePath = "path";
-  R.Loc->SourceLine = 99;
-  R.Loc->SourceColumn = 55;
-  check(R,
-        "<BLOCKINFO_BLOCK/>\n"
-        "<Meta BlockID=8 NumWords=3 BlockCodeSize=3>\n"
-        "  <Container info codeid=1 abbrevid=4 op0=0 op1=1/>\n"
-        "  <Remark version codeid=2 abbrevid=5 op0=0/>\n"
-        "</Meta>\n"
-        "<Remark BlockID=9 NumWords=4 BlockCodeSize=4>\n"
-        "  <Remark header codeid=5 abbrevid=4 op0=2 op1=0 op2=1 op3=2/>\n"
-        "  <Remark debug location codeid=6 abbrevid=5 op0=3 op1=99 op2=55/>\n"
-        "</Remark>\n",
-        "<BLOCKINFO_BLOCK/>\n"
-        "<Meta BlockID=8 NumWords=15 BlockCodeSize=3>\n"
-        "  <Container info codeid=1 abbrevid=4 op0=0 op1=0/>\n"
-        "  <String table codeid=3 abbrevid=5/> blob data = "
-        "'remark\\x00pass\\x00function\\x00path\\x00'\n"
-        "  <External File codeid=4 abbrevid=6/> blob data = "
-        "'" EXTERNALFILETESTPATH"'\n"
-        "</Meta>\n");
-}
-
-TEST(BitstreamRemarkSerializer, SeparateRemarkFileHotness) {
-  remarks::Remark R;
-  R.RemarkType = remarks::Type::Missed;
-  R.PassName = "pass";
-  R.RemarkName = "remark";
-  R.FunctionName = "function";
-  R.Hotness.emplace(999999999);
-  check(R,
-        "<BLOCKINFO_BLOCK/>\n"
-        "<Meta BlockID=8 NumWords=3 BlockCodeSize=3>\n"
-        "  <Container info codeid=1 abbrevid=4 op0=0 op1=1/>\n"
-        "  <Remark version codeid=2 abbrevid=5 op0=0/>\n"
-        "</Meta>\n"
-        "<Remark BlockID=9 NumWords=3 BlockCodeSize=4>\n"
-        "  <Remark header codeid=5 abbrevid=4 op0=2 op1=0 op2=1 op3=2/>\n"
-        "  <Remark hotness codeid=7 abbrevid=6 op0=999999999/>\n"
-        "</Remark>\n",
-        "<BLOCKINFO_BLOCK/>\n"
-        "<Meta BlockID=8 NumWords=14 BlockCodeSize=3>\n"
-        "  <Container info codeid=1 abbrevid=4 op0=0 op1=0/>\n"
-        "  <String table codeid=3 abbrevid=5/> blob data = "
-        "'remark\\x00pass\\x00function\\x00'\n"
-        "  <External File codeid=4 abbrevid=6/> blob data = "
-        "'" EXTERNALFILETESTPATH"'\n"
-        "</Meta>\n");
-}
-
-TEST(BitstreamRemarkSerializer, SeparateRemarkFileArgNoDebugLoc) {
-  remarks::Remark R;
-  R.RemarkType = remarks::Type::Missed;
-  R.PassName = "pass";
-  R.RemarkName = "remark";
-  R.FunctionName = "function";
-  R.Args.emplace_back();
-  R.Args.back().Key = "key";
-  R.Args.back().Val = "value";
-  check(R,
-        "<BLOCKINFO_BLOCK/>\n"
-        "<Meta BlockID=8 NumWords=3 BlockCodeSize=3>\n"
-        "  <Container info codeid=1 abbrevid=4 op0=0 op1=1/>\n"
-        "  <Remark version codeid=2 abbrevid=5 op0=0/>\n"
-        "</Meta>\n"
-        "<Remark BlockID=9 NumWords=2 BlockCodeSize=4>\n"
-        "  <Remark header codeid=5 abbrevid=4 op0=2 op1=0 op2=1 op3=2/>\n"
-        "  <Argument codeid=9 abbrevid=8 op0=3 op1=4/>\n"
-        "</Remark>\n",
-        "<BLOCKINFO_BLOCK/>\n"
-        "<Meta BlockID=8 NumWords=16 BlockCodeSize=3>\n"
-        "  <Container info codeid=1 abbrevid=4 op0=0 op1=0/>\n"
-        "  <String table codeid=3 abbrevid=5/> blob data = "
-        "'remark\\x00pass\\x00function\\x00key\\x00value\\x00'\n"
-        "  <External File codeid=4 abbrevid=6/> blob data = "
-        "'" EXTERNALFILETESTPATH"'\n"
-        "</Meta>\n");
-}
-
-TEST(BitstreamRemarkSerializer, SeparateRemarkFileArgDebugLoc) {
-  remarks::Remark R;
-  R.RemarkType = remarks::Type::Missed;
-  R.PassName = "pass";
-  R.RemarkName = "remark";
-  R.FunctionName = "function";
-  R.Args.emplace_back();
-  R.Args.back().Key = "key";
-  R.Args.back().Val = "value";
-  R.Args.back().Loc.emplace();
-  R.Args.back().Loc->SourceFilePath = "path";
-  R.Args.back().Loc->SourceLine = 99;
-  R.Args.back().Loc->SourceColumn = 55;
-  check(R,
-        "<BLOCKINFO_BLOCK/>\n"
-        "<Meta BlockID=8 NumWords=3 BlockCodeSize=3>\n"
-        "  <Container info codeid=1 abbrevid=4 op0=0 op1=1/>\n"
-        "  <Remark version codeid=2 abbrevid=5 op0=0/>\n"
-        "</Meta>\n"
-        "<Remark BlockID=9 NumWords=4 BlockCodeSize=4>\n"
-        "  <Remark header codeid=5 abbrevid=4 op0=2 op1=0 op2=1 op3=2/>\n"
-        "  <Argument with debug location codeid=8 abbrevid=7 op0=3 op1=4 op2=5 "
-        "op3=99 op4=55/>\n"
-        "</Remark>\n",
-        "<BLOCKINFO_BLOCK/>\n"
-        "<Meta BlockID=8 NumWords=17 BlockCodeSize=3>\n"
-        "  <Container info codeid=1 abbrevid=4 op0=0 op1=0/>\n"
-        "  <String table codeid=3 abbrevid=5/> blob data = "
-        "'remark\\x00pass\\x00function\\x00key\\x00value\\x00path\\x00'\n"
-        "  <External File codeid=4 abbrevid=6/> blob data = "
-        "'" EXTERNALFILETESTPATH"'\n"
-        "</Meta>\n");
-}
-
-TEST(BitstreamRemarkSerializer, SeparateRemarkFileAll) {
-  remarks::Remark R;
-  R.RemarkType = remarks::Type::Missed;
-  R.PassName = "pass";
-  R.RemarkName = "remark";
-  R.FunctionName = "function";
-  R.Loc.emplace();
-  R.Loc->SourceFilePath = "path";
-  R.Loc->SourceLine = 99;
-  R.Loc->SourceColumn = 55;
-  R.Hotness.emplace(999999999);
-  R.Args.emplace_back();
-  R.Args.back().Key = "key";
-  R.Args.back().Val = "value";
-  R.Args.back().Loc.emplace();
-  R.Args.back().Loc->SourceFilePath = "argpath";
-  R.Args.back().Loc->SourceLine = 11;
-  R.Args.back().Loc->SourceColumn = 66;
-  check(R,
-        "<BLOCKINFO_BLOCK/>\n"
-        "<Meta BlockID=8 NumWords=3 BlockCodeSize=3>\n"
-        "  <Container info codeid=1 abbrevid=4 op0=0 op1=1/>\n"
-        "  <Remark version codeid=2 abbrevid=5 op0=0/>\n"
-        "</Meta>\n"
-        "<Remark BlockID=9 NumWords=8 BlockCodeSize=4>\n"
-        "  <Remark header codeid=5 abbrevid=4 op0=2 op1=0 op2=1 op3=2/>\n"
-        "  <Remark debug location codeid=6 abbrevid=5 op0=3 op1=99 op2=55/>\n"
-        "  <Remark hotness codeid=7 abbrevid=6 op0=999999999/>\n"
-        "  <Argument with debug location codeid=8 abbrevid=7 op0=4 op1=5 op2=6 "
-        "op3=11 op4=66/>\n"
-        "</Remark>\n",
-        "<BLOCKINFO_BLOCK/>\n"
-        "<Meta BlockID=8 NumWords=19 BlockCodeSize=3>\n"
-        "  <Container info codeid=1 abbrevid=4 op0=0 op1=0/>\n"
-        "  <String table codeid=3 abbrevid=5/> blob data = "
-        "'remark\\x00pass\\x00function\\x00path\\x00key\\x00value\\x00argpa"
-        "th\\x00'\n  <External File codeid=4 abbrevid=6/> blob data = "
-        "'" EXTERNALFILETESTPATH"'\n"
-        "</Meta>\n");
-}
-
-TEST(BitstreamRemarkSerializer, Standalone) {
-  // Pre-populate the string table.
-  remarks::StringTable StrTab;
-  StrTab.add("pass");
-  StrTab.add("remark");
-  StrTab.add("function");
-  StrTab.add("path");
-  StrTab.add("key");
-  StrTab.add("value");
-  StrTab.add("argpath");
-  remarks::Remark R;
-  R.RemarkType = remarks::Type::Missed;
-  R.PassName = "pass";
-  R.RemarkName = "remark";
-  R.FunctionName = "function";
-  R.Loc.emplace();
-  R.Loc->SourceFilePath = "path";
-  R.Loc->SourceLine = 99;
-  R.Loc->SourceColumn = 55;
-  R.Hotness.emplace(999999999);
-  R.Args.emplace_back();
-  R.Args.back().Key = "key";
-  R.Args.back().Val = "value";
-  R.Args.back().Loc.emplace();
-  R.Args.back().Loc->SourceFilePath = "argpath";
-  R.Args.back().Loc->SourceLine = 11;
-  R.Args.back().Loc->SourceColumn = 66;
-  checkStandalone(
-      R,
-      "<BLOCKINFO_BLOCK/>\n"
-      "<Meta BlockID=8 NumWords=15 BlockCodeSize=3>\n"
-      "  <Container info codeid=1 abbrevid=4 op0=0 op1=2/>\n"
-      "  <Remark version codeid=2 abbrevid=5 op0=0/>\n"
-      "  <String table codeid=3 abbrevid=6/> blob data = "
-      "'pass\\x00remark\\x00function\\x00path\\x00key\\x00value\\x00argpath\\x0"
-      "0'\n"
-      "</Meta>\n"
-      "<Remark BlockID=9 NumWords=8 BlockCodeSize=4>\n"
-      "  <Remark header codeid=5 abbrevid=4 op0=2 op1=1 op2=0 op3=2/>\n"
-      "  <Remark debug location codeid=6 abbrevid=5 op0=3 op1=99 op2=55/>\n"
-      "  <Remark hotness codeid=7 abbrevid=6 op0=999999999/>\n"
-      "  <Argument with debug location codeid=8 abbrevid=7 op0=4 op1=5 op2=6 "
-      "op3=11 op4=66/>\n"
-      "</Remark>\n",
-      std::move(StrTab));
-}
diff --git a/gnu/llvm/llvm/unittests/Remarks/CMakeLists.txt b/gnu/llvm/llvm/unittests/Remarks/CMakeLists.txt
deleted file mode 100644
index 35d8290860f..00000000000
--- a/gnu/llvm/llvm/unittests/Remarks/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  BitReader
-  Remarks
-  Support
-  )
-
-add_llvm_unittest(RemarksTests
-  BitstreamRemarksFormatTest.cpp
-  BitstreamRemarksParsingTest.cpp
-  BitstreamRemarksSerializerTest.cpp
-  RemarksAPITest.cpp
-  RemarksLinkingTest.cpp
-  RemarksStrTabParsingTest.cpp
-  YAMLRemarksParsingTest.cpp
-  YAMLRemarksSerializerTest.cpp
-  )
diff --git a/gnu/llvm/llvm/unittests/Remarks/RemarksAPITest.cpp b/gnu/llvm/llvm/unittests/Remarks/RemarksAPITest.cpp
deleted file mode 100644
index 19fa90f5a6a..00000000000
--- a/gnu/llvm/llvm/unittests/Remarks/RemarksAPITest.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-//===- unittest/Support/RemarksAPITest.cpp - C++ API tests ----------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Remarks/Remark.h"
-#include "llvm/Remarks/RemarkStringTable.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-TEST(RemarksAPI, Comparison) {
-  remarks::Remark R;
-  R.RemarkType = remarks::Type::Missed;
-  R.PassName = "pass";
-  R.RemarkName = "name";
-  R.FunctionName = "func";
-  R.Loc = remarks::RemarkLocation{"path", 3, 4};
-  R.Hotness = 5;
-  R.Args.emplace_back();
-  R.Args.back().Key = "key";
-  R.Args.back().Val = "value";
-  R.Args.emplace_back();
-  R.Args.back().Key = "keydebug";
-  R.Args.back().Val = "valuedebug";
-  R.Args.back().Loc = remarks::RemarkLocation{"argpath", 6, 7};
-
-  // Check that == works.
-  EXPECT_EQ(R, R);
-
-  // Check that != works.
-  remarks::Remark R2 = R.clone();
-  R2.FunctionName = "func0";
-  EXPECT_NE(R, R2);
-
-  // Check that we iterate through all the arguments.
-  remarks::Remark R3 = R.clone();
-  R3.Args.back().Val = "not";
-  EXPECT_NE(R, R3);
-}
-
-TEST(RemarksAPI, Clone) {
-  remarks::Remark R;
-  R.RemarkType = remarks::Type::Missed;
-  R.PassName = "pass";
-  R.RemarkName = "name";
-  R.FunctionName = "func";
-  R.Loc = remarks::RemarkLocation{"path", 3, 4};
-  R.Hotness = 5;
-  R.Args.emplace_back();
-  R.Args.back().Key = "key";
-  R.Args.back().Val = "value";
-  R.Args.emplace_back();
-  R.Args.back().Key = "keydebug";
-  R.Args.back().Val = "valuedebug";
-  R.Args.back().Loc = remarks::RemarkLocation{"argpath", 6, 7};
-
-  // Check that clone works.
-  remarks::Remark R2 = R.clone();
-  EXPECT_EQ(R, R2);
-}
-
-TEST(RemarksAPI, ArgsAsMsg) {
-  remarks::Remark R;
-  R.RemarkType = remarks::Type::Missed;
-  R.Args.emplace_back();
-  R.Args.back().Key = "key";
-  R.Args.back().Val = "can not do this ";
-  R.Args.emplace_back();
-  R.Args.back().Key = "keydebug";
-  R.Args.back().Val = "because of that.";
-  R.Args.back().Loc = remarks::RemarkLocation{"argpath", 6, 7};
-
-  EXPECT_EQ(R.getArgsAsMsg(), "can not do this because of that.");
-}
-
-TEST(RemarksAPI, StringTableInternalize) {
-  remarks::StringTable StrTab;
-
-  // Empty table.
-  EXPECT_EQ(StrTab.SerializedSize, 0UL);
-
-  remarks::Remark R;
-  R.RemarkType = remarks::Type::Missed;
-  R.PassName = "pass";
-  R.RemarkName = "name";
-  R.FunctionName = "func";
-  R.Loc = remarks::RemarkLocation{"path", 3, 4};
-  R.Args.emplace_back();
-  R.Args.back().Key = "keydebug";
-  R.Args.back().Val = "valuedebug";
-  R.Args.back().Loc = remarks::RemarkLocation{"argpath", 6, 7};
-
-  // Check that internalize starts using the strings from the string table.
-  remarks::Remark R2 = R.clone();
-  StrTab.internalize(R2);
-
-  // Check that the pointers in the remarks are different.
-  EXPECT_NE(R.PassName.data(), R2.PassName.data());
-  EXPECT_NE(R.RemarkName.data(), R2.RemarkName.data());
-  EXPECT_NE(R.FunctionName.data(), R2.FunctionName.data());
-  EXPECT_NE(R.Loc->SourceFilePath.data(), R2.Loc->SourceFilePath.data());
-  EXPECT_NE(R.Args.back().Key.data(), R2.Args.back().Key.data());
-  EXPECT_NE(R.Args.back().Val.data(), R2.Args.back().Val.data());
-  EXPECT_NE(R.Args.back().Loc->SourceFilePath.data(),
-            R2.Args.back().Loc->SourceFilePath.data());
-
-  // Check that the internalized remark is using the pointers from the string table.
-  EXPECT_EQ(StrTab.add(R.PassName).second.data(), R2.PassName.data());
-  EXPECT_EQ(StrTab.add(R.RemarkName).second.data(), R2.RemarkName.data());
-  EXPECT_EQ(StrTab.add(R.FunctionName).second.data(), R2.FunctionName.data());
-  EXPECT_EQ(StrTab.add(R.Loc->SourceFilePath).second.data(),
-            R2.Loc->SourceFilePath.data());
-  EXPECT_EQ(StrTab.add(R.Args.back().Key).second.data(),
-            R2.Args.back().Key.data());
-  EXPECT_EQ(StrTab.add(R.Args.back().Val).second.data(),
-            R2.Args.back().Val.data());
-  EXPECT_EQ(StrTab.add(R.Args.back().Loc->SourceFilePath).second.data(),
-            R2.Args.back().Loc->SourceFilePath.data());
-}
diff --git a/gnu/llvm/llvm/unittests/Remarks/RemarksLinkingTest.cpp b/gnu/llvm/llvm/unittests/Remarks/RemarksLinkingTest.cpp
deleted file mode 100644
index 95c800d2d10..00000000000
--- a/gnu/llvm/llvm/unittests/Remarks/RemarksLinkingTest.cpp
+++ /dev/null
@@ -1,219 +0,0 @@
-//===- unittest/Support/RemarksLinkingTest.cpp - Linking tests ------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Bitcode/BitcodeAnalyzer.h"
-#include "llvm/Remarks/RemarkLinker.h"
-#include "llvm/Remarks/RemarkSerializer.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gtest/gtest.h"
-#include <string>
-
-using namespace llvm;
-
-static void serializeAndCheck(remarks::RemarkLinker &RL,
-                              remarks::Format OutputFormat,
-                              StringRef ExpectedOutput) {
-  // 1. Create a serializer.
-  // 2. Serialize all the remarks from the linker.
-  // 3. Check that it matches the output.
-  std::string Buf;
-  raw_string_ostream OS(Buf);
-  Error E = RL.serialize(OS, OutputFormat);
-  EXPECT_FALSE(static_cast<bool>(E));
-
-  // For bitstream, run it through the analyzer.
-  if (OutputFormat == remarks::Format::Bitstream) {
-    std::string AnalyzeBuf;
-    raw_string_ostream AnalyzeOS(AnalyzeBuf);
-    BCDumpOptions O(AnalyzeOS);
-    O.ShowBinaryBlobs = true;
-    BitcodeAnalyzer BA(OS.str());
-    EXPECT_FALSE(BA.analyze(O)); // Expect no errors.
-    EXPECT_EQ(AnalyzeOS.str(), ExpectedOutput);
-  } else {
-    EXPECT_EQ(OS.str(), ExpectedOutput);
-  }
-}
-
-static void check(remarks::Format InputFormat, StringRef Input,
-                  remarks::Format OutputFormat, StringRef ExpectedOutput) {
-  remarks::RemarkLinker RL;
-  EXPECT_FALSE(RL.link(Input, InputFormat));
-  serializeAndCheck(RL, OutputFormat, ExpectedOutput);
-}
-
-static void check(remarks::Format InputFormat, StringRef Input,
-                  remarks::Format InputFormat2, StringRef Input2,
-                  remarks::Format OutputFormat, StringRef ExpectedOutput) {
-  remarks::RemarkLinker RL;
-  EXPECT_FALSE(RL.link(Input, InputFormat));
-  EXPECT_FALSE(RL.link(Input2, InputFormat2));
-  serializeAndCheck(RL, OutputFormat, ExpectedOutput);
-}
-
-TEST(Remarks, LinkingGoodYAML) {
-  // One YAML remark.
-  check(remarks::Format::YAML,
-        "--- !Missed\n"
-        "Pass:            inline\n"
-        "Name:            NoDefinition\n"
-        "DebugLoc:        { File: file.c, Line: 3, Column: 12 }\n"
-        "Function:        foo\n"
-        "...\n",
-        remarks::Format::YAML,
-        "--- !Missed\n"
-        "Pass:            inline\n"
-        "Name:            NoDefinition\n"
-        "DebugLoc:        { File: file.c, Line: 3, Column: 12 }\n"
-        "Function:        foo\n"
-        "...\n");
-
-  // Check that we don't keep remarks without debug locations.
-  check(remarks::Format::YAML,
-        "--- !Missed\n"
-        "Pass:            inline\n"
-        "Name:            NoDefinition\n"
-        "Function:        foo\n"
-        "...\n",
-        remarks::Format::YAML, "");
-
-  // Check that we deduplicate remarks.
-  check(remarks::Format::YAML,
-        "--- !Missed\n"
-        "Pass:            inline\n"
-        "Name:            NoDefinition\n"
-        "DebugLoc:        { File: file.c, Line: 3, Column: 12 }\n"
-        "Function:        foo\n"
-        "...\n"
-        "--- !Missed\n"
-        "Pass:            inline\n"
-        "Name:            NoDefinition\n"
-        "DebugLoc:        { File: file.c, Line: 3, Column: 12 }\n"
-        "Function:        foo\n"
-        "...\n",
-        remarks::Format::YAML,
-        "--- !Missed\n"
-        "Pass:            inline\n"
-        "Name:            NoDefinition\n"
-        "DebugLoc:        { File: file.c, Line: 3, Column: 12 }\n"
-        "Function:        foo\n"
-        "...\n");
-}
-
-TEST(Remarks, LinkingGoodBitstream) {
-  // One YAML remark.
-  check(remarks::Format::YAML,
-        "--- !Missed\n"
-        "Pass:            inline\n"
-        "Name:            NoDefinition\n"
-        "DebugLoc:        { File: file.c, Line: 3, Column: 12 }\n"
-        "Function:        foo\n"
-        "...\n",
-        remarks::Format::Bitstream,
-        "<BLOCKINFO_BLOCK/>\n"
-        "<Meta BlockID=8 NumWords=12 BlockCodeSize=3>\n"
-        "  <Container info codeid=1 abbrevid=4 op0=0 op1=2/>\n"
-        "  <Remark version codeid=2 abbrevid=5 op0=0/>\n"
-        "  <String table codeid=3 abbrevid=6/> blob data = "
-        "'inline\\x00NoDefinition\\x00foo\\x00file.c\\x00'\n"
-        "</Meta>\n"
-        "<Remark BlockID=9 NumWords=4 BlockCodeSize=4>\n"
-        "  <Remark header codeid=5 abbrevid=4 op0=2 op1=1 op2=0 op3=2/>\n"
-        "  <Remark debug location codeid=6 abbrevid=5 op0=3 op1=3 op2=12/>\n"
-        "</Remark>\n");
-
-  // Check that we deduplicate remarks.
-  check(remarks::Format::YAML,
-        "--- !Missed\n"
-        "Pass:            inline\n"
-        "Name:            NoDefinition\n"
-        "DebugLoc:        { File: file.c, Line: 3, Column: 12 }\n"
-        "Function:        foo\n"
-        "...\n"
-        "--- !Missed\n"
-        "Pass:            inline\n"
-        "Name:            NoDefinition\n"
-        "DebugLoc:        { File: file.c, Line: 3, Column: 12 }\n"
-        "Function:        foo\n"
-        "...\n",
-        remarks::Format::Bitstream,
-        "<BLOCKINFO_BLOCK/>\n"
-        "<Meta BlockID=8 NumWords=12 BlockCodeSize=3>\n"
-        "  <Container info codeid=1 abbrevid=4 op0=0 op1=2/>\n"
-        "  <Remark version codeid=2 abbrevid=5 op0=0/>\n"
-        "  <String table codeid=3 abbrevid=6/> blob data = "
-        "'inline\\x00NoDefinition\\x00foo\\x00file.c\\x00'\n"
-        "</Meta>\n"
-        "<Remark BlockID=9 NumWords=4 BlockCodeSize=4>\n"
-        "  <Remark header codeid=5 abbrevid=4 op0=2 op1=1 op2=0 op3=2/>\n"
-        "  <Remark debug location codeid=6 abbrevid=5 op0=3 op1=3 op2=12/>\n"
-        "</Remark>\n");
-}
-
-TEST(Remarks, LinkingGoodStrTab) {
-  // Check that remarks from different entries use the same strtab.
-  check(remarks::Format::YAML,
-        "--- !Missed\n"
-        "Pass:            inline\n"
-        "Name:            NoDefinition\n"
-        "DebugLoc:        { File: file.c, Line: 3, Column: 12 }\n"
-        "Function:        foo\n"
-        "...\n",
-        remarks::Format::YAML,
-        "--- !Passed\n"
-        "Pass:            inline\n"
-        "Name:            Ok\n"
-        "DebugLoc:        { File: file.c, Line: 3, Column: 12 }\n"
-        "Function:        foo\n"
-        "...\n",
-        remarks::Format::YAMLStrTab,
-        StringRef("REMARKS\0\0\0\0\0\0\0\0\0\x22\0\0\0\0\0\0\0"
-                  "inline\0NoDefinition\0foo\0file.c\0Ok\0"
-                  "--- !Passed\n"
-                  "Pass:            0\n"
-                  "Name:            4\n"
-                  "DebugLoc:        { File: 3, Line: 3, Column: 12 }\n"
-                  "Function:        2\n"
-                  "...\n"
-                  "--- !Missed\n"
-                  "Pass:            0\n"
-                  "Name:            1\n"
-                  "DebugLoc:        { File: 3, Line: 3, Column: 12 }\n"
-                  "Function:        2\n"
-                  "...\n",
-                  304));
-}
-
-// Check that we propagate parsing errors.
-TEST(Remarks, LinkingError) {
-  remarks::RemarkLinker RL;
-  {
-    Error E = RL.link("badyaml", remarks::Format::YAML);
-    EXPECT_TRUE(static_cast<bool>(E));
-    EXPECT_EQ(toString(std::move(E)),
-              "YAML:1:1: error: document root is not of mapping type.\n"
-              "\n"
-              "badyaml\n"
-              "^~~~~~~\n"
-              "\n");
-  }
-
-  {
-    // Check that the prepend path is propagated and fails with the full path.
-    RL.setExternalFilePrependPath("/baddir/");
-    Error E = RL.link(
-        StringRef("REMARKS\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0badfile.opt.yaml",
-                  40),
-        remarks::Format::YAMLStrTab);
-    EXPECT_TRUE(static_cast<bool>(E));
-    std::string ErrorMessage = toString(std::move(E));
-    EXPECT_EQ(StringRef(ErrorMessage).lower(),
-              StringRef("'/baddir/badfile.opt.yaml': No such file or directory")
-                  .lower());
-  }
-}
diff --git a/gnu/llvm/llvm/unittests/Remarks/RemarksStrTabParsingTest.cpp b/gnu/llvm/llvm/unittests/Remarks/RemarksStrTabParsingTest.cpp
deleted file mode 100644
index f1e9eb86840..00000000000
--- a/gnu/llvm/llvm/unittests/Remarks/RemarksStrTabParsingTest.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-//===- unittest/Support/RemarksStrTabParsingTest.cpp - StrTab tests -------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Remarks/Remark.h"
-#include "llvm/Remarks/RemarkParser.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-TEST(RemarksStrTab, ParsingEmpty) {
-  StringRef Empty("", 0);
-  remarks::ParsedStringTable StrTab(Empty);
-  Expected<StringRef> Nothing = StrTab[0];
-  EXPECT_FALSE(static_cast<bool>(Nothing));
-  EXPECT_EQ(toString(Nothing.takeError()),
-            "String with index 0 is out of bounds (size = 0).");
-}
-
-TEST(RemarksStrTab, ParsingGood) {
-  StringRef Strings("str1\0str2\0str3\0str4", 20);
-  remarks::ParsedStringTable StrTab(Strings);
-  Expected<StringRef> Result = StrTab[0];
-  EXPECT_TRUE(static_cast<bool>(Result));
-  EXPECT_EQ(*Result, "str1");
-  Result = StrTab[1];
-  EXPECT_TRUE(static_cast<bool>(Result));
-  EXPECT_EQ(*Result, "str2");
-  Result = StrTab[2];
-  EXPECT_TRUE(static_cast<bool>(Result));
-  EXPECT_EQ(*Result, "str3");
-  Result = StrTab[3];
-  EXPECT_TRUE(static_cast<bool>(Result));
-  EXPECT_EQ(*Result, "str4");
-}
diff --git a/gnu/llvm/llvm/unittests/Remarks/YAMLRemarksParsingTest.cpp b/gnu/llvm/llvm/unittests/Remarks/YAMLRemarksParsingTest.cpp
deleted file mode 100644
index f20cdb5e6bb..00000000000
--- a/gnu/llvm/llvm/unittests/Remarks/YAMLRemarksParsingTest.cpp
+++ /dev/null
@@ -1,734 +0,0 @@
-//===- unittest/Support/YAMLRemarksParsingTest.cpp - OptTable tests -------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm-c/Remarks.h"
-#include "llvm/Remarks/Remark.h"
-#include "llvm/Remarks/RemarkParser.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-template <size_t N> void parseGood(const char (&Buf)[N]) {
-  Expected<std::unique_ptr<remarks::RemarkParser>> MaybeParser =
-      remarks::createRemarkParser(remarks::Format::YAML, {Buf, N - 1});
-  EXPECT_FALSE(errorToBool(MaybeParser.takeError()));
-  EXPECT_TRUE(*MaybeParser != nullptr);
-
-  remarks::RemarkParser &Parser = **MaybeParser;
-  Expected<std::unique_ptr<remarks::Remark>> Remark = Parser.next();
-  EXPECT_FALSE(errorToBool(Remark.takeError())); // Check for parsing errors.
-  EXPECT_TRUE(*Remark != nullptr);               // At least one remark.
-  Remark = Parser.next();
-  Error E = Remark.takeError();
-  EXPECT_TRUE(E.isA<remarks::EndOfFileError>());
-  EXPECT_TRUE(errorToBool(std::move(E))); // Check for parsing errors.
-}
-
-void parseGoodMeta(StringRef Buf) {
-  Expected<std::unique_ptr<remarks::RemarkParser>> MaybeParser =
-      remarks::createRemarkParserFromMeta(remarks::Format::YAML, Buf);
-  EXPECT_FALSE(errorToBool(MaybeParser.takeError()));
-  EXPECT_TRUE(*MaybeParser != nullptr);
-
-  remarks::RemarkParser &Parser = **MaybeParser;
-  Expected<std::unique_ptr<remarks::Remark>> Remark = Parser.next();
-  EXPECT_FALSE(errorToBool(Remark.takeError())); // Check for parsing errors.
-  EXPECT_TRUE(*Remark != nullptr);               // At least one remark.
-  Remark = Parser.next();
-  Error E = Remark.takeError();
-  EXPECT_TRUE(E.isA<remarks::EndOfFileError>());
-  EXPECT_TRUE(errorToBool(std::move(E))); // Check for parsing errors.
-}
-
-template <size_t N>
-bool parseExpectError(const char (&Buf)[N], const char *Error) {
-  Expected<std::unique_ptr<remarks::RemarkParser>> MaybeParser =
-      remarks::createRemarkParser(remarks::Format::YAML, {Buf, N - 1});
-  EXPECT_FALSE(errorToBool(MaybeParser.takeError()));
-  EXPECT_TRUE(*MaybeParser != nullptr);
-
-  remarks::RemarkParser &Parser = **MaybeParser;
-  Expected<std::unique_ptr<remarks::Remark>> Remark = Parser.next();
-  EXPECT_FALSE(Remark); // Check for parsing errors.
-
-  std::string ErrorStr;
-  raw_string_ostream Stream(ErrorStr);
-  handleAllErrors(Remark.takeError(),
-                  [&](const ErrorInfoBase &EIB) { EIB.log(Stream); });
-  return StringRef(Stream.str()).contains(Error);
-}
-
-enum class CmpType {
-  Equal,
-  Contains
-};
-
-void parseExpectErrorMeta(StringRef Buf, const char *Error, CmpType Cmp,
-                          Optional<StringRef> ExternalFilePrependPath = None) {
-  std::string ErrorStr;
-  raw_string_ostream Stream(ErrorStr);
-
-  Expected<std::unique_ptr<remarks::RemarkParser>> MaybeParser =
-      remarks::createRemarkParserFromMeta(remarks::Format::YAML, Buf,
-                                          /*StrTab=*/None,
-                                          std::move(ExternalFilePrependPath));
-  handleAllErrors(MaybeParser.takeError(),
-                  [&](const ErrorInfoBase &EIB) { EIB.log(Stream); });
-
-  // Use a case insensitive comparision due to case differences in error strings
-  // for different OSs.
-  if (Cmp == CmpType::Equal) {
-    EXPECT_EQ(StringRef(Stream.str()).lower(), StringRef(Error).lower());
-  }
-
-  if (Cmp == CmpType::Contains) {
-    EXPECT_TRUE(StringRef(Stream.str()).contains(StringRef(Error)));
-  }
-}
-
-TEST(YAMLRemarks, ParsingEmpty) {
-  EXPECT_TRUE(parseExpectError("\n\n", "document root is not of mapping type."));
-}
-
-TEST(YAMLRemarks, ParsingNotYAML) {
-  EXPECT_TRUE(
-      parseExpectError("\x01\x02\x03\x04\x05\x06", "Got empty plain scalar"));
-}
-
-TEST(YAMLRemarks, ParsingGood) {
-  parseGood("\n"
-            "--- !Missed\n"
-            "Pass: inline\n"
-            "Name: NoDefinition\n"
-            "DebugLoc: { File: file.c, Line: 3, Column: 12 }\n"
-            "Function: foo\n"
-            "Args:\n"
-            "  - Callee: bar\n"
-            "  - String: ' will not be inlined into '\n"
-            "  - Caller: foo\n"
-            "    DebugLoc: { File: file.c, Line: 2, Column: 0 }\n"
-            "  - String: ' because its definition is unavailable'\n"
-            "");
-
-  // No debug loc should also pass.
-  parseGood("\n"
-            "--- !Missed\n"
-            "Pass: inline\n"
-            "Name: NoDefinition\n"
-            "Function: foo\n"
-            "Args:\n"
-            "  - Callee: bar\n"
-            "  - String: ' will not be inlined into '\n"
-            "  - Caller: foo\n"
-            "    DebugLoc: { File: file.c, Line: 2, Column: 0 }\n"
-            "  - String: ' because its definition is unavailable'\n"
-            "");
-
-  // No args is also ok.
-  parseGood("\n"
-            "--- !Missed\n"
-            "Pass: inline\n"
-            "Name: NoDefinition\n"
-            "DebugLoc: { File: file.c, Line: 3, Column: 12 }\n"
-            "Function: foo\n"
-            "");
-
-  // Different order.
-  parseGood("\n"
-            "--- !Missed\n"
-            "DebugLoc: { Line: 3, Column: 12, File: file.c }\n"
-            "Function: foo\n"
-            "Name: NoDefinition\n"
-            "Args:\n"
-            "  - Callee: bar\n"
-            "  - String: ' will not be inlined into '\n"
-            "  - Caller: foo\n"
-            "    DebugLoc: { File: file.c, Line: 2, Column: 0 }\n"
-            "  - String: ' because its definition is unavailable'\n"
-            "Pass: inline\n"
-            "");
-}
-
-// Mandatory common part of a remark.
-#define COMMON_REMARK "\nPass: inline\nName: NoDefinition\nFunction: foo\n\n"
-// Test all the types.
-TEST(YAMLRemarks, ParsingTypes) {
-  // Type: Passed
-  parseGood("--- !Passed" COMMON_REMARK);
-  // Type: Missed
-  parseGood("--- !Missed" COMMON_REMARK);
-  // Type: Analysis
-  parseGood("--- !Analysis" COMMON_REMARK);
-  // Type: AnalysisFPCommute
-  parseGood("--- !AnalysisFPCommute" COMMON_REMARK);
-  // Type: AnalysisAliasing
-  parseGood("--- !AnalysisAliasing" COMMON_REMARK);
-  // Type: Failure
-  parseGood("--- !Failure" COMMON_REMARK);
-}
-#undef COMMON_REMARK
-
-TEST(YAMLRemarks, ParsingMissingFields) {
-  // No type.
-  EXPECT_TRUE(parseExpectError("\n"
-                   "---\n"
-                   "Pass: inline\n"
-                   "Name: NoDefinition\n"
-                   "Function: foo\n"
-                   "",
-                   "expected a remark tag."));
-  // No pass.
-  EXPECT_TRUE(parseExpectError("\n"
-                   "--- !Missed\n"
-                   "Name: NoDefinition\n"
-                   "Function: foo\n"
-                   "",
-                   "Type, Pass, Name or Function missing."));
-  // No name.
-  EXPECT_TRUE(parseExpectError("\n"
-                   "--- !Missed\n"
-                   "Pass: inline\n"
-                   "Function: foo\n"
-                   "",
-                   "Type, Pass, Name or Function missing."));
-  // No function.
-  EXPECT_TRUE(parseExpectError("\n"
-                   "--- !Missed\n"
-                   "Pass: inline\n"
-                   "Name: NoDefinition\n"
-                   "",
-                   "Type, Pass, Name or Function missing."));
-  // Debug loc but no file.
-  EXPECT_TRUE(parseExpectError("\n"
-                   "--- !Missed\n"
-                   "Pass: inline\n"
-                   "Name: NoDefinition\n"
-                   "Function: foo\n"
-                   "DebugLoc: { Line: 3, Column: 12 }\n"
-                   "",
-                   "DebugLoc node incomplete."));
-  // Debug loc but no line.
-  EXPECT_TRUE(parseExpectError("\n"
-                   "--- !Missed\n"
-                   "Pass: inline\n"
-                   "Name: NoDefinition\n"
-                   "Function: foo\n"
-                   "DebugLoc: { File: file.c, Column: 12 }\n"
-                   "",
-                   "DebugLoc node incomplete."));
-  // Debug loc but no column.
-  EXPECT_TRUE(parseExpectError("\n"
-                   "--- !Missed\n"
-                   "Pass: inline\n"
-                   "Name: NoDefinition\n"
-                   "Function: foo\n"
-                   "DebugLoc: { File: file.c, Line: 3 }\n"
-                   "",
-                   "DebugLoc node incomplete."));
-}
-
-TEST(YAMLRemarks, ParsingWrongTypes) {
-  // Wrong debug loc type.
-  EXPECT_TRUE(parseExpectError("\n"
-                   "--- !Missed\n"
-                   "Pass: inline\n"
-                   "Name: NoDefinition\n"
-                   "Function: foo\n"
-                   "DebugLoc: foo\n"
-                   "",
-                   "expected a value of mapping type."));
-  // Wrong line type.
-  EXPECT_TRUE(parseExpectError("\n"
-                   "--- !Missed\n"
-                   "Pass: inline\n"
-                   "Name: NoDefinition\n"
-                   "Function: foo\n"
-                   "DebugLoc: { File: file.c, Line: b, Column: 12 }\n"
-                   "",
-                   "expected a value of integer type."));
-  // Wrong column type.
-  EXPECT_TRUE(parseExpectError("\n"
-                   "--- !Missed\n"
-                   "Pass: inline\n"
-                   "Name: NoDefinition\n"
-                   "Function: foo\n"
-                   "DebugLoc: { File: file.c, Line: 3, Column: c }\n"
-                   "",
-                   "expected a value of integer type."));
-  // Wrong args type.
-  EXPECT_TRUE(parseExpectError("\n"
-                   "--- !Missed\n"
-                   "Pass: inline\n"
-                   "Name: NoDefinition\n"
-                   "Function: foo\n"
-                   "Args: foo\n"
-                   "",
-                   "wrong value type for key."));
-  // Wrong key type.
-  EXPECT_TRUE(parseExpectError("\n"
-                   "--- !Missed\n"
-                   "{ A: a }: inline\n"
-                   "Name: NoDefinition\n"
-                   "Function: foo\n"
-                   "",
-                   "key is not a string."));
-  // Debug loc with unknown entry.
-  EXPECT_TRUE(parseExpectError("\n"
-                   "--- !Missed\n"
-                   "Pass: inline\n"
-                   "Name: NoDefinition\n"
-                   "Function: foo\n"
-                   "DebugLoc: { File: file.c, Column: 12, Unknown: 12 }\n"
-                   "",
-                   "unknown entry in DebugLoc map."));
-  // Unknown entry.
-  EXPECT_TRUE(parseExpectError("\n"
-                   "--- !Missed\n"
-                   "Unknown: inline\n"
-                   "",
-                   "unknown key."));
-  // Not a scalar.
-  EXPECT_TRUE(parseExpectError("\n"
-                   "--- !Missed\n"
-                   "Pass: { File: a, Line: 1, Column: 2 }\n"
-                   "Name: NoDefinition\n"
-                   "Function: foo\n"
-                   "",
-                   "expected a value of scalar type."));
-  // Not a string file in debug loc.
-  EXPECT_TRUE(parseExpectError("\n"
-                   "--- !Missed\n"
-                   "Pass: inline\n"
-                   "Name: NoDefinition\n"
-                   "Function: foo\n"
-                   "DebugLoc: { File: { a: b }, Column: 12, Line: 12 }\n"
-                   "",
-                   "expected a value of scalar type."));
-  // Not a integer column in debug loc.
-  EXPECT_TRUE(parseExpectError("\n"
-                   "--- !Missed\n"
-                   "Pass: inline\n"
-                   "Name: NoDefinition\n"
-                   "Function: foo\n"
-                   "DebugLoc: { File: file.c, Column: { a: b }, Line: 12 }\n"
-                   "",
-                   "expected a value of scalar type."));
-  // Not a integer line in debug loc.
-  EXPECT_TRUE(parseExpectError("\n"
-                   "--- !Missed\n"
-                   "Pass: inline\n"
-                   "Name: NoDefinition\n"
-                   "Function: foo\n"
-                   "DebugLoc: { File: file.c, Column: 12, Line: { a: b } }\n"
-                   "",
-                   "expected a value of scalar type."));
-  // Not a mapping type value for args.
-  EXPECT_TRUE(parseExpectError("\n"
-                   "--- !Missed\n"
-                   "Pass: inline\n"
-                   "Name: NoDefinition\n"
-                   "Function: foo\n"
-                   "DebugLoc: { File: file.c, Column: 12, Line: { a: b } }\n"
-                   "",
-                   "expected a value of scalar type."));
-}
-
-TEST(YAMLRemarks, ParsingWrongArgs) {
-  // Multiple debug locs per arg.
-  EXPECT_TRUE(parseExpectError("\n"
-                   "--- !Missed\n"
-                   "Pass: inline\n"
-                   "Name: NoDefinition\n"
-                   "Function: foo\n"
-                   "Args:\n"
-                   "  - Str: string\n"
-                   "    DebugLoc: { File: a, Line: 1, Column: 2 }\n"
-                   "    DebugLoc: { File: a, Line: 1, Column: 2 }\n"
-                   "",
-                   "only one DebugLoc entry is allowed per argument."));
-  // Multiple strings per arg.
-  EXPECT_TRUE(parseExpectError("\n"
-                   "--- !Missed\n"
-                   "Pass: inline\n"
-                   "Name: NoDefinition\n"
-                   "Function: foo\n"
-                   "Args:\n"
-                   "  - Str: string\n"
-                   "    Str2: string\n"
-                   "    DebugLoc: { File: a, Line: 1, Column: 2 }\n"
-                   "",
-                   "only one string entry is allowed per argument."));
-  // No arg value.
-  EXPECT_TRUE(parseExpectError("\n"
-                   "--- !Missed\n"
-                   "Pass: inline\n"
-                   "Name: NoDefinition\n"
-                   "Function: foo\n"
-                   "Args:\n"
-                   "  - DebugLoc: { File: a, Line: 1, Column: 2 }\n"
-                   "",
-                   "argument key is missing."));
-}
-
-static inline StringRef checkStr(StringRef Str, unsigned ExpectedLen) {
-  const char *StrData = Str.data();
-  unsigned StrLen = Str.size();
-  EXPECT_EQ(StrLen, ExpectedLen);
-  return StringRef(StrData, StrLen);
-}
-
-TEST(YAMLRemarks, Contents) {
-  StringRef Buf = "\n"
-                  "--- !Missed\n"
-                  "Pass: inline\n"
-                  "Name: NoDefinition\n"
-                  "DebugLoc: { File: file.c, Line: 3, Column: 12 }\n"
-                  "Function: foo\n"
-                  "Hotness: 4\n"
-                  "Args:\n"
-                  "  - Callee: bar\n"
-                  "  - String: ' will not be inlined into '\n"
-                  "  - Caller: foo\n"
-                  "    DebugLoc: { File: file.c, Line: 2, Column: 0 }\n"
-                  "  - String: ' because its definition is unavailable'\n"
-                  "\n";
-
-  Expected<std::unique_ptr<remarks::RemarkParser>> MaybeParser =
-      remarks::createRemarkParser(remarks::Format::YAML, Buf);
-  EXPECT_FALSE(errorToBool(MaybeParser.takeError()));
-  EXPECT_TRUE(*MaybeParser != nullptr);
-
-  remarks::RemarkParser &Parser = **MaybeParser;
-  Expected<std::unique_ptr<remarks::Remark>> MaybeRemark = Parser.next();
-  EXPECT_FALSE(
-      errorToBool(MaybeRemark.takeError())); // Check for parsing errors.
-  EXPECT_TRUE(*MaybeRemark != nullptr);      // At least one remark.
-
-  const remarks::Remark &Remark = **MaybeRemark;
-  EXPECT_EQ(Remark.RemarkType, remarks::Type::Missed);
-  EXPECT_EQ(checkStr(Remark.PassName, 6), "inline");
-  EXPECT_EQ(checkStr(Remark.RemarkName, 12), "NoDefinition");
-  EXPECT_EQ(checkStr(Remark.FunctionName, 3), "foo");
-  EXPECT_TRUE(Remark.Loc);
-  const remarks::RemarkLocation &RL = *Remark.Loc;
-  EXPECT_EQ(checkStr(RL.SourceFilePath, 6), "file.c");
-  EXPECT_EQ(RL.SourceLine, 3U);
-  EXPECT_EQ(RL.SourceColumn, 12U);
-  EXPECT_TRUE(Remark.Hotness);
-  EXPECT_EQ(*Remark.Hotness, 4U);
-  EXPECT_EQ(Remark.Args.size(), 4U);
-
-  unsigned ArgID = 0;
-  for (const remarks::Argument &Arg : Remark.Args) {
-    switch (ArgID) {
-    case 0:
-      EXPECT_EQ(checkStr(Arg.Key, 6), "Callee");
-      EXPECT_EQ(checkStr(Arg.Val, 3), "bar");
-      EXPECT_FALSE(Arg.Loc);
-      break;
-    case 1:
-      EXPECT_EQ(checkStr(Arg.Key, 6), "String");
-      EXPECT_EQ(checkStr(Arg.Val, 26), " will not be inlined into ");
-      EXPECT_FALSE(Arg.Loc);
-      break;
-    case 2: {
-      EXPECT_EQ(checkStr(Arg.Key, 6), "Caller");
-      EXPECT_EQ(checkStr(Arg.Val, 3), "foo");
-      EXPECT_TRUE(Arg.Loc);
-      const remarks::RemarkLocation &RL = *Arg.Loc;
-      EXPECT_EQ(checkStr(RL.SourceFilePath, 6), "file.c");
-      EXPECT_EQ(RL.SourceLine, 2U);
-      EXPECT_EQ(RL.SourceColumn, 0U);
-      break;
-    }
-    case 3:
-      EXPECT_EQ(checkStr(Arg.Key, 6), "String");
-      EXPECT_EQ(checkStr(Arg.Val, 38),
-                " because its definition is unavailable");
-      EXPECT_FALSE(Arg.Loc);
-      break;
-    default:
-      break;
-    }
-    ++ArgID;
-  }
-
-  MaybeRemark = Parser.next();
-  Error E = MaybeRemark.takeError();
-  EXPECT_TRUE(E.isA<remarks::EndOfFileError>());
-  EXPECT_TRUE(errorToBool(std::move(E))); // Check for parsing errors.
-}
-
-static inline StringRef checkStr(LLVMRemarkStringRef Str,
-                                 unsigned ExpectedLen) {
-  const char *StrData = LLVMRemarkStringGetData(Str);
-  unsigned StrLen = LLVMRemarkStringGetLen(Str);
-  EXPECT_EQ(StrLen, ExpectedLen);
-  return StringRef(StrData, StrLen);
-}
-
-TEST(YAMLRemarks, ContentsCAPI) {
-  StringRef Buf = "\n"
-                  "--- !Missed\n"
-                  "Pass: inline\n"
-                  "Name: NoDefinition\n"
-                  "DebugLoc: { File: file.c, Line: 3, Column: 12 }\n"
-                  "Function: foo\n"
-                  "Args:\n"
-                  "  - Callee: bar\n"
-                  "  - String: ' will not be inlined into '\n"
-                  "  - Caller: foo\n"
-                  "    DebugLoc: { File: file.c, Line: 2, Column: 0 }\n"
-                  "  - String: ' because its definition is unavailable'\n"
-                  "\n";
-
-  LLVMRemarkParserRef Parser =
-      LLVMRemarkParserCreateYAML(Buf.data(), Buf.size());
-  LLVMRemarkEntryRef Remark = LLVMRemarkParserGetNext(Parser);
-  EXPECT_FALSE(Remark == nullptr);
-  EXPECT_EQ(LLVMRemarkEntryGetType(Remark), LLVMRemarkTypeMissed);
-  EXPECT_EQ(checkStr(LLVMRemarkEntryGetPassName(Remark), 6), "inline");
-  EXPECT_EQ(checkStr(LLVMRemarkEntryGetRemarkName(Remark), 12), "NoDefinition");
-  EXPECT_EQ(checkStr(LLVMRemarkEntryGetFunctionName(Remark), 3), "foo");
-  LLVMRemarkDebugLocRef DL = LLVMRemarkEntryGetDebugLoc(Remark);
-  EXPECT_EQ(checkStr(LLVMRemarkDebugLocGetSourceFilePath(DL), 6), "file.c");
-  EXPECT_EQ(LLVMRemarkDebugLocGetSourceLine(DL), 3U);
-  EXPECT_EQ(LLVMRemarkDebugLocGetSourceColumn(DL), 12U);
-  EXPECT_EQ(LLVMRemarkEntryGetHotness(Remark), 0U);
-  EXPECT_EQ(LLVMRemarkEntryGetNumArgs(Remark), 4U);
-
-  unsigned ArgID = 0;
-  LLVMRemarkArgRef Arg = LLVMRemarkEntryGetFirstArg(Remark);
-  do {
-    switch (ArgID) {
-    case 0:
-      EXPECT_EQ(checkStr(LLVMRemarkArgGetKey(Arg), 6), "Callee");
-      EXPECT_EQ(checkStr(LLVMRemarkArgGetValue(Arg), 3), "bar");
-      EXPECT_EQ(LLVMRemarkArgGetDebugLoc(Arg), nullptr);
-      break;
-    case 1:
-      EXPECT_EQ(checkStr(LLVMRemarkArgGetKey(Arg), 6), "String");
-      EXPECT_EQ(checkStr(LLVMRemarkArgGetValue(Arg), 26),
-                " will not be inlined into ");
-      EXPECT_EQ(LLVMRemarkArgGetDebugLoc(Arg), nullptr);
-      break;
-    case 2: {
-      EXPECT_EQ(checkStr(LLVMRemarkArgGetKey(Arg), 6), "Caller");
-      EXPECT_EQ(checkStr(LLVMRemarkArgGetValue(Arg), 3), "foo");
-      LLVMRemarkDebugLocRef DL = LLVMRemarkArgGetDebugLoc(Arg);
-      EXPECT_EQ(checkStr(LLVMRemarkDebugLocGetSourceFilePath(DL), 6), "file.c");
-      EXPECT_EQ(LLVMRemarkDebugLocGetSourceLine(DL), 2U);
-      EXPECT_EQ(LLVMRemarkDebugLocGetSourceColumn(DL), 0U);
-      break;
-    }
-    case 3:
-      EXPECT_EQ(checkStr(LLVMRemarkArgGetKey(Arg), 6), "String");
-      EXPECT_EQ(checkStr(LLVMRemarkArgGetValue(Arg), 38),
-                " because its definition is unavailable");
-      EXPECT_EQ(LLVMRemarkArgGetDebugLoc(Arg), nullptr);
-      break;
-    default:
-      break;
-    }
-    ++ArgID;
-  } while ((Arg = LLVMRemarkEntryGetNextArg(Arg, Remark)));
-
-  LLVMRemarkEntryDispose(Remark);
-
-  EXPECT_EQ(LLVMRemarkParserGetNext(Parser), nullptr);
-
-  EXPECT_FALSE(LLVMRemarkParserHasError(Parser));
-  LLVMRemarkParserDispose(Parser);
-}
-
-TEST(YAMLRemarks, ContentsStrTab) {
-  StringRef Buf = "\n"
-                  "--- !Missed\n"
-                  "Pass: 0\n"
-                  "Name: 1\n"
-                  "DebugLoc: { File: 2, Line: 3, Column: 12 }\n"
-                  "Function: 3\n"
-                  "Hotness: 4\n"
-                  "Args:\n"
-                  "  - Callee: 5\n"
-                  "  - String: 7\n"
-                  "  - Caller: 3\n"
-                  "    DebugLoc: { File: 2, Line: 2, Column: 0 }\n"
-                  "  - String: 8\n"
-                  "\n";
-
-  StringRef StrTabBuf =
-      StringRef("inline\0NoDefinition\0file.c\0foo\0Callee\0bar\0String\0 "
-                "will not be inlined into \0 because its definition is "
-                "unavailable",
-                115);
-
-  remarks::ParsedStringTable StrTab(StrTabBuf);
-  Expected<std::unique_ptr<remarks::RemarkParser>> MaybeParser =
-      remarks::createRemarkParser(remarks::Format::YAMLStrTab, Buf,
-                                  std::move(StrTab));
-  EXPECT_FALSE(errorToBool(MaybeParser.takeError()));
-  EXPECT_TRUE(*MaybeParser != nullptr);
-
-  remarks::RemarkParser &Parser = **MaybeParser;
-  Expected<std::unique_ptr<remarks::Remark>> MaybeRemark = Parser.next();
-  EXPECT_FALSE(
-      errorToBool(MaybeRemark.takeError())); // Check for parsing errors.
-  EXPECT_TRUE(*MaybeRemark != nullptr);      // At least one remark.
-
-  const remarks::Remark &Remark = **MaybeRemark;
-  EXPECT_EQ(Remark.RemarkType, remarks::Type::Missed);
-  EXPECT_EQ(checkStr(Remark.PassName, 6), "inline");
-  EXPECT_EQ(checkStr(Remark.RemarkName, 12), "NoDefinition");
-  EXPECT_EQ(checkStr(Remark.FunctionName, 3), "foo");
-  EXPECT_TRUE(Remark.Loc);
-  const remarks::RemarkLocation &RL = *Remark.Loc;
-  EXPECT_EQ(checkStr(RL.SourceFilePath, 6), "file.c");
-  EXPECT_EQ(RL.SourceLine, 3U);
-  EXPECT_EQ(RL.SourceColumn, 12U);
-  EXPECT_TRUE(Remark.Hotness);
-  EXPECT_EQ(*Remark.Hotness, 4U);
-  EXPECT_EQ(Remark.Args.size(), 4U);
-
-  unsigned ArgID = 0;
-  for (const remarks::Argument &Arg : Remark.Args) {
-    switch (ArgID) {
-    case 0:
-      EXPECT_EQ(checkStr(Arg.Key, 6), "Callee");
-      EXPECT_EQ(checkStr(Arg.Val, 3), "bar");
-      EXPECT_FALSE(Arg.Loc);
-      break;
-    case 1:
-      EXPECT_EQ(checkStr(Arg.Key, 6), "String");
-      EXPECT_EQ(checkStr(Arg.Val, 26), " will not be inlined into ");
-      EXPECT_FALSE(Arg.Loc);
-      break;
-    case 2: {
-      EXPECT_EQ(checkStr(Arg.Key, 6), "Caller");
-      EXPECT_EQ(checkStr(Arg.Val, 3), "foo");
-      EXPECT_TRUE(Arg.Loc);
-      const remarks::RemarkLocation &RL = *Arg.Loc;
-      EXPECT_EQ(checkStr(RL.SourceFilePath, 6), "file.c");
-      EXPECT_EQ(RL.SourceLine, 2U);
-      EXPECT_EQ(RL.SourceColumn, 0U);
-      break;
-    }
-    case 3:
-      EXPECT_EQ(checkStr(Arg.Key, 6), "String");
-      EXPECT_EQ(checkStr(Arg.Val, 38),
-                " because its definition is unavailable");
-      EXPECT_FALSE(Arg.Loc);
-      break;
-    default:
-      break;
-    }
-    ++ArgID;
-  }
-
-  MaybeRemark = Parser.next();
-  Error E = MaybeRemark.takeError();
-  EXPECT_TRUE(E.isA<remarks::EndOfFileError>());
-  EXPECT_TRUE(errorToBool(std::move(E))); // Check for parsing errors.
-}
-
-TEST(YAMLRemarks, ParsingBadStringTableIndex) {
-  StringRef Buf = "\n"
-                  "--- !Missed\n"
-                  "Pass: 50\n"
-                  "\n";
-
-  StringRef StrTabBuf = StringRef("inline");
-
-  remarks::ParsedStringTable StrTab(StrTabBuf);
-  Expected<std::unique_ptr<remarks::RemarkParser>> MaybeParser =
-      remarks::createRemarkParser(remarks::Format::YAMLStrTab, Buf,
-                                  std::move(StrTab));
-  EXPECT_FALSE(errorToBool(MaybeParser.takeError()));
-  EXPECT_TRUE(*MaybeParser != nullptr);
-
-  remarks::RemarkParser &Parser = **MaybeParser;
-  Expected<std::unique_ptr<remarks::Remark>> MaybeRemark = Parser.next();
-  EXPECT_FALSE(MaybeRemark); // Expect an error here.
-
-  std::string ErrorStr;
-  raw_string_ostream Stream(ErrorStr);
-  handleAllErrors(MaybeRemark.takeError(),
-                  [&](const ErrorInfoBase &EIB) { EIB.log(Stream); });
-  EXPECT_TRUE(
-      StringRef(Stream.str())
-          .contains("String with index 50 is out of bounds (size = 1)."));
-}
-
-TEST(YAMLRemarks, ParsingGoodMeta) {
-  // No metadata should also work.
-  parseGoodMeta("--- !Missed\n"
-                "Pass: inline\n"
-                "Name: NoDefinition\n"
-                "Function: foo\n");
-
-  // No string table.
-  parseGoodMeta(StringRef("REMARKS\0"
-                          "\0\0\0\0\0\0\0\0"
-                          "\0\0\0\0\0\0\0\0"
-                          "--- !Missed\n"
-                          "Pass: inline\n"
-                          "Name: NoDefinition\n"
-                          "Function: foo\n",
-                          82));
-
-  // Use the string table from the metadata.
-  parseGoodMeta(StringRef("REMARKS\0"
-                          "\0\0\0\0\0\0\0\0"
-                          "\x02\0\0\0\0\0\0\0"
-                          "a\0"
-                          "--- !Missed\n"
-                          "Pass: 0\n"
-                          "Name: 0\n"
-                          "Function: 0\n",
-                          66));
-}
-
-TEST(YAMLRemarks, ParsingBadMeta) {
-  parseExpectErrorMeta(StringRef("REMARKSS", 9),
-                       "Expecting \\0 after magic number.", CmpType::Equal);
-
-  parseExpectErrorMeta(StringRef("REMARKS\0", 8), "Expecting version number.",
-                       CmpType::Equal);
-
-  parseExpectErrorMeta(StringRef("REMARKS\0"
-                                 "\x09\0\0\0\0\0\0\0",
-                                 16),
-                       "Mismatching remark version. Got 9, expected 0.",
-                       CmpType::Equal);
-
-  parseExpectErrorMeta(StringRef("REMARKS\0"
-                                 "\0\0\0\0\0\0\0\0",
-                                 16),
-                       "Expecting string table size.", CmpType::Equal);
-
-  parseExpectErrorMeta(StringRef("REMARKS\0"
-                                 "\0\0\0\0\0\0\0\0"
-                                 "\x01\0\0\0\0\0\0\0",
-                                 24),
-                       "Expecting string table.", CmpType::Equal);
-
-  parseExpectErrorMeta(StringRef("REMARKS\0"
-                                 "\0\0\0\0\0\0\0\0"
-                                 "\0\0\0\0\0\0\0\0"
-                                 "/path/",
-                                 30),
-                       "'/path/'", CmpType::Contains);
-
-  parseExpectErrorMeta(StringRef("REMARKS\0"
-                                 "\0\0\0\0\0\0\0\0"
-                                 "\0\0\0\0\0\0\0\0"
-                                 "/path/",
-                                 30),
-                       "'/baddir/path/'", CmpType::Contains,
-                       StringRef("/baddir/"));
-}
diff --git a/gnu/llvm/llvm/unittests/Remarks/YAMLRemarksSerializerTest.cpp b/gnu/llvm/llvm/unittests/Remarks/YAMLRemarksSerializerTest.cpp
deleted file mode 100644
index 0ebb47809f5..00000000000
--- a/gnu/llvm/llvm/unittests/Remarks/YAMLRemarksSerializerTest.cpp
+++ /dev/null
@@ -1,329 +0,0 @@
-//===- unittest/Support/YAMLRemarksSerializerTest.cpp --------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Remarks/Remark.h"
-#include "llvm/Remarks/RemarkParser.h"
-#include "llvm/Remarks/YAMLRemarkSerializer.h"
-#include "llvm/Support/Error.h"
-#include "gtest/gtest.h"
-
-// We need to supprt Windows paths as well. In order to have paths with the same
-// length, use a different path according to the platform.
-#ifdef _WIN32
-#define EXTERNALFILETESTPATH "C:/externalfi"
-#else
-#define EXTERNALFILETESTPATH "/externalfile"
-#endif
-
-using namespace llvm;
-
-static void check(remarks::Format SerializerFormat,
-                  remarks::SerializerMode Mode, ArrayRef<remarks::Remark> Rs,
-                  StringRef ExpectedR, Optional<StringRef> ExpectedMeta,
-                  Optional<remarks::StringTable> StrTab = None) {
-  std::string Buf;
-  raw_string_ostream OS(Buf);
-  Expected<std::unique_ptr<remarks::RemarkSerializer>> MaybeS = [&] {
-    if (StrTab)
-      return createRemarkSerializer(SerializerFormat, Mode, OS,
-                                    std::move(*StrTab));
-    else
-      return createRemarkSerializer(SerializerFormat, Mode, OS);
-  }();
-  EXPECT_FALSE(errorToBool(MaybeS.takeError()));
-  std::unique_ptr<remarks::RemarkSerializer> S = std::move(*MaybeS);
-
-  for (const remarks::Remark &R : Rs)
-    S->emit(R);
-  EXPECT_EQ(OS.str(), ExpectedR);
-
-  if (ExpectedMeta) {
-    Buf.clear();
-    std::unique_ptr<remarks::MetaSerializer> MS =
-        S->metaSerializer(OS, StringRef(EXTERNALFILETESTPATH));
-    MS->emit();
-    EXPECT_EQ(OS.str(), *ExpectedMeta);
-  }
-}
-
-static void check(remarks::Format SerializerFormat, const remarks::Remark &R,
-                  StringRef ExpectedR, StringRef ExpectedMeta,
-                  Optional<remarks::StringTable> StrTab = None) {
-  return check(SerializerFormat, remarks::SerializerMode::Separate,
-               makeArrayRef(&R, &R + 1), ExpectedR, ExpectedMeta,
-               std::move(StrTab));
-}
-
-static void checkStandalone(remarks::Format SerializerFormat,
-                            const remarks::Remark &R, StringRef ExpectedR,
-                            Optional<remarks::StringTable> StrTab = None) {
-  return check(SerializerFormat, remarks::SerializerMode::Standalone,
-               makeArrayRef(&R, &R + 1), ExpectedR,
-               /*ExpectedMeta=*/None, std::move(StrTab));
-}
-
-TEST(YAMLRemarks, SerializerRemark) {
-  remarks::Remark R;
-  R.RemarkType = remarks::Type::Missed;
-  R.PassName = "pass";
-  R.RemarkName = "name";
-  R.FunctionName = "func";
-  R.Loc = remarks::RemarkLocation{"path", 3, 4};
-  R.Hotness = 5;
-  R.Args.emplace_back();
-  R.Args.back().Key = "key";
-  R.Args.back().Val = "value";
-  R.Args.emplace_back();
-  R.Args.back().Key = "keydebug";
-  R.Args.back().Val = "valuedebug";
-  R.Args.back().Loc = remarks::RemarkLocation{"argpath", 6, 7};
-  check(remarks::Format::YAML, R,
-        "--- !Missed\n"
-        "Pass:            pass\n"
-        "Name:            name\n"
-        "DebugLoc:        { File: path, Line: 3, Column: 4 }\n"
-        "Function:        func\n"
-        "Hotness:         5\n"
-        "Args:\n"
-        "  - key:             value\n"
-        "  - keydebug:        valuedebug\n"
-        "    DebugLoc:        { File: argpath, Line: 6, Column: 7 }\n"
-        "...\n",
-        StringRef("REMARKS\0"
-                  "\0\0\0\0\0\0\0\0"
-                  "\0\0\0\0\0\0\0\0" EXTERNALFILETESTPATH "\0",
-                  38));
-}
-
-TEST(YAMLRemarks, SerializerRemarkStandalone) {
-  remarks::Remark R;
-  R.RemarkType = remarks::Type::Missed;
-  R.PassName = "pass";
-  R.RemarkName = "name";
-  R.FunctionName = "func";
-  R.Loc = remarks::RemarkLocation{"path", 3, 4};
-  R.Hotness = 5;
-  R.Args.emplace_back();
-  R.Args.back().Key = "key";
-  R.Args.back().Val = "value";
-  R.Args.emplace_back();
-  R.Args.back().Key = "keydebug";
-  R.Args.back().Val = "valuedebug";
-  R.Args.back().Loc = remarks::RemarkLocation{"argpath", 6, 7};
-  checkStandalone(
-      remarks::Format::YAML, R,
-      StringRef("--- !Missed\n"
-                "Pass:            pass\n"
-                "Name:            name\n"
-                "DebugLoc:        { File: path, Line: 3, Column: 4 }\n"
-                "Function:        func\n"
-                "Hotness:         5\n"
-                "Args:\n"
-                "  - key:             value\n"
-                "  - keydebug:        valuedebug\n"
-                "    DebugLoc:        { File: argpath, Line: 6, Column: 7 }\n"
-                "...\n"));
-}
-
-TEST(YAMLRemarks, SerializerRemarkStrTab) {
-  remarks::Remark R;
-  R.RemarkType = remarks::Type::Missed;
-  R.PassName = "pass";
-  R.RemarkName = "name";
-  R.FunctionName = "func";
-  R.Loc = remarks::RemarkLocation{"path", 3, 4};
-  R.Hotness = 5;
-  R.Args.emplace_back();
-  R.Args.back().Key = "key";
-  R.Args.back().Val = "value";
-  R.Args.emplace_back();
-  R.Args.back().Key = "keydebug";
-  R.Args.back().Val = "valuedebug";
-  R.Args.back().Loc = remarks::RemarkLocation{"argpath", 6, 7};
-  check(remarks::Format::YAMLStrTab, R,
-        "--- !Missed\n"
-        "Pass:            0\n"
-        "Name:            1\n"
-        "DebugLoc:        { File: 3, Line: 3, Column: 4 }\n"
-        "Function:        2\n"
-        "Hotness:         5\n"
-        "Args:\n"
-        "  - key:             4\n"
-        "  - keydebug:        5\n"
-        "    DebugLoc:        { File: 6, Line: 6, Column: 7 }\n"
-        "...\n",
-        StringRef("REMARKS\0"
-                  "\0\0\0\0\0\0\0\0"
-                  "\x2d\0\0\0\0\0\0\0"
-                  "pass\0name\0func\0path\0value\0valuedebug\0argpath"
-                  "\0" EXTERNALFILETESTPATH "\0",
-                  83));
-}
-
-TEST(YAMLRemarks, SerializerRemarkParsedStrTab) {
-  StringRef StrTab("pass\0name\0func\0path\0value\0valuedebug\0argpath\0", 45);
-  remarks::Remark R;
-  R.RemarkType = remarks::Type::Missed;
-  R.PassName = "pass";
-  R.RemarkName = "name";
-  R.FunctionName = "func";
-  R.Loc = remarks::RemarkLocation{"path", 3, 4};
-  R.Hotness = 5;
-  R.Args.emplace_back();
-  R.Args.back().Key = "key";
-  R.Args.back().Val = "value";
-  R.Args.emplace_back();
-  R.Args.back().Key = "keydebug";
-  R.Args.back().Val = "valuedebug";
-  R.Args.back().Loc = remarks::RemarkLocation{"argpath", 6, 7};
-  check(remarks::Format::YAMLStrTab, R,
-        "--- !Missed\n"
-        "Pass:            0\n"
-        "Name:            1\n"
-        "DebugLoc:        { File: 3, Line: 3, Column: 4 }\n"
-        "Function:        2\n"
-        "Hotness:         5\n"
-        "Args:\n"
-        "  - key:             4\n"
-        "  - keydebug:        5\n"
-        "    DebugLoc:        { File: 6, Line: 6, Column: 7 }\n"
-        "...\n",
-        StringRef("REMARKS\0"
-                  "\0\0\0\0\0\0\0\0"
-                  "\x2d\0\0\0\0\0\0\0"
-                  "pass\0name\0func\0path\0value\0valuedebug\0argpath"
-                  "\0" EXTERNALFILETESTPATH "\0",
-                  83),
-        remarks::StringTable(remarks::ParsedStringTable(StrTab)));
-}
-
-TEST(YAMLRemarks, SerializerRemarkParsedStrTabStandaloneNoStrTab) {
-  // Check that we don't use the string table even if it was provided.
-  StringRef StrTab("pass\0name\0func\0path\0value\0valuedebug\0argpath\0", 45);
-  remarks::ParsedStringTable ParsedStrTab(StrTab);
-  remarks::StringTable PreFilledStrTab(ParsedStrTab);
-  remarks::Remark R;
-  R.RemarkType = remarks::Type::Missed;
-  R.PassName = "pass";
-  R.RemarkName = "name";
-  R.FunctionName = "func";
-  R.Loc = remarks::RemarkLocation{"path", 3, 4};
-  R.Hotness = 5;
-  R.Args.emplace_back();
-  R.Args.back().Key = "key";
-  R.Args.back().Val = "value";
-  R.Args.emplace_back();
-  R.Args.back().Key = "keydebug";
-  R.Args.back().Val = "valuedebug";
-  R.Args.back().Loc = remarks::RemarkLocation{"argpath", 6, 7};
-  checkStandalone(
-      remarks::Format::YAML, R,
-      StringRef("--- !Missed\n"
-                "Pass:            pass\n"
-                "Name:            name\n"
-                "DebugLoc:        { File: path, Line: 3, Column: 4 }\n"
-                "Function:        func\n"
-                "Hotness:         5\n"
-                "Args:\n"
-                "  - key:             value\n"
-                "  - keydebug:        valuedebug\n"
-                "    DebugLoc:        { File: argpath, Line: 6, Column: 7 }\n"
-                "...\n"),
-      std::move(PreFilledStrTab));
-}
-
-TEST(YAMLRemarks, SerializerRemarkParsedStrTabStandalone) {
-  StringRef StrTab("pass\0name\0func\0path\0value\0valuedebug\0argpath\0", 45);
-  remarks::ParsedStringTable ParsedStrTab(StrTab);
-  remarks::StringTable PreFilledStrTab(ParsedStrTab);
-  remarks::Remark R;
-  R.RemarkType = remarks::Type::Missed;
-  R.PassName = "pass";
-  R.RemarkName = "name";
-  R.FunctionName = "func";
-  R.Loc = remarks::RemarkLocation{"path", 3, 4};
-  R.Hotness = 5;
-  R.Args.emplace_back();
-  R.Args.back().Key = "key";
-  R.Args.back().Val = "value";
-  R.Args.emplace_back();
-  R.Args.back().Key = "keydebug";
-  R.Args.back().Val = "valuedebug";
-  R.Args.back().Loc = remarks::RemarkLocation{"argpath", 6, 7};
-  checkStandalone(
-      remarks::Format::YAMLStrTab, R,
-      StringRef("REMARKS\0"
-                "\0\0\0\0\0\0\0\0"
-                "\x2d\0\0\0\0\0\0\0"
-                "pass\0name\0func\0path\0value\0valuedebug\0argpath\0"
-                "--- !Missed\n"
-                "Pass:            0\n"
-                "Name:            1\n"
-                "DebugLoc:        { File: 3, Line: 3, Column: 4 }\n"
-                "Function:        2\n"
-                "Hotness:         5\n"
-                "Args:\n"
-                "  - key:             4\n"
-                "  - keydebug:        5\n"
-                "    DebugLoc:        { File: 6, Line: 6, Column: 7 }\n"
-                "...\n",
-                315),
-      std::move(PreFilledStrTab));
-}
-
-TEST(YAMLRemarks, SerializerRemarkParsedStrTabStandaloneMultipleRemarks) {
-  StringRef StrTab("pass\0name\0func\0path\0value\0valuedebug\0argpath\0", 45);
-  remarks::ParsedStringTable ParsedStrTab(StrTab);
-  remarks::StringTable PreFilledStrTab(ParsedStrTab);
-  SmallVector<remarks::Remark, 2> Rs;
-  remarks::Remark R;
-  R.RemarkType = remarks::Type::Missed;
-  R.PassName = "pass";
-  R.RemarkName = "name";
-  R.FunctionName = "func";
-  R.Loc = remarks::RemarkLocation{"path", 3, 4};
-  R.Hotness = 5;
-  R.Args.emplace_back();
-  R.Args.back().Key = "key";
-  R.Args.back().Val = "value";
-  R.Args.emplace_back();
-  R.Args.back().Key = "keydebug";
-  R.Args.back().Val = "valuedebug";
-  R.Args.back().Loc = remarks::RemarkLocation{"argpath", 6, 7};
-  Rs.emplace_back(R.clone());
-  Rs.emplace_back(std::move(R));
-  check(remarks::Format::YAMLStrTab, remarks::SerializerMode::Standalone, Rs,
-        StringRef("REMARKS\0"
-                  "\0\0\0\0\0\0\0\0"
-                  "\x2d\0\0\0\0\0\0\0"
-                  "pass\0name\0func\0path\0value\0valuedebug\0argpath\0"
-                  "--- !Missed\n"
-                  "Pass:            0\n"
-                  "Name:            1\n"
-                  "DebugLoc:        { File: 3, Line: 3, Column: 4 }\n"
-                  "Function:        2\n"
-                  "Hotness:         5\n"
-                  "Args:\n"
-                  "  - key:             4\n"
-                  "  - keydebug:        5\n"
-                  "    DebugLoc:        { File: 6, Line: 6, Column: 7 }\n"
-                  "...\n"
-                  "--- !Missed\n"
-                  "Pass:            0\n"
-                  "Name:            1\n"
-                  "DebugLoc:        { File: 3, Line: 3, Column: 4 }\n"
-                  "Function:        2\n"
-                  "Hotness:         5\n"
-                  "Args:\n"
-                  "  - key:             4\n"
-                  "  - keydebug:        5\n"
-                  "    DebugLoc:        { File: 6, Line: 6, Column: 7 }\n"
-                  "...\n",
-                  561),
-        /*ExpectedMeta=*/None, std::move(PreFilledStrTab));
-}
diff --git a/gnu/llvm/llvm/unittests/Support/ARMAttributeParser.cpp b/gnu/llvm/llvm/unittests/Support/ARMAttributeParser.cpp
deleted file mode 100644
index 61dfd6276e3..00000000000
--- a/gnu/llvm/llvm/unittests/Support/ARMAttributeParser.cpp
+++ /dev/null
@@ -1,422 +0,0 @@
-#include "llvm/Support/ARMAttributeParser.h"
-#include "llvm/Support/ARMBuildAttributes.h"
-#include "llvm/Support/ELFAttributes.h"
-#include "gtest/gtest.h"
-#include <string>
-
-using namespace llvm;
-
-struct AttributeSection {
-  unsigned Tag;
-  unsigned Value;
-
-  AttributeSection(unsigned tag, unsigned value) : Tag(tag), Value(value) { }
-
-  void write(raw_ostream &OS) {
-    OS.flush();
-    // length = length + "aeabi\0" + TagFile + ByteSize + Tag + Value;
-    // length = 17 bytes
-
-    OS << 'A' << (uint8_t)17 << (uint8_t)0 << (uint8_t)0 << (uint8_t)0;
-    OS << "aeabi" << '\0';
-    OS << (uint8_t)1 << (uint8_t)7 << (uint8_t)0 << (uint8_t)0 << (uint8_t)0;
-    OS << (uint8_t)Tag << (uint8_t)Value;
-
-  }
-};
-
-bool testBuildAttr(unsigned Tag, unsigned Value,
-                   unsigned ExpectedTag, unsigned ExpectedValue) {
-  std::string buffer;
-  raw_string_ostream OS(buffer);
-  AttributeSection Section(Tag, Value);
-  Section.write(OS);
-  ArrayRef<uint8_t> Bytes(
-    reinterpret_cast<const uint8_t*>(OS.str().c_str()), OS.str().size());
-
-  ARMAttributeParser Parser;
-  cantFail(Parser.parse(Bytes, support::little));
-
-  Optional<unsigned> Attr = Parser.getAttributeValue(ExpectedTag);
-  return Attr.hasValue() && Attr.getValue() == ExpectedValue;
-}
-
-void testParseError(ArrayRef<uint8_t> bytes, const char *msg) {
-  ARMAttributeParser parser;
-  Error e = parser.parse(bytes, support::little);
-  EXPECT_STREQ(toString(std::move(e)).c_str(), msg);
-}
-
-bool testTagString(unsigned Tag, const char *name) {
-  return ELFAttrs::attrTypeAsString(Tag, ARMBuildAttrs::getARMAttributeTags())
-             .str() == name;
-}
-
-TEST(ARMAttributeParser, UnknownCPU_arch) {
-  static const uint8_t bytes[] = {'A', 15, 0, 0, 0, 'a', 'e', 'a', 'b',
-                                  'i', 0,  1, 7, 0, 0,   0,   6,   22};
-  testParseError(bytes, "unknown CPU_arch value: 22");
-}
-
-TEST(CPUArchBuildAttr, testBuildAttr) {
-  EXPECT_TRUE(testTagString(6, "Tag_CPU_arch"));
-
-  EXPECT_TRUE(testBuildAttr(6, 0, ARMBuildAttrs::CPU_arch,
-                            ARMBuildAttrs::Pre_v4));
-  EXPECT_TRUE(testBuildAttr(6, 1, ARMBuildAttrs::CPU_arch,
-                            ARMBuildAttrs::v4));
-  EXPECT_TRUE(testBuildAttr(6, 2, ARMBuildAttrs::CPU_arch,
-                               ARMBuildAttrs::v4T));
-  EXPECT_TRUE(testBuildAttr(6, 3, ARMBuildAttrs::CPU_arch,
-                               ARMBuildAttrs::v5T));
-  EXPECT_TRUE(testBuildAttr(6, 4, ARMBuildAttrs::CPU_arch,
-                               ARMBuildAttrs::v5TE));
-  EXPECT_TRUE(testBuildAttr(6, 5, ARMBuildAttrs::CPU_arch,
-                               ARMBuildAttrs::v5TEJ));
-  EXPECT_TRUE(testBuildAttr(6, 6, ARMBuildAttrs::CPU_arch,
-                               ARMBuildAttrs::v6));
-  EXPECT_TRUE(testBuildAttr(6, 7, ARMBuildAttrs::CPU_arch,
-                               ARMBuildAttrs::v6KZ));
-  EXPECT_TRUE(testBuildAttr(6, 8, ARMBuildAttrs::CPU_arch,
-                               ARMBuildAttrs::v6T2));
-  EXPECT_TRUE(testBuildAttr(6, 9, ARMBuildAttrs::CPU_arch,
-                               ARMBuildAttrs::v6K));
-  EXPECT_TRUE(testBuildAttr(6, 10, ARMBuildAttrs::CPU_arch,
-                               ARMBuildAttrs::v7));
-  EXPECT_TRUE(testBuildAttr(6, 11, ARMBuildAttrs::CPU_arch,
-                               ARMBuildAttrs::v6_M));
-  EXPECT_TRUE(testBuildAttr(6, 12, ARMBuildAttrs::CPU_arch,
-                               ARMBuildAttrs::v6S_M));
-  EXPECT_TRUE(testBuildAttr(6, 13, ARMBuildAttrs::CPU_arch,
-                               ARMBuildAttrs::v7E_M));
-  EXPECT_TRUE(testBuildAttr(6, 14, ARMBuildAttrs::CPU_arch,
-                               ARMBuildAttrs::v8_A));
-  EXPECT_TRUE(testBuildAttr(6, 15, ARMBuildAttrs::CPU_arch,
-                               ARMBuildAttrs::v8_R));
-  EXPECT_TRUE(testBuildAttr(6, 16, ARMBuildAttrs::CPU_arch,
-                               ARMBuildAttrs::v8_M_Base));
-  EXPECT_TRUE(testBuildAttr(6, 17, ARMBuildAttrs::CPU_arch,
-                               ARMBuildAttrs::v8_M_Main));
-  EXPECT_TRUE(testBuildAttr(6, 21, ARMBuildAttrs::CPU_arch,
-                               ARMBuildAttrs::v8_1_M_Main));
-}
-
-TEST(CPUArchProfileBuildAttr, testBuildAttr) {
-  EXPECT_TRUE(testTagString(7, "Tag_CPU_arch_profile"));
-  EXPECT_TRUE(testBuildAttr(7, 'A', ARMBuildAttrs::CPU_arch_profile,
-                               ARMBuildAttrs::ApplicationProfile));
-  EXPECT_TRUE(testBuildAttr(7, 'R', ARMBuildAttrs::CPU_arch_profile,
-                               ARMBuildAttrs::RealTimeProfile));
-  EXPECT_TRUE(testBuildAttr(7, 'M', ARMBuildAttrs::CPU_arch_profile,
-                               ARMBuildAttrs::MicroControllerProfile));
-  EXPECT_TRUE(testBuildAttr(7, 'S', ARMBuildAttrs::CPU_arch_profile,
-                               ARMBuildAttrs::SystemProfile));
-}
-
-TEST(ARMISABuildAttr, testBuildAttr) {
-  EXPECT_TRUE(testTagString(8, "Tag_ARM_ISA_use"));
-  EXPECT_TRUE(testBuildAttr(8, 0, ARMBuildAttrs::ARM_ISA_use,
-                               ARMBuildAttrs::Not_Allowed));
-  EXPECT_TRUE(testBuildAttr(8, 1, ARMBuildAttrs::ARM_ISA_use,
-                               ARMBuildAttrs::Allowed));
-}
-
-TEST(ThumbISABuildAttr, testBuildAttr) {
-  EXPECT_TRUE(testTagString(9, "Tag_THUMB_ISA_use"));
-  EXPECT_TRUE(testBuildAttr(9, 0, ARMBuildAttrs::THUMB_ISA_use,
-                               ARMBuildAttrs::Not_Allowed));
-  EXPECT_TRUE(testBuildAttr(9, 1, ARMBuildAttrs::THUMB_ISA_use,
-                               ARMBuildAttrs::Allowed));
-  EXPECT_TRUE(testBuildAttr(9, 2, ARMBuildAttrs::THUMB_ISA_use,
-                               ARMBuildAttrs::AllowThumb32));
-  EXPECT_TRUE(testBuildAttr(9, 3, ARMBuildAttrs::THUMB_ISA_use,
-                               ARMBuildAttrs::AllowThumbDerived));
-}
-
-TEST(FPArchBuildAttr, testBuildAttr) {
-  EXPECT_TRUE(testTagString(10, "Tag_FP_arch"));
-  EXPECT_TRUE(testBuildAttr(10, 0, ARMBuildAttrs::FP_arch,
-                               ARMBuildAttrs::Not_Allowed));
-  EXPECT_TRUE(testBuildAttr(10, 1, ARMBuildAttrs::FP_arch,
-                               ARMBuildAttrs::Allowed));
-  EXPECT_TRUE(testBuildAttr(10, 2, ARMBuildAttrs::FP_arch,
-                               ARMBuildAttrs::AllowFPv2));
-  EXPECT_TRUE(testBuildAttr(10, 3, ARMBuildAttrs::FP_arch,
-                               ARMBuildAttrs::AllowFPv3A));
-  EXPECT_TRUE(testBuildAttr(10, 4, ARMBuildAttrs::FP_arch,
-                               ARMBuildAttrs::AllowFPv3B));
-  EXPECT_TRUE(testBuildAttr(10, 5, ARMBuildAttrs::FP_arch,
-                               ARMBuildAttrs::AllowFPv4A));
-  EXPECT_TRUE(testBuildAttr(10, 6, ARMBuildAttrs::FP_arch,
-                               ARMBuildAttrs::AllowFPv4B));
-  EXPECT_TRUE(testBuildAttr(10, 7, ARMBuildAttrs::FP_arch,
-                               ARMBuildAttrs::AllowFPARMv8A));
-  EXPECT_TRUE(testBuildAttr(10, 8, ARMBuildAttrs::FP_arch,
-                               ARMBuildAttrs::AllowFPARMv8B));
-}
-
-TEST(WMMXBuildAttr, testBuildAttr) {
-  EXPECT_TRUE(testTagString(11, "Tag_WMMX_arch"));
-  EXPECT_TRUE(testBuildAttr(11, 0, ARMBuildAttrs::WMMX_arch,
-                            ARMBuildAttrs::Not_Allowed));
-  EXPECT_TRUE(testBuildAttr(11, 1, ARMBuildAttrs::WMMX_arch,
-                            ARMBuildAttrs::AllowWMMXv1));
-  EXPECT_TRUE(testBuildAttr(11, 2, ARMBuildAttrs::WMMX_arch,
-                            ARMBuildAttrs::AllowWMMXv2));
-}
-
-TEST(SIMDBuildAttr, testBuildAttr) {
-  EXPECT_TRUE(testTagString(12, "Tag_Advanced_SIMD_arch"));
-  EXPECT_TRUE(testBuildAttr(12, 0, ARMBuildAttrs::Advanced_SIMD_arch,
-                            ARMBuildAttrs::Not_Allowed));
-  EXPECT_TRUE(testBuildAttr(12, 1, ARMBuildAttrs::Advanced_SIMD_arch,
-                            ARMBuildAttrs::AllowNeon));
-  EXPECT_TRUE(testBuildAttr(12, 2, ARMBuildAttrs::Advanced_SIMD_arch,
-                            ARMBuildAttrs::AllowNeon2));
-  EXPECT_TRUE(testBuildAttr(12, 3, ARMBuildAttrs::Advanced_SIMD_arch,
-                            ARMBuildAttrs::AllowNeonARMv8));
-  EXPECT_TRUE(testBuildAttr(12, 4, ARMBuildAttrs::Advanced_SIMD_arch,
-                            ARMBuildAttrs::AllowNeonARMv8_1a));
-}
-
-TEST(FPHPBuildAttr, testBuildAttr) {
-  EXPECT_TRUE(testTagString(36, "Tag_FP_HP_extension"));
-  EXPECT_TRUE(testBuildAttr(36, 0, ARMBuildAttrs::FP_HP_extension,
-                            ARMBuildAttrs::Not_Allowed));
-  EXPECT_TRUE(testBuildAttr(36, 1, ARMBuildAttrs::FP_HP_extension,
-                            ARMBuildAttrs::AllowHPFP));
-}
-
-TEST(MVEBuildAttr, testBuildAttr) {
-  EXPECT_TRUE(testTagString(48, "Tag_MVE_arch"));
-  EXPECT_TRUE(testBuildAttr(48, 0, ARMBuildAttrs::MVE_arch,
-                            ARMBuildAttrs::Not_Allowed));
-  EXPECT_TRUE(testBuildAttr(48, 1, ARMBuildAttrs::MVE_arch,
-                            ARMBuildAttrs::AllowMVEInteger));
-  EXPECT_TRUE(testBuildAttr(48, 2, ARMBuildAttrs::MVE_arch,
-                            ARMBuildAttrs::AllowMVEIntegerAndFloat));
-}
-
-TEST(CPUAlignBuildAttr, testBuildAttr) {
-  EXPECT_TRUE(testTagString(34, "Tag_CPU_unaligned_access"));
-  EXPECT_TRUE(testBuildAttr(34, 0, ARMBuildAttrs::CPU_unaligned_access,
-                            ARMBuildAttrs::Not_Allowed));
-  EXPECT_TRUE(testBuildAttr(34, 1, ARMBuildAttrs::CPU_unaligned_access,
-                            ARMBuildAttrs::Allowed));
-}
-
-TEST(T2EEBuildAttr, testBuildAttr) {
-  EXPECT_TRUE(testTagString(66, "Tag_T2EE_use"));
-  EXPECT_TRUE(testBuildAttr(66, 0, ARMBuildAttrs::T2EE_use,
-                            ARMBuildAttrs::Not_Allowed));
-  EXPECT_TRUE(testBuildAttr(66, 1, ARMBuildAttrs::T2EE_use,
-                            ARMBuildAttrs::Allowed));
-}
-
-TEST(VirtualizationBuildAttr, testBuildAttr) {
-  EXPECT_TRUE(testTagString(68, "Tag_Virtualization_use"));
-  EXPECT_TRUE(testBuildAttr(68, 0, ARMBuildAttrs::Virtualization_use,
-                            ARMBuildAttrs::Not_Allowed));
-  EXPECT_TRUE(testBuildAttr(68, 1, ARMBuildAttrs::Virtualization_use,
-                            ARMBuildAttrs::AllowTZ));
-  EXPECT_TRUE(testBuildAttr(68, 2, ARMBuildAttrs::Virtualization_use,
-                            ARMBuildAttrs::AllowVirtualization));
-  EXPECT_TRUE(testBuildAttr(68, 3, ARMBuildAttrs::Virtualization_use,
-                            ARMBuildAttrs::AllowTZVirtualization));
-}
-
-TEST(MPBuildAttr, testBuildAttr) {
-  EXPECT_TRUE(testTagString(42, "Tag_MPextension_use"));
-  EXPECT_TRUE(testBuildAttr(42, 0, ARMBuildAttrs::MPextension_use,
-                            ARMBuildAttrs::Not_Allowed));
-  EXPECT_TRUE(testBuildAttr(42, 1, ARMBuildAttrs::MPextension_use,
-                            ARMBuildAttrs::AllowMP));
-}
-
-TEST(DivBuildAttr, testBuildAttr) {
-  EXPECT_TRUE(testTagString(44, "Tag_DIV_use"));
-  EXPECT_TRUE(testBuildAttr(44, 0, ARMBuildAttrs::DIV_use,
-                            ARMBuildAttrs::AllowDIVIfExists));
-  EXPECT_TRUE(testBuildAttr(44, 1, ARMBuildAttrs::DIV_use,
-                            ARMBuildAttrs::DisallowDIV));
-  EXPECT_TRUE(testBuildAttr(44, 2, ARMBuildAttrs::DIV_use,
-                            ARMBuildAttrs::AllowDIVExt));
-}
-
-TEST(PCS_ConfigBuildAttr, testBuildAttr) {
-  EXPECT_TRUE(testTagString(13, "Tag_PCS_config"));
-  EXPECT_TRUE(testBuildAttr(13, 0, ARMBuildAttrs::PCS_config, 0));
-  EXPECT_TRUE(testBuildAttr(13, 1, ARMBuildAttrs::PCS_config, 1));
-  EXPECT_TRUE(testBuildAttr(13, 2, ARMBuildAttrs::PCS_config, 2));
-  EXPECT_TRUE(testBuildAttr(13, 3, ARMBuildAttrs::PCS_config, 3));
-  EXPECT_TRUE(testBuildAttr(13, 4, ARMBuildAttrs::PCS_config, 4));
-  EXPECT_TRUE(testBuildAttr(13, 5, ARMBuildAttrs::PCS_config, 5));
-  EXPECT_TRUE(testBuildAttr(13, 6, ARMBuildAttrs::PCS_config, 6));
-  EXPECT_TRUE(testBuildAttr(13, 7, ARMBuildAttrs::PCS_config, 7));
-}
-
-TEST(PCS_R9BuildAttr, testBuildAttr) {
-  EXPECT_TRUE(testTagString(14, "Tag_ABI_PCS_R9_use"));
-  EXPECT_TRUE(testBuildAttr(14, 0, ARMBuildAttrs::ABI_PCS_R9_use,
-                            ARMBuildAttrs::R9IsGPR));
-  EXPECT_TRUE(testBuildAttr(14, 1, ARMBuildAttrs::ABI_PCS_R9_use,
-                            ARMBuildAttrs::R9IsSB));
-  EXPECT_TRUE(testBuildAttr(14, 2, ARMBuildAttrs::ABI_PCS_R9_use,
-                            ARMBuildAttrs::R9IsTLSPointer));
-  EXPECT_TRUE(testBuildAttr(14, 3, ARMBuildAttrs::ABI_PCS_R9_use,
-                            ARMBuildAttrs::R9Reserved));
-}
-
-TEST(PCS_RWBuildAttr, testBuildAttr) {
-  EXPECT_TRUE(testTagString(15, "Tag_ABI_PCS_RW_data"));
-  EXPECT_TRUE(testBuildAttr(15, 0, ARMBuildAttrs::ABI_PCS_RW_data,
-                            ARMBuildAttrs::Not_Allowed));
-  EXPECT_TRUE(testBuildAttr(15, 1, ARMBuildAttrs::ABI_PCS_RW_data,
-                            ARMBuildAttrs::AddressRWPCRel));
-  EXPECT_TRUE(testBuildAttr(15, 2, ARMBuildAttrs::ABI_PCS_RW_data,
-                            ARMBuildAttrs::AddressRWSBRel));
-  EXPECT_TRUE(testBuildAttr(15, 3, ARMBuildAttrs::ABI_PCS_RW_data,
-                            ARMBuildAttrs::AddressRWNone));
-}
-
-TEST(PCS_ROBuildAttr, testBuildAttr) {
-  EXPECT_TRUE(testTagString(16, "Tag_ABI_PCS_RO_data"));
-  EXPECT_TRUE(testBuildAttr(16, 0, ARMBuildAttrs::ABI_PCS_RO_data,
-                            ARMBuildAttrs::Not_Allowed));
-  EXPECT_TRUE(testBuildAttr(16, 1, ARMBuildAttrs::ABI_PCS_RO_data,
-                            ARMBuildAttrs::AddressROPCRel));
-  EXPECT_TRUE(testBuildAttr(16, 2, ARMBuildAttrs::ABI_PCS_RO_data,
-                            ARMBuildAttrs::AddressRONone));
-}
-
-TEST(PCS_GOTBuildAttr, testBuildAttr) {
-  EXPECT_TRUE(testTagString(17, "Tag_ABI_PCS_GOT_use"));
-  EXPECT_TRUE(testBuildAttr(17, 0, ARMBuildAttrs::ABI_PCS_GOT_use,
-                            ARMBuildAttrs::Not_Allowed));
-  EXPECT_TRUE(testBuildAttr(17, 1, ARMBuildAttrs::ABI_PCS_GOT_use,
-                            ARMBuildAttrs::AddressDirect));
-  EXPECT_TRUE(testBuildAttr(17, 2, ARMBuildAttrs::ABI_PCS_GOT_use,
-                            ARMBuildAttrs::AddressGOT));
-}
-
-TEST(PCS_WCharBuildAttr, testBuildAttr) {
-  EXPECT_TRUE(testTagString(18, "Tag_ABI_PCS_wchar_t"));
-  EXPECT_TRUE(testBuildAttr(18, 0, ARMBuildAttrs::ABI_PCS_wchar_t,
-                            ARMBuildAttrs::WCharProhibited));
-  EXPECT_TRUE(testBuildAttr(18, 2, ARMBuildAttrs::ABI_PCS_wchar_t,
-                            ARMBuildAttrs::WCharWidth2Bytes));
-  EXPECT_TRUE(testBuildAttr(18, 4, ARMBuildAttrs::ABI_PCS_wchar_t,
-                            ARMBuildAttrs::WCharWidth4Bytes));
-}
-
-TEST(EnumSizeBuildAttr, testBuildAttr) {
-  EXPECT_TRUE(testTagString(26, "Tag_ABI_enum_size"));
-  EXPECT_TRUE(testBuildAttr(26, 0, ARMBuildAttrs::ABI_enum_size,
-                            ARMBuildAttrs::EnumProhibited));
-  EXPECT_TRUE(testBuildAttr(26, 1, ARMBuildAttrs::ABI_enum_size,
-                            ARMBuildAttrs::EnumSmallest));
-  EXPECT_TRUE(testBuildAttr(26, 2, ARMBuildAttrs::ABI_enum_size,
-                            ARMBuildAttrs::Enum32Bit));
-  EXPECT_TRUE(testBuildAttr(26, 3, ARMBuildAttrs::ABI_enum_size,
-                            ARMBuildAttrs::Enum32BitABI));
-}
-
-TEST(AlignNeededBuildAttr, testBuildAttr) {
-  EXPECT_TRUE(testTagString(24, "Tag_ABI_align_needed"));
-  EXPECT_TRUE(testBuildAttr(24, 0, ARMBuildAttrs::ABI_align_needed,
-                            ARMBuildAttrs::Not_Allowed));
-  EXPECT_TRUE(testBuildAttr(24, 1, ARMBuildAttrs::ABI_align_needed,
-                            ARMBuildAttrs::Align8Byte));
-  EXPECT_TRUE(testBuildAttr(24, 2, ARMBuildAttrs::ABI_align_needed,
-                            ARMBuildAttrs::Align4Byte));
-  EXPECT_TRUE(testBuildAttr(24, 3, ARMBuildAttrs::ABI_align_needed,
-                            ARMBuildAttrs::AlignReserved));
-}
-
-TEST(AlignPreservedBuildAttr, testBuildAttr) {
-  EXPECT_TRUE(testTagString(25, "Tag_ABI_align_preserved"));
-  EXPECT_TRUE(testBuildAttr(25, 0, ARMBuildAttrs::ABI_align_preserved,
-                            ARMBuildAttrs::AlignNotPreserved));
-  EXPECT_TRUE(testBuildAttr(25, 1, ARMBuildAttrs::ABI_align_preserved,
-                            ARMBuildAttrs::AlignPreserve8Byte));
-  EXPECT_TRUE(testBuildAttr(25, 2, ARMBuildAttrs::ABI_align_preserved,
-                            ARMBuildAttrs::AlignPreserveAll));
-  EXPECT_TRUE(testBuildAttr(25, 3, ARMBuildAttrs::ABI_align_preserved,
-                            ARMBuildAttrs::AlignReserved));
-}
-
-TEST(FPRoundingBuildAttr, testBuildAttr) {
-  EXPECT_TRUE(testTagString(19, "Tag_ABI_FP_rounding"));
-  EXPECT_TRUE(testBuildAttr(19, 0, ARMBuildAttrs::ABI_FP_rounding, 0));
-  EXPECT_TRUE(testBuildAttr(19, 1, ARMBuildAttrs::ABI_FP_rounding, 1));
-}
-
-TEST(FPDenormalBuildAttr, testBuildAttr) {
-  EXPECT_TRUE(testTagString(20, "Tag_ABI_FP_denormal"));
-  EXPECT_TRUE(testBuildAttr(20, 0, ARMBuildAttrs::ABI_FP_denormal,
-                            ARMBuildAttrs::PositiveZero));
-  EXPECT_TRUE(testBuildAttr(20, 1, ARMBuildAttrs::ABI_FP_denormal,
-                            ARMBuildAttrs::IEEEDenormals));
-  EXPECT_TRUE(testBuildAttr(20, 2, ARMBuildAttrs::ABI_FP_denormal,
-                            ARMBuildAttrs::PreserveFPSign));
-}
-
-TEST(FPExceptionsBuildAttr, testBuildAttr) {
-  EXPECT_TRUE(testTagString(21, "Tag_ABI_FP_exceptions"));
-  EXPECT_TRUE(testBuildAttr(21, 0, ARMBuildAttrs::ABI_FP_exceptions, 0));
-  EXPECT_TRUE(testBuildAttr(21, 1, ARMBuildAttrs::ABI_FP_exceptions, 1));
-}
-
-TEST(FPUserExceptionsBuildAttr, testBuildAttr) {
-  EXPECT_TRUE(testTagString(22, "Tag_ABI_FP_user_exceptions"));
-  EXPECT_TRUE(testBuildAttr(22, 0, ARMBuildAttrs::ABI_FP_user_exceptions, 0));
-  EXPECT_TRUE(testBuildAttr(22, 1, ARMBuildAttrs::ABI_FP_user_exceptions, 1));
-}
-
-TEST(FPNumberModelBuildAttr, testBuildAttr) {
-  EXPECT_TRUE(testTagString(23, "Tag_ABI_FP_number_model"));
-  EXPECT_TRUE(testBuildAttr(23, 0, ARMBuildAttrs::ABI_FP_number_model,
-                            ARMBuildAttrs::Not_Allowed));
-  EXPECT_TRUE(testBuildAttr(23, 1, ARMBuildAttrs::ABI_FP_number_model,
-                            ARMBuildAttrs::AllowIEEENormal));
-  EXPECT_TRUE(testBuildAttr(23, 2, ARMBuildAttrs::ABI_FP_number_model,
-                            ARMBuildAttrs::AllowRTABI));
-  EXPECT_TRUE(testBuildAttr(23, 3, ARMBuildAttrs::ABI_FP_number_model,
-                            ARMBuildAttrs::AllowIEEE754));
-}
-
-TEST(FP16BuildAttr, testBuildAttr) {
-  EXPECT_TRUE(testTagString(38, "Tag_ABI_FP_16bit_format"));
-  EXPECT_TRUE(testBuildAttr(38, 0, ARMBuildAttrs::ABI_FP_16bit_format,
-                            ARMBuildAttrs::Not_Allowed));
-  EXPECT_TRUE(testBuildAttr(38, 1, ARMBuildAttrs::ABI_FP_16bit_format,
-                            ARMBuildAttrs::FP16FormatIEEE));
-  EXPECT_TRUE(testBuildAttr(38, 2, ARMBuildAttrs::ABI_FP_16bit_format,
-                            ARMBuildAttrs::FP16VFP3));
-}
-
-TEST(HardFPBuildAttr, testBuildAttr) {
-  EXPECT_TRUE(testTagString(27, "Tag_ABI_HardFP_use"));
-  EXPECT_TRUE(testBuildAttr(27, 0, ARMBuildAttrs::ABI_HardFP_use,
-                            ARMBuildAttrs::HardFPImplied));
-  EXPECT_TRUE(testBuildAttr(27, 1, ARMBuildAttrs::ABI_HardFP_use,
-                            ARMBuildAttrs::HardFPSinglePrecision));
-  EXPECT_TRUE(testBuildAttr(27, 2, ARMBuildAttrs::ABI_HardFP_use, 2));
-}
-
-TEST(VFPArgsBuildAttr, testBuildAttr) {
-  EXPECT_TRUE(testTagString(28, "Tag_ABI_VFP_args"));
-  EXPECT_TRUE(testBuildAttr(28, 0, ARMBuildAttrs::ABI_VFP_args,
-                            ARMBuildAttrs::BaseAAPCS));
-  EXPECT_TRUE(testBuildAttr(28, 1, ARMBuildAttrs::ABI_VFP_args,
-                            ARMBuildAttrs::HardFPAAPCS));
-  EXPECT_TRUE(testBuildAttr(28, 2, ARMBuildAttrs::ABI_VFP_args, 2));
-  EXPECT_TRUE(testBuildAttr(28, 3, ARMBuildAttrs::ABI_VFP_args, 3));
-}
-
-TEST(WMMXArgsBuildAttr, testBuildAttr) {
-  EXPECT_TRUE(testTagString(29, "Tag_ABI_WMMX_args"));
-  EXPECT_TRUE(testBuildAttr(29, 0, ARMBuildAttrs::ABI_WMMX_args, 0));
-  EXPECT_TRUE(testBuildAttr(29, 1, ARMBuildAttrs::ABI_WMMX_args, 1));
-  EXPECT_TRUE(testBuildAttr(29, 2, ARMBuildAttrs::ABI_WMMX_args, 2));
-}
diff --git a/gnu/llvm/llvm/unittests/Support/AlignOfTest.cpp b/gnu/llvm/llvm/unittests/Support/AlignOfTest.cpp
deleted file mode 100644
index f84895c1860..00000000000
--- a/gnu/llvm/llvm/unittests/Support/AlignOfTest.cpp
+++ /dev/null
@@ -1,244 +0,0 @@
-//=== - llvm/unittest/Support/AlignOfTest.cpp - Alignment utility tests ---===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifdef _MSC_VER
-// Disable warnings about alignment-based structure padding.
-// This must be above the includes to suppress warnings in included templates.
-#pragma warning(disable:4324)
-#endif
-
-#include "llvm/Support/AlignOf.h"
-#include "llvm/Support/Compiler.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-// Disable warnings about questionable type definitions.
-// We're testing that even questionable types work with the alignment utilities.
-#ifdef _MSC_VER
-#pragma warning(disable:4584)
-#endif
-
-// Suppress direct base '{anonymous}::S1' inaccessible in '{anonymous}::D9'
-// due to ambiguity warning.
-#ifdef __clang__
-#pragma clang diagnostic ignored "-Wunknown-pragmas"
-#pragma clang diagnostic ignored "-Winaccessible-base"
-#elif ((__GNUC__ * 100) + __GNUC_MINOR__) >= 402
-// Pragma based warning suppression was introduced in GGC 4.2.  Additionally
-// this warning is "enabled by default".  The warning still appears if -Wall is
-// suppressed.  Apparently GCC suppresses it when -w is specifed, which is odd.
-#pragma GCC diagnostic warning "-w"
-#endif
-
-// Define some fixed alignment types to use in these tests.
-struct alignas(1) A1 {};
-struct alignas(2) A2 {};
-struct alignas(4) A4 {};
-struct alignas(8) A8 {};
-
-struct S1 {};
-struct S2 { char a; };
-struct S3 { int x; };
-struct S4 { double y; };
-struct S5 { A1 a1; A2 a2; A4 a4; A8 a8; };
-struct S6 { double f(); };
-struct D1 : S1 {};
-struct D2 : S6 { float g(); };
-struct D3 : S2 {};
-struct D4 : S2 { int x; };
-struct D5 : S3 { char c; };
-struct D6 : S2, S3 {};
-struct D7 : S1, S3 {};
-struct D8 : S1, D4, D5 { double x[2]; };
-struct D9 : S1, D1 { S1 s1; };
-struct V1 { virtual ~V1(); };
-struct V2 { int x; virtual ~V2(); };
-struct V3 : V1 {
-  ~V3() override;
-};
-struct V4 : virtual V2 { int y;
-  ~V4() override;
-};
-struct V5 : V4, V3 { double z;
-  ~V5() override;
-};
-struct V6 : S1 { virtual ~V6(); };
-struct V7 : virtual V2, virtual V6 {
-  ~V7() override;
-};
-struct V8 : V5, virtual V6, V7 { double zz;
-  ~V8() override;
-};
-
-double S6::f() { return 0.0; }
-float D2::g() { return 0.0f; }
-V1::~V1() {}
-V2::~V2() {}
-V3::~V3() {}
-V4::~V4() {}
-V5::~V5() {}
-V6::~V6() {}
-V7::~V7() {}
-V8::~V8() {}
-
-template <typename M> struct T { M m; };
-
-TEST(AlignOfTest, BasicAlignedArray) {
-  EXPECT_LE(1u, alignof(AlignedCharArrayUnion<A1>));
-  EXPECT_LE(2u, alignof(AlignedCharArrayUnion<A2>));
-  EXPECT_LE(4u, alignof(AlignedCharArrayUnion<A4>));
-  EXPECT_LE(8u, alignof(AlignedCharArrayUnion<A8>));
-
-  EXPECT_LE(1u, sizeof(AlignedCharArrayUnion<A1>));
-  EXPECT_LE(2u, sizeof(AlignedCharArrayUnion<A2>));
-  EXPECT_LE(4u, sizeof(AlignedCharArrayUnion<A4>));
-  EXPECT_LE(8u, sizeof(AlignedCharArrayUnion<A8>));
-
-  EXPECT_EQ(1u, (alignof(AlignedCharArrayUnion<A1>)));
-  EXPECT_EQ(2u, (alignof(AlignedCharArrayUnion<A1, A2>)));
-  EXPECT_EQ(4u, (alignof(AlignedCharArrayUnion<A1, A2, A4>)));
-  EXPECT_EQ(8u, (alignof(AlignedCharArrayUnion<A1, A2, A4, A8>)));
-
-  EXPECT_EQ(1u, sizeof(AlignedCharArrayUnion<A1>));
-  EXPECT_EQ(2u, sizeof(AlignedCharArrayUnion<A1, A2>));
-  EXPECT_EQ(4u, sizeof(AlignedCharArrayUnion<A1, A2, A4>));
-  EXPECT_EQ(8u, sizeof(AlignedCharArrayUnion<A1, A2, A4, A8>));
-
-  EXPECT_EQ(1u, (alignof(AlignedCharArrayUnion<A1[1]>)));
-  EXPECT_EQ(2u, (alignof(AlignedCharArrayUnion<A1[2], A2[1]>)));
-  EXPECT_EQ(4u, (alignof(AlignedCharArrayUnion<A1[42], A2[55], A4[13]>)));
-  EXPECT_EQ(8u, (alignof(AlignedCharArrayUnion<A1[2], A2[1], A4, A8>)));
-
-  EXPECT_EQ(1u,  sizeof(AlignedCharArrayUnion<A1[1]>));
-  EXPECT_EQ(2u,  sizeof(AlignedCharArrayUnion<A1[2], A2[1]>));
-  EXPECT_EQ(4u,  sizeof(AlignedCharArrayUnion<A1[3], A2[2], A4>));
-  EXPECT_EQ(16u, sizeof(AlignedCharArrayUnion<A1, A2[3],
-                                              A4[3], A8>));
-
-  // For other tests we simply assert that the alignment of the union mathes
-  // that of the fundamental type and hope that we have any weird type
-  // productions that would trigger bugs.
-  EXPECT_EQ(alignof(T<char>), alignof(AlignedCharArrayUnion<char>));
-  EXPECT_EQ(alignof(T<short>), alignof(AlignedCharArrayUnion<short>));
-  EXPECT_EQ(alignof(T<int>), alignof(AlignedCharArrayUnion<int>));
-  EXPECT_EQ(alignof(T<long>), alignof(AlignedCharArrayUnion<long>));
-  EXPECT_EQ(alignof(T<long long>), alignof(AlignedCharArrayUnion<long long>));
-  EXPECT_EQ(alignof(T<float>), alignof(AlignedCharArrayUnion<float>));
-#ifdef _AIX
-  EXPECT_LE(alignof(T<double>), alignof(AlignedCharArrayUnion<double>));
-  EXPECT_LE(alignof(T<long double>),
-            alignof(AlignedCharArrayUnion<long double>));
-  EXPECT_LE(alignof(S4), alignof(AlignedCharArrayUnion<S4>));
-#else
-  EXPECT_EQ(alignof(T<double>), alignof(AlignedCharArrayUnion<double>));
-  EXPECT_EQ(alignof(T<long double>),
-            alignof(AlignedCharArrayUnion<long double>));
-  EXPECT_EQ(alignof(S4), alignof(AlignedCharArrayUnion<S4>));
-#endif
-  EXPECT_EQ(alignof(T<void *>), alignof(AlignedCharArrayUnion<void *>));
-  EXPECT_EQ(alignof(T<int *>), alignof(AlignedCharArrayUnion<int *>));
-  EXPECT_EQ(alignof(T<double (*)(double)>),
-            alignof(AlignedCharArrayUnion<double (*)(double)>));
-  EXPECT_EQ(alignof(T<double (S6::*)()>),
-            alignof(AlignedCharArrayUnion<double (S6::*)()>));
-  EXPECT_EQ(alignof(S1), alignof(AlignedCharArrayUnion<S1>));
-  EXPECT_EQ(alignof(S2), alignof(AlignedCharArrayUnion<S2>));
-  EXPECT_EQ(alignof(S3), alignof(AlignedCharArrayUnion<S3>));
-  EXPECT_EQ(alignof(S5), alignof(AlignedCharArrayUnion<S5>));
-  EXPECT_EQ(alignof(S6), alignof(AlignedCharArrayUnion<S6>));
-  EXPECT_EQ(alignof(D1), alignof(AlignedCharArrayUnion<D1>));
-  EXPECT_EQ(alignof(D2), alignof(AlignedCharArrayUnion<D2>));
-  EXPECT_EQ(alignof(D3), alignof(AlignedCharArrayUnion<D3>));
-  EXPECT_EQ(alignof(D4), alignof(AlignedCharArrayUnion<D4>));
-  EXPECT_EQ(alignof(D5), alignof(AlignedCharArrayUnion<D5>));
-  EXPECT_EQ(alignof(D6), alignof(AlignedCharArrayUnion<D6>));
-  EXPECT_EQ(alignof(D7), alignof(AlignedCharArrayUnion<D7>));
-  EXPECT_EQ(alignof(D8), alignof(AlignedCharArrayUnion<D8>));
-  EXPECT_EQ(alignof(D9), alignof(AlignedCharArrayUnion<D9>));
-  EXPECT_EQ(alignof(V1), alignof(AlignedCharArrayUnion<V1>));
-  EXPECT_EQ(alignof(V2), alignof(AlignedCharArrayUnion<V2>));
-  EXPECT_EQ(alignof(V3), alignof(AlignedCharArrayUnion<V3>));
-  EXPECT_EQ(alignof(V4), alignof(AlignedCharArrayUnion<V4>));
-  EXPECT_EQ(alignof(V5), alignof(AlignedCharArrayUnion<V5>));
-  EXPECT_EQ(alignof(V6), alignof(AlignedCharArrayUnion<V6>));
-  EXPECT_EQ(alignof(V7), alignof(AlignedCharArrayUnion<V7>));
-
-  // Some versions of MSVC get this wrong somewhat disturbingly. The failure
-  // appears to be benign: alignof(V8) produces a preposterous value: 12
-#ifndef _MSC_VER
-  EXPECT_EQ(alignof(V8), alignof(AlignedCharArrayUnion<V8>));
-#endif
-
-  EXPECT_EQ(sizeof(char), sizeof(AlignedCharArrayUnion<char>));
-  EXPECT_EQ(sizeof(char[1]), sizeof(AlignedCharArrayUnion<char[1]>));
-  EXPECT_EQ(sizeof(char[2]), sizeof(AlignedCharArrayUnion<char[2]>));
-  EXPECT_EQ(sizeof(char[3]), sizeof(AlignedCharArrayUnion<char[3]>));
-  EXPECT_EQ(sizeof(char[4]), sizeof(AlignedCharArrayUnion<char[4]>));
-  EXPECT_EQ(sizeof(char[5]), sizeof(AlignedCharArrayUnion<char[5]>));
-  EXPECT_EQ(sizeof(char[8]), sizeof(AlignedCharArrayUnion<char[8]>));
-  EXPECT_EQ(sizeof(char[13]), sizeof(AlignedCharArrayUnion<char[13]>));
-  EXPECT_EQ(sizeof(char[16]), sizeof(AlignedCharArrayUnion<char[16]>));
-  EXPECT_EQ(sizeof(char[21]), sizeof(AlignedCharArrayUnion<char[21]>));
-  EXPECT_EQ(sizeof(char[32]), sizeof(AlignedCharArrayUnion<char[32]>));
-  EXPECT_EQ(sizeof(short), sizeof(AlignedCharArrayUnion<short>));
-  EXPECT_EQ(sizeof(int), sizeof(AlignedCharArrayUnion<int>));
-  EXPECT_EQ(sizeof(long), sizeof(AlignedCharArrayUnion<long>));
-  EXPECT_EQ(sizeof(long long),
-            sizeof(AlignedCharArrayUnion<long long>));
-  EXPECT_EQ(sizeof(float), sizeof(AlignedCharArrayUnion<float>));
-  EXPECT_EQ(sizeof(double), sizeof(AlignedCharArrayUnion<double>));
-  EXPECT_EQ(sizeof(long double),
-            sizeof(AlignedCharArrayUnion<long double>));
-  EXPECT_EQ(sizeof(void *), sizeof(AlignedCharArrayUnion<void *>));
-  EXPECT_EQ(sizeof(int *), sizeof(AlignedCharArrayUnion<int *>));
-  EXPECT_EQ(sizeof(double (*)(double)),
-            sizeof(AlignedCharArrayUnion<double (*)(double)>));
-  EXPECT_EQ(sizeof(double (S6::*)()),
-            sizeof(AlignedCharArrayUnion<double (S6::*)()>));
-  EXPECT_EQ(sizeof(S1), sizeof(AlignedCharArrayUnion<S1>));
-  EXPECT_EQ(sizeof(S2), sizeof(AlignedCharArrayUnion<S2>));
-  EXPECT_EQ(sizeof(S3), sizeof(AlignedCharArrayUnion<S3>));
-  EXPECT_EQ(sizeof(S4), sizeof(AlignedCharArrayUnion<S4>));
-  EXPECT_EQ(sizeof(S5), sizeof(AlignedCharArrayUnion<S5>));
-  EXPECT_EQ(sizeof(S6), sizeof(AlignedCharArrayUnion<S6>));
-  EXPECT_EQ(sizeof(D1), sizeof(AlignedCharArrayUnion<D1>));
-  EXPECT_EQ(sizeof(D2), sizeof(AlignedCharArrayUnion<D2>));
-  EXPECT_EQ(sizeof(D3), sizeof(AlignedCharArrayUnion<D3>));
-  EXPECT_EQ(sizeof(D4), sizeof(AlignedCharArrayUnion<D4>));
-  EXPECT_EQ(sizeof(D5), sizeof(AlignedCharArrayUnion<D5>));
-  EXPECT_EQ(sizeof(D6), sizeof(AlignedCharArrayUnion<D6>));
-  EXPECT_EQ(sizeof(D7), sizeof(AlignedCharArrayUnion<D7>));
-  EXPECT_EQ(sizeof(D8), sizeof(AlignedCharArrayUnion<D8>));
-  EXPECT_EQ(sizeof(D9), sizeof(AlignedCharArrayUnion<D9>));
-  EXPECT_EQ(sizeof(D9[1]), sizeof(AlignedCharArrayUnion<D9[1]>));
-  EXPECT_EQ(sizeof(D9[2]), sizeof(AlignedCharArrayUnion<D9[2]>));
-  EXPECT_EQ(sizeof(D9[3]), sizeof(AlignedCharArrayUnion<D9[3]>));
-  EXPECT_EQ(sizeof(D9[4]), sizeof(AlignedCharArrayUnion<D9[4]>));
-  EXPECT_EQ(sizeof(D9[5]), sizeof(AlignedCharArrayUnion<D9[5]>));
-  EXPECT_EQ(sizeof(D9[8]), sizeof(AlignedCharArrayUnion<D9[8]>));
-  EXPECT_EQ(sizeof(D9[13]), sizeof(AlignedCharArrayUnion<D9[13]>));
-  EXPECT_EQ(sizeof(D9[16]), sizeof(AlignedCharArrayUnion<D9[16]>));
-  EXPECT_EQ(sizeof(D9[21]), sizeof(AlignedCharArrayUnion<D9[21]>));
-  EXPECT_EQ(sizeof(D9[32]), sizeof(AlignedCharArrayUnion<D9[32]>));
-  EXPECT_EQ(sizeof(V1), sizeof(AlignedCharArrayUnion<V1>));
-  EXPECT_EQ(sizeof(V2), sizeof(AlignedCharArrayUnion<V2>));
-  EXPECT_EQ(sizeof(V3), sizeof(AlignedCharArrayUnion<V3>));
-  EXPECT_EQ(sizeof(V4), sizeof(AlignedCharArrayUnion<V4>));
-  EXPECT_EQ(sizeof(V5), sizeof(AlignedCharArrayUnion<V5>));
-  EXPECT_EQ(sizeof(V6), sizeof(AlignedCharArrayUnion<V6>));
-  EXPECT_EQ(sizeof(V7), sizeof(AlignedCharArrayUnion<V7>));
-
-  // Some versions of MSVC also get this wrong. The failure again appears to be
-  // benign: sizeof(V8) is only 52 bytes, but our array reserves 56.
-#ifndef _MSC_VER
-  EXPECT_EQ(sizeof(V8), sizeof(AlignedCharArrayUnion<V8>));
-#endif
-}
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/Support/AlignmentTest.cpp b/gnu/llvm/llvm/unittests/Support/AlignmentTest.cpp
deleted file mode 100644
index 5ef9cd4b2ac..00000000000
--- a/gnu/llvm/llvm/unittests/Support/AlignmentTest.cpp
+++ /dev/null
@@ -1,366 +0,0 @@
-//=== - llvm/unittest/Support/Alignment.cpp - Alignment utility tests -----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/Alignment.h"
-#include "gtest/gtest.h"
-
-#include <vector>
-
-#ifdef _MSC_VER
-// Disable warnings about potential divide by 0.
-#pragma warning(push)
-#pragma warning(disable : 4723)
-#endif
-
-using namespace llvm;
-
-namespace {
-
-TEST(AlignmentTest, AlignOfConstant) {
-  EXPECT_EQ(Align::Of<uint8_t>(), Align(alignof(uint8_t)));
-  EXPECT_EQ(Align::Of<uint16_t>(), Align(alignof(uint16_t)));
-  EXPECT_EQ(Align::Of<uint32_t>(), Align(alignof(uint32_t)));
-  EXPECT_EQ(Align::Of<uint64_t>(), Align(alignof(uint64_t)));
-}
-
-TEST(AlignmentTest, AlignConstant) {
-  EXPECT_EQ(Align::Constant<1>(), Align(1));
-  EXPECT_EQ(Align::Constant<2>(), Align(2));
-  EXPECT_EQ(Align::Constant<4>(), Align(4));
-  EXPECT_EQ(Align::Constant<8>(), Align(8));
-  EXPECT_EQ(Align::Constant<16>(), Align(16));
-  EXPECT_EQ(Align::Constant<32>(), Align(32));
-  EXPECT_EQ(Align::Constant<64>(), Align(64));
-}
-
-TEST(AlignmentTest, AlignConstexprConstant) {
-  constexpr Align kConstantAlign = Align::Of<uint64_t>();
-  EXPECT_EQ(Align(alignof(uint64_t)), kConstantAlign);
-}
-
-std::vector<uint64_t> getValidAlignments() {
-  std::vector<uint64_t> Out;
-  for (size_t Shift = 0; Shift < 64; ++Shift)
-    Out.push_back(1ULL << Shift);
-  return Out;
-}
-
-TEST(AlignmentTest, AlignDefaultCTor) {
-  EXPECT_EQ(Align().value(), 1ULL);
-}
-
-TEST(AlignmentTest, MaybeAlignDefaultCTor) {
-  EXPECT_FALSE(MaybeAlign().hasValue());
-}
-
-TEST(AlignmentTest, ValidCTors) {
-  for (uint64_t Value : getValidAlignments()) {
-    EXPECT_EQ(Align(Value).value(), Value);
-    EXPECT_EQ((*MaybeAlign(Value)).value(), Value);
-  }
-}
-
-TEST(AlignmentTest, CheckMaybeAlignHasValue) {
-  EXPECT_TRUE(MaybeAlign(1));
-  EXPECT_TRUE(MaybeAlign(1).hasValue());
-  EXPECT_FALSE(MaybeAlign(0));
-  EXPECT_FALSE(MaybeAlign(0).hasValue());
-  EXPECT_FALSE(MaybeAlign());
-  EXPECT_FALSE(MaybeAlign().hasValue());
-}
-
-TEST(AlignmentTest, Division) {
-  for (uint64_t Value : getValidAlignments()) {
-    if (Value > 1) {
-      EXPECT_EQ(Align(Value) / 2, Value / 2);
-      EXPECT_EQ(MaybeAlign(Value) / 2, Value / 2);
-    }
-  }
-  EXPECT_EQ(MaybeAlign(0) / 2, MaybeAlign(0));
-}
-
-TEST(AlignmentTest, AlignTo) {
-  struct {
-    uint64_t alignment;
-    uint64_t offset;
-    uint64_t rounded;
-    const void *forgedAddr() const {
-      //  A value of any integral or enumeration type can be converted to a
-      //  pointer type.
-      return reinterpret_cast<const void *>(offset);
-    }
-  } kTests[] = {
-      // MaybeAlign
-      {0, 0, 0},
-      {0, 1, 1},
-      {0, 5, 5},
-      // MaybeAlign / Align
-      {1, 0, 0},
-      {1, 1, 1},
-      {1, 5, 5},
-      {2, 0, 0},
-      {2, 1, 2},
-      {2, 2, 2},
-      {2, 7, 8},
-      {2, 16, 16},
-      {4, 0, 0},
-      {4, 1, 4},
-      {4, 4, 4},
-      {4, 6, 8},
-  };
-  for (const auto &T : kTests) {
-    MaybeAlign A(T.alignment);
-    // Test MaybeAlign
-    EXPECT_EQ(alignTo(T.offset, A), T.rounded);
-    // Test Align
-    if (A) {
-      EXPECT_EQ(alignTo(T.offset, A.getValue()), T.rounded);
-      EXPECT_EQ(alignAddr(T.forgedAddr(), A.getValue()), T.rounded);
-    }
-  }
-}
-
-TEST(AlignmentTest, AlignToWithSkew) {
-  EXPECT_EQ(alignTo(5, Align(8), 0), alignTo(5, Align(8)));
-  EXPECT_EQ(alignTo(5, Align(8), 7), 7U);
-  EXPECT_EQ(alignTo(17, Align(8), 1), 17U);
-  EXPECT_EQ(alignTo(~0LL, Align(8), 3), 3U);
-}
-
-TEST(AlignmentTest, Log2) {
-  for (uint64_t Value : getValidAlignments()) {
-    EXPECT_EQ(Log2(Align(Value)), Log2_64(Value));
-  }
-}
-
-TEST(AlignmentTest, MinAlign) {
-  struct {
-    uint64_t A;
-    uint64_t B;
-    uint64_t MinAlign;
-  } kTests[] = {
-      // MaybeAlign
-      {0, 0, 0},
-      {0, 8, 8},
-      {2, 0, 2},
-      // MaybeAlign / Align
-      {1, 2, 1},
-      {8, 4, 4},
-  };
-  for (const auto &T : kTests) {
-    EXPECT_EQ(commonAlignment(MaybeAlign(T.A), MaybeAlign(T.B)), T.MinAlign);
-    EXPECT_EQ(MinAlign(T.A, T.B), T.MinAlign);
-    if (T.A) {
-      EXPECT_EQ(commonAlignment(Align(T.A), MaybeAlign(T.B)), T.MinAlign);
-    }
-    if (T.B) {
-      EXPECT_EQ(commonAlignment(MaybeAlign(T.A), Align(T.B)), T.MinAlign);
-    }
-    if (T.A && T.B) {
-      EXPECT_EQ(commonAlignment(Align(T.A), Align(T.B)), T.MinAlign);
-    }
-  }
-}
-
-TEST(AlignmentTest, Encode_Decode) {
-  for (uint64_t Value : getValidAlignments()) {
-    {
-      Align Actual(Value);
-      Align Expected = decodeMaybeAlign(encode(Actual)).getValue();
-      EXPECT_EQ(Expected, Actual);
-    }
-    {
-      MaybeAlign Actual(Value);
-      MaybeAlign Expected = decodeMaybeAlign(encode(Actual));
-      EXPECT_EQ(Expected, Actual);
-    }
-  }
-  MaybeAlign Actual(0);
-  MaybeAlign Expected = decodeMaybeAlign(encode(Actual));
-  EXPECT_EQ(Expected, Actual);
-}
-
-TEST(AlignmentTest, isAligned_isAddrAligned) {
-  struct {
-    uint64_t alignment;
-    uint64_t offset;
-    bool isAligned;
-    const void *forgedAddr() const {
-      //  A value of any integral or enumeration type can be converted to a
-      //  pointer type.
-      return reinterpret_cast<const void *>(offset);
-    }
-  } kTests[] = {
-      {1, 0, true},  {1, 1, true},  {1, 5, true},  {2, 0, true},
-      {2, 1, false}, {2, 2, true},  {2, 7, false}, {2, 16, true},
-      {4, 0, true},  {4, 1, false}, {4, 4, true},  {4, 6, false},
-  };
-  for (const auto &T : kTests) {
-    MaybeAlign A(T.alignment);
-    // Test Align
-    if (A) {
-      EXPECT_EQ(isAligned(A.getValue(), T.offset), T.isAligned);
-      EXPECT_EQ(isAddrAligned(A.getValue(), T.forgedAddr()), T.isAligned);
-    }
-  }
-}
-
-TEST(AlignmentTest, offsetToAlignment) {
-  struct {
-    uint64_t alignment;
-    uint64_t offset;
-    uint64_t alignedOffset;
-    const void *forgedAddr() const {
-      //  A value of any integral or enumeration type can be converted to a
-      //  pointer type.
-      return reinterpret_cast<const void *>(offset);
-    }
-  } kTests[] = {
-      {1, 0, 0}, {1, 1, 0},  {1, 5, 0}, {2, 0, 0}, {2, 1, 1}, {2, 2, 0},
-      {2, 7, 1}, {2, 16, 0}, {4, 0, 0}, {4, 1, 3}, {4, 4, 0}, {4, 6, 2},
-  };
-  for (const auto &T : kTests) {
-    const Align A(T.alignment);
-    EXPECT_EQ(offsetToAlignment(T.offset, A), T.alignedOffset);
-    EXPECT_EQ(offsetToAlignedAddr(T.forgedAddr(), A), T.alignedOffset);
-  }
-}
-
-TEST(AlignmentTest, AlignComparisons) {
-  std::vector<uint64_t> ValidAlignments = getValidAlignments();
-  std::sort(ValidAlignments.begin(), ValidAlignments.end());
-  for (size_t I = 1; I < ValidAlignments.size(); ++I) {
-    assert(I >= 1);
-    const Align A(ValidAlignments[I - 1]);
-    const Align B(ValidAlignments[I]);
-    EXPECT_EQ(A, A);
-    EXPECT_NE(A, B);
-    EXPECT_LT(A, B);
-    EXPECT_GT(B, A);
-    EXPECT_LE(A, B);
-    EXPECT_GE(B, A);
-    EXPECT_LE(A, A);
-    EXPECT_GE(A, A);
-
-    EXPECT_EQ(A, A.value());
-    EXPECT_NE(A, B.value());
-    EXPECT_LT(A, B.value());
-    EXPECT_GT(B, A.value());
-    EXPECT_LE(A, B.value());
-    EXPECT_GE(B, A.value());
-    EXPECT_LE(A, A.value());
-    EXPECT_GE(A, A.value());
-
-    EXPECT_EQ(std::max(A, B), B);
-    EXPECT_EQ(std::min(A, B), A);
-
-    const MaybeAlign MA(ValidAlignments[I - 1]);
-    const MaybeAlign MB(ValidAlignments[I]);
-    EXPECT_EQ(MA, MA);
-    EXPECT_NE(MA, MB);
-
-    EXPECT_EQ(MA, MA ? (*MA).value() : 0);
-    EXPECT_NE(MA, MB ? (*MB).value() : 0);
-
-    EXPECT_EQ(std::max(A, B), B);
-    EXPECT_EQ(std::min(A, B), A);
-  }
-}
-
-TEST(AlignmentTest, Max) {
-  // We introduce std::max here to test ADL.
-  using std::max;
-
-  // Uses llvm::max.
-  EXPECT_EQ(max(MaybeAlign(), Align(2)), Align(2));
-  EXPECT_EQ(max(Align(2), MaybeAlign()), Align(2));
-
-  EXPECT_EQ(max(MaybeAlign(1), Align(2)), Align(2));
-  EXPECT_EQ(max(Align(2), MaybeAlign(1)), Align(2));
-
-  EXPECT_EQ(max(MaybeAlign(2), Align(2)), Align(2));
-  EXPECT_EQ(max(Align(2), MaybeAlign(2)), Align(2));
-
-  EXPECT_EQ(max(MaybeAlign(4), Align(2)), Align(4));
-  EXPECT_EQ(max(Align(2), MaybeAlign(4)), Align(4));
-
-  // Uses std::max.
-  EXPECT_EQ(max(Align(2), Align(4)), Align(4));
-}
-
-TEST(AlignmentTest, AssumeAligned) {
-  EXPECT_EQ(assumeAligned(0), Align(1));
-  EXPECT_EQ(assumeAligned(0), Align());
-  EXPECT_EQ(assumeAligned(1), Align(1));
-  EXPECT_EQ(assumeAligned(1), Align());
-}
-
-// Death tests reply on assert which is disabled in release mode.
-#ifndef NDEBUG
-
-// We use a subset of valid alignments for DEATH_TESTs as they are particularly
-// slow.
-std::vector<uint64_t> getValidAlignmentsForDeathTest() {
-  return {1, 1ULL << 31, 1ULL << 63};
-}
-
-std::vector<uint64_t> getNonPowerOfTwo() { return {3, 10, 15}; }
-
-TEST(AlignmentDeathTest, CantConvertUnsetMaybe) {
-  EXPECT_DEATH((MaybeAlign(0).getValue()), ".*");
-}
-
-TEST(AlignmentDeathTest, Division) {
-  EXPECT_DEATH(Align(1) / 2, "Can't halve byte alignment");
-  EXPECT_DEATH(MaybeAlign(1) / 2, "Can't halve byte alignment");
-
-  EXPECT_DEATH(Align(8) / 0, "Divisor must be positive and a power of 2");
-  EXPECT_DEATH(Align(8) / 3, "Divisor must be positive and a power of 2");
-}
-
-TEST(AlignmentDeathTest, InvalidCTors) {
-  EXPECT_DEATH((Align(0)), "Value must not be 0");
-  for (uint64_t Value : getNonPowerOfTwo()) {
-    EXPECT_DEATH((Align(Value)), "Alignment is not a power of 2");
-    EXPECT_DEATH((MaybeAlign(Value)),
-                 "Alignment is neither 0 nor a power of 2");
-  }
-}
-
-TEST(AlignmentDeathTest, ComparisonsWithZero) {
-  for (uint64_t Value : getValidAlignmentsForDeathTest()) {
-    EXPECT_DEATH((void)(Align(Value) == 0), ".* should be defined");
-    EXPECT_DEATH((void)(Align(Value) != 0), ".* should be defined");
-    EXPECT_DEATH((void)(Align(Value) >= 0), ".* should be defined");
-    EXPECT_DEATH((void)(Align(Value) <= 0), ".* should be defined");
-    EXPECT_DEATH((void)(Align(Value) > 0), ".* should be defined");
-    EXPECT_DEATH((void)(Align(Value) < 0), ".* should be defined");
-  }
-}
-
-TEST(AlignmentDeathTest, CompareMaybeAlignToZero) {
-  for (uint64_t Value : getValidAlignmentsForDeathTest()) {
-    // MaybeAlign is allowed to be == or != 0
-    (void)(MaybeAlign(Value) == 0);
-    (void)(MaybeAlign(Value) != 0);
-  }
-}
-
-TEST(AlignmentDeathTest, AlignAddr) {
-  const void *const unaligned_high_ptr =
-      reinterpret_cast<const void *>(std::numeric_limits<uintptr_t>::max() - 1);
-  EXPECT_DEATH(alignAddr(unaligned_high_ptr, Align(16)), "Overflow");
-}
-
-#endif // NDEBUG
-
-} // end anonymous namespace
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
diff --git a/gnu/llvm/llvm/unittests/Support/AllocatorTest.cpp b/gnu/llvm/llvm/unittests/Support/AllocatorTest.cpp
deleted file mode 100644
index c41f597c404..00000000000
--- a/gnu/llvm/llvm/unittests/Support/AllocatorTest.cpp
+++ /dev/null
@@ -1,235 +0,0 @@
-//===- llvm/unittest/Support/AllocatorTest.cpp - BumpPtrAllocator tests ---===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/Allocator.h"
-#include "gtest/gtest.h"
-#include <cstdlib>
-
-using namespace llvm;
-
-namespace {
-
-TEST(AllocatorTest, Basics) {
-  BumpPtrAllocator Alloc;
-  int *a = (int*)Alloc.Allocate(sizeof(int), alignof(int));
-  int *b = (int*)Alloc.Allocate(sizeof(int) * 10, alignof(int));
-  int *c = (int*)Alloc.Allocate(sizeof(int), alignof(int));
-  *a = 1;
-  b[0] = 2;
-  b[9] = 2;
-  *c = 3;
-  EXPECT_EQ(1, *a);
-  EXPECT_EQ(2, b[0]);
-  EXPECT_EQ(2, b[9]);
-  EXPECT_EQ(3, *c);
-  EXPECT_EQ(1U, Alloc.GetNumSlabs());
-
-  BumpPtrAllocator Alloc2 = std::move(Alloc);
-  EXPECT_EQ(0U, Alloc.GetNumSlabs());
-  EXPECT_EQ(1U, Alloc2.GetNumSlabs());
-
-  // Make sure the old pointers still work. These are especially interesting
-  // under ASan or Valgrind.
-  EXPECT_EQ(1, *a);
-  EXPECT_EQ(2, b[0]);
-  EXPECT_EQ(2, b[9]);
-  EXPECT_EQ(3, *c);
-
-  Alloc = std::move(Alloc2);
-  EXPECT_EQ(0U, Alloc2.GetNumSlabs());
-  EXPECT_EQ(1U, Alloc.GetNumSlabs());
-}
-
-// Allocate enough bytes to create three slabs.
-TEST(AllocatorTest, ThreeSlabs) {
-  BumpPtrAllocator Alloc;
-  Alloc.Allocate(3000, 1);
-  EXPECT_EQ(1U, Alloc.GetNumSlabs());
-  Alloc.Allocate(3000, 1);
-  EXPECT_EQ(2U, Alloc.GetNumSlabs());
-  Alloc.Allocate(3000, 1);
-  EXPECT_EQ(3U, Alloc.GetNumSlabs());
-}
-
-// Allocate enough bytes to create two slabs, reset the allocator, and do it
-// again.
-TEST(AllocatorTest, TestReset) {
-  BumpPtrAllocator Alloc;
-
-  // Allocate something larger than the SizeThreshold=4096.
-  (void)Alloc.Allocate(5000, 1);
-  Alloc.Reset();
-  // Calling Reset should free all CustomSizedSlabs.
-  EXPECT_EQ(0u, Alloc.GetNumSlabs());
-
-  Alloc.Allocate(3000, 1);
-  EXPECT_EQ(1U, Alloc.GetNumSlabs());
-  Alloc.Allocate(3000, 1);
-  EXPECT_EQ(2U, Alloc.GetNumSlabs());
-  Alloc.Reset();
-  EXPECT_EQ(1U, Alloc.GetNumSlabs());
-  Alloc.Allocate(3000, 1);
-  EXPECT_EQ(1U, Alloc.GetNumSlabs());
-  Alloc.Allocate(3000, 1);
-  EXPECT_EQ(2U, Alloc.GetNumSlabs());
-}
-
-// Test some allocations at varying alignments.
-TEST(AllocatorTest, TestAlignment) {
-  BumpPtrAllocator Alloc;
-  uintptr_t a;
-  a = (uintptr_t)Alloc.Allocate(1, 2);
-  EXPECT_EQ(0U, a & 1);
-  a = (uintptr_t)Alloc.Allocate(1, 4);
-  EXPECT_EQ(0U, a & 3);
-  a = (uintptr_t)Alloc.Allocate(1, 8);
-  EXPECT_EQ(0U, a & 7);
-  a = (uintptr_t)Alloc.Allocate(1, 16);
-  EXPECT_EQ(0U, a & 15);
-  a = (uintptr_t)Alloc.Allocate(1, 32);
-  EXPECT_EQ(0U, a & 31);
-  a = (uintptr_t)Alloc.Allocate(1, 64);
-  EXPECT_EQ(0U, a & 63);
-  a = (uintptr_t)Alloc.Allocate(1, 128);
-  EXPECT_EQ(0U, a & 127);
-}
-
-// Test allocating just over the slab size.  This tests a bug where before the
-// allocator incorrectly calculated the buffer end pointer.
-TEST(AllocatorTest, TestOverflow) {
-  BumpPtrAllocator Alloc;
-
-  // Fill the slab right up until the end pointer.
-  Alloc.Allocate(4096, 1);
-  EXPECT_EQ(1U, Alloc.GetNumSlabs());
-
-  // If we don't allocate a new slab, then we will have overflowed.
-  Alloc.Allocate(1, 1);
-  EXPECT_EQ(2U, Alloc.GetNumSlabs());
-}
-
-// Test allocating with a size larger than the initial slab size.
-TEST(AllocatorTest, TestSmallSlabSize) {
-  BumpPtrAllocator Alloc;
-
-  Alloc.Allocate(8000, 1);
-  EXPECT_EQ(1U, Alloc.GetNumSlabs());
-}
-
-// Test requesting alignment that goes past the end of the current slab.
-TEST(AllocatorTest, TestAlignmentPastSlab) {
-  BumpPtrAllocator Alloc;
-  Alloc.Allocate(4095, 1);
-
-  // Aligning the current slab pointer is likely to move it past the end of the
-  // slab, which would confuse any unsigned comparisons with the difference of
-  // the end pointer and the aligned pointer.
-  Alloc.Allocate(1024, 8192);
-
-  EXPECT_EQ(2U, Alloc.GetNumSlabs());
-}
-
-// Test allocating with a decreased growth delay.
-TEST(AllocatorTest, TestFasterSlabGrowthDelay) {
-  const size_t SlabSize = 4096;
-  // Decrease the growth delay to double the slab size every slab.
-  const size_t GrowthDelay = 1;
-  BumpPtrAllocatorImpl<MallocAllocator, SlabSize, SlabSize, GrowthDelay> Alloc;
-  // Disable the red zone for this test. The additional bytes allocated for the
-  // red zone would change the allocation numbers we check below.
-  Alloc.setRedZoneSize(0);
-
-  Alloc.Allocate(SlabSize, 1);
-  EXPECT_EQ(SlabSize, Alloc.getTotalMemory());
-  // We hit our growth delay with the previous allocation so the next
-  // allocation should get a twice as large slab.
-  Alloc.Allocate(SlabSize, 1);
-  EXPECT_EQ(SlabSize * 3, Alloc.getTotalMemory());
-  Alloc.Allocate(SlabSize, 1);
-  EXPECT_EQ(SlabSize * 3, Alloc.getTotalMemory());
-
-  // Both slabs are full again and hit the growth delay again, so the
-  // next allocation should again get a slab with four times the size of the
-  // original slab size. In total we now should have a memory size of:
-  // 1 + 2 + 4 * SlabSize.
-  Alloc.Allocate(SlabSize, 1);
-  EXPECT_EQ(SlabSize * 7, Alloc.getTotalMemory());
-}
-
-// Test allocating with a increased growth delay.
-TEST(AllocatorTest, TestSlowerSlabGrowthDelay) {
-  const size_t SlabSize = 16;
-  // Increase the growth delay to only double the slab size every 256 slabs.
-  const size_t GrowthDelay = 256;
-  BumpPtrAllocatorImpl<MallocAllocator, SlabSize, SlabSize, GrowthDelay> Alloc;
-  // Disable the red zone for this test. The additional bytes allocated for the
-  // red zone would change the allocation numbers we check below.
-  Alloc.setRedZoneSize(0);
-
-  // Allocate 256 slabs. We should keep getting slabs with the original size
-  // as we haven't hit our growth delay on the last allocation.
-  for (std::size_t i = 0; i < GrowthDelay; ++i)
-    Alloc.Allocate(SlabSize, 1);
-  EXPECT_EQ(SlabSize * GrowthDelay, Alloc.getTotalMemory());
-  // Allocate another slab. This time we should get another slab allocated
-  // that is twice as large as the normal slab size.
-  Alloc.Allocate(SlabSize, 1);
-  EXPECT_EQ(SlabSize * GrowthDelay + SlabSize * 2, Alloc.getTotalMemory());
-}
-
-// Mock slab allocator that returns slabs aligned on 4096 bytes.  There is no
-// easy portable way to do this, so this is kind of a hack.
-class MockSlabAllocator {
-  static size_t LastSlabSize;
-
-public:
-  ~MockSlabAllocator() { }
-
-  void *Allocate(size_t Size, size_t /*Alignment*/) {
-    // Allocate space for the alignment, the slab, and a void* that goes right
-    // before the slab.
-    Align Alignment(4096);
-    void *MemBase = safe_malloc(Size + Alignment.value() - 1 + sizeof(void *));
-
-    // Find the slab start.
-    void *Slab = (void *)alignAddr((char*)MemBase + sizeof(void *), Alignment);
-
-    // Hold a pointer to the base so we can free the whole malloced block.
-    ((void**)Slab)[-1] = MemBase;
-
-    LastSlabSize = Size;
-    return Slab;
-  }
-
-  void Deallocate(void *Slab, size_t /*Size*/, size_t /*Alignment*/) {
-    free(((void**)Slab)[-1]);
-  }
-
-  static size_t GetLastSlabSize() { return LastSlabSize; }
-};
-
-size_t MockSlabAllocator::LastSlabSize = 0;
-
-// Allocate a large-ish block with a really large alignment so that the
-// allocator will think that it has space, but after it does the alignment it
-// will not.
-TEST(AllocatorTest, TestBigAlignment) {
-  BumpPtrAllocatorImpl<MockSlabAllocator> Alloc;
-
-  // First allocate a tiny bit to ensure we have to re-align things.
-  (void)Alloc.Allocate(1, 1);
-
-  // Now the big chunk with a big alignment.
-  (void)Alloc.Allocate(3000, 2048);
-
-  // We test that the last slab size is not the default 4096 byte slab, but
-  // rather a custom sized slab that is larger.
-  EXPECT_GT(MockSlabAllocator::GetLastSlabSize(), 4096u);
-}
-
-}  // anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/Support/AnnotationsTest.cpp b/gnu/llvm/llvm/unittests/Support/AnnotationsTest.cpp
deleted file mode 100644
index b2970adc41c..00000000000
--- a/gnu/llvm/llvm/unittests/Support/AnnotationsTest.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-//===----- unittests/AnnotationsTest.cpp ----------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-#include "llvm/Testing/Support/Annotations.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-using ::testing::ElementsAre;
-using ::testing::IsEmpty;
-
-namespace {
-llvm::Annotations::Range range(size_t Begin, size_t End) {
-  llvm::Annotations::Range R;
-  R.Begin = Begin;
-  R.End = End;
-  return R;
-}
-
-TEST(AnnotationsTest, CleanedCode) {
-  EXPECT_EQ(llvm::Annotations("foo^bar$nnn[[baz$^[[qux]]]]").code(),
-            "foobarbazqux");
-}
-
-TEST(AnnotationsTest, Points) {
-  // A single point.
-  EXPECT_EQ(llvm::Annotations("^ab").point(), 0u);
-  EXPECT_EQ(llvm::Annotations("a^b").point(), 1u);
-  EXPECT_EQ(llvm::Annotations("ab^").point(), 2u);
-
-  // Multiple points.
-  EXPECT_THAT(llvm::Annotations("^a^bc^d^").points(),
-              ElementsAre(0u, 1u, 3u, 4u));
-
-  // No points.
-  EXPECT_THAT(llvm::Annotations("ab[[cd]]").points(), IsEmpty());
-
-  // Consecutive points.
-  EXPECT_THAT(llvm::Annotations("ab^^^cd").points(), ElementsAre(2u, 2u, 2u));
-}
-
-TEST(AnnotationsTest, Ranges) {
-  // A single range.
-  EXPECT_EQ(llvm::Annotations("[[a]]bc").range(), range(0, 1));
-  EXPECT_EQ(llvm::Annotations("a[[bc]]d").range(), range(1, 3));
-  EXPECT_EQ(llvm::Annotations("ab[[cd]]").range(), range(2, 4));
-
-  // Empty range.
-  EXPECT_EQ(llvm::Annotations("[[]]ab").range(), range(0, 0));
-  EXPECT_EQ(llvm::Annotations("a[[]]b").range(), range(1, 1));
-  EXPECT_EQ(llvm::Annotations("ab[[]]").range(), range(2, 2));
-
-  // Multiple ranges.
-  EXPECT_THAT(llvm::Annotations("[[a]][[b]]cd[[ef]]ef").ranges(),
-              ElementsAre(range(0, 1), range(1, 2), range(4, 6)));
-
-  // No ranges.
-  EXPECT_THAT(llvm::Annotations("ab^c^defef").ranges(), IsEmpty());
-}
-
-TEST(AnnotationsTest, Nested) {
-  llvm::Annotations Annotated("a[[f^oo^bar[[b[[a]]z]]]]bcdef");
-  EXPECT_THAT(Annotated.points(), ElementsAre(2u, 4u));
-  EXPECT_THAT(Annotated.ranges(),
-              ElementsAre(range(8, 9), range(7, 10), range(1, 10)));
-}
-
-TEST(AnnotationsTest, Named) {
-  // A single named point or range.
-  EXPECT_EQ(llvm::Annotations("a$foo^b").point("foo"), 1u);
-  EXPECT_EQ(llvm::Annotations("a$foo[[b]]cdef").range("foo"), range(1, 2));
-
-  // Empty names should also work.
-  EXPECT_EQ(llvm::Annotations("a$^b").point(""), 1u);
-  EXPECT_EQ(llvm::Annotations("a$[[b]]cdef").range(""), range(1, 2));
-
-  // Multiple named points.
-  llvm::Annotations Annotated("a$p1^bcd$p2^123$p1^345");
-  EXPECT_THAT(Annotated.points(), IsEmpty());
-  EXPECT_THAT(Annotated.points("p1"), ElementsAre(1u, 7u));
-  EXPECT_EQ(Annotated.point("p2"), 4u);
-}
-
-TEST(AnnotationsTest, Errors) {
-  // Annotations use llvm_unreachable, it will only crash in debug mode.
-#ifndef NDEBUG
-  // point() and range() crash on zero or multiple ranges.
-  EXPECT_DEATH(llvm::Annotations("ab[[c]]def").point(),
-               "expected exactly one point");
-  EXPECT_DEATH(llvm::Annotations("a^b^cdef").point(),
-               "expected exactly one point");
-
-  EXPECT_DEATH(llvm::Annotations("a^bcdef").range(),
-               "expected exactly one range");
-  EXPECT_DEATH(llvm::Annotations("a[[b]]c[[d]]ef").range(),
-               "expected exactly one range");
-
-  EXPECT_DEATH(llvm::Annotations("$foo^a$foo^a").point("foo"),
-               "expected exactly one point");
-  EXPECT_DEATH(llvm::Annotations("$foo[[a]]bc$foo[[a]]").range("foo"),
-               "expected exactly one range");
-
-  // Parsing failures.
-  EXPECT_DEATH(llvm::Annotations("ff[[fdfd"), "unmatched \\[\\[");
-  EXPECT_DEATH(llvm::Annotations("ff[[fdjsfjd]]xxx]]"), "unmatched \\]\\]");
-  EXPECT_DEATH(llvm::Annotations("ff$fdsfd"), "unterminated \\$name");
-#endif
-}
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/Support/ArrayRecyclerTest.cpp b/gnu/llvm/llvm/unittests/Support/ArrayRecyclerTest.cpp
deleted file mode 100644
index 264cf9740c5..00000000000
--- a/gnu/llvm/llvm/unittests/Support/ArrayRecyclerTest.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-//===--- unittest/Support/ArrayRecyclerTest.cpp ---------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/ArrayRecycler.h"
-#include "llvm/Support/Allocator.h"
-#include "gtest/gtest.h"
-#include <cstdlib>
-
-using namespace llvm;
-
-namespace {
-
-struct Object {
-  int Num;
-  Object *Other;
-};
-typedef ArrayRecycler<Object> ARO;
-
-TEST(ArrayRecyclerTest, Capacity) {
-  // Capacity size should never be 0.
-  ARO::Capacity Cap = ARO::Capacity::get(0);
-  EXPECT_LT(0u, Cap.getSize());
-
-  size_t PrevSize = Cap.getSize();
-  for (unsigned N = 1; N != 100; ++N) {
-    Cap = ARO::Capacity::get(N);
-    EXPECT_LE(N, Cap.getSize());
-    if (PrevSize >= N)
-      EXPECT_EQ(PrevSize, Cap.getSize());
-    else
-      EXPECT_LT(PrevSize, Cap.getSize());
-    PrevSize = Cap.getSize();
-  }
-
-  // Check that the buckets are monotonically increasing.
-  Cap = ARO::Capacity::get(0);
-  PrevSize = Cap.getSize();
-  for (unsigned N = 0; N != 20; ++N) {
-    Cap = Cap.getNext();
-    EXPECT_LT(PrevSize, Cap.getSize());
-    PrevSize = Cap.getSize();
-  }
-}
-
-TEST(ArrayRecyclerTest, Basics) {
-  BumpPtrAllocator Allocator;
-  ArrayRecycler<Object> DUT;
-
-  ARO::Capacity Cap = ARO::Capacity::get(8);
-  Object *A1 = DUT.allocate(Cap, Allocator);
-  A1[0].Num = 21;
-  A1[7].Num = 17;
-
-  Object *A2 = DUT.allocate(Cap, Allocator);
-  A2[0].Num = 121;
-  A2[7].Num = 117;
-
-  Object *A3 = DUT.allocate(Cap, Allocator);
-  A3[0].Num = 221;
-  A3[7].Num = 217;
-
-  EXPECT_EQ(21, A1[0].Num);
-  EXPECT_EQ(17, A1[7].Num);
-  EXPECT_EQ(121, A2[0].Num);
-  EXPECT_EQ(117, A2[7].Num);
-  EXPECT_EQ(221, A3[0].Num);
-  EXPECT_EQ(217, A3[7].Num);
-
-  DUT.deallocate(Cap, A2);
-
-  // Check that deallocation didn't clobber anything.
-  EXPECT_EQ(21, A1[0].Num);
-  EXPECT_EQ(17, A1[7].Num);
-  EXPECT_EQ(221, A3[0].Num);
-  EXPECT_EQ(217, A3[7].Num);
-
-  // Verify recycling.
-  Object *A2x = DUT.allocate(Cap, Allocator);
-  EXPECT_EQ(A2, A2x);
-
-  DUT.deallocate(Cap, A2x);
-  DUT.deallocate(Cap, A1);
-  DUT.deallocate(Cap, A3);
-
-  // Objects are not required to be recycled in reverse deallocation order, but
-  // that is what the current implementation does.
-  Object *A3x = DUT.allocate(Cap, Allocator);
-  EXPECT_EQ(A3, A3x);
-  Object *A1x = DUT.allocate(Cap, Allocator);
-  EXPECT_EQ(A1, A1x);
-  Object *A2y = DUT.allocate(Cap, Allocator);
-  EXPECT_EQ(A2, A2y);
-
-  // Back to allocation from the BumpPtrAllocator.
-  Object *A4 = DUT.allocate(Cap, Allocator);
-  EXPECT_NE(A1, A4);
-  EXPECT_NE(A2, A4);
-  EXPECT_NE(A3, A4);
-
-  DUT.clear(Allocator);
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/Support/Base64Test.cpp b/gnu/llvm/llvm/unittests/Support/Base64Test.cpp
deleted file mode 100644
index 9622c866b38..00000000000
--- a/gnu/llvm/llvm/unittests/Support/Base64Test.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-//===- llvm/unittest/Support/Base64Test.cpp - Base64 tests
-//--------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements unit tests for the Base64 functions.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/Base64.h"
-#include "llvm/ADT/StringRef.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-/// Tests an arbitrary set of bytes passed as \p Input.
-void TestBase64(StringRef Input, StringRef Final) {
-  auto Res = encodeBase64(Input);
-  EXPECT_EQ(Res, Final);
-}
-
-} // namespace
-
-TEST(Base64Test, Base64) {
-  // from: https://tools.ietf.org/html/rfc4648#section-10
-  TestBase64("", "");
-  TestBase64("f", "Zg==");
-  TestBase64("fo", "Zm8=");
-  TestBase64("foo", "Zm9v");
-  TestBase64("foob", "Zm9vYg==");
-  TestBase64("fooba", "Zm9vYmE=");
-  TestBase64("foobar", "Zm9vYmFy");
-
-  // With non-printable values.
-  char NonPrintableVector[] = {0x00, 0x00, 0x00,       0x46,
-                               0x00, 0x08, (char)0xff, (char)0xee};
-  TestBase64({NonPrintableVector, sizeof(NonPrintableVector)}, "AAAARgAI/+4=");
-
-  // Large test case
-  char LargeVector[] = {0x54, 0x68, 0x65, 0x20, 0x71, 0x75, 0x69, 0x63, 0x6b,
-                        0x20, 0x62, 0x72, 0x6f, 0x77, 0x6e, 0x20, 0x66, 0x6f,
-                        0x78, 0x20, 0x6a, 0x75, 0x6d, 0x70, 0x73, 0x20, 0x6f,
-                        0x76, 0x65, 0x72, 0x20, 0x31, 0x33, 0x20, 0x6c, 0x61,
-                        0x7a, 0x79, 0x20, 0x64, 0x6f, 0x67, 0x73, 0x2e};
-  TestBase64({LargeVector, sizeof(LargeVector)},
-             "VGhlIHF1aWNrIGJyb3duIGZveCBqdW1wcyBvdmVyIDEzIGxhenkgZG9ncy4=");
-}
diff --git a/gnu/llvm/llvm/unittests/Support/BinaryStreamTest.cpp b/gnu/llvm/llvm/unittests/Support/BinaryStreamTest.cpp
deleted file mode 100644
index c1db0638ef8..00000000000
--- a/gnu/llvm/llvm/unittests/Support/BinaryStreamTest.cpp
+++ /dev/null
@@ -1,907 +0,0 @@
-//===- llvm/unittest/Support/BinaryStreamTest.cpp -------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/Allocator.h"
-#include "llvm/Support/BinaryByteStream.h"
-#include "llvm/Support/BinaryItemStream.h"
-#include "llvm/Support/BinaryStreamArray.h"
-#include "llvm/Support/BinaryStreamReader.h"
-#include "llvm/Support/BinaryStreamRef.h"
-#include "llvm/Support/BinaryStreamWriter.h"
-#include "llvm/Testing/Support/Error.h"
-
-#include "gtest/gtest.h"
-
-
-using namespace llvm;
-using namespace llvm::support;
-
-namespace {
-
-class BrokenStream : public WritableBinaryStream {
-public:
-  BrokenStream(MutableArrayRef<uint8_t> Data, endianness Endian,
-                      uint32_t Align)
-      : Data(Data), PartitionIndex(alignDown(Data.size() / 2, Align)),
-        Endian(Endian) {}
-
-  endianness getEndian() const override { return Endian; }
-
-  Error readBytes(uint32_t Offset, uint32_t Size,
-                  ArrayRef<uint8_t> &Buffer) override {
-    if (auto EC = checkOffsetForRead(Offset, Size))
-      return EC;
-    uint32_t S = startIndex(Offset);
-    auto Ref = Data.drop_front(S);
-    if (Ref.size() >= Size) {
-      Buffer = Ref.take_front(Size);
-      return Error::success();
-    }
-
-    uint32_t BytesLeft = Size - Ref.size();
-    uint8_t *Ptr = Allocator.Allocate<uint8_t>(Size);
-    ::memcpy(Ptr, Ref.data(), Ref.size());
-    ::memcpy(Ptr + Ref.size(), Data.data(), BytesLeft);
-    Buffer = makeArrayRef<uint8_t>(Ptr, Size);
-    return Error::success();
-  }
-
-  Error readLongestContiguousChunk(uint32_t Offset,
-                                   ArrayRef<uint8_t> &Buffer) override {
-    if (auto EC = checkOffsetForRead(Offset, 1))
-      return EC;
-    uint32_t S = startIndex(Offset);
-    Buffer = Data.drop_front(S);
-    return Error::success();
-  }
-
-  uint32_t getLength() override { return Data.size(); }
-
-  Error writeBytes(uint32_t Offset, ArrayRef<uint8_t> SrcData) override {
-    if (auto EC = checkOffsetForWrite(Offset, SrcData.size()))
-      return EC;
-    if (SrcData.empty())
-      return Error::success();
-
-    uint32_t S = startIndex(Offset);
-    MutableArrayRef<uint8_t> Ref(Data);
-    Ref = Ref.drop_front(S);
-    if (Ref.size() >= SrcData.size()) {
-      ::memcpy(Ref.data(), SrcData.data(), SrcData.size());
-      return Error::success();
-    }
-
-    uint32_t BytesLeft = SrcData.size() - Ref.size();
-    ::memcpy(Ref.data(), SrcData.data(), Ref.size());
-    ::memcpy(&Data[0], SrcData.data() + Ref.size(), BytesLeft);
-    return Error::success();
-  }
-  Error commit() override { return Error::success(); }
-
-private:
-  uint32_t startIndex(uint32_t Offset) const {
-    return (Offset + PartitionIndex) % Data.size();
-  }
-
-  uint32_t endIndex(uint32_t Offset, uint32_t Size) const {
-    return (startIndex(Offset) + Size - 1) % Data.size();
-  }
-
-  // Buffer is organized like this:
-  // -------------------------------------------------
-  // | N/2 | N/2+1 | ... | N-1 | 0 | 1 | ... | N/2-1 |
-  // -------------------------------------------------
-  // So reads from the beginning actually come from the middle.
-  MutableArrayRef<uint8_t> Data;
-  uint32_t PartitionIndex = 0;
-  endianness Endian;
-  BumpPtrAllocator Allocator;
-};
-
-constexpr endianness Endians[] = {big, little, native};
-constexpr uint32_t NumEndians = llvm::array_lengthof(Endians);
-constexpr uint32_t NumStreams = 2 * NumEndians;
-
-class BinaryStreamTest : public testing::Test {
-
-public:
-  BinaryStreamTest() {}
-
-  void SetUp() override {
-    Streams.clear();
-    Streams.resize(NumStreams);
-    for (uint32_t I = 0; I < NumStreams; ++I)
-      Streams[I].IsContiguous = (I % 2 == 0);
-
-    InputData.clear();
-    OutputData.clear();
-  }
-
-protected:
-  struct StreamPair {
-    bool IsContiguous;
-    std::unique_ptr<BinaryStream> Input;
-    std::unique_ptr<WritableBinaryStream> Output;
-  };
-
-  void initializeInput(ArrayRef<uint8_t> Input, uint32_t Align) {
-    InputData = Input;
-
-    BrokenInputData.resize(InputData.size());
-    if (!Input.empty()) {
-      uint32_t PartitionIndex = alignDown(InputData.size() / 2, Align);
-      uint32_t RightBytes = InputData.size() - PartitionIndex;
-      uint32_t LeftBytes = PartitionIndex;
-      if (RightBytes > 0)
-        ::memcpy(&BrokenInputData[PartitionIndex], Input.data(), RightBytes);
-      if (LeftBytes > 0)
-        ::memcpy(&BrokenInputData[0], Input.data() + RightBytes, LeftBytes);
-    }
-
-    for (uint32_t I = 0; I < NumEndians; ++I) {
-      auto InByteStream =
-          std::make_unique<BinaryByteStream>(InputData, Endians[I]);
-      auto InBrokenStream = std::make_unique<BrokenStream>(
-          BrokenInputData, Endians[I], Align);
-
-      Streams[I * 2].Input = std::move(InByteStream);
-      Streams[I * 2 + 1].Input = std::move(InBrokenStream);
-    }
-  }
-
-  void initializeOutput(uint32_t Size, uint32_t Align) {
-    OutputData.resize(Size);
-    BrokenOutputData.resize(Size);
-
-    for (uint32_t I = 0; I < NumEndians; ++I) {
-      Streams[I * 2].Output =
-          std::make_unique<MutableBinaryByteStream>(OutputData, Endians[I]);
-      Streams[I * 2 + 1].Output = std::make_unique<BrokenStream>(
-          BrokenOutputData, Endians[I], Align);
-    }
-  }
-
-  void initializeOutputFromInput(uint32_t Align) {
-    for (uint32_t I = 0; I < NumEndians; ++I) {
-      Streams[I * 2].Output =
-          std::make_unique<MutableBinaryByteStream>(InputData, Endians[I]);
-      Streams[I * 2 + 1].Output = std::make_unique<BrokenStream>(
-          BrokenInputData, Endians[I], Align);
-    }
-  }
-
-  void initializeInputFromOutput(uint32_t Align) {
-    for (uint32_t I = 0; I < NumEndians; ++I) {
-      Streams[I * 2].Input =
-          std::make_unique<BinaryByteStream>(OutputData, Endians[I]);
-      Streams[I * 2 + 1].Input = std::make_unique<BrokenStream>(
-          BrokenOutputData, Endians[I], Align);
-    }
-  }
-
-  std::vector<uint8_t> InputData;
-  std::vector<uint8_t> BrokenInputData;
-
-  std::vector<uint8_t> OutputData;
-  std::vector<uint8_t> BrokenOutputData;
-
-  std::vector<StreamPair> Streams;
-};
-
-// Tests that a we can read from a BinaryByteStream without a StreamReader.
-TEST_F(BinaryStreamTest, BinaryByteStreamBounds) {
-  std::vector<uint8_t> InputData = {1, 2, 3, 4, 5};
-  initializeInput(InputData, 1);
-
-  for (auto &Stream : Streams) {
-    ArrayRef<uint8_t> Buffer;
-
-    // 1. If the read fits it should work.
-    ASSERT_EQ(InputData.size(), Stream.Input->getLength());
-    ASSERT_THAT_ERROR(Stream.Input->readBytes(2, 1, Buffer), Succeeded());
-    EXPECT_EQ(makeArrayRef(InputData).slice(2, 1), Buffer);
-    ASSERT_THAT_ERROR(Stream.Input->readBytes(0, 4, Buffer), Succeeded());
-    EXPECT_EQ(makeArrayRef(InputData).slice(0, 4), Buffer);
-
-    // 2. Reading past the bounds of the input should fail.
-    EXPECT_THAT_ERROR(Stream.Input->readBytes(4, 2, Buffer), Failed());
-  }
-}
-
-TEST_F(BinaryStreamTest, StreamRefBounds) {
-  std::vector<uint8_t> InputData = {1, 2, 3, 4, 5};
-  initializeInput(InputData, 1);
-
-  for (const auto &Stream : Streams) {
-    ArrayRef<uint8_t> Buffer;
-    BinaryStreamRef Ref(*Stream.Input);
-
-    // Read 1 byte from offset 2 should work
-    ASSERT_EQ(InputData.size(), Ref.getLength());
-    ASSERT_THAT_ERROR(Ref.readBytes(2, 1, Buffer), Succeeded());
-    EXPECT_EQ(makeArrayRef(InputData).slice(2, 1), Buffer);
-
-    // Reading everything from offset 2 on.
-    ASSERT_THAT_ERROR(Ref.readLongestContiguousChunk(2, Buffer), Succeeded());
-    if (Stream.IsContiguous)
-      EXPECT_EQ(makeArrayRef(InputData).slice(2), Buffer);
-    else
-      EXPECT_FALSE(Buffer.empty());
-
-    // Reading 6 bytes from offset 0 is too big.
-    EXPECT_THAT_ERROR(Ref.readBytes(0, 6, Buffer), Failed());
-    EXPECT_THAT_ERROR(Ref.readLongestContiguousChunk(6, Buffer), Failed());
-
-    // Reading 1 byte from offset 2 after dropping 1 byte is the same as reading
-    // 1 byte from offset 3.
-    Ref = Ref.drop_front(1);
-    ASSERT_THAT_ERROR(Ref.readBytes(2, 1, Buffer), Succeeded());
-    if (Stream.IsContiguous)
-      EXPECT_EQ(makeArrayRef(InputData).slice(3, 1), Buffer);
-    else
-      EXPECT_FALSE(Buffer.empty());
-
-    // Reading everything from offset 2 on after dropping 1 byte.
-    ASSERT_THAT_ERROR(Ref.readLongestContiguousChunk(2, Buffer), Succeeded());
-    if (Stream.IsContiguous)
-      EXPECT_EQ(makeArrayRef(InputData).slice(3), Buffer);
-    else
-      EXPECT_FALSE(Buffer.empty());
-
-    // Reading 2 bytes from offset 2 after dropping 2 bytes is the same as
-    // reading 2 bytes from offset 4, and should fail.
-    Ref = Ref.drop_front(1);
-    EXPECT_THAT_ERROR(Ref.readBytes(2, 2, Buffer), Failed());
-
-    // But if we read the longest contiguous chunk instead, we should still
-    // get the 1 byte at the end.
-    ASSERT_THAT_ERROR(Ref.readLongestContiguousChunk(2, Buffer), Succeeded());
-    EXPECT_EQ(makeArrayRef(InputData).take_back(), Buffer);
-  }
-}
-
-TEST_F(BinaryStreamTest, StreamRefDynamicSize) {
-  StringRef Strings[] = {"1", "2", "3", "4"};
-  AppendingBinaryByteStream Stream(support::little);
-
-  BinaryStreamWriter Writer(Stream);
-  BinaryStreamReader Reader(Stream);
-  const uint8_t *Byte;
-  StringRef Str;
-
-  // When the stream is empty, it should report a 0 length and we should get an
-  // error trying to read even 1 byte from it.
-  BinaryStreamRef ConstRef(Stream);
-  EXPECT_EQ(0U, ConstRef.getLength());
-  EXPECT_THAT_ERROR(Reader.readObject(Byte), Failed());
-
-  // But if we write to it, its size should increase and we should be able to
-  // read not just a byte, but the string that was written.
-  EXPECT_THAT_ERROR(Writer.writeCString(Strings[0]), Succeeded());
-  EXPECT_EQ(2U, ConstRef.getLength());
-  EXPECT_THAT_ERROR(Reader.readObject(Byte), Succeeded());
-
-  Reader.setOffset(0);
-  EXPECT_THAT_ERROR(Reader.readCString(Str), Succeeded());
-  EXPECT_EQ(Str, Strings[0]);
-
-  // If we drop some bytes from the front, we should still track the length as
-  // the
-  // underlying stream grows.
-  BinaryStreamRef Dropped = ConstRef.drop_front(1);
-  EXPECT_EQ(1U, Dropped.getLength());
-
-  EXPECT_THAT_ERROR(Writer.writeCString(Strings[1]), Succeeded());
-  EXPECT_EQ(4U, ConstRef.getLength());
-  EXPECT_EQ(3U, Dropped.getLength());
-
-  // If we drop zero bytes from the back, we should continue tracking the
-  // length.
-  Dropped = Dropped.drop_back(0);
-  EXPECT_THAT_ERROR(Writer.writeCString(Strings[2]), Succeeded());
-  EXPECT_EQ(6U, ConstRef.getLength());
-  EXPECT_EQ(5U, Dropped.getLength());
-
-  // If we drop non-zero bytes from the back, we should stop tracking the
-  // length.
-  Dropped = Dropped.drop_back(1);
-  EXPECT_THAT_ERROR(Writer.writeCString(Strings[3]), Succeeded());
-  EXPECT_EQ(8U, ConstRef.getLength());
-  EXPECT_EQ(4U, Dropped.getLength());
-}
-
-TEST_F(BinaryStreamTest, DropOperations) {
-  std::vector<uint8_t> InputData = {1, 2, 3, 4, 5, 4, 3, 2, 1};
-  auto RefData = makeArrayRef(InputData);
-  initializeInput(InputData, 1);
-
-  ArrayRef<uint8_t> Result;
-  BinaryStreamRef Original(InputData, support::little);
-  ASSERT_EQ(InputData.size(), Original.getLength());
-
-  EXPECT_THAT_ERROR(Original.readBytes(0, InputData.size(), Result),
-                    Succeeded());
-  EXPECT_EQ(RefData, Result);
-
-  auto Dropped = Original.drop_front(2);
-  EXPECT_THAT_ERROR(Dropped.readBytes(0, Dropped.getLength(), Result),
-                    Succeeded());
-  EXPECT_EQ(RefData.drop_front(2), Result);
-
-  Dropped = Original.drop_back(2);
-  EXPECT_THAT_ERROR(Dropped.readBytes(0, Dropped.getLength(), Result),
-                    Succeeded());
-  EXPECT_EQ(RefData.drop_back(2), Result);
-
-  Dropped = Original.keep_front(2);
-  EXPECT_THAT_ERROR(Dropped.readBytes(0, Dropped.getLength(), Result),
-                    Succeeded());
-  EXPECT_EQ(RefData.take_front(2), Result);
-
-  Dropped = Original.keep_back(2);
-  EXPECT_THAT_ERROR(Dropped.readBytes(0, Dropped.getLength(), Result),
-                    Succeeded());
-  EXPECT_EQ(RefData.take_back(2), Result);
-
-  Dropped = Original.drop_symmetric(2);
-  EXPECT_THAT_ERROR(Dropped.readBytes(0, Dropped.getLength(), Result),
-                    Succeeded());
-  EXPECT_EQ(RefData.drop_front(2).drop_back(2), Result);
-}
-
-// Test that we can write to a BinaryStream without a StreamWriter.
-TEST_F(BinaryStreamTest, MutableBinaryByteStreamBounds) {
-  std::vector<uint8_t> InputData = {'T', 'e', 's', 't', '\0'};
-  initializeInput(InputData, 1);
-  initializeOutput(InputData.size(), 1);
-
-  // For every combination of input stream and output stream.
-  for (auto &Stream : Streams) {
-    ASSERT_EQ(InputData.size(), Stream.Input->getLength());
-
-    // 1. Try two reads that are supposed to work.  One from offset 0, and one
-    // from the middle.
-    uint32_t Offsets[] = {0, 3};
-    for (auto Offset : Offsets) {
-      uint32_t ExpectedSize = Stream.Input->getLength() - Offset;
-
-      // Read everything from Offset until the end of the input data.
-      ArrayRef<uint8_t> Data;
-      ASSERT_THAT_ERROR(Stream.Input->readBytes(Offset, ExpectedSize, Data),
-                        Succeeded());
-      ASSERT_EQ(ExpectedSize, Data.size());
-
-      // Then write it to the destination.
-      ASSERT_THAT_ERROR(Stream.Output->writeBytes(0, Data), Succeeded());
-
-      // Then we read back what we wrote, it should match the corresponding
-      // slice of the original input data.
-      ArrayRef<uint8_t> Data2;
-      ASSERT_THAT_ERROR(Stream.Output->readBytes(Offset, ExpectedSize, Data2),
-                        Succeeded());
-      EXPECT_EQ(makeArrayRef(InputData).drop_front(Offset), Data2);
-    }
-
-    std::vector<uint8_t> BigData = {0, 1, 2, 3, 4};
-    // 2. If the write is too big, it should fail.
-    EXPECT_THAT_ERROR(Stream.Output->writeBytes(3, BigData), Failed());
-  }
-}
-
-TEST_F(BinaryStreamTest, AppendingStream) {
-  AppendingBinaryByteStream Stream(llvm::support::little);
-  EXPECT_EQ(0U, Stream.getLength());
-
-  std::vector<uint8_t> InputData = {'T', 'e', 's', 't', 'T', 'e', 's', 't'};
-  auto Test = makeArrayRef(InputData).take_front(4);
-  // Writing past the end of the stream is an error.
-  EXPECT_THAT_ERROR(Stream.writeBytes(4, Test), Failed());
-
-  // Writing exactly at the end of the stream is ok.
-  EXPECT_THAT_ERROR(Stream.writeBytes(0, Test), Succeeded());
-  EXPECT_EQ(Test, Stream.data());
-
-  // And now that the end of the stream is where we couldn't write before, now
-  // we can write.
-  EXPECT_THAT_ERROR(Stream.writeBytes(4, Test), Succeeded());
-  EXPECT_EQ(MutableArrayRef<uint8_t>(InputData), Stream.data());
-}
-
-// Test that FixedStreamArray works correctly.
-TEST_F(BinaryStreamTest, FixedStreamArray) {
-  std::vector<uint32_t> Ints = {90823, 12908, 109823, 209823};
-  ArrayRef<uint8_t> IntBytes(reinterpret_cast<uint8_t *>(Ints.data()),
-                             Ints.size() * sizeof(uint32_t));
-
-  initializeInput(IntBytes, alignof(uint32_t));
-
-  for (auto &Stream : Streams) {
-    ASSERT_EQ(InputData.size(), Stream.Input->getLength());
-
-    FixedStreamArray<uint32_t> Array(*Stream.Input);
-    auto Iter = Array.begin();
-    ASSERT_EQ(Ints[0], *Iter++);
-    ASSERT_EQ(Ints[1], *Iter++);
-    ASSERT_EQ(Ints[2], *Iter++);
-    ASSERT_EQ(Ints[3], *Iter++);
-    ASSERT_EQ(Array.end(), Iter);
-  }
-}
-
-// Ensure FixedStreamArrayIterator::operator-> works.
-// Added for coverage of r302257.
-TEST_F(BinaryStreamTest, FixedStreamArrayIteratorArrow) {
-  std::vector<std::pair<uint32_t, uint32_t>> Pairs = {{867, 5309}, {555, 1212}};
-  ArrayRef<uint8_t> PairBytes(reinterpret_cast<uint8_t *>(Pairs.data()),
-    Pairs.size() * sizeof(Pairs[0]));
-
-  initializeInput(PairBytes, alignof(uint32_t));
-
-  for (auto &Stream : Streams) {
-    ASSERT_EQ(InputData.size(), Stream.Input->getLength());
-
-    const FixedStreamArray<std::pair<uint32_t, uint32_t>> Array(*Stream.Input);
-    auto Iter = Array.begin();
-    ASSERT_EQ(Pairs[0].first, Iter->first);
-    ASSERT_EQ(Pairs[0].second, Iter->second);
-    ++Iter;
-    ASSERT_EQ(Pairs[1].first, Iter->first);
-    ASSERT_EQ(Pairs[1].second, Iter->second);
-    ++Iter;
-    ASSERT_EQ(Array.end(), Iter);
-  }
-}
-
-// Test that VarStreamArray works correctly.
-TEST_F(BinaryStreamTest, VarStreamArray) {
-  StringLiteral Strings("1. Test2. Longer Test3. Really Long Test4. Super "
-                        "Extra Longest Test Of All");
-  ArrayRef<uint8_t> StringBytes(
-      reinterpret_cast<const uint8_t *>(Strings.data()), Strings.size());
-  initializeInput(StringBytes, 1);
-
-  struct StringExtractor {
-  public:
-    Error operator()(BinaryStreamRef Stream, uint32_t &Len, StringRef &Item) {
-      if (Index == 0)
-        Len = strlen("1. Test");
-      else if (Index == 1)
-        Len = strlen("2. Longer Test");
-      else if (Index == 2)
-        Len = strlen("3. Really Long Test");
-      else
-        Len = strlen("4. Super Extra Longest Test Of All");
-      ArrayRef<uint8_t> Bytes;
-      if (auto EC = Stream.readBytes(0, Len, Bytes))
-        return EC;
-      Item =
-          StringRef(reinterpret_cast<const char *>(Bytes.data()), Bytes.size());
-      ++Index;
-      return Error::success();
-    }
-
-    uint32_t Index = 0;
-  };
-
-  for (auto &Stream : Streams) {
-    VarStreamArray<StringRef, StringExtractor> Array(*Stream.Input);
-    auto Iter = Array.begin();
-    ASSERT_EQ("1. Test", *Iter++);
-    ASSERT_EQ("2. Longer Test", *Iter++);
-    ASSERT_EQ("3. Really Long Test", *Iter++);
-    ASSERT_EQ("4. Super Extra Longest Test Of All", *Iter++);
-    ASSERT_EQ(Array.end(), Iter);
-  }
-}
-
-TEST_F(BinaryStreamTest, StreamReaderBounds) {
-  std::vector<uint8_t> Bytes;
-
-  initializeInput(Bytes, 1);
-  for (auto &Stream : Streams) {
-    StringRef S;
-    BinaryStreamReader Reader(*Stream.Input);
-    EXPECT_EQ(0U, Reader.bytesRemaining());
-    EXPECT_THAT_ERROR(Reader.readFixedString(S, 1), Failed());
-  }
-
-  Bytes.resize(5);
-  initializeInput(Bytes, 1);
-  for (auto &Stream : Streams) {
-    StringRef S;
-    BinaryStreamReader Reader(*Stream.Input);
-    EXPECT_EQ(Bytes.size(), Reader.bytesRemaining());
-    EXPECT_THAT_ERROR(Reader.readFixedString(S, 5), Succeeded());
-    EXPECT_THAT_ERROR(Reader.readFixedString(S, 6), Failed());
-  }
-}
-
-TEST_F(BinaryStreamTest, StreamReaderIntegers) {
-  support::ulittle64_t Little{908234};
-  support::ubig32_t Big{28907823};
-  short NS = 2897;
-  int NI = -89723;
-  unsigned long NUL = 902309023UL;
-  constexpr uint32_t Size =
-      sizeof(Little) + sizeof(Big) + sizeof(NS) + sizeof(NI) + sizeof(NUL);
-
-  initializeOutput(Size, alignof(support::ulittle64_t));
-  initializeInputFromOutput(alignof(support::ulittle64_t));
-
-  for (auto &Stream : Streams) {
-    BinaryStreamWriter Writer(*Stream.Output);
-    ASSERT_THAT_ERROR(Writer.writeObject(Little), Succeeded());
-    ASSERT_THAT_ERROR(Writer.writeObject(Big), Succeeded());
-    ASSERT_THAT_ERROR(Writer.writeInteger(NS), Succeeded());
-    ASSERT_THAT_ERROR(Writer.writeInteger(NI), Succeeded());
-    ASSERT_THAT_ERROR(Writer.writeInteger(NUL), Succeeded());
-
-    const support::ulittle64_t *Little2;
-    const support::ubig32_t *Big2;
-    short NS2;
-    int NI2;
-    unsigned long NUL2;
-
-    // 1. Reading fields individually.
-    BinaryStreamReader Reader(*Stream.Input);
-    ASSERT_THAT_ERROR(Reader.readObject(Little2), Succeeded());
-    ASSERT_THAT_ERROR(Reader.readObject(Big2), Succeeded());
-    ASSERT_THAT_ERROR(Reader.readInteger(NS2), Succeeded());
-    ASSERT_THAT_ERROR(Reader.readInteger(NI2), Succeeded());
-    ASSERT_THAT_ERROR(Reader.readInteger(NUL2), Succeeded());
-    ASSERT_EQ(0U, Reader.bytesRemaining());
-
-    EXPECT_EQ(Little, *Little2);
-    EXPECT_EQ(Big, *Big2);
-    EXPECT_EQ(NS, NS2);
-    EXPECT_EQ(NI, NI2);
-    EXPECT_EQ(NUL, NUL2);
-  }
-}
-
-TEST_F(BinaryStreamTest, StreamReaderIntegerArray) {
-  // 1. Arrays of integers
-  std::vector<int> Ints = {1, 2, 3, 4, 5};
-  ArrayRef<uint8_t> IntBytes(reinterpret_cast<uint8_t *>(&Ints[0]),
-                             Ints.size() * sizeof(int));
-
-  initializeInput(IntBytes, alignof(int));
-  for (auto &Stream : Streams) {
-    BinaryStreamReader Reader(*Stream.Input);
-    ArrayRef<int> IntsRef;
-    ASSERT_THAT_ERROR(Reader.readArray(IntsRef, Ints.size()), Succeeded());
-    ASSERT_EQ(0U, Reader.bytesRemaining());
-    EXPECT_EQ(makeArrayRef(Ints), IntsRef);
-
-    Reader.setOffset(0);
-    FixedStreamArray<int> FixedIntsRef;
-    ASSERT_THAT_ERROR(Reader.readArray(FixedIntsRef, Ints.size()), Succeeded());
-    ASSERT_EQ(0U, Reader.bytesRemaining());
-    ASSERT_EQ(Ints, std::vector<int>(FixedIntsRef.begin(), FixedIntsRef.end()));
-  }
-}
-
-TEST_F(BinaryStreamTest, StreamReaderEnum) {
-  enum class MyEnum : int64_t { Foo = -10, Bar = 0, Baz = 10 };
-
-  std::vector<MyEnum> Enums = {MyEnum::Bar, MyEnum::Baz, MyEnum::Foo};
-
-  initializeOutput(Enums.size() * sizeof(MyEnum), alignof(MyEnum));
-  initializeInputFromOutput(alignof(MyEnum));
-  for (auto &Stream : Streams) {
-    BinaryStreamWriter Writer(*Stream.Output);
-    for (auto Value : Enums)
-      ASSERT_THAT_ERROR(Writer.writeEnum(Value), Succeeded());
-
-    BinaryStreamReader Reader(*Stream.Input);
-
-    FixedStreamArray<MyEnum> FSA;
-
-    for (size_t I = 0; I < Enums.size(); ++I) {
-      MyEnum Value;
-      ASSERT_THAT_ERROR(Reader.readEnum(Value), Succeeded());
-      EXPECT_EQ(Enums[I], Value);
-    }
-    ASSERT_EQ(0U, Reader.bytesRemaining());
-  }
-}
-
-TEST_F(BinaryStreamTest, StreamReaderULEB128) {
-  std::vector<uint64_t> TestValues = {
-      0,                  // Zero
-      0x7F,               // One byte
-      0xFF,               // One byte, all-ones
-      0xAAAA,             // Two bytes
-      0xAAAAAAAA,         // Four bytes
-      0xAAAAAAAAAAAAAAAA, // Eight bytes
-      0xffffffffffffffff  // Eight bytess, all-ones
-  };
-
-  // Conservatively assume a 10-byte encoding for each of our LEB128s, with no
-  // alignment requirement.
-  initializeOutput(10 * TestValues.size(), 1);
-  initializeInputFromOutput(1);
-
-  for (auto &Stream : Streams) {
-    // Write fields.
-    BinaryStreamWriter Writer(*Stream.Output);
-    for (const auto &Value : TestValues)
-      ASSERT_THAT_ERROR(Writer.writeULEB128(Value), Succeeded());
-
-    // Read fields.
-    BinaryStreamReader Reader(*Stream.Input);
-    std::vector<uint64_t> Results;
-    Results.resize(TestValues.size());
-    for (unsigned I = 0; I != TestValues.size(); ++I)
-      ASSERT_THAT_ERROR(Reader.readULEB128(Results[I]), Succeeded());
-
-    for (unsigned I = 0; I != TestValues.size(); ++I)
-      EXPECT_EQ(TestValues[I], Results[I]);
-  }
-}
-
-TEST_F(BinaryStreamTest, StreamReaderSLEB128) {
-  std::vector<int64_t> TestValues = {
-      0,                  // Zero
-      0x7F,               // One byte
-      -0x7F,              // One byte, negative
-      0xFF,               // One byte, all-ones
-      0xAAAA,             // Two bytes
-      -0xAAAA,            // Two bytes, negative
-      0xAAAAAAAA,         // Four bytes
-      -0xAAAAAAAA,        // Four bytes, negative
-      0x2AAAAAAAAAAAAAAA, // Eight bytes
-      -0x7ffffffffffffff  // Eight bytess, negative
-  };
-
-  // Conservatively assume a 10-byte encoding for each of our LEB128s, with no
-  // alignment requirement.
-  initializeOutput(10 * TestValues.size(), 1);
-  initializeInputFromOutput(1);
-
-  for (auto &Stream : Streams) {
-    // Write fields.
-    BinaryStreamWriter Writer(*Stream.Output);
-    for (const auto &Value : TestValues)
-      ASSERT_THAT_ERROR(Writer.writeSLEB128(Value), Succeeded());
-
-    // Read fields.
-    BinaryStreamReader Reader(*Stream.Input);
-    std::vector<int64_t> Results;
-    Results.resize(TestValues.size());
-    for (unsigned I = 0; I != TestValues.size(); ++I)
-      ASSERT_THAT_ERROR(Reader.readSLEB128(Results[I]), Succeeded());
-
-    for (unsigned I = 0; I != TestValues.size(); ++I)
-      EXPECT_EQ(TestValues[I], Results[I]);
-  }
-}
-
-TEST_F(BinaryStreamTest, StreamReaderObject) {
-  struct Foo {
-    int X;
-    double Y;
-    char Z;
-
-    bool operator==(const Foo &Other) const {
-      return X == Other.X && Y == Other.Y && Z == Other.Z;
-    }
-  };
-
-  std::vector<Foo> Foos;
-  Foos.push_back({-42, 42.42, 42});
-  Foos.push_back({100, 3.1415, static_cast<char>(-89)});
-  Foos.push_back({200, 2.718, static_cast<char>(-12) });
-
-  const uint8_t *Bytes = reinterpret_cast<const uint8_t *>(&Foos[0]);
-
-  initializeInput(makeArrayRef(Bytes, 3 * sizeof(Foo)), alignof(Foo));
-
-  for (auto &Stream : Streams) {
-    // 1. Reading object pointers.
-    BinaryStreamReader Reader(*Stream.Input);
-    const Foo *FPtrOut = nullptr;
-    const Foo *GPtrOut = nullptr;
-    const Foo *HPtrOut = nullptr;
-    ASSERT_THAT_ERROR(Reader.readObject(FPtrOut), Succeeded());
-    ASSERT_THAT_ERROR(Reader.readObject(GPtrOut), Succeeded());
-    ASSERT_THAT_ERROR(Reader.readObject(HPtrOut), Succeeded());
-    EXPECT_EQ(0U, Reader.bytesRemaining());
-    EXPECT_EQ(Foos[0], *FPtrOut);
-    EXPECT_EQ(Foos[1], *GPtrOut);
-    EXPECT_EQ(Foos[2], *HPtrOut);
-  }
-}
-
-TEST_F(BinaryStreamTest, StreamReaderStrings) {
-  std::vector<uint8_t> Bytes = {'O',  'n', 'e', '\0', 'T', 'w', 'o',
-                                '\0', 'T', 'h', 'r',  'e', 'e', '\0',
-                                'F',  'o', 'u', 'r',  '\0'};
-  initializeInput(Bytes, 1);
-
-  for (auto &Stream : Streams) {
-    BinaryStreamReader Reader(*Stream.Input);
-
-    StringRef S1;
-    StringRef S2;
-    StringRef S3;
-    StringRef S4;
-    ASSERT_THAT_ERROR(Reader.readCString(S1), Succeeded());
-    ASSERT_THAT_ERROR(Reader.readCString(S2), Succeeded());
-    ASSERT_THAT_ERROR(Reader.readCString(S3), Succeeded());
-    ASSERT_THAT_ERROR(Reader.readCString(S4), Succeeded());
-    ASSERT_EQ(0U, Reader.bytesRemaining());
-
-    EXPECT_EQ("One", S1);
-    EXPECT_EQ("Two", S2);
-    EXPECT_EQ("Three", S3);
-    EXPECT_EQ("Four", S4);
-
-    S1 = S2 = S3 = S4 = "";
-    Reader.setOffset(0);
-    ASSERT_THAT_ERROR(Reader.readFixedString(S1, 3), Succeeded());
-    ASSERT_THAT_ERROR(Reader.skip(1), Succeeded());
-    ASSERT_THAT_ERROR(Reader.readFixedString(S2, 3), Succeeded());
-    ASSERT_THAT_ERROR(Reader.skip(1), Succeeded());
-    ASSERT_THAT_ERROR(Reader.readFixedString(S3, 5), Succeeded());
-    ASSERT_THAT_ERROR(Reader.skip(1), Succeeded());
-    ASSERT_THAT_ERROR(Reader.readFixedString(S4, 4), Succeeded());
-    ASSERT_THAT_ERROR(Reader.skip(1), Succeeded());
-    ASSERT_EQ(0U, Reader.bytesRemaining());
-
-    EXPECT_EQ("One", S1);
-    EXPECT_EQ("Two", S2);
-    EXPECT_EQ("Three", S3);
-    EXPECT_EQ("Four", S4);
-  }
-}
-
-TEST_F(BinaryStreamTest, StreamWriterBounds) {
-  initializeOutput(5, 1);
-
-  for (auto &Stream : Streams) {
-    BinaryStreamWriter Writer(*Stream.Output);
-
-    // 1. Can write a string that exactly fills the buffer.
-    EXPECT_EQ(5U, Writer.bytesRemaining());
-    EXPECT_THAT_ERROR(Writer.writeFixedString("abcde"), Succeeded());
-    EXPECT_EQ(0U, Writer.bytesRemaining());
-
-    // 2. Can write an empty string even when you're full
-    EXPECT_THAT_ERROR(Writer.writeFixedString(""), Succeeded());
-    EXPECT_THAT_ERROR(Writer.writeFixedString("a"), Failed());
-
-    // 3. Can't write a string that is one character too long.
-    Writer.setOffset(0);
-    EXPECT_THAT_ERROR(Writer.writeFixedString("abcdef"), Failed());
-  }
-}
-
-TEST_F(BinaryStreamTest, StreamWriterIntegerArrays) {
-  // 3. Arrays of integers
-  std::vector<int> SourceInts = {1, 2, 3, 4, 5};
-  ArrayRef<uint8_t> SourceBytes(reinterpret_cast<uint8_t *>(&SourceInts[0]),
-                                SourceInts.size() * sizeof(int));
-
-  initializeInput(SourceBytes, alignof(int));
-  initializeOutputFromInput(alignof(int));
-
-  for (auto &Stream : Streams) {
-    BinaryStreamReader Reader(*Stream.Input);
-    BinaryStreamWriter Writer(*Stream.Output);
-    ArrayRef<int> Ints;
-    ArrayRef<int> Ints2;
-    // First read them, then write them, then read them back.
-    ASSERT_THAT_ERROR(Reader.readArray(Ints, SourceInts.size()), Succeeded());
-    ASSERT_THAT_ERROR(Writer.writeArray(Ints), Succeeded());
-
-    BinaryStreamReader ReaderBacker(*Stream.Output);
-    ASSERT_THAT_ERROR(ReaderBacker.readArray(Ints2, SourceInts.size()),
-                      Succeeded());
-
-    EXPECT_EQ(makeArrayRef(SourceInts), Ints2);
-  }
-}
-
-TEST_F(BinaryStreamTest, StringWriterStrings) {
-  StringRef Strings[] = {"First", "Second", "Third", "Fourth"};
-
-  size_t Length = 0;
-  for (auto S : Strings)
-    Length += S.size() + 1;
-  initializeOutput(Length, 1);
-  initializeInputFromOutput(1);
-
-  for (auto &Stream : Streams) {
-    BinaryStreamWriter Writer(*Stream.Output);
-    for (auto S : Strings)
-      ASSERT_THAT_ERROR(Writer.writeCString(S), Succeeded());
-    std::vector<StringRef> InStrings;
-    BinaryStreamReader Reader(*Stream.Input);
-    while (!Reader.empty()) {
-      StringRef S;
-      ASSERT_THAT_ERROR(Reader.readCString(S), Succeeded());
-      InStrings.push_back(S);
-    }
-    EXPECT_EQ(makeArrayRef(Strings), makeArrayRef(InStrings));
-  }
-}
-
-TEST_F(BinaryStreamTest, StreamWriterAppend) {
-  StringRef Strings[] = {"First", "Second", "Third", "Fourth"};
-  AppendingBinaryByteStream Stream(support::little);
-  BinaryStreamWriter Writer(Stream);
-
-  for (auto &Str : Strings) {
-    EXPECT_THAT_ERROR(Writer.writeCString(Str), Succeeded());
-  }
-
-  BinaryStreamReader Reader(Stream);
-  for (auto &Str : Strings) {
-    StringRef S;
-    EXPECT_THAT_ERROR(Reader.readCString(S), Succeeded());
-    EXPECT_EQ(Str, S);
-  }
-}
-}
-
-namespace {
-struct BinaryItemStreamObject {
-  explicit BinaryItemStreamObject(ArrayRef<uint8_t> Bytes) : Bytes(Bytes) {}
-
-  ArrayRef<uint8_t> Bytes;
-};
-}
-
-namespace llvm {
-template <> struct BinaryItemTraits<BinaryItemStreamObject> {
-  static size_t length(const BinaryItemStreamObject &Item) {
-    return Item.Bytes.size();
-  }
-
-  static ArrayRef<uint8_t> bytes(const BinaryItemStreamObject &Item) {
-    return Item.Bytes;
-  }
-};
-}
-
-namespace {
-
-TEST_F(BinaryStreamTest, BinaryItemStream) {
-  std::vector<BinaryItemStreamObject> Objects;
-
-  struct Foo {
-    int X;
-    double Y;
-  };
-  std::vector<Foo> Foos = {{1, 1.0}, {2, 2.0}, {3, 3.0}};
-  BumpPtrAllocator Allocator;
-  for (const auto &F : Foos) {
-    uint8_t *Ptr = static_cast<uint8_t *>(Allocator.Allocate(sizeof(Foo),
-                                                             alignof(Foo)));
-    MutableArrayRef<uint8_t> Buffer(Ptr, sizeof(Foo));
-    MutableBinaryByteStream Stream(Buffer, llvm::support::big);
-    BinaryStreamWriter Writer(Stream);
-    ASSERT_THAT_ERROR(Writer.writeObject(F), Succeeded());
-    Objects.push_back(BinaryItemStreamObject(Buffer));
-  }
-
-  BinaryItemStream<BinaryItemStreamObject> ItemStream(big);
-  ItemStream.setItems(Objects);
-  BinaryStreamReader Reader(ItemStream);
-
-  for (const auto &F : Foos) {
-    const Foo *F2;
-    ASSERT_THAT_ERROR(Reader.readObject(F2), Succeeded());
-
-    EXPECT_EQ(F.X, F2->X);
-    EXPECT_DOUBLE_EQ(F.Y, F2->Y);
-  }
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/Support/BlockFrequencyTest.cpp b/gnu/llvm/llvm/unittests/Support/BlockFrequencyTest.cpp
deleted file mode 100644
index cf5cf921350..00000000000
--- a/gnu/llvm/llvm/unittests/Support/BlockFrequencyTest.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//===- unittests/Support/BlockFrequencyTest.cpp - BlockFrequency tests ----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/BlockFrequency.h"
-#include "llvm/Support/BranchProbability.h"
-#include "llvm/Support/DataTypes.h"
-#include "gtest/gtest.h"
-#include <climits>
-
-using namespace llvm;
-
-namespace {
-
-TEST(BlockFrequencyTest, OneToZero) {
-  BlockFrequency Freq(1);
-  BranchProbability Prob(UINT32_MAX / 3, UINT32_MAX);
-  Freq *= Prob;
-  EXPECT_EQ(Freq.getFrequency(), 0u);
-
-  Freq = BlockFrequency(1);
-  Freq *= Prob;
-  EXPECT_EQ(Freq.getFrequency(), 0u);
-}
-
-TEST(BlockFrequencyTest, OneToOne) {
-  BlockFrequency Freq(1);
-  BranchProbability Prob(UINT32_MAX, UINT32_MAX);
-  Freq *= Prob;
-  EXPECT_EQ(Freq.getFrequency(), 1u);
-
-  Freq = BlockFrequency(1);
-  Freq *= Prob;
-  EXPECT_EQ(Freq.getFrequency(), 1u);
-}
-
-TEST(BlockFrequencyTest, ThreeToOne) {
-  BlockFrequency Freq(3);
-  BranchProbability Prob(3000000, 9000000);
-  Freq *= Prob;
-  EXPECT_EQ(Freq.getFrequency(), 1u);
-
-  Freq = BlockFrequency(3);
-  Freq *= Prob;
-  EXPECT_EQ(Freq.getFrequency(), 1u);
-}
-
-TEST(BlockFrequencyTest, MaxToHalfMax) {
-  BlockFrequency Freq(UINT64_MAX);
-  BranchProbability Prob(UINT32_MAX / 2, UINT32_MAX);
-  Freq *= Prob;
-  EXPECT_EQ(Freq.getFrequency(), 9223372036854775807ULL);
-
-  Freq = BlockFrequency(UINT64_MAX);
-  Freq *= Prob;
-  EXPECT_EQ(Freq.getFrequency(), 9223372036854775807ULL);
-}
-
-TEST(BlockFrequencyTest, BigToBig) {
-  const uint64_t Big = 387246523487234346LL;
-  const uint32_t P = 123456789;
-  BlockFrequency Freq(Big);
-  BranchProbability Prob(P, P);
-  Freq *= Prob;
-  EXPECT_EQ(Freq.getFrequency(), Big);
-
-  Freq = BlockFrequency(Big);
-  Freq *= Prob;
-  EXPECT_EQ(Freq.getFrequency(), Big);
-}
-
-TEST(BlockFrequencyTest, MaxToMax) {
-  BlockFrequency Freq(UINT64_MAX);
-  BranchProbability Prob(UINT32_MAX, UINT32_MAX);
-  Freq *= Prob;
-  EXPECT_EQ(Freq.getFrequency(), UINT64_MAX);
-
-  // This additionally makes sure if we have a value equal to our saturating
-  // value, we do not signal saturation if the result equals said value, but
-  // saturating does not occur.
-  Freq = BlockFrequency(UINT64_MAX);
-  Freq *= Prob;
-  EXPECT_EQ(Freq.getFrequency(), UINT64_MAX);
-}
-
-TEST(BlockFrequencyTest, Subtract) {
-  BlockFrequency Freq1(0), Freq2(1);
-  EXPECT_EQ((Freq1 - Freq2).getFrequency(), 0u);
-  EXPECT_EQ((Freq2 - Freq1).getFrequency(), 1u);
-}
-
-TEST(BlockFrequency, Divide) {
-  BlockFrequency Freq(0x3333333333333333ULL);
-  Freq /= BranchProbability(1, 2);
-  EXPECT_EQ(Freq.getFrequency(), 0x6666666666666666ULL);
-}
-
-TEST(BlockFrequencyTest, Saturate) {
-  BlockFrequency Freq(0x3333333333333333ULL);
-  Freq /= BranchProbability(100, 300);
-  EXPECT_EQ(Freq.getFrequency(), 0x9999999866666668ULL);
-  Freq /= BranchProbability(1, 2);
-  EXPECT_EQ(Freq.getFrequency(), UINT64_MAX);
-
-  Freq = 0x1000000000000000ULL;
-  Freq /= BranchProbability(10000, 170000);
-  EXPECT_EQ(Freq.getFrequency(), UINT64_MAX);
-
-  // Try to cheat the multiplication overflow check.
-  Freq = 0x00000001f0000001ull;
-  Freq /= BranchProbability(1000, 0xf000000f);
-  EXPECT_EQ(33527736066704712ULL, Freq.getFrequency());
-}
-
-TEST(BlockFrequencyTest, SaturatingRightShift) {
-  BlockFrequency Freq(0x10080ULL);
-  Freq >>= 2;
-  EXPECT_EQ(Freq.getFrequency(), 0x4020ULL);
-  Freq >>= 20;
-  EXPECT_EQ(Freq.getFrequency(), 0x1ULL);
-}
-
-}
diff --git a/gnu/llvm/llvm/unittests/Support/BranchProbabilityTest.cpp b/gnu/llvm/llvm/unittests/Support/BranchProbabilityTest.cpp
deleted file mode 100644
index 94626e796e2..00000000000
--- a/gnu/llvm/llvm/unittests/Support/BranchProbabilityTest.cpp
+++ /dev/null
@@ -1,405 +0,0 @@
-//===- unittest/Support/BranchProbabilityTest.cpp - BranchProbability tests -=//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/BranchProbability.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace llvm {
-void PrintTo(BranchProbability P, ::std::ostream *os) {
-  *os << P.getNumerator() << "/" << P.getDenominator();
-}
-}
-namespace {
-
-typedef BranchProbability BP;
-TEST(BranchProbabilityTest, Accessors) {
-  EXPECT_EQ(306783378u, BP(1, 7).getNumerator());
-  EXPECT_EQ(1u << 31, BP(1, 7).getDenominator());
-  EXPECT_EQ(0u, BP::getZero().getNumerator());
-  EXPECT_EQ(1u << 31, BP::getZero().getDenominator());
-  EXPECT_EQ(1u << 31, BP::getOne().getNumerator());
-  EXPECT_EQ(1u << 31, BP::getOne().getDenominator());
-}
-
-TEST(BranchProbabilityTest, Operators) {
-  EXPECT_TRUE(BP(1, 7) < BP(2, 7));
-  EXPECT_TRUE(BP(1, 7) < BP(1, 4));
-  EXPECT_TRUE(BP(5, 7) < BP(3, 4));
-  EXPECT_FALSE(BP(1, 7) < BP(1, 7));
-  EXPECT_FALSE(BP(1, 7) < BP(2, 14));
-  EXPECT_FALSE(BP(4, 7) < BP(1, 2));
-  EXPECT_FALSE(BP(4, 7) < BP(3, 7));
-
-  EXPECT_FALSE(BP(1, 7) > BP(2, 7));
-  EXPECT_FALSE(BP(1, 7) > BP(1, 4));
-  EXPECT_FALSE(BP(5, 7) > BP(3, 4));
-  EXPECT_FALSE(BP(1, 7) > BP(1, 7));
-  EXPECT_FALSE(BP(1, 7) > BP(2, 14));
-  EXPECT_TRUE(BP(4, 7) > BP(1, 2));
-  EXPECT_TRUE(BP(4, 7) > BP(3, 7));
-
-  EXPECT_TRUE(BP(1, 7) <= BP(2, 7));
-  EXPECT_TRUE(BP(1, 7) <= BP(1, 4));
-  EXPECT_TRUE(BP(5, 7) <= BP(3, 4));
-  EXPECT_TRUE(BP(1, 7) <= BP(1, 7));
-  EXPECT_TRUE(BP(1, 7) <= BP(2, 14));
-  EXPECT_FALSE(BP(4, 7) <= BP(1, 2));
-  EXPECT_FALSE(BP(4, 7) <= BP(3, 7));
-
-  EXPECT_FALSE(BP(1, 7) >= BP(2, 7));
-  EXPECT_FALSE(BP(1, 7) >= BP(1, 4));
-  EXPECT_FALSE(BP(5, 7) >= BP(3, 4));
-  EXPECT_TRUE(BP(1, 7) >= BP(1, 7));
-  EXPECT_TRUE(BP(1, 7) >= BP(2, 14));
-  EXPECT_TRUE(BP(4, 7) >= BP(1, 2));
-  EXPECT_TRUE(BP(4, 7) >= BP(3, 7));
-
-  EXPECT_FALSE(BP(1, 7) == BP(2, 7));
-  EXPECT_FALSE(BP(1, 7) == BP(1, 4));
-  EXPECT_FALSE(BP(5, 7) == BP(3, 4));
-  EXPECT_TRUE(BP(1, 7) == BP(1, 7));
-  EXPECT_TRUE(BP(1, 7) == BP(2, 14));
-  EXPECT_FALSE(BP(4, 7) == BP(1, 2));
-  EXPECT_FALSE(BP(4, 7) == BP(3, 7));
-
-  EXPECT_TRUE(BP(1, 7) != BP(2, 7));
-  EXPECT_TRUE(BP(1, 7) != BP(1, 4));
-  EXPECT_TRUE(BP(5, 7) != BP(3, 4));
-  EXPECT_FALSE(BP(1, 7) != BP(1, 7));
-  EXPECT_FALSE(BP(1, 7) != BP(2, 14));
-  EXPECT_TRUE(BP(4, 7) != BP(1, 2));
-  EXPECT_TRUE(BP(4, 7) != BP(3, 7));
-
-  EXPECT_TRUE(BP(1, 7) == BP(2, 14));
-  EXPECT_TRUE(BP(1, 7) == BP(3, 21));
-  EXPECT_TRUE(BP(5, 7) == BP(25, 35));
-  EXPECT_TRUE(BP(99999998, 100000000) < BP(99999999, 100000000));
-  EXPECT_TRUE(BP(4, 8) == BP(400000000, 800000000));
-}
-
-TEST(BranchProbabilityTest, MoreOperators) {
-  BP A(4, 5);
-  BP B(4U << 29, 5U << 29);
-  BP C(3, 4);
-
-  EXPECT_TRUE(A == B);
-  EXPECT_FALSE(A != B);
-  EXPECT_FALSE(A < B);
-  EXPECT_FALSE(A > B);
-  EXPECT_TRUE(A <= B);
-  EXPECT_TRUE(A >= B);
-
-  EXPECT_FALSE(B == C);
-  EXPECT_TRUE(B != C);
-  EXPECT_FALSE(B < C);
-  EXPECT_TRUE(B > C);
-  EXPECT_FALSE(B <= C);
-  EXPECT_TRUE(B >= C);
-
-  BP BigZero(0, UINT32_MAX);
-  BP BigOne(UINT32_MAX, UINT32_MAX);
-  EXPECT_FALSE(BigZero == BigOne);
-  EXPECT_TRUE(BigZero != BigOne);
-  EXPECT_TRUE(BigZero < BigOne);
-  EXPECT_FALSE(BigZero > BigOne);
-  EXPECT_TRUE(BigZero <= BigOne);
-  EXPECT_FALSE(BigZero >= BigOne);
-}
-
-TEST(BranchProbabilityTest, ArithmeticOperators) {
-  BP Z(0, 1);
-  BP O(1, 1);
-  BP H(1, 2);
-  BP Q(1, 4);
-  BP Q3(3, 4);
-
-  EXPECT_EQ(Z + O, O);
-  EXPECT_EQ(H + Z, H);
-  EXPECT_EQ(H + H, O);
-  EXPECT_EQ(Q + H, Q3);
-  EXPECT_EQ(Q + Q3, O);
-  EXPECT_EQ(H + Q3, O);
-  EXPECT_EQ(Q3 + Q3, O);
-
-  EXPECT_EQ(Z - O, Z);
-  EXPECT_EQ(O - Z, O);
-  EXPECT_EQ(O - H, H);
-  EXPECT_EQ(O - Q, Q3);
-  EXPECT_EQ(Q3 - H, Q);
-  EXPECT_EQ(Q - H, Z);
-  EXPECT_EQ(Q - Q3, Z);
-
-  EXPECT_EQ(Z * O, Z);
-  EXPECT_EQ(H * H, Q);
-  EXPECT_EQ(Q * O, Q);
-  EXPECT_EQ(O * O, O);
-  EXPECT_EQ(Z * Z, Z);
-
-  EXPECT_EQ(Z * 3, Z);
-  EXPECT_EQ(Q * 3, Q3);
-  EXPECT_EQ(H * 3, O);
-  EXPECT_EQ(Q3 * 2, O);
-  EXPECT_EQ(O * UINT32_MAX, O);
-
-  EXPECT_EQ(Z / 4, Z);
-  EXPECT_EQ(O / 4, Q);
-  EXPECT_EQ(Q3 / 3, Q);
-  EXPECT_EQ(H / 2, Q);
-  EXPECT_EQ(O / 2, H);
-  EXPECT_EQ(H / UINT32_MAX, Z);
-
-  BP Min(1, 1u << 31);
-
-  EXPECT_EQ(O / UINT32_MAX, Z);
-  EXPECT_EQ(Min * UINT32_MAX, O);
-}
-
-TEST(BranchProbabilityTest, getCompl) {
-  EXPECT_EQ(BP(5, 7), BP(2, 7).getCompl());
-  EXPECT_EQ(BP(2, 7), BP(5, 7).getCompl());
-  EXPECT_EQ(BP::getZero(), BP(7, 7).getCompl());
-  EXPECT_EQ(BP::getOne(), BP(0, 7).getCompl());
-}
-
-TEST(BranchProbabilityTest, scale) {
-  // Multiply by 1.0.
-  EXPECT_EQ(UINT64_MAX, BP(1, 1).scale(UINT64_MAX));
-  EXPECT_EQ(UINT64_MAX, BP(7, 7).scale(UINT64_MAX));
-  EXPECT_EQ(UINT32_MAX, BP(1, 1).scale(UINT32_MAX));
-  EXPECT_EQ(UINT32_MAX, BP(7, 7).scale(UINT32_MAX));
-  EXPECT_EQ(0u, BP(1, 1).scale(0));
-  EXPECT_EQ(0u, BP(7, 7).scale(0));
-
-  // Multiply by 0.0.
-  EXPECT_EQ(0u, BP(0, 1).scale(UINT64_MAX));
-  EXPECT_EQ(0u, BP(0, 1).scale(UINT64_MAX));
-  EXPECT_EQ(0u, BP(0, 1).scale(0));
-
-  auto Two63 = UINT64_C(1) << 63;
-  auto Two31 = UINT64_C(1) << 31;
-
-  // Multiply by 0.5.
-  EXPECT_EQ(Two63 - 1, BP(1, 2).scale(UINT64_MAX));
-
-  // Big fractions.
-  EXPECT_EQ(1u, BP(Two31, UINT32_MAX).scale(2));
-  EXPECT_EQ(Two31, BP(Two31, UINT32_MAX).scale(Two31 * 2));
-  EXPECT_EQ(9223372036854775807ULL, BP(Two31, UINT32_MAX).scale(UINT64_MAX));
-
-  // High precision.
-  EXPECT_EQ(UINT64_C(9223372045444710399),
-            BP(Two31 + 1, UINT32_MAX - 2).scale(UINT64_MAX));
-}
-
-TEST(BranchProbabilityTest, scaleByInverse) {
-  // Divide by 1.0.
-  EXPECT_EQ(UINT64_MAX, BP(1, 1).scaleByInverse(UINT64_MAX));
-  EXPECT_EQ(UINT64_MAX, BP(7, 7).scaleByInverse(UINT64_MAX));
-  EXPECT_EQ(UINT32_MAX, BP(1, 1).scaleByInverse(UINT32_MAX));
-  EXPECT_EQ(UINT32_MAX, BP(7, 7).scaleByInverse(UINT32_MAX));
-  EXPECT_EQ(0u, BP(1, 1).scaleByInverse(0));
-  EXPECT_EQ(0u, BP(7, 7).scaleByInverse(0));
-
-  auto MAX_DENOMINATOR = BP::getDenominator();
-
-  // Divide by something very small.
-  EXPECT_EQ(UINT64_MAX, BP(1, UINT32_MAX).scaleByInverse(UINT64_MAX));
-  EXPECT_EQ(uint64_t(UINT32_MAX) * MAX_DENOMINATOR,
-            BP(1, MAX_DENOMINATOR).scaleByInverse(UINT32_MAX));
-  EXPECT_EQ(MAX_DENOMINATOR, BP(1, MAX_DENOMINATOR).scaleByInverse(1));
-
-  auto Two63 = UINT64_C(1) << 63;
-  auto Two31 = UINT64_C(1) << 31;
-
-  // Divide by 0.5.
-  EXPECT_EQ(UINT64_MAX - 1, BP(1, 2).scaleByInverse(Two63 - 1));
-  EXPECT_EQ(UINT64_MAX, BP(1, 2).scaleByInverse(Two63));
-
-  // Big fractions.
-  EXPECT_EQ(2u, BP(Two31, UINT32_MAX).scaleByInverse(1));
-  EXPECT_EQ(2u, BP(Two31 - 1, UINT32_MAX).scaleByInverse(1));
-  EXPECT_EQ(Two31 * 2, BP(Two31, UINT32_MAX).scaleByInverse(Two31));
-  EXPECT_EQ(Two31 * 2, BP(Two31 - 1, UINT32_MAX).scaleByInverse(Two31));
-  EXPECT_EQ(UINT64_MAX, BP(Two31, UINT32_MAX).scaleByInverse(Two63 + Two31));
-
-  // High precision.  The exact answers to these are close to the successors of
-  // the floor.  If we were rounding, these would round up.
-  EXPECT_EQ(UINT64_C(18446744060824649767),
-            BP(Two31 + 2, UINT32_MAX - 2)
-                .scaleByInverse(UINT64_C(9223372047592194056)));
-  EXPECT_EQ(UINT64_C(18446744060824649739),
-            BP(Two31 + 1, UINT32_MAX).scaleByInverse(Two63 + Two31));
-}
-
-TEST(BranchProbabilityTest, scaleBruteForce) {
-  struct {
-    uint64_t Num;
-    uint32_t Prob[2];
-    uint64_t Result;
-  } Tests[] = {
-    // Data for scaling that results in <= 64 bit division.
-    { 0x1423e2a50ULL, { 0x64819521, 0x7765dd13 }, 0x10f418888ULL },
-    { 0x35ef14ceULL, { 0x28ade3c7, 0x304532ae }, 0x2d73c33bULL },
-    { 0xd03dbfbe24ULL, { 0x790079, 0xe419f3 }, 0x6e776fc2c4ULL },
-    { 0x21d67410bULL, { 0x302a9dc2, 0x3ddb4442 }, 0x1a5948fd4ULL },
-    { 0x8664aeadULL, { 0x3d523513, 0x403523b1 }, 0x805a04cfULL },
-    { 0x201db0cf4ULL, { 0x35112a7b, 0x79fc0c74 }, 0xdf8b07f8ULL },
-    { 0x13f1e4430aULL, { 0x21c92bf, 0x21e63aae }, 0x13e0cba26ULL },
-    { 0x16c83229ULL, { 0x3793f66f, 0x53180dea }, 0xf3ce7b6ULL },
-    { 0xc62415be8ULL, { 0x9cc4a63, 0x4327ae9b }, 0x1ce8b71c1ULL },
-    { 0x6fac5e434ULL, { 0xe5f9170, 0x1115e10b }, 0x5df23dd4cULL },
-    { 0x1929375f2ULL, { 0x3a851375, 0x76c08456 }, 0xc662b083ULL },
-    { 0x243c89db6ULL, { 0x354ebfc0, 0x450ef197 }, 0x1bf8c1663ULL },
-    { 0x310e9b31aULL, { 0x1b1b8acf, 0x2d3629f0 }, 0x1d69c93f9ULL },
-    { 0xa1fae921dULL, { 0xa7a098c, 0x10469f44 }, 0x684413d6eULL },
-    { 0xc1582d957ULL, { 0x498e061, 0x59856bc }, 0x9edc5f4ecULL },
-    { 0x57cfee75ULL, { 0x1d061dc3, 0x7c8bfc17 }, 0x1476a220ULL },
-    { 0x139220080ULL, { 0x294a6c71, 0x2a2b07c9 }, 0x1329e1c75ULL },
-    { 0x1665d353cULL, { 0x7080db5, 0xde0d75c }, 0xb590d9faULL },
-    { 0xe8f14541ULL, { 0x5188e8b2, 0x736527ef }, 0xa4971be5ULL },
-    { 0x2f4775f29ULL, { 0x254ef0fe, 0x435fcf50 }, 0x1a2e449c1ULL },
-    { 0x27b85d8d7ULL, { 0x304c8220, 0x5de678f2 }, 0x146e3befbULL },
-    { 0x1d362e36bULL, { 0x36c85b12, 0x37a66f55 }, 0x1cc19b8e7ULL },
-    { 0x155fd48c7ULL, { 0xf5894d, 0x1256108 }, 0x11e383604ULL },
-    { 0xb5db2d15ULL, { 0x39bb26c5, 0x5bdcda3e }, 0x72499259ULL },
-    { 0x153990298ULL, { 0x48921c09, 0x706eb817 }, 0xdb3268e7ULL },
-    { 0x28a7c3ed7ULL, { 0x1f776fd7, 0x349f7a70 }, 0x184f73ae2ULL },
-    { 0x724dbeabULL, { 0x1bd149f5, 0x253a085e }, 0x5569c0b3ULL },
-    { 0xd8f0c513ULL, { 0x18c8cc4c, 0x1b72bad0 }, 0xc3e30642ULL },
-    { 0x17ce3dcbULL, { 0x1e4c6260, 0x233b359e }, 0x1478f4afULL },
-    { 0x1ce036ce0ULL, { 0x29e3c8af, 0x5318dd4a }, 0xe8e76195ULL },
-    { 0x1473ae2aULL, { 0x29b897ba, 0x2be29378 }, 0x13718185ULL },
-    { 0x1dd41aa68ULL, { 0x3d0a4441, 0x5a0e8f12 }, 0x1437b6bbfULL },
-    { 0x1b49e4a53ULL, { 0x3430c1fe, 0x5a204aed }, 0xfcd6852fULL },
-    { 0x217941b19ULL, { 0x12ced2bd, 0x21b68310 }, 0x12aca65b1ULL },
-    { 0xac6a4dc8ULL, { 0x3ed68da8, 0x6fdca34c }, 0x60da926dULL },
-    { 0x1c503a4e7ULL, { 0xfcbbd32, 0x11e48d17 }, 0x18fec7d37ULL },
-    { 0x1c885855ULL, { 0x213e919d, 0x25941897 }, 0x193de742ULL },
-    { 0x29b9c168eULL, { 0x2b644aea, 0x45725ee7 }, 0x1a122e5d4ULL },
-    { 0x806a33f2ULL, { 0x30a80a23, 0x5063733a }, 0x4db9a264ULL },
-    { 0x282afc96bULL, { 0x143ae554, 0x1a9863ff }, 0x1e8de5204ULL },
-    // Data for scaling that results in > 64 bit division.
-    { 0x23ca5f2f672ca41cULL, { 0xecbc641, 0x111373f7 }, 0x1f0301e5c76869c6ULL },
-    { 0x5e4f2468142265e3ULL, { 0x1ddf5837, 0x32189233 }, 0x383ca7bad6053ac9ULL },
-    { 0x277a1a6f6b266bf6ULL, { 0x415d81a8, 0x61eb5e1e }, 0x1a5a3e1d1c9e8540ULL },
-    { 0x1bdbb49a237035cbULL, { 0xea5bf17, 0x1d25ffb3 }, 0xdffc51c5cb51cf1ULL },
-    { 0x2bce6d29b64fb8ULL, { 0x3bfd5631, 0x7525c9bb }, 0x166ebedd9581fdULL },
-    { 0x3a02116103df5013ULL, { 0x2ee18a83, 0x3299aea8 }, 0x35be89227276f105ULL },
-    { 0x7b5762390799b18cULL, { 0x12f8e5b9, 0x2563bcd4 }, 0x3e960077695655a3ULL },
-    { 0x69cfd72537021579ULL, { 0x4c35f468, 0x6a40feee }, 0x4be4cb38695a4f30ULL },
-    { 0x49dfdf835120f1c1ULL, { 0x8cb3759, 0x559eb891 }, 0x79663f6e3c8d8f6ULL },
-    { 0x74b5be5c27676381ULL, { 0x47e4c5e0, 0x7c7b19ff }, 0x4367d2dfb22b3265ULL },
-    { 0x4f50f97075e7f431ULL, { 0x9a50a17, 0x11cd1185 }, 0x2af952b30374f382ULL },
-    { 0x2f8b0d712e393be4ULL, { 0x1487e386, 0x15aa356e }, 0x2d0df3649b2b19fcULL },
-    { 0x224c1c75999d3deULL, { 0x3b2df0ea, 0x4523b100 }, 0x1d5b481d160dd8bULL },
-    { 0x2bcbcea22a399a76ULL, { 0x28b58212, 0x48dd013e }, 0x187814d0610c8a56ULL },
-    { 0x1dbfca91257cb2d1ULL, { 0x1a8c04d9, 0x5e92502c }, 0x859cf7d19e83ad0ULL },
-    { 0x7f20039b57cda935ULL, { 0xeccf651, 0x323f476e }, 0x25720cd9054634bdULL },
-    { 0x40512c6a586aa087ULL, { 0x113b0423, 0x398c9eab }, 0x1341c03dbb662054ULL },
-    { 0x63d802693f050a11ULL, { 0xf50cdd6, 0xfce2a44 }, 0x60c0177b667a4feaULL },
-    { 0x2d956b422838de77ULL, { 0xb2d345b, 0x1321e557 }, 0x1aa0ed16b094575cULL },
-    { 0x5a1cdf0c1657bc91ULL, { 0x1d77bb0c, 0x1f991ff1 }, 0x54097ee9907290eaULL },
-    { 0x3801b26d7e00176bULL, { 0xeed25da, 0x1a819d8b }, 0x1f89e96a616b9abeULL },
-    { 0x37655e74338e1e45ULL, { 0x300e170a, 0x5a1595fe }, 0x1d8cfb55ff6a6dbcULL },
-    { 0x7b38703f2a84e6ULL, { 0x66d9053, 0xc79b6b9 }, 0x3f7d4c91b9afb9ULL },
-    { 0x2245063c0acb3215ULL, { 0x30ce2f5b, 0x610e7271 }, 0x113b916455fe2560ULL },
-    { 0x6bc195877b7b8a7eULL, { 0x392004aa, 0x4a24e60c }, 0x530594fabfc81cc3ULL },
-    { 0x40a3fde23c7b43dbULL, { 0x4e712195, 0x6553e56e }, 0x320a799bc205c78dULL },
-    { 0x1d3dfc2866fbccbaULL, { 0x5075b517, 0x5fc42245 }, 0x18917f00745cb781ULL },
-    { 0x19aeb14045a61121ULL, { 0x1bf6edec, 0x707e2f4b }, 0x6626672aa2ba10aULL },
-    { 0x44ff90486c531e9fULL, { 0x66598a, 0x8a90dc }, 0x32f6f2b097001598ULL },
-    { 0x3f3e7121092c5bcbULL, { 0x1c754df7, 0x5951a1b9 }, 0x14267f50d4971583ULL },
-    { 0x60e2dafb7e50a67eULL, { 0x4d96c66e, 0x65bd878d }, 0x49e317155d75e883ULL },
-    { 0x656286667e0e6e29ULL, { 0x9d971a2, 0xacda23b }, 0x5c6ee3159e1deac3ULL },
-    { 0x1114e0974255d507ULL, { 0x1c693, 0x2d6ff }, 0xaae42e4be5f9f8dULL },
-    { 0x508c8baf3a70ff5aULL, { 0x3b26b779, 0x6ad78745 }, 0x2c983876178ed5b1ULL },
-    { 0x5b47bc666bf1f9cfULL, { 0x10a87ed6, 0x187d358a }, 0x3e1767153bea720aULL },
-    { 0x50954e3744460395ULL, { 0x7a42263, 0xcdaa048 }, 0x2fe739f0944a023cULL },
-    { 0x20020b406550dd8fULL, { 0x3318539, 0x42eead0 }, 0x186f326307c0d985ULL },
-    { 0x5bcb0b872439ffd5ULL, { 0x6f61fb2, 0x9af7344 }, 0x41fa1e3c47f0f80dULL },
-    { 0x7a670f365db87a53ULL, { 0x417e102, 0x3bb54c67 }, 0x8642a551d0f41b0ULL },
-    { 0x1ef0db1e7bab1cd0ULL, { 0x2b60cf38, 0x4188f78f }, 0x147ae0d63fc0575aULL }
-  };
-
-  for (const auto &T : Tests) {
-    EXPECT_EQ(T.Result, BP(T.Prob[0], T.Prob[1]).scale(T.Num));
-  }
-}
-
-TEST(BranchProbabilityTest, NormalizeProbabilities) {
-  const auto UnknownProb = BranchProbability::getUnknown();
-  {
-    SmallVector<BranchProbability, 2> Probs{{0, 1}, {0, 1}};
-    BranchProbability::normalizeProbabilities(Probs.begin(), Probs.end());
-    EXPECT_EQ(BranchProbability::getDenominator() / 2, Probs[0].getNumerator());
-    EXPECT_EQ(BranchProbability::getDenominator() / 2, Probs[1].getNumerator());
-  }
-  {
-    SmallVector<BranchProbability, 2> Probs{{0, 1}, {1, 1}};
-    BranchProbability::normalizeProbabilities(Probs.begin(), Probs.end());
-    EXPECT_EQ(0u, Probs[0].getNumerator());
-    EXPECT_EQ(BranchProbability::getDenominator(), Probs[1].getNumerator());
-  }
-  {
-    SmallVector<BranchProbability, 2> Probs{{1, 100}, {1, 100}};
-    BranchProbability::normalizeProbabilities(Probs.begin(), Probs.end());
-    EXPECT_EQ(BranchProbability::getDenominator() / 2, Probs[0].getNumerator());
-    EXPECT_EQ(BranchProbability::getDenominator() / 2, Probs[1].getNumerator());
-  }
-  {
-    SmallVector<BranchProbability, 2> Probs{{1, 1}, {1, 1}};
-    BranchProbability::normalizeProbabilities(Probs.begin(), Probs.end());
-    EXPECT_EQ(BranchProbability::getDenominator() / 2, Probs[0].getNumerator());
-    EXPECT_EQ(BranchProbability::getDenominator() / 2, Probs[1].getNumerator());
-  }
-  {
-    SmallVector<BranchProbability, 3> Probs{{1, 1}, {1, 1}, {1, 1}};
-    BranchProbability::normalizeProbabilities(Probs.begin(), Probs.end());
-    EXPECT_EQ(BranchProbability::getDenominator() / 3 + 1,
-              Probs[0].getNumerator());
-    EXPECT_EQ(BranchProbability::getDenominator() / 3 + 1,
-              Probs[1].getNumerator());
-    EXPECT_EQ(BranchProbability::getDenominator() / 3 + 1,
-              Probs[2].getNumerator());
-  }
-  {
-    SmallVector<BranchProbability, 2> Probs{{0, 1}, UnknownProb};
-    BranchProbability::normalizeProbabilities(Probs.begin(), Probs.end());
-    EXPECT_EQ(0U, Probs[0].getNumerator());
-    EXPECT_EQ(BranchProbability::getDenominator(), Probs[1].getNumerator());
-  }
-  {
-    SmallVector<BranchProbability, 2> Probs{{1, 1}, UnknownProb};
-    BranchProbability::normalizeProbabilities(Probs.begin(), Probs.end());
-    EXPECT_EQ(BranchProbability::getDenominator(), Probs[0].getNumerator());
-    EXPECT_EQ(0U, Probs[1].getNumerator());
-  }
-  {
-    SmallVector<BranchProbability, 2> Probs{{1, 2}, UnknownProb};
-    BranchProbability::normalizeProbabilities(Probs.begin(), Probs.end());
-    EXPECT_EQ(BranchProbability::getDenominator() / 2, Probs[0].getNumerator());
-    EXPECT_EQ(BranchProbability::getDenominator() / 2, Probs[1].getNumerator());
-  }
-  {
-    SmallVector<BranchProbability, 4> Probs{
-        {1, 2}, {1, 2}, {1, 2}, UnknownProb};
-    BranchProbability::normalizeProbabilities(Probs.begin(), Probs.end());
-    EXPECT_EQ(BranchProbability::getDenominator() / 3 + 1,
-              Probs[0].getNumerator());
-    EXPECT_EQ(BranchProbability::getDenominator() / 3 + 1,
-              Probs[1].getNumerator());
-    EXPECT_EQ(BranchProbability::getDenominator() / 3 + 1,
-              Probs[2].getNumerator());
-    EXPECT_EQ(0U, Probs[3].getNumerator());
-  }
-}
-
-}
diff --git a/gnu/llvm/llvm/unittests/Support/CMakeLists.txt b/gnu/llvm/llvm/unittests/Support/CMakeLists.txt
deleted file mode 100644
index f03f12ee88e..00000000000
--- a/gnu/llvm/llvm/unittests/Support/CMakeLists.txt
+++ /dev/null
@@ -1,129 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  Support
-  )
-
-add_llvm_unittest(SupportTests
-  AlignmentTest.cpp
-  AlignOfTest.cpp
-  AllocatorTest.cpp
-  AnnotationsTest.cpp
-  ARMAttributeParser.cpp
-  ArrayRecyclerTest.cpp
-  Base64Test.cpp
-  BinaryStreamTest.cpp
-  BlockFrequencyTest.cpp
-  BranchProbabilityTest.cpp
-  CachePruningTest.cpp
-  CrashRecoveryTest.cpp
-  Casting.cpp
-  CheckedArithmeticTest.cpp
-  Chrono.cpp
-  CommandLineTest.cpp
-  CompressionTest.cpp
-  ConvertUTFTest.cpp
-  CRCTest.cpp
-  DataExtractorTest.cpp
-  DebugTest.cpp
-  DebugCounterTest.cpp
-  DJBTest.cpp
-  EndianStreamTest.cpp
-  EndianTest.cpp
-  ELFAttributeParserTest.cpp
-  ErrnoTest.cpp
-  ErrorOrTest.cpp
-  ErrorTest.cpp
-  ExtensibleRTTITest.cpp
-  FileCollectorTest.cpp
-  FileOutputBufferTest.cpp
-  FileUtilitiesTest.cpp
-  FormatVariadicTest.cpp
-  FSUniqueIDTest.cpp
-  GlobPatternTest.cpp
-  Host.cpp
-  IndexedAccessorTest.cpp
-  InstructionCostTest.cpp
-  ItaniumManglingCanonicalizerTest.cpp
-  JSONTest.cpp
-  KnownBitsTest.cpp
-  LEB128Test.cpp
-  LinearPolyBaseTest.cpp
-  LineIteratorTest.cpp
-  LockFileManagerTest.cpp
-  MatchersTest.cpp
-  MD5Test.cpp
-  ManagedStatic.cpp
-  MathExtrasTest.cpp
-  MemoryBufferRefTest.cpp
-  MemoryBufferTest.cpp
-  MemoryTest.cpp
-  NativeFormatTests.cpp
-  OptimizedStructLayoutTest.cpp
-  ParallelTest.cpp
-  Path.cpp
-  ProcessTest.cpp
-  ProgramTest.cpp
-  RegexTest.cpp
-  ReverseIterationTest.cpp
-  ReplaceFileTest.cpp
-  RISCVAttributeParserTest.cpp
-  ScaledNumberTest.cpp
-  SHA256.cpp
-  SourceMgrTest.cpp
-  SpecialCaseListTest.cpp
-  SuffixTreeTest.cpp
-  SwapByteOrderTest.cpp
-  SymbolRemappingReaderTest.cpp
-  TarWriterTest.cpp
-  TargetParserTest.cpp
-  TaskQueueTest.cpp
-  ThreadLocalTest.cpp
-  ThreadPool.cpp
-  Threading.cpp
-  TimerTest.cpp
-  ToolOutputFileTest.cpp
-  TypeNameTest.cpp
-  TypeTraitsTest.cpp
-  TrailingObjectsTest.cpp
-  TrigramIndexTest.cpp
-  UnicodeTest.cpp
-  VersionTupleTest.cpp
-  VirtualFileSystemTest.cpp
-  WithColorTest.cpp
-  YAMLIOTest.cpp
-  YAMLParserTest.cpp
-  formatted_raw_ostream_test.cpp
-  raw_fd_stream_test.cpp
-  raw_ostream_test.cpp
-  raw_pwrite_stream_test.cpp
-  raw_sha1_ostream_test.cpp
-  xxhashTest.cpp
-  )
-
-target_link_libraries(SupportTests PRIVATE LLVMTestingSupport)
-
-# Disable all warning for AlignOfTest.cpp,
-# as it does things intentionally, and there is no reliable way of
-# disabling all warnings for all the compilers by using pragmas.
-# Don't disable on MSVC, because all incriminated warnings are already disabled
-# in source; and because we would otherwise see this warning:
-#   cl : Command line warning D9025: overriding '/W4' with '/w'
-if(NOT MSVC)
-  set_source_files_properties(AlignOfTest.cpp PROPERTIES COMPILE_FLAGS -w)
-endif()
-if(MSVC)
-  if( CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.14 )
-    # Since VS2017 15.8, the following snippet: Failed<CustomSubError>()
-    # generates a warning:
-    # \svn\llvm\utils\unittest\googlemock\include\gmock\gmock-matchers.h(186):
-    #   warning C5046: 'testing::MatcherInterface<T>::~MatcherInterface': Symbol involving type with internal linkage not defined
-    set_source_files_properties(ErrorTest.cpp PROPERTIES COMPILE_FLAGS -wd5046)
-  endif()
-endif()
-
-# ManagedStatic.cpp uses <pthread>.
-target_link_libraries(SupportTests PRIVATE LLVMTestingSupport ${LLVM_PTHREAD_LIB})
-
-if(NOT LLVM_INTEGRATED_CRT_ALLOC)
-  # The test doesn't pass when using a custom allocator, PR47881.
-  add_subdirectory(DynamicLibrary)
-endif()
diff --git a/gnu/llvm/llvm/unittests/Support/CRCTest.cpp b/gnu/llvm/llvm/unittests/Support/CRCTest.cpp
deleted file mode 100644
index 32d2cf71939..00000000000
--- a/gnu/llvm/llvm/unittests/Support/CRCTest.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-//===- llvm/unittest/Support/CRCTest.cpp - CRC tests ----------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements unit tests for CRC calculation functions.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/CRC.h"
-#include "llvm/ADT/StringExtras.h"
-#include "gtest/gtest.h"
-#include <stdlib.h>
-
-using namespace llvm;
-
-namespace {
-
-TEST(CRCTest, CRC32) {
-  EXPECT_EQ(0x414FA339U, llvm::crc32(arrayRefFromStringRef(
-                             "The quick brown fox jumps over the lazy dog")));
-
-  // CRC-32/ISO-HDLC test vector
-  // http://reveng.sourceforge.net/crc-catalogue/17plus.htm#crc.cat.crc-32c
-  EXPECT_EQ(0xCBF43926U, llvm::crc32(arrayRefFromStringRef("123456789")));
-
-  // Check the CRC-32 of each byte value, exercising all of CRCTable.
-  for (int i = 0; i < 256; i++) {
-    // Compute CRCTable[i] using Hacker's Delight (2nd ed.) Figure 14-7.
-    uint32_t crc = i;
-    for (int j = 7; j >= 0; j--) {
-      uint32_t mask = -(crc & 1);
-      crc = (crc >> 1) ^ (0xEDB88320 & mask);
-    }
-
-    // CRCTable[i] is the CRC-32 of i without the initial and final bit flips.
-    uint8_t byte = i;
-    EXPECT_EQ(crc, ~llvm::crc32(0xFFFFFFFFU, byte));
-  }
-
-  EXPECT_EQ(0x00000000U, llvm::crc32(arrayRefFromStringRef("")));
-}
-
-#if (SIZE_MAX > UINT32_MAX) && defined(EXPENSIVE_CHECKS)
-TEST(CRCTest, LargeCRC32) {
-  // Check that crc32 can handle inputs with sizes larger than 32 bits.
-  size_t TestSize = (size_t)UINT32_MAX + 42;
-  uint8_t *TestData = (uint8_t*)calloc(TestSize, 1);
-  if (!TestData)
-    return;
-
-  // Test expectation generated with:
-  // $ truncate --size=`echo 2^32-1+42 | bc` /tmp/foo
-  // $ crc32 /tmp/foo
-  EXPECT_EQ(0xE46F28FBU, llvm::crc32(makeArrayRef(TestData, TestSize)));
-
-  free(TestData);
-}
-#endif
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/Support/CachePruningTest.cpp b/gnu/llvm/llvm/unittests/Support/CachePruningTest.cpp
deleted file mode 100644
index eeffe218ae6..00000000000
--- a/gnu/llvm/llvm/unittests/Support/CachePruningTest.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-//===- CachePruningTest.cpp -----------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/CachePruning.h"
-#include "llvm/Support/Error.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-TEST(CachePruningPolicyParser, Empty) {
-  auto P = parseCachePruningPolicy("");
-  ASSERT_TRUE(bool(P));
-  EXPECT_EQ(std::chrono::seconds(1200), P->Interval);
-  EXPECT_EQ(std::chrono::hours(7 * 24), P->Expiration);
-  EXPECT_EQ(75u, P->MaxSizePercentageOfAvailableSpace);
-}
-
-TEST(CachePruningPolicyParser, Interval) {
-  auto P = parseCachePruningPolicy("prune_interval=1s");
-  ASSERT_TRUE(bool(P));
-  EXPECT_EQ(std::chrono::seconds(1), P->Interval);
-  P = parseCachePruningPolicy("prune_interval=2m");
-  ASSERT_TRUE(bool(P));
-  EXPECT_EQ(std::chrono::minutes(2), *P->Interval);
-  P = parseCachePruningPolicy("prune_interval=3h");
-  ASSERT_TRUE(bool(P));
-  EXPECT_EQ(std::chrono::hours(3), *P->Interval);
-}
-
-TEST(CachePruningPolicyParser, Expiration) {
-  auto P = parseCachePruningPolicy("prune_after=1s");
-  ASSERT_TRUE(bool(P));
-  EXPECT_EQ(std::chrono::seconds(1), P->Expiration);
-}
-
-TEST(CachePruningPolicyParser, MaxSizePercentageOfAvailableSpace) {
-  auto P = parseCachePruningPolicy("cache_size=100%");
-  ASSERT_TRUE(bool(P));
-  EXPECT_EQ(100u, P->MaxSizePercentageOfAvailableSpace);
-  EXPECT_EQ(0u, P->MaxSizeBytes);
-}
-
-TEST(CachePruningPolicyParser, MaxSizeBytes) {
-  auto P = parseCachePruningPolicy("cache_size_bytes=1");
-  ASSERT_TRUE(bool(P));
-  EXPECT_EQ(75u, P->MaxSizePercentageOfAvailableSpace);
-  EXPECT_EQ(1u, P->MaxSizeBytes);
-  P = parseCachePruningPolicy("cache_size_bytes=2k");
-  ASSERT_TRUE(bool(P));
-  EXPECT_EQ(75u, P->MaxSizePercentageOfAvailableSpace);
-  EXPECT_EQ(2u * 1024u, P->MaxSizeBytes);
-  P = parseCachePruningPolicy("cache_size_bytes=3m");
-  ASSERT_TRUE(bool(P));
-  EXPECT_EQ(75u, P->MaxSizePercentageOfAvailableSpace);
-  EXPECT_EQ(3u * 1024u * 1024u, P->MaxSizeBytes);
-  P = parseCachePruningPolicy("cache_size_bytes=4G");
-  ASSERT_TRUE(bool(P));
-  EXPECT_EQ(75u, P->MaxSizePercentageOfAvailableSpace);
-  EXPECT_EQ(4ull * 1024ull * 1024ull * 1024ull, P->MaxSizeBytes);
-}
-
-TEST(CachePruningPolicyParser, Multiple) {
-  auto P = parseCachePruningPolicy("prune_after=1s:cache_size=50%");
-  ASSERT_TRUE(bool(P));
-  EXPECT_EQ(std::chrono::seconds(1200), P->Interval);
-  EXPECT_EQ(std::chrono::seconds(1), P->Expiration);
-  EXPECT_EQ(50u, P->MaxSizePercentageOfAvailableSpace);
-}
-
-TEST(CachePruningPolicyParser, Errors) {
-  EXPECT_EQ("Duration must not be empty",
-            toString(parseCachePruningPolicy("prune_interval=").takeError()));
-  EXPECT_EQ("'foo' not an integer",
-            toString(parseCachePruningPolicy("prune_interval=foos").takeError()));
-  EXPECT_EQ("'24x' must end with one of 's', 'm' or 'h'",
-            toString(parseCachePruningPolicy("prune_interval=24x").takeError()));
-  EXPECT_EQ("'foo' must be a percentage",
-            toString(parseCachePruningPolicy("cache_size=foo").takeError()));
-  EXPECT_EQ("'foo' not an integer",
-            toString(parseCachePruningPolicy("cache_size=foo%").takeError()));
-  EXPECT_EQ("'101' must be between 0 and 100",
-            toString(parseCachePruningPolicy("cache_size=101%").takeError()));
-  EXPECT_EQ(
-      "'foo' not an integer",
-      toString(parseCachePruningPolicy("cache_size_bytes=foo").takeError()));
-  EXPECT_EQ(
-      "'foo' not an integer",
-      toString(parseCachePruningPolicy("cache_size_bytes=foom").takeError()));
-  EXPECT_EQ("Unknown key: 'foo'",
-            toString(parseCachePruningPolicy("foo=bar").takeError()));
-}
diff --git a/gnu/llvm/llvm/unittests/Support/Casting.cpp b/gnu/llvm/llvm/unittests/Support/Casting.cpp
deleted file mode 100644
index a196fc2ec5e..00000000000
--- a/gnu/llvm/llvm/unittests/Support/Casting.cpp
+++ /dev/null
@@ -1,410 +0,0 @@
-//===---------- llvm/unittest/Support/Casting.cpp - Casting tests ---------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/Casting.h"
-#include "llvm/IR/User.h"
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gtest/gtest.h"
-#include <cstdlib>
-
-namespace llvm {
-// Used to test illegal cast. If a cast doesn't match any of the "real" ones,
-// it will match this one.
-struct IllegalCast;
-template <typename T> IllegalCast *cast(...) { return nullptr; }
-
-// set up two example classes
-// with conversion facility
-//
-struct bar {
-  bar() {}
-  struct foo *baz();
-  struct foo *caz();
-  struct foo *daz();
-  struct foo *naz();
-private:
-  bar(const bar &);
-};
-struct foo {
-  void ext() const;
-  /*  static bool classof(const bar *X) {
-    cerr << "Classof: " << X << "\n";
-    return true;
-    }*/
-};
-
-struct base {
-  virtual ~base() {}
-};
-
-struct derived : public base {
-  static bool classof(const base *B) { return true; }
-};
-
-template <> struct isa_impl<foo, bar> {
-  static inline bool doit(const bar &Val) {
-    dbgs() << "Classof: " << &Val << "\n";
-    return true;
-  }
-};
-
-template <typename T> struct isa_impl<foo, T> {
-  static inline bool doit(const T &Val) { return false; }
-};
-
-foo *bar::baz() {
-    return cast<foo>(this);
-}
-
-foo *bar::caz() {
-    return cast_or_null<foo>(this);
-}
-
-foo *bar::daz() {
-    return dyn_cast<foo>(this);
-}
-
-foo *bar::naz() {
-    return dyn_cast_or_null<foo>(this);
-}
-
-
-bar *fub();
-
-template <> struct simplify_type<foo> {
-  typedef int SimpleType;
-  static SimpleType getSimplifiedValue(foo &Val) { return 0; }
-};
-
-} // End llvm namespace
-
-using namespace llvm;
-
-
-// Test the peculiar behavior of Use in simplify_type.
-static_assert(std::is_same<simplify_type<Use>::SimpleType, Value *>::value,
-              "Use doesn't simplify correctly!");
-static_assert(std::is_same<simplify_type<Use *>::SimpleType, Value *>::value,
-              "Use doesn't simplify correctly!");
-
-// Test that a regular class behaves as expected.
-static_assert(std::is_same<simplify_type<foo>::SimpleType, int>::value,
-              "Unexpected simplify_type result!");
-static_assert(std::is_same<simplify_type<foo *>::SimpleType, foo *>::value,
-              "Unexpected simplify_type result!");
-
-namespace {
-
-const foo *null_foo = nullptr;
-
-bar B;
-extern bar &B1;
-bar &B1 = B;
-extern const bar *B2;
-// test various configurations of const
-const bar &B3 = B1;
-const bar *const B4 = B2;
-
-TEST(CastingTest, isa) {
-  EXPECT_TRUE(isa<foo>(B1));
-  EXPECT_TRUE(isa<foo>(B2));
-  EXPECT_TRUE(isa<foo>(B3));
-  EXPECT_TRUE(isa<foo>(B4));
-}
-
-TEST(CastingTest, isa_and_nonnull) {
-  EXPECT_TRUE(isa_and_nonnull<foo>(B2));
-  EXPECT_TRUE(isa_and_nonnull<foo>(B4));
-  EXPECT_FALSE(isa_and_nonnull<foo>(fub()));
-}
-
-TEST(CastingTest, cast) {
-  foo &F1 = cast<foo>(B1);
-  EXPECT_NE(&F1, null_foo);
-  const foo *F3 = cast<foo>(B2);
-  EXPECT_NE(F3, null_foo);
-  const foo *F4 = cast<foo>(B2);
-  EXPECT_NE(F4, null_foo);
-  const foo &F5 = cast<foo>(B3);
-  EXPECT_NE(&F5, null_foo);
-  const foo *F6 = cast<foo>(B4);
-  EXPECT_NE(F6, null_foo);
-  // Can't pass null pointer to cast<>.
-  // foo *F7 = cast<foo>(fub());
-  // EXPECT_EQ(F7, null_foo);
-  foo *F8 = B1.baz();
-  EXPECT_NE(F8, null_foo);
-
-  std::unique_ptr<const bar> BP(B2);
-  auto FP = cast<foo>(std::move(BP));
-  static_assert(std::is_same<std::unique_ptr<const foo>, decltype(FP)>::value,
-                "Incorrect deduced return type!");
-  EXPECT_NE(FP.get(), null_foo);
-  FP.release();
-}
-
-TEST(CastingTest, cast_or_null) {
-  const foo *F11 = cast_or_null<foo>(B2);
-  EXPECT_NE(F11, null_foo);
-  const foo *F12 = cast_or_null<foo>(B2);
-  EXPECT_NE(F12, null_foo);
-  const foo *F13 = cast_or_null<foo>(B4);
-  EXPECT_NE(F13, null_foo);
-  const foo *F14 = cast_or_null<foo>(fub());  // Shouldn't print.
-  EXPECT_EQ(F14, null_foo);
-  foo *F15 = B1.caz();
-  EXPECT_NE(F15, null_foo);
-
-  std::unique_ptr<const bar> BP(fub());
-  auto FP = cast_or_null<foo>(std::move(BP));
-  EXPECT_EQ(FP.get(), null_foo);
-}
-
-TEST(CastingTest, dyn_cast) {
-  const foo *F1 = dyn_cast<foo>(B2);
-  EXPECT_NE(F1, null_foo);
-  const foo *F2 = dyn_cast<foo>(B2);
-  EXPECT_NE(F2, null_foo);
-  const foo *F3 = dyn_cast<foo>(B4);
-  EXPECT_NE(F3, null_foo);
-  // Can't pass null pointer to dyn_cast<>.
-  // foo *F4 = dyn_cast<foo>(fub());
-  // EXPECT_EQ(F4, null_foo);
-  foo *F5 = B1.daz();
-  EXPECT_NE(F5, null_foo);
-}
-
-TEST(CastingTest, dyn_cast_or_null) {
-  const foo *F1 = dyn_cast_or_null<foo>(B2);
-  EXPECT_NE(F1, null_foo);
-  const foo *F2 = dyn_cast_or_null<foo>(B2);
-  EXPECT_NE(F2, null_foo);
-  const foo *F3 = dyn_cast_or_null<foo>(B4);
-  EXPECT_NE(F3, null_foo);
-  foo *F4 = dyn_cast_or_null<foo>(fub());
-  EXPECT_EQ(F4, null_foo);
-  foo *F5 = B1.naz();
-  EXPECT_NE(F5, null_foo);
-}
-
-std::unique_ptr<derived> newd() { return std::make_unique<derived>(); }
-std::unique_ptr<base> newb() { return std::make_unique<derived>(); }
-
-TEST(CastingTest, unique_dyn_cast) {
-  derived *OrigD = nullptr;
-  auto D = std::make_unique<derived>();
-  OrigD = D.get();
-
-  // Converting from D to itself is valid, it should return a new unique_ptr
-  // and the old one should become nullptr.
-  auto NewD = unique_dyn_cast<derived>(D);
-  ASSERT_EQ(OrigD, NewD.get());
-  ASSERT_EQ(nullptr, D);
-
-  // Converting from D to B is valid, B should have a value and D should be
-  // nullptr.
-  auto B = unique_dyn_cast<base>(NewD);
-  ASSERT_EQ(OrigD, B.get());
-  ASSERT_EQ(nullptr, NewD);
-
-  // Converting from B to itself is valid, it should return a new unique_ptr
-  // and the old one should become nullptr.
-  auto NewB = unique_dyn_cast<base>(B);
-  ASSERT_EQ(OrigD, NewB.get());
-  ASSERT_EQ(nullptr, B);
-
-  // Converting from B to D is valid, D should have a value and B should be
-  // nullptr;
-  D = unique_dyn_cast<derived>(NewB);
-  ASSERT_EQ(OrigD, D.get());
-  ASSERT_EQ(nullptr, NewB);
-
-  // Converting between unrelated types should fail.  The original value should
-  // remain unchanged and it should return nullptr.
-  auto F = unique_dyn_cast<foo>(D);
-  ASSERT_EQ(nullptr, F);
-  ASSERT_EQ(OrigD, D.get());
-
-  // All of the above should also hold for temporaries.
-  auto D2 = unique_dyn_cast<derived>(newd());
-  EXPECT_NE(nullptr, D2);
-
-  auto B2 = unique_dyn_cast<derived>(newb());
-  EXPECT_NE(nullptr, B2);
-
-  auto B3 = unique_dyn_cast<base>(newb());
-  EXPECT_NE(nullptr, B3);
-
-  auto F2 = unique_dyn_cast<foo>(newb());
-  EXPECT_EQ(nullptr, F2);
-}
-
-// These lines are errors...
-//foo *F20 = cast<foo>(B2);  // Yields const foo*
-//foo &F21 = cast<foo>(B3);  // Yields const foo&
-//foo *F22 = cast<foo>(B4);  // Yields const foo*
-//foo &F23 = cast_or_null<foo>(B1);
-//const foo &F24 = cast_or_null<foo>(B3);
-
-const bar *B2 = &B;
-}  // anonymous namespace
-
-bar *llvm::fub() { return nullptr; }
-
-namespace {
-namespace inferred_upcasting {
-// This test case verifies correct behavior of inferred upcasts when the
-// types are statically known to be OK to upcast. This is the case when,
-// for example, Derived inherits from Base, and we do `isa<Base>(Derived)`.
-
-// Note: This test will actually fail to compile without inferred
-// upcasting.
-
-class Base {
-public:
-  // No classof. We are testing that the upcast is inferred.
-  Base() {}
-};
-
-class Derived : public Base {
-public:
-  Derived() {}
-};
-
-// Even with no explicit classof() in Base, we should still be able to cast
-// Derived to its base class.
-TEST(CastingTest, UpcastIsInferred) {
-  Derived D;
-  EXPECT_TRUE(isa<Base>(D));
-  Base *BP = dyn_cast<Base>(&D);
-  EXPECT_TRUE(BP != nullptr);
-}
-
-
-// This test verifies that the inferred upcast takes precedence over an
-// explicitly written one. This is important because it verifies that the
-// dynamic check gets optimized away.
-class UseInferredUpcast {
-public:
-  int Dummy;
-  static bool classof(const UseInferredUpcast *) {
-    return false;
-  }
-};
-
-TEST(CastingTest, InferredUpcastTakesPrecedence) {
-  UseInferredUpcast UIU;
-  // Since the explicit classof() returns false, this will fail if the
-  // explicit one is used.
-  EXPECT_TRUE(isa<UseInferredUpcast>(&UIU));
-}
-
-} // end namespace inferred_upcasting
-} // end anonymous namespace
-// Test that we reject casts of temporaries (and so the illegal cast gets used).
-namespace TemporaryCast {
-struct pod {};
-IllegalCast *testIllegalCast() { return cast<foo>(pod()); }
-}
-
-namespace {
-namespace pointer_wrappers {
-
-struct Base {
-  bool IsDerived;
-  Base(bool IsDerived = false) : IsDerived(IsDerived) {}
-};
-
-struct Derived : Base {
-  Derived() : Base(true) {}
-  static bool classof(const Base *B) { return B->IsDerived; }
-};
-
-class PTy {
-  Base *B;
-public:
-  PTy(Base *B) : B(B) {}
-  explicit operator bool() const { return get(); }
-  Base *get() const { return B; }
-};
-
-} // end namespace pointer_wrappers
-} // end namespace
-
-namespace llvm {
-
-template <> struct simplify_type<pointer_wrappers::PTy> {
-  typedef pointer_wrappers::Base *SimpleType;
-  static SimpleType getSimplifiedValue(pointer_wrappers::PTy &P) {
-    return P.get();
-  }
-};
-template <> struct simplify_type<const pointer_wrappers::PTy> {
-  typedef pointer_wrappers::Base *SimpleType;
-  static SimpleType getSimplifiedValue(const pointer_wrappers::PTy &P) {
-    return P.get();
-  }
-};
-
-} // end namespace llvm
-
-namespace {
-namespace pointer_wrappers {
-
-// Some objects.
-pointer_wrappers::Base B;
-pointer_wrappers::Derived D;
-
-// Mutable "smart" pointers.
-pointer_wrappers::PTy MN(nullptr);
-pointer_wrappers::PTy MB(&B);
-pointer_wrappers::PTy MD(&D);
-
-// Const "smart" pointers.
-const pointer_wrappers::PTy CN(nullptr);
-const pointer_wrappers::PTy CB(&B);
-const pointer_wrappers::PTy CD(&D);
-
-TEST(CastingTest, smart_isa) {
-  EXPECT_TRUE(!isa<pointer_wrappers::Derived>(MB));
-  EXPECT_TRUE(!isa<pointer_wrappers::Derived>(CB));
-  EXPECT_TRUE(isa<pointer_wrappers::Derived>(MD));
-  EXPECT_TRUE(isa<pointer_wrappers::Derived>(CD));
-}
-
-TEST(CastingTest, smart_cast) {
-  EXPECT_TRUE(cast<pointer_wrappers::Derived>(MD) == &D);
-  EXPECT_TRUE(cast<pointer_wrappers::Derived>(CD) == &D);
-}
-
-TEST(CastingTest, smart_cast_or_null) {
-  EXPECT_TRUE(cast_or_null<pointer_wrappers::Derived>(MN) == nullptr);
-  EXPECT_TRUE(cast_or_null<pointer_wrappers::Derived>(CN) == nullptr);
-  EXPECT_TRUE(cast_or_null<pointer_wrappers::Derived>(MD) == &D);
-  EXPECT_TRUE(cast_or_null<pointer_wrappers::Derived>(CD) == &D);
-}
-
-TEST(CastingTest, smart_dyn_cast) {
-  EXPECT_TRUE(dyn_cast<pointer_wrappers::Derived>(MB) == nullptr);
-  EXPECT_TRUE(dyn_cast<pointer_wrappers::Derived>(CB) == nullptr);
-  EXPECT_TRUE(dyn_cast<pointer_wrappers::Derived>(MD) == &D);
-  EXPECT_TRUE(dyn_cast<pointer_wrappers::Derived>(CD) == &D);
-}
-
-TEST(CastingTest, smart_dyn_cast_or_null) {
-  EXPECT_TRUE(dyn_cast_or_null<pointer_wrappers::Derived>(MN) == nullptr);
-  EXPECT_TRUE(dyn_cast_or_null<pointer_wrappers::Derived>(CN) == nullptr);
-  EXPECT_TRUE(dyn_cast_or_null<pointer_wrappers::Derived>(MB) == nullptr);
-  EXPECT_TRUE(dyn_cast_or_null<pointer_wrappers::Derived>(CB) == nullptr);
-  EXPECT_TRUE(dyn_cast_or_null<pointer_wrappers::Derived>(MD) == &D);
-  EXPECT_TRUE(dyn_cast_or_null<pointer_wrappers::Derived>(CD) == &D);
-}
-
-} // end namespace pointer_wrappers
-} // end namespace
diff --git a/gnu/llvm/llvm/unittests/Support/CheckedArithmeticTest.cpp b/gnu/llvm/llvm/unittests/Support/CheckedArithmeticTest.cpp
deleted file mode 100644
index 18eee4c447e..00000000000
--- a/gnu/llvm/llvm/unittests/Support/CheckedArithmeticTest.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-#include "llvm/Support/CheckedArithmetic.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST(CheckedArithmetic, CheckedAdd) {
-  const int64_t Max = std::numeric_limits<int64_t>::max();
-  const int64_t Min = std::numeric_limits<int64_t>::min();
-  EXPECT_EQ(checkedAdd<int64_t>(Max, Max), None);
-  EXPECT_EQ(checkedAdd<int64_t>(Min, -1), None);
-  EXPECT_EQ(checkedAdd<int64_t>(Max, 1), None);
-  EXPECT_EQ(checkedAdd<int64_t>(10, 1), Optional<int64_t>(11));
-}
-
-TEST(CheckedArithmetic, CheckedAddSmall) {
-  const int16_t Max = std::numeric_limits<int16_t>::max();
-  const int16_t Min = std::numeric_limits<int16_t>::min();
-  EXPECT_EQ(checkedAdd<int16_t>(Max, Max), None);
-  EXPECT_EQ(checkedAdd<int16_t>(Min, -1), None);
-  EXPECT_EQ(checkedAdd<int16_t>(Max, 1), None);
-  EXPECT_EQ(checkedAdd<int16_t>(10, 1), Optional<int64_t>(11));
-}
-
-TEST(CheckedArithmetic, CheckedMul) {
-  const int64_t Max = std::numeric_limits<int64_t>::max();
-  const int64_t Min = std::numeric_limits<int64_t>::min();
-  EXPECT_EQ(checkedMul<int64_t>(Max, 2), None);
-  EXPECT_EQ(checkedMul<int64_t>(Max, Max), None);
-  EXPECT_EQ(checkedMul<int64_t>(Min, 2), None);
-  EXPECT_EQ(checkedMul<int64_t>(10, 2), Optional<int64_t>(20));
-}
-
-TEST(CheckedArithmetic, CheckedMulAdd) {
-  const int64_t Max = std::numeric_limits<int64_t>::max();
-  const int64_t Min = std::numeric_limits<int64_t>::min();
-  EXPECT_EQ(checkedMulAdd<int64_t>(Max, 1, 2), None);
-  EXPECT_EQ(checkedMulAdd<int64_t>(1, 1, Max), None);
-  EXPECT_EQ(checkedMulAdd<int64_t>(1, -1, Min), None);
-  EXPECT_EQ(checkedMulAdd<int64_t>(10, 2, 3), Optional<int64_t>(23));
-}
-
-TEST(CheckedArithmetic, CheckedMulSmall) {
-  const int16_t Max = std::numeric_limits<int16_t>::max();
-  const int16_t Min = std::numeric_limits<int16_t>::min();
-  EXPECT_EQ(checkedMul<int16_t>(Max, 2), None);
-  EXPECT_EQ(checkedMul<int16_t>(Max, Max), None);
-  EXPECT_EQ(checkedMul<int16_t>(Min, 2), None);
-  EXPECT_EQ(checkedMul<int16_t>(10, 2), Optional<int16_t>(20));
-}
-
-TEST(CheckedArithmetic, CheckedMulAddSmall) {
-  const int16_t Max = std::numeric_limits<int16_t>::max();
-  const int16_t Min = std::numeric_limits<int16_t>::min();
-  EXPECT_EQ(checkedMulAdd<int16_t>(Max, 1, 2), None);
-  EXPECT_EQ(checkedMulAdd<int16_t>(1, 1, Max), None);
-  EXPECT_EQ(checkedMulAdd<int16_t>(1, -1, Min), None);
-  EXPECT_EQ(checkedMulAdd<int16_t>(10, 2, 3), Optional<int16_t>(23));
-}
-
-TEST(CheckedArithmetic, CheckedAddUnsigned) {
-  const uint64_t Max = std::numeric_limits<uint64_t>::max();
-  EXPECT_EQ(checkedAddUnsigned<uint64_t>(Max, Max), None);
-  EXPECT_EQ(checkedAddUnsigned<uint64_t>(Max, 1), None);
-  EXPECT_EQ(checkedAddUnsigned<uint64_t>(10, 1), Optional<uint64_t>(11));
-}
-
-TEST(CheckedArithmetic, CheckedMulUnsigned) {
-  const uint64_t Max = std::numeric_limits<uint64_t>::max();
-  EXPECT_EQ(checkedMulUnsigned<uint64_t>(Max, 2), llvm::None);
-  EXPECT_EQ(checkedMulUnsigned<uint64_t>(Max, Max), llvm::None);
-  EXPECT_EQ(checkedMulUnsigned<uint64_t>(10, 2), Optional<uint64_t>(20));
-}
-
-TEST(CheckedArithmetic, CheckedMulAddUnsigned) {
-  const uint64_t Max = std::numeric_limits<uint64_t>::max();
-  EXPECT_EQ(checkedMulAddUnsigned<uint64_t>(Max, 1, 2), None);
-  EXPECT_EQ(checkedMulAddUnsigned<uint64_t>(1, 1, Max), None);
-  EXPECT_EQ(checkedMulAddUnsigned<uint64_t>(10, 2, 3), Optional<uint64_t>(23));
-}
-
-
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/Support/Chrono.cpp b/gnu/llvm/llvm/unittests/Support/Chrono.cpp
deleted file mode 100644
index 9a08a5c1bfd..00000000000
--- a/gnu/llvm/llvm/unittests/Support/Chrono.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-//===- llvm/unittest/Support/Chrono.cpp - Time utilities tests ------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/Chrono.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/Support/FormatVariadic.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::sys;
-using namespace std::chrono;
-
-namespace {
-
-TEST(Chrono, TimeTConversion) {
-  EXPECT_EQ(time_t(0), toTimeT(toTimePoint(time_t(0))));
-  EXPECT_EQ(time_t(1), toTimeT(toTimePoint(time_t(1))));
-  EXPECT_EQ(time_t(47), toTimeT(toTimePoint(time_t(47))));
-
-  TimePoint<> TP;
-  EXPECT_EQ(TP, toTimePoint(toTimeT(TP)));
-  TP += seconds(1);
-  EXPECT_EQ(TP, toTimePoint(toTimeT(TP)));
-  TP += hours(47);
-  EXPECT_EQ(TP, toTimePoint(toTimeT(TP)));
-}
-
-TEST(Chrono, TimePointFormat) {
-  using namespace std::chrono;
-  struct tm TM {};
-  TM.tm_year = 106;
-  TM.tm_mon = 0;
-  TM.tm_mday = 2;
-  TM.tm_hour = 15;
-  TM.tm_min = 4;
-  TM.tm_sec = 5;
-  TM.tm_isdst = -1;
-  TimePoint<> T =
-      system_clock::from_time_t(mktime(&TM)) + nanoseconds(123456789);
-
-  // operator<< uses the format YYYY-MM-DD HH:MM:SS.NNNNNNNNN
-  std::string S;
-  raw_string_ostream OS(S);
-  OS << T;
-  EXPECT_EQ("2006-01-02 15:04:05.123456789", OS.str());
-
-  // formatv default style matches operator<<.
-  EXPECT_EQ("2006-01-02 15:04:05.123456789", formatv("{0}", T).str());
-  // formatv supports strftime-style format strings.
-  EXPECT_EQ("15:04:05", formatv("{0:%H:%M:%S}", T).str());
-  // formatv supports our strftime extensions for sub-second precision.
-  EXPECT_EQ("123", formatv("{0:%L}", T).str());
-  EXPECT_EQ("123456", formatv("{0:%f}", T).str());
-  EXPECT_EQ("123456789", formatv("{0:%N}", T).str());
-  // our extensions don't interfere with %% escaping.
-  EXPECT_EQ("%foo", formatv("{0:%%foo}", T).str());
-}
-
-// Test that toTimePoint and toTimeT can be called with a arguments with varying
-// precisions.
-TEST(Chrono, ImplicitConversions) {
-  std::time_t TimeT = 47;
-  TimePoint<seconds> Sec = toTimePoint(TimeT);
-  TimePoint<milliseconds> Milli = toTimePoint(TimeT);
-  TimePoint<microseconds> Micro = toTimePoint(TimeT);
-  TimePoint<nanoseconds> Nano = toTimePoint(TimeT);
-  EXPECT_EQ(Sec, Milli);
-  EXPECT_EQ(Sec, Micro);
-  EXPECT_EQ(Sec, Nano);
-  EXPECT_EQ(TimeT, toTimeT(Sec));
-  EXPECT_EQ(TimeT, toTimeT(Milli));
-  EXPECT_EQ(TimeT, toTimeT(Micro));
-  EXPECT_EQ(TimeT, toTimeT(Nano));
-}
-
-TEST(Chrono, DurationFormat) {
-  EXPECT_EQ("1 h", formatv("{0}", hours(1)).str());
-  EXPECT_EQ("1 m", formatv("{0}", minutes(1)).str());
-  EXPECT_EQ("1 s", formatv("{0}", seconds(1)).str());
-  EXPECT_EQ("1 ms", formatv("{0}", milliseconds(1)).str());
-  EXPECT_EQ("1 us", formatv("{0}", microseconds(1)).str());
-  EXPECT_EQ("1 ns", formatv("{0}", nanoseconds(1)).str());
-
-  EXPECT_EQ("1 s", formatv("{0:+}", seconds(1)).str());
-  EXPECT_EQ("1", formatv("{0:-}", seconds(1)).str());
-
-  EXPECT_EQ("1000 ms", formatv("{0:ms}", seconds(1)).str());
-  EXPECT_EQ("1000000 us", formatv("{0:us}", seconds(1)).str());
-  EXPECT_EQ("1000", formatv("{0:ms-}", seconds(1)).str());
-
-  EXPECT_EQ("1,000 ms", formatv("{0:+n}", milliseconds(1000)).str());
-  EXPECT_EQ("0x3e8", formatv("{0:-x}", milliseconds(1000)).str());
-  EXPECT_EQ("010", formatv("{0:-3}", milliseconds(10)).str());
-  EXPECT_EQ("10,000", formatv("{0:ms-n}", seconds(10)).str());
-
-  EXPECT_EQ("1.00 s", formatv("{0}", duration<float>(1)).str());
-  EXPECT_EQ("0.123 s", formatv("{0:+3}", duration<float>(0.123f)).str());
-  EXPECT_EQ("1.230e-01 s", formatv("{0:+e3}", duration<float>(0.123f)).str());
-
-  typedef duration<float, std::ratio<60 * 60 * 24 * 14, 1000000>>
-      microfortnights;
-  EXPECT_EQ("1.00", formatv("{0:-}", microfortnights(1)).str());
-  EXPECT_EQ("1209.60 ms", formatv("{0:ms}", microfortnights(1)).str());
-}
-
-} // anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/Support/CommandLineTest.cpp b/gnu/llvm/llvm/unittests/Support/CommandLineTest.cpp
deleted file mode 100644
index a0352bc8a4c..00000000000
--- a/gnu/llvm/llvm/unittests/Support/CommandLineTest.cpp
+++ /dev/null
@@ -1,1897 +0,0 @@
-//===- llvm/unittest/Support/CommandLineTest.cpp - CommandLine tests ------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/CommandLine.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/SmallString.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/ADT/Triple.h"
-#include "llvm/Config/config.h"
-#include "llvm/Support/Allocator.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/Host.h"
-#include "llvm/Support/InitLLVM.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Support/Program.h"
-#include "llvm/Support/StringSaver.h"
-#include "llvm/Support/VirtualFileSystem.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/Testing/Support/SupportHelpers.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-#include <fstream>
-#include <stdlib.h>
-#include <string>
-#include <tuple>
-
-using namespace llvm;
-using llvm::unittest::TempDir;
-using llvm::unittest::TempFile;
-
-namespace {
-
-MATCHER(StringEquality, "Checks if two char* are equal as strings") {
-  return std::string(std::get<0>(arg)) == std::string(std::get<1>(arg));
-}
-
-class TempEnvVar {
- public:
-  TempEnvVar(const char *name, const char *value)
-      : name(name) {
-    const char *old_value = getenv(name);
-    EXPECT_EQ(nullptr, old_value) << old_value;
-#if HAVE_SETENV
-    setenv(name, value, true);
-#endif
-  }
-
-  ~TempEnvVar() {
-#if HAVE_SETENV
-    // Assume setenv and unsetenv come together.
-    unsetenv(name);
-#else
-    (void)name; // Suppress -Wunused-private-field.
-#endif
-  }
-
- private:
-  const char *const name;
-};
-
-template <typename T, typename Base = cl::opt<T>>
-class StackOption : public Base {
-public:
-  template <class... Ts>
-  explicit StackOption(Ts &&... Ms) : Base(std::forward<Ts>(Ms)...) {}
-
-  ~StackOption() override { this->removeArgument(); }
-
-  template <class DT> StackOption<T> &operator=(const DT &V) {
-    Base::operator=(V);
-    return *this;
-  }
-};
-
-class StackSubCommand : public cl::SubCommand {
-public:
-  StackSubCommand(StringRef Name,
-                  StringRef Description = StringRef())
-      : SubCommand(Name, Description) {}
-
-  StackSubCommand() : SubCommand() {}
-
-  ~StackSubCommand() { unregisterSubCommand(); }
-};
-
-
-cl::OptionCategory TestCategory("Test Options", "Description");
-TEST(CommandLineTest, ModifyExisitingOption) {
-  StackOption<int> TestOption("test-option", cl::desc("old description"));
-
-  static const char Description[] = "New description";
-  static const char ArgString[] = "new-test-option";
-  static const char ValueString[] = "Integer";
-
-  StringMap<cl::Option *> &Map =
-      cl::getRegisteredOptions(*cl::TopLevelSubCommand);
-
-  ASSERT_TRUE(Map.count("test-option") == 1) <<
-    "Could not find option in map.";
-
-  cl::Option *Retrieved = Map["test-option"];
-  ASSERT_EQ(&TestOption, Retrieved) << "Retrieved wrong option.";
-
-  ASSERT_NE(Retrieved->Categories.end(),
-            find_if(Retrieved->Categories,
-                    [&](const llvm::cl::OptionCategory *Cat) {
-                      return Cat == &cl::getGeneralCategory();
-                    }))
-      << "Incorrect default option category.";
-
-  Retrieved->addCategory(TestCategory);
-  ASSERT_NE(Retrieved->Categories.end(),
-            find_if(Retrieved->Categories,
-                    [&](const llvm::cl::OptionCategory *Cat) {
-                      return Cat == &TestCategory;
-                    }))
-      << "Failed to modify option's option category.";
-
-  Retrieved->setDescription(Description);
-  ASSERT_STREQ(Retrieved->HelpStr.data(), Description)
-      << "Changing option description failed.";
-
-  Retrieved->setArgStr(ArgString);
-  ASSERT_STREQ(ArgString, Retrieved->ArgStr.data())
-      << "Failed to modify option's Argument string.";
-
-  Retrieved->setValueStr(ValueString);
-  ASSERT_STREQ(Retrieved->ValueStr.data(), ValueString)
-      << "Failed to modify option's Value string.";
-
-  Retrieved->setHiddenFlag(cl::Hidden);
-  ASSERT_EQ(cl::Hidden, TestOption.getOptionHiddenFlag()) <<
-    "Failed to modify option's hidden flag.";
-}
-
-TEST(CommandLineTest, UseOptionCategory) {
-  StackOption<int> TestOption2("test-option", cl::cat(TestCategory));
-
-  ASSERT_NE(TestOption2.Categories.end(),
-            find_if(TestOption2.Categories,
-                         [&](const llvm::cl::OptionCategory *Cat) {
-                           return Cat == &TestCategory;
-                         }))
-      << "Failed to assign Option Category.";
-}
-
-TEST(CommandLineTest, UseMultipleCategories) {
-  StackOption<int> TestOption2("test-option2", cl::cat(TestCategory),
-                               cl::cat(cl::getGeneralCategory()),
-                               cl::cat(cl::getGeneralCategory()));
-
-  // Make sure cl::getGeneralCategory() wasn't added twice.
-  ASSERT_EQ(TestOption2.Categories.size(), 2U);
-
-  ASSERT_NE(TestOption2.Categories.end(),
-            find_if(TestOption2.Categories,
-                         [&](const llvm::cl::OptionCategory *Cat) {
-                           return Cat == &TestCategory;
-                         }))
-      << "Failed to assign Option Category.";
-  ASSERT_NE(TestOption2.Categories.end(),
-            find_if(TestOption2.Categories,
-                    [&](const llvm::cl::OptionCategory *Cat) {
-                      return Cat == &cl::getGeneralCategory();
-                    }))
-      << "Failed to assign General Category.";
-
-  cl::OptionCategory AnotherCategory("Additional test Options", "Description");
-  StackOption<int> TestOption("test-option", cl::cat(TestCategory),
-                              cl::cat(AnotherCategory));
-  ASSERT_EQ(TestOption.Categories.end(),
-            find_if(TestOption.Categories,
-                    [&](const llvm::cl::OptionCategory *Cat) {
-                      return Cat == &cl::getGeneralCategory();
-                    }))
-      << "Failed to remove General Category.";
-  ASSERT_NE(TestOption.Categories.end(),
-            find_if(TestOption.Categories,
-                         [&](const llvm::cl::OptionCategory *Cat) {
-                           return Cat == &TestCategory;
-                         }))
-      << "Failed to assign Option Category.";
-  ASSERT_NE(TestOption.Categories.end(),
-            find_if(TestOption.Categories,
-                         [&](const llvm::cl::OptionCategory *Cat) {
-                           return Cat == &AnotherCategory;
-                         }))
-      << "Failed to assign Another Category.";
-}
-
-typedef void ParserFunction(StringRef Source, StringSaver &Saver,
-                            SmallVectorImpl<const char *> &NewArgv,
-                            bool MarkEOLs);
-
-void testCommandLineTokenizer(ParserFunction *parse, StringRef Input,
-                              ArrayRef<const char *> Output,
-                              bool MarkEOLs = false) {
-  SmallVector<const char *, 0> Actual;
-  BumpPtrAllocator A;
-  StringSaver Saver(A);
-  parse(Input, Saver, Actual, MarkEOLs);
-  EXPECT_EQ(Output.size(), Actual.size());
-  for (unsigned I = 0, E = Actual.size(); I != E; ++I) {
-    if (I < Output.size()) {
-      EXPECT_STREQ(Output[I], Actual[I]);
-    }
-  }
-}
-
-TEST(CommandLineTest, TokenizeGNUCommandLine) {
-  const char Input[] =
-      "foo\\ bar \"foo bar\" \'foo bar\' 'foo\\\\bar' -DFOO=bar\\(\\) "
-      "foo\"bar\"baz C:\\\\src\\\\foo.cpp \"C:\\src\\foo.cpp\"";
-  const char *const Output[] = {
-      "foo bar",     "foo bar",   "foo bar",          "foo\\bar",
-      "-DFOO=bar()", "foobarbaz", "C:\\src\\foo.cpp", "C:srcfoo.cpp"};
-  testCommandLineTokenizer(cl::TokenizeGNUCommandLine, Input, Output);
-}
-
-TEST(CommandLineTest, TokenizeWindowsCommandLine1) {
-  const char Input[] =
-      R"(a\b c\\d e\\"f g" h\"i j\\\"k "lmn" o pqr "st \"u" \v)";
-  const char *const Output[] = { "a\\b", "c\\\\d", "e\\f g", "h\"i", "j\\\"k",
-                                 "lmn", "o", "pqr", "st \"u", "\\v" };
-  testCommandLineTokenizer(cl::TokenizeWindowsCommandLine, Input, Output);
-}
-
-TEST(CommandLineTest, TokenizeWindowsCommandLine2) {
-  const char Input[] = "clang -c -DFOO=\"\"\"ABC\"\"\" x.cpp";
-  const char *const Output[] = { "clang", "-c", "-DFOO=\"ABC\"", "x.cpp"};
-  testCommandLineTokenizer(cl::TokenizeWindowsCommandLine, Input, Output);
-}
-
-TEST(CommandLineTest, TokenizeWindowsCommandLineQuotedLastArgument) {
-  const char Input1[] = R"(a b c d "")";
-  const char *const Output1[] = {"a", "b", "c", "d", ""};
-  testCommandLineTokenizer(cl::TokenizeWindowsCommandLine, Input1, Output1);
-  const char Input2[] = R"(a b c d ")";
-  const char *const Output2[] = {"a", "b", "c", "d"};
-  testCommandLineTokenizer(cl::TokenizeWindowsCommandLine, Input2, Output2);
-}
-
-TEST(CommandLineTest, TokenizeAndMarkEOLs) {
-  // Clang uses EOL marking in response files to support options that consume
-  // the rest of the arguments on the current line, but do not consume arguments
-  // from subsequent lines. For example, given these rsp files contents:
-  // /c /Zi /O2
-  // /Oy- /link /debug /opt:ref
-  // /Zc:ThreadsafeStatics-
-  //
-  // clang-cl needs to treat "/debug /opt:ref" as linker flags, and everything
-  // else as compiler flags. The tokenizer inserts nullptr sentinels into the
-  // output so that clang-cl can find the end of the current line.
-  const char Input[] = "clang -Xclang foo\n\nfoo\"bar\"baz\n x.cpp\n";
-  const char *const Output[] = {"clang", "-Xclang", "foo",
-                                nullptr, nullptr,   "foobarbaz",
-                                nullptr, "x.cpp",   nullptr};
-  testCommandLineTokenizer(cl::TokenizeWindowsCommandLine, Input, Output,
-                           /*MarkEOLs=*/true);
-  testCommandLineTokenizer(cl::TokenizeGNUCommandLine, Input, Output,
-                           /*MarkEOLs=*/true);
-}
-
-TEST(CommandLineTest, TokenizeConfigFile1) {
-  const char *Input = "\\";
-  const char *const Output[] = { "\\" };
-  testCommandLineTokenizer(cl::tokenizeConfigFile, Input, Output);
-}
-
-TEST(CommandLineTest, TokenizeConfigFile2) {
-  const char *Input = "\\abc";
-  const char *const Output[] = { "abc" };
-  testCommandLineTokenizer(cl::tokenizeConfigFile, Input, Output);
-}
-
-TEST(CommandLineTest, TokenizeConfigFile3) {
-  const char *Input = "abc\\";
-  const char *const Output[] = { "abc\\" };
-  testCommandLineTokenizer(cl::tokenizeConfigFile, Input, Output);
-}
-
-TEST(CommandLineTest, TokenizeConfigFile4) {
-  const char *Input = "abc\\\n123";
-  const char *const Output[] = { "abc123" };
-  testCommandLineTokenizer(cl::tokenizeConfigFile, Input, Output);
-}
-
-TEST(CommandLineTest, TokenizeConfigFile5) {
-  const char *Input = "abc\\\r\n123";
-  const char *const Output[] = { "abc123" };
-  testCommandLineTokenizer(cl::tokenizeConfigFile, Input, Output);
-}
-
-TEST(CommandLineTest, TokenizeConfigFile6) {
-  const char *Input = "abc\\\n";
-  const char *const Output[] = { "abc" };
-  testCommandLineTokenizer(cl::tokenizeConfigFile, Input, Output);
-}
-
-TEST(CommandLineTest, TokenizeConfigFile7) {
-  const char *Input = "abc\\\r\n";
-  const char *const Output[] = { "abc" };
-  testCommandLineTokenizer(cl::tokenizeConfigFile, Input, Output);
-}
-
-TEST(CommandLineTest, TokenizeConfigFile8) {
-  SmallVector<const char *, 0> Actual;
-  BumpPtrAllocator A;
-  StringSaver Saver(A);
-  cl::tokenizeConfigFile("\\\n", Saver, Actual, /*MarkEOLs=*/false);
-  EXPECT_TRUE(Actual.empty());
-}
-
-TEST(CommandLineTest, TokenizeConfigFile9) {
-  SmallVector<const char *, 0> Actual;
-  BumpPtrAllocator A;
-  StringSaver Saver(A);
-  cl::tokenizeConfigFile("\\\r\n", Saver, Actual, /*MarkEOLs=*/false);
-  EXPECT_TRUE(Actual.empty());
-}
-
-TEST(CommandLineTest, TokenizeConfigFile10) {
-  const char *Input = "\\\nabc";
-  const char *const Output[] = { "abc" };
-  testCommandLineTokenizer(cl::tokenizeConfigFile, Input, Output);
-}
-
-TEST(CommandLineTest, TokenizeConfigFile11) {
-  const char *Input = "\\\r\nabc";
-  const char *const Output[] = { "abc" };
-  testCommandLineTokenizer(cl::tokenizeConfigFile, Input, Output);
-}
-
-TEST(CommandLineTest, AliasesWithArguments) {
-  static const size_t ARGC = 3;
-  const char *const Inputs[][ARGC] = {
-    { "-tool", "-actual=x", "-extra" },
-    { "-tool", "-actual", "x" },
-    { "-tool", "-alias=x", "-extra" },
-    { "-tool", "-alias", "x" }
-  };
-
-  for (size_t i = 0, e = array_lengthof(Inputs); i < e; ++i) {
-    StackOption<std::string> Actual("actual");
-    StackOption<bool> Extra("extra");
-    StackOption<std::string> Input(cl::Positional);
-
-    cl::alias Alias("alias", llvm::cl::aliasopt(Actual));
-
-    cl::ParseCommandLineOptions(ARGC, Inputs[i]);
-    EXPECT_EQ("x", Actual);
-    EXPECT_EQ(0, Input.getNumOccurrences());
-
-    Alias.removeArgument();
-  }
-}
-
-void testAliasRequired(int argc, const char *const *argv) {
-  StackOption<std::string> Option("option", cl::Required);
-  cl::alias Alias("o", llvm::cl::aliasopt(Option));
-
-  cl::ParseCommandLineOptions(argc, argv);
-  EXPECT_EQ("x", Option);
-  EXPECT_EQ(1, Option.getNumOccurrences());
-
-  Alias.removeArgument();
-}
-
-TEST(CommandLineTest, AliasRequired) {
-  const char *opts1[] = { "-tool", "-option=x" };
-  const char *opts2[] = { "-tool", "-o", "x" };
-  testAliasRequired(array_lengthof(opts1), opts1);
-  testAliasRequired(array_lengthof(opts2), opts2);
-}
-
-TEST(CommandLineTest, HideUnrelatedOptions) {
-  StackOption<int> TestOption1("hide-option-1");
-  StackOption<int> TestOption2("hide-option-2", cl::cat(TestCategory));
-
-  cl::HideUnrelatedOptions(TestCategory);
-
-  ASSERT_EQ(cl::ReallyHidden, TestOption1.getOptionHiddenFlag())
-      << "Failed to hide extra option.";
-  ASSERT_EQ(cl::NotHidden, TestOption2.getOptionHiddenFlag())
-      << "Hid extra option that should be visable.";
-
-  StringMap<cl::Option *> &Map =
-      cl::getRegisteredOptions(*cl::TopLevelSubCommand);
-  ASSERT_EQ(cl::NotHidden, Map["help"]->getOptionHiddenFlag())
-      << "Hid default option that should be visable.";
-}
-
-cl::OptionCategory TestCategory2("Test Options set 2", "Description");
-
-TEST(CommandLineTest, HideUnrelatedOptionsMulti) {
-  StackOption<int> TestOption1("multi-hide-option-1");
-  StackOption<int> TestOption2("multi-hide-option-2", cl::cat(TestCategory));
-  StackOption<int> TestOption3("multi-hide-option-3", cl::cat(TestCategory2));
-
-  const cl::OptionCategory *VisibleCategories[] = {&TestCategory,
-                                                   &TestCategory2};
-
-  cl::HideUnrelatedOptions(makeArrayRef(VisibleCategories));
-
-  ASSERT_EQ(cl::ReallyHidden, TestOption1.getOptionHiddenFlag())
-      << "Failed to hide extra option.";
-  ASSERT_EQ(cl::NotHidden, TestOption2.getOptionHiddenFlag())
-      << "Hid extra option that should be visable.";
-  ASSERT_EQ(cl::NotHidden, TestOption3.getOptionHiddenFlag())
-      << "Hid extra option that should be visable.";
-
-  StringMap<cl::Option *> &Map =
-      cl::getRegisteredOptions(*cl::TopLevelSubCommand);
-  ASSERT_EQ(cl::NotHidden, Map["help"]->getOptionHiddenFlag())
-      << "Hid default option that should be visable.";
-}
-
-TEST(CommandLineTest, SetValueInSubcategories) {
-  cl::ResetCommandLineParser();
-
-  StackSubCommand SC1("sc1", "First subcommand");
-  StackSubCommand SC2("sc2", "Second subcommand");
-
-  StackOption<bool> TopLevelOpt("top-level", cl::init(false));
-  StackOption<bool> SC1Opt("sc1", cl::sub(SC1), cl::init(false));
-  StackOption<bool> SC2Opt("sc2", cl::sub(SC2), cl::init(false));
-
-  EXPECT_FALSE(TopLevelOpt);
-  EXPECT_FALSE(SC1Opt);
-  EXPECT_FALSE(SC2Opt);
-  const char *args[] = {"prog", "-top-level"};
-  EXPECT_TRUE(
-      cl::ParseCommandLineOptions(2, args, StringRef(), &llvm::nulls()));
-  EXPECT_TRUE(TopLevelOpt);
-  EXPECT_FALSE(SC1Opt);
-  EXPECT_FALSE(SC2Opt);
-
-  TopLevelOpt = false;
-
-  cl::ResetAllOptionOccurrences();
-  EXPECT_FALSE(TopLevelOpt);
-  EXPECT_FALSE(SC1Opt);
-  EXPECT_FALSE(SC2Opt);
-  const char *args2[] = {"prog", "sc1", "-sc1"};
-  EXPECT_TRUE(
-      cl::ParseCommandLineOptions(3, args2, StringRef(), &llvm::nulls()));
-  EXPECT_FALSE(TopLevelOpt);
-  EXPECT_TRUE(SC1Opt);
-  EXPECT_FALSE(SC2Opt);
-
-  SC1Opt = false;
-
-  cl::ResetAllOptionOccurrences();
-  EXPECT_FALSE(TopLevelOpt);
-  EXPECT_FALSE(SC1Opt);
-  EXPECT_FALSE(SC2Opt);
-  const char *args3[] = {"prog", "sc2", "-sc2"};
-  EXPECT_TRUE(
-      cl::ParseCommandLineOptions(3, args3, StringRef(), &llvm::nulls()));
-  EXPECT_FALSE(TopLevelOpt);
-  EXPECT_FALSE(SC1Opt);
-  EXPECT_TRUE(SC2Opt);
-}
-
-TEST(CommandLineTest, LookupFailsInWrongSubCommand) {
-  cl::ResetCommandLineParser();
-
-  StackSubCommand SC1("sc1", "First subcommand");
-  StackSubCommand SC2("sc2", "Second subcommand");
-
-  StackOption<bool> SC1Opt("sc1", cl::sub(SC1), cl::init(false));
-  StackOption<bool> SC2Opt("sc2", cl::sub(SC2), cl::init(false));
-
-  std::string Errs;
-  raw_string_ostream OS(Errs);
-
-  const char *args[] = {"prog", "sc1", "-sc2"};
-  EXPECT_FALSE(cl::ParseCommandLineOptions(3, args, StringRef(), &OS));
-  OS.flush();
-  EXPECT_FALSE(Errs.empty());
-}
-
-TEST(CommandLineTest, AddToAllSubCommands) {
-  cl::ResetCommandLineParser();
-
-  StackSubCommand SC1("sc1", "First subcommand");
-  StackOption<bool> AllOpt("everywhere", cl::sub(*cl::AllSubCommands),
-                           cl::init(false));
-  StackSubCommand SC2("sc2", "Second subcommand");
-
-  const char *args[] = {"prog", "-everywhere"};
-  const char *args2[] = {"prog", "sc1", "-everywhere"};
-  const char *args3[] = {"prog", "sc2", "-everywhere"};
-
-  std::string Errs;
-  raw_string_ostream OS(Errs);
-
-  EXPECT_FALSE(AllOpt);
-  EXPECT_TRUE(cl::ParseCommandLineOptions(2, args, StringRef(), &OS));
-  EXPECT_TRUE(AllOpt);
-
-  AllOpt = false;
-
-  cl::ResetAllOptionOccurrences();
-  EXPECT_FALSE(AllOpt);
-  EXPECT_TRUE(cl::ParseCommandLineOptions(3, args2, StringRef(), &OS));
-  EXPECT_TRUE(AllOpt);
-
-  AllOpt = false;
-
-  cl::ResetAllOptionOccurrences();
-  EXPECT_FALSE(AllOpt);
-  EXPECT_TRUE(cl::ParseCommandLineOptions(3, args3, StringRef(), &OS));
-  EXPECT_TRUE(AllOpt);
-
-  // Since all parsing succeeded, the error message should be empty.
-  OS.flush();
-  EXPECT_TRUE(Errs.empty());
-}
-
-TEST(CommandLineTest, ReparseCommandLineOptions) {
-  cl::ResetCommandLineParser();
-
-  StackOption<bool> TopLevelOpt("top-level", cl::sub(*cl::TopLevelSubCommand),
-                                cl::init(false));
-
-  const char *args[] = {"prog", "-top-level"};
-
-  EXPECT_FALSE(TopLevelOpt);
-  EXPECT_TRUE(
-      cl::ParseCommandLineOptions(2, args, StringRef(), &llvm::nulls()));
-  EXPECT_TRUE(TopLevelOpt);
-
-  TopLevelOpt = false;
-
-  cl::ResetAllOptionOccurrences();
-  EXPECT_FALSE(TopLevelOpt);
-  EXPECT_TRUE(
-      cl::ParseCommandLineOptions(2, args, StringRef(), &llvm::nulls()));
-  EXPECT_TRUE(TopLevelOpt);
-}
-
-TEST(CommandLineTest, RemoveFromRegularSubCommand) {
-  cl::ResetCommandLineParser();
-
-  StackSubCommand SC("sc", "Subcommand");
-  StackOption<bool> RemoveOption("remove-option", cl::sub(SC), cl::init(false));
-  StackOption<bool> KeepOption("keep-option", cl::sub(SC), cl::init(false));
-
-  const char *args[] = {"prog", "sc", "-remove-option"};
-
-  std::string Errs;
-  raw_string_ostream OS(Errs);
-
-  EXPECT_FALSE(RemoveOption);
-  EXPECT_TRUE(cl::ParseCommandLineOptions(3, args, StringRef(), &OS));
-  EXPECT_TRUE(RemoveOption);
-  OS.flush();
-  EXPECT_TRUE(Errs.empty());
-
-  RemoveOption.removeArgument();
-
-  cl::ResetAllOptionOccurrences();
-  EXPECT_FALSE(cl::ParseCommandLineOptions(3, args, StringRef(), &OS));
-  OS.flush();
-  EXPECT_FALSE(Errs.empty());
-}
-
-TEST(CommandLineTest, RemoveFromTopLevelSubCommand) {
-  cl::ResetCommandLineParser();
-
-  StackOption<bool> TopLevelRemove(
-      "top-level-remove", cl::sub(*cl::TopLevelSubCommand), cl::init(false));
-  StackOption<bool> TopLevelKeep(
-      "top-level-keep", cl::sub(*cl::TopLevelSubCommand), cl::init(false));
-
-  const char *args[] = {"prog", "-top-level-remove"};
-
-  EXPECT_FALSE(TopLevelRemove);
-  EXPECT_TRUE(
-      cl::ParseCommandLineOptions(2, args, StringRef(), &llvm::nulls()));
-  EXPECT_TRUE(TopLevelRemove);
-
-  TopLevelRemove.removeArgument();
-
-  cl::ResetAllOptionOccurrences();
-  EXPECT_FALSE(
-      cl::ParseCommandLineOptions(2, args, StringRef(), &llvm::nulls()));
-}
-
-TEST(CommandLineTest, RemoveFromAllSubCommands) {
-  cl::ResetCommandLineParser();
-
-  StackSubCommand SC1("sc1", "First Subcommand");
-  StackSubCommand SC2("sc2", "Second Subcommand");
-  StackOption<bool> RemoveOption("remove-option", cl::sub(*cl::AllSubCommands),
-                                 cl::init(false));
-  StackOption<bool> KeepOption("keep-option", cl::sub(*cl::AllSubCommands),
-                               cl::init(false));
-
-  const char *args0[] = {"prog", "-remove-option"};
-  const char *args1[] = {"prog", "sc1", "-remove-option"};
-  const char *args2[] = {"prog", "sc2", "-remove-option"};
-
-  // It should work for all subcommands including the top-level.
-  EXPECT_FALSE(RemoveOption);
-  EXPECT_TRUE(
-      cl::ParseCommandLineOptions(2, args0, StringRef(), &llvm::nulls()));
-  EXPECT_TRUE(RemoveOption);
-
-  RemoveOption = false;
-
-  cl::ResetAllOptionOccurrences();
-  EXPECT_FALSE(RemoveOption);
-  EXPECT_TRUE(
-      cl::ParseCommandLineOptions(3, args1, StringRef(), &llvm::nulls()));
-  EXPECT_TRUE(RemoveOption);
-
-  RemoveOption = false;
-
-  cl::ResetAllOptionOccurrences();
-  EXPECT_FALSE(RemoveOption);
-  EXPECT_TRUE(
-      cl::ParseCommandLineOptions(3, args2, StringRef(), &llvm::nulls()));
-  EXPECT_TRUE(RemoveOption);
-
-  RemoveOption.removeArgument();
-
-  // It should not work for any subcommands including the top-level.
-  cl::ResetAllOptionOccurrences();
-  EXPECT_FALSE(
-      cl::ParseCommandLineOptions(2, args0, StringRef(), &llvm::nulls()));
-  cl::ResetAllOptionOccurrences();
-  EXPECT_FALSE(
-      cl::ParseCommandLineOptions(3, args1, StringRef(), &llvm::nulls()));
-  cl::ResetAllOptionOccurrences();
-  EXPECT_FALSE(
-      cl::ParseCommandLineOptions(3, args2, StringRef(), &llvm::nulls()));
-}
-
-TEST(CommandLineTest, GetRegisteredSubcommands) {
-  cl::ResetCommandLineParser();
-
-  StackSubCommand SC1("sc1", "First Subcommand");
-  StackOption<bool> Opt1("opt1", cl::sub(SC1), cl::init(false));
-  StackSubCommand SC2("sc2", "Second subcommand");
-  StackOption<bool> Opt2("opt2", cl::sub(SC2), cl::init(false));
-
-  const char *args0[] = {"prog", "sc1"};
-  const char *args1[] = {"prog", "sc2"};
-
-  EXPECT_TRUE(
-      cl::ParseCommandLineOptions(2, args0, StringRef(), &llvm::nulls()));
-  EXPECT_FALSE(Opt1);
-  EXPECT_FALSE(Opt2);
-  for (auto *S : cl::getRegisteredSubcommands()) {
-    if (*S) {
-      EXPECT_EQ("sc1", S->getName());
-    }
-  }
-
-  cl::ResetAllOptionOccurrences();
-  EXPECT_TRUE(
-      cl::ParseCommandLineOptions(2, args1, StringRef(), &llvm::nulls()));
-  EXPECT_FALSE(Opt1);
-  EXPECT_FALSE(Opt2);
-  for (auto *S : cl::getRegisteredSubcommands()) {
-    if (*S) {
-      EXPECT_EQ("sc2", S->getName());
-    }
-  }
-}
-
-TEST(CommandLineTest, DefaultOptions) {
-  cl::ResetCommandLineParser();
-
-  StackOption<std::string> Bar("bar", cl::sub(*cl::AllSubCommands),
-                               cl::DefaultOption);
-  StackOption<std::string, cl::alias> Bar_Alias(
-      "b", cl::desc("Alias for -bar"), cl::aliasopt(Bar), cl::DefaultOption);
-
-  StackOption<bool> Foo("foo", cl::init(false), cl::sub(*cl::AllSubCommands),
-                        cl::DefaultOption);
-  StackOption<bool, cl::alias> Foo_Alias("f", cl::desc("Alias for -foo"),
-                                         cl::aliasopt(Foo), cl::DefaultOption);
-
-  StackSubCommand SC1("sc1", "First Subcommand");
-  // Override "-b" and change type in sc1 SubCommand.
-  StackOption<bool> SC1_B("b", cl::sub(SC1), cl::init(false));
-  StackSubCommand SC2("sc2", "Second subcommand");
-  // Override "-foo" and change type in sc2 SubCommand.  Note that this does not
-  // affect "-f" alias, which continues to work correctly.
-  StackOption<std::string> SC2_Foo("foo", cl::sub(SC2));
-
-  const char *args0[] = {"prog", "-b", "args0 bar string", "-f"};
-  EXPECT_TRUE(cl::ParseCommandLineOptions(sizeof(args0) / sizeof(char *), args0,
-                                          StringRef(), &llvm::nulls()));
-  EXPECT_TRUE(Bar == "args0 bar string");
-  EXPECT_TRUE(Foo);
-  EXPECT_FALSE(SC1_B);
-  EXPECT_TRUE(SC2_Foo.empty());
-
-  cl::ResetAllOptionOccurrences();
-
-  const char *args1[] = {"prog", "sc1", "-b", "-bar", "args1 bar string", "-f"};
-  EXPECT_TRUE(cl::ParseCommandLineOptions(sizeof(args1) / sizeof(char *), args1,
-                                          StringRef(), &llvm::nulls()));
-  EXPECT_TRUE(Bar == "args1 bar string");
-  EXPECT_TRUE(Foo);
-  EXPECT_TRUE(SC1_B);
-  EXPECT_TRUE(SC2_Foo.empty());
-  for (auto *S : cl::getRegisteredSubcommands()) {
-    if (*S) {
-      EXPECT_EQ("sc1", S->getName());
-    }
-  }
-
-  cl::ResetAllOptionOccurrences();
-
-  const char *args2[] = {"prog", "sc2", "-b", "args2 bar string",
-                         "-f", "-foo", "foo string"};
-  EXPECT_TRUE(cl::ParseCommandLineOptions(sizeof(args2) / sizeof(char *), args2,
-                                          StringRef(), &llvm::nulls()));
-  EXPECT_TRUE(Bar == "args2 bar string");
-  EXPECT_TRUE(Foo);
-  EXPECT_FALSE(SC1_B);
-  EXPECT_TRUE(SC2_Foo == "foo string");
-  for (auto *S : cl::getRegisteredSubcommands()) {
-    if (*S) {
-      EXPECT_EQ("sc2", S->getName());
-    }
-  }
-  cl::ResetCommandLineParser();
-}
-
-TEST(CommandLineTest, ArgumentLimit) {
-  std::string args(32 * 4096, 'a');
-  EXPECT_FALSE(llvm::sys::commandLineFitsWithinSystemLimits("cl", args.data()));
-  std::string args2(256, 'a');
-  EXPECT_TRUE(llvm::sys::commandLineFitsWithinSystemLimits("cl", args2.data()));
-  if (Triple(sys::getProcessTriple()).isOSWindows()) {
-    // We use 32000 as a limit for command line length. Program name ('cl'),
-    // separating spaces and termination null character occupy 5 symbols.
-    std::string long_arg(32000 - 5, 'b');
-    EXPECT_TRUE(
-        llvm::sys::commandLineFitsWithinSystemLimits("cl", long_arg.data()));
-    long_arg += 'b';
-    EXPECT_FALSE(
-        llvm::sys::commandLineFitsWithinSystemLimits("cl", long_arg.data()));
-  }
-}
-
-TEST(CommandLineTest, ResponseFileWindows) {
-  if (!Triple(sys::getProcessTriple()).isOSWindows())
-    return;
-
-  StackOption<std::string, cl::list<std::string>> InputFilenames(
-      cl::Positional, cl::desc("<input files>"), cl::ZeroOrMore);
-  StackOption<bool> TopLevelOpt("top-level", cl::init(false));
-
-  // Create response file.
-  TempFile ResponseFile("resp-", ".txt",
-                        "-top-level\npath\\dir\\file1\npath/dir/file2",
-                        /*Unique*/ true);
-
-  llvm::SmallString<128> RspOpt;
-  RspOpt.append(1, '@');
-  RspOpt.append(ResponseFile.path());
-  const char *args[] = {"prog", RspOpt.c_str()};
-  EXPECT_FALSE(TopLevelOpt);
-  EXPECT_TRUE(
-      cl::ParseCommandLineOptions(2, args, StringRef(), &llvm::nulls()));
-  EXPECT_TRUE(TopLevelOpt);
-  EXPECT_TRUE(InputFilenames[0] == "path\\dir\\file1");
-  EXPECT_TRUE(InputFilenames[1] == "path/dir/file2");
-}
-
-TEST(CommandLineTest, ResponseFiles) {
-  vfs::InMemoryFileSystem FS;
-#ifdef _WIN32
-  const char *TestRoot = "C:\\";
-#else
-  const char *TestRoot = "/";
-#endif
-  FS.setCurrentWorkingDirectory(TestRoot);
-
-  // Create included response file of first level.
-  llvm::StringRef IncludedFileName = "resp1";
-  FS.addFile(IncludedFileName, 0,
-             llvm::MemoryBuffer::getMemBuffer("-option_1 -option_2\n"
-                                              "@incdir/resp2\n"
-                                              "-option_3=abcd\n"
-                                              "@incdir/resp3\n"
-                                              "-option_4=efjk\n"));
-
-  // Directory for included file.
-  llvm::StringRef IncDir = "incdir";
-
-  // Create included response file of second level.
-  llvm::SmallString<128> IncludedFileName2;
-  llvm::sys::path::append(IncludedFileName2, IncDir, "resp2");
-  FS.addFile(IncludedFileName2, 0,
-             MemoryBuffer::getMemBuffer("-option_21 -option_22\n"
-                                        "-option_23=abcd\n"));
-
-  // Create second included response file of second level.
-  llvm::SmallString<128> IncludedFileName3;
-  llvm::sys::path::append(IncludedFileName3, IncDir, "resp3");
-  FS.addFile(IncludedFileName3, 0,
-             MemoryBuffer::getMemBuffer("-option_31 -option_32\n"
-                                        "-option_33=abcd\n"));
-
-  // Prepare 'file' with reference to response file.
-  SmallString<128> IncRef;
-  IncRef.append(1, '@');
-  IncRef.append(IncludedFileName);
-  llvm::SmallVector<const char *, 4> Argv = {"test/test", "-flag_1",
-                                             IncRef.c_str(), "-flag_2"};
-
-  // Expand response files.
-  llvm::BumpPtrAllocator A;
-  llvm::StringSaver Saver(A);
-  ASSERT_TRUE(llvm::cl::ExpandResponseFiles(
-      Saver, llvm::cl::TokenizeGNUCommandLine, Argv, false, true,
-      /*CurrentDir=*/StringRef(TestRoot), FS));
-  EXPECT_THAT(Argv, testing::Pointwise(
-                        StringEquality(),
-                        {"test/test", "-flag_1", "-option_1", "-option_2",
-                         "-option_21", "-option_22", "-option_23=abcd",
-                         "-option_3=abcd", "-option_31", "-option_32",
-                         "-option_33=abcd", "-option_4=efjk", "-flag_2"}));
-}
-
-TEST(CommandLineTest, RecursiveResponseFiles) {
-  vfs::InMemoryFileSystem FS;
-#ifdef _WIN32
-  const char *TestRoot = "C:\\";
-#else
-  const char *TestRoot = "/";
-#endif
-  FS.setCurrentWorkingDirectory(TestRoot);
-
-  StringRef SelfFilePath = "self.rsp";
-  std::string SelfFileRef = ("@" + SelfFilePath).str();
-
-  StringRef NestedFilePath = "nested.rsp";
-  std::string NestedFileRef = ("@" + NestedFilePath).str();
-
-  StringRef FlagFilePath = "flag.rsp";
-  std::string FlagFileRef = ("@" + FlagFilePath).str();
-
-  std::string SelfFileContents;
-  raw_string_ostream SelfFile(SelfFileContents);
-  SelfFile << "-option_1\n";
-  SelfFile << FlagFileRef << "\n";
-  SelfFile << NestedFileRef << "\n";
-  SelfFile << SelfFileRef << "\n";
-  FS.addFile(SelfFilePath, 0, MemoryBuffer::getMemBuffer(SelfFile.str()));
-
-  std::string NestedFileContents;
-  raw_string_ostream NestedFile(NestedFileContents);
-  NestedFile << "-option_2\n";
-  NestedFile << FlagFileRef << "\n";
-  NestedFile << SelfFileRef << "\n";
-  NestedFile << NestedFileRef << "\n";
-  FS.addFile(NestedFilePath, 0, MemoryBuffer::getMemBuffer(NestedFile.str()));
-
-  std::string FlagFileContents;
-  raw_string_ostream FlagFile(FlagFileContents);
-  FlagFile << "-option_x\n";
-  FS.addFile(FlagFilePath, 0, MemoryBuffer::getMemBuffer(FlagFile.str()));
-
-  // Ensure:
-  // Recursive expansion terminates
-  // Recursive files never expand
-  // Non-recursive repeats are allowed
-  SmallVector<const char *, 4> Argv = {"test/test", SelfFileRef.c_str(),
-                                       "-option_3"};
-  BumpPtrAllocator A;
-  StringSaver Saver(A);
-#ifdef _WIN32
-  cl::TokenizerCallback Tokenizer = cl::TokenizeWindowsCommandLine;
-#else
-  cl::TokenizerCallback Tokenizer = cl::TokenizeGNUCommandLine;
-#endif
-  ASSERT_FALSE(cl::ExpandResponseFiles(Saver, Tokenizer, Argv, false, false,
-                                       /*CurrentDir=*/llvm::StringRef(TestRoot),
-                                       FS));
-
-  EXPECT_THAT(Argv,
-              testing::Pointwise(StringEquality(),
-                                 {"test/test", "-option_1", "-option_x",
-                                  "-option_2", "-option_x", SelfFileRef.c_str(),
-                                  NestedFileRef.c_str(), SelfFileRef.c_str(),
-                                  "-option_3"}));
-}
-
-TEST(CommandLineTest, ResponseFilesAtArguments) {
-  vfs::InMemoryFileSystem FS;
-#ifdef _WIN32
-  const char *TestRoot = "C:\\";
-#else
-  const char *TestRoot = "/";
-#endif
-  FS.setCurrentWorkingDirectory(TestRoot);
-
-  StringRef ResponseFilePath = "test.rsp";
-
-  std::string ResponseFileContents;
-  raw_string_ostream ResponseFile(ResponseFileContents);
-  ResponseFile << "-foo" << "\n";
-  ResponseFile << "-bar" << "\n";
-  FS.addFile(ResponseFilePath, 0,
-             MemoryBuffer::getMemBuffer(ResponseFile.str()));
-
-  // Ensure we expand rsp files after lots of non-rsp arguments starting with @.
-  constexpr size_t NON_RSP_AT_ARGS = 64;
-  SmallVector<const char *, 4> Argv = {"test/test"};
-  Argv.append(NON_RSP_AT_ARGS, "@non_rsp_at_arg");
-  std::string ResponseFileRef = ("@" + ResponseFilePath).str();
-  Argv.push_back(ResponseFileRef.c_str());
-
-  BumpPtrAllocator A;
-  StringSaver Saver(A);
-  ASSERT_FALSE(cl::ExpandResponseFiles(Saver, cl::TokenizeGNUCommandLine, Argv,
-                                       false, false,
-                                       /*CurrentDir=*/StringRef(TestRoot), FS));
-
-  // ASSERT instead of EXPECT to prevent potential out-of-bounds access.
-  ASSERT_EQ(Argv.size(), 1 + NON_RSP_AT_ARGS + 2);
-  size_t i = 0;
-  EXPECT_STREQ(Argv[i++], "test/test");
-  for (; i < 1 + NON_RSP_AT_ARGS; ++i)
-    EXPECT_STREQ(Argv[i], "@non_rsp_at_arg");
-  EXPECT_STREQ(Argv[i++], "-foo");
-  EXPECT_STREQ(Argv[i++], "-bar");
-}
-
-TEST(CommandLineTest, ResponseFileRelativePath) {
-  vfs::InMemoryFileSystem FS;
-#ifdef _WIN32
-  const char *TestRoot = "C:\\";
-#else
-  const char *TestRoot = "//net";
-#endif
-  FS.setCurrentWorkingDirectory(TestRoot);
-
-  StringRef OuterFile = "dir/outer.rsp";
-  StringRef OuterFileContents = "@inner.rsp";
-  FS.addFile(OuterFile, 0, MemoryBuffer::getMemBuffer(OuterFileContents));
-
-  StringRef InnerFile = "dir/inner.rsp";
-  StringRef InnerFileContents = "-flag";
-  FS.addFile(InnerFile, 0, MemoryBuffer::getMemBuffer(InnerFileContents));
-
-  SmallVector<const char *, 2> Argv = {"test/test", "@dir/outer.rsp"};
-
-  BumpPtrAllocator A;
-  StringSaver Saver(A);
-  ASSERT_TRUE(cl::ExpandResponseFiles(Saver, cl::TokenizeGNUCommandLine, Argv,
-                                      false, true,
-                                      /*CurrentDir=*/StringRef(TestRoot), FS));
-  EXPECT_THAT(Argv,
-              testing::Pointwise(StringEquality(), {"test/test", "-flag"}));
-}
-
-TEST(CommandLineTest, ResponseFileEOLs) {
-  vfs::InMemoryFileSystem FS;
-#ifdef _WIN32
-  const char *TestRoot = "C:\\";
-#else
-  const char *TestRoot = "//net";
-#endif
-  FS.setCurrentWorkingDirectory(TestRoot);
-  FS.addFile("eols.rsp", 0,
-             MemoryBuffer::getMemBuffer("-Xclang -Wno-whatever\n input.cpp"));
-  SmallVector<const char *, 2> Argv = {"clang", "@eols.rsp"};
-  BumpPtrAllocator A;
-  StringSaver Saver(A);
-  ASSERT_TRUE(cl::ExpandResponseFiles(Saver, cl::TokenizeWindowsCommandLine,
-                                      Argv, true, true,
-                                      /*CurrentDir=*/StringRef(TestRoot), FS));
-  const char *Expected[] = {"clang", "-Xclang", "-Wno-whatever", nullptr,
-                            "input.cpp"};
-  ASSERT_EQ(array_lengthof(Expected), Argv.size());
-  for (size_t I = 0, E = array_lengthof(Expected); I < E; ++I) {
-    if (Expected[I] == nullptr) {
-      ASSERT_EQ(Argv[I], nullptr);
-    } else {
-      ASSERT_STREQ(Expected[I], Argv[I]);
-    }
-  }
-}
-
-TEST(CommandLineTest, SetDefautValue) {
-  cl::ResetCommandLineParser();
-
-  StackOption<std::string> Opt1("opt1", cl::init("true"));
-  StackOption<bool> Opt2("opt2", cl::init(true));
-  cl::alias Alias("alias", llvm::cl::aliasopt(Opt2));
-  StackOption<int> Opt3("opt3", cl::init(3));
-
-  const char *args[] = {"prog", "-opt1=false", "-opt2", "-opt3"};
-
-  EXPECT_TRUE(
-    cl::ParseCommandLineOptions(2, args, StringRef(), &llvm::nulls()));
-
-  EXPECT_TRUE(Opt1 == "false");
-  EXPECT_TRUE(Opt2);
-  EXPECT_TRUE(Opt3 == 3);
-
-  Opt2 = false;
-  Opt3 = 1;
-
-  cl::ResetAllOptionOccurrences();
-
-  for (auto &OM : cl::getRegisteredOptions(*cl::TopLevelSubCommand)) {
-    cl::Option *O = OM.second;
-    if (O->ArgStr == "opt2") {
-      continue;
-    }
-    O->setDefault();
-  }
-
-  EXPECT_TRUE(Opt1 == "true");
-  EXPECT_TRUE(Opt2);
-  EXPECT_TRUE(Opt3 == 3);
-  Alias.removeArgument();
-}
-
-TEST(CommandLineTest, ReadConfigFile) {
-  llvm::SmallVector<const char *, 1> Argv;
-
-  TempDir TestDir("unittest", /*Unique*/ true);
-
-  llvm::SmallString<128> TestCfg;
-  llvm::sys::path::append(TestCfg, TestDir.path(), "foo");
-
-  TempFile ConfigFile(TestCfg, "",
-                      "# Comment\n"
-                      "-option_1\n"
-                      "@subconfig\n"
-                      "-option_3=abcd\n"
-                      "-option_4=\\\n"
-                      "cdef\n");
-
-  llvm::SmallString<128> TestCfg2;
-  llvm::sys::path::append(TestCfg2, TestDir.path(), "subconfig");
-  TempFile ConfigFile2(TestCfg2, "",
-                       "-option_2\n"
-                       "\n"
-                       "   # comment\n");
-
-  // Make sure the current directory is not the directory where config files
-  // resides. In this case the code that expands response files will not find
-  // 'subconfig' unless it resolves nested inclusions relative to the including
-  // file.
-  llvm::SmallString<128> CurrDir;
-  std::error_code EC = llvm::sys::fs::current_path(CurrDir);
-  EXPECT_TRUE(!EC);
-  EXPECT_NE(CurrDir.str(), TestDir.path());
-
-  llvm::BumpPtrAllocator A;
-  llvm::StringSaver Saver(A);
-  bool Result = llvm::cl::readConfigFile(ConfigFile.path(), Saver, Argv);
-
-  EXPECT_TRUE(Result);
-  EXPECT_EQ(Argv.size(), 4U);
-  EXPECT_STREQ(Argv[0], "-option_1");
-  EXPECT_STREQ(Argv[1], "-option_2");
-  EXPECT_STREQ(Argv[2], "-option_3=abcd");
-  EXPECT_STREQ(Argv[3], "-option_4=cdef");
-}
-
-TEST(CommandLineTest, PositionalEatArgsError) {
-  cl::ResetCommandLineParser();
-
-  StackOption<std::string, cl::list<std::string>> PosEatArgs(
-      "positional-eat-args", cl::Positional, cl::desc("<arguments>..."),
-      cl::ZeroOrMore, cl::PositionalEatsArgs);
-  StackOption<std::string, cl::list<std::string>> PosEatArgs2(
-      "positional-eat-args2", cl::Positional, cl::desc("Some strings"),
-      cl::ZeroOrMore, cl::PositionalEatsArgs);
-
-  const char *args[] = {"prog", "-positional-eat-args=XXXX"};
-  const char *args2[] = {"prog", "-positional-eat-args=XXXX", "-foo"};
-  const char *args3[] = {"prog", "-positional-eat-args", "-foo"};
-  const char *args4[] = {"prog", "-positional-eat-args",
-                         "-foo", "-positional-eat-args2",
-                         "-bar", "foo"};
-
-  std::string Errs;
-  raw_string_ostream OS(Errs);
-  EXPECT_FALSE(cl::ParseCommandLineOptions(2, args, StringRef(), &OS)); OS.flush();
-  EXPECT_FALSE(Errs.empty()); Errs.clear();
-  EXPECT_FALSE(cl::ParseCommandLineOptions(3, args2, StringRef(), &OS)); OS.flush();
-  EXPECT_FALSE(Errs.empty()); Errs.clear();
-  EXPECT_TRUE(cl::ParseCommandLineOptions(3, args3, StringRef(), &OS)); OS.flush();
-  EXPECT_TRUE(Errs.empty()); Errs.clear();
-
-  cl::ResetAllOptionOccurrences();
-  EXPECT_TRUE(cl::ParseCommandLineOptions(6, args4, StringRef(), &OS)); OS.flush();
-  EXPECT_TRUE(PosEatArgs.size() == 1);
-  EXPECT_TRUE(PosEatArgs2.size() == 2);
-  EXPECT_TRUE(Errs.empty());
-}
-
-#ifdef _WIN32
-TEST(CommandLineTest, GetCommandLineArguments) {
-  int argc = __argc;
-  char **argv = __argv;
-
-  // GetCommandLineArguments is called in InitLLVM.
-  llvm::InitLLVM X(argc, argv);
-
-  EXPECT_EQ(llvm::sys::path::is_absolute(argv[0]),
-            llvm::sys::path::is_absolute(__argv[0]));
-
-  EXPECT_TRUE(
-      llvm::sys::path::filename(argv[0]).equals_insensitive("supporttests.exe"))
-      << "Filename of test executable is "
-      << llvm::sys::path::filename(argv[0]);
-}
-#endif
-
-class OutputRedirector {
-public:
-  OutputRedirector(int RedirectFD)
-      : RedirectFD(RedirectFD), OldFD(dup(RedirectFD)) {
-    if (OldFD == -1 ||
-        sys::fs::createTemporaryFile("unittest-redirect", "", NewFD,
-                                     FilePath) ||
-        dup2(NewFD, RedirectFD) == -1)
-      Valid = false;
-  }
-
-  ~OutputRedirector() {
-    dup2(OldFD, RedirectFD);
-    close(OldFD);
-    close(NewFD);
-  }
-
-  SmallVector<char, 128> FilePath;
-  bool Valid = true;
-
-private:
-  int RedirectFD;
-  int OldFD;
-  int NewFD;
-};
-
-struct AutoDeleteFile {
-  SmallVector<char, 128> FilePath;
-  ~AutoDeleteFile() {
-    if (!FilePath.empty())
-      sys::fs::remove(std::string(FilePath.data(), FilePath.size()));
-  }
-};
-
-class PrintOptionInfoTest : public ::testing::Test {
-public:
-  // Return std::string because the output of a failing EXPECT check is
-  // unreadable for StringRef. It also avoids any lifetime issues.
-  template <typename... Ts> std::string runTest(Ts... OptionAttributes) {
-    outs().flush();  // flush any output from previous tests
-    AutoDeleteFile File;
-    {
-      OutputRedirector Stdout(fileno(stdout));
-      if (!Stdout.Valid)
-        return "";
-      File.FilePath = Stdout.FilePath;
-
-      StackOption<OptionValue> TestOption(Opt, cl::desc(HelpText),
-                                          OptionAttributes...);
-      printOptionInfo(TestOption, 26);
-      outs().flush();
-    }
-    auto Buffer = MemoryBuffer::getFile(File.FilePath);
-    if (!Buffer)
-      return "";
-    return Buffer->get()->getBuffer().str();
-  }
-
-  enum class OptionValue { Val };
-  const StringRef Opt = "some-option";
-  const StringRef HelpText = "some help";
-
-private:
-  // This is a workaround for cl::Option sub-classes having their
-  // printOptionInfo functions private.
-  void printOptionInfo(const cl::Option &O, size_t Width) {
-    O.printOptionInfo(Width);
-  }
-};
-
-TEST_F(PrintOptionInfoTest, PrintOptionInfoValueOptionalWithoutSentinel) {
-  std::string Output =
-      runTest(cl::ValueOptional,
-              cl::values(clEnumValN(OptionValue::Val, "v1", "desc1")));
-
-  // clang-format off
-  EXPECT_EQ(Output, ("  --" + Opt + "=<value> - " + HelpText + "\n"
-                     "    =v1                 -   desc1\n")
-                        .str());
-  // clang-format on
-}
-
-TEST_F(PrintOptionInfoTest, PrintOptionInfoValueOptionalWithSentinel) {
-  std::string Output = runTest(
-      cl::ValueOptional, cl::values(clEnumValN(OptionValue::Val, "v1", "desc1"),
-                                    clEnumValN(OptionValue::Val, "", "")));
-
-  // clang-format off
-  EXPECT_EQ(Output,
-            ("  --" + Opt + "         - " + HelpText + "\n"
-             "  --" + Opt + "=<value> - " + HelpText + "\n"
-             "    =v1                 -   desc1\n")
-                .str());
-  // clang-format on
-}
-
-TEST_F(PrintOptionInfoTest, PrintOptionInfoValueOptionalWithSentinelWithHelp) {
-  std::string Output = runTest(
-      cl::ValueOptional, cl::values(clEnumValN(OptionValue::Val, "v1", "desc1"),
-                                    clEnumValN(OptionValue::Val, "", "desc2")));
-
-  // clang-format off
-  EXPECT_EQ(Output, ("  --" + Opt + "         - " + HelpText + "\n"
-                     "  --" + Opt + "=<value> - " + HelpText + "\n"
-                     "    =v1                 -   desc1\n"
-                     "    =<empty>            -   desc2\n")
-                        .str());
-  // clang-format on
-}
-
-TEST_F(PrintOptionInfoTest, PrintOptionInfoValueRequiredWithEmptyValueName) {
-  std::string Output = runTest(
-      cl::ValueRequired, cl::values(clEnumValN(OptionValue::Val, "v1", "desc1"),
-                                    clEnumValN(OptionValue::Val, "", "")));
-
-  // clang-format off
-  EXPECT_EQ(Output, ("  --" + Opt + "=<value> - " + HelpText + "\n"
-                     "    =v1                 -   desc1\n"
-                     "    =<empty>\n")
-                        .str());
-  // clang-format on
-}
-
-TEST_F(PrintOptionInfoTest, PrintOptionInfoEmptyValueDescription) {
-  std::string Output = runTest(
-      cl::ValueRequired, cl::values(clEnumValN(OptionValue::Val, "v1", "")));
-
-  // clang-format off
-  EXPECT_EQ(Output,
-            ("  --" + Opt + "=<value> - " + HelpText + "\n"
-             "    =v1\n").str());
-  // clang-format on
-}
-
-TEST_F(PrintOptionInfoTest, PrintOptionInfoMultilineValueDescription) {
-  std::string Output =
-      runTest(cl::ValueRequired,
-              cl::values(clEnumValN(OptionValue::Val, "v1",
-                                    "This is the first enum value\n"
-                                    "which has a really long description\n"
-                                    "thus it is multi-line."),
-                         clEnumValN(OptionValue::Val, "",
-                                    "This is an unnamed enum value option\n"
-                                    "Should be indented as well")));
-
-  // clang-format off
-  EXPECT_EQ(Output,
-            ("  --" + Opt + "=<value> - " + HelpText + "\n"
-             "    =v1                 -   This is the first enum value\n"
-             "                            which has a really long description\n"
-             "                            thus it is multi-line.\n"
-             "    =<empty>            -   This is an unnamed enum value option\n"
-             "                            Should be indented as well\n").str());
-  // clang-format on
-}
-
-class GetOptionWidthTest : public ::testing::Test {
-public:
-  enum class OptionValue { Val };
-
-  template <typename... Ts>
-  size_t runTest(StringRef ArgName, Ts... OptionAttributes) {
-    StackOption<OptionValue> TestOption(ArgName, cl::desc("some help"),
-                                        OptionAttributes...);
-    return getOptionWidth(TestOption);
-  }
-
-private:
-  // This is a workaround for cl::Option sub-classes having their
-  // printOptionInfo
-  // functions private.
-  size_t getOptionWidth(const cl::Option &O) { return O.getOptionWidth(); }
-};
-
-TEST_F(GetOptionWidthTest, GetOptionWidthArgNameLonger) {
-  StringRef ArgName("a-long-argument-name");
-  size_t ExpectedStrSize = ("  --" + ArgName + "=<value> - ").str().size();
-  EXPECT_EQ(
-      runTest(ArgName, cl::values(clEnumValN(OptionValue::Val, "v", "help"))),
-      ExpectedStrSize);
-}
-
-TEST_F(GetOptionWidthTest, GetOptionWidthFirstOptionNameLonger) {
-  StringRef OptName("a-long-option-name");
-  size_t ExpectedStrSize = ("    =" + OptName + " - ").str().size();
-  EXPECT_EQ(
-      runTest("a", cl::values(clEnumValN(OptionValue::Val, OptName, "help"),
-                              clEnumValN(OptionValue::Val, "b", "help"))),
-      ExpectedStrSize);
-}
-
-TEST_F(GetOptionWidthTest, GetOptionWidthSecondOptionNameLonger) {
-  StringRef OptName("a-long-option-name");
-  size_t ExpectedStrSize = ("    =" + OptName + " - ").str().size();
-  EXPECT_EQ(
-      runTest("a", cl::values(clEnumValN(OptionValue::Val, "b", "help"),
-                              clEnumValN(OptionValue::Val, OptName, "help"))),
-      ExpectedStrSize);
-}
-
-TEST_F(GetOptionWidthTest, GetOptionWidthEmptyOptionNameLonger) {
-  size_t ExpectedStrSize = StringRef("    =<empty> - ").size();
-  // The length of a=<value> (including indentation) is actually the same as the
-  // =<empty> string, so it is impossible to distinguish via testing the case
-  // where the empty string is picked from where the option name is picked.
-  EXPECT_EQ(runTest("a", cl::values(clEnumValN(OptionValue::Val, "b", "help"),
-                                    clEnumValN(OptionValue::Val, "", "help"))),
-            ExpectedStrSize);
-}
-
-TEST_F(GetOptionWidthTest,
-       GetOptionWidthValueOptionalEmptyOptionWithNoDescription) {
-  StringRef ArgName("a");
-  // The length of a=<value> (including indentation) is actually the same as the
-  // =<empty> string, so it is impossible to distinguish via testing the case
-  // where the empty string is ignored from where it is not ignored.
-  // The dash will not actually be printed, but the space it would take up is
-  // included to ensure a consistent column width.
-  size_t ExpectedStrSize = ("  -" + ArgName + "=<value> - ").str().size();
-  EXPECT_EQ(runTest(ArgName, cl::ValueOptional,
-                    cl::values(clEnumValN(OptionValue::Val, "value", "help"),
-                               clEnumValN(OptionValue::Val, "", ""))),
-            ExpectedStrSize);
-}
-
-TEST_F(GetOptionWidthTest,
-       GetOptionWidthValueRequiredEmptyOptionWithNoDescription) {
-  // The length of a=<value> (including indentation) is actually the same as the
-  // =<empty> string, so it is impossible to distinguish via testing the case
-  // where the empty string is picked from where the option name is picked
-  size_t ExpectedStrSize = StringRef("    =<empty> - ").size();
-  EXPECT_EQ(runTest("a", cl::ValueRequired,
-                    cl::values(clEnumValN(OptionValue::Val, "value", "help"),
-                               clEnumValN(OptionValue::Val, "", ""))),
-            ExpectedStrSize);
-}
-
-TEST(CommandLineTest, PrefixOptions) {
-  cl::ResetCommandLineParser();
-
-  StackOption<std::string, cl::list<std::string>> IncludeDirs(
-      "I", cl::Prefix, cl::desc("Declare an include directory"));
-
-  // Test non-prefixed variant works with cl::Prefix options.
-  EXPECT_TRUE(IncludeDirs.empty());
-  const char *args[] = {"prog", "-I=/usr/include"};
-  EXPECT_TRUE(
-      cl::ParseCommandLineOptions(2, args, StringRef(), &llvm::nulls()));
-  EXPECT_TRUE(IncludeDirs.size() == 1);
-  EXPECT_TRUE(IncludeDirs.front().compare("/usr/include") == 0);
-
-  IncludeDirs.erase(IncludeDirs.begin());
-  cl::ResetAllOptionOccurrences();
-
-  // Test non-prefixed variant works with cl::Prefix options when value is
-  // passed in following argument.
-  EXPECT_TRUE(IncludeDirs.empty());
-  const char *args2[] = {"prog", "-I", "/usr/include"};
-  EXPECT_TRUE(
-      cl::ParseCommandLineOptions(3, args2, StringRef(), &llvm::nulls()));
-  EXPECT_TRUE(IncludeDirs.size() == 1);
-  EXPECT_TRUE(IncludeDirs.front().compare("/usr/include") == 0);
-
-  IncludeDirs.erase(IncludeDirs.begin());
-  cl::ResetAllOptionOccurrences();
-
-  // Test prefixed variant works with cl::Prefix options.
-  EXPECT_TRUE(IncludeDirs.empty());
-  const char *args3[] = {"prog", "-I/usr/include"};
-  EXPECT_TRUE(
-      cl::ParseCommandLineOptions(2, args3, StringRef(), &llvm::nulls()));
-  EXPECT_TRUE(IncludeDirs.size() == 1);
-  EXPECT_TRUE(IncludeDirs.front().compare("/usr/include") == 0);
-
-  StackOption<std::string, cl::list<std::string>> MacroDefs(
-      "D", cl::AlwaysPrefix, cl::desc("Define a macro"),
-      cl::value_desc("MACRO[=VALUE]"));
-
-  cl::ResetAllOptionOccurrences();
-
-  // Test non-prefixed variant does not work with cl::AlwaysPrefix options:
-  // equal sign is part of the value.
-  EXPECT_TRUE(MacroDefs.empty());
-  const char *args4[] = {"prog", "-D=HAVE_FOO"};
-  EXPECT_TRUE(
-      cl::ParseCommandLineOptions(2, args4, StringRef(), &llvm::nulls()));
-  EXPECT_TRUE(MacroDefs.size() == 1);
-  EXPECT_TRUE(MacroDefs.front().compare("=HAVE_FOO") == 0);
-
-  MacroDefs.erase(MacroDefs.begin());
-  cl::ResetAllOptionOccurrences();
-
-  // Test non-prefixed variant does not allow value to be passed in following
-  // argument with cl::AlwaysPrefix options.
-  EXPECT_TRUE(MacroDefs.empty());
-  const char *args5[] = {"prog", "-D", "HAVE_FOO"};
-  EXPECT_FALSE(
-      cl::ParseCommandLineOptions(3, args5, StringRef(), &llvm::nulls()));
-  EXPECT_TRUE(MacroDefs.empty());
-
-  cl::ResetAllOptionOccurrences();
-
-  // Test prefixed variant works with cl::AlwaysPrefix options.
-  EXPECT_TRUE(MacroDefs.empty());
-  const char *args6[] = {"prog", "-DHAVE_FOO"};
-  EXPECT_TRUE(
-      cl::ParseCommandLineOptions(2, args6, StringRef(), &llvm::nulls()));
-  EXPECT_TRUE(MacroDefs.size() == 1);
-  EXPECT_TRUE(MacroDefs.front().compare("HAVE_FOO") == 0);
-}
-
-TEST(CommandLineTest, GroupingWithValue) {
-  cl::ResetCommandLineParser();
-
-  StackOption<bool> OptF("f", cl::Grouping, cl::desc("Some flag"));
-  StackOption<bool> OptB("b", cl::Grouping, cl::desc("Another flag"));
-  StackOption<bool> OptD("d", cl::Grouping, cl::ValueDisallowed,
-                         cl::desc("ValueDisallowed option"));
-  StackOption<std::string> OptV("v", cl::Grouping,
-                                cl::desc("ValueRequired option"));
-  StackOption<std::string> OptO("o", cl::Grouping, cl::ValueOptional,
-                                cl::desc("ValueOptional option"));
-
-  // Should be possible to use an option which requires a value
-  // at the end of a group.
-  const char *args1[] = {"prog", "-fv", "val1"};
-  EXPECT_TRUE(
-      cl::ParseCommandLineOptions(3, args1, StringRef(), &llvm::nulls()));
-  EXPECT_TRUE(OptF);
-  EXPECT_STREQ("val1", OptV.c_str());
-  OptV.clear();
-  cl::ResetAllOptionOccurrences();
-
-  // Should not crash if it is accidentally used elsewhere in the group.
-  const char *args2[] = {"prog", "-vf", "val2"};
-  EXPECT_FALSE(
-      cl::ParseCommandLineOptions(3, args2, StringRef(), &llvm::nulls()));
-  OptV.clear();
-  cl::ResetAllOptionOccurrences();
-
-  // Should allow the "opt=value" form at the end of the group
-  const char *args3[] = {"prog", "-fv=val3"};
-  EXPECT_TRUE(
-      cl::ParseCommandLineOptions(2, args3, StringRef(), &llvm::nulls()));
-  EXPECT_TRUE(OptF);
-  EXPECT_STREQ("val3", OptV.c_str());
-  OptV.clear();
-  cl::ResetAllOptionOccurrences();
-
-  // Should allow assigning a value for a ValueOptional option
-  // at the end of the group
-  const char *args4[] = {"prog", "-fo=val4"};
-  EXPECT_TRUE(
-      cl::ParseCommandLineOptions(2, args4, StringRef(), &llvm::nulls()));
-  EXPECT_TRUE(OptF);
-  EXPECT_STREQ("val4", OptO.c_str());
-  OptO.clear();
-  cl::ResetAllOptionOccurrences();
-
-  // Should assign an empty value if a ValueOptional option is used elsewhere
-  // in the group.
-  const char *args5[] = {"prog", "-fob"};
-  EXPECT_TRUE(
-      cl::ParseCommandLineOptions(2, args5, StringRef(), &llvm::nulls()));
-  EXPECT_TRUE(OptF);
-  EXPECT_EQ(1, OptO.getNumOccurrences());
-  EXPECT_EQ(1, OptB.getNumOccurrences());
-  EXPECT_TRUE(OptO.empty());
-  cl::ResetAllOptionOccurrences();
-
-  // Should not allow an assignment for a ValueDisallowed option.
-  const char *args6[] = {"prog", "-fd=false"};
-  EXPECT_FALSE(
-      cl::ParseCommandLineOptions(2, args6, StringRef(), &llvm::nulls()));
-}
-
-TEST(CommandLineTest, GroupingAndPrefix) {
-  cl::ResetCommandLineParser();
-
-  StackOption<bool> OptF("f", cl::Grouping, cl::desc("Some flag"));
-  StackOption<bool> OptB("b", cl::Grouping, cl::desc("Another flag"));
-  StackOption<std::string> OptP("p", cl::Prefix, cl::Grouping,
-                                cl::desc("Prefix and Grouping"));
-  StackOption<std::string> OptA("a", cl::AlwaysPrefix, cl::Grouping,
-                                cl::desc("AlwaysPrefix and Grouping"));
-
-  // Should be possible to use a cl::Prefix option without grouping.
-  const char *args1[] = {"prog", "-pval1"};
-  EXPECT_TRUE(
-      cl::ParseCommandLineOptions(2, args1, StringRef(), &llvm::nulls()));
-  EXPECT_STREQ("val1", OptP.c_str());
-  OptP.clear();
-  cl::ResetAllOptionOccurrences();
-
-  // Should be possible to pass a value in a separate argument.
-  const char *args2[] = {"prog", "-p", "val2"};
-  EXPECT_TRUE(
-      cl::ParseCommandLineOptions(3, args2, StringRef(), &llvm::nulls()));
-  EXPECT_STREQ("val2", OptP.c_str());
-  OptP.clear();
-  cl::ResetAllOptionOccurrences();
-
-  // The "-opt=value" form should work, too.
-  const char *args3[] = {"prog", "-p=val3"};
-  EXPECT_TRUE(
-      cl::ParseCommandLineOptions(2, args3, StringRef(), &llvm::nulls()));
-  EXPECT_STREQ("val3", OptP.c_str());
-  OptP.clear();
-  cl::ResetAllOptionOccurrences();
-
-  // All three previous cases should work the same way if an option with both
-  // cl::Prefix and cl::Grouping modifiers is used at the end of a group.
-  const char *args4[] = {"prog", "-fpval4"};
-  EXPECT_TRUE(
-      cl::ParseCommandLineOptions(2, args4, StringRef(), &llvm::nulls()));
-  EXPECT_TRUE(OptF);
-  EXPECT_STREQ("val4", OptP.c_str());
-  OptP.clear();
-  cl::ResetAllOptionOccurrences();
-
-  const char *args5[] = {"prog", "-fp", "val5"};
-  EXPECT_TRUE(
-      cl::ParseCommandLineOptions(3, args5, StringRef(), &llvm::nulls()));
-  EXPECT_TRUE(OptF);
-  EXPECT_STREQ("val5", OptP.c_str());
-  OptP.clear();
-  cl::ResetAllOptionOccurrences();
-
-  const char *args6[] = {"prog", "-fp=val6"};
-  EXPECT_TRUE(
-      cl::ParseCommandLineOptions(2, args6, StringRef(), &llvm::nulls()));
-  EXPECT_TRUE(OptF);
-  EXPECT_STREQ("val6", OptP.c_str());
-  OptP.clear();
-  cl::ResetAllOptionOccurrences();
-
-  // Should assign a value even if the part after a cl::Prefix option is equal
-  // to the name of another option.
-  const char *args7[] = {"prog", "-fpb"};
-  EXPECT_TRUE(
-      cl::ParseCommandLineOptions(2, args7, StringRef(), &llvm::nulls()));
-  EXPECT_TRUE(OptF);
-  EXPECT_STREQ("b", OptP.c_str());
-  EXPECT_FALSE(OptB);
-  OptP.clear();
-  cl::ResetAllOptionOccurrences();
-
-  // Should be possible to use a cl::AlwaysPrefix option without grouping.
-  const char *args8[] = {"prog", "-aval8"};
-  EXPECT_TRUE(
-      cl::ParseCommandLineOptions(2, args8, StringRef(), &llvm::nulls()));
-  EXPECT_STREQ("val8", OptA.c_str());
-  OptA.clear();
-  cl::ResetAllOptionOccurrences();
-
-  // Should not be possible to pass a value in a separate argument.
-  const char *args9[] = {"prog", "-a", "val9"};
-  EXPECT_FALSE(
-      cl::ParseCommandLineOptions(3, args9, StringRef(), &llvm::nulls()));
-  cl::ResetAllOptionOccurrences();
-
-  // With the "-opt=value" form, the "=" symbol should be preserved.
-  const char *args10[] = {"prog", "-a=val10"};
-  EXPECT_TRUE(
-      cl::ParseCommandLineOptions(2, args10, StringRef(), &llvm::nulls()));
-  EXPECT_STREQ("=val10", OptA.c_str());
-  OptA.clear();
-  cl::ResetAllOptionOccurrences();
-
-  // All three previous cases should work the same way if an option with both
-  // cl::AlwaysPrefix and cl::Grouping modifiers is used at the end of a group.
-  const char *args11[] = {"prog", "-faval11"};
-  EXPECT_TRUE(
-      cl::ParseCommandLineOptions(2, args11, StringRef(), &llvm::nulls()));
-  EXPECT_TRUE(OptF);
-  EXPECT_STREQ("val11", OptA.c_str());
-  OptA.clear();
-  cl::ResetAllOptionOccurrences();
-
-  const char *args12[] = {"prog", "-fa", "val12"};
-  EXPECT_FALSE(
-      cl::ParseCommandLineOptions(3, args12, StringRef(), &llvm::nulls()));
-  cl::ResetAllOptionOccurrences();
-
-  const char *args13[] = {"prog", "-fa=val13"};
-  EXPECT_TRUE(
-      cl::ParseCommandLineOptions(2, args13, StringRef(), &llvm::nulls()));
-  EXPECT_TRUE(OptF);
-  EXPECT_STREQ("=val13", OptA.c_str());
-  OptA.clear();
-  cl::ResetAllOptionOccurrences();
-
-  // Should assign a value even if the part after a cl::AlwaysPrefix option
-  // is equal to the name of another option.
-  const char *args14[] = {"prog", "-fab"};
-  EXPECT_TRUE(
-      cl::ParseCommandLineOptions(2, args14, StringRef(), &llvm::nulls()));
-  EXPECT_TRUE(OptF);
-  EXPECT_STREQ("b", OptA.c_str());
-  EXPECT_FALSE(OptB);
-  OptA.clear();
-  cl::ResetAllOptionOccurrences();
-}
-
-TEST(CommandLineTest, LongOptions) {
-  cl::ResetCommandLineParser();
-
-  StackOption<bool> OptA("a", cl::desc("Some flag"));
-  StackOption<bool> OptBLong("long-flag", cl::desc("Some long flag"));
-  StackOption<bool, cl::alias> OptB("b", cl::desc("Alias to --long-flag"),
-                                    cl::aliasopt(OptBLong));
-  StackOption<std::string> OptAB("ab", cl::desc("Another long option"));
-
-  std::string Errs;
-  raw_string_ostream OS(Errs);
-
-  const char *args1[] = {"prog", "-a", "-ab", "val1"};
-  const char *args2[] = {"prog", "-a", "--ab", "val1"};
-  const char *args3[] = {"prog", "-ab", "--ab", "val1"};
-
-  //
-  // The following tests treat `-` and `--` the same, and always match the
-  // longest string.
-  //
-
-  EXPECT_TRUE(
-      cl::ParseCommandLineOptions(4, args1, StringRef(), &OS)); OS.flush();
-  EXPECT_TRUE(OptA);
-  EXPECT_FALSE(OptBLong);
-  EXPECT_STREQ("val1", OptAB.c_str());
-  EXPECT_TRUE(Errs.empty()); Errs.clear();
-  cl::ResetAllOptionOccurrences();
-
-  EXPECT_TRUE(
-      cl::ParseCommandLineOptions(4, args2, StringRef(), &OS)); OS.flush();
-  EXPECT_TRUE(OptA);
-  EXPECT_FALSE(OptBLong);
-  EXPECT_STREQ("val1", OptAB.c_str());
-  EXPECT_TRUE(Errs.empty()); Errs.clear();
-  cl::ResetAllOptionOccurrences();
-
-  // Fails because `-ab` and `--ab` are treated the same and appear more than
-  // once.  Also, `val1` is unexpected.
-  EXPECT_FALSE(
-      cl::ParseCommandLineOptions(4, args3, StringRef(), &OS)); OS.flush();
-  outs()<< Errs << "\n";
-  EXPECT_FALSE(Errs.empty()); Errs.clear();
-  cl::ResetAllOptionOccurrences();
-
-  //
-  // The following tests treat `-` and `--` differently, with `-` for short, and
-  // `--` for long options.
-  //
-
-  // Fails because `-ab` is treated as `-a -b`, so `-a` is seen twice, and
-  // `val1` is unexpected.
-  EXPECT_FALSE(cl::ParseCommandLineOptions(4, args1, StringRef(),
-                                           &OS, nullptr, true)); OS.flush();
-  EXPECT_FALSE(Errs.empty()); Errs.clear();
-  cl::ResetAllOptionOccurrences();
-
-  // Works because `-a` is treated differently than `--ab`.
-  EXPECT_TRUE(cl::ParseCommandLineOptions(4, args2, StringRef(),
-                                           &OS, nullptr, true)); OS.flush();
-  EXPECT_TRUE(Errs.empty()); Errs.clear();
-  cl::ResetAllOptionOccurrences();
-
-  // Works because `-ab` is treated as `-a -b`, and `--ab` is a long option.
-  EXPECT_TRUE(cl::ParseCommandLineOptions(4, args3, StringRef(),
-                                           &OS, nullptr, true));
-  EXPECT_TRUE(OptA);
-  EXPECT_TRUE(OptBLong);
-  EXPECT_STREQ("val1", OptAB.c_str());
-  OS.flush();
-  EXPECT_TRUE(Errs.empty()); Errs.clear();
-  cl::ResetAllOptionOccurrences();
-}
-
-TEST(CommandLineTest, OptionErrorMessage) {
-  // When there is an error, we expect some error message like:
-  //   prog: for the -a option: [...]
-  //
-  // Test whether the "for the -a option"-part is correctly formatted.
-  cl::ResetCommandLineParser();
-
-  StackOption<bool> OptA("a", cl::desc("Some option"));
-  StackOption<bool> OptLong("long", cl::desc("Some long option"));
-
-  std::string Errs;
-  raw_string_ostream OS(Errs);
-
-  OptA.error("custom error", OS);
-  OS.flush();
-  EXPECT_FALSE(Errs.find("for the -a option:") == std::string::npos);
-  Errs.clear();
-
-  OptLong.error("custom error", OS);
-  OS.flush();
-  EXPECT_FALSE(Errs.find("for the --long option:") == std::string::npos);
-  Errs.clear();
-
-  cl::ResetAllOptionOccurrences();
-}
-
-TEST(CommandLineTest, OptionErrorMessageSuggest) {
-  // When there is an error, and the edit-distance is not very large,
-  // we expect some error message like:
-  //   prog: did you mean '--option'?
-  //
-  // Test whether this message is well-formatted.
-  cl::ResetCommandLineParser();
-
-  StackOption<bool> OptLong("aluminium", cl::desc("Some long option"));
-
-  const char *args[] = {"prog", "--aluminum"};
-
-  std::string Errs;
-  raw_string_ostream OS(Errs);
-
-  EXPECT_FALSE(cl::ParseCommandLineOptions(2, args, StringRef(), &OS));
-  OS.flush();
-  EXPECT_FALSE(Errs.find("prog: Did you mean '--aluminium'?\n") ==
-               std::string::npos);
-  Errs.clear();
-
-  cl::ResetAllOptionOccurrences();
-}
-
-TEST(CommandLineTest, OptionErrorMessageSuggestNoHidden) {
-  // We expect that 'really hidden' option do not show up in option
-  // suggestions.
-  cl::ResetCommandLineParser();
-
-  StackOption<bool> OptLong("aluminium", cl::desc("Some long option"));
-  StackOption<bool> OptLong2("aluminum", cl::desc("Bad option"),
-                             cl::ReallyHidden);
-
-  const char *args[] = {"prog", "--alumnum"};
-
-  std::string Errs;
-  raw_string_ostream OS(Errs);
-
-  EXPECT_FALSE(cl::ParseCommandLineOptions(2, args, StringRef(), &OS));
-  OS.flush();
-  EXPECT_FALSE(Errs.find("prog: Did you mean '--aluminium'?\n") ==
-               std::string::npos);
-  Errs.clear();
-
-  cl::ResetAllOptionOccurrences();
-}
-
-TEST(CommandLineTest, Callback) {
-  cl::ResetCommandLineParser();
-
-  StackOption<bool> OptA("a", cl::desc("option a"));
-  StackOption<bool> OptB(
-      "b", cl::desc("option b -- This option turns on option a"),
-      cl::callback([&](const bool &) { OptA = true; }));
-  StackOption<bool> OptC(
-      "c", cl::desc("option c -- This option turns on options a and b"),
-      cl::callback([&](const bool &) { OptB = true; }));
-  StackOption<std::string, cl::list<std::string>> List(
-      "list",
-      cl::desc("option list -- This option turns on options a, b, and c when "
-               "'foo' is included in list"),
-      cl::CommaSeparated,
-      cl::callback([&](const std::string &Str) {
-        if (Str == "foo")
-          OptC = true;
-      }));
-
-  const char *args1[] = {"prog", "-a"};
-  EXPECT_TRUE(cl::ParseCommandLineOptions(2, args1));
-  EXPECT_TRUE(OptA);
-  EXPECT_FALSE(OptB);
-  EXPECT_FALSE(OptC);
-  EXPECT_TRUE(List.size() == 0);
-  cl::ResetAllOptionOccurrences();
-
-  const char *args2[] = {"prog", "-b"};
-  EXPECT_TRUE(cl::ParseCommandLineOptions(2, args2));
-  EXPECT_TRUE(OptA);
-  EXPECT_TRUE(OptB);
-  EXPECT_FALSE(OptC);
-  EXPECT_TRUE(List.size() == 0);
-  cl::ResetAllOptionOccurrences();
-
-  const char *args3[] = {"prog", "-c"};
-  EXPECT_TRUE(cl::ParseCommandLineOptions(2, args3));
-  EXPECT_TRUE(OptA);
-  EXPECT_TRUE(OptB);
-  EXPECT_TRUE(OptC);
-  EXPECT_TRUE(List.size() == 0);
-  cl::ResetAllOptionOccurrences();
-
-  const char *args4[] = {"prog", "--list=foo,bar"};
-  EXPECT_TRUE(cl::ParseCommandLineOptions(2, args4));
-  EXPECT_TRUE(OptA);
-  EXPECT_TRUE(OptB);
-  EXPECT_TRUE(OptC);
-  EXPECT_TRUE(List.size() == 2);
-  cl::ResetAllOptionOccurrences();
-
-  const char *args5[] = {"prog", "--list=bar"};
-  EXPECT_TRUE(cl::ParseCommandLineOptions(2, args5));
-  EXPECT_FALSE(OptA);
-  EXPECT_FALSE(OptB);
-  EXPECT_FALSE(OptC);
-  EXPECT_TRUE(List.size() == 1);
-
-  cl::ResetAllOptionOccurrences();
-}
-
-enum Enum { Val1, Val2 };
-static cl::bits<Enum> ExampleBits(
-    cl::desc("An example cl::bits to ensure it compiles"),
-    cl::values(
-      clEnumValN(Val1, "bits-val1", "The Val1 value"),
-      clEnumValN(Val1, "bits-val2", "The Val2 value")));
-
-TEST(CommandLineTest, ConsumeAfterOnePositional) {
-  cl::ResetCommandLineParser();
-
-  // input [args]
-  StackOption<std::string, cl::opt<std::string>> Input(cl::Positional,
-                                                       cl::Required);
-  StackOption<std::string, cl::list<std::string>> ExtraArgs(cl::ConsumeAfter);
-
-  const char *Args[] = {"prog", "input", "arg1", "arg2"};
-
-  std::string Errs;
-  raw_string_ostream OS(Errs);
-  EXPECT_TRUE(cl::ParseCommandLineOptions(4, Args, StringRef(), &OS));
-  OS.flush();
-  EXPECT_EQ("input", Input);
-  EXPECT_TRUE(ExtraArgs.size() == 2);
-  EXPECT_TRUE(ExtraArgs[0] == "arg1");
-  EXPECT_TRUE(ExtraArgs[1] == "arg2");
-  EXPECT_TRUE(Errs.empty());
-}
-
-TEST(CommandLineTest, ConsumeAfterTwoPositionals) {
-  cl::ResetCommandLineParser();
-
-  // input1 input2 [args]
-  StackOption<std::string, cl::opt<std::string>> Input1(cl::Positional,
-                                                        cl::Required);
-  StackOption<std::string, cl::opt<std::string>> Input2(cl::Positional,
-                                                        cl::Required);
-  StackOption<std::string, cl::list<std::string>> ExtraArgs(cl::ConsumeAfter);
-
-  const char *Args[] = {"prog", "input1", "input2", "arg1", "arg2"};
-
-  std::string Errs;
-  raw_string_ostream OS(Errs);
-  EXPECT_TRUE(cl::ParseCommandLineOptions(5, Args, StringRef(), &OS));
-  OS.flush();
-  EXPECT_EQ("input1", Input1);
-  EXPECT_EQ("input2", Input2);
-  EXPECT_TRUE(ExtraArgs.size() == 2);
-  EXPECT_TRUE(ExtraArgs[0] == "arg1");
-  EXPECT_TRUE(ExtraArgs[1] == "arg2");
-  EXPECT_TRUE(Errs.empty());
-}
-
-} // anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/Support/CompressionTest.cpp b/gnu/llvm/llvm/unittests/Support/CompressionTest.cpp
deleted file mode 100644
index 51723898e95..00000000000
--- a/gnu/llvm/llvm/unittests/Support/CompressionTest.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-//===- llvm/unittest/Support/CompressionTest.cpp - Compression tests ------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements unit tests for the Compression functions.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/Compression.h"
-#include "llvm/ADT/SmallString.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Config/config.h"
-#include "llvm/Support/Error.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-#if LLVM_ENABLE_ZLIB
-
-void TestZlibCompression(StringRef Input, int Level) {
-  SmallString<32> Compressed;
-  SmallString<32> Uncompressed;
-
-  Error E = zlib::compress(Input, Compressed, Level);
-  EXPECT_FALSE(E);
-  consumeError(std::move(E));
-
-  // Check that uncompressed buffer is the same as original.
-  E = zlib::uncompress(Compressed, Uncompressed, Input.size());
-  EXPECT_FALSE(E);
-  consumeError(std::move(E));
-
-  EXPECT_EQ(Input, Uncompressed);
-  if (Input.size() > 0) {
-    // Uncompression fails if expected length is too short.
-    E = zlib::uncompress(Compressed, Uncompressed, Input.size() - 1);
-    EXPECT_EQ("zlib error: Z_BUF_ERROR", llvm::toString(std::move(E)));
-  }
-}
-
-TEST(CompressionTest, Zlib) {
-  TestZlibCompression("", zlib::DefaultCompression);
-
-  TestZlibCompression("hello, world!", zlib::NoCompression);
-  TestZlibCompression("hello, world!", zlib::BestSizeCompression);
-  TestZlibCompression("hello, world!", zlib::BestSpeedCompression);
-  TestZlibCompression("hello, world!", zlib::DefaultCompression);
-
-  const size_t kSize = 1024;
-  char BinaryData[kSize];
-  for (size_t i = 0; i < kSize; ++i) {
-    BinaryData[i] = i & 255;
-  }
-  StringRef BinaryDataStr(BinaryData, kSize);
-
-  TestZlibCompression(BinaryDataStr, zlib::NoCompression);
-  TestZlibCompression(BinaryDataStr, zlib::BestSizeCompression);
-  TestZlibCompression(BinaryDataStr, zlib::BestSpeedCompression);
-  TestZlibCompression(BinaryDataStr, zlib::DefaultCompression);
-}
-
-TEST(CompressionTest, ZlibCRC32) {
-  EXPECT_EQ(
-      0x414FA339U,
-      zlib::crc32(StringRef("The quick brown fox jumps over the lazy dog")));
-}
-
-#endif
-
-}
diff --git a/gnu/llvm/llvm/unittests/Support/ConvertUTFTest.cpp b/gnu/llvm/llvm/unittests/Support/ConvertUTFTest.cpp
deleted file mode 100644
index 7bda6ea28ad..00000000000
--- a/gnu/llvm/llvm/unittests/Support/ConvertUTFTest.cpp
+++ /dev/null
@@ -1,1711 +0,0 @@
-//===- llvm/unittest/Support/ConvertUTFTest.cpp - ConvertUTF tests --------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/ConvertUTF.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "gtest/gtest.h"
-#include <string>
-#include <vector>
-
-using namespace llvm;
-
-TEST(ConvertUTFTest, ConvertUTF16LittleEndianToUTF8String) {
-  // Src is the look of disapproval.
-  alignas(UTF16) static const char Src[] = "\xff\xfe\xa0\x0c_\x00\xa0\x0c";
-  ArrayRef<char> Ref(Src, sizeof(Src) - 1);
-  std::string Result;
-  bool Success = convertUTF16ToUTF8String(Ref, Result);
-  EXPECT_TRUE(Success);
-  std::string Expected("\xe0\xb2\xa0_\xe0\xb2\xa0");
-  EXPECT_EQ(Expected, Result);
-}
-
-TEST(ConvertUTFTest, ConvertUTF16BigEndianToUTF8String) {
-  // Src is the look of disapproval.
-  alignas(UTF16) static const char Src[] = "\xfe\xff\x0c\xa0\x00_\x0c\xa0";
-  ArrayRef<char> Ref(Src, sizeof(Src) - 1);
-  std::string Result;
-  bool Success = convertUTF16ToUTF8String(Ref, Result);
-  EXPECT_TRUE(Success);
-  std::string Expected("\xe0\xb2\xa0_\xe0\xb2\xa0");
-  EXPECT_EQ(Expected, Result);
-}
-
-TEST(ConvertUTFTest, ConvertUTF8ToUTF16String) {
-  // Src is the look of disapproval.
-  static const char Src[] = "\xe0\xb2\xa0_\xe0\xb2\xa0";
-  StringRef Ref(Src, sizeof(Src) - 1);
-  SmallVector<UTF16, 5> Result;
-  bool Success = convertUTF8ToUTF16String(Ref, Result);
-  EXPECT_TRUE(Success);
-  static const UTF16 Expected[] = {0x0CA0, 0x005f, 0x0CA0, 0};
-  ASSERT_EQ(3u, Result.size());
-  for (int I = 0, E = 3; I != E; ++I)
-    EXPECT_EQ(Expected[I], Result[I]);
-}
-
-TEST(ConvertUTFTest, OddLengthInput) {
-  std::string Result;
-  bool Success = convertUTF16ToUTF8String(makeArrayRef("xxxxx", 5), Result);
-  EXPECT_FALSE(Success);
-}
-
-TEST(ConvertUTFTest, Empty) {
-  std::string Result;
-  bool Success = convertUTF16ToUTF8String(llvm::ArrayRef<char>(None), Result);
-  EXPECT_TRUE(Success);
-  EXPECT_TRUE(Result.empty());
-}
-
-TEST(ConvertUTFTest, HasUTF16BOM) {
-  bool HasBOM = hasUTF16ByteOrderMark(makeArrayRef("\xff\xfe", 2));
-  EXPECT_TRUE(HasBOM);
-  HasBOM = hasUTF16ByteOrderMark(makeArrayRef("\xfe\xff", 2));
-  EXPECT_TRUE(HasBOM);
-  HasBOM = hasUTF16ByteOrderMark(makeArrayRef("\xfe\xff ", 3));
-  EXPECT_TRUE(HasBOM); // Don't care about odd lengths.
-  HasBOM = hasUTF16ByteOrderMark(makeArrayRef("\xfe\xff\x00asdf", 6));
-  EXPECT_TRUE(HasBOM);
-
-  HasBOM = hasUTF16ByteOrderMark(None);
-  EXPECT_FALSE(HasBOM);
-  HasBOM = hasUTF16ByteOrderMark(makeArrayRef("\xfe", 1));
-  EXPECT_FALSE(HasBOM);
-}
-
-TEST(ConvertUTFTest, UTF16WrappersForConvertUTF16ToUTF8String) {
-  // Src is the look of disapproval.
-  alignas(UTF16) static const char Src[] = "\xff\xfe\xa0\x0c_\x00\xa0\x0c";
-  ArrayRef<UTF16> SrcRef = makeArrayRef((const UTF16 *)Src, 4);
-  std::string Result;
-  bool Success = convertUTF16ToUTF8String(SrcRef, Result);
-  EXPECT_TRUE(Success);
-  std::string Expected("\xe0\xb2\xa0_\xe0\xb2\xa0");
-  EXPECT_EQ(Expected, Result);
-}
-
-TEST(ConvertUTFTest, ConvertUTF8toWide) {
-  // Src is the look of disapproval.
-  static const char Src[] = "\xe0\xb2\xa0_\xe0\xb2\xa0";
-  std::wstring Result;
-  bool Success = ConvertUTF8toWide((const char*)Src, Result);
-  EXPECT_TRUE(Success);
-  std::wstring Expected(L"\x0ca0_\x0ca0");
-  EXPECT_EQ(Expected, Result);
-  Result.clear();
-  Success = ConvertUTF8toWide(StringRef(Src, 7), Result);
-  EXPECT_TRUE(Success);
-  EXPECT_EQ(Expected, Result);
-}
-
-TEST(ConvertUTFTest, convertWideToUTF8) {
-  // Src is the look of disapproval.
-  static const wchar_t Src[] = L"\x0ca0_\x0ca0";
-  std::string Result;
-  bool Success = convertWideToUTF8(Src, Result);
-  EXPECT_TRUE(Success);
-  std::string Expected("\xe0\xb2\xa0_\xe0\xb2\xa0");
-  EXPECT_EQ(Expected, Result);
-}
-
-struct ConvertUTFResultContainer {
-  ConversionResult ErrorCode;
-  std::vector<unsigned> UnicodeScalars;
-
-  ConvertUTFResultContainer(ConversionResult ErrorCode)
-      : ErrorCode(ErrorCode) {}
-
-  ConvertUTFResultContainer
-  withScalars(unsigned US0 = 0x110000, unsigned US1 = 0x110000,
-              unsigned US2 = 0x110000, unsigned US3 = 0x110000,
-              unsigned US4 = 0x110000, unsigned US5 = 0x110000,
-              unsigned US6 = 0x110000, unsigned US7 = 0x110000) {
-    ConvertUTFResultContainer Result(*this);
-    if (US0 != 0x110000)
-      Result.UnicodeScalars.push_back(US0);
-    if (US1 != 0x110000)
-      Result.UnicodeScalars.push_back(US1);
-    if (US2 != 0x110000)
-      Result.UnicodeScalars.push_back(US2);
-    if (US3 != 0x110000)
-      Result.UnicodeScalars.push_back(US3);
-    if (US4 != 0x110000)
-      Result.UnicodeScalars.push_back(US4);
-    if (US5 != 0x110000)
-      Result.UnicodeScalars.push_back(US5);
-    if (US6 != 0x110000)
-      Result.UnicodeScalars.push_back(US6);
-    if (US7 != 0x110000)
-      Result.UnicodeScalars.push_back(US7);
-    return Result;
-  }
-};
-
-std::pair<ConversionResult, std::vector<unsigned>>
-ConvertUTF8ToUnicodeScalarsLenient(StringRef S) {
-  const UTF8 *SourceStart = reinterpret_cast<const UTF8 *>(S.data());
-
-  const UTF8 *SourceNext = SourceStart;
-  std::vector<UTF32> Decoded(S.size(), 0);
-  UTF32 *TargetStart = Decoded.data();
-
-  auto ErrorCode =
-      ConvertUTF8toUTF32(&SourceNext, SourceStart + S.size(), &TargetStart,
-                         Decoded.data() + Decoded.size(), lenientConversion);
-
-  Decoded.resize(TargetStart - Decoded.data());
-
-  return std::make_pair(ErrorCode, Decoded);
-}
-
-std::pair<ConversionResult, std::vector<unsigned>>
-ConvertUTF8ToUnicodeScalarsPartialLenient(StringRef S) {
-  const UTF8 *SourceStart = reinterpret_cast<const UTF8 *>(S.data());
-
-  const UTF8 *SourceNext = SourceStart;
-  std::vector<UTF32> Decoded(S.size(), 0);
-  UTF32 *TargetStart = Decoded.data();
-
-  auto ErrorCode = ConvertUTF8toUTF32Partial(
-      &SourceNext, SourceStart + S.size(), &TargetStart,
-      Decoded.data() + Decoded.size(), lenientConversion);
-
-  Decoded.resize(TargetStart - Decoded.data());
-
-  return std::make_pair(ErrorCode, Decoded);
-}
-
-::testing::AssertionResult
-CheckConvertUTF8ToUnicodeScalars(ConvertUTFResultContainer Expected,
-                                 StringRef S, bool Partial = false) {
-  ConversionResult ErrorCode;
-  std::vector<unsigned> Decoded;
-  if (!Partial)
-    std::tie(ErrorCode, Decoded) = ConvertUTF8ToUnicodeScalarsLenient(S);
-  else
-    std::tie(ErrorCode, Decoded) = ConvertUTF8ToUnicodeScalarsPartialLenient(S);
-
-  if (Expected.ErrorCode != ErrorCode)
-    return ::testing::AssertionFailure() << "Expected error code "
-                                         << Expected.ErrorCode << ", actual "
-                                         << ErrorCode;
-
-  if (Expected.UnicodeScalars != Decoded)
-    return ::testing::AssertionFailure()
-           << "Expected lenient decoded result:\n"
-           << ::testing::PrintToString(Expected.UnicodeScalars) << "\n"
-           << "Actual result:\n" << ::testing::PrintToString(Decoded);
-
-  return ::testing::AssertionSuccess();
-}
-
-TEST(ConvertUTFTest, UTF8ToUTF32Lenient) {
-
-  //
-  // 1-byte sequences
-  //
-
-  // U+0041 LATIN CAPITAL LETTER A
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0x0041), "\x41"));
-
-  //
-  // 2-byte sequences
-  //
-
-  // U+0283 LATIN SMALL LETTER ESH
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0x0283),
-      "\xca\x83"));
-
-  // U+03BA GREEK SMALL LETTER KAPPA
-  // U+1F79 GREEK SMALL LETTER OMICRON WITH OXIA
-  // U+03C3 GREEK SMALL LETTER SIGMA
-  // U+03BC GREEK SMALL LETTER MU
-  // U+03B5 GREEK SMALL LETTER EPSILON
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK)
-          .withScalars(0x03ba, 0x1f79, 0x03c3, 0x03bc, 0x03b5),
-      "\xce\xba\xe1\xbd\xb9\xcf\x83\xce\xbc\xce\xb5"));
-
-  //
-  // 3-byte sequences
-  //
-
-  // U+4F8B CJK UNIFIED IDEOGRAPH-4F8B
-  // U+6587 CJK UNIFIED IDEOGRAPH-6587
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0x4f8b, 0x6587),
-      "\xe4\xbe\x8b\xe6\x96\x87"));
-
-  // U+D55C HANGUL SYLLABLE HAN
-  // U+AE00 HANGUL SYLLABLE GEUL
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xd55c, 0xae00),
-      "\xed\x95\x9c\xea\xb8\x80"));
-
-  // U+1112 HANGUL CHOSEONG HIEUH
-  // U+1161 HANGUL JUNGSEONG A
-  // U+11AB HANGUL JONGSEONG NIEUN
-  // U+1100 HANGUL CHOSEONG KIYEOK
-  // U+1173 HANGUL JUNGSEONG EU
-  // U+11AF HANGUL JONGSEONG RIEUL
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK)
-          .withScalars(0x1112, 0x1161, 0x11ab, 0x1100, 0x1173, 0x11af),
-      "\xe1\x84\x92\xe1\x85\xa1\xe1\x86\xab\xe1\x84\x80\xe1\x85\xb3"
-      "\xe1\x86\xaf"));
-
-  //
-  // 4-byte sequences
-  //
-
-  // U+E0100 VARIATION SELECTOR-17
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0x000E0100),
-      "\xf3\xa0\x84\x80"));
-
-  //
-  // First possible sequence of a certain length
-  //
-
-  // U+0000 NULL
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0x0000),
-      StringRef("\x00", 1)));
-
-  // U+0080 PADDING CHARACTER
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0x0080),
-      "\xc2\x80"));
-
-  // U+0800 SAMARITAN LETTER ALAF
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0x0800),
-      "\xe0\xa0\x80"));
-
-  // U+10000 LINEAR B SYLLABLE B008 A
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0x10000),
-      "\xf0\x90\x80\x80"));
-
-  // U+200000 (invalid)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xf8\x88\x80\x80\x80"));
-
-  // U+4000000 (invalid)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xfc\x84\x80\x80\x80\x80"));
-
-  //
-  // Last possible sequence of a certain length
-  //
-
-  // U+007F DELETE
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0x007f), "\x7f"));
-
-  // U+07FF (unassigned)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0x07ff),
-      "\xdf\xbf"));
-
-  // U+FFFF (noncharacter)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xffff),
-      "\xef\xbf\xbf"));
-
-  // U+1FFFFF (invalid)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xf7\xbf\xbf\xbf"));
-
-  // U+3FFFFFF (invalid)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xfb\xbf\xbf\xbf\xbf"));
-
-  // U+7FFFFFFF (invalid)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xfd\xbf\xbf\xbf\xbf\xbf"));
-
-  //
-  // Other boundary conditions
-  //
-
-  // U+D7FF (unassigned)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xd7ff),
-      "\xed\x9f\xbf"));
-
-  // U+E000 (private use)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xe000),
-      "\xee\x80\x80"));
-
-  // U+FFFD REPLACEMENT CHARACTER
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfffd),
-      "\xef\xbf\xbd"));
-
-  // U+10FFFF (noncharacter)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0x10ffff),
-      "\xf4\x8f\xbf\xbf"));
-
-  // U+110000 (invalid)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xf4\x90\x80\x80"));
-
-  //
-  // Unexpected continuation bytes
-  //
-
-  // A sequence of unexpected continuation bytes that don't follow a first
-  // byte, every byte is a maximal subpart.
-
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd), "\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd), "\xbf"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\x80\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\x80\xbf"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\xbf\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd),
-      "\x80\xbf\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\x80\xbf\x80\xbf"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\x80\xbf\x82\xbf\xaa"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xaa\xb0\xbb\xbf\xaa\xa0"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xaa\xb0\xbb\xbf\xaa\xa0\x8f"));
-
-  // All continuation bytes (0x80--0xbf).
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd,
-                       0xfffd, 0xfffd, 0xfffd, 0xfffd)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd,
-                       0xfffd, 0xfffd, 0xfffd, 0xfffd)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd,
-                       0xfffd, 0xfffd, 0xfffd, 0xfffd)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd,
-                       0xfffd, 0xfffd, 0xfffd, 0xfffd)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd,
-                       0xfffd, 0xfffd, 0xfffd, 0xfffd)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd,
-                       0xfffd, 0xfffd, 0xfffd, 0xfffd)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd,
-                       0xfffd, 0xfffd, 0xfffd, 0xfffd)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd,
-                       0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"
-      "\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"
-      "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf"
-      "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"));
-
-  //
-  // Lonely start bytes
-  //
-
-  // Start bytes of 2-byte sequences (0xc0--0xdf).
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd,
-                       0xfffd, 0xfffd, 0xfffd, 0xfffd)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd,
-                       0xfffd, 0xfffd, 0xfffd, 0xfffd)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd,
-                       0xfffd, 0xfffd, 0xfffd, 0xfffd)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd,
-                       0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"
-      "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"));
-
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0x0020, 0xfffd, 0x0020,
-                       0xfffd, 0x0020, 0xfffd, 0x0020)
-          .withScalars(0xfffd, 0x0020, 0xfffd, 0x0020,
-                       0xfffd, 0x0020, 0xfffd, 0x0020)
-          .withScalars(0xfffd, 0x0020, 0xfffd, 0x0020,
-                       0xfffd, 0x0020, 0xfffd, 0x0020)
-          .withScalars(0xfffd, 0x0020, 0xfffd, 0x0020,
-                       0xfffd, 0x0020, 0xfffd, 0x0020)
-          .withScalars(0xfffd, 0x0020, 0xfffd, 0x0020,
-                       0xfffd, 0x0020, 0xfffd, 0x0020)
-          .withScalars(0xfffd, 0x0020, 0xfffd, 0x0020,
-                       0xfffd, 0x0020, 0xfffd, 0x0020)
-          .withScalars(0xfffd, 0x0020, 0xfffd, 0x0020,
-                       0xfffd, 0x0020, 0xfffd, 0x0020)
-          .withScalars(0xfffd, 0x0020, 0xfffd, 0x0020,
-                       0xfffd, 0x0020, 0xfffd, 0x0020),
-      "\xc0\x20\xc1\x20\xc2\x20\xc3\x20\xc4\x20\xc5\x20\xc6\x20\xc7\x20"
-      "\xc8\x20\xc9\x20\xca\x20\xcb\x20\xcc\x20\xcd\x20\xce\x20\xcf\x20"
-      "\xd0\x20\xd1\x20\xd2\x20\xd3\x20\xd4\x20\xd5\x20\xd6\x20\xd7\x20"
-      "\xd8\x20\xd9\x20\xda\x20\xdb\x20\xdc\x20\xdd\x20\xde\x20\xdf\x20"));
-
-  // Start bytes of 3-byte sequences (0xe0--0xef).
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd,
-                       0xfffd, 0xfffd, 0xfffd, 0xfffd)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd,
-                       0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef"));
-
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0x0020, 0xfffd, 0x0020,
-                       0xfffd, 0x0020, 0xfffd, 0x0020)
-          .withScalars(0xfffd, 0x0020, 0xfffd, 0x0020,
-                       0xfffd, 0x0020, 0xfffd, 0x0020)
-          .withScalars(0xfffd, 0x0020, 0xfffd, 0x0020,
-                       0xfffd, 0x0020, 0xfffd, 0x0020)
-          .withScalars(0xfffd, 0x0020, 0xfffd, 0x0020,
-                       0xfffd, 0x0020, 0xfffd, 0x0020),
-      "\xe0\x20\xe1\x20\xe2\x20\xe3\x20\xe4\x20\xe5\x20\xe6\x20\xe7\x20"
-      "\xe8\x20\xe9\x20\xea\x20\xeb\x20\xec\x20\xed\x20\xee\x20\xef\x20"));
-
-  // Start bytes of 4-byte sequences (0xf0--0xf7).
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd,
-                       0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"));
-
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0x0020, 0xfffd, 0x0020,
-                       0xfffd, 0x0020, 0xfffd, 0x0020)
-          .withScalars(0xfffd, 0x0020, 0xfffd, 0x0020,
-                       0xfffd, 0x0020, 0xfffd, 0x0020),
-      "\xf0\x20\xf1\x20\xf2\x20\xf3\x20\xf4\x20\xf5\x20\xf6\x20\xf7\x20"));
-
-  // Start bytes of 5-byte sequences (0xf8--0xfb).
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xf8\xf9\xfa\xfb"));
-
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0x0020, 0xfffd, 0x0020,
-                       0xfffd, 0x0020, 0xfffd, 0x0020),
-      "\xf8\x20\xf9\x20\xfa\x20\xfb\x20"));
-
-  // Start bytes of 6-byte sequences (0xfc--0xfd).
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\xfc\xfd"));
-
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0x0020, 0xfffd, 0x0020),
-      "\xfc\x20\xfd\x20"));
-
-  //
-  // Other bytes (0xc0--0xc1, 0xfe--0xff).
-  //
-
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd), "\xc0"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd), "\xc1"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd), "\xfe"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd), "\xff"));
-
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xc0\xc1\xfe\xff"));
-
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xfe\xfe\xff\xff"));
-
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xfe\x80\x80\x80\x80\x80"));
-
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xff\x80\x80\x80\x80\x80"));
-
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0x0020, 0xfffd, 0x0020,
-                       0xfffd, 0x0020, 0xfffd, 0x0020),
-      "\xc0\x20\xc1\x20\xfe\x20\xff\x20"));
-
-  //
-  // Sequences with one continuation byte missing
-  //
-
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd), "\xc2"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd), "\xdf"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd),
-      "\xe0\xa0"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd),
-      "\xe0\xbf"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd),
-      "\xe1\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd),
-      "\xec\xbf"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd),
-      "\xed\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd),
-      "\xed\x9f"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd),
-      "\xee\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd),
-      "\xef\xbf"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd),
-      "\xf0\x90\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd),
-      "\xf0\xbf\xbf"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd),
-      "\xf1\x80\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd),
-      "\xf3\xbf\xbf"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd),
-      "\xf4\x80\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd),
-      "\xf4\x8f\xbf"));
-
-  // Overlong sequences with one trailing byte missing.
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd),
-      "\xc0"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd),
-      "\xc1"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\xe0\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\xe0\x9f"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd),
-      "\xf0\x80\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd),
-      "\xf0\x8f\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xf8\x80\x80\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xfc\x80\x80\x80\x80"));
-
-  // Sequences that represent surrogates with one trailing byte missing.
-  // High surrogates
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\xed\xa0"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\xed\xac"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\xed\xaf"));
-  // Low surrogates
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\xed\xb0"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\xed\xb4"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\xed\xbf"));
-
-  // Ill-formed 4-byte sequences.
-  // 11110zzz 10zzyyyy 10yyyyxx 10xxxxxx
-  // U+1100xx (invalid)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd),
-      "\xf4\x90\x80"));
-  // U+13FBxx (invalid)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd),
-      "\xf4\xbf\xbf"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd),
-      "\xf5\x80\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd),
-      "\xf6\x80\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd),
-      "\xf7\x80\x80"));
-  // U+1FFBxx (invalid)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd),
-      "\xf7\xbf\xbf"));
-
-  // Ill-formed 5-byte sequences.
-  // 111110uu 10zzzzzz 10zzyyyy 10yyyyxx 10xxxxxx
-  // U+2000xx (invalid)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xf8\x88\x80\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xf8\xbf\xbf\xbf"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xf9\x80\x80\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xfa\x80\x80\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xfb\x80\x80\x80"));
-  // U+3FFFFxx (invalid)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xfb\xbf\xbf\xbf"));
-
-  // Ill-formed 6-byte sequences.
-  // 1111110u 10uuuuuu 10uzzzzz 10zzzyyyy 10yyyyxx 10xxxxxx
-  // U+40000xx (invalid)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xfc\x84\x80\x80\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xfc\xbf\xbf\xbf\xbf"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xfd\x80\x80\x80\x80"));
-  // U+7FFFFFxx (invalid)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xfd\xbf\xbf\xbf\xbf"));
-
-  //
-  // Sequences with two continuation bytes missing
-  //
-
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd),
-      "\xf0\x90"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd),
-      "\xf0\xbf"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd),
-      "\xf1\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd),
-      "\xf3\xbf"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd),
-      "\xf4\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd),
-      "\xf4\x8f"));
-
-  // Overlong sequences with two trailing byte missing.
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd), "\xe0"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\xf0\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\xf0\x8f"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd),
-      "\xf8\x80\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xfc\x80\x80\x80"));
-
-  // Sequences that represent surrogates with two trailing bytes missing.
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd), "\xed"));
-
-  // Ill-formed 4-byte sequences.
-  // 11110zzz 10zzyyyy 10yyyyxx 10xxxxxx
-  // U+110yxx (invalid)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\xf4\x90"));
-  // U+13Fyxx (invalid)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\xf4\xbf"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\xf5\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\xf6\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\xf7\x80"));
-  // U+1FFyxx (invalid)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\xf7\xbf"));
-
-  // Ill-formed 5-byte sequences.
-  // 111110uu 10zzzzzz 10zzyyyy 10yyyyxx 10xxxxxx
-  // U+200yxx (invalid)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd, 0xfffd),
-      "\xf8\x88\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd, 0xfffd),
-      "\xf8\xbf\xbf"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd, 0xfffd),
-      "\xf9\x80\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd, 0xfffd),
-      "\xfa\x80\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd, 0xfffd),
-      "\xfb\x80\x80"));
-  // U+3FFFyxx (invalid)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd, 0xfffd),
-      "\xfb\xbf\xbf"));
-
-  // Ill-formed 6-byte sequences.
-  // 1111110u 10uuuuuu 10zzzzzz 10zzyyyy 10yyyyxx 10xxxxxx
-  // U+4000yxx (invalid)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xfc\x84\x80\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xfc\xbf\xbf\xbf"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xfd\x80\x80\x80"));
-  // U+7FFFFyxx (invalid)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xfd\xbf\xbf\xbf"));
-
-  //
-  // Sequences with three continuation bytes missing
-  //
-
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd), "\xf0"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd), "\xf1"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd), "\xf2"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd), "\xf3"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd), "\xf4"));
-
-  // Broken overlong sequences.
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd), "\xf0"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\xf8\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd, 0xfffd),
-      "\xfc\x80\x80"));
-
-  // Ill-formed 4-byte sequences.
-  // 11110zzz 10zzyyyy 10yyyyxx 10xxxxxx
-  // U+14yyxx (invalid)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd), "\xf5"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd), "\xf6"));
-  // U+1Cyyxx (invalid)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd), "\xf7"));
-
-  // Ill-formed 5-byte sequences.
-  // 111110uu 10zzzzzz 10zzyyyy 10yyyyxx 10xxxxxx
-  // U+20yyxx (invalid)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\xf8\x88"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\xf8\xbf"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\xf9\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\xfa\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\xfb\x80"));
-  // U+3FCyyxx (invalid)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\xfb\xbf"));
-
-  // Ill-formed 6-byte sequences.
-  // 1111110u 10uuuuuu 10zzzzzz 10zzyyyy 10yyyyxx 10xxxxxx
-  // U+400yyxx (invalid)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd, 0xfffd),
-      "\xfc\x84\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd, 0xfffd),
-      "\xfc\xbf\xbf"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd, 0xfffd),
-      "\xfd\x80\x80"));
-  // U+7FFCyyxx (invalid)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd, 0xfffd),
-      "\xfd\xbf\xbf"));
-
-  //
-  // Sequences with four continuation bytes missing
-  //
-
-  // Ill-formed 5-byte sequences.
-  // 111110uu 10zzzzzz 10zzyyyy 10yyyyxx 10xxxxxx
-  // U+uzyyxx (invalid)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd), "\xf8"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd), "\xf9"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd), "\xfa"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd), "\xfb"));
-  // U+3zyyxx (invalid)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd), "\xfb"));
-
-  // Broken overlong sequences.
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd), "\xf8"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\xfc\x80"));
-
-  // Ill-formed 6-byte sequences.
-  // 1111110u 10uuuuuu 10zzzzzz 10zzyyyy 10yyyyxx 10xxxxxx
-  // U+uzzyyxx (invalid)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\xfc\x84"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\xfc\xbf"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\xfd\x80"));
-  // U+7Fzzyyxx (invalid)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\xfd\xbf"));
-
-  //
-  // Sequences with five continuation bytes missing
-  //
-
-  // Ill-formed 6-byte sequences.
-  // 1111110u 10uuuuuu 10zzzzzz 10zzyyyy 10yyyyxx 10xxxxxx
-  // U+uzzyyxx (invalid)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd), "\xfc"));
-  // U+uuzzyyxx (invalid)
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd), "\xfd"));
-
-  //
-  // Consecutive sequences with trailing bytes missing
-  //
-
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, /**/ 0xfffd, 0xfffd, /**/ 0xfffd, 0xfffd, 0xfffd)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd)
-          .withScalars(0xfffd, /**/ 0xfffd, /**/ 0xfffd, 0xfffd, 0xfffd)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xc0" "\xe0\x80" "\xf0\x80\x80"
-      "\xf8\x80\x80\x80"
-      "\xfc\x80\x80\x80\x80"
-      "\xdf" "\xef\xbf" "\xf7\xbf\xbf"
-      "\xfb\xbf\xbf\xbf"
-      "\xfd\xbf\xbf\xbf\xbf"));
-
-  //
-  // Overlong UTF-8 sequences
-  //
-
-  // U+002F SOLIDUS
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0x002f), "\x2f"));
-
-  // Overlong sequences of the above.
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\xc0\xaf"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd),
-      "\xe0\x80\xaf"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xf0\x80\x80\xaf"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xf8\x80\x80\x80\xaf"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xfc\x80\x80\x80\x80\xaf"));
-
-  // U+0000 NULL
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0x0000),
-      StringRef("\x00", 1)));
-
-  // Overlong sequences of the above.
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\xc0\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd),
-      "\xe0\x80\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xf0\x80\x80\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xf8\x80\x80\x80\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xfc\x80\x80\x80\x80\x80"));
-
-  // Other overlong sequences.
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\xc0\xbf"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\xc1\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal).withScalars(0xfffd, 0xfffd),
-      "\xc1\xbf"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd),
-      "\xe0\x9f\xbf"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd),
-      "\xed\xa0\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd),
-      "\xed\xbf\xbf"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xf0\x8f\x80\x80"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xf0\x8f\xbf\xbf"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xf8\x87\xbf\xbf\xbf"));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xfc\x83\xbf\xbf\xbf\xbf"));
-
-  //
-  // Isolated surrogates
-  //
-
-  // Unicode 6.3.0:
-  //
-  //    D71.  High-surrogate code point: A Unicode code point in the range
-  //    U+D800 to U+DBFF.
-  //
-  //    D73.  Low-surrogate code point: A Unicode code point in the range
-  //    U+DC00 to U+DFFF.
-
-  // Note: U+E0100 is <DB40 DD00> in UTF16.
-
-  // High surrogates
-
-  // U+D800
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd),
-      "\xed\xa0\x80"));
-
-  // U+DB40
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd),
-      "\xed\xac\xa0"));
-
-  // U+DBFF
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd),
-      "\xed\xaf\xbf"));
-
-  // Low surrogates
-
-  // U+DC00
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd),
-      "\xed\xb0\x80"));
-
-  // U+DD00
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd),
-      "\xed\xb4\x80"));
-
-  // U+DFFF
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd),
-      "\xed\xbf\xbf"));
-
-  // Surrogate pairs
-
-  // U+D800 U+DC00
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xed\xa0\x80\xed\xb0\x80"));
-
-  // U+D800 U+DD00
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xed\xa0\x80\xed\xb4\x80"));
-
-  // U+D800 U+DFFF
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xed\xa0\x80\xed\xbf\xbf"));
-
-  // U+DB40 U+DC00
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xed\xac\xa0\xed\xb0\x80"));
-
-  // U+DB40 U+DD00
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xed\xac\xa0\xed\xb4\x80"));
-
-  // U+DB40 U+DFFF
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xed\xac\xa0\xed\xbf\xbf"));
-
-  // U+DBFF U+DC00
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xed\xaf\xbf\xed\xb0\x80"));
-
-  // U+DBFF U+DD00
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xed\xaf\xbf\xed\xb4\x80"));
-
-  // U+DBFF U+DFFF
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceIllegal)
-          .withScalars(0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd),
-      "\xed\xaf\xbf\xed\xbf\xbf"));
-
-  //
-  // Noncharacters
-  //
-
-  // Unicode 6.3.0:
-  //
-  //    D14.  Noncharacter: A code point that is permanently reserved for
-  //    internal use and that should never be interchanged. Noncharacters
-  //    consist of the values U+nFFFE and U+nFFFF (where n is from 0 to 1016)
-  //    and the values U+FDD0..U+FDEF.
-
-  // U+FFFE
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfffe),
-      "\xef\xbf\xbe"));
-
-  // U+FFFF
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xffff),
-      "\xef\xbf\xbf"));
-
-  // U+1FFFE
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0x1fffe),
-      "\xf0\x9f\xbf\xbe"));
-
-  // U+1FFFF
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0x1ffff),
-      "\xf0\x9f\xbf\xbf"));
-
-  // U+2FFFE
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0x2fffe),
-      "\xf0\xaf\xbf\xbe"));
-
-  // U+2FFFF
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0x2ffff),
-      "\xf0\xaf\xbf\xbf"));
-
-  // U+3FFFE
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0x3fffe),
-      "\xf0\xbf\xbf\xbe"));
-
-  // U+3FFFF
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0x3ffff),
-      "\xf0\xbf\xbf\xbf"));
-
-  // U+4FFFE
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0x4fffe),
-      "\xf1\x8f\xbf\xbe"));
-
-  // U+4FFFF
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0x4ffff),
-      "\xf1\x8f\xbf\xbf"));
-
-  // U+5FFFE
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0x5fffe),
-      "\xf1\x9f\xbf\xbe"));
-
-  // U+5FFFF
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0x5ffff),
-      "\xf1\x9f\xbf\xbf"));
-
-  // U+6FFFE
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0x6fffe),
-      "\xf1\xaf\xbf\xbe"));
-
-  // U+6FFFF
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0x6ffff),
-      "\xf1\xaf\xbf\xbf"));
-
-  // U+7FFFE
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0x7fffe),
-      "\xf1\xbf\xbf\xbe"));
-
-  // U+7FFFF
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0x7ffff),
-      "\xf1\xbf\xbf\xbf"));
-
-  // U+8FFFE
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0x8fffe),
-      "\xf2\x8f\xbf\xbe"));
-
-  // U+8FFFF
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0x8ffff),
-      "\xf2\x8f\xbf\xbf"));
-
-  // U+9FFFE
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0x9fffe),
-      "\xf2\x9f\xbf\xbe"));
-
-  // U+9FFFF
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0x9ffff),
-      "\xf2\x9f\xbf\xbf"));
-
-  // U+AFFFE
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xafffe),
-      "\xf2\xaf\xbf\xbe"));
-
-  // U+AFFFF
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xaffff),
-      "\xf2\xaf\xbf\xbf"));
-
-  // U+BFFFE
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xbfffe),
-      "\xf2\xbf\xbf\xbe"));
-
-  // U+BFFFF
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xbffff),
-      "\xf2\xbf\xbf\xbf"));
-
-  // U+CFFFE
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xcfffe),
-      "\xf3\x8f\xbf\xbe"));
-
-  // U+CFFFF
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xcfffF),
-      "\xf3\x8f\xbf\xbf"));
-
-  // U+DFFFE
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xdfffe),
-      "\xf3\x9f\xbf\xbe"));
-
-  // U+DFFFF
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xdffff),
-      "\xf3\x9f\xbf\xbf"));
-
-  // U+EFFFE
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xefffe),
-      "\xf3\xaf\xbf\xbe"));
-
-  // U+EFFFF
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xeffff),
-      "\xf3\xaf\xbf\xbf"));
-
-  // U+FFFFE
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xffffe),
-      "\xf3\xbf\xbf\xbe"));
-
-  // U+FFFFF
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfffff),
-      "\xf3\xbf\xbf\xbf"));
-
-  // U+10FFFE
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0x10fffe),
-      "\xf4\x8f\xbf\xbe"));
-
-  // U+10FFFF
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0x10ffff),
-      "\xf4\x8f\xbf\xbf"));
-
-  // U+FDD0
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfdd0),
-      "\xef\xb7\x90"));
-
-  // U+FDD1
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfdd1),
-      "\xef\xb7\x91"));
-
-  // U+FDD2
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfdd2),
-      "\xef\xb7\x92"));
-
-  // U+FDD3
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfdd3),
-      "\xef\xb7\x93"));
-
-  // U+FDD4
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfdd4),
-      "\xef\xb7\x94"));
-
-  // U+FDD5
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfdd5),
-      "\xef\xb7\x95"));
-
-  // U+FDD6
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfdd6),
-      "\xef\xb7\x96"));
-
-  // U+FDD7
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfdd7),
-      "\xef\xb7\x97"));
-
-  // U+FDD8
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfdd8),
-      "\xef\xb7\x98"));
-
-  // U+FDD9
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfdd9),
-      "\xef\xb7\x99"));
-
-  // U+FDDA
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfdda),
-      "\xef\xb7\x9a"));
-
-  // U+FDDB
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfddb),
-      "\xef\xb7\x9b"));
-
-  // U+FDDC
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfddc),
-      "\xef\xb7\x9c"));
-
-  // U+FDDD
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfddd),
-      "\xef\xb7\x9d"));
-
-  // U+FDDE
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfdde),
-      "\xef\xb7\x9e"));
-
-  // U+FDDF
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfddf),
-      "\xef\xb7\x9f"));
-
-  // U+FDE0
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfde0),
-      "\xef\xb7\xa0"));
-
-  // U+FDE1
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfde1),
-      "\xef\xb7\xa1"));
-
-  // U+FDE2
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfde2),
-      "\xef\xb7\xa2"));
-
-  // U+FDE3
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfde3),
-      "\xef\xb7\xa3"));
-
-  // U+FDE4
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfde4),
-      "\xef\xb7\xa4"));
-
-  // U+FDE5
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfde5),
-      "\xef\xb7\xa5"));
-
-  // U+FDE6
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfde6),
-      "\xef\xb7\xa6"));
-
-  // U+FDE7
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfde7),
-      "\xef\xb7\xa7"));
-
-  // U+FDE8
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfde8),
-      "\xef\xb7\xa8"));
-
-  // U+FDE9
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfde9),
-      "\xef\xb7\xa9"));
-
-  // U+FDEA
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfdea),
-      "\xef\xb7\xaa"));
-
-  // U+FDEB
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfdeb),
-      "\xef\xb7\xab"));
-
-  // U+FDEC
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfdec),
-      "\xef\xb7\xac"));
-
-  // U+FDED
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfded),
-      "\xef\xb7\xad"));
-
-  // U+FDEE
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfdee),
-      "\xef\xb7\xae"));
-
-  // U+FDEF
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfdef),
-      "\xef\xb7\xaf"));
-
-  // U+FDF0
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfdf0),
-      "\xef\xb7\xb0"));
-
-  // U+FDF1
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfdf1),
-      "\xef\xb7\xb1"));
-
-  // U+FDF2
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfdf2),
-      "\xef\xb7\xb2"));
-
-  // U+FDF3
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfdf3),
-      "\xef\xb7\xb3"));
-
-  // U+FDF4
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfdf4),
-      "\xef\xb7\xb4"));
-
-  // U+FDF5
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfdf5),
-      "\xef\xb7\xb5"));
-
-  // U+FDF6
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfdf6),
-      "\xef\xb7\xb6"));
-
-  // U+FDF7
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfdf7),
-      "\xef\xb7\xb7"));
-
-  // U+FDF8
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfdf8),
-      "\xef\xb7\xb8"));
-
-  // U+FDF9
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfdf9),
-      "\xef\xb7\xb9"));
-
-  // U+FDFA
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfdfa),
-      "\xef\xb7\xba"));
-
-  // U+FDFB
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfdfb),
-      "\xef\xb7\xbb"));
-
-  // U+FDFC
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfdfc),
-      "\xef\xb7\xbc"));
-
-  // U+FDFD
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfdfd),
-      "\xef\xb7\xbd"));
-
-  // U+FDFE
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfdfe),
-      "\xef\xb7\xbe"));
-
-  // U+FDFF
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0xfdff),
-      "\xef\xb7\xbf"));
-}
-
-TEST(ConvertUTFTest, UTF8ToUTF32PartialLenient) {
-  // U+0041 LATIN CAPITAL LETTER A
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(conversionOK).withScalars(0x0041),
-      "\x41", true));
-
-  //
-  // Sequences with one continuation byte missing
-  //
-
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceExhausted),
-      "\xc2", true));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceExhausted),
-      "\xdf", true));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceExhausted),
-      "\xe0\xa0", true));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceExhausted),
-      "\xe0\xbf", true));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceExhausted),
-      "\xe1\x80", true));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceExhausted),
-      "\xec\xbf", true));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceExhausted),
-      "\xed\x80", true));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceExhausted),
-      "\xed\x9f", true));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceExhausted),
-      "\xee\x80", true));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceExhausted),
-      "\xef\xbf", true));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceExhausted),
-      "\xf0\x90\x80", true));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceExhausted),
-      "\xf0\xbf\xbf", true));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceExhausted),
-      "\xf1\x80\x80", true));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceExhausted),
-      "\xf3\xbf\xbf", true));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceExhausted),
-      "\xf4\x80\x80", true));
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceExhausted),
-      "\xf4\x8f\xbf", true));
-
-  EXPECT_TRUE(CheckConvertUTF8ToUnicodeScalars(
-      ConvertUTFResultContainer(sourceExhausted).withScalars(0x0041),
-      "\x41\xc2", true));
-}
-
diff --git a/gnu/llvm/llvm/unittests/Support/CrashRecoveryTest.cpp b/gnu/llvm/llvm/unittests/Support/CrashRecoveryTest.cpp
deleted file mode 100644
index e95513eb284..00000000000
--- a/gnu/llvm/llvm/unittests/Support/CrashRecoveryTest.cpp
+++ /dev/null
@@ -1,187 +0,0 @@
-//===- llvm/unittest/Support/CrashRecoveryTest.cpp ------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/Triple.h"
-#include "llvm/Config/config.h"
-#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/Compiler.h"
-#include "llvm/Support/CrashRecoveryContext.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/Host.h"
-#include "llvm/Support/Program.h"
-#include "llvm/Support/Signals.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gtest/gtest.h"
-
-#ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
-#define NOGDI
-#include <windows.h>
-#endif
-
-#ifdef LLVM_ON_UNIX
-#ifdef HAVE_SIGNAL_H
-#include <signal.h>
-#endif
-#endif
-
-using namespace llvm;
-using namespace llvm::sys;
-
-static int GlobalInt = 0;
-static void nullDeref() { *(volatile int *)0x10 = 0; }
-static void incrementGlobal() { ++GlobalInt; }
-static void llvmTrap() { LLVM_BUILTIN_TRAP; }
-static void incrementGlobalWithParam(void *) { ++GlobalInt; }
-
-TEST(CrashRecoveryTest, Basic) {
-  llvm::CrashRecoveryContext::Enable();
-  GlobalInt = 0;
-  EXPECT_TRUE(CrashRecoveryContext().RunSafely(incrementGlobal));
-  EXPECT_EQ(1, GlobalInt);
-  EXPECT_FALSE(CrashRecoveryContext().RunSafely(nullDeref));
-  EXPECT_FALSE(CrashRecoveryContext().RunSafely(llvmTrap));
-}
-
-struct IncrementGlobalCleanup : CrashRecoveryContextCleanup {
-  IncrementGlobalCleanup(CrashRecoveryContext *CRC)
-      : CrashRecoveryContextCleanup(CRC) {}
-  void recoverResources() override { ++GlobalInt; }
-};
-
-static void noop() {}
-
-TEST(CrashRecoveryTest, Cleanup) {
-  llvm::CrashRecoveryContext::Enable();
-  GlobalInt = 0;
-  {
-    CrashRecoveryContext CRC;
-    CRC.registerCleanup(new IncrementGlobalCleanup(&CRC));
-    EXPECT_TRUE(CRC.RunSafely(noop));
-  } // run cleanups
-  EXPECT_EQ(1, GlobalInt);
-
-  GlobalInt = 0;
-  {
-    CrashRecoveryContext CRC;
-    CRC.registerCleanup(new IncrementGlobalCleanup(&CRC));
-    EXPECT_FALSE(CRC.RunSafely(nullDeref));
-  } // run cleanups
-  EXPECT_EQ(1, GlobalInt);
-  llvm::CrashRecoveryContext::Disable();
-}
-
-TEST(CrashRecoveryTest, DumpStackCleanup) {
-  SmallString<128> Filename;
-  std::error_code EC = sys::fs::createTemporaryFile("crash", "test", Filename);
-  EXPECT_FALSE(EC);
-  sys::RemoveFileOnSignal(Filename);
-  llvm::sys::AddSignalHandler(incrementGlobalWithParam, nullptr);
-  GlobalInt = 0;
-  llvm::CrashRecoveryContext::Enable();
-  {
-    CrashRecoveryContext CRC;
-    CRC.DumpStackAndCleanupOnFailure = true;
-    EXPECT_TRUE(CRC.RunSafely(noop));
-  }
-  EXPECT_TRUE(sys::fs::exists(Filename));
-  EXPECT_EQ(GlobalInt, 0);
-  {
-    CrashRecoveryContext CRC;
-    CRC.DumpStackAndCleanupOnFailure = true;
-    EXPECT_FALSE(CRC.RunSafely(nullDeref));
-    EXPECT_NE(CRC.RetCode, 0);
-  }
-  EXPECT_FALSE(sys::fs::exists(Filename));
-  EXPECT_EQ(GlobalInt, 1);
-  llvm::CrashRecoveryContext::Disable();
-}
-
-TEST(CrashRecoveryTest, LimitedStackTrace) {
-  std::string Res;
-  llvm::raw_string_ostream RawStream(Res);
-  PrintStackTrace(RawStream, 1);
-  std::string Str = RawStream.str();
-  // FIXME: Handle "Depth" parameter in PrintStackTrace() function
-  // to print stack trace upto a specified Depth.
-  if (!Triple(sys::getProcessTriple()).isOSWindows()) {
-    EXPECT_EQ(std::string::npos, Str.find("#1"));
-  }
-}
-
-#ifdef _WIN32
-static void raiseIt() {
-  RaiseException(123, EXCEPTION_NONCONTINUABLE, 0, NULL);
-}
-
-TEST(CrashRecoveryTest, RaiseException) {
-  llvm::CrashRecoveryContext::Enable();
-  EXPECT_FALSE(CrashRecoveryContext().RunSafely(raiseIt));
-}
-
-static void outputString() {
-  OutputDebugStringA("output for debugger\n");
-}
-
-TEST(CrashRecoveryTest, CallOutputDebugString) {
-  llvm::CrashRecoveryContext::Enable();
-  EXPECT_TRUE(CrashRecoveryContext().RunSafely(outputString));
-}
-
-TEST(CrashRecoveryTest, Abort) {
-  llvm::CrashRecoveryContext::Enable();
-  auto A = []() { abort(); };
-  EXPECT_FALSE(CrashRecoveryContext().RunSafely(A));
-  // Test a second time to ensure we reinstall the abort signal handler.
-  EXPECT_FALSE(CrashRecoveryContext().RunSafely(A));
-}
-#endif
-
-// Specifically ensure that programs that signal() or abort() through the
-// CrashRecoveryContext can re-throw again their signal, so that `not --crash`
-// succeeds.
-#ifdef LLVM_ON_UNIX
-// See llvm/utils/unittest/UnitTestMain/TestMain.cpp
-extern const char *TestMainArgv0;
-
-// Just a reachable symbol to ease resolving of the executable's path.
-static cl::opt<std::string> CrashTestStringArg1("crash-test-string-arg1");
-
-TEST(CrashRecoveryTest, UnixCRCReturnCode) {
-  using namespace llvm::sys;
-  if (getenv("LLVM_CRC_UNIXCRCRETURNCODE")) {
-    llvm::CrashRecoveryContext::Enable();
-    CrashRecoveryContext CRC;
-    // This path runs in a subprocess that exits by signalling, so don't use
-    // the googletest macros to verify things as they won't report properly.
-    if (CRC.RunSafely(abort))
-      llvm_unreachable("RunSafely returned true!");
-    if (CRC.RetCode != 128 + SIGABRT)
-      llvm_unreachable("Unexpected RetCode!");
-    // re-throw signal
-    llvm::sys::unregisterHandlers();
-    raise(CRC.RetCode - 128);
-    llvm_unreachable("Should have exited already!");
-  }
-
-  std::string Executable =
-      sys::fs::getMainExecutable(TestMainArgv0, &CrashTestStringArg1);
-  StringRef argv[] = {
-      Executable, "--gtest_filter=CrashRecoveryTest.UnixCRCReturnCode"};
-
-  // Add LLVM_CRC_UNIXCRCRETURNCODE to the environment of the child process.
-  int Res = setenv("LLVM_CRC_UNIXCRCRETURNCODE", "1", 0);
-  ASSERT_EQ(Res, 0);
-
-  std::string Error;
-  bool ExecutionFailed;
-  int RetCode = ExecuteAndWait(Executable, argv, {}, {}, 0, 0, &Error,
-                               &ExecutionFailed);
-  ASSERT_EQ(-2, RetCode);
-}
-#endif
diff --git a/gnu/llvm/llvm/unittests/Support/DJBTest.cpp b/gnu/llvm/llvm/unittests/Support/DJBTest.cpp
deleted file mode 100644
index c01bbe1eaa6..00000000000
--- a/gnu/llvm/llvm/unittests/Support/DJBTest.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-//===---------- llvm/unittest/Support/DJBTest.cpp -------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/DJB.h"
-#include "llvm/ADT/Twine.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-TEST(DJBTest, caseFolding) {
-  struct TestCase {
-    StringLiteral One;
-    StringLiteral Two;
-  };
-
-  static constexpr TestCase Tests[] = {
-      {{"ASDF"}, {"asdf"}},
-      {{"qWeR"}, {"QwEr"}},
-      {{"qqqqqqqqqqqqqqqqqqqq"}, {"QQQQQQQQQQQQQQQQQQQQ"}},
-
-      {{"I"}, {"i"}},
-      // Latin Small Letter Dotless I
-      {{u8"\u0130"}, {"i"}},
-      // Latin Capital Letter I With Dot Above
-      {{u8"\u0131"}, {"i"}},
-
-      // Latin Capital Letter A With Grave
-      {{u8"\u00c0"}, {u8"\u00e0"}},
-      // Latin Capital Letter A With Macron
-      {{u8"\u0100"}, {u8"\u0101"}},
-      // Latin Capital Letter L With Acute
-      {{u8"\u0139"}, {u8"\u013a"}},
-      // Cyrillic Capital Letter Ie
-      {{u8"\u0415"}, {u8"\u0435"}},
-      // Latin Capital Letter A With Circumflex And Grave
-      {{u8"\u1ea6"}, {u8"\u1ea7"}},
-      // Kelvin Sign
-      {{u8"\u212a"}, {u8"\u006b"}},
-      // Glagolitic Capital Letter Chrivi
-      {{u8"\u2c1d"}, {u8"\u2c4d"}},
-      // Fullwidth Latin Capital Letter M
-      {{u8"\uff2d"}, {u8"\uff4d"}},
-      // Old Hungarian Capital Letter Ej
-      {{u8"\U00010c92"}, {u8"\U00010cd2"}},
-  };
-
-  for (const TestCase &T : Tests) {
-    SCOPED_TRACE("Comparing '" + T.One + "' and '" + T.Two + "'");
-    EXPECT_EQ(caseFoldingDjbHash(T.One), caseFoldingDjbHash(T.Two));
-  }
-}
-
-TEST(DJBTest, knownValuesLowerCase) {
-  struct TestCase {
-    StringLiteral Text;
-    uint32_t Hash;
-  };
-  static constexpr TestCase Tests[] = {
-      {{""}, 5381u},
-      {{"f"}, 177675u},
-      {{"fo"}, 5863386u},
-      {{"foo"}, 193491849u},
-      {{"foob"}, 2090263819u},
-      {{"fooba"}, 259229388u},
-      {{"foobar"}, 4259602622u},
-      {{"pneumonoultramicroscopicsilicovolcanoconiosis"}, 3999417781u},
-  };
-
-  for (const TestCase &T : Tests) {
-    SCOPED_TRACE("Text: '" + T.Text + "'");
-    EXPECT_EQ(T.Hash, djbHash(T.Text));
-    EXPECT_EQ(T.Hash, caseFoldingDjbHash(T.Text));
-    EXPECT_EQ(T.Hash, caseFoldingDjbHash(T.Text.upper()));
-  }
-}
-
-TEST(DJBTest, knownValuesUnicode) {
-  EXPECT_EQ(5866553u, djbHash(u8"\u0130"));
-  EXPECT_EQ(177678u, caseFoldingDjbHash(u8"\u0130"));
-  EXPECT_EQ(
-      1302161417u,
-      djbHash(
-          u8"\u0130\u0131\u00c0\u00e0\u0100\u0101\u0139\u013a\u0415\u0435\u1ea6"
-          u8"\u1ea7\u212a\u006b\u2c1d\u2c4d\uff2d\uff4d\U00010c92\U00010cd2"));
-  EXPECT_EQ(
-      1145571043u,
-      caseFoldingDjbHash(
-          u8"\u0130\u0131\u00c0\u00e0\u0100\u0101\u0139\u013a\u0415\u0435\u1ea6"
-          u8"\u1ea7\u212a\u006b\u2c1d\u2c4d\uff2d\uff4d\U00010c92\U00010cd2"));
-}
diff --git a/gnu/llvm/llvm/unittests/Support/DataExtractorTest.cpp b/gnu/llvm/llvm/unittests/Support/DataExtractorTest.cpp
deleted file mode 100644
index 41c40648b85..00000000000
--- a/gnu/llvm/llvm/unittests/Support/DataExtractorTest.cpp
+++ /dev/null
@@ -1,384 +0,0 @@
-//===- llvm/unittest/Support/DataExtractorTest.cpp - DataExtractor tests --===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/DataExtractor.h"
-#include "llvm/Testing/Support/Error.h"
-#include "gtest/gtest.h"
-using namespace llvm;
-
-namespace {
-
-const char numberData[] = "\x80\x90\xFF\xFF\x80\x00\x00\x00";
-const char leb128data[] = "\xA6\x49";
-const char bigleb128data[] = "\xAA\xA9\xFF\xAA\xFF\xAA\xFF\x4A";
-
-TEST(DataExtractorTest, OffsetOverflow) {
-  DataExtractor DE(StringRef(numberData, sizeof(numberData)-1), false, 8);
-  EXPECT_FALSE(DE.isValidOffsetForDataOfSize(-2U, 5));
-}
-
-TEST(DataExtractorTest, UnsignedNumbers) {
-  DataExtractor DE(StringRef(numberData, sizeof(numberData)-1), false, 8);
-  uint64_t offset = 0;
-
-  EXPECT_EQ(0x80U, DE.getU8(&offset));
-  EXPECT_EQ(1U, offset);
-  offset = 0;
-  EXPECT_EQ(0x8090U, DE.getU16(&offset));
-  EXPECT_EQ(2U, offset);
-  offset = 0;
-  EXPECT_EQ(0x8090FFFFU, DE.getU32(&offset));
-  EXPECT_EQ(4U, offset);
-  offset = 0;
-  EXPECT_EQ(0x8090FFFF80000000ULL, DE.getU64(&offset));
-  EXPECT_EQ(8U, offset);
-  offset = 0;
-  EXPECT_EQ(0x8090FFFF80000000ULL, DE.getAddress(&offset));
-  EXPECT_EQ(8U, offset);
-  offset = 0;
-
-  uint32_t data[2];
-  EXPECT_EQ(data, DE.getU32(&offset, data, 2));
-  EXPECT_EQ(0x8090FFFFU, data[0]);
-  EXPECT_EQ(0x80000000U, data[1]);
-  EXPECT_EQ(8U, offset);
-  offset = 0;
-
-  // Now for little endian.
-  DE = DataExtractor(StringRef(numberData, sizeof(numberData)-1), true, 4);
-  EXPECT_EQ(0x9080U, DE.getU16(&offset));
-  EXPECT_EQ(2U, offset);
-  offset = 0;
-  EXPECT_EQ(0xFFFF9080U, DE.getU32(&offset));
-  EXPECT_EQ(4U, offset);
-  offset = 0;
-  EXPECT_EQ(0x80FFFF9080ULL, DE.getU64(&offset));
-  EXPECT_EQ(8U, offset);
-  offset = 0;
-  EXPECT_EQ(0xFFFF9080U, DE.getAddress(&offset));
-  EXPECT_EQ(4U, offset);
-  offset = 0;
-
-  EXPECT_EQ(data, DE.getU32(&offset, data, 2));
-  EXPECT_EQ(0xFFFF9080U, data[0]);
-  EXPECT_EQ(0x80U, data[1]);
-  EXPECT_EQ(8U, offset);
-}
-
-TEST(DataExtractorTest, SignedNumbers) {
-  DataExtractor DE(StringRef(numberData, sizeof(numberData)-1), false, 8);
-  uint64_t offset = 0;
-
-  EXPECT_EQ(-128, DE.getSigned(&offset, 1));
-  EXPECT_EQ(1U, offset);
-  offset = 0;
-  EXPECT_EQ(-32624, DE.getSigned(&offset, 2));
-  EXPECT_EQ(2U, offset);
-  offset = 0;
-  EXPECT_EQ(-2137980929, DE.getSigned(&offset, 4));
-  EXPECT_EQ(4U, offset);
-  offset = 0;
-  EXPECT_EQ(-9182558167379214336LL, DE.getSigned(&offset, 8));
-  EXPECT_EQ(8U, offset);
-}
-
-TEST(DataExtractorTest, Strings) {
-  const char stringData[] = "hellohello\0hello";
-  DataExtractor DE(StringRef(stringData, sizeof(stringData)-1), false, 8);
-  uint64_t offset = 0;
-
-  EXPECT_EQ(stringData, DE.getCStr(&offset));
-  EXPECT_EQ(11U, offset);
-  EXPECT_EQ(nullptr, DE.getCStr(&offset));
-  EXPECT_EQ(11U, offset);
-
-  DataExtractor::Cursor C(0);
-  EXPECT_EQ(stringData, DE.getCStr(C));
-  EXPECT_EQ(11U, C.tell());
-  EXPECT_EQ(nullptr, DE.getCStr(C));
-  EXPECT_EQ(11U, C.tell());
-  EXPECT_THAT_ERROR(
-      C.takeError(),
-      FailedWithMessage("no null terminated string at offset 0xb"));
-}
-
-TEST(DataExtractorTest, LEB128) {
-  DataExtractor DE(StringRef(leb128data, sizeof(leb128data)-1), false, 8);
-  uint64_t offset = 0;
-
-  EXPECT_EQ(9382ULL, DE.getULEB128(&offset));
-  EXPECT_EQ(2U, offset);
-  offset = 0;
-  EXPECT_EQ(-7002LL, DE.getSLEB128(&offset));
-  EXPECT_EQ(2U, offset);
-
-  DataExtractor BDE(StringRef(bigleb128data, sizeof(bigleb128data)-1), false,8);
-  offset = 0;
-  EXPECT_EQ(42218325750568106ULL, BDE.getULEB128(&offset));
-  EXPECT_EQ(8U, offset);
-  offset = 0;
-  EXPECT_EQ(-29839268287359830LL, BDE.getSLEB128(&offset));
-  EXPECT_EQ(8U, offset);
-}
-
-TEST(DataExtractorTest, LEB128_error) {
-  DataExtractor DE(StringRef("\x81"), false, 8);
-  uint64_t Offset = 0;
-  EXPECT_EQ(0U, DE.getULEB128(&Offset));
-  EXPECT_EQ(0U, Offset);
-
-  Offset = 0;
-  EXPECT_EQ(0U, DE.getSLEB128(&Offset));
-  EXPECT_EQ(0U, Offset);
-
-  DataExtractor::Cursor C(0);
-  EXPECT_EQ(0U, DE.getULEB128(C));
-  EXPECT_THAT_ERROR(
-      C.takeError(),
-      FailedWithMessage("unable to decode LEB128 at offset 0x00000000: "
-                        "malformed uleb128, extends past end"));
-
-  C = DataExtractor::Cursor(0);
-  EXPECT_EQ(0U, DE.getSLEB128(C));
-  EXPECT_THAT_ERROR(
-      C.takeError(),
-      FailedWithMessage("unable to decode LEB128 at offset 0x00000000: "
-                        "malformed sleb128, extends past end"));
-
-  // Show non-zero offsets are reported appropriately.
-  C = DataExtractor::Cursor(1);
-  EXPECT_EQ(0U, DE.getULEB128(C));
-  EXPECT_THAT_ERROR(
-      C.takeError(),
-      FailedWithMessage("unable to decode LEB128 at offset 0x00000001: "
-                        "malformed uleb128, extends past end"));
-}
-
-TEST(DataExtractorTest, Cursor_tell) {
-  DataExtractor DE(StringRef("AB"), false, 8);
-  DataExtractor::Cursor C(0);
-  // A successful read operation advances the cursor
-  EXPECT_EQ('A', DE.getU8(C));
-  EXPECT_EQ(1u, C.tell());
-
-  // An unsuccessful one doesn't.
-  EXPECT_EQ(0u, DE.getU16(C));
-  EXPECT_EQ(1u, C.tell());
-
-  // And neither do any subsequent operations.
-  EXPECT_EQ(0, DE.getU8(C));
-  EXPECT_EQ(1u, C.tell());
-
-  consumeError(C.takeError());
-}
-
-TEST(DataExtractorTest, Cursor_takeError) {
-  DataExtractor DE(StringRef("AB"), false, 8);
-  DataExtractor::Cursor C(0);
-  // Initially, the cursor is in the "success" state.
-  EXPECT_THAT_ERROR(C.takeError(), Succeeded());
-
-  // It remains "success" after a successful read.
-  EXPECT_EQ('A', DE.getU8(C));
-  EXPECT_THAT_ERROR(C.takeError(), Succeeded());
-
-  // An unsuccessful read sets the error state.
-  EXPECT_EQ(0u, DE.getU32(C));
-  EXPECT_THAT_ERROR(C.takeError(), Failed());
-
-  // Once set the error sticks until explicitly cleared.
-  EXPECT_EQ(0u, DE.getU32(C));
-  EXPECT_EQ(0, DE.getU8(C));
-  EXPECT_THAT_ERROR(C.takeError(), Failed());
-
-  // At which point reads can be succeed again.
-  EXPECT_EQ('B', DE.getU8(C));
-  EXPECT_THAT_ERROR(C.takeError(), Succeeded());
-}
-
-TEST(DataExtractorTest, Cursor_chaining) {
-  DataExtractor DE(StringRef("ABCD"), false, 8);
-  DataExtractor::Cursor C(0);
-
-  // Multiple reads can be chained without trigerring any assertions.
-  EXPECT_EQ('A', DE.getU8(C));
-  EXPECT_EQ('B', DE.getU8(C));
-  EXPECT_EQ('C', DE.getU8(C));
-  EXPECT_EQ('D', DE.getU8(C));
-  // And the error checked at the end.
-  EXPECT_THAT_ERROR(C.takeError(), Succeeded());
-}
-
-#if defined(GTEST_HAS_DEATH_TEST) && defined(_DEBUG) &&                        \
-    LLVM_ENABLE_ABI_BREAKING_CHECKS
-TEST(DataExtractorDeathTest, Cursor) {
-  DataExtractor DE(StringRef("AB"), false, 8);
-
-  // Even an unused cursor must be checked for errors:
-  EXPECT_DEATH(DataExtractor::Cursor(0),
-               "Success values must still be checked prior to being destroyed");
-
-  {
-    auto C = std::make_unique<DataExtractor::Cursor>(0);
-    EXPECT_EQ(0u, DE.getU32(*C));
-    // It must also be checked after an unsuccessful operation.
-    // destruction.
-    EXPECT_DEATH(C.reset(), "unexpected end of data");
-    EXPECT_THAT_ERROR(C->takeError(), Failed());
-  }
-  {
-    auto C = std::make_unique<DataExtractor::Cursor>(0);
-    EXPECT_EQ('A', DE.getU8(*C));
-    // Same goes for a successful one.
-    EXPECT_DEATH(
-        C.reset(),
-        "Success values must still be checked prior to being destroyed");
-    EXPECT_THAT_ERROR(C->takeError(), Succeeded());
-  }
-  {
-    auto C = std::make_unique<DataExtractor::Cursor>(0);
-    EXPECT_EQ('A', DE.getU8(*C));
-    EXPECT_EQ(0u, DE.getU32(*C));
-    // Even if a successful operation is followed by an unsuccessful one.
-    EXPECT_DEATH(C.reset(), "unexpected end of data");
-    EXPECT_THAT_ERROR(C->takeError(), Failed());
-  }
-  {
-    auto C = std::make_unique<DataExtractor::Cursor>(0);
-    EXPECT_EQ(0u, DE.getU32(*C));
-    EXPECT_EQ(0, DE.getU8(*C));
-    // Even if an unsuccessful operation is followed by one that would normally
-    // succeed.
-    EXPECT_DEATH(C.reset(), "unexpected end of data");
-    EXPECT_THAT_ERROR(C->takeError(), Failed());
-  }
-}
-#endif
-
-TEST(DataExtractorTest, getU8_vector) {
-  DataExtractor DE(StringRef("AB"), false, 8);
-  DataExtractor::Cursor C(0);
-  SmallVector<uint8_t, 2> S;
-
-  DE.getU8(C, S, 4);
-  EXPECT_THAT_ERROR(C.takeError(), Failed());
-  EXPECT_EQ("", toStringRef(S));
-
-  DE.getU8(C, S, 2);
-  EXPECT_THAT_ERROR(C.takeError(), Succeeded());
-  EXPECT_EQ("AB", toStringRef(S));
-
-  C = DataExtractor::Cursor(0x47);
-  DE.getU8(C, S, 2);
-  EXPECT_THAT_ERROR(
-      C.takeError(),
-      FailedWithMessage("offset 0x47 is beyond the end of data at 0x2"));
-}
-
-TEST(DataExtractorTest, getU24) {
-  DataExtractor DE(StringRef("ABCD"), false, 8);
-  DataExtractor::Cursor C(0);
-
-  EXPECT_EQ(0x414243u, DE.getU24(C));
-  EXPECT_EQ(0u, DE.getU24(C));
-  EXPECT_EQ(3u, C.tell());
-  EXPECT_THAT_ERROR(C.takeError(), Failed());
-}
-
-TEST(DataExtractorTest, skip) {
-  DataExtractor DE(StringRef("AB"), false, 8);
-  DataExtractor::Cursor C(0);
-
-  DE.skip(C, 4);
-  EXPECT_THAT_ERROR(C.takeError(), Failed());
-  EXPECT_EQ(0u, C.tell());
-
-  DE.skip(C, 2);
-  EXPECT_THAT_ERROR(C.takeError(), Succeeded());
-  EXPECT_EQ(2u, C.tell());
-}
-
-TEST(DataExtractorTest, eof) {
-  DataExtractor DE(StringRef("A"), false, 8);
-  DataExtractor::Cursor C(0);
-
-  EXPECT_FALSE(DE.eof(C));
-
-  EXPECT_EQ(0, DE.getU16(C));
-  EXPECT_FALSE(DE.eof(C));
-  EXPECT_THAT_ERROR(C.takeError(), Failed());
-
-  EXPECT_EQ('A', DE.getU8(C));
-  EXPECT_TRUE(DE.eof(C));
-  EXPECT_THAT_ERROR(C.takeError(), Succeeded());
-}
-
-TEST(DataExtractorTest, size) {
-  uint8_t Data[] = {'A', 'B', 'C', 'D'};
-  DataExtractor DE1(StringRef(reinterpret_cast<char *>(Data), sizeof(Data)),
-                    false, 8);
-  EXPECT_EQ(DE1.size(), sizeof(Data));
-  DataExtractor DE2(ArrayRef<uint8_t>(Data), false, 8);
-  EXPECT_EQ(DE2.size(), sizeof(Data));
-}
-
-TEST(DataExtractorTest, FixedLengthString) {
-  const char Data[] = "hello\x00\x00\x00world  \thola\x00";
-  DataExtractor DE(StringRef(Data, sizeof(Data)-1), false, 8);
-  uint64_t Offset = 0;
-  StringRef Str;
-  // Test extracting too many bytes doesn't modify Offset and returns None.
-  Str = DE.getFixedLengthString(&Offset, sizeof(Data));
-  EXPECT_TRUE(Str.empty());
-  EXPECT_EQ(Offset, 0u);
-
-  // Test extracting a fixed width C string with trailing NULL characters.
-  Str = DE.getFixedLengthString(&Offset, 8);
-  EXPECT_EQ(Offset, 8u);
-  EXPECT_EQ(Str.size(), 5u);
-  EXPECT_EQ(Str, "hello");
-  // Test extracting a fixed width C string with trailing space and tab
-  // characters.
-  Str = DE.getFixedLengthString(&Offset, 8, " \t");
-  EXPECT_EQ(Offset, 16u);
-  EXPECT_EQ(Str.size(), 5u);
-  EXPECT_EQ(Str, "world");
-  // Now extract a normal C string.
-  Str = DE.getCStrRef(&Offset);
-  EXPECT_EQ(Str.size(), 4u);
-  EXPECT_EQ(Str, "hola");
-}
-
-
-TEST(DataExtractorTest, GetBytes) {
-  // Use data with an embedded NULL character for good measure.
-  const char Data[] = "\x01\x02\x00\x04";
-  StringRef Bytes(Data, sizeof(Data)-1);
-  DataExtractor DE(Bytes, false, 8);
-  uint64_t Offset = 0;
-  StringRef Str;
-  // Test extracting too many bytes doesn't modify Offset and returns None.
-  Str = DE.getBytes(&Offset, sizeof(Data));
-  EXPECT_TRUE(Str.empty());
-  EXPECT_EQ(Offset, 0u);
-  // Test extracting 4 bytes from the stream.
-  Str = DE.getBytes(&Offset, 4);
-  EXPECT_EQ(Offset, 4u);
-  EXPECT_EQ(Str.size(), 4u);
-  EXPECT_EQ(Str, Bytes);
-
-  DataExtractor::Cursor C(0);
-  EXPECT_EQ(StringRef("\x01\x02"), DE.getBytes(C, 2));
-  EXPECT_EQ(StringRef("\x00\x04", 2), DE.getBytes(C, 2));
-  EXPECT_EQ(StringRef(), DE.getBytes(C, 2));
-  EXPECT_EQ(StringRef(), DE.getBytes(C, 2));
-  EXPECT_EQ(4u, C.tell());
-  EXPECT_THAT_ERROR(C.takeError(), Failed());
-}
-
-}
diff --git a/gnu/llvm/llvm/unittests/Support/DebugCounterTest.cpp b/gnu/llvm/llvm/unittests/Support/DebugCounterTest.cpp
deleted file mode 100644
index e7345b13cc1..00000000000
--- a/gnu/llvm/llvm/unittests/Support/DebugCounterTest.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-//===- llvm/unittest/Support/DebugCounterTest.cpp -------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/DebugCounter.h"
-#include "gtest/gtest.h"
-
-#include <string>
-using namespace llvm;
-
-#ifndef NDEBUG
-TEST(DebugCounterTest, CounterCheck) {
-  DEBUG_COUNTER(TestCounter, "test-counter", "Counter used for unit test");
-
-  EXPECT_FALSE(DebugCounter::isCounterSet(TestCounter));
-
-  auto DC = &DebugCounter::instance();
-  DC->push_back("test-counter-skip=1");
-  DC->push_back("test-counter-count=3");
-
-  EXPECT_TRUE(DebugCounter::isCounterSet(TestCounter));
-
-  EXPECT_EQ(0, DebugCounter::getCounterValue(TestCounter));
-  EXPECT_FALSE(DebugCounter::shouldExecute(TestCounter));
-
-  EXPECT_EQ(1, DebugCounter::getCounterValue(TestCounter));
-  EXPECT_TRUE(DebugCounter::shouldExecute(TestCounter));
-
-  DebugCounter::setCounterValue(TestCounter, 3);
-  EXPECT_TRUE(DebugCounter::shouldExecute(TestCounter));
-  EXPECT_FALSE(DebugCounter::shouldExecute(TestCounter));
-
-  DebugCounter::setCounterValue(TestCounter, 100);
-  EXPECT_FALSE(DebugCounter::shouldExecute(TestCounter));
-}
-#endif
diff --git a/gnu/llvm/llvm/unittests/Support/DebugTest.cpp b/gnu/llvm/llvm/unittests/Support/DebugTest.cpp
deleted file mode 100644
index e68e3764b43..00000000000
--- a/gnu/llvm/llvm/unittests/Support/DebugTest.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-//===- llvm/unittest/Support/DebugTest.cpp --------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gtest/gtest.h"
-
-#include <string>
-using namespace llvm;
-
-#ifndef NDEBUG
-TEST(DebugTest, Basic) {
-  std::string s1, s2;
-  raw_string_ostream os1(s1), os2(s2);
-  static const char *DT[] = {"A", "B"};  
-  
-  llvm::DebugFlag = true;
-  setCurrentDebugTypes(DT, 2);
-  DEBUG_WITH_TYPE("A", os1 << "A");
-  DEBUG_WITH_TYPE("B", os1 << "B");
-  EXPECT_EQ("AB", os1.str());
-
-  setCurrentDebugType("A");
-  DEBUG_WITH_TYPE("A", os2 << "A");
-  DEBUG_WITH_TYPE("B", os2 << "B");
-  EXPECT_EQ("A", os2.str());
-}
-#endif
diff --git a/gnu/llvm/llvm/unittests/Support/DynamicLibrary/CMakeLists.txt b/gnu/llvm/llvm/unittests/Support/DynamicLibrary/CMakeLists.txt
deleted file mode 100644
index 9e5d3b3dfb1..00000000000
--- a/gnu/llvm/llvm/unittests/Support/DynamicLibrary/CMakeLists.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-# Needed by LLVM's CMake checks because this file defines multiple targets.
-set(LLVM_OPTIONAL_SOURCES ExportedFuncs.cpp PipSqueak.cpp)
-
-set(LLVM_LINK_COMPONENTS Support)
-
-add_library(DynamicLibraryLib STATIC
-  ExportedFuncs.cpp
-  )
-set_target_properties(DynamicLibraryLib PROPERTIES FOLDER "Tests")
-
-# extract_symbols.py relies on all its library arguments being in the same
-# directory, so we must set the output directory in the same way as if
-# add_llvm_library was used.
-set_output_directory(DynamicLibraryLib
-  LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}
-  )
-
-add_llvm_unittest(DynamicLibraryTests
-  DynamicLibraryTest.cpp
-  )
-target_link_libraries(DynamicLibraryTests PRIVATE DynamicLibraryLib)
-export_executable_symbols(DynamicLibraryTests)
-
-function(dynlib_add_module NAME)
-  add_library(${NAME} MODULE
-    PipSqueak.cpp
-    )
-  set_target_properties(${NAME} PROPERTIES FOLDER "Tests")
-
-  set_output_directory(${NAME}
-    BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
-    LIBRARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
-    )
-
-  set_target_properties(${NAME}
-    PROPERTIES PREFIX ""
-    SUFFIX ${LLVM_PLUGIN_EXT}
-    )
-
-  add_dependencies(DynamicLibraryTests ${NAME})
-  
-  if(LLVM_INTEGRATED_CRT_ALLOC)
-    # We need to link in the Support lib for the Memory allocator override,
-    # otherwise the DynamicLibrary.Shutdown test will fail, because it would
-    # allocate memory with the CRT allocator, and release it with our custom
-    # allocator (see llvm/lib/Support/Windows/Memory.inc).
-    # /INCLUDE:malloc is there to force searching into LLVMSupport before libucrt
-    llvm_map_components_to_libnames(llvm_libs Support)
-    target_link_libraries(${NAME} ${llvm_libs} "-INCLUDE:malloc")
-  endif()
-  
-endfunction(dynlib_add_module)
-
-# Revert -Wl,-z,nodelete on this test since it relies on the file
-# being unloaded.
-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-  string(REPLACE "-Wl,-z,nodelete" "" CMAKE_MODULE_LINKER_FLAGS
-    ${CMAKE_MODULE_LINKER_FLAGS})
-endif()
-
-dynlib_add_module(PipSqueak)
-dynlib_add_module(SecondLib)
diff --git a/gnu/llvm/llvm/unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp b/gnu/llvm/llvm/unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
deleted file mode 100644
index 6c9063775a5..00000000000
--- a/gnu/llvm/llvm/unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-//===- llvm/unittest/Support/DynamicLibrary/DynamicLibraryTest.cpp --------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/DynamicLibrary.h"
-#include "llvm/Config/config.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/ManagedStatic.h"
-#include "llvm/Support/Path.h"
-#include "gtest/gtest.h"
-
-#include "PipSqueak.h"
-
-using namespace llvm;
-using namespace llvm::sys;
-
-std::string LibPath(const std::string Name = "PipSqueak") {
-  const auto &Argvs = testing::internal::GetArgvs();
-  const char *Argv0 =
-      Argvs.size() > 0 ? Argvs[0].c_str() : "DynamicLibraryTests";
-  void *Ptr = (void*)(intptr_t)TestA;
-  std::string Path = fs::getMainExecutable(Argv0, Ptr);
-  llvm::SmallString<256> Buf(path::parent_path(Path));
-  path::append(Buf, (Name + LLVM_PLUGIN_EXT).c_str());
-  return std::string(Buf.str());
-}
-
-#if defined(_WIN32) || (defined(HAVE_DLFCN_H) && defined(HAVE_DLOPEN))
-
-typedef void (*SetStrings)(std::string &GStr, std::string &LStr);
-typedef void (*TestOrder)(std::vector<std::string> &V);
-typedef const char *(*GetString)();
-
-template <class T> static T FuncPtr(void *Ptr) {
-  union {
-    T F;
-    void *P;
-  } Tmp;
-  Tmp.P = Ptr;
-  return Tmp.F;
-}
-template <class T> static void* PtrFunc(T *Func) {
-  union {
-    T *F;
-    void *P;
-  } Tmp;
-  Tmp.F = Func;
-  return Tmp.P;
-}
-
-static const char *OverloadTestA() { return "OverloadCall"; }
-
-std::string StdString(const char *Ptr) { return Ptr ? Ptr : ""; }
-
-TEST(DynamicLibrary, Overload) {
-  {
-    std::string Err;
-    llvm_shutdown_obj Shutdown;
-    DynamicLibrary DL =
-        DynamicLibrary::getPermanentLibrary(LibPath().c_str(), &Err);
-    EXPECT_TRUE(DL.isValid());
-    EXPECT_TRUE(Err.empty());
-
-    GetString GS = FuncPtr<GetString>(DL.getAddressOfSymbol("TestA"));
-    EXPECT_TRUE(GS != nullptr && GS != &TestA);
-    EXPECT_EQ(StdString(GS()), "LibCall");
-
-    GS = FuncPtr<GetString>(DynamicLibrary::SearchForAddressOfSymbol("TestA"));
-    EXPECT_TRUE(GS != nullptr && GS != &TestA);
-    EXPECT_EQ(StdString(GS()), "LibCall");
-
-    DL = DynamicLibrary::getPermanentLibrary(nullptr, &Err);
-    EXPECT_TRUE(DL.isValid());
-    EXPECT_TRUE(Err.empty());
-
-    // Test overloading local symbols does not occur by default
-    GS = FuncPtr<GetString>(DynamicLibrary::SearchForAddressOfSymbol("TestA"));
-    EXPECT_TRUE(GS != nullptr && GS == &TestA);
-    EXPECT_EQ(StdString(GS()), "ProcessCall");
-
-    GS = FuncPtr<GetString>(DL.getAddressOfSymbol("TestA"));
-    EXPECT_TRUE(GS != nullptr && GS == &TestA);
-    EXPECT_EQ(StdString(GS()), "ProcessCall");
-
-    // Test overloading by forcing library priority when searching for a symbol
-    DynamicLibrary::SearchOrder = DynamicLibrary::SO_LoadedFirst;
-    GS = FuncPtr<GetString>(DynamicLibrary::SearchForAddressOfSymbol("TestA"));
-    EXPECT_TRUE(GS != nullptr && GS != &TestA);
-    EXPECT_EQ(StdString(GS()), "LibCall");
-
-    DynamicLibrary::AddSymbol("TestA", PtrFunc(&OverloadTestA));
-    GS = FuncPtr<GetString>(DL.getAddressOfSymbol("TestA"));
-    EXPECT_TRUE(GS != nullptr && GS != &OverloadTestA);
-
-    GS = FuncPtr<GetString>(DynamicLibrary::SearchForAddressOfSymbol("TestA"));
-    EXPECT_TRUE(GS != nullptr && GS == &OverloadTestA);
-    EXPECT_EQ(StdString(GS()), "OverloadCall");
-  }
-  EXPECT_TRUE(FuncPtr<GetString>(DynamicLibrary::SearchForAddressOfSymbol(
-                  "TestA")) == nullptr);
-
-  // Check serach ordering is reset to default after call to llvm_shutdown
-  EXPECT_TRUE(DynamicLibrary::SearchOrder == DynamicLibrary::SO_Linker);
-}
-
-TEST(DynamicLibrary, Shutdown) {
-  std::string A("PipSqueak"), B, C("SecondLib");
-  std::vector<std::string> Order;
-  {
-    std::string Err;
-    llvm_shutdown_obj Shutdown;
-    DynamicLibrary DL =
-        DynamicLibrary::getPermanentLibrary(LibPath(A).c_str(), &Err);
-    EXPECT_TRUE(DL.isValid());
-    EXPECT_TRUE(Err.empty());
-
-    SetStrings SS_0 = FuncPtr<SetStrings>(
-        DynamicLibrary::SearchForAddressOfSymbol("SetStrings"));
-    EXPECT_TRUE(SS_0 != nullptr);
-
-    SS_0(A, B);
-    EXPECT_EQ(B, "Local::Local(PipSqueak)");
-
-    TestOrder TO_0 = FuncPtr<TestOrder>(
-        DynamicLibrary::SearchForAddressOfSymbol("TestOrder"));
-    EXPECT_TRUE(TO_0 != nullptr);
-    
-    DynamicLibrary DL2 =
-        DynamicLibrary::getPermanentLibrary(LibPath(C).c_str(), &Err);
-    EXPECT_TRUE(DL2.isValid());
-    EXPECT_TRUE(Err.empty());
-
-    // Should find latest version of symbols in SecondLib
-    SetStrings SS_1 = FuncPtr<SetStrings>(
-        DynamicLibrary::SearchForAddressOfSymbol("SetStrings"));
-    EXPECT_TRUE(SS_1 != nullptr);
-    EXPECT_TRUE(SS_0 != SS_1);
-
-    TestOrder TO_1 = FuncPtr<TestOrder>(
-        DynamicLibrary::SearchForAddressOfSymbol("TestOrder"));
-    EXPECT_TRUE(TO_1 != nullptr);
-    EXPECT_TRUE(TO_0 != TO_1);
-
-    B.clear();
-    SS_1(C, B);
-    EXPECT_EQ(B, "Local::Local(SecondLib)");
-
-    TO_0(Order);
-    TO_1(Order);
-  }
-  EXPECT_EQ(A, "Global::~Global");
-  EXPECT_EQ(B, "Local::~Local");
-  EXPECT_TRUE(FuncPtr<SetStrings>(DynamicLibrary::SearchForAddressOfSymbol(
-                  "SetStrings")) == nullptr);
-
-  // Test unload/destruction ordering
-  EXPECT_EQ(Order.size(), 2UL);
-  EXPECT_EQ(Order.front(), "SecondLib");
-  EXPECT_EQ(Order.back(), "PipSqueak");
-}
-
-#else
-
-TEST(DynamicLibrary, Unsupported) {
-  std::string Err;
-  DynamicLibrary DL =
-      DynamicLibrary::getPermanentLibrary(LibPath().c_str(), &Err);
-  EXPECT_FALSE(DL.isValid());
-  EXPECT_EQ(Err, "dlopen() not supported on this platform");
-}
-
-#endif
diff --git a/gnu/llvm/llvm/unittests/Support/DynamicLibrary/ExportedFuncs.cpp b/gnu/llvm/llvm/unittests/Support/DynamicLibrary/ExportedFuncs.cpp
deleted file mode 100644
index e1c6596261f..00000000000
--- a/gnu/llvm/llvm/unittests/Support/DynamicLibrary/ExportedFuncs.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-//===- llvm/unittest/Support/DynamicLibrary/ExportedFuncs.cpp -------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "PipSqueak.h"
-
-#ifndef PIPSQUEAK_TESTA_RETURN
-#define PIPSQUEAK_TESTA_RETURN "ProcessCall"
-#endif
-
-extern "C" PIPSQUEAK_EXPORT const char *TestA() { return PIPSQUEAK_TESTA_RETURN; }
diff --git a/gnu/llvm/llvm/unittests/Support/DynamicLibrary/PipSqueak.cpp b/gnu/llvm/llvm/unittests/Support/DynamicLibrary/PipSqueak.cpp
deleted file mode 100644
index 8ff2c30f492..00000000000
--- a/gnu/llvm/llvm/unittests/Support/DynamicLibrary/PipSqueak.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-//===- llvm/unittest/Support/DynamicLibrary/PipSqueak.cpp -----------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "PipSqueak.h"
-
-struct Global {
-  std::string *Str;
-  std::vector<std::string> *Vec;
-  Global() : Str(nullptr), Vec(nullptr) {}
-  ~Global() {
-    if (Str) {
-      if (Vec)
-        Vec->push_back(*Str);
-      *Str = "Global::~Global";
-    }
-  }
-};
-
-static Global Glb;
-
-struct Local {
-  std::string &Str;
-  Local(std::string &S) : Str(S) {
-    Str = "Local::Local";
-    if (Glb.Str && !Glb.Str->empty())
-      Str += std::string("(") + *Glb.Str + std::string(")");
-  }
-  ~Local() { Str = "Local::~Local"; }
-};
-
-
-extern "C" PIPSQUEAK_EXPORT void SetStrings(std::string &GStr,
-                                            std::string &LStr) {
-  Glb.Str = &GStr;
-  static Local Lcl(LStr);
-}
-
-extern "C" PIPSQUEAK_EXPORT void TestOrder(std::vector<std::string> &V) {
-  Glb.Vec = &V;
-}
-
-#define PIPSQUEAK_TESTA_RETURN "LibCall"
-#include "ExportedFuncs.cpp"
diff --git a/gnu/llvm/llvm/unittests/Support/DynamicLibrary/PipSqueak.h b/gnu/llvm/llvm/unittests/Support/DynamicLibrary/PipSqueak.h
deleted file mode 100644
index a32c06cdf5f..00000000000
--- a/gnu/llvm/llvm/unittests/Support/DynamicLibrary/PipSqueak.h
+++ /dev/null
@@ -1,33 +0,0 @@
-//===- llvm/unittest/Support/DynamicLibrary/PipSqueak.h -------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_PIPSQUEAK_H
-#define LLVM_PIPSQUEAK_H
-
-#if defined(_WIN32) && !defined(__GNUC__)
-// Disable warnings from inclusion of xlocale & exception
-#pragma warning(push)
-#pragma warning(disable: 4530)
-#pragma warning(disable: 4577)
-#include <string>
-#include <vector>
-#pragma warning(pop)
-#else
-#include <string>
-#include <vector>
-#endif
-
-#ifdef _WIN32
-#define PIPSQUEAK_EXPORT __declspec(dllexport)
-#else
-#define PIPSQUEAK_EXPORT
-#endif
-
-extern "C" PIPSQUEAK_EXPORT const char *TestA();
-
-#endif
diff --git a/gnu/llvm/llvm/unittests/Support/ELFAttributeParserTest.cpp b/gnu/llvm/llvm/unittests/Support/ELFAttributeParserTest.cpp
deleted file mode 100644
index 5eaed39a710..00000000000
--- a/gnu/llvm/llvm/unittests/Support/ELFAttributeParserTest.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-//===----- unittests/ELFAttributeParserTest.cpp ---------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/ELFAttributeParser.h"
-#include "llvm/Support/ELFAttributes.h"
-#include "gtest/gtest.h"
-#include <string>
-
-using namespace llvm;
-
-static const TagNameMap emptyTagNameMap;
-
-// This class is used to test the common part of the ELF attribute section.
-class AttributeHeaderParser : public ELFAttributeParser {
-  Error handler(uint64_t tag, bool &handled) override {
-    // Treat all attributes as handled.
-    handled = true;
-    return Error::success();
-  }
-
-public:
-  AttributeHeaderParser(ScopedPrinter *printer)
-      : ELFAttributeParser(printer, emptyTagNameMap, "test") {}
-  AttributeHeaderParser() : ELFAttributeParser(emptyTagNameMap, "test") {}
-};
-
-static void testParseError(ArrayRef<uint8_t> bytes, const char *msg) {
-  AttributeHeaderParser parser;
-  Error e = parser.parse(bytes, support::little);
-  EXPECT_STREQ(toString(std::move(e)).c_str(), msg);
-}
-
-TEST(AttributeHeaderParser, UnrecognizedFormatVersion) {
-  static const uint8_t bytes[] = {1};
-  testParseError(bytes, "unrecognized format-version: 0x1");
-}
-
-TEST(AttributeHeaderParser, InvalidSectionLength) {
-  static const uint8_t bytes[] = {'A', 3, 0, 0, 0};
-  testParseError(bytes, "invalid section length 3 at offset 0x1");
-}
-
-TEST(AttributeHeaderParser, UnrecognizedVendorName) {
-  static const uint8_t bytes[] = {'A', 7, 0, 0, 0, 'x', 'y', 0};
-  testParseError(bytes, "unrecognized vendor-name: xy");
-}
-
-TEST(AttributeHeaderParser, UnrecognizedTag) {
-  static const uint8_t bytes[] = {'A', 14, 0, 0, 0, 't', 'e', 's',
-                                  't', 0,  4, 5, 0, 0,   0};
-  testParseError(bytes, "unrecognized tag 0x4 at offset 0xa");
-}
-
-TEST(AttributeHeaderParser, InvalidAttributeSize) {
-  static const uint8_t bytes[] = {'A', 14, 0, 0, 0, 't', 'e', 's',
-                                  't', 0,  1, 4, 0, 0,   0};
-  testParseError(bytes, "invalid attribute size 4 at offset 0xa");
-}
diff --git a/gnu/llvm/llvm/unittests/Support/EndianStreamTest.cpp b/gnu/llvm/llvm/unittests/Support/EndianStreamTest.cpp
deleted file mode 100644
index 1e800ff5570..00000000000
--- a/gnu/llvm/llvm/unittests/Support/EndianStreamTest.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-//===- unittests/Support/EndianStreamTest.cpp - EndianStream.h tests ------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/EndianStream.h"
-#include "llvm/ADT/SmallString.h"
-#include "llvm/Support/DataTypes.h"
-#include "gtest/gtest.h"
-using namespace llvm;
-using namespace support;
-
-namespace {
-
-TEST(EndianStream, WriteInt32LE) {
-  SmallString<16> data;
-
-  {
-    raw_svector_ostream OS(data);
-    endian::Writer LE(OS, little);
-    LE.write(static_cast<int32_t>(-1362446643));
-  }
-
-  EXPECT_EQ(static_cast<uint8_t>(data[0]), 0xCD);
-  EXPECT_EQ(static_cast<uint8_t>(data[1]), 0xB6);
-  EXPECT_EQ(static_cast<uint8_t>(data[2]), 0xCA);
-  EXPECT_EQ(static_cast<uint8_t>(data[3]), 0xAE);
-}
-
-TEST(EndianStream, WriteInt32BE) {
-  SmallVector<char, 16> data;
-
-  {
-    raw_svector_ostream OS(data);
-    endian::Writer BE(OS, big);
-    BE.write(static_cast<int32_t>(-1362446643));
-  }
-
-  EXPECT_EQ(static_cast<uint8_t>(data[0]), 0xAE);
-  EXPECT_EQ(static_cast<uint8_t>(data[1]), 0xCA);
-  EXPECT_EQ(static_cast<uint8_t>(data[2]), 0xB6);
-  EXPECT_EQ(static_cast<uint8_t>(data[3]), 0xCD);
-}
-
-
-TEST(EndianStream, WriteFloatLE) {
-  SmallString<16> data;
-
-  {
-    raw_svector_ostream OS(data);
-    endian::Writer LE(OS, little);
-    LE.write(12345.0f);
-  }
-
-  EXPECT_EQ(static_cast<uint8_t>(data[0]), 0x00);
-  EXPECT_EQ(static_cast<uint8_t>(data[1]), 0xE4);
-  EXPECT_EQ(static_cast<uint8_t>(data[2]), 0x40);
-  EXPECT_EQ(static_cast<uint8_t>(data[3]), 0x46);
-}
-
-TEST(EndianStream, WriteFloatBE) {
-  SmallVector<char, 16> data;
-
-  {
-    raw_svector_ostream OS(data);
-    endian::Writer BE(OS, big);
-    BE.write(12345.0f);
-  }
-
-  EXPECT_EQ(static_cast<uint8_t>(data[0]), 0x46);
-  EXPECT_EQ(static_cast<uint8_t>(data[1]), 0x40);
-  EXPECT_EQ(static_cast<uint8_t>(data[2]), 0xE4);
-  EXPECT_EQ(static_cast<uint8_t>(data[3]), 0x00);
-}
-
-TEST(EndianStream, WriteInt64LE) {
-  SmallString<16> data;
-
-  {
-    raw_svector_ostream OS(data);
-    endian::Writer LE(OS, little);
-    LE.write(static_cast<int64_t>(-136244664332342323));
-  }
-
-  EXPECT_EQ(static_cast<uint8_t>(data[0]), 0xCD);
-  EXPECT_EQ(static_cast<uint8_t>(data[1]), 0xAB);
-  EXPECT_EQ(static_cast<uint8_t>(data[2]), 0xED);
-  EXPECT_EQ(static_cast<uint8_t>(data[3]), 0x1B);
-  EXPECT_EQ(static_cast<uint8_t>(data[4]), 0x33);
-  EXPECT_EQ(static_cast<uint8_t>(data[5]), 0xF6);
-  EXPECT_EQ(static_cast<uint8_t>(data[6]), 0x1B);
-  EXPECT_EQ(static_cast<uint8_t>(data[7]), 0xFE);
-}
-
-TEST(EndianStream, WriteInt64BE) {
-  SmallVector<char, 16> data;
-
-  {
-    raw_svector_ostream OS(data);
-    endian::Writer BE(OS, big);
-    BE.write(static_cast<int64_t>(-136244664332342323));
-  }
-
-  EXPECT_EQ(static_cast<uint8_t>(data[0]), 0xFE);
-  EXPECT_EQ(static_cast<uint8_t>(data[1]), 0x1B);
-  EXPECT_EQ(static_cast<uint8_t>(data[2]), 0xF6);
-  EXPECT_EQ(static_cast<uint8_t>(data[3]), 0x33);
-  EXPECT_EQ(static_cast<uint8_t>(data[4]), 0x1B);
-  EXPECT_EQ(static_cast<uint8_t>(data[5]), 0xED);
-  EXPECT_EQ(static_cast<uint8_t>(data[6]), 0xAB);
-  EXPECT_EQ(static_cast<uint8_t>(data[7]), 0xCD);
-}
-
-TEST(EndianStream, WriteDoubleLE) {
-  SmallString<16> data;
-
-  {
-    raw_svector_ostream OS(data);
-    endian::Writer LE(OS, little);
-    LE.write(-2349214918.58107);
-  }
-
-  EXPECT_EQ(static_cast<uint8_t>(data[0]), 0x20);
-  EXPECT_EQ(static_cast<uint8_t>(data[1]), 0x98);
-  EXPECT_EQ(static_cast<uint8_t>(data[2]), 0xD2);
-  EXPECT_EQ(static_cast<uint8_t>(data[3]), 0x98);
-  EXPECT_EQ(static_cast<uint8_t>(data[4]), 0xC5);
-  EXPECT_EQ(static_cast<uint8_t>(data[5]), 0x80);
-  EXPECT_EQ(static_cast<uint8_t>(data[6]), 0xE1);
-  EXPECT_EQ(static_cast<uint8_t>(data[7]), 0xC1);
-}
-
-TEST(EndianStream, WriteDoubleBE) {
-  SmallVector<char, 16> data;
-
-  {
-    raw_svector_ostream OS(data);
-    endian::Writer BE(OS, big);
-    BE.write(-2349214918.58107);
-  }
-
-  EXPECT_EQ(static_cast<uint8_t>(data[0]), 0xC1);
-  EXPECT_EQ(static_cast<uint8_t>(data[1]), 0xE1);
-  EXPECT_EQ(static_cast<uint8_t>(data[2]), 0x80);
-  EXPECT_EQ(static_cast<uint8_t>(data[3]), 0xC5);
-  EXPECT_EQ(static_cast<uint8_t>(data[4]), 0x98);
-  EXPECT_EQ(static_cast<uint8_t>(data[5]), 0xD2);
-  EXPECT_EQ(static_cast<uint8_t>(data[6]), 0x98);
-  EXPECT_EQ(static_cast<uint8_t>(data[7]), 0x20);
-}
-
-TEST(EndianStream, WriteArrayLE) {
-  SmallString<16> Data;
-
-  {
-    raw_svector_ostream OS(Data);
-    endian::Writer LE(OS, little);
-    LE.write<uint16_t>({0x1234, 0x5678});
-  }
-
-  EXPECT_EQ(static_cast<uint8_t>(Data[0]), 0x34);
-  EXPECT_EQ(static_cast<uint8_t>(Data[1]), 0x12);
-  EXPECT_EQ(static_cast<uint8_t>(Data[2]), 0x78);
-  EXPECT_EQ(static_cast<uint8_t>(Data[3]), 0x56);
-}
-
-TEST(EndianStream, WriteVectorLE) {
-  SmallString<16> Data;
-
-  {
-    raw_svector_ostream OS(Data);
-    endian::Writer LE(OS, little);
-    std::vector<uint16_t> Vec{0x1234, 0x5678};
-    LE.write<uint16_t>(Vec);
-  }
-
-  EXPECT_EQ(static_cast<uint8_t>(Data[0]), 0x34);
-  EXPECT_EQ(static_cast<uint8_t>(Data[1]), 0x12);
-  EXPECT_EQ(static_cast<uint8_t>(Data[2]), 0x78);
-  EXPECT_EQ(static_cast<uint8_t>(Data[3]), 0x56);
-}
-
-TEST(EndianStream, WriteFloatArrayLE) {
-  SmallString<16> Data;
-
-  {
-    raw_svector_ostream OS(Data);
-    endian::Writer LE(OS, little);
-    LE.write<float>({12345.0f, 12346.0f});
-  }
-
-  EXPECT_EQ(static_cast<uint8_t>(Data[0]), 0x00);
-  EXPECT_EQ(static_cast<uint8_t>(Data[1]), 0xE4);
-  EXPECT_EQ(static_cast<uint8_t>(Data[2]), 0x40);
-  EXPECT_EQ(static_cast<uint8_t>(Data[3]), 0x46);
-
-  EXPECT_EQ(static_cast<uint8_t>(Data[4]), 0x00);
-  EXPECT_EQ(static_cast<uint8_t>(Data[5]), 0xE8);
-  EXPECT_EQ(static_cast<uint8_t>(Data[6]), 0x40);
-  EXPECT_EQ(static_cast<uint8_t>(Data[7]), 0x46);
-}
-
-
-} // end anon namespace
diff --git a/gnu/llvm/llvm/unittests/Support/EndianTest.cpp b/gnu/llvm/llvm/unittests/Support/EndianTest.cpp
deleted file mode 100644
index b5e4a9c8d14..00000000000
--- a/gnu/llvm/llvm/unittests/Support/EndianTest.cpp
+++ /dev/null
@@ -1,212 +0,0 @@
-//===- unittests/Support/EndianTest.cpp - Endian.h tests ------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/Endian.h"
-#include "llvm/Support/DataTypes.h"
-#include "gtest/gtest.h"
-#include <cstdlib>
-#include <ctime>
-using namespace llvm;
-using namespace support;
-
-#undef max
-
-namespace {
-
-TEST(Endian, Read) {
-  // These are 5 bytes so we can be sure at least one of the reads is unaligned.
-  unsigned char bigval[] = {0x00, 0x01, 0x02, 0x03, 0x04};
-  unsigned char littleval[] = {0x00, 0x04, 0x03, 0x02, 0x01};
-  int32_t BigAsHost = 0x00010203;
-  EXPECT_EQ(BigAsHost, (endian::read<int32_t, big, unaligned>(bigval)));
-  int32_t LittleAsHost = 0x02030400;
-  EXPECT_EQ(LittleAsHost,(endian::read<int32_t, little, unaligned>(littleval)));
-
-  EXPECT_EQ((endian::read<int32_t, big, unaligned>(bigval + 1)),
-            (endian::read<int32_t, little, unaligned>(littleval + 1)));
-}
-
-TEST(Endian, ReadBitAligned) {
-  // Simple test to make sure we properly pull out the 0x0 word.
-  unsigned char littleval[] = {0x3f, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xff, 0xff};
-  unsigned char bigval[] = {0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xc0};
-  EXPECT_EQ(
-      (endian::readAtBitAlignment<int, little, unaligned>(&littleval[0], 6)),
-      0x0);
-  EXPECT_EQ((endian::readAtBitAlignment<int, big, unaligned>(&bigval[0], 6)),
-            0x0);
-  // Test to make sure that signed right shift of 0xf0000000 is masked
-  // properly.
-  unsigned char littleval2[] = {0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00};
-  unsigned char bigval2[] = {0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-  EXPECT_EQ(
-      (endian::readAtBitAlignment<int, little, unaligned>(&littleval2[0], 4)),
-      0x0f000000);
-  EXPECT_EQ((endian::readAtBitAlignment<int, big, unaligned>(&bigval2[0], 4)),
-            0x0f000000);
-  // Test to make sure left shift of start bit doesn't overflow.
-  EXPECT_EQ(
-      (endian::readAtBitAlignment<int, little, unaligned>(&littleval2[0], 1)),
-      0x78000000);
-  EXPECT_EQ((endian::readAtBitAlignment<int, big, unaligned>(&bigval2[0], 1)),
-            0x78000000);
-  // Test to make sure 64-bit int doesn't overflow.
-  unsigned char littleval3[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0,
-                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-  unsigned char bigval3[] = {0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-  EXPECT_EQ((endian::readAtBitAlignment<int64_t, little, unaligned>(
-                &littleval3[0], 4)),
-            0x0f00000000000000);
-  EXPECT_EQ(
-      (endian::readAtBitAlignment<int64_t, big, unaligned>(&bigval3[0], 4)),
-      0x0f00000000000000);
-}
-
-TEST(Endian, WriteBitAligned) {
-  // This test ensures that signed right shift of 0xffffaa is masked
-  // properly.
-  unsigned char bigval[8] = {0x00};
-  endian::writeAtBitAlignment<int32_t, big, unaligned>(bigval, (int)0xffffaaaa,
-                                                       4);
-  EXPECT_EQ(bigval[0], 0xff);
-  EXPECT_EQ(bigval[1], 0xfa);
-  EXPECT_EQ(bigval[2], 0xaa);
-  EXPECT_EQ(bigval[3], 0xa0);
-  EXPECT_EQ(bigval[4], 0x00);
-  EXPECT_EQ(bigval[5], 0x00);
-  EXPECT_EQ(bigval[6], 0x00);
-  EXPECT_EQ(bigval[7], 0x0f);
-
-  unsigned char littleval[8] = {0x00};
-  endian::writeAtBitAlignment<int32_t, little, unaligned>(littleval,
-                                                          (int)0xffffaaaa, 4);
-  EXPECT_EQ(littleval[0], 0xa0);
-  EXPECT_EQ(littleval[1], 0xaa);
-  EXPECT_EQ(littleval[2], 0xfa);
-  EXPECT_EQ(littleval[3], 0xff);
-  EXPECT_EQ(littleval[4], 0x0f);
-  EXPECT_EQ(littleval[5], 0x00);
-  EXPECT_EQ(littleval[6], 0x00);
-  EXPECT_EQ(littleval[7], 0x00);
-
-  // This test makes sure 1<<31 doesn't overflow.
-  // Test to make sure left shift of start bit doesn't overflow.
-  unsigned char bigval2[8] = {0x00};
-  endian::writeAtBitAlignment<int32_t, big, unaligned>(bigval2, (int)0xffffffff,
-                                                       1);
-  EXPECT_EQ(bigval2[0], 0xff);
-  EXPECT_EQ(bigval2[1], 0xff);
-  EXPECT_EQ(bigval2[2], 0xff);
-  EXPECT_EQ(bigval2[3], 0xfe);
-  EXPECT_EQ(bigval2[4], 0x00);
-  EXPECT_EQ(bigval2[5], 0x00);
-  EXPECT_EQ(bigval2[6], 0x00);
-  EXPECT_EQ(bigval2[7], 0x01);
-
-  unsigned char littleval2[8] = {0x00};
-  endian::writeAtBitAlignment<int32_t, little, unaligned>(littleval2,
-                                                          (int)0xffffffff, 1);
-  EXPECT_EQ(littleval2[0], 0xfe);
-  EXPECT_EQ(littleval2[1], 0xff);
-  EXPECT_EQ(littleval2[2], 0xff);
-  EXPECT_EQ(littleval2[3], 0xff);
-  EXPECT_EQ(littleval2[4], 0x01);
-  EXPECT_EQ(littleval2[5], 0x00);
-  EXPECT_EQ(littleval2[6], 0x00);
-  EXPECT_EQ(littleval2[7], 0x00);
-
-  // Test to make sure 64-bit int doesn't overflow.
-  unsigned char bigval64[16] = {0x00};
-  endian::writeAtBitAlignment<int64_t, big, unaligned>(
-      bigval64, (int64_t)0xffffffffffffffff, 1);
-  EXPECT_EQ(bigval64[0], 0xff);
-  EXPECT_EQ(bigval64[1], 0xff);
-  EXPECT_EQ(bigval64[2], 0xff);
-  EXPECT_EQ(bigval64[3], 0xff);
-  EXPECT_EQ(bigval64[4], 0xff);
-  EXPECT_EQ(bigval64[5], 0xff);
-  EXPECT_EQ(bigval64[6], 0xff);
-  EXPECT_EQ(bigval64[7], 0xfe);
-  EXPECT_EQ(bigval64[8], 0x00);
-  EXPECT_EQ(bigval64[9], 0x00);
-  EXPECT_EQ(bigval64[10], 0x00);
-  EXPECT_EQ(bigval64[11], 0x00);
-  EXPECT_EQ(bigval64[12], 0x00);
-  EXPECT_EQ(bigval64[13], 0x00);
-  EXPECT_EQ(bigval64[14], 0x00);
-  EXPECT_EQ(bigval64[15], 0x01);
-
-  unsigned char littleval64[16] = {0x00};
-  endian::writeAtBitAlignment<int64_t, little, unaligned>(
-      littleval64, (int64_t)0xffffffffffffffff, 1);
-  EXPECT_EQ(littleval64[0], 0xfe);
-  EXPECT_EQ(littleval64[1], 0xff);
-  EXPECT_EQ(littleval64[2], 0xff);
-  EXPECT_EQ(littleval64[3], 0xff);
-  EXPECT_EQ(littleval64[4], 0xff);
-  EXPECT_EQ(littleval64[5], 0xff);
-  EXPECT_EQ(littleval64[6], 0xff);
-  EXPECT_EQ(littleval64[7], 0xff);
-  EXPECT_EQ(littleval64[8], 0x01);
-  EXPECT_EQ(littleval64[9], 0x00);
-  EXPECT_EQ(littleval64[10], 0x00);
-  EXPECT_EQ(littleval64[11], 0x00);
-  EXPECT_EQ(littleval64[12], 0x00);
-  EXPECT_EQ(littleval64[13], 0x00);
-  EXPECT_EQ(littleval64[14], 0x00);
-  EXPECT_EQ(littleval64[15], 0x00);
-}
-
-TEST(Endian, Write) {
-  unsigned char data[5];
-  endian::write<int32_t, big, unaligned>(data, -1362446643);
-  EXPECT_EQ(data[0], 0xAE);
-  EXPECT_EQ(data[1], 0xCA);
-  EXPECT_EQ(data[2], 0xB6);
-  EXPECT_EQ(data[3], 0xCD);
-  endian::write<int32_t, big, unaligned>(data + 1, -1362446643);
-  EXPECT_EQ(data[1], 0xAE);
-  EXPECT_EQ(data[2], 0xCA);
-  EXPECT_EQ(data[3], 0xB6);
-  EXPECT_EQ(data[4], 0xCD);
-
-  endian::write<int32_t, little, unaligned>(data, -1362446643);
-  EXPECT_EQ(data[0], 0xCD);
-  EXPECT_EQ(data[1], 0xB6);
-  EXPECT_EQ(data[2], 0xCA);
-  EXPECT_EQ(data[3], 0xAE);
-  endian::write<int32_t, little, unaligned>(data + 1, -1362446643);
-  EXPECT_EQ(data[1], 0xCD);
-  EXPECT_EQ(data[2], 0xB6);
-  EXPECT_EQ(data[3], 0xCA);
-  EXPECT_EQ(data[4], 0xAE);
-}
-
-TEST(Endian, PackedEndianSpecificIntegral) {
-  // These are 5 bytes so we can be sure at least one of the reads is unaligned.
-  unsigned char big[] = {0x00, 0x01, 0x02, 0x03, 0x04};
-  unsigned char little[] = {0x00, 0x04, 0x03, 0x02, 0x01};
-  big32_t    *big_val    =
-    reinterpret_cast<big32_t *>(big + 1);
-  little32_t *little_val =
-    reinterpret_cast<little32_t *>(little + 1);
-
-  EXPECT_EQ(*big_val, *little_val);
-}
-
-TEST(Endian, PacketEndianSpecificIntegralAsEnum) {
-  enum class Test : uint16_t { ONETWO = 0x0102, TWOONE = 0x0201 };
-  unsigned char bytes[] = {0x01, 0x02};
-  using LittleTest = little_t<Test>;
-  using BigTest = big_t<Test>;
-  EXPECT_EQ(Test::TWOONE, *reinterpret_cast<LittleTest *>(bytes));
-  EXPECT_EQ(Test::ONETWO, *reinterpret_cast<BigTest *>(bytes));
-}
-
-} // end anon namespace
diff --git a/gnu/llvm/llvm/unittests/Support/ErrnoTest.cpp b/gnu/llvm/llvm/unittests/Support/ErrnoTest.cpp
deleted file mode 100644
index 747d9dde0b7..00000000000
--- a/gnu/llvm/llvm/unittests/Support/ErrnoTest.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-//===- ErrnoTest.cpp - Error handling unit tests --------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/Errno.h"
-#include "gtest/gtest.h"
-
-using namespace llvm::sys;
-
-TEST(ErrnoTest, RetryAfterSignal) {
-  EXPECT_EQ(1, RetryAfterSignal(-1, [] { return 1; }));
-
-  EXPECT_EQ(-1, RetryAfterSignal(-1, [] {
-    errno = EAGAIN;
-    return -1;
-  }));
-  EXPECT_EQ(EAGAIN, errno);
-
-  unsigned calls = 0;
-  EXPECT_EQ(1, RetryAfterSignal(-1, [&calls] {
-              errno = EINTR;
-              ++calls;
-              return calls == 1 ? -1 : 1;
-            }));
-  EXPECT_EQ(2u, calls);
-
-  EXPECT_EQ(1, RetryAfterSignal(-1, [](int x) { return x; }, 1));
-
-  std::unique_ptr<int> P(RetryAfterSignal(nullptr, [] { return new int(47); }));
-  EXPECT_EQ(47, *P);
-
-  errno = EINTR;
-  EXPECT_EQ(-1, RetryAfterSignal(-1, [] { return -1; }));
-}
diff --git a/gnu/llvm/llvm/unittests/Support/ErrorOrTest.cpp b/gnu/llvm/llvm/unittests/Support/ErrorOrTest.cpp
deleted file mode 100644
index 6e5bd2edd31..00000000000
--- a/gnu/llvm/llvm/unittests/Support/ErrorOrTest.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-//===- unittests/ErrorOrTest.cpp - ErrorOr.h tests ------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/ErrorOr.h"
-#include "llvm/Support/Errc.h"
-#include "gtest/gtest.h"
-#include <memory>
-
-using namespace llvm;
-
-namespace {
-
-ErrorOr<int> t1() { return 1; }
-ErrorOr<int> t2() { return errc::invalid_argument; }
-
-TEST(ErrorOr, SimpleValue) {
-  ErrorOr<int> a = t1();
-  // FIXME: This is probably a bug in gtest. EXPECT_TRUE should expand to
-  // include the !! to make it friendly to explicit bool operators.
-  EXPECT_TRUE(!!a);
-  EXPECT_EQ(1, *a);
-
-  ErrorOr<int> b = a;
-  EXPECT_EQ(1, *b);
-
-  a = t2();
-  EXPECT_FALSE(a);
-  EXPECT_EQ(a.getError(), errc::invalid_argument);
-#ifdef EXPECT_DEBUG_DEATH
-  EXPECT_DEBUG_DEATH(*a, "Cannot get value when an error exists");
-#endif
-}
-
-ErrorOr<std::unique_ptr<int> > t3() {
-  return std::unique_ptr<int>(new int(3));
-}
-
-TEST(ErrorOr, Types) {
-  int x;
-  ErrorOr<int&> a(x);
-  *a = 42;
-  EXPECT_EQ(42, x);
-
-  // Move only types.
-  EXPECT_EQ(3, **t3());
-}
-
-struct B {};
-struct D : B {};
-
-TEST(ErrorOr, Covariant) {
-  ErrorOr<B*> b(ErrorOr<D*>(nullptr));
-  b = ErrorOr<D*>(nullptr);
-
-  ErrorOr<std::unique_ptr<B> > b1(ErrorOr<std::unique_ptr<D> >(nullptr));
-  b1 = ErrorOr<std::unique_ptr<D> >(nullptr);
-
-  ErrorOr<std::unique_ptr<int>> b2(ErrorOr<int *>(nullptr));
-  ErrorOr<int *> b3(nullptr);
-  ErrorOr<std::unique_ptr<int>> b4(b3);
-}
-
-TEST(ErrorOr, Comparison) {
-  ErrorOr<int> x(errc::no_such_file_or_directory);
-  EXPECT_EQ(x, errc::no_such_file_or_directory);
-}
-
-TEST(ErrorOr, ImplicitConversion) {
-  ErrorOr<std::string> x("string literal");
-  EXPECT_TRUE(!!x);
-}
-
-TEST(ErrorOr, ImplicitConversionCausesMove) {
-  struct Source {};
-  struct Destination {
-    Destination(const Source&) {}
-    Destination(Source&&) = delete;
-  };
-  Source s;
-  ErrorOr<Destination> x = s;
-  EXPECT_TRUE(!!x);
-}
-
-TEST(ErrorOr, ImplicitConversionNoAmbiguity) {
-  struct CastsToErrorCode {
-    CastsToErrorCode() = default;
-    CastsToErrorCode(std::error_code) {}
-    operator std::error_code() { return errc::invalid_argument; }
-  } casts_to_error_code;
-  ErrorOr<CastsToErrorCode> x1(casts_to_error_code);
-  ErrorOr<CastsToErrorCode> x2 = casts_to_error_code;
-  ErrorOr<CastsToErrorCode> x3 = {casts_to_error_code};
-  ErrorOr<CastsToErrorCode> x4{casts_to_error_code};
-  ErrorOr<CastsToErrorCode> x5(errc::no_such_file_or_directory);
-  ErrorOr<CastsToErrorCode> x6 = errc::no_such_file_or_directory;
-  ErrorOr<CastsToErrorCode> x7 = {errc::no_such_file_or_directory};
-  ErrorOr<CastsToErrorCode> x8{errc::no_such_file_or_directory};
-  EXPECT_TRUE(!!x1);
-  EXPECT_TRUE(!!x2);
-  EXPECT_TRUE(!!x3);
-  EXPECT_TRUE(!!x4);
-  EXPECT_FALSE(x5);
-  EXPECT_FALSE(x6);
-  EXPECT_FALSE(x7);
-  EXPECT_FALSE(x8);
-}
-
-// ErrorOr<int*> x(nullptr);
-// ErrorOr<std::unique_ptr<int>> y = x; // invalid conversion
-static_assert(
-    !std::is_convertible<const ErrorOr<int *> &,
-                         ErrorOr<std::unique_ptr<int>>>::value,
-    "do not invoke explicit ctors in implicit conversion from lvalue");
-
-// ErrorOr<std::unique_ptr<int>> y = ErrorOr<int*>(nullptr); // invalid
-//                                                           // conversion
-static_assert(
-    !std::is_convertible<ErrorOr<int *> &&,
-                         ErrorOr<std::unique_ptr<int>>>::value,
-    "do not invoke explicit ctors in implicit conversion from rvalue");
-
-// ErrorOr<int*> x(nullptr);
-// ErrorOr<std::unique_ptr<int>> y;
-// y = x; // invalid conversion
-static_assert(!std::is_assignable<ErrorOr<std::unique_ptr<int>>&,
-                                  const ErrorOr<int *> &>::value,
-              "do not invoke explicit ctors in assignment");
-
-// ErrorOr<std::unique_ptr<int>> x;
-// x = ErrorOr<int*>(nullptr); // invalid conversion
-static_assert(!std::is_assignable<ErrorOr<std::unique_ptr<int>>&,
-                                  ErrorOr<int *> &&>::value,
-              "do not invoke explicit ctors in assignment");
-} // end anon namespace
diff --git a/gnu/llvm/llvm/unittests/Support/ErrorTest.cpp b/gnu/llvm/llvm/unittests/Support/ErrorTest.cpp
deleted file mode 100644
index d9e86fdd617..00000000000
--- a/gnu/llvm/llvm/unittests/Support/ErrorTest.cpp
+++ /dev/null
@@ -1,1034 +0,0 @@
-//===----- unittests/ErrorTest.cpp - Error.h tests ------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/Error.h"
-#include "llvm-c/Error.h"
-
-#include "llvm/ADT/Twine.h"
-#include "llvm/Support/Errc.h"
-#include "llvm/Support/ErrorHandling.h"
-#include "llvm/Support/ManagedStatic.h"
-#include "llvm/Testing/Support/Error.h"
-#include "gtest/gtest-spi.h"
-#include "gtest/gtest.h"
-#include <memory>
-
-using namespace llvm;
-
-namespace {
-
-// Custom error class with a default base class and some random 'info' attached.
-class CustomError : public ErrorInfo<CustomError> {
-public:
-  // Create an error with some info attached.
-  CustomError(int Info) : Info(Info) {}
-
-  // Get the info attached to this error.
-  int getInfo() const { return Info; }
-
-  // Log this error to a stream.
-  void log(raw_ostream &OS) const override {
-    OS << "CustomError {" << getInfo() << "}";
-  }
-
-  std::error_code convertToErrorCode() const override {
-    llvm_unreachable("CustomError doesn't support ECError conversion");
-  }
-
-  // Used by ErrorInfo::classID.
-  static char ID;
-
-protected:
-  // This error is subclassed below, but we can't use inheriting constructors
-  // yet, so we can't propagate the constructors through ErrorInfo. Instead
-  // we have to have a default constructor and have the subclass initialize all
-  // fields.
-  CustomError() : Info(0) {}
-
-  int Info;
-};
-
-char CustomError::ID = 0;
-
-// Custom error class with a custom base class and some additional random
-// 'info'.
-class CustomSubError : public ErrorInfo<CustomSubError, CustomError> {
-public:
-  // Create a sub-error with some info attached.
-  CustomSubError(int Info, int ExtraInfo) : ExtraInfo(ExtraInfo) {
-    this->Info = Info;
-  }
-
-  // Get the extra info attached to this error.
-  int getExtraInfo() const { return ExtraInfo; }
-
-  // Log this error to a stream.
-  void log(raw_ostream &OS) const override {
-    OS << "CustomSubError { " << getInfo() << ", " << getExtraInfo() << "}";
-  }
-
-  std::error_code convertToErrorCode() const override {
-    llvm_unreachable("CustomSubError doesn't support ECError conversion");
-  }
-
-  // Used by ErrorInfo::classID.
-  static char ID;
-
-protected:
-  int ExtraInfo;
-};
-
-char CustomSubError::ID = 0;
-
-static Error handleCustomError(const CustomError &CE) {
-  return Error::success();
-}
-
-static void handleCustomErrorVoid(const CustomError &CE) {}
-
-static Error handleCustomErrorUP(std::unique_ptr<CustomError> CE) {
-  return Error::success();
-}
-
-static void handleCustomErrorUPVoid(std::unique_ptr<CustomError> CE) {}
-
-// Test that success values implicitly convert to false, and don't cause crashes
-// once they've been implicitly converted.
-TEST(Error, CheckedSuccess) {
-  Error E = Error::success();
-  EXPECT_FALSE(E) << "Unexpected error while testing Error 'Success'";
-}
-
-// Test that unchecked success values cause an abort.
-#if LLVM_ENABLE_ABI_BREAKING_CHECKS
-TEST(Error, UncheckedSuccess) {
-  EXPECT_DEATH({ Error E = Error::success(); },
-               "Program aborted due to an unhandled Error:")
-      << "Unchecked Error Succes value did not cause abort()";
-}
-#endif
-
-// ErrorAsOutParameter tester.
-void errAsOutParamHelper(Error &Err) {
-  ErrorAsOutParameter ErrAsOutParam(&Err);
-  // Verify that checked flag is raised - assignment should not crash.
-  Err = Error::success();
-  // Raise the checked bit manually - caller should still have to test the
-  // error.
-  (void)!!Err;
-}
-
-// Test that ErrorAsOutParameter sets the checked flag on construction.
-TEST(Error, ErrorAsOutParameterChecked) {
-  Error E = Error::success();
-  errAsOutParamHelper(E);
-  (void)!!E;
-}
-
-// Test that ErrorAsOutParameter clears the checked flag on destruction.
-#if LLVM_ENABLE_ABI_BREAKING_CHECKS
-TEST(Error, ErrorAsOutParameterUnchecked) {
-  EXPECT_DEATH({ Error E = Error::success(); errAsOutParamHelper(E); },
-               "Program aborted due to an unhandled Error:")
-      << "ErrorAsOutParameter did not clear the checked flag on destruction.";
-}
-#endif
-
-// Check that we abort on unhandled failure cases. (Force conversion to bool
-// to make sure that we don't accidentally treat checked errors as handled).
-// Test runs in debug mode only.
-#if LLVM_ENABLE_ABI_BREAKING_CHECKS
-TEST(Error, UncheckedError) {
-  auto DropUnhandledError = []() {
-    Error E = make_error<CustomError>(42);
-    (void)!E;
-  };
-  EXPECT_DEATH(DropUnhandledError(),
-               "Program aborted due to an unhandled Error:")
-      << "Unhandled Error failure value did not cause abort()";
-}
-#endif
-
-// Check 'Error::isA<T>' method handling.
-TEST(Error, IsAHandling) {
-  // Check 'isA' handling.
-  Error E = make_error<CustomError>(1);
-  Error F = make_error<CustomSubError>(1, 2);
-  Error G = Error::success();
-
-  EXPECT_TRUE(E.isA<CustomError>());
-  EXPECT_FALSE(E.isA<CustomSubError>());
-  EXPECT_TRUE(F.isA<CustomError>());
-  EXPECT_TRUE(F.isA<CustomSubError>());
-  EXPECT_FALSE(G.isA<CustomError>());
-
-  consumeError(std::move(E));
-  consumeError(std::move(F));
-  consumeError(std::move(G));
-}
-
-// Check that we can handle a custom error.
-TEST(Error, HandleCustomError) {
-  int CaughtErrorInfo = 0;
-  handleAllErrors(make_error<CustomError>(42), [&](const CustomError &CE) {
-    CaughtErrorInfo = CE.getInfo();
-  });
-
-  EXPECT_TRUE(CaughtErrorInfo == 42) << "Wrong result from CustomError handler";
-}
-
-// Check that handler type deduction also works for handlers
-// of the following types:
-// void (const Err&)
-// Error (const Err&) mutable
-// void (const Err&) mutable
-// Error (Err&)
-// void (Err&)
-// Error (Err&) mutable
-// void (Err&) mutable
-// Error (unique_ptr<Err>)
-// void (unique_ptr<Err>)
-// Error (unique_ptr<Err>) mutable
-// void (unique_ptr<Err>) mutable
-TEST(Error, HandlerTypeDeduction) {
-
-  handleAllErrors(make_error<CustomError>(42), [](const CustomError &CE) {});
-
-  handleAllErrors(
-      make_error<CustomError>(42),
-      [](const CustomError &CE) mutable  -> Error { return Error::success(); });
-
-  handleAllErrors(make_error<CustomError>(42),
-                  [](const CustomError &CE) mutable {});
-
-  handleAllErrors(make_error<CustomError>(42),
-                  [](CustomError &CE) -> Error { return Error::success(); });
-
-  handleAllErrors(make_error<CustomError>(42), [](CustomError &CE) {});
-
-  handleAllErrors(make_error<CustomError>(42),
-                  [](CustomError &CE) mutable -> Error { return Error::success(); });
-
-  handleAllErrors(make_error<CustomError>(42), [](CustomError &CE) mutable {});
-
-  handleAllErrors(
-      make_error<CustomError>(42),
-      [](std::unique_ptr<CustomError> CE) -> Error { return Error::success(); });
-
-  handleAllErrors(make_error<CustomError>(42),
-                  [](std::unique_ptr<CustomError> CE) {});
-
-  handleAllErrors(
-      make_error<CustomError>(42),
-      [](std::unique_ptr<CustomError> CE) mutable -> Error { return Error::success(); });
-
-  handleAllErrors(make_error<CustomError>(42),
-                  [](std::unique_ptr<CustomError> CE) mutable {});
-
-  // Check that named handlers of type 'Error (const Err&)' work.
-  handleAllErrors(make_error<CustomError>(42), handleCustomError);
-
-  // Check that named handlers of type 'void (const Err&)' work.
-  handleAllErrors(make_error<CustomError>(42), handleCustomErrorVoid);
-
-  // Check that named handlers of type 'Error (std::unique_ptr<Err>)' work.
-  handleAllErrors(make_error<CustomError>(42), handleCustomErrorUP);
-
-  // Check that named handlers of type 'Error (std::unique_ptr<Err>)' work.
-  handleAllErrors(make_error<CustomError>(42), handleCustomErrorUPVoid);
-}
-
-// Test that we can handle errors with custom base classes.
-TEST(Error, HandleCustomErrorWithCustomBaseClass) {
-  int CaughtErrorInfo = 0;
-  int CaughtErrorExtraInfo = 0;
-  handleAllErrors(make_error<CustomSubError>(42, 7),
-                  [&](const CustomSubError &SE) {
-                    CaughtErrorInfo = SE.getInfo();
-                    CaughtErrorExtraInfo = SE.getExtraInfo();
-                  });
-
-  EXPECT_TRUE(CaughtErrorInfo == 42 && CaughtErrorExtraInfo == 7)
-      << "Wrong result from CustomSubError handler";
-}
-
-// Check that we trigger only the first handler that applies.
-TEST(Error, FirstHandlerOnly) {
-  int DummyInfo = 0;
-  int CaughtErrorInfo = 0;
-  int CaughtErrorExtraInfo = 0;
-
-  handleAllErrors(make_error<CustomSubError>(42, 7),
-                  [&](const CustomSubError &SE) {
-                    CaughtErrorInfo = SE.getInfo();
-                    CaughtErrorExtraInfo = SE.getExtraInfo();
-                  },
-                  [&](const CustomError &CE) { DummyInfo = CE.getInfo(); });
-
-  EXPECT_TRUE(CaughtErrorInfo == 42 && CaughtErrorExtraInfo == 7 &&
-              DummyInfo == 0)
-      << "Activated the wrong Error handler(s)";
-}
-
-// Check that general handlers shadow specific ones.
-TEST(Error, HandlerShadowing) {
-  int CaughtErrorInfo = 0;
-  int DummyInfo = 0;
-  int DummyExtraInfo = 0;
-
-  handleAllErrors(
-      make_error<CustomSubError>(42, 7),
-      [&](const CustomError &CE) { CaughtErrorInfo = CE.getInfo(); },
-      [&](const CustomSubError &SE) {
-        DummyInfo = SE.getInfo();
-        DummyExtraInfo = SE.getExtraInfo();
-      });
-
-  EXPECT_TRUE(CaughtErrorInfo == 42 && DummyInfo == 0 && DummyExtraInfo == 0)
-      << "General Error handler did not shadow specific handler";
-}
-
-// Test joinErrors.
-TEST(Error, CheckJoinErrors) {
-  int CustomErrorInfo1 = 0;
-  int CustomErrorInfo2 = 0;
-  int CustomErrorExtraInfo = 0;
-  Error E =
-      joinErrors(make_error<CustomError>(7), make_error<CustomSubError>(42, 7));
-
-  handleAllErrors(std::move(E),
-                  [&](const CustomSubError &SE) {
-                    CustomErrorInfo2 = SE.getInfo();
-                    CustomErrorExtraInfo = SE.getExtraInfo();
-                  },
-                  [&](const CustomError &CE) {
-                    // Assert that the CustomError instance above is handled
-                    // before the
-                    // CustomSubError - joinErrors should preserve error
-                    // ordering.
-                    EXPECT_EQ(CustomErrorInfo2, 0)
-                        << "CustomErrorInfo2 should be 0 here. "
-                           "joinErrors failed to preserve ordering.\n";
-                    CustomErrorInfo1 = CE.getInfo();
-                  });
-
-  EXPECT_TRUE(CustomErrorInfo1 == 7 && CustomErrorInfo2 == 42 &&
-              CustomErrorExtraInfo == 7)
-      << "Failed handling compound Error.";
-
-  // Test appending a single item to a list.
-  {
-    int Sum = 0;
-    handleAllErrors(
-        joinErrors(
-            joinErrors(make_error<CustomError>(7),
-                       make_error<CustomError>(7)),
-            make_error<CustomError>(7)),
-        [&](const CustomError &CE) {
-          Sum += CE.getInfo();
-        });
-    EXPECT_EQ(Sum, 21) << "Failed to correctly append error to error list.";
-  }
-
-  // Test prepending a single item to a list.
-  {
-    int Sum = 0;
-    handleAllErrors(
-        joinErrors(
-            make_error<CustomError>(7),
-            joinErrors(make_error<CustomError>(7),
-                       make_error<CustomError>(7))),
-        [&](const CustomError &CE) {
-          Sum += CE.getInfo();
-        });
-    EXPECT_EQ(Sum, 21) << "Failed to correctly prepend error to error list.";
-  }
-
-  // Test concatenating two error lists.
-  {
-    int Sum = 0;
-    handleAllErrors(
-        joinErrors(
-            joinErrors(
-                make_error<CustomError>(7),
-                make_error<CustomError>(7)),
-            joinErrors(
-                make_error<CustomError>(7),
-                make_error<CustomError>(7))),
-        [&](const CustomError &CE) {
-          Sum += CE.getInfo();
-        });
-    EXPECT_EQ(Sum, 28) << "Failed to correctly concatenate error lists.";
-  }
-}
-
-// Test that we can consume success values.
-TEST(Error, ConsumeSuccess) {
-  Error E = Error::success();
-  consumeError(std::move(E));
-}
-
-TEST(Error, ConsumeError) {
-  Error E = make_error<CustomError>(7);
-  consumeError(std::move(E));
-}
-
-// Test that handleAllUnhandledErrors crashes if an error is not caught.
-// Test runs in debug mode only.
-#if LLVM_ENABLE_ABI_BREAKING_CHECKS
-TEST(Error, FailureToHandle) {
-  auto FailToHandle = []() {
-    handleAllErrors(make_error<CustomError>(7), [&](const CustomSubError &SE) {
-      errs() << "This should never be called";
-      exit(1);
-    });
-  };
-
-  EXPECT_DEATH(FailToHandle(),
-               "Failure value returned from cantFail wrapped call\n"
-               "CustomError \\{7\\}")
-      << "Unhandled Error in handleAllErrors call did not cause an "
-         "abort()";
-}
-#endif
-
-// Test that handleAllUnhandledErrors crashes if an error is returned from a
-// handler.
-// Test runs in debug mode only.
-#if LLVM_ENABLE_ABI_BREAKING_CHECKS
-TEST(Error, FailureFromHandler) {
-  auto ReturnErrorFromHandler = []() {
-    handleAllErrors(make_error<CustomError>(7),
-                    [&](std::unique_ptr<CustomSubError> SE) {
-                      return Error(std::move(SE));
-                    });
-  };
-
-  EXPECT_DEATH(ReturnErrorFromHandler(),
-               "Failure value returned from cantFail wrapped call\n"
-               "CustomError \\{7\\}")
-      << " Error returned from handler in handleAllErrors call did not "
-         "cause abort()";
-}
-#endif
-
-// Test that we can return values from handleErrors.
-TEST(Error, CatchErrorFromHandler) {
-  int ErrorInfo = 0;
-
-  Error E = handleErrors(
-      make_error<CustomError>(7),
-      [&](std::unique_ptr<CustomError> CE) { return Error(std::move(CE)); });
-
-  handleAllErrors(std::move(E),
-                  [&](const CustomError &CE) { ErrorInfo = CE.getInfo(); });
-
-  EXPECT_EQ(ErrorInfo, 7)
-      << "Failed to handle Error returned from handleErrors.";
-}
-
-TEST(Error, StringError) {
-  std::string Msg;
-  raw_string_ostream S(Msg);
-  logAllUnhandledErrors(
-      make_error<StringError>("foo" + Twine(42), inconvertibleErrorCode()), S);
-  EXPECT_EQ(S.str(), "foo42\n") << "Unexpected StringError log result";
-
-  auto EC =
-    errorToErrorCode(make_error<StringError>("", errc::invalid_argument));
-  EXPECT_EQ(EC, errc::invalid_argument)
-    << "Failed to convert StringError to error_code.";
-}
-
-TEST(Error, createStringError) {
-  static const char *Bar = "bar";
-  static const std::error_code EC = errc::invalid_argument;
-  std::string Msg;
-  raw_string_ostream S(Msg);
-  logAllUnhandledErrors(createStringError(EC, "foo%s%d0x%" PRIx8, Bar, 1, 0xff),
-                        S);
-  EXPECT_EQ(S.str(), "foobar10xff\n")
-    << "Unexpected createStringError() log result";
-
-  S.flush();
-  Msg.clear();
-  logAllUnhandledErrors(createStringError(EC, Bar), S);
-  EXPECT_EQ(S.str(), "bar\n")
-    << "Unexpected createStringError() (overloaded) log result";
-
-  S.flush();
-  Msg.clear();
-  auto Res = errorToErrorCode(createStringError(EC, "foo%s", Bar));
-  EXPECT_EQ(Res, EC)
-    << "Failed to convert createStringError() result to error_code.";
-}
-
-// Test that the ExitOnError utility works as expected.
-TEST(Error, ExitOnError) {
-  ExitOnError ExitOnErr;
-  ExitOnErr.setBanner("Error in tool:");
-  ExitOnErr.setExitCodeMapper([](const Error &E) {
-    if (E.isA<CustomSubError>())
-      return 2;
-    return 1;
-  });
-
-  // Make sure we don't bail on success.
-  ExitOnErr(Error::success());
-  EXPECT_EQ(ExitOnErr(Expected<int>(7)), 7)
-      << "exitOnError returned an invalid value for Expected";
-
-  int A = 7;
-  int &B = ExitOnErr(Expected<int&>(A));
-  EXPECT_EQ(&A, &B) << "ExitOnError failed to propagate reference";
-
-  // Exit tests.
-  EXPECT_EXIT(ExitOnErr(make_error<CustomError>(7)),
-              ::testing::ExitedWithCode(1), "Error in tool:")
-      << "exitOnError returned an unexpected error result";
-
-  EXPECT_EXIT(ExitOnErr(Expected<int>(make_error<CustomSubError>(0, 0))),
-              ::testing::ExitedWithCode(2), "Error in tool:")
-      << "exitOnError returned an unexpected error result";
-}
-
-// Test that the ExitOnError utility works as expected.
-TEST(Error, CantFailSuccess) {
-  cantFail(Error::success());
-
-  int X = cantFail(Expected<int>(42));
-  EXPECT_EQ(X, 42) << "Expected value modified by cantFail";
-
-  int Dummy = 42;
-  int &Y = cantFail(Expected<int&>(Dummy));
-  EXPECT_EQ(&Dummy, &Y) << "Reference mangled by cantFail";
-}
-
-// Test that cantFail results in a crash if you pass it a failure value.
-#if LLVM_ENABLE_ABI_BREAKING_CHECKS && !defined(NDEBUG)
-TEST(Error, CantFailDeath) {
-  EXPECT_DEATH(cantFail(make_error<StringError>("Original error message",
-                                                inconvertibleErrorCode()),
-                        "Cantfail call failed"),
-               "Cantfail call failed\n"
-               "Original error message")
-      << "cantFail(Error) did not cause an abort for failure value";
-
-  EXPECT_DEATH(
-      {
-        auto IEC = inconvertibleErrorCode();
-        int X = cantFail(Expected<int>(make_error<StringError>("foo", IEC)));
-        (void)X;
-      },
-      "Failure value returned from cantFail wrapped call")
-    << "cantFail(Expected<int>) did not cause an abort for failure value";
-}
-#endif
-
-
-// Test Checked Expected<T> in success mode.
-TEST(Error, CheckedExpectedInSuccessMode) {
-  Expected<int> A = 7;
-  EXPECT_TRUE(!!A) << "Expected with non-error value doesn't convert to 'true'";
-  // Access is safe in second test, since we checked the error in the first.
-  EXPECT_EQ(*A, 7) << "Incorrect Expected non-error value";
-}
-
-// Test Expected with reference type.
-TEST(Error, ExpectedWithReferenceType) {
-  int A = 7;
-  Expected<int&> B = A;
-  // 'Check' B.
-  (void)!!B;
-  int &C = *B;
-  EXPECT_EQ(&A, &C) << "Expected failed to propagate reference";
-}
-
-// Test Unchecked Expected<T> in success mode.
-// We expect this to blow up the same way Error would.
-// Test runs in debug mode only.
-#if LLVM_ENABLE_ABI_BREAKING_CHECKS
-TEST(Error, UncheckedExpectedInSuccessModeDestruction) {
-  EXPECT_DEATH({ Expected<int> A = 7; },
-               "Expected<T> must be checked before access or destruction.")
-      << "Unchecked Expected<T> success value did not cause an abort().";
-}
-#endif
-
-// Test Unchecked Expected<T> in success mode.
-// We expect this to blow up the same way Error would.
-// Test runs in debug mode only.
-#if LLVM_ENABLE_ABI_BREAKING_CHECKS
-TEST(Error, UncheckedExpectedInSuccessModeAccess) {
-  EXPECT_DEATH(
-      {
-        const Expected<int> A = 7;
-        *A;
-      },
-      "Expected<T> must be checked before access or destruction.")
-      << "Unchecked Expected<T> success value did not cause an abort().";
-}
-#endif
-
-// Test Unchecked Expected<T> in success mode.
-// We expect this to blow up the same way Error would.
-// Test runs in debug mode only.
-#if LLVM_ENABLE_ABI_BREAKING_CHECKS
-TEST(Error, UncheckedExpectedInSuccessModeAssignment) {
-  EXPECT_DEATH(
-      {
-        Expected<int> A = 7;
-        A = 7;
-      },
-      "Expected<T> must be checked before access or destruction.")
-      << "Unchecked Expected<T> success value did not cause an abort().";
-}
-#endif
-
-// Test Expected<T> in failure mode.
-TEST(Error, ExpectedInFailureMode) {
-  Expected<int> A = make_error<CustomError>(42);
-  EXPECT_FALSE(!!A) << "Expected with error value doesn't convert to 'false'";
-  Error E = A.takeError();
-  EXPECT_TRUE(E.isA<CustomError>()) << "Incorrect Expected error value";
-  consumeError(std::move(E));
-}
-
-// Check that an Expected instance with an error value doesn't allow access to
-// operator*.
-// Test runs in debug mode only.
-#if LLVM_ENABLE_ABI_BREAKING_CHECKS
-TEST(Error, AccessExpectedInFailureMode) {
-  Expected<int> A = make_error<CustomError>(42);
-  EXPECT_DEATH(*A, "Expected<T> must be checked before access or destruction.")
-      << "Incorrect Expected error value";
-  consumeError(A.takeError());
-}
-#endif
-
-// Check that an Expected instance with an error triggers an abort if
-// unhandled.
-// Test runs in debug mode only.
-#if LLVM_ENABLE_ABI_BREAKING_CHECKS
-TEST(Error, UnhandledExpectedInFailureMode) {
-  EXPECT_DEATH({ Expected<int> A = make_error<CustomError>(42); },
-               "Expected<T> must be checked before access or destruction.")
-      << "Unchecked Expected<T> failure value did not cause an abort()";
-}
-#endif
-
-// Test covariance of Expected.
-TEST(Error, ExpectedCovariance) {
-  class B {};
-  class D : public B {};
-
-  Expected<B *> A1(Expected<D *>(nullptr));
-  // Check A1 by converting to bool before assigning to it.
-  (void)!!A1;
-  A1 = Expected<D *>(nullptr);
-  // Check A1 again before destruction.
-  (void)!!A1;
-
-  Expected<std::unique_ptr<B>> A2(Expected<std::unique_ptr<D>>(nullptr));
-  // Check A2 by converting to bool before assigning to it.
-  (void)!!A2;
-  A2 = Expected<std::unique_ptr<D>>(nullptr);
-  // Check A2 again before destruction.
-  (void)!!A2;
-}
-
-// Test that handleExpected just returns success values.
-TEST(Error, HandleExpectedSuccess) {
-  auto ValOrErr =
-    handleExpected(Expected<int>(42),
-                   []() { return Expected<int>(43); });
-  EXPECT_TRUE(!!ValOrErr)
-    << "handleExpected should have returned a success value here";
-  EXPECT_EQ(*ValOrErr, 42)
-    << "handleExpected should have returned the original success value here";
-}
-
-enum FooStrategy { Aggressive, Conservative };
-
-static Expected<int> foo(FooStrategy S) {
-  if (S == Aggressive)
-    return make_error<CustomError>(7);
-  return 42;
-}
-
-// Test that handleExpected invokes the error path if errors are not handled.
-TEST(Error, HandleExpectedUnhandledError) {
-  // foo(Aggressive) should return a CustomError which should pass through as
-  // there is no handler for CustomError.
-  auto ValOrErr =
-    handleExpected(
-      foo(Aggressive),
-      []() { return foo(Conservative); });
-
-  EXPECT_FALSE(!!ValOrErr)
-    << "handleExpected should have returned an error here";
-  auto Err = ValOrErr.takeError();
-  EXPECT_TRUE(Err.isA<CustomError>())
-    << "handleExpected should have returned the CustomError generated by "
-    "foo(Aggressive) here";
-  consumeError(std::move(Err));
-}
-
-// Test that handleExpected invokes the fallback path if errors are handled.
-TEST(Error, HandleExpectedHandledError) {
-  // foo(Aggressive) should return a CustomError which should handle triggering
-  // the fallback path.
-  auto ValOrErr =
-    handleExpected(
-      foo(Aggressive),
-      []() { return foo(Conservative); },
-      [](const CustomError&) { /* do nothing */ });
-
-  EXPECT_TRUE(!!ValOrErr)
-    << "handleExpected should have returned a success value here";
-  EXPECT_EQ(*ValOrErr, 42)
-    << "handleExpected returned the wrong success value";
-}
-
-TEST(Error, ErrorCodeConversions) {
-  // Round-trip a success value to check that it converts correctly.
-  EXPECT_EQ(errorToErrorCode(errorCodeToError(std::error_code())),
-            std::error_code())
-      << "std::error_code() should round-trip via Error conversions";
-
-  // Round-trip an error value to check that it converts correctly.
-  EXPECT_EQ(errorToErrorCode(errorCodeToError(errc::invalid_argument)),
-            errc::invalid_argument)
-      << "std::error_code error value should round-trip via Error "
-         "conversions";
-
-  // Round-trip a success value through ErrorOr/Expected to check that it
-  // converts correctly.
-  {
-    auto Orig = ErrorOr<int>(42);
-    auto RoundTripped =
-      expectedToErrorOr(errorOrToExpected(ErrorOr<int>(42)));
-    EXPECT_EQ(*Orig, *RoundTripped)
-      << "ErrorOr<T> success value should round-trip via Expected<T> "
-         "conversions.";
-  }
-
-  // Round-trip a failure value through ErrorOr/Expected to check that it
-  // converts correctly.
-  {
-    auto Orig = ErrorOr<int>(errc::invalid_argument);
-    auto RoundTripped =
-      expectedToErrorOr(
-          errorOrToExpected(ErrorOr<int>(errc::invalid_argument)));
-    EXPECT_EQ(Orig.getError(), RoundTripped.getError())
-      << "ErrorOr<T> failure value should round-trip via Expected<T> "
-         "conversions.";
-  }
-}
-
-// Test that error messages work.
-TEST(Error, ErrorMessage) {
-  EXPECT_EQ(toString(Error::success()).compare(""), 0);
-
-  Error E1 = make_error<CustomError>(0);
-  EXPECT_EQ(toString(std::move(E1)).compare("CustomError {0}"), 0);
-
-  Error E2 = make_error<CustomError>(0);
-  handleAllErrors(std::move(E2), [](const CustomError &CE) {
-    EXPECT_EQ(CE.message().compare("CustomError {0}"), 0);
-  });
-
-  Error E3 = joinErrors(make_error<CustomError>(0), make_error<CustomError>(1));
-  EXPECT_EQ(toString(std::move(E3))
-                .compare("CustomError {0}\n"
-                         "CustomError {1}"),
-            0);
-}
-
-TEST(Error, Stream) {
-  {
-    Error OK = Error::success();
-    std::string Buf;
-    llvm::raw_string_ostream S(Buf);
-    S << OK;
-    EXPECT_EQ("success", S.str());
-    consumeError(std::move(OK));
-  }
-  {
-    Error E1 = make_error<CustomError>(0);
-    std::string Buf;
-    llvm::raw_string_ostream S(Buf);
-    S << E1;
-    EXPECT_EQ("CustomError {0}", S.str());
-    consumeError(std::move(E1));
-  }
-}
-
-TEST(Error, SucceededMatcher) {
-  EXPECT_THAT_ERROR(Error::success(), Succeeded());
-  EXPECT_NONFATAL_FAILURE(
-      EXPECT_THAT_ERROR(make_error<CustomError>(0), Succeeded()),
-      "Expected: succeeded\n  Actual: failed  (CustomError {0})");
-
-  EXPECT_THAT_EXPECTED(Expected<int>(0), Succeeded());
-  EXPECT_NONFATAL_FAILURE(
-      EXPECT_THAT_EXPECTED(Expected<int>(make_error<CustomError>(0)),
-                           Succeeded()),
-      "Expected: succeeded\n  Actual: failed  (CustomError {0})");
-  int a = 1;
-  EXPECT_THAT_EXPECTED(Expected<int &>(a), Succeeded());
-}
-
-TEST(Error, FailedMatcher) {
-  EXPECT_THAT_ERROR(make_error<CustomError>(0), Failed());
-  EXPECT_NONFATAL_FAILURE(EXPECT_THAT_ERROR(Error::success(), Failed()),
-                          "Expected: failed\n  Actual: succeeded");
-
-  EXPECT_THAT_ERROR(make_error<CustomError>(0), Failed<CustomError>());
-  EXPECT_NONFATAL_FAILURE(
-      EXPECT_THAT_ERROR(Error::success(), Failed<CustomError>()),
-      "Expected: failed with Error of given type\n  Actual: succeeded");
-  EXPECT_NONFATAL_FAILURE(
-      EXPECT_THAT_ERROR(make_error<CustomError>(0), Failed<CustomSubError>()),
-      "Error was not of given type");
-  EXPECT_NONFATAL_FAILURE(
-      EXPECT_THAT_ERROR(
-          joinErrors(make_error<CustomError>(0), make_error<CustomError>(1)),
-          Failed<CustomError>()),
-      "multiple errors");
-
-  EXPECT_THAT_ERROR(
-      make_error<CustomError>(0),
-      Failed<CustomError>(testing::Property(&CustomError::getInfo, 0)));
-  EXPECT_NONFATAL_FAILURE(
-      EXPECT_THAT_ERROR(
-          make_error<CustomError>(0),
-          Failed<CustomError>(testing::Property(&CustomError::getInfo, 1))),
-      "Expected: failed with Error of given type and the error is an object "
-      "whose given property is equal to 1\n"
-      "  Actual: failed  (CustomError {0})");
-  EXPECT_THAT_ERROR(make_error<CustomError>(0), Failed<ErrorInfoBase>());
-
-  EXPECT_THAT_EXPECTED(Expected<int>(make_error<CustomError>(0)), Failed());
-  EXPECT_NONFATAL_FAILURE(
-      EXPECT_THAT_EXPECTED(Expected<int>(0), Failed()),
-      "Expected: failed\n  Actual: succeeded with value 0");
-  EXPECT_THAT_EXPECTED(Expected<int &>(make_error<CustomError>(0)), Failed());
-}
-
-TEST(Error, HasValueMatcher) {
-  EXPECT_THAT_EXPECTED(Expected<int>(0), HasValue(0));
-  EXPECT_NONFATAL_FAILURE(
-      EXPECT_THAT_EXPECTED(Expected<int>(make_error<CustomError>(0)),
-                           HasValue(0)),
-      "Expected: succeeded with value (is equal to 0)\n"
-      "  Actual: failed  (CustomError {0})");
-  EXPECT_NONFATAL_FAILURE(
-      EXPECT_THAT_EXPECTED(Expected<int>(1), HasValue(0)),
-      "Expected: succeeded with value (is equal to 0)\n"
-      "  Actual: succeeded with value 1, (isn't equal to 0)");
-
-  int a = 1;
-  EXPECT_THAT_EXPECTED(Expected<int &>(a), HasValue(testing::Eq(1)));
-
-  EXPECT_THAT_EXPECTED(Expected<int>(1), HasValue(testing::Gt(0)));
-  EXPECT_NONFATAL_FAILURE(
-      EXPECT_THAT_EXPECTED(Expected<int>(0), HasValue(testing::Gt(1))),
-      "Expected: succeeded with value (is > 1)\n"
-      "  Actual: succeeded with value 0, (isn't > 1)");
-  EXPECT_NONFATAL_FAILURE(
-      EXPECT_THAT_EXPECTED(Expected<int>(make_error<CustomError>(0)),
-                           HasValue(testing::Gt(1))),
-      "Expected: succeeded with value (is > 1)\n"
-      "  Actual: failed  (CustomError {0})");
-}
-
-TEST(Error, FailedWithMessageMatcher) {
-  EXPECT_THAT_EXPECTED(Expected<int>(make_error<CustomError>(0)),
-                       FailedWithMessage("CustomError {0}"));
-
-  EXPECT_NONFATAL_FAILURE(
-      EXPECT_THAT_EXPECTED(Expected<int>(make_error<CustomError>(1)),
-                           FailedWithMessage("CustomError {0}")),
-      "Expected: failed with Error whose message has 1 element that is equal "
-      "to \"CustomError {0}\"\n"
-      "  Actual: failed  (CustomError {1})");
-
-  EXPECT_NONFATAL_FAILURE(
-      EXPECT_THAT_EXPECTED(Expected<int>(0),
-                           FailedWithMessage("CustomError {0}")),
-      "Expected: failed with Error whose message has 1 element that is equal "
-      "to \"CustomError {0}\"\n"
-      "  Actual: succeeded with value 0");
-
-  EXPECT_NONFATAL_FAILURE(
-      EXPECT_THAT_EXPECTED(Expected<int>(make_error<CustomError>(0)),
-                           FailedWithMessage("CustomError {0}", "CustomError {0}")),
-      "Expected: failed with Error whose message has 2 elements where\n"
-      "element #0 is equal to \"CustomError {0}\",\n"
-      "element #1 is equal to \"CustomError {0}\"\n"
-      "  Actual: failed  (CustomError {0}), which has 1 element");
-
-  EXPECT_NONFATAL_FAILURE(
-      EXPECT_THAT_EXPECTED(
-          Expected<int>(joinErrors(make_error<CustomError>(0),
-                                   make_error<CustomError>(0))),
-          FailedWithMessage("CustomError {0}")),
-      "Expected: failed with Error whose message has 1 element that is equal "
-      "to \"CustomError {0}\"\n"
-      "  Actual: failed  (CustomError {0}; CustomError {0}), which has 2 elements");
-
-  EXPECT_THAT_ERROR(
-      joinErrors(make_error<CustomError>(0), make_error<CustomError>(0)),
-      FailedWithMessageArray(testing::SizeIs(2)));
-}
-
-TEST(Error, C_API) {
-  EXPECT_THAT_ERROR(unwrap(wrap(Error::success())), Succeeded())
-      << "Failed to round-trip Error success value via C API";
-  EXPECT_THAT_ERROR(unwrap(wrap(make_error<CustomError>(0))),
-                    Failed<CustomError>())
-      << "Failed to round-trip Error failure value via C API";
-
-  auto Err =
-      wrap(make_error<StringError>("test message", inconvertibleErrorCode()));
-  EXPECT_EQ(LLVMGetErrorTypeId(Err), LLVMGetStringErrorTypeId())
-      << "Failed to match error type ids via C API";
-  char *ErrMsg = LLVMGetErrorMessage(Err);
-  EXPECT_STREQ(ErrMsg, "test message")
-      << "Failed to roundtrip StringError error message via C API";
-  LLVMDisposeErrorMessage(ErrMsg);
-
-  bool GotCSE = false;
-  bool GotCE = false;
-  handleAllErrors(
-    unwrap(wrap(joinErrors(make_error<CustomSubError>(42, 7),
-                           make_error<CustomError>(42)))),
-    [&](CustomSubError &CSE) {
-      GotCSE = true;
-    },
-    [&](CustomError &CE) {
-      GotCE = true;
-    });
-  EXPECT_TRUE(GotCSE) << "Failed to round-trip ErrorList via C API";
-  EXPECT_TRUE(GotCE) << "Failed to round-trip ErrorList via C API";
-}
-
-TEST(Error, FileErrorTest) {
-#if !defined(NDEBUG) && GTEST_HAS_DEATH_TEST
-    EXPECT_DEATH(
-      {
-        Error S = Error::success();
-        consumeError(createFileError("file.bin", std::move(S)));
-      },
-      "");
-#endif
-  // Not allowed, would fail at compile-time
-  //consumeError(createFileError("file.bin", ErrorSuccess()));
-
-  Error E1 = make_error<CustomError>(1);
-  Error FE1 = createFileError("file.bin", std::move(E1));
-  EXPECT_EQ(toString(std::move(FE1)).compare("'file.bin': CustomError {1}"), 0);
-
-  Error E2 = make_error<CustomError>(2);
-  Error FE2 = createFileError("file.bin", std::move(E2));
-  handleAllErrors(std::move(FE2), [](const FileError &F) {
-    EXPECT_EQ(F.message().compare("'file.bin': CustomError {2}"), 0);
-  });
-
-  Error E3 = make_error<CustomError>(3);
-  Error FE3 = createFileError("file.bin", std::move(E3));
-  auto E31 = handleErrors(std::move(FE3), [](std::unique_ptr<FileError> F) {
-    return F->takeError();
-  });
-  handleAllErrors(std::move(E31), [](const CustomError &C) {
-    EXPECT_EQ(C.message().compare("CustomError {3}"), 0);
-  });
-
-  Error FE4 =
-      joinErrors(createFileError("file.bin", make_error<CustomError>(41)),
-                 createFileError("file2.bin", make_error<CustomError>(42)));
-  EXPECT_EQ(toString(std::move(FE4))
-                .compare("'file.bin': CustomError {41}\n"
-                         "'file2.bin': CustomError {42}"),
-            0);
-}
-
-enum class test_error_code {
-  unspecified = 1,
-  error_1,
-  error_2,
-};
-
-} // end anon namespace
-
-namespace std {
-    template <>
-    struct is_error_code_enum<test_error_code> : std::true_type {};
-} // namespace std
-
-namespace {
-
-const std::error_category &TErrorCategory();
-
-inline std::error_code make_error_code(test_error_code E) {
-    return std::error_code(static_cast<int>(E), TErrorCategory());
-}
-
-class TestDebugError : public ErrorInfo<TestDebugError, StringError> {
-public:
-    using ErrorInfo<TestDebugError, StringError >::ErrorInfo; // inherit constructors
-    TestDebugError(const Twine &S) : ErrorInfo(S, test_error_code::unspecified) {}
-    static char ID;
-};
-
-class TestErrorCategory : public std::error_category {
-public:
-  const char *name() const noexcept override { return "error"; }
-  std::string message(int Condition) const override {
-    switch (static_cast<test_error_code>(Condition)) {
-    case test_error_code::unspecified:
-      return "An unknown error has occurred.";
-    case test_error_code::error_1:
-      return "Error 1.";
-    case test_error_code::error_2:
-      return "Error 2.";
-    }
-    llvm_unreachable("Unrecognized test_error_code");
-  }
-};
-
-static llvm::ManagedStatic<TestErrorCategory> TestErrCategory;
-const std::error_category &TErrorCategory() { return *TestErrCategory; }
-
-char TestDebugError::ID;
-
-TEST(Error, SubtypeStringErrorTest) {
-  auto E1 = make_error<TestDebugError>(test_error_code::error_1);
-  EXPECT_EQ(toString(std::move(E1)).compare("Error 1."), 0);
-
-  auto E2 = make_error<TestDebugError>(test_error_code::error_1,
-                                       "Detailed information");
-  EXPECT_EQ(toString(std::move(E2)).compare("Error 1. Detailed information"),
-            0);
-
-  auto E3 = make_error<TestDebugError>(test_error_code::error_2);
-  handleAllErrors(std::move(E3), [](const TestDebugError &F) {
-    EXPECT_EQ(F.message().compare("Error 2."), 0);
-  });
-
-  auto E4 = joinErrors(make_error<TestDebugError>(test_error_code::error_1,
-                                                  "Detailed information"),
-                       make_error<TestDebugError>(test_error_code::error_2));
-  EXPECT_EQ(toString(std::move(E4))
-                .compare("Error 1. Detailed information\n"
-                         "Error 2."),
-            0);
-}
-
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/Support/ExtensibleRTTITest.cpp b/gnu/llvm/llvm/unittests/Support/ExtensibleRTTITest.cpp
deleted file mode 100644
index 84d2a6f1ae4..00000000000
--- a/gnu/llvm/llvm/unittests/Support/ExtensibleRTTITest.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-//===------ unittests/ExtensibleRTTITest.cpp - Extensible RTTI Tests ------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/ExtensibleRTTI.h"
-#include "llvm/Support/Casting.h"
-
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-class MyBaseType : public RTTIExtends<MyBaseType, RTTIRoot> {
-public:
-  static char ID;
-};
-
-class MyDerivedType : public RTTIExtends<MyDerivedType, MyBaseType> {
-public:
-  static char ID;
-};
-
-class MyOtherDerivedType : public RTTIExtends<MyOtherDerivedType, MyBaseType> {
-public:
-  static char ID;
-};
-
-class MyDeeperDerivedType
-    : public RTTIExtends<MyDeeperDerivedType, MyDerivedType> {
-public:
-  static char ID;
-};
-
-char MyBaseType::ID = 0;
-char MyDerivedType::ID = 0;
-char MyOtherDerivedType::ID = 0;
-char MyDeeperDerivedType::ID = 0;
-
-TEST(ExtensibleRTTI, isa) {
-  MyBaseType B;
-  MyDerivedType D;
-  MyDeeperDerivedType DD;
-
-  EXPECT_TRUE(isa<MyBaseType>(B));
-  EXPECT_FALSE(isa<MyDerivedType>(B));
-  EXPECT_FALSE(isa<MyOtherDerivedType>(B));
-  EXPECT_FALSE(isa<MyDeeperDerivedType>(B));
-
-  EXPECT_TRUE(isa<MyBaseType>(D));
-  EXPECT_TRUE(isa<MyDerivedType>(D));
-  EXPECT_FALSE(isa<MyOtherDerivedType>(D));
-  EXPECT_FALSE(isa<MyDeeperDerivedType>(D));
-
-  EXPECT_TRUE(isa<MyBaseType>(DD));
-  EXPECT_TRUE(isa<MyDerivedType>(DD));
-  EXPECT_FALSE(isa<MyOtherDerivedType>(DD));
-  EXPECT_TRUE(isa<MyDeeperDerivedType>(DD));
-}
-
-TEST(ExtensibleRTTI, cast) {
-  MyDerivedType D;
-  MyBaseType &BD = D;
-
-  cast<MyBaseType>(D);
-  cast<MyBaseType>(BD);
-  cast<MyDerivedType>(BD);
-}
-
-TEST(ExtensibleRTTI, dyn_cast) {
-  MyBaseType B;
-  MyDerivedType D;
-  MyBaseType &BD = D;
-
-  EXPECT_EQ(dyn_cast<MyDerivedType>(&B), nullptr);
-  EXPECT_EQ(dyn_cast<MyDerivedType>(&D), &D);
-  EXPECT_EQ(dyn_cast<MyBaseType>(&BD), &BD);
-  EXPECT_EQ(dyn_cast<MyDerivedType>(&BD), &D);
-}
-
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/Support/FSUniqueIDTest.cpp b/gnu/llvm/llvm/unittests/Support/FSUniqueIDTest.cpp
deleted file mode 100644
index 6c794730e39..00000000000
--- a/gnu/llvm/llvm/unittests/Support/FSUniqueIDTest.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-//===- llvm/unittest/Support/FSUniqueIDTest.cpp - Test sys::fs::UniqueID --===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/FileSystem/UniqueID.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::sys::fs;
-
-namespace {
-
-TEST(FSUniqueIDTest, construct) {
-  EXPECT_EQ(20u, UniqueID(20, 10).getDevice());
-  EXPECT_EQ(10u, UniqueID(20, 10).getFile());
-}
-
-TEST(FSUniqueIDTest, equals) {
-  EXPECT_TRUE(UniqueID(20, 10) == UniqueID(20, 10));
-  EXPECT_FALSE(UniqueID(20, 20) == UniqueID(20, 10));
-  EXPECT_FALSE(UniqueID(10, 10) == UniqueID(20, 10));
-}
-
-TEST(FSUniqueIDTest, less) {
-  EXPECT_FALSE(UniqueID(20, 2) < UniqueID(20, 2));
-  EXPECT_FALSE(UniqueID(20, 3) < UniqueID(20, 2));
-  EXPECT_FALSE(UniqueID(30, 2) < UniqueID(20, 2));
-  EXPECT_FALSE(UniqueID(30, 2) < UniqueID(20, 40));
-  EXPECT_TRUE(UniqueID(20, 2) < UniqueID(20, 3));
-  EXPECT_TRUE(UniqueID(20, 2) < UniqueID(30, 2));
-  EXPECT_TRUE(UniqueID(20, 40) < UniqueID(30, 2));
-}
-
-} // anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/Support/FileCollectorTest.cpp b/gnu/llvm/llvm/unittests/Support/FileCollectorTest.cpp
deleted file mode 100644
index 0e8e4503865..00000000000
--- a/gnu/llvm/llvm/unittests/Support/FileCollectorTest.cpp
+++ /dev/null
@@ -1,277 +0,0 @@
-//===-- FileCollectorTest.cpp -----------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-#include "llvm/Support/FileCollector.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Testing/Support/SupportHelpers.h"
-
-using namespace llvm;
-using llvm::unittest::TempDir;
-using llvm::unittest::TempFile;
-using llvm::unittest::TempLink;
-
-namespace llvm {
-namespace vfs {
-inline bool operator==(const llvm::vfs::YAMLVFSEntry &LHS,
-                       const llvm::vfs::YAMLVFSEntry &RHS) {
-  return LHS.VPath == RHS.VPath && LHS.RPath == RHS.RPath;
-}
-} // namespace vfs
-} // namespace llvm
-
-namespace {
-class TestingFileCollector : public FileCollector {
-public:
-  using FileCollector::FileCollector;
-  using FileCollector::Root;
-  using FileCollector::Seen;
-  using FileCollector::VFSWriter;
-
-  bool hasSeen(StringRef fs) {
-    return Seen.find(fs) != Seen.end();
-  }
-};
-
-} // end anonymous namespace
-
-TEST(FileCollectorTest, addFile) {
-  TempDir root("add_file_root", /*Unique*/ true);
-  std::string root_fs(root.path());
-  TestingFileCollector FileCollector(root_fs, root_fs);
-
-  FileCollector.addFile("/path/to/a");
-  FileCollector.addFile("/path/to/b");
-  FileCollector.addFile("/path/to/c");
-
-  // Make sure the root is correct.
-  EXPECT_EQ(FileCollector.Root, root_fs);
-
-  // Make sure we've seen all the added files.
-  EXPECT_TRUE(FileCollector.hasSeen("/path/to/a"));
-  EXPECT_TRUE(FileCollector.hasSeen("/path/to/b"));
-  EXPECT_TRUE(FileCollector.hasSeen("/path/to/c"));
-
-  // Make sure we've only seen the added files.
-  EXPECT_FALSE(FileCollector.hasSeen("/path/to/d"));
-}
-
-TEST(FileCollectorTest, addDirectory) {
-  TempDir file_root("file_root", /*Unique*/ true);
-
-  llvm::SmallString<128> aaa(file_root.path());
-  llvm::sys::path::append(aaa, "aaa");
-  TempFile a(aaa.str());
-
-  llvm::SmallString<128> bbb(file_root.path());
-  llvm::sys::path::append(bbb, "bbb");
-  TempFile b(bbb.str());
-
-  llvm::SmallString<128> ccc(file_root.path());
-  llvm::sys::path::append(ccc, "ccc");
-  TempFile c(ccc.str());
-
-  std::string root_fs(file_root.path());
-  TestingFileCollector FileCollector(root_fs, root_fs);
-
-  FileCollector.addDirectory(file_root.path());
-
-  // Make sure the root is correct.
-  EXPECT_EQ(FileCollector.Root, root_fs);
-
-  // Make sure we've seen all the added files.
-  EXPECT_TRUE(FileCollector.hasSeen(a.path()));
-  EXPECT_TRUE(FileCollector.hasSeen(b.path()));
-  EXPECT_TRUE(FileCollector.hasSeen(c.path()));
-
-  // Make sure we've only seen the added files.
-  llvm::SmallString<128> ddd(file_root.path());
-  llvm::sys::path::append(ddd, "ddd");
-  TempFile d(ddd);
-  EXPECT_FALSE(FileCollector.hasSeen(d.path()));
-}
-
-TEST(FileCollectorTest, copyFiles) {
-  TempDir file_root("file_root", /*Unique*/ true);
-  TempFile a(file_root.path("aaa"));
-  TempFile b(file_root.path("bbb"));
-  TempFile c(file_root.path("ccc"));
-
-  // Create file collector and add files.
-  TempDir root("copy_files_root", /*Unique*/ true);
-  std::string root_fs(root.path());
-  TestingFileCollector FileCollector(root_fs, root_fs);
-  FileCollector.addFile(a.path());
-  FileCollector.addFile(b.path());
-  FileCollector.addFile(c.path());
-
-  // Make sure we can copy the files.
-  std::error_code ec = FileCollector.copyFiles(true);
-  EXPECT_FALSE(ec);
-
-  // Now add a bogus file and make sure we error out.
-  FileCollector.addFile("/some/bogus/file");
-  ec = FileCollector.copyFiles(true);
-  EXPECT_TRUE(ec);
-
-  // However, if stop_on_error is true the copy should still succeed.
-  ec = FileCollector.copyFiles(false);
-  EXPECT_FALSE(ec);
-}
-
-TEST(FileCollectorTest, recordAndConstructDirectory) {
-  TempDir file_root("dir_root", /*Unique*/ true);
-  TempDir subdir(file_root.path("subdir"));
-  TempDir subdir2(file_root.path("subdir2"));
-  TempFile a(subdir2.path("a"));
-
-  // Create file collector and add files.
-  TempDir root("copy_files_root", /*Unique*/ true);
-  std::string root_fs(root.path());
-  TestingFileCollector FileCollector(root_fs, root_fs);
-  FileCollector.addFile(a.path());
-
-  // The empty directory isn't seen until we add it.
-  EXPECT_TRUE(FileCollector.hasSeen(a.path()));
-  EXPECT_FALSE(FileCollector.hasSeen(subdir.path()));
-
-  FileCollector.addFile(subdir.path());
-  EXPECT_TRUE(FileCollector.hasSeen(subdir.path()));
-
-  // Make sure we can construct the directory.
-  std::error_code ec = FileCollector.copyFiles(true);
-  EXPECT_FALSE(ec);
-  bool IsDirectory = false;
-  llvm::SmallString<128> SubdirInRoot = root.path();
-  llvm::sys::path::append(SubdirInRoot,
-                          llvm::sys::path::relative_path(subdir.path()));
-  ec = sys::fs::is_directory(SubdirInRoot, IsDirectory);
-  EXPECT_FALSE(ec);
-  ASSERT_TRUE(IsDirectory);
-}
-
-TEST(FileCollectorTest, recordVFSAccesses) {
-  TempDir file_root("dir_root", /*Unique*/ true);
-  TempDir subdir(file_root.path("subdir"));
-  TempDir subdir2(file_root.path("subdir2"));
-  TempFile a(subdir2.path("a"));
-  TempFile b(file_root.path("b"));
-  TempDir subdir3(file_root.path("subdir3"));
-  TempFile subdir3a(subdir3.path("aa"));
-  TempDir subdir3b(subdir3.path("subdirb"));
-  { TempFile subdir3fileremoved(subdir3.path("removed")); }
-
-  // Create file collector and add files.
-  TempDir root("copy_files_root", /*Unique*/ true);
-  std::string root_fs(root.path());
-  auto Collector = std::make_shared<TestingFileCollector>(root_fs, root_fs);
-  auto VFS =
-      FileCollector::createCollectorVFS(vfs::getRealFileSystem(), Collector);
-  VFS->status(a.path());
-  EXPECT_TRUE(Collector->hasSeen(a.path()));
-
-  VFS->openFileForRead(b.path());
-  EXPECT_TRUE(Collector->hasSeen(b.path()));
-
-  VFS->status(subdir.path());
-  EXPECT_TRUE(Collector->hasSeen(subdir.path()));
-
-#ifndef _WIN32
-  std::error_code EC;
-  auto It = VFS->dir_begin(subdir3.path(), EC);
-  EXPECT_FALSE(EC);
-  EXPECT_TRUE(Collector->hasSeen(subdir3.path()));
-  EXPECT_TRUE(Collector->hasSeen(subdir3a.path()));
-  EXPECT_TRUE(Collector->hasSeen(subdir3b.path()));
-  std::string RemovedFileName((Twine(subdir3.path("removed"))).str());
-  EXPECT_FALSE(Collector->hasSeen(RemovedFileName));
-#endif
-}
-
-#ifndef _WIN32
-TEST(FileCollectorTest, Symlinks) {
-  // Root where the original files live.
-  TempDir file_root("file_root", /*Unique*/ true);
-
-  // Create some files in the file root.
-  TempFile a(file_root.path("aaa"));
-  TempFile b(file_root.path("bbb"));
-  TempFile c(file_root.path("ccc"));
-
-  // Create a directory foo with file ddd.
-  TempDir foo(file_root.path("foo"));
-  TempFile d(foo.path("ddd"));
-
-  // Create a file eee in the foo's parent directory.
-  TempFile e(foo.path("../eee"));
-
-  // Create a symlink bar pointing to foo.
-  TempLink symlink(file_root.path("foo"), file_root.path("bar"));
-
-  // Root where files are copied to.
-  TempDir reproducer_root("reproducer_root", /*Unique*/ true);
-  std::string root_fs(reproducer_root.path());
-  TestingFileCollector FileCollector(root_fs, root_fs);
-
-  // Add all the files to the collector.
-  FileCollector.addFile(a.path());
-  FileCollector.addFile(b.path());
-  FileCollector.addFile(c.path());
-  FileCollector.addFile(d.path());
-  FileCollector.addFile(e.path());
-  FileCollector.addFile(file_root.path() + "/bar/ddd");
-
-  auto mapping = FileCollector.VFSWriter.getMappings();
-
-  {
-    // Make sure the common case works.
-    std::string vpath = (file_root.path() + "/aaa").str();
-    std::string rpath =
-        (reproducer_root.path() + file_root.path() + "/aaa").str();
-    printf("%s -> %s\n", vpath.c_str(), rpath.c_str());
-    EXPECT_THAT(mapping, testing::Contains(vfs::YAMLVFSEntry(vpath, rpath)));
-  }
-
-  {
-    // Make sure the virtual path points to the real source path.
-    std::string vpath = (file_root.path() + "/bar/ddd").str();
-    std::string rpath =
-        (reproducer_root.path() + file_root.path() + "/foo/ddd").str();
-    printf("%s -> %s\n", vpath.c_str(), rpath.c_str());
-    EXPECT_THAT(mapping, testing::Contains(vfs::YAMLVFSEntry(vpath, rpath)));
-  }
-
-  {
-    // Make sure that .. is removed from the source path.
-    std::string vpath = (file_root.path() + "/eee").str();
-    std::string rpath =
-        (reproducer_root.path() + file_root.path() + "/eee").str();
-    printf("%s -> %s\n", vpath.c_str(), rpath.c_str());
-    EXPECT_THAT(mapping, testing::Contains(vfs::YAMLVFSEntry(vpath, rpath)));
-  }
-}
-
-TEST(FileCollectorTest, recordVFSSymlinkAccesses) {
-  TempDir file_root("dir_root", /*Unique*/ true);
-  TempFile a(file_root.path("a"));
-  TempLink symlink(file_root.path("a"), file_root.path("b"));
-
-  // Create file collector and add files.
-  TempDir root("copy_files_root", true);
-  std::string root_fs(root.path());
-  auto Collector = std::make_shared<TestingFileCollector>(root_fs, root_fs);
-  auto VFS =
-      FileCollector::createCollectorVFS(vfs::getRealFileSystem(), Collector);
-  SmallString<256> Output;
-  VFS->getRealPath(symlink.path(), Output);
-  EXPECT_TRUE(Collector->hasSeen(a.path()));
-  EXPECT_TRUE(Collector->hasSeen(symlink.path()));
-}
-#endif
diff --git a/gnu/llvm/llvm/unittests/Support/FileOutputBufferTest.cpp b/gnu/llvm/llvm/unittests/Support/FileOutputBufferTest.cpp
deleted file mode 100644
index f7bb0833e5a..00000000000
--- a/gnu/llvm/llvm/unittests/Support/FileOutputBufferTest.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-//===- llvm/unittest/Support/FileOutputBuffer.cpp - unit tests ------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/FileOutputBuffer.h"
-#include "llvm/Support/Errc.h"
-#include "llvm/Support/ErrorHandling.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::sys;
-
-#define ASSERT_NO_ERROR(x)                                                     \
-  if (std::error_code ASSERT_NO_ERROR_ec = x) {                                \
-    SmallString<128> MessageStorage;                                           \
-    raw_svector_ostream Message(MessageStorage);                               \
-    Message << #x ": did not return errc::success.\n"                          \
-            << "error number: " << ASSERT_NO_ERROR_ec.value() << "\n"          \
-            << "error message: " << ASSERT_NO_ERROR_ec.message() << "\n";      \
-    GTEST_FATAL_FAILURE_(MessageStorage.c_str());                              \
-  } else {                                                                     \
-  }
-
-namespace {
-TEST(FileOutputBuffer, Test) {
-  // Create unique temporary directory for these tests
-  SmallString<128> TestDirectory;
-  {
-    ASSERT_NO_ERROR(
-        fs::createUniqueDirectory("FileOutputBuffer-test", TestDirectory));
-  }
-
-  // TEST 1: Verify commit case.
-  SmallString<128> File1(TestDirectory);
-  File1.append("/file1");
-  {
-    Expected<std::unique_ptr<FileOutputBuffer>> BufferOrErr =
-        FileOutputBuffer::create(File1, 8192);
-    ASSERT_NO_ERROR(errorToErrorCode(BufferOrErr.takeError()));
-    std::unique_ptr<FileOutputBuffer> &Buffer = *BufferOrErr;
-    // Start buffer with special header.
-    memcpy(Buffer->getBufferStart(), "AABBCCDDEEFFGGHHIIJJ", 20);
-    // Write to end of buffer to verify it is writable.
-    memcpy(Buffer->getBufferEnd() - 20, "AABBCCDDEEFFGGHHIIJJ", 20);
-    // Commit buffer.
-    ASSERT_NO_ERROR(errorToErrorCode(Buffer->commit()));
-  }
-
-  // Verify file is correct size.
-  uint64_t File1Size;
-  ASSERT_NO_ERROR(fs::file_size(Twine(File1), File1Size));
-  ASSERT_EQ(File1Size, 8192ULL);
-  ASSERT_NO_ERROR(fs::remove(File1.str()));
-
-  // TEST 2: Verify abort case.
-  SmallString<128> File2(TestDirectory);
-  File2.append("/file2");
-  {
-    Expected<std::unique_ptr<FileOutputBuffer>> Buffer2OrErr =
-        FileOutputBuffer::create(File2, 8192);
-    ASSERT_NO_ERROR(errorToErrorCode(Buffer2OrErr.takeError()));
-    std::unique_ptr<FileOutputBuffer> &Buffer2 = *Buffer2OrErr;
-    // Fill buffer with special header.
-    memcpy(Buffer2->getBufferStart(), "AABBCCDDEEFFGGHHIIJJ", 20);
-    // Do *not* commit buffer.
-  }
-  // Verify file does not exist (because buffer not committed).
-  ASSERT_EQ(fs::access(Twine(File2), fs::AccessMode::Exist),
-            errc::no_such_file_or_directory);
-  ASSERT_NO_ERROR(fs::remove(File2.str()));
-
-  // TEST 3: Verify sizing down case.
-  SmallString<128> File3(TestDirectory);
-  File3.append("/file3");
-  {
-    Expected<std::unique_ptr<FileOutputBuffer>> BufferOrErr =
-        FileOutputBuffer::create(File3, 8192000);
-    ASSERT_NO_ERROR(errorToErrorCode(BufferOrErr.takeError()));
-    std::unique_ptr<FileOutputBuffer> &Buffer = *BufferOrErr;
-    // Start buffer with special header.
-    memcpy(Buffer->getBufferStart(), "AABBCCDDEEFFGGHHIIJJ", 20);
-    // Write to end of buffer to verify it is writable.
-    memcpy(Buffer->getBufferEnd() - 20, "AABBCCDDEEFFGGHHIIJJ", 20);
-    ASSERT_NO_ERROR(errorToErrorCode(Buffer->commit()));
-  }
-
-  // Verify file is correct size.
-  uint64_t File3Size;
-  ASSERT_NO_ERROR(fs::file_size(Twine(File3), File3Size));
-  ASSERT_EQ(File3Size, 8192000ULL);
-  ASSERT_NO_ERROR(fs::remove(File3.str()));
-
-  // TEST 4: Verify file can be made executable.
-  SmallString<128> File4(TestDirectory);
-  File4.append("/file4");
-  {
-    Expected<std::unique_ptr<FileOutputBuffer>> BufferOrErr =
-        FileOutputBuffer::create(File4, 8192, FileOutputBuffer::F_executable);
-    ASSERT_NO_ERROR(errorToErrorCode(BufferOrErr.takeError()));
-    std::unique_ptr<FileOutputBuffer> &Buffer = *BufferOrErr;
-    // Start buffer with special header.
-    memcpy(Buffer->getBufferStart(), "AABBCCDDEEFFGGHHIIJJ", 20);
-    // Commit buffer.
-    ASSERT_NO_ERROR(errorToErrorCode(Buffer->commit()));
-  }
-  // Verify file exists and is executable.
-  fs::file_status Status;
-  ASSERT_NO_ERROR(fs::status(Twine(File4), Status));
-  bool IsExecutable = (Status.permissions() & fs::owner_exe);
-  EXPECT_TRUE(IsExecutable);
-  ASSERT_NO_ERROR(fs::remove(File4.str()));
-
-  // TEST 5: In-memory buffer works as expected.
-  SmallString<128> File5(TestDirectory);
-  File5.append("/file5");
-  {
-    Expected<std::unique_ptr<FileOutputBuffer>> BufferOrErr =
-        FileOutputBuffer::create(File5, 8000, FileOutputBuffer::F_no_mmap);
-    ASSERT_NO_ERROR(errorToErrorCode(BufferOrErr.takeError()));
-    std::unique_ptr<FileOutputBuffer> &Buffer = *BufferOrErr;
-    // Start buffer with special header.
-    memcpy(Buffer->getBufferStart(), "AABBCCDDEEFFGGHHIIJJ", 20);
-    ASSERT_NO_ERROR(errorToErrorCode(Buffer->commit()));
-    // Write to end of buffer to verify it is writable.
-    memcpy(Buffer->getBufferEnd() - 20, "AABBCCDDEEFFGGHHIIJJ", 20);
-    // Commit buffer.
-    ASSERT_NO_ERROR(errorToErrorCode(Buffer->commit()));
-  }
-
-  // Verify file is correct size.
-  uint64_t File5Size;
-  ASSERT_NO_ERROR(fs::file_size(Twine(File5), File5Size));
-  ASSERT_EQ(File5Size, 8000ULL);
-  ASSERT_NO_ERROR(fs::remove(File5.str()));
-
-  // TEST 6: Create an empty file.
-  SmallString<128> File6(TestDirectory);
-  File6.append("/file6");
-  {
-    Expected<std::unique_ptr<FileOutputBuffer>> BufferOrErr =
-        FileOutputBuffer::create(File6, 0);
-    ASSERT_NO_ERROR(errorToErrorCode(BufferOrErr.takeError()));
-    ASSERT_NO_ERROR(errorToErrorCode((*BufferOrErr)->commit()));
-  }
-  uint64_t File6Size;
-  ASSERT_NO_ERROR(fs::file_size(Twine(File6), File6Size));
-  ASSERT_EQ(File6Size, 0ULL);
-  ASSERT_NO_ERROR(fs::remove(File6.str()));
-
-  // Clean up.
-  ASSERT_NO_ERROR(fs::remove(TestDirectory.str()));
-}
-} // anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/Support/FileUtilitiesTest.cpp b/gnu/llvm/llvm/unittests/Support/FileUtilitiesTest.cpp
deleted file mode 100644
index ff973e23596..00000000000
--- a/gnu/llvm/llvm/unittests/Support/FileUtilitiesTest.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-//===- llvm/unittest/Support/FileUtilitiesTest.cpp - unit tests -----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/FileUtilities.h"
-#include "llvm/Support/Errc.h"
-#include "llvm/Support/ErrorHandling.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Testing/Support/SupportHelpers.h"
-#include "gtest/gtest.h"
-#include <fstream>
-
-using namespace llvm;
-using namespace llvm::sys;
-
-using llvm::unittest::TempDir;
-
-#define ASSERT_NO_ERROR(x)                                                     \
-  if (std::error_code ASSERT_NO_ERROR_ec = x) {                                \
-    SmallString<128> MessageStorage;                                           \
-    raw_svector_ostream Message(MessageStorage);                               \
-    Message << #x ": did not return errc::success.\n"                          \
-            << "error number: " << ASSERT_NO_ERROR_ec.value() << "\n"          \
-            << "error message: " << ASSERT_NO_ERROR_ec.message() << "\n";      \
-    GTEST_FATAL_FAILURE_(MessageStorage.c_str());                              \
-  } else {                                                                     \
-  }
-
-namespace {
-TEST(writeFileAtomicallyTest, Test) {
-  // Create unique temporary directory for these tests
-  TempDir RootTestDirectory("writeFileAtomicallyTest", /*Unique*/ true);
-
-  SmallString<128> FinalTestfilePath(RootTestDirectory.path());
-  sys::path::append(FinalTestfilePath, "foo.txt");
-  const std::string TempUniqTestFileModel =
-      std::string(FinalTestfilePath) + "-%%%%%%%%";
-  const std::string TestfileContent = "fooFOOfoo";
-
-  llvm::Error Err = llvm::writeFileAtomically(TempUniqTestFileModel, FinalTestfilePath, TestfileContent);
-  ASSERT_FALSE(static_cast<bool>(Err));
-
-  std::ifstream FinalFileStream(std::string(FinalTestfilePath.str()));
-  std::string FinalFileContent;
-  FinalFileStream >> FinalFileContent;
-  ASSERT_EQ(FinalFileContent, TestfileContent);
-}
-} // anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/Support/FormatVariadicTest.cpp b/gnu/llvm/llvm/unittests/Support/FormatVariadicTest.cpp
deleted file mode 100644
index 37946165e36..00000000000
--- a/gnu/llvm/llvm/unittests/Support/FormatVariadicTest.cpp
+++ /dev/null
@@ -1,700 +0,0 @@
-//===- FormatVariadicTest.cpp - Unit tests for string formatting ----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/FormatVariadic.h"
-#include "llvm/Support/Error.h"
-#include "llvm/Support/FormatAdapters.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-// Compile-time tests templates in the detail namespace.
-namespace {
-struct Format : public FormatAdapter<int> {
-  Format(int N) : FormatAdapter<int>(std::move(N)) {}
-  void format(raw_ostream &OS, StringRef Opt) override { OS << "Format"; }
-};
-
-using detail::uses_format_member;
-using detail::uses_missing_provider;
-
-static_assert(uses_format_member<Format>::value, "");
-static_assert(uses_format_member<Format &>::value, "");
-static_assert(uses_format_member<Format &&>::value, "");
-static_assert(uses_format_member<const Format>::value, "");
-static_assert(uses_format_member<const Format &>::value, "");
-static_assert(uses_format_member<const volatile Format>::value, "");
-static_assert(uses_format_member<const volatile Format &>::value, "");
-
-struct NoFormat {};
-static_assert(uses_missing_provider<NoFormat>::value, "");
-}
-
-TEST(FormatVariadicTest, EmptyFormatString) {
-  auto Replacements = formatv_object_base::parseFormatString("");
-  EXPECT_EQ(0U, Replacements.size());
-}
-
-TEST(FormatVariadicTest, NoReplacements) {
-  const StringRef kFormatString = "This is a test";
-  auto Replacements = formatv_object_base::parseFormatString(kFormatString);
-  ASSERT_EQ(1U, Replacements.size());
-  EXPECT_EQ(kFormatString, Replacements[0].Spec);
-  EXPECT_EQ(ReplacementType::Literal, Replacements[0].Type);
-}
-
-TEST(FormatVariadicTest, EscapedBrace) {
-  // {{ should be replaced with {
-  auto Replacements = formatv_object_base::parseFormatString("{{");
-  ASSERT_EQ(1u, Replacements.size());
-  EXPECT_EQ("{", Replacements[0].Spec);
-  EXPECT_EQ(ReplacementType::Literal, Replacements[0].Type);
-
-  // An even number N of braces should be replaced with N/2 braces.
-  Replacements = formatv_object_base::parseFormatString("{{{{{{");
-  ASSERT_EQ(1u, Replacements.size());
-  EXPECT_EQ("{{{", Replacements[0].Spec);
-  EXPECT_EQ(ReplacementType::Literal, Replacements[0].Type);
-
-  // } does not require doubling up.
-  Replacements = formatv_object_base::parseFormatString("}");
-  ASSERT_EQ(1u, Replacements.size());
-  EXPECT_EQ("}", Replacements[0].Spec);
-  EXPECT_EQ(ReplacementType::Literal, Replacements[0].Type);
-
-  // } does not require doubling up.
-  Replacements = formatv_object_base::parseFormatString("}}}");
-  ASSERT_EQ(1u, Replacements.size());
-  EXPECT_EQ("}}}", Replacements[0].Spec);
-  EXPECT_EQ(ReplacementType::Literal, Replacements[0].Type);
-}
-
-TEST(FormatVariadicTest, ValidReplacementSequence) {
-  // 1. Simple replacement - parameter index only
-  auto Replacements = formatv_object_base::parseFormatString("{0}");
-  ASSERT_EQ(1u, Replacements.size());
-  EXPECT_EQ(ReplacementType::Format, Replacements[0].Type);
-  EXPECT_EQ(0u, Replacements[0].Index);
-  EXPECT_EQ(0u, Replacements[0].Align);
-  EXPECT_EQ("", Replacements[0].Options);
-
-  Replacements = formatv_object_base::parseFormatString("{1}");
-  ASSERT_EQ(1u, Replacements.size());
-  EXPECT_EQ(ReplacementType::Format, Replacements[0].Type);
-  EXPECT_EQ(1u, Replacements[0].Index);
-  EXPECT_EQ(0u, Replacements[0].Align);
-  EXPECT_EQ(AlignStyle::Right, Replacements[0].Where);
-  EXPECT_EQ("", Replacements[0].Options);
-
-  // 2. Parameter index with right alignment
-  Replacements = formatv_object_base::parseFormatString("{0,3}");
-  ASSERT_EQ(1u, Replacements.size());
-  EXPECT_EQ(ReplacementType::Format, Replacements[0].Type);
-  EXPECT_EQ(0u, Replacements[0].Index);
-  EXPECT_EQ(3u, Replacements[0].Align);
-  EXPECT_EQ(AlignStyle::Right, Replacements[0].Where);
-  EXPECT_EQ("", Replacements[0].Options);
-
-  // 3. And left alignment
-  Replacements = formatv_object_base::parseFormatString("{0,-3}");
-  ASSERT_EQ(1u, Replacements.size());
-  EXPECT_EQ(ReplacementType::Format, Replacements[0].Type);
-  EXPECT_EQ(0u, Replacements[0].Index);
-  EXPECT_EQ(3u, Replacements[0].Align);
-  EXPECT_EQ(AlignStyle::Left, Replacements[0].Where);
-  EXPECT_EQ("", Replacements[0].Options);
-
-  // 4. And center alignment
-  Replacements = formatv_object_base::parseFormatString("{0,=3}");
-  ASSERT_EQ(1u, Replacements.size());
-  EXPECT_EQ(ReplacementType::Format, Replacements[0].Type);
-  EXPECT_EQ(0u, Replacements[0].Index);
-  EXPECT_EQ(3u, Replacements[0].Align);
-  EXPECT_EQ(AlignStyle::Center, Replacements[0].Where);
-  EXPECT_EQ("", Replacements[0].Options);
-
-  // 4. Parameter index with option string
-  Replacements = formatv_object_base::parseFormatString("{0:foo}");
-  ASSERT_EQ(1u, Replacements.size());
-  EXPECT_EQ(ReplacementType::Format, Replacements[0].Type);
-  EXPECT_EQ(0u, Replacements[0].Index);
-  EXPECT_EQ(0u, Replacements[0].Align);
-  EXPECT_EQ(AlignStyle::Right, Replacements[0].Where);
-  EXPECT_EQ("foo", Replacements[0].Options);
-
-  // 5. Parameter index with alignment before option string
-  Replacements = formatv_object_base::parseFormatString("{0,-3:foo}");
-  ASSERT_EQ(1u, Replacements.size());
-  EXPECT_EQ(ReplacementType::Format, Replacements[0].Type);
-  EXPECT_EQ(0u, Replacements[0].Index);
-  EXPECT_EQ(3u, Replacements[0].Align);
-  EXPECT_EQ(AlignStyle::Left, Replacements[0].Where);
-  EXPECT_EQ("foo", Replacements[0].Options);
-
-  // 7. Parameter indices, options, and alignment can all have whitespace.
-  Replacements = formatv_object_base::parseFormatString("{ 0, -3 : foo }");
-  ASSERT_EQ(1u, Replacements.size());
-  EXPECT_EQ(ReplacementType::Format, Replacements[0].Type);
-  EXPECT_EQ(0u, Replacements[0].Index);
-  EXPECT_EQ(3u, Replacements[0].Align);
-  EXPECT_EQ(AlignStyle::Left, Replacements[0].Where);
-  EXPECT_EQ("foo", Replacements[0].Options);
-
-  // 8. Everything after the first option specifier is part of the style, even
-  // if it contains another option specifier.
-  Replacements = formatv_object_base::parseFormatString("{0:0:1}");
-  ASSERT_EQ(1u, Replacements.size());
-  EXPECT_EQ("0:0:1", Replacements[0].Spec);
-  EXPECT_EQ(ReplacementType::Format, Replacements[0].Type);
-  EXPECT_EQ(0u, Replacements[0].Index);
-  EXPECT_EQ(0u, Replacements[0].Align);
-  EXPECT_EQ(AlignStyle::Right, Replacements[0].Where);
-  EXPECT_EQ("0:1", Replacements[0].Options);
-
-  // 9. Custom padding character
-  Replacements = formatv_object_base::parseFormatString("{0,p+4:foo}");
-  ASSERT_EQ(1u, Replacements.size());
-  EXPECT_EQ("0,p+4:foo", Replacements[0].Spec);
-  EXPECT_EQ(ReplacementType::Format, Replacements[0].Type);
-  EXPECT_EQ(0u, Replacements[0].Index);
-  EXPECT_EQ(4u, Replacements[0].Align);
-  EXPECT_EQ(AlignStyle::Right, Replacements[0].Where);
-  EXPECT_EQ('p', Replacements[0].Pad);
-  EXPECT_EQ("foo", Replacements[0].Options);
-
-  // Format string special characters are allowed as padding character
-  Replacements = formatv_object_base::parseFormatString("{0,-+4:foo}");
-  ASSERT_EQ(1u, Replacements.size());
-  EXPECT_EQ("0,-+4:foo", Replacements[0].Spec);
-  EXPECT_EQ(ReplacementType::Format, Replacements[0].Type);
-  EXPECT_EQ(0u, Replacements[0].Index);
-  EXPECT_EQ(4u, Replacements[0].Align);
-  EXPECT_EQ(AlignStyle::Right, Replacements[0].Where);
-  EXPECT_EQ('-', Replacements[0].Pad);
-  EXPECT_EQ("foo", Replacements[0].Options);
-
-  Replacements = formatv_object_base::parseFormatString("{0,+-4:foo}");
-  ASSERT_EQ(1u, Replacements.size());
-  EXPECT_EQ("0,+-4:foo", Replacements[0].Spec);
-  EXPECT_EQ(ReplacementType::Format, Replacements[0].Type);
-  EXPECT_EQ(0u, Replacements[0].Index);
-  EXPECT_EQ(4u, Replacements[0].Align);
-  EXPECT_EQ(AlignStyle::Left, Replacements[0].Where);
-  EXPECT_EQ('+', Replacements[0].Pad);
-  EXPECT_EQ("foo", Replacements[0].Options);
-
-  Replacements = formatv_object_base::parseFormatString("{0,==4:foo}");
-  ASSERT_EQ(1u, Replacements.size());
-  EXPECT_EQ("0,==4:foo", Replacements[0].Spec);
-  EXPECT_EQ(ReplacementType::Format, Replacements[0].Type);
-  EXPECT_EQ(0u, Replacements[0].Index);
-  EXPECT_EQ(4u, Replacements[0].Align);
-  EXPECT_EQ(AlignStyle::Center, Replacements[0].Where);
-  EXPECT_EQ('=', Replacements[0].Pad);
-  EXPECT_EQ("foo", Replacements[0].Options);
-
-  Replacements = formatv_object_base::parseFormatString("{0,:=4:foo}");
-  ASSERT_EQ(1u, Replacements.size());
-  EXPECT_EQ("0,:=4:foo", Replacements[0].Spec);
-  EXPECT_EQ(ReplacementType::Format, Replacements[0].Type);
-  EXPECT_EQ(0u, Replacements[0].Index);
-  EXPECT_EQ(4u, Replacements[0].Align);
-  EXPECT_EQ(AlignStyle::Center, Replacements[0].Where);
-  EXPECT_EQ(':', Replacements[0].Pad);
-  EXPECT_EQ("foo", Replacements[0].Options);
-}
-
-TEST(FormatVariadicTest, DefaultReplacementValues) {
-  // 2. If options string is missing, it defaults to empty.
-  auto Replacements = formatv_object_base::parseFormatString("{0,3}");
-  ASSERT_EQ(1u, Replacements.size());
-  EXPECT_EQ(ReplacementType::Format, Replacements[0].Type);
-  EXPECT_EQ(0u, Replacements[0].Index);
-  EXPECT_EQ(3u, Replacements[0].Align);
-  EXPECT_EQ("", Replacements[0].Options);
-
-  // Including if the colon is present but contains no text.
-  Replacements = formatv_object_base::parseFormatString("{0,3:}");
-  ASSERT_EQ(1u, Replacements.size());
-  EXPECT_EQ(ReplacementType::Format, Replacements[0].Type);
-  EXPECT_EQ(0u, Replacements[0].Index);
-  EXPECT_EQ(3u, Replacements[0].Align);
-  EXPECT_EQ("", Replacements[0].Options);
-
-  // 3. If alignment is missing, it defaults to 0, right, space
-  Replacements = formatv_object_base::parseFormatString("{0:foo}");
-  ASSERT_EQ(1u, Replacements.size());
-  EXPECT_EQ(ReplacementType::Format, Replacements[0].Type);
-  EXPECT_EQ(AlignStyle::Right, Replacements[0].Where);
-  EXPECT_EQ(' ', Replacements[0].Pad);
-  EXPECT_EQ(0u, Replacements[0].Index);
-  EXPECT_EQ(0u, Replacements[0].Align);
-  EXPECT_EQ("foo", Replacements[0].Options);
-}
-
-TEST(FormatVariadicTest, MultipleReplacements) {
-  auto Replacements =
-      formatv_object_base::parseFormatString("{0} {1:foo}-{2,-3:bar}");
-  ASSERT_EQ(5u, Replacements.size());
-  // {0}
-  EXPECT_EQ(ReplacementType::Format, Replacements[0].Type);
-  EXPECT_EQ(0u, Replacements[0].Index);
-  EXPECT_EQ(0u, Replacements[0].Align);
-  EXPECT_EQ(AlignStyle::Right, Replacements[0].Where);
-  EXPECT_EQ("", Replacements[0].Options);
-
-  // " "
-  EXPECT_EQ(ReplacementType::Literal, Replacements[1].Type);
-  EXPECT_EQ(" ", Replacements[1].Spec);
-
-  // {1:foo} - Options=foo
-  EXPECT_EQ(ReplacementType::Format, Replacements[2].Type);
-  EXPECT_EQ(1u, Replacements[2].Index);
-  EXPECT_EQ(0u, Replacements[2].Align);
-  EXPECT_EQ(AlignStyle::Right, Replacements[2].Where);
-  EXPECT_EQ("foo", Replacements[2].Options);
-
-  // "-"
-  EXPECT_EQ(ReplacementType::Literal, Replacements[3].Type);
-  EXPECT_EQ("-", Replacements[3].Spec);
-
-  // {2:bar,-3} - Options=bar, Align=-3
-  EXPECT_EQ(ReplacementType::Format, Replacements[4].Type);
-  EXPECT_EQ(2u, Replacements[4].Index);
-  EXPECT_EQ(3u, Replacements[4].Align);
-  EXPECT_EQ(AlignStyle::Left, Replacements[4].Where);
-  EXPECT_EQ("bar", Replacements[4].Options);
-}
-
-TEST(FormatVariadicTest, FormatNoReplacements) {
-  EXPECT_EQ("", formatv("").str());
-  EXPECT_EQ("Test", formatv("Test").str());
-}
-
-TEST(FormatVariadicTest, FormatBasicTypesOneReplacement) {
-  EXPECT_EQ("1", formatv("{0}", 1).str());
-  EXPECT_EQ("c", formatv("{0}", 'c').str());
-  EXPECT_EQ("-3", formatv("{0}", -3).str());
-  EXPECT_EQ("Test", formatv("{0}", "Test").str());
-  EXPECT_EQ("Test2", formatv("{0}", StringRef("Test2")).str());
-  EXPECT_EQ("Test3", formatv("{0}", std::string("Test3")).str());
-}
-
-TEST(FormatVariadicTest, IntegralHexFormatting) {
-  // 1. Trivial cases.  Make sure hex is not the default.
-  EXPECT_EQ("0", formatv("{0}", 0).str());
-  EXPECT_EQ("2748", formatv("{0}", 0xABC).str());
-  EXPECT_EQ("-2748", formatv("{0}", -0xABC).str());
-
-  // 3. various hex prefixes.
-  EXPECT_EQ("0xFF", formatv("{0:X}", 255).str());
-  EXPECT_EQ("0xFF", formatv("{0:X+}", 255).str());
-  EXPECT_EQ("0xff", formatv("{0:x}", 255).str());
-  EXPECT_EQ("0xff", formatv("{0:x+}", 255).str());
-  EXPECT_EQ("FF", formatv("{0:X-}", 255).str());
-  EXPECT_EQ("ff", formatv("{0:x-}", 255).str());
-
-  // 5. Precision pads left of the most significant digit but right of the
-  // prefix (if one exists).
-  EXPECT_EQ("0xFF", formatv("{0:X2}", 255).str());
-  EXPECT_EQ("0xFF", formatv("{0:X+2}", 255).str());
-  EXPECT_EQ("0x0ff", formatv("{0:x3}", 255).str());
-  EXPECT_EQ("0x0ff", formatv("{0:x+3}", 255).str());
-  EXPECT_EQ("00FF", formatv("{0:X-4}", 255).str());
-  EXPECT_EQ("00ff", formatv("{0:x-4}", 255).str());
-
-  // 6. Try some larger types.
-  EXPECT_EQ("0xDEADBEEFDEADBEEF",
-            formatv("{0:X16}", -2401053088876216593LL).str());
-  EXPECT_EQ("0xFEEBDAEDFEEBDAED",
-            formatv("{0:X16}", 0xFEEBDAEDFEEBDAEDULL).str());
-  EXPECT_EQ("0x00000000DEADBEEF", formatv("{0:X16}", 0xDEADBEEF).str());
-
-  // 7. Padding should take into account the prefix
-  EXPECT_EQ("0xff", formatv("{0,4:x}", 255).str());
-  EXPECT_EQ(" 0xff", formatv("{0,5:x+}", 255).str());
-  EXPECT_EQ("  FF", formatv("{0,4:X-}", 255).str());
-  EXPECT_EQ("   ff", formatv("{0,5:x-}", 255).str());
-
-  // 8. Including when it's been zero-padded
-  EXPECT_EQ("  0x0ff", formatv("{0,7:x3}", 255).str());
-  EXPECT_EQ(" 0x00ff", formatv("{0,7:x+4}", 255).str());
-  EXPECT_EQ("  000FF", formatv("{0,7:X-5}", 255).str());
-  EXPECT_EQ(" 0000ff", formatv("{0,7:x-6}", 255).str());
-
-  // 9. Precision with default format specifier should work too
-  EXPECT_EQ("    255", formatv("{0,7:3}", 255).str());
-  EXPECT_EQ("   0255", formatv("{0,7:4}", 255).str());
-  EXPECT_EQ("  00255", formatv("{0,7:5}", 255).str());
-  EXPECT_EQ(" 000255", formatv("{0,7:6}", 255).str());
-}
-
-TEST(FormatVariadicTest, PointerFormatting) {
-  // 1. Trivial cases.  Hex is default.  Default Precision is pointer width.
-  if (sizeof(void *) == 4) {
-    EXPECT_EQ("0x00000000", formatv("{0}", (void *)0).str());
-    EXPECT_EQ("0x00000ABC", formatv("{0}", (void *)0xABC).str());
-  } else {
-    EXPECT_EQ("0x0000000000000000", formatv("{0}", (void *)0).str());
-    EXPECT_EQ("0x0000000000000ABC", formatv("{0}", (void *)0xABC).str());
-  }
-
-  // 2. But we can reduce the precision explicitly.
-  EXPECT_EQ("0x0", formatv("{0:0}", (void *)0).str());
-  EXPECT_EQ("0xABC", formatv("{0:0}", (void *)0xABC).str());
-  EXPECT_EQ("0x0000", formatv("{0:4}", (void *)0).str());
-  EXPECT_EQ("0x0ABC", formatv("{0:4}", (void *)0xABC).str());
-
-  // 3. various hex prefixes.
-  EXPECT_EQ("0x0ABC", formatv("{0:X4}", (void *)0xABC).str());
-  EXPECT_EQ("0x0abc", formatv("{0:x4}", (void *)0xABC).str());
-  EXPECT_EQ("0ABC", formatv("{0:X-4}", (void *)0xABC).str());
-  EXPECT_EQ("0abc", formatv("{0:x-4}", (void *)0xABC).str());
-}
-
-TEST(FormatVariadicTest, IntegralNumberFormatting) {
-  // 1. Test comma grouping with default widths and precisions.
-  EXPECT_EQ("0", formatv("{0:N}", 0).str());
-  EXPECT_EQ("10", formatv("{0:N}", 10).str());
-  EXPECT_EQ("100", formatv("{0:N}", 100).str());
-  EXPECT_EQ("1,000", formatv("{0:N}", 1000).str());
-  EXPECT_EQ("1,234,567,890", formatv("{0:N}", 1234567890).str());
-  EXPECT_EQ("-10", formatv("{0:N}", -10).str());
-  EXPECT_EQ("-100", formatv("{0:N}", -100).str());
-  EXPECT_EQ("-1,000", formatv("{0:N}", -1000).str());
-  EXPECT_EQ("-1,234,567,890", formatv("{0:N}", -1234567890).str());
-
-  // 2. If there is no comma, width and precision pad to the same absolute
-  // size.
-  EXPECT_EQ(" 1", formatv("{0,2:N}", 1).str());
-
-  // 3. But if there is a comma or negative sign, width factors them in but
-  // precision doesn't.
-  EXPECT_EQ(" 1,000", formatv("{0,6:N}", 1000).str());
-  EXPECT_EQ(" -1,000", formatv("{0,7:N}", -1000).str());
-
-  // 4. Large widths all line up.
-  EXPECT_EQ("      1,000", formatv("{0,11:N}", 1000).str());
-  EXPECT_EQ("     -1,000", formatv("{0,11:N}", -1000).str());
-  EXPECT_EQ("   -100,000", formatv("{0,11:N}", -100000).str());
-}
-
-TEST(FormatVariadicTest, StringFormatting) {
-  const char FooArray[] = "FooArray";
-  const char *FooPtr = "FooPtr";
-  llvm::StringRef FooRef("FooRef");
-  constexpr StringLiteral FooLiteral("FooLiteral");
-  std::string FooString("FooString");
-  // 1. Test that we can print various types of strings.
-  EXPECT_EQ(FooArray, formatv("{0}", FooArray).str());
-  EXPECT_EQ(FooPtr, formatv("{0}", FooPtr).str());
-  EXPECT_EQ(FooRef, formatv("{0}", FooRef).str());
-  EXPECT_EQ(FooLiteral, formatv("{0}", FooLiteral).str());
-  EXPECT_EQ(FooString, formatv("{0}", FooString).str());
-
-  // 2. Test that the precision specifier prints the correct number of
-  // characters.
-  EXPECT_EQ("FooA", formatv("{0:4}", FooArray).str());
-  EXPECT_EQ("FooP", formatv("{0:4}", FooPtr).str());
-  EXPECT_EQ("FooR", formatv("{0:4}", FooRef).str());
-  EXPECT_EQ("FooS", formatv("{0:4}", FooString).str());
-
-  // 3. And that padding works.
-  EXPECT_EQ("  FooA", formatv("{0,6:4}", FooArray).str());
-  EXPECT_EQ("  FooP", formatv("{0,6:4}", FooPtr).str());
-  EXPECT_EQ("  FooR", formatv("{0,6:4}", FooRef).str());
-  EXPECT_EQ("  FooS", formatv("{0,6:4}", FooString).str());
-}
-
-TEST(FormatVariadicTest, CharFormatting) {
-  // 1. Not much to see here.  Just print a char with and without padding.
-  EXPECT_EQ("C", formatv("{0}", 'C').str());
-  EXPECT_EQ("  C", formatv("{0,3}", 'C').str());
-
-  // 2. char is really an integral type though, where the only difference is
-  // that the "default" is to print the ASCII.  So if a non-default presentation
-  // specifier exists, it should print as an integer.
-  EXPECT_EQ("37", formatv("{0:D}", (char)37).str());
-  EXPECT_EQ("  037", formatv("{0,5:D3}", (char)37).str());
-}
-
-TEST(FormatVariadicTest, BoolTest) {
-  // 1. Default style is lowercase text (same as 't')
-  EXPECT_EQ("true", formatv("{0}", true).str());
-  EXPECT_EQ("false", formatv("{0}", false).str());
-  EXPECT_EQ("true", formatv("{0:t}", true).str());
-  EXPECT_EQ("false", formatv("{0:t}", false).str());
-
-  // 2. T - uppercase text
-  EXPECT_EQ("TRUE", formatv("{0:T}", true).str());
-  EXPECT_EQ("FALSE", formatv("{0:T}", false).str());
-
-  // 3. D / d - integral
-  EXPECT_EQ("1", formatv("{0:D}", true).str());
-  EXPECT_EQ("0", formatv("{0:D}", false).str());
-  EXPECT_EQ("1", formatv("{0:d}", true).str());
-  EXPECT_EQ("0", formatv("{0:d}", false).str());
-
-  // 4. Y - uppercase yes/no
-  EXPECT_EQ("YES", formatv("{0:Y}", true).str());
-  EXPECT_EQ("NO", formatv("{0:Y}", false).str());
-
-  // 5. y - lowercase yes/no
-  EXPECT_EQ("yes", formatv("{0:y}", true).str());
-  EXPECT_EQ("no", formatv("{0:y}", false).str());
-}
-
-TEST(FormatVariadicTest, DoubleFormatting) {
-  // Test exponents, fixed point, and percent formatting.
-
-  // 1. Signed, unsigned, and zero exponent format.
-  EXPECT_EQ("0.000000E+00", formatv("{0:E}", 0.0).str());
-  EXPECT_EQ("-0.000000E+00", formatv("{0:E}", -0.0).str());
-  EXPECT_EQ("1.100000E+00", formatv("{0:E}", 1.1).str());
-  EXPECT_EQ("-1.100000E+00", formatv("{0:E}", -1.1).str());
-  EXPECT_EQ("1.234568E+03", formatv("{0:E}", 1234.5678).str());
-  EXPECT_EQ("-1.234568E+03", formatv("{0:E}", -1234.5678).str());
-  EXPECT_EQ("1.234568E-03", formatv("{0:E}", .0012345678).str());
-  EXPECT_EQ("-1.234568E-03", formatv("{0:E}", -.0012345678).str());
-
-  // 2. With padding and precision.
-  EXPECT_EQ("  0.000E+00", formatv("{0,11:E3}", 0.0).str());
-  EXPECT_EQ(" -1.100E+00", formatv("{0,11:E3}", -1.1).str());
-  EXPECT_EQ("  1.235E+03", formatv("{0,11:E3}", 1234.5678).str());
-  EXPECT_EQ(" -1.235E-03", formatv("{0,11:E3}", -.0012345678).str());
-
-  // 3. Signed, unsigned, and zero fixed point format.
-  EXPECT_EQ("0.00", formatv("{0:F}", 0.0).str());
-  EXPECT_EQ("-0.00", formatv("{0:F}", -0.0).str());
-  EXPECT_EQ("1.10", formatv("{0:F}", 1.1).str());
-  EXPECT_EQ("-1.10", formatv("{0:F}", -1.1).str());
-  EXPECT_EQ("1234.57", formatv("{0:F}", 1234.5678).str());
-  EXPECT_EQ("-1234.57", formatv("{0:F}", -1234.5678).str());
-  EXPECT_EQ("0.00", formatv("{0:F}", .0012345678).str());
-  EXPECT_EQ("-0.00", formatv("{0:F}", -.0012345678).str());
-
-  // 2. With padding and precision.
-  EXPECT_EQ("   0.000", formatv("{0,8:F3}", 0.0).str());
-  EXPECT_EQ("  -1.100", formatv("{0,8:F3}", -1.1).str());
-  EXPECT_EQ("1234.568", formatv("{0,8:F3}", 1234.5678).str());
-  EXPECT_EQ("  -0.001", formatv("{0,8:F3}", -.0012345678).str());
-}
-
-TEST(FormatVariadicTest, CustomPaddingCharacter) {
-  // 1. Padding with custom character
-  EXPECT_EQ("==123", formatv("{0,=+5}", 123).str());
-  EXPECT_EQ("=123=", formatv("{0,==5}", 123).str());
-  EXPECT_EQ("123==", formatv("{0,=-5}", 123).str());
-
-  // 2. Combined with zero padding
-  EXPECT_EQ("=00123=", formatv("{0,==7:5}", 123).str());
-}
-
-struct format_tuple {
-  const char *Fmt;
-  explicit format_tuple(const char *Fmt) : Fmt(Fmt) {}
-
-  template <typename... Ts> auto operator()(Ts &&... Values) const {
-    return formatv(Fmt, std::forward<Ts>(Values)...);
-  }
-};
-
-TEST(FormatVariadicTest, BigTest) {
-  using Tuple =
-      std::tuple<char, int, const char *, StringRef, std::string, double, float,
-                 void *, int, double, int64_t, uint64_t, double, uint8_t>;
-  Tuple Ts[] = {
-      Tuple('a', 1, "Str", StringRef(), std::string(), 3.14159, -.17532f,
-            (void *)nullptr, 123456, 6.02E23, -908234908423, 908234908422234,
-            std::numeric_limits<double>::quiet_NaN(), 0xAB),
-      Tuple('x', 0xDDB5B, "LongerStr", "StringRef", "std::string", -2.7,
-            .08215f, (void *)nullptr, 0, 6.62E-34, -908234908423,
-            908234908422234, std::numeric_limits<double>::infinity(), 0x0)};
-  // Test long string formatting with many edge cases combined.
-  const char *Intro =
-      "There are {{{0}} items in the tuple, and {{{1}} tuple(s) in the array.";
-  const char *Header =
-      "{0,6}|{1,8}|{2,=10}|{3,=10}|{4,=13}|{5,7}|{6,7}|{7,10}|{8,"
-      "-7}|{9,10}|{10,16}|{11,17}|{12,6}|{13,4}";
-  const char *Line =
-      "{0,6}|{1,8:X}|{2,=10}|{3,=10:5}|{4,=13}|{5,7:3}|{6,7:P2}|{7,"
-      "10:X8}|{8,-7:N}|{9,10:E4}|{10,16:N}|{11,17:D}|{12,6}|{13,"
-      "4:X}";
-
-  std::string S;
-  llvm::raw_string_ostream Stream(S);
-  Stream << formatv(Intro, std::tuple_size<Tuple>::value,
-                    llvm::array_lengthof(Ts))
-         << "\n";
-  Stream << formatv(Header, "Char", "HexInt", "Str", "Ref", "std::str",
-                    "double", "float", "pointer", "comma", "exp", "bigint",
-                    "bigint2", "limit", "byte")
-         << "\n";
-  for (auto &Item : Ts) {
-    Stream << llvm::apply_tuple(format_tuple(Line), Item) << "\n";
-  }
-  Stream.flush();
-  const char *Expected =
-      R"foo(There are {14} items in the tuple, and {2} tuple(s) in the array.
-  Char|  HexInt|   Str    |   Ref    |  std::str   | double|  float|   pointer|comma  |       exp|          bigint|          bigint2| limit|byte
-     a|     0x1|   Str    |          |             |  3.142|-17.53%|0x00000000|123,456|6.0200E+23|-908,234,908,423|  908234908422234|   nan|0xAB
-     x| 0xDDB5B|LongerStr |  Strin   | std::string | -2.700|  8.21%|0x00000000|0      |6.6200E-34|-908,234,908,423|  908234908422234|   INF| 0x0
-)foo";
-
-  EXPECT_EQ(Expected, S);
-}
-
-TEST(FormatVariadicTest, Range) {
-  std::vector<int> IntRange = {1, 1, 2, 3, 5, 8, 13};
-
-  // 1. Simple range with default separator and element style.
-  EXPECT_EQ("1, 1, 2, 3, 5, 8, 13",
-            formatv("{0}", make_range(IntRange.begin(), IntRange.end())).str());
-  EXPECT_EQ("1, 2, 3, 5, 8",
-            formatv("{0}", make_range(IntRange.begin() + 1, IntRange.end() - 1))
-                .str());
-
-  // 2. Non-default separator
-  EXPECT_EQ(
-      "1/1/2/3/5/8/13",
-      formatv("{0:$[/]}", make_range(IntRange.begin(), IntRange.end())).str());
-
-  // 3. Default separator, non-default element style.
-  EXPECT_EQ(
-      "0x1, 0x1, 0x2, 0x3, 0x5, 0x8, 0xd",
-      formatv("{0:@[x]}", make_range(IntRange.begin(), IntRange.end())).str());
-
-  // 4. Non-default separator and element style.
-  EXPECT_EQ(
-      "0x1 + 0x1 + 0x2 + 0x3 + 0x5 + 0x8 + 0xd",
-      formatv("{0:$[ + ]@[x]}", make_range(IntRange.begin(), IntRange.end()))
-          .str());
-
-  // 5. Element style and/or separator using alternate delimeters to allow using
-  // delimeter characters as part of the separator.
-  EXPECT_EQ(
-      "<0x1><0x1><0x2><0x3><0x5><0x8><0xd>",
-      formatv("<{0:$[><]@(x)}>", make_range(IntRange.begin(), IntRange.end()))
-          .str());
-  EXPECT_EQ(
-      "[0x1][0x1][0x2][0x3][0x5][0x8][0xd]",
-      formatv("[{0:$(][)@[x]}]", make_range(IntRange.begin(), IntRange.end()))
-          .str());
-  EXPECT_EQ(
-      "(0x1)(0x1)(0x2)(0x3)(0x5)(0x8)(0xd)",
-      formatv("({0:$<)(>@<x>})", make_range(IntRange.begin(), IntRange.end()))
-          .str());
-
-  // 5. Empty range.
-  EXPECT_EQ("", formatv("{0:$[+]@[x]}",
-                        make_range(IntRange.begin(), IntRange.begin()))
-                    .str());
-
-  // 6. Empty separator and style.
-  EXPECT_EQ("11235813",
-            formatv("{0:$[]@<>}", make_range(IntRange.begin(), IntRange.end()))
-                .str());
-}
-
-TEST(FormatVariadicTest, Adapter) {
-  class Negative : public FormatAdapter<int> {
-  public:
-    explicit Negative(int N) : FormatAdapter<int>(std::move(N)) {}
-    void format(raw_ostream &S, StringRef Options) override { S << -Item; }
-  };
-
-  EXPECT_EQ("-7", formatv("{0}", Negative(7)).str());
-
-  int N = 171;
-
-  EXPECT_EQ("  171  ",
-            formatv("{0}", fmt_align(N, AlignStyle::Center, 7)).str());
-  EXPECT_EQ("--171--",
-            formatv("{0}", fmt_align(N, AlignStyle::Center, 7, '-')).str());
-  EXPECT_EQ(" 171   ", formatv("{0}", fmt_pad(N, 1, 3)).str());
-  EXPECT_EQ("171171171171171", formatv("{0}", fmt_repeat(N, 5)).str());
-
-  EXPECT_EQ(" ABABABABAB   ",
-            formatv("{0:X-}", fmt_pad(fmt_repeat(N, 5), 1, 3)).str());
-  EXPECT_EQ("   AB    AB    AB    AB    AB     ",
-            formatv("{0,=34:X-}", fmt_repeat(fmt_pad(N, 1, 3), 5)).str());
-}
-
-TEST(FormatVariadicTest, MoveConstructor) {
-  auto fmt = formatv("{0} {1}", 1, 2);
-  auto fmt2 = std::move(fmt);
-  std::string S = std::string(fmt2);
-  EXPECT_EQ("1 2", S);
-}
-TEST(FormatVariadicTest, ImplicitConversions) {
-  std::string S = std::string(formatv("{0} {1}", 1, 2));
-  EXPECT_EQ("1 2", S);
-
-  SmallString<4> S2 = formatv("{0} {1}", 1, 2);
-  EXPECT_EQ("1 2", S2);
-}
-
-TEST(FormatVariadicTest, FormatAdapter) {
-  EXPECT_EQ("Format", formatv("{0}", Format(1)).str());
-
-  Format var(1);
-  EXPECT_EQ("Format", formatv("{0}", var).str());
-  EXPECT_EQ("Format", formatv("{0}", std::move(var)).str());
-
-  // Not supposed to compile
-  // const Format cvar(1);
-  // EXPECT_EQ("Format", formatv("{0}", cvar).str());
-}
-
-TEST(FormatVariadicTest, FormatFormatvObject) {
-  EXPECT_EQ("Format", formatv("F{0}t", formatv("o{0}a", "rm")).str());
-  EXPECT_EQ("[   ! ]", formatv("[{0,+5}]", formatv("{0,-2}", "!")).str());
-}
-
-namespace {
-struct Recorder {
-  int Copied = 0, Moved = 0;
-  Recorder() = default;
-  Recorder(const Recorder &Copy) : Copied(1 + Copy.Copied), Moved(Copy.Moved) {}
-  Recorder(const Recorder &&Move)
-      : Copied(Move.Copied), Moved(1 + Move.Moved) {}
-};
-} // namespace
-namespace llvm {
-template <> struct format_provider<Recorder> {
-  static void format(const Recorder &R, raw_ostream &OS, StringRef style) {
-    OS << R.Copied << "C " << R.Moved << "M";
-  }
-};
-} // namespace
-
-TEST(FormatVariadicTest, CopiesAndMoves) {
-  Recorder R;
-  EXPECT_EQ("0C 0M", formatv("{0}", R).str());
-  EXPECT_EQ("0C 3M", formatv("{0}", std::move(R)).str());
-  EXPECT_EQ("0C 3M", formatv("{0}", Recorder()).str());
-  EXPECT_EQ(0, R.Copied);
-  EXPECT_EQ(0, R.Moved);
-}
-
-namespace adl {
-struct X {};
-raw_ostream &operator<<(raw_ostream &OS, const X &) { return OS << "X"; }
-} // namespace adl
-TEST(FormatVariadicTest, FormatStreamable) {
-  adl::X X;
-  EXPECT_EQ("X", formatv("{0}", X).str());
-}
-
-TEST(FormatVariadicTest, FormatError) {
-  auto E1 = make_error<StringError>("X", inconvertibleErrorCode());
-  EXPECT_EQ("X", formatv("{0}", E1).str());
-  EXPECT_TRUE(E1.isA<StringError>()); // not consumed
-  EXPECT_EQ("X", formatv("{0}", fmt_consume(std::move(E1))).str());
-  EXPECT_FALSE(E1.isA<StringError>()); // consumed
-}
diff --git a/gnu/llvm/llvm/unittests/Support/GlobPatternTest.cpp b/gnu/llvm/llvm/unittests/Support/GlobPatternTest.cpp
deleted file mode 100644
index 7acd311b0bb..00000000000
--- a/gnu/llvm/llvm/unittests/Support/GlobPatternTest.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-//===- llvm/unittest/Support/GlobPatternTest.cpp --------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/GlobPattern.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-namespace {
-
-class GlobPatternTest : public ::testing::Test {};
-
-TEST_F(GlobPatternTest, Empty) {
-  Expected<GlobPattern> Pat1 = GlobPattern::create("");
-  EXPECT_TRUE((bool)Pat1);
-  EXPECT_TRUE(Pat1->match(""));
-  EXPECT_FALSE(Pat1->match("a"));
-}
-
-TEST_F(GlobPatternTest, Glob) {
-  Expected<GlobPattern> Pat1 = GlobPattern::create("ab*c*def");
-  EXPECT_TRUE((bool)Pat1);
-  EXPECT_TRUE(Pat1->match("abcdef"));
-  EXPECT_TRUE(Pat1->match("abxcxdef"));
-  EXPECT_FALSE(Pat1->match(""));
-  EXPECT_FALSE(Pat1->match("xabcdef"));
-  EXPECT_FALSE(Pat1->match("abcdefx"));
-}
-
-TEST_F(GlobPatternTest, Wildcard) {
-  Expected<GlobPattern> Pat1 = GlobPattern::create("a??c");
-  EXPECT_TRUE((bool)Pat1);
-  EXPECT_TRUE(Pat1->match("axxc"));
-  EXPECT_FALSE(Pat1->match("axxx"));
-  EXPECT_FALSE(Pat1->match(""));
-}
-
-TEST_F(GlobPatternTest, Escape) {
-  Expected<GlobPattern> Pat1 = GlobPattern::create("\\*");
-  EXPECT_TRUE((bool)Pat1);
-  EXPECT_TRUE(Pat1->match("*"));
-  EXPECT_FALSE(Pat1->match("\\*"));
-  EXPECT_FALSE(Pat1->match("a"));
-
-  Expected<GlobPattern> Pat2 = GlobPattern::create("a?\\?c");
-  EXPECT_TRUE((bool)Pat2);
-  EXPECT_TRUE(Pat2->match("ax?c"));
-  EXPECT_FALSE(Pat2->match("axxc"));
-  EXPECT_FALSE(Pat2->match(""));
-}
-
-TEST_F(GlobPatternTest, BasicCharacterClass) {
-  Expected<GlobPattern> Pat1 = GlobPattern::create("[abc-fy-z]");
-  EXPECT_TRUE((bool)Pat1);
-  EXPECT_TRUE(Pat1->match("a"));
-  EXPECT_TRUE(Pat1->match("b"));
-  EXPECT_TRUE(Pat1->match("c"));
-  EXPECT_TRUE(Pat1->match("d"));
-  EXPECT_TRUE(Pat1->match("e"));
-  EXPECT_TRUE(Pat1->match("f"));
-  EXPECT_TRUE(Pat1->match("y"));
-  EXPECT_TRUE(Pat1->match("z"));
-  EXPECT_FALSE(Pat1->match("g"));
-  EXPECT_FALSE(Pat1->match(""));
-}
-
-TEST_F(GlobPatternTest, NegatedCharacterClass) {
-  Expected<GlobPattern> Pat1 = GlobPattern::create("[^abc-fy-z]");
-  EXPECT_TRUE((bool)Pat1);
-  EXPECT_TRUE(Pat1->match("g"));
-  EXPECT_FALSE(Pat1->match("a"));
-  EXPECT_FALSE(Pat1->match("b"));
-  EXPECT_FALSE(Pat1->match("c"));
-  EXPECT_FALSE(Pat1->match("d"));
-  EXPECT_FALSE(Pat1->match("e"));
-  EXPECT_FALSE(Pat1->match("f"));
-  EXPECT_FALSE(Pat1->match("y"));
-  EXPECT_FALSE(Pat1->match("z"));
-  EXPECT_FALSE(Pat1->match(""));
-
-  Expected<GlobPattern> Pat2 = GlobPattern::create("[!abc-fy-z]");
-  EXPECT_TRUE((bool)Pat2);
-  EXPECT_TRUE(Pat2->match("g"));
-  EXPECT_FALSE(Pat2->match("a"));
-  EXPECT_FALSE(Pat2->match("b"));
-  EXPECT_FALSE(Pat2->match("c"));
-  EXPECT_FALSE(Pat2->match("d"));
-  EXPECT_FALSE(Pat2->match("e"));
-  EXPECT_FALSE(Pat2->match("f"));
-  EXPECT_FALSE(Pat2->match("y"));
-  EXPECT_FALSE(Pat2->match("z"));
-  EXPECT_FALSE(Pat2->match(""));
-}
-
-TEST_F(GlobPatternTest, BracketFrontOfCharacterClass) {
-  Expected<GlobPattern> Pat1 = GlobPattern::create("[]a]x");
-  EXPECT_TRUE((bool)Pat1);
-  EXPECT_TRUE(Pat1->match("]x"));
-  EXPECT_TRUE(Pat1->match("ax"));
-  EXPECT_FALSE(Pat1->match("a]x"));
-  EXPECT_FALSE(Pat1->match(""));
-}
-
-TEST_F(GlobPatternTest, SpecialCharsInCharacterClass) {
-  Expected<GlobPattern> Pat1 = GlobPattern::create("[*?^]");
-  EXPECT_TRUE((bool)Pat1);
-  EXPECT_TRUE(Pat1->match("*"));
-  EXPECT_TRUE(Pat1->match("?"));
-  EXPECT_TRUE(Pat1->match("^"));
-  EXPECT_FALSE(Pat1->match("*?^"));
-  EXPECT_FALSE(Pat1->match(""));
-}
-
-TEST_F(GlobPatternTest, Invalid) {
-  Expected<GlobPattern> Pat1 = GlobPattern::create("[");
-  EXPECT_FALSE((bool)Pat1);
-  handleAllErrors(Pat1.takeError(), [&](ErrorInfoBase &EIB) {});
-
-  Expected<GlobPattern> Pat2 = GlobPattern::create("[]");
-  EXPECT_FALSE((bool)Pat2);
-  handleAllErrors(Pat2.takeError(), [&](ErrorInfoBase &EIB) {});
-}
-
-TEST_F(GlobPatternTest, ExtSym) {
-  Expected<GlobPattern> Pat1 = GlobPattern::create("a*\xFF");
-  EXPECT_TRUE((bool)Pat1);
-  EXPECT_TRUE(Pat1->match("axxx\xFF"));
-  Expected<GlobPattern> Pat2 = GlobPattern::create("[\xFF-\xFF]");
-  EXPECT_TRUE((bool)Pat2);
-  EXPECT_TRUE(Pat2->match("\xFF"));
-}
-
-TEST_F(GlobPatternTest, IsTrivialMatchAll) {
-  Expected<GlobPattern> Pat1 = GlobPattern::create("*");
-  EXPECT_TRUE((bool)Pat1);
-  EXPECT_TRUE(Pat1->isTrivialMatchAll());
-
-  const char *NegativeCases[] = {"a*", "*a", "?*", "*?", "**", "\\*"};
-  for (auto *P : NegativeCases) {
-    Expected<GlobPattern> Pat2 = GlobPattern::create(P);
-    EXPECT_TRUE((bool)Pat2);
-    EXPECT_FALSE(Pat2->isTrivialMatchAll());
-  }
-}
-}
diff --git a/gnu/llvm/llvm/unittests/Support/Host.cpp b/gnu/llvm/llvm/unittests/Support/Host.cpp
deleted file mode 100644
index 0d6e36b0ae7..00000000000
--- a/gnu/llvm/llvm/unittests/Support/Host.cpp
+++ /dev/null
@@ -1,519 +0,0 @@
-//========- unittests/Support/Host.cpp - Host.cpp tests --------------========//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/Host.h"
-#include "llvm/Config/llvm-config.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/Triple.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Support/Program.h"
-#include "llvm/Support/Threading.h"
-
-#include "gtest/gtest.h"
-
-#define ASSERT_NO_ERROR(x)                                                     \
-  if (std::error_code ASSERT_NO_ERROR_ec = x) {                                \
-    SmallString<128> MessageStorage;                                           \
-    raw_svector_ostream Message(MessageStorage);                               \
-    Message << #x ": did not return errc::success.\n"                          \
-            << "error number: " << ASSERT_NO_ERROR_ec.value() << "\n"          \
-            << "error message: " << ASSERT_NO_ERROR_ec.message() << "\n";      \
-    GTEST_FATAL_FAILURE_(MessageStorage.c_str());                              \
-  } else {                                                                     \
-  }
-
-using namespace llvm;
-
-class HostTest : public testing::Test {
-  Triple Host;
-
-protected:
-  bool isSupportedArchAndOS() {
-    // Initially this is only testing detection of the number of
-    // physical cores, which is currently only supported/tested on
-    // some systems.
-    return (Host.isOSWindows() && llvm_is_multithreaded()) ||
-           Host.isOSDarwin() || (Host.isX86() && Host.isOSLinux()) ||
-           (Host.isPPC64() && Host.isOSLinux()) ||
-           (Host.isSystemZ() && (Host.isOSLinux() || Host.isOSzOS()));
-  }
-
-  HostTest() : Host(Triple::normalize(sys::getProcessTriple())) {}
-};
-
-TEST_F(HostTest, NumPhysicalCores) {
-  int Num = sys::getHostNumPhysicalCores();
-
-  if (isSupportedArchAndOS())
-    ASSERT_GT(Num, 0);
-  else
-    ASSERT_EQ(Num, -1);
-}
-
-TEST(getLinuxHostCPUName, ARM) {
-  StringRef CortexA9ProcCpuinfo = R"(
-processor       : 0
-model name      : ARMv7 Processor rev 10 (v7l)
-BogoMIPS        : 1393.66
-Features        : half thumb fastmult vfp edsp thumbee neon vfpv3 tls vfpd32
-CPU implementer : 0x41
-CPU architecture: 7
-CPU variant     : 0x2
-CPU part        : 0xc09
-CPU revision    : 10
-
-processor       : 1
-model name      : ARMv7 Processor rev 10 (v7l)
-BogoMIPS        : 1393.66
-Features        : half thumb fastmult vfp edsp thumbee neon vfpv3 tls vfpd32
-CPU implementer : 0x41
-CPU architecture: 7
-CPU variant     : 0x2
-CPU part        : 0xc09
-CPU revision    : 10
-
-Hardware        : Generic OMAP4 (Flattened Device Tree)
-Revision        : 0000
-Serial          : 0000000000000000
-)";
-
-  EXPECT_EQ(sys::detail::getHostCPUNameForARM(CortexA9ProcCpuinfo),
-            "cortex-a9");
-  EXPECT_EQ(sys::detail::getHostCPUNameForARM("CPU implementer : 0x41\n"
-                                              "CPU part        : 0xc0f"),
-            "cortex-a15");
-  // Verify that both CPU implementer and CPU part are checked:
-  EXPECT_EQ(sys::detail::getHostCPUNameForARM("CPU implementer : 0x40\n"
-                                              "CPU part        : 0xc0f"),
-            "generic");
-  EXPECT_EQ(sys::detail::getHostCPUNameForARM("CPU implementer : 0x51\n"
-                                              "CPU part        : 0x06f"),
-            "krait");
-}
-
-TEST(getLinuxHostCPUName, AArch64) {
-  EXPECT_EQ(sys::detail::getHostCPUNameForARM("CPU implementer : 0x41\n"
-                                              "CPU part        : 0xd03"),
-            "cortex-a53");
-
-  EXPECT_EQ(sys::detail::getHostCPUNameForARM("CPU implementer : 0x41\n"
-                                              "CPU part        : 0xd0c"),
-            "neoverse-n1");
-  // Verify that both CPU implementer and CPU part are checked:
-  EXPECT_EQ(sys::detail::getHostCPUNameForARM("CPU implementer : 0x40\n"
-                                              "CPU part        : 0xd03"),
-            "generic");
-  EXPECT_EQ(sys::detail::getHostCPUNameForARM("CPU implementer : 0x51\n"
-                                              "CPU part        : 0x201"),
-            "kryo");
-  EXPECT_EQ(sys::detail::getHostCPUNameForARM("CPU implementer : 0x51\n"
-                                              "CPU part        : 0x800"),
-            "cortex-a73");
-  EXPECT_EQ(sys::detail::getHostCPUNameForARM("CPU implementer : 0x51\n"
-                                              "CPU part        : 0x801"),
-            "cortex-a73");
-  EXPECT_EQ(sys::detail::getHostCPUNameForARM("CPU implementer : 0x51\n"
-                                              "CPU part        : 0xc00"),
-            "falkor");
-  EXPECT_EQ(sys::detail::getHostCPUNameForARM("CPU implementer : 0x51\n"
-                                              "CPU part        : 0xc01"),
-            "saphira");
-
-  // MSM8992/4 weirdness
-  StringRef MSM8992ProcCpuInfo = R"(
-Processor       : AArch64 Processor rev 3 (aarch64)
-processor       : 0
-processor       : 1
-processor       : 2
-processor       : 3
-processor       : 4
-processor       : 5
-Features        : fp asimd evtstrm aes pmull sha1 sha2 crc32
-CPU implementer : 0x41
-CPU architecture: 8
-CPU variant     : 0x0
-CPU part        : 0xd03
-CPU revision    : 3
-
-Hardware        : Qualcomm Technologies, Inc MSM8992
-)";
-
-  EXPECT_EQ(sys::detail::getHostCPUNameForARM(MSM8992ProcCpuInfo),
-            "cortex-a53");
-
-  // Exynos big.LITTLE weirdness
-  const std::string ExynosProcCpuInfo = R"(
-processor       : 0
-Features        : fp asimd evtstrm aes pmull sha1 sha2 crc32
-CPU implementer : 0x41
-CPU architecture: 8
-CPU variant     : 0x0
-CPU part        : 0xd05
-
-processor       : 1
-Features        : fp asimd evtstrm aes pmull sha1 sha2 crc32
-CPU implementer : 0x53
-CPU architecture: 8
-)";
-
-  // Verify default for Exynos.
-  EXPECT_EQ(sys::detail::getHostCPUNameForARM(ExynosProcCpuInfo +
-                                              "CPU variant     : 0xc\n"
-                                              "CPU part        : 0xafe"),
-            "exynos-m3");
-  // Verify Exynos M3.
-  EXPECT_EQ(sys::detail::getHostCPUNameForARM(ExynosProcCpuInfo +
-                                              "CPU variant     : 0x1\n"
-                                              "CPU part        : 0x002"),
-            "exynos-m3");
-  // Verify Exynos M4.
-  EXPECT_EQ(sys::detail::getHostCPUNameForARM(ExynosProcCpuInfo +
-                                              "CPU variant     : 0x1\n"
-                                              "CPU part        : 0x003"),
-            "exynos-m4");
-
-  const std::string ThunderX2T99ProcCpuInfo = R"(
-processor	: 0
-BogoMIPS	: 400.00
-Features	: fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics
-CPU implementer	: 0x43
-CPU architecture: 8
-CPU variant	: 0x1
-CPU part	: 0x0af
-)";
-
-  // Verify different versions of ThunderX2T99.
-  EXPECT_EQ(sys::detail::getHostCPUNameForARM(ThunderX2T99ProcCpuInfo +
-                                              "CPU implementer	: 0x42\n"
-                                              "CPU part	: 0x516"),
-            "thunderx2t99");
-
-  EXPECT_EQ(sys::detail::getHostCPUNameForARM(ThunderX2T99ProcCpuInfo +
-                                              "CPU implementer	: 0x42\n"
-                                              "CPU part	: 0x0516"),
-            "thunderx2t99");
-
-  EXPECT_EQ(sys::detail::getHostCPUNameForARM(ThunderX2T99ProcCpuInfo +
-                                              "CPU implementer	: 0x43\n"
-                                              "CPU part	: 0x516"),
-            "thunderx2t99");
-
-  EXPECT_EQ(sys::detail::getHostCPUNameForARM(ThunderX2T99ProcCpuInfo +
-                                              "CPU implementer	: 0x43\n"
-                                              "CPU part	: 0x0516"),
-            "thunderx2t99");
-
-  EXPECT_EQ(sys::detail::getHostCPUNameForARM(ThunderX2T99ProcCpuInfo +
-                                              "CPU implementer	: 0x42\n"
-                                              "CPU part	: 0xaf"),
-            "thunderx2t99");
-
-  EXPECT_EQ(sys::detail::getHostCPUNameForARM(ThunderX2T99ProcCpuInfo +
-                                              "CPU implementer	: 0x42\n"
-                                              "CPU part	: 0x0af"),
-            "thunderx2t99");
-
-  EXPECT_EQ(sys::detail::getHostCPUNameForARM(ThunderX2T99ProcCpuInfo +
-                                              "CPU implementer	: 0x43\n"
-                                              "CPU part	: 0xaf"),
-            "thunderx2t99");
-
-  EXPECT_EQ(sys::detail::getHostCPUNameForARM(ThunderX2T99ProcCpuInfo +
-                                              "CPU implementer	: 0x43\n"
-                                              "CPU part	: 0x0af"),
-            "thunderx2t99");
-
-  // Verify ThunderXT88.
-  const std::string ThunderXT88ProcCpuInfo = R"(
-processor	: 0
-BogoMIPS	: 200.00
-Features	: fp asimd evtstrm aes pmull sha1 sha2 crc32
-CPU implementer	: 0x43
-CPU architecture: 8
-CPU variant	: 0x1
-CPU part	: 0x0a1
-)";
-
-  EXPECT_EQ(sys::detail::getHostCPUNameForARM(ThunderXT88ProcCpuInfo +
-                                              "CPU implementer	: 0x43\n"
-                                              "CPU part	: 0x0a1"),
-            "thunderxt88");
-
-  EXPECT_EQ(sys::detail::getHostCPUNameForARM(ThunderXT88ProcCpuInfo +
-                                              "CPU implementer	: 0x43\n"
-                                              "CPU part	: 0xa1"),
-            "thunderxt88");
-
-  // Verify HiSilicon processors.
-  EXPECT_EQ(sys::detail::getHostCPUNameForARM("CPU implementer : 0x48\n"
-                                              "CPU part        : 0xd01"),
-            "tsv110");
-
-  // Verify A64FX.
-  const std::string A64FXProcCpuInfo = R"(
-processor       : 0
-BogoMIPS        : 200.00
-Features        : fp asimd evtstrm sha1 sha2 crc32 atomics fphp asimdhp cpuid asimdrdm fcma dcpop sve
-CPU implementer : 0x46
-CPU architecture: 8
-CPU variant     : 0x1
-CPU part        : 0x001
-)";
-
-  EXPECT_EQ(sys::detail::getHostCPUNameForARM(A64FXProcCpuInfo), "a64fx");
-
-  // Verify Nvidia Carmel.
-  const std::string CarmelProcCpuInfo = R"(
-processor       : 0
-model name      : ARMv8 Processor rev 0 (v8l)
-BogoMIPS        : 62.50
-Features        : fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics fphp asimdhp cpuid asimdrdm dcpop
-CPU implementer : 0x4e
-CPU architecture: 8
-CPU variant     : 0x0
-CPU part        : 0x004
-CPU revision    : 0
-)";
-
-  EXPECT_EQ(sys::detail::getHostCPUNameForARM(CarmelProcCpuInfo), "carmel");
-
-  // Snapdragon mixed implementer quirk
-  const std::string Snapdragon865ProcCPUInfo = R"(
-processor       : 0
-BogoMIPS        : 38.40
-Features        : fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics fphp asimdhp cpuid asimdrdm lrcpc dcpop asimddp
-CPU implementer : 0x51
-CPU architecture: 8
-CPU variant     : 0xd
-CPU part        : 0x805
-CPU revision    : 14
-processor       : 1
-processor       : 2
-processor       : 3
-processor       : 4
-processor       : 5
-processor       : 6
-BogoMIPS        : 38.40
-Features        : fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics fphp asimdhp cpuid asimdrdm lrcpc dcpop asimddp
-CPU implementer : 0x41
-CPU architecture: 8
-CPU variant     : 0x1
-CPU part        : 0xd0d
-CPU revision    : 0
-)";
-  EXPECT_EQ(sys::detail::getHostCPUNameForARM(Snapdragon865ProcCPUInfo), "cortex-a77");
-}
-
-TEST(getLinuxHostCPUName, s390x) {
-  SmallVector<std::string> ModelIDs(
-      {"3931", "8561", "3906", "2964", "2827", "2817", "2097", "2064"});
-  SmallVector<std::string> VectorSupport({"", "vx"});
-  SmallVector<StringRef> ExpectedCPUs;
-
-  // Model Id: 3931
-  ExpectedCPUs.push_back("zEC12");
-  ExpectedCPUs.push_back("arch14");
-
-  // Model Id: 8561
-  ExpectedCPUs.push_back("zEC12");
-  ExpectedCPUs.push_back("z15");
-
-  // Model Id: 3906
-  ExpectedCPUs.push_back("zEC12");
-  ExpectedCPUs.push_back("z14");
-
-  // Model Id: 2964
-  ExpectedCPUs.push_back("zEC12");
-  ExpectedCPUs.push_back("z13");
-
-  // Model Id: 2827
-  ExpectedCPUs.push_back("zEC12");
-  ExpectedCPUs.push_back("zEC12");
-
-  // Model Id: 2817
-  ExpectedCPUs.push_back("z196");
-  ExpectedCPUs.push_back("z196");
-
-  // Model Id: 2097
-  ExpectedCPUs.push_back("z10");
-  ExpectedCPUs.push_back("z10");
-
-  // Model Id: 2064
-  ExpectedCPUs.push_back("generic");
-  ExpectedCPUs.push_back("generic");
-
-  const std::string DummyBaseVectorInfo =
-      "features : esan3 zarch stfle msa ldisp eimm dfp edat etf3eh highgprs "
-      "te ";
-  const std::string DummyBaseMachineInfo =
-      "processor 0: version = FF,  identification = 059C88,  machine = ";
-
-  int CheckIndex = 0;
-  for (size_t I = 0; I < ModelIDs.size(); I++) {
-    for (size_t J = 0; J < VectorSupport.size(); J++) {
-      const std::string DummyCPUInfo = DummyBaseVectorInfo + VectorSupport[J] +
-                                       "\n" + DummyBaseMachineInfo +
-                                       ModelIDs[I];
-      EXPECT_EQ(sys::detail::getHostCPUNameForS390x(DummyCPUInfo),
-                ExpectedCPUs[CheckIndex++]);
-    }
-  }
-}
-
-#if defined(__APPLE__) || defined(_AIX)
-static bool runAndGetCommandOutput(
-    const char *ExePath, ArrayRef<llvm::StringRef> argv,
-    std::unique_ptr<char[]> &Buffer, off_t &Size) {
-  bool Success = false;
-  [ExePath, argv, &Buffer, &Size, &Success] {
-    using namespace llvm::sys;
-    SmallString<128> TestDirectory;
-    ASSERT_NO_ERROR(fs::createUniqueDirectory("host_test", TestDirectory));
-
-    SmallString<128> OutputFile(TestDirectory);
-    path::append(OutputFile, "out");
-    StringRef OutputPath = OutputFile.str();
-
-    const Optional<StringRef> Redirects[] = {
-        /*STDIN=*/None, /*STDOUT=*/OutputPath, /*STDERR=*/None};
-    int RetCode = ExecuteAndWait(ExePath, argv, /*env=*/llvm::None, Redirects);
-    ASSERT_EQ(0, RetCode);
-
-    int FD = 0;
-    ASSERT_NO_ERROR(fs::openFileForRead(OutputPath, FD));
-    Size = ::lseek(FD, 0, SEEK_END);
-    ASSERT_NE(-1, Size);
-    ::lseek(FD, 0, SEEK_SET);
-    Buffer = std::make_unique<char[]>(Size);
-    ASSERT_EQ(::read(FD, Buffer.get(), Size), Size);
-    ::close(FD);
-
-    ASSERT_NO_ERROR(fs::remove(OutputPath));
-    ASSERT_NO_ERROR(fs::remove(TestDirectory.str()));
-    Success = true;
-  }();
-  return Success;
-}
-
-TEST_F(HostTest, DummyRunAndGetCommandOutputUse) {
-  // Suppress defined-but-not-used warnings when the tests using the helper are
-  // disabled.
-  (void) runAndGetCommandOutput;
-}
-#endif
-
-#if defined(__APPLE__)
-TEST_F(HostTest, getMacOSHostVersion) {
-  using namespace llvm::sys;
-  llvm::Triple HostTriple(getProcessTriple());
-  if (!HostTriple.isMacOSX())
-    return;
-
-  const char *SwVersPath = "/usr/bin/sw_vers";
-  StringRef argv[] = {SwVersPath, "-productVersion"};
-  std::unique_ptr<char[]> Buffer;
-  off_t Size;
-  ASSERT_EQ(runAndGetCommandOutput(SwVersPath, argv, Buffer, Size), true);
-  StringRef SystemVersion(Buffer.get(), Size);
-
-  // Ensure that the two versions match.
-  unsigned SystemMajor, SystemMinor, SystemMicro;
-  ASSERT_EQ(llvm::Triple((Twine("x86_64-apple-macos") + SystemVersion))
-                .getMacOSXVersion(SystemMajor, SystemMinor, SystemMicro),
-            true);
-  unsigned HostMajor, HostMinor, HostMicro;
-  ASSERT_EQ(HostTriple.getMacOSXVersion(HostMajor, HostMinor, HostMicro), true);
-
-  if (SystemMajor > 10) {
-    // Don't compare the 'Minor' and 'Micro' versions, as they're always '0' for
-    // the 'Darwin' triples on 11.x.
-    ASSERT_EQ(SystemMajor, HostMajor);
-  } else {
-    // Don't compare the 'Micro' version, as it's always '0' for the 'Darwin'
-    // triples.
-    ASSERT_EQ(std::tie(SystemMajor, SystemMinor), std::tie(HostMajor, HostMinor));
-  }
-}
-#endif
-
-#if defined(_AIX)
-TEST_F(HostTest, AIXVersionDetect) {
-  using namespace llvm::sys;
-
-  llvm::Triple HostTriple(getProcessTriple());
-  ASSERT_EQ(HostTriple.getOS(), Triple::AIX);
-
-  llvm::Triple ConfiguredHostTriple(LLVM_HOST_TRIPLE);
-  ASSERT_EQ(ConfiguredHostTriple.getOS(), Triple::AIX);
-
-  const char *ExePath = "/usr/bin/oslevel";
-  StringRef argv[] = {ExePath};
-  std::unique_ptr<char[]> Buffer;
-  off_t Size;
-  ASSERT_EQ(runAndGetCommandOutput(ExePath, argv, Buffer, Size), true);
-  StringRef SystemVersion(Buffer.get(), Size);
-
-  unsigned SystemMajor, SystemMinor, SystemMicro;
-  llvm::Triple((Twine("powerpc-ibm-aix") + SystemVersion))
-      .getOSVersion(SystemMajor, SystemMinor, SystemMicro);
-
-  // Ensure that the host triple version (major) and release (minor) numbers,
-  // unless explicitly configured, match with those of the current system.
-  if (!ConfiguredHostTriple.getOSMajorVersion()) {
-    unsigned HostMajor, HostMinor, HostMicro;
-    HostTriple.getOSVersion(HostMajor, HostMinor, HostMicro);
-    ASSERT_EQ(std::tie(SystemMajor, SystemMinor),
-              std::tie(HostMajor, HostMinor));
-  }
-
-  llvm::Triple TargetTriple(getDefaultTargetTriple());
-  if (TargetTriple.getOS() != Triple::AIX)
-    return;
-
-  // Ensure that the target triple version (major) and release (minor) numbers
-  // match with those of the current system.
-  llvm::Triple ConfiguredTargetTriple(LLVM_DEFAULT_TARGET_TRIPLE);
-  if (ConfiguredTargetTriple.getOSMajorVersion())
-    return; // The version was configured explicitly; skip.
-
-  unsigned TargetMajor, TargetMinor, TargetMicro;
-  TargetTriple.getOSVersion(TargetMajor, TargetMinor, TargetMicro);
-  ASSERT_EQ(std::tie(SystemMajor, SystemMinor),
-            std::tie(TargetMajor, TargetMinor));
-}
-
-TEST_F(HostTest, AIXHostCPUDetect) {
-  // Return a value based on the current processor implementation mode.
-  const char *ExePath = "/usr/sbin/getsystype";
-  StringRef argv[] = {ExePath, "-i"};
-  std::unique_ptr<char[]> Buffer;
-  off_t Size;
-  ASSERT_EQ(runAndGetCommandOutput(ExePath, argv, Buffer, Size), true);
-  StringRef CPU(Buffer.get(), Size);
-  StringRef MCPU = StringSwitch<const char *>(CPU)
-                       .Case("POWER 4\n", "pwr4")
-                       .Case("POWER 5\n", "pwr5")
-                       .Case("POWER 6\n", "pwr6")
-                       .Case("POWER 7\n", "pwr7")
-                       .Case("POWER 8\n", "pwr8")
-                       .Case("POWER 9\n", "pwr9")
-                       .Case("POWER 10\n", "pwr10")
-                       .Default("unknown");
-
-  StringRef HostCPU = sys::getHostCPUName();
-
-  // Just do the comparison on the base implementation mode.
-  if (HostCPU == "970")
-    HostCPU = StringRef("pwr4");
-  else
-    HostCPU = HostCPU.rtrim('x');
-
-  EXPECT_EQ(HostCPU, MCPU);
-}
-#endif
diff --git a/gnu/llvm/llvm/unittests/Support/IndexedAccessorTest.cpp b/gnu/llvm/llvm/unittests/Support/IndexedAccessorTest.cpp
deleted file mode 100644
index 9981e91df10..00000000000
--- a/gnu/llvm/llvm/unittests/Support/IndexedAccessorTest.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-//===- IndexedAccessorTest.cpp - Indexed Accessor Tests -------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/STLExtras.h"
-#include "gmock/gmock.h"
-
-using namespace llvm;
-using namespace llvm::detail;
-
-namespace {
-/// Simple indexed accessor range that wraps an array.
-template <typename T>
-struct ArrayIndexedAccessorRange
-    : public indexed_accessor_range<ArrayIndexedAccessorRange<T>, T *, T> {
-  ArrayIndexedAccessorRange(T *data, ptrdiff_t start, ptrdiff_t numElements)
-      : indexed_accessor_range<ArrayIndexedAccessorRange<T>, T *, T>(
-            data, start, numElements) {}
-  using indexed_accessor_range<ArrayIndexedAccessorRange<T>, T *,
-                               T>::indexed_accessor_range;
-
-  /// See `llvm::indexed_accessor_range` for details.
-  static T &dereference(T *data, ptrdiff_t index) { return data[index]; }
-};
-} // end anonymous namespace
-
-template <typename T>
-static void compareData(ArrayIndexedAccessorRange<T> range,
-                        ArrayRef<T> referenceData) {
-  ASSERT_TRUE(referenceData.size() == range.size());
-  ASSERT_TRUE(std::equal(range.begin(), range.end(), referenceData.begin()));
-}
-
-namespace {
-TEST(AccessorRange, SliceTest) {
-  int rawData[] = {0, 1, 2, 3, 4};
-  ArrayRef<int> data = llvm::makeArrayRef(rawData);
-
-  ArrayIndexedAccessorRange<int> range(rawData, /*start=*/0, /*numElements=*/5);
-  compareData(range, data);
-  compareData(range.slice(2, 3), data.slice(2, 3));
-  compareData(range.slice(0, 5), data.slice(0, 5));
-}
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/Support/InstructionCostTest.cpp b/gnu/llvm/llvm/unittests/Support/InstructionCostTest.cpp
deleted file mode 100644
index e31bf34233a..00000000000
--- a/gnu/llvm/llvm/unittests/Support/InstructionCostTest.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-//===- InstructionCostTest.cpp - InstructionCost tests --------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/InstructionCost.h"
-#include "gtest/gtest.h"
-#include <limits>
-
-using namespace llvm;
-
-namespace {
-
-struct CostTest : public testing::Test {
-  CostTest() {}
-};
-
-} // namespace
-
-TEST_F(CostTest, DefaultCtor) {
-  InstructionCost DefaultCost;
-
-  ASSERT_TRUE(DefaultCost.isValid());
-  EXPECT_EQ(*(DefaultCost.getValue()), 0);
-}
-
-TEST_F(CostTest, Operators) {
-
-  InstructionCost VThree = 3;
-  InstructionCost VNegTwo = -2;
-  InstructionCost VSix = 6;
-  InstructionCost IThreeA = InstructionCost::getInvalid(3);
-  InstructionCost IThreeB = InstructionCost::getInvalid(3);
-  InstructionCost ITwo = InstructionCost::getInvalid(2);
-  InstructionCost TmpCost;
-
-  EXPECT_NE(VThree, VNegTwo);
-  EXPECT_GT(VThree, VNegTwo);
-  EXPECT_NE(VThree, IThreeA);
-  EXPECT_EQ(IThreeA, IThreeB);
-  EXPECT_GE(IThreeA, VNegTwo);
-  EXPECT_LT(VSix, IThreeA);
-  EXPECT_LT(VThree, ITwo);
-  EXPECT_GE(ITwo, VThree);
-  EXPECT_EQ(VSix - IThreeA, IThreeB);
-  EXPECT_EQ(VThree - VNegTwo, 5);
-  EXPECT_EQ(VThree * VNegTwo, -6);
-  EXPECT_EQ(VSix / VThree, 2);
-  EXPECT_NE(IThreeA, ITwo);
-  EXPECT_LT(ITwo, IThreeA);
-  EXPECT_GT(IThreeA, ITwo);
-
-  EXPECT_FALSE(IThreeA.isValid());
-  EXPECT_EQ(IThreeA.getState(), InstructionCost::Invalid);
-
-  TmpCost = VThree + IThreeA;
-  EXPECT_FALSE(TmpCost.isValid());
-
-  // Test increments, decrements
-  EXPECT_EQ(++VThree, 4);
-  EXPECT_EQ(VThree++, 4);
-  EXPECT_EQ(VThree, 5);
-  EXPECT_EQ(--VThree, 4);
-  EXPECT_EQ(VThree--, 4);
-  EXPECT_EQ(VThree, 3);
-
-  TmpCost = VThree * IThreeA;
-  EXPECT_FALSE(TmpCost.isValid());
-
-  // Test value extraction
-  EXPECT_EQ(*(VThree.getValue()), 3);
-  EXPECT_EQ(IThreeA.getValue(), None);
-
-  EXPECT_EQ(std::min(VThree, VNegTwo), -2);
-  EXPECT_EQ(std::max(VThree, VSix), 6);
-
-  // Test saturation
-  auto Max = InstructionCost::getMax();
-  auto Min = InstructionCost::getMin();
-  auto MinusOne = InstructionCost(-1);
-  auto MinusTwo = InstructionCost(-2);
-  auto One = InstructionCost(1);
-  auto Two = InstructionCost(2);
-  EXPECT_EQ(Max + One, Max);
-  EXPECT_EQ(Min + MinusOne, Min);
-  EXPECT_EQ(Min - One, Min);
-  EXPECT_EQ(Max - MinusOne, Max);
-  EXPECT_EQ(Max * Two, Max);
-  EXPECT_EQ(Min * Two, Min);
-  EXPECT_EQ(Max * MinusTwo, Min);
-  EXPECT_EQ(Min * MinusTwo, Max);
-}
diff --git a/gnu/llvm/llvm/unittests/Support/ItaniumManglingCanonicalizerTest.cpp b/gnu/llvm/llvm/unittests/Support/ItaniumManglingCanonicalizerTest.cpp
deleted file mode 100644
index b20cdcf340b..00000000000
--- a/gnu/llvm/llvm/unittests/Support/ItaniumManglingCanonicalizerTest.cpp
+++ /dev/null
@@ -1,389 +0,0 @@
-//===-------------- ItaniumManglingCanonicalizerTest.cpp ------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/ItaniumManglingCanonicalizer.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/StringRef.h"
-#include "gtest/gtest.h"
-
-#include <cstdlib>
-#include <map>
-#include <vector>
-
-using namespace llvm;
-
-namespace {
-
-using EquivalenceError = llvm::ItaniumManglingCanonicalizer::EquivalenceError;
-using FragmentKind = llvm::ItaniumManglingCanonicalizer::FragmentKind;
-
-struct Equivalence {
-  FragmentKind Kind;
-  llvm::StringRef First;
-  llvm::StringRef Second;
-};
-
-// A set of manglings that should all be considered equivalent.
-using EquivalenceClass = std::vector<llvm::StringRef>;
-
-struct Testcase {
-  // A set of equivalences to register.
-  std::vector<Equivalence> Equivalences;
-  // A set of distinct equivalence classes created by registering the
-  // equivalences.
-  std::vector<EquivalenceClass> Classes;
-};
-
-// A function that returns a set of test cases.
-static std::vector<Testcase> getTestcases() {
-  return {
-    // Three different manglings for std::string (old libstdc++, new libstdc++,
-    // libc++).
-    {
-      {
-        {FragmentKind::Type, "Ss",
-         "NSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"},
-        {FragmentKind::Type, "Ss",
-         "NSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE"},
-      },
-      {
-        {"_Z1fv"},
-        {"_Z1fSs",
-         "_Z1fNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-         "_Z1fNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE"},
-        {"_ZNKSs4sizeEv",
-         "_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE4sizeEv",
-         "_ZNKSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE4sizeEv"},
-      }
-    },
-
-    // Check that substitutions are properly handled.
-    {
-      {
-        // ::X <-> ::N::X<int>
-        {FragmentKind::Type, "1X", "N1N1XIiEE"},
-        // ::T<T<int, int>, T<int, int>> <-> T<int>
-        {FragmentKind::Type, "1TIS_IiiES0_E", "1TIiE"},
-        // A::B::foo <-> AB::foo
-        {FragmentKind::Name, "N1A1B3fooE", "N2AB3fooE"},
-      },
-      {
-        {"_Z1f1XPS_RS_", "_Z1fN1N1XIiEEPS1_RS1_"},
-        {"_ZN1A1B3fooE1TIS1_IiiES2_EPS3_RS3_", "_ZN2AB3fooE1TIiEPS1_RS1_"},
-      }
-    },
-
-    // Check that nested equivalences are properly handled.
-    {
-      {
-        // std::__1::char_traits == std::__cxx11::char_traits
-        // (Note that this is unused and should make no difference,
-        // but it should not cause us to fail to match up the cases
-        // below.)
-        {FragmentKind::Name,
-         "NSt3__111char_traitsE",
-         "NSt7__cxx1111char_traitsE"},
-        // std::__1::allocator == std::allocator
-        {FragmentKind::Name,
-         "NSt3__19allocatorE",
-         "Sa"}, // "Sa" is not strictly a <name> but we accept it as one.
-        // std::__1::vector == std::vector
-        {FragmentKind::Name,
-         "St6vector",
-         "NSt3__16vectorE"},
-        // std::__1::basic_string<
-        //   char
-        //   std::__1::char_traits<char>,
-        //   std::__1::allocator<char>> ==
-        // std::__cxx11::basic_string<
-        //   char,
-        //   std::char_traits<char>,
-        //   std::allocator<char>>
-        {FragmentKind::Type,
-         "NSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-         "NSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE"},
-        // X<A> <-> X<B>
-        {FragmentKind::Type, "1XI1AE", "1XI1BE"},
-        // X <-> Y
-        {FragmentKind::Name, "1X", "1Y"},
-      },
-      {
-        // f(std::string)
-        {"_Z1fNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-         "_Z1fNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE"},
-        // f(std::vector<int>)
-        {"_Z1fSt6vectorIiSaIiEE", "_Z1fNSt3__16vectorIiNS_9allocatorIiEEEE"},
-        // f(X<A>), f(X<B>), f(Y<A>), f(Y<B>)
-        {"_Z1f1XI1AE", "_Z1f1XI1BE", "_Z1f1YI1AE", "_Z1f1YI1BE"},
-        // f(X<C>), f(Y<C>)
-        {"_Z1f1XI1CE", "_Z1f1YI1CE"},
-      }
-    },
-
-    // Check namespace equivalences.
-    {
-      {
-        // std::__1 == std::__cxx11
-        {FragmentKind::Name, "St3__1", "St7__cxx11"},
-        // std::__1::allocator == std::allocator
-        {FragmentKind::Name, "NSt3__19allocatorE", "Sa"},
-        // std::vector == std::__1::vector
-        {FragmentKind::Name, "St6vector", "NSt3__16vectorE"},
-        // std::__cxx11::char_traits == std::char_traits
-        // (This indirectly means that std::__1::char_traits == std::char_traits,
-        // due to the std::__cxx11 == std::__1 equivalence, which is what we rely
-        // on below.)
-        {FragmentKind::Name, "NSt7__cxx1111char_traitsE", "St11char_traits"},
-      },
-      {
-        // f(std::foo)
-        {"_Z1fNSt7__cxx113fooE",
-         "_Z1fNSt3__13fooE"},
-        // f(std::string)
-        {"_Z1fNSt7__cxx1111char_traitsIcEE",
-         "_Z1fNSt3__111char_traitsIcEE",
-         "_Z1fSt11char_traitsIcE"},
-        // f(std::string)
-        {"_Z1fNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-         "_Z1fNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE"},
-        // f(std::vector<int>)
-        {"_Z1fSt6vectorIiSaIiEE", "_Z1fNSt3__16vectorIiNS_9allocatorIiEEEE"},
-      }
-    },
-
-    // Check namespace equivalences for namespace 'std'. We support using 'St'
-    // for this, despite it not technically being a <name>.
-    {
-      {
-        // std::__1 == std
-        {FragmentKind::Name, "St3__1", "St"},
-        // std::__1 == std::__cxx11
-        {FragmentKind::Name, "St3__1", "St7__cxx11"},
-        // FIXME: Should a 'std' equivalence also cover the predefined
-        // substitutions?
-        // std::__1::allocator == std::allocator
-        {FragmentKind::Name, "NSt3__19allocatorE", "Sa"},
-      },
-      {
-        {"_Z1fSt3foo", "_Z1fNSt3__13fooE", "_Z1fNSt7__cxx113fooE"},
-        {"_Z1fNSt3bar3bazE", "_Z1fNSt3__13bar3bazE"},
-        // f(std::string)
-        {"_Z1fNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-         "_Z1fNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE"},
-        // f(std::vector<int>)
-        {"_Z1fSt6vectorIiSaIiEE", "_Z1fNSt3__16vectorIiNS_9allocatorIiEEEE"},
-      }
-    },
-
-    // Check mutually-recursive equivalences.
-    {
-      {
-        {FragmentKind::Type, "1A", "1B"},
-        {FragmentKind::Type, "1A", "1C"},
-        {FragmentKind::Type, "1D", "1B"},
-        {FragmentKind::Type, "1C", "1E"},
-      },
-      {
-        {"_Z1f1A", "_Z1f1B", "_Z1f1C", "_Z1f1D", "_Z1f1E"},
-        {"_Z1f1F"},
-      }
-    },
-
-    // Check <encoding>s.
-    {
-      {
-        {FragmentKind::Encoding, "1fv", "1gv"},
-      },
-      {
-        // f(void) -> g(void)
-        {"_Z1fv", "_Z1gv"},
-        // static local 'n' in f(void) -> static local 'n' in g(void)
-        {"_ZZ1fvE1n", "_ZZ1gvE1n"},
-      }
-    },
-
-    // Corner case: the substitution can appear within its own expansion.
-    {
-      {
-        // X <-> Y<X>
-        {FragmentKind::Type, "1X", "1YI1XE"},
-        // A<B> <-> B
-        {FragmentKind::Type, "1AI1BE", "1B"},
-      },
-      {
-        // f(X) == f(Y<X>) == f(Y<Y<X>>) == f(Y<Y<Y<X>>>)
-        {"_Z1f1X", "_Z1f1YI1XE", "_Z1f1YIS_I1XEE", "_Z1f1YIS_IS_I1XEEE"},
-        // f(B) == f(A<B>) == f(A<A<B>>) == f(A<A<A<B>>>)
-        {"_Z1f1B", "_Z1f1AI1BE", "_Z1f1AIS_I1BEE", "_Z1f1AIS_IS_I1BEEE"},
-      }
-    },
-
-    // Redundant equivalences are accepted (and have no effect).
-    {
-      {
-        {FragmentKind::Name, "3std", "St"},
-        {FragmentKind::Name, "1X", "1Y"},
-        {FragmentKind::Name, "N1X1ZE", "N1Y1ZE"},
-      },
-      {}
-    },
-
-    // Check that ctor and dtor variants are considered distinct.
-    {
-      {},
-      {{"_ZN1XC1Ev"}, {"_ZN1XC2Ev"}, {"_ZN1XD1Ev"}, {"_ZN1XD2Ev"}}
-    },
-
-    // Ensure array types with and without bounds are handled properly.
-    {
-      {
-        {FragmentKind::Type, "A_i", "A1_f"},
-      },
-      {
-        {"_Z1fRA_i", "_Z1fRA_i", "_Z1fRA1_f"},
-        {"_Z1fRA1_i"}, {"_Z1fRA_f"},
-      }
-    },
-
-    // Unmangled names can be remapped as complete encodings.
-    {
-      {
-        {FragmentKind::Encoding, "3foo", "3bar"},
-      },
-      {
-        // foo == bar
-        {"foo", "bar"},
-        // void f<foo>() == void f<bar>()
-        {"_Z1fIL_Z3fooEEvv", "_Z1fIL_Z3barEEvv"},
-      }
-    },
-  };
-}
-
-// A function to get a set of test cases for forward template references.
-static std::vector<Testcase> getForwardTemplateReferenceTestcases() {
-  return {
-    // ForwardTemplateReference does not support canonicalization.
-    // FIXME: We should consider ways of fixing this, perhaps by eliminating
-    // the ForwardTemplateReference node with a tree transformation.
-    {
-      {
-        // X::operator T() <with T = A> == Y::operator T() <with T = A>
-        {FragmentKind::Encoding, "N1XcvT_I1AEEv", "N1YcvT_I1AEEv"},
-        // A == B
-        {FragmentKind::Name, "1A", "1B"},
-      },
-      {
-        // All combinations result in unique equivalence classes.
-        {"_ZN1XcvT_I1AEEv"},
-        {"_ZN1XcvT_I1BEEv"},
-        {"_ZN1YcvT_I1AEEv"},
-        {"_ZN1YcvT_I1BEEv"},
-        // Even giving the same string twice gives a new class.
-        {"_ZN1XcvT_I1AEEv"},
-      }
-    },
-  };
-}
-
-template<bool CanonicalizeFirst>
-static void testTestcases(ArrayRef<Testcase> Testcases) {
-  for (const auto &Testcase : Testcases) {
-    llvm::ItaniumManglingCanonicalizer Canonicalizer;
-    for (const auto &Equiv : Testcase.Equivalences) {
-      auto Result =
-          Canonicalizer.addEquivalence(Equiv.Kind, Equiv.First, Equiv.Second);
-      EXPECT_EQ(Result, EquivalenceError::Success)
-          << "couldn't add equivalence between " << Equiv.First << " and "
-          << Equiv.Second;
-    }
-
-    using CanonKey = llvm::ItaniumManglingCanonicalizer::Key;
-
-    std::map<const EquivalenceClass*, CanonKey> Keys;
-    if (CanonicalizeFirst)
-      for (const auto &Class : Testcase.Classes)
-        Keys.insert({&Class, Canonicalizer.canonicalize(*Class.begin())});
-
-    std::map<CanonKey, llvm::StringRef> Found;
-    for (const auto &Class : Testcase.Classes) {
-      CanonKey ClassKey = Keys[&Class];
-      for (llvm::StringRef Str : Class) {
-        // Force a copy to be made when calling lookup to test that it doesn't
-        // retain any part of the provided string.
-        CanonKey ThisKey = CanonicalizeFirst
-                               ? Canonicalizer.lookup(std::string(Str))
-                               : Canonicalizer.canonicalize(Str);
-        EXPECT_NE(ThisKey, CanonKey()) << "couldn't canonicalize " << Str;
-        if (ClassKey) {
-          EXPECT_EQ(ThisKey, ClassKey)
-              << Str << " not in the same class as " << *Class.begin();
-        } else {
-          ClassKey = ThisKey;
-        }
-      }
-      EXPECT_TRUE(Found.insert({ClassKey, *Class.begin()}).second)
-          << *Class.begin() << " is in the same class as " << Found[ClassKey];
-    }
-  }
-}
-
-TEST(ItaniumManglingCanonicalizerTest, TestCanonicalize) {
-  testTestcases<false>(getTestcases());
-}
-
-TEST(ItaniumManglingCanonicalizerTest, TestLookup) {
-  testTestcases<true>(getTestcases());
-}
-
-TEST(ItaniumManglingCanonicalizerTest, TestForwardTemplateReference) {
-  // lookup(...) after canonicalization (intentionally) returns different
-  // values for this testcase.
-  testTestcases<false>(getForwardTemplateReferenceTestcases());
-}
-
-
-TEST(ItaniumManglingCanonicalizerTest, TestInvalidManglings) {
-  llvm::ItaniumManglingCanonicalizer Canonicalizer;
-  EXPECT_EQ(Canonicalizer.addEquivalence(FragmentKind::Type, "", "1X"),
-            EquivalenceError::InvalidFirstMangling);
-  EXPECT_EQ(Canonicalizer.addEquivalence(FragmentKind::Type, "1X", "1ab"),
-            EquivalenceError::InvalidSecondMangling);
-  EXPECT_EQ(Canonicalizer.canonicalize("_Z3fooE"),
-            llvm::ItaniumManglingCanonicalizer::Key());
-  EXPECT_EQ(Canonicalizer.canonicalize("_Zfoo"),
-            llvm::ItaniumManglingCanonicalizer::Key());
-
-  // A reference to a template parameter ('T_' etc) cannot appear in a <name>,
-  // because we don't have template arguments to bind to it. (The arguments in
-  // an 'I ... E' construct in the <name> aren't registered as
-  // backreferenceable arguments in this sense, because they're not part of
-  // the template argument list of an <encoding>.
-  EXPECT_EQ(Canonicalizer.addEquivalence(FragmentKind::Name, "N1XcvT_I1AEE",
-                                         "1f"),
-            EquivalenceError::InvalidFirstMangling);
-}
-
-TEST(ItaniumManglingCanonicalizerTest, TestBadEquivalenceOrder) {
-  llvm::ItaniumManglingCanonicalizer Canonicalizer;
-  EXPECT_EQ(Canonicalizer.addEquivalence(FragmentKind::Type, "N1P1XE", "N1Q1XE"),
-            EquivalenceError::Success);
-  EXPECT_EQ(Canonicalizer.addEquivalence(FragmentKind::Type, "1P", "1Q"),
-            EquivalenceError::ManglingAlreadyUsed);
-
-  EXPECT_EQ(Canonicalizer.addEquivalence(FragmentKind::Type, "N1C1XE", "N1A1YE"),
-            EquivalenceError::Success);
-  EXPECT_EQ(Canonicalizer.addEquivalence(FragmentKind::Type, "1A", "1B"),
-            EquivalenceError::Success);
-  EXPECT_EQ(Canonicalizer.addEquivalence(FragmentKind::Type, "1C", "1D"),
-            EquivalenceError::Success);
-  EXPECT_EQ(Canonicalizer.addEquivalence(FragmentKind::Type, "1B", "1D"),
-            EquivalenceError::ManglingAlreadyUsed);
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/Support/JSONTest.cpp b/gnu/llvm/llvm/unittests/Support/JSONTest.cpp
deleted file mode 100644
index ed9a72d36b0..00000000000
--- a/gnu/llvm/llvm/unittests/Support/JSONTest.cpp
+++ /dev/null
@@ -1,549 +0,0 @@
-//===-- JSONTest.cpp - JSON unit tests --------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/JSON.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/Testing/Support/Error.h"
-
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-namespace json {
-
-namespace {
-
-std::string s(const Value &E) { return llvm::formatv("{0}", E).str(); }
-std::string sp(const Value &E) { return llvm::formatv("{0:2}", E).str(); }
-
-TEST(JSONTest, Types) {
-  EXPECT_EQ("true", s(true));
-  EXPECT_EQ("null", s(nullptr));
-  EXPECT_EQ("2.5", s(2.5));
-  EXPECT_EQ(R"("foo")", s("foo"));
-  EXPECT_EQ("[1,2,3]", s({1, 2, 3}));
-  EXPECT_EQ(R"({"x":10,"y":20})", s(Object{{"x", 10}, {"y", 20}}));
-
-#ifdef NDEBUG
-  EXPECT_EQ(R"("��")", s("\xC0\x80"));
-  EXPECT_EQ(R"({"��":0})", s(Object{{"\xC0\x80", 0}}));
-#else
-  EXPECT_DEATH(s("\xC0\x80"), "Invalid UTF-8");
-  EXPECT_DEATH(s(Object{{"\xC0\x80", 0}}), "Invalid UTF-8");
-#endif
-}
-
-TEST(JSONTest, Constructors) {
-  // Lots of edge cases around empty and singleton init lists.
-  EXPECT_EQ("[[[3]]]", s({{{3}}}));
-  EXPECT_EQ("[[[]]]", s({{{}}}));
-  EXPECT_EQ("[[{}]]", s({{Object{}}}));
-  EXPECT_EQ(R"({"A":{"B":{}}})", s(Object{{"A", Object{{"B", Object{}}}}}));
-  EXPECT_EQ(R"({"A":{"B":{"X":"Y"}}})",
-            s(Object{{"A", Object{{"B", Object{{"X", "Y"}}}}}}));
-  EXPECT_EQ("null", s(llvm::Optional<double>()));
-  EXPECT_EQ("2.5", s(llvm::Optional<double>(2.5)));
-  EXPECT_EQ("[[2.5,null]]", s(std::vector<std::vector<llvm::Optional<double>>>{
-                                 {2.5, llvm::None}}));
-}
-
-TEST(JSONTest, StringOwnership) {
-  char X[] = "Hello";
-  Value Alias = static_cast<const char *>(X);
-  X[1] = 'a';
-  EXPECT_EQ(R"("Hallo")", s(Alias));
-
-  std::string Y = "Hello";
-  Value Copy = Y;
-  Y[1] = 'a';
-  EXPECT_EQ(R"("Hello")", s(Copy));
-}
-
-TEST(JSONTest, CanonicalOutput) {
-  // Objects are sorted (but arrays aren't)!
-  EXPECT_EQ(R"({"a":1,"b":2,"c":3})", s(Object{{"a", 1}, {"c", 3}, {"b", 2}}));
-  EXPECT_EQ(R"(["a","c","b"])", s({"a", "c", "b"}));
-  EXPECT_EQ("3", s(3.0));
-}
-
-TEST(JSONTest, Escaping) {
-  std::string Test = {
-      0,                    // Strings may contain nulls.
-      '\b',   '\f',         // Have mnemonics, but we escape numerically.
-      '\r',   '\n',   '\t', // Escaped with mnemonics.
-      'S',    '\"',   '\\', // Printable ASCII characters.
-      '\x7f',               // Delete is not escaped.
-      '\xce', '\x94',       // Non-ASCII UTF-8 is not escaped.
-  };
-
-  std::string TestString = R"("\u0000\u0008\u000c\r\n\tS\"\\)"
-                           "\x7f\xCE\x94\"";
-
-  EXPECT_EQ(TestString, s(Test));
-
-  EXPECT_EQ(R"({"object keys are\nescaped":true})",
-            s(Object{{"object keys are\nescaped", true}}));
-}
-
-TEST(JSONTest, PrettyPrinting) {
-  const char Str[] = R"({
-  "empty_array": [],
-  "empty_object": {},
-  "full_array": [
-    1,
-    null
-  ],
-  "full_object": {
-    "nested_array": [
-      {
-        "property": "value"
-      }
-    ]
-  }
-})";
-
-  EXPECT_EQ(Str, sp(Object{
-                     {"empty_object", Object{}},
-                     {"empty_array", {}},
-                     {"full_array", {1, nullptr}},
-                     {"full_object",
-                      Object{
-                          {"nested_array",
-                           {Object{
-                               {"property", "value"},
-                           }}},
-                      }},
-                 }));
-}
-
-TEST(JSONTest, Array) {
-  Array A{1, 2};
-  A.emplace_back(3);
-  A.emplace(++A.begin(), 0);
-  A.push_back(4);
-  A.insert(++++A.begin(), 99);
-
-  EXPECT_EQ(A.size(), 6u);
-  EXPECT_EQ(R"([1,0,99,2,3,4])", s(std::move(A)));
-}
-
-TEST(JSONTest, Object) {
-  Object O{{"a", 1}, {"b", 2}, {"c", 3}};
-  EXPECT_TRUE(O.try_emplace("d", 4).second);
-  EXPECT_FALSE(O.try_emplace("a", 4).second);
-
-  auto D = O.find("d");
-  EXPECT_FALSE(D == O.end());
-  auto E = O.find("e");
-  EXPECT_TRUE(E == O.end());
-
-  O.erase("b");
-  O.erase(D);
-  EXPECT_EQ(O.size(), 2u);
-  EXPECT_EQ(R"({"a":1,"c":3})", s(std::move(O)));
-}
-
-TEST(JSONTest, Parse) {
-  auto Compare = [](llvm::StringRef S, Value Expected) {
-    if (auto E = parse(S)) {
-      // Compare both string forms and with operator==, in case we have bugs.
-      EXPECT_EQ(*E, Expected);
-      EXPECT_EQ(sp(*E), sp(Expected));
-    } else {
-      handleAllErrors(E.takeError(), [S](const llvm::ErrorInfoBase &E) {
-        FAIL() << "Failed to parse JSON >>> " << S << " <<<: " << E.message();
-      });
-    }
-  };
-
-  Compare(R"(true)", true);
-  Compare(R"(false)", false);
-  Compare(R"(null)", nullptr);
-
-  Compare(R"(42)", 42);
-  Compare(R"(2.5)", 2.5);
-  Compare(R"(2e50)", 2e50);
-  Compare(R"(1.2e3456789)", std::numeric_limits<double>::infinity());
-
-  Compare(R"("foo")", "foo");
-  Compare(R"("\"\\\b\f\n\r\t")", "\"\\\b\f\n\r\t");
-  Compare(R"("\u0000")", llvm::StringRef("\0", 1));
-  Compare("\"\x7f\"", "\x7f");
-  Compare(R"("\ud801\udc37")", u8"\U00010437"); // UTF16 surrogate pair escape.
-  Compare("\"\xE2\x82\xAC\xF0\x9D\x84\x9E\"", u8"\u20ac\U0001d11e"); // UTF8
-  Compare(
-      R"("LoneLeading=\ud801, LoneTrailing=\udc01, LeadingLeadingTrailing=\ud801\ud801\udc37")",
-      u8"LoneLeading=\ufffd, LoneTrailing=\ufffd, "
-      u8"LeadingLeadingTrailing=\ufffd\U00010437"); // Invalid unicode.
-
-  Compare(R"({"":0,"":0})", Object{{"", 0}});
-  Compare(R"({"obj":{},"arr":[]})", Object{{"obj", Object{}}, {"arr", {}}});
-  Compare(R"({"\n":{"\u0000":[[[[]]]]}})",
-          Object{{"\n", Object{
-                            {llvm::StringRef("\0", 1), {{{{}}}}},
-                        }}});
-  Compare("\r[\n\t] ", {});
-}
-
-TEST(JSONTest, ParseErrors) {
-  auto ExpectErr = [](llvm::StringRef Msg, llvm::StringRef S) {
-    if (auto E = parse(S)) {
-      // Compare both string forms and with operator==, in case we have bugs.
-      FAIL() << "Parsed JSON >>> " << S << " <<< but wanted error: " << Msg;
-    } else {
-      handleAllErrors(E.takeError(), [S, Msg](const llvm::ErrorInfoBase &E) {
-        EXPECT_THAT(E.message(), testing::HasSubstr(std::string(Msg))) << S;
-      });
-    }
-  };
-  ExpectErr("Unexpected EOF", "");
-  ExpectErr("Unexpected EOF", "[");
-  ExpectErr("Text after end of document", "[][]");
-  ExpectErr("Invalid JSON value (false?)", "fuzzy");
-  ExpectErr("Expected , or ]", "[2?]");
-  ExpectErr("Expected object key", "{a:2}");
-  ExpectErr("Expected : after object key", R"({"a",2})");
-  ExpectErr("Expected , or } after object property", R"({"a":2 "b":3})");
-  ExpectErr("Invalid JSON value", R"([&%!])");
-  ExpectErr("Invalid JSON value (number?)", "1e1.0");
-  ExpectErr("Unterminated string", R"("abc\"def)");
-  ExpectErr("Control character in string", "\"abc\ndef\"");
-  ExpectErr("Invalid escape sequence", R"("\030")");
-  ExpectErr("Invalid \\u escape sequence", R"("\usuck")");
-  ExpectErr("[3:3, byte=19]", R"({
-  "valid": 1,
-  invalid: 2
-})");
-  ExpectErr("Invalid UTF-8 sequence", "\"\xC0\x80\""); // WTF-8 null
-}
-
-// Direct tests of isUTF8 and fixUTF8. Internal uses are also tested elsewhere.
-TEST(JSONTest, UTF8) {
-  for (const char *Valid : {
-           "this is ASCII text",
-           "thïs tëxt häs BMP chäräctërs",
-           "𐌶𐌰L𐌾𐍈 C𐍈𐌼𐌴𐍃",
-       }) {
-    EXPECT_TRUE(isUTF8(Valid)) << Valid;
-    EXPECT_EQ(fixUTF8(Valid), Valid);
-  }
-  for (auto Invalid : std::vector<std::pair<const char *, const char *>>{
-           {"lone trailing \x81\x82 bytes", "lone trailing �� bytes"},
-           {"missing trailing \xD0 bytes", "missing trailing � bytes"},
-           {"truncated character \xD0", "truncated character �"},
-           {"not \xC1\x80 the \xE0\x9f\xBF shortest \xF0\x83\x83\x83 encoding",
-            "not �� the ��� shortest ���� encoding"},
-           {"too \xF9\x80\x80\x80\x80 long", "too ����� long"},
-           {"surrogate \xED\xA0\x80 invalid \xF4\x90\x80\x80",
-            "surrogate ��� invalid ����"}}) {
-    EXPECT_FALSE(isUTF8(Invalid.first)) << Invalid.first;
-    EXPECT_EQ(fixUTF8(Invalid.first), Invalid.second);
-  }
-}
-
-TEST(JSONTest, Inspection) {
-  llvm::Expected<Value> Doc = parse(R"(
-    {
-      "null": null,
-      "boolean": false,
-      "number": 2.78,
-      "string": "json",
-      "array": [null, true, 3.14, "hello", [1,2,3], {"time": "arrow"}],
-      "object": {"fruit": "banana"}
-    }
-  )");
-  EXPECT_TRUE(!!Doc);
-
-  Object *O = Doc->getAsObject();
-  ASSERT_TRUE(O);
-
-  EXPECT_FALSE(O->getNull("missing"));
-  EXPECT_FALSE(O->getNull("boolean"));
-  EXPECT_TRUE(O->getNull("null"));
-
-  EXPECT_EQ(O->getNumber("number"), llvm::Optional<double>(2.78));
-  EXPECT_FALSE(O->getInteger("number"));
-  EXPECT_EQ(O->getString("string"), llvm::Optional<llvm::StringRef>("json"));
-  ASSERT_FALSE(O->getObject("missing"));
-  ASSERT_FALSE(O->getObject("array"));
-  ASSERT_TRUE(O->getObject("object"));
-  EXPECT_EQ(*O->getObject("object"), (Object{{"fruit", "banana"}}));
-
-  Array *A = O->getArray("array");
-  ASSERT_TRUE(A);
-  EXPECT_EQ((*A)[1].getAsBoolean(), llvm::Optional<bool>(true));
-  ASSERT_TRUE((*A)[4].getAsArray());
-  EXPECT_EQ(*(*A)[4].getAsArray(), (Array{1, 2, 3}));
-  EXPECT_EQ((*(*A)[4].getAsArray())[1].getAsInteger(),
-            llvm::Optional<int64_t>(2));
-  int I = 0;
-  for (Value &E : *A) {
-    if (I++ == 5) {
-      ASSERT_TRUE(E.getAsObject());
-      EXPECT_EQ(E.getAsObject()->getString("time"),
-                llvm::Optional<llvm::StringRef>("arrow"));
-    } else
-      EXPECT_FALSE(E.getAsObject());
-  }
-}
-
-// Verify special integer handling - we try to preserve exact int64 values.
-TEST(JSONTest, Integers) {
-  struct {
-    const char *Desc;
-    Value Val;
-    const char *Str;
-    llvm::Optional<int64_t> AsInt;
-    llvm::Optional<double> AsNumber;
-  } TestCases[] = {
-      {
-          "Non-integer. Stored as double, not convertible.",
-          double{1.5},
-          "1.5",
-          llvm::None,
-          1.5,
-      },
-
-      {
-          "Integer, not exact double. Stored as int64, convertible.",
-          int64_t{0x4000000000000001},
-          "4611686018427387905",
-          int64_t{0x4000000000000001},
-          double{0x4000000000000000},
-      },
-
-      {
-          "Negative integer, not exact double. Stored as int64, convertible.",
-          int64_t{-0x4000000000000001},
-          "-4611686018427387905",
-          int64_t{-0x4000000000000001},
-          double{-0x4000000000000000},
-      },
-
-      // PR46470,
-      // https://developercommunity.visualstudio.com/content/problem/1093399/incorrect-result-when-printing-6917529027641081856.html
-#if !defined(_MSC_VER) || _MSC_VER < 1926
-      {
-          "Dynamically exact integer. Stored as double, convertible.",
-          double{0x6000000000000000},
-          "6.9175290276410819e+18",
-          int64_t{0x6000000000000000},
-          double{0x6000000000000000},
-      },
-#endif
-
-      {
-          "Dynamically integer, >64 bits. Stored as double, not convertible.",
-          1.5 * double{0x8000000000000000},
-          "1.3835058055282164e+19",
-          llvm::None,
-          1.5 * double{0x8000000000000000},
-      },
-  };
-  for (const auto &T : TestCases) {
-    EXPECT_EQ(T.Str, s(T.Val)) << T.Desc;
-    llvm::Expected<Value> Doc = parse(T.Str);
-    EXPECT_TRUE(!!Doc) << T.Desc;
-    EXPECT_EQ(Doc->getAsInteger(), T.AsInt) << T.Desc;
-    EXPECT_EQ(Doc->getAsNumber(), T.AsNumber) << T.Desc;
-    EXPECT_EQ(T.Val, *Doc) << T.Desc;
-    EXPECT_EQ(T.Str, s(*Doc)) << T.Desc;
-  }
-}
-
-// Sample struct with typical JSON-mapping rules.
-struct CustomStruct {
-  CustomStruct() : B(false) {}
-  CustomStruct(std::string S, llvm::Optional<int> I, bool B)
-      : S(S), I(I), B(B) {}
-  std::string S;
-  llvm::Optional<int> I;
-  bool B;
-};
-inline bool operator==(const CustomStruct &L, const CustomStruct &R) {
-  return L.S == R.S && L.I == R.I && L.B == R.B;
-}
-inline llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
-                                     const CustomStruct &S) {
-  return OS << "(" << S.S << ", " << (S.I ? std::to_string(*S.I) : "None")
-            << ", " << S.B << ")";
-}
-bool fromJSON(const Value &E, CustomStruct &R, Path P) {
-  ObjectMapper O(E, P);
-  return O && O.map("str", R.S) && O.map("int", R.I) &&
-         O.mapOptional("bool", R.B);
-}
-
-static std::string errorContext(const Value &V, const Path::Root &R) {
-  std::string Context;
-  llvm::raw_string_ostream OS(Context);
-  R.printErrorContext(V, OS);
-  return OS.str();
-}
-
-TEST(JSONTest, Deserialize) {
-  std::map<std::string, std::vector<CustomStruct>> R;
-  CustomStruct ExpectedStruct = {"foo", 42, true};
-  std::map<std::string, std::vector<CustomStruct>> Expected;
-  Value J = Object{{"foo", Array{
-                               Object{
-                                   {"str", "foo"},
-                                   {"int", 42},
-                                   {"bool", true},
-                                   {"unknown", "ignored"},
-                               },
-                               Object{{"str", "bar"}},
-                           }}};
-  Expected["foo"] = {
-      CustomStruct("foo", 42, true),
-      CustomStruct("bar", llvm::None, false),
-  };
-  Path::Root Root("CustomStruct");
-  ASSERT_TRUE(fromJSON(J, R, Root));
-  EXPECT_EQ(R, Expected);
-
-  (*J.getAsObject()->getArray("foo"))[0] = 123;
-  ASSERT_FALSE(fromJSON(J, R, Root));
-  EXPECT_EQ("expected object at CustomStruct.foo[0]",
-            toString(Root.getError()));
-  const char *ExpectedDump = R"({
-  "foo": [
-    /* error: expected object */
-    123,
-    { ... }
-  ]
-})";
-  EXPECT_EQ(ExpectedDump, errorContext(J, Root));
-
-  CustomStruct V;
-  EXPECT_FALSE(fromJSON(nullptr, V, Root));
-  EXPECT_EQ("expected object when parsing CustomStruct",
-            toString(Root.getError()));
-
-  EXPECT_FALSE(fromJSON(Object{}, V, Root));
-  EXPECT_EQ("missing value at CustomStruct.str", toString(Root.getError()));
-
-  EXPECT_FALSE(fromJSON(Object{{"str", 1}}, V, Root));
-  EXPECT_EQ("expected string at CustomStruct.str", toString(Root.getError()));
-
-  // Optional<T> must parse as the correct type if present.
-  EXPECT_FALSE(fromJSON(Object{{"str", "1"}, {"int", "string"}}, V, Root));
-  EXPECT_EQ("expected integer at CustomStruct.int", toString(Root.getError()));
-
-  // mapOptional must parse as the correct type if present.
-  EXPECT_FALSE(fromJSON(Object{{"str", "1"}, {"bool", "string"}}, V, Root));
-  EXPECT_EQ("expected boolean at CustomStruct.bool", toString(Root.getError()));
-}
-
-TEST(JSONTest, ParseDeserialize) {
-  auto E = parse<std::vector<CustomStruct>>(R"json(
-    [{"str": "foo", "int": 42}, {"int": 42}]
-  )json");
-  EXPECT_THAT_EXPECTED(E, FailedWithMessage("missing value at (root)[1].str"));
-
-  E = parse<std::vector<CustomStruct>>(R"json(
-    [{"str": "foo", "int": 42}, {"str": "bar"}
-  )json");
-  EXPECT_THAT_EXPECTED(
-      E,
-      FailedWithMessage("[3:2, byte=50]: Expected , or ] after array element"));
-
-  E = parse<std::vector<CustomStruct>>(R"json(
-    [{"str": "foo", "int": 42}]
-  )json");
-  EXPECT_THAT_EXPECTED(E, Succeeded());
-  EXPECT_THAT(*E, testing::SizeIs(1));
-}
-
-TEST(JSONTest, Stream) {
-  auto StreamStuff = [](unsigned Indent) {
-    std::string S;
-    llvm::raw_string_ostream OS(S);
-    OStream J(OS, Indent);
-    J.comment("top*/level");
-    J.object([&] {
-      J.attributeArray("foo", [&] {
-        J.value(nullptr);
-        J.comment("element");
-        J.value(42.5);
-        J.arrayBegin();
-        J.value(43);
-        J.arrayEnd();
-        J.rawValue([](raw_ostream &OS) { OS << "'unverified\nraw value'"; });
-      });
-      J.comment("attribute");
-      J.attributeBegin("bar");
-      J.comment("attribute value");
-      J.objectBegin();
-      J.objectEnd();
-      J.attributeEnd();
-      J.attribute("baz", "xyz");
-    });
-    return OS.str();
-  };
-
-  const char *Plain =
-      R"(/*top* /level*/{"foo":[null,/*element*/42.5,[43],'unverified
-raw value'],/*attribute*/"bar":/*attribute value*/{},"baz":"xyz"})";
-  EXPECT_EQ(Plain, StreamStuff(0));
-  const char *Pretty = R"(/* top* /level */
-{
-  "foo": [
-    null,
-    /* element */
-    42.5,
-    [
-      43
-    ],
-    'unverified
-raw value'
-  ],
-  /* attribute */
-  "bar": /* attribute value */ {},
-  "baz": "xyz"
-})";
-  EXPECT_EQ(Pretty, StreamStuff(2));
-}
-
-TEST(JSONTest, Path) {
-  Path::Root R("foo");
-  Path P = R, A = P.field("a"), B = P.field("b");
-  P.report("oh no");
-  EXPECT_THAT_ERROR(R.getError(), FailedWithMessage("oh no when parsing foo"));
-  A.index(1).field("c").index(2).report("boom");
-  EXPECT_THAT_ERROR(R.getError(), FailedWithMessage("boom at foo.a[1].c[2]"));
-  B.field("d").field("e").report("bam");
-  EXPECT_THAT_ERROR(R.getError(), FailedWithMessage("bam at foo.b.d.e"));
-
-  Value V = Object{
-      {"a", Array{42}},
-      {"b",
-       Object{{"d",
-               Object{
-                   {"e", Array{1, Object{{"x", "y"}}}},
-                   {"f", "a moderately long string: 48 characters in total"},
-               }}}},
-  };
-  const char *Expected = R"({
-  "a": [ ... ],
-  "b": {
-    "d": {
-      "e": /* error: bam */ [
-        1,
-        { ... }
-      ],
-      "f": "a moderately long string: 48 characte..."
-    }
-  }
-})";
-  EXPECT_EQ(Expected, errorContext(V, R));
-}
-
-} // namespace
-} // namespace json
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/Support/KnownBitsTest.cpp b/gnu/llvm/llvm/unittests/Support/KnownBitsTest.cpp
deleted file mode 100644
index cce426748a6..00000000000
--- a/gnu/llvm/llvm/unittests/Support/KnownBitsTest.cpp
+++ /dev/null
@@ -1,482 +0,0 @@
-//===- llvm/unittest/Support/KnownBitsTest.cpp - KnownBits tests ----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements unit tests for KnownBits functions.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/KnownBits.h"
-#include "KnownBitsTest.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST(KnownBitsTest, AddCarryExhaustive) {
-  unsigned Bits = 4;
-  ForeachKnownBits(Bits, [&](const KnownBits &Known1) {
-    ForeachKnownBits(Bits, [&](const KnownBits &Known2) {
-      ForeachKnownBits(1, [&](const KnownBits &KnownCarry) {
-        // Explicitly compute known bits of the addition by trying all
-        // possibilities.
-        KnownBits Known(Bits);
-        Known.Zero.setAllBits();
-        Known.One.setAllBits();
-        ForeachNumInKnownBits(Known1, [&](const APInt &N1) {
-          ForeachNumInKnownBits(Known2, [&](const APInt &N2) {
-            ForeachNumInKnownBits(KnownCarry, [&](const APInt &Carry) {
-              APInt Add = N1 + N2;
-              if (Carry.getBoolValue())
-                ++Add;
-
-              Known.One &= Add;
-              Known.Zero &= ~Add;
-            });
-          });
-        });
-
-        KnownBits KnownComputed = KnownBits::computeForAddCarry(
-            Known1, Known2, KnownCarry);
-        EXPECT_EQ(Known.Zero, KnownComputed.Zero);
-        EXPECT_EQ(Known.One, KnownComputed.One);
-      });
-    });
-  });
-}
-
-static void TestAddSubExhaustive(bool IsAdd) {
-  unsigned Bits = 4;
-  ForeachKnownBits(Bits, [&](const KnownBits &Known1) {
-    ForeachKnownBits(Bits, [&](const KnownBits &Known2) {
-      KnownBits Known(Bits), KnownNSW(Bits);
-      Known.Zero.setAllBits();
-      Known.One.setAllBits();
-      KnownNSW.Zero.setAllBits();
-      KnownNSW.One.setAllBits();
-
-      ForeachNumInKnownBits(Known1, [&](const APInt &N1) {
-        ForeachNumInKnownBits(Known2, [&](const APInt &N2) {
-          bool Overflow;
-          APInt Res;
-          if (IsAdd)
-            Res = N1.sadd_ov(N2, Overflow);
-          else
-            Res = N1.ssub_ov(N2, Overflow);
-
-          Known.One &= Res;
-          Known.Zero &= ~Res;
-
-          if (!Overflow) {
-            KnownNSW.One &= Res;
-            KnownNSW.Zero &= ~Res;
-          }
-        });
-      });
-
-      KnownBits KnownComputed = KnownBits::computeForAddSub(
-          IsAdd, /*NSW*/false, Known1, Known2);
-      EXPECT_EQ(Known.Zero, KnownComputed.Zero);
-      EXPECT_EQ(Known.One, KnownComputed.One);
-
-      // The NSW calculation is not precise, only check that it's
-      // conservatively correct.
-      KnownBits KnownNSWComputed = KnownBits::computeForAddSub(
-          IsAdd, /*NSW*/true, Known1, Known2);
-      EXPECT_TRUE(KnownNSWComputed.Zero.isSubsetOf(KnownNSW.Zero));
-      EXPECT_TRUE(KnownNSWComputed.One.isSubsetOf(KnownNSW.One));
-    });
-  });
-}
-
-TEST(KnownBitsTest, AddSubExhaustive) {
-  TestAddSubExhaustive(true);
-  TestAddSubExhaustive(false);
-}
-
-TEST(KnownBitsTest, BinaryExhaustive) {
-  unsigned Bits = 4;
-  ForeachKnownBits(Bits, [&](const KnownBits &Known1) {
-    ForeachKnownBits(Bits, [&](const KnownBits &Known2) {
-      KnownBits KnownAnd(Bits);
-      KnownAnd.Zero.setAllBits();
-      KnownAnd.One.setAllBits();
-      KnownBits KnownOr(KnownAnd);
-      KnownBits KnownXor(KnownAnd);
-      KnownBits KnownUMax(KnownAnd);
-      KnownBits KnownUMin(KnownAnd);
-      KnownBits KnownSMax(KnownAnd);
-      KnownBits KnownSMin(KnownAnd);
-      KnownBits KnownMul(KnownAnd);
-      KnownBits KnownMulHS(KnownAnd);
-      KnownBits KnownMulHU(KnownAnd);
-      KnownBits KnownUDiv(KnownAnd);
-      KnownBits KnownURem(KnownAnd);
-      KnownBits KnownSRem(KnownAnd);
-      KnownBits KnownShl(KnownAnd);
-      KnownBits KnownLShr(KnownAnd);
-      KnownBits KnownAShr(KnownAnd);
-
-      ForeachNumInKnownBits(Known1, [&](const APInt &N1) {
-        ForeachNumInKnownBits(Known2, [&](const APInt &N2) {
-          APInt Res;
-
-          Res = N1 & N2;
-          KnownAnd.One &= Res;
-          KnownAnd.Zero &= ~Res;
-
-          Res = N1 | N2;
-          KnownOr.One &= Res;
-          KnownOr.Zero &= ~Res;
-
-          Res = N1 ^ N2;
-          KnownXor.One &= Res;
-          KnownXor.Zero &= ~Res;
-
-          Res = APIntOps::umax(N1, N2);
-          KnownUMax.One &= Res;
-          KnownUMax.Zero &= ~Res;
-
-          Res = APIntOps::umin(N1, N2);
-          KnownUMin.One &= Res;
-          KnownUMin.Zero &= ~Res;
-
-          Res = APIntOps::smax(N1, N2);
-          KnownSMax.One &= Res;
-          KnownSMax.Zero &= ~Res;
-
-          Res = APIntOps::smin(N1, N2);
-          KnownSMin.One &= Res;
-          KnownSMin.Zero &= ~Res;
-
-          Res = N1 * N2;
-          KnownMul.One &= Res;
-          KnownMul.Zero &= ~Res;
-
-          Res = (N1.sext(2 * Bits) * N2.sext(2 * Bits)).extractBits(Bits, Bits);
-          KnownMulHS.One &= Res;
-          KnownMulHS.Zero &= ~Res;
-
-          Res = (N1.zext(2 * Bits) * N2.zext(2 * Bits)).extractBits(Bits, Bits);
-          KnownMulHU.One &= Res;
-          KnownMulHU.Zero &= ~Res;
-
-          if (!N2.isNullValue()) {
-            Res = N1.udiv(N2);
-            KnownUDiv.One &= Res;
-            KnownUDiv.Zero &= ~Res;
-
-            Res = N1.urem(N2);
-            KnownURem.One &= Res;
-            KnownURem.Zero &= ~Res;
-
-            Res = N1.srem(N2);
-            KnownSRem.One &= Res;
-            KnownSRem.Zero &= ~Res;
-          }
-
-          if (N2.ult(1ULL << N1.getBitWidth())) {
-            Res = N1.shl(N2);
-            KnownShl.One &= Res;
-            KnownShl.Zero &= ~Res;
-
-            Res = N1.lshr(N2);
-            KnownLShr.One &= Res;
-            KnownLShr.Zero &= ~Res;
-
-            Res = N1.ashr(N2);
-            KnownAShr.One &= Res;
-            KnownAShr.Zero &= ~Res;
-          } else {
-            KnownShl.resetAll();
-            KnownLShr.resetAll();
-            KnownAShr.resetAll();
-          }
-        });
-      });
-
-      KnownBits ComputedAnd = Known1 & Known2;
-      EXPECT_EQ(KnownAnd.Zero, ComputedAnd.Zero);
-      EXPECT_EQ(KnownAnd.One, ComputedAnd.One);
-
-      KnownBits ComputedOr = Known1 | Known2;
-      EXPECT_EQ(KnownOr.Zero, ComputedOr.Zero);
-      EXPECT_EQ(KnownOr.One, ComputedOr.One);
-
-      KnownBits ComputedXor = Known1 ^ Known2;
-      EXPECT_EQ(KnownXor.Zero, ComputedXor.Zero);
-      EXPECT_EQ(KnownXor.One, ComputedXor.One);
-
-      KnownBits ComputedUMax = KnownBits::umax(Known1, Known2);
-      EXPECT_EQ(KnownUMax.Zero, ComputedUMax.Zero);
-      EXPECT_EQ(KnownUMax.One, ComputedUMax.One);
-
-      KnownBits ComputedUMin = KnownBits::umin(Known1, Known2);
-      EXPECT_EQ(KnownUMin.Zero, ComputedUMin.Zero);
-      EXPECT_EQ(KnownUMin.One, ComputedUMin.One);
-
-      KnownBits ComputedSMax = KnownBits::smax(Known1, Known2);
-      EXPECT_EQ(KnownSMax.Zero, ComputedSMax.Zero);
-      EXPECT_EQ(KnownSMax.One, ComputedSMax.One);
-
-      KnownBits ComputedSMin = KnownBits::smin(Known1, Known2);
-      EXPECT_EQ(KnownSMin.Zero, ComputedSMin.Zero);
-      EXPECT_EQ(KnownSMin.One, ComputedSMin.One);
-
-      // The following are conservatively correct, but not guaranteed to be
-      // precise.
-      KnownBits ComputedMul = KnownBits::mul(Known1, Known2);
-      EXPECT_TRUE(ComputedMul.Zero.isSubsetOf(KnownMul.Zero));
-      EXPECT_TRUE(ComputedMul.One.isSubsetOf(KnownMul.One));
-
-      KnownBits ComputedMulHS = KnownBits::mulhs(Known1, Known2);
-      EXPECT_TRUE(ComputedMulHS.Zero.isSubsetOf(KnownMulHS.Zero));
-      EXPECT_TRUE(ComputedMulHS.One.isSubsetOf(KnownMulHS.One));
-
-      KnownBits ComputedMulHU = KnownBits::mulhu(Known1, Known2);
-      EXPECT_TRUE(ComputedMulHU.Zero.isSubsetOf(KnownMulHU.Zero));
-      EXPECT_TRUE(ComputedMulHU.One.isSubsetOf(KnownMulHU.One));
-
-      KnownBits ComputedUDiv = KnownBits::udiv(Known1, Known2);
-      EXPECT_TRUE(ComputedUDiv.Zero.isSubsetOf(KnownUDiv.Zero));
-      EXPECT_TRUE(ComputedUDiv.One.isSubsetOf(KnownUDiv.One));
-
-      KnownBits ComputedURem = KnownBits::urem(Known1, Known2);
-      EXPECT_TRUE(ComputedURem.Zero.isSubsetOf(KnownURem.Zero));
-      EXPECT_TRUE(ComputedURem.One.isSubsetOf(KnownURem.One));
-
-      KnownBits ComputedSRem = KnownBits::srem(Known1, Known2);
-      EXPECT_TRUE(ComputedSRem.Zero.isSubsetOf(KnownSRem.Zero));
-      EXPECT_TRUE(ComputedSRem.One.isSubsetOf(KnownSRem.One));
-
-      KnownBits ComputedShl = KnownBits::shl(Known1, Known2);
-      EXPECT_TRUE(ComputedShl.Zero.isSubsetOf(KnownShl.Zero));
-      EXPECT_TRUE(ComputedShl.One.isSubsetOf(KnownShl.One));
-
-      KnownBits ComputedLShr = KnownBits::lshr(Known1, Known2);
-      EXPECT_TRUE(ComputedLShr.Zero.isSubsetOf(KnownLShr.Zero));
-      EXPECT_TRUE(ComputedLShr.One.isSubsetOf(KnownLShr.One));
-
-      KnownBits ComputedAShr = KnownBits::ashr(Known1, Known2);
-      EXPECT_TRUE(ComputedAShr.Zero.isSubsetOf(KnownAShr.Zero));
-      EXPECT_TRUE(ComputedAShr.One.isSubsetOf(KnownAShr.One));
-    });
-  });
-}
-
-TEST(KnownBitsTest, UnaryExhaustive) {
-  unsigned Bits = 4;
-  ForeachKnownBits(Bits, [&](const KnownBits &Known) {
-    KnownBits KnownAbs(Bits);
-    KnownAbs.Zero.setAllBits();
-    KnownAbs.One.setAllBits();
-    KnownBits KnownAbsPoison(KnownAbs);
-
-    ForeachNumInKnownBits(Known, [&](const APInt &N) {
-      APInt Res = N.abs();
-      KnownAbs.One &= Res;
-      KnownAbs.Zero &= ~Res;
-
-      if (!N.isMinSignedValue()) {
-        KnownAbsPoison.One &= Res;
-        KnownAbsPoison.Zero &= ~Res;
-      }
-    });
-
-    // abs() is conservatively correct, but not guaranteed to be precise.
-    KnownBits ComputedAbs = Known.abs();
-    EXPECT_TRUE(ComputedAbs.Zero.isSubsetOf(KnownAbs.Zero));
-    EXPECT_TRUE(ComputedAbs.One.isSubsetOf(KnownAbs.One));
-
-    KnownBits ComputedAbsPoison = Known.abs(true);
-    EXPECT_TRUE(ComputedAbsPoison.Zero.isSubsetOf(KnownAbsPoison.Zero));
-    EXPECT_TRUE(ComputedAbsPoison.One.isSubsetOf(KnownAbsPoison.One));
-  });
-}
-
-TEST(KnownBitsTest, ICmpExhaustive) {
-  unsigned Bits = 4;
-  ForeachKnownBits(Bits, [&](const KnownBits &Known1) {
-    ForeachKnownBits(Bits, [&](const KnownBits &Known2) {
-      bool AllEQ = true, NoneEQ = true;
-      bool AllNE = true, NoneNE = true;
-      bool AllUGT = true, NoneUGT = true;
-      bool AllUGE = true, NoneUGE = true;
-      bool AllULT = true, NoneULT = true;
-      bool AllULE = true, NoneULE = true;
-      bool AllSGT = true, NoneSGT = true;
-      bool AllSGE = true, NoneSGE = true;
-      bool AllSLT = true, NoneSLT = true;
-      bool AllSLE = true, NoneSLE = true;
-
-      ForeachNumInKnownBits(Known1, [&](const APInt &N1) {
-        ForeachNumInKnownBits(Known2, [&](const APInt &N2) {
-          AllEQ &= N1.eq(N2);
-          AllNE &= N1.ne(N2);
-          AllUGT &= N1.ugt(N2);
-          AllUGE &= N1.uge(N2);
-          AllULT &= N1.ult(N2);
-          AllULE &= N1.ule(N2);
-          AllSGT &= N1.sgt(N2);
-          AllSGE &= N1.sge(N2);
-          AllSLT &= N1.slt(N2);
-          AllSLE &= N1.sle(N2);
-          NoneEQ &= !N1.eq(N2);
-          NoneNE &= !N1.ne(N2);
-          NoneUGT &= !N1.ugt(N2);
-          NoneUGE &= !N1.uge(N2);
-          NoneULT &= !N1.ult(N2);
-          NoneULE &= !N1.ule(N2);
-          NoneSGT &= !N1.sgt(N2);
-          NoneSGE &= !N1.sge(N2);
-          NoneSLT &= !N1.slt(N2);
-          NoneSLE &= !N1.sle(N2);
-        });
-      });
-
-      Optional<bool> KnownEQ = KnownBits::eq(Known1, Known2);
-      Optional<bool> KnownNE = KnownBits::ne(Known1, Known2);
-      Optional<bool> KnownUGT = KnownBits::ugt(Known1, Known2);
-      Optional<bool> KnownUGE = KnownBits::uge(Known1, Known2);
-      Optional<bool> KnownULT = KnownBits::ult(Known1, Known2);
-      Optional<bool> KnownULE = KnownBits::ule(Known1, Known2);
-      Optional<bool> KnownSGT = KnownBits::sgt(Known1, Known2);
-      Optional<bool> KnownSGE = KnownBits::sge(Known1, Known2);
-      Optional<bool> KnownSLT = KnownBits::slt(Known1, Known2);
-      Optional<bool> KnownSLE = KnownBits::sle(Known1, Known2);
-
-      EXPECT_EQ(AllEQ || NoneEQ, KnownEQ.hasValue());
-      EXPECT_EQ(AllNE || NoneNE, KnownNE.hasValue());
-      EXPECT_EQ(AllUGT || NoneUGT, KnownUGT.hasValue());
-      EXPECT_EQ(AllUGE || NoneUGE, KnownUGE.hasValue());
-      EXPECT_EQ(AllULT || NoneULT, KnownULT.hasValue());
-      EXPECT_EQ(AllULE || NoneULE, KnownULE.hasValue());
-      EXPECT_EQ(AllSGT || NoneSGT, KnownSGT.hasValue());
-      EXPECT_EQ(AllSGE || NoneSGE, KnownSGE.hasValue());
-      EXPECT_EQ(AllSLT || NoneSLT, KnownSLT.hasValue());
-      EXPECT_EQ(AllSLE || NoneSLE, KnownSLE.hasValue());
-
-      EXPECT_EQ(AllEQ, KnownEQ.hasValue() && KnownEQ.getValue());
-      EXPECT_EQ(AllNE, KnownNE.hasValue() && KnownNE.getValue());
-      EXPECT_EQ(AllUGT, KnownUGT.hasValue() && KnownUGT.getValue());
-      EXPECT_EQ(AllUGE, KnownUGE.hasValue() && KnownUGE.getValue());
-      EXPECT_EQ(AllULT, KnownULT.hasValue() && KnownULT.getValue());
-      EXPECT_EQ(AllULE, KnownULE.hasValue() && KnownULE.getValue());
-      EXPECT_EQ(AllSGT, KnownSGT.hasValue() && KnownSGT.getValue());
-      EXPECT_EQ(AllSGE, KnownSGE.hasValue() && KnownSGE.getValue());
-      EXPECT_EQ(AllSLT, KnownSLT.hasValue() && KnownSLT.getValue());
-      EXPECT_EQ(AllSLE, KnownSLE.hasValue() && KnownSLE.getValue());
-
-      EXPECT_EQ(NoneEQ, KnownEQ.hasValue() && !KnownEQ.getValue());
-      EXPECT_EQ(NoneNE, KnownNE.hasValue() && !KnownNE.getValue());
-      EXPECT_EQ(NoneUGT, KnownUGT.hasValue() && !KnownUGT.getValue());
-      EXPECT_EQ(NoneUGE, KnownUGE.hasValue() && !KnownUGE.getValue());
-      EXPECT_EQ(NoneULT, KnownULT.hasValue() && !KnownULT.getValue());
-      EXPECT_EQ(NoneULE, KnownULE.hasValue() && !KnownULE.getValue());
-      EXPECT_EQ(NoneSGT, KnownSGT.hasValue() && !KnownSGT.getValue());
-      EXPECT_EQ(NoneSGE, KnownSGE.hasValue() && !KnownSGE.getValue());
-      EXPECT_EQ(NoneSLT, KnownSLT.hasValue() && !KnownSLT.getValue());
-      EXPECT_EQ(NoneSLE, KnownSLE.hasValue() && !KnownSLE.getValue());
-    });
-  });
-}
-
-TEST(KnownBitsTest, GetMinMaxVal) {
-  unsigned Bits = 4;
-  ForeachKnownBits(Bits, [&](const KnownBits &Known) {
-    APInt Min = APInt::getMaxValue(Bits);
-    APInt Max = APInt::getMinValue(Bits);
-    ForeachNumInKnownBits(Known, [&](const APInt &N) {
-      Min = APIntOps::umin(Min, N);
-      Max = APIntOps::umax(Max, N);
-    });
-    EXPECT_EQ(Min, Known.getMinValue());
-    EXPECT_EQ(Max, Known.getMaxValue());
-  });
-}
-
-TEST(KnownBitsTest, GetSignedMinMaxVal) {
-  unsigned Bits = 4;
-  ForeachKnownBits(Bits, [&](const KnownBits &Known) {
-    APInt Min = APInt::getSignedMaxValue(Bits);
-    APInt Max = APInt::getSignedMinValue(Bits);
-    ForeachNumInKnownBits(Known, [&](const APInt &N) {
-      Min = APIntOps::smin(Min, N);
-      Max = APIntOps::smax(Max, N);
-    });
-    EXPECT_EQ(Min, Known.getSignedMinValue());
-    EXPECT_EQ(Max, Known.getSignedMaxValue());
-  });
-}
-
-TEST(KnownBitsTest, SExtOrTrunc) {
-  const unsigned NarrowerSize = 4;
-  const unsigned BaseSize = 6;
-  const unsigned WiderSize = 8;
-  APInt NegativeFitsNarrower(BaseSize, -4, /*isSigned*/ true);
-  APInt NegativeDoesntFitNarrower(BaseSize, -28, /*isSigned*/ true);
-  APInt PositiveFitsNarrower(BaseSize, 14);
-  APInt PositiveDoesntFitNarrower(BaseSize, 36);
-  auto InitKnownBits = [&](KnownBits &Res, const APInt &Input) {
-    Res = KnownBits(Input.getBitWidth());
-    Res.One = Input;
-    Res.Zero = ~Input;
-  };
-
-  for (unsigned Size : {NarrowerSize, BaseSize, WiderSize}) {
-    for (const APInt &Input :
-         {NegativeFitsNarrower, NegativeDoesntFitNarrower, PositiveFitsNarrower,
-          PositiveDoesntFitNarrower}) {
-      KnownBits Test;
-      InitKnownBits(Test, Input);
-      KnownBits Baseline;
-      InitKnownBits(Baseline, Input.sextOrTrunc(Size));
-      Test = Test.sextOrTrunc(Size);
-      EXPECT_EQ(Test.One, Baseline.One);
-      EXPECT_EQ(Test.Zero, Baseline.Zero);
-    }
-  }
-}
-
-TEST(KnownBitsTest, SExtInReg) {
-  unsigned Bits = 4;
-  for (unsigned FromBits = 1; FromBits <= Bits; ++FromBits) {
-    ForeachKnownBits(Bits, [&](const KnownBits &Known) {
-      APInt CommonOne = APInt::getAllOnesValue(Bits);
-      APInt CommonZero = APInt::getAllOnesValue(Bits);
-      unsigned ExtBits = Bits - FromBits;
-      ForeachNumInKnownBits(Known, [&](const APInt &N) {
-        APInt Ext = N << ExtBits;
-        Ext.ashrInPlace(ExtBits);
-        CommonOne &= Ext;
-        CommonZero &= ~Ext;
-      });
-      KnownBits KnownSExtInReg = Known.sextInReg(FromBits);
-      EXPECT_EQ(CommonOne, KnownSExtInReg.One);
-      EXPECT_EQ(CommonZero, KnownSExtInReg.Zero);
-    });
-  }
-}
-
-TEST(KnownBitsTest, CommonBitsSet) {
-  unsigned Bits = 4;
-  ForeachKnownBits(Bits, [&](const KnownBits &Known1) {
-    ForeachKnownBits(Bits, [&](const KnownBits &Known2) {
-      bool HasCommonBitsSet = false;
-      ForeachNumInKnownBits(Known1, [&](const APInt &N1) {
-        ForeachNumInKnownBits(Known2, [&](const APInt &N2) {
-          HasCommonBitsSet |= N1.intersects(N2);
-        });
-      });
-      EXPECT_EQ(!HasCommonBitsSet,
-                KnownBits::haveNoCommonBitsSet(Known1, Known2));
-    });
-  });
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/Support/KnownBitsTest.h b/gnu/llvm/llvm/unittests/Support/KnownBitsTest.h
deleted file mode 100644
index bc291898814..00000000000
--- a/gnu/llvm/llvm/unittests/Support/KnownBitsTest.h
+++ /dev/null
@@ -1,52 +0,0 @@
-//===- llvm/unittest/Support/KnownBitsTest.h - KnownBits tests ------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements helpers for KnownBits and DemandedBits unit tests.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_UNITTESTS_SUPPORT_KNOWNBITSTEST_H
-#define LLVM_UNITTESTS_SUPPORT_KNOWNBITSTEST_H
-
-#include "llvm/Support/KnownBits.h"
-
-namespace {
-
-using namespace llvm;
-
-template <typename FnTy> void ForeachKnownBits(unsigned Bits, FnTy Fn) {
-  unsigned Max = 1 << Bits;
-  KnownBits Known(Bits);
-  for (unsigned Zero = 0; Zero < Max; ++Zero) {
-    for (unsigned One = 0; One < Max; ++One) {
-      Known.Zero = Zero;
-      Known.One = One;
-      if (Known.hasConflict())
-        continue;
-
-      Fn(Known);
-    }
-  }
-}
-
-template <typename FnTy>
-void ForeachNumInKnownBits(const KnownBits &Known, FnTy Fn) {
-  unsigned Bits = Known.getBitWidth();
-  unsigned Max = 1 << Bits;
-  for (unsigned N = 0; N < Max; ++N) {
-    APInt Num(Bits, N);
-    if ((Num & Known.Zero) != 0 || (~Num & Known.One) != 0)
-      continue;
-
-    Fn(Num);
-  }
-}
-
-} // end anonymous namespace
-
-#endif
diff --git a/gnu/llvm/llvm/unittests/Support/LEB128Test.cpp b/gnu/llvm/llvm/unittests/Support/LEB128Test.cpp
deleted file mode 100644
index 986d2935845..00000000000
--- a/gnu/llvm/llvm/unittests/Support/LEB128Test.cpp
+++ /dev/null
@@ -1,435 +0,0 @@
-//===- llvm/unittest/Support/LEB128Test.cpp - LEB128 function tests -------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/LEB128.h"
-#include "llvm/Support/DataTypes.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gtest/gtest.h"
-#include <string>
-using namespace llvm;
-
-namespace {
-
-TEST(LEB128Test, EncodeSLEB128) {
-#define EXPECT_SLEB128_EQ(EXPECTED, VALUE, PAD) \
-  do { \
-    std::string Expected(EXPECTED, sizeof(EXPECTED) - 1); \
-    \
-    /* encodeSLEB128(uint64_t, raw_ostream &, unsigned) */ \
-    std::string Actual1; \
-    raw_string_ostream Stream(Actual1); \
-    encodeSLEB128(VALUE, Stream, PAD); \
-    Stream.flush(); \
-    EXPECT_EQ(Expected, Actual1); \
-    \
-    /* encodeSLEB128(uint64_t, uint8_t *, unsigned) */ \
-    uint8_t Buffer[32]; \
-    unsigned Size = encodeSLEB128(VALUE, Buffer, PAD); \
-    std::string Actual2(reinterpret_cast<const char *>(Buffer), Size); \
-    EXPECT_EQ(Expected, Actual2); \
-  } while (0)
-
-  // Encode SLEB128
-  EXPECT_SLEB128_EQ("\x00", 0, 0);
-  EXPECT_SLEB128_EQ("\x01", 1, 0);
-  EXPECT_SLEB128_EQ("\x7f", -1, 0);
-  EXPECT_SLEB128_EQ("\x3f", 63, 0);
-  EXPECT_SLEB128_EQ("\x41", -63, 0);
-  EXPECT_SLEB128_EQ("\x40", -64, 0);
-  EXPECT_SLEB128_EQ("\xbf\x7f", -65, 0);
-  EXPECT_SLEB128_EQ("\xc0\x00", 64, 0);
-
-  // Encode SLEB128 with some extra padding bytes
-  EXPECT_SLEB128_EQ("\x80\x00", 0, 2);
-  EXPECT_SLEB128_EQ("\x80\x80\x00", 0, 3);
-  EXPECT_SLEB128_EQ("\xff\x80\x00", 0x7f, 3);
-  EXPECT_SLEB128_EQ("\xff\x80\x80\x00", 0x7f, 4);
-  EXPECT_SLEB128_EQ("\x80\x81\x00", 0x80, 3);
-  EXPECT_SLEB128_EQ("\x80\x81\x80\x00", 0x80, 4);
-  EXPECT_SLEB128_EQ("\xc0\x7f", -0x40, 2);
-
-  EXPECT_SLEB128_EQ("\xc0\xff\x7f", -0x40, 3);
-  EXPECT_SLEB128_EQ("\x80\xff\x7f", -0x80, 3);
-  EXPECT_SLEB128_EQ("\x80\xff\xff\x7f", -0x80, 4);
-
-#undef EXPECT_SLEB128_EQ
-}
-
-TEST(LEB128Test, EncodeULEB128) {
-#define EXPECT_ULEB128_EQ(EXPECTED, VALUE, PAD) \
-  do { \
-    std::string Expected(EXPECTED, sizeof(EXPECTED) - 1); \
-    \
-    /* encodeULEB128(uint64_t, raw_ostream &, unsigned) */ \
-    std::string Actual1; \
-    raw_string_ostream Stream(Actual1); \
-    encodeULEB128(VALUE, Stream, PAD); \
-    Stream.flush(); \
-    EXPECT_EQ(Expected, Actual1); \
-    \
-    /* encodeULEB128(uint64_t, uint8_t *, unsigned) */ \
-    uint8_t Buffer[32]; \
-    unsigned Size = encodeULEB128(VALUE, Buffer, PAD); \
-    std::string Actual2(reinterpret_cast<const char *>(Buffer), Size); \
-    EXPECT_EQ(Expected, Actual2); \
-  } while (0)
-
-  // Encode ULEB128
-  EXPECT_ULEB128_EQ("\x00", 0, 0);
-  EXPECT_ULEB128_EQ("\x01", 1, 0);
-  EXPECT_ULEB128_EQ("\x3f", 63, 0);
-  EXPECT_ULEB128_EQ("\x40", 64, 0);
-  EXPECT_ULEB128_EQ("\x7f", 0x7f, 0);
-  EXPECT_ULEB128_EQ("\x80\x01", 0x80, 0);
-  EXPECT_ULEB128_EQ("\x81\x01", 0x81, 0);
-  EXPECT_ULEB128_EQ("\x90\x01", 0x90, 0);
-  EXPECT_ULEB128_EQ("\xff\x01", 0xff, 0);
-  EXPECT_ULEB128_EQ("\x80\x02", 0x100, 0);
-  EXPECT_ULEB128_EQ("\x81\x02", 0x101, 0);
-
-  // Encode ULEB128 with some extra padding bytes
-  EXPECT_ULEB128_EQ("\x80\x00", 0, 2);
-  EXPECT_ULEB128_EQ("\x80\x80\x00", 0, 3);
-  EXPECT_ULEB128_EQ("\xff\x00", 0x7f, 2);
-  EXPECT_ULEB128_EQ("\xff\x80\x00", 0x7f, 3);
-  EXPECT_ULEB128_EQ("\x80\x81\x00", 0x80, 3);
-  EXPECT_ULEB128_EQ("\x80\x81\x80\x00", 0x80, 4);
-
-#undef EXPECT_ULEB128_EQ
-}
-
-TEST(LEB128Test, DecodeULEB128) {
-#define EXPECT_DECODE_ULEB128_EQ(EXPECTED, VALUE) \
-  do { \
-    unsigned ActualSize = 0; \
-    uint64_t Actual = decodeULEB128(reinterpret_cast<const uint8_t *>(VALUE), \
-                                    &ActualSize); \
-    EXPECT_EQ(sizeof(VALUE) - 1, ActualSize); \
-    EXPECT_EQ(EXPECTED, Actual); \
-  } while (0)
-
-  // Don't crash
-  EXPECT_EQ(0u, decodeULEB128(nullptr, nullptr, nullptr));
-
-  // Decode ULEB128
-  EXPECT_DECODE_ULEB128_EQ(0u, "\x00");
-  EXPECT_DECODE_ULEB128_EQ(1u, "\x01");
-  EXPECT_DECODE_ULEB128_EQ(63u, "\x3f");
-  EXPECT_DECODE_ULEB128_EQ(64u, "\x40");
-  EXPECT_DECODE_ULEB128_EQ(0x7fu, "\x7f");
-  EXPECT_DECODE_ULEB128_EQ(0x80u, "\x80\x01");
-  EXPECT_DECODE_ULEB128_EQ(0x81u, "\x81\x01");
-  EXPECT_DECODE_ULEB128_EQ(0x90u, "\x90\x01");
-  EXPECT_DECODE_ULEB128_EQ(0xffu, "\xff\x01");
-  EXPECT_DECODE_ULEB128_EQ(0x100u, "\x80\x02");
-  EXPECT_DECODE_ULEB128_EQ(0x101u, "\x81\x02");
-  EXPECT_DECODE_ULEB128_EQ(4294975616ULL, "\x80\xc1\x80\x80\x10");
-
-  // Decode ULEB128 with extra padding bytes
-  EXPECT_DECODE_ULEB128_EQ(0u, "\x80\x00");
-  EXPECT_DECODE_ULEB128_EQ(0u, "\x80\x80\x00");
-  EXPECT_DECODE_ULEB128_EQ(0x7fu, "\xff\x00");
-  EXPECT_DECODE_ULEB128_EQ(0x7fu, "\xff\x80\x00");
-  EXPECT_DECODE_ULEB128_EQ(0x80u, "\x80\x81\x00");
-  EXPECT_DECODE_ULEB128_EQ(0x80u, "\x80\x81\x80\x00");
-  EXPECT_DECODE_ULEB128_EQ(0x80u, "\x80\x81\x80\x80\x80\x80\x80\x80\x80\x00");
-  EXPECT_DECODE_ULEB128_EQ(0x80000000'00000000ul,
-                           "\x80\x80\x80\x80\x80\x80\x80\x80\x80\x01");
-
-#undef EXPECT_DECODE_ULEB128_EQ
-}
-
-TEST(LEB128Test, DecodeInvalidULEB128) {
-#define EXPECT_INVALID_ULEB128(VALUE, ERROR_OFFSET)                            \
-  do {                                                                         \
-    const uint8_t *Value = reinterpret_cast<const uint8_t *>(VALUE);           \
-    const char *Error = nullptr;                                               \
-    unsigned ErrorOffset = 0;                                                  \
-    uint64_t Actual =                                                          \
-        decodeULEB128(Value, &ErrorOffset, Value + strlen(VALUE), &Error);     \
-    EXPECT_NE(Error, nullptr);                                                 \
-    EXPECT_EQ(0ul, Actual);                                                    \
-    EXPECT_EQ(ERROR_OFFSET, ErrorOffset);                                      \
-  } while (0)
-
-  // Buffer overflow.
-  EXPECT_INVALID_ULEB128("", 0u);
-  EXPECT_INVALID_ULEB128("\x80", 1u);
-
-  // Does not fit in 64 bits.
-  EXPECT_INVALID_ULEB128("\x80\x80\x80\x80\x80\x80\x80\x80\x80\x02", 9u);
-  EXPECT_INVALID_ULEB128("\x80\x80\x80\x80\x80\x80\x80\x80\x80\x80\x02", 10u);
-
-#undef EXPECT_INVALID_ULEB128
-}
-
-TEST(LEB128Test, DecodeSLEB128) {
-#define EXPECT_DECODE_SLEB128_EQ(EXPECTED, VALUE) \
-  do { \
-    unsigned ActualSize = 0; \
-    int64_t Actual = decodeSLEB128(reinterpret_cast<const uint8_t *>(VALUE), \
-                                    &ActualSize); \
-    EXPECT_EQ(sizeof(VALUE) - 1, ActualSize); \
-    EXPECT_EQ(EXPECTED, Actual); \
-  } while (0)
-
-  // Don't crash
-  EXPECT_EQ(0, decodeSLEB128(nullptr, nullptr, nullptr));
-
-  // Decode SLEB128
-  EXPECT_DECODE_SLEB128_EQ(0L, "\x00");
-  EXPECT_DECODE_SLEB128_EQ(1L, "\x01");
-  EXPECT_DECODE_SLEB128_EQ(63L, "\x3f");
-  EXPECT_DECODE_SLEB128_EQ(-64L, "\x40");
-  EXPECT_DECODE_SLEB128_EQ(-63L, "\x41");
-  EXPECT_DECODE_SLEB128_EQ(-1L, "\x7f");
-  EXPECT_DECODE_SLEB128_EQ(128L, "\x80\x01");
-  EXPECT_DECODE_SLEB128_EQ(129L, "\x81\x01");
-  EXPECT_DECODE_SLEB128_EQ(-129L, "\xff\x7e");
-  EXPECT_DECODE_SLEB128_EQ(-128L, "\x80\x7f");
-  EXPECT_DECODE_SLEB128_EQ(-127L, "\x81\x7f");
-  EXPECT_DECODE_SLEB128_EQ(64L, "\xc0\x00");
-  EXPECT_DECODE_SLEB128_EQ(-12345L, "\xc7\x9f\x7f");
-
-  // Decode unnormalized SLEB128 with extra padding bytes.
-  EXPECT_DECODE_SLEB128_EQ(0L, "\x80\x00");
-  EXPECT_DECODE_SLEB128_EQ(0L, "\x80\x80\x00");
-  EXPECT_DECODE_SLEB128_EQ(0x7fL, "\xff\x00");
-  EXPECT_DECODE_SLEB128_EQ(0x7fL, "\xff\x80\x00");
-  EXPECT_DECODE_SLEB128_EQ(0x80L, "\x80\x81\x00");
-  EXPECT_DECODE_SLEB128_EQ(0x80L, "\x80\x81\x80\x00");
-  EXPECT_DECODE_SLEB128_EQ(0x80L, "\x80\x81\x80\x80\x80\x80\x80\x80\x80\x00");
-  EXPECT_DECODE_SLEB128_EQ(-2L, "\xFE\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x7F");
-  EXPECT_DECODE_SLEB128_EQ(INT64_MIN,
-                           "\x80\x80\x80\x80\x80\x80\x80\x80\x80\x7F");
-  EXPECT_DECODE_SLEB128_EQ(INT64_MAX,
-                           "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x00");
-
-#undef EXPECT_DECODE_SLEB128_EQ
-}
-
-TEST(LEB128Test, DecodeInvalidSLEB128) {
-#define EXPECT_INVALID_SLEB128(VALUE, ERROR_OFFSET)                            \
-  do {                                                                         \
-    const uint8_t *Value = reinterpret_cast<const uint8_t *>(VALUE);           \
-    const char *Error = nullptr;                                               \
-    unsigned ErrorOffset = 0;                                                  \
-    uint64_t Actual =                                                          \
-        decodeSLEB128(Value, &ErrorOffset, Value + strlen(VALUE), &Error);     \
-    EXPECT_NE(Error, nullptr);                                                 \
-    EXPECT_EQ(0ul, Actual);                                                    \
-    EXPECT_EQ(ERROR_OFFSET, ErrorOffset);                                      \
-  } while (0)
-
-  // Buffer overflow.
-  EXPECT_INVALID_SLEB128("", 0u);
-  EXPECT_INVALID_SLEB128("\x80", 1u);
-
-  // Does not fit in 64 bits.
-  EXPECT_INVALID_SLEB128("\x80\x80\x80\x80\x80\x80\x80\x80\x80\x01", 9u);
-  EXPECT_INVALID_SLEB128("\x80\x80\x80\x80\x80\x80\x80\x80\x80\x7E", 9u);
-  EXPECT_INVALID_SLEB128("\x80\x80\x80\x80\x80\x80\x80\x80\x80\x80\x02", 10u);
-  EXPECT_INVALID_SLEB128("\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x7E", 9u);
-  EXPECT_INVALID_SLEB128("\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x01", 9u);
-  EXPECT_INVALID_SLEB128("\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x7E", 10u);
-  EXPECT_INVALID_SLEB128("\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x00", 10u);
-
-#undef EXPECT_INVALID_SLEB128
-}
-
-TEST(LEB128Test, SLEB128Size) {
-  // Positive Value Testing Plan:
-  // (1) 128 ^ n - 1 ........ need (n+1) bytes
-  // (2) 128 ^ n ............ need (n+1) bytes
-  // (3) 128 ^ n * 63 ....... need (n+1) bytes
-  // (4) 128 ^ n * 64 - 1 ... need (n+1) bytes
-  // (5) 128 ^ n * 64 ....... need (n+2) bytes
-
-  EXPECT_EQ(1u, getSLEB128Size(0x0LL));
-  EXPECT_EQ(1u, getSLEB128Size(0x1LL));
-  EXPECT_EQ(1u, getSLEB128Size(0x3fLL));
-  EXPECT_EQ(1u, getSLEB128Size(0x3fLL));
-  EXPECT_EQ(2u, getSLEB128Size(0x40LL));
-
-  EXPECT_EQ(2u, getSLEB128Size(0x7fLL));
-  EXPECT_EQ(2u, getSLEB128Size(0x80LL));
-  EXPECT_EQ(2u, getSLEB128Size(0x1f80LL));
-  EXPECT_EQ(2u, getSLEB128Size(0x1fffLL));
-  EXPECT_EQ(3u, getSLEB128Size(0x2000LL));
-
-  EXPECT_EQ(3u, getSLEB128Size(0x3fffLL));
-  EXPECT_EQ(3u, getSLEB128Size(0x4000LL));
-  EXPECT_EQ(3u, getSLEB128Size(0xfc000LL));
-  EXPECT_EQ(3u, getSLEB128Size(0xfffffLL));
-  EXPECT_EQ(4u, getSLEB128Size(0x100000LL));
-
-  EXPECT_EQ(4u, getSLEB128Size(0x1fffffLL));
-  EXPECT_EQ(4u, getSLEB128Size(0x200000LL));
-  EXPECT_EQ(4u, getSLEB128Size(0x7e00000LL));
-  EXPECT_EQ(4u, getSLEB128Size(0x7ffffffLL));
-  EXPECT_EQ(5u, getSLEB128Size(0x8000000LL));
-
-  EXPECT_EQ(5u, getSLEB128Size(0xfffffffLL));
-  EXPECT_EQ(5u, getSLEB128Size(0x10000000LL));
-  EXPECT_EQ(5u, getSLEB128Size(0x3f0000000LL));
-  EXPECT_EQ(5u, getSLEB128Size(0x3ffffffffLL));
-  EXPECT_EQ(6u, getSLEB128Size(0x400000000LL));
-
-  EXPECT_EQ(6u, getSLEB128Size(0x7ffffffffLL));
-  EXPECT_EQ(6u, getSLEB128Size(0x800000000LL));
-  EXPECT_EQ(6u, getSLEB128Size(0x1f800000000LL));
-  EXPECT_EQ(6u, getSLEB128Size(0x1ffffffffffLL));
-  EXPECT_EQ(7u, getSLEB128Size(0x20000000000LL));
-
-  EXPECT_EQ(7u, getSLEB128Size(0x3ffffffffffLL));
-  EXPECT_EQ(7u, getSLEB128Size(0x40000000000LL));
-  EXPECT_EQ(7u, getSLEB128Size(0xfc0000000000LL));
-  EXPECT_EQ(7u, getSLEB128Size(0xffffffffffffLL));
-  EXPECT_EQ(8u, getSLEB128Size(0x1000000000000LL));
-
-  EXPECT_EQ(8u, getSLEB128Size(0x1ffffffffffffLL));
-  EXPECT_EQ(8u, getSLEB128Size(0x2000000000000LL));
-  EXPECT_EQ(8u, getSLEB128Size(0x7e000000000000LL));
-  EXPECT_EQ(8u, getSLEB128Size(0x7fffffffffffffLL));
-  EXPECT_EQ(9u, getSLEB128Size(0x80000000000000LL));
-
-  EXPECT_EQ(9u, getSLEB128Size(0xffffffffffffffLL));
-  EXPECT_EQ(9u, getSLEB128Size(0x100000000000000LL));
-  EXPECT_EQ(9u, getSLEB128Size(0x3f00000000000000LL));
-  EXPECT_EQ(9u, getSLEB128Size(0x3fffffffffffffffLL));
-  EXPECT_EQ(10u, getSLEB128Size(0x4000000000000000LL));
-
-  EXPECT_EQ(10u, getSLEB128Size(0x7fffffffffffffffLL));
-  EXPECT_EQ(10u, getSLEB128Size(INT64_MAX));
-
-  // Negative Value Testing Plan:
-  // (1) - 128 ^ n - 1 ........ need (n+1) bytes
-  // (2) - 128 ^ n ............ need (n+1) bytes
-  // (3) - 128 ^ n * 63 ....... need (n+1) bytes
-  // (4) - 128 ^ n * 64 ....... need (n+1) bytes (different from positive one)
-  // (5) - 128 ^ n * 65 - 1 ... need (n+2) bytes (if n > 0)
-  // (6) - 128 ^ n * 65 ....... need (n+2) bytes
-
-  EXPECT_EQ(1u, getSLEB128Size(0x0LL));
-  EXPECT_EQ(1u, getSLEB128Size(-0x1LL));
-  EXPECT_EQ(1u, getSLEB128Size(-0x3fLL));
-  EXPECT_EQ(1u, getSLEB128Size(-0x40LL));
-  EXPECT_EQ(1u, getSLEB128Size(-0x40LL)); // special case
-  EXPECT_EQ(2u, getSLEB128Size(-0x41LL));
-
-  EXPECT_EQ(2u, getSLEB128Size(-0x7fLL));
-  EXPECT_EQ(2u, getSLEB128Size(-0x80LL));
-  EXPECT_EQ(2u, getSLEB128Size(-0x1f80LL));
-  EXPECT_EQ(2u, getSLEB128Size(-0x2000LL));
-  EXPECT_EQ(3u, getSLEB128Size(-0x207fLL));
-  EXPECT_EQ(3u, getSLEB128Size(-0x2080LL));
-
-  EXPECT_EQ(3u, getSLEB128Size(-0x3fffLL));
-  EXPECT_EQ(3u, getSLEB128Size(-0x4000LL));
-  EXPECT_EQ(3u, getSLEB128Size(-0xfc000LL));
-  EXPECT_EQ(3u, getSLEB128Size(-0x100000LL));
-  EXPECT_EQ(4u, getSLEB128Size(-0x103fffLL));
-  EXPECT_EQ(4u, getSLEB128Size(-0x104000LL));
-
-  EXPECT_EQ(4u, getSLEB128Size(-0x1fffffLL));
-  EXPECT_EQ(4u, getSLEB128Size(-0x200000LL));
-  EXPECT_EQ(4u, getSLEB128Size(-0x7e00000LL));
-  EXPECT_EQ(4u, getSLEB128Size(-0x8000000LL));
-  EXPECT_EQ(5u, getSLEB128Size(-0x81fffffLL));
-  EXPECT_EQ(5u, getSLEB128Size(-0x8200000LL));
-
-  EXPECT_EQ(5u, getSLEB128Size(-0xfffffffLL));
-  EXPECT_EQ(5u, getSLEB128Size(-0x10000000LL));
-  EXPECT_EQ(5u, getSLEB128Size(-0x3f0000000LL));
-  EXPECT_EQ(5u, getSLEB128Size(-0x400000000LL));
-  EXPECT_EQ(6u, getSLEB128Size(-0x40fffffffLL));
-  EXPECT_EQ(6u, getSLEB128Size(-0x410000000LL));
-
-  EXPECT_EQ(6u, getSLEB128Size(-0x7ffffffffLL));
-  EXPECT_EQ(6u, getSLEB128Size(-0x800000000LL));
-  EXPECT_EQ(6u, getSLEB128Size(-0x1f800000000LL));
-  EXPECT_EQ(6u, getSLEB128Size(-0x20000000000LL));
-  EXPECT_EQ(7u, getSLEB128Size(-0x207ffffffffLL));
-  EXPECT_EQ(7u, getSLEB128Size(-0x20800000000LL));
-
-  EXPECT_EQ(7u, getSLEB128Size(-0x3ffffffffffLL));
-  EXPECT_EQ(7u, getSLEB128Size(-0x40000000000LL));
-  EXPECT_EQ(7u, getSLEB128Size(-0xfc0000000000LL));
-  EXPECT_EQ(7u, getSLEB128Size(-0x1000000000000LL));
-  EXPECT_EQ(8u, getSLEB128Size(-0x103ffffffffffLL));
-  EXPECT_EQ(8u, getSLEB128Size(-0x1040000000000LL));
-
-  EXPECT_EQ(8u, getSLEB128Size(-0x1ffffffffffffLL));
-  EXPECT_EQ(8u, getSLEB128Size(-0x2000000000000LL));
-  EXPECT_EQ(8u, getSLEB128Size(-0x7e000000000000LL));
-  EXPECT_EQ(8u, getSLEB128Size(-0x80000000000000LL));
-  EXPECT_EQ(9u, getSLEB128Size(-0x81ffffffffffffLL));
-  EXPECT_EQ(9u, getSLEB128Size(-0x82000000000000LL));
-
-  EXPECT_EQ(9u, getSLEB128Size(-0xffffffffffffffLL));
-  EXPECT_EQ(9u, getSLEB128Size(-0x100000000000000LL));
-  EXPECT_EQ(9u, getSLEB128Size(-0x3f00000000000000LL));
-  EXPECT_EQ(9u, getSLEB128Size(-0x4000000000000000LL));
-  EXPECT_EQ(10u, getSLEB128Size(-0x40ffffffffffffffLL));
-  EXPECT_EQ(10u, getSLEB128Size(-0x4100000000000000LL));
-
-  EXPECT_EQ(10u, getSLEB128Size(-0x7fffffffffffffffLL));
-  EXPECT_EQ(10u, getSLEB128Size(-0x8000000000000000LL));
-  EXPECT_EQ(10u, getSLEB128Size(INT64_MIN));
-}
-
-TEST(LEB128Test, ULEB128Size) {
-  // Testing Plan:
-  // (1) 128 ^ n ............ need (n+1) bytes
-  // (2) 128 ^ n * 64 ....... need (n+1) bytes
-  // (3) 128 ^ (n+1) - 1 .... need (n+1) bytes
-
-  EXPECT_EQ(1u, getULEB128Size(0)); // special case
-
-  EXPECT_EQ(1u, getULEB128Size(0x1ULL));
-  EXPECT_EQ(1u, getULEB128Size(0x40ULL));
-  EXPECT_EQ(1u, getULEB128Size(0x7fULL));
-
-  EXPECT_EQ(2u, getULEB128Size(0x80ULL));
-  EXPECT_EQ(2u, getULEB128Size(0x2000ULL));
-  EXPECT_EQ(2u, getULEB128Size(0x3fffULL));
-
-  EXPECT_EQ(3u, getULEB128Size(0x4000ULL));
-  EXPECT_EQ(3u, getULEB128Size(0x100000ULL));
-  EXPECT_EQ(3u, getULEB128Size(0x1fffffULL));
-
-  EXPECT_EQ(4u, getULEB128Size(0x200000ULL));
-  EXPECT_EQ(4u, getULEB128Size(0x8000000ULL));
-  EXPECT_EQ(4u, getULEB128Size(0xfffffffULL));
-
-  EXPECT_EQ(5u, getULEB128Size(0x10000000ULL));
-  EXPECT_EQ(5u, getULEB128Size(0x400000000ULL));
-  EXPECT_EQ(5u, getULEB128Size(0x7ffffffffULL));
-
-  EXPECT_EQ(6u, getULEB128Size(0x800000000ULL));
-  EXPECT_EQ(6u, getULEB128Size(0x20000000000ULL));
-  EXPECT_EQ(6u, getULEB128Size(0x3ffffffffffULL));
-
-  EXPECT_EQ(7u, getULEB128Size(0x40000000000ULL));
-  EXPECT_EQ(7u, getULEB128Size(0x1000000000000ULL));
-  EXPECT_EQ(7u, getULEB128Size(0x1ffffffffffffULL));
-
-  EXPECT_EQ(8u, getULEB128Size(0x2000000000000ULL));
-  EXPECT_EQ(8u, getULEB128Size(0x80000000000000ULL));
-  EXPECT_EQ(8u, getULEB128Size(0xffffffffffffffULL));
-
-  EXPECT_EQ(9u, getULEB128Size(0x100000000000000ULL));
-  EXPECT_EQ(9u, getULEB128Size(0x4000000000000000ULL));
-  EXPECT_EQ(9u, getULEB128Size(0x7fffffffffffffffULL));
-
-  EXPECT_EQ(10u, getULEB128Size(0x8000000000000000ULL));
-
-  EXPECT_EQ(10u, getULEB128Size(UINT64_MAX));
-}
-
-}  // anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/Support/LineIteratorTest.cpp b/gnu/llvm/llvm/unittests/Support/LineIteratorTest.cpp
deleted file mode 100644
index 7d1bae1a035..00000000000
--- a/gnu/llvm/llvm/unittests/Support/LineIteratorTest.cpp
+++ /dev/null
@@ -1,216 +0,0 @@
-//===- LineIterator.cpp - Unit tests --------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/LineIterator.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::sys;
-
-namespace {
-
-TEST(LineIteratorTest, Basic) {
-  std::unique_ptr<MemoryBuffer> Buffer = MemoryBuffer::getMemBuffer("line 1\n"
-                                                                    "line 2\n"
-                                                                    "line 3");
-
-  line_iterator I = line_iterator(*Buffer), E;
-
-  EXPECT_FALSE(I.is_at_eof());
-  EXPECT_NE(E, I);
-
-  EXPECT_EQ("line 1", *I);
-  EXPECT_EQ(1, I.line_number());
-  ++I;
-  EXPECT_EQ("line 2", *I);
-  EXPECT_EQ(2, I.line_number());
-  ++I;
-  EXPECT_EQ("line 3", *I);
-  EXPECT_EQ(3, I.line_number());
-  ++I;
-
-  EXPECT_TRUE(I.is_at_eof());
-  EXPECT_EQ(E, I);
-}
-
-TEST(LineIteratorTest, Ref) {
-  std::unique_ptr<MemoryBuffer> Buffer = MemoryBuffer::getMemBuffer("line 1\n"
-                                                                    "line 2\n"
-                                                                    "line 3");
-
-  line_iterator I = line_iterator(Buffer->getMemBufferRef()), E;
-
-  EXPECT_FALSE(I.is_at_eof());
-  EXPECT_NE(E, I);
-
-  EXPECT_EQ("line 1", *I);
-  EXPECT_EQ(1, I.line_number());
-  ++I;
-  EXPECT_EQ("line 2", *I);
-  EXPECT_EQ(2, I.line_number());
-  ++I;
-  EXPECT_EQ("line 3", *I);
-  EXPECT_EQ(3, I.line_number());
-  ++I;
-
-  EXPECT_TRUE(I.is_at_eof());
-  EXPECT_EQ(E, I);
-}
-
-TEST(LineIteratorTest, CommentAndBlankSkipping) {
-  std::unique_ptr<MemoryBuffer> Buffer(
-      MemoryBuffer::getMemBuffer("line 1\n"
-                                 "line 2\n"
-                                 "# Comment 1\n"
-                                 "\n"
-                                 "line 5\n"
-                                 "\n"
-                                 "# Comment 2"));
-
-  line_iterator I = line_iterator(*Buffer, true, '#'), E;
-
-  EXPECT_FALSE(I.is_at_eof());
-  EXPECT_NE(E, I);
-
-  EXPECT_EQ("line 1", *I);
-  EXPECT_EQ(1, I.line_number());
-  ++I;
-  EXPECT_EQ("line 2", *I);
-  EXPECT_EQ(2, I.line_number());
-  ++I;
-  EXPECT_EQ("line 5", *I);
-  EXPECT_EQ(5, I.line_number());
-  ++I;
-
-  EXPECT_TRUE(I.is_at_eof());
-  EXPECT_EQ(E, I);
-}
-
-TEST(LineIteratorTest, CommentSkippingKeepBlanks) {
-  std::unique_ptr<MemoryBuffer> Buffer(
-      MemoryBuffer::getMemBuffer("line 1\n"
-                                 "line 2\n"
-                                 "# Comment 1\n"
-                                 "# Comment 2\n"
-                                 "\n"
-                                 "line 6\n"
-                                 "\n"
-                                 "# Comment 3"));
-
-  line_iterator I = line_iterator(*Buffer, false, '#'), E;
-
-  EXPECT_FALSE(I.is_at_eof());
-  EXPECT_NE(E, I);
-
-  EXPECT_EQ("line 1", *I);
-  EXPECT_EQ(1, I.line_number());
-  ++I;
-  EXPECT_EQ("line 2", *I);
-  EXPECT_EQ(2, I.line_number());
-  ++I;
-  EXPECT_EQ("", *I);
-  EXPECT_EQ(5, I.line_number());
-  ++I;
-  EXPECT_EQ("line 6", *I);
-  EXPECT_EQ(6, I.line_number());
-  ++I;
-  EXPECT_EQ("", *I);
-  EXPECT_EQ(7, I.line_number());
-  ++I;
-
-  EXPECT_TRUE(I.is_at_eof());
-  EXPECT_EQ(E, I);
-}
-
-
-TEST(LineIteratorTest, BlankSkipping) {
-  std::unique_ptr<MemoryBuffer> Buffer = MemoryBuffer::getMemBuffer("\n\n\n"
-                                                                    "line 1\n"
-                                                                    "\n\n\n"
-                                                                    "line 2\n"
-                                                                    "\n\n\n");
-
-  line_iterator I = line_iterator(*Buffer), E;
-
-  EXPECT_FALSE(I.is_at_eof());
-  EXPECT_NE(E, I);
-
-  EXPECT_EQ("line 1", *I);
-  EXPECT_EQ(4, I.line_number());
-  ++I;
-  EXPECT_EQ("line 2", *I);
-  EXPECT_EQ(8, I.line_number());
-  ++I;
-
-  EXPECT_TRUE(I.is_at_eof());
-  EXPECT_EQ(E, I);
-}
-
-TEST(LineIteratorTest, BlankKeeping) {
-  std::unique_ptr<MemoryBuffer> Buffer = MemoryBuffer::getMemBuffer("\n\n"
-                                                                    "line 3\n"
-                                                                    "\n"
-                                                                    "line 5\n"
-                                                                    "\n\n");
-  line_iterator I = line_iterator(*Buffer, false), E;
-
-  EXPECT_FALSE(I.is_at_eof());
-  EXPECT_NE(E, I);
-
-  EXPECT_EQ("", *I);
-  EXPECT_EQ(1, I.line_number());
-  ++I;
-  EXPECT_EQ("", *I);
-  EXPECT_EQ(2, I.line_number());
-  ++I;
-  EXPECT_EQ("line 3", *I);
-  EXPECT_EQ(3, I.line_number());
-  ++I;
-  EXPECT_EQ("", *I);
-  EXPECT_EQ(4, I.line_number());
-  ++I;
-  EXPECT_EQ("line 5", *I);
-  EXPECT_EQ(5, I.line_number());
-  ++I;
-  EXPECT_EQ("", *I);
-  EXPECT_EQ(6, I.line_number());
-  ++I;
-  EXPECT_EQ("", *I);
-  EXPECT_EQ(7, I.line_number());
-  ++I;
-
-  EXPECT_TRUE(I.is_at_eof());
-  EXPECT_EQ(E, I);
-}
-
-TEST(LineIteratorTest, EmptyBuffers) {
-  std::unique_ptr<MemoryBuffer> Buffer = MemoryBuffer::getMemBuffer("");
-  EXPECT_TRUE(line_iterator(*Buffer).is_at_eof());
-  EXPECT_EQ(line_iterator(), line_iterator(*Buffer));
-  EXPECT_TRUE(line_iterator(*Buffer, false).is_at_eof());
-  EXPECT_EQ(line_iterator(), line_iterator(*Buffer, false));
-
-  Buffer = MemoryBuffer::getMemBuffer("\n\n\n");
-  EXPECT_TRUE(line_iterator(*Buffer).is_at_eof());
-  EXPECT_EQ(line_iterator(), line_iterator(*Buffer));
-
-  Buffer = MemoryBuffer::getMemBuffer("# foo\n"
-                                      "\n"
-                                      "# bar");
-  EXPECT_TRUE(line_iterator(*Buffer, true, '#').is_at_eof());
-  EXPECT_EQ(line_iterator(), line_iterator(*Buffer, true, '#'));
-
-  Buffer = MemoryBuffer::getMemBuffer("\n"
-                                      "# baz\n"
-                                      "\n");
-  EXPECT_TRUE(line_iterator(*Buffer, true, '#').is_at_eof());
-  EXPECT_EQ(line_iterator(), line_iterator(*Buffer, true, '#'));
-}
-
-} // anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/Support/LinearPolyBaseTest.cpp b/gnu/llvm/llvm/unittests/Support/LinearPolyBaseTest.cpp
deleted file mode 100644
index 6942ea2a14e..00000000000
--- a/gnu/llvm/llvm/unittests/Support/LinearPolyBaseTest.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-//===- TestPoly3D.cpp - Poly3D unit tests------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/TypeSize.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-class Poly3D;
-
-namespace llvm {
-template <> struct LinearPolyBaseTypeTraits<Poly3D> {
-  using ScalarTy = int64_t;
-  static const unsigned Dimensions = 3;
-};
-}
-
-using Poly3DBase = LinearPolyBase<Poly3D>;
-class Poly3D : public Poly3DBase {
-public:
-  using ScalarTy = Poly3DBase::ScalarTy;
-  Poly3D(ScalarTy x, ScalarTy y, ScalarTy z) : Poly3DBase({x, y, z}) {}
-  Poly3D(const Poly3DBase &Convert) : Poly3DBase(Convert) {}
-};
-
-TEST(LinearPolyBase, Poly3D_isZero) {
-  EXPECT_TRUE(Poly3D(0, 0, 0).isZero());
-  EXPECT_TRUE(Poly3D(0, 0, 1).isNonZero());
-  EXPECT_TRUE(Poly3D(0, 0, 1));
-}
-
-TEST(LinearPolyBase, Poly3D_Equality) {
-  EXPECT_EQ(Poly3D(1, 2, 3), Poly3D(1, 2, 3));
-  EXPECT_NE(Poly3D(1, 2, 3), Poly3D(1, 2, 4));
-}
-
-TEST(LinearPolyBase, Poly3D_GetValue) {
-  EXPECT_EQ(Poly3D(1, 2, 3).getValue(0), 1);
-  EXPECT_EQ(Poly3D(1, 2, 3).getValue(1), 2);
-  EXPECT_EQ(Poly3D(1, 2, 3).getValue(2), 3);
-}
-
-TEST(LinearPolyBase, Poly3D_Add) {
-  // Test operator+
-  EXPECT_EQ(Poly3D(42, 0, 0) + Poly3D(0, 42, 0) + Poly3D(0, 0, 42),
-            Poly3D(42, 42, 42));
-
-  // Test operator+=
-  Poly3D X(42, 0, 0);
-  X += Poly3D(0, 42, 0);
-  X += Poly3D(0, 0, 42);
-  EXPECT_EQ(X, Poly3D(42, 42, 42));
-}
-
-TEST(LinearPolyBase, Poly3D_Sub) {
-  // Test operator-
-  EXPECT_EQ(Poly3D(42, 42, 42) - Poly3D(42, 0, 0) - Poly3D(0, 42, 0) -
-                Poly3D(0, 0, 42),
-            Poly3D(0, 0, 0));
-
-  // Test operator-=
-  Poly3D X(42, 42, 42);
-  X -= Poly3D(42, 0, 0);
-  X -= Poly3D(0, 42, 0);
-  X -= Poly3D(0, 0, 42);
-  EXPECT_EQ(X, Poly3D(0, 0, 0));
-}
-
-TEST(LinearPolyBase, Poly3D_Scale) {
-  // Test operator*
-  EXPECT_EQ(Poly3D(1, 2, 4) * 2, Poly3D(2, 4, 8));
-  EXPECT_EQ(Poly3D(1, 2, 4) * -2, Poly3D(-2, -4, -8));
-}
-
-TEST(LinearPolyBase, Poly3D_Invert) {
-  // Test operator-
-  EXPECT_EQ(-Poly3D(2, 4, 8), Poly3D(-2, -4, -8));
-}
-
-class Univariate3D;
-namespace llvm {
-template <> struct LinearPolyBaseTypeTraits<Univariate3D> {
-  using ScalarTy = int64_t;
-  static const unsigned Dimensions = 3;
-};
-}
-
-using Univariate3DBase = UnivariateLinearPolyBase<Univariate3D>;
-class Univariate3D : public Univariate3DBase {
-public:
-  using ScalarTy = Univariate3DBase::ScalarTy;
-  Univariate3D(ScalarTy x, unsigned Dim) : Univariate3DBase(x, Dim) {}
-  Univariate3D(const Univariate3DBase &Convert) : Univariate3DBase(Convert) {}
-};
-
-TEST(UnivariateLinearPolyBase, Univariate3D_isZero) {
-  EXPECT_TRUE(Univariate3D(0, 0).isZero());
-  EXPECT_TRUE(Univariate3D(0, 1).isZero());
-  EXPECT_TRUE(Univariate3D(0, 2).isZero());
-  EXPECT_TRUE(Univariate3D(1, 0).isNonZero());
-  EXPECT_TRUE(Univariate3D(1, 1).isNonZero());
-  EXPECT_TRUE(Univariate3D(1, 2).isNonZero());
-  EXPECT_TRUE(Univariate3D(1, 0));
-}
-
-TEST(UnivariateLinearPolyBase, Univariate3D_Equality) {
-  EXPECT_EQ(Univariate3D(1, 0), Univariate3D(1, 0));
-  EXPECT_NE(Univariate3D(1, 0), Univariate3D(1, 2));
-  EXPECT_NE(Univariate3D(1, 0), Univariate3D(1, 1));
-  EXPECT_NE(Univariate3D(1, 0), Univariate3D(2, 0));
-  EXPECT_NE(Univariate3D(1, 0), Univariate3D(0, 0));
-}
-
-TEST(UnivariateLinearPolyBase, Univariate3D_GetValue) {
-  EXPECT_EQ(Univariate3D(42, 0).getValue(0), 42);
-  EXPECT_EQ(Univariate3D(42, 0).getValue(1), 0);
-  EXPECT_EQ(Univariate3D(42, 0).getValue(2), 0);
-
-  EXPECT_EQ(Univariate3D(42, 1).getValue(0), 0);
-  EXPECT_EQ(Univariate3D(42, 1).getValue(1), 42);
-  EXPECT_EQ(Univariate3D(42, 1).getValue(2), 0);
-
-  EXPECT_EQ(Univariate3D(42, 0).getValue(), 42);
-  EXPECT_EQ(Univariate3D(42, 1).getValue(), 42);
-}
-
-TEST(UnivariateLinearPolyBase, Univariate3D_Add) {
-  // Test operator+
-  EXPECT_EQ(Univariate3D(42, 0) + Univariate3D(42, 0), Univariate3D(84, 0));
-  EXPECT_EQ(Univariate3D(42, 1) + Univariate3D(42, 1), Univariate3D(84, 1));
-  EXPECT_DEBUG_DEATH(Univariate3D(42, 0) + Univariate3D(42, 1),
-                     "Invalid dimensions");
-
-  // Test operator+=
-  Univariate3D X(42, 0);
-  X += Univariate3D(42, 0);
-  EXPECT_EQ(X, Univariate3D(84, 0));
-
-  // Test 'getWithIncrement' method
-  EXPECT_EQ(Univariate3D(42, 0).getWithIncrement(1), Univariate3D(43, 0));
-  EXPECT_EQ(Univariate3D(42, 1).getWithIncrement(2), Univariate3D(44, 1));
-  EXPECT_EQ(Univariate3D(42, 2).getWithIncrement(3), Univariate3D(45, 2));
-}
-
-TEST(UnivariateLinearPolyBase, Univariate3D_Sub) {
-  // Test operator+
-  EXPECT_EQ(Univariate3D(84, 0) - Univariate3D(42, 0), Univariate3D(42, 0));
-  EXPECT_EQ(Univariate3D(84, 1) - Univariate3D(42, 1), Univariate3D(42, 1));
-  EXPECT_DEBUG_DEATH(Univariate3D(84, 0) - Univariate3D(42, 1),
-                     "Invalid dimensions");
-
-  // Test operator+=
-  Univariate3D X(84, 0);
-  X -= Univariate3D(42, 0);
-  EXPECT_EQ(X, Univariate3D(42, 0));
-
-  // Test 'getWithDecrement' method
-  EXPECT_EQ(Univariate3D(43, 0).getWithDecrement(1), Univariate3D(42, 0));
-  EXPECT_EQ(Univariate3D(44, 1).getWithDecrement(2), Univariate3D(42, 1));
-  EXPECT_EQ(Univariate3D(45, 2).getWithDecrement(3), Univariate3D(42, 2));
-}
-
-TEST(UnivariateLinearPolyBase, Univariate3D_Scale) {
-  // Test operator*
-  EXPECT_EQ(Univariate3D(4, 0) * 2, Univariate3D(8, 0));
-  EXPECT_EQ(Univariate3D(4, 1) * -2, Univariate3D(-8, 1));
-}
-
-TEST(UnivariateLinearPolyBase, Univariate3D_Invert) {
-  // Test operator-
-  EXPECT_EQ(-Univariate3D(4, 0), Univariate3D(-4, 0));
-  EXPECT_EQ(-Univariate3D(4, 1), Univariate3D(-4, 1));
-}
-
diff --git a/gnu/llvm/llvm/unittests/Support/LockFileManagerTest.cpp b/gnu/llvm/llvm/unittests/Support/LockFileManagerTest.cpp
deleted file mode 100644
index 552053d46e8..00000000000
--- a/gnu/llvm/llvm/unittests/Support/LockFileManagerTest.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-//===- unittests/LockFileManagerTest.cpp - LockFileManager tests ----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/LockFileManager.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Testing/Support/SupportHelpers.h"
-#include "gtest/gtest.h"
-#include <memory>
-
-using namespace llvm;
-using llvm::unittest::TempDir;
-
-namespace {
-
-TEST(LockFileManagerTest, Basic) {
-  TempDir TmpDir("LockFileManagerTestDir", /*Unique*/ true);
-
-  SmallString<64> LockedFile(TmpDir.path());
-  sys::path::append(LockedFile, "file.lock");
-
-  {
-    // The lock file should not exist, so we should successfully acquire it.
-    LockFileManager Locked1(LockedFile);
-    EXPECT_EQ(LockFileManager::LFS_Owned, Locked1.getState());
-
-    // Attempting to reacquire the lock should fail.  Waiting on it would cause
-    // deadlock, so don't try that.
-    LockFileManager Locked2(LockedFile);
-    EXPECT_NE(LockFileManager::LFS_Owned, Locked2.getState());
-  }
-
-  // Now that the lock is out of scope, the file should be gone.
-  EXPECT_FALSE(sys::fs::exists(LockedFile.str()));
-}
-
-TEST(LockFileManagerTest, LinkLockExists) {
-  TempDir LockFileManagerTestDir("LockFileManagerTestDir", /*Unique*/ true);
-
-  SmallString<64> LockedFile(LockFileManagerTestDir.path());
-  sys::path::append(LockedFile, "file");
-
-  SmallString<64> FileLocK(LockFileManagerTestDir.path());
-  sys::path::append(FileLocK, "file.lock");
-
-  SmallString<64> TmpFileLock(LockFileManagerTestDir.path());
-  sys::path::append(TmpFileLock, "file.lock-000");
-
-  int FD;
-  std::error_code EC = sys::fs::openFileForWrite(TmpFileLock.str(), FD);
-  ASSERT_FALSE(EC);
-
-  int Ret = close(FD);
-  ASSERT_EQ(Ret, 0);
-
-  EC = sys::fs::create_link(TmpFileLock.str(), FileLocK.str());
-  ASSERT_FALSE(EC);
-
-  EC = sys::fs::remove(TmpFileLock.str());
-  ASSERT_FALSE(EC);
-
-  {
-    // The lock file doesn't point to a real file, so we should successfully
-    // acquire it.
-    LockFileManager Locked(LockedFile);
-    EXPECT_EQ(LockFileManager::LFS_Owned, Locked.getState());
-  }
-
-  // Now that the lock is out of scope, the file should be gone.
-  EXPECT_FALSE(sys::fs::exists(LockedFile.str()));
-}
-
-
-TEST(LockFileManagerTest, RelativePath) {
-  TempDir LockFileManagerTestDir("LockFileManagerTestDir", /*Unique*/ true);
-
-  char PathBuf[1024];
-  const char *OrigPath = getcwd(PathBuf, 1024);
-  ASSERT_FALSE(chdir(LockFileManagerTestDir.c_str()));
-
-  TempDir inner("inner");
-  SmallString<64> LockedFile(inner.path());
-  sys::path::append(LockedFile, "file");
-
-  SmallString<64> FileLock(LockedFile);
-  FileLock += ".lock";
-
-  {
-    // The lock file should not exist, so we should successfully acquire it.
-    LockFileManager Locked(LockedFile);
-    EXPECT_EQ(LockFileManager::LFS_Owned, Locked.getState());
-    EXPECT_TRUE(sys::fs::exists(FileLock.str()));
-  }
-
-  // Now that the lock is out of scope, the file should be gone.
-  EXPECT_FALSE(sys::fs::exists(LockedFile.str()));
-  EXPECT_FALSE(sys::fs::exists(FileLock.str()));
-
-  ASSERT_FALSE(chdir(OrigPath));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/Support/MD5Test.cpp b/gnu/llvm/llvm/unittests/Support/MD5Test.cpp
deleted file mode 100644
index 3a24e1fa697..00000000000
--- a/gnu/llvm/llvm/unittests/Support/MD5Test.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-//===- llvm/unittest/Support/MD5Test.cpp - MD5 tests ----------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements unit tests for the MD5 functions.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/MD5.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/SmallString.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-/// Tests an arbitrary set of bytes passed as \p Input.
-void TestMD5Sum(ArrayRef<uint8_t> Input, StringRef Final) {
-  MD5 Hash;
-  Hash.update(Input);
-  MD5::MD5Result MD5Res;
-  Hash.final(MD5Res);
-  SmallString<32> Res;
-  MD5::stringifyResult(MD5Res, Res);
-  EXPECT_EQ(Res, Final);
-}
-
-void TestMD5Sum(StringRef Input, StringRef Final) {
-  MD5 Hash;
-  Hash.update(Input);
-  MD5::MD5Result MD5Res;
-  Hash.final(MD5Res);
-  SmallString<32> Res;
-  MD5::stringifyResult(MD5Res, Res);
-  EXPECT_EQ(Res, Final);
-}
-
-TEST(MD5Test, MD5) {
-  TestMD5Sum(makeArrayRef((const uint8_t *)"", (size_t) 0),
-             "d41d8cd98f00b204e9800998ecf8427e");
-  TestMD5Sum(makeArrayRef((const uint8_t *)"a", (size_t) 1),
-             "0cc175b9c0f1b6a831c399e269772661");
-  TestMD5Sum(makeArrayRef((const uint8_t *)"abcdefghijklmnopqrstuvwxyz",
-                          (size_t) 26),
-             "c3fcd3d76192e4007dfb496cca67e13b");
-  TestMD5Sum(makeArrayRef((const uint8_t *)"\0", (size_t) 1),
-             "93b885adfe0da089cdf634904fd59f71");
-  TestMD5Sum(makeArrayRef((const uint8_t *)"a\0", (size_t) 2),
-             "4144e195f46de78a3623da7364d04f11");
-  TestMD5Sum(makeArrayRef((const uint8_t *)"abcdefghijklmnopqrstuvwxyz\0",
-                          (size_t) 27),
-             "81948d1f1554f58cd1a56ebb01f808cb");
-  TestMD5Sum("abcdefghijklmnopqrstuvwxyz", "c3fcd3d76192e4007dfb496cca67e13b");
-}
-
-TEST(MD5HashTest, MD5) {
-  ArrayRef<uint8_t> Input((const uint8_t *)"abcdefghijklmnopqrstuvwxyz", 26);
-  std::array<uint8_t, 16> Vec = MD5::hash(Input);
-  MD5::MD5Result MD5Res;
-  SmallString<32> Res;
-  memcpy(MD5Res.Bytes.data(), Vec.data(), Vec.size());
-  MD5::stringifyResult(MD5Res, Res);
-  EXPECT_EQ(Res, "c3fcd3d76192e4007dfb496cca67e13b");
-  EXPECT_EQ(0x3be167ca6c49fb7dULL, MD5Res.high());
-  EXPECT_EQ(0x00e49261d7d3fcc3ULL, MD5Res.low());
-}
-}
diff --git a/gnu/llvm/llvm/unittests/Support/ManagedStatic.cpp b/gnu/llvm/llvm/unittests/Support/ManagedStatic.cpp
deleted file mode 100644
index 3e9e3f52e41..00000000000
--- a/gnu/llvm/llvm/unittests/Support/ManagedStatic.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-//===- llvm/unittest/Support/ManagedStatic.cpp - ManagedStatic tests ------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/Allocator.h"
-#include "llvm/Support/ManagedStatic.h"
-#include "llvm/Config/config.h"
-#ifdef HAVE_PTHREAD_H
-#include <pthread.h>
-#endif
-
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-#if LLVM_ENABLE_THREADS != 0 && defined(HAVE_PTHREAD_H) && \
-  !__has_feature(memory_sanitizer)
-namespace test1 {
-  llvm::ManagedStatic<int> ms;
-  void *helper(void*) {
-    *ms;
-    return nullptr;
-  }
-
-  // Valgrind's leak checker complains glibc's stack allocation.
-  // To appease valgrind, we provide our own stack for each thread.
-  void *allocate_stack(pthread_attr_t &a, size_t n = 65536) {
-    void *stack = safe_malloc(n);
-    pthread_attr_init(&a);
-#if defined(__linux__)
-    pthread_attr_setstack(&a, stack, n);
-#endif
-    return stack;
-  }
-}
-
-TEST(Initialize, MultipleThreads) {
-  // Run this test under tsan: http://code.google.com/p/data-race-test/
-
-  pthread_attr_t a1, a2;
-  void *p1 = test1::allocate_stack(a1);
-  void *p2 = test1::allocate_stack(a2);
-
-  pthread_t t1, t2;
-  pthread_create(&t1, &a1, test1::helper, nullptr);
-  pthread_create(&t2, &a2, test1::helper, nullptr);
-  pthread_join(t1, nullptr);
-  pthread_join(t2, nullptr);
-  free(p1);
-  free(p2);
-}
-#endif
-
-namespace NestedStatics {
-static ManagedStatic<int> Ms1;
-struct Nest {
-  Nest() {
-    ++(*Ms1);
-  }
-
-  ~Nest() {
-    assert(Ms1.isConstructed());
-    ++(*Ms1);
-  }
-};
-static ManagedStatic<Nest> Ms2;
-
-TEST(ManagedStaticTest, NestedStatics) {
-  EXPECT_FALSE(Ms1.isConstructed());
-  EXPECT_FALSE(Ms2.isConstructed());
-
-  *Ms2;
-  EXPECT_TRUE(Ms1.isConstructed());
-  EXPECT_TRUE(Ms2.isConstructed());
-}
-} // namespace NestedStatics
-
-namespace CustomCreatorDeletor {
-struct CustomCreate {
-  static void *call() {
-    void *Mem = safe_malloc(sizeof(int));
-    *((int *)Mem) = 42;
-    return Mem;
-  }
-};
-struct CustomDelete {
-  static void call(void *P) { std::free(P); }
-};
-static ManagedStatic<int, CustomCreate, CustomDelete> Custom;
-TEST(ManagedStaticTest, CustomCreatorDeletor) {
-  EXPECT_EQ(42, *Custom);
-}
-} // namespace CustomCreatorDeletor
-
-} // anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/Support/MatchersTest.cpp b/gnu/llvm/llvm/unittests/Support/MatchersTest.cpp
deleted file mode 100644
index 3248686fba9..00000000000
--- a/gnu/llvm/llvm/unittests/Support/MatchersTest.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-//===----- unittests/MatchersTest.cpp -------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/Optional.h"
-#include "llvm/Testing/Support/SupportHelpers.h"
-#include "gmock/gmock-matchers.h"
-
-using ::testing::_;
-using ::testing::AllOf;
-using ::testing::Gt;
-using ::testing::Lt;
-using ::testing::Not;
-
-namespace {
-TEST(MatchersTest, Optional) {
-  EXPECT_THAT(llvm::Optional<int>(llvm::None), Not(llvm::ValueIs(_)));
-  EXPECT_THAT(llvm::Optional<int>(10), llvm::ValueIs(10));
-  EXPECT_THAT(llvm::Optional<int>(10), llvm::ValueIs(AllOf(Lt(11), Gt(9))));
-}
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/Support/MathExtrasTest.cpp b/gnu/llvm/llvm/unittests/Support/MathExtrasTest.cpp
deleted file mode 100644
index 6088fdc1e5a..00000000000
--- a/gnu/llvm/llvm/unittests/Support/MathExtrasTest.cpp
+++ /dev/null
@@ -1,607 +0,0 @@
-//===- unittests/Support/MathExtrasTest.cpp - math utils tests ------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/MathExtras.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST(MathExtras, countTrailingZeros) {
-  uint8_t Z8 = 0;
-  uint16_t Z16 = 0;
-  uint32_t Z32 = 0;
-  uint64_t Z64 = 0;
-  EXPECT_EQ(8u, countTrailingZeros(Z8));
-  EXPECT_EQ(16u, countTrailingZeros(Z16));
-  EXPECT_EQ(32u, countTrailingZeros(Z32));
-  EXPECT_EQ(64u, countTrailingZeros(Z64));
-
-  uint8_t NZ8 = 42;
-  uint16_t NZ16 = 42;
-  uint32_t NZ32 = 42;
-  uint64_t NZ64 = 42;
-  EXPECT_EQ(1u, countTrailingZeros(NZ8));
-  EXPECT_EQ(1u, countTrailingZeros(NZ16));
-  EXPECT_EQ(1u, countTrailingZeros(NZ32));
-  EXPECT_EQ(1u, countTrailingZeros(NZ64));
-}
-
-TEST(MathExtras, countLeadingZeros) {
-  uint8_t Z8 = 0;
-  uint16_t Z16 = 0;
-  uint32_t Z32 = 0;
-  uint64_t Z64 = 0;
-  EXPECT_EQ(8u, countLeadingZeros(Z8));
-  EXPECT_EQ(16u, countLeadingZeros(Z16));
-  EXPECT_EQ(32u, countLeadingZeros(Z32));
-  EXPECT_EQ(64u, countLeadingZeros(Z64));
-
-  uint8_t NZ8 = 42;
-  uint16_t NZ16 = 42;
-  uint32_t NZ32 = 42;
-  uint64_t NZ64 = 42;
-  EXPECT_EQ(2u, countLeadingZeros(NZ8));
-  EXPECT_EQ(10u, countLeadingZeros(NZ16));
-  EXPECT_EQ(26u, countLeadingZeros(NZ32));
-  EXPECT_EQ(58u, countLeadingZeros(NZ64));
-
-  EXPECT_EQ(8u, countLeadingZeros(0x00F000FFu));
-  EXPECT_EQ(8u, countLeadingZeros(0x00F12345u));
-  for (unsigned i = 0; i <= 30; ++i) {
-    EXPECT_EQ(31 - i, countLeadingZeros(1u << i));
-  }
-
-  EXPECT_EQ(8u, countLeadingZeros(0x00F1234500F12345ULL));
-  EXPECT_EQ(1u, countLeadingZeros(1ULL << 62));
-  for (unsigned i = 0; i <= 62; ++i) {
-    EXPECT_EQ(63 - i, countLeadingZeros(1ULL << i));
-  }
-}
-
-TEST(MathExtras, onesMask) {
-  EXPECT_EQ(0U, maskLeadingOnes<uint8_t>(0));
-  EXPECT_EQ(0U, maskTrailingOnes<uint8_t>(0));
-  EXPECT_EQ(0U, maskLeadingOnes<uint16_t>(0));
-  EXPECT_EQ(0U, maskTrailingOnes<uint16_t>(0));
-  EXPECT_EQ(0U, maskLeadingOnes<uint32_t>(0));
-  EXPECT_EQ(0U, maskTrailingOnes<uint32_t>(0));
-  EXPECT_EQ(0U, maskLeadingOnes<uint64_t>(0));
-  EXPECT_EQ(0U, maskTrailingOnes<uint64_t>(0));
-
-  EXPECT_EQ(0x00000003U, maskTrailingOnes<uint32_t>(2U));
-  EXPECT_EQ(0xC0000000U, maskLeadingOnes<uint32_t>(2U));
-
-  EXPECT_EQ(0x000007FFU, maskTrailingOnes<uint32_t>(11U));
-  EXPECT_EQ(0xFFE00000U, maskLeadingOnes<uint32_t>(11U));
-
-  EXPECT_EQ(0xFFFFFFFFU, maskTrailingOnes<uint32_t>(32U));
-  EXPECT_EQ(0xFFFFFFFFU, maskLeadingOnes<uint32_t>(32U));
-  EXPECT_EQ(0xFFFFFFFFFFFFFFFFULL, maskTrailingOnes<uint64_t>(64U));
-  EXPECT_EQ(0xFFFFFFFFFFFFFFFFULL, maskLeadingOnes<uint64_t>(64U));
-
-  EXPECT_EQ(0x0000FFFFFFFFFFFFULL, maskTrailingOnes<uint64_t>(48U));
-  EXPECT_EQ(0xFFFFFFFFFFFF0000ULL, maskLeadingOnes<uint64_t>(48U));
-}
-
-TEST(MathExtras, findFirstSet) {
-  uint8_t Z8 = 0;
-  uint16_t Z16 = 0;
-  uint32_t Z32 = 0;
-  uint64_t Z64 = 0;
-  EXPECT_EQ(0xFFULL, findFirstSet(Z8));
-  EXPECT_EQ(0xFFFFULL, findFirstSet(Z16));
-  EXPECT_EQ(0xFFFFFFFFULL, findFirstSet(Z32));
-  EXPECT_EQ(0xFFFFFFFFFFFFFFFFULL, findFirstSet(Z64));
-
-  uint8_t NZ8 = 42;
-  uint16_t NZ16 = 42;
-  uint32_t NZ32 = 42;
-  uint64_t NZ64 = 42;
-  EXPECT_EQ(1u, findFirstSet(NZ8));
-  EXPECT_EQ(1u, findFirstSet(NZ16));
-  EXPECT_EQ(1u, findFirstSet(NZ32));
-  EXPECT_EQ(1u, findFirstSet(NZ64));
-}
-
-TEST(MathExtras, findLastSet) {
-  uint8_t Z8 = 0;
-  uint16_t Z16 = 0;
-  uint32_t Z32 = 0;
-  uint64_t Z64 = 0;
-  EXPECT_EQ(0xFFULL, findLastSet(Z8));
-  EXPECT_EQ(0xFFFFULL, findLastSet(Z16));
-  EXPECT_EQ(0xFFFFFFFFULL, findLastSet(Z32));
-  EXPECT_EQ(0xFFFFFFFFFFFFFFFFULL, findLastSet(Z64));
-
-  uint8_t NZ8 = 42;
-  uint16_t NZ16 = 42;
-  uint32_t NZ32 = 42;
-  uint64_t NZ64 = 42;
-  EXPECT_EQ(5u, findLastSet(NZ8));
-  EXPECT_EQ(5u, findLastSet(NZ16));
-  EXPECT_EQ(5u, findLastSet(NZ32));
-  EXPECT_EQ(5u, findLastSet(NZ64));
-}
-
-TEST(MathExtras, isIntN) {
-  EXPECT_TRUE(isIntN(16, 32767));
-  EXPECT_FALSE(isIntN(16, 32768));
-}
-
-TEST(MathExtras, isUIntN) {
-  EXPECT_TRUE(isUIntN(16, 65535));
-  EXPECT_FALSE(isUIntN(16, 65536));
-  EXPECT_TRUE(isUIntN(1, 0));
-  EXPECT_TRUE(isUIntN(6, 63));
-}
-
-TEST(MathExtras, maxIntN) {
-  EXPECT_EQ(32767, maxIntN(16));
-  EXPECT_EQ(2147483647, maxIntN(32));
-  EXPECT_EQ(std::numeric_limits<int32_t>::max(), maxIntN(32));
-  EXPECT_EQ(std::numeric_limits<int64_t>::max(), maxIntN(64));
-}
-
-TEST(MathExtras, minIntN) {
-  EXPECT_EQ(-32768LL, minIntN(16));
-  EXPECT_EQ(-64LL, minIntN(7));
-  EXPECT_EQ(std::numeric_limits<int32_t>::min(), minIntN(32));
-  EXPECT_EQ(std::numeric_limits<int64_t>::min(), minIntN(64));
-}
-
-TEST(MathExtras, maxUIntN) {
-  EXPECT_EQ(0xffffULL, maxUIntN(16));
-  EXPECT_EQ(0xffffffffULL, maxUIntN(32));
-  EXPECT_EQ(0xffffffffffffffffULL, maxUIntN(64));
-  EXPECT_EQ(1ULL, maxUIntN(1));
-  EXPECT_EQ(0x0fULL, maxUIntN(4));
-}
-
-TEST(MathExtras, reverseBits) {
-  uint8_t NZ8 = 42;
-  uint16_t NZ16 = 42;
-  uint32_t NZ32 = 42;
-  uint64_t NZ64 = 42;
-  EXPECT_EQ(0x54ULL, reverseBits(NZ8));
-  EXPECT_EQ(0x5400ULL, reverseBits(NZ16));
-  EXPECT_EQ(0x54000000ULL, reverseBits(NZ32));
-  EXPECT_EQ(0x5400000000000000ULL, reverseBits(NZ64));
-}
-
-TEST(MathExtras, isPowerOf2_32) {
-  EXPECT_FALSE(isPowerOf2_32(0));
-  EXPECT_TRUE(isPowerOf2_32(1 << 6));
-  EXPECT_TRUE(isPowerOf2_32(1 << 12));
-  EXPECT_FALSE(isPowerOf2_32((1 << 19) + 3));
-  EXPECT_FALSE(isPowerOf2_32(0xABCDEF0));
-}
-
-TEST(MathExtras, isPowerOf2_64) {
-  EXPECT_FALSE(isPowerOf2_64(0));
-  EXPECT_TRUE(isPowerOf2_64(1LL << 46));
-  EXPECT_TRUE(isPowerOf2_64(1LL << 12));
-  EXPECT_FALSE(isPowerOf2_64((1LL << 53) + 3));
-  EXPECT_FALSE(isPowerOf2_64(0xABCDEF0ABCDEF0LL));
-}
-
-TEST(MathExtras, PowerOf2Ceil) {
-  EXPECT_EQ(0U, PowerOf2Ceil(0U));
-  EXPECT_EQ(8U, PowerOf2Ceil(8U));
-  EXPECT_EQ(8U, PowerOf2Ceil(7U));
-}
-
-TEST(MathExtras, PowerOf2Floor) {
-  EXPECT_EQ(0U, PowerOf2Floor(0U));
-  EXPECT_EQ(8U, PowerOf2Floor(8U));
-  EXPECT_EQ(4U, PowerOf2Floor(7U));
-}
-
-TEST(MathExtras, CTLog2) {
-  EXPECT_EQ(CTLog2<1ULL << 0>(), 0U);
-  EXPECT_EQ(CTLog2<1ULL << 1>(), 1U);
-  EXPECT_EQ(CTLog2<1ULL << 2>(), 2U);
-  EXPECT_EQ(CTLog2<1ULL << 3>(), 3U);
-  EXPECT_EQ(CTLog2<1ULL << 4>(), 4U);
-  EXPECT_EQ(CTLog2<1ULL << 5>(), 5U);
-  EXPECT_EQ(CTLog2<1ULL << 6>(), 6U);
-  EXPECT_EQ(CTLog2<1ULL << 7>(), 7U);
-  EXPECT_EQ(CTLog2<1ULL << 8>(), 8U);
-  EXPECT_EQ(CTLog2<1ULL << 9>(), 9U);
-  EXPECT_EQ(CTLog2<1ULL << 10>(), 10U);
-  EXPECT_EQ(CTLog2<1ULL << 11>(), 11U);
-  EXPECT_EQ(CTLog2<1ULL << 12>(), 12U);
-  EXPECT_EQ(CTLog2<1ULL << 13>(), 13U);
-  EXPECT_EQ(CTLog2<1ULL << 14>(), 14U);
-  EXPECT_EQ(CTLog2<1ULL << 15>(), 15U);
-}
-
-TEST(MathExtras, countLeadingOnes) {
-  for (int i = 30; i >= 0; --i) {
-    // Start with all ones and unset some bit.
-    EXPECT_EQ(31u - i, countLeadingOnes(0xFFFFFFFF ^ (1 << i)));
-  }
-  for (int i = 62; i >= 0; --i) {
-    // Start with all ones and unset some bit.
-    EXPECT_EQ(63u - i, countLeadingOnes(0xFFFFFFFFFFFFFFFFULL ^ (1LL << i)));
-  }
-  for (int i = 30; i >= 0; --i) {
-    // Start with all ones and unset some bit.
-    EXPECT_EQ(31u - i, countLeadingOnes(0xFFFFFFFF ^ (1 << i)));
-  }
-}
-
-TEST(MathExtras, FloatBits) {
-  static const float kValue = 5632.34f;
-  EXPECT_FLOAT_EQ(kValue, BitsToFloat(FloatToBits(kValue)));
-}
-
-TEST(MathExtras, DoubleBits) {
-  static const double kValue = 87987234.983498;
-  EXPECT_DOUBLE_EQ(kValue, BitsToDouble(DoubleToBits(kValue)));
-}
-
-TEST(MathExtras, MinAlign) {
-  EXPECT_EQ(1u, MinAlign(2, 3));
-  EXPECT_EQ(2u, MinAlign(2, 4));
-  EXPECT_EQ(1u, MinAlign(17, 64));
-  EXPECT_EQ(256u, MinAlign(256, 512));
-}
-
-TEST(MathExtras, NextPowerOf2) {
-  EXPECT_EQ(4u, NextPowerOf2(3));
-  EXPECT_EQ(16u, NextPowerOf2(15));
-  EXPECT_EQ(256u, NextPowerOf2(128));
-}
-
-TEST(MathExtras, alignTo) {
-  EXPECT_EQ(8u, alignTo(5, 8));
-  EXPECT_EQ(24u, alignTo(17, 8));
-  EXPECT_EQ(0u, alignTo(~0LL, 8));
-
-  EXPECT_EQ(7u, alignTo(5, 8, 7));
-  EXPECT_EQ(17u, alignTo(17, 8, 1));
-  EXPECT_EQ(3u, alignTo(~0LL, 8, 3));
-  EXPECT_EQ(552u, alignTo(321, 255, 42));
-}
-
-template<typename T>
-void SaturatingAddTestHelper()
-{
-  const T Max = std::numeric_limits<T>::max();
-  bool ResultOverflowed;
-
-  EXPECT_EQ(T(3), SaturatingAdd(T(1), T(2)));
-  EXPECT_EQ(T(3), SaturatingAdd(T(1), T(2), &ResultOverflowed));
-  EXPECT_FALSE(ResultOverflowed);
-
-  EXPECT_EQ(Max, SaturatingAdd(Max, T(1)));
-  EXPECT_EQ(Max, SaturatingAdd(Max, T(1), &ResultOverflowed));
-  EXPECT_TRUE(ResultOverflowed);
-
-  EXPECT_EQ(Max, SaturatingAdd(T(1), T(Max - 1)));
-  EXPECT_EQ(Max, SaturatingAdd(T(1), T(Max - 1), &ResultOverflowed));
-  EXPECT_FALSE(ResultOverflowed);
-
-  EXPECT_EQ(Max, SaturatingAdd(T(1), Max));
-  EXPECT_EQ(Max, SaturatingAdd(T(1), Max, &ResultOverflowed));
-  EXPECT_TRUE(ResultOverflowed);
-
-  EXPECT_EQ(Max, SaturatingAdd(Max, Max));
-  EXPECT_EQ(Max, SaturatingAdd(Max, Max, &ResultOverflowed));
-  EXPECT_TRUE(ResultOverflowed);
-}
-
-TEST(MathExtras, SaturatingAdd) {
-  SaturatingAddTestHelper<uint8_t>();
-  SaturatingAddTestHelper<uint16_t>();
-  SaturatingAddTestHelper<uint32_t>();
-  SaturatingAddTestHelper<uint64_t>();
-}
-
-template<typename T>
-void SaturatingMultiplyTestHelper()
-{
-  const T Max = std::numeric_limits<T>::max();
-  bool ResultOverflowed;
-
-  // Test basic multiplication.
-  EXPECT_EQ(T(6), SaturatingMultiply(T(2), T(3)));
-  EXPECT_EQ(T(6), SaturatingMultiply(T(2), T(3), &ResultOverflowed));
-  EXPECT_FALSE(ResultOverflowed);
-
-  EXPECT_EQ(T(6), SaturatingMultiply(T(3), T(2)));
-  EXPECT_EQ(T(6), SaturatingMultiply(T(3), T(2), &ResultOverflowed));
-  EXPECT_FALSE(ResultOverflowed);
-
-  // Test multiplication by zero.
-  EXPECT_EQ(T(0), SaturatingMultiply(T(0), T(0)));
-  EXPECT_EQ(T(0), SaturatingMultiply(T(0), T(0), &ResultOverflowed));
-  EXPECT_FALSE(ResultOverflowed);
-
-  EXPECT_EQ(T(0), SaturatingMultiply(T(1), T(0)));
-  EXPECT_EQ(T(0), SaturatingMultiply(T(1), T(0), &ResultOverflowed));
-  EXPECT_FALSE(ResultOverflowed);
-
-  EXPECT_EQ(T(0), SaturatingMultiply(T(0), T(1)));
-  EXPECT_EQ(T(0), SaturatingMultiply(T(0), T(1), &ResultOverflowed));
-  EXPECT_FALSE(ResultOverflowed);
-
-  EXPECT_EQ(T(0), SaturatingMultiply(Max, T(0)));
-  EXPECT_EQ(T(0), SaturatingMultiply(Max, T(0), &ResultOverflowed));
-  EXPECT_FALSE(ResultOverflowed);
-
-  EXPECT_EQ(T(0), SaturatingMultiply(T(0), Max));
-  EXPECT_EQ(T(0), SaturatingMultiply(T(0), Max, &ResultOverflowed));
-  EXPECT_FALSE(ResultOverflowed);
-
-  // Test multiplication by maximum value.
-  EXPECT_EQ(Max, SaturatingMultiply(Max, T(2)));
-  EXPECT_EQ(Max, SaturatingMultiply(Max, T(2), &ResultOverflowed));
-  EXPECT_TRUE(ResultOverflowed);
-
-  EXPECT_EQ(Max, SaturatingMultiply(T(2), Max));
-  EXPECT_EQ(Max, SaturatingMultiply(T(2), Max, &ResultOverflowed));
-  EXPECT_TRUE(ResultOverflowed);
-
-  EXPECT_EQ(Max, SaturatingMultiply(Max, Max));
-  EXPECT_EQ(Max, SaturatingMultiply(Max, Max, &ResultOverflowed));
-  EXPECT_TRUE(ResultOverflowed);
-
-  // Test interesting boundary conditions for algorithm -
-  // ((1 << A) - 1) * ((1 << B) + K) for K in [-1, 0, 1]
-  // and A + B == std::numeric_limits<T>::digits.
-  // We expect overflow iff A > B and K = 1.
-  const int Digits = std::numeric_limits<T>::digits;
-  for (int A = 1, B = Digits - 1; B >= 1; ++A, --B) {
-    for (int K = -1; K <= 1; ++K) {
-      T X = (T(1) << A) - T(1);
-      T Y = (T(1) << B) + K;
-      bool OverflowExpected = A > B && K == 1;
-
-      if(OverflowExpected) {
-        EXPECT_EQ(Max, SaturatingMultiply(X, Y));
-        EXPECT_EQ(Max, SaturatingMultiply(X, Y, &ResultOverflowed));
-        EXPECT_TRUE(ResultOverflowed);
-      } else {
-        EXPECT_EQ(X * Y, SaturatingMultiply(X, Y));
-        EXPECT_EQ(X * Y, SaturatingMultiply(X, Y, &ResultOverflowed));
-        EXPECT_FALSE(ResultOverflowed);
-      }
-    }
-  }
-}
-
-TEST(MathExtras, SaturatingMultiply) {
-  SaturatingMultiplyTestHelper<uint8_t>();
-  SaturatingMultiplyTestHelper<uint16_t>();
-  SaturatingMultiplyTestHelper<uint32_t>();
-  SaturatingMultiplyTestHelper<uint64_t>();
-}
-
-template<typename T>
-void SaturatingMultiplyAddTestHelper()
-{
-  const T Max = std::numeric_limits<T>::max();
-  bool ResultOverflowed;
-
-  // Test basic multiply-add.
-  EXPECT_EQ(T(16), SaturatingMultiplyAdd(T(2), T(3), T(10)));
-  EXPECT_EQ(T(16), SaturatingMultiplyAdd(T(2), T(3), T(10), &ResultOverflowed));
-  EXPECT_FALSE(ResultOverflowed);
-
-  // Test multiply overflows, add doesn't overflow
-  EXPECT_EQ(Max, SaturatingMultiplyAdd(Max, Max, T(0), &ResultOverflowed));
-  EXPECT_TRUE(ResultOverflowed);
-
-  // Test multiply doesn't overflow, add overflows
-  EXPECT_EQ(Max, SaturatingMultiplyAdd(T(1), T(1), Max, &ResultOverflowed));
-  EXPECT_TRUE(ResultOverflowed);
-
-  // Test multiply-add with Max as operand
-  EXPECT_EQ(Max, SaturatingMultiplyAdd(T(1), T(1), Max, &ResultOverflowed));
-  EXPECT_TRUE(ResultOverflowed);
-
-  EXPECT_EQ(Max, SaturatingMultiplyAdd(T(1), Max, T(1), &ResultOverflowed));
-  EXPECT_TRUE(ResultOverflowed);
-
-  EXPECT_EQ(Max, SaturatingMultiplyAdd(Max, Max, T(1), &ResultOverflowed));
-  EXPECT_TRUE(ResultOverflowed);
-
-  EXPECT_EQ(Max, SaturatingMultiplyAdd(Max, Max, Max, &ResultOverflowed));
-  EXPECT_TRUE(ResultOverflowed);
-
-  // Test multiply-add with 0 as operand
-  EXPECT_EQ(T(1), SaturatingMultiplyAdd(T(1), T(1), T(0), &ResultOverflowed));
-  EXPECT_FALSE(ResultOverflowed);
-
-  EXPECT_EQ(T(1), SaturatingMultiplyAdd(T(1), T(0), T(1), &ResultOverflowed));
-  EXPECT_FALSE(ResultOverflowed);
-
-  EXPECT_EQ(T(1), SaturatingMultiplyAdd(T(0), T(0), T(1), &ResultOverflowed));
-  EXPECT_FALSE(ResultOverflowed);
-
-  EXPECT_EQ(T(0), SaturatingMultiplyAdd(T(0), T(0), T(0), &ResultOverflowed));
-  EXPECT_FALSE(ResultOverflowed);
-
-}
-
-TEST(MathExtras, SaturatingMultiplyAdd) {
-  SaturatingMultiplyAddTestHelper<uint8_t>();
-  SaturatingMultiplyAddTestHelper<uint16_t>();
-  SaturatingMultiplyAddTestHelper<uint32_t>();
-  SaturatingMultiplyAddTestHelper<uint64_t>();
-}
-
-TEST(MathExtras, IsShiftedUInt) {
-  EXPECT_TRUE((isShiftedUInt<1, 0>(0)));
-  EXPECT_TRUE((isShiftedUInt<1, 0>(1)));
-  EXPECT_FALSE((isShiftedUInt<1, 0>(2)));
-  EXPECT_FALSE((isShiftedUInt<1, 0>(3)));
-  EXPECT_FALSE((isShiftedUInt<1, 0>(0x8000000000000000)));
-  EXPECT_TRUE((isShiftedUInt<1, 63>(0x8000000000000000)));
-  EXPECT_TRUE((isShiftedUInt<2, 62>(0xC000000000000000)));
-  EXPECT_FALSE((isShiftedUInt<2, 62>(0xE000000000000000)));
-
-  // 0x201 is ten bits long and has a 1 in the MSB and LSB.
-  EXPECT_TRUE((isShiftedUInt<10, 5>(uint64_t(0x201) << 5)));
-  EXPECT_FALSE((isShiftedUInt<10, 5>(uint64_t(0x201) << 4)));
-  EXPECT_FALSE((isShiftedUInt<10, 5>(uint64_t(0x201) << 6)));
-}
-
-TEST(MathExtras, IsShiftedInt) {
-  EXPECT_TRUE((isShiftedInt<1, 0>(0)));
-  EXPECT_TRUE((isShiftedInt<1, 0>(-1)));
-  EXPECT_FALSE((isShiftedInt<1, 0>(2)));
-  EXPECT_FALSE((isShiftedInt<1, 0>(3)));
-  EXPECT_FALSE((isShiftedInt<1, 0>(0x8000000000000000)));
-  EXPECT_TRUE((isShiftedInt<1, 63>(0x8000000000000000)));
-  EXPECT_TRUE((isShiftedInt<2, 62>(0xC000000000000000)));
-  EXPECT_FALSE((isShiftedInt<2, 62>(0xE000000000000000)));
-
-  // 0x201 is ten bits long and has a 1 in the MSB and LSB.
-  EXPECT_TRUE((isShiftedInt<11, 5>(int64_t(0x201) << 5)));
-  EXPECT_FALSE((isShiftedInt<11, 5>(int64_t(0x201) << 3)));
-  EXPECT_FALSE((isShiftedInt<11, 5>(int64_t(0x201) << 6)));
-  EXPECT_TRUE((isShiftedInt<11, 5>(-(int64_t(0x201) << 5))));
-  EXPECT_FALSE((isShiftedInt<11, 5>(-(int64_t(0x201) << 3))));
-  EXPECT_FALSE((isShiftedInt<11, 5>(-(int64_t(0x201) << 6))));
-
-  EXPECT_TRUE((isShiftedInt<6, 10>(-(int64_t(1) << 15))));
-  EXPECT_FALSE((isShiftedInt<6, 10>(int64_t(1) << 15)));
-}
-
-template <typename T>
-class OverflowTest : public ::testing::Test { };
-
-using OverflowTestTypes = ::testing::Types<signed char, short, int, long,
-                                           long long>;
-
-TYPED_TEST_SUITE(OverflowTest, OverflowTestTypes, );
-
-TYPED_TEST(OverflowTest, AddNoOverflow) {
-  TypeParam Result;
-  EXPECT_FALSE(AddOverflow<TypeParam>(1, 2, Result));
-  EXPECT_EQ(Result, TypeParam(3));
-}
-
-TYPED_TEST(OverflowTest, AddOverflowToNegative) {
-  TypeParam Result;
-  auto MaxValue = std::numeric_limits<TypeParam>::max();
-  EXPECT_TRUE(AddOverflow<TypeParam>(MaxValue, MaxValue, Result));
-  EXPECT_EQ(Result, TypeParam(-2));
-}
-
-TYPED_TEST(OverflowTest, AddOverflowToMin) {
-  TypeParam Result;
-  auto MaxValue = std::numeric_limits<TypeParam>::max();
-  EXPECT_TRUE(AddOverflow<TypeParam>(MaxValue, TypeParam(1), Result));
-  EXPECT_EQ(Result, std::numeric_limits<TypeParam>::min());
-}
-
-TYPED_TEST(OverflowTest, AddOverflowToZero) {
-  TypeParam Result;
-  auto MinValue = std::numeric_limits<TypeParam>::min();
-  EXPECT_TRUE(AddOverflow<TypeParam>(MinValue, MinValue, Result));
-  EXPECT_EQ(Result, TypeParam(0));
-}
-
-TYPED_TEST(OverflowTest, AddOverflowToMax) {
-  TypeParam Result;
-  auto MinValue = std::numeric_limits<TypeParam>::min();
-  EXPECT_TRUE(AddOverflow<TypeParam>(MinValue, TypeParam(-1), Result));
-  EXPECT_EQ(Result, std::numeric_limits<TypeParam>::max());
-}
-
-TYPED_TEST(OverflowTest, SubNoOverflow) {
-  TypeParam Result;
-  EXPECT_FALSE(SubOverflow<TypeParam>(1, 2, Result));
-  EXPECT_EQ(Result, TypeParam(-1));
-}
-
-TYPED_TEST(OverflowTest, SubOverflowToMax) {
-  TypeParam Result;
-  auto MinValue = std::numeric_limits<TypeParam>::min();
-  EXPECT_TRUE(SubOverflow<TypeParam>(0, MinValue, Result));
-  EXPECT_EQ(Result, MinValue);
-}
-
-TYPED_TEST(OverflowTest, SubOverflowToMin) {
-  TypeParam Result;
-  auto MinValue = std::numeric_limits<TypeParam>::min();
-  EXPECT_TRUE(SubOverflow<TypeParam>(0, MinValue, Result));
-  EXPECT_EQ(Result, MinValue);
-}
-
-TYPED_TEST(OverflowTest, SubOverflowToNegative) {
-  TypeParam Result;
-  auto MaxValue = std::numeric_limits<TypeParam>::max();
-  auto MinValue = std::numeric_limits<TypeParam>::min();
-  EXPECT_TRUE(SubOverflow<TypeParam>(MaxValue, MinValue, Result));
-  EXPECT_EQ(Result, TypeParam(-1));
-}
-
-TYPED_TEST(OverflowTest, SubOverflowToPositive) {
-  TypeParam Result;
-  auto MaxValue = std::numeric_limits<TypeParam>::max();
-  auto MinValue = std::numeric_limits<TypeParam>::min();
-  EXPECT_TRUE(SubOverflow<TypeParam>(MinValue, MaxValue, Result));
-  EXPECT_EQ(Result, TypeParam(1));
-}
-
-TYPED_TEST(OverflowTest, MulNoOverflow) {
-  TypeParam Result;
-  EXPECT_FALSE(MulOverflow<TypeParam>(1, 2, Result));
-  EXPECT_EQ(Result, 2);
-  EXPECT_FALSE(MulOverflow<TypeParam>(-1, 3, Result));
-  EXPECT_EQ(Result, -3);
-  EXPECT_FALSE(MulOverflow<TypeParam>(4, -2, Result));
-  EXPECT_EQ(Result, -8);
-  EXPECT_FALSE(MulOverflow<TypeParam>(-6, -5, Result));
-  EXPECT_EQ(Result, 30);
-}
-
-TYPED_TEST(OverflowTest, MulNoOverflowToMax) {
-  TypeParam Result;
-  auto MaxValue = std::numeric_limits<TypeParam>::max();
-  auto MinValue = std::numeric_limits<TypeParam>::min();
-  EXPECT_FALSE(MulOverflow<TypeParam>(MinValue + 1, -1, Result));
-  EXPECT_EQ(Result, MaxValue);
-}
-
-TYPED_TEST(OverflowTest, MulOverflowToMin) {
-  TypeParam Result;
-  auto MinValue = std::numeric_limits<TypeParam>::min();
-  EXPECT_TRUE(MulOverflow<TypeParam>(MinValue, -1, Result));
-  EXPECT_EQ(Result, MinValue);
-}
-
-TYPED_TEST(OverflowTest, MulOverflowMax) {
-  TypeParam Result;
-  auto MinValue = std::numeric_limits<TypeParam>::min();
-  auto MaxValue = std::numeric_limits<TypeParam>::max();
-  EXPECT_TRUE(MulOverflow<TypeParam>(MinValue, MinValue, Result));
-  EXPECT_EQ(Result, 0);
-  EXPECT_TRUE(MulOverflow<TypeParam>(MaxValue, MaxValue, Result));
-  EXPECT_EQ(Result, 1);
-}
-
-TYPED_TEST(OverflowTest, MulResultZero) {
-  TypeParam Result;
-  EXPECT_FALSE(MulOverflow<TypeParam>(4, 0, Result));
-  EXPECT_EQ(Result, TypeParam(0));
-  EXPECT_FALSE(MulOverflow<TypeParam>(-5, 0, Result));
-  EXPECT_EQ(Result, TypeParam(0));
-  EXPECT_FALSE(MulOverflow<TypeParam>(0, 5, Result));
-  EXPECT_EQ(Result, TypeParam(0));
-  EXPECT_FALSE(MulOverflow<TypeParam>(0, -5, Result));
-  EXPECT_EQ(Result, TypeParam(0));
-}
-
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/Support/MemoryBufferRefTest.cpp b/gnu/llvm/llvm/unittests/Support/MemoryBufferRefTest.cpp
deleted file mode 100644
index 760e583b450..00000000000
--- a/gnu/llvm/llvm/unittests/Support/MemoryBufferRefTest.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-//===- MemoryBufferRefTest.cpp - MemoryBufferRef tests --------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements unit tests for the MemoryBufferRef support class.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/MemoryBufferRef.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST(MemoryBufferRefTest, construct) {
-  std::unique_ptr<MemoryBuffer> MB(MemoryBuffer::getMemBuffer("data", "id"));
-  MemoryBufferRef MBR(*MB);
-
-  EXPECT_EQ(MB->getBufferStart(), MBR.getBufferStart());
-  EXPECT_EQ(MB->getBufferIdentifier(), MBR.getBufferIdentifier());
-}
-
-TEST(MemoryBufferRefTest, compareEquals) {
-  std::string Data = "data";
-  std::unique_ptr<MemoryBuffer> MB(MemoryBuffer::getMemBuffer(Data, "id"));
-  MemoryBufferRef Ref(*MB);
-  MemoryBufferRef Empty;
-  MemoryBufferRef NoIdentifier(MB->getBuffer(), "");
-  MemoryBufferRef NoData("", MB->getBufferIdentifier());
-  MemoryBufferRef Same(MB->getBuffer(), MB->getBufferIdentifier());
-
-  EXPECT_NE(Empty, Ref);
-  EXPECT_NE(NoIdentifier, Ref);
-  EXPECT_NE(NoData, Ref);
-  EXPECT_EQ(Same, Ref);
-
-  // Confirm NE when content matches but pointer identity does not.
-  std::unique_ptr<MemoryBuffer> Copy(
-      MemoryBuffer::getMemBufferCopy(Data, "id"));
-  MemoryBufferRef CopyRef(*Copy);
-  EXPECT_EQ(Ref.getBuffer(), CopyRef.getBuffer());
-  EXPECT_NE(Ref, CopyRef);
-}
-
-} // end namespace
diff --git a/gnu/llvm/llvm/unittests/Support/MemoryBufferTest.cpp b/gnu/llvm/llvm/unittests/Support/MemoryBufferTest.cpp
deleted file mode 100644
index 97bb62df393..00000000000
--- a/gnu/llvm/llvm/unittests/Support/MemoryBufferTest.cpp
+++ /dev/null
@@ -1,411 +0,0 @@
-//===- llvm/unittest/Support/MemoryBufferTest.cpp - MemoryBuffer tests ----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements unit tests for the MemoryBuffer support class.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/ADT/ScopeExit.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/FileUtilities.h"
-#include "llvm/Support/Process.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/Testing/Support/Error.h"
-#include "gtest/gtest.h"
-#if LLVM_ENABLE_THREADS
-#include <thread>
-#endif
-#if LLVM_ON_UNIX
-#include <unistd.h>
-#endif
-#if _WIN32
-#include <windows.h>
-#endif
-
-using namespace llvm;
-
-#define ASSERT_NO_ERROR(x)                                                     \
-  if (std::error_code ASSERT_NO_ERROR_ec = x) {                                \
-    SmallString<128> MessageStorage;                                           \
-    raw_svector_ostream Message(MessageStorage);                               \
-    Message << #x ": did not return errc::success.\n"                          \
-            << "error number: " << ASSERT_NO_ERROR_ec.value() << "\n"          \
-            << "error message: " << ASSERT_NO_ERROR_ec.message() << "\n";      \
-    GTEST_FATAL_FAILURE_(MessageStorage.c_str());                              \
-  } else {                                                                     \
-  }
-
-#define ASSERT_ERROR(x)                                                        \
-  if (!x) {                                                                    \
-    SmallString<128> MessageStorage;                                           \
-    raw_svector_ostream Message(MessageStorage);                               \
-    Message << #x ": did not return a failure error code.\n";                  \
-    GTEST_FATAL_FAILURE_(MessageStorage.c_str());                              \
-  }
-
-namespace {
-
-class MemoryBufferTest : public testing::Test {
-protected:
-  MemoryBufferTest()
-  : data("this is some data")
-  { }
-
-  void SetUp() override {}
-
-  /// Common testing for different modes of getOpenFileSlice.
-  /// Creates a temporary file with known contents, and uses
-  /// MemoryBuffer::getOpenFileSlice to map it.
-  /// If \p Reopen is true, the file is closed after creating and reopened
-  /// anew before using MemoryBuffer.
-  void testGetOpenFileSlice(bool Reopen);
-
-  typedef std::unique_ptr<MemoryBuffer> OwningBuffer;
-
-  std::string data;
-};
-
-TEST_F(MemoryBufferTest, get) {
-  // Default name and null-terminator flag
-  OwningBuffer MB1(MemoryBuffer::getMemBuffer(data));
-  EXPECT_TRUE(nullptr != MB1.get());
-
-  // RequiresNullTerminator = false
-  OwningBuffer MB2(MemoryBuffer::getMemBuffer(data, "one", false));
-  EXPECT_TRUE(nullptr != MB2.get());
-
-  // RequiresNullTerminator = true
-  OwningBuffer MB3(MemoryBuffer::getMemBuffer(data, "two", true));
-  EXPECT_TRUE(nullptr != MB3.get());
-
-  // verify all 3 buffers point to the same address
-  EXPECT_EQ(MB1->getBufferStart(), MB2->getBufferStart());
-  EXPECT_EQ(MB2->getBufferStart(), MB3->getBufferStart());
-
-  // verify the original data is unmodified after deleting the buffers
-  MB1.reset();
-  MB2.reset();
-  MB3.reset();
-  EXPECT_EQ("this is some data", data);
-}
-
-TEST_F(MemoryBufferTest, getOpenFile) {
-  int FD;
-  SmallString<64> TestPath;
-  ASSERT_EQ(sys::fs::createTemporaryFile("MemoryBufferTest_getOpenFile", "temp",
-                                         FD, TestPath),
-            std::error_code());
-
-  FileRemover Cleanup(TestPath);
-  raw_fd_ostream OF(FD, /*shouldClose*/ true);
-  OF << "12345678";
-  OF.close();
-
-  {
-    Expected<sys::fs::file_t> File = sys::fs::openNativeFileForRead(TestPath);
-    ASSERT_THAT_EXPECTED(File, Succeeded());
-    auto OnExit =
-        make_scope_exit([&] { ASSERT_NO_ERROR(sys::fs::closeFile(*File)); });
-    ErrorOr<OwningBuffer> MB = MemoryBuffer::getOpenFile(*File, TestPath, 6);
-    ASSERT_NO_ERROR(MB.getError());
-    EXPECT_EQ("123456", MB.get()->getBuffer());
-  }
-  {
-    Expected<sys::fs::file_t> File = sys::fs::openNativeFileForWrite(
-        TestPath, sys::fs::CD_OpenExisting, sys::fs::OF_None);
-    ASSERT_THAT_EXPECTED(File, Succeeded());
-    auto OnExit =
-        make_scope_exit([&] { ASSERT_NO_ERROR(sys::fs::closeFile(*File)); });
-    ASSERT_ERROR(MemoryBuffer::getOpenFile(*File, TestPath, 6).getError());
-  }
-}
-
-TEST_F(MemoryBufferTest, NullTerminator4K) {
-  // Test that a file with size that is a multiple of the page size can be null
-  // terminated correctly by MemoryBuffer.
-  int TestFD;
-  SmallString<64> TestPath;
-  sys::fs::createTemporaryFile("MemoryBufferTest_NullTerminator4K", "temp",
-                               TestFD, TestPath);
-  FileRemover Cleanup(TestPath);
-  raw_fd_ostream OF(TestFD, true, /*unbuffered=*/true);
-  for (unsigned i = 0; i < 4096 / 16; ++i) {
-    OF << "0123456789abcdef";
-  }
-  OF.close();
-
-  ErrorOr<OwningBuffer> MB = MemoryBuffer::getFile(TestPath.c_str());
-  std::error_code EC = MB.getError();
-  ASSERT_FALSE(EC);
-
-  const char *BufData = MB.get()->getBufferStart();
-  EXPECT_EQ('f', BufData[4095]);
-  EXPECT_EQ('\0', BufData[4096]);
-}
-
-TEST_F(MemoryBufferTest, copy) {
-  // copy with no name
-  OwningBuffer MBC1(MemoryBuffer::getMemBufferCopy(data));
-  EXPECT_TRUE(nullptr != MBC1.get());
-
-  // copy with a name
-  OwningBuffer MBC2(MemoryBuffer::getMemBufferCopy(data, "copy"));
-  EXPECT_TRUE(nullptr != MBC2.get());
-
-  // verify the two copies do not point to the same place
-  EXPECT_NE(MBC1->getBufferStart(), MBC2->getBufferStart());
-}
-
-#if LLVM_ENABLE_THREADS
-TEST_F(MemoryBufferTest, createFromPipe) {
-  sys::fs::file_t pipes[2];
-#if LLVM_ON_UNIX
-  ASSERT_EQ(::pipe(pipes), 0) << strerror(errno);
-#else
-  ASSERT_TRUE(::CreatePipe(&pipes[0], &pipes[1], nullptr, 0))
-      << ::GetLastError();
-#endif
-  auto ReadCloser = make_scope_exit([&] { sys::fs::closeFile(pipes[0]); });
-  std::thread Writer([&] {
-    auto WriteCloser = make_scope_exit([&] { sys::fs::closeFile(pipes[1]); });
-    for (unsigned i = 0; i < 5; ++i) {
-      std::this_thread::sleep_for(std::chrono::milliseconds(10));
-#if LLVM_ON_UNIX
-      ASSERT_EQ(::write(pipes[1], "foo", 3), 3) << strerror(errno);
-#else
-      DWORD Written;
-      ASSERT_TRUE(::WriteFile(pipes[1], "foo", 3, &Written, nullptr))
-          << ::GetLastError();
-      ASSERT_EQ(Written, 3u);
-#endif
-    }
-  });
-  ErrorOr<OwningBuffer> MB =
-      MemoryBuffer::getOpenFile(pipes[0], "pipe", /*FileSize*/ -1);
-  Writer.join();
-  ASSERT_NO_ERROR(MB.getError());
-  EXPECT_EQ(MB.get()->getBuffer(), "foofoofoofoofoo");
-}
-#endif
-
-TEST_F(MemoryBufferTest, make_new) {
-  // 0-sized buffer
-  OwningBuffer Zero(WritableMemoryBuffer::getNewUninitMemBuffer(0));
-  EXPECT_TRUE(nullptr != Zero.get());
-
-  // uninitialized buffer with no name
-  OwningBuffer One(WritableMemoryBuffer::getNewUninitMemBuffer(321));
-  EXPECT_TRUE(nullptr != One.get());
-
-  // uninitialized buffer with name
-  OwningBuffer Two(WritableMemoryBuffer::getNewUninitMemBuffer(123, "bla"));
-  EXPECT_TRUE(nullptr != Two.get());
-
-  // 0-initialized buffer with no name
-  OwningBuffer Three(WritableMemoryBuffer::getNewMemBuffer(321, data));
-  EXPECT_TRUE(nullptr != Three.get());
-  for (size_t i = 0; i < 321; ++i)
-    EXPECT_EQ(0, Three->getBufferStart()[0]);
-
-  // 0-initialized buffer with name
-  OwningBuffer Four(WritableMemoryBuffer::getNewMemBuffer(123, "zeros"));
-  EXPECT_TRUE(nullptr != Four.get());
-  for (size_t i = 0; i < 123; ++i)
-    EXPECT_EQ(0, Four->getBufferStart()[0]);
-}
-
-void MemoryBufferTest::testGetOpenFileSlice(bool Reopen) {
-  // Test that MemoryBuffer::getOpenFile works properly when no null
-  // terminator is requested and the size is large enough to trigger
-  // the usage of memory mapping.
-  int TestFD;
-  SmallString<64> TestPath;
-  // Create a temporary file and write data into it.
-  sys::fs::createTemporaryFile("prefix", "temp", TestFD, TestPath);
-  FileRemover Cleanup(TestPath);
-  // OF is responsible for closing the file; If the file is not
-  // reopened, it will be unbuffered so that the results are
-  // immediately visible through the fd.
-  raw_fd_ostream OF(TestFD, true, !Reopen);
-  for (int i = 0; i < 60000; ++i) {
-    OF << "0123456789";
-  }
-
-  if (Reopen) {
-    OF.close();
-    EXPECT_FALSE(sys::fs::openFileForRead(TestPath.c_str(), TestFD));
-  }
-
-  ErrorOr<OwningBuffer> Buf = MemoryBuffer::getOpenFileSlice(
-      sys::fs::convertFDToNativeFile(TestFD), TestPath.c_str(),
-      40000, // Size
-      80000  // Offset
-  );
-
-  std::error_code EC = Buf.getError();
-  EXPECT_FALSE(EC);
-
-  StringRef BufData = Buf.get()->getBuffer();
-  EXPECT_EQ(BufData.size(), 40000U);
-  EXPECT_EQ(BufData[0], '0');
-  EXPECT_EQ(BufData[9], '9');
-}
-
-TEST_F(MemoryBufferTest, getOpenFileNoReopen) {
-  testGetOpenFileSlice(false);
-}
-
-TEST_F(MemoryBufferTest, getOpenFileReopened) {
-  testGetOpenFileSlice(true);
-}
-
-TEST_F(MemoryBufferTest, slice) {
-  // Create a file that is six pages long with different data on each page.
-  int FD;
-  SmallString<64> TestPath;
-  sys::fs::createTemporaryFile("MemoryBufferTest_Slice", "temp", FD, TestPath);
-  FileRemover Cleanup(TestPath);
-  raw_fd_ostream OF(FD, true, /*unbuffered=*/true);
-  for (unsigned i = 0; i < 0x2000 / 8; ++i) {
-    OF << "12345678";
-  }
-  for (unsigned i = 0; i < 0x2000 / 8; ++i) {
-    OF << "abcdefgh";
-  }
-  for (unsigned i = 0; i < 0x2000 / 8; ++i) {
-    OF << "ABCDEFGH";
-  }
-  OF.close();
-
-  // Try offset of one page.
-  ErrorOr<OwningBuffer> MB = MemoryBuffer::getFileSlice(TestPath.str(),
-                                                        0x4000, 0x1000);
-  std::error_code EC = MB.getError();
-  ASSERT_FALSE(EC);
-  EXPECT_EQ(0x4000UL, MB.get()->getBufferSize());
- 
-  StringRef BufData = MB.get()->getBuffer();
-  EXPECT_TRUE(BufData.substr(0x0000,8).equals("12345678"));
-  EXPECT_TRUE(BufData.substr(0x0FF8,8).equals("12345678"));
-  EXPECT_TRUE(BufData.substr(0x1000,8).equals("abcdefgh"));
-  EXPECT_TRUE(BufData.substr(0x2FF8,8).equals("abcdefgh"));
-  EXPECT_TRUE(BufData.substr(0x3000,8).equals("ABCDEFGH"));
-  EXPECT_TRUE(BufData.substr(0x3FF8,8).equals("ABCDEFGH"));
-   
-  // Try non-page aligned.
-  ErrorOr<OwningBuffer> MB2 = MemoryBuffer::getFileSlice(TestPath.str(),
-                                                         0x3000, 0x0800);
-  EC = MB2.getError();
-  ASSERT_FALSE(EC);
-  EXPECT_EQ(0x3000UL, MB2.get()->getBufferSize());
-  
-  StringRef BufData2 = MB2.get()->getBuffer();
-  EXPECT_TRUE(BufData2.substr(0x0000,8).equals("12345678"));
-  EXPECT_TRUE(BufData2.substr(0x17F8,8).equals("12345678"));
-  EXPECT_TRUE(BufData2.substr(0x1800,8).equals("abcdefgh"));
-  EXPECT_TRUE(BufData2.substr(0x2FF8,8).equals("abcdefgh"));
-}
-
-TEST_F(MemoryBufferTest, writableSlice) {
-  // Create a file initialized with some data
-  int FD;
-  SmallString<64> TestPath;
-  sys::fs::createTemporaryFile("MemoryBufferTest_WritableSlice", "temp", FD,
-                               TestPath);
-  FileRemover Cleanup(TestPath);
-  raw_fd_ostream OF(FD, true);
-  for (unsigned i = 0; i < 0x1000; ++i)
-    OF << "0123456789abcdef";
-  OF.close();
-
-  {
-    auto MBOrError =
-        WritableMemoryBuffer::getFileSlice(TestPath.str(), 0x6000, 0x2000);
-    ASSERT_FALSE(MBOrError.getError());
-    // Write some data.  It should be mapped private, so that upon completion
-    // the original file contents are not modified.
-    WritableMemoryBuffer &MB = **MBOrError;
-    ASSERT_EQ(0x6000u, MB.getBufferSize());
-    char *Start = MB.getBufferStart();
-    ASSERT_EQ(MB.getBufferEnd(), MB.getBufferStart() + MB.getBufferSize());
-    ::memset(Start, 'x', MB.getBufferSize());
-  }
-
-  auto MBOrError = MemoryBuffer::getFile(TestPath);
-  ASSERT_FALSE(MBOrError.getError());
-  auto &MB = **MBOrError;
-  ASSERT_EQ(0x10000u, MB.getBufferSize());
-  for (size_t i = 0; i < MB.getBufferSize(); i += 0x10)
-    EXPECT_EQ("0123456789abcdef", MB.getBuffer().substr(i, 0x10)) << "i: " << i;
-}
-
-TEST_F(MemoryBufferTest, writeThroughFile) {
-  // Create a file initialized with some data
-  int FD;
-  SmallString<64> TestPath;
-  sys::fs::createTemporaryFile("MemoryBufferTest_WriteThrough", "temp", FD,
-                               TestPath);
-  FileRemover Cleanup(TestPath);
-  raw_fd_ostream OF(FD, true);
-  OF << "0123456789abcdef";
-  OF.close();
-  {
-    auto MBOrError = WriteThroughMemoryBuffer::getFile(TestPath);
-    ASSERT_FALSE(MBOrError.getError());
-    // Write some data.  It should be mapped readwrite, so that upon completion
-    // the original file contents are modified.
-    WriteThroughMemoryBuffer &MB = **MBOrError;
-    ASSERT_EQ(16u, MB.getBufferSize());
-    char *Start = MB.getBufferStart();
-    ASSERT_EQ(MB.getBufferEnd(), MB.getBufferStart() + MB.getBufferSize());
-    ::memset(Start, 'x', MB.getBufferSize());
-  }
-
-  auto MBOrError = MemoryBuffer::getFile(TestPath);
-  ASSERT_FALSE(MBOrError.getError());
-  auto &MB = **MBOrError;
-  ASSERT_EQ(16u, MB.getBufferSize());
-  EXPECT_EQ("xxxxxxxxxxxxxxxx", MB.getBuffer());
-}
-
-TEST_F(MemoryBufferTest, mmapVolatileNoNull) {
-  // Verify that `MemoryBuffer::getOpenFile` will use mmap when
-  // `RequiresNullTerminator = false`, `IsVolatile = true`, and the file is
-  // large enough to use mmap.
-  //
-  // This is done because Clang should use this mode to open module files, and
-  // falling back to malloc for them causes a huge memory usage increase.
-
-  int FD;
-  SmallString<64> TestPath;
-  ASSERT_NO_ERROR(sys::fs::createTemporaryFile(
-      "MemoryBufferTest_mmapVolatileNoNull", "temp", FD, TestPath));
-  FileRemover Cleanup(TestPath);
-  raw_fd_ostream OF(FD, true);
-  // Create a file large enough to mmap. 4 pages should be enough.
-  unsigned PageSize = sys::Process::getPageSizeEstimate();
-  unsigned FileWrites = (PageSize * 4) / 8;
-  for (unsigned i = 0; i < FileWrites; ++i)
-    OF << "01234567";
-  OF.close();
-
-  Expected<sys::fs::file_t> File = sys::fs::openNativeFileForRead(TestPath);
-  ASSERT_THAT_EXPECTED(File, Succeeded());
-  auto OnExit =
-      make_scope_exit([&] { ASSERT_NO_ERROR(sys::fs::closeFile(*File)); });
-
-  auto MBOrError = MemoryBuffer::getOpenFile(*File, TestPath,
-      /*FileSize=*/-1, /*RequiresNullTerminator=*/false, /*IsVolatile=*/true);
-  ASSERT_NO_ERROR(MBOrError.getError())
-  OwningBuffer MB = std::move(*MBOrError);
-  EXPECT_EQ(MB->getBufferKind(), MemoryBuffer::MemoryBuffer_MMap);
-  EXPECT_EQ(MB->getBufferSize(), std::size_t(FileWrites * 8));
-  EXPECT_TRUE(MB->getBuffer().startswith("01234567"));
-}
-}
diff --git a/gnu/llvm/llvm/unittests/Support/MemoryTest.cpp b/gnu/llvm/llvm/unittests/Support/MemoryTest.cpp
deleted file mode 100644
index bcbbd285823..00000000000
--- a/gnu/llvm/llvm/unittests/Support/MemoryTest.cpp
+++ /dev/null
@@ -1,434 +0,0 @@
-//===- llvm/unittest/Support/AllocatorTest.cpp - BumpPtrAllocator tests ---===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/Memory.h"
-#include "llvm/Support/Process.h"
-#include "gtest/gtest.h"
-#include <cassert>
-#include <cstdlib>
-
-#if defined(__NetBSD__)
-// clang-format off
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#include <err.h>
-#include <unistd.h>
-// clang-format on
-#endif
-
-using namespace llvm;
-using namespace sys;
-
-namespace {
-
-bool IsMPROTECT() {
-#if defined(__NetBSD__)
-  int mib[3];
-  int paxflags;
-  size_t len = sizeof(paxflags);
-
-  mib[0] = CTL_PROC;
-  mib[1] = getpid();
-  mib[2] = PROC_PID_PAXFLAGS;
-
-  if (sysctl(mib, 3, &paxflags, &len, NULL, 0) != 0)
-    err(EXIT_FAILURE, "sysctl");
-
-  return !!(paxflags & CTL_PROC_PAXFLAGS_MPROTECT);
-#elif defined(__APPLE__) && defined(__aarch64__)
-  return true;
-#else
-  return false;
-#endif
-}
-
-class MappedMemoryTest : public ::testing::TestWithParam<unsigned> {
-public:
-  MappedMemoryTest() {
-    Flags = GetParam();
-    PageSize = sys::Process::getPageSizeEstimate();
-  }
-
-protected:
-  // Adds RW flags to permit testing of the resulting memory
-  unsigned getTestableEquivalent(unsigned RequestedFlags) {
-    switch (RequestedFlags) {
-    case Memory::MF_READ:
-    case Memory::MF_WRITE:
-    case Memory::MF_READ|Memory::MF_WRITE:
-      return Memory::MF_READ|Memory::MF_WRITE;
-    case Memory::MF_READ|Memory::MF_EXEC:
-    case Memory::MF_READ|Memory::MF_WRITE|Memory::MF_EXEC:
-    case Memory::MF_EXEC:
-      return Memory::MF_READ|Memory::MF_WRITE|Memory::MF_EXEC;
-    }
-    // Default in case values are added to the enum, as required by some compilers
-    return Memory::MF_READ|Memory::MF_WRITE;
-  }
-
-  // Returns true if the memory blocks overlap
-  bool doesOverlap(MemoryBlock M1, MemoryBlock M2) {
-    if (M1.base() == M2.base())
-      return true;
-
-    if (M1.base() > M2.base())
-      return (unsigned char *)M2.base() + M2.allocatedSize() > M1.base();
-
-    return (unsigned char *)M1.base() + M1.allocatedSize() > M2.base();
-  }
-
-  unsigned Flags;
-  size_t   PageSize;
-};
-
-// MPROTECT prevents W+X mmaps
-#define CHECK_UNSUPPORTED() \
-  do { \
-    if ((Flags & Memory::MF_WRITE) && (Flags & Memory::MF_EXEC) && \
-        IsMPROTECT()) \
-      return; \
-  } while (0)
-
-TEST_P(MappedMemoryTest, AllocAndRelease) {
-  CHECK_UNSUPPORTED();
-  std::error_code EC;
-  MemoryBlock M1 = Memory::allocateMappedMemory(sizeof(int), nullptr, Flags,EC);
-  EXPECT_EQ(std::error_code(), EC);
-
-  EXPECT_NE((void*)nullptr, M1.base());
-  EXPECT_LE(sizeof(int), M1.allocatedSize());
-
-  EXPECT_FALSE(Memory::releaseMappedMemory(M1));
-}
-
-TEST_P(MappedMemoryTest, AllocAndReleaseHuge) {
-  CHECK_UNSUPPORTED();
-  std::error_code EC;
-  MemoryBlock M1 = Memory::allocateMappedMemory(
-      sizeof(int), nullptr, Flags | Memory::MF_HUGE_HINT, EC);
-  EXPECT_EQ(std::error_code(), EC);
-
-  // Test large/huge memory pages. In the worst case, 4kb pages should be
-  // returned, if large pages aren't available.
-
-  EXPECT_NE((void *)nullptr, M1.base());
-  EXPECT_LE(sizeof(int), M1.allocatedSize());
-
-  EXPECT_FALSE(Memory::releaseMappedMemory(M1));
-}
-
-TEST_P(MappedMemoryTest, MultipleAllocAndRelease) {
-  CHECK_UNSUPPORTED();
-  std::error_code EC;
-  MemoryBlock M1 = Memory::allocateMappedMemory(16, nullptr, Flags, EC);
-  EXPECT_EQ(std::error_code(), EC);
-  MemoryBlock M2 = Memory::allocateMappedMemory(64, nullptr, Flags, EC);
-  EXPECT_EQ(std::error_code(), EC);
-  MemoryBlock M3 = Memory::allocateMappedMemory(32, nullptr, Flags, EC);
-  EXPECT_EQ(std::error_code(), EC);
-
-  EXPECT_NE((void*)nullptr, M1.base());
-  EXPECT_LE(16U, M1.allocatedSize());
-  EXPECT_NE((void*)nullptr, M2.base());
-  EXPECT_LE(64U, M2.allocatedSize());
-  EXPECT_NE((void*)nullptr, M3.base());
-  EXPECT_LE(32U, M3.allocatedSize());
-
-  EXPECT_FALSE(doesOverlap(M1, M2));
-  EXPECT_FALSE(doesOverlap(M2, M3));
-  EXPECT_FALSE(doesOverlap(M1, M3));
-
-  EXPECT_FALSE(Memory::releaseMappedMemory(M1));
-  EXPECT_FALSE(Memory::releaseMappedMemory(M3));
-  MemoryBlock M4 = Memory::allocateMappedMemory(16, nullptr, Flags, EC);
-  EXPECT_EQ(std::error_code(), EC);
-  EXPECT_NE((void*)nullptr, M4.base());
-  EXPECT_LE(16U, M4.allocatedSize());
-  EXPECT_FALSE(Memory::releaseMappedMemory(M4));
-  EXPECT_FALSE(Memory::releaseMappedMemory(M2));
-}
-
-TEST_P(MappedMemoryTest, BasicWrite) {
-  // This test applies only to readable and writeable combinations
-  if (Flags &&
-      !((Flags & Memory::MF_READ) && (Flags & Memory::MF_WRITE)))
-    return;
-  CHECK_UNSUPPORTED();
-
-  std::error_code EC;
-  MemoryBlock M1 = Memory::allocateMappedMemory(sizeof(int), nullptr, Flags,EC);
-  EXPECT_EQ(std::error_code(), EC);
-
-  EXPECT_NE((void*)nullptr, M1.base());
-  EXPECT_LE(sizeof(int), M1.allocatedSize());
-
-  int *a = (int*)M1.base();
-  *a = 1;
-  EXPECT_EQ(1, *a);
-
-  EXPECT_FALSE(Memory::releaseMappedMemory(M1));
-}
-
-TEST_P(MappedMemoryTest, MultipleWrite) {
-  // This test applies only to readable and writeable combinations
-  if (Flags &&
-      !((Flags & Memory::MF_READ) && (Flags & Memory::MF_WRITE)))
-    return;
-  CHECK_UNSUPPORTED();
-
-  std::error_code EC;
-  MemoryBlock M1 = Memory::allocateMappedMemory(sizeof(int), nullptr, Flags,
-                                                EC);
-  EXPECT_EQ(std::error_code(), EC);
-  MemoryBlock M2 = Memory::allocateMappedMemory(8 * sizeof(int), nullptr, Flags,
-                                                EC);
-  EXPECT_EQ(std::error_code(), EC);
-  MemoryBlock M3 = Memory::allocateMappedMemory(4 * sizeof(int), nullptr, Flags,
-                                                EC);
-  EXPECT_EQ(std::error_code(), EC);
-
-  EXPECT_FALSE(doesOverlap(M1, M2));
-  EXPECT_FALSE(doesOverlap(M2, M3));
-  EXPECT_FALSE(doesOverlap(M1, M3));
-
-  EXPECT_NE((void*)nullptr, M1.base());
-  EXPECT_LE(1U * sizeof(int), M1.allocatedSize());
-  EXPECT_NE((void*)nullptr, M2.base());
-  EXPECT_LE(8U * sizeof(int), M2.allocatedSize());
-  EXPECT_NE((void*)nullptr, M3.base());
-  EXPECT_LE(4U * sizeof(int), M3.allocatedSize());
-
-  int *x = (int*)M1.base();
-  *x = 1;
-
-  int *y = (int*)M2.base();
-  for (int i = 0; i < 8; i++) {
-    y[i] = i;
-  }
-
-  int *z = (int*)M3.base();
-  *z = 42;
-
-  EXPECT_EQ(1, *x);
-  EXPECT_EQ(7, y[7]);
-  EXPECT_EQ(42, *z);
-
-  EXPECT_FALSE(Memory::releaseMappedMemory(M1));
-  EXPECT_FALSE(Memory::releaseMappedMemory(M3));
-
-  MemoryBlock M4 = Memory::allocateMappedMemory(64 * sizeof(int), nullptr,
-                                                Flags, EC);
-  EXPECT_EQ(std::error_code(), EC);
-  EXPECT_NE((void*)nullptr, M4.base());
-  EXPECT_LE(64U * sizeof(int), M4.allocatedSize());
-  x = (int*)M4.base();
-  *x = 4;
-  EXPECT_EQ(4, *x);
-  EXPECT_FALSE(Memory::releaseMappedMemory(M4));
-
-  // Verify that M2 remains unaffected by other activity
-  for (int i = 0; i < 8; i++) {
-    EXPECT_EQ(i, y[i]);
-  }
-  EXPECT_FALSE(Memory::releaseMappedMemory(M2));
-}
-
-TEST_P(MappedMemoryTest, EnabledWrite) {
-  // MPROTECT prevents W+X, and since this test always adds W we need
-  // to block any variant with X.
-  if ((Flags & Memory::MF_EXEC) && IsMPROTECT())
-    return;
-
-  std::error_code EC;
-  MemoryBlock M1 = Memory::allocateMappedMemory(2 * sizeof(int), nullptr, Flags,
-                                                EC);
-  EXPECT_EQ(std::error_code(), EC);
-  MemoryBlock M2 = Memory::allocateMappedMemory(8 * sizeof(int), nullptr, Flags,
-                                                EC);
-  EXPECT_EQ(std::error_code(), EC);
-  MemoryBlock M3 = Memory::allocateMappedMemory(4 * sizeof(int), nullptr, Flags,
-                                                EC);
-  EXPECT_EQ(std::error_code(), EC);
-
-  EXPECT_NE((void*)nullptr, M1.base());
-  EXPECT_LE(2U * sizeof(int), M1.allocatedSize());
-  EXPECT_NE((void*)nullptr, M2.base());
-  EXPECT_LE(8U * sizeof(int), M2.allocatedSize());
-  EXPECT_NE((void*)nullptr, M3.base());
-  EXPECT_LE(4U * sizeof(int), M3.allocatedSize());
-
-  EXPECT_FALSE(Memory::protectMappedMemory(M1, getTestableEquivalent(Flags)));
-  EXPECT_FALSE(Memory::protectMappedMemory(M2, getTestableEquivalent(Flags)));
-  EXPECT_FALSE(Memory::protectMappedMemory(M3, getTestableEquivalent(Flags)));
-
-  EXPECT_FALSE(doesOverlap(M1, M2));
-  EXPECT_FALSE(doesOverlap(M2, M3));
-  EXPECT_FALSE(doesOverlap(M1, M3));
-
-  int *x = (int*)M1.base();
-  *x = 1;
-  int *y = (int*)M2.base();
-  for (unsigned int i = 0; i < 8; i++) {
-    y[i] = i;
-  }
-  int *z = (int*)M3.base();
-  *z = 42;
-
-  EXPECT_EQ(1, *x);
-  EXPECT_EQ(7, y[7]);
-  EXPECT_EQ(42, *z);
-
-  EXPECT_FALSE(Memory::releaseMappedMemory(M1));
-  EXPECT_FALSE(Memory::releaseMappedMemory(M3));
-  EXPECT_EQ(6, y[6]);
-
-  MemoryBlock M4 = Memory::allocateMappedMemory(16, nullptr, Flags, EC);
-  EXPECT_EQ(std::error_code(), EC);
-  EXPECT_NE((void*)nullptr, M4.base());
-  EXPECT_LE(16U, M4.allocatedSize());
-  EXPECT_EQ(std::error_code(),
-            Memory::protectMappedMemory(M4, getTestableEquivalent(Flags)));
-  x = (int*)M4.base();
-  *x = 4;
-  EXPECT_EQ(4, *x);
-  EXPECT_FALSE(Memory::releaseMappedMemory(M4));
-  EXPECT_FALSE(Memory::releaseMappedMemory(M2));
-}
-
-TEST_P(MappedMemoryTest, SuccessiveNear) {
-  CHECK_UNSUPPORTED();
-  std::error_code EC;
-  MemoryBlock M1 = Memory::allocateMappedMemory(16, nullptr, Flags, EC);
-  EXPECT_EQ(std::error_code(), EC);
-  MemoryBlock M2 = Memory::allocateMappedMemory(64, &M1, Flags, EC);
-  EXPECT_EQ(std::error_code(), EC);
-  MemoryBlock M3 = Memory::allocateMappedMemory(32, &M2, Flags, EC);
-  EXPECT_EQ(std::error_code(), EC);
-
-  EXPECT_NE((void*)nullptr, M1.base());
-  EXPECT_LE(16U, M1.allocatedSize());
-  EXPECT_NE((void*)nullptr, M2.base());
-  EXPECT_LE(64U, M2.allocatedSize());
-  EXPECT_NE((void*)nullptr, M3.base());
-  EXPECT_LE(32U, M3.allocatedSize());
-
-  EXPECT_FALSE(doesOverlap(M1, M2));
-  EXPECT_FALSE(doesOverlap(M2, M3));
-  EXPECT_FALSE(doesOverlap(M1, M3));
-
-  EXPECT_FALSE(Memory::releaseMappedMemory(M1));
-  EXPECT_FALSE(Memory::releaseMappedMemory(M3));
-  EXPECT_FALSE(Memory::releaseMappedMemory(M2));
-}
-
-TEST_P(MappedMemoryTest, DuplicateNear) {
-  CHECK_UNSUPPORTED();
-  std::error_code EC;
-  MemoryBlock Near((void*)(3*PageSize), 16);
-  MemoryBlock M1 = Memory::allocateMappedMemory(16, &Near, Flags, EC);
-  EXPECT_EQ(std::error_code(), EC);
-  MemoryBlock M2 = Memory::allocateMappedMemory(64, &Near, Flags, EC);
-  EXPECT_EQ(std::error_code(), EC);
-  MemoryBlock M3 = Memory::allocateMappedMemory(32, &Near, Flags, EC);
-  EXPECT_EQ(std::error_code(), EC);
-
-  EXPECT_NE((void*)nullptr, M1.base());
-  EXPECT_LE(16U, M1.allocatedSize());
-  EXPECT_NE((void*)nullptr, M2.base());
-  EXPECT_LE(64U, M2.allocatedSize());
-  EXPECT_NE((void*)nullptr, M3.base());
-  EXPECT_LE(32U, M3.allocatedSize());
-
-  EXPECT_FALSE(Memory::releaseMappedMemory(M1));
-  EXPECT_FALSE(Memory::releaseMappedMemory(M3));
-  EXPECT_FALSE(Memory::releaseMappedMemory(M2));
-}
-
-TEST_P(MappedMemoryTest, ZeroNear) {
-  CHECK_UNSUPPORTED();
-  std::error_code EC;
-  MemoryBlock Near(nullptr, 0);
-  MemoryBlock M1 = Memory::allocateMappedMemory(16, &Near, Flags, EC);
-  EXPECT_EQ(std::error_code(), EC);
-  MemoryBlock M2 = Memory::allocateMappedMemory(64, &Near, Flags, EC);
-  EXPECT_EQ(std::error_code(), EC);
-  MemoryBlock M3 = Memory::allocateMappedMemory(32, &Near, Flags, EC);
-  EXPECT_EQ(std::error_code(), EC);
-
-  EXPECT_NE((void*)nullptr, M1.base());
-  EXPECT_LE(16U, M1.allocatedSize());
-  EXPECT_NE((void*)nullptr, M2.base());
-  EXPECT_LE(64U, M2.allocatedSize());
-  EXPECT_NE((void*)nullptr, M3.base());
-  EXPECT_LE(32U, M3.allocatedSize());
-
-  EXPECT_FALSE(doesOverlap(M1, M2));
-  EXPECT_FALSE(doesOverlap(M2, M3));
-  EXPECT_FALSE(doesOverlap(M1, M3));
-
-  EXPECT_FALSE(Memory::releaseMappedMemory(M1));
-  EXPECT_FALSE(Memory::releaseMappedMemory(M3));
-  EXPECT_FALSE(Memory::releaseMappedMemory(M2));
-}
-
-TEST_P(MappedMemoryTest, ZeroSizeNear) {
-  CHECK_UNSUPPORTED();
-  std::error_code EC;
-  MemoryBlock Near((void*)(4*PageSize), 0);
-  MemoryBlock M1 = Memory::allocateMappedMemory(16, &Near, Flags, EC);
-  EXPECT_EQ(std::error_code(), EC);
-  MemoryBlock M2 = Memory::allocateMappedMemory(64, &Near, Flags, EC);
-  EXPECT_EQ(std::error_code(), EC);
-  MemoryBlock M3 = Memory::allocateMappedMemory(32, &Near, Flags, EC);
-  EXPECT_EQ(std::error_code(), EC);
-
-  EXPECT_NE((void*)nullptr, M1.base());
-  EXPECT_LE(16U, M1.allocatedSize());
-  EXPECT_NE((void*)nullptr, M2.base());
-  EXPECT_LE(64U, M2.allocatedSize());
-  EXPECT_NE((void*)nullptr, M3.base());
-  EXPECT_LE(32U, M3.allocatedSize());
-
-  EXPECT_FALSE(doesOverlap(M1, M2));
-  EXPECT_FALSE(doesOverlap(M2, M3));
-  EXPECT_FALSE(doesOverlap(M1, M3));
-
-  EXPECT_FALSE(Memory::releaseMappedMemory(M1));
-  EXPECT_FALSE(Memory::releaseMappedMemory(M3));
-  EXPECT_FALSE(Memory::releaseMappedMemory(M2));
-}
-
-TEST_P(MappedMemoryTest, UnalignedNear) {
-  CHECK_UNSUPPORTED();
-  std::error_code EC;
-  MemoryBlock Near((void*)(2*PageSize+5), 0);
-  MemoryBlock M1 = Memory::allocateMappedMemory(15, &Near, Flags, EC);
-  EXPECT_EQ(std::error_code(), EC);
-
-  EXPECT_NE((void*)nullptr, M1.base());
-  EXPECT_LE(sizeof(int), M1.allocatedSize());
-
-  EXPECT_FALSE(Memory::releaseMappedMemory(M1));
-}
-
-// Note that Memory::MF_WRITE is not supported exclusively across
-// operating systems and architectures and can imply MF_READ|MF_WRITE
-unsigned MemoryFlags[] = {
-                           Memory::MF_READ,
-                           Memory::MF_WRITE,
-                           Memory::MF_READ|Memory::MF_WRITE,
-                           Memory::MF_EXEC,
-                           Memory::MF_READ|Memory::MF_EXEC,
-                           Memory::MF_READ|Memory::MF_WRITE|Memory::MF_EXEC
-                         };
-
-INSTANTIATE_TEST_SUITE_P(AllocationTests, MappedMemoryTest,
-                         ::testing::ValuesIn(MemoryFlags));
-
-}  // anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/Support/NativeFormatTests.cpp b/gnu/llvm/llvm/unittests/Support/NativeFormatTests.cpp
deleted file mode 100644
index bbe9aa6f6dc..00000000000
--- a/gnu/llvm/llvm/unittests/Support/NativeFormatTests.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-//===- llvm/unittest/Support/NativeFormatTests.cpp - formatting tests -----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/SmallString.h"
-#include "llvm/Support/NativeFormatting.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gtest/gtest.h"
-
-#include <type_traits>
-
-using namespace llvm;
-
-namespace {
-
-template <typename T> std::string format_number(T N, IntegerStyle Style) {
-  std::string S;
-  llvm::raw_string_ostream Str(S);
-  write_integer(Str, N, 0, Style);
-  Str.flush();
-  return S;
-}
-
-std::string format_number(uint64_t N, HexPrintStyle Style,
-                          Optional<size_t> Width = None) {
-  std::string S;
-  llvm::raw_string_ostream Str(S);
-  write_hex(Str, N, Style, Width);
-  Str.flush();
-  return S;
-}
-
-std::string format_number(double D, FloatStyle Style,
-                          Optional<size_t> Precision = None) {
-  std::string S;
-  llvm::raw_string_ostream Str(S);
-  write_double(Str, D, Style, Precision);
-  Str.flush();
-  return S;
-}
-
-// Test basic number formatting with various styles and default width and
-// precision.
-TEST(NativeFormatTest, BasicIntegerTests) {
-  // Simple integers with no decimal.
-  EXPECT_EQ("0", format_number(0, IntegerStyle::Integer));
-  EXPECT_EQ("2425", format_number(2425, IntegerStyle::Integer));
-  EXPECT_EQ("-2425", format_number(-2425, IntegerStyle::Integer));
-
-  EXPECT_EQ("0", format_number(0LL, IntegerStyle::Integer));
-  EXPECT_EQ("257257257235709",
-            format_number(257257257235709LL, IntegerStyle::Integer));
-  EXPECT_EQ("-257257257235709",
-            format_number(-257257257235709LL, IntegerStyle::Integer));
-
-  // Number formatting.
-  EXPECT_EQ("0", format_number(0, IntegerStyle::Number));
-  EXPECT_EQ("2,425", format_number(2425, IntegerStyle::Number));
-  EXPECT_EQ("-2,425", format_number(-2425, IntegerStyle::Number));
-  EXPECT_EQ("257,257,257,235,709",
-            format_number(257257257235709LL, IntegerStyle::Number));
-  EXPECT_EQ("-257,257,257,235,709",
-            format_number(-257257257235709LL, IntegerStyle::Number));
-
-  // Hex formatting.
-  // lower case, prefix.
-  EXPECT_EQ("0x0", format_number(0, HexPrintStyle::PrefixLower));
-  EXPECT_EQ("0xbeef", format_number(0xbeefLL, HexPrintStyle::PrefixLower));
-  EXPECT_EQ("0xdeadbeef",
-            format_number(0xdeadbeefLL, HexPrintStyle::PrefixLower));
-
-  // upper-case, prefix.
-  EXPECT_EQ("0x0", format_number(0, HexPrintStyle::PrefixUpper));
-  EXPECT_EQ("0xBEEF", format_number(0xbeefLL, HexPrintStyle::PrefixUpper));
-  EXPECT_EQ("0xDEADBEEF",
-            format_number(0xdeadbeefLL, HexPrintStyle::PrefixUpper));
-
-  // lower-case, no prefix
-  EXPECT_EQ("0", format_number(0, HexPrintStyle::Lower));
-  EXPECT_EQ("beef", format_number(0xbeefLL, HexPrintStyle::Lower));
-  EXPECT_EQ("deadbeef", format_number(0xdeadbeefLL, HexPrintStyle::Lower));
-
-  // upper-case, no prefix.
-  EXPECT_EQ("0", format_number(0, HexPrintStyle::Upper));
-  EXPECT_EQ("BEEF", format_number(0xbeef, HexPrintStyle::Upper));
-  EXPECT_EQ("DEADBEEF", format_number(0xdeadbeef, HexPrintStyle::Upper));
-}
-
-// Test basic floating point formatting with various styles and default width
-// and precision.
-TEST(NativeFormatTest, BasicFloatingPointTests) {
-  // Double
-  EXPECT_EQ("0.000000e+00", format_number(0.0, FloatStyle::Exponent));
-  EXPECT_EQ("-0.000000e+00", format_number(-0.0, FloatStyle::Exponent));
-  EXPECT_EQ("1.100000e+00", format_number(1.1, FloatStyle::Exponent));
-  EXPECT_EQ("1.100000E+00", format_number(1.1, FloatStyle::ExponentUpper));
-
-  // Default precision is 2 for floating points.
-  EXPECT_EQ("1.10", format_number(1.1, FloatStyle::Fixed));
-  EXPECT_EQ("1.34", format_number(1.34, FloatStyle::Fixed));
-  EXPECT_EQ("1.34", format_number(1.344, FloatStyle::Fixed));
-  EXPECT_EQ("1.35", format_number(1.346, FloatStyle::Fixed));
-}
-
-// Test common boundary cases and min/max conditions.
-TEST(NativeFormatTest, BoundaryTests) {
-  // Min and max.
-  EXPECT_EQ("18446744073709551615",
-            format_number(UINT64_MAX, IntegerStyle::Integer));
-
-  EXPECT_EQ("9223372036854775807",
-            format_number(INT64_MAX, IntegerStyle::Integer));
-  EXPECT_EQ("-9223372036854775808",
-            format_number(INT64_MIN, IntegerStyle::Integer));
-
-  EXPECT_EQ("4294967295", format_number(UINT32_MAX, IntegerStyle::Integer));
-  EXPECT_EQ("2147483647", format_number(INT32_MAX, IntegerStyle::Integer));
-  EXPECT_EQ("-2147483648", format_number(INT32_MIN, IntegerStyle::Integer));
-
-  EXPECT_EQ("nan", format_number(std::numeric_limits<double>::quiet_NaN(),
-                                 FloatStyle::Fixed));
-  EXPECT_EQ("INF", format_number(std::numeric_limits<double>::infinity(),
-                                 FloatStyle::Fixed));
-}
-
-TEST(NativeFormatTest, HexTests) {
-  // Test hex formatting with different widths and precisions.
-
-  // Width less than the value should print the full value anyway.
-  EXPECT_EQ("0x0", format_number(0, HexPrintStyle::PrefixLower, 0));
-  EXPECT_EQ("0xabcde", format_number(0xABCDE, HexPrintStyle::PrefixLower, 3));
-
-  // Precision greater than the value should pad with 0s.
-  // TODO: The prefix should not be counted in the precision.  But unfortunately
-  // it is and we have to live with it unless we fix all existing users of
-  // prefixed hex formatting.
-  EXPECT_EQ("0x000", format_number(0, HexPrintStyle::PrefixLower, 5));
-  EXPECT_EQ("0x0abcde", format_number(0xABCDE, HexPrintStyle::PrefixLower, 8));
-
-  EXPECT_EQ("00000", format_number(0, HexPrintStyle::Lower, 5));
-  EXPECT_EQ("000abcde", format_number(0xABCDE, HexPrintStyle::Lower, 8));
-
-  // Try printing more digits than can fit in a uint64.
-  EXPECT_EQ("0x00000000000000abcde",
-            format_number(0xABCDE, HexPrintStyle::PrefixLower, 21));
-}
-
-TEST(NativeFormatTest, IntegerTests) {
-  EXPECT_EQ("-10", format_number(-10, IntegerStyle::Integer));
-  EXPECT_EQ("-100", format_number(-100, IntegerStyle::Integer));
-  EXPECT_EQ("-1000", format_number(-1000, IntegerStyle::Integer));
-  EXPECT_EQ("-1234567890", format_number(-1234567890, IntegerStyle::Integer));
-  EXPECT_EQ("10", format_number(10, IntegerStyle::Integer));
-  EXPECT_EQ("100", format_number(100, IntegerStyle::Integer));
-  EXPECT_EQ("1000", format_number(1000, IntegerStyle::Integer));
-  EXPECT_EQ("1234567890", format_number(1234567890, IntegerStyle::Integer));
-}
-
-TEST(NativeFormatTest, CommaTests) {
-  EXPECT_EQ("0", format_number(0, IntegerStyle::Number));
-  EXPECT_EQ("10", format_number(10, IntegerStyle::Number));
-  EXPECT_EQ("100", format_number(100, IntegerStyle::Number));
-  EXPECT_EQ("1,000", format_number(1000, IntegerStyle::Number));
-  EXPECT_EQ("1,234,567,890", format_number(1234567890, IntegerStyle::Number));
-
-  EXPECT_EQ("-10", format_number(-10, IntegerStyle::Number));
-  EXPECT_EQ("-100", format_number(-100, IntegerStyle::Number));
-  EXPECT_EQ("-1,000", format_number(-1000, IntegerStyle::Number));
-  EXPECT_EQ("-1,234,567,890", format_number(-1234567890, IntegerStyle::Number));
-}
-}
diff --git a/gnu/llvm/llvm/unittests/Support/OptimizedStructLayoutTest.cpp b/gnu/llvm/llvm/unittests/Support/OptimizedStructLayoutTest.cpp
deleted file mode 100644
index e8cd5f4285e..00000000000
--- a/gnu/llvm/llvm/unittests/Support/OptimizedStructLayoutTest.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-//=== - unittest/Support/OptimizedStructLayoutTest.cpp - Layout tests -----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/OptimizedStructLayout.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-class LayoutTest {
-  struct Field {
-    uint64_t Size;
-    Align Alignment;
-    uint64_t ForcedOffset;
-    uint64_t ExpectedOffset;
-  };
-
-  SmallVector<Field, 16> Fields;
-  bool Verified = false;
-
-public:
-  LayoutTest() {}
-  LayoutTest(const LayoutTest &) = delete;
-  LayoutTest &operator=(const LayoutTest &) = delete;
-  ~LayoutTest() { assert(Verified); }
-
-  LayoutTest &flexible(uint64_t Size, uint64_t Alignment,
-                       uint64_t ExpectedOffset) {
-    Fields.push_back({Size, Align(Alignment),
-                      OptimizedStructLayoutField::FlexibleOffset, ExpectedOffset});
-    return *this;
-  }
-
-  LayoutTest &fixed(uint64_t Size, uint64_t Alignment, uint64_t Offset) {
-    Fields.push_back({Size, Align(Alignment), Offset, Offset});
-    return *this;
-  }
-
-  void verify(uint64_t ExpectedSize, uint64_t ExpectedAlignment) {
-    SmallVector<OptimizedStructLayoutField, 8> LayoutFields;
-    LayoutFields.reserve(Fields.size());
-    for (auto &F : Fields)
-      LayoutFields.emplace_back(&F, F.Size, F.Alignment, F.ForcedOffset);
-
-    auto SizeAndAlign = performOptimizedStructLayout(LayoutFields);
-
-    EXPECT_EQ(SizeAndAlign.first, ExpectedSize);
-    EXPECT_EQ(SizeAndAlign.second, Align(ExpectedAlignment));
-
-    for (auto &LF : LayoutFields) {
-      auto &F = *static_cast<const Field *>(LF.Id);
-      EXPECT_EQ(LF.Offset, F.ExpectedOffset);
-    }
-
-    Verified = true;
-  }
-};
-
-}
-
-TEST(OptimizedStructLayoutTest, Basic) {
-  LayoutTest()
-    .flexible(12, 4, 8)
-    .flexible(8,  8, 0)
-    .flexible(4,  4, 20)
-    .verify(24, 8);
-}
-
-TEST(OptimizedStructLayoutTest, OddSize) {
-  LayoutTest()
-    .flexible(8,  8, 16)
-    .flexible(4,  4, 12)
-    .flexible(1,  1, 10)
-    .flexible(10, 8, 0)
-    .verify(24, 8);
-}
-
-TEST(OptimizedStructLayoutTest, Gaps) {
-  LayoutTest()
-    .fixed(4, 4, 8)
-    .fixed(4, 4, 16)
-    .flexible(4, 4, 0)
-    .flexible(4, 4, 4)
-    .flexible(4, 4, 12)
-    .flexible(4, 4, 20)
-    .verify(24, 4);
-}
-
-TEST(OptimizedStructLayoutTest, Greed) {
-  // The greedy algorithm doesn't find the optimal layout here, which
-  // would be to put the 5-byte field at the end.
-  LayoutTest()
-    .fixed(4, 4, 8)
-    .flexible(5, 4, 0)
-    .flexible(4, 4, 12)
-    .flexible(4, 4, 16)
-    .flexible(4, 4, 20)
-    .verify(24, 4);
-}
-
-TEST(OptimizedStructLayoutTest, Jagged) {
-  LayoutTest()
-    .flexible(1, 2, 18)
-    .flexible(13, 8, 0)
-    .flexible(3, 2, 14)
-    .verify(19, 8);
-}
-
-TEST(OptimizedStructLayoutTest, GardenPath) {
-  // The 4-byte-aligned field is our highest priority, but the less-aligned
-  // fields keep leaving the end offset mis-aligned.
-  LayoutTest()
-    .fixed(7, 4, 0)
-    .flexible(4, 4, 44)
-    .flexible(6, 1, 7)
-    .flexible(5, 1, 13)
-    .flexible(7, 2, 18)
-    .flexible(4, 1, 25)
-    .flexible(4, 1, 29)
-    .flexible(1, 1, 33)
-    .flexible(4, 2, 34)
-    .flexible(4, 2, 38)
-    .flexible(2, 2, 42)
-    .flexible(2, 2, 48)
-    .verify(50, 4);
-}
-
-// PR 51131
-TEST(OptimizedStructLayoutTest, HighAlignment) {
-  // Handle the case where a flexible field has such a high alignment
-  // requirement that aligning LastEnd to it gives an offset past the
-  // end of the gap before the next fixed-alignment field.
-  LayoutTest()
-    .fixed(8, 8, 0)
-    .fixed(8, 8, 8)
-    .fixed(64, 64, 64)
-    .flexible(1, 1, 16)
-    .flexible(1, 1, 17)
-    .flexible(4, 128, 128)
-    .flexible(1, 1, 18)
-    .flexible(1, 1, 19)
-    .verify(132, 128);
-}
diff --git a/gnu/llvm/llvm/unittests/Support/ParallelTest.cpp b/gnu/llvm/llvm/unittests/Support/ParallelTest.cpp
deleted file mode 100644
index f4bd10b57f8..00000000000
--- a/gnu/llvm/llvm/unittests/Support/ParallelTest.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-//===- llvm/unittest/Support/ParallelTest.cpp -----------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-///
-/// \file
-/// Parallel.h unit tests.
-///
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/Parallel.h"
-#include "gtest/gtest.h"
-#include <array>
-#include <random>
-
-uint32_t array[1024 * 1024];
-
-using namespace llvm;
-
-// Tests below are hanging up on mingw. Investigating.
-#if !defined(__MINGW32__)
-
-TEST(Parallel, sort) {
-  std::mt19937 randEngine;
-  std::uniform_int_distribution<uint32_t> dist;
-
-  for (auto &i : array)
-    i = dist(randEngine);
-
-  parallelSort(std::begin(array), std::end(array));
-  ASSERT_TRUE(llvm::is_sorted(array));
-}
-
-TEST(Parallel, parallel_for) {
-  // We need to test the case with a TaskSize > 1. We are white-box testing
-  // here. The TaskSize is calculated as (End - Begin) / 1024 at the time of
-  // writing.
-  uint32_t range[2050];
-  std::fill(range, range + 2050, 1);
-  parallelForEachN(0, 2049, [&range](size_t I) { ++range[I]; });
-
-  uint32_t expected[2049];
-  std::fill(expected, expected + 2049, 2);
-  ASSERT_TRUE(std::equal(range, range + 2049, expected));
-  // Check that we don't write past the end of the requested range.
-  ASSERT_EQ(range[2049], 1u);
-}
-
-TEST(Parallel, TransformReduce) {
-  // Sum an empty list, check that it works.
-  auto identity = [](uint32_t v) { return v; };
-  uint32_t sum = parallelTransformReduce(ArrayRef<uint32_t>(), 0U,
-                                         std::plus<uint32_t>(), identity);
-  EXPECT_EQ(sum, 0U);
-
-  // Sum the lengths of these strings in parallel.
-  const char *strs[] = {"a", "ab", "abc", "abcd", "abcde", "abcdef"};
-  size_t lenSum =
-      parallelTransformReduce(strs, static_cast<size_t>(0), std::plus<size_t>(),
-                              [](const char *s) { return strlen(s); });
-  EXPECT_EQ(lenSum, static_cast<size_t>(21));
-
-  // Check that we handle non-divisible task sizes as above.
-  uint32_t range[2050];
-  std::fill(std::begin(range), std::end(range), 1);
-  sum = parallelTransformReduce(range, 0U, std::plus<uint32_t>(), identity);
-  EXPECT_EQ(sum, 2050U);
-
-  std::fill(std::begin(range), std::end(range), 2);
-  sum = parallelTransformReduce(range, 0U, std::plus<uint32_t>(), identity);
-  EXPECT_EQ(sum, 4100U);
-
-  // Avoid one large task.
-  uint32_t range2[3060];
-  std::fill(std::begin(range2), std::end(range2), 1);
-  sum = parallelTransformReduce(range2, 0U, std::plus<uint32_t>(), identity);
-  EXPECT_EQ(sum, 3060U);
-}
-
-TEST(Parallel, ForEachError) {
-  int nums[] = {1, 2, 3, 4, 5, 6};
-  Error e = parallelForEachError(nums, [](int v) -> Error {
-    if ((v & 1) == 0)
-      return createStringError(std::errc::invalid_argument, "asdf");
-    return Error::success();
-  });
-  EXPECT_TRUE(e.isA<ErrorList>());
-  std::string errText = toString(std::move(e));
-  EXPECT_EQ(errText, std::string("asdf\nasdf\nasdf"));
-}
-
-#endif
diff --git a/gnu/llvm/llvm/unittests/Support/Path.cpp b/gnu/llvm/llvm/unittests/Support/Path.cpp
deleted file mode 100644
index 7f95e6cae51..00000000000
--- a/gnu/llvm/llvm/unittests/Support/Path.cpp
+++ /dev/null
@@ -1,2304 +0,0 @@
-//===- llvm/unittest/Support/Path.cpp - Path tests ------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/Path.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/ScopeExit.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/Triple.h"
-#include "llvm/BinaryFormat/Magic.h"
-#include "llvm/Config/llvm-config.h"
-#include "llvm/Support/Compiler.h"
-#include "llvm/Support/ConvertUTF.h"
-#include "llvm/Support/Errc.h"
-#include "llvm/Support/ErrorHandling.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/FileUtilities.h"
-#include "llvm/Support/Host.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/Testing/Support/Error.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-#ifdef _WIN32
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/Support/Chrono.h"
-#include "llvm/Support/Windows/WindowsSupport.h"
-#include <windows.h>
-#include <winerror.h>
-#endif
-
-#ifdef LLVM_ON_UNIX
-#include <pwd.h>
-#include <sys/stat.h>
-#endif
-
-using namespace llvm;
-using namespace llvm::sys;
-
-#define ASSERT_NO_ERROR(x)                                                     \
-  if (std::error_code ASSERT_NO_ERROR_ec = x) {                                \
-    SmallString<128> MessageStorage;                                           \
-    raw_svector_ostream Message(MessageStorage);                               \
-    Message << #x ": did not return errc::success.\n"                          \
-            << "error number: " << ASSERT_NO_ERROR_ec.value() << "\n"          \
-            << "error message: " << ASSERT_NO_ERROR_ec.message() << "\n";      \
-    GTEST_FATAL_FAILURE_(MessageStorage.c_str());                              \
-  } else {                                                                     \
-  }
-
-#define ASSERT_ERROR(x)                                                        \
-  if (!x) {                                                                    \
-    SmallString<128> MessageStorage;                                           \
-    raw_svector_ostream Message(MessageStorage);                               \
-    Message << #x ": did not return a failure error code.\n";                  \
-    GTEST_FATAL_FAILURE_(MessageStorage.c_str());                              \
-  }
-
-namespace {
-
-struct FileDescriptorCloser {
-  explicit FileDescriptorCloser(int FD) : FD(FD) {}
-  ~FileDescriptorCloser() { ::close(FD); }
-  int FD;
-};
-
-TEST(is_separator, Works) {
-  EXPECT_TRUE(path::is_separator('/'));
-  EXPECT_FALSE(path::is_separator('\0'));
-  EXPECT_FALSE(path::is_separator('-'));
-  EXPECT_FALSE(path::is_separator(' '));
-
-  EXPECT_TRUE(path::is_separator('\\', path::Style::windows));
-  EXPECT_FALSE(path::is_separator('\\', path::Style::posix));
-
-#ifdef _WIN32
-  EXPECT_TRUE(path::is_separator('\\'));
-#else
-  EXPECT_FALSE(path::is_separator('\\'));
-#endif
-}
-
-TEST(is_absolute_gnu, Works) {
-  // Test tuple <Path, ExpectedPosixValue, ExpectedWindowsValue>.
-  const std::tuple<StringRef, bool, bool> Paths[] = {
-      std::make_tuple("", false, false),
-      std::make_tuple("/", true, true),
-      std::make_tuple("/foo", true, true),
-      std::make_tuple("\\", false, true),
-      std::make_tuple("\\foo", false, true),
-      std::make_tuple("foo", false, false),
-      std::make_tuple("c", false, false),
-      std::make_tuple("c:", false, true),
-      std::make_tuple("c:\\", false, true),
-      std::make_tuple("!:", false, true),
-      std::make_tuple("xx:", false, false),
-      std::make_tuple("c:abc\\", false, true),
-      std::make_tuple(":", false, false)};
-
-  for (const auto &Path : Paths) {
-    EXPECT_EQ(path::is_absolute_gnu(std::get<0>(Path), path::Style::posix),
-              std::get<1>(Path));
-    EXPECT_EQ(path::is_absolute_gnu(std::get<0>(Path), path::Style::windows),
-              std::get<2>(Path));
-  }
-}
-
-TEST(Support, Path) {
-  SmallVector<StringRef, 40> paths;
-  paths.push_back("");
-  paths.push_back(".");
-  paths.push_back("..");
-  paths.push_back("foo");
-  paths.push_back("/");
-  paths.push_back("/foo");
-  paths.push_back("foo/");
-  paths.push_back("/foo/");
-  paths.push_back("foo/bar");
-  paths.push_back("/foo/bar");
-  paths.push_back("//net");
-  paths.push_back("//net/");
-  paths.push_back("//net/foo");
-  paths.push_back("///foo///");
-  paths.push_back("///foo///bar");
-  paths.push_back("/.");
-  paths.push_back("./");
-  paths.push_back("/..");
-  paths.push_back("../");
-  paths.push_back("foo/.");
-  paths.push_back("foo/..");
-  paths.push_back("foo/./");
-  paths.push_back("foo/./bar");
-  paths.push_back("foo/..");
-  paths.push_back("foo/../");
-  paths.push_back("foo/../bar");
-  paths.push_back("c:");
-  paths.push_back("c:/");
-  paths.push_back("c:foo");
-  paths.push_back("c:/foo");
-  paths.push_back("c:foo/");
-  paths.push_back("c:/foo/");
-  paths.push_back("c:/foo/bar");
-  paths.push_back("prn:");
-  paths.push_back("c:\\");
-  paths.push_back("c:foo");
-  paths.push_back("c:\\foo");
-  paths.push_back("c:foo\\");
-  paths.push_back("c:\\foo\\");
-  paths.push_back("c:\\foo/");
-  paths.push_back("c:/foo\\bar");
-
-  for (SmallVector<StringRef, 40>::const_iterator i = paths.begin(),
-                                                  e = paths.end();
-                                                  i != e;
-                                                  ++i) {
-    SCOPED_TRACE(*i);
-    SmallVector<StringRef, 5> ComponentStack;
-    for (sys::path::const_iterator ci = sys::path::begin(*i),
-                                   ce = sys::path::end(*i);
-                                   ci != ce;
-                                   ++ci) {
-      EXPECT_FALSE(ci->empty());
-      ComponentStack.push_back(*ci);
-    }
-
-    SmallVector<StringRef, 5> ReverseComponentStack;
-    for (sys::path::reverse_iterator ci = sys::path::rbegin(*i),
-                                     ce = sys::path::rend(*i);
-                                     ci != ce;
-                                     ++ci) {
-      EXPECT_FALSE(ci->empty());
-      ReverseComponentStack.push_back(*ci);
-    }
-    std::reverse(ReverseComponentStack.begin(), ReverseComponentStack.end());
-    EXPECT_THAT(ComponentStack, testing::ContainerEq(ReverseComponentStack));
-
-    // Crash test most of the API - since we're iterating over all of our paths
-    // here there isn't really anything reasonable to assert on in the results.
-    (void)path::has_root_path(*i);
-    (void)path::root_path(*i);
-    (void)path::has_root_name(*i);
-    (void)path::root_name(*i);
-    (void)path::has_root_directory(*i);
-    (void)path::root_directory(*i);
-    (void)path::has_parent_path(*i);
-    (void)path::parent_path(*i);
-    (void)path::has_filename(*i);
-    (void)path::filename(*i);
-    (void)path::has_stem(*i);
-    (void)path::stem(*i);
-    (void)path::has_extension(*i);
-    (void)path::extension(*i);
-    (void)path::is_absolute(*i);
-    (void)path::is_absolute_gnu(*i);
-    (void)path::is_relative(*i);
-
-    SmallString<128> temp_store;
-    temp_store = *i;
-    ASSERT_NO_ERROR(fs::make_absolute(temp_store));
-    temp_store = *i;
-    path::remove_filename(temp_store);
-
-    temp_store = *i;
-    path::replace_extension(temp_store, "ext");
-    StringRef filename(temp_store.begin(), temp_store.size()), stem, ext;
-    stem = path::stem(filename);
-    ext  = path::extension(filename);
-    EXPECT_EQ(*sys::path::rbegin(filename), (stem + ext).str());
-
-    path::native(*i, temp_store);
-  }
-
-  {
-    SmallString<32> Relative("foo.cpp");
-    sys::fs::make_absolute("/root", Relative);
-    Relative[5] = '/'; // Fix up windows paths.
-    ASSERT_EQ("/root/foo.cpp", Relative);
-  }
-
-  {
-    SmallString<32> Relative("foo.cpp");
-    sys::fs::make_absolute("//root", Relative);
-    Relative[6] = '/'; // Fix up windows paths.
-    ASSERT_EQ("//root/foo.cpp", Relative);
-  }
-}
-
-TEST(Support, PathRoot) {
-  ASSERT_EQ(path::root_name("//net/hello", path::Style::posix).str(), "//net");
-  ASSERT_EQ(path::root_name("c:/hello", path::Style::posix).str(), "");
-  ASSERT_EQ(path::root_name("c:/hello", path::Style::windows).str(), "c:");
-  ASSERT_EQ(path::root_name("/hello", path::Style::posix).str(), "");
-
-  ASSERT_EQ(path::root_directory("/goo/hello", path::Style::posix).str(), "/");
-  ASSERT_EQ(path::root_directory("c:/hello", path::Style::windows).str(), "/");
-  ASSERT_EQ(path::root_directory("d/file.txt", path::Style::posix).str(), "");
-  ASSERT_EQ(path::root_directory("d/file.txt", path::Style::windows).str(), "");
-
-  SmallVector<StringRef, 40> paths;
-  paths.push_back("");
-  paths.push_back(".");
-  paths.push_back("..");
-  paths.push_back("foo");
-  paths.push_back("/");
-  paths.push_back("/foo");
-  paths.push_back("foo/");
-  paths.push_back("/foo/");
-  paths.push_back("foo/bar");
-  paths.push_back("/foo/bar");
-  paths.push_back("//net");
-  paths.push_back("//net/");
-  paths.push_back("//net/foo");
-  paths.push_back("///foo///");
-  paths.push_back("///foo///bar");
-  paths.push_back("/.");
-  paths.push_back("./");
-  paths.push_back("/..");
-  paths.push_back("../");
-  paths.push_back("foo/.");
-  paths.push_back("foo/..");
-  paths.push_back("foo/./");
-  paths.push_back("foo/./bar");
-  paths.push_back("foo/..");
-  paths.push_back("foo/../");
-  paths.push_back("foo/../bar");
-  paths.push_back("c:");
-  paths.push_back("c:/");
-  paths.push_back("c:foo");
-  paths.push_back("c:/foo");
-  paths.push_back("c:foo/");
-  paths.push_back("c:/foo/");
-  paths.push_back("c:/foo/bar");
-  paths.push_back("prn:");
-  paths.push_back("c:\\");
-  paths.push_back("c:foo");
-  paths.push_back("c:\\foo");
-  paths.push_back("c:foo\\");
-  paths.push_back("c:\\foo\\");
-  paths.push_back("c:\\foo/");
-  paths.push_back("c:/foo\\bar");
-
-  for (StringRef p : paths) {
-    ASSERT_EQ(
-      path::root_name(p, path::Style::posix).str() + path::root_directory(p, path::Style::posix).str(),
-      path::root_path(p, path::Style::posix).str());
-
-    ASSERT_EQ(
-      path::root_name(p, path::Style::windows).str() + path::root_directory(p, path::Style::windows).str(),
-      path::root_path(p, path::Style::windows).str());
-  }
-}
-
-TEST(Support, FilenameParent) {
-  EXPECT_EQ("/", path::filename("/"));
-  EXPECT_EQ("", path::parent_path("/"));
-
-  EXPECT_EQ("\\", path::filename("c:\\", path::Style::windows));
-  EXPECT_EQ("c:", path::parent_path("c:\\", path::Style::windows));
-
-  EXPECT_EQ("/", path::filename("///"));
-  EXPECT_EQ("", path::parent_path("///"));
-
-  EXPECT_EQ("\\", path::filename("c:\\\\", path::Style::windows));
-  EXPECT_EQ("c:", path::parent_path("c:\\\\", path::Style::windows));
-
-  EXPECT_EQ("bar", path::filename("/foo/bar"));
-  EXPECT_EQ("/foo", path::parent_path("/foo/bar"));
-
-  EXPECT_EQ("foo", path::filename("/foo"));
-  EXPECT_EQ("/", path::parent_path("/foo"));
-
-  EXPECT_EQ("foo", path::filename("foo"));
-  EXPECT_EQ("", path::parent_path("foo"));
-
-  EXPECT_EQ(".", path::filename("foo/"));
-  EXPECT_EQ("foo", path::parent_path("foo/"));
-
-  EXPECT_EQ("//net", path::filename("//net"));
-  EXPECT_EQ("", path::parent_path("//net"));
-
-  EXPECT_EQ("/", path::filename("//net/"));
-  EXPECT_EQ("//net", path::parent_path("//net/"));
-
-  EXPECT_EQ("foo", path::filename("//net/foo"));
-  EXPECT_EQ("//net/", path::parent_path("//net/foo"));
-
-  // These checks are just to make sure we do something reasonable with the
-  // paths below. They are not meant to prescribe the one true interpretation of
-  // these paths. Other decompositions (e.g. "//" -> "" + "//") are also
-  // possible.
-  EXPECT_EQ("/", path::filename("//"));
-  EXPECT_EQ("", path::parent_path("//"));
-
-  EXPECT_EQ("\\", path::filename("\\\\", path::Style::windows));
-  EXPECT_EQ("", path::parent_path("\\\\", path::Style::windows));
-
-  EXPECT_EQ("\\", path::filename("\\\\\\", path::Style::windows));
-  EXPECT_EQ("", path::parent_path("\\\\\\", path::Style::windows));
-}
-
-static std::vector<StringRef>
-GetComponents(StringRef Path, path::Style S = path::Style::native) {
-  return {path::begin(Path, S), path::end(Path)};
-}
-
-TEST(Support, PathIterator) {
-  EXPECT_THAT(GetComponents("/foo"), testing::ElementsAre("/", "foo"));
-  EXPECT_THAT(GetComponents("/"), testing::ElementsAre("/"));
-  EXPECT_THAT(GetComponents("//"), testing::ElementsAre("/"));
-  EXPECT_THAT(GetComponents("///"), testing::ElementsAre("/"));
-  EXPECT_THAT(GetComponents("c/d/e/foo.txt"),
-              testing::ElementsAre("c", "d", "e", "foo.txt"));
-  EXPECT_THAT(GetComponents(".c/.d/../."),
-              testing::ElementsAre(".c", ".d", "..", "."));
-  EXPECT_THAT(GetComponents("/c/d/e/foo.txt"),
-              testing::ElementsAre("/", "c", "d", "e", "foo.txt"));
-  EXPECT_THAT(GetComponents("/.c/.d/../."),
-              testing::ElementsAre("/", ".c", ".d", "..", "."));
-  EXPECT_THAT(GetComponents("c:\\c\\e\\foo.txt", path::Style::windows),
-              testing::ElementsAre("c:", "\\", "c", "e", "foo.txt"));
-  EXPECT_THAT(GetComponents("//net/"), testing::ElementsAre("//net", "/"));
-  EXPECT_THAT(GetComponents("//net/c/foo.txt"),
-              testing::ElementsAre("//net", "/", "c", "foo.txt"));
-}
-
-TEST(Support, AbsolutePathIteratorEnd) {
-  // Trailing slashes are converted to '.' unless they are part of the root path.
-  SmallVector<std::pair<StringRef, path::Style>, 4> Paths;
-  Paths.emplace_back("/foo/", path::Style::native);
-  Paths.emplace_back("/foo//", path::Style::native);
-  Paths.emplace_back("//net/foo/", path::Style::native);
-  Paths.emplace_back("c:\\foo\\", path::Style::windows);
-
-  for (auto &Path : Paths) {
-    SCOPED_TRACE(Path.first);
-    StringRef LastComponent = *path::rbegin(Path.first, Path.second);
-    EXPECT_EQ(".", LastComponent);
-  }
-
-  SmallVector<std::pair<StringRef, path::Style>, 3> RootPaths;
-  RootPaths.emplace_back("/", path::Style::native);
-  RootPaths.emplace_back("//net/", path::Style::native);
-  RootPaths.emplace_back("c:\\", path::Style::windows);
-  RootPaths.emplace_back("//net//", path::Style::native);
-  RootPaths.emplace_back("c:\\\\", path::Style::windows);
-
-  for (auto &Path : RootPaths) {
-    SCOPED_TRACE(Path.first);
-    StringRef LastComponent = *path::rbegin(Path.first, Path.second);
-    EXPECT_EQ(1u, LastComponent.size());
-    EXPECT_TRUE(path::is_separator(LastComponent[0], Path.second));
-  }
-}
-
-#ifdef _WIN32
-std::string getEnvWin(const wchar_t *Var) {
-  std::string expected;
-  if (wchar_t const *path = ::_wgetenv(Var)) {
-    auto pathLen = ::wcslen(path);
-    ArrayRef<char> ref{reinterpret_cast<char const *>(path),
-                       pathLen * sizeof(wchar_t)};
-    convertUTF16ToUTF8String(ref, expected);
-  }
-  return expected;
-}
-#else
-// RAII helper to set and restore an environment variable.
-class WithEnv {
-  const char *Var;
-  llvm::Optional<std::string> OriginalValue;
-
-public:
-  WithEnv(const char *Var, const char *Value) : Var(Var) {
-    if (const char *V = ::getenv(Var))
-      OriginalValue.emplace(V);
-    if (Value)
-      ::setenv(Var, Value, 1);
-    else
-      ::unsetenv(Var);
-  }
-  ~WithEnv() {
-    if (OriginalValue)
-      ::setenv(Var, OriginalValue->c_str(), 1);
-    else
-      ::unsetenv(Var);
-  }
-};
-#endif
-
-TEST(Support, HomeDirectory) {
-  std::string expected;
-#ifdef _WIN32
-  expected = getEnvWin(L"USERPROFILE");
-#else
-  if (char const *path = ::getenv("HOME"))
-    expected = path;
-#endif
-  // Do not try to test it if we don't know what to expect.
-  // On Windows we use something better than env vars.
-  if (!expected.empty()) {
-    SmallString<128> HomeDir;
-    auto status = path::home_directory(HomeDir);
-    EXPECT_TRUE(status);
-    EXPECT_EQ(expected, HomeDir);
-  }
-}
-
-// Apple has their own solution for this.
-#if defined(LLVM_ON_UNIX) && !defined(__APPLE__)
-TEST(Support, HomeDirectoryWithNoEnv) {
-  WithEnv Env("HOME", nullptr);
-
-  // Don't run the test if we have nothing to compare against.
-  struct passwd *pw = getpwuid(getuid());
-  if (!pw || !pw->pw_dir) return;
-  std::string PwDir = pw->pw_dir;
-
-  SmallString<128> HomeDir;
-  EXPECT_TRUE(path::home_directory(HomeDir));
-  EXPECT_EQ(PwDir, HomeDir);
-}
-
-TEST(Support, ConfigDirectoryWithEnv) {
-  WithEnv Env("XDG_CONFIG_HOME", "/xdg/config");
-
-  SmallString<128> ConfigDir;
-  EXPECT_TRUE(path::user_config_directory(ConfigDir));
-  EXPECT_EQ("/xdg/config", ConfigDir);
-}
-
-TEST(Support, ConfigDirectoryNoEnv) {
-  WithEnv Env("XDG_CONFIG_HOME", nullptr);
-
-  SmallString<128> Fallback;
-  ASSERT_TRUE(path::home_directory(Fallback));
-  path::append(Fallback, ".config");
-
-  SmallString<128> CacheDir;
-  EXPECT_TRUE(path::user_config_directory(CacheDir));
-  EXPECT_EQ(Fallback, CacheDir);
-}
-
-TEST(Support, CacheDirectoryWithEnv) {
-  WithEnv Env("XDG_CACHE_HOME", "/xdg/cache");
-
-  SmallString<128> CacheDir;
-  EXPECT_TRUE(path::cache_directory(CacheDir));
-  EXPECT_EQ("/xdg/cache", CacheDir);
-}
-
-TEST(Support, CacheDirectoryNoEnv) {
-  WithEnv Env("XDG_CACHE_HOME", nullptr);
-
-  SmallString<128> Fallback;
-  ASSERT_TRUE(path::home_directory(Fallback));
-  path::append(Fallback, ".cache");
-
-  SmallString<128> CacheDir;
-  EXPECT_TRUE(path::cache_directory(CacheDir));
-  EXPECT_EQ(Fallback, CacheDir);
-}
-#endif
-
-#ifdef __APPLE__
-TEST(Support, ConfigDirectory) {
-  SmallString<128> Fallback;
-  ASSERT_TRUE(path::home_directory(Fallback));
-  path::append(Fallback, "Library/Preferences");
-
-  SmallString<128> ConfigDir;
-  EXPECT_TRUE(path::user_config_directory(ConfigDir));
-  EXPECT_EQ(Fallback, ConfigDir);
-}
-#endif
-
-#ifdef _WIN32
-TEST(Support, ConfigDirectory) {
-  std::string Expected = getEnvWin(L"LOCALAPPDATA");
-  // Do not try to test it if we don't know what to expect.
-  if (!Expected.empty()) {
-    SmallString<128> CacheDir;
-    EXPECT_TRUE(path::user_config_directory(CacheDir));
-    EXPECT_EQ(Expected, CacheDir);
-  }
-}
-
-TEST(Support, CacheDirectory) {
-  std::string Expected = getEnvWin(L"LOCALAPPDATA");
-  // Do not try to test it if we don't know what to expect.
-  if (!Expected.empty()) {
-    SmallString<128> CacheDir;
-    EXPECT_TRUE(path::cache_directory(CacheDir));
-    EXPECT_EQ(Expected, CacheDir);
-  }
-}
-#endif
-
-TEST(Support, TempDirectory) {
-  SmallString<32> TempDir;
-  path::system_temp_directory(false, TempDir);
-  EXPECT_TRUE(!TempDir.empty());
-  TempDir.clear();
-  path::system_temp_directory(true, TempDir);
-  EXPECT_TRUE(!TempDir.empty());
-}
-
-#ifdef _WIN32
-static std::string path2regex(std::string Path) {
-  size_t Pos = 0;
-  while ((Pos = Path.find('\\', Pos)) != std::string::npos) {
-    Path.replace(Pos, 1, "\\\\");
-    Pos += 2;
-  }
-  return Path;
-}
-
-/// Helper for running temp dir test in separated process. See below.
-#define EXPECT_TEMP_DIR(prepare, expected)                                     \
-  EXPECT_EXIT(                                                                 \
-      {                                                                        \
-        prepare;                                                               \
-        SmallString<300> TempDir;                                              \
-        path::system_temp_directory(true, TempDir);                            \
-        raw_os_ostream(std::cerr) << TempDir;                                  \
-        std::exit(0);                                                          \
-      },                                                                       \
-      ::testing::ExitedWithCode(0), path2regex(expected))
-
-TEST(SupportDeathTest, TempDirectoryOnWindows) {
-  // In this test we want to check how system_temp_directory responds to
-  // different values of specific env vars. To prevent corrupting env vars of
-  // the current process all checks are done in separated processes.
-  EXPECT_TEMP_DIR(_wputenv_s(L"TMP", L"C:\\OtherFolder"), "C:\\OtherFolder");
-  EXPECT_TEMP_DIR(_wputenv_s(L"TMP", L"C:/Unix/Path/Seperators"),
-                  "C:\\Unix\\Path\\Seperators");
-  EXPECT_TEMP_DIR(_wputenv_s(L"TMP", L"Local Path"), ".+\\Local Path$");
-  EXPECT_TEMP_DIR(_wputenv_s(L"TMP", L"F:\\TrailingSep\\"), "F:\\TrailingSep");
-  EXPECT_TEMP_DIR(
-      _wputenv_s(L"TMP", L"C:\\2\x03C0r-\x00B5\x00B3\\\x2135\x2080"),
-      "C:\\2\xCF\x80r-\xC2\xB5\xC2\xB3\\\xE2\x84\xB5\xE2\x82\x80");
-
-  // Test $TMP empty, $TEMP set.
-  EXPECT_TEMP_DIR(
-      {
-        _wputenv_s(L"TMP", L"");
-        _wputenv_s(L"TEMP", L"C:\\Valid\\Path");
-      },
-      "C:\\Valid\\Path");
-
-  // All related env vars empty
-  EXPECT_TEMP_DIR(
-  {
-    _wputenv_s(L"TMP", L"");
-    _wputenv_s(L"TEMP", L"");
-    _wputenv_s(L"USERPROFILE", L"");
-  },
-    "C:\\Temp");
-
-  // Test evn var / path with 260 chars.
-  SmallString<270> Expected{"C:\\Temp\\AB\\123456789"};
-  while (Expected.size() < 260)
-    Expected.append("\\DirNameWith19Charss");
-  ASSERT_EQ(260U, Expected.size());
-  EXPECT_TEMP_DIR(_putenv_s("TMP", Expected.c_str()), Expected.c_str());
-}
-#endif
-
-class FileSystemTest : public testing::Test {
-protected:
-  /// Unique temporary directory in which all created filesystem entities must
-  /// be placed. It is removed at the end of each test (must be empty).
-  SmallString<128> TestDirectory;
-  SmallString<128> NonExistantFile;
-
-  void SetUp() override {
-    ASSERT_NO_ERROR(
-        fs::createUniqueDirectory("file-system-test", TestDirectory));
-    // We don't care about this specific file.
-    errs() << "Test Directory: " << TestDirectory << '\n';
-    errs().flush();
-    NonExistantFile = TestDirectory;
-
-    // Even though this value is hardcoded, is a 128-bit GUID, so we should be
-    // guaranteed that this file will never exist.
-    sys::path::append(NonExistantFile, "1B28B495C16344CB9822E588CD4C3EF0");
-  }
-
-  void TearDown() override { ASSERT_NO_ERROR(fs::remove(TestDirectory.str())); }
-};
-
-TEST_F(FileSystemTest, Unique) {
-  // Create a temp file.
-  int FileDescriptor;
-  SmallString<64> TempPath;
-  ASSERT_NO_ERROR(
-      fs::createTemporaryFile("prefix", "temp", FileDescriptor, TempPath));
-
-  // The same file should return an identical unique id.
-  fs::UniqueID F1, F2;
-  ASSERT_NO_ERROR(fs::getUniqueID(Twine(TempPath), F1));
-  ASSERT_NO_ERROR(fs::getUniqueID(Twine(TempPath), F2));
-  ASSERT_EQ(F1, F2);
-
-  // Different files should return different unique ids.
-  int FileDescriptor2;
-  SmallString<64> TempPath2;
-  ASSERT_NO_ERROR(
-      fs::createTemporaryFile("prefix", "temp", FileDescriptor2, TempPath2));
-
-  fs::UniqueID D;
-  ASSERT_NO_ERROR(fs::getUniqueID(Twine(TempPath2), D));
-  ASSERT_NE(D, F1);
-  ::close(FileDescriptor2);
-
-  ASSERT_NO_ERROR(fs::remove(Twine(TempPath2)));
-
-  // Two paths representing the same file on disk should still provide the
-  // same unique id.  We can test this by making a hard link.
-  ASSERT_NO_ERROR(fs::create_link(Twine(TempPath), Twine(TempPath2)));
-  fs::UniqueID D2;
-  ASSERT_NO_ERROR(fs::getUniqueID(Twine(TempPath2), D2));
-  ASSERT_EQ(D2, F1);
-
-  ::close(FileDescriptor);
-
-  SmallString<128> Dir1;
-  ASSERT_NO_ERROR(
-     fs::createUniqueDirectory("dir1", Dir1));
-  ASSERT_NO_ERROR(fs::getUniqueID(Dir1.c_str(), F1));
-  ASSERT_NO_ERROR(fs::getUniqueID(Dir1.c_str(), F2));
-  ASSERT_EQ(F1, F2);
-
-  SmallString<128> Dir2;
-  ASSERT_NO_ERROR(
-     fs::createUniqueDirectory("dir2", Dir2));
-  ASSERT_NO_ERROR(fs::getUniqueID(Dir2.c_str(), F2));
-  ASSERT_NE(F1, F2);
-  ASSERT_NO_ERROR(fs::remove(Dir1));
-  ASSERT_NO_ERROR(fs::remove(Dir2));
-  ASSERT_NO_ERROR(fs::remove(TempPath2));
-  ASSERT_NO_ERROR(fs::remove(TempPath));
-}
-
-TEST_F(FileSystemTest, RealPath) {
-  ASSERT_NO_ERROR(
-      fs::create_directories(Twine(TestDirectory) + "/test1/test2/test3"));
-  ASSERT_TRUE(fs::exists(Twine(TestDirectory) + "/test1/test2/test3"));
-
-  SmallString<64> RealBase;
-  SmallString<64> Expected;
-  SmallString<64> Actual;
-
-  // TestDirectory itself might be under a symlink or have been specified with
-  // a different case than the existing temp directory.  In such cases real_path
-  // on the concatenated path will differ in the TestDirectory portion from
-  // how we specified it.  Make sure to compare against the real_path of the
-  // TestDirectory, and not just the value of TestDirectory.
-  ASSERT_NO_ERROR(fs::real_path(TestDirectory, RealBase));
-  path::native(Twine(RealBase) + "/test1/test2", Expected);
-
-  ASSERT_NO_ERROR(fs::real_path(
-      Twine(TestDirectory) + "/././test1/../test1/test2/./test3/..", Actual));
-
-  EXPECT_EQ(Expected, Actual);
-
-  SmallString<64> HomeDir;
-
-  // This can fail if $HOME is not set and getpwuid fails.
-  bool Result = llvm::sys::path::home_directory(HomeDir);
-  if (Result) {
-    ASSERT_NO_ERROR(fs::real_path(HomeDir, Expected));
-    ASSERT_NO_ERROR(fs::real_path("~", Actual, true));
-    EXPECT_EQ(Expected, Actual);
-    ASSERT_NO_ERROR(fs::real_path("~/", Actual, true));
-    EXPECT_EQ(Expected, Actual);
-  }
-
-  ASSERT_NO_ERROR(fs::remove_directories(Twine(TestDirectory) + "/test1"));
-}
-
-TEST_F(FileSystemTest, ExpandTilde) {
-  SmallString<64> Expected;
-  SmallString<64> Actual;
-  SmallString<64> HomeDir;
-
-  // This can fail if $HOME is not set and getpwuid fails.
-  bool Result = llvm::sys::path::home_directory(HomeDir);
-  if (Result) {
-    fs::expand_tilde(HomeDir, Expected);
-
-    fs::expand_tilde("~", Actual);
-    EXPECT_EQ(Expected, Actual);
-
-#ifdef _WIN32
-    Expected += "\\foo";
-    fs::expand_tilde("~\\foo", Actual);
-#else
-    Expected += "/foo";
-    fs::expand_tilde("~/foo", Actual);
-#endif
-
-    EXPECT_EQ(Expected, Actual);
-  }
-}
-
-#ifdef LLVM_ON_UNIX
-TEST_F(FileSystemTest, RealPathNoReadPerm) {
-  SmallString<64> Expanded;
-
-  ASSERT_NO_ERROR(
-    fs::create_directories(Twine(TestDirectory) + "/noreadperm"));
-  ASSERT_TRUE(fs::exists(Twine(TestDirectory) + "/noreadperm"));
-
-  fs::setPermissions(Twine(TestDirectory) + "/noreadperm", fs::no_perms);
-  fs::setPermissions(Twine(TestDirectory) + "/noreadperm", fs::all_exe);
-
-  ASSERT_NO_ERROR(fs::real_path(Twine(TestDirectory) + "/noreadperm", Expanded,
-                                false));
-
-  ASSERT_NO_ERROR(fs::remove_directories(Twine(TestDirectory) + "/noreadperm"));
-}
-#endif
-
-
-TEST_F(FileSystemTest, TempFileKeepDiscard) {
-  // We can keep then discard.
-  auto TempFileOrError = fs::TempFile::create(TestDirectory + "/test-%%%%");
-  ASSERT_TRUE((bool)TempFileOrError);
-  fs::TempFile File = std::move(*TempFileOrError);
-  ASSERT_EQ(-1, TempFileOrError->FD);
-  ASSERT_FALSE((bool)File.keep(TestDirectory + "/keep"));
-  ASSERT_FALSE((bool)File.discard());
-  ASSERT_TRUE(fs::exists(TestDirectory + "/keep"));
-  ASSERT_NO_ERROR(fs::remove(TestDirectory + "/keep"));
-}
-
-TEST_F(FileSystemTest, TempFileDiscardDiscard) {
-  // We can discard twice.
-  auto TempFileOrError = fs::TempFile::create(TestDirectory + "/test-%%%%");
-  ASSERT_TRUE((bool)TempFileOrError);
-  fs::TempFile File = std::move(*TempFileOrError);
-  ASSERT_EQ(-1, TempFileOrError->FD);
-  ASSERT_FALSE((bool)File.discard());
-  ASSERT_FALSE((bool)File.discard());
-  ASSERT_FALSE(fs::exists(TestDirectory + "/keep"));
-}
-
-TEST_F(FileSystemTest, TempFiles) {
-  // Create a temp file.
-  int FileDescriptor;
-  SmallString<64> TempPath;
-  ASSERT_NO_ERROR(
-      fs::createTemporaryFile("prefix", "temp", FileDescriptor, TempPath));
-
-  // Make sure it exists.
-  ASSERT_TRUE(sys::fs::exists(Twine(TempPath)));
-
-  // Create another temp tile.
-  int FD2;
-  SmallString<64> TempPath2;
-  ASSERT_NO_ERROR(fs::createTemporaryFile("prefix", "temp", FD2, TempPath2));
-  ASSERT_TRUE(TempPath2.endswith(".temp"));
-  ASSERT_NE(TempPath.str(), TempPath2.str());
-
-  fs::file_status A, B;
-  ASSERT_NO_ERROR(fs::status(Twine(TempPath), A));
-  ASSERT_NO_ERROR(fs::status(Twine(TempPath2), B));
-  EXPECT_FALSE(fs::equivalent(A, B));
-
-  ::close(FD2);
-
-  // Remove Temp2.
-  ASSERT_NO_ERROR(fs::remove(Twine(TempPath2)));
-  ASSERT_NO_ERROR(fs::remove(Twine(TempPath2)));
-  ASSERT_EQ(fs::remove(Twine(TempPath2), false),
-            errc::no_such_file_or_directory);
-
-  std::error_code EC = fs::status(TempPath2.c_str(), B);
-  EXPECT_EQ(EC, errc::no_such_file_or_directory);
-  EXPECT_EQ(B.type(), fs::file_type::file_not_found);
-
-  // Make sure Temp2 doesn't exist.
-  ASSERT_EQ(fs::access(Twine(TempPath2), sys::fs::AccessMode::Exist),
-            errc::no_such_file_or_directory);
-
-  SmallString<64> TempPath3;
-  ASSERT_NO_ERROR(fs::createTemporaryFile("prefix", "", TempPath3));
-  ASSERT_FALSE(TempPath3.endswith("."));
-  FileRemover Cleanup3(TempPath3);
-
-  // Create a hard link to Temp1.
-  ASSERT_NO_ERROR(fs::create_link(Twine(TempPath), Twine(TempPath2)));
-  bool equal;
-  ASSERT_NO_ERROR(fs::equivalent(Twine(TempPath), Twine(TempPath2), equal));
-  EXPECT_TRUE(equal);
-  ASSERT_NO_ERROR(fs::status(Twine(TempPath), A));
-  ASSERT_NO_ERROR(fs::status(Twine(TempPath2), B));
-  EXPECT_TRUE(fs::equivalent(A, B));
-
-  // Remove Temp1.
-  ::close(FileDescriptor);
-  ASSERT_NO_ERROR(fs::remove(Twine(TempPath)));
-
-  // Remove the hard link.
-  ASSERT_NO_ERROR(fs::remove(Twine(TempPath2)));
-
-  // Make sure Temp1 doesn't exist.
-  ASSERT_EQ(fs::access(Twine(TempPath), sys::fs::AccessMode::Exist),
-            errc::no_such_file_or_directory);
-
-#ifdef _WIN32
-  // Path name > 260 chars should get an error.
-  const char *Path270 =
-    "abcdefghijklmnopqrstuvwxyz9abcdefghijklmnopqrstuvwxyz8"
-    "abcdefghijklmnopqrstuvwxyz7abcdefghijklmnopqrstuvwxyz6"
-    "abcdefghijklmnopqrstuvwxyz5abcdefghijklmnopqrstuvwxyz4"
-    "abcdefghijklmnopqrstuvwxyz3abcdefghijklmnopqrstuvwxyz2"
-    "abcdefghijklmnopqrstuvwxyz1abcdefghijklmnopqrstuvwxyz0";
-  EXPECT_EQ(fs::createUniqueFile(Path270, FileDescriptor, TempPath),
-            errc::invalid_argument);
-  // Relative path < 247 chars, no problem.
-  const char *Path216 =
-    "abcdefghijklmnopqrstuvwxyz7abcdefghijklmnopqrstuvwxyz6"
-    "abcdefghijklmnopqrstuvwxyz5abcdefghijklmnopqrstuvwxyz4"
-    "abcdefghijklmnopqrstuvwxyz3abcdefghijklmnopqrstuvwxyz2"
-    "abcdefghijklmnopqrstuvwxyz1abcdefghijklmnopqrstuvwxyz0";
-  ASSERT_NO_ERROR(fs::createTemporaryFile(Path216, "", TempPath));
-  ASSERT_NO_ERROR(fs::remove(Twine(TempPath)));
-#endif
-}
-
-TEST_F(FileSystemTest, TempFileCollisions) {
-  SmallString<128> TestDirectory;
-  ASSERT_NO_ERROR(
-      fs::createUniqueDirectory("CreateUniqueFileTest", TestDirectory));
-  FileRemover Cleanup(TestDirectory);
-  SmallString<128> Model = TestDirectory;
-  path::append(Model, "%.tmp");
-  SmallString<128> Path;
-  std::vector<fs::TempFile> TempFiles;
-
-  auto TryCreateTempFile = [&]() {
-    Expected<fs::TempFile> T = fs::TempFile::create(Model);
-    if (T) {
-      TempFiles.push_back(std::move(*T));
-      return true;
-    } else {
-      logAllUnhandledErrors(T.takeError(), errs(),
-                            "Failed to create temporary file: ");
-      return false;
-    }
-  };
-
-  // Our single-character template allows for 16 unique names. Check that
-  // calling TryCreateTempFile repeatedly results in 16 successes.
-  // Because the test depends on random numbers, it could theoretically fail.
-  // However, the probability of this happening is tiny: with 32 calls, each
-  // of which will retry up to 128 times, to not get a given digit we would
-  // have to fail at least 15 + 17 * 128 = 2191 attempts. The probability of
-  // 2191 attempts not producing a given hexadecimal digit is
-  // (1 - 1/16) ** 2191 or 3.88e-62.
-  int Successes = 0;
-  for (int i = 0; i < 32; ++i)
-    if (TryCreateTempFile()) ++Successes;
-  EXPECT_EQ(Successes, 16);
-
-  for (fs::TempFile &T : TempFiles)
-    cantFail(T.discard());
-}
-
-TEST_F(FileSystemTest, CreateDir) {
-  ASSERT_NO_ERROR(fs::create_directory(Twine(TestDirectory) + "foo"));
-  ASSERT_NO_ERROR(fs::create_directory(Twine(TestDirectory) + "foo"));
-  ASSERT_EQ(fs::create_directory(Twine(TestDirectory) + "foo", false),
-            errc::file_exists);
-  ASSERT_NO_ERROR(fs::remove(Twine(TestDirectory) + "foo"));
-
-#ifdef LLVM_ON_UNIX
-  // Set a 0000 umask so that we can test our directory permissions.
-  mode_t OldUmask = ::umask(0000);
-
-  fs::file_status Status;
-  ASSERT_NO_ERROR(
-      fs::create_directory(Twine(TestDirectory) + "baz500", false,
-                           fs::perms::owner_read | fs::perms::owner_exe));
-  ASSERT_NO_ERROR(fs::status(Twine(TestDirectory) + "baz500", Status));
-  ASSERT_EQ(Status.permissions() & fs::perms::all_all,
-            fs::perms::owner_read | fs::perms::owner_exe);
-  ASSERT_NO_ERROR(fs::create_directory(Twine(TestDirectory) + "baz777", false,
-                                       fs::perms::all_all));
-  ASSERT_NO_ERROR(fs::status(Twine(TestDirectory) + "baz777", Status));
-  ASSERT_EQ(Status.permissions() & fs::perms::all_all, fs::perms::all_all);
-
-  // Restore umask to be safe.
-  ::umask(OldUmask);
-#endif
-
-#ifdef _WIN32
-  // Prove that create_directories() can handle a pathname > 248 characters,
-  // which is the documented limit for CreateDirectory().
-  // (248 is MAX_PATH subtracting room for an 8.3 filename.)
-  // Generate a directory path guaranteed to fall into that range.
-  size_t TmpLen = TestDirectory.size();
-  const char *OneDir = "\\123456789";
-  size_t OneDirLen = strlen(OneDir);
-  ASSERT_LT(OneDirLen, 12U);
-  size_t NLevels = ((248 - TmpLen) / OneDirLen) + 1;
-  SmallString<260> LongDir(TestDirectory);
-  for (size_t I = 0; I < NLevels; ++I)
-    LongDir.append(OneDir);
-  ASSERT_NO_ERROR(fs::create_directories(Twine(LongDir)));
-  ASSERT_NO_ERROR(fs::create_directories(Twine(LongDir)));
-  ASSERT_EQ(fs::create_directories(Twine(LongDir), false),
-            errc::file_exists);
-  // Tidy up, "recursively" removing the directories.
-  StringRef ThisDir(LongDir);
-  for (size_t J = 0; J < NLevels; ++J) {
-    ASSERT_NO_ERROR(fs::remove(ThisDir));
-    ThisDir = path::parent_path(ThisDir);
-  }
-
-  // Also verify that paths with Unix separators are handled correctly.
-  std::string LongPathWithUnixSeparators(TestDirectory.str());
-  // Add at least one subdirectory to TestDirectory, and replace slashes with
-  // backslashes
-  do {
-    LongPathWithUnixSeparators.append("/DirNameWith19Charss");
-  } while (LongPathWithUnixSeparators.size() < 260);
-  std::replace(LongPathWithUnixSeparators.begin(),
-               LongPathWithUnixSeparators.end(),
-               '\\', '/');
-  ASSERT_NO_ERROR(fs::create_directories(Twine(LongPathWithUnixSeparators)));
-  // cleanup
-  ASSERT_NO_ERROR(fs::remove_directories(Twine(TestDirectory) +
-                                         "/DirNameWith19Charss"));
-
-  // Similarly for a relative pathname.  Need to set the current directory to
-  // TestDirectory so that the one we create ends up in the right place.
-  char PreviousDir[260];
-  size_t PreviousDirLen = ::GetCurrentDirectoryA(260, PreviousDir);
-  ASSERT_GT(PreviousDirLen, 0U);
-  ASSERT_LT(PreviousDirLen, 260U);
-  ASSERT_NE(::SetCurrentDirectoryA(TestDirectory.c_str()), 0);
-  LongDir.clear();
-  // Generate a relative directory name with absolute length > 248.
-  size_t LongDirLen = 249 - TestDirectory.size();
-  LongDir.assign(LongDirLen, 'a');
-  ASSERT_NO_ERROR(fs::create_directory(Twine(LongDir)));
-  // While we're here, prove that .. and . handling works in these long paths.
-  const char *DotDotDirs = "\\..\\.\\b";
-  LongDir.append(DotDotDirs);
-  ASSERT_NO_ERROR(fs::create_directory("b"));
-  ASSERT_EQ(fs::create_directory(Twine(LongDir), false), errc::file_exists);
-  // And clean up.
-  ASSERT_NO_ERROR(fs::remove("b"));
-  ASSERT_NO_ERROR(fs::remove(
-    Twine(LongDir.substr(0, LongDir.size() - strlen(DotDotDirs)))));
-  ASSERT_NE(::SetCurrentDirectoryA(PreviousDir), 0);
-#endif
-}
-
-TEST_F(FileSystemTest, DirectoryIteration) {
-  std::error_code ec;
-  for (fs::directory_iterator i(".", ec), e; i != e; i.increment(ec))
-    ASSERT_NO_ERROR(ec);
-
-  // Create a known hierarchy to recurse over.
-  ASSERT_NO_ERROR(
-      fs::create_directories(Twine(TestDirectory) + "/recursive/a0/aa1"));
-  ASSERT_NO_ERROR(
-      fs::create_directories(Twine(TestDirectory) + "/recursive/a0/ab1"));
-  ASSERT_NO_ERROR(fs::create_directories(Twine(TestDirectory) +
-                                         "/recursive/dontlookhere/da1"));
-  ASSERT_NO_ERROR(
-      fs::create_directories(Twine(TestDirectory) + "/recursive/z0/za1"));
-  ASSERT_NO_ERROR(
-      fs::create_directories(Twine(TestDirectory) + "/recursive/pop/p1"));
-  typedef std::vector<std::string> v_t;
-  v_t visited;
-  for (fs::recursive_directory_iterator i(Twine(TestDirectory)
-         + "/recursive", ec), e; i != e; i.increment(ec)){
-    ASSERT_NO_ERROR(ec);
-    if (path::filename(i->path()) == "p1") {
-      i.pop();
-      // FIXME: recursive_directory_iterator should be more robust.
-      if (i == e) break;
-    }
-    if (path::filename(i->path()) == "dontlookhere")
-      i.no_push();
-    visited.push_back(std::string(path::filename(i->path())));
-  }
-  v_t::const_iterator a0 = find(visited, "a0");
-  v_t::const_iterator aa1 = find(visited, "aa1");
-  v_t::const_iterator ab1 = find(visited, "ab1");
-  v_t::const_iterator dontlookhere = find(visited, "dontlookhere");
-  v_t::const_iterator da1 = find(visited, "da1");
-  v_t::const_iterator z0 = find(visited, "z0");
-  v_t::const_iterator za1 = find(visited, "za1");
-  v_t::const_iterator pop = find(visited, "pop");
-  v_t::const_iterator p1 = find(visited, "p1");
-
-  // Make sure that each path was visited correctly.
-  ASSERT_NE(a0, visited.end());
-  ASSERT_NE(aa1, visited.end());
-  ASSERT_NE(ab1, visited.end());
-  ASSERT_NE(dontlookhere, visited.end());
-  ASSERT_EQ(da1, visited.end()); // Not visited.
-  ASSERT_NE(z0, visited.end());
-  ASSERT_NE(za1, visited.end());
-  ASSERT_NE(pop, visited.end());
-  ASSERT_EQ(p1, visited.end()); // Not visited.
-
-  // Make sure that parents were visited before children. No other ordering
-  // guarantees can be made across siblings.
-  ASSERT_LT(a0, aa1);
-  ASSERT_LT(a0, ab1);
-  ASSERT_LT(z0, za1);
-
-  ASSERT_NO_ERROR(fs::remove(Twine(TestDirectory) + "/recursive/a0/aa1"));
-  ASSERT_NO_ERROR(fs::remove(Twine(TestDirectory) + "/recursive/a0/ab1"));
-  ASSERT_NO_ERROR(fs::remove(Twine(TestDirectory) + "/recursive/a0"));
-  ASSERT_NO_ERROR(
-      fs::remove(Twine(TestDirectory) + "/recursive/dontlookhere/da1"));
-  ASSERT_NO_ERROR(fs::remove(Twine(TestDirectory) + "/recursive/dontlookhere"));
-  ASSERT_NO_ERROR(fs::remove(Twine(TestDirectory) + "/recursive/pop/p1"));
-  ASSERT_NO_ERROR(fs::remove(Twine(TestDirectory) + "/recursive/pop"));
-  ASSERT_NO_ERROR(fs::remove(Twine(TestDirectory) + "/recursive/z0/za1"));
-  ASSERT_NO_ERROR(fs::remove(Twine(TestDirectory) + "/recursive/z0"));
-  ASSERT_NO_ERROR(fs::remove(Twine(TestDirectory) + "/recursive"));
-
-  // Test recursive_directory_iterator level()
-  ASSERT_NO_ERROR(
-      fs::create_directories(Twine(TestDirectory) + "/reclevel/a/b/c"));
-  fs::recursive_directory_iterator I(Twine(TestDirectory) + "/reclevel", ec), E;
-  for (int l = 0; I != E; I.increment(ec), ++l) {
-    ASSERT_NO_ERROR(ec);
-    EXPECT_EQ(I.level(), l);
-  }
-  EXPECT_EQ(I, E);
-  ASSERT_NO_ERROR(fs::remove(Twine(TestDirectory) + "/reclevel/a/b/c"));
-  ASSERT_NO_ERROR(fs::remove(Twine(TestDirectory) + "/reclevel/a/b"));
-  ASSERT_NO_ERROR(fs::remove(Twine(TestDirectory) + "/reclevel/a"));
-  ASSERT_NO_ERROR(fs::remove(Twine(TestDirectory) + "/reclevel"));
-}
-
-TEST_F(FileSystemTest, DirectoryNotExecutable) {
-  ASSERT_EQ(fs::access(TestDirectory, sys::fs::AccessMode::Execute),
-            errc::permission_denied);
-}
-
-#ifdef LLVM_ON_UNIX
-TEST_F(FileSystemTest, BrokenSymlinkDirectoryIteration) {
-  // Create a known hierarchy to recurse over.
-  ASSERT_NO_ERROR(fs::create_directories(Twine(TestDirectory) + "/symlink"));
-  ASSERT_NO_ERROR(
-      fs::create_link("no_such_file", Twine(TestDirectory) + "/symlink/a"));
-  ASSERT_NO_ERROR(
-      fs::create_directories(Twine(TestDirectory) + "/symlink/b/bb"));
-  ASSERT_NO_ERROR(
-      fs::create_link("no_such_file", Twine(TestDirectory) + "/symlink/b/ba"));
-  ASSERT_NO_ERROR(
-      fs::create_link("no_such_file", Twine(TestDirectory) + "/symlink/b/bc"));
-  ASSERT_NO_ERROR(
-      fs::create_link("no_such_file", Twine(TestDirectory) + "/symlink/c"));
-  ASSERT_NO_ERROR(
-      fs::create_directories(Twine(TestDirectory) + "/symlink/d/dd/ddd"));
-  ASSERT_NO_ERROR(fs::create_link(Twine(TestDirectory) + "/symlink/d/dd",
-                                  Twine(TestDirectory) + "/symlink/d/da"));
-  ASSERT_NO_ERROR(
-      fs::create_link("no_such_file", Twine(TestDirectory) + "/symlink/e"));
-
-  typedef std::vector<std::string> v_t;
-  v_t VisitedNonBrokenSymlinks;
-  v_t VisitedBrokenSymlinks;
-  std::error_code ec;
-  using testing::UnorderedElementsAre;
-  using testing::UnorderedElementsAreArray;
-
-  // Broken symbol links are expected to throw an error.
-  for (fs::directory_iterator i(Twine(TestDirectory) + "/symlink", ec), e;
-       i != e; i.increment(ec)) {
-    ASSERT_NO_ERROR(ec);
-    if (i->status().getError() ==
-        std::make_error_code(std::errc::no_such_file_or_directory)) {
-      VisitedBrokenSymlinks.push_back(std::string(path::filename(i->path())));
-      continue;
-    }
-    VisitedNonBrokenSymlinks.push_back(std::string(path::filename(i->path())));
-  }
-  EXPECT_THAT(VisitedNonBrokenSymlinks, UnorderedElementsAre("b", "d"));
-  VisitedNonBrokenSymlinks.clear();
-
-  EXPECT_THAT(VisitedBrokenSymlinks, UnorderedElementsAre("a", "c", "e"));
-  VisitedBrokenSymlinks.clear();
-
-  // Broken symbol links are expected to throw an error.
-  for (fs::recursive_directory_iterator i(
-      Twine(TestDirectory) + "/symlink", ec), e; i != e; i.increment(ec)) {
-    ASSERT_NO_ERROR(ec);
-    if (i->status().getError() ==
-        std::make_error_code(std::errc::no_such_file_or_directory)) {
-      VisitedBrokenSymlinks.push_back(std::string(path::filename(i->path())));
-      continue;
-    }
-    VisitedNonBrokenSymlinks.push_back(std::string(path::filename(i->path())));
-  }
-  EXPECT_THAT(VisitedNonBrokenSymlinks,
-              UnorderedElementsAre("b", "bb", "d", "da", "dd", "ddd", "ddd"));
-  VisitedNonBrokenSymlinks.clear();
-
-  EXPECT_THAT(VisitedBrokenSymlinks,
-              UnorderedElementsAre("a", "ba", "bc", "c", "e"));
-  VisitedBrokenSymlinks.clear();
-
-  for (fs::recursive_directory_iterator i(
-      Twine(TestDirectory) + "/symlink", ec, /*follow_symlinks=*/false), e;
-       i != e; i.increment(ec)) {
-    ASSERT_NO_ERROR(ec);
-    if (i->status().getError() ==
-        std::make_error_code(std::errc::no_such_file_or_directory)) {
-      VisitedBrokenSymlinks.push_back(std::string(path::filename(i->path())));
-      continue;
-    }
-    VisitedNonBrokenSymlinks.push_back(std::string(path::filename(i->path())));
-  }
-  EXPECT_THAT(VisitedNonBrokenSymlinks,
-              UnorderedElementsAreArray({"a", "b", "ba", "bb", "bc", "c", "d",
-                                         "da", "dd", "ddd", "e"}));
-  VisitedNonBrokenSymlinks.clear();
-
-  EXPECT_THAT(VisitedBrokenSymlinks, UnorderedElementsAre());
-  VisitedBrokenSymlinks.clear();
-
-  ASSERT_NO_ERROR(fs::remove_directories(Twine(TestDirectory) + "/symlink"));
-}
-#endif
-
-#ifdef _WIN32
-TEST_F(FileSystemTest, UTF8ToUTF16DirectoryIteration) {
-  // The Windows filesystem support uses UTF-16 and converts paths from the
-  // input UTF-8. The UTF-16 equivalent of the input path can be shorter in
-  // length.
-
-  // This test relies on TestDirectory not being so long such that MAX_PATH
-  // would be exceeded (see widenPath). If that were the case, the UTF-16
-  // path is likely to be longer than the input.
-  const char *Pi = "\xcf\x80"; // UTF-8 lower case pi.
-  std::string RootDir = (TestDirectory + "/" + Pi).str();
-
-  // Create test directories.
-  ASSERT_NO_ERROR(fs::create_directories(Twine(RootDir) + "/a"));
-  ASSERT_NO_ERROR(fs::create_directories(Twine(RootDir) + "/b"));
-
-  std::error_code EC;
-  unsigned Count = 0;
-  for (fs::directory_iterator I(Twine(RootDir), EC), E; I != E;
-       I.increment(EC)) {
-    ASSERT_NO_ERROR(EC);
-    StringRef DirName = path::filename(I->path());
-    EXPECT_TRUE(DirName == "a" || DirName == "b");
-    ++Count;
-  }
-  EXPECT_EQ(Count, 2U);
-
-  ASSERT_NO_ERROR(fs::remove(Twine(RootDir) + "/a"));
-  ASSERT_NO_ERROR(fs::remove(Twine(RootDir) + "/b"));
-  ASSERT_NO_ERROR(fs::remove(Twine(RootDir)));
-}
-#endif
-
-TEST_F(FileSystemTest, Remove) {
-  SmallString<64> BaseDir;
-  SmallString<64> Paths[4];
-  int fds[4];
-  ASSERT_NO_ERROR(fs::createUniqueDirectory("fs_remove", BaseDir));
-
-  ASSERT_NO_ERROR(fs::create_directories(Twine(BaseDir) + "/foo/bar/baz"));
-  ASSERT_NO_ERROR(fs::create_directories(Twine(BaseDir) + "/foo/bar/buzz"));
-  ASSERT_NO_ERROR(fs::createUniqueFile(
-      Twine(BaseDir) + "/foo/bar/baz/%%%%%%.tmp", fds[0], Paths[0]));
-  ASSERT_NO_ERROR(fs::createUniqueFile(
-      Twine(BaseDir) + "/foo/bar/baz/%%%%%%.tmp", fds[1], Paths[1]));
-  ASSERT_NO_ERROR(fs::createUniqueFile(
-      Twine(BaseDir) + "/foo/bar/buzz/%%%%%%.tmp", fds[2], Paths[2]));
-  ASSERT_NO_ERROR(fs::createUniqueFile(
-      Twine(BaseDir) + "/foo/bar/buzz/%%%%%%.tmp", fds[3], Paths[3]));
-
-  for (int fd : fds)
-    ::close(fd);
-
-  EXPECT_TRUE(fs::exists(Twine(BaseDir) + "/foo/bar/baz"));
-  EXPECT_TRUE(fs::exists(Twine(BaseDir) + "/foo/bar/buzz"));
-  EXPECT_TRUE(fs::exists(Paths[0]));
-  EXPECT_TRUE(fs::exists(Paths[1]));
-  EXPECT_TRUE(fs::exists(Paths[2]));
-  EXPECT_TRUE(fs::exists(Paths[3]));
-
-  ASSERT_NO_ERROR(fs::remove_directories("D:/footest"));
-
-  ASSERT_NO_ERROR(fs::remove_directories(BaseDir));
-  ASSERT_FALSE(fs::exists(BaseDir));
-}
-
-#ifdef _WIN32
-TEST_F(FileSystemTest, CarriageReturn) {
-  SmallString<128> FilePathname(TestDirectory);
-  std::error_code EC;
-  path::append(FilePathname, "test");
-
-  {
-    raw_fd_ostream File(FilePathname, EC, sys::fs::OF_TextWithCRLF);
-    ASSERT_NO_ERROR(EC);
-    File << '\n';
-  }
-  {
-    auto Buf = MemoryBuffer::getFile(FilePathname.str());
-    EXPECT_TRUE((bool)Buf);
-    EXPECT_EQ(Buf.get()->getBuffer(), "\r\n");
-  }
-
-  {
-    raw_fd_ostream File(FilePathname, EC, sys::fs::OF_None);
-    ASSERT_NO_ERROR(EC);
-    File << '\n';
-  }
-  {
-    auto Buf = MemoryBuffer::getFile(FilePathname.str());
-    EXPECT_TRUE((bool)Buf);
-    EXPECT_EQ(Buf.get()->getBuffer(), "\n");
-  }
-  ASSERT_NO_ERROR(fs::remove(Twine(FilePathname)));
-}
-#endif
-
-TEST_F(FileSystemTest, Resize) {
-  int FD;
-  SmallString<64> TempPath;
-  ASSERT_NO_ERROR(fs::createTemporaryFile("prefix", "temp", FD, TempPath));
-  ASSERT_NO_ERROR(fs::resize_file(FD, 123));
-  fs::file_status Status;
-  ASSERT_NO_ERROR(fs::status(FD, Status));
-  ASSERT_EQ(Status.getSize(), 123U);
-  ::close(FD);
-  ASSERT_NO_ERROR(fs::remove(TempPath));
-}
-
-TEST_F(FileSystemTest, ResizeBeforeMapping) {
-  // Create a temp file.
-  int FD;
-  SmallString<64> TempPath;
-  ASSERT_NO_ERROR(fs::createTemporaryFile("prefix", "temp", FD, TempPath));
-  ASSERT_NO_ERROR(fs::resize_file_before_mapping_readwrite(FD, 123));
-
-  // Map in temp file. On Windows, fs::resize_file_before_mapping_readwrite is
-  // a no-op and the mapping itself will resize the file.
-  std::error_code EC;
-  {
-    fs::mapped_file_region mfr(fs::convertFDToNativeFile(FD),
-                               fs::mapped_file_region::readwrite, 123, 0, EC);
-    ASSERT_NO_ERROR(EC);
-    // Unmap temp file
-  }
-
-  // Check the size.
-  fs::file_status Status;
-  ASSERT_NO_ERROR(fs::status(FD, Status));
-  ASSERT_EQ(Status.getSize(), 123U);
-  ::close(FD);
-  ASSERT_NO_ERROR(fs::remove(TempPath));
-}
-
-TEST_F(FileSystemTest, MD5) {
-  int FD;
-  SmallString<64> TempPath;
-  ASSERT_NO_ERROR(fs::createTemporaryFile("prefix", "temp", FD, TempPath));
-  StringRef Data("abcdefghijklmnopqrstuvwxyz");
-  ASSERT_EQ(write(FD, Data.data(), Data.size()), static_cast<ssize_t>(Data.size()));
-  lseek(FD, 0, SEEK_SET);
-  auto Hash = fs::md5_contents(FD);
-  ::close(FD);
-  ASSERT_NO_ERROR(Hash.getError());
-
-  EXPECT_STREQ("c3fcd3d76192e4007dfb496cca67e13b", Hash->digest().c_str());
-}
-
-TEST_F(FileSystemTest, FileMapping) {
-  // Create a temp file.
-  int FileDescriptor;
-  SmallString<64> TempPath;
-  ASSERT_NO_ERROR(
-      fs::createTemporaryFile("prefix", "temp", FileDescriptor, TempPath));
-  unsigned Size = 4096;
-  ASSERT_NO_ERROR(
-      fs::resize_file_before_mapping_readwrite(FileDescriptor, Size));
-
-  // Map in temp file and add some content
-  std::error_code EC;
-  StringRef Val("hello there");
-  fs::mapped_file_region MaybeMFR;
-  EXPECT_FALSE(MaybeMFR);
-  {
-    fs::mapped_file_region mfr(fs::convertFDToNativeFile(FileDescriptor),
-                               fs::mapped_file_region::readwrite, Size, 0, EC);
-    ASSERT_NO_ERROR(EC);
-    std::copy(Val.begin(), Val.end(), mfr.data());
-    // Explicitly add a 0.
-    mfr.data()[Val.size()] = 0;
-
-    // Move it out of the scope and confirm mfr is reset.
-    MaybeMFR = std::move(mfr);
-    EXPECT_FALSE(mfr);
-#if !defined(NDEBUG) && GTEST_HAS_DEATH_TEST
-    EXPECT_DEATH(mfr.data(), "Mapping failed but used anyway!");
-    EXPECT_DEATH(mfr.size(), "Mapping failed but used anyway!");
-#endif
-  }
-
-  // Check that the moved-to region is still valid.
-  EXPECT_EQ(Val, StringRef(MaybeMFR.data()));
-  EXPECT_EQ(Size, MaybeMFR.size());
-
-  // Unmap temp file.
-  MaybeMFR.unmap();
-
-  ASSERT_EQ(close(FileDescriptor), 0);
-
-  // Map it back in read-only
-  {
-    int FD;
-    EC = fs::openFileForRead(Twine(TempPath), FD);
-    ASSERT_NO_ERROR(EC);
-    fs::mapped_file_region mfr(fs::convertFDToNativeFile(FD),
-                               fs::mapped_file_region::readonly, Size, 0, EC);
-    ASSERT_NO_ERROR(EC);
-
-    // Verify content
-    EXPECT_EQ(StringRef(mfr.const_data()), Val);
-
-    // Unmap temp file
-    fs::mapped_file_region m(fs::convertFDToNativeFile(FD),
-                             fs::mapped_file_region::readonly, Size, 0, EC);
-    ASSERT_NO_ERROR(EC);
-    ASSERT_EQ(close(FD), 0);
-  }
-  ASSERT_NO_ERROR(fs::remove(TempPath));
-}
-
-TEST(Support, NormalizePath) {
-  //                           Input,        Expected Win, Expected Posix
-  using TestTuple = std::tuple<const char *, const char *, const char *>;
-  std::vector<TestTuple> Tests;
-  Tests.emplace_back("a", "a", "a");
-  Tests.emplace_back("a/b", "a\\b", "a/b");
-  Tests.emplace_back("a\\b", "a\\b", "a/b");
-  Tests.emplace_back("a\\\\b", "a\\\\b", "a//b");
-  Tests.emplace_back("\\a", "\\a", "/a");
-  Tests.emplace_back("a\\", "a\\", "a/");
-  Tests.emplace_back("a\\t", "a\\t", "a/t");
-
-  for (auto &T : Tests) {
-    SmallString<64> Win(std::get<0>(T));
-    SmallString<64> Posix(Win);
-    path::native(Win, path::Style::windows);
-    path::native(Posix, path::Style::posix);
-    EXPECT_EQ(std::get<1>(T), Win);
-    EXPECT_EQ(std::get<2>(T), Posix);
-  }
-
-#if defined(_WIN32)
-  SmallString<64> PathHome;
-  path::home_directory(PathHome);
-
-  const char *Path7a = "~/aaa";
-  SmallString<64> Path7(Path7a);
-  path::native(Path7);
-  EXPECT_TRUE(Path7.endswith("\\aaa"));
-  EXPECT_TRUE(Path7.startswith(PathHome));
-  EXPECT_EQ(Path7.size(), PathHome.size() + strlen(Path7a + 1));
-
-  const char *Path8a = "~";
-  SmallString<64> Path8(Path8a);
-  path::native(Path8);
-  EXPECT_EQ(Path8, PathHome);
-
-  const char *Path9a = "~aaa";
-  SmallString<64> Path9(Path9a);
-  path::native(Path9);
-  EXPECT_EQ(Path9, "~aaa");
-
-  const char *Path10a = "aaa/~/b";
-  SmallString<64> Path10(Path10a);
-  path::native(Path10);
-  EXPECT_EQ(Path10, "aaa\\~\\b");
-#endif
-}
-
-TEST(Support, RemoveLeadingDotSlash) {
-  StringRef Path1("././/foolz/wat");
-  StringRef Path2("./////");
-
-  Path1 = path::remove_leading_dotslash(Path1);
-  EXPECT_EQ(Path1, "foolz/wat");
-  Path2 = path::remove_leading_dotslash(Path2);
-  EXPECT_EQ(Path2, "");
-}
-
-static std::string remove_dots(StringRef path, bool remove_dot_dot,
-                               path::Style style) {
-  SmallString<256> buffer(path);
-  path::remove_dots(buffer, remove_dot_dot, style);
-  return std::string(buffer.str());
-}
-
-TEST(Support, RemoveDots) {
-  EXPECT_EQ("foolz\\wat",
-            remove_dots(".\\.\\\\foolz\\wat", false, path::Style::windows));
-  EXPECT_EQ("", remove_dots(".\\\\\\\\\\", false, path::Style::windows));
-
-  EXPECT_EQ("a\\..\\b\\c",
-            remove_dots(".\\a\\..\\b\\c", false, path::Style::windows));
-  EXPECT_EQ("b\\c", remove_dots(".\\a\\..\\b\\c", true, path::Style::windows));
-  EXPECT_EQ("c", remove_dots(".\\.\\c", true, path::Style::windows));
-  EXPECT_EQ("..\\a\\c",
-            remove_dots("..\\a\\b\\..\\c", true, path::Style::windows));
-  EXPECT_EQ("..\\..\\a\\c",
-            remove_dots("..\\..\\a\\b\\..\\c", true, path::Style::windows));
-  EXPECT_EQ("C:\\a\\c", remove_dots("C:\\foo\\bar//..\\..\\a\\c", true,
-                                    path::Style::windows));
-
-  // FIXME: These leading forward slashes are emergent behavior. VFS depends on
-  // this behavior now.
-  EXPECT_EQ("C:/bar",
-            remove_dots("C:/foo/../bar", true, path::Style::windows));
-  EXPECT_EQ("C:/foo\\bar",
-            remove_dots("C:/foo/bar", true, path::Style::windows));
-  EXPECT_EQ("C:/foo\\bar",
-            remove_dots("C:/foo\\bar", true, path::Style::windows));
-  EXPECT_EQ("/", remove_dots("/", true, path::Style::windows));
-  EXPECT_EQ("C:/", remove_dots("C:/", true, path::Style::windows));
-
-  // Some clients of remove_dots expect it to remove trailing slashes. Again,
-  // this is emergent behavior that VFS relies on, and not inherently part of
-  // the specification.
-  EXPECT_EQ("C:\\foo\\bar",
-            remove_dots("C:\\foo\\bar\\", true, path::Style::windows));
-  EXPECT_EQ("/foo/bar",
-            remove_dots("/foo/bar/", true, path::Style::posix));
-
-  // A double separator is rewritten.
-  EXPECT_EQ("C:/foo\\bar", remove_dots("C:/foo//bar", true, path::Style::windows));
-
-  SmallString<64> Path1(".\\.\\c");
-  EXPECT_TRUE(path::remove_dots(Path1, true, path::Style::windows));
-  EXPECT_EQ("c", Path1);
-
-  EXPECT_EQ("foolz/wat",
-            remove_dots("././/foolz/wat", false, path::Style::posix));
-  EXPECT_EQ("", remove_dots("./////", false, path::Style::posix));
-
-  EXPECT_EQ("a/../b/c", remove_dots("./a/../b/c", false, path::Style::posix));
-  EXPECT_EQ("b/c", remove_dots("./a/../b/c", true, path::Style::posix));
-  EXPECT_EQ("c", remove_dots("././c", true, path::Style::posix));
-  EXPECT_EQ("../a/c", remove_dots("../a/b/../c", true, path::Style::posix));
-  EXPECT_EQ("../../a/c",
-            remove_dots("../../a/b/../c", true, path::Style::posix));
-  EXPECT_EQ("/a/c", remove_dots("/../../a/c", true, path::Style::posix));
-  EXPECT_EQ("/a/c",
-            remove_dots("/../a/b//../././/c", true, path::Style::posix));
-  EXPECT_EQ("/", remove_dots("/", true, path::Style::posix));
-
-  // FIXME: Leaving behind this double leading slash seems like a bug.
-  EXPECT_EQ("//foo/bar",
-            remove_dots("//foo/bar/", true, path::Style::posix));
-
-  SmallString<64> Path2("././c");
-  EXPECT_TRUE(path::remove_dots(Path2, true, path::Style::posix));
-  EXPECT_EQ("c", Path2);
-}
-
-TEST(Support, ReplacePathPrefix) {
-  SmallString<64> Path1("/foo");
-  SmallString<64> Path2("/old/foo");
-  SmallString<64> Path3("/oldnew/foo");
-  SmallString<64> Path4("C:\\old/foo\\bar");
-  SmallString<64> OldPrefix("/old");
-  SmallString<64> OldPrefixSep("/old/");
-  SmallString<64> OldPrefixWin("c:/oLD/F");
-  SmallString<64> NewPrefix("/new");
-  SmallString<64> NewPrefix2("/longernew");
-  SmallString<64> EmptyPrefix("");
-  bool Found;
-
-  SmallString<64> Path = Path1;
-  Found = path::replace_path_prefix(Path, OldPrefix, NewPrefix);
-  EXPECT_FALSE(Found);
-  EXPECT_EQ(Path, "/foo");
-  Path = Path2;
-  Found = path::replace_path_prefix(Path, OldPrefix, NewPrefix);
-  EXPECT_TRUE(Found);
-  EXPECT_EQ(Path, "/new/foo");
-  Path = Path2;
-  Found = path::replace_path_prefix(Path, OldPrefix, NewPrefix2);
-  EXPECT_TRUE(Found);
-  EXPECT_EQ(Path, "/longernew/foo");
-  Path = Path1;
-  Found = path::replace_path_prefix(Path, EmptyPrefix, NewPrefix);
-  EXPECT_TRUE(Found);
-  EXPECT_EQ(Path, "/new/foo");
-  Path = Path2;
-  Found = path::replace_path_prefix(Path, OldPrefix, EmptyPrefix);
-  EXPECT_TRUE(Found);
-  EXPECT_EQ(Path, "/foo");
-  Path = Path2;
-  Found = path::replace_path_prefix(Path, OldPrefixSep, EmptyPrefix);
-  EXPECT_TRUE(Found);
-  EXPECT_EQ(Path, "foo");
-  Path = Path3;
-  Found = path::replace_path_prefix(Path, OldPrefix, NewPrefix);
-  EXPECT_TRUE(Found);
-  EXPECT_EQ(Path, "/newnew/foo");
-  Path = Path3;
-  Found = path::replace_path_prefix(Path, OldPrefix, NewPrefix2);
-  EXPECT_TRUE(Found);
-  EXPECT_EQ(Path, "/longernewnew/foo");
-  Path = Path1;
-  Found = path::replace_path_prefix(Path, EmptyPrefix, NewPrefix);
-  EXPECT_TRUE(Found);
-  EXPECT_EQ(Path, "/new/foo");
-  Path = OldPrefix;
-  Found = path::replace_path_prefix(Path, OldPrefix, NewPrefix);
-  EXPECT_TRUE(Found);
-  EXPECT_EQ(Path, "/new");
-  Path = OldPrefixSep;
-  Found = path::replace_path_prefix(Path, OldPrefix, NewPrefix);
-  EXPECT_TRUE(Found);
-  EXPECT_EQ(Path, "/new/");
-  Path = OldPrefix;
-  Found = path::replace_path_prefix(Path, OldPrefixSep, NewPrefix);
-  EXPECT_FALSE(Found);
-  EXPECT_EQ(Path, "/old");
-  Path = Path4;
-  Found = path::replace_path_prefix(Path, OldPrefixWin, NewPrefix,
-                                    path::Style::windows);
-  EXPECT_TRUE(Found);
-  EXPECT_EQ(Path, "/newoo\\bar");
-  Path = Path4;
-  Found = path::replace_path_prefix(Path, OldPrefixWin, NewPrefix,
-                                    path::Style::posix);
-  EXPECT_FALSE(Found);
-  EXPECT_EQ(Path, "C:\\old/foo\\bar");
-}
-
-TEST_F(FileSystemTest, OpenFileForRead) {
-  // Create a temp file.
-  int FileDescriptor;
-  SmallString<64> TempPath;
-  ASSERT_NO_ERROR(
-      fs::createTemporaryFile("prefix", "temp", FileDescriptor, TempPath));
-  FileRemover Cleanup(TempPath);
-
-  // Make sure it exists.
-  ASSERT_TRUE(sys::fs::exists(Twine(TempPath)));
-
-  // Open the file for read
-  int FileDescriptor2;
-  SmallString<64> ResultPath;
-  ASSERT_NO_ERROR(fs::openFileForRead(Twine(TempPath), FileDescriptor2,
-                                      fs::OF_None, &ResultPath))
-
-  // If we succeeded, check that the paths are the same (modulo case):
-  if (!ResultPath.empty()) {
-    // The paths returned by createTemporaryFile and getPathFromOpenFD
-    // should reference the same file on disk.
-    fs::UniqueID D1, D2;
-    ASSERT_NO_ERROR(fs::getUniqueID(Twine(TempPath), D1));
-    ASSERT_NO_ERROR(fs::getUniqueID(Twine(ResultPath), D2));
-    ASSERT_EQ(D1, D2);
-  }
-  ::close(FileDescriptor);
-  ::close(FileDescriptor2);
-
-#ifdef _WIN32
-  // Since Windows Vista, file access time is not updated by default.
-  // This is instead updated manually by openFileForRead.
-  // https://blogs.technet.microsoft.com/filecab/2006/11/07/disabling-last-access-time-in-windows-vista-to-improve-ntfs-performance/
-  // This part of the unit test is Windows specific as the updating of
-  // access times can be disabled on Linux using /etc/fstab.
-
-  // Set access time to UNIX epoch.
-  ASSERT_NO_ERROR(sys::fs::openFileForWrite(Twine(TempPath), FileDescriptor,
-                                            fs::CD_OpenExisting));
-  TimePoint<> Epoch(std::chrono::milliseconds(0));
-  ASSERT_NO_ERROR(fs::setLastAccessAndModificationTime(FileDescriptor, Epoch));
-  ::close(FileDescriptor);
-
-  // Open the file and ensure access time is updated, when forced.
-  ASSERT_NO_ERROR(fs::openFileForRead(Twine(TempPath), FileDescriptor,
-                                      fs::OF_UpdateAtime, &ResultPath));
-
-  sys::fs::file_status Status;
-  ASSERT_NO_ERROR(sys::fs::status(FileDescriptor, Status));
-  auto FileAccessTime = Status.getLastAccessedTime();
-
-  ASSERT_NE(Epoch, FileAccessTime);
-  ::close(FileDescriptor);
-
-  // Ideally this test would include a case when ATime is not forced to update,
-  // however the expected behaviour will differ depending on the configuration
-  // of the Windows file system.
-#endif
-}
-
-static void createFileWithData(const Twine &Path, bool ShouldExistBefore,
-                               fs::CreationDisposition Disp, StringRef Data) {
-  int FD;
-  ASSERT_EQ(ShouldExistBefore, fs::exists(Path));
-  ASSERT_NO_ERROR(fs::openFileForWrite(Path, FD, Disp));
-  FileDescriptorCloser Closer(FD);
-  ASSERT_TRUE(fs::exists(Path));
-
-  ASSERT_EQ(Data.size(), (size_t)write(FD, Data.data(), Data.size()));
-}
-
-static void verifyFileContents(const Twine &Path, StringRef Contents) {
-  auto Buffer = MemoryBuffer::getFile(Path);
-  ASSERT_TRUE((bool)Buffer);
-  StringRef Data = Buffer.get()->getBuffer();
-  ASSERT_EQ(Data, Contents);
-}
-
-TEST_F(FileSystemTest, CreateNew) {
-  int FD;
-  Optional<FileDescriptorCloser> Closer;
-
-  // Succeeds if the file does not exist.
-  ASSERT_FALSE(fs::exists(NonExistantFile));
-  ASSERT_NO_ERROR(fs::openFileForWrite(NonExistantFile, FD, fs::CD_CreateNew));
-  ASSERT_TRUE(fs::exists(NonExistantFile));
-
-  FileRemover Cleanup(NonExistantFile);
-  Closer.emplace(FD);
-
-  // And creates a file of size 0.
-  sys::fs::file_status Status;
-  ASSERT_NO_ERROR(sys::fs::status(FD, Status));
-  EXPECT_EQ(0ULL, Status.getSize());
-
-  // Close this first, before trying to re-open the file.
-  Closer.reset();
-
-  // But fails if the file does exist.
-  ASSERT_ERROR(fs::openFileForWrite(NonExistantFile, FD, fs::CD_CreateNew));
-}
-
-TEST_F(FileSystemTest, CreateAlways) {
-  int FD;
-  Optional<FileDescriptorCloser> Closer;
-
-  // Succeeds if the file does not exist.
-  ASSERT_FALSE(fs::exists(NonExistantFile));
-  ASSERT_NO_ERROR(
-      fs::openFileForWrite(NonExistantFile, FD, fs::CD_CreateAlways));
-
-  Closer.emplace(FD);
-
-  ASSERT_TRUE(fs::exists(NonExistantFile));
-
-  FileRemover Cleanup(NonExistantFile);
-
-  // And creates a file of size 0.
-  uint64_t FileSize;
-  ASSERT_NO_ERROR(sys::fs::file_size(NonExistantFile, FileSize));
-  ASSERT_EQ(0ULL, FileSize);
-
-  // If we write some data to it re-create it with CreateAlways, it succeeds and
-  // truncates to 0 bytes.
-  ASSERT_EQ(4, write(FD, "Test", 4));
-
-  Closer.reset();
-
-  ASSERT_NO_ERROR(sys::fs::file_size(NonExistantFile, FileSize));
-  ASSERT_EQ(4ULL, FileSize);
-
-  ASSERT_NO_ERROR(
-      fs::openFileForWrite(NonExistantFile, FD, fs::CD_CreateAlways));
-  Closer.emplace(FD);
-  ASSERT_NO_ERROR(sys::fs::file_size(NonExistantFile, FileSize));
-  ASSERT_EQ(0ULL, FileSize);
-}
-
-TEST_F(FileSystemTest, OpenExisting) {
-  int FD;
-
-  // Fails if the file does not exist.
-  ASSERT_FALSE(fs::exists(NonExistantFile));
-  ASSERT_ERROR(fs::openFileForWrite(NonExistantFile, FD, fs::CD_OpenExisting));
-  ASSERT_FALSE(fs::exists(NonExistantFile));
-
-  // Make a dummy file now so that we can try again when the file does exist.
-  createFileWithData(NonExistantFile, false, fs::CD_CreateNew, "Fizz");
-  FileRemover Cleanup(NonExistantFile);
-  uint64_t FileSize;
-  ASSERT_NO_ERROR(sys::fs::file_size(NonExistantFile, FileSize));
-  ASSERT_EQ(4ULL, FileSize);
-
-  // If we re-create it with different data, it overwrites rather than
-  // appending.
-  createFileWithData(NonExistantFile, true, fs::CD_OpenExisting, "Buzz");
-  verifyFileContents(NonExistantFile, "Buzz");
-}
-
-TEST_F(FileSystemTest, OpenAlways) {
-  // Succeeds if the file does not exist.
-  createFileWithData(NonExistantFile, false, fs::CD_OpenAlways, "Fizz");
-  FileRemover Cleanup(NonExistantFile);
-  uint64_t FileSize;
-  ASSERT_NO_ERROR(sys::fs::file_size(NonExistantFile, FileSize));
-  ASSERT_EQ(4ULL, FileSize);
-
-  // Now re-open it and write again, verifying the contents get over-written.
-  createFileWithData(NonExistantFile, true, fs::CD_OpenAlways, "Bu");
-  verifyFileContents(NonExistantFile, "Buzz");
-}
-
-TEST_F(FileSystemTest, AppendSetsCorrectFileOffset) {
-  fs::CreationDisposition Disps[] = {fs::CD_CreateAlways, fs::CD_OpenAlways,
-                                     fs::CD_OpenExisting};
-
-  // Write some data and re-open it with every possible disposition (this is a
-  // hack that shouldn't work, but is left for compatibility.  OF_Append
-  // overrides
-  // the specified disposition.
-  for (fs::CreationDisposition Disp : Disps) {
-    int FD;
-    Optional<FileDescriptorCloser> Closer;
-
-    createFileWithData(NonExistantFile, false, fs::CD_CreateNew, "Fizz");
-
-    FileRemover Cleanup(NonExistantFile);
-
-    uint64_t FileSize;
-    ASSERT_NO_ERROR(sys::fs::file_size(NonExistantFile, FileSize));
-    ASSERT_EQ(4ULL, FileSize);
-    ASSERT_NO_ERROR(
-        fs::openFileForWrite(NonExistantFile, FD, Disp, fs::OF_Append));
-    Closer.emplace(FD);
-    ASSERT_NO_ERROR(sys::fs::file_size(NonExistantFile, FileSize));
-    ASSERT_EQ(4ULL, FileSize);
-
-    ASSERT_EQ(4, write(FD, "Buzz", 4));
-    Closer.reset();
-
-    verifyFileContents(NonExistantFile, "FizzBuzz");
-  }
-}
-
-static void verifyRead(int FD, StringRef Data, bool ShouldSucceed) {
-  std::vector<char> Buffer;
-  Buffer.resize(Data.size());
-  int Result = ::read(FD, Buffer.data(), Buffer.size());
-  if (ShouldSucceed) {
-    ASSERT_EQ((size_t)Result, Data.size());
-    ASSERT_EQ(Data, StringRef(Buffer.data(), Buffer.size()));
-  } else {
-    ASSERT_EQ(-1, Result);
-    ASSERT_EQ(EBADF, errno);
-  }
-}
-
-static void verifyWrite(int FD, StringRef Data, bool ShouldSucceed) {
-  int Result = ::write(FD, Data.data(), Data.size());
-  if (ShouldSucceed)
-    ASSERT_EQ((size_t)Result, Data.size());
-  else {
-    ASSERT_EQ(-1, Result);
-    ASSERT_EQ(EBADF, errno);
-  }
-}
-
-TEST_F(FileSystemTest, ReadOnlyFileCantWrite) {
-  createFileWithData(NonExistantFile, false, fs::CD_CreateNew, "Fizz");
-  FileRemover Cleanup(NonExistantFile);
-
-  int FD;
-  ASSERT_NO_ERROR(fs::openFileForRead(NonExistantFile, FD));
-  FileDescriptorCloser Closer(FD);
-
-  verifyWrite(FD, "Buzz", false);
-  verifyRead(FD, "Fizz", true);
-}
-
-TEST_F(FileSystemTest, WriteOnlyFileCantRead) {
-  createFileWithData(NonExistantFile, false, fs::CD_CreateNew, "Fizz");
-  FileRemover Cleanup(NonExistantFile);
-
-  int FD;
-  ASSERT_NO_ERROR(
-      fs::openFileForWrite(NonExistantFile, FD, fs::CD_OpenExisting));
-  FileDescriptorCloser Closer(FD);
-  verifyRead(FD, "Fizz", false);
-  verifyWrite(FD, "Buzz", true);
-}
-
-TEST_F(FileSystemTest, ReadWriteFileCanReadOrWrite) {
-  createFileWithData(NonExistantFile, false, fs::CD_CreateNew, "Fizz");
-  FileRemover Cleanup(NonExistantFile);
-
-  int FD;
-  ASSERT_NO_ERROR(fs::openFileForReadWrite(NonExistantFile, FD,
-                                           fs::CD_OpenExisting, fs::OF_None));
-  FileDescriptorCloser Closer(FD);
-  verifyRead(FD, "Fizz", true);
-  verifyWrite(FD, "Buzz", true);
-}
-
-TEST_F(FileSystemTest, readNativeFile) {
-  createFileWithData(NonExistantFile, false, fs::CD_CreateNew, "01234");
-  FileRemover Cleanup(NonExistantFile);
-  const auto &Read = [&](size_t ToRead) -> Expected<std::string> {
-    std::string Buf(ToRead, '?');
-    Expected<fs::file_t> FD = fs::openNativeFileForRead(NonExistantFile);
-    if (!FD)
-      return FD.takeError();
-    auto Close = make_scope_exit([&] { fs::closeFile(*FD); });
-    if (Expected<size_t> BytesRead = fs::readNativeFile(
-            *FD, makeMutableArrayRef(&*Buf.begin(), Buf.size())))
-      return Buf.substr(0, *BytesRead);
-    else
-      return BytesRead.takeError();
-  };
-  EXPECT_THAT_EXPECTED(Read(5), HasValue("01234"));
-  EXPECT_THAT_EXPECTED(Read(3), HasValue("012"));
-  EXPECT_THAT_EXPECTED(Read(6), HasValue("01234"));
-}
-
-TEST_F(FileSystemTest, readNativeFileSlice) {
-  createFileWithData(NonExistantFile, false, fs::CD_CreateNew, "01234");
-  FileRemover Cleanup(NonExistantFile);
-  Expected<fs::file_t> FD = fs::openNativeFileForRead(NonExistantFile);
-  ASSERT_THAT_EXPECTED(FD, Succeeded());
-  auto Close = make_scope_exit([&] { fs::closeFile(*FD); });
-  const auto &Read = [&](size_t Offset,
-                         size_t ToRead) -> Expected<std::string> {
-    std::string Buf(ToRead, '?');
-    if (Expected<size_t> BytesRead = fs::readNativeFileSlice(
-            *FD, makeMutableArrayRef(&*Buf.begin(), Buf.size()), Offset))
-      return Buf.substr(0, *BytesRead);
-    else
-      return BytesRead.takeError();
-  };
-  EXPECT_THAT_EXPECTED(Read(0, 5), HasValue("01234"));
-  EXPECT_THAT_EXPECTED(Read(0, 3), HasValue("012"));
-  EXPECT_THAT_EXPECTED(Read(2, 3), HasValue("234"));
-  EXPECT_THAT_EXPECTED(Read(0, 6), HasValue("01234"));
-  EXPECT_THAT_EXPECTED(Read(2, 6), HasValue("234"));
-  EXPECT_THAT_EXPECTED(Read(5, 5), HasValue(""));
-}
-
-TEST_F(FileSystemTest, is_local) {
-  bool TestDirectoryIsLocal;
-  ASSERT_NO_ERROR(fs::is_local(TestDirectory, TestDirectoryIsLocal));
-  EXPECT_EQ(TestDirectoryIsLocal, fs::is_local(TestDirectory));
-
-  int FD;
-  SmallString<128> TempPath;
-  ASSERT_NO_ERROR(
-      fs::createUniqueFile(Twine(TestDirectory) + "/temp", FD, TempPath));
-  FileRemover Cleanup(TempPath);
-
-  // Make sure it exists.
-  ASSERT_TRUE(sys::fs::exists(Twine(TempPath)));
-
-  bool TempFileIsLocal;
-  ASSERT_NO_ERROR(fs::is_local(FD, TempFileIsLocal));
-  EXPECT_EQ(TempFileIsLocal, fs::is_local(FD));
-  ::close(FD);
-
-  // Expect that the file and its parent directory are equally local or equally
-  // remote.
-  EXPECT_EQ(TestDirectoryIsLocal, TempFileIsLocal);
-}
-
-TEST_F(FileSystemTest, getUmask) {
-#ifdef _WIN32
-  EXPECT_EQ(fs::getUmask(), 0U) << "Should always be 0 on Windows.";
-#else
-  unsigned OldMask = ::umask(0022);
-  unsigned CurrentMask = fs::getUmask();
-  EXPECT_EQ(CurrentMask, 0022U)
-      << "getUmask() didn't return previously set umask()";
-  EXPECT_EQ(::umask(OldMask), mode_t(0022U))
-      << "getUmask() may have changed umask()";
-#endif
-}
-
-TEST_F(FileSystemTest, RespectUmask) {
-#ifndef _WIN32
-  unsigned OldMask = ::umask(0022);
-
-  int FD;
-  SmallString<128> TempPath;
-  ASSERT_NO_ERROR(fs::createTemporaryFile("prefix", "temp", FD, TempPath));
-
-  fs::perms AllRWE = static_cast<fs::perms>(0777);
-
-  ASSERT_NO_ERROR(fs::setPermissions(TempPath, AllRWE));
-
-  ErrorOr<fs::perms> Perms = fs::getPermissions(TempPath);
-  ASSERT_TRUE(!!Perms);
-  EXPECT_EQ(Perms.get(), AllRWE) << "Should have ignored umask by default";
-
-  ASSERT_NO_ERROR(fs::setPermissions(TempPath, AllRWE));
-
-  Perms = fs::getPermissions(TempPath);
-  ASSERT_TRUE(!!Perms);
-  EXPECT_EQ(Perms.get(), AllRWE) << "Should have ignored umask";
-
-  ASSERT_NO_ERROR(
-      fs::setPermissions(FD, static_cast<fs::perms>(AllRWE & ~fs::getUmask())));
-  Perms = fs::getPermissions(TempPath);
-  ASSERT_TRUE(!!Perms);
-  EXPECT_EQ(Perms.get(), static_cast<fs::perms>(0755))
-      << "Did not respect umask";
-
-  (void)::umask(0057);
-
-  ASSERT_NO_ERROR(
-      fs::setPermissions(FD, static_cast<fs::perms>(AllRWE & ~fs::getUmask())));
-  Perms = fs::getPermissions(TempPath);
-  ASSERT_TRUE(!!Perms);
-  EXPECT_EQ(Perms.get(), static_cast<fs::perms>(0720))
-      << "Did not respect umask";
-
-  (void)::umask(OldMask);
-  (void)::close(FD);
-#endif
-}
-
-TEST_F(FileSystemTest, set_current_path) {
-  SmallString<128> path;
-
-  ASSERT_NO_ERROR(fs::current_path(path));
-  ASSERT_NE(TestDirectory, path);
-
-  struct RestorePath {
-    SmallString<128> path;
-    RestorePath(const SmallString<128> &path) : path(path) {}
-    ~RestorePath() { fs::set_current_path(path); }
-  } restore_path(path);
-
-  ASSERT_NO_ERROR(fs::set_current_path(TestDirectory));
-
-  ASSERT_NO_ERROR(fs::current_path(path));
-
-  fs::UniqueID D1, D2;
-  ASSERT_NO_ERROR(fs::getUniqueID(TestDirectory, D1));
-  ASSERT_NO_ERROR(fs::getUniqueID(path, D2));
-  ASSERT_EQ(D1, D2) << "D1: " << TestDirectory << "\nD2: " << path;
-}
-
-TEST_F(FileSystemTest, permissions) {
-  int FD;
-  SmallString<64> TempPath;
-  ASSERT_NO_ERROR(fs::createTemporaryFile("prefix", "temp", FD, TempPath));
-  FileRemover Cleanup(TempPath);
-
-  // Make sure it exists.
-  ASSERT_TRUE(fs::exists(Twine(TempPath)));
-
-  auto CheckPermissions = [&](fs::perms Expected) {
-    ErrorOr<fs::perms> Actual = fs::getPermissions(TempPath);
-    return Actual && *Actual == Expected;
-  };
-
-  std::error_code NoError;
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::all_all), NoError);
-  EXPECT_TRUE(CheckPermissions(fs::all_all));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::all_read | fs::all_exe), NoError);
-  EXPECT_TRUE(CheckPermissions(fs::all_read | fs::all_exe));
-
-#if defined(_WIN32)
-  fs::perms ReadOnly = fs::all_read | fs::all_exe;
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::no_perms), NoError);
-  EXPECT_TRUE(CheckPermissions(ReadOnly));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::owner_read), NoError);
-  EXPECT_TRUE(CheckPermissions(ReadOnly));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::owner_write), NoError);
-  EXPECT_TRUE(CheckPermissions(fs::all_all));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::owner_exe), NoError);
-  EXPECT_TRUE(CheckPermissions(ReadOnly));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::owner_all), NoError);
-  EXPECT_TRUE(CheckPermissions(fs::all_all));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::group_read), NoError);
-  EXPECT_TRUE(CheckPermissions(ReadOnly));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::group_write), NoError);
-  EXPECT_TRUE(CheckPermissions(fs::all_all));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::group_exe), NoError);
-  EXPECT_TRUE(CheckPermissions(ReadOnly));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::group_all), NoError);
-  EXPECT_TRUE(CheckPermissions(fs::all_all));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::others_read), NoError);
-  EXPECT_TRUE(CheckPermissions(ReadOnly));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::others_write), NoError);
-  EXPECT_TRUE(CheckPermissions(fs::all_all));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::others_exe), NoError);
-  EXPECT_TRUE(CheckPermissions(ReadOnly));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::others_all), NoError);
-  EXPECT_TRUE(CheckPermissions(fs::all_all));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::all_read), NoError);
-  EXPECT_TRUE(CheckPermissions(ReadOnly));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::all_write), NoError);
-  EXPECT_TRUE(CheckPermissions(fs::all_all));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::all_exe), NoError);
-  EXPECT_TRUE(CheckPermissions(ReadOnly));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::set_uid_on_exe), NoError);
-  EXPECT_TRUE(CheckPermissions(ReadOnly));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::set_gid_on_exe), NoError);
-  EXPECT_TRUE(CheckPermissions(ReadOnly));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::sticky_bit), NoError);
-  EXPECT_TRUE(CheckPermissions(ReadOnly));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::set_uid_on_exe |
-                                             fs::set_gid_on_exe |
-                                             fs::sticky_bit),
-            NoError);
-  EXPECT_TRUE(CheckPermissions(ReadOnly));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, ReadOnly | fs::set_uid_on_exe |
-                                             fs::set_gid_on_exe |
-                                             fs::sticky_bit),
-            NoError);
-  EXPECT_TRUE(CheckPermissions(ReadOnly));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::all_perms), NoError);
-  EXPECT_TRUE(CheckPermissions(fs::all_all));
-#else
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::no_perms), NoError);
-  EXPECT_TRUE(CheckPermissions(fs::no_perms));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::owner_read), NoError);
-  EXPECT_TRUE(CheckPermissions(fs::owner_read));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::owner_write), NoError);
-  EXPECT_TRUE(CheckPermissions(fs::owner_write));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::owner_exe), NoError);
-  EXPECT_TRUE(CheckPermissions(fs::owner_exe));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::owner_all), NoError);
-  EXPECT_TRUE(CheckPermissions(fs::owner_all));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::group_read), NoError);
-  EXPECT_TRUE(CheckPermissions(fs::group_read));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::group_write), NoError);
-  EXPECT_TRUE(CheckPermissions(fs::group_write));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::group_exe), NoError);
-  EXPECT_TRUE(CheckPermissions(fs::group_exe));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::group_all), NoError);
-  EXPECT_TRUE(CheckPermissions(fs::group_all));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::others_read), NoError);
-  EXPECT_TRUE(CheckPermissions(fs::others_read));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::others_write), NoError);
-  EXPECT_TRUE(CheckPermissions(fs::others_write));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::others_exe), NoError);
-  EXPECT_TRUE(CheckPermissions(fs::others_exe));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::others_all), NoError);
-  EXPECT_TRUE(CheckPermissions(fs::others_all));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::all_read), NoError);
-  EXPECT_TRUE(CheckPermissions(fs::all_read));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::all_write), NoError);
-  EXPECT_TRUE(CheckPermissions(fs::all_write));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::all_exe), NoError);
-  EXPECT_TRUE(CheckPermissions(fs::all_exe));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::set_uid_on_exe), NoError);
-  EXPECT_TRUE(CheckPermissions(fs::set_uid_on_exe));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::set_gid_on_exe), NoError);
-  EXPECT_TRUE(CheckPermissions(fs::set_gid_on_exe));
-
-  // Modern BSDs require root to set the sticky bit on files.
-  // AIX and Solaris without root will mask off (i.e., lose) the sticky bit
-  // on files.
-#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) &&  \
-    !defined(_AIX) && !(defined(__sun__) && defined(__svr4__))
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::sticky_bit), NoError);
-  EXPECT_TRUE(CheckPermissions(fs::sticky_bit));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::set_uid_on_exe |
-                                             fs::set_gid_on_exe |
-                                             fs::sticky_bit),
-            NoError);
-  EXPECT_TRUE(CheckPermissions(fs::set_uid_on_exe | fs::set_gid_on_exe |
-                               fs::sticky_bit));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::all_read | fs::set_uid_on_exe |
-                                             fs::set_gid_on_exe |
-                                             fs::sticky_bit),
-            NoError);
-  EXPECT_TRUE(CheckPermissions(fs::all_read | fs::set_uid_on_exe |
-                               fs::set_gid_on_exe | fs::sticky_bit));
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::all_perms), NoError);
-  EXPECT_TRUE(CheckPermissions(fs::all_perms));
-#endif // !FreeBSD && !NetBSD && !OpenBSD && !AIX
-
-  EXPECT_EQ(fs::setPermissions(TempPath, fs::all_perms & ~fs::sticky_bit),
-                               NoError);
-  EXPECT_TRUE(CheckPermissions(fs::all_perms & ~fs::sticky_bit));
-#endif
-}
-
-#ifdef _WIN32
-TEST_F(FileSystemTest, widenPath) {
-  const std::wstring LongPathPrefix(L"\\\\?\\");
-
-  // Test that the length limit is checked against the UTF-16 length and not the
-  // UTF-8 length.
-  std::string Input("C:\\foldername\\");
-  const std::string Pi("\xcf\x80"); // UTF-8 lower case pi.
-  // Add Pi up to the MAX_PATH limit.
-  const size_t NumChars = MAX_PATH - Input.size() - 1;
-  for (size_t i = 0; i < NumChars; ++i)
-    Input += Pi;
-  // Check that UTF-8 length already exceeds MAX_PATH.
-  EXPECT_TRUE(Input.size() > MAX_PATH);
-  SmallVector<wchar_t, MAX_PATH + 16> Result;
-  ASSERT_NO_ERROR(windows::widenPath(Input, Result));
-  // Result should not start with the long path prefix.
-  EXPECT_TRUE(std::wmemcmp(Result.data(), LongPathPrefix.c_str(),
-                           LongPathPrefix.size()) != 0);
-  EXPECT_EQ(Result.size(), (size_t)MAX_PATH - 1);
-
-  // Add another Pi to exceed the MAX_PATH limit.
-  Input += Pi;
-  // Construct the expected result.
-  SmallVector<wchar_t, MAX_PATH + 16> Expected;
-  ASSERT_NO_ERROR(windows::UTF8ToUTF16(Input, Expected));
-  Expected.insert(Expected.begin(), LongPathPrefix.begin(),
-                  LongPathPrefix.end());
-
-  ASSERT_NO_ERROR(windows::widenPath(Input, Result));
-  EXPECT_EQ(Result, Expected);
-
-  // Test that UNC paths are handled correctly.
-  const std::string ShareName("\\\\sharename\\");
-  const std::string FileName("\\filename");
-  // Initialize directory name so that the input is within the MAX_PATH limit.
-  const char DirChar = 'x';
-  std::string DirName(MAX_PATH - ShareName.size() - FileName.size() - 1,
-                      DirChar);
-
-  Input = ShareName + DirName + FileName;
-  ASSERT_NO_ERROR(windows::widenPath(Input, Result));
-  // Result should not start with the long path prefix.
-  EXPECT_TRUE(std::wmemcmp(Result.data(), LongPathPrefix.c_str(),
-                           LongPathPrefix.size()) != 0);
-  EXPECT_EQ(Result.size(), (size_t)MAX_PATH - 1);
-
-  // Extend the directory name so the input exceeds the MAX_PATH limit.
-  DirName += DirChar;
-  Input = ShareName + DirName + FileName;
-  // Construct the expected result.
-  ASSERT_NO_ERROR(windows::UTF8ToUTF16(StringRef(Input).substr(2), Expected));
-  const std::wstring UNCPrefix(LongPathPrefix + L"UNC\\");
-  Expected.insert(Expected.begin(), UNCPrefix.begin(), UNCPrefix.end());
-
-  ASSERT_NO_ERROR(windows::widenPath(Input, Result));
-  EXPECT_EQ(Result, Expected);
-
-  // Check that Unix separators are handled correctly.
-  std::replace(Input.begin(), Input.end(), '\\', '/');
-  ASSERT_NO_ERROR(windows::widenPath(Input, Result));
-  EXPECT_EQ(Result, Expected);
-
-  // Check the removal of "dots".
-  Input = ShareName + DirName + "\\.\\foo\\.\\.." + FileName;
-  ASSERT_NO_ERROR(windows::widenPath(Input, Result));
-  EXPECT_EQ(Result, Expected);
-}
-#endif
-
-#ifdef _WIN32
-// Windows refuses lock request if file region is already locked by the same
-// process. POSIX system in this case updates the existing lock.
-TEST_F(FileSystemTest, FileLocker) {
-  using namespace std::chrono;
-  int FD;
-  std::error_code EC;
-  SmallString<64> TempPath;
-  EC = fs::createTemporaryFile("test", "temp", FD, TempPath);
-  ASSERT_NO_ERROR(EC);
-  FileRemover Cleanup(TempPath);
-  raw_fd_ostream Stream(TempPath, EC);
-
-  EC = fs::tryLockFile(FD);
-  ASSERT_NO_ERROR(EC);
-  EC = fs::unlockFile(FD);
-  ASSERT_NO_ERROR(EC);
-
-  if (auto L = Stream.lock()) {
-    ASSERT_ERROR(fs::tryLockFile(FD));
-    ASSERT_NO_ERROR(L->unlock());
-    ASSERT_NO_ERROR(fs::tryLockFile(FD));
-    ASSERT_NO_ERROR(fs::unlockFile(FD));
-  } else {
-    ADD_FAILURE();
-    handleAllErrors(L.takeError(), [&](ErrorInfoBase &EIB) {});
-  }
-
-  ASSERT_NO_ERROR(fs::tryLockFile(FD));
-  ASSERT_NO_ERROR(fs::unlockFile(FD));
-
-  {
-    Expected<fs::FileLocker> L1 = Stream.lock();
-    ASSERT_THAT_EXPECTED(L1, Succeeded());
-    raw_fd_ostream Stream2(FD, false);
-    Expected<fs::FileLocker> L2 = Stream2.tryLockFor(250ms);
-    ASSERT_THAT_EXPECTED(L2, Failed());
-    ASSERT_NO_ERROR(L1->unlock());
-    Expected<fs::FileLocker> L3 = Stream.tryLockFor(0ms);
-    ASSERT_THAT_EXPECTED(L3, Succeeded());
-  }
-
-  ASSERT_NO_ERROR(fs::tryLockFile(FD));
-  ASSERT_NO_ERROR(fs::unlockFile(FD));
-}
-#endif
-
-} // anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/Support/ProcessTest.cpp b/gnu/llvm/llvm/unittests/Support/ProcessTest.cpp
deleted file mode 100644
index d4ccfe1ecfd..00000000000
--- a/gnu/llvm/llvm/unittests/Support/ProcessTest.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-//===- unittest/Support/ProcessTest.cpp -----------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/Triple.h"
-#include "llvm/Support/Error.h"
-#include "llvm/Support/Host.h"
-#include "llvm/Support/Process.h"
-#include "gtest/gtest.h"
-
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
-namespace {
-
-using namespace llvm;
-using namespace sys;
-
-TEST(ProcessTest, GetProcessIdTest) {
-  const Process::Pid pid = Process::getProcessId();
-
-#ifdef _WIN32
-  EXPECT_EQ((DWORD)pid, ::GetCurrentProcessId());
-#else
-  EXPECT_EQ(pid, ::getpid());
-#endif
-}
-
-TEST(ProcessTest, GetRandomNumberTest) {
-  const unsigned r1 = Process::GetRandomNumber();
-  const unsigned r2 = Process::GetRandomNumber();
-  // It should be extremely unlikely that both r1 and r2 are 0.
-  EXPECT_NE((r1 | r2), 0u);
-}
-
-#ifdef _MSC_VER
-#define setenv(name, var, ignore) _putenv_s(name, var)
-#endif
-
-#if HAVE_SETENV || _MSC_VER
-TEST(ProcessTest, Basic) {
-  setenv("__LLVM_TEST_ENVIRON_VAR__", "abc", true);
-  Optional<std::string> val(Process::GetEnv("__LLVM_TEST_ENVIRON_VAR__"));
-  EXPECT_TRUE(val.hasValue());
-  EXPECT_STREQ("abc", val->c_str());
-}
-
-TEST(ProcessTest, None) {
-  Optional<std::string> val(
-      Process::GetEnv("__LLVM_TEST_ENVIRON_NO_SUCH_VAR__"));
-  EXPECT_FALSE(val.hasValue());
-}
-#endif
-
-#ifdef _WIN32
-
-TEST(ProcessTest, EmptyVal) {
-  SetEnvironmentVariableA("__LLVM_TEST_ENVIRON_VAR__", "");
-  Optional<std::string> val(Process::GetEnv("__LLVM_TEST_ENVIRON_VAR__"));
-  EXPECT_TRUE(val.hasValue());
-  EXPECT_STREQ("", val->c_str());
-}
-
-TEST(ProcessTest, Wchar) {
-  SetEnvironmentVariableW(L"__LLVM_TEST_ENVIRON_VAR__", L"abcdefghijklmnopqrs");
-  Optional<std::string> val(Process::GetEnv("__LLVM_TEST_ENVIRON_VAR__"));
-  EXPECT_TRUE(val.hasValue());
-  EXPECT_STREQ("abcdefghijklmnopqrs", val->c_str());
-}
-#endif
-
-class PageSizeTest : public testing::Test {
-  Triple Host;
-
-protected:
-  PageSizeTest() : Host(Triple::normalize(sys::getProcessTriple())) {}
-
-  bool isSupported() const {
-    // For now just on X86-64 and Aarch64. This can be expanded in the future.
-    return (Host.getArch() == Triple::x86_64 ||
-            Host.getArch() == Triple::aarch64) &&
-           Host.getOS() == Triple::Linux;
-  }
-
-  bool pageSizeAsExpected(unsigned PageSize) const {
-    switch (Host.getArch()) {
-    case Triple::x86_64:
-      return PageSize == 4096;
-    case Triple::aarch64:
-      // supported granule sizes are 4k, 16k and 64k
-      return PageSize == 4096 || PageSize == 16384 || PageSize == 65536;
-    default:
-      llvm_unreachable("unexpected arch!");
-    }
-  }
-};
-
-TEST_F(PageSizeTest, PageSize) {
-  if (!isSupported())
-    return;
-
-  llvm::Expected<unsigned> Result = llvm::sys::Process::getPageSize();
-  ASSERT_FALSE(!Result);
-  ASSERT_TRUE(pageSizeAsExpected(*Result));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/Support/ProgramTest.cpp b/gnu/llvm/llvm/unittests/Support/ProgramTest.cpp
deleted file mode 100644
index 98eb81c0abf..00000000000
--- a/gnu/llvm/llvm/unittests/Support/ProgramTest.cpp
+++ /dev/null
@@ -1,420 +0,0 @@
-//===- unittest/Support/ProgramTest.cpp -----------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/Program.h"
-#include "llvm/Config/llvm-config.h"
-#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/ConvertUTF.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/Path.h"
-#include "gtest/gtest.h"
-#include <stdlib.h>
-#include <thread>
-#if defined(__APPLE__)
-# include <crt_externs.h>
-#elif !defined(_MSC_VER)
-// Forward declare environ in case it's not provided by stdlib.h.
-extern char **environ;
-#endif
-
-#if defined(LLVM_ON_UNIX)
-#include <unistd.h>
-void sleep_for(unsigned int seconds) {
-  sleep(seconds);
-}
-#elif defined(_WIN32)
-#include <windows.h>
-void sleep_for(unsigned int seconds) {
-  Sleep(seconds * 1000);
-}
-#else
-#error sleep_for is not implemented on your platform.
-#endif
-
-#define ASSERT_NO_ERROR(x)                                                     \
-  if (std::error_code ASSERT_NO_ERROR_ec = x) {                                \
-    SmallString<128> MessageStorage;                                           \
-    raw_svector_ostream Message(MessageStorage);                               \
-    Message << #x ": did not return errc::success.\n"                          \
-            << "error number: " << ASSERT_NO_ERROR_ec.value() << "\n"          \
-            << "error message: " << ASSERT_NO_ERROR_ec.message() << "\n";      \
-    GTEST_FATAL_FAILURE_(MessageStorage.c_str());                              \
-  } else {                                                                     \
-  }
-// From TestMain.cpp.
-extern const char *TestMainArgv0;
-
-namespace {
-
-using namespace llvm;
-using namespace sys;
-
-static cl::opt<std::string>
-ProgramTestStringArg1("program-test-string-arg1");
-static cl::opt<std::string>
-ProgramTestStringArg2("program-test-string-arg2");
-
-class ProgramEnvTest : public testing::Test {
-  std::vector<StringRef> EnvTable;
-  std::vector<std::string> EnvStorage;
-
-protected:
-  void SetUp() override {
-    auto EnvP = [] {
-#if defined(_WIN32)
-      _wgetenv(L"TMP"); // Populate _wenviron, initially is null
-      return _wenviron;
-#elif defined(__APPLE__)
-      return *_NSGetEnviron();
-#else
-      return environ;
-#endif
-    }();
-    ASSERT_TRUE(EnvP);
-
-    auto prepareEnvVar = [this](decltype(*EnvP) Var) -> StringRef {
-#if defined(_WIN32)
-      // On Windows convert UTF16 encoded variable to UTF8
-      auto Len = wcslen(Var);
-      ArrayRef<char> Ref{reinterpret_cast<char const *>(Var),
-                         Len * sizeof(*Var)};
-      EnvStorage.emplace_back();
-      auto convStatus = convertUTF16ToUTF8String(Ref, EnvStorage.back());
-      EXPECT_TRUE(convStatus);
-      return EnvStorage.back();
-#else
-      (void)this;
-      return StringRef(Var);
-#endif
-    };
-
-    while (*EnvP != nullptr) {
-      EnvTable.emplace_back(prepareEnvVar(*EnvP));
-      ++EnvP;
-    }
-  }
-
-  void TearDown() override {
-    EnvTable.clear();
-    EnvStorage.clear();
-  }
-
-  void addEnvVar(StringRef Var) { EnvTable.emplace_back(Var); }
-
-  ArrayRef<StringRef> getEnviron() const { return EnvTable; }
-};
-
-#ifdef _WIN32
-TEST_F(ProgramEnvTest, CreateProcessLongPath) {
-  if (getenv("LLVM_PROGRAM_TEST_LONG_PATH"))
-    exit(0);
-
-  // getMainExecutable returns an absolute path; prepend the long-path prefix.
-  std::string MyAbsExe =
-      sys::fs::getMainExecutable(TestMainArgv0, &ProgramTestStringArg1);
-  std::string MyExe;
-  if (!StringRef(MyAbsExe).startswith("\\\\?\\"))
-    MyExe.append("\\\\?\\");
-  MyExe.append(MyAbsExe);
-
-  StringRef ArgV[] = {MyExe,
-                      "--gtest_filter=ProgramEnvTest.CreateProcessLongPath"};
-
-  // Add LLVM_PROGRAM_TEST_LONG_PATH to the environment of the child.
-  addEnvVar("LLVM_PROGRAM_TEST_LONG_PATH=1");
-
-  // Redirect stdout to a long path.
-  SmallString<128> TestDirectory;
-  ASSERT_NO_ERROR(
-    fs::createUniqueDirectory("program-redirect-test", TestDirectory));
-  SmallString<256> LongPath(TestDirectory);
-  LongPath.push_back('\\');
-  // MAX_PATH = 260
-  LongPath.append(260 - TestDirectory.size(), 'a');
-
-  std::string Error;
-  bool ExecutionFailed;
-  Optional<StringRef> Redirects[] = {None, LongPath.str(), None};
-  int RC = ExecuteAndWait(MyExe, ArgV, getEnviron(), Redirects,
-    /*secondsToWait=*/ 10, /*memoryLimit=*/ 0, &Error,
-    &ExecutionFailed);
-  EXPECT_FALSE(ExecutionFailed) << Error;
-  EXPECT_EQ(0, RC);
-
-  // Remove the long stdout.
-  ASSERT_NO_ERROR(fs::remove(Twine(LongPath)));
-  ASSERT_NO_ERROR(fs::remove(Twine(TestDirectory)));
-}
-#endif
-
-TEST_F(ProgramEnvTest, CreateProcessTrailingSlash) {
-  if (getenv("LLVM_PROGRAM_TEST_CHILD")) {
-    if (ProgramTestStringArg1 == "has\\\\ trailing\\" &&
-        ProgramTestStringArg2 == "has\\\\ trailing\\") {
-      exit(0);  // Success!  The arguments were passed and parsed.
-    }
-    exit(1);
-  }
-
-  std::string my_exe =
-      sys::fs::getMainExecutable(TestMainArgv0, &ProgramTestStringArg1);
-  StringRef argv[] = {
-      my_exe,
-      "--gtest_filter=ProgramEnvTest.CreateProcessTrailingSlash",
-      "-program-test-string-arg1",
-      "has\\\\ trailing\\",
-      "-program-test-string-arg2",
-      "has\\\\ trailing\\"};
-
-  // Add LLVM_PROGRAM_TEST_CHILD to the environment of the child.
-  addEnvVar("LLVM_PROGRAM_TEST_CHILD=1");
-
-  std::string error;
-  bool ExecutionFailed;
-  // Redirect stdout and stdin to NUL, but let stderr through.
-#ifdef _WIN32
-  StringRef nul("NUL");
-#else
-  StringRef nul("/dev/null");
-#endif
-  Optional<StringRef> redirects[] = { nul, nul, None };
-  int rc = ExecuteAndWait(my_exe, argv, getEnviron(), redirects,
-                          /*secondsToWait=*/ 10, /*memoryLimit=*/ 0, &error,
-                          &ExecutionFailed);
-  EXPECT_FALSE(ExecutionFailed) << error;
-  EXPECT_EQ(0, rc);
-}
-
-TEST_F(ProgramEnvTest, TestExecuteNoWait) {
-  using namespace llvm::sys;
-
-  if (getenv("LLVM_PROGRAM_TEST_EXECUTE_NO_WAIT")) {
-    sleep_for(/*seconds*/ 1);
-    exit(0);
-  }
-
-  std::string Executable =
-      sys::fs::getMainExecutable(TestMainArgv0, &ProgramTestStringArg1);
-  StringRef argv[] = {Executable,
-                      "--gtest_filter=ProgramEnvTest.TestExecuteNoWait"};
-
-  // Add LLVM_PROGRAM_TEST_EXECUTE_NO_WAIT to the environment of the child.
-  addEnvVar("LLVM_PROGRAM_TEST_EXECUTE_NO_WAIT=1");
-
-  std::string Error;
-  bool ExecutionFailed;
-  ProcessInfo PI1 = ExecuteNoWait(Executable, argv, getEnviron(), {}, 0, &Error,
-                                  &ExecutionFailed);
-  ASSERT_FALSE(ExecutionFailed) << Error;
-  ASSERT_NE(PI1.Pid, ProcessInfo::InvalidPid) << "Invalid process id";
-
-  unsigned LoopCount = 0;
-
-  // Test that Wait() with WaitUntilTerminates=true works. In this case,
-  // LoopCount should only be incremented once.
-  while (true) {
-    ++LoopCount;
-    ProcessInfo WaitResult = llvm::sys::Wait(PI1, 0, true, &Error);
-    ASSERT_TRUE(Error.empty());
-    if (WaitResult.Pid == PI1.Pid)
-      break;
-  }
-
-  EXPECT_EQ(LoopCount, 1u) << "LoopCount should be 1";
-
-  ProcessInfo PI2 = ExecuteNoWait(Executable, argv, getEnviron(), {}, 0, &Error,
-                                  &ExecutionFailed);
-  ASSERT_FALSE(ExecutionFailed) << Error;
-  ASSERT_NE(PI2.Pid, ProcessInfo::InvalidPid) << "Invalid process id";
-
-  // Test that Wait() with SecondsToWait=0 performs a non-blocking wait. In this
-  // cse, LoopCount should be greater than 1 (more than one increment occurs).
-  while (true) {
-    ++LoopCount;
-    ProcessInfo WaitResult = llvm::sys::Wait(PI2, 0, false, &Error);
-    ASSERT_TRUE(Error.empty());
-    if (WaitResult.Pid == PI2.Pid)
-      break;
-  }
-
-  ASSERT_GT(LoopCount, 1u) << "LoopCount should be >1";
-}
-
-TEST_F(ProgramEnvTest, TestExecuteAndWaitTimeout) {
-  using namespace llvm::sys;
-
-  if (getenv("LLVM_PROGRAM_TEST_TIMEOUT")) {
-    sleep_for(/*seconds*/ 10);
-    exit(0);
-  }
-
-  std::string Executable =
-      sys::fs::getMainExecutable(TestMainArgv0, &ProgramTestStringArg1);
-  StringRef argv[] = {
-      Executable, "--gtest_filter=ProgramEnvTest.TestExecuteAndWaitTimeout"};
-
-  // Add LLVM_PROGRAM_TEST_TIMEOUT to the environment of the child.
- addEnvVar("LLVM_PROGRAM_TEST_TIMEOUT=1");
-
-  std::string Error;
-  bool ExecutionFailed;
-  int RetCode =
-      ExecuteAndWait(Executable, argv, getEnviron(), {}, /*secondsToWait=*/1, 0,
-                     &Error, &ExecutionFailed);
-  ASSERT_EQ(-2, RetCode);
-}
-
-TEST(ProgramTest, TestExecuteNegative) {
-  std::string Executable = "i_dont_exist";
-  StringRef argv[] = {Executable};
-
-  {
-    std::string Error;
-    bool ExecutionFailed;
-    int RetCode = ExecuteAndWait(Executable, argv, llvm::None, {}, 0, 0, &Error,
-                                 &ExecutionFailed);
-    ASSERT_TRUE(RetCode < 0) << "On error ExecuteAndWait should return 0 or "
-                                "positive value indicating the result code";
-    ASSERT_TRUE(ExecutionFailed);
-    ASSERT_FALSE(Error.empty());
-  }
-
-  {
-    std::string Error;
-    bool ExecutionFailed;
-    ProcessInfo PI = ExecuteNoWait(Executable, argv, llvm::None, {}, 0, &Error,
-                                   &ExecutionFailed);
-    ASSERT_EQ(PI.Pid, ProcessInfo::InvalidPid)
-        << "On error ExecuteNoWait should return an invalid ProcessInfo";
-    ASSERT_TRUE(ExecutionFailed);
-    ASSERT_FALSE(Error.empty());
-  }
-
-}
-
-#ifdef _WIN32
-const char utf16le_text[] =
-    "\x6c\x00\x69\x00\x6e\x00\x67\x00\xfc\x00\x69\x00\xe7\x00\x61\x00";
-const char utf16be_text[] =
-    "\x00\x6c\x00\x69\x00\x6e\x00\x67\x00\xfc\x00\x69\x00\xe7\x00\x61";
-#endif
-const char utf8_text[] = "\x6c\x69\x6e\x67\xc3\xbc\x69\xc3\xa7\x61";
-
-TEST(ProgramTest, TestWriteWithSystemEncoding) {
-  SmallString<128> TestDirectory;
-  ASSERT_NO_ERROR(fs::createUniqueDirectory("program-test", TestDirectory));
-  errs() << "Test Directory: " << TestDirectory << '\n';
-  errs().flush();
-  SmallString<128> file_pathname(TestDirectory);
-  path::append(file_pathname, "international-file.txt");
-  // Only on Windows we should encode in UTF16. For other systems, use UTF8
-  ASSERT_NO_ERROR(sys::writeFileWithEncoding(file_pathname.c_str(), utf8_text,
-                                             sys::WEM_UTF16));
-  int fd = 0;
-  ASSERT_NO_ERROR(fs::openFileForRead(file_pathname.c_str(), fd));
-#if defined(_WIN32)
-  char buf[18];
-  ASSERT_EQ(::read(fd, buf, 18), 18);
-  const char *utf16_text;
-  if (strncmp(buf, "\xfe\xff", 2) == 0) { // UTF16-BE
-    utf16_text = utf16be_text;
-  } else if (strncmp(buf, "\xff\xfe", 2) == 0) { // UTF16-LE
-    utf16_text = utf16le_text;
-  } else {
-    FAIL() << "Invalid BOM in UTF-16 file";
-  }
-  ASSERT_EQ(strncmp(&buf[2], utf16_text, 16), 0);
-#else
-  char buf[10];
-  ASSERT_EQ(::read(fd, buf, 10), 10);
-  ASSERT_EQ(strncmp(buf, utf8_text, 10), 0);
-#endif
-  ::close(fd);
-  ASSERT_NO_ERROR(fs::remove(file_pathname.str()));
-  ASSERT_NO_ERROR(fs::remove(TestDirectory.str()));
-}
-
-TEST_F(ProgramEnvTest, TestExecuteAndWaitStatistics) {
-  using namespace llvm::sys;
-
-  if (getenv("LLVM_PROGRAM_TEST_STATISTICS"))
-    exit(0);
-
-  std::string Executable =
-      sys::fs::getMainExecutable(TestMainArgv0, &ProgramTestStringArg1);
-  StringRef argv[] = {
-      Executable, "--gtest_filter=ProgramEnvTest.TestExecuteAndWaitStatistics"};
-
-  // Add LLVM_PROGRAM_TEST_STATISTICS to the environment of the child.
-  addEnvVar("LLVM_PROGRAM_TEST_STATISTICS=1");
-
-  std::string Error;
-  bool ExecutionFailed;
-  Optional<ProcessStatistics> ProcStat;
-  int RetCode = ExecuteAndWait(Executable, argv, getEnviron(), {}, 0, 0, &Error,
-                               &ExecutionFailed, &ProcStat);
-  ASSERT_EQ(0, RetCode);
-  ASSERT_TRUE(ProcStat);
-  ASSERT_GE(ProcStat->UserTime, std::chrono::microseconds(0));
-  ASSERT_GE(ProcStat->TotalTime, ProcStat->UserTime);
-}
-
-TEST_F(ProgramEnvTest, TestLockFile) {
-  using namespace llvm::sys;
-
-  if (const char *LockedFile = getenv("LLVM_PROGRAM_TEST_LOCKED_FILE")) {
-    // Child process.
-    int FD2;
-    ASSERT_NO_ERROR(fs::openFileForReadWrite(LockedFile, FD2,
-                                             fs::CD_OpenExisting, fs::OF_None));
-
-    std::error_code ErrC = fs::tryLockFile(FD2, std::chrono::seconds(5));
-    ASSERT_NO_ERROR(ErrC);
-    ASSERT_NO_ERROR(fs::unlockFile(FD2));
-    close(FD2);
-    exit(0);
-  }
-
-  // Create file that will be locked.
-  SmallString<64> LockedFile;
-  int FD1;
-  ASSERT_NO_ERROR(
-      fs::createTemporaryFile("TestLockFile", "temp", FD1, LockedFile));
-
-  std::string Executable =
-      sys::fs::getMainExecutable(TestMainArgv0, &ProgramTestStringArg1);
-  StringRef argv[] = {Executable, "--gtest_filter=ProgramEnvTest.TestLockFile"};
-
-  // Add LLVM_PROGRAM_TEST_LOCKED_FILE to the environment of the child.
-  std::string EnvVar = "LLVM_PROGRAM_TEST_LOCKED_FILE=";
-  EnvVar += LockedFile.str();
-  addEnvVar(EnvVar);
-
-  // Lock the file.
-  ASSERT_NO_ERROR(fs::tryLockFile(FD1));
-
-  std::string Error;
-  bool ExecutionFailed;
-  ProcessInfo PI2 = ExecuteNoWait(Executable, argv, getEnviron(), {}, 0, &Error,
-                                  &ExecutionFailed);
-  ASSERT_FALSE(ExecutionFailed) << Error;
-  ASSERT_TRUE(Error.empty());
-  ASSERT_NE(PI2.Pid, ProcessInfo::InvalidPid) << "Invalid process id";
-
-  // Wait some time to give the child process a chance to start.
-  std::this_thread::sleep_for(std::chrono::milliseconds(100));
-
-  ASSERT_NO_ERROR(fs::unlockFile(FD1));
-  ProcessInfo WaitResult = llvm::sys::Wait(PI2, 5 /* seconds */, true, &Error);
-  ASSERT_TRUE(Error.empty());
-  ASSERT_EQ(0, WaitResult.ReturnCode);
-  ASSERT_EQ(WaitResult.Pid, PI2.Pid);
-  sys::fs::remove(LockedFile);
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/Support/RISCVAttributeParserTest.cpp b/gnu/llvm/llvm/unittests/Support/RISCVAttributeParserTest.cpp
deleted file mode 100644
index 02ffb366a83..00000000000
--- a/gnu/llvm/llvm/unittests/Support/RISCVAttributeParserTest.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-//===----- unittests/RISCVAttributeParserTest.cpp -------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-#include "llvm/Support/RISCVAttributeParser.h"
-#include "llvm/Support/ARMBuildAttributes.h"
-#include "llvm/Support/ELFAttributes.h"
-#include "gtest/gtest.h"
-#include <string>
-
-using namespace llvm;
-
-struct RISCVAttributeSection {
-  unsigned Tag;
-  unsigned Value;
-
-  RISCVAttributeSection(unsigned tag, unsigned value)
-      : Tag(tag), Value(value) {}
-
-  void write(raw_ostream &OS) {
-    OS.flush();
-    // length = length + "riscv\0" + TagFile + ByteSize + Tag + Value;
-    // length = 17 bytes
-
-    OS << 'A' << (uint8_t)17 << (uint8_t)0 << (uint8_t)0 << (uint8_t)0;
-    OS << "riscv" << '\0';
-    OS << (uint8_t)1 << (uint8_t)7 << (uint8_t)0 << (uint8_t)0 << (uint8_t)0;
-    OS << (uint8_t)Tag << (uint8_t)Value;
-  }
-};
-
-static bool testAttribute(unsigned Tag, unsigned Value, unsigned ExpectedTag,
-                          unsigned ExpectedValue) {
-  std::string buffer;
-  raw_string_ostream OS(buffer);
-  RISCVAttributeSection Section(Tag, Value);
-  Section.write(OS);
-  ArrayRef<uint8_t> Bytes(reinterpret_cast<const uint8_t *>(OS.str().c_str()),
-                          OS.str().size());
-
-  RISCVAttributeParser Parser;
-  cantFail(Parser.parse(Bytes, support::little));
-
-  Optional<unsigned> Attr = Parser.getAttributeValue(ExpectedTag);
-  return Attr.hasValue() && Attr.getValue() == ExpectedValue;
-}
-
-static bool testTagString(unsigned Tag, const char *name) {
-  return ELFAttrs::attrTypeAsString(Tag, RISCVAttrs::getRISCVAttributeTags())
-             .str() == name;
-}
-
-TEST(StackAlign, testAttribute) {
-  EXPECT_TRUE(testTagString(4, "Tag_stack_align"));
-  EXPECT_TRUE(
-      testAttribute(4, 4, RISCVAttrs::STACK_ALIGN, RISCVAttrs::ALIGN_4));
-  EXPECT_TRUE(
-      testAttribute(4, 16, RISCVAttrs::STACK_ALIGN, RISCVAttrs::ALIGN_16));
-}
-
-TEST(UnalignedAccess, testAttribute) {
-  EXPECT_TRUE(testTagString(6, "Tag_unaligned_access"));
-  EXPECT_TRUE(testAttribute(6, 0, RISCVAttrs::UNALIGNED_ACCESS,
-                            RISCVAttrs::NOT_ALLOWED));
-  EXPECT_TRUE(
-      testAttribute(6, 1, RISCVAttrs::UNALIGNED_ACCESS, RISCVAttrs::ALLOWED));
-}
diff --git a/gnu/llvm/llvm/unittests/Support/RegexTest.cpp b/gnu/llvm/llvm/unittests/Support/RegexTest.cpp
deleted file mode 100644
index eb8160e4666..00000000000
--- a/gnu/llvm/llvm/unittests/Support/RegexTest.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-//===- llvm/unittest/Support/RegexTest.cpp - Regex tests --===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/Regex.h"
-#include "llvm/ADT/SmallVector.h"
-#include "gtest/gtest.h"
-#include <cstring>
-
-using namespace llvm;
-namespace {
-
-class RegexTest : public ::testing::Test {
-};
-
-TEST_F(RegexTest, Basics) {
-  Regex r1("^[0-9]+$");
-  EXPECT_TRUE(r1.match("916"));
-  EXPECT_TRUE(r1.match("9"));
-  EXPECT_FALSE(r1.match("9a"));
-
-  SmallVector<StringRef, 1> Matches;
-  Regex r2("[0-9]+");
-  EXPECT_TRUE(r2.match("aa216b", &Matches));
-  EXPECT_EQ(1u, Matches.size());
-  EXPECT_EQ("216", Matches[0].str());
-
-  Regex r3("[0-9]+([a-f])?:([0-9]+)");
-  EXPECT_TRUE(r3.match("9a:513b", &Matches));
-  EXPECT_EQ(3u, Matches.size());
-  EXPECT_EQ("9a:513", Matches[0].str());
-  EXPECT_EQ("a", Matches[1].str());
-  EXPECT_EQ("513", Matches[2].str());
-
-  EXPECT_TRUE(r3.match("9:513b", &Matches));
-  EXPECT_EQ(3u, Matches.size());
-  EXPECT_EQ("9:513", Matches[0].str());
-  EXPECT_EQ("", Matches[1].str());
-  EXPECT_EQ("513", Matches[2].str());
-
-  Regex r4("a[^b]+b");
-  std::string String="axxb";
-  String[2] = '\0';
-  EXPECT_FALSE(r4.match("abb"));
-  EXPECT_TRUE(r4.match(String, &Matches));
-  EXPECT_EQ(1u, Matches.size());
-  EXPECT_EQ(String, Matches[0].str());
-
-  std::string NulPattern="X[0-9]+X([a-f])?:([0-9]+)";
-  String="YX99a:513b";
-  NulPattern[7] = '\0';
-  Regex r5(NulPattern);
-  EXPECT_FALSE(r5.match(String));
-  EXPECT_FALSE(r5.match("X9"));
-  String[3]='\0';
-  EXPECT_TRUE(r5.match(String));
-}
-
-TEST_F(RegexTest, Backreferences) {
-  Regex r1("([a-z]+)_\\1");
-  SmallVector<StringRef, 4> Matches;
-  EXPECT_TRUE(r1.match("abc_abc", &Matches));
-  EXPECT_EQ(2u, Matches.size());
-  EXPECT_FALSE(r1.match("abc_ab", &Matches));
-
-  Regex r2("a([0-9])b\\1c\\1");
-  EXPECT_TRUE(r2.match("a4b4c4", &Matches));
-  EXPECT_EQ(2u, Matches.size());
-  EXPECT_EQ("4", Matches[1].str());
-  EXPECT_FALSE(r2.match("a2b2c3"));
-
-  Regex r3("a([0-9])([a-z])b\\1\\2");
-  EXPECT_TRUE(r3.match("a6zb6z", &Matches));
-  EXPECT_EQ(3u, Matches.size());
-  EXPECT_EQ("6", Matches[1].str());
-  EXPECT_EQ("z", Matches[2].str());
-  EXPECT_FALSE(r3.match("a6zb6y"));
-  EXPECT_FALSE(r3.match("a6zb7z"));
-}
-
-TEST_F(RegexTest, Substitution) {
-  std::string Error;
-
-  EXPECT_EQ("aNUMber", Regex("[0-9]+").sub("NUM", "a1234ber"));
-
-  // Standard Escapes
-  EXPECT_EQ("a\\ber", Regex("[0-9]+").sub("\\\\", "a1234ber", &Error));
-  EXPECT_EQ("", Error);
-  EXPECT_EQ("a\nber", Regex("[0-9]+").sub("\\n", "a1234ber", &Error));
-  EXPECT_EQ("", Error);
-  EXPECT_EQ("a\tber", Regex("[0-9]+").sub("\\t", "a1234ber", &Error));
-  EXPECT_EQ("", Error);
-  EXPECT_EQ("ajber", Regex("[0-9]+").sub("\\j", "a1234ber", &Error));
-  EXPECT_EQ("", Error);
-
-  EXPECT_EQ("aber", Regex("[0-9]+").sub("\\", "a1234ber", &Error));
-  EXPECT_EQ(Error, "replacement string contained trailing backslash");
-  
-  // Backreferences
-  EXPECT_EQ("aa1234bber", Regex("a[0-9]+b").sub("a\\0b", "a1234ber", &Error));
-  EXPECT_EQ("", Error);
-
-  EXPECT_EQ("a1234ber", Regex("a([0-9]+)b").sub("a\\1b", "a1234ber", &Error));
-  EXPECT_EQ("", Error);
-
-  EXPECT_EQ("aber", Regex("a[0-9]+b").sub("a\\100b", "a1234ber", &Error));
-  EXPECT_EQ(Error, "invalid backreference string '100'");
-}
-
-TEST_F(RegexTest, IsLiteralERE) {
-  EXPECT_TRUE(Regex::isLiteralERE("abc"));
-  EXPECT_FALSE(Regex::isLiteralERE("a(bc)"));
-  EXPECT_FALSE(Regex::isLiteralERE("^abc"));
-  EXPECT_FALSE(Regex::isLiteralERE("abc$"));
-  EXPECT_FALSE(Regex::isLiteralERE("a|bc"));
-  EXPECT_FALSE(Regex::isLiteralERE("abc*"));
-  EXPECT_FALSE(Regex::isLiteralERE("abc+"));
-  EXPECT_FALSE(Regex::isLiteralERE("abc?"));
-  EXPECT_FALSE(Regex::isLiteralERE("abc."));
-  EXPECT_FALSE(Regex::isLiteralERE("a[bc]"));
-  EXPECT_FALSE(Regex::isLiteralERE("abc\\1"));
-  EXPECT_FALSE(Regex::isLiteralERE("abc{1,2}"));
-}
-
-TEST_F(RegexTest, Escape) {
-  EXPECT_EQ("a\\[bc\\]", Regex::escape("a[bc]"));
-  EXPECT_EQ("abc\\{1\\\\,2\\}", Regex::escape("abc{1\\,2}"));
-}
-
-TEST_F(RegexTest, IsValid) {
-  std::string Error;
-  EXPECT_FALSE(Regex("(foo").isValid(Error));
-  EXPECT_EQ("parentheses not balanced", Error);
-  EXPECT_FALSE(Regex("a[b-").isValid(Error));
-  EXPECT_EQ("invalid character range", Error);
-}
-
-TEST_F(RegexTest, MoveConstruct) {
-  Regex r1("^[0-9]+$");
-  Regex r2(std::move(r1));
-  EXPECT_TRUE(r2.match("916"));
-}
-
-TEST_F(RegexTest, MoveAssign) {
-  Regex r1("^[0-9]+$");
-  Regex r2("abc");
-  r2 = std::move(r1);
-  EXPECT_TRUE(r2.match("916"));
-  std::string Error;
-  EXPECT_FALSE(r1.isValid(Error));
-}
-
-TEST_F(RegexTest, NoArgConstructor) {
-  std::string Error;
-  Regex r1;
-  EXPECT_FALSE(r1.isValid(Error));
-  EXPECT_EQ("invalid regular expression", Error);
-  r1 = Regex("abc");
-  EXPECT_TRUE(r1.isValid(Error));
-}
-
-TEST_F(RegexTest, MatchInvalid) {
-  Regex r1;
-  std::string Error;
-  EXPECT_FALSE(r1.isValid(Error));
-  EXPECT_FALSE(r1.match("X"));
-}
-
-// https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=3727
-TEST_F(RegexTest, OssFuzz3727Regression) {
-  // Wrap in a StringRef so the NUL byte doesn't terminate the string
-  Regex r(StringRef("[[[=GS\x00[=][", 10));
-  std::string Error;
-  EXPECT_FALSE(r.isValid(Error));
-}
-
-}
diff --git a/gnu/llvm/llvm/unittests/Support/ReplaceFileTest.cpp b/gnu/llvm/llvm/unittests/Support/ReplaceFileTest.cpp
deleted file mode 100644
index d2273d77f5e..00000000000
--- a/gnu/llvm/llvm/unittests/Support/ReplaceFileTest.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-//===- llvm/unittest/Support/ReplaceFileTest.cpp - unit tests -------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/Errc.h"
-#include "llvm/Support/ErrorHandling.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Support/Process.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::sys;
-
-#define ASSERT_NO_ERROR(x)                                                 \
-  do {                                                                     \
-    if (std::error_code ASSERT_NO_ERROR_ec = x) {                          \
-      errs() << #x ": did not return errc::success.\n"                     \
-             << "error number: " << ASSERT_NO_ERROR_ec.value() << "\n"     \
-             << "error message: " << ASSERT_NO_ERROR_ec.message() << "\n"; \
-    }                                                                      \
-  } while (false)
-
-namespace {
-std::error_code CreateFileWithContent(const SmallString<128> &FilePath,
-                                      const StringRef &content) {
-  int FD = 0;
-  if (std::error_code ec = fs::openFileForWrite(FilePath, FD))
-    return ec;
-
-  const bool ShouldClose = true;
-  raw_fd_ostream OS(FD, ShouldClose);
-  OS << content;
-
-  return std::error_code();
-}
-
-class ScopedFD {
-  int FD;
-
-  ScopedFD(const ScopedFD &) = delete;
-  ScopedFD &operator=(const ScopedFD &) = delete;
-
- public:
-  explicit ScopedFD(int Descriptor) : FD(Descriptor) {}
-  ~ScopedFD() { Process::SafelyCloseFileDescriptor(FD); }
-};
-
-bool FDHasContent(int FD, StringRef Content) {
-  auto Buffer =
-      MemoryBuffer::getOpenFile(sys::fs::convertFDToNativeFile(FD), "", -1);
-  assert(Buffer);
-  return Buffer.get()->getBuffer() == Content;
-}
-
-bool FileHasContent(StringRef File, StringRef Content) {
-  int FD = 0;
-  auto EC = fs::openFileForRead(File, FD);
-  (void)EC;
-  assert(!EC);
-  ScopedFD EventuallyCloseIt(FD);
-  return FDHasContent(FD, Content);
-}
-
-TEST(rename, FileOpenedForReadingCanBeReplaced) {
-  // Create unique temporary directory for this test.
-  SmallString<128> TestDirectory;
-  ASSERT_NO_ERROR(fs::createUniqueDirectory(
-      "FileOpenedForReadingCanBeReplaced-test", TestDirectory));
-
-  // Add a couple of files to the test directory.
-  SmallString<128> SourceFileName(TestDirectory);
-  path::append(SourceFileName, "source");
-
-  SmallString<128> TargetFileName(TestDirectory);
-  path::append(TargetFileName, "target");
-
-  ASSERT_NO_ERROR(CreateFileWithContent(SourceFileName, "!!source!!"));
-  ASSERT_NO_ERROR(CreateFileWithContent(TargetFileName, "!!target!!"));
-
-  {
-    // Open the target file for reading.
-    int ReadFD = 0;
-    ASSERT_NO_ERROR(fs::openFileForRead(TargetFileName, ReadFD));
-    ScopedFD EventuallyCloseIt(ReadFD);
-
-    // Confirm we can replace the file while it is open.
-    EXPECT_TRUE(!fs::rename(SourceFileName, TargetFileName));
-
-    // We should still be able to read the old data through the existing
-    // descriptor.
-    EXPECT_TRUE(FDHasContent(ReadFD, "!!target!!"));
-
-    // The source file should no longer exist
-    EXPECT_FALSE(fs::exists(SourceFileName));
-  }
-
-  // If we obtain a new descriptor for the target file, we should find that it
-  // contains the content that was in the source file.
-  EXPECT_TRUE(FileHasContent(TargetFileName, "!!source!!"));
-
-  // Rename the target file back to the source file name to confirm that rename
-  // still works if the destination does not already exist.
-  EXPECT_TRUE(!fs::rename(TargetFileName, SourceFileName));
-  EXPECT_FALSE(fs::exists(TargetFileName));
-  ASSERT_TRUE(fs::exists(SourceFileName));
-
-  // Clean up.
-  ASSERT_NO_ERROR(fs::remove(SourceFileName));
-  ASSERT_NO_ERROR(fs::remove(TestDirectory.str()));
-}
-
-TEST(rename, ExistingTemp) {
-  // Test that existing .tmpN files don't get deleted by the Windows
-  // sys::fs::rename implementation.
-  SmallString<128> TestDirectory;
-  ASSERT_NO_ERROR(
-      fs::createUniqueDirectory("ExistingTemp-test", TestDirectory));
-
-  SmallString<128> SourceFileName(TestDirectory);
-  path::append(SourceFileName, "source");
-
-  SmallString<128> TargetFileName(TestDirectory);
-  path::append(TargetFileName, "target");
-
-  SmallString<128> TargetTmp0FileName(TestDirectory);
-  path::append(TargetTmp0FileName, "target.tmp0");
-
-  SmallString<128> TargetTmp1FileName(TestDirectory);
-  path::append(TargetTmp1FileName, "target.tmp1");
-
-  ASSERT_NO_ERROR(CreateFileWithContent(SourceFileName, "!!source!!"));
-  ASSERT_NO_ERROR(CreateFileWithContent(TargetFileName, "!!target!!"));
-  ASSERT_NO_ERROR(CreateFileWithContent(TargetTmp0FileName, "!!target.tmp0!!"));
-
-  {
-    // Use mapped_file_region to make sure that the destination file is mmap'ed.
-    // This will cause SetInformationByHandle to fail when renaming to the
-    // destination, and we will follow the code path that tries to give target
-    // a temporary name.
-    int TargetFD;
-    std::error_code EC;
-    ASSERT_NO_ERROR(fs::openFileForRead(TargetFileName, TargetFD));
-    ScopedFD X(TargetFD);
-    sys::fs::mapped_file_region MFR(sys::fs::convertFDToNativeFile(TargetFD),
-                                    sys::fs::mapped_file_region::readonly, 10,
-                                    0, EC);
-    ASSERT_FALSE(EC);
-
-    ASSERT_NO_ERROR(fs::rename(SourceFileName, TargetFileName));
-
-#ifdef _WIN32
-    // Make sure that target was temporarily renamed to target.tmp1 on Windows.
-    // This is signified by a permission denied error as opposed to no such file
-    // or directory when trying to open it.
-    int Tmp1FD;
-    EXPECT_EQ(errc::permission_denied,
-              fs::openFileForRead(TargetTmp1FileName, Tmp1FD));
-#endif
-  }
-
-  EXPECT_TRUE(FileHasContent(TargetTmp0FileName, "!!target.tmp0!!"));
-
-  ASSERT_NO_ERROR(fs::remove(TargetFileName));
-  ASSERT_NO_ERROR(fs::remove(TargetTmp0FileName));
-  ASSERT_NO_ERROR(fs::remove(TestDirectory.str()));
-}
-
-}  // anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/Support/ReverseIterationTest.cpp b/gnu/llvm/llvm/unittests/Support/ReverseIterationTest.cpp
deleted file mode 100644
index 657368283ef..00000000000
--- a/gnu/llvm/llvm/unittests/Support/ReverseIterationTest.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//===- llvm/unittest/Support/ReverseIterationTest.cpp ---------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===---------------------------------------------------------------------===//
-//
-// Reverse Iteration unit tests.
-//
-//===---------------------------------------------------------------------===//
-
-#include "llvm/Support/ReverseIteration.h"
-#include "llvm/ADT/DenseMap.h"
-#include "llvm/ADT/DenseMapInfo.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-TEST(ReverseIterationTest, DenseMapTest1) {
-  static_assert(detail::IsPointerLike<int *>::value,
-                "int * is pointer-like");
-  static_assert(detail::IsPointerLike<uintptr_t>::value,
-                "uintptr_t is pointer-like");
-  static_assert(!detail::IsPointerLike<int>::value,
-                "int is not pointer-like");
-  static_assert(detail::IsPointerLike<void *>::value,
-                "void * is pointer-like");
-  struct IncompleteType;
-  static_assert(detail::IsPointerLike<IncompleteType *>::value,
-                "incomplete * is pointer-like");
-
-  // For a DenseMap with non-pointer-like keys, forward iteration equals
-  // reverse iteration.
-  DenseMap<int, int> Map;
-  int Keys[] = { 1, 2, 3, 4 };
-
-  // Insert keys into the DenseMap.
-  for (auto Key: Keys)
-    Map[Key] = 0;
-
-  // Note: This is the observed order of keys in the DenseMap.
-  // If there is any change in the behavior of the DenseMap, this order
-  // would need to be adjusted accordingly.
-  int IterKeys[] = { 2, 4, 1, 3 };
-
-  // Check that the DenseMap is iterated in the expected order.
-  for (auto Tuple : zip(Map, IterKeys))
-    ASSERT_EQ(std::get<0>(Tuple).first, std::get<1>(Tuple));
-
-  // Check operator++ (post-increment).
-  int i = 0;
-  for (auto iter = Map.begin(), end = Map.end(); iter != end; iter++, ++i)
-    ASSERT_EQ(iter->first, IterKeys[i]);
-}
-
-// Define a pointer-like int.
-struct PtrLikeInt { int value; };
-
-namespace llvm {
-
-template<> struct DenseMapInfo<PtrLikeInt *> {
-  static PtrLikeInt *getEmptyKey() {
-    static PtrLikeInt EmptyKey;
-    return &EmptyKey;
-  }
-
-  static PtrLikeInt *getTombstoneKey() {
-    static PtrLikeInt TombstoneKey;
-    return &TombstoneKey;
-  }
-
-  static int getHashValue(const PtrLikeInt *P) {
-    return P->value;
-  }
-
-  static bool isEqual(const PtrLikeInt *LHS, const PtrLikeInt *RHS) {
-    return LHS == RHS;
-  }
-};
-
-} // end namespace llvm
-
-TEST(ReverseIterationTest, DenseMapTest2) {
-  static_assert(detail::IsPointerLike<PtrLikeInt *>::value,
-                "PtrLikeInt * is pointer-like");
-
-  PtrLikeInt a = {4}, b = {8}, c = {12}, d = {16};
-  PtrLikeInt *Keys[] = { &a, &b, &c, &d };
-
-  // Insert keys into the DenseMap.
-  DenseMap<PtrLikeInt *, int> Map;
-  for (auto *Key : Keys)
-    Map[Key] = Key->value;
-
-  // Note: If there is any change in the behavior of the DenseMap,
-  // the observed order of keys would need to be adjusted accordingly.
-  if (shouldReverseIterate<PtrLikeInt *>())
-    std::reverse(&Keys[0], &Keys[4]);
-
-  // Check that the DenseMap is iterated in the expected order.
-  for (auto Tuple : zip(Map, Keys))
-    ASSERT_EQ(std::get<0>(Tuple).second, std::get<1>(Tuple)->value);
-
-  // Check operator++ (post-increment).
-  int i = 0;
-  for (auto iter = Map.begin(), end = Map.end(); iter != end; iter++, ++i)
-    ASSERT_EQ(iter->second, Keys[i]->value);
-}
diff --git a/gnu/llvm/llvm/unittests/Support/SHA256.cpp b/gnu/llvm/llvm/unittests/Support/SHA256.cpp
deleted file mode 100644
index 82359a7177b..00000000000
--- a/gnu/llvm/llvm/unittests/Support/SHA256.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-//===- llvm/unittest/Support/SHA256Test.cpp - SHA256 tests
-//----------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements unit tests for the SHA256 functions.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/SHA256.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/SmallString.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-static std::string toHex(StringRef Input) {
-  static const char *const LUT = "0123456789abcdef";
-  size_t Length = Input.size();
-
-  std::string Output;
-  Output.reserve(2 * Length);
-  for (size_t i = 0; i < Length; ++i) {
-    const unsigned char c = Input[i];
-    Output.push_back(LUT[c >> 4]);
-    Output.push_back(LUT[c & 15]);
-  }
-  return Output;
-}
-
-/// Tests an arbitrary set of bytes passed as \p Input.
-void TestSHA256Sum(ArrayRef<uint8_t> Input, StringRef Final) {
-  SHA256 Hash;
-  Hash.update(Input);
-  auto hash = Hash.final();
-  auto hashStr = toHex(hash);
-  EXPECT_EQ(hashStr, Final);
-}
-
-using KV = std::pair<const char *, const char *>;
-
-TEST(SHA256Test, SHA256) {
-  std::array<KV, 5> testvectors{
-      KV{"",
-         "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"},
-      KV{"a",
-         "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb"},
-      KV{"abc",
-         "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad"},
-      KV{"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
-         "248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1"},
-      KV{"abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklm"
-         "nopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu",
-         "cf5b16a778af8380036ce59e7b0492370b249b11e8f07a51afac45037afee9d1"}};
-
-  for (auto input_expected : testvectors) {
-    auto str = std::get<0>(input_expected);
-    auto expected = std::get<1>(input_expected);
-    TestSHA256Sum({reinterpret_cast<const uint8_t *>(str), strlen(str)},
-                  expected);
-  }
-
-  std::string rep(1000, 'a');
-  SHA256 Hash;
-  for (int i = 0; i < 1000; ++i) {
-    Hash.update({reinterpret_cast<const uint8_t *>(rep.data()), rep.size()});
-  }
-  auto hash = Hash.final();
-  auto hashStr = toHex(hash);
-  EXPECT_EQ(hashStr,
-            "cdc76e5c9914fb9281a1c7e284d73e67f1809a48a497200e046d39ccc7112cd0");
-}
-
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/Support/ScaledNumberTest.cpp b/gnu/llvm/llvm/unittests/Support/ScaledNumberTest.cpp
deleted file mode 100644
index 82ecce09444..00000000000
--- a/gnu/llvm/llvm/unittests/Support/ScaledNumberTest.cpp
+++ /dev/null
@@ -1,568 +0,0 @@
-//===- llvm/unittest/Support/ScaledNumberTest.cpp - ScaledPair tests -----==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/ScaledNumber.h"
-#include "llvm/Support/DataTypes.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::ScaledNumbers;
-
-namespace {
-
-template <class UIntT> struct ScaledPair {
-  UIntT D;
-  int S;
-  ScaledPair(const std::pair<UIntT, int16_t> &F) : D(F.first), S(F.second) {}
-  ScaledPair(UIntT D, int S) : D(D), S(S) {}
-
-  bool operator==(const ScaledPair<UIntT> &X) const {
-    return D == X.D && S == X.S;
-  }
-};
-template <class UIntT>
-bool operator==(const std::pair<UIntT, int16_t> &L,
-                const ScaledPair<UIntT> &R) {
-  return ScaledPair<UIntT>(L) == R;
-}
-template <class UIntT>
-void PrintTo(const ScaledPair<UIntT> &F, ::std::ostream *os) {
-  *os << F.D << "*2^" << F.S;
-}
-
-typedef ScaledPair<uint32_t> SP32;
-typedef ScaledPair<uint64_t> SP64;
-
-TEST(ScaledNumberHelpersTest, getRounded) {
-  EXPECT_EQ(getRounded32(0, 0, false), SP32(0, 0));
-  EXPECT_EQ(getRounded32(0, 0, true), SP32(1, 0));
-  EXPECT_EQ(getRounded32(20, 21, true), SP32(21, 21));
-  EXPECT_EQ(getRounded32(UINT32_MAX, 0, false), SP32(UINT32_MAX, 0));
-  EXPECT_EQ(getRounded32(UINT32_MAX, 0, true), SP32(1 << 31, 1));
-
-  EXPECT_EQ(getRounded64(0, 0, false), SP64(0, 0));
-  EXPECT_EQ(getRounded64(0, 0, true), SP64(1, 0));
-  EXPECT_EQ(getRounded64(20, 21, true), SP64(21, 21));
-  EXPECT_EQ(getRounded64(UINT32_MAX, 0, false), SP64(UINT32_MAX, 0));
-  EXPECT_EQ(getRounded64(UINT32_MAX, 0, true), SP64(UINT64_C(1) << 32, 0));
-  EXPECT_EQ(getRounded64(UINT64_MAX, 0, false), SP64(UINT64_MAX, 0));
-  EXPECT_EQ(getRounded64(UINT64_MAX, 0, true), SP64(UINT64_C(1) << 63, 1));
-}
-
-TEST(ScaledNumberHelpersTest, getAdjusted) {
-  const uint64_t Max32In64 = UINT32_MAX;
-  EXPECT_EQ(getAdjusted32(0), SP32(0, 0));
-  EXPECT_EQ(getAdjusted32(0, 5), SP32(0, 5));
-  EXPECT_EQ(getAdjusted32(UINT32_MAX), SP32(UINT32_MAX, 0));
-  EXPECT_EQ(getAdjusted32(Max32In64 << 1), SP32(UINT32_MAX, 1));
-  EXPECT_EQ(getAdjusted32(Max32In64 << 1, 1), SP32(UINT32_MAX, 2));
-  EXPECT_EQ(getAdjusted32(Max32In64 << 31), SP32(UINT32_MAX, 31));
-  EXPECT_EQ(getAdjusted32(Max32In64 << 32), SP32(UINT32_MAX, 32));
-  EXPECT_EQ(getAdjusted32(Max32In64 + 1), SP32(1u << 31, 1));
-  EXPECT_EQ(getAdjusted32(UINT64_MAX), SP32(1u << 31, 33));
-
-  EXPECT_EQ(getAdjusted64(0), SP64(0, 0));
-  EXPECT_EQ(getAdjusted64(0, 5), SP64(0, 5));
-  EXPECT_EQ(getAdjusted64(UINT32_MAX), SP64(UINT32_MAX, 0));
-  EXPECT_EQ(getAdjusted64(Max32In64 << 1), SP64(Max32In64 << 1, 0));
-  EXPECT_EQ(getAdjusted64(Max32In64 << 1, 1), SP64(Max32In64 << 1, 1));
-  EXPECT_EQ(getAdjusted64(Max32In64 << 31), SP64(Max32In64 << 31, 0));
-  EXPECT_EQ(getAdjusted64(Max32In64 << 32), SP64(Max32In64 << 32, 0));
-  EXPECT_EQ(getAdjusted64(Max32In64 + 1), SP64(Max32In64 + 1, 0));
-  EXPECT_EQ(getAdjusted64(UINT64_MAX), SP64(UINT64_MAX, 0));
-}
-
-TEST(ScaledNumberHelpersTest, getProduct) {
-  // Zero.
-  EXPECT_EQ(SP32(0, 0), getProduct32(0, 0));
-  EXPECT_EQ(SP32(0, 0), getProduct32(0, 1));
-  EXPECT_EQ(SP32(0, 0), getProduct32(0, 33));
-
-  // Basic.
-  EXPECT_EQ(SP32(6, 0), getProduct32(2, 3));
-  EXPECT_EQ(SP32(UINT16_MAX / 3 * UINT16_MAX / 5 * 2, 0),
-            getProduct32(UINT16_MAX / 3, UINT16_MAX / 5 * 2));
-
-  // Overflow, no loss of precision.
-  // ==> 0xf00010 * 0x1001
-  // ==> 0xf00f00000 + 0x10010
-  // ==> 0xf00f10010
-  // ==> 0xf00f1001 * 2^4
-  EXPECT_EQ(SP32(0xf00f1001, 4), getProduct32(0xf00010, 0x1001));
-
-  // Overflow, loss of precision, rounds down.
-  // ==> 0xf000070 * 0x1001
-  // ==> 0xf00f000000 + 0x70070
-  // ==> 0xf00f070070
-  // ==> 0xf00f0700 * 2^8
-  EXPECT_EQ(SP32(0xf00f0700, 8), getProduct32(0xf000070, 0x1001));
-
-  // Overflow, loss of precision, rounds up.
-  // ==> 0xf000080 * 0x1001
-  // ==> 0xf00f000000 + 0x80080
-  // ==> 0xf00f080080
-  // ==> 0xf00f0801 * 2^8
-  EXPECT_EQ(SP32(0xf00f0801, 8), getProduct32(0xf000080, 0x1001));
-
-  // Reverse operand order.
-  EXPECT_EQ(SP32(0, 0), getProduct32(1, 0));
-  EXPECT_EQ(SP32(0, 0), getProduct32(33, 0));
-  EXPECT_EQ(SP32(6, 0), getProduct32(3, 2));
-  EXPECT_EQ(SP32(UINT16_MAX / 3 * UINT16_MAX / 5 * 2, 0),
-            getProduct32(UINT16_MAX / 5 * 2, UINT16_MAX / 3));
-  EXPECT_EQ(SP32(0xf00f1001, 4), getProduct32(0x1001, 0xf00010));
-  EXPECT_EQ(SP32(0xf00f0700, 8), getProduct32(0x1001, 0xf000070));
-  EXPECT_EQ(SP32(0xf00f0801, 8), getProduct32(0x1001, 0xf000080));
-
-  // Round to overflow.
-  EXPECT_EQ(SP64(UINT64_C(1) << 63, 64),
-            getProduct64(UINT64_C(10376293541461622786),
-                         UINT64_C(16397105843297379211)));
-
-  // Big number with rounding.
-  EXPECT_EQ(SP64(UINT64_C(9223372036854775810), 64),
-            getProduct64(UINT64_C(18446744073709551556),
-                         UINT64_C(9223372036854775840)));
-}
-
-TEST(ScaledNumberHelpersTest, getQuotient) {
-  // Zero.
-  EXPECT_EQ(SP32(0, 0), getQuotient32(0, 0));
-  EXPECT_EQ(SP32(0, 0), getQuotient32(0, 1));
-  EXPECT_EQ(SP32(0, 0), getQuotient32(0, 73));
-  EXPECT_EQ(SP32(UINT32_MAX, MaxScale), getQuotient32(1, 0));
-  EXPECT_EQ(SP32(UINT32_MAX, MaxScale), getQuotient32(6, 0));
-
-  // Powers of two.
-  EXPECT_EQ(SP32(1u << 31, -31), getQuotient32(1, 1));
-  EXPECT_EQ(SP32(1u << 31, -30), getQuotient32(2, 1));
-  EXPECT_EQ(SP32(1u << 31, -33), getQuotient32(4, 16));
-  EXPECT_EQ(SP32(7u << 29, -29), getQuotient32(7, 1));
-  EXPECT_EQ(SP32(7u << 29, -30), getQuotient32(7, 2));
-  EXPECT_EQ(SP32(7u << 29, -33), getQuotient32(7, 16));
-
-  // Divide evenly.
-  EXPECT_EQ(SP32(3u << 30, -30), getQuotient32(9, 3));
-  EXPECT_EQ(SP32(9u << 28, -28), getQuotient32(63, 7));
-
-  // Divide unevenly.
-  EXPECT_EQ(SP32(0xaaaaaaab, -33), getQuotient32(1, 3));
-  EXPECT_EQ(SP32(0xd5555555, -31), getQuotient32(5, 3));
-
-  // 64-bit division is hard to test, since divide64 doesn't canonicalize its
-  // output.  However, this is the algorithm the implementation uses:
-  //
-  // - Shift divisor right.
-  // - If we have 1 (power of 2), return early -- not canonicalized.
-  // - Shift dividend left.
-  // - 64-bit integer divide.
-  // - If there's a remainder, continue with long division.
-  //
-  // TODO: require less knowledge about the implementation in the test.
-
-  // Zero.
-  EXPECT_EQ(SP64(0, 0), getQuotient64(0, 0));
-  EXPECT_EQ(SP64(0, 0), getQuotient64(0, 1));
-  EXPECT_EQ(SP64(0, 0), getQuotient64(0, 73));
-  EXPECT_EQ(SP64(UINT64_MAX, MaxScale), getQuotient64(1, 0));
-  EXPECT_EQ(SP64(UINT64_MAX, MaxScale), getQuotient64(6, 0));
-
-  // Powers of two.
-  EXPECT_EQ(SP64(1, 0), getQuotient64(1, 1));
-  EXPECT_EQ(SP64(2, 0), getQuotient64(2, 1));
-  EXPECT_EQ(SP64(4, -4), getQuotient64(4, 16));
-  EXPECT_EQ(SP64(7, 0), getQuotient64(7, 1));
-  EXPECT_EQ(SP64(7, -1), getQuotient64(7, 2));
-  EXPECT_EQ(SP64(7, -4), getQuotient64(7, 16));
-
-  // Divide evenly.
-  EXPECT_EQ(SP64(UINT64_C(3) << 60, -60), getQuotient64(9, 3));
-  EXPECT_EQ(SP64(UINT64_C(9) << 58, -58), getQuotient64(63, 7));
-
-  // Divide unevenly.
-  EXPECT_EQ(SP64(0xaaaaaaaaaaaaaaab, -65), getQuotient64(1, 3));
-  EXPECT_EQ(SP64(0xd555555555555555, -63), getQuotient64(5, 3));
-}
-
-TEST(ScaledNumberHelpersTest, getLg) {
-  EXPECT_EQ(0, getLg(UINT32_C(1), 0));
-  EXPECT_EQ(1, getLg(UINT32_C(1), 1));
-  EXPECT_EQ(1, getLg(UINT32_C(2), 0));
-  EXPECT_EQ(3, getLg(UINT32_C(1), 3));
-  EXPECT_EQ(3, getLg(UINT32_C(7), 0));
-  EXPECT_EQ(3, getLg(UINT32_C(8), 0));
-  EXPECT_EQ(3, getLg(UINT32_C(9), 0));
-  EXPECT_EQ(3, getLg(UINT32_C(64), -3));
-  EXPECT_EQ(31, getLg((UINT32_MAX >> 1) + 2, 0));
-  EXPECT_EQ(32, getLg(UINT32_MAX, 0));
-  EXPECT_EQ(-1, getLg(UINT32_C(1), -1));
-  EXPECT_EQ(-1, getLg(UINT32_C(2), -2));
-  EXPECT_EQ(INT32_MIN, getLg(UINT32_C(0), -1));
-  EXPECT_EQ(INT32_MIN, getLg(UINT32_C(0), 0));
-  EXPECT_EQ(INT32_MIN, getLg(UINT32_C(0), 1));
-
-  EXPECT_EQ(0, getLg(UINT64_C(1), 0));
-  EXPECT_EQ(1, getLg(UINT64_C(1), 1));
-  EXPECT_EQ(1, getLg(UINT64_C(2), 0));
-  EXPECT_EQ(3, getLg(UINT64_C(1), 3));
-  EXPECT_EQ(3, getLg(UINT64_C(7), 0));
-  EXPECT_EQ(3, getLg(UINT64_C(8), 0));
-  EXPECT_EQ(3, getLg(UINT64_C(9), 0));
-  EXPECT_EQ(3, getLg(UINT64_C(64), -3));
-  EXPECT_EQ(63, getLg((UINT64_MAX >> 1) + 2, 0));
-  EXPECT_EQ(64, getLg(UINT64_MAX, 0));
-  EXPECT_EQ(-1, getLg(UINT64_C(1), -1));
-  EXPECT_EQ(-1, getLg(UINT64_C(2), -2));
-  EXPECT_EQ(INT32_MIN, getLg(UINT64_C(0), -1));
-  EXPECT_EQ(INT32_MIN, getLg(UINT64_C(0), 0));
-  EXPECT_EQ(INT32_MIN, getLg(UINT64_C(0), 1));
-}
-
-TEST(ScaledNumberHelpersTest, getLgFloor) {
-  EXPECT_EQ(0, getLgFloor(UINT32_C(1), 0));
-  EXPECT_EQ(1, getLgFloor(UINT32_C(1), 1));
-  EXPECT_EQ(1, getLgFloor(UINT32_C(2), 0));
-  EXPECT_EQ(2, getLgFloor(UINT32_C(7), 0));
-  EXPECT_EQ(3, getLgFloor(UINT32_C(1), 3));
-  EXPECT_EQ(3, getLgFloor(UINT32_C(8), 0));
-  EXPECT_EQ(3, getLgFloor(UINT32_C(9), 0));
-  EXPECT_EQ(3, getLgFloor(UINT32_C(64), -3));
-  EXPECT_EQ(31, getLgFloor((UINT32_MAX >> 1) + 2, 0));
-  EXPECT_EQ(31, getLgFloor(UINT32_MAX, 0));
-  EXPECT_EQ(INT32_MIN, getLgFloor(UINT32_C(0), -1));
-  EXPECT_EQ(INT32_MIN, getLgFloor(UINT32_C(0), 0));
-  EXPECT_EQ(INT32_MIN, getLgFloor(UINT32_C(0), 1));
-
-  EXPECT_EQ(0, getLgFloor(UINT64_C(1), 0));
-  EXPECT_EQ(1, getLgFloor(UINT64_C(1), 1));
-  EXPECT_EQ(1, getLgFloor(UINT64_C(2), 0));
-  EXPECT_EQ(2, getLgFloor(UINT64_C(7), 0));
-  EXPECT_EQ(3, getLgFloor(UINT64_C(1), 3));
-  EXPECT_EQ(3, getLgFloor(UINT64_C(8), 0));
-  EXPECT_EQ(3, getLgFloor(UINT64_C(9), 0));
-  EXPECT_EQ(3, getLgFloor(UINT64_C(64), -3));
-  EXPECT_EQ(63, getLgFloor((UINT64_MAX >> 1) + 2, 0));
-  EXPECT_EQ(63, getLgFloor(UINT64_MAX, 0));
-  EXPECT_EQ(INT32_MIN, getLgFloor(UINT64_C(0), -1));
-  EXPECT_EQ(INT32_MIN, getLgFloor(UINT64_C(0), 0));
-  EXPECT_EQ(INT32_MIN, getLgFloor(UINT64_C(0), 1));
-}
-
-TEST(ScaledNumberHelpersTest, getLgCeiling) {
-  EXPECT_EQ(0, getLgCeiling(UINT32_C(1), 0));
-  EXPECT_EQ(1, getLgCeiling(UINT32_C(1), 1));
-  EXPECT_EQ(1, getLgCeiling(UINT32_C(2), 0));
-  EXPECT_EQ(3, getLgCeiling(UINT32_C(1), 3));
-  EXPECT_EQ(3, getLgCeiling(UINT32_C(7), 0));
-  EXPECT_EQ(3, getLgCeiling(UINT32_C(8), 0));
-  EXPECT_EQ(3, getLgCeiling(UINT32_C(64), -3));
-  EXPECT_EQ(4, getLgCeiling(UINT32_C(9), 0));
-  EXPECT_EQ(32, getLgCeiling(UINT32_MAX, 0));
-  EXPECT_EQ(32, getLgCeiling((UINT32_MAX >> 1) + 2, 0));
-  EXPECT_EQ(INT32_MIN, getLgCeiling(UINT32_C(0), -1));
-  EXPECT_EQ(INT32_MIN, getLgCeiling(UINT32_C(0), 0));
-  EXPECT_EQ(INT32_MIN, getLgCeiling(UINT32_C(0), 1));
-
-  EXPECT_EQ(0, getLgCeiling(UINT64_C(1), 0));
-  EXPECT_EQ(1, getLgCeiling(UINT64_C(1), 1));
-  EXPECT_EQ(1, getLgCeiling(UINT64_C(2), 0));
-  EXPECT_EQ(3, getLgCeiling(UINT64_C(1), 3));
-  EXPECT_EQ(3, getLgCeiling(UINT64_C(7), 0));
-  EXPECT_EQ(3, getLgCeiling(UINT64_C(8), 0));
-  EXPECT_EQ(3, getLgCeiling(UINT64_C(64), -3));
-  EXPECT_EQ(4, getLgCeiling(UINT64_C(9), 0));
-  EXPECT_EQ(64, getLgCeiling((UINT64_MAX >> 1) + 2, 0));
-  EXPECT_EQ(64, getLgCeiling(UINT64_MAX, 0));
-  EXPECT_EQ(INT32_MIN, getLgCeiling(UINT64_C(0), -1));
-  EXPECT_EQ(INT32_MIN, getLgCeiling(UINT64_C(0), 0));
-  EXPECT_EQ(INT32_MIN, getLgCeiling(UINT64_C(0), 1));
-}
-
-TEST(ScaledNumberHelpersTest, compare) {
-  EXPECT_EQ(0, compare(UINT32_C(0), 0, UINT32_C(0), 1));
-  EXPECT_EQ(0, compare(UINT32_C(0), 0, UINT32_C(0), -10));
-  EXPECT_EQ(0, compare(UINT32_C(0), 0, UINT32_C(0), 20));
-  EXPECT_EQ(0, compare(UINT32_C(8), 0, UINT32_C(64), -3));
-  EXPECT_EQ(0, compare(UINT32_C(8), 0, UINT32_C(32), -2));
-  EXPECT_EQ(0, compare(UINT32_C(8), 0, UINT32_C(16), -1));
-  EXPECT_EQ(0, compare(UINT32_C(8), 0, UINT32_C(8), 0));
-  EXPECT_EQ(0, compare(UINT32_C(8), 0, UINT32_C(4), 1));
-  EXPECT_EQ(0, compare(UINT32_C(8), 0, UINT32_C(2), 2));
-  EXPECT_EQ(0, compare(UINT32_C(8), 0, UINT32_C(1), 3));
-  EXPECT_EQ(-1, compare(UINT32_C(0), 0, UINT32_C(1), 3));
-  EXPECT_EQ(-1, compare(UINT32_C(7), 0, UINT32_C(1), 3));
-  EXPECT_EQ(-1, compare(UINT32_C(7), 0, UINT32_C(64), -3));
-  EXPECT_EQ(1, compare(UINT32_C(9), 0, UINT32_C(1), 3));
-  EXPECT_EQ(1, compare(UINT32_C(9), 0, UINT32_C(64), -3));
-  EXPECT_EQ(1, compare(UINT32_C(9), 0, UINT32_C(0), 0));
-
-  EXPECT_EQ(0, compare(UINT64_C(0), 0, UINT64_C(0), 1));
-  EXPECT_EQ(0, compare(UINT64_C(0), 0, UINT64_C(0), -10));
-  EXPECT_EQ(0, compare(UINT64_C(0), 0, UINT64_C(0), 20));
-  EXPECT_EQ(0, compare(UINT64_C(8), 0, UINT64_C(64), -3));
-  EXPECT_EQ(0, compare(UINT64_C(8), 0, UINT64_C(32), -2));
-  EXPECT_EQ(0, compare(UINT64_C(8), 0, UINT64_C(16), -1));
-  EXPECT_EQ(0, compare(UINT64_C(8), 0, UINT64_C(8), 0));
-  EXPECT_EQ(0, compare(UINT64_C(8), 0, UINT64_C(4), 1));
-  EXPECT_EQ(0, compare(UINT64_C(8), 0, UINT64_C(2), 2));
-  EXPECT_EQ(0, compare(UINT64_C(8), 0, UINT64_C(1), 3));
-  EXPECT_EQ(-1, compare(UINT64_C(0), 0, UINT64_C(1), 3));
-  EXPECT_EQ(-1, compare(UINT64_C(7), 0, UINT64_C(1), 3));
-  EXPECT_EQ(-1, compare(UINT64_C(7), 0, UINT64_C(64), -3));
-  EXPECT_EQ(1, compare(UINT64_C(9), 0, UINT64_C(1), 3));
-  EXPECT_EQ(1, compare(UINT64_C(9), 0, UINT64_C(64), -3));
-  EXPECT_EQ(1, compare(UINT64_C(9), 0, UINT64_C(0), 0));
-  EXPECT_EQ(-1, compare(UINT64_MAX, 0, UINT64_C(1), 64));
-}
-
-TEST(ScaledNumberHelpersTest, matchScales) {
-#define MATCH_SCALES(T, LDIn, LSIn, RDIn, RSIn, LDOut, RDOut, SOut)            \
-  do {                                                                         \
-    T LDx = LDIn;                                                              \
-    T RDx = RDIn;                                                              \
-    T LDy = LDOut;                                                             \
-    T RDy = RDOut;                                                             \
-    int16_t LSx = LSIn;                                                        \
-    int16_t RSx = RSIn;                                                        \
-    int16_t Sy = SOut;                                                         \
-                                                                               \
-    EXPECT_EQ(SOut, matchScales(LDx, LSx, RDx, RSx));                          \
-    EXPECT_EQ(LDy, LDx);                                                       \
-    EXPECT_EQ(RDy, RDx);                                                       \
-    if (LDy) {                                                                 \
-      EXPECT_EQ(Sy, LSx);                                                      \
-    }                                                                          \
-    if (RDy) {                                                                 \
-      EXPECT_EQ(Sy, RSx);                                                      \
-    }                                                                          \
-  } while (false)
-
-  MATCH_SCALES(uint32_t, 0, 0, 0, 0, 0, 0, 0);
-  MATCH_SCALES(uint32_t, 0, 50, 7, 1, 0, 7, 1);
-  MATCH_SCALES(uint32_t, UINT32_C(1) << 31, 1, 9, 0, UINT32_C(1) << 31, 4, 1);
-  MATCH_SCALES(uint32_t, UINT32_C(1) << 31, 2, 9, 0, UINT32_C(1) << 31, 2, 2);
-  MATCH_SCALES(uint32_t, UINT32_C(1) << 31, 3, 9, 0, UINT32_C(1) << 31, 1, 3);
-  MATCH_SCALES(uint32_t, UINT32_C(1) << 31, 4, 9, 0, UINT32_C(1) << 31, 0, 4);
-  MATCH_SCALES(uint32_t, UINT32_C(1) << 30, 4, 9, 0, UINT32_C(1) << 31, 1, 3);
-  MATCH_SCALES(uint32_t, UINT32_C(1) << 29, 4, 9, 0, UINT32_C(1) << 31, 2, 2);
-  MATCH_SCALES(uint32_t, UINT32_C(1) << 28, 4, 9, 0, UINT32_C(1) << 31, 4, 1);
-  MATCH_SCALES(uint32_t, UINT32_C(1) << 27, 4, 9, 0, UINT32_C(1) << 31, 9, 0);
-  MATCH_SCALES(uint32_t, 7, 1, 0, 50, 7, 0, 1);
-  MATCH_SCALES(uint32_t, 9, 0, UINT32_C(1) << 31, 1, 4, UINT32_C(1) << 31, 1);
-  MATCH_SCALES(uint32_t, 9, 0, UINT32_C(1) << 31, 2, 2, UINT32_C(1) << 31, 2);
-  MATCH_SCALES(uint32_t, 9, 0, UINT32_C(1) << 31, 3, 1, UINT32_C(1) << 31, 3);
-  MATCH_SCALES(uint32_t, 9, 0, UINT32_C(1) << 31, 4, 0, UINT32_C(1) << 31, 4);
-  MATCH_SCALES(uint32_t, 9, 0, UINT32_C(1) << 30, 4, 1, UINT32_C(1) << 31, 3);
-  MATCH_SCALES(uint32_t, 9, 0, UINT32_C(1) << 29, 4, 2, UINT32_C(1) << 31, 2);
-  MATCH_SCALES(uint32_t, 9, 0, UINT32_C(1) << 28, 4, 4, UINT32_C(1) << 31, 1);
-  MATCH_SCALES(uint32_t, 9, 0, UINT32_C(1) << 27, 4, 9, UINT32_C(1) << 31, 0);
-
-  MATCH_SCALES(uint64_t, 0, 0, 0, 0, 0, 0, 0);
-  MATCH_SCALES(uint64_t, 0, 100, 7, 1, 0, 7, 1);
-  MATCH_SCALES(uint64_t, UINT64_C(1) << 63, 1, 9, 0, UINT64_C(1) << 63, 4, 1);
-  MATCH_SCALES(uint64_t, UINT64_C(1) << 63, 2, 9, 0, UINT64_C(1) << 63, 2, 2);
-  MATCH_SCALES(uint64_t, UINT64_C(1) << 63, 3, 9, 0, UINT64_C(1) << 63, 1, 3);
-  MATCH_SCALES(uint64_t, UINT64_C(1) << 63, 4, 9, 0, UINT64_C(1) << 63, 0, 4);
-  MATCH_SCALES(uint64_t, UINT64_C(1) << 62, 4, 9, 0, UINT64_C(1) << 63, 1, 3);
-  MATCH_SCALES(uint64_t, UINT64_C(1) << 61, 4, 9, 0, UINT64_C(1) << 63, 2, 2);
-  MATCH_SCALES(uint64_t, UINT64_C(1) << 60, 4, 9, 0, UINT64_C(1) << 63, 4, 1);
-  MATCH_SCALES(uint64_t, UINT64_C(1) << 59, 4, 9, 0, UINT64_C(1) << 63, 9, 0);
-  MATCH_SCALES(uint64_t, 7, 1, 0, 100, 7, 0, 1);
-  MATCH_SCALES(uint64_t, 9, 0, UINT64_C(1) << 63, 1, 4, UINT64_C(1) << 63, 1);
-  MATCH_SCALES(uint64_t, 9, 0, UINT64_C(1) << 63, 2, 2, UINT64_C(1) << 63, 2);
-  MATCH_SCALES(uint64_t, 9, 0, UINT64_C(1) << 63, 3, 1, UINT64_C(1) << 63, 3);
-  MATCH_SCALES(uint64_t, 9, 0, UINT64_C(1) << 63, 4, 0, UINT64_C(1) << 63, 4);
-  MATCH_SCALES(uint64_t, 9, 0, UINT64_C(1) << 62, 4, 1, UINT64_C(1) << 63, 3);
-  MATCH_SCALES(uint64_t, 9, 0, UINT64_C(1) << 61, 4, 2, UINT64_C(1) << 63, 2);
-  MATCH_SCALES(uint64_t, 9, 0, UINT64_C(1) << 60, 4, 4, UINT64_C(1) << 63, 1);
-  MATCH_SCALES(uint64_t, 9, 0, UINT64_C(1) << 59, 4, 9, UINT64_C(1) << 63, 0);
-}
-
-TEST(ScaledNumberHelpersTest, getSum) {
-  // Zero.
-  EXPECT_EQ(SP32(1, 0), getSum32(0, 0, 1, 0));
-  EXPECT_EQ(SP32(8, -3), getSum32(0, 0, 8, -3));
-  EXPECT_EQ(SP32(UINT32_MAX, 0), getSum32(0, 0, UINT32_MAX, 0));
-
-  // Basic.
-  EXPECT_EQ(SP32(2, 0), getSum32(1, 0, 1, 0));
-  EXPECT_EQ(SP32(3, 0), getSum32(1, 0, 2, 0));
-  EXPECT_EQ(SP32(67, 0), getSum32(7, 0, 60, 0));
-
-  // Different scales.
-  EXPECT_EQ(SP32(3, 0), getSum32(1, 0, 1, 1));
-  EXPECT_EQ(SP32(4, 0), getSum32(2, 0, 1, 1));
-
-  // Loss of precision.
-  EXPECT_EQ(SP32(UINT32_C(1) << 31, 1), getSum32(1, 32, 1, 0));
-  EXPECT_EQ(SP32(UINT32_C(1) << 31, -31), getSum32(1, -32, 1, 0));
-
-  // Not quite loss of precision.
-  EXPECT_EQ(SP32((UINT32_C(1) << 31) + 1, 1), getSum32(1, 32, 1, 1));
-  EXPECT_EQ(SP32((UINT32_C(1) << 31) + 1, -32), getSum32(1, -32, 1, -1));
-
-  // Overflow.
-  EXPECT_EQ(SP32(UINT32_C(1) << 31, 1), getSum32(1, 0, UINT32_MAX, 0));
-
-  // Reverse operand order.
-  EXPECT_EQ(SP32(1, 0), getSum32(1, 0, 0, 0));
-  EXPECT_EQ(SP32(8, -3), getSum32(8, -3, 0, 0));
-  EXPECT_EQ(SP32(UINT32_MAX, 0), getSum32(UINT32_MAX, 0, 0, 0));
-  EXPECT_EQ(SP32(3, 0), getSum32(2, 0, 1, 0));
-  EXPECT_EQ(SP32(67, 0), getSum32(60, 0, 7, 0));
-  EXPECT_EQ(SP32(3, 0), getSum32(1, 1, 1, 0));
-  EXPECT_EQ(SP32(4, 0), getSum32(1, 1, 2, 0));
-  EXPECT_EQ(SP32(UINT32_C(1) << 31, 1), getSum32(1, 0, 1, 32));
-  EXPECT_EQ(SP32(UINT32_C(1) << 31, -31), getSum32(1, 0, 1, -32));
-  EXPECT_EQ(SP32((UINT32_C(1) << 31) + 1, 1), getSum32(1, 1, 1, 32));
-  EXPECT_EQ(SP32((UINT32_C(1) << 31) + 1, -32), getSum32(1, -1, 1, -32));
-  EXPECT_EQ(SP32(UINT32_C(1) << 31, 1), getSum32(UINT32_MAX, 0, 1, 0));
-
-  // Zero.
-  EXPECT_EQ(SP64(1, 0), getSum64(0, 0, 1, 0));
-  EXPECT_EQ(SP64(8, -3), getSum64(0, 0, 8, -3));
-  EXPECT_EQ(SP64(UINT64_MAX, 0), getSum64(0, 0, UINT64_MAX, 0));
-
-  // Basic.
-  EXPECT_EQ(SP64(2, 0), getSum64(1, 0, 1, 0));
-  EXPECT_EQ(SP64(3, 0), getSum64(1, 0, 2, 0));
-  EXPECT_EQ(SP64(67, 0), getSum64(7, 0, 60, 0));
-
-  // Different scales.
-  EXPECT_EQ(SP64(3, 0), getSum64(1, 0, 1, 1));
-  EXPECT_EQ(SP64(4, 0), getSum64(2, 0, 1, 1));
-
-  // Loss of precision.
-  EXPECT_EQ(SP64(UINT64_C(1) << 63, 1), getSum64(1, 64, 1, 0));
-  EXPECT_EQ(SP64(UINT64_C(1) << 63, -63), getSum64(1, -64, 1, 0));
-
-  // Not quite loss of precision.
-  EXPECT_EQ(SP64((UINT64_C(1) << 63) + 1, 1), getSum64(1, 64, 1, 1));
-  EXPECT_EQ(SP64((UINT64_C(1) << 63) + 1, -64), getSum64(1, -64, 1, -1));
-
-  // Overflow.
-  EXPECT_EQ(SP64(UINT64_C(1) << 63, 1), getSum64(1, 0, UINT64_MAX, 0));
-
-  // Reverse operand order.
-  EXPECT_EQ(SP64(1, 0), getSum64(1, 0, 0, 0));
-  EXPECT_EQ(SP64(8, -3), getSum64(8, -3, 0, 0));
-  EXPECT_EQ(SP64(UINT64_MAX, 0), getSum64(UINT64_MAX, 0, 0, 0));
-  EXPECT_EQ(SP64(3, 0), getSum64(2, 0, 1, 0));
-  EXPECT_EQ(SP64(67, 0), getSum64(60, 0, 7, 0));
-  EXPECT_EQ(SP64(3, 0), getSum64(1, 1, 1, 0));
-  EXPECT_EQ(SP64(4, 0), getSum64(1, 1, 2, 0));
-  EXPECT_EQ(SP64(UINT64_C(1) << 63, 1), getSum64(1, 0, 1, 64));
-  EXPECT_EQ(SP64(UINT64_C(1) << 63, -63), getSum64(1, 0, 1, -64));
-  EXPECT_EQ(SP64((UINT64_C(1) << 63) + 1, 1), getSum64(1, 1, 1, 64));
-  EXPECT_EQ(SP64((UINT64_C(1) << 63) + 1, -64), getSum64(1, -1, 1, -64));
-  EXPECT_EQ(SP64(UINT64_C(1) << 63, 1), getSum64(UINT64_MAX, 0, 1, 0));
-}
-
-TEST(ScaledNumberHelpersTest, getDifference) {
-  // Basic.
-  EXPECT_EQ(SP32(0, 0), getDifference32(1, 0, 1, 0));
-  EXPECT_EQ(SP32(1, 0), getDifference32(2, 0, 1, 0));
-  EXPECT_EQ(SP32(53, 0), getDifference32(60, 0, 7, 0));
-
-  // Equals "0", different scales.
-  EXPECT_EQ(SP32(0, 0), getDifference32(2, 0, 1, 1));
-
-  // Subtract "0".
-  EXPECT_EQ(SP32(1, 0), getDifference32(1, 0, 0, 0));
-  EXPECT_EQ(SP32(8, -3), getDifference32(8, -3, 0, 0));
-  EXPECT_EQ(SP32(UINT32_MAX, 0), getDifference32(UINT32_MAX, 0, 0, 0));
-
-  // Loss of precision.
-  EXPECT_EQ(SP32((UINT32_C(1) << 31) + 1, 1),
-            getDifference32((UINT32_C(1) << 31) + 1, 1, 1, 0));
-  EXPECT_EQ(SP32((UINT32_C(1) << 31) + 1, -31),
-            getDifference32((UINT32_C(1) << 31) + 1, -31, 1, -32));
-
-  // Not quite loss of precision.
-  EXPECT_EQ(SP32(UINT32_MAX, 0), getDifference32(1, 32, 1, 0));
-  EXPECT_EQ(SP32(UINT32_MAX, -32), getDifference32(1, 0, 1, -32));
-
-  // Saturate to "0".
-  EXPECT_EQ(SP32(0, 0), getDifference32(0, 0, 1, 0));
-  EXPECT_EQ(SP32(0, 0), getDifference32(0, 0, 8, -3));
-  EXPECT_EQ(SP32(0, 0), getDifference32(0, 0, UINT32_MAX, 0));
-  EXPECT_EQ(SP32(0, 0), getDifference32(7, 0, 60, 0));
-  EXPECT_EQ(SP32(0, 0), getDifference32(1, 0, 1, 1));
-  EXPECT_EQ(SP32(0, 0), getDifference32(1, -32, 1, 0));
-  EXPECT_EQ(SP32(0, 0), getDifference32(1, -32, 1, -1));
-
-  // Regression tests for cases that failed during bringup.
-  EXPECT_EQ(SP32(UINT32_C(1) << 26, -31),
-            getDifference32(1, 0, UINT32_C(31) << 27, -32));
-
-  // Basic.
-  EXPECT_EQ(SP64(0, 0), getDifference64(1, 0, 1, 0));
-  EXPECT_EQ(SP64(1, 0), getDifference64(2, 0, 1, 0));
-  EXPECT_EQ(SP64(53, 0), getDifference64(60, 0, 7, 0));
-
-  // Equals "0", different scales.
-  EXPECT_EQ(SP64(0, 0), getDifference64(2, 0, 1, 1));
-
-  // Subtract "0".
-  EXPECT_EQ(SP64(1, 0), getDifference64(1, 0, 0, 0));
-  EXPECT_EQ(SP64(8, -3), getDifference64(8, -3, 0, 0));
-  EXPECT_EQ(SP64(UINT64_MAX, 0), getDifference64(UINT64_MAX, 0, 0, 0));
-
-  // Loss of precision.
-  EXPECT_EQ(SP64((UINT64_C(1) << 63) + 1, 1),
-            getDifference64((UINT64_C(1) << 63) + 1, 1, 1, 0));
-  EXPECT_EQ(SP64((UINT64_C(1) << 63) + 1, -63),
-            getDifference64((UINT64_C(1) << 63) + 1, -63, 1, -64));
-
-  // Not quite loss of precision.
-  EXPECT_EQ(SP64(UINT64_MAX, 0), getDifference64(1, 64, 1, 0));
-  EXPECT_EQ(SP64(UINT64_MAX, -64), getDifference64(1, 0, 1, -64));
-
-  // Saturate to "0".
-  EXPECT_EQ(SP64(0, 0), getDifference64(0, 0, 1, 0));
-  EXPECT_EQ(SP64(0, 0), getDifference64(0, 0, 8, -3));
-  EXPECT_EQ(SP64(0, 0), getDifference64(0, 0, UINT64_MAX, 0));
-  EXPECT_EQ(SP64(0, 0), getDifference64(7, 0, 60, 0));
-  EXPECT_EQ(SP64(0, 0), getDifference64(1, 0, 1, 1));
-  EXPECT_EQ(SP64(0, 0), getDifference64(1, -64, 1, 0));
-  EXPECT_EQ(SP64(0, 0), getDifference64(1, -64, 1, -1));
-}
-
-TEST(ScaledNumberHelpersTest, arithmeticOperators) {
-  EXPECT_EQ(ScaledNumber<uint32_t>(10, 0),
-            ScaledNumber<uint32_t>(1, 3) + ScaledNumber<uint32_t>(1, 1));
-  EXPECT_EQ(ScaledNumber<uint32_t>(6, 0),
-            ScaledNumber<uint32_t>(1, 3) - ScaledNumber<uint32_t>(1, 1));
-  EXPECT_EQ(ScaledNumber<uint32_t>(2, 3),
-            ScaledNumber<uint32_t>(1, 3) * ScaledNumber<uint32_t>(1, 1));
-  EXPECT_EQ(ScaledNumber<uint32_t>(1, 2),
-            ScaledNumber<uint32_t>(1, 3) / ScaledNumber<uint32_t>(1, 1));
-  EXPECT_EQ(ScaledNumber<uint32_t>(1, 2), ScaledNumber<uint32_t>(1, 3) >> 1);
-  EXPECT_EQ(ScaledNumber<uint32_t>(1, 4), ScaledNumber<uint32_t>(1, 3) << 1);
-
-  EXPECT_EQ(ScaledNumber<uint64_t>(10, 0),
-            ScaledNumber<uint64_t>(1, 3) + ScaledNumber<uint64_t>(1, 1));
-  EXPECT_EQ(ScaledNumber<uint64_t>(6, 0),
-            ScaledNumber<uint64_t>(1, 3) - ScaledNumber<uint64_t>(1, 1));
-  EXPECT_EQ(ScaledNumber<uint64_t>(2, 3),
-            ScaledNumber<uint64_t>(1, 3) * ScaledNumber<uint64_t>(1, 1));
-  EXPECT_EQ(ScaledNumber<uint64_t>(1, 2),
-            ScaledNumber<uint64_t>(1, 3) / ScaledNumber<uint64_t>(1, 1));
-  EXPECT_EQ(ScaledNumber<uint64_t>(1, 2), ScaledNumber<uint64_t>(1, 3) >> 1);
-  EXPECT_EQ(ScaledNumber<uint64_t>(1, 4), ScaledNumber<uint64_t>(1, 3) << 1);
-}
-
-TEST(ScaledNumberHelpersTest, toIntBug) {
-  ScaledNumber<uint32_t> n(1, 0);
-  EXPECT_EQ(1u, (n * n).toInt<uint32_t>());
-}
-
-static_assert(std::is_trivially_copyable<ScaledNumber<uint32_t>>::value,
-              "trivially copyable");
-
-} // end namespace
diff --git a/gnu/llvm/llvm/unittests/Support/SourceMgrTest.cpp b/gnu/llvm/llvm/unittests/Support/SourceMgrTest.cpp
deleted file mode 100644
index a3079a403a1..00000000000
--- a/gnu/llvm/llvm/unittests/Support/SourceMgrTest.cpp
+++ /dev/null
@@ -1,498 +0,0 @@
-//===- unittests/Support/SourceMgrTest.cpp - SourceMgr tests --------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/SourceMgr.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-class SourceMgrTest : public testing::Test {
-public:
-  SourceMgr SM;
-  unsigned MainBufferID;
-  std::string Output;
-
-  void setMainBuffer(StringRef Text, StringRef BufferName) {
-    std::unique_ptr<MemoryBuffer> MainBuffer =
-        MemoryBuffer::getMemBuffer(Text, BufferName);
-    MainBufferID = SM.AddNewSourceBuffer(std::move(MainBuffer), llvm::SMLoc());
-  }
-
-  SMLoc getLoc(unsigned Offset) {
-    return SMLoc::getFromPointer(
-        SM.getMemoryBuffer(MainBufferID)->getBufferStart() + Offset);
-  }
-
-  SMRange getRange(unsigned Offset, unsigned Length) {
-    return SMRange(getLoc(Offset), getLoc(Offset + Length));
-  }
-
-  void printMessage(SMLoc Loc, SourceMgr::DiagKind Kind,
-                    const Twine &Msg, ArrayRef<SMRange> Ranges,
-                    ArrayRef<SMFixIt> FixIts) {
-    raw_string_ostream OS(Output);
-    SM.PrintMessage(OS, Loc, Kind, Msg, Ranges, FixIts);
-  }
-};
-
-} // unnamed namespace
-
-TEST_F(SourceMgrTest, BasicError) {
-  setMainBuffer("aaa bbb\nccc ddd\n", "file.in");
-  printMessage(getLoc(4), SourceMgr::DK_Error, "message", None, None);
-
-  EXPECT_EQ("file.in:1:5: error: message\n"
-            "aaa bbb\n"
-            "    ^\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, BasicWarning) {
-  setMainBuffer("aaa bbb\nccc ddd\n", "file.in");
-  printMessage(getLoc(4), SourceMgr::DK_Warning, "message", None, None);
-
-  EXPECT_EQ("file.in:1:5: warning: message\n"
-            "aaa bbb\n"
-            "    ^\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, BasicRemark) {
-  setMainBuffer("aaa bbb\nccc ddd\n", "file.in");
-  printMessage(getLoc(4), SourceMgr::DK_Remark, "message", None, None);
-
-  EXPECT_EQ("file.in:1:5: remark: message\n"
-            "aaa bbb\n"
-            "    ^\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, BasicNote) {
-  setMainBuffer("aaa bbb\nccc ddd\n", "file.in");
-  printMessage(getLoc(4), SourceMgr::DK_Note, "message", None, None);
-
-  EXPECT_EQ("file.in:1:5: note: message\n"
-            "aaa bbb\n"
-            "    ^\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, LocationAtEndOfLine) {
-  setMainBuffer("aaa bbb\nccc ddd\n", "file.in");
-  printMessage(getLoc(6), SourceMgr::DK_Error, "message", None, None);
-
-  EXPECT_EQ("file.in:1:7: error: message\n"
-            "aaa bbb\n"
-            "      ^\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, LocationAtNewline) {
-  setMainBuffer("aaa bbb\nccc ddd\n", "file.in");
-  printMessage(getLoc(7), SourceMgr::DK_Error, "message", None, None);
-
-  EXPECT_EQ("file.in:1:8: error: message\n"
-            "aaa bbb\n"
-            "       ^\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, LocationAtEmptyBuffer) {
-  setMainBuffer("", "file.in");
-  printMessage(getLoc(0), SourceMgr::DK_Error, "message", None, None);
-
-  EXPECT_EQ("file.in:1:1: error: message\n"
-            "\n"
-            "^\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, LocationJustOnSoleNewline) {
-  setMainBuffer("\n", "file.in");
-  printMessage(getLoc(0), SourceMgr::DK_Error, "message", None, None);
-
-  EXPECT_EQ("file.in:1:1: error: message\n"
-            "\n"
-            "^\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, LocationJustAfterSoleNewline) {
-  setMainBuffer("\n", "file.in");
-  printMessage(getLoc(1), SourceMgr::DK_Error, "message", None, None);
-
-  EXPECT_EQ("file.in:2:1: error: message\n"
-            "\n"
-            "^\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, LocationJustAfterNonNewline) {
-  setMainBuffer("123", "file.in");
-  printMessage(getLoc(3), SourceMgr::DK_Error, "message", None, None);
-
-  EXPECT_EQ("file.in:1:4: error: message\n"
-            "123\n"
-            "   ^\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, LocationOnFirstLineOfMultiline) {
-  setMainBuffer("1234\n6789\n", "file.in");
-  printMessage(getLoc(3), SourceMgr::DK_Error, "message", None, None);
-
-  EXPECT_EQ("file.in:1:4: error: message\n"
-            "1234\n"
-            "   ^\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, LocationOnEOLOfFirstLineOfMultiline) {
-  setMainBuffer("1234\n6789\n", "file.in");
-  printMessage(getLoc(4), SourceMgr::DK_Error, "message", None, None);
-
-  EXPECT_EQ("file.in:1:5: error: message\n"
-            "1234\n"
-            "    ^\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, LocationOnSecondLineOfMultiline) {
-  setMainBuffer("1234\n6789\n", "file.in");
-  printMessage(getLoc(5), SourceMgr::DK_Error, "message", None, None);
-
-  EXPECT_EQ("file.in:2:1: error: message\n"
-            "6789\n"
-            "^\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, LocationOnSecondLineOfMultilineNoSecondEOL) {
-  setMainBuffer("1234\n6789", "file.in");
-  printMessage(getLoc(5), SourceMgr::DK_Error, "message", None, None);
-
-  EXPECT_EQ("file.in:2:1: error: message\n"
-            "6789\n"
-            "^\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, LocationOnEOLOfSecondSecondLineOfMultiline) {
-  setMainBuffer("1234\n6789\n", "file.in");
-  printMessage(getLoc(9), SourceMgr::DK_Error, "message", None, None);
-
-  EXPECT_EQ("file.in:2:5: error: message\n"
-            "6789\n"
-            "    ^\n",
-            Output);
-}
-
-#define STRING_LITERAL_253_BYTES \
-  "1234567890\n1234567890\n" \
-  "1234567890\n1234567890\n" \
-  "1234567890\n1234567890\n" \
-  "1234567890\n1234567890\n" \
-  "1234567890\n1234567890\n" \
-  "1234567890\n1234567890\n" \
-  "1234567890\n1234567890\n" \
-  "1234567890\n1234567890\n" \
-  "1234567890\n1234567890\n" \
-  "1234567890\n1234567890\n" \
-  "1234567890\n1234567890\n" \
-  "1234567890\n"
-
-//===----------------------------------------------------------------------===//
-// 255-byte buffer tests
-//===----------------------------------------------------------------------===//
-
-TEST_F(SourceMgrTest, LocationBeforeEndOf255ByteBuffer) {
-  setMainBuffer(STRING_LITERAL_253_BYTES   // first 253 bytes
-                "12"                       // + 2 = 255 bytes
-                , "file.in");
-  printMessage(getLoc(253), SourceMgr::DK_Error, "message", None, None);
-  EXPECT_EQ("file.in:24:1: error: message\n"
-            "12\n"
-            "^\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, LocationAtEndOf255ByteBuffer) {
-  setMainBuffer(STRING_LITERAL_253_BYTES   // first 253 bytes
-                "12"                       // + 2 = 255 bytes
-                , "file.in");
-  printMessage(getLoc(254), SourceMgr::DK_Error, "message", None, None);
-  EXPECT_EQ("file.in:24:2: error: message\n"
-            "12\n"
-            " ^\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, LocationPastEndOf255ByteBuffer) {
-  setMainBuffer(STRING_LITERAL_253_BYTES   // first 253 bytes
-                "12"                       // + 2 = 255 bytes
-                , "file.in");
-  printMessage(getLoc(255), SourceMgr::DK_Error, "message", None, None);
-  EXPECT_EQ("file.in:24:3: error: message\n"
-            "12\n"
-            "  ^\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, LocationBeforeEndOf255ByteBufferEndingInNewline) {
-  setMainBuffer(STRING_LITERAL_253_BYTES   // first 253 bytes
-                "1\n"                      // + 2 = 255 bytes
-                , "file.in");
-  printMessage(getLoc(253), SourceMgr::DK_Error, "message", None, None);
-  EXPECT_EQ("file.in:24:1: error: message\n"
-            "1\n"
-            "^\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, LocationAtEndOf255ByteBufferEndingInNewline) {
-  setMainBuffer(STRING_LITERAL_253_BYTES   // first 253 bytes
-                "1\n"                      // + 2 = 255 bytes
-                , "file.in");
-  printMessage(getLoc(254), SourceMgr::DK_Error, "message", None, None);
-  EXPECT_EQ("file.in:24:2: error: message\n"
-            "1\n"
-            " ^\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, LocationPastEndOf255ByteBufferEndingInNewline) {
-  setMainBuffer(STRING_LITERAL_253_BYTES   // first 253 bytes
-                "1\n"                      // + 2 = 255 bytes
-                , "file.in");
-  printMessage(getLoc(255), SourceMgr::DK_Error, "message", None, None);
-  EXPECT_EQ("file.in:25:1: error: message\n"
-            "\n"
-            "^\n",
-            Output);
-}
-
-//===----------------------------------------------------------------------===//
-// 256-byte buffer tests
-//===----------------------------------------------------------------------===//
-
-TEST_F(SourceMgrTest, LocationBeforeEndOf256ByteBuffer) {
-  setMainBuffer(STRING_LITERAL_253_BYTES   // first 253 bytes
-                "123"                      // + 3 = 256 bytes
-                , "file.in");
-  printMessage(getLoc(254), SourceMgr::DK_Error, "message", None, None);
-  EXPECT_EQ("file.in:24:2: error: message\n"
-            "123\n"
-            " ^\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, LocationAtEndOf256ByteBuffer) {
-  setMainBuffer(STRING_LITERAL_253_BYTES   // first 253 bytes
-                "123"                      // + 3 = 256 bytes
-                , "file.in");
-  printMessage(getLoc(255), SourceMgr::DK_Error, "message", None, None);
-  EXPECT_EQ("file.in:24:3: error: message\n"
-            "123\n"
-            "  ^\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, LocationPastEndOf256ByteBuffer) {
-  setMainBuffer(STRING_LITERAL_253_BYTES   // first 253 bytes
-                "123"                      // + 3 = 256 bytes
-                , "file.in");
-  printMessage(getLoc(256), SourceMgr::DK_Error, "message", None, None);
-  EXPECT_EQ("file.in:24:4: error: message\n"
-            "123\n"
-            "   ^\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, LocationBeforeEndOf256ByteBufferEndingInNewline) {
-  setMainBuffer(STRING_LITERAL_253_BYTES   // first 253 bytes
-                "12\n"                     // + 3 = 256 bytes
-                , "file.in");
-  printMessage(getLoc(254), SourceMgr::DK_Error, "message", None, None);
-  EXPECT_EQ("file.in:24:2: error: message\n"
-            "12\n"
-            " ^\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, LocationAtEndOf256ByteBufferEndingInNewline) {
-  setMainBuffer(STRING_LITERAL_253_BYTES   // first 253 bytes
-                "12\n"                     // + 3 = 256 bytes
-                , "file.in");
-  printMessage(getLoc(255), SourceMgr::DK_Error, "message", None, None);
-  EXPECT_EQ("file.in:24:3: error: message\n"
-            "12\n"
-            "  ^\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, LocationPastEndOf256ByteBufferEndingInNewline) {
-  setMainBuffer(STRING_LITERAL_253_BYTES   // first 253 bytes
-                "12\n"                     // + 3 = 256 bytes
-                , "file.in");
-  printMessage(getLoc(256), SourceMgr::DK_Error, "message", None, None);
-  EXPECT_EQ("file.in:25:1: error: message\n"
-            "\n"
-            "^\n",
-            Output);
-}
-
-//===----------------------------------------------------------------------===//
-// 257-byte buffer tests
-//===----------------------------------------------------------------------===//
-
-TEST_F(SourceMgrTest, LocationBeforeEndOf257ByteBuffer) {
-  setMainBuffer(STRING_LITERAL_253_BYTES   // first 253 bytes
-                "1234"                     // + 4 = 257 bytes
-                , "file.in");
-  printMessage(getLoc(255), SourceMgr::DK_Error, "message", None, None);
-  EXPECT_EQ("file.in:24:3: error: message\n"
-            "1234\n"
-            "  ^\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, LocationAtEndOf257ByteBuffer) {
-  setMainBuffer(STRING_LITERAL_253_BYTES   // first 253 bytes
-                "1234"                     // + 4 = 257 bytes
-                , "file.in");
-  printMessage(getLoc(256), SourceMgr::DK_Error, "message", None, None);
-  EXPECT_EQ("file.in:24:4: error: message\n"
-            "1234\n"
-            "   ^\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, LocationPastEndOf257ByteBuffer) {
-  setMainBuffer(STRING_LITERAL_253_BYTES   // first 253 bytes
-                "1234"                     // + 4 = 257 bytes
-                , "file.in");
-  printMessage(getLoc(257), SourceMgr::DK_Error, "message", None, None);
-  EXPECT_EQ("file.in:24:5: error: message\n"
-            "1234\n"
-            "    ^\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, LocationBeforeEndOf257ByteBufferEndingInNewline) {
-  setMainBuffer(STRING_LITERAL_253_BYTES   // first 253 bytes
-                "123\n"                    // + 4 = 257 bytes
-                , "file.in");
-  printMessage(getLoc(255), SourceMgr::DK_Error, "message", None, None);
-  EXPECT_EQ("file.in:24:3: error: message\n"
-            "123\n"
-            "  ^\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, LocationAtEndOf257ByteBufferEndingInNewline) {
-  setMainBuffer(STRING_LITERAL_253_BYTES   // first 253 bytes
-                "123\n"                    // + 4 = 257 bytes
-                , "file.in");
-  printMessage(getLoc(256), SourceMgr::DK_Error, "message", None, None);
-  EXPECT_EQ("file.in:24:4: error: message\n"
-            "123\n"
-            "   ^\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, LocationPastEndOf257ByteBufferEndingInNewline) {
-  setMainBuffer(STRING_LITERAL_253_BYTES   // first 253 bytes
-                "123\n"                    // + 4 = 257 bytes
-                , "file.in");
-  printMessage(getLoc(257), SourceMgr::DK_Error, "message", None, None);
-  EXPECT_EQ("file.in:25:1: error: message\n"
-            "\n"
-            "^\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, BasicRange) {
-  setMainBuffer("aaa bbb\nccc ddd\n", "file.in");
-  printMessage(getLoc(4), SourceMgr::DK_Error, "message", getRange(4, 3), None);
-
-  EXPECT_EQ("file.in:1:5: error: message\n"
-            "aaa bbb\n"
-            "    ^~~\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, RangeWithTab) {
-  setMainBuffer("aaa\tbbb\nccc ddd\n", "file.in");
-  printMessage(getLoc(4), SourceMgr::DK_Error, "message", getRange(3, 3), None);
-
-  EXPECT_EQ("file.in:1:5: error: message\n"
-            "aaa     bbb\n"
-            "   ~~~~~^~\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, MultiLineRange) {
-  setMainBuffer("aaa bbb\nccc ddd\n", "file.in");
-  printMessage(getLoc(4), SourceMgr::DK_Error, "message", getRange(4, 7), None);
-
-  EXPECT_EQ("file.in:1:5: error: message\n"
-            "aaa bbb\n"
-            "    ^~~\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, MultipleRanges) {
-  setMainBuffer("aaa bbb\nccc ddd\n", "file.in");
-  SMRange Ranges[] = { getRange(0, 3), getRange(4, 3) };
-  printMessage(getLoc(4), SourceMgr::DK_Error, "message", Ranges, None);
-
-  EXPECT_EQ("file.in:1:5: error: message\n"
-            "aaa bbb\n"
-            "~~~ ^~~\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, OverlappingRanges) {
-  setMainBuffer("aaa bbb\nccc ddd\n", "file.in");
-  SMRange Ranges[] = { getRange(0, 3), getRange(2, 4) };
-  printMessage(getLoc(4), SourceMgr::DK_Error, "message", Ranges, None);
-
-  EXPECT_EQ("file.in:1:5: error: message\n"
-            "aaa bbb\n"
-            "~~~~^~\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, BasicFixit) {
-  setMainBuffer("aaa bbb\nccc ddd\n", "file.in");
-  printMessage(getLoc(4), SourceMgr::DK_Error, "message", None,
-               makeArrayRef(SMFixIt(getRange(4, 3), "zzz")));
-
-  EXPECT_EQ("file.in:1:5: error: message\n"
-            "aaa bbb\n"
-            "    ^~~\n"
-            "    zzz\n",
-            Output);
-}
-
-TEST_F(SourceMgrTest, FixitForTab) {
-  setMainBuffer("aaa\tbbb\nccc ddd\n", "file.in");
-  printMessage(getLoc(3), SourceMgr::DK_Error, "message", None,
-               makeArrayRef(SMFixIt(getRange(3, 1), "zzz")));
-
-  EXPECT_EQ("file.in:1:4: error: message\n"
-            "aaa     bbb\n"
-            "   ^^^^^\n"
-            "   zzz\n",
-            Output);
-}
-
diff --git a/gnu/llvm/llvm/unittests/Support/SpecialCaseListTest.cpp b/gnu/llvm/llvm/unittests/Support/SpecialCaseListTest.cpp
deleted file mode 100644
index bee639df6a6..00000000000
--- a/gnu/llvm/llvm/unittests/Support/SpecialCaseListTest.cpp
+++ /dev/null
@@ -1,248 +0,0 @@
-//===- SpecialCaseListTest.cpp - Unit tests for SpecialCaseList -----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/SpecialCaseList.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/VirtualFileSystem.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-class SpecialCaseListTest : public ::testing::Test {
-protected:
-  std::unique_ptr<SpecialCaseList> makeSpecialCaseList(StringRef List,
-                                                       std::string &Error) {
-    std::unique_ptr<MemoryBuffer> MB = MemoryBuffer::getMemBuffer(List);
-    return SpecialCaseList::create(MB.get(), Error);
-  }
-
-  std::unique_ptr<SpecialCaseList> makeSpecialCaseList(StringRef List) {
-    std::string Error;
-    auto SCL = makeSpecialCaseList(List, Error);
-    assert(SCL);
-    assert(Error == "");
-    return SCL;
-  }
-
-  std::string makeSpecialCaseListFile(StringRef Contents) {
-    int FD;
-    SmallString<64> Path;
-    sys::fs::createTemporaryFile("SpecialCaseListTest", "temp", FD, Path);
-    raw_fd_ostream OF(FD, true, true);
-    OF << Contents;
-    OF.close();
-    return std::string(Path.str());
-  }
-};
-
-TEST_F(SpecialCaseListTest, Basic) {
-  std::unique_ptr<SpecialCaseList> SCL =
-      makeSpecialCaseList("# This is a comment.\n"
-                          "\n"
-                          "src:hello\n"
-                          "src:bye\n"
-                          "src:hi=category\n"
-                          "src:z*=category\n");
-  EXPECT_TRUE(SCL->inSection("", "src", "hello"));
-  EXPECT_TRUE(SCL->inSection("", "src", "bye"));
-  EXPECT_TRUE(SCL->inSection("", "src", "hi", "category"));
-  EXPECT_TRUE(SCL->inSection("", "src", "zzzz", "category"));
-  EXPECT_FALSE(SCL->inSection("", "src", "hi"));
-  EXPECT_FALSE(SCL->inSection("", "fun", "hello"));
-  EXPECT_FALSE(SCL->inSection("", "src", "hello", "category"));
-
-  EXPECT_EQ(3u, SCL->inSectionBlame("", "src", "hello"));
-  EXPECT_EQ(4u, SCL->inSectionBlame("", "src", "bye"));
-  EXPECT_EQ(5u, SCL->inSectionBlame("", "src", "hi", "category"));
-  EXPECT_EQ(6u, SCL->inSectionBlame("", "src", "zzzz", "category"));
-  EXPECT_EQ(0u, SCL->inSectionBlame("", "src", "hi"));
-  EXPECT_EQ(0u, SCL->inSectionBlame("", "fun", "hello"));
-  EXPECT_EQ(0u, SCL->inSectionBlame("", "src", "hello", "category"));
-}
-
-TEST_F(SpecialCaseListTest, CorrectErrorLineNumberWithBlankLine) {
-  std::string Error;
-  EXPECT_EQ(nullptr, makeSpecialCaseList("# This is a comment.\n"
-                                         "\n"
-                                         "[not valid\n",
-                                         Error));
-  EXPECT_TRUE(
-      ((StringRef)Error).startswith("malformed section header on line 3:"));
-
-  EXPECT_EQ(nullptr, makeSpecialCaseList("\n\n\n"
-                                         "[not valid\n",
-                                         Error));
-  EXPECT_TRUE(
-      ((StringRef)Error).startswith("malformed section header on line 4:"));
-}
-
-TEST_F(SpecialCaseListTest, SectionRegexErrorHandling) {
-  std::string Error;
-  EXPECT_EQ(makeSpecialCaseList("[address", Error), nullptr);
-  EXPECT_TRUE(((StringRef)Error).startswith("malformed section header "));
-
-  EXPECT_EQ(makeSpecialCaseList("[[]", Error), nullptr);
-  EXPECT_TRUE(((StringRef)Error).startswith("malformed regex for section [: "));
-
-  EXPECT_EQ(makeSpecialCaseList("src:=", Error), nullptr);
-  EXPECT_TRUE(((StringRef)Error).endswith("Supplied regexp was blank"));
-}
-
-TEST_F(SpecialCaseListTest, Section) {
-  std::unique_ptr<SpecialCaseList> SCL = makeSpecialCaseList("src:global\n"
-                                                             "[sect1|sect2]\n"
-                                                             "src:test1\n"
-                                                             "[sect3*]\n"
-                                                             "src:test2\n");
-  EXPECT_TRUE(SCL->inSection("arbitrary", "src", "global"));
-  EXPECT_TRUE(SCL->inSection("", "src", "global"));
-  EXPECT_TRUE(SCL->inSection("sect1", "src", "test1"));
-  EXPECT_FALSE(SCL->inSection("sect1-arbitrary", "src", "test1"));
-  EXPECT_FALSE(SCL->inSection("sect", "src", "test1"));
-  EXPECT_FALSE(SCL->inSection("sect1", "src", "test2"));
-  EXPECT_TRUE(SCL->inSection("sect2", "src", "test1"));
-  EXPECT_TRUE(SCL->inSection("sect3", "src", "test2"));
-  EXPECT_TRUE(SCL->inSection("sect3-arbitrary", "src", "test2"));
-  EXPECT_FALSE(SCL->inSection("", "src", "test1"));
-  EXPECT_FALSE(SCL->inSection("", "src", "test2"));
-}
-
-TEST_F(SpecialCaseListTest, GlobalInit) {
-  std::unique_ptr<SpecialCaseList> SCL =
-      makeSpecialCaseList("global:foo=init\n");
-  EXPECT_FALSE(SCL->inSection("", "global", "foo"));
-  EXPECT_FALSE(SCL->inSection("", "global", "bar"));
-  EXPECT_TRUE(SCL->inSection("", "global", "foo", "init"));
-  EXPECT_FALSE(SCL->inSection("", "global", "bar", "init"));
-
-  SCL = makeSpecialCaseList("type:t2=init\n");
-  EXPECT_FALSE(SCL->inSection("", "type", "t1"));
-  EXPECT_FALSE(SCL->inSection("", "type", "t2"));
-  EXPECT_FALSE(SCL->inSection("", "type", "t1", "init"));
-  EXPECT_TRUE(SCL->inSection("", "type", "t2", "init"));
-
-  SCL = makeSpecialCaseList("src:hello=init\n");
-  EXPECT_FALSE(SCL->inSection("", "src", "hello"));
-  EXPECT_FALSE(SCL->inSection("", "src", "bye"));
-  EXPECT_TRUE(SCL->inSection("", "src", "hello", "init"));
-  EXPECT_FALSE(SCL->inSection("", "src", "bye", "init"));
-}
-
-TEST_F(SpecialCaseListTest, Substring) {
-  std::unique_ptr<SpecialCaseList> SCL = makeSpecialCaseList("src:hello\n"
-                                                             "fun:foo\n"
-                                                             "global:bar\n");
-  EXPECT_FALSE(SCL->inSection("", "src", "othello"));
-  EXPECT_FALSE(SCL->inSection("", "fun", "tomfoolery"));
-  EXPECT_FALSE(SCL->inSection("", "global", "bartender"));
-
-  SCL = makeSpecialCaseList("fun:*foo*\n");
-  EXPECT_TRUE(SCL->inSection("", "fun", "tomfoolery"));
-  EXPECT_TRUE(SCL->inSection("", "fun", "foobar"));
-}
-
-TEST_F(SpecialCaseListTest, InvalidSpecialCaseList) {
-  std::string Error;
-  EXPECT_EQ(nullptr, makeSpecialCaseList("badline", Error));
-  EXPECT_EQ("malformed line 1: 'badline'", Error);
-  EXPECT_EQ(nullptr, makeSpecialCaseList("src:bad[a-", Error));
-  EXPECT_EQ("malformed regex in line 1: 'bad[a-': invalid character range",
-            Error);
-  EXPECT_EQ(nullptr, makeSpecialCaseList("src:a.c\n"
-                                   "fun:fun(a\n",
-                                   Error));
-  EXPECT_EQ("malformed regex in line 2: 'fun(a': parentheses not balanced",
-            Error);
-  std::vector<std::string> Files(1, "unexisting");
-  EXPECT_EQ(nullptr,
-            SpecialCaseList::create(Files, *vfs::getRealFileSystem(), Error));
-  EXPECT_EQ(0U, Error.find("can't open file 'unexisting':"));
-}
-
-TEST_F(SpecialCaseListTest, EmptySpecialCaseList) {
-  std::unique_ptr<SpecialCaseList> SCL = makeSpecialCaseList("");
-  EXPECT_FALSE(SCL->inSection("", "foo", "bar"));
-}
-
-TEST_F(SpecialCaseListTest, MultipleExclusions) {
-  std::vector<std::string> Files;
-  Files.push_back(makeSpecialCaseListFile("src:bar\n"
-                                          "src:*foo*\n"
-                                          "src:ban=init\n"));
-  Files.push_back(makeSpecialCaseListFile("src:baz\n"
-                                          "src:*fog*\n"));
-  auto SCL = SpecialCaseList::createOrDie(Files, *vfs::getRealFileSystem());
-  EXPECT_TRUE(SCL->inSection("", "src", "bar"));
-  EXPECT_TRUE(SCL->inSection("", "src", "baz"));
-  EXPECT_FALSE(SCL->inSection("", "src", "ban"));
-  EXPECT_TRUE(SCL->inSection("", "src", "ban", "init"));
-  EXPECT_TRUE(SCL->inSection("", "src", "tomfoolery"));
-  EXPECT_TRUE(SCL->inSection("", "src", "tomfoglery"));
-  for (auto &Path : Files)
-    sys::fs::remove(Path);
-}
-
-TEST_F(SpecialCaseListTest, NoTrigramsInRules) {
-  std::unique_ptr<SpecialCaseList> SCL = makeSpecialCaseList("fun:b.r\n"
-                                                             "fun:za*az\n");
-  EXPECT_TRUE(SCL->inSection("", "fun", "bar"));
-  EXPECT_FALSE(SCL->inSection("", "fun", "baz"));
-  EXPECT_TRUE(SCL->inSection("", "fun", "zakaz"));
-  EXPECT_FALSE(SCL->inSection("", "fun", "zaraza"));
-}
-
-TEST_F(SpecialCaseListTest, NoTrigramsInARule) {
-  std::unique_ptr<SpecialCaseList> SCL = makeSpecialCaseList("fun:*bar*\n"
-                                                             "fun:za*az\n");
-  EXPECT_TRUE(SCL->inSection("", "fun", "abara"));
-  EXPECT_FALSE(SCL->inSection("", "fun", "bor"));
-  EXPECT_TRUE(SCL->inSection("", "fun", "zakaz"));
-  EXPECT_FALSE(SCL->inSection("", "fun", "zaraza"));
-}
-
-TEST_F(SpecialCaseListTest, RepetitiveRule) {
-  std::unique_ptr<SpecialCaseList> SCL = makeSpecialCaseList("fun:*bar*bar*bar*bar*\n"
-                                                             "fun:bar*\n");
-  EXPECT_TRUE(SCL->inSection("", "fun", "bara"));
-  EXPECT_FALSE(SCL->inSection("", "fun", "abara"));
-  EXPECT_TRUE(SCL->inSection("", "fun", "barbarbarbar"));
-  EXPECT_TRUE(SCL->inSection("", "fun", "abarbarbarbar"));
-  EXPECT_FALSE(SCL->inSection("", "fun", "abarbarbar"));
-}
-
-TEST_F(SpecialCaseListTest, SpecialSymbolRule) {
-  std::unique_ptr<SpecialCaseList> SCL = makeSpecialCaseList("src:*c\\+\\+abi*\n");
-  EXPECT_TRUE(SCL->inSection("", "src", "c++abi"));
-  EXPECT_FALSE(SCL->inSection("", "src", "c\\+\\+abi"));
-}
-
-TEST_F(SpecialCaseListTest, PopularTrigram) {
-  std::unique_ptr<SpecialCaseList> SCL = makeSpecialCaseList("fun:*aaaaaa*\n"
-                                                             "fun:*aaaaa*\n"
-                                                             "fun:*aaaa*\n"
-                                                             "fun:*aaa*\n");
-  EXPECT_TRUE(SCL->inSection("", "fun", "aaa"));
-  EXPECT_TRUE(SCL->inSection("", "fun", "aaaa"));
-  EXPECT_TRUE(SCL->inSection("", "fun", "aaaabbbaaa"));
-}
-
-TEST_F(SpecialCaseListTest, EscapedSymbols) {
-  std::unique_ptr<SpecialCaseList> SCL = makeSpecialCaseList("src:*c\\+\\+abi*\n"
-                                                             "src:*hello\\\\world*\n");
-  EXPECT_TRUE(SCL->inSection("", "src", "dir/c++abi"));
-  EXPECT_FALSE(SCL->inSection("", "src", "dir/c\\+\\+abi"));
-  EXPECT_FALSE(SCL->inSection("", "src", "c\\+\\+abi"));
-  EXPECT_TRUE(SCL->inSection("", "src", "C:\\hello\\world"));
-  EXPECT_TRUE(SCL->inSection("", "src", "hello\\world"));
-  EXPECT_FALSE(SCL->inSection("", "src", "hello\\\\world"));
-}
-
-}
diff --git a/gnu/llvm/llvm/unittests/Support/SuffixTreeTest.cpp b/gnu/llvm/llvm/unittests/Support/SuffixTreeTest.cpp
deleted file mode 100644
index f5d8112ccf5..00000000000
--- a/gnu/llvm/llvm/unittests/Support/SuffixTreeTest.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-//===- unittests/Support/SuffixTreeTest.cpp - suffix tree tests -----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/SuffixTree.h"
-#include "gtest/gtest.h"
-#include <vector>
-
-using namespace llvm;
-
-namespace {
-
-// Each example vector has a unique element at the end to represent the end of
-// the string
-
-// Tests that The SuffixTree finds a simple repetition of the substring {1, 2}
-// {1, 2} twice in the provided string.
-TEST(SuffixTreeTest, TestSingleRepetition) {
-  std::vector<unsigned> SimpleRepetitionData = {1, 2, 1, 2, 3};
-  SuffixTree ST(SimpleRepetitionData);
-  std::vector<SuffixTree::RepeatedSubstring> SubStrings;
-  for (auto It = ST.begin(); It != ST.end(); It++)
-    SubStrings.push_back(*It);
-  ASSERT_EQ(SubStrings.size(), 1u);
-  EXPECT_EQ(SubStrings[0].Length, 2u);
-  EXPECT_EQ(SubStrings[0].StartIndices.size(), 2u);
-  for (unsigned StartIdx : SubStrings[0].StartIndices) {
-    EXPECT_EQ(SimpleRepetitionData[StartIdx], 1u);
-    EXPECT_EQ(SimpleRepetitionData[StartIdx + 1], 2u);
-  }
-}
-
-// Tests that the SuffixTree is able to find the substrings {1, 2, 3} at
-// at indices 0 and 3 as well as the substrings {2, 3} at indices 1 and 4.
-// This test also serves as a flag for improvements to the suffix tree.
-//
-// FIXME: Right now, the longest repeated substring from a specific index is
-// returned, this could be improved to return the longest repeated substring, as
-// well as those that are smaller.
-TEST(SuffixTreeTest, TestLongerRepetition) {
-  std::vector<unsigned> RepeatedRepetitionData = {1, 2, 3, 1, 2, 3, 4};
-  SuffixTree ST(RepeatedRepetitionData);
-  std::vector<SuffixTree::RepeatedSubstring> SubStrings;
-  for (auto It = ST.begin(); It != ST.end(); It++)
-    SubStrings.push_back(*It);
-  EXPECT_EQ(SubStrings.size(), 2u);
-  unsigned Len;
-  for (SuffixTree::RepeatedSubstring &RS : SubStrings) {
-    Len = RS.Length;
-    bool IsExpectedLen = (Len == 3u || Len == 2u);
-    bool IsExpectedIndex;
-    ASSERT_TRUE(IsExpectedLen);
-
-    if (Len == 3u) {
-      for (unsigned StartIdx : RS.StartIndices) {
-        IsExpectedIndex = (StartIdx == 0u || StartIdx == 3u);
-        EXPECT_TRUE(IsExpectedIndex);
-        EXPECT_EQ(RepeatedRepetitionData[StartIdx], 1u);
-        EXPECT_EQ(RepeatedRepetitionData[StartIdx + 1], 2u);
-        EXPECT_EQ(RepeatedRepetitionData[StartIdx + 2], 3u);
-      }
-    } else {
-      for (unsigned StartIdx : RS.StartIndices) {
-        IsExpectedIndex = (StartIdx == 1u || StartIdx == 4u);
-        EXPECT_TRUE(IsExpectedIndex);
-        EXPECT_EQ(RepeatedRepetitionData[StartIdx], 2u);
-        EXPECT_EQ(RepeatedRepetitionData[StartIdx + 1], 3u);
-      }
-    }
-  }
-}
-
-// Tests that the SuffixTree is able to find substring {1, 1, 1, 1, 1} at
-// indices 0 and 1.
-//
-// FIXME: Add support for detecting {1, 1} and {1, 1, 1}
-TEST(SuffixTreeTest, TestSingleCharacterRepeat) {
-  std::vector<unsigned> RepeatedRepetitionData = {1, 1, 1, 1, 1, 1, 2};
-  std::vector<unsigned>::iterator RRDIt, RRDIt2;
-  SuffixTree ST(RepeatedRepetitionData);
-  std::vector<SuffixTree::RepeatedSubstring> SubStrings;
-  for (auto It = ST.begin(); It != ST.end(); It++)
-    SubStrings.push_back(*It);
-  EXPECT_EQ(SubStrings.size(), 1u);
-  for (SuffixTree::RepeatedSubstring &RS : SubStrings) {
-    EXPECT_EQ(RS.StartIndices.size(),
-              RepeatedRepetitionData.size() - RS.Length);
-    for (unsigned StartIdx : SubStrings[0].StartIndices) {
-      RRDIt = RRDIt2 = RepeatedRepetitionData.begin();
-      std::advance(RRDIt, StartIdx);
-      std::advance(RRDIt2, StartIdx + SubStrings[0].Length);
-      ASSERT_TRUE(
-          all_of(make_range<std::vector<unsigned>::iterator>(RRDIt, RRDIt2),
-                 [](unsigned Elt) { return Elt == 1; }));
-    }
-  }
-}
-
-// The suffix tree cannot currently find repeated substrings in strings of the
-// form {1, 2, 3, 1, 2, 3}, because the two {1, 2, 3}s are adjacent ("tandem
-// repeats")
-//
-// FIXME: Teach the SuffixTree to recognize these cases.
-TEST(SuffixTreeTest, TestTandemRepeat) {
-  std::vector<unsigned> RepeatedRepetitionData = {1, 2, 3, 1, 2, 3};
-  SuffixTree ST(RepeatedRepetitionData);
-  std::vector<SuffixTree::RepeatedSubstring> SubStrings;
-  for (auto It = ST.begin(); It != ST.end(); It++)
-    SubStrings.push_back(*It);
-  EXPECT_EQ(SubStrings.size(), 0u);
-}
-
-// Tests that the SuffixTree does not erroneously include values that are not
-// in repeated substrings.  That is, only finds {1, 1} at indices 0 and 3 and
-// does not include 2 and 3.
-TEST(SuffixTreeTest, TestExclusion) {
-  std::vector<unsigned> RepeatedRepetitionData = {1, 1, 2, 1, 1, 3};
-  std::vector<unsigned>::iterator RRDIt, RRDIt2;
-  SuffixTree ST(RepeatedRepetitionData);
-  std::vector<SuffixTree::RepeatedSubstring> SubStrings;
-  for (auto It = ST.begin(); It != ST.end(); It++)
-    SubStrings.push_back(*It);
-  EXPECT_EQ(SubStrings.size(), 1u);
-  bool IsExpectedIndex;
-  for (SuffixTree::RepeatedSubstring &RS : SubStrings) {
-    for (unsigned StartIdx : RS.StartIndices) {
-      IsExpectedIndex = (StartIdx == 0u || StartIdx == 3u);
-      EXPECT_TRUE(IsExpectedIndex);
-      RRDIt = RRDIt2 = RepeatedRepetitionData.begin();
-      std::advance(RRDIt, StartIdx);
-      std::advance(RRDIt2, StartIdx + RS.Length);
-      EXPECT_TRUE(
-          all_of(make_range<std::vector<unsigned>::iterator>(RRDIt, RRDIt2),
-                 [](unsigned Elt) { return Elt == 1; }));
-    }
-  }
-}
-
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/Support/SwapByteOrderTest.cpp b/gnu/llvm/llvm/unittests/Support/SwapByteOrderTest.cpp
deleted file mode 100644
index 85392fad67e..00000000000
--- a/gnu/llvm/llvm/unittests/Support/SwapByteOrderTest.cpp
+++ /dev/null
@@ -1,210 +0,0 @@
-//===- unittests/Support/SwapByteOrderTest.cpp - swap byte order test -----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/SwapByteOrder.h"
-#include "gtest/gtest.h"
-#include <cstdlib>
-#include <ctime>
-using namespace llvm;
-
-#undef max
-
-namespace {
-
-TEST(ByteSwap, Swap_32) {
-  EXPECT_EQ(0x44332211u, ByteSwap_32(0x11223344));
-  EXPECT_EQ(0xDDCCBBAAu, ByteSwap_32(0xAABBCCDD));
-}
-
-TEST(ByteSwap, Swap_64) {
-  EXPECT_EQ(0x8877665544332211ULL, ByteSwap_64(0x1122334455667788LL));
-  EXPECT_EQ(0x1100FFEEDDCCBBAAULL, ByteSwap_64(0xAABBCCDDEEFF0011LL));
-}
-
-// In these first two tests all of the original_uintx values are truncated
-// except for 64. We could avoid this, but there's really no point.
-
-TEST(getSwappedBytes, UnsignedRoundTrip) {
-  // The point of the bit twiddling of magic is to test with and without bits
-  // in every byte.
-  uint64_t value = 1;
-  for (std::size_t i = 0; i <= sizeof(value); ++i) {
-    uint8_t original_uint8 = static_cast<uint8_t>(value);
-    EXPECT_EQ(original_uint8,
-              sys::getSwappedBytes(sys::getSwappedBytes(original_uint8)));
-
-    uint16_t original_uint16 = static_cast<uint16_t>(value);
-    EXPECT_EQ(original_uint16,
-              sys::getSwappedBytes(sys::getSwappedBytes(original_uint16)));
-
-    uint32_t original_uint32 = static_cast<uint32_t>(value);
-    EXPECT_EQ(original_uint32,
-              sys::getSwappedBytes(sys::getSwappedBytes(original_uint32)));
-
-    uint64_t original_uint64 = static_cast<uint64_t>(value);
-    EXPECT_EQ(original_uint64,
-              sys::getSwappedBytes(sys::getSwappedBytes(original_uint64)));
-
-    value = (value << 8) | 0x55; // binary 0101 0101.
-  }
-}
-
-TEST(getSwappedBytes, SignedRoundTrip) {
-  // The point of the bit twiddling of magic is to test with and without bits
-  // in every byte.
-  uint64_t value = 1;
-  for (std::size_t i = 0; i <= sizeof(value); ++i) {
-    int8_t original_int8 = static_cast<int8_t>(value);
-    EXPECT_EQ(original_int8,
-              sys::getSwappedBytes(sys::getSwappedBytes(original_int8)));
-
-    int16_t original_int16 = static_cast<int16_t>(value);
-    EXPECT_EQ(original_int16,
-              sys::getSwappedBytes(sys::getSwappedBytes(original_int16)));
-
-    int32_t original_int32 = static_cast<int32_t>(value);
-    EXPECT_EQ(original_int32,
-              sys::getSwappedBytes(sys::getSwappedBytes(original_int32)));
-
-    int64_t original_int64 = static_cast<int64_t>(value);
-    EXPECT_EQ(original_int64,
-              sys::getSwappedBytes(sys::getSwappedBytes(original_int64)));
-
-    // Test other sign.
-    value *= -1;
-
-    original_int8 = static_cast<int8_t>(value);
-    EXPECT_EQ(original_int8,
-              sys::getSwappedBytes(sys::getSwappedBytes(original_int8)));
-
-    original_int16 = static_cast<int16_t>(value);
-    EXPECT_EQ(original_int16,
-              sys::getSwappedBytes(sys::getSwappedBytes(original_int16)));
-
-    original_int32 = static_cast<int32_t>(value);
-    EXPECT_EQ(original_int32,
-              sys::getSwappedBytes(sys::getSwappedBytes(original_int32)));
-
-    original_int64 = static_cast<int64_t>(value);
-    EXPECT_EQ(original_int64,
-              sys::getSwappedBytes(sys::getSwappedBytes(original_int64)));
-
-    // Return to normal sign and twiddle.
-    value *= -1;
-    value = (value << 8) | 0x55; // binary 0101 0101.
-  }
-}
-
-TEST(getSwappedBytes, uint8_t) {
-  EXPECT_EQ(uint8_t(0x11), sys::getSwappedBytes(uint8_t(0x11)));
-}
-
-TEST(getSwappedBytes, uint16_t) {
-  EXPECT_EQ(uint16_t(0x1122), sys::getSwappedBytes(uint16_t(0x2211)));
-}
-
-TEST(getSwappedBytes, uint32_t) {
-  EXPECT_EQ(uint32_t(0x11223344), sys::getSwappedBytes(uint32_t(0x44332211)));
-}
-
-TEST(getSwappedBytes, uint64_t) {
-  EXPECT_EQ(uint64_t(0x1122334455667788ULL),
-    sys::getSwappedBytes(uint64_t(0x8877665544332211ULL)));
-}
-
-TEST(getSwappedBytes, int8_t) {
-  EXPECT_EQ(int8_t(0x11), sys::getSwappedBytes(int8_t(0x11)));
-}
-
-TEST(getSwappedBytes, int16_t) {
-  EXPECT_EQ(int16_t(0x1122), sys::getSwappedBytes(int16_t(0x2211)));
-}
-
-TEST(getSwappedBytes, int32_t) {
-  EXPECT_EQ(int32_t(0x11223344), sys::getSwappedBytes(int32_t(0x44332211)));
-}
-
-TEST(getSwappedBytes, int64_t) {
-  EXPECT_EQ(int64_t(0x1122334455667788LL),
-    sys::getSwappedBytes(int64_t(0x8877665544332211LL)));
-}
-
-TEST(getSwappedBytes, float) {
-  EXPECT_EQ(1.79366203433576585078237386661e-43f, sys::getSwappedBytes(-0.0f));
-  // 0x11223344
-  EXPECT_EQ(7.1653228759765625e2f, sys::getSwappedBytes(1.2795344e-28f));
-}
-
-TEST(getSwappedBytes, double) {
-  EXPECT_EQ(6.32404026676795576546008054871e-322, sys::getSwappedBytes(-0.0));
-  // 0x1122334455667788
-  EXPECT_EQ(-7.08687663657301358331704585496e-268,
-    sys::getSwappedBytes(3.84141202447173065923064450234e-226));
-}
-
-TEST(swapByteOrder, uint8_t) {
-  uint8_t value = 0x11;
-  sys::swapByteOrder(value);
-  EXPECT_EQ(uint8_t(0x11), value);
-}
-
-TEST(swapByteOrder, uint16_t) {
-  uint16_t value = 0x2211;
-  sys::swapByteOrder(value);
-  EXPECT_EQ(uint16_t(0x1122), value);
-}
-
-TEST(swapByteOrder, uint32_t) {
-  uint32_t value = 0x44332211;
-  sys::swapByteOrder(value);
-  EXPECT_EQ(uint32_t(0x11223344), value);
-}
-
-TEST(swapByteOrder, uint64_t) {
-  uint64_t value = 0x8877665544332211ULL;
-  sys::swapByteOrder(value);
-  EXPECT_EQ(uint64_t(0x1122334455667788ULL), value);
-}
-
-TEST(swapByteOrder, int8_t) {
-  int8_t value = 0x11;
-  sys::swapByteOrder(value);
-  EXPECT_EQ(int8_t(0x11), value);
-}
-
-TEST(swapByteOrder, int16_t) {
-  int16_t value = 0x2211;
-  sys::swapByteOrder(value);
-  EXPECT_EQ(int16_t(0x1122), value);
-}
-
-TEST(swapByteOrder, int32_t) {
-  int32_t value = 0x44332211;
-  sys::swapByteOrder(value);
-  EXPECT_EQ(int32_t(0x11223344), value);
-}
-
-TEST(swapByteOrder, int64_t) {
-  int64_t value = 0x8877665544332211LL;
-  sys::swapByteOrder(value);
-  EXPECT_EQ(int64_t(0x1122334455667788LL), value);
-}
-
-TEST(swapByteOrder, float) {
-  float value = 7.1653228759765625e2f; // 0x44332211
-  sys::swapByteOrder(value);
-  EXPECT_EQ(1.2795344e-28f, value);
-}
-
-TEST(swapByteOrder, double) {
-  double value = -7.08687663657301358331704585496e-268; // 0x8877665544332211
-  sys::swapByteOrder(value);
-  EXPECT_EQ(3.84141202447173065923064450234e-226, value);
-}
-
-}
diff --git a/gnu/llvm/llvm/unittests/Support/SymbolRemappingReaderTest.cpp b/gnu/llvm/llvm/unittests/Support/SymbolRemappingReaderTest.cpp
deleted file mode 100644
index 6db4b2a6da1..00000000000
--- a/gnu/llvm/llvm/unittests/Support/SymbolRemappingReaderTest.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-//===- unittests/Support/SymbolRemappingReaderTest.cpp --------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/SymbolRemappingReader.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-class SymbolRemappingReaderTest : public testing::Test {
-public:
-  std::unique_ptr<MemoryBuffer> Buffer;
-  SymbolRemappingReader Reader;
-
-  std::string readWithErrors(StringRef Text, StringRef BufferName) {
-    Buffer = MemoryBuffer::getMemBuffer(Text, BufferName);
-    Error E = Reader.read(*Buffer);
-    EXPECT_TRUE((bool)E);
-    return toString(std::move(E));
-  }
-
-  void read(StringRef Text, StringRef BufferName) {
-    Buffer = MemoryBuffer::getMemBuffer(Text, BufferName);
-    Error E = Reader.read(*Buffer);
-    EXPECT_FALSE((bool)E);
-  }
-};
-} // unnamed namespace
-
-TEST_F(SymbolRemappingReaderTest, ParseErrors) {
-  EXPECT_EQ(readWithErrors("error", "foo.map"),
-            "foo.map:1: Expected 'kind mangled_name mangled_name', "
-            "found 'error'");
-
-  EXPECT_EQ(readWithErrors("error m1 m2", "foo.map"),
-            "foo.map:1: Invalid kind, expected 'name', 'type', or 'encoding', "
-            "found 'error'");
-}
-
-TEST_F(SymbolRemappingReaderTest, DemanglingErrors) {
-  EXPECT_EQ(readWithErrors("type i banana", "foo.map"),
-            "foo.map:1: Could not demangle 'banana' as a <type>; "
-            "invalid mangling?");
-  EXPECT_EQ(readWithErrors("name i 1X", "foo.map"),
-            "foo.map:1: Could not demangle 'i' as a <name>; "
-            "invalid mangling?");
-  EXPECT_EQ(readWithErrors("name 1X 1fv", "foo.map"),
-            "foo.map:1: Could not demangle '1fv' as a <name>; "
-            "invalid mangling?");
-  EXPECT_EQ(readWithErrors("encoding 1fv 1f1gE", "foo.map"),
-            "foo.map:1: Could not demangle '1f1gE' as a <encoding>; "
-            "invalid mangling?");
-}
-
-TEST_F(SymbolRemappingReaderTest, BadMappingOrder) {
-  StringRef Map = R"(
-    # N::foo == M::bar
-    name N1N3fooE N1M3barE
-
-    # N:: == M::
-    name 1N 1M
-  )";
-  EXPECT_EQ(readWithErrors(Map, "foo.map"),
-            "foo.map:6: Manglings '1N' and '1M' have both been used in prior "
-            "remappings. Move this remapping earlier in the file.");
-}
-
-TEST_F(SymbolRemappingReaderTest, RemappingsAdded) {
-  StringRef Map = R"(
-    # A::foo == B::bar
-    name N1A3fooE N1B3barE
-
-    # int == long
-    type i l
-
-    # void f<int>() = void g<int>()
-    encoding 1fIiEvv 1gIiEvv
-  )";
-
-  read(Map, "foo.map");
-  auto Key = Reader.insert("_ZN1B3bar3bazIiEEvv");
-  EXPECT_NE(Key, SymbolRemappingReader::Key());
-  EXPECT_EQ(Key, Reader.lookup("_ZN1A3foo3bazIlEEvv"));
-  EXPECT_NE(Key, Reader.lookup("_ZN1C3foo3bazIlEEvv"));
-
-  Key = Reader.insert("_Z1fIiEvv");
-  EXPECT_NE(Key, SymbolRemappingReader::Key());
-  EXPECT_EQ(Key, Reader.lookup("_Z1gIlEvv"));
-}
diff --git a/gnu/llvm/llvm/unittests/Support/TarWriterTest.cpp b/gnu/llvm/llvm/unittests/Support/TarWriterTest.cpp
deleted file mode 100644
index 5a7d901a2e9..00000000000
--- a/gnu/llvm/llvm/unittests/Support/TarWriterTest.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-//===- llvm/unittest/Support/TarWriterTest.cpp ----------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/TarWriter.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Testing/Support/SupportHelpers.h"
-#include "gtest/gtest.h"
-#include <vector>
-
-using namespace llvm;
-using llvm::unittest::TempFile;
-
-namespace {
-
-struct UstarHeader {
-  char Name[100];
-  char Mode[8];
-  char Uid[8];
-  char Gid[8];
-  char Size[12];
-  char Mtime[12];
-  char Checksum[8];
-  char TypeFlag;
-  char Linkname[100];
-  char Magic[6];
-  char Version[2];
-  char Uname[32];
-  char Gname[32];
-  char DevMajor[8];
-  char DevMinor[8];
-  char Prefix[155];
-  char Pad[12];
-};
-
-class TarWriterTest : public ::testing::Test {};
-
-static std::vector<uint8_t> createTar(StringRef Base, StringRef Filename) {
-  TempFile TarWriterTest("TarWriterTest", "tar", "", /*Unique*/ true);
-
-  // Create a tar file.
-  Expected<std::unique_ptr<TarWriter>> TarOrErr =
-      TarWriter::create(TarWriterTest.path(), Base);
-  EXPECT_TRUE((bool)TarOrErr);
-  std::unique_ptr<TarWriter> Tar = std::move(*TarOrErr);
-  Tar->append(Filename, "contents");
-  Tar.reset();
-
-  // Read the tar file.
-  ErrorOr<std::unique_ptr<MemoryBuffer>> MBOrErr =
-      MemoryBuffer::getFile(TarWriterTest.path());
-  EXPECT_TRUE((bool)MBOrErr);
-  std::unique_ptr<MemoryBuffer> MB = std::move(*MBOrErr);
-  std::vector<uint8_t> Buf((const uint8_t *)MB->getBufferStart(),
-                           (const uint8_t *)MB->getBufferEnd());
-
-  // Windows does not allow us to remove a mmap'ed files, so
-  // unmap first and then remove the temporary file.
-  MB = nullptr;
-
-  return Buf;
-}
-
-static UstarHeader createUstar(StringRef Base, StringRef Filename) {
-  std::vector<uint8_t> Buf = createTar(Base, Filename);
-  EXPECT_TRUE(Buf.size() >= sizeof(UstarHeader));
-  return *reinterpret_cast<const UstarHeader *>(Buf.data());
-}
-
-TEST_F(TarWriterTest, Basics) {
-  UstarHeader Hdr = createUstar("base", "file");
-  EXPECT_EQ("ustar", StringRef(Hdr.Magic));
-  EXPECT_EQ("00", StringRef(Hdr.Version, 2));
-  EXPECT_EQ("base/file", StringRef(Hdr.Name));
-  EXPECT_EQ("00000000010", StringRef(Hdr.Size));
-}
-
-TEST_F(TarWriterTest, LongFilename) {
-  // The prefix is prefixed by an additional '/' so it's one longer than the
-  // number of x's here.
-  std::string x136(136, 'x');
-  std::string x137(137, 'x');
-  std::string y99(99, 'y');
-  std::string y100(100, 'y');
-
-  UstarHeader Hdr1 = createUstar("", x136 + "/" + y99);
-  EXPECT_EQ("/" + x136, StringRef(Hdr1.Prefix));
-  EXPECT_EQ(y99, StringRef(Hdr1.Name));
-
-  UstarHeader Hdr2 = createUstar("", x137 + "/" + y99);
-  EXPECT_EQ("", StringRef(Hdr2.Prefix));
-  EXPECT_EQ("", StringRef(Hdr2.Name));
-
-  UstarHeader Hdr3 = createUstar("", x136 + "/" + y100);
-  EXPECT_EQ("", StringRef(Hdr3.Prefix));
-  EXPECT_EQ("", StringRef(Hdr3.Name));
-
-  UstarHeader Hdr4 = createUstar("", x137 + "/" + y100);
-  EXPECT_EQ("", StringRef(Hdr4.Prefix));
-  EXPECT_EQ("", StringRef(Hdr4.Name));
-
-  std::string yz = "yyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzz";
-  UstarHeader Hdr5 = createUstar("", x136 + "/" + yz);
-  EXPECT_EQ("/" + x136, StringRef(Hdr5.Prefix));
-  EXPECT_EQ(yz, StringRef(Hdr5.Name));
-}
-
-TEST_F(TarWriterTest, Pax) {
-  std::vector<uint8_t> Buf = createTar("", std::string(200, 'x'));
-  EXPECT_TRUE(Buf.size() >= 1024);
-
-  auto *Hdr = reinterpret_cast<const UstarHeader *>(Buf.data());
-  EXPECT_EQ("", StringRef(Hdr->Prefix));
-  EXPECT_EQ("", StringRef(Hdr->Name));
-
-  StringRef Pax = StringRef((char *)(Buf.data() + 512), 512);
-  EXPECT_TRUE(Pax.startswith("211 path=/" + std::string(200, 'x')));
-}
-
-TEST_F(TarWriterTest, SingleFile) {
-  TempFile TarWriterTest("TarWriterTest", "tar", "", /*Unique*/ true);
-
-  Expected<std::unique_ptr<TarWriter>> TarOrErr =
-      TarWriter::create(TarWriterTest.path(), "");
-  EXPECT_TRUE((bool)TarOrErr);
-  std::unique_ptr<TarWriter> Tar = std::move(*TarOrErr);
-  Tar->append("FooPath", "foo");
-  Tar.reset();
-
-  uint64_t TarSize;
-  std::error_code EC = sys::fs::file_size(TarWriterTest.path(), TarSize);
-  EXPECT_FALSE((bool)EC);
-  EXPECT_EQ(TarSize, 2048ULL);
-}
-
-TEST_F(TarWriterTest, NoDuplicate) {
-  TempFile TarWriterTest("TarWriterTest", "tar", "", /*Unique*/ true);
-
-  Expected<std::unique_ptr<TarWriter>> TarOrErr =
-      TarWriter::create(TarWriterTest.path(), "");
-  EXPECT_TRUE((bool)TarOrErr);
-  std::unique_ptr<TarWriter> Tar = std::move(*TarOrErr);
-  Tar->append("FooPath", "foo");
-  Tar->append("BarPath", "bar");
-  Tar.reset();
-
-  uint64_t TarSize;
-  std::error_code EC = sys::fs::file_size(TarWriterTest.path(), TarSize);
-  EXPECT_FALSE((bool)EC);
-  EXPECT_EQ(TarSize, 3072ULL);
-}
-
-TEST_F(TarWriterTest, Duplicate) {
-  TempFile TarWriterTest("TarWriterTest", "tar", "", /*Unique*/ true);
-
-  Expected<std::unique_ptr<TarWriter>> TarOrErr =
-      TarWriter::create(TarWriterTest.path(), "");
-  EXPECT_TRUE((bool)TarOrErr);
-  std::unique_ptr<TarWriter> Tar = std::move(*TarOrErr);
-  Tar->append("FooPath", "foo");
-  Tar->append("FooPath", "bar");
-  Tar.reset();
-
-  uint64_t TarSize;
-  std::error_code EC = sys::fs::file_size(TarWriterTest.path(), TarSize);
-  EXPECT_FALSE((bool)EC);
-  EXPECT_EQ(TarSize, 2048ULL);
-}
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/Support/TargetParserTest.cpp b/gnu/llvm/llvm/unittests/Support/TargetParserTest.cpp
deleted file mode 100644
index a465eb0c57c..00000000000
--- a/gnu/llvm/llvm/unittests/Support/TargetParserTest.cpp
+++ /dev/null
@@ -1,1458 +0,0 @@
-//===----------- TargetParser.cpp - Target Parser -------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/TargetParser.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/StringExtras.h"
-#include "llvm/Support/ARMBuildAttributes.h"
-#include "llvm/Support/FormatVariadic.h"
-#include "gtest/gtest.h"
-#include <string>
-
-using namespace llvm;
-
-namespace {
-const char *ARMArch[] = {
-    "armv2",       "armv2a",       "armv3",       "armv3m",       "armv4",
-    "armv4t",      "armv5",        "armv5t",      "armv5e",       "armv5te",
-    "armv5tej",    "armv6",        "armv6j",      "armv6k",       "armv6hl",
-    "armv6t2",     "armv6kz",      "armv6z",      "armv6zk",      "armv6-m",
-    "armv6m",      "armv6sm",      "armv6s-m",    "armv7-a",      "armv7",
-    "armv7a",      "armv7ve",      "armv7hl",     "armv7l",       "armv7-r",
-    "armv7r",      "armv7-m",      "armv7m",      "armv7k",       "armv7s",
-    "armv7e-m",    "armv7em",      "armv8-a",     "armv8",        "armv8a",
-    "armv8l",      "armv8.1-a",    "armv8.1a",    "armv8.2-a",    "armv8.2a",
-    "armv8.3-a",   "armv8.3a",     "armv8.4-a",   "armv8.4a",     "armv8.5-a",
-    "armv8.5a",    "armv8.6-a",    "armv8.6a",    "armv8.7-a",    "armv8.7a",
-    "armv8-r",     "armv8r",       "armv8-m.base","armv8m.base",  "armv8-m.main",
-    "armv8m.main", "iwmmxt",       "iwmmxt2",     "xscale",       "armv8.1-m.main",
-};
-
-template <ARM::ISAKind ISAKind>
-std::string FormatExtensionFlags(uint64_t Flags) {
-  std::vector<StringRef> Features;
-
-  if (ISAKind == ARM::ISAKind::AARCH64) {
-    // AEK_NONE is not meant to be shown to the user so the target parser
-    // does not recognise it. It is relevant here though.
-    if (Flags & AArch64::AEK_NONE)
-      Features.push_back("none");
-    AArch64::getExtensionFeatures(Flags, Features);
-  } else {
-    if (Flags & ARM::AEK_NONE)
-      Features.push_back("none");
-    ARM::getExtensionFeatures(Flags, Features);
-  }
-
-  // The target parser also includes every extension you don't have.
-  // E.g. if AEK_CRC is not set then it adds "-crc". Not useful here.
-  Features.erase(std::remove_if(Features.begin(), Features.end(),
-                                [](StringRef extension) {
-                                  return extension.startswith("-");
-                                }),
-                 Features.end());
-
-  return llvm::join(Features, ", ");
-}
-
-template <ARM::ISAKind ISAKind>
-testing::AssertionResult
-AssertSameExtensionFlags(const char *m_expr, const char *n_expr,
-                         uint64_t ExpectedFlags, uint64_t GotFlags) {
-  if (ExpectedFlags == GotFlags)
-    return testing::AssertionSuccess();
-
-  return testing::AssertionFailure() << llvm::formatv(
-             "Expected extension flags: {0} ({1:x})\n"
-             "     Got extension flags: {2} ({3:x})\n",
-             FormatExtensionFlags<ISAKind>(ExpectedFlags), ExpectedFlags,
-             FormatExtensionFlags<ISAKind>(GotFlags), GotFlags);
-}
-
-struct ARMCPUTestParams {
-  ARMCPUTestParams(StringRef CPUName, StringRef ExpectedArch,
-                   StringRef ExpectedFPU, uint64_t ExpectedFlags,
-                   StringRef CPUAttr)
-      : CPUName(CPUName), ExpectedArch(ExpectedArch), ExpectedFPU(ExpectedFPU),
-        ExpectedFlags(ExpectedFlags), CPUAttr(CPUAttr) {}
-
-  friend std::ostream &operator<<(std::ostream &os,
-                                  const ARMCPUTestParams &params) {
-    return os << "\"" << params.CPUName.str() << "\", \""
-              << params.ExpectedArch.str() << "\", \""
-              << params.ExpectedFPU.str() << "\", 0x" << std::hex
-              << params.ExpectedFlags << ", \"" << params.CPUAttr.str() << "\"";
-  }
-
-  StringRef CPUName;
-  StringRef ExpectedArch;
-  StringRef ExpectedFPU;
-  uint64_t ExpectedFlags;
-  StringRef CPUAttr;
-};
-
-class ARMCPUTestFixture : public ::testing::TestWithParam<ARMCPUTestParams> {};
-
-TEST_P(ARMCPUTestFixture, ARMCPUTests) {
-  auto params = GetParam();
-
-  ARM::ArchKind AK = ARM::parseCPUArch(params.CPUName);
-  EXPECT_EQ(params.ExpectedArch, ARM::getArchName(AK));
-
-  unsigned FPUKind = ARM::getDefaultFPU(params.CPUName, AK);
-  EXPECT_EQ(params.ExpectedFPU, ARM::getFPUName(FPUKind));
-
-  uint64_t default_extensions = ARM::getDefaultExtensions(params.CPUName, AK);
-  EXPECT_PRED_FORMAT2(AssertSameExtensionFlags<ARM::ISAKind::ARM>,
-                      params.ExpectedFlags, default_extensions);
-
-  EXPECT_EQ(params.CPUAttr, ARM::getCPUAttr(AK));
-}
-
-// Note that we include ARM::AEK_NONE even when there are other extensions
-// we expect. This is because the default extensions for a CPU are the sum
-// of the default extensions for its architecture and for the CPU.
-// So if a CPU has no extra extensions, it adds AEK_NONE.
-INSTANTIATE_TEST_SUITE_P(
-    ARMCPUTestsPart1, ARMCPUTestFixture,
-    ::testing::Values(
-        ARMCPUTestParams("invalid", "invalid", "invalid", ARM::AEK_NONE, ""),
-        ARMCPUTestParams("generic", "invalid", "none", ARM::AEK_NONE, ""),
-
-        ARMCPUTestParams("arm8", "armv4", "none", ARM::AEK_NONE, "4"),
-        ARMCPUTestParams("arm810", "armv4", "none", ARM::AEK_NONE, "4"),
-        ARMCPUTestParams("strongarm", "armv4", "none", ARM::AEK_NONE, "4"),
-        ARMCPUTestParams("strongarm110", "armv4", "none", ARM::AEK_NONE, "4"),
-        ARMCPUTestParams("strongarm1100", "armv4", "none", ARM::AEK_NONE, "4"),
-        ARMCPUTestParams("strongarm1110", "armv4", "none", ARM::AEK_NONE, "4"),
-        ARMCPUTestParams("arm7tdmi", "armv4t", "none", ARM::AEK_NONE, "4T"),
-        ARMCPUTestParams("arm7tdmi-s", "armv4t", "none", ARM::AEK_NONE, "4T"),
-        ARMCPUTestParams("arm710t", "armv4t", "none", ARM::AEK_NONE, "4T"),
-        ARMCPUTestParams("arm720t", "armv4t", "none", ARM::AEK_NONE, "4T"),
-        ARMCPUTestParams("arm9", "armv4t", "none", ARM::AEK_NONE, "4T"),
-        ARMCPUTestParams("arm9tdmi", "armv4t", "none", ARM::AEK_NONE, "4T"),
-        ARMCPUTestParams("arm920", "armv4t", "none", ARM::AEK_NONE, "4T"),
-        ARMCPUTestParams("arm920t", "armv4t", "none", ARM::AEK_NONE, "4T"),
-        ARMCPUTestParams("arm922t", "armv4t", "none", ARM::AEK_NONE, "4T"),
-        ARMCPUTestParams("arm940t", "armv4t", "none", ARM::AEK_NONE, "4T"),
-        ARMCPUTestParams("ep9312", "armv4t", "none", ARM::AEK_NONE, "4T"),
-        ARMCPUTestParams("arm10tdmi", "armv5t", "none", ARM::AEK_NONE, "5T"),
-        ARMCPUTestParams("arm1020t", "armv5t", "none", ARM::AEK_NONE, "5T"),
-        ARMCPUTestParams("arm9e", "armv5te", "none",
-                         ARM::AEK_NONE | ARM::AEK_DSP, "5TE"),
-        ARMCPUTestParams("arm946e-s", "armv5te", "none",
-                         ARM::AEK_NONE | ARM::AEK_DSP, "5TE"),
-        ARMCPUTestParams("arm966e-s", "armv5te", "none",
-                         ARM::AEK_NONE | ARM::AEK_DSP, "5TE"),
-        ARMCPUTestParams("arm968e-s", "armv5te", "none",
-                         ARM::AEK_NONE | ARM::AEK_DSP, "5TE"),
-        ARMCPUTestParams("arm10e", "armv5te", "none",
-                         ARM::AEK_NONE | ARM::AEK_DSP, "5TE"),
-        ARMCPUTestParams("arm1020e", "armv5te", "none",
-                         ARM::AEK_NONE | ARM::AEK_DSP, "5TE"),
-        ARMCPUTestParams("arm1022e", "armv5te", "none",
-                         ARM::AEK_NONE | ARM::AEK_DSP, "5TE"),
-        ARMCPUTestParams("arm926ej-s", "armv5tej", "none",
-                         ARM::AEK_NONE | ARM::AEK_DSP, "5TEJ"),
-        ARMCPUTestParams("arm1136j-s", "armv6", "none",
-                         ARM::AEK_NONE | ARM::AEK_DSP, "6"),
-        ARMCPUTestParams("arm1136jf-s", "armv6", "vfpv2",
-                         ARM::AEK_NONE | ARM::AEK_DSP, "6"),
-        ARMCPUTestParams("arm1176jz-s", "armv6kz", "none",
-                         ARM::AEK_NONE | ARM::AEK_SEC | ARM::AEK_DSP, "6KZ"),
-        ARMCPUTestParams("mpcore", "armv6k", "vfpv2",
-                         ARM::AEK_NONE | ARM::AEK_DSP, "6K"),
-        ARMCPUTestParams("mpcorenovfp", "armv6k", "none",
-                         ARM::AEK_NONE | ARM::AEK_DSP, "6K"),
-        ARMCPUTestParams("arm1176jzf-s", "armv6kz", "vfpv2",
-                         ARM::AEK_NONE | ARM::AEK_SEC | ARM::AEK_DSP, "6KZ"),
-        ARMCPUTestParams("arm1156t2-s", "armv6t2", "none",
-                         ARM::AEK_NONE | ARM::AEK_DSP, "6T2"),
-        ARMCPUTestParams("arm1156t2f-s", "armv6t2", "vfpv2",
-                         ARM::AEK_NONE | ARM::AEK_DSP, "6T2"),
-        ARMCPUTestParams("cortex-m0", "armv6-m", "none", ARM::AEK_NONE, "6-M"),
-        ARMCPUTestParams("cortex-m0plus", "armv6-m", "none", ARM::AEK_NONE,
-                         "6-M"),
-        ARMCPUTestParams("cortex-m1", "armv6-m", "none", ARM::AEK_NONE, "6-M"),
-        ARMCPUTestParams("sc000", "armv6-m", "none", ARM::AEK_NONE, "6-M"),
-        ARMCPUTestParams("cortex-a5", "armv7-a", "neon-vfpv4",
-                         ARM::AEK_MP | ARM::AEK_SEC | ARM::AEK_DSP, "7-A"),
-        ARMCPUTestParams("cortex-a7", "armv7-a", "neon-vfpv4",
-                         ARM::AEK_HWDIVTHUMB | ARM::AEK_HWDIVARM | ARM::AEK_MP |
-                             ARM::AEK_SEC | ARM::AEK_VIRT | ARM::AEK_DSP,
-                         "7-A"),
-        ARMCPUTestParams("cortex-a8", "armv7-a", "neon",
-                         ARM::AEK_SEC | ARM::AEK_DSP, "7-A")));
-
-// gtest in llvm has a limit of 50 test cases when using ::Values so we split
-// them into 2 blocks
-INSTANTIATE_TEST_SUITE_P(
-    ARMCPUTestsPart2, ARMCPUTestFixture,
-    ::testing::Values(
-        ARMCPUTestParams("cortex-a9", "armv7-a", "neon-fp16",
-                         ARM::AEK_MP | ARM::AEK_SEC | ARM::AEK_DSP, "7-A"),
-        ARMCPUTestParams("cortex-a12", "armv7-a", "neon-vfpv4",
-                         ARM::AEK_SEC | ARM::AEK_MP | ARM::AEK_VIRT |
-                             ARM::AEK_HWDIVARM | ARM::AEK_HWDIVTHUMB |
-                             ARM::AEK_DSP,
-                         "7-A"),
-        ARMCPUTestParams("cortex-a15", "armv7-a", "neon-vfpv4",
-                         ARM::AEK_SEC | ARM::AEK_MP | ARM::AEK_VIRT |
-                             ARM::AEK_HWDIVARM | ARM::AEK_HWDIVTHUMB |
-                             ARM::AEK_DSP,
-                         "7-A"),
-        ARMCPUTestParams("cortex-a17", "armv7-a", "neon-vfpv4",
-                         ARM::AEK_SEC | ARM::AEK_MP | ARM::AEK_VIRT |
-                             ARM::AEK_HWDIVARM | ARM::AEK_HWDIVTHUMB |
-                             ARM::AEK_DSP,
-                         "7-A"),
-        ARMCPUTestParams("krait", "armv7-a", "neon-vfpv4",
-                         ARM::AEK_HWDIVARM | ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP,
-                         "7-A"),
-        ARMCPUTestParams("cortex-r4", "armv7-r", "none",
-                         ARM::AEK_NONE | ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP,
-                         "7-R"),
-        ARMCPUTestParams("cortex-r4f", "armv7-r", "vfpv3-d16",
-                         ARM::AEK_NONE | ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP,
-                         "7-R"),
-        ARMCPUTestParams("cortex-r5", "armv7-r", "vfpv3-d16",
-                         ARM::AEK_MP | ARM::AEK_HWDIVARM | ARM::AEK_HWDIVTHUMB |
-                             ARM::AEK_DSP,
-                         "7-R"),
-        ARMCPUTestParams("cortex-r7", "armv7-r", "vfpv3-d16-fp16",
-                         ARM::AEK_MP | ARM::AEK_HWDIVARM | ARM::AEK_HWDIVTHUMB |
-                             ARM::AEK_DSP,
-                         "7-R"),
-        ARMCPUTestParams("cortex-r8", "armv7-r", "vfpv3-d16-fp16",
-                         ARM::AEK_MP | ARM::AEK_HWDIVARM | ARM::AEK_HWDIVTHUMB |
-                             ARM::AEK_DSP,
-                         "7-R"),
-        ARMCPUTestParams("cortex-r52", "armv8-r", "neon-fp-armv8",
-                         ARM::AEK_NONE | ARM::AEK_CRC | ARM::AEK_MP |
-                             ARM::AEK_VIRT | ARM::AEK_HWDIVARM |
-                             ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP,
-                         "8-R"),
-        ARMCPUTestParams("sc300", "armv7-m", "none",
-                         ARM::AEK_NONE | ARM::AEK_HWDIVTHUMB, "7-M"),
-        ARMCPUTestParams("cortex-m3", "armv7-m", "none",
-                         ARM::AEK_NONE | ARM::AEK_HWDIVTHUMB, "7-M"),
-        ARMCPUTestParams("cortex-m4", "armv7e-m", "fpv4-sp-d16",
-                         ARM::AEK_NONE | ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP,
-                         "7E-M"),
-        ARMCPUTestParams("cortex-m7", "armv7e-m", "fpv5-d16",
-                         ARM::AEK_NONE | ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP,
-                         "7E-M"),
-        ARMCPUTestParams("cortex-a32", "armv8-a", "crypto-neon-fp-armv8",
-                         ARM::AEK_CRC | ARM::AEK_SEC | ARM::AEK_MP |
-                             ARM::AEK_VIRT | ARM::AEK_HWDIVARM |
-                             ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP,
-                         "8-A"),
-        ARMCPUTestParams("cortex-a35", "armv8-a", "crypto-neon-fp-armv8",
-                         ARM::AEK_CRC | ARM::AEK_SEC | ARM::AEK_MP |
-                             ARM::AEK_VIRT | ARM::AEK_HWDIVARM |
-                             ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP,
-                         "8-A"),
-        ARMCPUTestParams("cortex-a53", "armv8-a", "crypto-neon-fp-armv8",
-                         ARM::AEK_CRC | ARM::AEK_SEC | ARM::AEK_MP |
-                             ARM::AEK_VIRT | ARM::AEK_HWDIVARM |
-                             ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP,
-                         "8-A"),
-        ARMCPUTestParams("cortex-a55", "armv8.2-a", "crypto-neon-fp-armv8",
-                         ARM::AEK_CRC | ARM::AEK_SEC | ARM::AEK_MP |
-                             ARM::AEK_VIRT | ARM::AEK_HWDIVARM |
-                             ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP |
-                             ARM::AEK_FP16 | ARM::AEK_RAS | ARM::AEK_DOTPROD,
-                         "8.2-A"),
-        ARMCPUTestParams("cortex-a57", "armv8-a", "crypto-neon-fp-armv8",
-                         ARM::AEK_CRC | ARM::AEK_SEC | ARM::AEK_MP |
-                             ARM::AEK_VIRT | ARM::AEK_HWDIVARM |
-                             ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP,
-                         "8-A"),
-        ARMCPUTestParams("cortex-a72", "armv8-a", "crypto-neon-fp-armv8",
-                         ARM::AEK_CRC | ARM::AEK_SEC | ARM::AEK_MP |
-                             ARM::AEK_VIRT | ARM::AEK_HWDIVARM |
-                             ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP,
-                         "8-A"),
-        ARMCPUTestParams("cortex-a73", "armv8-a", "crypto-neon-fp-armv8",
-                         ARM::AEK_CRC | ARM::AEK_SEC | ARM::AEK_MP |
-                             ARM::AEK_VIRT | ARM::AEK_HWDIVARM |
-                             ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP,
-                         "8-A"),
-        ARMCPUTestParams("cortex-a75", "armv8.2-a", "crypto-neon-fp-armv8",
-                         ARM::AEK_CRC | ARM::AEK_SEC | ARM::AEK_MP |
-                             ARM::AEK_VIRT | ARM::AEK_HWDIVARM |
-                             ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP |
-                             ARM::AEK_FP16 | ARM::AEK_RAS | ARM::AEK_DOTPROD,
-                         "8.2-A"),
-        ARMCPUTestParams("cortex-a76", "armv8.2-a", "crypto-neon-fp-armv8",
-                         ARM::AEK_CRC | ARM::AEK_SEC | ARM::AEK_MP |
-                             ARM::AEK_VIRT | ARM::AEK_HWDIVARM |
-                             ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP |
-                             ARM::AEK_FP16 | ARM::AEK_RAS | ARM::AEK_DOTPROD,
-                         "8.2-A"),
-        ARMCPUTestParams("cortex-a76ae", "armv8.2-a", "crypto-neon-fp-armv8",
-                         ARM::AEK_CRC | ARM::AEK_SEC | ARM::AEK_MP |
-                             ARM::AEK_VIRT | ARM::AEK_HWDIVARM |
-                             ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP |
-                             ARM::AEK_FP16 | ARM::AEK_RAS | ARM::AEK_DOTPROD,
-                         "8.2-A"),
-        ARMCPUTestParams("cortex-a78c", "armv8.2-a", "crypto-neon-fp-armv8",
-                         ARM::AEK_SEC | ARM::AEK_MP | ARM::AEK_VIRT |
-                             ARM::AEK_HWDIVARM | ARM::AEK_HWDIVTHUMB |
-                             ARM::AEK_DSP | ARM::AEK_CRC | ARM::AEK_RAS |
-                             ARM::AEK_FP16 | ARM::AEK_DOTPROD,
-                         "8.2-A"),
-        ARMCPUTestParams("cortex-a77", "armv8.2-a", "crypto-neon-fp-armv8",
-                         ARM::AEK_CRC | ARM::AEK_SEC | ARM::AEK_MP |
-                             ARM::AEK_VIRT | ARM::AEK_HWDIVARM |
-                             ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP |
-                             ARM::AEK_FP16 | ARM::AEK_RAS | ARM::AEK_DOTPROD,
-                         "8.2-A"),
-        ARMCPUTestParams("cortex-a78", "armv8.2-a", "crypto-neon-fp-armv8",
-                         ARM::AEK_DOTPROD | ARM::AEK_FP16 | ARM::AEK_SEC |
-                             ARM::AEK_MP | ARM::AEK_VIRT | ARM::AEK_HWDIVARM |
-                             ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP | ARM::AEK_CRC |
-                             ARM::AEK_RAS,
-                         "8.2-A"),
-        ARMCPUTestParams("cortex-x1", "armv8.2-a", "crypto-neon-fp-armv8",
-                         ARM::AEK_RAS | ARM::AEK_FP16 | ARM::AEK_DOTPROD |
-                             ARM::AEK_SEC | ARM::AEK_MP | ARM::AEK_VIRT |
-                             ARM::AEK_HWDIVARM | ARM::AEK_HWDIVTHUMB |
-                             ARM::AEK_DSP | ARM::AEK_CRC | ARM::AEK_RAS,
-                         "8.2-A"),
-        ARMCPUTestParams("neoverse-n1", "armv8.2-a", "crypto-neon-fp-armv8",
-                         ARM::AEK_CRC | ARM::AEK_SEC | ARM::AEK_MP |
-                             ARM::AEK_VIRT | ARM::AEK_HWDIVARM |
-                             ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP |
-                             ARM::AEK_FP16 | ARM::AEK_RAS | ARM::AEK_DOTPROD,
-                         "8.2-A"),
-        ARMCPUTestParams("neoverse-n2", "armv8.5-a", "crypto-neon-fp-armv8",
-                         ARM::AEK_CRC | ARM::AEK_HWDIVTHUMB |
-                             ARM::AEK_HWDIVARM | ARM::AEK_MP | ARM::AEK_SEC |
-                             ARM::AEK_VIRT | ARM::AEK_DSP | ARM::AEK_BF16 |
-                             ARM::AEK_DOTPROD | ARM::AEK_RAS | ARM::AEK_I8MM |
-                             ARM::AEK_SB,
-                         "8.5-A"),
-        ARMCPUTestParams("neoverse-v1", "armv8.4-a", "crypto-neon-fp-armv8",
-                         ARM::AEK_SEC | ARM::AEK_MP | ARM::AEK_VIRT |
-                             ARM::AEK_HWDIVARM | ARM::AEK_HWDIVTHUMB |
-                             ARM::AEK_DSP | ARM::AEK_CRC | ARM::AEK_RAS |
-                             ARM::AEK_FP16 | ARM::AEK_BF16 | ARM::AEK_DOTPROD,
-                         "8.4-A"),
-        ARMCPUTestParams("cyclone", "armv8-a", "crypto-neon-fp-armv8",
-                         ARM::AEK_CRC | ARM::AEK_SEC | ARM::AEK_MP |
-                             ARM::AEK_VIRT | ARM::AEK_HWDIVARM |
-                             ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP,
-                         "8-A"),
-        ARMCPUTestParams("exynos-m3", "armv8-a", "crypto-neon-fp-armv8",
-                         ARM::AEK_CRC | ARM::AEK_SEC | ARM::AEK_MP |
-                             ARM::AEK_VIRT | ARM::AEK_HWDIVARM |
-                             ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP,
-                         "8-A"),
-        ARMCPUTestParams("exynos-m4", "armv8.2-a", "crypto-neon-fp-armv8",
-                         ARM::AEK_CRC | ARM::AEK_SEC | ARM::AEK_MP |
-                             ARM::AEK_VIRT | ARM::AEK_HWDIVARM |
-                             ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP |
-                             ARM::AEK_DOTPROD | ARM::AEK_FP16 | ARM::AEK_RAS,
-                         "8.2-A"),
-        ARMCPUTestParams("exynos-m5", "armv8.2-a", "crypto-neon-fp-armv8",
-                         ARM::AEK_CRC | ARM::AEK_SEC | ARM::AEK_MP |
-                             ARM::AEK_VIRT | ARM::AEK_HWDIVARM |
-                             ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP |
-                             ARM::AEK_DOTPROD | ARM::AEK_FP16 | ARM::AEK_RAS,
-                         "8.2-A"),
-        ARMCPUTestParams("cortex-m23", "armv8-m.base", "none",
-                         ARM::AEK_NONE | ARM::AEK_HWDIVTHUMB, "8-M.Baseline"),
-        ARMCPUTestParams("cortex-m33", "armv8-m.main", "fpv5-sp-d16",
-                         ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP, "8-M.Mainline"),
-        ARMCPUTestParams("cortex-m35p", "armv8-m.main", "fpv5-sp-d16",
-                         ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP, "8-M.Mainline"),
-        ARMCPUTestParams("cortex-m55", "armv8.1-m.main",
-                         "fp-armv8-fullfp16-d16",
-                         ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP | ARM::AEK_SIMD |
-                             ARM::AEK_FP | ARM::AEK_RAS | ARM::AEK_LOB |
-                             ARM::AEK_FP16,
-                         "8.1-M.Mainline"),
-        ARMCPUTestParams("iwmmxt", "iwmmxt", "none", ARM::AEK_NONE, "iwmmxt"),
-        ARMCPUTestParams("xscale", "xscale", "none", ARM::AEK_NONE, "xscale"),
-        ARMCPUTestParams("swift", "armv7s", "neon-vfpv4",
-                         ARM::AEK_HWDIVARM | ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP,
-                         "7-S")));
-
-static constexpr unsigned NumARMCPUArchs = 86;
-
-TEST(TargetParserTest, testARMCPUArchList) {
-  SmallVector<StringRef, NumARMCPUArchs> List;
-  ARM::fillValidCPUArchList(List);
-
-  // No list exists for these in this test suite, so ensure all are
-  // valid, and match the expected 'magic' count.
-  EXPECT_EQ(List.size(), NumARMCPUArchs);
-  for(StringRef CPU : List) {
-    EXPECT_NE(ARM::parseCPUArch(CPU), ARM::ArchKind::INVALID);
-  }
-}
-
-TEST(TargetParserTest, testInvalidARMArch) {
-  auto InvalidArchStrings = {"armv", "armv99", "noarm"};
-  for (const char* InvalidArch : InvalidArchStrings)
-    EXPECT_EQ(ARM::parseArch(InvalidArch), ARM::ArchKind::INVALID);
-}
-
-bool testARMArch(StringRef Arch, StringRef DefaultCPU, StringRef SubArch,
-                 unsigned ArchAttr) {
-  ARM::ArchKind AK = ARM::parseArch(Arch);
-  bool Result = (AK != ARM::ArchKind::INVALID);
-  Result &= ARM::getDefaultCPU(Arch).equals(DefaultCPU);
-  Result &= ARM::getSubArch(AK).equals(SubArch);
-  Result &= (ARM::getArchAttr(AK) == ArchAttr);
-  return Result;
-}
-
-TEST(TargetParserTest, testARMArch) {
-  EXPECT_TRUE(
-      testARMArch("armv2", "generic", "v2", ARMBuildAttrs::CPUArch::Pre_v4));
-  EXPECT_TRUE(
-      testARMArch("armv2a", "generic", "v2a", ARMBuildAttrs::CPUArch::Pre_v4));
-  EXPECT_TRUE(
-      testARMArch("armv3", "generic", "v3", ARMBuildAttrs::CPUArch::Pre_v4));
-  EXPECT_TRUE(
-      testARMArch("armv3m", "generic", "v3m", ARMBuildAttrs::CPUArch::Pre_v4));
-  EXPECT_TRUE(
-      testARMArch("armv4", "strongarm", "v4",
-                          ARMBuildAttrs::CPUArch::v4));
-  EXPECT_TRUE(
-      testARMArch("armv4t", "arm7tdmi", "v4t",
-                          ARMBuildAttrs::CPUArch::v4T));
-  EXPECT_TRUE(
-      testARMArch("armv5t", "arm10tdmi", "v5",
-                          ARMBuildAttrs::CPUArch::v5T));
-  EXPECT_TRUE(
-      testARMArch("armv5te", "arm1022e", "v5e",
-                          ARMBuildAttrs::CPUArch::v5TE));
-  EXPECT_TRUE(
-      testARMArch("armv5tej", "arm926ej-s", "v5e",
-                          ARMBuildAttrs::CPUArch::v5TEJ));
-  EXPECT_TRUE(
-      testARMArch("armv6", "arm1136jf-s", "v6",
-                          ARMBuildAttrs::CPUArch::v6));
-  EXPECT_TRUE(
-      testARMArch("armv6k", "mpcore", "v6k",
-                          ARMBuildAttrs::CPUArch::v6K));
-  EXPECT_TRUE(
-      testARMArch("armv6t2", "arm1156t2-s", "v6t2",
-                          ARMBuildAttrs::CPUArch::v6T2));
-  EXPECT_TRUE(
-      testARMArch("armv6kz", "arm1176jzf-s", "v6kz",
-                          ARMBuildAttrs::CPUArch::v6KZ));
-  EXPECT_TRUE(
-      testARMArch("armv6-m", "cortex-m0", "v6m",
-                          ARMBuildAttrs::CPUArch::v6_M));
-  EXPECT_TRUE(
-      testARMArch("armv7-a", "generic", "v7",
-                          ARMBuildAttrs::CPUArch::v7));
-  EXPECT_TRUE(
-      testARMArch("armv7ve", "generic", "v7ve",
-                          ARMBuildAttrs::CPUArch::v7));
-  EXPECT_TRUE(
-      testARMArch("armv7-r", "cortex-r4", "v7r",
-                          ARMBuildAttrs::CPUArch::v7));
-  EXPECT_TRUE(
-      testARMArch("armv7-m", "cortex-m3", "v7m",
-                          ARMBuildAttrs::CPUArch::v7));
-  EXPECT_TRUE(
-      testARMArch("armv7e-m", "cortex-m4", "v7em",
-                          ARMBuildAttrs::CPUArch::v7E_M));
-  EXPECT_TRUE(
-      testARMArch("armv8-a", "generic", "v8",
-                          ARMBuildAttrs::CPUArch::v8_A));
-  EXPECT_TRUE(
-      testARMArch("armv8.1-a", "generic", "v8.1a",
-                          ARMBuildAttrs::CPUArch::v8_A));
-  EXPECT_TRUE(
-      testARMArch("armv8.2-a", "generic", "v8.2a",
-                          ARMBuildAttrs::CPUArch::v8_A));
-  EXPECT_TRUE(
-      testARMArch("armv8.3-a", "generic", "v8.3a",
-                          ARMBuildAttrs::CPUArch::v8_A));
-  EXPECT_TRUE(
-      testARMArch("armv8.4-a", "generic", "v8.4a",
-                          ARMBuildAttrs::CPUArch::v8_A));
-  EXPECT_TRUE(
-      testARMArch("armv8.5-a", "generic", "v8.5a",
-                          ARMBuildAttrs::CPUArch::v8_A));
-  EXPECT_TRUE(
-      testARMArch("armv8.6-a", "generic", "v8.6a",
-                          ARMBuildAttrs::CPUArch::v8_A));
-  EXPECT_TRUE(
-      testARMArch("armv8.7-a", "generic", "v8.7a",
-                          ARMBuildAttrs::CPUArch::v8_A));
-  EXPECT_TRUE(
-      testARMArch("armv8-r", "cortex-r52", "v8r",
-                          ARMBuildAttrs::CPUArch::v8_R));
-  EXPECT_TRUE(
-      testARMArch("armv8-m.base", "generic", "v8m.base",
-                          ARMBuildAttrs::CPUArch::v8_M_Base));
-  EXPECT_TRUE(
-      testARMArch("armv8-m.main", "generic", "v8m.main",
-                          ARMBuildAttrs::CPUArch::v8_M_Main));
-  EXPECT_TRUE(
-      testARMArch("armv8.1-m.main", "generic", "v8.1m.main",
-                          ARMBuildAttrs::CPUArch::v8_1_M_Main));
-  EXPECT_TRUE(
-      testARMArch("iwmmxt", "iwmmxt", "",
-                          ARMBuildAttrs::CPUArch::v5TE));
-  EXPECT_TRUE(
-      testARMArch("iwmmxt2", "generic", "",
-                          ARMBuildAttrs::CPUArch::v5TE));
-  EXPECT_TRUE(
-      testARMArch("xscale", "xscale", "v5e",
-                          ARMBuildAttrs::CPUArch::v5TE));
-  EXPECT_TRUE(
-      testARMArch("armv7s", "swift", "v7s",
-                          ARMBuildAttrs::CPUArch::v7));
-  EXPECT_TRUE(
-      testARMArch("armv7k", "generic", "v7k",
-                          ARMBuildAttrs::CPUArch::v7));
-}
-
-bool testARMExtension(StringRef CPUName,ARM::ArchKind ArchKind, StringRef ArchExt) {
-  return ARM::getDefaultExtensions(CPUName, ArchKind) &
-         ARM::parseArchExt(ArchExt);
-}
-
-TEST(TargetParserTest, testARMExtension) {
-  EXPECT_FALSE(testARMExtension("strongarm", ARM::ArchKind::INVALID, "dsp"));
-  EXPECT_FALSE(testARMExtension("arm7tdmi", ARM::ArchKind::INVALID, "dsp"));
-  EXPECT_FALSE(testARMExtension("arm10tdmi",
-                                ARM::ArchKind::INVALID, "simd"));
-  EXPECT_FALSE(testARMExtension("arm1022e", ARM::ArchKind::INVALID, "simd"));
-  EXPECT_FALSE(testARMExtension("arm926ej-s",
-                                ARM::ArchKind::INVALID, "simd"));
-  EXPECT_FALSE(testARMExtension("arm1136jf-s",
-                                ARM::ArchKind::INVALID, "crypto"));
-  EXPECT_FALSE(testARMExtension("arm1156t2-s",
-                                ARM::ArchKind::INVALID, "crypto"));
-  EXPECT_FALSE(testARMExtension("arm1176jzf-s",
-                                ARM::ArchKind::INVALID, "crypto"));
-  EXPECT_FALSE(testARMExtension("cortex-m0",
-                                ARM::ArchKind::INVALID, "crypto"));
-  EXPECT_FALSE(testARMExtension("cortex-a8",
-                                ARM::ArchKind::INVALID, "crypto"));
-  EXPECT_FALSE(testARMExtension("cortex-r4",
-                                ARM::ArchKind::INVALID, "crypto"));
-  EXPECT_FALSE(testARMExtension("cortex-m3",
-                                ARM::ArchKind::INVALID, "crypto"));
-  EXPECT_FALSE(testARMExtension("cortex-a53",
-                                ARM::ArchKind::INVALID, "ras"));
-  EXPECT_FALSE(testARMExtension("cortex-a53",
-                                ARM::ArchKind::INVALID, "fp16"));
-  EXPECT_TRUE(testARMExtension("cortex-a55",
-                                ARM::ArchKind::INVALID, "fp16"));
-  EXPECT_FALSE(testARMExtension("cortex-a55",
-                                ARM::ArchKind::INVALID, "fp16fml"));
-  EXPECT_TRUE(testARMExtension("cortex-a75",
-                                ARM::ArchKind::INVALID, "fp16"));
-  EXPECT_FALSE(testARMExtension("cortex-a75",
-                                ARM::ArchKind::INVALID, "fp16fml"));
-  EXPECT_FALSE(testARMExtension("cortex-r52",
-                                ARM::ArchKind::INVALID, "ras"));
-  EXPECT_FALSE(testARMExtension("iwmmxt", ARM::ArchKind::INVALID, "crc"));
-  EXPECT_FALSE(testARMExtension("xscale", ARM::ArchKind::INVALID, "crc"));
-  EXPECT_FALSE(testARMExtension("swift", ARM::ArchKind::INVALID, "crc"));
-
-  EXPECT_FALSE(testARMExtension("generic", ARM::ArchKind::ARMV2, "thumb"));
-  EXPECT_FALSE(testARMExtension("generic", ARM::ArchKind::ARMV2A, "thumb"));
-  EXPECT_FALSE(testARMExtension("generic", ARM::ArchKind::ARMV3, "thumb"));
-  EXPECT_FALSE(testARMExtension("generic", ARM::ArchKind::ARMV3M, "thumb"));
-  EXPECT_FALSE(testARMExtension("generic", ARM::ArchKind::ARMV4, "dsp"));
-  EXPECT_FALSE(testARMExtension("generic", ARM::ArchKind::ARMV4T, "dsp"));
-  EXPECT_FALSE(testARMExtension("generic", ARM::ArchKind::ARMV5T, "simd"));
-  EXPECT_FALSE(testARMExtension("generic", ARM::ArchKind::ARMV5TE, "simd"));
-  EXPECT_FALSE(testARMExtension("generic", ARM::ArchKind::ARMV5TEJ, "simd"));
-  EXPECT_FALSE(testARMExtension("generic", ARM::ArchKind::ARMV6, "crypto"));
-  EXPECT_FALSE(testARMExtension("generic", ARM::ArchKind::ARMV6K, "crypto"));
-  EXPECT_FALSE(testARMExtension("generic",
-                                ARM::ArchKind::ARMV6T2, "crypto"));
-  EXPECT_FALSE(testARMExtension("generic",
-                                ARM::ArchKind::ARMV6KZ, "crypto"));
-  EXPECT_FALSE(testARMExtension("generic", ARM::ArchKind::ARMV6M, "crypto"));
-  EXPECT_FALSE(testARMExtension("generic", ARM::ArchKind::ARMV7A, "crypto"));
-  EXPECT_FALSE(testARMExtension("generic", ARM::ArchKind::ARMV7R, "crypto"));
-  EXPECT_FALSE(testARMExtension("generic", ARM::ArchKind::ARMV7M, "crypto"));
-  EXPECT_FALSE(testARMExtension("generic",
-                                ARM::ArchKind::ARMV7EM, "crypto"));
-  EXPECT_FALSE(testARMExtension("generic", ARM::ArchKind::ARMV8A, "ras"));
-  EXPECT_FALSE(testARMExtension("generic", ARM::ArchKind::ARMV8_1A, "ras"));
-  EXPECT_FALSE(testARMExtension("generic", ARM::ArchKind::ARMV8_2A, "profile"));
-  EXPECT_FALSE(testARMExtension("generic", ARM::ArchKind::ARMV8_2A, "fp16"));
-  EXPECT_FALSE(testARMExtension("generic", ARM::ArchKind::ARMV8_2A, "fp16fml"));
-  EXPECT_FALSE(testARMExtension("generic", ARM::ArchKind::ARMV8_3A, "fp16"));
-  EXPECT_FALSE(testARMExtension("generic", ARM::ArchKind::ARMV8_3A, "fp16fml"));
-  EXPECT_FALSE(testARMExtension("generic", ARM::ArchKind::ARMV8_4A, "fp16"));
-  EXPECT_FALSE(testARMExtension("generic", ARM::ArchKind::ARMV8_4A, "fp16fml"));
-  EXPECT_FALSE(testARMExtension("generic", ARM::ArchKind::ARMV8R, "ras"));
-  EXPECT_FALSE(testARMExtension("generic",
-                                ARM::ArchKind::ARMV8MBaseline, "crc"));
-  EXPECT_FALSE(testARMExtension("generic",
-                                ARM::ArchKind::ARMV8MMainline, "crc"));
-  EXPECT_FALSE(testARMExtension("generic", ARM::ArchKind::IWMMXT, "crc"));
-  EXPECT_FALSE(testARMExtension("generic", ARM::ArchKind::IWMMXT2, "crc"));
-  EXPECT_FALSE(testARMExtension("generic", ARM::ArchKind::XSCALE, "crc"));
-  EXPECT_FALSE(testARMExtension("generic", ARM::ArchKind::ARMV7S, "crypto"));
-  EXPECT_FALSE(testARMExtension("generic", ARM::ArchKind::ARMV7K, "crypto"));
-}
-
-TEST(TargetParserTest, ARMFPUVersion) {
-  for (ARM::FPUKind FK = static_cast<ARM::FPUKind>(0);
-       FK <= ARM::FPUKind::FK_LAST;
-       FK = static_cast<ARM::FPUKind>(static_cast<unsigned>(FK) + 1))
-    if (FK == ARM::FK_LAST || ARM::getFPUName(FK) == "invalid" ||
-        ARM::getFPUName(FK) == "none" || ARM::getFPUName(FK) == "softvfp")
-      EXPECT_EQ(ARM::FPUVersion::NONE, ARM::getFPUVersion(FK));
-    else
-      EXPECT_NE(ARM::FPUVersion::NONE, ARM::getFPUVersion(FK));
-}
-
-TEST(TargetParserTest, ARMFPUNeonSupportLevel) {
-  for (ARM::FPUKind FK = static_cast<ARM::FPUKind>(0);
-       FK <= ARM::FPUKind::FK_LAST;
-       FK = static_cast<ARM::FPUKind>(static_cast<unsigned>(FK) + 1))
-    if (FK == ARM::FK_LAST ||
-        ARM::getFPUName(FK).find("neon") == std::string::npos)
-      EXPECT_EQ(ARM::NeonSupportLevel::None,
-                 ARM::getFPUNeonSupportLevel(FK));
-    else
-      EXPECT_NE(ARM::NeonSupportLevel::None,
-                ARM::getFPUNeonSupportLevel(FK));
-}
-
-TEST(TargetParserTest, ARMFPURestriction) {
-  for (ARM::FPUKind FK = static_cast<ARM::FPUKind>(0);
-       FK <= ARM::FPUKind::FK_LAST;
-       FK = static_cast<ARM::FPUKind>(static_cast<unsigned>(FK) + 1)) {
-    if (FK == ARM::FK_LAST ||
-        (ARM::getFPUName(FK).find("d16") == std::string::npos &&
-         ARM::getFPUName(FK).find("vfpv3xd") == std::string::npos))
-      EXPECT_EQ(ARM::FPURestriction::None, ARM::getFPURestriction(FK));
-    else
-      EXPECT_NE(ARM::FPURestriction::None, ARM::getFPURestriction(FK));
-  }
-}
-
-TEST(TargetParserTest, ARMExtensionFeatures) {
-  std::map<uint64_t, std::vector<StringRef>> Extensions;
-
-  for (auto &Ext : ARM::ARCHExtNames) {
-    if (Ext.Feature && Ext.NegFeature)
-      Extensions[Ext.ID] = { StringRef(Ext.Feature),
-                             StringRef(Ext.NegFeature) };
-  }
-
-  Extensions[ARM::AEK_HWDIVARM]   = { "+hwdiv-arm", "-hwdiv-arm" };
-  Extensions[ARM::AEK_HWDIVTHUMB] = { "+hwdiv",     "-hwdiv" };
-
-  std::vector<StringRef> Features;
-
-  EXPECT_FALSE(ARM::getExtensionFeatures(ARM::AEK_INVALID, Features));
-
-  for (auto &E : Extensions) {
-    // test +extension
-    Features.clear();
-    ARM::getExtensionFeatures(E.first, Features);
-    EXPECT_TRUE(llvm::is_contained(Features, E.second.at(0)));
-    EXPECT_TRUE(Extensions.size() == Features.size());
-
-    // test -extension
-    Features.clear();
-    ARM::getExtensionFeatures(~E.first, Features);
-    EXPECT_TRUE(llvm::is_contained(Features, E.second.at(1)));
-    EXPECT_TRUE(Extensions.size() == Features.size());
-  }
-}
-
-TEST(TargetParserTest, ARMFPUFeatures) {
-  std::vector<StringRef> Features;
-  for (ARM::FPUKind FK = static_cast<ARM::FPUKind>(0);
-       FK <= ARM::FPUKind::FK_LAST;
-       FK = static_cast<ARM::FPUKind>(static_cast<unsigned>(FK) + 1))
-    EXPECT_TRUE((FK == ARM::FK_INVALID || FK >= ARM::FK_LAST)
-                    ? !ARM::getFPUFeatures(FK, Features)
-                    : ARM::getFPUFeatures(FK, Features));
-}
-
-TEST(TargetParserTest, ARMArchExtFeature) {
-  const char *ArchExt[][4] = {{"crc", "nocrc", "+crc", "-crc"},
-                              {"crypto", "nocrypto", "+crypto", "-crypto"},
-                              {"dsp", "nodsp", "+dsp", "-dsp"},
-                              {"fp", "nofp", nullptr, nullptr},
-                              {"idiv", "noidiv", nullptr, nullptr},
-                              {"mp", "nomp", nullptr, nullptr},
-                              {"simd", "nosimd", nullptr, nullptr},
-                              {"sec", "nosec", nullptr, nullptr},
-                              {"virt", "novirt", nullptr, nullptr},
-                              {"fp16", "nofp16", "+fullfp16", "-fullfp16"},
-                              {"fp16fml", "nofp16fml", "+fp16fml", "-fp16fml"},
-                              {"ras", "noras", "+ras", "-ras"},
-                              {"dotprod", "nodotprod", "+dotprod", "-dotprod"},
-                              {"os", "noos", nullptr, nullptr},
-                              {"iwmmxt", "noiwmmxt", nullptr, nullptr},
-                              {"iwmmxt2", "noiwmmxt2", nullptr, nullptr},
-                              {"maverick", "maverick", nullptr, nullptr},
-                              {"xscale", "noxscale", nullptr, nullptr},
-                              {"sb", "nosb", "+sb", "-sb"},
-                              {"i8mm", "noi8mm", "+i8mm", "-i8mm"},
-                              {"mve", "nomve", "+mve", "-mve"},
-                              {"mve.fp", "nomve.fp", "+mve.fp", "-mve.fp"}};
-
-  for (unsigned i = 0; i < array_lengthof(ArchExt); i++) {
-    EXPECT_EQ(StringRef(ArchExt[i][2]), ARM::getArchExtFeature(ArchExt[i][0]));
-    EXPECT_EQ(StringRef(ArchExt[i][3]), ARM::getArchExtFeature(ArchExt[i][1]));
-  }
-}
-
-static bool
-testArchExtDependency(const char *ArchExt,
-                      const std::initializer_list<const char *> &Expected) {
-  std::vector<StringRef> Features;
-  unsigned FPUID;
-
-  if (!ARM::appendArchExtFeatures("", ARM::ArchKind::ARMV8_1MMainline, ArchExt,
-                                  Features, FPUID))
-    return false;
-
-  return llvm::all_of(Expected, [&](StringRef Ext) {
-    return llvm::is_contained(Features, Ext);
-  });
-}
-
-TEST(TargetParserTest, ARMArchExtDependencies) {
-  EXPECT_TRUE(testArchExtDependency("mve", {"+mve", "+dsp"}));
-  EXPECT_TRUE(testArchExtDependency("mve.fp", {"+mve.fp", "+mve", "+dsp"}));
-  EXPECT_TRUE(testArchExtDependency("nodsp", {"-dsp", "-mve", "-mve.fp"}));
-  EXPECT_TRUE(testArchExtDependency("nomve", {"-mve", "-mve.fp"}));
-}
-
-TEST(TargetParserTest, ARMparseHWDiv) {
-  const char *hwdiv[] = {"thumb", "arm", "arm,thumb", "thumb,arm"};
-
-  for (unsigned i = 0; i < array_lengthof(hwdiv); i++)
-    EXPECT_NE(ARM::AEK_INVALID, ARM::parseHWDiv((StringRef)hwdiv[i]));
-}
-
-TEST(TargetParserTest, ARMparseArchEndianAndISA) {
-  const char *Arch[] = {
-      "v2",   "v2a",    "v3",    "v3m",    "v4",    "v4t",    "v5",    "v5t",
-      "v5e",  "v5te",   "v5tej", "v6",     "v6j",   "v6k",    "v6hl",  "v6t2",
-      "v6kz", "v6z",    "v6zk",  "v6-m",   "v6m",   "v6sm",   "v6s-m", "v7-a",
-      "v7",   "v7a",    "v7ve",  "v7hl",   "v7l",   "v7-r",   "v7r",   "v7-m",
-      "v7m",  "v7k",    "v7s",   "v7e-m",  "v7em",  "v8-a",   "v8",    "v8a",
-      "v8l",  "v8.1-a", "v8.1a", "v8.2-a", "v8.2a", "v8.3-a", "v8.3a", "v8.4-a",
-      "v8.4a", "v8.5-a","v8.5a", "v8.6-a", "v8.6a", "v8.7-a", "v8.7a", "v8-r",
-      "v8m.base", "v8m.main", "v8.1m.main"
-  };
-
-  for (unsigned i = 0; i < array_lengthof(Arch); i++) {
-    std::string arm_1 = "armeb" + (std::string)(Arch[i]);
-    std::string arm_2 = "arm" + (std::string)(Arch[i]) + "eb";
-    std::string arm_3 = "arm" + (std::string)(Arch[i]);
-    std::string thumb_1 = "thumbeb" + (std::string)(Arch[i]);
-    std::string thumb_2 = "thumb" + (std::string)(Arch[i]) + "eb";
-    std::string thumb_3 = "thumb" + (std::string)(Arch[i]);
-
-    EXPECT_EQ(ARM::EndianKind::BIG, ARM::parseArchEndian(arm_1));
-    EXPECT_EQ(ARM::EndianKind::BIG, ARM::parseArchEndian(arm_2));
-    EXPECT_EQ(ARM::EndianKind::LITTLE, ARM::parseArchEndian(arm_3));
-
-    EXPECT_EQ(ARM::ISAKind::ARM, ARM::parseArchISA(arm_1));
-    EXPECT_EQ(ARM::ISAKind::ARM, ARM::parseArchISA(arm_2));
-    EXPECT_EQ(ARM::ISAKind::ARM, ARM::parseArchISA(arm_3));
-    if (i >= 4) {
-      EXPECT_EQ(ARM::EndianKind::BIG, ARM::parseArchEndian(thumb_1));
-      EXPECT_EQ(ARM::EndianKind::BIG, ARM::parseArchEndian(thumb_2));
-      EXPECT_EQ(ARM::EndianKind::LITTLE, ARM::parseArchEndian(thumb_3));
-
-      EXPECT_EQ(ARM::ISAKind::THUMB, ARM::parseArchISA(thumb_1));
-      EXPECT_EQ(ARM::ISAKind::THUMB, ARM::parseArchISA(thumb_2));
-      EXPECT_EQ(ARM::ISAKind::THUMB, ARM::parseArchISA(thumb_3));
-    }
-  }
-
-  EXPECT_EQ(ARM::EndianKind::LITTLE, ARM::parseArchEndian("aarch64"));
-  EXPECT_EQ(ARM::EndianKind::LITTLE, ARM::parseArchEndian("arm64_32"));
-  EXPECT_EQ(ARM::EndianKind::BIG, ARM::parseArchEndian("aarch64_be"));
-
-  EXPECT_EQ(ARM::ISAKind::AARCH64, ARM::parseArchISA("aarch64"));
-  EXPECT_EQ(ARM::ISAKind::AARCH64, ARM::parseArchISA("aarch64_be"));
-  EXPECT_EQ(ARM::ISAKind::AARCH64, ARM::parseArchISA("arm64"));
-  EXPECT_EQ(ARM::ISAKind::AARCH64, ARM::parseArchISA("arm64_be"));
-  EXPECT_EQ(ARM::ISAKind::AARCH64, ARM::parseArchISA("arm64_32"));
-  EXPECT_EQ(ARM::ISAKind::AARCH64, ARM::parseArchISA("aarch64_32"));
-}
-
-TEST(TargetParserTest, ARMparseArchProfile) {
-  for (unsigned i = 0; i < array_lengthof(ARMArch); i++) {
-    switch (ARM::parseArch(ARMArch[i])) {
-    case ARM::ArchKind::ARMV6M:
-    case ARM::ArchKind::ARMV7M:
-    case ARM::ArchKind::ARMV7EM:
-    case ARM::ArchKind::ARMV8MMainline:
-    case ARM::ArchKind::ARMV8MBaseline:
-    case ARM::ArchKind::ARMV8_1MMainline:
-      EXPECT_EQ(ARM::ProfileKind::M, ARM::parseArchProfile(ARMArch[i]));
-      break;
-    case ARM::ArchKind::ARMV7R:
-    case ARM::ArchKind::ARMV8R:
-      EXPECT_EQ(ARM::ProfileKind::R, ARM::parseArchProfile(ARMArch[i]));
-      break;
-    case ARM::ArchKind::ARMV7A:
-    case ARM::ArchKind::ARMV7VE:
-    case ARM::ArchKind::ARMV7K:
-    case ARM::ArchKind::ARMV8A:
-    case ARM::ArchKind::ARMV8_1A:
-    case ARM::ArchKind::ARMV8_2A:
-    case ARM::ArchKind::ARMV8_3A:
-    case ARM::ArchKind::ARMV8_4A:
-    case ARM::ArchKind::ARMV8_5A:
-    case ARM::ArchKind::ARMV8_6A:
-    case ARM::ArchKind::ARMV8_7A:
-      EXPECT_EQ(ARM::ProfileKind::A, ARM::parseArchProfile(ARMArch[i]));
-      break;
-    default:
-      EXPECT_EQ(ARM::ProfileKind::INVALID, ARM::parseArchProfile(ARMArch[i]));
-      break;
-    }
-  }
-}
-
-TEST(TargetParserTest, ARMparseArchVersion) {
-  for (unsigned i = 0; i < array_lengthof(ARMArch); i++)
-    if (((std::string)ARMArch[i]).substr(0, 4) == "armv")
-      EXPECT_EQ((ARMArch[i][4] - 48u), ARM::parseArchVersion(ARMArch[i]));
-    else
-      EXPECT_EQ(5u, ARM::parseArchVersion(ARMArch[i]));
-}
-
-class AArch64CPUTestFixture
-    : public ::testing::TestWithParam<ARMCPUTestParams> {};
-
-TEST_P(AArch64CPUTestFixture, testAArch64CPU) {
-  ARMCPUTestParams params = GetParam();
-
-  AArch64::ArchKind AK = AArch64::parseCPUArch(params.CPUName);
-  EXPECT_EQ(params.ExpectedArch, AArch64::getArchName(AK));
-
-  uint64_t default_extensions =
-      AArch64::getDefaultExtensions(params.CPUName, AK);
-  EXPECT_PRED_FORMAT2(AssertSameExtensionFlags<ARM::ISAKind::AARCH64>,
-                      params.ExpectedFlags, default_extensions);
-
-  unsigned FPUKind = AArch64::getDefaultFPU(params.CPUName, AK);
-  EXPECT_EQ(params.ExpectedFPU, ARM::getFPUName(FPUKind));
-
-  EXPECT_EQ(params.CPUAttr, AArch64::getCPUAttr(AK));
-}
-
-INSTANTIATE_TEST_SUITE_P(
-    AArch64CPUTests, AArch64CPUTestFixture,
-    ::testing::Values(
-        ARMCPUTestParams("invalid", "invalid", "invalid", AArch64::AEK_NONE,
-                         ""),
-        ARMCPUTestParams("generic", "invalid", "none", AArch64::AEK_NONE, ""),
-
-        ARMCPUTestParams("cortex-a34", "armv8-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_FP | AArch64::AEK_SIMD,
-                         "8-A"),
-        ARMCPUTestParams("cortex-a35", "armv8-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_FP | AArch64::AEK_SIMD,
-                         "8-A"),
-        ARMCPUTestParams("cortex-a53", "armv8-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_FP | AArch64::AEK_SIMD,
-                         "8-A"),
-        ARMCPUTestParams("cortex-a55", "armv8.2-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_FP | AArch64::AEK_SIMD |
-                             AArch64::AEK_RAS | AArch64::AEK_LSE |
-                             AArch64::AEK_RDM | AArch64::AEK_FP16 |
-                             AArch64::AEK_DOTPROD | AArch64::AEK_RCPC,
-                         "8.2-A"),
-        ARMCPUTestParams("cortex-a57", "armv8-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_FP | AArch64::AEK_SIMD,
-                         "8-A"),
-        ARMCPUTestParams("cortex-a65", "armv8.2-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_DOTPROD | AArch64::AEK_FP |
-                             AArch64::AEK_FP16 | AArch64::AEK_LSE |
-                             AArch64::AEK_RAS | AArch64::AEK_RCPC |
-                             AArch64::AEK_RDM | AArch64::AEK_SIMD |
-                             AArch64::AEK_SSBS,
-                         "8.2-A"),
-        ARMCPUTestParams("cortex-a65ae", "armv8.2-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_DOTPROD | AArch64::AEK_FP |
-                             AArch64::AEK_FP16 | AArch64::AEK_LSE |
-                             AArch64::AEK_RAS | AArch64::AEK_RCPC |
-                             AArch64::AEK_RDM | AArch64::AEK_SIMD |
-                             AArch64::AEK_SSBS,
-                         "8.2-A"),
-        ARMCPUTestParams("cortex-a72", "armv8-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_FP | AArch64::AEK_SIMD,
-                         "8-A"),
-        ARMCPUTestParams("cortex-a73", "armv8-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_FP | AArch64::AEK_SIMD,
-                         "8-A"),
-        ARMCPUTestParams("cortex-a75", "armv8.2-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_FP | AArch64::AEK_SIMD |
-                             AArch64::AEK_RAS | AArch64::AEK_LSE |
-                             AArch64::AEK_RDM | AArch64::AEK_FP16 |
-                             AArch64::AEK_DOTPROD | AArch64::AEK_RCPC,
-                         "8.2-A"),
-        ARMCPUTestParams("cortex-a76", "armv8.2-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_FP | AArch64::AEK_RDM |
-                             AArch64::AEK_SIMD | AArch64::AEK_RAS |
-                             AArch64::AEK_LSE | AArch64::AEK_FP16 |
-                             AArch64::AEK_DOTPROD | AArch64::AEK_RCPC |
-                             AArch64::AEK_SSBS,
-                         "8.2-A"),
-        ARMCPUTestParams("cortex-a76ae", "armv8.2-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_FP | AArch64::AEK_RDM |
-                             AArch64::AEK_SIMD | AArch64::AEK_RAS |
-                             AArch64::AEK_LSE | AArch64::AEK_FP16 |
-                             AArch64::AEK_DOTPROD | AArch64::AEK_RCPC |
-                             AArch64::AEK_SSBS,
-                         "8.2-A"),
-        ARMCPUTestParams("cortex-a77", "armv8.2-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_FP | AArch64::AEK_RDM |
-                             AArch64::AEK_SIMD | AArch64::AEK_RAS |
-                             AArch64::AEK_LSE | AArch64::AEK_FP16 |
-                             AArch64::AEK_DOTPROD | AArch64::AEK_RCPC |
-                             AArch64::AEK_SSBS,
-                         "8.2-A"),
-        ARMCPUTestParams("cortex-a78", "armv8.2-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_FP | AArch64::AEK_RDM |
-                             AArch64::AEK_SIMD | AArch64::AEK_RAS |
-                             AArch64::AEK_LSE | AArch64::AEK_FP16 |
-                             AArch64::AEK_DOTPROD | AArch64::AEK_RCPC |
-                             AArch64::AEK_SSBS,
-                         "8.2-A"),
-        ARMCPUTestParams("cortex-a78c", "armv8.2-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_RAS | AArch64::AEK_CRC |
-                             AArch64::AEK_CRYPTO | AArch64::AEK_FP |
-                             AArch64::AEK_SIMD | AArch64::AEK_RAS |
-                             AArch64::AEK_LSE | AArch64::AEK_RDM |
-                             AArch64::AEK_FP16 | AArch64::AEK_DOTPROD |
-                             AArch64::AEK_RCPC | AArch64::AEK_SSBS,
-                         "8.2-A"),
-        ARMCPUTestParams(
-            "neoverse-v1", "armv8.4-a", "crypto-neon-fp-armv8",
-            AArch64::AEK_RAS | AArch64::AEK_SVE | AArch64::AEK_SSBS |
-                AArch64::AEK_RCPC | AArch64::AEK_CRC | AArch64::AEK_FP |
-                AArch64::AEK_SIMD | AArch64::AEK_RAS | AArch64::AEK_LSE |
-                AArch64::AEK_RDM | AArch64::AEK_RCPC | AArch64::AEK_DOTPROD |
-                AArch64::AEK_CRYPTO | AArch64::AEK_FP16 | AArch64::AEK_BF16,
-            "8.4-A"),
-        ARMCPUTestParams("cortex-r82", "armv8-r", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_RDM |
-                             AArch64::AEK_SSBS | AArch64::AEK_DOTPROD |
-                             AArch64::AEK_FP | AArch64::AEK_SIMD |
-                             AArch64::AEK_FP16 | AArch64::AEK_FP16FML |
-                             AArch64::AEK_RAS | AArch64::AEK_RCPC |
-                             AArch64::AEK_LSE | AArch64::AEK_SB,
-                         "8-R"),
-        ARMCPUTestParams("cortex-x1", "armv8.2-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_FP | AArch64::AEK_RDM |
-                             AArch64::AEK_SIMD | AArch64::AEK_RAS |
-                             AArch64::AEK_LSE | AArch64::AEK_FP16 |
-                             AArch64::AEK_DOTPROD | AArch64::AEK_RCPC |
-                             AArch64::AEK_SSBS,
-                         "8.2-A"),
-        ARMCPUTestParams("cyclone", "armv8-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_NONE | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_FP | AArch64::AEK_SIMD,
-                         "8-A"),
-        ARMCPUTestParams("apple-a7", "armv8-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_NONE | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_FP | AArch64::AEK_SIMD,
-                         "8-A"),
-        ARMCPUTestParams("apple-a8", "armv8-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_NONE | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_FP | AArch64::AEK_SIMD,
-                         "8-A"),
-        ARMCPUTestParams("apple-a9", "armv8-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_NONE | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_FP | AArch64::AEK_SIMD,
-                         "8-A"),
-        ARMCPUTestParams("apple-a10", "armv8-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_FP | AArch64::AEK_RDM |
-                             AArch64::AEK_SIMD,
-                         "8-A"),
-        ARMCPUTestParams("apple-a11", "armv8.2-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_FP | AArch64::AEK_LSE |
-                             AArch64::AEK_RAS | AArch64::AEK_RDM |
-                             AArch64::AEK_SIMD | AArch64::AEK_FP16,
-                         "8.2-A"),
-        ARMCPUTestParams("apple-a12", "armv8.3-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_FP | AArch64::AEK_SIMD |
-                             AArch64::AEK_LSE | AArch64::AEK_RAS |
-                             AArch64::AEK_RDM | AArch64::AEK_RCPC |
-                             AArch64::AEK_FP16,
-                         "8.3-A"),
-        ARMCPUTestParams("apple-a13", "armv8.4-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_FP | AArch64::AEK_SIMD |
-                             AArch64::AEK_LSE | AArch64::AEK_RAS |
-                             AArch64::AEK_RDM | AArch64::AEK_RCPC |
-                             AArch64::AEK_DOTPROD | AArch64::AEK_FP16 |
-                             AArch64::AEK_FP16FML,
-                         "8.4-A"),
-        ARMCPUTestParams("apple-a14", "armv8.5-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_FP | AArch64::AEK_SIMD |
-                             AArch64::AEK_LSE | AArch64::AEK_RAS |
-                             AArch64::AEK_RDM | AArch64::AEK_RCPC |
-                             AArch64::AEK_DOTPROD | AArch64::AEK_FP16 |
-                             AArch64::AEK_FP16FML,
-                         "8.5-A"),
-        ARMCPUTestParams("apple-m1", "armv8.5-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_FP | AArch64::AEK_SIMD |
-                             AArch64::AEK_LSE | AArch64::AEK_RAS |
-                             AArch64::AEK_RDM | AArch64::AEK_RCPC |
-                             AArch64::AEK_DOTPROD | AArch64::AEK_FP16 |
-                             AArch64::AEK_FP16FML,
-                         "8.5-A"),
-        ARMCPUTestParams("apple-s4", "armv8.3-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_FP | AArch64::AEK_SIMD |
-                             AArch64::AEK_LSE | AArch64::AEK_RAS |
-                             AArch64::AEK_RDM | AArch64::AEK_RCPC |
-                             AArch64::AEK_FP16,
-                         "8.3-A"),
-        ARMCPUTestParams("apple-s5", "armv8.3-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_FP | AArch64::AEK_SIMD |
-                             AArch64::AEK_LSE | AArch64::AEK_RAS |
-                             AArch64::AEK_RDM | AArch64::AEK_RCPC |
-                             AArch64::AEK_FP16,
-                         "8.3-A"),
-        ARMCPUTestParams("exynos-m3", "armv8-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_FP | AArch64::AEK_SIMD,
-                         "8-A"),
-        ARMCPUTestParams("exynos-m4", "armv8.2-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_DOTPROD | AArch64::AEK_FP |
-                             AArch64::AEK_FP16 | AArch64::AEK_LSE |
-                             AArch64::AEK_RAS | AArch64::AEK_RDM |
-                             AArch64::AEK_SIMD,
-                         "8.2-A"),
-        ARMCPUTestParams("exynos-m5", "armv8.2-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_DOTPROD | AArch64::AEK_FP |
-                             AArch64::AEK_FP16 | AArch64::AEK_LSE |
-                             AArch64::AEK_RAS | AArch64::AEK_RDM |
-                             AArch64::AEK_SIMD,
-                         "8.2-A"),
-        ARMCPUTestParams("falkor", "armv8-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_FP | AArch64::AEK_SIMD |
-                             AArch64::AEK_RDM,
-                         "8-A"),
-        ARMCPUTestParams("kryo", "armv8-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_FP | AArch64::AEK_SIMD,
-                         "8-A"),
-        ARMCPUTestParams("neoverse-e1", "armv8.2-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_DOTPROD | AArch64::AEK_FP |
-                             AArch64::AEK_FP16 | AArch64::AEK_LSE |
-                             AArch64::AEK_RAS | AArch64::AEK_RCPC |
-                             AArch64::AEK_RDM | AArch64::AEK_SIMD |
-                             AArch64::AEK_SSBS,
-                         "8.2-A"),
-        ARMCPUTestParams("neoverse-n1", "armv8.2-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_DOTPROD | AArch64::AEK_FP |
-                             AArch64::AEK_FP16 | AArch64::AEK_LSE |
-                             AArch64::AEK_PROFILE | AArch64::AEK_RAS |
-                             AArch64::AEK_RCPC | AArch64::AEK_RDM |
-                             AArch64::AEK_SIMD | AArch64::AEK_SSBS,
-                         "8.2-A"),
-        ARMCPUTestParams("neoverse-n2", "armv8.5-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_FP | AArch64::AEK_SIMD |
-                             AArch64::AEK_FP16 | AArch64::AEK_RAS |
-                             AArch64::AEK_LSE | AArch64::AEK_SVE |
-                             AArch64::AEK_DOTPROD | AArch64::AEK_RCPC |
-                             AArch64::AEK_RDM | AArch64::AEK_MTE |
-                             AArch64::AEK_SSBS | AArch64::AEK_SB |
-                             AArch64::AEK_SVE2 | AArch64::AEK_SVE2BITPERM |
-                             AArch64::AEK_BF16 | AArch64::AEK_I8MM,
-                         "8.5-A"),
-        ARMCPUTestParams("thunderx2t99", "armv8.1-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_NONE | AArch64::AEK_CRC |
-                             AArch64::AEK_CRYPTO | AArch64::AEK_LSE |
-                             AArch64::AEK_RDM | AArch64::AEK_FP |
-                             AArch64::AEK_SIMD,
-                         "8.1-A"),
-        ARMCPUTestParams("thunderx3t110", "armv8.3-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_LSE | AArch64::AEK_RDM |
-                             AArch64::AEK_FP | AArch64::AEK_SIMD |
-                             AArch64::AEK_PROFILE | AArch64::AEK_RAS |
-                             AArch64::AEK_RAND | AArch64::AEK_RCPC,
-                         "8.3-A"),
-        ARMCPUTestParams("thunderx", "armv8-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_SIMD | AArch64::AEK_FP |
-                             AArch64::AEK_PROFILE,
-                         "8-A"),
-        ARMCPUTestParams("thunderxt81", "armv8-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_SIMD | AArch64::AEK_FP |
-                             AArch64::AEK_PROFILE,
-                         "8-A"),
-        ARMCPUTestParams("thunderxt83", "armv8-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_SIMD | AArch64::AEK_FP |
-                             AArch64::AEK_PROFILE,
-                         "8-A"),
-        ARMCPUTestParams("thunderxt88", "armv8-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_SIMD | AArch64::AEK_FP |
-                             AArch64::AEK_PROFILE,
-                         "8-A"),
-        ARMCPUTestParams("tsv110", "armv8.2-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_FP | AArch64::AEK_SIMD |
-                             AArch64::AEK_RAS | AArch64::AEK_LSE |
-                             AArch64::AEK_RDM | AArch64::AEK_PROFILE |
-                             AArch64::AEK_FP16 | AArch64::AEK_FP16FML |
-                             AArch64::AEK_DOTPROD,
-                         "8.2-A"),
-        ARMCPUTestParams("a64fx", "armv8.2-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_FP | AArch64::AEK_SIMD |
-                             AArch64::AEK_FP16 | AArch64::AEK_RAS |
-                             AArch64::AEK_LSE | AArch64::AEK_SVE |
-                             AArch64::AEK_RDM,
-                         "8.2-A"),
-        ARMCPUTestParams("carmel", "armv8.2-a", "crypto-neon-fp-armv8",
-                         AArch64::AEK_CRC | AArch64::AEK_CRYPTO |
-                             AArch64::AEK_FP | AArch64::AEK_SIMD |
-                             AArch64::AEK_FP16 | AArch64::AEK_RAS |
-                             AArch64::AEK_LSE | AArch64::AEK_RDM,
-                         "8.2-A")));
-
-static constexpr unsigned NumAArch64CPUArchs = 48;
-
-TEST(TargetParserTest, testAArch64CPUArchList) {
-  SmallVector<StringRef, NumAArch64CPUArchs> List;
-  AArch64::fillValidCPUArchList(List);
-
-  // No list exists for these in this test suite, so ensure all are
-  // valid, and match the expected 'magic' count.
-  EXPECT_EQ(List.size(), NumAArch64CPUArchs);
-  for(StringRef CPU : List) {
-    EXPECT_NE(AArch64::parseCPUArch(CPU), AArch64::ArchKind::INVALID);
-  }
-}
-
-bool testAArch64Arch(StringRef Arch, StringRef DefaultCPU, StringRef SubArch,
-                     unsigned ArchAttr) {
-  AArch64::ArchKind AK = AArch64::parseArch(Arch);
-  return (AK != AArch64::ArchKind::INVALID) &
-         AArch64::getDefaultCPU(Arch).equals(DefaultCPU) &
-         AArch64::getSubArch(AK).equals(SubArch) &
-         (AArch64::getArchAttr(AK) == ArchAttr);
-}
-
-TEST(TargetParserTest, testAArch64Arch) {
-  EXPECT_TRUE(testAArch64Arch("armv8-a", "cortex-a53", "v8",
-                              ARMBuildAttrs::CPUArch::v8_A));
-  EXPECT_TRUE(testAArch64Arch("armv8.1-a", "generic", "v8.1a",
-                              ARMBuildAttrs::CPUArch::v8_A));
-  EXPECT_TRUE(testAArch64Arch("armv8.2-a", "generic", "v8.2a",
-                              ARMBuildAttrs::CPUArch::v8_A));
-  EXPECT_TRUE(testAArch64Arch("armv8.3-a", "generic", "v8.3a",
-                              ARMBuildAttrs::CPUArch::v8_A));
-  EXPECT_TRUE(testAArch64Arch("armv8.4-a", "generic", "v8.4a",
-                              ARMBuildAttrs::CPUArch::v8_A));
-  EXPECT_TRUE(testAArch64Arch("armv8.5-a", "generic", "v8.5a",
-                              ARMBuildAttrs::CPUArch::v8_A));
-  EXPECT_TRUE(testAArch64Arch("armv8.6-a", "generic", "v8.6a",
-                              ARMBuildAttrs::CPUArch::v8_A));
-  EXPECT_TRUE(testAArch64Arch("armv8.7-a", "generic", "v8.7a",
-                              ARMBuildAttrs::CPUArch::v8_A));
-}
-
-bool testAArch64Extension(StringRef CPUName, AArch64::ArchKind AK,
-                          StringRef ArchExt) {
-  return AArch64::getDefaultExtensions(CPUName, AK) &
-         AArch64::parseArchExt(ArchExt);
-}
-
-TEST(TargetParserTest, testAArch64Extension) {
-  EXPECT_FALSE(testAArch64Extension("cortex-a34",
-                                    AArch64::ArchKind::INVALID, "ras"));
-  EXPECT_FALSE(testAArch64Extension("cortex-a35",
-                                    AArch64::ArchKind::INVALID, "ras"));
-  EXPECT_FALSE(testAArch64Extension("cortex-a53",
-                                    AArch64::ArchKind::INVALID, "ras"));
-  EXPECT_TRUE(testAArch64Extension("cortex-a55",
-                                    AArch64::ArchKind::INVALID, "ras"));
-  EXPECT_TRUE(testAArch64Extension("cortex-a55",
-                                    AArch64::ArchKind::INVALID, "fp16"));
-  EXPECT_FALSE(testAArch64Extension("cortex-a55",
-                                    AArch64::ArchKind::INVALID, "fp16fml"));
-  EXPECT_TRUE(testAArch64Extension("cortex-a55",
-                                    AArch64::ArchKind::INVALID, "dotprod"));
-  EXPECT_FALSE(testAArch64Extension("cortex-a57",
-                                    AArch64::ArchKind::INVALID, "ras"));
-  EXPECT_FALSE(testAArch64Extension("cortex-a72",
-                                    AArch64::ArchKind::INVALID, "ras"));
-  EXPECT_FALSE(testAArch64Extension("cortex-a73",
-                                    AArch64::ArchKind::INVALID, "ras"));
-  EXPECT_TRUE(testAArch64Extension("cortex-a75",
-                                    AArch64::ArchKind::INVALID, "ras"));
-  EXPECT_TRUE(testAArch64Extension("cortex-a75",
-                                    AArch64::ArchKind::INVALID, "fp16"));
-  EXPECT_FALSE(testAArch64Extension("cortex-a75",
-                                    AArch64::ArchKind::INVALID, "fp16fml"));
-  EXPECT_TRUE(testAArch64Extension("cortex-a75",
-                                   AArch64::ArchKind::INVALID, "dotprod"));
-  EXPECT_TRUE(testAArch64Extension("cortex-r82",
-                                   AArch64::ArchKind::INVALID, "ras"));
-  EXPECT_TRUE(testAArch64Extension("cortex-r82",
-                                   AArch64::ArchKind::INVALID, "fp16"));
-  EXPECT_TRUE(testAArch64Extension("cortex-r82",
-                                   AArch64::ArchKind::INVALID, "fp16fml"));
-  EXPECT_TRUE(testAArch64Extension("cortex-r82",
-                                   AArch64::ArchKind::INVALID, "dotprod"));
-  EXPECT_TRUE(testAArch64Extension("cortex-r82",
-                                   AArch64::ArchKind::INVALID, "lse"));
-  EXPECT_FALSE(testAArch64Extension("cyclone",
-                                    AArch64::ArchKind::INVALID, "ras"));
-  EXPECT_FALSE(testAArch64Extension("exynos-m3",
-                                    AArch64::ArchKind::INVALID, "ras"));
-  EXPECT_TRUE(testAArch64Extension("exynos-m4",
-                                   AArch64::ArchKind::INVALID, "dotprod"));
-  EXPECT_TRUE(testAArch64Extension("exynos-m4",
-                                   AArch64::ArchKind::INVALID, "fp16"));
-  EXPECT_TRUE(testAArch64Extension("exynos-m4",
-                                   AArch64::ArchKind::INVALID, "lse"));
-  EXPECT_TRUE(testAArch64Extension("exynos-m4",
-                                   AArch64::ArchKind::INVALID, "ras"));
-  EXPECT_TRUE(testAArch64Extension("exynos-m4",
-                                   AArch64::ArchKind::INVALID, "rdm"));
-  EXPECT_TRUE(testAArch64Extension("exynos-m5",
-                                   AArch64::ArchKind::INVALID, "dotprod"));
-  EXPECT_TRUE(testAArch64Extension("exynos-m5",
-                                   AArch64::ArchKind::INVALID, "fp16"));
-  EXPECT_TRUE(testAArch64Extension("exynos-m5",
-                                   AArch64::ArchKind::INVALID, "lse"));
-  EXPECT_TRUE(testAArch64Extension("exynos-m5",
-                                   AArch64::ArchKind::INVALID, "ras"));
-  EXPECT_TRUE(testAArch64Extension("exynos-m5",
-                                   AArch64::ArchKind::INVALID, "rdm"));
-  EXPECT_TRUE(testAArch64Extension("falkor",
-                                   AArch64::ArchKind::INVALID, "rdm"));
-  EXPECT_FALSE(testAArch64Extension("kryo",
-                                    AArch64::ArchKind::INVALID, "ras"));
-  EXPECT_TRUE(testAArch64Extension("saphira",
-                                    AArch64::ArchKind::INVALID, "crc"));
-  EXPECT_TRUE(testAArch64Extension("saphira",
-                                    AArch64::ArchKind::INVALID, "lse"));
-  EXPECT_TRUE(testAArch64Extension("saphira",
-                                   AArch64::ArchKind::INVALID, "rdm"));
-  EXPECT_TRUE(testAArch64Extension("saphira",
-                                   AArch64::ArchKind::INVALID, "ras"));
-  EXPECT_TRUE(testAArch64Extension("saphira",
-                                   AArch64::ArchKind::INVALID, "rcpc"));
-  EXPECT_TRUE(testAArch64Extension("saphira",
-                                   AArch64::ArchKind::INVALID, "profile"));
-  EXPECT_FALSE(testAArch64Extension("saphira",
-                                    AArch64::ArchKind::INVALID, "fp16"));
-  EXPECT_FALSE(testAArch64Extension("thunderx2t99",
-                                    AArch64::ArchKind::INVALID, "ras"));
-  EXPECT_FALSE(testAArch64Extension("thunderx",
-                                    AArch64::ArchKind::INVALID, "lse"));
-  EXPECT_FALSE(testAArch64Extension("thunderxt81",
-                                    AArch64::ArchKind::INVALID, "lse"));
-  EXPECT_FALSE(testAArch64Extension("thunderxt83",
-                                    AArch64::ArchKind::INVALID, "lse"));
-  EXPECT_FALSE(testAArch64Extension("thunderxt88",
-                                    AArch64::ArchKind::INVALID, "lse"));
-  EXPECT_TRUE(testAArch64Extension("tsv110",
-                                   AArch64::ArchKind::INVALID, "crypto"));
-  EXPECT_FALSE(testAArch64Extension("tsv110",
-                                    AArch64::ArchKind::INVALID, "sha3"));
-  EXPECT_FALSE(testAArch64Extension("tsv110",
-                                    AArch64::ArchKind::INVALID, "sm4"));
-  EXPECT_TRUE(testAArch64Extension("tsv110",
-                                   AArch64::ArchKind::INVALID, "ras"));
-  EXPECT_TRUE(testAArch64Extension("tsv110",
-                                   AArch64::ArchKind::INVALID, "profile"));
-  EXPECT_TRUE(testAArch64Extension("tsv110",
-                                   AArch64::ArchKind::INVALID, "fp16"));
-  EXPECT_TRUE(testAArch64Extension("tsv110",
-                                   AArch64::ArchKind::INVALID, "fp16fml"));
-  EXPECT_TRUE(testAArch64Extension("tsv110",
-                                   AArch64::ArchKind::INVALID, "dotprod"));
-  EXPECT_TRUE(testAArch64Extension("a64fx",
-                                   AArch64::ArchKind::INVALID, "fp16"));
-  EXPECT_TRUE(testAArch64Extension("a64fx",
-                                   AArch64::ArchKind::INVALID, "sve"));
-  EXPECT_FALSE(testAArch64Extension("a64fx",
-                                   AArch64::ArchKind::INVALID, "sve2"));
-  EXPECT_TRUE(
-      testAArch64Extension("carmel", AArch64::ArchKind::INVALID, "crypto"));
-  EXPECT_TRUE(
-      testAArch64Extension("carmel", AArch64::ArchKind::INVALID, "fp16"));
-
-  EXPECT_FALSE(testAArch64Extension(
-      "generic", AArch64::ArchKind::ARMV8A, "ras"));
-  EXPECT_FALSE(testAArch64Extension(
-      "generic", AArch64::ArchKind::ARMV8_1A, "ras"));
-  EXPECT_FALSE(testAArch64Extension(
-      "generic", AArch64::ArchKind::ARMV8_2A, "profile"));
-  EXPECT_FALSE(testAArch64Extension(
-      "generic", AArch64::ArchKind::ARMV8_2A, "fp16"));
-  EXPECT_FALSE(testAArch64Extension(
-      "generic", AArch64::ArchKind::ARMV8_2A, "fp16fml"));
-  EXPECT_FALSE(testAArch64Extension(
-      "generic", AArch64::ArchKind::ARMV8_3A, "fp16"));
-  EXPECT_FALSE(testAArch64Extension(
-      "generic", AArch64::ArchKind::ARMV8_3A, "fp16fml"));
-  EXPECT_FALSE(testAArch64Extension(
-      "generic", AArch64::ArchKind::ARMV8_4A, "fp16"));
-  EXPECT_FALSE(testAArch64Extension(
-      "generic", AArch64::ArchKind::ARMV8_4A, "fp16fml"));
-}
-
-TEST(TargetParserTest, AArch64ExtensionFeatures) {
-  std::vector<uint64_t> Extensions = {
-    AArch64::AEK_CRC,      AArch64::AEK_CRYPTO,
-    AArch64::AEK_FP,       AArch64::AEK_SIMD,
-    AArch64::AEK_FP16,     AArch64::AEK_PROFILE,
-    AArch64::AEK_RAS,      AArch64::AEK_LSE,
-    AArch64::AEK_RDM,      AArch64::AEK_DOTPROD,
-    AArch64::AEK_SVE,      AArch64::AEK_SVE2,
-    AArch64::AEK_SVE2AES,  AArch64::AEK_SVE2SM4,
-    AArch64::AEK_SVE2SHA3, AArch64::AEK_SVE2BITPERM,
-    AArch64::AEK_RCPC,     AArch64::AEK_FP16FML,
-    AArch64::AEK_SME,      AArch64::AEK_SMEF64,
-    AArch64::AEK_SMEI64 };
-
-  std::vector<StringRef> Features;
-
-  uint64_t ExtVal = 0;
-  for (auto Ext : Extensions)
-    ExtVal |= Ext;
-
-  EXPECT_FALSE(AArch64::getExtensionFeatures(AArch64::AEK_INVALID, Features));
-  EXPECT_TRUE(!Features.size());
-
-  AArch64::getExtensionFeatures(ExtVal, Features);
-  EXPECT_TRUE(Extensions.size() == Features.size());
-
-  EXPECT_TRUE(llvm::is_contained(Features, "+crc"));
-  EXPECT_TRUE(llvm::is_contained(Features, "+crypto"));
-  EXPECT_TRUE(llvm::is_contained(Features, "+fp-armv8"));
-  EXPECT_TRUE(llvm::is_contained(Features, "+neon"));
-  EXPECT_TRUE(llvm::is_contained(Features, "+fullfp16"));
-  EXPECT_TRUE(llvm::is_contained(Features, "+spe"));
-  EXPECT_TRUE(llvm::is_contained(Features, "+ras"));
-  EXPECT_TRUE(llvm::is_contained(Features, "+lse"));
-  EXPECT_TRUE(llvm::is_contained(Features, "+rdm"));
-  EXPECT_TRUE(llvm::is_contained(Features, "+dotprod"));
-  EXPECT_TRUE(llvm::is_contained(Features, "+rcpc"));
-  EXPECT_TRUE(llvm::is_contained(Features, "+fp16fml"));
-  EXPECT_TRUE(llvm::is_contained(Features, "+sve"));
-  EXPECT_TRUE(llvm::is_contained(Features, "+sve2"));
-  EXPECT_TRUE(llvm::is_contained(Features, "+sve2-aes"));
-  EXPECT_TRUE(llvm::is_contained(Features, "+sve2-sm4"));
-  EXPECT_TRUE(llvm::is_contained(Features, "+sve2-sha3"));
-  EXPECT_TRUE(llvm::is_contained(Features, "+sve2-bitperm"));
-  EXPECT_TRUE(llvm::is_contained(Features, "+sme"));
-  EXPECT_TRUE(llvm::is_contained(Features, "+sme-f64"));
-  EXPECT_TRUE(llvm::is_contained(Features, "+sme-i64"));
-}
-
-TEST(TargetParserTest, AArch64ArchFeatures) {
-  std::vector<StringRef> Features;
-
-  for (auto AK : AArch64::ArchKinds)
-    EXPECT_TRUE((AK == AArch64::ArchKind::INVALID)
-                    ? !AArch64::getArchFeatures(AK, Features)
-                    : AArch64::getArchFeatures(AK, Features));
-}
-
-TEST(TargetParserTest, AArch64ArchExtFeature) {
-  const char *ArchExt[][4] = {{"crc", "nocrc", "+crc", "-crc"},
-                              {"crypto", "nocrypto", "+crypto", "-crypto"},
-                              {"flagm", "noflagm", "+flagm", "-flagm"},
-                              {"fp", "nofp", "+fp-armv8", "-fp-armv8"},
-                              {"simd", "nosimd", "+neon", "-neon"},
-                              {"fp16", "nofp16", "+fullfp16", "-fullfp16"},
-                              {"fp16fml", "nofp16fml", "+fp16fml", "-fp16fml"},
-                              {"profile", "noprofile", "+spe", "-spe"},
-                              {"ras", "noras", "+ras", "-ras"},
-                              {"lse", "nolse", "+lse", "-lse"},
-                              {"rdm", "nordm", "+rdm", "-rdm"},
-                              {"sve", "nosve", "+sve", "-sve"},
-                              {"sve2", "nosve2", "+sve2", "-sve2"},
-                              {"sve2-aes", "nosve2-aes", "+sve2-aes",
-                               "-sve2-aes"},
-                              {"sve2-sm4", "nosve2-sm4", "+sve2-sm4",
-                               "-sve2-sm4"},
-                              {"sve2-sha3", "nosve2-sha3", "+sve2-sha3",
-                               "-sve2-sha3"},
-                              {"sve2-bitperm", "nosve2-bitperm",
-                               "+sve2-bitperm", "-sve2-bitperm"},
-                              {"dotprod", "nodotprod", "+dotprod", "-dotprod"},
-                              {"rcpc", "norcpc", "+rcpc", "-rcpc" },
-                              {"rng", "norng", "+rand", "-rand"},
-                              {"memtag", "nomemtag", "+mte", "-mte"},
-                              {"tme", "notme", "+tme", "-tme"},
-                              {"pauth", "nopauth", "+pauth", "-pauth"},
-                              {"ssbs", "nossbs", "+ssbs", "-ssbs"},
-                              {"sb", "nosb", "+sb", "-sb"},
-                              {"predres", "nopredres", "+predres", "-predres"},
-                              {"i8mm", "noi8mm", "+i8mm", "-i8mm"},
-                              {"f32mm", "nof32mm", "+f32mm", "-f32mm"},
-                              {"f64mm", "nof64mm", "+f64mm", "-f64mm"},
-                              {"sme", "nosme", "+sme", "-sme"},
-                              {"sme-f64", "nosme-f64", "+sme-f64", "-sme-f64"},
-                              {"sme-i64", "nosme-i64", "+sme-i64", "-sme-i64"},
-};
-
-  for (unsigned i = 0; i < array_lengthof(ArchExt); i++) {
-    EXPECT_EQ(StringRef(ArchExt[i][2]),
-              AArch64::getArchExtFeature(ArchExt[i][0]));
-    EXPECT_EQ(StringRef(ArchExt[i][3]),
-              AArch64::getArchExtFeature(ArchExt[i][1]));
-  }
-}
-
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/Support/TaskQueueTest.cpp b/gnu/llvm/llvm/unittests/Support/TaskQueueTest.cpp
deleted file mode 100644
index 4d8c3e4064b..00000000000
--- a/gnu/llvm/llvm/unittests/Support/TaskQueueTest.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-//========- unittests/Support/TaskQueue.cpp - TaskQueue.h tests ------========//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Config/llvm-config.h"
-
-#if LLVM_ENABLE_THREADS
-
-#include "llvm/Support/TaskQueue.h"
-
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-class TaskQueueTest : public testing::Test {
-protected:
-  TaskQueueTest() {}
-};
-
-TEST_F(TaskQueueTest, OrderedFutures) {
-  ThreadPool TP(hardware_concurrency(1));
-  TaskQueue TQ(TP);
-  std::atomic<int> X{ 0 };
-  std::atomic<int> Y{ 0 };
-  std::atomic<int> Z{ 0 };
-
-  std::mutex M1, M2, M3;
-  std::unique_lock<std::mutex> L1(M1);
-  std::unique_lock<std::mutex> L2(M2);
-  std::unique_lock<std::mutex> L3(M3);
-
-  std::future<void> F1 = TQ.async([&] {
-    std::unique_lock<std::mutex> Lock(M1);
-    ++X;
-  });
-  std::future<void> F2 = TQ.async([&] {
-    std::unique_lock<std::mutex> Lock(M2);
-    ++Y;
-  });
-  std::future<void> F3 = TQ.async([&] {
-    std::unique_lock<std::mutex> Lock(M3);
-    ++Z;
-  });
-
-  L1.unlock();
-  F1.wait();
-  ASSERT_EQ(1, X);
-  ASSERT_EQ(0, Y);
-  ASSERT_EQ(0, Z);
-
-  L2.unlock();
-  F2.wait();
-  ASSERT_EQ(1, X);
-  ASSERT_EQ(1, Y);
-  ASSERT_EQ(0, Z);
-
-  L3.unlock();
-  F3.wait();
-  ASSERT_EQ(1, X);
-  ASSERT_EQ(1, Y);
-  ASSERT_EQ(1, Z);
-}
-
-TEST_F(TaskQueueTest, UnOrderedFutures) {
-  ThreadPool TP(hardware_concurrency(1));
-  TaskQueue TQ(TP);
-  std::atomic<int> X{ 0 };
-  std::atomic<int> Y{ 0 };
-  std::atomic<int> Z{ 0 };
-  std::mutex M;
-
-  std::unique_lock<std::mutex> Lock(M);
-
-  std::future<void> F1 = TQ.async([&] { ++X; });
-  std::future<void> F2 = TQ.async([&] { ++Y; });
-  std::future<void> F3 = TQ.async([&M, &Z] {
-    std::unique_lock<std::mutex> Lock(M);
-    ++Z;
-  });
-
-  F2.wait();
-  ASSERT_EQ(1, X);
-  ASSERT_EQ(1, Y);
-  ASSERT_EQ(0, Z);
-
-  Lock.unlock();
-
-  F3.wait();
-  ASSERT_EQ(1, X);
-  ASSERT_EQ(1, Y);
-  ASSERT_EQ(1, Z);
-}
-
-TEST_F(TaskQueueTest, FutureWithReturnValue) {
-  ThreadPool TP(hardware_concurrency(1));
-  TaskQueue TQ(TP);
-  std::future<std::string> F1 = TQ.async([&] { return std::string("Hello"); });
-  std::future<int> F2 = TQ.async([&] { return 42; });
-
-  ASSERT_EQ(42, F2.get());
-  ASSERT_EQ("Hello", F1.get());
-}
-#endif
diff --git a/gnu/llvm/llvm/unittests/Support/ThreadLocalTest.cpp b/gnu/llvm/llvm/unittests/Support/ThreadLocalTest.cpp
deleted file mode 100644
index 075d7d95b25..00000000000
--- a/gnu/llvm/llvm/unittests/Support/ThreadLocalTest.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-//===- llvm/unittest/Support/ThreadLocalTest.cpp - ThreadLocal tests ------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/ThreadLocal.h"
-#include "gtest/gtest.h"
-#include <type_traits>
-
-using namespace llvm;
-using namespace sys;
-
-namespace {
-
-class ThreadLocalTest : public ::testing::Test {
-};
-
-struct S {
-  int i;
-};
-
-TEST_F(ThreadLocalTest, Basics) {
-  ThreadLocal<const S> x;
-
-  static_assert(
-      std::is_const<std::remove_pointer<decltype(x.get())>::type>::value,
-      "ThreadLocal::get didn't return a pointer to const object");
-
-  EXPECT_EQ(nullptr, x.get());
-
-  S s;
-  x.set(&s);
-  EXPECT_EQ(&s, x.get());
-
-  x.erase();
-  EXPECT_EQ(nullptr, x.get());
-
-  ThreadLocal<S> y;
-
-  static_assert(
-      !std::is_const<std::remove_pointer<decltype(y.get())>::type>::value,
-      "ThreadLocal::get returned a pointer to const object");
-
-  EXPECT_EQ(nullptr, y.get());
-
-  y.set(&s);
-  EXPECT_EQ(&s, y.get());
-
-  y.erase();
-  EXPECT_EQ(nullptr, y.get());
-}
-
-}
diff --git a/gnu/llvm/llvm/unittests/Support/ThreadPool.cpp b/gnu/llvm/llvm/unittests/Support/ThreadPool.cpp
deleted file mode 100644
index a560d5069bf..00000000000
--- a/gnu/llvm/llvm/unittests/Support/ThreadPool.cpp
+++ /dev/null
@@ -1,274 +0,0 @@
-//========- unittests/Support/ThreadPools.cpp - ThreadPools.h tests --========//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/ThreadPool.h"
-
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/SetVector.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/Triple.h"
-#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/Host.h"
-#include "llvm/Support/Program.h"
-#include "llvm/Support/TargetSelect.h"
-#include "llvm/Support/Threading.h"
-
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-// Fixture for the unittests, allowing to *temporarily* disable the unittests
-// on a particular platform
-class ThreadPoolTest : public testing::Test {
-  Triple Host;
-  SmallVector<Triple::ArchType, 4> UnsupportedArchs;
-  SmallVector<Triple::OSType, 4> UnsupportedOSs;
-  SmallVector<Triple::EnvironmentType, 1> UnsupportedEnvironments;
-protected:
-  // This is intended for platform as a temporary "XFAIL"
-  bool isUnsupportedOSOrEnvironment() {
-    Triple Host(Triple::normalize(sys::getProcessTriple()));
-
-    if (find(UnsupportedEnvironments, Host.getEnvironment()) !=
-        UnsupportedEnvironments.end())
-      return true;
-
-    if (is_contained(UnsupportedOSs, Host.getOS()))
-      return true;
-
-    if (is_contained(UnsupportedArchs, Host.getArch()))
-      return true;
-
-    return false;
-  }
-
-  ThreadPoolTest() {
-    // Add unsupported configuration here, example:
-    //   UnsupportedArchs.push_back(Triple::x86_64);
-
-    // See https://llvm.org/bugs/show_bug.cgi?id=25829
-    UnsupportedArchs.push_back(Triple::ppc64le);
-    UnsupportedArchs.push_back(Triple::ppc64);
-  }
-
-  /// Make sure this thread not progress faster than the main thread.
-  void waitForMainThread() {
-    std::unique_lock<std::mutex> LockGuard(WaitMainThreadMutex);
-    WaitMainThread.wait(LockGuard, [&] { return MainThreadReady; });
-  }
-
-  /// Set the readiness of the main thread.
-  void setMainThreadReady() {
-    {
-      std::unique_lock<std::mutex> LockGuard(WaitMainThreadMutex);
-      MainThreadReady = true;
-    }
-    WaitMainThread.notify_all();
-  }
-
-  void SetUp() override { MainThreadReady = false; }
-
-  std::vector<llvm::BitVector> RunOnAllSockets(ThreadPoolStrategy S);
-
-  std::condition_variable WaitMainThread;
-  std::mutex WaitMainThreadMutex;
-  bool MainThreadReady = false;
-};
-
-#define CHECK_UNSUPPORTED()                                                    \
-  do {                                                                         \
-    if (isUnsupportedOSOrEnvironment())                                        \
-      return;                                                                  \
-  } while (0);
-
-TEST_F(ThreadPoolTest, AsyncBarrier) {
-  CHECK_UNSUPPORTED();
-  // test that async & barrier work together properly.
-
-  std::atomic_int checked_in{0};
-
-  ThreadPool Pool;
-  for (size_t i = 0; i < 5; ++i) {
-    Pool.async([this, &checked_in] {
-      waitForMainThread();
-      ++checked_in;
-    });
-  }
-  ASSERT_EQ(0, checked_in);
-  setMainThreadReady();
-  Pool.wait();
-  ASSERT_EQ(5, checked_in);
-}
-
-static void TestFunc(std::atomic_int &checked_in, int i) { checked_in += i; }
-
-TEST_F(ThreadPoolTest, AsyncBarrierArgs) {
-  CHECK_UNSUPPORTED();
-  // Test that async works with a function requiring multiple parameters.
-  std::atomic_int checked_in{0};
-
-  ThreadPool Pool;
-  for (size_t i = 0; i < 5; ++i) {
-    Pool.async(TestFunc, std::ref(checked_in), i);
-  }
-  Pool.wait();
-  ASSERT_EQ(10, checked_in);
-}
-
-TEST_F(ThreadPoolTest, Async) {
-  CHECK_UNSUPPORTED();
-  ThreadPool Pool;
-  std::atomic_int i{0};
-  Pool.async([this, &i] {
-    waitForMainThread();
-    ++i;
-  });
-  Pool.async([&i] { ++i; });
-  ASSERT_NE(2, i.load());
-  setMainThreadReady();
-  Pool.wait();
-  ASSERT_EQ(2, i.load());
-}
-
-TEST_F(ThreadPoolTest, GetFuture) {
-  CHECK_UNSUPPORTED();
-  ThreadPool Pool(hardware_concurrency(2));
-  std::atomic_int i{0};
-  Pool.async([this, &i] {
-    waitForMainThread();
-    ++i;
-  });
-  // Force the future using get()
-  Pool.async([&i] { ++i; }).get();
-  ASSERT_NE(2, i.load());
-  setMainThreadReady();
-  Pool.wait();
-  ASSERT_EQ(2, i.load());
-}
-
-TEST_F(ThreadPoolTest, PoolDestruction) {
-  CHECK_UNSUPPORTED();
-  // Test that we are waiting on destruction
-  std::atomic_int checked_in{0};
-  {
-    ThreadPool Pool;
-    for (size_t i = 0; i < 5; ++i) {
-      Pool.async([this, &checked_in] {
-        waitForMainThread();
-        ++checked_in;
-      });
-    }
-    ASSERT_EQ(0, checked_in);
-    setMainThreadReady();
-  }
-  ASSERT_EQ(5, checked_in);
-}
-
-#if LLVM_ENABLE_THREADS == 1
-
-// FIXME: Skip some tests below on non-Windows because multi-socket systems
-// were not fully tested on Unix yet, and llvm::get_thread_affinity_mask()
-// isn't implemented for Unix (need AffinityMask in Support/Unix/Program.inc).
-#ifdef _WIN32
-
-std::vector<llvm::BitVector>
-ThreadPoolTest::RunOnAllSockets(ThreadPoolStrategy S) {
-  llvm::SetVector<llvm::BitVector> ThreadsUsed;
-  std::mutex Lock;
-  {
-    std::condition_variable AllThreads;
-    std::mutex AllThreadsLock;
-    unsigned Active = 0;
-
-    ThreadPool Pool(S);
-    for (size_t I = 0; I < S.compute_thread_count(); ++I) {
-      Pool.async([&] {
-        {
-          std::lock_guard<std::mutex> Guard(AllThreadsLock);
-          ++Active;
-          AllThreads.notify_one();
-        }
-        waitForMainThread();
-        std::lock_guard<std::mutex> Guard(Lock);
-        auto Mask = llvm::get_thread_affinity_mask();
-        ThreadsUsed.insert(Mask);
-      });
-    }
-    EXPECT_EQ(true, ThreadsUsed.empty());
-    {
-      std::unique_lock<std::mutex> Guard(AllThreadsLock);
-      AllThreads.wait(Guard,
-                      [&]() { return Active == S.compute_thread_count(); });
-    }
-    setMainThreadReady();
-  }
-  return ThreadsUsed.takeVector();
-}
-
-TEST_F(ThreadPoolTest, AllThreads_UseAllRessources) {
-  CHECK_UNSUPPORTED();
-  std::vector<llvm::BitVector> ThreadsUsed = RunOnAllSockets({});
-  ASSERT_EQ(llvm::get_cpus(), ThreadsUsed.size());
-}
-
-TEST_F(ThreadPoolTest, AllThreads_OneThreadPerCore) {
-  CHECK_UNSUPPORTED();
-  std::vector<llvm::BitVector> ThreadsUsed =
-      RunOnAllSockets(llvm::heavyweight_hardware_concurrency());
-  ASSERT_EQ(llvm::get_cpus(), ThreadsUsed.size());
-}
-
-// From TestMain.cpp.
-extern const char *TestMainArgv0;
-
-// Just a reachable symbol to ease resolving of the executable's path.
-static cl::opt<std::string> ThreadPoolTestStringArg1("thread-pool-string-arg1");
-
-#ifdef _WIN32
-#define setenv(name, var, ignore) _putenv_s(name, var)
-#endif
-
-TEST_F(ThreadPoolTest, AffinityMask) {
-  CHECK_UNSUPPORTED();
-
-  // Skip this test if less than 4 threads are available.
-  if (llvm::hardware_concurrency().compute_thread_count() < 4)
-    return;
-
-  using namespace llvm::sys;
-  if (getenv("LLVM_THREADPOOL_AFFINITYMASK")) {
-    std::vector<llvm::BitVector> ThreadsUsed = RunOnAllSockets({});
-    // Ensure the threads only ran on CPUs 0-3.
-    // NOTE: Don't use ASSERT* here because this runs in a subprocess,
-    // and will show up as un-executed in the parent.
-    assert(llvm::all_of(ThreadsUsed,
-                        [](auto &T) { return T.getData().front() < 16UL; }) &&
-           "Threads ran on more CPUs than expected! The affinity mask does not "
-           "seem to work.");
-    return;
-  }
-  std::string Executable =
-      sys::fs::getMainExecutable(TestMainArgv0, &ThreadPoolTestStringArg1);
-  StringRef argv[] = {Executable, "--gtest_filter=ThreadPoolTest.AffinityMask"};
-
-  // Add environment variable to the environment of the child process.
-  int Res = setenv("LLVM_THREADPOOL_AFFINITYMASK", "1", false);
-  ASSERT_EQ(Res, 0);
-
-  std::string Error;
-  bool ExecutionFailed;
-  BitVector Affinity;
-  Affinity.resize(4);
-  Affinity.set(0, 4); // Use CPUs 0,1,2,3.
-  int Ret = sys::ExecuteAndWait(Executable, argv, {}, {}, 0, 0, &Error,
-                                &ExecutionFailed, nullptr, &Affinity);
-  ASSERT_EQ(0, Ret);
-}
-
-#endif // #ifdef _WIN32
-#endif // #if LLVM_ENABLE_THREADS == 1
diff --git a/gnu/llvm/llvm/unittests/Support/Threading.cpp b/gnu/llvm/llvm/unittests/Support/Threading.cpp
deleted file mode 100644
index 87008f17feb..00000000000
--- a/gnu/llvm/llvm/unittests/Support/Threading.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-//===- unittests/Threading.cpp - Thread tests -----------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/Threading.h"
-#include "llvm/Support/thread.h"
-#include "gtest/gtest.h"
-
-#include <atomic>
-#include <condition_variable>
-
-using namespace llvm;
-
-namespace {
-
-TEST(Threading, PhysicalConcurrency) {
-  auto Num = heavyweight_hardware_concurrency();
-  // Since Num is unsigned this will also catch us trying to
-  // return -1.
-  ASSERT_LE(Num.compute_thread_count(),
-            hardware_concurrency().compute_thread_count());
-}
-
-#if LLVM_ENABLE_THREADS
-
-class Notification {
-public:
-  void notify() {
-    {
-      std::lock_guard<std::mutex> Lock(M);
-      Notified = true;
-      // Broadcast with the lock held, so it's safe to destroy the Notification
-      // after wait() returns.
-      CV.notify_all();
-    }
-  }
-
-  bool wait() {
-    std::unique_lock<std::mutex> Lock(M);
-    using steady_clock = std::chrono::steady_clock;
-    auto Deadline = steady_clock::now() +
-                    std::chrono::duration_cast<steady_clock::duration>(
-                        std::chrono::duration<double>(5));
-    return CV.wait_until(Lock, Deadline, [this] { return Notified; });
-  }
-
-private:
-  bool Notified = false;
-  mutable std::condition_variable CV;
-  mutable std::mutex M;
-};
-
-TEST(Threading, RunOnThreadSyncAsync) {
-  Notification ThreadStarted, ThreadAdvanced, ThreadFinished;
-
-  auto ThreadFunc = [&] {
-    ThreadStarted.notify();
-    ASSERT_TRUE(ThreadAdvanced.wait());
-    ThreadFinished.notify();
-  };
-
-  llvm::thread Thread(ThreadFunc);
-  Thread.detach();
-  ASSERT_TRUE(ThreadStarted.wait());
-  ThreadAdvanced.notify();
-  ASSERT_TRUE(ThreadFinished.wait());
-}
-
-TEST(Threading, RunOnThreadSync) {
-  std::atomic_bool Executed(false);
-  llvm::thread Thread(
-      [](void *Arg) { *static_cast<std::atomic_bool *>(Arg) = true; },
-      &Executed);
-  Thread.join();
-  ASSERT_EQ(Executed, true);
-}
-
-#if defined(__APPLE__)
-TEST(Threading, AppleStackSize) {
-  llvm::thread Thread([] {
-    volatile unsigned char Var[8 * 1024 * 1024 - 10240];
-    Var[0] = 0xff;
-    ASSERT_EQ(Var[0], 0xff);
-  });
-  Thread.join();
-}
-#endif
-#endif
-
-} // end anon namespace
diff --git a/gnu/llvm/llvm/unittests/Support/TimerTest.cpp b/gnu/llvm/llvm/unittests/Support/TimerTest.cpp
deleted file mode 100644
index 9a9b67eaa9f..00000000000
--- a/gnu/llvm/llvm/unittests/Support/TimerTest.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-//===- unittests/TimerTest.cpp - Timer tests ------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/Timer.h"
-#include "gtest/gtest.h"
-
-#if _WIN32
-#include <windows.h>
-#else
-#include <time.h>
-#endif
-
-using namespace llvm;
-
-namespace {
-
-// FIXME: Put this somewhere in Support, it's also used in LockFileManager.
-void SleepMS() {
-#if _WIN32
-  Sleep(1);
-#else
-  struct timespec Interval;
-  Interval.tv_sec = 0;
-  Interval.tv_nsec = 1000000;
-  nanosleep(&Interval, nullptr);
-#endif
-}
-
-TEST(Timer, Additivity) {
-  Timer T1("T1", "T1");
-
-  EXPECT_TRUE(T1.isInitialized());
-
-  T1.startTimer();
-  T1.stopTimer();
-  auto TR1 = T1.getTotalTime();
-
-  T1.startTimer();
-  SleepMS();
-  T1.stopTimer();
-  auto TR2 = T1.getTotalTime();
-
-  EXPECT_TRUE(TR1 < TR2);
-}
-
-TEST(Timer, CheckIfTriggered) {
-  Timer T1("T1", "T1");
-
-  EXPECT_FALSE(T1.hasTriggered());
-  T1.startTimer();
-  EXPECT_TRUE(T1.hasTriggered());
-  T1.stopTimer();
-  EXPECT_TRUE(T1.hasTriggered());
-
-  T1.clear();
-  EXPECT_FALSE(T1.hasTriggered());
-}
-
-} // end anon namespace
diff --git a/gnu/llvm/llvm/unittests/Support/ToolOutputFileTest.cpp b/gnu/llvm/llvm/unittests/Support/ToolOutputFileTest.cpp
deleted file mode 100644
index 853136b06ee..00000000000
--- a/gnu/llvm/llvm/unittests/Support/ToolOutputFileTest.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-//===- ToolOutputFileTest.cpp - ToolOutputFile tests ----------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/ToolOutputFile.h"
-#include "llvm/Support/FileSystem.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST(ToolOutputFileTest, DashOpensOuts) {
-  std::error_code EC;
-  EXPECT_EQ(&ToolOutputFile("-", EC, sys::fs::OF_None).os(), &outs());
-}
-
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/Support/TrailingObjectsTest.cpp b/gnu/llvm/llvm/unittests/Support/TrailingObjectsTest.cpp
deleted file mode 100644
index e2656b2229c..00000000000
--- a/gnu/llvm/llvm/unittests/Support/TrailingObjectsTest.cpp
+++ /dev/null
@@ -1,258 +0,0 @@
-//=== - llvm/unittest/Support/TrailingObjectsTest.cpp ---------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/TrailingObjects.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-// This class, beyond being used by the test case, a nice
-// demonstration of the intended usage of TrailingObjects, with a
-// single trailing array.
-class Class1 final : protected TrailingObjects<Class1, short> {
-  friend TrailingObjects;
-
-  unsigned NumShorts;
-
-protected:
-  size_t numTrailingObjects(OverloadToken<short>) const { return NumShorts; }
-
-  Class1(int *ShortArray, unsigned NumShorts) : NumShorts(NumShorts) {
-    std::uninitialized_copy(ShortArray, ShortArray + NumShorts,
-                            getTrailingObjects<short>());
-  }
-
-public:
-  static Class1 *create(int *ShortArray, unsigned NumShorts) {
-    void *Mem = ::operator new(totalSizeToAlloc<short>(NumShorts));
-    return new (Mem) Class1(ShortArray, NumShorts);
-  }
-  void operator delete(void *p) { ::operator delete(p); }
-
-  short get(unsigned Num) const { return getTrailingObjects<short>()[Num]; }
-
-  unsigned numShorts() const { return NumShorts; }
-
-  // Pull some protected members in as public, for testability.
-  template <typename... Ty>
-  using FixedSizeStorage = TrailingObjects::FixedSizeStorage<Ty...>;
-
-  using TrailingObjects::totalSizeToAlloc;
-  using TrailingObjects::additionalSizeToAlloc;
-  using TrailingObjects::getTrailingObjects;
-};
-
-// Here, there are two singular optional object types appended.  Note
-// that the alignment of Class2 is automatically increased to account
-// for the alignment requirements of the trailing objects.
-class Class2 final : protected TrailingObjects<Class2, double, short> {
-  friend TrailingObjects;
-
-  bool HasShort, HasDouble;
-
-protected:
-  size_t numTrailingObjects(OverloadToken<short>) const {
-    return HasShort ? 1 : 0;
-  }
-  size_t numTrailingObjects(OverloadToken<double>) const {
-    return HasDouble ? 1 : 0;
-  }
-
-  Class2(bool HasShort, bool HasDouble)
-      : HasShort(HasShort), HasDouble(HasDouble) {}
-
-public:
-  static Class2 *create(short S = 0, double D = 0.0) {
-    bool HasShort = S != 0;
-    bool HasDouble = D != 0.0;
-
-    void *Mem =
-        ::operator new(totalSizeToAlloc<double, short>(HasDouble, HasShort));
-    Class2 *C = new (Mem) Class2(HasShort, HasDouble);
-    if (HasShort)
-      *C->getTrailingObjects<short>() = S;
-    if (HasDouble)
-      *C->getTrailingObjects<double>() = D;
-    return C;
-  }
-  void operator delete(void *p) { ::operator delete(p); }
-
-  short getShort() const {
-    if (!HasShort)
-      return 0;
-    return *getTrailingObjects<short>();
-  }
-
-  double getDouble() const {
-    if (!HasDouble)
-      return 0.0;
-    return *getTrailingObjects<double>();
-  }
-
-  // Pull some protected members in as public, for testability.
-  template <typename... Ty>
-  using FixedSizeStorage = TrailingObjects::FixedSizeStorage<Ty...>;
-
-  using TrailingObjects::totalSizeToAlloc;
-  using TrailingObjects::additionalSizeToAlloc;
-  using TrailingObjects::getTrailingObjects;
-};
-
-TEST(TrailingObjects, OneArg) {
-  int arr[] = {1, 2, 3};
-  Class1 *C = Class1::create(arr, 3);
-  EXPECT_EQ(sizeof(Class1), sizeof(unsigned));
-  EXPECT_EQ(Class1::additionalSizeToAlloc<short>(1), sizeof(short));
-  EXPECT_EQ(Class1::additionalSizeToAlloc<short>(3), sizeof(short) * 3);
-
-  EXPECT_EQ(alignof(Class1),
-            alignof(Class1::FixedSizeStorage<short>::with_counts<1>::type));
-  EXPECT_EQ(sizeof(Class1::FixedSizeStorage<short>::with_counts<1>::type),
-            llvm::alignTo(Class1::totalSizeToAlloc<short>(1), alignof(Class1)));
-  EXPECT_EQ(Class1::totalSizeToAlloc<short>(1), sizeof(Class1) + sizeof(short));
-
-  EXPECT_EQ(alignof(Class1),
-            alignof(Class1::FixedSizeStorage<short>::with_counts<3>::type));
-  EXPECT_EQ(sizeof(Class1::FixedSizeStorage<short>::with_counts<3>::type),
-            llvm::alignTo(Class1::totalSizeToAlloc<short>(3), alignof(Class1)));
-  EXPECT_EQ(Class1::totalSizeToAlloc<short>(3),
-            sizeof(Class1) + sizeof(short) * 3);
-
-  EXPECT_EQ(C->getTrailingObjects<short>(), reinterpret_cast<short *>(C + 1));
-  EXPECT_EQ(C->get(0), 1);
-  EXPECT_EQ(C->get(2), 3);
-  delete C;
-}
-
-TEST(TrailingObjects, TwoArg) {
-  Class2 *C1 = Class2::create(4);
-  Class2 *C2 = Class2::create(0, 4.2);
-
-  EXPECT_EQ(sizeof(Class2), llvm::alignTo(sizeof(bool) * 2, alignof(double)));
-  EXPECT_EQ(alignof(Class2), alignof(double));
-
-  EXPECT_EQ((Class2::additionalSizeToAlloc<double, short>(1, 0)),
-            sizeof(double));
-  EXPECT_EQ((Class2::additionalSizeToAlloc<double, short>(0, 1)),
-            sizeof(short));
-  EXPECT_EQ((Class2::additionalSizeToAlloc<double, short>(3, 1)),
-            sizeof(double) * 3 + sizeof(short));
-
-  EXPECT_EQ(
-      alignof(Class2),
-      (alignof(
-          Class2::FixedSizeStorage<double, short>::with_counts<1, 1>::type)));
-  EXPECT_EQ(
-      sizeof(Class2::FixedSizeStorage<double, short>::with_counts<1, 1>::type),
-      llvm::alignTo(Class2::totalSizeToAlloc<double, short>(1, 1),
-                    alignof(Class2)));
-  EXPECT_EQ((Class2::totalSizeToAlloc<double, short>(1, 1)),
-            sizeof(Class2) + sizeof(double) + sizeof(short));
-
-  EXPECT_EQ(C1->getDouble(), 0);
-  EXPECT_EQ(C1->getShort(), 4);
-  EXPECT_EQ(C1->getTrailingObjects<double>(),
-            reinterpret_cast<double *>(C1 + 1));
-  EXPECT_EQ(C1->getTrailingObjects<short>(), reinterpret_cast<short *>(C1 + 1));
-
-  EXPECT_EQ(C2->getDouble(), 4.2);
-  EXPECT_EQ(C2->getShort(), 0);
-  EXPECT_EQ(C2->getTrailingObjects<double>(),
-            reinterpret_cast<double *>(C2 + 1));
-  EXPECT_EQ(C2->getTrailingObjects<short>(),
-            reinterpret_cast<short *>(reinterpret_cast<double *>(C2 + 1) + 1));
-  delete C1;
-  delete C2;
-}
-
-// This test class is not trying to be a usage demo, just asserting
-// that three args does actually work too (it's the same code as
-// handles the second arg, so it's basically covered by the above, but
-// just in case..)
-class Class3 final : public TrailingObjects<Class3, double, short, bool> {
-  friend TrailingObjects;
-
-  size_t numTrailingObjects(OverloadToken<double>) const { return 1; }
-  size_t numTrailingObjects(OverloadToken<short>) const { return 1; }
-};
-
-TEST(TrailingObjects, ThreeArg) {
-  EXPECT_EQ((Class3::additionalSizeToAlloc<double, short, bool>(1, 1, 3)),
-            sizeof(double) + sizeof(short) + 3 * sizeof(bool));
-  EXPECT_EQ(sizeof(Class3), llvm::alignTo(1, alignof(double)));
-
-  EXPECT_EQ(
-      alignof(Class3),
-      (alignof(Class3::FixedSizeStorage<double, short,
-                                        bool>::with_counts<1, 1, 3>::type)));
-  EXPECT_EQ(
-      sizeof(Class3::FixedSizeStorage<double, short,
-                                      bool>::with_counts<1, 1, 3>::type),
-      llvm::alignTo(Class3::totalSizeToAlloc<double, short, bool>(1, 1, 3),
-                    alignof(Class3)));
-
-  std::unique_ptr<char[]> P(new char[1000]);
-  Class3 *C = reinterpret_cast<Class3 *>(P.get());
-  EXPECT_EQ(C->getTrailingObjects<double>(), reinterpret_cast<double *>(C + 1));
-  EXPECT_EQ(C->getTrailingObjects<short>(),
-            reinterpret_cast<short *>(reinterpret_cast<double *>(C + 1) + 1));
-  EXPECT_EQ(
-      C->getTrailingObjects<bool>(),
-      reinterpret_cast<bool *>(
-          reinterpret_cast<short *>(reinterpret_cast<double *>(C + 1) + 1) +
-          1));
-}
-
-class Class4 final : public TrailingObjects<Class4, char, long> {
-  friend TrailingObjects;
-  size_t numTrailingObjects(OverloadToken<char>) const { return 1; }
-};
-
-TEST(TrailingObjects, Realignment) {
-  EXPECT_EQ((Class4::additionalSizeToAlloc<char, long>(1, 1)),
-            llvm::alignTo(sizeof(long) + 1, alignof(long)));
-  EXPECT_EQ(sizeof(Class4), llvm::alignTo(1, alignof(long)));
-
-  EXPECT_EQ(
-      alignof(Class4),
-      (alignof(Class4::FixedSizeStorage<char, long>::with_counts<1, 1>::type)));
-  EXPECT_EQ(
-      sizeof(Class4::FixedSizeStorage<char, long>::with_counts<1, 1>::type),
-      llvm::alignTo(Class4::totalSizeToAlloc<char, long>(1, 1),
-                    alignof(Class4)));
-
-  std::unique_ptr<char[]> P(new char[1000]);
-  Class4 *C = reinterpret_cast<Class4 *>(P.get());
-  EXPECT_EQ(C->getTrailingObjects<char>(), reinterpret_cast<char *>(C + 1));
-  EXPECT_EQ(C->getTrailingObjects<long>(),
-            reinterpret_cast<long *>(llvm::alignAddr(
-                reinterpret_cast<char *>(C + 1) + 1, Align::Of<long>())));
-}
-}
-
-// Test the use of TrailingObjects with a template class. This
-// previously failed to compile due to a bug in MSVC's member access
-// control/lookup handling for OverloadToken.
-template <typename Derived>
-class Class5Tmpl : private llvm::TrailingObjects<Derived, float, int> {
-  using TrailingObjects = typename llvm::TrailingObjects<Derived, float>;
-  friend TrailingObjects;
-
-  size_t numTrailingObjects(
-      typename TrailingObjects::template OverloadToken<float>) const {
-    return 1;
-  }
-
-  size_t numTrailingObjects(
-      typename TrailingObjects::template OverloadToken<int>) const {
-    return 2;
-  }
-};
-
-class Class5 : public Class5Tmpl<Class5> {};
diff --git a/gnu/llvm/llvm/unittests/Support/TrigramIndexTest.cpp b/gnu/llvm/llvm/unittests/Support/TrigramIndexTest.cpp
deleted file mode 100644
index 42b3fcdbd53..00000000000
--- a/gnu/llvm/llvm/unittests/Support/TrigramIndexTest.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-//===- TrigramIndexTest.cpp - Unit tests for TrigramIndex -----------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/TrigramIndex.h"
-#include "llvm/ADT/STLExtras.h"
-#include "gtest/gtest.h"
-
-#include <string>
-#include <vector>
-
-using namespace llvm;
-
-namespace {
-
-class TrigramIndexTest : public ::testing::Test {
-protected:
-  std::unique_ptr<TrigramIndex> makeTrigramIndex(
-      std::vector<std::string> Rules) {
-    std::unique_ptr<TrigramIndex> TI =
-        std::make_unique<TrigramIndex>();
-    for (auto &Rule : Rules)
-      TI->insert(Rule);
-    return TI;
-  }
-};
-
-TEST_F(TrigramIndexTest, Empty) {
-  std::unique_ptr<TrigramIndex> TI =
-      makeTrigramIndex({});
-  EXPECT_FALSE(TI->isDefeated());
-  EXPECT_TRUE(TI->isDefinitelyOut("foo"));
-}
-
-TEST_F(TrigramIndexTest, Basic) {
-  std::unique_ptr<TrigramIndex> TI =
-      makeTrigramIndex({"*hello*", "*wor.d*"});
-  EXPECT_FALSE(TI->isDefeated());
-  EXPECT_TRUE(TI->isDefinitelyOut("foo"));
-}
-
-TEST_F(TrigramIndexTest, NoTrigramsInRules) {
-  std::unique_ptr<TrigramIndex> TI =
-      makeTrigramIndex({"b.r", "za*az"});
-  EXPECT_TRUE(TI->isDefeated());
-  EXPECT_FALSE(TI->isDefinitelyOut("foo"));
-  EXPECT_FALSE(TI->isDefinitelyOut("bar"));
-  EXPECT_FALSE(TI->isDefinitelyOut("zakaz"));
-}
-
-TEST_F(TrigramIndexTest, NoTrigramsInARule) {
-  std::unique_ptr<TrigramIndex> TI =
-      makeTrigramIndex({"*hello*", "*wo.ld*"});
-  EXPECT_TRUE(TI->isDefeated());
-  EXPECT_FALSE(TI->isDefinitelyOut("foo"));
-}
-
-TEST_F(TrigramIndexTest, RepetitiveRule) {
-  std::unique_ptr<TrigramIndex> TI =
-      makeTrigramIndex({"*bar*bar*bar*bar*bar", "bar*bar"});
-  EXPECT_FALSE(TI->isDefeated());
-  EXPECT_TRUE(TI->isDefinitelyOut("foo"));
-  EXPECT_TRUE(TI->isDefinitelyOut("bar"));
-  EXPECT_FALSE(TI->isDefinitelyOut("barbara"));
-  EXPECT_FALSE(TI->isDefinitelyOut("bar+bar"));
-}
-
-TEST_F(TrigramIndexTest, PopularTrigram) {
-  std::unique_ptr<TrigramIndex> TI =
-      makeTrigramIndex({"*aaa*", "*aaaa*", "*aaaaa*", "*aaaaa*", "*aaaaaa*"});
-  EXPECT_TRUE(TI->isDefeated());
-}
-
-TEST_F(TrigramIndexTest, PopularTrigram2) {
-  std::unique_ptr<TrigramIndex> TI =
-      makeTrigramIndex({"class1.h", "class2.h", "class3.h", "class4.h", "class.h"});
-  EXPECT_TRUE(TI->isDefeated());
-}
-
-TEST_F(TrigramIndexTest, TooComplicatedRegex) {
-  std::unique_ptr<TrigramIndex> TI =
-      makeTrigramIndex({"[0-9]+"});
-  EXPECT_TRUE(TI->isDefeated());
-}
-
-TEST_F(TrigramIndexTest, TooComplicatedRegex2) {
-  std::unique_ptr<TrigramIndex> TI =
-      makeTrigramIndex({"foo|bar"});
-  EXPECT_TRUE(TI->isDefeated());
-}
-
-TEST_F(TrigramIndexTest, EscapedSymbols) {
-  std::unique_ptr<TrigramIndex> TI =
-      makeTrigramIndex({"*c\\+\\+*", "*hello\\\\world*", "a\\tb", "a\\0b"});
-  EXPECT_FALSE(TI->isDefeated());
-  EXPECT_FALSE(TI->isDefinitelyOut("c++"));
-  EXPECT_TRUE(TI->isDefinitelyOut("c\\+\\+"));
-  EXPECT_FALSE(TI->isDefinitelyOut("hello\\world"));
-  EXPECT_TRUE(TI->isDefinitelyOut("hello\\\\world"));
-  EXPECT_FALSE(TI->isDefinitelyOut("atb"));
-  EXPECT_TRUE(TI->isDefinitelyOut("a\\tb"));
-  EXPECT_TRUE(TI->isDefinitelyOut("a\tb"));
-  EXPECT_FALSE(TI->isDefinitelyOut("a0b"));
-}
-
-TEST_F(TrigramIndexTest, Backreference1) {
-  std::unique_ptr<TrigramIndex> TI =
-      makeTrigramIndex({"*foo\\1*"});
-  EXPECT_TRUE(TI->isDefeated());
-}
-
-TEST_F(TrigramIndexTest, Backreference2) {
-  std::unique_ptr<TrigramIndex> TI =
-      makeTrigramIndex({"*foo\\2*"});
-  EXPECT_TRUE(TI->isDefeated());
-}
-
-TEST_F(TrigramIndexTest, Sequence) {
-  std::unique_ptr<TrigramIndex> TI =
-      makeTrigramIndex({"class1.h", "class2.h", "class3.h", "class4.h"});
-  EXPECT_FALSE(TI->isDefeated());
-  EXPECT_FALSE(TI->isDefinitelyOut("class1"));
-  EXPECT_TRUE(TI->isDefinitelyOut("class.h"));
-  EXPECT_TRUE(TI->isDefinitelyOut("class"));
-}
-
-}  // namespace
diff --git a/gnu/llvm/llvm/unittests/Support/TypeNameTest.cpp b/gnu/llvm/llvm/unittests/Support/TypeNameTest.cpp
deleted file mode 100644
index c8962933e9c..00000000000
--- a/gnu/llvm/llvm/unittests/Support/TypeNameTest.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-//===- TypeNameTest.cpp ---------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/TypeName.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-namespace N1 {
-struct S1 {};
-class C1 {};
-union U1 {};
-}
-
-TEST(TypeNameTest, Names) {
-  struct S2 {};
-
-  StringRef S1Name = getTypeName<N1::S1>();
-  StringRef C1Name = getTypeName<N1::C1>();
-  StringRef U1Name = getTypeName<N1::U1>();
-  StringRef S2Name = getTypeName<S2>();
-
-#if defined(__clang__) || defined(__GNUC__) || defined(__INTEL_COMPILER) ||    \
-    defined(_MSC_VER)
-  EXPECT_TRUE(S1Name.endswith("::N1::S1")) << S1Name.str();
-  EXPECT_TRUE(C1Name.endswith("::N1::C1")) << C1Name.str();
-  EXPECT_TRUE(U1Name.endswith("::N1::U1")) << U1Name.str();
-#ifdef __clang__
-  EXPECT_TRUE(S2Name.endswith("S2")) << S2Name.str();
-#else
-  EXPECT_TRUE(S2Name.endswith("::S2")) << S2Name.str();
-#endif
-#else
-  EXPECT_EQ("UNKNOWN_TYPE", S1Name);
-  EXPECT_EQ("UNKNOWN_TYPE", C1Name);
-  EXPECT_EQ("UNKNOWN_TYPE", U1Name);
-  EXPECT_EQ("UNKNOWN_TYPE", S2Name);
-#endif
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/Support/TypeTraitsTest.cpp b/gnu/llvm/llvm/unittests/Support/TypeTraitsTest.cpp
deleted file mode 100644
index 734e50afa2d..00000000000
--- a/gnu/llvm/llvm/unittests/Support/TypeTraitsTest.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-//===- TypeTraitsTest.cpp -------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/FunctionExtras.h"
-#include "llvm/ADT/Optional.h"
-#include "llvm/ADT/PointerIntPair.h"
-#include "llvm/ADT/SmallString.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/type_traits.h"
-#include "gtest/gtest.h"
-
-namespace {
-
-// Compile-time tests using static assert.
-namespace triviality {
-
-// Helper for compile time checking trivially copy constructible and trivially
-// move constructible type traits.
-template <typename T, bool IsTriviallyCopyConstructible,
-          bool IsTriviallyMoveConstructible>
-void TrivialityTester() {
-  static_assert(llvm::is_trivially_copy_constructible<T>::value ==
-                    IsTriviallyCopyConstructible,
-                "Mismatch in expected trivial copy construction!");
-  static_assert(llvm::is_trivially_move_constructible<T>::value ==
-                    IsTriviallyMoveConstructible,
-                "Mismatch in expected trivial move construction!");
-
-#if defined(_LIBCPP_VERSION) || defined(_MSC_VER)
-  // On compilers with support for the standard traits, make sure they agree.
-  static_assert(std::is_trivially_copy_constructible<T>::value ==
-                    IsTriviallyCopyConstructible,
-                "Mismatch in expected trivial copy construction!");
-  static_assert(std::is_trivially_move_constructible<T>::value ==
-                    IsTriviallyMoveConstructible,
-                "Mismatch in expected trivial move construction!");
-#endif
-}
-
-template void TrivialityTester<int, true, true>();
-template void TrivialityTester<void *, true, true>();
-template void TrivialityTester<int &, true, true>();
-template void TrivialityTester<int &&, false, true>();
-
-struct X {};
-struct Y {
-  Y(const Y &);
-};
-struct Z {
-  Z(const Z &);
-  Z(Z &&);
-};
-struct A {
-  A(const A &) = default;
-  A(A &&);
-};
-struct B {
-  B(const B &);
-  B(B &&) = default;
-};
-
-template void TrivialityTester<X, true, true>();
-template void TrivialityTester<Y, false, false>();
-template void TrivialityTester<Z, false, false>();
-template void TrivialityTester<A, true, false>();
-template void TrivialityTester<B, false, true>();
-
-template void TrivialityTester<Z &, true, true>();
-template void TrivialityTester<A &, true, true>();
-template void TrivialityTester<B &, true, true>();
-template void TrivialityTester<Z &&, false, true>();
-template void TrivialityTester<A &&, false, true>();
-template void TrivialityTester<B &&, false, true>();
-
-TEST(Triviality, Tester) {
-  TrivialityTester<int, true, true>();
-  TrivialityTester<void *, true, true>();
-  TrivialityTester<int &, true, true>();
-  TrivialityTester<int &&, false, true>();
-
-  TrivialityTester<X, true, true>();
-  TrivialityTester<Y, false, false>();
-  TrivialityTester<Z, false, false>();
-  TrivialityTester<A, true, false>();
-  TrivialityTester<B, false, true>();
-
-  TrivialityTester<Z &, true, true>();
-  TrivialityTester<A &, true, true>();
-  TrivialityTester<B &, true, true>();
-  TrivialityTester<Z &&, false, true>();
-  TrivialityTester<A &&, false, true>();
-  TrivialityTester<B &&, false, true>();
-}
-
-// Test that the following ADT behave as expected wrt. trivially copyable trait
-//
-// NB: It is important that this trait behaves the same for (at least) these
-// types for all supported compilers to prevent ABI issue when llvm is compiled
-// with compiler A and an other project using llvm is compiled with compiler B.
-
-TEST(Triviality, ADT) {
-
-  TrivialityTester<llvm::SmallVector<int>, false, false>();
-  TrivialityTester<llvm::SmallString<8>, false, false>();
-
-  TrivialityTester<std::function<int()>, false, false>();
-#if !defined(__FreeBSD__)
-  TrivialityTester<std::pair<int, bool>, true, true>();
-#endif
-  TrivialityTester<llvm::unique_function<int()>, false, false>();
-  TrivialityTester<llvm::StringRef, true, true>();
-  TrivialityTester<llvm::ArrayRef<int>, true, true>();
-  TrivialityTester<llvm::PointerIntPair<int *, 2>, true, true>();
-  TrivialityTester<llvm::Optional<int>, true, true>();
-}
-
-} // namespace triviality
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/Support/UnicodeTest.cpp b/gnu/llvm/llvm/unittests/Support/UnicodeTest.cpp
deleted file mode 100644
index 6ce323dc8f3..00000000000
--- a/gnu/llvm/llvm/unittests/Support/UnicodeTest.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-//===- unittests/Support/UnicodeTest.cpp - Unicode.h tests ----------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/Unicode.h"
-#include "llvm/Support/ConvertUTF.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-namespace sys {
-namespace unicode {
-namespace {
-
-TEST(Unicode, columnWidthUTF8) {
-  EXPECT_EQ(0, columnWidthUTF8(""));
-  EXPECT_EQ(1, columnWidthUTF8(" "));
-  EXPECT_EQ(1, columnWidthUTF8("a"));
-  EXPECT_EQ(1, columnWidthUTF8("~"));
-
-  EXPECT_EQ(6, columnWidthUTF8("abcdef"));
-
-  EXPECT_EQ(-1, columnWidthUTF8("\x01"));
-  EXPECT_EQ(-1, columnWidthUTF8("\t"));
-  EXPECT_EQ(-1, columnWidthUTF8("aaaaaaaaaa\x01"));
-  EXPECT_EQ(-1, columnWidthUTF8("\342\200\213")); // 200B ZERO WIDTH SPACE
-
-  // 00AD SOFT HYPHEN is displayed on most terminals as a space or a dash. Some
-  // text editors display it only when a line is broken at it, some use it as a
-  // line-break hint, but don't display. We choose terminal-oriented
-  // interpretation.
-  EXPECT_EQ(1, columnWidthUTF8("\302\255"));
-
-  EXPECT_EQ(0, columnWidthUTF8("\314\200"));     // 0300 COMBINING GRAVE ACCENT
-  EXPECT_EQ(1, columnWidthUTF8("\340\270\201")); // 0E01 THAI CHARACTER KO KAI
-  EXPECT_EQ(2, columnWidthUTF8("\344\270\200")); // CJK UNIFIED IDEOGRAPH-4E00
-
-  EXPECT_EQ(4, columnWidthUTF8("\344\270\200\344\270\200"));
-  EXPECT_EQ(3, columnWidthUTF8("q\344\270\200"));
-  EXPECT_EQ(3, columnWidthUTF8("\314\200\340\270\201\344\270\200"));
-
-  // Invalid UTF-8 strings, columnWidthUTF8 should error out.
-  EXPECT_EQ(-2, columnWidthUTF8("\344"));
-  EXPECT_EQ(-2, columnWidthUTF8("\344\270"));
-  EXPECT_EQ(-2, columnWidthUTF8("\344\270\033"));
-  EXPECT_EQ(-2, columnWidthUTF8("\344\270\300"));
-  EXPECT_EQ(-2, columnWidthUTF8("\377\366\355"));
-
-  EXPECT_EQ(-2, columnWidthUTF8("qwer\344"));
-  EXPECT_EQ(-2, columnWidthUTF8("qwer\344\270"));
-  EXPECT_EQ(-2, columnWidthUTF8("qwer\344\270\033"));
-  EXPECT_EQ(-2, columnWidthUTF8("qwer\344\270\300"));
-  EXPECT_EQ(-2, columnWidthUTF8("qwer\377\366\355"));
-
-  // UTF-8 sequences longer than 4 bytes correspond to unallocated Unicode
-  // characters.
-  EXPECT_EQ(-2, columnWidthUTF8("\370\200\200\200\200"));     // U+200000
-  EXPECT_EQ(-2, columnWidthUTF8("\374\200\200\200\200\200")); // U+4000000
-}
-
-TEST(Unicode, isPrintable) {
-  EXPECT_FALSE(isPrintable(0)); // <control-0000>-<control-001F>
-  EXPECT_FALSE(isPrintable(0x01));
-  EXPECT_FALSE(isPrintable(0x1F));
-  EXPECT_TRUE(isPrintable(' '));
-  EXPECT_TRUE(isPrintable('A'));
-  EXPECT_TRUE(isPrintable('~'));
-  EXPECT_FALSE(isPrintable(0x7F)); // <control-007F>..<control-009F>
-  EXPECT_FALSE(isPrintable(0x90));
-  EXPECT_FALSE(isPrintable(0x9F));
-
-  EXPECT_TRUE(isPrintable(0xAC));
-  EXPECT_TRUE(isPrintable(0xAD)); // SOFT HYPHEN is displayed on most terminals
-                                  // as either a space or a dash.
-  EXPECT_TRUE(isPrintable(0xAE));
-
-  EXPECT_TRUE(isPrintable(0x0377));  // GREEK SMALL LETTER PAMPHYLIAN DIGAMMA
-  EXPECT_FALSE(isPrintable(0x0378)); // <reserved-0378>..<reserved-0379>
-
-  EXPECT_FALSE(isPrintable(0x0600)); // ARABIC NUMBER SIGN
-
-  EXPECT_FALSE(isPrintable(0x1FFFF)); // <reserved-1F774>..<noncharacter-1FFFF>
-  EXPECT_TRUE(isPrintable(0x20000));  // CJK UNIFIED IDEOGRAPH-20000
-
-  EXPECT_FALSE(isPrintable(0x10FFFF)); // noncharacter
-
-  // test the validity of a fast path in columnWidthUTF8
-  for (unsigned char c = 0; c < 128; ++c) {
-    const UTF8 buf8[2] = {c, 0};
-    const UTF8 *Target8 = &buf8[0];
-    UTF32 buf32[1];
-    UTF32 *Target32 = &buf32[0];
-    auto status = ConvertUTF8toUTF32(&Target8, Target8 + 1, &Target32,
-                                     Target32 + 1, strictConversion);
-    EXPECT_TRUE(status == conversionOK);
-    EXPECT_TRUE((columnWidthUTF8(reinterpret_cast<const char *>(buf8)) == 1) ==
-                (bool)isPrintable(buf32[0]));
-  }
-}
-
-} // namespace
-} // namespace unicode
-} // namespace sys
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/Support/VersionTupleTest.cpp b/gnu/llvm/llvm/unittests/Support/VersionTupleTest.cpp
deleted file mode 100644
index af6c0a7feba..00000000000
--- a/gnu/llvm/llvm/unittests/Support/VersionTupleTest.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-//===- VersionTupleTests.cpp - Version Number Handling Tests --------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/VersionTuple.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-TEST(VersionTuple, getAsString) {
-  EXPECT_EQ("0", VersionTuple().getAsString());
-  EXPECT_EQ("1", VersionTuple(1).getAsString());
-  EXPECT_EQ("1.2", VersionTuple(1, 2).getAsString());
-  EXPECT_EQ("1.2.3", VersionTuple(1, 2, 3).getAsString());
-  EXPECT_EQ("1.2.3.4", VersionTuple(1, 2, 3, 4).getAsString());
-}
-
-TEST(VersionTuple, tryParse) {
-  VersionTuple VT;
-
-  EXPECT_FALSE(VT.tryParse("1"));
-  EXPECT_EQ("1", VT.getAsString());
-
-  EXPECT_FALSE(VT.tryParse("1.2"));
-  EXPECT_EQ("1.2", VT.getAsString());
-
-  EXPECT_FALSE(VT.tryParse("1.2.3"));
-  EXPECT_EQ("1.2.3", VT.getAsString());
-
-  EXPECT_FALSE(VT.tryParse("1.2.3.4"));
-  EXPECT_EQ("1.2.3.4", VT.getAsString());
-
-  EXPECT_TRUE(VT.tryParse(""));
-  EXPECT_TRUE(VT.tryParse("1."));
-  EXPECT_TRUE(VT.tryParse("1.2."));
-  EXPECT_TRUE(VT.tryParse("1.2.3."));
-  EXPECT_TRUE(VT.tryParse("1.2.3.4."));
-  EXPECT_TRUE(VT.tryParse("1.2.3.4.5"));
-  EXPECT_TRUE(VT.tryParse("1-2"));
-  EXPECT_TRUE(VT.tryParse("1+2"));
-  EXPECT_TRUE(VT.tryParse(".1"));
-  EXPECT_TRUE(VT.tryParse(" 1"));
-  EXPECT_TRUE(VT.tryParse("1 "));
-  EXPECT_TRUE(VT.tryParse("."));
-}
diff --git a/gnu/llvm/llvm/unittests/Support/VirtualFileSystemTest.cpp b/gnu/llvm/llvm/unittests/Support/VirtualFileSystemTest.cpp
deleted file mode 100644
index 6aa21893748..00000000000
--- a/gnu/llvm/llvm/unittests/Support/VirtualFileSystemTest.cpp
+++ /dev/null
@@ -1,2647 +0,0 @@
-//===- unittests/Support/VirtualFileSystem.cpp -------------- VFS tests ---===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/VirtualFileSystem.h"
-#include "llvm/ADT/Triple.h"
-#include "llvm/Config/llvm-config.h"
-#include "llvm/Support/Errc.h"
-#include "llvm/Support/Host.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Support/SourceMgr.h"
-#include "llvm/Testing/Support/SupportHelpers.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-#include <map>
-#include <string>
-
-using namespace llvm;
-using llvm::sys::fs::UniqueID;
-using llvm::unittest::TempDir;
-using llvm::unittest::TempFile;
-using llvm::unittest::TempLink;
-using testing::ElementsAre;
-using testing::Pair;
-using testing::UnorderedElementsAre;
-
-namespace {
-struct DummyFile : public vfs::File {
-  vfs::Status S;
-  explicit DummyFile(vfs::Status S) : S(S) {}
-  llvm::ErrorOr<vfs::Status> status() override { return S; }
-  llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>>
-  getBuffer(const Twine &Name, int64_t FileSize, bool RequiresNullTerminator,
-            bool IsVolatile) override {
-    llvm_unreachable("unimplemented");
-  }
-  std::error_code close() override { return std::error_code(); }
-};
-
-class DummyFileSystem : public vfs::FileSystem {
-  int FSID;   // used to produce UniqueIDs
-  int FileID; // used to produce UniqueIDs
-  std::string WorkingDirectory;
-  std::map<std::string, vfs::Status> FilesAndDirs;
-  typedef std::map<std::string, vfs::Status>::const_iterator const_iterator;
-
-  static int getNextFSID() {
-    static int Count = 0;
-    return Count++;
-  }
-
-public:
-  DummyFileSystem() : FSID(getNextFSID()), FileID(0) {}
-
-  ErrorOr<vfs::Status> status(const Twine &Path) override {
-    auto I = findEntry(Path);
-    if (I == FilesAndDirs.end())
-      return make_error_code(llvm::errc::no_such_file_or_directory);
-    return I->second;
-  }
-  ErrorOr<std::unique_ptr<vfs::File>>
-  openFileForRead(const Twine &Path) override {
-    auto S = status(Path);
-    if (S)
-      return std::unique_ptr<vfs::File>(new DummyFile{*S});
-    return S.getError();
-  }
-  llvm::ErrorOr<std::string> getCurrentWorkingDirectory() const override {
-    return WorkingDirectory;
-  }
-  std::error_code setCurrentWorkingDirectory(const Twine &Path) override {
-    WorkingDirectory = Path.str();
-    return std::error_code();
-  }
-  // Map any symlink to "/symlink".
-  std::error_code getRealPath(const Twine &Path,
-                              SmallVectorImpl<char> &Output) const override {
-    auto I = findEntry(Path);
-    if (I == FilesAndDirs.end())
-      return make_error_code(llvm::errc::no_such_file_or_directory);
-    if (I->second.isSymlink()) {
-      Output.clear();
-      Twine("/symlink").toVector(Output);
-      return std::error_code();
-    }
-    Output.clear();
-    Path.toVector(Output);
-    return std::error_code();
-  }
-
-  struct DirIterImpl : public llvm::vfs::detail::DirIterImpl {
-    std::map<std::string, vfs::Status> &FilesAndDirs;
-    std::map<std::string, vfs::Status>::iterator I;
-    std::string Path;
-    bool isInPath(StringRef S) {
-      if (Path.size() < S.size() && S.find(Path) == 0) {
-        auto LastSep = S.find_last_of('/');
-        if (LastSep == Path.size() || LastSep == Path.size() - 1)
-          return true;
-      }
-      return false;
-    }
-    DirIterImpl(std::map<std::string, vfs::Status> &FilesAndDirs,
-                const Twine &_Path)
-        : FilesAndDirs(FilesAndDirs), I(FilesAndDirs.begin()),
-          Path(_Path.str()) {
-      for (; I != FilesAndDirs.end(); ++I) {
-        if (isInPath(I->first)) {
-          CurrentEntry = vfs::directory_entry(std::string(I->second.getName()),
-                                              I->second.getType());
-          break;
-        }
-      }
-    }
-    std::error_code increment() override {
-      ++I;
-      for (; I != FilesAndDirs.end(); ++I) {
-        if (isInPath(I->first)) {
-          CurrentEntry = vfs::directory_entry(std::string(I->second.getName()),
-                                              I->second.getType());
-          break;
-        }
-      }
-      if (I == FilesAndDirs.end())
-        CurrentEntry = vfs::directory_entry();
-      return std::error_code();
-    }
-  };
-
-  vfs::directory_iterator dir_begin(const Twine &Dir,
-                                    std::error_code &EC) override {
-    return vfs::directory_iterator(
-        std::make_shared<DirIterImpl>(FilesAndDirs, Dir));
-  }
-
-  void addEntry(StringRef Path, const vfs::Status &Status) {
-    FilesAndDirs[std::string(Path)] = Status;
-  }
-
-  const_iterator findEntry(const Twine &Path) const {
-    SmallString<128> P;
-    Path.toVector(P);
-    std::error_code EC = makeAbsolute(P);
-    assert(!EC);
-    (void)EC;
-    return FilesAndDirs.find(std::string(P.str()));
-  }
-
-  void addRegularFile(StringRef Path, sys::fs::perms Perms = sys::fs::all_all) {
-    vfs::Status S(Path, UniqueID(FSID, FileID++),
-                  std::chrono::system_clock::now(), 0, 0, 1024,
-                  sys::fs::file_type::regular_file, Perms);
-    addEntry(Path, S);
-  }
-
-  void addDirectory(StringRef Path, sys::fs::perms Perms = sys::fs::all_all) {
-    vfs::Status S(Path, UniqueID(FSID, FileID++),
-                  std::chrono::system_clock::now(), 0, 0, 0,
-                  sys::fs::file_type::directory_file, Perms);
-    addEntry(Path, S);
-  }
-
-  void addSymlink(StringRef Path) {
-    vfs::Status S(Path, UniqueID(FSID, FileID++),
-                  std::chrono::system_clock::now(), 0, 0, 0,
-                  sys::fs::file_type::symlink_file, sys::fs::all_all);
-    addEntry(Path, S);
-  }
-};
-
-class ErrorDummyFileSystem : public DummyFileSystem {
-  std::error_code setCurrentWorkingDirectory(const Twine &Path) override {
-    return llvm::errc::no_such_file_or_directory;
-  }
-};
-
-/// Replace back-slashes by front-slashes.
-std::string getPosixPath(std::string S) {
-  SmallString<128> Result;
-  llvm::sys::path::native(S, Result, llvm::sys::path::Style::posix);
-  return std::string(Result.str());
-}
-} // end anonymous namespace
-
-TEST(VirtualFileSystemTest, StatusQueries) {
-  IntrusiveRefCntPtr<DummyFileSystem> D(new DummyFileSystem());
-  ErrorOr<vfs::Status> Status((std::error_code()));
-
-  D->addRegularFile("/foo");
-  Status = D->status("/foo");
-  ASSERT_FALSE(Status.getError());
-  EXPECT_TRUE(Status->isStatusKnown());
-  EXPECT_FALSE(Status->isDirectory());
-  EXPECT_TRUE(Status->isRegularFile());
-  EXPECT_FALSE(Status->isSymlink());
-  EXPECT_FALSE(Status->isOther());
-  EXPECT_TRUE(Status->exists());
-
-  D->addDirectory("/bar");
-  Status = D->status("/bar");
-  ASSERT_FALSE(Status.getError());
-  EXPECT_TRUE(Status->isStatusKnown());
-  EXPECT_TRUE(Status->isDirectory());
-  EXPECT_FALSE(Status->isRegularFile());
-  EXPECT_FALSE(Status->isSymlink());
-  EXPECT_FALSE(Status->isOther());
-  EXPECT_TRUE(Status->exists());
-
-  D->addSymlink("/baz");
-  Status = D->status("/baz");
-  ASSERT_FALSE(Status.getError());
-  EXPECT_TRUE(Status->isStatusKnown());
-  EXPECT_FALSE(Status->isDirectory());
-  EXPECT_FALSE(Status->isRegularFile());
-  EXPECT_TRUE(Status->isSymlink());
-  EXPECT_FALSE(Status->isOther());
-  EXPECT_TRUE(Status->exists());
-
-  EXPECT_TRUE(Status->equivalent(*Status));
-  ErrorOr<vfs::Status> Status2 = D->status("/foo");
-  ASSERT_FALSE(Status2.getError());
-  EXPECT_FALSE(Status->equivalent(*Status2));
-}
-
-TEST(VirtualFileSystemTest, BaseOnlyOverlay) {
-  IntrusiveRefCntPtr<DummyFileSystem> D(new DummyFileSystem());
-  ErrorOr<vfs::Status> Status((std::error_code()));
-  EXPECT_FALSE(Status = D->status("/foo"));
-
-  IntrusiveRefCntPtr<vfs::OverlayFileSystem> O(new vfs::OverlayFileSystem(D));
-  EXPECT_FALSE(Status = O->status("/foo"));
-
-  D->addRegularFile("/foo");
-  Status = D->status("/foo");
-  EXPECT_FALSE(Status.getError());
-
-  ErrorOr<vfs::Status> Status2((std::error_code()));
-  Status2 = O->status("/foo");
-  EXPECT_FALSE(Status2.getError());
-  EXPECT_TRUE(Status->equivalent(*Status2));
-}
-
-TEST(VirtualFileSystemTest, GetRealPathInOverlay) {
-  IntrusiveRefCntPtr<DummyFileSystem> Lower(new DummyFileSystem());
-  Lower->addRegularFile("/foo");
-  Lower->addSymlink("/lower_link");
-  IntrusiveRefCntPtr<DummyFileSystem> Upper(new DummyFileSystem());
-
-  IntrusiveRefCntPtr<vfs::OverlayFileSystem> O(
-      new vfs::OverlayFileSystem(Lower));
-  O->pushOverlay(Upper);
-
-  // Regular file.
-  SmallString<16> RealPath;
-  EXPECT_FALSE(O->getRealPath("/foo", RealPath));
-  EXPECT_EQ(RealPath.str(), "/foo");
-
-  // Expect no error getting real path for symlink in lower overlay.
-  EXPECT_FALSE(O->getRealPath("/lower_link", RealPath));
-  EXPECT_EQ(RealPath.str(), "/symlink");
-
-  // Try a non-existing link.
-  EXPECT_EQ(O->getRealPath("/upper_link", RealPath),
-            errc::no_such_file_or_directory);
-
-  // Add a new symlink in upper.
-  Upper->addSymlink("/upper_link");
-  EXPECT_FALSE(O->getRealPath("/upper_link", RealPath));
-  EXPECT_EQ(RealPath.str(), "/symlink");
-}
-
-TEST(VirtualFileSystemTest, OverlayFiles) {
-  IntrusiveRefCntPtr<DummyFileSystem> Base(new DummyFileSystem());
-  IntrusiveRefCntPtr<DummyFileSystem> Middle(new DummyFileSystem());
-  IntrusiveRefCntPtr<DummyFileSystem> Top(new DummyFileSystem());
-  IntrusiveRefCntPtr<vfs::OverlayFileSystem> O(
-      new vfs::OverlayFileSystem(Base));
-  O->pushOverlay(Middle);
-  O->pushOverlay(Top);
-
-  ErrorOr<vfs::Status> Status1((std::error_code())),
-      Status2((std::error_code())), Status3((std::error_code())),
-      StatusB((std::error_code())), StatusM((std::error_code())),
-      StatusT((std::error_code()));
-
-  Base->addRegularFile("/foo");
-  StatusB = Base->status("/foo");
-  ASSERT_FALSE(StatusB.getError());
-  Status1 = O->status("/foo");
-  ASSERT_FALSE(Status1.getError());
-  Middle->addRegularFile("/foo");
-  StatusM = Middle->status("/foo");
-  ASSERT_FALSE(StatusM.getError());
-  Status2 = O->status("/foo");
-  ASSERT_FALSE(Status2.getError());
-  Top->addRegularFile("/foo");
-  StatusT = Top->status("/foo");
-  ASSERT_FALSE(StatusT.getError());
-  Status3 = O->status("/foo");
-  ASSERT_FALSE(Status3.getError());
-
-  EXPECT_TRUE(Status1->equivalent(*StatusB));
-  EXPECT_TRUE(Status2->equivalent(*StatusM));
-  EXPECT_TRUE(Status3->equivalent(*StatusT));
-
-  EXPECT_FALSE(Status1->equivalent(*Status2));
-  EXPECT_FALSE(Status2->equivalent(*Status3));
-  EXPECT_FALSE(Status1->equivalent(*Status3));
-}
-
-TEST(VirtualFileSystemTest, OverlayDirsNonMerged) {
-  IntrusiveRefCntPtr<DummyFileSystem> Lower(new DummyFileSystem());
-  IntrusiveRefCntPtr<DummyFileSystem> Upper(new DummyFileSystem());
-  IntrusiveRefCntPtr<vfs::OverlayFileSystem> O(
-      new vfs::OverlayFileSystem(Lower));
-  O->pushOverlay(Upper);
-
-  Lower->addDirectory("/lower-only");
-  Upper->addDirectory("/upper-only");
-
-  // non-merged paths should be the same
-  ErrorOr<vfs::Status> Status1 = Lower->status("/lower-only");
-  ASSERT_FALSE(Status1.getError());
-  ErrorOr<vfs::Status> Status2 = O->status("/lower-only");
-  ASSERT_FALSE(Status2.getError());
-  EXPECT_TRUE(Status1->equivalent(*Status2));
-
-  Status1 = Upper->status("/upper-only");
-  ASSERT_FALSE(Status1.getError());
-  Status2 = O->status("/upper-only");
-  ASSERT_FALSE(Status2.getError());
-  EXPECT_TRUE(Status1->equivalent(*Status2));
-}
-
-TEST(VirtualFileSystemTest, MergedDirPermissions) {
-  // merged directories get the permissions of the upper dir
-  IntrusiveRefCntPtr<DummyFileSystem> Lower(new DummyFileSystem());
-  IntrusiveRefCntPtr<DummyFileSystem> Upper(new DummyFileSystem());
-  IntrusiveRefCntPtr<vfs::OverlayFileSystem> O(
-      new vfs::OverlayFileSystem(Lower));
-  O->pushOverlay(Upper);
-
-  ErrorOr<vfs::Status> Status((std::error_code()));
-  Lower->addDirectory("/both", sys::fs::owner_read);
-  Upper->addDirectory("/both", sys::fs::owner_all | sys::fs::group_read);
-  Status = O->status("/both");
-  ASSERT_FALSE(Status.getError());
-  EXPECT_EQ(0740, Status->getPermissions());
-
-  // permissions (as usual) are not recursively applied
-  Lower->addRegularFile("/both/foo", sys::fs::owner_read);
-  Upper->addRegularFile("/both/bar", sys::fs::owner_write);
-  Status = O->status("/both/foo");
-  ASSERT_FALSE(Status.getError());
-  EXPECT_EQ(0400, Status->getPermissions());
-  Status = O->status("/both/bar");
-  ASSERT_FALSE(Status.getError());
-  EXPECT_EQ(0200, Status->getPermissions());
-}
-
-TEST(VirtualFileSystemTest, OverlayIterator) {
-  IntrusiveRefCntPtr<DummyFileSystem> Lower(new DummyFileSystem());
-  Lower->addRegularFile("/foo");
-  IntrusiveRefCntPtr<DummyFileSystem> Upper(new DummyFileSystem());
-
-  IntrusiveRefCntPtr<vfs::OverlayFileSystem> O(
-      new vfs::OverlayFileSystem(Lower));
-  O->pushOverlay(Upper);
-
-  ErrorOr<vfs::Status> Status((std::error_code()));
-  {
-    auto it = O->overlays_begin();
-    auto end = O->overlays_end();
-
-    EXPECT_NE(it, end);
-
-    Status = (*it)->status("/foo");
-    ASSERT_TRUE(Status.getError());
-
-    it++;
-    EXPECT_NE(it, end);
-
-    Status = (*it)->status("/foo");
-    ASSERT_FALSE(Status.getError());
-    EXPECT_TRUE(Status->exists());
-
-    it++;
-    EXPECT_EQ(it, end);
-  }
-
-  {
-    auto it = O->overlays_rbegin();
-    auto end = O->overlays_rend();
-
-    EXPECT_NE(it, end);
-
-    Status = (*it)->status("/foo");
-    ASSERT_FALSE(Status.getError());
-    EXPECT_TRUE(Status->exists());
-
-    it++;
-    EXPECT_NE(it, end);
-
-    Status = (*it)->status("/foo");
-    ASSERT_TRUE(Status.getError());
-
-    it++;
-    EXPECT_EQ(it, end);
-  }
-}
-
-TEST(VirtualFileSystemTest, BasicRealFSIteration) {
-  TempDir TestDirectory("virtual-file-system-test", /*Unique*/ true);
-  IntrusiveRefCntPtr<vfs::FileSystem> FS = vfs::getRealFileSystem();
-
-  std::error_code EC;
-  vfs::directory_iterator I = FS->dir_begin(Twine(TestDirectory.path()), EC);
-  ASSERT_FALSE(EC);
-  EXPECT_EQ(vfs::directory_iterator(), I); // empty directory is empty
-
-  TempDir _a(TestDirectory.path("a"));
-  TempDir _ab(TestDirectory.path("a/b"));
-  TempDir _c(TestDirectory.path("c"));
-  TempDir _cd(TestDirectory.path("c/d"));
-
-  I = FS->dir_begin(Twine(TestDirectory.path()), EC);
-  ASSERT_FALSE(EC);
-  ASSERT_NE(vfs::directory_iterator(), I);
-  // Check either a or c, since we can't rely on the iteration order.
-  EXPECT_TRUE(I->path().endswith("a") || I->path().endswith("c"));
-  I.increment(EC);
-  ASSERT_FALSE(EC);
-  ASSERT_NE(vfs::directory_iterator(), I);
-  EXPECT_TRUE(I->path().endswith("a") || I->path().endswith("c"));
-  I.increment(EC);
-  EXPECT_EQ(vfs::directory_iterator(), I);
-}
-
-#ifdef LLVM_ON_UNIX
-TEST(VirtualFileSystemTest, MultipleWorkingDirs) {
-  // Our root contains a/aa, b/bb, c, where c is a link to a/.
-  // Run tests both in root/b/ and root/c/ (to test "normal" and symlink dirs).
-  // Interleave operations to show the working directories are independent.
-  TempDir Root("r", /*Unique*/ true);
-  TempDir ADir(Root.path("a"));
-  TempDir BDir(Root.path("b"));
-  TempLink C(ADir.path(), Root.path("c"));
-  TempFile AA(ADir.path("aa"), "", "aaaa");
-  TempFile BB(BDir.path("bb"), "", "bbbb");
-  std::unique_ptr<vfs::FileSystem> BFS = vfs::createPhysicalFileSystem(),
-                                   CFS = vfs::createPhysicalFileSystem();
-
-  ASSERT_FALSE(BFS->setCurrentWorkingDirectory(BDir.path()));
-  ASSERT_FALSE(CFS->setCurrentWorkingDirectory(C.path()));
-  EXPECT_EQ(BDir.path(), *BFS->getCurrentWorkingDirectory());
-  EXPECT_EQ(C.path(), *CFS->getCurrentWorkingDirectory());
-
-  // openFileForRead(), indirectly.
-  auto BBuf = BFS->getBufferForFile("bb");
-  ASSERT_TRUE(BBuf);
-  EXPECT_EQ("bbbb", (*BBuf)->getBuffer());
-
-  auto ABuf = CFS->getBufferForFile("aa");
-  ASSERT_TRUE(ABuf);
-  EXPECT_EQ("aaaa", (*ABuf)->getBuffer());
-
-  // status()
-  auto BStat = BFS->status("bb");
-  ASSERT_TRUE(BStat);
-  EXPECT_EQ("bb", BStat->getName());
-
-  auto AStat = CFS->status("aa");
-  ASSERT_TRUE(AStat);
-  EXPECT_EQ("aa", AStat->getName()); // unresolved name
-
-  // getRealPath()
-  SmallString<128> BPath;
-  ASSERT_FALSE(BFS->getRealPath("bb", BPath));
-  EXPECT_EQ(BB.path(), BPath);
-
-  SmallString<128> APath;
-  ASSERT_FALSE(CFS->getRealPath("aa", APath));
-  EXPECT_EQ(AA.path(), APath); // Reports resolved name.
-
-  // dir_begin
-  std::error_code EC;
-  auto BIt = BFS->dir_begin(".", EC);
-  ASSERT_FALSE(EC);
-  ASSERT_NE(BIt, vfs::directory_iterator());
-  EXPECT_EQ((BDir.path() + "/./bb").str(), BIt->path());
-  BIt.increment(EC);
-  ASSERT_FALSE(EC);
-  ASSERT_EQ(BIt, vfs::directory_iterator());
-
-  auto CIt = CFS->dir_begin(".", EC);
-  ASSERT_FALSE(EC);
-  ASSERT_NE(CIt, vfs::directory_iterator());
-  EXPECT_EQ((ADir.path() + "/./aa").str(),
-            CIt->path()); // Partly resolved name!
-  CIt.increment(EC); // Because likely to read through this path.
-  ASSERT_FALSE(EC);
-  ASSERT_EQ(CIt, vfs::directory_iterator());
-}
-
-TEST(VirtualFileSystemTest, BrokenSymlinkRealFSIteration) {
-  TempDir TestDirectory("virtual-file-system-test", /*Unique*/ true);
-  IntrusiveRefCntPtr<vfs::FileSystem> FS = vfs::getRealFileSystem();
-
-  TempLink _a("no_such_file", TestDirectory.path("a"));
-  TempDir _b(TestDirectory.path("b"));
-  TempLink _c("no_such_file", TestDirectory.path("c"));
-
-  // Should get no iteration error, but a stat error for the broken symlinks.
-  std::map<std::string, std::error_code> StatResults;
-  std::error_code EC;
-  for (vfs::directory_iterator
-           I = FS->dir_begin(Twine(TestDirectory.path()), EC),
-           E;
-       I != E; I.increment(EC)) {
-    EXPECT_FALSE(EC);
-    StatResults[std::string(sys::path::filename(I->path()))] =
-        FS->status(I->path()).getError();
-  }
-  EXPECT_THAT(
-      StatResults,
-      ElementsAre(
-          Pair("a", std::make_error_code(std::errc::no_such_file_or_directory)),
-          Pair("b", std::error_code()),
-          Pair("c",
-               std::make_error_code(std::errc::no_such_file_or_directory))));
-}
-#endif
-
-TEST(VirtualFileSystemTest, BasicRealFSRecursiveIteration) {
-  TempDir TestDirectory("virtual-file-system-test", /*Unique*/ true);
-  IntrusiveRefCntPtr<vfs::FileSystem> FS = vfs::getRealFileSystem();
-
-  std::error_code EC;
-  auto I =
-      vfs::recursive_directory_iterator(*FS, Twine(TestDirectory.path()), EC);
-  ASSERT_FALSE(EC);
-  EXPECT_EQ(vfs::recursive_directory_iterator(), I); // empty directory is empty
-
-  TempDir _a(TestDirectory.path("a"));
-  TempDir _ab(TestDirectory.path("a/b"));
-  TempDir _c(TestDirectory.path("c"));
-  TempDir _cd(TestDirectory.path("c/d"));
-
-  I = vfs::recursive_directory_iterator(*FS, Twine(TestDirectory.path()), EC);
-  ASSERT_FALSE(EC);
-  ASSERT_NE(vfs::recursive_directory_iterator(), I);
-
-  std::vector<std::string> Contents;
-  for (auto E = vfs::recursive_directory_iterator(); !EC && I != E;
-       I.increment(EC)) {
-    Contents.push_back(std::string(I->path()));
-  }
-
-  // Check contents, which may be in any order
-  EXPECT_EQ(4U, Contents.size());
-  int Counts[4] = {0, 0, 0, 0};
-  for (const std::string &Name : Contents) {
-    ASSERT_FALSE(Name.empty());
-    int Index = Name[Name.size() - 1] - 'a';
-    ASSERT_TRUE(Index >= 0 && Index < 4);
-    Counts[Index]++;
-  }
-  EXPECT_EQ(1, Counts[0]); // a
-  EXPECT_EQ(1, Counts[1]); // b
-  EXPECT_EQ(1, Counts[2]); // c
-  EXPECT_EQ(1, Counts[3]); // d
-}
-
-TEST(VirtualFileSystemTest, BasicRealFSRecursiveIterationNoPush) {
-  TempDir TestDirectory("virtual-file-system-test", /*Unique*/ true);
-
-  TempDir _a(TestDirectory.path("a"));
-  TempDir _ab(TestDirectory.path("a/b"));
-  TempDir _c(TestDirectory.path("c"));
-  TempDir _cd(TestDirectory.path("c/d"));
-  TempDir _e(TestDirectory.path("e"));
-  TempDir _ef(TestDirectory.path("e/f"));
-  TempDir _g(TestDirectory.path("g"));
-
-  IntrusiveRefCntPtr<vfs::FileSystem> FS = vfs::getRealFileSystem();
-
-  // Test that calling no_push on entries without subdirectories has no effect.
-  {
-    std::error_code EC;
-    auto I =
-        vfs::recursive_directory_iterator(*FS, Twine(TestDirectory.path()), EC);
-    ASSERT_FALSE(EC);
-
-    std::vector<std::string> Contents;
-    for (auto E = vfs::recursive_directory_iterator(); !EC && I != E;
-         I.increment(EC)) {
-      Contents.push_back(std::string(I->path()));
-      char last = I->path().back();
-      switch (last) {
-      case 'b':
-      case 'd':
-      case 'f':
-      case 'g':
-        I.no_push();
-        break;
-      default:
-        break;
-      }
-    }
-    EXPECT_EQ(7U, Contents.size());
-  }
-
-  // Test that calling no_push skips subdirectories.
-  {
-    std::error_code EC;
-    auto I =
-        vfs::recursive_directory_iterator(*FS, Twine(TestDirectory.path()), EC);
-    ASSERT_FALSE(EC);
-
-    std::vector<std::string> Contents;
-    for (auto E = vfs::recursive_directory_iterator(); !EC && I != E;
-         I.increment(EC)) {
-      Contents.push_back(std::string(I->path()));
-      char last = I->path().back();
-      switch (last) {
-      case 'a':
-      case 'c':
-      case 'e':
-        I.no_push();
-        break;
-      default:
-        break;
-      }
-    }
-
-    // Check contents, which may be in any order
-    EXPECT_EQ(4U, Contents.size());
-    int Counts[7] = {0, 0, 0, 0, 0, 0, 0};
-    for (const std::string &Name : Contents) {
-      ASSERT_FALSE(Name.empty());
-      int Index = Name[Name.size() - 1] - 'a';
-      ASSERT_TRUE(Index >= 0 && Index < 7);
-      Counts[Index]++;
-    }
-    EXPECT_EQ(1, Counts[0]); // a
-    EXPECT_EQ(0, Counts[1]); // b
-    EXPECT_EQ(1, Counts[2]); // c
-    EXPECT_EQ(0, Counts[3]); // d
-    EXPECT_EQ(1, Counts[4]); // e
-    EXPECT_EQ(0, Counts[5]); // f
-    EXPECT_EQ(1, Counts[6]); // g
-  }
-}
-
-#ifdef LLVM_ON_UNIX
-TEST(VirtualFileSystemTest, BrokenSymlinkRealFSRecursiveIteration) {
-  TempDir TestDirectory("virtual-file-system-test", /*Unique*/ true);
-  IntrusiveRefCntPtr<vfs::FileSystem> FS = vfs::getRealFileSystem();
-
-  TempLink _a("no_such_file", TestDirectory.path("a"));
-  TempDir _b(TestDirectory.path("b"));
-  TempLink _ba("no_such_file", TestDirectory.path("b/a"));
-  TempDir _bb(TestDirectory.path("b/b"));
-  TempLink _bc("no_such_file", TestDirectory.path("b/c"));
-  TempLink _c("no_such_file", TestDirectory.path("c"));
-  TempDir _d(TestDirectory.path("d"));
-  TempDir _dd(TestDirectory.path("d/d"));
-  TempDir _ddd(TestDirectory.path("d/d/d"));
-  TempLink _e("no_such_file", TestDirectory.path("e"));
-
-  std::vector<std::string> VisitedBrokenSymlinks;
-  std::vector<std::string> VisitedNonBrokenSymlinks;
-  std::error_code EC;
-  for (vfs::recursive_directory_iterator
-           I(*FS, Twine(TestDirectory.path()), EC),
-       E;
-       I != E; I.increment(EC)) {
-    EXPECT_FALSE(EC);
-    (FS->status(I->path()) ? VisitedNonBrokenSymlinks : VisitedBrokenSymlinks)
-        .push_back(std::string(I->path()));
-  }
-
-  // Check visited file names.
-  EXPECT_THAT(VisitedBrokenSymlinks,
-              UnorderedElementsAre(_a.path().str(), _ba.path().str(),
-                                   _bc.path().str(), _c.path().str(),
-                                   _e.path().str()));
-  EXPECT_THAT(VisitedNonBrokenSymlinks,
-              UnorderedElementsAre(_b.path().str(), _bb.path().str(),
-                                   _d.path().str(), _dd.path().str(),
-                                   _ddd.path().str()));
-}
-#endif
-
-template <typename DirIter>
-static void checkContents(DirIter I, ArrayRef<StringRef> ExpectedOut) {
-  std::error_code EC;
-  SmallVector<StringRef, 4> Expected(ExpectedOut.begin(), ExpectedOut.end());
-  SmallVector<std::string, 4> InputToCheck;
-
-  // Do not rely on iteration order to check for contents, sort both
-  // content vectors before comparison.
-  for (DirIter E; !EC && I != E; I.increment(EC))
-    InputToCheck.push_back(std::string(I->path()));
-
-  llvm::sort(InputToCheck);
-  llvm::sort(Expected);
-  EXPECT_EQ(InputToCheck.size(), Expected.size());
-
-  unsigned LastElt = std::min(InputToCheck.size(), Expected.size());
-  for (unsigned Idx = 0; Idx != LastElt; ++Idx)
-    EXPECT_EQ(StringRef(InputToCheck[Idx]), Expected[Idx]);
-}
-
-TEST(VirtualFileSystemTest, OverlayIteration) {
-  IntrusiveRefCntPtr<DummyFileSystem> Lower(new DummyFileSystem());
-  IntrusiveRefCntPtr<DummyFileSystem> Upper(new DummyFileSystem());
-  IntrusiveRefCntPtr<vfs::OverlayFileSystem> O(
-      new vfs::OverlayFileSystem(Lower));
-  O->pushOverlay(Upper);
-
-  std::error_code EC;
-  checkContents(O->dir_begin("/", EC), ArrayRef<StringRef>());
-
-  Lower->addRegularFile("/file1");
-  checkContents(O->dir_begin("/", EC), ArrayRef<StringRef>("/file1"));
-
-  Upper->addRegularFile("/file2");
-  checkContents(O->dir_begin("/", EC), {"/file2", "/file1"});
-
-  Lower->addDirectory("/dir1");
-  Lower->addRegularFile("/dir1/foo");
-  Upper->addDirectory("/dir2");
-  Upper->addRegularFile("/dir2/foo");
-  checkContents(O->dir_begin("/dir2", EC), ArrayRef<StringRef>("/dir2/foo"));
-  checkContents(O->dir_begin("/", EC), {"/dir2", "/file2", "/dir1", "/file1"});
-}
-
-TEST(VirtualFileSystemTest, OverlayRecursiveIteration) {
-  IntrusiveRefCntPtr<DummyFileSystem> Lower(new DummyFileSystem());
-  IntrusiveRefCntPtr<DummyFileSystem> Middle(new DummyFileSystem());
-  IntrusiveRefCntPtr<DummyFileSystem> Upper(new DummyFileSystem());
-  IntrusiveRefCntPtr<vfs::OverlayFileSystem> O(
-      new vfs::OverlayFileSystem(Lower));
-  O->pushOverlay(Middle);
-  O->pushOverlay(Upper);
-
-  std::error_code EC;
-  checkContents(vfs::recursive_directory_iterator(*O, "/", EC),
-                ArrayRef<StringRef>());
-
-  Lower->addRegularFile("/file1");
-  checkContents(vfs::recursive_directory_iterator(*O, "/", EC),
-                ArrayRef<StringRef>("/file1"));
-
-  Upper->addDirectory("/dir");
-  Upper->addRegularFile("/dir/file2");
-  checkContents(vfs::recursive_directory_iterator(*O, "/", EC),
-                {"/dir", "/dir/file2", "/file1"});
-
-  Lower->addDirectory("/dir1");
-  Lower->addRegularFile("/dir1/foo");
-  Lower->addDirectory("/dir1/a");
-  Lower->addRegularFile("/dir1/a/b");
-  Middle->addDirectory("/a");
-  Middle->addDirectory("/a/b");
-  Middle->addDirectory("/a/b/c");
-  Middle->addRegularFile("/a/b/c/d");
-  Middle->addRegularFile("/hiddenByUp");
-  Upper->addDirectory("/dir2");
-  Upper->addRegularFile("/dir2/foo");
-  Upper->addRegularFile("/hiddenByUp");
-  checkContents(vfs::recursive_directory_iterator(*O, "/dir2", EC),
-                ArrayRef<StringRef>("/dir2/foo"));
-  checkContents(vfs::recursive_directory_iterator(*O, "/", EC),
-                {"/dir", "/dir/file2", "/dir2", "/dir2/foo", "/hiddenByUp",
-                 "/a", "/a/b", "/a/b/c", "/a/b/c/d", "/dir1", "/dir1/a",
-                 "/dir1/a/b", "/dir1/foo", "/file1"});
-}
-
-TEST(VirtualFileSystemTest, ThreeLevelIteration) {
-  IntrusiveRefCntPtr<DummyFileSystem> Lower(new DummyFileSystem());
-  IntrusiveRefCntPtr<DummyFileSystem> Middle(new DummyFileSystem());
-  IntrusiveRefCntPtr<DummyFileSystem> Upper(new DummyFileSystem());
-  IntrusiveRefCntPtr<vfs::OverlayFileSystem> O(
-      new vfs::OverlayFileSystem(Lower));
-  O->pushOverlay(Middle);
-  O->pushOverlay(Upper);
-
-  std::error_code EC;
-  checkContents(O->dir_begin("/", EC), ArrayRef<StringRef>());
-
-  Middle->addRegularFile("/file2");
-  checkContents(O->dir_begin("/", EC), ArrayRef<StringRef>("/file2"));
-
-  Lower->addRegularFile("/file1");
-  Upper->addRegularFile("/file3");
-  checkContents(O->dir_begin("/", EC), {"/file3", "/file2", "/file1"});
-}
-
-TEST(VirtualFileSystemTest, HiddenInIteration) {
-  IntrusiveRefCntPtr<DummyFileSystem> Lower(new DummyFileSystem());
-  IntrusiveRefCntPtr<DummyFileSystem> Middle(new DummyFileSystem());
-  IntrusiveRefCntPtr<DummyFileSystem> Upper(new DummyFileSystem());
-  IntrusiveRefCntPtr<vfs::OverlayFileSystem> O(
-      new vfs::OverlayFileSystem(Lower));
-  O->pushOverlay(Middle);
-  O->pushOverlay(Upper);
-
-  std::error_code EC;
-  Lower->addRegularFile("/onlyInLow");
-  Lower->addDirectory("/hiddenByMid");
-  Lower->addDirectory("/hiddenByUp");
-  Middle->addRegularFile("/onlyInMid");
-  Middle->addRegularFile("/hiddenByMid");
-  Middle->addDirectory("/hiddenByUp");
-  Upper->addRegularFile("/onlyInUp");
-  Upper->addRegularFile("/hiddenByUp");
-  checkContents(
-      O->dir_begin("/", EC),
-      {"/hiddenByUp", "/onlyInUp", "/hiddenByMid", "/onlyInMid", "/onlyInLow"});
-
-  // Make sure we get the top-most entry
-  {
-    std::error_code EC;
-    vfs::directory_iterator I = O->dir_begin("/", EC), E;
-    for (; !EC && I != E; I.increment(EC))
-      if (I->path() == "/hiddenByUp")
-        break;
-    ASSERT_NE(E, I);
-    EXPECT_EQ(sys::fs::file_type::regular_file, I->type());
-  }
-  {
-    std::error_code EC;
-    vfs::directory_iterator I = O->dir_begin("/", EC), E;
-    for (; !EC && I != E; I.increment(EC))
-      if (I->path() == "/hiddenByMid")
-        break;
-    ASSERT_NE(E, I);
-    EXPECT_EQ(sys::fs::file_type::regular_file, I->type());
-  }
-}
-
-TEST(ProxyFileSystemTest, Basic) {
-  IntrusiveRefCntPtr<vfs::InMemoryFileSystem> Base(
-      new vfs::InMemoryFileSystem());
-  vfs::ProxyFileSystem PFS(Base);
-
-  Base->addFile("/a", 0, MemoryBuffer::getMemBuffer("test"));
-
-  auto Stat = PFS.status("/a");
-  ASSERT_FALSE(Stat.getError());
-
-  auto File = PFS.openFileForRead("/a");
-  ASSERT_FALSE(File.getError());
-  EXPECT_EQ("test", (*(*File)->getBuffer("ignored"))->getBuffer());
-
-  std::error_code EC;
-  vfs::directory_iterator I = PFS.dir_begin("/", EC);
-  ASSERT_FALSE(EC);
-  ASSERT_EQ("/a", I->path());
-  I.increment(EC);
-  ASSERT_FALSE(EC);
-  ASSERT_EQ(vfs::directory_iterator(), I);
-
-  ASSERT_FALSE(PFS.setCurrentWorkingDirectory("/"));
-
-  auto PWD = PFS.getCurrentWorkingDirectory();
-  ASSERT_FALSE(PWD.getError());
-  ASSERT_EQ("/", *PWD);
-
-  SmallString<16> Path;
-  ASSERT_FALSE(PFS.getRealPath("a", Path));
-  ASSERT_EQ("/a", Path);
-
-  bool Local = true;
-  ASSERT_FALSE(PFS.isLocal("/a", Local));
-  EXPECT_FALSE(Local);
-}
-
-class InMemoryFileSystemTest : public ::testing::Test {
-protected:
-  llvm::vfs::InMemoryFileSystem FS;
-  llvm::vfs::InMemoryFileSystem NormalizedFS;
-
-  InMemoryFileSystemTest()
-      : FS(/*UseNormalizedPaths=*/false),
-        NormalizedFS(/*UseNormalizedPaths=*/true) {}
-};
-
-MATCHER_P2(IsHardLinkTo, FS, Target, "") {
-  StringRef From = arg;
-  StringRef To = Target;
-  auto OpenedFrom = FS->openFileForRead(From);
-  auto OpenedTo = FS->openFileForRead(To);
-  return !OpenedFrom.getError() && !OpenedTo.getError() &&
-         (*OpenedFrom)->status()->getUniqueID() ==
-             (*OpenedTo)->status()->getUniqueID();
-}
-
-TEST_F(InMemoryFileSystemTest, IsEmpty) {
-  auto Stat = FS.status("/a");
-  ASSERT_EQ(Stat.getError(), errc::no_such_file_or_directory) << FS.toString();
-  Stat = FS.status("/");
-  ASSERT_EQ(Stat.getError(), errc::no_such_file_or_directory) << FS.toString();
-}
-
-TEST_F(InMemoryFileSystemTest, WindowsPath) {
-  FS.addFile("c:/windows/system128/foo.cpp", 0, MemoryBuffer::getMemBuffer(""));
-  auto Stat = FS.status("c:");
-#if !defined(_WIN32)
-  ASSERT_FALSE(Stat.getError()) << Stat.getError() << FS.toString();
-#endif
-  Stat = FS.status("c:/windows/system128/foo.cpp");
-  ASSERT_FALSE(Stat.getError()) << Stat.getError() << FS.toString();
-  FS.addFile("d:/windows/foo.cpp", 0, MemoryBuffer::getMemBuffer(""));
-  Stat = FS.status("d:/windows/foo.cpp");
-  ASSERT_FALSE(Stat.getError()) << Stat.getError() << FS.toString();
-}
-
-TEST_F(InMemoryFileSystemTest, OverlayFile) {
-  FS.addFile("/a", 0, MemoryBuffer::getMemBuffer("a"));
-  NormalizedFS.addFile("/a", 0, MemoryBuffer::getMemBuffer("a"));
-  auto Stat = FS.status("/");
-  ASSERT_FALSE(Stat.getError()) << Stat.getError() << FS.toString();
-  Stat = FS.status("/.");
-  ASSERT_FALSE(Stat);
-  Stat = NormalizedFS.status("/.");
-  ASSERT_FALSE(Stat.getError()) << Stat.getError() << FS.toString();
-  Stat = FS.status("/a");
-  ASSERT_FALSE(Stat.getError()) << Stat.getError() << "\n" << FS.toString();
-  ASSERT_EQ("/a", Stat->getName());
-}
-
-TEST_F(InMemoryFileSystemTest, OverlayFileNoOwn) {
-  auto Buf = MemoryBuffer::getMemBuffer("a");
-  FS.addFileNoOwn("/a", 0, *Buf);
-  auto Stat = FS.status("/a");
-  ASSERT_FALSE(Stat.getError()) << Stat.getError() << "\n" << FS.toString();
-  ASSERT_EQ("/a", Stat->getName());
-}
-
-TEST_F(InMemoryFileSystemTest, OpenFileForRead) {
-  FS.addFile("/a", 0, MemoryBuffer::getMemBuffer("a"));
-  FS.addFile("././c", 0, MemoryBuffer::getMemBuffer("c"));
-  FS.addFile("./d/../d", 0, MemoryBuffer::getMemBuffer("d"));
-  NormalizedFS.addFile("/a", 0, MemoryBuffer::getMemBuffer("a"));
-  NormalizedFS.addFile("././c", 0, MemoryBuffer::getMemBuffer("c"));
-  NormalizedFS.addFile("./d/../d", 0, MemoryBuffer::getMemBuffer("d"));
-  auto File = FS.openFileForRead("/a");
-  ASSERT_EQ("a", (*(*File)->getBuffer("ignored"))->getBuffer());
-  File = FS.openFileForRead("/a"); // Open again.
-  ASSERT_EQ("a", (*(*File)->getBuffer("ignored"))->getBuffer());
-  File = NormalizedFS.openFileForRead("/././a"); // Open again.
-  ASSERT_EQ("a", (*(*File)->getBuffer("ignored"))->getBuffer());
-  File = FS.openFileForRead("/");
-  ASSERT_EQ(File.getError(), errc::invalid_argument) << FS.toString();
-  File = FS.openFileForRead("/b");
-  ASSERT_EQ(File.getError(), errc::no_such_file_or_directory) << FS.toString();
-  File = FS.openFileForRead("./c");
-  ASSERT_FALSE(File);
-  File = FS.openFileForRead("e/../d");
-  ASSERT_FALSE(File);
-  File = NormalizedFS.openFileForRead("./c");
-  ASSERT_EQ("c", (*(*File)->getBuffer("ignored"))->getBuffer());
-  File = NormalizedFS.openFileForRead("e/../d");
-  ASSERT_EQ("d", (*(*File)->getBuffer("ignored"))->getBuffer());
-}
-
-TEST_F(InMemoryFileSystemTest, DuplicatedFile) {
-  ASSERT_TRUE(FS.addFile("/a", 0, MemoryBuffer::getMemBuffer("a")));
-  ASSERT_FALSE(FS.addFile("/a/b", 0, MemoryBuffer::getMemBuffer("a")));
-  ASSERT_TRUE(FS.addFile("/a", 0, MemoryBuffer::getMemBuffer("a")));
-  ASSERT_FALSE(FS.addFile("/a", 0, MemoryBuffer::getMemBuffer("b")));
-}
-
-TEST_F(InMemoryFileSystemTest, DirectoryIteration) {
-  FS.addFile("/a", 0, MemoryBuffer::getMemBuffer(""));
-  FS.addFile("/b/c", 0, MemoryBuffer::getMemBuffer(""));
-
-  std::error_code EC;
-  vfs::directory_iterator I = FS.dir_begin("/", EC);
-  ASSERT_FALSE(EC);
-  ASSERT_EQ("/a", I->path());
-  I.increment(EC);
-  ASSERT_FALSE(EC);
-  ASSERT_EQ("/b", I->path());
-  I.increment(EC);
-  ASSERT_FALSE(EC);
-  ASSERT_EQ(vfs::directory_iterator(), I);
-
-  I = FS.dir_begin("/b", EC);
-  ASSERT_FALSE(EC);
-  // When on Windows, we end up with "/b\\c" as the name.  Convert to Posix
-  // path for the sake of the comparison.
-  ASSERT_EQ("/b/c", getPosixPath(std::string(I->path())));
-  I.increment(EC);
-  ASSERT_FALSE(EC);
-  ASSERT_EQ(vfs::directory_iterator(), I);
-}
-
-TEST_F(InMemoryFileSystemTest, WorkingDirectory) {
-  FS.setCurrentWorkingDirectory("/b");
-  FS.addFile("c", 0, MemoryBuffer::getMemBuffer(""));
-
-  auto Stat = FS.status("/b/c");
-  ASSERT_FALSE(Stat.getError()) << Stat.getError() << "\n" << FS.toString();
-  ASSERT_EQ("/b/c", Stat->getName());
-  ASSERT_EQ("/b", *FS.getCurrentWorkingDirectory());
-
-  Stat = FS.status("c");
-  ASSERT_FALSE(Stat.getError()) << Stat.getError() << "\n" << FS.toString();
-
-  NormalizedFS.setCurrentWorkingDirectory("/b/c");
-  NormalizedFS.setCurrentWorkingDirectory(".");
-  ASSERT_EQ("/b/c",
-            getPosixPath(NormalizedFS.getCurrentWorkingDirectory().get()));
-  NormalizedFS.setCurrentWorkingDirectory("..");
-  ASSERT_EQ("/b",
-            getPosixPath(NormalizedFS.getCurrentWorkingDirectory().get()));
-}
-
-TEST_F(InMemoryFileSystemTest, IsLocal) {
-  FS.setCurrentWorkingDirectory("/b");
-  FS.addFile("c", 0, MemoryBuffer::getMemBuffer(""));
-
-  std::error_code EC;
-  bool IsLocal = true;
-  EC = FS.isLocal("c", IsLocal);
-  ASSERT_FALSE(EC);
-  ASSERT_FALSE(IsLocal);
-}
-
-#if !defined(_WIN32)
-TEST_F(InMemoryFileSystemTest, GetRealPath) {
-  SmallString<16> Path;
-  EXPECT_EQ(FS.getRealPath("b", Path), errc::operation_not_permitted);
-
-  auto GetRealPath = [this](StringRef P) {
-    SmallString<16> Output;
-    auto EC = FS.getRealPath(P, Output);
-    EXPECT_FALSE(EC);
-    return std::string(Output);
-  };
-
-  FS.setCurrentWorkingDirectory("a");
-  EXPECT_EQ(GetRealPath("b"), "a/b");
-  EXPECT_EQ(GetRealPath("../b"), "b");
-  EXPECT_EQ(GetRealPath("b/./c"), "a/b/c");
-
-  FS.setCurrentWorkingDirectory("/a");
-  EXPECT_EQ(GetRealPath("b"), "/a/b");
-  EXPECT_EQ(GetRealPath("../b"), "/b");
-  EXPECT_EQ(GetRealPath("b/./c"), "/a/b/c");
-}
-#endif // _WIN32
-
-TEST_F(InMemoryFileSystemTest, AddFileWithUser) {
-  FS.addFile("/a/b/c", 0, MemoryBuffer::getMemBuffer("abc"), 0xFEEDFACE);
-  auto Stat = FS.status("/a");
-  ASSERT_FALSE(Stat.getError()) << Stat.getError() << "\n" << FS.toString();
-  ASSERT_TRUE(Stat->isDirectory());
-  ASSERT_EQ(0xFEEDFACE, Stat->getUser());
-  Stat = FS.status("/a/b");
-  ASSERT_FALSE(Stat.getError()) << Stat.getError() << "\n" << FS.toString();
-  ASSERT_TRUE(Stat->isDirectory());
-  ASSERT_EQ(0xFEEDFACE, Stat->getUser());
-  Stat = FS.status("/a/b/c");
-  ASSERT_FALSE(Stat.getError()) << Stat.getError() << "\n" << FS.toString();
-  ASSERT_TRUE(Stat->isRegularFile());
-  ASSERT_EQ(sys::fs::perms::all_all, Stat->getPermissions());
-  ASSERT_EQ(0xFEEDFACE, Stat->getUser());
-}
-
-TEST_F(InMemoryFileSystemTest, AddFileWithGroup) {
-  FS.addFile("/a/b/c", 0, MemoryBuffer::getMemBuffer("abc"), None, 0xDABBAD00);
-  auto Stat = FS.status("/a");
-  ASSERT_FALSE(Stat.getError()) << Stat.getError() << "\n" << FS.toString();
-  ASSERT_TRUE(Stat->isDirectory());
-  ASSERT_EQ(0xDABBAD00, Stat->getGroup());
-  Stat = FS.status("/a/b");
-  ASSERT_TRUE(Stat->isDirectory());
-  ASSERT_FALSE(Stat.getError()) << Stat.getError() << "\n" << FS.toString();
-  ASSERT_EQ(0xDABBAD00, Stat->getGroup());
-  Stat = FS.status("/a/b/c");
-  ASSERT_FALSE(Stat.getError()) << Stat.getError() << "\n" << FS.toString();
-  ASSERT_TRUE(Stat->isRegularFile());
-  ASSERT_EQ(sys::fs::perms::all_all, Stat->getPermissions());
-  ASSERT_EQ(0xDABBAD00, Stat->getGroup());
-}
-
-TEST_F(InMemoryFileSystemTest, AddFileWithFileType) {
-  FS.addFile("/a/b/c", 0, MemoryBuffer::getMemBuffer("abc"), None, None,
-             sys::fs::file_type::socket_file);
-  auto Stat = FS.status("/a");
-  ASSERT_FALSE(Stat.getError()) << Stat.getError() << "\n" << FS.toString();
-  ASSERT_TRUE(Stat->isDirectory());
-  Stat = FS.status("/a/b");
-  ASSERT_FALSE(Stat.getError()) << Stat.getError() << "\n" << FS.toString();
-  ASSERT_TRUE(Stat->isDirectory());
-  Stat = FS.status("/a/b/c");
-  ASSERT_FALSE(Stat.getError()) << Stat.getError() << "\n" << FS.toString();
-  ASSERT_EQ(sys::fs::file_type::socket_file, Stat->getType());
-  ASSERT_EQ(sys::fs::perms::all_all, Stat->getPermissions());
-}
-
-TEST_F(InMemoryFileSystemTest, AddFileWithPerms) {
-  FS.addFile("/a/b/c", 0, MemoryBuffer::getMemBuffer("abc"), None, None, None,
-             sys::fs::perms::owner_read | sys::fs::perms::owner_write);
-  auto Stat = FS.status("/a");
-  ASSERT_FALSE(Stat.getError()) << Stat.getError() << "\n" << FS.toString();
-  ASSERT_TRUE(Stat->isDirectory());
-  ASSERT_EQ(sys::fs::perms::owner_read | sys::fs::perms::owner_write |
-                sys::fs::perms::owner_exe,
-            Stat->getPermissions());
-  Stat = FS.status("/a/b");
-  ASSERT_FALSE(Stat.getError()) << Stat.getError() << "\n" << FS.toString();
-  ASSERT_TRUE(Stat->isDirectory());
-  ASSERT_EQ(sys::fs::perms::owner_read | sys::fs::perms::owner_write |
-                sys::fs::perms::owner_exe,
-            Stat->getPermissions());
-  Stat = FS.status("/a/b/c");
-  ASSERT_FALSE(Stat.getError()) << Stat.getError() << "\n" << FS.toString();
-  ASSERT_TRUE(Stat->isRegularFile());
-  ASSERT_EQ(sys::fs::perms::owner_read | sys::fs::perms::owner_write,
-            Stat->getPermissions());
-}
-
-TEST_F(InMemoryFileSystemTest, AddDirectoryThenAddChild) {
-  FS.addFile("/a", 0, MemoryBuffer::getMemBuffer(""), /*User=*/None,
-             /*Group=*/None, sys::fs::file_type::directory_file);
-  FS.addFile("/a/b", 0, MemoryBuffer::getMemBuffer("abc"), /*User=*/None,
-             /*Group=*/None, sys::fs::file_type::regular_file);
-  auto Stat = FS.status("/a");
-  ASSERT_FALSE(Stat.getError()) << Stat.getError() << "\n" << FS.toString();
-  ASSERT_TRUE(Stat->isDirectory());
-  Stat = FS.status("/a/b");
-  ASSERT_FALSE(Stat.getError()) << Stat.getError() << "\n" << FS.toString();
-  ASSERT_TRUE(Stat->isRegularFile());
-}
-
-// Test that the name returned by status() is in the same form as the path that
-// was requested (to match the behavior of RealFileSystem).
-TEST_F(InMemoryFileSystemTest, StatusName) {
-  NormalizedFS.addFile("/a/b/c", 0, MemoryBuffer::getMemBuffer("abc"),
-                       /*User=*/None,
-                       /*Group=*/None, sys::fs::file_type::regular_file);
-  NormalizedFS.setCurrentWorkingDirectory("/a/b");
-
-  // Access using InMemoryFileSystem::status.
-  auto Stat = NormalizedFS.status("../b/c");
-  ASSERT_FALSE(Stat.getError()) << Stat.getError() << "\n"
-                                << NormalizedFS.toString();
-  ASSERT_TRUE(Stat->isRegularFile());
-  ASSERT_EQ("../b/c", Stat->getName());
-
-  // Access using InMemoryFileAdaptor::status.
-  auto File = NormalizedFS.openFileForRead("../b/c");
-  ASSERT_FALSE(File.getError()) << File.getError() << "\n"
-                                << NormalizedFS.toString();
-  Stat = (*File)->status();
-  ASSERT_FALSE(Stat.getError()) << Stat.getError() << "\n"
-                                << NormalizedFS.toString();
-  ASSERT_TRUE(Stat->isRegularFile());
-  ASSERT_EQ("../b/c", Stat->getName());
-
-  // Access using a directory iterator.
-  std::error_code EC;
-  llvm::vfs::directory_iterator It = NormalizedFS.dir_begin("../b", EC);
-  // When on Windows, we end up with "../b\\c" as the name.  Convert to Posix
-  // path for the sake of the comparison.
-  ASSERT_EQ("../b/c", getPosixPath(std::string(It->path())));
-}
-
-TEST_F(InMemoryFileSystemTest, AddHardLinkToFile) {
-  StringRef FromLink = "/path/to/FROM/link";
-  StringRef Target = "/path/to/TO/file";
-  FS.addFile(Target, 0, MemoryBuffer::getMemBuffer("content of target"));
-  EXPECT_TRUE(FS.addHardLink(FromLink, Target));
-  EXPECT_THAT(FromLink, IsHardLinkTo(&FS, Target));
-  EXPECT_TRUE(FS.status(FromLink)->getSize() == FS.status(Target)->getSize());
-  EXPECT_TRUE(FS.getBufferForFile(FromLink)->get()->getBuffer() ==
-              FS.getBufferForFile(Target)->get()->getBuffer());
-}
-
-TEST_F(InMemoryFileSystemTest, AddHardLinkInChainPattern) {
-  StringRef Link0 = "/path/to/0/link";
-  StringRef Link1 = "/path/to/1/link";
-  StringRef Link2 = "/path/to/2/link";
-  StringRef Target = "/path/to/target";
-  FS.addFile(Target, 0, MemoryBuffer::getMemBuffer("content of target file"));
-  EXPECT_TRUE(FS.addHardLink(Link2, Target));
-  EXPECT_TRUE(FS.addHardLink(Link1, Link2));
-  EXPECT_TRUE(FS.addHardLink(Link0, Link1));
-  EXPECT_THAT(Link0, IsHardLinkTo(&FS, Target));
-  EXPECT_THAT(Link1, IsHardLinkTo(&FS, Target));
-  EXPECT_THAT(Link2, IsHardLinkTo(&FS, Target));
-}
-
-TEST_F(InMemoryFileSystemTest, AddHardLinkToAFileThatWasNotAddedBefore) {
-  EXPECT_FALSE(FS.addHardLink("/path/to/link", "/path/to/target"));
-}
-
-TEST_F(InMemoryFileSystemTest, AddHardLinkFromAFileThatWasAddedBefore) {
-  StringRef Link = "/path/to/link";
-  StringRef Target = "/path/to/target";
-  FS.addFile(Target, 0, MemoryBuffer::getMemBuffer("content of target"));
-  FS.addFile(Link, 0, MemoryBuffer::getMemBuffer("content of link"));
-  EXPECT_FALSE(FS.addHardLink(Link, Target));
-}
-
-TEST_F(InMemoryFileSystemTest, AddSameHardLinkMoreThanOnce) {
-  StringRef Link = "/path/to/link";
-  StringRef Target = "/path/to/target";
-  FS.addFile(Target, 0, MemoryBuffer::getMemBuffer("content of target"));
-  EXPECT_TRUE(FS.addHardLink(Link, Target));
-  EXPECT_FALSE(FS.addHardLink(Link, Target));
-}
-
-TEST_F(InMemoryFileSystemTest, AddFileInPlaceOfAHardLinkWithSameContent) {
-  StringRef Link = "/path/to/link";
-  StringRef Target = "/path/to/target";
-  StringRef Content = "content of target";
-  EXPECT_TRUE(FS.addFile(Target, 0, MemoryBuffer::getMemBuffer(Content)));
-  EXPECT_TRUE(FS.addHardLink(Link, Target));
-  EXPECT_TRUE(FS.addFile(Link, 0, MemoryBuffer::getMemBuffer(Content)));
-}
-
-TEST_F(InMemoryFileSystemTest, AddFileInPlaceOfAHardLinkWithDifferentContent) {
-  StringRef Link = "/path/to/link";
-  StringRef Target = "/path/to/target";
-  StringRef Content = "content of target";
-  StringRef LinkContent = "different content of link";
-  EXPECT_TRUE(FS.addFile(Target, 0, MemoryBuffer::getMemBuffer(Content)));
-  EXPECT_TRUE(FS.addHardLink(Link, Target));
-  EXPECT_FALSE(FS.addFile(Link, 0, MemoryBuffer::getMemBuffer(LinkContent)));
-}
-
-TEST_F(InMemoryFileSystemTest, AddHardLinkToADirectory) {
-  StringRef Dir = "path/to/dummy/dir";
-  StringRef Link = "/path/to/link";
-  StringRef File = "path/to/dummy/dir/target";
-  StringRef Content = "content of target";
-  EXPECT_TRUE(FS.addFile(File, 0, MemoryBuffer::getMemBuffer(Content)));
-  EXPECT_FALSE(FS.addHardLink(Link, Dir));
-}
-
-TEST_F(InMemoryFileSystemTest, AddHardLinkFromADirectory) {
-  StringRef Dir = "path/to/dummy/dir";
-  StringRef Target = "path/to/dummy/dir/target";
-  StringRef Content = "content of target";
-  EXPECT_TRUE(FS.addFile(Target, 0, MemoryBuffer::getMemBuffer(Content)));
-  EXPECT_FALSE(FS.addHardLink(Dir, Target));
-}
-
-TEST_F(InMemoryFileSystemTest, AddHardLinkUnderAFile) {
-  StringRef CommonContent = "content string";
-  FS.addFile("/a/b", 0, MemoryBuffer::getMemBuffer(CommonContent));
-  FS.addFile("/c/d", 0, MemoryBuffer::getMemBuffer(CommonContent));
-  EXPECT_FALSE(FS.addHardLink("/c/d/e", "/a/b"));
-}
-
-TEST_F(InMemoryFileSystemTest, RecursiveIterationWithHardLink) {
-  std::error_code EC;
-  FS.addFile("/a/b", 0, MemoryBuffer::getMemBuffer("content string"));
-  EXPECT_TRUE(FS.addHardLink("/c/d", "/a/b"));
-  auto I = vfs::recursive_directory_iterator(FS, "/", EC);
-  ASSERT_FALSE(EC);
-  std::vector<std::string> Nodes;
-  for (auto E = vfs::recursive_directory_iterator(); !EC && I != E;
-       I.increment(EC)) {
-    Nodes.push_back(getPosixPath(std::string(I->path())));
-  }
-  EXPECT_THAT(Nodes, testing::UnorderedElementsAre("/a", "/a/b", "/c", "/c/d"));
-}
-
-// NOTE: in the tests below, we use '//root/' as our root directory, since it is
-// a legal *absolute* path on Windows as well as *nix.
-class VFSFromYAMLTest : public ::testing::Test {
-public:
-  int NumDiagnostics;
-
-  void SetUp() override { NumDiagnostics = 0; }
-
-  static void CountingDiagHandler(const SMDiagnostic &, void *Context) {
-    VFSFromYAMLTest *Test = static_cast<VFSFromYAMLTest *>(Context);
-    ++Test->NumDiagnostics;
-  }
-
-  std::unique_ptr<vfs::FileSystem>
-  getFromYAMLRawString(StringRef Content,
-                       IntrusiveRefCntPtr<vfs::FileSystem> ExternalFS) {
-    std::unique_ptr<MemoryBuffer> Buffer = MemoryBuffer::getMemBuffer(Content);
-    return getVFSFromYAML(std::move(Buffer), CountingDiagHandler, "", this,
-                          ExternalFS);
-  }
-
-  std::unique_ptr<vfs::FileSystem> getFromYAMLString(
-      StringRef Content,
-      IntrusiveRefCntPtr<vfs::FileSystem> ExternalFS = new DummyFileSystem()) {
-    std::string VersionPlusContent("{\n  'version':0,\n");
-    VersionPlusContent += Content.slice(Content.find('{') + 1, StringRef::npos);
-    return getFromYAMLRawString(VersionPlusContent, ExternalFS);
-  }
-
-  // This is intended as a "XFAIL" for windows hosts.
-  bool supportsSameDirMultipleYAMLEntries() {
-    Triple Host(Triple::normalize(sys::getProcessTriple()));
-    return !Host.isOSWindows();
-  }
-};
-
-TEST_F(VFSFromYAMLTest, BasicVFSFromYAML) {
-  IntrusiveRefCntPtr<vfs::FileSystem> FS;
-  FS = getFromYAMLString("");
-  EXPECT_EQ(nullptr, FS.get());
-  FS = getFromYAMLString("[]");
-  EXPECT_EQ(nullptr, FS.get());
-  FS = getFromYAMLString("'string'");
-  EXPECT_EQ(nullptr, FS.get());
-  EXPECT_EQ(3, NumDiagnostics);
-}
-
-TEST_F(VFSFromYAMLTest, MappedFiles) {
-  IntrusiveRefCntPtr<DummyFileSystem> Lower(new DummyFileSystem());
-  Lower->addDirectory("//root/foo/bar");
-  Lower->addRegularFile("//root/foo/bar/a");
-  IntrusiveRefCntPtr<vfs::FileSystem> FS = getFromYAMLString(
-      "{ 'roots': [\n"
-      "{\n"
-      "  'type': 'directory',\n"
-      "  'name': '//root/',\n"
-      "  'contents': [ {\n"
-      "                  'type': 'file',\n"
-      "                  'name': 'file1',\n"
-      "                  'external-contents': '//root/foo/bar/a'\n"
-      "                },\n"
-      "                {\n"
-      "                  'type': 'file',\n"
-      "                  'name': 'file2',\n"
-      "                  'external-contents': '//root/foo/b'\n"
-      "                },\n"
-      "                {\n"
-      "                  'type': 'directory-remap',\n"
-      "                  'name': 'mappeddir',\n"
-      "                  'external-contents': '//root/foo/bar'\n"
-      "                },\n"
-      "                {\n"
-      "                  'type': 'directory-remap',\n"
-      "                  'name': 'mappeddir2',\n"
-      "                  'use-external-name': false,\n"
-      "                  'external-contents': '//root/foo/bar'\n"
-      "                }\n"
-      "              ]\n"
-      "}\n"
-      "]\n"
-      "}",
-      Lower);
-  ASSERT_TRUE(FS.get() != nullptr);
-
-  IntrusiveRefCntPtr<vfs::OverlayFileSystem> O(
-      new vfs::OverlayFileSystem(Lower));
-  O->pushOverlay(FS);
-
-  // file
-  ErrorOr<vfs::Status> S = O->status("//root/file1");
-  ASSERT_FALSE(S.getError());
-  EXPECT_EQ("//root/foo/bar/a", S->getName());
-  EXPECT_TRUE(S->IsVFSMapped);
-
-  ErrorOr<vfs::Status> SLower = O->status("//root/foo/bar/a");
-  EXPECT_EQ("//root/foo/bar/a", SLower->getName());
-  EXPECT_TRUE(S->equivalent(*SLower));
-  EXPECT_FALSE(SLower->IsVFSMapped);
-
-  // file after opening
-  auto OpenedF = O->openFileForRead("//root/file1");
-  ASSERT_FALSE(OpenedF.getError());
-  auto OpenedS = (*OpenedF)->status();
-  ASSERT_FALSE(OpenedS.getError());
-  EXPECT_EQ("//root/foo/bar/a", OpenedS->getName());
-  EXPECT_TRUE(OpenedS->IsVFSMapped);
-
-  // directory
-  S = O->status("//root/");
-  ASSERT_FALSE(S.getError());
-  EXPECT_TRUE(S->isDirectory());
-  EXPECT_TRUE(S->equivalent(*O->status("//root/"))); // non-volatile UniqueID
-
-  // remapped directory
-  S = O->status("//root/mappeddir");
-  ASSERT_FALSE(S.getError());
-  EXPECT_TRUE(S->isDirectory());
-  EXPECT_TRUE(S->IsVFSMapped);
-  EXPECT_TRUE(S->equivalent(*O->status("//root/foo/bar")));
-
-  SLower = O->status("//root/foo/bar");
-  EXPECT_EQ("//root/foo/bar", SLower->getName());
-  EXPECT_TRUE(S->equivalent(*SLower));
-  EXPECT_FALSE(SLower->IsVFSMapped);
-
-  // file in remapped directory
-  S = O->status("//root/mappeddir/a");
-  ASSERT_FALSE(S.getError());
-  ASSERT_FALSE(S->isDirectory());
-  ASSERT_TRUE(S->IsVFSMapped);
-  ASSERT_EQ("//root/foo/bar/a", S->getName());
-
-  // file in remapped directory, with use-external-name=false
-  S = O->status("//root/mappeddir2/a");
-  ASSERT_FALSE(S.getError());
-  ASSERT_FALSE(S->isDirectory());
-  ASSERT_TRUE(S->IsVFSMapped);
-  ASSERT_EQ("//root/mappeddir2/a", S->getName());
-
-  // file contents in remapped directory
-  OpenedF = O->openFileForRead("//root/mappeddir/a");
-  ASSERT_FALSE(OpenedF.getError());
-  OpenedS = (*OpenedF)->status();
-  ASSERT_FALSE(OpenedS.getError());
-  EXPECT_EQ("//root/foo/bar/a", OpenedS->getName());
-  EXPECT_TRUE(OpenedS->IsVFSMapped);
-
-  // file contents in remapped directory, with use-external-name=false
-  OpenedF = O->openFileForRead("//root/mappeddir2/a");
-  ASSERT_FALSE(OpenedF.getError());
-  OpenedS = (*OpenedF)->status();
-  ASSERT_FALSE(OpenedS.getError());
-  EXPECT_EQ("//root/mappeddir2/a", OpenedS->getName());
-  EXPECT_TRUE(OpenedS->IsVFSMapped);
-
-  // broken mapping
-  EXPECT_EQ(O->status("//root/file2").getError(),
-            llvm::errc::no_such_file_or_directory);
-  EXPECT_EQ(0, NumDiagnostics);
-}
-
-TEST_F(VFSFromYAMLTest, MappedRoot) {
-  IntrusiveRefCntPtr<DummyFileSystem> Lower(new DummyFileSystem());
-  Lower->addDirectory("//root/foo/bar");
-  Lower->addRegularFile("//root/foo/bar/a");
-  IntrusiveRefCntPtr<vfs::FileSystem> FS =
-      getFromYAMLString("{ 'roots': [\n"
-                        "{\n"
-                        "  'type': 'directory-remap',\n"
-                        "  'name': '//mappedroot/',\n"
-                        "  'external-contents': '//root/foo/bar'\n"
-                        "}\n"
-                        "]\n"
-                        "}",
-                        Lower);
-  ASSERT_TRUE(FS.get() != nullptr);
-
-  IntrusiveRefCntPtr<vfs::OverlayFileSystem> O(
-      new vfs::OverlayFileSystem(Lower));
-  O->pushOverlay(FS);
-
-  // file
-  ErrorOr<vfs::Status> S = O->status("//mappedroot/a");
-  ASSERT_FALSE(S.getError());
-  EXPECT_EQ("//root/foo/bar/a", S->getName());
-  EXPECT_TRUE(S->IsVFSMapped);
-
-  ErrorOr<vfs::Status> SLower = O->status("//root/foo/bar/a");
-  EXPECT_EQ("//root/foo/bar/a", SLower->getName());
-  EXPECT_TRUE(S->equivalent(*SLower));
-  EXPECT_FALSE(SLower->IsVFSMapped);
-
-  // file after opening
-  auto OpenedF = O->openFileForRead("//mappedroot/a");
-  ASSERT_FALSE(OpenedF.getError());
-  auto OpenedS = (*OpenedF)->status();
-  ASSERT_FALSE(OpenedS.getError());
-  EXPECT_EQ("//root/foo/bar/a", OpenedS->getName());
-  EXPECT_TRUE(OpenedS->IsVFSMapped);
-
-  EXPECT_EQ(0, NumDiagnostics);
-}
-
-TEST_F(VFSFromYAMLTest, RemappedDirectoryOverlay) {
-  IntrusiveRefCntPtr<DummyFileSystem> Lower(new DummyFileSystem());
-  Lower->addDirectory("//root/foo");
-  Lower->addRegularFile("//root/foo/a");
-  Lower->addDirectory("//root/bar");
-  Lower->addRegularFile("//root/bar/b");
-  Lower->addRegularFile("//root/bar/c");
-  IntrusiveRefCntPtr<vfs::FileSystem> FS =
-      getFromYAMLString("{ 'roots': [\n"
-                        "{\n"
-                        "  'type': 'directory',\n"
-                        "  'name': '//root/',\n"
-                        "  'contents': [ {\n"
-                        "                  'type': 'directory-remap',\n"
-                        "                  'name': 'bar',\n"
-                        "                  'external-contents': '//root/foo'\n"
-                        "                }\n"
-                        "              ]\n"
-                        "}]}",
-                        Lower);
-  ASSERT_TRUE(FS.get() != nullptr);
-
-  IntrusiveRefCntPtr<vfs::OverlayFileSystem> O(
-      new vfs::OverlayFileSystem(Lower));
-  O->pushOverlay(FS);
-
-  ErrorOr<vfs::Status> S = O->status("//root/foo");
-  ASSERT_FALSE(S.getError());
-
-  ErrorOr<vfs::Status> SS = O->status("//root/bar");
-  ASSERT_FALSE(SS.getError());
-  EXPECT_TRUE(S->equivalent(*SS));
-
-  std::error_code EC;
-  checkContents(O->dir_begin("//root/bar", EC),
-                {"//root/foo/a", "//root/bar/b", "//root/bar/c"});
-
-  Lower->addRegularFile("//root/foo/b");
-  checkContents(O->dir_begin("//root/bar", EC),
-                {"//root/foo/a", "//root/foo/b", "//root/bar/c"});
-
-  EXPECT_EQ(0, NumDiagnostics);
-}
-
-TEST_F(VFSFromYAMLTest, RemappedDirectoryOverlayNoExternalNames) {
-  IntrusiveRefCntPtr<DummyFileSystem> Lower(new DummyFileSystem());
-  Lower->addDirectory("//root/foo");
-  Lower->addRegularFile("//root/foo/a");
-  Lower->addDirectory("//root/bar");
-  Lower->addRegularFile("//root/bar/b");
-  Lower->addRegularFile("//root/bar/c");
-  IntrusiveRefCntPtr<vfs::FileSystem> FS =
-      getFromYAMLString("{ 'use-external-names': false,\n"
-                        "  'roots': [\n"
-                        "{\n"
-                        "  'type': 'directory',\n"
-                        "  'name': '//root/',\n"
-                        "  'contents': [ {\n"
-                        "                  'type': 'directory-remap',\n"
-                        "                  'name': 'bar',\n"
-                        "                  'external-contents': '//root/foo'\n"
-                        "                }\n"
-                        "              ]\n"
-                        "}]}",
-                        Lower);
-  ASSERT_TRUE(FS.get() != nullptr);
-
-  ErrorOr<vfs::Status> S = FS->status("//root/foo");
-  ASSERT_FALSE(S.getError());
-
-  ErrorOr<vfs::Status> SS = FS->status("//root/bar");
-  ASSERT_FALSE(SS.getError());
-  EXPECT_TRUE(S->equivalent(*SS));
-
-  std::error_code EC;
-  checkContents(FS->dir_begin("//root/bar", EC),
-                {"//root/bar/a", "//root/bar/b", "//root/bar/c"});
-
-  Lower->addRegularFile("//root/foo/b");
-  checkContents(FS->dir_begin("//root/bar", EC),
-                {"//root/bar/a", "//root/bar/b", "//root/bar/c"});
-
-  EXPECT_EQ(0, NumDiagnostics);
-}
-
-TEST_F(VFSFromYAMLTest, RemappedDirectoryOverlayNoFallthrough) {
-  IntrusiveRefCntPtr<DummyFileSystem> Lower(new DummyFileSystem());
-  Lower->addDirectory("//root/foo");
-  Lower->addRegularFile("//root/foo/a");
-  Lower->addDirectory("//root/bar");
-  Lower->addRegularFile("//root/bar/b");
-  Lower->addRegularFile("//root/bar/c");
-  IntrusiveRefCntPtr<vfs::FileSystem> FS =
-      getFromYAMLString("{ 'fallthrough': false,\n"
-                        "  'roots': [\n"
-                        "{\n"
-                        "  'type': 'directory',\n"
-                        "  'name': '//root/',\n"
-                        "  'contents': [ {\n"
-                        "                  'type': 'directory-remap',\n"
-                        "                  'name': 'bar',\n"
-                        "                  'external-contents': '//root/foo'\n"
-                        "                }\n"
-                        "              ]\n"
-                        "}]}",
-                        Lower);
-  ASSERT_TRUE(FS.get() != nullptr);
-
-  ErrorOr<vfs::Status> S = Lower->status("//root/foo");
-  ASSERT_FALSE(S.getError());
-
-  ErrorOr<vfs::Status> SS = FS->status("//root/bar");
-  ASSERT_FALSE(SS.getError());
-  EXPECT_TRUE(S->equivalent(*SS));
-
-  std::error_code EC;
-  checkContents(FS->dir_begin("//root/bar", EC), {"//root/foo/a"});
-
-  Lower->addRegularFile("//root/foo/b");
-  checkContents(FS->dir_begin("//root/bar", EC),
-                {"//root/foo/a", "//root/foo/b"});
-
-  EXPECT_EQ(0, NumDiagnostics);
-}
-
-TEST_F(VFSFromYAMLTest, CaseInsensitive) {
-  IntrusiveRefCntPtr<DummyFileSystem> Lower(new DummyFileSystem());
-  Lower->addRegularFile("//root/foo/bar/a");
-  IntrusiveRefCntPtr<vfs::FileSystem> FS = getFromYAMLString(
-      "{ 'case-sensitive': 'false',\n"
-      "  'roots': [\n"
-      "{\n"
-      "  'type': 'directory',\n"
-      "  'name': '//root/',\n"
-      "  'contents': [ {\n"
-      "                  'type': 'file',\n"
-      "                  'name': 'XX',\n"
-      "                  'external-contents': '//root/foo/bar/a'\n"
-      "                }\n"
-      "              ]\n"
-      "}]}",
-      Lower);
-  ASSERT_TRUE(FS.get() != nullptr);
-
-  IntrusiveRefCntPtr<vfs::OverlayFileSystem> O(
-      new vfs::OverlayFileSystem(Lower));
-  O->pushOverlay(FS);
-
-  ErrorOr<vfs::Status> S = O->status("//root/XX");
-  ASSERT_FALSE(S.getError());
-
-  ErrorOr<vfs::Status> SS = O->status("//root/xx");
-  ASSERT_FALSE(SS.getError());
-  EXPECT_TRUE(S->equivalent(*SS));
-  SS = O->status("//root/xX");
-  EXPECT_TRUE(S->equivalent(*SS));
-  SS = O->status("//root/Xx");
-  EXPECT_TRUE(S->equivalent(*SS));
-  EXPECT_EQ(0, NumDiagnostics);
-}
-
-TEST_F(VFSFromYAMLTest, CaseSensitive) {
-  IntrusiveRefCntPtr<DummyFileSystem> Lower(new DummyFileSystem());
-  Lower->addRegularFile("//root/foo/bar/a");
-  IntrusiveRefCntPtr<vfs::FileSystem> FS = getFromYAMLString(
-      "{ 'case-sensitive': 'true',\n"
-      "  'roots': [\n"
-      "{\n"
-      "  'type': 'directory',\n"
-      "  'name': '//root/',\n"
-      "  'contents': [ {\n"
-      "                  'type': 'file',\n"
-      "                  'name': 'XX',\n"
-      "                  'external-contents': '//root/foo/bar/a'\n"
-      "                }\n"
-      "              ]\n"
-      "}]}",
-      Lower);
-  ASSERT_TRUE(FS.get() != nullptr);
-
-  IntrusiveRefCntPtr<vfs::OverlayFileSystem> O(
-      new vfs::OverlayFileSystem(Lower));
-  O->pushOverlay(FS);
-
-  ErrorOr<vfs::Status> SS = O->status("//root/xx");
-  EXPECT_EQ(SS.getError(), llvm::errc::no_such_file_or_directory);
-  SS = O->status("//root/xX");
-  EXPECT_EQ(SS.getError(), llvm::errc::no_such_file_or_directory);
-  SS = O->status("//root/Xx");
-  EXPECT_EQ(SS.getError(), llvm::errc::no_such_file_or_directory);
-  EXPECT_EQ(0, NumDiagnostics);
-}
-
-TEST_F(VFSFromYAMLTest, IllegalVFSFile) {
-  IntrusiveRefCntPtr<DummyFileSystem> Lower(new DummyFileSystem());
-
-  // invalid YAML at top-level
-  IntrusiveRefCntPtr<vfs::FileSystem> FS = getFromYAMLString("{]", Lower);
-  EXPECT_EQ(nullptr, FS.get());
-  // invalid YAML in roots
-  FS = getFromYAMLString("{ 'roots':[}", Lower);
-  // invalid YAML in directory
-  FS = getFromYAMLString(
-      "{ 'roots':[ { 'name': 'foo', 'type': 'directory', 'contents': [}",
-      Lower);
-  EXPECT_EQ(nullptr, FS.get());
-
-  // invalid configuration
-  FS = getFromYAMLString("{ 'knobular': 'true', 'roots':[] }", Lower);
-  EXPECT_EQ(nullptr, FS.get());
-  FS = getFromYAMLString("{ 'case-sensitive': 'maybe', 'roots':[] }", Lower);
-  EXPECT_EQ(nullptr, FS.get());
-
-  // invalid roots
-  FS = getFromYAMLString("{ 'roots':'' }", Lower);
-  EXPECT_EQ(nullptr, FS.get());
-  FS = getFromYAMLString("{ 'roots':{} }", Lower);
-  EXPECT_EQ(nullptr, FS.get());
-
-  // invalid entries
-  FS = getFromYAMLString(
-      "{ 'roots':[ { 'type': 'other', 'name': 'me', 'contents': '' }", Lower);
-  EXPECT_EQ(nullptr, FS.get());
-  FS = getFromYAMLString("{ 'roots':[ { 'type': 'file', 'name': [], "
-                         "'external-contents': 'other' }",
-                         Lower);
-  EXPECT_EQ(nullptr, FS.get());
-  FS = getFromYAMLString(
-      "{ 'roots':[ { 'type': 'file', 'name': 'me', 'external-contents': [] }",
-      Lower);
-  EXPECT_EQ(nullptr, FS.get());
-  FS = getFromYAMLString(
-      "{ 'roots':[ { 'type': 'file', 'name': 'me', 'external-contents': {} }",
-      Lower);
-  EXPECT_EQ(nullptr, FS.get());
-  FS = getFromYAMLString(
-      "{ 'roots':[ { 'type': 'directory', 'name': 'me', 'contents': {} }",
-      Lower);
-  EXPECT_EQ(nullptr, FS.get());
-  FS = getFromYAMLString(
-      "{ 'roots':[ { 'type': 'directory', 'name': 'me', 'contents': '' }",
-      Lower);
-  EXPECT_EQ(nullptr, FS.get());
-  FS = getFromYAMLString(
-      "{ 'roots':[ { 'thingy': 'directory', 'name': 'me', 'contents': [] }",
-      Lower);
-  EXPECT_EQ(nullptr, FS.get());
-
-  // missing mandatory fields
-  FS = getFromYAMLString("{ 'roots':[ { 'type': 'file', 'name': 'me' }", Lower);
-  EXPECT_EQ(nullptr, FS.get());
-  FS = getFromYAMLString(
-      "{ 'roots':[ { 'type': 'file', 'external-contents': 'other' }", Lower);
-  EXPECT_EQ(nullptr, FS.get());
-  FS = getFromYAMLString("{ 'roots':[ { 'name': 'me', 'contents': [] }", Lower);
-  EXPECT_EQ(nullptr, FS.get());
-
-  // duplicate keys
-  FS = getFromYAMLString("{ 'roots':[], 'roots':[] }", Lower);
-  EXPECT_EQ(nullptr, FS.get());
-  FS = getFromYAMLString(
-      "{ 'case-sensitive':'true', 'case-sensitive':'true', 'roots':[] }",
-      Lower);
-  EXPECT_EQ(nullptr, FS.get());
-  FS =
-      getFromYAMLString("{ 'roots':[{'name':'me', 'name':'you', 'type':'file', "
-                        "'external-contents':'blah' } ] }",
-                        Lower);
-  EXPECT_EQ(nullptr, FS.get());
-
-  // missing version
-  FS = getFromYAMLRawString("{ 'roots':[] }", Lower);
-  EXPECT_EQ(nullptr, FS.get());
-
-  // bad version number
-  FS = getFromYAMLRawString("{ 'version':'foo', 'roots':[] }", Lower);
-  EXPECT_EQ(nullptr, FS.get());
-  FS = getFromYAMLRawString("{ 'version':-1, 'roots':[] }", Lower);
-  EXPECT_EQ(nullptr, FS.get());
-  FS = getFromYAMLRawString("{ 'version':100000, 'roots':[] }", Lower);
-  EXPECT_EQ(nullptr, FS.get());
-
-  // both 'external-contents' and 'contents' specified
-  Lower->addDirectory("//root/external/dir");
-  FS = getFromYAMLString(
-      "{ 'roots':[ \n"
-      "{ 'type': 'directory', 'name': '//root/A', 'contents': [],\n"
-      "  'external-contents': '//root/external/dir'}]}",
-      Lower);
-  EXPECT_EQ(nullptr, FS.get());
-
-  // 'directory-remap' with 'contents'
-  FS = getFromYAMLString(
-      "{ 'roots':[ \n"
-      "{ 'type': 'directory-remap', 'name': '//root/A', 'contents': [] }]}",
-      Lower);
-  EXPECT_EQ(nullptr, FS.get());
-
-  EXPECT_EQ(26, NumDiagnostics);
-}
-
-TEST_F(VFSFromYAMLTest, UseExternalName) {
-  IntrusiveRefCntPtr<DummyFileSystem> Lower(new DummyFileSystem());
-  Lower->addRegularFile("//root/external/file");
-
-  IntrusiveRefCntPtr<vfs::FileSystem> FS =
-      getFromYAMLString("{ 'roots': [\n"
-                        "  { 'type': 'file', 'name': '//root/A',\n"
-                        "    'external-contents': '//root/external/file'\n"
-                        "  },\n"
-                        "  { 'type': 'file', 'name': '//root/B',\n"
-                        "    'use-external-name': true,\n"
-                        "    'external-contents': '//root/external/file'\n"
-                        "  },\n"
-                        "  { 'type': 'file', 'name': '//root/C',\n"
-                        "    'use-external-name': false,\n"
-                        "    'external-contents': '//root/external/file'\n"
-                        "  }\n"
-                        "] }",
-                        Lower);
-  ASSERT_TRUE(nullptr != FS.get());
-
-  // default true
-  EXPECT_EQ("//root/external/file", FS->status("//root/A")->getName());
-  // explicit
-  EXPECT_EQ("//root/external/file", FS->status("//root/B")->getName());
-  EXPECT_EQ("//root/C", FS->status("//root/C")->getName());
-
-  // global configuration
-  FS = getFromYAMLString("{ 'use-external-names': false,\n"
-                         "  'roots': [\n"
-                         "  { 'type': 'file', 'name': '//root/A',\n"
-                         "    'external-contents': '//root/external/file'\n"
-                         "  },\n"
-                         "  { 'type': 'file', 'name': '//root/B',\n"
-                         "    'use-external-name': true,\n"
-                         "    'external-contents': '//root/external/file'\n"
-                         "  },\n"
-                         "  { 'type': 'file', 'name': '//root/C',\n"
-                         "    'use-external-name': false,\n"
-                         "    'external-contents': '//root/external/file'\n"
-                         "  }\n"
-                         "] }",
-                         Lower);
-  ASSERT_TRUE(nullptr != FS.get());
-
-  // default
-  EXPECT_EQ("//root/A", FS->status("//root/A")->getName());
-  // explicit
-  EXPECT_EQ("//root/external/file", FS->status("//root/B")->getName());
-  EXPECT_EQ("//root/C", FS->status("//root/C")->getName());
-}
-
-TEST_F(VFSFromYAMLTest, MultiComponentPath) {
-  IntrusiveRefCntPtr<DummyFileSystem> Lower(new DummyFileSystem());
-  Lower->addRegularFile("//root/other");
-
-  // file in roots
-  IntrusiveRefCntPtr<vfs::FileSystem> FS =
-      getFromYAMLString("{ 'roots': [\n"
-                        "  { 'type': 'file', 'name': '//root/path/to/file',\n"
-                        "    'external-contents': '//root/other' }]\n"
-                        "}",
-                        Lower);
-  ASSERT_TRUE(nullptr != FS.get());
-  EXPECT_FALSE(FS->status("//root/path/to/file").getError());
-  EXPECT_FALSE(FS->status("//root/path/to").getError());
-  EXPECT_FALSE(FS->status("//root/path").getError());
-  EXPECT_FALSE(FS->status("//root/").getError());
-
-  // at the start
-  FS = getFromYAMLString(
-      "{ 'roots': [\n"
-      "  { 'type': 'directory', 'name': '//root/path/to',\n"
-      "    'contents': [ { 'type': 'file', 'name': 'file',\n"
-      "                    'external-contents': '//root/other' }]}]\n"
-      "}",
-      Lower);
-  ASSERT_TRUE(nullptr != FS.get());
-  EXPECT_FALSE(FS->status("//root/path/to/file").getError());
-  EXPECT_FALSE(FS->status("//root/path/to").getError());
-  EXPECT_FALSE(FS->status("//root/path").getError());
-  EXPECT_FALSE(FS->status("//root/").getError());
-
-  // at the end
-  FS = getFromYAMLString(
-      "{ 'roots': [\n"
-      "  { 'type': 'directory', 'name': '//root/',\n"
-      "    'contents': [ { 'type': 'file', 'name': 'path/to/file',\n"
-      "                    'external-contents': '//root/other' }]}]\n"
-      "}",
-      Lower);
-  ASSERT_TRUE(nullptr != FS.get());
-  EXPECT_FALSE(FS->status("//root/path/to/file").getError());
-  EXPECT_FALSE(FS->status("//root/path/to").getError());
-  EXPECT_FALSE(FS->status("//root/path").getError());
-  EXPECT_FALSE(FS->status("//root/").getError());
-}
-
-TEST_F(VFSFromYAMLTest, TrailingSlashes) {
-  IntrusiveRefCntPtr<DummyFileSystem> Lower(new DummyFileSystem());
-  Lower->addRegularFile("//root/other");
-
-  // file in roots
-  IntrusiveRefCntPtr<vfs::FileSystem> FS = getFromYAMLString(
-      "{ 'roots': [\n"
-      "  { 'type': 'directory', 'name': '//root/path/to////',\n"
-      "    'contents': [ { 'type': 'file', 'name': 'file',\n"
-      "                    'external-contents': '//root/other' }]}]\n"
-      "}",
-      Lower);
-  ASSERT_TRUE(nullptr != FS.get());
-  EXPECT_FALSE(FS->status("//root/path/to/file").getError());
-  EXPECT_FALSE(FS->status("//root/path/to").getError());
-  EXPECT_FALSE(FS->status("//root/path").getError());
-  EXPECT_FALSE(FS->status("//root/").getError());
-}
-
-TEST_F(VFSFromYAMLTest, DirectoryIteration) {
-  IntrusiveRefCntPtr<DummyFileSystem> Lower(new DummyFileSystem());
-  Lower->addDirectory("//root/");
-  Lower->addDirectory("//root/foo");
-  Lower->addDirectory("//root/foo/bar");
-  Lower->addRegularFile("//root/foo/bar/a");
-  Lower->addRegularFile("//root/foo/bar/b");
-  Lower->addRegularFile("//root/file3");
-  IntrusiveRefCntPtr<vfs::FileSystem> FS = getFromYAMLString(
-      "{ 'use-external-names': false,\n"
-      "  'roots': [\n"
-      "{\n"
-      "  'type': 'directory',\n"
-      "  'name': '//root/',\n"
-      "  'contents': [ {\n"
-      "                  'type': 'file',\n"
-      "                  'name': 'file1',\n"
-      "                  'external-contents': '//root/foo/bar/a'\n"
-      "                },\n"
-      "                {\n"
-      "                  'type': 'file',\n"
-      "                  'name': 'file2',\n"
-      "                  'external-contents': '//root/foo/bar/b'\n"
-      "                }\n"
-      "              ]\n"
-      "}\n"
-      "]\n"
-      "}",
-      Lower);
-  ASSERT_TRUE(FS.get() != nullptr);
-
-  IntrusiveRefCntPtr<vfs::OverlayFileSystem> O(
-      new vfs::OverlayFileSystem(Lower));
-  O->pushOverlay(FS);
-
-  std::error_code EC;
-  checkContents(O->dir_begin("//root/", EC),
-                {"//root/file1", "//root/file2", "//root/file3", "//root/foo"});
-
-  checkContents(O->dir_begin("//root/foo/bar", EC),
-                {"//root/foo/bar/a", "//root/foo/bar/b"});
-}
-
-TEST_F(VFSFromYAMLTest, DirectoryIterationSameDirMultipleEntries) {
-  // https://llvm.org/bugs/show_bug.cgi?id=27725
-  if (!supportsSameDirMultipleYAMLEntries())
-    return;
-
-  IntrusiveRefCntPtr<DummyFileSystem> Lower(new DummyFileSystem());
-  Lower->addDirectory("//root/zab");
-  Lower->addDirectory("//root/baz");
-  Lower->addRegularFile("//root/zab/a");
-  Lower->addRegularFile("//root/zab/b");
-  IntrusiveRefCntPtr<vfs::FileSystem> FS = getFromYAMLString(
-      "{ 'use-external-names': false,\n"
-      "  'roots': [\n"
-      "{\n"
-      "  'type': 'directory',\n"
-      "  'name': '//root/baz/',\n"
-      "  'contents': [ {\n"
-      "                  'type': 'file',\n"
-      "                  'name': 'x',\n"
-      "                  'external-contents': '//root/zab/a'\n"
-      "                }\n"
-      "              ]\n"
-      "},\n"
-      "{\n"
-      "  'type': 'directory',\n"
-      "  'name': '//root/baz/',\n"
-      "  'contents': [ {\n"
-      "                  'type': 'file',\n"
-      "                  'name': 'y',\n"
-      "                  'external-contents': '//root/zab/b'\n"
-      "                }\n"
-      "              ]\n"
-      "}\n"
-      "]\n"
-      "}",
-      Lower);
-  ASSERT_TRUE(FS.get() != nullptr);
-
-  IntrusiveRefCntPtr<vfs::OverlayFileSystem> O(
-      new vfs::OverlayFileSystem(Lower));
-  O->pushOverlay(FS);
-
-  std::error_code EC;
-
-  checkContents(O->dir_begin("//root/baz/", EC),
-                {"//root/baz/x", "//root/baz/y"});
-}
-
-TEST_F(VFSFromYAMLTest, RecursiveDirectoryIterationLevel) {
-
-  IntrusiveRefCntPtr<DummyFileSystem> Lower(new DummyFileSystem());
-  Lower->addDirectory("//root/a");
-  Lower->addDirectory("//root/a/b");
-  Lower->addDirectory("//root/a/b/c");
-  Lower->addRegularFile("//root/a/b/c/file");
-  IntrusiveRefCntPtr<vfs::FileSystem> FS = getFromYAMLString(
-      "{ 'use-external-names': false,\n"
-      "  'roots': [\n"
-      "{\n"
-      "  'type': 'directory',\n"
-      "  'name': '//root/a/b/c/',\n"
-      "  'contents': [ {\n"
-      "                  'type': 'file',\n"
-      "                  'name': 'file',\n"
-      "                  'external-contents': '//root/a/b/c/file'\n"
-      "                }\n"
-      "              ]\n"
-      "},\n"
-      "]\n"
-      "}",
-      Lower);
-  ASSERT_TRUE(FS.get() != nullptr);
-
-  IntrusiveRefCntPtr<vfs::OverlayFileSystem> O(
-      new vfs::OverlayFileSystem(Lower));
-  O->pushOverlay(FS);
-
-  std::error_code EC;
-
-  // Test recursive_directory_iterator level()
-  vfs::recursive_directory_iterator I = vfs::recursive_directory_iterator(
-                                        *O, "//root", EC),
-                                    E;
-  ASSERT_FALSE(EC);
-  for (int l = 0; I != E; I.increment(EC), ++l) {
-    ASSERT_FALSE(EC);
-    EXPECT_EQ(I.level(), l);
-  }
-  EXPECT_EQ(I, E);
-}
-
-TEST_F(VFSFromYAMLTest, RelativePaths) {
-  IntrusiveRefCntPtr<DummyFileSystem> Lower(new DummyFileSystem());
-  // Filename at root level without a parent directory.
-  IntrusiveRefCntPtr<vfs::FileSystem> FS = getFromYAMLString(
-      "{ 'roots': [\n"
-      "  { 'type': 'file', 'name': 'file-not-in-directory.h',\n"
-      "    'external-contents': '//root/external/file'\n"
-      "  }\n"
-      "] }",
-      Lower);
-  EXPECT_EQ(nullptr, FS.get());
-
-  // Relative file path.
-  FS = getFromYAMLString("{ 'roots': [\n"
-                         "  { 'type': 'file', 'name': 'relative/file/path.h',\n"
-                         "    'external-contents': '//root/external/file'\n"
-                         "  }\n"
-                         "] }",
-                         Lower);
-  EXPECT_EQ(nullptr, FS.get());
-
-  // Relative directory path.
-  FS = getFromYAMLString(
-      "{ 'roots': [\n"
-      "  { 'type': 'directory', 'name': 'relative/directory/path.h',\n"
-      "    'contents': []\n"
-      "  }\n"
-      "] }",
-      Lower);
-  EXPECT_EQ(nullptr, FS.get());
-
-  EXPECT_EQ(3, NumDiagnostics);
-}
-
-TEST_F(VFSFromYAMLTest, NonFallthroughDirectoryIteration) {
-  IntrusiveRefCntPtr<DummyFileSystem> Lower(new DummyFileSystem());
-  Lower->addDirectory("//root/");
-  Lower->addRegularFile("//root/a");
-  Lower->addRegularFile("//root/b");
-  IntrusiveRefCntPtr<vfs::FileSystem> FS = getFromYAMLString(
-      "{ 'use-external-names': false,\n"
-      "  'fallthrough': false,\n"
-      "  'roots': [\n"
-      "{\n"
-      "  'type': 'directory',\n"
-      "  'name': '//root/',\n"
-      "  'contents': [ {\n"
-      "                  'type': 'file',\n"
-      "                  'name': 'c',\n"
-      "                  'external-contents': '//root/a'\n"
-      "                }\n"
-      "              ]\n"
-      "}\n"
-      "]\n"
-      "}",
-      Lower);
-  ASSERT_TRUE(FS.get() != nullptr);
-
-  std::error_code EC;
-  checkContents(FS->dir_begin("//root/", EC),
-                {"//root/c"});
-}
-
-TEST_F(VFSFromYAMLTest, DirectoryIterationWithDuplicates) {
-  IntrusiveRefCntPtr<DummyFileSystem> Lower(new DummyFileSystem());
-  Lower->addDirectory("//root/");
-  Lower->addRegularFile("//root/a");
-  Lower->addRegularFile("//root/b");
-  IntrusiveRefCntPtr<vfs::FileSystem> FS = getFromYAMLString(
-      "{ 'use-external-names': false,\n"
-      "  'roots': [\n"
-      "{\n"
-      "  'type': 'directory',\n"
-      "  'name': '//root/',\n"
-      "  'contents': [ {\n"
-      "                  'type': 'file',\n"
-      "                  'name': 'a',\n"
-      "                  'external-contents': '//root/a'\n"
-      "                }\n"
-      "              ]\n"
-      "}\n"
-      "]\n"
-      "}",
-	  Lower);
-  ASSERT_TRUE(FS.get() != nullptr);
-
-  std::error_code EC;
-  checkContents(FS->dir_begin("//root/", EC),
-                {"//root/a", "//root/b"});
-}
-
-TEST_F(VFSFromYAMLTest, DirectoryIterationErrorInVFSLayer) {
-  IntrusiveRefCntPtr<DummyFileSystem> Lower(new DummyFileSystem());
-  Lower->addDirectory("//root/");
-  Lower->addDirectory("//root/foo");
-  Lower->addRegularFile("//root/foo/a");
-  Lower->addRegularFile("//root/foo/b");
-  IntrusiveRefCntPtr<vfs::FileSystem> FS = getFromYAMLString(
-      "{ 'use-external-names': false,\n"
-      "  'roots': [\n"
-      "{\n"
-      "  'type': 'directory',\n"
-      "  'name': '//root/',\n"
-      "  'contents': [ {\n"
-      "                  'type': 'file',\n"
-      "                  'name': 'bar/a',\n"
-      "                  'external-contents': '//root/foo/a'\n"
-      "                }\n"
-      "              ]\n"
-      "}\n"
-      "]\n"
-      "}",
-      Lower);
-  ASSERT_TRUE(FS.get() != nullptr);
-
-  std::error_code EC;
-  checkContents(FS->dir_begin("//root/foo", EC),
-                {"//root/foo/a", "//root/foo/b"});
-}
-
-TEST_F(VFSFromYAMLTest, GetRealPath) {
-  IntrusiveRefCntPtr<DummyFileSystem> Lower(new DummyFileSystem());
-  Lower->addDirectory("//dir/");
-  Lower->addRegularFile("/foo");
-  Lower->addSymlink("/link");
-  IntrusiveRefCntPtr<vfs::FileSystem> FS = getFromYAMLString(
-      "{ 'use-external-names': false,\n"
-      "  'roots': [\n"
-      "{\n"
-      "  'type': 'directory',\n"
-      "  'name': '//root/',\n"
-      "  'contents': [ {\n"
-      "                  'type': 'file',\n"
-      "                  'name': 'bar',\n"
-      "                  'external-contents': '/link'\n"
-      "                }\n"
-      "              ]\n"
-      "},\n"
-      "{\n"
-      "  'type': 'directory',\n"
-      "  'name': '//dir/',\n"
-      "  'contents': []\n"
-      "}\n"
-      "]\n"
-      "}",
-      Lower);
-  ASSERT_TRUE(FS.get() != nullptr);
-
-  // Regular file present in underlying file system.
-  SmallString<16> RealPath;
-  EXPECT_FALSE(FS->getRealPath("/foo", RealPath));
-  EXPECT_EQ(RealPath.str(), "/foo");
-
-  // File present in YAML pointing to symlink in underlying file system.
-  EXPECT_FALSE(FS->getRealPath("//root/bar", RealPath));
-  EXPECT_EQ(RealPath.str(), "/symlink");
-
-  // Directories should fall back to the underlying file system is possible.
-  EXPECT_FALSE(FS->getRealPath("//dir/", RealPath));
-  EXPECT_EQ(RealPath.str(), "//dir/");
-
-  // Try a non-existing file.
-  EXPECT_EQ(FS->getRealPath("/non_existing", RealPath),
-            errc::no_such_file_or_directory);
-}
-
-TEST_F(VFSFromYAMLTest, WorkingDirectory) {
-  IntrusiveRefCntPtr<DummyFileSystem> Lower(new DummyFileSystem());
-  Lower->addDirectory("//root/");
-  Lower->addDirectory("//root/foo");
-  Lower->addRegularFile("//root/foo/a");
-  Lower->addRegularFile("//root/foo/b");
-  IntrusiveRefCntPtr<vfs::FileSystem> FS = getFromYAMLString(
-      "{ 'use-external-names': false,\n"
-      "  'roots': [\n"
-      "{\n"
-      "  'type': 'directory',\n"
-      "  'name': '//root/bar',\n"
-      "  'contents': [ {\n"
-      "                  'type': 'file',\n"
-      "                  'name': 'a',\n"
-      "                  'external-contents': '//root/foo/a'\n"
-      "                }\n"
-      "              ]\n"
-      "}\n"
-      "]\n"
-      "}",
-      Lower);
-  ASSERT_TRUE(FS.get() != nullptr);
-  std::error_code EC = FS->setCurrentWorkingDirectory("//root/bar");
-  ASSERT_FALSE(EC);
-
-  llvm::ErrorOr<std::string> WorkingDir = FS->getCurrentWorkingDirectory();
-  ASSERT_TRUE(WorkingDir);
-  EXPECT_EQ(*WorkingDir, "//root/bar");
-
-  llvm::ErrorOr<vfs::Status> Status = FS->status("./a");
-  ASSERT_FALSE(Status.getError());
-  EXPECT_TRUE(Status->isStatusKnown());
-  EXPECT_FALSE(Status->isDirectory());
-  EXPECT_TRUE(Status->isRegularFile());
-  EXPECT_FALSE(Status->isSymlink());
-  EXPECT_FALSE(Status->isOther());
-  EXPECT_TRUE(Status->exists());
-
-  EC = FS->setCurrentWorkingDirectory("bogus");
-  ASSERT_TRUE(EC);
-  WorkingDir = FS->getCurrentWorkingDirectory();
-  ASSERT_TRUE(WorkingDir);
-  EXPECT_EQ(*WorkingDir, "//root/bar");
-
-  EC = FS->setCurrentWorkingDirectory("//root/");
-  ASSERT_FALSE(EC);
-  WorkingDir = FS->getCurrentWorkingDirectory();
-  ASSERT_TRUE(WorkingDir);
-  EXPECT_EQ(*WorkingDir, "//root/");
-
-  EC = FS->setCurrentWorkingDirectory("bar");
-  ASSERT_FALSE(EC);
-  WorkingDir = FS->getCurrentWorkingDirectory();
-  ASSERT_TRUE(WorkingDir);
-  EXPECT_EQ(*WorkingDir, "//root/bar");
-}
-
-TEST_F(VFSFromYAMLTest, WorkingDirectoryFallthrough) {
-  IntrusiveRefCntPtr<DummyFileSystem> Lower(new DummyFileSystem());
-  Lower->addDirectory("//root/");
-  Lower->addDirectory("//root/foo");
-  Lower->addRegularFile("//root/foo/a");
-  Lower->addRegularFile("//root/foo/b");
-  Lower->addRegularFile("//root/c");
-  IntrusiveRefCntPtr<vfs::FileSystem> FS = getFromYAMLString(
-      "{ 'use-external-names': false,\n"
-      "  'roots': [\n"
-      "{\n"
-      "  'type': 'directory',\n"
-      "  'name': '//root/bar',\n"
-      "  'contents': [ {\n"
-      "                  'type': 'file',\n"
-      "                  'name': 'a',\n"
-      "                  'external-contents': '//root/foo/a'\n"
-      "                }\n"
-      "              ]\n"
-      "},\n"
-      "{\n"
-      "  'type': 'directory',\n"
-      "  'name': '//root/bar/baz',\n"
-      "  'contents': [ {\n"
-      "                  'type': 'file',\n"
-      "                  'name': 'a',\n"
-      "                  'external-contents': '//root/foo/a'\n"
-      "                }\n"
-      "              ]\n"
-      "}\n"
-      "]\n"
-      "}",
-      Lower);
-  ASSERT_TRUE(FS.get() != nullptr);
-  std::error_code EC = FS->setCurrentWorkingDirectory("//root/");
-  ASSERT_FALSE(EC);
-  ASSERT_TRUE(FS.get() != nullptr);
-
-  llvm::ErrorOr<vfs::Status> Status = FS->status("bar/a");
-  ASSERT_FALSE(Status.getError());
-  EXPECT_TRUE(Status->exists());
-
-  Status = FS->status("foo/a");
-  ASSERT_FALSE(Status.getError());
-  EXPECT_TRUE(Status->exists());
-
-  EC = FS->setCurrentWorkingDirectory("//root/bar");
-  ASSERT_FALSE(EC);
-
-  Status = FS->status("./a");
-  ASSERT_FALSE(Status.getError());
-  EXPECT_TRUE(Status->exists());
-
-  Status = FS->status("./b");
-  ASSERT_TRUE(Status.getError());
-
-  Status = FS->status("./c");
-  ASSERT_TRUE(Status.getError());
-
-  EC = FS->setCurrentWorkingDirectory("//root/");
-  ASSERT_FALSE(EC);
-
-  Status = FS->status("c");
-  ASSERT_FALSE(Status.getError());
-  EXPECT_TRUE(Status->exists());
-
-  Status = FS->status("./bar/baz/a");
-  ASSERT_FALSE(Status.getError());
-  EXPECT_TRUE(Status->exists());
-
-  EC = FS->setCurrentWorkingDirectory("//root/bar");
-  ASSERT_FALSE(EC);
-
-  Status = FS->status("./baz/a");
-  ASSERT_FALSE(Status.getError());
-  EXPECT_TRUE(Status->exists());
-
-  Status = FS->status("../bar/baz/a");
-  ASSERT_FALSE(Status.getError());
-  EXPECT_TRUE(Status->exists());
-}
-
-TEST_F(VFSFromYAMLTest, WorkingDirectoryFallthroughInvalid) {
-  IntrusiveRefCntPtr<ErrorDummyFileSystem> Lower(new ErrorDummyFileSystem());
-  Lower->addDirectory("//root/");
-  Lower->addDirectory("//root/foo");
-  Lower->addRegularFile("//root/foo/a");
-  Lower->addRegularFile("//root/foo/b");
-  Lower->addRegularFile("//root/c");
-  IntrusiveRefCntPtr<vfs::FileSystem> FS = getFromYAMLString(
-      "{ 'use-external-names': false,\n"
-      "  'roots': [\n"
-      "{\n"
-      "  'type': 'directory',\n"
-      "  'name': '//root/bar',\n"
-      "  'contents': [ {\n"
-      "                  'type': 'file',\n"
-      "                  'name': 'a',\n"
-      "                  'external-contents': '//root/foo/a'\n"
-      "                }\n"
-      "              ]\n"
-      "}\n"
-      "]\n"
-      "}",
-      Lower);
-  ASSERT_TRUE(FS.get() != nullptr);
-  std::error_code EC = FS->setCurrentWorkingDirectory("//root/");
-  ASSERT_FALSE(EC);
-  ASSERT_TRUE(FS.get() != nullptr);
-
-  llvm::ErrorOr<vfs::Status> Status = FS->status("bar/a");
-  ASSERT_FALSE(Status.getError());
-  EXPECT_TRUE(Status->exists());
-
-  Status = FS->status("foo/a");
-  ASSERT_FALSE(Status.getError());
-  EXPECT_TRUE(Status->exists());
-}
-
-TEST_F(VFSFromYAMLTest, VirtualWorkingDirectory) {
-  IntrusiveRefCntPtr<ErrorDummyFileSystem> Lower(new ErrorDummyFileSystem());
-  Lower->addDirectory("//root/");
-  Lower->addDirectory("//root/foo");
-  Lower->addRegularFile("//root/foo/a");
-  Lower->addRegularFile("//root/foo/b");
-  Lower->addRegularFile("//root/c");
-  IntrusiveRefCntPtr<vfs::FileSystem> FS = getFromYAMLString(
-      "{ 'use-external-names': false,\n"
-      "  'roots': [\n"
-      "{\n"
-      "  'type': 'directory',\n"
-      "  'name': '//root/bar',\n"
-      "  'contents': [ {\n"
-      "                  'type': 'file',\n"
-      "                  'name': 'a',\n"
-      "                  'external-contents': '//root/foo/a'\n"
-      "                }\n"
-      "              ]\n"
-      "}\n"
-      "]\n"
-      "}",
-      Lower);
-  ASSERT_TRUE(FS.get() != nullptr);
-  std::error_code EC = FS->setCurrentWorkingDirectory("//root/bar");
-  ASSERT_FALSE(EC);
-  ASSERT_TRUE(FS.get() != nullptr);
-
-  llvm::ErrorOr<vfs::Status> Status = FS->status("a");
-  ASSERT_FALSE(Status.getError());
-  EXPECT_TRUE(Status->exists());
-}
-
-TEST_F(VFSFromYAMLTest, YAMLVFSWriterTest) {
-  TempDir TestDirectory("virtual-file-system-test", /*Unique*/ true);
-  TempDir _a(TestDirectory.path("a"));
-  TempFile _ab(TestDirectory.path("a, b"));
-  TempDir _c(TestDirectory.path("c"));
-  TempFile _cd(TestDirectory.path("c/d"));
-  TempDir _e(TestDirectory.path("e"));
-  TempDir _ef(TestDirectory.path("e/f"));
-  TempFile _g(TestDirectory.path("g"));
-  TempDir _h(TestDirectory.path("h"));
-
-  vfs::YAMLVFSWriter VFSWriter;
-  VFSWriter.addDirectoryMapping(_a.path(), "//root/a");
-  VFSWriter.addFileMapping(_ab.path(), "//root/a/b");
-  VFSWriter.addFileMapping(_cd.path(), "//root/c/d");
-  VFSWriter.addDirectoryMapping(_e.path(), "//root/e");
-  VFSWriter.addDirectoryMapping(_ef.path(), "//root/e/f");
-  VFSWriter.addFileMapping(_g.path(), "//root/g");
-  VFSWriter.addDirectoryMapping(_h.path(), "//root/h");
-
-  std::string Buffer;
-  raw_string_ostream OS(Buffer);
-  VFSWriter.write(OS);
-  OS.flush();
-
-  IntrusiveRefCntPtr<ErrorDummyFileSystem> Lower(new ErrorDummyFileSystem());
-  Lower->addDirectory("//root/");
-  Lower->addDirectory("//root/a");
-  Lower->addRegularFile("//root/a/b");
-  Lower->addDirectory("//root/b");
-  Lower->addDirectory("//root/c");
-  Lower->addRegularFile("//root/c/d");
-  Lower->addDirectory("//root/e");
-  Lower->addDirectory("//root/e/f");
-  Lower->addRegularFile("//root/g");
-  Lower->addDirectory("//root/h");
-
-  IntrusiveRefCntPtr<vfs::FileSystem> FS = getFromYAMLRawString(Buffer, Lower);
-  ASSERT_TRUE(FS.get() != nullptr);
-
-  EXPECT_TRUE(FS->exists(_a.path()));
-  EXPECT_TRUE(FS->exists(_ab.path()));
-  EXPECT_TRUE(FS->exists(_c.path()));
-  EXPECT_TRUE(FS->exists(_cd.path()));
-  EXPECT_TRUE(FS->exists(_e.path()));
-  EXPECT_TRUE(FS->exists(_ef.path()));
-  EXPECT_TRUE(FS->exists(_g.path()));
-  EXPECT_TRUE(FS->exists(_h.path()));
-}
-
-TEST_F(VFSFromYAMLTest, YAMLVFSWriterTest2) {
-  TempDir TestDirectory("virtual-file-system-test", /*Unique*/ true);
-  TempDir _a(TestDirectory.path("a"));
-  TempFile _ab(TestDirectory.path("a/b"));
-  TempDir _ac(TestDirectory.path("a/c"));
-  TempFile _acd(TestDirectory.path("a/c/d"));
-  TempFile _ace(TestDirectory.path("a/c/e"));
-  TempFile _acf(TestDirectory.path("a/c/f"));
-  TempDir _ag(TestDirectory.path("a/g"));
-  TempFile _agh(TestDirectory.path("a/g/h"));
-
-  vfs::YAMLVFSWriter VFSWriter;
-  VFSWriter.addDirectoryMapping(_a.path(), "//root/a");
-  VFSWriter.addFileMapping(_ab.path(), "//root/a/b");
-  VFSWriter.addDirectoryMapping(_ac.path(), "//root/a/c");
-  VFSWriter.addFileMapping(_acd.path(), "//root/a/c/d");
-  VFSWriter.addFileMapping(_ace.path(), "//root/a/c/e");
-  VFSWriter.addFileMapping(_acf.path(), "//root/a/c/f");
-  VFSWriter.addDirectoryMapping(_ag.path(), "//root/a/g");
-  VFSWriter.addFileMapping(_agh.path(), "//root/a/g/h");
-
-  std::string Buffer;
-  raw_string_ostream OS(Buffer);
-  VFSWriter.write(OS);
-  OS.flush();
-
-  IntrusiveRefCntPtr<ErrorDummyFileSystem> Lower(new ErrorDummyFileSystem());
-  IntrusiveRefCntPtr<vfs::FileSystem> FS = getFromYAMLRawString(Buffer, Lower);
-  EXPECT_TRUE(FS.get() != nullptr);
-}
-
-TEST_F(VFSFromYAMLTest, YAMLVFSWriterTest3) {
-  TempDir TestDirectory("virtual-file-system-test", /*Unique*/ true);
-  TempDir _a(TestDirectory.path("a"));
-  TempFile _ab(TestDirectory.path("a/b"));
-  TempDir _ac(TestDirectory.path("a/c"));
-  TempDir _acd(TestDirectory.path("a/c/d"));
-  TempDir _acde(TestDirectory.path("a/c/d/e"));
-  TempFile _acdef(TestDirectory.path("a/c/d/e/f"));
-  TempFile _acdeg(TestDirectory.path("a/c/d/e/g"));
-  TempDir _ah(TestDirectory.path("a/h"));
-  TempFile _ahi(TestDirectory.path("a/h/i"));
-
-  vfs::YAMLVFSWriter VFSWriter;
-  VFSWriter.addDirectoryMapping(_a.path(), "//root/a");
-  VFSWriter.addFileMapping(_ab.path(), "//root/a/b");
-  VFSWriter.addDirectoryMapping(_ac.path(), "//root/a/c");
-  VFSWriter.addDirectoryMapping(_acd.path(), "//root/a/c/d");
-  VFSWriter.addDirectoryMapping(_acde.path(), "//root/a/c/d/e");
-  VFSWriter.addFileMapping(_acdef.path(), "//root/a/c/d/e/f");
-  VFSWriter.addFileMapping(_acdeg.path(), "//root/a/c/d/e/g");
-  VFSWriter.addDirectoryMapping(_ahi.path(), "//root/a/h");
-  VFSWriter.addFileMapping(_ahi.path(), "//root/a/h/i");
-
-  std::string Buffer;
-  raw_string_ostream OS(Buffer);
-  VFSWriter.write(OS);
-  OS.flush();
-
-  IntrusiveRefCntPtr<ErrorDummyFileSystem> Lower(new ErrorDummyFileSystem());
-  IntrusiveRefCntPtr<vfs::FileSystem> FS = getFromYAMLRawString(Buffer, Lower);
-  EXPECT_TRUE(FS.get() != nullptr);
-}
-
-TEST_F(VFSFromYAMLTest, YAMLVFSWriterTestHandleDirs) {
-  TempDir TestDirectory("virtual-file-system-test", /*Unique*/ true);
-  TempDir _a(TestDirectory.path("a"));
-  TempDir _b(TestDirectory.path("b"));
-  TempDir _c(TestDirectory.path("c"));
-
-  vfs::YAMLVFSWriter VFSWriter;
-  VFSWriter.addDirectoryMapping(_a.path(), "//root/a");
-  VFSWriter.addDirectoryMapping(_b.path(), "//root/b");
-  VFSWriter.addDirectoryMapping(_c.path(), "//root/c");
-
-  std::string Buffer;
-  raw_string_ostream OS(Buffer);
-  VFSWriter.write(OS);
-  OS.flush();
-
-  // We didn't add a single file - only directories.
-  EXPECT_TRUE(Buffer.find("'type': 'file'") == std::string::npos);
-
-  IntrusiveRefCntPtr<ErrorDummyFileSystem> Lower(new ErrorDummyFileSystem());
-  Lower->addDirectory("//root/a");
-  Lower->addDirectory("//root/b");
-  Lower->addDirectory("//root/c");
-  // canaries
-  Lower->addRegularFile("//root/a/a");
-  Lower->addRegularFile("//root/b/b");
-  Lower->addRegularFile("//root/c/c");
-
-  IntrusiveRefCntPtr<vfs::FileSystem> FS = getFromYAMLRawString(Buffer, Lower);
-  ASSERT_TRUE(FS.get() != nullptr);
-
-  EXPECT_FALSE(FS->exists(_a.path("a")));
-  EXPECT_FALSE(FS->exists(_b.path("b")));
-  EXPECT_FALSE(FS->exists(_c.path("c")));
-}
-
-TEST(VFSFromRemappedFilesTest, Basic) {
-  IntrusiveRefCntPtr<vfs::InMemoryFileSystem> BaseFS =
-      new vfs::InMemoryFileSystem;
-  BaseFS->addFile("//root/b", 0, MemoryBuffer::getMemBuffer("contents of b"));
-  BaseFS->addFile("//root/c", 0, MemoryBuffer::getMemBuffer("contents of c"));
-
-  std::vector<std::pair<std::string, std::string>> RemappedFiles = {
-      {"//root/a/a", "//root/b"},
-      {"//root/a/b/c", "//root/c"},
-  };
-  auto RemappedFS = vfs::RedirectingFileSystem::create(
-      RemappedFiles, /*UseExternalNames=*/false, *BaseFS);
-
-  auto StatA = RemappedFS->status("//root/a/a");
-  auto StatB = RemappedFS->status("//root/a/b/c");
-  ASSERT_TRUE(StatA);
-  ASSERT_TRUE(StatB);
-  EXPECT_EQ("//root/a/a", StatA->getName());
-  EXPECT_EQ("//root/a/b/c", StatB->getName());
-
-  auto BufferA = RemappedFS->getBufferForFile("//root/a/a");
-  auto BufferB = RemappedFS->getBufferForFile("//root/a/b/c");
-  ASSERT_TRUE(BufferA);
-  ASSERT_TRUE(BufferB);
-  EXPECT_EQ("contents of b", (*BufferA)->getBuffer());
-  EXPECT_EQ("contents of c", (*BufferB)->getBuffer());
-}
-
-TEST(VFSFromRemappedFilesTest, UseExternalNames) {
-  IntrusiveRefCntPtr<vfs::InMemoryFileSystem> BaseFS =
-      new vfs::InMemoryFileSystem;
-  BaseFS->addFile("//root/b", 0, MemoryBuffer::getMemBuffer("contents of b"));
-  BaseFS->addFile("//root/c", 0, MemoryBuffer::getMemBuffer("contents of c"));
-
-  std::vector<std::pair<std::string, std::string>> RemappedFiles = {
-      {"//root/a/a", "//root/b"},
-      {"//root/a/b/c", "//root/c"},
-  };
-  auto RemappedFS = vfs::RedirectingFileSystem::create(
-      RemappedFiles, /*UseExternalNames=*/true, *BaseFS);
-
-  auto StatA = RemappedFS->status("//root/a/a");
-  auto StatB = RemappedFS->status("//root/a/b/c");
-  ASSERT_TRUE(StatA);
-  ASSERT_TRUE(StatB);
-  EXPECT_EQ("//root/b", StatA->getName());
-  EXPECT_EQ("//root/c", StatB->getName());
-
-  auto BufferA = RemappedFS->getBufferForFile("//root/a/a");
-  auto BufferB = RemappedFS->getBufferForFile("//root/a/b/c");
-  ASSERT_TRUE(BufferA);
-  ASSERT_TRUE(BufferB);
-  EXPECT_EQ("contents of b", (*BufferA)->getBuffer());
-  EXPECT_EQ("contents of c", (*BufferB)->getBuffer());
-}
-
-TEST(VFSFromRemappedFilesTest, LastMappingWins) {
-  IntrusiveRefCntPtr<vfs::InMemoryFileSystem> BaseFS =
-      new vfs::InMemoryFileSystem;
-  BaseFS->addFile("//root/b", 0, MemoryBuffer::getMemBuffer("contents of b"));
-  BaseFS->addFile("//root/c", 0, MemoryBuffer::getMemBuffer("contents of c"));
-
-  std::vector<std::pair<std::string, std::string>> RemappedFiles = {
-      {"//root/a", "//root/b"},
-      {"//root/a", "//root/c"},
-  };
-  auto RemappedFSKeepName = vfs::RedirectingFileSystem::create(
-      RemappedFiles, /*UseExternalNames=*/false, *BaseFS);
-  auto RemappedFSExternalName = vfs::RedirectingFileSystem::create(
-      RemappedFiles, /*UseExternalNames=*/true, *BaseFS);
-
-  auto StatKeepA = RemappedFSKeepName->status("//root/a");
-  auto StatExternalA = RemappedFSExternalName->status("//root/a");
-  ASSERT_TRUE(StatKeepA);
-  ASSERT_TRUE(StatExternalA);
-  EXPECT_EQ("//root/a", StatKeepA->getName());
-  EXPECT_EQ("//root/c", StatExternalA->getName());
-
-  auto BufferKeepA = RemappedFSKeepName->getBufferForFile("//root/a");
-  auto BufferExternalA = RemappedFSExternalName->getBufferForFile("//root/a");
-  ASSERT_TRUE(BufferKeepA);
-  ASSERT_TRUE(BufferExternalA);
-  EXPECT_EQ("contents of c", (*BufferKeepA)->getBuffer());
-  EXPECT_EQ("contents of c", (*BufferExternalA)->getBuffer());
-}
diff --git a/gnu/llvm/llvm/unittests/Support/WithColorTest.cpp b/gnu/llvm/llvm/unittests/Support/WithColorTest.cpp
deleted file mode 100644
index 8afb092575c..00000000000
--- a/gnu/llvm/llvm/unittests/Support/WithColorTest.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-//===- WithColorTest.cpp --------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/WithColor.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-TEST(WithColorTest, ColorMode) {
-  {
-    std::string S;
-    llvm::raw_string_ostream OS(S);
-    OS.enable_colors(true);
-
-    WithColor(OS, HighlightColor::Error, ColorMode::Disable) << "test";
-    EXPECT_EQ("test", OS.str());
-  }
-
-  {
-    std::string S;
-    llvm::raw_string_ostream OS(S);
-    OS.enable_colors(true);
-
-    WithColor(OS, HighlightColor::Error, ColorMode::Auto) << "test";
-    EXPECT_EQ("test", OS.str());
-  }
-
-#ifdef LLVM_ON_UNIX
-  {
-    std::string S;
-    llvm::raw_string_ostream OS(S);
-    OS.enable_colors(true);
-
-    WithColor(OS, HighlightColor::Error, ColorMode::Enable) << "test";
-    EXPECT_EQ("\x1B[0;1;31mtest\x1B[0m", OS.str());
-  }
-#endif
-}
diff --git a/gnu/llvm/llvm/unittests/Support/YAMLIOTest.cpp b/gnu/llvm/llvm/unittests/Support/YAMLIOTest.cpp
deleted file mode 100644
index 3e1efbc7550..00000000000
--- a/gnu/llvm/llvm/unittests/Support/YAMLIOTest.cpp
+++ /dev/null
@@ -1,3216 +0,0 @@
-//===- unittest/Support/YAMLIOTest.cpp ------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/BitmaskEnum.h"
-#include "llvm/ADT/StringMap.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/ADT/StringSwitch.h"
-#include "llvm/ADT/Twine.h"
-#include "llvm/Support/Casting.h"
-#include "llvm/Support/Endian.h"
-#include "llvm/Support/Format.h"
-#include "llvm/Support/YAMLTraits.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-using llvm::yaml::Hex16;
-using llvm::yaml::Hex32;
-using llvm::yaml::Hex64;
-using llvm::yaml::Hex8;
-using llvm::yaml::Input;
-using llvm::yaml::IO;
-using llvm::yaml::isNumeric;
-using llvm::yaml::MappingNormalization;
-using llvm::yaml::MappingTraits;
-using llvm::yaml::Output;
-using llvm::yaml::ScalarTraits;
-using ::testing::StartsWith;
-
-
-
-
-static void suppressErrorMessages(const llvm::SMDiagnostic &, void *) {
-}
-
-
-
-//===----------------------------------------------------------------------===//
-//  Test MappingTraits
-//===----------------------------------------------------------------------===//
-
-struct FooBar {
-  int foo;
-  int bar;
-};
-typedef std::vector<FooBar> FooBarSequence;
-
-LLVM_YAML_IS_SEQUENCE_VECTOR(FooBar)
-
-struct FooBarContainer {
-  FooBarSequence fbs;
-};
-
-namespace llvm {
-namespace yaml {
-  template <>
-  struct MappingTraits<FooBar> {
-    static void mapping(IO &io, FooBar& fb) {
-      io.mapRequired("foo",    fb.foo);
-      io.mapRequired("bar",    fb.bar);
-    }
-  };
-
-  template <> struct MappingTraits<FooBarContainer> {
-    static void mapping(IO &io, FooBarContainer &fb) {
-      io.mapRequired("fbs", fb.fbs);
-    }
-  };
-}
-}
-
-
-//
-// Test the reading of a yaml mapping
-//
-TEST(YAMLIO, TestMapRead) {
-  FooBar doc;
-  {
-    Input yin("---\nfoo:  3\nbar:  5\n...\n");
-    yin >> doc;
-
-    EXPECT_FALSE(yin.error());
-    EXPECT_EQ(doc.foo, 3);
-    EXPECT_EQ(doc.bar, 5);
-  }
-
-  {
-    Input yin("{foo: 3, bar: 5}");
-    yin >> doc;
-
-    EXPECT_FALSE(yin.error());
-    EXPECT_EQ(doc.foo, 3);
-    EXPECT_EQ(doc.bar, 5);
-  }
-}
-
-TEST(YAMLIO, TestMalformedMapRead) {
-  FooBar doc;
-  Input yin("{foo: 3; bar: 5}", nullptr, suppressErrorMessages);
-  yin >> doc;
-  EXPECT_TRUE(!!yin.error());
-}
-
-//
-// Test the reading of a yaml sequence of mappings
-//
-TEST(YAMLIO, TestSequenceMapRead) {
-  FooBarSequence seq;
-  Input yin("---\n - foo:  3\n   bar:  5\n - foo:  7\n   bar:  9\n...\n");
-  yin >> seq;
-
-  EXPECT_FALSE(yin.error());
-  EXPECT_EQ(seq.size(), 2UL);
-  FooBar& map1 = seq[0];
-  FooBar& map2 = seq[1];
-  EXPECT_EQ(map1.foo, 3);
-  EXPECT_EQ(map1.bar, 5);
-  EXPECT_EQ(map2.foo, 7);
-  EXPECT_EQ(map2.bar, 9);
-}
-
-//
-// Test the reading of a map containing a yaml sequence of mappings
-//
-TEST(YAMLIO, TestContainerSequenceMapRead) {
-  {
-    FooBarContainer cont;
-    Input yin2("---\nfbs:\n - foo: 3\n   bar: 5\n - foo: 7\n   bar: 9\n...\n");
-    yin2 >> cont;
-
-    EXPECT_FALSE(yin2.error());
-    EXPECT_EQ(cont.fbs.size(), 2UL);
-    EXPECT_EQ(cont.fbs[0].foo, 3);
-    EXPECT_EQ(cont.fbs[0].bar, 5);
-    EXPECT_EQ(cont.fbs[1].foo, 7);
-    EXPECT_EQ(cont.fbs[1].bar, 9);
-  }
-
-  {
-    FooBarContainer cont;
-    Input yin("---\nfbs:\n...\n");
-    yin >> cont;
-    // Okay: Empty node represents an empty array.
-    EXPECT_FALSE(yin.error());
-    EXPECT_EQ(cont.fbs.size(), 0UL);
-  }
-
-  {
-    FooBarContainer cont;
-    Input yin("---\nfbs: !!null null\n...\n");
-    yin >> cont;
-    // Okay: null represents an empty array.
-    EXPECT_FALSE(yin.error());
-    EXPECT_EQ(cont.fbs.size(), 0UL);
-  }
-
-  {
-    FooBarContainer cont;
-    Input yin("---\nfbs: ~\n...\n");
-    yin >> cont;
-    // Okay: null represents an empty array.
-    EXPECT_FALSE(yin.error());
-    EXPECT_EQ(cont.fbs.size(), 0UL);
-  }
-
-  {
-    FooBarContainer cont;
-    Input yin("---\nfbs: null\n...\n");
-    yin >> cont;
-    // Okay: null represents an empty array.
-    EXPECT_FALSE(yin.error());
-    EXPECT_EQ(cont.fbs.size(), 0UL);
-  }
-}
-
-//
-// Test the reading of a map containing a malformed yaml sequence
-//
-TEST(YAMLIO, TestMalformedContainerSequenceMapRead) {
-  {
-    FooBarContainer cont;
-    Input yin("---\nfbs:\n   foo: 3\n   bar: 5\n...\n", nullptr,
-              suppressErrorMessages);
-    yin >> cont;
-    // Error: fbs is not a sequence.
-    EXPECT_TRUE(!!yin.error());
-    EXPECT_EQ(cont.fbs.size(), 0UL);
-  }
-
-  {
-    FooBarContainer cont;
-    Input yin("---\nfbs: 'scalar'\n...\n", nullptr, suppressErrorMessages);
-    yin >> cont;
-    // This should be an error.
-    EXPECT_TRUE(!!yin.error());
-    EXPECT_EQ(cont.fbs.size(), 0UL);
-  }
-}
-
-//
-// Test writing then reading back a sequence of mappings
-//
-TEST(YAMLIO, TestSequenceMapWriteAndRead) {
-  std::string intermediate;
-  {
-    FooBar entry1;
-    entry1.foo = 10;
-    entry1.bar = -3;
-    FooBar entry2;
-    entry2.foo = 257;
-    entry2.bar = 0;
-    FooBarSequence seq;
-    seq.push_back(entry1);
-    seq.push_back(entry2);
-
-    llvm::raw_string_ostream ostr(intermediate);
-    Output yout(ostr);
-    yout << seq;
-  }
-
-  {
-    Input yin(intermediate);
-    FooBarSequence seq2;
-    yin >> seq2;
-
-    EXPECT_FALSE(yin.error());
-    EXPECT_EQ(seq2.size(), 2UL);
-    FooBar& map1 = seq2[0];
-    FooBar& map2 = seq2[1];
-    EXPECT_EQ(map1.foo, 10);
-    EXPECT_EQ(map1.bar, -3);
-    EXPECT_EQ(map2.foo, 257);
-    EXPECT_EQ(map2.bar, 0);
-  }
-}
-
-//
-// Test YAML filename handling.
-//
-static void testErrorFilename(const llvm::SMDiagnostic &Error, void *) {
-  EXPECT_EQ(Error.getFilename(), "foo.yaml");
-}
-
-TEST(YAMLIO, TestGivenFilename) {
-  auto Buffer = llvm::MemoryBuffer::getMemBuffer("{ x: 42 }", "foo.yaml");
-  Input yin(*Buffer, nullptr, testErrorFilename);
-  FooBar Value;
-  yin >> Value;
-
-  EXPECT_TRUE(!!yin.error());
-}
-
-struct WithStringField {
-  std::string str1;
-  std::string str2;
-  std::string str3;
-};
-
-namespace llvm {
-namespace yaml {
-template <> struct MappingTraits<WithStringField> {
-  static void mapping(IO &io, WithStringField &fb) {
-    io.mapRequired("str1", fb.str1);
-    io.mapRequired("str2", fb.str2);
-    io.mapRequired("str3", fb.str3);
-  }
-};
-} // namespace yaml
-} // namespace llvm
-
-TEST(YAMLIO, MultilineStrings) {
-  WithStringField Original;
-  Original.str1 = "a multiline string\nfoobarbaz";
-  Original.str2 = "another one\rfoobarbaz";
-  Original.str3 = "a one-line string";
-
-  std::string Serialized;
-  {
-    llvm::raw_string_ostream OS(Serialized);
-    Output YOut(OS);
-    YOut << Original;
-  }
-  auto Expected = "---\n"
-                  "str1:            \"a multiline string\\nfoobarbaz\"\n"
-                  "str2:            \"another one\\rfoobarbaz\"\n"
-                  "str3:            a one-line string\n"
-                  "...\n";
-  ASSERT_EQ(Serialized, Expected);
-
-  // Also check it parses back without the errors.
-  WithStringField Deserialized;
-  {
-    Input YIn(Serialized);
-    YIn >> Deserialized;
-    ASSERT_FALSE(YIn.error())
-        << "Parsing error occurred during deserialization. Serialized string:\n"
-        << Serialized;
-  }
-  EXPECT_EQ(Original.str1, Deserialized.str1);
-  EXPECT_EQ(Original.str2, Deserialized.str2);
-  EXPECT_EQ(Original.str3, Deserialized.str3);
-}
-
-TEST(YAMLIO, NoQuotesForTab) {
-  WithStringField WithTab;
-  WithTab.str1 = "aba\tcaba";
-  std::string Serialized;
-  {
-    llvm::raw_string_ostream OS(Serialized);
-    Output YOut(OS);
-    YOut << WithTab;
-  }
-  auto ExpectedPrefix = "---\n"
-                        "str1:            aba\tcaba\n";
-  EXPECT_THAT(Serialized, StartsWith(ExpectedPrefix));
-}
-
-//===----------------------------------------------------------------------===//
-//  Test built-in types
-//===----------------------------------------------------------------------===//
-
-struct BuiltInTypes {
-  llvm::StringRef str;
-  std::string stdstr;
-  uint64_t        u64;
-  uint32_t        u32;
-  uint16_t        u16;
-  uint8_t         u8;
-  bool            b;
-  int64_t         s64;
-  int32_t         s32;
-  int16_t         s16;
-  int8_t          s8;
-  float           f;
-  double          d;
-  Hex8            h8;
-  Hex16           h16;
-  Hex32           h32;
-  Hex64           h64;
-};
-
-namespace llvm {
-namespace yaml {
-  template <>
-  struct MappingTraits<BuiltInTypes> {
-    static void mapping(IO &io, BuiltInTypes& bt) {
-      io.mapRequired("str",      bt.str);
-      io.mapRequired("stdstr",   bt.stdstr);
-      io.mapRequired("u64",      bt.u64);
-      io.mapRequired("u32",      bt.u32);
-      io.mapRequired("u16",      bt.u16);
-      io.mapRequired("u8",       bt.u8);
-      io.mapRequired("b",        bt.b);
-      io.mapRequired("s64",      bt.s64);
-      io.mapRequired("s32",      bt.s32);
-      io.mapRequired("s16",      bt.s16);
-      io.mapRequired("s8",       bt.s8);
-      io.mapRequired("f",        bt.f);
-      io.mapRequired("d",        bt.d);
-      io.mapRequired("h8",       bt.h8);
-      io.mapRequired("h16",      bt.h16);
-      io.mapRequired("h32",      bt.h32);
-      io.mapRequired("h64",      bt.h64);
-    }
-  };
-}
-}
-
-
-//
-// Test the reading of all built-in scalar conversions
-//
-TEST(YAMLIO, TestReadBuiltInTypes) {
-  BuiltInTypes map;
-  Input yin("---\n"
-            "str:      hello there\n"
-            "stdstr:   hello where?\n"
-            "u64:      5000000000\n"
-            "u32:      4000000000\n"
-            "u16:      65000\n"
-            "u8:       255\n"
-            "b:        false\n"
-            "s64:      -5000000000\n"
-            "s32:      -2000000000\n"
-            "s16:      -32000\n"
-            "s8:       -127\n"
-            "f:        137.125\n"
-            "d:        -2.8625\n"
-            "h8:       0xFF\n"
-            "h16:      0x8765\n"
-            "h32:      0xFEDCBA98\n"
-            "h64:      0xFEDCBA9876543210\n"
-           "...\n");
-  yin >> map;
-
-  EXPECT_FALSE(yin.error());
-  EXPECT_TRUE(map.str.equals("hello there"));
-  EXPECT_TRUE(map.stdstr == "hello where?");
-  EXPECT_EQ(map.u64, 5000000000ULL);
-  EXPECT_EQ(map.u32, 4000000000U);
-  EXPECT_EQ(map.u16, 65000);
-  EXPECT_EQ(map.u8,  255);
-  EXPECT_EQ(map.b,   false);
-  EXPECT_EQ(map.s64, -5000000000LL);
-  EXPECT_EQ(map.s32, -2000000000L);
-  EXPECT_EQ(map.s16, -32000);
-  EXPECT_EQ(map.s8,  -127);
-  EXPECT_EQ(map.f,   137.125);
-  EXPECT_EQ(map.d,   -2.8625);
-  EXPECT_EQ(map.h8,  Hex8(255));
-  EXPECT_EQ(map.h16, Hex16(0x8765));
-  EXPECT_EQ(map.h32, Hex32(0xFEDCBA98));
-  EXPECT_EQ(map.h64, Hex64(0xFEDCBA9876543210LL));
-}
-
-
-//
-// Test writing then reading back all built-in scalar types
-//
-TEST(YAMLIO, TestReadWriteBuiltInTypes) {
-  std::string intermediate;
-  {
-    BuiltInTypes map;
-    map.str = "one two";
-    map.stdstr = "three four";
-    map.u64 = 6000000000ULL;
-    map.u32 = 3000000000U;
-    map.u16 = 50000;
-    map.u8  = 254;
-    map.b   = true;
-    map.s64 = -6000000000LL;
-    map.s32 = -2000000000;
-    map.s16 = -32000;
-    map.s8  = -128;
-    map.f   = 3.25;
-    map.d   = -2.8625;
-    map.h8  = 254;
-    map.h16 = 50000;
-    map.h32 = 3000000000U;
-    map.h64 = 6000000000LL;
-
-    llvm::raw_string_ostream ostr(intermediate);
-    Output yout(ostr);
-    yout << map;
-  }
-
-  {
-    Input yin(intermediate);
-    BuiltInTypes map;
-    yin >> map;
-
-    EXPECT_FALSE(yin.error());
-    EXPECT_TRUE(map.str.equals("one two"));
-    EXPECT_TRUE(map.stdstr == "three four");
-    EXPECT_EQ(map.u64,      6000000000ULL);
-    EXPECT_EQ(map.u32,      3000000000U);
-    EXPECT_EQ(map.u16,      50000);
-    EXPECT_EQ(map.u8,       254);
-    EXPECT_EQ(map.b,        true);
-    EXPECT_EQ(map.s64,      -6000000000LL);
-    EXPECT_EQ(map.s32,      -2000000000L);
-    EXPECT_EQ(map.s16,      -32000);
-    EXPECT_EQ(map.s8,       -128);
-    EXPECT_EQ(map.f,        3.25);
-    EXPECT_EQ(map.d,        -2.8625);
-    EXPECT_EQ(map.h8,       Hex8(254));
-    EXPECT_EQ(map.h16,      Hex16(50000));
-    EXPECT_EQ(map.h32,      Hex32(3000000000U));
-    EXPECT_EQ(map.h64,      Hex64(6000000000LL));
-  }
-}
-
-//===----------------------------------------------------------------------===//
-//  Test endian-aware types
-//===----------------------------------------------------------------------===//
-
-struct EndianTypes {
-  typedef llvm::support::detail::packed_endian_specific_integral<
-      float, llvm::support::little, llvm::support::unaligned>
-      ulittle_float;
-  typedef llvm::support::detail::packed_endian_specific_integral<
-      double, llvm::support::little, llvm::support::unaligned>
-      ulittle_double;
-
-  llvm::support::ulittle64_t u64;
-  llvm::support::ulittle32_t u32;
-  llvm::support::ulittle16_t u16;
-  llvm::support::little64_t s64;
-  llvm::support::little32_t s32;
-  llvm::support::little16_t s16;
-  ulittle_float f;
-  ulittle_double d;
-};
-
-namespace llvm {
-namespace yaml {
-template <> struct MappingTraits<EndianTypes> {
-  static void mapping(IO &io, EndianTypes &et) {
-    io.mapRequired("u64", et.u64);
-    io.mapRequired("u32", et.u32);
-    io.mapRequired("u16", et.u16);
-    io.mapRequired("s64", et.s64);
-    io.mapRequired("s32", et.s32);
-    io.mapRequired("s16", et.s16);
-    io.mapRequired("f", et.f);
-    io.mapRequired("d", et.d);
-  }
-};
-}
-}
-
-//
-// Test the reading of all endian scalar conversions
-//
-TEST(YAMLIO, TestReadEndianTypes) {
-  EndianTypes map;
-  Input yin("---\n"
-            "u64:      5000000000\n"
-            "u32:      4000000000\n"
-            "u16:      65000\n"
-            "s64:      -5000000000\n"
-            "s32:      -2000000000\n"
-            "s16:      -32000\n"
-            "f:        3.25\n"
-            "d:        -2.8625\n"
-            "...\n");
-  yin >> map;
-
-  EXPECT_FALSE(yin.error());
-  EXPECT_EQ(map.u64, 5000000000ULL);
-  EXPECT_EQ(map.u32, 4000000000U);
-  EXPECT_EQ(map.u16, 65000);
-  EXPECT_EQ(map.s64, -5000000000LL);
-  EXPECT_EQ(map.s32, -2000000000L);
-  EXPECT_EQ(map.s16, -32000);
-  EXPECT_EQ(map.f, 3.25f);
-  EXPECT_EQ(map.d, -2.8625);
-}
-
-//
-// Test writing then reading back all endian-aware scalar types
-//
-TEST(YAMLIO, TestReadWriteEndianTypes) {
-  std::string intermediate;
-  {
-    EndianTypes map;
-    map.u64 = 6000000000ULL;
-    map.u32 = 3000000000U;
-    map.u16 = 50000;
-    map.s64 = -6000000000LL;
-    map.s32 = -2000000000;
-    map.s16 = -32000;
-    map.f = 3.25f;
-    map.d = -2.8625;
-
-    llvm::raw_string_ostream ostr(intermediate);
-    Output yout(ostr);
-    yout << map;
-  }
-
-  {
-    Input yin(intermediate);
-    EndianTypes map;
-    yin >> map;
-
-    EXPECT_FALSE(yin.error());
-    EXPECT_EQ(map.u64, 6000000000ULL);
-    EXPECT_EQ(map.u32, 3000000000U);
-    EXPECT_EQ(map.u16, 50000);
-    EXPECT_EQ(map.s64, -6000000000LL);
-    EXPECT_EQ(map.s32, -2000000000L);
-    EXPECT_EQ(map.s16, -32000);
-    EXPECT_EQ(map.f, 3.25f);
-    EXPECT_EQ(map.d, -2.8625);
-  }
-}
-
-enum class Enum : uint16_t { One, Two };
-enum class BitsetEnum : uint16_t {
-  ZeroOne = 0x01,
-  OneZero = 0x10,
-  LLVM_MARK_AS_BITMASK_ENUM(/*LargestValue*/ OneZero),
-};
-LLVM_ENABLE_BITMASK_ENUMS_IN_NAMESPACE();
-struct EndianEnums {
-  llvm::support::little_t<Enum> LittleEnum;
-  llvm::support::big_t<Enum> BigEnum;
-  llvm::support::little_t<BitsetEnum> LittleBitset;
-  llvm::support::big_t<BitsetEnum> BigBitset;
-};
-namespace llvm {
-namespace yaml {
-template <> struct ScalarEnumerationTraits<Enum> {
-  static void enumeration(IO &io, Enum &E) {
-    io.enumCase(E, "One", Enum::One);
-    io.enumCase(E, "Two", Enum::Two);
-  }
-};
-
-template <> struct ScalarBitSetTraits<BitsetEnum> {
-  static void bitset(IO &io, BitsetEnum &E) {
-    io.bitSetCase(E, "ZeroOne", BitsetEnum::ZeroOne);
-    io.bitSetCase(E, "OneZero", BitsetEnum::OneZero);
-  }
-};
-
-template <> struct MappingTraits<EndianEnums> {
-  static void mapping(IO &io, EndianEnums &EE) {
-    io.mapRequired("LittleEnum", EE.LittleEnum);
-    io.mapRequired("BigEnum", EE.BigEnum);
-    io.mapRequired("LittleBitset", EE.LittleBitset);
-    io.mapRequired("BigBitset", EE.BigBitset);
-  }
-};
-} // namespace yaml
-} // namespace llvm
-
-TEST(YAMLIO, TestReadEndianEnums) {
-  EndianEnums map;
-  Input yin("---\n"
-            "LittleEnum:   One\n"
-            "BigEnum:      Two\n"
-            "LittleBitset: [ ZeroOne ]\n"
-            "BigBitset:    [ ZeroOne, OneZero ]\n"
-            "...\n");
-  yin >> map;
-
-  EXPECT_FALSE(yin.error());
-  EXPECT_EQ(Enum::One, map.LittleEnum);
-  EXPECT_EQ(Enum::Two, map.BigEnum);
-  EXPECT_EQ(BitsetEnum::ZeroOne, map.LittleBitset);
-  EXPECT_EQ(BitsetEnum::ZeroOne | BitsetEnum::OneZero, map.BigBitset);
-}
-
-TEST(YAMLIO, TestReadWriteEndianEnums) {
-  std::string intermediate;
-  {
-    EndianEnums map;
-    map.LittleEnum = Enum::Two;
-    map.BigEnum = Enum::One;
-    map.LittleBitset = BitsetEnum::OneZero | BitsetEnum::ZeroOne;
-    map.BigBitset = BitsetEnum::OneZero;
-
-    llvm::raw_string_ostream ostr(intermediate);
-    Output yout(ostr);
-    yout << map;
-  }
-
-  {
-    Input yin(intermediate);
-    EndianEnums map;
-    yin >> map;
-
-    EXPECT_FALSE(yin.error());
-    EXPECT_EQ(Enum::Two, map.LittleEnum);
-    EXPECT_EQ(Enum::One, map.BigEnum);
-    EXPECT_EQ(BitsetEnum::OneZero | BitsetEnum::ZeroOne, map.LittleBitset);
-    EXPECT_EQ(BitsetEnum::OneZero, map.BigBitset);
-  }
-}
-
-struct StringTypes {
-  llvm::StringRef str1;
-  llvm::StringRef str2;
-  llvm::StringRef str3;
-  llvm::StringRef str4;
-  llvm::StringRef str5;
-  llvm::StringRef str6;
-  llvm::StringRef str7;
-  llvm::StringRef str8;
-  llvm::StringRef str9;
-  llvm::StringRef str10;
-  llvm::StringRef str11;
-  std::string stdstr1;
-  std::string stdstr2;
-  std::string stdstr3;
-  std::string stdstr4;
-  std::string stdstr5;
-  std::string stdstr6;
-  std::string stdstr7;
-  std::string stdstr8;
-  std::string stdstr9;
-  std::string stdstr10;
-  std::string stdstr11;
-  std::string stdstr12;
-  std::string stdstr13;
-};
-
-namespace llvm {
-namespace yaml {
-  template <>
-  struct MappingTraits<StringTypes> {
-    static void mapping(IO &io, StringTypes& st) {
-      io.mapRequired("str1",      st.str1);
-      io.mapRequired("str2",      st.str2);
-      io.mapRequired("str3",      st.str3);
-      io.mapRequired("str4",      st.str4);
-      io.mapRequired("str5",      st.str5);
-      io.mapRequired("str6",      st.str6);
-      io.mapRequired("str7",      st.str7);
-      io.mapRequired("str8",      st.str8);
-      io.mapRequired("str9",      st.str9);
-      io.mapRequired("str10",     st.str10);
-      io.mapRequired("str11",     st.str11);
-      io.mapRequired("stdstr1",   st.stdstr1);
-      io.mapRequired("stdstr2",   st.stdstr2);
-      io.mapRequired("stdstr3",   st.stdstr3);
-      io.mapRequired("stdstr4",   st.stdstr4);
-      io.mapRequired("stdstr5",   st.stdstr5);
-      io.mapRequired("stdstr6",   st.stdstr6);
-      io.mapRequired("stdstr7",   st.stdstr7);
-      io.mapRequired("stdstr8",   st.stdstr8);
-      io.mapRequired("stdstr9",   st.stdstr9);
-      io.mapRequired("stdstr10",  st.stdstr10);
-      io.mapRequired("stdstr11",  st.stdstr11);
-      io.mapRequired("stdstr12",  st.stdstr12);
-      io.mapRequired("stdstr13",  st.stdstr13);
-    }
-  };
-}
-}
-
-TEST(YAMLIO, TestReadWriteStringTypes) {
-  std::string intermediate;
-  {
-    StringTypes map;
-    map.str1 = "'aaa";
-    map.str2 = "\"bbb";
-    map.str3 = "`ccc";
-    map.str4 = "@ddd";
-    map.str5 = "";
-    map.str6 = "0000000004000000";
-    map.str7 = "true";
-    map.str8 = "FALSE";
-    map.str9 = "~";
-    map.str10 = "0.2e20";
-    map.str11 = "0x30";
-    map.stdstr1 = "'eee";
-    map.stdstr2 = "\"fff";
-    map.stdstr3 = "`ggg";
-    map.stdstr4 = "@hhh";
-    map.stdstr5 = "";
-    map.stdstr6 = "0000000004000000";
-    map.stdstr7 = "true";
-    map.stdstr8 = "FALSE";
-    map.stdstr9 = "~";
-    map.stdstr10 = "0.2e20";
-    map.stdstr11 = "0x30";
-    map.stdstr12 = "- match";
-    map.stdstr13.assign("\0a\0b\0", 5);
-
-    llvm::raw_string_ostream ostr(intermediate);
-    Output yout(ostr);
-    yout << map;
-  }
-
-  llvm::StringRef flowOut(intermediate);
-  EXPECT_NE(llvm::StringRef::npos, flowOut.find("'''aaa"));
-  EXPECT_NE(llvm::StringRef::npos, flowOut.find("'\"bbb'"));
-  EXPECT_NE(llvm::StringRef::npos, flowOut.find("'`ccc'"));
-  EXPECT_NE(llvm::StringRef::npos, flowOut.find("'@ddd'"));
-  EXPECT_NE(llvm::StringRef::npos, flowOut.find("''\n"));
-  EXPECT_NE(llvm::StringRef::npos, flowOut.find("'0000000004000000'\n"));
-  EXPECT_NE(llvm::StringRef::npos, flowOut.find("'true'\n"));
-  EXPECT_NE(llvm::StringRef::npos, flowOut.find("'FALSE'\n"));
-  EXPECT_NE(llvm::StringRef::npos, flowOut.find("'~'\n"));
-  EXPECT_NE(llvm::StringRef::npos, flowOut.find("'0.2e20'\n"));
-  EXPECT_NE(llvm::StringRef::npos, flowOut.find("'0x30'\n"));
-  EXPECT_NE(llvm::StringRef::npos, flowOut.find("'- match'\n"));
-  EXPECT_NE(std::string::npos, flowOut.find("'''eee"));
-  EXPECT_NE(std::string::npos, flowOut.find("'\"fff'"));
-  EXPECT_NE(std::string::npos, flowOut.find("'`ggg'"));
-  EXPECT_NE(std::string::npos, flowOut.find("'@hhh'"));
-  EXPECT_NE(std::string::npos, flowOut.find("''\n"));
-  EXPECT_NE(std::string::npos, flowOut.find("'0000000004000000'\n"));
-  EXPECT_NE(std::string::npos, flowOut.find("\"\\0a\\0b\\0\""));
-
-  {
-    Input yin(intermediate);
-    StringTypes map;
-    yin >> map;
-
-    EXPECT_FALSE(yin.error());
-    EXPECT_TRUE(map.str1.equals("'aaa"));
-    EXPECT_TRUE(map.str2.equals("\"bbb"));
-    EXPECT_TRUE(map.str3.equals("`ccc"));
-    EXPECT_TRUE(map.str4.equals("@ddd"));
-    EXPECT_TRUE(map.str5.equals(""));
-    EXPECT_TRUE(map.str6.equals("0000000004000000"));
-    EXPECT_TRUE(map.stdstr1 == "'eee");
-    EXPECT_TRUE(map.stdstr2 == "\"fff");
-    EXPECT_TRUE(map.stdstr3 == "`ggg");
-    EXPECT_TRUE(map.stdstr4 == "@hhh");
-    EXPECT_TRUE(map.stdstr5 == "");
-    EXPECT_TRUE(map.stdstr6 == "0000000004000000");
-    EXPECT_EQ(std::string("\0a\0b\0", 5), map.stdstr13);
-  }
-}
-
-//===----------------------------------------------------------------------===//
-//  Test ScalarEnumerationTraits
-//===----------------------------------------------------------------------===//
-
-enum Colors {
-    cRed,
-    cBlue,
-    cGreen,
-    cYellow
-};
-
-struct ColorMap {
-  Colors      c1;
-  Colors      c2;
-  Colors      c3;
-  Colors      c4;
-  Colors      c5;
-  Colors      c6;
-};
-
-namespace llvm {
-namespace yaml {
-  template <>
-  struct ScalarEnumerationTraits<Colors> {
-    static void enumeration(IO &io, Colors &value) {
-      io.enumCase(value, "red",   cRed);
-      io.enumCase(value, "blue",  cBlue);
-      io.enumCase(value, "green", cGreen);
-      io.enumCase(value, "yellow",cYellow);
-    }
-  };
-  template <>
-  struct MappingTraits<ColorMap> {
-    static void mapping(IO &io, ColorMap& c) {
-      io.mapRequired("c1", c.c1);
-      io.mapRequired("c2", c.c2);
-      io.mapRequired("c3", c.c3);
-      io.mapOptional("c4", c.c4, cBlue);   // supplies default
-      io.mapOptional("c5", c.c5, cYellow); // supplies default
-      io.mapOptional("c6", c.c6, cRed);    // supplies default
-    }
-  };
-}
-}
-
-
-//
-// Test reading enumerated scalars
-//
-TEST(YAMLIO, TestEnumRead) {
-  ColorMap map;
-  Input yin("---\n"
-            "c1:  blue\n"
-            "c2:  red\n"
-            "c3:  green\n"
-            "c5:  yellow\n"
-            "...\n");
-  yin >> map;
-
-  EXPECT_FALSE(yin.error());
-  EXPECT_EQ(cBlue,  map.c1);
-  EXPECT_EQ(cRed,   map.c2);
-  EXPECT_EQ(cGreen, map.c3);
-  EXPECT_EQ(cBlue,  map.c4);  // tests default
-  EXPECT_EQ(cYellow,map.c5);  // tests overridden
-  EXPECT_EQ(cRed,   map.c6);  // tests default
-}
-
-
-
-//===----------------------------------------------------------------------===//
-//  Test ScalarBitSetTraits
-//===----------------------------------------------------------------------===//
-
-enum MyFlags {
-  flagNone    = 0,
-  flagBig     = 1 << 0,
-  flagFlat    = 1 << 1,
-  flagRound   = 1 << 2,
-  flagPointy  = 1 << 3
-};
-inline MyFlags operator|(MyFlags a, MyFlags b) {
-  return static_cast<MyFlags>(
-                      static_cast<uint32_t>(a) | static_cast<uint32_t>(b));
-}
-
-struct FlagsMap {
-  MyFlags     f1;
-  MyFlags     f2;
-  MyFlags     f3;
-  MyFlags     f4;
-};
-
-
-namespace llvm {
-namespace yaml {
-  template <>
-  struct ScalarBitSetTraits<MyFlags> {
-    static void bitset(IO &io, MyFlags &value) {
-      io.bitSetCase(value, "big",   flagBig);
-      io.bitSetCase(value, "flat",  flagFlat);
-      io.bitSetCase(value, "round", flagRound);
-      io.bitSetCase(value, "pointy",flagPointy);
-    }
-  };
-  template <>
-  struct MappingTraits<FlagsMap> {
-    static void mapping(IO &io, FlagsMap& c) {
-      io.mapRequired("f1", c.f1);
-      io.mapRequired("f2", c.f2);
-      io.mapRequired("f3", c.f3);
-      io.mapOptional("f4", c.f4, flagRound);
-     }
-  };
-}
-}
-
-
-//
-// Test reading flow sequence representing bit-mask values
-//
-TEST(YAMLIO, TestFlagsRead) {
-  FlagsMap map;
-  Input yin("---\n"
-            "f1:  [ big ]\n"
-            "f2:  [ round, flat ]\n"
-            "f3:  []\n"
-            "...\n");
-  yin >> map;
-
-  EXPECT_FALSE(yin.error());
-  EXPECT_EQ(flagBig,              map.f1);
-  EXPECT_EQ(flagRound|flagFlat,   map.f2);
-  EXPECT_EQ(flagNone,             map.f3);  // check empty set
-  EXPECT_EQ(flagRound,            map.f4);  // check optional key
-}
-
-
-//
-// Test writing then reading back bit-mask values
-//
-TEST(YAMLIO, TestReadWriteFlags) {
-  std::string intermediate;
-  {
-    FlagsMap map;
-    map.f1 = flagBig;
-    map.f2 = flagRound | flagFlat;
-    map.f3 = flagNone;
-    map.f4 = flagNone;
-
-    llvm::raw_string_ostream ostr(intermediate);
-    Output yout(ostr);
-    yout << map;
-  }
-
-  {
-    Input yin(intermediate);
-    FlagsMap map2;
-    yin >> map2;
-
-    EXPECT_FALSE(yin.error());
-    EXPECT_EQ(flagBig,              map2.f1);
-    EXPECT_EQ(flagRound|flagFlat,   map2.f2);
-    EXPECT_EQ(flagNone,             map2.f3);
-    //EXPECT_EQ(flagRound,            map2.f4);  // check optional key
-  }
-}
-
-
-
-//===----------------------------------------------------------------------===//
-//  Test ScalarTraits
-//===----------------------------------------------------------------------===//
-
-struct MyCustomType {
-  int length;
-  int width;
-};
-
-struct MyCustomTypeMap {
-  MyCustomType     f1;
-  MyCustomType     f2;
-  int              f3;
-};
-
-
-namespace llvm {
-namespace yaml {
-  template <>
-  struct MappingTraits<MyCustomTypeMap> {
-    static void mapping(IO &io, MyCustomTypeMap& s) {
-      io.mapRequired("f1", s.f1);
-      io.mapRequired("f2", s.f2);
-      io.mapRequired("f3", s.f3);
-     }
-  };
-  // MyCustomType is formatted as a yaml scalar.  A value of
-  // {length=3, width=4} would be represented in yaml as "3 by 4".
-  template<>
-  struct ScalarTraits<MyCustomType> {
-    static void output(const MyCustomType &value, void* ctxt, llvm::raw_ostream &out) {
-      out << llvm::format("%d by %d", value.length, value.width);
-    }
-    static StringRef input(StringRef scalar, void* ctxt, MyCustomType &value) {
-      size_t byStart = scalar.find("by");
-      if ( byStart != StringRef::npos ) {
-        StringRef lenStr = scalar.slice(0, byStart);
-        lenStr = lenStr.rtrim();
-        if ( lenStr.getAsInteger(0, value.length) ) {
-          return "malformed length";
-        }
-        StringRef widthStr = scalar.drop_front(byStart+2);
-        widthStr = widthStr.ltrim();
-        if ( widthStr.getAsInteger(0, value.width) ) {
-          return "malformed width";
-        }
-        return StringRef();
-      }
-      else {
-          return "malformed by";
-      }
-    }
-    static QuotingType mustQuote(StringRef) { return QuotingType::Single; }
-  };
-}
-}
-
-
-//
-// Test writing then reading back custom values
-//
-TEST(YAMLIO, TestReadWriteMyCustomType) {
-  std::string intermediate;
-  {
-    MyCustomTypeMap map;
-    map.f1.length = 1;
-    map.f1.width  = 4;
-    map.f2.length = 100;
-    map.f2.width  = 400;
-    map.f3 = 10;
-
-    llvm::raw_string_ostream ostr(intermediate);
-    Output yout(ostr);
-    yout << map;
-  }
-
-  {
-    Input yin(intermediate);
-    MyCustomTypeMap map2;
-    yin >> map2;
-
-    EXPECT_FALSE(yin.error());
-    EXPECT_EQ(1,      map2.f1.length);
-    EXPECT_EQ(4,      map2.f1.width);
-    EXPECT_EQ(100,    map2.f2.length);
-    EXPECT_EQ(400,    map2.f2.width);
-    EXPECT_EQ(10,     map2.f3);
-  }
-}
-
-
-//===----------------------------------------------------------------------===//
-//  Test BlockScalarTraits
-//===----------------------------------------------------------------------===//
-
-struct MultilineStringType {
-  std::string str;
-};
-
-struct MultilineStringTypeMap {
-  MultilineStringType name;
-  MultilineStringType description;
-  MultilineStringType ingredients;
-  MultilineStringType recipes;
-  MultilineStringType warningLabels;
-  MultilineStringType documentation;
-  int price;
-};
-
-namespace llvm {
-namespace yaml {
-  template <>
-  struct MappingTraits<MultilineStringTypeMap> {
-    static void mapping(IO &io, MultilineStringTypeMap& s) {
-      io.mapRequired("name", s.name);
-      io.mapRequired("description", s.description);
-      io.mapRequired("ingredients", s.ingredients);
-      io.mapRequired("recipes", s.recipes);
-      io.mapRequired("warningLabels", s.warningLabels);
-      io.mapRequired("documentation", s.documentation);
-      io.mapRequired("price", s.price);
-     }
-  };
-
-  // MultilineStringType is formatted as a yaml block literal scalar. A value of
-  // "Hello\nWorld" would be represented in yaml as
-  //  |
-  //    Hello
-  //    World
-  template <>
-  struct BlockScalarTraits<MultilineStringType> {
-    static void output(const MultilineStringType &value, void *ctxt,
-                       llvm::raw_ostream &out) {
-      out << value.str;
-    }
-    static StringRef input(StringRef scalar, void *ctxt,
-                           MultilineStringType &value) {
-      value.str = scalar.str();
-      return StringRef();
-    }
-  };
-}
-}
-
-LLVM_YAML_IS_DOCUMENT_LIST_VECTOR(MultilineStringType)
-
-//
-// Test writing then reading back custom values
-//
-TEST(YAMLIO, TestReadWriteMultilineStringType) {
-  std::string intermediate;
-  {
-    MultilineStringTypeMap map;
-    map.name.str = "An Item";
-    map.description.str = "Hello\nWorld";
-    map.ingredients.str = "SubItem 1\nSub Item 2\n\nSub Item 3\n";
-    map.recipes.str = "\n\nTest 1\n\n\n";
-    map.warningLabels.str = "";
-    map.documentation.str = "\n\n";
-    map.price = 350;
-
-    llvm::raw_string_ostream ostr(intermediate);
-    Output yout(ostr);
-    yout << map;
-  }
-  {
-    Input yin(intermediate);
-    MultilineStringTypeMap map2;
-    yin >> map2;
-
-    EXPECT_FALSE(yin.error());
-    EXPECT_EQ(map2.name.str, "An Item\n");
-    EXPECT_EQ(map2.description.str, "Hello\nWorld\n");
-    EXPECT_EQ(map2.ingredients.str, "SubItem 1\nSub Item 2\n\nSub Item 3\n");
-    EXPECT_EQ(map2.recipes.str, "\n\nTest 1\n");
-    EXPECT_TRUE(map2.warningLabels.str.empty());
-    EXPECT_TRUE(map2.documentation.str.empty());
-    EXPECT_EQ(map2.price, 350);
-  }
-}
-
-//
-// Test writing then reading back custom values
-//
-TEST(YAMLIO, TestReadWriteBlockScalarDocuments) {
-  std::string intermediate;
-  {
-    std::vector<MultilineStringType> documents;
-    MultilineStringType doc;
-    doc.str = "Hello\nWorld";
-    documents.push_back(doc);
-
-    llvm::raw_string_ostream ostr(intermediate);
-    Output yout(ostr);
-    yout << documents;
-
-    // Verify that the block scalar header was written out on the same line
-    // as the document marker.
-    EXPECT_NE(llvm::StringRef::npos, llvm::StringRef(ostr.str()).find("--- |"));
-  }
-  {
-    Input yin(intermediate);
-    std::vector<MultilineStringType> documents2;
-    yin >> documents2;
-
-    EXPECT_FALSE(yin.error());
-    EXPECT_EQ(documents2.size(), size_t(1));
-    EXPECT_EQ(documents2[0].str, "Hello\nWorld\n");
-  }
-}
-
-TEST(YAMLIO, TestReadWriteBlockScalarValue) {
-  std::string intermediate;
-  {
-    MultilineStringType doc;
-    doc.str = "Just a block\nscalar doc";
-
-    llvm::raw_string_ostream ostr(intermediate);
-    Output yout(ostr);
-    yout << doc;
-  }
-  {
-    Input yin(intermediate);
-    MultilineStringType doc;
-    yin >> doc;
-
-    EXPECT_FALSE(yin.error());
-    EXPECT_EQ(doc.str, "Just a block\nscalar doc\n");
-  }
-}
-
-//===----------------------------------------------------------------------===//
-//  Test flow sequences
-//===----------------------------------------------------------------------===//
-
-LLVM_YAML_STRONG_TYPEDEF(int, MyNumber)
-LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(MyNumber)
-LLVM_YAML_STRONG_TYPEDEF(llvm::StringRef, MyString)
-LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(MyString)
-
-namespace llvm {
-namespace yaml {
-  template<>
-  struct ScalarTraits<MyNumber> {
-    static void output(const MyNumber &value, void *, llvm::raw_ostream &out) {
-      out << value;
-    }
-
-    static StringRef input(StringRef scalar, void *, MyNumber &value) {
-      long long n;
-      if ( getAsSignedInteger(scalar, 0, n) )
-        return "invalid number";
-      value = n;
-      return StringRef();
-    }
-
-    static QuotingType mustQuote(StringRef) { return QuotingType::None; }
-  };
-
-  template <> struct ScalarTraits<MyString> {
-    using Impl = ScalarTraits<StringRef>;
-    static void output(const MyString &V, void *Ctx, raw_ostream &OS) {
-      Impl::output(V, Ctx, OS);
-    }
-    static StringRef input(StringRef S, void *Ctx, MyString &V) {
-      return Impl::input(S, Ctx, V.value);
-    }
-    static QuotingType mustQuote(StringRef S) {
-      return Impl::mustQuote(S);
-    }
-  };
-}
-}
-
-struct NameAndNumbers {
-  llvm::StringRef               name;
-  std::vector<MyString>         strings;
-  std::vector<MyNumber>         single;
-  std::vector<MyNumber>         numbers;
-};
-
-namespace llvm {
-namespace yaml {
-  template <>
-  struct MappingTraits<NameAndNumbers> {
-    static void mapping(IO &io, NameAndNumbers& nn) {
-      io.mapRequired("name",     nn.name);
-      io.mapRequired("strings",  nn.strings);
-      io.mapRequired("single",   nn.single);
-      io.mapRequired("numbers",  nn.numbers);
-    }
-  };
-}
-}
-
-typedef std::vector<MyNumber> MyNumberFlowSequence;
-
-LLVM_YAML_IS_SEQUENCE_VECTOR(MyNumberFlowSequence)
-
-struct NameAndNumbersFlow {
-  llvm::StringRef                    name;
-  std::vector<MyNumberFlowSequence>  sequenceOfNumbers;
-};
-
-namespace llvm {
-namespace yaml {
-  template <>
-  struct MappingTraits<NameAndNumbersFlow> {
-    static void mapping(IO &io, NameAndNumbersFlow& nn) {
-      io.mapRequired("name",     nn.name);
-      io.mapRequired("sequenceOfNumbers",  nn.sequenceOfNumbers);
-    }
-  };
-}
-}
-
-//
-// Test writing then reading back custom values
-//
-TEST(YAMLIO, TestReadWriteMyFlowSequence) {
-  std::string intermediate;
-  {
-    NameAndNumbers map;
-    map.name  = "hello";
-    map.strings.push_back(llvm::StringRef("one"));
-    map.strings.push_back(llvm::StringRef("two"));
-    map.single.push_back(1);
-    map.numbers.push_back(10);
-    map.numbers.push_back(-30);
-    map.numbers.push_back(1024);
-
-    llvm::raw_string_ostream ostr(intermediate);
-    Output yout(ostr);
-    yout << map;
-
-    // Verify sequences were written in flow style
-    ostr.flush();
-    llvm::StringRef flowOut(intermediate);
-    EXPECT_NE(llvm::StringRef::npos, flowOut.find("one, two"));
-    EXPECT_NE(llvm::StringRef::npos, flowOut.find("10, -30, 1024"));
-  }
-
-  {
-    Input yin(intermediate);
-    NameAndNumbers map2;
-    yin >> map2;
-
-    EXPECT_FALSE(yin.error());
-    EXPECT_TRUE(map2.name.equals("hello"));
-    EXPECT_EQ(map2.strings.size(), 2UL);
-    EXPECT_TRUE(map2.strings[0].value.equals("one"));
-    EXPECT_TRUE(map2.strings[1].value.equals("two"));
-    EXPECT_EQ(map2.single.size(), 1UL);
-    EXPECT_EQ(1,       map2.single[0]);
-    EXPECT_EQ(map2.numbers.size(), 3UL);
-    EXPECT_EQ(10,      map2.numbers[0]);
-    EXPECT_EQ(-30,     map2.numbers[1]);
-    EXPECT_EQ(1024,    map2.numbers[2]);
-  }
-}
-
-
-//
-// Test writing then reading back a sequence of flow sequences.
-//
-TEST(YAMLIO, TestReadWriteSequenceOfMyFlowSequence) {
-  std::string intermediate;
-  {
-    NameAndNumbersFlow map;
-    map.name  = "hello";
-    MyNumberFlowSequence single = { 0 };
-    MyNumberFlowSequence numbers = { 12, 1, -512 };
-    map.sequenceOfNumbers.push_back(single);
-    map.sequenceOfNumbers.push_back(numbers);
-    map.sequenceOfNumbers.push_back(MyNumberFlowSequence());
-
-    llvm::raw_string_ostream ostr(intermediate);
-    Output yout(ostr);
-    yout << map;
-
-    // Verify sequences were written in flow style
-    // and that the parent sequence used '-'.
-    ostr.flush();
-    llvm::StringRef flowOut(intermediate);
-    EXPECT_NE(llvm::StringRef::npos, flowOut.find("- [ 0 ]"));
-    EXPECT_NE(llvm::StringRef::npos, flowOut.find("- [ 12, 1, -512 ]"));
-    EXPECT_NE(llvm::StringRef::npos, flowOut.find("- [  ]"));
-  }
-
-  {
-    Input yin(intermediate);
-    NameAndNumbersFlow map2;
-    yin >> map2;
-
-    EXPECT_FALSE(yin.error());
-    EXPECT_TRUE(map2.name.equals("hello"));
-    EXPECT_EQ(map2.sequenceOfNumbers.size(), 3UL);
-    EXPECT_EQ(map2.sequenceOfNumbers[0].size(), 1UL);
-    EXPECT_EQ(0,    map2.sequenceOfNumbers[0][0]);
-    EXPECT_EQ(map2.sequenceOfNumbers[1].size(), 3UL);
-    EXPECT_EQ(12,   map2.sequenceOfNumbers[1][0]);
-    EXPECT_EQ(1,    map2.sequenceOfNumbers[1][1]);
-    EXPECT_EQ(-512, map2.sequenceOfNumbers[1][2]);
-    EXPECT_TRUE(map2.sequenceOfNumbers[2].empty());
-  }
-}
-
-//===----------------------------------------------------------------------===//
-//  Test normalizing/denormalizing
-//===----------------------------------------------------------------------===//
-
-LLVM_YAML_STRONG_TYPEDEF(uint32_t, TotalSeconds)
-
-typedef std::vector<TotalSeconds> SecondsSequence;
-
-LLVM_YAML_IS_SEQUENCE_VECTOR(TotalSeconds)
-
-
-namespace llvm {
-namespace yaml {
-  template <>
-  struct MappingTraits<TotalSeconds> {
-
-    class NormalizedSeconds {
-    public:
-      NormalizedSeconds(IO &io)
-        : hours(0), minutes(0), seconds(0) {
-      }
-      NormalizedSeconds(IO &, TotalSeconds &secs)
-        : hours(secs/3600),
-          minutes((secs - (hours*3600))/60),
-          seconds(secs % 60) {
-      }
-      TotalSeconds denormalize(IO &) {
-        return TotalSeconds(hours*3600 + minutes*60 + seconds);
-      }
-
-      uint32_t     hours;
-      uint8_t      minutes;
-      uint8_t      seconds;
-    };
-
-    static void mapping(IO &io, TotalSeconds &secs) {
-      MappingNormalization<NormalizedSeconds, TotalSeconds> keys(io, secs);
-
-      io.mapOptional("hours", keys->hours, 0);
-      io.mapOptional("minutes", keys->minutes, 0);
-      io.mapRequired("seconds",  keys->seconds);
-    }
-  };
-}
-}
-
-
-//
-// Test the reading of a yaml sequence of mappings
-//
-TEST(YAMLIO, TestReadMySecondsSequence) {
-  SecondsSequence seq;
-  Input yin("---\n - hours:  1\n   seconds:  5\n - seconds:  59\n...\n");
-  yin >> seq;
-
-  EXPECT_FALSE(yin.error());
-  EXPECT_EQ(seq.size(), 2UL);
-  EXPECT_EQ(seq[0], 3605U);
-  EXPECT_EQ(seq[1], 59U);
-}
-
-
-//
-// Test writing then reading back custom values
-//
-TEST(YAMLIO, TestReadWriteMySecondsSequence) {
-  std::string intermediate;
-  {
-    SecondsSequence seq;
-    seq.push_back(4000);
-    seq.push_back(500);
-    seq.push_back(59);
-
-    llvm::raw_string_ostream ostr(intermediate);
-    Output yout(ostr);
-    yout << seq;
-  }
-  {
-    Input yin(intermediate);
-    SecondsSequence seq2;
-    yin >> seq2;
-
-    EXPECT_FALSE(yin.error());
-    EXPECT_EQ(seq2.size(), 3UL);
-    EXPECT_EQ(seq2[0], 4000U);
-    EXPECT_EQ(seq2[1], 500U);
-    EXPECT_EQ(seq2[2], 59U);
-  }
-}
-
-
-//===----------------------------------------------------------------------===//
-//  Test dynamic typing
-//===----------------------------------------------------------------------===//
-
-enum AFlags {
-    a1,
-    a2,
-    a3
-};
-
-enum BFlags {
-    b1,
-    b2,
-    b3
-};
-
-enum Kind {
-    kindA,
-    kindB
-};
-
-struct KindAndFlags {
-  KindAndFlags() : kind(kindA), flags(0) { }
-  KindAndFlags(Kind k, uint32_t f) : kind(k), flags(f) { }
-  Kind        kind;
-  uint32_t    flags;
-};
-
-typedef std::vector<KindAndFlags> KindAndFlagsSequence;
-
-LLVM_YAML_IS_SEQUENCE_VECTOR(KindAndFlags)
-
-namespace llvm {
-namespace yaml {
-  template <>
-  struct ScalarEnumerationTraits<AFlags> {
-    static void enumeration(IO &io, AFlags &value) {
-      io.enumCase(value, "a1",  a1);
-      io.enumCase(value, "a2",  a2);
-      io.enumCase(value, "a3",  a3);
-    }
-  };
-  template <>
-  struct ScalarEnumerationTraits<BFlags> {
-    static void enumeration(IO &io, BFlags &value) {
-      io.enumCase(value, "b1",  b1);
-      io.enumCase(value, "b2",  b2);
-      io.enumCase(value, "b3",  b3);
-    }
-  };
-  template <>
-  struct ScalarEnumerationTraits<Kind> {
-    static void enumeration(IO &io, Kind &value) {
-      io.enumCase(value, "A",  kindA);
-      io.enumCase(value, "B",  kindB);
-    }
-  };
-  template <>
-  struct MappingTraits<KindAndFlags> {
-    static void mapping(IO &io, KindAndFlags& kf) {
-      io.mapRequired("kind",  kf.kind);
-      // Type of "flags" field varies depending on "kind" field.
-      // Use memcpy here to avoid breaking strict aliasing rules.
-      if (kf.kind == kindA) {
-        AFlags aflags = static_cast<AFlags>(kf.flags);
-        io.mapRequired("flags", aflags);
-        kf.flags = aflags;
-      } else {
-        BFlags bflags = static_cast<BFlags>(kf.flags);
-        io.mapRequired("flags", bflags);
-        kf.flags = bflags;
-      }
-    }
-  };
-}
-}
-
-
-//
-// Test the reading of a yaml sequence dynamic types
-//
-TEST(YAMLIO, TestReadKindAndFlagsSequence) {
-  KindAndFlagsSequence seq;
-  Input yin("---\n - kind:  A\n   flags:  a2\n - kind:  B\n   flags:  b1\n...\n");
-  yin >> seq;
-
-  EXPECT_FALSE(yin.error());
-  EXPECT_EQ(seq.size(), 2UL);
-  EXPECT_EQ(seq[0].kind,  kindA);
-  EXPECT_EQ(seq[0].flags, (uint32_t)a2);
-  EXPECT_EQ(seq[1].kind,  kindB);
-  EXPECT_EQ(seq[1].flags, (uint32_t)b1);
-}
-
-//
-// Test writing then reading back dynamic types
-//
-TEST(YAMLIO, TestReadWriteKindAndFlagsSequence) {
-  std::string intermediate;
-  {
-    KindAndFlagsSequence seq;
-    seq.push_back(KindAndFlags(kindA,a1));
-    seq.push_back(KindAndFlags(kindB,b1));
-    seq.push_back(KindAndFlags(kindA,a2));
-    seq.push_back(KindAndFlags(kindB,b2));
-    seq.push_back(KindAndFlags(kindA,a3));
-
-    llvm::raw_string_ostream ostr(intermediate);
-    Output yout(ostr);
-    yout << seq;
-  }
-  {
-    Input yin(intermediate);
-    KindAndFlagsSequence seq2;
-    yin >> seq2;
-
-    EXPECT_FALSE(yin.error());
-    EXPECT_EQ(seq2.size(), 5UL);
-    EXPECT_EQ(seq2[0].kind,  kindA);
-    EXPECT_EQ(seq2[0].flags, (uint32_t)a1);
-    EXPECT_EQ(seq2[1].kind,  kindB);
-    EXPECT_EQ(seq2[1].flags, (uint32_t)b1);
-    EXPECT_EQ(seq2[2].kind,  kindA);
-    EXPECT_EQ(seq2[2].flags, (uint32_t)a2);
-    EXPECT_EQ(seq2[3].kind,  kindB);
-    EXPECT_EQ(seq2[3].flags, (uint32_t)b2);
-    EXPECT_EQ(seq2[4].kind,  kindA);
-    EXPECT_EQ(seq2[4].flags, (uint32_t)a3);
-  }
-}
-
-
-//===----------------------------------------------------------------------===//
-//  Test document list
-//===----------------------------------------------------------------------===//
-
-struct FooBarMap {
-  int foo;
-  int bar;
-};
-typedef std::vector<FooBarMap> FooBarMapDocumentList;
-
-LLVM_YAML_IS_DOCUMENT_LIST_VECTOR(FooBarMap)
-
-
-namespace llvm {
-namespace yaml {
-  template <>
-  struct MappingTraits<FooBarMap> {
-    static void mapping(IO &io, FooBarMap& fb) {
-      io.mapRequired("foo",    fb.foo);
-      io.mapRequired("bar",    fb.bar);
-    }
-  };
-}
-}
-
-
-//
-// Test the reading of a yaml mapping
-//
-TEST(YAMLIO, TestDocRead) {
-  FooBarMap doc;
-  Input yin("---\nfoo:  3\nbar:  5\n...\n");
-  yin >> doc;
-
-  EXPECT_FALSE(yin.error());
-  EXPECT_EQ(doc.foo, 3);
-  EXPECT_EQ(doc.bar,5);
-}
-
-
-
-//
-// Test writing then reading back a sequence of mappings
-//
-TEST(YAMLIO, TestSequenceDocListWriteAndRead) {
-  std::string intermediate;
-  {
-    FooBarMap doc1;
-    doc1.foo = 10;
-    doc1.bar = -3;
-    FooBarMap doc2;
-    doc2.foo = 257;
-    doc2.bar = 0;
-    std::vector<FooBarMap> docList;
-    docList.push_back(doc1);
-    docList.push_back(doc2);
-
-    llvm::raw_string_ostream ostr(intermediate);
-    Output yout(ostr);
-    yout << docList;
-  }
-
-
-  {
-    Input yin(intermediate);
-    std::vector<FooBarMap> docList2;
-    yin >> docList2;
-
-    EXPECT_FALSE(yin.error());
-    EXPECT_EQ(docList2.size(), 2UL);
-    FooBarMap& map1 = docList2[0];
-    FooBarMap& map2 = docList2[1];
-    EXPECT_EQ(map1.foo, 10);
-    EXPECT_EQ(map1.bar, -3);
-    EXPECT_EQ(map2.foo, 257);
-    EXPECT_EQ(map2.bar, 0);
-  }
-}
-
-//===----------------------------------------------------------------------===//
-//  Test document tags
-//===----------------------------------------------------------------------===//
-
-struct MyDouble {
-  MyDouble() : value(0.0) { }
-  MyDouble(double x) : value(x) { }
-  double value;
-};
-
-LLVM_YAML_IS_DOCUMENT_LIST_VECTOR(MyDouble)
-
-
-namespace llvm {
-namespace yaml {
-  template <>
-  struct MappingTraits<MyDouble> {
-    static void mapping(IO &io, MyDouble &d) {
-      if (io.mapTag("!decimal", true)) {
-        mappingDecimal(io, d);
-      } else if (io.mapTag("!fraction")) {
-        mappingFraction(io, d);
-      }
-    }
-    static void mappingDecimal(IO &io, MyDouble &d) {
-      io.mapRequired("value", d.value);
-    }
-    static void mappingFraction(IO &io, MyDouble &d) {
-        double num, denom;
-        io.mapRequired("numerator",      num);
-        io.mapRequired("denominator",    denom);
-        // convert fraction to double
-        d.value = num/denom;
-    }
-  };
- }
-}
-
-
-//
-// Test the reading of two different tagged yaml documents.
-//
-TEST(YAMLIO, TestTaggedDocuments) {
-  std::vector<MyDouble> docList;
-  Input yin("--- !decimal\nvalue:  3.0\n"
-            "--- !fraction\nnumerator:  9.0\ndenominator:  2\n...\n");
-  yin >> docList;
-  EXPECT_FALSE(yin.error());
-  EXPECT_EQ(docList.size(), 2UL);
-  EXPECT_EQ(docList[0].value, 3.0);
-  EXPECT_EQ(docList[1].value, 4.5);
-}
-
-
-
-//
-// Test writing then reading back tagged documents
-//
-TEST(YAMLIO, TestTaggedDocumentsWriteAndRead) {
-  std::string intermediate;
-  {
-    MyDouble a(10.25);
-    MyDouble b(-3.75);
-    std::vector<MyDouble> docList;
-    docList.push_back(a);
-    docList.push_back(b);
-
-    llvm::raw_string_ostream ostr(intermediate);
-    Output yout(ostr);
-    yout << docList;
-  }
-
-  {
-    Input yin(intermediate);
-    std::vector<MyDouble> docList2;
-    yin >> docList2;
-
-    EXPECT_FALSE(yin.error());
-    EXPECT_EQ(docList2.size(), 2UL);
-    EXPECT_EQ(docList2[0].value, 10.25);
-    EXPECT_EQ(docList2[1].value, -3.75);
-  }
-}
-
-
-//===----------------------------------------------------------------------===//
-//  Test mapping validation
-//===----------------------------------------------------------------------===//
-
-struct MyValidation {
-  double value;
-};
-
-LLVM_YAML_IS_DOCUMENT_LIST_VECTOR(MyValidation)
-
-namespace llvm {
-namespace yaml {
-  template <>
-  struct MappingTraits<MyValidation> {
-    static void mapping(IO &io, MyValidation &d) {
-        io.mapRequired("value", d.value);
-    }
-    static std::string validate(IO &io, MyValidation &d) {
-        if (d.value < 0)
-          return "negative value";
-        return {};
-    }
-  };
- }
-}
-
-
-//
-// Test that validate() is called and complains about the negative value.
-//
-TEST(YAMLIO, TestValidatingInput) {
-  std::vector<MyValidation> docList;
-  Input yin("--- \nvalue:  3.0\n"
-            "--- \nvalue:  -1.0\n...\n",
-            nullptr, suppressErrorMessages);
-  yin >> docList;
-  EXPECT_TRUE(!!yin.error());
-}
-
-//===----------------------------------------------------------------------===//
-//  Test flow mapping
-//===----------------------------------------------------------------------===//
-
-struct FlowFooBar {
-  int foo;
-  int bar;
-
-  FlowFooBar() : foo(0), bar(0) {}
-  FlowFooBar(int foo, int bar) : foo(foo), bar(bar) {}
-};
-
-typedef std::vector<FlowFooBar> FlowFooBarSequence;
-
-LLVM_YAML_IS_SEQUENCE_VECTOR(FlowFooBar)
-
-struct FlowFooBarDoc {
-  FlowFooBar attribute;
-  FlowFooBarSequence seq;
-};
-
-namespace llvm {
-namespace yaml {
-  template <>
-  struct MappingTraits<FlowFooBar> {
-    static void mapping(IO &io, FlowFooBar &fb) {
-      io.mapRequired("foo", fb.foo);
-      io.mapRequired("bar", fb.bar);
-    }
-
-    static const bool flow = true;
-  };
-
-  template <>
-  struct MappingTraits<FlowFooBarDoc> {
-    static void mapping(IO &io, FlowFooBarDoc &fb) {
-      io.mapRequired("attribute", fb.attribute);
-      io.mapRequired("seq", fb.seq);
-    }
-  };
-}
-}
-
-//
-// Test writing then reading back custom mappings
-//
-TEST(YAMLIO, TestReadWriteMyFlowMapping) {
-  std::string intermediate;
-  {
-    FlowFooBarDoc doc;
-    doc.attribute = FlowFooBar(42, 907);
-    doc.seq.push_back(FlowFooBar(1, 2));
-    doc.seq.push_back(FlowFooBar(0, 0));
-    doc.seq.push_back(FlowFooBar(-1, 1024));
-
-    llvm::raw_string_ostream ostr(intermediate);
-    Output yout(ostr);
-    yout << doc;
-
-    // Verify that mappings were written in flow style
-    ostr.flush();
-    llvm::StringRef flowOut(intermediate);
-    EXPECT_NE(llvm::StringRef::npos, flowOut.find("{ foo: 42, bar: 907 }"));
-    EXPECT_NE(llvm::StringRef::npos, flowOut.find("- { foo: 1, bar: 2 }"));
-    EXPECT_NE(llvm::StringRef::npos, flowOut.find("- { foo: 0, bar: 0 }"));
-    EXPECT_NE(llvm::StringRef::npos, flowOut.find("- { foo: -1, bar: 1024 }"));
-  }
-
-  {
-    Input yin(intermediate);
-    FlowFooBarDoc doc2;
-    yin >> doc2;
-
-    EXPECT_FALSE(yin.error());
-    EXPECT_EQ(doc2.attribute.foo, 42);
-    EXPECT_EQ(doc2.attribute.bar, 907);
-    EXPECT_EQ(doc2.seq.size(), 3UL);
-    EXPECT_EQ(doc2.seq[0].foo, 1);
-    EXPECT_EQ(doc2.seq[0].bar, 2);
-    EXPECT_EQ(doc2.seq[1].foo, 0);
-    EXPECT_EQ(doc2.seq[1].bar, 0);
-    EXPECT_EQ(doc2.seq[2].foo, -1);
-    EXPECT_EQ(doc2.seq[2].bar, 1024);
-  }
-}
-
-//===----------------------------------------------------------------------===//
-//  Test error handling
-//===----------------------------------------------------------------------===//
-
-//
-// Test error handling of unknown enumerated scalar
-//
-TEST(YAMLIO, TestColorsReadError) {
-  ColorMap map;
-  Input yin("---\n"
-            "c1:  blue\n"
-            "c2:  purple\n"
-            "c3:  green\n"
-            "...\n",
-            /*Ctxt=*/nullptr,
-            suppressErrorMessages);
-  yin >> map;
-  EXPECT_TRUE(!!yin.error());
-}
-
-
-//
-// Test error handling of flow sequence with unknown value
-//
-TEST(YAMLIO, TestFlagsReadError) {
-  FlagsMap map;
-  Input yin("---\n"
-            "f1:  [ big ]\n"
-            "f2:  [ round, hollow ]\n"
-            "f3:  []\n"
-            "...\n",
-            /*Ctxt=*/nullptr,
-            suppressErrorMessages);
-  yin >> map;
-
-  EXPECT_TRUE(!!yin.error());
-}
-
-
-//
-// Test error handling reading built-in uint8_t type
-//
-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
-//
-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
-//
-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
-//
-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
-//
-TEST(YAMLIO, TestReadBuiltInTypesint8OverError) {
-  std::vector<int8_t> seq;
-  Input yin("---\n"
-            "- -128\n"
-            "- 0\n"
-            "- 127\n"
-            "- 128\n"
-           "...\n",
-            /*Ctxt=*/nullptr,
-            suppressErrorMessages);
-  yin >> seq;
-
-  EXPECT_TRUE(!!yin.error());
-}
-
-//
-// Test error handling reading built-in int8_t type
-//
-TEST(YAMLIO, TestReadBuiltInTypesint8UnderError) {
-  std::vector<int8_t> seq;
-  Input yin("---\n"
-            "- -128\n"
-            "- 0\n"
-            "- 127\n"
-            "- -129\n"
-            "...\n",
-            /*Ctxt=*/nullptr,
-            suppressErrorMessages);
-  yin >> seq;
-
-  EXPECT_TRUE(!!yin.error());
-}
-
-
-//
-// Test error handling reading built-in int16_t type
-//
-TEST(YAMLIO, TestReadBuiltInTypesint16UnderError) {
-  std::vector<int16_t> seq;
-  Input yin("---\n"
-            "- 32767\n"
-            "- 0\n"
-            "- -32768\n"
-            "- -32769\n"
-            "...\n",
-            /*Ctxt=*/nullptr,
-            suppressErrorMessages);
-  yin >> seq;
-
-  EXPECT_TRUE(!!yin.error());
-}
-
-
-//
-// Test error handling reading built-in int16_t type
-//
-TEST(YAMLIO, TestReadBuiltInTypesint16OverError) {
-  std::vector<int16_t> seq;
-  Input yin("---\n"
-            "- 32767\n"
-            "- 0\n"
-            "- -32768\n"
-            "- 32768\n"
-            "...\n",
-            /*Ctxt=*/nullptr,
-            suppressErrorMessages);
-  yin >> seq;
-
-  EXPECT_TRUE(!!yin.error());
-}
-
-
-//
-// Test error handling reading built-in int32_t type
-//
-TEST(YAMLIO, TestReadBuiltInTypesint32UnderError) {
-  std::vector<int32_t> seq;
-  Input yin("---\n"
-            "- 2147483647\n"
-            "- 0\n"
-            "- -2147483648\n"
-            "- -2147483649\n"
-            "...\n",
-            /*Ctxt=*/nullptr,
-            suppressErrorMessages);
-  yin >> seq;
-
-  EXPECT_TRUE(!!yin.error());
-}
-
-//
-// Test error handling reading built-in int32_t type
-//
-TEST(YAMLIO, TestReadBuiltInTypesint32OverError) {
-  std::vector<int32_t> seq;
-  Input yin("---\n"
-            "- 2147483647\n"
-            "- 0\n"
-            "- -2147483648\n"
-            "- 2147483649\n"
-            "...\n",
-            /*Ctxt=*/nullptr,
-            suppressErrorMessages);
-  yin >> seq;
-
-  EXPECT_TRUE(!!yin.error());
-}
-
-
-//
-// Test error handling reading built-in int64_t type
-//
-TEST(YAMLIO, TestReadBuiltInTypesint64UnderError) {
-  std::vector<int64_t> seq;
-  Input yin("---\n"
-            "- -9223372036854775808\n"
-            "- 0\n"
-            "- 9223372036854775807\n"
-            "- -9223372036854775809\n"
-            "...\n",
-            /*Ctxt=*/nullptr,
-            suppressErrorMessages);
-  yin >> seq;
-
-  EXPECT_TRUE(!!yin.error());
-}
-
-//
-// Test error handling reading built-in int64_t type
-//
-TEST(YAMLIO, TestReadBuiltInTypesint64OverError) {
-  std::vector<int64_t> seq;
-  Input yin("---\n"
-            "- -9223372036854775808\n"
-            "- 0\n"
-            "- 9223372036854775807\n"
-            "- 9223372036854775809\n"
-            "...\n",
-            /*Ctxt=*/nullptr,
-            suppressErrorMessages);
-  yin >> seq;
-
-  EXPECT_TRUE(!!yin.error());
-}
-
-//
-// Test error handling reading built-in float type
-//
-TEST(YAMLIO, TestReadBuiltInTypesFloatError) {
-  std::vector<float> seq;
-  Input yin("---\n"
-            "- 0.0\n"
-            "- 1000.1\n"
-            "- -123.456\n"
-            "- 1.2.3\n"
-            "...\n",
-            /*Ctxt=*/nullptr,
-            suppressErrorMessages);
-  yin >> seq;
-
-  EXPECT_TRUE(!!yin.error());
-}
-
-//
-// Test error handling reading built-in float type
-//
-TEST(YAMLIO, TestReadBuiltInTypesDoubleError) {
-  std::vector<double> seq;
-  Input yin("---\n"
-            "- 0.0\n"
-            "- 1000.1\n"
-            "- -123.456\n"
-            "- 1.2.3\n"
-            "...\n",
-            /*Ctxt=*/nullptr,
-            suppressErrorMessages);
-  yin >> seq;
-
-  EXPECT_TRUE(!!yin.error());
-}
-
-//
-// Test error handling reading built-in Hex8 type
-//
-TEST(YAMLIO, TestReadBuiltInTypesHex8Error) {
-  std::vector<Hex8> seq;
-  Input yin("---\n"
-            "- 0x12\n"
-            "- 0xFE\n"
-            "- 0x123\n"
-            "...\n",
-            /*Ctxt=*/nullptr,
-            suppressErrorMessages);
-  yin >> seq;
-  EXPECT_TRUE(!!yin.error());
-
-  std::vector<Hex8> seq2;
-  Input yin2("---\n"
-             "[ 0x12, 0xFE, 0x123 ]\n"
-             "...\n",
-             /*Ctxt=*/nullptr, suppressErrorMessages);
-  yin2 >> seq2;
-  EXPECT_TRUE(!!yin2.error());
-
-  EXPECT_TRUE(seq.size() == 3);
-  EXPECT_TRUE(seq.size() == seq2.size());
-  for (size_t i = 0; i < seq.size(); ++i)
-    EXPECT_TRUE(seq[i] == seq2[i]);
-}
-
-
-//
-// Test error handling reading built-in Hex16 type
-//
-TEST(YAMLIO, TestReadBuiltInTypesHex16Error) {
-  std::vector<Hex16> seq;
-  Input yin("---\n"
-            "- 0x0012\n"
-            "- 0xFEFF\n"
-            "- 0x12345\n"
-            "...\n",
-            /*Ctxt=*/nullptr,
-            suppressErrorMessages);
-  yin >> seq;
-  EXPECT_TRUE(!!yin.error());
-
-  std::vector<Hex16> seq2;
-  Input yin2("---\n"
-             "[ 0x0012, 0xFEFF, 0x12345 ]\n"
-             "...\n",
-             /*Ctxt=*/nullptr, suppressErrorMessages);
-  yin2 >> seq2;
-  EXPECT_TRUE(!!yin2.error());
-
-  EXPECT_TRUE(seq.size() == 3);
-  EXPECT_TRUE(seq.size() == seq2.size());
-  for (size_t i = 0; i < seq.size(); ++i)
-    EXPECT_TRUE(seq[i] == seq2[i]);
-}
-
-//
-// Test error handling reading built-in Hex32 type
-//
-TEST(YAMLIO, TestReadBuiltInTypesHex32Error) {
-  std::vector<Hex32> seq;
-  Input yin("---\n"
-            "- 0x0012\n"
-            "- 0xFEFF0000\n"
-            "- 0x1234556789\n"
-            "...\n",
-            /*Ctxt=*/nullptr,
-            suppressErrorMessages);
-  yin >> seq;
-
-  EXPECT_TRUE(!!yin.error());
-
-  std::vector<Hex32> seq2;
-  Input yin2("---\n"
-             "[ 0x0012, 0xFEFF0000, 0x1234556789 ]\n"
-             "...\n",
-             /*Ctxt=*/nullptr, suppressErrorMessages);
-  yin2 >> seq2;
-  EXPECT_TRUE(!!yin2.error());
-
-  EXPECT_TRUE(seq.size() == 3);
-  EXPECT_TRUE(seq.size() == seq2.size());
-  for (size_t i = 0; i < seq.size(); ++i)
-    EXPECT_TRUE(seq[i] == seq2[i]);
-}
-
-//
-// Test error handling reading built-in Hex64 type
-//
-TEST(YAMLIO, TestReadBuiltInTypesHex64Error) {
-  std::vector<Hex64> seq;
-  Input yin("---\n"
-            "- 0x0012\n"
-            "- 0xFFEEDDCCBBAA9988\n"
-            "- 0x12345567890ABCDEF0\n"
-            "...\n",
-            /*Ctxt=*/nullptr,
-            suppressErrorMessages);
-  yin >> seq;
-  EXPECT_TRUE(!!yin.error());
-
-  std::vector<Hex64> seq2;
-  Input yin2("---\n"
-             "[ 0x0012, 0xFFEEDDCCBBAA9988, 0x12345567890ABCDEF0 ]\n"
-             "...\n",
-             /*Ctxt=*/nullptr, suppressErrorMessages);
-  yin2 >> seq2;
-  EXPECT_TRUE(!!yin2.error());
-
-  EXPECT_TRUE(seq.size() == 3);
-  EXPECT_TRUE(seq.size() == seq2.size());
-  for (size_t i = 0; i < seq.size(); ++i)
-    EXPECT_TRUE(seq[i] == seq2[i]);
-}
-
-TEST(YAMLIO, TestMalformedMapFailsGracefully) {
-  FooBar doc;
-  {
-    // We pass the suppressErrorMessages handler to handle the error
-    // message generated in the constructor of Input.
-    Input yin("{foo:3, bar: 5}", /*Ctxt=*/nullptr, suppressErrorMessages);
-    yin >> doc;
-    EXPECT_TRUE(!!yin.error());
-  }
-
-  {
-    Input yin("---\nfoo:3\nbar: 5\n...\n", /*Ctxt=*/nullptr, suppressErrorMessages);
-    yin >> doc;
-    EXPECT_TRUE(!!yin.error());
-  }
-}
-
-struct OptionalTest {
-  std::vector<int> Numbers;
-};
-
-struct OptionalTestSeq {
-  std::vector<OptionalTest> Tests;
-};
-
-LLVM_YAML_IS_SEQUENCE_VECTOR(OptionalTest)
-namespace llvm {
-namespace yaml {
-  template <>
-  struct MappingTraits<OptionalTest> {
-    static void mapping(IO& IO, OptionalTest &OT) {
-      IO.mapOptional("Numbers", OT.Numbers);
-    }
-  };
-
-  template <>
-  struct MappingTraits<OptionalTestSeq> {
-    static void mapping(IO &IO, OptionalTestSeq &OTS) {
-      IO.mapOptional("Tests", OTS.Tests);
-    }
-  };
-}
-}
-
-TEST(YAMLIO, SequenceElideTest) {
-  // Test that writing out a purely optional structure with its fields set to
-  // default followed by other data is properly read back in.
-  OptionalTestSeq Seq;
-  OptionalTest One, Two, Three, Four;
-  int N[] = {1, 2, 3};
-  Three.Numbers.assign(N, N + 3);
-  Seq.Tests.push_back(One);
-  Seq.Tests.push_back(Two);
-  Seq.Tests.push_back(Three);
-  Seq.Tests.push_back(Four);
-
-  std::string intermediate;
-  {
-    llvm::raw_string_ostream ostr(intermediate);
-    Output yout(ostr);
-    yout << Seq;
-  }
-
-  Input yin(intermediate);
-  OptionalTestSeq Seq2;
-  yin >> Seq2;
-
-  EXPECT_FALSE(yin.error());
-
-  EXPECT_EQ(4UL, Seq2.Tests.size());
-
-  EXPECT_TRUE(Seq2.Tests[0].Numbers.empty());
-  EXPECT_TRUE(Seq2.Tests[1].Numbers.empty());
-
-  EXPECT_EQ(1, Seq2.Tests[2].Numbers[0]);
-  EXPECT_EQ(2, Seq2.Tests[2].Numbers[1]);
-  EXPECT_EQ(3, Seq2.Tests[2].Numbers[2]);
-
-  EXPECT_TRUE(Seq2.Tests[3].Numbers.empty());
-}
-
-TEST(YAMLIO, TestEmptyStringFailsForMapWithRequiredFields) {
-  FooBar doc;
-  Input yin("");
-  yin >> doc;
-  EXPECT_TRUE(!!yin.error());
-}
-
-TEST(YAMLIO, TestEmptyStringSucceedsForMapWithOptionalFields) {
-  OptionalTest doc;
-  Input yin("");
-  yin >> doc;
-  EXPECT_FALSE(yin.error());
-}
-
-TEST(YAMLIO, TestEmptyStringSucceedsForSequence) {
-  std::vector<uint8_t> seq;
-  Input yin("", /*Ctxt=*/nullptr, suppressErrorMessages);
-  yin >> seq;
-
-  EXPECT_FALSE(yin.error());
-  EXPECT_TRUE(seq.empty());
-}
-
-struct FlowMap {
-  llvm::StringRef str1, str2, str3;
-  FlowMap(llvm::StringRef str1, llvm::StringRef str2, llvm::StringRef str3)
-    : str1(str1), str2(str2), str3(str3) {}
-};
-
-struct FlowSeq {
-  llvm::StringRef str;
-  FlowSeq(llvm::StringRef S) : str(S) {}
-  FlowSeq() = default;
-};
-
-namespace llvm {
-namespace yaml {
-  template <>
-  struct MappingTraits<FlowMap> {
-    static void mapping(IO &io, FlowMap &fm) {
-      io.mapRequired("str1", fm.str1);
-      io.mapRequired("str2", fm.str2);
-      io.mapRequired("str3", fm.str3);
-    }
-
-    static const bool flow = true;
-  };
-
-template <>
-struct ScalarTraits<FlowSeq> {
-  static void output(const FlowSeq &value, void*, llvm::raw_ostream &out) {
-    out << value.str;
-  }
-  static StringRef input(StringRef scalar, void*, FlowSeq &value) {
-    value.str = scalar;
-    return "";
-  }
-
-  static QuotingType mustQuote(StringRef S) { return QuotingType::None; }
-};
-}
-}
-
-LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(FlowSeq)
-
-TEST(YAMLIO, TestWrapFlow) {
-  std::string out;
-  llvm::raw_string_ostream ostr(out);
-  FlowMap Map("This is str1", "This is str2", "This is str3");
-  std::vector<FlowSeq> Seq;
-  Seq.emplace_back("This is str1");
-  Seq.emplace_back("This is str2");
-  Seq.emplace_back("This is str3");
-
-  {
-    // 20 is just bellow the total length of the first mapping field.
-    // We should wreap at every element.
-    Output yout(ostr, nullptr, 15);
-
-    yout << Map;
-    ostr.flush();
-    EXPECT_EQ(out,
-              "---\n"
-              "{ str1: This is str1, \n"
-              "  str2: This is str2, \n"
-              "  str3: This is str3 }\n"
-              "...\n");
-    out.clear();
-
-    yout << Seq;
-    ostr.flush();
-    EXPECT_EQ(out,
-              "---\n"
-              "[ This is str1, \n"
-              "  This is str2, \n"
-              "  This is str3 ]\n"
-              "...\n");
-    out.clear();
-  }
-  {
-    // 25 will allow the second field to be output on the first line.
-    Output yout(ostr, nullptr, 25);
-
-    yout << Map;
-    ostr.flush();
-    EXPECT_EQ(out,
-              "---\n"
-              "{ str1: This is str1, str2: This is str2, \n"
-              "  str3: This is str3 }\n"
-              "...\n");
-    out.clear();
-
-    yout << Seq;
-    ostr.flush();
-    EXPECT_EQ(out,
-              "---\n"
-              "[ This is str1, This is str2, \n"
-              "  This is str3 ]\n"
-              "...\n");
-    out.clear();
-  }
-  {
-    // 0 means no wrapping.
-    Output yout(ostr, nullptr, 0);
-
-    yout << Map;
-    ostr.flush();
-    EXPECT_EQ(out,
-              "---\n"
-              "{ str1: This is str1, str2: This is str2, str3: This is str3 }\n"
-              "...\n");
-    out.clear();
-
-    yout << Seq;
-    ostr.flush();
-    EXPECT_EQ(out,
-              "---\n"
-              "[ This is str1, This is str2, This is str3 ]\n"
-              "...\n");
-    out.clear();
-  }
-}
-
-struct MappingContext {
-  int A = 0;
-};
-struct SimpleMap {
-  int B = 0;
-  int C = 0;
-};
-
-struct NestedMap {
-  NestedMap(MappingContext &Context) : Context(Context) {}
-  SimpleMap Simple;
-  MappingContext &Context;
-};
-
-namespace llvm {
-namespace yaml {
-template <> struct MappingContextTraits<SimpleMap, MappingContext> {
-  static void mapping(IO &io, SimpleMap &sm, MappingContext &Context) {
-    io.mapRequired("B", sm.B);
-    io.mapRequired("C", sm.C);
-    ++Context.A;
-    io.mapRequired("Context", Context.A);
-  }
-};
-
-template <> struct MappingTraits<NestedMap> {
-  static void mapping(IO &io, NestedMap &nm) {
-    io.mapRequired("Simple", nm.Simple, nm.Context);
-  }
-};
-}
-}
-
-TEST(YAMLIO, TestMapWithContext) {
-  MappingContext Context;
-  NestedMap Nested(Context);
-  std::string out;
-  llvm::raw_string_ostream ostr(out);
-
-  Output yout(ostr, nullptr, 15);
-
-  yout << Nested;
-  ostr.flush();
-  EXPECT_EQ(1, Context.A);
-  EXPECT_EQ("---\n"
-            "Simple:\n"
-            "  B:               0\n"
-            "  C:               0\n"
-            "  Context:         1\n"
-            "...\n",
-            out);
-
-  out.clear();
-
-  Nested.Simple.B = 2;
-  Nested.Simple.C = 3;
-  yout << Nested;
-  ostr.flush();
-  EXPECT_EQ(2, Context.A);
-  EXPECT_EQ("---\n"
-            "Simple:\n"
-            "  B:               2\n"
-            "  C:               3\n"
-            "  Context:         2\n"
-            "...\n",
-            out);
-  out.clear();
-}
-
-LLVM_YAML_IS_STRING_MAP(int)
-
-TEST(YAMLIO, TestCustomMapping) {
-  std::map<std::string, int> x;
-
-  std::string out;
-  llvm::raw_string_ostream ostr(out);
-  Output xout(ostr, nullptr, 0);
-
-  xout << x;
-  ostr.flush();
-  EXPECT_EQ("---\n"
-            "{}\n"
-            "...\n",
-            out);
-
-  x["foo"] = 1;
-  x["bar"] = 2;
-
-  out.clear();
-  xout << x;
-  ostr.flush();
-  EXPECT_EQ("---\n"
-            "bar:             2\n"
-            "foo:             1\n"
-            "...\n",
-            out);
-
-  Input yin(out);
-  std::map<std::string, int> y;
-  yin >> y;
-  EXPECT_EQ(2ul, y.size());
-  EXPECT_EQ(1, y["foo"]);
-  EXPECT_EQ(2, y["bar"]);
-}
-
-LLVM_YAML_IS_STRING_MAP(FooBar)
-
-TEST(YAMLIO, TestCustomMappingStruct) {
-  std::map<std::string, FooBar> x;
-  x["foo"].foo = 1;
-  x["foo"].bar = 2;
-  x["bar"].foo = 3;
-  x["bar"].bar = 4;
-
-  std::string out;
-  llvm::raw_string_ostream ostr(out);
-  Output xout(ostr, nullptr, 0);
-
-  xout << x;
-  ostr.flush();
-  EXPECT_EQ("---\n"
-            "bar:\n"
-            "  foo:             3\n"
-            "  bar:             4\n"
-            "foo:\n"
-            "  foo:             1\n"
-            "  bar:             2\n"
-            "...\n",
-            out);
-
-  Input yin(out);
-  std::map<std::string, FooBar> y;
-  yin >> y;
-  EXPECT_EQ(2ul, y.size());
-  EXPECT_EQ(1, y["foo"].foo);
-  EXPECT_EQ(2, y["foo"].bar);
-  EXPECT_EQ(3, y["bar"].foo);
-  EXPECT_EQ(4, y["bar"].bar);
-}
-
-struct FooBarMapMap {
-  std::map<std::string, FooBar> fbm;
-};
-
-namespace llvm {
-namespace yaml {
-template <> struct MappingTraits<FooBarMapMap> {
-  static void mapping(IO &io, FooBarMapMap &x) {
-    io.mapRequired("fbm", x.fbm);
-  }
-};
-}
-}
-
-TEST(YAMLIO, TestEmptyMapWrite) {
-  FooBarMapMap cont;
-  std::string str;
-  llvm::raw_string_ostream OS(str);
-  Output yout(OS);
-  yout << cont;
-  EXPECT_EQ(OS.str(), "---\nfbm:             {}\n...\n");
-}
-
-TEST(YAMLIO, TestEmptySequenceWrite) {
-  {
-    FooBarContainer cont;
-    std::string str;
-    llvm::raw_string_ostream OS(str);
-    Output yout(OS);
-    yout << cont;
-    EXPECT_EQ(OS.str(), "---\nfbs:             []\n...\n");
-  }
-
-  {
-    FooBarSequence seq;
-    std::string str;
-    llvm::raw_string_ostream OS(str);
-    Output yout(OS);
-    yout << seq;
-    EXPECT_EQ(OS.str(), "---\n[]\n...\n");
-  }
-}
-
-static void TestEscaped(llvm::StringRef Input, llvm::StringRef Expected) {
-  std::string out;
-  llvm::raw_string_ostream ostr(out);
-  Output xout(ostr, nullptr, 0);
-
-  llvm::yaml::EmptyContext Ctx;
-  yamlize(xout, Input, true, Ctx);
-
-  ostr.flush();
-
-  // Make a separate StringRef so we get nice byte-by-byte output.
-  llvm::StringRef Got(out);
-  EXPECT_EQ(Expected, Got);
-}
-
-TEST(YAMLIO, TestEscaped) {
-  // Single quote
-  TestEscaped("@abc@", "'@abc@'");
-  // No quote
-  TestEscaped("abc", "abc");
-  // Forward slash quoted
-  TestEscaped("abc/", "'abc/'");
-  // Double quote non-printable
-  TestEscaped("\01@abc@", "\"\\x01@abc@\"");
-  // Double quote inside single quote
-  TestEscaped("abc\"fdf", "'abc\"fdf'");
-  // Double quote inside double quote
-  TestEscaped("\01bc\"fdf", "\"\\x01bc\\\"fdf\"");
-  // Single quote inside single quote
-  TestEscaped("abc'fdf", "'abc''fdf'");
-  // UTF8
-  TestEscaped("/*параметр*/", "\"/*параметр*/\"");
-  // UTF8 with single quote inside double quote
-  TestEscaped("parameter 'параметр' is unused",
-              "\"parameter 'параметр' is unused\"");
-
-  // String with embedded non-printable multibyte UTF-8 sequence (U+200B
-  // zero-width space). The thing to test here is that we emit a
-  // unicode-scalar level escape like \uNNNN (at the YAML level), and don't
-  // just pass the UTF-8 byte sequence through as with quoted printables.
-  {
-    const unsigned char foobar[10] = {'f', 'o', 'o',
-                                      0xE2, 0x80, 0x8B, // UTF-8 of U+200B
-                                      'b', 'a', 'r',
-                                      0x0};
-    TestEscaped((char const *)foobar, "\"foo\\u200Bbar\"");
-  }
-}
-
-TEST(YAMLIO, Numeric) {
-  EXPECT_TRUE(isNumeric(".inf"));
-  EXPECT_TRUE(isNumeric(".INF"));
-  EXPECT_TRUE(isNumeric(".Inf"));
-  EXPECT_TRUE(isNumeric("-.inf"));
-  EXPECT_TRUE(isNumeric("+.inf"));
-
-  EXPECT_TRUE(isNumeric(".nan"));
-  EXPECT_TRUE(isNumeric(".NaN"));
-  EXPECT_TRUE(isNumeric(".NAN"));
-
-  EXPECT_TRUE(isNumeric("0"));
-  EXPECT_TRUE(isNumeric("0."));
-  EXPECT_TRUE(isNumeric("0.0"));
-  EXPECT_TRUE(isNumeric("-0.0"));
-  EXPECT_TRUE(isNumeric("+0.0"));
-
-  EXPECT_TRUE(isNumeric("12345"));
-  EXPECT_TRUE(isNumeric("012345"));
-  EXPECT_TRUE(isNumeric("+12.0"));
-  EXPECT_TRUE(isNumeric(".5"));
-  EXPECT_TRUE(isNumeric("+.5"));
-  EXPECT_TRUE(isNumeric("-1.0"));
-
-  EXPECT_TRUE(isNumeric("2.3e4"));
-  EXPECT_TRUE(isNumeric("-2E+05"));
-  EXPECT_TRUE(isNumeric("+12e03"));
-  EXPECT_TRUE(isNumeric("6.8523015e+5"));
-
-  EXPECT_TRUE(isNumeric("1.e+1"));
-  EXPECT_TRUE(isNumeric(".0e+1"));
-
-  EXPECT_TRUE(isNumeric("0x2aF3"));
-  EXPECT_TRUE(isNumeric("0o01234567"));
-
-  EXPECT_FALSE(isNumeric("not a number"));
-  EXPECT_FALSE(isNumeric("."));
-  EXPECT_FALSE(isNumeric(".e+1"));
-  EXPECT_FALSE(isNumeric(".1e"));
-  EXPECT_FALSE(isNumeric(".1e+"));
-  EXPECT_FALSE(isNumeric(".1e++1"));
-
-  EXPECT_FALSE(isNumeric("ABCD"));
-  EXPECT_FALSE(isNumeric("+0x2AF3"));
-  EXPECT_FALSE(isNumeric("-0x2AF3"));
-  EXPECT_FALSE(isNumeric("0x2AF3Z"));
-  EXPECT_FALSE(isNumeric("0o012345678"));
-  EXPECT_FALSE(isNumeric("0xZ"));
-  EXPECT_FALSE(isNumeric("-0o012345678"));
-  EXPECT_FALSE(isNumeric("000003A8229434B839616A25C16B0291F77A438B"));
-
-  EXPECT_FALSE(isNumeric(""));
-  EXPECT_FALSE(isNumeric("."));
-  EXPECT_FALSE(isNumeric(".e+1"));
-  EXPECT_FALSE(isNumeric(".e+"));
-  EXPECT_FALSE(isNumeric(".e"));
-  EXPECT_FALSE(isNumeric("e1"));
-
-  // Deprecated formats: as for YAML 1.2 specification, the following are not
-  // valid numbers anymore:
-  //
-  // * Sexagecimal numbers
-  // * Decimal numbers with comma s the delimiter
-  // * "inf", "nan" without '.' prefix
-  EXPECT_FALSE(isNumeric("3:25:45"));
-  EXPECT_FALSE(isNumeric("+12,345"));
-  EXPECT_FALSE(isNumeric("-inf"));
-  EXPECT_FALSE(isNumeric("1,230.15"));
-}
-
-//===----------------------------------------------------------------------===//
-//  Test PolymorphicTraits and TaggedScalarTraits
-//===----------------------------------------------------------------------===//
-
-struct Poly {
-  enum NodeKind {
-    NK_Scalar,
-    NK_Seq,
-    NK_Map,
-  } Kind;
-
-  Poly(NodeKind Kind) : Kind(Kind) {}
-
-  virtual ~Poly() = default;
-
-  NodeKind getKind() const { return Kind; }
-};
-
-struct Scalar : Poly {
-  enum ScalarKind {
-    SK_Unknown,
-    SK_Double,
-    SK_Bool,
-  } SKind;
-
-  union {
-    double DoubleValue;
-    bool BoolValue;
-  };
-
-  Scalar() : Poly(NK_Scalar), SKind(SK_Unknown) {}
-  Scalar(double DoubleValue)
-      : Poly(NK_Scalar), SKind(SK_Double), DoubleValue(DoubleValue) {}
-  Scalar(bool BoolValue)
-      : Poly(NK_Scalar), SKind(SK_Bool), BoolValue(BoolValue) {}
-
-  static bool classof(const Poly *N) { return N->getKind() == NK_Scalar; }
-};
-
-struct Seq : Poly, std::vector<std::unique_ptr<Poly>> {
-  Seq() : Poly(NK_Seq) {}
-
-  static bool classof(const Poly *N) { return N->getKind() == NK_Seq; }
-};
-
-struct Map : Poly, llvm::StringMap<std::unique_ptr<Poly>> {
-  Map() : Poly(NK_Map) {}
-
-  static bool classof(const Poly *N) { return N->getKind() == NK_Map; }
-};
-
-namespace llvm {
-namespace yaml {
-
-template <> struct PolymorphicTraits<std::unique_ptr<Poly>> {
-  static NodeKind getKind(const std::unique_ptr<Poly> &N) {
-    if (isa<Scalar>(*N))
-      return NodeKind::Scalar;
-    if (isa<Seq>(*N))
-      return NodeKind::Sequence;
-    if (isa<Map>(*N))
-      return NodeKind::Map;
-    llvm_unreachable("unsupported node type");
-  }
-
-  static Scalar &getAsScalar(std::unique_ptr<Poly> &N) {
-    if (!N || !isa<Scalar>(*N))
-      N = std::make_unique<Scalar>();
-    return *cast<Scalar>(N.get());
-  }
-
-  static Seq &getAsSequence(std::unique_ptr<Poly> &N) {
-    if (!N || !isa<Seq>(*N))
-      N = std::make_unique<Seq>();
-    return *cast<Seq>(N.get());
-  }
-
-  static Map &getAsMap(std::unique_ptr<Poly> &N) {
-    if (!N || !isa<Map>(*N))
-      N = std::make_unique<Map>();
-    return *cast<Map>(N.get());
-  }
-};
-
-template <> struct TaggedScalarTraits<Scalar> {
-  static void output(const Scalar &S, void *Ctxt, raw_ostream &ScalarOS,
-                     raw_ostream &TagOS) {
-    switch (S.SKind) {
-    case Scalar::SK_Unknown:
-      report_fatal_error("output unknown scalar");
-      break;
-    case Scalar::SK_Double:
-      TagOS << "!double";
-      ScalarTraits<double>::output(S.DoubleValue, Ctxt, ScalarOS);
-      break;
-    case Scalar::SK_Bool:
-      TagOS << "!bool";
-      ScalarTraits<bool>::output(S.BoolValue, Ctxt, ScalarOS);
-      break;
-    }
-  }
-
-  static StringRef input(StringRef ScalarStr, StringRef Tag, void *Ctxt,
-                         Scalar &S) {
-    S.SKind = StringSwitch<Scalar::ScalarKind>(Tag)
-                  .Case("!double", Scalar::SK_Double)
-                  .Case("!bool", Scalar::SK_Bool)
-                  .Default(Scalar::SK_Unknown);
-    switch (S.SKind) {
-    case Scalar::SK_Unknown:
-      return StringRef("unknown scalar tag");
-    case Scalar::SK_Double:
-      return ScalarTraits<double>::input(ScalarStr, Ctxt, S.DoubleValue);
-    case Scalar::SK_Bool:
-      return ScalarTraits<bool>::input(ScalarStr, Ctxt, S.BoolValue);
-    }
-    llvm_unreachable("unknown scalar kind");
-  }
-
-  static QuotingType mustQuote(const Scalar &S, StringRef Str) {
-    switch (S.SKind) {
-    case Scalar::SK_Unknown:
-      report_fatal_error("quote unknown scalar");
-    case Scalar::SK_Double:
-      return ScalarTraits<double>::mustQuote(Str);
-    case Scalar::SK_Bool:
-      return ScalarTraits<bool>::mustQuote(Str);
-    }
-    llvm_unreachable("unknown scalar kind");
-  }
-};
-
-template <> struct CustomMappingTraits<Map> {
-  static void inputOne(IO &IO, StringRef Key, Map &M) {
-    IO.mapRequired(Key.str().c_str(), M[Key]);
-  }
-
-  static void output(IO &IO, Map &M) {
-    for (auto &N : M)
-      IO.mapRequired(N.getKey().str().c_str(), N.getValue());
-  }
-};
-
-template <> struct SequenceTraits<Seq> {
-  static size_t size(IO &IO, Seq &A) { return A.size(); }
-
-  static std::unique_ptr<Poly> &element(IO &IO, Seq &A, size_t Index) {
-    if (Index >= A.size())
-      A.resize(Index + 1);
-    return A[Index];
-  }
-};
-
-} // namespace yaml
-} // namespace llvm
-
-TEST(YAMLIO, TestReadWritePolymorphicScalar) {
-  std::string intermediate;
-  std::unique_ptr<Poly> node = std::make_unique<Scalar>(true);
-
-  llvm::raw_string_ostream ostr(intermediate);
-  Output yout(ostr);
-#ifdef GTEST_HAS_DEATH_TEST
-#ifndef NDEBUG
-  EXPECT_DEATH(yout << node, "plain scalar documents are not supported");
-#endif
-#endif
-}
-
-TEST(YAMLIO, TestReadWritePolymorphicSeq) {
-  std::string intermediate;
-  {
-    auto seq = std::make_unique<Seq>();
-    seq->push_back(std::make_unique<Scalar>(true));
-    seq->push_back(std::make_unique<Scalar>(1.0));
-    auto node = llvm::unique_dyn_cast<Poly>(seq);
-
-    llvm::raw_string_ostream ostr(intermediate);
-    Output yout(ostr);
-    yout << node;
-  }
-  {
-    Input yin(intermediate);
-    std::unique_ptr<Poly> node;
-    yin >> node;
-
-    EXPECT_FALSE(yin.error());
-    auto seq = llvm::dyn_cast<Seq>(node.get());
-    ASSERT_TRUE(seq);
-    ASSERT_EQ(seq->size(), 2u);
-    auto first = llvm::dyn_cast<Scalar>((*seq)[0].get());
-    ASSERT_TRUE(first);
-    EXPECT_EQ(first->SKind, Scalar::SK_Bool);
-    EXPECT_TRUE(first->BoolValue);
-    auto second = llvm::dyn_cast<Scalar>((*seq)[1].get());
-    ASSERT_TRUE(second);
-    EXPECT_EQ(second->SKind, Scalar::SK_Double);
-    EXPECT_EQ(second->DoubleValue, 1.0);
-  }
-}
-
-TEST(YAMLIO, TestReadWritePolymorphicMap) {
-  std::string intermediate;
-  {
-    auto map = std::make_unique<Map>();
-    (*map)["foo"] = std::make_unique<Scalar>(false);
-    (*map)["bar"] = std::make_unique<Scalar>(2.0);
-    std::unique_ptr<Poly> node = llvm::unique_dyn_cast<Poly>(map);
-
-    llvm::raw_string_ostream ostr(intermediate);
-    Output yout(ostr);
-    yout << node;
-  }
-  {
-    Input yin(intermediate);
-    std::unique_ptr<Poly> node;
-    yin >> node;
-
-    EXPECT_FALSE(yin.error());
-    auto map = llvm::dyn_cast<Map>(node.get());
-    ASSERT_TRUE(map);
-    auto foo = llvm::dyn_cast<Scalar>((*map)["foo"].get());
-    ASSERT_TRUE(foo);
-    EXPECT_EQ(foo->SKind, Scalar::SK_Bool);
-    EXPECT_FALSE(foo->BoolValue);
-    auto bar = llvm::dyn_cast<Scalar>((*map)["bar"].get());
-    ASSERT_TRUE(bar);
-    EXPECT_EQ(bar->SKind, Scalar::SK_Double);
-    EXPECT_EQ(bar->DoubleValue, 2.0);
-  }
-}
-
-TEST(YAMLIO, TestAnchorMapError) {
-  Input yin("& & &: ");
-  yin.setCurrentDocument();
-  EXPECT_TRUE(yin.error());
-}
-
-TEST(YAMLIO, TestFlowSequenceTokenErrors) {
-  Input yin(",");
-  EXPECT_FALSE(yin.setCurrentDocument());
-  EXPECT_TRUE(yin.error());
-
-  Input yin2("]");
-  EXPECT_FALSE(yin2.setCurrentDocument());
-  EXPECT_TRUE(yin2.error());
-
-  Input yin3("}");
-  EXPECT_FALSE(yin3.setCurrentDocument());
-  EXPECT_TRUE(yin3.error());
-}
-
-TEST(YAMLIO, TestDirectiveMappingNoValue) {
-  Input yin("%YAML\n{5:");
-  EXPECT_FALSE(yin.setCurrentDocument());
-  EXPECT_TRUE(yin.error());
-
-  Input yin2("%TAG\n'\x98!< :\n");
-  yin2.setCurrentDocument();
-  EXPECT_TRUE(yin2.error());
-}
-
-TEST(YAMLIO, TestUnescapeInfiniteLoop) {
-  Input yin("\"\\u\\^#\\\\\"");
-  yin.setCurrentDocument();
-  EXPECT_TRUE(yin.error());
-}
-
-TEST(YAMLIO, TestScannerUnexpectedCharacter) {
-  Input yin("!<$\x9F.");
-  EXPECT_FALSE(yin.setCurrentDocument());
-  EXPECT_TRUE(yin.error());
-}
-
-TEST(YAMLIO, TestUnknownDirective) {
-  Input yin("%");
-  EXPECT_FALSE(yin.setCurrentDocument());
-  EXPECT_TRUE(yin.error());
-
-  Input yin2("%)");
-  EXPECT_FALSE(yin2.setCurrentDocument());
-  EXPECT_TRUE(yin2.error());
-}
-
-TEST(YAMLIO, TestEmptyAlias) {
-  Input yin("&");
-  EXPECT_FALSE(yin.setCurrentDocument());
-  EXPECT_TRUE(yin.error());
-}
-
-TEST(YAMLIO, TestEmptyAnchor) {
-  Input yin("*");
-  EXPECT_FALSE(yin.setCurrentDocument());
-}
-
-TEST(YAMLIO, TestScannerNoNullEmpty) {
-  std::vector<char> str{};
-  Input yin(llvm::StringRef(str.data(), str.size()));
-  yin.setCurrentDocument();
-  EXPECT_FALSE(yin.error());
-}
-
-TEST(YAMLIO, TestScannerNoNullSequenceOfNull) {
-  std::vector<char> str{'-'};
-  Input yin(llvm::StringRef(str.data(), str.size()));
-  yin.setCurrentDocument();
-  EXPECT_FALSE(yin.error());
-}
-
-TEST(YAMLIO, TestScannerNoNullSimpleSequence) {
-  std::vector<char> str{'-', ' ', 'a'};
-  Input yin(llvm::StringRef(str.data(), str.size()));
-  yin.setCurrentDocument();
-  EXPECT_FALSE(yin.error());
-}
-
-TEST(YAMLIO, TestScannerNoNullUnbalancedMap) {
-  std::vector<char> str{'{'};
-  Input yin(llvm::StringRef(str.data(), str.size()));
-  yin.setCurrentDocument();
-  EXPECT_TRUE(yin.error());
-}
-
-TEST(YAMLIO, TestScannerNoNullEmptyMap) {
-  std::vector<char> str{'{', '}'};
-  Input yin(llvm::StringRef(str.data(), str.size()));
-  yin.setCurrentDocument();
-  EXPECT_FALSE(yin.error());
-}
-
-TEST(YAMLIO, TestScannerNoNullUnbalancedSequence) {
-  std::vector<char> str{'['};
-  Input yin(llvm::StringRef(str.data(), str.size()));
-  yin.setCurrentDocument();
-  EXPECT_TRUE(yin.error());
-}
-
-TEST(YAMLIO, TestScannerNoNullEmptySequence) {
-  std::vector<char> str{'[', ']'};
-  Input yin(llvm::StringRef(str.data(), str.size()));
-  yin.setCurrentDocument();
-  EXPECT_FALSE(yin.error());
-}
-
-TEST(YAMLIO, TestScannerNoNullScalarUnbalancedDoubleQuote) {
-  std::vector<char> str{'"'};
-  Input yin(llvm::StringRef(str.data(), str.size()));
-  yin.setCurrentDocument();
-  EXPECT_TRUE(yin.error());
-}
-
-TEST(YAMLIO, TestScannerNoNullScalarUnbalancedSingleQuote) {
-  std::vector<char> str{'\''};
-  Input yin(llvm::StringRef(str.data(), str.size()));
-  yin.setCurrentDocument();
-  EXPECT_TRUE(yin.error());
-}
-
-TEST(YAMLIO, TestScannerNoNullEmptyAlias) {
-  std::vector<char> str{'&'};
-  Input yin(llvm::StringRef(str.data(), str.size()));
-  yin.setCurrentDocument();
-  EXPECT_TRUE(yin.error());
-}
-
-TEST(YAMLIO, TestScannerNoNullEmptyAnchor) {
-  std::vector<char> str{'*'};
-  Input yin(llvm::StringRef(str.data(), str.size()));
-  yin.setCurrentDocument();
-  EXPECT_TRUE(yin.error());
-}
-
-TEST(YAMLIO, TestScannerNoNullDecodeInvalidUTF8) {
-  std::vector<char> str{'\xef'};
-  Input yin(llvm::StringRef(str.data(), str.size()));
-  yin.setCurrentDocument();
-  EXPECT_TRUE(yin.error());
-}
-
-TEST(YAMLIO, TestScannerNoNullScanPlainScalarInFlow) {
-  std::vector<char> str{'{', 'a', ':'};
-  Input yin(llvm::StringRef(str.data(), str.size()));
-  yin.setCurrentDocument();
-  EXPECT_TRUE(yin.error());
-}
diff --git a/gnu/llvm/llvm/unittests/Support/YAMLParserTest.cpp b/gnu/llvm/llvm/unittests/Support/YAMLParserTest.cpp
deleted file mode 100644
index adda6ce9f5c..00000000000
--- a/gnu/llvm/llvm/unittests/Support/YAMLParserTest.cpp
+++ /dev/null
@@ -1,385 +0,0 @@
-//===- unittest/Support/YAMLParserTest ------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/YAMLParser.h"
-#include "llvm/ADT/Twine.h"
-#include "llvm/Support/Casting.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-
-static void SuppressDiagnosticsOutput(const SMDiagnostic &, void *) {
-  // Prevent SourceMgr from writing errors to stderr
-  // to reduce noise in unit test runs.
-}
-
-// Assumes Ctx is an SMDiagnostic where Diag can be stored.
-static void CollectDiagnosticsOutput(const SMDiagnostic &Diag, void *Ctx) {
-  SMDiagnostic* DiagOut = static_cast<SMDiagnostic*>(Ctx);
-  *DiagOut = Diag;
-}
-
-// Checks that the given input gives a parse error. Makes sure that an error
-// text is available and the parse fails.
-static void ExpectParseError(StringRef Message, StringRef Input) {
-  SourceMgr SM;
-  yaml::Stream Stream(Input, SM);
-  SM.setDiagHandler(SuppressDiagnosticsOutput);
-  EXPECT_FALSE(Stream.validate()) << Message << ": " << Input;
-  EXPECT_TRUE(Stream.failed()) << Message << ": " << Input;
-}
-
-// Checks that the given input can be parsed without error.
-static void ExpectParseSuccess(StringRef Message, StringRef Input) {
-  SourceMgr SM;
-  yaml::Stream Stream(Input, SM);
-  EXPECT_TRUE(Stream.validate()) << Message << ": " << Input;
-}
-
-TEST(YAMLParser, ParsesEmptyArray) {
-  ExpectParseSuccess("Empty array", "[]");
-}
-
-TEST(YAMLParser, FailsIfNotClosingArray) {
-  ExpectParseError("Not closing array", "[");
-  ExpectParseError("Not closing array", "  [  ");
-  ExpectParseError("Not closing array", "  [x");
-}
-
-TEST(YAMLParser, ParsesEmptyArrayWithWhitespace) {
-  ExpectParseSuccess("Array with spaces", "  [  ]  ");
-  ExpectParseSuccess("All whitespaces", "\t\r\n[\t\n \t\r ]\t\r \n\n");
-}
-
-TEST(YAMLParser, ParsesEmptyObject) {
-  ExpectParseSuccess("Empty object", "[{}]");
-}
-
-TEST(YAMLParser, ParsesObject) {
-  ExpectParseSuccess("Object with an entry", "[{\"a\":\"/b\"}]");
-}
-
-TEST(YAMLParser, ParsesMultipleKeyValuePairsInObject) {
-  ExpectParseSuccess("Multiple key, value pairs",
-                     "[{\"a\":\"/b\",\"c\":\"d\",\"e\":\"f\"}]");
-}
-
-TEST(YAMLParser, FailsIfNotClosingObject) {
-  ExpectParseError("Missing close on empty", "[{]");
-  ExpectParseError("Missing close after pair", "[{\"a\":\"b\"]");
-}
-
-TEST(YAMLParser, FailsIfMissingColon) {
-  ExpectParseError("Missing colon between key and value", "[{\"a\"\"/b\"}]");
-  ExpectParseError("Missing colon between key and value", "[{\"a\" \"b\"}]");
-}
-
-TEST(YAMLParser, FailsOnMissingQuote) {
-  ExpectParseError("Missing open quote", "[{a\":\"b\"}]");
-  ExpectParseError("Missing closing quote", "[{\"a\":\"b}]");
-}
-
-TEST(YAMLParser, ParsesEscapedQuotes) {
-  ExpectParseSuccess("Parses escaped string in key and value",
-                     "[{\"a\":\"\\\"b\\\"  \\\" \\\"\"}]");
-}
-
-TEST(YAMLParser, ParsesEmptyString) {
-  ExpectParseSuccess("Parses empty string in value", "[{\"a\":\"\"}]");
-}
-
-TEST(YAMLParser, ParsesMultipleObjects) {
-  ExpectParseSuccess(
-      "Multiple objects in array",
-      "["
-      " { \"a\" : \"b\" },"
-      " { \"a\" : \"b\" },"
-      " { \"a\" : \"b\" }"
-      "]");
-}
-
-TEST(YAMLParser, FailsOnMissingComma) {
-  ExpectParseError(
-      "Missing comma",
-      "["
-      " { \"a\" : \"b\" }"
-      " { \"a\" : \"b\" }"
-      "]");
-}
-
-TEST(YAMLParser, ParsesSpacesInBetweenTokens) {
-  ExpectParseSuccess(
-      "Various whitespace between tokens",
-      " \t \n\n \r [ \t \n\n \r"
-      " \t \n\n \r { \t \n\n \r\"a\"\t \n\n \r :"
-      " \t \n\n \r \"b\"\t \n\n \r } \t \n\n \r,\t \n\n \r"
-      " \t \n\n \r { \t \n\n \r\"a\"\t \n\n \r :"
-      " \t \n\n \r \"b\"\t \n\n \r } \t \n\n \r]\t \n\n \r");
-}
-
-TEST(YAMLParser, ParsesArrayOfArrays) {
-  ExpectParseSuccess("Array of arrays", "[[]]");
-}
-
-TEST(YAMLParser, ParsesBlockLiteralScalars) {
-  ExpectParseSuccess("Block literal scalar", "test: |\n  Hello\n  World\n");
-  ExpectParseSuccess("Block literal scalar EOF", "test: |\n  Hello\n  World");
-  ExpectParseSuccess("Empty block literal scalar header EOF", "test: | ");
-  ExpectParseSuccess("Empty block literal scalar", "test: |\ntest2: 20");
-  ExpectParseSuccess("Empty block literal scalar 2", "- | \n  \n\n \n- 42");
-  ExpectParseSuccess("Block literal scalar in sequence",
-                     "- |\n  Testing\n  Out\n\n- 22");
-  ExpectParseSuccess("Block literal scalar in document",
-                     "--- |\n  Document\n...");
-  ExpectParseSuccess("Empty non indented lines still count",
-                     "- |\n  First line\n \n\n  Another line\n\n- 2");
-  ExpectParseSuccess("Comment in block literal scalar header",
-                     "test: | # Comment \n  No Comment\ntest 2: | # Void");
-  ExpectParseSuccess("Chomping indicators in block literal scalar header",
-                     "test: |- \n  Hello\n\ntest 2: |+ \n\n  World\n\n\n");
-  ExpectParseSuccess("Indent indicators in block literal scalar header",
-                     "test: |1 \n  \n Hello \n  World\n");
-  ExpectParseSuccess("Chomping and indent indicators in block literals",
-                     "test: |-1\n Hello\ntest 2: |9+\n         World");
-  ExpectParseSuccess("Trailing comments in block literals",
-                     "test: |\n  Content\n # Trailing\n  #Comment\ntest 2: 3");
-  ExpectParseError("Invalid block scalar header", "test: | failure");
-  ExpectParseError("Invalid line indentation", "test: |\n  First line\n Error");
-  ExpectParseError("Long leading space line", "test: |\n   \n  Test\n");
-}
-
-TEST(YAMLParser, NullTerminatedBlockScalars) {
-  SourceMgr SM;
-  yaml::Stream Stream("test: |\n  Hello\n  World\n", SM);
-  yaml::Document &Doc = *Stream.begin();
-  yaml::MappingNode *Map = cast<yaml::MappingNode>(Doc.getRoot());
-  StringRef Value =
-      cast<yaml::BlockScalarNode>(Map->begin()->getValue())->getValue();
-
-  EXPECT_EQ(Value, "Hello\nWorld\n");
-  EXPECT_EQ(Value.data()[Value.size()], '\0');
-}
-
-TEST(YAMLParser, HandlesEndOfFileGracefully) {
-  ExpectParseError("In string starting with EOF", "[\"");
-  ExpectParseError("In string hitting EOF", "[\"   ");
-  ExpectParseError("In string escaping EOF", "[\"  \\");
-  ExpectParseError("In array starting with EOF", "[");
-  ExpectParseError("In array element starting with EOF", "[[], ");
-  ExpectParseError("In array hitting EOF", "[[] ");
-  ExpectParseError("In array hitting EOF", "[[]");
-  ExpectParseError("In object hitting EOF", "{\"\"");
-}
-
-TEST(YAMLParser, HandlesNullValuesInKeyValueNodesGracefully) {
-  ExpectParseError("KeyValueNode with null key", "? \"\n:");
-  ExpectParseError("KeyValueNode with null value", "test: '");
-}
-
-// Checks that the given string can be parsed into an identical string inside
-// of an array.
-static void ExpectCanParseString(StringRef String) {
-  std::string StringInArray = (llvm::Twine("[\"") + String + "\"]").str();
-  SourceMgr SM;
-  yaml::Stream Stream(StringInArray, SM);
-  yaml::SequenceNode *ParsedSequence
-    = dyn_cast<yaml::SequenceNode>(Stream.begin()->getRoot());
-  StringRef ParsedString
-    = dyn_cast<yaml::ScalarNode>(
-      static_cast<yaml::Node*>(ParsedSequence->begin()))->getRawValue();
-  ParsedString = ParsedString.substr(1, ParsedString.size() - 2);
-  EXPECT_EQ(String, ParsedString.str());
-}
-
-// Checks that parsing the given string inside an array fails.
-static void ExpectCannotParseString(StringRef String) {
-  std::string StringInArray = (llvm::Twine("[\"") + String + "\"]").str();
-  ExpectParseError((Twine("When parsing string \"") + String + "\"").str(),
-                   StringInArray);
-}
-
-TEST(YAMLParser, ParsesStrings) {
-  ExpectCanParseString("");
-  ExpectCannotParseString("\\");
-  ExpectCannotParseString("\"");
-  ExpectCanParseString(" ");
-  ExpectCanParseString("\\ ");
-  ExpectCanParseString("\\\"");
-  ExpectCannotParseString("\"\\");
-  ExpectCannotParseString(" \\");
-  ExpectCanParseString("\\\\");
-  ExpectCannotParseString("\\\\\\");
-  ExpectCanParseString("\\\\\\\\");
-  ExpectCanParseString("\\\" ");
-  ExpectCannotParseString("\\\\\" ");
-  ExpectCanParseString("\\\\\\\" ");
-  ExpectCanParseString("    \\\\  \\\"  \\\\\\\"   ");
-}
-
-TEST(YAMLParser, WorksWithIteratorAlgorithms) {
-  SourceMgr SM;
-  yaml::Stream Stream("[\"1\", \"2\", \"3\", \"4\", \"5\", \"6\"]", SM);
-  yaml::SequenceNode *Array
-    = dyn_cast<yaml::SequenceNode>(Stream.begin()->getRoot());
-  EXPECT_EQ(6, std::distance(Array->begin(), Array->end()));
-}
-
-TEST(YAMLParser, DefaultDiagnosticFilename) {
-  SourceMgr SM;
-
-  SMDiagnostic GeneratedDiag;
-  SM.setDiagHandler(CollectDiagnosticsOutput, &GeneratedDiag);
-
-  // When we construct a YAML stream over an unnamed string,
-  // the filename is hard-coded as "YAML".
-  yaml::Stream UnnamedStream("[]", SM);
-  UnnamedStream.printError(UnnamedStream.begin()->getRoot(), "Hello, World!");
-  EXPECT_EQ("YAML", GeneratedDiag.getFilename());
-}
-
-TEST(YAMLParser, DiagnosticFilenameFromBufferID) {
-  SourceMgr SM;
-
-  SMDiagnostic GeneratedDiag;
-  SM.setDiagHandler(CollectDiagnosticsOutput, &GeneratedDiag);
-
-  // When we construct a YAML stream over a named buffer,
-  // we get its ID as filename in diagnostics.
-  std::unique_ptr<MemoryBuffer> Buffer =
-      MemoryBuffer::getMemBuffer("[]", "buffername.yaml");
-  yaml::Stream Stream(Buffer->getMemBufferRef(), SM);
-  Stream.printError(Stream.begin()->getRoot(), "Hello, World!");
-  EXPECT_EQ("buffername.yaml", GeneratedDiag.getFilename());
-}
-
-TEST(YAMLParser, SameNodeIteratorOperatorNotEquals) {
-  SourceMgr SM;
-  yaml::Stream Stream("[\"1\", \"2\"]", SM);
-
-  yaml::SequenceNode *Node = dyn_cast<yaml::SequenceNode>(
-                                              Stream.begin()->getRoot());
-
-  auto Begin = Node->begin();
-  auto End = Node->end();
-
-  EXPECT_TRUE(Begin != End);
-  EXPECT_FALSE(Begin != Begin);
-  EXPECT_FALSE(End != End);
-}
-
-TEST(YAMLParser, SameNodeIteratorOperatorEquals) {
-  SourceMgr SM;
-  yaml::Stream Stream("[\"1\", \"2\"]", SM);
-
-  yaml::SequenceNode *Node = dyn_cast<yaml::SequenceNode>(
-                                              Stream.begin()->getRoot());
-
-  auto Begin = Node->begin();
-  auto End = Node->end();
-
-  EXPECT_FALSE(Begin == End);
-  EXPECT_TRUE(Begin == Begin);
-  EXPECT_TRUE(End == End);
-}
-
-TEST(YAMLParser, DifferentNodesIteratorOperatorNotEquals) {
-  SourceMgr SM;
-  yaml::Stream Stream("[\"1\", \"2\"]", SM);
-  yaml::Stream AnotherStream("[\"1\", \"2\"]", SM);
-
-  yaml::SequenceNode *Node = dyn_cast<yaml::SequenceNode>(
-                                                  Stream.begin()->getRoot());
-  yaml::SequenceNode *AnotherNode = dyn_cast<yaml::SequenceNode>(
-                                              AnotherStream.begin()->getRoot());
-
-  auto Begin = Node->begin();
-  auto End = Node->end();
-
-  auto AnotherBegin = AnotherNode->begin();
-  auto AnotherEnd = AnotherNode->end();
-
-  EXPECT_TRUE(Begin != AnotherBegin);
-  EXPECT_TRUE(Begin != AnotherEnd);
-  EXPECT_FALSE(End != AnotherEnd);
-}
-
-TEST(YAMLParser, DifferentNodesIteratorOperatorEquals) {
-  SourceMgr SM;
-  yaml::Stream Stream("[\"1\", \"2\"]", SM);
-  yaml::Stream AnotherStream("[\"1\", \"2\"]", SM);
-
-  yaml::SequenceNode *Node = dyn_cast<yaml::SequenceNode>(
-                                                    Stream.begin()->getRoot());
-  yaml::SequenceNode *AnotherNode = dyn_cast<yaml::SequenceNode>(
-                                             AnotherStream.begin()->getRoot());
-
-  auto Begin = Node->begin();
-  auto End = Node->end();
-
-  auto AnotherBegin = AnotherNode->begin();
-  auto AnotherEnd = AnotherNode->end();
-
-  EXPECT_FALSE(Begin == AnotherBegin);
-  EXPECT_FALSE(Begin == AnotherEnd);
-  EXPECT_TRUE(End == AnotherEnd);
-}
-
-TEST(YAMLParser, FlowSequenceTokensOutsideFlowSequence) {
-  auto FlowSequenceStrs = {",", "]", "}"};
-  SourceMgr SM;
-
-  for (auto &Str : FlowSequenceStrs) {
-    yaml::Stream Stream(Str, SM);
-    yaml::Document &Doc = *Stream.begin();
-    EXPECT_FALSE(Doc.skip());
-  }
-}
-
-static void expectCanParseBool(StringRef S, bool Expected) {
-  llvm::Optional<bool> Parsed = yaml::parseBool(S);
-  EXPECT_TRUE(Parsed.hasValue());
-  EXPECT_EQ(*Parsed, Expected);
-}
-
-static void expectCannotParseBool(StringRef S) {
-  EXPECT_FALSE(yaml::parseBool(S).hasValue());
-}
-
-TEST(YAMLParser, ParsesBools) {
-  // Test true values.
-  expectCanParseBool("ON", true);
-  expectCanParseBool("On", true);
-  expectCanParseBool("on", true);
-  expectCanParseBool("TRUE", true);
-  expectCanParseBool("True", true);
-  expectCanParseBool("true", true);
-  expectCanParseBool("Y", true);
-  expectCanParseBool("y", true);
-  expectCanParseBool("YES", true);
-  expectCanParseBool("Yes", true);
-  expectCanParseBool("yes", true);
-  expectCannotParseBool("1");
-
-  // Test false values.
-  expectCanParseBool("FALSE", false);
-  expectCanParseBool("False", false);
-  expectCanParseBool("false", false);
-  expectCanParseBool("N", false);
-  expectCanParseBool("n", false);
-  expectCanParseBool("NO", false);
-  expectCanParseBool("No", false);
-  expectCanParseBool("no", false);
-  expectCanParseBool("OFF", false);
-  expectCanParseBool("Off", false);
-  expectCanParseBool("off", false);
-  expectCannotParseBool("0");
-}
-
-} // end namespace llvm
diff --git a/gnu/llvm/llvm/unittests/Support/formatted_raw_ostream_test.cpp b/gnu/llvm/llvm/unittests/Support/formatted_raw_ostream_test.cpp
deleted file mode 100644
index 5c57f1f1870..00000000000
--- a/gnu/llvm/llvm/unittests/Support/formatted_raw_ostream_test.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-//===- llvm/unittest/Support/formatted_raw_ostream_test.cpp ---------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/SmallString.h"
-#include "llvm/Support/FormattedStream.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST(formatted_raw_ostreamTest, Test_Tell) {
-  // Check offset when underlying stream has buffer contents.
-  SmallString<128> A;
-  raw_svector_ostream B(A);
-  formatted_raw_ostream C(B);
-  char tmp[100] = "";
-
-  for (unsigned i = 0; i != 3; ++i) {
-    C.write(tmp, 100);
-
-    EXPECT_EQ(100*(i+1), (unsigned) C.tell());
-  }
-}
-
-TEST(formatted_raw_ostreamTest, Test_LineColumn) {
-  // Test tracking of line and column numbers in a stream.
-  SmallString<128> A;
-  raw_svector_ostream B(A);
-  formatted_raw_ostream C(B);
-
-  EXPECT_EQ(0U, C.getLine());
-  EXPECT_EQ(0U, C.getColumn());
-
-  C << "a";
-  EXPECT_EQ(0U, C.getLine());
-  EXPECT_EQ(1U, C.getColumn());
-
-  C << "bcdef";
-  EXPECT_EQ(0U, C.getLine());
-  EXPECT_EQ(6U, C.getColumn());
-
-  // '\n' increments line number, sets column to zero.
-  C << "\n";
-  EXPECT_EQ(1U, C.getLine());
-  EXPECT_EQ(0U, C.getColumn());
-
-  // '\r sets column to zero without changing line number
-  C << "foo\r";
-  EXPECT_EQ(1U, C.getLine());
-  EXPECT_EQ(0U, C.getColumn());
-
-  // '\t' advances column to the next multiple of 8.
-  // FIXME: If the column number is already a multiple of 8 this will do
-  // nothing, is this behaviour correct?
-  C << "1\t";
-  EXPECT_EQ(8U, C.getColumn());
-  C << "\t";
-  EXPECT_EQ(8U, C.getColumn());
-  C << "1234567\t";
-  EXPECT_EQ(16U, C.getColumn());
-  EXPECT_EQ(1U, C.getLine());
-}
-
-TEST(formatted_raw_ostreamTest, Test_Flush) {
-  // Flushing the buffer causes the characters in the buffer to be scanned
-  // before the buffer is emptied, so line and column numbers will still be
-  // tracked properly.
-  SmallString<128> A;
-  raw_svector_ostream B(A);
-  B.SetBufferSize(32);
-  formatted_raw_ostream C(B);
-
-  C << "\nabc";
-  EXPECT_EQ(4U, C.GetNumBytesInBuffer());
-  C.flush();
-  EXPECT_EQ(1U, C.getLine());
-  EXPECT_EQ(3U, C.getColumn());
-  EXPECT_EQ(0U, C.GetNumBytesInBuffer());
-}
-
-TEST(formatted_raw_ostreamTest, Test_UTF8) {
-  SmallString<128> A;
-  raw_svector_ostream B(A);
-  B.SetBufferSize(32);
-  formatted_raw_ostream C(B);
-
-  // U+00A0 Non-breaking space: encoded as two bytes, but only one column wide.
-  C << u8"\u00a0";
-  EXPECT_EQ(0U, C.getLine());
-  EXPECT_EQ(1U, C.getColumn());
-  EXPECT_EQ(2U, C.GetNumBytesInBuffer());
-
-  // U+2468 CIRCLED DIGIT NINE: encoded as three bytes, but only one column
-  // wide.
-  C << u8"\u2468";
-  EXPECT_EQ(0U, C.getLine());
-  EXPECT_EQ(2U, C.getColumn());
-  EXPECT_EQ(5U, C.GetNumBytesInBuffer());
-
-  // U+00010000 LINEAR B SYLLABLE B008 A: encoded as four bytes, but only one
-  // column wide.
-  C << u8"\U00010000";
-  EXPECT_EQ(0U, C.getLine());
-  EXPECT_EQ(3U, C.getColumn());
-  EXPECT_EQ(9U, C.GetNumBytesInBuffer());
-
-  // U+55B5, CJK character, encodes as three bytes, takes up two columns.
-  C << u8"\u55b5";
-  EXPECT_EQ(0U, C.getLine());
-  EXPECT_EQ(5U, C.getColumn());
-  EXPECT_EQ(12U, C.GetNumBytesInBuffer());
-
-  // U+200B, zero-width space, encoded as three bytes but has no effect on the
-  // column or line number.
-  C << u8"\u200b";
-  EXPECT_EQ(0U, C.getLine());
-  EXPECT_EQ(5U, C.getColumn());
-  EXPECT_EQ(15U, C.GetNumBytesInBuffer());
-}
-
-TEST(formatted_raw_ostreamTest, Test_UTF8Buffered) {
-  SmallString<128> A;
-  raw_svector_ostream B(A);
-  B.SetBufferSize(4);
-  formatted_raw_ostream C(B);
-
-  // U+2468 encodes as three bytes, so will cause the buffer to be flushed after
-  // the first byte (4 byte buffer, 3 bytes already written). We need to save
-  // the first part of the UTF-8 encoding until after the buffer is cleared and
-  // the remaining two bytes are written, at which point we can check the
-  // display width. In this case the display width is 1, so we end at column 4,
-  // with 6 bytes written into total, 2 of which are in the buffer.
-  C << u8"123\u2468";
-  EXPECT_EQ(0U, C.getLine());
-  EXPECT_EQ(4U, C.getColumn());
-  EXPECT_EQ(2U, C.GetNumBytesInBuffer());
-  C.flush();
-  EXPECT_EQ(6U, A.size());
-
-  // Same as above, but with a CJK character which displays as two columns.
-  C << u8"123\u55b5";
-  EXPECT_EQ(0U, C.getLine());
-  EXPECT_EQ(9U, C.getColumn());
-  EXPECT_EQ(2U, C.GetNumBytesInBuffer());
-  C.flush();
-  EXPECT_EQ(12U, A.size());
-}
-
-TEST(formatted_raw_ostreamTest, Test_UTF8TinyBuffer) {
-  SmallString<128> A;
-  raw_svector_ostream B(A);
-  B.SetBufferSize(1);
-  formatted_raw_ostream C(B);
-
-  // The stream has a one-byte buffer, so it gets flushed multiple times while
-  // printing a single Unicode character.
-  C << u8"\u2468";
-  EXPECT_EQ(0U, C.getLine());
-  EXPECT_EQ(1U, C.getColumn());
-  EXPECT_EQ(0U, C.GetNumBytesInBuffer());
-  C.flush();
-  EXPECT_EQ(3U, A.size());
-}
-}
diff --git a/gnu/llvm/llvm/unittests/Support/raw_fd_stream_test.cpp b/gnu/llvm/llvm/unittests/Support/raw_fd_stream_test.cpp
deleted file mode 100644
index 00d834da321..00000000000
--- a/gnu/llvm/llvm/unittests/Support/raw_fd_stream_test.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-//===- llvm/unittest/Support/raw_fd_stream_test.cpp - raw_fd_stream tests -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/SmallString.h"
-#include "llvm/Config/llvm-config.h"
-#include "llvm/Support/Casting.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/FileUtilities.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST(raw_fd_streamTest, ReadAfterWrite) {
-  SmallString<64> Path;
-  int FD;
-  ASSERT_FALSE(sys::fs::createTemporaryFile("foo", "bar", FD, Path));
-  FileRemover Cleanup(Path);
-  std::error_code EC;
-  raw_fd_stream OS(Path, EC);
-  EXPECT_TRUE(!EC);
-
-  char Bytes[8];
-
-  OS.write("01234567", 8);
-
-  OS.seek(3);
-  EXPECT_EQ(OS.read(Bytes, 2), 2);
-  EXPECT_EQ(Bytes[0], '3');
-  EXPECT_EQ(Bytes[1], '4');
-
-  OS.seek(4);
-  OS.write("xyz", 3);
-
-  OS.seek(0);
-  EXPECT_EQ(OS.read(Bytes, 8), 8);
-  EXPECT_EQ(Bytes[0], '0');
-  EXPECT_EQ(Bytes[1], '1');
-  EXPECT_EQ(Bytes[2], '2');
-  EXPECT_EQ(Bytes[3], '3');
-  EXPECT_EQ(Bytes[4], 'x');
-  EXPECT_EQ(Bytes[5], 'y');
-  EXPECT_EQ(Bytes[6], 'z');
-  EXPECT_EQ(Bytes[7], '7');
-}
-
-TEST(raw_fd_streamTest, DynCast) {
-  {
-    std::error_code EC;
-    raw_fd_stream OS("-", EC);
-    EXPECT_TRUE(dyn_cast<raw_fd_stream>(&OS));
-  }
-  {
-    std::error_code EC;
-    raw_fd_ostream OS("-", EC);
-    EXPECT_FALSE(dyn_cast<raw_fd_stream>(&OS));
-  }
-}
-
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/Support/raw_ostream_test.cpp b/gnu/llvm/llvm/unittests/Support/raw_ostream_test.cpp
deleted file mode 100644
index d8e17324ecd..00000000000
--- a/gnu/llvm/llvm/unittests/Support/raw_ostream_test.cpp
+++ /dev/null
@@ -1,546 +0,0 @@
-//===- llvm/unittest/Support/raw_ostream_test.cpp - raw_ostream tests -----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/SmallString.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/FileUtilities.h"
-#include "llvm/Support/Format.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/Testing/Support/Error.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-template<typename T> std::string printToString(const T &Value) {
-  std::string res;
-  {
-    llvm::raw_string_ostream OS(res);
-    OS.SetBuffered();
-    OS << Value;
-  }
-  return res;
-}
-
-/// printToString - Print the given value to a stream which only has \arg
-/// BytesLeftInBuffer bytes left in the buffer. This is useful for testing edge
-/// cases in the buffer handling logic.
-template<typename T> std::string printToString(const T &Value,
-                                               unsigned BytesLeftInBuffer) {
-  // FIXME: This is relying on internal knowledge of how raw_ostream works to
-  // get the buffer position right.
-  SmallString<256> SVec;
-  assert(BytesLeftInBuffer < 256 && "Invalid buffer count!");
-  llvm::raw_svector_ostream OS(SVec);
-  unsigned StartIndex = 256 - BytesLeftInBuffer;
-  for (unsigned i = 0; i != StartIndex; ++i)
-    OS << '?';
-  OS << Value;
-  return std::string(OS.str().substr(StartIndex));
-}
-
-template<typename T> std::string printToStringUnbuffered(const T &Value) {
-  std::string res;
-  llvm::raw_string_ostream OS(res);
-  OS.SetUnbuffered();
-  OS << Value;
-  return res;
-}
-
-struct X {};
-
-raw_ostream &operator<<(raw_ostream &OS, const X &) { return OS << 'X'; }
-
-TEST(raw_ostreamTest, Types_Buffered) {
-  // Char
-  EXPECT_EQ("c", printToString('c'));
-
-  // String
-  EXPECT_EQ("hello", printToString("hello"));
-  EXPECT_EQ("hello", printToString(std::string("hello")));
-
-  // Int
-  EXPECT_EQ("0", printToString(0));
-  EXPECT_EQ("2425", printToString(2425));
-  EXPECT_EQ("-2425", printToString(-2425));
-
-  // Long long
-  EXPECT_EQ("0", printToString(0LL));
-  EXPECT_EQ("257257257235709", printToString(257257257235709LL));
-  EXPECT_EQ("-257257257235709", printToString(-257257257235709LL));
-
-  // Double
-  EXPECT_EQ("1.100000e+00", printToString(1.1));
-
-  // void*
-  EXPECT_EQ("0x0", printToString((void*) nullptr));
-  EXPECT_EQ("0xbeef", printToString((void*) 0xbeefLL));
-  EXPECT_EQ("0xdeadbeef", printToString((void*) 0xdeadbeefLL));
-
-  // Min and max.
-  EXPECT_EQ("18446744073709551615", printToString(UINT64_MAX));
-  EXPECT_EQ("-9223372036854775808", printToString(INT64_MIN));
-
-  // X, checking free operator<<().
-  EXPECT_EQ("X", printToString(X{}));
-}
-
-TEST(raw_ostreamTest, Types_Unbuffered) {  
-  // Char
-  EXPECT_EQ("c", printToStringUnbuffered('c'));
-
-  // String
-  EXPECT_EQ("hello", printToStringUnbuffered("hello"));
-  EXPECT_EQ("hello", printToStringUnbuffered(std::string("hello")));
-
-  // Int
-  EXPECT_EQ("0", printToStringUnbuffered(0));
-  EXPECT_EQ("2425", printToStringUnbuffered(2425));
-  EXPECT_EQ("-2425", printToStringUnbuffered(-2425));
-
-  // Long long
-  EXPECT_EQ("0", printToStringUnbuffered(0LL));
-  EXPECT_EQ("257257257235709", printToStringUnbuffered(257257257235709LL));
-  EXPECT_EQ("-257257257235709", printToStringUnbuffered(-257257257235709LL));
-
-  // Double
-  EXPECT_EQ("1.100000e+00", printToStringUnbuffered(1.1));
-
-  // void*
-  EXPECT_EQ("0x0", printToStringUnbuffered((void*) nullptr));
-  EXPECT_EQ("0xbeef", printToStringUnbuffered((void*) 0xbeefLL));
-  EXPECT_EQ("0xdeadbeef", printToStringUnbuffered((void*) 0xdeadbeefLL));
-
-  // Min and max.
-  EXPECT_EQ("18446744073709551615", printToStringUnbuffered(UINT64_MAX));
-  EXPECT_EQ("-9223372036854775808", printToStringUnbuffered(INT64_MIN));
-
-  // X, checking free operator<<().
-  EXPECT_EQ("X", printToString(X{}));
-}
-
-TEST(raw_ostreamTest, BufferEdge) {  
-  EXPECT_EQ("1.20", printToString(format("%.2f", 1.2), 1));
-  EXPECT_EQ("1.20", printToString(format("%.2f", 1.2), 2));
-  EXPECT_EQ("1.20", printToString(format("%.2f", 1.2), 3));
-  EXPECT_EQ("1.20", printToString(format("%.2f", 1.2), 4));
-  EXPECT_EQ("1.20", printToString(format("%.2f", 1.2), 10));
-}
-
-TEST(raw_ostreamTest, TinyBuffer) {
-  std::string Str;
-  raw_string_ostream OS(Str);
-  OS.SetBufferSize(1);
-  OS << "hello";
-  OS << 1;
-  OS << 'w' << 'o' << 'r' << 'l' << 'd';
-  EXPECT_EQ("hello1world", OS.str());
-}
-
-TEST(raw_ostreamTest, WriteEscaped) {
-  std::string Str;
-
-  Str = "";
-  raw_string_ostream(Str).write_escaped("hi");
-  EXPECT_EQ("hi", Str);
-
-  Str = "";
-  raw_string_ostream(Str).write_escaped("\\\t\n\"");
-  EXPECT_EQ("\\\\\\t\\n\\\"", Str);
-
-  Str = "";
-  raw_string_ostream(Str).write_escaped("\1\10\200");
-  EXPECT_EQ("\\001\\010\\200", Str);
-}
-
-TEST(raw_ostreamTest, Justify) {  
-  EXPECT_EQ("xyz   ", printToString(left_justify("xyz", 6), 6));
-  EXPECT_EQ("abc",    printToString(left_justify("abc", 3), 3));
-  EXPECT_EQ("big",    printToString(left_justify("big", 1), 3));
-  EXPECT_EQ("   xyz", printToString(right_justify("xyz", 6), 6));
-  EXPECT_EQ("abc",    printToString(right_justify("abc", 3), 3));
-  EXPECT_EQ("big",    printToString(right_justify("big", 1), 3));
-  EXPECT_EQ("   on    ",    printToString(center_justify("on", 9), 9));
-  EXPECT_EQ("   off    ",    printToString(center_justify("off", 10), 10));
-  EXPECT_EQ("single ",    printToString(center_justify("single", 7), 7));
-  EXPECT_EQ("none",    printToString(center_justify("none", 1), 4));
-  EXPECT_EQ("none",    printToString(center_justify("none", 1), 1));
-}
-
-TEST(raw_ostreamTest, FormatHex) {  
-  EXPECT_EQ("0x1234",     printToString(format_hex(0x1234, 6), 6));
-  EXPECT_EQ("0x001234",   printToString(format_hex(0x1234, 8), 8));
-  EXPECT_EQ("0x00001234", printToString(format_hex(0x1234, 10), 10));
-  EXPECT_EQ("0x1234",     printToString(format_hex(0x1234, 4), 6));
-  EXPECT_EQ("0xff",       printToString(format_hex(255, 4), 4));
-  EXPECT_EQ("0xFF",       printToString(format_hex(255, 4, true), 4));
-  EXPECT_EQ("0x1",        printToString(format_hex(1, 3), 3));
-  EXPECT_EQ("0x12",       printToString(format_hex(0x12, 3), 4));
-  EXPECT_EQ("0x123",      printToString(format_hex(0x123, 3), 5));
-  EXPECT_EQ("FF",         printToString(format_hex_no_prefix(0xFF, 2, true), 4));
-  EXPECT_EQ("ABCD",       printToString(format_hex_no_prefix(0xABCD, 2, true), 4));
-  EXPECT_EQ("0xffffffffffffffff",     
-                          printToString(format_hex(UINT64_MAX, 18), 18));
-  EXPECT_EQ("0x8000000000000000",     
-                          printToString(format_hex((INT64_MIN), 18), 18));
-}
-
-TEST(raw_ostreamTest, FormatDecimal) {  
-  EXPECT_EQ("   0",        printToString(format_decimal(0, 4), 4));
-  EXPECT_EQ("  -1",        printToString(format_decimal(-1, 4), 4));
-  EXPECT_EQ("    -1",      printToString(format_decimal(-1, 6), 6));
-  EXPECT_EQ("1234567890",  printToString(format_decimal(1234567890, 10), 10));
-  EXPECT_EQ("  9223372036854775807", 
-                          printToString(format_decimal(INT64_MAX, 21), 21));
-  EXPECT_EQ(" -9223372036854775808", 
-                          printToString(format_decimal(INT64_MIN, 21), 21));
-}
-
-static std::string formatted_bytes_str(ArrayRef<uint8_t> Bytes,
-                                       llvm::Optional<uint64_t> Offset = None,
-                                       uint32_t NumPerLine = 16,
-                                       uint8_t ByteGroupSize = 4) {
-  std::string S;
-  raw_string_ostream Str(S);
-  Str << format_bytes(Bytes, Offset, NumPerLine, ByteGroupSize);
-  Str.flush();
-  return S;
-}
-
-static std::string format_bytes_with_ascii_str(ArrayRef<uint8_t> Bytes,
-                                               Optional<uint64_t> Offset = None,
-                                               uint32_t NumPerLine = 16,
-                                               uint8_t ByteGroupSize = 4) {
-  std::string S;
-  raw_string_ostream Str(S);
-  Str << format_bytes_with_ascii(Bytes, Offset, NumPerLine, ByteGroupSize);
-  Str.flush();
-  return S;
-}
-
-TEST(raw_ostreamTest, FormattedHexBytes) {
-  std::vector<uint8_t> Buf = {'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i',
-                              'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r',
-                              's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0',
-                              '1', '2', '3', '4', '5', '6', '7', '8', '9'};
-  ArrayRef<uint8_t> B(Buf);
-
-  // Test invalid input.
-  EXPECT_EQ("", formatted_bytes_str(ArrayRef<uint8_t>()));
-  EXPECT_EQ("", format_bytes_with_ascii_str(ArrayRef<uint8_t>()));
-  //----------------------------------------------------------------------
-  // Test hex byte output with the default 4 byte groups
-  //----------------------------------------------------------------------
-  EXPECT_EQ("61", formatted_bytes_str(B.take_front()));
-  EXPECT_EQ("61626364 65", formatted_bytes_str(B.take_front(5)));
-  // Test that 16 bytes get written to a line correctly.
-  EXPECT_EQ("61626364 65666768 696a6b6c 6d6e6f70",
-            formatted_bytes_str(B.take_front(16)));
-  // Test raw bytes with default 16 bytes per line wrapping.
-  EXPECT_EQ("61626364 65666768 696a6b6c 6d6e6f70\n71",
-            formatted_bytes_str(B.take_front(17)));
-  // Test raw bytes with 1 bytes per line wrapping.
-  EXPECT_EQ("61\n62\n63\n64\n65\n66",
-            formatted_bytes_str(B.take_front(6), None, 1));
-  // Test raw bytes with 7 bytes per line wrapping.
-  EXPECT_EQ("61626364 656667\n68696a6b 6c6d6e\n6f7071",
-            formatted_bytes_str(B.take_front(17), None, 7));
-  // Test raw bytes with 8 bytes per line wrapping.
-  EXPECT_EQ("61626364 65666768\n696a6b6c 6d6e6f70\n71",
-            formatted_bytes_str(B.take_front(17), None, 8));
-  //----------------------------------------------------------------------
-  // Test hex byte output with the 1 byte groups
-  //----------------------------------------------------------------------
-  EXPECT_EQ("61 62 63 64 65",
-            formatted_bytes_str(B.take_front(5), None, 16, 1));
-  // Test that 16 bytes get written to a line correctly.
-  EXPECT_EQ("61 62 63 64 65 66 67 68 69 6a 6b 6c 6d 6e 6f 70",
-            formatted_bytes_str(B.take_front(16), None, 16, 1));
-  // Test raw bytes with default 16 bytes per line wrapping.
-  EXPECT_EQ("61 62 63 64 65 66 67 68 69 6a 6b 6c 6d 6e 6f 70\n71",
-            formatted_bytes_str(B.take_front(17), None, 16, 1));
-  // Test raw bytes with 7 bytes per line wrapping.
-  EXPECT_EQ("61 62 63 64 65 66 67\n68 69 6a 6b 6c 6d 6e\n6f 70 71",
-            formatted_bytes_str(B.take_front(17), None, 7, 1));
-  // Test raw bytes with 8 bytes per line wrapping.
-  EXPECT_EQ("61 62 63 64 65 66 67 68\n69 6a 6b 6c 6d 6e 6f 70\n71",
-            formatted_bytes_str(B.take_front(17), None, 8, 1));
-
-  //----------------------------------------------------------------------
-  // Test hex byte output with the 2 byte groups
-  //----------------------------------------------------------------------
-  EXPECT_EQ("6162 6364 65", formatted_bytes_str(B.take_front(5), None, 16, 2));
-  // Test that 16 bytes get written to a line correctly.
-  EXPECT_EQ("6162 6364 6566 6768 696a 6b6c 6d6e 6f70",
-            formatted_bytes_str(B.take_front(16), None, 16, 2));
-  // Test raw bytes with default 16 bytes per line wrapping.
-  EXPECT_EQ("6162 6364 6566 6768 696a 6b6c 6d6e 6f70\n71",
-            formatted_bytes_str(B.take_front(17), None, 16, 2));
-  // Test raw bytes with 7 bytes per line wrapping.
-  EXPECT_EQ("6162 6364 6566 67\n6869 6a6b 6c6d 6e\n6f70 71",
-            formatted_bytes_str(B.take_front(17), None, 7, 2));
-  // Test raw bytes with 8 bytes per line wrapping.
-  EXPECT_EQ("6162 6364 6566 6768\n696a 6b6c 6d6e 6f70\n71",
-            formatted_bytes_str(B.take_front(17), None, 8, 2));
-
-  //----------------------------------------------------------------------
-  // Test hex bytes with offset with the default 4 byte groups.
-  //----------------------------------------------------------------------
-  EXPECT_EQ("0000: 61", formatted_bytes_str(B.take_front(), 0x0));
-  EXPECT_EQ("1000: 61", formatted_bytes_str(B.take_front(), 0x1000));
-  EXPECT_EQ("1000: 61\n1001: 62",
-            formatted_bytes_str(B.take_front(2), 0x1000, 1));
-  //----------------------------------------------------------------------
-  // Test hex bytes with ASCII with the default 4 byte groups.
-  //----------------------------------------------------------------------
-  EXPECT_EQ("61626364 65666768 696a6b6c 6d6e6f70  |abcdefghijklmnop|",
-            format_bytes_with_ascii_str(B.take_front(16)));
-  EXPECT_EQ("61626364 65666768  |abcdefgh|\n"
-            "696a6b6c 6d6e6f70  |ijklmnop|",
-            format_bytes_with_ascii_str(B.take_front(16), None, 8));
-  EXPECT_EQ("61626364 65666768  |abcdefgh|\n696a6b6c           |ijkl|",
-            format_bytes_with_ascii_str(B.take_front(12), None, 8));
-  std::vector<uint8_t> Unprintable = {'a', '\x1e', 'b', '\x1f'};
-  // Make sure the ASCII is still lined up correctly when fewer bytes than 16
-  // bytes per line are available. The ASCII should still be aligned as if 16
-  // bytes of hex might be displayed.
-  EXPECT_EQ("611e621f                             |a.b.|",
-            format_bytes_with_ascii_str(Unprintable));
-  //----------------------------------------------------------------------
-  // Test hex bytes with ASCII with offsets with the default 4 byte groups.
-  //----------------------------------------------------------------------
-  EXPECT_EQ("0000: 61626364 65666768 "
-            "696a6b6c 6d6e6f70  |abcdefghijklmnop|",
-            format_bytes_with_ascii_str(B.take_front(16), 0));
-  EXPECT_EQ("0000: 61626364 65666768  |abcdefgh|\n"
-            "0008: 696a6b6c 6d6e6f70  |ijklmnop|",
-            format_bytes_with_ascii_str(B.take_front(16), 0, 8));
-  EXPECT_EQ("0000: 61626364 656667  |abcdefg|\n"
-            "0007: 68696a6b 6c      |hijkl|",
-            format_bytes_with_ascii_str(B.take_front(12), 0, 7));
-
-  //----------------------------------------------------------------------
-  // Test hex bytes with ASCII with offsets with the default 2 byte groups.
-  //----------------------------------------------------------------------
-  EXPECT_EQ("0000: 6162 6364 6566 6768 "
-            "696a 6b6c 6d6e 6f70  |abcdefghijklmnop|",
-            format_bytes_with_ascii_str(B.take_front(16), 0, 16, 2));
-  EXPECT_EQ("0000: 6162 6364 6566 6768  |abcdefgh|\n"
-            "0008: 696a 6b6c 6d6e 6f70  |ijklmnop|",
-            format_bytes_with_ascii_str(B.take_front(16), 0, 8, 2));
-  EXPECT_EQ("0000: 6162 6364 6566 67  |abcdefg|\n"
-            "0007: 6869 6a6b 6c       |hijkl|",
-            format_bytes_with_ascii_str(B.take_front(12), 0, 7, 2));
-
-  //----------------------------------------------------------------------
-  // Test hex bytes with ASCII with offsets with the default 1 byte groups.
-  //----------------------------------------------------------------------
-  EXPECT_EQ("0000: 61 62 63 64 65 66 67 68 "
-            "69 6a 6b 6c 6d 6e 6f 70  |abcdefghijklmnop|",
-            format_bytes_with_ascii_str(B.take_front(16), 0, 16, 1));
-  EXPECT_EQ("0000: 61 62 63 64 65 66 67 68  |abcdefgh|\n"
-            "0008: 69 6a 6b 6c 6d 6e 6f 70  |ijklmnop|",
-            format_bytes_with_ascii_str(B.take_front(16), 0, 8, 1));
-  EXPECT_EQ("0000: 61 62 63 64 65 66 67  |abcdefg|\n"
-            "0007: 68 69 6a 6b 6c        |hijkl|",
-            format_bytes_with_ascii_str(B.take_front(12), 0, 7, 1));
-}
-
-#ifdef LLVM_ON_UNIX
-TEST(raw_ostreamTest, Colors) {
-  {
-    std::string S;
-    raw_string_ostream Sos(S);
-    Sos.enable_colors(false);
-    Sos.changeColor(raw_ostream::YELLOW);
-    EXPECT_EQ("", Sos.str());
-  }
-
-  {
-    std::string S;
-    raw_string_ostream Sos(S);
-    Sos.enable_colors(true);
-    Sos.changeColor(raw_ostream::YELLOW);
-    EXPECT_EQ("\x1B[0;33m", Sos.str());
-  }
-}
-#endif
-
-TEST(raw_fd_ostreamTest, multiple_raw_fd_ostream_to_stdout) {
-  std::error_code EC;
-
-  { raw_fd_ostream("-", EC, sys::fs::OpenFlags::OF_None); }
-  { raw_fd_ostream("-", EC, sys::fs::OpenFlags::OF_None); }
-}
-
-TEST(raw_ostreamTest, flush_tied_to_stream_on_write) {
-  std::string TiedToBuffer;
-  raw_string_ostream TiedTo(TiedToBuffer);
-  TiedTo.SetBuffered();
-  TiedTo << "a";
-
-  std::string Buffer;
-  raw_string_ostream TiedStream(Buffer);
-  TiedStream.tie(&TiedTo);
-  // Sanity check that the stream hasn't already been flushed.
-  EXPECT_EQ("", TiedToBuffer);
-
-  // Empty string doesn't cause a flush of TiedTo.
-  TiedStream << "";
-  EXPECT_EQ("", TiedToBuffer);
-
-  // Non-empty strings trigger flush of TiedTo.
-  TiedStream << "abc";
-  EXPECT_EQ("a", TiedToBuffer);
-
-  // Single char write flushes TiedTo.
-  TiedTo << "c";
-  TiedStream << 'd';
-  EXPECT_EQ("ac", TiedToBuffer);
-
-  // Write to buffered stream without flush does not flush TiedTo.
-  TiedStream.SetBuffered();
-  TiedStream.SetBufferSize(2);
-  TiedTo << "e";
-  TiedStream << "f";
-  EXPECT_EQ("ac", TiedToBuffer);
-
-  // Explicit flush of buffered stream flushes TiedTo.
-  TiedStream.flush();
-  EXPECT_EQ("ace", TiedToBuffer);
-
-  // Explicit flush of buffered stream with empty buffer does not flush TiedTo.
-  TiedTo << "g";
-  TiedStream.flush();
-  EXPECT_EQ("ace", TiedToBuffer);
-
-  // Write of data to empty buffer that is greater than buffer size flushes
-  // TiedTo.
-  TiedStream << "hijklm";
-  EXPECT_EQ("aceg", TiedToBuffer);
-
-  // Write of data that overflows buffer size also flushes TiedTo.
-  TiedStream.flush();
-  TiedStream << "n";
-  TiedTo << "o";
-  TiedStream << "pq";
-  EXPECT_EQ("acego", TiedToBuffer);
-
-  // Streams can be tied to each other safely.
-  TiedStream.flush();
-  Buffer = "";
-  TiedTo.tie(&TiedStream);
-  TiedTo.SetBufferSize(2);
-  TiedStream << "r";
-  TiedTo << "s";
-  EXPECT_EQ("", Buffer);
-  EXPECT_EQ("acego", TiedToBuffer);
-  TiedTo << "tuv";
-  EXPECT_EQ("r", Buffer);
-  TiedStream << "wxy";
-  EXPECT_EQ("acegostuv", TiedToBuffer);
-  // The x remains in the buffer, since it was written after the flush of
-  // TiedTo.
-  EXPECT_EQ("rwx", Buffer);
-  TiedTo.tie(nullptr);
-
-  // Calling tie with nullptr unties stream.
-  TiedStream.SetUnbuffered();
-  TiedStream.tie(nullptr);
-  TiedTo << "y";
-  TiedStream << "0";
-  EXPECT_EQ("acegostuv", TiedToBuffer);
-}
-
-TEST(raw_ostreamTest, reserve_stream) {
-  std::string Str;
-  raw_string_ostream OS(Str);
-  OS << "11111111111111111111";
-  uint64_t CurrentPos = OS.tell();
-  OS.reserveExtraSpace(1000);
-  EXPECT_TRUE(Str.capacity() >= CurrentPos + 1000);
-  OS << "hello";
-  OS << 1;
-  OS << 'w' << 'o' << 'r' << 'l' << 'd';
-  OS.flush();
-  EXPECT_EQ("11111111111111111111hello1world", Str);
-}
-
-static void checkFileData(StringRef FileName, StringRef GoldenData) {
-  ErrorOr<std::unique_ptr<MemoryBuffer>> BufOrErr =
-      MemoryBuffer::getFileOrSTDIN(FileName);
-  EXPECT_FALSE(BufOrErr.getError());
-
-  EXPECT_EQ((*BufOrErr)->getBufferSize(), GoldenData.size());
-  EXPECT_EQ(memcmp((*BufOrErr)->getBufferStart(), GoldenData.data(),
-                   GoldenData.size()),
-            0);
-}
-
-TEST(raw_ostreamTest, writeToOutputFile) {
-  SmallString<64> Path;
-  int FD;
-  ASSERT_FALSE(sys::fs::createTemporaryFile("foo", "bar", FD, Path));
-  FileRemover Cleanup(Path);
-
-  ASSERT_THAT_ERROR(writeToOutput(Path,
-                                  [](raw_ostream &Out) -> Error {
-                                    Out << "HelloWorld";
-                                    return Error::success();
-                                  }),
-                    Succeeded());
-  checkFileData(Path, "HelloWorld");
-}
-
-TEST(raw_ostreamTest, writeToNonexistingPath) {
-  StringRef FileName = "/_bad/_path";
-  std::string ErrorMessage = toString(createFileError(
-      FileName, make_error_code(errc::no_such_file_or_directory)));
-
-  EXPECT_THAT_ERROR(writeToOutput(FileName,
-                                  [](raw_ostream &Out) -> Error {
-                                    Out << "HelloWorld";
-                                    return Error::success();
-                                  }),
-                    FailedWithMessage(ErrorMessage));
-}
-
-TEST(raw_ostreamTest, writeToDevNull) {
-  bool DevNullIsUsed = false;
-
-  EXPECT_THAT_ERROR(
-      writeToOutput("/dev/null",
-                    [&](raw_ostream &Out) -> Error {
-                      DevNullIsUsed =
-                          testing::internal::CheckedDowncastToActualType<
-                              raw_null_ostream, raw_ostream>(&Out);
-                      return Error::success();
-                    }),
-      Succeeded());
-
-  EXPECT_TRUE(DevNullIsUsed);
-}
-
-TEST(raw_ostreamTest, writeToStdOut) {
-  outs().flush();
-  testing::internal::CaptureStdout();
-
-  EXPECT_THAT_ERROR(writeToOutput("-",
-                                  [](raw_ostream &Out) -> Error {
-                                    Out << "HelloWorld";
-                                    return Error::success();
-                                  }),
-                    Succeeded());
-  outs().flush();
-
-  std::string CapturedStdOut = testing::internal::GetCapturedStdout();
-  EXPECT_EQ(CapturedStdOut, "HelloWorld");
-}
-}
diff --git a/gnu/llvm/llvm/unittests/Support/raw_pwrite_stream_test.cpp b/gnu/llvm/llvm/unittests/Support/raw_pwrite_stream_test.cpp
deleted file mode 100644
index 459eb940a43..00000000000
--- a/gnu/llvm/llvm/unittests/Support/raw_pwrite_stream_test.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-//===- raw_pwrite_stream_test.cpp - raw_pwrite_stream tests ---------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/SmallString.h"
-#include "llvm/Config/llvm-config.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/FileUtilities.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-#define ASSERT_NO_ERROR(x)                                                     \
-  if (std::error_code ASSERT_NO_ERROR_ec = x) {                                \
-    SmallString<128> MessageStorage;                                           \
-    raw_svector_ostream Message(MessageStorage);                               \
-    Message << #x ": did not return errc::success.\n"                          \
-            << "error number: " << ASSERT_NO_ERROR_ec.value() << "\n"          \
-            << "error message: " << ASSERT_NO_ERROR_ec.message() << "\n";      \
-    GTEST_FATAL_FAILURE_(MessageStorage.c_str());                              \
-  } else {                                                                     \
-  }
-
-namespace {
-
-TEST(raw_pwrite_ostreamTest, TestSVector) {
-  SmallVector<char, 0> Buffer;
-  raw_svector_ostream OS(Buffer);
-  OS << "abcd";
-  StringRef Test = "test";
-  OS.pwrite(Test.data(), Test.size(), 0);
-  EXPECT_EQ(Test, OS.str());
-
-#ifdef GTEST_HAS_DEATH_TEST
-#ifndef NDEBUG
-  EXPECT_DEATH(OS.pwrite("12345", 5, 0),
-               "We don't support extending the stream");
-#endif
-#endif
-}
-
-#ifdef _WIN32
-#define setenv(name, var, ignore) _putenv_s(name, var)
-#endif
-
-TEST(raw_pwrite_ostreamTest, TestFD) {
-  SmallString<64> Path;
-  int FD;
-
-  // If we want to clean up from a death test, we have to remove the file from
-  // the parent process. Have the parent create the file, pass it via
-  // environment variable to the child, let the child crash, and then remove it
-  // in the parent.
-  const char *ParentPath = getenv("RAW_PWRITE_TEST_FILE");
-  if (ParentPath) {
-    Path = ParentPath;
-    ASSERT_NO_ERROR(sys::fs::openFileForRead(Path, FD));
-  } else {
-    ASSERT_NO_ERROR(sys::fs::createTemporaryFile("foo", "bar", FD, Path));
-    setenv("RAW_PWRITE_TEST_FILE", Path.c_str(), true);
-  }
-  FileRemover Cleanup(Path);
-
-  raw_fd_ostream OS(FD, true);
-  OS << "abcd";
-  StringRef Test = "test";
-  OS.pwrite(Test.data(), Test.size(), 0);
-  OS.pwrite(Test.data(), Test.size(), 0);
-
-#ifdef GTEST_HAS_DEATH_TEST
-#ifndef NDEBUG
-  EXPECT_DEATH(OS.pwrite("12345", 5, 0),
-               "We don't support extending the stream");
-#endif
-#endif
-}
-
-#ifdef LLVM_ON_UNIX
-TEST(raw_pwrite_ostreamTest, TestDevNull) {
-  int FD;
-  sys::fs::openFileForWrite("/dev/null", FD, sys::fs::CD_OpenExisting);
-  raw_fd_ostream OS(FD, true);
-  OS << "abcd";
-  StringRef Test = "test";
-  OS.pwrite(Test.data(), Test.size(), 0);
-  OS.pwrite(Test.data(), Test.size(), 0);
-}
-#endif
-}
diff --git a/gnu/llvm/llvm/unittests/Support/raw_sha1_ostream_test.cpp b/gnu/llvm/llvm/unittests/Support/raw_sha1_ostream_test.cpp
deleted file mode 100644
index 3238d0d0e88..00000000000
--- a/gnu/llvm/llvm/unittests/Support/raw_sha1_ostream_test.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-//===- llvm/unittest/Support/raw_ostream_test.cpp - raw_ostream tests -----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/Format.h"
-#include "llvm/Support/raw_sha1_ostream.h"
-#include "gtest/gtest.h"
-
-#include <string>
-
-using namespace llvm;
-
-static std::string toHex(StringRef Input) {
-  static const char *const LUT = "0123456789ABCDEF";
-  size_t Length = Input.size();
-
-  std::string Output;
-  Output.reserve(2 * Length);
-  for (size_t i = 0; i < Length; ++i) {
-    const unsigned char c = Input[i];
-    Output.push_back(LUT[c >> 4]);
-    Output.push_back(LUT[c & 15]);
-  }
-  return Output;
-}
-
-TEST(raw_sha1_ostreamTest, Basic) {
-  llvm::raw_sha1_ostream Sha1Stream;
-  Sha1Stream << "Hello World!";
-  auto Hash = toHex(Sha1Stream.sha1());
-
-  ASSERT_EQ("2EF7BDE608CE5404E97D5F042F95F89F1C232871", Hash);
-}
-
-TEST(sha1_hash_test, Basic) {
-  ArrayRef<uint8_t> Input((const uint8_t *)"Hello World!", 12);
-  std::array<uint8_t, 20> Vec = SHA1::hash(Input);
-  std::string Hash = toHex({(const char *)Vec.data(), 20});
-  ASSERT_EQ("2EF7BDE608CE5404E97D5F042F95F89F1C232871", Hash);
-}
-
-TEST(sha1_hash_test, Update) {
-  SHA1 sha1;
-  std::string Input = "123456789012345678901234567890";
-  ASSERT_EQ(Input.size(), 30UL);
-  // 3 short updates.
-  sha1.update(Input);
-  sha1.update(Input);
-  sha1.update(Input);
-  // Long update that gets into the optimized loop with prefix/suffix.
-  sha1.update(Input + Input + Input + Input);
-  // 18 bytes buffered now.
-
-  std::string Hash = toHex(sha1.final());
-  ASSERT_EQ("3E4A614101AD84985AB0FE54DC12A6D71551E5AE", Hash);
-}
-
-// Check that getting the intermediate hash in the middle of the stream does
-// not invalidate the final result.
-TEST(raw_sha1_ostreamTest, Intermediate) {
-  llvm::raw_sha1_ostream Sha1Stream;
-  Sha1Stream << "Hello";
-  auto Hash = toHex(Sha1Stream.sha1());
-
-  ASSERT_EQ("F7FF9E8B7BB2E09B70935A5D785E0CC5D9D0ABF0", Hash);
-  Sha1Stream << " World!";
-  Hash = toHex(Sha1Stream.sha1());
-
-  // Compute the non-split hash separately as a reference.
-  llvm::raw_sha1_ostream NonSplitSha1Stream;
-  NonSplitSha1Stream << "Hello World!";
-  auto NonSplitHash = toHex(NonSplitSha1Stream.sha1());
-
-  ASSERT_EQ(NonSplitHash, Hash);
-}
-
-TEST(raw_sha1_ostreamTest, Reset) {
-  llvm::raw_sha1_ostream Sha1Stream;
-  Sha1Stream << "Hello";
-  auto Hash = toHex(Sha1Stream.sha1());
-
-  ASSERT_EQ("F7FF9E8B7BB2E09B70935A5D785E0CC5D9D0ABF0", Hash);
-
-  Sha1Stream.resetHash();
-  Sha1Stream << " World!";
-  Hash = toHex(Sha1Stream.sha1());
-
-  ASSERT_EQ("7447F2A5A42185C8CF91E632789C431830B59067", Hash);
-}
diff --git a/gnu/llvm/llvm/unittests/Support/xxhashTest.cpp b/gnu/llvm/llvm/unittests/Support/xxhashTest.cpp
deleted file mode 100644
index 7dc7c40c69e..00000000000
--- a/gnu/llvm/llvm/unittests/Support/xxhashTest.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-//===- llvm/unittest/Support/xxhashTest.cpp -------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/xxhash.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-TEST(xxhashTest, Basic) {
-  EXPECT_EQ(0x33bf00a859c4ba3fU, xxHash64("foo"));
-  EXPECT_EQ(0x48a37c90ad27a659U, xxHash64("bar"));
-  EXPECT_EQ(0x69196c1b3af0bff9U,
-            xxHash64("0123456789abcdefghijklmnopqrstuvwxyz"));
-}
diff --git a/gnu/llvm/llvm/unittests/TableGen/Automata.td b/gnu/llvm/llvm/unittests/TableGen/Automata.td
deleted file mode 100644
index 96f44e5f35c..00000000000
--- a/gnu/llvm/llvm/unittests/TableGen/Automata.td
+++ /dev/null
@@ -1,186 +0,0 @@
-include "llvm/TableGen/Automaton.td"
-include "llvm/TableGen/SearchableTable.td"
-
-// Define a set of input token symbols.
-class SymKindTy;
-def SK_a : SymKindTy;
-def SK_b : SymKindTy;
-def SK_c : SymKindTy;
-def SK_d : SymKindTy;
-
-// Emit those as a C++ enum using SearchableTables.
-def SymKind : GenericEnum {
-  let FilterClass = "SymKindTy";
-}
-
-// Define a transition implementation.
-class SimpleTransition<bits<2> State, SymKindTy A> : Transition {
-  let NewState{1...0} = State;
-  SymKindTy ActionSym = A;
-}
-
-// Token SK_a sets bit 0b01.
-def : SimpleTransition<0b01, SK_a>;
-// Token SK_b sets bits 0b10.
-def : SimpleTransition<0b10, SK_b>;
-// Token SK_c sets both bits 0b11.
-def : SimpleTransition<0b11, SK_c>;
-
-def SimpleAutomaton : GenericAutomaton {
-  let TransitionClass = "SimpleTransition";
-  let SymbolFields = ["ActionSym"];
-  // Override the type of ActionSym from SymKindTy to the C++ type SymKind.
-  string TypeOf_ActionSym = "SymKind";
-}
-
-//===----------------------------------------------------------------------===//
-// TupleActionAutomaton test implementation
-
-// Define a transition implementation.
-class TupleTransition<bits<2> State, SymKindTy s1, SymKindTy s2, string s3> : Transition {
-  let NewState{1...0} = State;
-  SymKindTy S1 = s1;
-  SymKindTy S2 = s2;
-  string S3 = s3;
-}
-
-def : TupleTransition<0b01, SK_a, SK_b, "yeet">;
-def : TupleTransition<0b10, SK_b, SK_b, "foo">;
-def : TupleTransition<0b10, SK_c, SK_a, "foo">;
-
-def TupleAutomaton : GenericAutomaton {
-  let TransitionClass = "TupleTransition";
-  let SymbolFields = ["S1", "S2", "S3"];
-  string TypeOf_S1 = "SymKind";
-  string TypeOf_S2 = "SymKind";
-}
-
-//===----------------------------------------------------------------------===//
-// NfaAutomaton test implementation
-
-class NfaTransition<bits<2> State, SymKindTy S> : Transition {
-  let NewState{1...0} = State;
-  SymKindTy A = S;
-}
-
-// Symbols a and b can transition to 0b01 or 0b11 (sets bit 0).
-def : NfaTransition<0b01, SK_a>;
-def : NfaTransition<0b01, SK_b>;
-// Symbols a and b can also transition to 0b10 or 0b11 (sets bit 1).
-def : NfaTransition<0b10, SK_a>;
-def : NfaTransition<0b10, SK_b>;
-
-def NfaAutomaton : GenericAutomaton {
-  let TransitionClass = "NfaTransition";
-  let SymbolFields = ["A"];
-  string TypeOf_A = "SymKind";
-}
-
-//===----------------------------------------------------------------------===//
-// BinPacker test implementation
-//===----------------------------------------------------------------------===//
-// This test generates an automaton that can pack values into bins subject to
-// constraints. There are 6 possible bins, and the input tokens are constraint
-// types. Some input types span two bins.
-
-// The symbol type for a bin constraint. We use lists of ints as a tblgen hack
-// to conditionally generate defs within multiclasses based on record
-// information. A bin is nonempty (has a dummy one-element value) if enabled.
-class BinRequirementKind {
-  list<int> Bin0 = [];
-  list<int> Bin1 = [];
-  list<int> Bin2 = [];
-  list<int> Bin3 = [];
-  list<int> Bin4 = [];
-  list<int> Bin5 = [];
-}
-// Can use bins {0-3}
-def BRK_0_to_4    : BinRequirementKind { let Bin0 = [1]; let Bin1 = [1]; let Bin2 = [1]; let Bin3 = [1]; }
-// Can use bins {0-3} but only evens (0 and 2).
-def BRK_0_to_4_lo : BinRequirementKind { let Bin0 = [1]; let Bin2 = [1]; }
-// Can use bins {0-3} but only odds (1 and 3).
-def BRK_0_to_4_hi : BinRequirementKind { let Bin1 = [1]; let Bin3 = [1]; }
-// Can use bins {0-3} but only even-odd pairs (0+1 or 1+2).
-def BRK_0_to_4_dbl : BinRequirementKind { let Bin0 = [1]; let Bin2 = [1]; }
-def BRK_0_to_6 :    BinRequirementKind { let Bin0 = [1]; let Bin1 = [1]; let Bin2 = [1];
-                                         let Bin3 = [1]; let Bin4 = [1]; let Bin5 = [1]; }
-def BRK_0_to_6_lo : BinRequirementKind { let Bin0 = [1]; let Bin2 = [1]; let Bin4 = [1]; }
-def BRK_0_to_6_hi : BinRequirementKind { let Bin1 = [1]; let Bin3 = [1]; let Bin5 = [1]; }
-def BRK_0_to_6_dbl : BinRequirementKind { let Bin0 = [1]; let Bin2 = [1]; let Bin4 = [1]; }
-def BRK_2_to_6 :    BinRequirementKind { let Bin2 = [1];
-                                         let Bin3 = [1]; let Bin4 = [1]; let Bin5 = [1]; }
-def BRK_2_to_6_lo : BinRequirementKind { let Bin2 = [1]; let Bin4 = [1]; }
-def BRK_2_to_6_hi : BinRequirementKind { let Bin3 = [1]; let Bin5 = [1];}
-def BRK_2_to_6_dbl : BinRequirementKind { let Bin2 = [1]; let Bin4 = [1]; }
-def BRK_2_to_4 :    BinRequirementKind { let Bin2 = [1]; let Bin3 = [1]; }
-def BRK_2_to_4_lo : BinRequirementKind { let Bin2 = [1]; }
-def BRK_2_to_4_hi : BinRequirementKind { let Bin3 = [1]; }
-def BRK_2_to_4_dbl : BinRequirementKind { let Bin2 = [1]; }
-
-def BinRequirementKindEnum : GenericEnum {
-  let FilterClass = "BinRequirementKind";
-}
-
-// The transition class is trivial; it just contains the constraint symbol.
-class BinTransition : Transition {
-  BinRequirementKind Sym;
-}
-
-// Mixin that occupies a single bin.
-class Bin0 : BinTransition { let NewState{0} = 1; }
-class Bin1 : BinTransition { let NewState{1} = 1; }
-class Bin2 : BinTransition { let NewState{2} = 1;}
-class Bin3 : BinTransition { let NewState{3} = 1; }
-class Bin4 : BinTransition { let NewState{4} = 1;}
-class Bin5 : BinTransition { let NewState{5} = 1; }
-// Mixin that occupies a pair of bins (even-odd pairs).
-class Bin01 : BinTransition { let NewState{0,1} = 0b11; }
-class Bin23 : BinTransition { let NewState{2,3} = 0b11; }
-class Bin45 : BinTransition { let NewState{4,5} = 0b11; }
-
-// Instantiate all possible bin assignments for E.
-multiclass BinAssignments<BinRequirementKind E> {
-  let Sym = E in {
-    // Note the tablegen hack to conditionally instantiate a def based on E.
-    foreach x = E.Bin0 in { def : Bin0; }
-    foreach x = E.Bin1 in { def : Bin1; }
-    foreach x = E.Bin2 in { def : Bin2; }
-    foreach x = E.Bin3 in { def : Bin3; }
-    foreach x = E.Bin4 in { def : Bin4; }
-    foreach x = E.Bin5 in { def : Bin5; }
-  }
-}
-
-// Instantiate all possible bin assignments for E, which spans even-odd pairs.
-multiclass DblBinAssignments<BinRequirementKind E> {
-  let Sym = E in {
-    foreach x = E.Bin0 in { def : Bin01; }
-    foreach x = E.Bin2 in { def : Bin23; }
-    foreach x = E.Bin4 in { def : Bin45; }
-  }
-}
-
-defm : BinAssignments<BRK_0_to_4>;
-defm : DblBinAssignments<BRK_0_to_4_dbl>;
-defm : BinAssignments<BRK_0_to_4_lo>;
-defm : BinAssignments<BRK_0_to_4_hi>;
-defm : BinAssignments<BRK_0_to_6>;
-defm : DblBinAssignments<BRK_0_to_6_dbl>;
-defm : BinAssignments<BRK_0_to_6_lo>;
-defm : BinAssignments<BRK_0_to_6_hi>;
-defm : BinAssignments<BRK_2_to_6>;
-defm : DblBinAssignments<BRK_2_to_6_dbl>;
-defm : BinAssignments<BRK_2_to_6_lo>;
-defm : BinAssignments<BRK_2_to_6_hi>;
-defm : BinAssignments<BRK_2_to_4>;
-defm : DblBinAssignments<BRK_2_to_4_dbl>;
-defm : BinAssignments<BRK_2_to_4_lo>;
-defm : BinAssignments<BRK_2_to_4_hi>;
-
-def BinPackerAutomaton : GenericAutomaton {
-  let TransitionClass = "BinTransition";
-  let SymbolFields = ["Sym"];
-  string TypeOf_Sym = "BinRequirementKindEnum";
-}
-
-
diff --git a/gnu/llvm/llvm/unittests/TableGen/AutomataTest.cpp b/gnu/llvm/llvm/unittests/TableGen/AutomataTest.cpp
deleted file mode 100644
index fb19716c484..00000000000
--- a/gnu/llvm/llvm/unittests/TableGen/AutomataTest.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-//===- unittest/TableGen/AutomataTest.cpp - DFA tests ---------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/Automaton.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using testing::ContainerEq;
-using testing::UnorderedElementsAre;
-
-// Bring in the enums created by SearchableTables.td.
-#define GET_SymKind_DECL
-#define GET_BinRequirementKindEnum_DECL
-#include "AutomataTables.inc"
-
-// And bring in the automata from Automata.td.
-#define GET_SimpleAutomaton_DECL
-#define GET_TupleAutomaton_DECL
-#define GET_NfaAutomaton_DECL
-#define GET_BinPackerAutomaton_DECL
-#include "AutomataAutomata.inc"
-
-TEST(Automata, SimpleAutomatonAcceptsFromInitialState) {
-  Automaton<SymKind> A(makeArrayRef(SimpleAutomatonTransitions));
-  EXPECT_TRUE(A.add(SK_a));
-  A.reset();
-  EXPECT_TRUE(A.add(SK_b));
-  A.reset();
-  EXPECT_TRUE(A.add(SK_c));
-  A.reset();
-  EXPECT_FALSE(A.add(SK_d));
-}
-
-TEST(Automata, SimpleAutomatonAcceptsSequences) {
-  Automaton<SymKind> A(makeArrayRef(SimpleAutomatonTransitions));
-  // Test sequence <a b>
-  A.reset();
-  EXPECT_TRUE(A.add(SK_a));
-  EXPECT_TRUE(A.add(SK_b));
-
-  // Test sequence <a c> is rejected (c cannot get bit 0b10);
-  A.reset();
-  EXPECT_TRUE(A.add(SK_a));
-  EXPECT_FALSE(A.add(SK_c));
-
-  // Symmetric test: sequence <c a> is rejected.
-  A.reset();
-  EXPECT_TRUE(A.add(SK_c));
-  EXPECT_FALSE(A.add(SK_a));
-}
-
-TEST(Automata, TupleAutomatonAccepts) {
-  Automaton<TupleAutomatonAction> A(makeArrayRef(TupleAutomatonTransitions));
-  A.reset();
-  EXPECT_TRUE(
-      A.add(TupleAutomatonAction{SK_a, SK_b, "yeet"}));
-  A.reset();
-  EXPECT_FALSE(
-      A.add(TupleAutomatonAction{SK_a, SK_a, "yeet"}));
-  A.reset();
-  EXPECT_FALSE(
-      A.add(TupleAutomatonAction{SK_a, SK_b, "feet"}));
-  A.reset();
-  EXPECT_TRUE(
-      A.add(TupleAutomatonAction{SK_b, SK_b, "foo"}));
-}
-
-TEST(Automata, NfaAutomatonAccepts) {
-  Automaton<SymKind> A(makeArrayRef(NfaAutomatonTransitions));
-
-  // Test sequences <a a>, <a b>, <b a>, <b b>. All should be accepted.
-  A.reset();
-  EXPECT_TRUE(A.add(SK_a));
-  EXPECT_TRUE(A.add(SK_a));
-  A.reset();
-  EXPECT_TRUE(A.add(SK_a));
-  EXPECT_TRUE(A.add(SK_b));
-  A.reset();
-  EXPECT_TRUE(A.add(SK_b));
-  EXPECT_TRUE(A.add(SK_a));
-  A.reset();
-  EXPECT_TRUE(A.add(SK_b));
-  EXPECT_TRUE(A.add(SK_b));
-
-  // Expect that <b b b> is not accepted.
-  A.reset();
-  EXPECT_TRUE(A.add(SK_b));
-  EXPECT_TRUE(A.add(SK_b));
-  EXPECT_FALSE(A.add(SK_b));
-}
-
-TEST(Automata, BinPackerAutomatonAccepts) {
-  Automaton<BinPackerAutomatonAction> A(makeArrayRef(BinPackerAutomatonTransitions));
-
-  // Expect that we can pack two double-bins in 0-4, then no more in 0-4.
-  A.reset();
-  EXPECT_TRUE(A.add(BRK_0_to_4_dbl));
-  EXPECT_TRUE(A.add(BRK_0_to_4_dbl));
-  EXPECT_FALSE(A.add(BRK_0_to_4));
-
-  // Expect that we can pack two double-bins in 0-4, two more in 0-6 then no
-  // more.
-  A.reset();
-  EXPECT_TRUE(A.add(BRK_0_to_4_dbl));
-  EXPECT_TRUE(A.add(BRK_0_to_4_dbl));
-  EXPECT_TRUE(A.add(BRK_0_to_6));
-  EXPECT_TRUE(A.add(BRK_0_to_6));
-  EXPECT_FALSE(A.add(BRK_0_to_6));
-
-  // Expect that we can pack BRK_0_to_6 five times to occupy five bins, then
-  // cannot allocate any double-bins.
-  A.reset();
-  for (unsigned I = 0; I < 5; ++I)
-    EXPECT_TRUE(A.add(BRK_0_to_6));
-  EXPECT_FALSE(A.add(BRK_0_to_6_dbl));
-}
-
-// The state we defined in TableGen uses the least significant 6 bits to represent a bin state.
-#define BINS(a, b, c, d, e, f)                                                 \
-  ((a << 5) | (b << 4) | (c << 3) | (d << 2) | (e << 1) | (f << 0))
-
-TEST(Automata, BinPackerAutomatonExplains) {
-  Automaton<BinPackerAutomatonAction> A(makeArrayRef(BinPackerAutomatonTransitions),
-                                        makeArrayRef(BinPackerAutomatonTransitionInfo));
-  // Pack two double-bins in 0-4, then a single bin in 0-6.
-  EXPECT_TRUE(A.add(BRK_0_to_4_dbl));
-  EXPECT_TRUE(A.add(BRK_0_to_4_dbl));
-  EXPECT_TRUE(A.add(BRK_0_to_6));
-  EXPECT_THAT(
-      A.getNfaPaths(),
-      UnorderedElementsAre(
-          // Allocate {0,1} first, then 6.
-          ContainerEq(NfaPath{BINS(0, 0, 0, 0, 1, 1), BINS(0, 0, 1, 1, 1, 1),
-                              BINS(1, 0, 1, 1, 1, 1)}),
-          // Allocate {0,1} first, then 5.
-          ContainerEq(NfaPath{BINS(0, 0, 0, 0, 1, 1), BINS(0, 0, 1, 1, 1, 1),
-                              BINS(0, 1, 1, 1, 1, 1)}),
-          // Allocate {2,3} first, then 6.
-          ContainerEq(NfaPath{BINS(0, 0, 1, 1, 0, 0), BINS(0, 0, 1, 1, 1, 1),
-                              BINS(1, 0, 1, 1, 1, 1)}),
-          // Allocate {2,3} first, then 5.
-          ContainerEq(NfaPath{BINS(0, 0, 1, 1, 0, 0), BINS(0, 0, 1, 1, 1, 1),
-                              BINS(0, 1, 1, 1, 1, 1)})));
-}
diff --git a/gnu/llvm/llvm/unittests/TableGen/CMakeLists.txt b/gnu/llvm/llvm/unittests/TableGen/CMakeLists.txt
deleted file mode 100644
index 15f60800aa9..00000000000
--- a/gnu/llvm/llvm/unittests/TableGen/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  TableGen
-  Support
-  )
-
-set(LLVM_TARGET_DEFINITIONS Automata.td)
-
-tablegen(LLVM AutomataTables.inc -gen-searchable-tables)
-tablegen(LLVM AutomataAutomata.inc -gen-automata)
-add_public_tablegen_target(AutomataTestTableGen)
-
-add_llvm_unittest(TableGenTests DISABLE_LLVM_LINK_LLVM_DYLIB
-  CodeExpanderTest.cpp
-  AutomataTest.cpp
-  )
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../utils/TableGen)
-target_link_libraries(TableGenTests PRIVATE LLVMTableGenGlobalISel LLVMTableGen)
diff --git a/gnu/llvm/llvm/unittests/TableGen/CodeExpanderTest.cpp b/gnu/llvm/llvm/unittests/TableGen/CodeExpanderTest.cpp
deleted file mode 100644
index 4a9a0e8c114..00000000000
--- a/gnu/llvm/llvm/unittests/TableGen/CodeExpanderTest.cpp
+++ /dev/null
@@ -1,183 +0,0 @@
-//===- llvm/unittest/TableGen/CodeExpanderTest.cpp - Tests ----------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "GlobalISel/CodeExpander.h"
-#include "GlobalISel/CodeExpansions.h"
-
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/TableGen/Error.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-static StringRef bufferize(StringRef Str) {
-  std::unique_ptr<MemoryBuffer> Buffer =
-      MemoryBuffer::getMemBufferCopy(Str, "TestBuffer");
-  StringRef StrBufferRef = Buffer->getBuffer();
-  SrcMgr.AddNewSourceBuffer(std::move(Buffer), SMLoc());
-  return StrBufferRef;
-}
-
-class RAIIDiagnosticChecker {
-  std::string EmittedDiags;
-  raw_string_ostream OS;
-  std::vector<SMDiagnostic> Expected;
-  std::vector<SMDiagnostic> Received;
-
-public:
-  RAIIDiagnosticChecker() : OS(EmittedDiags) {
-    SrcMgr.setDiagHandler(handler, this);
-  }
-  ~RAIIDiagnosticChecker() {
-    SrcMgr.setDiagHandler(nullptr);
-    EXPECT_EQ(Received.size(), Expected.size());
-    for (unsigned i = 0; i < Received.size() && i < Expected.size(); ++i) {
-      EXPECT_EQ(Received[i].getLoc(), Expected[i].getLoc());
-      EXPECT_EQ(Received[i].getFilename(), Expected[i].getFilename());
-      EXPECT_EQ(Received[i].getKind(), Expected[i].getKind());
-      EXPECT_EQ(Received[i].getLineNo(), Expected[i].getLineNo());
-      EXPECT_EQ(Received[i].getColumnNo(), Expected[i].getColumnNo());
-      EXPECT_EQ(Received[i].getMessage(), Expected[i].getMessage());
-      EXPECT_EQ(Received[i].getLineContents(), Expected[i].getLineContents());
-      EXPECT_EQ(Received[i].getRanges(), Expected[i].getRanges());
-    }
-
-    if (testing::Test::HasFailure())
-      errs() << "Emitted diagnostic:\n" << OS.str();
-  }
-
-  void expect(SMDiagnostic D) { Expected.push_back(D); }
-
-  void diag(const SMDiagnostic &D) {
-    Received.push_back(D);
-  }
-
-  static void handler(const SMDiagnostic &D, void *Context) {
-    RAIIDiagnosticChecker *Self = static_cast<RAIIDiagnosticChecker *>(Context);
-    Self->diag(D);
-    SrcMgr.setDiagHandler(nullptr);
-    SrcMgr.PrintMessage(Self->OS, D);
-    SrcMgr.setDiagHandler(handler, Context);
-  };
-};
-
-TEST(CodeExpander, NoExpansions) {
-  std::string Result;
-  raw_string_ostream OS(Result);
-  CodeExpansions Expansions;
-
-  RAIIDiagnosticChecker DiagChecker;
-  CodeExpander("No expansions", Expansions, SMLoc(), false).emit(OS);
-  EXPECT_EQ(OS.str(), "No expansions");
-}
-
-// Indentation is applied to all lines except the first
-TEST(CodeExpander, Indentation) {
-  std::string Result;
-  raw_string_ostream OS(Result);
-  CodeExpansions Expansions;
-
-  RAIIDiagnosticChecker DiagChecker;
-  CodeExpander("No expansions\nsecond line\nthird line", Expansions, SMLoc(),
-               false, "  ")
-      .emit(OS);
-  EXPECT_EQ(OS.str(), "No expansions\n  second line\n  third line");
-}
-
-// \ is an escape character that removes special meanings from the next
-// character.
-TEST(CodeExpander, Escape) {
-  std::string Result;
-  raw_string_ostream OS(Result);
-  CodeExpansions Expansions;
-
-  RAIIDiagnosticChecker DiagChecker;
-  CodeExpander("\\\\\\a\\$", Expansions, SMLoc(), false).emit(OS);
-  EXPECT_EQ(OS.str(), "\\a$");
-}
-
-// $foo is not an expansion. It should warn though.
-TEST(CodeExpander, NotAnExpansion) {
-  std::string Result;
-  raw_string_ostream OS(Result);
-  CodeExpansions Expansions;
-
-  RAIIDiagnosticChecker DiagChecker;
-  StringRef In = bufferize(" $foo");
-  CodeExpander(" $foo", Expansions, SMLoc::getFromPointer(In.data()), false)
-      .emit(OS);
-  EXPECT_EQ(OS.str(), " $foo");
-  DiagChecker.expect(SMDiagnostic(
-      SrcMgr, SMLoc::getFromPointer(In.data()), "TestBuffer", 1, 0,
-      SourceMgr::DK_Warning, "Assuming missing escape character: \\$", " $foo", {}));
-}
-
-// \$foo is not an expansion but shouldn't warn as it's using the escape.
-TEST(CodeExpander, EscapedNotAnExpansion) {
-  std::string Result;
-  raw_string_ostream OS(Result);
-  CodeExpansions Expansions;
-
-  RAIIDiagnosticChecker DiagChecker;
-  CodeExpander("\\$foo", Expansions, SMLoc(), false).emit(OS);
-  EXPECT_EQ(OS.str(), "$foo");
-}
-
-// \${foo is not an expansion but shouldn't warn as it's using the escape.
-TEST(CodeExpander, EscapedUnterminatedExpansion) {
-  std::string Result;
-  raw_string_ostream OS(Result);
-  CodeExpansions Expansions;
-
-  RAIIDiagnosticChecker DiagChecker;
-  CodeExpander("\\${foo", Expansions, SMLoc(), false).emit(OS);
-  EXPECT_EQ(OS.str(), "${foo");
-}
-
-// \${foo is not an expansion but shouldn't warn as it's using the escape.
-TEST(CodeExpander, EscapedExpansion) {
-  std::string Result;
-  raw_string_ostream OS(Result);
-  CodeExpansions Expansions;
-
-  RAIIDiagnosticChecker DiagChecker;
-  CodeExpander("\\${foo}", Expansions, SMLoc(), false).emit(OS);
-  EXPECT_EQ(OS.str(), "${foo}");
-}
-
-// ${foo} is an undefined expansion and should error.
-TEST(CodeExpander, UndefinedExpansion) {
-  std::string Result;
-  raw_string_ostream OS(Result);
-  CodeExpansions Expansions;
-  Expansions.declare("bar", "expansion");
-
-  RAIIDiagnosticChecker DiagChecker;
-  CodeExpander("${foo}${bar}", Expansions, SMLoc(), false).emit(OS);
-  EXPECT_EQ(OS.str(), "expansion");
-  DiagChecker.expect(
-      SMDiagnostic(SrcMgr, SMLoc(), "<unknown>", 0, -1, SourceMgr::DK_Error,
-                   "Attempt to expand an undeclared variable 'foo'", "", {}));
-}
-
-// ${bar is an unterminated expansion. Warn and implicitly terminate it.
-TEST(CodeExpander, UnterminatedExpansion) {
-  std::string Result;
-  raw_string_ostream OS(Result);
-  CodeExpansions Expansions;
-  Expansions.declare("bar", "expansion");
-
-  RAIIDiagnosticChecker DiagChecker;
-  StringRef In = bufferize(" ${bar");
-  CodeExpander(In, Expansions, SMLoc::getFromPointer(In.data()), false)
-      .emit(OS);
-  EXPECT_EQ(OS.str(), " expansion");
-  DiagChecker.expect(SMDiagnostic(SrcMgr, SMLoc::getFromPointer(In.data()),
-                                  "TestBuffer", 1, 0, SourceMgr::DK_Warning,
-                                  "Unterminated expansion '${bar'", " ${bar", {}));
-}
diff --git a/gnu/llvm/llvm/unittests/Target/AArch64/CMakeLists.txt b/gnu/llvm/llvm/unittests/Target/AArch64/CMakeLists.txt
deleted file mode 100644
index 2a400a90ddc..00000000000
--- a/gnu/llvm/llvm/unittests/Target/AArch64/CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-include_directories(
-  ${CMAKE_SOURCE_DIR}/lib/Target/AArch64
-  ${CMAKE_BINARY_DIR}/lib/Target/AArch64
-  )
-
-set(LLVM_LINK_COMPONENTS
-  AArch64CodeGen
-  AArch64Desc
-  AArch64Info
-  CodeGen
-  Core
-  GlobalISel
-  MC
-  MIRParser
-  SelectionDAG
-  Support
-  Target
-  )
-
-add_llvm_target_unittest(AArch64Tests
-  InstSizes.cpp
-  DecomposeStackOffsetTest.cpp
-  MatrixRegisterAliasing.cpp
-  )
diff --git a/gnu/llvm/llvm/unittests/Target/AArch64/DecomposeStackOffsetTest.cpp b/gnu/llvm/llvm/unittests/Target/AArch64/DecomposeStackOffsetTest.cpp
deleted file mode 100644
index be6985e0a28..00000000000
--- a/gnu/llvm/llvm/unittests/Target/AArch64/DecomposeStackOffsetTest.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-//===- TestStackOffset.cpp - StackOffset unit tests------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/TypeSize.h"
-#include "AArch64InstrInfo.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-TEST(StackOffset, decomposeStackOffsetForFrameOffsets) {
-  StackOffset A = StackOffset::getFixed(8);
-  StackOffset B = StackOffset::getFixed(4);
-  StackOffset C = StackOffset::getScalable(16);
-
-  // If all offsets can be materialized with only ADDVL,
-  // make sure PLSized is 0.
-  int64_t ByteSized, VLSized, PLSized;
-  AArch64InstrInfo::decomposeStackOffsetForFrameOffsets(A + B + C, ByteSized, PLSized,
-                                            VLSized);
-  EXPECT_EQ(12, ByteSized);
-  EXPECT_EQ(1, VLSized);
-  EXPECT_EQ(0, PLSized);
-
-  // If we need an ADDPL to materialize the offset, and the number of scalable
-  // bytes fits the ADDPL immediate, fold the scalable bytes to fit in PLSized.
-  StackOffset D = StackOffset::getScalable(2);
-  AArch64InstrInfo::decomposeStackOffsetForFrameOffsets(C + D, ByteSized, PLSized, VLSized);
-  EXPECT_EQ(0, ByteSized);
-  EXPECT_EQ(0, VLSized);
-  EXPECT_EQ(9, PLSized);
-
-  StackOffset E = StackOffset::getScalable(64);
-  StackOffset F = StackOffset::getScalable(2);
-  AArch64InstrInfo::decomposeStackOffsetForFrameOffsets(E + F, ByteSized, PLSized, VLSized);
-  EXPECT_EQ(0, ByteSized);
-  EXPECT_EQ(0, VLSized);
-  EXPECT_EQ(33, PLSized);
-
-  // If the offset requires an ADDPL instruction to materialize, and would
-  // require more than two instructions, decompose it into both
-  // ADDVL (n x 16 bytes) and ADDPL (n x 2 bytes) instructions.
-  StackOffset G = StackOffset::getScalable(128);
-  StackOffset H = StackOffset::getScalable(2);
-  AArch64InstrInfo::decomposeStackOffsetForFrameOffsets(G + H, ByteSized, PLSized, VLSized);
-  EXPECT_EQ(0, ByteSized);
-  EXPECT_EQ(8, VLSized);
-  EXPECT_EQ(1, PLSized);
-}
diff --git a/gnu/llvm/llvm/unittests/Target/AArch64/InstSizes.cpp b/gnu/llvm/llvm/unittests/Target/AArch64/InstSizes.cpp
deleted file mode 100644
index 01ec44e35ff..00000000000
--- a/gnu/llvm/llvm/unittests/Target/AArch64/InstSizes.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-#include "AArch64Subtarget.h"
-#include "AArch64TargetMachine.h"
-#include "llvm/CodeGen/MIRParser/MIRParser.h"
-#include "llvm/CodeGen/MachineModuleInfo.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-std::unique_ptr<LLVMTargetMachine> createTargetMachine() {
-  auto TT(Triple::normalize("aarch64--"));
-  std::string CPU("generic");
-  std::string FS("");
-
-  LLVMInitializeAArch64TargetInfo();
-  LLVMInitializeAArch64Target();
-  LLVMInitializeAArch64TargetMC();
-
-  std::string Error;
-  const Target *TheTarget = TargetRegistry::lookupTarget(TT, Error);
-
-  return std::unique_ptr<LLVMTargetMachine>(static_cast<LLVMTargetMachine*>(
-      TheTarget->createTargetMachine(TT, CPU, FS, TargetOptions(), None, None,
-                                     CodeGenOpt::Default)));
-}
-
-std::unique_ptr<AArch64InstrInfo> createInstrInfo(TargetMachine *TM) {
-  AArch64Subtarget ST(TM->getTargetTriple(), std::string(TM->getTargetCPU()),
-                      std::string(TM->getTargetFeatureString()), *TM,
-                      /* isLittle */ false);
-  return std::make_unique<AArch64InstrInfo>(ST);
-}
-
-/// The \p InputIRSnippet is only needed for things that can't be expressed in
-/// the \p InputMIRSnippet (global variables etc)
-/// TODO: Some of this might be useful for other architectures as well - extract
-///       the platform-independent parts somewhere they can be reused.
-void runChecks(
-    LLVMTargetMachine *TM, AArch64InstrInfo *II, const StringRef InputIRSnippet,
-    const StringRef InputMIRSnippet,
-    std::function<void(AArch64InstrInfo &, MachineFunction &)> Checks) {
-  LLVMContext Context;
-
-  auto MIRString =
-    "--- |\n"
-    "  declare void @sizes()\n"
-    + InputIRSnippet.str() +
-    "...\n"
-    "---\n"
-    "name: sizes\n"
-    "body: |\n"
-    "  bb.0:\n"
-    + InputMIRSnippet.str();
-
-  std::unique_ptr<MemoryBuffer> MBuffer = MemoryBuffer::getMemBuffer(MIRString);
-  std::unique_ptr<MIRParser> MParser =
-      createMIRParser(std::move(MBuffer), Context);
-  ASSERT_TRUE(MParser);
-
-  std::unique_ptr<Module> M = MParser->parseIRModule();
-  ASSERT_TRUE(M);
-
-  M->setTargetTriple(TM->getTargetTriple().getTriple());
-  M->setDataLayout(TM->createDataLayout());
-
-  MachineModuleInfo MMI(TM);
-  bool Res = MParser->parseMachineFunctions(*M, MMI);
-  ASSERT_FALSE(Res);
-
-  auto F = M->getFunction("sizes");
-  ASSERT_TRUE(F != nullptr);
-  auto &MF = MMI.getOrCreateMachineFunction(*F);
-
-  Checks(*II, MF);
-}
-
-} // anonymous namespace
-
-TEST(InstSizes, Authenticated) {
-  std::unique_ptr<LLVMTargetMachine> TM = createTargetMachine();
-  ASSERT_TRUE(TM);
-  std::unique_ptr<AArch64InstrInfo> II = createInstrInfo(TM.get());
-
-  auto isAuthInst = [](AArch64InstrInfo &II, MachineFunction &MF) {
-    auto I = MF.begin()->begin();
-    EXPECT_EQ(4u, II.getInstSizeInBytes(*I));
-    EXPECT_TRUE(I->getDesc().isAuthenticated());
-  };
-
-  runChecks(TM.get(), II.get(), "",
-            "    \n"
-            "    BLRAA $x10, $x9\n",
-            isAuthInst);
-
-  runChecks(TM.get(), II.get(), "",
-            "    \n"
-            "    RETAB implicit $lr, implicit $sp, implicit killed $x0\n",
-            isAuthInst);
-
-  runChecks(TM.get(), II.get(), "",
-            "    \n"
-            "    frame-destroy AUTIASP implicit-def $lr, implicit killed $lr, implicit $sp\n",
-            isAuthInst);
-
-  runChecks(TM.get(), II.get(), "",
-            "    \n"
-            "    frame-destroy AUTIBSP implicit-def $lr, implicit killed $lr, implicit $sp\n",
-            isAuthInst);
-}
-
-TEST(InstSizes, STACKMAP) {
-  std::unique_ptr<LLVMTargetMachine> TM = createTargetMachine();
-  ASSERT_TRUE(TM);
-  std::unique_ptr<AArch64InstrInfo> II = createInstrInfo(TM.get());
-
-  runChecks(TM.get(), II.get(), "", "    STACKMAP 0, 16\n"
-                                    "    STACKMAP 1, 32\n",
-            [](AArch64InstrInfo &II, MachineFunction &MF) {
-              auto I = MF.begin()->begin();
-              EXPECT_EQ(16u, II.getInstSizeInBytes(*I));
-              ++I;
-              EXPECT_EQ(32u, II.getInstSizeInBytes(*I));
-            });
-}
-
-TEST(InstSizes, PATCHPOINT) {
-  std::unique_ptr<LLVMTargetMachine> TM = createTargetMachine();
-  std::unique_ptr<AArch64InstrInfo> II = createInstrInfo(TM.get());
-
-  runChecks(TM.get(), II.get(), "",
-            "    PATCHPOINT 0, 16, 0, 0, 0, csr_aarch64_aapcs\n"
-            "    PATCHPOINT 1, 32, 0, 0, 0, csr_aarch64_aapcs\n",
-            [](AArch64InstrInfo &II, MachineFunction &MF) {
-              auto I = MF.begin()->begin();
-              EXPECT_EQ(16u, II.getInstSizeInBytes(*I));
-              ++I;
-              EXPECT_EQ(32u, II.getInstSizeInBytes(*I));
-            });
-}
-
-TEST(InstSizes, TLSDESC_CALLSEQ) {
-  std::unique_ptr<LLVMTargetMachine> TM = createTargetMachine();
-  std::unique_ptr<AArch64InstrInfo> II = createInstrInfo(TM.get());
-
-  runChecks(
-      TM.get(), II.get(),
-      "  @ThreadLocalGlobal = external thread_local global i32, align 8\n",
-      "    TLSDESC_CALLSEQ target-flags(aarch64-tls) @ThreadLocalGlobal\n",
-      [](AArch64InstrInfo &II, MachineFunction &MF) {
-        auto I = MF.begin()->begin();
-        EXPECT_EQ(16u, II.getInstSizeInBytes(*I));
-      });
-}
diff --git a/gnu/llvm/llvm/unittests/Target/AArch64/MatrixRegisterAliasing.cpp b/gnu/llvm/llvm/unittests/Target/AArch64/MatrixRegisterAliasing.cpp
deleted file mode 100644
index 2f0d3717d03..00000000000
--- a/gnu/llvm/llvm/unittests/Target/AArch64/MatrixRegisterAliasing.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-#include "AArch64Subtarget.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-std::unique_ptr<LLVMTargetMachine> createTargetMachine() {
-  auto TT(Triple::normalize("aarch64--"));
-  std::string CPU("generic");
-  std::string FS("+sme");
-
-  LLVMInitializeAArch64TargetInfo();
-  LLVMInitializeAArch64Target();
-  LLVMInitializeAArch64TargetMC();
-
-  std::string Error;
-  const Target *TheTarget = TargetRegistry::lookupTarget(TT, Error);
-
-  return std::unique_ptr<LLVMTargetMachine>(
-      static_cast<LLVMTargetMachine *>(TheTarget->createTargetMachine(
-          TT, CPU, FS, TargetOptions(), None, None, CodeGenOpt::Default)));
-}
-
-std::unique_ptr<AArch64InstrInfo> createInstrInfo(TargetMachine *TM) {
-  AArch64Subtarget ST(TM->getTargetTriple(), std::string(TM->getTargetCPU()),
-                      std::string(TM->getTargetFeatureString()), *TM,
-                      /* isLittle */ false);
-  return std::make_unique<AArch64InstrInfo>(ST);
-}
-
-TEST(MatrixRegisterAliasing, Aliasing) {
-  std::unique_ptr<LLVMTargetMachine> TM = createTargetMachine();
-  ASSERT_TRUE(TM);
-  std::unique_ptr<AArch64InstrInfo> II = createInstrInfo(TM.get());
-
-  const AArch64RegisterInfo &TRI = II->getRegisterInfo();
-
-  // za overlaps with za.b
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZA, AArch64::ZAB0));
-
-  // za0.b overlaps with all tiles
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAB0, AArch64::ZAQ0));
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAB0, AArch64::ZAQ15));
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAB0, AArch64::ZAD0));
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAB0, AArch64::ZAD7));
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAB0, AArch64::ZAS0));
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAB0, AArch64::ZAS3));
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAB0, AArch64::ZAH0));
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAB0, AArch64::ZAH1));
-
-  // za0.h aliases with za0.q, za2.q, ..
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAH0, AArch64::ZAQ0));
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAH0, AArch64::ZAQ2));
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAH0, AArch64::ZAQ4));
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAH0, AArch64::ZAQ6));
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAH0, AArch64::ZAQ8));
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAH0, AArch64::ZAQ10));
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAH0, AArch64::ZAQ12));
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAH0, AArch64::ZAQ14));
-
-  // za1.h aliases with za1.q, za3.q, ...
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAH1, AArch64::ZAQ1));
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAH1, AArch64::ZAQ3));
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAH1, AArch64::ZAQ5));
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAH1, AArch64::ZAQ7));
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAH1, AArch64::ZAQ9));
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAH1, AArch64::ZAQ11));
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAH1, AArch64::ZAQ13));
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAH1, AArch64::ZAQ15));
-
-  // za1.h doesn't alias with za0.q, za2.q, ..
-  ASSERT_FALSE(TRI.regsOverlap(AArch64::ZAH1, AArch64::ZAQ0));
-  ASSERT_FALSE(TRI.regsOverlap(AArch64::ZAH1, AArch64::ZAQ2));
-  ASSERT_FALSE(TRI.regsOverlap(AArch64::ZAH1, AArch64::ZAQ4));
-  ASSERT_FALSE(TRI.regsOverlap(AArch64::ZAH1, AArch64::ZAQ6));
-  ASSERT_FALSE(TRI.regsOverlap(AArch64::ZAH1, AArch64::ZAQ8));
-  ASSERT_FALSE(TRI.regsOverlap(AArch64::ZAH1, AArch64::ZAQ10));
-  ASSERT_FALSE(TRI.regsOverlap(AArch64::ZAH1, AArch64::ZAQ12));
-  ASSERT_FALSE(TRI.regsOverlap(AArch64::ZAH1, AArch64::ZAQ14));
-
-  // za0.h doesn't alias with za1.q, za3.q, ..
-  ASSERT_FALSE(TRI.regsOverlap(AArch64::ZAH0, AArch64::ZAQ1));
-  ASSERT_FALSE(TRI.regsOverlap(AArch64::ZAH0, AArch64::ZAQ3));
-  ASSERT_FALSE(TRI.regsOverlap(AArch64::ZAH0, AArch64::ZAQ5));
-  ASSERT_FALSE(TRI.regsOverlap(AArch64::ZAH0, AArch64::ZAQ7));
-  ASSERT_FALSE(TRI.regsOverlap(AArch64::ZAH0, AArch64::ZAQ9));
-  ASSERT_FALSE(TRI.regsOverlap(AArch64::ZAH0, AArch64::ZAQ11));
-  ASSERT_FALSE(TRI.regsOverlap(AArch64::ZAH0, AArch64::ZAQ13));
-  ASSERT_FALSE(TRI.regsOverlap(AArch64::ZAH0, AArch64::ZAQ15));
-
-  // za0.s aliases with za0.q, za4.q, za8.q, za12.q
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAS0, AArch64::ZAQ0));
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAS0, AArch64::ZAQ4));
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAS0, AArch64::ZAQ8));
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAS0, AArch64::ZAQ12));
-
-  // za1.s aliases with za1.q, za5.q, za9.q, za13.q
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAS1, AArch64::ZAQ1));
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAS1, AArch64::ZAQ5));
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAS1, AArch64::ZAQ9));
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAS1, AArch64::ZAQ13));
-
-  // za0.s doesn't alias with za1.q, za5.q, za9.q, za13.q
-  ASSERT_FALSE(TRI.regsOverlap(AArch64::ZAS0, AArch64::ZAQ1));
-  ASSERT_FALSE(TRI.regsOverlap(AArch64::ZAS0, AArch64::ZAQ5));
-  ASSERT_FALSE(TRI.regsOverlap(AArch64::ZAS0, AArch64::ZAQ9));
-  ASSERT_FALSE(TRI.regsOverlap(AArch64::ZAS0, AArch64::ZAQ13));
-
-  // za1.s doesn't alias with za0.q, za4.q, za8.q, za12.q
-  ASSERT_FALSE(TRI.regsOverlap(AArch64::ZAS1, AArch64::ZAQ0));
-  ASSERT_FALSE(TRI.regsOverlap(AArch64::ZAS1, AArch64::ZAQ4));
-  ASSERT_FALSE(TRI.regsOverlap(AArch64::ZAS1, AArch64::ZAQ8));
-  ASSERT_FALSE(TRI.regsOverlap(AArch64::ZAS1, AArch64::ZAQ12));
-
-  // za0.d aliases za0.q and za8.q
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAD0, AArch64::ZAQ0));
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAD0, AArch64::ZAQ8));
-
-  // za1.d aliases za1.q and za9.q
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAD1, AArch64::ZAQ1));
-  ASSERT_TRUE(TRI.regsOverlap(AArch64::ZAD1, AArch64::ZAQ9));
-
-  // za0.d doesn't alias with za1.q and za9.q
-  ASSERT_FALSE(TRI.regsOverlap(AArch64::ZAD0, AArch64::ZAQ1));
-  ASSERT_FALSE(TRI.regsOverlap(AArch64::ZAD0, AArch64::ZAQ9));
-
-  // za1.d doesn't alias with za0.q and za8.q
-  ASSERT_FALSE(TRI.regsOverlap(AArch64::ZAD1, AArch64::ZAQ0));
-  ASSERT_FALSE(TRI.regsOverlap(AArch64::ZAD1, AArch64::ZAQ8));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/Target/AMDGPU/CMakeLists.txt b/gnu/llvm/llvm/unittests/Target/AMDGPU/CMakeLists.txt
deleted file mode 100644
index 8cdb59c9f72..00000000000
--- a/gnu/llvm/llvm/unittests/Target/AMDGPU/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-include_directories(
-  ${PROJECT_SOURCE_DIR}/lib/Target/AMDGPU
-  ${PROJECT_BINARY_DIR}/lib/Target/AMDGPU
-  )
-
-set(LLVM_LINK_COMPONENTS
-  AMDGPUCodeGen
-  AMDGPUDesc
-  AMDGPUInfo
-  CodeGen
-  Core
-  MC
-  Support
-  )
-
-add_llvm_target_unittest(AMDGPUTests
-  DwarfRegMappings.cpp
-  ExecMayBeModifiedBeforeAnyUse.cpp
-  )
diff --git a/gnu/llvm/llvm/unittests/Target/AMDGPU/DwarfRegMappings.cpp b/gnu/llvm/llvm/unittests/Target/AMDGPU/DwarfRegMappings.cpp
deleted file mode 100644
index fca919993dc..00000000000
--- a/gnu/llvm/llvm/unittests/Target/AMDGPU/DwarfRegMappings.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-//===- llvm/unittests/Target/AMDGPU/DwarfRegMappings.cpp ------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "AMDGPUSubtarget.h"
-#include "AMDGPUTargetMachine.h"
-#include "llvm/CodeGen/TargetSubtargetInfo.h"
-#include "llvm/MC/MCTargetOptions.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "llvm/Target/TargetMachine.h"
-#include "gtest/gtest.h"
-#include <thread>
-
-using namespace llvm;
-
-std::once_flag flag;
-
-void InitializeAMDGPUTarget() {
-  std::call_once(flag, []() {
-    LLVMInitializeAMDGPUTargetInfo();
-    LLVMInitializeAMDGPUTarget();
-    LLVMInitializeAMDGPUTargetMC();
-  });
-}
-
-std::unique_ptr<const GCNTargetMachine>
-createTargetMachine(std::string TStr, StringRef CPU, StringRef FS) {
-  InitializeAMDGPUTarget();
-
-  std::string Error;
-  const Target *T = TargetRegistry::lookupTarget(TStr, Error);
-  if (!T)
-    return nullptr;
-
-  TargetOptions Options;
-  return std::unique_ptr<GCNTargetMachine>(static_cast<GCNTargetMachine *>(
-      T->createTargetMachine(TStr, CPU, FS, Options, None, None)));
-}
-
-TEST(AMDGPUDwarfRegMappingTests, TestWave64DwarfRegMapping) {
-  for (auto Triple :
-       {"amdgcn-amd-", "amdgcn-amd-amdhsa", "amdgcn-amd-amdpal"}) {
-    auto TM = createTargetMachine(Triple, "gfx1010", "+wavefrontsize64");
-    if (TM) {
-      GCNSubtarget ST(TM->getTargetTriple(), std::string(TM->getTargetCPU()),
-                      std::string(TM->getTargetFeatureString()), *TM);
-      auto MRI = ST.getRegisterInfo();
-      if (MRI) {
-        // Wave64 Dwarf register mapping test numbers
-        // PC_64 => 16, EXEC_MASK_64 => 17, S0 => 32, S63 => 95,
-        // S64 => 1088, S105 => 1129, V0 => 2560, V255 => 2815,
-        // A0 => 3072, A255 => 3327
-        for (int llvmReg :
-             {16, 17, 32, 95, 1088, 1129, 2560, 2815, 3072, 3327}) {
-          MCRegister PCReg(*MRI->getLLVMRegNum(llvmReg, false));
-          EXPECT_EQ(llvmReg, MRI->getDwarfRegNum(PCReg, false));
-        }
-      }
-    }
-  }
-}
-
-TEST(AMDGPUDwarfRegMappingTests, TestWave32DwarfRegMapping) {
-  for (auto Triple :
-       {"amdgcn-amd-", "amdgcn-amd-amdhsa", "amdgcn-amd-amdpal"}) {
-    auto TM = createTargetMachine(Triple, "gfx1010", "+wavefrontsize32");
-    if (TM) {
-      GCNSubtarget ST(TM->getTargetTriple(), std::string(TM->getTargetCPU()),
-                      std::string(TM->getTargetFeatureString()), *TM);
-      auto MRI = ST.getRegisterInfo();
-      if (MRI) {
-        // Wave32 Dwarf register mapping test numbers
-        // PC_64 => 16, EXEC_MASK_32 => 1, S0 => 32, S63 => 95,
-        // S64 => 1088, S105 => 1129, V0 => 1536, V255 => 1791,
-        // A0 => 2048, A255 => 2303
-        for (int llvmReg :
-             {16, 1, 32, 95, 1088, 1129, 1536, 1791, 2048, 2303}) {
-          MCRegister PCReg(*MRI->getLLVMRegNum(llvmReg, false));
-          EXPECT_EQ(llvmReg, MRI->getDwarfRegNum(PCReg, false));
-        }
-      }
-    }
-  }
-}
diff --git a/gnu/llvm/llvm/unittests/Target/AMDGPU/ExecMayBeModifiedBeforeAnyUse.cpp b/gnu/llvm/llvm/unittests/Target/AMDGPU/ExecMayBeModifiedBeforeAnyUse.cpp
deleted file mode 100755
index c772608b49d..00000000000
--- a/gnu/llvm/llvm/unittests/Target/AMDGPU/ExecMayBeModifiedBeforeAnyUse.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//===- llvm/unittests/Target/AMDGPU/ExecMayBeModifiedBeforeAnyUse.cpp -----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "AMDGPUTargetMachine.h"
-#include "GCNSubtarget.h"
-#include "MCTargetDesc/AMDGPUMCTargetDesc.h"
-#include "llvm/CodeGen/MachineModuleInfo.h"
-#include "llvm/CodeGen/TargetSubtargetInfo.h"
-#include "llvm/MC/MCTargetOptions.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "llvm/Target/TargetMachine.h"
-#include "gtest/gtest.h"
-#include <thread>
-
-using namespace llvm;
-
-// implementation is in the llvm/unittests/Target/AMDGPU/DwarfRegMappings.cpp
-std::unique_ptr<const GCNTargetMachine>
-createTargetMachine(std::string TStr, StringRef CPU, StringRef FS);
-
-TEST(AMDGPUExecMayBeModifiedBeforeAnyUse, TheTest) {
-  auto TM = createTargetMachine("amdgcn-amd-", "gfx906", "");
-  if (!TM)
-    return;
-
-  GCNSubtarget ST(TM->getTargetTriple(), std::string(TM->getTargetCPU()),
-                  std::string(TM->getTargetFeatureString()), *TM);
-
-  LLVMContext Ctx;
-  Module Mod("Module", Ctx);
-  Mod.setDataLayout(TM->createDataLayout());
-
-  auto *Type = FunctionType::get(Type::getVoidTy(Ctx), false);
-  auto *F = Function::Create(Type, GlobalValue::ExternalLinkage, "Test", &Mod);
-
-  MachineModuleInfo MMI(TM.get());
-  auto MF = std::make_unique<MachineFunction>(*F, *TM, ST, 42, MMI);
-  auto *BB = MF->CreateMachineBasicBlock();
-  MF->push_back(BB);
-
-  auto E = BB->end();
-  DebugLoc DL;
-  const auto &TII = *ST.getInstrInfo();
-  auto &MRI = MF->getRegInfo();
-
-  // create machine IR
-  Register R = MRI.createVirtualRegister(&AMDGPU::SReg_32RegClass);
-
-  MachineInstr *DefMI =
-      BuildMI(*BB, E, DL, TII.get(AMDGPU::S_MOV_B32), R).addImm(42).getInstr();
-
-  auto First =
-      BuildMI(*BB, E, DL, TII.get(AMDGPU::S_NOP)).addReg(R, RegState::Implicit);
-
-  BuildMI(*BB, E, DL, TII.get(AMDGPU::S_NOP)).addReg(R, RegState::Implicit);
-
-  // this violates the continuous sequence of R's uses for the first S_NOP
-  First.addReg(R, RegState::Implicit);
-
-#ifdef DEBUG_THIS_TEST
-  MF->dump();
-  MRI.dumpUses(R);
-#endif
-
-  // make sure execMayBeModifiedBeforeAnyUse doesn't crash
-  ASSERT_FALSE(execMayBeModifiedBeforeAnyUse(MRI, R, *DefMI));
-}
diff --git a/gnu/llvm/llvm/unittests/Target/ARM/CMakeLists.txt b/gnu/llvm/llvm/unittests/Target/ARM/CMakeLists.txt
deleted file mode 100644
index ba7a0449512..00000000000
--- a/gnu/llvm/llvm/unittests/Target/ARM/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-include_directories(
-  ${LLVM_MAIN_SRC_DIR}/lib/Target/ARM
-  ${LLVM_BINARY_DIR}/lib/Target/ARM
-  )
-
-set(LLVM_LINK_COMPONENTS
-  ARMCodeGen
-  ARMDesc
-  ARMInfo
-  CodeGen
-  GlobalISel
-  MC
-  SelectionDAG
-  Support
-  Target
-)
-
-add_llvm_target_unittest(ARMTests
-  MachineInstrTest.cpp
-  )
diff --git a/gnu/llvm/llvm/unittests/Target/ARM/MachineInstrTest.cpp b/gnu/llvm/llvm/unittests/Target/ARM/MachineInstrTest.cpp
deleted file mode 100644
index b02779453f7..00000000000
--- a/gnu/llvm/llvm/unittests/Target/ARM/MachineInstrTest.cpp
+++ /dev/null
@@ -1,1210 +0,0 @@
-#include "ARMBaseInstrInfo.h"
-#include "ARMSubtarget.h"
-#include "ARMTargetMachine.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "llvm/Target/TargetMachine.h"
-#include "llvm/Target/TargetOptions.h"
-
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-TEST(MachineInstructionDoubleWidthResult, IsCorrect) {
-  using namespace ARM;
-
-  auto DoubleWidthResult = [](unsigned Opcode) {
-    switch (Opcode) {
-    default:
-      break;
-    case MVE_VMULLBp16:
-    case MVE_VMULLBp8:
-    case MVE_VMULLBs16:
-    case MVE_VMULLBs32:
-    case MVE_VMULLBs8:
-    case MVE_VMULLBu16:
-    case MVE_VMULLBu32:
-    case MVE_VMULLBu8:
-    case MVE_VMULLTp16:
-    case MVE_VMULLTp8:
-    case MVE_VMULLTs16:
-    case MVE_VMULLTs32:
-    case MVE_VMULLTs8:
-    case MVE_VMULLTu16:
-    case MVE_VMULLTu32:
-    case MVE_VMULLTu8:
-    case MVE_VQDMULL_qr_s16bh:
-    case MVE_VQDMULL_qr_s16th:
-    case MVE_VQDMULL_qr_s32bh:
-    case MVE_VQDMULL_qr_s32th:
-    case MVE_VQDMULLs16bh:
-    case MVE_VQDMULLs16th:
-    case MVE_VQDMULLs32bh:
-    case MVE_VQDMULLs32th:
-    case MVE_VMOVLs16bh:
-    case MVE_VMOVLs16th:
-    case MVE_VMOVLs8bh:
-    case MVE_VMOVLs8th:
-    case MVE_VMOVLu16bh:
-    case MVE_VMOVLu16th:
-    case MVE_VMOVLu8bh:
-    case MVE_VMOVLu8th:
-    case MVE_VSHLL_imms16bh:
-    case MVE_VSHLL_imms16th:
-    case MVE_VSHLL_imms8bh:
-    case MVE_VSHLL_imms8th:
-    case MVE_VSHLL_immu16bh:
-    case MVE_VSHLL_immu16th:
-    case MVE_VSHLL_immu8bh:
-    case MVE_VSHLL_immu8th:
-    case MVE_VSHLL_lws16bh:
-    case MVE_VSHLL_lws16th:
-    case MVE_VSHLL_lws8bh:
-    case MVE_VSHLL_lws8th:
-    case MVE_VSHLL_lwu16bh:
-    case MVE_VSHLL_lwu16th:
-    case MVE_VSHLL_lwu8bh:
-    case MVE_VSHLL_lwu8th:
-      return true;
-    }
-    return false;
-  };
-
-  LLVMInitializeARMTargetInfo();
-  LLVMInitializeARMTarget();
-  LLVMInitializeARMTargetMC();
-
-  auto TT(Triple::normalize("thumbv8.1m.main-none-none-eabi"));
-  std::string Error;
-  const Target *T = TargetRegistry::lookupTarget(TT, Error);
-  if (!T) {
-    dbgs() << Error;
-    return;
-  }
-
-  TargetOptions Options;
-  auto TM = std::unique_ptr<LLVMTargetMachine>(
-    static_cast<LLVMTargetMachine*>(
-      T->createTargetMachine(TT, "generic", "", Options, None, None,
-                             CodeGenOpt::Default)));
-  ARMSubtarget ST(TM->getTargetTriple(), std::string(TM->getTargetCPU()),
-                  std::string(TM->getTargetFeatureString()),
-                  *static_cast<const ARMBaseTargetMachine *>(TM.get()), false);
-  const ARMBaseInstrInfo *TII = ST.getInstrInfo();
-  auto MII = TM->getMCInstrInfo();
-
-  for (unsigned i = 0; i < ARM::INSTRUCTION_LIST_END; ++i) {
-    const MCInstrDesc &Desc = TII->get(i);
-
-    uint64_t Flags = Desc.TSFlags;
-    if ((Flags & ARMII::DomainMask) != ARMII::DomainMVE)
-      continue;
-
-    bool Valid = (Flags & ARMII::DoubleWidthResult) != 0;
-    ASSERT_EQ(DoubleWidthResult(i), Valid)
-              << MII->getName(i)
-              << ": mismatched expectation for tail-predicated safety\n";
-  }
-}
-
-TEST(MachineInstructionHorizontalReduction, IsCorrect) {
-  using namespace ARM;
-
-  auto HorizontalReduction = [](unsigned Opcode) {
-    switch (Opcode) {
-    default:
-      break;
-    case MVE_VABAVs16:
-    case MVE_VABAVs32:
-    case MVE_VABAVs8:
-    case MVE_VABAVu16:
-    case MVE_VABAVu32:
-    case MVE_VABAVu8:
-    case MVE_VADDLVs32acc:
-    case MVE_VADDLVs32no_acc:
-    case MVE_VADDLVu32acc:
-    case MVE_VADDLVu32no_acc:
-    case MVE_VADDVs16acc:
-    case MVE_VADDVs16no_acc:
-    case MVE_VADDVs32acc:
-    case MVE_VADDVs32no_acc:
-    case MVE_VADDVs8acc:
-    case MVE_VADDVs8no_acc:
-    case MVE_VADDVu16acc:
-    case MVE_VADDVu16no_acc:
-    case MVE_VADDVu32acc:
-    case MVE_VADDVu32no_acc:
-    case MVE_VADDVu8acc:
-    case MVE_VADDVu8no_acc:
-    case MVE_VMAXAVs16:
-    case MVE_VMAXAVs32:
-    case MVE_VMAXAVs8:
-    case MVE_VMAXNMAVf16:
-    case MVE_VMAXNMAVf32:
-    case MVE_VMAXNMVf16:
-    case MVE_VMAXNMVf32:
-    case MVE_VMAXVs16:
-    case MVE_VMAXVs32:
-    case MVE_VMAXVs8:
-    case MVE_VMAXVu16:
-    case MVE_VMAXVu32:
-    case MVE_VMAXVu8:
-    case MVE_VMINAVs16:
-    case MVE_VMINAVs32:
-    case MVE_VMINAVs8:
-    case MVE_VMINNMAVf16:
-    case MVE_VMINNMAVf32:
-    case MVE_VMINNMVf16:
-    case MVE_VMINNMVf32:
-    case MVE_VMINVs16:
-    case MVE_VMINVs32:
-    case MVE_VMINVs8:
-    case MVE_VMINVu16:
-    case MVE_VMINVu32:
-    case MVE_VMINVu8:
-    case MVE_VMLADAVas16:
-    case MVE_VMLADAVas32:
-    case MVE_VMLADAVas8:
-    case MVE_VMLADAVau16:
-    case MVE_VMLADAVau32:
-    case MVE_VMLADAVau8:
-    case MVE_VMLADAVaxs16:
-    case MVE_VMLADAVaxs32:
-    case MVE_VMLADAVaxs8:
-    case MVE_VMLADAVs16:
-    case MVE_VMLADAVs32:
-    case MVE_VMLADAVs8:
-    case MVE_VMLADAVu16:
-    case MVE_VMLADAVu32:
-    case MVE_VMLADAVu8:
-    case MVE_VMLADAVxs16:
-    case MVE_VMLADAVxs32:
-    case MVE_VMLADAVxs8:
-    case MVE_VMLALDAVas16:
-    case MVE_VMLALDAVas32:
-    case MVE_VMLALDAVau16:
-    case MVE_VMLALDAVau32:
-    case MVE_VMLALDAVaxs16:
-    case MVE_VMLALDAVaxs32:
-    case MVE_VMLALDAVs16:
-    case MVE_VMLALDAVs32:
-    case MVE_VMLALDAVu16:
-    case MVE_VMLALDAVu32:
-    case MVE_VMLALDAVxs16:
-    case MVE_VMLALDAVxs32:
-    case MVE_VMLSDAVas16:
-    case MVE_VMLSDAVas32:
-    case MVE_VMLSDAVas8:
-    case MVE_VMLSDAVaxs16:
-    case MVE_VMLSDAVaxs32:
-    case MVE_VMLSDAVaxs8:
-    case MVE_VMLSDAVs16:
-    case MVE_VMLSDAVs32:
-    case MVE_VMLSDAVs8:
-    case MVE_VMLSDAVxs16:
-    case MVE_VMLSDAVxs32:
-    case MVE_VMLSDAVxs8:
-    case MVE_VMLSLDAVas16:
-    case MVE_VMLSLDAVas32:
-    case MVE_VMLSLDAVaxs16:
-    case MVE_VMLSLDAVaxs32:
-    case MVE_VMLSLDAVs16:
-    case MVE_VMLSLDAVs32:
-    case MVE_VMLSLDAVxs16:
-    case MVE_VMLSLDAVxs32:
-    case MVE_VRMLALDAVHas32:
-    case MVE_VRMLALDAVHau32:
-    case MVE_VRMLALDAVHaxs32:
-    case MVE_VRMLALDAVHs32:
-    case MVE_VRMLALDAVHu32:
-    case MVE_VRMLALDAVHxs32:
-    case MVE_VRMLSLDAVHas32:
-    case MVE_VRMLSLDAVHaxs32:
-    case MVE_VRMLSLDAVHs32:
-    case MVE_VRMLSLDAVHxs32:
-      return true;
-    }
-    return false;
-  };
-
-  LLVMInitializeARMTargetInfo();
-  LLVMInitializeARMTarget();
-  LLVMInitializeARMTargetMC();
-
-  auto TT(Triple::normalize("thumbv8.1m.main-none-none-eabi"));
-  std::string Error;
-  const Target *T = TargetRegistry::lookupTarget(TT, Error);
-  if (!T) {
-    dbgs() << Error;
-    return;
-  }
-
-  TargetOptions Options;
-  auto TM = std::unique_ptr<LLVMTargetMachine>(
-    static_cast<LLVMTargetMachine*>(
-      T->createTargetMachine(TT, "generic", "", Options, None, None,
-                             CodeGenOpt::Default)));
-  ARMSubtarget ST(TM->getTargetTriple(), std::string(TM->getTargetCPU()),
-                  std::string(TM->getTargetFeatureString()),
-                  *static_cast<const ARMBaseTargetMachine *>(TM.get()), false);
-  const ARMBaseInstrInfo *TII = ST.getInstrInfo();
-  auto MII = TM->getMCInstrInfo();
-
-  for (unsigned i = 0; i < ARM::INSTRUCTION_LIST_END; ++i) {
-    const MCInstrDesc &Desc = TII->get(i);
-
-    uint64_t Flags = Desc.TSFlags;
-    if ((Flags & ARMII::DomainMask) != ARMII::DomainMVE)
-      continue;
-    bool Valid = (Flags & ARMII::HorizontalReduction) != 0;
-    ASSERT_EQ(HorizontalReduction(i), Valid)
-              << MII->getName(i)
-              << ": mismatched expectation for tail-predicated safety\n";
-  }
-}
-
-TEST(MachineInstructionRetainsPreviousHalfElement, IsCorrect) {
-  using namespace ARM;
-
-  auto RetainsPreviousHalfElement = [](unsigned Opcode) {
-    switch (Opcode) {
-    default:
-      break;
-    case MVE_VMOVNi16bh:
-    case MVE_VMOVNi16th:
-    case MVE_VMOVNi32bh:
-    case MVE_VMOVNi32th:
-    case MVE_VQMOVNs16bh:
-    case MVE_VQMOVNs16th:
-    case MVE_VQMOVNs32bh:
-    case MVE_VQMOVNs32th:
-    case MVE_VQMOVNu16bh:
-    case MVE_VQMOVNu16th:
-    case MVE_VQMOVNu32bh:
-    case MVE_VQMOVNu32th:
-    case MVE_VQMOVUNs16bh:
-    case MVE_VQMOVUNs16th:
-    case MVE_VQMOVUNs32bh:
-    case MVE_VQMOVUNs32th:
-    case MVE_VQRSHRNbhs16:
-    case MVE_VQRSHRNbhs32:
-    case MVE_VQRSHRNbhu16:
-    case MVE_VQRSHRNbhu32:
-    case MVE_VQRSHRNths16:
-    case MVE_VQRSHRNths32:
-    case MVE_VQRSHRNthu16:
-    case MVE_VQRSHRNthu32:
-    case MVE_VQRSHRUNs16bh:
-    case MVE_VQRSHRUNs16th:
-    case MVE_VQRSHRUNs32bh:
-    case MVE_VQRSHRUNs32th:
-    case MVE_VQSHRNbhs16:
-    case MVE_VQSHRNbhs32:
-    case MVE_VQSHRNbhu16:
-    case MVE_VQSHRNbhu32:
-    case MVE_VQSHRNths16:
-    case MVE_VQSHRNths32:
-    case MVE_VQSHRNthu16:
-    case MVE_VQSHRNthu32:
-    case MVE_VQSHRUNs16bh:
-    case MVE_VQSHRUNs16th:
-    case MVE_VQSHRUNs32bh:
-    case MVE_VQSHRUNs32th:
-    case MVE_VRSHRNi16bh:
-    case MVE_VRSHRNi16th:
-    case MVE_VRSHRNi32bh:
-    case MVE_VRSHRNi32th:
-    case MVE_VSHRNi16bh:
-    case MVE_VSHRNi16th:
-    case MVE_VSHRNi32bh:
-    case MVE_VSHRNi32th:
-    case MVE_VCVTf16f32bh:
-    case MVE_VCVTf16f32th:
-    case MVE_VCVTf32f16bh:
-    case MVE_VCVTf32f16th:
-      return true;
-    }
-    return false;
-  };
-
-  LLVMInitializeARMTargetInfo();
-  LLVMInitializeARMTarget();
-  LLVMInitializeARMTargetMC();
-
-  auto TT(Triple::normalize("thumbv8.1m.main-none-none-eabi"));
-  std::string Error;
-  const Target *T = TargetRegistry::lookupTarget(TT, Error);
-  if (!T) {
-    dbgs() << Error;
-    return;
-  }
-
-  TargetOptions Options;
-  auto TM = std::unique_ptr<LLVMTargetMachine>(
-    static_cast<LLVMTargetMachine*>(
-      T->createTargetMachine(TT, "generic", "", Options, None, None,
-                             CodeGenOpt::Default)));
-  ARMSubtarget ST(TM->getTargetTriple(), std::string(TM->getTargetCPU()),
-                  std::string(TM->getTargetFeatureString()),
-                  *static_cast<const ARMBaseTargetMachine *>(TM.get()), false);
-  const ARMBaseInstrInfo *TII = ST.getInstrInfo();
-  auto MII = TM->getMCInstrInfo();
-
-  for (unsigned i = 0; i < ARM::INSTRUCTION_LIST_END; ++i) {
-    const MCInstrDesc &Desc = TII->get(i);
-
-    uint64_t Flags = Desc.TSFlags;
-    if ((Flags & ARMII::DomainMask) != ARMII::DomainMVE)
-      continue;
-
-    bool Valid = (Flags & ARMII::RetainsPreviousHalfElement) != 0;
-    ASSERT_EQ(RetainsPreviousHalfElement(i), Valid)
-              << MII->getName(i)
-              << ": mismatched expectation for tail-predicated safety\n";
-  }
-}
-// Test for instructions that aren't immediately obviously valid within a
-// tail-predicated loop. This should be marked up in their tablegen
-// descriptions. Currently we, conservatively, disallow:
-// - cross beat carries.
-// - complex operations.
-// - horizontal operations with exchange.
-// - byte swapping.
-// - interleaved memory instructions.
-// TODO: Add to this list once we can handle them safely.
-TEST(MachineInstrValidTailPredication, IsCorrect) {
-
-  using namespace ARM;
-
-  auto IsValidTPOpcode = [](unsigned Opcode) {
-    switch (Opcode) {
-    default:
-      return false;
-    case MVE_ASRLi:
-    case MVE_ASRLr:
-    case MVE_LSRL:
-    case MVE_LSLLi:
-    case MVE_LSLLr:
-    case MVE_SQRSHR:
-    case MVE_SQRSHRL:
-    case MVE_SQSHL:
-    case MVE_SQSHLL:
-    case MVE_SRSHR:
-    case MVE_SRSHRL:
-    case MVE_UQRSHL:
-    case MVE_UQRSHLL:
-    case MVE_UQSHL:
-    case MVE_UQSHLL:
-    case MVE_URSHR:
-    case MVE_URSHRL:
-    case MVE_VABDf16:
-    case MVE_VABDf32:
-    case MVE_VABDs16:
-    case MVE_VABDs32:
-    case MVE_VABDs8:
-    case MVE_VABDu16:
-    case MVE_VABDu32:
-    case MVE_VABDu8:
-    case MVE_VABSf16:
-    case MVE_VABSf32:
-    case MVE_VABSs16:
-    case MVE_VABSs32:
-    case MVE_VABSs8:
-    case MVE_VADD_qr_f16:
-    case MVE_VADD_qr_f32:
-    case MVE_VADD_qr_i16:
-    case MVE_VADD_qr_i32:
-    case MVE_VADD_qr_i8:
-    case MVE_VADDVs16acc:
-    case MVE_VADDVs16no_acc:
-    case MVE_VADDVs32acc:
-    case MVE_VADDVs32no_acc:
-    case MVE_VADDVs8acc:
-    case MVE_VADDVs8no_acc:
-    case MVE_VADDVu16acc:
-    case MVE_VADDVu16no_acc:
-    case MVE_VADDVu32acc:
-    case MVE_VADDVu32no_acc:
-    case MVE_VADDVu8acc:
-    case MVE_VADDVu8no_acc:
-    case MVE_VADDf16:
-    case MVE_VADDf32:
-    case MVE_VADDi16:
-    case MVE_VADDi32:
-    case MVE_VADDi8:
-    case MVE_VAND:
-    case MVE_VBIC:
-    case MVE_VBICimmi16:
-    case MVE_VBICimmi32:
-    case MVE_VBRSR16:
-    case MVE_VBRSR32:
-    case MVE_VBRSR8:
-    case MVE_VCLSs16:
-    case MVE_VCLSs32:
-    case MVE_VCLSs8:
-    case MVE_VCLZs16:
-    case MVE_VCLZs32:
-    case MVE_VCLZs8:
-    case MVE_VCMPf16:
-    case MVE_VCMPf16r:
-    case MVE_VCMPf32:
-    case MVE_VCMPf32r:
-    case MVE_VCMPi16:
-    case MVE_VCMPi16r:
-    case MVE_VCMPi32:
-    case MVE_VCMPi32r:
-    case MVE_VCMPi8:
-    case MVE_VCMPi8r:
-    case MVE_VCMPs16:
-    case MVE_VCMPs16r:
-    case MVE_VCMPs32:
-    case MVE_VCMPs32r:
-    case MVE_VCMPs8:
-    case MVE_VCMPs8r:
-    case MVE_VCMPu16:
-    case MVE_VCMPu16r:
-    case MVE_VCMPu32:
-    case MVE_VCMPu32r:
-    case MVE_VCMPu8:
-    case MVE_VCMPu8r:
-    case MVE_VCTP16:
-    case MVE_VCTP32:
-    case MVE_VCTP64:
-    case MVE_VCTP8:
-    case MVE_VCVTf16s16_fix:
-    case MVE_VCVTf16s16n:
-    case MVE_VCVTf16u16_fix:
-    case MVE_VCVTf16u16n:
-    case MVE_VCVTf32s32_fix:
-    case MVE_VCVTf32s32n:
-    case MVE_VCVTf32u32_fix:
-    case MVE_VCVTf32u32n:
-    case MVE_VCVTs16f16_fix:
-    case MVE_VCVTs16f16a:
-    case MVE_VCVTs16f16m:
-    case MVE_VCVTs16f16n:
-    case MVE_VCVTs16f16p:
-    case MVE_VCVTs16f16z:
-    case MVE_VCVTs32f32_fix:
-    case MVE_VCVTs32f32a:
-    case MVE_VCVTs32f32m:
-    case MVE_VCVTs32f32n:
-    case MVE_VCVTs32f32p:
-    case MVE_VCVTs32f32z:
-    case MVE_VCVTu16f16_fix:
-    case MVE_VCVTu16f16a:
-    case MVE_VCVTu16f16m:
-    case MVE_VCVTu16f16n:
-    case MVE_VCVTu16f16p:
-    case MVE_VCVTu16f16z:
-    case MVE_VCVTu32f32_fix:
-    case MVE_VCVTu32f32a:
-    case MVE_VCVTu32f32m:
-    case MVE_VCVTu32f32n:
-    case MVE_VCVTu32f32p:
-    case MVE_VCVTu32f32z:
-    case MVE_VDDUPu16:
-    case MVE_VDDUPu32:
-    case MVE_VDDUPu8:
-    case MVE_VDUP16:
-    case MVE_VDUP32:
-    case MVE_VDUP8:
-    case MVE_VDWDUPu16:
-    case MVE_VDWDUPu32:
-    case MVE_VDWDUPu8:
-    case MVE_VEOR:
-    case MVE_VFMA_qr_Sf16:
-    case MVE_VFMA_qr_Sf32:
-    case MVE_VFMA_qr_f16:
-    case MVE_VFMA_qr_f32:
-    case MVE_VFMAf16:
-    case MVE_VFMAf32:
-    case MVE_VFMSf16:
-    case MVE_VFMSf32:
-    case MVE_VMAXAs16:
-    case MVE_VMAXAs32:
-    case MVE_VMAXAs8:
-    case MVE_VMAXs16:
-    case MVE_VMAXs32:
-    case MVE_VMAXs8:
-    case MVE_VMAXu16:
-    case MVE_VMAXu32:
-    case MVE_VMAXu8:
-    case MVE_VMINAs16:
-    case MVE_VMINAs32:
-    case MVE_VMINAs8:
-    case MVE_VMINs16:
-    case MVE_VMINs32:
-    case MVE_VMINs8:
-    case MVE_VMINu16:
-    case MVE_VMINu32:
-    case MVE_VMINu8:
-    case MVE_VMLADAVas16:
-    case MVE_VMLADAVas32:
-    case MVE_VMLADAVas8:
-    case MVE_VMLADAVau16:
-    case MVE_VMLADAVau32:
-    case MVE_VMLADAVau8:
-    case MVE_VMLADAVs16:
-    case MVE_VMLADAVs32:
-    case MVE_VMLADAVs8:
-    case MVE_VMLADAVu16:
-    case MVE_VMLADAVu32:
-    case MVE_VMLADAVu8:
-    case MVE_VMLALDAVs16:
-    case MVE_VMLALDAVs32:
-    case MVE_VMLALDAVu16:
-    case MVE_VMLALDAVu32:
-    case MVE_VMLALDAVas16:
-    case MVE_VMLALDAVas32:
-    case MVE_VMLALDAVau16:
-    case MVE_VMLALDAVau32:
-    case MVE_VMLSDAVas16:
-    case MVE_VMLSDAVas32:
-    case MVE_VMLSDAVas8:
-    case MVE_VMLSDAVs16:
-    case MVE_VMLSDAVs32:
-    case MVE_VMLSDAVs8:
-    case MVE_VMLSLDAVas16:
-    case MVE_VMLSLDAVas32:
-    case MVE_VMLSLDAVs16:
-    case MVE_VMLSLDAVs32:
-    case MVE_VRMLALDAVHas32:
-    case MVE_VRMLALDAVHau32:
-    case MVE_VRMLALDAVHs32:
-    case MVE_VRMLALDAVHu32:
-    case MVE_VRMLSLDAVHas32:
-    case MVE_VRMLSLDAVHs32:
-    case MVE_VMLAS_qr_s16:
-    case MVE_VMLAS_qr_s32:
-    case MVE_VMLAS_qr_s8:
-    case MVE_VMLAS_qr_u16:
-    case MVE_VMLAS_qr_u32:
-    case MVE_VMLAS_qr_u8:
-    case MVE_VMLA_qr_s16:
-    case MVE_VMLA_qr_s32:
-    case MVE_VMLA_qr_s8:
-    case MVE_VMLA_qr_u16:
-    case MVE_VMLA_qr_u32:
-    case MVE_VMLA_qr_u8:
-    case MVE_VHADD_qr_s16:
-    case MVE_VHADD_qr_s32:
-    case MVE_VHADD_qr_s8:
-    case MVE_VHADD_qr_u16:
-    case MVE_VHADD_qr_u32:
-    case MVE_VHADD_qr_u8:
-    case MVE_VHADDs16:
-    case MVE_VHADDs32:
-    case MVE_VHADDs8:
-    case MVE_VHADDu16:
-    case MVE_VHADDu32:
-    case MVE_VHADDu8:
-    case MVE_VHSUB_qr_s16:
-    case MVE_VHSUB_qr_s32:
-    case MVE_VHSUB_qr_s8:
-    case MVE_VHSUB_qr_u16:
-    case MVE_VHSUB_qr_u32:
-    case MVE_VHSUB_qr_u8:
-    case MVE_VHSUBs16:
-    case MVE_VHSUBs32:
-    case MVE_VHSUBs8:
-    case MVE_VHSUBu16:
-    case MVE_VHSUBu32:
-    case MVE_VHSUBu8:
-    case MVE_VIDUPu16:
-    case MVE_VIDUPu32:
-    case MVE_VIDUPu8:
-    case MVE_VIWDUPu16:
-    case MVE_VIWDUPu32:
-    case MVE_VIWDUPu8:
-    case MVE_VLD20_8:
-    case MVE_VLD21_8:
-    case MVE_VLD20_16:
-    case MVE_VLD21_16:
-    case MVE_VLD20_32:
-    case MVE_VLD21_32:
-    case MVE_VLD20_8_wb:
-    case MVE_VLD21_8_wb:
-    case MVE_VLD20_16_wb:
-    case MVE_VLD21_16_wb:
-    case MVE_VLD20_32_wb:
-    case MVE_VLD21_32_wb:
-    case MVE_VLD40_8:
-    case MVE_VLD41_8:
-    case MVE_VLD42_8:
-    case MVE_VLD43_8:
-    case MVE_VLD40_16:
-    case MVE_VLD41_16:
-    case MVE_VLD42_16:
-    case MVE_VLD43_16:
-    case MVE_VLD40_32:
-    case MVE_VLD41_32:
-    case MVE_VLD42_32:
-    case MVE_VLD43_32:
-    case MVE_VLD40_8_wb:
-    case MVE_VLD41_8_wb:
-    case MVE_VLD42_8_wb:
-    case MVE_VLD43_8_wb:
-    case MVE_VLD40_16_wb:
-    case MVE_VLD41_16_wb:
-    case MVE_VLD42_16_wb:
-    case MVE_VLD43_16_wb:
-    case MVE_VLD40_32_wb:
-    case MVE_VLD41_32_wb:
-    case MVE_VLD42_32_wb:
-    case MVE_VLD43_32_wb:
-    case MVE_VLDRBS16:
-    case MVE_VLDRBS16_post:
-    case MVE_VLDRBS16_pre:
-    case MVE_VLDRBS16_rq:
-    case MVE_VLDRBS32:
-    case MVE_VLDRBS32_post:
-    case MVE_VLDRBS32_pre:
-    case MVE_VLDRBS32_rq:
-    case MVE_VLDRBU16:
-    case MVE_VLDRBU16_post:
-    case MVE_VLDRBU16_pre:
-    case MVE_VLDRBU16_rq:
-    case MVE_VLDRBU32:
-    case MVE_VLDRBU32_post:
-    case MVE_VLDRBU32_pre:
-    case MVE_VLDRBU32_rq:
-    case MVE_VLDRBU8:
-    case MVE_VLDRBU8_post:
-    case MVE_VLDRBU8_pre:
-    case MVE_VLDRBU8_rq:
-    case MVE_VLDRDU64_qi:
-    case MVE_VLDRDU64_qi_pre:
-    case MVE_VLDRDU64_rq:
-    case MVE_VLDRDU64_rq_u:
-    case MVE_VLDRHS32:
-    case MVE_VLDRHS32_post:
-    case MVE_VLDRHS32_pre:
-    case MVE_VLDRHS32_rq:
-    case MVE_VLDRHS32_rq_u:
-    case MVE_VLDRHU16:
-    case MVE_VLDRHU16_post:
-    case MVE_VLDRHU16_pre:
-    case MVE_VLDRHU16_rq:
-    case MVE_VLDRHU16_rq_u:
-    case MVE_VLDRHU32:
-    case MVE_VLDRHU32_post:
-    case MVE_VLDRHU32_pre:
-    case MVE_VLDRHU32_rq:
-    case MVE_VLDRHU32_rq_u:
-    case MVE_VLDRWU32:
-    case MVE_VLDRWU32_post:
-    case MVE_VLDRWU32_pre:
-    case MVE_VLDRWU32_qi:
-    case MVE_VLDRWU32_qi_pre:
-    case MVE_VLDRWU32_rq:
-    case MVE_VLDRWU32_rq_u:
-    case MVE_VMOVimmf32:
-    case MVE_VMOVimmi16:
-    case MVE_VMOVimmi32:
-    case MVE_VMOVimmi64:
-    case MVE_VMOVimmi8:
-    case MVE_VMOVNi16bh:
-    case MVE_VMOVNi16th:
-    case MVE_VMOVNi32bh:
-    case MVE_VMOVNi32th:
-    case MVE_VMULLBp16:
-    case MVE_VMULLBp8:
-    case MVE_VMULLBs16:
-    case MVE_VMULLBs32:
-    case MVE_VMULLBs8:
-    case MVE_VMULLBu16:
-    case MVE_VMULLBu32:
-    case MVE_VMULLBu8:
-    case MVE_VMULLTp16:
-    case MVE_VMULLTp8:
-    case MVE_VMULLTs16:
-    case MVE_VMULLTs32:
-    case MVE_VMULLTs8:
-    case MVE_VMULLTu16:
-    case MVE_VMULLTu32:
-    case MVE_VMULLTu8:
-    case MVE_VMUL_qr_f16:
-    case MVE_VMUL_qr_f32:
-    case MVE_VMUL_qr_i16:
-    case MVE_VMUL_qr_i32:
-    case MVE_VMUL_qr_i8:
-    case MVE_VMULf16:
-    case MVE_VMULf32:
-    case MVE_VMULi16:
-    case MVE_VMULi8:
-    case MVE_VMULi32:
-    case MVE_VMULHs32:
-    case MVE_VMULHs16:
-    case MVE_VMULHs8:
-    case MVE_VMULHu32:
-    case MVE_VMULHu16:
-    case MVE_VMULHu8:
-    case MVE_VMVN:
-    case MVE_VMVNimmi16:
-    case MVE_VMVNimmi32:
-    case MVE_VNEGf16:
-    case MVE_VNEGf32:
-    case MVE_VNEGs16:
-    case MVE_VNEGs32:
-    case MVE_VNEGs8:
-    case MVE_VORN:
-    case MVE_VORR:
-    case MVE_VORRimmi16:
-    case MVE_VORRimmi32:
-    case MVE_VPST:
-    case MVE_VPTv16i8:
-    case MVE_VPTv8i16:
-    case MVE_VPTv4i32:
-    case MVE_VPTv16i8r:
-    case MVE_VPTv8i16r:
-    case MVE_VPTv4i32r:
-    case MVE_VPTv16s8:
-    case MVE_VPTv8s16:
-    case MVE_VPTv4s32:
-    case MVE_VPTv16s8r:
-    case MVE_VPTv8s16r:
-    case MVE_VPTv4s32r:
-    case MVE_VPTv16u8:
-    case MVE_VPTv8u16:
-    case MVE_VPTv4u32:
-    case MVE_VPTv16u8r:
-    case MVE_VPTv8u16r:
-    case MVE_VPTv4u32r:
-    case MVE_VPTv8f16:
-    case MVE_VPTv4f32:
-    case MVE_VPTv8f16r:
-    case MVE_VPTv4f32r:
-    case MVE_VQABSs16:
-    case MVE_VQABSs32:
-    case MVE_VQABSs8:
-    case MVE_VQADD_qr_s16:
-    case MVE_VQADD_qr_s32:
-    case MVE_VQADD_qr_s8:
-    case MVE_VQADD_qr_u16:
-    case MVE_VQADD_qr_u32:
-    case MVE_VQADD_qr_u8:
-    case MVE_VQADDs16:
-    case MVE_VQADDs32:
-    case MVE_VQADDs8:
-    case MVE_VQADDu16:
-    case MVE_VQADDu32:
-    case MVE_VQADDu8:
-    case MVE_VQDMULH_qr_s16:
-    case MVE_VQDMULH_qr_s32:
-    case MVE_VQDMULH_qr_s8:
-    case MVE_VQDMULHi16:
-    case MVE_VQDMULHi32:
-    case MVE_VQDMULHi8:
-    case MVE_VQDMULL_qr_s16bh:
-    case MVE_VQDMULL_qr_s16th:
-    case MVE_VQDMULL_qr_s32bh:
-    case MVE_VQDMULL_qr_s32th:
-    case MVE_VQDMULLs16bh:
-    case MVE_VQDMULLs16th:
-    case MVE_VQDMULLs32bh:
-    case MVE_VQDMULLs32th:
-    case MVE_VQRDMULH_qr_s16:
-    case MVE_VQRDMULH_qr_s32:
-    case MVE_VQRDMULH_qr_s8:
-    case MVE_VQRDMULHi16:
-    case MVE_VQRDMULHi32:
-    case MVE_VQRDMULHi8:
-    case MVE_VQNEGs16:
-    case MVE_VQNEGs32:
-    case MVE_VQNEGs8:
-    case MVE_VQMOVNs16bh:
-    case MVE_VQMOVNs16th:
-    case MVE_VQMOVNs32bh:
-    case MVE_VQMOVNs32th:
-    case MVE_VQMOVNu16bh:
-    case MVE_VQMOVNu16th:
-    case MVE_VQMOVNu32bh:
-    case MVE_VQMOVNu32th:
-    case MVE_VQMOVUNs16bh:
-    case MVE_VQMOVUNs16th:
-    case MVE_VQMOVUNs32bh:
-    case MVE_VQMOVUNs32th:
-    case MVE_VQRSHL_by_vecs16:
-    case MVE_VQRSHL_by_vecs32:
-    case MVE_VQRSHL_by_vecs8:
-    case MVE_VQRSHL_by_vecu16:
-    case MVE_VQRSHL_by_vecu32:
-    case MVE_VQRSHL_by_vecu8:
-    case MVE_VQRSHL_qrs16:
-    case MVE_VQRSHL_qrs32:
-    case MVE_VQRSHL_qrs8:
-    case MVE_VQRSHL_qru16:
-    case MVE_VQRSHL_qru8:
-    case MVE_VQRSHL_qru32:
-    case MVE_VQSHLU_imms16:
-    case MVE_VQSHLU_imms32:
-    case MVE_VQSHLU_imms8:
-    case MVE_VQSHLimms16:
-    case MVE_VQSHLimms32:
-    case MVE_VQSHLimms8:
-    case MVE_VQSHLimmu16:
-    case MVE_VQSHLimmu32:
-    case MVE_VQSHLimmu8:
-    case MVE_VQSHL_by_vecs16:
-    case MVE_VQSHL_by_vecs32:
-    case MVE_VQSHL_by_vecs8:
-    case MVE_VQSHL_by_vecu16:
-    case MVE_VQSHL_by_vecu32:
-    case MVE_VQSHL_by_vecu8:
-    case MVE_VQSHL_qrs16:
-    case MVE_VQSHL_qrs32:
-    case MVE_VQSHL_qrs8:
-    case MVE_VQSHL_qru16:
-    case MVE_VQSHL_qru32:
-    case MVE_VQSHL_qru8:
-    case MVE_VQRSHRNbhs16:
-    case MVE_VQRSHRNbhs32:
-    case MVE_VQRSHRNbhu16:
-    case MVE_VQRSHRNbhu32:
-    case MVE_VQRSHRNths16:
-    case MVE_VQRSHRNths32:
-    case MVE_VQRSHRNthu16:
-    case MVE_VQRSHRNthu32:
-    case MVE_VQRSHRUNs16bh:
-    case MVE_VQRSHRUNs16th:
-    case MVE_VQRSHRUNs32bh:
-    case MVE_VQRSHRUNs32th:
-    case MVE_VQSHRNbhs16:
-    case MVE_VQSHRNbhs32:
-    case MVE_VQSHRNbhu16:
-    case MVE_VQSHRNbhu32:
-    case MVE_VQSHRNths16:
-    case MVE_VQSHRNths32:
-    case MVE_VQSHRNthu16:
-    case MVE_VQSHRNthu32:
-    case MVE_VQSHRUNs16bh:
-    case MVE_VQSHRUNs16th:
-    case MVE_VQSHRUNs32bh:
-    case MVE_VQSHRUNs32th:
-    case MVE_VQSUB_qr_s16:
-    case MVE_VQSUB_qr_s32:
-    case MVE_VQSUB_qr_s8:
-    case MVE_VQSUB_qr_u16:
-    case MVE_VQSUB_qr_u32:
-    case MVE_VQSUB_qr_u8:
-    case MVE_VQSUBs16:
-    case MVE_VQSUBs32:
-    case MVE_VQSUBs8:
-    case MVE_VQSUBu16:
-    case MVE_VQSUBu32:
-    case MVE_VQSUBu8:
-    case MVE_VRHADDs16:
-    case MVE_VRHADDs32:
-    case MVE_VRHADDs8:
-    case MVE_VRHADDu16:
-    case MVE_VRHADDu32:
-    case MVE_VRHADDu8:
-    case MVE_VRINTf16A:
-    case MVE_VRINTf16M:
-    case MVE_VRINTf16N:
-    case MVE_VRINTf16P:
-    case MVE_VRINTf16X:
-    case MVE_VRINTf16Z:
-    case MVE_VRINTf32A:
-    case MVE_VRINTf32M:
-    case MVE_VRINTf32N:
-    case MVE_VRINTf32P:
-    case MVE_VRINTf32X:
-    case MVE_VRINTf32Z:
-    case MVE_VRMULHs32:
-    case MVE_VRMULHs16:
-    case MVE_VRMULHs8:
-    case MVE_VRMULHu32:
-    case MVE_VRMULHu16:
-    case MVE_VRMULHu8:
-    case MVE_VRSHL_by_vecs16:
-    case MVE_VRSHL_by_vecs32:
-    case MVE_VRSHL_by_vecs8:
-    case MVE_VRSHL_by_vecu16:
-    case MVE_VRSHL_by_vecu32:
-    case MVE_VRSHL_by_vecu8:
-    case MVE_VRSHL_qrs16:
-    case MVE_VRSHL_qrs32:
-    case MVE_VRSHL_qrs8:
-    case MVE_VRSHL_qru16:
-    case MVE_VRSHL_qru32:
-    case MVE_VRSHL_qru8:
-    case MVE_VRSHR_imms16:
-    case MVE_VRSHR_imms32:
-    case MVE_VRSHR_imms8:
-    case MVE_VRSHR_immu16:
-    case MVE_VRSHR_immu32:
-    case MVE_VRSHR_immu8:
-    case MVE_VRSHRNi16bh:
-    case MVE_VRSHRNi16th:
-    case MVE_VRSHRNi32bh:
-    case MVE_VRSHRNi32th:
-    case MVE_VSHL_by_vecs16:
-    case MVE_VSHL_by_vecs32:
-    case MVE_VSHL_by_vecs8:
-    case MVE_VSHL_by_vecu16:
-    case MVE_VSHL_by_vecu32:
-    case MVE_VSHL_by_vecu8:
-    case MVE_VSHL_immi16:
-    case MVE_VSHL_immi32:
-    case MVE_VSHL_immi8:
-    case MVE_VSHL_qrs16:
-    case MVE_VSHL_qrs32:
-    case MVE_VSHL_qrs8:
-    case MVE_VSHL_qru16:
-    case MVE_VSHL_qru32:
-    case MVE_VSHL_qru8:
-    case MVE_VSHR_imms16:
-    case MVE_VSHR_imms32:
-    case MVE_VSHR_imms8:
-    case MVE_VSHR_immu16:
-    case MVE_VSHR_immu32:
-    case MVE_VSHR_immu8:
-    case MVE_VSHRNi16bh:
-    case MVE_VSHRNi16th:
-    case MVE_VSHRNi32bh:
-    case MVE_VSHRNi32th:
-    case MVE_VSLIimm16:
-    case MVE_VSLIimm32:
-    case MVE_VSLIimm8:
-    case MVE_VSRIimm16:
-    case MVE_VSRIimm32:
-    case MVE_VSRIimm8:
-    case MVE_VSTRB16:
-    case MVE_VSTRB16_post:
-    case MVE_VSTRB16_pre:
-    case MVE_VSTRB16_rq:
-    case MVE_VSTRB32:
-    case MVE_VSTRB32_post:
-    case MVE_VSTRB32_pre:
-    case MVE_VSTRB32_rq:
-    case MVE_VSTRB8_rq:
-    case MVE_VSTRBU8:
-    case MVE_VSTRBU8_post:
-    case MVE_VSTRBU8_pre:
-    case MVE_VSTRD64_qi:
-    case MVE_VSTRD64_qi_pre:
-    case MVE_VSTRD64_rq:
-    case MVE_VSTRD64_rq_u:
-    case MVE_VSTRH16_rq:
-    case MVE_VSTRH16_rq_u:
-    case MVE_VSTRH32:
-    case MVE_VSTRH32_post:
-    case MVE_VSTRH32_pre:
-    case MVE_VSTRH32_rq:
-    case MVE_VSTRH32_rq_u:
-    case MVE_VSTRHU16:
-    case MVE_VSTRHU16_post:
-    case MVE_VSTRHU16_pre:
-    case MVE_VSTRW32_qi:
-    case MVE_VSTRW32_qi_pre:
-    case MVE_VSTRW32_rq:
-    case MVE_VSTRW32_rq_u:
-    case MVE_VSTRWU32:
-    case MVE_VSTRWU32_post:
-    case MVE_VSTRWU32_pre:
-    case MVE_VSUB_qr_f16:
-    case MVE_VSUB_qr_f32:
-    case MVE_VSUB_qr_i16:
-    case MVE_VSUB_qr_i32:
-    case MVE_VSUB_qr_i8:
-    case MVE_VSUBf16:
-    case MVE_VSUBf32:
-    case MVE_VSUBi16:
-    case MVE_VSUBi32:
-    case MVE_VSUBi8:
-    case VLDR_P0_off:
-    case VLDR_P0_post:
-    case VLDR_P0_pre:
-    case VLDR_VPR_off:
-    case VLDR_VPR_post:
-    case VLDR_VPR_pre:
-    case VSTR_P0_off:
-    case VSTR_P0_post:
-    case VSTR_P0_pre:
-    case VSTR_VPR_off:
-    case VSTR_VPR_post:
-    case VSTR_VPR_pre:
-    case VMRS_P0:
-    case VMRS_VPR:
-      return true;
-    }
-  };
-
-  LLVMInitializeARMTargetInfo();
-  LLVMInitializeARMTarget();
-  LLVMInitializeARMTargetMC();
-
-  auto TT(Triple::normalize("thumbv8.1m.main-none-none-eabi"));
-  std::string Error;
-  const Target *T = TargetRegistry::lookupTarget(TT, Error);
-  if (!T) {
-    dbgs() << Error;
-    return;
-  }
-
-  TargetOptions Options;
-  auto TM = std::unique_ptr<LLVMTargetMachine>(
-    static_cast<LLVMTargetMachine*>(
-      T->createTargetMachine(TT, "generic", "", Options, None, None,
-                             CodeGenOpt::Default)));
-  ARMSubtarget ST(TM->getTargetTriple(), std::string(TM->getTargetCPU()),
-                  std::string(TM->getTargetFeatureString()),
-                  *static_cast<const ARMBaseTargetMachine *>(TM.get()), false);
-
-  auto MII = TM->getMCInstrInfo();
-  for (unsigned i = 0; i < ARM::INSTRUCTION_LIST_END; ++i) {
-    uint64_t Flags = MII->get(i).TSFlags;
-    if ((Flags & ARMII::DomainMask) != ARMII::DomainMVE)
-      continue;
-    bool Valid = (Flags & ARMII::ValidForTailPredication) != 0;
-    ASSERT_EQ(IsValidTPOpcode(i), Valid)
-              << MII->getName(i)
-              << ": mismatched expectation for tail-predicated safety\n";
-  }
-}
-
-TEST(MachineInstr, HasSideEffects) {
-  using namespace ARM;
-  std::set<unsigned> UnpredictableOpcodes = {
-      // MVE Instructions
-      MVE_VCTP8,
-      MVE_VCTP16,
-      MVE_VCTP32,
-      MVE_VCTP64,
-      MVE_VPST,
-      MVE_VPTv16i8,
-      MVE_VPTv8i16,
-      MVE_VPTv4i32,
-      MVE_VPTv16i8r,
-      MVE_VPTv8i16r,
-      MVE_VPTv4i32r,
-      MVE_VPTv16s8,
-      MVE_VPTv8s16,
-      MVE_VPTv4s32,
-      MVE_VPTv16s8r,
-      MVE_VPTv8s16r,
-      MVE_VPTv4s32r,
-      MVE_VPTv16u8,
-      MVE_VPTv8u16,
-      MVE_VPTv4u32,
-      MVE_VPTv16u8r,
-      MVE_VPTv8u16r,
-      MVE_VPTv4u32r,
-      MVE_VPTv8f16,
-      MVE_VPTv4f32,
-      MVE_VPTv8f16r,
-      MVE_VPTv4f32r,
-      MVE_VADC,
-      MVE_VADCI,
-      MVE_VSBC,
-      MVE_VSBCI,
-      MVE_VSHLC,
-      // FP Instructions
-      FLDMXIA,
-      FLDMXDB_UPD,
-      FLDMXIA_UPD,
-      FSTMXDB_UPD,
-      FSTMXIA,
-      FSTMXIA_UPD,
-      VLDR_FPCXTNS_off,
-      VLDR_FPCXTNS_off,
-      VLDR_FPCXTNS_post,
-      VLDR_FPCXTNS_pre,
-      VLDR_FPCXTS_off,
-      VLDR_FPCXTS_post,
-      VLDR_FPCXTS_pre,
-      VLDR_FPSCR_NZCVQC_off,
-      VLDR_FPSCR_NZCVQC_post,
-      VLDR_FPSCR_NZCVQC_pre,
-      VLDR_FPSCR_off,
-      VLDR_FPSCR_post,
-      VLDR_FPSCR_pre,
-      VLDR_P0_off,
-      VLDR_P0_post,
-      VLDR_P0_pre,
-      VLDR_VPR_off,
-      VLDR_VPR_post,
-      VLDR_VPR_pre,
-      VLLDM,
-      VLSTM,
-      VMRS,
-      VMRS_FPCXTNS,
-      VMRS_FPCXTS,
-      VMRS_FPEXC,
-      VMRS_FPINST,
-      VMRS_FPINST2,
-      VMRS_FPSCR_NZCVQC,
-      VMRS_FPSID,
-      VMRS_MVFR0,
-      VMRS_MVFR1,
-      VMRS_MVFR2,
-      VMRS_P0,
-      VMRS_VPR,
-      VMSR,
-      VMSR_FPCXTNS,
-      VMSR_FPCXTS,
-      VMSR_FPEXC,
-      VMSR_FPINST,
-      VMSR_FPINST2,
-      VMSR_FPSCR_NZCVQC,
-      VMSR_FPSID,
-      VMSR_P0,
-      VMSR_VPR,
-      VSCCLRMD,
-      VSCCLRMS,
-      VSTR_FPCXTNS_off,
-      VSTR_FPCXTNS_post,
-      VSTR_FPCXTNS_pre,
-      VSTR_FPCXTS_off,
-      VSTR_FPCXTS_post,
-      VSTR_FPCXTS_pre,
-      VSTR_FPSCR_NZCVQC_off,
-      VSTR_FPSCR_NZCVQC_post,
-      VSTR_FPSCR_NZCVQC_pre,
-      VSTR_FPSCR_off,
-      VSTR_FPSCR_post,
-      VSTR_FPSCR_pre,
-      VSTR_P0_off,
-      VSTR_P0_post,
-      VSTR_P0_pre,
-      VSTR_VPR_off,
-      VSTR_VPR_post,
-      VSTR_VPR_pre,
-  };
-
-  LLVMInitializeARMTargetInfo();
-  LLVMInitializeARMTarget();
-  LLVMInitializeARMTargetMC();
-
-  auto TT(Triple::normalize("thumbv8.1m.main-none-none-eabi"));
-  std::string Error;
-  const Target *T = TargetRegistry::lookupTarget(TT, Error);
-  if (!T) {
-    dbgs() << Error;
-    return;
-  }
-
-  TargetOptions Options;
-  auto TM = std::unique_ptr<LLVMTargetMachine>(
-      static_cast<LLVMTargetMachine *>(T->createTargetMachine(
-          TT, "generic", "", Options, None, None, CodeGenOpt::Default)));
-  ARMSubtarget ST(TM->getTargetTriple(), std::string(TM->getTargetCPU()),
-                  std::string(TM->getTargetFeatureString()),
-                  *static_cast<const ARMBaseTargetMachine *>(TM.get()), false);
-  const ARMBaseInstrInfo *TII = ST.getInstrInfo();
-  auto MII = TM->getMCInstrInfo();
-
-  for (unsigned Op = 0; Op < ARM::INSTRUCTION_LIST_END; ++Op) {
-    const MCInstrDesc &Desc = TII->get(Op);
-    if ((Desc.TSFlags &
-         (ARMII::DomainMVE | ARMII::DomainVFP | ARMII::DomainNEONA8)) == 0)
-      continue;
-    if (UnpredictableOpcodes.count(Op))
-      continue;
-
-    ASSERT_FALSE(Desc.hasUnmodeledSideEffects())
-        << MII->getName(Op) << " has unexpected side effects";
-  }
-}
diff --git a/gnu/llvm/llvm/unittests/Target/CMakeLists.txt b/gnu/llvm/llvm/unittests/Target/CMakeLists.txt
deleted file mode 100644
index 9015029b097..00000000000
--- a/gnu/llvm/llvm/unittests/Target/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-foreach(t ${LLVM_TARGETS_TO_BUILD})
-  if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${t})
-    add_subdirectory(${t})
-  endif()
-endforeach()
diff --git a/gnu/llvm/llvm/unittests/Target/PowerPC/AIXRelocModelTest.cpp b/gnu/llvm/llvm/unittests/Target/PowerPC/AIXRelocModelTest.cpp
deleted file mode 100644
index fa5560910af..00000000000
--- a/gnu/llvm/llvm/unittests/Target/PowerPC/AIXRelocModelTest.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include "llvm/ADT/Triple.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "llvm/Target/TargetMachine.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-class AIXRelocModelTest : public ::testing::Test {
-protected:
-  static void SetUpTestCase() {
-    LLVMInitializePowerPCTargetInfo();
-    LLVMInitializePowerPCTarget();
-    LLVMInitializePowerPCTargetMC();
-  }
-};
-
-TEST_F(AIXRelocModelTest, DefalutToPIC) {
-  Triple TheTriple(/*ArchStr*/ "powerpc", /*VendorStr*/ "", /*OSStr*/ "aix");
-  std::string Error;
-  const Target *TheTarget = TargetRegistry::lookupTarget("", TheTriple, Error);
-  ASSERT_TRUE(TheTarget) << Error;
-
-  TargetOptions Options;
-  // Create a TargetMachine for powerpc--aix target, and deliberately leave its
-  // relocation model unset.
-  std::unique_ptr<TargetMachine> Target(TheTarget->createTargetMachine(
-      /*TT*/ TheTriple.getTriple(), /*CPU*/ "", /*Features*/ "",
-      /*Options*/ Options, /*RM*/ None, /*CM*/ None,
-      /*OL*/ CodeGenOpt::Default));
-  ASSERT_TRUE(Target) << "Could not allocate target machine!";
-
-  // The relocation model on AIX should be forced to PIC regardless.
-  EXPECT_TRUE(Target->getRelocationModel() == Reloc::PIC_);
-}
-
-} // end of anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/Target/PowerPC/CMakeLists.txt b/gnu/llvm/llvm/unittests/Target/PowerPC/CMakeLists.txt
deleted file mode 100644
index c691f63a46d..00000000000
--- a/gnu/llvm/llvm/unittests/Target/PowerPC/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-include_directories(
-  ${CMAKE_SOURCE_DIR}/lib/Target/PowerPC
-  ${CMAKE_BINARY_DIR}/lib/Target/PowerPC
-  )
-
-set(LLVM_LINK_COMPONENTS
-  MC
-  Support
-  Target
-  PowerPCCodeGen
-  PowerPCDesc
-  PowerPCInfo
-  )
-
-add_llvm_unittest(PowerPCTests
-  AIXRelocModelTest.cpp
-  )
diff --git a/gnu/llvm/llvm/unittests/Target/WebAssembly/CMakeLists.txt b/gnu/llvm/llvm/unittests/Target/WebAssembly/CMakeLists.txt
deleted file mode 100644
index 2e467e46c93..00000000000
--- a/gnu/llvm/llvm/unittests/Target/WebAssembly/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-include_directories(
-  ${CMAKE_SOURCE_DIR}/lib/Target/WebAssembly
-  ${CMAKE_BINARY_DIR}/lib/Target/WebAssembly
-  )
-
-set(LLVM_LINK_COMPONENTS
-  CodeGen
-  Core
-  MC
-  MIRParser
-  WebAssemblyCodeGen
-  WebAssemblyDesc
-  WebAssemblyInfo
-  )
-
-add_llvm_target_unittest(WebAssemblyTests
-  WebAssemblyExceptionInfoTest.cpp
-  )
diff --git a/gnu/llvm/llvm/unittests/Target/WebAssembly/WebAssemblyExceptionInfoTest.cpp b/gnu/llvm/llvm/unittests/Target/WebAssembly/WebAssemblyExceptionInfoTest.cpp
deleted file mode 100644
index 003f8295ab6..00000000000
--- a/gnu/llvm/llvm/unittests/Target/WebAssembly/WebAssemblyExceptionInfoTest.cpp
+++ /dev/null
@@ -1,417 +0,0 @@
-//=== WebAssemblyExceptionInfoTest.cpp - WebAssemblyExceptionInfo unit tests =//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "WebAssemblyExceptionInfo.h"
-#include "llvm/CodeGen/MIRParser/MIRParser.h"
-#include "llvm/CodeGen/MachineDominanceFrontier.h"
-#include "llvm/CodeGen/MachineDominators.h"
-#include "llvm/CodeGen/MachineModuleInfo.h"
-#include "llvm/Support/SourceMgr.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "llvm/Target/TargetMachine.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-std::unique_ptr<LLVMTargetMachine> createTargetMachine() {
-  auto TT(Triple::normalize("wasm32-unknown-unknown"));
-  std::string CPU("");
-  std::string FS("");
-
-  LLVMInitializeWebAssemblyTargetInfo();
-  LLVMInitializeWebAssemblyTarget();
-  LLVMInitializeWebAssemblyTargetMC();
-
-  std::string Error;
-  const Target *TheTarget = TargetRegistry::lookupTarget(TT, Error);
-  assert(TheTarget);
-
-  return std::unique_ptr<LLVMTargetMachine>(static_cast<LLVMTargetMachine*>(
-      TheTarget->createTargetMachine(TT, CPU, FS, TargetOptions(), None, None,
-                                     CodeGenOpt::Default)));
-}
-
-std::unique_ptr<Module> parseMIR(LLVMContext &Context,
-                                 std::unique_ptr<MIRParser> &MIR,
-                                 const TargetMachine &TM, StringRef MIRCode,
-                                 const char *FuncName, MachineModuleInfo &MMI) {
-  SMDiagnostic Diagnostic;
-  std::unique_ptr<MemoryBuffer> MBuffer = MemoryBuffer::getMemBuffer(MIRCode);
-  MIR = createMIRParser(std::move(MBuffer), Context);
-  if (!MIR)
-    return nullptr;
-
-  std::unique_ptr<Module> M = MIR->parseIRModule();
-  if (!M)
-    return nullptr;
-
-  M->setDataLayout(TM.createDataLayout());
-
-  if (MIR->parseMachineFunctions(*M, MMI))
-    return nullptr;
-
-  return M;
-}
-
-} // namespace
-
-TEST(WebAssemblyExceptionInfoTest, TEST0) {
-  std::unique_ptr<LLVMTargetMachine> TM = createTargetMachine();
-  ASSERT_TRUE(TM);
-
-  StringRef MIRString = R"MIR(
---- |
-  target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-  target triple = "wasm32-unknown-unknown"
-
-  declare i32 @__gxx_wasm_personality_v0(...)
-
-  define void @test0() personality i8* bitcast (i32 (...)* @__gxx_wasm_personality_v0 to i8*) {
-    unreachable
-  }
-
-...
----
-name: test0
-liveins:
-  - { reg: '$arguments' }
-  - { reg: '$value_stack' }
-body: |
-  bb.0:
-    successors: %bb.1, %bb.2
-    liveins: $arguments, $value_stack
-    BR %bb.1, implicit-def dead $arguments
-
-  bb.1:
-  ; predecessors: %bb.0
-    successors: %bb.7
-    liveins: $value_stack
-    BR %bb.7, implicit-def $arguments
-
-  bb.2 (landing-pad):
-  ; predecessors: %bb.0
-    successors: %bb.3, %bb.9
-    liveins: $value_stack
-    CATCH_ALL implicit-def $arguments
-    RETHROW 0, implicit-def dead $arguments
-
-  bb.3 (landing-pad):
-  ; predecessors: %bb.2
-    successors: %bb.4, %bb.6
-    liveins: $value_stack
-    %1:i32 = CATCH &__cpp_exception, implicit-def $arguments
-    BR_IF %bb.4, %58:i32, implicit-def $arguments, implicit-def $value_stack, implicit $value_stack
-    BR %bb.6, implicit-def $arguments
-
-  bb.4:
-  ; predecessors: %bb.3
-    successors: %bb.5, %bb.8
-    liveins: $value_stack
-    BR %bb.5, implicit-def dead $arguments
-
-  bb.5:
-  ; predecessors: %bb.4
-    successors: %bb.7
-    liveins: $value_stack
-    BR %bb.7, implicit-def dead $arguments
-
-  bb.6:
-  ; predecessors: %bb.3
-    successors: %bb.10, %bb.9
-    liveins: $value_stack
-    BR %bb.10, implicit-def dead $arguments
-
-  bb.7:
-  ; predecessors: %bb.5, %bb.1
-    liveins: $value_stack
-    RETURN implicit-def $arguments
-
-  bb.8 (landing-pad):
-  ; predecessors: %bb.4
-    successors: %bb.9
-    liveins: $value_stack
-    CATCH_ALL implicit-def $arguments
-    RETHROW 0, implicit-def dead $arguments
-
-  bb.9 (landing-pad):
-  ; predecessors: %bb.2, %bb.6, %bb.8
-    liveins: $value_stack
-    CATCH_ALL implicit-def $arguments
-    RETHROW 0, implicit-def dead $arguments
-
-  bb.10:
-  ; predecessors: %bb.6
-    liveins: $value_stack
-    UNREACHABLE implicit-def $arguments
-)MIR";
-
-  LLVMContext Context;
-  std::unique_ptr<MIRParser> MIR;
-  MachineModuleInfo MMI(TM.get());
-  std::unique_ptr<Module> M =
-      parseMIR(Context, MIR, *TM, MIRString, "test0", MMI);
-  ASSERT_TRUE(M);
-
-  Function *F = M->getFunction("test0");
-  auto *MF = MMI.getMachineFunction(*F);
-  ASSERT_TRUE(MF);
-
-  WebAssemblyExceptionInfo WEI;
-  MachineDominatorTree MDT;
-  MachineDominanceFrontier MDF;
-  MDT.runOnMachineFunction(*MF);
-  MDF.getBase().analyze(MDT.getBase());
-  WEI.recalculate(*MF, MDT, MDF);
-
-  // Exception info structure:
-  // |- bb2 (ehpad), bb3, bb4, bb5, bb6, bb8, bb9, bb10
-  //   |- bb3 (ehpad), bb4, bb5, bb6, bb8, bb10
-  //     |- bb8 (ehpad)
-  //   |- bb9 (ehpad)
-
-  auto *MBB2 = MF->getBlockNumbered(2);
-  auto *WE0 = WEI.getExceptionFor(MBB2);
-  ASSERT_TRUE(WE0);
-  EXPECT_EQ(WE0->getEHPad(), MBB2);
-  EXPECT_EQ(WE0->getParentException(), nullptr);
-  EXPECT_EQ(WE0->getExceptionDepth(), (unsigned)1);
-
-  auto *MBB3 = MF->getBlockNumbered(3);
-  auto *WE0_0 = WEI.getExceptionFor(MBB3);
-  ASSERT_TRUE(WE0_0);
-  EXPECT_EQ(WE0_0->getEHPad(), MBB3);
-  EXPECT_EQ(WE0_0->getParentException(), WE0);
-  EXPECT_EQ(WE0_0->getExceptionDepth(), (unsigned)2);
-
-  auto *MBB4 = MF->getBlockNumbered(4);
-  WE0_0 = WEI.getExceptionFor(MBB4);
-  ASSERT_TRUE(WE0_0);
-  EXPECT_EQ(WE0_0->getEHPad(), MBB3);
-
-  auto *MBB5 = MF->getBlockNumbered(5);
-  WE0_0 = WEI.getExceptionFor(MBB5);
-  ASSERT_TRUE(WE0_0);
-  EXPECT_EQ(WE0_0->getEHPad(), MBB3);
-
-  auto *MBB6 = MF->getBlockNumbered(6);
-  WE0_0 = WEI.getExceptionFor(MBB6);
-  ASSERT_TRUE(WE0_0);
-  EXPECT_EQ(WE0_0->getEHPad(), MBB3);
-
-  auto *MBB10 = MF->getBlockNumbered(10);
-  WE0_0 = WEI.getExceptionFor(MBB10);
-  ASSERT_TRUE(WE0_0);
-  EXPECT_EQ(WE0_0->getEHPad(), MBB3);
-
-  auto *MBB8 = MF->getBlockNumbered(8);
-  auto *WE0_0_0 = WEI.getExceptionFor(MBB8);
-  ASSERT_TRUE(WE0_0_0);
-  EXPECT_EQ(WE0_0_0->getEHPad(), MBB8);
-  EXPECT_EQ(WE0_0_0->getParentException(), WE0_0);
-  EXPECT_EQ(WE0_0_0->getExceptionDepth(), (unsigned)3);
-
-  auto *MBB9 = MF->getBlockNumbered(9);
-  auto *WE0_1 = WEI.getExceptionFor(MBB9);
-  ASSERT_TRUE(WE0_1);
-  EXPECT_EQ(WE0_1->getEHPad(), MBB9);
-  EXPECT_EQ(WE0_1->getParentException(), WE0);
-  EXPECT_EQ(WE0_1->getExceptionDepth(), (unsigned)2);
-}
-
-TEST(WebAssemblyExceptionInfoTest, TEST1) {
-  std::unique_ptr<LLVMTargetMachine> TM = createTargetMachine();
-  ASSERT_TRUE(TM);
-
-  StringRef MIRString = R"MIR(
---- |
-  target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-  target triple = "wasm32-unknown-unknown"
-
-  declare i32 @__gxx_wasm_personality_v0(...)
-
-  define void @test1() personality i8* bitcast (i32 (...)* @__gxx_wasm_personality_v0 to i8*) {
-    unreachable
-  }
-
-...
----
-name: test1
-liveins:
-  - { reg: '$arguments' }
-  - { reg: '$value_stack' }
-body: |
-  bb.0:
-    successors: %bb.9, %bb.1
-    liveins: $arguments, $value_stack
-    BR %bb.9, implicit-def dead $arguments
-
-  bb.1 (landing-pad):
-  ; predecessors: %bb.0
-    successors: %bb.2, %bb.8
-    liveins: $value_stack
-    %0:i32 = CATCH &__cpp_exception, implicit-def $arguments
-    BR_IF %bb.2, %32:i32, implicit-def $arguments, implicit-def $value_stack, implicit $value_stack
-    BR %bb.8, implicit-def $arguments
-
-  bb.2:
-  ; predecessors: %bb.1
-    successors: %bb.7, %bb.3, %bb.11
-    liveins: $value_stack
-    BR %bb.7, implicit-def dead $arguments
-
-  bb.3 (landing-pad):
-  ; predecessors: %bb.2
-    successors: %bb.4, %bb.6
-    liveins: $value_stack
-    %1:i32 = CATCH &__cpp_exception, implicit-def $arguments
-    BR_IF %bb.4, %43:i32, implicit-def $arguments, implicit-def $value_stack, implicit $value_stack
-    BR %bb.6, implicit-def $arguments
-
-  bb.4:
-  ; predecessors: %bb.3
-    successors: %bb.5, %bb.10
-    liveins: $value_stack
-    BR %bb.5, implicit-def dead $arguments
-
-  bb.5:
-  ; predecessors: %bb.4
-    successors: %bb.7(0x80000000); %bb.7(200.00%)
-    liveins: $value_stack
-    BR %bb.7, implicit-def dead $arguments
-
-  bb.6:
-  ; predecessors: %bb.3
-    successors: %bb.12, %bb.11
-    liveins: $value_stack
-    BR %bb.12, implicit-def dead $arguments
-
-  bb.7:
-  ; predecessors: %bb.2, %bb.5
-    successors: %bb.9(0x80000000); %bb.9(200.00%)
-    liveins: $value_stack
-    BR %bb.9, implicit-def dead $arguments
-
-  bb.8:
-  ; predecessors: %bb.1
-    liveins: $value_stack
-    UNREACHABLE implicit-def $arguments
-
-  bb.9:
-  ; predecessors: %bb.0, %bb.7
-    liveins: $value_stack
-    RETURN implicit-def $arguments
-
-  bb.10 (landing-pad):
-  ; predecessors: %bb.4
-    successors: %bb.11
-    liveins: $value_stack
-    CATCH_ALL implicit-def $arguments
-    RETHROW 0, implicit-def dead $arguments
-
-  bb.11 (landing-pad):
-  ; predecessors: %bb.2, %bb.6, %bb.10
-    liveins: $value_stack
-    CATCH_ALL implicit-def $arguments
-    RETHROW 0, implicit-def dead $arguments
-
-  bb.12:
-  ; predecessors: %bb.6
-    liveins: $value_stack
-    UNREACHABLE implicit-def $arguments
-)MIR";
-
-  LLVMContext Context;
-  std::unique_ptr<MIRParser> MIR;
-  MachineModuleInfo MMI(TM.get());
-  std::unique_ptr<Module> M =
-      parseMIR(Context, MIR, *TM, MIRString, "test1", MMI);
-  ASSERT_TRUE(M);
-
-  Function *F = M->getFunction("test1");
-  auto *MF = MMI.getMachineFunction(*F);
-  ASSERT_TRUE(MF);
-
-  WebAssemblyExceptionInfo WEI;
-  MachineDominatorTree MDT;
-  MachineDominanceFrontier MDF;
-  MDT.runOnMachineFunction(*MF);
-  MDF.getBase().analyze(MDT.getBase());
-  WEI.recalculate(*MF, MDT, MDF);
-
-  // Exception info structure:
-  // |- bb1 (ehpad), bb2, bb3, bb4, bb5, bb6, bb7, bb8, bb10, bb11, bb12
-  //   |- bb3 (ehpad), bb4, bb5, bb6, bb10, bb12
-  //     |- bb10 (ehpad)
-  //   |- bb11 (ehpad)
-
-  auto *MBB1 = MF->getBlockNumbered(1);
-  auto *WE0 = WEI.getExceptionFor(MBB1);
-  ASSERT_TRUE(WE0);
-  EXPECT_EQ(WE0->getEHPad(), MBB1);
-  EXPECT_EQ(WE0->getParentException(), nullptr);
-  EXPECT_EQ(WE0->getExceptionDepth(), (unsigned)1);
-
-  auto *MBB2 = MF->getBlockNumbered(2);
-  WE0 = WEI.getExceptionFor(MBB2);
-  ASSERT_TRUE(WE0);
-  EXPECT_EQ(WE0->getEHPad(), MBB1);
-
-  auto *MBB7 = MF->getBlockNumbered(7);
-  WE0 = WEI.getExceptionFor(MBB7);
-  ASSERT_TRUE(WE0);
-  EXPECT_EQ(WE0->getEHPad(), MBB1);
-
-  auto *MBB8 = MF->getBlockNumbered(8);
-  WE0 = WEI.getExceptionFor(MBB8);
-  ASSERT_TRUE(WE0);
-  EXPECT_EQ(WE0->getEHPad(), MBB1);
-
-  auto *MBB3 = MF->getBlockNumbered(3);
-  auto *WE0_0 = WEI.getExceptionFor(MBB3);
-  ASSERT_TRUE(WE0_0);
-  EXPECT_EQ(WE0_0->getEHPad(), MBB3);
-  EXPECT_EQ(WE0_0->getParentException(), WE0);
-  EXPECT_EQ(WE0_0->getExceptionDepth(), (unsigned)2);
-
-  auto *MBB4 = MF->getBlockNumbered(4);
-  WE0_0 = WEI.getExceptionFor(MBB4);
-  ASSERT_TRUE(WE0_0);
-  EXPECT_EQ(WE0_0->getEHPad(), MBB3);
-
-  auto *MBB5 = MF->getBlockNumbered(5);
-  WE0_0 = WEI.getExceptionFor(MBB5);
-  ASSERT_TRUE(WE0_0);
-  EXPECT_EQ(WE0_0->getEHPad(), MBB3);
-
-  auto *MBB6 = MF->getBlockNumbered(6);
-  WE0_0 = WEI.getExceptionFor(MBB6);
-  ASSERT_TRUE(WE0_0);
-  EXPECT_EQ(WE0_0->getEHPad(), MBB3);
-
-  auto *MBB12 = MF->getBlockNumbered(12);
-  WE0_0 = WEI.getExceptionFor(MBB12);
-  ASSERT_TRUE(WE0_0);
-  EXPECT_EQ(WE0_0->getEHPad(), MBB3);
-
-  auto *MBB10 = MF->getBlockNumbered(10);
-  auto *WE0_0_0 = WEI.getExceptionFor(MBB10);
-  ASSERT_TRUE(WE0_0_0);
-  EXPECT_EQ(WE0_0_0->getEHPad(), MBB10);
-  EXPECT_EQ(WE0_0_0->getParentException(), WE0_0);
-  EXPECT_EQ(WE0_0_0->getExceptionDepth(), (unsigned)3);
-
-  auto *MBB11 = MF->getBlockNumbered(11);
-  auto *WE0_1 = WEI.getExceptionFor(MBB11);
-  ASSERT_TRUE(WE0_1);
-  EXPECT_EQ(WE0_1->getEHPad(), MBB11);
-  EXPECT_EQ(WE0_1->getParentException(), WE0);
-  EXPECT_EQ(WE0_1->getExceptionDepth(), (unsigned)2);
-}
diff --git a/gnu/llvm/llvm/unittests/Target/X86/CMakeLists.txt b/gnu/llvm/llvm/unittests/Target/X86/CMakeLists.txt
deleted file mode 100644
index 5763f4f5edb..00000000000
--- a/gnu/llvm/llvm/unittests/Target/X86/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-include_directories(
-  ${CMAKE_SOURCE_DIR}/lib/Target/X86
-  ${CMAKE_BINARY_DIR}/lib/Target/X86
-  )
-
-set(LLVM_LINK_COMPONENTS
-  Analysis
-  CodeGen
-  Core
-  MC
-  MIRParser
-  Support
-  Target
-  X86CodeGen
-  X86Desc
-  X86Info
-  )
-
-add_llvm_unittest(X86Tests
-  MachineSizeOptsTest.cpp
-  )
diff --git a/gnu/llvm/llvm/unittests/Target/X86/MachineSizeOptsTest.cpp b/gnu/llvm/llvm/unittests/Target/X86/MachineSizeOptsTest.cpp
deleted file mode 100644
index 449d426d9b6..00000000000
--- a/gnu/llvm/llvm/unittests/Target/X86/MachineSizeOptsTest.cpp
+++ /dev/null
@@ -1,235 +0,0 @@
-//===- MachineSizeOptsTest.cpp --------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/CodeGen/MachineSizeOpts.h"
-#include "llvm/Analysis/ProfileSummaryInfo.h"
-#include "llvm/Analysis/BlockFrequencyInfo.h"
-#include "llvm/Analysis/BranchProbabilityInfo.h"
-#include "llvm/Analysis/LoopInfo.h"
-#include "llvm/CodeGen/MIRParser/MIRParser.h"
-#include "llvm/CodeGen/MachineBlockFrequencyInfo.h"
-#include "llvm/CodeGen/MachineBranchProbabilityInfo.h"
-#include "llvm/CodeGen/MachineDominators.h"
-#include "llvm/CodeGen/MachineLoopInfo.h"
-#include "llvm/CodeGen/MachineModuleInfo.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "llvm/Target/TargetMachine.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-std::unique_ptr<LLVMTargetMachine> createTargetMachine() {
-  auto TT(Triple::normalize("x86_64--"));
-  std::string Error;
-  const Target *TheTarget = TargetRegistry::lookupTarget(TT, Error);
-  return std::unique_ptr<LLVMTargetMachine>(static_cast<LLVMTargetMachine*>(
-      TheTarget->createTargetMachine(TT, "", "", TargetOptions(), None, None,
-                                     CodeGenOpt::Default)));
-}
-
-class MachineSizeOptsTest : public testing::Test {
- protected:
-  static const char* MIRString;
-  LLVMContext Context;
-  std::unique_ptr<LLVMTargetMachine> TM;
-  std::unique_ptr<MachineModuleInfo> MMI;
-  std::unique_ptr<MIRParser> Parser;
-  std::unique_ptr<Module> M;
-  struct BFIData {
-    std::unique_ptr<MachineDominatorTree> MDT;
-    std::unique_ptr<MachineLoopInfo> MLI;
-    std::unique_ptr<MachineBranchProbabilityInfo> MBPI;
-    std::unique_ptr<MachineBlockFrequencyInfo> MBFI;
-    BFIData(MachineFunction &MF) {
-      MDT.reset(new MachineDominatorTree(MF));
-      MLI.reset(new MachineLoopInfo(*MDT));
-      MBPI.reset(new MachineBranchProbabilityInfo());
-      MBFI.reset(new MachineBlockFrequencyInfo(MF, *MBPI, *MLI));
-    }
-    MachineBlockFrequencyInfo *get() { return MBFI.get(); }
-  };
-
-  static void SetUpTestCase() {
-    LLVMInitializeX86TargetInfo();
-    LLVMInitializeX86Target();
-    LLVMInitializeX86TargetMC();
-  }
-
-  void SetUp() override {
-    TM = createTargetMachine();
-    std::unique_ptr<MemoryBuffer> MBuffer =
-        MemoryBuffer::getMemBuffer(MIRString);
-    Parser = createMIRParser(std::move(MBuffer), Context);
-    if (!Parser)
-      report_fatal_error("null MIRParser");
-    M = Parser->parseIRModule();
-    if (!M)
-      report_fatal_error("parseIRModule failed");
-    M->setTargetTriple(TM->getTargetTriple().getTriple());
-    M->setDataLayout(TM->createDataLayout());
-    MMI = std::make_unique<MachineModuleInfo>(TM.get());
-    if (Parser->parseMachineFunctions(*M, *MMI.get()))
-      report_fatal_error("parseMachineFunctions failed");
-  }
-
-  MachineFunction *getMachineFunction(Module *M, StringRef Name) {
-    auto F = M->getFunction(Name);
-    if (!F)
-      report_fatal_error("null Function");
-    auto &MF = MMI->getOrCreateMachineFunction(*F);
-    return &MF;
-  }
-};
-
-TEST_F(MachineSizeOptsTest, Test) {
-  MachineFunction *F = getMachineFunction(M.get(), "f");
-  ASSERT_TRUE(F != nullptr);
-  MachineFunction *G = getMachineFunction(M.get(), "g");
-  ASSERT_TRUE(G != nullptr);
-  MachineFunction *H = getMachineFunction(M.get(), "h");
-  ASSERT_TRUE(H != nullptr);
-  ProfileSummaryInfo PSI = ProfileSummaryInfo(*M.get());
-  ASSERT_TRUE(PSI.hasProfileSummary());
-  BFIData BFID_F(*F);
-  BFIData BFID_G(*G);
-  BFIData BFID_H(*H);
-  MachineBlockFrequencyInfo *MBFI_F = BFID_F.get();
-  MachineBlockFrequencyInfo *MBFI_G = BFID_G.get();
-  MachineBlockFrequencyInfo *MBFI_H = BFID_H.get();
-  MachineBasicBlock &BB0 = F->front();
-  auto iter = BB0.succ_begin();
-  MachineBasicBlock *BB1 = *iter;
-  iter++;
-  MachineBasicBlock *BB2 = *iter;
-  iter++;
-  ASSERT_TRUE(iter == BB0.succ_end());
-  MachineBasicBlock *BB3 = *BB1->succ_begin();
-  ASSERT_TRUE(BB3 == *BB2->succ_begin());
-  EXPECT_FALSE(shouldOptimizeForSize(F, &PSI, MBFI_F, PGSOQueryType::Test));
-  EXPECT_TRUE(shouldOptimizeForSize(G, &PSI, MBFI_G, PGSOQueryType::Test));
-  EXPECT_FALSE(shouldOptimizeForSize(H, &PSI, MBFI_H, PGSOQueryType::Test));
-  EXPECT_FALSE(shouldOptimizeForSize(&BB0, &PSI, MBFI_F, PGSOQueryType::Test));
-  EXPECT_FALSE(shouldOptimizeForSize(BB1, &PSI, MBFI_F, PGSOQueryType::Test));
-  EXPECT_TRUE(shouldOptimizeForSize(BB2, &PSI, MBFI_F, PGSOQueryType::Test));
-  EXPECT_FALSE(shouldOptimizeForSize(BB3, &PSI, MBFI_F, PGSOQueryType::Test));
-}
-
-const char* MachineSizeOptsTest::MIRString = R"MIR(
---- |
-  define i32 @g(i32 %x) !prof !14 {
-    ret i32 0
-  }
-
-  define i32 @h(i32 %x) !prof !15 {
-    ret i32 0
-  }
-
-  define i32 @f(i32 %x) !prof !16 {
-  bb0:
-    %y1 = icmp eq i32 %x, 0
-    br i1 %y1, label %bb1, label %bb2, !prof !17
-
-  bb1:                                              ; preds = %bb0
-    %z1 = call i32 @g(i32 %x)
-    br label %bb3
-
-  bb2:                                              ; preds = %bb0
-    %z2 = call i32 @h(i32 %x)
-    br label %bb3
-
-  bb3:                                              ; preds = %bb2, %bb1
-    %y2 = phi i32 [ 0, %bb1 ], [ 1, %bb2 ]
-    ret i32 %y2
-  }
-
-  !llvm.module.flags = !{!0}
-
-  !0 = !{i32 1, !"ProfileSummary", !1}
-  !1 = !{!2, !3, !4, !5, !6, !7, !8, !9}
-  !2 = !{!"ProfileFormat", !"InstrProf"}
-  !3 = !{!"TotalCount", i64 10000}
-  !4 = !{!"MaxCount", i64 10}
-  !5 = !{!"MaxInternalCount", i64 1}
-  !6 = !{!"MaxFunctionCount", i64 1000}
-  !7 = !{!"NumCounts", i64 3}
-  !8 = !{!"NumFunctions", i64 3}
-  !9 = !{!"DetailedSummary", !10}
-  !10 = !{!11, !12, !13}
-  !11 = !{i32 10000, i64 1000, i32 1}
-  !12 = !{i32 999000, i64 300, i32 3}
-  !13 = !{i32 999999, i64 5, i32 10}
-  !14 = !{!"function_entry_count", i64 1}
-  !15 = !{!"function_entry_count", i64 100}
-  !16 = !{!"function_entry_count", i64 400}
-  !17 = !{!"branch_weights", i32 100, i32 1}
-
-...
----
-name:            g
-body:             |
-  bb.0:
-    %1:gr32 = MOV32r0 implicit-def dead $eflags
-    $eax = COPY %1
-    RET 0, $eax
-
-...
----
-name:            h
-body:             |
-  bb.0:
-    %1:gr32 = MOV32r0 implicit-def dead $eflags
-    $eax = COPY %1
-    RET 0, $eax
-
-...
----
-name:            f
-tracksRegLiveness: true
-body:             |
-  bb.0:
-    successors: %bb.1(0x7ebb907a), %bb.2(0x01446f86)
-    liveins: $edi
-
-    %1:gr32 = COPY $edi
-    TEST32rr %1, %1, implicit-def $eflags
-    JCC_1 %bb.2, 5, implicit $eflags
-    JMP_1 %bb.1
-
-  bb.1:
-    successors: %bb.3(0x80000000)
-
-    ADJCALLSTACKDOWN64 0, 0, 0, implicit-def dead $rsp, implicit-def dead $eflags, implicit-def dead $ssp, implicit $rsp, implicit $ssp
-    $edi = COPY %1
-    CALL64pcrel32 @g, csr_64, implicit $rsp, implicit $ssp, implicit $edi, implicit-def $rsp, implicit-def $ssp, implicit-def $eax
-    ADJCALLSTACKUP64 0, 0, implicit-def dead $rsp, implicit-def dead $eflags, implicit-def dead $ssp, implicit $rsp, implicit $ssp
-    %5:gr32 = COPY $eax
-    %4:gr32 = MOV32r0 implicit-def dead $eflags
-    JMP_1 %bb.3
-
-  bb.2:
-    successors: %bb.3(0x80000000)
-
-    ADJCALLSTACKDOWN64 0, 0, 0, implicit-def dead $rsp, implicit-def dead $eflags, implicit-def dead $ssp, implicit $rsp, implicit $ssp
-    $edi = COPY %1
-    CALL64pcrel32 @h, csr_64, implicit $rsp, implicit $ssp, implicit $edi, implicit-def $rsp, implicit-def $ssp, implicit-def $eax
-    ADJCALLSTACKUP64 0, 0, implicit-def dead $rsp, implicit-def dead $eflags, implicit-def dead $ssp, implicit $rsp, implicit $ssp
-    %3:gr32 = COPY $eax
-    %2:gr32 = MOV32ri 1
-
-  bb.3:
-    %0:gr32 = PHI %2, %bb.2, %4, %bb.1
-    $eax = COPY %0
-    RET 0, $eax
-
-...
-)MIR";
-
-} // anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/TextAPI/CMakeLists.txt b/gnu/llvm/llvm/unittests/TextAPI/CMakeLists.txt
deleted file mode 100644
index d575d57610b..00000000000
--- a/gnu/llvm/llvm/unittests/TextAPI/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  TextAPI
-)
-
-add_llvm_unittest(TextAPITests
-  TextStubV1Tests.cpp
-  TextStubV2Tests.cpp
-  TextStubV3Tests.cpp
-  TextStubV4Tests.cpp
-)
-
-target_link_libraries(TextAPITests PRIVATE LLVMTestingSupport)
diff --git a/gnu/llvm/llvm/unittests/TextAPI/TextStubHelpers.h b/gnu/llvm/llvm/unittests/TextAPI/TextStubHelpers.h
deleted file mode 100644
index 67bfa1aba2b..00000000000
--- a/gnu/llvm/llvm/unittests/TextAPI/TextStubHelpers.h
+++ /dev/null
@@ -1,63 +0,0 @@
-//===-- TextStubHelpers.cpp -------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===-----------------------------------------------------------------------===/
-
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/TextAPI/InterfaceFile.h"
-#include <algorithm>
-#include <string>
-
-#ifndef TEXT_STUB_HELPERS_H
-#define TEXT_STUB_HELPERS_H
-
-namespace llvm {
-struct ExportedSymbol {
-  llvm::MachO::SymbolKind Kind;
-  std::string Name;
-  bool WeakDefined;
-  bool ThreadLocalValue;
-};
-
-using ExportedSymbolSeq = std::vector<ExportedSymbol>;
-using UUIDs = std::vector<std::pair<llvm::MachO::Target, std::string>>;
-using TBDFile = std::unique_ptr<MachO::InterfaceFile>;
-using TBDReexportFile = std::shared_ptr<MachO::InterfaceFile>;
-
-inline bool operator<(const ExportedSymbol &LHS, const ExportedSymbol &RHS) {
-  return std::tie(LHS.Kind, LHS.Name) < std::tie(RHS.Kind, RHS.Name);
-}
-
-inline bool operator==(const ExportedSymbol &LHS, const ExportedSymbol &RHS) {
-  return std::tie(LHS.Kind, LHS.Name, LHS.WeakDefined, LHS.ThreadLocalValue) ==
-         std::tie(RHS.Kind, RHS.Name, RHS.WeakDefined, RHS.ThreadLocalValue);
-}
-
-inline std::string stripWhitespace(std::string S) {
-  S.erase(std::remove_if(S.begin(), S.end(), ::isspace), S.end());
-  return S;
-}
-
-// This will transform a single InterfaceFile then compare against the other
-// InterfaceFile then transform the second InterfaceFile in the same way to
-// regain equality.
-inline bool
-checkEqualityOnTransform(MachO::InterfaceFile &FileA,
-                         MachO::InterfaceFile &FileB,
-                         void (*Transform)(MachO::InterfaceFile *)) {
-  Transform(&FileA);
-  // Files should not be equal.
-  if (FileA == FileB)
-    return false;
-  Transform(&FileB);
-  // Files should be equal.
-  if (FileA != FileB)
-    return false;
-  return true;
-}
-
-} // namespace llvm
-#endif
diff --git a/gnu/llvm/llvm/unittests/TextAPI/TextStubV1Tests.cpp b/gnu/llvm/llvm/unittests/TextAPI/TextStubV1Tests.cpp
deleted file mode 100644
index 7931070b531..00000000000
--- a/gnu/llvm/llvm/unittests/TextAPI/TextStubV1Tests.cpp
+++ /dev/null
@@ -1,459 +0,0 @@
-//===-- TextStubV1Tests.cpp - TBD V1 File Test ----------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===-----------------------------------------------------------------------===/
-
-#include "TextStubHelpers.h"
-#include "llvm/TextAPI/InterfaceFile.h"
-#include "llvm/TextAPI/TextAPIReader.h"
-#include "llvm/TextAPI/TextAPIWriter.h"
-#include "gtest/gtest.h"
-#include <string>
-#include <vector>
-
-using namespace llvm;
-using namespace llvm::MachO;
-
-static ExportedSymbol TBDv1Symbols[] = {
-    {SymbolKind::GlobalSymbol, "$ld$hide$os9.0$_sym1", false, false},
-    {SymbolKind::GlobalSymbol, "_sym1", false, false},
-    {SymbolKind::GlobalSymbol, "_sym2", false, false},
-    {SymbolKind::GlobalSymbol, "_sym3", false, false},
-    {SymbolKind::GlobalSymbol, "_sym4", false, false},
-    {SymbolKind::GlobalSymbol, "_sym5", false, false},
-    {SymbolKind::GlobalSymbol, "_tlv1", false, true},
-    {SymbolKind::GlobalSymbol, "_tlv2", false, true},
-    {SymbolKind::GlobalSymbol, "_tlv3", false, true},
-    {SymbolKind::GlobalSymbol, "_weak1", true, false},
-    {SymbolKind::GlobalSymbol, "_weak2", true, false},
-    {SymbolKind::GlobalSymbol, "_weak3", true, false},
-    {SymbolKind::ObjectiveCClass, "class1", false, false},
-    {SymbolKind::ObjectiveCClass, "class2", false, false},
-    {SymbolKind::ObjectiveCClass, "class3", false, false},
-    {SymbolKind::ObjectiveCInstanceVariable, "class1._ivar1", false, false},
-    {SymbolKind::ObjectiveCInstanceVariable, "class1._ivar2", false, false},
-    {SymbolKind::ObjectiveCInstanceVariable, "class1._ivar3", false, false},
-};
-
-namespace TBDv1 {
-
-TEST(TBDv1, ReadFile) {
-  static const char TBDv1File1[] =
-      "---\n"
-      "archs: [ armv7, armv7s, armv7k, arm64 ]\n"
-      "platform: ios\n"
-      "install-name: Test.dylib\n"
-      "current-version: 2.3.4\n"
-      "compatibility-version: 1.0\n"
-      "swift-version: 1.1\n"
-      "exports:\n"
-      "  - archs: [ armv7, armv7s, armv7k, arm64 ]\n"
-      "    allowed-clients: [ clientA ]\n"
-      "    re-exports: [ /usr/lib/libfoo.dylib ]\n"
-      "    symbols: [ _sym1, _sym2, _sym3, _sym4, $ld$hide$os9.0$_sym1 ]\n"
-      "    objc-classes: [ _class1, _class2 ]\n"
-      "    objc-ivars: [ _class1._ivar1, _class1._ivar2 ]\n"
-      "    weak-def-symbols: [ _weak1, _weak2 ]\n"
-      "    thread-local-symbols: [ _tlv1, _tlv2 ]\n"
-      "  - archs: [ armv7, armv7s, armv7k ]\n"
-      "    symbols: [ _sym5 ]\n"
-      "    objc-classes: [ _class3 ]\n"
-      "    objc-ivars: [ _class1._ivar3 ]\n"
-      "    weak-def-symbols: [ _weak3 ]\n"
-      "    thread-local-symbols: [ _tlv3 ]\n"
-      "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv1File1, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V1, File->getFileType());
-  auto Archs = AK_armv7 | AK_armv7s | AK_armv7k | AK_arm64;
-  auto Platform = PlatformKind::iOS;
-  TargetList Targets;
-  for (auto &&arch : Archs)
-    Targets.emplace_back(Target(arch, Platform));
-  EXPECT_EQ(Archs, File->getArchitectures());
-  EXPECT_EQ(File->getPlatforms().size(), 1U);
-  EXPECT_EQ(Platform, *File->getPlatforms().begin());
-  EXPECT_EQ(std::string("Test.dylib"), File->getInstallName());
-  EXPECT_EQ(PackedVersion(2, 3, 4), File->getCurrentVersion());
-  EXPECT_EQ(PackedVersion(1, 0, 0), File->getCompatibilityVersion());
-  EXPECT_EQ(2U, File->getSwiftABIVersion());
-  EXPECT_EQ(ObjCConstraintType::None, File->getObjCConstraint());
-  EXPECT_TRUE(File->isTwoLevelNamespace());
-  EXPECT_TRUE(File->isApplicationExtensionSafe());
-  EXPECT_FALSE(File->isInstallAPI());
-  InterfaceFileRef client("clientA", Targets);
-  InterfaceFileRef reexport("/usr/lib/libfoo.dylib", Targets);
-  EXPECT_EQ(1U, File->allowableClients().size());
-  EXPECT_EQ(client, File->allowableClients().front());
-  EXPECT_EQ(1U, File->reexportedLibraries().size());
-  EXPECT_EQ(reexport, File->reexportedLibraries().front());
-
-  ExportedSymbolSeq Exports;
-  for (const auto *Sym : File->symbols()) {
-    EXPECT_FALSE(Sym->isWeakReferenced());
-    EXPECT_FALSE(Sym->isUndefined());
-    Exports.emplace_back(
-        ExportedSymbol{Sym->getKind(), std::string(Sym->getName()),
-                       Sym->isWeakDefined(), Sym->isThreadLocalValue()});
-  }
-  llvm::sort(Exports.begin(), Exports.end());
-
-  EXPECT_EQ(sizeof(TBDv1Symbols) / sizeof(ExportedSymbol), Exports.size());
-  EXPECT_TRUE(
-      std::equal(Exports.begin(), Exports.end(), std::begin(TBDv1Symbols)));
-
-  File->addSymbol(SymbolKind::ObjectiveCClassEHType, "Class1", {Targets[1]});
-  File->addSymbol(SymbolKind::ObjectiveCInstanceVariable, "Class1._ivar1",
-                  {Targets[1]});
-}
-
-TEST(TBDv1, ReadFile2) {
-  static const char TBDv1File2[] = "--- !tapi-tbd-v1\n"
-                                   "archs: [ armv7, armv7s, armv7k, arm64 ]\n"
-                                   "platform: ios\n"
-                                   "install-name: Test.dylib\n"
-                                   "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv1File2, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V1, File->getFileType());
-  auto Archs = AK_armv7 | AK_armv7s | AK_armv7k | AK_arm64;
-  auto Platform = PlatformKind::iOS;
-  TargetList Targets;
-  for (auto &&arch : Archs)
-    Targets.emplace_back(Target(arch, Platform));
-  EXPECT_EQ(Archs, File->getArchitectures());
-  EXPECT_EQ(File->getPlatforms().size(), 1U);
-  EXPECT_EQ(Platform, *File->getPlatforms().begin());
-  EXPECT_EQ(std::string("Test.dylib"), File->getInstallName());
-  EXPECT_EQ(PackedVersion(1, 0, 0), File->getCurrentVersion());
-  EXPECT_EQ(PackedVersion(1, 0, 0), File->getCompatibilityVersion());
-  EXPECT_EQ(0U, File->getSwiftABIVersion());
-  EXPECT_EQ(ObjCConstraintType::None, File->getObjCConstraint());
-  EXPECT_TRUE(File->isTwoLevelNamespace());
-  EXPECT_TRUE(File->isApplicationExtensionSafe());
-  EXPECT_FALSE(File->isInstallAPI());
-  EXPECT_EQ(0U, File->allowableClients().size());
-  EXPECT_EQ(0U, File->reexportedLibraries().size());
-}
-
-TEST(TBDv1, WriteFile) {
-  static const char TBDv1File3[] =
-      "---\n"
-      "archs:           [ i386, x86_64 ]\n"
-      "platform:        macosx\n"
-      "install-name:    '/usr/lib/libfoo.dylib'\n"
-      "current-version: 1.2.3\n"
-      "compatibility-version: 0\n"
-      "swift-version:   5\n"
-      "objc-constraint: retain_release\n"
-      "exports:\n"
-      "  - archs:           [ i386 ]\n"
-      "    symbols:         [ _sym1 ]\n"
-      "    weak-def-symbols: [ _sym2 ]\n"
-      "    thread-local-symbols: [ _sym3 ]\n"
-      "  - archs:           [ x86_64 ]\n"
-      "    allowed-clients: [ clientA ]\n"
-      "    re-exports:      [ '/usr/lib/libfoo.dylib' ]\n"
-      "    symbols:         [ '_OBJC_EHTYPE_$_Class1' ]\n"
-      "    objc-classes:    [ _Class1 ]\n"
-      "    objc-ivars:      [ _Class1._ivar1 ]\n"
-      "...\n";
-
-  InterfaceFile File;
-  TargetList Targets;
-  for (auto &&arch : AK_i386 | AK_x86_64)
-    Targets.emplace_back(Target(arch, PlatformKind::macOS));
-  File.setPath("libfoo.dylib");
-  File.setInstallName("/usr/lib/libfoo.dylib");
-  File.setFileType(FileType::TBD_V1);
-  File.addTargets(Targets);
-  File.setCurrentVersion(PackedVersion(1, 2, 3));
-  File.setSwiftABIVersion(5);
-  File.setObjCConstraint(ObjCConstraintType::Retain_Release);
-  File.addAllowableClient("clientA", Targets[1]);
-  File.addReexportedLibrary("/usr/lib/libfoo.dylib", Targets[1]);
-  File.addSymbol(SymbolKind::GlobalSymbol, "_sym1", {Targets[0]});
-  File.addSymbol(SymbolKind::GlobalSymbol, "_sym2", {Targets[0]},
-                 SymbolFlags::WeakDefined);
-  File.addSymbol(SymbolKind::GlobalSymbol, "_sym3", {Targets[0]},
-                 SymbolFlags::ThreadLocalValue);
-  File.addSymbol(SymbolKind::ObjectiveCClass, "Class1", {Targets[1]});
-  File.addSymbol(SymbolKind::ObjectiveCClassEHType, "Class1", {Targets[1]});
-  File.addSymbol(SymbolKind::ObjectiveCInstanceVariable, "Class1._ivar1",
-                 {Targets[1]});
-
-  SmallString<4096> Buffer;
-  raw_svector_ostream OS(Buffer);
-  Error Result = TextAPIWriter::writeToStream(OS, File);
-  EXPECT_FALSE(Result);
-  EXPECT_STREQ(TBDv1File3, Buffer.c_str());
-}
-
-TEST(TBDv1, Platform_macOS) {
-  static const char TBDv1PlatformMacOS[] = "---\n"
-                                           "archs: [ x86_64 ]\n"
-                                           "platform: macosx\n"
-                                           "install-name: Test.dylib\n"
-                                           "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv1PlatformMacOS, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  auto Platform = PlatformKind::macOS;
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V1, File->getFileType());
-  EXPECT_EQ(File->getPlatforms().size(), 1U);
-  EXPECT_EQ(Platform, *File->getPlatforms().begin());
-}
-
-TEST(TBDv1, Platform_iOS) {
-  static const char TBDv1PlatformiOS[] = "---\n"
-                                         "archs: [ arm64 ]\n"
-                                         "platform: ios\n"
-                                         "install-name: Test.dylib\n"
-                                         "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv1PlatformiOS, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  auto Platform = PlatformKind::iOS;
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V1, File->getFileType());
-  EXPECT_EQ(File->getPlatforms().size(), 1U);
-  EXPECT_EQ(Platform, *File->getPlatforms().begin());
-}
-
-TEST(TBDv1, Platform_watchOS) {
-  static const char TBDv1PlatformWatchOS[] = "---\n"
-                                             "archs: [ armv7k ]\n"
-                                             "platform: watchos\n"
-                                             "install-name: Test.dylib\n"
-                                             "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv1PlatformWatchOS, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  auto Platform = PlatformKind::watchOS;
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V1, File->getFileType());
-  EXPECT_EQ(File->getPlatforms().size(), 1U);
-  EXPECT_EQ(Platform, *File->getPlatforms().begin());
-}
-
-TEST(TBDv1, Platform_tvOS) {
-  static const char TBDv1PlatformtvOS[] = "---\n"
-                                          "archs: [ arm64 ]\n"
-                                          "platform: tvos\n"
-                                          "install-name: Test.dylib\n"
-                                          "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv1PlatformtvOS, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  auto Platform = PlatformKind::tvOS;
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V1, File->getFileType());
-  EXPECT_EQ(File->getPlatforms().size(), 1U);
-  EXPECT_EQ(Platform, *File->getPlatforms().begin());
-}
-
-TEST(TBDv1, Platform_bridgeOS) {
-  static const char TBDv1BridgeOS[] = "---\n"
-                                      "archs: [ armv7k ]\n"
-                                      "platform: bridgeos\n"
-                                      "install-name: Test.dylib\n"
-                                      "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv1BridgeOS, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  auto Platform = PlatformKind::bridgeOS;
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V1, File->getFileType());
-  EXPECT_EQ(File->getPlatforms().size(), 1U);
-  EXPECT_EQ(Platform, *File->getPlatforms().begin());
-}
-
-TEST(TBDv1, Swift_1_0) {
-  static const char TBDv1Swift1[] = "---\n"
-                                    "archs: [ arm64 ]\n"
-                                    "platform: ios\n"
-                                    "install-name: Test.dylib\n"
-                                    "swift-version: 1.0\n"
-                                    "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv1Swift1, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V1, File->getFileType());
-  EXPECT_EQ(1U, File->getSwiftABIVersion());
-}
-
-TEST(TBDv1, Swift_1_1) {
-  static const char TBDv1Swift1dot[] = "---\n"
-                                       "archs: [ arm64 ]\n"
-                                       "platform: ios\n"
-                                       "install-name: Test.dylib\n"
-                                       "swift-version: 1.1\n"
-                                       "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv1Swift1dot, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V1, File->getFileType());
-  EXPECT_EQ(2U, File->getSwiftABIVersion());
-}
-
-TEST(TBDv1, Swift_2_0) {
-  static const char TBDv1Swift2[] = "---\n"
-                                    "archs: [ arm64 ]\n"
-                                    "platform: ios\n"
-                                    "install-name: Test.dylib\n"
-                                    "swift-version: 2.0\n"
-                                    "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv1Swift2, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V1, File->getFileType());
-  EXPECT_EQ(3U, File->getSwiftABIVersion());
-}
-
-TEST(TBDv1, Swift_3_0) {
-  static const char TBDv1Swift3[] = "---\n"
-                                    "archs: [ arm64 ]\n"
-                                    "platform: ios\n"
-                                    "install-name: Test.dylib\n"
-                                    "swift-version: 3.0\n"
-                                    "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv1Swift3, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V1, File->getFileType());
-  EXPECT_EQ(4U, File->getSwiftABIVersion());
-}
-
-TEST(TBDv1, Swift_4_0) {
-  static const char TBDv1Swift4[] = "---\n"
-                                    "archs: [ arm64 ]\n"
-                                    "platform: ios\n"
-                                    "install-name: Test.dylib\n"
-                                    "swift-version: 4.0\n"
-                                    "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv1Swift4, "Test.tbd"));
-  EXPECT_FALSE(!!Result);
-  std::string ErrorMessage = toString(Result.takeError());
-  EXPECT_EQ("malformed file\nTest.tbd:5:16: error: invalid Swift ABI "
-            "version.\nswift-version: 4.0\n               ^~~\n",
-            ErrorMessage);
-}
-
-TEST(TBDv1, Swift_5) {
-  static const char TBDv1Swift5[] = "---\n"
-                                    "archs: [ arm64 ]\n"
-                                    "platform: ios\n"
-                                    "install-name: Test.dylib\n"
-                                    "swift-version: 5\n"
-                                    "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv1Swift5, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V1, File->getFileType());
-  EXPECT_EQ(5U, File->getSwiftABIVersion());
-}
-
-TEST(TBDv1, Swift_99) {
-  static const char TBDv1Swift99[] = "---\n"
-                                     "archs: [ arm64 ]\n"
-                                     "platform: ios\n"
-                                     "install-name: Test.dylib\n"
-                                     "swift-version: 99\n"
-                                     "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv1Swift99, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V1, File->getFileType());
-  EXPECT_EQ(99U, File->getSwiftABIVersion());
-}
-
-TEST(TBDv1, UnknownArchitecture) {
-  static const char TBDv1FileUnknownArch[] = "---\n"
-                                             "archs: [ foo ]\n"
-                                             "platform: macosx\n"
-                                             "install-name: Test.dylib\n"
-                                             "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv1FileUnknownArch, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-}
-
-TEST(TBDv1, UnknownPlatform) {
-  static const char TBDv1FileUnknownPlatform[] = "---\n"
-                                                 "archs: [ i386 ]\n"
-                                                 "platform: newOS\n"
-                                                 "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv1FileUnknownPlatform, "Test.tbd"));
-  EXPECT_FALSE(!!Result);
-  std::string ErrorMessage = toString(Result.takeError());
-  EXPECT_EQ("malformed file\nTest.tbd:3:11: error: unknown platform\nplatform: "
-            "newOS\n          ^~~~~\n",
-            ErrorMessage);
-}
-
-TEST(TBDv1, MalformedFile1) {
-  static const char TBDv1FileMalformed1[] = "---\n"
-                                            "archs: [ arm64 ]\n"
-                                            "foobar: \"Unsupported key\"\n"
-                                            "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv1FileMalformed1, "Test.tbd"));
-  EXPECT_FALSE(!!Result);
-  std::string ErrorMessage = toString(Result.takeError());
-  ASSERT_EQ("malformed file\nTest.tbd:2:1: error: missing required key "
-            "'platform'\narchs: [ arm64 ]\n^\n",
-            ErrorMessage);
-}
-
-TEST(TBDv1, MalformedFile2) {
-  static const char TBDv1FileMalformed2[] = "---\n"
-                                            "archs: [ arm64 ]\n"
-                                            "platform: ios\n"
-                                            "install-name: Test.dylib\n"
-                                            "foobar: \"Unsupported key\"\n"
-                                            "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv1FileMalformed2, "Test.tbd"));
-  EXPECT_FALSE(!!Result);
-  std::string ErrorMessage = toString(Result.takeError());
-  ASSERT_EQ(
-      "malformed file\nTest.tbd:5:1: error: unknown key 'foobar'\nfoobar: "
-      "\"Unsupported key\"\n^~~~~~\n",
-      ErrorMessage);
-}
-
-} // end namespace TBDv1.
diff --git a/gnu/llvm/llvm/unittests/TextAPI/TextStubV2Tests.cpp b/gnu/llvm/llvm/unittests/TextAPI/TextStubV2Tests.cpp
deleted file mode 100644
index 873fc1ff553..00000000000
--- a/gnu/llvm/llvm/unittests/TextAPI/TextStubV2Tests.cpp
+++ /dev/null
@@ -1,494 +0,0 @@
-//===-- TextStubV2Tests.cpp - TBD V2 File Test ----------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===-----------------------------------------------------------------------===/
-#include "TextStubHelpers.h"
-#include "llvm/TextAPI/InterfaceFile.h"
-#include "llvm/TextAPI/TextAPIReader.h"
-#include "llvm/TextAPI/TextAPIWriter.h"
-#include "gtest/gtest.h"
-#include <string>
-#include <vector>
-
-using namespace llvm;
-using namespace llvm::MachO;
-
-static ExportedSymbol TBDv2Symbols[] = {
-    {SymbolKind::GlobalSymbol, "$ld$hide$os9.0$_sym1", false, false},
-    {SymbolKind::GlobalSymbol, "_sym1", false, false},
-    {SymbolKind::GlobalSymbol, "_sym2", false, false},
-    {SymbolKind::GlobalSymbol, "_sym3", false, false},
-    {SymbolKind::GlobalSymbol, "_sym4", false, false},
-    {SymbolKind::GlobalSymbol, "_sym5", false, false},
-    {SymbolKind::GlobalSymbol, "_tlv1", false, true},
-    {SymbolKind::GlobalSymbol, "_tlv2", false, true},
-    {SymbolKind::GlobalSymbol, "_tlv3", false, true},
-    {SymbolKind::GlobalSymbol, "_weak1", true, false},
-    {SymbolKind::GlobalSymbol, "_weak2", true, false},
-    {SymbolKind::GlobalSymbol, "_weak3", true, false},
-    {SymbolKind::ObjectiveCClass, "class1", false, false},
-    {SymbolKind::ObjectiveCClass, "class2", false, false},
-    {SymbolKind::ObjectiveCClass, "class3", false, false},
-    {SymbolKind::ObjectiveCInstanceVariable, "class1._ivar1", false, false},
-    {SymbolKind::ObjectiveCInstanceVariable, "class1._ivar2", false, false},
-    {SymbolKind::ObjectiveCInstanceVariable, "class1._ivar3", false, false},
-};
-
-namespace TBDv2 {
-
-TEST(TBDv2, ReadFile) {
-  static const char TBDv2File1[] =
-      "--- !tapi-tbd-v2\n"
-      "archs: [ armv7, armv7s, armv7k, arm64 ]\n"
-      "platform: ios\n"
-      "flags: [ installapi ]\n"
-      "install-name: Test.dylib\n"
-      "current-version: 2.3.4\n"
-      "compatibility-version: 1.0\n"
-      "swift-version: 1.1\n"
-      "parent-umbrella: Umbrella.dylib\n"
-      "exports:\n"
-      "  - archs: [ armv7, armv7s, armv7k, arm64 ]\n"
-      "    allowable-clients: [ clientA ]\n"
-      "    re-exports: [ /usr/lib/libfoo.dylib ]\n"
-      "    symbols: [ _sym1, _sym2, _sym3, _sym4, $ld$hide$os9.0$_sym1 ]\n"
-      "    objc-classes: [ _class1, _class2 ]\n"
-      "    objc-ivars: [ _class1._ivar1, _class1._ivar2 ]\n"
-      "    weak-def-symbols: [ _weak1, _weak2 ]\n"
-      "    thread-local-symbols: [ _tlv1, _tlv2 ]\n"
-      "  - archs: [ armv7, armv7s, armv7k ]\n"
-      "    symbols: [ _sym5 ]\n"
-      "    objc-classes: [ _class3 ]\n"
-      "    objc-ivars: [ _class1._ivar3 ]\n"
-      "    weak-def-symbols: [ _weak3 ]\n"
-      "    thread-local-symbols: [ _tlv3 ]\n"
-      "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv2File1, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V2, File->getFileType());
-  auto Archs = AK_armv7 | AK_armv7s | AK_armv7k | AK_arm64;
-  auto Platform = PlatformKind::iOS;
-  TargetList Targets;
-  for (auto &&arch : Archs)
-    Targets.emplace_back(Target(arch, Platform));
-  EXPECT_EQ(Archs, File->getArchitectures());
-  EXPECT_EQ(File->getPlatforms().size(), 1U);
-  EXPECT_EQ(Platform, *File->getPlatforms().begin());
-  EXPECT_EQ(std::string("Test.dylib"), File->getInstallName());
-  EXPECT_EQ(PackedVersion(2, 3, 4), File->getCurrentVersion());
-  EXPECT_EQ(PackedVersion(1, 0, 0), File->getCompatibilityVersion());
-  EXPECT_EQ(2U, File->getSwiftABIVersion());
-  EXPECT_EQ(ObjCConstraintType::Retain_Release, File->getObjCConstraint());
-  EXPECT_TRUE(File->isTwoLevelNamespace());
-  EXPECT_TRUE(File->isApplicationExtensionSafe());
-  EXPECT_TRUE(File->isInstallAPI());
-  InterfaceFileRef client("clientA", Targets);
-  InterfaceFileRef reexport("/usr/lib/libfoo.dylib", Targets);
-  EXPECT_EQ(1U, File->allowableClients().size());
-  EXPECT_EQ(client, File->allowableClients().front());
-  EXPECT_EQ(1U, File->reexportedLibraries().size());
-  EXPECT_EQ(reexport, File->reexportedLibraries().front());
-
-  ExportedSymbolSeq Exports;
-  for (const auto *Sym : File->symbols()) {
-    EXPECT_FALSE(Sym->isWeakReferenced());
-    EXPECT_FALSE(Sym->isUndefined());
-    Exports.emplace_back(
-        ExportedSymbol{Sym->getKind(), std::string(Sym->getName()),
-                       Sym->isWeakDefined(), Sym->isThreadLocalValue()});
-  }
-  llvm::sort(Exports.begin(), Exports.end());
-
-  EXPECT_EQ(sizeof(TBDv2Symbols) / sizeof(ExportedSymbol), Exports.size());
-  EXPECT_TRUE(
-      std::equal(Exports.begin(), Exports.end(), std::begin(TBDv2Symbols)));
-}
-
-TEST(TBDv2, ReadFile2) {
-  static const char TBDv2File2[] =
-      "--- !tapi-tbd-v2\n"
-      "archs: [ armv7, armv7s, armv7k, arm64 ]\n"
-      "platform: ios\n"
-      "flags: [ flat_namespace, not_app_extension_safe ]\n"
-      "install-name: Test.dylib\n"
-      "swift-version: 1.1\n"
-      "exports:\n"
-      "  - archs: [ armv7, armv7s, armv7k, arm64 ]\n"
-      "    symbols: [ _sym1, _sym2, _sym3, _sym4, $ld$hide$os9.0$_sym1 ]\n"
-      "    objc-classes: [ _class1, _class2 ]\n"
-      "    objc-ivars: [ _class1._ivar1, _class1._ivar2 ]\n"
-      "    weak-def-symbols: [ _weak1, _weak2 ]\n"
-      "    thread-local-symbols: [ _tlv1, _tlv2 ]\n"
-      "  - archs: [ armv7, armv7s, armv7k ]\n"
-      "    symbols: [ _sym5 ]\n"
-      "    objc-classes: [ _class3 ]\n"
-      "    objc-ivars: [ _class1._ivar3 ]\n"
-      "    weak-def-symbols: [ _weak3 ]\n"
-      "    thread-local-symbols: [ _tlv3 ]\n"
-      "undefineds:\n"
-      "  - archs: [ armv7, armv7s, armv7k, arm64 ]\n"
-      "    symbols: [ _undefSym1, _undefSym2, _undefSym3 ]\n"
-      "    objc-classes: [ _undefClass1, _undefClass2 ]\n"
-      "    objc-ivars: [ _undefClass1._ivar1, _undefClass1._ivar2 ]\n"
-      "    weak-ref-symbols: [ _undefWeak1, _undefWeak2 ]\n"
-      "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv2File2, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V2, File->getFileType());
-  auto Archs = AK_armv7 | AK_armv7s | AK_armv7k | AK_arm64;
-  auto Platform = PlatformKind::iOS;
-  TargetList Targets;
-  for (auto &&arch : Archs)
-    Targets.emplace_back(Target(arch, Platform));
-  EXPECT_EQ(Archs, File->getArchitectures());
-  EXPECT_EQ(File->getPlatforms().size(), 1U);
-  EXPECT_EQ(Platform, *File->getPlatforms().begin());
-  EXPECT_EQ(std::string("Test.dylib"), File->getInstallName());
-  EXPECT_EQ(PackedVersion(1, 0, 0), File->getCurrentVersion());
-  EXPECT_EQ(PackedVersion(1, 0, 0), File->getCompatibilityVersion());
-  EXPECT_EQ(2U, File->getSwiftABIVersion());
-  EXPECT_EQ(ObjCConstraintType::Retain_Release, File->getObjCConstraint());
-  EXPECT_FALSE(File->isTwoLevelNamespace());
-  EXPECT_FALSE(File->isApplicationExtensionSafe());
-  EXPECT_FALSE(File->isInstallAPI());
-  EXPECT_EQ(0U, File->allowableClients().size());
-  EXPECT_EQ(0U, File->reexportedLibraries().size());
-}
-
-TEST(TBDv2, WriteFile) {
-  static const char TBDv2File3[] =
-      "--- !tapi-tbd-v2\n"
-      "archs:           [ i386, x86_64 ]\n"
-      "platform:        macosx\n"
-      "install-name:    '/usr/lib/libfoo.dylib'\n"
-      "current-version: 1.2.3\n"
-      "compatibility-version: 0\n"
-      "swift-version:   5\n"
-      "exports:\n"
-      "  - archs:           [ i386 ]\n"
-      "    symbols:         [ _sym1 ]\n"
-      "    weak-def-symbols: [ _sym2 ]\n"
-      "    thread-local-symbols: [ _sym3 ]\n"
-      "  - archs:           [ x86_64 ]\n"
-      "    allowable-clients: [ clientA ]\n"
-      "    re-exports:      [ '/usr/lib/libfoo.dylib' ]\n"
-      "    symbols:         [ '_OBJC_EHTYPE_$_Class1' ]\n"
-      "    objc-classes:    [ _Class1 ]\n"
-      "    objc-ivars:      [ _Class1._ivar1 ]\n"
-      "...\n";
-
-  InterfaceFile File;
-  TargetList Targets;
-  for (auto &&arch : AK_i386 | AK_x86_64)
-    Targets.emplace_back(Target(arch, PlatformKind::macOS));
-  File.setPath("libfoo.dylib");
-  File.setInstallName("/usr/lib/libfoo.dylib");
-  File.setFileType(FileType::TBD_V2);
-  File.addTargets(Targets);
-  File.setCurrentVersion(PackedVersion(1, 2, 3));
-  File.setTwoLevelNamespace();
-  File.setApplicationExtensionSafe();
-  File.setSwiftABIVersion(5);
-  File.setObjCConstraint(ObjCConstraintType::Retain_Release);
-  File.addAllowableClient("clientA", Targets[1]);
-  File.addReexportedLibrary("/usr/lib/libfoo.dylib", Targets[1]);
-  File.addSymbol(SymbolKind::GlobalSymbol, "_sym1", {Targets[0]});
-  File.addSymbol(SymbolKind::GlobalSymbol, "_sym2", {Targets[0]},
-                 SymbolFlags::WeakDefined);
-  File.addSymbol(SymbolKind::GlobalSymbol, "_sym3", {Targets[0]},
-                 SymbolFlags::ThreadLocalValue);
-  File.addSymbol(SymbolKind::ObjectiveCClass, "Class1", {Targets[1]});
-  File.addSymbol(SymbolKind::ObjectiveCClassEHType, "Class1", {Targets[1]});
-  File.addSymbol(SymbolKind::ObjectiveCInstanceVariable, "Class1._ivar1",
-                 {Targets[1]});
-
-  SmallString<4096> Buffer;
-  raw_svector_ostream OS(Buffer);
-  Error Result = TextAPIWriter::writeToStream(OS, File);
-  EXPECT_FALSE(Result);
-  EXPECT_STREQ(TBDv2File3, Buffer.c_str());
-}
-
-TEST(TBDv2, Platform_macOS) {
-  static const char TBDv2PlatformMacOS[] = "--- !tapi-tbd-v2\n"
-                                           "archs: [ x86_64 ]\n"
-                                           "platform: macosx\n"
-                                           "install-name: Test.dylib\n"
-                                           "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv2PlatformMacOS, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  auto Platform = PlatformKind::macOS;
-  EXPECT_EQ(FileType::TBD_V2, File->getFileType());
-  EXPECT_EQ(File->getPlatforms().size(), 1U);
-  EXPECT_EQ(Platform, *File->getPlatforms().begin());
-}
-
-TEST(TBDv2, Platform_iOS) {
-  static const char TBDv2PlatformiOS[] = "--- !tapi-tbd-v2\n"
-                                         "archs: [ arm64 ]\n"
-                                         "platform: ios\n"
-                                         "install-name: Test.dylib\n"
-                                         "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv2PlatformiOS, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  auto Platform = PlatformKind::iOS;
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V2, File->getFileType());
-  EXPECT_EQ(File->getPlatforms().size(), 1U);
-  EXPECT_EQ(Platform, *File->getPlatforms().begin());
-}
-
-TEST(TBDv2, Platform_watchOS) {
-  static const char TBDv2PlatformWatchOS[] = "--- !tapi-tbd-v2\n"
-                                             "archs: [ armv7k ]\n"
-                                             "platform: watchos\n"
-                                             "install-name: Test.dylib\n"
-                                             "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv2PlatformWatchOS, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  auto Platform = PlatformKind::watchOS;
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V2, File->getFileType());
-  EXPECT_EQ(File->getPlatforms().size(), 1U);
-  EXPECT_EQ(Platform, *File->getPlatforms().begin());
-}
-
-TEST(TBDv2, Platform_tvOS) {
-  static const char TBDv2PlatformtvOS[] = "--- !tapi-tbd-v2\n"
-                                          "archs: [ arm64 ]\n"
-                                          "platform: tvos\n"
-                                          "install-name: Test.dylib\n"
-                                          "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv2PlatformtvOS, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  auto Platform = PlatformKind::tvOS;
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V2, File->getFileType());
-  EXPECT_EQ(File->getPlatforms().size(), 1U);
-  EXPECT_EQ(Platform, *File->getPlatforms().begin());
-}
-
-TEST(TBDv2, Platform_bridgeOS) {
-  static const char TBDv2BridgeOS[] = "--- !tapi-tbd-v2\n"
-                                      "archs: [ armv7k ]\n"
-                                      "platform: bridgeos\n"
-                                      "install-name: Test.dylib\n"
-                                      "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv2BridgeOS, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  auto Platform = PlatformKind::bridgeOS;
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V2, File->getFileType());
-  EXPECT_EQ(File->getPlatforms().size(), 1U);
-  EXPECT_EQ(Platform, *File->getPlatforms().begin());
-}
-
-TEST(TBDv2, Swift_1_0) {
-  static const char TBDv2Swift1[] = "--- !tapi-tbd-v2\n"
-                                    "archs: [ arm64 ]\n"
-                                    "platform: ios\n"
-                                    "install-name: Test.dylib\n"
-                                    "swift-version: 1.0\n"
-                                    "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv2Swift1, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V2, File->getFileType());
-  EXPECT_EQ(1U, File->getSwiftABIVersion());
-}
-
-TEST(TBDv2, Swift_1_1) {
-  static const char TBDv2Swift1dot[] = "--- !tapi-tbd-v2\n"
-                                       "archs: [ arm64 ]\n"
-                                       "platform: ios\n"
-                                       "install-name: Test.dylib\n"
-                                       "swift-version: 1.1\n"
-                                       "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv2Swift1dot, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V2, File->getFileType());
-  EXPECT_EQ(2U, File->getSwiftABIVersion());
-}
-
-TEST(TBDv2, Swift_2_0) {
-  static const char tbd_v2_swift_2_0[] = "--- !tapi-tbd-v2\n"
-                                         "archs: [ arm64 ]\n"
-                                         "platform: ios\n"
-                                         "install-name: Test.dylib\n"
-                                         "swift-version: 2.0\n"
-                                         "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(tbd_v2_swift_2_0, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V2, File->getFileType());
-  EXPECT_EQ(3U, File->getSwiftABIVersion());
-}
-
-TEST(TBDv2, Swift_3_0) {
-  static const char TBDv2Swift3[] = "--- !tapi-tbd-v2\n"
-                                    "archs: [ arm64 ]\n"
-                                    "platform: ios\n"
-                                    "install-name: Test.dylib\n"
-                                    "swift-version: 3.0\n"
-                                    "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv2Swift3, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V2, File->getFileType());
-  EXPECT_EQ(4U, File->getSwiftABIVersion());
-}
-
-TEST(TBDv2, Swift_4_0) {
-  static const char TBDv2Swift4[] = "--- !tapi-tbd-v2\n"
-                                    "archs: [ arm64 ]\n"
-                                    "platform: ios\n"
-                                    "install-name: Test.dylib\n"
-                                    "swift-version: 4.0\n"
-                                    "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv2Swift4, "Test.tbd"));
-  EXPECT_FALSE(!!Result);
-  std::string ErrorMessage = toString(Result.takeError());
-  EXPECT_EQ("malformed file\nTest.tbd:5:16: error: invalid Swift ABI "
-            "version.\nswift-version: 4.0\n               ^~~\n",
-            ErrorMessage);
-}
-
-TEST(TBDv2, Swift_5) {
-  static const char TBDv2Swift5[] = "--- !tapi-tbd-v2\n"
-                                    "archs: [ arm64 ]\n"
-                                    "platform: ios\n"
-                                    "install-name: Test.dylib\n"
-                                    "swift-version: 5\n"
-                                    "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv2Swift5, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V2, File->getFileType());
-  EXPECT_EQ(5U, File->getSwiftABIVersion());
-}
-
-TEST(TBDv2, Swift_99) {
-  static const char TBDv2Swift99[] = "--- !tapi-tbd-v2\n"
-                                     "archs: [ arm64 ]\n"
-                                     "platform: ios\n"
-                                     "install-name: Test.dylib\n"
-                                     "swift-version: 99\n"
-                                     "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv2Swift99, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V2, File->getFileType());
-  EXPECT_EQ(99U, File->getSwiftABIVersion());
-}
-
-TEST(TBDv2, UnknownArchitecture) {
-  static const char TBDv2FileUnknownArch[] = "--- !tapi-tbd-v2\n"
-                                             "archs: [ foo ]\n"
-                                             "platform: macosx\n"
-                                             "install-name: Test.dylib\n"
-                                             "...\n";
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv2FileUnknownArch, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-}
-
-TEST(TBDv2, UnknownPlatform) {
-  static const char TBDv2FileUnknownPlatform[] = "--- !tapi-tbd-v2\n"
-                                                 "archs: [ i386 ]\n"
-                                                 "platform: newOS\n"
-                                                 "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv2FileUnknownPlatform, "Test.tbd"));
-  EXPECT_FALSE(!!Result);
-  std::string ErrorMessage = toString(Result.takeError());
-  EXPECT_EQ("malformed file\nTest.tbd:3:11: error: unknown platform\nplatform: "
-            "newOS\n          ^~~~~\n",
-            ErrorMessage);
-}
-
-TEST(TBDv2, InvalidPlatform) {
-  static const char TBDv2FileInvalidPlatform[] = "--- !tapi-tbd-v2\n"
-                                                 "archs: [ i386 ]\n"
-                                                 "platform: iosmac\n"
-                                                 "install-name: Test.dylib\n"
-                                                 "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv2FileInvalidPlatform, "Test.tbd"));
-  EXPECT_FALSE(!!Result);
-  std::string ErrorMessage = toString(Result.takeError());
-  EXPECT_EQ("malformed file\nTest.tbd:3:11: error: invalid platform\nplatform: "
-            "iosmac\n          ^~~~~~\n",
-            ErrorMessage);
-}
-
-TEST(TBDv2, MalformedFile1) {
-  static const char TBDv2FileMalformed1[] = "--- !tapi-tbd-v2\n"
-                                            "archs: [ arm64 ]\n"
-                                            "foobar: \"Unsupported key\"\n"
-                                            "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv2FileMalformed1, "Test.tbd"));
-  EXPECT_FALSE(!!Result);
-  std::string ErrorMessage = toString(Result.takeError());
-  ASSERT_EQ("malformed file\nTest.tbd:2:1: error: missing required key "
-            "'platform'\narchs: [ arm64 ]\n^\n",
-            ErrorMessage);
-}
-
-TEST(TBDv2, MalformedFile2) {
-  static const char TBDv2FileMalformed2[] = "--- !tapi-tbd-v2\n"
-                                            "archs: [ arm64 ]\n"
-                                            "platform: ios\n"
-                                            "install-name: Test.dylib\n"
-                                            "foobar: \"Unsupported key\"\n"
-                                            "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv2FileMalformed2, "Test.tbd"));
-  EXPECT_FALSE(!!Result);
-  std::string ErrorMessage = toString(Result.takeError());
-  ASSERT_EQ(
-      "malformed file\nTest.tbd:5:1: error: unknown key 'foobar'\nfoobar: "
-      "\"Unsupported key\"\n^~~~~~\n",
-      ErrorMessage);
-}
-
-} // namespace TBDv2
diff --git a/gnu/llvm/llvm/unittests/TextAPI/TextStubV3Tests.cpp b/gnu/llvm/llvm/unittests/TextAPI/TextStubV3Tests.cpp
deleted file mode 100644
index bad3b45e0c3..00000000000
--- a/gnu/llvm/llvm/unittests/TextAPI/TextStubV3Tests.cpp
+++ /dev/null
@@ -1,949 +0,0 @@
-//===-- TextStubV3Tests.cpp - TBD V3 File Test ----------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===-----------------------------------------------------------------------===/
-#include "TextStubHelpers.h"
-#include "llvm/TextAPI/InterfaceFile.h"
-#include "llvm/TextAPI/TextAPIReader.h"
-#include "llvm/TextAPI/TextAPIWriter.h"
-#include "gtest/gtest.h"
-#include <string>
-#include <vector>
-
-using namespace llvm;
-using namespace llvm::MachO;
-
-static ExportedSymbol TBDv3Symbols[] = {
-    {SymbolKind::GlobalSymbol, "$ld$hide$os9.0$_sym1", false, false},
-    {SymbolKind::GlobalSymbol, "_sym1", false, false},
-    {SymbolKind::GlobalSymbol, "_sym2", false, false},
-    {SymbolKind::GlobalSymbol, "_sym3", false, false},
-    {SymbolKind::GlobalSymbol, "_sym4", false, false},
-    {SymbolKind::GlobalSymbol, "_sym5", false, false},
-    {SymbolKind::GlobalSymbol, "_tlv1", false, true},
-    {SymbolKind::GlobalSymbol, "_tlv3", false, true},
-    {SymbolKind::GlobalSymbol, "_weak1", true, false},
-    {SymbolKind::GlobalSymbol, "_weak2", true, false},
-    {SymbolKind::GlobalSymbol, "_weak3", true, false},
-    {SymbolKind::ObjectiveCClass, "class1", false, false},
-    {SymbolKind::ObjectiveCClass, "class2", false, false},
-    {SymbolKind::ObjectiveCClass, "class3", false, false},
-    {SymbolKind::ObjectiveCClassEHType, "class1", false, false},
-    {SymbolKind::ObjectiveCInstanceVariable, "class1._ivar1", false, false},
-    {SymbolKind::ObjectiveCInstanceVariable, "class1._ivar2", false, false},
-    {SymbolKind::ObjectiveCInstanceVariable, "class1._ivar3", false, false},
-};
-
-namespace TBDv3 {
-
-TEST(TBDv3, ReadFile) {
-  static const char TBDv3File1[] =
-      "--- !tapi-tbd-v3\n"
-      "archs: [ armv7, arm64 ]\n"
-      "uuids: [ 'armv7: 00000000-0000-0000-0000-000000000000',\n"
-      "         'arm64: 11111111-1111-1111-1111-111111111111']\n"
-      "platform: ios\n"
-      "flags: [ installapi ]\n"
-      "install-name: Test.dylib\n"
-      "current-version: 2.3.4\n"
-      "compatibility-version: 1.0\n"
-      "swift-abi-version: 1.1\n"
-      "parent-umbrella: Umbrella.dylib\n"
-      "exports:\n"
-      "  - archs: [ armv7, arm64 ]\n"
-      "    allowable-clients: [ clientA ]\n"
-      "    re-exports: [ /usr/lib/libfoo.dylib ]\n"
-      "    symbols: [ _sym1, _sym2, _sym3, _sym4, $ld$hide$os9.0$_sym1 ]\n"
-      "    objc-classes: [ class1, class2 ]\n"
-      "    objc-eh-types: [ class1 ]\n"
-      "    objc-ivars: [ class1._ivar1, class1._ivar2 ]\n"
-      "    weak-def-symbols: [ _weak1, _weak2 ]\n"
-      "    thread-local-symbols: [ _tlv1, _tlv3 ]\n"
-      "  - archs: [ armv7 ]\n"
-      "    symbols: [ _sym5 ]\n"
-      "    objc-classes: [ class3 ]\n"
-      "    objc-ivars: [ class1._ivar3 ]\n"
-      "    weak-def-symbols: [ _weak3 ]\n"
-      "    thread-local-symbols: [ _tlv3 ]\n"
-      "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv3File1, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V3, File->getFileType());
-  auto Archs = AK_armv7 | AK_arm64;
-  auto Platform = PlatformKind::iOS;
-  TargetList Targets;
-  for (auto &&arch : Archs)
-    Targets.emplace_back(Target(arch, Platform));
-  EXPECT_EQ(Archs, File->getArchitectures());
-  UUIDs Uuids = {{Target(AK_armv7, PlatformKind::unknown),
-                  "00000000-0000-0000-0000-000000000000"},
-                 {Target(AK_arm64, PlatformKind::unknown),
-                  "11111111-1111-1111-1111-111111111111"}};
-  EXPECT_EQ(Uuids, File->uuids());
-  EXPECT_EQ(File->getPlatforms().size(), 1U);
-  EXPECT_EQ(Platform, *File->getPlatforms().begin());
-  EXPECT_EQ(std::string("Test.dylib"), File->getInstallName());
-  EXPECT_EQ(PackedVersion(2, 3, 4), File->getCurrentVersion());
-  EXPECT_EQ(PackedVersion(1, 0, 0), File->getCompatibilityVersion());
-  EXPECT_EQ(2U, File->getSwiftABIVersion());
-  EXPECT_EQ(ObjCConstraintType::Retain_Release, File->getObjCConstraint());
-  EXPECT_TRUE(File->isTwoLevelNamespace());
-  EXPECT_TRUE(File->isApplicationExtensionSafe());
-  EXPECT_TRUE(File->isInstallAPI());
-  InterfaceFileRef client("clientA", Targets);
-  InterfaceFileRef reexport("/usr/lib/libfoo.dylib", Targets);
-  EXPECT_EQ(1U, File->allowableClients().size());
-  EXPECT_EQ(client, File->allowableClients().front());
-  EXPECT_EQ(1U, File->reexportedLibraries().size());
-  EXPECT_EQ(reexport, File->reexportedLibraries().front());
-
-  ExportedSymbolSeq Exports;
-  for (const auto *Sym : File->symbols()) {
-    EXPECT_FALSE(Sym->isWeakReferenced());
-    EXPECT_FALSE(Sym->isUndefined());
-    Exports.emplace_back(
-        ExportedSymbol{Sym->getKind(), std::string(Sym->getName()),
-                       Sym->isWeakDefined(), Sym->isThreadLocalValue()});
-  }
-  llvm::sort(Exports.begin(), Exports.end());
-
-  EXPECT_EQ(sizeof(TBDv3Symbols) / sizeof(ExportedSymbol), Exports.size());
-  EXPECT_TRUE(
-      std::equal(Exports.begin(), Exports.end(), std::begin(TBDv3Symbols)));
-}
-
-TEST(TBDv3, ReadMultipleDocuments) {
-  static const char TBDv3Inlines[] =
-      "--- !tapi-tbd-v3\n"
-      "archs: [ armv7, arm64 ]\n"
-      "uuids: [ 'armv7: 00000000-0000-0000-0000-000000000000',\n"
-      "         'arm64: 11111111-1111-1111-1111-111111111111']\n"
-      "platform: ios\n"
-      "install-name: Test.dylib\n"
-      "current-version: 2.3.4\n"
-      "compatibility-version: 1.0\n"
-      "swift-abi-version: 1.1\n"
-      "parent-umbrella: Umbrella.dylib\n"
-      "exports:\n"
-      "  - archs: [ armv7, arm64 ]\n"
-      "    allowable-clients: [ clientA ]\n"
-      "    re-exports: [ /usr/lib/libfoo.dylib,\n"
-      "                  TestInline.dylib ]\n"
-      "    symbols: [ _sym1, _sym2, _sym3, _sym4, $ld$hide$os9.0$_sym1 ]\n"
-      "    objc-classes: [ class1, class2 ]\n"
-      "    objc-eh-types: [ class1 ]\n"
-      "    objc-ivars: [ class1._ivar1, class1._ivar2 ]\n"
-      "    weak-def-symbols: [ _weak1, _weak2 ]\n"
-      "    thread-local-symbols: [ _tlv1, _tlv3 ]\n"
-      "  - archs: [ armv7 ]\n"
-      "    symbols: [ _sym5 ]\n"
-      "    objc-classes: [ class3 ]\n"
-      "    objc-ivars: [ class1._ivar3 ]\n"
-      "    weak-def-symbols: [ _weak3 ]\n"
-      "    thread-local-symbols: [ _tlv3 ]\n"
-      "--- !tapi-tbd-v3\n"
-      "archs: [ armv7, arm64 ]\n"
-      "uuids: [ 'armv7: 00000000-0000-0000-0000-000000000000',\n"
-      "         'arm64: 11111111-1111-1111-1111-111111111111']\n"
-      "platform: ios\n"
-      "install-name: TestInline.dylib\n"
-      "swift-abi-version: 1.1\n"
-      "exports:\n"
-      "  - archs: [ armv7, arm64 ]\n"
-      "    symbols: [ _sym5, _sym6 ]\n"
-      "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv3Inlines, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(File->documents().size(), 1U);
-  EXPECT_EQ(FileType::TBD_V3, File->getFileType());
-  auto Archs = AK_armv7 | AK_arm64;
-  auto Platform = PlatformKind::iOS;
-  TargetList Targets;
-  for (auto &&arch : Archs)
-    Targets.emplace_back(Target(arch, Platform));
-  EXPECT_EQ(Archs, File->getArchitectures());
-  UUIDs Uuids = {{Target(AK_armv7, PlatformKind::unknown),
-                  "00000000-0000-0000-0000-000000000000"},
-                 {Target(AK_arm64, PlatformKind::unknown),
-                  "11111111-1111-1111-1111-111111111111"}};
-  EXPECT_EQ(Uuids, File->uuids());
-  EXPECT_EQ(File->getPlatforms().size(), 1U);
-  EXPECT_EQ(Platform, *File->getPlatforms().begin());
-  EXPECT_EQ(std::string("Test.dylib"), File->getInstallName());
-  EXPECT_EQ(PackedVersion(2, 3, 4), File->getCurrentVersion());
-  EXPECT_EQ(PackedVersion(1, 0, 0), File->getCompatibilityVersion());
-  EXPECT_EQ(2U, File->getSwiftABIVersion());
-  EXPECT_EQ(ObjCConstraintType::Retain_Release, File->getObjCConstraint());
-  EXPECT_TRUE(File->isTwoLevelNamespace());
-  EXPECT_TRUE(File->isApplicationExtensionSafe());
-  EXPECT_FALSE(File->isInstallAPI());
-  InterfaceFileRef Client("clientA", Targets);
-  const std::vector<InterfaceFileRef> Reexports = {
-      InterfaceFileRef("/usr/lib/libfoo.dylib", Targets),
-      InterfaceFileRef("TestInline.dylib", Targets)};
-  EXPECT_EQ(1U, File->allowableClients().size());
-  EXPECT_EQ(Client, File->allowableClients().front());
-  EXPECT_EQ(2U, File->reexportedLibraries().size());
-  EXPECT_EQ(Reexports, File->reexportedLibraries());
-
-  ExportedSymbolSeq Exports;
-  for (const auto *Sym : File->symbols()) {
-    EXPECT_FALSE(Sym->isWeakReferenced());
-    EXPECT_FALSE(Sym->isUndefined());
-    Exports.emplace_back(ExportedSymbol{Sym->getKind(), Sym->getName().str(),
-                                        Sym->isWeakDefined(),
-                                        Sym->isThreadLocalValue()});
-  }
-  llvm::sort(Exports.begin(), Exports.end());
-
-  EXPECT_EQ(sizeof(TBDv3Symbols) / sizeof(ExportedSymbol), Exports.size());
-  EXPECT_TRUE(
-      std::equal(Exports.begin(), Exports.end(), std::begin(TBDv3Symbols)));
-
-  // Check Second Document
-  Exports.clear();
-  TBDReexportFile Document = File->documents().front();
-  EXPECT_EQ(FileType::TBD_V3, Document->getFileType());
-  EXPECT_EQ(Archs, Document->getArchitectures());
-  EXPECT_EQ(Uuids, Document->uuids());
-  EXPECT_EQ(Platform, *Document->getPlatforms().begin());
-  EXPECT_EQ(std::string("TestInline.dylib"), Document->getInstallName());
-  EXPECT_EQ(PackedVersion(1, 0, 0), Document->getCurrentVersion());
-  EXPECT_EQ(PackedVersion(1, 0, 0), Document->getCompatibilityVersion());
-  EXPECT_EQ(2U, Document->getSwiftABIVersion());
-
-  for (const auto *Sym : Document->symbols()) {
-    EXPECT_FALSE(Sym->isWeakReferenced());
-    EXPECT_FALSE(Sym->isUndefined());
-    Exports.emplace_back(ExportedSymbol{Sym->getKind(), Sym->getName().str(),
-                                        Sym->isWeakDefined(),
-                                        Sym->isThreadLocalValue()});
-  }
-  llvm::sort(Exports.begin(), Exports.end());
-
-  ExportedSymbolSeq DocumentSymbols{
-      {SymbolKind::GlobalSymbol, "_sym5", false, false},
-      {SymbolKind::GlobalSymbol, "_sym6", false, false},
-  };
-
-  EXPECT_EQ(DocumentSymbols.size(), Exports.size());
-  EXPECT_TRUE(
-      std::equal(Exports.begin(), Exports.end(), DocumentSymbols.begin()));
-}
-
-TEST(TBDv3, WriteFile) {
-  static const char TBDv3File3[] =
-      "--- !tapi-tbd-v3\n"
-      "archs:           [ i386, x86_64 ]\n"
-      "platform:        macosx\n"
-      "install-name:    '/usr/lib/libfoo.dylib'\n"
-      "current-version: 1.2.3\n"
-      "compatibility-version: 0\n"
-      "swift-abi-version: 5\n"
-      "exports:\n"
-      "  - archs:           [ i386 ]\n"
-      "    symbols:         [ _sym1 ]\n"
-      "    weak-def-symbols: [ _sym2 ]\n"
-      "    thread-local-symbols: [ _sym3 ]\n"
-      "  - archs:           [ x86_64 ]\n"
-      "    allowable-clients: [ clientA ]\n"
-      "    re-exports:      [ '/usr/lib/libfoo.dylib' ]\n"
-      "    objc-classes:    [ Class1 ]\n"
-      "    objc-eh-types:   [ Class1 ]\n"
-      "    objc-ivars:      [ Class1._ivar1 ]\n"
-      "...\n";
-
-  InterfaceFile File;
-  TargetList Targets;
-  for (auto &&arch : AK_i386 | AK_x86_64)
-    Targets.emplace_back(Target(arch, PlatformKind::macOS));
-  File.setPath("libfoo.dylib");
-  File.setInstallName("/usr/lib/libfoo.dylib");
-  File.setFileType(FileType::TBD_V3);
-  File.addTargets(Targets);
-  File.setCurrentVersion(PackedVersion(1, 2, 3));
-  File.setTwoLevelNamespace();
-  File.setApplicationExtensionSafe();
-  File.setSwiftABIVersion(5);
-  File.setObjCConstraint(ObjCConstraintType::Retain_Release);
-  File.addAllowableClient("clientA", Targets[1]);
-  File.addReexportedLibrary("/usr/lib/libfoo.dylib", Targets[1]);
-  File.addSymbol(SymbolKind::GlobalSymbol, "_sym1", {Targets[0]});
-  File.addSymbol(SymbolKind::GlobalSymbol, "_sym2", {Targets[0]},
-                 SymbolFlags::WeakDefined);
-  File.addSymbol(SymbolKind::GlobalSymbol, "_sym3", {Targets[0]},
-                 SymbolFlags::ThreadLocalValue);
-  File.addSymbol(SymbolKind::ObjectiveCClass, "Class1", {Targets[1]});
-  File.addSymbol(SymbolKind::ObjectiveCClassEHType, "Class1", {Targets[1]});
-  File.addSymbol(SymbolKind::ObjectiveCInstanceVariable, "Class1._ivar1",
-                 {Targets[1]});
-
-  SmallString<4096> Buffer;
-  raw_svector_ostream OS(Buffer);
-  Error Result = TextAPIWriter::writeToStream(OS, File);
-  EXPECT_FALSE(Result);
-  EXPECT_STREQ(TBDv3File3, Buffer.c_str());
-}
-
-TEST(TBDv3, WriteMultipleDocuments) {
-  static const char TBDv3Inlines[] =
-      "--- !tapi-tbd-v3\n"
-      "archs:           [ i386, x86_64 ]\n"
-      "platform:        zippered\n"
-      "install-name:    '/usr/lib/libfoo.dylib'\n"
-      "current-version: 1.2.3\n"
-      "compatibility-version: 0\n"
-      "swift-abi-version: 5\n"
-      "exports:\n"
-      "  - archs:           [ x86_64 ]\n"
-      "    allowable-clients: [ clientA ]\n"
-      "    re-exports:      [ '/usr/lib/libbar.dylib' ]\n"
-      "  - archs:           [ i386, x86_64 ]\n"
-      "    symbols:         [ _sym1 ]\n"
-      "    objc-classes:    [ Class1 ]\n"
-      "    objc-eh-types:   [ Class1 ]\n"
-      "    objc-ivars:      [ Class1._ivar1 ]\n"
-      "    weak-def-symbols: [ _sym2 ]\n"
-      "    thread-local-symbols: [ _symA ]\n"
-      "--- !tapi-tbd-v3\n"
-      "archs:           [ i386 ]\n"
-      "platform:        macosx\n"
-      "install-name:    '/usr/lib/libbar.dylib'\n"
-      "current-version: 0\n"
-      "compatibility-version: 0\n"
-      "swift-abi-version: 5\n"
-      "objc-constraint: none\n"
-      "exports:\n"
-      "  - archs:           [ i386 ]\n"
-      "    symbols:         [ _sym3, _sym4 ]\n"
-      "...\n";
-
-  InterfaceFile File;
-  TargetList Targets;
-  for (auto &&arch : AK_i386 | AK_x86_64) {
-    Targets.emplace_back(Target(arch, PlatformKind::macOS));
-    Targets.emplace_back(Target(arch, PlatformKind::macCatalyst));
-  }
-  File.addTargets(Targets);
-  File.setPath("libfoo.dylib");
-  File.setInstallName("/usr/lib/libfoo.dylib");
-  File.setFileType(FileType::TBD_V3);
-  File.setCurrentVersion(PackedVersion(1, 2, 3));
-  File.setTwoLevelNamespace();
-  File.setApplicationExtensionSafe();
-  File.setSwiftABIVersion(5);
-  File.setObjCConstraint(ObjCConstraintType::Retain_Release);
-  File.addAllowableClient("clientA", Targets[2]);
-  File.addReexportedLibrary("/usr/lib/libbar.dylib", Targets[2]);
-  File.addSymbol(SymbolKind::GlobalSymbol, "_sym1", Targets);
-  File.addSymbol(SymbolKind::GlobalSymbol, "_sym2", Targets,
-                 SymbolFlags::WeakDefined);
-  File.addSymbol(SymbolKind::GlobalSymbol, "_symA", Targets,
-                 SymbolFlags::ThreadLocalValue);
-  File.addSymbol(SymbolKind::ObjectiveCClass, "Class1", Targets);
-  File.addSymbol(SymbolKind::ObjectiveCClassEHType, "Class1", Targets);
-  File.addSymbol(SymbolKind::ObjectiveCInstanceVariable, "Class1._ivar1",
-                 Targets);
-
-  // Inline document
-  InterfaceFile Document;
-  Targets = {Target(AK_i386, PlatformKind::macOS)};
-  Document.addTargets(Targets);
-  Document.setPath("libbar.dylib");
-  Document.setInstallName("/usr/lib/libbar.dylib");
-  Document.setFileType(FileType::TBD_V3);
-  Document.setTwoLevelNamespace();
-  Document.setApplicationExtensionSafe();
-  Document.setSwiftABIVersion(5);
-  Document.addSymbol(SymbolKind::GlobalSymbol, "_sym3", Targets);
-  Document.addSymbol(SymbolKind::GlobalSymbol, "_sym4", Targets);
-  File.addDocument(std::make_shared<InterfaceFile>(std::move(Document)));
-  
-  SmallString<4096> Buffer;
-  raw_svector_ostream OS(Buffer);
-  Error Result = TextAPIWriter::writeToStream(OS, File);
-  EXPECT_FALSE(Result);
-  EXPECT_STREQ(TBDv3Inlines, Buffer.c_str());
-}
-
-TEST(TBDv3, Platform_macOS) {
-  static const char TBDv3PlatformMacOS[] = "--- !tapi-tbd-v3\n"
-                                           "archs: [ x86_64 ]\n"
-                                           "platform: macosx\n"
-                                           "install-name: Test.dylib\n"
-                                           "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv3PlatformMacOS, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  auto Platform = PlatformKind::macOS;
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V3, File->getFileType());
-  EXPECT_EQ(File->getPlatforms().size(), 1U);
-  EXPECT_EQ(Platform, *File->getPlatforms().begin());
-
-  SmallString<4096> Buffer;
-  raw_svector_ostream OS(Buffer);
-  Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
-  EXPECT_TRUE(!WriteResult);
-  EXPECT_EQ(stripWhitespace(TBDv3PlatformMacOS),
-            stripWhitespace(Buffer.c_str()));
-}
-
-TEST(TBDv3, Platform_iOS) {
-  static const char TBDv3PlatformiOS[] = "--- !tapi-tbd-v3\n"
-                                         "archs: [ arm64 ]\n"
-                                         "platform: ios\n"
-                                         "install-name: Test.dylib\n"
-                                         "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv3PlatformiOS, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  auto Platform = PlatformKind::iOS;
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V3, File->getFileType());
-  EXPECT_EQ(File->getPlatforms().size(), 1U);
-  EXPECT_EQ(Platform, *File->getPlatforms().begin());
-
-  SmallString<4096> Buffer;
-  raw_svector_ostream OS(Buffer);
-  Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
-  EXPECT_TRUE(!WriteResult);
-  EXPECT_EQ(stripWhitespace(TBDv3PlatformiOS), stripWhitespace(Buffer.c_str()));
-}
-
-TEST(TBDv3, Platform_watchOS) {
-  static const char TBDv3watchOS[] = "--- !tapi-tbd-v3\n"
-                                     "archs: [ armv7k ]\n"
-                                     "platform: watchos\n"
-                                     "install-name: Test.dylib\n"
-                                     "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv3watchOS, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  auto Platform = PlatformKind::watchOS;
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V3, File->getFileType());
-  EXPECT_EQ(File->getPlatforms().size(), 1U);
-  EXPECT_EQ(Platform, *File->getPlatforms().begin());
-
-  SmallString<4096> Buffer;
-  raw_svector_ostream OS(Buffer);
-  Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
-  EXPECT_TRUE(!WriteResult);
-  EXPECT_EQ(stripWhitespace(TBDv3watchOS), stripWhitespace(Buffer.c_str()));
-}
-
-TEST(TBDv3, Platform_tvOS) {
-  static const char TBDv3PlatformtvOS[] = "--- !tapi-tbd-v3\n"
-                                          "archs: [ arm64 ]\n"
-                                          "platform: tvos\n"
-                                          "install-name: Test.dylib\n"
-                                          "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv3PlatformtvOS, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  auto Platform = PlatformKind::tvOS;
-  EXPECT_EQ(FileType::TBD_V3, File->getFileType());
-  EXPECT_EQ(File->getPlatforms().size(), 1U);
-  EXPECT_EQ(Platform, *File->getPlatforms().begin());
-
-  SmallString<4096> Buffer;
-  raw_svector_ostream OS(Buffer);
-  Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
-  EXPECT_FALSE(WriteResult);
-  EXPECT_EQ(stripWhitespace(TBDv3PlatformtvOS),
-            stripWhitespace(Buffer.c_str()));
-}
-
-TEST(TBDv3, Platform_bridgeOS) {
-  static const char TBDv3BridgeOS[] = "--- !tapi-tbd-v3\n"
-                                      "archs: [ armv7k ]\n"
-                                      "platform: bridgeos\n"
-                                      "install-name: Test.dylib\n"
-                                      "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv3BridgeOS, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  auto Platform = PlatformKind::bridgeOS;
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V3, File->getFileType());
-  EXPECT_EQ(File->getPlatforms().size(), 1U);
-  EXPECT_EQ(Platform, *File->getPlatforms().begin());
-
-  SmallString<4096> Buffer;
-  raw_svector_ostream OS(Buffer);
-  Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
-  EXPECT_TRUE(!WriteResult);
-  EXPECT_EQ(stripWhitespace(TBDv3BridgeOS), stripWhitespace(Buffer.c_str()));
-}
-
-TEST(TBDv3, Platform_macCatalyst) {
-  static const char TBDv3PlatformiOSmac[] = "--- !tapi-tbd-v3\n"
-                                            "archs: [ armv7k ]\n"
-                                            "platform: iosmac\n"
-                                            "install-name: Test.dylib\n"
-                                            "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv3PlatformiOSmac, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  auto Platform = PlatformKind::macCatalyst;
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V3, File->getFileType());
-  EXPECT_EQ(Platform, *File->getPlatforms().begin());
-
-  SmallString<4096> Buffer;
-  raw_svector_ostream OS(Buffer);
-  Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
-  EXPECT_TRUE(!WriteResult);
-  EXPECT_EQ(stripWhitespace(TBDv3PlatformiOSmac),
-            stripWhitespace(Buffer.c_str()));
-}
-
-TEST(TBDv3, Platform_zippered) {
-  static const char TBDv3PlatformZippered[] = "--- !tapi-tbd-v3\n"
-                                              "archs: [ armv7k ]\n"
-                                              "platform: zippered\n"
-                                              "install-name: Test.dylib\n"
-                                              "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv3PlatformZippered, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V3, File->getFileType());
-
-  PlatformSet Platforms;
-  Platforms.insert(PlatformKind::macOS);
-  Platforms.insert(PlatformKind::macCatalyst);
-  EXPECT_EQ(Platforms.size(), File->getPlatforms().size());
-  for (auto Platform : File->getPlatforms())
-	    EXPECT_EQ(Platforms.count(Platform), 1U);
-
-  SmallString<4096> Buffer;
-  raw_svector_ostream OS(Buffer);
-  Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
-  EXPECT_TRUE(!WriteResult);
-  EXPECT_EQ(stripWhitespace(TBDv3PlatformZippered),
-            stripWhitespace(Buffer.c_str()));
-}
-
-TEST(TBDv3, Platform_iOSSim) {
-  static const char TBDv3PlatformiOSsim[] = "--- !tapi-tbd-v3\n"
-                                            "archs: [ x86_64 ]\n"
-                                            "platform: ios\n"
-                                            "install-name: Test.dylib\n"
-                                            "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv3PlatformiOSsim, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  auto Platform = PlatformKind::iOSSimulator;
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V3, File->getFileType());
-  EXPECT_EQ(File->getPlatforms().size(), 1U);
-  EXPECT_EQ(Platform, *File->getPlatforms().begin());
-
-  SmallString<4096> Buffer;
-  raw_svector_ostream OS(Buffer);
-  Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
-  EXPECT_TRUE(!WriteResult);
-  EXPECT_EQ(stripWhitespace(TBDv3PlatformiOSsim),
-            stripWhitespace(Buffer.c_str()));
-}
-
-TEST(TBDv3, Platform_watchOSSim) {
-  static const char TBDv3watchOSsim[] = "--- !tapi-tbd-v3\n"
-                                        "archs: [ x86_64 ]\n"
-                                        "platform: watchos\n"
-                                        "install-name: Test.dylib\n"
-                                        "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv3watchOSsim, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  auto Platform = PlatformKind::watchOSSimulator;
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V3, File->getFileType());
-  EXPECT_EQ(File->getPlatforms().size(), 1U);
-  EXPECT_EQ(Platform, *File->getPlatforms().begin());
-
-  SmallString<4096> Buffer;
-  raw_svector_ostream OS(Buffer);
-  Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
-  EXPECT_TRUE(!WriteResult);
-  EXPECT_EQ(stripWhitespace(TBDv3watchOSsim), stripWhitespace(Buffer.c_str()));
-}
-
-TEST(TBDv3, Platform_tvOSSim) {
-  static const char TBDv3PlatformtvOSsim[] = "--- !tapi-tbd-v3\n"
-                                             "archs: [ x86_64 ]\n"
-                                             "platform: tvos\n"
-                                             "install-name: Test.dylib\n"
-                                             "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv3PlatformtvOSsim, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  auto Platform = PlatformKind::tvOSSimulator;
-  EXPECT_EQ(FileType::TBD_V3, File->getFileType());
-  EXPECT_EQ(File->getPlatforms().size(), 1U);
-  EXPECT_EQ(Platform, *File->getPlatforms().begin());
-
-  SmallString<4096> Buffer;
-  raw_svector_ostream OS(Buffer);
-  Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
-  EXPECT_TRUE(!WriteResult);
-  EXPECT_EQ(stripWhitespace(TBDv3PlatformtvOSsim),
-            stripWhitespace(Buffer.c_str()));
-}
-
-TEST(TBDv3, Arch_arm64e) {
-  static const char TBDv3ArchArm64e[] = "--- !tapi-tbd-v3\n"
-                                        "archs: [ arm64, arm64e ]\n"
-                                        "platform: ios\n"
-                                        "install-name: Test.dylib\n"
-                                        "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv3ArchArm64e, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  auto Platform = PlatformKind::iOS;
-  auto Archs = AK_arm64 | AK_arm64e;
-  EXPECT_EQ(FileType::TBD_V3, File->getFileType());
-  EXPECT_EQ(File->getPlatforms().size(), 1U);
-  EXPECT_EQ(Platform, *File->getPlatforms().begin());
-  EXPECT_EQ(Archs, File->getArchitectures());
-
-  SmallString<4096> Buffer;
-  raw_svector_ostream OS(Buffer);
-  Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
-  EXPECT_TRUE(!WriteResult);
-  EXPECT_EQ(stripWhitespace(TBDv3ArchArm64e), stripWhitespace(Buffer.c_str()));
-}
-
-TEST(TBDv3, Swift_1_0) {
-  static const char TBDv3Swift1[] = "--- !tapi-tbd-v3\n"
-                                    "archs: [ arm64 ]\n"
-                                    "platform: ios\n"
-                                    "install-name: Test.dylib\n"
-                                    "swift-abi-version: 1.0\n"
-                                    "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv3Swift1, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V3, File->getFileType());
-  EXPECT_EQ(1U, File->getSwiftABIVersion());
-
-  SmallString<4096> Buffer;
-  raw_svector_ostream OS(Buffer);
-  Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
-  EXPECT_TRUE(!WriteResult);
-  EXPECT_EQ(stripWhitespace(TBDv3Swift1), stripWhitespace(Buffer.c_str()));
-}
-
-TEST(TBDv3, Swift_1_1) {
-  static const char TBDv3Swift1Dot[] = "--- !tapi-tbd-v3\n"
-                                       "archs: [ arm64 ]\n"
-                                       "platform: ios\n"
-                                       "install-name: Test.dylib\n"
-                                       "swift-abi-version: 1.1\n"
-                                       "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv3Swift1Dot, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V3, File->getFileType());
-  EXPECT_EQ(2U, File->getSwiftABIVersion());
-
-  SmallString<4096> Buffer;
-  raw_svector_ostream OS(Buffer);
-  Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
-  EXPECT_TRUE(!WriteResult);
-  EXPECT_EQ(stripWhitespace(TBDv3Swift1Dot), stripWhitespace(Buffer.c_str()));
-}
-
-TEST(TBDv3, Swift_2_0) {
-  static const char TBDv3Swift2[] = "--- !tapi-tbd-v3\n"
-                                    "archs: [ arm64 ]\n"
-                                    "platform: ios\n"
-                                    "install-name: Test.dylib\n"
-                                    "swift-abi-version: 2.0\n"
-                                    "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv3Swift2, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V3, File->getFileType());
-  EXPECT_EQ(3U, File->getSwiftABIVersion());
-
-  SmallString<4096> Buffer;
-  raw_svector_ostream OS(Buffer);
-  Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
-  EXPECT_TRUE(!WriteResult);
-  EXPECT_EQ(stripWhitespace(TBDv3Swift2), stripWhitespace(Buffer.c_str()));
-}
-
-TEST(TBDv3, Swift_3_0) {
-  static const char TBDv3Swift3[] = "--- !tapi-tbd-v3\n"
-                                    "archs: [ arm64 ]\n"
-                                    "platform: ios\n"
-                                    "install-name: Test.dylib\n"
-                                    "swift-abi-version: 3.0\n"
-                                    "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv3Swift3, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V3, File->getFileType());
-  EXPECT_EQ(4U, File->getSwiftABIVersion());
-
-  SmallString<4096> Buffer;
-  raw_svector_ostream OS(Buffer);
-  Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
-  EXPECT_TRUE(!WriteResult);
-  EXPECT_EQ(stripWhitespace(TBDv3Swift3), stripWhitespace(Buffer.c_str()));
-}
-
-TEST(TBDv3, Swift_4_0) {
-  static const char TBDv3Swift4[] = "--- !tapi-tbd-v3\n"
-                                    "archs: [ arm64 ]\n"
-                                    "platform: ios\n"
-                                    "install-name: Test.dylib\n"
-                                    "swift-abi-version: 4.0\n"
-                                    "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv3Swift4, "Test.tbd"));
-  EXPECT_FALSE(!!Result);
-  std::string ErrorMessage = toString(Result.takeError());
-  EXPECT_EQ("malformed file\nTest.tbd:5:20: error: invalid Swift ABI "
-            "version.\nswift-abi-version: 4.0\n                   ^~~\n",
-            ErrorMessage);
-}
-
-TEST(TBDv3, Swift_5) {
-  static const char TBDv3Swift5[] = "--- !tapi-tbd-v3\n"
-                                    "archs: [ arm64 ]\n"
-                                    "platform: ios\n"
-                                    "install-name: Test.dylib\n"
-                                    "swift-abi-version: 5\n"
-                                    "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv3Swift5, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V3, File->getFileType());
-  EXPECT_EQ(5U, File->getSwiftABIVersion());
-}
-
-TEST(TBDv3, Swift_99) {
-  static const char TBDv3Swift99[] = "--- !tapi-tbd-v3\n"
-                                     "archs: [ arm64 ]\n"
-                                     "platform: ios\n"
-                                     "install-name: Test.dylib\n"
-                                     "swift-abi-version: 99\n"
-                                     "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv3Swift99, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V3, File->getFileType());
-  EXPECT_EQ(99U, File->getSwiftABIVersion());
-}
-
-TEST(TBDv3, UnknownArchitecture) {
-  static const char TBDv3FileUnknownArch[] = "--- !tapi-tbd-v3\n"
-                                             "archs: [ foo ]\n"
-                                             "platform: macosx\n"
-                                             "install-name: Test.dylib\n"
-                                             "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv3FileUnknownArch, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-}
-
-TEST(TBDv3, UnknownPlatform) {
-  static const char TBDv3FileUnknownPlatform[] = "--- !tapi-tbd-v3\n"
-                                                 "archs: [ i386 ]\n"
-                                                 "platform: newOS\n"
-                                                 "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv3FileUnknownPlatform, "Test.tbd"));
-  EXPECT_FALSE(!!Result);
-  std::string ErrorMessage = toString(Result.takeError());
-  EXPECT_EQ("malformed file\nTest.tbd:3:11: error: unknown platform\nplatform: "
-            "newOS\n          ^~~~~\n",
-            ErrorMessage);
-}
-
-TEST(TBDv3, MalformedFile1) {
-  static const char TBDv3FileMalformed1[] = "--- !tapi-tbd-v3\n"
-                                            "archs: [ arm64 ]\n"
-                                            "foobar: \"Unsupported key\"\n"
-                                            "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv3FileMalformed1, "Test.tbd"));
-  EXPECT_FALSE(!!Result);
-  std::string ErrorMessage = toString(Result.takeError());
-  ASSERT_EQ("malformed file\nTest.tbd:2:1: error: missing required key "
-            "'platform'\narchs: [ arm64 ]\n^\n",
-            ErrorMessage);
-}
-
-TEST(TBDv3, MalformedFile2) {
-  static const char TBDv3FileMalformed2[] = "--- !tapi-tbd-v3\n"
-                                            "archs: [ arm64 ]\n"
-                                            "platform: ios\n"
-                                            "install-name: Test.dylib\n"
-                                            "foobar: \"Unsupported key\"\n"
-                                            "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv3FileMalformed2, "Test.tbd"));
-  EXPECT_FALSE(!!Result);
-  std::string ErrorMessage = toString(Result.takeError());
-  ASSERT_EQ(
-      "malformed file\nTest.tbd:5:1: error: unknown key 'foobar'\nfoobar: "
-      "\"Unsupported key\"\n^~~~~~\n",
-      ErrorMessage);
-}
-
-TEST(TBDv3, InterfaceEquality) {
-  static const char TBDv3File[] =
-      "--- !tapi-tbd-v3\n"
-      "archs: [ armv7, arm64 ]\n"
-      "uuids: [ 'armv7: 00000000-0000-0000-0000-000000000000',\n"
-      "         'arm64: 11111111-1111-1111-1111-111111111111']\n"
-      "platform: ios\n"
-      "flags: [ installapi ]\n"
-      "install-name: Test.dylib\n"
-      "current-version: 2.3.4\n"
-      "compatibility-version: 1.0\n"
-      "swift-abi-version: 1.1\n"
-      "parent-umbrella: Umbrella.dylib\n"
-      "exports:\n"
-      "  - archs: [ armv7, arm64 ]\n"
-      "    allowable-clients: [ clientA ]\n"
-      "    re-exports: [ /usr/lib/libfoo.dylib ]\n"
-      "    symbols: [ _sym1, _sym2, _sym3, _sym4, $ld$hide$os9.0$_sym1 ]\n"
-      "    objc-classes: [ class1, class2 ]\n"
-      "    objc-eh-types: [ class1 ]\n"
-      "    objc-ivars: [ class1._ivar1, class1._ivar2 ]\n"
-      "    weak-def-symbols: [ _weak1, _weak2 ]\n"
-      "    thread-local-symbols: [ _tlv1, _tlv3 ]\n"
-      "  - archs: [ armv7 ]\n"
-      "    symbols: [ _sym5 ]\n"
-      "    objc-classes: [ class3 ]\n"
-      "    objc-ivars: [ class1._ivar3 ]\n"
-      "    weak-def-symbols: [ _weak3 ]\n"
-      "    thread-local-symbols: [ _tlv3 ]\n"
-      "--- !tapi-tbd-v3\n"
-      "archs:           [ i386 ]\n"
-      "platform:        macosx\n"
-      "install-name:    '/usr/lib/libbar.dylib'\n"
-      "current-version: 0\n"
-      "compatibility-version: 0\n"
-      "swift-abi-version: 5\n"
-      "objc-constraint: none\n"
-      "exports:\n"
-      "  - archs:           [ i386 ]\n"
-      "    symbols:         [ _sym3, _sym4 ]\n"
-      "...\n";
-  Expected<TBDFile> ResultA =
-      TextAPIReader::get(MemoryBufferRef(TBDv3File, "TestA.tbd"));
-  EXPECT_TRUE(!!ResultA);
-  InterfaceFile FileA = std::move(*ResultA.get());
-  Expected<TBDFile> ResultB =
-      TextAPIReader::get(MemoryBufferRef(TBDv3File, "TestB.tbd"));
-  EXPECT_TRUE(!!ResultB);
-  InterfaceFile FileB = std::move(*ResultB.get());
-  EXPECT_FALSE(FileA.getPath() == FileB.getPath());
-  EXPECT_TRUE(FileA == FileB);
-}
-
-
-
-TEST(TBDv3, InterfaceInequality) {
-  static const char TBDv3File[] = "--- !tapi-tbd-v3\n"
-                                  "archs: [ armv7, arm64 ]\n"
-                                  "platform: ios\n"
-                                  "install-name: Test.dylib\n"
-                                  "...\n";
-
-  Expected<TBDFile> ResultA =
-      TextAPIReader::get(MemoryBufferRef(TBDv3File, "TestA.tbd"));
-  EXPECT_TRUE(!!ResultA);
-  InterfaceFile FileA = std::move(*ResultA.get());
-  Expected<TBDFile> ResultB =
-      TextAPIReader::get(MemoryBufferRef(TBDv3File, "TestB.tbd"));
-  EXPECT_TRUE(!!ResultB);
-  InterfaceFile FileB = std::move(*ResultB.get());
-
-  EXPECT_TRUE(checkEqualityOnTransform(FileA, FileB, [](InterfaceFile *File) {
-    File->addTarget(Target(AK_x86_64, PlatformKind::iOS));
-  }));
-  EXPECT_TRUE(checkEqualityOnTransform(FileA, FileB, [](InterfaceFile *File) {
-    File->setCurrentVersion(PackedVersion(1, 2, 3));
-    File->setCompatibilityVersion(PackedVersion(1, 0, 0));
-  }));
-  EXPECT_TRUE(checkEqualityOnTransform(
-      FileA, FileB, [](InterfaceFile *File) { File->setSwiftABIVersion(5); }));
-  EXPECT_TRUE(checkEqualityOnTransform(FileA, FileB, [](InterfaceFile *File) {
-    File->setTwoLevelNamespace(false);
-  }));
-  EXPECT_TRUE(checkEqualityOnTransform(
-      FileA, FileB, [](InterfaceFile *File) { File->setInstallAPI(true); }));
-  EXPECT_TRUE(checkEqualityOnTransform(FileA, FileB, [](InterfaceFile *File) {
-    File->setApplicationExtensionSafe(false);
-  }));
-  EXPECT_TRUE(checkEqualityOnTransform(FileA, FileB, [](InterfaceFile *File) {
-    File->addParentUmbrella(Target(AK_armv7, PlatformKind::iOS), "Umbrella.dylib");
-  }));
-  EXPECT_TRUE(checkEqualityOnTransform(FileA, FileB, [](InterfaceFile *File) {
-    File->addAllowableClient("ClientA", Target(AK_armv7, PlatformKind::iOS));
-  }));
-  EXPECT_TRUE(checkEqualityOnTransform(FileA, FileB, [](InterfaceFile *File) {
-    File->addReexportedLibrary("/System/Library/Frameworks/A.framework/A",
-                              Target(AK_armv7, PlatformKind::iOS));
-  }));
-  EXPECT_TRUE(checkEqualityOnTransform(FileA, FileB, [](InterfaceFile *File) {
-    File->addSymbol(SymbolKind::GlobalSymbol, "_symA", {Target(AK_arm64, PlatformKind::iOS)});
-  }));
-  EXPECT_TRUE(checkEqualityOnTransform(FileA, FileB, [](InterfaceFile *File) {
-    InterfaceFile Document;
-    Document.addTargets(TargetList{Target(AK_armv7, PlatformKind::iOS),
-                      Target(AK_arm64, PlatformKind::iOS)});
-    Document.setInstallName("/System/Library/Frameworks/A.framework/A");
-    File->addDocument(std::make_shared<InterfaceFile>(std::move(Document)));
-  }));
-}
-
-} // namespace TBDv3
diff --git a/gnu/llvm/llvm/unittests/TextAPI/TextStubV4Tests.cpp b/gnu/llvm/llvm/unittests/TextAPI/TextStubV4Tests.cpp
deleted file mode 100644
index 1fe5081894f..00000000000
--- a/gnu/llvm/llvm/unittests/TextAPI/TextStubV4Tests.cpp
+++ /dev/null
@@ -1,1175 +0,0 @@
-//===-- TextStubV4Tests.cpp - TBD V4 File Test ----------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===-----------------------------------------------------------------------===/
-
-#include "TextStubHelpers.h"
-#include "llvm/TextAPI/InterfaceFile.h"
-#include "llvm/TextAPI/TextAPIReader.h"
-#include "llvm/TextAPI/TextAPIWriter.h"
-#include "gtest/gtest.h"
-#include <string>
-#include <vector>
-
-using namespace llvm;
-using namespace llvm::MachO;
-
-
-namespace TBDv4 {
-
-TEST(TBDv4, ReadFile) {
-  static const char TBDv4File[] =
-      "--- !tapi-tbd\n"
-      "tbd-version: 4\n"
-      "targets:  [ i386-macos, x86_64-macos, x86_64-ios ]\n"
-      "uuids:\n"
-      "  - target: i386-macos\n"
-      "    value: 00000000-0000-0000-0000-000000000000\n"
-      "  - target: x86_64-macos\n"
-      "    value: 11111111-1111-1111-1111-111111111111\n"
-      "  - target: x86_64-ios\n"
-      "    value: 11111111-1111-1111-1111-111111111111\n"
-      "flags: [ flat_namespace, installapi ]\n"
-      "install-name: Umbrella.framework/Umbrella\n"
-      "current-version: 1.2.3\n"
-      "compatibility-version: 1.2\n"
-      "swift-abi-version: 5\n"
-      "parent-umbrella:\n"
-      "  - targets: [ i386-macos, x86_64-macos, x86_64-ios ]\n"
-      "    umbrella: System\n"
-      "allowable-clients:\n"
-      "  - targets: [ i386-macos, x86_64-macos, x86_64-ios ]\n"
-      "    clients: [ ClientA ]\n"
-      "reexported-libraries:\n"
-      "  - targets: [ i386-macos ]\n"
-      "    libraries: [ /System/Library/Frameworks/A.framework/A ]\n"
-      "exports:\n"
-      "  - targets: [ i386-macos ]\n"
-      "    symbols: [ _symA ]\n"
-      "    objc-classes: []\n"
-      "    objc-eh-types: []\n"
-      "    objc-ivars: []\n"
-      "    weak-symbols: []\n"
-      "    thread-local-symbols: []\n"
-      "  - targets: [ x86_64-ios ]\n"
-      "    symbols: [_symB]\n"
-      "  - targets: [ x86_64-macos, x86_64-ios ]\n"
-      "    symbols: [_symAB]\n"
-      "reexports:\n"
-      "  - targets: [ i386-macos ]\n"
-      "    symbols: [_symC]\n"
-      "    objc-classes: []\n"
-      "    objc-eh-types: []\n"
-      "    objc-ivars: []\n"
-      "    weak-symbols: []\n"
-      "    thread-local-symbols: []\n"
-      "undefineds:\n"
-      "  - targets: [ i386-macos ]\n"
-      "    symbols: [ _symD ]\n"
-      "    objc-classes: []\n"
-      "    objc-eh-types: []\n"
-      "    objc-ivars: []\n"
-      "    weak-symbols: []\n"
-      "    thread-local-symbols: []\n"
-      "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv4File, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V4, File->getFileType());
-  PlatformSet Platforms;
-  Platforms.insert(getPlatformFromName("macos"));
-  Platforms.insert(getPlatformFromName("ios"));
-  auto Archs = AK_i386 | AK_x86_64;
-  TargetList Targets = {
-      Target(AK_i386, PlatformKind::macOS),
-      Target(AK_x86_64, PlatformKind::macOS),
-      Target(AK_x86_64, PlatformKind::iOS),
-  };
-  UUIDs uuids = {{Targets[0], "00000000-0000-0000-0000-000000000000"},
-                 {Targets[1], "11111111-1111-1111-1111-111111111111"},
-                 {Targets[2], "11111111-1111-1111-1111-111111111111"}};
-  EXPECT_EQ(Archs, File->getArchitectures());
-  EXPECT_EQ(uuids, File->uuids());
-  EXPECT_EQ(Platforms.size(), File->getPlatforms().size());
-  for (auto Platform : File->getPlatforms())
-    EXPECT_EQ(Platforms.count(Platform), 1U);
-  EXPECT_EQ(std::string("Umbrella.framework/Umbrella"), File->getInstallName());
-  EXPECT_EQ(PackedVersion(1, 2, 3), File->getCurrentVersion());
-  EXPECT_EQ(PackedVersion(1, 2, 0), File->getCompatibilityVersion());
-  EXPECT_EQ(5U, File->getSwiftABIVersion());
-  EXPECT_FALSE(File->isTwoLevelNamespace());
-  EXPECT_TRUE(File->isApplicationExtensionSafe());
-  EXPECT_TRUE(File->isInstallAPI());
-  InterfaceFileRef client("ClientA", Targets);
-  InterfaceFileRef reexport("/System/Library/Frameworks/A.framework/A",
-                            {Targets[0]});
-  EXPECT_EQ(1U, File->allowableClients().size());
-  EXPECT_EQ(client, File->allowableClients().front());
-  EXPECT_EQ(1U, File->reexportedLibraries().size());
-  EXPECT_EQ(reexport, File->reexportedLibraries().front());
-
-  ExportedSymbolSeq Exports, Reexports, Undefineds;
-  ExportedSymbol temp;
-  for (const auto *Sym : File->symbols()) {
-    temp = ExportedSymbol{Sym->getKind(), std::string(Sym->getName()),
-                          Sym->isWeakDefined(), Sym->isThreadLocalValue()};
-    EXPECT_FALSE(Sym->isWeakReferenced());
-    if (Sym->isUndefined())
-      Undefineds.emplace_back(std::move(temp));
-    else
-      Sym->isReexported() ? Reexports.emplace_back(std::move(temp))
-                          : Exports.emplace_back(std::move(temp));
-  }
-  llvm::sort(Exports.begin(), Exports.end());
-  llvm::sort(Reexports.begin(), Reexports.end());
-  llvm::sort(Undefineds.begin(), Undefineds.end());
-
-  static ExportedSymbol ExpectedExportedSymbols[] = {
-      {SymbolKind::GlobalSymbol, "_symA", false, false},
-      {SymbolKind::GlobalSymbol, "_symAB", false, false},
-      {SymbolKind::GlobalSymbol, "_symB", false, false},
-  };
-
-  static ExportedSymbol ExpectedReexportedSymbols[] = {
-      {SymbolKind::GlobalSymbol, "_symC", false, false},
-  };
-
-  static ExportedSymbol ExpectedUndefinedSymbols[] = {
-      {SymbolKind::GlobalSymbol, "_symD", false, false},
-  };
-
-  EXPECT_EQ(sizeof(ExpectedExportedSymbols) / sizeof(ExportedSymbol),
-            Exports.size());
-  EXPECT_EQ(sizeof(ExpectedReexportedSymbols) / sizeof(ExportedSymbol),
-            Reexports.size());
-  EXPECT_EQ(sizeof(ExpectedUndefinedSymbols) / sizeof(ExportedSymbol),
-            Undefineds.size());
-  EXPECT_TRUE(std::equal(Exports.begin(), Exports.end(),
-                         std::begin(ExpectedExportedSymbols)));
-  EXPECT_TRUE(std::equal(Reexports.begin(), Reexports.end(),
-                         std::begin(ExpectedReexportedSymbols)));
-  EXPECT_TRUE(std::equal(Undefineds.begin(), Undefineds.end(),
-                         std::begin(ExpectedUndefinedSymbols)));
-}
-
-TEST(TBDv4, ReadMultipleDocuments) {
-  static const char TBDv4Inlines[] =
-      "--- !tapi-tbd\n"
-      "tbd-version: 4\n"
-      "targets: [ i386-macos, i386-maccatalyst, x86_64-macos, "
-      "x86_64-maccatalyst ]\n"
-      "uuids:\n"
-      "  - target: i386-macos\n"
-      "    value: 00000000-0000-0000-0000-000000000000\n"
-      "  - target: i386-maccatalyst\n"
-      "    value: 00000000-0000-0000-0000-000000000002\n"
-      "  - target: x86_64-macos\n"
-      "    value: 11111111-1111-1111-1111-111111111111\n"
-      "  - target: x86_64-maccatalyst\n"
-      "    value: 11111111-1111-1111-1111-111111111112\n"
-      "install-name: /System/Library/Frameworks/Umbrella.framework/Umbrella\n"
-      "parent-umbrella:\n"
-      "  - targets: [ i386-macos, x86_64-macos ]\n"
-      "    umbrella: System\n"
-      "reexported-libraries:\n"
-      "  - targets: [ i386-macos, x86_64-macos ]\n"
-      "    libraries: [ /System/Library/Frameworks/A.framework/A ]\n"
-      "--- !tapi-tbd\n"
-      "tbd-version: 4\n"
-      "targets:  [ i386-macos, x86_64-macos ]\n"
-      "uuids:\n"
-      "  - target: i386-macos\n"
-      "    value: 20000000-0000-0000-0000-000000000000\n"
-      "  - target: x86_64-macos\n"
-      "    value: 21111111-1111-1111-1111-111111111111\n"
-      "flags: [ flat_namespace ]\n"
-      "install-name: /System/Library/Frameworks/A.framework/A\n"
-      "current-version: 1.2.3\n"
-      "compatibility-version: 1.2\n"
-      "swift-abi-version: 5\n"
-      "exports:\n"
-      "  - targets: [ i386-macos ]\n"
-      "    symbols: [ _symA ]\n"
-      "    objc-classes: []\n"
-      "    objc-eh-types: []\n"
-      "    objc-ivars: []\n"
-      "    weak-symbols: []\n"
-      "    thread-local-symbols: []\n"
-      "  - targets: [ x86_64-macos ]\n"
-      "    symbols: [_symAB]\n"
-      "reexports:\n"
-      "  - targets: [ i386-macos ]\n"
-      "    symbols: [_symC]\n"
-      "    objc-classes: []\n"
-      "    objc-eh-types: []\n"
-      "    objc-ivars: []\n"
-      "    weak-symbols: []\n"
-      "    thread-local-symbols: []\n"
-      "undefineds:\n"
-      "  - targets: [ i386-macos ]\n"
-      "    symbols: [ _symD ]\n"
-      "    objc-classes: []\n"
-      "    objc-eh-types: []\n"
-      "    objc-ivars: []\n"
-      "    weak-symbols: []\n"
-      "    thread-local-symbols: []\n"
-      "...\n";
-
-  PlatformSet Platforms;
-  Platforms.insert(PlatformKind::macOS);
-  Platforms.insert(PlatformKind::macCatalyst);
-  ArchitectureSet Archs = AK_i386 | AK_x86_64;
-  TargetList Targets;
-  for (auto &&Arch : Archs)
-    for (auto &&Platform : Platforms)
-      Targets.emplace_back(Target(Arch, Platform));
-  UUIDs Uuids = {
-      {Targets[0], "00000000-0000-0000-0000-000000000000"},
-      {Targets[1], "00000000-0000-0000-0000-000000000002"},
-      {Targets[2], "11111111-1111-1111-1111-111111111111"},
-      {Targets[3], "11111111-1111-1111-1111-111111111112"},
-  };
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv4Inlines, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V4, File->getFileType());
-  EXPECT_EQ(Archs, File->getArchitectures());
-  EXPECT_EQ(Uuids, File->uuids());
-  EXPECT_EQ(Platforms, File->getPlatforms());
-  EXPECT_EQ(
-      std::string("/System/Library/Frameworks/Umbrella.framework/Umbrella"),
-      File->getInstallName());
-  EXPECT_TRUE(File->isTwoLevelNamespace());
-  EXPECT_TRUE(File->isApplicationExtensionSafe());
-  EXPECT_FALSE(File->isInstallAPI());
-  EXPECT_EQ(PackedVersion(1, 0, 0), File->getCurrentVersion());
-  EXPECT_EQ(PackedVersion(1, 0, 0), File->getCompatibilityVersion());
-  InterfaceFileRef reexport("/System/Library/Frameworks/A.framework/A",
-                            {Targets[0], Targets[2]});
-  EXPECT_EQ(1U, File->reexportedLibraries().size());
-  EXPECT_EQ(reexport, File->reexportedLibraries().front());
-  EXPECT_TRUE(File->symbols().empty());
-
-  // Check Inlined Document
-  Targets.clear();
-  Uuids.clear();
-  PlatformKind Platform = PlatformKind::macOS;
-  for (auto &&Arch : Archs)
-    Targets.emplace_back(Target(Arch, Platform));
-  Uuids = {
-      {Targets[0], "20000000-0000-0000-0000-000000000000"},
-      {Targets[1], "21111111-1111-1111-1111-111111111111"},
-  };
-
-  TBDReexportFile Document = File->documents().front();
-  EXPECT_EQ(FileType::TBD_V4, Document->getFileType());
-  EXPECT_EQ(Archs, Document->getArchitectures());
-  EXPECT_EQ(Uuids, Document->uuids());
-  EXPECT_EQ(1U, Document->getPlatforms().size());
-  EXPECT_EQ(Platform, *(Document->getPlatforms().begin()));
-  EXPECT_EQ(std::string("/System/Library/Frameworks/A.framework/A"),
-            Document->getInstallName());
-  EXPECT_EQ(PackedVersion(1, 2, 3), Document->getCurrentVersion());
-  EXPECT_EQ(PackedVersion(1, 2, 0), Document->getCompatibilityVersion());
-  EXPECT_EQ(5U, Document->getSwiftABIVersion());
-  EXPECT_FALSE(Document->isTwoLevelNamespace());
-  EXPECT_TRUE(Document->isApplicationExtensionSafe());
-  EXPECT_FALSE(Document->isInstallAPI());
-
-  ExportedSymbolSeq Exports;
-  ExportedSymbolSeq Reexports, Undefineds;
-  for (const auto *Sym : Document->symbols()) {
-    ExportedSymbol Temp =
-        ExportedSymbol{Sym->getKind(), std::string(Sym->getName()),
-                       Sym->isWeakDefined(), Sym->isThreadLocalValue()};
-    EXPECT_FALSE(Sym->isWeakReferenced());
-    if (Sym->isUndefined())
-      Undefineds.emplace_back(std::move(Temp));
-    else
-      Sym->isReexported() ? Reexports.emplace_back(std::move(Temp))
-                          : Exports.emplace_back(std::move(Temp));
-  }
-  llvm::sort(Exports.begin(), Exports.end());
-  llvm::sort(Reexports.begin(), Reexports.end());
-  llvm::sort(Undefineds.begin(), Undefineds.end());
-
-  static ExportedSymbol ExpectedExportedSymbols[] = {
-      {SymbolKind::GlobalSymbol, "_symA", false, false},
-      {SymbolKind::GlobalSymbol, "_symAB", false, false},
-  };
-
-  static ExportedSymbol ExpectedReexportedSymbols[] = {
-      {SymbolKind::GlobalSymbol, "_symC", false, false},
-  };
-
-  static ExportedSymbol ExpectedUndefinedSymbols[] = {
-      {SymbolKind::GlobalSymbol, "_symD", false, false},
-  };
-
-  EXPECT_EQ(sizeof(ExpectedExportedSymbols) / sizeof(ExportedSymbol),
-            Exports.size());
-  EXPECT_EQ(sizeof(ExpectedReexportedSymbols) / sizeof(ExportedSymbol),
-            Reexports.size());
-  EXPECT_EQ(sizeof(ExpectedUndefinedSymbols) / sizeof(ExportedSymbol),
-            Undefineds.size());
-  EXPECT_TRUE(std::equal(Exports.begin(), Exports.end(),
-                         std::begin(ExpectedExportedSymbols)));
-  EXPECT_TRUE(std::equal(Reexports.begin(), Reexports.end(),
-                         std::begin(ExpectedReexportedSymbols)));
-  EXPECT_TRUE(std::equal(Undefineds.begin(), Undefineds.end(),
-                         std::begin(ExpectedUndefinedSymbols)));
-}
-
-TEST(TBDv4, WriteFile) {
-  static const char TBDv4File[] =
-      "--- !tapi-tbd\n"
-      "tbd-version:     4\n"
-      "targets:         [ i386-macos, x86_64-ios-simulator ]\n"
-      "uuids:\n"
-      "  - target:          i386-macos\n"
-      "    value:           00000000-0000-0000-0000-000000000000\n"
-      "  - target:          x86_64-ios-simulator\n"
-      "    value:           11111111-1111-1111-1111-111111111111\n"
-      "flags:           [ installapi ]\n"
-      "install-name:    'Umbrella.framework/Umbrella'\n"
-      "current-version: 1.2.3\n"
-      "compatibility-version: 0\n"
-      "swift-abi-version: 5\n"
-      "parent-umbrella:\n"
-      "  - targets:         [ i386-macos, x86_64-ios-simulator ]\n"
-      "    umbrella:        System\n"
-      "allowable-clients:\n"
-      "  - targets:         [ i386-macos ]\n"
-      "    clients:         [ ClientA ]\n"
-      "exports:\n"
-      "  - targets:         [ i386-macos ]\n"
-      "    symbols:         [ _symA ]\n"
-      "    objc-classes:    [ Class1 ]\n"
-      "    weak-symbols:    [ _symC ]\n"
-      "  - targets:         [ x86_64-ios-simulator ]\n"
-      "    symbols:         [ _symB ]\n"
-      "...\n";
-
-  InterfaceFile File;
-  TargetList Targets = {
-      Target(AK_i386, PlatformKind::macOS),
-      Target(AK_x86_64, PlatformKind::iOSSimulator),
-  };
-  UUIDs uuids = {{Targets[0], "00000000-0000-0000-0000-000000000000"},
-                 {Targets[1], "11111111-1111-1111-1111-111111111111"}};
-  File.setInstallName("Umbrella.framework/Umbrella");
-  File.setFileType(FileType::TBD_V4);
-  File.addTargets(Targets);
-  File.addUUID(uuids[0].first, uuids[0].second);
-  File.addUUID(uuids[1].first, uuids[1].second);
-  File.setCurrentVersion(PackedVersion(1, 2, 3));
-  File.setTwoLevelNamespace();
-  File.setInstallAPI(true);
-  File.setApplicationExtensionSafe(true);
-  File.setSwiftABIVersion(5);
-  File.addAllowableClient("ClientA", Targets[0]);
-  File.addParentUmbrella(Targets[0], "System");
-  File.addParentUmbrella(Targets[1], "System");
-  File.addSymbol(SymbolKind::GlobalSymbol, "_symA", {Targets[0]});
-  File.addSymbol(SymbolKind::GlobalSymbol, "_symB", {Targets[1]});
-  File.addSymbol(SymbolKind::GlobalSymbol, "_symC", {Targets[0]},
-                 SymbolFlags::WeakDefined);
-  File.addSymbol(SymbolKind::ObjectiveCClass, "Class1", {Targets[0]});
-
-  SmallString<4096> Buffer;
-  raw_svector_ostream OS(Buffer);
-  Error Result = TextAPIWriter::writeToStream(OS, File);
-  EXPECT_FALSE(Result);
-  EXPECT_STREQ(TBDv4File, Buffer.c_str());
-}
-
-TEST(TBDv4, WriteMultipleDocuments) {
-  static const char TBDv4Inlines[] =
-      "--- !tapi-tbd\n"
-      "tbd-version:     4\n"
-      "targets:         [ i386-maccatalyst, x86_64-maccatalyst ]\n"
-      "uuids:\n"
-      "  - target:          i386-maccatalyst\n"
-      "    value:           00000000-0000-0000-0000-000000000002\n"
-      "  - target:          x86_64-maccatalyst\n"
-      "    value:           11111111-1111-1111-1111-111111111112\n"
-      "install-name:    "
-      "'/System/Library/Frameworks/Umbrella.framework/Umbrella'\n"
-      "reexported-libraries:\n"
-      "  - targets:         [ i386-maccatalyst, x86_64-maccatalyst ]\n"
-      "    libraries:       [ '/System/Library/Frameworks/A.framework/A' ]\n"
-      "--- !tapi-tbd\n"
-      "tbd-version:     4\n"
-      "targets:         [ i386-maccatalyst, x86_64-maccatalyst ]\n"
-      "uuids:\n"
-      "  - target:          i386-maccatalyst\n"
-      "    value:           00000000-0000-0000-0000-000000000000\n"
-      "  - target:          x86_64-maccatalyst\n"
-      "    value:           11111111-1111-1111-1111-111111111111\n"
-      "install-name:    '/System/Library/Frameworks/A.framework/A'\n"
-      "exports:\n"
-      "  - targets:         [ i386-maccatalyst ]\n"
-      "    weak-symbols:    [ _symC ]\n"
-      "  - targets:         [ i386-maccatalyst, x86_64-maccatalyst ]\n"
-      "    symbols:         [ _symA ]\n"
-      "    objc-classes:    [ Class1 ]\n"
-      "  - targets:         [ x86_64-maccatalyst ]\n"
-      "    symbols:         [ _symAB ]\n"
-      "...\n";
-
-  InterfaceFile File;
-  PlatformKind Platform = PlatformKind::macCatalyst;
-  TargetList Targets = {
-      Target(AK_i386, Platform),
-      Target(AK_x86_64, Platform),
-  };
-  UUIDs Uuids = {{Targets[0], "00000000-0000-0000-0000-000000000002"},
-                 {Targets[1], "11111111-1111-1111-1111-111111111112"}};
-  File.setInstallName("/System/Library/Frameworks/Umbrella.framework/Umbrella");
-  File.setFileType(FileType::TBD_V4);
-  File.addTargets(Targets);
-  File.addUUID(Uuids[0].first, Uuids[0].second);
-  File.addUUID(Uuids[1].first, Uuids[1].second);
-  File.setCompatibilityVersion(PackedVersion(1, 0, 0));
-  File.setCurrentVersion(PackedVersion(1, 0, 0));
-  File.setTwoLevelNamespace();
-  File.setApplicationExtensionSafe(true);
-  File.addReexportedLibrary("/System/Library/Frameworks/A.framework/A",
-                            Targets[0]);
-  File.addReexportedLibrary("/System/Library/Frameworks/A.framework/A",
-                            Targets[1]);
-
-  // Write Second Document
-  Uuids = {{Targets[0], "00000000-0000-0000-0000-000000000000"},
-           {Targets[1], "11111111-1111-1111-1111-111111111111"}};
-  InterfaceFile Document;
-  Document.setInstallName("/System/Library/Frameworks/A.framework/A");
-  Document.setFileType(FileType::TBD_V4);
-  Document.addTargets(Targets);
-  Document.addUUID(Uuids[0].first, Uuids[0].second);
-  Document.addUUID(Uuids[1].first, Uuids[1].second);
-  Document.setCompatibilityVersion(PackedVersion(1, 0, 0));
-  Document.setCurrentVersion(PackedVersion(1, 0, 0));
-  Document.setTwoLevelNamespace();
-  Document.setApplicationExtensionSafe(true);
-  Document.addSymbol(SymbolKind::GlobalSymbol, "_symA", Targets);
-  Document.addSymbol(SymbolKind::GlobalSymbol, "_symAB", {Targets[1]});
-  Document.addSymbol(SymbolKind::GlobalSymbol, "_symC", {Targets[0]},
-                     SymbolFlags::WeakDefined);
-  Document.addSymbol(SymbolKind::ObjectiveCClass, "Class1", Targets);
-  File.addDocument(std::make_shared<InterfaceFile>(std::move(Document)));
-
-  SmallString<4096> Buffer;
-  raw_svector_ostream OS(Buffer);
-  Error Result = TextAPIWriter::writeToStream(OS, File);
-  EXPECT_FALSE(Result);
-  EXPECT_STREQ(TBDv4Inlines, Buffer.c_str());
-}
-
-TEST(TBDv4, MultipleTargets) {
-  static const char TBDv4MultipleTargets[] =
-      "--- !tapi-tbd\n"
-      "tbd-version: 4\n"
-      "targets: [ i386-maccatalyst, x86_64-tvos, arm64-ios ]\n"
-      "install-name: Test.dylib\n"
-      "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv4MultipleTargets, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  PlatformSet Platforms;
-  Platforms.insert(PlatformKind::macCatalyst);
-  Platforms.insert(PlatformKind::tvOS);
-  Platforms.insert(PlatformKind::iOS);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V4, File->getFileType());
-  EXPECT_EQ(AK_x86_64 | AK_arm64 | AK_i386, File->getArchitectures());
-  EXPECT_EQ(Platforms.size(), File->getPlatforms().size());
-  for (auto Platform : File->getPlatforms())
-    EXPECT_EQ(Platforms.count(Platform), 1U);
-
-  SmallString<4096> Buffer;
-  raw_svector_ostream OS(Buffer);
-  Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
-  EXPECT_TRUE(!WriteResult);
-  EXPECT_EQ(stripWhitespace(TBDv4MultipleTargets),
-            stripWhitespace(Buffer.c_str()));
-}
-
-TEST(TBDv4, MultipleTargetsSameArch) {
-  static const char TBDv4TargetsSameArch[] =
-      "--- !tapi-tbd\n"
-      "tbd-version: 4\n"
-      "targets: [ x86_64-tvos , x86_64-maccatalyst ]\n"
-      "install-name: Test.dylib\n"
-      "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv4TargetsSameArch, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  PlatformSet Platforms;
-  Platforms.insert(PlatformKind::tvOS);
-  Platforms.insert(PlatformKind::macCatalyst);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V4, File->getFileType());
-  EXPECT_EQ(ArchitectureSet(AK_x86_64), File->getArchitectures());
-  EXPECT_EQ(Platforms.size(), File->getPlatforms().size());
-  for (auto Platform : File->getPlatforms())
-    EXPECT_EQ(Platforms.count(Platform), 1U);
-
-  SmallString<4096> Buffer;
-  raw_svector_ostream OS(Buffer);
-  Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
-  EXPECT_TRUE(!WriteResult);
-  EXPECT_EQ(stripWhitespace(TBDv4TargetsSameArch),
-            stripWhitespace(Buffer.c_str()));
-}
-
-TEST(TBDv4, MultipleTargetsSamePlatform) {
-  static const char TBDv4MultipleTargetsSamePlatform[] =
-      "--- !tapi-tbd\n"
-      "tbd-version: 4\n"
-      "targets: [ armv7k-ios , arm64-ios]\n"
-      "install-name: Test.dylib\n"
-      "...\n";
-
-  Expected<TBDFile> Result = TextAPIReader::get(
-      MemoryBufferRef(TBDv4MultipleTargetsSamePlatform, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V4, File->getFileType());
-  EXPECT_EQ(AK_arm64 | AK_armv7k, File->getArchitectures());
-  EXPECT_EQ(File->getPlatforms().size(), 1U);
-  EXPECT_EQ(PlatformKind::iOS, *File->getPlatforms().begin());
-
-  SmallString<4096> Buffer;
-  raw_svector_ostream OS(Buffer);
-  Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
-  EXPECT_TRUE(!WriteResult);
-  EXPECT_EQ(stripWhitespace(TBDv4MultipleTargetsSamePlatform),
-            stripWhitespace(Buffer.c_str()));
-}
-
-TEST(TBDv4, Target_maccatalyst) {
-  static const char TBDv4TargetMacCatalyst[] =
-      "--- !tapi-tbd\n"
-      "tbd-version: 4\n"
-      "targets: [  x86_64-maccatalyst ]\n"
-      "install-name: Test.dylib\n"
-      "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv4TargetMacCatalyst, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V4, File->getFileType());
-  EXPECT_EQ(ArchitectureSet(AK_x86_64), File->getArchitectures());
-  EXPECT_EQ(File->getPlatforms().size(), 1U);
-  EXPECT_EQ(PlatformKind::macCatalyst, *File->getPlatforms().begin());
-
-  SmallString<4096> Buffer;
-  raw_svector_ostream OS(Buffer);
-  Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
-  EXPECT_TRUE(!WriteResult);
-  EXPECT_EQ(stripWhitespace(TBDv4TargetMacCatalyst),
-            stripWhitespace(Buffer.c_str()));
-}
-
-TEST(TBDv4, Target_x86_ios) {
-  static const char TBDv4Targetx86iOS[] = "--- !tapi-tbd\n"
-                                          "tbd-version: 4\n"
-                                          "targets: [  x86_64-ios ]\n"
-                                          "install-name: Test.dylib\n"
-                                          "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv4Targetx86iOS, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V4, File->getFileType());
-  EXPECT_EQ(ArchitectureSet(AK_x86_64), File->getArchitectures());
-  EXPECT_EQ(File->getPlatforms().size(), 1U);
-  EXPECT_EQ(PlatformKind::iOS, *File->getPlatforms().begin());
-
-  SmallString<4096> Buffer;
-  raw_svector_ostream OS(Buffer);
-  Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
-  EXPECT_TRUE(!WriteResult);
-  EXPECT_EQ(stripWhitespace(TBDv4Targetx86iOS),
-            stripWhitespace(Buffer.c_str()));
-}
-
-TEST(TBDv4, Target_arm_bridgeOS) {
-  static const char TBDv4PlatformBridgeOS[] = "--- !tapi-tbd\n"
-                                              "tbd-version: 4\n"
-                                              "targets: [  armv7k-bridgeos ]\n"
-                                              "install-name: Test.dylib\n"
-                                              "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv4PlatformBridgeOS, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V4, File->getFileType());
-  EXPECT_EQ(File->getPlatforms().size(), 1U);
-  EXPECT_EQ(PlatformKind::bridgeOS, *File->getPlatforms().begin());
-  EXPECT_EQ(ArchitectureSet(AK_armv7k), File->getArchitectures());
-
-  SmallString<4096> Buffer;
-  raw_svector_ostream OS(Buffer);
-  Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
-  EXPECT_TRUE(!WriteResult);
-  EXPECT_EQ(stripWhitespace(TBDv4PlatformBridgeOS),
-            stripWhitespace(Buffer.c_str()));
-}
-
-TEST(TBDv4, Target_arm_iOS) {
-  static const char TBDv4ArchArm64e[] = "--- !tapi-tbd\n"
-                                        "tbd-version: 4\n"
-                                        "targets: [  arm64e-ios ]\n"
-                                        "install-name: Test.dylib\n"
-                                        "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv4ArchArm64e, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V4, File->getFileType());
-  EXPECT_EQ(File->getPlatforms().size(), 1U);
-  EXPECT_EQ(PlatformKind::iOS, *File->getPlatforms().begin());
-  EXPECT_EQ(ArchitectureSet(AK_arm64e), File->getArchitectures());
-
-  SmallString<4096> Buffer;
-  raw_svector_ostream OS(Buffer);
-  Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
-  EXPECT_TRUE(!WriteResult);
-  EXPECT_EQ(stripWhitespace(TBDv4ArchArm64e), stripWhitespace(Buffer.c_str()));
-}
-
-TEST(TBDv4, Target_x86_macos) {
-  static const char TBDv4Targetx86MacOS[] = "--- !tapi-tbd\n"
-                                            "tbd-version: 4\n"
-                                            "targets: [  x86_64-macos ]\n"
-                                            "install-name: Test.dylib\n"
-                                            "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv4Targetx86MacOS, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V4, File->getFileType());
-  EXPECT_EQ(ArchitectureSet(AK_x86_64), File->getArchitectures());
-  EXPECT_EQ(File->getPlatforms().size(), 1U);
-  EXPECT_EQ(PlatformKind::macOS, *File->getPlatforms().begin());
-
-  SmallString<4096> Buffer;
-  raw_svector_ostream OS(Buffer);
-  Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
-  EXPECT_TRUE(!WriteResult);
-  EXPECT_EQ(stripWhitespace(TBDv4Targetx86MacOS),
-            stripWhitespace(Buffer.c_str()));
-}
-
-TEST(TBDv4, Target_x86_ios_simulator) {
-  static const char TBDv4Targetx86iOSSim[] =
-      "--- !tapi-tbd\n"
-      "tbd-version: 4\n"
-      "targets: [  x86_64-ios-simulator  ]\n"
-      "install-name: Test.dylib\n"
-      "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv4Targetx86iOSSim, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V4, File->getFileType());
-  EXPECT_EQ(ArchitectureSet(AK_x86_64), File->getArchitectures());
-  EXPECT_EQ(File->getPlatforms().size(), 1U);
-  EXPECT_EQ(PlatformKind::iOSSimulator, *File->getPlatforms().begin());
-
-  SmallString<4096> Buffer;
-  raw_svector_ostream OS(Buffer);
-  Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
-  EXPECT_TRUE(!WriteResult);
-  EXPECT_EQ(stripWhitespace(TBDv4Targetx86iOSSim),
-            stripWhitespace(Buffer.c_str()));
-}
-
-TEST(TBDv4, Target_x86_tvos_simulator) {
-  static const char TBDv4x86tvOSSim[] = "--- !tapi-tbd\n"
-                                        "tbd-version: 4\n"
-                                        "targets: [  x86_64-tvos-simulator  ]\n"
-                                        "install-name: Test.dylib\n"
-                                        "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv4x86tvOSSim, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V4, File->getFileType());
-  EXPECT_EQ(ArchitectureSet(AK_x86_64), File->getArchitectures());
-  EXPECT_EQ(File->getPlatforms().size(), 1U);
-  EXPECT_EQ(PlatformKind::tvOSSimulator, *File->getPlatforms().begin());
-
-  SmallString<4096> Buffer;
-  raw_svector_ostream OS(Buffer);
-  Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
-  EXPECT_TRUE(!WriteResult);
-  EXPECT_EQ(stripWhitespace(TBDv4x86tvOSSim), stripWhitespace(Buffer.c_str()));
-}
-
-TEST(TBDv4, Target_i386_watchos_simulator) {
-  static const char TBDv4i386watchOSSim[] =
-      "--- !tapi-tbd\n"
-      "tbd-version: 4\n"
-      "targets: [  i386-watchos-simulator  ]\n"
-      "install-name: Test.dylib\n"
-      "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv4i386watchOSSim, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V4, File->getFileType());
-  EXPECT_EQ(ArchitectureSet(AK_i386), File->getArchitectures());
-  EXPECT_EQ(File->getPlatforms().size(), 1U);
-  EXPECT_EQ(PlatformKind::watchOSSimulator, *File->getPlatforms().begin());
-
-  SmallString<4096> Buffer;
-  raw_svector_ostream OS(Buffer);
-  Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
-  EXPECT_TRUE(!WriteResult);
-  EXPECT_EQ(stripWhitespace(TBDv4i386watchOSSim),
-            stripWhitespace(Buffer.c_str()));
-}
-
-TEST(TBDv4, Target_i386_driverkit) {
-  static const char TBDv4i386DriverKit[] = "--- !tapi-tbd\n"
-                                           "tbd-version: 4\n"
-                                           "targets: [  i386-driverkit  ]\n"
-                                           "install-name: Test.dylib\n"
-                                           "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv4i386DriverKit, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V4, File->getFileType());
-  EXPECT_EQ(ArchitectureSet(AK_i386), File->getArchitectures());
-  EXPECT_EQ(File->getPlatforms().size(), 1U);
-  EXPECT_EQ(PlatformKind::driverKit, *File->getPlatforms().begin());
-
-  SmallString<4096> Buffer;
-  raw_svector_ostream OS(Buffer);
-  Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
-  EXPECT_TRUE(!WriteResult);
-  EXPECT_EQ(stripWhitespace(TBDv4i386DriverKit),
-            stripWhitespace(Buffer.c_str()));
-}
-
-TEST(TBDv4, Swift_1) {
-  static const char TBDv4SwiftVersion1[] = "--- !tapi-tbd\n"
-                                           "tbd-version: 4\n"
-                                           "targets: [  x86_64-macos ]\n"
-                                           "install-name: Test.dylib\n"
-                                           "swift-abi-version: 1\n"
-                                           "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv4SwiftVersion1, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V4, File->getFileType());
-  EXPECT_EQ(1U, File->getSwiftABIVersion());
-
-  // No writer test because we emit "swift-abi-version:1.0".
-}
-
-TEST(TBDv4, Swift_2) {
-  static const char TBDv4Swift2[] = "--- !tapi-tbd\n"
-                                    "tbd-version: 4\n"
-                                    "targets: [  x86_64-macos ]\n"
-                                    "install-name: Test.dylib\n"
-                                    "swift-abi-version: 2\n"
-                                    "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv4Swift2, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V4, File->getFileType());
-  EXPECT_EQ(2U, File->getSwiftABIVersion());
-
-  // No writer test because we emit "swift-abi-version:2.0".
-}
-
-TEST(TBDv4, Swift_5) {
-  static const char TBDv4SwiftVersion5[] = "--- !tapi-tbd\n"
-                                           "tbd-version: 4\n"
-                                           "targets: [  x86_64-macos ]\n"
-                                           "install-name: Test.dylib\n"
-                                           "swift-abi-version: 5\n"
-                                           "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv4SwiftVersion5, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V4, File->getFileType());
-  EXPECT_EQ(5U, File->getSwiftABIVersion());
-
-  SmallString<4096> Buffer;
-  raw_svector_ostream OS(Buffer);
-  Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
-  EXPECT_TRUE(!WriteResult);
-  EXPECT_EQ(stripWhitespace(TBDv4SwiftVersion5),
-            stripWhitespace(Buffer.c_str()));
-}
-
-TEST(TBDv4, Swift_99) {
-  static const char TBDv4SwiftVersion99[] = "--- !tapi-tbd\n"
-                                            "tbd-version: 4\n"
-                                            "targets: [  x86_64-macos ]\n"
-                                            "install-name: Test.dylib\n"
-                                            "swift-abi-version: 99\n"
-                                            "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv4SwiftVersion99, "Test.tbd"));
-  EXPECT_TRUE(!!Result);
-  TBDFile File = std::move(Result.get());
-  EXPECT_EQ(FileType::TBD_V4, File->getFileType());
-  EXPECT_EQ(99U, File->getSwiftABIVersion());
-
-  SmallString<4096> Buffer;
-  raw_svector_ostream OS(Buffer);
-  Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
-  EXPECT_TRUE(!WriteResult);
-  EXPECT_EQ(stripWhitespace(TBDv4SwiftVersion99),
-            stripWhitespace(Buffer.c_str()));
-}
-
-TEST(TBDv4, InvalidArchitecture) {
-  static const char TBDv4UnknownArch[] = "--- !tapi-tbd\n"
-                                         "tbd-version: 4\n"
-                                         "targets: [ foo-macos ]\n"
-                                         "install-name: Test.dylib\n"
-                                         "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv4UnknownArch, "Test.tbd"));
-  EXPECT_FALSE(!!Result);
-  std::string ErrorMessage = toString(Result.takeError());
-  EXPECT_EQ("malformed file\nTest.tbd:3:12: error: unknown "
-            "architecture\ntargets: [ foo-macos ]\n"
-            "           ^~~~~~~~~~\n",
-            ErrorMessage);
-}
-
-TEST(TBDv4, InvalidPlatform) {
-  static const char TBDv4FInvalidPlatform[] = "--- !tapi-tbd\n"
-                                              "tbd-version: 4\n"
-                                              "targets: [ x86_64-maos ]\n"
-                                              "install-name: Test.dylib\n"
-                                              "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv4FInvalidPlatform, "Test.tbd"));
-  EXPECT_FALSE(!!Result);
-  std::string ErrorMessage = toString(Result.takeError());
-  EXPECT_EQ("malformed file\nTest.tbd:3:12: error: unknown platform\ntargets: "
-            "[ x86_64-maos ]\n"
-            "           ^~~~~~~~~~~~\n",
-            ErrorMessage);
-}
-
-TEST(TBDv4, MalformedFile1) {
-  static const char TBDv4MalformedFile1[] = "--- !tapi-tbd\n"
-                                            "tbd-version: 4\n"
-                                            "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv4MalformedFile1, "Test.tbd"));
-  EXPECT_FALSE(!!Result);
-  std::string ErrorMessage = toString(Result.takeError());
-  ASSERT_EQ("malformed file\nTest.tbd:2:1: error: missing required key "
-            "'targets'\ntbd-version: 4\n^\n",
-            ErrorMessage);
-}
-
-TEST(TBDv4, MalformedFile2) {
-  static const char TBDv4MalformedFile2[] = "--- !tapi-tbd\n"
-                                            "tbd-version: 4\n"
-                                            "targets: [ x86_64-macos ]\n"
-                                            "install-name: Test.dylib\n"
-                                            "foobar: \"unsupported key\"\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv4MalformedFile2, "Test.tbd"));
-  EXPECT_FALSE(!!Result);
-  std::string ErrorMessage = toString(Result.takeError());
-  ASSERT_EQ(
-      "malformed file\nTest.tbd:5:1: error: unknown key 'foobar'\nfoobar: "
-      "\"unsupported key\"\n^~~~~~\n",
-      ErrorMessage);
-}
-
-TEST(TBDv4, MalformedFile3) {
-  static const char TBDv4MalformedSwift[] = "--- !tapi-tbd\n"
-                                            "tbd-version: 4\n"
-                                            "targets: [  x86_64-macos ]\n"
-                                            "install-name: Test.dylib\n"
-                                            "swift-abi-version: 1.1\n"
-                                            "...\n";
-
-  Expected<TBDFile> Result =
-      TextAPIReader::get(MemoryBufferRef(TBDv4MalformedSwift, "Test.tbd"));
-  EXPECT_FALSE(!!Result);
-  std::string ErrorMessage = toString(Result.takeError());
-  EXPECT_EQ("malformed file\nTest.tbd:5:20: error: invalid Swift ABI "
-            "version.\nswift-abi-version: 1.1\n                   ^~~\n",
-            ErrorMessage);
-}
-
-TEST(TBDv4, InterfaceEquality) {
-  static const char TBDv4File[] =
-      "--- !tapi-tbd\n"
-      "tbd-version: 4\n"
-      "targets:  [ i386-macos, x86_64-macos, x86_64-ios ]\n"
-      "uuids:\n"
-      "  - target: i386-macos\n"
-      "    value: 00000000-0000-0000-0000-000000000000\n"
-      "  - target: x86_64-macos\n"
-      "    value: 11111111-1111-1111-1111-111111111111\n"
-      "  - target: x86_64-ios\n"
-      "    value: 11111111-1111-1111-1111-111111111111\n"
-      "flags: [ flat_namespace, installapi ]\n"
-      "install-name: Umbrella.framework/Umbrella\n"
-      "current-version: 1.2.3\n"
-      "compatibility-version: 1.2\n"
-      "swift-abi-version: 5\n"
-      "parent-umbrella:\n"
-      "  - targets: [ i386-macos, x86_64-macos, x86_64-ios ]\n"
-      "    umbrella: System\n"
-      "allowable-clients:\n"
-      "  - targets: [ i386-macos, x86_64-macos, x86_64-ios ]\n"
-      "    clients: [ ClientA ]\n"
-      "reexported-libraries:\n"
-      "  - targets: [ i386-macos ]\n"
-      "    libraries: [ /System/Library/Frameworks/A.framework/A ]\n"
-      "exports:\n"
-      "  - targets: [ i386-macos ]\n"
-      "    symbols: [ _symA ]\n"
-      "    objc-classes: []\n"
-      "    objc-eh-types: []\n"
-      "    objc-ivars: []\n"
-      "    weak-symbols: []\n"
-      "    thread-local-symbols: []\n"
-      "  - targets: [ x86_64-ios ]\n"
-      "    symbols: [_symB]\n"
-      "  - targets: [ x86_64-macos, x86_64-ios ]\n"
-      "    symbols: [_symAB]\n"
-      "reexports:\n"
-      "  - targets: [ i386-macos ]\n"
-      "    symbols: [_symC]\n"
-      "    objc-classes: []\n"
-      "    objc-eh-types: []\n"
-      "    objc-ivars: []\n"
-      "    weak-symbols: []\n"
-      "    thread-local-symbols: []\n"
-      "undefineds:\n"
-      "  - targets: [ i386-macos ]\n"
-      "    symbols: [ _symD ]\n"
-      "    objc-classes: []\n"
-      "    objc-eh-types: []\n"
-      "    objc-ivars: []\n"
-      "    weak-symbols: []\n"
-      "    thread-local-symbols: []\n"
-      "tbd-version:     4\n"
-      "targets:         [ i386-maccatalyst, x86_64-maccatalyst ]\n"
-      "uuids:\n"
-      "  - target:          i386-maccatalyst\n"
-      "    value:           00000000-0000-0000-0000-000000000000\n"
-      "  - target:          x86_64-maccatalyst\n"
-      "    value:           11111111-1111-1111-1111-111111111111\n"
-      "install-name:    '/System/Library/Frameworks/A.framework/A'\n"
-      "exports:\n"
-      "  - targets:         [ i386-maccatalyst ]\n"
-      "    weak-symbols:    [ _symC ]\n"
-      "  - targets:         [ i386-maccatalyst, x86_64-maccatalyst ]\n"
-      "    symbols:         [ _symA ]\n"
-      "    objc-classes:    [ Class1 ]\n"
-      "  - targets:         [ x86_64-maccatalyst ]\n"
-      "    symbols:         [ _symAB ]\n"
-      "...\n";
-
-  Expected<TBDFile> ResultA =
-      TextAPIReader::get(MemoryBufferRef(TBDv4File, "TestA.tbd"));
-  EXPECT_TRUE(!!ResultA);
-  InterfaceFile FileA = std::move(*ResultA.get());
-  Expected<TBDFile> ResultB =
-      TextAPIReader::get(MemoryBufferRef(TBDv4File, "TestB.tbd"));
-  EXPECT_TRUE(!!ResultB);
-  InterfaceFile FileB = std::move(*ResultB.get());
-  EXPECT_TRUE(FileA == FileB);
-}
-
-TEST(TBDv4, InterfaceDiffVersionsEquality) {
-  static const char TBDv4File[] =
-      "--- !tapi-tbd\n"
-      "tbd-version: 4\n"
-      "targets:  [ i386-macos, x86_64-macos ]\n"
-      "uuids:\n"
-      "  - target: i386-macos\n"
-      "    value: 00000000-0000-0000-0000-000000000000\n"
-      "  - target: x86_64-macos\n"
-      "    value: 11111111-1111-1111-1111-111111111111\n"
-      "flags: [ installapi ]\n"
-      "install-name: Umbrella.framework/Umbrella\n"
-      "current-version: 1.2.3\n"
-      "compatibility-version: 1.0\n"
-      "swift-abi-version: 5\n"
-      "parent-umbrella:\n"
-      "  - targets: [ i386-macos, x86_64-macos ]\n"
-      "    umbrella: System\n"
-      "allowable-clients:\n"
-      "  - targets: [ i386-macos, x86_64-macos ]\n"
-      "    clients: [ ClientA ]\n"
-      "reexported-libraries:\n"
-      "  - targets: [ i386-macos ]\n"
-      "    libraries: [ /System/Library/Frameworks/A.framework/A ]\n"
-      "exports:\n"
-      "  - targets: [ i386-macos ]\n"
-      "    symbols: [ _sym5 ]\n"
-      "    objc-classes: [ class3]\n"
-      "    objc-eh-types: []\n"
-      "    objc-ivars: [ class1._ivar3 ]\n"
-      "    weak-symbols: [ _weak3 ]\n"
-      "  - targets: [ x86_64-macos ]\n"
-      "    symbols: [_symAB]\n"
-      "  - targets: [ i386-macos, x86_64-macos ]\n"
-      "    symbols: [_symA]\n"
-      "    objc-classes: [ class1, class2 ]\n"
-      "    objc-eh-types: [ class1 ]\n"
-      "    objc-ivars: [ class1._ivar1, class1._ivar2 ]\n"
-      "    weak-symbols: [ _weak1, _weak2 ]\n"
-      "    thread-local-symbols: [ _tlv1, _tlv3 ]\n"
-      "undefineds:\n"
-      "  - targets: [ i386-macos ]\n"
-      "    symbols: [ _symC ]\n"
-      "    objc-classes: []\n"
-      "    objc-eh-types: []\n"
-      "    objc-ivars: []\n"
-      "    weak-symbols: []\n"
-      "    thread-local-symbols: []\n"
-      "...\n";
-
-  static const char TBDv3File[] =
-      "--- !tapi-tbd-v3\n"
-      "archs: [ i386, x86_64 ]\n"
-      "uuids: [ 'i386: 00000000-0000-0000-0000-000000000000',\n"
-      "         'x86_64: 22222222-2222-2222-2222-222222222222']\n"
-      "platform: macosx\n"
-      "flags: [ installapi ]\n"
-      "install-name: Umbrella.framework/Umbrella\n"
-      "current-version: 1.2.3\n"
-      "compatibility-version: 1.0\n"
-      "swift-abi-version: 5\n"
-      "parent-umbrella: System\n"
-      "exports:\n"
-      "  - archs: [ i386, x86_64 ]\n"
-      "    allowable-clients: [ ClientA ]\n"
-      "    symbols: [ _symA ]\n"
-      "    objc-classes: [ class1, class2 ]\n"
-      "    objc-eh-types: [ class1 ]\n"
-      "    objc-ivars: [ class1._ivar1, class1._ivar2 ]\n"
-      "    weak-def-symbols: [ _weak1, _weak2 ]\n"
-      "    thread-local-symbols: [ _tlv1, _tlv3 ]\n"
-      "  - archs: [ i386 ]\n"
-      "    re-exports: [ /System/Library/Frameworks/A.framework/A ]\n"
-      "    symbols: [ _sym5 ]\n"
-      "    objc-classes: [ class3 ]\n"
-      "    objc-ivars: [ class1._ivar3 ]\n"
-      "    weak-def-symbols: [ _weak3 ]\n"
-      "  - archs: [ x86_64 ]\n"
-      "    symbols: [ _symAB ]\n"
-      "undefineds:\n"
-      "  - archs: [ i386 ]\n"
-      "    symbols: [ _symC ]\n"
-      "...\n";
-
-  Expected<TBDFile> ResultA =
-      TextAPIReader::get(MemoryBufferRef(TBDv4File, "TestA.tbd"));
-  EXPECT_TRUE(!!ResultA);
-  InterfaceFile FileA = std::move(*ResultA.get());
-  Expected<TBDFile> ResultB =
-      TextAPIReader::get(MemoryBufferRef(TBDv3File, "TestB.tbd"));
-  EXPECT_TRUE(!!ResultB);
-  InterfaceFile FileB = std::move(*ResultB.get());
-  EXPECT_NE(FileA.uuids(), FileB.uuids());
-  EXPECT_TRUE(FileA == FileB);
-}
-
-TEST(TBDv4, InterfaceInequality) {
-  static const char TBDv4File[] = "--- !tapi-tbd\n"
-                                  "tbd-version: 4\n"
-                                  "targets:  [ i386-macos, x86_64-macos ]\n"
-                                  "install-name: Umbrella.framework/Umbrella\n"
-                                  "...\n";
-
-  Expected<TBDFile> ResultA =
-      TextAPIReader::get(MemoryBufferRef(TBDv4File, "TestA.tbd"));
-  EXPECT_TRUE(!!ResultA);
-  InterfaceFile FileA = std::move(*ResultA.get());
-  Expected<TBDFile> ResultB =
-      TextAPIReader::get(MemoryBufferRef(TBDv4File, "TestB.tbd"));
-  EXPECT_TRUE(!!ResultB);
-  InterfaceFile FileB = std::move(*ResultB.get());
-
-  EXPECT_TRUE(checkEqualityOnTransform(FileA, FileB, [](InterfaceFile *File) {
-    File->addTarget(Target(AK_x86_64, PlatformKind::iOS));
-  }));
-  EXPECT_TRUE(checkEqualityOnTransform(FileA, FileB, [](InterfaceFile *File) {
-    File->setCurrentVersion(PackedVersion(1, 2, 3));
-    File->setCompatibilityVersion(PackedVersion(1, 0, 0));
-  }));
-  EXPECT_TRUE(checkEqualityOnTransform(
-      FileA, FileB, [](InterfaceFile *File) { File->setSwiftABIVersion(5); }));
-  EXPECT_TRUE(checkEqualityOnTransform(FileA, FileB, [](InterfaceFile *File) {
-    File->setTwoLevelNamespace(false);
-  }));
-  EXPECT_TRUE(checkEqualityOnTransform(
-      FileA, FileB, [](InterfaceFile *File) { File->setInstallAPI(true); }));
-  EXPECT_TRUE(checkEqualityOnTransform(FileA, FileB, [](InterfaceFile *File) {
-    File->setApplicationExtensionSafe(false);
-  }));
-  EXPECT_TRUE(checkEqualityOnTransform(FileA, FileB, [](InterfaceFile *File) {
-    File->addParentUmbrella(Target(AK_x86_64, PlatformKind::macOS), "System.dylib");
-  }));
-  EXPECT_TRUE(checkEqualityOnTransform(FileA, FileB, [](InterfaceFile *File) {
-    File->addAllowableClient("ClientA", Target(AK_i386, PlatformKind::macOS));
-  }));
-  EXPECT_TRUE(checkEqualityOnTransform(FileA, FileB, [](InterfaceFile *File) {
-    File->addReexportedLibrary("/System/Library/Frameworks/A.framework/A",
-                               Target(AK_i386, PlatformKind::macOS));
-  }));
-  EXPECT_TRUE(checkEqualityOnTransform(FileA, FileB, [](InterfaceFile *File) {
-    File->addSymbol(SymbolKind::GlobalSymbol, "_symA", {Target(AK_x86_64, PlatformKind::macOS)});
-  }));
-  EXPECT_TRUE(checkEqualityOnTransform(FileA, FileB, [](InterfaceFile *File) {
-    InterfaceFile Document;
-    Document.addTargets(TargetList {Target(AK_i386, PlatformKind::macOS),
-                      Target(AK_x86_64, PlatformKind::macOS)});
-    Document.setInstallName("/System/Library/Frameworks/A.framework/A");
-    File->addDocument(std::make_shared<InterfaceFile>(std::move(Document)));
-  }));
-}
-
-} // end namespace TBDv4
diff --git a/gnu/llvm/llvm/unittests/Transforms/CMakeLists.txt b/gnu/llvm/llvm/unittests/Transforms/CMakeLists.txt
deleted file mode 100644
index b7f1817849a..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-add_subdirectory(IPO)
-add_subdirectory(Scalar)
-add_subdirectory(Utils)
-add_subdirectory(Vectorize)
diff --git a/gnu/llvm/llvm/unittests/Transforms/IPO/AttributorTest.cpp b/gnu/llvm/llvm/unittests/Transforms/IPO/AttributorTest.cpp
deleted file mode 100644
index 51de06c6d5e..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/IPO/AttributorTest.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-//===- AttributorTest.cpp - Attributor unit tests ------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===---------------------------------------------------------------------===//
-
-#include "llvm/Transforms/IPO/Attributor.h"
-#include "AttributorTestBase.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Analysis/CGSCCPassManager.h"
-#include "llvm/Analysis/CallGraphSCCPass.h"
-#include "llvm/Analysis/LoopAnalysisManager.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/Support/Allocator.h"
-#include "llvm/Testing/Support/Error.h"
-#include "llvm/Transforms/Utils/CallGraphUpdater.h"
-#include "gtest/gtest.h"
-#include <memory>
-
-namespace llvm {
-
-TEST_F(AttributorTestBase, IRPPositionCallBaseContext) {
-  const char *ModuleString = R"(
-    define i32 @foo(i32 %a) {
-    entry:
-      ret i32 %a
-    }
-  )";
-
-  parseModule(ModuleString);
-
-  Function *F = M->getFunction("foo");
-  IRPosition Pos =
-      IRPosition::function(*F, (const llvm::CallBase *)(uintptr_t)0xDEADBEEF);
-  EXPECT_TRUE(Pos.hasCallBaseContext());
-  EXPECT_FALSE(Pos.stripCallBaseContext().hasCallBaseContext());
-}
-
-TEST_F(AttributorTestBase, TestCast) {
-  const char *ModuleString = R"(
-    define i32 @foo(i32 %a, i32 %b) {
-    entry:
-      %c = add i32 %a, %b
-      ret i32 %c
-    }
-  )";
-
-  Module &M = parseModule(ModuleString);
-
-  SetVector<Function *> Functions;
-  AnalysisGetter AG;
-  for (Function &F : M)
-    Functions.insert(&F);
-
-  CallGraphUpdater CGUpdater;
-  BumpPtrAllocator Allocator;
-  InformationCache InfoCache(M, AG, Allocator, nullptr);
-  Attributor A(Functions, InfoCache, CGUpdater);
-
-  Function *F = M.getFunction("foo");
-
-  const AbstractAttribute *AA =
-      &A.getOrCreateAAFor<AAIsDead>(IRPosition::function(*F));
-
-  EXPECT_TRUE(AA);
-
-  const auto *SFail = dyn_cast<AAAlign>(AA);
-  const auto *SSucc = dyn_cast<AAIsDead>(AA);
-
-  ASSERT_EQ(SFail, nullptr);
-  ASSERT_TRUE(SSucc);
-}
-
-TEST_F(AttributorTestBase, AAReachabilityTest) {
-  const char *ModuleString = R"(
-    @x = global i32 0
-    define void @func4() {
-      store i32 0, i32* @x
-      ret void
-    }
-
-    define void @func3() {
-      store i32 0, i32* @x
-      ret void
-    }
-
-    define void @func2() {
-    entry:
-      call void @func3()
-      ret void
-    }
-
-    define void @func1() {
-    entry:
-      call void @func2()
-      ret void
-    }
-
-    define void @func5(void ()* %unknown) {
-    entry:
-      call void %unknown()
-      ret void
-    }
-
-    define void @func6() {
-    entry:
-      call void @func5(void ()* @func3)
-      ret void
-    }
-  )";
-
-  Module &M = parseModule(ModuleString);
-
-  SetVector<Function *> Functions;
-  AnalysisGetter AG;
-  for (Function &F : M)
-    Functions.insert(&F);
-
-  CallGraphUpdater CGUpdater;
-  BumpPtrAllocator Allocator;
-  InformationCache InfoCache(M, AG, Allocator, nullptr);
-  Attributor A(Functions, InfoCache, CGUpdater);
-
-  Function *F1 = M.getFunction("func1");
-  Function *F3 = M.getFunction("func3");
-  Function *F4 = M.getFunction("func4");
-  Function *F6 = M.getFunction("func6");
-
-  const AAFunctionReachability &F1AA =
-      A.getOrCreateAAFor<AAFunctionReachability>(IRPosition::function(*F1));
-
-  const AAFunctionReachability &F6AA =
-      A.getOrCreateAAFor<AAFunctionReachability>(IRPosition::function(*F6));
-
-  F1AA.canReach(A, F3);
-  F1AA.canReach(A, F4);
-  F6AA.canReach(A, F4);
-
-  A.run();
-
-  ASSERT_TRUE(F1AA.canReach(A, F3));
-  ASSERT_FALSE(F1AA.canReach(A, F4));
-
-  // Assumed to be reacahable, since F6 can reach a function with
-  // a unknown callee.
-  ASSERT_TRUE(F6AA.canReach(A, F4));
-}
-
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/Transforms/IPO/AttributorTestBase.h b/gnu/llvm/llvm/unittests/Transforms/IPO/AttributorTestBase.h
deleted file mode 100644
index 9220b60c497..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/IPO/AttributorTestBase.h
+++ /dev/null
@@ -1,48 +0,0 @@
-//===- llvm/unittest/Transforms/IPO/AttributorTestBase.h -----------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-/// \file
-/// This file defines an AttributorTestBase class, which provides helpers to
-/// parse a LLVM IR string and create Attributor
-//===----------------------------------------------------------------------===//
-#ifndef LLVM_UNITTESTS_TRANSFORMS_ATTRIBUTOR_TESTBASE_H
-#define LLVM_UNITTESTS_TRANSFORMS_ATTRIBUTOR_TESTBASE_H
-
-#include "llvm/Analysis/CGSCCPassManager.h"
-#include "llvm/Analysis/CallGraphSCCPass.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/PassManager.h"
-#include "llvm/Support/Allocator.h"
-#include "llvm/Support/SourceMgr.h"
-#include "llvm/Testing/Support/Error.h"
-#include "llvm/Transforms/IPO/Attributor.h"
-#include "llvm/Transforms/Utils/CallGraphUpdater.h"
-#include "gtest/gtest.h"
-#include <memory>
-
-namespace llvm {
-
-/// Helper class to create a module from assembly string and an Attributor
-class AttributorTestBase : public testing::Test {
-protected:
-  std::unique_ptr<LLVMContext> Ctx;
-  std::unique_ptr<Module> M;
-
-  AttributorTestBase() : Ctx(new LLVMContext) {}
-
-  Module &parseModule(const char *ModuleString) {
-    SMDiagnostic Err;
-    M = parseAssemblyString(ModuleString, Err, *Ctx);
-    EXPECT_TRUE(M);
-    return *M;
-  }
-};
-
-} // namespace llvm
-
-#endif
\ No newline at end of file
diff --git a/gnu/llvm/llvm/unittests/Transforms/IPO/CMakeLists.txt b/gnu/llvm/llvm/unittests/Transforms/IPO/CMakeLists.txt
deleted file mode 100644
index 0e95518093a..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/IPO/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  Analysis
-  AsmParser
-  Core
-  IPO
-  Support
-  TransformUtils
-  )
-
-add_llvm_unittest(IPOTests
-  LowerTypeTests.cpp
-  WholeProgramDevirt.cpp
-  AttributorTest.cpp
-  )
diff --git a/gnu/llvm/llvm/unittests/Transforms/IPO/LowerTypeTests.cpp b/gnu/llvm/llvm/unittests/Transforms/IPO/LowerTypeTests.cpp
deleted file mode 100644
index ba13378099e..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/IPO/LowerTypeTests.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-//===- LowerTypeTests.cpp - Unit tests for type test lowering -------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Transforms/IPO/LowerTypeTests.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace lowertypetests;
-
-TEST(LowerTypeTests, BitSetBuilder) {
-  struct {
-    std::vector<uint64_t> Offsets;
-    std::set<uint64_t> Bits;
-    uint64_t ByteOffset;
-    uint64_t BitSize;
-    unsigned AlignLog2;
-    bool IsSingleOffset;
-    bool IsAllOnes;
-  } BSBTests[] = {
-      {{}, std::set<uint64_t>{}, 0, 1, 0, false, false},
-      {{0}, {0}, 0, 1, 0, true, true},
-      {{4}, {0}, 4, 1, 0, true, true},
-      {{37}, {0}, 37, 1, 0, true, true},
-      {{0, 1}, {0, 1}, 0, 2, 0, false, true},
-      {{0, 4}, {0, 1}, 0, 2, 2, false, true},
-      {{0, uint64_t(1) << 33}, {0, 1}, 0, 2, 33, false, true},
-      {{3, 7}, {0, 1}, 3, 2, 2, false, true},
-      {{0, 1, 7}, {0, 1, 7}, 0, 8, 0, false, false},
-      {{0, 2, 14}, {0, 1, 7}, 0, 8, 1, false, false},
-      {{0, 1, 8}, {0, 1, 8}, 0, 9, 0, false, false},
-      {{0, 2, 16}, {0, 1, 8}, 0, 9, 1, false, false},
-      {{0, 1, 2, 3, 4, 5, 6, 7},
-       {0, 1, 2, 3, 4, 5, 6, 7},
-       0,
-       8,
-       0,
-       false,
-       true},
-      {{0, 1, 2, 3, 4, 5, 6, 7, 8},
-       {0, 1, 2, 3, 4, 5, 6, 7, 8},
-       0,
-       9,
-       0,
-       false,
-       true},
-  };
-
-  for (auto &&T : BSBTests) {
-    BitSetBuilder BSB;
-    for (auto Offset : T.Offsets)
-      BSB.addOffset(Offset);
-
-    BitSetInfo BSI = BSB.build();
-
-    EXPECT_EQ(T.Bits, BSI.Bits);
-    EXPECT_EQ(T.ByteOffset, BSI.ByteOffset);
-    EXPECT_EQ(T.BitSize, BSI.BitSize);
-    EXPECT_EQ(T.AlignLog2, BSI.AlignLog2);
-    EXPECT_EQ(T.IsSingleOffset, BSI.isSingleOffset());
-    EXPECT_EQ(T.IsAllOnes, BSI.isAllOnes());
-
-    for (auto Offset : T.Offsets)
-      EXPECT_TRUE(BSI.containsGlobalOffset(Offset));
-
-    auto I = T.Offsets.begin();
-    for (uint64_t NonOffset = 0; NonOffset != 256; ++NonOffset) {
-      if (I != T.Offsets.end() && *I == NonOffset) {
-        ++I;
-        continue;
-      }
-
-      EXPECT_FALSE(BSI.containsGlobalOffset(NonOffset));
-    }
-  }
-}
-
-TEST(LowerTypeTests, GlobalLayoutBuilder) {
-  struct {
-    uint64_t NumObjects;
-    std::vector<std::set<uint64_t>> Fragments;
-    std::vector<uint64_t> WantLayout;
-  } GLBTests[] = {
-    {0, {}, {}},
-    {4, {{0, 1}, {2, 3}}, {0, 1, 2, 3}},
-    {3, {{0, 1}, {1, 2}}, {0, 1, 2}},
-    {4, {{0, 1}, {1, 2}, {2, 3}}, {0, 1, 2, 3}},
-    {4, {{0, 1}, {2, 3}, {1, 2}}, {0, 1, 2, 3}},
-    {6, {{2, 5}, {0, 1, 2, 3, 4, 5}}, {0, 1, 2, 5, 3, 4}},
-  };
-
-  for (auto &&T : GLBTests) {
-    GlobalLayoutBuilder GLB(T.NumObjects);
-    for (auto &&F : T.Fragments)
-      GLB.addFragment(F);
-
-    std::vector<uint64_t> ComputedLayout;
-    for (auto &&F : GLB.Fragments)
-      ComputedLayout.insert(ComputedLayout.end(), F.begin(), F.end());
-
-    EXPECT_EQ(T.WantLayout, ComputedLayout);
-  }
-}
-
-TEST(LowerTypeTests, ByteArrayBuilder) {
-  struct BABAlloc {
-    std::set<uint64_t> Bits;
-    uint64_t BitSize;
-    uint64_t WantByteOffset;
-    uint8_t WantMask;
-  };
-
-  struct {
-    std::vector<BABAlloc> Allocs;
-    std::vector<uint8_t> WantBytes;
-  } BABTests[] = {
-      {{{{0}, 1, 0, 1}, {{0}, 1, 0, 2}}, {3}},
-      {{{{0}, 16, 0, 1},
-        {{1}, 15, 0, 2},
-        {{2}, 14, 0, 4},
-        {{3}, 13, 0, 8},
-        {{4}, 12, 0, 0x10},
-        {{5}, 11, 0, 0x20},
-        {{6}, 10, 0, 0x40},
-        {{7}, 9, 0, 0x80},
-        {{0}, 7, 9, 0x80},
-        {{0}, 6, 10, 0x40},
-        {{0}, 5, 11, 0x20},
-        {{0}, 4, 12, 0x10},
-        {{0}, 3, 13, 8},
-        {{0}, 2, 14, 4},
-        {{0}, 1, 15, 2}},
-       {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80, 0, 0x80, 0x40, 0x20, 0x10, 8, 4,
-        2}},
-  };
-
-  for (auto &&T : BABTests) {
-    ByteArrayBuilder BABuilder;
-
-    for (auto &&A : T.Allocs) {
-      uint64_t GotByteOffset;
-      uint8_t GotMask;
-
-      BABuilder.allocate(A.Bits, A.BitSize, GotByteOffset, GotMask);
-      EXPECT_EQ(A.WantByteOffset, GotByteOffset);
-      EXPECT_EQ(A.WantMask, GotMask);
-    }
-
-    EXPECT_EQ(T.WantBytes, BABuilder.Bytes);
-  }
-}
diff --git a/gnu/llvm/llvm/unittests/Transforms/IPO/WholeProgramDevirt.cpp b/gnu/llvm/llvm/unittests/Transforms/IPO/WholeProgramDevirt.cpp
deleted file mode 100644
index 8fae05bef2a..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/IPO/WholeProgramDevirt.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-//===- WholeProgramDevirt.cpp - Unit tests for whole-program devirt -------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Transforms/IPO/WholeProgramDevirt.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace wholeprogramdevirt;
-
-TEST(WholeProgramDevirt, findLowestOffset) {
-  VTableBits VT1;
-  VT1.ObjectSize = 8;
-  VT1.Before.BytesUsed = {1 << 0};
-  VT1.After.BytesUsed = {1 << 1};
-
-  VTableBits VT2;
-  VT2.ObjectSize = 8;
-  VT2.Before.BytesUsed = {1 << 1};
-  VT2.After.BytesUsed = {1 << 0};
-
-  TypeMemberInfo TM1{&VT1, 0};
-  TypeMemberInfo TM2{&VT2, 0};
-  VirtualCallTarget Targets[] = {
-    {&TM1, /*IsBigEndian=*/false},
-    {&TM2, /*IsBigEndian=*/false},
-  };
-
-  EXPECT_EQ(2ull, findLowestOffset(Targets, /*IsAfter=*/false, 1));
-  EXPECT_EQ(66ull, findLowestOffset(Targets, /*IsAfter=*/true, 1));
-
-  EXPECT_EQ(8ull, findLowestOffset(Targets, /*IsAfter=*/false, 8));
-  EXPECT_EQ(72ull, findLowestOffset(Targets, /*IsAfter=*/true, 8));
-
-  TM1.Offset = 4;
-  EXPECT_EQ(33ull, findLowestOffset(Targets, /*IsAfter=*/false, 1));
-  EXPECT_EQ(65ull, findLowestOffset(Targets, /*IsAfter=*/true, 1));
-
-  EXPECT_EQ(40ull, findLowestOffset(Targets, /*IsAfter=*/false, 8));
-  EXPECT_EQ(72ull, findLowestOffset(Targets, /*IsAfter=*/true, 8));
-
-  TM1.Offset = 8;
-  TM2.Offset = 8;
-  EXPECT_EQ(66ull, findLowestOffset(Targets, /*IsAfter=*/false, 1));
-  EXPECT_EQ(2ull, findLowestOffset(Targets, /*IsAfter=*/true, 1));
-
-  EXPECT_EQ(72ull, findLowestOffset(Targets, /*IsAfter=*/false, 8));
-  EXPECT_EQ(8ull, findLowestOffset(Targets, /*IsAfter=*/true, 8));
-
-  VT1.After.BytesUsed = {0xff, 0, 0, 0, 0xff};
-  VT2.After.BytesUsed = {0xff, 1, 0, 0, 0};
-  EXPECT_EQ(16ull, findLowestOffset(Targets, /*IsAfter=*/true, 16));
-  EXPECT_EQ(40ull, findLowestOffset(Targets, /*IsAfter=*/true, 32));
-}
-
-TEST(WholeProgramDevirt, setReturnValues) {
-  VTableBits VT1;
-  VT1.ObjectSize = 8;
-
-  VTableBits VT2;
-  VT2.ObjectSize = 8;
-
-  TypeMemberInfo TM1{&VT1, 0};
-  TypeMemberInfo TM2{&VT2, 0};
-  VirtualCallTarget Targets[] = {
-    {&TM1, /*IsBigEndian=*/false},
-    {&TM2, /*IsBigEndian=*/false},
-  };
-
-  TM1.Offset = 4;
-  TM2.Offset = 4;
-
-  int64_t OffsetByte;
-  uint64_t OffsetBit;
-
-  Targets[0].RetVal = 1;
-  Targets[1].RetVal = 0;
-  setBeforeReturnValues(Targets, 32, 1, OffsetByte, OffsetBit);
-  EXPECT_EQ(-5ll, OffsetByte);
-  EXPECT_EQ(0ull, OffsetBit);
-  EXPECT_EQ(std::vector<uint8_t>{1}, VT1.Before.Bytes);
-  EXPECT_EQ(std::vector<uint8_t>{1}, VT1.Before.BytesUsed);
-  EXPECT_EQ(std::vector<uint8_t>{0}, VT2.Before.Bytes);
-  EXPECT_EQ(std::vector<uint8_t>{1}, VT2.Before.BytesUsed);
-
-  Targets[0].RetVal = 0;
-  Targets[1].RetVal = 1;
-  setBeforeReturnValues(Targets, 39, 1, OffsetByte, OffsetBit);
-  EXPECT_EQ(-5ll, OffsetByte);
-  EXPECT_EQ(7ull, OffsetBit);
-  EXPECT_EQ(std::vector<uint8_t>{1}, VT1.Before.Bytes);
-  EXPECT_EQ(std::vector<uint8_t>{0x81}, VT1.Before.BytesUsed);
-  EXPECT_EQ(std::vector<uint8_t>{0x80}, VT2.Before.Bytes);
-  EXPECT_EQ(std::vector<uint8_t>{0x81}, VT2.Before.BytesUsed);
-
-  Targets[0].RetVal = 12;
-  Targets[1].RetVal = 34;
-  setBeforeReturnValues(Targets, 40, 8, OffsetByte, OffsetBit);
-  EXPECT_EQ(-6ll, OffsetByte);
-  EXPECT_EQ(0ull, OffsetBit);
-  EXPECT_EQ((std::vector<uint8_t>{1, 12}), VT1.Before.Bytes);
-  EXPECT_EQ((std::vector<uint8_t>{0x81, 0xff}), VT1.Before.BytesUsed);
-  EXPECT_EQ((std::vector<uint8_t>{0x80, 34}), VT2.Before.Bytes);
-  EXPECT_EQ((std::vector<uint8_t>{0x81, 0xff}), VT2.Before.BytesUsed);
-
-  Targets[0].RetVal = 56;
-  Targets[1].RetVal = 78;
-  setBeforeReturnValues(Targets, 48, 16, OffsetByte, OffsetBit);
-  EXPECT_EQ(-8ll, OffsetByte);
-  EXPECT_EQ(0ull, OffsetBit);
-  EXPECT_EQ((std::vector<uint8_t>{1, 12, 0, 56}), VT1.Before.Bytes);
-  EXPECT_EQ((std::vector<uint8_t>{0x81, 0xff, 0xff, 0xff}),
-            VT1.Before.BytesUsed);
-  EXPECT_EQ((std::vector<uint8_t>{0x80, 34, 0, 78}), VT2.Before.Bytes);
-  EXPECT_EQ((std::vector<uint8_t>{0x81, 0xff, 0xff, 0xff}),
-            VT2.Before.BytesUsed);
-
-  Targets[0].RetVal = 1;
-  Targets[1].RetVal = 0;
-  setAfterReturnValues(Targets, 32, 1, OffsetByte, OffsetBit);
-  EXPECT_EQ(4ll, OffsetByte);
-  EXPECT_EQ(0ull, OffsetBit);
-  EXPECT_EQ(std::vector<uint8_t>{1}, VT1.After.Bytes);
-  EXPECT_EQ(std::vector<uint8_t>{1}, VT1.After.BytesUsed);
-  EXPECT_EQ(std::vector<uint8_t>{0}, VT2.After.Bytes);
-  EXPECT_EQ(std::vector<uint8_t>{1}, VT2.After.BytesUsed);
-
-  Targets[0].RetVal = 0;
-  Targets[1].RetVal = 1;
-  setAfterReturnValues(Targets, 39, 1, OffsetByte, OffsetBit);
-  EXPECT_EQ(4ll, OffsetByte);
-  EXPECT_EQ(7ull, OffsetBit);
-  EXPECT_EQ(std::vector<uint8_t>{1}, VT1.After.Bytes);
-  EXPECT_EQ(std::vector<uint8_t>{0x81}, VT1.After.BytesUsed);
-  EXPECT_EQ(std::vector<uint8_t>{0x80}, VT2.After.Bytes);
-  EXPECT_EQ(std::vector<uint8_t>{0x81}, VT2.After.BytesUsed);
-
-  Targets[0].RetVal = 12;
-  Targets[1].RetVal = 34;
-  setAfterReturnValues(Targets, 40, 8, OffsetByte, OffsetBit);
-  EXPECT_EQ(5ll, OffsetByte);
-  EXPECT_EQ(0ull, OffsetBit);
-  EXPECT_EQ((std::vector<uint8_t>{1, 12}), VT1.After.Bytes);
-  EXPECT_EQ((std::vector<uint8_t>{0x81, 0xff}), VT1.After.BytesUsed);
-  EXPECT_EQ((std::vector<uint8_t>{0x80, 34}), VT2.After.Bytes);
-  EXPECT_EQ((std::vector<uint8_t>{0x81, 0xff}), VT2.After.BytesUsed);
-
-  Targets[0].RetVal = 56;
-  Targets[1].RetVal = 78;
-  setAfterReturnValues(Targets, 48, 16, OffsetByte, OffsetBit);
-  EXPECT_EQ(6ll, OffsetByte);
-  EXPECT_EQ(0ull, OffsetBit);
-  EXPECT_EQ((std::vector<uint8_t>{1, 12, 56, 0}), VT1.After.Bytes);
-  EXPECT_EQ((std::vector<uint8_t>{0x81, 0xff, 0xff, 0xff}),
-            VT1.After.BytesUsed);
-  EXPECT_EQ((std::vector<uint8_t>{0x80, 34, 78, 0}), VT2.After.Bytes);
-  EXPECT_EQ((std::vector<uint8_t>{0x81, 0xff, 0xff, 0xff}),
-            VT2.After.BytesUsed);
-}
diff --git a/gnu/llvm/llvm/unittests/Transforms/Scalar/CMakeLists.txt b/gnu/llvm/llvm/unittests/Transforms/Scalar/CMakeLists.txt
deleted file mode 100644
index eaa2c4eb27a..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/Scalar/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  Analysis
-  AsmParser
-  Core
-  Passes
-  Support
-  ScalarOpts
-  TransformUtils
-  )
-
-add_llvm_unittest(ScalarTests
-  LICMTest.cpp
-  LoopPassManagerTest.cpp
-  )
-
-target_link_libraries(ScalarTests PRIVATE LLVMTestingSupport)
-
-# Workaround for the gcc 6.1 bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80916.
-if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
-  set_source_files_properties(LoopPassManagerTest.cpp PROPERTIES COMPILE_FLAGS -Wno-unused-function)
-endif()
diff --git a/gnu/llvm/llvm/unittests/Transforms/Scalar/LICMTest.cpp b/gnu/llvm/llvm/unittests/Transforms/Scalar/LICMTest.cpp
deleted file mode 100644
index 3063785332b..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/Scalar/LICMTest.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-//===- LICMTest.cpp - LICM unit tests -------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/ScalarEvolution.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Passes/PassBuilder.h"
-#include "llvm/Support/SourceMgr.h"
-#include "llvm/Testing/Support/Error.h"
-#include "llvm/Transforms/Scalar/LICM.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-
-TEST(LICMTest, TestSCEVInvalidationOnHoisting) {
-  LLVMContext Ctx;
-  ModulePassManager MPM;
-  PassBuilder PB;
-  LoopAnalysisManager LAM;
-  FunctionAnalysisManager FAM;
-  CGSCCAnalysisManager CGAM;
-  ModuleAnalysisManager MAM;
-
-  PB.registerModuleAnalyses(MAM);
-  PB.registerCGSCCAnalyses(CGAM);
-  PB.registerFunctionAnalyses(FAM);
-  PB.registerLoopAnalyses(LAM);
-  PB.crossRegisterProxies(LAM, FAM, CGAM, MAM);
-
-  StringRef PipelineStr = "require<opt-remark-emit>,loop(licm)";
-  ASSERT_THAT_ERROR(PB.parsePassPipeline(MPM, PipelineStr), Succeeded());
-
-  SMDiagnostic Error;
-  StringRef Text = R"(
-    define void @foo(i64* %ptr) {
-    entry:
-      br label %loop
-
-    loop:
-      %iv = phi i64 [ 0, %entry ], [ %iv.inc, %loop ]
-      %n = load i64, i64* %ptr, !invariant.load !0
-      %iv.inc = add i64 %iv, 1
-      %cmp = icmp ult i64 %iv.inc, %n
-      br i1 %cmp, label %loop, label %exit
-
-    exit:
-      ret void
-    }
-
-    !0 = !{}
-  )";
-
-  std::unique_ptr<Module> M = parseAssemblyString(Text, Error, Ctx);
-  ASSERT_TRUE(M);
-  Function *F = M->getFunction("foo");
-  ScalarEvolution &SE = FAM.getResult<ScalarEvolutionAnalysis>(*F);
-  BasicBlock &EntryBB = F->getEntryBlock();
-  BasicBlock *LoopBB = EntryBB.getUniqueSuccessor();
-
-  // Select `load i64, i64* %ptr`.
-  Instruction *IBefore = LoopBB->getFirstNonPHI();
-  // Make sure the right instruction was selected.
-  ASSERT_TRUE(isa<LoadInst>(IBefore));
-  // Upon this query SCEV caches disposition of <load i64, i64* %ptr> SCEV.
-  ASSERT_EQ(SE.getBlockDisposition(SE.getSCEV(IBefore), LoopBB),
-            ScalarEvolution::BlockDisposition::DominatesBlock);
-
-  MPM.run(*M, MAM);
-
-  // Select `load i64, i64* %ptr` after it was hoisted.
-  Instruction *IAfter = EntryBB.getFirstNonPHI();
-  // Make sure the right instruction was selected.
-  ASSERT_TRUE(isa<LoadInst>(IAfter));
-
-  ScalarEvolution::BlockDisposition DispositionBeforeInvalidation =
-      SE.getBlockDisposition(SE.getSCEV(IAfter), LoopBB);
-  SE.forgetValue(IAfter);
-  ScalarEvolution::BlockDisposition DispositionAfterInvalidation =
-      SE.getBlockDisposition(SE.getSCEV(IAfter), LoopBB);
-
-  // If LICM have properly invalidated SCEV,
-  //   1. SCEV of <load i64, i64* %ptr> should properly dominate the "loop" BB,
-  //   2. extra invalidation shouldn't change result of the query.
-  EXPECT_EQ(DispositionBeforeInvalidation,
-            ScalarEvolution::BlockDisposition::ProperlyDominatesBlock);
-  EXPECT_EQ(DispositionBeforeInvalidation, DispositionAfterInvalidation);
-}
-}
diff --git a/gnu/llvm/llvm/unittests/Transforms/Scalar/LoopPassManagerTest.cpp b/gnu/llvm/llvm/unittests/Transforms/Scalar/LoopPassManagerTest.cpp
deleted file mode 100644
index db631c221e5..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/Scalar/LoopPassManagerTest.cpp
+++ /dev/null
@@ -1,1668 +0,0 @@
-//===- llvm/unittest/Analysis/LoopPassManagerTest.cpp - LPM tests ---------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Transforms/Scalar/LoopPassManager.h"
-#include "llvm/Analysis/AliasAnalysis.h"
-#include "llvm/Analysis/AssumptionCache.h"
-#include "llvm/Analysis/BlockFrequencyInfo.h"
-#include "llvm/Analysis/BranchProbabilityInfo.h"
-#include "llvm/Analysis/MemorySSA.h"
-#include "llvm/Analysis/PostDominators.h"
-#include "llvm/Analysis/ScalarEvolution.h"
-#include "llvm/Analysis/TargetLibraryInfo.h"
-#include "llvm/Analysis/TargetTransformInfo.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Dominators.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/PassManager.h"
-#include "llvm/Support/SourceMgr.h"
-
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-using testing::DoDefault;
-using testing::Return;
-using testing::Expectation;
-using testing::Invoke;
-using testing::InvokeWithoutArgs;
-using testing::_;
-
-template <typename DerivedT, typename IRUnitT,
-          typename AnalysisManagerT = AnalysisManager<IRUnitT>,
-          typename... ExtraArgTs>
-class MockAnalysisHandleBase {
-public:
-  class Analysis : public AnalysisInfoMixin<Analysis> {
-    friend AnalysisInfoMixin<Analysis>;
-    friend MockAnalysisHandleBase;
-    static AnalysisKey Key;
-
-    DerivedT *Handle;
-
-    Analysis(DerivedT &Handle) : Handle(&Handle) {
-      static_assert(std::is_base_of<MockAnalysisHandleBase, DerivedT>::value,
-                    "Must pass the derived type to this template!");
-    }
-
-  public:
-    class Result {
-      friend MockAnalysisHandleBase;
-
-      DerivedT *Handle;
-
-      Result(DerivedT &Handle) : Handle(&Handle) {}
-
-    public:
-      // Forward invalidation events to the mock handle.
-      bool invalidate(IRUnitT &IR, const PreservedAnalyses &PA,
-                      typename AnalysisManagerT::Invalidator &Inv) {
-        return Handle->invalidate(IR, PA, Inv);
-      }
-    };
-
-    Result run(IRUnitT &IR, AnalysisManagerT &AM, ExtraArgTs... ExtraArgs) {
-      return Handle->run(IR, AM, ExtraArgs...);
-    }
-  };
-
-  Analysis getAnalysis() { return Analysis(static_cast<DerivedT &>(*this)); }
-  typename Analysis::Result getResult() {
-    return typename Analysis::Result(static_cast<DerivedT &>(*this));
-  }
-
-protected:
-  // FIXME: MSVC seems unable to handle a lambda argument to Invoke from within
-  // the template, so we use a boring static function.
-  static bool invalidateCallback(IRUnitT &IR, const PreservedAnalyses &PA,
-                                 typename AnalysisManagerT::Invalidator &Inv) {
-    auto PAC = PA.template getChecker<Analysis>();
-    return !PAC.preserved() &&
-           !PAC.template preservedSet<AllAnalysesOn<IRUnitT>>();
-  }
-
-  /// Derived classes should call this in their constructor to set up default
-  /// mock actions. (We can't do this in our constructor because this has to
-  /// run after the DerivedT is constructed.)
-  void setDefaults() {
-    ON_CALL(static_cast<DerivedT &>(*this),
-            run(_, _, testing::Matcher<ExtraArgTs>(_)...))
-        .WillByDefault(Return(this->getResult()));
-    ON_CALL(static_cast<DerivedT &>(*this), invalidate(_, _, _))
-        .WillByDefault(Invoke(&invalidateCallback));
-  }
-};
-
-template <typename DerivedT, typename IRUnitT, typename AnalysisManagerT,
-          typename... ExtraArgTs>
-AnalysisKey MockAnalysisHandleBase<DerivedT, IRUnitT, AnalysisManagerT,
-                                   ExtraArgTs...>::Analysis::Key;
-
-/// Mock handle for loop analyses.
-///
-/// This is provided as a template accepting an (optional) integer. Because
-/// analyses are identified and queried by type, this allows constructing
-/// multiple handles with distinctly typed nested 'Analysis' types that can be
-/// registered and queried. If you want to register multiple loop analysis
-/// passes, you'll need to instantiate this type with different values for I.
-/// For example:
-///
-///   MockLoopAnalysisHandleTemplate<0> h0;
-///   MockLoopAnalysisHandleTemplate<1> h1;
-///   typedef decltype(h0)::Analysis Analysis0;
-///   typedef decltype(h1)::Analysis Analysis1;
-template <size_t I = static_cast<size_t>(-1)>
-struct MockLoopAnalysisHandleTemplate
-    : MockAnalysisHandleBase<MockLoopAnalysisHandleTemplate<I>, Loop,
-                             LoopAnalysisManager,
-                             LoopStandardAnalysisResults &> {
-  typedef typename MockLoopAnalysisHandleTemplate::Analysis Analysis;
-
-  MOCK_METHOD3_T(run, typename Analysis::Result(Loop &, LoopAnalysisManager &,
-                                                LoopStandardAnalysisResults &));
-
-  MOCK_METHOD3_T(invalidate, bool(Loop &, const PreservedAnalyses &,
-                                  LoopAnalysisManager::Invalidator &));
-
-  MockLoopAnalysisHandleTemplate() { this->setDefaults(); }
-};
-
-typedef MockLoopAnalysisHandleTemplate<> MockLoopAnalysisHandle;
-
-struct MockFunctionAnalysisHandle
-    : MockAnalysisHandleBase<MockFunctionAnalysisHandle, Function> {
-  MOCK_METHOD2(run, Analysis::Result(Function &, FunctionAnalysisManager &));
-
-  MOCK_METHOD3(invalidate, bool(Function &, const PreservedAnalyses &,
-                                FunctionAnalysisManager::Invalidator &));
-
-  MockFunctionAnalysisHandle() { setDefaults(); }
-};
-
-template <typename DerivedT, typename IRUnitT,
-          typename AnalysisManagerT = AnalysisManager<IRUnitT>,
-          typename... ExtraArgTs>
-class MockPassHandleBase {
-public:
-  class Pass : public PassInfoMixin<Pass> {
-    friend MockPassHandleBase;
-
-    DerivedT *Handle;
-
-    Pass(DerivedT &Handle) : Handle(&Handle) {
-      static_assert(std::is_base_of<MockPassHandleBase, DerivedT>::value,
-                    "Must pass the derived type to this template!");
-    }
-
-  public:
-    PreservedAnalyses run(IRUnitT &IR, AnalysisManagerT &AM,
-                          ExtraArgTs... ExtraArgs) {
-      return Handle->run(IR, AM, ExtraArgs...);
-    }
-  };
-
-  Pass getPass() { return Pass(static_cast<DerivedT &>(*this)); }
-
-protected:
-  /// Derived classes should call this in their constructor to set up default
-  /// mock actions. (We can't do this in our constructor because this has to
-  /// run after the DerivedT is constructed.)
-  void setDefaults() {
-    ON_CALL(static_cast<DerivedT &>(*this),
-            run(_, _, testing::Matcher<ExtraArgTs>(_)...))
-        .WillByDefault(Return(PreservedAnalyses::all()));
-  }
-};
-
-struct MockLoopPassHandle
-    : MockPassHandleBase<MockLoopPassHandle, Loop, LoopAnalysisManager,
-                         LoopStandardAnalysisResults &, LPMUpdater &> {
-  MOCK_METHOD4(run,
-               PreservedAnalyses(Loop &, LoopAnalysisManager &,
-                                 LoopStandardAnalysisResults &, LPMUpdater &));
-  MockLoopPassHandle() { setDefaults(); }
-};
-
-struct MockLoopNestPassHandle
-    : MockPassHandleBase<MockLoopNestPassHandle, LoopNest, LoopAnalysisManager,
-                         LoopStandardAnalysisResults &, LPMUpdater &> {
-  MOCK_METHOD4(run,
-               PreservedAnalyses(LoopNest &, LoopAnalysisManager &,
-                                 LoopStandardAnalysisResults &, LPMUpdater &));
-
-  MockLoopNestPassHandle() { setDefaults(); }
-};
-
-struct MockFunctionPassHandle
-    : MockPassHandleBase<MockFunctionPassHandle, Function> {
-  MOCK_METHOD2(run, PreservedAnalyses(Function &, FunctionAnalysisManager &));
-
-  MockFunctionPassHandle() { setDefaults(); }
-};
-
-struct MockModulePassHandle : MockPassHandleBase<MockModulePassHandle, Module> {
-  MOCK_METHOD2(run, PreservedAnalyses(Module &, ModuleAnalysisManager &));
-
-  MockModulePassHandle() { setDefaults(); }
-};
-
-/// Define a custom matcher for objects which support a 'getName' method
-/// returning a StringRef.
-///
-/// LLVM often has IR objects or analysis objects which expose a StringRef name
-/// and in tests it is convenient to match these by name for readability. This
-/// matcher supports any type exposing a getName() method of this form.
-///
-/// It should be used as:
-///
-///   HasName("my_function")
-///
-/// No namespace or other qualification is required.
-MATCHER_P(HasName, Name, "") {
-  // The matcher's name and argument are printed in the case of failure, but we
-  // also want to print out the name of the argument. This uses an implicitly
-  // avaiable std::ostream, so we have to construct a std::string.
-  *result_listener << "has name '" << arg.getName().str() << "'";
-  return Name == arg.getName();
-}
-
-std::unique_ptr<Module> parseIR(LLVMContext &C, const char *IR) {
-  SMDiagnostic Err;
-  return parseAssemblyString(IR, Err, C);
-}
-
-class LoopPassManagerTest : public ::testing::Test {
-protected:
-  LLVMContext Context;
-  std::unique_ptr<Module> M;
-
-  LoopAnalysisManager LAM;
-  FunctionAnalysisManager FAM;
-  ModuleAnalysisManager MAM;
-
-  MockLoopAnalysisHandle MLAHandle;
-  MockLoopPassHandle MLPHandle;
-  MockLoopNestPassHandle MLNPHandle;
-  MockFunctionPassHandle MFPHandle;
-  MockModulePassHandle MMPHandle;
-
-  static PreservedAnalyses
-  getLoopAnalysisResult(Loop &L, LoopAnalysisManager &AM,
-                        LoopStandardAnalysisResults &AR, LPMUpdater &) {
-    (void)AM.getResult<MockLoopAnalysisHandle::Analysis>(L, AR);
-    return PreservedAnalyses::all();
-  };
-
-public:
-  LoopPassManagerTest()
-      : M(parseIR(Context,
-                  "define void @f(i1* %ptr) {\n"
-                  "entry:\n"
-                  "  br label %loop.0\n"
-                  "loop.0:\n"
-                  "  %cond.0 = load volatile i1, i1* %ptr\n"
-                  "  br i1 %cond.0, label %loop.0.0.ph, label %end\n"
-                  "loop.0.0.ph:\n"
-                  "  br label %loop.0.0\n"
-                  "loop.0.0:\n"
-                  "  %cond.0.0 = load volatile i1, i1* %ptr\n"
-                  "  br i1 %cond.0.0, label %loop.0.0, label %loop.0.1.ph\n"
-                  "loop.0.1.ph:\n"
-                  "  br label %loop.0.1\n"
-                  "loop.0.1:\n"
-                  "  %cond.0.1 = load volatile i1, i1* %ptr\n"
-                  "  br i1 %cond.0.1, label %loop.0.1, label %loop.0.latch\n"
-                  "loop.0.latch:\n"
-                  "  br label %loop.0\n"
-                  "end:\n"
-                  "  ret void\n"
-                  "}\n"
-                  "\n"
-                  "define void @g(i1* %ptr) {\n"
-                  "entry:\n"
-                  "  br label %loop.g.0\n"
-                  "loop.g.0:\n"
-                  "  %cond.0 = load volatile i1, i1* %ptr\n"
-                  "  br i1 %cond.0, label %loop.g.0, label %end\n"
-                  "end:\n"
-                  "  ret void\n"
-                  "}\n")),
-        LAM(), FAM(), MAM() {
-    // Register our mock analysis.
-    LAM.registerPass([&] { return MLAHandle.getAnalysis(); });
-
-    // We need DominatorTreeAnalysis for LoopAnalysis.
-    FAM.registerPass([&] { return DominatorTreeAnalysis(); });
-    FAM.registerPass([&] { return LoopAnalysis(); });
-    // We also allow loop passes to assume a set of other analyses and so need
-    // those.
-    FAM.registerPass([&] { return AAManager(); });
-    FAM.registerPass([&] { return AssumptionAnalysis(); });
-    FAM.registerPass([&] { return BlockFrequencyAnalysis(); });
-    FAM.registerPass([&] { return BranchProbabilityAnalysis(); });
-    FAM.registerPass([&] { return PostDominatorTreeAnalysis(); });
-    FAM.registerPass([&] { return MemorySSAAnalysis(); });
-    FAM.registerPass([&] { return ScalarEvolutionAnalysis(); });
-    FAM.registerPass([&] { return TargetLibraryAnalysis(); });
-    FAM.registerPass([&] { return TargetIRAnalysis(); });
-
-    // Register required pass instrumentation analysis.
-    LAM.registerPass([&] { return PassInstrumentationAnalysis(); });
-    FAM.registerPass([&] { return PassInstrumentationAnalysis(); });
-    MAM.registerPass([&] { return PassInstrumentationAnalysis(); });
-
-    // Cross-register proxies.
-    LAM.registerPass([&] { return FunctionAnalysisManagerLoopProxy(FAM); });
-    FAM.registerPass([&] { return LoopAnalysisManagerFunctionProxy(LAM); });
-    FAM.registerPass([&] { return ModuleAnalysisManagerFunctionProxy(MAM); });
-    MAM.registerPass([&] { return FunctionAnalysisManagerModuleProxy(FAM); });
-  }
-};
-
-TEST_F(LoopPassManagerTest, Basic) {
-  ModulePassManager MPM;
-  ::testing::InSequence MakeExpectationsSequenced;
-
-  // First we just visit all the loops in all the functions and get their
-  // analysis results. This will run the analysis a total of four times,
-  // once for each loop.
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.0"), _, _, _))
-      .WillOnce(Invoke(getLoopAnalysisResult));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.0"), _, _));
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.1"), _, _, _))
-      .WillOnce(Invoke(getLoopAnalysisResult));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.1"), _, _));
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0"), _, _, _))
-      .WillOnce(Invoke(getLoopAnalysisResult));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0"), _, _));
-  EXPECT_CALL(MLPHandle, run(HasName("loop.g.0"), _, _, _))
-      .WillOnce(Invoke(getLoopAnalysisResult));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.g.0"), _, _));
-  // Wire the loop pass through pass managers into the module pipeline.
-  {
-    LoopPassManager LPM;
-    LPM.addPass(MLPHandle.getPass());
-    FunctionPassManager FPM;
-    FPM.addPass(createFunctionToLoopPassAdaptor(std::move(LPM)));
-    MPM.addPass(createModuleToFunctionPassAdaptor(std::move(FPM)));
-  }
-
-  // Next we run two passes over the loops. The first one invalidates the
-  // analyses for one loop, the second ones try to get the analysis results.
-  // This should force only one analysis to re-run within the loop PM, but will
-  // also invalidate everything after the loop pass manager finishes.
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.0"), _, _, _))
-      .WillOnce(DoDefault())
-      .WillOnce(Invoke(getLoopAnalysisResult));
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.1"), _, _, _))
-      .WillOnce(InvokeWithoutArgs([] { return PreservedAnalyses::none(); }))
-      .WillOnce(Invoke(getLoopAnalysisResult));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.1"), _, _));
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0"), _, _, _))
-      .WillOnce(DoDefault())
-      .WillOnce(Invoke(getLoopAnalysisResult));
-  EXPECT_CALL(MLPHandle, run(HasName("loop.g.0"), _, _, _))
-      .WillOnce(DoDefault())
-      .WillOnce(Invoke(getLoopAnalysisResult));
-  // Wire two loop pass runs into the module pipeline.
-  {
-    LoopPassManager LPM;
-    LPM.addPass(MLPHandle.getPass());
-    LPM.addPass(MLPHandle.getPass());
-    FunctionPassManager FPM;
-    FPM.addPass(createFunctionToLoopPassAdaptor(std::move(LPM)));
-    MPM.addPass(createModuleToFunctionPassAdaptor(std::move(FPM)));
-  }
-
-  // And now run the pipeline across the module.
-  MPM.run(*M, MAM);
-}
-
-TEST_F(LoopPassManagerTest, FunctionPassInvalidationOfLoopAnalyses) {
-  ModulePassManager MPM;
-  FunctionPassManager FPM;
-  // We process each function completely in sequence.
-  ::testing::Sequence FSequence, GSequence;
-
-  // First, force the analysis result to be computed for each loop.
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.0"), _, _))
-      .InSequence(FSequence)
-      .WillOnce(DoDefault());
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.1"), _, _))
-      .InSequence(FSequence)
-      .WillOnce(DoDefault());
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0"), _, _))
-      .InSequence(FSequence)
-      .WillOnce(DoDefault());
-  EXPECT_CALL(MLAHandle, run(HasName("loop.g.0"), _, _))
-      .InSequence(GSequence)
-      .WillOnce(DoDefault());
-  FPM.addPass(createFunctionToLoopPassAdaptor(
-      RequireAnalysisLoopPass<MockLoopAnalysisHandle::Analysis>()));
-
-  // No need to re-run if we require again from a fresh loop pass manager.
-  FPM.addPass(createFunctionToLoopPassAdaptor(
-      RequireAnalysisLoopPass<MockLoopAnalysisHandle::Analysis>()));
-  // For 'f', preserve most things but not the specific loop analyses.
-  auto PA = getLoopPassPreservedAnalyses();
-  if (EnableMSSALoopDependency)
-    PA.preserve<MemorySSAAnalysis>();
-  EXPECT_CALL(MFPHandle, run(HasName("f"), _))
-      .InSequence(FSequence)
-      .WillOnce(Return(PA));
-  EXPECT_CALL(MLAHandle, invalidate(HasName("loop.0.0"), _, _))
-      .InSequence(FSequence)
-      .WillOnce(DoDefault());
-  // On one loop, skip the invalidation (as though we did an internal update).
-  EXPECT_CALL(MLAHandle, invalidate(HasName("loop.0.1"), _, _))
-      .InSequence(FSequence)
-      .WillOnce(Return(false));
-  EXPECT_CALL(MLAHandle, invalidate(HasName("loop.0"), _, _))
-      .InSequence(FSequence)
-      .WillOnce(DoDefault());
-  // Now two loops still have to be recomputed.
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.0"), _, _))
-      .InSequence(FSequence)
-      .WillOnce(DoDefault());
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0"), _, _))
-      .InSequence(FSequence)
-      .WillOnce(DoDefault());
-  // Preserve things in the second function to ensure invalidation remains
-  // isolated to one function.
-  EXPECT_CALL(MFPHandle, run(HasName("g"), _))
-      .InSequence(GSequence)
-      .WillOnce(DoDefault());
-  FPM.addPass(MFPHandle.getPass());
-  FPM.addPass(createFunctionToLoopPassAdaptor(
-      RequireAnalysisLoopPass<MockLoopAnalysisHandle::Analysis>()));
-
-  EXPECT_CALL(MFPHandle, run(HasName("f"), _))
-      .InSequence(FSequence)
-      .WillOnce(DoDefault());
-  // For 'g', fail to preserve anything, causing the loops themselves to be
-  // cleared. We don't get an invalidation event here as the loop is gone, but
-  // we should still have to recompute the analysis.
-  EXPECT_CALL(MFPHandle, run(HasName("g"), _))
-      .InSequence(GSequence)
-      .WillOnce(Return(PreservedAnalyses::none()));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.g.0"), _, _))
-      .InSequence(GSequence)
-      .WillOnce(DoDefault());
-  FPM.addPass(MFPHandle.getPass());
-  FPM.addPass(createFunctionToLoopPassAdaptor(
-      RequireAnalysisLoopPass<MockLoopAnalysisHandle::Analysis>()));
-
-  MPM.addPass(createModuleToFunctionPassAdaptor(std::move(FPM)));
-
-  // Verify with a separate function pass run that we didn't mess up 'f's
-  // cache. No analysis runs should be necessary here.
-  MPM.addPass(createModuleToFunctionPassAdaptor(createFunctionToLoopPassAdaptor(
-      RequireAnalysisLoopPass<MockLoopAnalysisHandle::Analysis>())));
-
-  MPM.run(*M, MAM);
-}
-
-TEST_F(LoopPassManagerTest, ModulePassInvalidationOfLoopAnalyses) {
-  ModulePassManager MPM;
-  ::testing::InSequence MakeExpectationsSequenced;
-
-  // First, force the analysis result to be computed for each loop.
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.0"), _, _));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.1"), _, _));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0"), _, _));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.g.0"), _, _));
-  MPM.addPass(createModuleToFunctionPassAdaptor(createFunctionToLoopPassAdaptor(
-      RequireAnalysisLoopPass<MockLoopAnalysisHandle::Analysis>())));
-
-  // Walking all the way out and all the way back in doesn't re-run the
-  // analysis.
-  MPM.addPass(createModuleToFunctionPassAdaptor(createFunctionToLoopPassAdaptor(
-      RequireAnalysisLoopPass<MockLoopAnalysisHandle::Analysis>())));
-
-  // But a module pass that doesn't preserve the actual mock loop analysis
-  // invalidates all the way down and forces recomputing.
-  EXPECT_CALL(MMPHandle, run(_, _)).WillOnce(InvokeWithoutArgs([] {
-    auto PA = getLoopPassPreservedAnalyses();
-    PA.preserve<FunctionAnalysisManagerModuleProxy>();
-    if (EnableMSSALoopDependency)
-      PA.preserve<MemorySSAAnalysis>();
-    return PA;
-  }));
-  // All the loop analyses from both functions get invalidated before we
-  // recompute anything.
-  EXPECT_CALL(MLAHandle, invalidate(HasName("loop.0.0"), _, _));
-  // On one loop, again skip the invalidation (as though we did an internal
-  // update).
-  EXPECT_CALL(MLAHandle, invalidate(HasName("loop.0.1"), _, _))
-      .WillOnce(Return(false));
-  EXPECT_CALL(MLAHandle, invalidate(HasName("loop.0"), _, _));
-  EXPECT_CALL(MLAHandle, invalidate(HasName("loop.g.0"), _, _));
-  // Now all but one of the loops gets re-analyzed.
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.0"), _, _));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0"), _, _));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.g.0"), _, _));
-  MPM.addPass(MMPHandle.getPass());
-  MPM.addPass(createModuleToFunctionPassAdaptor(createFunctionToLoopPassAdaptor(
-      RequireAnalysisLoopPass<MockLoopAnalysisHandle::Analysis>())));
-
-  // Verify that the cached values persist.
-  MPM.addPass(createModuleToFunctionPassAdaptor(createFunctionToLoopPassAdaptor(
-      RequireAnalysisLoopPass<MockLoopAnalysisHandle::Analysis>())));
-
-  // Now we fail to preserve the loop analysis and observe that the loop
-  // analyses are cleared (so no invalidation event) as the loops themselves
-  // are no longer valid.
-  EXPECT_CALL(MMPHandle, run(_, _)).WillOnce(InvokeWithoutArgs([] {
-    auto PA = PreservedAnalyses::none();
-    PA.preserve<FunctionAnalysisManagerModuleProxy>();
-    return PA;
-  }));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.0"), _, _));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.1"), _, _));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0"), _, _));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.g.0"), _, _));
-  MPM.addPass(MMPHandle.getPass());
-  MPM.addPass(createModuleToFunctionPassAdaptor(createFunctionToLoopPassAdaptor(
-      RequireAnalysisLoopPass<MockLoopAnalysisHandle::Analysis>())));
-
-  // Verify that the cached values persist.
-  MPM.addPass(createModuleToFunctionPassAdaptor(createFunctionToLoopPassAdaptor(
-      RequireAnalysisLoopPass<MockLoopAnalysisHandle::Analysis>())));
-
-  // Next, check that even if we preserve everything within the function itelf,
-  // if the function's module pass proxy isn't preserved and the potential set
-  // of functions changes, the clear reaches the loop analyses as well. This
-  // will again trigger re-runs but not invalidation events.
-  EXPECT_CALL(MMPHandle, run(_, _)).WillOnce(InvokeWithoutArgs([] {
-    auto PA = PreservedAnalyses::none();
-    PA.preserveSet<AllAnalysesOn<Function>>();
-    PA.preserveSet<AllAnalysesOn<Loop>>();
-    return PA;
-  }));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.0"), _, _));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.1"), _, _));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0"), _, _));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.g.0"), _, _));
-  MPM.addPass(MMPHandle.getPass());
-  MPM.addPass(createModuleToFunctionPassAdaptor(createFunctionToLoopPassAdaptor(
-      RequireAnalysisLoopPass<MockLoopAnalysisHandle::Analysis>())));
-
-  MPM.run(*M, MAM);
-}
-
-// Test that if any of the bundled analyses provided in the LPM's signature
-// become invalid, the analysis proxy itself becomes invalid and we clear all
-// loop analysis results.
-TEST_F(LoopPassManagerTest, InvalidationOfBundledAnalyses) {
-  ModulePassManager MPM;
-  FunctionPassManager FPM;
-  ::testing::InSequence MakeExpectationsSequenced;
-
-  // First, force the analysis result to be computed for each loop.
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.0"), _, _));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.1"), _, _));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0"), _, _));
-  FPM.addPass(createFunctionToLoopPassAdaptor(
-      RequireAnalysisLoopPass<MockLoopAnalysisHandle::Analysis>()));
-
-  // No need to re-run if we require again from a fresh loop pass manager.
-  FPM.addPass(createFunctionToLoopPassAdaptor(
-      RequireAnalysisLoopPass<MockLoopAnalysisHandle::Analysis>()));
-
-  // Preserving everything but the loop analyses themselves results in
-  // invalidation and running.
-  EXPECT_CALL(MFPHandle, run(HasName("f"), _))
-      .WillOnce(Return(getLoopPassPreservedAnalyses()));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.0"), _, _));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.1"), _, _));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0"), _, _));
-  FPM.addPass(MFPHandle.getPass());
-  FPM.addPass(createFunctionToLoopPassAdaptor(
-      RequireAnalysisLoopPass<MockLoopAnalysisHandle::Analysis>()));
-
-  // The rest don't invalidate analyses, they only trigger re-runs because we
-  // clear the cache completely.
-  EXPECT_CALL(MFPHandle, run(HasName("f"), _)).WillOnce(InvokeWithoutArgs([] {
-    auto PA = PreservedAnalyses::none();
-    // Not preserving `AAManager`.
-    PA.preserve<DominatorTreeAnalysis>();
-    PA.preserve<LoopAnalysis>();
-    PA.preserve<LoopAnalysisManagerFunctionProxy>();
-    PA.preserve<ScalarEvolutionAnalysis>();
-    return PA;
-  }));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.0"), _, _));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.1"), _, _));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0"), _, _));
-  FPM.addPass(MFPHandle.getPass());
-  FPM.addPass(createFunctionToLoopPassAdaptor(
-      RequireAnalysisLoopPass<MockLoopAnalysisHandle::Analysis>()));
-
-  EXPECT_CALL(MFPHandle, run(HasName("f"), _)).WillOnce(InvokeWithoutArgs([] {
-    auto PA = PreservedAnalyses::none();
-    // Not preserving `DominatorTreeAnalysis`.
-    PA.preserve<LoopAnalysis>();
-    PA.preserve<LoopAnalysisManagerFunctionProxy>();
-    PA.preserve<ScalarEvolutionAnalysis>();
-    return PA;
-  }));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.0"), _, _));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.1"), _, _));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0"), _, _));
-  FPM.addPass(MFPHandle.getPass());
-  FPM.addPass(createFunctionToLoopPassAdaptor(
-      RequireAnalysisLoopPass<MockLoopAnalysisHandle::Analysis>()));
-
-  EXPECT_CALL(MFPHandle, run(HasName("f"), _)).WillOnce(InvokeWithoutArgs([] {
-    auto PA = PreservedAnalyses::none();
-    PA.preserve<DominatorTreeAnalysis>();
-    // Not preserving the `LoopAnalysis`.
-    PA.preserve<LoopAnalysisManagerFunctionProxy>();
-    PA.preserve<ScalarEvolutionAnalysis>();
-    return PA;
-  }));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.0"), _, _));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.1"), _, _));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0"), _, _));
-  FPM.addPass(MFPHandle.getPass());
-  FPM.addPass(createFunctionToLoopPassAdaptor(
-      RequireAnalysisLoopPass<MockLoopAnalysisHandle::Analysis>()));
-
-  EXPECT_CALL(MFPHandle, run(HasName("f"), _)).WillOnce(InvokeWithoutArgs([] {
-    auto PA = PreservedAnalyses::none();
-    PA.preserve<DominatorTreeAnalysis>();
-    PA.preserve<LoopAnalysis>();
-    // Not preserving the `LoopAnalysisManagerFunctionProxy`.
-    PA.preserve<ScalarEvolutionAnalysis>();
-    return PA;
-  }));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.0"), _, _));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.1"), _, _));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0"), _, _));
-  FPM.addPass(MFPHandle.getPass());
-  FPM.addPass(createFunctionToLoopPassAdaptor(
-      RequireAnalysisLoopPass<MockLoopAnalysisHandle::Analysis>()));
-
-  EXPECT_CALL(MFPHandle, run(HasName("f"), _)).WillOnce(InvokeWithoutArgs([] {
-    auto PA = PreservedAnalyses::none();
-    PA.preserve<DominatorTreeAnalysis>();
-    PA.preserve<LoopAnalysis>();
-    PA.preserve<LoopAnalysisManagerFunctionProxy>();
-    // Not preserving `ScalarEvolutionAnalysis`.
-    return PA;
-  }));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.0"), _, _));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.1"), _, _));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0"), _, _));
-  FPM.addPass(MFPHandle.getPass());
-  FPM.addPass(createFunctionToLoopPassAdaptor(
-      RequireAnalysisLoopPass<MockLoopAnalysisHandle::Analysis>()));
-
-  // After all the churn on 'f', we'll compute the loop analysis results for
-  // 'g' once with a requires pass and then run our mock pass over g a bunch
-  // but just get cached results each time.
-  EXPECT_CALL(MLAHandle, run(HasName("loop.g.0"), _, _));
-  EXPECT_CALL(MFPHandle, run(HasName("g"), _)).Times(6);
-
-  MPM.addPass(createModuleToFunctionPassAdaptor(std::move(FPM)));
-  MPM.run(*M, MAM);
-}
-
-TEST_F(LoopPassManagerTest, IndirectInvalidation) {
-  // We need two distinct analysis types and handles.
-  enum { A, B };
-  MockLoopAnalysisHandleTemplate<A> MLAHandleA;
-  MockLoopAnalysisHandleTemplate<B> MLAHandleB;
-  LAM.registerPass([&] { return MLAHandleA.getAnalysis(); });
-  LAM.registerPass([&] { return MLAHandleB.getAnalysis(); });
-  typedef decltype(MLAHandleA)::Analysis AnalysisA;
-  typedef decltype(MLAHandleB)::Analysis AnalysisB;
-
-  // Set up AnalysisA to depend on our AnalysisB. For testing purposes we just
-  // need to get the AnalysisB results in AnalysisA's run method and check if
-  // AnalysisB gets invalidated in AnalysisA's invalidate method.
-  ON_CALL(MLAHandleA, run(_, _, _))
-      .WillByDefault(Invoke([&](Loop &L, LoopAnalysisManager &AM,
-                                LoopStandardAnalysisResults &AR) {
-        (void)AM.getResult<AnalysisB>(L, AR);
-        return MLAHandleA.getResult();
-      }));
-  ON_CALL(MLAHandleA, invalidate(_, _, _))
-      .WillByDefault(Invoke([](Loop &L, const PreservedAnalyses &PA,
-                               LoopAnalysisManager::Invalidator &Inv) {
-        auto PAC = PA.getChecker<AnalysisA>();
-        return !(PAC.preserved() || PAC.preservedSet<AllAnalysesOn<Loop>>()) ||
-               Inv.invalidate<AnalysisB>(L, PA);
-      }));
-
-  ::testing::InSequence MakeExpectationsSequenced;
-
-  // Compute the analyses across all of 'f' first.
-  EXPECT_CALL(MLAHandleA, run(HasName("loop.0.0"), _, _));
-  EXPECT_CALL(MLAHandleB, run(HasName("loop.0.0"), _, _));
-  EXPECT_CALL(MLAHandleA, run(HasName("loop.0.1"), _, _));
-  EXPECT_CALL(MLAHandleB, run(HasName("loop.0.1"), _, _));
-  EXPECT_CALL(MLAHandleA, run(HasName("loop.0"), _, _));
-  EXPECT_CALL(MLAHandleB, run(HasName("loop.0"), _, _));
-
-  // Now we invalidate AnalysisB (but not AnalysisA) for one of the loops and
-  // preserve everything for the rest. This in turn triggers that one loop to
-  // recompute both AnalysisB *and* AnalysisA if indirect invalidation is
-  // working.
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.0"), _, _, _))
-      .WillOnce(InvokeWithoutArgs([] {
-        auto PA = getLoopPassPreservedAnalyses();
-        // Specifically preserve AnalysisA so that it would survive if it
-        // didn't depend on AnalysisB.
-        PA.preserve<AnalysisA>();
-        return PA;
-      }));
-  // It happens that AnalysisB is invalidated first. That shouldn't matter
-  // though, and we should still call AnalysisA's invalidation.
-  EXPECT_CALL(MLAHandleB, invalidate(HasName("loop.0.0"), _, _));
-  EXPECT_CALL(MLAHandleA, invalidate(HasName("loop.0.0"), _, _));
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.0"), _, _, _))
-      .WillOnce(Invoke([](Loop &L, LoopAnalysisManager &AM,
-                          LoopStandardAnalysisResults &AR, LPMUpdater &) {
-        (void)AM.getResult<AnalysisA>(L, AR);
-        return PreservedAnalyses::all();
-      }));
-  EXPECT_CALL(MLAHandleA, run(HasName("loop.0.0"), _, _));
-  EXPECT_CALL(MLAHandleB, run(HasName("loop.0.0"), _, _));
-  // The rest of the loops should run and get cached results.
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.1"), _, _, _))
-      .Times(2)
-      .WillRepeatedly(Invoke([](Loop &L, LoopAnalysisManager &AM,
-                                LoopStandardAnalysisResults &AR, LPMUpdater &) {
-        (void)AM.getResult<AnalysisA>(L, AR);
-        return PreservedAnalyses::all();
-      }));
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0"), _, _, _))
-      .Times(2)
-      .WillRepeatedly(Invoke([](Loop &L, LoopAnalysisManager &AM,
-                                LoopStandardAnalysisResults &AR, LPMUpdater &) {
-        (void)AM.getResult<AnalysisA>(L, AR);
-        return PreservedAnalyses::all();
-      }));
-
-  // The run over 'g' should be boring, with us just computing the analyses once
-  // up front and then running loop passes and getting cached results.
-  EXPECT_CALL(MLAHandleA, run(HasName("loop.g.0"), _, _));
-  EXPECT_CALL(MLAHandleB, run(HasName("loop.g.0"), _, _));
-  EXPECT_CALL(MLPHandle, run(HasName("loop.g.0"), _, _, _))
-      .Times(2)
-      .WillRepeatedly(Invoke([](Loop &L, LoopAnalysisManager &AM,
-                                LoopStandardAnalysisResults &AR, LPMUpdater &) {
-        (void)AM.getResult<AnalysisA>(L, AR);
-        return PreservedAnalyses::all();
-      }));
-
-  // Build the pipeline and run it.
-  ModulePassManager MPM;
-  FunctionPassManager FPM;
-  FPM.addPass(
-      createFunctionToLoopPassAdaptor(RequireAnalysisLoopPass<AnalysisA>()));
-  LoopPassManager LPM;
-  LPM.addPass(MLPHandle.getPass());
-  LPM.addPass(MLPHandle.getPass());
-  FPM.addPass(createFunctionToLoopPassAdaptor(std::move(LPM)));
-  MPM.addPass(createModuleToFunctionPassAdaptor(std::move(FPM)));
-  MPM.run(*M, MAM);
-}
-
-TEST_F(LoopPassManagerTest, IndirectOuterPassInvalidation) {
-  typedef decltype(MLAHandle)::Analysis LoopAnalysis;
-
-  MockFunctionAnalysisHandle MFAHandle;
-  FAM.registerPass([&] { return MFAHandle.getAnalysis(); });
-  typedef decltype(MFAHandle)::Analysis FunctionAnalysis;
-
-  // Set up the loop analysis to depend on both the function and module
-  // analysis.
-  ON_CALL(MLAHandle, run(_, _, _))
-      .WillByDefault(Invoke([&](Loop &L, LoopAnalysisManager &AM,
-                                LoopStandardAnalysisResults &AR) {
-        auto &FAMP = AM.getResult<FunctionAnalysisManagerLoopProxy>(L, AR);
-        Function &F = *L.getHeader()->getParent();
-        // This call will assert when trying to get the actual analysis if the
-        // FunctionAnalysis can be invalidated. Only check its existence.
-        // Alternatively, use FAM above, for the purposes of this unittest.
-        if (FAMP.cachedResultExists<FunctionAnalysis>(F))
-          FAMP.registerOuterAnalysisInvalidation<FunctionAnalysis,
-                                                 LoopAnalysis>();
-        return MLAHandle.getResult();
-      }));
-
-  ::testing::InSequence MakeExpectationsSequenced;
-
-  // Compute the analyses across all of 'f' first.
-  EXPECT_CALL(MFPHandle, run(HasName("f"), _))
-      .WillOnce(Invoke([](Function &F, FunctionAnalysisManager &AM) {
-        // Force the computing of the function analysis so it is available in
-        // this function.
-        (void)AM.getResult<FunctionAnalysis>(F);
-        return PreservedAnalyses::all();
-      }));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.0"), _, _));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.1"), _, _));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0"), _, _));
-
-  // Now invalidate the function analysis but preserve the loop analyses.
-  // This should trigger immediate invalidation of the loop analyses, despite
-  // the fact that they were preserved.
-  EXPECT_CALL(MFPHandle, run(HasName("f"), _)).WillOnce(InvokeWithoutArgs([] {
-    auto PA = getLoopPassPreservedAnalyses();
-    if (EnableMSSALoopDependency)
-      PA.preserve<MemorySSAAnalysis>();
-    PA.preserveSet<AllAnalysesOn<Loop>>();
-    return PA;
-  }));
-  EXPECT_CALL(MLAHandle, invalidate(HasName("loop.0.0"), _, _));
-  EXPECT_CALL(MLAHandle, invalidate(HasName("loop.0.1"), _, _));
-  EXPECT_CALL(MLAHandle, invalidate(HasName("loop.0"), _, _));
-
-  // And re-running a requires pass recomputes them.
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.0"), _, _));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.1"), _, _));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0"), _, _));
-
-  // When we run over 'g' we don't populate the cache with the function
-  // analysis.
-  EXPECT_CALL(MFPHandle, run(HasName("g"), _))
-      .WillOnce(Return(PreservedAnalyses::all()));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.g.0"), _, _));
-
-  // Which means that no extra invalidation occurs and cached values are used.
-  EXPECT_CALL(MFPHandle, run(HasName("g"), _)).WillOnce(InvokeWithoutArgs([] {
-    auto PA = getLoopPassPreservedAnalyses();
-    if (EnableMSSALoopDependency)
-      PA.preserve<MemorySSAAnalysis>();
-    PA.preserveSet<AllAnalysesOn<Loop>>();
-    return PA;
-  }));
-
-  // Build the pipeline and run it.
-  ModulePassManager MPM;
-  FunctionPassManager FPM;
-  FPM.addPass(MFPHandle.getPass());
-  FPM.addPass(
-      createFunctionToLoopPassAdaptor(RequireAnalysisLoopPass<LoopAnalysis>()));
-  FPM.addPass(MFPHandle.getPass());
-  FPM.addPass(
-      createFunctionToLoopPassAdaptor(RequireAnalysisLoopPass<LoopAnalysis>()));
-  MPM.addPass(createModuleToFunctionPassAdaptor(std::move(FPM)));
-  MPM.run(*M, MAM);
-}
-
-TEST_F(LoopPassManagerTest, LoopChildInsertion) {
-  // Super boring module with three loops in a single loop nest.
-  M = parseIR(Context, "define void @f(i1* %ptr) {\n"
-                       "entry:\n"
-                       "  br label %loop.0\n"
-                       "loop.0:\n"
-                       "  %cond.0 = load volatile i1, i1* %ptr\n"
-                       "  br i1 %cond.0, label %loop.0.0.ph, label %end\n"
-                       "loop.0.0.ph:\n"
-                       "  br label %loop.0.0\n"
-                       "loop.0.0:\n"
-                       "  %cond.0.0 = load volatile i1, i1* %ptr\n"
-                       "  br i1 %cond.0.0, label %loop.0.0, label %loop.0.1.ph\n"
-                       "loop.0.1.ph:\n"
-                       "  br label %loop.0.1\n"
-                       "loop.0.1:\n"
-                       "  %cond.0.1 = load volatile i1, i1* %ptr\n"
-                       "  br i1 %cond.0.1, label %loop.0.1, label %loop.0.2.ph\n"
-                       "loop.0.2.ph:\n"
-                       "  br label %loop.0.2\n"
-                       "loop.0.2:\n"
-                       "  %cond.0.2 = load volatile i1, i1* %ptr\n"
-                       "  br i1 %cond.0.2, label %loop.0.2, label %loop.0.latch\n"
-                       "loop.0.latch:\n"
-                       "  br label %loop.0\n"
-                       "end:\n"
-                       "  ret void\n"
-                       "}\n");
-
-  // Build up variables referring into the IR so we can rewrite it below
-  // easily.
-  Function &F = *M->begin();
-  ASSERT_THAT(F, HasName("f"));
-  Argument &Ptr = *F.arg_begin();
-  auto BBI = F.begin();
-  BasicBlock &EntryBB = *BBI++;
-  ASSERT_THAT(EntryBB, HasName("entry"));
-  BasicBlock &Loop0BB = *BBI++;
-  ASSERT_THAT(Loop0BB, HasName("loop.0"));
-  BasicBlock &Loop00PHBB = *BBI++;
-  ASSERT_THAT(Loop00PHBB, HasName("loop.0.0.ph"));
-  BasicBlock &Loop00BB = *BBI++;
-  ASSERT_THAT(Loop00BB, HasName("loop.0.0"));
-  BasicBlock &Loop01PHBB = *BBI++;
-  ASSERT_THAT(Loop01PHBB, HasName("loop.0.1.ph"));
-  BasicBlock &Loop01BB = *BBI++;
-  ASSERT_THAT(Loop01BB, HasName("loop.0.1"));
-  BasicBlock &Loop02PHBB = *BBI++;
-  ASSERT_THAT(Loop02PHBB, HasName("loop.0.2.ph"));
-  BasicBlock &Loop02BB = *BBI++;
-  ASSERT_THAT(Loop02BB, HasName("loop.0.2"));
-  BasicBlock &Loop0LatchBB = *BBI++;
-  ASSERT_THAT(Loop0LatchBB, HasName("loop.0.latch"));
-  BasicBlock &EndBB = *BBI++;
-  ASSERT_THAT(EndBB, HasName("end"));
-  ASSERT_THAT(BBI, F.end());
-  auto CreateCondBr = [&](BasicBlock *TrueBB, BasicBlock *FalseBB,
-                          const char *Name, BasicBlock *BB) {
-    auto *Cond = new LoadInst(Type::getInt1Ty(Context), &Ptr, Name,
-                              /*isVolatile*/ true, BB);
-    BranchInst::Create(TrueBB, FalseBB, Cond, BB);
-  };
-
-  // Build the pass managers and register our pipeline. We build a single loop
-  // pass pipeline consisting of three mock pass runs over each loop. After
-  // this we run both domtree and loop verification passes to make sure that
-  // the IR remained valid during our mutations.
-  ModulePassManager MPM;
-  FunctionPassManager FPM;
-  LoopPassManager LPM;
-  LPM.addPass(MLPHandle.getPass());
-  LPM.addPass(MLPHandle.getPass());
-  LPM.addPass(MLPHandle.getPass());
-  FPM.addPass(createFunctionToLoopPassAdaptor(std::move(LPM)));
-  FPM.addPass(DominatorTreeVerifierPass());
-  FPM.addPass(LoopVerifierPass());
-  MPM.addPass(createModuleToFunctionPassAdaptor(std::move(FPM)));
-
-  // All the visit orders are deterministic, so we use simple fully order
-  // expectations.
-  ::testing::InSequence MakeExpectationsSequenced;
-
-  // We run loop passes three times over each of the loops.
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.0"), _, _, _))
-      .WillOnce(Invoke(getLoopAnalysisResult));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.0"), _, _));
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.0"), _, _, _))
-      .Times(2)
-      .WillRepeatedly(Invoke(getLoopAnalysisResult));
-
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.1"), _, _, _))
-      .WillOnce(Invoke(getLoopAnalysisResult));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.1"), _, _));
-
-  // When running over the middle loop, the second run inserts two new child
-  // loops, inserting them and itself into the worklist.
-  BasicBlock *NewLoop010BB, *NewLoop01LatchBB;
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.1"), _, _, _))
-      .WillOnce(Invoke([&](Loop &L, LoopAnalysisManager &AM,
-                           LoopStandardAnalysisResults &AR,
-                           LPMUpdater &Updater) {
-        auto *NewLoop = AR.LI.AllocateLoop();
-        L.addChildLoop(NewLoop);
-        auto *NewLoop010PHBB =
-            BasicBlock::Create(Context, "loop.0.1.0.ph", &F, &Loop02PHBB);
-        NewLoop010BB =
-            BasicBlock::Create(Context, "loop.0.1.0", &F, &Loop02PHBB);
-        NewLoop01LatchBB =
-            BasicBlock::Create(Context, "loop.0.1.latch", &F, &Loop02PHBB);
-        Loop01BB.getTerminator()->replaceUsesOfWith(&Loop01BB, NewLoop010PHBB);
-        BranchInst::Create(NewLoop010BB, NewLoop010PHBB);
-        CreateCondBr(NewLoop01LatchBB, NewLoop010BB, "cond.0.1.0",
-                     NewLoop010BB);
-        BranchInst::Create(&Loop01BB, NewLoop01LatchBB);
-        AR.DT.addNewBlock(NewLoop010PHBB, &Loop01BB);
-        AR.DT.addNewBlock(NewLoop010BB, NewLoop010PHBB);
-        AR.DT.addNewBlock(NewLoop01LatchBB, NewLoop010BB);
-        EXPECT_TRUE(AR.DT.verify());
-        L.addBasicBlockToLoop(NewLoop010PHBB, AR.LI);
-        NewLoop->addBasicBlockToLoop(NewLoop010BB, AR.LI);
-        L.addBasicBlockToLoop(NewLoop01LatchBB, AR.LI);
-        NewLoop->verifyLoop();
-        L.verifyLoop();
-        Updater.addChildLoops({NewLoop});
-        return PreservedAnalyses::all();
-      }));
-
-  // We should immediately drop down to fully visit the new inner loop.
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.1.0"), _, _, _))
-      .WillOnce(Invoke(getLoopAnalysisResult));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.1.0"), _, _));
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.1.0"), _, _, _))
-      .Times(2)
-      .WillRepeatedly(Invoke(getLoopAnalysisResult));
-
-  // After visiting the inner loop, we should re-visit the second loop
-  // reflecting its new loop nest structure.
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.1"), _, _, _))
-      .WillOnce(Invoke(getLoopAnalysisResult));
-
-  // In the second run over the middle loop after we've visited the new child,
-  // we add another child to check that we can repeatedly add children, and add
-  // children to a loop that already has children.
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.1"), _, _, _))
-      .WillOnce(Invoke([&](Loop &L, LoopAnalysisManager &AM,
-                           LoopStandardAnalysisResults &AR,
-                           LPMUpdater &Updater) {
-        auto *NewLoop = AR.LI.AllocateLoop();
-        L.addChildLoop(NewLoop);
-        auto *NewLoop011PHBB = BasicBlock::Create(Context, "loop.0.1.1.ph", &F, NewLoop01LatchBB);
-        auto *NewLoop011BB = BasicBlock::Create(Context, "loop.0.1.1", &F, NewLoop01LatchBB);
-        NewLoop010BB->getTerminator()->replaceUsesOfWith(NewLoop01LatchBB,
-                                                         NewLoop011PHBB);
-        BranchInst::Create(NewLoop011BB, NewLoop011PHBB);
-        CreateCondBr(NewLoop01LatchBB, NewLoop011BB, "cond.0.1.1",
-                     NewLoop011BB);
-        AR.DT.addNewBlock(NewLoop011PHBB, NewLoop010BB);
-        auto *NewDTNode = AR.DT.addNewBlock(NewLoop011BB, NewLoop011PHBB);
-        AR.DT.changeImmediateDominator(AR.DT[NewLoop01LatchBB], NewDTNode);
-        EXPECT_TRUE(AR.DT.verify());
-        L.addBasicBlockToLoop(NewLoop011PHBB, AR.LI);
-        NewLoop->addBasicBlockToLoop(NewLoop011BB, AR.LI);
-        NewLoop->verifyLoop();
-        L.verifyLoop();
-        Updater.addChildLoops({NewLoop});
-        return PreservedAnalyses::all();
-      }));
-
-  // Again, we should immediately drop down to visit the new, unvisited child
-  // loop. We don't need to revisit the other child though.
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.1.1"), _, _, _))
-      .WillOnce(Invoke(getLoopAnalysisResult));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.1.1"), _, _));
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.1.1"), _, _, _))
-      .Times(2)
-      .WillRepeatedly(Invoke(getLoopAnalysisResult));
-
-  // And now we should pop back up to the second loop and do a full pipeline of
-  // three passes on its current form.
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.1"), _, _, _))
-      .Times(3)
-      .WillRepeatedly(Invoke(getLoopAnalysisResult));
-
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.2"), _, _, _))
-      .WillOnce(Invoke(getLoopAnalysisResult));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.2"), _, _));
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.2"), _, _, _))
-      .Times(2)
-      .WillRepeatedly(Invoke(getLoopAnalysisResult));
-
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0"), _, _, _))
-      .WillOnce(Invoke(getLoopAnalysisResult));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0"), _, _));
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0"), _, _, _))
-      .Times(2)
-      .WillRepeatedly(Invoke(getLoopAnalysisResult));
-
-  // Now that all the expected actions are registered, run the pipeline over
-  // our module. All of our expectations are verified when the test finishes.
-  MPM.run(*M, MAM);
-}
-
-TEST_F(LoopPassManagerTest, LoopPeerInsertion) {
-  // Super boring module with two loop nests and loop nest with two child
-  // loops.
-  M = parseIR(Context, "define void @f(i1* %ptr) {\n"
-                       "entry:\n"
-                       "  br label %loop.0\n"
-                       "loop.0:\n"
-                       "  %cond.0 = load volatile i1, i1* %ptr\n"
-                       "  br i1 %cond.0, label %loop.0.0.ph, label %loop.2.ph\n"
-                       "loop.0.0.ph:\n"
-                       "  br label %loop.0.0\n"
-                       "loop.0.0:\n"
-                       "  %cond.0.0 = load volatile i1, i1* %ptr\n"
-                       "  br i1 %cond.0.0, label %loop.0.0, label %loop.0.2.ph\n"
-                       "loop.0.2.ph:\n"
-                       "  br label %loop.0.2\n"
-                       "loop.0.2:\n"
-                       "  %cond.0.2 = load volatile i1, i1* %ptr\n"
-                       "  br i1 %cond.0.2, label %loop.0.2, label %loop.0.latch\n"
-                       "loop.0.latch:\n"
-                       "  br label %loop.0\n"
-                       "loop.2.ph:\n"
-                       "  br label %loop.2\n"
-                       "loop.2:\n"
-                       "  %cond.2 = load volatile i1, i1* %ptr\n"
-                       "  br i1 %cond.2, label %loop.2, label %end\n"
-                       "end:\n"
-                       "  ret void\n"
-                       "}\n");
-
-  // Build up variables referring into the IR so we can rewrite it below
-  // easily.
-  Function &F = *M->begin();
-  ASSERT_THAT(F, HasName("f"));
-  Argument &Ptr = *F.arg_begin();
-  auto BBI = F.begin();
-  BasicBlock &EntryBB = *BBI++;
-  ASSERT_THAT(EntryBB, HasName("entry"));
-  BasicBlock &Loop0BB = *BBI++;
-  ASSERT_THAT(Loop0BB, HasName("loop.0"));
-  BasicBlock &Loop00PHBB = *BBI++;
-  ASSERT_THAT(Loop00PHBB, HasName("loop.0.0.ph"));
-  BasicBlock &Loop00BB = *BBI++;
-  ASSERT_THAT(Loop00BB, HasName("loop.0.0"));
-  BasicBlock &Loop02PHBB = *BBI++;
-  ASSERT_THAT(Loop02PHBB, HasName("loop.0.2.ph"));
-  BasicBlock &Loop02BB = *BBI++;
-  ASSERT_THAT(Loop02BB, HasName("loop.0.2"));
-  BasicBlock &Loop0LatchBB = *BBI++;
-  ASSERT_THAT(Loop0LatchBB, HasName("loop.0.latch"));
-  BasicBlock &Loop2PHBB = *BBI++;
-  ASSERT_THAT(Loop2PHBB, HasName("loop.2.ph"));
-  BasicBlock &Loop2BB = *BBI++;
-  ASSERT_THAT(Loop2BB, HasName("loop.2"));
-  BasicBlock &EndBB = *BBI++;
-  ASSERT_THAT(EndBB, HasName("end"));
-  ASSERT_THAT(BBI, F.end());
-  auto CreateCondBr = [&](BasicBlock *TrueBB, BasicBlock *FalseBB,
-                          const char *Name, BasicBlock *BB) {
-    auto *Cond = new LoadInst(Type::getInt1Ty(Context), &Ptr, Name,
-                              /*isVolatile*/ true, BB);
-    BranchInst::Create(TrueBB, FalseBB, Cond, BB);
-  };
-
-  // Build the pass managers and register our pipeline. We build a single loop
-  // pass pipeline consisting of three mock pass runs over each loop. After
-  // this we run both domtree and loop verification passes to make sure that
-  // the IR remained valid during our mutations.
-  ModulePassManager MPM;
-  FunctionPassManager FPM;
-  LoopPassManager LPM;
-  LPM.addPass(MLPHandle.getPass());
-  LPM.addPass(MLPHandle.getPass());
-  LPM.addPass(MLPHandle.getPass());
-  FPM.addPass(createFunctionToLoopPassAdaptor(std::move(LPM)));
-  FPM.addPass(DominatorTreeVerifierPass());
-  FPM.addPass(LoopVerifierPass());
-  MPM.addPass(createModuleToFunctionPassAdaptor(std::move(FPM)));
-
-  // All the visit orders are deterministic, so we use simple fully order
-  // expectations.
-  ::testing::InSequence MakeExpectationsSequenced;
-
-  // We run loop passes three times over each of the loops.
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.0"), _, _, _))
-      .WillOnce(Invoke(getLoopAnalysisResult));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.0"), _, _));
-
-  // On the second run, we insert a sibling loop.
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.0"), _, _, _))
-      .WillOnce(Invoke([&](Loop &L, LoopAnalysisManager &AM,
-                           LoopStandardAnalysisResults &AR,
-                           LPMUpdater &Updater) {
-        auto *NewLoop = AR.LI.AllocateLoop();
-        L.getParentLoop()->addChildLoop(NewLoop);
-        auto *NewLoop01PHBB = BasicBlock::Create(Context, "loop.0.1.ph", &F, &Loop02PHBB);
-        auto *NewLoop01BB = BasicBlock::Create(Context, "loop.0.1", &F, &Loop02PHBB);
-        BranchInst::Create(NewLoop01BB, NewLoop01PHBB);
-        CreateCondBr(&Loop02PHBB, NewLoop01BB, "cond.0.1", NewLoop01BB);
-        Loop00BB.getTerminator()->replaceUsesOfWith(&Loop02PHBB, NewLoop01PHBB);
-        AR.DT.addNewBlock(NewLoop01PHBB, &Loop00BB);
-        auto *NewDTNode = AR.DT.addNewBlock(NewLoop01BB, NewLoop01PHBB);
-        AR.DT.changeImmediateDominator(AR.DT[&Loop02PHBB], NewDTNode);
-        EXPECT_TRUE(AR.DT.verify());
-        L.getParentLoop()->addBasicBlockToLoop(NewLoop01PHBB, AR.LI);
-        NewLoop->addBasicBlockToLoop(NewLoop01BB, AR.LI);
-        L.getParentLoop()->verifyLoop();
-        Updater.addSiblingLoops({NewLoop});
-        return PreservedAnalyses::all();
-      }));
-  // We finish processing this loop as sibling loops don't perturb the
-  // postorder walk.
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.0"), _, _, _))
-      .WillOnce(Invoke(getLoopAnalysisResult));
-
-  // We visit the inserted sibling next.
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.1"), _, _, _))
-      .WillOnce(Invoke(getLoopAnalysisResult));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.1"), _, _));
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.1"), _, _, _))
-      .Times(2)
-      .WillRepeatedly(Invoke(getLoopAnalysisResult));
-
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.2"), _, _, _))
-      .WillOnce(Invoke(getLoopAnalysisResult));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.2"), _, _));
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.2"), _, _, _))
-      .WillOnce(Invoke(getLoopAnalysisResult));
-  // Next, on the third pass run on the last inner loop we add more new
-  // siblings, more than one, and one with nested child loops. By doing this at
-  // the end we make sure that edge case works well.
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.2"), _, _, _))
-      .WillOnce(Invoke([&](Loop &L, LoopAnalysisManager &AM,
-                           LoopStandardAnalysisResults &AR,
-                           LPMUpdater &Updater) {
-        Loop *NewLoops[] = {AR.LI.AllocateLoop(), AR.LI.AllocateLoop(),
-                            AR.LI.AllocateLoop()};
-        L.getParentLoop()->addChildLoop(NewLoops[0]);
-        L.getParentLoop()->addChildLoop(NewLoops[1]);
-        NewLoops[1]->addChildLoop(NewLoops[2]);
-        auto *NewLoop03PHBB =
-            BasicBlock::Create(Context, "loop.0.3.ph", &F, &Loop0LatchBB);
-        auto *NewLoop03BB =
-            BasicBlock::Create(Context, "loop.0.3", &F, &Loop0LatchBB);
-        auto *NewLoop04PHBB =
-            BasicBlock::Create(Context, "loop.0.4.ph", &F, &Loop0LatchBB);
-        auto *NewLoop04BB =
-            BasicBlock::Create(Context, "loop.0.4", &F, &Loop0LatchBB);
-        auto *NewLoop040PHBB =
-            BasicBlock::Create(Context, "loop.0.4.0.ph", &F, &Loop0LatchBB);
-        auto *NewLoop040BB =
-            BasicBlock::Create(Context, "loop.0.4.0", &F, &Loop0LatchBB);
-        auto *NewLoop04LatchBB =
-            BasicBlock::Create(Context, "loop.0.4.latch", &F, &Loop0LatchBB);
-        Loop02BB.getTerminator()->replaceUsesOfWith(&Loop0LatchBB, NewLoop03PHBB);
-        BranchInst::Create(NewLoop03BB, NewLoop03PHBB);
-        CreateCondBr(NewLoop04PHBB, NewLoop03BB, "cond.0.3", NewLoop03BB);
-        BranchInst::Create(NewLoop04BB, NewLoop04PHBB);
-        CreateCondBr(&Loop0LatchBB, NewLoop040PHBB, "cond.0.4", NewLoop04BB);
-        BranchInst::Create(NewLoop040BB, NewLoop040PHBB);
-        CreateCondBr(NewLoop04LatchBB, NewLoop040BB, "cond.0.4.0", NewLoop040BB);
-        BranchInst::Create(NewLoop04BB, NewLoop04LatchBB);
-        AR.DT.addNewBlock(NewLoop03PHBB, &Loop02BB);
-        AR.DT.addNewBlock(NewLoop03BB, NewLoop03PHBB);
-        AR.DT.addNewBlock(NewLoop04PHBB, NewLoop03BB);
-        auto *NewDTNode = AR.DT.addNewBlock(NewLoop04BB, NewLoop04PHBB);
-        AR.DT.changeImmediateDominator(AR.DT[&Loop0LatchBB], NewDTNode);
-        AR.DT.addNewBlock(NewLoop040PHBB, NewLoop04BB);
-        AR.DT.addNewBlock(NewLoop040BB, NewLoop040PHBB);
-        AR.DT.addNewBlock(NewLoop04LatchBB, NewLoop040BB);
-        EXPECT_TRUE(AR.DT.verify());
-        L.getParentLoop()->addBasicBlockToLoop(NewLoop03PHBB, AR.LI);
-        NewLoops[0]->addBasicBlockToLoop(NewLoop03BB, AR.LI);
-        L.getParentLoop()->addBasicBlockToLoop(NewLoop04PHBB, AR.LI);
-        NewLoops[1]->addBasicBlockToLoop(NewLoop04BB, AR.LI);
-        NewLoops[1]->addBasicBlockToLoop(NewLoop040PHBB, AR.LI);
-        NewLoops[2]->addBasicBlockToLoop(NewLoop040BB, AR.LI);
-        NewLoops[1]->addBasicBlockToLoop(NewLoop04LatchBB, AR.LI);
-        L.getParentLoop()->verifyLoop();
-        Updater.addSiblingLoops({NewLoops[0], NewLoops[1]});
-        return PreservedAnalyses::all();
-      }));
-
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.3"), _, _, _))
-      .WillOnce(Invoke(getLoopAnalysisResult));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.3"), _, _));
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.3"), _, _, _))
-      .Times(2)
-      .WillRepeatedly(Invoke(getLoopAnalysisResult));
-
-  // Note that we need to visit the inner loop of this added sibling before the
-  // sibling itself!
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.4.0"), _, _, _))
-      .WillOnce(Invoke(getLoopAnalysisResult));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.4.0"), _, _));
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.4.0"), _, _, _))
-      .Times(2)
-      .WillRepeatedly(Invoke(getLoopAnalysisResult));
-
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.4"), _, _, _))
-      .WillOnce(Invoke(getLoopAnalysisResult));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.4"), _, _));
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.4"), _, _, _))
-      .Times(2)
-      .WillRepeatedly(Invoke(getLoopAnalysisResult));
-
-  // And only now do we visit the outermost loop of the nest.
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0"), _, _, _))
-      .WillOnce(Invoke(getLoopAnalysisResult));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0"), _, _));
-  // On the second pass, we add sibling loops which become new top-level loops.
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0"), _, _, _))
-      .WillOnce(Invoke([&](Loop &L, LoopAnalysisManager &AM,
-                           LoopStandardAnalysisResults &AR,
-                           LPMUpdater &Updater) {
-        auto *NewLoop = AR.LI.AllocateLoop();
-        AR.LI.addTopLevelLoop(NewLoop);
-        auto *NewLoop1PHBB = BasicBlock::Create(Context, "loop.1.ph", &F, &Loop2BB);
-        auto *NewLoop1BB = BasicBlock::Create(Context, "loop.1", &F, &Loop2BB);
-        BranchInst::Create(NewLoop1BB, NewLoop1PHBB);
-        CreateCondBr(&Loop2PHBB, NewLoop1BB, "cond.1", NewLoop1BB);
-        Loop0BB.getTerminator()->replaceUsesOfWith(&Loop2PHBB, NewLoop1PHBB);
-        AR.DT.addNewBlock(NewLoop1PHBB, &Loop0BB);
-        auto *NewDTNode = AR.DT.addNewBlock(NewLoop1BB, NewLoop1PHBB);
-        AR.DT.changeImmediateDominator(AR.DT[&Loop2PHBB], NewDTNode);
-        EXPECT_TRUE(AR.DT.verify());
-        NewLoop->addBasicBlockToLoop(NewLoop1BB, AR.LI);
-        NewLoop->verifyLoop();
-        Updater.addSiblingLoops({NewLoop});
-        return PreservedAnalyses::all();
-      }));
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0"), _, _, _))
-      .WillOnce(Invoke(getLoopAnalysisResult));
-
-  EXPECT_CALL(MLPHandle, run(HasName("loop.1"), _, _, _))
-      .WillOnce(Invoke(getLoopAnalysisResult));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.1"), _, _));
-  EXPECT_CALL(MLPHandle, run(HasName("loop.1"), _, _, _))
-      .Times(2)
-      .WillRepeatedly(Invoke(getLoopAnalysisResult));
-
-  EXPECT_CALL(MLPHandle, run(HasName("loop.2"), _, _, _))
-      .WillOnce(Invoke(getLoopAnalysisResult));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.2"), _, _));
-  EXPECT_CALL(MLPHandle, run(HasName("loop.2"), _, _, _))
-      .Times(2)
-      .WillRepeatedly(Invoke(getLoopAnalysisResult));
-
-  // Now that all the expected actions are registered, run the pipeline over
-  // our module. All of our expectations are verified when the test finishes.
-  MPM.run(*M, MAM);
-}
-
-TEST_F(LoopPassManagerTest, LoopDeletion) {
-  // Build a module with a single loop nest that contains one outer loop with
-  // three subloops, and one of those with its own subloop. We will
-  // incrementally delete all of these to test different deletion scenarios.
-  M = parseIR(Context, "define void @f(i1* %ptr) {\n"
-                       "entry:\n"
-                       "  br label %loop.0\n"
-                       "loop.0:\n"
-                       "  %cond.0 = load volatile i1, i1* %ptr\n"
-                       "  br i1 %cond.0, label %loop.0.0.ph, label %end\n"
-                       "loop.0.0.ph:\n"
-                       "  br label %loop.0.0\n"
-                       "loop.0.0:\n"
-                       "  %cond.0.0 = load volatile i1, i1* %ptr\n"
-                       "  br i1 %cond.0.0, label %loop.0.0, label %loop.0.1.ph\n"
-                       "loop.0.1.ph:\n"
-                       "  br label %loop.0.1\n"
-                       "loop.0.1:\n"
-                       "  %cond.0.1 = load volatile i1, i1* %ptr\n"
-                       "  br i1 %cond.0.1, label %loop.0.1, label %loop.0.2.ph\n"
-                       "loop.0.2.ph:\n"
-                       "  br label %loop.0.2\n"
-                       "loop.0.2:\n"
-                       "  %cond.0.2 = load volatile i1, i1* %ptr\n"
-                       "  br i1 %cond.0.2, label %loop.0.2.0.ph, label %loop.0.latch\n"
-                       "loop.0.2.0.ph:\n"
-                       "  br label %loop.0.2.0\n"
-                       "loop.0.2.0:\n"
-                       "  %cond.0.2.0 = load volatile i1, i1* %ptr\n"
-                       "  br i1 %cond.0.2.0, label %loop.0.2.0, label %loop.0.2.latch\n"
-                       "loop.0.2.latch:\n"
-                       "  br label %loop.0.2\n"
-                       "loop.0.latch:\n"
-                       "  br label %loop.0\n"
-                       "end:\n"
-                       "  ret void\n"
-                       "}\n");
-
-  // Build up variables referring into the IR so we can rewrite it below
-  // easily.
-  Function &F = *M->begin();
-  ASSERT_THAT(F, HasName("f"));
-  Argument &Ptr = *F.arg_begin();
-  auto BBI = F.begin();
-  BasicBlock &EntryBB = *BBI++;
-  ASSERT_THAT(EntryBB, HasName("entry"));
-  BasicBlock &Loop0BB = *BBI++;
-  ASSERT_THAT(Loop0BB, HasName("loop.0"));
-  BasicBlock &Loop00PHBB = *BBI++;
-  ASSERT_THAT(Loop00PHBB, HasName("loop.0.0.ph"));
-  BasicBlock &Loop00BB = *BBI++;
-  ASSERT_THAT(Loop00BB, HasName("loop.0.0"));
-  BasicBlock &Loop01PHBB = *BBI++;
-  ASSERT_THAT(Loop01PHBB, HasName("loop.0.1.ph"));
-  BasicBlock &Loop01BB = *BBI++;
-  ASSERT_THAT(Loop01BB, HasName("loop.0.1"));
-  BasicBlock &Loop02PHBB = *BBI++;
-  ASSERT_THAT(Loop02PHBB, HasName("loop.0.2.ph"));
-  BasicBlock &Loop02BB = *BBI++;
-  ASSERT_THAT(Loop02BB, HasName("loop.0.2"));
-  BasicBlock &Loop020PHBB = *BBI++;
-  ASSERT_THAT(Loop020PHBB, HasName("loop.0.2.0.ph"));
-  BasicBlock &Loop020BB = *BBI++;
-  ASSERT_THAT(Loop020BB, HasName("loop.0.2.0"));
-  BasicBlock &Loop02LatchBB = *BBI++;
-  ASSERT_THAT(Loop02LatchBB, HasName("loop.0.2.latch"));
-  BasicBlock &Loop0LatchBB = *BBI++;
-  ASSERT_THAT(Loop0LatchBB, HasName("loop.0.latch"));
-  BasicBlock &EndBB = *BBI++;
-  ASSERT_THAT(EndBB, HasName("end"));
-  ASSERT_THAT(BBI, F.end());
-
-  // Helper to do the actual deletion of a loop. We directly encode this here
-  // to isolate ourselves from the rest of LLVM and for simplicity. Here we can
-  // egregiously cheat based on knowledge of the test case. For example, we
-  // have no PHI nodes and there is always a single i-dom.
-  auto EraseLoop = [](Loop &L, BasicBlock &IDomBB,
-                      LoopStandardAnalysisResults &AR, LPMUpdater &Updater) {
-    assert(L.isInnermost() && "Can only delete leaf loops with this routine!");
-    SmallVector<BasicBlock *, 4> LoopBBs(L.block_begin(), L.block_end());
-    Updater.markLoopAsDeleted(L, L.getName());
-    IDomBB.getTerminator()->replaceUsesOfWith(L.getHeader(),
-                                              L.getUniqueExitBlock());
-    for (BasicBlock *LoopBB : LoopBBs) {
-      SmallVector<DomTreeNode *, 4> ChildNodes(AR.DT[LoopBB]->begin(),
-                                               AR.DT[LoopBB]->end());
-      for (DomTreeNode *ChildNode : ChildNodes)
-        AR.DT.changeImmediateDominator(ChildNode, AR.DT[&IDomBB]);
-      AR.DT.eraseNode(LoopBB);
-      AR.LI.removeBlock(LoopBB);
-      LoopBB->dropAllReferences();
-    }
-    for (BasicBlock *LoopBB : LoopBBs)
-      LoopBB->eraseFromParent();
-
-    AR.LI.erase(&L);
-  };
-
-  // Build up the pass managers.
-  ModulePassManager MPM;
-  FunctionPassManager FPM;
-  // We run several loop pass pipelines across the loop nest, but they all take
-  // the same form of three mock pass runs in a loop pipeline followed by
-  // domtree and loop verification. We use a lambda to stamp this out each
-  // time.
-  auto AddLoopPipelineAndVerificationPasses = [&] {
-    LoopPassManager LPM;
-    LPM.addPass(MLPHandle.getPass());
-    LPM.addPass(MLPHandle.getPass());
-    LPM.addPass(MLPHandle.getPass());
-    FPM.addPass(createFunctionToLoopPassAdaptor(std::move(LPM)));
-    FPM.addPass(DominatorTreeVerifierPass());
-    FPM.addPass(LoopVerifierPass());
-  };
-
-  // All the visit orders are deterministic so we use simple fully order
-  // expectations.
-  ::testing::InSequence MakeExpectationsSequenced;
-
-  // We run the loop pipeline with three passes over each of the loops. When
-  // running over the middle loop, the second pass in the pipeline deletes it.
-  // This should prevent the third pass from visiting it but otherwise leave
-  // the process unimpacted.
-  AddLoopPipelineAndVerificationPasses();
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.0"), _, _, _))
-      .WillOnce(Invoke(getLoopAnalysisResult));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.0"), _, _));
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.0"), _, _, _))
-      .Times(2)
-      .WillRepeatedly(Invoke(getLoopAnalysisResult));
-
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.1"), _, _, _))
-      .WillOnce(Invoke(getLoopAnalysisResult));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.1"), _, _));
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.1"), _, _, _))
-      .WillOnce(
-          Invoke([&](Loop &L, LoopAnalysisManager &AM,
-                     LoopStandardAnalysisResults &AR, LPMUpdater &Updater) {
-            Loop *ParentL = L.getParentLoop();
-            AR.SE.forgetLoop(&L);
-            EraseLoop(L, Loop01PHBB, AR, Updater);
-            ParentL->verifyLoop();
-            return PreservedAnalyses::all();
-          }));
-
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.2.0"), _, _, _))
-      .WillOnce(Invoke(getLoopAnalysisResult));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.2.0"), _, _));
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.2.0"), _, _, _))
-      .Times(2)
-      .WillRepeatedly(Invoke(getLoopAnalysisResult));
-
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.2"), _, _, _))
-      .WillOnce(Invoke(getLoopAnalysisResult));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.2"), _, _));
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.2"), _, _, _))
-      .Times(2)
-      .WillRepeatedly(Invoke(getLoopAnalysisResult));
-
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0"), _, _, _))
-      .WillOnce(Invoke(getLoopAnalysisResult));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0"), _, _));
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0"), _, _, _))
-      .Times(2)
-      .WillRepeatedly(Invoke(getLoopAnalysisResult));
-
-  // Run the loop pipeline again. This time we delete the last loop, which
-  // contains a nested loop within it and insert a new loop into the nest. This
-  // makes sure we can handle nested loop deletion.
-  AddLoopPipelineAndVerificationPasses();
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.0"), _, _, _))
-      .Times(3)
-      .WillRepeatedly(Invoke(getLoopAnalysisResult));
-
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.2.0"), _, _, _))
-      .Times(3)
-      .WillRepeatedly(Invoke(getLoopAnalysisResult));
-
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.2"), _, _, _))
-      .WillOnce(Invoke(getLoopAnalysisResult));
-  BasicBlock *NewLoop03PHBB;
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.2"), _, _, _))
-      .WillOnce(
-          Invoke([&](Loop &L, LoopAnalysisManager &AM,
-                     LoopStandardAnalysisResults &AR, LPMUpdater &Updater) {
-            AR.SE.forgetLoop(*L.begin());
-            EraseLoop(**L.begin(), Loop020PHBB, AR, Updater);
-
-            auto *ParentL = L.getParentLoop();
-            AR.SE.forgetLoop(&L);
-            EraseLoop(L, Loop02PHBB, AR, Updater);
-
-            // Now insert a new sibling loop.
-            auto *NewSibling = AR.LI.AllocateLoop();
-            ParentL->addChildLoop(NewSibling);
-            NewLoop03PHBB =
-                BasicBlock::Create(Context, "loop.0.3.ph", &F, &Loop0LatchBB);
-            auto *NewLoop03BB =
-                BasicBlock::Create(Context, "loop.0.3", &F, &Loop0LatchBB);
-            BranchInst::Create(NewLoop03BB, NewLoop03PHBB);
-            auto *Cond =
-                new LoadInst(Type::getInt1Ty(Context), &Ptr, "cond.0.3",
-                             /*isVolatile*/ true, NewLoop03BB);
-            BranchInst::Create(&Loop0LatchBB, NewLoop03BB, Cond, NewLoop03BB);
-            Loop02PHBB.getTerminator()->replaceUsesOfWith(&Loop0LatchBB,
-                                                          NewLoop03PHBB);
-            AR.DT.addNewBlock(NewLoop03PHBB, &Loop02PHBB);
-            AR.DT.addNewBlock(NewLoop03BB, NewLoop03PHBB);
-            AR.DT.changeImmediateDominator(AR.DT[&Loop0LatchBB],
-                                           AR.DT[NewLoop03BB]);
-            EXPECT_TRUE(AR.DT.verify());
-            ParentL->addBasicBlockToLoop(NewLoop03PHBB, AR.LI);
-            NewSibling->addBasicBlockToLoop(NewLoop03BB, AR.LI);
-            NewSibling->verifyLoop();
-            ParentL->verifyLoop();
-            Updater.addSiblingLoops({NewSibling});
-            return PreservedAnalyses::all();
-          }));
-
-  // To respect our inner-to-outer traversal order, we must visit the
-  // newly-inserted sibling of the loop we just deleted before we visit the
-  // outer loop. When we do so, this must compute a fresh analysis result, even
-  // though our new loop has the same pointer value as the loop we deleted.
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.3"), _, _, _))
-      .WillOnce(Invoke(getLoopAnalysisResult));
-  EXPECT_CALL(MLAHandle, run(HasName("loop.0.3"), _, _));
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.3"), _, _, _))
-      .Times(2)
-      .WillRepeatedly(Invoke(getLoopAnalysisResult));
-
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0"), _, _, _))
-      .Times(3)
-      .WillRepeatedly(Invoke(getLoopAnalysisResult));
-
-  // In the final loop pipeline run we delete every loop, including the last
-  // loop of the nest. We do this again in the second pass in the pipeline, and
-  // as a consequence we never make it to three runs on any loop. We also cover
-  // deleting multiple loops in a single pipeline, deleting the first loop and
-  // deleting the (last) top level loop.
-  AddLoopPipelineAndVerificationPasses();
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.0"), _, _, _))
-      .WillOnce(Invoke(getLoopAnalysisResult));
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.0"), _, _, _))
-      .WillOnce(
-          Invoke([&](Loop &L, LoopAnalysisManager &AM,
-                     LoopStandardAnalysisResults &AR, LPMUpdater &Updater) {
-            AR.SE.forgetLoop(&L);
-            EraseLoop(L, Loop00PHBB, AR, Updater);
-            return PreservedAnalyses::all();
-          }));
-
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.3"), _, _, _))
-      .WillOnce(Invoke(getLoopAnalysisResult));
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.3"), _, _, _))
-      .WillOnce(
-          Invoke([&](Loop &L, LoopAnalysisManager &AM,
-                     LoopStandardAnalysisResults &AR, LPMUpdater &Updater) {
-            AR.SE.forgetLoop(&L);
-            EraseLoop(L, *NewLoop03PHBB, AR, Updater);
-            return PreservedAnalyses::all();
-          }));
-
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0"), _, _, _))
-      .WillOnce(Invoke(getLoopAnalysisResult));
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0"), _, _, _))
-      .WillOnce(
-          Invoke([&](Loop &L, LoopAnalysisManager &AM,
-                     LoopStandardAnalysisResults &AR, LPMUpdater &Updater) {
-            AR.SE.forgetLoop(&L);
-            EraseLoop(L, EntryBB, AR, Updater);
-            return PreservedAnalyses::all();
-          }));
-
-  // Add the function pass pipeline now that it is fully built up and run it
-  // over the module's one function.
-  MPM.addPass(createModuleToFunctionPassAdaptor(std::move(FPM)));
-  MPM.run(*M, MAM);
-}
-
-TEST_F(LoopPassManagerTest, HandleLoopNestPass) {
-  ::testing::Sequence FSequence, GSequence;
-
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.0"), _, _, _))
-      .Times(2)
-      .InSequence(FSequence);
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0.1"), _, _, _))
-      .Times(2)
-      .InSequence(FSequence);
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0"), _, _, _)).InSequence(FSequence);
-  EXPECT_CALL(MLNPHandle, run(HasName("loop.0"), _, _, _))
-      .InSequence(FSequence);
-  EXPECT_CALL(MLPHandle, run(HasName("loop.0"), _, _, _)).InSequence(FSequence);
-  EXPECT_CALL(MLNPHandle, run(HasName("loop.0"), _, _, _))
-      .InSequence(FSequence);
-  EXPECT_CALL(MLPHandle, run(HasName("loop.g.0"), _, _, _))
-      .InSequence(GSequence);
-  EXPECT_CALL(MLNPHandle, run(HasName("loop.g.0"), _, _, _))
-      .InSequence(GSequence);
-  EXPECT_CALL(MLPHandle, run(HasName("loop.g.0"), _, _, _))
-      .InSequence(GSequence);
-  EXPECT_CALL(MLNPHandle, run(HasName("loop.g.0"), _, _, _))
-      .InSequence(GSequence);
-
-  EXPECT_CALL(MLNPHandle, run(HasName("loop.0"), _, _, _))
-      .InSequence(FSequence);
-  EXPECT_CALL(MLNPHandle, run(HasName("loop.g.0"), _, _, _))
-      .InSequence(GSequence);
-
-  EXPECT_CALL(MLNPHandle, run(HasName("loop.0"), _, _, _))
-      .InSequence(FSequence);
-  EXPECT_CALL(MLNPHandle, run(HasName("loop.g.0"), _, _, _))
-      .InSequence(GSequence);
-
-  ModulePassManager MPM;
-  FunctionPassManager FPM;
-
-  {
-    LoopPassManager LPM;
-    LPM.addPass(MLPHandle.getPass());
-    LPM.addPass(MLNPHandle.getPass());
-    LPM.addPass(MLPHandle.getPass());
-    LPM.addPass(MLNPHandle.getPass());
-
-    auto Adaptor = createFunctionToLoopPassAdaptor(std::move(LPM));
-    ASSERT_FALSE(Adaptor.isLoopNestMode());
-    FPM.addPass(std::move(Adaptor));
-  }
-
-  {
-    auto Adaptor = createFunctionToLoopPassAdaptor(MLNPHandle.getPass());
-    ASSERT_TRUE(Adaptor.isLoopNestMode());
-    FPM.addPass(std::move(Adaptor));
-  }
-
-  {
-    LoopPassManager LPM;
-    LPM.addPass(MLNPHandle.getPass());
-    auto Adaptor = createFunctionToLoopPassAdaptor(MLNPHandle.getPass());
-    ASSERT_TRUE(Adaptor.isLoopNestMode());
-    FPM.addPass(std::move(Adaptor));
-  }
-
-  MPM.addPass(createModuleToFunctionPassAdaptor(std::move(FPM)));
-  MPM.run(*M, MAM);
-}
-
-} // namespace
diff --git a/gnu/llvm/llvm/unittests/Transforms/Utils/ASanStackFrameLayoutTest.cpp b/gnu/llvm/llvm/unittests/Transforms/Utils/ASanStackFrameLayoutTest.cpp
deleted file mode 100644
index 8af49c6fb9f..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/Utils/ASanStackFrameLayoutTest.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-//===- ASanStackFrameLayoutTest.cpp - Tests for ComputeASanStackFrameLayout===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-#include "llvm/Transforms/Utils/ASanStackFrameLayout.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "gtest/gtest.h"
-#include <sstream>
-
-using namespace llvm;
-
-static std::string
-ShadowBytesToString(ArrayRef<uint8_t> ShadowBytes) {
-  std::ostringstream os;
-  for (size_t i = 0, n = ShadowBytes.size(); i < n; i++) {
-    switch (ShadowBytes[i]) {
-      case kAsanStackLeftRedzoneMagic:    os << "L"; break;
-      case kAsanStackRightRedzoneMagic:   os << "R"; break;
-      case kAsanStackMidRedzoneMagic:     os << "M"; break;
-      case kAsanStackUseAfterScopeMagic:
-        os << "S";
-        break;
-      default:                            os << (unsigned)ShadowBytes[i];
-    }
-  }
-  return os.str();
-}
-
-// Use macro to preserve line information in EXPECT_EQ output.
-#define TEST_LAYOUT(V, Granularity, MinHeaderSize, ExpectedDescr,              \
-                    ExpectedShadow, ExpectedShadowAfterScope)                  \
-  {                                                                            \
-    SmallVector<ASanStackVariableDescription, 10> Vars = V;                    \
-    ASanStackFrameLayout L =                                                   \
-        ComputeASanStackFrameLayout(Vars, Granularity, MinHeaderSize);         \
-    EXPECT_STREQ(ExpectedDescr,                                                \
-                 ComputeASanStackFrameDescription(Vars).c_str());              \
-    EXPECT_EQ(ExpectedShadow, ShadowBytesToString(GetShadowBytes(Vars, L)));   \
-    EXPECT_EQ(ExpectedShadowAfterScope,                                        \
-              ShadowBytesToString(GetShadowBytesAfterScope(Vars, L)));         \
-  }
-
-TEST(ASanStackFrameLayout, Test) {
-#define VAR(name, size, lifetime, alignment, line)                             \
-  ASanStackVariableDescription name##size##_##alignment = {                    \
-    #name #size "_" #alignment,                                                \
-    size,                                                                      \
-    lifetime,                                                                  \
-    alignment,                                                                 \
-    0,                                                                         \
-    0,                                                                         \
-    line,                                                                      \
-  }
-
-  VAR(a, 1, 0, 1, 0);
-  VAR(p, 1, 0, 32, 15);
-  VAR(p, 1, 0, 256, 2700);
-  VAR(a, 2, 0, 1, 0);
-  VAR(a, 3, 0, 1, 0);
-  VAR(a, 4, 0, 1, 0);
-  VAR(a, 7, 0, 1, 0);
-  VAR(a, 8, 8, 1, 0);
-  VAR(a, 9, 0, 1, 0);
-  VAR(a, 16, 16, 1, 0);
-  VAR(a, 41, 9, 1, 7);
-  VAR(a, 105, 103, 1, 0);
-  VAR(a, 200, 97, 1, 0);
-
-  TEST_LAYOUT({a1_1}, 8, 16, "1 16 1 4 a1_1", "LL1R", "LL1R");
-  TEST_LAYOUT({a1_1}, 16, 16, "1 16 1 4 a1_1", "L1R", "L1R");
-  TEST_LAYOUT({a1_1}, 32, 32, "1 32 1 4 a1_1", "L1R", "L1R");
-  TEST_LAYOUT({a1_1}, 64, 64, "1 64 1 4 a1_1", "L1R", "L1R");
-  TEST_LAYOUT({p1_32}, 8, 32, "1 32 1 8 p1_32:15", "LLLL1RRR", "LLLL1RRR");
-  TEST_LAYOUT({p1_32}, 8, 64, "1 64 1 8 p1_32:15", "LLLLLLLL1RRRRRRR",
-              "LLLLLLLL1RRRRRRR");
-
-  TEST_LAYOUT({a1_1}, 8, 32, "1 32 1 4 a1_1", "LLLL1RRR", "LLLL1RRR");
-  TEST_LAYOUT({a2_1}, 8, 32, "1 32 2 4 a2_1", "LLLL2RRR", "LLLL2RRR");
-  TEST_LAYOUT({a3_1}, 8, 32, "1 32 3 4 a3_1", "LLLL3RRR", "LLLL3RRR");
-  TEST_LAYOUT({a4_1}, 8, 32, "1 32 4 4 a4_1", "LLLL4RRR", "LLLL4RRR");
-  TEST_LAYOUT({a7_1}, 8, 32, "1 32 7 4 a7_1", "LLLL7RRR", "LLLL7RRR");
-  TEST_LAYOUT({a8_1}, 8, 32, "1 32 8 4 a8_1", "LLLL0RRR", "LLLLSRRR");
-  TEST_LAYOUT({a9_1}, 8, 32, "1 32 9 4 a9_1", "LLLL01RR", "LLLL01RR");
-  TEST_LAYOUT({a16_1}, 8, 32, "1 32 16 5 a16_1", "LLLL00RR", "LLLLSSRR");
-  TEST_LAYOUT({p1_256}, 8, 32, "1 256 1 11 p1_256:2700",
-              "LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL1RRR",
-              "LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL1RRR");
-  TEST_LAYOUT({a41_1}, 8, 32, "1 32 41 7 a41_1:7", "LLLL000001RRRRRR",
-              "LLLLSS0001RRRRRR");
-  TEST_LAYOUT({a105_1}, 8, 32, "1 32 105 6 a105_1", "LLLL00000000000001RRRRRR",
-              "LLLLSSSSSSSSSSSSS1RRRRRR");
-
-  {
-    SmallVector<ASanStackVariableDescription, 10> t = {a1_1, p1_256};
-    TEST_LAYOUT(t, 8, 32, "2 256 1 11 p1_256:2700 272 1 4 a1_1",
-                "LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL1M1R",
-                "LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL1M1R");
-  }
-
-  {
-    SmallVector<ASanStackVariableDescription, 10> t = {a1_1, a16_1, a41_1};
-    TEST_LAYOUT(t, 8, 32, "3 32 1 4 a1_1 48 16 5 a16_1 80 41 7 a41_1:7",
-                "LLLL1M00MM000001RRRR", "LLLL1MSSMMSS0001RRRR");
-  }
-
-  TEST_LAYOUT({a2_1}, 32, 32, "1 32 2 4 a2_1", "L2R", "L2R");
-  TEST_LAYOUT({a9_1}, 32, 32, "1 32 9 4 a9_1", "L9R", "L9R");
-  TEST_LAYOUT({a16_1}, 32, 32, "1 32 16 5 a16_1", "L16R", "LSR");
-  TEST_LAYOUT({p1_256}, 32, 32, "1 256 1 11 p1_256:2700",
-              "LLLLLLLL1R", "LLLLLLLL1R");
-  TEST_LAYOUT({a41_1}, 32, 32, "1 32 41 7 a41_1:7", "L09R",
-              "LS9R");
-  TEST_LAYOUT({a105_1}, 32, 32, "1 32 105 6 a105_1", "L0009R",
-              "LSSSSR");
-  TEST_LAYOUT({a200_1}, 32, 32, "1 32 200 6 a200_1", "L0000008RR",
-              "LSSSS008RR");
-
-  {
-    SmallVector<ASanStackVariableDescription, 10> t = {a1_1, p1_256};
-    TEST_LAYOUT(t, 32, 32, "2 256 1 11 p1_256:2700 320 1 4 a1_1",
-                "LLLLLLLL1M1R", "LLLLLLLL1M1R");
-  }
-
-  {
-    SmallVector<ASanStackVariableDescription, 10> t = {a1_1, a16_1, a41_1};
-    TEST_LAYOUT(t, 32, 32, "3 32 1 4 a1_1 96 16 5 a16_1 160 41 7 a41_1:7",
-                "L1M16M09R", "L1MSMS9R");
-  }
-#undef VAR
-#undef TEST_LAYOUT
-}
diff --git a/gnu/llvm/llvm/unittests/Transforms/Utils/BasicBlockUtilsTest.cpp b/gnu/llvm/llvm/unittests/Transforms/Utils/BasicBlockUtilsTest.cpp
deleted file mode 100644
index 8800b4339fa..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/Utils/BasicBlockUtilsTest.cpp
+++ /dev/null
@@ -1,594 +0,0 @@
-//===- BasicBlockUtils.cpp - Unit tests for BasicBlockUtils ---------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Transforms/Utils/BasicBlockUtils.h"
-#include "llvm/Analysis/AssumptionCache.h"
-#include "llvm/Analysis/BasicAliasAnalysis.h"
-#include "llvm/Analysis/BlockFrequencyInfo.h"
-#include "llvm/Analysis/BranchProbabilityInfo.h"
-#include "llvm/Analysis/CFG.h"
-#include "llvm/Analysis/LoopInfo.h"
-#include "llvm/Analysis/MemorySSA.h"
-#include "llvm/Analysis/MemorySSAUpdater.h"
-#include "llvm/Analysis/PostDominators.h"
-#include "llvm/Analysis/TargetLibraryInfo.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/BasicBlock.h"
-#include "llvm/IR/Dominators.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/Support/SourceMgr.h"
-#include "llvm/Transforms/Utils/BreakCriticalEdges.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-static std::unique_ptr<Module> parseIR(LLVMContext &C, const char *IR) {
-  SMDiagnostic Err;
-  std::unique_ptr<Module> Mod = parseAssemblyString(IR, Err, C);
-  if (!Mod)
-    Err.print("BasicBlockUtilsTests", errs());
-  return Mod;
-}
-
-static BasicBlock *getBasicBlockByName(Function &F, StringRef Name) {
-  for (BasicBlock &BB : F)
-    if (BB.getName() == Name)
-      return &BB;
-  llvm_unreachable("Expected to find basic block!");
-}
-
-TEST(BasicBlockUtils, EliminateUnreachableBlocks) {
-  LLVMContext C;
-
-  std::unique_ptr<Module> M = parseIR(
-    C,
-    "define i32 @has_unreachable(i1 %cond) {\n"
-    "entry:\n"
-    "  br i1 %cond, label %bb0, label %bb1\n"
-    "bb0:\n"
-    "  br label %bb1\n"
-    "bb1:\n"
-    "  %phi = phi i32 [ 0, %entry ], [ 1, %bb0 ]"
-    "  ret i32 %phi\n"
-    "bb2:\n"
-    "  ret i32 42\n"
-    "}\n"
-    "\n"
-    );
-
-  auto *F = M->getFunction("has_unreachable");
-  DominatorTree DT(*F);
-  DomTreeUpdater DTU(DT, DomTreeUpdater::UpdateStrategy::Eager);
-
-  EXPECT_EQ(F->size(), (size_t)4);
-  bool Result = EliminateUnreachableBlocks(*F, &DTU);
-  EXPECT_TRUE(Result);
-  EXPECT_EQ(F->size(), (size_t)3);
-  EXPECT_TRUE(DT.verify());
-}
-
-TEST(BasicBlockUtils, SplitEdge_ex1) {
-  LLVMContext C;
-  std::unique_ptr<Module> M =
-      parseIR(C, "define void @foo(i1 %cond0) {\n"
-                 "entry:\n"
-                 "  br i1 %cond0, label %bb0, label %bb1\n"
-                 "bb0:\n"
-                 " %0 = mul i32 1, 2\n"
-                 "  br label %bb1\n"
-                 "bb1:\n"
-                 "  br label %bb2\n"
-                 "bb2:\n"
-                 "  ret void\n"
-                 "}\n"
-                 "\n");
-
-  Function *F = M->getFunction("foo");
-  DominatorTree DT(*F);
-  BasicBlock *SrcBlock;
-  BasicBlock *DestBlock;
-  BasicBlock *NewBB;
-
-  SrcBlock = getBasicBlockByName(*F, "entry");
-  DestBlock = getBasicBlockByName(*F, "bb0");
-  NewBB = SplitEdge(SrcBlock, DestBlock, &DT, nullptr, nullptr);
-
-  EXPECT_TRUE(DT.verify());
-  EXPECT_EQ(NewBB->getSinglePredecessor(), SrcBlock);
-  EXPECT_EQ(NewBB->getSingleSuccessor(), DestBlock);
-  EXPECT_EQ(NewBB->getParent(), F);
-
-  bool BBFlag = false;
-  for (BasicBlock &BB : *F) {
-    if (BB.getName() == NewBB->getName()) {
-      BBFlag = true;
-    }
-  }
-  EXPECT_TRUE(BBFlag);
-}
-
-TEST(BasicBlockUtils, SplitEdge_ex2) {
-  LLVMContext C;
-  std::unique_ptr<Module> M = parseIR(C, "define void @foo() {\n"
-                                         "bb0:\n"
-                                         "  br label %bb2\n"
-                                         "bb1:\n"
-                                         "  br label %bb2\n"
-                                         "bb2:\n"
-                                         "  ret void\n"
-                                         "}\n"
-                                         "\n");
-
-  Function *F = M->getFunction("foo");
-  DominatorTree DT(*F);
-
-  BasicBlock *SrcBlock;
-  BasicBlock *DestBlock;
-  BasicBlock *NewBB;
-
-  SrcBlock = getBasicBlockByName(*F, "bb0");
-  DestBlock = getBasicBlockByName(*F, "bb2");
-  NewBB = SplitEdge(SrcBlock, DestBlock, &DT, nullptr, nullptr);
-
-  EXPECT_TRUE(DT.verify());
-  EXPECT_EQ(NewBB->getSinglePredecessor(), SrcBlock);
-  EXPECT_EQ(NewBB->getSingleSuccessor(), DestBlock);
-  EXPECT_EQ(NewBB->getParent(), F);
-
-  bool BBFlag = false;
-  for (BasicBlock &BB : *F) {
-    if (BB.getName() == NewBB->getName()) {
-      BBFlag = true;
-    }
-  }
-  EXPECT_TRUE(BBFlag);
-}
-
-TEST(BasicBlockUtils, SplitEdge_ex3) {
-  LLVMContext C;
-  std::unique_ptr<Module> M =
-      parseIR(C, "define i32 @foo(i32 %n) {\n"
-                 "entry:\n"
-                 " br label %header\n"
-                 "header:\n"
-                 " %sum.02 = phi i32 [ 0, %entry ], [ %sum.1, %bb3 ]\n"
-                 " %0 = phi i32 [ 0, %entry ], [ %4, %bb3 ] \n"
-                 " %1 = icmp slt i32 %0, %n \n"
-                 " br i1 %1, label %bb0, label %bb1\n"
-                 "bb0:\n"
-                 "  %2 = add nsw i32 %sum.02, 2\n"
-                 "  br label %bb2\n"
-                 "bb1:\n"
-                 "  %3 = add nsw i32 %sum.02, 1\n"
-                 "  br label %bb2\n"
-                 "bb2:\n"
-                 "  %sum.1 = phi i32 [ %2, %bb0 ], [ %3, %bb1 ]\n"
-                 "  br label %bb3\n"
-                 "bb3:\n"
-                 "  %4 = add nsw i32 %0, 1 \n"
-                 "  %5 = icmp slt i32 %4, 100\n"
-                 "  br i1 %5, label %header, label %bb4\n"
-                 "bb4:\n"
-                 " %sum.0.lcssa = phi i32 [ %sum.1, %bb3 ]\n"
-                 " ret i32 %sum.0.lcssa\n"
-                 "}\n"
-                 "\n");
-
-  Function *F = M->getFunction("foo");
-  DominatorTree DT(*F);
-
-  LoopInfo LI(DT);
-
-  DataLayout DL("e-i64:64-f80:128-n8:16:32:64-S128");
-  TargetLibraryInfoImpl TLII;
-  TargetLibraryInfo TLI(TLII);
-  AssumptionCache AC(*F);
-  AAResults AA(TLI);
-
-  BasicAAResult BAA(DL, *F, TLI, AC, &DT);
-  AA.addAAResult(BAA);
-
-  MemorySSA MSSA(*F, &AA, &DT);
-  MemorySSAUpdater Updater(&MSSA);
-
-  BasicBlock *SrcBlock;
-  BasicBlock *DestBlock;
-  BasicBlock *NewBB;
-
-  SrcBlock = getBasicBlockByName(*F, "header");
-  DestBlock = getBasicBlockByName(*F, "bb0");
-  NewBB = SplitEdge(SrcBlock, DestBlock, &DT, &LI, &Updater);
-
-  Updater.getMemorySSA()->verifyMemorySSA();
-  EXPECT_TRUE(DT.verify());
-  EXPECT_NE(LI.getLoopFor(SrcBlock), nullptr);
-  EXPECT_NE(LI.getLoopFor(DestBlock), nullptr);
-  EXPECT_NE(LI.getLoopFor(NewBB), nullptr);
-  EXPECT_EQ(NewBB->getSinglePredecessor(), SrcBlock);
-  EXPECT_EQ(NewBB->getSingleSuccessor(), DestBlock);
-  EXPECT_EQ(NewBB->getParent(), F);
-
-  bool BBFlag = false;
-  for (BasicBlock &BB : *F) {
-    if (BB.getName() == NewBB->getName()) {
-      BBFlag = true;
-    }
-  }
-  EXPECT_TRUE(BBFlag);
-}
-
-TEST(BasicBlockUtils, SplitEdge_ex4) {
-  LLVMContext C;
-  std::unique_ptr<Module> M = parseIR(
-      C, "define void @bar(i32 %cond) personality i8 0 {\n"
-         "entry:\n"
-         "  switch i32 %cond, label %exit [\n"
-         "    i32 -1, label %continue\n"
-         "    i32 0, label %continue\n"
-         "    i32 1, label %continue_alt\n"
-         "    i32 2, label %continue_alt\n"
-         "  ]\n"
-         "exit:\n"
-         "  ret void\n"
-         "continue:\n"
-         "  invoke void @sink() to label %normal unwind label %exception\n"
-         "continue_alt:\n"
-         "  invoke void @sink_alt() to label %normal unwind label %exception\n"
-         "exception:\n"
-         "  %cleanup = landingpad i8 cleanup\n"
-         "  br label %trivial-eh-handler\n"
-         "trivial-eh-handler:\n"
-         "  call void @sideeffect(i32 1)\n"
-         "  br label %normal\n"
-         "normal:\n"
-         "  call void @sideeffect(i32 0)\n"
-         "  ret void\n"
-         "}\n"
-         "\n"
-         "declare void @sideeffect(i32)\n"
-         "declare void @sink() cold\n"
-         "declare void @sink_alt() cold\n");
-
-  Function *F = M->getFunction("bar");
-
-  DominatorTree DT(*F);
-
-  LoopInfo LI(DT);
-
-  TargetLibraryInfoImpl TLII;
-  TargetLibraryInfo TLI(TLII);
-
-  AAResults AA(TLI);
-
-  MemorySSA MSSA(*F, &AA, &DT);
-  MemorySSAUpdater MSSAU(&MSSA);
-
-  BasicBlock *SrcBlock;
-  BasicBlock *DestBlock;
-
-  SrcBlock = getBasicBlockByName(*F, "continue");
-  DestBlock = getBasicBlockByName(*F, "exception");
-
-  unsigned SuccNum = GetSuccessorNumber(SrcBlock, DestBlock);
-  Instruction *LatchTerm = SrcBlock->getTerminator();
-
-  const CriticalEdgeSplittingOptions Options =
-      CriticalEdgeSplittingOptions(&DT, &LI, &MSSAU);
-
-  // Check that the following edge is both critical and the destination block is
-  // an exception block. These must be handled differently by SplitEdge
-  bool CriticalEdge =
-      isCriticalEdge(LatchTerm, SuccNum, Options.MergeIdenticalEdges);
-  EXPECT_TRUE(CriticalEdge);
-
-  bool Ehpad = DestBlock->isEHPad();
-  EXPECT_TRUE(Ehpad);
-
-  BasicBlock *NewBB = SplitEdge(SrcBlock, DestBlock, &DT, &LI, &MSSAU, "");
-
-  MSSA.verifyMemorySSA();
-  EXPECT_TRUE(DT.verify());
-  EXPECT_NE(NewBB, nullptr);
-  EXPECT_EQ(NewBB->getSinglePredecessor(), SrcBlock);
-  EXPECT_EQ(NewBB, SrcBlock->getTerminator()->getSuccessor(SuccNum));
-  EXPECT_EQ(NewBB->getParent(), F);
-
-  bool BBFlag = false;
-  for (BasicBlock &BB : *F) {
-    if (BB.getName() == NewBB->getName()) {
-      BBFlag = true;
-      break;
-    }
-  }
-  EXPECT_TRUE(BBFlag);
-}
-
-TEST(BasicBlockUtils, splitBasicBlockBefore_ex1) {
-  LLVMContext C;
-  std::unique_ptr<Module> M = parseIR(C, "define void @foo() {\n"
-                                         "bb0:\n"
-                                         " %0 = mul i32 1, 2\n"
-                                         "  br label %bb2\n"
-                                         "bb1:\n"
-                                         "  br label %bb3\n"
-                                         "bb2:\n"
-                                         "  %1 = phi  i32 [ %0, %bb0 ]\n"
-                                         "  br label %bb3\n"
-                                         "bb3:\n"
-                                         "  ret void\n"
-                                         "}\n"
-                                         "\n");
-
-  Function *F = M->getFunction("foo");
-  DominatorTree DT(*F);
-
-  BasicBlock *DestBlock;
-  BasicBlock *NewBB;
-
-  DestBlock = getBasicBlockByName(*F, "bb2");
-
-  NewBB = DestBlock->splitBasicBlockBefore(DestBlock->front().getIterator(),
-                                           "test");
-
-  PHINode *PN = dyn_cast<PHINode>(&(DestBlock->front()));
-  EXPECT_EQ(PN->getIncomingBlock(0), NewBB);
-  EXPECT_EQ(NewBB->getName(), "test");
-  EXPECT_EQ(NewBB->getSingleSuccessor(), DestBlock);
-  EXPECT_EQ(DestBlock->getSinglePredecessor(), NewBB);
-}
-
-#ifndef NDEBUG
-TEST(BasicBlockUtils, splitBasicBlockBefore_ex2) {
-  LLVMContext C;
-  std::unique_ptr<Module> M =
-      parseIR(C, "define void @foo() {\n"
-                 "bb0:\n"
-                 " %0 = mul i32 1, 2\n"
-                 "  br label %bb2\n"
-                 "bb1:\n"
-                 "  br label %bb2\n"
-                 "bb2:\n"
-                 "  %1 = phi  i32 [ %0, %bb0 ], [ 1, %bb1 ]\n"
-                 "  br label %bb3\n"
-                 "bb3:\n"
-                 "  ret void\n"
-                 "}\n"
-                 "\n");
-
-  Function *F = M->getFunction("foo");
-  DominatorTree DT(*F);
-
-  BasicBlock *DestBlock;
-
-  DestBlock = getBasicBlockByName(*F, "bb2");
-
-  ASSERT_DEATH(
-      {
-        DestBlock->splitBasicBlockBefore(DestBlock->front().getIterator(),
-                                         "test");
-      },
-      "cannot split on multi incoming phis");
-}
-#endif
-
-TEST(BasicBlockUtils, NoUnreachableBlocksToEliminate) {
-  LLVMContext C;
-
-  std::unique_ptr<Module> M = parseIR(
-    C,
-    "define i32 @no_unreachable(i1 %cond) {\n"
-    "entry:\n"
-    "  br i1 %cond, label %bb0, label %bb1\n"
-    "bb0:\n"
-    "  br label %bb1\n"
-    "bb1:\n"
-    "  %phi = phi i32 [ 0, %entry ], [ 1, %bb0 ]"
-    "  ret i32 %phi\n"
-    "}\n"
-    "\n"
-    );
-
-  auto *F = M->getFunction("no_unreachable");
-  DominatorTree DT(*F);
-  DomTreeUpdater DTU(DT, DomTreeUpdater::UpdateStrategy::Eager);
-
-  EXPECT_EQ(F->size(), (size_t)3);
-  bool Result = EliminateUnreachableBlocks(*F, &DTU);
-  EXPECT_FALSE(Result);
-  EXPECT_EQ(F->size(), (size_t)3);
-  EXPECT_TRUE(DT.verify());
-}
-
-TEST(BasicBlockUtils, SplitBlockPredecessors) {
-  LLVMContext C;
-
-  std::unique_ptr<Module> M = parseIR(
-    C,
-    "define i32 @basic_func(i1 %cond) {\n"
-    "entry:\n"
-    "  br i1 %cond, label %bb0, label %bb1\n"
-    "bb0:\n"
-    "  br label %bb1\n"
-    "bb1:\n"
-    "  %phi = phi i32 [ 0, %entry ], [ 1, %bb0 ]"
-    "  ret i32 %phi\n"
-    "}\n"
-    "\n"
-    );
-
-  auto *F = M->getFunction("basic_func");
-  DominatorTree DT(*F);
-
-  // Make sure the dominator tree is properly updated if calling this on the
-  // entry block.
-  SplitBlockPredecessors(&F->getEntryBlock(), {}, "split.entry", &DT);
-  EXPECT_TRUE(DT.verify());
-}
-
-TEST(BasicBlockUtils, SplitCriticalEdge) {
-  LLVMContext C;
-
-  std::unique_ptr<Module> M = parseIR(
-    C,
-    "define void @crit_edge(i1 %cond0, i1 %cond1) {\n"
-    "entry:\n"
-    "  br i1 %cond0, label %bb0, label %bb1\n"
-    "bb0:\n"
-    "  br label %bb1\n"
-    "bb1:\n"
-    "  br label %bb2\n"
-    "bb2:\n"
-    "  ret void\n"
-    "}\n"
-    "\n"
-    );
-
-  auto *F = M->getFunction("crit_edge");
-  DominatorTree DT(*F);
-  PostDominatorTree PDT(*F);
-
-  CriticalEdgeSplittingOptions CESO(&DT, nullptr, nullptr, &PDT);
-  EXPECT_EQ(1u, SplitAllCriticalEdges(*F, CESO));
-  EXPECT_TRUE(DT.verify());
-  EXPECT_TRUE(PDT.verify());
-}
-
-TEST(BasicBlockUtils, SplitIndirectBrCriticalEdge) {
-  LLVMContext C;
-
-  std::unique_ptr<Module> M =
-      parseIR(C, "define void @crit_edge(i8* %cond0, i1 %cond1) {\n"
-                 "entry:\n"
-                 "  indirectbr i8* %cond0, [label %bb0, label %bb1]\n"
-                 "bb0:\n"
-                 "  br label %bb1\n"
-                 "bb1:\n"
-                 "  %p = phi i32 [0, %bb0], [0, %entry]\n"
-                 "  br i1 %cond1, label %bb2, label %bb3\n"
-                 "bb2:\n"
-                 "  ret void\n"
-                 "bb3:\n"
-                 "  ret void\n"
-                 "}\n");
-
-  auto *F = M->getFunction("crit_edge");
-  DominatorTree DT(*F);
-  LoopInfo LI(DT);
-  BranchProbabilityInfo BPI(*F, LI);
-  BlockFrequencyInfo BFI(*F, BPI, LI);
-
-  auto Block = [&F](StringRef BBName) -> const BasicBlock & {
-    for (auto &BB : *F)
-      if (BB.getName() == BBName)
-        return BB;
-    llvm_unreachable("Block not found");
-  };
-
-  bool Split = SplitIndirectBrCriticalEdges(*F, &BPI, &BFI);
-
-  EXPECT_TRUE(Split);
-
-  // Check that successors of the split block get their probability correct.
-  BasicBlock *SplitBB = Block("bb1").getTerminator()->getSuccessor(0);
-  EXPECT_EQ(2u, SplitBB->getTerminator()->getNumSuccessors());
-  EXPECT_EQ(BranchProbability(1, 2), BPI.getEdgeProbability(SplitBB, 0u));
-  EXPECT_EQ(BranchProbability(1, 2), BPI.getEdgeProbability(SplitBB, 1u));
-}
-
-TEST(BasicBlockUtils, SetEdgeProbability) {
-  LLVMContext C;
-
-  std::unique_ptr<Module> M = parseIR(
-      C, "define void @edge_probability(i32 %0) {\n"
-         "entry:\n"
-         "switch i32 %0, label %LD [\n"
-         "  i32 700, label %L0\n"
-         "  i32 701, label %L1\n"
-         "  i32 702, label %L2\n"
-         "  i32 703, label %L3\n"
-         "  i32 704, label %L4\n"
-         "  i32 705, label %L5\n"
-         "  i32 706, label %L6\n"
-         "  i32 707, label %L7\n"
-         "  i32 708, label %L8\n"
-         "  i32 709, label %L9\n"
-         "  i32 710, label %L10\n"
-         "  i32 711, label %L11\n"
-         "  i32 712, label %L12\n"
-         "  i32 713, label %L13\n"
-         "  i32 714, label %L14\n"
-         "  i32 715, label %L15\n"
-         "  i32 716, label %L16\n"
-         "  i32 717, label %L17\n"
-         "  i32 718, label %L18\n"
-         "  i32 719, label %L19\n"
-         "], !prof !{!\"branch_weights\", i32 1, i32 1, i32 1, i32 1, i32 1, "
-         "i32 451, i32 1, i32 12, i32 1, i32 1, i32 1, i32 1, i32 1, i32 1, "
-         "i32 1, i32 1, i32 1, i32 1, i32 1, i32 1, i32 1}\n"
-         "LD:\n"
-         "  unreachable\n"
-         "L0:\n"
-         "  ret void\n"
-         "L1:\n"
-         "  ret void\n"
-         "L2:\n"
-         "  ret void\n"
-         "L3:\n"
-         "  ret void\n"
-         "L4:\n"
-         "  ret void\n"
-         "L5:\n"
-         "  ret void\n"
-         "L6:\n"
-         "  ret void\n"
-         "L7:\n"
-         "  ret void\n"
-         "L8:\n"
-         "  ret void\n"
-         "L9:\n"
-         "  ret void\n"
-         "L10:\n"
-         "  ret void\n"
-         "L11:\n"
-         "  ret void\n"
-         "L12:\n"
-         "  ret void\n"
-         "L13:\n"
-         "  ret void\n"
-         "L14:\n"
-         "  ret void\n"
-         "L15:\n"
-         "  ret void\n"
-         "L16:\n"
-         "  ret void\n"
-         "L17:\n"
-         "  ret void\n"
-         "L18:\n"
-         "  ret void\n"
-         "L19:\n"
-         "  ret void\n"
-         "}\n");
-
-  auto *F = M->getFunction("edge_probability");
-  DominatorTree DT(*F);
-  LoopInfo LI(DT);
-  BranchProbabilityInfo BPI(*F, LI);
-
-  auto Block = [&F](StringRef BBName) -> const BasicBlock & {
-    for (auto &BB : *F)
-      if (BB.getName() == BBName)
-        return BB;
-    llvm_unreachable("Block not found");
-  };
-
-  // Check that the unreachable block has the minimal probability.
-  const BasicBlock &EntryBB = Block("entry");
-  const BasicBlock &UnreachableBB = Block("LD");
-  EXPECT_EQ(BranchProbability::getRaw(1),
-            BPI.getEdgeProbability(&EntryBB, &UnreachableBB));
-}
diff --git a/gnu/llvm/llvm/unittests/Transforms/Utils/CMakeLists.txt b/gnu/llvm/llvm/unittests/Transforms/Utils/CMakeLists.txt
deleted file mode 100644
index af26c24b40d..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/Utils/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  Analysis
-  AsmParser
-  BitWriter
-  Core
-  Support
-  TransformUtils
-  )
-
-add_llvm_unittest(UtilsTests
-  ASanStackFrameLayoutTest.cpp
-  BasicBlockUtilsTest.cpp
-  CallPromotionUtilsTest.cpp
-  CloningTest.cpp
-  CodeExtractorTest.cpp
-  CodeMoverUtilsTest.cpp
-  DebugifyTest.cpp
-  FunctionComparatorTest.cpp
-  IntegerDivisionTest.cpp
-  LocalTest.cpp
-  LoopRotationUtilsTest.cpp
-  LoopUtilsTest.cpp
-  ModuleUtilsTest.cpp
-  ScalarEvolutionExpanderTest.cpp
-  SizeOptsTest.cpp
-  SSAUpdaterBulkTest.cpp
-  UnrollLoopTest.cpp
-  ValueMapperTest.cpp
-  VFABIUtils.cpp
-  )
diff --git a/gnu/llvm/llvm/unittests/Transforms/Utils/CallPromotionUtilsTest.cpp b/gnu/llvm/llvm/unittests/Transforms/Utils/CallPromotionUtilsTest.cpp
deleted file mode 100644
index eff8e27d36d..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/Utils/CallPromotionUtilsTest.cpp
+++ /dev/null
@@ -1,370 +0,0 @@
-//===- CallPromotionUtilsTest.cpp - CallPromotionUtils unit tests ---------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Transforms/Utils/CallPromotionUtils.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-static std::unique_ptr<Module> parseIR(LLVMContext &C, const char *IR) {
-  SMDiagnostic Err;
-  std::unique_ptr<Module> Mod = parseAssemblyString(IR, Err, C);
-  if (!Mod)
-    Err.print("UtilsTests", errs());
-  return Mod;
-}
-
-TEST(CallPromotionUtilsTest, TryPromoteCall) {
-  LLVMContext C;
-  std::unique_ptr<Module> M = parseIR(C,
-                                      R"IR(
-%class.Impl = type <{ %class.Interface, i32, [4 x i8] }>
-%class.Interface = type { i32 (...)** }
-
-@_ZTV4Impl = constant { [3 x i8*] } { [3 x i8*] [i8* null, i8* null, i8* bitcast (void (%class.Impl*)* @_ZN4Impl3RunEv to i8*)] }
-
-define void @f() {
-entry:
-  %o = alloca %class.Impl
-  %base = getelementptr %class.Impl, %class.Impl* %o, i64 0, i32 0, i32 0
-  store i32 (...)** bitcast (i8** getelementptr inbounds ({ [3 x i8*] }, { [3 x i8*] }* @_ZTV4Impl, i64 0, inrange i32 0, i64 2) to i32 (...)**), i32 (...)*** %base
-  %f = getelementptr inbounds %class.Impl, %class.Impl* %o, i64 0, i32 1
-  store i32 3, i32* %f
-  %base.i = getelementptr inbounds %class.Impl, %class.Impl* %o, i64 0, i32 0
-  %c = bitcast %class.Interface* %base.i to void (%class.Interface*)***
-  %vtable.i = load void (%class.Interface*)**, void (%class.Interface*)*** %c
-  %fp = load void (%class.Interface*)*, void (%class.Interface*)** %vtable.i
-  call void %fp(%class.Interface* nonnull %base.i)
-  ret void
-}
-
-declare void @_ZN4Impl3RunEv(%class.Impl* %this)
-)IR");
-
-  auto *GV = M->getNamedValue("f");
-  ASSERT_TRUE(GV);
-  auto *F = dyn_cast<Function>(GV);
-  ASSERT_TRUE(F);
-  Instruction *Inst = &F->front().front();
-  auto *AI = dyn_cast<AllocaInst>(Inst);
-  ASSERT_TRUE(AI);
-  Inst = &*++F->front().rbegin();
-  auto *CI = dyn_cast<CallInst>(Inst);
-  ASSERT_TRUE(CI);
-  ASSERT_FALSE(CI->getCalledFunction());
-  bool IsPromoted = tryPromoteCall(*CI);
-  EXPECT_TRUE(IsPromoted);
-  GV = M->getNamedValue("_ZN4Impl3RunEv");
-  ASSERT_TRUE(GV);
-  auto *F1 = dyn_cast<Function>(GV);
-  EXPECT_EQ(F1, CI->getCalledFunction());
-}
-
-TEST(CallPromotionUtilsTest, TryPromoteCall_NoFPLoad) {
-  LLVMContext C;
-  std::unique_ptr<Module> M = parseIR(C,
-                                      R"IR(
-%class.Impl = type <{ %class.Interface, i32, [4 x i8] }>
-%class.Interface = type { i32 (...)** }
-
-define void @f(void (%class.Interface*)* %fp, %class.Interface* nonnull %base.i) {
-entry:
-  call void %fp(%class.Interface* nonnull %base.i)
-  ret void
-}
-)IR");
-
-  auto *GV = M->getNamedValue("f");
-  ASSERT_TRUE(GV);
-  auto *F = dyn_cast<Function>(GV);
-  ASSERT_TRUE(F);
-  Instruction *Inst = &F->front().front();
-  auto *CI = dyn_cast<CallInst>(Inst);
-  ASSERT_TRUE(CI);
-  ASSERT_FALSE(CI->getCalledFunction());
-  bool IsPromoted = tryPromoteCall(*CI);
-  EXPECT_FALSE(IsPromoted);
-}
-
-TEST(CallPromotionUtilsTest, TryPromoteCall_NoVTablePtrLoad) {
-  LLVMContext C;
-  std::unique_ptr<Module> M = parseIR(C,
-                                      R"IR(
-%class.Impl = type <{ %class.Interface, i32, [4 x i8] }>
-%class.Interface = type { i32 (...)** }
-
-define void @f(void (%class.Interface*)** %vtable.i, %class.Interface* nonnull %base.i) {
-entry:
-  %fp = load void (%class.Interface*)*, void (%class.Interface*)** %vtable.i
-  call void %fp(%class.Interface* nonnull %base.i)
-  ret void
-}
-)IR");
-
-  auto *GV = M->getNamedValue("f");
-  ASSERT_TRUE(GV);
-  auto *F = dyn_cast<Function>(GV);
-  ASSERT_TRUE(F);
-  Instruction *Inst = &*++F->front().rbegin();
-  auto *CI = dyn_cast<CallInst>(Inst);
-  ASSERT_TRUE(CI);
-  ASSERT_FALSE(CI->getCalledFunction());
-  bool IsPromoted = tryPromoteCall(*CI);
-  EXPECT_FALSE(IsPromoted);
-}
-
-TEST(CallPromotionUtilsTest, TryPromoteCall_NoVTableInitFound) {
-  LLVMContext C;
-  std::unique_ptr<Module> M = parseIR(C,
-                                      R"IR(
-%class.Impl = type <{ %class.Interface, i32, [4 x i8] }>
-%class.Interface = type { i32 (...)** }
-
-define void @f() {
-entry:
-  %o = alloca %class.Impl
-  %f = getelementptr inbounds %class.Impl, %class.Impl* %o, i64 0, i32 1
-  store i32 3, i32* %f
-  %base.i = getelementptr inbounds %class.Impl, %class.Impl* %o, i64 0, i32 0
-  %c = bitcast %class.Interface* %base.i to void (%class.Interface*)***
-  %vtable.i = load void (%class.Interface*)**, void (%class.Interface*)*** %c
-  %fp = load void (%class.Interface*)*, void (%class.Interface*)** %vtable.i
-  call void %fp(%class.Interface* nonnull %base.i)
-  ret void
-}
-
-declare void @_ZN4Impl3RunEv(%class.Impl* %this)
-)IR");
-
-  auto *GV = M->getNamedValue("f");
-  ASSERT_TRUE(GV);
-  auto *F = dyn_cast<Function>(GV);
-  ASSERT_TRUE(F);
-  Instruction *Inst = &*++F->front().rbegin();
-  auto *CI = dyn_cast<CallInst>(Inst);
-  ASSERT_TRUE(CI);
-  ASSERT_FALSE(CI->getCalledFunction());
-  bool IsPromoted = tryPromoteCall(*CI);
-  EXPECT_FALSE(IsPromoted);
-}
-
-TEST(CallPromotionUtilsTest, TryPromoteCall_EmptyVTable) {
-  LLVMContext C;
-  std::unique_ptr<Module> M = parseIR(C,
-                                      R"IR(
-%class.Impl = type <{ %class.Interface, i32, [4 x i8] }>
-%class.Interface = type { i32 (...)** }
-
-@_ZTV4Impl = external global { [3 x i8*] }
-
-define void @f() {
-entry:
-  %o = alloca %class.Impl
-  %base = getelementptr %class.Impl, %class.Impl* %o, i64 0, i32 0, i32 0
-  store i32 (...)** bitcast (i8** getelementptr inbounds ({ [3 x i8*] }, { [3 x i8*] }* @_ZTV4Impl, i64 0, inrange i32 0, i64 2) to i32 (...)**), i32 (...)*** %base
-  %f = getelementptr inbounds %class.Impl, %class.Impl* %o, i64 0, i32 1
-  store i32 3, i32* %f
-  %base.i = getelementptr inbounds %class.Impl, %class.Impl* %o, i64 0, i32 0
-  %c = bitcast %class.Interface* %base.i to void (%class.Interface*)***
-  %vtable.i = load void (%class.Interface*)**, void (%class.Interface*)*** %c
-  %fp = load void (%class.Interface*)*, void (%class.Interface*)** %vtable.i
-  call void %fp(%class.Interface* nonnull %base.i)
-  ret void
-}
-
-declare void @_ZN4Impl3RunEv(%class.Impl* %this)
-)IR");
-
-  auto *GV = M->getNamedValue("f");
-  ASSERT_TRUE(GV);
-  auto *F = dyn_cast<Function>(GV);
-  ASSERT_TRUE(F);
-  Instruction *Inst = &F->front().front();
-  auto *AI = dyn_cast<AllocaInst>(Inst);
-  ASSERT_TRUE(AI);
-  Inst = &*++F->front().rbegin();
-  auto *CI = dyn_cast<CallInst>(Inst);
-  ASSERT_TRUE(CI);
-  ASSERT_FALSE(CI->getCalledFunction());
-  bool IsPromoted = tryPromoteCall(*CI);
-  EXPECT_FALSE(IsPromoted);
-}
-
-TEST(CallPromotionUtilsTest, TryPromoteCall_NullFP) {
-  LLVMContext C;
-  std::unique_ptr<Module> M = parseIR(C,
-                                      R"IR(
-%class.Impl = type <{ %class.Interface, i32, [4 x i8] }>
-%class.Interface = type { i32 (...)** }
-
-@_ZTV4Impl = constant { [3 x i8*] } { [3 x i8*] [i8* null, i8* null, i8* null] }
-
-define void @f() {
-entry:
-  %o = alloca %class.Impl
-  %base = getelementptr %class.Impl, %class.Impl* %o, i64 0, i32 0, i32 0
-  store i32 (...)** bitcast (i8** getelementptr inbounds ({ [3 x i8*] }, { [3 x i8*] }* @_ZTV4Impl, i64 0, inrange i32 0, i64 2) to i32 (...)**), i32 (...)*** %base
-  %f = getelementptr inbounds %class.Impl, %class.Impl* %o, i64 0, i32 1
-  store i32 3, i32* %f
-  %base.i = getelementptr inbounds %class.Impl, %class.Impl* %o, i64 0, i32 0
-  %c = bitcast %class.Interface* %base.i to void (%class.Interface*)***
-  %vtable.i = load void (%class.Interface*)**, void (%class.Interface*)*** %c
-  %fp = load void (%class.Interface*)*, void (%class.Interface*)** %vtable.i
-  call void %fp(%class.Interface* nonnull %base.i)
-  ret void
-}
-
-declare void @_ZN4Impl3RunEv(%class.Impl* %this)
-)IR");
-
-  auto *GV = M->getNamedValue("f");
-  ASSERT_TRUE(GV);
-  auto *F = dyn_cast<Function>(GV);
-  ASSERT_TRUE(F);
-  Instruction *Inst = &F->front().front();
-  auto *AI = dyn_cast<AllocaInst>(Inst);
-  ASSERT_TRUE(AI);
-  Inst = &*++F->front().rbegin();
-  auto *CI = dyn_cast<CallInst>(Inst);
-  ASSERT_TRUE(CI);
-  ASSERT_FALSE(CI->getCalledFunction());
-  bool IsPromoted = tryPromoteCall(*CI);
-  EXPECT_FALSE(IsPromoted);
-}
-
-// Based on clang/test/CodeGenCXX/member-function-pointer-calls.cpp
-TEST(CallPromotionUtilsTest, TryPromoteCall_MemberFunctionCalls) {
-  LLVMContext C;
-  std::unique_ptr<Module> M = parseIR(C,
-                                      R"IR(
-%struct.A = type { i32 (...)** }
-
-@_ZTV1A = linkonce_odr unnamed_addr constant { [4 x i8*] } { [4 x i8*] [i8* null, i8* null, i8* bitcast (i32 (%struct.A*)* @_ZN1A3vf1Ev to i8*), i8* bitcast (i32 (%struct.A*)* @_ZN1A3vf2Ev to i8*)] }, align 8
-
-define i32 @_Z2g1v() {
-entry:
-  %a = alloca %struct.A, align 8
-  %0 = bitcast %struct.A* %a to i8*
-  %1 = getelementptr %struct.A, %struct.A* %a, i64 0, i32 0
-  store i32 (...)** bitcast (i8** getelementptr inbounds ({ [4 x i8*] }, { [4 x i8*] }* @_ZTV1A, i64 0, inrange i32 0, i64 2) to i32 (...)**), i32 (...)*** %1, align 8
-  %2 = bitcast %struct.A* %a to i8*
-  %3 = bitcast i8* %2 to i8**
-  %vtable.i = load i8*, i8** %3, align 8
-  %4 = bitcast i8* %vtable.i to i32 (%struct.A*)**
-  %memptr.virtualfn.i = load i32 (%struct.A*)*, i32 (%struct.A*)** %4, align 8
-  %call.i = call i32 %memptr.virtualfn.i(%struct.A* %a)
-  ret i32 %call.i
-}
-
-define i32 @_Z2g2v() {
-entry:
-  %a = alloca %struct.A, align 8
-  %0 = bitcast %struct.A* %a to i8*
-  %1 = getelementptr %struct.A, %struct.A* %a, i64 0, i32 0
-  store i32 (...)** bitcast (i8** getelementptr inbounds ({ [4 x i8*] }, { [4 x i8*] }* @_ZTV1A, i64 0, inrange i32 0, i64 2) to i32 (...)**), i32 (...)*** %1, align 8
-  %2 = bitcast %struct.A* %a to i8*
-  %3 = bitcast i8* %2 to i8**
-  %vtable.i = load i8*, i8** %3, align 8
-  %4 = getelementptr i8, i8* %vtable.i, i64 8
-  %5 = bitcast i8* %4 to i32 (%struct.A*)**
-  %memptr.virtualfn.i = load i32 (%struct.A*)*, i32 (%struct.A*)** %5, align 8
-  %call.i = call i32 %memptr.virtualfn.i(%struct.A* %a)
-  ret i32 %call.i
-}
-
-declare i32 @_ZN1A3vf1Ev(%struct.A* %this)
-declare i32 @_ZN1A3vf2Ev(%struct.A* %this)
-)IR");
-
-  auto *GV = M->getNamedValue("_Z2g1v");
-  ASSERT_TRUE(GV);
-  auto *F = dyn_cast<Function>(GV);
-  ASSERT_TRUE(F);
-  Instruction *Inst = &F->front().front();
-  auto *AI = dyn_cast<AllocaInst>(Inst);
-  ASSERT_TRUE(AI);
-  Inst = &*++F->front().rbegin();
-  auto *CI = dyn_cast<CallInst>(Inst);
-  ASSERT_TRUE(CI);
-  ASSERT_FALSE(CI->getCalledFunction());
-  bool IsPromoted1 = tryPromoteCall(*CI);
-  EXPECT_TRUE(IsPromoted1);
-  GV = M->getNamedValue("_ZN1A3vf1Ev");
-  ASSERT_TRUE(GV);
-  F = dyn_cast<Function>(GV);
-  EXPECT_EQ(F, CI->getCalledFunction());
-
-  GV = M->getNamedValue("_Z2g2v");
-  ASSERT_TRUE(GV);
-  F = dyn_cast<Function>(GV);
-  ASSERT_TRUE(F);
-  Inst = &F->front().front();
-  AI = dyn_cast<AllocaInst>(Inst);
-  ASSERT_TRUE(AI);
-  Inst = &*++F->front().rbegin();
-  CI = dyn_cast<CallInst>(Inst);
-  ASSERT_TRUE(CI);
-  ASSERT_FALSE(CI->getCalledFunction());
-  bool IsPromoted2 = tryPromoteCall(*CI);
-  EXPECT_TRUE(IsPromoted2);
-  GV = M->getNamedValue("_ZN1A3vf2Ev");
-  ASSERT_TRUE(GV);
-  F = dyn_cast<Function>(GV);
-  EXPECT_EQ(F, CI->getCalledFunction());
-}
-
-// Check that it isn't crashing due to missing promotion legality.
-TEST(CallPromotionUtilsTest, TryPromoteCall_Legality) {
-  LLVMContext C;
-  std::unique_ptr<Module> M = parseIR(C,
-                                      R"IR(
-%struct1 = type <{ i32, i64 }>
-%struct2 = type <{ i32, i64 }>
-
-%class.Impl = type <{ %class.Interface, i32, [4 x i8] }>
-%class.Interface = type { i32 (...)** }
-
-@_ZTV4Impl = constant { [3 x i8*] } { [3 x i8*] [i8* null, i8* null, i8* bitcast (%struct2 (%class.Impl*)* @_ZN4Impl3RunEv to i8*)] }
-
-define %struct1 @f() {
-entry:
-  %o = alloca %class.Impl
-  %base = getelementptr %class.Impl, %class.Impl* %o, i64 0, i32 0, i32 0
-  store i32 (...)** bitcast (i8** getelementptr inbounds ({ [3 x i8*] }, { [3 x i8*] }* @_ZTV4Impl, i64 0, inrange i32 0, i64 2) to i32 (...)**), i32 (...)*** %base
-  %f = getelementptr inbounds %class.Impl, %class.Impl* %o, i64 0, i32 1
-  store i32 3, i32* %f
-  %base.i = getelementptr inbounds %class.Impl, %class.Impl* %o, i64 0, i32 0
-  %c = bitcast %class.Interface* %base.i to %struct1 (%class.Interface*)***
-  %vtable.i = load %struct1 (%class.Interface*)**, %struct1 (%class.Interface*)*** %c
-  %fp = load %struct1 (%class.Interface*)*, %struct1 (%class.Interface*)** %vtable.i
-  %rv = call %struct1 %fp(%class.Interface* nonnull %base.i)
-  ret %struct1 %rv
-}
-
-declare %struct2 @_ZN4Impl3RunEv(%class.Impl* %this)
-)IR");
-
-  auto *GV = M->getNamedValue("f");
-  ASSERT_TRUE(GV);
-  auto *F = dyn_cast<Function>(GV);
-  ASSERT_TRUE(F);
-  Instruction *Inst = &F->front().front();
-  auto *AI = dyn_cast<AllocaInst>(Inst);
-  ASSERT_TRUE(AI);
-  Inst = &*++F->front().rbegin();
-  auto *CI = dyn_cast<CallInst>(Inst);
-  ASSERT_TRUE(CI);
-  ASSERT_FALSE(CI->getCalledFunction());
-  bool IsPromoted = tryPromoteCall(*CI);
-  EXPECT_FALSE(IsPromoted);
-}
diff --git a/gnu/llvm/llvm/unittests/Transforms/Utils/CloningTest.cpp b/gnu/llvm/llvm/unittests/Transforms/Utils/CloningTest.cpp
deleted file mode 100644
index 34802b63aae..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/Utils/CloningTest.cpp
+++ /dev/null
@@ -1,1028 +0,0 @@
-//===- Cloning.cpp - Unit tests for the Cloner ----------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Transforms/Utils/Cloning.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/SmallPtrSet.h"
-#include "llvm/Analysis/AliasAnalysis.h"
-#include "llvm/Analysis/DomTreeUpdater.h"
-#include "llvm/Analysis/LoopInfo.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Argument.h"
-#include "llvm/IR/Constant.h"
-#include "llvm/IR/DIBuilder.h"
-#include "llvm/IR/DebugInfo.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/InstIterator.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/IntrinsicInst.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/Verifier.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-class CloneInstruction : public ::testing::Test {
-protected:
-  void SetUp() override { V = nullptr; }
-
-  template <typename T>
-  T *clone(T *V1) {
-    Value *V2 = V1->clone();
-    Orig.insert(V1);
-    Clones.insert(V2);
-    return cast<T>(V2);
-  }
-
-  void eraseClones() {
-    for (Value *V : Clones)
-      V->deleteValue();
-    Clones.clear();
-  }
-
-  void TearDown() override {
-    eraseClones();
-    for (Value *V : Orig)
-      V->deleteValue();
-    Orig.clear();
-    if (V)
-      V->deleteValue();
-  }
-
-  SmallPtrSet<Value *, 4> Orig;   // Erase on exit
-  SmallPtrSet<Value *, 4> Clones; // Erase in eraseClones
-
-  LLVMContext context;
-  Value *V;
-};
-
-TEST_F(CloneInstruction, OverflowBits) {
-  V = new Argument(Type::getInt32Ty(context));
-
-  BinaryOperator *Add = BinaryOperator::Create(Instruction::Add, V, V);
-  BinaryOperator *Sub = BinaryOperator::Create(Instruction::Sub, V, V);
-  BinaryOperator *Mul = BinaryOperator::Create(Instruction::Mul, V, V);
-
-  BinaryOperator *AddClone = this->clone(Add);
-  BinaryOperator *SubClone = this->clone(Sub);
-  BinaryOperator *MulClone = this->clone(Mul);
-
-  EXPECT_FALSE(AddClone->hasNoUnsignedWrap());
-  EXPECT_FALSE(AddClone->hasNoSignedWrap());
-  EXPECT_FALSE(SubClone->hasNoUnsignedWrap());
-  EXPECT_FALSE(SubClone->hasNoSignedWrap());
-  EXPECT_FALSE(MulClone->hasNoUnsignedWrap());
-  EXPECT_FALSE(MulClone->hasNoSignedWrap());
-
-  eraseClones();
-
-  Add->setHasNoUnsignedWrap();
-  Sub->setHasNoUnsignedWrap();
-  Mul->setHasNoUnsignedWrap();
-
-  AddClone = this->clone(Add);
-  SubClone = this->clone(Sub);
-  MulClone = this->clone(Mul);
-
-  EXPECT_TRUE(AddClone->hasNoUnsignedWrap());
-  EXPECT_FALSE(AddClone->hasNoSignedWrap());
-  EXPECT_TRUE(SubClone->hasNoUnsignedWrap());
-  EXPECT_FALSE(SubClone->hasNoSignedWrap());
-  EXPECT_TRUE(MulClone->hasNoUnsignedWrap());
-  EXPECT_FALSE(MulClone->hasNoSignedWrap());
-
-  eraseClones();
-
-  Add->setHasNoSignedWrap();
-  Sub->setHasNoSignedWrap();
-  Mul->setHasNoSignedWrap();
-
-  AddClone = this->clone(Add);
-  SubClone = this->clone(Sub);
-  MulClone = this->clone(Mul);
-
-  EXPECT_TRUE(AddClone->hasNoUnsignedWrap());
-  EXPECT_TRUE(AddClone->hasNoSignedWrap());
-  EXPECT_TRUE(SubClone->hasNoUnsignedWrap());
-  EXPECT_TRUE(SubClone->hasNoSignedWrap());
-  EXPECT_TRUE(MulClone->hasNoUnsignedWrap());
-  EXPECT_TRUE(MulClone->hasNoSignedWrap());
-
-  eraseClones();
-
-  Add->setHasNoUnsignedWrap(false);
-  Sub->setHasNoUnsignedWrap(false);
-  Mul->setHasNoUnsignedWrap(false);
-
-  AddClone = this->clone(Add);
-  SubClone = this->clone(Sub);
-  MulClone = this->clone(Mul);
-
-  EXPECT_FALSE(AddClone->hasNoUnsignedWrap());
-  EXPECT_TRUE(AddClone->hasNoSignedWrap());
-  EXPECT_FALSE(SubClone->hasNoUnsignedWrap());
-  EXPECT_TRUE(SubClone->hasNoSignedWrap());
-  EXPECT_FALSE(MulClone->hasNoUnsignedWrap());
-  EXPECT_TRUE(MulClone->hasNoSignedWrap());
-}
-
-TEST_F(CloneInstruction, Inbounds) {
-  V = new Argument(Type::getInt32PtrTy(context));
-
-  Constant *Z = Constant::getNullValue(Type::getInt32Ty(context));
-  std::vector<Value *> ops;
-  ops.push_back(Z);
-  GetElementPtrInst *GEP =
-      GetElementPtrInst::Create(Type::getInt32Ty(context), V, ops);
-  EXPECT_FALSE(this->clone(GEP)->isInBounds());
-
-  GEP->setIsInBounds();
-  EXPECT_TRUE(this->clone(GEP)->isInBounds());
-}
-
-TEST_F(CloneInstruction, Exact) {
-  V = new Argument(Type::getInt32Ty(context));
-
-  BinaryOperator *SDiv = BinaryOperator::Create(Instruction::SDiv, V, V);
-  EXPECT_FALSE(this->clone(SDiv)->isExact());
-
-  SDiv->setIsExact(true);
-  EXPECT_TRUE(this->clone(SDiv)->isExact());
-}
-
-TEST_F(CloneInstruction, Attributes) {
-  Type *ArgTy1[] = { Type::getInt32PtrTy(context) };
-  FunctionType *FT1 =  FunctionType::get(Type::getVoidTy(context), ArgTy1, false);
-
-  Function *F1 = Function::Create(FT1, Function::ExternalLinkage);
-  BasicBlock *BB = BasicBlock::Create(context, "", F1);
-  IRBuilder<> Builder(BB);
-  Builder.CreateRetVoid();
-
-  Function *F2 = Function::Create(FT1, Function::ExternalLinkage);
-
-  Argument *A = &*F1->arg_begin();
-  A->addAttr(Attribute::NoCapture);
-
-  SmallVector<ReturnInst*, 4> Returns;
-  ValueToValueMapTy VMap;
-  VMap[A] = UndefValue::get(A->getType());
-
-  CloneFunctionInto(F2, F1, VMap, CloneFunctionChangeType::LocalChangesOnly,
-                    Returns);
-  EXPECT_FALSE(F2->arg_begin()->hasNoCaptureAttr());
-
-  delete F1;
-  delete F2;
-}
-
-TEST_F(CloneInstruction, CallingConvention) {
-  Type *ArgTy1[] = { Type::getInt32PtrTy(context) };
-  FunctionType *FT1 =  FunctionType::get(Type::getVoidTy(context), ArgTy1, false);
-
-  Function *F1 = Function::Create(FT1, Function::ExternalLinkage);
-  F1->setCallingConv(CallingConv::Cold);
-  BasicBlock *BB = BasicBlock::Create(context, "", F1);
-  IRBuilder<> Builder(BB);
-  Builder.CreateRetVoid();
-
-  Function *F2 = Function::Create(FT1, Function::ExternalLinkage);
-
-  SmallVector<ReturnInst*, 4> Returns;
-  ValueToValueMapTy VMap;
-  VMap[&*F1->arg_begin()] = &*F2->arg_begin();
-
-  CloneFunctionInto(F2, F1, VMap, CloneFunctionChangeType::LocalChangesOnly,
-                    Returns);
-  EXPECT_EQ(CallingConv::Cold, F2->getCallingConv());
-
-  delete F1;
-  delete F2;
-}
-
-TEST_F(CloneInstruction, DuplicateInstructionsToSplit) {
-  Type *ArgTy1[] = {Type::getInt32PtrTy(context)};
-  FunctionType *FT = FunctionType::get(Type::getVoidTy(context), ArgTy1, false);
-  V = new Argument(Type::getInt32Ty(context));
-
-  Function *F = Function::Create(FT, Function::ExternalLinkage);
-
-  BasicBlock *BB1 = BasicBlock::Create(context, "", F);
-  IRBuilder<> Builder1(BB1);
-
-  BasicBlock *BB2 = BasicBlock::Create(context, "", F);
-  IRBuilder<> Builder2(BB2);
-
-  Builder1.CreateBr(BB2);
-
-  Instruction *AddInst = cast<Instruction>(Builder2.CreateAdd(V, V));
-  Instruction *MulInst = cast<Instruction>(Builder2.CreateMul(AddInst, V));
-  Instruction *SubInst = cast<Instruction>(Builder2.CreateSub(MulInst, V));
-  Builder2.CreateRetVoid();
-
-  // Dummy DTU.
-  ValueToValueMapTy Mapping;
-  DomTreeUpdater DTU(DomTreeUpdater::UpdateStrategy::Lazy);
-  auto Split =
-      DuplicateInstructionsInSplitBetween(BB2, BB1, SubInst, Mapping, DTU);
-
-  EXPECT_TRUE(Split);
-  EXPECT_EQ(Mapping.size(), 2u);
-  EXPECT_TRUE(Mapping.find(AddInst) != Mapping.end());
-  EXPECT_TRUE(Mapping.find(MulInst) != Mapping.end());
-
-  auto AddSplit = dyn_cast<Instruction>(Mapping[AddInst]);
-  EXPECT_TRUE(AddSplit);
-  EXPECT_EQ(AddSplit->getOperand(0), V);
-  EXPECT_EQ(AddSplit->getOperand(1), V);
-  EXPECT_EQ(AddSplit->getParent(), Split);
-
-  auto MulSplit = dyn_cast<Instruction>(Mapping[MulInst]);
-  EXPECT_TRUE(MulSplit);
-  EXPECT_EQ(MulSplit->getOperand(0), AddSplit);
-  EXPECT_EQ(MulSplit->getOperand(1), V);
-  EXPECT_EQ(MulSplit->getParent(), Split);
-
-  EXPECT_EQ(AddSplit->getNextNode(), MulSplit);
-  EXPECT_EQ(MulSplit->getNextNode(), Split->getTerminator());
-
-  delete F;
-}
-
-TEST_F(CloneInstruction, DuplicateInstructionsToSplitBlocksEq1) {
-  Type *ArgTy1[] = {Type::getInt32PtrTy(context)};
-  FunctionType *FT = FunctionType::get(Type::getVoidTy(context), ArgTy1, false);
-  V = new Argument(Type::getInt32Ty(context));
-
-  Function *F = Function::Create(FT, Function::ExternalLinkage);
-
-  BasicBlock *BB1 = BasicBlock::Create(context, "", F);
-  IRBuilder<> Builder1(BB1);
-
-  BasicBlock *BB2 = BasicBlock::Create(context, "", F);
-  IRBuilder<> Builder2(BB2);
-
-  Builder1.CreateBr(BB2);
-
-  Instruction *AddInst = cast<Instruction>(Builder2.CreateAdd(V, V));
-  Instruction *MulInst = cast<Instruction>(Builder2.CreateMul(AddInst, V));
-  Instruction *SubInst = cast<Instruction>(Builder2.CreateSub(MulInst, V));
-  Builder2.CreateBr(BB2);
-
-  // Dummy DTU.
-  DomTreeUpdater DTU(DomTreeUpdater::UpdateStrategy::Lazy);
-  ValueToValueMapTy Mapping;
-  auto Split = DuplicateInstructionsInSplitBetween(
-      BB2, BB2, BB2->getTerminator(), Mapping, DTU);
-
-  EXPECT_TRUE(Split);
-  EXPECT_EQ(Mapping.size(), 3u);
-  EXPECT_TRUE(Mapping.find(AddInst) != Mapping.end());
-  EXPECT_TRUE(Mapping.find(MulInst) != Mapping.end());
-  EXPECT_TRUE(Mapping.find(SubInst) != Mapping.end());
-
-  auto AddSplit = dyn_cast<Instruction>(Mapping[AddInst]);
-  EXPECT_TRUE(AddSplit);
-  EXPECT_EQ(AddSplit->getOperand(0), V);
-  EXPECT_EQ(AddSplit->getOperand(1), V);
-  EXPECT_EQ(AddSplit->getParent(), Split);
-
-  auto MulSplit = dyn_cast<Instruction>(Mapping[MulInst]);
-  EXPECT_TRUE(MulSplit);
-  EXPECT_EQ(MulSplit->getOperand(0), AddSplit);
-  EXPECT_EQ(MulSplit->getOperand(1), V);
-  EXPECT_EQ(MulSplit->getParent(), Split);
-
-  auto SubSplit = dyn_cast<Instruction>(Mapping[SubInst]);
-  EXPECT_EQ(MulSplit->getNextNode(), SubSplit);
-  EXPECT_EQ(SubSplit->getNextNode(), Split->getTerminator());
-  EXPECT_EQ(Split->getSingleSuccessor(), BB2);
-  EXPECT_EQ(BB2->getSingleSuccessor(), Split);
-
-  delete F;
-}
-
-TEST_F(CloneInstruction, DuplicateInstructionsToSplitBlocksEq2) {
-  Type *ArgTy1[] = {Type::getInt32PtrTy(context)};
-  FunctionType *FT = FunctionType::get(Type::getVoidTy(context), ArgTy1, false);
-  V = new Argument(Type::getInt32Ty(context));
-
-  Function *F = Function::Create(FT, Function::ExternalLinkage);
-
-  BasicBlock *BB1 = BasicBlock::Create(context, "", F);
-  IRBuilder<> Builder1(BB1);
-
-  BasicBlock *BB2 = BasicBlock::Create(context, "", F);
-  IRBuilder<> Builder2(BB2);
-
-  Builder1.CreateBr(BB2);
-
-  Instruction *AddInst = cast<Instruction>(Builder2.CreateAdd(V, V));
-  Instruction *MulInst = cast<Instruction>(Builder2.CreateMul(AddInst, V));
-  Instruction *SubInst = cast<Instruction>(Builder2.CreateSub(MulInst, V));
-  Builder2.CreateBr(BB2);
-
-  // Dummy DTU.
-  DomTreeUpdater DTU(DomTreeUpdater::UpdateStrategy::Lazy);
-  ValueToValueMapTy Mapping;
-  auto Split =
-      DuplicateInstructionsInSplitBetween(BB2, BB2, SubInst, Mapping, DTU);
-
-  EXPECT_TRUE(Split);
-  EXPECT_EQ(Mapping.size(), 2u);
-  EXPECT_TRUE(Mapping.find(AddInst) != Mapping.end());
-  EXPECT_TRUE(Mapping.find(MulInst) != Mapping.end());
-
-  auto AddSplit = dyn_cast<Instruction>(Mapping[AddInst]);
-  EXPECT_TRUE(AddSplit);
-  EXPECT_EQ(AddSplit->getOperand(0), V);
-  EXPECT_EQ(AddSplit->getOperand(1), V);
-  EXPECT_EQ(AddSplit->getParent(), Split);
-
-  auto MulSplit = dyn_cast<Instruction>(Mapping[MulInst]);
-  EXPECT_TRUE(MulSplit);
-  EXPECT_EQ(MulSplit->getOperand(0), AddSplit);
-  EXPECT_EQ(MulSplit->getOperand(1), V);
-  EXPECT_EQ(MulSplit->getParent(), Split);
-  EXPECT_EQ(MulSplit->getNextNode(), Split->getTerminator());
-  EXPECT_EQ(Split->getSingleSuccessor(), BB2);
-  EXPECT_EQ(BB2->getSingleSuccessor(), Split);
-
-  delete F;
-}
-
-static void runWithLoopInfoAndDominatorTree(
-    Module &M, StringRef FuncName,
-    function_ref<void(Function &F, LoopInfo &LI, DominatorTree &DT)> Test) {
-  auto *F = M.getFunction(FuncName);
-  ASSERT_NE(F, nullptr) << "Could not find " << FuncName;
-
-  DominatorTree DT(*F);
-  LoopInfo LI(DT);
-
-  Test(*F, LI, DT);
-}
-
-static std::unique_ptr<Module> parseIR(LLVMContext &C, const char *IR) {
-  SMDiagnostic Err;
-  std::unique_ptr<Module> Mod = parseAssemblyString(IR, Err, C);
-  if (!Mod)
-    Err.print("CloneLoop", errs());
-  return Mod;
-}
-
-TEST(CloneLoop, CloneLoopNest) {
-  // Parse the module.
-  LLVMContext Context;
-
-  std::unique_ptr<Module> M = parseIR(
-    Context,
-    R"(define void @foo(i32* %A, i32 %ub) {
-entry:
-  %guardcmp = icmp slt i32 0, %ub
-  br i1 %guardcmp, label %for.outer.preheader, label %for.end
-for.outer.preheader:
-  br label %for.outer
-for.outer:
-  %j = phi i32 [ 0, %for.outer.preheader ], [ %inc.outer, %for.outer.latch ]
-  br i1 %guardcmp, label %for.inner.preheader, label %for.outer.latch
-for.inner.preheader:
-  br label %for.inner
-for.inner:
-  %i = phi i32 [ 0, %for.inner.preheader ], [ %inc, %for.inner ]
-  %idxprom = sext i32 %i to i64
-  %arrayidx = getelementptr inbounds i32, i32* %A, i64 %idxprom
-  store i32 %i, i32* %arrayidx, align 4
-  %inc = add nsw i32 %i, 1
-  %cmp = icmp slt i32 %inc, %ub
-  br i1 %cmp, label %for.inner, label %for.inner.exit
-for.inner.exit:
-  br label %for.outer.latch
-for.outer.latch:
-  %inc.outer = add nsw i32 %j, 1
-  %cmp.outer = icmp slt i32 %inc.outer, %ub
-  br i1 %cmp.outer, label %for.outer, label %for.outer.exit
-for.outer.exit:
-  br label %for.end
-for.end:
-  ret void
-})"
-    );
-
-  runWithLoopInfoAndDominatorTree(
-      *M, "foo", [&](Function &F, LoopInfo &LI, DominatorTree &DT) {
-        Function::iterator FI = F.begin();
-        // First basic block is entry - skip it.
-        BasicBlock *Preheader = &*(++FI);
-        BasicBlock *Header = &*(++FI);
-        assert(Header->getName() == "for.outer");
-        Loop *L = LI.getLoopFor(Header);
-        EXPECT_NE(L, nullptr);
-        EXPECT_EQ(Header, L->getHeader());
-        EXPECT_EQ(Preheader, L->getLoopPreheader());
-
-        ValueToValueMapTy VMap;
-        SmallVector<BasicBlock *, 4> ClonedLoopBlocks;
-        Loop *NewLoop = cloneLoopWithPreheader(Preheader, Preheader, L, VMap,
-                                               "", &LI, &DT, ClonedLoopBlocks);
-        EXPECT_NE(NewLoop, nullptr);
-        EXPECT_EQ(NewLoop->getSubLoops().size(), 1u);
-        Loop::block_iterator BI = NewLoop->block_begin();
-        EXPECT_TRUE((*BI)->getName().startswith("for.outer"));
-        EXPECT_TRUE((*(++BI))->getName().startswith("for.inner.preheader"));
-        EXPECT_TRUE((*(++BI))->getName().startswith("for.inner"));
-        EXPECT_TRUE((*(++BI))->getName().startswith("for.inner.exit"));
-        EXPECT_TRUE((*(++BI))->getName().startswith("for.outer.latch"));
-      });
-}
-
-class CloneFunc : public ::testing::Test {
-protected:
-  void SetUp() override {
-    SetupModule();
-    CreateOldFunc();
-    CreateNewFunc();
-    SetupFinder();
-  }
-
-  void TearDown() override { delete Finder; }
-
-  void SetupModule() {
-    M = new Module("", C);
-  }
-
-  void CreateOldFunc() {
-    FunctionType* FuncType = FunctionType::get(Type::getVoidTy(C), false);
-    OldFunc = Function::Create(FuncType, GlobalValue::PrivateLinkage, "f", M);
-    CreateOldFunctionBodyAndDI();
-  }
-
-  void CreateOldFunctionBodyAndDI() {
-    DIBuilder DBuilder(*M);
-    IRBuilder<> IBuilder(C);
-
-    // Function DI
-    auto *File = DBuilder.createFile("filename.c", "/file/dir/");
-    DITypeRefArray ParamTypes = DBuilder.getOrCreateTypeArray(None);
-    DISubroutineType *FuncType =
-        DBuilder.createSubroutineType(ParamTypes);
-    auto *CU = DBuilder.createCompileUnit(dwarf::DW_LANG_C99,
-                                          DBuilder.createFile("filename.c",
-                                                              "/file/dir"),
-                                          "CloneFunc", false, "", 0);
-
-    auto *Subprogram = DBuilder.createFunction(
-        CU, "f", "f", File, 4, FuncType, 3, DINode::FlagZero,
-        DISubprogram::SPFlagLocalToUnit | DISubprogram::SPFlagDefinition);
-    OldFunc->setSubprogram(Subprogram);
-
-    // Function body
-    BasicBlock* Entry = BasicBlock::Create(C, "", OldFunc);
-    IBuilder.SetInsertPoint(Entry);
-    DebugLoc Loc = DILocation::get(Subprogram->getContext(), 3, 2, Subprogram);
-    IBuilder.SetCurrentDebugLocation(Loc);
-    AllocaInst* Alloca = IBuilder.CreateAlloca(IntegerType::getInt32Ty(C));
-    IBuilder.SetCurrentDebugLocation(
-        DILocation::get(Subprogram->getContext(), 4, 2, Subprogram));
-    Value* AllocaContent = IBuilder.getInt32(1);
-    Instruction* Store = IBuilder.CreateStore(AllocaContent, Alloca);
-    IBuilder.SetCurrentDebugLocation(
-        DILocation::get(Subprogram->getContext(), 5, 2, Subprogram));
-
-    // Create a local variable around the alloca
-    auto *IntType = DBuilder.createBasicType("int", 32, dwarf::DW_ATE_signed);
-    auto *E = DBuilder.createExpression();
-    auto *Variable =
-        DBuilder.createAutoVariable(Subprogram, "x", File, 5, IntType, true);
-    auto *DL = DILocation::get(Subprogram->getContext(), 5, 0, Subprogram);
-    DBuilder.insertDeclare(Alloca, Variable, E, DL, Store);
-    DBuilder.insertDbgValueIntrinsic(AllocaContent, Variable, E, DL, Entry);
-    // Also create an inlined variable.
-    // Create a distinct struct type that we should not duplicate during
-    // cloning).
-    auto *StructType = DICompositeType::getDistinct(
-        C, dwarf::DW_TAG_structure_type, "some_struct", nullptr, 0, nullptr,
-        nullptr, 32, 32, 0, DINode::FlagZero, nullptr, 0, nullptr, nullptr);
-    auto *InlinedSP = DBuilder.createFunction(
-        CU, "inlined", "inlined", File, 8, FuncType, 9, DINode::FlagZero,
-        DISubprogram::SPFlagLocalToUnit | DISubprogram::SPFlagDefinition);
-    auto *InlinedVar =
-        DBuilder.createAutoVariable(InlinedSP, "inlined", File, 5, StructType, true);
-    auto *Scope = DBuilder.createLexicalBlock(
-        DBuilder.createLexicalBlockFile(InlinedSP, File), File, 1, 1);
-    auto InlinedDL = DILocation::get(
-        Subprogram->getContext(), 9, 4, Scope,
-        DILocation::get(Subprogram->getContext(), 5, 2, Subprogram));
-    IBuilder.SetCurrentDebugLocation(InlinedDL);
-    DBuilder.insertDeclare(Alloca, InlinedVar, E, InlinedDL, Store);
-    IBuilder.CreateStore(IBuilder.getInt32(2), Alloca);
-    // Finalize the debug info.
-    DBuilder.finalize();
-    IBuilder.CreateRetVoid();
-
-    // Create another, empty, compile unit.
-    DIBuilder DBuilder2(*M);
-    DBuilder2.createCompileUnit(dwarf::DW_LANG_C99,
-                                DBuilder.createFile("extra.c", "/file/dir"),
-                                "CloneFunc", false, "", 0);
-    DBuilder2.finalize();
-  }
-
-  void CreateNewFunc() {
-    ValueToValueMapTy VMap;
-    NewFunc = CloneFunction(OldFunc, VMap, nullptr);
-  }
-
-  void SetupFinder() {
-    Finder = new DebugInfoFinder();
-    Finder->processModule(*M);
-  }
-
-  LLVMContext C;
-  Function* OldFunc;
-  Function* NewFunc;
-  Module* M;
-  DebugInfoFinder* Finder;
-};
-
-// Test that a new, distinct function was created.
-TEST_F(CloneFunc, NewFunctionCreated) {
-  EXPECT_NE(OldFunc, NewFunc);
-}
-
-// Test that a new subprogram entry was added and is pointing to the new
-// function, while the original subprogram still points to the old one.
-TEST_F(CloneFunc, Subprogram) {
-  EXPECT_FALSE(verifyModule(*M, &errs()));
-  EXPECT_EQ(3U, Finder->subprogram_count());
-  EXPECT_NE(NewFunc->getSubprogram(), OldFunc->getSubprogram());
-}
-
-// Test that instructions in the old function still belong to it in the
-// metadata, while instruction in the new function belong to the new one.
-TEST_F(CloneFunc, InstructionOwnership) {
-  EXPECT_FALSE(verifyModule(*M));
-
-  inst_iterator OldIter = inst_begin(OldFunc);
-  inst_iterator OldEnd = inst_end(OldFunc);
-  inst_iterator NewIter = inst_begin(NewFunc);
-  inst_iterator NewEnd = inst_end(NewFunc);
-  while (OldIter != OldEnd && NewIter != NewEnd) {
-    Instruction& OldI = *OldIter;
-    Instruction& NewI = *NewIter;
-    EXPECT_NE(&OldI, &NewI);
-
-    EXPECT_EQ(OldI.hasMetadata(), NewI.hasMetadata());
-    if (OldI.hasMetadata()) {
-      const DebugLoc& OldDL = OldI.getDebugLoc();
-      const DebugLoc& NewDL = NewI.getDebugLoc();
-
-      // Verify that the debug location data is the same
-      EXPECT_EQ(OldDL.getLine(), NewDL.getLine());
-      EXPECT_EQ(OldDL.getCol(), NewDL.getCol());
-
-      // But that they belong to different functions
-      auto *OldSubprogram = cast<DISubprogram>(OldDL.getInlinedAtScope());
-      auto *NewSubprogram = cast<DISubprogram>(NewDL.getInlinedAtScope());
-      EXPECT_EQ(OldFunc->getSubprogram(), OldSubprogram);
-      EXPECT_EQ(NewFunc->getSubprogram(), NewSubprogram);
-    }
-
-    ++OldIter;
-    ++NewIter;
-  }
-  EXPECT_EQ(OldEnd, OldIter);
-  EXPECT_EQ(NewEnd, NewIter);
-}
-
-// Test that the arguments for debug intrinsics in the new function were
-// properly cloned
-TEST_F(CloneFunc, DebugIntrinsics) {
-  EXPECT_FALSE(verifyModule(*M));
-
-  inst_iterator OldIter = inst_begin(OldFunc);
-  inst_iterator OldEnd = inst_end(OldFunc);
-  inst_iterator NewIter = inst_begin(NewFunc);
-  inst_iterator NewEnd = inst_end(NewFunc);
-  while (OldIter != OldEnd && NewIter != NewEnd) {
-    Instruction& OldI = *OldIter;
-    Instruction& NewI = *NewIter;
-    if (DbgDeclareInst* OldIntrin = dyn_cast<DbgDeclareInst>(&OldI)) {
-      DbgDeclareInst* NewIntrin = dyn_cast<DbgDeclareInst>(&NewI);
-      EXPECT_TRUE(NewIntrin);
-
-      // Old address must belong to the old function
-      EXPECT_EQ(OldFunc, cast<AllocaInst>(OldIntrin->getAddress())->
-                         getParent()->getParent());
-      // New address must belong to the new function
-      EXPECT_EQ(NewFunc, cast<AllocaInst>(NewIntrin->getAddress())->
-                         getParent()->getParent());
-
-      if (OldIntrin->getDebugLoc()->getInlinedAt()) {
-        // Inlined variable should refer to the same DILocalVariable as in the
-        // Old Function
-        EXPECT_EQ(OldIntrin->getVariable(), NewIntrin->getVariable());
-      } else {
-        // Old variable must belong to the old function.
-        EXPECT_EQ(OldFunc->getSubprogram(),
-                  cast<DISubprogram>(OldIntrin->getVariable()->getScope()));
-        // New variable must belong to the new function.
-        EXPECT_EQ(NewFunc->getSubprogram(),
-                  cast<DISubprogram>(NewIntrin->getVariable()->getScope()));
-      }
-    } else if (DbgValueInst* OldIntrin = dyn_cast<DbgValueInst>(&OldI)) {
-      DbgValueInst* NewIntrin = dyn_cast<DbgValueInst>(&NewI);
-      EXPECT_TRUE(NewIntrin);
-
-      if (!OldIntrin->getDebugLoc()->getInlinedAt()) {
-        // Old variable must belong to the old function.
-        EXPECT_EQ(OldFunc->getSubprogram(),
-                  cast<DISubprogram>(OldIntrin->getVariable()->getScope()));
-        // New variable must belong to the new function.
-        EXPECT_EQ(NewFunc->getSubprogram(),
-                  cast<DISubprogram>(NewIntrin->getVariable()->getScope()));
-      }
-    }
-
-    ++OldIter;
-    ++NewIter;
-  }
-}
-
-static int GetDICompileUnitCount(const Module& M) {
-  if (const auto* LLVM_DBG_CU = M.getNamedMetadata("llvm.dbg.cu")) {
-    return LLVM_DBG_CU->getNumOperands();
-  }
-  return 0;
-}
-
-static bool haveCompileUnitsInCommon(const Module &LHS, const Module &RHS) {
-  const NamedMDNode *LHSCUs = LHS.getNamedMetadata("llvm.dbg.cu");
-  if (!LHSCUs)
-    return false;
-
-  const NamedMDNode *RHSCUs = RHS.getNamedMetadata("llvm.dbg.cu");
-  if (!RHSCUs)
-    return false;
-
-  SmallPtrSet<const MDNode *, 8> Found;
-  for (int I = 0, E = LHSCUs->getNumOperands(); I != E; ++I)
-    if (const MDNode *N = LHSCUs->getOperand(I))
-      Found.insert(N);
-
-  for (int I = 0, E = RHSCUs->getNumOperands(); I != E; ++I)
-    if (const MDNode *N = RHSCUs->getOperand(I))
-      if (Found.count(N))
-        return true;
-
-  return false;
-}
-
-TEST(CloneFunction, CloneEmptyFunction) {
-  StringRef ImplAssembly = R"(
-    define void @foo() {
-      ret void
-    }
-    declare void @bar()
-  )";
-
-  LLVMContext Context;
-  SMDiagnostic Error;
-
-  auto ImplModule = parseAssemblyString(ImplAssembly, Error, Context);
-  EXPECT_TRUE(ImplModule != nullptr);
-  auto *ImplFunction = ImplModule->getFunction("foo");
-  EXPECT_TRUE(ImplFunction != nullptr);
-  auto *DeclFunction = ImplModule->getFunction("bar");
-  EXPECT_TRUE(DeclFunction != nullptr);
-
-  ValueToValueMapTy VMap;
-  SmallVector<ReturnInst *, 8> Returns;
-  ClonedCodeInfo CCI;
-  CloneFunctionInto(ImplFunction, DeclFunction, VMap,
-                    CloneFunctionChangeType::GlobalChanges, Returns, "", &CCI);
-
-  EXPECT_FALSE(verifyModule(*ImplModule, &errs()));
-  EXPECT_FALSE(CCI.ContainsCalls);
-  EXPECT_FALSE(CCI.ContainsDynamicAllocas);
-}
-
-TEST(CloneFunction, CloneFunctionWithInalloca) {
-  StringRef ImplAssembly = R"(
-    declare void @a(i32* inalloca(i32))
-    define void @foo() {
-      %a = alloca inalloca i32
-      call void @a(i32* inalloca(i32) %a)
-      ret void
-    }
-    declare void @bar()
-  )";
-
-  LLVMContext Context;
-  SMDiagnostic Error;
-
-  auto ImplModule = parseAssemblyString(ImplAssembly, Error, Context);
-  EXPECT_TRUE(ImplModule != nullptr);
-  auto *ImplFunction = ImplModule->getFunction("foo");
-  EXPECT_TRUE(ImplFunction != nullptr);
-  auto *DeclFunction = ImplModule->getFunction("bar");
-  EXPECT_TRUE(DeclFunction != nullptr);
-
-  ValueToValueMapTy VMap;
-  SmallVector<ReturnInst *, 8> Returns;
-  ClonedCodeInfo CCI;
-  CloneFunctionInto(DeclFunction, ImplFunction, VMap,
-                    CloneFunctionChangeType::GlobalChanges, Returns, "", &CCI);
-
-  EXPECT_FALSE(verifyModule(*ImplModule, &errs()));
-  EXPECT_TRUE(CCI.ContainsCalls);
-  EXPECT_TRUE(CCI.ContainsDynamicAllocas);
-}
-
-TEST(CloneFunction, CloneFunctionWithSubprograms) {
-  // Tests that the debug info is duplicated correctly when a DISubprogram
-  // happens to be one of the operands of the DISubprogram that is being cloned.
-  // In general, operands of "test" that are distinct should be duplicated,
-  // but in this case "my_operator" should not be duplicated. If it is
-  // duplicated, the metadata in the llvm.dbg.declare could end up with
-  // different duplicates.
-  StringRef ImplAssembly = R"(
-    declare void @llvm.dbg.declare(metadata, metadata, metadata)
-
-    define void @test() !dbg !5 {
-      call void @llvm.dbg.declare(metadata i8* undef, metadata !4, metadata !DIExpression()), !dbg !6
-      ret void
-    }
-
-    declare void @cloned()
-
-    !llvm.dbg.cu = !{!0}
-    !llvm.module.flags = !{!2}
-    !0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1)
-    !1 = !DIFile(filename: "test.cpp",  directory: "")
-    !2 = !{i32 1, !"Debug Info Version", i32 3}
-    !3 = distinct !DISubprogram(name: "my_operator", scope: !1, unit: !0, retainedNodes: !{!4})
-    !4 = !DILocalVariable(name: "awaitables", scope: !3)
-    !5 = distinct !DISubprogram(name: "test", scope: !3, unit: !0)
-    !6 = !DILocation(line: 55, column: 15, scope: !3, inlinedAt: !7)
-    !7 = distinct !DILocation(line: 73, column: 14, scope: !5)
-  )";
-
-  LLVMContext Context;
-  SMDiagnostic Error;
-
-  auto ImplModule = parseAssemblyString(ImplAssembly, Error, Context);
-  EXPECT_TRUE(ImplModule != nullptr);
-  auto *OldFunc = ImplModule->getFunction("test");
-  EXPECT_TRUE(OldFunc != nullptr);
-  auto *NewFunc = ImplModule->getFunction("cloned");
-  EXPECT_TRUE(NewFunc != nullptr);
-
-  ValueToValueMapTy VMap;
-  SmallVector<ReturnInst *, 8> Returns;
-  ClonedCodeInfo CCI;
-  CloneFunctionInto(NewFunc, OldFunc, VMap,
-                    CloneFunctionChangeType::GlobalChanges, Returns, "", &CCI);
-
-  // This fails if the scopes in the llvm.dbg.declare variable and location
-  // aren't the same.
-  EXPECT_FALSE(verifyModule(*ImplModule, &errs()));
-}
-
-TEST(CloneFunction, CloneFunctionToDifferentModule) {
-  StringRef ImplAssembly = R"(
-    define void @foo() {
-      ret void, !dbg !5
-    }
-
-    !llvm.module.flags = !{!0}
-    !llvm.dbg.cu = !{!2, !6}
-    !0 = !{i32 1, !"Debug Info Version", i32 3}
-    !1 = distinct !DISubprogram(unit: !2)
-    !2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3)
-    !3 = !DIFile(filename: "foo.c", directory: "/tmp")
-    !4 = distinct !DISubprogram(unit: !2)
-    !5 = !DILocation(line: 4, scope: !1)
-    !6 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3)
-  )";
-  StringRef DeclAssembly = R"(
-    declare void @foo()
-  )";
-
-  LLVMContext Context;
-  SMDiagnostic Error;
-
-  auto ImplModule = parseAssemblyString(ImplAssembly, Error, Context);
-  EXPECT_TRUE(ImplModule != nullptr);
-  // DICompileUnits: !2, !6. Only !2 is reachable from @foo().
-  EXPECT_TRUE(GetDICompileUnitCount(*ImplModule) == 2);
-  auto* ImplFunction = ImplModule->getFunction("foo");
-  EXPECT_TRUE(ImplFunction != nullptr);
-
-  auto DeclModule = parseAssemblyString(DeclAssembly, Error, Context);
-  EXPECT_TRUE(DeclModule != nullptr);
-  // No DICompileUnits defined here.
-  EXPECT_TRUE(GetDICompileUnitCount(*DeclModule) == 0);
-  auto* DeclFunction = DeclModule->getFunction("foo");
-  EXPECT_TRUE(DeclFunction != nullptr);
-
-  ValueToValueMapTy VMap;
-  VMap[ImplFunction] = DeclFunction;
-  // No args to map
-  SmallVector<ReturnInst*, 8> Returns;
-  CloneFunctionInto(DeclFunction, ImplFunction, VMap,
-                    CloneFunctionChangeType::DifferentModule, Returns);
-
-  EXPECT_FALSE(verifyModule(*ImplModule, &errs()));
-  EXPECT_FALSE(verifyModule(*DeclModule, &errs()));
-  // DICompileUnit !2 shall be cloned into DeclModule.
-  EXPECT_TRUE(GetDICompileUnitCount(*DeclModule) == 1);
-  EXPECT_FALSE(haveCompileUnitsInCommon(*ImplModule, *DeclModule));
-}
-
-class CloneModule : public ::testing::Test {
-protected:
-  void SetUp() override {
-    SetupModule();
-    CreateOldModule();
-    CreateNewModule();
-  }
-
-  void SetupModule() { OldM = new Module("", C); }
-
-  void CreateOldModule() {
-    auto *CD = OldM->getOrInsertComdat("comdat");
-    CD->setSelectionKind(Comdat::ExactMatch);
-
-    auto GV = new GlobalVariable(
-        *OldM, Type::getInt32Ty(C), false, GlobalValue::ExternalLinkage,
-        ConstantInt::get(Type::getInt32Ty(C), 1), "gv");
-    GV->addMetadata(LLVMContext::MD_type, *MDNode::get(C, {}));
-    GV->setComdat(CD);
-
-    {
-      // Add an empty compile unit first that isn't otherwise referenced, to
-      // confirm that compile units get cloned in the correct order.
-      DIBuilder EmptyBuilder(*OldM);
-      auto *File = EmptyBuilder.createFile("empty.c", "/file/dir/");
-      (void)EmptyBuilder.createCompileUnit(dwarf::DW_LANG_C99, File,
-                                           "EmptyUnit", false, "", 0);
-      EmptyBuilder.finalize();
-    }
-
-    DIBuilder DBuilder(*OldM);
-    IRBuilder<> IBuilder(C);
-
-    auto *FuncType = FunctionType::get(Type::getVoidTy(C), false);
-    auto *PersFn = Function::Create(FuncType, GlobalValue::ExternalLinkage,
-                                    "persfn", OldM);
-    auto *F =
-        Function::Create(FuncType, GlobalValue::PrivateLinkage, "f", OldM);
-    F->setPersonalityFn(PersFn);
-    F->setComdat(CD);
-
-    // Create debug info
-    auto *File = DBuilder.createFile("filename.c", "/file/dir/");
-    DITypeRefArray ParamTypes = DBuilder.getOrCreateTypeArray(None);
-    DISubroutineType *DFuncType = DBuilder.createSubroutineType(ParamTypes);
-    auto *CU = DBuilder.createCompileUnit(dwarf::DW_LANG_C99,
-                                          DBuilder.createFile("filename.c",
-                                                              "/file/dir"),
-                                          "CloneModule", false, "", 0);
-    // Function DI
-    auto *Subprogram = DBuilder.createFunction(
-        CU, "f", "f", File, 4, DFuncType, 3, DINode::FlagZero,
-        DISubprogram::SPFlagLocalToUnit | DISubprogram::SPFlagDefinition);
-    F->setSubprogram(Subprogram);
-
-    // Create and assign DIGlobalVariableExpression to gv
-    auto GVExpression = DBuilder.createGlobalVariableExpression(
-        Subprogram, "gv", "gv", File, 1, DBuilder.createNullPtrType(), false);
-    GV->addDebugInfo(GVExpression);
-
-    // DIGlobalVariableExpression not attached to any global variable
-    auto Expr = DBuilder.createExpression(
-        ArrayRef<uint64_t>{dwarf::DW_OP_constu, 42U, dwarf::DW_OP_stack_value});
-
-    DBuilder.createGlobalVariableExpression(
-        Subprogram, "unattached", "unattached", File, 1,
-        DBuilder.createNullPtrType(), false, true, Expr);
-
-    auto *Entry = BasicBlock::Create(C, "", F);
-    IBuilder.SetInsertPoint(Entry);
-    IBuilder.CreateRetVoid();
-
-    // Finalize the debug info
-    DBuilder.finalize();
-  }
-
-  void CreateNewModule() { NewM = llvm::CloneModule(*OldM).release(); }
-
-  LLVMContext C;
-  Module *OldM;
-  Module *NewM;
-};
-
-TEST_F(CloneModule, Verify) {
-  // Confirm the old module is (still) valid.
-  EXPECT_FALSE(verifyModule(*OldM));
-
-  // Check the new module.
-  EXPECT_FALSE(verifyModule(*NewM));
-}
-
-TEST_F(CloneModule, OldModuleUnchanged) {
-  DebugInfoFinder Finder;
-  Finder.processModule(*OldM);
-  EXPECT_EQ(1U, Finder.subprogram_count());
-}
-
-TEST_F(CloneModule, Subprogram) {
-  Function *NewF = NewM->getFunction("f");
-  DISubprogram *SP = NewF->getSubprogram();
-  EXPECT_TRUE(SP != nullptr);
-  EXPECT_EQ(SP->getName(), "f");
-  EXPECT_EQ(SP->getFile()->getFilename(), "filename.c");
-  EXPECT_EQ(SP->getLine(), (unsigned)4);
-}
-
-TEST_F(CloneModule, GlobalMetadata) {
-  GlobalVariable *NewGV = NewM->getGlobalVariable("gv");
-  EXPECT_NE(nullptr, NewGV->getMetadata(LLVMContext::MD_type));
-}
-
-TEST_F(CloneModule, GlobalDebugInfo) {
-  GlobalVariable *NewGV = NewM->getGlobalVariable("gv");
-  EXPECT_TRUE(NewGV != nullptr);
-
-  // Find debug info expression assigned to global
-  SmallVector<DIGlobalVariableExpression *, 1> GVs;
-  NewGV->getDebugInfo(GVs);
-  EXPECT_EQ(GVs.size(), 1U);
-
-  DIGlobalVariableExpression *GVExpr = GVs[0];
-  DIGlobalVariable *GV = GVExpr->getVariable();
-  EXPECT_TRUE(GV != nullptr);
-
-  EXPECT_EQ(GV->getName(), "gv");
-  EXPECT_EQ(GV->getLine(), 1U);
-
-  // Assert that the scope of the debug info attached to
-  // global variable matches the cloned function.
-  DISubprogram *SP = NewM->getFunction("f")->getSubprogram();
-  EXPECT_TRUE(SP != nullptr);
-  EXPECT_EQ(GV->getScope(), SP);
-}
-
-TEST_F(CloneModule, CompileUnit) {
-  // Find DICompileUnit listed in llvm.dbg.cu
-  auto *NMD = NewM->getNamedMetadata("llvm.dbg.cu");
-  EXPECT_TRUE(NMD != nullptr);
-  EXPECT_EQ(NMD->getNumOperands(), 2U);
-  EXPECT_FALSE(haveCompileUnitsInCommon(*OldM, *NewM));
-
-  // Check that the empty CU is first, even though it's not referenced except
-  // from named metadata.
-  DICompileUnit *EmptyCU = dyn_cast<llvm::DICompileUnit>(NMD->getOperand(0));
-  EXPECT_TRUE(EmptyCU != nullptr);
-  EXPECT_EQ("EmptyUnit", EmptyCU->getProducer());
-
-  // Get the interesting CU.
-  DICompileUnit *CU = dyn_cast<llvm::DICompileUnit>(NMD->getOperand(1));
-  EXPECT_TRUE(CU != nullptr);
-  EXPECT_EQ("CloneModule", CU->getProducer());
-
-  // Assert this CU is consistent with the cloned function debug info
-  DISubprogram *SP = NewM->getFunction("f")->getSubprogram();
-  EXPECT_TRUE(SP != nullptr);
-  EXPECT_EQ(SP->getUnit(), CU);
-
-  // Check globals listed in CU have the correct scope
-  DIGlobalVariableExpressionArray GlobalArray = CU->getGlobalVariables();
-  EXPECT_EQ(GlobalArray.size(), 2U);
-  for (DIGlobalVariableExpression *GVExpr : GlobalArray) {
-    DIGlobalVariable *GV = GVExpr->getVariable();
-    EXPECT_EQ(GV->getScope(), SP);
-  }
-}
-
-TEST_F(CloneModule, Comdat) {
-  GlobalVariable *NewGV = NewM->getGlobalVariable("gv");
-  auto *CD = NewGV->getComdat();
-  ASSERT_NE(nullptr, CD);
-  EXPECT_EQ("comdat", CD->getName());
-  EXPECT_EQ(Comdat::ExactMatch, CD->getSelectionKind());
-
-  Function *NewF = NewM->getFunction("f");
-  EXPECT_EQ(CD, NewF->getComdat());
-}
-}
diff --git a/gnu/llvm/llvm/unittests/Transforms/Utils/CodeExtractorTest.cpp b/gnu/llvm/llvm/unittests/Transforms/Utils/CodeExtractorTest.cpp
deleted file mode 100644
index a6fb926aec3..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/Utils/CodeExtractorTest.cpp
+++ /dev/null
@@ -1,334 +0,0 @@
-//===- CodeExtractor.cpp - Unit tests for CodeExtractor -------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Transforms/Utils/CodeExtractor.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/Analysis/AssumptionCache.h"
-#include "llvm/IR/BasicBlock.h"
-#include "llvm/IR/Dominators.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/Verifier.h"
-#include "llvm/IRReader/IRReader.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-BasicBlock *getBlockByName(Function *F, StringRef name) {
-  for (auto &BB : *F)
-    if (BB.getName() == name)
-      return &BB;
-  return nullptr;
-}
-
-TEST(CodeExtractor, ExitStub) {
-  LLVMContext Ctx;
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M(parseAssemblyString(R"invalid(
-    define i32 @foo(i32 %x, i32 %y, i32 %z) {
-    header:
-      %0 = icmp ugt i32 %x, %y
-      br i1 %0, label %body1, label %body2
-
-    body1:
-      %1 = add i32 %z, 2
-      br label %notExtracted
-
-    body2:
-      %2 = mul i32 %z, 7
-      br label %notExtracted
-
-    notExtracted:
-      %3 = phi i32 [ %1, %body1 ], [ %2, %body2 ]
-      %4 = add i32 %3, %x
-      ret i32 %4
-    }
-  )invalid",
-                                                Err, Ctx));
-
-  Function *Func = M->getFunction("foo");
-  SmallVector<BasicBlock *, 3> Candidates{ getBlockByName(Func, "header"),
-                                           getBlockByName(Func, "body1"),
-                                           getBlockByName(Func, "body2") };
-
-  CodeExtractor CE(Candidates);
-  EXPECT_TRUE(CE.isEligible());
-
-  CodeExtractorAnalysisCache CEAC(*Func);
-  Function *Outlined = CE.extractCodeRegion(CEAC);
-  EXPECT_TRUE(Outlined);
-  BasicBlock *Exit = getBlockByName(Func, "notExtracted");
-  BasicBlock *ExitSplit = getBlockByName(Outlined, "notExtracted.split");
-  // Ensure that PHI in exit block has only one incoming value (from code
-  // replacer block).
-  EXPECT_TRUE(Exit && cast<PHINode>(Exit->front()).getNumIncomingValues() == 1);
-  // Ensure that there is a PHI in outlined function with 2 incoming values.
-  EXPECT_TRUE(ExitSplit &&
-              cast<PHINode>(ExitSplit->front()).getNumIncomingValues() == 2);
-  EXPECT_FALSE(verifyFunction(*Outlined));
-  EXPECT_FALSE(verifyFunction(*Func));
-}
-
-TEST(CodeExtractor, ExitPHIOnePredFromRegion) {
-  LLVMContext Ctx;
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M(parseAssemblyString(R"invalid(
-    define i32 @foo() {
-    header:
-      br i1 undef, label %extracted1, label %pred
-
-    pred:
-      br i1 undef, label %exit1, label %exit2
-
-    extracted1:
-      br i1 undef, label %extracted2, label %exit1
-
-    extracted2:
-      br label %exit2
-
-    exit1:
-      %0 = phi i32 [ 1, %extracted1 ], [ 2, %pred ]
-      ret i32 %0
-
-    exit2:
-      %1 = phi i32 [ 3, %extracted2 ], [ 4, %pred ]
-      ret i32 %1
-    }
-  )invalid", Err, Ctx));
-
-  Function *Func = M->getFunction("foo");
-  SmallVector<BasicBlock *, 2> ExtractedBlocks{
-    getBlockByName(Func, "extracted1"),
-    getBlockByName(Func, "extracted2")
-  };
-
-  CodeExtractor CE(ExtractedBlocks);
-  EXPECT_TRUE(CE.isEligible());
-
-  CodeExtractorAnalysisCache CEAC(*Func);
-  Function *Outlined = CE.extractCodeRegion(CEAC);
-  EXPECT_TRUE(Outlined);
-  BasicBlock *Exit1 = getBlockByName(Func, "exit1");
-  BasicBlock *Exit2 = getBlockByName(Func, "exit2");
-  // Ensure that PHIs in exits are not splitted (since that they have only one
-  // incoming value from extracted region).
-  EXPECT_TRUE(Exit1 &&
-          cast<PHINode>(Exit1->front()).getNumIncomingValues() == 2);
-  EXPECT_TRUE(Exit2 &&
-          cast<PHINode>(Exit2->front()).getNumIncomingValues() == 2);
-  EXPECT_FALSE(verifyFunction(*Outlined));
-  EXPECT_FALSE(verifyFunction(*Func));
-}
-
-TEST(CodeExtractor, StoreOutputInvokeResultAfterEHPad) {
-  LLVMContext Ctx;
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M(parseAssemblyString(R"invalid(
-    declare i8 @hoge()
-
-    define i32 @foo() personality i8* null {
-      entry:
-        %call = invoke i8 @hoge()
-                to label %invoke.cont unwind label %lpad
-
-      invoke.cont:                                      ; preds = %entry
-        unreachable
-
-      lpad:                                             ; preds = %entry
-        %0 = landingpad { i8*, i32 }
-                catch i8* null
-        br i1 undef, label %catch, label %finally.catchall
-
-      catch:                                            ; preds = %lpad
-        %call2 = invoke i8 @hoge()
-                to label %invoke.cont2 unwind label %lpad2
-
-      invoke.cont2:                                    ; preds = %catch
-        %call3 = invoke i8 @hoge()
-                to label %invoke.cont3 unwind label %lpad2
-
-      invoke.cont3:                                    ; preds = %invoke.cont2
-        unreachable
-
-      lpad2:                                           ; preds = %invoke.cont2, %catch
-        %ex.1 = phi i8* [ undef, %invoke.cont2 ], [ null, %catch ]
-        %1 = landingpad { i8*, i32 }
-                catch i8* null
-        br label %finally.catchall
-
-      finally.catchall:                                 ; preds = %lpad33, %lpad
-        %ex.2 = phi i8* [ %ex.1, %lpad2 ], [ null, %lpad ]
-        unreachable
-    }
-  )invalid", Err, Ctx));
-
-	if (!M) {
-    Err.print("unit", errs());
-    exit(1);
-  }
-
-  Function *Func = M->getFunction("foo");
-  EXPECT_FALSE(verifyFunction(*Func, &errs()));
-
-  SmallVector<BasicBlock *, 2> ExtractedBlocks{
-    getBlockByName(Func, "catch"),
-    getBlockByName(Func, "invoke.cont2"),
-    getBlockByName(Func, "invoke.cont3"),
-    getBlockByName(Func, "lpad2")
-  };
-
-  CodeExtractor CE(ExtractedBlocks);
-  EXPECT_TRUE(CE.isEligible());
-
-  CodeExtractorAnalysisCache CEAC(*Func);
-  Function *Outlined = CE.extractCodeRegion(CEAC);
-  EXPECT_TRUE(Outlined);
-  EXPECT_FALSE(verifyFunction(*Outlined, &errs()));
-  EXPECT_FALSE(verifyFunction(*Func, &errs()));
-}
-
-TEST(CodeExtractor, StoreOutputInvokeResultInExitStub) {
-  LLVMContext Ctx;
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M(parseAssemblyString(R"invalid(
-    declare i32 @bar()
-
-    define i32 @foo() personality i8* null {
-    entry:
-      %0 = invoke i32 @bar() to label %exit unwind label %lpad
-
-    exit:
-      ret i32 %0
-
-    lpad:
-      %1 = landingpad { i8*, i32 }
-              cleanup
-      resume { i8*, i32 } %1
-    }
-  )invalid",
-                                                Err, Ctx));
-
-  Function *Func = M->getFunction("foo");
-  SmallVector<BasicBlock *, 1> Blocks{ getBlockByName(Func, "entry"),
-                                       getBlockByName(Func, "lpad") };
-
-  CodeExtractor CE(Blocks);
-  EXPECT_TRUE(CE.isEligible());
-
-  CodeExtractorAnalysisCache CEAC(*Func);
-  Function *Outlined = CE.extractCodeRegion(CEAC);
-  EXPECT_TRUE(Outlined);
-  EXPECT_FALSE(verifyFunction(*Outlined));
-  EXPECT_FALSE(verifyFunction(*Func));
-}
-
-TEST(CodeExtractor, ExtractAndInvalidateAssumptionCache) {
-  LLVMContext Ctx;
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M(parseAssemblyString(R"ir(
-        target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"
-        target triple = "aarch64"
-
-        %b = type { i64 }
-        declare void @g(i8*)
-
-        declare void @llvm.assume(i1) #0
-
-        define void @test() {
-        entry:
-          br label %label
-
-        label:
-          %0 = load %b*, %b** inttoptr (i64 8 to %b**), align 8
-          %1 = getelementptr inbounds %b, %b* %0, i64 undef, i32 0
-          %2 = load i64, i64* %1, align 8
-          %3 = icmp ugt i64 %2, 1
-          br i1 %3, label %if.then, label %if.else
-
-        if.then:
-          unreachable
-
-        if.else:
-          call void @g(i8* undef)
-          store i64 undef, i64* null, align 536870912
-          %4 = icmp eq i64 %2, 0
-          call void @llvm.assume(i1 %4)
-          unreachable
-        }
-
-        attributes #0 = { nounwind willreturn }
-  )ir",
-                                                Err, Ctx));
-
-  assert(M && "Could not parse module?");
-  Function *Func = M->getFunction("test");
-  SmallVector<BasicBlock *, 1> Blocks{ getBlockByName(Func, "if.else") };
-  AssumptionCache AC(*Func);
-  CodeExtractor CE(Blocks, nullptr, false, nullptr, nullptr, &AC);
-  EXPECT_TRUE(CE.isEligible());
-
-  CodeExtractorAnalysisCache CEAC(*Func);
-  Function *Outlined = CE.extractCodeRegion(CEAC);
-  EXPECT_TRUE(Outlined);
-  EXPECT_FALSE(verifyFunction(*Outlined));
-  EXPECT_FALSE(verifyFunction(*Func));
-  EXPECT_FALSE(CE.verifyAssumptionCache(*Func, *Outlined, &AC));
-}
-
-TEST(CodeExtractor, RemoveBitcastUsesFromOuterLifetimeMarkers) {
-  LLVMContext Ctx;
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M(parseAssemblyString(R"ir(
-    target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
-    target triple = "x86_64-unknown-linux-gnu"
-
-    declare void @use(i32*)
-    declare void @llvm.lifetime.start.p0i8(i64, i8*)
-    declare void @llvm.lifetime.end.p0i8(i64, i8*)
-
-    define void @foo() {
-    entry:
-      %0 = alloca i32
-      br label %extract
-
-    extract:
-      %1 = bitcast i32* %0 to i8*
-      call void @llvm.lifetime.start.p0i8(i64 4, i8* %1)
-      call void @use(i32* %0)
-      br label %exit
-
-    exit:
-      call void @use(i32* %0)
-      call void @llvm.lifetime.end.p0i8(i64 4, i8* %1)
-      ret void
-    }
-  )ir",
-                                                Err, Ctx));
-
-  Function *Func = M->getFunction("foo");
-  SmallVector<BasicBlock *, 1> Blocks{getBlockByName(Func, "extract")};
-
-  CodeExtractor CE(Blocks);
-  EXPECT_TRUE(CE.isEligible());
-
-  CodeExtractorAnalysisCache CEAC(*Func);
-  SetVector<Value *> Inputs, Outputs, SinkingCands, HoistingCands;
-  BasicBlock *CommonExit = nullptr;
-  CE.findAllocas(CEAC, SinkingCands, HoistingCands, CommonExit);
-  CE.findInputsOutputs(Inputs, Outputs, SinkingCands);
-  EXPECT_EQ(Outputs.size(), 0U);
-
-  Function *Outlined = CE.extractCodeRegion(CEAC);
-  EXPECT_TRUE(Outlined);
-  EXPECT_FALSE(verifyFunction(*Outlined));
-  EXPECT_FALSE(verifyFunction(*Func));
-}
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/Transforms/Utils/CodeMoverUtilsTest.cpp b/gnu/llvm/llvm/unittests/Transforms/Utils/CodeMoverUtilsTest.cpp
deleted file mode 100644
index 300f9c22555..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/Utils/CodeMoverUtilsTest.cpp
+++ /dev/null
@@ -1,857 +0,0 @@
-//===- CodeMoverUtils.cpp - Unit tests for CodeMoverUtils ---------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Transforms/Utils/CodeMoverUtils.h"
-#include "llvm/Analysis/AliasAnalysis.h"
-#include "llvm/Analysis/AssumptionCache.h"
-#include "llvm/Analysis/DependenceAnalysis.h"
-#include "llvm/Analysis/LoopInfo.h"
-#include "llvm/Analysis/PostDominators.h"
-#include "llvm/Analysis/TargetLibraryInfo.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Dominators.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/Support/SourceMgr.h"
-#include "llvm/Transforms/Utils/ScalarEvolutionExpander.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-static std::unique_ptr<Module> parseIR(LLVMContext &C, const char *IR) {
-  SMDiagnostic Err;
-  std::unique_ptr<Module> Mod = parseAssemblyString(IR, Err, C);
-  if (!Mod)
-    Err.print("CodeMoverUtilsTests", errs());
-  return Mod;
-}
-
-static void run(Module &M, StringRef FuncName,
-                function_ref<void(Function &F, DominatorTree &DT,
-                                  PostDominatorTree &PDT, DependenceInfo &DI)>
-                    Test) {
-  auto *F = M.getFunction(FuncName);
-  DominatorTree DT(*F);
-  PostDominatorTree PDT(*F);
-  TargetLibraryInfoImpl TLII;
-  TargetLibraryInfo TLI(TLII);
-  AssumptionCache AC(*F);
-  AliasAnalysis AA(TLI);
-  LoopInfo LI(DT);
-  ScalarEvolution SE(*F, TLI, AC, DT, LI);
-  DependenceInfo DI(F, &AA, &SE, &LI);
-  Test(*F, DT, PDT, DI);
-}
-
-static BasicBlock *getBasicBlockByName(Function &F, StringRef Name) {
-  for (BasicBlock &BB : F)
-    if (BB.getName() == Name)
-      return &BB;
-  llvm_unreachable("Expected to find basic block!");
-}
-
-static Instruction *getInstructionByName(Function &F, StringRef Name) {
-  for (BasicBlock &BB : F)
-    for (Instruction &I : BB)
-      if (I.getName() == Name)
-        return &I;
-  llvm_unreachable("Expected to find instruction!");
-}
-
-TEST(CodeMoverUtils, IsControlFlowEquivalentSimpleTest) {
-  LLVMContext C;
-
-  // void foo(int &i, bool cond1, bool cond2) {
-  //   if (cond1)
-  //     i = 1;
-  //   if (cond1)
-  //     i = 2;
-  //   if (cond2)
-  //     i = 3;
-  // }
-  std::unique_ptr<Module> M =
-      parseIR(C, R"(define void @foo(i32* %i, i1 %cond1, i1 %cond2) {
-                 entry:
-                   br i1 %cond1, label %if.first, label %if.first.end
-                 if.first:
-                   store i32 1, i32* %i, align 4
-                   br label %if.first.end
-                 if.first.end:
-                   br i1 %cond1, label %if.second, label %if.second.end
-                 if.second:
-                   store i32 2, i32* %i, align 4
-                   br label %if.second.end
-                 if.second.end:
-                   br i1 %cond2, label %if.third, label %if.third.end
-                 if.third:
-                   store i32 3, i32* %i, align 4
-                   br label %if.third.end
-                 if.third.end:
-                   ret void
-                 })");
-  run(*M, "foo",
-      [&](Function &F, DominatorTree &DT, PostDominatorTree &PDT,
-          DependenceInfo &DI) {
-        BasicBlock *FirstIfBody = getBasicBlockByName(F, "if.first");
-        EXPECT_TRUE(
-            isControlFlowEquivalent(*FirstIfBody, *FirstIfBody, DT, PDT));
-        BasicBlock *SecondIfBody = getBasicBlockByName(F, "if.second");
-        EXPECT_TRUE(
-            isControlFlowEquivalent(*FirstIfBody, *SecondIfBody, DT, PDT));
-
-        BasicBlock *ThirdIfBody = getBasicBlockByName(F, "if.third");
-        EXPECT_FALSE(
-            isControlFlowEquivalent(*FirstIfBody, *ThirdIfBody, DT, PDT));
-        EXPECT_FALSE(
-            isControlFlowEquivalent(*SecondIfBody, *ThirdIfBody, DT, PDT));
-      });
-}
-
-TEST(CodeMoverUtils, IsControlFlowEquivalentOppositeCondTest) {
-  LLVMContext C;
-
-  // void foo(int &i, unsigned X, unsigned Y) {
-  //   if (X < Y)
-  //     i = 1;
-  //   if (Y > X)
-  //     i = 2;
-  //   if (X >= Y)
-  //     i = 3;
-  //   else
-  //     i = 4;
-  //   if (X == Y)
-  //     i = 5;
-  //   if (Y == X)
-  //     i = 6;
-  //   else
-  //     i = 7;
-  //   if (X != Y)
-  //     i = 8;
-  //   else
-  //     i = 9;
-  // }
-  std::unique_ptr<Module> M =
-      parseIR(C, R"(define void @foo(i32* %i, i32 %X, i32 %Y) {
-                 entry:
-                   %cmp1 = icmp ult i32 %X, %Y
-                   br i1 %cmp1, label %if.first, label %if.first.end
-                 if.first:
-                   store i32 1, i32* %i, align 4
-                   br label %if.first.end
-                 if.first.end:
-                   %cmp2 = icmp ugt i32 %Y, %X
-                   br i1 %cmp2, label %if.second, label %if.second.end
-                 if.second:
-                   store i32 2, i32* %i, align 4
-                   br label %if.second.end
-                 if.second.end:
-                   %cmp3 = icmp uge i32 %X, %Y
-                   br i1 %cmp3, label %if.third, label %if.third.else
-                 if.third:
-                   store i32 3, i32* %i, align 4
-                   br label %if.third.end
-                 if.third.else:
-                   store i32 4, i32* %i, align 4
-                   br label %if.third.end
-                 if.third.end:
-                   %cmp4 = icmp eq i32 %X, %Y
-                   br i1 %cmp4, label %if.fourth, label %if.fourth.end
-                 if.fourth:
-                   store i32 5, i32* %i, align 4
-                   br label %if.fourth.end
-                 if.fourth.end:
-                   %cmp5 = icmp eq i32 %Y, %X
-                   br i1 %cmp5, label %if.fifth, label %if.fifth.else
-                 if.fifth:
-                   store i32 6, i32* %i, align 4
-                   br label %if.fifth.end
-                 if.fifth.else:
-                   store i32 7, i32* %i, align 4
-                   br label %if.fifth.end
-                 if.fifth.end:
-                   %cmp6 = icmp ne i32 %X, %Y
-                   br i1 %cmp6, label %if.sixth, label %if.sixth.else
-                 if.sixth:
-                   store i32 8, i32* %i, align 4
-                   br label %if.sixth.end
-                 if.sixth.else:
-                   store i32 9, i32* %i, align 4
-                   br label %if.sixth.end
-                 if.sixth.end:
-                   ret void
-                 })");
-  run(*M, "foo",
-      [&](Function &F, DominatorTree &DT, PostDominatorTree &PDT,
-          DependenceInfo &DI) {
-        BasicBlock *FirstIfBody = getBasicBlockByName(F, "if.first");
-        BasicBlock *SecondIfBody = getBasicBlockByName(F, "if.second");
-        BasicBlock *ThirdIfBody = getBasicBlockByName(F, "if.third");
-        BasicBlock *ThirdElseBody = getBasicBlockByName(F, "if.third.else");
-        EXPECT_TRUE(
-            isControlFlowEquivalent(*FirstIfBody, *ThirdElseBody, DT, PDT));
-        EXPECT_TRUE(
-            isControlFlowEquivalent(*SecondIfBody, *ThirdElseBody, DT, PDT));
-        EXPECT_FALSE(
-            isControlFlowEquivalent(*ThirdIfBody, *ThirdElseBody, DT, PDT));
-
-        BasicBlock *FourthIfBody = getBasicBlockByName(F, "if.fourth");
-        BasicBlock *FifthIfBody = getBasicBlockByName(F, "if.fifth");
-        BasicBlock *FifthElseBody = getBasicBlockByName(F, "if.fifth.else");
-        EXPECT_FALSE(
-            isControlFlowEquivalent(*FifthIfBody, *FifthElseBody, DT, PDT));
-        BasicBlock *SixthIfBody = getBasicBlockByName(F, "if.sixth");
-        EXPECT_TRUE(
-            isControlFlowEquivalent(*FifthElseBody, *SixthIfBody, DT, PDT));
-        BasicBlock *SixthElseBody = getBasicBlockByName(F, "if.sixth.else");
-        EXPECT_TRUE(
-            isControlFlowEquivalent(*FourthIfBody, *SixthElseBody, DT, PDT));
-        EXPECT_TRUE(
-            isControlFlowEquivalent(*FifthIfBody, *SixthElseBody, DT, PDT));
-      });
-}
-
-TEST(CodeMoverUtils, IsControlFlowEquivalentCondNestTest) {
-  LLVMContext C;
-
-  // void foo(int &i, bool cond1, bool cond2) {
-  //   if (cond1)
-  //     if (cond2)
-  //       i = 1;
-  //   if (cond2)
-  //     if (cond1)
-  //       i = 2;
-  // }
-  std::unique_ptr<Module> M =
-      parseIR(C, R"(define void @foo(i32* %i, i1 %cond1, i1 %cond2) { 
-         entry:
-           br i1 %cond1, label %if.outer.first, label %if.first.end
-         if.outer.first:
-           br i1 %cond2, label %if.inner.first, label %if.first.end
-         if.inner.first:
-           store i32 1, i32* %i, align 4
-           br label %if.first.end
-         if.first.end:
-           br i1 %cond2, label %if.outer.second, label %if.second.end
-         if.outer.second:
-           br i1 %cond1, label %if.inner.second, label %if.second.end
-         if.inner.second:
-           store i32 2, i32* %i, align 4
-           br label %if.second.end
-         if.second.end:
-           ret void
-         })");
-  run(*M, "foo",
-      [&](Function &F, DominatorTree &DT, PostDominatorTree &PDT,
-          DependenceInfo &DI) {
-        BasicBlock *FirstOuterIfBody = getBasicBlockByName(F, "if.outer.first");
-        BasicBlock *FirstInnerIfBody = getBasicBlockByName(F, "if.inner.first");
-        BasicBlock *SecondOuterIfBody =
-            getBasicBlockByName(F, "if.outer.second");
-        BasicBlock *SecondInnerIfBody =
-            getBasicBlockByName(F, "if.inner.second");
-        EXPECT_TRUE(isControlFlowEquivalent(*FirstInnerIfBody,
-                                            *SecondInnerIfBody, DT, PDT));
-        EXPECT_FALSE(isControlFlowEquivalent(*FirstOuterIfBody,
-                                             *SecondOuterIfBody, DT, PDT));
-        EXPECT_FALSE(isControlFlowEquivalent(*FirstOuterIfBody,
-                                             *SecondInnerIfBody, DT, PDT));
-        EXPECT_FALSE(isControlFlowEquivalent(*FirstInnerIfBody,
-                                             *SecondOuterIfBody, DT, PDT));
-      });
-}
-
-TEST(CodeMoverUtils, IsControlFlowEquivalentImbalanceTest) {
-  LLVMContext C;
-
-  // void foo(int &i, bool cond1, bool cond2) {
-  //   if (cond1)
-  //     if (cond2)
-  //       if (cond3)
-  //         i = 1;
-  //   if (cond2)
-  //     if (cond3)
-  //       i = 2;
-  //   if (cond1)
-  //     if (cond1)
-  //       i = 3;
-  //   if (cond1)
-  //     i = 4;
-  // }
-  std::unique_ptr<Module> M = parseIR(
-      C, R"(define void @foo(i32* %i, i1 %cond1, i1 %cond2, i1 %cond3) { 
-         entry:
-           br i1 %cond1, label %if.outer.first, label %if.first.end
-         if.outer.first:
-           br i1 %cond2, label %if.middle.first, label %if.first.end
-         if.middle.first:
-           br i1 %cond3, label %if.inner.first, label %if.first.end
-         if.inner.first:
-           store i32 1, i32* %i, align 4
-           br label %if.first.end
-         if.first.end:
-           br i1 %cond2, label %if.outer.second, label %if.second.end
-         if.outer.second:
-           br i1 %cond3, label %if.inner.second, label %if.second.end
-         if.inner.second:
-           store i32 2, i32* %i, align 4
-           br label %if.second.end
-         if.second.end:
-           br i1 %cond1, label %if.outer.third, label %if.third.end
-         if.outer.third:
-           br i1 %cond1, label %if.inner.third, label %if.third.end
-         if.inner.third:
-           store i32 3, i32* %i, align 4
-           br label %if.third.end
-         if.third.end:
-           br i1 %cond1, label %if.fourth, label %if.fourth.end
-         if.fourth:
-           store i32 4, i32* %i, align 4
-           br label %if.fourth.end
-         if.fourth.end:
-           ret void
-         })");
-  run(*M, "foo",
-      [&](Function &F, DominatorTree &DT, PostDominatorTree &PDT,
-          DependenceInfo &DI) {
-        BasicBlock *FirstIfBody = getBasicBlockByName(F, "if.inner.first");
-        BasicBlock *SecondIfBody = getBasicBlockByName(F, "if.inner.second");
-        EXPECT_FALSE(
-            isControlFlowEquivalent(*FirstIfBody, *SecondIfBody, DT, PDT));
-
-        BasicBlock *ThirdIfBody = getBasicBlockByName(F, "if.inner.third");
-        BasicBlock *FourthIfBody = getBasicBlockByName(F, "if.fourth");
-        EXPECT_TRUE(
-            isControlFlowEquivalent(*ThirdIfBody, *FourthIfBody, DT, PDT));
-      });
-}
-
-TEST(CodeMoverUtils, IsControlFlowEquivalentPointerTest) {
-  LLVMContext C;
-
-  // void foo(int &i, int *cond) {
-  //   if (*cond)
-  //     i = 1;
-  //   if (*cond)
-  //     i = 2;
-  //   *cond = 1;
-  //   if (*cond)
-  //     i = 3;
-  // }
-  std::unique_ptr<Module> M =
-      parseIR(C, R"(define void @foo(i32* %i, i32* %cond) {
-                 entry:
-                   %0 = load i32, i32* %cond, align 4
-                   %tobool1 = icmp ne i32 %0, 0
-                   br i1 %tobool1, label %if.first, label %if.first.end
-                 if.first:
-                   store i32 1, i32* %i, align 4
-                   br label %if.first.end
-                 if.first.end:
-                   %1 = load i32, i32* %cond, align 4
-                   %tobool2 = icmp ne i32 %1, 0
-                   br i1 %tobool2, label %if.second, label %if.second.end
-                 if.second:
-                   store i32 2, i32* %i, align 4
-                   br label %if.second.end
-                 if.second.end:
-                   store i32 1, i32* %cond, align 4
-                   %2 = load i32, i32* %cond, align 4
-                   %tobool3 = icmp ne i32 %2, 0
-                   br i1 %tobool3, label %if.third, label %if.third.end
-                 if.third:
-                   store i32 3, i32* %i, align 4
-                   br label %if.third.end
-                 if.third.end:
-                   ret void
-                 })");
-  run(*M, "foo",
-      [&](Function &F, DominatorTree &DT, PostDominatorTree &PDT,
-          DependenceInfo &DI) {
-        BasicBlock *FirstIfBody = getBasicBlockByName(F, "if.first");
-        BasicBlock *SecondIfBody = getBasicBlockByName(F, "if.second");
-        // Limitation: if we can prove cond haven't been modify between %0 and
-        // %1, then we can prove FirstIfBody and SecondIfBody are control flow
-        // equivalent.
-        EXPECT_FALSE(
-            isControlFlowEquivalent(*FirstIfBody, *SecondIfBody, DT, PDT));
-
-        BasicBlock *ThirdIfBody = getBasicBlockByName(F, "if.third");
-        EXPECT_FALSE(
-            isControlFlowEquivalent(*FirstIfBody, *ThirdIfBody, DT, PDT));
-        EXPECT_FALSE(
-            isControlFlowEquivalent(*SecondIfBody, *ThirdIfBody, DT, PDT));
-      });
-}
-
-TEST(CodeMoverUtils, IsControlFlowEquivalentNotPostdomTest) {
-  LLVMContext C;
-
-  // void foo(bool cond1, bool cond2) {
-  //   if (cond1) {
-  //     if (cond2)
-  //       return;
-  //   } else
-  //     if (cond2)
-  //       return;
-  //   return;
-  // }
-  std::unique_ptr<Module> M =
-      parseIR(C, R"(define void @foo(i1 %cond1, i1 %cond2) {
-                 idom:
-                   br i1 %cond1, label %succ0, label %succ1
-                 succ0:
-                   br i1 %cond2, label %succ0ret, label %succ0succ1
-                 succ0ret:
-                   ret void
-                 succ0succ1:
-                   br label %bb
-                 succ1:
-                   br i1 %cond2, label %succ1ret, label %succ1succ1
-                 succ1ret:
-                   ret void
-                 succ1succ1:
-                   br label %bb
-                 bb:
-                   ret void
-                 })");
-  run(*M, "foo",
-      [&](Function &F, DominatorTree &DT, PostDominatorTree &PDT,
-          DependenceInfo &DI) {
-        BasicBlock &Idom = F.front();
-        assert(Idom.getName() == "idom" && "Expecting BasicBlock idom");
-        BasicBlock &BB = F.back();
-        assert(BB.getName() == "bb" && "Expecting BasicBlock bb");
-        EXPECT_FALSE(isControlFlowEquivalent(Idom, BB, DT, PDT));
-      });
-}
-
-TEST(CodeMoverUtils, IsSafeToMoveTest1) {
-  LLVMContext C;
-
-  // void safecall() noexcept willreturn nosync;
-  // void unsafecall();
-  // void foo(int * __restrict__ A, int * __restrict__ B, int * __restrict__ C,
-  //          long N) {
-  //   X = N / 1;
-  //   safecall();
-  //   unsafecall1();
-  //   unsafecall2();
-  //   for (long i = 0; i < N; ++i) {
-  //     A[5] = 5;
-  //     A[i] = 0;
-  //     B[i] = A[i];
-  //     C[i] = A[i];
-  //     A[6] = 6;
-  //   }
-  // }
-  std::unique_ptr<Module> M = parseIR(
-      C, R"(define void @foo(i32* noalias %A, i32* noalias %B, i32* noalias %C
-                           , i64 %N) {
-         entry:
-           %X = sdiv i64 1, %N
-           call void @safecall()
-           %cmp1 = icmp slt i64 0, %N
-           call void @unsafecall1()
-           call void @unsafecall2()
-           br i1 %cmp1, label %for.body, label %for.end
-         for.body:
-           %i = phi i64 [ 0, %entry ], [ %inc, %for.body ]
-           %arrayidx_A5 = getelementptr inbounds i32, i32* %A, i64 5
-           store i32 5, i32* %arrayidx_A5, align 4
-           %arrayidx_A = getelementptr inbounds i32, i32* %A, i64 %i
-           store i32 0, i32* %arrayidx_A, align 4
-           %load1 = load i32, i32* %arrayidx_A, align 4
-           %arrayidx_B = getelementptr inbounds i32, i32* %B, i64 %i
-           store i32 %load1, i32* %arrayidx_B, align 4
-           %load2 = load i32, i32* %arrayidx_A, align 4
-           %arrayidx_C = getelementptr inbounds i32, i32* %C, i64 %i
-           store i32 %load2, i32* %arrayidx_C, align 4
-           %arrayidx_A6 = getelementptr inbounds i32, i32* %A, i64 6
-           store i32 6, i32* %arrayidx_A6, align 4
-           %inc = add nsw i64 %i, 1
-           %cmp = icmp slt i64 %inc, %N
-           br i1 %cmp, label %for.body, label %for.end
-         for.end:
-           ret void
-         }
-         declare void @safecall() nounwind nosync willreturn
-         declare void @unsafecall1()
-         declare void @unsafecall2())");
-
-  run(*M, "foo",
-      [&](Function &F, DominatorTree &DT, PostDominatorTree &PDT,
-          DependenceInfo &DI) {
-        BasicBlock *Entry = getBasicBlockByName(F, "entry");
-        Instruction *CI_safecall = Entry->front().getNextNode();
-        assert(isa<CallInst>(CI_safecall) &&
-               "Expecting CI_safecall to be a CallInst");
-        Instruction *CI_unsafecall = CI_safecall->getNextNode()->getNextNode();
-        assert(isa<CallInst>(CI_unsafecall) &&
-               "Expecting CI_unsafecall to be a CallInst");
-        BasicBlock *ForBody = getBasicBlockByName(F, "for.body");
-        Instruction &PN = ForBody->front();
-        assert(isa<PHINode>(PN) && "Expecting PN to be a PHINode");
-        Instruction *SI_A5 =
-            getInstructionByName(F, "arrayidx_A5")->getNextNode();
-        Instruction *SI = getInstructionByName(F, "arrayidx_A")->getNextNode();
-        Instruction *LI1 = getInstructionByName(F, "load1");
-        Instruction *LI2 = getInstructionByName(F, "load2");
-        Instruction *SI_A6 =
-            getInstructionByName(F, "arrayidx_A6")->getNextNode();
-
-        // Can move after CI_safecall, as it does not throw, not synchronize, or
-        // must return.
-        EXPECT_TRUE(isSafeToMoveBefore(*CI_safecall->getPrevNode(),
-                                       *CI_safecall->getNextNode(), DT, &PDT,
-                                       &DI));
-
-        // Cannot move CI_unsafecall, as it may throw.
-        EXPECT_FALSE(isSafeToMoveBefore(*CI_unsafecall->getNextNode(),
-                                        *CI_unsafecall, DT, &PDT, &DI));
-
-        // Moving instruction to non control flow equivalent places are not
-        // supported.
-        EXPECT_FALSE(
-            isSafeToMoveBefore(*SI_A5, *Entry->getTerminator(), DT, &PDT, &DI));
-
-        // Moving PHINode is not supported.
-        EXPECT_FALSE(isSafeToMoveBefore(PN, *PN.getNextNode()->getNextNode(),
-                                        DT, &PDT, &DI));
-
-        // Cannot move non-PHINode before PHINode.
-        EXPECT_FALSE(isSafeToMoveBefore(*PN.getNextNode(), PN, DT, &PDT, &DI));
-
-        // Moving Terminator is not supported.
-        EXPECT_FALSE(isSafeToMoveBefore(*Entry->getTerminator(),
-                                        *PN.getNextNode(), DT, &PDT, &DI));
-
-        // Cannot move %arrayidx_A after SI, as SI is its user.
-        EXPECT_FALSE(isSafeToMoveBefore(*SI->getPrevNode(), *SI->getNextNode(),
-                                        DT, &PDT, &DI));
-
-        // Cannot move SI before %arrayidx_A, as %arrayidx_A is its operand.
-        EXPECT_FALSE(
-            isSafeToMoveBefore(*SI, *SI->getPrevNode(), DT, &PDT, &DI));
-
-        // Cannot move LI2 after SI_A6, as there is a flow dependence.
-        EXPECT_FALSE(
-            isSafeToMoveBefore(*LI2, *SI_A6->getNextNode(), DT, &PDT, &DI));
-
-        // Cannot move SI after LI1, as there is a anti dependence.
-        EXPECT_FALSE(
-            isSafeToMoveBefore(*SI, *LI1->getNextNode(), DT, &PDT, &DI));
-
-        // Cannot move SI_A5 after SI, as there is a output dependence.
-        EXPECT_FALSE(isSafeToMoveBefore(*SI_A5, *LI1, DT, &PDT, &DI));
-
-        // Can move LI2 before LI1, as there is only an input dependence.
-        EXPECT_TRUE(isSafeToMoveBefore(*LI2, *LI1, DT, &PDT, &DI));
-      });
-}
-
-TEST(CodeMoverUtils, IsSafeToMoveTest2) {
-  LLVMContext C;
-
-  std::unique_ptr<Module> M =
-      parseIR(C, R"(define void @foo(i1 %cond, i32 %op0, i32 %op1) {
-                 entry:
-                   br i1 %cond, label %if.then.first, label %if.end.first
-                 if.then.first:
-                   %add = add i32 %op0, %op1
-                   %user = add i32 %add, 1
-                   br label %if.end.first
-                 if.end.first:
-                   br i1 %cond, label %if.then.second, label %if.end.second
-                 if.then.second:
-                   %sub_op0 = add i32 %op0, 1
-                   %sub = sub i32 %sub_op0, %op1
-                   br label %if.end.second
-                 if.end.second:
-                   ret void
-                 })");
-
-  run(*M, "foo",
-      [&](Function &F, DominatorTree &DT, PostDominatorTree &PDT,
-          DependenceInfo &DI) {
-        Instruction *AddInst = getInstructionByName(F, "add");
-        Instruction *SubInst = getInstructionByName(F, "sub");
-
-        // Cannot move as %user uses %add and %sub doesn't dominates %user.
-        EXPECT_FALSE(isSafeToMoveBefore(*AddInst, *SubInst, DT, &PDT, &DI));
-
-        // Cannot move as %sub_op0 is an operand of %sub and %add doesn't
-        // dominates %sub_op0.
-        EXPECT_FALSE(isSafeToMoveBefore(*SubInst, *AddInst, DT, &PDT, &DI));
-      });
-}
-
-TEST(CodeMoverUtils, IsSafeToMoveTest3) {
-  LLVMContext C;
-
-  std::unique_ptr<Module> M = parseIR(C, R"(define void @foo(i64 %N) {
-                 entry:
-                   br label %for.body
-                 for.body:
-                   %i = phi i64 [ 0, %entry ], [ %inc, %for.latch ]
-                   %inc = add nsw i64 %i, 1
-                   br label %for.latch
-                 for.latch:
-                   %cmp = icmp slt i64 %inc, %N
-                   br i1 %cmp, label %for.body, label %for.end
-                 for.end:
-                   ret void
-                 })");
-
-  run(*M, "foo",
-      [&](Function &F, DominatorTree &DT, PostDominatorTree &PDT,
-          DependenceInfo &DI) {
-        Instruction *IncInst = getInstructionByName(F, "inc");
-        Instruction *CmpInst = getInstructionByName(F, "cmp");
-
-        // Can move as the incoming block of %inc for %i (%for.latch) dominated
-        // by %cmp.
-        EXPECT_TRUE(isSafeToMoveBefore(*IncInst, *CmpInst, DT, &PDT, &DI));
-      });
-}
-
-TEST(CodeMoverUtils, IsSafeToMoveTest4) {
-  LLVMContext C;
-
-  std::unique_ptr<Module> M =
-      parseIR(C, R"(define void @foo(i1 %cond, i32 %op0, i32 %op1) {
-                 entry:
-                   br i1 %cond, label %if.end.first, label %if.then.first
-                 if.then.first:
-                   %add = add i32 %op0, %op1
-                   %user = add i32 %add, 1
-                   br label %if.end.first
-                 if.end.first:
-                   br i1 %cond, label %if.end.second, label %if.then.second
-                 if.then.second:
-                   %sub_op0 = add i32 %op0, 1
-                   %sub = sub i32 %sub_op0, %op1
-                   br label %if.end.second
-                 if.end.second:
-                   ret void
-                 })");
-
-  run(*M, "foo",
-      [&](Function &F, DominatorTree &DT, PostDominatorTree &PDT,
-          DependenceInfo &DI) {
-        Instruction *AddInst = getInstructionByName(F, "add");
-        Instruction *SubInst = getInstructionByName(F, "sub");
-
-        // Cannot move as %user uses %add and %sub doesn't dominates %user.
-        EXPECT_FALSE(isSafeToMoveBefore(*AddInst, *SubInst, DT, &PDT, &DI));
-
-        // Cannot move as %sub_op0 is an operand of %sub and %add doesn't
-        // dominates %sub_op0.
-        EXPECT_FALSE(isSafeToMoveBefore(*SubInst, *AddInst, DT, &PDT, &DI));
-      });
-}
-
-TEST(CodeMoverUtils, IsSafeToMoveTest5) {
-  LLVMContext C;
-
-  std::unique_ptr<Module> M =
-      parseIR(C, R"(define void @dependence(i32* noalias %A, i32* noalias %B){
-entry:
-    store i32 0, i32* %A, align 4 ; storeA0
-    store i32 2, i32* %A, align 4 ; storeA1
-    %tmp0 = load i32, i32* %A, align 4 ; loadA0
-    store i32 1, i32* %B, align 4 ; storeB0
-    %tmp1 = load i32, i32* %A, align 4 ; loadA1
-    store i32 2, i32* %A, align 4 ; storeA2 
-    store i32 4, i32* %B, align 4 ; StoreB1 
-    %tmp2 = load i32, i32* %A, align 4 ; loadA2 
-    %tmp3 = load i32, i32* %A, align 4 ; loadA3 
-    %tmp4 = load i32, i32* %B, align 4 ; loadB2
-    %tmp5 = load i32, i32* %B, align 4 ; loadB3
-    ret void
-})");
-
-  run(*M, "dependence",
-      [&](Function &F, DominatorTree &DT, PostDominatorTree &PDT,
-          DependenceInfo &DI) {
-        Instruction *LoadA0 = getInstructionByName(F, "tmp0");
-        Instruction *LoadA1 = getInstructionByName(F, "tmp1");
-        Instruction *LoadA2 = getInstructionByName(F, "tmp2");
-        Instruction *LoadA3 = getInstructionByName(F, "tmp3");
-        Instruction *LoadB2 = getInstructionByName(F, "tmp4");
-        Instruction *LoadB3 = getInstructionByName(F, "tmp5");
-        Instruction *StoreA1 = LoadA0->getPrevNode();
-        Instruction *StoreA0 = StoreA1->getPrevNode();
-        Instruction *StoreB0 = LoadA0->getNextNode();
-        Instruction *StoreB1 = LoadA2->getPrevNode();
-        Instruction *StoreA2 = StoreB1->getPrevNode();
-
-        // Input forward dependency
-        EXPECT_TRUE(isSafeToMoveBefore(*LoadA2, *LoadB2, DT, &PDT, &DI));
-        // Input backward dependency
-        EXPECT_TRUE(isSafeToMoveBefore(*LoadA3, *LoadA2, DT, &PDT, &DI));
-
-        // Output forward dependency
-        EXPECT_FALSE(isSafeToMoveBefore(*StoreA0, *LoadA0, DT, &PDT, &DI));
-        // Output backward dependency
-        EXPECT_FALSE(isSafeToMoveBefore(*StoreA1, *StoreA0, DT, &PDT, &DI));
-
-        // Flow forward dependency
-        EXPECT_FALSE(isSafeToMoveBefore(*StoreA1, *StoreB0, DT, &PDT, &DI));
-        // Flow backward dependency
-        EXPECT_FALSE(isSafeToMoveBefore(*LoadA0, *StoreA1, DT, &PDT, &DI));
-
-        // Anti forward dependency
-        EXPECT_FALSE(isSafeToMoveBefore(*LoadA1, *StoreB1, DT, &PDT, &DI));
-        // Anti backward dependency
-        EXPECT_FALSE(isSafeToMoveBefore(*StoreA2, *LoadA1, DT, &PDT, &DI));
-
-        // No input backward dependency
-        EXPECT_TRUE(isSafeToMoveBefore(*LoadB2, *LoadA3, DT, &PDT, &DI));
-        // No input forward dependency
-        EXPECT_TRUE(isSafeToMoveBefore(*LoadA3, *LoadB3, DT, &PDT, &DI));
-
-        // No Output forward dependency
-        EXPECT_TRUE(isSafeToMoveBefore(*StoreA2, *LoadA2, DT, &PDT, &DI));
-        // No Output backward dependency
-        EXPECT_TRUE(isSafeToMoveBefore(*StoreB1, *StoreA2, DT, &PDT, &DI));
-
-        // No flow forward dependency
-        EXPECT_TRUE(isSafeToMoveBefore(*StoreB0, *StoreA2, DT, &PDT, &DI));
-        // No flow backward dependency
-        EXPECT_TRUE(isSafeToMoveBefore(*LoadA1, *StoreB0, DT, &PDT, &DI));
-
-        // No anti backward dependency
-        EXPECT_TRUE(isSafeToMoveBefore(*StoreB0, *LoadA0, DT, &PDT, &DI));
-        // No anti forward dependency
-        EXPECT_TRUE(isSafeToMoveBefore(*LoadA0, *LoadA1, DT, &PDT, &DI));
-      });
-}
-
-TEST(CodeMoverUtils, IsSafeToMoveTest6) {
-  LLVMContext C;
-
-  std::unique_ptr<Module> M = parseIR(
-      C, R"(define void @dependence(i1 %cond, i32* noalias %A, i32* noalias %B){
-   entry:
-        br i1 %cond, label %bb0, label %bb1
-   bb0:
-        br label %bb1
-    bb1:
-        store i32 0, i32* %A, align 4 ; storeA0
-        br i1 %cond, label %bb2, label %bb3
-    bb2:
-        br label %bb3
-    bb3:
-        store i32 2, i32* %A, align 4 ; storeA1
-        br i1 %cond, label %bb4, label %bb5
-    bb4:
-        br label %bb5
-    bb5:
-        %tmp0 = load i32, i32* %A, align 4 ; loadA0
-        br i1 %cond, label %bb6, label %bb7
-    bb6:
-        br label %bb7
-    bb7:
-        store i32 1, i32* %B, align 4 ; storeB0
-        br i1 %cond, label %bb8, label %bb9
-    bb8:
-        br label %bb9
-    bb9:
-        %tmp1 = load i32, i32* %A, align 4 ; loadA1
-        br i1 %cond, label %bb10, label %bb11
-    bb10:
-        br label %bb11
-    bb11:
-        store i32 2, i32* %A, align 4 ; storeA2
-        br i1 %cond, label %bb12, label %bb13
-    bb12:
-        br label %bb13
-    bb13:
-        store i32 4, i32* %B, align 4 ; StoreB1
-        br i1 %cond, label %bb14, label %bb15
-    bb14:
-        br label %bb15
-    bb15:
-        %tmp2 = load i32, i32* %A, align 4 ; loadA2
-        br i1 %cond, label %bb16, label %bb17
-    bb16:
-        br label %bb17
-    bb17:
-        %tmp3 = load i32, i32* %A, align 4 ; loadA3
-        br i1 %cond, label %bb18, label %bb19
-    bb18:
-        br label %bb19
-    bb19:
-        %tmp4 = load i32, i32* %B, align 4 ; loadB2
-        br i1 %cond, label %bb20, label %bb21
-    bb20:
-       br label %bb21
-    bb21:
-       %tmp5 = load i32, i32* %B, align 4 ; loadB3
-       ret void
-   })");
-  run(*M, "dependence",
-      [&](Function &F, DominatorTree &DT, PostDominatorTree &PDT,
-          DependenceInfo &DI) {
-        BasicBlock *BB1 = getBasicBlockByName(F, "bb1");
-        BasicBlock *BB3 = getBasicBlockByName(F, "bb3");
-        BasicBlock *BB7 = getBasicBlockByName(F, "bb7");
-        BasicBlock *BB11 = getBasicBlockByName(F, "bb11");
-        BasicBlock *BB13 = getBasicBlockByName(F, "bb13");
-        Instruction *LoadA0 = getInstructionByName(F, "tmp0");
-        Instruction *LoadA1 = getInstructionByName(F, "tmp1");
-        Instruction *LoadA2 = getInstructionByName(F, "tmp2");
-        Instruction *LoadA3 = getInstructionByName(F, "tmp3");
-        Instruction *LoadB2 = getInstructionByName(F, "tmp4");
-        Instruction *LoadB3 = getInstructionByName(F, "tmp5");
-        Instruction &StoreA1 = BB3->front();
-        Instruction &StoreA0 = BB1->front();
-        Instruction &StoreB0 = BB7->front();
-        Instruction &StoreB1 = BB13->front();
-        Instruction &StoreA2 = BB11->front();
-
-        // Input forward dependency
-        EXPECT_TRUE(isSafeToMoveBefore(*LoadA2, *LoadB2, DT, &PDT, &DI));
-        // Input backward dependency
-        EXPECT_TRUE(isSafeToMoveBefore(*LoadA3, *LoadA2, DT, &PDT, &DI));
-
-        // Output forward dependency
-        EXPECT_FALSE(isSafeToMoveBefore(StoreA0, *LoadA0, DT, &PDT, &DI));
-        // Output backward dependency
-        EXPECT_FALSE(isSafeToMoveBefore(StoreA1, StoreA0, DT, &PDT, &DI));
-
-        // Flow forward dependency
-        EXPECT_FALSE(isSafeToMoveBefore(StoreA1, StoreB0, DT, &PDT, &DI));
-        // Flow backward dependency
-        EXPECT_FALSE(isSafeToMoveBefore(*LoadA0, StoreA1, DT, &PDT, &DI));
-
-        // Anti forward dependency
-        EXPECT_FALSE(isSafeToMoveBefore(*LoadA1, StoreB1, DT, &PDT, &DI));
-        // Anti backward dependency
-        EXPECT_FALSE(isSafeToMoveBefore(StoreA2, *LoadA1, DT, &PDT, &DI));
-
-        // No input backward dependency
-        EXPECT_TRUE(isSafeToMoveBefore(*LoadB2, *LoadA3, DT, &PDT, &DI));
-        // No input forward dependency
-        EXPECT_TRUE(isSafeToMoveBefore(*LoadA3, *LoadB3, DT, &PDT, &DI));
-
-        // No Output forward dependency
-        EXPECT_TRUE(isSafeToMoveBefore(StoreA2, *LoadA2, DT, &PDT, &DI));
-        // No Output backward dependency
-        EXPECT_TRUE(isSafeToMoveBefore(StoreB1, StoreA2, DT, &PDT, &DI));
-
-        // No flow forward dependency
-        EXPECT_TRUE(isSafeToMoveBefore(StoreB0, StoreA2, DT, &PDT, &DI));
-        // No flow backward dependency
-        EXPECT_TRUE(isSafeToMoveBefore(*LoadA1, StoreB0, DT, &PDT, &DI));
-
-        // No anti backward dependency
-        EXPECT_TRUE(isSafeToMoveBefore(StoreB0, *LoadA0, DT, &PDT, &DI));
-        // No anti forward dependency
-        EXPECT_TRUE(isSafeToMoveBefore(*LoadA0, *LoadA1, DT, &PDT, &DI));
-      });
-}
diff --git a/gnu/llvm/llvm/unittests/Transforms/Utils/DebugifyTest.cpp b/gnu/llvm/llvm/unittests/Transforms/Utils/DebugifyTest.cpp
deleted file mode 100644
index 33ff72c9d9e..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/Utils/DebugifyTest.cpp
+++ /dev/null
@@ -1,264 +0,0 @@
-//===- DebugifyTest.cpp - Debugify unit tests -----------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/DebugInfoMetadata.h"
-#include "llvm/IR/IntrinsicInst.h"
-#include "llvm/IR/LegacyPassManager.h"
-#include "llvm/Support/SourceMgr.h"
-#include "llvm/Transforms/Utils/Debugify.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-static std::unique_ptr<Module> parseIR(LLVMContext &C, const char *IR) {
-  SMDiagnostic Err;
-  std::unique_ptr<Module> Mod = parseAssemblyString(IR, Err, C);
-  if (!Mod)
-    Err.print("DebugifyTest", errs());
-  return Mod;
-}
-
-namespace llvm {
-void initializeDebugInfoDropPass(PassRegistry &);
-void initializeDebugInfoDummyAnalysisPass(PassRegistry &);
-
-namespace {
-struct DebugInfoDrop : public FunctionPass {
-  static char ID;
-  bool runOnFunction(Function &F) override {
-    // Drop DISubprogram.
-    F.setSubprogram(nullptr);
-    for (BasicBlock &BB : F) {
-      // Remove debug locations.
-      for (Instruction &I : BB)
-        I.setDebugLoc(DebugLoc());
-    }
-
-    return false;
-  }
-
-  void getAnalysisUsage(AnalysisUsage &AU) const override {
-    AU.setPreservesCFG();
-  }
-
-  DebugInfoDrop() : FunctionPass(ID) {}
-};
-
-struct DebugValueDrop : public FunctionPass {
-  static char ID;
-  bool runOnFunction(Function &F) override {
-    SmallVector<DbgVariableIntrinsic *, 4> Dbgs;
-    for (BasicBlock &BB : F) {
-      // Remove dbg var intrinsics.
-      for (Instruction &I : BB) {
-        if (auto *DVI = dyn_cast<DbgVariableIntrinsic>(&I))
-          Dbgs.push_back(DVI);
-      }
-    }
-
-    for (auto &I : Dbgs)
-      I->eraseFromParent();
-
-    return true;
-  }
-
-  void getAnalysisUsage(AnalysisUsage &AU) const override {
-    AU.setPreservesCFG();
-  }
-
-  DebugValueDrop() : FunctionPass(ID) {}
-};
-
-struct DebugInfoDummyAnalysis : public FunctionPass {
-  static char ID;
-  bool runOnFunction(Function &F) override {
-    // Do nothing, so debug info stays untouched.
-    return false;
-  }
-  void getAnalysisUsage(AnalysisUsage &AU) const override {
-    AU.setPreservesAll();
-  }
-
-  DebugInfoDummyAnalysis() : FunctionPass(ID) {}
-};
-}
-
-char DebugInfoDrop::ID = 0;
-char DebugValueDrop::ID = 0;
-char DebugInfoDummyAnalysis::ID = 0;
-
-TEST(DebugInfoDrop, DropOriginalDebugInfo) {
-  LLVMContext C;
-  std::unique_ptr<Module> M = parseIR(C, R"(
-    define i16 @f(i16 %a) !dbg !6 {
-      %b = add i16 %a, 1, !dbg !11
-      call void @llvm.dbg.value(metadata i16 %b, metadata !9, metadata !DIExpression()), !dbg !11
-      ret i16 0, !dbg !11
-    }
-    declare void @llvm.dbg.value(metadata, metadata, metadata)
-
-    !llvm.dbg.cu = !{!0}
-    !llvm.module.flags = !{!5}
-
-    !0 = distinct !DICompileUnit(language: DW_LANG_C, file: !1, producer: "debugify", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2)
-    !1 = !DIFile(filename: "t.ll", directory: "/")
-    !2 = !{}
-    !5 = !{i32 2, !"Debug Info Version", i32 3}
-    !6 = distinct !DISubprogram(name: "f", linkageName: "f", scope: null, file: !1, line: 1, type: !7, scopeLine: 1, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !8)
-    !7 = !DISubroutineType(types: !2)
-    !8 = !{!9}
-    !9 = !DILocalVariable(name: "b", scope: !6, file: !1, line: 1, type: !10)
-    !10 = !DIBasicType(name: "ty16", size: 16, encoding: DW_ATE_unsigned)
-    !11 = !DILocation(line: 1, column: 1, scope: !6)
-  )");
-
-  DebugInfoDrop *P = new DebugInfoDrop();
-
-  DebugInfoPerPassMap DIPreservationMap;
-  DebugifyCustomPassManager Passes;
-  Passes.setDIPreservationMap(DIPreservationMap);
-  Passes.add(createDebugifyModulePass(DebugifyMode::OriginalDebugInfo, "",
-                                      &(Passes.getDebugInfoPerPassMap())));
-  Passes.add(P);
-  Passes.add(createCheckDebugifyModulePass(false, "", nullptr,
-                                           DebugifyMode::OriginalDebugInfo,
-                                           &(Passes.getDebugInfoPerPassMap())));
-
-  testing::internal::CaptureStderr();
-  Passes.run(*M);
-
-  std::string StdOut = testing::internal::GetCapturedStderr();
-
-  std::string ErrorForSP = "ERROR:  dropped DISubprogram of";
-  std::string WarningForLoc = "WARNING:  dropped DILocation of";
-  std::string FinalResult = "CheckModuleDebugify (original debuginfo): FAIL";
-
-  EXPECT_TRUE(StdOut.find(ErrorForSP) != std::string::npos);
-  EXPECT_TRUE(StdOut.find(WarningForLoc) != std::string::npos);
-  EXPECT_TRUE(StdOut.find(FinalResult) != std::string::npos);
-}
-
-TEST(DebugValueDrop, DropOriginalDebugValues) {
-  LLVMContext C;
-  std::unique_ptr<Module> M = parseIR(C, R"(
-    define i16 @f(i16 %a) !dbg !6 {
-      %b = add i16 %a, 1, !dbg !11
-      call void @llvm.dbg.value(metadata i16 %b, metadata !9, metadata !DIExpression()), !dbg !11
-      ret i16 0, !dbg !11
-    }
-    declare void @llvm.dbg.value(metadata, metadata, metadata)
-
-    !llvm.dbg.cu = !{!0}
-    !llvm.module.flags = !{!5}
-
-    !0 = distinct !DICompileUnit(language: DW_LANG_C, file: !1, producer: "debugify", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2)
-    !1 = !DIFile(filename: "t.ll", directory: "/")
-    !2 = !{}
-    !5 = !{i32 2, !"Debug Info Version", i32 3}
-    !6 = distinct !DISubprogram(name: "f", linkageName: "f", scope: null, file: !1, line: 1, type: !7, scopeLine: 1, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !8)
-    !7 = !DISubroutineType(types: !2)
-    !8 = !{!9}
-    !9 = !DILocalVariable(name: "b", scope: !6, file: !1, line: 1, type: !10)
-    !10 = !DIBasicType(name: "ty16", size: 16, encoding: DW_ATE_unsigned)
-    !11 = !DILocation(line: 1, column: 1, scope: !6)
-  )");
-
-  DebugValueDrop *P = new DebugValueDrop();
-
-  DebugInfoPerPassMap DIPreservationMap;
-  DebugifyCustomPassManager Passes;
-  Passes.setDIPreservationMap(DIPreservationMap);
-  Passes.add(createDebugifyModulePass(DebugifyMode::OriginalDebugInfo, "",
-                                      &(Passes.getDebugInfoPerPassMap())));
-  Passes.add(P);
-  Passes.add(createCheckDebugifyModulePass(false, "", nullptr,
-                                           DebugifyMode::OriginalDebugInfo,
-                                           &(Passes.getDebugInfoPerPassMap())));
-
-  testing::internal::CaptureStderr();
-  Passes.run(*M);
-
-  std::string StdOut = testing::internal::GetCapturedStderr();
-
-  std::string ErrorForSP = "ERROR:  dropped DISubprogram of";
-  std::string WarningForLoc = "WARNING:  dropped DILocation of";
-  std::string WarningForVars = "WARNING:  drops dbg.value()/dbg.declare() for";
-  std::string FinalResult = "CheckModuleDebugify (original debuginfo): FAIL";
-
-  EXPECT_TRUE(StdOut.find(ErrorForSP) == std::string::npos);
-  EXPECT_TRUE(StdOut.find(WarningForLoc) == std::string::npos);
-  EXPECT_TRUE(StdOut.find(WarningForVars) != std::string::npos);
-  EXPECT_TRUE(StdOut.find(FinalResult) != std::string::npos);
-}
-
-TEST(DebugInfoDummyAnalysis, PreserveOriginalDebugInfo) {
-  LLVMContext C;
-  std::unique_ptr<Module> M = parseIR(C, R"(
-    define i32 @g(i32 %b) !dbg !6 {
-      %c = add i32 %b, 1, !dbg !11
-      call void @llvm.dbg.value(metadata i32 %c, metadata !9, metadata !DIExpression()), !dbg !11
-      ret i32 1, !dbg !11
-    }
-    declare void @llvm.dbg.value(metadata, metadata, metadata)
-
-    !llvm.dbg.cu = !{!0}
-    !llvm.module.flags = !{!5}
-
-    !0 = distinct !DICompileUnit(language: DW_LANG_C, file: !1, producer: "debugify", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2)
-    !1 = !DIFile(filename: "test.ll", directory: "/")
-    !2 = !{}
-    !5 = !{i32 2, !"Debug Info Version", i32 3}
-    !6 = distinct !DISubprogram(name: "f", linkageName: "f", scope: null, file: !1, line: 1, type: !7, scopeLine: 1, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !8)
-    !7 = !DISubroutineType(types: !2)
-    !8 = !{!9}
-    !9 = !DILocalVariable(name: "c", scope: !6, file: !1, line: 1, type: !10)
-    !10 = !DIBasicType(name: "ty32", size: 32, encoding: DW_ATE_unsigned)
-    !11 = !DILocation(line: 1, column: 1, scope: !6)
-  )");
-
-  DebugInfoDummyAnalysis *P = new DebugInfoDummyAnalysis();
-
-  DebugInfoPerPassMap DIPreservationMap;
-  DebugifyCustomPassManager Passes;
-  Passes.setDIPreservationMap(DIPreservationMap);
-  Passes.add(createDebugifyModulePass(DebugifyMode::OriginalDebugInfo, "",
-                                      &(Passes.getDebugInfoPerPassMap())));
-  Passes.add(P);
-  Passes.add(createCheckDebugifyModulePass(false, "", nullptr,
-                                           DebugifyMode::OriginalDebugInfo,
-                                           &(Passes.getDebugInfoPerPassMap())));
-
-  testing::internal::CaptureStderr();
-  Passes.run(*M);
-
-  std::string StdOut = testing::internal::GetCapturedStderr();
-
-  std::string ErrorForSP = "ERROR:  dropped DISubprogram of";
-  std::string WarningForLoc = "WARNING:  dropped DILocation of";
-  std::string WarningForVars = "WARNING:  drops dbg.value()/dbg.declare() for";
-  std::string FinalResult = "CheckModuleDebugify (original debuginfo): PASS";
-
-  EXPECT_TRUE(StdOut.find(ErrorForSP) == std::string::npos);
-  EXPECT_TRUE(StdOut.find(WarningForLoc) == std::string::npos);
-  EXPECT_TRUE(StdOut.find(WarningForVars) == std::string::npos);
-  EXPECT_TRUE(StdOut.find(FinalResult) != std::string::npos);
-}
-
-} // end namespace llvm
-
-INITIALIZE_PASS_BEGIN(DebugInfoDrop, "debuginfodroppass", "debuginfodroppass",
-                      false, false)
-INITIALIZE_PASS_END(DebugInfoDrop, "debuginfodroppass", "debuginfodroppass", false,
-                    false)
-
-INITIALIZE_PASS_BEGIN(DebugInfoDummyAnalysis, "debuginfodummyanalysispass",
-                      "debuginfodummyanalysispass", false, false)
-INITIALIZE_PASS_END(DebugInfoDummyAnalysis, "debuginfodummyanalysispass",
-                    "debuginfodummyanalysispass", false, false)
diff --git a/gnu/llvm/llvm/unittests/Transforms/Utils/FunctionComparatorTest.cpp b/gnu/llvm/llvm/unittests/Transforms/Utils/FunctionComparatorTest.cpp
deleted file mode 100644
index 42f9fb39c2d..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/Utils/FunctionComparatorTest.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-//===- FunctionComparator.cpp - Unit tests for FunctionComparator ---------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-#include "llvm/Transforms/Utils/FunctionComparator.h"
-#include "llvm/IR/BasicBlock.h"
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-/// Generates a simple test function.
-struct TestFunction {
-  Function *F;
-  BasicBlock *BB;
-  Constant *C;
-  Instruction *I;
-  Type *T;
-
-  TestFunction(LLVMContext &Ctx, Module &M, int addVal) {
-    IRBuilder<> B(Ctx);
-    T = B.getInt8Ty();
-    F = Function::Create(FunctionType::get(T, {B.getInt8PtrTy()}, false),
-                         GlobalValue::ExternalLinkage, "F", &M);
-    BB = BasicBlock::Create(Ctx, "", F);
-    B.SetInsertPoint(BB);
-    Argument *PointerArg = &*F->arg_begin();
-    LoadInst *LoadInst = B.CreateLoad(T, PointerArg);
-    C = B.getInt8(addVal);
-    I = cast<Instruction>(B.CreateAdd(LoadInst, C));
-    B.CreateRet(I);
-  }
-};
-
-/// A class for testing the FunctionComparator API.
-///
-/// The main purpose is to test if the required protected functions are
-/// accessible from a derived class of FunctionComparator.
-class TestComparator : public FunctionComparator {
-public:
-  TestComparator(const Function *F1, const Function *F2,
-                 GlobalNumberState *GN)
-        : FunctionComparator(F1, F2, GN) {
-  }
-
-  bool testFunctionAccess(const Function *F1, const Function *F2) {
-    // Test if FnL and FnR are accessible.
-    return F1 == FnL && F2 == FnR;
-  }
-
-  int testCompare() {
-    return compare();
-  }
-
-  int testCompareSignature() {
-    beginCompare();
-    return compareSignature();
-  }
-
-  int testCmpBasicBlocks(BasicBlock *BBL, BasicBlock *BBR) {
-    beginCompare();
-    return cmpBasicBlocks(BBL, BBR);
-  }
-
-  int testCmpConstants(const Constant *L, const Constant *R) {
-    beginCompare();
-    return cmpConstants(L, R);
-  }
-
-  int testCmpGlobalValues(GlobalValue *L, GlobalValue *R) {
-    beginCompare();
-    return cmpGlobalValues(L, R);
-  }
-
-  int testCmpValues(const Value *L, const Value *R) {
-    beginCompare();
-    return cmpValues(L, R);
-  }
-
-  int testCmpOperations(const Instruction *L, const Instruction *R,
-                        bool &needToCmpOperands) {
-    beginCompare();
-    return cmpOperations(L, R, needToCmpOperands);
-  }
-
-  int testCmpTypes(Type *TyL, Type *TyR) {
-    beginCompare();
-    return cmpTypes(TyL, TyR);
-  }
-
-  int testCmpPrimitives() {
-    beginCompare();
-    return
-      cmpNumbers(2, 3) +
-      cmpAPInts(APInt(32, 2), APInt(32, 3)) +
-      cmpAPFloats(APFloat(2.0), APFloat(3.0)) +
-      cmpMem("2", "3");
-  }
-};
-
-/// A sanity check for the FunctionComparator API.
-TEST(FunctionComparatorTest, TestAPI) {
-  LLVMContext C;
-  Module M("test", C);
-  TestFunction F1(C, M, 27);
-  TestFunction F2(C, M, 28);
-
-  GlobalNumberState GN;
-  TestComparator Cmp(F1.F, F2.F, &GN);
-
-  EXPECT_TRUE(Cmp.testFunctionAccess(F1.F, F2.F));
-  EXPECT_EQ(Cmp.testCompare(), -1);
-  EXPECT_EQ(Cmp.testCompareSignature(), 0);
-  EXPECT_EQ(Cmp.testCmpBasicBlocks(F1.BB, F2.BB), -1);
-  EXPECT_EQ(Cmp.testCmpConstants(F1.C, F2.C), -1);
-  EXPECT_EQ(Cmp.testCmpGlobalValues(F1.F, F2.F), -1);
-  EXPECT_EQ(Cmp.testCmpValues(F1.I, F2.I), 0);
-  bool needToCmpOperands = false;
-  EXPECT_EQ(Cmp.testCmpOperations(F1.I, F2.I, needToCmpOperands), 0);
-  EXPECT_TRUE(needToCmpOperands);
-  EXPECT_EQ(Cmp.testCmpTypes(F1.T, F2.T), 0);
-  EXPECT_EQ(Cmp.testCmpPrimitives(), -4);
-}
diff --git a/gnu/llvm/llvm/unittests/Transforms/Utils/IntegerDivisionTest.cpp b/gnu/llvm/llvm/unittests/Transforms/Utils/IntegerDivisionTest.cpp
deleted file mode 100644
index 79946735f85..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/Utils/IntegerDivisionTest.cpp
+++ /dev/null
@@ -1,263 +0,0 @@
-//===- IntegerDivision.cpp - Unit tests for the integer division code -----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Transforms/Utils/IntegerDivision.h"
-#include "llvm/IR/BasicBlock.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/GlobalValue.h"
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/Module.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-
-TEST(IntegerDivision, SDiv) {
-  LLVMContext C;
-  Module M("test division", C);
-  IRBuilder<> Builder(C);
-
-  SmallVector<Type*, 2> ArgTys(2, Builder.getInt32Ty());
-  Function *F = Function::Create(FunctionType::get(Builder.getInt32Ty(),
-                                                   ArgTys, false),
-                                 GlobalValue::ExternalLinkage, "F", &M);
-  assert(F->arg_size() == 2);
-
-  BasicBlock *BB = BasicBlock::Create(C, "", F);
-  Builder.SetInsertPoint(BB);
-
-  Function::arg_iterator AI = F->arg_begin();
-  Value *A = &*AI++;
-  Value *B = &*AI++;
-
-  Value *Div = Builder.CreateSDiv(A, B);
-  EXPECT_TRUE(BB->front().getOpcode() == Instruction::SDiv);
-
-  Value *Ret = Builder.CreateRet(Div);
-
-  expandDivision(cast<BinaryOperator>(Div));
-  EXPECT_TRUE(BB->front().getOpcode() == Instruction::AShr);
-
-  Instruction* Quotient = dyn_cast<Instruction>(cast<User>(Ret)->getOperand(0));
-  EXPECT_TRUE(Quotient && Quotient->getOpcode() == Instruction::Sub);
-}
-
-TEST(IntegerDivision, UDiv) {
-  LLVMContext C;
-  Module M("test division", C);
-  IRBuilder<> Builder(C);
-
-  SmallVector<Type*, 2> ArgTys(2, Builder.getInt32Ty());
-  Function *F = Function::Create(FunctionType::get(Builder.getInt32Ty(),
-                                                   ArgTys, false),
-                                 GlobalValue::ExternalLinkage, "F", &M);
-  assert(F->arg_size() == 2);
-
-  BasicBlock *BB = BasicBlock::Create(C, "", F);
-  Builder.SetInsertPoint(BB);
-
-  Function::arg_iterator AI = F->arg_begin();
-  Value *A = &*AI++;
-  Value *B = &*AI++;
-
-  Value *Div = Builder.CreateUDiv(A, B);
-  EXPECT_TRUE(BB->front().getOpcode() == Instruction::UDiv);
-
-  Value *Ret = Builder.CreateRet(Div);
-
-  expandDivision(cast<BinaryOperator>(Div));
-  EXPECT_TRUE(BB->front().getOpcode() == Instruction::ICmp);
-
-  Instruction* Quotient = dyn_cast<Instruction>(cast<User>(Ret)->getOperand(0));
-  EXPECT_TRUE(Quotient && Quotient->getOpcode() == Instruction::PHI);
-}
-
-TEST(IntegerDivision, SRem) {
-  LLVMContext C;
-  Module M("test remainder", C);
-  IRBuilder<> Builder(C);
-
-  SmallVector<Type*, 2> ArgTys(2, Builder.getInt32Ty());
-  Function *F = Function::Create(FunctionType::get(Builder.getInt32Ty(),
-                                                   ArgTys, false),
-                                 GlobalValue::ExternalLinkage, "F", &M);
-  assert(F->arg_size() == 2);
-
-  BasicBlock *BB = BasicBlock::Create(C, "", F);
-  Builder.SetInsertPoint(BB);
-
-  Function::arg_iterator AI = F->arg_begin();
-  Value *A = &*AI++;
-  Value *B = &*AI++;
-
-  Value *Rem = Builder.CreateSRem(A, B);
-  EXPECT_TRUE(BB->front().getOpcode() == Instruction::SRem);
-
-  Value *Ret = Builder.CreateRet(Rem);
-
-  expandRemainder(cast<BinaryOperator>(Rem));
-  EXPECT_TRUE(BB->front().getOpcode() == Instruction::AShr);
-
-  Instruction* Remainder = dyn_cast<Instruction>(cast<User>(Ret)->getOperand(0));
-  EXPECT_TRUE(Remainder && Remainder->getOpcode() == Instruction::Sub);
-}
-
-TEST(IntegerDivision, URem) {
-  LLVMContext C;
-  Module M("test remainder", C);
-  IRBuilder<> Builder(C);
-
-  SmallVector<Type*, 2> ArgTys(2, Builder.getInt32Ty());
-  Function *F = Function::Create(FunctionType::get(Builder.getInt32Ty(),
-                                                   ArgTys, false),
-                                 GlobalValue::ExternalLinkage, "F", &M);
-  assert(F->arg_size() == 2);
-
-  BasicBlock *BB = BasicBlock::Create(C, "", F);
-  Builder.SetInsertPoint(BB);
-
-  Function::arg_iterator AI = F->arg_begin();
-  Value *A = &*AI++;
-  Value *B = &*AI++;
-
-  Value *Rem = Builder.CreateURem(A, B);
-  EXPECT_TRUE(BB->front().getOpcode() == Instruction::URem);
-
-  Value *Ret = Builder.CreateRet(Rem);
-
-  expandRemainder(cast<BinaryOperator>(Rem));
-  EXPECT_TRUE(BB->front().getOpcode() == Instruction::ICmp);
-
-  Instruction* Remainder = dyn_cast<Instruction>(cast<User>(Ret)->getOperand(0));
-  EXPECT_TRUE(Remainder && Remainder->getOpcode() == Instruction::Sub);
-}
-
-
-TEST(IntegerDivision, SDiv64) {
-  LLVMContext C;
-  Module M("test division", C);
-  IRBuilder<> Builder(C);
-
-  SmallVector<Type*, 2> ArgTys(2, Builder.getInt64Ty());
-  Function *F = Function::Create(FunctionType::get(Builder.getInt64Ty(),
-                                                   ArgTys, false),
-                                 GlobalValue::ExternalLinkage, "F", &M);
-  assert(F->arg_size() == 2);
-
-  BasicBlock *BB = BasicBlock::Create(C, "", F);
-  Builder.SetInsertPoint(BB);
-
-  Function::arg_iterator AI = F->arg_begin();
-  Value *A = &*AI++;
-  Value *B = &*AI++;
-
-  Value *Div = Builder.CreateSDiv(A, B);
-  EXPECT_TRUE(BB->front().getOpcode() == Instruction::SDiv);
-
-  Value *Ret = Builder.CreateRet(Div);
-
-  expandDivision(cast<BinaryOperator>(Div));
-  EXPECT_TRUE(BB->front().getOpcode() == Instruction::AShr);
-
-  Instruction* Quotient = dyn_cast<Instruction>(cast<User>(Ret)->getOperand(0));
-  EXPECT_TRUE(Quotient && Quotient->getOpcode() == Instruction::Sub);
-}
-
-TEST(IntegerDivision, UDiv64) {
-  LLVMContext C;
-  Module M("test division", C);
-  IRBuilder<> Builder(C);
-
-  SmallVector<Type*, 2> ArgTys(2, Builder.getInt64Ty());
-  Function *F = Function::Create(FunctionType::get(Builder.getInt64Ty(),
-                                                   ArgTys, false),
-                                 GlobalValue::ExternalLinkage, "F", &M);
-  assert(F->arg_size() == 2);
-
-  BasicBlock *BB = BasicBlock::Create(C, "", F);
-  Builder.SetInsertPoint(BB);
-
-  Function::arg_iterator AI = F->arg_begin();
-  Value *A = &*AI++;
-  Value *B = &*AI++;
-
-  Value *Div = Builder.CreateUDiv(A, B);
-  EXPECT_TRUE(BB->front().getOpcode() == Instruction::UDiv);
-
-  Value *Ret = Builder.CreateRet(Div);
-
-  expandDivision(cast<BinaryOperator>(Div));
-  EXPECT_TRUE(BB->front().getOpcode() == Instruction::ICmp);
-
-  Instruction* Quotient = dyn_cast<Instruction>(cast<User>(Ret)->getOperand(0));
-  EXPECT_TRUE(Quotient && Quotient->getOpcode() == Instruction::PHI);
-}
-
-TEST(IntegerDivision, SRem64) {
-  LLVMContext C;
-  Module M("test remainder", C);
-  IRBuilder<> Builder(C);
-
-  SmallVector<Type*, 2> ArgTys(2, Builder.getInt64Ty());
-  Function *F = Function::Create(FunctionType::get(Builder.getInt64Ty(),
-                                                   ArgTys, false),
-                                 GlobalValue::ExternalLinkage, "F", &M);
-  assert(F->arg_size() == 2);
-
-  BasicBlock *BB = BasicBlock::Create(C, "", F);
-  Builder.SetInsertPoint(BB);
-
-  Function::arg_iterator AI = F->arg_begin();
-  Value *A = &*AI++;
-  Value *B = &*AI++;
-
-  Value *Rem = Builder.CreateSRem(A, B);
-  EXPECT_TRUE(BB->front().getOpcode() == Instruction::SRem);
-
-  Value *Ret = Builder.CreateRet(Rem);
-
-  expandRemainder(cast<BinaryOperator>(Rem));
-  EXPECT_TRUE(BB->front().getOpcode() == Instruction::AShr);
-
-  Instruction* Remainder = dyn_cast<Instruction>(cast<User>(Ret)->getOperand(0));
-  EXPECT_TRUE(Remainder && Remainder->getOpcode() == Instruction::Sub);
-}
-
-TEST(IntegerDivision, URem64) {
-  LLVMContext C;
-  Module M("test remainder", C);
-  IRBuilder<> Builder(C);
-
-  SmallVector<Type*, 2> ArgTys(2, Builder.getInt64Ty());
-  Function *F = Function::Create(FunctionType::get(Builder.getInt64Ty(),
-                                                   ArgTys, false),
-                                 GlobalValue::ExternalLinkage, "F", &M);
-  assert(F->arg_size() == 2);
-
-  BasicBlock *BB = BasicBlock::Create(C, "", F);
-  Builder.SetInsertPoint(BB);
-
-  Function::arg_iterator AI = F->arg_begin();
-  Value *A = &*AI++;
-  Value *B = &*AI++;
-
-  Value *Rem = Builder.CreateURem(A, B);
-  EXPECT_TRUE(BB->front().getOpcode() == Instruction::URem);
-
-  Value *Ret = Builder.CreateRet(Rem);
-
-  expandRemainder(cast<BinaryOperator>(Rem));
-  EXPECT_TRUE(BB->front().getOpcode() == Instruction::ICmp);
-
-  Instruction* Remainder = dyn_cast<Instruction>(cast<User>(Ret)->getOperand(0));
-  EXPECT_TRUE(Remainder && Remainder->getOpcode() == Instruction::Sub);
-}
-
-}
diff --git a/gnu/llvm/llvm/unittests/Transforms/Utils/LocalTest.cpp b/gnu/llvm/llvm/unittests/Transforms/Utils/LocalTest.cpp
deleted file mode 100644
index be9d9e52da1..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/Utils/LocalTest.cpp
+++ /dev/null
@@ -1,1073 +0,0 @@
-//===- Local.cpp - Unit tests for Local -----------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Transforms/Utils/Local.h"
-#include "llvm/Analysis/DomTreeUpdater.h"
-#include "llvm/Analysis/PostDominators.h"
-#include "llvm/Analysis/TargetTransformInfo.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/BasicBlock.h"
-#include "llvm/IR/DIBuilder.h"
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/IntrinsicInst.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Verifier.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-TEST(Local, RecursivelyDeleteDeadPHINodes) {
-  LLVMContext C;
-
-  IRBuilder<> builder(C);
-
-  // Make blocks
-  BasicBlock *bb0 = BasicBlock::Create(C);
-  BasicBlock *bb1 = BasicBlock::Create(C);
-
-  builder.SetInsertPoint(bb0);
-  PHINode    *phi = builder.CreatePHI(Type::getInt32Ty(C), 2);
-  BranchInst *br0 = builder.CreateCondBr(builder.getTrue(), bb0, bb1);
-
-  builder.SetInsertPoint(bb1);
-  BranchInst *br1 = builder.CreateBr(bb0);
-
-  phi->addIncoming(phi, bb0);
-  phi->addIncoming(phi, bb1);
-
-  // The PHI will be removed
-  EXPECT_TRUE(RecursivelyDeleteDeadPHINode(phi));
-
-  // Make sure the blocks only contain the branches
-  EXPECT_EQ(&bb0->front(), br0);
-  EXPECT_EQ(&bb1->front(), br1);
-
-  builder.SetInsertPoint(bb0);
-  phi = builder.CreatePHI(Type::getInt32Ty(C), 0);
-
-  EXPECT_TRUE(RecursivelyDeleteDeadPHINode(phi));
-
-  builder.SetInsertPoint(bb0);
-  phi = builder.CreatePHI(Type::getInt32Ty(C), 0);
-  builder.CreateAdd(phi, phi);
-
-  EXPECT_TRUE(RecursivelyDeleteDeadPHINode(phi));
-
-  bb0->dropAllReferences();
-  bb1->dropAllReferences();
-  delete bb0;
-  delete bb1;
-}
-
-TEST(Local, RemoveDuplicatePHINodes) {
-  LLVMContext C;
-  IRBuilder<> B(C);
-
-  std::unique_ptr<Function> F(
-      Function::Create(FunctionType::get(B.getVoidTy(), false),
-                       GlobalValue::ExternalLinkage, "F"));
-  BasicBlock *Entry(BasicBlock::Create(C, "", F.get()));
-  BasicBlock *BB(BasicBlock::Create(C, "", F.get()));
-  BranchInst::Create(BB, Entry);
-
-  B.SetInsertPoint(BB);
-
-  AssertingVH<PHINode> P1 = B.CreatePHI(Type::getInt32Ty(C), 2);
-  P1->addIncoming(B.getInt32(42), Entry);
-
-  PHINode *P2 = B.CreatePHI(Type::getInt32Ty(C), 2);
-  P2->addIncoming(B.getInt32(42), Entry);
-
-  AssertingVH<PHINode> P3 = B.CreatePHI(Type::getInt32Ty(C), 2);
-  P3->addIncoming(B.getInt32(42), Entry);
-  P3->addIncoming(B.getInt32(23), BB);
-
-  PHINode *P4 = B.CreatePHI(Type::getInt32Ty(C), 2);
-  P4->addIncoming(B.getInt32(42), Entry);
-  P4->addIncoming(B.getInt32(23), BB);
-
-  P1->addIncoming(P3, BB);
-  P2->addIncoming(P4, BB);
-  BranchInst::Create(BB, BB);
-
-  // Verify that we can eliminate PHIs that become duplicates after chaning PHIs
-  // downstream.
-  EXPECT_TRUE(EliminateDuplicatePHINodes(BB));
-  EXPECT_EQ(3U, BB->size());
-}
-
-static std::unique_ptr<Module> parseIR(LLVMContext &C, const char *IR) {
-  SMDiagnostic Err;
-  std::unique_ptr<Module> Mod = parseAssemblyString(IR, Err, C);
-  if (!Mod)
-    Err.print("UtilsTests", errs());
-  return Mod;
-}
-
-TEST(Local, ReplaceDbgDeclare) {
-  LLVMContext C;
-
-  // Original C source to get debug info for a local variable:
-  // void f() { int x; }
-  std::unique_ptr<Module> M = parseIR(C,
-                                      R"(
-      define void @f() !dbg !8 {
-      entry:
-        %x = alloca i32, align 4
-        call void @llvm.dbg.declare(metadata i32* %x, metadata !11, metadata !DIExpression()), !dbg !13
-        call void @llvm.dbg.declare(metadata i32* %x, metadata !11, metadata !DIExpression()), !dbg !13
-        ret void, !dbg !14
-      }
-      declare void @llvm.dbg.declare(metadata, metadata, metadata)
-      !llvm.dbg.cu = !{!0}
-      !llvm.module.flags = !{!3, !4}
-      !0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 6.0.0", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !2)
-      !1 = !DIFile(filename: "t2.c", directory: "foo")
-      !2 = !{}
-      !3 = !{i32 2, !"Dwarf Version", i32 4}
-      !4 = !{i32 2, !"Debug Info Version", i32 3}
-      !8 = distinct !DISubprogram(name: "f", scope: !1, file: !1, line: 1, type: !9, isLocal: false, isDefinition: true, scopeLine: 1, isOptimized: false, unit: !0, retainedNodes: !2)
-      !9 = !DISubroutineType(types: !10)
-      !10 = !{null}
-      !11 = !DILocalVariable(name: "x", scope: !8, file: !1, line: 2, type: !12)
-      !12 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
-      !13 = !DILocation(line: 2, column: 7, scope: !8)
-      !14 = !DILocation(line: 3, column: 1, scope: !8)
-      )");
-  auto *GV = M->getNamedValue("f");
-  ASSERT_TRUE(GV);
-  auto *F = dyn_cast<Function>(GV);
-  ASSERT_TRUE(F);
-  Instruction *Inst = &F->front().front();
-  auto *AI = dyn_cast<AllocaInst>(Inst);
-  ASSERT_TRUE(AI);
-  Inst = Inst->getNextNode()->getNextNode();
-  ASSERT_TRUE(Inst);
-  auto *DII = dyn_cast<DbgDeclareInst>(Inst);
-  ASSERT_TRUE(DII);
-  Value *NewBase = Constant::getNullValue(Type::getInt32PtrTy(C));
-  DIBuilder DIB(*M);
-  replaceDbgDeclare(AI, NewBase, DIB, DIExpression::ApplyOffset, 0);
-
-  // There should be exactly two dbg.declares.
-  int Declares = 0;
-  for (const Instruction &I : F->front())
-    if (isa<DbgDeclareInst>(I))
-      Declares++;
-  EXPECT_EQ(2, Declares);
-}
-
-/// Build the dominator tree for the function and run the Test.
-static void runWithDomTree(
-    Module &M, StringRef FuncName,
-    function_ref<void(Function &F, DominatorTree *DT)> Test) {
-  auto *F = M.getFunction(FuncName);
-  ASSERT_NE(F, nullptr) << "Could not find " << FuncName;
-  // Compute the dominator tree for the function.
-  DominatorTree DT(*F);
-  Test(*F, &DT);
-}
-
-TEST(Local, MergeBasicBlockIntoOnlyPred) {
-  LLVMContext C;
-  std::unique_ptr<Module> M;
-  auto resetIR = [&]() {
-    M = parseIR(C,
-                R"(
-      define i32 @f(i8* %str) {
-      entry:
-        br label %bb2.i
-      bb2.i:                                            ; preds = %bb4.i, %entry
-        br i1 false, label %bb4.i, label %base2flt.exit204
-      bb4.i:                                            ; preds = %bb2.i
-        br i1 false, label %base2flt.exit204, label %bb2.i
-      bb10.i196.bb7.i197_crit_edge:                     ; No predecessors!
-        br label %bb7.i197
-      bb7.i197:                                         ; preds = %bb10.i196.bb7.i197_crit_edge
-        %.reg2mem.0 = phi i32 [ %.reg2mem.0, %bb10.i196.bb7.i197_crit_edge ]
-        br i1 undef, label %base2flt.exit204, label %base2flt.exit204
-      base2flt.exit204:                                 ; preds = %bb7.i197, %bb7.i197, %bb2.i, %bb4.i
-        ret i32 0
-      }
-      )");
-  };
-
-  auto resetIRReplaceEntry = [&]() {
-    M = parseIR(C,
-                R"(
-      define i32 @f() {
-      entry:
-        br label %bb2.i
-      bb2.i:                                            ; preds = %entry
-        ret i32 0
-      }
-      )");
-  };
-
-  auto Test = [&](Function &F, DomTreeUpdater &DTU) {
-    for (Function::iterator I = F.begin(), E = F.end(); I != E;) {
-      BasicBlock *BB = &*I++;
-      BasicBlock *SinglePred = BB->getSinglePredecessor();
-      if (!SinglePred || SinglePred == BB || BB->hasAddressTaken())
-        continue;
-      BranchInst *Term = dyn_cast<BranchInst>(SinglePred->getTerminator());
-      if (Term && !Term->isConditional())
-        MergeBasicBlockIntoOnlyPred(BB, &DTU);
-    }
-    if (DTU.hasDomTree()) {
-      EXPECT_TRUE(DTU.getDomTree().verify());
-    }
-    if (DTU.hasPostDomTree()) {
-      EXPECT_TRUE(DTU.getPostDomTree().verify());
-    }
-  };
-
-  // Test MergeBasicBlockIntoOnlyPred working under Eager UpdateStrategy with
-  // both DT and PDT.
-  resetIR();
-  runWithDomTree(*M, "f", [&](Function &F, DominatorTree *DT) {
-    PostDominatorTree PDT = PostDominatorTree(F);
-    DomTreeUpdater DTU(*DT, PDT, DomTreeUpdater::UpdateStrategy::Eager);
-    Test(F, DTU);
-  });
-
-  // Test MergeBasicBlockIntoOnlyPred working under Eager UpdateStrategy with
-  // DT.
-  resetIR();
-  runWithDomTree(*M, "f", [&](Function &F, DominatorTree *DT) {
-    DomTreeUpdater DTU(*DT, DomTreeUpdater::UpdateStrategy::Eager);
-    Test(F, DTU);
-  });
-
-  // Test MergeBasicBlockIntoOnlyPred working under Eager UpdateStrategy with
-  // PDT.
-  resetIR();
-  runWithDomTree(*M, "f", [&](Function &F, DominatorTree *DT) {
-    PostDominatorTree PDT = PostDominatorTree(F);
-    DomTreeUpdater DTU(PDT, DomTreeUpdater::UpdateStrategy::Eager);
-    Test(F, DTU);
-  });
-
-  // Test MergeBasicBlockIntoOnlyPred working under Lazy UpdateStrategy with
-  // both DT and PDT.
-  resetIR();
-  runWithDomTree(*M, "f", [&](Function &F, DominatorTree *DT) {
-    PostDominatorTree PDT = PostDominatorTree(F);
-    DomTreeUpdater DTU(*DT, PDT, DomTreeUpdater::UpdateStrategy::Lazy);
-    Test(F, DTU);
-  });
-
-  // Test MergeBasicBlockIntoOnlyPred working under Lazy UpdateStrategy with
-  // PDT.
-  resetIR();
-  runWithDomTree(*M, "f", [&](Function &F, DominatorTree *DT) {
-    PostDominatorTree PDT = PostDominatorTree(F);
-    DomTreeUpdater DTU(PDT, DomTreeUpdater::UpdateStrategy::Lazy);
-    Test(F, DTU);
-  });
-
-  // Test MergeBasicBlockIntoOnlyPred working under Lazy UpdateStrategy with DT.
-  resetIR();
-  runWithDomTree(*M, "f", [&](Function &F, DominatorTree *DT) {
-    DomTreeUpdater DTU(*DT, DomTreeUpdater::UpdateStrategy::Lazy);
-    Test(F, DTU);
-  });
-
-  // Test MergeBasicBlockIntoOnlyPred working under Eager UpdateStrategy with
-  // both DT and PDT.
-  resetIRReplaceEntry();
-  runWithDomTree(*M, "f", [&](Function &F, DominatorTree *DT) {
-    PostDominatorTree PDT = PostDominatorTree(F);
-    DomTreeUpdater DTU(*DT, PDT, DomTreeUpdater::UpdateStrategy::Eager);
-    Test(F, DTU);
-  });
-
-  // Test MergeBasicBlockIntoOnlyPred working under Eager UpdateStrategy with
-  // DT.
-  resetIRReplaceEntry();
-  runWithDomTree(*M, "f", [&](Function &F, DominatorTree *DT) {
-    DomTreeUpdater DTU(*DT, DomTreeUpdater::UpdateStrategy::Eager);
-    Test(F, DTU);
-  });
-
-  // Test MergeBasicBlockIntoOnlyPred working under Eager UpdateStrategy with
-  // PDT.
-  resetIRReplaceEntry();
-  runWithDomTree(*M, "f", [&](Function &F, DominatorTree *DT) {
-    PostDominatorTree PDT = PostDominatorTree(F);
-    DomTreeUpdater DTU(PDT, DomTreeUpdater::UpdateStrategy::Eager);
-    Test(F, DTU);
-  });
-
-  // Test MergeBasicBlockIntoOnlyPred working under Lazy UpdateStrategy with
-  // both DT and PDT.
-  resetIRReplaceEntry();
-  runWithDomTree(*M, "f", [&](Function &F, DominatorTree *DT) {
-    PostDominatorTree PDT = PostDominatorTree(F);
-    DomTreeUpdater DTU(*DT, PDT, DomTreeUpdater::UpdateStrategy::Lazy);
-    Test(F, DTU);
-  });
-
-  // Test MergeBasicBlockIntoOnlyPred working under Lazy UpdateStrategy with
-  // PDT.
-  resetIRReplaceEntry();
-  runWithDomTree(*M, "f", [&](Function &F, DominatorTree *DT) {
-    PostDominatorTree PDT = PostDominatorTree(F);
-    DomTreeUpdater DTU(PDT, DomTreeUpdater::UpdateStrategy::Lazy);
-    Test(F, DTU);
-  });
-
-  // Test MergeBasicBlockIntoOnlyPred working under Lazy UpdateStrategy with DT.
-  resetIRReplaceEntry();
-  runWithDomTree(*M, "f", [&](Function &F, DominatorTree *DT) {
-    DomTreeUpdater DTU(*DT, DomTreeUpdater::UpdateStrategy::Lazy);
-    Test(F, DTU);
-  });
-}
-
-TEST(Local, ConstantFoldTerminator) {
-  LLVMContext C;
-
-  std::unique_ptr<Module> M = parseIR(C,
-                                      R"(
-      define void @br_same_dest() {
-      entry:
-        br i1 false, label %bb0, label %bb0
-      bb0:
-        ret void
-      }
-
-      define void @br_different_dest() {
-      entry:
-        br i1 true, label %bb0, label %bb1
-      bb0:
-        br label %exit
-      bb1:
-        br label %exit
-      exit:
-        ret void
-      }
-
-      define void @switch_2_different_dest() {
-      entry:
-        switch i32 0, label %default [ i32 0, label %bb0 ]
-      default:
-        ret void
-      bb0:
-        ret void
-      }
-      define void @switch_2_different_dest_default() {
-      entry:
-        switch i32 1, label %default [ i32 0, label %bb0 ]
-      default:
-        ret void
-      bb0:
-        ret void
-      }
-      define void @switch_3_different_dest() {
-      entry:
-        switch i32 0, label %default [ i32 0, label %bb0
-                                       i32 1, label %bb1 ]
-      default:
-        ret void
-      bb0:
-        ret void
-      bb1:
-        ret void
-      }
-
-      define void @switch_variable_2_default_dest(i32 %arg) {
-      entry:
-        switch i32 %arg, label %default [ i32 0, label %default ]
-      default:
-        ret void
-      }
-
-      define void @switch_constant_2_default_dest() {
-      entry:
-        switch i32 1, label %default [ i32 0, label %default ]
-      default:
-        ret void
-      }
-
-      define void @switch_constant_3_repeated_dest() {
-      entry:
-        switch i32 0, label %default [ i32 0, label %bb0
-                                       i32 1, label %bb0 ]
-       bb0:
-         ret void
-      default:
-        ret void
-      }
-
-      define void @indirectbr() {
-      entry:
-        indirectbr i8* blockaddress(@indirectbr, %bb0), [label %bb0, label %bb1]
-      bb0:
-        ret void
-      bb1:
-        ret void
-      }
-
-      define void @indirectbr_repeated() {
-      entry:
-        indirectbr i8* blockaddress(@indirectbr_repeated, %bb0), [label %bb0, label %bb0]
-      bb0:
-        ret void
-      }
-
-      define void @indirectbr_unreachable() {
-      entry:
-        indirectbr i8* blockaddress(@indirectbr_unreachable, %bb0), [label %bb1]
-      bb0:
-        ret void
-      bb1:
-        ret void
-      }
-        )");
-
-  auto CFAllTerminatorsEager = [&](Function &F, DominatorTree *DT) {
-    PostDominatorTree PDT = PostDominatorTree(F);
-    DomTreeUpdater DTU(*DT, PDT, DomTreeUpdater::UpdateStrategy::Eager);
-    for (Function::iterator I = F.begin(), E = F.end(); I != E;) {
-      BasicBlock *BB = &*I++;
-      ConstantFoldTerminator(BB, true, nullptr, &DTU);
-    }
-
-    EXPECT_TRUE(DTU.getDomTree().verify());
-    EXPECT_TRUE(DTU.getPostDomTree().verify());
-  };
-
-  auto CFAllTerminatorsLazy = [&](Function &F, DominatorTree *DT) {
-    PostDominatorTree PDT = PostDominatorTree(F);
-    DomTreeUpdater DTU(*DT, PDT, DomTreeUpdater::UpdateStrategy::Lazy);
-    for (Function::iterator I = F.begin(), E = F.end(); I != E;) {
-      BasicBlock *BB = &*I++;
-      ConstantFoldTerminator(BB, true, nullptr, &DTU);
-    }
-
-    EXPECT_TRUE(DTU.getDomTree().verify());
-    EXPECT_TRUE(DTU.getPostDomTree().verify());
-  };
-
-  // Test ConstantFoldTerminator under Eager UpdateStrategy.
-  runWithDomTree(*M, "br_same_dest", CFAllTerminatorsEager);
-  runWithDomTree(*M, "br_different_dest", CFAllTerminatorsEager);
-  runWithDomTree(*M, "switch_2_different_dest", CFAllTerminatorsEager);
-  runWithDomTree(*M, "switch_2_different_dest_default", CFAllTerminatorsEager);
-  runWithDomTree(*M, "switch_3_different_dest", CFAllTerminatorsEager);
-  runWithDomTree(*M, "switch_variable_2_default_dest", CFAllTerminatorsEager);
-  runWithDomTree(*M, "switch_constant_2_default_dest", CFAllTerminatorsEager);
-  runWithDomTree(*M, "switch_constant_3_repeated_dest", CFAllTerminatorsEager);
-  runWithDomTree(*M, "indirectbr", CFAllTerminatorsEager);
-  runWithDomTree(*M, "indirectbr_repeated", CFAllTerminatorsEager);
-  runWithDomTree(*M, "indirectbr_unreachable", CFAllTerminatorsEager);
-
-  // Test ConstantFoldTerminator under Lazy UpdateStrategy.
-  runWithDomTree(*M, "br_same_dest", CFAllTerminatorsLazy);
-  runWithDomTree(*M, "br_different_dest", CFAllTerminatorsLazy);
-  runWithDomTree(*M, "switch_2_different_dest", CFAllTerminatorsLazy);
-  runWithDomTree(*M, "switch_2_different_dest_default", CFAllTerminatorsLazy);
-  runWithDomTree(*M, "switch_3_different_dest", CFAllTerminatorsLazy);
-  runWithDomTree(*M, "switch_variable_2_default_dest", CFAllTerminatorsLazy);
-  runWithDomTree(*M, "switch_constant_2_default_dest", CFAllTerminatorsLazy);
-  runWithDomTree(*M, "switch_constant_3_repeated_dest", CFAllTerminatorsLazy);
-  runWithDomTree(*M, "indirectbr", CFAllTerminatorsLazy);
-  runWithDomTree(*M, "indirectbr_repeated", CFAllTerminatorsLazy);
-  runWithDomTree(*M, "indirectbr_unreachable", CFAllTerminatorsLazy);
-}
-
-struct SalvageDebugInfoTest : ::testing::Test {
-  LLVMContext C;
-  std::unique_ptr<Module> M;
-  Function *F = nullptr;
-
-  void SetUp() override {
-    M = parseIR(C,
-                R"(
-      define void @f() !dbg !8 {
-      entry:
-        %x = add i32 0, 1
-        %y = add i32 %x, 2
-        call void @llvm.dbg.value(metadata i32 %x, metadata !11, metadata !DIExpression()), !dbg !13
-        call void @llvm.dbg.value(metadata i32 %y, metadata !11, metadata !DIExpression()), !dbg !13
-        ret void, !dbg !14
-      }
-      declare void @llvm.dbg.value(metadata, metadata, metadata)
-      !llvm.dbg.cu = !{!0}
-      !llvm.module.flags = !{!3, !4}
-      !0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 6.0.0", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !2)
-      !1 = !DIFile(filename: "t2.c", directory: "foo")
-      !2 = !{}
-      !3 = !{i32 2, !"Dwarf Version", i32 4}
-      !4 = !{i32 2, !"Debug Info Version", i32 3}
-      !8 = distinct !DISubprogram(name: "f", scope: !1, file: !1, line: 1, type: !9, isLocal: false, isDefinition: true, scopeLine: 1, isOptimized: false, unit: !0, retainedNodes: !2)
-      !9 = !DISubroutineType(types: !10)
-      !10 = !{null}
-      !11 = !DILocalVariable(name: "x", scope: !8, file: !1, line: 2, type: !12)
-      !12 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
-      !13 = !DILocation(line: 2, column: 7, scope: !8)
-      !14 = !DILocation(line: 3, column: 1, scope: !8)
-      )");
-
-    auto *GV = M->getNamedValue("f");
-    ASSERT_TRUE(GV);
-    F = dyn_cast<Function>(GV);
-    ASSERT_TRUE(F);
-  }
-
-  bool doesDebugValueDescribeX(const DbgValueInst &DI) {
-    if (DI.getNumVariableLocationOps() != 1u)
-      return false;
-    const auto &CI = *cast<ConstantInt>(DI.getValue(0));
-    if (CI.isZero())
-      return DI.getExpression()->getElements().equals(
-          {dwarf::DW_OP_plus_uconst, 1, dwarf::DW_OP_stack_value});
-    else if (CI.isOneValue())
-      return DI.getExpression()->getElements().empty();
-    return false;
-  }
-
-  bool doesDebugValueDescribeY(const DbgValueInst &DI) {
-    if (DI.getNumVariableLocationOps() != 1u)
-      return false;
-    const auto &CI = *cast<ConstantInt>(DI.getVariableLocationOp(0));
-    if (CI.isZero())
-      return DI.getExpression()->getElements().equals(
-          {dwarf::DW_OP_plus_uconst, 1, dwarf::DW_OP_plus_uconst, 2,
-           dwarf::DW_OP_stack_value});
-    else if (CI.isOneValue())
-      return DI.getExpression()->getElements().equals(
-          {dwarf::DW_OP_plus_uconst, 2, dwarf::DW_OP_stack_value});
-    return false;
-  }
-
-  void verifyDebugValuesAreSalvaged() {
-    // Check that the debug values for %x and %y are preserved.
-    bool FoundX = false;
-    bool FoundY = false;
-    for (const Instruction &I : F->front()) {
-      auto DI = dyn_cast<DbgValueInst>(&I);
-      if (!DI) {
-        // The function should only contain debug values and a terminator.
-        ASSERT_TRUE(I.isTerminator());
-        continue;
-      }
-      EXPECT_EQ(DI->getVariable()->getName(), "x");
-      FoundX |= doesDebugValueDescribeX(*DI);
-      FoundY |= doesDebugValueDescribeY(*DI);
-    }
-    ASSERT_TRUE(FoundX);
-    ASSERT_TRUE(FoundY);
-  }
-};
-
-TEST_F(SalvageDebugInfoTest, RecursiveInstDeletion) {
-  Instruction *Inst = &F->front().front();
-  Inst = Inst->getNextNode(); // Get %y = add ...
-  ASSERT_TRUE(Inst);
-  bool Deleted = RecursivelyDeleteTriviallyDeadInstructions(Inst);
-  ASSERT_TRUE(Deleted);
-  verifyDebugValuesAreSalvaged();
-}
-
-TEST_F(SalvageDebugInfoTest, RecursiveBlockSimplification) {
-  BasicBlock *BB = &F->front();
-  ASSERT_TRUE(BB);
-  bool Deleted = SimplifyInstructionsInBlock(BB);
-  ASSERT_TRUE(Deleted);
-  verifyDebugValuesAreSalvaged();
-}
-
-TEST(Local, ChangeToUnreachable) {
-  LLVMContext Ctx;
-
-  std::unique_ptr<Module> M = parseIR(Ctx,
-                                      R"(
-    define internal void @foo() !dbg !6 {
-    entry:
-      ret void, !dbg !8
-    }
-
-    !llvm.dbg.cu = !{!0}
-    !llvm.debugify = !{!3, !4}
-    !llvm.module.flags = !{!5}
-
-    !0 = distinct !DICompileUnit(language: DW_LANG_C, file: !1, producer: "debugify", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2)
-    !1 = !DIFile(filename: "test.ll", directory: "/")
-    !2 = !{}
-    !3 = !{i32 1}
-    !4 = !{i32 0}
-    !5 = !{i32 2, !"Debug Info Version", i32 3}
-    !6 = distinct !DISubprogram(name: "foo", linkageName: "foo", scope: null, file: !1, line: 1, type: !7, isLocal: true, isDefinition: true, scopeLine: 1, isOptimized: true, unit: !0, retainedNodes: !2)
-    !7 = !DISubroutineType(types: !2)
-    !8 = !DILocation(line: 1, column: 1, scope: !6)
-  )");
-
-  bool BrokenDebugInfo = true;
-  verifyModule(*M, &errs(), &BrokenDebugInfo);
-  ASSERT_FALSE(BrokenDebugInfo);
-
-  Function &F = *cast<Function>(M->getNamedValue("foo"));
-
-  BasicBlock &BB = F.front();
-  Instruction &A = BB.front();
-  DebugLoc DLA = A.getDebugLoc();
-
-  ASSERT_TRUE(isa<ReturnInst>(&A));
-  // One instruction should be affected.
-  EXPECT_EQ(changeToUnreachable(&A), 1U);
-
-  Instruction &B = BB.front();
-
-  // There should be an uncreachable instruction.
-  ASSERT_TRUE(isa<UnreachableInst>(&B));
-
-  DebugLoc DLB = B.getDebugLoc();
-  EXPECT_EQ(DLA, DLB);
-}
-
-TEST(Local, ReplaceAllDbgUsesWith) {
-  using namespace llvm::dwarf;
-
-  LLVMContext Ctx;
-
-  // Note: The datalayout simulates Darwin/x86_64.
-  std::unique_ptr<Module> M = parseIR(Ctx,
-                                      R"(
-    target datalayout = "e-m:o-i63:64-f80:128-n8:16:32:64-S128"
-
-    declare i32 @escape(i32)
-
-    define void @f() !dbg !6 {
-    entry:
-      %a = add i32 0, 1, !dbg !15
-      call void @llvm.dbg.value(metadata i32 %a, metadata !9, metadata !DIExpression()), !dbg !15
-
-      %b = add i64 0, 1, !dbg !16
-      call void @llvm.dbg.value(metadata i64 %b, metadata !11, metadata !DIExpression()), !dbg !16
-      call void @llvm.dbg.value(metadata i64 %b, metadata !11, metadata !DIExpression(DW_OP_lit0, DW_OP_mul)), !dbg !16
-      call void @llvm.dbg.value(metadata i64 %b, metadata !11, metadata !DIExpression(DW_OP_lit0, DW_OP_mul, DW_OP_stack_value)), !dbg !16
-      call void @llvm.dbg.value(metadata i64 %b, metadata !11, metadata !DIExpression(DW_OP_LLVM_fragment, 0, 8)), !dbg !16
-      call void @llvm.dbg.value(metadata i64 %b, metadata !11, metadata !DIExpression(DW_OP_lit0, DW_OP_mul, DW_OP_LLVM_fragment, 0, 8)), !dbg !16
-      call void @llvm.dbg.value(metadata i64 %b, metadata !11, metadata !DIExpression(DW_OP_lit0, DW_OP_mul, DW_OP_stack_value, DW_OP_LLVM_fragment, 0, 8)), !dbg !16
-
-      %c = inttoptr i64 0 to i64*, !dbg !17
-      call void @llvm.dbg.declare(metadata i64* %c, metadata !13, metadata !DIExpression()), !dbg !17
-
-      %d = inttoptr i64 0 to i32*, !dbg !18
-      call void @llvm.dbg.addr(metadata i32* %d, metadata !20, metadata !DIExpression()), !dbg !18
-
-      %e = add <2 x i16> zeroinitializer, zeroinitializer
-      call void @llvm.dbg.value(metadata <2 x i16> %e, metadata !14, metadata !DIExpression()), !dbg !18
-
-      %f = call i32 @escape(i32 0)
-      call void @llvm.dbg.value(metadata i32 %f, metadata !9, metadata !DIExpression()), !dbg !15
-
-      %barrier = call i32 @escape(i32 0)
-
-      %g = call i32 @escape(i32 %f)
-      call void @llvm.dbg.value(metadata i32 %g, metadata !9, metadata !DIExpression()), !dbg !15
-
-      ret void, !dbg !19
-    }
-
-    declare void @llvm.dbg.addr(metadata, metadata, metadata)
-    declare void @llvm.dbg.declare(metadata, metadata, metadata)
-    declare void @llvm.dbg.value(metadata, metadata, metadata)
-
-    !llvm.dbg.cu = !{!0}
-    !llvm.module.flags = !{!5}
-
-    !0 = distinct !DICompileUnit(language: DW_LANG_C, file: !1, producer: "debugify", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2)
-    !1 = !DIFile(filename: "/Users/vsk/Desktop/foo.ll", directory: "/")
-    !2 = !{}
-    !5 = !{i32 2, !"Debug Info Version", i32 3}
-    !6 = distinct !DISubprogram(name: "f", linkageName: "f", scope: null, file: !1, line: 1, type: !7, isLocal: false, isDefinition: true, scopeLine: 1, isOptimized: true, unit: !0, retainedNodes: !8)
-    !7 = !DISubroutineType(types: !2)
-    !8 = !{!9, !11, !13, !14}
-    !9 = !DILocalVariable(name: "1", scope: !6, file: !1, line: 1, type: !10)
-    !10 = !DIBasicType(name: "ty32", size: 32, encoding: DW_ATE_signed)
-    !11 = !DILocalVariable(name: "2", scope: !6, file: !1, line: 2, type: !12)
-    !12 = !DIBasicType(name: "ty64", size: 64, encoding: DW_ATE_signed)
-    !13 = !DILocalVariable(name: "3", scope: !6, file: !1, line: 3, type: !12)
-    !14 = !DILocalVariable(name: "4", scope: !6, file: !1, line: 4, type: !10)
-    !15 = !DILocation(line: 1, column: 1, scope: !6)
-    !16 = !DILocation(line: 2, column: 1, scope: !6)
-    !17 = !DILocation(line: 3, column: 1, scope: !6)
-    !18 = !DILocation(line: 4, column: 1, scope: !6)
-    !19 = !DILocation(line: 5, column: 1, scope: !6)
-    !20 = !DILocalVariable(name: "5", scope: !6, file: !1, line: 5, type: !10)
-  )");
-
-  bool BrokenDebugInfo = true;
-  verifyModule(*M, &errs(), &BrokenDebugInfo);
-  ASSERT_FALSE(BrokenDebugInfo);
-
-  Function &F = *cast<Function>(M->getNamedValue("f"));
-  DominatorTree DT{F};
-
-  BasicBlock &BB = F.front();
-  Instruction &A = BB.front();
-  Instruction &B = *A.getNextNonDebugInstruction();
-  Instruction &C = *B.getNextNonDebugInstruction();
-  Instruction &D = *C.getNextNonDebugInstruction();
-  Instruction &E = *D.getNextNonDebugInstruction();
-  Instruction &F_ = *E.getNextNonDebugInstruction();
-  Instruction &Barrier = *F_.getNextNonDebugInstruction();
-  Instruction &G = *Barrier.getNextNonDebugInstruction();
-
-  // Simulate i32 <-> i64* conversion. Expect no updates: the datalayout says
-  // pointers are 64 bits, so the conversion would be lossy.
-  EXPECT_FALSE(replaceAllDbgUsesWith(A, C, C, DT));
-  EXPECT_FALSE(replaceAllDbgUsesWith(C, A, A, DT));
-
-  // Simulate i32 <-> <2 x i16> conversion. This is unsupported.
-  EXPECT_FALSE(replaceAllDbgUsesWith(E, A, A, DT));
-  EXPECT_FALSE(replaceAllDbgUsesWith(A, E, E, DT));
-
-  // Simulate i32* <-> i64* conversion.
-  EXPECT_TRUE(replaceAllDbgUsesWith(D, C, C, DT));
-
-  SmallVector<DbgVariableIntrinsic *, 2> CDbgVals;
-  findDbgUsers(CDbgVals, &C);
-  EXPECT_EQ(2U, CDbgVals.size());
-  EXPECT_TRUE(any_of(CDbgVals, [](DbgVariableIntrinsic *DII) {
-    return isa<DbgAddrIntrinsic>(DII);
-  }));
-  EXPECT_TRUE(any_of(CDbgVals, [](DbgVariableIntrinsic *DII) {
-    return isa<DbgDeclareInst>(DII);
-  }));
-
-  EXPECT_TRUE(replaceAllDbgUsesWith(C, D, D, DT));
-
-  SmallVector<DbgVariableIntrinsic *, 2> DDbgVals;
-  findDbgUsers(DDbgVals, &D);
-  EXPECT_EQ(2U, DDbgVals.size());
-  EXPECT_TRUE(any_of(DDbgVals, [](DbgVariableIntrinsic *DII) {
-    return isa<DbgAddrIntrinsic>(DII);
-  }));
-  EXPECT_TRUE(any_of(DDbgVals, [](DbgVariableIntrinsic *DII) {
-    return isa<DbgDeclareInst>(DII);
-  }));
-
-  // Introduce a use-before-def. Check that the dbg.value for %a is salvaged.
-  EXPECT_TRUE(replaceAllDbgUsesWith(A, F_, F_, DT));
-
-  auto *ADbgVal = cast<DbgValueInst>(A.getNextNode());
-  EXPECT_EQ(ADbgVal->getNumVariableLocationOps(), 1u);
-  EXPECT_EQ(ConstantInt::get(A.getType(), 0), ADbgVal->getVariableLocationOp(0));
-
-  // Introduce a use-before-def. Check that the dbg.values for %f become undef.
-  EXPECT_TRUE(replaceAllDbgUsesWith(F_, G, G, DT));
-
-  auto *FDbgVal = cast<DbgValueInst>(F_.getNextNode());
-  EXPECT_EQ(FDbgVal->getNumVariableLocationOps(), 1u);
-  EXPECT_TRUE(FDbgVal->isUndef());
-
-  SmallVector<DbgValueInst *, 1> FDbgVals;
-  findDbgValues(FDbgVals, &F_);
-  EXPECT_EQ(0U, FDbgVals.size());
-
-  // Simulate i32 -> i64 conversion to test sign-extension. Here are some
-  // interesting cases to handle:
-  //  1) debug user has empty DIExpression
-  //  2) debug user has non-empty, non-stack-value'd DIExpression
-  //  3) debug user has non-empty, stack-value'd DIExpression
-  //  4-6) like (1-3), but with a fragment
-  EXPECT_TRUE(replaceAllDbgUsesWith(B, A, A, DT));
-
-  SmallVector<DbgValueInst *, 8> ADbgVals;
-  findDbgValues(ADbgVals, &A);
-  EXPECT_EQ(6U, ADbgVals.size());
-
-  // Check that %a has a dbg.value with a DIExpression matching \p Ops.
-  auto hasADbgVal = [&](ArrayRef<uint64_t> Ops) {
-    return any_of(ADbgVals, [&](DbgValueInst *DVI) {
-      assert(DVI->getVariable()->getName() == "2");
-      return DVI->getExpression()->getElements() == Ops;
-    });
-  };
-
-  // Case 1: The original expr is empty, so no deref is needed.
-  EXPECT_TRUE(hasADbgVal({DW_OP_LLVM_convert, 32, DW_ATE_signed,
-                         DW_OP_LLVM_convert, 64, DW_ATE_signed,
-                         DW_OP_stack_value}));
-
-  // Case 2: Perform an address calculation with the original expr, deref it,
-  // then sign-extend the result.
-  EXPECT_TRUE(hasADbgVal({DW_OP_lit0, DW_OP_mul, DW_OP_deref,
-                         DW_OP_LLVM_convert, 32, DW_ATE_signed,
-                         DW_OP_LLVM_convert, 64, DW_ATE_signed,
-                         DW_OP_stack_value}));
-
-  // Case 3: Insert the sign-extension logic before the DW_OP_stack_value.
-  EXPECT_TRUE(hasADbgVal({DW_OP_lit0, DW_OP_mul, DW_OP_LLVM_convert, 32,
-                         DW_ATE_signed, DW_OP_LLVM_convert, 64, DW_ATE_signed,
-                         DW_OP_stack_value}));
-
-  // Cases 4-6: Just like cases 1-3, but preserve the fragment at the end.
-  EXPECT_TRUE(hasADbgVal({DW_OP_LLVM_convert, 32, DW_ATE_signed,
-                         DW_OP_LLVM_convert, 64, DW_ATE_signed,
-                         DW_OP_stack_value, DW_OP_LLVM_fragment, 0, 8}));
-
-  EXPECT_TRUE(hasADbgVal({DW_OP_lit0, DW_OP_mul, DW_OP_deref,
-                         DW_OP_LLVM_convert, 32, DW_ATE_signed,
-                         DW_OP_LLVM_convert, 64, DW_ATE_signed,
-                         DW_OP_stack_value, DW_OP_LLVM_fragment, 0, 8}));
-
-  EXPECT_TRUE(hasADbgVal({DW_OP_lit0, DW_OP_mul, DW_OP_LLVM_convert, 32,
-                         DW_ATE_signed, DW_OP_LLVM_convert, 64, DW_ATE_signed,
-                         DW_OP_stack_value, DW_OP_LLVM_fragment, 0, 8}));
-
-  verifyModule(*M, &errs(), &BrokenDebugInfo);
-  ASSERT_FALSE(BrokenDebugInfo);
-}
-
-TEST(Local, RemoveUnreachableBlocks) {
-  LLVMContext C;
-
-  std::unique_ptr<Module> M = parseIR(C,
-                                      R"(
-      define void @br_simple() {
-      entry:
-        br label %bb0
-      bb0:
-        ret void
-      bb1:
-        ret void
-      }
-
-      define void @br_self_loop() {
-      entry:
-        br label %bb0
-      bb0:
-        br i1 true, label %bb1, label %bb0
-      bb1:
-        br i1 true, label %bb0, label %bb2
-      bb2:
-        br label %bb2
-      }
-
-      define void @br_constant() {
-      entry:
-        br label %bb0
-      bb0:
-        br i1 true, label %bb1, label %bb2
-      bb1:
-        br i1 true, label %bb0, label %bb2
-      bb2:
-        br label %bb2
-      }
-
-      define void @br_loop() {
-      entry:
-        br label %bb0
-      bb0:
-        br label %bb0
-      bb1:
-        br label %bb2
-      bb2:
-        br label %bb1
-      }
-
-      declare i32 @__gxx_personality_v0(...)
-
-      define void @invoke_terminator() personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
-      entry:
-        br i1 undef, label %invoke.block, label %exit
-
-      invoke.block:
-        %cond = invoke zeroext i1 @invokable()
-                to label %continue.block unwind label %lpad.block
-
-      continue.block:
-        br i1 %cond, label %if.then, label %if.end
-
-      if.then:
-        unreachable
-
-      if.end:
-        unreachable
-
-      lpad.block:
-        %lp = landingpad { i8*, i32 }
-                catch i8* null
-        br label %exit
-
-      exit:
-        ret void
-      }
-
-      declare i1 @invokable()
-      )");
-
-  auto runEager = [&](Function &F, DominatorTree *DT) {
-    PostDominatorTree PDT = PostDominatorTree(F);
-    DomTreeUpdater DTU(*DT, PDT, DomTreeUpdater::UpdateStrategy::Eager);
-    removeUnreachableBlocks(F, &DTU);
-    EXPECT_TRUE(DTU.getDomTree().verify());
-    EXPECT_TRUE(DTU.getPostDomTree().verify());
-  };
-
-  auto runLazy = [&](Function &F, DominatorTree *DT) {
-    PostDominatorTree PDT = PostDominatorTree(F);
-    DomTreeUpdater DTU(*DT, PDT, DomTreeUpdater::UpdateStrategy::Lazy);
-    removeUnreachableBlocks(F, &DTU);
-    EXPECT_TRUE(DTU.getDomTree().verify());
-    EXPECT_TRUE(DTU.getPostDomTree().verify());
-  };
-
-  // Test removeUnreachableBlocks under Eager UpdateStrategy.
-  runWithDomTree(*M, "br_simple", runEager);
-  runWithDomTree(*M, "br_self_loop", runEager);
-  runWithDomTree(*M, "br_constant", runEager);
-  runWithDomTree(*M, "br_loop", runEager);
-  runWithDomTree(*M, "invoke_terminator", runEager);
-
-  // Test removeUnreachableBlocks under Lazy UpdateStrategy.
-  runWithDomTree(*M, "br_simple", runLazy);
-  runWithDomTree(*M, "br_self_loop", runLazy);
-  runWithDomTree(*M, "br_constant", runLazy);
-  runWithDomTree(*M, "br_loop", runLazy);
-  runWithDomTree(*M, "invoke_terminator", runLazy);
-
-  M = parseIR(C,
-              R"(
-      define void @f() {
-      entry:
-        ret void
-      bb0:
-        ret void
-      }
-        )");
-
-  auto checkRUBlocksRetVal = [&](Function &F, DominatorTree *DT) {
-    DomTreeUpdater DTU(DT, DomTreeUpdater::UpdateStrategy::Lazy);
-    EXPECT_TRUE(removeUnreachableBlocks(F, &DTU));
-    EXPECT_FALSE(removeUnreachableBlocks(F, &DTU));
-    EXPECT_TRUE(DTU.getDomTree().verify());
-  };
-
-  runWithDomTree(*M, "f", checkRUBlocksRetVal);
-}
-
-TEST(Local, SimplifyCFGWithNullAC) {
-  LLVMContext Ctx;
-
-  std::unique_ptr<Module> M = parseIR(Ctx, R"(
-    declare void @true_path()
-    declare void @false_path()
-    declare void @llvm.assume(i1 %cond);
-
-    define i32 @foo(i1, i32) {
-    entry:
-      %cmp = icmp sgt i32 %1, 0
-      br i1 %cmp, label %if.bb1, label %then.bb1
-    if.bb1:
-      call void @true_path()
-      br label %test.bb
-    then.bb1:
-      call void @false_path()
-      br label %test.bb
-    test.bb:
-      %phi = phi i1 [1, %if.bb1], [%0, %then.bb1]
-      call void @llvm.assume(i1 %0)
-      br i1 %phi, label %if.bb2, label %then.bb2
-    if.bb2:
-      ret i32 %1
-    then.bb2:
-      ret i32 0
-    }
-  )");
-
-  Function &F = *cast<Function>(M->getNamedValue("foo"));
-  TargetTransformInfo TTI(M->getDataLayout());
-
-  SimplifyCFGOptions Options{};
-  Options.setAssumptionCache(nullptr);
-
-  // Obtain BasicBlock of interest to this test, %test.bb.
-  BasicBlock *TestBB = nullptr;
-  for (BasicBlock &BB : F) {
-    if (BB.getName().equals("test.bb")) {
-      TestBB = &BB;
-      break;
-    }
-  }
-  ASSERT_TRUE(TestBB);
-
-  DominatorTree DT(F);
-  DomTreeUpdater DTU(DT, DomTreeUpdater::UpdateStrategy::Eager);
-
-  // %test.bb is expected to be simplified by FoldCondBranchOnPHI.
-  EXPECT_TRUE(simplifyCFG(TestBB, TTI,
-                          RequireAndPreserveDomTree ? &DTU : nullptr, Options));
-}
-
-TEST(Local, CanReplaceOperandWithVariable) {
-  LLVMContext Ctx;
-  Module M("test_module", Ctx);
-  IRBuilder<> B(Ctx);
-
-  FunctionType *FnType =
-    FunctionType::get(Type::getVoidTy(Ctx), {}, false);
-
-  FunctionType *VarArgFnType =
-    FunctionType::get(Type::getVoidTy(Ctx), {B.getInt32Ty()}, true);
-
-  Function *TestBody = Function::Create(FnType, GlobalValue::ExternalLinkage,
-                                        0, "", &M);
-
-  BasicBlock *BB0 = BasicBlock::Create(Ctx, "", TestBody);
-  B.SetInsertPoint(BB0);
-
-  FunctionCallee Intrin = M.getOrInsertFunction("llvm.foo", FnType);
-  FunctionCallee Func = M.getOrInsertFunction("foo", FnType);
-  FunctionCallee VarArgFunc
-    = M.getOrInsertFunction("foo.vararg", VarArgFnType);
-  FunctionCallee VarArgIntrin
-    = M.getOrInsertFunction("llvm.foo.vararg", VarArgFnType);
-
-  auto *CallToIntrin = B.CreateCall(Intrin);
-  auto *CallToFunc = B.CreateCall(Func);
-
-  // Test if it's valid to replace the callee operand.
-  EXPECT_FALSE(canReplaceOperandWithVariable(CallToIntrin, 0));
-  EXPECT_TRUE(canReplaceOperandWithVariable(CallToFunc, 0));
-
-  // That it's invalid to replace an argument in the variadic argument list for
-  // an intrinsic, but OK for a normal function.
-  auto *CallToVarArgFunc = B.CreateCall(
-    VarArgFunc, {B.getInt32(0), B.getInt32(1), B.getInt32(2)});
-  EXPECT_TRUE(canReplaceOperandWithVariable(CallToVarArgFunc, 0));
-  EXPECT_TRUE(canReplaceOperandWithVariable(CallToVarArgFunc, 1));
-  EXPECT_TRUE(canReplaceOperandWithVariable(CallToVarArgFunc, 2));
-  EXPECT_TRUE(canReplaceOperandWithVariable(CallToVarArgFunc, 3));
-
-  auto *CallToVarArgIntrin = B.CreateCall(
-    VarArgIntrin, {B.getInt32(0), B.getInt32(1), B.getInt32(2)});
-  EXPECT_TRUE(canReplaceOperandWithVariable(CallToVarArgIntrin, 0));
-  EXPECT_FALSE(canReplaceOperandWithVariable(CallToVarArgIntrin, 1));
-  EXPECT_FALSE(canReplaceOperandWithVariable(CallToVarArgIntrin, 2));
-  EXPECT_FALSE(canReplaceOperandWithVariable(CallToVarArgIntrin, 3));
-
-  // Test that it's invalid to replace gcroot operands, even though it can't use
-  // immarg.
-  Type *PtrPtr = B.getInt8Ty()->getPointerTo(0);
-  Value *Alloca = B.CreateAlloca(PtrPtr, (unsigned)0);
-  CallInst *GCRoot = B.CreateIntrinsic(Intrinsic::gcroot, {},
-    {Alloca, Constant::getNullValue(PtrPtr)});
-  EXPECT_TRUE(canReplaceOperandWithVariable(GCRoot, 0)); // Alloca
-  EXPECT_FALSE(canReplaceOperandWithVariable(GCRoot, 1));
-  EXPECT_FALSE(canReplaceOperandWithVariable(GCRoot, 2));
-
-  BB0->dropAllReferences();
-}
diff --git a/gnu/llvm/llvm/unittests/Transforms/Utils/LoopRotationUtilsTest.cpp b/gnu/llvm/llvm/unittests/Transforms/Utils/LoopRotationUtilsTest.cpp
deleted file mode 100644
index fd3d6d49474..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/Utils/LoopRotationUtilsTest.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-//===- LoopRotationUtilsTest.cpp - Unit tests for LoopRotation utility ----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Transforms/Utils/LoopRotationUtils.h"
-#include "llvm/Analysis/AssumptionCache.h"
-#include "llvm/Analysis/InstructionSimplify.h"
-#include "llvm/Analysis/LoopInfo.h"
-#include "llvm/Analysis/ScalarEvolution.h"
-#include "llvm/Analysis/TargetLibraryInfo.h"
-#include "llvm/Analysis/TargetTransformInfo.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Dominators.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-static std::unique_ptr<Module> parseIR(LLVMContext &C, const char *IR) {
-  SMDiagnostic Err;
-  std::unique_ptr<Module> Mod = parseAssemblyString(IR, Err, C);
-  if (!Mod)
-    Err.print("LoopRotationUtilsTest", errs());
-  return Mod;
-}
-
-/// This test contains multi-deopt-exits pattern that might allow loop rotation
-/// to trigger multiple times if multiple rotations are enabled.
-/// At least one rotation should be performed, no matter what loop rotation settings are.
-TEST(LoopRotate, MultiDeoptExit) {
-  LLVMContext C;
-
-  std::unique_ptr<Module> M = parseIR(
-    C,
-    R"(
-declare i32 @llvm.experimental.deoptimize.i32(...)
-
-define i32 @test(i32 * nonnull %a, i64 %x) {
-entry:
-  br label %for.cond1
-
-for.cond1:
-  %idx = phi i64 [ 0, %entry ], [ %idx.next, %for.tail ]
-  %sum = phi i32 [ 0, %entry ], [ %sum.next, %for.tail ]
-  %a.idx = getelementptr inbounds i32, i32 *%a, i64 %idx
-  %val.a.idx = load i32, i32* %a.idx, align 4
-  %zero.check = icmp eq i32 %val.a.idx, 0
-  br i1 %zero.check, label %deopt.exit, label %for.cond2
-
-for.cond2:
-  %for.check = icmp ult i64 %idx, %x
-  br i1 %for.check, label %for.body, label %return
-
-for.body:
-  br label %for.tail
-
-for.tail:
-  %sum.next = add i32 %sum, %val.a.idx
-  %idx.next = add nuw nsw i64 %idx, 1
-  br label %for.cond1
-
-return:
-  ret i32 %sum
-
-deopt.exit:
-  %deopt.val = call i32(...) @llvm.experimental.deoptimize.i32() [ "deopt"(i32 %val.a.idx) ]
-  ret i32 %deopt.val
-})"
-    );
-
-  auto *F = M->getFunction("test");
-  DominatorTree DT(*F);
-  LoopInfo LI(DT);
-  AssumptionCache AC(*F);
-  TargetTransformInfo TTI(M->getDataLayout());
-  TargetLibraryInfoImpl TLII;
-  TargetLibraryInfo TLI(TLII);
-  ScalarEvolution SE(*F, TLI, AC, DT, LI);
-  SimplifyQuery SQ(M->getDataLayout());
-
-  Loop *L = *LI.begin();
-
-  bool ret = LoopRotation(L, &LI, &TTI,
-                          &AC, &DT,
-                          &SE, nullptr,
-                          SQ, true, -1, false);
-  EXPECT_TRUE(ret);
-}
-
-/// Checking a special case of multi-deopt exit loop that can not perform
-/// required amount of rotations due to the desired header containing
-/// non-duplicatable code.
-/// Similar to MultiDeoptExit test this one should do at least one rotation and
-/// pass no matter what loop rotation settings are.
-TEST(LoopRotate, MultiDeoptExit_Nondup) {
-  LLVMContext C;
-
-  std::unique_ptr<Module> M = parseIR(
-    C,
-    R"(
-; Rotation should be done once, attempted twice.
-; Second time fails due to non-duplicatable header.
-
-declare i32 @llvm.experimental.deoptimize.i32(...)
-
-declare void @nondup()
-
-define i32 @test_nondup(i32 * nonnull %a, i64 %x) {
-entry:
-  br label %for.cond1
-
-for.cond1:
-  %idx = phi i64 [ 0, %entry ], [ %idx.next, %for.tail ]
-  %sum = phi i32 [ 0, %entry ], [ %sum.next, %for.tail ]
-  %a.idx = getelementptr inbounds i32, i32 *%a, i64 %idx
-  %val.a.idx = load i32, i32* %a.idx, align 4
-  %zero.check = icmp eq i32 %val.a.idx, 0
-  br i1 %zero.check, label %deopt.exit, label %for.cond2
-
-for.cond2:
-  call void @nondup() noduplicate
-  %for.check = icmp ult i64 %idx, %x
-  br i1 %for.check, label %for.body, label %return
-
-for.body:
-  br label %for.tail
-
-for.tail:
-  %sum.next = add i32 %sum, %val.a.idx
-  %idx.next = add nuw nsw i64 %idx, 1
-  br label %for.cond1
-
-return:
-  ret i32 %sum
-
-deopt.exit:
-  %deopt.val = call i32(...) @llvm.experimental.deoptimize.i32() [ "deopt"(i32 %val.a.idx) ]
-  ret i32 %deopt.val
-})"
-    );
-
-  auto *F = M->getFunction("test_nondup");
-  DominatorTree DT(*F);
-  LoopInfo LI(DT);
-  AssumptionCache AC(*F);
-  TargetTransformInfo TTI(M->getDataLayout());
-  TargetLibraryInfoImpl TLII;
-  TargetLibraryInfo TLI(TLII);
-  ScalarEvolution SE(*F, TLI, AC, DT, LI);
-  SimplifyQuery SQ(M->getDataLayout());
-
-  Loop *L = *LI.begin();
-
-  bool ret = LoopRotation(L, &LI, &TTI,
-                          &AC, &DT,
-                          &SE, nullptr,
-                          SQ, true, -1, false);
-  /// LoopRotation should properly report "true" as we still perform the first rotation
-  /// so we do change the IR.
-  EXPECT_TRUE(ret);
-}
diff --git a/gnu/llvm/llvm/unittests/Transforms/Utils/LoopUtilsTest.cpp b/gnu/llvm/llvm/unittests/Transforms/Utils/LoopUtilsTest.cpp
deleted file mode 100644
index aa0d72cf8bb..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/Utils/LoopUtilsTest.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-//===- LoopUtilsTest.cpp - Unit tests for LoopUtils -----------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Transforms/Utils/LoopUtils.h"
-#include "llvm/Analysis/AssumptionCache.h"
-#include "llvm/Analysis/LoopInfo.h"
-#include "llvm/Analysis/ScalarEvolution.h"
-#include "llvm/Analysis/TargetLibraryInfo.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Dominators.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-static std::unique_ptr<Module> parseIR(LLVMContext &C, const char *IR) {
-  SMDiagnostic Err;
-  std::unique_ptr<Module> Mod = parseAssemblyString(IR, Err, C);
-  if (!Mod)
-    Err.print("LoopUtilsTests", errs());
-  return Mod;
-}
-
-static void run(Module &M, StringRef FuncName,
-                function_ref<void(Function &F, DominatorTree &DT,
-                                  ScalarEvolution &SE, LoopInfo &LI)>
-                    Test) {
-  Function *F = M.getFunction(FuncName);
-  DominatorTree DT(*F);
-  TargetLibraryInfoImpl TLII;
-  TargetLibraryInfo TLI(TLII);
-  AssumptionCache AC(*F);
-  LoopInfo LI(DT);
-  ScalarEvolution SE(*F, TLI, AC, DT, LI);
-  Test(*F, DT, SE, LI);
-}
-
-TEST(LoopUtils, DeleteDeadLoopNest) {
-  LLVMContext C;
-  std::unique_ptr<Module> M =
-      parseIR(C, "define void @foo() {\n"
-                 "entry:\n"
-                 "  br label %for.i\n"
-                 "for.i:\n"
-                 "  %i = phi i64 [ 0, %entry ], [ %inc.i, %for.i.latch ]\n"
-                 "  br label %for.j\n"
-                 "for.j:\n"
-                 "  %j = phi i64 [ 0, %for.i ], [ %inc.j, %for.j ]\n"
-                 "  %inc.j = add nsw i64 %j, 1\n"
-                 "  %cmp.j = icmp slt i64 %inc.j, 100\n"
-                 "  br i1 %cmp.j, label %for.j, label %for.k.preheader\n"
-                 "for.k.preheader:\n"
-                 "  br label %for.k\n"
-                 "for.k:\n"
-                 "  %k = phi i64 [ %inc.k, %for.k ], [ 0, %for.k.preheader ]\n"
-                 "  %inc.k = add nsw i64 %k, 1\n"
-                 "  %cmp.k = icmp slt i64 %inc.k, 100\n"
-                 "  br i1 %cmp.k, label %for.k, label %for.i.latch\n"
-                 "for.i.latch:\n"
-                 "  %inc.i = add nsw i64 %i, 1\n"
-                 "  %cmp.i = icmp slt i64 %inc.i, 100\n"
-                 "  br i1 %cmp.i, label %for.i, label %for.end\n"
-                 "for.end:\n"
-                 "  ret void\n"
-                 "}\n");
-
-  run(*M, "foo",
-      [&](Function &F, DominatorTree &DT, ScalarEvolution &SE, LoopInfo &LI) {
-        assert(LI.begin() != LI.end() && "Expecting loops in function F");
-        Loop *L = *LI.begin();
-        assert(L && L->getName() == "for.i" && "Expecting loop for.i");
-
-        deleteDeadLoop(L, &DT, &SE, &LI);
-
-        assert(DT.verify(DominatorTree::VerificationLevel::Fast) &&
-               "Expecting valid dominator tree");
-        LI.verify(DT);
-        assert(LI.begin() == LI.end() &&
-               "Expecting no loops left in function F");
-        SE.verify();
-
-        Function::iterator FI = F.begin();
-        BasicBlock *Entry = &*(FI++);
-        assert(Entry->getName() == "entry" && "Expecting BasicBlock entry");
-        const BranchInst *BI = dyn_cast<BranchInst>(Entry->getTerminator());
-        assert(BI && "Expecting valid branch instruction");
-        EXPECT_EQ(BI->getNumSuccessors(), (unsigned)1);
-        EXPECT_EQ(BI->getSuccessor(0)->getName(), "for.end");
-      });
-}
diff --git a/gnu/llvm/llvm/unittests/Transforms/Utils/ModuleUtilsTest.cpp b/gnu/llvm/llvm/unittests/Transforms/Utils/ModuleUtilsTest.cpp
deleted file mode 100644
index e1bc58fda0e..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/Utils/ModuleUtilsTest.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-//===- ModuleUtilsTest.cpp - Unit tests for Module utility ----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Transforms/Utils/ModuleUtils.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-static std::unique_ptr<Module> parseIR(LLVMContext &C, const char *IR) {
-  SMDiagnostic Err;
-  std::unique_ptr<Module> Mod = parseAssemblyString(IR, Err, C);
-  if (!Mod)
-    Err.print("ModuleUtilsTest", errs());
-  return Mod;
-}
-
-static int getUsedListSize(Module &M, StringRef Name) {
-  auto *UsedList = M.getGlobalVariable(Name);
-  if (!UsedList)
-    return 0;
-  auto *UsedListBaseArrayType = cast<ArrayType>(UsedList->getValueType());
-  return UsedListBaseArrayType->getNumElements();
-}
-
-TEST(ModuleUtils, AppendToUsedList1) {
-  LLVMContext C;
-
-  std::unique_ptr<Module> M = parseIR(
-      C, R"(@x = addrspace(4) global [2 x i32] zeroinitializer, align 4)");
-  SmallVector<GlobalValue *, 2> Globals;
-  for (auto &G : M->globals()) {
-    Globals.push_back(&G);
-  }
-  EXPECT_EQ(0, getUsedListSize(*M, "llvm.compiler.used"));
-  appendToCompilerUsed(*M, Globals);
-  EXPECT_EQ(1, getUsedListSize(*M, "llvm.compiler.used"));
-
-  EXPECT_EQ(0, getUsedListSize(*M, "llvm.used"));
-  appendToUsed(*M, Globals);
-  EXPECT_EQ(1, getUsedListSize(*M, "llvm.used"));
-}
-
-TEST(ModuleUtils, AppendToUsedList2) {
-  LLVMContext C;
-
-  std::unique_ptr<Module> M =
-      parseIR(C, R"(@x = global [2 x i32] zeroinitializer, align 4)");
-  SmallVector<GlobalValue *, 2> Globals;
-  for (auto &G : M->globals()) {
-    Globals.push_back(&G);
-  }
-  EXPECT_EQ(0, getUsedListSize(*M, "llvm.compiler.used"));
-  appendToCompilerUsed(*M, Globals);
-  EXPECT_EQ(1, getUsedListSize(*M, "llvm.compiler.used"));
-
-  EXPECT_EQ(0, getUsedListSize(*M, "llvm.used"));
-  appendToUsed(*M, Globals);
-  EXPECT_EQ(1, getUsedListSize(*M, "llvm.used"));
-}
diff --git a/gnu/llvm/llvm/unittests/Transforms/Utils/SSAUpdaterBulkTest.cpp b/gnu/llvm/llvm/unittests/Transforms/Utils/SSAUpdaterBulkTest.cpp
deleted file mode 100644
index b75a492c58b..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/Utils/SSAUpdaterBulkTest.cpp
+++ /dev/null
@@ -1,194 +0,0 @@
-//===- SSAUpdaterBulk.cpp - Unit tests for SSAUpdaterBulk -----------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Transforms/Utils/SSAUpdaterBulk.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/BasicBlock.h"
-#include "llvm/IR/Dominators.h"
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-TEST(SSAUpdaterBulk, SimpleMerge) {
-  SSAUpdaterBulk Updater;
-  LLVMContext C;
-  Module M("SSAUpdaterTest", C);
-  IRBuilder<> B(C);
-  Type *I32Ty = B.getInt32Ty();
-  auto *F = Function::Create(FunctionType::get(B.getVoidTy(), {I32Ty}, false),
-                             GlobalValue::ExternalLinkage, "F", &M);
-
-  // Generate a simple program:
-  //   if:
-  //     br i1 true, label %true, label %false
-  //   true:
-  //     %1 = add i32 %0, 1
-  //     %2 = sub i32 %0, 2
-  //     br label %merge
-  //   false:
-  //     %3 = add i32 %0, 3
-  //     %4 = sub i32 %0, 4
-  //     br label %merge
-  //   merge:
-  //     %5 = add i32 %1, 5
-  //     %6 = add i32 %3, 6
-  //     %7 = add i32 %2, %4
-  //     %8 = sub i32 %2, %4
-  Argument *FirstArg = &*(F->arg_begin());
-  BasicBlock *IfBB = BasicBlock::Create(C, "if", F);
-  BasicBlock *TrueBB = BasicBlock::Create(C, "true", F);
-  BasicBlock *FalseBB = BasicBlock::Create(C, "false", F);
-  BasicBlock *MergeBB = BasicBlock::Create(C, "merge", F);
-
-  B.SetInsertPoint(IfBB);
-  B.CreateCondBr(B.getTrue(), TrueBB, FalseBB);
-
-  B.SetInsertPoint(TrueBB);
-  Value *AddOp1 = B.CreateAdd(FirstArg, ConstantInt::get(I32Ty, 1));
-  Value *SubOp1 = B.CreateSub(FirstArg, ConstantInt::get(I32Ty, 2));
-  B.CreateBr(MergeBB);
-
-  B.SetInsertPoint(FalseBB);
-  Value *AddOp2 = B.CreateAdd(FirstArg, ConstantInt::get(I32Ty, 3));
-  Value *SubOp2 = B.CreateSub(FirstArg, ConstantInt::get(I32Ty, 4));
-  B.CreateBr(MergeBB);
-
-  B.SetInsertPoint(MergeBB, MergeBB->begin());
-  auto *I1 = cast<Instruction>(B.CreateAdd(AddOp1, ConstantInt::get(I32Ty, 5)));
-  auto *I2 = cast<Instruction>(B.CreateAdd(AddOp2, ConstantInt::get(I32Ty, 6)));
-  auto *I3 = cast<Instruction>(B.CreateAdd(SubOp1, SubOp2));
-  auto *I4 = cast<Instruction>(B.CreateSub(SubOp1, SubOp2));
-
-  // Now rewrite uses in instructions %5, %6, %7. They need to use a phi, which
-  // SSAUpdater should insert into %merge.
-  // Intentionally don't touch %8 to see that SSAUpdater only changes
-  // instructions that were explicitly specified.
-  unsigned VarNum = Updater.AddVariable("a", I32Ty);
-  Updater.AddAvailableValue(VarNum, TrueBB, AddOp1);
-  Updater.AddAvailableValue(VarNum, FalseBB, AddOp2);
-  Updater.AddUse(VarNum, &I1->getOperandUse(0));
-  Updater.AddUse(VarNum, &I2->getOperandUse(0));
-
-  VarNum = Updater.AddVariable("b", I32Ty);
-  Updater.AddAvailableValue(VarNum, TrueBB, SubOp1);
-  Updater.AddAvailableValue(VarNum, FalseBB, SubOp2);
-  Updater.AddUse(VarNum, &I3->getOperandUse(0));
-  Updater.AddUse(VarNum, &I3->getOperandUse(1));
-
-  DominatorTree DT(*F);
-  Updater.RewriteAllUses(&DT);
-
-  // Check how %5 and %6 were rewritten.
-  PHINode *UpdatePhiA = dyn_cast_or_null<PHINode>(I1->getOperand(0));
-  EXPECT_NE(UpdatePhiA, nullptr);
-  EXPECT_EQ(UpdatePhiA->getIncomingValueForBlock(TrueBB), AddOp1);
-  EXPECT_EQ(UpdatePhiA->getIncomingValueForBlock(FalseBB), AddOp2);
-  EXPECT_EQ(UpdatePhiA, dyn_cast_or_null<PHINode>(I1->getOperand(0)));
-
-  // Check how %7 was rewritten.
-  PHINode *UpdatePhiB = dyn_cast_or_null<PHINode>(I3->getOperand(0));
-  EXPECT_EQ(UpdatePhiB->getIncomingValueForBlock(TrueBB), SubOp1);
-  EXPECT_EQ(UpdatePhiB->getIncomingValueForBlock(FalseBB), SubOp2);
-  EXPECT_EQ(UpdatePhiB, dyn_cast_or_null<PHINode>(I3->getOperand(1)));
-
-  // Check that %8 was kept untouched.
-  EXPECT_EQ(I4->getOperand(0), SubOp1);
-  EXPECT_EQ(I4->getOperand(1), SubOp2);
-}
-
-TEST(SSAUpdaterBulk, Irreducible) {
-  SSAUpdaterBulk Updater;
-  LLVMContext C;
-  Module M("SSAUpdaterTest", C);
-  IRBuilder<> B(C);
-  Type *I32Ty = B.getInt32Ty();
-  auto *F = Function::Create(FunctionType::get(B.getVoidTy(), {I32Ty}, false),
-                             GlobalValue::ExternalLinkage, "F", &M);
-
-  // Generate a small program with a multi-entry loop:
-  //     if:
-  //       %1 = add i32 %0, 1
-  //       br i1 true, label %loopmain, label %loopstart
-  //
-  //     loopstart:
-  //       %2 = add i32 %0, 2
-  //       br label %loopmain
-  //
-  //     loopmain:
-  //       %3 = add i32 %1, 3
-  //       br i1 true, label %loopstart, label %afterloop
-  //
-  //     afterloop:
-  //       %4 = add i32 %2, 4
-  //       ret i32 %0
-  Argument *FirstArg = &*F->arg_begin();
-  BasicBlock *IfBB = BasicBlock::Create(C, "if", F);
-  BasicBlock *LoopStartBB = BasicBlock::Create(C, "loopstart", F);
-  BasicBlock *LoopMainBB = BasicBlock::Create(C, "loopmain", F);
-  BasicBlock *AfterLoopBB = BasicBlock::Create(C, "afterloop", F);
-
-  B.SetInsertPoint(IfBB);
-  Value *AddOp1 = B.CreateAdd(FirstArg, ConstantInt::get(I32Ty, 1));
-  B.CreateCondBr(B.getTrue(), LoopMainBB, LoopStartBB);
-
-  B.SetInsertPoint(LoopStartBB);
-  Value *AddOp2 = B.CreateAdd(FirstArg, ConstantInt::get(I32Ty, 2));
-  B.CreateBr(LoopMainBB);
-
-  B.SetInsertPoint(LoopMainBB);
-  auto *I1 = cast<Instruction>(B.CreateAdd(AddOp1, ConstantInt::get(I32Ty, 3)));
-  B.CreateCondBr(B.getTrue(), LoopStartBB, AfterLoopBB);
-
-  B.SetInsertPoint(AfterLoopBB);
-  auto *I2 = cast<Instruction>(B.CreateAdd(AddOp2, ConstantInt::get(I32Ty, 4)));
-  ReturnInst *Return = B.CreateRet(FirstArg);
-
-  // Now rewrite uses in instructions %3, %4, and 'ret i32 %0'. Only %4 needs a
-  // new phi, others should be able to work with existing values.
-  // The phi for %4 should be inserted into LoopMainBB and should look like
-  // this:
-  //   %b = phi i32 [ %2, %loopstart ], [ undef, %if ]
-  // No other rewrites should be made.
-
-  // Add use in %3.
-  unsigned VarNum = Updater.AddVariable("c", I32Ty);
-  Updater.AddAvailableValue(VarNum, IfBB, AddOp1);
-  Updater.AddUse(VarNum, &I1->getOperandUse(0));
-
-  // Add use in %4.
-  VarNum = Updater.AddVariable("b", I32Ty);
-  Updater.AddAvailableValue(VarNum, LoopStartBB, AddOp2);
-  Updater.AddUse(VarNum, &I2->getOperandUse(0));
-
-  // Add use in the return instruction.
-  VarNum = Updater.AddVariable("a", I32Ty);
-  Updater.AddAvailableValue(VarNum, &F->getEntryBlock(), FirstArg);
-  Updater.AddUse(VarNum, &Return->getOperandUse(0));
-
-  // Save all inserted phis into a vector.
-  SmallVector<PHINode *, 8> Inserted;
-  DominatorTree DT(*F);
-  Updater.RewriteAllUses(&DT, &Inserted);
-
-  // Only one phi should have been inserted.
-  EXPECT_EQ(Inserted.size(), 1u);
-
-  // I1 and Return should use the same values as they used before.
-  EXPECT_EQ(I1->getOperand(0), AddOp1);
-  EXPECT_EQ(Return->getOperand(0), FirstArg);
-
-  // I2 should use the new phi.
-  PHINode *UpdatePhi = dyn_cast_or_null<PHINode>(I2->getOperand(0));
-  EXPECT_NE(UpdatePhi, nullptr);
-  EXPECT_EQ(UpdatePhi->getIncomingValueForBlock(LoopStartBB), AddOp2);
-  EXPECT_EQ(UpdatePhi->getIncomingValueForBlock(IfBB), UndefValue::get(I32Ty));
-}
diff --git a/gnu/llvm/llvm/unittests/Transforms/Utils/ScalarEvolutionExpanderTest.cpp b/gnu/llvm/llvm/unittests/Transforms/Utils/ScalarEvolutionExpanderTest.cpp
deleted file mode 100644
index d825a756d50..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/Utils/ScalarEvolutionExpanderTest.cpp
+++ /dev/null
@@ -1,967 +0,0 @@
-//=== ScalarEvolutionExpanderTest.cpp - ScalarEvolutionExpander unit tests ===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Transforms/Utils/ScalarEvolutionExpander.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/Analysis/AssumptionCache.h"
-#include "llvm/Analysis/LoopInfo.h"
-#include "llvm/Analysis/ScalarEvolutionExpressions.h"
-#include "llvm/Analysis/TargetLibraryInfo.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/Dominators.h"
-#include "llvm/IR/GlobalVariable.h"
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/InstIterator.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/PatternMatch.h"
-#include "llvm/IR/Verifier.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-
-using namespace PatternMatch;
-
-// We use this fixture to ensure that we clean up ScalarEvolution before
-// deleting the PassManager.
-class ScalarEvolutionExpanderTest : public testing::Test {
-protected:
-  LLVMContext Context;
-  Module M;
-  TargetLibraryInfoImpl TLII;
-  TargetLibraryInfo TLI;
-
-  std::unique_ptr<AssumptionCache> AC;
-  std::unique_ptr<DominatorTree> DT;
-  std::unique_ptr<LoopInfo> LI;
-
-  ScalarEvolutionExpanderTest() : M("", Context), TLII(), TLI(TLII) {}
-
-  ScalarEvolution buildSE(Function &F) {
-    AC.reset(new AssumptionCache(F));
-    DT.reset(new DominatorTree(F));
-    LI.reset(new LoopInfo(*DT));
-    return ScalarEvolution(F, TLI, *AC, *DT, *LI);
-  }
-
-  void runWithSE(
-      Module &M, StringRef FuncName,
-      function_ref<void(Function &F, LoopInfo &LI, ScalarEvolution &SE)> Test) {
-    auto *F = M.getFunction(FuncName);
-    ASSERT_NE(F, nullptr) << "Could not find " << FuncName;
-    ScalarEvolution SE = buildSE(*F);
-    Test(*F, *LI, SE);
-  }
-};
-
-static Instruction &GetInstByName(Function &F, StringRef Name) {
-  for (auto &I : instructions(F))
-    if (I.getName() == Name)
-      return I;
-  llvm_unreachable("Could not find instructions!");
-}
-
-TEST_F(ScalarEvolutionExpanderTest, ExpandPtrTypeSCEV) {
-  // It is to test the fix for PR30213. It exercises the branch in scev
-  // expansion when the value in ValueOffsetPair is a ptr and the offset
-  // is not divisible by the elem type size of value.
-  auto *I8Ty = Type::getInt8Ty(Context);
-  auto *I8PtrTy = Type::getInt8PtrTy(Context);
-  auto *I32Ty = Type::getInt32Ty(Context);
-  auto *I32PtrTy = Type::getInt32PtrTy(Context);
-  FunctionType *FTy =
-      FunctionType::get(Type::getVoidTy(Context), std::vector<Type *>(), false);
-  Function *F = Function::Create(FTy, Function::ExternalLinkage, "f", M);
-  BasicBlock *EntryBB = BasicBlock::Create(Context, "entry", F);
-  BasicBlock *LoopBB = BasicBlock::Create(Context, "loop", F);
-  BasicBlock *ExitBB = BasicBlock::Create(Context, "exit", F);
-  BranchInst::Create(LoopBB, EntryBB);
-  ReturnInst::Create(Context, nullptr, ExitBB);
-
-  // loop:                            ; preds = %loop, %entry
-  //   %alloca = alloca i32
-  //   %gep0 = getelementptr i32, i32* %alloca, i32 1
-  //   %bitcast1 = bitcast i32* %gep0 to i8*
-  //   %gep1 = getelementptr i8, i8* %bitcast1, i32 1
-  //   %gep2 = getelementptr i8, i8* undef, i32 1
-  //   %cmp = icmp ult i8* undef, %bitcast1
-  //   %select = select i1 %cmp, i8* %gep1, i8* %gep2
-  //   %bitcast2 = bitcast i8* %select to i32*
-  //   br i1 undef, label %loop, label %exit
-
-  const DataLayout &DL = F->getParent()->getDataLayout();
-  BranchInst *Br = BranchInst::Create(
-      LoopBB, ExitBB, UndefValue::get(Type::getInt1Ty(Context)), LoopBB);
-  AllocaInst *Alloca =
-      new AllocaInst(I32Ty, DL.getAllocaAddrSpace(), "alloca", Br);
-  ConstantInt *Ci32 = ConstantInt::get(Context, APInt(32, 1));
-  GetElementPtrInst *Gep0 =
-      GetElementPtrInst::Create(I32Ty, Alloca, Ci32, "gep0", Br);
-  CastInst *CastA =
-      CastInst::CreateBitOrPointerCast(Gep0, I8PtrTy, "bitcast1", Br);
-  GetElementPtrInst *Gep1 =
-      GetElementPtrInst::Create(I8Ty, CastA, Ci32, "gep1", Br);
-  GetElementPtrInst *Gep2 = GetElementPtrInst::Create(
-      I8Ty, UndefValue::get(I8PtrTy), Ci32, "gep2", Br);
-  CmpInst *Cmp = CmpInst::Create(Instruction::ICmp, CmpInst::ICMP_ULT,
-                                 UndefValue::get(I8PtrTy), CastA, "cmp", Br);
-  SelectInst *Sel = SelectInst::Create(Cmp, Gep1, Gep2, "select", Br);
-  CastInst *CastB =
-      CastInst::CreateBitOrPointerCast(Sel, I32PtrTy, "bitcast2", Br);
-
-  ScalarEvolution SE = buildSE(*F);
-  auto *S = SE.getSCEV(CastB);
-  EXPECT_TRUE(isa<SCEVUnknown>(S));
-}
-
-// Make sure that SCEV doesn't introduce illegal ptrtoint/inttoptr instructions
-TEST_F(ScalarEvolutionExpanderTest, SCEVZeroExtendExprNonIntegral) {
-  /*
-   * Create the following code:
-   * func(i64 addrspace(10)* %arg)
-   * top:
-   *  br label %L.ph
-   * L.ph:
-   *  br label %L
-   * L:
-   *  %phi = phi i64 [i64 0, %L.ph], [ %add, %L2 ]
-   *  %add = add i64 %phi2, 1
-   *  br i1 undef, label %post, label %L2
-   * post:
-   *  %gepbase = getelementptr i64 addrspace(10)* %arg, i64 1
-   *  #= %gep = getelementptr i64 addrspace(10)* %gepbase, i64 %add =#
-   *  ret void
-   *
-   * We will create the appropriate SCEV expression for %gep and expand it,
-   * then check that no inttoptr/ptrtoint instructions got inserted.
-   */
-
-  // Create a module with non-integral pointers in it's datalayout
-  Module NIM("nonintegral", Context);
-  std::string DataLayout = M.getDataLayoutStr();
-  if (!DataLayout.empty())
-    DataLayout += "-";
-  DataLayout += "ni:10";
-  NIM.setDataLayout(DataLayout);
-
-  Type *T_int1 = Type::getInt1Ty(Context);
-  Type *T_int64 = Type::getInt64Ty(Context);
-  Type *T_pint64 = T_int64->getPointerTo(10);
-
-  FunctionType *FTy =
-      FunctionType::get(Type::getVoidTy(Context), {T_pint64}, false);
-  Function *F = Function::Create(FTy, Function::ExternalLinkage, "foo", NIM);
-
-  Argument *Arg = &*F->arg_begin();
-
-  BasicBlock *Top = BasicBlock::Create(Context, "top", F);
-  BasicBlock *LPh = BasicBlock::Create(Context, "L.ph", F);
-  BasicBlock *L = BasicBlock::Create(Context, "L", F);
-  BasicBlock *Post = BasicBlock::Create(Context, "post", F);
-
-  IRBuilder<> Builder(Top);
-  Builder.CreateBr(LPh);
-
-  Builder.SetInsertPoint(LPh);
-  Builder.CreateBr(L);
-
-  Builder.SetInsertPoint(L);
-  PHINode *Phi = Builder.CreatePHI(T_int64, 2);
-  Value *Add = Builder.CreateAdd(Phi, ConstantInt::get(T_int64, 1), "add");
-  Builder.CreateCondBr(UndefValue::get(T_int1), L, Post);
-  Phi->addIncoming(ConstantInt::get(T_int64, 0), LPh);
-  Phi->addIncoming(Add, L);
-
-  Builder.SetInsertPoint(Post);
-  Value *GepBase =
-      Builder.CreateGEP(T_int64, Arg, ConstantInt::get(T_int64, 1));
-  Instruction *Ret = Builder.CreateRetVoid();
-
-  ScalarEvolution SE = buildSE(*F);
-  auto *AddRec =
-      SE.getAddRecExpr(SE.getUnknown(GepBase), SE.getConstant(T_int64, 1),
-                       LI->getLoopFor(L), SCEV::FlagNUW);
-
-  SCEVExpander Exp(SE, NIM.getDataLayout(), "expander");
-  Exp.disableCanonicalMode();
-  Exp.expandCodeFor(AddRec, T_pint64, Ret);
-
-  // Make sure none of the instructions inserted were inttoptr/ptrtoint.
-  // The verifier will check this.
-  EXPECT_FALSE(verifyFunction(*F, &errs()));
-}
-
-// Check that we can correctly identify the points at which the SCEV of the
-// AddRec can be expanded.
-TEST_F(ScalarEvolutionExpanderTest, SCEVExpanderIsSafeToExpandAt) {
-  /*
-   * Create the following code:
-   * func(i64 addrspace(10)* %arg)
-   * top:
-   *  br label %L.ph
-   * L.ph:
-   *  br label %L
-   * L:
-   *  %phi = phi i64 [i64 0, %L.ph], [ %add, %L2 ]
-   *  %add = add i64 %phi2, 1
-   *  %cond = icmp slt i64 %add, 1000; then becomes 2000.
-   *  br i1 %cond, label %post, label %L2
-   * post:
-   *  ret void
-   *
-   */
-
-  // Create a module with non-integral pointers in it's datalayout
-  Module NIM("nonintegral", Context);
-  std::string DataLayout = M.getDataLayoutStr();
-  if (!DataLayout.empty())
-    DataLayout += "-";
-  DataLayout += "ni:10";
-  NIM.setDataLayout(DataLayout);
-
-  Type *T_int64 = Type::getInt64Ty(Context);
-  Type *T_pint64 = T_int64->getPointerTo(10);
-
-  FunctionType *FTy =
-      FunctionType::get(Type::getVoidTy(Context), {T_pint64}, false);
-  Function *F = Function::Create(FTy, Function::ExternalLinkage, "foo", NIM);
-
-  BasicBlock *Top = BasicBlock::Create(Context, "top", F);
-  BasicBlock *LPh = BasicBlock::Create(Context, "L.ph", F);
-  BasicBlock *L = BasicBlock::Create(Context, "L", F);
-  BasicBlock *Post = BasicBlock::Create(Context, "post", F);
-
-  IRBuilder<> Builder(Top);
-  Builder.CreateBr(LPh);
-
-  Builder.SetInsertPoint(LPh);
-  Builder.CreateBr(L);
-
-  Builder.SetInsertPoint(L);
-  PHINode *Phi = Builder.CreatePHI(T_int64, 2);
-  auto *Add = cast<Instruction>(
-      Builder.CreateAdd(Phi, ConstantInt::get(T_int64, 1), "add"));
-  auto *Limit = ConstantInt::get(T_int64, 1000);
-  auto *Cond = cast<Instruction>(
-      Builder.CreateICmp(ICmpInst::ICMP_SLT, Add, Limit, "cond"));
-  Builder.CreateCondBr(Cond, L, Post);
-  Phi->addIncoming(ConstantInt::get(T_int64, 0), LPh);
-  Phi->addIncoming(Add, L);
-
-  Builder.SetInsertPoint(Post);
-  Instruction *Ret = Builder.CreateRetVoid();
-
-  ScalarEvolution SE = buildSE(*F);
-  const SCEV *S = SE.getSCEV(Phi);
-  EXPECT_TRUE(isa<SCEVAddRecExpr>(S));
-  const SCEVAddRecExpr *AR = cast<SCEVAddRecExpr>(S);
-  EXPECT_TRUE(AR->isAffine());
-  EXPECT_FALSE(isSafeToExpandAt(AR, Top->getTerminator(), SE));
-  EXPECT_FALSE(isSafeToExpandAt(AR, LPh->getTerminator(), SE));
-  EXPECT_TRUE(isSafeToExpandAt(AR, L->getTerminator(), SE));
-  EXPECT_TRUE(isSafeToExpandAt(AR, Post->getTerminator(), SE));
-
-  EXPECT_TRUE(LI->getLoopFor(L)->isLCSSAForm(*DT));
-  SCEVExpander Exp(SE, M.getDataLayout(), "expander");
-  Exp.expandCodeFor(SE.getSCEV(Add), nullptr, Ret);
-  EXPECT_TRUE(LI->getLoopFor(L)->isLCSSAForm(*DT));
-}
-
-// Check that SCEV expander does not use the nuw instruction
-// for expansion.
-TEST_F(ScalarEvolutionExpanderTest, SCEVExpanderNUW) {
-  /*
-   * Create the following code:
-   * func(i64 %a)
-   * entry:
-   *   br false, label %exit, label %body
-   * body:
-   *  %s1 = add i64 %a, -1
-   *  br label %exit
-   * exit:
-   *  %s = add nuw i64 %a, -1
-   *  ret %s
-   */
-
-  // Create a module.
-  Module M("SCEVExpanderNUW", Context);
-
-  Type *T_int64 = Type::getInt64Ty(Context);
-
-  FunctionType *FTy =
-      FunctionType::get(Type::getVoidTy(Context), {T_int64}, false);
-  Function *F = Function::Create(FTy, Function::ExternalLinkage, "func", M);
-  Argument *Arg = &*F->arg_begin();
-  ConstantInt *C = ConstantInt::get(Context, APInt(64, -1));
-
-  BasicBlock *Entry = BasicBlock::Create(Context, "entry", F);
-  BasicBlock *Body = BasicBlock::Create(Context, "body", F);
-  BasicBlock *Exit = BasicBlock::Create(Context, "exit", F);
-
-  IRBuilder<> Builder(Entry);
-  ConstantInt *Cond = ConstantInt::get(Context, APInt(1, 0));
-  Builder.CreateCondBr(Cond, Exit, Body);
-
-  Builder.SetInsertPoint(Body);
-  auto *S1 = cast<Instruction>(Builder.CreateAdd(Arg, C, "add"));
-  Builder.CreateBr(Exit);
-
-  Builder.SetInsertPoint(Exit);
-  auto *S2 = cast<Instruction>(Builder.CreateAdd(Arg, C, "add"));
-  S2->setHasNoUnsignedWrap(true);
-  auto *R = cast<Instruction>(Builder.CreateRetVoid());
-
-  ScalarEvolution SE = buildSE(*F);
-  const SCEV *S = SE.getSCEV(S1);
-  EXPECT_TRUE(isa<SCEVAddExpr>(S));
-  SCEVExpander Exp(SE, M.getDataLayout(), "expander");
-  auto *I = cast<Instruction>(Exp.expandCodeFor(S, nullptr, R));
-  EXPECT_FALSE(I->hasNoUnsignedWrap());
-}
-
-// Check that SCEV expander does not use the nsw instruction
-// for expansion.
-TEST_F(ScalarEvolutionExpanderTest, SCEVExpanderNSW) {
-  /*
-   * Create the following code:
-   * func(i64 %a)
-   * entry:
-   *   br false, label %exit, label %body
-   * body:
-   *  %s1 = add i64 %a, -1
-   *  br label %exit
-   * exit:
-   *  %s = add nsw i64 %a, -1
-   *  ret %s
-   */
-
-  // Create a module.
-  Module M("SCEVExpanderNSW", Context);
-
-  Type *T_int64 = Type::getInt64Ty(Context);
-
-  FunctionType *FTy =
-      FunctionType::get(Type::getVoidTy(Context), {T_int64}, false);
-  Function *F = Function::Create(FTy, Function::ExternalLinkage, "func", M);
-  Argument *Arg = &*F->arg_begin();
-  ConstantInt *C = ConstantInt::get(Context, APInt(64, -1));
-
-  BasicBlock *Entry = BasicBlock::Create(Context, "entry", F);
-  BasicBlock *Body = BasicBlock::Create(Context, "body", F);
-  BasicBlock *Exit = BasicBlock::Create(Context, "exit", F);
-
-  IRBuilder<> Builder(Entry);
-  ConstantInt *Cond = ConstantInt::get(Context, APInt(1, 0));
-  Builder.CreateCondBr(Cond, Exit, Body);
-
-  Builder.SetInsertPoint(Body);
-  auto *S1 = cast<Instruction>(Builder.CreateAdd(Arg, C, "add"));
-  Builder.CreateBr(Exit);
-
-  Builder.SetInsertPoint(Exit);
-  auto *S2 = cast<Instruction>(Builder.CreateAdd(Arg, C, "add"));
-  S2->setHasNoSignedWrap(true);
-  auto *R = cast<Instruction>(Builder.CreateRetVoid());
-
-  ScalarEvolution SE = buildSE(*F);
-  const SCEV *S = SE.getSCEV(S1);
-  EXPECT_TRUE(isa<SCEVAddExpr>(S));
-  SCEVExpander Exp(SE, M.getDataLayout(), "expander");
-  auto *I = cast<Instruction>(Exp.expandCodeFor(S, nullptr, R));
-  EXPECT_FALSE(I->hasNoSignedWrap());
-}
-
-// Check that SCEV does not save the SCEV -> V
-// mapping of SCEV differ from V in NUW flag.
-TEST_F(ScalarEvolutionExpanderTest, SCEVCacheNUW) {
-  /*
-   * Create the following code:
-   * func(i64 %a)
-   * entry:
-   *  %s1 = add i64 %a, -1
-   *  %s2 = add nuw i64 %a, -1
-   *  br label %exit
-   * exit:
-   *  ret %s
-   */
-
-  // Create a module.
-  Module M("SCEVCacheNUW", Context);
-
-  Type *T_int64 = Type::getInt64Ty(Context);
-
-  FunctionType *FTy =
-      FunctionType::get(Type::getVoidTy(Context), {T_int64}, false);
-  Function *F = Function::Create(FTy, Function::ExternalLinkage, "func", M);
-  Argument *Arg = &*F->arg_begin();
-  ConstantInt *C = ConstantInt::get(Context, APInt(64, -1));
-
-  BasicBlock *Entry = BasicBlock::Create(Context, "entry", F);
-  BasicBlock *Exit = BasicBlock::Create(Context, "exit", F);
-
-  IRBuilder<> Builder(Entry);
-  auto *S1 = cast<Instruction>(Builder.CreateAdd(Arg, C, "add"));
-  auto *S2 = cast<Instruction>(Builder.CreateAdd(Arg, C, "add"));
-  S2->setHasNoUnsignedWrap(true);
-  Builder.CreateBr(Exit);
-
-  Builder.SetInsertPoint(Exit);
-  auto *R = cast<Instruction>(Builder.CreateRetVoid());
-
-  ScalarEvolution SE = buildSE(*F);
-  // Get S2 first to move it to cache.
-  const SCEV *SC2 = SE.getSCEV(S2);
-  EXPECT_TRUE(isa<SCEVAddExpr>(SC2));
-  // Now get S1.
-  const SCEV *SC1 = SE.getSCEV(S1);
-  EXPECT_TRUE(isa<SCEVAddExpr>(SC1));
-  // Expand for S1, it should use S1 not S2 in spite S2
-  // first in the cache.
-  SCEVExpander Exp(SE, M.getDataLayout(), "expander");
-  auto *I = cast<Instruction>(Exp.expandCodeFor(SC1, nullptr, R));
-  EXPECT_FALSE(I->hasNoUnsignedWrap());
-}
-
-// Check that SCEV does not save the SCEV -> V
-// mapping of SCEV differ from V in NSW flag.
-TEST_F(ScalarEvolutionExpanderTest, SCEVCacheNSW) {
-  /*
-   * Create the following code:
-   * func(i64 %a)
-   * entry:
-   *  %s1 = add i64 %a, -1
-   *  %s2 = add nsw i64 %a, -1
-   *  br label %exit
-   * exit:
-   *  ret %s
-   */
-
-  // Create a module.
-  Module M("SCEVCacheNUW", Context);
-
-  Type *T_int64 = Type::getInt64Ty(Context);
-
-  FunctionType *FTy =
-      FunctionType::get(Type::getVoidTy(Context), {T_int64}, false);
-  Function *F = Function::Create(FTy, Function::ExternalLinkage, "func", M);
-  Argument *Arg = &*F->arg_begin();
-  ConstantInt *C = ConstantInt::get(Context, APInt(64, -1));
-
-  BasicBlock *Entry = BasicBlock::Create(Context, "entry", F);
-  BasicBlock *Exit = BasicBlock::Create(Context, "exit", F);
-
-  IRBuilder<> Builder(Entry);
-  auto *S1 = cast<Instruction>(Builder.CreateAdd(Arg, C, "add"));
-  auto *S2 = cast<Instruction>(Builder.CreateAdd(Arg, C, "add"));
-  S2->setHasNoSignedWrap(true);
-  Builder.CreateBr(Exit);
-
-  Builder.SetInsertPoint(Exit);
-  auto *R = cast<Instruction>(Builder.CreateRetVoid());
-
-  ScalarEvolution SE = buildSE(*F);
-  // Get S2 first to move it to cache.
-  const SCEV *SC2 = SE.getSCEV(S2);
-  EXPECT_TRUE(isa<SCEVAddExpr>(SC2));
-  // Now get S1.
-  const SCEV *SC1 = SE.getSCEV(S1);
-  EXPECT_TRUE(isa<SCEVAddExpr>(SC1));
-  // Expand for S1, it should use S1 not S2 in spite S2
-  // first in the cache.
-  SCEVExpander Exp(SE, M.getDataLayout(), "expander");
-  auto *I = cast<Instruction>(Exp.expandCodeFor(SC1, nullptr, R));
-  EXPECT_FALSE(I->hasNoSignedWrap());
-}
-
-TEST_F(ScalarEvolutionExpanderTest, SCEVExpandInsertCanonicalIV) {
-  LLVMContext C;
-  SMDiagnostic Err;
-
-  // Expand the addrec produced by GetAddRec into a loop without a canonical IV.
-  // SCEVExpander will insert one.
-  auto TestNoCanonicalIV =
-      [&](std::function<const SCEV *(ScalarEvolution & SE, Loop * L)>
-              GetAddRec) {
-        std::unique_ptr<Module> M = parseAssemblyString(
-            "define i32 @test(i32 %limit) { "
-            "entry: "
-            "  br label %loop "
-            "loop: "
-            "  %i = phi i32 [ 1, %entry ], [ %i.inc, %loop ] "
-            "  %i.inc = add nsw i32 %i, 1 "
-            "  %cont = icmp slt i32 %i.inc, %limit "
-            "  br i1 %cont, label %loop, label %exit "
-            "exit: "
-            "  ret i32 %i.inc "
-            "}",
-            Err, C);
-
-        assert(M && "Could not parse module?");
-        assert(!verifyModule(*M) && "Must have been well formed!");
-
-        runWithSE(
-            *M, "test", [&](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-              auto &I = GetInstByName(F, "i");
-              auto *Loop = LI.getLoopFor(I.getParent());
-              EXPECT_FALSE(Loop->getCanonicalInductionVariable());
-
-              auto *AR = GetAddRec(SE, Loop);
-              unsigned ExpectedCanonicalIVWidth =
-                  SE.getTypeSizeInBits(AR->getType());
-
-              SCEVExpander Exp(SE, M->getDataLayout(), "expander");
-              auto *InsertAt = I.getNextNode();
-              Exp.expandCodeFor(AR, nullptr, InsertAt);
-              PHINode *CanonicalIV = Loop->getCanonicalInductionVariable();
-              unsigned CanonicalIVBitWidth =
-                  cast<IntegerType>(CanonicalIV->getType())->getBitWidth();
-              EXPECT_EQ(CanonicalIVBitWidth, ExpectedCanonicalIVWidth);
-            });
-      };
-
-  // Expand the addrec produced by GetAddRec into a loop with a canonical IV
-  // which is narrower than addrec type.
-  // SCEVExpander will insert a canonical IV of a wider type to expand the
-  // addrec.
-  auto TestNarrowCanonicalIV = [&](std::function<const SCEV *(
-                                       ScalarEvolution & SE, Loop * L)>
-                                       GetAddRec) {
-    std::unique_ptr<Module> M = parseAssemblyString(
-        "define i32 @test(i32 %limit) { "
-        "entry: "
-        "  br label %loop "
-        "loop: "
-        "  %i = phi i32 [ 1, %entry ], [ %i.inc, %loop ] "
-        "  %canonical.iv = phi i8 [ 0, %entry ], [ %canonical.iv.inc, %loop ] "
-        "  %i.inc = add nsw i32 %i, 1 "
-        "  %canonical.iv.inc = add i8 %canonical.iv, 1 "
-        "  %cont = icmp slt i32 %i.inc, %limit "
-        "  br i1 %cont, label %loop, label %exit "
-        "exit: "
-        "  ret i32 %i.inc "
-        "}",
-        Err, C);
-
-    assert(M && "Could not parse module?");
-    assert(!verifyModule(*M) && "Must have been well formed!");
-
-    runWithSE(*M, "test", [&](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-      auto &I = GetInstByName(F, "i");
-
-      auto *LoopHeaderBB = I.getParent();
-      auto *Loop = LI.getLoopFor(LoopHeaderBB);
-      PHINode *CanonicalIV = Loop->getCanonicalInductionVariable();
-      EXPECT_EQ(CanonicalIV, &GetInstByName(F, "canonical.iv"));
-
-      auto *AR = GetAddRec(SE, Loop);
-
-      unsigned ExpectedCanonicalIVWidth = SE.getTypeSizeInBits(AR->getType());
-      unsigned CanonicalIVBitWidth =
-          cast<IntegerType>(CanonicalIV->getType())->getBitWidth();
-      EXPECT_LT(CanonicalIVBitWidth, ExpectedCanonicalIVWidth);
-
-      SCEVExpander Exp(SE, M->getDataLayout(), "expander");
-      auto *InsertAt = I.getNextNode();
-      Exp.expandCodeFor(AR, nullptr, InsertAt);
-
-      // Loop over all of the PHI nodes, looking for the new canonical indvar.
-      PHINode *NewCanonicalIV = nullptr;
-      for (BasicBlock::iterator i = LoopHeaderBB->begin(); isa<PHINode>(i);
-           ++i) {
-        PHINode *PN = cast<PHINode>(i);
-        if (PN == &I || PN == CanonicalIV)
-          continue;
-        // We expect that the only PHI added is the new canonical IV
-        EXPECT_FALSE(NewCanonicalIV);
-        NewCanonicalIV = PN;
-      }
-
-      // Check that NewCanonicalIV is a canonical IV, i.e {0,+,1}
-      BasicBlock *Incoming = nullptr, *Backedge = nullptr;
-      EXPECT_TRUE(Loop->getIncomingAndBackEdge(Incoming, Backedge));
-      auto *Start = NewCanonicalIV->getIncomingValueForBlock(Incoming);
-      EXPECT_TRUE(isa<ConstantInt>(Start));
-      EXPECT_TRUE(dyn_cast<ConstantInt>(Start)->isZero());
-      auto *Next = NewCanonicalIV->getIncomingValueForBlock(Backedge);
-      EXPECT_TRUE(isa<BinaryOperator>(Next));
-      auto *NextBinOp = dyn_cast<BinaryOperator>(Next);
-      EXPECT_EQ(NextBinOp->getOpcode(), Instruction::Add);
-      EXPECT_EQ(NextBinOp->getOperand(0), NewCanonicalIV);
-      auto *Step = NextBinOp->getOperand(1);
-      EXPECT_TRUE(isa<ConstantInt>(Step));
-      EXPECT_TRUE(dyn_cast<ConstantInt>(Step)->isOne());
-
-      unsigned NewCanonicalIVBitWidth =
-          cast<IntegerType>(NewCanonicalIV->getType())->getBitWidth();
-      EXPECT_EQ(NewCanonicalIVBitWidth, ExpectedCanonicalIVWidth);
-    });
-  };
-
-  // Expand the addrec produced by GetAddRec into a loop with a canonical IV
-  // of addrec width.
-  // To expand the addrec SCEVExpander should use the existing canonical IV.
-  auto TestMatchingCanonicalIV =
-      [&](std::function<const SCEV *(ScalarEvolution & SE, Loop * L)> GetAddRec,
-          unsigned ARBitWidth) {
-        auto ARBitWidthTypeStr = "i" + std::to_string(ARBitWidth);
-        std::unique_ptr<Module> M = parseAssemblyString(
-            "define i32 @test(i32 %limit) { "
-            "entry: "
-            "  br label %loop "
-            "loop: "
-            "  %i = phi i32 [ 1, %entry ], [ %i.inc, %loop ] "
-            "  %canonical.iv = phi " +
-                ARBitWidthTypeStr +
-                " [ 0, %entry ], [ %canonical.iv.inc, %loop ] "
-                "  %i.inc = add nsw i32 %i, 1 "
-                "  %canonical.iv.inc = add " +
-                ARBitWidthTypeStr +
-                " %canonical.iv, 1 "
-                "  %cont = icmp slt i32 %i.inc, %limit "
-                "  br i1 %cont, label %loop, label %exit "
-                "exit: "
-                "  ret i32 %i.inc "
-                "}",
-            Err, C);
-
-        assert(M && "Could not parse module?");
-        assert(!verifyModule(*M) && "Must have been well formed!");
-
-        runWithSE(
-            *M, "test", [&](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-              auto &I = GetInstByName(F, "i");
-              auto &CanonicalIV = GetInstByName(F, "canonical.iv");
-
-              auto *LoopHeaderBB = I.getParent();
-              auto *Loop = LI.getLoopFor(LoopHeaderBB);
-              EXPECT_EQ(&CanonicalIV, Loop->getCanonicalInductionVariable());
-              unsigned CanonicalIVBitWidth =
-                  cast<IntegerType>(CanonicalIV.getType())->getBitWidth();
-
-              auto *AR = GetAddRec(SE, Loop);
-              EXPECT_EQ(ARBitWidth, SE.getTypeSizeInBits(AR->getType()));
-              EXPECT_EQ(CanonicalIVBitWidth, ARBitWidth);
-
-              SCEVExpander Exp(SE, M->getDataLayout(), "expander");
-              auto *InsertAt = I.getNextNode();
-              Exp.expandCodeFor(AR, nullptr, InsertAt);
-
-              // Loop over all of the PHI nodes, looking if a new canonical
-              // indvar was introduced.
-              PHINode *NewCanonicalIV = nullptr;
-              for (BasicBlock::iterator i = LoopHeaderBB->begin();
-                   isa<PHINode>(i); ++i) {
-                PHINode *PN = cast<PHINode>(i);
-                if (PN == &I || PN == &CanonicalIV)
-                  continue;
-                NewCanonicalIV = PN;
-              }
-              EXPECT_FALSE(NewCanonicalIV);
-            });
-      };
-
-  unsigned ARBitWidth = 16;
-  Type *ARType = IntegerType::get(C, ARBitWidth);
-
-  // Expand {5,+,1}
-  auto GetAR2 = [&](ScalarEvolution &SE, Loop *L) -> const SCEV * {
-    return SE.getAddRecExpr(SE.getConstant(APInt(ARBitWidth, 5)),
-                            SE.getOne(ARType), L, SCEV::FlagAnyWrap);
-  };
-  TestNoCanonicalIV(GetAR2);
-  TestNarrowCanonicalIV(GetAR2);
-  TestMatchingCanonicalIV(GetAR2, ARBitWidth);
-}
-
-TEST_F(ScalarEvolutionExpanderTest, SCEVExpanderShlNSW) {
-
-  auto checkOneCase = [this](std::string &&str) {
-    LLVMContext C;
-    SMDiagnostic Err;
-    std::unique_ptr<Module> M = parseAssemblyString(str, Err, C);
-
-    assert(M && "Could not parse module?");
-    assert(!verifyModule(*M) && "Must have been well formed!");
-
-    Function *F = M->getFunction("f");
-    ASSERT_NE(F, nullptr) << "Could not find function 'f'";
-
-    BasicBlock &Entry = F->getEntryBlock();
-    LoadInst *Load = cast<LoadInst>(&Entry.front());
-    BinaryOperator *And = cast<BinaryOperator>(*Load->user_begin());
-
-    ScalarEvolution SE = buildSE(*F);
-    const SCEV *AndSCEV = SE.getSCEV(And);
-    EXPECT_TRUE(isa<SCEVMulExpr>(AndSCEV));
-    EXPECT_TRUE(cast<SCEVMulExpr>(AndSCEV)->hasNoSignedWrap());
-
-    SCEVExpander Exp(SE, M->getDataLayout(), "expander");
-    auto *I = cast<Instruction>(Exp.expandCodeFor(AndSCEV, nullptr, And));
-    EXPECT_EQ(I->getOpcode(), Instruction::Shl);
-    EXPECT_FALSE(I->hasNoSignedWrap());
-  };
-
-  checkOneCase("define void @f(i16* %arrayidx) { "
-               "  %1 = load i16, i16* %arrayidx "
-               "  %2 = and i16 %1, -32768 "
-               "  ret void "
-               "} ");
-
-  checkOneCase("define void @f(i8* %arrayidx) { "
-               "  %1 = load i8, i8* %arrayidx "
-               "  %2 = and i8 %1, -128 "
-               "  ret void "
-               "} ");
-}
-
-// Test expansion of nested addrecs in CanonicalMode.
-// Expanding nested addrecs in canonical mode requiers a canonical IV of a
-// type wider than the type of the addrec itself. Currently, SCEVExpander
-// just falls back to literal mode for nested addrecs.
-TEST_F(ScalarEvolutionExpanderTest, SCEVExpandNonAffineAddRec) {
-  LLVMContext C;
-  SMDiagnostic Err;
-
-  // Expand the addrec produced by GetAddRec into a loop without a canonical IV.
-  auto TestNoCanonicalIV =
-      [&](std::function<const SCEVAddRecExpr *(ScalarEvolution & SE, Loop * L)>
-              GetAddRec) {
-        std::unique_ptr<Module> M = parseAssemblyString(
-            "define i32 @test(i32 %limit) { "
-            "entry: "
-            "  br label %loop "
-            "loop: "
-            "  %i = phi i32 [ 1, %entry ], [ %i.inc, %loop ] "
-            "  %i.inc = add nsw i32 %i, 1 "
-            "  %cont = icmp slt i32 %i.inc, %limit "
-            "  br i1 %cont, label %loop, label %exit "
-            "exit: "
-            "  ret i32 %i.inc "
-            "}",
-            Err, C);
-
-        assert(M && "Could not parse module?");
-        assert(!verifyModule(*M) && "Must have been well formed!");
-
-        runWithSE(*M, "test",
-                  [&](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-                    auto &I = GetInstByName(F, "i");
-                    auto *Loop = LI.getLoopFor(I.getParent());
-                    EXPECT_FALSE(Loop->getCanonicalInductionVariable());
-
-                    auto *AR = GetAddRec(SE, Loop);
-                    EXPECT_FALSE(AR->isAffine());
-
-                    SCEVExpander Exp(SE, M->getDataLayout(), "expander");
-                    auto *InsertAt = I.getNextNode();
-                    Value *V = Exp.expandCodeFor(AR, nullptr, InsertAt);
-                    auto *ExpandedAR = SE.getSCEV(V);
-                    // Check that the expansion happened literally.
-                    EXPECT_EQ(AR, ExpandedAR);
-                  });
-      };
-
-  // Expand the addrec produced by GetAddRec into a loop with a canonical IV
-  // which is narrower than addrec type.
-  auto TestNarrowCanonicalIV = [&](std::function<const SCEVAddRecExpr *(
-                                       ScalarEvolution & SE, Loop * L)>
-                                       GetAddRec) {
-    std::unique_ptr<Module> M = parseAssemblyString(
-        "define i32 @test(i32 %limit) { "
-        "entry: "
-        "  br label %loop "
-        "loop: "
-        "  %i = phi i32 [ 1, %entry ], [ %i.inc, %loop ] "
-        "  %canonical.iv = phi i8 [ 0, %entry ], [ %canonical.iv.inc, %loop ] "
-        "  %i.inc = add nsw i32 %i, 1 "
-        "  %canonical.iv.inc = add i8 %canonical.iv, 1 "
-        "  %cont = icmp slt i32 %i.inc, %limit "
-        "  br i1 %cont, label %loop, label %exit "
-        "exit: "
-        "  ret i32 %i.inc "
-        "}",
-        Err, C);
-
-    assert(M && "Could not parse module?");
-    assert(!verifyModule(*M) && "Must have been well formed!");
-
-    runWithSE(*M, "test", [&](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-      auto &I = GetInstByName(F, "i");
-
-      auto *LoopHeaderBB = I.getParent();
-      auto *Loop = LI.getLoopFor(LoopHeaderBB);
-      PHINode *CanonicalIV = Loop->getCanonicalInductionVariable();
-      EXPECT_EQ(CanonicalIV, &GetInstByName(F, "canonical.iv"));
-
-      auto *AR = GetAddRec(SE, Loop);
-      EXPECT_FALSE(AR->isAffine());
-
-      unsigned ExpectedCanonicalIVWidth = SE.getTypeSizeInBits(AR->getType());
-      unsigned CanonicalIVBitWidth =
-          cast<IntegerType>(CanonicalIV->getType())->getBitWidth();
-      EXPECT_LT(CanonicalIVBitWidth, ExpectedCanonicalIVWidth);
-
-      SCEVExpander Exp(SE, M->getDataLayout(), "expander");
-      auto *InsertAt = I.getNextNode();
-      Value *V = Exp.expandCodeFor(AR, nullptr, InsertAt);
-      auto *ExpandedAR = SE.getSCEV(V);
-      // Check that the expansion happened literally.
-      EXPECT_EQ(AR, ExpandedAR);
-    });
-  };
-
-  // Expand the addrec produced by GetAddRec into a loop with a canonical IV
-  // of addrec width.
-  auto TestMatchingCanonicalIV =
-      [&](std::function<const SCEVAddRecExpr *(ScalarEvolution & SE, Loop * L)>
-              GetAddRec,
-          unsigned ARBitWidth) {
-        auto ARBitWidthTypeStr = "i" + std::to_string(ARBitWidth);
-        std::unique_ptr<Module> M = parseAssemblyString(
-            "define i32 @test(i32 %limit) { "
-            "entry: "
-            "  br label %loop "
-            "loop: "
-            "  %i = phi i32 [ 1, %entry ], [ %i.inc, %loop ] "
-            "  %canonical.iv = phi " +
-                ARBitWidthTypeStr +
-                " [ 0, %entry ], [ %canonical.iv.inc, %loop ] "
-                "  %i.inc = add nsw i32 %i, 1 "
-                "  %canonical.iv.inc = add " +
-                ARBitWidthTypeStr +
-                " %canonical.iv, 1 "
-                "  %cont = icmp slt i32 %i.inc, %limit "
-                "  br i1 %cont, label %loop, label %exit "
-                "exit: "
-                "  ret i32 %i.inc "
-                "}",
-            Err, C);
-
-        assert(M && "Could not parse module?");
-        assert(!verifyModule(*M) && "Must have been well formed!");
-
-        runWithSE(
-            *M, "test", [&](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-              auto &I = GetInstByName(F, "i");
-              auto &CanonicalIV = GetInstByName(F, "canonical.iv");
-
-              auto *LoopHeaderBB = I.getParent();
-              auto *Loop = LI.getLoopFor(LoopHeaderBB);
-              EXPECT_EQ(&CanonicalIV, Loop->getCanonicalInductionVariable());
-              unsigned CanonicalIVBitWidth =
-                  cast<IntegerType>(CanonicalIV.getType())->getBitWidth();
-
-              auto *AR = GetAddRec(SE, Loop);
-              EXPECT_FALSE(AR->isAffine());
-              EXPECT_EQ(ARBitWidth, SE.getTypeSizeInBits(AR->getType()));
-              EXPECT_EQ(CanonicalIVBitWidth, ARBitWidth);
-
-              SCEVExpander Exp(SE, M->getDataLayout(), "expander");
-              auto *InsertAt = I.getNextNode();
-              Value *V = Exp.expandCodeFor(AR, nullptr, InsertAt);
-              auto *ExpandedAR = SE.getSCEV(V);
-              // Check that the expansion happened literally.
-              EXPECT_EQ(AR, ExpandedAR);
-            });
-      };
-
-  unsigned ARBitWidth = 16;
-  Type *ARType = IntegerType::get(C, ARBitWidth);
-
-  // Expand {5,+,1,+,1}
-  auto GetAR3 = [&](ScalarEvolution &SE, Loop *L) -> const SCEVAddRecExpr * {
-    SmallVector<const SCEV *, 3> Ops = {SE.getConstant(APInt(ARBitWidth, 5)),
-                                        SE.getOne(ARType), SE.getOne(ARType)};
-    return cast<SCEVAddRecExpr>(SE.getAddRecExpr(Ops, L, SCEV::FlagAnyWrap));
-  };
-  TestNoCanonicalIV(GetAR3);
-  TestNarrowCanonicalIV(GetAR3);
-  TestMatchingCanonicalIV(GetAR3, ARBitWidth);
-
-  // Expand {5,+,1,+,1,+,1}
-  auto GetAR4 = [&](ScalarEvolution &SE, Loop *L) -> const SCEVAddRecExpr * {
-    SmallVector<const SCEV *, 4> Ops = {SE.getConstant(APInt(ARBitWidth, 5)),
-                                        SE.getOne(ARType), SE.getOne(ARType),
-                                        SE.getOne(ARType)};
-    return cast<SCEVAddRecExpr>(SE.getAddRecExpr(Ops, L, SCEV::FlagAnyWrap));
-  };
-  TestNoCanonicalIV(GetAR4);
-  TestNarrowCanonicalIV(GetAR4);
-  TestMatchingCanonicalIV(GetAR4, ARBitWidth);
-
-  // Expand {5,+,1,+,1,+,1,+,1}
-  auto GetAR5 = [&](ScalarEvolution &SE, Loop *L) -> const SCEVAddRecExpr * {
-    SmallVector<const SCEV *, 5> Ops = {SE.getConstant(APInt(ARBitWidth, 5)),
-                                        SE.getOne(ARType), SE.getOne(ARType),
-                                        SE.getOne(ARType), SE.getOne(ARType)};
-    return cast<SCEVAddRecExpr>(SE.getAddRecExpr(Ops, L, SCEV::FlagAnyWrap));
-  };
-  TestNoCanonicalIV(GetAR5);
-  TestNarrowCanonicalIV(GetAR5);
-  TestMatchingCanonicalIV(GetAR5, ARBitWidth);
-}
-
-TEST_F(ScalarEvolutionExpanderTest, ExpandNonIntegralPtrWithNullBase) {
-  LLVMContext C;
-  SMDiagnostic Err;
-
-  std::unique_ptr<Module> M =
-      parseAssemblyString("target datalayout = "
-                          "\"e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:"
-                          "128-n8:16:32:64-S128-ni:1-p2:32:8:8:32-ni:2\""
-                          "define float addrspace(1)* @test(i64 %offset) { "
-                          "  %ptr = getelementptr inbounds float, float "
-                          "addrspace(1)* null, i64 %offset"
-                          "  ret float addrspace(1)* %ptr"
-                          "}",
-                          Err, C);
-
-  assert(M && "Could not parse module?");
-  assert(!verifyModule(*M) && "Must have been well formed!");
-
-  runWithSE(*M, "test", [&](Function &F, LoopInfo &LI, ScalarEvolution &SE) {
-    auto &I = GetInstByName(F, "ptr");
-    auto PtrPlus1 =
-        SE.getAddExpr(SE.getSCEV(&I), SE.getConstant(I.getType(), 1));
-    SCEVExpander Exp(SE, M->getDataLayout(), "expander");
-
-    Value *V = Exp.expandCodeFor(PtrPlus1, I.getType(), &I);
-    I.replaceAllUsesWith(V);
-
-    // Check that the expander created:
-    // define float addrspace(1)* @test(i64 %off) {
-    //   %scevgep = getelementptr float, float addrspace(1)* null, i64 %off
-    //   %scevgep1 = bitcast float addrspace(1)* %scevgep to i8 addrspace(1)*
-    //   %uglygep = getelementptr i8, i8 addrspace(1)* %scevgep1, i64 1
-    //   %uglygep2 = bitcast i8 addrspace(1)* %uglygep to float addrspace(1)*
-    //   %ptr = getelementptr inbounds float, float addrspace(1)* null, i64 %off
-    //   ret float addrspace(1)* %uglygep2
-    // }
-
-    auto *Cast = dyn_cast<BitCastInst>(V);
-    EXPECT_TRUE(Cast);
-    EXPECT_EQ(Cast->getType(), I.getType());
-    auto *GEP = dyn_cast<GetElementPtrInst>(Cast->getOperand(0));
-    EXPECT_TRUE(GEP);
-    EXPECT_TRUE(match(GEP->getOperand(1), m_SpecificInt(1)));
-    auto *Cast1 = dyn_cast<BitCastInst>(GEP->getPointerOperand());
-    EXPECT_TRUE(Cast1);
-    auto *GEP1 = dyn_cast<GetElementPtrInst>(Cast1->getOperand(0));
-    EXPECT_TRUE(GEP1);
-    EXPECT_TRUE(cast<Constant>(GEP1->getPointerOperand())->isNullValue());
-    EXPECT_EQ(GEP1->getOperand(1), &*F.arg_begin());
-    EXPECT_EQ(cast<PointerType>(GEP1->getPointerOperand()->getType())
-                  ->getAddressSpace(),
-              cast<PointerType>(I.getType())->getAddressSpace());
-    EXPECT_FALSE(verifyFunction(F, &errs()));
-  });
-}
-
-} // end namespace llvm
diff --git a/gnu/llvm/llvm/unittests/Transforms/Utils/SizeOptsTest.cpp b/gnu/llvm/llvm/unittests/Transforms/Utils/SizeOptsTest.cpp
deleted file mode 100644
index 7caa5ed319a..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/Utils/SizeOptsTest.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-//===- SizeOptsTest.cpp - SizeOpts unit tests -----------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Transforms/Utils/SizeOpts.h"
-#include "llvm/Analysis/ProfileSummaryInfo.h"
-#include "llvm/Analysis/BlockFrequencyInfo.h"
-#include "llvm/Analysis/BranchProbabilityInfo.h"
-#include "llvm/Analysis/LoopInfo.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/BasicBlock.h"
-#include "llvm/IR/Dominators.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Support/FormatVariadic.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-class SizeOptsTest : public testing::Test {
-protected:
-  static const char* IRString;
-  LLVMContext C;
-  std::unique_ptr<Module> M;
-  struct BFIData {
-    std::unique_ptr<DominatorTree> DT;
-    std::unique_ptr<LoopInfo> LI;
-    std::unique_ptr<BranchProbabilityInfo> BPI;
-    std::unique_ptr<BlockFrequencyInfo> BFI;
-    BFIData(Function &F) {
-      DT.reset(new DominatorTree(F));
-      LI.reset(new LoopInfo(*DT));
-      BPI.reset(new BranchProbabilityInfo(F, *LI));
-      BFI.reset(new BlockFrequencyInfo(F, *BPI, *LI));
-    }
-    BlockFrequencyInfo *get() { return BFI.get(); }
-  };
-
-  void SetUp() override {
-    SMDiagnostic Err;
-    M = parseAssemblyString(IRString, Err, C);
-  }
-};
-
-TEST_F(SizeOptsTest, Test) {
-  Function *F = M->getFunction("f");
-  Function *G = M->getFunction("g");
-  Function *H = M->getFunction("h");
-
-  ProfileSummaryInfo PSI(*M.get());
-  BFIData BFID_F(*F);
-  BFIData BFID_G(*G);
-  BFIData BFID_H(*H);
-  BlockFrequencyInfo *BFI_F = BFID_F.get();
-  BlockFrequencyInfo *BFI_G = BFID_G.get();
-  BlockFrequencyInfo *BFI_H = BFID_H.get();
-  BasicBlock &BB0 = F->getEntryBlock();
-  BasicBlock *BB1 = BB0.getTerminator()->getSuccessor(0);
-  BasicBlock *BB2 = BB0.getTerminator()->getSuccessor(1);
-  BasicBlock *BB3 = BB1->getSingleSuccessor();
-
-  EXPECT_TRUE(PSI.hasProfileSummary());
-  EXPECT_FALSE(shouldOptimizeForSize(F, &PSI, BFI_F, PGSOQueryType::Test));
-  EXPECT_TRUE(shouldOptimizeForSize(G, &PSI, BFI_G, PGSOQueryType::Test));
-  EXPECT_FALSE(shouldOptimizeForSize(H, &PSI, BFI_H, PGSOQueryType::Test));
-  EXPECT_FALSE(shouldOptimizeForSize(&BB0, &PSI, BFI_F, PGSOQueryType::Test));
-  EXPECT_FALSE(shouldOptimizeForSize(BB1, &PSI, BFI_F, PGSOQueryType::Test));
-  EXPECT_TRUE(shouldOptimizeForSize(BB2, &PSI, BFI_F, PGSOQueryType::Test));
-  EXPECT_FALSE(shouldOptimizeForSize(BB3, &PSI, BFI_F, PGSOQueryType::Test));
-}
-
-const char* SizeOptsTest::IRString = R"IR(
-  define i32 @g(i32 %x) !prof !14 {
-    ret i32 0
-  }
-
-  define i32 @h(i32 %x) !prof !15 {
-    ret i32 0
-  }
-
-  define i32 @f(i32 %x) !prof !16 {
-  bb0:
-    %y1 = icmp eq i32 %x, 0
-    br i1 %y1, label %bb1, label %bb2, !prof !17
-
-  bb1:                                              ; preds = %bb0
-    %z1 = call i32 @g(i32 %x)
-    br label %bb3
-
-  bb2:                                              ; preds = %bb0
-    %z2 = call i32 @h(i32 %x)
-    br label %bb3
-
-  bb3:                                              ; preds = %bb2, %bb1
-    %y2 = phi i32 [ 0, %bb1 ], [ 1, %bb2 ]
-    ret i32 %y2
-  }
-
-  !llvm.module.flags = !{!0}
-
-  !0 = !{i32 1, !"ProfileSummary", !1}
-  !1 = !{!2, !3, !4, !5, !6, !7, !8, !9}
-  !2 = !{!"ProfileFormat", !"InstrProf"}
-  !3 = !{!"TotalCount", i64 10000}
-  !4 = !{!"MaxCount", i64 10}
-  !5 = !{!"MaxInternalCount", i64 1}
-  !6 = !{!"MaxFunctionCount", i64 1000}
-  !7 = !{!"NumCounts", i64 3}
-  !8 = !{!"NumFunctions", i64 3}
-  !9 = !{!"DetailedSummary", !10}
-  !10 = !{!11, !12, !13}
-  !11 = !{i32 10000, i64 1000, i32 1}
-  !12 = !{i32 999000, i64 300, i32 3}
-  !13 = !{i32 999999, i64 5, i32 10}
-  !14 = !{!"function_entry_count", i64 1}
-  !15 = !{!"function_entry_count", i64 100}
-  !16 = !{!"function_entry_count", i64 400}
-  !17 = !{!"branch_weights", i32 100, i32 1}
-)IR";
-
-} // end anonymous namespace
diff --git a/gnu/llvm/llvm/unittests/Transforms/Utils/UnrollLoopTest.cpp b/gnu/llvm/llvm/unittests/Transforms/Utils/UnrollLoopTest.cpp
deleted file mode 100644
index de337803f50..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/Utils/UnrollLoopTest.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-//===- UnrollLoopTest.cpp - Unit tests for UnrollLoop ---------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Transforms/Utils/UnrollLoop.h"
-#include "llvm/Analysis/AssumptionCache.h"
-#include "llvm/Analysis/LoopInfo.h"
-#include "llvm/Analysis/ScalarEvolution.h"
-#include "llvm/Analysis/TargetLibraryInfo.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/BasicBlock.h"
-#include "llvm/IR/Dominators.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-static std::unique_ptr<Module> parseIR(LLVMContext &C, const char *IR) {
-  SMDiagnostic Err;
-  std::unique_ptr<Module> Mod = parseAssemblyString(IR, Err, C);
-  if (!Mod)
-    Err.print("UnrollLoopTests", errs());
-  return Mod;
-}
-
-TEST(LoopUnrollRuntime, Latch) {
-  LLVMContext C;
-
-  std::unique_ptr<Module> M = parseIR(
-    C,
-    R"(define i32 @test(i32* %a, i32* %b, i32* %c, i64 %n) {
-entry:
-  br label %while.cond
-
-while.cond:                                       ; preds = %while.body, %entry
-  %i.0 = phi i64 [ 0, %entry ], [ %inc, %while.body ]
-  %cmp = icmp slt i64 %i.0, %n
-  br i1 %cmp, label %while.body, label %while.end
-
-while.body:                                       ; preds = %while.cond
-  %arrayidx = getelementptr inbounds i32, i32* %b, i64 %i.0
-  %0 = load i32, i32* %arrayidx
-  %arrayidx1 = getelementptr inbounds i32, i32* %c, i64 %i.0
-  %1 = load i32, i32* %arrayidx1
-  %mul = mul nsw i32 %0, %1
-  %arrayidx2 = getelementptr inbounds i32, i32* %a, i64 %i.0
-  store i32 %mul, i32* %arrayidx2
-  %inc = add nsw i64 %i.0, 1
-  br label %while.cond
-
-while.end:                                        ; preds = %while.cond
-  ret i32 0
-})"
-    );
-
-  auto *F = M->getFunction("test");
-  DominatorTree DT(*F);
-  LoopInfo LI(DT);
-  AssumptionCache AC(*F);
-  TargetLibraryInfoImpl TLII;
-  TargetLibraryInfo TLI(TLII);
-  ScalarEvolution SE(*F, TLI, AC, DT, LI);
-
-  Loop *L = *LI.begin();
-
-  bool PreserveLCSSA = L->isRecursivelyLCSSAForm(DT,LI);
-
-  bool ret =
-      UnrollRuntimeLoopRemainder(L, 4, true, false, false, false, &LI, &SE, &DT,
-                                 &AC, /*TTI=*/nullptr, PreserveLCSSA);
-  EXPECT_FALSE(ret);
-}
diff --git a/gnu/llvm/llvm/unittests/Transforms/Utils/VFABIUtils.cpp b/gnu/llvm/llvm/unittests/Transforms/Utils/VFABIUtils.cpp
deleted file mode 100644
index 689e1280dea..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/Utils/VFABIUtils.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-//===------- VFABIUtils.cpp - VFABI Unittests  ----------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/InstIterator.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Support/SourceMgr.h"
-#include "llvm/Transforms/Utils/ModuleUtils.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-class VFABIAttrTest : public testing::Test {
-protected:
-  void SetUp() override {
-    M = parseAssemblyString(IR, Err, Ctx);
-    // Get the only call instruction in the block, which is the first
-    // instruction.
-    CI = dyn_cast<CallInst>(&*(instructions(M->getFunction("f")).begin()));
-  }
-  const char *IR = "define i32 @f(i32 %a) {\n"
-                   " %1 = call i32 @g(i32 %a) #0\n"
-                   "  ret i32 %1\n"
-                   "}\n"
-                   "declare i32 @g(i32)\n"
-                   "declare <2 x i32> @custom_vg(<2 x i32>)"
-                   "declare <4 x i32> @_ZGVnN4v_g(<4 x i32>)"
-                   "declare <8 x i32> @_ZGVnN8v_g(<8 x i32>)"
-                   "attributes #0 = { "
-                   "\"vector-function-abi-variant\"=\""
-                   "_ZGVnN2v_g(custom_vg),_ZGVnN4v_g\" }";
-  LLVMContext Ctx;
-  SMDiagnostic Err;
-  std::unique_ptr<Module> M;
-  CallInst *CI;
-  SmallVector<std::string, 8> Mappings;
-};
-
-TEST_F(VFABIAttrTest, Write) {
-  Mappings.push_back("_ZGVnN8v_g");
-  Mappings.push_back("_ZGVnN2v_g(custom_vg)");
-  VFABI::setVectorVariantNames(CI, Mappings);
-  const StringRef S = CI->getAttribute(AttributeList::FunctionIndex,
-                                       "vector-function-abi-variant")
-                          .getValueAsString();
-  EXPECT_EQ(S, "_ZGVnN8v_g,_ZGVnN2v_g(custom_vg)");
-}
diff --git a/gnu/llvm/llvm/unittests/Transforms/Utils/ValueMapperTest.cpp b/gnu/llvm/llvm/unittests/Transforms/Utils/ValueMapperTest.cpp
deleted file mode 100644
index abfa6714346..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/Utils/ValueMapperTest.cpp
+++ /dev/null
@@ -1,349 +0,0 @@
-//===- ValueMapper.cpp - Unit tests for ValueMapper -----------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Transforms/Utils/ValueMapper.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/GlobalVariable.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Metadata.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-TEST(ValueMapperTest, mapMDNode) {
-  LLVMContext Context;
-  auto *U = MDTuple::get(Context, None);
-
-  // The node should be unchanged.
-  ValueToValueMapTy VM;
-  EXPECT_EQ(U, ValueMapper(VM).mapMDNode(*U));
-}
-
-TEST(ValueMapperTest, mapMDNodeCycle) {
-  LLVMContext Context;
-  MDNode *U0;
-  MDNode *U1;
-  {
-    Metadata *Ops[] = {nullptr};
-    auto T = MDTuple::getTemporary(Context, Ops);
-    Ops[0] = T.get();
-    U0 = MDTuple::get(Context, Ops);
-    T->replaceOperandWith(0, U0);
-    U1 = MDNode::replaceWithUniqued(std::move(T));
-    U0->resolveCycles();
-  }
-
-  EXPECT_TRUE(U0->isResolved());
-  EXPECT_TRUE(U0->isUniqued());
-  EXPECT_TRUE(U1->isResolved());
-  EXPECT_TRUE(U1->isUniqued());
-  EXPECT_EQ(U1, U0->getOperand(0));
-  EXPECT_EQ(U0, U1->getOperand(0));
-
-  // Cycles shouldn't be duplicated.
-  {
-    ValueToValueMapTy VM;
-    EXPECT_EQ(U0, ValueMapper(VM).mapMDNode(*U0));
-    EXPECT_EQ(U1, ValueMapper(VM).mapMDNode(*U1));
-  }
-
-  // Check the other order.
-  {
-    ValueToValueMapTy VM;
-    EXPECT_EQ(U1, ValueMapper(VM).mapMDNode(*U1));
-    EXPECT_EQ(U0, ValueMapper(VM).mapMDNode(*U0));
-  }
-}
-
-TEST(ValueMapperTest, mapMDNodeDuplicatedCycle) {
-  LLVMContext Context;
-  auto *PtrTy = Type::getInt8Ty(Context)->getPointerTo();
-  std::unique_ptr<GlobalVariable> G0 = std::make_unique<GlobalVariable>(
-      PtrTy, false, GlobalValue::ExternalLinkage, nullptr, "G0");
-  std::unique_ptr<GlobalVariable> G1 = std::make_unique<GlobalVariable>(
-      PtrTy, false, GlobalValue::ExternalLinkage, nullptr, "G1");
-
-  // Create a cycle that references G0.
-  MDNode *N0; // !0 = !{!1}
-  MDNode *N1; // !1 = !{!0, i8* @G0}
-  {
-    auto T0 = MDTuple::getTemporary(Context, nullptr);
-    Metadata *Ops1[] = {T0.get(), ConstantAsMetadata::get(G0.get())};
-    N1 = MDTuple::get(Context, Ops1);
-    T0->replaceOperandWith(0, N1);
-    N0 = MDNode::replaceWithUniqued(std::move(T0));
-  }
-
-  // Resolve N0 and N1.
-  ASSERT_FALSE(N0->isResolved());
-  ASSERT_FALSE(N1->isResolved());
-  N0->resolveCycles();
-  ASSERT_TRUE(N0->isResolved());
-  ASSERT_TRUE(N1->isResolved());
-
-  // Seed the value map to map G0 to G1 and map the nodes.  The output should
-  // have new nodes that reference G1 (instead of G0).
-  ValueToValueMapTy VM;
-  VM[G0.get()] = G1.get();
-  MDNode *MappedN0 = ValueMapper(VM).mapMDNode(*N0);
-  MDNode *MappedN1 = ValueMapper(VM).mapMDNode(*N1);
-  EXPECT_NE(N0, MappedN0);
-  EXPECT_NE(N1, MappedN1);
-  EXPECT_EQ(ConstantAsMetadata::get(G1.get()), MappedN1->getOperand(1));
-
-  // Check that the output nodes are resolved.
-  EXPECT_TRUE(MappedN0->isResolved());
-  EXPECT_TRUE(MappedN1->isResolved());
-}
-
-TEST(ValueMapperTest, mapMDNodeUnresolved) {
-  LLVMContext Context;
-  TempMDTuple T = MDTuple::getTemporary(Context, None);
-
-  ValueToValueMapTy VM;
-  EXPECT_EQ(T.get(), ValueMapper(VM, RF_NoModuleLevelChanges).mapMDNode(*T));
-}
-
-TEST(ValueMapperTest, mapMDNodeDistinct) {
-  LLVMContext Context;
-  auto *D = MDTuple::getDistinct(Context, None);
-
-  {
-    // The node should be cloned.
-    ValueToValueMapTy VM;
-    EXPECT_NE(D, ValueMapper(VM).mapMDNode(*D));
-  }
-  {
-    // The node should be moved.
-    ValueToValueMapTy VM;
-    EXPECT_EQ(D, ValueMapper(VM, RF_ReuseAndMutateDistinctMDs).mapMDNode(*D));
-  }
-}
-
-TEST(ValueMapperTest, mapMDNodeDistinctOperands) {
-  LLVMContext Context;
-  Metadata *Old = MDTuple::getDistinct(Context, None);
-  auto *D = MDTuple::getDistinct(Context, Old);
-  ASSERT_EQ(Old, D->getOperand(0));
-
-  Metadata *New = MDTuple::getDistinct(Context, None);
-  ValueToValueMapTy VM;
-  VM.MD()[Old].reset(New);
-
-  // Make sure operands are updated.
-  EXPECT_EQ(D, ValueMapper(VM, RF_ReuseAndMutateDistinctMDs).mapMDNode(*D));
-  EXPECT_EQ(New, D->getOperand(0));
-}
-
-TEST(ValueMapperTest, mapMDNodeSeeded) {
-  LLVMContext Context;
-  auto *D = MDTuple::getDistinct(Context, None);
-
-  // The node should be moved.
-  ValueToValueMapTy VM;
-  EXPECT_EQ(None, VM.getMappedMD(D));
-
-  VM.MD().insert(std::make_pair(D, TrackingMDRef(D)));
-  EXPECT_EQ(D, *VM.getMappedMD(D));
-  EXPECT_EQ(D, ValueMapper(VM).mapMDNode(*D));
-}
-
-TEST(ValueMapperTest, mapMDNodeSeededWithNull) {
-  LLVMContext Context;
-  auto *D = MDTuple::getDistinct(Context, None);
-
-  // The node should be moved.
-  ValueToValueMapTy VM;
-  EXPECT_EQ(None, VM.getMappedMD(D));
-
-  VM.MD().insert(std::make_pair(D, TrackingMDRef()));
-  EXPECT_EQ(nullptr, *VM.getMappedMD(D));
-  EXPECT_EQ(nullptr, ValueMapper(VM).mapMDNode(*D));
-}
-
-TEST(ValueMapperTest, mapMetadataNullMapGlobalWithIgnoreMissingLocals) {
-  LLVMContext C;
-  FunctionType *FTy =
-      FunctionType::get(Type::getVoidTy(C), Type::getInt8Ty(C), false);
-  std::unique_ptr<Function> F(
-      Function::Create(FTy, GlobalValue::ExternalLinkage, "F"));
-
-  ValueToValueMapTy VM;
-  RemapFlags Flags = RF_IgnoreMissingLocals | RF_NullMapMissingGlobalValues;
-  EXPECT_EQ(nullptr, ValueMapper(VM, Flags).mapValue(*F));
-}
-
-TEST(ValueMapperTest, mapMetadataMDString) {
-  LLVMContext C;
-  auto *S1 = MDString::get(C, "S1");
-  ValueToValueMapTy VM;
-
-  // Make sure S1 maps to itself, but isn't memoized.
-  EXPECT_EQ(S1, ValueMapper(VM).mapMetadata(*S1));
-  EXPECT_EQ(None, VM.getMappedMD(S1));
-
-  // We still expect VM.MD() to be respected.
-  auto *S2 = MDString::get(C, "S2");
-  VM.MD()[S1].reset(S2);
-  EXPECT_EQ(S2, ValueMapper(VM).mapMetadata(*S1));
-}
-
-TEST(ValueMapperTest, mapMetadataGetMappedMD) {
-  LLVMContext C;
-  auto *N0 = MDTuple::get(C, None);
-  auto *N1 = MDTuple::get(C, N0);
-
-  // Make sure hasMD and getMappedMD work correctly.
-  ValueToValueMapTy VM;
-  EXPECT_FALSE(VM.hasMD());
-  EXPECT_EQ(N0, ValueMapper(VM).mapMetadata(*N0));
-  EXPECT_EQ(N1, ValueMapper(VM).mapMetadata(*N1));
-  EXPECT_TRUE(VM.hasMD());
-  ASSERT_NE(None, VM.getMappedMD(N0));
-  ASSERT_NE(None, VM.getMappedMD(N1));
-  EXPECT_EQ(N0, *VM.getMappedMD(N0));
-  EXPECT_EQ(N1, *VM.getMappedMD(N1));
-}
-
-TEST(ValueMapperTest, mapMetadataNoModuleLevelChanges) {
-  LLVMContext C;
-  auto *N0 = MDTuple::get(C, None);
-  auto *N1 = MDTuple::get(C, N0);
-
-  // Nothing should be memoized when RF_NoModuleLevelChanges.
-  ValueToValueMapTy VM;
-  EXPECT_FALSE(VM.hasMD());
-  EXPECT_EQ(N0, ValueMapper(VM, RF_NoModuleLevelChanges).mapMetadata(*N0));
-  EXPECT_EQ(N1, ValueMapper(VM, RF_NoModuleLevelChanges).mapMetadata(*N1));
-  EXPECT_FALSE(VM.hasMD());
-  EXPECT_EQ(None, VM.getMappedMD(N0));
-  EXPECT_EQ(None, VM.getMappedMD(N1));
-}
-
-TEST(ValueMapperTest, mapMetadataConstantAsMetadata) {
-  LLVMContext C;
-  FunctionType *FTy =
-      FunctionType::get(Type::getVoidTy(C), Type::getInt8Ty(C), false);
-  std::unique_ptr<Function> F(
-      Function::Create(FTy, GlobalValue::ExternalLinkage, "F"));
-
-  auto *CAM = ConstantAsMetadata::get(F.get());
-  {
-    // ConstantAsMetadata shouldn't be memoized.
-    ValueToValueMapTy VM;
-    EXPECT_EQ(CAM, ValueMapper(VM).mapMetadata(*CAM));
-    EXPECT_FALSE(VM.MD().count(CAM));
-    EXPECT_EQ(CAM, ValueMapper(VM, RF_IgnoreMissingLocals).mapMetadata(*CAM));
-    EXPECT_FALSE(VM.MD().count(CAM));
-
-    // But it should respect a mapping that gets seeded.
-    auto *N = MDTuple::get(C, None);
-    VM.MD()[CAM].reset(N);
-    EXPECT_EQ(N, ValueMapper(VM).mapMetadata(*CAM));
-    EXPECT_EQ(N, ValueMapper(VM, RF_IgnoreMissingLocals).mapMetadata(*CAM));
-  }
-
-  std::unique_ptr<Function> F2(
-      Function::Create(FTy, GlobalValue::ExternalLinkage, "F2"));
-  ValueToValueMapTy VM;
-  VM[F.get()] = F2.get();
-  auto *F2MD = ValueMapper(VM).mapMetadata(*CAM);
-  EXPECT_FALSE(VM.MD().count(CAM));
-  EXPECT_TRUE(F2MD);
-  EXPECT_EQ(F2.get(), cast<ConstantAsMetadata>(F2MD)->getValue());
-}
-
-#ifdef GTEST_HAS_DEATH_TEST
-#ifndef NDEBUG
-TEST(ValueMapperTest, mapMetadataLocalAsMetadata) {
-  LLVMContext C;
-  FunctionType *FTy =
-      FunctionType::get(Type::getVoidTy(C), Type::getInt8Ty(C), false);
-  std::unique_ptr<Function> F(
-      Function::Create(FTy, GlobalValue::ExternalLinkage, "F"));
-  Argument &A = *F->arg_begin();
-
-  // mapMetadata doesn't support LocalAsMetadata.  The only valid container for
-  // LocalAsMetadata is a MetadataAsValue instance, so use it directly.
-  auto *LAM = LocalAsMetadata::get(&A);
-  ValueToValueMapTy VM;
-  EXPECT_DEATH(ValueMapper(VM).mapMetadata(*LAM), "Unexpected local metadata");
-  EXPECT_DEATH(ValueMapper(VM, RF_IgnoreMissingLocals).mapMetadata(*LAM),
-               "Unexpected local metadata");
-}
-#endif
-#endif
-
-TEST(ValueMapperTest, mapValueLocalAsMetadata) {
-  LLVMContext C;
-  FunctionType *FTy =
-      FunctionType::get(Type::getVoidTy(C), Type::getInt8Ty(C), false);
-  std::unique_ptr<Function> F(
-      Function::Create(FTy, GlobalValue::ExternalLinkage, "F"));
-  Argument &A = *F->arg_begin();
-
-  auto *LAM = LocalAsMetadata::get(&A);
-  auto *MAV = MetadataAsValue::get(C, LAM);
-
-  // The principled answer to a LocalAsMetadata of an unmapped SSA value would
-  // be to return nullptr (regardless of RF_IgnoreMissingLocals).
-  //
-  // However, algorithms that use RemapInstruction assume that each instruction
-  // only references SSA values from previous instructions.  Arguments of
-  // such as "metadata i32 %x" don't currently successfully maintain that
-  // property.  To keep RemapInstruction from crashing we need a non-null
-  // return here, but we also shouldn't reference the unmapped local.  Use
-  // "metadata !{}".
-  auto *N0 = MDTuple::get(C, None);
-  auto *N0AV = MetadataAsValue::get(C, N0);
-  ValueToValueMapTy VM;
-  EXPECT_EQ(N0AV, ValueMapper(VM).mapValue(*MAV));
-  EXPECT_EQ(nullptr, ValueMapper(VM, RF_IgnoreMissingLocals).mapValue(*MAV));
-  EXPECT_FALSE(VM.count(MAV));
-  EXPECT_FALSE(VM.count(&A));
-  EXPECT_EQ(None, VM.getMappedMD(LAM));
-
-  VM[MAV] = MAV;
-  EXPECT_EQ(MAV, ValueMapper(VM).mapValue(*MAV));
-  EXPECT_EQ(MAV, ValueMapper(VM, RF_IgnoreMissingLocals).mapValue(*MAV));
-  EXPECT_TRUE(VM.count(MAV));
-  EXPECT_FALSE(VM.count(&A));
-
-  VM[MAV] = &A;
-  EXPECT_EQ(&A, ValueMapper(VM).mapValue(*MAV));
-  EXPECT_EQ(&A, ValueMapper(VM, RF_IgnoreMissingLocals).mapValue(*MAV));
-  EXPECT_TRUE(VM.count(MAV));
-  EXPECT_FALSE(VM.count(&A));
-}
-
-TEST(ValueMapperTest, mapValueLocalAsMetadataToConstant) {
-  LLVMContext Context;
-  auto *Int8 = Type::getInt8Ty(Context);
-  FunctionType *FTy = FunctionType::get(Type::getVoidTy(Context), Int8, false);
-  std::unique_ptr<Function> F(
-      Function::Create(FTy, GlobalValue::ExternalLinkage, "F"));
-
-  // Map a local value to a constant.
-  Argument &A = *F->arg_begin();
-  Constant &C = *ConstantInt::get(Int8, 42);
-  ValueToValueMapTy VM;
-  VM[&A] = &C;
-
-  // Look up the metadata-as-value wrapper.  Don't crash.
-  auto *MDA = MetadataAsValue::get(Context, ValueAsMetadata::get(&A));
-  auto *MDC = MetadataAsValue::get(Context, ValueAsMetadata::get(&C));
-  EXPECT_TRUE(isa<LocalAsMetadata>(MDA->getMetadata()));
-  EXPECT_TRUE(isa<ConstantAsMetadata>(MDC->getMetadata()));
-  EXPECT_EQ(&C, ValueMapper(VM).mapValue(A));
-  EXPECT_EQ(MDC, ValueMapper(VM).mapValue(*MDA));
-}
-
-} // end namespace
diff --git a/gnu/llvm/llvm/unittests/Transforms/Vectorize/CMakeLists.txt b/gnu/llvm/llvm/unittests/Transforms/Vectorize/CMakeLists.txt
deleted file mode 100644
index 74fc5ed43f3..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/Vectorize/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  Analysis
-  Core
-  Vectorize
-  AsmParser
-  )
-
-add_llvm_unittest(VectorizeTests
-  VPlanDominatorTreeTest.cpp
-  VPlanLoopInfoTest.cpp
-  VPlanPredicatorTest.cpp
-  VPlanTest.cpp
-  VPlanHCFGTest.cpp
-  VPlanSlpTest.cpp
-  )
diff --git a/gnu/llvm/llvm/unittests/Transforms/Vectorize/VPlanDominatorTreeTest.cpp b/gnu/llvm/llvm/unittests/Transforms/Vectorize/VPlanDominatorTreeTest.cpp
deleted file mode 100644
index 6f397907e31..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/Vectorize/VPlanDominatorTreeTest.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-//===- llvm/unittests/Transforms/Vectorize/VPlanDominatorTreeTest.cpp -----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "../lib/Transforms/Vectorize/VPlanHCFGBuilder.h"
-#include "VPlanTestBase.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-namespace {
-
-class VPlanDominatorTreeTest : public VPlanTestBase {};
-
-TEST_F(VPlanDominatorTreeTest, BasicVPBBDomination) {
-  const char *ModuleString =
-      "define void @f(i32* %a, i32* %b, i32* %c, i32 %N, i32 %M, i32 %K) {\n"
-      "entry:\n"
-      "  br label %for.body\n"
-      "for.body:\n"
-      "  %iv = phi i64 [ 0, %entry ], [ %iv.next, %for.inc ]\n"
-      "  br i1 true, label %if.then, label %if.else\n"
-      "if.then:\n"
-      "  br label %for.inc\n"
-      "if.else:\n"
-      "  br label %for.inc\n"
-      "for.inc:\n"
-      "  %iv.next = add nuw nsw i64 %iv, 1\n"
-      "  %exitcond = icmp eq i64 %iv.next, 300\n"
-      "  br i1 %exitcond, label %for.end, label %for.body\n"
-      "for.end:\n"
-      "  ret void\n"
-      "}\n";
-
-  Module &M = parseModule(ModuleString);
-
-  Function *F = M.getFunction("f");
-  BasicBlock *LoopHeader = F->getEntryBlock().getSingleSuccessor();
-  auto Plan = buildPlainCFG(LoopHeader);
-
-  // Build VPlan domination tree analysis.
-  VPRegionBlock *TopRegion = cast<VPRegionBlock>(Plan->getEntry());
-  VPDominatorTree VPDT;
-  VPDT.recalculate(*TopRegion);
-
-  VPBlockBase *PH = TopRegion->getEntry();
-  VPBlockBase *H = PH->getSingleSuccessor();
-  VPBlockBase *IfThen = H->getSuccessors()[0];
-  VPBlockBase *IfElse = H->getSuccessors()[1];
-  VPBlockBase *Latch = IfThen->getSingleSuccessor();
-  VPBlockBase *Exit = Latch->getSuccessors()[0] != H
-                          ? Latch->getSuccessors()[0]
-                          : Latch->getSuccessors()[1];
-  // Reachability.
-  EXPECT_TRUE(VPDT.isReachableFromEntry(PH));
-  EXPECT_TRUE(VPDT.isReachableFromEntry(H));
-  EXPECT_TRUE(VPDT.isReachableFromEntry(IfThen));
-  EXPECT_TRUE(VPDT.isReachableFromEntry(IfElse));
-  EXPECT_TRUE(VPDT.isReachableFromEntry(Latch));
-  EXPECT_TRUE(VPDT.isReachableFromEntry(Exit));
-
-  // VPBB dominance.
-  EXPECT_TRUE(VPDT.dominates(PH, PH));
-  EXPECT_TRUE(VPDT.dominates(PH, H));
-  EXPECT_TRUE(VPDT.dominates(PH, IfThen));
-  EXPECT_TRUE(VPDT.dominates(PH, IfElse));
-  EXPECT_TRUE(VPDT.dominates(PH, Latch));
-  EXPECT_TRUE(VPDT.dominates(PH, Exit));
-
-  EXPECT_FALSE(VPDT.dominates(H, PH));
-  EXPECT_TRUE(VPDT.dominates(H, H));
-  EXPECT_TRUE(VPDT.dominates(H, IfThen));
-  EXPECT_TRUE(VPDT.dominates(H, IfElse));
-  EXPECT_TRUE(VPDT.dominates(H, Latch));
-  EXPECT_TRUE(VPDT.dominates(H, Exit));
-
-  EXPECT_FALSE(VPDT.dominates(IfThen, PH));
-  EXPECT_FALSE(VPDT.dominates(IfThen, H));
-  EXPECT_TRUE(VPDT.dominates(IfThen, IfThen));
-  EXPECT_FALSE(VPDT.dominates(IfThen, IfElse));
-  EXPECT_FALSE(VPDT.dominates(IfThen, Latch));
-  EXPECT_FALSE(VPDT.dominates(IfThen, Exit));
-
-  EXPECT_FALSE(VPDT.dominates(IfElse, PH));
-  EXPECT_FALSE(VPDT.dominates(IfElse, H));
-  EXPECT_FALSE(VPDT.dominates(IfElse, IfThen));
-  EXPECT_TRUE(VPDT.dominates(IfElse, IfElse));
-  EXPECT_FALSE(VPDT.dominates(IfElse, Latch));
-  EXPECT_FALSE(VPDT.dominates(IfElse, Exit));
-
-  EXPECT_FALSE(VPDT.dominates(Latch, PH));
-  EXPECT_FALSE(VPDT.dominates(Latch, H));
-  EXPECT_FALSE(VPDT.dominates(Latch, IfThen));
-  EXPECT_FALSE(VPDT.dominates(Latch, IfElse));
-  EXPECT_TRUE(VPDT.dominates(Latch, Latch));
-  EXPECT_TRUE(VPDT.dominates(Latch, Exit));
-
-  EXPECT_FALSE(VPDT.dominates(Exit, PH));
-  EXPECT_FALSE(VPDT.dominates(Exit, H));
-  EXPECT_FALSE(VPDT.dominates(Exit, IfThen));
-  EXPECT_FALSE(VPDT.dominates(Exit, IfElse));
-  EXPECT_FALSE(VPDT.dominates(Exit, Latch));
-  EXPECT_TRUE(VPDT.dominates(Exit, Exit));
-
-  // VPBB proper dominance.
-  EXPECT_FALSE(VPDT.properlyDominates(PH, PH));
-  EXPECT_TRUE(VPDT.properlyDominates(PH, H));
-  EXPECT_TRUE(VPDT.properlyDominates(PH, IfThen));
-  EXPECT_TRUE(VPDT.properlyDominates(PH, IfElse));
-  EXPECT_TRUE(VPDT.properlyDominates(PH, Latch));
-  EXPECT_TRUE(VPDT.properlyDominates(PH, Exit));
-
-  EXPECT_FALSE(VPDT.properlyDominates(H, PH));
-  EXPECT_FALSE(VPDT.properlyDominates(H, H));
-  EXPECT_TRUE(VPDT.properlyDominates(H, IfThen));
-  EXPECT_TRUE(VPDT.properlyDominates(H, IfElse));
-  EXPECT_TRUE(VPDT.properlyDominates(H, Latch));
-  EXPECT_TRUE(VPDT.properlyDominates(H, Exit));
-
-  EXPECT_FALSE(VPDT.properlyDominates(IfThen, PH));
-  EXPECT_FALSE(VPDT.properlyDominates(IfThen, H));
-  EXPECT_FALSE(VPDT.properlyDominates(IfThen, IfThen));
-  EXPECT_FALSE(VPDT.properlyDominates(IfThen, IfElse));
-  EXPECT_FALSE(VPDT.properlyDominates(IfThen, Latch));
-  EXPECT_FALSE(VPDT.properlyDominates(IfThen, Exit));
-
-  EXPECT_FALSE(VPDT.properlyDominates(IfElse, PH));
-  EXPECT_FALSE(VPDT.properlyDominates(IfElse, H));
-  EXPECT_FALSE(VPDT.properlyDominates(IfElse, IfThen));
-  EXPECT_FALSE(VPDT.properlyDominates(IfElse, IfElse));
-  EXPECT_FALSE(VPDT.properlyDominates(IfElse, Latch));
-  EXPECT_FALSE(VPDT.properlyDominates(IfElse, Exit));
-
-  EXPECT_FALSE(VPDT.properlyDominates(Latch, PH));
-  EXPECT_FALSE(VPDT.properlyDominates(Latch, H));
-  EXPECT_FALSE(VPDT.properlyDominates(Latch, IfThen));
-  EXPECT_FALSE(VPDT.properlyDominates(Latch, IfElse));
-  EXPECT_FALSE(VPDT.properlyDominates(Latch, Latch));
-  EXPECT_TRUE(VPDT.properlyDominates(Latch, Exit));
-
-  EXPECT_FALSE(VPDT.properlyDominates(Exit, PH));
-  EXPECT_FALSE(VPDT.properlyDominates(Exit, H));
-  EXPECT_FALSE(VPDT.properlyDominates(Exit, IfThen));
-  EXPECT_FALSE(VPDT.properlyDominates(Exit, IfElse));
-  EXPECT_FALSE(VPDT.properlyDominates(Exit, Latch));
-  EXPECT_FALSE(VPDT.properlyDominates(Exit, Exit));
-
-  // VPBB nearest common dominator.
-  EXPECT_EQ(PH, VPDT.findNearestCommonDominator(PH, PH));
-  EXPECT_EQ(PH, VPDT.findNearestCommonDominator(PH, H));
-  EXPECT_EQ(PH, VPDT.findNearestCommonDominator(PH, IfThen));
-  EXPECT_EQ(PH, VPDT.findNearestCommonDominator(PH, IfElse));
-  EXPECT_EQ(PH, VPDT.findNearestCommonDominator(PH, Latch));
-  EXPECT_EQ(PH, VPDT.findNearestCommonDominator(PH, Exit));
-
-  EXPECT_EQ(PH, VPDT.findNearestCommonDominator(H, PH));
-  EXPECT_EQ(H, VPDT.findNearestCommonDominator(H, H));
-  EXPECT_EQ(H, VPDT.findNearestCommonDominator(H, IfThen));
-  EXPECT_EQ(H, VPDT.findNearestCommonDominator(H, IfElse));
-  EXPECT_EQ(H, VPDT.findNearestCommonDominator(H, Latch));
-  EXPECT_EQ(H, VPDT.findNearestCommonDominator(H, Exit));
-
-  EXPECT_EQ(PH, VPDT.findNearestCommonDominator(IfThen, PH));
-  EXPECT_EQ(H, VPDT.findNearestCommonDominator(IfThen, H));
-  EXPECT_EQ(IfThen, VPDT.findNearestCommonDominator(IfThen, IfThen));
-  EXPECT_EQ(H, VPDT.findNearestCommonDominator(IfThen, IfElse));
-  EXPECT_EQ(H, VPDT.findNearestCommonDominator(IfThen, Latch));
-  EXPECT_EQ(H, VPDT.findNearestCommonDominator(IfThen, Exit));
-
-  EXPECT_EQ(PH, VPDT.findNearestCommonDominator(IfElse, PH));
-  EXPECT_EQ(H, VPDT.findNearestCommonDominator(IfElse, H));
-  EXPECT_EQ(H, VPDT.findNearestCommonDominator(IfElse, IfThen));
-  EXPECT_EQ(IfElse, VPDT.findNearestCommonDominator(IfElse, IfElse));
-  EXPECT_EQ(H, VPDT.findNearestCommonDominator(IfElse, Latch));
-  EXPECT_EQ(H, VPDT.findNearestCommonDominator(IfElse, Exit));
-
-  EXPECT_EQ(PH, VPDT.findNearestCommonDominator(Latch, PH));
-  EXPECT_EQ(H, VPDT.findNearestCommonDominator(Latch, H));
-  EXPECT_EQ(H, VPDT.findNearestCommonDominator(Latch, IfThen));
-  EXPECT_EQ(H, VPDT.findNearestCommonDominator(Latch, IfElse));
-  EXPECT_EQ(Latch, VPDT.findNearestCommonDominator(Latch, Latch));
-  EXPECT_EQ(Latch, VPDT.findNearestCommonDominator(Latch, Exit));
-
-  EXPECT_EQ(PH, VPDT.findNearestCommonDominator(Exit, PH));
-  EXPECT_EQ(H, VPDT.findNearestCommonDominator(Exit, H));
-  EXPECT_EQ(H, VPDT.findNearestCommonDominator(Exit, IfThen));
-  EXPECT_EQ(H, VPDT.findNearestCommonDominator(Exit, IfElse));
-  EXPECT_EQ(Latch, VPDT.findNearestCommonDominator(Exit, Latch));
-  EXPECT_EQ(Exit, VPDT.findNearestCommonDominator(Exit, Exit));
-}
-} // namespace
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/Transforms/Vectorize/VPlanHCFGTest.cpp b/gnu/llvm/llvm/unittests/Transforms/Vectorize/VPlanHCFGTest.cpp
deleted file mode 100644
index ea84034354a..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/Vectorize/VPlanHCFGTest.cpp
+++ /dev/null
@@ -1,194 +0,0 @@
-//===- llvm/unittest/Transforms/Vectorize/VPlanHCFGTest.cpp ---------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "../lib/Transforms/Vectorize/VPlan.h"
-#include "../lib/Transforms/Vectorize/VPlanTransforms.h"
-#include "VPlanTestBase.h"
-#include "gtest/gtest.h"
-#include <string>
-
-namespace llvm {
-namespace {
-
-class VPlanHCFGTest : public VPlanTestBase {};
-
-TEST_F(VPlanHCFGTest, testBuildHCFGInnerLoop) {
-  const char *ModuleString =
-      "define void @f(i32* %A, i64 %N) {\n"
-      "entry:\n"
-      "  br label %for.body\n"
-      "for.body:\n"
-      "  %indvars.iv = phi i64 [ 0, %entry ], [ %indvars.iv.next, %for.body ]\n"
-      "  %arr.idx = getelementptr inbounds i32, i32* %A, i64 %indvars.iv\n"
-      "  %l1 = load i32, i32* %arr.idx, align 4\n"
-      "  %res = add i32 %l1, 10\n"
-      "  store i32 %res, i32* %arr.idx, align 4\n"
-      "  %indvars.iv.next = add i64 %indvars.iv, 1\n"
-      "  %exitcond = icmp ne i64 %indvars.iv.next, %N\n"
-      "  br i1 %exitcond, label %for.body, label %for.end\n"
-      "for.end:\n"
-      "  ret void\n"
-      "}\n";
-
-  Module &M = parseModule(ModuleString);
-
-  Function *F = M.getFunction("f");
-  BasicBlock *LoopHeader = F->getEntryBlock().getSingleSuccessor();
-  auto Plan = buildHCFG(LoopHeader);
-
-  VPBasicBlock *Entry = Plan->getEntry()->getEntryBasicBlock();
-  EXPECT_NE(nullptr, Entry->getSingleSuccessor());
-  EXPECT_EQ(0u, Entry->getNumPredecessors());
-  EXPECT_EQ(1u, Entry->getNumSuccessors());
-  EXPECT_EQ(nullptr, Entry->getCondBit());
-
-  VPBasicBlock *VecBB = Entry->getSingleSuccessor()->getEntryBasicBlock();
-  EXPECT_EQ(7u, VecBB->size());
-  EXPECT_EQ(2u, VecBB->getNumPredecessors());
-  EXPECT_EQ(2u, VecBB->getNumSuccessors());
-  EXPECT_EQ(&*Plan, VecBB->getPlan());
-
-  auto Iter = VecBB->begin();
-  VPWidenPHIRecipe *Phi = dyn_cast<VPWidenPHIRecipe>(&*Iter++);
-  EXPECT_NE(nullptr, Phi);
-
-  VPInstruction *Idx = dyn_cast<VPInstruction>(&*Iter++);
-  EXPECT_EQ(Instruction::GetElementPtr, Idx->getOpcode());
-  EXPECT_EQ(2u, Idx->getNumOperands());
-  EXPECT_EQ(Phi, Idx->getOperand(1));
-
-  VPInstruction *Load = dyn_cast<VPInstruction>(&*Iter++);
-  EXPECT_EQ(Instruction::Load, Load->getOpcode());
-  EXPECT_EQ(1u, Load->getNumOperands());
-  EXPECT_EQ(Idx, Load->getOperand(0));
-
-  VPInstruction *Add = dyn_cast<VPInstruction>(&*Iter++);
-  EXPECT_EQ(Instruction::Add, Add->getOpcode());
-  EXPECT_EQ(2u, Add->getNumOperands());
-  EXPECT_EQ(Load, Add->getOperand(0));
-
-  VPInstruction *Store = dyn_cast<VPInstruction>(&*Iter++);
-  EXPECT_EQ(Instruction::Store, Store->getOpcode());
-  EXPECT_EQ(2u, Store->getNumOperands());
-  EXPECT_EQ(Add, Store->getOperand(0));
-  EXPECT_EQ(Idx, Store->getOperand(1));
-
-  VPInstruction *IndvarAdd = dyn_cast<VPInstruction>(&*Iter++);
-  EXPECT_EQ(Instruction::Add, IndvarAdd->getOpcode());
-  EXPECT_EQ(2u, IndvarAdd->getNumOperands());
-  EXPECT_EQ(Phi, IndvarAdd->getOperand(0));
-
-  VPInstruction *ICmp = dyn_cast<VPInstruction>(&*Iter++);
-  EXPECT_EQ(Instruction::ICmp, ICmp->getOpcode());
-  EXPECT_EQ(2u, ICmp->getNumOperands());
-  EXPECT_EQ(IndvarAdd, ICmp->getOperand(0));
-  EXPECT_EQ(VecBB->getCondBit(), ICmp);
-
-#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
-  // Add an external value to check we do not print the list of external values,
-  // as this is not required with the new printing.
-  Plan->addVPValue(&*F->arg_begin());
-  std::string FullDump;
-  raw_string_ostream OS(FullDump);
-  Plan->printDOT(OS);
-  const char *ExpectedStr = R"(digraph VPlan {
-graph [labelloc=t, fontsize=30; label="Vectorization Plan"]
-node [shape=rect, fontname=Courier, fontsize=30]
-edge [fontname=Courier, fontsize=30]
-compound=true
-  subgraph cluster_N0 {
-    fontname=Courier
-    label="\<x1\> TopRegion"
-    N1 [label =
-      "entry:\l" +
-      "Successor(s): for.body\l"
-    ]
-    N1 -> N2 [ label=""]
-    N2 [label =
-      "for.body:\l" +
-      "  WIDEN-PHI ir\<%indvars.iv\> = phi ir\<0\>, ir\<%indvars.iv.next\>\l" +
-      "  EMIT ir\<%arr.idx\> = getelementptr ir\<%A\> ir\<%indvars.iv\>\l" +
-      "  EMIT ir\<%l1\> = load ir\<%arr.idx\>\l" +
-      "  EMIT ir\<%res\> = add ir\<%l1\> ir\<10\>\l" +
-      "  EMIT store ir\<%res\> ir\<%arr.idx\>\l" +
-      "  EMIT ir\<%indvars.iv.next\> = add ir\<%indvars.iv\> ir\<1\>\l" +
-      "  EMIT ir\<%exitcond\> = icmp ir\<%indvars.iv.next\> ir\<%N\>\l" +
-      "Successor(s): for.body, for.end\l" +
-      "CondBit: ir\<%exitcond\> (for.body)\l"
-    ]
-    N2 -> N2 [ label="T"]
-    N2 -> N3 [ label="F"]
-    N3 [label =
-      "for.end:\l" +
-      "  EMIT ret\l" +
-      "No successors\l"
-    ]
-  }
-}
-)";
-  EXPECT_EQ(ExpectedStr, FullDump);
-#endif
-
-  LoopVectorizationLegality::InductionList Inductions;
-  SmallPtrSet<Instruction *, 1> DeadInstructions;
-  VPlanTransforms::VPInstructionsToVPRecipes(LI->getLoopFor(LoopHeader), Plan,
-                                             Inductions, DeadInstructions, *SE);
-}
-
-TEST_F(VPlanHCFGTest, testVPInstructionToVPRecipesInner) {
-  const char *ModuleString =
-      "define void @f(i32* %A, i64 %N) {\n"
-      "entry:\n"
-      "  br label %for.body\n"
-      "for.body:\n"
-      "  %indvars.iv = phi i64 [ 0, %entry ], [ %indvars.iv.next, %for.body ]\n"
-      "  %arr.idx = getelementptr inbounds i32, i32* %A, i64 %indvars.iv\n"
-      "  %l1 = load i32, i32* %arr.idx, align 4\n"
-      "  %res = add i32 %l1, 10\n"
-      "  store i32 %res, i32* %arr.idx, align 4\n"
-      "  %indvars.iv.next = add i64 %indvars.iv, 1\n"
-      "  %exitcond = icmp ne i64 %indvars.iv.next, %N\n"
-      "  br i1 %exitcond, label %for.body, label %for.end\n"
-      "for.end:\n"
-      "  ret void\n"
-      "}\n";
-
-  Module &M = parseModule(ModuleString);
-
-  Function *F = M.getFunction("f");
-  BasicBlock *LoopHeader = F->getEntryBlock().getSingleSuccessor();
-  auto Plan = buildHCFG(LoopHeader);
-
-  LoopVectorizationLegality::InductionList Inductions;
-  SmallPtrSet<Instruction *, 1> DeadInstructions;
-  VPlanTransforms::VPInstructionsToVPRecipes(LI->getLoopFor(LoopHeader), Plan,
-                                             Inductions, DeadInstructions, *SE);
-
-  VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
-  EXPECT_NE(nullptr, Entry->getSingleSuccessor());
-  EXPECT_EQ(0u, Entry->getNumPredecessors());
-  EXPECT_EQ(1u, Entry->getNumSuccessors());
-
-  VPBasicBlock *VecBB = Entry->getSingleSuccessor()->getEntryBasicBlock();
-  EXPECT_EQ(7u, VecBB->size());
-  EXPECT_EQ(2u, VecBB->getNumPredecessors());
-  EXPECT_EQ(2u, VecBB->getNumSuccessors());
-
-  auto Iter = VecBB->begin();
-  EXPECT_NE(nullptr, dyn_cast<VPWidenPHIRecipe>(&*Iter++));
-  EXPECT_NE(nullptr, dyn_cast<VPWidenGEPRecipe>(&*Iter++));
-  EXPECT_NE(nullptr, dyn_cast<VPWidenMemoryInstructionRecipe>(&*Iter++));
-  EXPECT_NE(nullptr, dyn_cast<VPWidenRecipe>(&*Iter++));
-  EXPECT_NE(nullptr, dyn_cast<VPWidenMemoryInstructionRecipe>(&*Iter++));
-  EXPECT_NE(nullptr, dyn_cast<VPWidenRecipe>(&*Iter++));
-  EXPECT_NE(nullptr, dyn_cast<VPWidenRecipe>(&*Iter++));
-  EXPECT_EQ(VecBB->end(), Iter);
-}
-
-} // namespace
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/Transforms/Vectorize/VPlanLoopInfoTest.cpp b/gnu/llvm/llvm/unittests/Transforms/Vectorize/VPlanLoopInfoTest.cpp
deleted file mode 100644
index 0bb45996898..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/Vectorize/VPlanLoopInfoTest.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-//===- llvm/unittests/Transforms/Vectorize/VPlanLoopInfoTest.cpp -----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "../lib/Transforms/Vectorize/VPlanLoopInfo.h"
-#include "VPlanTestBase.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-namespace {
-
-class VPlanLoopInfo : public VPlanTestBase {};
-
-TEST_F(VPlanLoopInfo, BasicLoopInfoTest) {
-  const char *ModuleString =
-      "define void @f(i32* %a, i32* %b, i32* %c, i32 %N, i32 %M, i32 %K) {\n"
-      "entry:\n"
-      "  br label %for.body\n"
-      "for.body:\n"
-      "  %iv = phi i64 [ 0, %entry ], [ %iv.next, %for.inc ]\n"
-      "  br i1 true, label %if.then, label %if.else\n"
-      "if.then:\n"
-      "  br label %for.inc\n"
-      "if.else:\n"
-      "  br label %for.inc\n"
-      "for.inc:\n"
-      "  %iv.next = add nuw nsw i64 %iv, 1\n"
-      "  %exitcond = icmp eq i64 %iv.next, 300\n"
-      "  br i1 %exitcond, label %for.end, label %for.body\n"
-      "for.end:\n"
-      "  ret void\n"
-      "}\n";
-
-  Module &M = parseModule(ModuleString);
-
-  Function *F = M.getFunction("f");
-  BasicBlock *LoopHeader = F->getEntryBlock().getSingleSuccessor();
-  auto Plan = buildHCFG(LoopHeader);
-
-  // Build VPlan domination tree and loop info analyses.
-  VPRegionBlock *TopRegion = cast<VPRegionBlock>(Plan->getEntry());
-  VPDominatorTree VPDT;
-  VPDT.recalculate(*TopRegion);
-  VPLoopInfo VPLI;
-  VPLI.analyze(VPDT);
-
-  VPBlockBase *PH = TopRegion->getEntry();
-  VPBlockBase *H = PH->getSingleSuccessor();
-  VPBlockBase *IfThen = H->getSuccessors()[0];
-  VPBlockBase *IfElse = H->getSuccessors()[1];
-  VPBlockBase *Latch = IfThen->getSingleSuccessor();
-  VPBlockBase *Exit = Latch->getSuccessors()[0] != H
-                          ? Latch->getSuccessors()[0]
-                          : Latch->getSuccessors()[1];
-
-  // Number of loops.
-  EXPECT_EQ(1, std::distance(VPLI.begin(), VPLI.end()));
-  VPLoop *VPLp = *VPLI.begin();
-
-  // VPBBs contained in VPLoop.
-  EXPECT_FALSE(VPLp->contains(PH));
-  EXPECT_EQ(nullptr, VPLI.getLoopFor(PH));
-  EXPECT_TRUE(VPLp->contains(H));
-  EXPECT_EQ(VPLp, VPLI.getLoopFor(H));
-  EXPECT_TRUE(VPLp->contains(IfThen));
-  EXPECT_EQ(VPLp, VPLI.getLoopFor(IfThen));
-  EXPECT_TRUE(VPLp->contains(IfElse));
-  EXPECT_EQ(VPLp, VPLI.getLoopFor(IfElse));
-  EXPECT_TRUE(VPLp->contains(Latch));
-  EXPECT_EQ(VPLp, VPLI.getLoopFor(Latch));
-  EXPECT_FALSE(VPLp->contains(Exit));
-  EXPECT_EQ(nullptr, VPLI.getLoopFor(Exit));
-
-  // VPLoop's parts.
-  EXPECT_EQ(PH, VPLp->getLoopPreheader());
-  EXPECT_EQ(H, VPLp->getHeader());
-  EXPECT_EQ(Latch, VPLp->getLoopLatch());
-  EXPECT_EQ(Latch, VPLp->getExitingBlock());
-  EXPECT_EQ(Exit, VPLp->getExitBlock());
-}
-} // namespace
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/Transforms/Vectorize/VPlanPredicatorTest.cpp b/gnu/llvm/llvm/unittests/Transforms/Vectorize/VPlanPredicatorTest.cpp
deleted file mode 100644
index dccbe9c4cf6..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/Vectorize/VPlanPredicatorTest.cpp
+++ /dev/null
@@ -1,236 +0,0 @@
-//===- llvm/unittests/Transforms/Vectorize/VPlanPredicatorTest.cpp -----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "../lib/Transforms/Vectorize/VPlanPredicator.h"
-#include "VPlanTestBase.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-namespace {
-
-class VPlanPredicatorTest : public VPlanTestBase {};
-
-TEST_F(VPlanPredicatorTest, BasicPredicatorTest) {
-  const char *ModuleString =
-      "@arr = common global [8 x [8 x i64]] "
-      "zeroinitializer, align 16\n"
-      "@arr2 = common global [8 x [8 x i64]] "
-      "zeroinitializer, align 16\n"
-      "@arr3 = common global [8 x [8 x i64]] "
-      "zeroinitializer, align 16\n"
-      "define void @f(i64 %n1) {\n"
-      "entry:\n"
-      "  br label %for.cond1.preheader\n"
-      "for.cond1.preheader:                              \n"
-      "  %i1.029 = phi i64 [ 0, %entry ], [ %inc14, %for.inc13 ]\n"
-      "  br label %for.body3\n"
-      "for.body3:                                        \n"
-      "  %i2.028 = phi i64 [ 0, %for.cond1.preheader ], [ %inc, %for.inc ]\n"
-      "  %arrayidx4 = getelementptr inbounds [8 x [8 x i64]], [8 x [8 x i64]]* "
-      "@arr, i64 0, i64 %i2.028, i64 %i1.029\n"
-      "  %0 = load i64, i64* %arrayidx4, align 8\n"
-      "  %cmp5 = icmp ugt i64 %0, 10\n"
-      "  br i1 %cmp5, label %if.then, label %for.inc\n"
-      "if.then:                                          \n"
-      "  %arrayidx7 = getelementptr inbounds [8 x [8 x i64]], [8 x [8 x i64]]* "
-      "@arr2, i64 0, i64 %i2.028, i64 %i1.029\n"
-      "  %1 = load i64, i64* %arrayidx7, align 8\n"
-      "  %cmp8 = icmp ugt i64 %1, 100\n"
-      "  br i1 %cmp8, label %if.then9, label %for.inc\n"
-      "if.then9:                                         \n"
-      "  %add = add nuw nsw i64 %i2.028, %i1.029\n"
-      "  %arrayidx11 = getelementptr inbounds [8 x [8 x i64]], [8 x [8 x "
-      "i64]]* @arr3, i64 0, i64 %i2.028, i64 %i1.029\n"
-      "  store i64 %add, i64* %arrayidx11, align 8\n"
-      "  br label %for.inc\n"
-      "for.inc:                                          \n"
-      "  %inc = add nuw nsw i64 %i2.028, 1\n"
-      "  %exitcond = icmp eq i64 %inc, 8\n"
-      "  br i1 %exitcond, label %for.inc13, label %for.body3\n"
-      "for.inc13:                                        \n"
-      "  %inc14 = add nuw nsw i64 %i1.029, 1\n"
-      "  %exitcond30 = icmp eq i64 %inc14, 8\n"
-      "  br i1 %exitcond30, label %for.end15, label %for.cond1.preheader\n"
-      "for.end15:                                        \n"
-      "  ret void\n"
-      "}\n";
-
-  Module &M = parseModule(ModuleString);
-
-  Function *F = M.getFunction("f");
-  BasicBlock *LoopHeader = F->getEntryBlock().getSingleSuccessor();
-  auto Plan = buildHCFG(LoopHeader);
-
-  VPRegionBlock *TopRegion = cast<VPRegionBlock>(Plan->getEntry());
-  VPBlockBase *PH = TopRegion->getEntry();
-  VPBlockBase *H = PH->getSingleSuccessor();
-  VPBlockBase *InnerLoopH = H->getSingleSuccessor();
-  VPBlockBase *OuterIf = InnerLoopH->getSuccessors()[0];
-  VPBlockBase *InnerLoopLatch = InnerLoopH->getSuccessors()[1];
-  VPBlockBase *InnerIf = OuterIf->getSuccessors()[0];
-  VPValue *CBV1 = InnerLoopH->getCondBit();
-  VPValue *CBV2 = OuterIf->getCondBit();
-
-  // Apply predication.
-  VPlanPredicator VPP(*Plan);
-  VPP.predicate();
-
-  VPBlockBase *InnerLoopLinSucc = InnerLoopH->getSingleSuccessor();
-  VPBlockBase *OuterIfLinSucc = OuterIf->getSingleSuccessor();
-  VPBlockBase *InnerIfLinSucc = InnerIf->getSingleSuccessor();
-  VPValue *OuterIfPred = OuterIf->getPredicate();
-  VPInstruction *InnerAnd =
-      cast<VPInstruction>(InnerIf->getEntryBasicBlock()->begin());
-  VPValue *InnerIfPred = InnerIf->getPredicate();
-
-  // Test block predicates
-  EXPECT_NE(nullptr, CBV1);
-  EXPECT_NE(nullptr, CBV2);
-  EXPECT_NE(nullptr, InnerAnd);
-  EXPECT_EQ(CBV1, OuterIfPred);
-  EXPECT_EQ(InnerAnd->getOpcode(), Instruction::And);
-  EXPECT_EQ(InnerAnd->getOperand(0), CBV1);
-  EXPECT_EQ(InnerAnd->getOperand(1), CBV2);
-  EXPECT_EQ(InnerIfPred, InnerAnd);
-
-  // Test Linearization
-  EXPECT_EQ(InnerLoopLinSucc, OuterIf);
-  EXPECT_EQ(OuterIfLinSucc, InnerIf);
-  EXPECT_EQ(InnerIfLinSucc, InnerLoopLatch);
-
-  // Check that the containing VPlan is set correctly.
-  EXPECT_EQ(&*Plan, InnerLoopLinSucc->getPlan());
-  EXPECT_EQ(&*Plan, OuterIfLinSucc->getPlan());
-  EXPECT_EQ(&*Plan, InnerIfLinSucc->getPlan());
-  EXPECT_EQ(&*Plan, InnerIf->getPlan());
-  EXPECT_EQ(&*Plan, InnerLoopLatch->getPlan());
-}
-
-// Test generation of Not and Or during predication.
-TEST_F(VPlanPredicatorTest, PredicatorNegOrTest) {
-  const char *ModuleString =
-      "@arr = common global [100 x [100 x i32]] zeroinitializer, align 16\n"
-      "@arr2 = common global [100 x [100 x i32]] zeroinitializer, align 16\n"
-      "@arr3 = common global [100 x [100 x i32]] zeroinitializer, align 16\n"
-      "define void @foo() {\n"
-      "entry:\n"
-      "  br label %for.cond1.preheader\n"
-      "for.cond1.preheader:                              \n"
-      "  %indvars.iv42 = phi i64 [ 0, %entry ], [ %indvars.iv.next43, "
-      "%for.inc22 ]\n"
-      "  br label %for.body3\n"
-      "for.body3:                                        \n"
-      "  %indvars.iv = phi i64 [ 0, %for.cond1.preheader ], [ "
-      "%indvars.iv.next, %if.end21 ]\n"
-      "  %arrayidx5 = getelementptr inbounds [100 x [100 x i32]], [100 x [100 "
-      "x i32]]* @arr, i64 0, i64 %indvars.iv, i64 %indvars.iv42\n"
-      "  %0 = load i32, i32* %arrayidx5, align 4\n"
-      "  %cmp6 = icmp slt i32 %0, 100\n"
-      "  br i1 %cmp6, label %if.then, label %if.end21\n"
-      "if.then:                                          \n"
-      "  %cmp7 = icmp sgt i32 %0, 10\n"
-      "  br i1 %cmp7, label %if.then8, label %if.else\n"
-      "if.then8:                                         \n"
-      "  %add = add nsw i32 %0, 10\n"
-      "  %arrayidx12 = getelementptr inbounds [100 x [100 x i32]], [100 x [100 "
-      "x i32]]* @arr2, i64 0, i64 %indvars.iv, i64 %indvars.iv42\n"
-      "  store i32 %add, i32* %arrayidx12, align 4\n"
-      "  br label %if.end\n"
-      "if.else:                                          \n"
-      "  %sub = add nsw i32 %0, -10\n"
-      "  %arrayidx16 = getelementptr inbounds [100 x [100 x i32]], [100 x [100 "
-      "x i32]]* @arr3, i64 0, i64 %indvars.iv, i64 %indvars.iv42\n"
-      "  store i32 %sub, i32* %arrayidx16, align 4\n"
-      "  br label %if.end\n"
-      "if.end:                                           \n"
-      "  store i32 222, i32* %arrayidx5, align 4\n"
-      "  br label %if.end21\n"
-      "if.end21:                                         \n"
-      "  %indvars.iv.next = add nuw nsw i64 %indvars.iv, 1\n"
-      "  %exitcond = icmp eq i64 %indvars.iv.next, 100\n"
-      "  br i1 %exitcond, label %for.inc22, label %for.body3\n"
-      "for.inc22:                                        \n"
-      "  %indvars.iv.next43 = add nuw nsw i64 %indvars.iv42, 1\n"
-      "  %exitcond44 = icmp eq i64 %indvars.iv.next43, 100\n"
-      "  br i1 %exitcond44, label %for.end24, label %for.cond1.preheader\n"
-      "for.end24:                                        \n"
-      "  ret void\n"
-      "}\n";
-
-  Module &M = parseModule(ModuleString);
-  Function *F = M.getFunction("foo");
-  BasicBlock *LoopHeader = F->getEntryBlock().getSingleSuccessor();
-  auto Plan = buildHCFG(LoopHeader);
-
-  VPRegionBlock *TopRegion = cast<VPRegionBlock>(Plan->getEntry());
-  VPBlockBase *PH = TopRegion->getEntry();
-  VPBlockBase *H = PH->getSingleSuccessor();
-  VPBlockBase *OuterIfCmpBlk = H->getSingleSuccessor();
-  VPBlockBase *InnerIfCmpBlk = OuterIfCmpBlk->getSuccessors()[0];
-  VPBlockBase *InnerIfTSucc = InnerIfCmpBlk->getSuccessors()[0];
-  VPBlockBase *InnerIfFSucc = InnerIfCmpBlk->getSuccessors()[1];
-  VPBlockBase *TSuccSucc = InnerIfTSucc->getSingleSuccessor();
-  VPBlockBase *FSuccSucc = InnerIfFSucc->getSingleSuccessor();
-
-  VPValue *OuterCBV = OuterIfCmpBlk->getCondBit();
-  VPValue *InnerCBV = InnerIfCmpBlk->getCondBit();
-
-  // Apply predication.
-  VPlanPredicator VPP(*Plan);
-  VPP.predicate();
-
-  VPInstruction *And =
-      cast<VPInstruction>(InnerIfTSucc->getEntryBasicBlock()->begin());
-  VPInstruction *Not =
-      cast<VPInstruction>(InnerIfFSucc->getEntryBasicBlock()->begin());
-  VPInstruction *NotAnd = cast<VPInstruction>(
-      &*std::next(InnerIfFSucc->getEntryBasicBlock()->begin(), 1));
-  VPInstruction *Or =
-      cast<VPInstruction>(TSuccSucc->getEntryBasicBlock()->begin());
-
-  // Test block predicates
-  EXPECT_NE(nullptr, OuterCBV);
-  EXPECT_NE(nullptr, InnerCBV);
-  EXPECT_NE(nullptr, And);
-  EXPECT_NE(nullptr, Not);
-  EXPECT_NE(nullptr, NotAnd);
-
-  EXPECT_EQ(And->getOpcode(), Instruction::And);
-  EXPECT_EQ(NotAnd->getOpcode(), Instruction::And);
-  EXPECT_EQ(Not->getOpcode(), VPInstruction::Not);
-
-  EXPECT_EQ(And->getOperand(0), OuterCBV);
-  EXPECT_EQ(And->getOperand(1), InnerCBV);
-
-  EXPECT_EQ(Not->getOperand(0), InnerCBV);
-
-  EXPECT_EQ(NotAnd->getOperand(0), OuterCBV);
-  EXPECT_EQ(NotAnd->getOperand(1), Not);
-
-  EXPECT_EQ(InnerIfTSucc->getPredicate(), And);
-  EXPECT_EQ(InnerIfFSucc->getPredicate(), NotAnd);
-
-  EXPECT_EQ(TSuccSucc, FSuccSucc);
-  EXPECT_EQ(Or->getOpcode(), Instruction::Or);
-  EXPECT_EQ(TSuccSucc->getPredicate(), Or);
-
-  // Test operands of the Or - account for differences in predecessor block
-  // ordering.
-  VPInstruction *OrOp0Inst = cast<VPInstruction>(Or->getOperand(0));
-  VPInstruction *OrOp1Inst = cast<VPInstruction>(Or->getOperand(1));
-
-  bool ValidOrOperands = false;
-  if (((OrOp0Inst == And) && (OrOp1Inst == NotAnd)) ||
-      ((OrOp0Inst == NotAnd) && (OrOp1Inst == And)))
-    ValidOrOperands = true;
-
-  EXPECT_TRUE(ValidOrOperands);
-}
-
-} // namespace
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/Transforms/Vectorize/VPlanSlpTest.cpp b/gnu/llvm/llvm/unittests/Transforms/Vectorize/VPlanSlpTest.cpp
deleted file mode 100644
index af0bef544e3..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/Vectorize/VPlanSlpTest.cpp
+++ /dev/null
@@ -1,921 +0,0 @@
-//===- llvm/unittest/Transforms/Vectorize/VPlanSlpTest.cpp ---------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "../lib/Transforms/Vectorize/VPlan.h"
-#include "../lib/Transforms/Vectorize/VPlanHCFGBuilder.h"
-#include "VPlanTestBase.h"
-#include "llvm/Analysis/TargetLibraryInfo.h"
-#include "llvm/Analysis/VectorUtils.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-namespace {
-
-class VPlanSlpTest : public VPlanTestBase {
-protected:
-  TargetLibraryInfoImpl TLII;
-  TargetLibraryInfo TLI;
-  DataLayout DL;
-
-  std::unique_ptr<AssumptionCache> AC;
-  std::unique_ptr<ScalarEvolution> SE;
-  std::unique_ptr<AAResults> AARes;
-  std::unique_ptr<BasicAAResult> BasicAA;
-  std::unique_ptr<LoopAccessInfo> LAI;
-  std::unique_ptr<PredicatedScalarEvolution> PSE;
-  std::unique_ptr<InterleavedAccessInfo> IAI;
-
-  VPlanSlpTest()
-      : TLII(), TLI(TLII),
-        DL("e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-"
-           "f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:"
-           "16:32:64-S128") {}
-
-  VPInterleavedAccessInfo getInterleavedAccessInfo(Function &F, Loop *L,
-                                                   VPlan &Plan) {
-    AC.reset(new AssumptionCache(F));
-    SE.reset(new ScalarEvolution(F, TLI, *AC, *DT, *LI));
-    BasicAA.reset(new BasicAAResult(DL, F, TLI, *AC, &*DT));
-    AARes.reset(new AAResults(TLI));
-    AARes->addAAResult(*BasicAA);
-    PSE.reset(new PredicatedScalarEvolution(*SE, *L));
-    LAI.reset(new LoopAccessInfo(L, &*SE, &TLI, &*AARes, &*DT, &*LI));
-    IAI.reset(new InterleavedAccessInfo(*PSE, L, &*DT, &*LI, &*LAI));
-    IAI->analyzeInterleaving(false);
-    return {Plan, *IAI};
-  }
-};
-
-TEST_F(VPlanSlpTest, testSlpSimple_2) {
-  const char *ModuleString =
-      "%struct.Test = type { i32, i32 }\n"
-      "%struct.Test3 = type { i32, i32, i32 }\n"
-      "%struct.Test4xi8 = type { i8, i8, i8 }\n"
-      "define void @add_x2(%struct.Test* nocapture readonly %A, %struct.Test* "
-      "nocapture readonly %B, %struct.Test* nocapture %C)  {\n"
-      "entry:\n"
-      "  br label %for.body\n"
-      "for.body:                                         ; preds = %for.body, "
-      "%entry\n"
-      "  %indvars.iv = phi i64 [ 0, %entry ], [ %indvars.iv.next, %for.body ]\n"
-      "  %A0 = getelementptr inbounds %struct.Test, %struct.Test* %A, i64 "
-      "%indvars.iv, i32 0\n"
-      "  %vA0 = load i32, i32* %A0, align 4\n"
-      "  %B0 = getelementptr inbounds %struct.Test, %struct.Test* %B, i64 "
-      "%indvars.iv, i32 0\n"
-      "  %vB0 = load i32, i32* %B0, align 4\n"
-      "  %add0 = add nsw i32 %vA0, %vB0\n"
-      "  %A1 = getelementptr inbounds %struct.Test, %struct.Test* %A, i64 "
-      "%indvars.iv, i32 1\n"
-      "  %vA1 = load i32, i32* %A1, align 4\n"
-      "  %B1 = getelementptr inbounds %struct.Test, %struct.Test* %B, i64 "
-      "%indvars.iv, i32 1\n"
-      "  %vB1 = load i32, i32* %B1, align 4\n"
-      "  %add1 = add nsw i32 %vA1, %vB1\n"
-      "  %C0 = getelementptr inbounds %struct.Test, %struct.Test* %C, i64 "
-      "%indvars.iv, i32 0\n"
-      "  store i32 %add0, i32* %C0, align 4\n"
-      "  %C1 = getelementptr inbounds %struct.Test, %struct.Test* %C, i64 "
-      "%indvars.iv, i32 1\n"
-      "  store i32 %add1, i32* %C1, align 4\n"
-      "  %indvars.iv.next = add nuw nsw i64 %indvars.iv, 1\n"
-      "  %exitcond = icmp eq i64 %indvars.iv.next, 1024\n"
-      "  br i1 %exitcond, label %for.cond.cleanup, label %for.body\n"
-      "for.cond.cleanup:                                 ; preds = %for.body\n"
-      "  ret void\n"
-      "}\n";
-
-  Module &M = parseModule(ModuleString);
-
-  Function *F = M.getFunction("add_x2");
-  BasicBlock *LoopHeader = F->getEntryBlock().getSingleSuccessor();
-  auto Plan = buildHCFG(LoopHeader);
-  auto VPIAI = getInterleavedAccessInfo(*F, LI->getLoopFor(LoopHeader), *Plan);
-
-  VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
-  EXPECT_NE(nullptr, Entry->getSingleSuccessor());
-  VPBasicBlock *Body = Entry->getSingleSuccessor()->getEntryBasicBlock();
-
-  VPInstruction *Store1 = cast<VPInstruction>(&*std::next(Body->begin(), 12));
-  VPInstruction *Store2 = cast<VPInstruction>(&*std::next(Body->begin(), 14));
-
-  VPlanSlp Slp(VPIAI, *Body);
-  SmallVector<VPValue *, 4> StoreRoot = {Store1, Store2};
-  VPInstruction *CombinedStore = Slp.buildGraph(StoreRoot);
-  EXPECT_EQ(64u, Slp.getWidestBundleBits());
-  EXPECT_EQ(VPInstruction::SLPStore, CombinedStore->getOpcode());
-
-  auto *CombinedAdd = cast<VPInstruction>(CombinedStore->getOperand(0));
-  EXPECT_EQ(Instruction::Add, CombinedAdd->getOpcode());
-
-  auto *CombinedLoadA = cast<VPInstruction>(CombinedAdd->getOperand(0));
-  auto *CombinedLoadB = cast<VPInstruction>(CombinedAdd->getOperand(1));
-  EXPECT_EQ(VPInstruction::SLPLoad, CombinedLoadA->getOpcode());
-  EXPECT_EQ(VPInstruction::SLPLoad, CombinedLoadB->getOpcode());
-
-  delete CombinedStore;
-  delete CombinedAdd;
-  delete CombinedLoadA;
-  delete CombinedLoadB;
-}
-
-TEST_F(VPlanSlpTest, testSlpSimple_3) {
-  const char *ModuleString =
-      "%struct.Test = type { i32, i32 }\n"
-      "%struct.Test3 = type { i32, i32, i32 }\n"
-      "%struct.Test4xi8 = type { i8, i8, i8 }\n"
-      "define void @add_x2(%struct.Test* nocapture readonly %A, %struct.Test* "
-      "nocapture readonly %B, %struct.Test* nocapture %C)  {\n"
-      "entry:\n"
-      "  br label %for.body\n"
-      "for.body:                                         ; preds = %for.body, "
-      "%entry\n"
-      "  %indvars.iv = phi i64 [ 0, %entry ], [ %indvars.iv.next, %for.body ]\n"
-      "  %A0 = getelementptr %struct.Test, %struct.Test* %A, i64 "
-      "                      %indvars.iv, i32 0\n"
-      "  %vA0 = load i32, i32* %A0, align 4\n"
-      "  %B0 = getelementptr inbounds %struct.Test, %struct.Test* %B, i64 "
-      "                      %indvars.iv, i32 0\n"
-      "  %vB0 = load i32, i32* %B0, align 4\n"
-      "  %add0 = add nsw i32 %vA0, %vB0\n"
-      "  %A1 = getelementptr inbounds %struct.Test, %struct.Test* %A, i64 "
-      "                      %indvars.iv, i32 1\n"
-      "  %vA1 = load i32, i32* %A1, align 4\n"
-      "  %B1 = getelementptr inbounds %struct.Test, %struct.Test* %B, i64 "
-      "                      %indvars.iv, i32 1\n"
-      "  %vB1 = load i32, i32* %B1, align 4\n"
-      "  %add1 = add nsw i32 %vA1, %vB1\n"
-      "  %C0 = getelementptr inbounds %struct.Test, %struct.Test* %C, i64 "
-      "                      %indvars.iv, i32 0\n"
-      "  store i32 %add0, i32* %C0, align 4\n"
-      "  %C1 = getelementptr inbounds %struct.Test, %struct.Test* %C, i64 "
-      "                      %indvars.iv, i32 1\n"
-      "  store i32 %add1, i32* %C1, align 4\n"
-      "  %indvars.iv.next = add nuw nsw i64 %indvars.iv, 1\n"
-      "  %exitcond = icmp eq i64 %indvars.iv.next, 1024\n"
-      "  br i1 %exitcond, label %for.cond.cleanup, label %for.body\n"
-      "for.cond.cleanup:                                 ; preds = %for.body\n"
-      "  ret void\n"
-      "}\n";
-
-  Module &M = parseModule(ModuleString);
-
-  Function *F = M.getFunction("add_x2");
-  BasicBlock *LoopHeader = F->getEntryBlock().getSingleSuccessor();
-  auto Plan = buildHCFG(LoopHeader);
-
-  VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
-  EXPECT_NE(nullptr, Entry->getSingleSuccessor());
-  VPBasicBlock *Body = Entry->getSingleSuccessor()->getEntryBasicBlock();
-
-  VPInstruction *Store1 = cast<VPInstruction>(&*std::next(Body->begin(), 12));
-  VPInstruction *Store2 = cast<VPInstruction>(&*std::next(Body->begin(), 14));
-
-  auto VPIAI = getInterleavedAccessInfo(*F, LI->getLoopFor(LoopHeader), *Plan);
-
-  VPlanSlp Slp(VPIAI, *Body);
-  SmallVector<VPValue *, 4> StoreRoot = {Store1, Store2};
-  VPInstruction *CombinedStore = Slp.buildGraph(StoreRoot);
-  EXPECT_EQ(64u, Slp.getWidestBundleBits());
-  EXPECT_EQ(VPInstruction::SLPStore, CombinedStore->getOpcode());
-
-  auto *CombinedAdd = cast<VPInstruction>(CombinedStore->getOperand(0));
-  EXPECT_EQ(Instruction::Add, CombinedAdd->getOpcode());
-
-  auto *CombinedLoadA = cast<VPInstruction>(CombinedAdd->getOperand(0));
-  auto *CombinedLoadB = cast<VPInstruction>(CombinedAdd->getOperand(1));
-  EXPECT_EQ(VPInstruction::SLPLoad, CombinedLoadA->getOpcode());
-  EXPECT_EQ(VPInstruction::SLPLoad, CombinedLoadB->getOpcode());
-
-  VPInstruction *GetA = cast<VPInstruction>(&*std::next(Body->begin(), 1));
-  VPInstruction *GetB = cast<VPInstruction>(&*std::next(Body->begin(), 3));
-  EXPECT_EQ(GetA, CombinedLoadA->getOperand(0));
-  EXPECT_EQ(GetB, CombinedLoadB->getOperand(0));
-
-  delete CombinedStore;
-  delete CombinedAdd;
-  delete CombinedLoadA;
-  delete CombinedLoadB;
-}
-
-TEST_F(VPlanSlpTest, testSlpReuse_1) {
-  const char *ModuleString =
-      "%struct.Test = type { i32, i32 }\n"
-      "define void @add_x2(%struct.Test* nocapture readonly %A, %struct.Test* "
-      "nocapture readonly %B, %struct.Test* nocapture %C)  {\n"
-      "entry:\n"
-      "  br label %for.body\n"
-      "for.body:                                         ; preds = %for.body, "
-      "%entry\n"
-      "  %indvars.iv = phi i64 [ 0, %entry ], [ %indvars.iv.next, %for.body ]\n"
-      "  %A0 = getelementptr inbounds %struct.Test, %struct.Test* %A, i64 "
-      "%indvars.iv, i32 0\n"
-      "  %vA0 = load i32, i32* %A0, align 4\n"
-      "  %add0 = add nsw i32 %vA0, %vA0\n"
-      "  %A1 = getelementptr inbounds %struct.Test, %struct.Test* %A, i64 "
-      "%indvars.iv, i32 1\n"
-      "  %vA1 = load i32, i32* %A1, align 4\n"
-      "  %add1 = add nsw i32 %vA1, %vA1\n"
-      "  %C0 = getelementptr inbounds %struct.Test, %struct.Test* %C, i64 "
-      "%indvars.iv, i32 0\n"
-      "  store i32 %add0, i32* %C0, align 4\n"
-      "  %C1 = getelementptr inbounds %struct.Test, %struct.Test* %C, i64 "
-      "%indvars.iv, i32 1\n"
-      "  store i32 %add1, i32* %C1, align 4\n"
-      "  %indvars.iv.next = add nuw nsw i64 %indvars.iv, 1\n"
-      "  %exitcond = icmp eq i64 %indvars.iv.next, 1024\n"
-      "  br i1 %exitcond, label %for.cond.cleanup, label %for.body\n"
-      "for.cond.cleanup:                                 ; preds = %for.body\n"
-      "  ret void\n"
-      "}\n";
-
-  Module &M = parseModule(ModuleString);
-
-  Function *F = M.getFunction("add_x2");
-  BasicBlock *LoopHeader = F->getEntryBlock().getSingleSuccessor();
-  auto Plan = buildHCFG(LoopHeader);
-  auto VPIAI = getInterleavedAccessInfo(*F, LI->getLoopFor(LoopHeader), *Plan);
-
-  VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
-  EXPECT_NE(nullptr, Entry->getSingleSuccessor());
-  VPBasicBlock *Body = Entry->getSingleSuccessor()->getEntryBasicBlock();
-
-  VPInstruction *Store1 = cast<VPInstruction>(&*std::next(Body->begin(), 8));
-  VPInstruction *Store2 = cast<VPInstruction>(&*std::next(Body->begin(), 10));
-
-  VPlanSlp Slp(VPIAI, *Body);
-  SmallVector<VPValue *, 4> StoreRoot = {Store1, Store2};
-  VPInstruction *CombinedStore = Slp.buildGraph(StoreRoot);
-  EXPECT_EQ(64u, Slp.getWidestBundleBits());
-  EXPECT_EQ(VPInstruction::SLPStore, CombinedStore->getOpcode());
-
-  auto *CombinedAdd = cast<VPInstruction>(CombinedStore->getOperand(0));
-  EXPECT_EQ(Instruction::Add, CombinedAdd->getOpcode());
-
-  auto *CombinedLoadA = cast<VPInstruction>(CombinedAdd->getOperand(0));
-  EXPECT_EQ(CombinedLoadA, CombinedAdd->getOperand(1));
-  EXPECT_EQ(VPInstruction::SLPLoad, CombinedLoadA->getOpcode());
-
-  delete CombinedStore;
-  delete CombinedAdd;
-  delete CombinedLoadA;
-}
-
-TEST_F(VPlanSlpTest, testSlpReuse_2) {
-  const char *ModuleString =
-      "%struct.Test = type { i32, i32 }\n"
-      "define i32 @add_x2(%struct.Test* nocapture readonly %A, %struct.Test* "
-      "nocapture readonly %B, %struct.Test* nocapture %C)  {\n"
-      "entry:\n"
-      "  br label %for.body\n"
-      "for.body:                                         ; preds = %for.body, "
-      "%entry\n"
-      "  %indvars.iv = phi i64 [ 0, %entry ], [ %indvars.iv.next, %for.body ]\n"
-      "  %A0 = getelementptr inbounds %struct.Test, %struct.Test* %A, i64 "
-      "%indvars.iv, i32 0\n"
-      "  %vA0 = load i32, i32* %A0, align 4\n"
-      "  %add0 = add nsw i32 %vA0, %vA0\n"
-      "  %C0 = getelementptr inbounds %struct.Test, %struct.Test* %C, i64 "
-      "%indvars.iv, i32 0\n"
-      "  store i32 %add0, i32* %C0, align 4\n"
-      "  %A1 = getelementptr inbounds %struct.Test, %struct.Test* %A, i64 "
-      "%indvars.iv, i32 1\n"
-      "  %vA1 = load i32, i32* %A1, align 4\n"
-      "  %add1 = add nsw i32 %vA1, %vA1\n"
-      "  %C1 = getelementptr inbounds %struct.Test, %struct.Test* %C, i64 "
-      "%indvars.iv, i32 1\n"
-      "  store i32 %add1, i32* %C1, align 4\n"
-      "  %indvars.iv.next = add nuw nsw i64 %indvars.iv, 1\n"
-      "  %exitcond = icmp eq i64 %indvars.iv.next, 1024\n"
-      "  br i1 %exitcond, label %for.cond.cleanup, label %for.body\n"
-      "for.cond.cleanup:                                 ; preds = %for.body\n"
-      "  ret i32 %vA1\n"
-      "}\n";
-
-  Module &M = parseModule(ModuleString);
-
-  Function *F = M.getFunction("add_x2");
-  BasicBlock *LoopHeader = F->getEntryBlock().getSingleSuccessor();
-  auto Plan = buildHCFG(LoopHeader);
-  auto VPIAI = getInterleavedAccessInfo(*F, LI->getLoopFor(LoopHeader), *Plan);
-
-  VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
-  EXPECT_NE(nullptr, Entry->getSingleSuccessor());
-  VPBasicBlock *Body = Entry->getSingleSuccessor()->getEntryBasicBlock();
-
-  VPInstruction *Store1 = cast<VPInstruction>(&*std::next(Body->begin(), 5));
-  VPInstruction *Store2 = cast<VPInstruction>(&*std::next(Body->begin(), 10));
-
-  VPlanSlp Slp(VPIAI, *Body);
-  SmallVector<VPValue *, 4> StoreRoot = {Store1, Store2};
-  Slp.buildGraph(StoreRoot);
-  EXPECT_FALSE(Slp.isCompletelySLP());
-}
-
-static void checkReorderExample(VPInstruction *Store1, VPInstruction *Store2,
-                                VPBasicBlock *Body,
-                                VPInterleavedAccessInfo &&IAI) {
-  VPlanSlp Slp(IAI, *Body);
-  SmallVector<VPValue *, 4> StoreRoot = {Store1, Store2};
-  VPInstruction *CombinedStore = Slp.buildGraph(StoreRoot);
-
-  EXPECT_TRUE(Slp.isCompletelySLP());
-  EXPECT_EQ(CombinedStore->getOpcode(), VPInstruction::SLPStore);
-
-  VPInstruction *CombinedAdd =
-      cast<VPInstruction>(CombinedStore->getOperand(0));
-  EXPECT_EQ(CombinedAdd->getOpcode(), Instruction::Add);
-
-  VPInstruction *CombinedMulAB =
-      cast<VPInstruction>(CombinedAdd->getOperand(0));
-  VPInstruction *CombinedMulCD =
-      cast<VPInstruction>(CombinedAdd->getOperand(1));
-  EXPECT_EQ(CombinedMulAB->getOpcode(), Instruction::Mul);
-
-  VPInstruction *CombinedLoadA =
-      cast<VPInstruction>(CombinedMulAB->getOperand(0));
-  EXPECT_EQ(VPInstruction::SLPLoad, CombinedLoadA->getOpcode());
-  VPInstruction *LoadvA0 = cast<VPInstruction>(&*std::next(Body->begin(), 2));
-  VPInstruction *LoadvA1 = cast<VPInstruction>(&*std::next(Body->begin(), 12));
-  EXPECT_EQ(LoadvA0->getOperand(0), CombinedLoadA->getOperand(0));
-  EXPECT_EQ(LoadvA1->getOperand(0), CombinedLoadA->getOperand(1));
-
-  VPInstruction *CombinedLoadB =
-      cast<VPInstruction>(CombinedMulAB->getOperand(1));
-  EXPECT_EQ(VPInstruction::SLPLoad, CombinedLoadB->getOpcode());
-  VPInstruction *LoadvB0 = cast<VPInstruction>(&*std::next(Body->begin(), 4));
-  VPInstruction *LoadvB1 = cast<VPInstruction>(&*std::next(Body->begin(), 14));
-  EXPECT_EQ(LoadvB0->getOperand(0), CombinedLoadB->getOperand(0));
-  EXPECT_EQ(LoadvB1->getOperand(0), CombinedLoadB->getOperand(1));
-
-  EXPECT_EQ(CombinedMulCD->getOpcode(), Instruction::Mul);
-
-  VPInstruction *CombinedLoadC =
-      cast<VPInstruction>(CombinedMulCD->getOperand(0));
-  EXPECT_EQ(VPInstruction::SLPLoad, CombinedLoadC->getOpcode());
-  VPInstruction *LoadvC0 = cast<VPInstruction>(&*std::next(Body->begin(), 7));
-  VPInstruction *LoadvC1 = cast<VPInstruction>(&*std::next(Body->begin(), 17));
-  EXPECT_EQ(LoadvC0->getOperand(0), CombinedLoadC->getOperand(0));
-  EXPECT_EQ(LoadvC1->getOperand(0), CombinedLoadC->getOperand(1));
-
-  VPInstruction *CombinedLoadD =
-      cast<VPInstruction>(CombinedMulCD->getOperand(1));
-  EXPECT_EQ(VPInstruction::SLPLoad, CombinedLoadD->getOpcode());
-  VPInstruction *LoadvD0 = cast<VPInstruction>(&*std::next(Body->begin(), 9));
-  VPInstruction *LoadvD1 = cast<VPInstruction>(&*std::next(Body->begin(), 19));
-  EXPECT_EQ(LoadvD0->getOperand(0), CombinedLoadD->getOperand(0));
-  EXPECT_EQ(LoadvD1->getOperand(0), CombinedLoadD->getOperand(1));
-
-  delete CombinedStore;
-  delete CombinedAdd;
-  delete CombinedMulAB;
-  delete CombinedMulCD;
-  delete CombinedLoadA;
-  delete CombinedLoadB;
-  delete CombinedLoadC;
-  delete CombinedLoadD;
-}
-
-TEST_F(VPlanSlpTest, testSlpReorder_1) {
-  LLVMContext Ctx;
-  const char *ModuleString =
-      "%struct.Test = type { i32, i32 }\n"
-      "define void @add_x3(%struct.Test* %A, %struct.Test* %B, %struct.Test* "
-      "%C,  %struct.Test* %D,  %struct.Test* %E)  {\n"
-      "entry:\n"
-      "  br label %for.body\n"
-      "for.body:                                         ; preds = %for.body, "
-      "%entry\n"
-      "  %indvars.iv = phi i64 [ 0, %entry ], [ %indvars.iv.next, %for.body ]\n"
-      "  %A0 = getelementptr inbounds %struct.Test, %struct.Test* %A, i64 "
-      "%indvars.iv, i32 0\n"
-      "  %vA0 = load i32, i32* %A0, align 4\n"
-      "  %B0 = getelementptr inbounds %struct.Test, %struct.Test* %B, i64 "
-      "%indvars.iv, i32 0\n"
-      "  %vB0 = load i32, i32* %B0, align 4\n"
-      "  %mul11 = mul nsw i32 %vA0, %vB0\n"
-      "  %C0 = getelementptr inbounds %struct.Test, %struct.Test* %C, i64 "
-      "%indvars.iv, i32 0\n"
-      "  %vC0 = load i32, i32* %C0, align 4\n"
-      "  %D0 = getelementptr inbounds %struct.Test, %struct.Test* %D, i64 "
-      "%indvars.iv, i32 0\n"
-      "  %vD0 = load i32, i32* %D0, align 4\n"
-      "  %mul12 = mul nsw i32 %vC0, %vD0\n"
-      "  %A1 = getelementptr inbounds %struct.Test, %struct.Test* %A, i64 "
-      "%indvars.iv, i32 1\n"
-      "  %vA1 = load i32, i32* %A1, align 4\n"
-      "  %B1 = getelementptr inbounds %struct.Test, %struct.Test* %B, i64 "
-      "%indvars.iv, i32 1\n"
-      "  %vB1 = load i32, i32* %B1, align 4\n"
-      "  %mul21 = mul nsw i32 %vA1, %vB1\n"
-      "  %C1 = getelementptr inbounds %struct.Test, %struct.Test* %C, i64 "
-      "%indvars.iv, i32 1\n"
-      "  %vC1 = load i32, i32* %C1, align 4\n"
-      "  %D1 = getelementptr inbounds %struct.Test, %struct.Test* %D, i64 "
-      "%indvars.iv, i32 1\n"
-      "  %vD1 = load i32, i32* %D1, align 4\n"
-      "  %mul22 = mul nsw i32 %vC1, %vD1\n"
-      "  %add1 = add nsw i32 %mul11, %mul12\n"
-      "  %add2 = add nsw i32 %mul22, %mul21\n"
-      "  %E0 = getelementptr inbounds %struct.Test, %struct.Test* %E, i64 "
-      "%indvars.iv, i32 0\n"
-      "  store i32 %add1, i32* %E0, align 4\n"
-      "  %E1 = getelementptr inbounds %struct.Test, %struct.Test* %E, i64 "
-      "%indvars.iv, i32 1\n"
-      "  store i32 %add2, i32* %E1, align 4\n"
-      "  %indvars.iv.next = add nuw nsw i64 %indvars.iv, 1\n"
-      "  %exitcond = icmp eq i64 %indvars.iv.next, 1024\n"
-      "  br i1 %exitcond, label %for.cond.cleanup, label %for.body\n"
-      "for.cond.cleanup:                                 ; preds = %for.body\n"
-      "  ret void\n"
-      "}\n";
-
-  Module &M = parseModule(ModuleString);
-
-  Function *F = M.getFunction("add_x3");
-  BasicBlock *LoopHeader = F->getEntryBlock().getSingleSuccessor();
-  auto Plan = buildHCFG(LoopHeader);
-
-  VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
-  EXPECT_NE(nullptr, Entry->getSingleSuccessor());
-  VPBasicBlock *Body = Entry->getSingleSuccessor()->getEntryBasicBlock();
-
-  VPInstruction *Store1 = cast<VPInstruction>(&*std::next(Body->begin(), 24));
-  VPInstruction *Store2 = cast<VPInstruction>(&*std::next(Body->begin(), 26));
-
-  checkReorderExample(
-      Store1, Store2, Body,
-      getInterleavedAccessInfo(*F, LI->getLoopFor(LoopHeader), *Plan));
-}
-
-TEST_F(VPlanSlpTest, testSlpReorder_2) {
-  LLVMContext Ctx;
-  const char *ModuleString =
-      "%struct.Test = type { i32, i32 }\n"
-      "define void @add_x3(%struct.Test* %A, %struct.Test* %B, %struct.Test* "
-      "%C,  %struct.Test* %D,  %struct.Test* %E)  {\n"
-      "entry:\n"
-      "  br label %for.body\n"
-      "for.body:                                         ; preds = %for.body, "
-      "%entry\n"
-      "  %indvars.iv = phi i64 [ 0, %entry ], [ %indvars.iv.next, %for.body ]\n"
-      "  %A0 = getelementptr inbounds %struct.Test, %struct.Test* %A, i64 "
-      "%indvars.iv, i32 0\n"
-      "  %vA0 = load i32, i32* %A0, align 4\n"
-      "  %B0 = getelementptr inbounds %struct.Test, %struct.Test* %B, i64 "
-      "%indvars.iv, i32 0\n"
-      "  %vB0 = load i32, i32* %B0, align 4\n"
-      "  %mul11 = mul nsw i32 %vA0, %vB0\n"
-      "  %C0 = getelementptr inbounds %struct.Test, %struct.Test* %C, i64 "
-      "%indvars.iv, i32 0\n"
-      "  %vC0 = load i32, i32* %C0, align 4\n"
-      "  %D0 = getelementptr inbounds %struct.Test, %struct.Test* %D, i64 "
-      "%indvars.iv, i32 0\n"
-      "  %vD0 = load i32, i32* %D0, align 4\n"
-      "  %mul12 = mul nsw i32 %vC0, %vD0\n"
-      "  %A1 = getelementptr inbounds %struct.Test, %struct.Test* %A, i64 "
-      "%indvars.iv, i32 1\n"
-      "  %vA1 = load i32, i32* %A1, align 4\n"
-      "  %B1 = getelementptr inbounds %struct.Test, %struct.Test* %B, i64 "
-      "%indvars.iv, i32 1\n"
-      "  %vB1 = load i32, i32* %B1, align 4\n"
-      "  %mul21 = mul nsw i32 %vB1, %vA1\n"
-      "  %C1 = getelementptr inbounds %struct.Test, %struct.Test* %C, i64 "
-      "%indvars.iv, i32 1\n"
-      "  %vC1 = load i32, i32* %C1, align 4\n"
-      "  %D1 = getelementptr inbounds %struct.Test, %struct.Test* %D, i64 "
-      "%indvars.iv, i32 1\n"
-      "  %vD1 = load i32, i32* %D1, align 4\n"
-      "  %mul22 = mul nsw i32 %vD1, %vC1\n"
-      "  %add1 = add nsw i32 %mul11, %mul12\n"
-      "  %add2 = add nsw i32 %mul22, %mul21\n"
-      "  %E0 = getelementptr inbounds %struct.Test, %struct.Test* %E, i64 "
-      "%indvars.iv, i32 0\n"
-      "  store i32 %add1, i32* %E0, align 4\n"
-      "  %E1 = getelementptr inbounds %struct.Test, %struct.Test* %E, i64 "
-      "%indvars.iv, i32 1\n"
-      "  store i32 %add2, i32* %E1, align 4\n"
-      "  %indvars.iv.next = add nuw nsw i64 %indvars.iv, 1\n"
-      "  %exitcond = icmp eq i64 %indvars.iv.next, 1024\n"
-      "  br i1 %exitcond, label %for.cond.cleanup, label %for.body\n"
-      "for.cond.cleanup:                                 ; preds = %for.body\n"
-      "  ret void\n"
-      "}\n";
-
-  Module &M = parseModule(ModuleString);
-
-  Function *F = M.getFunction("add_x3");
-  BasicBlock *LoopHeader = F->getEntryBlock().getSingleSuccessor();
-  auto Plan = buildHCFG(LoopHeader);
-
-  VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
-  EXPECT_NE(nullptr, Entry->getSingleSuccessor());
-  VPBasicBlock *Body = Entry->getSingleSuccessor()->getEntryBasicBlock();
-
-  VPInstruction *Store1 = cast<VPInstruction>(&*std::next(Body->begin(), 24));
-  VPInstruction *Store2 = cast<VPInstruction>(&*std::next(Body->begin(), 26));
-
-  checkReorderExample(
-      Store1, Store2, Body,
-      getInterleavedAccessInfo(*F, LI->getLoopFor(LoopHeader), *Plan));
-}
-
-TEST_F(VPlanSlpTest, testSlpReorder_3) {
-  LLVMContext Ctx;
-  const char *ModuleString =
-      "%struct.Test = type { i32, i32 }\n"
-      "define void @add_x3(%struct.Test* %A, %struct.Test* %B, %struct.Test* "
-      "%C,  %struct.Test* %D,  %struct.Test* %E)  {\n"
-      "entry:\n"
-      "  br label %for.body\n"
-      "for.body:                                         ; preds = %for.body, "
-      "%entry\n"
-      "  %indvars.iv = phi i64 [ 0, %entry ], [ %indvars.iv.next, %for.body ]\n"
-      "  %A1 = getelementptr inbounds %struct.Test, %struct.Test* %A, i64 "
-      "%indvars.iv, i32 1\n"
-      "  %vA1 = load i32, i32* %A1, align 4\n"
-      "  %B0 = getelementptr inbounds %struct.Test, %struct.Test* %B, i64 "
-      "%indvars.iv, i32 0\n"
-      "  %vB0 = load i32, i32* %B0, align 4\n"
-      "  %mul11 = mul nsw i32 %vA1, %vB0\n"
-      "  %C0 = getelementptr inbounds %struct.Test, %struct.Test* %C, i64 "
-      "%indvars.iv, i32 0\n"
-      "  %vC0 = load i32, i32* %C0, align 4\n"
-      "  %D0 = getelementptr inbounds %struct.Test, %struct.Test* %D, i64 "
-      "%indvars.iv, i32 0\n"
-      "  %vD0 = load i32, i32* %D0, align 4\n"
-      "  %mul12 = mul nsw i32 %vC0, %vD0\n"
-      "  %A0 = getelementptr inbounds %struct.Test, %struct.Test* %A, i64 "
-      "%indvars.iv, i32 0\n"
-      "  %vA0 = load i32, i32* %A0, align 4\n"
-      "  %B1 = getelementptr inbounds %struct.Test, %struct.Test* %B, i64 "
-      "%indvars.iv, i32 1\n"
-      "  %vB1 = load i32, i32* %B1, align 4\n"
-      "  %mul21 = mul nsw i32 %vB1, %vA0\n"
-      "  %C1 = getelementptr inbounds %struct.Test, %struct.Test* %C, i64 "
-      "%indvars.iv, i32 1\n"
-      "  %vC1 = load i32, i32* %C1, align 4\n"
-      "  %D1 = getelementptr inbounds %struct.Test, %struct.Test* %D, i64 "
-      "%indvars.iv, i32 1\n"
-      "  %vD1 = load i32, i32* %D1, align 4\n"
-      "  %mul22 = mul nsw i32 %vD1, %vC1\n"
-      "  %add1 = add nsw i32 %mul11, %mul12\n"
-      "  %add2 = add nsw i32 %mul22, %mul21\n"
-      "  %E0 = getelementptr inbounds %struct.Test, %struct.Test* %E, i64 "
-      "%indvars.iv, i32 0\n"
-      "  store i32 %add1, i32* %E0, align 4\n"
-      "  %E1 = getelementptr inbounds %struct.Test, %struct.Test* %E, i64 "
-      "%indvars.iv, i32 1\n"
-      "  store i32 %add2, i32* %E1, align 4\n"
-      "  %indvars.iv.next = add nuw nsw i64 %indvars.iv, 1\n"
-      "  %exitcond = icmp eq i64 %indvars.iv.next, 1024\n"
-      "  br i1 %exitcond, label %for.cond.cleanup, label %for.body\n"
-      "for.cond.cleanup:                                 ; preds = %for.body\n"
-      "  ret void\n"
-      "}\n";
-
-  Module &M = parseModule(ModuleString);
-
-  Function *F = M.getFunction("add_x3");
-  BasicBlock *LoopHeader = F->getEntryBlock().getSingleSuccessor();
-  auto Plan = buildHCFG(LoopHeader);
-
-  VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
-  EXPECT_NE(nullptr, Entry->getSingleSuccessor());
-  VPBasicBlock *Body = Entry->getSingleSuccessor()->getEntryBasicBlock();
-
-  VPInstruction *Store1 = cast<VPInstruction>(&*std::next(Body->begin(), 24));
-  VPInstruction *Store2 = cast<VPInstruction>(&*std::next(Body->begin(), 26));
-
-  auto VPIAI = getInterleavedAccessInfo(*F, LI->getLoopFor(LoopHeader), *Plan);
-  VPlanSlp Slp(VPIAI, *Body);
-  SmallVector<VPValue *, 4> StoreRoot = {Store1, Store2};
-  EXPECT_EQ(nullptr, Slp.buildGraph(StoreRoot));
-
-  // FIXME Need to select better first value for lane0.
-  EXPECT_FALSE(Slp.isCompletelySLP());
-}
-
-TEST_F(VPlanSlpTest, testSlpReorder_4) {
-  LLVMContext Ctx;
-  const char *ModuleString =
-      "%struct.Test = type { i32, i32 }\n"
-      "define void @add_x3(%struct.Test* %A, %struct.Test* %B, %struct.Test* "
-      "%C,  %struct.Test* %D,  %struct.Test* %E)  {\n"
-      "entry:\n"
-      "  br label %for.body\n"
-      "for.body:                                         ; preds = %for.body, "
-      "%entry\n"
-      "  %indvars.iv = phi i64 [ 0, %entry ], [ %indvars.iv.next, %for.body ]\n"
-      "  %A0 = getelementptr inbounds %struct.Test, %struct.Test* %A, i64 "
-      "%indvars.iv, i32 0\n"
-      "  %vA0 = load i32, i32* %A0, align 4\n"
-      "  %B0 = getelementptr inbounds %struct.Test, %struct.Test* %B, i64 "
-      "%indvars.iv, i32 0\n"
-      "  %vB0 = load i32, i32* %B0, align 4\n"
-      "  %mul11 = mul nsw i32 %vA0, %vB0\n"
-      "  %C0 = getelementptr inbounds %struct.Test, %struct.Test* %C, i64 "
-      "%indvars.iv, i32 0\n"
-      "  %vC0 = load i32, i32* %C0, align 4\n"
-      "  %D0 = getelementptr inbounds %struct.Test, %struct.Test* %D, i64 "
-      "%indvars.iv, i32 0\n"
-      "  %vD0 = load i32, i32* %D0, align 4\n"
-      "  %mul12 = mul nsw i32 %vC0, %vD0\n"
-      "  %A1 = getelementptr inbounds %struct.Test, %struct.Test* %A, i64 "
-      "%indvars.iv, i32 1\n"
-      "  %vA1 = load i32, i32* %A1, align 4\n"
-      "  %B1 = getelementptr inbounds %struct.Test, %struct.Test* %B, i64 "
-      "%indvars.iv, i32 1\n"
-      "  %vB1 = load i32, i32* %B1, align 4\n"
-      "  %mul21 = mul nsw i32 %vA1, %vB1\n"
-      "  %C1 = getelementptr inbounds %struct.Test, %struct.Test* %C, i64 "
-      "%indvars.iv, i32 1\n"
-      "  %vC1 = load i32, i32* %C1, align 4\n"
-      "  %D1 = getelementptr inbounds %struct.Test, %struct.Test* %D, i64 "
-      "%indvars.iv, i32 1\n"
-      "  %vD1 = load i32, i32* %D1, align 4\n"
-      "  %mul22 = mul nsw i32 %vC1, %vD1\n"
-      "  %add1 = add nsw i32 %mul11, %mul12\n"
-      "  %add2 = add nsw i32 %mul22, %mul21\n"
-      "  %E0 = getelementptr inbounds %struct.Test, %struct.Test* %E, i64 "
-      "%indvars.iv, i32 0\n"
-      "  store i32 %add1, i32* %E0, align 4\n"
-      "  %E1 = getelementptr inbounds %struct.Test, %struct.Test* %E, i64 "
-      "%indvars.iv, i32 1\n"
-      "  store i32 %add2, i32* %E1, align 4\n"
-      "  %indvars.iv.next = add nuw nsw i64 %indvars.iv, 1\n"
-      "  %exitcond = icmp eq i64 %indvars.iv.next, 1024\n"
-      "  br i1 %exitcond, label %for.cond.cleanup, label %for.body\n"
-      "for.cond.cleanup:                                 ; preds = %for.body\n"
-      "  ret void\n"
-      "}\n";
-
-  Module &M = parseModule(ModuleString);
-
-  Function *F = M.getFunction("add_x3");
-  BasicBlock *LoopHeader = F->getEntryBlock().getSingleSuccessor();
-  auto Plan = buildHCFG(LoopHeader);
-
-  VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
-  EXPECT_NE(nullptr, Entry->getSingleSuccessor());
-  VPBasicBlock *Body = Entry->getSingleSuccessor()->getEntryBasicBlock();
-
-  VPInstruction *Store1 = cast<VPInstruction>(&*std::next(Body->begin(), 24));
-  VPInstruction *Store2 = cast<VPInstruction>(&*std::next(Body->begin(), 26));
-
-  checkReorderExample(
-      Store1, Store2, Body,
-      getInterleavedAccessInfo(*F, LI->getLoopFor(LoopHeader), *Plan));
-}
-
-// Make sure we do not combine instructions with operands in different BBs.
-TEST_F(VPlanSlpTest, testInstrsInDifferentBBs) {
-  const char *ModuleString =
-      "%struct.Test = type { i32, i32 }\n"
-      "%struct.Test3 = type { i32, i32, i32 }\n"
-      "%struct.Test4xi8 = type { i8, i8, i8 }\n"
-      "define void @add_x2(%struct.Test* nocapture readonly %A, %struct.Test* "
-      "nocapture readonly %B, %struct.Test* nocapture %C)  {\n"
-      "entry:\n"
-      "  br label %for.body\n"
-      "for.body:                                         ; preds = %for.body, "
-      "%entry\n"
-      "  %indvars.iv = phi i64 [ 0, %entry ], [ %indvars.iv.next, %for.body ]\n"
-      "  %A0 = getelementptr inbounds %struct.Test, %struct.Test* %A, i64 "
-      "%indvars.iv, i32 0\n"
-      "  %vA0 = load i32, i32* %A0, align 4\n"
-      "  %B0 = getelementptr inbounds %struct.Test, %struct.Test* %B, i64 "
-      "%indvars.iv, i32 0\n"
-      "  %vB0 = load i32, i32* %B0, align 4\n"
-      "  %add0 = add nsw i32 %vA0, %vB0\n"
-      "  %A1 = getelementptr inbounds %struct.Test, %struct.Test* %A, i64 "
-      "%indvars.iv, i32 1\n"
-      "  %vA1 = load i32, i32* %A1, align 4\n"
-      "  %B1 = getelementptr inbounds %struct.Test, %struct.Test* %B, i64 "
-      "%indvars.iv, i32 1\n"
-      "  br label %bb2\n"
-      "bb2:\n"
-      "  %vB1 = load i32, i32* %B1, align 4\n"
-      "  %add1 = add nsw i32 %vA1, %vB1\n"
-      "  %C0 = getelementptr inbounds %struct.Test, %struct.Test* %C, i64 "
-      "%indvars.iv, i32 0\n"
-      "  store i32 %add0, i32* %C0, align 4\n"
-      "  %C1 = getelementptr inbounds %struct.Test, %struct.Test* %C, i64 "
-      "%indvars.iv, i32 1\n"
-      "  store i32 %add1, i32* %C1, align 4\n"
-      "  %indvars.iv.next = add nuw nsw i64 %indvars.iv, 1\n"
-      "  %exitcond = icmp eq i64 %indvars.iv.next, 1024\n"
-      "  br i1 %exitcond, label %for.cond.cleanup, label %for.body\n"
-      "for.cond.cleanup:                                 ; preds = %for.body\n"
-      "  ret void\n"
-      "}\n";
-
-  Module &M = parseModule(ModuleString);
-
-  Function *F = M.getFunction("add_x2");
-  BasicBlock *LoopHeader = F->getEntryBlock().getSingleSuccessor();
-  auto Plan = buildHCFG(LoopHeader);
-  auto VPIAI = getInterleavedAccessInfo(*F, LI->getLoopFor(LoopHeader), *Plan);
-
-  VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
-  EXPECT_NE(nullptr, Entry->getSingleSuccessor());
-  VPBasicBlock *Body = Entry->getSingleSuccessor()->getEntryBasicBlock();
-  VPBasicBlock *BB2 = Body->getSingleSuccessor()->getEntryBasicBlock();
-
-  VPInstruction *Store1 = cast<VPInstruction>(&*std::next(BB2->begin(), 3));
-  VPInstruction *Store2 = cast<VPInstruction>(&*std::next(BB2->begin(), 5));
-
-  VPlanSlp Slp(VPIAI, *BB2);
-  SmallVector<VPValue *, 4> StoreRoot = {Store1, Store2};
-  EXPECT_EQ(nullptr, Slp.buildGraph(StoreRoot));
-  EXPECT_EQ(0u, Slp.getWidestBundleBits());
-}
-
-// Make sure we do not combine instructions with operands in different BBs.
-TEST_F(VPlanSlpTest, testInstrsInDifferentBBs2) {
-  const char *ModuleString =
-      "%struct.Test = type { i32, i32 }\n"
-      "%struct.Test3 = type { i32, i32, i32 }\n"
-      "%struct.Test4xi8 = type { i8, i8, i8 }\n"
-      "define void @add_x2(%struct.Test* nocapture readonly %A, %struct.Test* "
-      "nocapture readonly %B, %struct.Test* nocapture %C)  {\n"
-      "entry:\n"
-      "  br label %for.body\n"
-      "for.body:                                         ; preds = %for.body, "
-      "%entry\n"
-      "  %indvars.iv = phi i64 [ 0, %entry ], [ %indvars.iv.next, %for.body ]\n"
-      "  %A0 = getelementptr inbounds %struct.Test, %struct.Test* %A, i64 "
-      "%indvars.iv, i32 0\n"
-      "  %vA0 = load i32, i32* %A0, align 4\n"
-      "  %B0 = getelementptr inbounds %struct.Test, %struct.Test* %B, i64 "
-      "%indvars.iv, i32 0\n"
-      "  %vB0 = load i32, i32* %B0, align 4\n"
-      "  %add0 = add nsw i32 %vA0, %vB0\n"
-      "  %A1 = getelementptr inbounds %struct.Test, %struct.Test* %A, i64 "
-      "%indvars.iv, i32 1\n"
-      "  %vA1 = load i32, i32* %A1, align 4\n"
-      "  %B1 = getelementptr inbounds %struct.Test, %struct.Test* %B, i64 "
-      "%indvars.iv, i32 1\n"
-      "  %vB1 = load i32, i32* %B1, align 4\n"
-      "  %add1 = add nsw i32 %vA1, %vB1\n"
-      "  br label %bb2\n"
-      "bb2:\n"
-      "  %C0 = getelementptr inbounds %struct.Test, %struct.Test* %C, i64 "
-      "%indvars.iv, i32 0\n"
-      "  store i32 %add0, i32* %C0, align 4\n"
-      "  %C1 = getelementptr inbounds %struct.Test, %struct.Test* %C, i64 "
-      "%indvars.iv, i32 1\n"
-      "  store i32 %add1, i32* %C1, align 4\n"
-      "  %indvars.iv.next = add nuw nsw i64 %indvars.iv, 1\n"
-      "  %exitcond = icmp eq i64 %indvars.iv.next, 1024\n"
-      "  br i1 %exitcond, label %for.cond.cleanup, label %for.body\n"
-      "for.cond.cleanup:                                 ; preds = %for.body\n"
-      "  ret void\n"
-      "}\n";
-
-  Module &M = parseModule(ModuleString);
-
-  Function *F = M.getFunction("add_x2");
-  BasicBlock *LoopHeader = F->getEntryBlock().getSingleSuccessor();
-  auto Plan = buildHCFG(LoopHeader);
-  auto VPIAI = getInterleavedAccessInfo(*F, LI->getLoopFor(LoopHeader), *Plan);
-
-  VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
-  EXPECT_NE(nullptr, Entry->getSingleSuccessor());
-  VPBasicBlock *Body = Entry->getSingleSuccessor()->getEntryBasicBlock();
-  VPBasicBlock *BB2 = Body->getSingleSuccessor()->getEntryBasicBlock();
-
-  VPInstruction *Store1 = cast<VPInstruction>(&*std::next(BB2->begin(), 1));
-  VPInstruction *Store2 = cast<VPInstruction>(&*std::next(BB2->begin(), 3));
-
-  VPlanSlp Slp(VPIAI, *BB2);
-  SmallVector<VPValue *, 4> StoreRoot = {Store1, Store2};
-  EXPECT_EQ(nullptr, Slp.buildGraph(StoreRoot));
-  EXPECT_EQ(0u, Slp.getWidestBundleBits());
-}
-
-TEST_F(VPlanSlpTest, testSlpAtomicLoad) {
-  const char *ModuleString =
-      "%struct.Test = type { i32, i32 }\n"
-      "%struct.Test3 = type { i32, i32, i32 }\n"
-      "%struct.Test4xi8 = type { i8, i8, i8 }\n"
-      "define void @add_x2(%struct.Test* nocapture readonly %A, %struct.Test* "
-      "nocapture readonly %B, %struct.Test* nocapture %C)  {\n"
-      "entry:\n"
-      "  br label %for.body\n"
-      "for.body:                                         ; preds = %for.body, "
-      "%entry\n"
-      "  %indvars.iv = phi i64 [ 0, %entry ], [ %indvars.iv.next, %for.body ]\n"
-      "  %A0 = getelementptr inbounds %struct.Test, %struct.Test* %A, i64 "
-      "%indvars.iv, i32 0\n"
-      "  %vA0 = load atomic i32, i32* %A0 monotonic, align 4\n"
-      "  %B0 = getelementptr inbounds %struct.Test, %struct.Test* %B, i64 "
-      "%indvars.iv, i32 0\n"
-      "  %vB0 = load i32, i32* %B0, align 4\n"
-      "  %add0 = add nsw i32 %vA0, %vB0\n"
-      "  %A1 = getelementptr inbounds %struct.Test, %struct.Test* %A, i64 "
-      "%indvars.iv, i32 1\n"
-      "  %vA1 = load i32, i32* %A1, align 4\n"
-      "  %B1 = getelementptr inbounds %struct.Test, %struct.Test* %B, i64 "
-      "%indvars.iv, i32 1\n"
-      "  %vB1 = load i32, i32* %B1, align 4\n"
-      "  %add1 = add nsw i32 %vA1, %vB1\n"
-      "  %C0 = getelementptr inbounds %struct.Test, %struct.Test* %C, i64 "
-      "%indvars.iv, i32 0\n"
-      "  store i32 %add0, i32* %C0, align 4\n"
-      "  %C1 = getelementptr inbounds %struct.Test, %struct.Test* %C, i64 "
-      "%indvars.iv, i32 1\n"
-      "  store i32 %add1, i32* %C1, align 4\n"
-      "  %indvars.iv.next = add nuw nsw i64 %indvars.iv, 1\n"
-      "  %exitcond = icmp eq i64 %indvars.iv.next, 1024\n"
-      "  br i1 %exitcond, label %for.cond.cleanup, label %for.body\n"
-      "for.cond.cleanup:                                 ; preds = %for.body\n"
-      "  ret void\n"
-      "}\n";
-
-  Module &M = parseModule(ModuleString);
-
-  Function *F = M.getFunction("add_x2");
-  BasicBlock *LoopHeader = F->getEntryBlock().getSingleSuccessor();
-  auto Plan = buildHCFG(LoopHeader);
-  auto VPIAI = getInterleavedAccessInfo(*F, LI->getLoopFor(LoopHeader), *Plan);
-
-  VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
-  EXPECT_NE(nullptr, Entry->getSingleSuccessor());
-  VPBasicBlock *Body = Entry->getSingleSuccessor()->getEntryBasicBlock();
-
-  VPInstruction *Store1 = cast<VPInstruction>(&*std::next(Body->begin(), 12));
-  VPInstruction *Store2 = cast<VPInstruction>(&*std::next(Body->begin(), 14));
-
-  VPlanSlp Slp(VPIAI, *Body);
-  SmallVector<VPValue *, 4> StoreRoot = {Store1, Store2};
-  EXPECT_EQ(nullptr, Slp.buildGraph(StoreRoot));
-  EXPECT_FALSE(Slp.isCompletelySLP());
-}
-
-TEST_F(VPlanSlpTest, testSlpAtomicStore) {
-  const char *ModuleString =
-      "%struct.Test = type { i32, i32 }\n"
-      "%struct.Test3 = type { i32, i32, i32 }\n"
-      "%struct.Test4xi8 = type { i8, i8, i8 }\n"
-      "define void @add_x2(%struct.Test* nocapture readonly %A, %struct.Test* "
-      "nocapture readonly %B, %struct.Test* nocapture %C)  {\n"
-      "entry:\n"
-      "  br label %for.body\n"
-      "for.body:                                         ; preds = %for.body, "
-      "%entry\n"
-      "  %indvars.iv = phi i64 [ 0, %entry ], [ %indvars.iv.next, %for.body ]\n"
-      "  %A0 = getelementptr inbounds %struct.Test, %struct.Test* %A, i64 "
-      "%indvars.iv, i32 0\n"
-      "  %vA0 = load i32, i32* %A0, align 4\n"
-      "  %B0 = getelementptr inbounds %struct.Test, %struct.Test* %B, i64 "
-      "%indvars.iv, i32 0\n"
-      "  %vB0 = load i32, i32* %B0, align 4\n"
-      "  %add0 = add nsw i32 %vA0, %vB0\n"
-      "  %A1 = getelementptr inbounds %struct.Test, %struct.Test* %A, i64 "
-      "%indvars.iv, i32 1\n"
-      "  %vA1 = load i32, i32* %A1, align 4\n"
-      "  %B1 = getelementptr inbounds %struct.Test, %struct.Test* %B, i64 "
-      "%indvars.iv, i32 1\n"
-      "  %vB1 = load i32, i32* %B1, align 4\n"
-      "  %add1 = add nsw i32 %vA1, %vB1\n"
-      "  %C0 = getelementptr inbounds %struct.Test, %struct.Test* %C, i64 "
-      "%indvars.iv, i32 0\n"
-      "  store atomic i32 %add0, i32* %C0 monotonic, align 4\n"
-      "  %C1 = getelementptr inbounds %struct.Test, %struct.Test* %C, i64 "
-      "%indvars.iv, i32 1\n"
-      "  store i32 %add1, i32* %C1, align 4\n"
-      "  %indvars.iv.next = add nuw nsw i64 %indvars.iv, 1\n"
-      "  %exitcond = icmp eq i64 %indvars.iv.next, 1024\n"
-      "  br i1 %exitcond, label %for.cond.cleanup, label %for.body\n"
-      "for.cond.cleanup:                                 ; preds = %for.body\n"
-      "  ret void\n"
-      "}\n";
-
-  Module &M = parseModule(ModuleString);
-
-  Function *F = M.getFunction("add_x2");
-  BasicBlock *LoopHeader = F->getEntryBlock().getSingleSuccessor();
-  auto Plan = buildHCFG(LoopHeader);
-  auto VPIAI = getInterleavedAccessInfo(*F, LI->getLoopFor(LoopHeader), *Plan);
-
-  VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
-  EXPECT_NE(nullptr, Entry->getSingleSuccessor());
-  VPBasicBlock *Body = Entry->getSingleSuccessor()->getEntryBasicBlock();
-
-  VPInstruction *Store1 = cast<VPInstruction>(&*std::next(Body->begin(), 12));
-  VPInstruction *Store2 = cast<VPInstruction>(&*std::next(Body->begin(), 14));
-
-  VPlanSlp Slp(VPIAI, *Body);
-  SmallVector<VPValue *, 4> StoreRoot = {Store1, Store2};
-  Slp.buildGraph(StoreRoot);
-  EXPECT_FALSE(Slp.isCompletelySLP());
-}
-
-} // namespace
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/Transforms/Vectorize/VPlanTest.cpp b/gnu/llvm/llvm/unittests/Transforms/Vectorize/VPlanTest.cpp
deleted file mode 100644
index 22ca09e6949..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/Vectorize/VPlanTest.cpp
+++ /dev/null
@@ -1,1215 +0,0 @@
-//===- llvm/unittests/Transforms/Vectorize/VPlanTest.cpp - VPlan tests ----===//
-//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "../lib/Transforms/Vectorize/VPlan.h"
-#include "llvm/Analysis/VectorUtils.h"
-#include "llvm/IR/Instruction.h"
-#include "llvm/IR/Instructions.h"
-#include "gtest/gtest.h"
-#include <string>
-
-namespace llvm {
-namespace {
-
-#define CHECK_ITERATOR(Range1, ...)                                            \
-  do {                                                                         \
-    std::vector<VPInstruction *> Tmp = {__VA_ARGS__};                          \
-    EXPECT_EQ((size_t)std::distance(Range1.begin(), Range1.end()),             \
-              Tmp.size());                                                     \
-    for (auto Pair : zip(Range1, make_range(Tmp.begin(), Tmp.end())))          \
-      EXPECT_EQ(&std::get<0>(Pair), std::get<1>(Pair));                        \
-  } while (0)
-
-TEST(VPInstructionTest, insertBefore) {
-  VPInstruction *I1 = new VPInstruction(0, {});
-  VPInstruction *I2 = new VPInstruction(1, {});
-  VPInstruction *I3 = new VPInstruction(2, {});
-
-  VPBasicBlock VPBB1;
-  VPBB1.appendRecipe(I1);
-
-  I2->insertBefore(I1);
-  CHECK_ITERATOR(VPBB1, I2, I1);
-
-  I3->insertBefore(I2);
-  CHECK_ITERATOR(VPBB1, I3, I2, I1);
-}
-
-TEST(VPInstructionTest, eraseFromParent) {
-  VPInstruction *I1 = new VPInstruction(0, {});
-  VPInstruction *I2 = new VPInstruction(1, {});
-  VPInstruction *I3 = new VPInstruction(2, {});
-
-  VPBasicBlock VPBB1;
-  VPBB1.appendRecipe(I1);
-  VPBB1.appendRecipe(I2);
-  VPBB1.appendRecipe(I3);
-
-  I2->eraseFromParent();
-  CHECK_ITERATOR(VPBB1, I1, I3);
-
-  I1->eraseFromParent();
-  CHECK_ITERATOR(VPBB1, I3);
-
-  I3->eraseFromParent();
-  EXPECT_TRUE(VPBB1.empty());
-}
-
-TEST(VPInstructionTest, moveAfter) {
-  VPInstruction *I1 = new VPInstruction(0, {});
-  VPInstruction *I2 = new VPInstruction(1, {});
-  VPInstruction *I3 = new VPInstruction(2, {});
-
-  VPBasicBlock VPBB1;
-  VPBB1.appendRecipe(I1);
-  VPBB1.appendRecipe(I2);
-  VPBB1.appendRecipe(I3);
-
-  I1->moveAfter(I2);
-
-  CHECK_ITERATOR(VPBB1, I2, I1, I3);
-
-  VPInstruction *I4 = new VPInstruction(4, {});
-  VPInstruction *I5 = new VPInstruction(5, {});
-  VPBasicBlock VPBB2;
-  VPBB2.appendRecipe(I4);
-  VPBB2.appendRecipe(I5);
-
-  I3->moveAfter(I4);
-
-  CHECK_ITERATOR(VPBB1, I2, I1);
-  CHECK_ITERATOR(VPBB2, I4, I3, I5);
-  EXPECT_EQ(I3->getParent(), I4->getParent());
-}
-
-TEST(VPInstructionTest, moveBefore) {
-  VPInstruction *I1 = new VPInstruction(0, {});
-  VPInstruction *I2 = new VPInstruction(1, {});
-  VPInstruction *I3 = new VPInstruction(2, {});
-
-  VPBasicBlock VPBB1;
-  VPBB1.appendRecipe(I1);
-  VPBB1.appendRecipe(I2);
-  VPBB1.appendRecipe(I3);
-
-  I1->moveBefore(VPBB1, I3->getIterator());
-
-  CHECK_ITERATOR(VPBB1, I2, I1, I3);
-
-  VPInstruction *I4 = new VPInstruction(4, {});
-  VPInstruction *I5 = new VPInstruction(5, {});
-  VPBasicBlock VPBB2;
-  VPBB2.appendRecipe(I4);
-  VPBB2.appendRecipe(I5);
-
-  I3->moveBefore(VPBB2, I4->getIterator());
-
-  CHECK_ITERATOR(VPBB1, I2, I1);
-  CHECK_ITERATOR(VPBB2, I3, I4, I5);
-  EXPECT_EQ(I3->getParent(), I4->getParent());
-
-  VPBasicBlock VPBB3;
-
-  I4->moveBefore(VPBB3, VPBB3.end());
-
-  CHECK_ITERATOR(VPBB1, I2, I1);
-  CHECK_ITERATOR(VPBB2, I3, I5);
-  CHECK_ITERATOR(VPBB3, I4);
-  EXPECT_EQ(&VPBB3, I4->getParent());
-}
-
-TEST(VPInstructionTest, setOperand) {
-  VPValue *VPV1 = new VPValue();
-  VPValue *VPV2 = new VPValue();
-  VPInstruction *I1 = new VPInstruction(0, {VPV1, VPV2});
-  EXPECT_EQ(1u, VPV1->getNumUsers());
-  EXPECT_EQ(I1, *VPV1->user_begin());
-  EXPECT_EQ(1u, VPV2->getNumUsers());
-  EXPECT_EQ(I1, *VPV2->user_begin());
-
-  // Replace operand 0 (VPV1) with VPV3.
-  VPValue *VPV3 = new VPValue();
-  I1->setOperand(0, VPV3);
-  EXPECT_EQ(0u, VPV1->getNumUsers());
-  EXPECT_EQ(1u, VPV2->getNumUsers());
-  EXPECT_EQ(I1, *VPV2->user_begin());
-  EXPECT_EQ(1u, VPV3->getNumUsers());
-  EXPECT_EQ(I1, *VPV3->user_begin());
-
-  // Replace operand 1 (VPV2) with VPV3.
-  I1->setOperand(1, VPV3);
-  EXPECT_EQ(0u, VPV1->getNumUsers());
-  EXPECT_EQ(0u, VPV2->getNumUsers());
-  EXPECT_EQ(2u, VPV3->getNumUsers());
-  EXPECT_EQ(I1, *VPV3->user_begin());
-  EXPECT_EQ(I1, *std::next(VPV3->user_begin()));
-
-  // Replace operand 0 (VPV3) with VPV4.
-  VPValue *VPV4 = new VPValue();
-  I1->setOperand(0, VPV4);
-  EXPECT_EQ(1u, VPV3->getNumUsers());
-  EXPECT_EQ(I1, *VPV3->user_begin());
-  EXPECT_EQ(I1, *VPV4->user_begin());
-
-  // Replace operand 1 (VPV3) with VPV4.
-  I1->setOperand(1, VPV4);
-  EXPECT_EQ(0u, VPV3->getNumUsers());
-  EXPECT_EQ(I1, *VPV4->user_begin());
-  EXPECT_EQ(I1, *std::next(VPV4->user_begin()));
-
-  delete I1;
-  delete VPV1;
-  delete VPV2;
-  delete VPV3;
-  delete VPV4;
-}
-
-TEST(VPInstructionTest, replaceAllUsesWith) {
-  VPValue *VPV1 = new VPValue();
-  VPValue *VPV2 = new VPValue();
-  VPInstruction *I1 = new VPInstruction(0, {VPV1, VPV2});
-
-  // Replace all uses of VPV1 with VPV3.
-  VPValue *VPV3 = new VPValue();
-  VPV1->replaceAllUsesWith(VPV3);
-  EXPECT_EQ(VPV3, I1->getOperand(0));
-  EXPECT_EQ(VPV2, I1->getOperand(1));
-  EXPECT_EQ(0u, VPV1->getNumUsers());
-  EXPECT_EQ(1u, VPV2->getNumUsers());
-  EXPECT_EQ(I1, *VPV2->user_begin());
-  EXPECT_EQ(1u, VPV3->getNumUsers());
-  EXPECT_EQ(I1, *VPV3->user_begin());
-
-  // Replace all uses of VPV2 with VPV3.
-  VPV2->replaceAllUsesWith(VPV3);
-  EXPECT_EQ(VPV3, I1->getOperand(0));
-  EXPECT_EQ(VPV3, I1->getOperand(1));
-  EXPECT_EQ(0u, VPV1->getNumUsers());
-  EXPECT_EQ(0u, VPV2->getNumUsers());
-  EXPECT_EQ(2u, VPV3->getNumUsers());
-  EXPECT_EQ(I1, *VPV3->user_begin());
-
-  // Replace all uses of VPV3 with VPV1.
-  VPV3->replaceAllUsesWith(VPV1);
-  EXPECT_EQ(VPV1, I1->getOperand(0));
-  EXPECT_EQ(VPV1, I1->getOperand(1));
-  EXPECT_EQ(2u, VPV1->getNumUsers());
-  EXPECT_EQ(I1, *VPV1->user_begin());
-  EXPECT_EQ(0u, VPV2->getNumUsers());
-  EXPECT_EQ(0u, VPV3->getNumUsers());
-
-  VPInstruction *I2 = new VPInstruction(0, {VPV1, VPV2});
-  EXPECT_EQ(3u, VPV1->getNumUsers());
-  VPV1->replaceAllUsesWith(VPV3);
-  EXPECT_EQ(3u, VPV3->getNumUsers());
-
-  delete I1;
-  delete I2;
-  delete VPV1;
-  delete VPV2;
-  delete VPV3;
-}
-
-TEST(VPInstructionTest, releaseOperandsAtDeletion) {
-  VPValue *VPV1 = new VPValue();
-  VPValue *VPV2 = new VPValue();
-  VPInstruction *I1 = new VPInstruction(0, {VPV1, VPV2});
-
-  EXPECT_EQ(1u, VPV1->getNumUsers());
-  EXPECT_EQ(I1, *VPV1->user_begin());
-  EXPECT_EQ(1u, VPV2->getNumUsers());
-  EXPECT_EQ(I1, *VPV2->user_begin());
-
-  delete I1;
-
-  EXPECT_EQ(0u, VPV1->getNumUsers());
-  EXPECT_EQ(0u, VPV2->getNumUsers());
-
-  delete VPV1;
-  delete VPV2;
-}
-TEST(VPBasicBlockTest, getPlan) {
-  {
-    VPBasicBlock *VPBB1 = new VPBasicBlock();
-    VPBasicBlock *VPBB2 = new VPBasicBlock();
-    VPBasicBlock *VPBB3 = new VPBasicBlock();
-    VPBasicBlock *VPBB4 = new VPBasicBlock();
-
-    //     VPBB1
-    //     /   \
-    // VPBB2  VPBB3
-    //    \    /
-    //    VPBB4
-    VPBlockUtils::connectBlocks(VPBB1, VPBB2);
-    VPBlockUtils::connectBlocks(VPBB1, VPBB3);
-    VPBlockUtils::connectBlocks(VPBB2, VPBB4);
-    VPBlockUtils::connectBlocks(VPBB3, VPBB4);
-
-    VPlan Plan;
-    Plan.setEntry(VPBB1);
-
-    EXPECT_EQ(&Plan, VPBB1->getPlan());
-    EXPECT_EQ(&Plan, VPBB2->getPlan());
-    EXPECT_EQ(&Plan, VPBB3->getPlan());
-    EXPECT_EQ(&Plan, VPBB4->getPlan());
-  }
-
-  {
-    // Region block is entry into VPlan.
-    VPBasicBlock *R1BB1 = new VPBasicBlock();
-    VPBasicBlock *R1BB2 = new VPBasicBlock();
-    VPRegionBlock *R1 = new VPRegionBlock(R1BB1, R1BB2, "R1");
-    VPBlockUtils::connectBlocks(R1BB1, R1BB2);
-
-    VPlan Plan;
-    Plan.setEntry(R1);
-    EXPECT_EQ(&Plan, R1->getPlan());
-    EXPECT_EQ(&Plan, R1BB1->getPlan());
-    EXPECT_EQ(&Plan, R1BB2->getPlan());
-  }
-
-  {
-    // VPBasicBlock is the entry into the VPlan, followed by a region.
-    VPBasicBlock *R1BB1 = new VPBasicBlock();
-    VPBasicBlock *R1BB2 = new VPBasicBlock();
-    VPRegionBlock *R1 = new VPRegionBlock(R1BB1, R1BB2, "R1");
-    VPBlockUtils::connectBlocks(R1BB1, R1BB2);
-
-    VPBasicBlock *VPBB1 = new VPBasicBlock();
-    VPBlockUtils::connectBlocks(VPBB1, R1);
-
-    VPlan Plan;
-    Plan.setEntry(VPBB1);
-    EXPECT_EQ(&Plan, VPBB1->getPlan());
-    EXPECT_EQ(&Plan, R1->getPlan());
-    EXPECT_EQ(&Plan, R1BB1->getPlan());
-    EXPECT_EQ(&Plan, R1BB2->getPlan());
-  }
-
-  {
-    VPBasicBlock *R1BB1 = new VPBasicBlock();
-    VPBasicBlock *R1BB2 = new VPBasicBlock();
-    VPRegionBlock *R1 = new VPRegionBlock(R1BB1, R1BB2, "R1");
-    VPBlockUtils::connectBlocks(R1BB1, R1BB2);
-
-    VPBasicBlock *R2BB1 = new VPBasicBlock();
-    VPBasicBlock *R2BB2 = new VPBasicBlock();
-    VPRegionBlock *R2 = new VPRegionBlock(R2BB1, R2BB2, "R2");
-    VPBlockUtils::connectBlocks(R2BB1, R2BB2);
-
-    VPBasicBlock *VPBB1 = new VPBasicBlock();
-    VPBlockUtils::connectBlocks(VPBB1, R1);
-    VPBlockUtils::connectBlocks(VPBB1, R2);
-
-    VPBasicBlock *VPBB2 = new VPBasicBlock();
-    VPBlockUtils::connectBlocks(R1, VPBB2);
-    VPBlockUtils::connectBlocks(R2, VPBB2);
-
-    VPlan Plan;
-    Plan.setEntry(VPBB1);
-    EXPECT_EQ(&Plan, VPBB1->getPlan());
-    EXPECT_EQ(&Plan, R1->getPlan());
-    EXPECT_EQ(&Plan, R1BB1->getPlan());
-    EXPECT_EQ(&Plan, R1BB2->getPlan());
-    EXPECT_EQ(&Plan, R2->getPlan());
-    EXPECT_EQ(&Plan, R2BB1->getPlan());
-    EXPECT_EQ(&Plan, R2BB2->getPlan());
-    EXPECT_EQ(&Plan, VPBB2->getPlan());
-  }
-}
-
-TEST(VPBasicBlockTest, TraversingIteratorTest) {
-  {
-    // VPBasicBlocks only
-    //     VPBB1
-    //     /   \
-    // VPBB2  VPBB3
-    //    \    /
-    //    VPBB4
-    //
-    VPBasicBlock *VPBB1 = new VPBasicBlock();
-    VPBasicBlock *VPBB2 = new VPBasicBlock();
-    VPBasicBlock *VPBB3 = new VPBasicBlock();
-    VPBasicBlock *VPBB4 = new VPBasicBlock();
-
-    VPBlockUtils::connectBlocks(VPBB1, VPBB2);
-    VPBlockUtils::connectBlocks(VPBB1, VPBB3);
-    VPBlockUtils::connectBlocks(VPBB2, VPBB4);
-    VPBlockUtils::connectBlocks(VPBB3, VPBB4);
-
-    VPBlockRecursiveTraversalWrapper<const VPBlockBase *> Start(VPBB1);
-    SmallVector<const VPBlockBase *> FromIterator(depth_first(Start));
-    EXPECT_EQ(4u, FromIterator.size());
-    EXPECT_EQ(VPBB1, FromIterator[0]);
-    EXPECT_EQ(VPBB2, FromIterator[1]);
-
-    // Use Plan to properly clean up created blocks.
-    VPlan Plan;
-    Plan.setEntry(VPBB1);
-  }
-
-  {
-    // 2 consecutive regions.
-    // R1 {
-    //     \
-    //     R1BB1
-    //    /     \   |--|
-    //  R1BB2   R1BB3 -|
-    //    \      /
-    //     R1BB4
-    //  }
-    //   |
-    // R2 {
-    //   \
-    //    R2BB1
-    //      |
-    //    R2BB2
-    //
-    VPBasicBlock *R1BB1 = new VPBasicBlock();
-    VPBasicBlock *R1BB2 = new VPBasicBlock();
-    VPBasicBlock *R1BB3 = new VPBasicBlock();
-    VPBasicBlock *R1BB4 = new VPBasicBlock();
-    VPRegionBlock *R1 = new VPRegionBlock(R1BB1, R1BB4, "R1");
-    R1BB2->setParent(R1);
-    R1BB3->setParent(R1);
-    VPBlockUtils::connectBlocks(R1BB1, R1BB2);
-    VPBlockUtils::connectBlocks(R1BB1, R1BB3);
-    VPBlockUtils::connectBlocks(R1BB2, R1BB4);
-    VPBlockUtils::connectBlocks(R1BB3, R1BB4);
-    // Cycle.
-    VPBlockUtils::connectBlocks(R1BB3, R1BB3);
-
-    VPBasicBlock *R2BB1 = new VPBasicBlock();
-    VPBasicBlock *R2BB2 = new VPBasicBlock();
-    VPRegionBlock *R2 = new VPRegionBlock(R2BB1, R2BB2, "R2");
-    VPBlockUtils::connectBlocks(R2BB1, R2BB2);
-    VPBlockUtils::connectBlocks(R1, R2);
-
-    // Depth-first.
-    VPBlockRecursiveTraversalWrapper<VPBlockBase *> Start(R1);
-    SmallVector<const VPBlockBase *> FromIterator(df_begin(Start),
-                                                  df_end(Start));
-    EXPECT_EQ(8u, FromIterator.size());
-    EXPECT_EQ(R1, FromIterator[0]);
-    EXPECT_EQ(R1BB1, FromIterator[1]);
-    EXPECT_EQ(R1BB2, FromIterator[2]);
-    EXPECT_EQ(R1BB4, FromIterator[3]);
-    EXPECT_EQ(R2, FromIterator[4]);
-    EXPECT_EQ(R2BB1, FromIterator[5]);
-    EXPECT_EQ(R2BB2, FromIterator[6]);
-    EXPECT_EQ(R1BB3, FromIterator[7]);
-
-    // const VPBasicBlocks only.
-    FromIterator.clear();
-    copy(VPBlockUtils::blocksOnly<const VPBasicBlock>(depth_first(Start)),
-         std::back_inserter(FromIterator));
-    EXPECT_EQ(6u, FromIterator.size());
-    EXPECT_EQ(R1BB1, FromIterator[0]);
-    EXPECT_EQ(R1BB2, FromIterator[1]);
-    EXPECT_EQ(R1BB4, FromIterator[2]);
-    EXPECT_EQ(R2BB1, FromIterator[3]);
-    EXPECT_EQ(R2BB2, FromIterator[4]);
-    EXPECT_EQ(R1BB3, FromIterator[5]);
-
-    // VPRegionBlocks only.
-    SmallVector<VPRegionBlock *> FromIteratorVPRegion(
-        VPBlockUtils::blocksOnly<VPRegionBlock>(depth_first(Start)));
-    EXPECT_EQ(2u, FromIteratorVPRegion.size());
-    EXPECT_EQ(R1, FromIteratorVPRegion[0]);
-    EXPECT_EQ(R2, FromIteratorVPRegion[1]);
-
-    // Post-order.
-    FromIterator.clear();
-    copy(post_order(Start), std::back_inserter(FromIterator));
-    EXPECT_EQ(8u, FromIterator.size());
-    EXPECT_EQ(R2BB2, FromIterator[0]);
-    EXPECT_EQ(R2BB1, FromIterator[1]);
-    EXPECT_EQ(R2, FromIterator[2]);
-    EXPECT_EQ(R1BB4, FromIterator[3]);
-    EXPECT_EQ(R1BB2, FromIterator[4]);
-    EXPECT_EQ(R1BB3, FromIterator[5]);
-    EXPECT_EQ(R1BB1, FromIterator[6]);
-    EXPECT_EQ(R1, FromIterator[7]);
-
-    // Use Plan to properly clean up created blocks.
-    VPlan Plan;
-    Plan.setEntry(R1);
-  }
-
-  {
-    // 2 nested regions.
-    //  VPBB1
-    //    |
-    //  R1 {
-    //         R1BB1
-    //       /        \
-    //   R2 {          |
-    //     \           |
-    //     R2BB1       |
-    //       |   \    R1BB2
-    //     R2BB2-|     |
-    //        \        |
-    //         R2BB3   |
-    //   }            /
-    //      \        /
-    //        R1BB3
-    //  }
-    //   |
-    //  VPBB2
-    //
-    VPBasicBlock *R1BB1 = new VPBasicBlock("R1BB1");
-    VPBasicBlock *R1BB2 = new VPBasicBlock("R1BB2");
-    VPBasicBlock *R1BB3 = new VPBasicBlock("R1BB3");
-    VPRegionBlock *R1 = new VPRegionBlock(R1BB1, R1BB3, "R1");
-
-    VPBasicBlock *R2BB1 = new VPBasicBlock("R2BB1");
-    VPBasicBlock *R2BB2 = new VPBasicBlock("R2BB2");
-    VPBasicBlock *R2BB3 = new VPBasicBlock("R2BB3");
-    VPRegionBlock *R2 = new VPRegionBlock(R2BB1, R2BB3, "R2");
-    R2BB2->setParent(R2);
-    VPBlockUtils::connectBlocks(R2BB1, R2BB2);
-    VPBlockUtils::connectBlocks(R2BB2, R2BB1);
-    VPBlockUtils::connectBlocks(R2BB2, R2BB3);
-
-    R2->setParent(R1);
-    VPBlockUtils::connectBlocks(R1BB1, R2);
-    R1BB2->setParent(R1);
-    VPBlockUtils::connectBlocks(R1BB1, R1BB2);
-    VPBlockUtils::connectBlocks(R1BB2, R1BB3);
-    VPBlockUtils::connectBlocks(R2, R1BB3);
-
-    VPBasicBlock *VPBB1 = new VPBasicBlock("VPBB1");
-    VPBlockUtils::connectBlocks(VPBB1, R1);
-    VPBasicBlock *VPBB2 = new VPBasicBlock("VPBB2");
-    VPBlockUtils::connectBlocks(R1, VPBB2);
-
-    // Depth-first.
-    VPBlockRecursiveTraversalWrapper<VPBlockBase *> Start(VPBB1);
-    SmallVector<VPBlockBase *> FromIterator(depth_first(Start));
-    EXPECT_EQ(10u, FromIterator.size());
-    EXPECT_EQ(VPBB1, FromIterator[0]);
-    EXPECT_EQ(R1, FromIterator[1]);
-    EXPECT_EQ(R1BB1, FromIterator[2]);
-    EXPECT_EQ(R2, FromIterator[3]);
-    EXPECT_EQ(R2BB1, FromIterator[4]);
-    EXPECT_EQ(R2BB2, FromIterator[5]);
-    EXPECT_EQ(R2BB3, FromIterator[6]);
-    EXPECT_EQ(R1BB3, FromIterator[7]);
-    EXPECT_EQ(VPBB2, FromIterator[8]);
-    EXPECT_EQ(R1BB2, FromIterator[9]);
-
-    // Post-order.
-    FromIterator.clear();
-    FromIterator.append(po_begin(Start), po_end(Start));
-    EXPECT_EQ(10u, FromIterator.size());
-    EXPECT_EQ(VPBB2, FromIterator[0]);
-    EXPECT_EQ(R1BB3, FromIterator[1]);
-    EXPECT_EQ(R2BB3, FromIterator[2]);
-    EXPECT_EQ(R2BB2, FromIterator[3]);
-    EXPECT_EQ(R2BB1, FromIterator[4]);
-    EXPECT_EQ(R2, FromIterator[5]);
-    EXPECT_EQ(R1BB2, FromIterator[6]);
-    EXPECT_EQ(R1BB1, FromIterator[7]);
-    EXPECT_EQ(R1, FromIterator[8]);
-    EXPECT_EQ(VPBB1, FromIterator[9]);
-
-    // Use Plan to properly clean up created blocks.
-    VPlan Plan;
-    Plan.setEntry(VPBB1);
-  }
-
-  {
-    //  VPBB1
-    //    |
-    //  R1 {
-    //    \
-    //     R2 {
-    //      R2BB1
-    //        |
-    //      R2BB2
-    //   }
-    //
-    VPBasicBlock *R2BB1 = new VPBasicBlock("R2BB1");
-    VPBasicBlock *R2BB2 = new VPBasicBlock("R2BB2");
-    VPRegionBlock *R2 = new VPRegionBlock(R2BB1, R2BB2, "R2");
-    VPBlockUtils::connectBlocks(R2BB1, R2BB2);
-
-    VPRegionBlock *R1 = new VPRegionBlock(R2, R2, "R1");
-    R2->setParent(R1);
-
-    VPBasicBlock *VPBB1 = new VPBasicBlock("VPBB1");
-    VPBlockUtils::connectBlocks(VPBB1, R1);
-
-    // Depth-first.
-    VPBlockRecursiveTraversalWrapper<VPBlockBase *> Start(VPBB1);
-    SmallVector<VPBlockBase *> FromIterator(depth_first(Start));
-    EXPECT_EQ(5u, FromIterator.size());
-    EXPECT_EQ(VPBB1, FromIterator[0]);
-    EXPECT_EQ(R1, FromIterator[1]);
-    EXPECT_EQ(R2, FromIterator[2]);
-    EXPECT_EQ(R2BB1, FromIterator[3]);
-    EXPECT_EQ(R2BB2, FromIterator[4]);
-
-    // Post-order.
-    FromIterator.clear();
-    FromIterator.append(po_begin(Start), po_end(Start));
-    EXPECT_EQ(5u, FromIterator.size());
-    EXPECT_EQ(R2BB2, FromIterator[0]);
-    EXPECT_EQ(R2BB1, FromIterator[1]);
-    EXPECT_EQ(R2, FromIterator[2]);
-    EXPECT_EQ(R1, FromIterator[3]);
-    EXPECT_EQ(VPBB1, FromIterator[4]);
-
-    // Use Plan to properly clean up created blocks.
-    VPlan Plan;
-    Plan.setEntry(VPBB1);
-  }
-
-  {
-    //  Nested regions with both R3 and R2 being exit nodes without successors.
-    //  The successors of R1 should be used.
-    //
-    //  VPBB1
-    //    |
-    //  R1 {
-    //    \
-    //     R2 {
-    //      \
-    //      R2BB1
-    //        |
-    //       R3 {
-    //          R3BB1
-    //      }
-    //   }
-    //   |
-    //  VPBB2
-    //
-    VPBasicBlock *R3BB1 = new VPBasicBlock("R3BB1");
-    VPRegionBlock *R3 = new VPRegionBlock(R3BB1, R3BB1, "R3");
-
-    VPBasicBlock *R2BB1 = new VPBasicBlock("R2BB1");
-    VPRegionBlock *R2 = new VPRegionBlock(R2BB1, R3, "R2");
-    R3->setParent(R2);
-    VPBlockUtils::connectBlocks(R2BB1, R3);
-
-    VPRegionBlock *R1 = new VPRegionBlock(R2, R2, "R1");
-    R2->setParent(R1);
-
-    VPBasicBlock *VPBB1 = new VPBasicBlock("VPBB1");
-    VPBasicBlock *VPBB2 = new VPBasicBlock("VPBB2");
-    VPBlockUtils::connectBlocks(VPBB1, R1);
-    VPBlockUtils::connectBlocks(R1, VPBB2);
-
-    // Depth-first.
-    VPBlockRecursiveTraversalWrapper<VPBlockBase *> Start(VPBB1);
-    SmallVector<VPBlockBase *> FromIterator(depth_first(Start));
-    EXPECT_EQ(7u, FromIterator.size());
-    EXPECT_EQ(VPBB1, FromIterator[0]);
-    EXPECT_EQ(R1, FromIterator[1]);
-    EXPECT_EQ(R2, FromIterator[2]);
-    EXPECT_EQ(R2BB1, FromIterator[3]);
-    EXPECT_EQ(R3, FromIterator[4]);
-    EXPECT_EQ(R3BB1, FromIterator[5]);
-    EXPECT_EQ(VPBB2, FromIterator[6]);
-
-    SmallVector<VPBlockBase *> FromIteratorVPBB;
-    copy(VPBlockUtils::blocksOnly<VPBasicBlock>(depth_first(Start)),
-         std::back_inserter(FromIteratorVPBB));
-    EXPECT_EQ(VPBB1, FromIteratorVPBB[0]);
-    EXPECT_EQ(R2BB1, FromIteratorVPBB[1]);
-    EXPECT_EQ(R3BB1, FromIteratorVPBB[2]);
-    EXPECT_EQ(VPBB2, FromIteratorVPBB[3]);
-
-    // Post-order.
-    FromIterator.clear();
-    copy(post_order(Start), std::back_inserter(FromIterator));
-    EXPECT_EQ(7u, FromIterator.size());
-    EXPECT_EQ(VPBB2, FromIterator[0]);
-    EXPECT_EQ(R3BB1, FromIterator[1]);
-    EXPECT_EQ(R3, FromIterator[2]);
-    EXPECT_EQ(R2BB1, FromIterator[3]);
-    EXPECT_EQ(R2, FromIterator[4]);
-    EXPECT_EQ(R1, FromIterator[5]);
-    EXPECT_EQ(VPBB1, FromIterator[6]);
-
-    // Post-order, const VPRegionBlocks only.
-    VPBlockRecursiveTraversalWrapper<const VPBlockBase *> StartConst(VPBB1);
-    SmallVector<const VPRegionBlock *> FromIteratorVPRegion(
-        VPBlockUtils::blocksOnly<const VPRegionBlock>(post_order(StartConst)));
-    EXPECT_EQ(3u, FromIteratorVPRegion.size());
-    EXPECT_EQ(R3, FromIteratorVPRegion[0]);
-    EXPECT_EQ(R2, FromIteratorVPRegion[1]);
-    EXPECT_EQ(R1, FromIteratorVPRegion[2]);
-
-    // Post-order, VPBasicBlocks only.
-    FromIterator.clear();
-    copy(VPBlockUtils::blocksOnly<VPBasicBlock>(post_order(Start)),
-         std::back_inserter(FromIterator));
-    EXPECT_EQ(FromIterator.size(), 4u);
-    EXPECT_EQ(VPBB2, FromIterator[0]);
-    EXPECT_EQ(R3BB1, FromIterator[1]);
-    EXPECT_EQ(R2BB1, FromIterator[2]);
-    EXPECT_EQ(VPBB1, FromIterator[3]);
-
-    // Use Plan to properly clean up created blocks.
-    VPlan Plan;
-    Plan.setEntry(VPBB1);
-  }
-}
-
-#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
-TEST(VPBasicBlockTest, print) {
-  VPInstruction *I1 = new VPInstruction(Instruction::Add, {});
-  VPInstruction *I2 = new VPInstruction(Instruction::Sub, {I1});
-  VPInstruction *I3 = new VPInstruction(Instruction::Br, {I1, I2});
-
-  VPBasicBlock *VPBB1 = new VPBasicBlock();
-  VPBB1->appendRecipe(I1);
-  VPBB1->appendRecipe(I2);
-  VPBB1->appendRecipe(I3);
-  VPBB1->setName("bb1");
-
-  VPInstruction *I4 = new VPInstruction(Instruction::Mul, {I2, I1});
-  VPInstruction *I5 = new VPInstruction(Instruction::Ret, {I4});
-  VPBasicBlock *VPBB2 = new VPBasicBlock();
-  VPBB2->appendRecipe(I4);
-  VPBB2->appendRecipe(I5);
-  VPBB2->setName("bb2");
-
-  VPBlockUtils::connectBlocks(VPBB1, VPBB2);
-
-  // Check printing an instruction without associated VPlan.
-  {
-    std::string I3Dump;
-    raw_string_ostream OS(I3Dump);
-    VPSlotTracker SlotTracker;
-    I3->print(OS, "", SlotTracker);
-    OS.flush();
-    EXPECT_EQ("EMIT br <badref> <badref>", I3Dump);
-  }
-
-  VPlan Plan;
-  Plan.setEntry(VPBB1);
-  std::string FullDump;
-  raw_string_ostream OS(FullDump);
-  Plan.printDOT(OS);
-
-  const char *ExpectedStr = R"(digraph VPlan {
-graph [labelloc=t, fontsize=30; label="Vectorization Plan"]
-node [shape=rect, fontname=Courier, fontsize=30]
-edge [fontname=Courier, fontsize=30]
-compound=true
-  N0 [label =
-    "bb1:\l" +
-    "  EMIT vp\<%0\> = add\l" +
-    "  EMIT vp\<%1\> = sub vp\<%0\>\l" +
-    "  EMIT br vp\<%0\> vp\<%1\>\l" +
-    "Successor(s): bb2\l"
-  ]
-  N0 -> N1 [ label=""]
-  N1 [label =
-    "bb2:\l" +
-    "  EMIT vp\<%3\> = mul vp\<%1\> vp\<%0\>\l" +
-    "  EMIT ret vp\<%3\>\l" +
-    "No successors\l"
-  ]
-}
-)";
-  EXPECT_EQ(ExpectedStr, FullDump);
-
-  const char *ExpectedBlock1Str = R"(bb1:
-  EMIT vp<%0> = add
-  EMIT vp<%1> = sub vp<%0>
-  EMIT br vp<%0> vp<%1>
-Successor(s): bb2
-)";
-  std::string Block1Dump;
-  raw_string_ostream OS1(Block1Dump);
-  VPBB1->print(OS1);
-  EXPECT_EQ(ExpectedBlock1Str, Block1Dump);
-
-  // Ensure that numbering is good when dumping the second block in isolation.
-  const char *ExpectedBlock2Str = R"(bb2:
-  EMIT vp<%3> = mul vp<%1> vp<%0>
-  EMIT ret vp<%3>
-No successors
-)";
-  std::string Block2Dump;
-  raw_string_ostream OS2(Block2Dump);
-  VPBB2->print(OS2);
-  EXPECT_EQ(ExpectedBlock2Str, Block2Dump);
-
-  {
-    std::string I3Dump;
-    raw_string_ostream OS(I3Dump);
-    VPSlotTracker SlotTracker(&Plan);
-    I3->print(OS, "", SlotTracker);
-    OS.flush();
-    EXPECT_EQ("EMIT br vp<%0> vp<%1>", I3Dump);
-  }
-
-  {
-    std::string I4Dump;
-    raw_string_ostream OS(I4Dump);
-    OS << *I4;
-    OS.flush();
-    EXPECT_EQ("EMIT vp<%3> = mul vp<%1> vp<%0>", I4Dump);
-  }
-}
-#endif
-
-TEST(VPRecipeTest, CastVPInstructionToVPUser) {
-  VPValue Op1;
-  VPValue Op2;
-  VPInstruction Recipe(Instruction::Add, {&Op1, &Op2});
-  EXPECT_TRUE(isa<VPUser>(&Recipe));
-  VPRecipeBase *BaseR = &Recipe;
-  EXPECT_TRUE(isa<VPUser>(BaseR));
-  EXPECT_EQ(&Recipe, BaseR);
-}
-
-TEST(VPRecipeTest, CastVPWidenRecipeToVPUser) {
-  LLVMContext C;
-
-  IntegerType *Int32 = IntegerType::get(C, 32);
-  auto *AI =
-      BinaryOperator::CreateAdd(UndefValue::get(Int32), UndefValue::get(Int32));
-  VPValue Op1;
-  VPValue Op2;
-  SmallVector<VPValue *, 2> Args;
-  Args.push_back(&Op1);
-  Args.push_back(&Op1);
-  VPWidenRecipe WidenR(*AI, make_range(Args.begin(), Args.end()));
-  EXPECT_TRUE(isa<VPUser>(&WidenR));
-  VPRecipeBase *WidenRBase = &WidenR;
-  EXPECT_TRUE(isa<VPUser>(WidenRBase));
-  EXPECT_EQ(&WidenR, WidenRBase);
-  delete AI;
-}
-
-TEST(VPRecipeTest, CastVPWidenCallRecipeToVPUserAndVPDef) {
-  LLVMContext C;
-
-  IntegerType *Int32 = IntegerType::get(C, 32);
-  FunctionType *FTy = FunctionType::get(Int32, false);
-  auto *Call = CallInst::Create(FTy, UndefValue::get(FTy));
-  VPValue Op1;
-  VPValue Op2;
-  SmallVector<VPValue *, 2> Args;
-  Args.push_back(&Op1);
-  Args.push_back(&Op2);
-  VPWidenCallRecipe Recipe(*Call, make_range(Args.begin(), Args.end()));
-  EXPECT_TRUE(isa<VPUser>(&Recipe));
-  VPRecipeBase *BaseR = &Recipe;
-  EXPECT_TRUE(isa<VPUser>(BaseR));
-  EXPECT_EQ(&Recipe, BaseR);
-
-  VPValue *VPV = &Recipe;
-  EXPECT_TRUE(isa<VPRecipeBase>(VPV->getDef()));
-  EXPECT_EQ(&Recipe, dyn_cast<VPRecipeBase>(VPV->getDef()));
-
-  delete Call;
-}
-
-TEST(VPRecipeTest, CastVPWidenSelectRecipeToVPUserAndVPDef) {
-  LLVMContext C;
-
-  IntegerType *Int1 = IntegerType::get(C, 1);
-  IntegerType *Int32 = IntegerType::get(C, 32);
-  auto *SelectI = SelectInst::Create(
-      UndefValue::get(Int1), UndefValue::get(Int32), UndefValue::get(Int32));
-  VPValue Op1;
-  VPValue Op2;
-  VPValue Op3;
-  SmallVector<VPValue *, 4> Args;
-  Args.push_back(&Op1);
-  Args.push_back(&Op2);
-  Args.push_back(&Op3);
-  VPWidenSelectRecipe WidenSelectR(*SelectI,
-                                   make_range(Args.begin(), Args.end()), false);
-  EXPECT_TRUE(isa<VPUser>(&WidenSelectR));
-  VPRecipeBase *BaseR = &WidenSelectR;
-  EXPECT_TRUE(isa<VPUser>(BaseR));
-  EXPECT_EQ(&WidenSelectR, BaseR);
-
-  VPValue *VPV = &WidenSelectR;
-  EXPECT_TRUE(isa<VPRecipeBase>(VPV->getDef()));
-  EXPECT_EQ(&WidenSelectR, dyn_cast<VPRecipeBase>(VPV->getDef()));
-
-  delete SelectI;
-}
-
-TEST(VPRecipeTest, CastVPWidenGEPRecipeToVPUserAndVPDef) {
-  LLVMContext C;
-
-  IntegerType *Int32 = IntegerType::get(C, 32);
-  PointerType *Int32Ptr = PointerType::get(Int32, 0);
-  auto *GEP = GetElementPtrInst::Create(Int32, UndefValue::get(Int32Ptr),
-                                        UndefValue::get(Int32));
-  VPValue Op1;
-  VPValue Op2;
-  SmallVector<VPValue *, 4> Args;
-  Args.push_back(&Op1);
-  Args.push_back(&Op2);
-  VPWidenGEPRecipe Recipe(GEP, make_range(Args.begin(), Args.end()));
-  EXPECT_TRUE(isa<VPUser>(&Recipe));
-  VPRecipeBase *BaseR = &Recipe;
-  EXPECT_TRUE(isa<VPUser>(BaseR));
-  EXPECT_EQ(&Recipe, BaseR);
-
-  VPValue *VPV = &Recipe;
-  EXPECT_TRUE(isa<VPRecipeBase>(VPV->getDef()));
-  EXPECT_EQ(&Recipe, dyn_cast<VPRecipeBase>(VPV->getDef()));
-
-  delete GEP;
-}
-
-TEST(VPRecipeTest, CastVPBlendRecipeToVPUser) {
-  LLVMContext C;
-
-  IntegerType *Int32 = IntegerType::get(C, 32);
-  auto *Phi = PHINode::Create(Int32, 1);
-  VPValue Op1;
-  VPValue Op2;
-  SmallVector<VPValue *, 4> Args;
-  Args.push_back(&Op1);
-  Args.push_back(&Op2);
-  VPBlendRecipe Recipe(Phi, Args);
-  EXPECT_TRUE(isa<VPUser>(&Recipe));
-  VPRecipeBase *BaseR = &Recipe;
-  EXPECT_TRUE(isa<VPUser>(BaseR));
-  delete Phi;
-}
-
-TEST(VPRecipeTest, CastVPInterleaveRecipeToVPUser) {
-  LLVMContext C;
-
-  VPValue Addr;
-  VPValue Mask;
-  InterleaveGroup<Instruction> IG(4, false, Align(4));
-  VPInterleaveRecipe Recipe(&IG, &Addr, {}, &Mask);
-  EXPECT_TRUE(isa<VPUser>(&Recipe));
-  VPRecipeBase *BaseR = &Recipe;
-  EXPECT_TRUE(isa<VPUser>(BaseR));
-  EXPECT_EQ(&Recipe, BaseR);
-}
-
-TEST(VPRecipeTest, CastVPReplicateRecipeToVPUser) {
-  LLVMContext C;
-
-  VPValue Op1;
-  VPValue Op2;
-  SmallVector<VPValue *, 4> Args;
-  Args.push_back(&Op1);
-  Args.push_back(&Op2);
-
-  VPReplicateRecipe Recipe(nullptr, make_range(Args.begin(), Args.end()), true,
-                           false);
-  EXPECT_TRUE(isa<VPUser>(&Recipe));
-  VPRecipeBase *BaseR = &Recipe;
-  EXPECT_TRUE(isa<VPUser>(BaseR));
-}
-
-TEST(VPRecipeTest, CastVPBranchOnMaskRecipeToVPUser) {
-  LLVMContext C;
-
-  VPValue Mask;
-  VPBranchOnMaskRecipe Recipe(&Mask);
-  EXPECT_TRUE(isa<VPUser>(&Recipe));
-  VPRecipeBase *BaseR = &Recipe;
-  EXPECT_TRUE(isa<VPUser>(BaseR));
-  EXPECT_EQ(&Recipe, BaseR);
-}
-
-TEST(VPRecipeTest, CastVPWidenMemoryInstructionRecipeToVPUserAndVPDef) {
-  LLVMContext C;
-
-  IntegerType *Int32 = IntegerType::get(C, 32);
-  PointerType *Int32Ptr = PointerType::get(Int32, 0);
-  auto *Load =
-      new LoadInst(Int32, UndefValue::get(Int32Ptr), "", false, Align(1));
-  VPValue Addr;
-  VPValue Mask;
-  VPWidenMemoryInstructionRecipe Recipe(*Load, &Addr, &Mask);
-  EXPECT_TRUE(isa<VPUser>(&Recipe));
-  VPRecipeBase *BaseR = &Recipe;
-  EXPECT_TRUE(isa<VPUser>(BaseR));
-  EXPECT_EQ(&Recipe, BaseR);
-
-  VPValue *VPV = Recipe.getVPSingleValue();
-  EXPECT_TRUE(isa<VPRecipeBase>(VPV->getDef()));
-  EXPECT_EQ(&Recipe, dyn_cast<VPRecipeBase>(VPV->getDef()));
-
-  delete Load;
-}
-
-TEST(VPRecipeTest, MayHaveSideEffectsAndMayReadWriteMemory) {
-  LLVMContext C;
-  IntegerType *Int1 = IntegerType::get(C, 1);
-  IntegerType *Int32 = IntegerType::get(C, 32);
-  PointerType *Int32Ptr = PointerType::get(Int32, 0);
-
-  {
-    auto *AI = BinaryOperator::CreateAdd(UndefValue::get(Int32),
-                                         UndefValue::get(Int32));
-    VPValue Op1;
-    VPValue Op2;
-    SmallVector<VPValue *, 2> Args;
-    Args.push_back(&Op1);
-    Args.push_back(&Op1);
-    VPWidenRecipe Recipe(*AI, make_range(Args.begin(), Args.end()));
-    EXPECT_FALSE(Recipe.mayHaveSideEffects());
-    EXPECT_FALSE(Recipe.mayReadFromMemory());
-    EXPECT_FALSE(Recipe.mayWriteToMemory());
-    EXPECT_FALSE(Recipe.mayReadOrWriteMemory());
-    delete AI;
-  }
-
-  {
-    auto *SelectI = SelectInst::Create(
-        UndefValue::get(Int1), UndefValue::get(Int32), UndefValue::get(Int32));
-    VPValue Op1;
-    VPValue Op2;
-    VPValue Op3;
-    SmallVector<VPValue *, 4> Args;
-    Args.push_back(&Op1);
-    Args.push_back(&Op2);
-    Args.push_back(&Op3);
-    VPWidenSelectRecipe Recipe(*SelectI, make_range(Args.begin(), Args.end()),
-                               false);
-    EXPECT_FALSE(Recipe.mayHaveSideEffects());
-    EXPECT_FALSE(Recipe.mayReadFromMemory());
-    EXPECT_FALSE(Recipe.mayWriteToMemory());
-    EXPECT_FALSE(Recipe.mayReadOrWriteMemory());
-    delete SelectI;
-  }
-
-  {
-    auto *GEP = GetElementPtrInst::Create(Int32, UndefValue::get(Int32Ptr),
-                                          UndefValue::get(Int32));
-    VPValue Op1;
-    VPValue Op2;
-    SmallVector<VPValue *, 4> Args;
-    Args.push_back(&Op1);
-    Args.push_back(&Op2);
-    VPWidenGEPRecipe Recipe(GEP, make_range(Args.begin(), Args.end()));
-    EXPECT_FALSE(Recipe.mayHaveSideEffects());
-    EXPECT_FALSE(Recipe.mayReadFromMemory());
-    EXPECT_FALSE(Recipe.mayWriteToMemory());
-    EXPECT_FALSE(Recipe.mayReadOrWriteMemory());
-    delete GEP;
-  }
-
-  {
-    VPValue Mask;
-    VPBranchOnMaskRecipe Recipe(&Mask);
-    EXPECT_FALSE(Recipe.mayHaveSideEffects());
-    EXPECT_FALSE(Recipe.mayReadFromMemory());
-    EXPECT_FALSE(Recipe.mayWriteToMemory());
-    EXPECT_FALSE(Recipe.mayReadOrWriteMemory());
-  }
-
-  {
-    VPValue ChainOp;
-    VPValue VecOp;
-    VPValue CondOp;
-    VPReductionRecipe Recipe(nullptr, nullptr, &ChainOp, &CondOp, &VecOp,
-                             nullptr);
-    EXPECT_FALSE(Recipe.mayHaveSideEffects());
-    EXPECT_FALSE(Recipe.mayReadFromMemory());
-    EXPECT_FALSE(Recipe.mayWriteToMemory());
-    EXPECT_FALSE(Recipe.mayReadOrWriteMemory());
-  }
-
-  {
-    auto *Load =
-        new LoadInst(Int32, UndefValue::get(Int32Ptr), "", false, Align(1));
-    VPValue Addr;
-    VPValue Mask;
-    VPWidenMemoryInstructionRecipe Recipe(*Load, &Addr, &Mask);
-    EXPECT_TRUE(Recipe.mayHaveSideEffects());
-    EXPECT_TRUE(Recipe.mayReadFromMemory());
-    EXPECT_FALSE(Recipe.mayWriteToMemory());
-    EXPECT_TRUE(Recipe.mayReadOrWriteMemory());
-    delete Load;
-  }
-
-  {
-    auto *Store = new StoreInst(UndefValue::get(Int32),
-                                UndefValue::get(Int32Ptr), false, Align(1));
-    VPValue Addr;
-    VPValue Mask;
-    VPValue StoredV;
-    VPWidenMemoryInstructionRecipe Recipe(*Store, &Addr, &StoredV, &Mask);
-    EXPECT_TRUE(Recipe.mayHaveSideEffects());
-    EXPECT_FALSE(Recipe.mayReadFromMemory());
-    EXPECT_TRUE(Recipe.mayWriteToMemory());
-    EXPECT_TRUE(Recipe.mayReadOrWriteMemory());
-    delete Store;
-  }
-
-  {
-    FunctionType *FTy = FunctionType::get(Int32, false);
-    auto *Call = CallInst::Create(FTy, UndefValue::get(FTy));
-    VPValue Op1;
-    VPValue Op2;
-    SmallVector<VPValue *, 2> Args;
-    Args.push_back(&Op1);
-    Args.push_back(&Op2);
-    VPWidenCallRecipe Recipe(*Call, make_range(Args.begin(), Args.end()));
-    EXPECT_TRUE(Recipe.mayHaveSideEffects());
-    EXPECT_TRUE(Recipe.mayReadFromMemory());
-    EXPECT_TRUE(Recipe.mayWriteToMemory());
-    EXPECT_TRUE(Recipe.mayReadOrWriteMemory());
-    delete Call;
-  }
-
-  // The initial implementation is conservative with respect to VPInstructions.
-  {
-    VPValue Op1;
-    VPValue Op2;
-    VPInstruction VPInst(Instruction::Add, {&Op1, &Op2});
-    VPRecipeBase &Recipe = VPInst;
-    EXPECT_TRUE(Recipe.mayHaveSideEffects());
-    EXPECT_TRUE(Recipe.mayReadFromMemory());
-    EXPECT_TRUE(Recipe.mayWriteToMemory());
-    EXPECT_TRUE(Recipe.mayReadOrWriteMemory());
-  }
-}
-
-#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
-TEST(VPRecipeTest, dump) {
-  VPlan Plan;
-  VPBasicBlock *VPBB1 = new VPBasicBlock();
-  Plan.setEntry(VPBB1);
-
-  LLVMContext C;
-
-  IntegerType *Int32 = IntegerType::get(C, 32);
-  auto *AI =
-      BinaryOperator::CreateAdd(UndefValue::get(Int32), UndefValue::get(Int32));
-  AI->setName("a");
-  SmallVector<VPValue *, 2> Args;
-  VPValue *ExtVPV1 = new VPValue();
-  VPValue *ExtVPV2 = new VPValue();
-  Plan.addExternalDef(ExtVPV1);
-  Plan.addExternalDef(ExtVPV2);
-  Args.push_back(ExtVPV1);
-  Args.push_back(ExtVPV2);
-  VPWidenRecipe *WidenR =
-      new VPWidenRecipe(*AI, make_range(Args.begin(), Args.end()));
-  VPBB1->appendRecipe(WidenR);
-
-  {
-    // Use EXPECT_EXIT to capture stderr and compare against expected output.
-    //
-    // Test VPValue::dump().
-    VPValue *VPV = WidenR;
-    EXPECT_EXIT(
-        {
-          VPV->dump();
-          exit(0);
-        },
-        testing::ExitedWithCode(0), "WIDEN ir<%a> = add vp<%0>, vp<%1>");
-
-    // Test VPRecipeBase::dump().
-    VPRecipeBase *R = WidenR;
-    EXPECT_EXIT(
-        {
-          R->dump();
-          exit(0);
-        },
-        testing::ExitedWithCode(0), "WIDEN ir<%a> = add vp<%0>, vp<%1>");
-
-    // Test VPDef::dump().
-    VPDef *D = WidenR;
-    EXPECT_EXIT(
-        {
-          D->dump();
-          exit(0);
-        },
-        testing::ExitedWithCode(0), "WIDEN ir<%a> = add vp<%0>, vp<%1>");
-  }
-
-  delete AI;
-}
-#endif
-
-TEST(VPRecipeTest, CastVPReductionRecipeToVPUser) {
-  LLVMContext C;
-
-  VPValue ChainOp;
-  VPValue VecOp;
-  VPValue CondOp;
-  VPReductionRecipe Recipe(nullptr, nullptr, &ChainOp, &CondOp, &VecOp,
-                           nullptr);
-  EXPECT_TRUE(isa<VPUser>(&Recipe));
-  VPRecipeBase *BaseR = &Recipe;
-  EXPECT_TRUE(isa<VPUser>(BaseR));
-}
-
-struct VPDoubleValueDef : public VPRecipeBase {
-  VPDoubleValueDef(ArrayRef<VPValue *> Operands) : VPRecipeBase(99, Operands) {
-    new VPValue(nullptr, this);
-    new VPValue(nullptr, this);
-  }
-
-  void execute(struct VPTransformState &State) override{};
-#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
-  void print(raw_ostream &O, const Twine &Indent,
-             VPSlotTracker &SlotTracker) const override {}
-#endif
-};
-
-TEST(VPDoubleValueDefTest, traverseUseLists) {
-  // Check that the def-use chains of a multi-def can be traversed in both
-  // directions.
-
-  // Create a new VPDef which defines 2 values and has 2 operands.
-  VPInstruction Op0(20, {});
-  VPInstruction Op1(30, {});
-  VPDoubleValueDef DoubleValueDef({&Op0, &Op1});
-
-  // Create a new users of the defined values.
-  VPInstruction I1(
-      1, {DoubleValueDef.getVPValue(0), DoubleValueDef.getVPValue(1)});
-  VPInstruction I2(2, {DoubleValueDef.getVPValue(0)});
-  VPInstruction I3(3, {DoubleValueDef.getVPValue(1)});
-
-  // Check operands of the VPDef (traversing upwards).
-  SmallVector<VPValue *, 4> DoubleOperands(DoubleValueDef.op_begin(),
-                                           DoubleValueDef.op_end());
-  EXPECT_EQ(2u, DoubleOperands.size());
-  EXPECT_EQ(&Op0, DoubleOperands[0]);
-  EXPECT_EQ(&Op1, DoubleOperands[1]);
-
-  // Check users of the defined values (traversing downwards).
-  SmallVector<VPUser *, 4> DoubleValueDefV0Users(
-      DoubleValueDef.getVPValue(0)->user_begin(),
-      DoubleValueDef.getVPValue(0)->user_end());
-  EXPECT_EQ(2u, DoubleValueDefV0Users.size());
-  EXPECT_EQ(&I1, DoubleValueDefV0Users[0]);
-  EXPECT_EQ(&I2, DoubleValueDefV0Users[1]);
-
-  SmallVector<VPUser *, 4> DoubleValueDefV1Users(
-      DoubleValueDef.getVPValue(1)->user_begin(),
-      DoubleValueDef.getVPValue(1)->user_end());
-  EXPECT_EQ(2u, DoubleValueDefV1Users.size());
-  EXPECT_EQ(&I1, DoubleValueDefV1Users[0]);
-  EXPECT_EQ(&I3, DoubleValueDefV1Users[1]);
-
-  // Now check that we can get the right VPDef for each defined value.
-  EXPECT_EQ(&DoubleValueDef, I1.getOperand(0)->getDef());
-  EXPECT_EQ(&DoubleValueDef, I1.getOperand(1)->getDef());
-  EXPECT_EQ(&DoubleValueDef, I2.getOperand(0)->getDef());
-  EXPECT_EQ(&DoubleValueDef, I3.getOperand(0)->getDef());
-}
-
-} // namespace
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/Transforms/Vectorize/VPlanTestBase.h b/gnu/llvm/llvm/unittests/Transforms/Vectorize/VPlanTestBase.h
deleted file mode 100644
index 75fdab65fea..00000000000
--- a/gnu/llvm/llvm/unittests/Transforms/Vectorize/VPlanTestBase.h
+++ /dev/null
@@ -1,87 +0,0 @@
-//===- llvm/unittest/Transforms/Vectorize/VPlanTestBase.h -----------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-/// \file
-/// This file defines a VPlanTestBase class, which provides helpers to parse
-/// a LLVM IR string and create VPlans given a loop entry block.
-//===----------------------------------------------------------------------===//
-#ifndef LLVM_UNITTESTS_TRANSFORMS_VECTORIZE_VPLANTESTBASE_H
-#define LLVM_UNITTESTS_TRANSFORMS_VECTORIZE_VPLANTESTBASE_H
-
-#include "../lib/Transforms/Vectorize/VPlan.h"
-#include "../lib/Transforms/Vectorize/VPlanHCFGBuilder.h"
-#include "llvm/Analysis/AssumptionCache.h"
-#include "llvm/Analysis/BasicAliasAnalysis.h"
-#include "llvm/Analysis/LoopInfo.h"
-#include "llvm/Analysis/TargetLibraryInfo.h"
-#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/Dominators.h"
-#include "llvm/Support/SourceMgr.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-
-/// Helper class to create a module from an assembly string and VPlans for a
-/// given loop entry block.
-class VPlanTestBase : public testing::Test {
-protected:
-  TargetLibraryInfoImpl TLII;
-  TargetLibraryInfo TLI;
-  DataLayout DL;
-
-  std::unique_ptr<LLVMContext> Ctx;
-  std::unique_ptr<Module> M;
-  std::unique_ptr<LoopInfo> LI;
-  std::unique_ptr<DominatorTree> DT;
-  std::unique_ptr<AssumptionCache> AC;
-  std::unique_ptr<ScalarEvolution> SE;
-
-  VPlanTestBase()
-      : TLII(), TLI(TLII),
-        DL("e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-"
-           "f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:"
-           "16:32:64-S128"),
-        Ctx(new LLVMContext) {}
-
-  Module &parseModule(const char *ModuleString) {
-    SMDiagnostic Err;
-    M = parseAssemblyString(ModuleString, Err, *Ctx);
-    EXPECT_TRUE(M);
-    return *M;
-  }
-
-  void doAnalysis(Function &F) {
-    DT.reset(new DominatorTree(F));
-    LI.reset(new LoopInfo(*DT));
-    AC.reset(new AssumptionCache(F));
-    SE.reset(new ScalarEvolution(F, TLI, *AC, *DT, *LI));
-  }
-
-  VPlanPtr buildHCFG(BasicBlock *LoopHeader) {
-    doAnalysis(*LoopHeader->getParent());
-
-    auto Plan = std::make_unique<VPlan>();
-    VPlanHCFGBuilder HCFGBuilder(LI->getLoopFor(LoopHeader), LI.get(), *Plan);
-    HCFGBuilder.buildHierarchicalCFG();
-    return Plan;
-  }
-
-  /// Build the VPlan plain CFG for the loop starting from \p LoopHeader.
-  VPlanPtr buildPlainCFG(BasicBlock *LoopHeader) {
-    doAnalysis(*LoopHeader->getParent());
-
-    auto Plan = std::make_unique<VPlan>();
-    VPlanHCFGBuilder HCFGBuilder(LI->getLoopFor(LoopHeader), LI.get(), *Plan);
-    VPRegionBlock *TopRegion = HCFGBuilder.buildPlainCFG();
-    Plan->setEntry(TopRegion);
-    return Plan;
-  }
-};
-
-} // namespace llvm
-
-#endif // LLVM_UNITTESTS_TRANSFORMS_VECTORIZE_VPLANTESTBASE_H
diff --git a/gnu/llvm/llvm/unittests/XRay/CMakeLists.txt b/gnu/llvm/llvm/unittests/XRay/CMakeLists.txt
deleted file mode 100644
index a08098582ae..00000000000
--- a/gnu/llvm/llvm/unittests/XRay/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  Support
-  XRay
-  )
-
-add_llvm_unittest(XRayTests
-  FDRBlockIndexerTest.cpp
-  FDRBlockVerifierTest.cpp
-  FDRProducerConsumerTest.cpp
-  FDRRecordPrinterTest.cpp
-  FDRRecordsTest.cpp
-  FDRTraceWriterTest.cpp
-  GraphTest.cpp
-  ProfileTest.cpp
-  )
-
-add_dependencies(XRayTests intrinsics_gen)
-target_link_libraries(XRayTests PRIVATE LLVMTestingSupport)
diff --git a/gnu/llvm/llvm/unittests/XRay/FDRBlockIndexerTest.cpp b/gnu/llvm/llvm/unittests/XRay/FDRBlockIndexerTest.cpp
deleted file mode 100644
index f2fab2f2ba1..00000000000
--- a/gnu/llvm/llvm/unittests/XRay/FDRBlockIndexerTest.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-//===- llvm/unittest/XRay/FDRTraceWriterTest.cpp ----------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-#include "llvm/XRay/BlockIndexer.h"
-#include "llvm/XRay/FDRLogBuilder.h"
-#include "llvm/XRay/FDRRecords.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-namespace xray {
-namespace {
-
-using ::testing::ElementsAre;
-using ::testing::Eq;
-using ::testing::Field;
-using ::testing::Not;
-using ::testing::SizeIs;
-
-// This test ensures that we can index blocks that follow version 3 of the log
-// format.
-TEST(FDRBlockIndexerTest, IndexBlocksV3) {
-  auto Block0 = LogBuilder()
-                    .add<BufferExtents>(80)
-                    .add<NewBufferRecord>(1)
-                    .add<WallclockRecord>(1, 2)
-                    .add<PIDRecord>(1)
-                    .add<NewCPUIDRecord>(1, 2)
-                    .add<FunctionRecord>(RecordTypes::ENTER, 1, 1)
-                    .add<FunctionRecord>(RecordTypes::EXIT, 1, 100)
-                    .consume();
-  auto Block1 = LogBuilder()
-                    .add<BufferExtents>(80)
-                    .add<NewBufferRecord>(1)
-                    .add<WallclockRecord>(1, 2)
-                    .add<PIDRecord>(1)
-                    .add<NewCPUIDRecord>(1, 2)
-                    .add<FunctionRecord>(RecordTypes::ENTER, 1, 1)
-                    .add<FunctionRecord>(RecordTypes::EXIT, 1, 100)
-                    .consume();
-  auto Block2 = LogBuilder()
-                    .add<BufferExtents>(80)
-                    .add<NewBufferRecord>(2)
-                    .add<WallclockRecord>(1, 2)
-                    .add<PIDRecord>(1)
-                    .add<NewCPUIDRecord>(2, 2)
-                    .add<FunctionRecord>(RecordTypes::ENTER, 1, 1)
-                    .add<FunctionRecord>(RecordTypes::EXIT, 1, 100)
-                    .consume();
-  BlockIndexer::Index Index;
-  BlockIndexer Indexer(Index);
-  // Iterate through the contrived blocks we have created above.
-  for (auto B : {std::ref(Block0), std::ref(Block1), std::ref(Block2)}) {
-    // For each record in the block, we apply the indexer.
-    for (auto &R : B.get())
-      ASSERT_FALSE(errorToBool(R->apply(Indexer)));
-    ASSERT_FALSE(errorToBool(Indexer.flush()));
-  }
-
-  ASSERT_THAT(Index.size(), Eq(2u));
-  auto T1Blocks = Index.find({1, 1});
-  ASSERT_THAT(T1Blocks, Not(Eq(Index.end())));
-
-  // Expect only six records, because we're ignoring the BufferExtents record.
-  EXPECT_THAT(T1Blocks->second,
-              ElementsAre(Field(&BlockIndexer::Block::Records, SizeIs(6u)),
-                          Field(&BlockIndexer::Block::Records, SizeIs(6u))));
-  auto T2Blocks = Index.find({1, 2});
-  ASSERT_THAT(T2Blocks, Not(Eq(Index.end())));
-  EXPECT_THAT(T2Blocks->second, ElementsAre(Field(&BlockIndexer::Block::Records,
-                                                  SizeIs(Eq(6u)))));
-}
-
-// FIXME: Support indexing V2 and V1 blocks.
-
-} // namespace
-} // namespace xray
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/XRay/FDRBlockVerifierTest.cpp b/gnu/llvm/llvm/unittests/XRay/FDRBlockVerifierTest.cpp
deleted file mode 100644
index 5af27450291..00000000000
--- a/gnu/llvm/llvm/unittests/XRay/FDRBlockVerifierTest.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-//===- llvm/unittest/XRay/FDRBlockVerifierTest.cpp --------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-#include "llvm/Testing/Support/Error.h"
-#include "llvm/XRay/BlockIndexer.h"
-#include "llvm/XRay/BlockVerifier.h"
-#include "llvm/XRay/FDRLogBuilder.h"
-#include "llvm/XRay/FDRRecords.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-namespace xray {
-namespace {
-
-using ::testing::ElementsAre;
-using ::testing::Not;
-using ::testing::SizeIs;
-
-TEST(FDRBlockVerifierTest, ValidBlocksV3) {
-  auto Block0 = LogBuilder()
-                    .add<BufferExtents>(80)
-                    .add<NewBufferRecord>(1)
-                    .add<WallclockRecord>(1, 2)
-                    .add<PIDRecord>(1)
-                    .add<NewCPUIDRecord>(1, 2)
-                    .add<FunctionRecord>(RecordTypes::ENTER, 1, 1)
-                    .add<FunctionRecord>(RecordTypes::EXIT, 1, 100)
-                    .consume();
-  auto Block1 = LogBuilder()
-                    .add<BufferExtents>(80)
-                    .add<NewBufferRecord>(1)
-                    .add<WallclockRecord>(1, 2)
-                    .add<PIDRecord>(1)
-                    .add<NewCPUIDRecord>(1, 2)
-                    .add<FunctionRecord>(RecordTypes::ENTER, 1, 1)
-                    .add<FunctionRecord>(RecordTypes::EXIT, 1, 100)
-                    .consume();
-  auto Block2 = LogBuilder()
-                    .add<BufferExtents>(80)
-                    .add<NewBufferRecord>(2)
-                    .add<WallclockRecord>(1, 2)
-                    .add<PIDRecord>(1)
-                    .add<NewCPUIDRecord>(2, 2)
-                    .add<FunctionRecord>(RecordTypes::ENTER, 1, 1)
-                    .add<FunctionRecord>(RecordTypes::EXIT, 1, 100)
-                    .consume();
-  BlockIndexer::Index Index;
-  BlockIndexer Indexer(Index);
-  for (auto B : {std::ref(Block0), std::ref(Block1), std::ref(Block2)}) {
-    for (auto &R : B.get())
-      ASSERT_FALSE(errorToBool(R->apply(Indexer)));
-    ASSERT_FALSE(errorToBool(Indexer.flush()));
-  }
-
-  BlockVerifier Verifier;
-  for (auto &ProcessThreadBlocks : Index) {
-    auto &Blocks = ProcessThreadBlocks.second;
-    for (auto &B : Blocks) {
-      for (auto *R : B.Records)
-        ASSERT_FALSE(errorToBool(R->apply(Verifier)));
-      ASSERT_FALSE(errorToBool(Verifier.verify()));
-      Verifier.reset();
-    }
-  }
-}
-
-TEST(FDRBlockVerifierTest, MissingPIDRecord) {
-  auto Block = LogBuilder()
-                   .add<BufferExtents>(20)
-                   .add<NewBufferRecord>(1)
-                   .add<WallclockRecord>(1, 2)
-                   .add<NewCPUIDRecord>(1, 2)
-                   .add<FunctionRecord>(RecordTypes::ENTER, 1, 1)
-                   .add<FunctionRecord>(RecordTypes::EXIT, 1, 100)
-                   .consume();
-  BlockVerifier Verifier;
-  for (auto &R : Block)
-    ASSERT_FALSE(errorToBool(R->apply(Verifier)));
-  ASSERT_FALSE(errorToBool(Verifier.verify()));
-}
-
-TEST(FDRBlockVerifierTest, MissingBufferExtents) {
-  auto Block = LogBuilder()
-                   .add<NewBufferRecord>(1)
-                   .add<WallclockRecord>(1, 2)
-                   .add<NewCPUIDRecord>(1, 2)
-                   .add<FunctionRecord>(RecordTypes::ENTER, 1, 1)
-                   .add<FunctionRecord>(RecordTypes::EXIT, 1, 100)
-                   .consume();
-  BlockVerifier Verifier;
-  for (auto &R : Block)
-    ASSERT_FALSE(errorToBool(R->apply(Verifier)));
-  ASSERT_FALSE(errorToBool(Verifier.verify()));
-}
-
-TEST(FDRBlockVerifierTest, IgnoreRecordsAfterEOB) {
-  auto Block = LogBuilder()
-                   .add<NewBufferRecord>(1)
-                   .add<WallclockRecord>(1, 2)
-                   .add<NewCPUIDRecord>(1, 2)
-                   .add<EndBufferRecord>()
-                   .add<FunctionRecord>(RecordTypes::ENTER, 1, 1)
-                   .add<FunctionRecord>(RecordTypes::EXIT, 1, 100)
-                   .consume();
-  BlockVerifier Verifier;
-  for (auto &R : Block)
-    ASSERT_FALSE(errorToBool(R->apply(Verifier)));
-  ASSERT_FALSE(errorToBool(Verifier.verify()));
-}
-
-TEST(FDRBlockVerifierTest, MalformedV2) {
-  auto Block = LogBuilder()
-                   .add<NewBufferRecord>(1)
-                   .add<WallclockRecord>(1, 2)
-                   .add<NewCPUIDRecord>(1, 2)
-                   .add<FunctionRecord>(RecordTypes::ENTER, 1, 1)
-                   .add<FunctionRecord>(RecordTypes::EXIT, 1, 100)
-                   .add<NewBufferRecord>(2)
-                   .consume();
-  BlockVerifier Verifier;
-
-  ASSERT_THAT(Block, SizeIs(6u));
-  EXPECT_THAT_ERROR(Block[0]->apply(Verifier), Succeeded());
-  EXPECT_THAT_ERROR(Block[1]->apply(Verifier), Succeeded());
-  EXPECT_THAT_ERROR(Block[2]->apply(Verifier), Succeeded());
-  EXPECT_THAT_ERROR(Block[3]->apply(Verifier), Succeeded());
-  EXPECT_THAT_ERROR(Block[4]->apply(Verifier), Succeeded());
-  EXPECT_THAT_ERROR(Block[5]->apply(Verifier), Failed());
-}
-
-} // namespace
-} // namespace xray
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/XRay/FDRProducerConsumerTest.cpp b/gnu/llvm/llvm/unittests/XRay/FDRProducerConsumerTest.cpp
deleted file mode 100644
index 7b9eed7daba..00000000000
--- a/gnu/llvm/llvm/unittests/XRay/FDRProducerConsumerTest.cpp
+++ /dev/null
@@ -1,222 +0,0 @@
-//===- llvm/unittest/XRay/FDRProducerConsumerTest.cpp -----------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Test for round-trip record writing and reading.
-//
-//===----------------------------------------------------------------------===//
-#include "llvm/Support/DataExtractor.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/XRay/FDRLogBuilder.h"
-#include "llvm/XRay/FDRRecordConsumer.h"
-#include "llvm/XRay/FDRRecordProducer.h"
-#include "llvm/XRay/FDRRecords.h"
-#include "llvm/XRay/FDRTraceWriter.h"
-#include "llvm/XRay/FileHeaderReader.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-#include <string>
-#include <tuple>
-
-namespace llvm {
-namespace xray {
-namespace {
-
-using ::testing::Eq;
-using ::testing::IsEmpty;
-using ::testing::Not;
-using ::testing::SizeIs;
-
-template <class RecordType> std::unique_ptr<Record> MakeRecord();
-
-template <> std::unique_ptr<Record> MakeRecord<NewBufferRecord>() {
-  return std::make_unique<NewBufferRecord>(1);
-}
-
-template <> std::unique_ptr<Record> MakeRecord<NewCPUIDRecord>() {
-  return std::make_unique<NewCPUIDRecord>(1, 2);
-}
-
-template <> std::unique_ptr<Record> MakeRecord<TSCWrapRecord>() {
-  return std::make_unique<TSCWrapRecord>(1);
-}
-
-template <> std::unique_ptr<Record> MakeRecord<WallclockRecord>() {
-  return std::make_unique<WallclockRecord>(1, 2);
-}
-
-template <> std::unique_ptr<Record> MakeRecord<CustomEventRecord>() {
-  return std::make_unique<CustomEventRecord>(4, 1, 2, "data");
-}
-
-template <> std::unique_ptr<Record> MakeRecord<CallArgRecord>() {
-  return std::make_unique<CallArgRecord>(1);
-}
-
-template <> std::unique_ptr<Record> MakeRecord<PIDRecord>() {
-  return std::make_unique<PIDRecord>(1);
-}
-
-template <> std::unique_ptr<Record> MakeRecord<FunctionRecord>() {
-  return std::make_unique<FunctionRecord>(RecordTypes::ENTER, 1, 2);
-}
-
-template <> std::unique_ptr<Record> MakeRecord<CustomEventRecordV5>() {
-  return std::make_unique<CustomEventRecordV5>(4, 1, "data");
-}
-
-template <> std::unique_ptr<Record> MakeRecord<TypedEventRecord>() {
-  return std::make_unique<TypedEventRecord>(4, 1, 2, "data");
-}
-
-template <class T> class RoundTripTest : public ::testing::Test {
-public:
-  RoundTripTest() : Data(), OS(Data) {
-    H.Version = 4;
-    H.Type = 1;
-    H.ConstantTSC = true;
-    H.NonstopTSC = true;
-    H.CycleFrequency = 3e9;
-
-    Writer = std::make_unique<FDRTraceWriter>(OS, H);
-    Rec = MakeRecord<T>();
-  }
-
-protected:
-  std::string Data;
-  raw_string_ostream OS;
-  XRayFileHeader H;
-  std::unique_ptr<FDRTraceWriter> Writer;
-  std::unique_ptr<Record> Rec;
-};
-
-TYPED_TEST_SUITE_P(RoundTripTest);
-
-template <class T> class RoundTripTestV5 : public ::testing::Test {
-public:
-  RoundTripTestV5() : Data(), OS(Data) {
-    H.Version = 5;
-    H.Type = 1;
-    H.ConstantTSC = true;
-    H.NonstopTSC = true;
-    H.CycleFrequency = 3e9;
-
-    Writer = std::make_unique<FDRTraceWriter>(OS, H);
-    Rec = MakeRecord<T>();
-  }
-
-protected:
-  std::string Data;
-  raw_string_ostream OS;
-  XRayFileHeader H;
-  std::unique_ptr<FDRTraceWriter> Writer;
-  std::unique_ptr<Record> Rec;
-};
-
-TYPED_TEST_SUITE_P(RoundTripTestV5);
-
-// This test ensures that the writing and reading implementations are in sync --
-// that given write(read(write(R))) == R.
-TYPED_TEST_P(RoundTripTest, RoundTripsSingleValue) {
-  // Always write a buffer extents record which will cover the correct size of
-  // the record, for version 3 and up.
-  BufferExtents BE(200);
-  ASSERT_FALSE(errorToBool(BE.apply(*this->Writer)));
-  auto &R = this->Rec;
-  ASSERT_FALSE(errorToBool(R->apply(*this->Writer)));
-  this->OS.flush();
-
-  DataExtractor DE(this->Data, sys::IsLittleEndianHost, 8);
-  uint64_t OffsetPtr = 0;
-  auto HeaderOrErr = readBinaryFormatHeader(DE, OffsetPtr);
-  if (!HeaderOrErr)
-    FAIL() << HeaderOrErr.takeError();
-
-  FileBasedRecordProducer P(HeaderOrErr.get(), DE, OffsetPtr);
-  std::vector<std::unique_ptr<Record>> Records;
-  LogBuilderConsumer C(Records);
-  while (DE.isValidOffsetForDataOfSize(OffsetPtr, 1)) {
-    auto R = P.produce();
-    if (!R)
-      FAIL() << R.takeError();
-    if (auto E = C.consume(std::move(R.get())))
-      FAIL() << E;
-  }
-  ASSERT_THAT(Records, Not(IsEmpty()));
-  std::string Data2;
-  raw_string_ostream OS2(Data2);
-  FDRTraceWriter Writer2(OS2, this->H);
-  for (auto &P : Records)
-    ASSERT_FALSE(errorToBool(P->apply(Writer2)));
-  OS2.flush();
-
-  EXPECT_EQ(Data2.substr(sizeof(XRayFileHeader)),
-            this->Data.substr(sizeof(XRayFileHeader)));
-  ASSERT_THAT(Records, SizeIs(2));
-  EXPECT_THAT(Records[1]->getRecordType(), Eq(R->getRecordType()));
-}
-
-REGISTER_TYPED_TEST_SUITE_P(RoundTripTest, RoundTripsSingleValue);
-
-// We duplicate the above case for the V5 version using different types and
-// encodings.
-TYPED_TEST_P(RoundTripTestV5, RoundTripsSingleValue) {
-  BufferExtents BE(200);
-  ASSERT_FALSE(errorToBool(BE.apply(*this->Writer)));
-  auto &R = this->Rec;
-  ASSERT_FALSE(errorToBool(R->apply(*this->Writer)));
-  this->OS.flush();
-
-  DataExtractor DE(this->Data, sys::IsLittleEndianHost, 8);
-  uint64_t OffsetPtr = 0;
-  auto HeaderOrErr = readBinaryFormatHeader(DE, OffsetPtr);
-  if (!HeaderOrErr)
-    FAIL() << HeaderOrErr.takeError();
-
-  FileBasedRecordProducer P(HeaderOrErr.get(), DE, OffsetPtr);
-  std::vector<std::unique_ptr<Record>> Records;
-  LogBuilderConsumer C(Records);
-  while (DE.isValidOffsetForDataOfSize(OffsetPtr, 1)) {
-    auto R = P.produce();
-    if (!R)
-      FAIL() << R.takeError();
-    if (auto E = C.consume(std::move(R.get())))
-      FAIL() << E;
-  }
-  ASSERT_THAT(Records, Not(IsEmpty()));
-  std::string Data2;
-  raw_string_ostream OS2(Data2);
-  FDRTraceWriter Writer2(OS2, this->H);
-  for (auto &P : Records)
-    ASSERT_FALSE(errorToBool(P->apply(Writer2)));
-  OS2.flush();
-
-  EXPECT_EQ(Data2.substr(sizeof(XRayFileHeader)),
-            this->Data.substr(sizeof(XRayFileHeader)));
-  ASSERT_THAT(Records, SizeIs(2));
-  EXPECT_THAT(Records[1]->getRecordType(), Eq(R->getRecordType()));
-}
-
-REGISTER_TYPED_TEST_SUITE_P(RoundTripTestV5, RoundTripsSingleValue);
-
-// These are the record types we support for v4 and below.
-using RecordTypes =
-    ::testing::Types<NewBufferRecord, NewCPUIDRecord, TSCWrapRecord,
-                     WallclockRecord, CustomEventRecord, CallArgRecord,
-                     PIDRecord, FunctionRecord>;
-INSTANTIATE_TYPED_TEST_SUITE_P(Records, RoundTripTest, RecordTypes, );
-
-// For V5, we have two new types we're supporting.
-using RecordTypesV5 =
-    ::testing::Types<NewBufferRecord, NewCPUIDRecord, TSCWrapRecord,
-                     WallclockRecord, CustomEventRecordV5, TypedEventRecord,
-                     CallArgRecord, PIDRecord, FunctionRecord>;
-INSTANTIATE_TYPED_TEST_SUITE_P(Records, RoundTripTestV5, RecordTypesV5, );
-
-} // namespace
-} // namespace xray
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/XRay/FDRRecordPrinterTest.cpp b/gnu/llvm/llvm/unittests/XRay/FDRRecordPrinterTest.cpp
deleted file mode 100644
index a29112f899e..00000000000
--- a/gnu/llvm/llvm/unittests/XRay/FDRRecordPrinterTest.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-//===- llvm/unittest/XRay/FDRRecordPrinterTest.cpp --------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/XRay/FDRRecords.h"
-#include "llvm/XRay/RecordPrinter.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-#include <string>
-
-namespace llvm {
-namespace xray {
-namespace {
-
-using ::testing::Eq;
-
-template <class RecordType> struct Helper {};
-
-template <> struct Helper<BufferExtents> {
-  static std::unique_ptr<Record> construct() {
-    return std::make_unique<BufferExtents>(1);
-  }
-
-  static const char *expected() { return "<Buffer: size = 1 bytes>"; }
-};
-
-template <> struct Helper<WallclockRecord> {
-  static std::unique_ptr<Record> construct() {
-    return std::make_unique<WallclockRecord>(1, 2);
-  }
-
-  static const char *expected() { return "<Wall Time: seconds = 1.000002>"; }
-};
-
-template <> struct Helper<NewCPUIDRecord> {
-  static std::unique_ptr<Record> construct() {
-    return std::make_unique<NewCPUIDRecord>(1, 2);
-  }
-
-  static const char *expected() { return "<CPU: id = 1, tsc = 2>"; }
-};
-
-template <> struct Helper<TSCWrapRecord> {
-  static std::unique_ptr<Record> construct() {
-    return std::make_unique<TSCWrapRecord>(1);
-  }
-
-  static const char *expected() { return "<TSC Wrap: base = 1>"; }
-};
-
-template <> struct Helper<CustomEventRecord> {
-  static std::unique_ptr<Record> construct() {
-    return std::make_unique<CustomEventRecord>(4, 1, 2, "data");
-  }
-
-  static const char *expected() {
-    return "<Custom Event: tsc = 1, cpu = 2, size = 4, data = 'data'>";
-  }
-};
-
-template <> struct Helper<CallArgRecord> {
-  static std::unique_ptr<Record> construct() {
-    return std::make_unique<CallArgRecord>(1);
-  }
-
-  static const char *expected() {
-    return "<Call Argument: data = 1 (hex = 0x1)>";
-  }
-};
-
-template <> struct Helper<PIDRecord> {
-  static std::unique_ptr<Record> construct() {
-    return std::make_unique<PIDRecord>(1);
-  }
-
-  static const char *expected() { return "<PID: 1>"; }
-};
-
-template <> struct Helper<NewBufferRecord> {
-  static std::unique_ptr<Record> construct() {
-    return std::make_unique<NewBufferRecord>(1);
-  }
-
-  static const char *expected() { return "<Thread ID: 1>"; }
-};
-
-template <> struct Helper<EndBufferRecord> {
-  static std::unique_ptr<Record> construct() {
-    return std::make_unique<EndBufferRecord>();
-  }
-
-  static const char *expected() { return "<End of Buffer>"; }
-};
-
-template <class T> class PrinterTest : public ::testing::Test {
-protected:
-  std::string Data;
-  raw_string_ostream OS;
-  RecordPrinter P;
-  std::unique_ptr<Record> R;
-
-public:
-  PrinterTest() : Data(), OS(Data), P(OS), R(Helper<T>::construct()) {}
-};
-
-TYPED_TEST_SUITE_P(PrinterTest);
-
-TYPED_TEST_P(PrinterTest, PrintsRecord) {
-  ASSERT_NE(nullptr, this->R);
-  ASSERT_FALSE(errorToBool(this->R->apply(this->P)));
-  this->OS.flush();
-  EXPECT_THAT(this->Data, Eq(Helper<TypeParam>::expected()));
-}
-
-REGISTER_TYPED_TEST_SUITE_P(PrinterTest, PrintsRecord);
-using FDRRecordTypes =
-    ::testing::Types<BufferExtents, NewBufferRecord, EndBufferRecord,
-                     NewCPUIDRecord, TSCWrapRecord, WallclockRecord,
-                     CustomEventRecord, CallArgRecord, BufferExtents,
-                     PIDRecord>;
-INSTANTIATE_TYPED_TEST_SUITE_P(Records, PrinterTest, FDRRecordTypes, );
-
-TEST(FDRRecordPrinterTest, WriteFunctionRecordEnter) {
-  std::string Data;
-  raw_string_ostream OS(Data);
-  RecordPrinter P(OS);
-  FunctionRecord R(RecordTypes::ENTER, 1, 2);
-  ASSERT_FALSE(errorToBool(R.apply(P)));
-  OS.flush();
-  EXPECT_THAT(Data, Eq("<Function Enter: #1 delta = +2>"));
-}
-
-TEST(FDRRecordPrinterTest, WriteFunctionRecordExit) {
-  std::string Data;
-  raw_string_ostream OS(Data);
-  RecordPrinter P(OS);
-  FunctionRecord R(RecordTypes::EXIT, 1, 2);
-  ASSERT_FALSE(errorToBool(R.apply(P)));
-  OS.flush();
-  EXPECT_THAT(Data, Eq("<Function Exit: #1 delta = +2>"));
-}
-
-TEST(FDRRecordPrinterTest, WriteFunctionRecordTailExit) {
-  std::string Data;
-  raw_string_ostream OS(Data);
-  RecordPrinter P(OS);
-  FunctionRecord R(RecordTypes::TAIL_EXIT, 1, 2);
-  ASSERT_FALSE(errorToBool(R.apply(P)));
-  OS.flush();
-  EXPECT_THAT(Data, Eq("<Function Tail Exit: #1 delta = +2>"));
-}
-
-TEST(FDRRecordPrinterTest, WriteFunctionRecordEnterArg) {
-  std::string Data;
-  raw_string_ostream OS(Data);
-  RecordPrinter P(OS);
-  FunctionRecord R(RecordTypes::ENTER_ARG, 1, 2);
-  ASSERT_FALSE(errorToBool(R.apply(P)));
-  OS.flush();
-  EXPECT_THAT(Data, Eq("<Function Enter With Arg: #1 delta = +2>"));
-}
-
-} // namespace
-} // namespace xray
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/XRay/FDRRecordsTest.cpp b/gnu/llvm/llvm/unittests/XRay/FDRRecordsTest.cpp
deleted file mode 100644
index aac3c86e49e..00000000000
--- a/gnu/llvm/llvm/unittests/XRay/FDRRecordsTest.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-//===- FDRRecords.cpp - Unit Tests for XRay FDR Record Loading ------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-#include "llvm/XRay/BlockIndexer.h"
-#include "llvm/XRay/BlockPrinter.h"
-#include "llvm/XRay/BlockVerifier.h"
-#include "llvm/XRay/FDRLogBuilder.h"
-#include "llvm/XRay/FDRRecords.h"
-#include "llvm/XRay/RecordPrinter.h"
-
-namespace llvm {
-namespace xray {
-namespace {
-
-using ::testing::Eq;
-using ::testing::Not;
-
-TEST(XRayFDRTest, BuilderAndBlockIndexer) {
-  // We recreate a single block of valid records, then ensure that we find all
-  // of them belonging in the same index. We do this for three blocks, and
-  // ensure we find the same records in the blocks we deduce.
-  auto Block0 = LogBuilder()
-                    .add<BufferExtents>(100)
-                    .add<NewBufferRecord>(1)
-                    .add<WallclockRecord>(1, 1)
-                    .add<PIDRecord>(1)
-                    .add<FunctionRecord>(RecordTypes::ENTER, 1, 1)
-                    .add<FunctionRecord>(RecordTypes::EXIT, 1, 100)
-                    .add<CustomEventRecordV5>(1, 4, "XRAY")
-                    .add<TypedEventRecord>(1, 4, 2, "XRAY")
-                    .consume();
-  auto Block1 = LogBuilder()
-                    .add<BufferExtents>(100)
-                    .add<NewBufferRecord>(1)
-                    .add<WallclockRecord>(1, 2)
-                    .add<PIDRecord>(1)
-                    .add<FunctionRecord>(RecordTypes::ENTER, 1, 1)
-                    .add<FunctionRecord>(RecordTypes::EXIT, 1, 100)
-                    .add<CustomEventRecordV5>(1, 4, "XRAY")
-                    .add<TypedEventRecord>(1, 4, 2, "XRAY")
-                    .consume();
-  auto Block2 = LogBuilder()
-                    .add<BufferExtents>(100)
-                    .add<NewBufferRecord>(2)
-                    .add<WallclockRecord>(1, 3)
-                    .add<PIDRecord>(1)
-                    .add<FunctionRecord>(RecordTypes::ENTER, 1, 1)
-                    .add<FunctionRecord>(RecordTypes::EXIT, 1, 100)
-                    .add<CustomEventRecordV5>(1, 4, "XRAY")
-                    .add<TypedEventRecord>(1, 4, 2, "XRAY")
-                    .consume();
-  BlockIndexer::Index Index;
-  BlockIndexer Indexer(Index);
-  for (auto B : {std::ref(Block0), std::ref(Block1), std::ref(Block2)}) {
-    for (auto &R : B.get())
-      ASSERT_FALSE(errorToBool(R->apply(Indexer)));
-    ASSERT_FALSE(errorToBool(Indexer.flush()));
-  }
-
-  // We have two threads worth of blocks.
-  ASSERT_THAT(Index.size(), Eq(2u));
-  auto T1Blocks = Index.find({1, 1});
-  ASSERT_THAT(T1Blocks, Not(Eq(Index.end())));
-  ASSERT_THAT(T1Blocks->second.size(), Eq(2u));
-  auto T2Blocks = Index.find({1, 2});
-  ASSERT_THAT(T2Blocks, Not(Eq(Index.end())));
-  ASSERT_THAT(T2Blocks->second.size(), Eq(1u));
-}
-
-TEST(XRayFDRTest, BuilderAndBlockVerifier) {
-  auto Block = LogBuilder()
-                   .add<BufferExtents>(48)
-                   .add<NewBufferRecord>(1)
-                   .add<WallclockRecord>(1, 1)
-                   .add<PIDRecord>(1)
-                   .add<NewCPUIDRecord>(1, 2)
-                   .consume();
-  BlockVerifier Verifier;
-  for (auto &R : Block)
-    ASSERT_FALSE(errorToBool(R->apply(Verifier)));
-  ASSERT_FALSE(errorToBool(Verifier.verify()));
-}
-
-TEST(XRayFDRTest, IndexAndVerifyBlocks) {
-  auto Block0 = LogBuilder()
-                    .add<BufferExtents>(64)
-                    .add<NewBufferRecord>(1)
-                    .add<WallclockRecord>(1, 1)
-                    .add<PIDRecord>(1)
-                    .add<NewCPUIDRecord>(1, 2)
-                    .add<FunctionRecord>(RecordTypes::ENTER, 1, 1)
-                    .add<FunctionRecord>(RecordTypes::EXIT, 1, 100)
-                    .add<CustomEventRecordV5>(1, 4, "XRAY")
-                    .add<TypedEventRecord>(1, 4, 2, "XRAY")
-                    .consume();
-  auto Block1 = LogBuilder()
-                    .add<BufferExtents>(64)
-                    .add<NewBufferRecord>(1)
-                    .add<WallclockRecord>(1, 1)
-                    .add<PIDRecord>(1)
-                    .add<NewCPUIDRecord>(1, 2)
-                    .add<FunctionRecord>(RecordTypes::ENTER, 1, 1)
-                    .add<FunctionRecord>(RecordTypes::EXIT, 1, 100)
-                    .add<CustomEventRecordV5>(1, 4, "XRAY")
-                    .add<TypedEventRecord>(1, 4, 2, "XRAY")
-                    .consume();
-  auto Block2 = LogBuilder()
-                    .add<BufferExtents>(64)
-                    .add<NewBufferRecord>(1)
-                    .add<WallclockRecord>(1, 1)
-                    .add<PIDRecord>(1)
-                    .add<NewCPUIDRecord>(1, 2)
-                    .add<FunctionRecord>(RecordTypes::ENTER, 1, 1)
-                    .add<FunctionRecord>(RecordTypes::EXIT, 1, 100)
-                    .add<CustomEventRecordV5>(1, 4, "XRAY")
-                    .add<TypedEventRecord>(1, 4, 2, "XRAY")
-                    .consume();
-
-  // First, index the records in different blocks.
-  BlockIndexer::Index Index;
-  BlockIndexer Indexer(Index);
-  for (auto B : {std::ref(Block0), std::ref(Block1), std::ref(Block2)}) {
-    for (auto &R : B.get())
-      ASSERT_FALSE(errorToBool(R->apply(Indexer)));
-    ASSERT_FALSE(errorToBool(Indexer.flush()));
-  }
-
-  // Next, verify that each block is consistently defined.
-  BlockVerifier Verifier;
-  for (auto &ProcessThreadBlocks : Index) {
-    auto &Blocks = ProcessThreadBlocks.second;
-    for (auto &B : Blocks) {
-      for (auto *R : B.Records)
-        ASSERT_FALSE(errorToBool(R->apply(Verifier)));
-      ASSERT_FALSE(errorToBool(Verifier.verify()));
-      Verifier.reset();
-    }
-  }
-
-  // Then set up the printing mechanisms.
-  std::string Output;
-  raw_string_ostream OS(Output);
-  RecordPrinter RP(OS);
-  BlockPrinter BP(OS, RP);
-  for (auto &ProcessThreadBlocks : Index) {
-    auto &Blocks = ProcessThreadBlocks.second;
-    for (auto &B : Blocks) {
-      for (auto *R : B.Records)
-        ASSERT_FALSE(errorToBool(R->apply(BP)));
-      BP.reset();
-    }
-  }
-
-  OS.flush();
-  EXPECT_THAT(Output, Not(Eq("")));
-}
-
-} // namespace
-} // namespace xray
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/XRay/FDRTraceWriterTest.cpp b/gnu/llvm/llvm/unittests/XRay/FDRTraceWriterTest.cpp
deleted file mode 100644
index 4f2f06e468c..00000000000
--- a/gnu/llvm/llvm/unittests/XRay/FDRTraceWriterTest.cpp
+++ /dev/null
@@ -1,182 +0,0 @@
-//===- llvm/unittest/XRay/FDRTraceWriterTest.cpp ----------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Test a utility that can write out XRay FDR Mode formatted trace files.
-//
-//===----------------------------------------------------------------------===//
-#include "llvm/XRay/FDRTraceWriter.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/XRay/FDRLogBuilder.h"
-#include "llvm/XRay/FDRRecords.h"
-#include "llvm/XRay/Trace.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-#include <string>
-
-namespace llvm {
-namespace xray {
-namespace {
-
-using testing::ElementsAre;
-using testing::Eq;
-using testing::Field;
-using testing::IsEmpty;
-using testing::Not;
-
-// We want to be able to create an instance of an FDRTraceWriter and associate
-// it with a stream, which could be loaded and turned into a Trace instance.
-// This test writes out version 3 trace logs.
-TEST(FDRTraceWriterTest, WriteToStringBufferVersion3) {
-  std::string Data;
-  raw_string_ostream OS(Data);
-  XRayFileHeader H;
-  H.Version = 3;
-  H.Type = 1;
-  H.ConstantTSC = true;
-  H.NonstopTSC = true;
-  H.CycleFrequency = 3e9;
-  FDRTraceWriter Writer(OS, H);
-  auto L = LogBuilder()
-               .add<BufferExtents>(80)
-               .add<NewBufferRecord>(1)
-               .add<WallclockRecord>(1, 1)
-               .add<PIDRecord>(1)
-               .add<NewCPUIDRecord>(1, 2)
-               .add<FunctionRecord>(RecordTypes::ENTER, 1, 1)
-               .add<FunctionRecord>(RecordTypes::EXIT, 1, 100)
-               .consume();
-  for (auto &P : L)
-    ASSERT_FALSE(errorToBool(P->apply(Writer)));
-  OS.flush();
-
-  // Then from here we load the Trace file.
-  DataExtractor DE(Data, sys::IsLittleEndianHost, 8);
-  auto TraceOrErr = loadTrace(DE, true);
-  if (!TraceOrErr)
-    FAIL() << TraceOrErr.takeError();
-  auto &Trace = TraceOrErr.get();
-
-  ASSERT_THAT(Trace, Not(IsEmpty()));
-  EXPECT_THAT(Trace, ElementsAre(Field(&XRayRecord::FuncId, Eq(1)),
-                                 Field(&XRayRecord::FuncId, Eq(1))));
-  EXPECT_THAT(Trace, ElementsAre(Field(&XRayRecord::TId, Eq(1u)),
-                                 Field(&XRayRecord::TId, Eq(1u))));
-  EXPECT_THAT(Trace, ElementsAre(Field(&XRayRecord::PId, Eq(1u)),
-                                 Field(&XRayRecord::PId, Eq(1u))));
-  EXPECT_THAT(Trace, ElementsAre(Field(&XRayRecord::CPU, Eq(1u)),
-                                 Field(&XRayRecord::CPU, Eq(1u))));
-  EXPECT_THAT(Trace,
-              ElementsAre(Field(&XRayRecord::Type, Eq(RecordTypes::ENTER)),
-                          Field(&XRayRecord::Type, Eq(RecordTypes::EXIT))));
-}
-
-// This version is almost exactly the same as above, except writing version 2
-// logs, without the PID records.
-TEST(FDRTraceWriterTest, WriteToStringBufferVersion2) {
-  std::string Data;
-  raw_string_ostream OS(Data);
-  XRayFileHeader H;
-  H.Version = 2;
-  H.Type = 1;
-  H.ConstantTSC = true;
-  H.NonstopTSC = true;
-  H.CycleFrequency = 3e9;
-  FDRTraceWriter Writer(OS, H);
-  auto L = LogBuilder()
-               .add<BufferExtents>(64)
-               .add<NewBufferRecord>(1)
-               .add<WallclockRecord>(1, 1)
-               .add<NewCPUIDRecord>(1, 2)
-               .add<FunctionRecord>(RecordTypes::ENTER, 1, 1)
-               .add<FunctionRecord>(RecordTypes::EXIT, 1, 100)
-               .consume();
-  for (auto &P : L)
-    ASSERT_FALSE(errorToBool(P->apply(Writer)));
-  OS.flush();
-
-  // Then from here we load the Trace file.
-  DataExtractor DE(Data, sys::IsLittleEndianHost, 8);
-  auto TraceOrErr = loadTrace(DE, true);
-  if (!TraceOrErr)
-    FAIL() << TraceOrErr.takeError();
-  auto &Trace = TraceOrErr.get();
-
-  ASSERT_THAT(Trace, Not(IsEmpty()));
-  EXPECT_THAT(Trace, ElementsAre(Field(&XRayRecord::FuncId, Eq(1)),
-                                 Field(&XRayRecord::FuncId, Eq(1))));
-  EXPECT_THAT(Trace, ElementsAre(Field(&XRayRecord::TId, Eq(1u)),
-                                 Field(&XRayRecord::TId, Eq(1u))));
-  EXPECT_THAT(Trace, ElementsAre(Field(&XRayRecord::CPU, Eq(1u)),
-                                 Field(&XRayRecord::CPU, Eq(1u))));
-  EXPECT_THAT(Trace,
-              ElementsAre(Field(&XRayRecord::Type, Eq(RecordTypes::ENTER)),
-                          Field(&XRayRecord::Type, Eq(RecordTypes::EXIT))));
-}
-
-// This covers version 1 of the log, without a BufferExtents record but has an
-// explicit EndOfBuffer record.
-TEST(FDRTraceWriterTest, WriteToStringBufferVersion1) {
-  std::string Data;
-  raw_string_ostream OS(Data);
-  XRayFileHeader H;
-  H.Version = 1;
-  H.Type = 1;
-  H.ConstantTSC = true;
-  H.NonstopTSC = true;
-  H.CycleFrequency = 3e9;
-  // Write the size of buffers out, arbitrarily it's 4k.
-  constexpr uint64_t BufferSize = 4096;
-  std::memcpy(H.FreeFormData, reinterpret_cast<const char *>(&BufferSize),
-              sizeof(BufferSize));
-  FDRTraceWriter Writer(OS, H);
-  OS.flush();
-
-  // Ensure that at this point the Data buffer has the file header serialized
-  // size.
-  ASSERT_THAT(Data.size(), Eq(32u));
-  auto L = LogBuilder()
-               .add<NewBufferRecord>(1)
-               .add<WallclockRecord>(1, 1)
-               .add<NewCPUIDRecord>(1, 2)
-               .add<FunctionRecord>(RecordTypes::ENTER, 1, 1)
-               .add<FunctionRecord>(RecordTypes::EXIT, 1, 100)
-               .add<EndBufferRecord>()
-               .consume();
-  for (auto &P : L)
-    ASSERT_FALSE(errorToBool(P->apply(Writer)));
-
-  // We need to pad the buffer with 4016 (4096 - 80) bytes of zeros.
-  OS.write_zeros(4016);
-  OS.flush();
-
-  // For version 1 of the log, we need the whole buffer to be the size of the
-  // file header plus 32.
-  ASSERT_THAT(Data.size(), Eq(BufferSize + 32));
-
-  // Then from here we load the Trace file.
-  DataExtractor DE(Data, sys::IsLittleEndianHost, 8);
-  auto TraceOrErr = loadTrace(DE, true);
-  if (!TraceOrErr)
-    FAIL() << TraceOrErr.takeError();
-  auto &Trace = TraceOrErr.get();
-
-  ASSERT_THAT(Trace, Not(IsEmpty()));
-  EXPECT_THAT(Trace, ElementsAre(Field(&XRayRecord::FuncId, Eq(1)),
-                                 Field(&XRayRecord::FuncId, Eq(1))));
-  EXPECT_THAT(Trace, ElementsAre(Field(&XRayRecord::TId, Eq(1u)),
-                                 Field(&XRayRecord::TId, Eq(1u))));
-  EXPECT_THAT(Trace, ElementsAre(Field(&XRayRecord::CPU, Eq(1u)),
-                                 Field(&XRayRecord::CPU, Eq(1u))));
-  EXPECT_THAT(Trace,
-              ElementsAre(Field(&XRayRecord::Type, Eq(RecordTypes::ENTER)),
-                          Field(&XRayRecord::Type, Eq(RecordTypes::EXIT))));
-}
-
-} // namespace
-} // namespace xray
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/XRay/GraphTest.cpp b/gnu/llvm/llvm/unittests/XRay/GraphTest.cpp
deleted file mode 100644
index 424fed13c17..00000000000
--- a/gnu/llvm/llvm/unittests/XRay/GraphTest.cpp
+++ /dev/null
@@ -1,260 +0,0 @@
-//===- llvm/unittest/XRay/GraphTest.cpp - XRay Graph unit tests -*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/XRay/Graph.h"
-#include "gtest/gtest.h"
-#include <iostream>
-#include <set>
-#include <type_traits>
-
-using namespace llvm;
-using namespace xray;
-
-namespace {
-struct VAttr {
-  unsigned VA;
-};
-struct EAttr {
-  unsigned EA;
-};
-typedef Graph<VAttr, EAttr, unsigned> GraphT;
-typedef typename GraphT::VertexIdentifier VI;
-typedef typename GraphT::EdgeIdentifier EI;
-
-// Test Fixture
-template <typename T> class GraphTest : public testing::Test {
-protected:
-  T Graph = getTestGraph();
-
-private:
-  static T getTestGraph() {
-    using std::make_pair;
-    std::remove_const_t<T> G;
-    G.insert(make_pair(1u, VAttr({3u})));
-    G.insert(make_pair(2u, VAttr({5u})));
-    G.insert(make_pair(3u, VAttr({7u})));
-    G.insert(make_pair(4u, VAttr({11u})));
-    G.insert(make_pair(5u, VAttr({13u})));
-    G.insert(make_pair(6u, VAttr({17u})));
-
-    G.insert(std::make_pair(EI(1u, 2u), EAttr({3u * 5u})));
-    G.insert(std::make_pair(EI(2u, 3u), EAttr({5u * 7u})));
-    G.insert(std::make_pair(EI(6u, 3u), EAttr({2u * 7u * 17u})));
-    G.insert(std::make_pair(EI(4u, 6u), EAttr({11u * 17u})));
-    G.insert(std::make_pair(EI(2u, 4u), EAttr({5u * 11u})));
-    G.insert(std::make_pair(EI(2u, 5u), EAttr({5u * 13u})));
-    G.insert(std::make_pair(EI(4u, 5u), EAttr({11u * 13u})));
-
-    return G;
-  }
-};
-
-typedef ::testing::Types<GraphT, const GraphT> GraphTestTypes;
-
-using VVT = typename GraphT::VertexValueType;
-using EVT = typename GraphT::EdgeValueType;
-
-TYPED_TEST_SUITE(GraphTest, GraphTestTypes, );
-
-template <typename T> void graphVertexTester(T &G) {
-  std::set<unsigned> V({1u, 2u, 3u, 4u, 5u, 6u});
-  std::vector<unsigned> VA({0u, 3u, 5u, 7u, 11u, 13u, 17u});
-
-  EXPECT_EQ(V.size(), G.vertices().size());
-  EXPECT_FALSE(G.vertices().empty());
-  for (unsigned u : V) {
-    auto EVV = G.at(u);
-    ASSERT_TRUE(!!EVV);
-    EXPECT_EQ(1u, G.count(u));
-    EXPECT_EQ(VA[u], EVV->VA);
-    EXPECT_NE(G.vertices().end(),
-              std::find_if(G.vertices().begin(), G.vertices().end(),
-                           [&](const VVT &VV) { return VV.first == u; }));
-    consumeError(EVV.takeError());
-  }
-
-  for (auto &VVT : G.vertices()) {
-    EXPECT_EQ(1u, V.count(VVT.first));
-    EXPECT_EQ(VA[VVT.first], VVT.second.VA);
-  }
-}
-
-template <typename T> void graphEdgeTester(T &G) {
-  std::set<unsigned> V({1u, 2u, 3u, 4u, 5u, 6u});
-
-  std::set<std::pair<unsigned, unsigned>> E(
-      {{1u, 2u}, {2u, 3u}, {6u, 3u}, {4u, 6u}, {2u, 4u}, {2u, 5u}, {4u, 5u}});
-  std::vector<unsigned> VA({0u, 3u, 5u, 7u, 11u, 13u, 17u});
-
-  EXPECT_EQ(E.size(), G.edges().size());
-  EXPECT_FALSE(G.edges().empty());
-  for (std::pair<unsigned, unsigned> u : E) {
-    auto EEV = G.at(u);
-    ASSERT_TRUE(!!EEV);
-    EXPECT_EQ(1u, G.count(u));
-    EXPECT_EQ(VA[u.first] * VA[u.second] * ((u.first > u.second) ? 2 : 1),
-              EEV->EA);
-    auto Pred = [&](const EVT &EV) { return EV.first == u; };
-    EXPECT_NE(G.edges().end(),
-              std::find_if(G.edges().begin(), G.edges().end(), Pred));
-    consumeError(EEV.takeError());
-  }
-
-  for (auto &EV : G.edges()) {
-    EXPECT_EQ(1u, E.count(EV.first));
-    EXPECT_EQ(VA[EV.first.first] * VA[EV.first.second] *
-                  ((EV.first.first > EV.first.second) ? 2 : 1),
-              EV.second.EA);
-    const auto &IE = G.inEdges(EV.first.second);
-    const auto &OE = G.outEdges(EV.first.first);
-    EXPECT_NE(IE.size(), 0u);
-    EXPECT_NE(OE.size(), 0u);
-    EXPECT_NE(IE.begin(), IE.end());
-    EXPECT_NE(OE.begin(), OE.end());
-    {
-      auto It = std::find_if(
-          G.inEdges(EV.first.second).begin(), G.inEdges(EV.first.second).end(),
-          [&](const EVT &EVI) { return EVI.first == EV.first; });
-      EXPECT_NE(G.inEdges(EV.first.second).end(), It);
-    }
-    {
-      auto It = std::find_if(
-          G.inEdges(EV.first.first).begin(), G.inEdges(EV.first.first).end(),
-          [&](const EVT &EVI) { return EVI.first == EV.first; });
-      EXPECT_EQ(G.inEdges(EV.first.first).end(), It);
-    }
-    {
-      auto It =
-          std::find_if(G.outEdges(EV.first.second).begin(),
-                       G.outEdges(EV.first.second).end(),
-                       [&](const EVT &EVI) { return EVI.first == EV.first; });
-      EXPECT_EQ(G.outEdges(EV.first.second).end(), It);
-    }
-    {
-      auto It = std::find_if(
-          G.outEdges(EV.first.first).begin(), G.outEdges(EV.first.first).end(),
-          [&](const EVT &EVI) { return EVI.first == EV.first; });
-      EXPECT_NE(G.outEdges(EV.first.first).end(), It);
-    }
-  }
-}
-
-TYPED_TEST(GraphTest, TestGraphEdge) {
-  auto &G = this->Graph;
-
-  graphEdgeTester(G);
-}
-
-TYPED_TEST(GraphTest, TestGraphVertex) {
-  auto &G = this->Graph;
-
-  graphVertexTester(G);
-}
-
-TYPED_TEST(GraphTest, TestCopyConstructor) {
-  TypeParam G(this->Graph);
-
-  graphEdgeTester(G);
-  graphVertexTester(G);
-}
-
-TYPED_TEST(GraphTest, TestCopyAssign) {
-  TypeParam G = this->Graph;
-
-  graphEdgeTester(G);
-  graphVertexTester(G);
-}
-
-TYPED_TEST(GraphTest, TestMoveConstructor) {
-  TypeParam G(std::move(this->Graph));
-
-  graphEdgeTester(G);
-  graphVertexTester(G);
-}
-
-// Tests the incremental Construction of a graph
-TEST(GraphTest, TestConstruction) {
-  GraphT MG;
-  const GraphT &G = MG;
-  EXPECT_EQ(0u, G.count(0u));
-  EXPECT_EQ(0u, G.count({0u, 1u}));
-  auto VE = G.at(0);
-  auto EE = G.at({0, 0});
-  EXPECT_FALSE(VE); // G.at[0] returns an error
-  EXPECT_FALSE(EE); // G.at[{0,0}] returns an error
-  consumeError(VE.takeError());
-  consumeError(EE.takeError());
-  EXPECT_TRUE(G.vertices().empty());
-  EXPECT_TRUE(G.edges().empty());
-  EXPECT_EQ(G.vertices().begin(), G.vertices().end());
-  EXPECT_EQ(G.edges().begin(), G.edges().end());
-}
-
-TEST(GraphTest, TestiVertexAccessOperator) {
-  GraphT MG;
-  const GraphT &G = MG;
-
-  MG[0u] = {1u};
-  EXPECT_EQ(1u, MG[0u].VA);
-  EXPECT_EQ(1u, G.count(0u));
-  EXPECT_EQ(0u, G.count(1u));
-  EXPECT_EQ(1u, MG[0u].VA);
-  auto T = G.at(0u);
-  EXPECT_TRUE(!!T);
-  EXPECT_EQ(1u, T->VA);
-
-  EXPECT_EQ(1u, G.vertices().size());
-  EXPECT_EQ(0u, G.edges().size());
-  EXPECT_FALSE(G.vertices().empty());
-  EXPECT_TRUE(G.edges().empty());
-  EXPECT_NE(G.vertices().begin(), G.vertices().end());
-  EXPECT_EQ(G.edges().begin(), G.edges().end());
-  EXPECT_EQ(1u, G.vertices().begin()->second.VA);
-  EXPECT_EQ(0u, G.vertices().begin()->first);
-  EXPECT_EQ(0u, G.outEdges(0u).size());
-  EXPECT_TRUE(G.outEdges(0u).empty());
-  EXPECT_EQ(G.outEdges(0u).begin(), G.outEdges(0u).end());
-  EXPECT_EQ(0u, G.inEdges(0u).size());
-  EXPECT_TRUE(G.inEdges(0u).empty());
-  EXPECT_EQ(G.inEdges(0u).begin(), G.inEdges(0u).end());
-}
-
-TEST(GraphTest, TestEdgeAccessOperator) {
-  GraphT MG;
-  const GraphT &G = MG;
-
-  MG[{0u, 0u}] = {2u};
-  EI EdgeIdent({0u, 0u});
-  EXPECT_EQ(2u, MG[EdgeIdent].EA);
-  EXPECT_EQ(1u, G.count({0u, 0u}));
-  EXPECT_EQ(0u, G.count({0u, 1u}));
-  EXPECT_EQ(1u, G.count(0u));
-  EXPECT_NE(1u, G.count(1u));
-  auto T = G.at({0u, 0u});
-  EXPECT_TRUE(T && T->EA == 2u);
-  EXPECT_EQ(1u, G.edges().size());
-  EXPECT_EQ(1u, G.vertices().size());
-  EXPECT_FALSE(G.edges().empty());
-  EXPECT_FALSE(G.vertices().empty());
-  EXPECT_NE(G.edges().begin(), G.edges().end());
-  EXPECT_EQ(EI(0u, 0u), G.edges().begin()->first);
-  EXPECT_EQ(2u, G.edges().begin()->second.EA);
-  EXPECT_EQ(1u, G.outEdges(0u).size());
-  EXPECT_FALSE(G.outEdges(0u).empty());
-  EXPECT_NE(G.outEdges(0u).begin(), G.outEdges(0u).end());
-  EXPECT_EQ(EI(0u, 0u), G.outEdges(0u).begin()->first);
-  EXPECT_EQ(2u, G.outEdges(0u).begin()->second.EA);
-  EXPECT_EQ(++(G.outEdges(0u).begin()), G.outEdges(0u).end());
-  EXPECT_EQ(1u, G.inEdges(0u).size());
-  EXPECT_FALSE(G.inEdges(0u).empty());
-  EXPECT_NE(G.inEdges(0u).begin(), G.inEdges(0u).end());
-  EXPECT_EQ(EI(0u, 0u), G.inEdges(0u).begin()->first);
-  EXPECT_EQ(2u, G.inEdges(0u).begin()->second.EA);
-  EXPECT_EQ(++(G.inEdges(0u).begin()), G.inEdges(0u).end());
-}
-}
diff --git a/gnu/llvm/llvm/unittests/XRay/ProfileTest.cpp b/gnu/llvm/llvm/unittests/XRay/ProfileTest.cpp
deleted file mode 100644
index 7eb848f1116..00000000000
--- a/gnu/llvm/llvm/unittests/XRay/ProfileTest.cpp
+++ /dev/null
@@ -1,266 +0,0 @@
-//===- ProfileTest.cpp - XRay Profile unit tests ----------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-#include "llvm/XRay/Profile.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-#include <numeric>
-
-namespace llvm {
-namespace xray {
-namespace {
-
-using ::testing::AllOf;
-using ::testing::ElementsAre;
-using ::testing::Eq;
-using ::testing::Field;
-using ::testing::Not;
-using ::testing::Pair;
-using ::testing::UnorderedElementsAre;
-
-TEST(ProfileTest, CreateProfile) { Profile P; }
-
-TEST(ProfileTest, InternPath) {
-  Profile P;
-  auto Path0 = P.internPath({3, 2, 1});
-  auto Path1 = P.internPath({3, 2, 1});
-  auto Path2 = P.internPath({2, 1});
-  EXPECT_THAT(Path0, Eq(Path1));
-  EXPECT_THAT(Path0, Not(Eq(Path2)));
-}
-
-TEST(ProfileTest, ExpandPath) {
-  Profile P;
-  auto PathID = P.internPath({3, 2, 1});
-  auto PathOrError = P.expandPath(PathID);
-  if (!PathOrError)
-    FAIL() << "Error: " << PathOrError.takeError();
-  EXPECT_THAT(PathOrError.get(), ElementsAre(3, 2, 1));
-}
-
-TEST(ProfileTest, AddBlocks) {
-  Profile P;
-  // Expect an error on adding empty blocks.
-  EXPECT_TRUE(errorToBool(P.addBlock({})));
-
-  // Thread blocks may not be empty.
-  EXPECT_TRUE(errorToBool(P.addBlock({1, {}})));
-
-  // Thread blocks with data must succeed.
-  EXPECT_FALSE(errorToBool(P.addBlock(
-      Profile::Block{Profile::ThreadID{1},
-                     {
-                         {P.internPath({2, 1}), Profile::Data{1, 1000}},
-                         {P.internPath({3, 2, 1}), Profile::Data{10, 100}},
-                     }})));
-}
-
-TEST(ProfileTest, CopyProfile) {
-  Profile P0, P1;
-  EXPECT_FALSE(errorToBool(P0.addBlock(
-      Profile::Block{Profile::ThreadID{1},
-                     {
-                         {P0.internPath({2, 1}), Profile::Data{1, 1000}},
-                         {P0.internPath({3, 2, 1}), Profile::Data{10, 100}},
-                     }})));
-  P1 = P0;
-  EXPECT_THAT(
-      P1, UnorderedElementsAre(AllOf(
-              Field(&Profile::Block::Thread, Eq(Profile::ThreadID{1})),
-              Field(&Profile::Block::PathData,
-                    UnorderedElementsAre(
-                        Pair(P1.internPath({2, 1}),
-                             AllOf(Field(&Profile::Data::CallCount, Eq(1u)),
-                                   Field(&Profile::Data::CumulativeLocalTime,
-                                         Eq(1000u)))),
-                        Pair(P1.internPath({3, 2, 1}),
-                             AllOf(Field(&Profile::Data::CallCount, Eq(10u)),
-                                   Field(&Profile::Data::CumulativeLocalTime,
-                                         Eq(100u)))))))));
-}
-
-TEST(ProfileTest, MoveProfile) {
-  Profile P0, P1;
-  EXPECT_FALSE(errorToBool(P0.addBlock(
-      Profile::Block{Profile::ThreadID{1},
-                     {
-                         {P0.internPath({2, 1}), Profile::Data{1, 1000}},
-                         {P0.internPath({3, 2, 1}), Profile::Data{10, 100}},
-                     }})));
-  P1 = std::move(P0);
-  EXPECT_THAT(
-      P1, UnorderedElementsAre(AllOf(
-              Field(&Profile::Block::Thread, Eq(Profile::ThreadID{1})),
-              Field(&Profile::Block::PathData,
-                    UnorderedElementsAre(
-                        Pair(P1.internPath({2, 1}),
-                             AllOf(Field(&Profile::Data::CallCount, Eq(1u)),
-                                   Field(&Profile::Data::CumulativeLocalTime,
-                                         Eq(1000u)))),
-                        Pair(P1.internPath({3, 2, 1}),
-                             AllOf(Field(&Profile::Data::CallCount, Eq(10u)),
-                                   Field(&Profile::Data::CumulativeLocalTime,
-                                         Eq(100u)))))))));
-  EXPECT_THAT(P0, UnorderedElementsAre());
-}
-
-TEST(ProfileTest, MergeProfilesByThread) {
-  Profile P0, P1;
-
-  // Set up the blocks for two different threads in P0.
-  EXPECT_FALSE(errorToBool(P0.addBlock(
-      Profile::Block{Profile::ThreadID{1},
-                     {{P0.internPath({2, 1}), Profile::Data{1, 1000}},
-                      {P0.internPath({4, 1}), Profile::Data{1, 1000}}}})));
-  EXPECT_FALSE(errorToBool(P0.addBlock(
-      Profile::Block{Profile::ThreadID{2},
-                     {{P0.internPath({3, 1}), Profile::Data{1, 1000}}}})));
-
-  // Set up the blocks for two different threads in P1.
-  EXPECT_FALSE(errorToBool(P1.addBlock(
-      Profile::Block{Profile::ThreadID{1},
-                     {{P1.internPath({2, 1}), Profile::Data{1, 1000}}}})));
-  EXPECT_FALSE(errorToBool(P1.addBlock(
-      Profile::Block{Profile::ThreadID{2},
-                     {{P1.internPath({3, 1}), Profile::Data{1, 1000}},
-                      {P1.internPath({4, 1}), Profile::Data{1, 1000}}}})));
-
-  Profile Merged = mergeProfilesByThread(P0, P1);
-  EXPECT_THAT(
-      Merged,
-      UnorderedElementsAre(
-          // We want to see two threads after the merge.
-          AllOf(Field(&Profile::Block::Thread, Eq(Profile::ThreadID{1})),
-                Field(&Profile::Block::PathData,
-                      UnorderedElementsAre(
-                          Pair(Merged.internPath({2, 1}),
-                               AllOf(Field(&Profile::Data::CallCount, Eq(2u)),
-                                     Field(&Profile::Data::CumulativeLocalTime,
-                                           Eq(2000u)))),
-                          Pair(Merged.internPath({4, 1}),
-                               AllOf(Field(&Profile::Data::CallCount, Eq(1u)),
-                                     Field(&Profile::Data::CumulativeLocalTime,
-                                           Eq(1000u))))))),
-          AllOf(Field(&Profile::Block::Thread, Eq(Profile::ThreadID{2})),
-                Field(&Profile::Block::PathData,
-                      UnorderedElementsAre(
-                          Pair(Merged.internPath({3, 1}),
-                               AllOf(Field(&Profile::Data::CallCount, Eq(2u)),
-                                     Field(&Profile::Data::CumulativeLocalTime,
-                                           Eq(2000u)))),
-                          Pair(Merged.internPath({4, 1}),
-                               AllOf(Field(&Profile::Data::CallCount, Eq(1u)),
-                                     Field(&Profile::Data::CumulativeLocalTime,
-                                           Eq(1000u)))))))));
-}
-
-TEST(ProfileTest, MergeProfilesByStack) {
-  Profile P0, P1;
-  EXPECT_FALSE(errorToBool(P0.addBlock(
-      Profile::Block{Profile::ThreadID{1},
-                     {{P0.internPath({2, 1}), Profile::Data{1, 1000}}}})));
-  EXPECT_FALSE(errorToBool(P1.addBlock(
-      Profile::Block{Profile::ThreadID{2},
-                     {{P1.internPath({2, 1}), Profile::Data{1, 1000}}}})));
-
-  Profile Merged = mergeProfilesByStack(P0, P1);
-  EXPECT_THAT(Merged,
-              ElementsAre(AllOf(
-                  // We expect that we lose the ThreadID dimension in this
-                  // algorithm.
-                  Field(&Profile::Block::Thread, Eq(Profile::ThreadID{0})),
-                  Field(&Profile::Block::PathData,
-                        ElementsAre(Pair(
-                            Merged.internPath({2, 1}),
-                            AllOf(Field(&Profile::Data::CallCount, Eq(2u)),
-                                  Field(&Profile::Data::CumulativeLocalTime,
-                                        Eq(2000u)))))))));
-}
-
-TEST(ProfileTest, MergeProfilesByStackAccumulate) {
-  std::vector<Profile> Profiles(3);
-  EXPECT_FALSE(errorToBool(Profiles[0].addBlock(Profile::Block{
-      Profile::ThreadID{1},
-      {{Profiles[0].internPath({2, 1}), Profile::Data{1, 1000}}}})));
-  EXPECT_FALSE(errorToBool(Profiles[1].addBlock(Profile::Block{
-      Profile::ThreadID{2},
-      {{Profiles[1].internPath({2, 1}), Profile::Data{1, 1000}}}})));
-  EXPECT_FALSE(errorToBool(Profiles[2].addBlock(Profile::Block{
-      Profile::ThreadID{3},
-      {{Profiles[2].internPath({2, 1}), Profile::Data{1, 1000}}}})));
-  Profile Merged = std::accumulate(Profiles.begin(), Profiles.end(), Profile(),
-                                   mergeProfilesByStack);
-  EXPECT_THAT(Merged,
-              ElementsAre(AllOf(
-                  // We expect that we lose the ThreadID dimension in this
-                  // algorithm.
-                  Field(&Profile::Block::Thread, Eq(Profile::ThreadID{0})),
-                  Field(&Profile::Block::PathData,
-                        ElementsAre(Pair(
-                            Merged.internPath({2, 1}),
-                            AllOf(Field(&Profile::Data::CallCount, Eq(3u)),
-                                  Field(&Profile::Data::CumulativeLocalTime,
-                                        Eq(3000u)))))))));
-}
-
-TEST(ProfileTest, MergeProfilesByThreadAccumulate) {
-  std::vector<Profile> Profiles(2);
-
-  // Set up the blocks for two different threads in Profiles[0].
-  EXPECT_FALSE(errorToBool(Profiles[0].addBlock(Profile::Block{
-      Profile::ThreadID{1},
-      {{Profiles[0].internPath({2, 1}), Profile::Data{1, 1000}},
-       {Profiles[0].internPath({4, 1}), Profile::Data{1, 1000}}}})));
-  EXPECT_FALSE(errorToBool(Profiles[0].addBlock(Profile::Block{
-      Profile::ThreadID{2},
-      {{Profiles[0].internPath({3, 1}), Profile::Data{1, 1000}}}})));
-
-  // Set up the blocks for two different threads in Profiles[1].
-  EXPECT_FALSE(errorToBool(Profiles[1].addBlock(Profile::Block{
-      Profile::ThreadID{1},
-      {{Profiles[1].internPath({2, 1}), Profile::Data{1, 1000}}}})));
-  EXPECT_FALSE(errorToBool(Profiles[1].addBlock(Profile::Block{
-      Profile::ThreadID{2},
-      {{Profiles[1].internPath({3, 1}), Profile::Data{1, 1000}},
-       {Profiles[1].internPath({4, 1}), Profile::Data{1, 1000}}}})));
-
-  Profile Merged = std::accumulate(Profiles.begin(), Profiles.end(), Profile(),
-                                   mergeProfilesByThread);
-  EXPECT_THAT(
-      Merged,
-      UnorderedElementsAre(
-          // We want to see two threads after the merge.
-          AllOf(Field(&Profile::Block::Thread, Eq(Profile::ThreadID{1})),
-                Field(&Profile::Block::PathData,
-                      UnorderedElementsAre(
-                          Pair(Merged.internPath({2, 1}),
-                               AllOf(Field(&Profile::Data::CallCount, Eq(2u)),
-                                     Field(&Profile::Data::CumulativeLocalTime,
-                                           Eq(2000u)))),
-                          Pair(Merged.internPath({4, 1}),
-                               AllOf(Field(&Profile::Data::CallCount, Eq(1u)),
-                                     Field(&Profile::Data::CumulativeLocalTime,
-                                           Eq(1000u))))))),
-          AllOf(Field(&Profile::Block::Thread, Eq(Profile::ThreadID{2})),
-                Field(&Profile::Block::PathData,
-                      UnorderedElementsAre(
-                          Pair(Merged.internPath({3, 1}),
-                               AllOf(Field(&Profile::Data::CallCount, Eq(2u)),
-                                     Field(&Profile::Data::CumulativeLocalTime,
-                                           Eq(2000u)))),
-                          Pair(Merged.internPath({4, 1}),
-                               AllOf(Field(&Profile::Data::CallCount, Eq(1u)),
-                                     Field(&Profile::Data::CumulativeLocalTime,
-                                           Eq(1000u)))))))));
-}
-// FIXME: Add a test creating a Trace and generating a Profile
-// FIXME: Add tests for ranking/sorting profile blocks by dimension
-
-} // namespace
-} // namespace xray
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/tools/CMakeLists.txt b/gnu/llvm/llvm/unittests/tools/CMakeLists.txt
deleted file mode 100644
index 7861da8c0e3..00000000000
--- a/gnu/llvm/llvm/unittests/tools/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-if(LLVM_TARGETS_TO_BUILD MATCHES "X86")
-  add_subdirectory(
-    llvm-cfi-verify
-  )
-endif()
-
-add_subdirectory(
-  llvm-exegesis
-)
-add_subdirectory(llvm-profgen)
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-cfi-verify/CMakeLists.txt b/gnu/llvm/llvm/unittests/tools/llvm-cfi-verify/CMakeLists.txt
deleted file mode 100644
index ee89c9b5ad9..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-cfi-verify/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  AllTargetsAsmParsers
-  AllTargetsDescs
-  AllTargetsDisassemblers
-  AllTargetsInfos
-  MC
-  MCParser
-  Object
-  Support
-  Symbolize
-  )
-
-add_llvm_unittest(CFIVerifyTests
-  FileAnalysis.cpp
-  GraphBuilder.cpp
-  )
-target_link_libraries(CFIVerifyTests PRIVATE LLVMCFIVerify)
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-cfi-verify/FileAnalysis.cpp b/gnu/llvm/llvm/unittests/tools/llvm-cfi-verify/FileAnalysis.cpp
deleted file mode 100644
index 6bb083b4d2b..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-cfi-verify/FileAnalysis.cpp
+++ /dev/null
@@ -1,1101 +0,0 @@
-//===- llvm/unittests/tools/llvm-cfi-verify/FileAnalysis.cpp --------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "../tools/llvm-cfi-verify/lib/FileAnalysis.h"
-#include "../tools/llvm-cfi-verify/lib/GraphBuilder.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-#include "llvm/BinaryFormat/ELF.h"
-#include "llvm/MC/MCAsmInfo.h"
-#include "llvm/MC/MCContext.h"
-#include "llvm/MC/MCDisassembler/MCDisassembler.h"
-#include "llvm/MC/MCInst.h"
-#include "llvm/MC/MCInstPrinter.h"
-#include "llvm/MC/MCInstrAnalysis.h"
-#include "llvm/MC/MCInstrDesc.h"
-#include "llvm/MC/MCInstrInfo.h"
-#include "llvm/MC/MCObjectFileInfo.h"
-#include "llvm/MC/MCRegisterInfo.h"
-#include "llvm/MC/MCSubtargetInfo.h"
-#include "llvm/Object/Binary.h"
-#include "llvm/Object/COFF.h"
-#include "llvm/Object/ELFObjectFile.h"
-#include "llvm/Object/ObjectFile.h"
-#include "llvm/Support/Casting.h"
-#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/Error.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "llvm/Support/raw_ostream.h"
-
-#include <cstdlib>
-
-using Instr = ::llvm::cfi_verify::FileAnalysis::Instr;
-using ::testing::Eq;
-using ::testing::Field;
-
-namespace llvm {
-namespace cfi_verify {
-namespace {
-class ELFTestFileAnalysis : public FileAnalysis {
-public:
-  ELFTestFileAnalysis(StringRef Trip)
-      : FileAnalysis(Triple(Trip), SubtargetFeatures()) {}
-
-  // Expose this method publicly for testing.
-  void parseSectionContents(ArrayRef<uint8_t> SectionBytes,
-                            object::SectionedAddress Address) {
-    FileAnalysis::parseSectionContents(SectionBytes, Address);
-  }
-
-  Error initialiseDisassemblyMembers() {
-    return FileAnalysis::initialiseDisassemblyMembers();
-  }
-};
-
-class BasicFileAnalysisTest : public ::testing::Test {
-public:
-  BasicFileAnalysisTest(StringRef Trip)
-      : SuccessfullyInitialised(false), Analysis(Trip) {}
-protected:
-  void SetUp() override {
-    IgnoreDWARFFlag = true;
-    SuccessfullyInitialised = true;
-    if (auto Err = Analysis.initialiseDisassemblyMembers()) {
-      handleAllErrors(std::move(Err), [&](const UnsupportedDisassembly &E) {
-        SuccessfullyInitialised = false;
-        outs()
-            << "Note: CFIVerifyTests are disabled due to lack of support "
-               "on this build.\n";
-      });
-    }
-  }
-
-  bool SuccessfullyInitialised;
-  ELFTestFileAnalysis Analysis;
-};
-
-class BasicX86FileAnalysisTest : public BasicFileAnalysisTest {
-public:
-  BasicX86FileAnalysisTest() : BasicFileAnalysisTest("x86_64--") {}
-};
-
-class BasicAArch64FileAnalysisTest : public BasicFileAnalysisTest {
-public:
-  BasicAArch64FileAnalysisTest() : BasicFileAnalysisTest("aarch64--") {}
-};
-
-TEST_F(BasicX86FileAnalysisTest, BasicDisassemblyTraversalTest) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x90,                   // 0: nop
-          0xb0, 0x00,             // 1: mov $0x0, %al
-          0x48, 0x89, 0xe5,       // 3: mov %rsp, %rbp
-          0x48, 0x83, 0xec, 0x18, // 6: sub $0x18, %rsp
-          0x48, 0xbe, 0xc4, 0x07, 0x40,
-          0x00, 0x00, 0x00, 0x00, 0x00, // 10: movabs $0x4007c4, %rsi
-          0x2f,                         // 20: (bad)
-          0x41, 0x0e,                   // 21: rex.B (bad)
-          0x62, 0x72, 0x65, 0x61, 0x6b, // 23: (bad) {%k1}
-      },
-      {0xDEADBEEF, 0x0});
-
-  EXPECT_EQ(nullptr, Analysis.getInstruction(0x0));
-  EXPECT_EQ(nullptr, Analysis.getInstruction(0x1000));
-
-  // 0xDEADBEEF: nop
-  const auto *InstrMeta = Analysis.getInstruction(0xDEADBEEF);
-  EXPECT_NE(nullptr, InstrMeta);
-  EXPECT_EQ(0xDEADBEEF, InstrMeta->VMAddress);
-  EXPECT_EQ(1u, InstrMeta->InstructionSize);
-  EXPECT_TRUE(InstrMeta->Valid);
-
-  const auto *NextInstrMeta = Analysis.getNextInstructionSequential(*InstrMeta);
-  EXPECT_EQ(nullptr, Analysis.getPrevInstructionSequential(*InstrMeta));
-  const auto *PrevInstrMeta = InstrMeta;
-
-  // 0xDEADBEEF + 1: mov $0x0, %al
-  InstrMeta = Analysis.getInstruction(0xDEADBEEF + 1);
-  EXPECT_NE(nullptr, InstrMeta);
-  EXPECT_EQ(NextInstrMeta, InstrMeta);
-  EXPECT_EQ(0xDEADBEEF + 1, InstrMeta->VMAddress);
-  EXPECT_EQ(2u, InstrMeta->InstructionSize);
-  EXPECT_TRUE(InstrMeta->Valid);
-
-  NextInstrMeta = Analysis.getNextInstructionSequential(*InstrMeta);
-  EXPECT_EQ(PrevInstrMeta, Analysis.getPrevInstructionSequential(*InstrMeta));
-  PrevInstrMeta = InstrMeta;
-
-  // 0xDEADBEEF + 3: mov %rsp, %rbp
-  InstrMeta = Analysis.getInstruction(0xDEADBEEF + 3);
-  EXPECT_NE(nullptr, InstrMeta);
-  EXPECT_EQ(NextInstrMeta, InstrMeta);
-  EXPECT_EQ(0xDEADBEEF + 3, InstrMeta->VMAddress);
-  EXPECT_EQ(3u, InstrMeta->InstructionSize);
-  EXPECT_TRUE(InstrMeta->Valid);
-
-  NextInstrMeta = Analysis.getNextInstructionSequential(*InstrMeta);
-  EXPECT_EQ(PrevInstrMeta, Analysis.getPrevInstructionSequential(*InstrMeta));
-  PrevInstrMeta = InstrMeta;
-
-  // 0xDEADBEEF + 6: sub $0x18, %rsp
-  InstrMeta = Analysis.getInstruction(0xDEADBEEF + 6);
-  EXPECT_NE(nullptr, InstrMeta);
-  EXPECT_EQ(NextInstrMeta, InstrMeta);
-  EXPECT_EQ(0xDEADBEEF + 6, InstrMeta->VMAddress);
-  EXPECT_EQ(4u, InstrMeta->InstructionSize);
-  EXPECT_TRUE(InstrMeta->Valid);
-
-  NextInstrMeta = Analysis.getNextInstructionSequential(*InstrMeta);
-  EXPECT_EQ(PrevInstrMeta, Analysis.getPrevInstructionSequential(*InstrMeta));
-  PrevInstrMeta = InstrMeta;
-
-  // 0xDEADBEEF + 10: movabs $0x4007c4, %rsi
-  InstrMeta = Analysis.getInstruction(0xDEADBEEF + 10);
-  EXPECT_NE(nullptr, InstrMeta);
-  EXPECT_EQ(NextInstrMeta, InstrMeta);
-  EXPECT_EQ(0xDEADBEEF + 10, InstrMeta->VMAddress);
-  EXPECT_EQ(10u, InstrMeta->InstructionSize);
-  EXPECT_TRUE(InstrMeta->Valid);
-
-  EXPECT_EQ(nullptr, Analysis.getNextInstructionSequential(*InstrMeta));
-  EXPECT_EQ(PrevInstrMeta, Analysis.getPrevInstructionSequential(*InstrMeta));
-  PrevInstrMeta = InstrMeta;
-
-  // 0xDEADBEEF + 20: (bad)
-  InstrMeta = Analysis.getInstruction(0xDEADBEEF + 20);
-  EXPECT_NE(nullptr, InstrMeta);
-  EXPECT_EQ(0xDEADBEEF + 20, InstrMeta->VMAddress);
-  EXPECT_EQ(1u, InstrMeta->InstructionSize);
-  EXPECT_FALSE(InstrMeta->Valid);
-
-  EXPECT_EQ(nullptr, Analysis.getNextInstructionSequential(*InstrMeta));
-  EXPECT_EQ(PrevInstrMeta, Analysis.getPrevInstructionSequential(*InstrMeta));
-
-  // 0xDEADBEEF + 21: rex.B (bad)
-  InstrMeta = Analysis.getInstruction(0xDEADBEEF + 21);
-  EXPECT_NE(nullptr, InstrMeta);
-  EXPECT_EQ(0xDEADBEEF + 21, InstrMeta->VMAddress);
-  EXPECT_EQ(2u, InstrMeta->InstructionSize);
-  EXPECT_FALSE(InstrMeta->Valid);
-
-  EXPECT_EQ(nullptr, Analysis.getNextInstructionSequential(*InstrMeta));
-  EXPECT_EQ(nullptr, Analysis.getPrevInstructionSequential(*InstrMeta));
-
-  // 0xDEADBEEF + 6: (bad) {%k1}
-  InstrMeta = Analysis.getInstruction(0xDEADBEEF + 23);
-  EXPECT_NE(nullptr, InstrMeta);
-  EXPECT_EQ(0xDEADBEEF + 23, InstrMeta->VMAddress);
-  EXPECT_EQ(5u, InstrMeta->InstructionSize);
-  EXPECT_FALSE(InstrMeta->Valid);
-
-  EXPECT_EQ(nullptr, Analysis.getNextInstructionSequential(*InstrMeta));
-  EXPECT_EQ(nullptr, Analysis.getPrevInstructionSequential(*InstrMeta));
-}
-
-TEST_F(BasicX86FileAnalysisTest, PrevAndNextFromBadInst) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x90, // 0: nop
-          0x2f, // 1: (bad)
-          0x90  // 2: nop
-      },
-      {0xDEADBEEF, 0x0});
-  const auto &BadInstrMeta = Analysis.getInstructionOrDie(0xDEADBEEF + 1);
-  const auto *GoodInstrMeta =
-      Analysis.getPrevInstructionSequential(BadInstrMeta);
-  EXPECT_NE(nullptr, GoodInstrMeta);
-  EXPECT_EQ(0xDEADBEEF, GoodInstrMeta->VMAddress);
-  EXPECT_EQ(1u, GoodInstrMeta->InstructionSize);
-
-  GoodInstrMeta = Analysis.getNextInstructionSequential(BadInstrMeta);
-  EXPECT_NE(nullptr, GoodInstrMeta);
-  EXPECT_EQ(0xDEADBEEF + 2, GoodInstrMeta->VMAddress);
-  EXPECT_EQ(1u, GoodInstrMeta->InstructionSize);
-}
-
-TEST_F(BasicX86FileAnalysisTest, CFITrapTest) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x90,                   // 0: nop
-          0xb0, 0x00,             // 1: mov $0x0, %al
-          0x48, 0x89, 0xe5,       // 3: mov %rsp, %rbp
-          0x48, 0x83, 0xec, 0x18, // 6: sub $0x18, %rsp
-          0x48, 0xbe, 0xc4, 0x07, 0x40,
-          0x00, 0x00, 0x00, 0x00, 0x00, // 10: movabs $0x4007c4, %rsi
-          0x2f,                         // 20: (bad)
-          0x41, 0x0e,                   // 21: rex.B (bad)
-          0x62, 0x72, 0x65, 0x61, 0x6b, // 23: (bad) {%k1}
-          0x0f, 0x0b                    // 28: ud2
-      },
-      {0xDEADBEEF, 0x0});
-
-  EXPECT_FALSE(Analysis.isCFITrap(Analysis.getInstructionOrDie(0xDEADBEEF)));
-  EXPECT_FALSE(
-      Analysis.isCFITrap(Analysis.getInstructionOrDie(0xDEADBEEF + 3)));
-  EXPECT_FALSE(
-      Analysis.isCFITrap(Analysis.getInstructionOrDie(0xDEADBEEF + 6)));
-  EXPECT_FALSE(
-      Analysis.isCFITrap(Analysis.getInstructionOrDie(0xDEADBEEF + 10)));
-  EXPECT_FALSE(
-      Analysis.isCFITrap(Analysis.getInstructionOrDie(0xDEADBEEF + 20)));
-  EXPECT_FALSE(
-      Analysis.isCFITrap(Analysis.getInstructionOrDie(0xDEADBEEF + 21)));
-  EXPECT_FALSE(
-      Analysis.isCFITrap(Analysis.getInstructionOrDie(0xDEADBEEF + 23)));
-  EXPECT_TRUE(
-      Analysis.isCFITrap(Analysis.getInstructionOrDie(0xDEADBEEF + 28)));
-}
-
-TEST_F(BasicX86FileAnalysisTest, FallThroughTest) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x90,                         // 0: nop
-          0xb0, 0x00,                   // 1: mov $0x0, %al
-          0x2f,                         // 3: (bad)
-          0x0f, 0x0b,                   // 4: ud2
-          0xff, 0x20,                   // 6: jmpq *(%rax)
-          0xeb, 0x00,                   // 8: jmp +0
-          0xe8, 0x45, 0xfe, 0xff, 0xff, // 10: callq [some loc]
-          0xff, 0x10,                   // 15: callq *(rax)
-          0x75, 0x00,                   // 17: jne +0
-          0xc3,                         // 19: retq
-      },
-      {0xDEADBEEF, 0x0});
-
-  EXPECT_TRUE(
-      Analysis.canFallThrough(Analysis.getInstructionOrDie(0xDEADBEEF)));
-  EXPECT_TRUE(
-      Analysis.canFallThrough(Analysis.getInstructionOrDie(0xDEADBEEF + 1)));
-  EXPECT_FALSE(
-      Analysis.canFallThrough(Analysis.getInstructionOrDie(0xDEADBEEF + 3)));
-  EXPECT_FALSE(
-      Analysis.canFallThrough(Analysis.getInstructionOrDie(0xDEADBEEF + 4)));
-  EXPECT_FALSE(
-      Analysis.canFallThrough(Analysis.getInstructionOrDie(0xDEADBEEF + 6)));
-  EXPECT_FALSE(
-      Analysis.canFallThrough(Analysis.getInstructionOrDie(0xDEADBEEF + 8)));
-  EXPECT_FALSE(
-      Analysis.canFallThrough(Analysis.getInstructionOrDie(0xDEADBEEF + 10)));
-  EXPECT_FALSE(
-      Analysis.canFallThrough(Analysis.getInstructionOrDie(0xDEADBEEF + 15)));
-  EXPECT_TRUE(
-      Analysis.canFallThrough(Analysis.getInstructionOrDie(0xDEADBEEF + 17)));
-  EXPECT_FALSE(
-      Analysis.canFallThrough(Analysis.getInstructionOrDie(0xDEADBEEF + 19)));
-}
-
-TEST_F(BasicX86FileAnalysisTest, DefiniteNextInstructionTest) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x90,                         // 0: nop
-          0xb0, 0x00,                   // 1: mov $0x0, %al
-          0x2f,                         // 3: (bad)
-          0x0f, 0x0b,                   // 4: ud2
-          0xff, 0x20,                   // 6: jmpq *(%rax)
-          0xeb, 0x00,                   // 8: jmp 10 [+0]
-          0xeb, 0x05,                   // 10: jmp 17 [+5]
-          0xe8, 0x00, 0x00, 0x00, 0x00, // 12: callq 17 [+0]
-          0xe8, 0x78, 0x56, 0x34, 0x12, // 17: callq 0x1234569f [+0x12345678]
-          0xe8, 0x04, 0x00, 0x00, 0x00, // 22: callq 31 [+4]
-          0xff, 0x10,                   // 27: callq *(rax)
-          0x75, 0x00,                   // 29: jne 31 [+0]
-          0x75, 0xe0,                   // 31: jne 1 [-32]
-          0xc3,                         // 33: retq
-          0xeb, 0xdd,                   // 34: jmp 1 [-35]
-          0xeb, 0xdd,                   // 36: jmp 3 [-35]
-          0xeb, 0xdc,                   // 38: jmp 4 [-36]
-      },
-      {0xDEADBEEF, 0x0});
-
-  const auto *Current = Analysis.getInstruction(0xDEADBEEF);
-  const auto *Next = Analysis.getDefiniteNextInstruction(*Current);
-  EXPECT_NE(nullptr, Next);
-  EXPECT_EQ(0xDEADBEEF + 1, Next->VMAddress);
-
-  Current = Analysis.getInstruction(0xDEADBEEF + 1);
-  EXPECT_EQ(nullptr, Analysis.getDefiniteNextInstruction(*Current));
-
-  Current = Analysis.getInstruction(0xDEADBEEF + 3);
-  EXPECT_EQ(nullptr, Analysis.getDefiniteNextInstruction(*Current));
-
-  Current = Analysis.getInstruction(0xDEADBEEF + 4);
-  EXPECT_EQ(nullptr, Analysis.getDefiniteNextInstruction(*Current));
-
-  Current = Analysis.getInstruction(0xDEADBEEF + 6);
-  EXPECT_EQ(nullptr, Analysis.getDefiniteNextInstruction(*Current));
-
-  Current = Analysis.getInstruction(0xDEADBEEF + 8);
-  Next = Analysis.getDefiniteNextInstruction(*Current);
-  EXPECT_NE(nullptr, Next);
-  EXPECT_EQ(0xDEADBEEF + 10, Next->VMAddress);
-
-  Current = Analysis.getInstruction(0xDEADBEEF + 10);
-  Next = Analysis.getDefiniteNextInstruction(*Current);
-  EXPECT_NE(nullptr, Next);
-  EXPECT_EQ(0xDEADBEEF + 17, Next->VMAddress);
-
-  Current = Analysis.getInstruction(0xDEADBEEF + 12);
-  Next = Analysis.getDefiniteNextInstruction(*Current);
-  EXPECT_NE(nullptr, Next);
-  EXPECT_EQ(0xDEADBEEF + 17, Next->VMAddress);
-
-  Current = Analysis.getInstruction(0xDEADBEEF + 17);
-  // Note, definite next instruction address is out of range and should fail.
-  EXPECT_EQ(nullptr, Analysis.getDefiniteNextInstruction(*Current));
-  Next = Analysis.getDefiniteNextInstruction(*Current);
-
-  Current = Analysis.getInstruction(0xDEADBEEF + 22);
-  Next = Analysis.getDefiniteNextInstruction(*Current);
-  EXPECT_NE(nullptr, Next);
-  EXPECT_EQ(0xDEADBEEF + 31, Next->VMAddress);
-
-  Current = Analysis.getInstruction(0xDEADBEEF + 27);
-  EXPECT_EQ(nullptr, Analysis.getDefiniteNextInstruction(*Current));
-  Current = Analysis.getInstruction(0xDEADBEEF + 29);
-  EXPECT_EQ(nullptr, Analysis.getDefiniteNextInstruction(*Current));
-  Current = Analysis.getInstruction(0xDEADBEEF + 31);
-  EXPECT_EQ(nullptr, Analysis.getDefiniteNextInstruction(*Current));
-  Current = Analysis.getInstruction(0xDEADBEEF + 33);
-  EXPECT_EQ(nullptr, Analysis.getDefiniteNextInstruction(*Current));
-
-  Current = Analysis.getInstruction(0xDEADBEEF + 34);
-  Next = Analysis.getDefiniteNextInstruction(*Current);
-  EXPECT_NE(nullptr, Next);
-  EXPECT_EQ(0xDEADBEEF + 1, Next->VMAddress);
-
-  Current = Analysis.getInstruction(0xDEADBEEF + 36);
-  EXPECT_EQ(nullptr, Analysis.getDefiniteNextInstruction(*Current));
-
-  Current = Analysis.getInstruction(0xDEADBEEF + 38);
-  Next = Analysis.getDefiniteNextInstruction(*Current);
-  EXPECT_NE(nullptr, Next);
-  EXPECT_EQ(0xDEADBEEF + 4, Next->VMAddress);
-}
-
-TEST_F(BasicX86FileAnalysisTest, ControlFlowXRefsTest) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x90,                         // 0: nop
-          0xb0, 0x00,                   // 1: mov $0x0, %al
-          0x2f,                         // 3: (bad)
-          0x0f, 0x0b,                   // 4: ud2
-          0xff, 0x20,                   // 6: jmpq *(%rax)
-          0xeb, 0x00,                   // 8: jmp 10 [+0]
-          0xeb, 0x05,                   // 10: jmp 17 [+5]
-          0xe8, 0x00, 0x00, 0x00, 0x00, // 12: callq 17 [+0]
-          0xe8, 0x78, 0x56, 0x34, 0x12, // 17: callq 0x1234569f [+0x12345678]
-          0xe8, 0x04, 0x00, 0x00, 0x00, // 22: callq 31 [+4]
-          0xff, 0x10,                   // 27: callq *(rax)
-          0x75, 0x00,                   // 29: jne 31 [+0]
-          0x75, 0xe0,                   // 31: jne 1 [-32]
-          0xc3,                         // 33: retq
-          0xeb, 0xdd,                   // 34: jmp 1 [-35]
-          0xeb, 0xdd,                   // 36: jmp 3 [-35]
-          0xeb, 0xdc,                   // 38: jmp 4 [-36]
-      },
-      {0xDEADBEEF, 0x0});
-  const auto *InstrMetaPtr = &Analysis.getInstructionOrDie(0xDEADBEEF);
-  std::set<const Instr *> XRefs =
-      Analysis.getDirectControlFlowXRefs(*InstrMetaPtr);
-  EXPECT_TRUE(XRefs.empty());
-
-  InstrMetaPtr = &Analysis.getInstructionOrDie(0xDEADBEEF + 1);
-  XRefs = Analysis.getDirectControlFlowXRefs(*InstrMetaPtr);
-  EXPECT_THAT(XRefs, UnorderedElementsAre(
-                         Field(&Instr::VMAddress, Eq(0xDEADBEEF)),
-                         Field(&Instr::VMAddress, Eq(0xDEADBEEF + 31)),
-                         Field(&Instr::VMAddress, Eq(0xDEADBEEF + 34))));
-
-  InstrMetaPtr = &Analysis.getInstructionOrDie(0xDEADBEEF + 3);
-  XRefs = Analysis.getDirectControlFlowXRefs(*InstrMetaPtr);
-  EXPECT_THAT(XRefs, UnorderedElementsAre(
-                         Field(&Instr::VMAddress, Eq(0xDEADBEEF + 1)),
-                         Field(&Instr::VMAddress, Eq(0xDEADBEEF + 36))));
-
-  InstrMetaPtr = &Analysis.getInstructionOrDie(0xDEADBEEF + 4);
-  XRefs = Analysis.getDirectControlFlowXRefs(*InstrMetaPtr);
-  EXPECT_THAT(XRefs, UnorderedElementsAre(
-                         Field(&Instr::VMAddress, Eq(0xDEADBEEF + 38))));
-
-  InstrMetaPtr = &Analysis.getInstructionOrDie(0xDEADBEEF + 6);
-  EXPECT_TRUE(Analysis.getDirectControlFlowXRefs(*InstrMetaPtr).empty());
-
-  InstrMetaPtr = &Analysis.getInstructionOrDie(0xDEADBEEF + 8);
-  XRefs = Analysis.getDirectControlFlowXRefs(*InstrMetaPtr);
-  EXPECT_TRUE(Analysis.getDirectControlFlowXRefs(*InstrMetaPtr).empty());
-
-  InstrMetaPtr = &Analysis.getInstructionOrDie(0xDEADBEEF + 10);
-  XRefs = Analysis.getDirectControlFlowXRefs(*InstrMetaPtr);
-  EXPECT_THAT(XRefs, UnorderedElementsAre(
-                         Field(&Instr::VMAddress, Eq(0xDEADBEEF + 8))));
-
-  InstrMetaPtr = &Analysis.getInstructionOrDie(0xDEADBEEF + 12);
-  XRefs = Analysis.getDirectControlFlowXRefs(*InstrMetaPtr);
-  EXPECT_TRUE(Analysis.getDirectControlFlowXRefs(*InstrMetaPtr).empty());
-
-  InstrMetaPtr = &Analysis.getInstructionOrDie(0xDEADBEEF + 17);
-  XRefs = Analysis.getDirectControlFlowXRefs(*InstrMetaPtr);
-  EXPECT_THAT(XRefs, UnorderedElementsAre(
-                         Field(&Instr::VMAddress, Eq(0xDEADBEEF + 10)),
-                         Field(&Instr::VMAddress, Eq(0xDEADBEEF + 12))));
-
-  InstrMetaPtr = &Analysis.getInstructionOrDie(0xDEADBEEF + 22);
-  XRefs = Analysis.getDirectControlFlowXRefs(*InstrMetaPtr);
-  EXPECT_TRUE(Analysis.getDirectControlFlowXRefs(*InstrMetaPtr).empty());
-
-  InstrMetaPtr = &Analysis.getInstructionOrDie(0xDEADBEEF + 27);
-  XRefs = Analysis.getDirectControlFlowXRefs(*InstrMetaPtr);
-  EXPECT_TRUE(Analysis.getDirectControlFlowXRefs(*InstrMetaPtr).empty());
-
-  InstrMetaPtr = &Analysis.getInstructionOrDie(0xDEADBEEF + 29);
-  XRefs = Analysis.getDirectControlFlowXRefs(*InstrMetaPtr);
-  EXPECT_TRUE(Analysis.getDirectControlFlowXRefs(*InstrMetaPtr).empty());
-
-  InstrMetaPtr = &Analysis.getInstructionOrDie(0xDEADBEEF + 31);
-  XRefs = Analysis.getDirectControlFlowXRefs(*InstrMetaPtr);
-  EXPECT_THAT(XRefs, UnorderedElementsAre(
-                         Field(&Instr::VMAddress, Eq(0xDEADBEEF + 22)),
-                         Field(&Instr::VMAddress, Eq(0xDEADBEEF + 29))));
-
-  InstrMetaPtr = &Analysis.getInstructionOrDie(0xDEADBEEF + 33);
-  XRefs = Analysis.getDirectControlFlowXRefs(*InstrMetaPtr);
-  EXPECT_THAT(XRefs, UnorderedElementsAre(
-                         Field(&Instr::VMAddress, Eq(0xDEADBEEF + 31))));
-
-  InstrMetaPtr = &Analysis.getInstructionOrDie(0xDEADBEEF + 34);
-  XRefs = Analysis.getDirectControlFlowXRefs(*InstrMetaPtr);
-  EXPECT_TRUE(Analysis.getDirectControlFlowXRefs(*InstrMetaPtr).empty());
-
-  InstrMetaPtr = &Analysis.getInstructionOrDie(0xDEADBEEF + 36);
-  XRefs = Analysis.getDirectControlFlowXRefs(*InstrMetaPtr);
-  EXPECT_TRUE(Analysis.getDirectControlFlowXRefs(*InstrMetaPtr).empty());
-
-  InstrMetaPtr = &Analysis.getInstructionOrDie(0xDEADBEEF + 38);
-  XRefs = Analysis.getDirectControlFlowXRefs(*InstrMetaPtr);
-  EXPECT_TRUE(Analysis.getDirectControlFlowXRefs(*InstrMetaPtr).empty());
-}
-
-TEST_F(BasicX86FileAnalysisTest, CFIProtectionInvalidTargets) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x90,       // 0: nop
-          0x0f, 0x0b, // 1: ud2
-          0x75, 0x00, // 3: jne 5 [+0]
-      },
-      {0xDEADBEEF, 0x0});
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF, 0x0});
-  EXPECT_EQ(CFIProtectionStatus::FAIL_NOT_INDIRECT_CF,
-            Analysis.validateCFIProtection(Result));
-  Result = GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 1, 0x0});
-  EXPECT_EQ(CFIProtectionStatus::FAIL_NOT_INDIRECT_CF,
-            Analysis.validateCFIProtection(Result));
-  Result = GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 3, 0x0});
-  EXPECT_EQ(CFIProtectionStatus::FAIL_NOT_INDIRECT_CF,
-            Analysis.validateCFIProtection(Result));
-  Result = GraphBuilder::buildFlowGraph(Analysis, {0x12345678, 0x0});
-  EXPECT_EQ(CFIProtectionStatus::FAIL_INVALID_INSTRUCTION,
-            Analysis.validateCFIProtection(Result));
-}
-
-TEST_F(BasicX86FileAnalysisTest, CFIProtectionBasicFallthroughToUd2) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x75, 0x02, // 0: jne 4 [+2]
-          0x0f, 0x0b, // 2: ud2
-          0xff, 0x10, // 4: callq *(%rax)
-      },
-      {0xDEADBEEF, 0x0});
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 4, 0x0});
-  EXPECT_EQ(CFIProtectionStatus::PROTECTED,
-            Analysis.validateCFIProtection(Result));
-}
-
-TEST_F(BasicX86FileAnalysisTest, CFIProtectionBasicJumpToUd2) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x75, 0x02, // 0: jne 4 [+2]
-          0xff, 0x10, // 2: callq *(%rax)
-          0x0f, 0x0b, // 4: ud2
-      },
-      {0xDEADBEEF, 0x0});
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 2, 0x0});
-  EXPECT_EQ(CFIProtectionStatus::PROTECTED,
-            Analysis.validateCFIProtection(Result));
-}
-
-TEST_F(BasicX86FileAnalysisTest, CFIProtectionDualPathUd2) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x75, 0x03, // 0: jne 5 [+3]
-          0x90,       // 2: nop
-          0xff, 0x10, // 3: callq *(%rax)
-          0x0f, 0x0b, // 5: ud2
-          0x75, 0xf9, // 7: jne 2 [-7]
-          0x0f, 0x0b, // 9: ud2
-      },
-      {0xDEADBEEF, 0x0});
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 3, 0x0});
-  EXPECT_EQ(CFIProtectionStatus::PROTECTED,
-            Analysis.validateCFIProtection(Result));
-}
-
-TEST_F(BasicX86FileAnalysisTest, CFIProtectionDualPathSingleUd2) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x75, 0x05, // 0: jne 7 [+5]
-          0x90,       // 2: nop
-          0xff, 0x10, // 3: callq *(%rax)
-          0x75, 0xfb, // 5: jne 2 [-5]
-          0x0f, 0x0b, // 7: ud2
-      },
-      {0xDEADBEEF, 0x0});
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 3, 0x0});
-  EXPECT_EQ(CFIProtectionStatus::PROTECTED,
-            Analysis.validateCFIProtection(Result));
-}
-
-TEST_F(BasicX86FileAnalysisTest, CFIProtectionDualFailLimitUpwards) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x75, 0x06, // 0: jne 8 [+6]
-          0x90,       // 2: nop
-          0x90,       // 3: nop
-          0x90,       // 4: nop
-          0x90,       // 5: nop
-          0xff, 0x10, // 6: callq *(%rax)
-          0x0f, 0x0b, // 8: ud2
-      },
-      {0xDEADBEEF, 0x0});
-  uint64_t PrevSearchLengthForConditionalBranch =
-      SearchLengthForConditionalBranch;
-  SearchLengthForConditionalBranch = 2;
-
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 6, 0x0});
-  EXPECT_EQ(CFIProtectionStatus::FAIL_ORPHANS,
-            Analysis.validateCFIProtection(Result));
-
-  SearchLengthForConditionalBranch = PrevSearchLengthForConditionalBranch;
-}
-
-TEST_F(BasicX86FileAnalysisTest, CFIProtectionDualFailLimitDownwards) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x75, 0x02, // 0: jne 4 [+2]
-          0xff, 0x10, // 2: callq *(%rax)
-          0x90,       // 4: nop
-          0x90,       // 5: nop
-          0x90,       // 6: nop
-          0x90,       // 7: nop
-          0x0f, 0x0b, // 8: ud2
-      },
-      {0xDEADBEEF, 0x0});
-  uint64_t PrevSearchLengthForUndef = SearchLengthForUndef;
-  SearchLengthForUndef = 2;
-
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 2, 0x0});
-  EXPECT_EQ(CFIProtectionStatus::FAIL_BAD_CONDITIONAL_BRANCH,
-            Analysis.validateCFIProtection(Result));
-
-  SearchLengthForUndef = PrevSearchLengthForUndef;
-}
-
-TEST_F(BasicX86FileAnalysisTest, CFIProtectionGoodAndBadPaths) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0xeb, 0x02, // 0: jmp 4 [+2]
-          0x75, 0x02, // 2: jne 6 [+2]
-          0xff, 0x10, // 4: callq *(%rax)
-          0x0f, 0x0b, // 6: ud2
-      },
-      {0xDEADBEEF, 0x0});
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 4, 0x0});
-  EXPECT_EQ(CFIProtectionStatus::FAIL_ORPHANS,
-            Analysis.validateCFIProtection(Result));
-}
-
-TEST_F(BasicX86FileAnalysisTest, CFIProtectionWithUnconditionalJumpInFallthrough) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x75, 0x04, // 0: jne 6 [+4]
-          0xeb, 0x00, // 2: jmp 4 [+0]
-          0xff, 0x10, // 4: callq *(%rax)
-          0x0f, 0x0b, // 6: ud2
-      },
-      {0xDEADBEEF, 0x0});
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 4, 0x0});
-  EXPECT_EQ(CFIProtectionStatus::PROTECTED,
-            Analysis.validateCFIProtection(Result));
-}
-
-TEST_F(BasicX86FileAnalysisTest, CFIProtectionComplexExample) {
-  if (!SuccessfullyInitialised)
-    return;
-  // See unittests/GraphBuilder.cpp::BuildFlowGraphComplexExample for this
-  // graph.
-  Analysis.parseSectionContents(
-      {
-          0x75, 0x12,                   // 0: jne 20 [+18]
-          0xeb, 0x03,                   // 2: jmp 7 [+3]
-          0x75, 0x10,                   // 4: jne 22 [+16]
-          0x90,                         // 6: nop
-          0x90,                         // 7: nop
-          0x90,                         // 8: nop
-          0xff, 0x10,                   // 9: callq *(%rax)
-          0xeb, 0xfc,                   // 11: jmp 9 [-4]
-          0x75, 0xfa,                   // 13: jne 9 [-6]
-          0xe8, 0x78, 0x56, 0x34, 0x12, // 15: callq OUTOFBOUNDS [+0x12345678]
-          0x90,                         // 20: nop
-          0x90,                         // 21: nop
-          0x0f, 0x0b,                   // 22: ud2
-      },
-      {0xDEADBEEF, 0x0});
-  uint64_t PrevSearchLengthForUndef = SearchLengthForUndef;
-  SearchLengthForUndef = 5;
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 9, 0x0});
-  EXPECT_EQ(CFIProtectionStatus::FAIL_ORPHANS,
-            Analysis.validateCFIProtection(Result));
-  SearchLengthForUndef = PrevSearchLengthForUndef;
-}
-
-TEST_F(BasicX86FileAnalysisTest, UndefSearchLengthOneTest) {
-  Analysis.parseSectionContents(
-      {
-          0x77, 0x0d,                   // 0x688118: ja 0x688127 [+12]
-          0x48, 0x89, 0xdf,             // 0x68811a: mov %rbx, %rdi
-          0xff, 0xd0,                   // 0x68811d: callq *%rax
-          0x48, 0x89, 0xdf,             // 0x68811f: mov %rbx, %rdi
-          0xe8, 0x09, 0x00, 0x00, 0x00, // 0x688122: callq 0x688130
-          0x0f, 0x0b,                   // 0x688127: ud2
-      },
-      {0x688118, 0x0});
-  uint64_t PrevSearchLengthForUndef = SearchLengthForUndef;
-  SearchLengthForUndef = 1;
-  GraphResult Result = GraphBuilder::buildFlowGraph(Analysis, {0x68811d, 0x0});
-  EXPECT_EQ(CFIProtectionStatus::PROTECTED,
-            Analysis.validateCFIProtection(Result));
-  SearchLengthForUndef = PrevSearchLengthForUndef;
-}
-
-TEST_F(BasicX86FileAnalysisTest, UndefSearchLengthOneTestFarAway) {
-  Analysis.parseSectionContents(
-      {
-          0x74, 0x73,                         // 0x7759eb: je 0x775a60
-          0xe9, 0x1c, 0x04, 0x00, 0x00, 0x00, // 0x7759ed: jmpq 0x775e0e
-      },
-      {0x7759eb, 0x0});
-
-  Analysis.parseSectionContents(
-      {
-          0x0f, 0x85, 0xb2, 0x03, 0x00, 0x00, // 0x775a56: jne    0x775e0e
-          0x48, 0x83, 0xc3, 0xf4, // 0x775a5c: add    $0xfffffffffffffff4,%rbx
-          0x48, 0x8b, 0x7c, 0x24, 0x10, // 0x775a60: mov    0x10(%rsp),%rdi
-          0x48, 0x89, 0xde,             // 0x775a65: mov    %rbx,%rsi
-          0xff, 0xd1,                   // 0x775a68: callq  *%rcx
-      },
-      {0x775a56, 0x0});
-
-  Analysis.parseSectionContents(
-      {
-          0x0f, 0x0b, // 0x775e0e: ud2
-      },
-      {0x775e0e, 0x0});
-  uint64_t PrevSearchLengthForUndef = SearchLengthForUndef;
-  SearchLengthForUndef = 1;
-  GraphResult Result = GraphBuilder::buildFlowGraph(Analysis, {0x775a68, 0x0});
-  EXPECT_EQ(CFIProtectionStatus::FAIL_BAD_CONDITIONAL_BRANCH,
-            Analysis.validateCFIProtection(Result));
-  SearchLengthForUndef = 2;
-  Result = GraphBuilder::buildFlowGraph(Analysis, {0x775a68, 0x0});
-  EXPECT_EQ(CFIProtectionStatus::PROTECTED,
-            Analysis.validateCFIProtection(Result));
-  SearchLengthForUndef = 3;
-  Result = GraphBuilder::buildFlowGraph(Analysis, {0x775a68, 0x0});
-  EXPECT_EQ(CFIProtectionStatus::PROTECTED,
-            Analysis.validateCFIProtection(Result));
-  SearchLengthForUndef = PrevSearchLengthForUndef;
-}
-
-TEST_F(BasicX86FileAnalysisTest, CFIProtectionClobberSinglePathExplicit) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x75, 0x02,                         // 0: jne 4 [+2]
-          0x0f, 0x0b,                         // 2: ud2
-          0x48, 0x05, 0x00, 0x00, 0x00, 0x00, // 4: add $0x0, %rax
-          0xff, 0x10,                         // 10: callq *(%rax)
-      },
-      {0xDEADBEEF, 0x0});
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 10, 0x0});
-  EXPECT_EQ(CFIProtectionStatus::FAIL_REGISTER_CLOBBERED,
-            Analysis.validateCFIProtection(Result));
-}
-
-TEST_F(BasicX86FileAnalysisTest, CFIProtectionClobberSinglePathExplicit2) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x75, 0x02,             // 0: jne 4 [+2]
-          0x0f, 0x0b,             // 2: ud2
-          0x48, 0x83, 0xc0, 0x00, // 4: add $0x0, %rax
-          0xff, 0x10,             // 8: callq *(%rax)
-      },
-      {0xDEADBEEF, 0x0});
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 8, 0x0});
-  EXPECT_EQ(CFIProtectionStatus::FAIL_REGISTER_CLOBBERED,
-            Analysis.validateCFIProtection(Result));
-}
-
-TEST_F(BasicX86FileAnalysisTest, CFIProtectionClobberSinglePathImplicit) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x75, 0x02,                   // 0: jne 4 [+2]
-          0x0f, 0x0b,                   // 2: ud2
-          0x05, 0x00, 0x00, 0x00, 0x00, // 4: add $0x0, %eax
-          0xff, 0x10,                   // 9: callq *(%rax)
-      },
-      {0xDEADBEEF, 0x0});
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 9, 0x0});
-  EXPECT_EQ(CFIProtectionStatus::FAIL_REGISTER_CLOBBERED,
-            Analysis.validateCFIProtection(Result));
-}
-
-TEST_F(BasicX86FileAnalysisTest, CFIProtectionClobberDualPathImplicit) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x75, 0x04, // 0: jne 6 [+4]
-          0x0f, 0x31, // 2: rdtsc (note: affects eax)
-          0xff, 0x10, // 4: callq *(%rax)
-          0x0f, 0x0b, // 6: ud2
-          0x75, 0xf9, // 8: jne 2 [-7]
-          0x0f, 0x0b, // 10: ud2
-      },
-      {0xDEADBEEF, 0x0});
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 4, 0x0});
-  EXPECT_EQ(CFIProtectionStatus::FAIL_REGISTER_CLOBBERED,
-            Analysis.validateCFIProtection(Result));
-}
-
-TEST_F(BasicAArch64FileAnalysisTest, AArch64BasicUnprotected) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x00, 0x01, 0x3f, 0xd6, // 0: blr x8
-      },
-      {0xDEADBEEF, 0x0});
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF, 0x0});
-  EXPECT_EQ(CFIProtectionStatus::FAIL_ORPHANS,
-            Analysis.validateCFIProtection(Result));
-}
-
-TEST_F(BasicAArch64FileAnalysisTest, AArch64BasicProtected) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x49, 0x00, 0x00, 0x54, // 0: b.ls 8
-          0x20, 0x00, 0x20, 0xd4, // 4: brk #0x1
-          0x00, 0x01, 0x3f, 0xd6, // 8: blr x8
-      },
-      {0xDEADBEEF, 0x0});
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 8, 0x0});
-  EXPECT_EQ(CFIProtectionStatus::PROTECTED,
-            Analysis.validateCFIProtection(Result));
-}
-
-TEST_F(BasicAArch64FileAnalysisTest, AArch64ClobberBasic) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x49, 0x00, 0x00, 0x54, // 0: b.ls 8
-          0x20, 0x00, 0x20, 0xd4, // 4: brk #0x1
-          0x08, 0x05, 0x00, 0x91, // 8: add x8, x8, #1
-          0x00, 0x01, 0x3f, 0xd6, // 12: blr x8
-      },
-      {0xDEADBEEF, 0x0});
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 12, 0x0});
-  EXPECT_EQ(CFIProtectionStatus::FAIL_REGISTER_CLOBBERED,
-            Analysis.validateCFIProtection(Result));
-}
-
-TEST_F(BasicAArch64FileAnalysisTest, AArch64ClobberOneLoad) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x49, 0x00, 0x00, 0x54, // 0: b.ls 8
-          0x20, 0x00, 0x20, 0xd4, // 4: brk #0x1
-          0x21, 0x09, 0x40, 0xf9, // 8: ldr x1, [x9,#16]
-          0x20, 0x00, 0x1f, 0xd6, // 12: br x1
-      },
-      {0xDEADBEEF, 0x0});
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 12, 0x0});
-  EXPECT_EQ(CFIProtectionStatus::PROTECTED,
-            Analysis.validateCFIProtection(Result));
-}
-
-TEST_F(BasicAArch64FileAnalysisTest, AArch64ClobberLoadAddGood) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x49, 0x00, 0x00, 0x54, // 0: b.ls 8
-          0x20, 0x00, 0x20, 0xd4, // 4: brk #0x1
-          0x21, 0x04, 0x00, 0x91, // 8: add x1, x1, #1
-          0x21, 0x09, 0x40, 0xf9, // 12: ldr x1, [x9,#16]
-          0x20, 0x00, 0x1f, 0xd6, // 16: br x1
-      },
-      {0xDEADBEEF, 0x0});
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 16, 0x0});
-  EXPECT_EQ(CFIProtectionStatus::PROTECTED,
-            Analysis.validateCFIProtection(Result));
-}
-
-TEST_F(BasicAArch64FileAnalysisTest, AArch64ClobberLoadAddBad) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x49, 0x00, 0x00, 0x54, // 0: b.ls 8
-          0x20, 0x00, 0x20, 0xd4, // 4: brk #0x1
-          0x21, 0x09, 0x40, 0xf9, // 8: ldr x1, [x9,#16]
-          0x21, 0x04, 0x00, 0x91, // 12: add x1, x1, #1
-          0x20, 0x00, 0x1f, 0xd6, // 16: br x1
-      },
-      {0xDEADBEEF, 0x0});
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 16, 0x0});
-  EXPECT_EQ(CFIProtectionStatus::FAIL_REGISTER_CLOBBERED,
-            Analysis.validateCFIProtection(Result));
-}
-
-TEST_F(BasicAArch64FileAnalysisTest, AArch64ClobberLoadAddBad2) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x49, 0x00, 0x00, 0x54, // 0: b.ls 8
-          0x20, 0x00, 0x20, 0xd4, // 4: brk #0x1
-          0x29, 0x04, 0x00, 0x91, // 16: add x9, x1, #1
-          0x21, 0x09, 0x40, 0xf9, // 12: ldr x1, [x9,#16]
-          0x20, 0x00, 0x1f, 0xd6, // 16: br x1
-      },
-      {0xDEADBEEF, 0x0});
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 16, 0x0});
-  EXPECT_EQ(CFIProtectionStatus::FAIL_REGISTER_CLOBBERED,
-            Analysis.validateCFIProtection(Result));
-}
-
-TEST_F(BasicAArch64FileAnalysisTest, AArch64ClobberTwoLoads) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x49, 0x00, 0x00, 0x54, // 0: b.ls 8
-          0x20, 0x00, 0x20, 0xd4, // 4: brk #0x1
-          0x21, 0x09, 0x40, 0xf9, // 8: ldr x1, [x9,#16]
-          0x21, 0x08, 0x40, 0xf9, // 12: ldr x1, [x1,#16]
-          0x20, 0x00, 0x1f, 0xd6, // 16: br x1
-      },
-      {0xDEADBEEF, 0x0});
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 16, 0x0});
-  EXPECT_EQ(CFIProtectionStatus::FAIL_REGISTER_CLOBBERED,
-            Analysis.validateCFIProtection(Result));
-}
-
-TEST_F(BasicAArch64FileAnalysisTest, AArch64ClobberUnrelatedSecondLoad) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x49, 0x00, 0x00, 0x54, // 0: b.ls 8
-          0x20, 0x00, 0x20, 0xd4, // 4: brk #0x1
-          0x21, 0x09, 0x40, 0xf9, // 8: ldr x1, [x9,#16]
-          0x21, 0x09, 0x40, 0xf9, // 12: ldr x1, [x9,#16]
-          0x20, 0x00, 0x1f, 0xd6, // 16: br x1
-      },
-      {0xDEADBEEF, 0x0});
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 16, 0x0});
-  EXPECT_EQ(CFIProtectionStatus::PROTECTED,
-            Analysis.validateCFIProtection(Result));
-}
-
-TEST_F(BasicAArch64FileAnalysisTest, AArch64ClobberUnrelatedLoads) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x49, 0x00, 0x00, 0x54, // 0: b.ls 8
-          0x20, 0x00, 0x20, 0xd4, // 4: brk #0x1
-          0x22, 0x09, 0x40, 0xf9, // 8: ldr x2, [x9,#16]
-          0x22, 0x08, 0x40, 0xf9, // 12: ldr x2, [x1,#16]
-          0x20, 0x00, 0x1f, 0xd6, // 16: br x1
-      },
-      {0xDEADBEEF, 0x0});
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 16, 0x0});
-  EXPECT_EQ(CFIProtectionStatus::PROTECTED,
-            Analysis.validateCFIProtection(Result));
-}
-
-TEST_F(BasicAArch64FileAnalysisTest, AArch64GoodAndBadPaths) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x03, 0x00, 0x00, 0x14, // 0: b 12
-          0x49, 0x00, 0x00, 0x54, // 4: b.ls 8
-          0x20, 0x00, 0x20, 0xd4, // 8: brk #0x1
-          0x20, 0x00, 0x1f, 0xd6, // 12: br x1
-      },
-      {0xDEADBEEF, 0x0});
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 12, 0x0});
-  EXPECT_EQ(CFIProtectionStatus::FAIL_ORPHANS,
-            Analysis.validateCFIProtection(Result));
-}
-
-TEST_F(BasicAArch64FileAnalysisTest, AArch64TwoPaths) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0xc9, 0x00, 0x00, 0x54, // 0: b.ls 24
-          0x21, 0x08, 0x40, 0xf9, // 4: ldr x1, [x1,#16]
-          0x03, 0x00, 0x00, 0x14, // 8: b 12
-          0x69, 0x00, 0x00, 0x54, // 12: b.ls 12
-          0x21, 0x08, 0x40, 0xf9, // 16: ldr x1, [x1,#16]
-          0x20, 0x00, 0x1f, 0xd6, // 20: br x1
-          0x20, 0x00, 0x20, 0xd4, // 24: brk #0x1
-      },
-      {0xDEADBEEF, 0x0});
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 20, 0x0});
-  EXPECT_EQ(CFIProtectionStatus::PROTECTED,
-            Analysis.validateCFIProtection(Result));
-}
-
-TEST_F(BasicAArch64FileAnalysisTest, AArch64TwoPathsBadLoad1) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0xe9, 0x00, 0x00, 0x54, // 0: b.ls 28
-          0x21, 0x08, 0x40, 0xf9, // 4: ldr x1, [x1,#16]
-          0x21, 0x08, 0x40, 0xf9, // 8: ldr x1, [x1,#16]
-          0x03, 0x00, 0x00, 0x14, // 12: b 12
-          0x69, 0x00, 0x00, 0x54, // 16: b.ls 12
-          0x21, 0x08, 0x40, 0xf9, // 20: ldr x1, [x1,#16]
-          0x20, 0x00, 0x1f, 0xd6, // 24: br x1
-          0x20, 0x00, 0x20, 0xd4, // 28: brk #0x1
-      },
-      {0xDEADBEEF, 0x0});
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 24, 0x0});
-  EXPECT_EQ(CFIProtectionStatus::FAIL_REGISTER_CLOBBERED,
-            Analysis.validateCFIProtection(Result));
-}
-
-TEST_F(BasicAArch64FileAnalysisTest, AArch64TwoPathsBadLoad2) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0xe9, 0x00, 0x00, 0x54, // 0: b.ls 28
-          0x21, 0x08, 0x40, 0xf9, // 4: ldr x1, [x1,#16]
-          0x03, 0x00, 0x00, 0x14, // 8: b 12
-          0x89, 0x00, 0x00, 0x54, // 12: b.ls 16
-          0x21, 0x08, 0x40, 0xf9, // 16: ldr x1, [x1,#16]
-          0x21, 0x08, 0x40, 0xf9, // 20: ldr x1, [x1,#16]
-          0x20, 0x00, 0x1f, 0xd6, // 24: br x1
-          0x20, 0x00, 0x20, 0xd4, // 28: brk #0x1
-      },
-      {0xDEADBEEF, 0x0});
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 24, 0x0});
-  EXPECT_EQ(CFIProtectionStatus::FAIL_REGISTER_CLOBBERED,
-            Analysis.validateCFIProtection(Result));
-}
-
-} // anonymous namespace
-} // end namespace cfi_verify
-} // end namespace llvm
-
-int main(int argc, char **argv) {
-  ::testing::InitGoogleTest(&argc, argv);
-  llvm::cl::ParseCommandLineOptions(argc, argv);
-
-  llvm::InitializeAllTargetInfos();
-  llvm::InitializeAllTargetMCs();
-  llvm::InitializeAllAsmParsers();
-  llvm::InitializeAllDisassemblers();
-
-  return RUN_ALL_TESTS();
-}
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-cfi-verify/GraphBuilder.cpp b/gnu/llvm/llvm/unittests/tools/llvm-cfi-verify/GraphBuilder.cpp
deleted file mode 100644
index 954c113b915..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-cfi-verify/GraphBuilder.cpp
+++ /dev/null
@@ -1,598 +0,0 @@
-//===- llvm/unittests/llvm-cfi-verify/GraphBuilder.cpp --------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "../tools/llvm-cfi-verify/lib/GraphBuilder.h"
-#include "../tools/llvm-cfi-verify/lib/FileAnalysis.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-#include "llvm/BinaryFormat/ELF.h"
-#include "llvm/MC/MCAsmInfo.h"
-#include "llvm/MC/MCContext.h"
-#include "llvm/MC/MCDisassembler/MCDisassembler.h"
-#include "llvm/MC/MCInst.h"
-#include "llvm/MC/MCInstPrinter.h"
-#include "llvm/MC/MCInstrAnalysis.h"
-#include "llvm/MC/MCInstrDesc.h"
-#include "llvm/MC/MCInstrInfo.h"
-#include "llvm/MC/MCObjectFileInfo.h"
-#include "llvm/MC/MCRegisterInfo.h"
-#include "llvm/MC/MCSubtargetInfo.h"
-#include "llvm/Object/Binary.h"
-#include "llvm/Object/COFF.h"
-#include "llvm/Object/ELFObjectFile.h"
-#include "llvm/Object/ObjectFile.h"
-#include "llvm/Support/Casting.h"
-#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/Error.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "llvm/Support/raw_ostream.h"
-
-#include <cstdlib>
-#include <sstream>
-
-using Instr = ::llvm::cfi_verify::FileAnalysis::Instr;
-using ::testing::AllOf;
-using ::testing::Each;
-using ::testing::ElementsAre;
-using ::testing::Eq;
-using ::testing::Field;
-using ::testing::IsEmpty;
-using ::testing::Matches;
-using ::testing::Pair;
-using ::testing::PrintToString;
-using ::testing::Property;
-using ::testing::SizeIs;
-using ::testing::UnorderedElementsAre;
-using ::testing::Value;
-
-namespace llvm {
-namespace cfi_verify {
-// Printing helpers for gtest.
-std::string HexStringifyContainer(const std::vector<uint64_t> &C) {
-  std::stringstream Stream;
-  if (C.empty()) {
-    return "{ }";
-  }
-
-  Stream << "{ ";
-  const auto &LastElemIt = std::end(C) - 1;
-
-  for (auto It = std::begin(C); It != LastElemIt; ++It) {
-    Stream << "0x" << std::hex << *It << ", ";
-  }
-  Stream << "0x" << std::hex << *LastElemIt << " }";
-  return Stream.str();
-}
-
-void PrintTo(const ConditionalBranchNode &BranchNode, ::std::ostream *os) {
-  *os << "ConditionalBranchNode<Address: 0x" << std::hex << BranchNode.Address
-      << ", Target: 0x" << BranchNode.Target << ", Fallthrough: 0x"
-      << BranchNode.Fallthrough
-      << ", CFIProtection: " << BranchNode.CFIProtection << ">";
-}
-
-void PrintTo(const GraphResult &Result, ::std::ostream *os) {
-  *os << "Result BaseAddress: 0x" << std::hex << Result.BaseAddress << "\n";
-
-  if (Result.ConditionalBranchNodes.empty())
-    *os << "  (No conditional branch nodes)\n";
-
-  for (const auto &Node : Result.ConditionalBranchNodes) {
-    *os << "  ";
-    PrintTo(Node, os);
-    *os << "\n    Fallthrough Path: " << std::hex
-        << HexStringifyContainer(Result.flattenAddress(Node.Fallthrough))
-        << "\n";
-    *os << "    Target Path: " << std::hex
-        << HexStringifyContainer(Result.flattenAddress(Node.Target)) << "\n";
-  }
-
-  if (Result.OrphanedNodes.empty())
-    *os << "  (No orphaned nodes)";
-
-  for (const auto &Orphan : Result.OrphanedNodes) {
-    *os << "  Orphan (0x" << std::hex << Orphan
-        << ") Path: " << HexStringifyContainer(Result.flattenAddress(Orphan))
-        << "\n";
-  }
-}
-
-namespace {
-class ELFx86TestFileAnalysis : public FileAnalysis {
-public:
-  ELFx86TestFileAnalysis()
-      : FileAnalysis(Triple("x86_64--"), SubtargetFeatures()) {}
-
-  // Expose this method publicly for testing.
-  void parseSectionContents(ArrayRef<uint8_t> SectionBytes,
-                            object::SectionedAddress Address) {
-    FileAnalysis::parseSectionContents(SectionBytes, Address);
-  }
-
-  Error initialiseDisassemblyMembers() {
-    return FileAnalysis::initialiseDisassemblyMembers();
-  }
-};
-
-class BasicGraphBuilderTest : public ::testing::Test {
-protected:
-  void SetUp() override {
-    IgnoreDWARFFlag = true;
-    SuccessfullyInitialised = true;
-    if (auto Err = Analysis.initialiseDisassemblyMembers()) {
-      handleAllErrors(std::move(Err), [&](const UnsupportedDisassembly &E) {
-        SuccessfullyInitialised = false;
-        outs()
-            << "Note: CFIVerifyTests are disabled due to lack of x86 support "
-               "on this build.\n";
-      });
-    }
-  }
-
-  bool SuccessfullyInitialised;
-  ELFx86TestFileAnalysis Analysis;
-};
-
-MATCHER_P2(HasPath, Result, Matcher, "has path " + PrintToString(Matcher)) {
-  const auto &Path = Result.flattenAddress(arg);
-  *result_listener << "the path is " << PrintToString(Path);
-  return Matches(Matcher)(Path);
-}
-
-TEST_F(BasicGraphBuilderTest, BuildFlowGraphTestSinglePathFallthroughUd2) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x75, 0x02, // 0: jne 4 [+2]
-          0x0f, 0x0b, // 2: ud2
-          0xff, 0x10, // 4: callq *(%rax)
-      },
-      {0xDEADBEEF, 0x0});
-  const auto Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 4, 0x0});
-
-  EXPECT_THAT(Result.OrphanedNodes, IsEmpty());
-  EXPECT_THAT(Result.ConditionalBranchNodes, SizeIs(1));
-  EXPECT_THAT(Result.ConditionalBranchNodes,
-              Each(Field(&ConditionalBranchNode::CFIProtection, Eq(true))));
-  EXPECT_THAT(
-      Result.ConditionalBranchNodes,
-      Contains(AllOf(Field(&ConditionalBranchNode::Address, Eq(0xDEADBEEF)),
-                     Field(&ConditionalBranchNode::Target,
-                           HasPath(Result, ElementsAre(0xDEADBEEF + 4))),
-                     Field(&ConditionalBranchNode::Fallthrough,
-                           HasPath(Result, ElementsAre(0xDEADBEEF + 2))))))
-      << PrintToString(Result);
-}
-
-TEST_F(BasicGraphBuilderTest, BuildFlowGraphTestSinglePathJumpUd2) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x75, 0x02, // 0: jne 4 [+2]
-          0xff, 0x10, // 2: callq *(%rax)
-          0x0f, 0x0b, // 4: ud2
-      },
-      {0xDEADBEEF, 0x0});
-  const auto Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 2, 0x0});
-
-  EXPECT_THAT(Result.OrphanedNodes, IsEmpty());
-  EXPECT_THAT(Result.ConditionalBranchNodes, SizeIs(1));
-  EXPECT_THAT(Result.ConditionalBranchNodes,
-              Each(Field(&ConditionalBranchNode::CFIProtection, Eq(true))));
-  EXPECT_THAT(
-      Result.ConditionalBranchNodes,
-      Contains(AllOf(Field(&ConditionalBranchNode::Address, Eq(0xDEADBEEF)),
-                     Field(&ConditionalBranchNode::Target,
-                           HasPath(Result, ElementsAre(0xDEADBEEF + 4))),
-                     Field(&ConditionalBranchNode::Fallthrough,
-                           HasPath(Result, ElementsAre(0xDEADBEEF + 2))))))
-      << PrintToString(Result);
-}
-
-TEST_F(BasicGraphBuilderTest, BuildFlowGraphTestDualPathDualUd2) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x75, 0x03, // 0: jne 5 [+3]
-          0x90,       // 2: nop
-          0xff, 0x10, // 3: callq *(%rax)
-          0x0f, 0x0b, // 5: ud2
-          0x75, 0xf9, // 7: jne 2 [-7]
-          0x0f, 0x0b, // 9: ud2
-      },
-      {0xDEADBEEF, 0x0});
-  const auto Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 3, 0x0});
-
-  EXPECT_THAT(Result.OrphanedNodes, IsEmpty());
-  EXPECT_THAT(Result.ConditionalBranchNodes, SizeIs(2));
-  EXPECT_THAT(Result.ConditionalBranchNodes,
-              Each(Field(&ConditionalBranchNode::CFIProtection, Eq(true))));
-  EXPECT_THAT(
-      Result.ConditionalBranchNodes,
-      Contains(AllOf(
-          Field(&ConditionalBranchNode::Address, Eq(0xDEADBEEF)),
-          Field(&ConditionalBranchNode::Fallthrough,
-                HasPath(Result, ElementsAre(0xDEADBEEF + 2, 0xDEADBEEF + 3))),
-          Field(&ConditionalBranchNode::Target,
-                HasPath(Result, ElementsAre(0xDEADBEEF + 5))))))
-      << PrintToString(Result);
-  EXPECT_THAT(
-      Result.ConditionalBranchNodes,
-      Contains(AllOf(
-          Field(&ConditionalBranchNode::Address, Eq(0xDEADBEEF + 7)),
-          Field(&ConditionalBranchNode::Fallthrough,
-                HasPath(Result, ElementsAre(0xDEADBEEF + 9))),
-          Field(&ConditionalBranchNode::Target,
-                HasPath(Result, ElementsAre(0xDEADBEEF + 2, 0xDEADBEEF + 3))))))
-      << PrintToString(Result);
-}
-
-TEST_F(BasicGraphBuilderTest, BuildFlowGraphTestDualPathSingleUd2) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x75, 0x05, // 0: jne 7 [+5]
-          0x90,       // 2: nop
-          0xff, 0x10, // 3: callq *(%rax)
-          0x75, 0xfb, // 5: jne 2 [-5]
-          0x0f, 0x0b, // 7: ud2
-      },
-      {0xDEADBEEF, 0x0});
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 3, 0x0});
-
-  EXPECT_THAT(Result.OrphanedNodes, IsEmpty());
-  EXPECT_THAT(Result.ConditionalBranchNodes, SizeIs(2));
-  EXPECT_THAT(Result.ConditionalBranchNodes,
-              Each(Field(&ConditionalBranchNode::CFIProtection, Eq(true))));
-  EXPECT_THAT(
-      Result.ConditionalBranchNodes,
-      Contains(AllOf(
-          Field(&ConditionalBranchNode::Address, Eq(0xDEADBEEF)),
-          Field(&ConditionalBranchNode::Fallthrough,
-                HasPath(Result, ElementsAre(0xDEADBEEF + 2, 0xDEADBEEF + 3))),
-          Field(&ConditionalBranchNode::Target,
-                HasPath(Result, ElementsAre(0xDEADBEEF + 7))))))
-      << PrintToString(Result);
-  EXPECT_THAT(
-      Result.ConditionalBranchNodes,
-      Contains(AllOf(
-          Field(&ConditionalBranchNode::Address, Eq(0xDEADBEEF + 5)),
-          Field(&ConditionalBranchNode::Fallthrough,
-                HasPath(Result, ElementsAre(0xDEADBEEF + 7))),
-          Field(&ConditionalBranchNode::Target,
-                HasPath(Result, ElementsAre(0xDEADBEEF + 2, 0xDEADBEEF + 3))))))
-      << PrintToString(Result);
-}
-
-TEST_F(BasicGraphBuilderTest, BuildFlowGraphFailures) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x90,       // 0: nop
-          0x75, 0xfe, // 1: jne 1 [-2]
-      },
-      {0xDEADBEEF, 0x0});
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF, 0x0});
-  EXPECT_THAT(Result.OrphanedNodes, IsEmpty());
-  EXPECT_THAT(Result.ConditionalBranchNodes, IsEmpty());
-
-  Result = GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 1, 0x0});
-  EXPECT_THAT(Result.OrphanedNodes, IsEmpty());
-  EXPECT_THAT(Result.ConditionalBranchNodes, IsEmpty());
-
-  Result = GraphBuilder::buildFlowGraph(Analysis, {0xDEADC0DE, 0x0});
-  EXPECT_THAT(Result.OrphanedNodes, IsEmpty());
-  EXPECT_THAT(Result.ConditionalBranchNodes, IsEmpty());
-}
-
-TEST_F(BasicGraphBuilderTest, BuildFlowGraphNoXrefs) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0xeb, 0xfe, // 0: jmp 0 [-2]
-          0xff, 0x10, // 2: callq *(%rax)
-      },
-      {0xDEADBEEF, 0x0});
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 2, 0x0});
-  EXPECT_THAT(Result.ConditionalBranchNodes, IsEmpty());
-  EXPECT_THAT(Result.OrphanedNodes, ElementsAre(0xDEADBEEF + 2));
-  EXPECT_THAT(Result.IntermediateNodes, IsEmpty());
-}
-
-TEST_F(BasicGraphBuilderTest, BuildFlowGraphConditionalInfiniteLoop) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x75, 0xfe, // 0: jne 0 [-2]
-          0xff, 0x10, // 2: callq *(%rax)
-      },
-      {0xDEADBEEF, 0x0});
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 2, 0x0});
-  EXPECT_THAT(Result.OrphanedNodes, IsEmpty());
-  EXPECT_THAT(Result.ConditionalBranchNodes, SizeIs(1));
-  EXPECT_THAT(
-      Result.ConditionalBranchNodes,
-      Each(AllOf(Field(&ConditionalBranchNode::CFIProtection, Eq(false)),
-                 Field(&ConditionalBranchNode::Target,
-                       HasPath(Result, ElementsAre(0xDEADBEEF))),
-                 Field(&ConditionalBranchNode::Fallthrough,
-                       HasPath(Result, ElementsAre(0xDEADBEEF + 2))))))
-      << PrintToString(Result);
-}
-
-TEST_F(BasicGraphBuilderTest, BuildFlowGraphUnconditionalInfiniteLoop) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x75, 0x02, // 0: jne 4 [+2]
-          0xeb, 0xfc, // 2: jmp 0 [-4]
-          0xff, 0x10, // 4: callq *(%rax)
-      },
-      {0xDEADBEEF, 0x0});
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 4, 0x0});
-  EXPECT_THAT(Result.OrphanedNodes, IsEmpty());
-  EXPECT_THAT(Result.ConditionalBranchNodes, SizeIs(1));
-  EXPECT_THAT(
-      Result.ConditionalBranchNodes,
-      Contains(
-          AllOf(Field(&ConditionalBranchNode::Address, Eq(0xDEADBEEF)),
-                Field(&ConditionalBranchNode::Fallthrough,
-                      HasPath(Result, ElementsAre(0xDEADBEEF + 2, 0xDEADBEEF))),
-                Field(&ConditionalBranchNode::Target,
-                      HasPath(Result, ElementsAre(0xDEADBEEF + 4))))))
-      << PrintToString(Result);
-}
-
-TEST_F(BasicGraphBuilderTest, BuildFlowGraphNoFlowsToIndirection) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x75, 0x00, // 0: jne 2 [+0]
-          0xeb, 0xfc, // 2: jmp 0 [-4]
-          0xff, 0x10, // 4: callq *(%rax)
-      },
-      {0xDEADBEEF, 0x0});
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 4, 0x0});
-  EXPECT_THAT(Result.OrphanedNodes, ElementsAre(0xDEADBEEF + 4));
-  EXPECT_THAT(Result.ConditionalBranchNodes, IsEmpty());
-}
-
-TEST_F(BasicGraphBuilderTest, BuildFlowGraphLengthExceededUpwards) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x75, 0x06, // 0: jne 8 [+6]
-          0x90,       // 2: nop
-          0x90,       // 3: nop
-          0x90,       // 4: nop
-          0x90,       // 5: nop
-          0xff, 0x10, // 6: callq *(%rax)
-          0x0f, 0x0b, // 8: ud2
-      },
-      {0xDEADBEEF, 0x0});
-  uint64_t PrevSearchLengthForConditionalBranch =
-      SearchLengthForConditionalBranch;
-  SearchLengthForConditionalBranch = 2;
-
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 6, 0x0});
-  EXPECT_THAT(Result.OrphanedNodes, SizeIs(1));
-  EXPECT_THAT(Result.OrphanedNodes,
-              Each(HasPath(Result, ElementsAre(0xDEADBEEF + 4, 0xDEADBEEF + 5,
-                                               0xDEADBEEF + 6))))
-      << PrintToString(Result);
-  EXPECT_THAT(Result.ConditionalBranchNodes, IsEmpty());
-
-  SearchLengthForConditionalBranch = PrevSearchLengthForConditionalBranch;
-}
-
-TEST_F(BasicGraphBuilderTest, BuildFlowGraphLengthExceededDownwards) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x75, 0x02, // 0: jne 4 [+2]
-          0xff, 0x10, // 2: callq *(%rax)
-          0x90,       // 4: nop
-          0x90,       // 5: nop
-          0x90,       // 6: nop
-          0x90,       // 7: nop
-          0x0f, 0x0b, // 8: ud2
-      },
-      {0xDEADBEEF, 0x0});
-  uint64_t PrevSearchLengthForUndef = SearchLengthForUndef;
-  SearchLengthForUndef = 2;
-
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 2, 0x0});
-  EXPECT_THAT(Result.OrphanedNodes, IsEmpty());
-  EXPECT_THAT(
-      Result.ConditionalBranchNodes,
-      Each(AllOf(
-          Field(&ConditionalBranchNode::CFIProtection, Eq(false)),
-          Field(&ConditionalBranchNode::Address, Eq(0xDEADBEEF)),
-          Field(&ConditionalBranchNode::Target,
-                HasPath(Result, ElementsAre(0xDEADBEEF + 4, 0xDEADBEEF + 5))),
-          Field(&ConditionalBranchNode::Fallthrough,
-                HasPath(Result, ElementsAre(0xDEADBEEF + 2))))))
-      << PrintToString(Result);
-
-  SearchLengthForUndef = PrevSearchLengthForUndef;
-}
-
-// This test ensures when avoiding doing repeated work we still generate the
-// paths correctly. We don't need to recalculate the flow from 0x2 -> 0x3 as it
-// should only need to be generated once.
-TEST_F(BasicGraphBuilderTest, BuildFlowGraphWithRepeatedWork) {
-  if (!SuccessfullyInitialised)
-    return;
-  Analysis.parseSectionContents(
-      {
-          0x75, 0x05, // 0: jne 7 [+5]
-          0x90,       // 2: nop
-          0xff, 0x10, // 3: callq *(%rax)
-          0x75, 0xfb, // 5: jne 2 [-5]
-          0x0f, 0x0b, // 7: ud2
-      },
-      {0xDEADBEEF, 0x0});
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0xDEADBEEF + 3, 0x0});
-  EXPECT_THAT(Result.OrphanedNodes, IsEmpty());
-  EXPECT_THAT(Result.ConditionalBranchNodes, SizeIs(2));
-  EXPECT_THAT(
-      Result.ConditionalBranchNodes,
-      Contains(AllOf(
-          Field(&ConditionalBranchNode::CFIProtection, Eq(true)),
-          Field(&ConditionalBranchNode::Address, Eq(0xDEADBEEF)),
-          Field(&ConditionalBranchNode::Target,
-                HasPath(Result, ElementsAre(0xDEADBEEF + 7))),
-          Field(&ConditionalBranchNode::Fallthrough,
-                HasPath(Result, ElementsAre(0xDEADBEEF + 2, 0xDEADBEEF + 3))))))
-      << PrintToString(Result);
-  EXPECT_THAT(
-      Result.ConditionalBranchNodes,
-      Contains(AllOf(
-          Field(&ConditionalBranchNode::CFIProtection, Eq(true)),
-          Field(&ConditionalBranchNode::Address, Eq(0xDEADBEEF + 5)),
-          Field(&ConditionalBranchNode::Target,
-                HasPath(Result, ElementsAre(0xDEADBEEF + 2, 0xDEADBEEF + 3))),
-          Field(&ConditionalBranchNode::Fallthrough,
-                HasPath(Result, ElementsAre(0xDEADBEEF + 7))))))
-      << PrintToString(Result);
-  EXPECT_THAT(Result.IntermediateNodes, SizeIs(1));
-  EXPECT_THAT(Result.IntermediateNodes,
-              UnorderedElementsAre(Pair(0xDEADBEEF + 2, 0xDEADBEEF + 3)));
-}
-
-TEST_F(BasicGraphBuilderTest, BuildFlowGraphComplexExample) {
-  if (!SuccessfullyInitialised)
-    return;
-  // The following code has this graph:
-  //  +----------+      +--------------+
-  //  |    20    | <--- |      0       |
-  //  +----------+      +--------------+
-  //    |                 |
-  //    v                 v
-  //  +----------+      +--------------+
-  //  |    21    |      |      2       |
-  //  +----------+      +--------------+
-  //    |                 |
-  //    v                 v
-  //  +----------+      +--------------+
-  //  | 22 (ud2) |  +-> |      7       |
-  //  +----------+  |   +--------------+
-  //    ^           |     |
-  //    |           |     v
-  //  +----------+  |   +--------------+
-  //  |    4     |  |   |      8       |
-  //  +----------+  |   +--------------+
-  //    |           |     |
-  //    v           |     v
-  //  +----------+  |   +--------------+    +------------+
-  //  |    6     | -+   | 9 (indirect) | <- |     13     |
-  //  +----------+      +--------------+    +------------+
-  //                      ^                   |
-  //                      |                   v
-  //                    +--------------+    +------------+
-  //                    |      11      |    | 15 (error) |
-  //                    +--------------+    +------------+
-  // Or, in image format: https://i.imgur.com/aX5fCoi.png
-
-  Analysis.parseSectionContents(
-      {
-          0x75, 0x12,                   // 0: jne 20 [+18]
-          0xeb, 0x03,                   // 2: jmp 7 [+3]
-          0x75, 0x10,                   // 4: jne 22 [+16]
-          0x90,                         // 6: nop
-          0x90,                         // 7: nop
-          0x90,                         // 8: nop
-          0xff, 0x10,                   // 9: callq *(%rax)
-          0xeb, 0xfc,                   // 11: jmp 9 [-4]
-          0x75, 0xfa,                   // 13: jne 9 [-6]
-          0xe8, 0x78, 0x56, 0x34, 0x12, // 15: callq OUTOFBOUNDS [+0x12345678]
-          0x90,                         // 20: nop
-          0x90,                         // 21: nop
-          0x0f, 0x0b,                   // 22: ud2
-      },
-      {0x1000, 0x0});
-  uint64_t PrevSearchLengthForUndef = SearchLengthForUndef;
-  SearchLengthForUndef = 5;
-
-  GraphResult Result =
-      GraphBuilder::buildFlowGraph(Analysis, {0x1000 + 9, 0x0});
-
-  EXPECT_THAT(Result.OrphanedNodes, SizeIs(1));
-  EXPECT_THAT(Result.ConditionalBranchNodes, SizeIs(3));
-
-  EXPECT_THAT(
-      Result.OrphanedNodes,
-      Each(AllOf(Eq(0x1000u + 11),
-                 HasPath(Result, ElementsAre(0x1000 + 11, 0x1000 + 9)))))
-      << PrintToString(Result);
-
-  EXPECT_THAT(Result.ConditionalBranchNodes,
-              Contains(AllOf(
-                  Field(&ConditionalBranchNode::CFIProtection, Eq(true)),
-                  Field(&ConditionalBranchNode::Address, Eq(0x1000u)),
-                  Field(&ConditionalBranchNode::Target,
-                        HasPath(Result, ElementsAre(0x1000 + 20, 0x1000 + 21,
-                                                    0x1000 + 22))),
-                  Field(&ConditionalBranchNode::Fallthrough,
-                        HasPath(Result, ElementsAre(0x1000 + 2, 0x1000 + 7,
-                                                    0x1000 + 8, 0x1000 + 9))))))
-      << PrintToString(Result);
-
-  EXPECT_THAT(Result.ConditionalBranchNodes,
-              Contains(AllOf(
-                  Field(&ConditionalBranchNode::CFIProtection, Eq(true)),
-                  Field(&ConditionalBranchNode::Address, Eq(0x1000u + 4)),
-                  Field(&ConditionalBranchNode::Target,
-                        HasPath(Result, ElementsAre(0x1000 + 22))),
-                  Field(&ConditionalBranchNode::Fallthrough,
-                        HasPath(Result, ElementsAre(0x1000 + 6, 0x1000 + 7,
-                                                    0x1000 + 8, 0x1000 + 9))))))
-      << PrintToString(Result);
-
-  EXPECT_THAT(
-      Result.ConditionalBranchNodes,
-      Contains(AllOf(Field(&ConditionalBranchNode::CFIProtection, Eq(false)),
-                     Field(&ConditionalBranchNode::Address, Eq(0x1000u + 13)),
-                     Field(&ConditionalBranchNode::Target,
-                           HasPath(Result, ElementsAre(0x1000 + 9))),
-                     Field(&ConditionalBranchNode::Fallthrough,
-                           HasPath(Result, ElementsAre(0x1000 + 15))))))
-      << PrintToString(Result);
-
-  SearchLengthForUndef = PrevSearchLengthForUndef;
-}
-
-} // anonymous namespace
-} // end namespace cfi_verify
-} // end namespace llvm
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/AArch64/CMakeLists.txt b/gnu/llvm/llvm/unittests/tools/llvm-exegesis/AArch64/CMakeLists.txt
deleted file mode 100644
index b99510418bf..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/AArch64/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-add_llvm_exegesis_unittest_includes(
-  ${LLVM_MAIN_SRC_DIR}/lib/Target/AArch64
-  ${LLVM_BINARY_DIR}/lib/Target/AArch64
-  ${LLVM_MAIN_SRC_DIR}/tools/llvm-exegesis/lib
-  )
-
-add_llvm_exegesis_unittest_link_components(
-  MC
-  MCParser
-  Object
-  Support
-  Symbolize
-  AArch64
-  )
-
-add_llvm_exegesis_unittest_sources(
-  TargetTest.cpp
-  )
-add_llvm_exegesis_unittest_link_libraries(
-  LLVMExegesisAArch64)
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/AArch64/TargetTest.cpp b/gnu/llvm/llvm/unittests/tools/llvm-exegesis/AArch64/TargetTest.cpp
deleted file mode 100644
index 5421c1704fb..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/AArch64/TargetTest.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-//===-- TargetTest.cpp ------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "Target.h"
-
-#include <cassert>
-#include <memory>
-
-#include "MCTargetDesc/AArch64MCTargetDesc.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-namespace exegesis {
-
-void InitializeAArch64ExegesisTarget();
-
-namespace {
-
-using testing::Gt;
-using testing::IsEmpty;
-using testing::Not;
-using testing::NotNull;
-
-constexpr const char kTriple[] = "aarch64-unknown-linux";
-
-class AArch64TargetTest : public ::testing::Test {
-protected:
-  AArch64TargetTest()
-      : ExegesisTarget_(ExegesisTarget::lookup(Triple(kTriple))) {
-    EXPECT_THAT(ExegesisTarget_, NotNull());
-    std::string error;
-    Target_ = TargetRegistry::lookupTarget(kTriple, error);
-    EXPECT_THAT(Target_, NotNull());
-    STI_.reset(
-        Target_->createMCSubtargetInfo(kTriple, "generic", /*no features*/ ""));
-  }
-
-  static void SetUpTestCase() {
-    LLVMInitializeAArch64TargetInfo();
-    LLVMInitializeAArch64Target();
-    LLVMInitializeAArch64TargetMC();
-    InitializeAArch64ExegesisTarget();
-  }
-
-  std::vector<MCInst> setRegTo(unsigned Reg, const APInt &Value) {
-    return ExegesisTarget_->setRegTo(*STI_, Reg, Value);
-  }
-
-  const Target *Target_;
-  const ExegesisTarget *const ExegesisTarget_;
-  std::unique_ptr<MCSubtargetInfo> STI_;
-};
-
-TEST_F(AArch64TargetTest, SetRegToConstant) {
-  // The AArch64 target currently doesn't know how to set register values.
-  const auto Insts = setRegTo(AArch64::X0, APInt());
-  EXPECT_THAT(Insts, Not(IsEmpty()));
-}
-
-TEST_F(AArch64TargetTest, DefaultPfmCounters) {
-  const std::string Expected = "CPU_CYCLES";
-  EXPECT_EQ(ExegesisTarget_->getPfmCounters("").CycleCounter, Expected);
-  EXPECT_EQ(ExegesisTarget_->getPfmCounters("unknown_cpu").CycleCounter,
-            Expected);
-}
-
-} // namespace
-} // namespace exegesis
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/ARM/AssemblerTest.cpp b/gnu/llvm/llvm/unittests/tools/llvm-exegesis/ARM/AssemblerTest.cpp
deleted file mode 100644
index 85fafa0c435..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/ARM/AssemblerTest.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-//===-- AssemblerTest.cpp ---------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "../Common/AssemblerUtils.h"
-#include "ARMInstrInfo.h"
-
-namespace llvm {
-namespace exegesis {
-namespace {
-
-class ARMMachineFunctionGeneratorTest
-    : public MachineFunctionGeneratorBaseTest {
-protected:
-  ARMMachineFunctionGeneratorTest()
-      : MachineFunctionGeneratorBaseTest("armv7-none-linux-gnueabi", "") {}
-
-  static void SetUpTestCase() {
-    LLVMInitializeARMTargetInfo();
-    LLVMInitializeARMTargetMC();
-    LLVMInitializeARMTarget();
-    LLVMInitializeARMAsmPrinter();
-  }
-};
-
-TEST_F(ARMMachineFunctionGeneratorTest, DISABLED_JitFunction) {
-  Check({}, MCInst(), 0x1e, 0xff, 0x2f, 0xe1);
-}
-
-TEST_F(ARMMachineFunctionGeneratorTest, DISABLED_JitFunctionADDrr) {
-  Check({{ARM::R0, APInt()}},
-        MCInstBuilder(ARM::ADDrr)
-            .addReg(ARM::R0)
-            .addReg(ARM::R0)
-            .addReg(ARM::R0)
-            .addImm(ARMCC::AL)
-            .addReg(0)
-            .addReg(0),
-        0x00, 0x00, 0x80, 0xe0, 0x1e, 0xff, 0x2f, 0xe1);
-}
-
-} // namespace
-} // namespace exegesis
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/ARM/CMakeLists.txt b/gnu/llvm/llvm/unittests/tools/llvm-exegesis/ARM/CMakeLists.txt
deleted file mode 100644
index 097a20d542d..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/ARM/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-add_llvm_exegesis_unittest_includes(
-  ${LLVM_MAIN_SRC_DIR}/lib/Target/ARM
-  ${LLVM_BINARY_DIR}/lib/Target/ARM
-  ${LLVM_MAIN_SRC_DIR}/tools/llvm-exegesis/lib
-  )
-
-add_llvm_exegesis_unittest_link_components(
-  Core
-  MC
-  MCParser
-  Object
-  Support
-  Symbolize
-  ARM
-  )
-
-add_llvm_exegesis_unittest_sources(
-  AssemblerTest.cpp
-  )
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/BenchmarkRunnerTest.cpp b/gnu/llvm/llvm/unittests/tools/llvm-exegesis/BenchmarkRunnerTest.cpp
deleted file mode 100644
index 9414a48c989..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/BenchmarkRunnerTest.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-//===-- BenchmarkRunnerTest.cpp ---------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "BenchmarkRunner.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-namespace exegesis {
-
-namespace {
-
-TEST(ScratchSpaceTest, Works) {
-  BenchmarkRunner::ScratchSpace Space;
-  EXPECT_EQ(reinterpret_cast<intptr_t>(Space.ptr()) %
-                BenchmarkRunner::ScratchSpace::kAlignment,
-            0u);
-  Space.ptr()[0] = 42;
-  Space.ptr()[BenchmarkRunner::ScratchSpace::kSize - 1] = 43;
-  Space.clear();
-  EXPECT_EQ(Space.ptr()[0], 0);
-  EXPECT_EQ(Space.ptr()[BenchmarkRunner::ScratchSpace::kSize - 1], 0);
-}
-
-} // namespace
-} // namespace exegesis
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/CMakeLists.txt b/gnu/llvm/llvm/unittests/tools/llvm-exegesis/CMakeLists.txt
deleted file mode 100644
index f010cf7f6cd..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/CMakeLists.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-set(exegesis_includes
-  ${LLVM_MAIN_SRC_DIR}/tools/llvm-exegesis/lib
-  )
-
-set(LLVM_LINK_COMPONENTS
-  MC
-  MCParser
-  Object
-  Support
-  Symbolize
-  )
-
-set(exegesis_sources
-  BenchmarkRunnerTest.cpp
-  ClusteringTest.cpp
-  PerfHelperTest.cpp
-  RegisterValueTest.cpp
-  SnippetGeneratorTest.cpp
-  )
-
-set(exegesis_link_libraries LLVMExegesis)
-
-function(add_llvm_exegesis_unittest_includes)
-  set(exegesis_includes ${exegesis_includes} ${ARGV} PARENT_SCOPE)
-endfunction()
-
-function(add_llvm_exegesis_unittest_sources)
-  set(sources ${ARGV})
-  list(TRANSFORM sources PREPEND "${CMAKE_CURRENT_LIST_DIR}/")
-  set(exegesis_sources ${exegesis_sources} ${sources} PARENT_SCOPE)
-endfunction()
-
-function(add_llvm_exegesis_unittest_link_components comps)
-  set(LLVM_LINK_COMPONENTS ${LLVM_LINK_COMPONENTS} ${ARGV} PARENT_SCOPE)
-endfunction()
-
-function(add_llvm_exegesis_unittest_link_libraries libs)
-  set(exegesis_link_libraries ${exegesis_link_libraries} ${ARGV} PARENT_SCOPE)
-endfunction()
-
-
-if(LLVM_TARGETS_TO_BUILD MATCHES "X86")
-  include(X86/CMakeLists.txt)
-endif()
-if(LLVM_TARGETS_TO_BUILD MATCHES "ARM")
-  include(ARM/CMakeLists.txt)
-endif()
-if(LLVM_TARGETS_TO_BUILD MATCHES "AArch64")
-  include(AArch64/CMakeLists.txt)
-endif()
-if(LLVM_TARGETS_TO_BUILD MATCHES "PowerPC")
-  include(PowerPC/CMakeLists.txt)
-endif()
-if(LLVM_TARGETS_TO_BUILD MATCHES "Mips")
-  include(Mips/CMakeLists.txt)
-endif()
-
-include_directories(${exegesis_includes})
-
-list(REMOVE_DUPLICATES LLVM_LINK_COMPONENTS)
-
-add_llvm_target_unittest(LLVMExegesisTests
-  ${exegesis_sources}
-  )
-target_link_libraries(LLVMExegesisTests PRIVATE ${exegesis_link_libraries})
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/ClusteringTest.cpp b/gnu/llvm/llvm/unittests/tools/llvm-exegesis/ClusteringTest.cpp
deleted file mode 100644
index b23938a6202..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/ClusteringTest.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-//===-- ClusteringTest.cpp --------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "Clustering.h"
-#include "BenchmarkResult.h"
-#include "llvm/Support/Error.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-namespace exegesis {
-
-namespace {
-
-using testing::Field;
-using testing::UnorderedElementsAre;
-using testing::UnorderedElementsAreArray;
-
-static const auto HasPoints = [](const std::vector<int> &Indices) {
-  return Field(&InstructionBenchmarkClustering::Cluster::PointIndices,
-                 UnorderedElementsAreArray(Indices));
-};
-
-TEST(ClusteringTest, Clusters3D) {
-  std::vector<InstructionBenchmark> Points(6);
-
-  // Cluster around (x=0, y=1, z=2): points {0, 3}.
-  Points[0].Measurements = {
-      {"x", 0.01, 0.0}, {"y", 1.02, 0.0}, {"z", 1.98, 0.0}};
-  Points[3].Measurements = {
-      {"x", -0.01, 0.0}, {"y", 1.02, 0.0}, {"z", 1.98, 0.0}};
-  // Cluster around (x=1, y=1, z=2): points {1, 4}.
-  Points[1].Measurements = {
-      {"x", 1.01, 0.0}, {"y", 1.02, 0.0}, {"z", 1.98, 0.0}};
-  Points[4].Measurements = {
-      {"x", 0.99, 0.0}, {"y", 1.02, 0.0}, {"z", 1.98, 0.0}};
-  // Cluster around (x=0, y=0, z=0): points {5}, marked as noise.
-  Points[5].Measurements = {
-      {"x", 0.0, 0.0}, {"y", 0.01, 0.0}, {"z", -0.02, 0.0}};
-  // Error cluster: points {2}
-  Points[2].Error = "oops";
-
-  auto Clustering = InstructionBenchmarkClustering::create(
-      Points, InstructionBenchmarkClustering::ModeE::Dbscan, 2, 0.25);
-  ASSERT_TRUE((bool)Clustering);
-  EXPECT_THAT(Clustering.get().getValidClusters(),
-              UnorderedElementsAre(HasPoints({0, 3}), HasPoints({1, 4})));
-  EXPECT_THAT(Clustering.get().getCluster(
-                  InstructionBenchmarkClustering::ClusterId::noise()),
-              HasPoints({5}));
-  EXPECT_THAT(Clustering.get().getCluster(
-                  InstructionBenchmarkClustering::ClusterId::error()),
-              HasPoints({2}));
-
-  EXPECT_EQ(Clustering.get().getClusterIdForPoint(2),
-            InstructionBenchmarkClustering::ClusterId::error());
-  EXPECT_EQ(Clustering.get().getClusterIdForPoint(5),
-            InstructionBenchmarkClustering::ClusterId::noise());
-  EXPECT_EQ(Clustering.get().getClusterIdForPoint(0),
-            Clustering.get().getClusterIdForPoint(3));
-  EXPECT_EQ(Clustering.get().getClusterIdForPoint(1),
-            Clustering.get().getClusterIdForPoint(4));
-}
-
-TEST(ClusteringTest, Clusters3D_InvalidSize) {
-  std::vector<InstructionBenchmark> Points(6);
-  Points[0].Measurements = {
-      {"x", 0.01, 0.0}, {"y", 1.02, 0.0}, {"z", 1.98, 0.0}};
-  Points[1].Measurements = {{"y", 1.02, 0.0}, {"z", 1.98, 0.0}};
-  auto Error =
-      InstructionBenchmarkClustering::create(
-          Points, InstructionBenchmarkClustering::ModeE::Dbscan, 2, 0.25)
-          .takeError();
-  ASSERT_TRUE((bool)Error);
-  consumeError(std::move(Error));
-}
-
-TEST(ClusteringTest, Clusters3D_InvalidOrder) {
-  std::vector<InstructionBenchmark> Points(6);
-  Points[0].Measurements = {{"x", 0.01, 0.0}, {"y", 1.02, 0.0}};
-  Points[1].Measurements = {{"y", 1.02, 0.0}, {"x", 1.98, 0.0}};
-  auto Error =
-      InstructionBenchmarkClustering::create(
-          Points, InstructionBenchmarkClustering::ModeE::Dbscan, 2, 0.25)
-          .takeError();
-  ASSERT_TRUE((bool)Error);
-  consumeError(std::move(Error));
-}
-
-TEST(ClusteringTest, Ordering) {
-  ASSERT_LT(InstructionBenchmarkClustering::ClusterId::makeValid(1),
-            InstructionBenchmarkClustering::ClusterId::makeValid(2));
-
-  ASSERT_LT(InstructionBenchmarkClustering::ClusterId::makeValid(2),
-            InstructionBenchmarkClustering::ClusterId::noise());
-
-  ASSERT_LT(InstructionBenchmarkClustering::ClusterId::makeValid(2),
-            InstructionBenchmarkClustering::ClusterId::error());
-
-  ASSERT_LT(InstructionBenchmarkClustering::ClusterId::noise(),
-            InstructionBenchmarkClustering::ClusterId::error());
-}
-
-TEST(ClusteringTest, Ordering1) {
-  std::vector<InstructionBenchmark> Points(3);
-
-  Points[0].Measurements = {
-      {"x", 0.0, 0.0}};
-  Points[1].Measurements = {
-      {"x", 1.0, 0.0}};
-  Points[2].Measurements = {
-      {"x", 2.0, 0.0}};
-
-  auto Clustering = InstructionBenchmarkClustering::create(
-      Points, InstructionBenchmarkClustering::ModeE::Dbscan, 2, 1.1);
-  ASSERT_TRUE((bool)Clustering);
-  EXPECT_THAT(Clustering.get().getValidClusters(),
-              UnorderedElementsAre(HasPoints({0, 1, 2})));
-}
-
-TEST(ClusteringTest, Ordering2) {
-  std::vector<InstructionBenchmark> Points(3);
-
-  Points[0].Measurements = {
-      {"x", 0.0, 0.0}};
-  Points[1].Measurements = {
-      {"x", 2.0, 0.0}};
-  Points[2].Measurements = {
-      {"x", 1.0, 0.0}};
-
-  auto Clustering = InstructionBenchmarkClustering::create(
-      Points, InstructionBenchmarkClustering::ModeE::Dbscan, 2, 1.1);
-  ASSERT_TRUE((bool)Clustering);
-  EXPECT_THAT(Clustering.get().getValidClusters(),
-              UnorderedElementsAre(HasPoints({0, 1, 2})));
-}
-
-} // namespace
-} // namespace exegesis
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/Common/AssemblerUtils.h b/gnu/llvm/llvm/unittests/tools/llvm-exegesis/Common/AssemblerUtils.h
deleted file mode 100644
index 239685beb14..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/Common/AssemblerUtils.h
+++ /dev/null
@@ -1,95 +0,0 @@
-//===-- AssemblerUtils.h ----------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_UNITTESTS_TOOLS_LLVMEXEGESIS_ASSEMBLERUTILS_H
-#define LLVM_UNITTESTS_TOOLS_LLVMEXEGESIS_ASSEMBLERUTILS_H
-
-#include "Assembler.h"
-#include "BenchmarkRunner.h"
-#include "Target.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/CodeGen/MachineInstrBuilder.h"
-#include "llvm/CodeGen/TargetInstrInfo.h"
-#include "llvm/CodeGen/TargetSubtargetInfo.h"
-#include "llvm/MC/MCInstBuilder.h"
-#include "llvm/Support/Host.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-namespace exegesis {
-
-class MachineFunctionGeneratorBaseTest : public ::testing::Test {
-protected:
-  MachineFunctionGeneratorBaseTest(const std::string &TT,
-                                   const std::string &CpuName)
-      : TT(TT), CpuName(CpuName),
-        CanExecute(Triple(TT).getArch() ==
-                   Triple(sys::getProcessTriple()).getArch()),
-        ET(ExegesisTarget::lookup(Triple(TT))) {
-    assert(ET);
-    if (!CanExecute) {
-      outs() << "Skipping execution, host:" << sys::getProcessTriple()
-             << ", target:" << TT << "\n";
-    }
-  }
-
-  template <class... Bs>
-  inline void Check(ArrayRef<RegisterValue> RegisterInitialValues, MCInst Inst,
-                    Bs... Bytes) {
-    ExecutableFunction Function =
-        (Inst.getOpcode() == 0)
-            ? assembleToFunction(RegisterInitialValues, [](FunctionFiller &) {})
-            : assembleToFunction(RegisterInitialValues,
-                                 [Inst](FunctionFiller &Filler) {
-                                   Filler.getEntry().addInstruction(Inst);
-                                 });
-    ASSERT_THAT(Function.getFunctionBytes().str(),
-                testing::ElementsAre(Bytes...));
-    if (CanExecute) {
-      BenchmarkRunner::ScratchSpace Scratch;
-      Function(Scratch.ptr());
-    }
-  }
-
-private:
-  std::unique_ptr<LLVMTargetMachine> createTargetMachine() {
-    std::string Error;
-    const Target *TheTarget = TargetRegistry::lookupTarget(TT, Error);
-    EXPECT_TRUE(TheTarget) << Error << " " << TT;
-    const TargetOptions Options;
-    TargetMachine *TM = TheTarget->createTargetMachine(TT, CpuName, "", Options,
-                                                       Reloc::Model::Static);
-    EXPECT_TRUE(TM) << TT << " " << CpuName;
-    return std::unique_ptr<LLVMTargetMachine>(
-        static_cast<LLVMTargetMachine *>(TM));
-  }
-
-  ExecutableFunction
-  assembleToFunction(ArrayRef<RegisterValue> RegisterInitialValues,
-                     FillFunction Fill) {
-    SmallString<256> Buffer;
-    raw_svector_ostream AsmStream(Buffer);
-    EXPECT_FALSE(assembleToStream(*ET, createTargetMachine(), /*LiveIns=*/{},
-                                  RegisterInitialValues, Fill, AsmStream));
-    return ExecutableFunction(createTargetMachine(),
-                              getObjectFromBuffer(AsmStream.str()));
-  }
-
-  const std::string TT;
-  const std::string CpuName;
-  const bool CanExecute;
-  const ExegesisTarget *const ET;
-};
-
-} // namespace exegesis
-} // namespace llvm
-
-#endif
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/Mips/BenchmarkResultTest.cpp b/gnu/llvm/llvm/unittests/tools/llvm-exegesis/Mips/BenchmarkResultTest.cpp
deleted file mode 100644
index 163242ddff6..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/Mips/BenchmarkResultTest.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-//===-- BenchmarkResultTest.cpp ---------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "BenchmarkResult.h"
-#include "MipsInstrInfo.h"
-#include "TestBase.h"
-#include "llvm/ADT/SmallString.h"
-#include "llvm/Support/Error.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "llvm/Support/YAMLTraits.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/Testing/Support/SupportHelpers.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-using ::testing::AllOf;
-using ::testing::Eq;
-using ::testing::get;
-using ::testing::Pointwise;
-using ::testing::Property;
-
-using llvm::unittest::TempDir;
-
-namespace llvm {
-namespace exegesis {
-
-static std::string Dump(const MCInst &McInst) {
-  std::string Buffer;
-  raw_string_ostream OS(Buffer);
-  McInst.print(OS);
-  return Buffer;
-}
-
-MATCHER(EqMCInst, "") {
-  const std::string Lhs = Dump(get<0>(arg));
-  const std::string Rhs = Dump(get<1>(arg));
-  if (Lhs != Rhs) {
-    *result_listener << Lhs << " <=> " << Rhs;
-    return false;
-  }
-  return true;
-}
-
-namespace {
-
-class MipsBenchmarkResultTest : public MipsTestBase {};
-
-TEST_F(MipsBenchmarkResultTest, WriteToAndReadFromDisk) {
-  ExitOnError ExitOnErr;
-
-  InstructionBenchmark ToDisk;
-
-  ToDisk.Key.Instructions.push_back(MCInstBuilder(Mips::XOR)
-                                        .addReg(Mips::T0)
-                                        .addReg(Mips::T1)
-                                        .addReg(Mips::T2));
-  ToDisk.Key.Config = "config";
-  ToDisk.Key.RegisterInitialValues = {
-      RegisterValue{Mips::T1, APInt(8, "123", 10)},
-      RegisterValue{Mips::T2, APInt(8, "456", 10)}};
-  ToDisk.Mode = InstructionBenchmark::Latency;
-  ToDisk.CpuName = "cpu_name";
-  ToDisk.LLVMTriple = "llvm_triple";
-  ToDisk.NumRepetitions = 1;
-  ToDisk.Measurements.push_back(BenchmarkMeasure{"a", 1, 1});
-  ToDisk.Measurements.push_back(BenchmarkMeasure{"b", 2, 2});
-  ToDisk.Error = "error";
-  ToDisk.Info = "info";
-
-  TempDir TestDirectory("BenchmarkResultTestDir", /*Unique*/ true);
-  SmallString<64> Filename(TestDirectory.path());
-  sys::path::append(Filename, "data.yaml");
-  errs() << Filename << "-------\n";
-  ExitOnErr(ToDisk.writeYaml(State, Filename));
-
-  {
-    // One-element version.
-    const auto FromDisk =
-        ExitOnErr(InstructionBenchmark::readYaml(State, Filename));
-
-    EXPECT_THAT(FromDisk.Key.Instructions,
-                Pointwise(EqMCInst(), ToDisk.Key.Instructions));
-    EXPECT_EQ(FromDisk.Key.Config, ToDisk.Key.Config);
-    EXPECT_EQ(FromDisk.Mode, ToDisk.Mode);
-    EXPECT_EQ(FromDisk.CpuName, ToDisk.CpuName);
-    EXPECT_EQ(FromDisk.LLVMTriple, ToDisk.LLVMTriple);
-    EXPECT_EQ(FromDisk.NumRepetitions, ToDisk.NumRepetitions);
-    EXPECT_THAT(FromDisk.Measurements, ToDisk.Measurements);
-    EXPECT_THAT(FromDisk.Error, ToDisk.Error);
-    EXPECT_EQ(FromDisk.Info, ToDisk.Info);
-  }
-  {
-    // Vector version.
-    const auto FromDiskVector =
-        ExitOnErr(InstructionBenchmark::readYamls(State, Filename));
-    ASSERT_EQ(FromDiskVector.size(), size_t{1});
-    const auto FromDisk = FromDiskVector[0];
-    EXPECT_THAT(FromDisk.Key.Instructions,
-                Pointwise(EqMCInst(), ToDisk.Key.Instructions));
-    EXPECT_EQ(FromDisk.Key.Config, ToDisk.Key.Config);
-    EXPECT_EQ(FromDisk.Mode, ToDisk.Mode);
-    EXPECT_EQ(FromDisk.CpuName, ToDisk.CpuName);
-    EXPECT_EQ(FromDisk.LLVMTriple, ToDisk.LLVMTriple);
-    EXPECT_EQ(FromDisk.NumRepetitions, ToDisk.NumRepetitions);
-    EXPECT_THAT(FromDisk.Measurements, ToDisk.Measurements);
-    EXPECT_THAT(FromDisk.Error, ToDisk.Error);
-    EXPECT_EQ(FromDisk.Info, ToDisk.Info);
-  }
-}
-
-TEST_F(MipsBenchmarkResultTest, PerInstructionStats) {
-  PerInstructionStats Stats;
-  Stats.push(BenchmarkMeasure{"a", 0.5, 0.0});
-  Stats.push(BenchmarkMeasure{"a", 1.5, 0.0});
-  Stats.push(BenchmarkMeasure{"a", -1.0, 0.0});
-  Stats.push(BenchmarkMeasure{"a", 0.0, 0.0});
-  EXPECT_EQ(Stats.min(), -1.0);
-  EXPECT_EQ(Stats.max(), 1.5);
-  EXPECT_EQ(Stats.avg(), 0.25); // (0.5+1.5-1.0+0.0) / 4
-}
-} // namespace
-} // namespace exegesis
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/Mips/CMakeLists.txt b/gnu/llvm/llvm/unittests/tools/llvm-exegesis/Mips/CMakeLists.txt
deleted file mode 100644
index 102a86c4518..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/Mips/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-add_llvm_exegesis_unittest_includes(
-  ${LLVM_MAIN_SRC_DIR}/lib/Target/Mips
-  ${LLVM_BINARY_DIR}/lib/Target/Mips
-  ${LLVM_MAIN_SRC_DIR}/tools/llvm-exegesis/lib
-  )
-
-add_llvm_exegesis_unittest_link_components(
-  MC
-  MCParser
-  Object
-  Support
-  Symbolize
-  Mips
-  )
-
-add_llvm_exegesis_unittest_sources(
-  BenchmarkResultTest.cpp
-  RegisterAliasingTest.cpp
-  SnippetGeneratorTest.cpp
-  TargetTest.cpp
-  )
-add_llvm_exegesis_unittest_link_libraries(
-  LLVMExegesisMips)
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/Mips/RegisterAliasingTest.cpp b/gnu/llvm/llvm/unittests/tools/llvm-exegesis/Mips/RegisterAliasingTest.cpp
deleted file mode 100644
index 06da33c5a3a..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/Mips/RegisterAliasingTest.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//===-- RegisterAliasingTest.cpp --------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "RegisterAliasing.h"
-
-#include <cassert>
-#include <memory>
-
-#include "MipsInstrInfo.h"
-#include "TestBase.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-namespace exegesis {
-namespace {
-
-class MipsRegisterAliasingTest : public MipsTestBase {};
-
-TEST_F(MipsRegisterAliasingTest, TrackSimpleRegister) {
-  const auto &RegInfo = State.getRegInfo();
-  const RegisterAliasingTracker tracker(RegInfo, Mips::T0_64);
-  std::set<MCPhysReg> ActualAliasedRegisters;
-  for (unsigned I : tracker.aliasedBits().set_bits())
-    ActualAliasedRegisters.insert(static_cast<MCPhysReg>(I));
-  const std::set<MCPhysReg> ExpectedAliasedRegisters = {Mips::T0, Mips::T0_64};
-  ASSERT_THAT(ActualAliasedRegisters, ExpectedAliasedRegisters);
-  for (MCPhysReg aliased : ExpectedAliasedRegisters) {
-    ASSERT_THAT(tracker.getOrigin(aliased), Mips::T0_64);
-  }
-}
-
-TEST_F(MipsRegisterAliasingTest, TrackRegisterClass) {
-  // The alias bits for
-  // GPR64_with_sub_32_in_GPRMM16MoveP_and_GPRMM16ZeroRegClassID
-  // are the union of the alias bits for ZERO_64, V0_64, V1_64 and S1_64.
-  const auto &RegInfo = State.getRegInfo();
-  const BitVector NoReservedReg(RegInfo.getNumRegs());
-
-  const RegisterAliasingTracker RegClassTracker(
-      RegInfo, NoReservedReg,
-      RegInfo.getRegClass(
-          Mips::GPR64_with_sub_32_in_GPRMM16MoveP_and_GPRMM16ZeroRegClassID));
-
-  BitVector sum(RegInfo.getNumRegs());
-  sum |= RegisterAliasingTracker(RegInfo, Mips::ZERO_64).aliasedBits();
-  sum |= RegisterAliasingTracker(RegInfo, Mips::V0_64).aliasedBits();
-  sum |= RegisterAliasingTracker(RegInfo, Mips::V1_64).aliasedBits();
-  sum |= RegisterAliasingTracker(RegInfo, Mips::S1_64).aliasedBits();
-
-  ASSERT_THAT(RegClassTracker.aliasedBits(), sum);
-}
-
-TEST_F(MipsRegisterAliasingTest, TrackRegisterClassCache) {
-  // Fetching the same tracker twice yields the same pointers.
-  const auto &RegInfo = State.getRegInfo();
-  const BitVector NoReservedReg(RegInfo.getNumRegs());
-  RegisterAliasingTrackerCache Cache(RegInfo, NoReservedReg);
-  ASSERT_THAT(&Cache.getRegister(Mips::T0), &Cache.getRegister(Mips::T0));
-
-  ASSERT_THAT(&Cache.getRegisterClass(Mips::ACC64RegClassID),
-              &Cache.getRegisterClass(Mips::ACC64RegClassID));
-}
-
-} // namespace
-} // namespace exegesis
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/Mips/SnippetGeneratorTest.cpp b/gnu/llvm/llvm/unittests/tools/llvm-exegesis/Mips/SnippetGeneratorTest.cpp
deleted file mode 100644
index 39294819f37..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/Mips/SnippetGeneratorTest.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-//===-- SnippetGeneratorTest.cpp --------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "../Common/AssemblerUtils.h"
-#include "LlvmState.h"
-#include "MCInstrDescView.h"
-#include "MipsInstrInfo.h"
-#include "ParallelSnippetGenerator.h"
-#include "RegisterAliasing.h"
-#include "SerialSnippetGenerator.h"
-#include "TestBase.h"
-
-#include <unordered_set>
-
-namespace llvm {
-namespace exegesis {
-namespace {
-
-using testing::AnyOf;
-using testing::ElementsAre;
-using testing::HasSubstr;
-using testing::SizeIs;
-
-MATCHER(IsInvalid, "") { return !arg.isValid(); }
-MATCHER(IsReg, "") { return arg.isReg(); }
-
-template <typename SnippetGeneratorT>
-class MipsSnippetGeneratorTest : public MipsTestBase {
-protected:
-  MipsSnippetGeneratorTest() : Generator(State, SnippetGenerator::Options()) {}
-
-  std::vector<CodeTemplate> checkAndGetCodeTemplates(unsigned Opcode) {
-    randomGenerator().seed(0); // Initialize seed.
-    const Instruction &Instr = State.getIC().getInstr(Opcode);
-    auto CodeTemplateOrError = Generator.generateCodeTemplates(
-        &Instr, State.getRATC().emptyRegisters());
-    EXPECT_FALSE(CodeTemplateOrError.takeError()); // Valid configuration.
-    return std::move(CodeTemplateOrError.get());
-  }
-
-  SnippetGeneratorT Generator;
-};
-
-using MipsSerialSnippetGeneratorTest = MipsSnippetGeneratorTest<SerialSnippetGenerator>;
-
-using MipsParallelSnippetGeneratorTest =
-    MipsSnippetGeneratorTest<ParallelSnippetGenerator>;
-
-TEST_F(MipsSerialSnippetGeneratorTest, ImplicitSelfDependencyThroughExplicitRegs) {
-  // - ADD
-  // - Op0 Explicit Def RegClass(GPR32)
-  // - Op1 Explicit Use RegClass(GPR32)
-  // - Op2 Explicit Use RegClass(GPR32)
-  // - Var0 [Op0]
-  // - Var1 [Op1]
-  // - Var2 [Op2]
-  // - hasAliasingRegisters
-  const unsigned Opcode = Mips::ADD;
-  const auto CodeTemplates = checkAndGetCodeTemplates(Opcode);
-  ASSERT_THAT(CodeTemplates, SizeIs(1));
-  const auto &CT = CodeTemplates[0];
-  EXPECT_THAT(CT.Execution, ExecutionMode::SERIAL_VIA_EXPLICIT_REGS);
-  ASSERT_THAT(CT.Instructions, SizeIs(1));
-  const InstructionTemplate &IT = CT.Instructions[0];
-  EXPECT_THAT(IT.getOpcode(), Opcode);
-  ASSERT_THAT(IT.getVariableValues(), SizeIs(3));
-  EXPECT_THAT(IT.getVariableValues(),
-              AnyOf(ElementsAre(IsReg(), IsInvalid(), IsReg()),
-                    ElementsAre(IsReg(), IsReg(), IsInvalid())))
-      << "Op0 is either set to Op1 or to Op2";
-}
-
-TEST_F(MipsSerialSnippetGeneratorTest,
-       ImplicitSelfDependencyThroughExplicitRegsForbidAll) {
-  // - XOR
-  // - Op0 Explicit Def RegClass(GPR32)
-  // - Op1 Explicit Use RegClass(GPR32)
-  // - Op2 Explicit Use RegClass(GPR32)
-  // - Var0 [Op0]
-  // - Var1 [Op1]
-  // - Var2 [Op2]
-  // - hasAliasingRegisters
-  randomGenerator().seed(0); // Initialize seed.
-  const Instruction &Instr = State.getIC().getInstr(Mips::XOR);
-  auto AllRegisters = State.getRATC().emptyRegisters();
-  AllRegisters.flip();
-  auto Error =
-      Generator.generateCodeTemplates(&Instr, AllRegisters).takeError();
-  EXPECT_TRUE((bool)Error);
-  consumeError(std::move(Error));
-}
-
-TEST_F(MipsParallelSnippetGeneratorTest, MemoryUse) {
-  // LB reads from memory.
-  // - LB
-  // - Op0 Explicit Def RegClass(GPR32)
-  // - Op1 Explicit Use Memory RegClass(MSA128F16)
-  // - Op2 Explicit Use Memory
-  // - Var0 [Op0]
-  // - Var1 [Op1]
-  // - Var2 [Op2]
-  // - hasMemoryOperands
-  const unsigned Opcode = Mips::LB;
-  const auto CodeTemplates = checkAndGetCodeTemplates(Opcode);
-  ASSERT_THAT(CodeTemplates, SizeIs(1));
-  const auto &CT = CodeTemplates[0];
-  EXPECT_THAT(CT.Info,
-              HasSubstr("instruction is parallel, repeating a random one."));
-  EXPECT_THAT(CT.Execution, ExecutionMode::UNKNOWN);
-  ASSERT_THAT(CT.Instructions,
-              SizeIs(ParallelSnippetGenerator::kMinNumDifferentAddresses));
-  const InstructionTemplate &IT = CT.Instructions[0];
-  EXPECT_THAT(IT.getOpcode(), Opcode);
-  ASSERT_THAT(IT.getVariableValues(), SizeIs(3));
-  EXPECT_EQ(IT.getVariableValues()[0].getReg(), 0u);
-  EXPECT_EQ(IT.getVariableValues()[2].getImm(), 0);
-}
-
-} // namespace
-} // namespace exegesis
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/Mips/TargetTest.cpp b/gnu/llvm/llvm/unittests/tools/llvm-exegesis/Mips/TargetTest.cpp
deleted file mode 100644
index 9ee0f1e79bc..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/Mips/TargetTest.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-//===-- TargetTest.cpp ------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "Target.h"
-
-#include <cassert>
-#include <memory>
-
-#include "MCTargetDesc/MipsMCTargetDesc.h"
-#include "TestBase.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-namespace exegesis {
-namespace {
-
-using testing::AllOf;
-using testing::ElementsAre;
-using testing::Eq;
-using testing::Matcher;
-using testing::Property;
-
-Matcher<MCOperand> IsImm(int64_t Value) {
-  return AllOf(Property(&MCOperand::isImm, Eq(true)),
-               Property(&MCOperand::getImm, Eq(Value)));
-}
-
-Matcher<MCOperand> IsReg(unsigned Reg) {
-  return AllOf(Property(&MCOperand::isReg, Eq(true)),
-               Property(&MCOperand::getReg, Eq(Reg)));
-}
-
-Matcher<MCInst> OpcodeIs(unsigned Opcode) {
-  return Property(&MCInst::getOpcode, Eq(Opcode));
-}
-
-Matcher<MCInst> IsLoadLow16BitImm(unsigned Reg, int64_t Value, bool IsGPR32) {
-  const unsigned ZeroReg = IsGPR32 ? Mips::ZERO : Mips::ZERO_64;
-  const unsigned ORi = IsGPR32 ? Mips::ORi : Mips::ORi64;
-  return AllOf(OpcodeIs(ORi),
-               ElementsAre(IsReg(Reg), IsReg(ZeroReg), IsImm(Value)));
-}
-
-Matcher<MCInst> IsLoadHigh16BitImm(unsigned Reg, int64_t Value, bool IsGPR32) {
-  const unsigned LUi = IsGPR32 ? Mips::LUi : Mips::LUi64;
-  return AllOf(OpcodeIs(LUi), ElementsAre(IsReg(Reg), IsImm(Value)));
-}
-
-Matcher<MCInst> IsShift(unsigned Reg, uint16_t Amount, bool IsGPR32) {
-  const unsigned SLL = IsGPR32 ? Mips::SLL : Mips::SLL64_64;
-  return AllOf(OpcodeIs(SLL),
-               ElementsAre(IsReg(Reg), IsReg(Reg), IsImm(Amount)));
-}
-
-class MipsTargetTest : public MipsTestBase {
-protected:
-  std::vector<MCInst> setRegTo(unsigned Reg, const APInt &Value) {
-    return State.getExegesisTarget().setRegTo(State.getSubtargetInfo(), Reg,
-                                              Value);
-  }
-};
-
-TEST_F(MipsTargetTest, SetGPR32RegTo16BitValue) {
-  const uint16_t Value = 0xFFFFU;
-  const unsigned Reg = Mips::T0;
-  EXPECT_THAT(setRegTo(Reg, APInt(16, Value)),
-              ElementsAre(IsLoadLow16BitImm(Reg, Value, true)));
-}
-
-TEST_F(MipsTargetTest, SetGPR64RegTo16BitValue) {
-  const uint16_t Value = 0xFFFFU;
-  const unsigned Reg = Mips::T0_64;
-  EXPECT_THAT(setRegTo(Reg, APInt(16, Value)),
-              ElementsAre(IsLoadLow16BitImm(Reg, Value, false)));
-}
-
-TEST_F(MipsTargetTest, SetGPR32RegTo32BitValue) {
-  const uint32_t Value0 = 0xFFFF0000UL;
-  const unsigned Reg0 = Mips::T0;
-  EXPECT_THAT(setRegTo(Reg0, APInt(32, Value0)),
-              ElementsAre(IsLoadHigh16BitImm(Reg0, 0xFFFFU, true)));
-  const uint32_t Value1 = 0xFFFFFFFFUL;
-  const unsigned Reg1 = Mips::T1;
-  EXPECT_THAT(setRegTo(Reg1, APInt(32, Value1)),
-              ElementsAre(IsLoadHigh16BitImm(Reg1, 0xFFFFU, true),
-                          IsLoadLow16BitImm(Reg1, 0xFFFFU, true)));
-}
-
-TEST_F(MipsTargetTest, SetGPR64RegTo32BitValue) {
-  const uint32_t Value0 = 0x7FFF0000UL;
-  const unsigned Reg0 = Mips::T0_64;
-  EXPECT_THAT(setRegTo(Reg0, APInt(32, Value0)),
-              ElementsAre(IsLoadHigh16BitImm(Reg0, 0x7FFFU, false)));
-  const uint32_t Value1 = 0x7FFFFFFFUL;
-  const unsigned Reg1 = Mips::T1_64;
-  EXPECT_THAT(setRegTo(Reg1, APInt(32, Value1)),
-              ElementsAre(IsLoadHigh16BitImm(Reg1, 0x7FFFU, false),
-                          IsLoadLow16BitImm(Reg1, 0xFFFFU, false)));
-  const uint32_t Value2 = 0xFFFF0000UL;
-  const unsigned Reg2 = Mips::T2_64;
-  EXPECT_THAT(setRegTo(Reg2, APInt(32, Value2)),
-              ElementsAre(IsLoadLow16BitImm(Reg2, 0xFFFFU, false),
-                          IsShift(Reg2, 16, false)));
-  const uint32_t Value3 = 0xFFFFFFFFUL;
-  const unsigned Reg3 = Mips::T3_64;
-  EXPECT_THAT(setRegTo(Reg3, APInt(32, Value3)),
-              ElementsAre(IsLoadLow16BitImm(Reg3, 0xFFFFU, false),
-                          IsShift(Reg3, 16, false),
-                          IsLoadLow16BitImm(Reg3, 0xFFFFU, false)));
-}
-
-TEST_F(MipsTargetTest, DefaultPfmCounters) {
-  const std::string Expected = "CYCLES";
-  EXPECT_EQ(State.getExegesisTarget().getPfmCounters("").CycleCounter,
-            Expected);
-  EXPECT_EQ(
-      State.getExegesisTarget().getPfmCounters("unknown_cpu").CycleCounter,
-      Expected);
-}
-
-} // namespace
-} // namespace exegesis
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/Mips/TestBase.h b/gnu/llvm/llvm/unittests/tools/llvm-exegesis/Mips/TestBase.h
deleted file mode 100644
index b9c1efa3eeb..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/Mips/TestBase.h
+++ /dev/null
@@ -1,42 +0,0 @@
-//===-- TestBase.h ----------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-// Test fixture common to all Mips tests.
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_UNITTESTS_TOOLS_LLVMEXEGESIS_MIPS_TESTBASE_H
-#define LLVM_UNITTESTS_TOOLS_LLVMEXEGESIS_MIPS_TESTBASE_H
-
-#include "LlvmState.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-namespace exegesis {
-
-void InitializeMipsExegesisTarget();
-
-class MipsTestBase : public ::testing::Test {
-protected:
-  MipsTestBase() : State("mips-unknown-linux", "mips32") {}
-
-  static void SetUpTestCase() {
-    LLVMInitializeMipsTargetInfo();
-    LLVMInitializeMipsTargetMC();
-    LLVMInitializeMipsTarget();
-    InitializeMipsExegesisTarget();
-  }
-
-  const LLVMState State;
-};
-
-} // namespace exegesis
-} // namespace llvm
-
-#endif
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/PerfHelperTest.cpp b/gnu/llvm/llvm/unittests/tools/llvm-exegesis/PerfHelperTest.cpp
deleted file mode 100644
index f4a07e8ebf5..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/PerfHelperTest.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-//===-- PerfHelperTest.cpp --------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "PerfHelper.h"
-#include "llvm/Config/config.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-namespace exegesis {
-namespace pfm {
-namespace {
-
-using ::testing::IsEmpty;
-using ::testing::Not;
-
-TEST(PerfHelperTest, FunctionalTest) {
-#ifdef HAVE_LIBPFM
-  ASSERT_FALSE(pfmInitialize());
-  PerfEvent Event("CYCLES:u");
-  ASSERT_TRUE(Event.valid());
-  EXPECT_EQ(Event.name(), "CYCLES:u");
-  EXPECT_THAT(Event.getPfmEventString(), Not(IsEmpty()));
-  Counter Cnt(std::move(Event));
-  Cnt.start();
-  Cnt.stop();
-  Cnt.read();
-  pfmTerminate();
-#else
-  ASSERT_TRUE(pfmInitialize());
-#endif
-}
-
-} // namespace
-} // namespace pfm
-} // namespace exegesis
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/PowerPC/AnalysisTest.cpp b/gnu/llvm/llvm/unittests/tools/llvm-exegesis/PowerPC/AnalysisTest.cpp
deleted file mode 100644
index 7cdae5411f5..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/PowerPC/AnalysisTest.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-//===-- PPCAnalysisTest.cpp ---------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "Analysis.h"
-
-#include <cassert>
-#include <memory>
-
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-namespace llvm{
-namespace exegesis {
-namespace {
-
-using testing::Pair;
-using testing::UnorderedElementsAre;
-
-class PPCAnalysisTest : public ::testing::Test {
-protected:
-  PPCAnalysisTest() {
-    const std::string TT = "powerpc64le-unknown-linux";
-    std::string error;
-    const Target *const TheTarget = TargetRegistry::lookupTarget(TT, error);
-    if (!TheTarget) {
-      errs() << error << "\n";
-      return;
-    }
-    STI.reset(TheTarget->createMCSubtargetInfo(TT, "pwr9", ""));
-
-    // Compute the ProxResIdx of ports uses in tests.
-    const auto &SM = STI->getSchedModel();
-    for (unsigned I = 0, E = SM.getNumProcResourceKinds(); I < E; ++I) {
-      const std::string Name = SM.getProcResource(I)->Name;
-      if (Name == "ALU") {
-        ALUIdx = I;
-      } else if (Name == "ALUE") {
-        ALUEIdx = I;
-      } else if (Name == "ALUO") {
-        ALUOIdx = I;
-      } else if (Name == "IP_AGEN") {
-        IPAGENIdx = I;
-      }
-    }
-    EXPECT_NE(ALUIdx, 0);
-    EXPECT_NE(ALUEIdx, 0);
-    EXPECT_NE(ALUOIdx, 0);
-    EXPECT_NE(IPAGENIdx, 0);
-  }
-
-  static void SetUpTestCase() {
-    LLVMInitializePowerPCTargetInfo();
-    LLVMInitializePowerPCTarget();
-    LLVMInitializePowerPCTargetMC();
-  }
-
-protected:
-  std::unique_ptr<const MCSubtargetInfo> STI;
-  uint16_t ALUIdx = 0;
-  uint16_t ALUEIdx = 0;
-  uint16_t ALUOIdx = 0;
-  uint16_t IPAGENIdx = 0;
-};
-
-TEST_F(PPCAnalysisTest, ComputeIdealizedProcResPressure_2ALU) {
-  const auto Pressure =
-      computeIdealizedProcResPressure(STI->getSchedModel(), {{ALUIdx, 2}});
-  EXPECT_THAT(Pressure, UnorderedElementsAre(Pair(ALUIdx, 2.0)));
-}
-
-TEST_F(PPCAnalysisTest, ComputeIdealizedProcResPressure_1ALUE) {
-  const auto Pressure =
-      computeIdealizedProcResPressure(STI->getSchedModel(), {{ALUEIdx, 2}});
-  EXPECT_THAT(Pressure, UnorderedElementsAre(Pair(ALUEIdx, 2.0)));
-}
-
-TEST_F(PPCAnalysisTest, ComputeIdealizedProcResPressure_1ALU1IPAGEN) {
-  const auto Pressure =
-      computeIdealizedProcResPressure(STI->getSchedModel(), {{ALUIdx, 1}, {IPAGENIdx, 1}});
-  EXPECT_THAT(Pressure, UnorderedElementsAre(Pair(ALUIdx, 1.0),Pair(IPAGENIdx, 1)));
-}
-} // namespace
-} // namespace exegesis
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/PowerPC/CMakeLists.txt b/gnu/llvm/llvm/unittests/tools/llvm-exegesis/PowerPC/CMakeLists.txt
deleted file mode 100644
index 20e7d5d2b82..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/PowerPC/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-add_llvm_exegesis_unittest_includes(
-  ${LLVM_MAIN_SRC_DIR}/lib/Target/PowerPC
-  ${LLVM_BINARY_DIR}/lib/Target/PowerPC
-  ${LLVM_MAIN_SRC_DIR}/tools/llvm-exegesis/lib
-  )
-
-add_llvm_exegesis_unittest_link_components(
-  MC
-  MCParser
-  Object
-  Support
-  Symbolize
-  PowerPC
-  )
-
-add_llvm_exegesis_unittest_sources(
-  AnalysisTest.cpp
-  SnippetGeneratorTest.cpp
-  TargetTest.cpp
-  )
-add_llvm_exegesis_unittest_link_libraries(
-  LLVMExegesisPowerPC)
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/PowerPC/SnippetGeneratorTest.cpp b/gnu/llvm/llvm/unittests/tools/llvm-exegesis/PowerPC/SnippetGeneratorTest.cpp
deleted file mode 100644
index bca1a5edff3..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/PowerPC/SnippetGeneratorTest.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-//===-- SnippetGeneratorTest.cpp --------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "../Common/AssemblerUtils.h"
-#include "LlvmState.h"
-#include "MCInstrDescView.h"
-#include "PPCInstrInfo.h"
-#include "ParallelSnippetGenerator.h"
-#include "RegisterAliasing.h"
-#include "SerialSnippetGenerator.h"
-#include "TestBase.h"
-
-#include <unordered_set>
-
-namespace llvm {
-namespace exegesis {
-namespace {
-
-using testing::AnyOf;
-using testing::ElementsAre;
-using testing::HasSubstr;
-using testing::SizeIs;
-
-MATCHER(IsInvalid, "") { return !arg.isValid(); }
-MATCHER(IsReg, "") { return arg.isReg(); }
-
-template <typename SnippetGeneratorT>
-class PPCSnippetGeneratorTest : public PPCTestBase {
-protected:
-  PPCSnippetGeneratorTest() : Generator(State, SnippetGenerator::Options()) {}
-
-  std::vector<CodeTemplate> checkAndGetCodeTemplates(unsigned Opcode) {
-    randomGenerator().seed(0); // Initialize seed.
-    const Instruction &Instr = State.getIC().getInstr(Opcode);
-    auto CodeTemplateOrError = Generator.generateCodeTemplates(
-        &Instr, State.getRATC().emptyRegisters());
-    EXPECT_FALSE(CodeTemplateOrError.takeError()); // Valid configuration.
-    return std::move(CodeTemplateOrError.get());
-  }
-
-  SnippetGeneratorT Generator;
-};
-
-using PPCSerialSnippetGeneratorTest = PPCSnippetGeneratorTest<SerialSnippetGenerator>;
-
-using PPCParallelSnippetGeneratorTest =
-    PPCSnippetGeneratorTest<ParallelSnippetGenerator>;
-
-TEST_F(PPCSerialSnippetGeneratorTest, ImplicitSelfDependencyThroughExplicitRegs) {
-  // - ADD8
-  // - Op0 Explicit Def RegClass(G8RC)
-  // - Op1 Explicit Use RegClass(G8RC)
-  // - Op2 Explicit Use RegClass(G8RC)
-  // - Var0 [Op0]
-  // - Var1 [Op1]
-  // - Var2 [Op2]
-  // - hasAliasingRegisters
-  const unsigned Opcode = PPC::ADD8;
-  const auto CodeTemplates = checkAndGetCodeTemplates(Opcode);
-  ASSERT_THAT(CodeTemplates, SizeIs(1));
-  const auto &CT = CodeTemplates[0];
-  EXPECT_THAT(CT.Execution, ExecutionMode::SERIAL_VIA_EXPLICIT_REGS);
-  ASSERT_THAT(CT.Instructions, SizeIs(1));
-  const InstructionTemplate &IT = CT.Instructions[0];
-  EXPECT_THAT(IT.getOpcode(), Opcode);
-  ASSERT_THAT(IT.getVariableValues(), SizeIs(3));
-  EXPECT_THAT(IT.getVariableValues(),
-              AnyOf(ElementsAre(IsReg(), IsInvalid(), IsReg()),
-                    ElementsAre(IsReg(), IsReg(), IsInvalid())))
-      << "Op0 is either set to Op1 or to Op2";
-}
-
-TEST_F(PPCSerialSnippetGeneratorTest, ImplicitSelfDependencyThroughTiedRegs) {
-
-  // - RLDIMI
-  // - Op0 Explicit Def RegClass(G8RC)
-  // - Op1 Explicit Use RegClass(G8RC) TiedToOp0
-  // - Op2 Explicit Use RegClass(G8RC)
-  // - Op3 Explicit Use Immediate
-  // - Op4 Explicit Use Immediate
-  // - Var0 [Op0,Op1]
-  // - Var1 [Op2]
-  // - Var2 [Op3]
-  // - Var3 [Op4]
-  // - hasTiedRegisters (execution is always serial)
-  // - hasAliasingRegisters
-  // - RLDIMI
-  const unsigned Opcode = PPC::RLDIMI;
-  const auto CodeTemplates = checkAndGetCodeTemplates(Opcode);
-  ASSERT_THAT(CodeTemplates, SizeIs(1));
-  const auto &CT = CodeTemplates[0];
-  EXPECT_THAT(CT.Execution, ExecutionMode::ALWAYS_SERIAL_TIED_REGS_ALIAS);
-  ASSERT_THAT(CT.Instructions, SizeIs(1));
-  const InstructionTemplate &IT = CT.Instructions[0];
-  EXPECT_THAT(IT.getOpcode(), Opcode);
-  ASSERT_THAT(IT.getVariableValues(), SizeIs(4));
-  EXPECT_THAT(IT.getVariableValues()[2], IsInvalid()) << "Operand 1 is not set";
-  EXPECT_THAT(IT.getVariableValues()[3], IsInvalid()) << "Operand 2 is not set";
-}
-
-TEST_F(PPCParallelSnippetGeneratorTest, MemoryUse) {
-  // - LDX
-  // - Op0 Explicit Def RegClass(G8RC)
-  // - Op1 Explicit Use Memory RegClass(GPRC)
-  // - Op2 Explicit Use Memory RegClass(VSSRC)
-  // - Var0 [Op0]
-  // - Var1 [Op1]
-  // - Var2 [Op2]
-  // - hasMemoryOperands
-  // - hasAliasingRegisters
-  const unsigned Opcode = PPC::LDX;
-  const auto CodeTemplates = checkAndGetCodeTemplates(Opcode);
-  ASSERT_THAT(CodeTemplates, SizeIs(1));
-  const auto &CT = CodeTemplates[0];
-  EXPECT_THAT(CT.Info, HasSubstr("instruction has no tied variables picking "
-                                 "Uses different from defs"));
-  EXPECT_THAT(CT.Execution, ExecutionMode::UNKNOWN);
-  ASSERT_THAT(CT.Instructions,
-              SizeIs(ParallelSnippetGenerator::kMinNumDifferentAddresses));
-  const InstructionTemplate &IT = CT.Instructions[0];
-  EXPECT_THAT(IT.getOpcode(), Opcode);
-  ASSERT_THAT(IT.getVariableValues(), SizeIs(3));
-  EXPECT_EQ(IT.getVariableValues()[1].getReg(), PPC::X1);
-  EXPECT_EQ(IT.getVariableValues()[2].getReg(), PPC::X13);
-}
-
-} // namespace
-} // namespace exegesis
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/PowerPC/TargetTest.cpp b/gnu/llvm/llvm/unittests/tools/llvm-exegesis/PowerPC/TargetTest.cpp
deleted file mode 100644
index a1b628fca2c..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/PowerPC/TargetTest.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-//===-- TargetTest.cpp ---------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "Target.h"
-
-#include <cassert>
-#include <memory>
-
-#include "MCTargetDesc/PPCMCTargetDesc.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-namespace llvm{
-namespace exegesis {
-
-void InitializePowerPCExegesisTarget();
-
-namespace {
-
-using testing::NotNull;
-using testing::IsEmpty;
-using testing::Not;
-
-constexpr const char kTriple[] = "powerpc64le-unknown-linux";
-
-class PowerPCTargetTest : public ::testing::Test {
-protected:
-  PowerPCTargetTest()
-      : ExegesisTarget_(ExegesisTarget::lookup(Triple(kTriple))) {
-    EXPECT_THAT(ExegesisTarget_, NotNull());
-    std::string error;
-    Target_ = TargetRegistry::lookupTarget(kTriple, error);
-    EXPECT_THAT(Target_, NotNull());
-  }
-  static void SetUpTestCase() {
-    LLVMInitializePowerPCTargetInfo();
-    LLVMInitializePowerPCTarget();
-    LLVMInitializePowerPCTargetMC();
-    InitializePowerPCExegesisTarget();
-  }
-
-  const Target *Target_;
-  const ExegesisTarget *const ExegesisTarget_;
-};
-
-TEST_F(PowerPCTargetTest, SetRegToConstant) {
-  const std::unique_ptr<MCSubtargetInfo> STI(
-      Target_->createMCSubtargetInfo(kTriple, "generic", ""));
-  const auto Insts = ExegesisTarget_->setRegTo(*STI, PPC::X0, APInt());
-  EXPECT_THAT(Insts, Not(IsEmpty()));
-}
-
-TEST_F(PowerPCTargetTest, DefaultPfmCounters) {
-  const std::string Expected = "CYCLES";
-  EXPECT_EQ(ExegesisTarget_->getPfmCounters("").CycleCounter, Expected);
-  EXPECT_EQ(ExegesisTarget_->getPfmCounters("unknown_cpu").CycleCounter,
-            Expected);
-}
-
-} // namespace
-} // namespace exegesis
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/PowerPC/TestBase.h b/gnu/llvm/llvm/unittests/tools/llvm-exegesis/PowerPC/TestBase.h
deleted file mode 100644
index 567f3f381fb..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/PowerPC/TestBase.h
+++ /dev/null
@@ -1,42 +0,0 @@
-//===-- TestBase.h ----------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-// Test fixture common to all PowerPC tests.
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_UNITTESTS_TOOLS_LLVMEXEGESIS_POWERPC_TESTBASE_H
-#define LLVM_UNITTESTS_TOOLS_LLVMEXEGESIS_POWERPC_TESTBASE_H
-
-#include "LlvmState.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-namespace exegesis {
-
-void InitializePowerPCExegesisTarget();
-
-class PPCTestBase : public ::testing::Test {
-protected:
-  PPCTestBase() : State("powerpc64le-unknown-linux", "ppc64le") {}
-
-  static void SetUpTestCase() {
-    LLVMInitializePowerPCTargetInfo();
-    LLVMInitializePowerPCTargetMC();
-    LLVMInitializePowerPCTarget();
-    InitializePowerPCExegesisTarget();
-  }
-
-  const LLVMState State;
-};
-
-} // namespace exegesis
-} // namespace llvm
-
-#endif
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/RegisterValueTest.cpp b/gnu/llvm/llvm/unittests/tools/llvm-exegesis/RegisterValueTest.cpp
deleted file mode 100644
index 21332ad64f9..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/RegisterValueTest.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-//===-- RegisterValueTest.cpp -----------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "RegisterValue.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-namespace exegesis {
-
-namespace {
-
-#define CHECK(EXPECTED, ACTUAL)                                                \
-  EXPECT_EQ(APInt(SizeInBits, EXPECTED, 16),                                   \
-            bitcastFloatValue(Semantic, PredefinedValues::ACTUAL))
-
-TEST(RegisterValueTest, Half) {
-  const size_t SizeInBits = 16;
-  const auto &Semantic = APFloatBase::IEEEhalf();
-  CHECK("0000", POS_ZERO);
-  CHECK("8000", NEG_ZERO);
-  CHECK("3C00", ONE);
-  CHECK("4000", TWO);
-  CHECK("7C00", INF);
-  CHECK("7E00", QNAN);
-  CHECK("7BFF", LARGEST);
-  CHECK("0400", SMALLEST_NORM);
-  CHECK("0001", SMALLEST);
-  CHECK("0001", ULP);
-  CHECK("3C01", ONE_PLUS_ULP);
-}
-
-TEST(RegisterValueTest, Single) {
-  const size_t SizeInBits = 32;
-  const auto &Semantic = APFloatBase::IEEEsingle();
-  CHECK("00000000", POS_ZERO);
-  CHECK("80000000", NEG_ZERO);
-  CHECK("3F800000", ONE);
-  CHECK("40000000", TWO);
-  CHECK("7F800000", INF);
-  CHECK("7FC00000", QNAN);
-  CHECK("7F7FFFFF", LARGEST);
-  CHECK("00800000", SMALLEST_NORM);
-  CHECK("00000001", SMALLEST);
-  CHECK("00000001", ULP);
-  CHECK("3F800001", ONE_PLUS_ULP);
-}
-
-TEST(RegisterValueTest, Double) {
-  const size_t SizeInBits = 64;
-  const auto &Semantic = APFloatBase::IEEEdouble();
-  CHECK("0000000000000000", POS_ZERO);
-  CHECK("8000000000000000", NEG_ZERO);
-  CHECK("3FF0000000000000", ONE);
-  CHECK("4000000000000000", TWO);
-  CHECK("7FF0000000000000", INF);
-  CHECK("7FF8000000000000", QNAN);
-  CHECK("7FEFFFFFFFFFFFFF", LARGEST);
-  CHECK("0010000000000000", SMALLEST_NORM);
-  CHECK("0000000000000001", SMALLEST);
-  CHECK("0000000000000001", ULP);
-  CHECK("3FF0000000000001", ONE_PLUS_ULP);
-}
-
-} // namespace
-} // namespace exegesis
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/SnippetGeneratorTest.cpp b/gnu/llvm/llvm/unittests/tools/llvm-exegesis/SnippetGeneratorTest.cpp
deleted file mode 100644
index 760caa8ce32..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/SnippetGeneratorTest.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-//===-- SnippetGeneratorTest.cpp --------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "SnippetGenerator.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-#include <initializer_list>
-
-namespace llvm {
-namespace exegesis {
-
-namespace {
-
-TEST(CombinationGenerator, Square) {
-  const std::vector<std::vector<int>> Choices{{0, 1}, {2, 3}};
-
-  std::vector<std::vector<int>> Variants;
-  CombinationGenerator<int, std::vector<int>, 4> G(Choices);
-  const size_t NumVariants = G.numCombinations();
-  G.generate([&](ArrayRef<int> State) -> bool {
-    Variants.emplace_back(State);
-    return false; // keep going
-  });
-
-  const std::vector<std::vector<int>> ExpectedVariants{
-      {0, 2},
-      {0, 3},
-      {1, 2},
-      {1, 3},
-  };
-  ASSERT_THAT(Variants, ::testing::SizeIs(NumVariants));
-  ASSERT_THAT(Variants, ::testing::ContainerEq(ExpectedVariants));
-}
-
-TEST(CombinationGenerator, MiddleColumn) {
-  const std::vector<std::vector<int>> Choices{{0}, {1, 2}, {3}};
-
-  std::vector<std::vector<int>> Variants;
-  CombinationGenerator<int, std::vector<int>, 4> G(Choices);
-  const size_t NumVariants = G.numCombinations();
-  G.generate([&](ArrayRef<int> State) -> bool {
-    Variants.emplace_back(State);
-    return false; // keep going
-  });
-
-  const std::vector<std::vector<int>> ExpectedVariants{
-      {0, 1, 3},
-      {0, 2, 3},
-  };
-  ASSERT_THAT(Variants, ::testing::SizeIs(NumVariants));
-  ASSERT_THAT(Variants, ::testing::ContainerEq(ExpectedVariants));
-}
-
-TEST(CombinationGenerator, SideColumns) {
-  const std::vector<std::vector<int>> Choices{{0, 1}, {2}, {3, 4}};
-
-  std::vector<std::vector<int>> Variants;
-  CombinationGenerator<int, std::vector<int>, 4> G(Choices);
-  const size_t NumVariants = G.numCombinations();
-  G.generate([&](ArrayRef<int> State) -> bool {
-    Variants.emplace_back(State);
-    return false; // keep going
-  });
-
-  const std::vector<std::vector<int>> ExpectedVariants{
-      {0, 2, 3},
-      {0, 2, 4},
-      {1, 2, 3},
-      {1, 2, 4},
-  };
-  ASSERT_THAT(Variants, ::testing::SizeIs(NumVariants));
-  ASSERT_THAT(Variants, ::testing::ContainerEq(ExpectedVariants));
-}
-
-TEST(CombinationGenerator, LeftColumn) {
-  const std::vector<std::vector<int>> Choices{{0, 1}, {2}};
-
-  std::vector<std::vector<int>> Variants;
-  CombinationGenerator<int, std::vector<int>, 4> G(Choices);
-  const size_t NumVariants = G.numCombinations();
-  G.generate([&](ArrayRef<int> State) -> bool {
-    Variants.emplace_back(State);
-    return false; // keep going
-  });
-
-  const std::vector<std::vector<int>> ExpectedVariants{
-      {0, 2},
-      {1, 2},
-  };
-  ASSERT_THAT(Variants, ::testing::SizeIs(NumVariants));
-  ASSERT_THAT(Variants, ::testing::ContainerEq(ExpectedVariants));
-}
-
-TEST(CombinationGenerator, RightColumn) {
-  const std::vector<std::vector<int>> Choices{{0}, {1, 2}};
-
-  std::vector<std::vector<int>> Variants;
-  CombinationGenerator<int, std::vector<int>, 4> G(Choices);
-  const size_t NumVariants = G.numCombinations();
-  G.generate([&](ArrayRef<int> State) -> bool {
-    Variants.emplace_back(State);
-    return false; // keep going
-  });
-
-  const std::vector<std::vector<int>> ExpectedVariants{
-      {0, 1},
-      {0, 2},
-  };
-  ASSERT_THAT(Variants, ::testing::SizeIs(NumVariants));
-  ASSERT_THAT(Variants, ::testing::ContainerEq(ExpectedVariants));
-}
-
-TEST(CombinationGenerator, Column) {
-  const std::vector<std::vector<int>> Choices{{0, 1}};
-
-  std::vector<std::vector<int>> Variants;
-  CombinationGenerator<int, std::vector<int>, 4> G(Choices);
-  const size_t NumVariants = G.numCombinations();
-  G.generate([&](ArrayRef<int> State) -> bool {
-    Variants.emplace_back(State);
-    return false; // keep going
-  });
-
-  const std::vector<std::vector<int>> ExpectedVariants{
-      {0},
-      {1},
-  };
-  ASSERT_THAT(Variants, ::testing::SizeIs(NumVariants));
-  ASSERT_THAT(Variants, ::testing::ContainerEq(ExpectedVariants));
-}
-
-TEST(CombinationGenerator, Row) {
-  const std::vector<std::vector<int>> Choices{{0}, {1}};
-
-  std::vector<std::vector<int>> Variants;
-  CombinationGenerator<int, std::vector<int>, 4> G(Choices);
-  const size_t NumVariants = G.numCombinations();
-  G.generate([&](ArrayRef<int> State) -> bool {
-    Variants.emplace_back(State);
-    return false; // keep going
-  });
-
-  const std::vector<std::vector<int>> ExpectedVariants{
-      {0, 1},
-  };
-  ASSERT_THAT(Variants, ::testing::SizeIs(NumVariants));
-  ASSERT_THAT(Variants, ::testing::ContainerEq(ExpectedVariants));
-}
-
-TEST(CombinationGenerator, Singleton) {
-  const std::vector<std::vector<int>> Choices{{0}};
-
-  std::vector<std::vector<int>> Variants;
-  CombinationGenerator<int, std::vector<int>, 4> G(Choices);
-  const size_t NumVariants = G.numCombinations();
-  G.generate([&](ArrayRef<int> State) -> bool {
-    Variants.emplace_back(State);
-    return false; // keep going
-  });
-
-  const std::vector<std::vector<int>> ExpectedVariants{
-      {0},
-  };
-  ASSERT_THAT(Variants, ::testing::SizeIs(NumVariants));
-  ASSERT_THAT(Variants, ::testing::ContainerEq(ExpectedVariants));
-}
-
-} // namespace
-} // namespace exegesis
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/AssemblerTest.cpp b/gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/AssemblerTest.cpp
deleted file mode 100644
index a2c30e9f5c6..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/AssemblerTest.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-//===-- AssemblerTest.cpp ---------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "../Common/AssemblerUtils.h"
-#include "X86InstrInfo.h"
-
-namespace llvm {
-namespace exegesis {
-
-void InitializeX86ExegesisTarget();
-
-namespace {
-
-using X86::EAX;
-using X86::MOV32ri;
-using X86::MOV64ri32;
-using X86::RAX;
-using X86::XOR32rr;
-
-class X86MachineFunctionGeneratorTest
-    : public MachineFunctionGeneratorBaseTest {
-protected:
-  X86MachineFunctionGeneratorTest()
-      : MachineFunctionGeneratorBaseTest("x86_64-unknown-linux", "haswell") {}
-
-  static void SetUpTestCase() {
-    LLVMInitializeX86TargetInfo();
-    LLVMInitializeX86TargetMC();
-    LLVMInitializeX86Target();
-    LLVMInitializeX86AsmPrinter();
-    InitializeX86ExegesisTarget();
-  }
-};
-
-TEST_F(X86MachineFunctionGeneratorTest, DISABLED_JitFunction) {
-  Check({}, MCInst(), 0xc3);
-}
-
-TEST_F(X86MachineFunctionGeneratorTest, DISABLED_JitFunctionXOR32rr_X86) {
-  Check({{EAX, APInt(32, 1)}},
-        MCInstBuilder(XOR32rr).addReg(EAX).addReg(EAX).addReg(EAX),
-        // mov eax, 1
-        0xb8, 0x01, 0x00, 0x00, 0x00,
-        // xor eax, eax
-        0x31, 0xc0, 0xc3);
-}
-
-TEST_F(X86MachineFunctionGeneratorTest, DISABLED_JitFunctionMOV64ri) {
-  Check({}, MCInstBuilder(MOV64ri32).addReg(RAX).addImm(42), 0x48, 0xc7, 0xc0,
-        0x2a, 0x00, 0x00, 0x00, 0xc3);
-}
-
-TEST_F(X86MachineFunctionGeneratorTest, DISABLED_JitFunctionMOV32ri) {
-  Check({}, MCInstBuilder(MOV32ri).addReg(EAX).addImm(42), 0xb8, 0x2a, 0x00,
-        0x00, 0x00, 0xc3);
-}
-
-} // namespace
-} // namespace exegesis
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/BenchmarkResultTest.cpp b/gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/BenchmarkResultTest.cpp
deleted file mode 100644
index aed2b631dd7..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/BenchmarkResultTest.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-//===-- BenchmarkResultTest.cpp ---------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "BenchmarkResult.h"
-#include "X86InstrInfo.h"
-#include "llvm/ADT/SmallString.h"
-#include "llvm/Support/Error.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "llvm/Support/YAMLTraits.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-using ::testing::AllOf;
-using ::testing::Eq;
-using ::testing::get;
-using ::testing::Pointwise;
-using ::testing::Property;
-
-namespace llvm {
-namespace exegesis {
-
-static std::string Dump(const MCInst &McInst) {
-  std::string Buffer;
-  raw_string_ostream OS(Buffer);
-  McInst.print(OS);
-  return Buffer;
-}
-
-MATCHER(EqMCInst, "") {
-  const std::string Lhs = Dump(get<0>(arg));
-  const std::string Rhs = Dump(get<1>(arg));
-  if (Lhs != Rhs) {
-    *result_listener << Lhs << " <=> " << Rhs;
-    return false;
-  }
-  return true;
-}
-
-namespace {
-
-TEST(BenchmarkResultTest, WriteToAndReadFromDisk) {
-  LLVMInitializeX86TargetInfo();
-  LLVMInitializeX86Target();
-  LLVMInitializeX86TargetMC();
-
-  // Read benchmarks.
-  const LLVMState State("x86_64-unknown-linux", "haswell");
-
-  ExitOnError ExitOnErr;
-
-  InstructionBenchmark ToDisk;
-
-  ToDisk.Key.Instructions.push_back(MCInstBuilder(X86::XOR32rr)
-                                        .addReg(X86::AL)
-                                        .addReg(X86::AH)
-                                        .addImm(123)
-                                        .addDFPImm(bit_cast<uint64_t>(0.5)));
-  ToDisk.Key.Config = "config";
-  ToDisk.Key.RegisterInitialValues = {
-      RegisterValue{X86::AL, APInt(8, "-1", 10)},
-      RegisterValue{X86::AH, APInt(8, "123", 10)}};
-  ToDisk.Mode = InstructionBenchmark::Latency;
-  ToDisk.CpuName = "cpu_name";
-  ToDisk.LLVMTriple = "llvm_triple";
-  ToDisk.NumRepetitions = 1;
-  ToDisk.Measurements.push_back(BenchmarkMeasure{"a", 1, 1});
-  ToDisk.Measurements.push_back(BenchmarkMeasure{"b", 2, 2});
-  ToDisk.Error = "error";
-  ToDisk.Info = "info";
-
-  SmallString<64> Filename;
-  std::error_code EC;
-  EC = sys::fs::createUniqueDirectory("BenchmarkResultTestDir", Filename);
-  ASSERT_FALSE(EC);
-  sys::path::append(Filename, "data.yaml");
-  errs() << Filename << "-------\n";
-  ExitOnErr(ToDisk.writeYaml(State, Filename));
-
-  {
-    // One-element version.
-    const auto FromDisk =
-        ExitOnErr(InstructionBenchmark::readYaml(State, Filename));
-
-    EXPECT_THAT(FromDisk.Key.Instructions,
-                Pointwise(EqMCInst(), ToDisk.Key.Instructions));
-    EXPECT_EQ(FromDisk.Key.Config, ToDisk.Key.Config);
-    EXPECT_EQ(FromDisk.Mode, ToDisk.Mode);
-    EXPECT_EQ(FromDisk.CpuName, ToDisk.CpuName);
-    EXPECT_EQ(FromDisk.LLVMTriple, ToDisk.LLVMTriple);
-    EXPECT_EQ(FromDisk.NumRepetitions, ToDisk.NumRepetitions);
-    EXPECT_THAT(FromDisk.Measurements, ToDisk.Measurements);
-    EXPECT_THAT(FromDisk.Error, ToDisk.Error);
-    EXPECT_EQ(FromDisk.Info, ToDisk.Info);
-  }
-  {
-    // Vector version.
-    const auto FromDiskVector =
-        ExitOnErr(InstructionBenchmark::readYamls(State, Filename));
-    ASSERT_EQ(FromDiskVector.size(), size_t{1});
-    const auto FromDisk = FromDiskVector[0];
-    EXPECT_THAT(FromDisk.Key.Instructions,
-                Pointwise(EqMCInst(), ToDisk.Key.Instructions));
-    EXPECT_EQ(FromDisk.Key.Config, ToDisk.Key.Config);
-    EXPECT_EQ(FromDisk.Mode, ToDisk.Mode);
-    EXPECT_EQ(FromDisk.CpuName, ToDisk.CpuName);
-    EXPECT_EQ(FromDisk.LLVMTriple, ToDisk.LLVMTriple);
-    EXPECT_EQ(FromDisk.NumRepetitions, ToDisk.NumRepetitions);
-    EXPECT_THAT(FromDisk.Measurements, ToDisk.Measurements);
-    EXPECT_THAT(FromDisk.Error, ToDisk.Error);
-    EXPECT_EQ(FromDisk.Info, ToDisk.Info);
-  }
-}
-
-TEST(BenchmarkResultTest, PerInstructionStats) {
-  PerInstructionStats Stats;
-  Stats.push(BenchmarkMeasure{"a", 0.5, 0.0});
-  Stats.push(BenchmarkMeasure{"a", 1.5, 0.0});
-  Stats.push(BenchmarkMeasure{"a", -1.0, 0.0});
-  Stats.push(BenchmarkMeasure{"a", 0.0, 0.0});
-  EXPECT_EQ(Stats.min(), -1.0);
-  EXPECT_EQ(Stats.max(), 1.5);
-  EXPECT_EQ(Stats.avg(), 0.25); // (0.5+1.5-1.0+0.0) / 4
-}
-} // namespace
-} // namespace exegesis
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/CMakeLists.txt b/gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/CMakeLists.txt
deleted file mode 100644
index 9ce547ddaad..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-add_llvm_exegesis_unittest_includes(
-  ${LLVM_MAIN_SRC_DIR}/lib/Target/X86
-  ${LLVM_BINARY_DIR}/lib/Target/X86
-  ${LLVM_MAIN_SRC_DIR}/tools/llvm-exegesis/lib
-  )
-
-add_llvm_exegesis_unittest_sources(
-  AssemblerTest.cpp
-  BenchmarkResultTest.cpp
-  RegisterAliasingTest.cpp
-  SchedClassResolutionTest.cpp
-  SnippetFileTest.cpp
-  SnippetGeneratorTest.cpp
-  SnippetRepetitorTest.cpp
-  TargetTest.cpp
-  )
-
-add_llvm_exegesis_unittest_link_components(
-  Core
-  Codegen
-  MC
-  MCParser
-  Object
-  Support
-  Symbolize
-  X86
-  )
-
-add_llvm_exegesis_unittest_link_libraries(
-  LLVMExegesisX86
-  )
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/RegisterAliasingTest.cpp b/gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/RegisterAliasingTest.cpp
deleted file mode 100644
index 13ae243778b..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/RegisterAliasingTest.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//===-- X86RegisterAliasingTest.cpp --------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-
-#include "RegisterAliasing.h"
-
-#include <cassert>
-#include <memory>
-
-#include "TestBase.h"
-#include "X86InstrInfo.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-namespace exegesis {
-namespace {
-
-class X86RegisterAliasingTest : public X86TestBase {};
-
-TEST_F(X86RegisterAliasingTest, TrackSimpleRegister) {
-  const auto &RegInfo = State.getRegInfo();
-  const RegisterAliasingTracker tracker(RegInfo, X86::EAX);
-  std::set<MCPhysReg> ActualAliasedRegisters;
-  for (unsigned I : tracker.aliasedBits().set_bits())
-    ActualAliasedRegisters.insert(static_cast<MCPhysReg>(I));
-  const std::set<MCPhysReg> ExpectedAliasedRegisters = {
-      X86::AL, X86::AH, X86::AX, X86::EAX, X86::HAX, X86::RAX};
-  ASSERT_THAT(ActualAliasedRegisters, ExpectedAliasedRegisters);
-  for (MCPhysReg aliased : ExpectedAliasedRegisters) {
-    ASSERT_THAT(tracker.getOrigin(aliased), X86::EAX);
-  }
-}
-
-TEST_F(X86RegisterAliasingTest, TrackRegisterClass) {
-  // The alias bits for GR8_ABCD_LRegClassID are the union of the alias bits for
-  // AL, BL, CL and DL.
-  const auto &RegInfo = State.getRegInfo();
-  const BitVector NoReservedReg(RegInfo.getNumRegs());
-
-  const RegisterAliasingTracker RegClassTracker(
-      RegInfo, NoReservedReg, RegInfo.getRegClass(X86::GR8_ABCD_LRegClassID));
-
-  BitVector sum(RegInfo.getNumRegs());
-  sum |= RegisterAliasingTracker(RegInfo, X86::AL).aliasedBits();
-  sum |= RegisterAliasingTracker(RegInfo, X86::BL).aliasedBits();
-  sum |= RegisterAliasingTracker(RegInfo, X86::CL).aliasedBits();
-  sum |= RegisterAliasingTracker(RegInfo, X86::DL).aliasedBits();
-
-  ASSERT_THAT(RegClassTracker.aliasedBits(), sum);
-}
-
-TEST_F(X86RegisterAliasingTest, TrackRegisterClassCache) {
-  // Fetching twice the same tracker yields the same pointers.
-  const auto &RegInfo = State.getRegInfo();
-  const BitVector NoReservedReg(RegInfo.getNumRegs());
-  RegisterAliasingTrackerCache Cache(RegInfo, NoReservedReg);
-  ASSERT_THAT(&Cache.getRegister(X86::AX), &Cache.getRegister(X86::AX));
-
-  ASSERT_THAT(&Cache.getRegisterClass(X86::GR8_ABCD_LRegClassID),
-              &Cache.getRegisterClass(X86::GR8_ABCD_LRegClassID));
-}
-
-} // namespace
-} // namespace exegesis
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/SchedClassResolutionTest.cpp b/gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/SchedClassResolutionTest.cpp
deleted file mode 100644
index be99f0017d7..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/SchedClassResolutionTest.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-//===-- SchedClassResolutionTest.cpp ----------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "SchedClassResolution.h"
-
-#include <cassert>
-#include <memory>
-
-#include "TestBase.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-namespace exegesis {
-namespace {
-
-using testing::Pair;
-using testing::UnorderedElementsAre;
-
-class X86SchedClassResolutionTest : public X86TestBase {
-protected:
-  X86SchedClassResolutionTest() : STI(State.getSubtargetInfo()) {
-    // Compute the ProxResIdx of ports uses in tests.
-    const auto &SM = STI.getSchedModel();
-    for (unsigned I = 0, E = SM.getNumProcResourceKinds(); I < E; ++I) {
-      const std::string Name = SM.getProcResource(I)->Name;
-      if (Name == "HWPort0") {
-        P0Idx = I;
-      } else if (Name == "HWPort1") {
-        P1Idx = I;
-      } else if (Name == "HWPort5") {
-        P5Idx = I;
-      } else if (Name == "HWPort6") {
-        P6Idx = I;
-      } else if (Name == "HWPort05") {
-        P05Idx = I;
-      } else if (Name == "HWPort0156") {
-        P0156Idx = I;
-      }
-    }
-    EXPECT_NE(P0Idx, 0);
-    EXPECT_NE(P1Idx, 0);
-    EXPECT_NE(P5Idx, 0);
-    EXPECT_NE(P6Idx, 0);
-    EXPECT_NE(P05Idx, 0);
-    EXPECT_NE(P0156Idx, 0);
-  }
-
-protected:
-  const MCSubtargetInfo &STI;
-  uint16_t P0Idx = 0;
-  uint16_t P1Idx = 0;
-  uint16_t P5Idx = 0;
-  uint16_t P6Idx = 0;
-  uint16_t P05Idx = 0;
-  uint16_t P0156Idx = 0;
-};
-
-TEST_F(X86SchedClassResolutionTest, ComputeIdealizedProcResPressure_2P0) {
-  const auto Pressure =
-      computeIdealizedProcResPressure(STI.getSchedModel(), {{P0Idx, 2}});
-  EXPECT_THAT(Pressure, UnorderedElementsAre(Pair(P0Idx, 2.0)));
-}
-
-TEST_F(X86SchedClassResolutionTest, ComputeIdealizedProcResPressure_2P05) {
-  const auto Pressure =
-      computeIdealizedProcResPressure(STI.getSchedModel(), {{P05Idx, 2}});
-  EXPECT_THAT(Pressure,
-              UnorderedElementsAre(Pair(P0Idx, 1.0), Pair(P5Idx, 1.0)));
-}
-
-TEST_F(X86SchedClassResolutionTest, ComputeIdealizedProcResPressure_2P05_2P0156) {
-  const auto Pressure = computeIdealizedProcResPressure(
-      STI.getSchedModel(), {{P05Idx, 2}, {P0156Idx, 2}});
-  EXPECT_THAT(Pressure,
-              UnorderedElementsAre(Pair(P0Idx, 1.0), Pair(P1Idx, 1.0),
-                                   Pair(P5Idx, 1.0), Pair(P6Idx, 1.0)));
-}
-
-TEST_F(X86SchedClassResolutionTest,
-       ComputeIdealizedProcResPressure_1P1_1P05_2P0156) {
-  const auto Pressure = computeIdealizedProcResPressure(
-      STI.getSchedModel(), {{P1Idx, 1}, {P05Idx, 1}, {P0156Idx, 2}});
-  EXPECT_THAT(Pressure,
-              UnorderedElementsAre(Pair(P0Idx, 1.0), Pair(P1Idx, 1.0),
-                                   Pair(P5Idx, 1.0), Pair(P6Idx, 1.0)));
-}
-
-} // namespace
-} // namespace exegesis
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/SnippetFileTest.cpp b/gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/SnippetFileTest.cpp
deleted file mode 100644
index 4bcd3f27f87..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/SnippetFileTest.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-//===-- SnippetFileTest.cpp -------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "SnippetFile.h"
-
-#include "LlvmState.h"
-#include "TestBase.h"
-#include "X86InstrInfo.h"
-#include "llvm/Support/Error.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/Testing/Support/SupportHelpers.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-namespace exegesis {
-
-void InitializeX86ExegesisTarget();
-
-namespace {
-
-using testing::AllOf;
-using testing::ElementsAre;
-using testing::Eq;
-using testing::Field;
-using testing::Property;
-using testing::SizeIs;
-
-using llvm::unittest::TempDir;
-
-class X86SnippetFileTest : public X86TestBase {
-protected:
-  Expected<std::vector<BenchmarkCode>> TestCommon(StringRef Contents) {
-    TempDir TestDirectory("SnippetFileTestDir", /*Unique*/ true);
-    SmallString<64> Filename(TestDirectory.path());
-    sys::path::append(Filename, "snippet.s");
-    errs() << Filename << "-------\n";
-    {
-      std::error_code EC;
-      raw_fd_ostream FOS(Filename, EC);
-      FOS << Contents;
-      EXPECT_FALSE(EC);
-    }
-    return readSnippets(State, Filename);
-  }
-};
-
-// FIXME: Refactor these to ../Common/Matchers.h
-static auto HasOpcode = [](unsigned Opcode) {
-  return Property(&MCInst::getOpcode, Eq(Opcode));
-};
-
-MATCHER_P2(RegisterInitialValueIs, Reg, Val, "") {
-  if (arg.Register == Reg &&
-      arg.Value.getLimitedValue() == static_cast<uint64_t>(Val))
-    return true;
-  *result_listener << "expected: {" << Reg << ", " << Val << "} ";
-  *result_listener << "actual: {" << arg.Register << ", "
-                   << arg.Value.getLimitedValue() << "}";
-  return false;
-}
-
-TEST_F(X86SnippetFileTest, Works) {
-  auto Snippets = TestCommon(R"(
-    # LLVM-EXEGESIS-DEFREG RAX 0f
-    # LLVM-EXEGESIS-DEFREG SIL 0
-    # LLVM-EXEGESIS-LIVEIN RDI
-    # LLVM-EXEGESIS-LIVEIN DL
-    incq %rax
-  )");
-  EXPECT_FALSE((bool)Snippets.takeError());
-  ASSERT_THAT(*Snippets, SizeIs(1));
-  const auto &Snippet = (*Snippets)[0];
-  ASSERT_THAT(Snippet.Key.Instructions, ElementsAre(HasOpcode(X86::INC64r)));
-  ASSERT_THAT(Snippet.Key.RegisterInitialValues,
-              ElementsAre(RegisterInitialValueIs(X86::RAX, 15),
-                          RegisterInitialValueIs(X86::SIL, 0)));
-  ASSERT_THAT(Snippet.LiveIns, ElementsAre(X86::RDI, X86::DL));
-}
-
-TEST_F(X86SnippetFileTest, BadDefregParam) {
-  auto Error = TestCommon(R"(
-    # LLVM-EXEGESIS-DEFREG DOESNOEXIST 0
-    incq %rax
-  )")
-                   .takeError();
-  EXPECT_TRUE((bool)Error);
-  consumeError(std::move(Error));
-}
-
-TEST_F(X86SnippetFileTest, NoDefregValue) {
-  auto Error = TestCommon(R"(
-    # LLVM-EXEGESIS-DEFREG RAX
-    incq %rax
-  )")
-                   .takeError();
-  EXPECT_TRUE((bool)Error);
-  consumeError(std::move(Error));
-}
-
-TEST_F(X86SnippetFileTest, MissingParam) {
-  auto Error = TestCommon(R"(
-    # LLVM-EXEGESIS-LIVEIN
-    incq %rax
-  )")
-                   .takeError();
-  EXPECT_TRUE((bool)Error);
-  consumeError(std::move(Error));
-}
-
-TEST_F(X86SnippetFileTest, NoAsmStreamer) {
-  auto Snippets = TestCommon(R"(
-    .cv_fpo_proc foo 4
-  )");
-  EXPECT_FALSE((bool)Snippets.takeError());
-}
-
-} // namespace
-} // namespace exegesis
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/SnippetGeneratorTest.cpp b/gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/SnippetGeneratorTest.cpp
deleted file mode 100644
index ce6fd821d2c..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/SnippetGeneratorTest.cpp
+++ /dev/null
@@ -1,461 +0,0 @@
-//===-- SnippetGeneratorTest.cpp --------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "../Common/AssemblerUtils.h"
-#include "LlvmState.h"
-#include "MCInstrDescView.h"
-#include "ParallelSnippetGenerator.h"
-#include "RegisterAliasing.h"
-#include "SerialSnippetGenerator.h"
-#include "TestBase.h"
-#include "X86InstrInfo.h"
-
-#include <unordered_set>
-
-namespace llvm {
-namespace exegesis {
-
-void InitializeX86ExegesisTarget();
-
-namespace {
-
-using testing::AnyOf;
-using testing::ElementsAre;
-using testing::Gt;
-using testing::HasSubstr;
-using testing::Not;
-using testing::SizeIs;
-using testing::UnorderedElementsAre;
-
-MATCHER(IsInvalid, "") { return !arg.isValid(); }
-MATCHER(IsReg, "") { return arg.isReg(); }
-
-template <typename SnippetGeneratorT>
-class X86SnippetGeneratorTest : public X86TestBase {
-protected:
-  X86SnippetGeneratorTest() : Generator(State, SnippetGenerator::Options()),
-	                      InstrInfo(State.getInstrInfo()) {}
-
-  std::vector<CodeTemplate> checkAndGetCodeTemplates(unsigned Opcode) {
-    randomGenerator().seed(0); // Initialize seed.
-    const Instruction &Instr = State.getIC().getInstr(Opcode);
-    auto CodeTemplateOrError = Generator.generateCodeTemplates(
-        &Instr, State.getRATC().emptyRegisters());
-    EXPECT_FALSE(CodeTemplateOrError.takeError()); // Valid configuration.
-    return std::move(CodeTemplateOrError.get());
-  }
-
-  SnippetGeneratorT Generator;
-  const MCInstrInfo &InstrInfo;
-};
-
-using X86SerialSnippetGeneratorTest = X86SnippetGeneratorTest<SerialSnippetGenerator>;
-
-using X86ParallelSnippetGeneratorTest =
-    X86SnippetGeneratorTest<ParallelSnippetGenerator>;
-
-TEST_F(X86SerialSnippetGeneratorTest, ImplicitSelfDependencyThroughImplicitReg) {
-  // - ADC16i16
-  // - Op0 Explicit Use Immediate
-  // - Op1 Implicit Def Reg(AX)
-  // - Op2 Implicit Def Reg(EFLAGS)
-  // - Op3 Implicit Use Reg(AX)
-  // - Op4 Implicit Use Reg(EFLAGS)
-  // - Var0 [Op0]
-  // - hasAliasingImplicitRegisters (execution is always serial)
-  // - hasAliasingRegisters
-  const unsigned Opcode = X86::ADC16i16;
-  EXPECT_THAT(InstrInfo.get(Opcode).getImplicitDefs()[0], X86::AX);
-  EXPECT_THAT(InstrInfo.get(Opcode).getImplicitDefs()[1], X86::EFLAGS);
-  EXPECT_THAT(InstrInfo.get(Opcode).getImplicitUses()[0], X86::AX);
-  EXPECT_THAT(InstrInfo.get(Opcode).getImplicitUses()[1], X86::EFLAGS);
-  const auto CodeTemplates = checkAndGetCodeTemplates(Opcode);
-  ASSERT_THAT(CodeTemplates, SizeIs(1));
-  const auto &CT = CodeTemplates[0];
-  EXPECT_THAT(CT.Execution, ExecutionMode::ALWAYS_SERIAL_IMPLICIT_REGS_ALIAS);
-  ASSERT_THAT(CT.Instructions, SizeIs(1));
-  const InstructionTemplate &IT = CT.Instructions[0];
-  EXPECT_THAT(IT.getOpcode(), Opcode);
-  ASSERT_THAT(IT.getVariableValues(), SizeIs(1)); // Imm.
-  EXPECT_THAT(IT.getVariableValues()[0], IsInvalid()) << "Immediate is not set";
-}
-
-TEST_F(X86SerialSnippetGeneratorTest, ImplicitSelfDependencyThroughTiedRegs) {
-  // - ADD16ri
-  // - Op0 Explicit Def RegClass(GR16)
-  // - Op1 Explicit Use RegClass(GR16) TiedToOp0
-  // - Op2 Explicit Use Immediate
-  // - Op3 Implicit Def Reg(EFLAGS)
-  // - Var0 [Op0,Op1]
-  // - Var1 [Op2]
-  // - hasTiedRegisters (execution is always serial)
-  // - hasAliasingRegisters
-  const unsigned Opcode = X86::ADD16ri;
-  EXPECT_THAT(InstrInfo.get(Opcode).getImplicitDefs()[0], X86::EFLAGS);
-  const auto CodeTemplates = checkAndGetCodeTemplates(Opcode);
-  ASSERT_THAT(CodeTemplates, SizeIs(1));
-  const auto &CT = CodeTemplates[0];
-  EXPECT_THAT(CT.Execution, ExecutionMode::ALWAYS_SERIAL_TIED_REGS_ALIAS);
-  ASSERT_THAT(CT.Instructions, SizeIs(1));
-  const InstructionTemplate &IT = CT.Instructions[0];
-  EXPECT_THAT(IT.getOpcode(), Opcode);
-  ASSERT_THAT(IT.getVariableValues(), SizeIs(2));
-  EXPECT_THAT(IT.getVariableValues()[0], IsInvalid()) << "Operand 1 is not set";
-  EXPECT_THAT(IT.getVariableValues()[1], IsInvalid()) << "Operand 2 is not set";
-}
-
-TEST_F(X86SerialSnippetGeneratorTest, ImplicitSelfDependencyThroughExplicitRegs) {
-  // - VXORPSrr
-  // - Op0 Explicit Def RegClass(VR128)
-  // - Op1 Explicit Use RegClass(VR128)
-  // - Op2 Explicit Use RegClass(VR128)
-  // - Var0 [Op0]
-  // - Var1 [Op1]
-  // - Var2 [Op2]
-  // - hasAliasingRegisters
-  const unsigned Opcode = X86::VXORPSrr;
-  const auto CodeTemplates = checkAndGetCodeTemplates(Opcode);
-  ASSERT_THAT(CodeTemplates, SizeIs(1));
-  const auto &CT = CodeTemplates[0];
-  EXPECT_THAT(CT.Execution, ExecutionMode::SERIAL_VIA_EXPLICIT_REGS);
-  ASSERT_THAT(CT.Instructions, SizeIs(1));
-  const InstructionTemplate &IT = CT.Instructions[0];
-  EXPECT_THAT(IT.getOpcode(), Opcode);
-  ASSERT_THAT(IT.getVariableValues(), SizeIs(3));
-  EXPECT_THAT(IT.getVariableValues(),
-              AnyOf(ElementsAre(IsReg(), IsInvalid(), IsReg()),
-                    ElementsAre(IsReg(), IsReg(), IsInvalid())))
-      << "Op0 is either set to Op1 or to Op2";
-}
-
-TEST_F(X86SerialSnippetGeneratorTest,
-       ImplicitSelfDependencyThroughExplicitRegsForbidAll) {
-  // - VXORPSrr
-  // - Op0 Explicit Def RegClass(VR128)
-  // - Op1 Explicit Use RegClass(VR128)
-  // - Op2 Explicit Use RegClass(VR128)
-  // - Var0 [Op0]
-  // - Var1 [Op1]
-  // - Var2 [Op2]
-  // - hasAliasingRegisters
-  const unsigned Opcode = X86::VXORPSrr;
-  randomGenerator().seed(0); // Initialize seed.
-  const Instruction &Instr = State.getIC().getInstr(Opcode);
-  auto AllRegisters = State.getRATC().emptyRegisters();
-  AllRegisters.flip();
-  auto Error =
-      Generator.generateCodeTemplates(&Instr, AllRegisters).takeError();
-  EXPECT_TRUE((bool)Error);
-  consumeError(std::move(Error));
-}
-
-TEST_F(X86SerialSnippetGeneratorTest, DependencyThroughOtherOpcode) {
-  // - CMP64rr
-  // - Op0 Explicit Use RegClass(GR64)
-  // - Op1 Explicit Use RegClass(GR64)
-  // - Op2 Implicit Def Reg(EFLAGS)
-  // - Var0 [Op0]
-  // - Var1 [Op1]
-  const unsigned Opcode = X86::CMP64rr;
-  const auto CodeTemplates = checkAndGetCodeTemplates(Opcode);
-  ASSERT_THAT(CodeTemplates, SizeIs(Gt(1U))) << "Many templates are available";
-  for (const auto &CT : CodeTemplates) {
-    EXPECT_THAT(CT.Execution, ExecutionMode::SERIAL_VIA_NON_MEMORY_INSTR);
-    ASSERT_THAT(CT.Instructions, SizeIs(2));
-    const InstructionTemplate &IT = CT.Instructions[0];
-    EXPECT_THAT(IT.getOpcode(), Opcode);
-    ASSERT_THAT(IT.getVariableValues(), SizeIs(2));
-    EXPECT_THAT(IT.getVariableValues(),
-                AnyOf(ElementsAre(IsReg(), IsInvalid()),
-                      ElementsAre(IsInvalid(), IsReg())));
-    EXPECT_THAT(CT.Instructions[1].getOpcode(), Not(Opcode));
-    // TODO: check that the two instructions alias each other.
-  }
-}
-
-TEST_F(X86SerialSnippetGeneratorTest, LAHF) {
-  // - LAHF
-  // - Op0 Implicit Def Reg(AH)
-  // - Op1 Implicit Use Reg(EFLAGS)
-  const unsigned Opcode = X86::LAHF;
-  const auto CodeTemplates = checkAndGetCodeTemplates(Opcode);
-  ASSERT_THAT(CodeTemplates, SizeIs(Gt(1U))) << "Many templates are available";
-  for (const auto &CT : CodeTemplates) {
-    EXPECT_THAT(CT.Execution, ExecutionMode::SERIAL_VIA_NON_MEMORY_INSTR);
-    ASSERT_THAT(CT.Instructions, SizeIs(2));
-    const InstructionTemplate &IT = CT.Instructions[0];
-    EXPECT_THAT(IT.getOpcode(), Opcode);
-    ASSERT_THAT(IT.getVariableValues(), SizeIs(0));
-  }
-}
-
-TEST_F(X86SerialSnippetGeneratorTest, VCVTUSI642SDZrrb_Int) {
-  // - VCVTUSI642SDZrrb_Int
-  // - Op0 Explicit Def RegClass(VR128X)
-  // - Op1 Explicit Use RegClass(VR128X)
-  // - Op2 Explicit Use STATIC_ROUNDING
-  // - Op2 Explicit Use RegClass(GR64)
-  // - Op4 Implicit Use Reg(MXSCR)
-  const unsigned Opcode = X86::VCVTUSI642SDZrrb_Int;
-  const Instruction &Instr = State.getIC().getInstr(Opcode);
-  std::vector<BenchmarkCode> Configs;
-  auto Error = Generator.generateConfigurations(
-      &Instr, Configs, State.getRATC().emptyRegisters());
-  ASSERT_FALSE(Error);
-  ASSERT_THAT(Configs, SizeIs(1));
-  const BenchmarkCode &BC = Configs[0];
-  ASSERT_THAT(BC.Key.Instructions, SizeIs(1));
-  ASSERT_TRUE(BC.Key.Instructions[0].getOperand(3).isImm());
-}
-
-TEST_F(X86ParallelSnippetGeneratorTest, ParallelInstruction) {
-  // - BNDCL32rr
-  // - Op0 Explicit Use RegClass(BNDR)
-  // - Op1 Explicit Use RegClass(GR32)
-  // - Var0 [Op0]
-  // - Var1 [Op1]
-  const unsigned Opcode = X86::BNDCL32rr;
-  const auto CodeTemplates = checkAndGetCodeTemplates(Opcode);
-  ASSERT_THAT(CodeTemplates, SizeIs(1));
-  const auto &CT = CodeTemplates[0];
-  EXPECT_THAT(CT.Info, HasSubstr("parallel"));
-  EXPECT_THAT(CT.Execution, ExecutionMode::UNKNOWN);
-  ASSERT_THAT(CT.Instructions, SizeIs(1));
-  const InstructionTemplate &IT = CT.Instructions[0];
-  EXPECT_THAT(IT.getOpcode(), Opcode);
-  ASSERT_THAT(IT.getVariableValues(), SizeIs(2));
-  EXPECT_THAT(IT.getVariableValues()[0], IsInvalid());
-  EXPECT_THAT(IT.getVariableValues()[1], IsInvalid());
-}
-
-TEST_F(X86ParallelSnippetGeneratorTest, SerialInstruction) {
-  // - CDQ
-  // - Op0 Implicit Def Reg(EAX)
-  // - Op1 Implicit Def Reg(EDX)
-  // - Op2 Implicit Use Reg(EAX)
-  // - hasAliasingImplicitRegisters (execution is always serial)
-  // - hasAliasingRegisters
-  const unsigned Opcode = X86::CDQ;
-  const auto CodeTemplates = checkAndGetCodeTemplates(Opcode);
-  ASSERT_THAT(CodeTemplates, SizeIs(1));
-  const auto &CT = CodeTemplates[0];
-  EXPECT_THAT(CT.Info, HasSubstr("serial"));
-  EXPECT_THAT(CT.Execution, ExecutionMode::UNKNOWN);
-  ASSERT_THAT(CT.Instructions, SizeIs(1));
-  const InstructionTemplate &IT = CT.Instructions[0];
-  EXPECT_THAT(IT.getOpcode(), Opcode);
-  ASSERT_THAT(IT.getVariableValues(), SizeIs(0));
-}
-
-TEST_F(X86ParallelSnippetGeneratorTest, StaticRenaming) {
-  // CMOV32rr has tied variables, we enumerate the possible values to execute
-  // as many in parallel as possible.
-
-  // - CMOV32rr
-  // - Op0 Explicit Def RegClass(GR32)
-  // - Op1 Explicit Use RegClass(GR32) TiedToOp0
-  // - Op2 Explicit Use RegClass(GR32)
-  // - Op3 Explicit Use Immediate
-  // - Op3 Implicit Use Reg(EFLAGS)
-  // - Var0 [Op0,Op1]
-  // - Var1 [Op2]
-  // - hasTiedRegisters (execution is always serial)
-  // - hasAliasingRegisters
-  const unsigned Opcode = X86::CMOV32rr;
-  const auto CodeTemplates = checkAndGetCodeTemplates(Opcode);
-  ASSERT_THAT(CodeTemplates, SizeIs(1));
-  const auto &CT = CodeTemplates[0];
-  EXPECT_THAT(CT.Info, HasSubstr("static renaming"));
-  EXPECT_THAT(CT.Execution, ExecutionMode::UNKNOWN);
-  constexpr const unsigned kInstructionCount = 15;
-  ASSERT_THAT(CT.Instructions, SizeIs(kInstructionCount));
-  std::unordered_set<unsigned> AllDefRegisters;
-  for (const auto &IT : CT.Instructions) {
-    ASSERT_THAT(IT.getVariableValues(), SizeIs(3));
-    AllDefRegisters.insert(IT.getVariableValues()[0].getReg());
-  }
-  EXPECT_THAT(AllDefRegisters, SizeIs(kInstructionCount))
-      << "Each instruction writes to a different register";
-}
-
-TEST_F(X86ParallelSnippetGeneratorTest, NoTiedVariables) {
-  // CMOV_GR32 has no tied variables, we make sure def and use are different
-  // from each other.
-
-  // - CMOV_GR32
-  // - Op0 Explicit Def RegClass(GR32)
-  // - Op1 Explicit Use RegClass(GR32)
-  // - Op2 Explicit Use RegClass(GR32)
-  // - Op3 Explicit Use Immediate
-  // - Op4 Implicit Use Reg(EFLAGS)
-  // - Var0 [Op0]
-  // - Var1 [Op1]
-  // - Var2 [Op2]
-  // - Var3 [Op3]
-  // - hasAliasingRegisters
-  const unsigned Opcode = X86::CMOV_GR32;
-  const auto CodeTemplates = checkAndGetCodeTemplates(Opcode);
-  ASSERT_THAT(CodeTemplates, SizeIs(1));
-  const auto &CT = CodeTemplates[0];
-  EXPECT_THAT(CT.Info, HasSubstr("no tied variables"));
-  EXPECT_THAT(CT.Execution, ExecutionMode::UNKNOWN);
-  ASSERT_THAT(CT.Instructions, SizeIs(1));
-  const InstructionTemplate &IT = CT.Instructions[0];
-  EXPECT_THAT(IT.getOpcode(), Opcode);
-  ASSERT_THAT(IT.getVariableValues(), SizeIs(4));
-  EXPECT_THAT(IT.getVariableValues()[0].getReg(),
-              Not(IT.getVariableValues()[1].getReg()))
-      << "Def is different from first Use";
-  EXPECT_THAT(IT.getVariableValues()[0].getReg(),
-              Not(IT.getVariableValues()[2].getReg()))
-      << "Def is different from second Use";
-  EXPECT_THAT(IT.getVariableValues()[3], IsInvalid());
-}
-
-TEST_F(X86ParallelSnippetGeneratorTest, MemoryUse) {
-  // Mov32rm reads from memory.
-  // - MOV32rm
-  // - Op0 Explicit Def RegClass(GR32)
-  // - Op1 Explicit Use Memory RegClass(GR8)
-  // - Op2 Explicit Use Memory
-  // - Op3 Explicit Use Memory RegClass(GRH8)
-  // - Op4 Explicit Use Memory
-  // - Op5 Explicit Use Memory RegClass(SEGMENT_REG)
-  // - Var0 [Op0]
-  // - Var1 [Op1]
-  // - Var2 [Op2]
-  // - Var3 [Op3]
-  // - Var4 [Op4]
-  // - Var5 [Op5]
-  // - hasMemoryOperands
-  // - hasAliasingRegisters
-  const unsigned Opcode = X86::MOV32rm;
-  const auto CodeTemplates = checkAndGetCodeTemplates(Opcode);
-  ASSERT_THAT(CodeTemplates, SizeIs(1));
-  const auto &CT = CodeTemplates[0];
-  EXPECT_THAT(CT.Info, HasSubstr("no tied variables"));
-  EXPECT_THAT(CT.Execution, ExecutionMode::UNKNOWN);
-  ASSERT_THAT(CT.Instructions,
-              SizeIs(ParallelSnippetGenerator::kMinNumDifferentAddresses));
-  const InstructionTemplate &IT = CT.Instructions[0];
-  EXPECT_THAT(IT.getOpcode(), Opcode);
-  ASSERT_THAT(IT.getVariableValues(), SizeIs(6));
-  EXPECT_EQ(IT.getVariableValues()[2].getImm(), 1);
-  EXPECT_EQ(IT.getVariableValues()[3].getReg(), 0u);
-  EXPECT_EQ(IT.getVariableValues()[4].getImm(), 0);
-  EXPECT_EQ(IT.getVariableValues()[5].getReg(), 0u);
-}
-
-TEST_F(X86ParallelSnippetGeneratorTest, MOV16ms) {
-  const unsigned Opcode = X86::MOV16ms;
-  const Instruction &Instr = State.getIC().getInstr(Opcode);
-  std::vector<BenchmarkCode> Benchmarks;
-  auto Err = Generator.generateConfigurations(&Instr, Benchmarks,
-                                              State.getRATC().emptyRegisters());
-  EXPECT_TRUE((bool)Err);
-  EXPECT_THAT(toString(std::move(Err)),
-              testing::HasSubstr("no available registers"));
-}
-
-class X86FakeSnippetGenerator : public SnippetGenerator {
-public:
-  X86FakeSnippetGenerator(const LLVMState &State, const Options &Opts)
-      : SnippetGenerator(State, Opts) {}
-
-  const Instruction &getInstr(unsigned Opcode) {
-    return State.getIC().getInstr(Opcode);
-  }
-
-  InstructionTemplate getInstructionTemplate(unsigned Opcode) {
-    return {&getInstr(Opcode)};
-  }
-
-private:
-  Expected<std::vector<CodeTemplate>>
-  generateCodeTemplates(InstructionTemplate, const BitVector &) const override {
-    return make_error<StringError>("not implemented", inconvertibleErrorCode());
-  }
-};
-
-using X86FakeSnippetGeneratorTest = X86SnippetGeneratorTest<X86FakeSnippetGenerator>;
-
-testing::Matcher<const RegisterValue &> IsRegisterValue(unsigned Reg,
-                                                        APInt Value) {
-  return testing::AllOf(testing::Field(&RegisterValue::Register, Reg),
-                        testing::Field(&RegisterValue::Value, Value));
-}
-
-TEST_F(X86FakeSnippetGeneratorTest, MemoryUse_Movsb) {
-  // MOVSB writes to scratch memory register.
-  // - MOVSB
-  // - Op0 Explicit Use Memory RegClass(GR8)
-  // - Op1 Explicit Use Memory RegClass(GR8)
-  // - Op2 Explicit Use Memory RegClass(SEGMENT_REG)
-  // - Op3 Implicit Def Reg(EDI)
-  // - Op4 Implicit Def Reg(ESI)
-  // - Op5 Implicit Use Reg(EDI)
-  // - Op6 Implicit Use Reg(ESI)
-  // - Op7 Implicit Use Reg(DF)
-  // - Var0 [Op0]
-  // - Var1 [Op1]
-  // - Var2 [Op2]
-  // - hasMemoryOperands
-  // - hasAliasingImplicitRegisters (execution is always serial)
-  // - hasAliasingRegisters
-  const unsigned Opcode = X86::MOVSB;
-  const Instruction &Instr = State.getIC().getInstr(Opcode);
-  std::vector<BenchmarkCode> Benchmarks;
-  auto Error = Generator.generateConfigurations(
-      &Instr, Benchmarks, State.getRATC().emptyRegisters());
-  EXPECT_TRUE((bool)Error);
-  consumeError(std::move(Error));
-}
-
-TEST_F(X86FakeSnippetGeneratorTest, ComputeRegisterInitialValuesAdd16ri) {
-  // ADD16ri:
-  // explicit def 0       : reg RegClass=GR16
-  // explicit use 1       : reg RegClass=GR16 | TIED_TO:0
-  // explicit use 2       : imm
-  // implicit def         : EFLAGS
-  InstructionTemplate IT = Generator.getInstructionTemplate(X86::ADD16ri);
-  IT.getValueFor(IT.getInstr().Variables[0]) = MCOperand::createReg(X86::AX);
-  std::vector<InstructionTemplate> Snippet;
-  Snippet.push_back(std::move(IT));
-  const auto RIV = Generator.computeRegisterInitialValues(Snippet);
-  EXPECT_THAT(RIV, ElementsAre(IsRegisterValue(X86::AX, APInt())));
-}
-
-TEST_F(X86FakeSnippetGeneratorTest, ComputeRegisterInitialValuesAdd64rr) {
-  // ADD64rr:
-  //  mov64ri rax, 42
-  //  add64rr rax, rax, rbx
-  // -> only rbx needs defining.
-  std::vector<InstructionTemplate> Snippet;
-  {
-    InstructionTemplate Mov = Generator.getInstructionTemplate(X86::MOV64ri);
-    Mov.getValueFor(Mov.getInstr().Variables[0]) =
-        MCOperand::createReg(X86::RAX);
-    Mov.getValueFor(Mov.getInstr().Variables[1]) = MCOperand::createImm(42);
-    Snippet.push_back(std::move(Mov));
-  }
-  {
-    InstructionTemplate Add = Generator.getInstructionTemplate(X86::ADD64rr);
-    Add.getValueFor(Add.getInstr().Variables[0]) =
-        MCOperand::createReg(X86::RAX);
-    Add.getValueFor(Add.getInstr().Variables[1]) =
-        MCOperand::createReg(X86::RBX);
-    Snippet.push_back(std::move(Add));
-  }
-
-  const auto RIV = Generator.computeRegisterInitialValues(Snippet);
-  EXPECT_THAT(RIV, ElementsAre(IsRegisterValue(X86::RBX, APInt())));
-}
-
-} // namespace
-} // namespace exegesis
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/SnippetRepetitorTest.cpp b/gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/SnippetRepetitorTest.cpp
deleted file mode 100644
index b5aca1eb353..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/SnippetRepetitorTest.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-//===-- SnippetRepetitorTest.cpp --------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "../Common/AssemblerUtils.h"
-#include "LlvmState.h"
-#include "MCInstrDescView.h"
-#include "RegisterAliasing.h"
-#include "TestBase.h"
-#include "X86InstrInfo.h"
-#include "llvm/CodeGen/MachineBasicBlock.h"
-
-namespace llvm {
-namespace exegesis {
-
-void InitializeX86ExegesisTarget();
-
-namespace {
-
-using testing::ElementsAre;
-using testing::Eq;
-using testing::Field;
-using testing::Property;
-using testing::UnorderedElementsAre;
-
-class X86SnippetRepetitorTest : public X86TestBase {
-protected:
-  void SetUp() override {
-    TM = State.createTargetMachine();
-    Context = std::make_unique<LLVMContext>();
-    Mod = std::make_unique<Module>("X86SnippetRepetitorTest", *Context);
-    Mod->setDataLayout(TM->createDataLayout());
-    MMI = std::make_unique<MachineModuleInfo>(TM.get());
-    MF = &createVoidVoidPtrMachineFunction("TestFn", Mod.get(), MMI.get());
-  }
-
-  void TestCommon(InstructionBenchmark::RepetitionModeE RepetitionMode) {
-    const auto Repetitor = SnippetRepetitor::Create(RepetitionMode, State);
-    const std::vector<MCInst> Instructions = {MCInstBuilder(X86::NOOP)};
-    FunctionFiller Sink(*MF, {X86::EAX});
-    const auto Fill =
-        Repetitor->Repeat(Instructions, kMinInstructions, kLoopBodySize);
-    Fill(Sink);
-  }
-
-  static constexpr const unsigned kMinInstructions = 3;
-  static constexpr const unsigned kLoopBodySize = 5;
-
-  std::unique_ptr<LLVMTargetMachine> TM;
-  std::unique_ptr<LLVMContext> Context;
-  std::unique_ptr<Module> Mod;
-  std::unique_ptr<MachineModuleInfo> MMI;
-  MachineFunction *MF = nullptr;
-};
-
-static auto HasOpcode = [](unsigned Opcode) {
-  return Property(&MachineInstr::getOpcode, Eq(Opcode));
-};
-
-static auto LiveReg = [](unsigned Reg) {
-  return Field(&MachineBasicBlock::RegisterMaskPair::PhysReg, Eq(Reg));
-};
-
-TEST_F(X86SnippetRepetitorTest, Duplicate) {
-  TestCommon(InstructionBenchmark::Duplicate);
-  // Duplicating creates a single basic block that repeats the instructions.
-  ASSERT_EQ(MF->getNumBlockIDs(), 1u);
-  EXPECT_THAT(MF->getBlockNumbered(0)->instrs(),
-              ElementsAre(HasOpcode(X86::NOOP), HasOpcode(X86::NOOP),
-                          HasOpcode(X86::NOOP), HasOpcode(X86::RETQ)));
-}
-
-TEST_F(X86SnippetRepetitorTest, Loop) {
-  TestCommon(InstructionBenchmark::Loop);
-  // Duplicating creates an entry block, a loop body and a ret block.
-  ASSERT_EQ(MF->getNumBlockIDs(), 3u);
-  const auto &LoopBlock = *MF->getBlockNumbered(1);
-  EXPECT_THAT(LoopBlock.instrs(),
-              ElementsAre(HasOpcode(X86::NOOP), HasOpcode(X86::NOOP),
-                          HasOpcode(X86::NOOP), HasOpcode(X86::NOOP),
-                          HasOpcode(X86::NOOP), HasOpcode(X86::ADD64ri8),
-                          HasOpcode(X86::JCC_1)));
-  EXPECT_THAT(LoopBlock.liveins(),
-              UnorderedElementsAre(
-                  LiveReg(X86::EAX),
-                  LiveReg(State.getExegesisTarget().getLoopCounterRegister(
-                      State.getTargetMachine().getTargetTriple()))));
-  EXPECT_THAT(MF->getBlockNumbered(2)->instrs(),
-              ElementsAre(HasOpcode(X86::RETQ)));
-}
-
-} // namespace
-} // namespace exegesis
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/TargetTest.cpp b/gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/TargetTest.cpp
deleted file mode 100644
index d1f153eab47..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/TargetTest.cpp
+++ /dev/null
@@ -1,396 +0,0 @@
-//===-- TargetTest.cpp -----------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "Target.h"
-
-#include <cassert>
-#include <memory>
-
-#include "MCTargetDesc/X86MCTargetDesc.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-#include "llvm/MC/MCInstPrinter.h"
-
-namespace llvm {
-
-bool operator==(const MCOperand &a, const MCOperand &b) {
-  if (a.isImm() && b.isImm())
-    return a.getImm() == b.getImm();
-  if (a.isReg() && b.isReg())
-    return a.getReg() == b.getReg();
-  return false;
-}
-
-bool operator==(const MCInst &a, const MCInst &b) {
-  if (a.getOpcode() != b.getOpcode())
-    return false;
-  if (a.getNumOperands() != b.getNumOperands())
-    return false;
-  for (unsigned I = 0; I < a.getNumOperands(); ++I) {
-    if (!(a.getOperand(I) == b.getOperand(I)))
-      return false;
-  }
-  return true;
-}
-
-} // namespace llvm
-
-namespace llvm {
-namespace exegesis {
-
-void InitializeX86ExegesisTarget();
-
-namespace {
-
-using testing::AllOf;
-using testing::ElementsAre;
-using testing::ElementsAreArray;
-using testing::Eq;
-using testing::Gt;
-using testing::Matcher;
-using testing::NotNull;
-using testing::Property;
-using testing::SizeIs;
-
-Matcher<MCOperand> IsImm(int64_t Value) {
-  return AllOf(Property(&MCOperand::isImm, Eq(true)),
-               Property(&MCOperand::getImm, Eq(Value)));
-}
-
-Matcher<MCOperand> IsReg(unsigned Reg) {
-  return AllOf(Property(&MCOperand::isReg, Eq(true)),
-               Property(&MCOperand::getReg, Eq(Reg)));
-}
-
-Matcher<MCInst> OpcodeIs(unsigned Opcode) {
-  return Property(&MCInst::getOpcode, Eq(Opcode));
-}
-
-Matcher<MCInst> IsMovImmediate(unsigned Opcode, int64_t Reg, int64_t Value) {
-  return AllOf(OpcodeIs(Opcode), ElementsAre(IsReg(Reg), IsImm(Value)));
-}
-
-Matcher<MCInst> IsMovValueToStack(unsigned Opcode, int64_t Value,
-                                  size_t Offset) {
-  return AllOf(OpcodeIs(Opcode),
-               ElementsAre(IsReg(X86::RSP), IsImm(1), IsReg(0), IsImm(Offset),
-                           IsReg(0), IsImm(Value)));
-}
-
-Matcher<MCInst> IsMovValueFromStack(unsigned Opcode, unsigned Reg) {
-  return AllOf(OpcodeIs(Opcode),
-               ElementsAre(IsReg(Reg), IsReg(X86::RSP), IsImm(1), IsReg(0),
-                           IsImm(0), IsReg(0)));
-}
-
-Matcher<MCInst> IsStackAllocate(unsigned Size) {
-  return AllOf(OpcodeIs(X86::SUB64ri8),
-               ElementsAre(IsReg(X86::RSP), IsReg(X86::RSP), IsImm(Size)));
-}
-
-Matcher<MCInst> IsStackDeallocate(unsigned Size) {
-  return AllOf(OpcodeIs(X86::ADD64ri8),
-               ElementsAre(IsReg(X86::RSP), IsReg(X86::RSP), IsImm(Size)));
-}
-
-constexpr const char kTriple[] = "x86_64-unknown-linux";
-
-class X86TargetTest : public ::testing::Test {
-protected:
-  X86TargetTest(const char *Features) : State(kTriple, "core2", Features) {}
-
-  static void SetUpTestCase() {
-    LLVMInitializeX86TargetInfo();
-    LLVMInitializeX86Target();
-    LLVMInitializeX86TargetMC();
-    InitializeX86ExegesisTarget();
-  }
-
-  std::vector<MCInst> setRegTo(unsigned Reg, const APInt &Value) {
-    return State.getExegesisTarget().setRegTo(State.getSubtargetInfo(), Reg,
-                                              Value);
-  }
-
-  const Instruction &getInstr(unsigned OpCode) {
-    return State.getIC().getInstr(OpCode);
-  }
-
-  LLVMState State;
-};
-
-class X86Core2TargetTest : public X86TargetTest {
-public:
-  X86Core2TargetTest() : X86TargetTest("") {}
-};
-
-class X86Core2AvxTargetTest : public X86TargetTest {
-public:
-  X86Core2AvxTargetTest() : X86TargetTest("+avx") {}
-};
-
-class X86Core2Avx512TargetTest : public X86TargetTest {
-public:
-  X86Core2Avx512TargetTest() : X86TargetTest("+avx512vl") {}
-};
-
-TEST_F(X86Core2TargetTest, NoHighByteRegs) {
-  EXPECT_TRUE(State.getRATC().reservedRegisters().test(X86::AH));
-}
-
-TEST_F(X86Core2TargetTest, SetFlags) {
-  const unsigned Reg = X86::EFLAGS;
-  EXPECT_THAT(setRegTo(Reg, APInt(64, 0x1111222233334444ULL)),
-              ElementsAre(IsStackAllocate(8),
-                          IsMovValueToStack(X86::MOV32mi, 0x33334444UL, 0),
-                          IsMovValueToStack(X86::MOV32mi, 0x11112222UL, 4),
-                          OpcodeIs(X86::POPF64)));
-}
-
-TEST_F(X86Core2TargetTest, SetRegToGR8Value) {
-  const uint8_t Value = 0xFFU;
-  const unsigned Reg = X86::AL;
-  EXPECT_THAT(setRegTo(Reg, APInt(8, Value)),
-              ElementsAre(IsMovImmediate(X86::MOV8ri, Reg, Value)));
-}
-
-TEST_F(X86Core2TargetTest, SetRegToGR16Value) {
-  const uint16_t Value = 0xFFFFU;
-  const unsigned Reg = X86::BX;
-  EXPECT_THAT(setRegTo(Reg, APInt(16, Value)),
-              ElementsAre(IsMovImmediate(X86::MOV16ri, Reg, Value)));
-}
-
-TEST_F(X86Core2TargetTest, SetRegToGR32Value) {
-  const uint32_t Value = 0x7FFFFU;
-  const unsigned Reg = X86::ECX;
-  EXPECT_THAT(setRegTo(Reg, APInt(32, Value)),
-              ElementsAre(IsMovImmediate(X86::MOV32ri, Reg, Value)));
-}
-
-TEST_F(X86Core2TargetTest, SetRegToGR64Value) {
-  const uint64_t Value = 0x7FFFFFFFFFFFFFFFULL;
-  const unsigned Reg = X86::RDX;
-  EXPECT_THAT(setRegTo(Reg, APInt(64, Value)),
-              ElementsAre(IsMovImmediate(X86::MOV64ri, Reg, Value)));
-}
-
-TEST_F(X86Core2TargetTest, SetRegToVR64Value) {
-  EXPECT_THAT(setRegTo(X86::MM0, APInt(64, 0x1111222233334444ULL)),
-              ElementsAre(IsStackAllocate(8),
-                          IsMovValueToStack(X86::MOV32mi, 0x33334444UL, 0),
-                          IsMovValueToStack(X86::MOV32mi, 0x11112222UL, 4),
-                          IsMovValueFromStack(X86::MMX_MOVQ64rm, X86::MM0),
-                          IsStackDeallocate(8)));
-}
-
-TEST_F(X86Core2TargetTest, SetRegToVR128Value_Use_MOVDQUrm) {
-  EXPECT_THAT(
-      setRegTo(X86::XMM0, APInt(128, "11112222333344445555666677778888", 16)),
-      ElementsAre(IsStackAllocate(16),
-                  IsMovValueToStack(X86::MOV32mi, 0x77778888UL, 0),
-                  IsMovValueToStack(X86::MOV32mi, 0x55556666UL, 4),
-                  IsMovValueToStack(X86::MOV32mi, 0x33334444UL, 8),
-                  IsMovValueToStack(X86::MOV32mi, 0x11112222UL, 12),
-                  IsMovValueFromStack(X86::MOVDQUrm, X86::XMM0),
-                  IsStackDeallocate(16)));
-}
-
-TEST_F(X86Core2AvxTargetTest, SetRegToVR128Value_Use_VMOVDQUrm) {
-  EXPECT_THAT(
-      setRegTo(X86::XMM0, APInt(128, "11112222333344445555666677778888", 16)),
-      ElementsAre(IsStackAllocate(16),
-                  IsMovValueToStack(X86::MOV32mi, 0x77778888UL, 0),
-                  IsMovValueToStack(X86::MOV32mi, 0x55556666UL, 4),
-                  IsMovValueToStack(X86::MOV32mi, 0x33334444UL, 8),
-                  IsMovValueToStack(X86::MOV32mi, 0x11112222UL, 12),
-                  IsMovValueFromStack(X86::VMOVDQUrm, X86::XMM0),
-                  IsStackDeallocate(16)));
-}
-
-TEST_F(X86Core2Avx512TargetTest, SetRegToVR128Value_Use_VMOVDQU32Z128rm) {
-  EXPECT_THAT(
-      setRegTo(X86::XMM0, APInt(128, "11112222333344445555666677778888", 16)),
-      ElementsAre(IsStackAllocate(16),
-                  IsMovValueToStack(X86::MOV32mi, 0x77778888UL, 0),
-                  IsMovValueToStack(X86::MOV32mi, 0x55556666UL, 4),
-                  IsMovValueToStack(X86::MOV32mi, 0x33334444UL, 8),
-                  IsMovValueToStack(X86::MOV32mi, 0x11112222UL, 12),
-                  IsMovValueFromStack(X86::VMOVDQU32Z128rm, X86::XMM0),
-                  IsStackDeallocate(16)));
-}
-
-TEST_F(X86Core2AvxTargetTest, SetRegToVR256Value_Use_VMOVDQUYrm) {
-  const char ValueStr[] =
-      "1111111122222222333333334444444455555555666666667777777788888888";
-  EXPECT_THAT(
-      setRegTo(X86::YMM0, APInt(256, ValueStr, 16)),
-      ElementsAreArray({IsStackAllocate(32),
-                        IsMovValueToStack(X86::MOV32mi, 0x88888888UL, 0),
-                        IsMovValueToStack(X86::MOV32mi, 0x77777777UL, 4),
-                        IsMovValueToStack(X86::MOV32mi, 0x66666666UL, 8),
-                        IsMovValueToStack(X86::MOV32mi, 0x55555555UL, 12),
-                        IsMovValueToStack(X86::MOV32mi, 0x44444444UL, 16),
-                        IsMovValueToStack(X86::MOV32mi, 0x33333333UL, 20),
-                        IsMovValueToStack(X86::MOV32mi, 0x22222222UL, 24),
-                        IsMovValueToStack(X86::MOV32mi, 0x11111111UL, 28),
-                        IsMovValueFromStack(X86::VMOVDQUYrm, X86::YMM0),
-                        IsStackDeallocate(32)}));
-}
-
-TEST_F(X86Core2Avx512TargetTest, SetRegToVR256Value_Use_VMOVDQU32Z256rm) {
-  const char ValueStr[] =
-      "1111111122222222333333334444444455555555666666667777777788888888";
-  EXPECT_THAT(
-      setRegTo(X86::YMM0, APInt(256, ValueStr, 16)),
-      ElementsAreArray({IsStackAllocate(32),
-                        IsMovValueToStack(X86::MOV32mi, 0x88888888UL, 0),
-                        IsMovValueToStack(X86::MOV32mi, 0x77777777UL, 4),
-                        IsMovValueToStack(X86::MOV32mi, 0x66666666UL, 8),
-                        IsMovValueToStack(X86::MOV32mi, 0x55555555UL, 12),
-                        IsMovValueToStack(X86::MOV32mi, 0x44444444UL, 16),
-                        IsMovValueToStack(X86::MOV32mi, 0x33333333UL, 20),
-                        IsMovValueToStack(X86::MOV32mi, 0x22222222UL, 24),
-                        IsMovValueToStack(X86::MOV32mi, 0x11111111UL, 28),
-                        IsMovValueFromStack(X86::VMOVDQU32Z256rm, X86::YMM0),
-                        IsStackDeallocate(32)}));
-}
-
-TEST_F(X86Core2Avx512TargetTest, SetRegToVR512Value) {
-  const char ValueStr[] =
-      "1111111122222222333333334444444455555555666666667777777788888888"
-      "99999999AAAAAAAABBBBBBBBCCCCCCCCDDDDDDDDEEEEEEEEFFFFFFFF00000000";
-  EXPECT_THAT(
-      setRegTo(X86::ZMM0, APInt(512, ValueStr, 16)),
-      ElementsAreArray({IsStackAllocate(64),
-                        IsMovValueToStack(X86::MOV32mi, 0x00000000UL, 0),
-                        IsMovValueToStack(X86::MOV32mi, 0xFFFFFFFFUL, 4),
-                        IsMovValueToStack(X86::MOV32mi, 0xEEEEEEEEUL, 8),
-                        IsMovValueToStack(X86::MOV32mi, 0xDDDDDDDDUL, 12),
-                        IsMovValueToStack(X86::MOV32mi, 0xCCCCCCCCUL, 16),
-                        IsMovValueToStack(X86::MOV32mi, 0xBBBBBBBBUL, 20),
-                        IsMovValueToStack(X86::MOV32mi, 0xAAAAAAAAUL, 24),
-                        IsMovValueToStack(X86::MOV32mi, 0x99999999UL, 28),
-                        IsMovValueToStack(X86::MOV32mi, 0x88888888UL, 32),
-                        IsMovValueToStack(X86::MOV32mi, 0x77777777UL, 36),
-                        IsMovValueToStack(X86::MOV32mi, 0x66666666UL, 40),
-                        IsMovValueToStack(X86::MOV32mi, 0x55555555UL, 44),
-                        IsMovValueToStack(X86::MOV32mi, 0x44444444UL, 48),
-                        IsMovValueToStack(X86::MOV32mi, 0x33333333UL, 52),
-                        IsMovValueToStack(X86::MOV32mi, 0x22222222UL, 56),
-                        IsMovValueToStack(X86::MOV32mi, 0x11111111UL, 60),
-                        IsMovValueFromStack(X86::VMOVDQU32Zrm, X86::ZMM0),
-                        IsStackDeallocate(64)}));
-}
-
-// Note: We always put 80 bits on the stack independently of the size of the
-// value. This uses a bit more space but makes the code simpler.
-
-TEST_F(X86Core2TargetTest, SetRegToST0_32Bits) {
-  EXPECT_THAT(setRegTo(X86::ST0, APInt(32, 0x11112222ULL)),
-              ElementsAre(IsStackAllocate(10),
-                          IsMovValueToStack(X86::MOV32mi, 0x11112222UL, 0),
-                          IsMovValueToStack(X86::MOV32mi, 0x00000000UL, 4),
-                          IsMovValueToStack(X86::MOV16mi, 0x0000UL, 8),
-                          OpcodeIs(X86::LD_F80m), IsStackDeallocate(10)));
-}
-
-TEST_F(X86Core2TargetTest, SetRegToST1_32Bits) {
-  const MCInst CopySt0ToSt1 = MCInstBuilder(X86::ST_Frr).addReg(X86::ST1);
-  EXPECT_THAT(setRegTo(X86::ST1, APInt(32, 0x11112222ULL)),
-              ElementsAre(IsStackAllocate(10),
-                          IsMovValueToStack(X86::MOV32mi, 0x11112222UL, 0),
-                          IsMovValueToStack(X86::MOV32mi, 0x00000000UL, 4),
-                          IsMovValueToStack(X86::MOV16mi, 0x0000UL, 8),
-                          OpcodeIs(X86::LD_F80m), CopySt0ToSt1,
-                          IsStackDeallocate(10)));
-}
-
-TEST_F(X86Core2TargetTest, SetRegToST0_64Bits) {
-  EXPECT_THAT(setRegTo(X86::ST0, APInt(64, 0x1111222233334444ULL)),
-              ElementsAre(IsStackAllocate(10),
-                          IsMovValueToStack(X86::MOV32mi, 0x33334444UL, 0),
-                          IsMovValueToStack(X86::MOV32mi, 0x11112222UL, 4),
-                          IsMovValueToStack(X86::MOV16mi, 0x0000UL, 8),
-                          OpcodeIs(X86::LD_F80m), IsStackDeallocate(10)));
-}
-
-TEST_F(X86Core2TargetTest, SetRegToST0_80Bits) {
-  EXPECT_THAT(setRegTo(X86::ST0, APInt(80, "11112222333344445555", 16)),
-              ElementsAre(IsStackAllocate(10),
-                          IsMovValueToStack(X86::MOV32mi, 0x44445555UL, 0),
-                          IsMovValueToStack(X86::MOV32mi, 0x22223333UL, 4),
-                          IsMovValueToStack(X86::MOV16mi, 0x1111UL, 8),
-                          OpcodeIs(X86::LD_F80m), IsStackDeallocate(10)));
-}
-
-TEST_F(X86Core2TargetTest, SetRegToFP0_80Bits) {
-  EXPECT_THAT(setRegTo(X86::FP0, APInt(80, "11112222333344445555", 16)),
-              ElementsAre(IsStackAllocate(10),
-                          IsMovValueToStack(X86::MOV32mi, 0x44445555UL, 0),
-                          IsMovValueToStack(X86::MOV32mi, 0x22223333UL, 4),
-                          IsMovValueToStack(X86::MOV16mi, 0x1111UL, 8),
-                          OpcodeIs(X86::LD_Fp80m), IsStackDeallocate(10)));
-}
-
-TEST_F(X86Core2TargetTest, SetRegToFP1_32Bits) {
-  EXPECT_THAT(setRegTo(X86::FP1, APInt(32, 0x11112222ULL)),
-              ElementsAre(IsStackAllocate(10),
-                          IsMovValueToStack(X86::MOV32mi, 0x11112222UL, 0),
-                          IsMovValueToStack(X86::MOV32mi, 0x00000000UL, 4),
-                          IsMovValueToStack(X86::MOV16mi, 0x0000UL, 8),
-                          OpcodeIs(X86::LD_Fp80m), IsStackDeallocate(10)));
-}
-
-TEST_F(X86Core2TargetTest, SetRegToFP1_4Bits) {
-  EXPECT_THAT(setRegTo(X86::FP1, APInt(4, 0x1ULL)),
-              ElementsAre(IsStackAllocate(10),
-                          IsMovValueToStack(X86::MOV32mi, 0x00000001UL, 0),
-                          IsMovValueToStack(X86::MOV32mi, 0x00000000UL, 4),
-                          IsMovValueToStack(X86::MOV16mi, 0x0000UL, 8),
-                          OpcodeIs(X86::LD_Fp80m), IsStackDeallocate(10)));
-}
-
-TEST_F(X86Core2Avx512TargetTest, FillMemoryOperands_ADD64rm) {
-  const Instruction &I = getInstr(X86::ADD64rm);
-  InstructionTemplate IT(&I);
-  constexpr const int kOffset = 42;
-  State.getExegesisTarget().fillMemoryOperands(IT, X86::RDI, kOffset);
-  // Memory is operands 2-6.
-  EXPECT_THAT(IT.getValueFor(I.Operands[2]), IsReg(X86::RDI));
-  EXPECT_THAT(IT.getValueFor(I.Operands[3]), IsImm(1));
-  EXPECT_THAT(IT.getValueFor(I.Operands[4]), IsReg(0));
-  EXPECT_THAT(IT.getValueFor(I.Operands[5]), IsImm(kOffset));
-  EXPECT_THAT(IT.getValueFor(I.Operands[6]), IsReg(0));
-}
-
-TEST_F(X86Core2Avx512TargetTest, FillMemoryOperands_VGATHERDPSZ128rm) {
-  const Instruction &I = getInstr(X86::VGATHERDPSZ128rm);
-  InstructionTemplate IT(&I);
-  constexpr const int kOffset = 42;
-  State.getExegesisTarget().fillMemoryOperands(IT, X86::RDI, kOffset);
-  // Memory is operands 4-8.
-  EXPECT_THAT(IT.getValueFor(I.Operands[4]), IsReg(X86::RDI));
-  EXPECT_THAT(IT.getValueFor(I.Operands[5]), IsImm(1));
-  EXPECT_THAT(IT.getValueFor(I.Operands[6]), IsReg(0));
-  EXPECT_THAT(IT.getValueFor(I.Operands[7]), IsImm(kOffset));
-  EXPECT_THAT(IT.getValueFor(I.Operands[8]), IsReg(0));
-}
-
-TEST_F(X86Core2TargetTest, AllowAsBackToBack) {
-  EXPECT_TRUE(
-      State.getExegesisTarget().allowAsBackToBack(getInstr(X86::ADD64rr)));
-  EXPECT_FALSE(
-      State.getExegesisTarget().allowAsBackToBack(getInstr(X86::LEA64r)));
-}
-
-} // namespace
-} // namespace exegesis
-} // namespace llvm
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/TestBase.h b/gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/TestBase.h
deleted file mode 100644
index a7e542af83d..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-exegesis/X86/TestBase.h
+++ /dev/null
@@ -1,44 +0,0 @@
-//===-- TestBase.h ----------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-// Test fixture common to all X86 tests.
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_UNITTESTS_TOOLS_LLVMEXEGESIS_X86_TESTBASE_H
-#define LLVM_UNITTESTS_TOOLS_LLVMEXEGESIS_X86_TESTBASE_H
-
-#include "LlvmState.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-namespace llvm {
-namespace exegesis {
-
-void InitializeX86ExegesisTarget();
-
-class X86TestBase : public ::testing::Test {
-protected:
-  X86TestBase() : State("x86_64-unknown-linux", "haswell") {}
-
-  static void SetUpTestCase() {
-    LLVMInitializeX86TargetInfo();
-    LLVMInitializeX86TargetMC();
-    LLVMInitializeX86Target();
-    LLVMInitializeX86AsmPrinter();
-    LLVMInitializeX86AsmParser();
-    InitializeX86ExegesisTarget();
-  }
-
-  const LLVMState State;
-};
-
-} // namespace exegesis
-} // namespace llvm
-
-#endif
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-profgen/CMakeLists.txt b/gnu/llvm/llvm/unittests/tools/llvm-profgen/CMakeLists.txt
deleted file mode 100644
index 5a658cf7084..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-profgen/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  Support
-  )
-
-add_llvm_unittest(LLVMProfgenTests
-    ContextCompressionTest.cpp
-  )
-
-target_link_libraries(LLVMProfgenTests PRIVATE LLVMTestingSupport)
-
-add_dependencies(LLVMProfgenTests intrinsics_gen)
diff --git a/gnu/llvm/llvm/unittests/tools/llvm-profgen/ContextCompressionTest.cpp b/gnu/llvm/llvm/unittests/tools/llvm-profgen/ContextCompressionTest.cpp
deleted file mode 100644
index 7f0cee8878a..00000000000
--- a/gnu/llvm/llvm/unittests/tools/llvm-profgen/ContextCompressionTest.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-//===-- ContextCompressionTest.cpp -------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-#include "../tools/llvm-profgen/ProfileGenerator.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace sampleprof;
-
-TEST(TestCompression, TestNoSizeLimit1) {
-  SmallVector<std::string, 16> Context = {"a", "b", "c", "a", "b", "c"};
-  SmallVector<std::string, 16> Expect = {"a", "b", "c"};
-  CSProfileGenerator::compressRecursionContext(Context, -1);
-  EXPECT_TRUE(std::equal(Context.begin(), Context.end(), Expect.begin()));
-}
-
-TEST(TestCompression, TestNoSizeLimit2) {
-  SmallVector<std::string, 16> Context = {"m", "a", "a", "b", "c", "a",
-                                          "b", "c", "b", "c", "d"};
-  SmallVector<std::string, 16> Expect = {"m", "a", "b", "c", "d"};
-  CSProfileGenerator::compressRecursionContext(Context, -1);
-  EXPECT_TRUE(std::equal(Context.begin(), Context.end(), Expect.begin()));
-}
-
-TEST(TestCompression, TestMaxDedupSize) {
-  SmallVector<std::string, 16> Context = {"m", "a", "a", "b", "c", "a",
-                                          "b", "c", "b", "c", "d"};
-  SmallVector<std::string, 16> Expect = {"m", "a", "b", "c",
-                                         "a", "b", "c", "d"};
-  CSProfileGenerator::compressRecursionContext(Context, 2);
-  EXPECT_TRUE(std::equal(Context.begin(), Context.end(), Expect.begin()));
-}
diff --git a/gnu/llvm/llvm/unittests/unittest.cfg.in b/gnu/llvm/llvm/unittests/unittest.cfg.in
deleted file mode 100644
index e2db16ffe2b..00000000000
--- a/gnu/llvm/llvm/unittests/unittest.cfg.in
+++ /dev/null
@@ -1 +0,0 @@
-@LLVM_UNITTEST_SOURCE_DIR@
diff --git a/gnu/llvm/llvm/utils/TableGen/CodeBeadsGen.cpp b/gnu/llvm/llvm/utils/TableGen/CodeBeadsGen.cpp
deleted file mode 100644
index 18a6d6d19eb..00000000000
--- a/gnu/llvm/llvm/utils/TableGen/CodeBeadsGen.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-//===---------- CodeBeadsGen.cpp - Code Beads Generator -------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-// CodeBeads are data fields carrying auxiliary information for instructions.
-//
-// Under the hood it's simply implemented by a `bits` field (with arbitrary
-// length) in each TG instruction description, where this TG backend will
-// generate a helper function to access it.
-//
-// This is especially useful for expressing variable length encoding
-// instructions and complex addressing modes. Since in those cases each
-// instruction is usually associated with large amount of information like
-// addressing mode details used on a specific operand. Instead of retreating to
-// ad-hoc methods to figure out these information when encoding an instruction,
-// CodeBeads provide a clean table for the instruction encoder to lookup.
-//===----------------------------------------------------------------------===//
-
-#include "CodeGenTarget.h"
-#include "llvm/ADT/StringExtras.h"
-#include "llvm/Support/Debug.h"
-#include "llvm/TableGen/Error.h"
-#include "llvm/TableGen/Record.h"
-#include "llvm/TableGen/TableGenBackend.h"
-#include <map>
-#include <string>
-#include <vector>
-using namespace llvm;
-
-namespace {
-
-class CodeBeadsGen {
-  RecordKeeper &Records;
-
-public:
-  CodeBeadsGen(RecordKeeper &R) : Records(R) {}
-  void run(raw_ostream &OS);
-};
-
-void CodeBeadsGen::run(raw_ostream &OS) {
-  CodeGenTarget Target(Records);
-  std::vector<Record *> Insts = Records.getAllDerivedDefinitions("Instruction");
-
-  // For little-endian instruction bit encodings, reverse the bit order
-  Target.reverseBitsForLittleEndianEncoding();
-
-  ArrayRef<const CodeGenInstruction *> NumberedInstructions =
-      Target.getInstructionsByEnumValue();
-
-  // Emit function declaration
-  OS << "const uint8_t *llvm::" << Target.getInstNamespace();
-  OS << "::getMCInstrBeads(unsigned Opcode) {\n";
-
-  // First, get the maximum bit length among all beads. And do some
-  // simple validation
-  unsigned MaxBitLength = 0;
-
-  for (const CodeGenInstruction *CGI : NumberedInstructions) {
-    Record *R = CGI->TheDef;
-    if (!R->getValue("Beads"))
-      continue;
-
-    BitsInit *BI = R->getValueAsBitsInit("Beads");
-    if (!BI->isComplete()) {
-      PrintFatalError(R->getLoc(), "Record `" + R->getName() +
-                                       "', bit field 'Beads' is not complete");
-    }
-
-    MaxBitLength = std::max(MaxBitLength, BI->getNumBits());
-  }
-
-  // Number of bytes
-  unsigned Parts = MaxBitLength / 8;
-
-  // Emit instruction base values
-  OS << "  static const uint8_t InstBits[][" << Parts << "] = {\n";
-  for (const CodeGenInstruction *CGI : NumberedInstructions) {
-    Record *R = CGI->TheDef;
-
-    if (R->getValueAsString("Namespace") == "TargetOpcode" ||
-        !R->getValue("Beads")) {
-      OS << "\t{ 0x0 },\t// ";
-      if (R->getValueAsBit("isPseudo"))
-        OS << "(Pseudo) ";
-      OS << R->getName() << "\n";
-      continue;
-    }
-
-    BitsInit *BI = R->getValueAsBitsInit("Beads");
-
-    // Convert to byte array:
-    // [dcba] -> [a][b][c][d]
-    OS << "\t{";
-    for (unsigned p = 0; p < Parts; ++p) {
-      unsigned Right = 8 * p;
-      unsigned Left = Right + 8;
-
-      uint8_t Value = 0;
-      for (unsigned i = Right; i != Left; ++i) {
-        unsigned Shift = i % 8;
-        if (auto *B = dyn_cast<BitInit>(BI->getBit(i))) {
-          Value |= (static_cast<uint8_t>(B->getValue()) << Shift);
-        } else {
-          PrintFatalError(R->getLoc(), "Record `" + R->getName() +
-                                           "', bit 'Beads[" + Twine(i) +
-                                           "]' is not defined");
-        }
-      }
-
-      if (p)
-        OS << ',';
-      OS << " 0x";
-      OS.write_hex(Value);
-      OS << "";
-    }
-    OS << " }," << '\t' << "// " << R->getName() << "\n";
-  }
-  OS << "\t{ 0x0 }\n  };\n";
-
-  // Emit initial function code
-  OS << "  return InstBits[Opcode];\n"
-     << "}\n\n";
-}
-
-} // End anonymous namespace
-
-namespace llvm {
-
-void EmitCodeBeads(RecordKeeper &RK, raw_ostream &OS) {
-  emitSourceFileHeader("Machine Code Beads", OS);
-  CodeBeadsGen(RK).run(OS);
-}
-
-} // namespace llvm
diff --git a/gnu/llvm/llvm/utils/TableGen/FixedLenDecoderEmitter.cpp b/gnu/llvm/llvm/utils/TableGen/FixedLenDecoderEmitter.cpp
deleted file mode 100644
index c5dd1e62669..00000000000
--- a/gnu/llvm/llvm/utils/TableGen/FixedLenDecoderEmitter.cpp
+++ /dev/null
@@ -1,2560 +0,0 @@
-//===------------ FixedLenDecoderEmitter.cpp - Decoder Generator ----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// It contains the tablegen backend that emits the decoder functions for
-// targets with fixed length instruction set.
-//
-//===----------------------------------------------------------------------===//
-
-#include "CodeGenInstruction.h"
-#include "CodeGenTarget.h"
-#include "InfoByHwMode.h"
-#include "llvm/ADT/APInt.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/CachedHashString.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/SetVector.h"
-#include "llvm/ADT/SmallString.h"
-#include "llvm/ADT/Statistic.h"
-#include "llvm/ADT/StringExtras.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/MC/MCFixedLenDisassembler.h"
-#include "llvm/Support/Casting.h"
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/ErrorHandling.h"
-#include "llvm/Support/FormattedStream.h"
-#include "llvm/Support/LEB128.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/TableGen/Error.h"
-#include "llvm/TableGen/Record.h"
-#include <algorithm>
-#include <cassert>
-#include <cstddef>
-#include <cstdint>
-#include <map>
-#include <memory>
-#include <set>
-#include <string>
-#include <utility>
-#include <vector>
-
-using namespace llvm;
-
-#define DEBUG_TYPE "decoder-emitter"
-
-namespace {
-
-STATISTIC(NumEncodings, "Number of encodings considered");
-STATISTIC(NumEncodingsLackingDisasm, "Number of encodings without disassembler info");
-STATISTIC(NumInstructions, "Number of instructions considered");
-STATISTIC(NumEncodingsSupported, "Number of encodings supported");
-STATISTIC(NumEncodingsOmitted, "Number of encodings omitted");
-
-struct EncodingField {
-  unsigned Base, Width, Offset;
-  EncodingField(unsigned B, unsigned W, unsigned O)
-    : Base(B), Width(W), Offset(O) { }
-};
-
-struct OperandInfo {
-  std::vector<EncodingField> Fields;
-  std::string Decoder;
-  bool HasCompleteDecoder;
-  uint64_t InitValue;
-
-  OperandInfo(std::string D, bool HCD)
-      : Decoder(std::move(D)), HasCompleteDecoder(HCD), InitValue(0) {}
-
-  void addField(unsigned Base, unsigned Width, unsigned Offset) {
-    Fields.push_back(EncodingField(Base, Width, Offset));
-  }
-
-  unsigned numFields() const { return Fields.size(); }
-
-  typedef std::vector<EncodingField>::const_iterator const_iterator;
-
-  const_iterator begin() const { return Fields.begin(); }
-  const_iterator end() const   { return Fields.end();   }
-};
-
-typedef std::vector<uint8_t> DecoderTable;
-typedef uint32_t DecoderFixup;
-typedef std::vector<DecoderFixup> FixupList;
-typedef std::vector<FixupList> FixupScopeList;
-typedef SmallSetVector<CachedHashString, 16> PredicateSet;
-typedef SmallSetVector<CachedHashString, 16> DecoderSet;
-struct DecoderTableInfo {
-  DecoderTable Table;
-  FixupScopeList FixupStack;
-  PredicateSet Predicates;
-  DecoderSet Decoders;
-};
-
-struct EncodingAndInst {
-  const Record *EncodingDef;
-  const CodeGenInstruction *Inst;
-  StringRef HwModeName;
-
-  EncodingAndInst(const Record *EncodingDef, const CodeGenInstruction *Inst,
-                  StringRef HwModeName = "")
-      : EncodingDef(EncodingDef), Inst(Inst), HwModeName(HwModeName) {}
-};
-
-struct EncodingIDAndOpcode {
-  unsigned EncodingID;
-  unsigned Opcode;
-
-  EncodingIDAndOpcode() : EncodingID(0), Opcode(0) {}
-  EncodingIDAndOpcode(unsigned EncodingID, unsigned Opcode)
-      : EncodingID(EncodingID), Opcode(Opcode) {}
-};
-
-raw_ostream &operator<<(raw_ostream &OS, const EncodingAndInst &Value) {
-  if (Value.EncodingDef != Value.Inst->TheDef)
-    OS << Value.EncodingDef->getName() << ":";
-  OS << Value.Inst->TheDef->getName();
-  return OS;
-}
-
-class FixedLenDecoderEmitter {
-  RecordKeeper &RK;
-  std::vector<EncodingAndInst> NumberedEncodings;
-
-public:
-  // Defaults preserved here for documentation, even though they aren't
-  // strictly necessary given the way that this is currently being called.
-  FixedLenDecoderEmitter(RecordKeeper &R, std::string PredicateNamespace,
-                         std::string GPrefix = "if (",
-                         std::string GPostfix = " == MCDisassembler::Fail)",
-                         std::string ROK = "MCDisassembler::Success",
-                         std::string RFail = "MCDisassembler::Fail",
-                         std::string L = "")
-      : RK(R), Target(R), PredicateNamespace(std::move(PredicateNamespace)),
-        GuardPrefix(std::move(GPrefix)), GuardPostfix(std::move(GPostfix)),
-        ReturnOK(std::move(ROK)), ReturnFail(std::move(RFail)),
-        Locals(std::move(L)) {}
-
-  // Emit the decoder state machine table.
-  void emitTable(formatted_raw_ostream &o, DecoderTable &Table,
-                 unsigned Indentation, unsigned BitWidth,
-                 StringRef Namespace) const;
-  void emitPredicateFunction(formatted_raw_ostream &OS,
-                             PredicateSet &Predicates,
-                             unsigned Indentation) const;
-  void emitDecoderFunction(formatted_raw_ostream &OS,
-                           DecoderSet &Decoders,
-                           unsigned Indentation) const;
-
-  // run - Output the code emitter
-  void run(raw_ostream &o);
-
-private:
-  CodeGenTarget Target;
-
-public:
-  std::string PredicateNamespace;
-  std::string GuardPrefix, GuardPostfix;
-  std::string ReturnOK, ReturnFail;
-  std::string Locals;
-};
-
-} // end anonymous namespace
-
-// The set (BIT_TRUE, BIT_FALSE, BIT_UNSET) represents a ternary logic system
-// for a bit value.
-//
-// BIT_UNFILTERED is used as the init value for a filter position.  It is used
-// only for filter processings.
-typedef enum {
-  BIT_TRUE,      // '1'
-  BIT_FALSE,     // '0'
-  BIT_UNSET,     // '?'
-  BIT_UNFILTERED // unfiltered
-} bit_value_t;
-
-static bool ValueSet(bit_value_t V) {
-  return (V == BIT_TRUE || V == BIT_FALSE);
-}
-
-static bool ValueNotSet(bit_value_t V) {
-  return (V == BIT_UNSET);
-}
-
-static int Value(bit_value_t V) {
-  return ValueNotSet(V) ? -1 : (V == BIT_FALSE ? 0 : 1);
-}
-
-static bit_value_t bitFromBits(const BitsInit &bits, unsigned index) {
-  if (BitInit *bit = dyn_cast<BitInit>(bits.getBit(index)))
-    return bit->getValue() ? BIT_TRUE : BIT_FALSE;
-
-  // The bit is uninitialized.
-  return BIT_UNSET;
-}
-
-// Prints the bit value for each position.
-static void dumpBits(raw_ostream &o, const BitsInit &bits) {
-  for (unsigned index = bits.getNumBits(); index > 0; --index) {
-    switch (bitFromBits(bits, index - 1)) {
-    case BIT_TRUE:
-      o << "1";
-      break;
-    case BIT_FALSE:
-      o << "0";
-      break;
-    case BIT_UNSET:
-      o << "_";
-      break;
-    default:
-      llvm_unreachable("unexpected return value from bitFromBits");
-    }
-  }
-}
-
-static BitsInit &getBitsField(const Record &def, StringRef str) {
-  BitsInit *bits = def.getValueAsBitsInit(str);
-  return *bits;
-}
-
-// Representation of the instruction to work on.
-typedef std::vector<bit_value_t> insn_t;
-
-namespace {
-
-static const uint64_t NO_FIXED_SEGMENTS_SENTINEL = -1ULL;
-
-class FilterChooser;
-
-/// Filter - Filter works with FilterChooser to produce the decoding tree for
-/// the ISA.
-///
-/// It is useful to think of a Filter as governing the switch stmts of the
-/// decoding tree in a certain level.  Each case stmt delegates to an inferior
-/// FilterChooser to decide what further decoding logic to employ, or in another
-/// words, what other remaining bits to look at.  The FilterChooser eventually
-/// chooses a best Filter to do its job.
-///
-/// This recursive scheme ends when the number of Opcodes assigned to the
-/// FilterChooser becomes 1 or if there is a conflict.  A conflict happens when
-/// the Filter/FilterChooser combo does not know how to distinguish among the
-/// Opcodes assigned.
-///
-/// An example of a conflict is
-///
-/// Conflict:
-///                     111101000.00........00010000....
-///                     111101000.00........0001........
-///                     1111010...00........0001........
-///                     1111010...00....................
-///                     1111010.........................
-///                     1111............................
-///                     ................................
-///     VST4q8a         111101000_00________00010000____
-///     VST4q8b         111101000_00________00010000____
-///
-/// The Debug output shows the path that the decoding tree follows to reach the
-/// the conclusion that there is a conflict.  VST4q8a is a vst4 to double-spaced
-/// even registers, while VST4q8b is a vst4 to double-spaced odd registers.
-///
-/// The encoding info in the .td files does not specify this meta information,
-/// which could have been used by the decoder to resolve the conflict.  The
-/// decoder could try to decode the even/odd register numbering and assign to
-/// VST4q8a or VST4q8b, but for the time being, the decoder chooses the "a"
-/// version and return the Opcode since the two have the same Asm format string.
-class Filter {
-protected:
-  const FilterChooser *Owner;// points to the FilterChooser who owns this filter
-  unsigned StartBit; // the starting bit position
-  unsigned NumBits; // number of bits to filter
-  bool Mixed; // a mixed region contains both set and unset bits
-
-  // Map of well-known segment value to the set of uid's with that value.
-  std::map<uint64_t, std::vector<EncodingIDAndOpcode>>
-      FilteredInstructions;
-
-  // Set of uid's with non-constant segment values.
-  std::vector<EncodingIDAndOpcode> VariableInstructions;
-
-  // Map of well-known segment value to its delegate.
-  std::map<uint64_t, std::unique_ptr<const FilterChooser>> FilterChooserMap;
-
-  // Number of instructions which fall under FilteredInstructions category.
-  unsigned NumFiltered;
-
-  // Keeps track of the last opcode in the filtered bucket.
-  EncodingIDAndOpcode LastOpcFiltered;
-
-public:
-  Filter(Filter &&f);
-  Filter(FilterChooser &owner, unsigned startBit, unsigned numBits, bool mixed);
-
-  ~Filter() = default;
-
-  unsigned getNumFiltered() const { return NumFiltered; }
-
-  EncodingIDAndOpcode getSingletonOpc() const {
-    assert(NumFiltered == 1);
-    return LastOpcFiltered;
-  }
-
-  // Return the filter chooser for the group of instructions without constant
-  // segment values.
-  const FilterChooser &getVariableFC() const {
-    assert(NumFiltered == 1);
-    assert(FilterChooserMap.size() == 1);
-    return *(FilterChooserMap.find(NO_FIXED_SEGMENTS_SENTINEL)->second);
-  }
-
-  // Divides the decoding task into sub tasks and delegates them to the
-  // inferior FilterChooser's.
-  //
-  // A special case arises when there's only one entry in the filtered
-  // instructions.  In order to unambiguously decode the singleton, we need to
-  // match the remaining undecoded encoding bits against the singleton.
-  void recurse();
-
-  // Emit table entries to decode instructions given a segment or segments of
-  // bits.
-  void emitTableEntry(DecoderTableInfo &TableInfo) const;
-
-  // Returns the number of fanout produced by the filter.  More fanout implies
-  // the filter distinguishes more categories of instructions.
-  unsigned usefulness() const;
-}; // end class Filter
-
-} // end anonymous namespace
-
-// These are states of our finite state machines used in FilterChooser's
-// filterProcessor() which produces the filter candidates to use.
-typedef enum {
-  ATTR_NONE,
-  ATTR_FILTERED,
-  ATTR_ALL_SET,
-  ATTR_ALL_UNSET,
-  ATTR_MIXED
-} bitAttr_t;
-
-/// FilterChooser - FilterChooser chooses the best filter among a set of Filters
-/// in order to perform the decoding of instructions at the current level.
-///
-/// Decoding proceeds from the top down.  Based on the well-known encoding bits
-/// of instructions available, FilterChooser builds up the possible Filters that
-/// can further the task of decoding by distinguishing among the remaining
-/// candidate instructions.
-///
-/// Once a filter has been chosen, it is called upon to divide the decoding task
-/// into sub-tasks and delegates them to its inferior FilterChoosers for further
-/// processings.
-///
-/// It is useful to think of a Filter as governing the switch stmts of the
-/// decoding tree.  And each case is delegated to an inferior FilterChooser to
-/// decide what further remaining bits to look at.
-namespace {
-
-class FilterChooser {
-protected:
-  friend class Filter;
-
-  // Vector of codegen instructions to choose our filter.
-  ArrayRef<EncodingAndInst> AllInstructions;
-
-  // Vector of uid's for this filter chooser to work on.
-  // The first member of the pair is the opcode id being decoded, the second is
-  // the opcode id that should be emitted.
-  const std::vector<EncodingIDAndOpcode> &Opcodes;
-
-  // Lookup table for the operand decoding of instructions.
-  const std::map<unsigned, std::vector<OperandInfo>> &Operands;
-
-  // Vector of candidate filters.
-  std::vector<Filter> Filters;
-
-  // Array of bit values passed down from our parent.
-  // Set to all BIT_UNFILTERED's for Parent == NULL.
-  std::vector<bit_value_t> FilterBitValues;
-
-  // Links to the FilterChooser above us in the decoding tree.
-  const FilterChooser *Parent;
-
-  // Index of the best filter from Filters.
-  int BestIndex;
-
-  // Width of instructions
-  unsigned BitWidth;
-
-  // Parent emitter
-  const FixedLenDecoderEmitter *Emitter;
-
-public:
-  FilterChooser(ArrayRef<EncodingAndInst> Insts,
-                const std::vector<EncodingIDAndOpcode> &IDs,
-                const std::map<unsigned, std::vector<OperandInfo>> &Ops,
-                unsigned BW, const FixedLenDecoderEmitter *E)
-      : AllInstructions(Insts), Opcodes(IDs), Operands(Ops),
-        FilterBitValues(BW, BIT_UNFILTERED), Parent(nullptr), BestIndex(-1),
-        BitWidth(BW), Emitter(E) {
-    doFilter();
-  }
-
-  FilterChooser(ArrayRef<EncodingAndInst> Insts,
-                const std::vector<EncodingIDAndOpcode> &IDs,
-                const std::map<unsigned, std::vector<OperandInfo>> &Ops,
-                const std::vector<bit_value_t> &ParentFilterBitValues,
-                const FilterChooser &parent)
-      : AllInstructions(Insts), Opcodes(IDs), Operands(Ops),
-        FilterBitValues(ParentFilterBitValues), Parent(&parent), BestIndex(-1),
-        BitWidth(parent.BitWidth), Emitter(parent.Emitter) {
-    doFilter();
-  }
-
-  FilterChooser(const FilterChooser &) = delete;
-  void operator=(const FilterChooser &) = delete;
-
-  unsigned getBitWidth() const { return BitWidth; }
-
-protected:
-  // Populates the insn given the uid.
-  void insnWithID(insn_t &Insn, unsigned Opcode) const {
-    BitsInit &Bits = getBitsField(*AllInstructions[Opcode].EncodingDef, "Inst");
-
-    // We may have a SoftFail bitmask, which specifies a mask where an encoding
-    // may differ from the value in "Inst" and yet still be valid, but the
-    // disassembler should return SoftFail instead of Success.
-    //
-    // This is used for marking UNPREDICTABLE instructions in the ARM world.
-    BitsInit *SFBits =
-        AllInstructions[Opcode].EncodingDef->getValueAsBitsInit("SoftFail");
-
-    for (unsigned i = 0; i < BitWidth; ++i) {
-      if (SFBits && bitFromBits(*SFBits, i) == BIT_TRUE)
-        Insn.push_back(BIT_UNSET);
-      else
-        Insn.push_back(bitFromBits(Bits, i));
-    }
-  }
-
-  // Emit the name of the encoding/instruction pair.
-  void emitNameWithID(raw_ostream &OS, unsigned Opcode) const {
-    const Record *EncodingDef = AllInstructions[Opcode].EncodingDef;
-    const Record *InstDef = AllInstructions[Opcode].Inst->TheDef;
-    if (EncodingDef != InstDef)
-      OS << EncodingDef->getName() << ":";
-    OS << InstDef->getName();
-  }
-
-  // Populates the field of the insn given the start position and the number of
-  // consecutive bits to scan for.
-  //
-  // Returns false if there exists any uninitialized bit value in the range.
-  // Returns true, otherwise.
-  bool fieldFromInsn(uint64_t &Field, insn_t &Insn, unsigned StartBit,
-                     unsigned NumBits) const;
-
-  /// dumpFilterArray - dumpFilterArray prints out debugging info for the given
-  /// filter array as a series of chars.
-  void dumpFilterArray(raw_ostream &o,
-                       const std::vector<bit_value_t> & filter) const;
-
-  /// dumpStack - dumpStack traverses the filter chooser chain and calls
-  /// dumpFilterArray on each filter chooser up to the top level one.
-  void dumpStack(raw_ostream &o, const char *prefix) const;
-
-  Filter &bestFilter() {
-    assert(BestIndex != -1 && "BestIndex not set");
-    return Filters[BestIndex];
-  }
-
-  bool PositionFiltered(unsigned i) const {
-    return ValueSet(FilterBitValues[i]);
-  }
-
-  // Calculates the island(s) needed to decode the instruction.
-  // This returns a lit of undecoded bits of an instructions, for example,
-  // Inst{20} = 1 && Inst{3-0} == 0b1111 represents two islands of yet-to-be
-  // decoded bits in order to verify that the instruction matches the Opcode.
-  unsigned getIslands(std::vector<unsigned> &StartBits,
-                      std::vector<unsigned> &EndBits,
-                      std::vector<uint64_t> &FieldVals,
-                      const insn_t &Insn) const;
-
-  // Emits code to check the Predicates member of an instruction are true.
-  // Returns true if predicate matches were emitted, false otherwise.
-  bool emitPredicateMatch(raw_ostream &o, unsigned &Indentation,
-                          unsigned Opc) const;
-
-  bool doesOpcodeNeedPredicate(unsigned Opc) const;
-  unsigned getPredicateIndex(DecoderTableInfo &TableInfo, StringRef P) const;
-  void emitPredicateTableEntry(DecoderTableInfo &TableInfo,
-                               unsigned Opc) const;
-
-  void emitSoftFailTableEntry(DecoderTableInfo &TableInfo,
-                              unsigned Opc) const;
-
-  // Emits table entries to decode the singleton.
-  void emitSingletonTableEntry(DecoderTableInfo &TableInfo,
-                               EncodingIDAndOpcode Opc) const;
-
-  // Emits code to decode the singleton, and then to decode the rest.
-  void emitSingletonTableEntry(DecoderTableInfo &TableInfo,
-                               const Filter &Best) const;
-
-  void emitBinaryParser(raw_ostream &o, unsigned &Indentation,
-                        const OperandInfo &OpInfo,
-                        bool &OpHasCompleteDecoder) const;
-
-  void emitDecoder(raw_ostream &OS, unsigned Indentation, unsigned Opc,
-                   bool &HasCompleteDecoder) const;
-  unsigned getDecoderIndex(DecoderSet &Decoders, unsigned Opc,
-                           bool &HasCompleteDecoder) const;
-
-  // Assign a single filter and run with it.
-  void runSingleFilter(unsigned startBit, unsigned numBit, bool mixed);
-
-  // reportRegion is a helper function for filterProcessor to mark a region as
-  // eligible for use as a filter region.
-  void reportRegion(bitAttr_t RA, unsigned StartBit, unsigned BitIndex,
-                    bool AllowMixed);
-
-  // FilterProcessor scans the well-known encoding bits of the instructions and
-  // builds up a list of candidate filters.  It chooses the best filter and
-  // recursively descends down the decoding tree.
-  bool filterProcessor(bool AllowMixed, bool Greedy = true);
-
-  // Decides on the best configuration of filter(s) to use in order to decode
-  // the instructions.  A conflict of instructions may occur, in which case we
-  // dump the conflict set to the standard error.
-  void doFilter();
-
-public:
-  // emitTableEntries - Emit state machine entries to decode our share of
-  // instructions.
-  void emitTableEntries(DecoderTableInfo &TableInfo) const;
-};
-
-} // end anonymous namespace
-
-///////////////////////////
-//                       //
-// Filter Implementation //
-//                       //
-///////////////////////////
-
-Filter::Filter(Filter &&f)
-  : Owner(f.Owner), StartBit(f.StartBit), NumBits(f.NumBits), Mixed(f.Mixed),
-    FilteredInstructions(std::move(f.FilteredInstructions)),
-    VariableInstructions(std::move(f.VariableInstructions)),
-    FilterChooserMap(std::move(f.FilterChooserMap)), NumFiltered(f.NumFiltered),
-    LastOpcFiltered(f.LastOpcFiltered) {
-}
-
-Filter::Filter(FilterChooser &owner, unsigned startBit, unsigned numBits,
-               bool mixed)
-  : Owner(&owner), StartBit(startBit), NumBits(numBits), Mixed(mixed) {
-  assert(StartBit + NumBits - 1 < Owner->BitWidth);
-
-  NumFiltered = 0;
-  LastOpcFiltered = {0, 0};
-
-  for (unsigned i = 0, e = Owner->Opcodes.size(); i != e; ++i) {
-    insn_t Insn;
-
-    // Populates the insn given the uid.
-    Owner->insnWithID(Insn, Owner->Opcodes[i].EncodingID);
-
-    uint64_t Field;
-    // Scans the segment for possibly well-specified encoding bits.
-    bool ok = Owner->fieldFromInsn(Field, Insn, StartBit, NumBits);
-
-    if (ok) {
-      // The encoding bits are well-known.  Lets add the uid of the
-      // instruction into the bucket keyed off the constant field value.
-      LastOpcFiltered = Owner->Opcodes[i];
-      FilteredInstructions[Field].push_back(LastOpcFiltered);
-      ++NumFiltered;
-    } else {
-      // Some of the encoding bit(s) are unspecified.  This contributes to
-      // one additional member of "Variable" instructions.
-      VariableInstructions.push_back(Owner->Opcodes[i]);
-    }
-  }
-
-  assert((FilteredInstructions.size() + VariableInstructions.size() > 0)
-         && "Filter returns no instruction categories");
-}
-
-// Divides the decoding task into sub tasks and delegates them to the
-// inferior FilterChooser's.
-//
-// A special case arises when there's only one entry in the filtered
-// instructions.  In order to unambiguously decode the singleton, we need to
-// match the remaining undecoded encoding bits against the singleton.
-void Filter::recurse() {
-  // Starts by inheriting our parent filter chooser's filter bit values.
-  std::vector<bit_value_t> BitValueArray(Owner->FilterBitValues);
-
-  if (!VariableInstructions.empty()) {
-    // Conservatively marks each segment position as BIT_UNSET.
-    for (unsigned bitIndex = 0; bitIndex < NumBits; ++bitIndex)
-      BitValueArray[StartBit + bitIndex] = BIT_UNSET;
-
-    // Delegates to an inferior filter chooser for further processing on this
-    // group of instructions whose segment values are variable.
-    FilterChooserMap.insert(std::make_pair(NO_FIXED_SEGMENTS_SENTINEL,
-        std::make_unique<FilterChooser>(Owner->AllInstructions,
-            VariableInstructions, Owner->Operands, BitValueArray, *Owner)));
-  }
-
-  // No need to recurse for a singleton filtered instruction.
-  // See also Filter::emit*().
-  if (getNumFiltered() == 1) {
-    assert(FilterChooserMap.size() == 1);
-    return;
-  }
-
-  // Otherwise, create sub choosers.
-  for (const auto &Inst : FilteredInstructions) {
-
-    // Marks all the segment positions with either BIT_TRUE or BIT_FALSE.
-    for (unsigned bitIndex = 0; bitIndex < NumBits; ++bitIndex) {
-      if (Inst.first & (1ULL << bitIndex))
-        BitValueArray[StartBit + bitIndex] = BIT_TRUE;
-      else
-        BitValueArray[StartBit + bitIndex] = BIT_FALSE;
-    }
-
-    // Delegates to an inferior filter chooser for further processing on this
-    // category of instructions.
-    FilterChooserMap.insert(std::make_pair(
-        Inst.first, std::make_unique<FilterChooser>(
-                                Owner->AllInstructions, Inst.second,
-                                Owner->Operands, BitValueArray, *Owner)));
-  }
-}
-
-static void resolveTableFixups(DecoderTable &Table, const FixupList &Fixups,
-                               uint32_t DestIdx) {
-  // Any NumToSkip fixups in the current scope can resolve to the
-  // current location.
-  for (FixupList::const_reverse_iterator I = Fixups.rbegin(),
-                                         E = Fixups.rend();
-       I != E; ++I) {
-    // Calculate the distance from the byte following the fixup entry byte
-    // to the destination. The Target is calculated from after the 16-bit
-    // NumToSkip entry itself, so subtract two  from the displacement here
-    // to account for that.
-    uint32_t FixupIdx = *I;
-    uint32_t Delta = DestIdx - FixupIdx - 3;
-    // Our NumToSkip entries are 24-bits. Make sure our table isn't too
-    // big.
-    assert(Delta < (1u << 24));
-    Table[FixupIdx] = (uint8_t)Delta;
-    Table[FixupIdx + 1] = (uint8_t)(Delta >> 8);
-    Table[FixupIdx + 2] = (uint8_t)(Delta >> 16);
-  }
-}
-
-// Emit table entries to decode instructions given a segment or segments
-// of bits.
-void Filter::emitTableEntry(DecoderTableInfo &TableInfo) const {
-  TableInfo.Table.push_back(MCD::OPC_ExtractField);
-  TableInfo.Table.push_back(StartBit);
-  TableInfo.Table.push_back(NumBits);
-
-  // A new filter entry begins a new scope for fixup resolution.
-  TableInfo.FixupStack.emplace_back();
-
-  DecoderTable &Table = TableInfo.Table;
-
-  size_t PrevFilter = 0;
-  bool HasFallthrough = false;
-  for (auto &Filter : FilterChooserMap) {
-    // Field value -1 implies a non-empty set of variable instructions.
-    // See also recurse().
-    if (Filter.first == NO_FIXED_SEGMENTS_SENTINEL) {
-      HasFallthrough = true;
-
-      // Each scope should always have at least one filter value to check
-      // for.
-      assert(PrevFilter != 0 && "empty filter set!");
-      FixupList &CurScope = TableInfo.FixupStack.back();
-      // Resolve any NumToSkip fixups in the current scope.
-      resolveTableFixups(Table, CurScope, Table.size());
-      CurScope.clear();
-      PrevFilter = 0;  // Don't re-process the filter's fallthrough.
-    } else {
-      Table.push_back(MCD::OPC_FilterValue);
-      // Encode and emit the value to filter against.
-      uint8_t Buffer[16];
-      unsigned Len = encodeULEB128(Filter.first, Buffer);
-      Table.insert(Table.end(), Buffer, Buffer + Len);
-      // Reserve space for the NumToSkip entry. We'll backpatch the value
-      // later.
-      PrevFilter = Table.size();
-      Table.push_back(0);
-      Table.push_back(0);
-      Table.push_back(0);
-    }
-
-    // We arrive at a category of instructions with the same segment value.
-    // Now delegate to the sub filter chooser for further decodings.
-    // The case may fallthrough, which happens if the remaining well-known
-    // encoding bits do not match exactly.
-    Filter.second->emitTableEntries(TableInfo);
-
-    // Now that we've emitted the body of the handler, update the NumToSkip
-    // of the filter itself to be able to skip forward when false. Subtract
-    // two as to account for the width of the NumToSkip field itself.
-    if (PrevFilter) {
-      uint32_t NumToSkip = Table.size() - PrevFilter - 3;
-      assert(NumToSkip < (1u << 24) && "disassembler decoding table too large!");
-      Table[PrevFilter] = (uint8_t)NumToSkip;
-      Table[PrevFilter + 1] = (uint8_t)(NumToSkip >> 8);
-      Table[PrevFilter + 2] = (uint8_t)(NumToSkip >> 16);
-    }
-  }
-
-  // Any remaining unresolved fixups bubble up to the parent fixup scope.
-  assert(TableInfo.FixupStack.size() > 1 && "fixup stack underflow!");
-  FixupScopeList::iterator Source = TableInfo.FixupStack.end() - 1;
-  FixupScopeList::iterator Dest = Source - 1;
-  llvm::append_range(*Dest, *Source);
-  TableInfo.FixupStack.pop_back();
-
-  // If there is no fallthrough, then the final filter should get fixed
-  // up according to the enclosing scope rather than the current position.
-  if (!HasFallthrough)
-    TableInfo.FixupStack.back().push_back(PrevFilter);
-}
-
-// Returns the number of fanout produced by the filter.  More fanout implies
-// the filter distinguishes more categories of instructions.
-unsigned Filter::usefulness() const {
-  if (!VariableInstructions.empty())
-    return FilteredInstructions.size();
-  else
-    return FilteredInstructions.size() + 1;
-}
-
-//////////////////////////////////
-//                              //
-// Filterchooser Implementation //
-//                              //
-//////////////////////////////////
-
-// Emit the decoder state machine table.
-void FixedLenDecoderEmitter::emitTable(formatted_raw_ostream &OS,
-                                       DecoderTable &Table,
-                                       unsigned Indentation,
-                                       unsigned BitWidth,
-                                       StringRef Namespace) const {
-  OS.indent(Indentation) << "static const uint8_t DecoderTable" << Namespace
-    << BitWidth << "[] = {\n";
-
-  Indentation += 2;
-
-  // FIXME: We may be able to use the NumToSkip values to recover
-  // appropriate indentation levels.
-  DecoderTable::const_iterator I = Table.begin();
-  DecoderTable::const_iterator E = Table.end();
-  while (I != E) {
-    assert (I < E && "incomplete decode table entry!");
-
-    uint64_t Pos = I - Table.begin();
-    OS << "/* " << Pos << " */";
-    OS.PadToColumn(12);
-
-    switch (*I) {
-    default:
-      PrintFatalError("invalid decode table opcode");
-    case MCD::OPC_ExtractField: {
-      ++I;
-      unsigned Start = *I++;
-      unsigned Len = *I++;
-      OS.indent(Indentation) << "MCD::OPC_ExtractField, " << Start << ", "
-        << Len << ",  // Inst{";
-      if (Len > 1)
-        OS << (Start + Len - 1) << "-";
-      OS << Start << "} ...\n";
-      break;
-    }
-    case MCD::OPC_FilterValue: {
-      ++I;
-      OS.indent(Indentation) << "MCD::OPC_FilterValue, ";
-      // The filter value is ULEB128 encoded.
-      while (*I >= 128)
-        OS << (unsigned)*I++ << ", ";
-      OS << (unsigned)*I++ << ", ";
-
-      // 24-bit numtoskip value.
-      uint8_t Byte = *I++;
-      uint32_t NumToSkip = Byte;
-      OS << (unsigned)Byte << ", ";
-      Byte = *I++;
-      OS << (unsigned)Byte << ", ";
-      NumToSkip |= Byte << 8;
-      Byte = *I++;
-      OS << utostr(Byte) << ", ";
-      NumToSkip |= Byte << 16;
-      OS << "// Skip to: " << ((I - Table.begin()) + NumToSkip) << "\n";
-      break;
-    }
-    case MCD::OPC_CheckField: {
-      ++I;
-      unsigned Start = *I++;
-      unsigned Len = *I++;
-      OS.indent(Indentation) << "MCD::OPC_CheckField, " << Start << ", "
-        << Len << ", ";// << Val << ", " << NumToSkip << ",\n";
-      // ULEB128 encoded field value.
-      for (; *I >= 128; ++I)
-        OS << (unsigned)*I << ", ";
-      OS << (unsigned)*I++ << ", ";
-      // 24-bit numtoskip value.
-      uint8_t Byte = *I++;
-      uint32_t NumToSkip = Byte;
-      OS << (unsigned)Byte << ", ";
-      Byte = *I++;
-      OS << (unsigned)Byte << ", ";
-      NumToSkip |= Byte << 8;
-      Byte = *I++;
-      OS << utostr(Byte) << ", ";
-      NumToSkip |= Byte << 16;
-      OS << "// Skip to: " << ((I - Table.begin()) + NumToSkip) << "\n";
-      break;
-    }
-    case MCD::OPC_CheckPredicate: {
-      ++I;
-      OS.indent(Indentation) << "MCD::OPC_CheckPredicate, ";
-      for (; *I >= 128; ++I)
-        OS << (unsigned)*I << ", ";
-      OS << (unsigned)*I++ << ", ";
-
-      // 24-bit numtoskip value.
-      uint8_t Byte = *I++;
-      uint32_t NumToSkip = Byte;
-      OS << (unsigned)Byte << ", ";
-      Byte = *I++;
-      OS << (unsigned)Byte << ", ";
-      NumToSkip |= Byte << 8;
-      Byte = *I++;
-      OS << utostr(Byte) << ", ";
-      NumToSkip |= Byte << 16;
-      OS << "// Skip to: " << ((I - Table.begin()) + NumToSkip) << "\n";
-      break;
-    }
-    case MCD::OPC_Decode:
-    case MCD::OPC_TryDecode: {
-      bool IsTry = *I == MCD::OPC_TryDecode;
-      ++I;
-      // Extract the ULEB128 encoded Opcode to a buffer.
-      uint8_t Buffer[16], *p = Buffer;
-      while ((*p++ = *I++) >= 128)
-        assert((p - Buffer) <= (ptrdiff_t)sizeof(Buffer)
-               && "ULEB128 value too large!");
-      // Decode the Opcode value.
-      unsigned Opc = decodeULEB128(Buffer);
-      OS.indent(Indentation) << "MCD::OPC_" << (IsTry ? "Try" : "")
-        << "Decode, ";
-      for (p = Buffer; *p >= 128; ++p)
-        OS << (unsigned)*p << ", ";
-      OS << (unsigned)*p << ", ";
-
-      // Decoder index.
-      for (; *I >= 128; ++I)
-        OS << (unsigned)*I << ", ";
-      OS << (unsigned)*I++ << ", ";
-
-      if (!IsTry) {
-        OS << "// Opcode: " << NumberedEncodings[Opc] << "\n";
-        break;
-      }
-
-      // Fallthrough for OPC_TryDecode.
-
-      // 24-bit numtoskip value.
-      uint8_t Byte = *I++;
-      uint32_t NumToSkip = Byte;
-      OS << (unsigned)Byte << ", ";
-      Byte = *I++;
-      OS << (unsigned)Byte << ", ";
-      NumToSkip |= Byte << 8;
-      Byte = *I++;
-      OS << utostr(Byte) << ", ";
-      NumToSkip |= Byte << 16;
-
-      OS << "// Opcode: " << NumberedEncodings[Opc]
-         << ", skip to: " << ((I - Table.begin()) + NumToSkip) << "\n";
-      break;
-    }
-    case MCD::OPC_SoftFail: {
-      ++I;
-      OS.indent(Indentation) << "MCD::OPC_SoftFail";
-      // Positive mask
-      uint64_t Value = 0;
-      unsigned Shift = 0;
-      do {
-        OS << ", " << (unsigned)*I;
-        Value += (*I & 0x7f) << Shift;
-        Shift += 7;
-      } while (*I++ >= 128);
-      if (Value > 127) {
-        OS << " /* 0x";
-        OS.write_hex(Value);
-        OS << " */";
-      }
-      // Negative mask
-      Value = 0;
-      Shift = 0;
-      do {
-        OS << ", " << (unsigned)*I;
-        Value += (*I & 0x7f) << Shift;
-        Shift += 7;
-      } while (*I++ >= 128);
-      if (Value > 127) {
-        OS << " /* 0x";
-        OS.write_hex(Value);
-        OS << " */";
-      }
-      OS << ",\n";
-      break;
-    }
-    case MCD::OPC_Fail: {
-      ++I;
-      OS.indent(Indentation) << "MCD::OPC_Fail,\n";
-      break;
-    }
-    }
-  }
-  OS.indent(Indentation) << "0\n";
-
-  Indentation -= 2;
-
-  OS.indent(Indentation) << "};\n\n";
-}
-
-void FixedLenDecoderEmitter::
-emitPredicateFunction(formatted_raw_ostream &OS, PredicateSet &Predicates,
-                      unsigned Indentation) const {
-  // The predicate function is just a big switch statement based on the
-  // input predicate index.
-  OS.indent(Indentation) << "static bool checkDecoderPredicate(unsigned Idx, "
-    << "const FeatureBitset &Bits) {\n";
-  Indentation += 2;
-  if (!Predicates.empty()) {
-    OS.indent(Indentation) << "switch (Idx) {\n";
-    OS.indent(Indentation) << "default: llvm_unreachable(\"Invalid index!\");\n";
-    unsigned Index = 0;
-    for (const auto &Predicate : Predicates) {
-      OS.indent(Indentation) << "case " << Index++ << ":\n";
-      OS.indent(Indentation+2) << "return (" << Predicate << ");\n";
-    }
-    OS.indent(Indentation) << "}\n";
-  } else {
-    // No case statement to emit
-    OS.indent(Indentation) << "llvm_unreachable(\"Invalid index!\");\n";
-  }
-  Indentation -= 2;
-  OS.indent(Indentation) << "}\n\n";
-}
-
-void FixedLenDecoderEmitter::
-emitDecoderFunction(formatted_raw_ostream &OS, DecoderSet &Decoders,
-                    unsigned Indentation) const {
-  // The decoder function is just a big switch statement based on the
-  // input decoder index.
-  OS.indent(Indentation) << "template <typename InsnType>\n";
-  OS.indent(Indentation) << "static DecodeStatus decodeToMCInst(DecodeStatus S,"
-    << " unsigned Idx, InsnType insn, MCInst &MI,\n";
-  OS.indent(Indentation) << "                                   uint64_t "
-    << "Address, const void *Decoder, bool &DecodeComplete) {\n";
-  Indentation += 2;
-  OS.indent(Indentation) << "DecodeComplete = true;\n";
-  // TODO: When InsnType is large, using uint64_t limits all fields to 64 bits
-  // It would be better for emitBinaryParser to use a 64-bit tmp whenever
-  // possible but fall back to an InsnType-sized tmp for truly large fields.
-  OS.indent(Indentation) << "using TmpType = "
-                            "std::conditional_t<std::is_integral<InsnType>::"
-                            "value, InsnType, uint64_t>;\n";
-  OS.indent(Indentation) << "TmpType tmp;\n";
-  OS.indent(Indentation) << "switch (Idx) {\n";
-  OS.indent(Indentation) << "default: llvm_unreachable(\"Invalid index!\");\n";
-  unsigned Index = 0;
-  for (const auto &Decoder : Decoders) {
-    OS.indent(Indentation) << "case " << Index++ << ":\n";
-    OS << Decoder;
-    OS.indent(Indentation+2) << "return S;\n";
-  }
-  OS.indent(Indentation) << "}\n";
-  Indentation -= 2;
-  OS.indent(Indentation) << "}\n\n";
-}
-
-// Populates the field of the insn given the start position and the number of
-// consecutive bits to scan for.
-//
-// Returns false if and on the first uninitialized bit value encountered.
-// Returns true, otherwise.
-bool FilterChooser::fieldFromInsn(uint64_t &Field, insn_t &Insn,
-                                  unsigned StartBit, unsigned NumBits) const {
-  Field = 0;
-
-  for (unsigned i = 0; i < NumBits; ++i) {
-    if (Insn[StartBit + i] == BIT_UNSET)
-      return false;
-
-    if (Insn[StartBit + i] == BIT_TRUE)
-      Field = Field | (1ULL << i);
-  }
-
-  return true;
-}
-
-/// dumpFilterArray - dumpFilterArray prints out debugging info for the given
-/// filter array as a series of chars.
-void FilterChooser::dumpFilterArray(raw_ostream &o,
-                                 const std::vector<bit_value_t> &filter) const {
-  for (unsigned bitIndex = BitWidth; bitIndex > 0; bitIndex--) {
-    switch (filter[bitIndex - 1]) {
-    case BIT_UNFILTERED:
-      o << ".";
-      break;
-    case BIT_UNSET:
-      o << "_";
-      break;
-    case BIT_TRUE:
-      o << "1";
-      break;
-    case BIT_FALSE:
-      o << "0";
-      break;
-    }
-  }
-}
-
-/// dumpStack - dumpStack traverses the filter chooser chain and calls
-/// dumpFilterArray on each filter chooser up to the top level one.
-void FilterChooser::dumpStack(raw_ostream &o, const char *prefix) const {
-  const FilterChooser *current = this;
-
-  while (current) {
-    o << prefix;
-    dumpFilterArray(o, current->FilterBitValues);
-    o << '\n';
-    current = current->Parent;
-  }
-}
-
-// Calculates the island(s) needed to decode the instruction.
-// This returns a list of undecoded bits of an instructions, for example,
-// Inst{20} = 1 && Inst{3-0} == 0b1111 represents two islands of yet-to-be
-// decoded bits in order to verify that the instruction matches the Opcode.
-unsigned FilterChooser::getIslands(std::vector<unsigned> &StartBits,
-                                   std::vector<unsigned> &EndBits,
-                                   std::vector<uint64_t> &FieldVals,
-                                   const insn_t &Insn) const {
-  unsigned Num, BitNo;
-  Num = BitNo = 0;
-
-  uint64_t FieldVal = 0;
-
-  // 0: Init
-  // 1: Water (the bit value does not affect decoding)
-  // 2: Island (well-known bit value needed for decoding)
-  int State = 0;
-
-  for (unsigned i = 0; i < BitWidth; ++i) {
-    int64_t Val = Value(Insn[i]);
-    bool Filtered = PositionFiltered(i);
-    switch (State) {
-    default: llvm_unreachable("Unreachable code!");
-    case 0:
-    case 1:
-      if (Filtered || Val == -1)
-        State = 1; // Still in Water
-      else {
-        State = 2; // Into the Island
-        BitNo = 0;
-        StartBits.push_back(i);
-        FieldVal = Val;
-      }
-      break;
-    case 2:
-      if (Filtered || Val == -1) {
-        State = 1; // Into the Water
-        EndBits.push_back(i - 1);
-        FieldVals.push_back(FieldVal);
-        ++Num;
-      } else {
-        State = 2; // Still in Island
-        ++BitNo;
-        FieldVal = FieldVal | Val << BitNo;
-      }
-      break;
-    }
-  }
-  // If we are still in Island after the loop, do some housekeeping.
-  if (State == 2) {
-    EndBits.push_back(BitWidth - 1);
-    FieldVals.push_back(FieldVal);
-    ++Num;
-  }
-
-  assert(StartBits.size() == Num && EndBits.size() == Num &&
-         FieldVals.size() == Num);
-  return Num;
-}
-
-void FilterChooser::emitBinaryParser(raw_ostream &o, unsigned &Indentation,
-                                     const OperandInfo &OpInfo,
-                                     bool &OpHasCompleteDecoder) const {
-  const std::string &Decoder = OpInfo.Decoder;
-
-  bool UseInsertBits = OpInfo.numFields() != 1 || OpInfo.InitValue != 0;
-
-  if (UseInsertBits) {
-    o.indent(Indentation) << "tmp = 0x";
-    o.write_hex(OpInfo.InitValue);
-    o << ";\n";
-  }
-
-  for (const EncodingField &EF : OpInfo) {
-    o.indent(Indentation);
-    if (UseInsertBits)
-      o << "insertBits(tmp, ";
-    else
-      o << "tmp = ";
-    o << "fieldFromInstruction(insn, " << EF.Base << ", " << EF.Width << ')';
-    if (UseInsertBits)
-      o << ", " << EF.Offset << ", " << EF.Width << ')';
-    else if (EF.Offset != 0)
-      o << " << " << EF.Offset;
-    o << ";\n";
-  }
-
-  if (Decoder != "") {
-    OpHasCompleteDecoder = OpInfo.HasCompleteDecoder;
-    o.indent(Indentation) << Emitter->GuardPrefix << Decoder
-      << "(MI, tmp, Address, Decoder)"
-      << Emitter->GuardPostfix
-      << " { " << (OpHasCompleteDecoder ? "" : "DecodeComplete = false; ")
-      << "return MCDisassembler::Fail; }\n";
-  } else {
-    OpHasCompleteDecoder = true;
-    o.indent(Indentation) << "MI.addOperand(MCOperand::createImm(tmp));\n";
-  }
-}
-
-void FilterChooser::emitDecoder(raw_ostream &OS, unsigned Indentation,
-                                unsigned Opc, bool &HasCompleteDecoder) const {
-  HasCompleteDecoder = true;
-
-  for (const auto &Op : Operands.find(Opc)->second) {
-    // If a custom instruction decoder was specified, use that.
-    if (Op.numFields() == 0 && !Op.Decoder.empty()) {
-      HasCompleteDecoder = Op.HasCompleteDecoder;
-      OS.indent(Indentation) << Emitter->GuardPrefix << Op.Decoder
-        << "(MI, insn, Address, Decoder)"
-        << Emitter->GuardPostfix
-        << " { " << (HasCompleteDecoder ? "" : "DecodeComplete = false; ")
-        << "return MCDisassembler::Fail; }\n";
-      break;
-    }
-
-    bool OpHasCompleteDecoder;
-    emitBinaryParser(OS, Indentation, Op, OpHasCompleteDecoder);
-    if (!OpHasCompleteDecoder)
-      HasCompleteDecoder = false;
-  }
-}
-
-unsigned FilterChooser::getDecoderIndex(DecoderSet &Decoders,
-                                        unsigned Opc,
-                                        bool &HasCompleteDecoder) const {
-  // Build up the predicate string.
-  SmallString<256> Decoder;
-  // FIXME: emitDecoder() function can take a buffer directly rather than
-  // a stream.
-  raw_svector_ostream S(Decoder);
-  unsigned I = 4;
-  emitDecoder(S, I, Opc, HasCompleteDecoder);
-
-  // Using the full decoder string as the key value here is a bit
-  // heavyweight, but is effective. If the string comparisons become a
-  // performance concern, we can implement a mangling of the predicate
-  // data easily enough with a map back to the actual string. That's
-  // overkill for now, though.
-
-  // Make sure the predicate is in the table.
-  Decoders.insert(CachedHashString(Decoder));
-  // Now figure out the index for when we write out the table.
-  DecoderSet::const_iterator P = find(Decoders, Decoder.str());
-  return (unsigned)(P - Decoders.begin());
-}
-
-bool FilterChooser::emitPredicateMatch(raw_ostream &o, unsigned &Indentation,
-                                       unsigned Opc) const {
-  ListInit *Predicates =
-      AllInstructions[Opc].EncodingDef->getValueAsListInit("Predicates");
-  bool IsFirstEmission = true;
-  for (unsigned i = 0; i < Predicates->size(); ++i) {
-    Record *Pred = Predicates->getElementAsRecord(i);
-    if (!Pred->getValue("AssemblerMatcherPredicate"))
-      continue;
-
-    if (!isa<DagInit>(Pred->getValue("AssemblerCondDag")->getValue()))
-      continue;
-
-    const DagInit *D = Pred->getValueAsDag("AssemblerCondDag");
-    std::string CombineType = D->getOperator()->getAsString();
-    if (CombineType != "any_of" && CombineType != "all_of")
-      PrintFatalError(Pred->getLoc(), "Invalid AssemblerCondDag!");
-    if (D->getNumArgs() == 0)
-      PrintFatalError(Pred->getLoc(), "Invalid AssemblerCondDag!");
-    bool IsOr = CombineType == "any_of";
-
-    if (!IsFirstEmission)
-      o << " && ";
-
-    if (IsOr)
-      o << "(";
-
-    ListSeparator LS(IsOr ? " || " : " && ");
-    for (auto *Arg : D->getArgs()) {
-      o << LS;
-      if (auto *NotArg = dyn_cast<DagInit>(Arg)) {
-        if (NotArg->getOperator()->getAsString() != "not" ||
-            NotArg->getNumArgs() != 1)
-          PrintFatalError(Pred->getLoc(), "Invalid AssemblerCondDag!");
-        Arg = NotArg->getArg(0);
-        o << "!";
-      }
-      if (!isa<DefInit>(Arg) ||
-          !cast<DefInit>(Arg)->getDef()->isSubClassOf("SubtargetFeature"))
-        PrintFatalError(Pred->getLoc(), "Invalid AssemblerCondDag!");
-      o << "Bits[" << Emitter->PredicateNamespace << "::" << Arg->getAsString()
-        << "]";
-    }
-
-    if (IsOr)
-      o << ")";
-
-    IsFirstEmission = false;
-  }
-  return !Predicates->empty();
-}
-
-bool FilterChooser::doesOpcodeNeedPredicate(unsigned Opc) const {
-  ListInit *Predicates =
-      AllInstructions[Opc].EncodingDef->getValueAsListInit("Predicates");
-  for (unsigned i = 0; i < Predicates->size(); ++i) {
-    Record *Pred = Predicates->getElementAsRecord(i);
-    if (!Pred->getValue("AssemblerMatcherPredicate"))
-      continue;
-
-    if (isa<DagInit>(Pred->getValue("AssemblerCondDag")->getValue()))
-      return true;
-  }
-  return false;
-}
-
-unsigned FilterChooser::getPredicateIndex(DecoderTableInfo &TableInfo,
-                                          StringRef Predicate) const {
-  // Using the full predicate string as the key value here is a bit
-  // heavyweight, but is effective. If the string comparisons become a
-  // performance concern, we can implement a mangling of the predicate
-  // data easily enough with a map back to the actual string. That's
-  // overkill for now, though.
-
-  // Make sure the predicate is in the table.
-  TableInfo.Predicates.insert(CachedHashString(Predicate));
-  // Now figure out the index for when we write out the table.
-  PredicateSet::const_iterator P = find(TableInfo.Predicates, Predicate);
-  return (unsigned)(P - TableInfo.Predicates.begin());
-}
-
-void FilterChooser::emitPredicateTableEntry(DecoderTableInfo &TableInfo,
-                                            unsigned Opc) const {
-  if (!doesOpcodeNeedPredicate(Opc))
-    return;
-
-  // Build up the predicate string.
-  SmallString<256> Predicate;
-  // FIXME: emitPredicateMatch() functions can take a buffer directly rather
-  // than a stream.
-  raw_svector_ostream PS(Predicate);
-  unsigned I = 0;
-  emitPredicateMatch(PS, I, Opc);
-
-  // Figure out the index into the predicate table for the predicate just
-  // computed.
-  unsigned PIdx = getPredicateIndex(TableInfo, PS.str());
-  SmallString<16> PBytes;
-  raw_svector_ostream S(PBytes);
-  encodeULEB128(PIdx, S);
-
-  TableInfo.Table.push_back(MCD::OPC_CheckPredicate);
-  // Predicate index
-  for (unsigned i = 0, e = PBytes.size(); i != e; ++i)
-    TableInfo.Table.push_back(PBytes[i]);
-  // Push location for NumToSkip backpatching.
-  TableInfo.FixupStack.back().push_back(TableInfo.Table.size());
-  TableInfo.Table.push_back(0);
-  TableInfo.Table.push_back(0);
-  TableInfo.Table.push_back(0);
-}
-
-void FilterChooser::emitSoftFailTableEntry(DecoderTableInfo &TableInfo,
-                                           unsigned Opc) const {
-  BitsInit *SFBits =
-      AllInstructions[Opc].EncodingDef->getValueAsBitsInit("SoftFail");
-  if (!SFBits) return;
-  BitsInit *InstBits =
-      AllInstructions[Opc].EncodingDef->getValueAsBitsInit("Inst");
-
-  APInt PositiveMask(BitWidth, 0ULL);
-  APInt NegativeMask(BitWidth, 0ULL);
-  for (unsigned i = 0; i < BitWidth; ++i) {
-    bit_value_t B = bitFromBits(*SFBits, i);
-    bit_value_t IB = bitFromBits(*InstBits, i);
-
-    if (B != BIT_TRUE) continue;
-
-    switch (IB) {
-    case BIT_FALSE:
-      // The bit is meant to be false, so emit a check to see if it is true.
-      PositiveMask.setBit(i);
-      break;
-    case BIT_TRUE:
-      // The bit is meant to be true, so emit a check to see if it is false.
-      NegativeMask.setBit(i);
-      break;
-    default:
-      // The bit is not set; this must be an error!
-      errs() << "SoftFail Conflict: bit SoftFail{" << i << "} in "
-             << AllInstructions[Opc] << " is set but Inst{" << i
-             << "} is unset!\n"
-             << "  - You can only mark a bit as SoftFail if it is fully defined"
-             << " (1/0 - not '?') in Inst\n";
-      return;
-    }
-  }
-
-  bool NeedPositiveMask = PositiveMask.getBoolValue();
-  bool NeedNegativeMask = NegativeMask.getBoolValue();
-
-  if (!NeedPositiveMask && !NeedNegativeMask)
-    return;
-
-  TableInfo.Table.push_back(MCD::OPC_SoftFail);
-
-  SmallString<16> MaskBytes;
-  raw_svector_ostream S(MaskBytes);
-  if (NeedPositiveMask) {
-    encodeULEB128(PositiveMask.getZExtValue(), S);
-    for (unsigned i = 0, e = MaskBytes.size(); i != e; ++i)
-      TableInfo.Table.push_back(MaskBytes[i]);
-  } else
-    TableInfo.Table.push_back(0);
-  if (NeedNegativeMask) {
-    MaskBytes.clear();
-    encodeULEB128(NegativeMask.getZExtValue(), S);
-    for (unsigned i = 0, e = MaskBytes.size(); i != e; ++i)
-      TableInfo.Table.push_back(MaskBytes[i]);
-  } else
-    TableInfo.Table.push_back(0);
-}
-
-// Emits table entries to decode the singleton.
-void FilterChooser::emitSingletonTableEntry(DecoderTableInfo &TableInfo,
-                                            EncodingIDAndOpcode Opc) const {
-  std::vector<unsigned> StartBits;
-  std::vector<unsigned> EndBits;
-  std::vector<uint64_t> FieldVals;
-  insn_t Insn;
-  insnWithID(Insn, Opc.EncodingID);
-
-  // Look for islands of undecoded bits of the singleton.
-  getIslands(StartBits, EndBits, FieldVals, Insn);
-
-  unsigned Size = StartBits.size();
-
-  // Emit the predicate table entry if one is needed.
-  emitPredicateTableEntry(TableInfo, Opc.EncodingID);
-
-  // Check any additional encoding fields needed.
-  for (unsigned I = Size; I != 0; --I) {
-    unsigned NumBits = EndBits[I-1] - StartBits[I-1] + 1;
-    TableInfo.Table.push_back(MCD::OPC_CheckField);
-    TableInfo.Table.push_back(StartBits[I-1]);
-    TableInfo.Table.push_back(NumBits);
-    uint8_t Buffer[16], *p;
-    encodeULEB128(FieldVals[I-1], Buffer);
-    for (p = Buffer; *p >= 128 ; ++p)
-      TableInfo.Table.push_back(*p);
-    TableInfo.Table.push_back(*p);
-    // Push location for NumToSkip backpatching.
-    TableInfo.FixupStack.back().push_back(TableInfo.Table.size());
-    // The fixup is always 24-bits, so go ahead and allocate the space
-    // in the table so all our relative position calculations work OK even
-    // before we fully resolve the real value here.
-    TableInfo.Table.push_back(0);
-    TableInfo.Table.push_back(0);
-    TableInfo.Table.push_back(0);
-  }
-
-  // Check for soft failure of the match.
-  emitSoftFailTableEntry(TableInfo, Opc.EncodingID);
-
-  bool HasCompleteDecoder;
-  unsigned DIdx =
-      getDecoderIndex(TableInfo.Decoders, Opc.EncodingID, HasCompleteDecoder);
-
-  // Produce OPC_Decode or OPC_TryDecode opcode based on the information
-  // whether the instruction decoder is complete or not. If it is complete
-  // then it handles all possible values of remaining variable/unfiltered bits
-  // and for any value can determine if the bitpattern is a valid instruction
-  // or not. This means OPC_Decode will be the final step in the decoding
-  // process. If it is not complete, then the Fail return code from the
-  // decoder method indicates that additional processing should be done to see
-  // if there is any other instruction that also matches the bitpattern and
-  // can decode it.
-  TableInfo.Table.push_back(HasCompleteDecoder ? MCD::OPC_Decode :
-      MCD::OPC_TryDecode);
-  NumEncodingsSupported++;
-  uint8_t Buffer[16], *p;
-  encodeULEB128(Opc.Opcode, Buffer);
-  for (p = Buffer; *p >= 128 ; ++p)
-    TableInfo.Table.push_back(*p);
-  TableInfo.Table.push_back(*p);
-
-  SmallString<16> Bytes;
-  raw_svector_ostream S(Bytes);
-  encodeULEB128(DIdx, S);
-
-  // Decoder index
-  for (unsigned i = 0, e = Bytes.size(); i != e; ++i)
-    TableInfo.Table.push_back(Bytes[i]);
-
-  if (!HasCompleteDecoder) {
-    // Push location for NumToSkip backpatching.
-    TableInfo.FixupStack.back().push_back(TableInfo.Table.size());
-    // Allocate the space for the fixup.
-    TableInfo.Table.push_back(0);
-    TableInfo.Table.push_back(0);
-    TableInfo.Table.push_back(0);
-  }
-}
-
-// Emits table entries to decode the singleton, and then to decode the rest.
-void FilterChooser::emitSingletonTableEntry(DecoderTableInfo &TableInfo,
-                                            const Filter &Best) const {
-  EncodingIDAndOpcode Opc = Best.getSingletonOpc();
-
-  // complex singletons need predicate checks from the first singleton
-  // to refer forward to the variable filterchooser that follows.
-  TableInfo.FixupStack.emplace_back();
-
-  emitSingletonTableEntry(TableInfo, Opc);
-
-  resolveTableFixups(TableInfo.Table, TableInfo.FixupStack.back(),
-                     TableInfo.Table.size());
-  TableInfo.FixupStack.pop_back();
-
-  Best.getVariableFC().emitTableEntries(TableInfo);
-}
-
-// Assign a single filter and run with it.  Top level API client can initialize
-// with a single filter to start the filtering process.
-void FilterChooser::runSingleFilter(unsigned startBit, unsigned numBit,
-                                    bool mixed) {
-  Filters.clear();
-  Filters.emplace_back(*this, startBit, numBit, true);
-  BestIndex = 0; // Sole Filter instance to choose from.
-  bestFilter().recurse();
-}
-
-// reportRegion is a helper function for filterProcessor to mark a region as
-// eligible for use as a filter region.
-void FilterChooser::reportRegion(bitAttr_t RA, unsigned StartBit,
-                                 unsigned BitIndex, bool AllowMixed) {
-  if (RA == ATTR_MIXED && AllowMixed)
-    Filters.emplace_back(*this, StartBit, BitIndex - StartBit, true);
-  else if (RA == ATTR_ALL_SET && !AllowMixed)
-    Filters.emplace_back(*this, StartBit, BitIndex - StartBit, false);
-}
-
-// FilterProcessor scans the well-known encoding bits of the instructions and
-// builds up a list of candidate filters.  It chooses the best filter and
-// recursively descends down the decoding tree.
-bool FilterChooser::filterProcessor(bool AllowMixed, bool Greedy) {
-  Filters.clear();
-  BestIndex = -1;
-  unsigned numInstructions = Opcodes.size();
-
-  assert(numInstructions && "Filter created with no instructions");
-
-  // No further filtering is necessary.
-  if (numInstructions == 1)
-    return true;
-
-  // Heuristics.  See also doFilter()'s "Heuristics" comment when num of
-  // instructions is 3.
-  if (AllowMixed && !Greedy) {
-    assert(numInstructions == 3);
-
-    for (auto Opcode : Opcodes) {
-      std::vector<unsigned> StartBits;
-      std::vector<unsigned> EndBits;
-      std::vector<uint64_t> FieldVals;
-      insn_t Insn;
-
-      insnWithID(Insn, Opcode.EncodingID);
-
-      // Look for islands of undecoded bits of any instruction.
-      if (getIslands(StartBits, EndBits, FieldVals, Insn) > 0) {
-        // Found an instruction with island(s).  Now just assign a filter.
-        runSingleFilter(StartBits[0], EndBits[0] - StartBits[0] + 1, true);
-        return true;
-      }
-    }
-  }
-
-  unsigned BitIndex;
-
-  // We maintain BIT_WIDTH copies of the bitAttrs automaton.
-  // The automaton consumes the corresponding bit from each
-  // instruction.
-  //
-  //   Input symbols: 0, 1, and _ (unset).
-  //   States:        NONE, FILTERED, ALL_SET, ALL_UNSET, and MIXED.
-  //   Initial state: NONE.
-  //
-  // (NONE) ------- [01] -> (ALL_SET)
-  // (NONE) ------- _ ----> (ALL_UNSET)
-  // (ALL_SET) ---- [01] -> (ALL_SET)
-  // (ALL_SET) ---- _ ----> (MIXED)
-  // (ALL_UNSET) -- [01] -> (MIXED)
-  // (ALL_UNSET) -- _ ----> (ALL_UNSET)
-  // (MIXED) ------ . ----> (MIXED)
-  // (FILTERED)---- . ----> (FILTERED)
-
-  std::vector<bitAttr_t> bitAttrs;
-
-  // FILTERED bit positions provide no entropy and are not worthy of pursuing.
-  // Filter::recurse() set either BIT_TRUE or BIT_FALSE for each position.
-  for (BitIndex = 0; BitIndex < BitWidth; ++BitIndex)
-    if (FilterBitValues[BitIndex] == BIT_TRUE ||
-        FilterBitValues[BitIndex] == BIT_FALSE)
-      bitAttrs.push_back(ATTR_FILTERED);
-    else
-      bitAttrs.push_back(ATTR_NONE);
-
-  for (unsigned InsnIndex = 0; InsnIndex < numInstructions; ++InsnIndex) {
-    insn_t insn;
-
-    insnWithID(insn, Opcodes[InsnIndex].EncodingID);
-
-    for (BitIndex = 0; BitIndex < BitWidth; ++BitIndex) {
-      switch (bitAttrs[BitIndex]) {
-      case ATTR_NONE:
-        if (insn[BitIndex] == BIT_UNSET)
-          bitAttrs[BitIndex] = ATTR_ALL_UNSET;
-        else
-          bitAttrs[BitIndex] = ATTR_ALL_SET;
-        break;
-      case ATTR_ALL_SET:
-        if (insn[BitIndex] == BIT_UNSET)
-          bitAttrs[BitIndex] = ATTR_MIXED;
-        break;
-      case ATTR_ALL_UNSET:
-        if (insn[BitIndex] != BIT_UNSET)
-          bitAttrs[BitIndex] = ATTR_MIXED;
-        break;
-      case ATTR_MIXED:
-      case ATTR_FILTERED:
-        break;
-      }
-    }
-  }
-
-  // The regionAttr automaton consumes the bitAttrs automatons' state,
-  // lowest-to-highest.
-  //
-  //   Input symbols: F(iltered), (all_)S(et), (all_)U(nset), M(ixed)
-  //   States:        NONE, ALL_SET, MIXED
-  //   Initial state: NONE
-  //
-  // (NONE) ----- F --> (NONE)
-  // (NONE) ----- S --> (ALL_SET)     ; and set region start
-  // (NONE) ----- U --> (NONE)
-  // (NONE) ----- M --> (MIXED)       ; and set region start
-  // (ALL_SET) -- F --> (NONE)        ; and report an ALL_SET region
-  // (ALL_SET) -- S --> (ALL_SET)
-  // (ALL_SET) -- U --> (NONE)        ; and report an ALL_SET region
-  // (ALL_SET) -- M --> (MIXED)       ; and report an ALL_SET region
-  // (MIXED) ---- F --> (NONE)        ; and report a MIXED region
-  // (MIXED) ---- S --> (ALL_SET)     ; and report a MIXED region
-  // (MIXED) ---- U --> (NONE)        ; and report a MIXED region
-  // (MIXED) ---- M --> (MIXED)
-
-  bitAttr_t RA = ATTR_NONE;
-  unsigned StartBit = 0;
-
-  for (BitIndex = 0; BitIndex < BitWidth; ++BitIndex) {
-    bitAttr_t bitAttr = bitAttrs[BitIndex];
-
-    assert(bitAttr != ATTR_NONE && "Bit without attributes");
-
-    switch (RA) {
-    case ATTR_NONE:
-      switch (bitAttr) {
-      case ATTR_FILTERED:
-        break;
-      case ATTR_ALL_SET:
-        StartBit = BitIndex;
-        RA = ATTR_ALL_SET;
-        break;
-      case ATTR_ALL_UNSET:
-        break;
-      case ATTR_MIXED:
-        StartBit = BitIndex;
-        RA = ATTR_MIXED;
-        break;
-      default:
-        llvm_unreachable("Unexpected bitAttr!");
-      }
-      break;
-    case ATTR_ALL_SET:
-      switch (bitAttr) {
-      case ATTR_FILTERED:
-        reportRegion(RA, StartBit, BitIndex, AllowMixed);
-        RA = ATTR_NONE;
-        break;
-      case ATTR_ALL_SET:
-        break;
-      case ATTR_ALL_UNSET:
-        reportRegion(RA, StartBit, BitIndex, AllowMixed);
-        RA = ATTR_NONE;
-        break;
-      case ATTR_MIXED:
-        reportRegion(RA, StartBit, BitIndex, AllowMixed);
-        StartBit = BitIndex;
-        RA = ATTR_MIXED;
-        break;
-      default:
-        llvm_unreachable("Unexpected bitAttr!");
-      }
-      break;
-    case ATTR_MIXED:
-      switch (bitAttr) {
-      case ATTR_FILTERED:
-        reportRegion(RA, StartBit, BitIndex, AllowMixed);
-        StartBit = BitIndex;
-        RA = ATTR_NONE;
-        break;
-      case ATTR_ALL_SET:
-        reportRegion(RA, StartBit, BitIndex, AllowMixed);
-        StartBit = BitIndex;
-        RA = ATTR_ALL_SET;
-        break;
-      case ATTR_ALL_UNSET:
-        reportRegion(RA, StartBit, BitIndex, AllowMixed);
-        RA = ATTR_NONE;
-        break;
-      case ATTR_MIXED:
-        break;
-      default:
-        llvm_unreachable("Unexpected bitAttr!");
-      }
-      break;
-    case ATTR_ALL_UNSET:
-      llvm_unreachable("regionAttr state machine has no ATTR_UNSET state");
-    case ATTR_FILTERED:
-      llvm_unreachable("regionAttr state machine has no ATTR_FILTERED state");
-    }
-  }
-
-  // At the end, if we're still in ALL_SET or MIXED states, report a region
-  switch (RA) {
-  case ATTR_NONE:
-    break;
-  case ATTR_FILTERED:
-    break;
-  case ATTR_ALL_SET:
-    reportRegion(RA, StartBit, BitIndex, AllowMixed);
-    break;
-  case ATTR_ALL_UNSET:
-    break;
-  case ATTR_MIXED:
-    reportRegion(RA, StartBit, BitIndex, AllowMixed);
-    break;
-  }
-
-  // We have finished with the filter processings.  Now it's time to choose
-  // the best performing filter.
-  BestIndex = 0;
-  bool AllUseless = true;
-  unsigned BestScore = 0;
-
-  for (unsigned i = 0, e = Filters.size(); i != e; ++i) {
-    unsigned Usefulness = Filters[i].usefulness();
-
-    if (Usefulness)
-      AllUseless = false;
-
-    if (Usefulness > BestScore) {
-      BestIndex = i;
-      BestScore = Usefulness;
-    }
-  }
-
-  if (!AllUseless)
-    bestFilter().recurse();
-
-  return !AllUseless;
-} // end of FilterChooser::filterProcessor(bool)
-
-// Decides on the best configuration of filter(s) to use in order to decode
-// the instructions.  A conflict of instructions may occur, in which case we
-// dump the conflict set to the standard error.
-void FilterChooser::doFilter() {
-  unsigned Num = Opcodes.size();
-  assert(Num && "FilterChooser created with no instructions");
-
-  // Try regions of consecutive known bit values first.
-  if (filterProcessor(false))
-    return;
-
-  // Then regions of mixed bits (both known and unitialized bit values allowed).
-  if (filterProcessor(true))
-    return;
-
-  // Heuristics to cope with conflict set {t2CMPrs, t2SUBSrr, t2SUBSrs} where
-  // no single instruction for the maximum ATTR_MIXED region Inst{14-4} has a
-  // well-known encoding pattern.  In such case, we backtrack and scan for the
-  // the very first consecutive ATTR_ALL_SET region and assign a filter to it.
-  if (Num == 3 && filterProcessor(true, false))
-    return;
-
-  // If we come to here, the instruction decoding has failed.
-  // Set the BestIndex to -1 to indicate so.
-  BestIndex = -1;
-}
-
-// emitTableEntries - Emit state machine entries to decode our share of
-// instructions.
-void FilterChooser::emitTableEntries(DecoderTableInfo &TableInfo) const {
-  if (Opcodes.size() == 1) {
-    // There is only one instruction in the set, which is great!
-    // Call emitSingletonDecoder() to see whether there are any remaining
-    // encodings bits.
-    emitSingletonTableEntry(TableInfo, Opcodes[0]);
-    return;
-  }
-
-  // Choose the best filter to do the decodings!
-  if (BestIndex != -1) {
-    const Filter &Best = Filters[BestIndex];
-    if (Best.getNumFiltered() == 1)
-      emitSingletonTableEntry(TableInfo, Best);
-    else
-      Best.emitTableEntry(TableInfo);
-    return;
-  }
-
-  // We don't know how to decode these instructions!  Dump the
-  // conflict set and bail.
-
-  // Print out useful conflict information for postmortem analysis.
-  errs() << "Decoding Conflict:\n";
-
-  dumpStack(errs(), "\t\t");
-
-  for (auto Opcode : Opcodes) {
-    errs() << '\t';
-    emitNameWithID(errs(), Opcode.EncodingID);
-    errs() << " ";
-    dumpBits(
-        errs(),
-        getBitsField(*AllInstructions[Opcode.EncodingID].EncodingDef, "Inst"));
-    errs() << '\n';
-  }
-}
-
-static std::string findOperandDecoderMethod(TypedInit *TI) {
-  std::string Decoder;
-
-  Record *Record = cast<DefInit>(TI)->getDef();
-
-  RecordVal *DecoderString = Record->getValue("DecoderMethod");
-  StringInit *String = DecoderString ?
-    dyn_cast<StringInit>(DecoderString->getValue()) : nullptr;
-  if (String) {
-    Decoder = std::string(String->getValue());
-    if (!Decoder.empty())
-      return Decoder;
-  }
-
-  if (Record->isSubClassOf("RegisterOperand"))
-    Record = Record->getValueAsDef("RegClass");
-
-  if (Record->isSubClassOf("RegisterClass")) {
-    Decoder = "Decode" + Record->getName().str() + "RegisterClass";
-  } else if (Record->isSubClassOf("PointerLikeRegClass")) {
-    Decoder = "DecodePointerLikeRegClass" +
-      utostr(Record->getValueAsInt("RegClassKind"));
-  }
-
-  return Decoder;
-}
-
-static bool
-populateInstruction(CodeGenTarget &Target, const Record &EncodingDef,
-                    const CodeGenInstruction &CGI, unsigned Opc,
-                    std::map<unsigned, std::vector<OperandInfo>> &Operands) {
-  const Record &Def = *CGI.TheDef;
-  // If all the bit positions are not specified; do not decode this instruction.
-  // We are bound to fail!  For proper disassembly, the well-known encoding bits
-  // of the instruction must be fully specified.
-
-  BitsInit &Bits = getBitsField(EncodingDef, "Inst");
-  if (Bits.allInComplete()) return false;
-
-  std::vector<OperandInfo> InsnOperands;
-
-  // If the instruction has specified a custom decoding hook, use that instead
-  // of trying to auto-generate the decoder.
-  StringRef InstDecoder = EncodingDef.getValueAsString("DecoderMethod");
-  if (InstDecoder != "") {
-    bool HasCompleteInstDecoder = EncodingDef.getValueAsBit("hasCompleteDecoder");
-    InsnOperands.push_back(
-        OperandInfo(std::string(InstDecoder), HasCompleteInstDecoder));
-    Operands[Opc] = InsnOperands;
-    return true;
-  }
-
-  // Generate a description of the operand of the instruction that we know
-  // how to decode automatically.
-  // FIXME: We'll need to have a way to manually override this as needed.
-
-  // Gather the outputs/inputs of the instruction, so we can find their
-  // positions in the encoding.  This assumes for now that they appear in the
-  // MCInst in the order that they're listed.
-  std::vector<std::pair<Init*, StringRef>> InOutOperands;
-  DagInit *Out  = Def.getValueAsDag("OutOperandList");
-  DagInit *In  = Def.getValueAsDag("InOperandList");
-  for (unsigned i = 0; i < Out->getNumArgs(); ++i)
-    InOutOperands.push_back(std::make_pair(Out->getArg(i),
-                                           Out->getArgNameStr(i)));
-  for (unsigned i = 0; i < In->getNumArgs(); ++i)
-    InOutOperands.push_back(std::make_pair(In->getArg(i),
-                                           In->getArgNameStr(i)));
-
-  // Search for tied operands, so that we can correctly instantiate
-  // operands that are not explicitly represented in the encoding.
-  std::map<std::string, std::string> TiedNames;
-  for (unsigned i = 0; i < CGI.Operands.size(); ++i) {
-    int tiedTo = CGI.Operands[i].getTiedRegister();
-    if (tiedTo != -1) {
-      std::pair<unsigned, unsigned> SO =
-        CGI.Operands.getSubOperandNumber(tiedTo);
-      TiedNames[std::string(InOutOperands[i].second)] =
-          std::string(InOutOperands[SO.first].second);
-      TiedNames[std::string(InOutOperands[SO.first].second)] =
-          std::string(InOutOperands[i].second);
-    }
-  }
-
-  std::map<std::string, std::vector<OperandInfo>> NumberedInsnOperands;
-  std::set<std::string> NumberedInsnOperandsNoTie;
-  if (Target.getInstructionSet()->
-        getValueAsBit("decodePositionallyEncodedOperands")) {
-    const std::vector<RecordVal> &Vals = Def.getValues();
-    unsigned NumberedOp = 0;
-
-    std::set<unsigned> NamedOpIndices;
-    if (Target.getInstructionSet()->
-         getValueAsBit("noNamedPositionallyEncodedOperands"))
-      // Collect the set of operand indices that might correspond to named
-      // operand, and skip these when assigning operands based on position.
-      for (unsigned i = 0, e = Vals.size(); i != e; ++i) {
-        unsigned OpIdx;
-        if (!CGI.Operands.hasOperandNamed(Vals[i].getName(), OpIdx))
-          continue;
-
-        NamedOpIndices.insert(OpIdx);
-      }
-
-    for (unsigned i = 0, e = Vals.size(); i != e; ++i) {
-      // Ignore fixed fields in the record, we're looking for values like:
-      //    bits<5> RST = { ?, ?, ?, ?, ? };
-      if (Vals[i].isNonconcreteOK() || Vals[i].getValue()->isComplete())
-        continue;
-
-      // Determine if Vals[i] actually contributes to the Inst encoding.
-      unsigned bi = 0;
-      for (; bi < Bits.getNumBits(); ++bi) {
-        VarInit *Var = nullptr;
-        VarBitInit *BI = dyn_cast<VarBitInit>(Bits.getBit(bi));
-        if (BI)
-          Var = dyn_cast<VarInit>(BI->getBitVar());
-        else
-          Var = dyn_cast<VarInit>(Bits.getBit(bi));
-
-        if (Var && Var->getName() == Vals[i].getName())
-          break;
-      }
-
-      if (bi == Bits.getNumBits())
-        continue;
-
-      // Skip variables that correspond to explicitly-named operands.
-      unsigned OpIdx;
-      if (CGI.Operands.hasOperandNamed(Vals[i].getName(), OpIdx))
-        continue;
-
-      // Get the bit range for this operand:
-      unsigned bitStart = bi++, bitWidth = 1;
-      for (; bi < Bits.getNumBits(); ++bi) {
-        VarInit *Var = nullptr;
-        VarBitInit *BI = dyn_cast<VarBitInit>(Bits.getBit(bi));
-        if (BI)
-          Var = dyn_cast<VarInit>(BI->getBitVar());
-        else
-          Var = dyn_cast<VarInit>(Bits.getBit(bi));
-
-        if (!Var)
-          break;
-
-        if (Var->getName() != Vals[i].getName())
-          break;
-
-        ++bitWidth;
-      }
-
-      unsigned NumberOps = CGI.Operands.size();
-      while (NumberedOp < NumberOps &&
-             (CGI.Operands.isFlatOperandNotEmitted(NumberedOp) ||
-              (!NamedOpIndices.empty() && NamedOpIndices.count(
-                CGI.Operands.getSubOperandNumber(NumberedOp).first))))
-        ++NumberedOp;
-
-      OpIdx = NumberedOp++;
-
-      // OpIdx now holds the ordered operand number of Vals[i].
-      std::pair<unsigned, unsigned> SO =
-        CGI.Operands.getSubOperandNumber(OpIdx);
-      const std::string &Name = CGI.Operands[SO.first].Name;
-
-      LLVM_DEBUG(dbgs() << "Numbered operand mapping for " << Def.getName()
-                        << ": " << Name << "(" << SO.first << ", " << SO.second
-                        << ") => " << Vals[i].getName() << "\n");
-
-      std::string Decoder;
-      Record *TypeRecord = CGI.Operands[SO.first].Rec;
-
-      RecordVal *DecoderString = TypeRecord->getValue("DecoderMethod");
-      StringInit *String = DecoderString ?
-        dyn_cast<StringInit>(DecoderString->getValue()) : nullptr;
-      if (String && String->getValue() != "")
-        Decoder = std::string(String->getValue());
-
-      if (Decoder == "" &&
-          CGI.Operands[SO.first].MIOperandInfo &&
-          CGI.Operands[SO.first].MIOperandInfo->getNumArgs()) {
-        Init *Arg = CGI.Operands[SO.first].MIOperandInfo->
-                      getArg(SO.second);
-        if (DefInit *DI = cast<DefInit>(Arg))
-          TypeRecord = DI->getDef();
-      }
-
-      bool isReg = false;
-      if (TypeRecord->isSubClassOf("RegisterOperand"))
-        TypeRecord = TypeRecord->getValueAsDef("RegClass");
-      if (TypeRecord->isSubClassOf("RegisterClass")) {
-        Decoder = "Decode" + TypeRecord->getName().str() + "RegisterClass";
-        isReg = true;
-      } else if (TypeRecord->isSubClassOf("PointerLikeRegClass")) {
-        Decoder = "DecodePointerLikeRegClass" +
-                  utostr(TypeRecord->getValueAsInt("RegClassKind"));
-        isReg = true;
-      }
-
-      DecoderString = TypeRecord->getValue("DecoderMethod");
-      String = DecoderString ?
-        dyn_cast<StringInit>(DecoderString->getValue()) : nullptr;
-      if (!isReg && String && String->getValue() != "")
-        Decoder = std::string(String->getValue());
-
-      RecordVal *HasCompleteDecoderVal =
-        TypeRecord->getValue("hasCompleteDecoder");
-      BitInit *HasCompleteDecoderBit = HasCompleteDecoderVal ?
-        dyn_cast<BitInit>(HasCompleteDecoderVal->getValue()) : nullptr;
-      bool HasCompleteDecoder = HasCompleteDecoderBit ?
-        HasCompleteDecoderBit->getValue() : true;
-
-      OperandInfo OpInfo(Decoder, HasCompleteDecoder);
-      OpInfo.addField(bitStart, bitWidth, 0);
-
-      NumberedInsnOperands[Name].push_back(OpInfo);
-
-      // FIXME: For complex operands with custom decoders we can't handle tied
-      // sub-operands automatically. Skip those here and assume that this is
-      // fixed up elsewhere.
-      if (CGI.Operands[SO.first].MIOperandInfo &&
-          CGI.Operands[SO.first].MIOperandInfo->getNumArgs() > 1 &&
-          String && String->getValue() != "")
-        NumberedInsnOperandsNoTie.insert(Name);
-    }
-  }
-
-  // For each operand, see if we can figure out where it is encoded.
-  for (const auto &Op : InOutOperands) {
-    if (!NumberedInsnOperands[std::string(Op.second)].empty()) {
-      llvm::append_range(InsnOperands,
-                         NumberedInsnOperands[std::string(Op.second)]);
-      continue;
-    }
-    if (!NumberedInsnOperands[TiedNames[std::string(Op.second)]].empty()) {
-      if (!NumberedInsnOperandsNoTie.count(TiedNames[std::string(Op.second)])) {
-        // Figure out to which (sub)operand we're tied.
-        unsigned i =
-            CGI.Operands.getOperandNamed(TiedNames[std::string(Op.second)]);
-        int tiedTo = CGI.Operands[i].getTiedRegister();
-        if (tiedTo == -1) {
-          i = CGI.Operands.getOperandNamed(Op.second);
-          tiedTo = CGI.Operands[i].getTiedRegister();
-        }
-
-        if (tiedTo != -1) {
-          std::pair<unsigned, unsigned> SO =
-            CGI.Operands.getSubOperandNumber(tiedTo);
-
-          InsnOperands.push_back(
-              NumberedInsnOperands[TiedNames[std::string(Op.second)]]
-                                  [SO.second]);
-        }
-      }
-      continue;
-    }
-
-    TypedInit *TI = cast<TypedInit>(Op.first);
-
-    // At this point, we can locate the decoder field, but we need to know how
-    // to interpret it.  As a first step, require the target to provide
-    // callbacks for decoding register classes.
-    std::string Decoder = findOperandDecoderMethod(TI);
-    Record *TypeRecord = cast<DefInit>(TI)->getDef();
-
-    RecordVal *HasCompleteDecoderVal =
-      TypeRecord->getValue("hasCompleteDecoder");
-    BitInit *HasCompleteDecoderBit = HasCompleteDecoderVal ?
-      dyn_cast<BitInit>(HasCompleteDecoderVal->getValue()) : nullptr;
-    bool HasCompleteDecoder = HasCompleteDecoderBit ?
-      HasCompleteDecoderBit->getValue() : true;
-
-    OperandInfo OpInfo(Decoder, HasCompleteDecoder);
-
-    // Some bits of the operand may be required to be 1 depending on the
-    // instruction's encoding. Collect those bits.
-    if (const RecordVal *EncodedValue = EncodingDef.getValue(Op.second))
-      if (const BitsInit *OpBits = dyn_cast<BitsInit>(EncodedValue->getValue()))
-        for (unsigned I = 0; I < OpBits->getNumBits(); ++I)
-          if (const BitInit *OpBit = dyn_cast<BitInit>(OpBits->getBit(I)))
-            if (OpBit->getValue())
-              OpInfo.InitValue |= 1ULL << I;
-
-    unsigned Base = ~0U;
-    unsigned Width = 0;
-    unsigned Offset = 0;
-
-    for (unsigned bi = 0; bi < Bits.getNumBits(); ++bi) {
-      VarInit *Var = nullptr;
-      VarBitInit *BI = dyn_cast<VarBitInit>(Bits.getBit(bi));
-      if (BI)
-        Var = dyn_cast<VarInit>(BI->getBitVar());
-      else
-        Var = dyn_cast<VarInit>(Bits.getBit(bi));
-
-      if (!Var) {
-        if (Base != ~0U) {
-          OpInfo.addField(Base, Width, Offset);
-          Base = ~0U;
-          Width = 0;
-          Offset = 0;
-        }
-        continue;
-      }
-
-      if (Var->getName() != Op.second &&
-          Var->getName() != TiedNames[std::string(Op.second)]) {
-        if (Base != ~0U) {
-          OpInfo.addField(Base, Width, Offset);
-          Base = ~0U;
-          Width = 0;
-          Offset = 0;
-        }
-        continue;
-      }
-
-      if (Base == ~0U) {
-        Base = bi;
-        Width = 1;
-        Offset = BI ? BI->getBitNum() : 0;
-      } else if (BI && BI->getBitNum() != Offset + Width) {
-        OpInfo.addField(Base, Width, Offset);
-        Base = bi;
-        Width = 1;
-        Offset = BI->getBitNum();
-      } else {
-        ++Width;
-      }
-    }
-
-    if (Base != ~0U)
-      OpInfo.addField(Base, Width, Offset);
-
-    if (OpInfo.numFields() > 0)
-      InsnOperands.push_back(OpInfo);
-  }
-
-  Operands[Opc] = InsnOperands;
-
-#if 0
-  LLVM_DEBUG({
-      // Dumps the instruction encoding bits.
-      dumpBits(errs(), Bits);
-
-      errs() << '\n';
-
-      // Dumps the list of operand info.
-      for (unsigned i = 0, e = CGI.Operands.size(); i != e; ++i) {
-        const CGIOperandList::OperandInfo &Info = CGI.Operands[i];
-        const std::string &OperandName = Info.Name;
-        const Record &OperandDef = *Info.Rec;
-
-        errs() << "\t" << OperandName << " (" << OperandDef.getName() << ")\n";
-      }
-    });
-#endif
-
-  return true;
-}
-
-// emitFieldFromInstruction - Emit the templated helper function
-// fieldFromInstruction().
-// On Windows we make sure that this function is not inlined when
-// using the VS compiler. It has a bug which causes the function
-// to be optimized out in some circustances. See llvm.org/pr38292
-static void emitFieldFromInstruction(formatted_raw_ostream &OS) {
-  OS << "// Helper functions for extracting fields from encoded instructions.\n"
-     << "// InsnType must either be integral or an APInt-like object that "
-        "must:\n"
-     << "// * be default-constructible and copy-constructible\n"
-     << "// * be constructible from a uint64_t\n"
-     << "// * be constructible from an APInt (this can be private)\n"
-     << "// * Support insertBits(bits, startBit, numBits)\n"
-     << "// * Support extractBitsAsZExtValue(numBits, startBit)\n"
-     << "// * be convertible to bool\n"
-     << "// * Support the ~, &, ==, and != operators with other objects of "
-        "the same type\n"
-     << "// * Support put (<<) to raw_ostream&\n"
-     << "template <typename InsnType>\n"
-     << "#if defined(_MSC_VER) && !defined(__clang__)\n"
-     << "__declspec(noinline)\n"
-     << "#endif\n"
-     << "static std::enable_if_t<std::is_integral<InsnType>::value, InsnType>\n"
-     << "fieldFromInstruction(const InsnType &insn, unsigned startBit,\n"
-     << "                     unsigned numBits) {\n"
-     << "  assert(startBit + numBits <= 64 && \"Cannot support >64-bit "
-        "extractions!\");\n"
-     << "  assert(startBit + numBits <= (sizeof(InsnType) * 8) &&\n"
-     << "         \"Instruction field out of bounds!\");\n"
-     << "  InsnType fieldMask;\n"
-     << "  if (numBits == sizeof(InsnType) * 8)\n"
-     << "    fieldMask = (InsnType)(-1LL);\n"
-     << "  else\n"
-     << "    fieldMask = (((InsnType)1 << numBits) - 1) << startBit;\n"
-     << "  return (insn & fieldMask) >> startBit;\n"
-     << "}\n"
-     << "\n"
-     << "template <typename InsnType>\n"
-     << "static std::enable_if_t<!std::is_integral<InsnType>::value, "
-        "uint64_t>\n"
-     << "fieldFromInstruction(const InsnType &insn, unsigned startBit,\n"
-     << "                     unsigned numBits) {\n"
-     << "  return insn.extractBitsAsZExtValue(numBits, startBit);\n"
-     << "}\n\n";
-}
-
-// emitInsertBits - Emit the templated helper function insertBits().
-static void emitInsertBits(formatted_raw_ostream &OS) {
-  OS << "// Helper function for inserting bits extracted from an encoded "
-        "instruction into\n"
-     << "// a field.\n"
-     << "template <typename InsnType>\n"
-     << "static std::enable_if_t<std::is_integral<InsnType>::value>\n"
-     << "insertBits(InsnType &field, InsnType bits, unsigned startBit, "
-        "unsigned numBits) {\n"
-     << "  assert(startBit + numBits <= sizeof field * 8);\n"
-     << "  field |= (InsnType)bits << startBit;\n"
-     << "}\n"
-     << "\n"
-     << "template <typename InsnType>\n"
-     << "static std::enable_if_t<!std::is_integral<InsnType>::value>\n"
-     << "insertBits(InsnType &field, uint64_t bits, unsigned startBit, "
-        "unsigned numBits) {\n"
-     << "  field.insertBits(bits, startBit, numBits);\n"
-     << "}\n\n";
-}
-
-// emitDecodeInstruction - Emit the templated helper function
-// decodeInstruction().
-static void emitDecodeInstruction(formatted_raw_ostream &OS) {
-  OS << "template <typename InsnType>\n"
-     << "static DecodeStatus decodeInstruction(const uint8_t DecodeTable[], "
-        "MCInst &MI,\n"
-     << "                                      InsnType insn, uint64_t "
-        "Address,\n"
-     << "                                      const void *DisAsm,\n"
-     << "                                      const MCSubtargetInfo &STI) {\n"
-     << "  const FeatureBitset &Bits = STI.getFeatureBits();\n"
-     << "\n"
-     << "  const uint8_t *Ptr = DecodeTable;\n"
-     << "  InsnType CurFieldValue = 0;\n"
-     << "  DecodeStatus S = MCDisassembler::Success;\n"
-     << "  while (true) {\n"
-     << "    ptrdiff_t Loc = Ptr - DecodeTable;\n"
-     << "    switch (*Ptr) {\n"
-     << "    default:\n"
-     << "      errs() << Loc << \": Unexpected decode table opcode!\\n\";\n"
-     << "      return MCDisassembler::Fail;\n"
-     << "    case MCD::OPC_ExtractField: {\n"
-     << "      unsigned Start = *++Ptr;\n"
-     << "      unsigned Len = *++Ptr;\n"
-     << "      ++Ptr;\n"
-     << "      CurFieldValue = fieldFromInstruction(insn, Start, Len);\n"
-     << "      LLVM_DEBUG(dbgs() << Loc << \": OPC_ExtractField(\" << Start << "
-        "\", \"\n"
-     << "                   << Len << \"): \" << CurFieldValue << \"\\n\");\n"
-     << "      break;\n"
-     << "    }\n"
-     << "    case MCD::OPC_FilterValue: {\n"
-     << "      // Decode the field value.\n"
-     << "      unsigned Len;\n"
-     << "      InsnType Val = decodeULEB128(++Ptr, &Len);\n"
-     << "      Ptr += Len;\n"
-     << "      // NumToSkip is a plain 24-bit integer.\n"
-     << "      unsigned NumToSkip = *Ptr++;\n"
-     << "      NumToSkip |= (*Ptr++) << 8;\n"
-     << "      NumToSkip |= (*Ptr++) << 16;\n"
-     << "\n"
-     << "      // Perform the filter operation.\n"
-     << "      if (Val != CurFieldValue)\n"
-     << "        Ptr += NumToSkip;\n"
-     << "      LLVM_DEBUG(dbgs() << Loc << \": OPC_FilterValue(\" << Val << "
-        "\", \" << NumToSkip\n"
-     << "                   << \"): \" << ((Val != CurFieldValue) ? \"FAIL:\" "
-        ": \"PASS:\")\n"
-     << "                   << \" continuing at \" << (Ptr - DecodeTable) << "
-        "\"\\n\");\n"
-     << "\n"
-     << "      break;\n"
-     << "    }\n"
-     << "    case MCD::OPC_CheckField: {\n"
-     << "      unsigned Start = *++Ptr;\n"
-     << "      unsigned Len = *++Ptr;\n"
-     << "      InsnType FieldValue = fieldFromInstruction(insn, Start, Len);\n"
-     << "      // Decode the field value.\n"
-     << "      InsnType ExpectedValue = decodeULEB128(++Ptr, &Len);\n"
-     << "      Ptr += Len;\n"
-     << "      // NumToSkip is a plain 24-bit integer.\n"
-     << "      unsigned NumToSkip = *Ptr++;\n"
-     << "      NumToSkip |= (*Ptr++) << 8;\n"
-     << "      NumToSkip |= (*Ptr++) << 16;\n"
-     << "\n"
-     << "      // If the actual and expected values don't match, skip.\n"
-     << "      if (ExpectedValue != FieldValue)\n"
-     << "        Ptr += NumToSkip;\n"
-     << "      LLVM_DEBUG(dbgs() << Loc << \": OPC_CheckField(\" << Start << "
-        "\", \"\n"
-     << "                   << Len << \", \" << ExpectedValue << \", \" << "
-        "NumToSkip\n"
-     << "                   << \"): FieldValue = \" << FieldValue << \", "
-        "ExpectedValue = \"\n"
-     << "                   << ExpectedValue << \": \"\n"
-     << "                   << ((ExpectedValue == FieldValue) ? \"PASS\\n\" : "
-        "\"FAIL\\n\"));\n"
-     << "      break;\n"
-     << "    }\n"
-     << "    case MCD::OPC_CheckPredicate: {\n"
-     << "      unsigned Len;\n"
-     << "      // Decode the Predicate Index value.\n"
-     << "      unsigned PIdx = decodeULEB128(++Ptr, &Len);\n"
-     << "      Ptr += Len;\n"
-     << "      // NumToSkip is a plain 24-bit integer.\n"
-     << "      unsigned NumToSkip = *Ptr++;\n"
-     << "      NumToSkip |= (*Ptr++) << 8;\n"
-     << "      NumToSkip |= (*Ptr++) << 16;\n"
-     << "      // Check the predicate.\n"
-     << "      bool Pred;\n"
-     << "      if (!(Pred = checkDecoderPredicate(PIdx, Bits)))\n"
-     << "        Ptr += NumToSkip;\n"
-     << "      (void)Pred;\n"
-     << "      LLVM_DEBUG(dbgs() << Loc << \": OPC_CheckPredicate(\" << PIdx "
-        "<< \"): \"\n"
-     << "            << (Pred ? \"PASS\\n\" : \"FAIL\\n\"));\n"
-     << "\n"
-     << "      break;\n"
-     << "    }\n"
-     << "    case MCD::OPC_Decode: {\n"
-     << "      unsigned Len;\n"
-     << "      // Decode the Opcode value.\n"
-     << "      unsigned Opc = decodeULEB128(++Ptr, &Len);\n"
-     << "      Ptr += Len;\n"
-     << "      unsigned DecodeIdx = decodeULEB128(Ptr, &Len);\n"
-     << "      Ptr += Len;\n"
-     << "\n"
-     << "      MI.clear();\n"
-     << "      MI.setOpcode(Opc);\n"
-     << "      bool DecodeComplete;\n"
-     << "      S = decodeToMCInst(S, DecodeIdx, insn, MI, Address, DisAsm, "
-        "DecodeComplete);\n"
-     << "      assert(DecodeComplete);\n"
-     << "\n"
-     << "      LLVM_DEBUG(dbgs() << Loc << \": OPC_Decode: opcode \" << Opc\n"
-     << "                   << \", using decoder \" << DecodeIdx << \": \"\n"
-     << "                   << (S != MCDisassembler::Fail ? \"PASS\" : "
-        "\"FAIL\") << \"\\n\");\n"
-     << "      return S;\n"
-     << "    }\n"
-     << "    case MCD::OPC_TryDecode: {\n"
-     << "      unsigned Len;\n"
-     << "      // Decode the Opcode value.\n"
-     << "      unsigned Opc = decodeULEB128(++Ptr, &Len);\n"
-     << "      Ptr += Len;\n"
-     << "      unsigned DecodeIdx = decodeULEB128(Ptr, &Len);\n"
-     << "      Ptr += Len;\n"
-     << "      // NumToSkip is a plain 24-bit integer.\n"
-     << "      unsigned NumToSkip = *Ptr++;\n"
-     << "      NumToSkip |= (*Ptr++) << 8;\n"
-     << "      NumToSkip |= (*Ptr++) << 16;\n"
-     << "\n"
-     << "      // Perform the decode operation.\n"
-     << "      MCInst TmpMI;\n"
-     << "      TmpMI.setOpcode(Opc);\n"
-     << "      bool DecodeComplete;\n"
-     << "      S = decodeToMCInst(S, DecodeIdx, insn, TmpMI, Address, DisAsm, "
-        "DecodeComplete);\n"
-     << "      LLVM_DEBUG(dbgs() << Loc << \": OPC_TryDecode: opcode \" << "
-        "Opc\n"
-     << "                   << \", using decoder \" << DecodeIdx << \": \");\n"
-     << "\n"
-     << "      if (DecodeComplete) {\n"
-     << "        // Decoding complete.\n"
-     << "        LLVM_DEBUG(dbgs() << (S != MCDisassembler::Fail ? \"PASS\" : "
-        "\"FAIL\") << \"\\n\");\n"
-     << "        MI = TmpMI;\n"
-     << "        return S;\n"
-     << "      } else {\n"
-     << "        assert(S == MCDisassembler::Fail);\n"
-     << "        // If the decoding was incomplete, skip.\n"
-     << "        Ptr += NumToSkip;\n"
-     << "        LLVM_DEBUG(dbgs() << \"FAIL: continuing at \" << (Ptr - "
-        "DecodeTable) << \"\\n\");\n"
-     << "        // Reset decode status. This also drops a SoftFail status "
-        "that could be\n"
-     << "        // set before the decode attempt.\n"
-     << "        S = MCDisassembler::Success;\n"
-     << "      }\n"
-     << "      break;\n"
-     << "    }\n"
-     << "    case MCD::OPC_SoftFail: {\n"
-     << "      // Decode the mask values.\n"
-     << "      unsigned Len;\n"
-     << "      InsnType PositiveMask = decodeULEB128(++Ptr, &Len);\n"
-     << "      Ptr += Len;\n"
-     << "      InsnType NegativeMask = decodeULEB128(Ptr, &Len);\n"
-     << "      Ptr += Len;\n"
-     << "      bool Fail = (insn & PositiveMask) || (~insn & NegativeMask);\n"
-     << "      if (Fail)\n"
-     << "        S = MCDisassembler::SoftFail;\n"
-     << "      LLVM_DEBUG(dbgs() << Loc << \": OPC_SoftFail: \" << (Fail ? "
-        "\"FAIL\\n\" : \"PASS\\n\"));\n"
-     << "      break;\n"
-     << "    }\n"
-     << "    case MCD::OPC_Fail: {\n"
-     << "      LLVM_DEBUG(dbgs() << Loc << \": OPC_Fail\\n\");\n"
-     << "      return MCDisassembler::Fail;\n"
-     << "    }\n"
-     << "    }\n"
-     << "  }\n"
-     << "  llvm_unreachable(\"bogosity detected in disassembler state "
-        "machine!\");\n"
-     << "}\n\n";
-}
-
-// Emits disassembler code for instruction decoding.
-void FixedLenDecoderEmitter::run(raw_ostream &o) {
-  formatted_raw_ostream OS(o);
-  OS << "#include \"llvm/MC/MCInst.h\"\n";
-  OS << "#include \"llvm/Support/DataTypes.h\"\n";
-  OS << "#include \"llvm/Support/Debug.h\"\n";
-  OS << "#include \"llvm/Support/LEB128.h\"\n";
-  OS << "#include \"llvm/Support/raw_ostream.h\"\n";
-  OS << "#include <assert.h>\n";
-  OS << '\n';
-  OS << "namespace llvm {\n\n";
-
-  emitFieldFromInstruction(OS);
-  emitInsertBits(OS);
-
-  Target.reverseBitsForLittleEndianEncoding();
-
-  // Parameterize the decoders based on namespace and instruction width.
-  std::set<StringRef> HwModeNames;
-  const auto &NumberedInstructions = Target.getInstructionsByEnumValue();
-  NumberedEncodings.reserve(NumberedInstructions.size());
-  DenseMap<Record *, unsigned> IndexOfInstruction;
-  // First, collect all HwModes referenced by the target.
-  for (const auto &NumberedInstruction : NumberedInstructions) {
-    IndexOfInstruction[NumberedInstruction->TheDef] = NumberedEncodings.size();
-
-    if (const RecordVal *RV =
-            NumberedInstruction->TheDef->getValue("EncodingInfos")) {
-      if (auto *DI = dyn_cast_or_null<DefInit>(RV->getValue())) {
-        const CodeGenHwModes &HWM = Target.getHwModes();
-        EncodingInfoByHwMode EBM(DI->getDef(), HWM);
-        for (auto &KV : EBM)
-          HwModeNames.insert(HWM.getMode(KV.first).Name);
-      }
-    }
-  }
-
-  // If HwModeNames is empty, add the empty string so we always have one HwMode.
-  if (HwModeNames.empty())
-    HwModeNames.insert("");
-
-  for (const auto &NumberedInstruction : NumberedInstructions) {
-    IndexOfInstruction[NumberedInstruction->TheDef] = NumberedEncodings.size();
-
-    if (const RecordVal *RV =
-            NumberedInstruction->TheDef->getValue("EncodingInfos")) {
-      if (DefInit *DI = dyn_cast_or_null<DefInit>(RV->getValue())) {
-        const CodeGenHwModes &HWM = Target.getHwModes();
-        EncodingInfoByHwMode EBM(DI->getDef(), HWM);
-        for (auto &KV : EBM) {
-          NumberedEncodings.emplace_back(KV.second, NumberedInstruction,
-                                         HWM.getMode(KV.first).Name);
-          HwModeNames.insert(HWM.getMode(KV.first).Name);
-        }
-        continue;
-      }
-    }
-    // This instruction is encoded the same on all HwModes. Emit it for all
-    // HwModes.
-    for (StringRef HwModeName : HwModeNames)
-      NumberedEncodings.emplace_back(NumberedInstruction->TheDef,
-                                     NumberedInstruction, HwModeName);
-  }
-  for (const auto &NumberedAlias : RK.getAllDerivedDefinitions("AdditionalEncoding"))
-    NumberedEncodings.emplace_back(
-        NumberedAlias,
-        &Target.getInstruction(NumberedAlias->getValueAsDef("AliasOf")));
-
-  std::map<std::pair<std::string, unsigned>, std::vector<EncodingIDAndOpcode>>
-      OpcMap;
-  std::map<unsigned, std::vector<OperandInfo>> Operands;
-
-  for (unsigned i = 0; i < NumberedEncodings.size(); ++i) {
-    const Record *EncodingDef = NumberedEncodings[i].EncodingDef;
-    const CodeGenInstruction *Inst = NumberedEncodings[i].Inst;
-    const Record *Def = Inst->TheDef;
-    unsigned Size = EncodingDef->getValueAsInt("Size");
-    if (Def->getValueAsString("Namespace") == "TargetOpcode" ||
-        Def->getValueAsBit("isPseudo") ||
-        Def->getValueAsBit("isAsmParserOnly") ||
-        Def->getValueAsBit("isCodeGenOnly")) {
-      NumEncodingsLackingDisasm++;
-      continue;
-    }
-
-    if (i < NumberedInstructions.size())
-      NumInstructions++;
-    NumEncodings++;
-
-    if (!Size)
-      continue;
-
-    if (populateInstruction(Target, *EncodingDef, *Inst, i, Operands)) {
-      std::string DecoderNamespace =
-          std::string(EncodingDef->getValueAsString("DecoderNamespace"));
-      if (!NumberedEncodings[i].HwModeName.empty())
-        DecoderNamespace +=
-            std::string("_") + NumberedEncodings[i].HwModeName.str();
-      OpcMap[std::make_pair(DecoderNamespace, Size)].emplace_back(
-          i, IndexOfInstruction.find(Def)->second);
-    } else {
-      NumEncodingsOmitted++;
-    }
-  }
-
-  DecoderTableInfo TableInfo;
-  for (const auto &Opc : OpcMap) {
-    // Emit the decoder for this namespace+width combination.
-    ArrayRef<EncodingAndInst> NumberedEncodingsRef(
-        NumberedEncodings.data(), NumberedEncodings.size());
-    FilterChooser FC(NumberedEncodingsRef, Opc.second, Operands,
-                     8 * Opc.first.second, this);
-
-    // The decode table is cleared for each top level decoder function. The
-    // predicates and decoders themselves, however, are shared across all
-    // decoders to give more opportunities for uniqueing.
-    TableInfo.Table.clear();
-    TableInfo.FixupStack.clear();
-    TableInfo.Table.reserve(16384);
-    TableInfo.FixupStack.emplace_back();
-    FC.emitTableEntries(TableInfo);
-    // Any NumToSkip fixups in the top level scope can resolve to the
-    // OPC_Fail at the end of the table.
-    assert(TableInfo.FixupStack.size() == 1 && "fixup stack phasing error!");
-    // Resolve any NumToSkip fixups in the current scope.
-    resolveTableFixups(TableInfo.Table, TableInfo.FixupStack.back(),
-                       TableInfo.Table.size());
-    TableInfo.FixupStack.clear();
-
-    TableInfo.Table.push_back(MCD::OPC_Fail);
-
-    // Print the table to the output stream.
-    emitTable(OS, TableInfo.Table, 0, FC.getBitWidth(), Opc.first.first);
-    OS.flush();
-  }
-
-  // Emit the predicate function.
-  emitPredicateFunction(OS, TableInfo.Predicates, 0);
-
-  // Emit the decoder function.
-  emitDecoderFunction(OS, TableInfo.Decoders, 0);
-
-  // Emit the main entry point for the decoder, decodeInstruction().
-  emitDecodeInstruction(OS);
-
-  OS << "\n} // end namespace llvm\n";
-}
-
-namespace llvm {
-
-void EmitFixedLenDecoder(RecordKeeper &RK, raw_ostream &OS,
-                         const std::string &PredicateNamespace,
-                         const std::string &GPrefix,
-                         const std::string &GPostfix, const std::string &ROK,
-                         const std::string &RFail, const std::string &L) {
-  FixedLenDecoderEmitter(RK, PredicateNamespace, GPrefix, GPostfix,
-                         ROK, RFail, L).run(OS);
-}
-
-} // end namespace llvm
diff --git a/gnu/llvm/llvm/utils/TableGen/RISCVCompressInstEmitter.cpp b/gnu/llvm/llvm/utils/TableGen/RISCVCompressInstEmitter.cpp
deleted file mode 100644
index e931801f82a..00000000000
--- a/gnu/llvm/llvm/utils/TableGen/RISCVCompressInstEmitter.cpp
+++ /dev/null
@@ -1,893 +0,0 @@
-//===- RISCVCompressInstEmitter.cpp - Generator for RISCV Compression -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-// RISCVCompressInstEmitter implements a tablegen-driven CompressPat based
-// RISCV Instruction Compression mechanism.
-//
-//===--------------------------------------------------------------===//
-//
-// RISCVCompressInstEmitter implements a tablegen-driven CompressPat Instruction
-// Compression mechanism for generating RISCV compressed instructions
-// (C ISA Extension) from the expanded instruction form.
-
-// This tablegen backend processes CompressPat declarations in a
-// td file and generates all the required checks to validate the pattern
-// declarations; validate the input and output operands to generate the correct
-// compressed instructions. The checks include validating  different types of
-// operands; register operands, immediate operands, fixed register and fixed
-// immediate inputs.
-//
-// Example:
-// class CompressPat<dag input, dag output> {
-//   dag Input  = input;
-//   dag Output    = output;
-//   list<Predicate> Predicates = [];
-// }
-//
-// let Predicates = [HasStdExtC] in {
-// def : CompressPat<(ADD GPRNoX0:$rs1, GPRNoX0:$rs1, GPRNoX0:$rs2),
-//                   (C_ADD GPRNoX0:$rs1, GPRNoX0:$rs2)>;
-// }
-//
-// The result is an auto-generated header file
-// 'RISCVGenCompressInstEmitter.inc' which exports two functions for
-// compressing/uncompressing MCInst instructions, plus
-// some helper functions:
-//
-// bool compressInst(MCInst &OutInst, const MCInst &MI,
-//                   const MCSubtargetInfo &STI,
-//                   MCContext &Context);
-//
-// bool uncompressInst(MCInst &OutInst, const MCInst &MI,
-//                     const MCRegisterInfo &MRI,
-//                     const MCSubtargetInfo &STI);
-//
-// In addition, it exports a function for checking whether
-// an instruction is compressable:
-//
-// bool isCompressibleInst(const MachineInstr& MI,
-//                           const RISCVSubtarget *Subtarget,
-//                           const MCRegisterInfo &MRI,
-//                           const MCSubtargetInfo &STI);
-//
-// The clients that include this auto-generated header file and
-// invoke these functions can compress an instruction before emitting
-// it in the target-specific ASM or ELF streamer or can uncompress
-// an instruction before printing it when the expanded instruction
-// format aliases is favored.
-
-//===----------------------------------------------------------------------===//
-
-#include "CodeGenInstruction.h"
-#include "CodeGenTarget.h"
-#include "llvm/ADT/IndexedMap.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/StringExtras.h"
-#include "llvm/ADT/StringMap.h"
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/ErrorHandling.h"
-#include "llvm/TableGen/Error.h"
-#include "llvm/TableGen/Record.h"
-#include "llvm/TableGen/TableGenBackend.h"
-#include <set>
-#include <vector>
-using namespace llvm;
-
-#define DEBUG_TYPE "compress-inst-emitter"
-
-namespace {
-class RISCVCompressInstEmitter {
-  struct OpData {
-    enum MapKind { Operand, Imm, Reg };
-    MapKind Kind;
-    union {
-      unsigned Operand; // Operand number mapped to.
-      int64_t Imm;      // Integer immediate value.
-      Record *Reg;      // Physical register.
-    } Data;
-    int TiedOpIdx = -1; // Tied operand index within the instruction.
-  };
-  struct CompressPat {
-    CodeGenInstruction Source; // The source instruction definition.
-    CodeGenInstruction Dest;   // The destination instruction to transform to.
-    std::vector<Record *>
-        PatReqFeatures; // Required target features to enable pattern.
-    IndexedMap<OpData>
-        SourceOperandMap; // Maps operands in the Source Instruction to
-                          // the corresponding Dest instruction operand.
-    IndexedMap<OpData>
-        DestOperandMap; // Maps operands in the Dest Instruction
-                        // to the corresponding Source instruction operand.
-    bool IsCompressOnly;
-    CompressPat(CodeGenInstruction &S, CodeGenInstruction &D,
-                std::vector<Record *> RF, IndexedMap<OpData> &SourceMap,
-                IndexedMap<OpData> &DestMap, bool IsCompressOnly)
-        : Source(S), Dest(D), PatReqFeatures(RF), SourceOperandMap(SourceMap),
-          DestOperandMap(DestMap), IsCompressOnly(IsCompressOnly) {}
-  };
-  enum EmitterType { Compress, Uncompress, CheckCompress };
-  RecordKeeper &Records;
-  CodeGenTarget Target;
-  SmallVector<CompressPat, 4> CompressPatterns;
-
-  void addDagOperandMapping(Record *Rec, DagInit *Dag, CodeGenInstruction &Inst,
-                            IndexedMap<OpData> &OperandMap, bool IsSourceInst);
-  void evaluateCompressPat(Record *Compress);
-  void emitCompressInstEmitter(raw_ostream &o, EmitterType EType);
-  bool validateTypes(Record *SubType, Record *Type, bool IsSourceInst);
-  bool validateRegister(Record *Reg, Record *RegClass);
-  void createDagOperandMapping(Record *Rec, StringMap<unsigned> &SourceOperands,
-                               StringMap<unsigned> &DestOperands,
-                               DagInit *SourceDag, DagInit *DestDag,
-                               IndexedMap<OpData> &SourceOperandMap);
-
-  void createInstOperandMapping(Record *Rec, DagInit *SourceDag,
-                                DagInit *DestDag,
-                                IndexedMap<OpData> &SourceOperandMap,
-                                IndexedMap<OpData> &DestOperandMap,
-                                StringMap<unsigned> &SourceOperands,
-                                CodeGenInstruction &DestInst);
-
-public:
-  RISCVCompressInstEmitter(RecordKeeper &R) : Records(R), Target(R) {}
-
-  void run(raw_ostream &o);
-};
-} // End anonymous namespace.
-
-bool RISCVCompressInstEmitter::validateRegister(Record *Reg, Record *RegClass) {
-  assert(Reg->isSubClassOf("Register") && "Reg record should be a Register");
-  assert(RegClass->isSubClassOf("RegisterClass") &&
-         "RegClass record should be a RegisterClass");
-  const CodeGenRegisterClass &RC = Target.getRegisterClass(RegClass);
-  const CodeGenRegister *R = Target.getRegisterByName(Reg->getName().lower());
-  assert((R != nullptr) && "Register not defined!!");
-  return RC.contains(R);
-}
-
-bool RISCVCompressInstEmitter::validateTypes(Record *DagOpType,
-                                             Record *InstOpType,
-                                             bool IsSourceInst) {
-  if (DagOpType == InstOpType)
-    return true;
-  // Only source instruction operands are allowed to not match Input Dag
-  // operands.
-  if (!IsSourceInst)
-    return false;
-
-  if (DagOpType->isSubClassOf("RegisterClass") &&
-      InstOpType->isSubClassOf("RegisterClass")) {
-    const CodeGenRegisterClass &RC = Target.getRegisterClass(InstOpType);
-    const CodeGenRegisterClass &SubRC = Target.getRegisterClass(DagOpType);
-    return RC.hasSubClass(&SubRC);
-  }
-
-  // At this point either or both types are not registers, reject the pattern.
-  if (DagOpType->isSubClassOf("RegisterClass") ||
-      InstOpType->isSubClassOf("RegisterClass"))
-    return false;
-
-  // Let further validation happen when compress()/uncompress() functions are
-  // invoked.
-  LLVM_DEBUG(dbgs() << (IsSourceInst ? "Input" : "Output")
-                    << " Dag Operand Type: '" << DagOpType->getName()
-                    << "' and "
-                    << "Instruction Operand Type: '" << InstOpType->getName()
-                    << "' can't be checked at pattern validation time!\n");
-  return true;
-}
-
-/// The patterns in the Dag contain different types of operands:
-/// Register operands, e.g.: GPRC:$rs1; Fixed registers, e.g: X1; Immediate
-/// operands, e.g.: simm6:$imm; Fixed immediate operands, e.g.: 0. This function
-/// maps Dag operands to its corresponding instruction operands. For register
-/// operands and fixed registers it expects the Dag operand type to be contained
-/// in the instantiated instruction operand type. For immediate operands and
-/// immediates no validation checks are enforced at pattern validation time.
-void RISCVCompressInstEmitter::addDagOperandMapping(
-    Record *Rec, DagInit *Dag, CodeGenInstruction &Inst,
-    IndexedMap<OpData> &OperandMap, bool IsSourceInst) {
-  // TiedCount keeps track of the number of operands skipped in Inst
-  // operands list to get to the corresponding Dag operand. This is
-  // necessary because the number of operands in Inst might be greater
-  // than number of operands in the Dag due to how tied operands
-  // are represented.
-  unsigned TiedCount = 0;
-  for (unsigned i = 0, e = Inst.Operands.size(); i != e; ++i) {
-    int TiedOpIdx = Inst.Operands[i].getTiedRegister();
-    if (-1 != TiedOpIdx) {
-      // Set the entry in OperandMap for the tied operand we're skipping.
-      OperandMap[i].Kind = OperandMap[TiedOpIdx].Kind;
-      OperandMap[i].Data = OperandMap[TiedOpIdx].Data;
-      TiedCount++;
-      continue;
-    }
-    if (DefInit *DI = dyn_cast<DefInit>(Dag->getArg(i - TiedCount))) {
-      if (DI->getDef()->isSubClassOf("Register")) {
-        // Check if the fixed register belongs to the Register class.
-        if (!validateRegister(DI->getDef(), Inst.Operands[i].Rec))
-          PrintFatalError(Rec->getLoc(),
-                          "Error in Dag '" + Dag->getAsString() +
-                              "'Register: '" + DI->getDef()->getName() +
-                              "' is not in register class '" +
-                              Inst.Operands[i].Rec->getName() + "'");
-        OperandMap[i].Kind = OpData::Reg;
-        OperandMap[i].Data.Reg = DI->getDef();
-        continue;
-      }
-      // Validate that Dag operand type matches the type defined in the
-      // corresponding instruction. Operands in the input Dag pattern are
-      // allowed to be a subclass of the type specified in corresponding
-      // instruction operand instead of being an exact match.
-      if (!validateTypes(DI->getDef(), Inst.Operands[i].Rec, IsSourceInst))
-        PrintFatalError(Rec->getLoc(),
-                        "Error in Dag '" + Dag->getAsString() + "'. Operand '" +
-                            Dag->getArgNameStr(i - TiedCount) + "' has type '" +
-                            DI->getDef()->getName() +
-                            "' which does not match the type '" +
-                            Inst.Operands[i].Rec->getName() +
-                            "' in the corresponding instruction operand!");
-
-      OperandMap[i].Kind = OpData::Operand;
-    } else if (IntInit *II = dyn_cast<IntInit>(Dag->getArg(i - TiedCount))) {
-      // Validate that corresponding instruction operand expects an immediate.
-      if (Inst.Operands[i].Rec->isSubClassOf("RegisterClass"))
-        PrintFatalError(
-            Rec->getLoc(),
-            "Error in Dag '" + Dag->getAsString() + "' Found immediate: '" +
-                II->getAsString() +
-                "' but corresponding instruction operand expected a register!");
-      // No pattern validation check possible for values of fixed immediate.
-      OperandMap[i].Kind = OpData::Imm;
-      OperandMap[i].Data.Imm = II->getValue();
-      LLVM_DEBUG(
-          dbgs() << "  Found immediate '" << II->getValue() << "' at "
-                 << (IsSourceInst ? "input " : "output ")
-                 << "Dag. No validation time check possible for values of "
-                    "fixed immediate.\n");
-    } else
-      llvm_unreachable("Unhandled CompressPat argument type!");
-  }
-}
-
-// Verify the Dag operand count is enough to build an instruction.
-static bool verifyDagOpCount(CodeGenInstruction &Inst, DagInit *Dag,
-                             bool IsSource) {
-  if (Dag->getNumArgs() == Inst.Operands.size())
-    return true;
-  // Source instructions are non compressed instructions and don't have tied
-  // operands.
-  if (IsSource)
-    PrintFatalError(Inst.TheDef->getLoc(),
-                    "Input operands for Inst '" + Inst.TheDef->getName() +
-                        "' and input Dag operand count mismatch");
-  // The Dag can't have more arguments than the Instruction.
-  if (Dag->getNumArgs() > Inst.Operands.size())
-    PrintFatalError(Inst.TheDef->getLoc(),
-                    "Inst '" + Inst.TheDef->getName() +
-                        "' and Dag operand count mismatch");
-
-  // The Instruction might have tied operands so the Dag might have
-  //  a fewer operand count.
-  unsigned RealCount = Inst.Operands.size();
-  for (const auto &Operand : Inst.Operands)
-    if (Operand.getTiedRegister() != -1)
-      --RealCount;
-
-  if (Dag->getNumArgs() != RealCount)
-    PrintFatalError(Inst.TheDef->getLoc(),
-                    "Inst '" + Inst.TheDef->getName() +
-                        "' and Dag operand count mismatch");
-  return true;
-}
-
-static bool validateArgsTypes(Init *Arg1, Init *Arg2) {
-  return cast<DefInit>(Arg1)->getDef() == cast<DefInit>(Arg2)->getDef();
-}
-
-// Creates a mapping between the operand name in the Dag (e.g. $rs1) and
-// its index in the list of Dag operands and checks that operands with the same
-// name have the same types. For example in 'C_ADD $rs1, $rs2' we generate the
-// mapping $rs1 --> 0, $rs2 ---> 1. If the operand appears twice in the (tied)
-// same Dag we use the last occurrence for indexing.
-void RISCVCompressInstEmitter::createDagOperandMapping(
-    Record *Rec, StringMap<unsigned> &SourceOperands,
-    StringMap<unsigned> &DestOperands, DagInit *SourceDag, DagInit *DestDag,
-    IndexedMap<OpData> &SourceOperandMap) {
-  for (unsigned i = 0; i < DestDag->getNumArgs(); ++i) {
-    // Skip fixed immediates and registers, they were handled in
-    // addDagOperandMapping.
-    if ("" == DestDag->getArgNameStr(i))
-      continue;
-    DestOperands[DestDag->getArgNameStr(i)] = i;
-  }
-
-  for (unsigned i = 0; i < SourceDag->getNumArgs(); ++i) {
-    // Skip fixed immediates and registers, they were handled in
-    // addDagOperandMapping.
-    if ("" == SourceDag->getArgNameStr(i))
-      continue;
-
-    StringMap<unsigned>::iterator it =
-        SourceOperands.find(SourceDag->getArgNameStr(i));
-    if (it != SourceOperands.end()) {
-      // Operand sharing the same name in the Dag should be mapped as tied.
-      SourceOperandMap[i].TiedOpIdx = it->getValue();
-      if (!validateArgsTypes(SourceDag->getArg(it->getValue()),
-                             SourceDag->getArg(i)))
-        PrintFatalError(Rec->getLoc(),
-                        "Input Operand '" + SourceDag->getArgNameStr(i) +
-                            "' has a mismatched tied operand!\n");
-    }
-    it = DestOperands.find(SourceDag->getArgNameStr(i));
-    if (it == DestOperands.end())
-      PrintFatalError(Rec->getLoc(), "Operand " + SourceDag->getArgNameStr(i) +
-                                         " defined in Input Dag but not used in"
-                                         " Output Dag!\n");
-    // Input Dag operand types must match output Dag operand type.
-    if (!validateArgsTypes(DestDag->getArg(it->getValue()),
-                           SourceDag->getArg(i)))
-      PrintFatalError(Rec->getLoc(), "Type mismatch between Input and "
-                                     "Output Dag operand '" +
-                                         SourceDag->getArgNameStr(i) + "'!");
-    SourceOperands[SourceDag->getArgNameStr(i)] = i;
-  }
-}
-
-/// Map operand names in the Dag to their index in both corresponding input and
-/// output instructions. Validate that operands defined in the input are
-/// used in the output pattern while populating the maps.
-void RISCVCompressInstEmitter::createInstOperandMapping(
-    Record *Rec, DagInit *SourceDag, DagInit *DestDag,
-    IndexedMap<OpData> &SourceOperandMap, IndexedMap<OpData> &DestOperandMap,
-    StringMap<unsigned> &SourceOperands, CodeGenInstruction &DestInst) {
-  // TiedCount keeps track of the number of operands skipped in Inst
-  // operands list to get to the corresponding Dag operand.
-  unsigned TiedCount = 0;
-  LLVM_DEBUG(dbgs() << "  Operand mapping:\n  Source   Dest\n");
-  for (unsigned i = 0, e = DestInst.Operands.size(); i != e; ++i) {
-    int TiedInstOpIdx = DestInst.Operands[i].getTiedRegister();
-    if (TiedInstOpIdx != -1) {
-      ++TiedCount;
-      DestOperandMap[i].Data = DestOperandMap[TiedInstOpIdx].Data;
-      DestOperandMap[i].Kind = DestOperandMap[TiedInstOpIdx].Kind;
-      if (DestOperandMap[i].Kind == OpData::Operand)
-        // No need to fill the SourceOperandMap here since it was mapped to
-        // destination operand 'TiedInstOpIdx' in a previous iteration.
-        LLVM_DEBUG(dbgs() << "    " << DestOperandMap[i].Data.Operand
-                          << " ====> " << i
-                          << "  Dest operand tied with operand '"
-                          << TiedInstOpIdx << "'\n");
-      continue;
-    }
-    // Skip fixed immediates and registers, they were handled in
-    // addDagOperandMapping.
-    if (DestOperandMap[i].Kind != OpData::Operand)
-      continue;
-
-    unsigned DagArgIdx = i - TiedCount;
-    StringMap<unsigned>::iterator SourceOp =
-        SourceOperands.find(DestDag->getArgNameStr(DagArgIdx));
-    if (SourceOp == SourceOperands.end())
-      PrintFatalError(Rec->getLoc(),
-                      "Output Dag operand '" +
-                          DestDag->getArgNameStr(DagArgIdx) +
-                          "' has no matching input Dag operand.");
-
-    assert(DestDag->getArgNameStr(DagArgIdx) ==
-               SourceDag->getArgNameStr(SourceOp->getValue()) &&
-           "Incorrect operand mapping detected!\n");
-    DestOperandMap[i].Data.Operand = SourceOp->getValue();
-    SourceOperandMap[SourceOp->getValue()].Data.Operand = i;
-    LLVM_DEBUG(dbgs() << "    " << SourceOp->getValue() << " ====> " << i
-                      << "\n");
-  }
-}
-
-/// Validates the CompressPattern and create operand mapping.
-/// These are the checks to validate a CompressPat pattern declarations.
-/// Error out with message under these conditions:
-/// - Dag Input opcode is an expanded instruction and Dag Output opcode is a
-///   compressed instruction.
-/// - Operands in Dag Input must be all used in Dag Output.
-///   Register Operand type in Dag Input Type  must be contained in the
-///   corresponding Source Instruction type.
-/// - Register Operand type in Dag Input must be the  same as in  Dag Ouput.
-/// - Register Operand type in  Dag Output must be the same  as the
-///   corresponding Destination Inst type.
-/// - Immediate Operand type in Dag Input must be the same as in Dag Ouput.
-/// - Immediate Operand type in Dag Ouput must be the same as the corresponding
-///   Destination Instruction type.
-/// - Fixed register must be contained in the corresponding Source Instruction
-///   type.
-/// - Fixed register must be contained in the corresponding Destination
-///   Instruction type. Warning message printed under these conditions:
-/// - Fixed immediate in Dag Input or Dag Ouput cannot be checked at this time
-///   and generate warning.
-/// - Immediate operand type in Dag Input differs from the corresponding Source
-///   Instruction type  and generate a warning.
-void RISCVCompressInstEmitter::evaluateCompressPat(Record *Rec) {
-  // Validate input Dag operands.
-  DagInit *SourceDag = Rec->getValueAsDag("Input");
-  assert(SourceDag && "Missing 'Input' in compress pattern!");
-  LLVM_DEBUG(dbgs() << "Input: " << *SourceDag << "\n");
-
-  // Checking we are transforming from compressed to uncompressed instructions.
-  Record *Operator = SourceDag->getOperatorAsDef(Rec->getLoc());
-  if (!Operator->isSubClassOf("RVInst"))
-    PrintFatalError(Rec->getLoc(), "Input instruction '" + Operator->getName() +
-                                       "' is not a 32 bit wide instruction!");
-  CodeGenInstruction SourceInst(Operator);
-  verifyDagOpCount(SourceInst, SourceDag, true);
-
-  // Validate output Dag operands.
-  DagInit *DestDag = Rec->getValueAsDag("Output");
-  assert(DestDag && "Missing 'Output' in compress pattern!");
-  LLVM_DEBUG(dbgs() << "Output: " << *DestDag << "\n");
-
-  Record *DestOperator = DestDag->getOperatorAsDef(Rec->getLoc());
-  if (!DestOperator->isSubClassOf("RVInst16"))
-    PrintFatalError(Rec->getLoc(), "Output instruction  '" +
-                                       DestOperator->getName() +
-                                       "' is not a 16 bit wide instruction!");
-  CodeGenInstruction DestInst(DestOperator);
-  verifyDagOpCount(DestInst, DestDag, false);
-
-  // Fill the mapping from the source to destination instructions.
-
-  IndexedMap<OpData> SourceOperandMap;
-  SourceOperandMap.grow(SourceInst.Operands.size());
-  // Create a mapping between source Dag operands and source Inst operands.
-  addDagOperandMapping(Rec, SourceDag, SourceInst, SourceOperandMap,
-                       /*IsSourceInst*/ true);
-
-  IndexedMap<OpData> DestOperandMap;
-  DestOperandMap.grow(DestInst.Operands.size());
-  // Create a mapping between destination Dag operands and destination Inst
-  // operands.
-  addDagOperandMapping(Rec, DestDag, DestInst, DestOperandMap,
-                       /*IsSourceInst*/ false);
-
-  StringMap<unsigned> SourceOperands;
-  StringMap<unsigned> DestOperands;
-  createDagOperandMapping(Rec, SourceOperands, DestOperands, SourceDag, DestDag,
-                          SourceOperandMap);
-  // Create operand mapping between the source and destination instructions.
-  createInstOperandMapping(Rec, SourceDag, DestDag, SourceOperandMap,
-                           DestOperandMap, SourceOperands, DestInst);
-
-  // Get the target features for the CompressPat.
-  std::vector<Record *> PatReqFeatures;
-  std::vector<Record *> RF = Rec->getValueAsListOfDefs("Predicates");
-  copy_if(RF, std::back_inserter(PatReqFeatures), [](Record *R) {
-    return R->getValueAsBit("AssemblerMatcherPredicate");
-  });
-
-  CompressPatterns.push_back(CompressPat(SourceInst, DestInst, PatReqFeatures,
-                                         SourceOperandMap, DestOperandMap,
-                                         Rec->getValueAsBit("isCompressOnly")));
-}
-
-static void
-getReqFeatures(std::set<std::pair<bool, StringRef>> &FeaturesSet,
-               std::set<std::set<std::pair<bool, StringRef>>> &AnyOfFeatureSets,
-               const std::vector<Record *> &ReqFeatures) {
-  for (auto &R : ReqFeatures) {
-    const DagInit *D = R->getValueAsDag("AssemblerCondDag");
-    std::string CombineType = D->getOperator()->getAsString();
-    if (CombineType != "any_of" && CombineType != "all_of")
-      PrintFatalError(R->getLoc(), "Invalid AssemblerCondDag!");
-    if (D->getNumArgs() == 0)
-      PrintFatalError(R->getLoc(), "Invalid AssemblerCondDag!");
-    bool IsOr = CombineType == "any_of";
-    std::set<std::pair<bool, StringRef>> AnyOfSet;
-
-    for (auto *Arg : D->getArgs()) {
-      bool IsNot = false;
-      if (auto *NotArg = dyn_cast<DagInit>(Arg)) {
-        if (NotArg->getOperator()->getAsString() != "not" ||
-            NotArg->getNumArgs() != 1)
-          PrintFatalError(R->getLoc(), "Invalid AssemblerCondDag!");
-        Arg = NotArg->getArg(0);
-        IsNot = true;
-      }
-      if (!isa<DefInit>(Arg) ||
-          !cast<DefInit>(Arg)->getDef()->isSubClassOf("SubtargetFeature"))
-        PrintFatalError(R->getLoc(), "Invalid AssemblerCondDag!");
-      if (IsOr)
-        AnyOfSet.insert({IsNot, cast<DefInit>(Arg)->getDef()->getName()});
-      else
-        FeaturesSet.insert({IsNot, cast<DefInit>(Arg)->getDef()->getName()});
-    }
-
-    if (IsOr)
-      AnyOfFeatureSets.insert(AnyOfSet);
-  }
-}
-
-static unsigned getPredicates(DenseMap<const Record *, unsigned> &PredicateMap,
-                              std::vector<const Record *> &Predicates,
-                              Record *Rec, StringRef Name) {
-  unsigned &Entry = PredicateMap[Rec];
-  if (Entry)
-    return Entry;
-
-  if (!Rec->isValueUnset(Name)) {
-    Predicates.push_back(Rec);
-    Entry = Predicates.size();
-    return Entry;
-  }
-
-  PrintFatalError(Rec->getLoc(), "No " + Name +
-                                     " predicate on this operand at all: '" +
-                                     Rec->getName() + "'");
-  return 0;
-}
-
-static void printPredicates(const std::vector<const Record *> &Predicates,
-                            StringRef Name, raw_ostream &o) {
-  for (unsigned i = 0; i < Predicates.size(); ++i) {
-    StringRef Pred = Predicates[i]->getValueAsString(Name);
-    o << "  case " << i + 1 << ": {\n"
-      << "  // " << Predicates[i]->getName() << "\n"
-      << "  " << Pred << "\n"
-      << "  }\n";
-  }
-}
-
-static void mergeCondAndCode(raw_ostream &CombinedStream, StringRef CondStr,
-                             StringRef CodeStr) {
-  // Remove first indentation and last '&&'.
-  CondStr = CondStr.drop_front(6).drop_back(4);
-  CombinedStream.indent(4) << "if (" << CondStr << ") {\n";
-  CombinedStream << CodeStr;
-  CombinedStream.indent(4) << "  return true;\n";
-  CombinedStream.indent(4) << "} // if\n";
-}
-
-void RISCVCompressInstEmitter::emitCompressInstEmitter(raw_ostream &o,
-                                                       EmitterType EType) {
-  Record *AsmWriter = Target.getAsmWriter();
-  if (!AsmWriter->getValueAsInt("PassSubtarget"))
-    PrintFatalError(AsmWriter->getLoc(),
-                    "'PassSubtarget' is false. SubTargetInfo object is needed "
-                    "for target features.\n");
-
-  StringRef Namespace = Target.getName();
-
-  // Sort entries in CompressPatterns to handle instructions that can have more
-  // than one candidate for compression\uncompression, e.g ADD can be
-  // transformed to a C_ADD or a C_MV. When emitting 'uncompress()' function the
-  // source and destination are flipped and the sort key needs to change
-  // accordingly.
-  llvm::stable_sort(CompressPatterns, [EType](const CompressPat &LHS,
-                                              const CompressPat &RHS) {
-    if (EType == EmitterType::Compress || EType == EmitterType::CheckCompress)
-      return (LHS.Source.TheDef->getName() < RHS.Source.TheDef->getName());
-    else
-      return (LHS.Dest.TheDef->getName() < RHS.Dest.TheDef->getName());
-  });
-
-  // A list of MCOperandPredicates for all operands in use, and the reverse map.
-  std::vector<const Record *> MCOpPredicates;
-  DenseMap<const Record *, unsigned> MCOpPredicateMap;
-  // A list of ImmLeaf Predicates for all operands in use, and the reverse map.
-  std::vector<const Record *> ImmLeafPredicates;
-  DenseMap<const Record *, unsigned> ImmLeafPredicateMap;
-
-  std::string F;
-  std::string FH;
-  raw_string_ostream Func(F);
-  raw_string_ostream FuncH(FH);
-  bool NeedMRI = false;
-
-  if (EType == EmitterType::Compress)
-    o << "\n#ifdef GEN_COMPRESS_INSTR\n"
-      << "#undef GEN_COMPRESS_INSTR\n\n";
-  else if (EType == EmitterType::Uncompress)
-    o << "\n#ifdef GEN_UNCOMPRESS_INSTR\n"
-      << "#undef GEN_UNCOMPRESS_INSTR\n\n";
-  else if (EType == EmitterType::CheckCompress)
-    o << "\n#ifdef GEN_CHECK_COMPRESS_INSTR\n"
-      << "#undef GEN_CHECK_COMPRESS_INSTR\n\n";
-
-  if (EType == EmitterType::Compress) {
-    FuncH << "static bool compressInst(MCInst &OutInst,\n";
-    FuncH.indent(25) << "const MCInst &MI,\n";
-    FuncH.indent(25) << "const MCSubtargetInfo &STI,\n";
-    FuncH.indent(25) << "MCContext &Context) {\n";
-  } else if (EType == EmitterType::Uncompress){
-    FuncH << "static bool uncompressInst(MCInst &OutInst,\n";
-    FuncH.indent(27) << "const MCInst &MI,\n";
-    FuncH.indent(27) << "const MCRegisterInfo &MRI,\n";
-    FuncH.indent(27) << "const MCSubtargetInfo &STI) {\n";
-  } else if (EType == EmitterType::CheckCompress) {
-    FuncH << "static bool isCompressibleInst(const MachineInstr &MI,\n";
-    FuncH.indent(27) << "const RISCVSubtarget *Subtarget,\n";
-    FuncH.indent(27) << "const MCRegisterInfo &MRI,\n";
-    FuncH.indent(27) << "const MCSubtargetInfo &STI) {\n";
-  }
-
-  if (CompressPatterns.empty()) {
-    o << FuncH.str();
-    o.indent(2) << "return false;\n}\n";
-    if (EType == EmitterType::Compress)
-      o << "\n#endif //GEN_COMPRESS_INSTR\n";
-    else if (EType == EmitterType::Uncompress)
-      o << "\n#endif //GEN_UNCOMPRESS_INSTR\n\n";
-    else if (EType == EmitterType::CheckCompress)
-      o << "\n#endif //GEN_CHECK_COMPRESS_INSTR\n\n";
-    return;
-  }
-
-  std::string CaseString;
-  raw_string_ostream CaseStream(CaseString);
-  StringRef PrevOp;
-  StringRef CurOp;
-  CaseStream << "  switch (MI.getOpcode()) {\n";
-  CaseStream << "    default: return false;\n";
-
-  bool CompressOrCheck =
-    EType == EmitterType::Compress || EType == EmitterType::CheckCompress;
-  bool CompressOrUncompress =
-    EType == EmitterType::Compress || EType == EmitterType::Uncompress;
-
-  for (auto &CompressPat : CompressPatterns) {
-    if (EType == EmitterType::Uncompress && CompressPat.IsCompressOnly)
-      continue;
-
-    std::string CondString;
-    std::string CodeString;
-    raw_string_ostream CondStream(CondString);
-    raw_string_ostream CodeStream(CodeString);
-    CodeGenInstruction &Source =
-        CompressOrCheck ?  CompressPat.Source : CompressPat.Dest;
-    CodeGenInstruction &Dest =
-        CompressOrCheck ? CompressPat.Dest : CompressPat.Source;
-    IndexedMap<OpData> SourceOperandMap = CompressOrCheck ?
-      CompressPat.SourceOperandMap : CompressPat.DestOperandMap;
-    IndexedMap<OpData> &DestOperandMap = CompressOrCheck ?
-      CompressPat.DestOperandMap : CompressPat.SourceOperandMap;
-
-    CurOp = Source.TheDef->getName();
-    // Check current and previous opcode to decide to continue or end a case.
-    if (CurOp != PrevOp) {
-      if (!PrevOp.empty())
-        CaseStream.indent(6) << "break;\n    } // case " + PrevOp + "\n";
-      CaseStream.indent(4) << "case " + Namespace + "::" + CurOp + ": {\n";
-    }
-
-    std::set<std::pair<bool, StringRef>> FeaturesSet;
-    std::set<std::set<std::pair<bool, StringRef>>> AnyOfFeatureSets;
-    // Add CompressPat required features.
-    getReqFeatures(FeaturesSet, AnyOfFeatureSets, CompressPat.PatReqFeatures);
-
-    // Add Dest instruction required features.
-    std::vector<Record *> ReqFeatures;
-    std::vector<Record *> RF = Dest.TheDef->getValueAsListOfDefs("Predicates");
-    copy_if(RF, std::back_inserter(ReqFeatures), [](Record *R) {
-      return R->getValueAsBit("AssemblerMatcherPredicate");
-    });
-    getReqFeatures(FeaturesSet, AnyOfFeatureSets, ReqFeatures);
-
-    // Emit checks for all required features.
-    for (auto &Op : FeaturesSet) {
-      StringRef Not = Op.first ? "!" : "";
-      CondStream.indent(6) << Not << "STI.getFeatureBits()[" << Namespace
-                           << "::" << Op.second << "]"
-                           << " &&\n";
-    }
-
-    // Emit checks for all required feature groups.
-    for (auto &Set : AnyOfFeatureSets) {
-      CondStream.indent(6) << "(";
-      for (auto &Op : Set) {
-        bool isLast = &Op == &*Set.rbegin();
-        StringRef Not = Op.first ? "!" : "";
-        CondStream << Not << "STI.getFeatureBits()[" << Namespace
-                   << "::" << Op.second << "]";
-        if (!isLast)
-          CondStream << " || ";
-      }
-      CondStream << ") &&\n";
-    }
-
-    // Start Source Inst operands validation.
-    unsigned OpNo = 0;
-    for (OpNo = 0; OpNo < Source.Operands.size(); ++OpNo) {
-      if (SourceOperandMap[OpNo].TiedOpIdx != -1) {
-        if (Source.Operands[OpNo].Rec->isSubClassOf("RegisterClass"))
-          CondStream.indent(6)
-              << "(MI.getOperand(" << OpNo << ").getReg() ==  MI.getOperand("
-              << SourceOperandMap[OpNo].TiedOpIdx << ").getReg()) &&\n";
-        else
-          PrintFatalError("Unexpected tied operand types!\n");
-      }
-      // Check for fixed immediates\registers in the source instruction.
-      switch (SourceOperandMap[OpNo].Kind) {
-      case OpData::Operand:
-        // We don't need to do anything for source instruction operand checks.
-        break;
-      case OpData::Imm:
-        CondStream.indent(6)
-            << "(MI.getOperand(" << OpNo << ").isImm()) &&\n"
-            << "      (MI.getOperand(" << OpNo
-            << ").getImm() == " << SourceOperandMap[OpNo].Data.Imm << ") &&\n";
-        break;
-      case OpData::Reg: {
-        Record *Reg = SourceOperandMap[OpNo].Data.Reg;
-        CondStream.indent(6)
-            << "(MI.getOperand(" << OpNo << ").getReg() == " << Namespace
-            << "::" << Reg->getName() << ") &&\n";
-        break;
-      }
-      }
-    }
-    CodeStream.indent(6) << "// " << Dest.AsmString << "\n";
-    if (CompressOrUncompress)
-      CodeStream.indent(6) << "OutInst.setOpcode(" << Namespace
-                           << "::" << Dest.TheDef->getName() << ");\n";
-    OpNo = 0;
-    for (const auto &DestOperand : Dest.Operands) {
-      CodeStream.indent(6) << "// Operand: " << DestOperand.Name << "\n";
-      switch (DestOperandMap[OpNo].Kind) {
-      case OpData::Operand: {
-        unsigned OpIdx = DestOperandMap[OpNo].Data.Operand;
-        // Check that the operand in the Source instruction fits
-        // the type for the Dest instruction.
-        if (DestOperand.Rec->isSubClassOf("RegisterClass")) {
-          NeedMRI = true;
-          // This is a register operand. Check the register class.
-          // Don't check register class if this is a tied operand, it was done
-          // for the operand its tied to.
-          if (DestOperand.getTiedRegister() == -1)
-            CondStream.indent(6) << "(MRI.getRegClass(" << Namespace
-                                 << "::" << DestOperand.Rec->getName()
-                                 << "RegClassID).contains(MI.getOperand("
-                                 << OpIdx << ").getReg())) &&\n";
-
-          if (CompressOrUncompress)
-            CodeStream.indent(6)
-                << "OutInst.addOperand(MI.getOperand(" << OpIdx << "));\n";
-        } else {
-          // Handling immediate operands.
-          if (CompressOrUncompress) {
-            unsigned Entry =
-                getPredicates(MCOpPredicateMap, MCOpPredicates, DestOperand.Rec,
-                              "MCOperandPredicate");
-            CondStream.indent(6)
-                << Namespace << "ValidateMCOperand("
-                << "MI.getOperand(" << OpIdx << "), STI, " << Entry << ") &&\n";
-          } else {
-            unsigned Entry =
-                getPredicates(ImmLeafPredicateMap, ImmLeafPredicates,
-                              DestOperand.Rec, "ImmediateCode");
-            CondStream.indent(6)
-                << "MI.getOperand(" << OpIdx << ").isImm() &&\n";
-            CondStream.indent(6) << Namespace << "ValidateMachineOperand("
-                                 << "MI.getOperand(" << OpIdx
-                                 << "), Subtarget, " << Entry << ") &&\n";
-          }
-          if (CompressOrUncompress)
-            CodeStream.indent(6)
-                << "OutInst.addOperand(MI.getOperand(" << OpIdx << "));\n";
-        }
-        break;
-      }
-      case OpData::Imm: {
-        if (CompressOrUncompress) {
-          unsigned Entry = getPredicates(MCOpPredicateMap, MCOpPredicates,
-                                         DestOperand.Rec, "MCOperandPredicate");
-          CondStream.indent(6)
-              << Namespace << "ValidateMCOperand("
-              << "MCOperand::createImm(" << DestOperandMap[OpNo].Data.Imm
-              << "), STI, " << Entry << ") &&\n";
-        } else {
-          unsigned Entry = getPredicates(ImmLeafPredicateMap, ImmLeafPredicates,
-                                         DestOperand.Rec, "ImmediateCode");
-          CondStream.indent(6)
-              << Namespace
-              << "ValidateMachineOperand(MachineOperand::CreateImm("
-              << DestOperandMap[OpNo].Data.Imm << "), SubTarget, " << Entry
-              << ") &&\n";
-        }
-        if (CompressOrUncompress)
-          CodeStream.indent(6) << "OutInst.addOperand(MCOperand::createImm("
-                               << DestOperandMap[OpNo].Data.Imm << "));\n";
-      } break;
-      case OpData::Reg: {
-        if (CompressOrUncompress) {
-          // Fixed register has been validated at pattern validation time.
-          Record *Reg = DestOperandMap[OpNo].Data.Reg;
-          CodeStream.indent(6)
-              << "OutInst.addOperand(MCOperand::createReg(" << Namespace
-              << "::" << Reg->getName() << "));\n";
-        }
-      } break;
-      }
-      ++OpNo;
-    }
-    if (CompressOrUncompress)
-      CodeStream.indent(6) << "OutInst.setLoc(MI.getLoc());\n";
-    mergeCondAndCode(CaseStream, CondStream.str(), CodeStream.str());
-    PrevOp = CurOp;
-  }
-  Func << CaseStream.str() << "\n";
-  // Close brace for the last case.
-  Func.indent(4) << "} // case " << CurOp << "\n";
-  Func.indent(2) << "} // switch\n";
-  Func.indent(2) << "return false;\n}\n";
-
-  if (!MCOpPredicates.empty()) {
-    o << "static bool " << Namespace
-      << "ValidateMCOperand(const MCOperand &MCOp,\n"
-      << "                  const MCSubtargetInfo &STI,\n"
-      << "                  unsigned PredicateIndex) {\n"
-      << "  switch (PredicateIndex) {\n"
-      << "  default:\n"
-      << "    llvm_unreachable(\"Unknown MCOperandPredicate kind\");\n"
-      << "    break;\n";
-
-    printPredicates(MCOpPredicates, "MCOperandPredicate", o);
-
-    o << "  }\n"
-      << "}\n\n";
-  }
-
-  if (!ImmLeafPredicates.empty()) {
-    o << "static bool " << Namespace
-      << "ValidateMachineOperand(const MachineOperand &MO,\n"
-      << "                  const RISCVSubtarget *Subtarget,\n"
-      << "                  unsigned PredicateIndex) {\n"
-      << "  int64_t Imm = MO.getImm();\n"
-      << "  switch (PredicateIndex) {\n"
-      << "  default:\n"
-      << "    llvm_unreachable(\"Unknown ImmLeaf Predicate kind\");\n"
-      << "    break;\n";
-
-    printPredicates(ImmLeafPredicates, "ImmediateCode", o);
-
-    o << "  }\n"
-      << "}\n\n";
-  }
-
-  o << FuncH.str();
-  if (NeedMRI && EType == EmitterType::Compress)
-    o.indent(2) << "const MCRegisterInfo &MRI = *Context.getRegisterInfo();\n";
-  o << Func.str();
-
-  if (EType == EmitterType::Compress)
-    o << "\n#endif //GEN_COMPRESS_INSTR\n";
-  else if (EType == EmitterType::Uncompress)
-    o << "\n#endif //GEN_UNCOMPRESS_INSTR\n\n";
-  else if (EType == EmitterType::CheckCompress)
-    o << "\n#endif //GEN_CHECK_COMPRESS_INSTR\n\n";
-}
-
-void RISCVCompressInstEmitter::run(raw_ostream &o) {
-  std::vector<Record *> Insts = Records.getAllDerivedDefinitions("CompressPat");
-
-  // Process the CompressPat definitions, validating them as we do so.
-  for (unsigned i = 0, e = Insts.size(); i != e; ++i)
-    evaluateCompressPat(Insts[i]);
-
-  // Emit file header.
-  emitSourceFileHeader("Compress instruction Source Fragment", o);
-  // Generate compressInst() function.
-  emitCompressInstEmitter(o, EmitterType::Compress);
-  // Generate uncompressInst() function.
-  emitCompressInstEmitter(o, EmitterType::Uncompress);
-  // Generate isCompressibleInst() function.
-  emitCompressInstEmitter(o, EmitterType::CheckCompress);
-}
-
-namespace llvm {
-
-void EmitCompressInst(RecordKeeper &RK, raw_ostream &OS) {
-  RISCVCompressInstEmitter(RK).run(OS);
-}
-
-} // namespace llvm
diff --git a/gnu/llvm/llvm/utils/benchmark/AUTHORS b/gnu/llvm/llvm/utils/benchmark/AUTHORS
deleted file mode 100644
index 052a383f77c..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/AUTHORS
+++ /dev/null
@@ -1,47 +0,0 @@
-# This is the official list of benchmark authors for copyright purposes.
-# This file is distinct from the CONTRIBUTORS files.
-# See the latter for an explanation.
-#
-# Names should be added to this file as:
-#	Name or Organization <email address>
-# The email address is not required for organizations.
-#
-# Please keep the list sorted.
-
-Albert Pretorius <pretoalb@gmail.com>
-Arne Beer <arne@twobeer.de>
-Carto
-Christopher Seymour <chris.j.seymour@hotmail.com>
-David Coeurjolly <david.coeurjolly@liris.cnrs.fr>
-Deniz Evrenci <denizevrenci@gmail.com>
-Dirac Research
-Dominik Czarnota <dominik.b.czarnota@gmail.com>
-Eric Fiselier <eric@efcs.ca>
-Eugene Zhuk <eugene.zhuk@gmail.com>
-Evgeny Safronov <division494@gmail.com>
-Felix Homann <linuxaudio@showlabor.de>
-Google Inc.
-International Business Machines Corporation
-Ismael Jimenez Martinez <ismael.jimenez.martinez@gmail.com>
-Jern-Kuan Leong <jernkuan@gmail.com>
-JianXiong Zhou <zhoujianxiong2@gmail.com>
-Joao Paulo Magalhaes <joaoppmagalhaes@gmail.com>
-Jussi Knuuttila <jussi.knuuttila@gmail.com>
-Kaito Udagawa <umireon@gmail.com>
-Kishan Kumar <kumar.kishan@outlook.com>
-Lei Xu <eddyxu@gmail.com>
-Matt Clarkson <mattyclarkson@gmail.com>
-Maxim Vafin <maxvafin@gmail.com>
-MongoDB Inc.
-Nick Hutchinson <nshutchinson@gmail.com>
-Oleksandr Sochka <sasha.sochka@gmail.com>
-Paul Redmond <paul.redmond@gmail.com>
-Radoslav Yovchev <radoslav.tm@gmail.com>
-Roman Lebedev <lebedev.ri@gmail.com>
-Shuo Chen <chenshuo@chenshuo.com>
-Steinar H. Gunderson <sgunderson@bigfoot.com>
-Stripe, Inc.
-Yixuan Qiu <yixuanq@gmail.com>
-Yusuke Suzuki <utatane.tea@gmail.com>
-Zbigniew Skowron <zbychs@gmail.com>
-Min-Yih Hsu <yihshyng223@gmail.com>
diff --git a/gnu/llvm/llvm/utils/benchmark/CMakeLists.txt b/gnu/llvm/llvm/utils/benchmark/CMakeLists.txt
deleted file mode 100644
index 3a80b906d5c..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/CMakeLists.txt
+++ /dev/null
@@ -1,266 +0,0 @@
-cmake_minimum_required(VERSION 3.13.4)
-
-# Tell cmake 3.0+ that it's safe to clear the PROJECT_VERSION variable in the
-# call to project() below.
-if(POLICY CMP0048)
-  cmake_policy(SET CMP0048 NEW)
-endif()
-
-project (benchmark)
-
-foreach(p
-    CMP0054 # CMake 3.1
-    CMP0056 # export EXE_LINKER_FLAGS to try_run
-    CMP0057 # Support no if() IN_LIST operator
-    )
-  if(POLICY ${p})
-    cmake_policy(SET ${p} NEW)
-  endif()
-endforeach()
-
-option(BENCHMARK_ENABLE_TESTING "Enable testing of the benchmark library." ON)
-option(BENCHMARK_ENABLE_EXCEPTIONS "Enable the use of exceptions in the benchmark library." ON)
-option(BENCHMARK_ENABLE_LTO "Enable link time optimisation of the benchmark library." OFF)
-option(BENCHMARK_USE_LIBCXX "Build and test using libc++ as the standard library." OFF)
-option(BENCHMARK_BUILD_32_BITS "Build a 32 bit version of the library." OFF)
-option(BENCHMARK_ENABLE_INSTALL "Enable installation of benchmark. (Projects embedding benchmark may want to turn this OFF.)" ON)
-
-# Allow unmet dependencies to be met using CMake's ExternalProject mechanics, which
-# may require downloading the source code.
-option(BENCHMARK_DOWNLOAD_DEPENDENCIES "Allow the downloading and in-tree building of unmet dependencies" OFF)
-
-# This option can be used to disable building and running unit tests which depend on gtest
-# in cases where it is not possible to build or find a valid version of gtest.
-option(BENCHMARK_ENABLE_GTEST_TESTS "Enable building the unit tests which depend on gtest" OFF)
-
-set(ENABLE_ASSEMBLY_TESTS_DEFAULT OFF)
-function(should_enable_assembly_tests)
-  if(CMAKE_BUILD_TYPE)
-    string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER)
-    if (${CMAKE_BUILD_TYPE_LOWER} MATCHES "coverage")
-      # FIXME: The --coverage flag needs to be removed when building assembly
-      # tests for this to work.
-      return()
-    endif()
-  endif()
-  if (MSVC)
-    return()
-  elseif(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
-    return()
-  elseif(NOT CMAKE_SIZEOF_VOID_P EQUAL 8)
-    # FIXME: Make these work on 32 bit builds
-    return()
-  elseif(BENCHMARK_BUILD_32_BITS)
-     # FIXME: Make these work on 32 bit builds
-    return()
-  endif()
-  find_program(LLVM_FILECHECK_EXE FileCheck)
-  if (LLVM_FILECHECK_EXE)
-    set(LLVM_FILECHECK_EXE "${LLVM_FILECHECK_EXE}" CACHE PATH "llvm filecheck" FORCE)
-    message(STATUS "LLVM FileCheck Found: ${LLVM_FILECHECK_EXE}")
-  else()
-    message(STATUS "Failed to find LLVM FileCheck")
-    return()
-  endif()
-  set(ENABLE_ASSEMBLY_TESTS_DEFAULT ON PARENT_SCOPE)
-endfunction()
-should_enable_assembly_tests()
-
-# This option disables the building and running of the assembly verification tests
-option(BENCHMARK_ENABLE_ASSEMBLY_TESTS "Enable building and running the assembly tests"
-    ${ENABLE_ASSEMBLY_TESTS_DEFAULT})
-
-# Make sure we can import out CMake functions
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-
-
-# Read the git tags to determine the project version
-# WARNING: This is meaningless for when the benchmark library is being built in-tree,
-# so disable it and hardcode a null version.
-# include(GetGitVersion)
-# get_git_version(GIT_VERSION)
-set(GIT_VERSION "v0.0.0")
-
-# Tell the user what versions we are using
-string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" VERSION ${GIT_VERSION})
-message("-- Version: ${VERSION}")
-
-# The version of the libraries
-set(GENERIC_LIB_VERSION ${VERSION})
-string(SUBSTRING ${VERSION} 0 1 GENERIC_LIB_SOVERSION)
-
-# Import our CMake modules
-include(CheckCXXCompilerFlag)
-include(AddCXXCompilerFlag)
-include(CXXFeatureCheck)
-
-if (BENCHMARK_BUILD_32_BITS)
-  add_required_cxx_compiler_flag(-m32)
-endif()
-
-if (MSVC)
-  # Turn compiler warnings up to 11
-  string(REGEX REPLACE "[-/]W[1-4]" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
-  add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-
-  if (NOT BENCHMARK_ENABLE_EXCEPTIONS)
-    add_cxx_compiler_flag(-EHs-)
-    add_cxx_compiler_flag(-EHa-)
-    add_definitions(-D_HAS_EXCEPTIONS=0)
-  endif()
-  # Link time optimisation
-  if (BENCHMARK_ENABLE_LTO)
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL")
-    set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} /LTCG")
-    set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /LTCG")
-    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG")
-
-    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /GL")
-    string(REGEX REPLACE "[-/]INCREMENTAL" "/INCREMENTAL:NO" CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO}")
-    set(CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO} /LTCG")
-    string(REGEX REPLACE "[-/]INCREMENTAL" "/INCREMENTAL:NO" CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO}")
-    set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /LTCG")
-    string(REGEX REPLACE "[-/]INCREMENTAL" "/INCREMENTAL:NO" CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO}")
-    set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /LTCG")
-
-    set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /GL")
-    set(CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL "${CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL} /LTCG")
-    set(CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL "${CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL} /LTCG")
-    set(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL} /LTCG")
-  endif()
-else()
-  # Try and enable C++11. Don't use C++14 because it doesn't work in some
-  # configurations.
-  add_cxx_compiler_flag(-std=c++11)
-  if (NOT HAVE_CXX_FLAG_STD_CXX11)
-    add_cxx_compiler_flag(-std=c++0x)
-  endif()
-
-  # Turn compiler warnings up to 11
-  add_cxx_compiler_flag(-Wall)
-
-  add_cxx_compiler_flag(-Wextra)
-  add_cxx_compiler_flag(-Wshadow)
-  # FIXME(kbobyrev): Document this change.
-  # add_cxx_compiler_flag(-Werror RELEASE)
-  # add_cxx_compiler_flag(-Werror RELWITHDEBINFO)
-  # add_cxx_compiler_flag(-Werror MINSIZEREL)
-  add_cxx_compiler_flag(-pedantic)
-  add_cxx_compiler_flag(-pedantic-errors)
-  add_cxx_compiler_flag(-Wshorten-64-to-32)
-  add_cxx_compiler_flag(-Wfloat-equal)
-  add_cxx_compiler_flag(-fstrict-aliasing)
-  if (NOT BENCHMARK_ENABLE_EXCEPTIONS)
-    add_cxx_compiler_flag(-fno-exceptions)
-  endif()
-
-  if (CXX_SUPPORTS_SUGGEST_OVERRIDE_FLAG)
-    add_cxx_compiler_flag(-Wno-suggest-override)
-  endif()
-
-  if (HAVE_CXX_FLAG_FSTRICT_ALIASING)
-    if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "Intel") #ICC17u2: Many false positives for Wstrict-aliasing
-      add_cxx_compiler_flag(-Wstrict-aliasing)
-    endif()
-  endif()
-  # ICC17u2: overloaded virtual function "benchmark::Fixture::SetUp" is only partially overridden
-  # (because of deprecated overload)
-  add_cxx_compiler_flag(-wd654)
-  add_cxx_compiler_flag(-Wthread-safety)
-  if (HAVE_CXX_FLAG_WTHREAD_SAFETY)
-    cxx_feature_check(THREAD_SAFETY_ATTRIBUTES)
-  endif()
-
-  # On most UNIX like platforms g++ and clang++ define _GNU_SOURCE as a
-  # predefined macro, which turns on all of the wonderful libc extensions.
-  # However g++ doesn't do this in Cygwin so we have to define it ourselfs
-  # since we depend on GNU/POSIX/BSD extensions.
-  if (CYGWIN)
-    add_definitions(-D_GNU_SOURCE=1)
-  endif()
-
-  # Link time optimisation
-  if (BENCHMARK_ENABLE_LTO)
-    add_cxx_compiler_flag(-flto)
-    if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
-      find_program(GCC_AR gcc-ar)
-      if (GCC_AR)
-        set(CMAKE_AR ${GCC_AR})
-      endif()
-      find_program(GCC_RANLIB gcc-ranlib)
-      if (GCC_RANLIB)
-        set(CMAKE_RANLIB ${GCC_RANLIB})
-      endif()
-    elseif("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
-      include(llvm-toolchain)
-    endif()
-  endif()
-
-  # Coverage build type
-  set(BENCHMARK_CXX_FLAGS_COVERAGE "${CMAKE_CXX_FLAGS_DEBUG}"
-    CACHE STRING "Flags used by the C++ compiler during coverage builds."
-    FORCE)
-  set(BENCHMARK_EXE_LINKER_FLAGS_COVERAGE "${CMAKE_EXE_LINKER_FLAGS_DEBUG}"
-    CACHE STRING "Flags used for linking binaries during coverage builds."
-    FORCE)
-  set(BENCHMARK_SHARED_LINKER_FLAGS_COVERAGE "${CMAKE_SHARED_LINKER_FLAGS_DEBUG}"
-    CACHE STRING "Flags used by the shared libraries linker during coverage builds."
-    FORCE)
-  mark_as_advanced(
-    BENCHMARK_CXX_FLAGS_COVERAGE
-    BENCHMARK_EXE_LINKER_FLAGS_COVERAGE
-    BENCHMARK_SHARED_LINKER_FLAGS_COVERAGE)
-  set(CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING
-    "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel Coverage.")
-  add_cxx_compiler_flag(--coverage COVERAGE)
-endif()
-
-if (BENCHMARK_USE_LIBCXX)
-  if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-    add_cxx_compiler_flag(-stdlib=libc++)
-  elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR
-          "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
-    add_cxx_compiler_flag(-nostdinc++)
-    message("libc++ header path must be manually specified using CMAKE_CXX_FLAGS")
-    # Adding -nodefaultlibs directly to CMAKE_<TYPE>_LINKER_FLAGS will break
-    # configuration checks such as 'find_package(Threads)'
-    list(APPEND BENCHMARK_CXX_LINKER_FLAGS -nodefaultlibs)
-    # -lc++ cannot be added directly to CMAKE_<TYPE>_LINKER_FLAGS because
-    # linker flags appear before all linker inputs and -lc++ must appear after.
-    list(APPEND BENCHMARK_CXX_LIBRARIES c++)
-  else()
-    message(FATAL_ERROR "-DBENCHMARK_USE_LIBCXX:BOOL=ON is not supported for compiler")
-  endif()
-endif(BENCHMARK_USE_LIBCXX)
-
-# C++ feature checks
-# Determine the correct regular expression engine to use
-cxx_feature_check(STD_REGEX)
-cxx_feature_check(GNU_POSIX_REGEX)
-cxx_feature_check(POSIX_REGEX)
-if(NOT HAVE_STD_REGEX AND NOT HAVE_GNU_POSIX_REGEX AND NOT HAVE_POSIX_REGEX)
-  message(FATAL_ERROR "Failed to determine the source files for the regular expression backend")
-endif()
-if (NOT BENCHMARK_ENABLE_EXCEPTIONS AND HAVE_STD_REGEX
-        AND NOT HAVE_GNU_POSIX_REGEX AND NOT HAVE_POSIX_REGEX)
-  message(WARNING "Using std::regex with exceptions disabled is not fully supported")
-endif()
-cxx_feature_check(STEADY_CLOCK)
-# Ensure we have pthreads
-find_package(Threads REQUIRED)
-
-# Set up directories
-include_directories(${PROJECT_SOURCE_DIR}/include)
-
-# Build the targets
-add_subdirectory(src)
-
-if (BENCHMARK_ENABLE_TESTING)
-  enable_testing()
-  if (BENCHMARK_ENABLE_GTEST_TESTS)
-    include(HandleGTest)
-  endif()
-  add_subdirectory(test)
-endif()
diff --git a/gnu/llvm/llvm/utils/benchmark/CONTRIBUTING.md b/gnu/llvm/llvm/utils/benchmark/CONTRIBUTING.md
deleted file mode 100644
index 43de4c9d470..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/CONTRIBUTING.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# How to contribute #
-
-We'd love to accept your patches and contributions to this project.  There are
-a just a few small guidelines you need to follow.
-
-
-## Contributor License Agreement ##
-
-Contributions to any Google project must be accompanied by a Contributor
-License Agreement.  This is not a copyright **assignment**, it simply gives
-Google permission to use and redistribute your contributions as part of the
-project.
-
-  * If you are an individual writing original source code and you're sure you
-    own the intellectual property, then you'll need to sign an [individual
-    CLA][].
-
-  * If you work for a company that wants to allow you to contribute your work,
-    then you'll need to sign a [corporate CLA][].
-
-You generally only need to submit a CLA once, so if you've already submitted
-one (even if it was for a different project), you probably don't need to do it
-again.
-
-[individual CLA]: https://developers.google.com/open-source/cla/individual
-[corporate CLA]: https://developers.google.com/open-source/cla/corporate
-
-Once your CLA is submitted (or if you already submitted one for
-another Google project), make a commit adding yourself to the
-[AUTHORS][] and [CONTRIBUTORS][] files. This commit can be part
-of your first [pull request][].
-
-[AUTHORS]: AUTHORS
-[CONTRIBUTORS]: CONTRIBUTORS
-
-
-## Submitting a patch ##
-
-  1. It's generally best to start by opening a new issue describing the bug or
-     feature you're intending to fix.  Even if you think it's relatively minor,
-     it's helpful to know what people are working on.  Mention in the initial
-     issue that you are planning to work on that bug or feature so that it can
-     be assigned to you.
-
-  1. Follow the normal process of [forking][] the project, and setup a new
-     branch to work in.  It's important that each group of changes be done in
-     separate branches in order to ensure that a pull request only includes the
-     commits related to that bug or feature.
-
-  1. Do your best to have [well-formed commit messages][] for each change.
-     This provides consistency throughout the project, and ensures that commit
-     messages are able to be formatted properly by various git tools.
-
-  1. Finally, push the commits to your fork and submit a [pull request][].
-
-[forking]: https://help.github.com/articles/fork-a-repo
-[well-formed commit messages]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
-[pull request]: https://help.github.com/articles/creating-a-pull-request
diff --git a/gnu/llvm/llvm/utils/benchmark/CONTRIBUTORS b/gnu/llvm/llvm/utils/benchmark/CONTRIBUTORS
deleted file mode 100644
index 073d6767bc4..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/CONTRIBUTORS
+++ /dev/null
@@ -1,67 +0,0 @@
-# People who have agreed to one of the CLAs and can contribute patches.
-# The AUTHORS file lists the copyright holders; this file
-# lists people.  For example, Google employees are listed here
-# but not in AUTHORS, because Google holds the copyright.
-#
-# Names should be added to this file only after verifying that
-# the individual or the individual's organization has agreed to
-# the appropriate Contributor License Agreement, found here:
-#
-# https://developers.google.com/open-source/cla/individual
-# https://developers.google.com/open-source/cla/corporate
-#
-# The agreement for individuals can be filled out on the web.
-#
-# When adding J Random Contributor's name to this file,
-# either J's name or J's organization's name should be
-# added to the AUTHORS file, depending on whether the
-# individual or corporate CLA was used.
-#
-# Names should be added to this file as:
-#     Name <email address>
-#
-# Please keep the list sorted.
-
-Albert Pretorius <pretoalb@gmail.com>
-Arne Beer <arne@twobeer.de>
-Billy Robert O'Neal III <billy.oneal@gmail.com> <bion@microsoft.com>
-Chris Kennelly <ckennelly@google.com> <ckennelly@ckennelly.com>
-Christopher Seymour <chris.j.seymour@hotmail.com>
-David Coeurjolly <david.coeurjolly@liris.cnrs.fr>
-Deniz Evrenci <denizevrenci@gmail.com>
-Dominic Hamon <dma@stripysock.com> <dominic@google.com>
-Dominik Czarnota <dominik.b.czarnota@gmail.com>
-Eric Fiselier <eric@efcs.ca>
-Eugene Zhuk <eugene.zhuk@gmail.com>
-Evgeny Safronov <division494@gmail.com>
-Felix Homann <linuxaudio@showlabor.de>
-Ismael Jimenez Martinez <ismael.jimenez.martinez@gmail.com>
-Jern-Kuan Leong <jernkuan@gmail.com>
-JianXiong Zhou <zhoujianxiong2@gmail.com>
-Joao Paulo Magalhaes <joaoppmagalhaes@gmail.com>
-John Millikin <jmillikin@stripe.com>
-Jussi Knuuttila <jussi.knuuttila@gmail.com>
-Kai Wolf <kai.wolf@gmail.com>
-Kishan Kumar <kumar.kishan@outlook.com>
-Kaito Udagawa <umireon@gmail.com>
-Lei Xu <eddyxu@gmail.com>
-Matt Clarkson <mattyclarkson@gmail.com>
-Maxim Vafin <maxvafin@gmail.com>
-Nick Hutchinson <nshutchinson@gmail.com>
-Oleksandr Sochka <sasha.sochka@gmail.com>
-Pascal Leroy <phl@google.com>
-Paul Redmond <paul.redmond@gmail.com>
-Pierre Phaneuf <pphaneuf@google.com>
-Radoslav Yovchev <radoslav.tm@gmail.com>
-Raul Marin <rmrodriguez@cartodb.com>
-Ray Glover <ray.glover@uk.ibm.com>
-Robert Guo <robert.guo@mongodb.com>
-Roman Lebedev <lebedev.ri@gmail.com>
-Shuo Chen <chenshuo@chenshuo.com>
-Steven Wan <wan.yu@ibm.com>
-Tobias Ulvgård <tobias.ulvgard@dirac.se>
-Tom Madams <tom.ej.madams@gmail.com> <tmadams@google.com>
-Yixuan Qiu <yixuanq@gmail.com>
-Yusuke Suzuki <utatane.tea@gmail.com>
-Zbigniew Skowron <zbychs@gmail.com>
-Min-Yih Hsu <yihshyng223@gmail.com>
diff --git a/gnu/llvm/llvm/utils/benchmark/LICENSE b/gnu/llvm/llvm/utils/benchmark/LICENSE
deleted file mode 100644
index d6456956733..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/gnu/llvm/llvm/utils/benchmark/README.LLVM b/gnu/llvm/llvm/utils/benchmark/README.LLVM
deleted file mode 100644
index d77da3b6200..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/README.LLVM
+++ /dev/null
@@ -1,39 +0,0 @@
-LLVM notes
-----------
-
-This directory contains the Google Benchmark source code. Currently, the checked
-Benchmark library version is v1.4.1.
-
-This directory is under a different license than LLVM.
-
-Changes:
-
-* Bazel BUILD files are removed from the library
-* https://github.com/google/benchmark/commit/f85304e4e3a0e4e1bf15b91720df4a19e90b589f
-  is applied on top of the v1.4.1 to silence compiler warnings
-* https://github.com/google/benchmark/commit/505be96ab23056580a3a2315abba048f4428b04e
-  is applied to comply with the LLVM's required CMake version
-* https://github.com/google/benchmark/commit/f0901417c89d123474e6b91365029cfe32cf89dc
-  is applied to fix 32-bit build failure on macOS
-* https://github.com/google/benchmark/commit/52613079824ac58d06c070aa9fbbb186a5859e2c
-  is applied to fix cross compilation with MinGW headers
-* https://github.com/google/benchmark/commit/439d6b1c2a6da5cb6adc4c4dfc555af235722396
-  is applied to fix building with MinGW headers for ARM
-* https://github.com/google/benchmark/commit/a9b31c51b1ee7ec7b31438c647123c2cbac5d956
-  is applied to disable exceptions in Microsoft STL when exceptions are disabled
-* Disabled CMake get_git_version as it is meaningless for this in-tree build,
-  and hardcoded a null version
-* https://github.com/google/benchmark/commit/4abdfbb802d1b514703223f5f852ce4a507d32d2
-  is applied on top of v1.4.1 to add RISC-V timer support.
-* https://github.com/google/benchmark/commit/8e48105d465c586068dd8e248fe75a8971c6ba3a
-  is applied on top of v1.4.1 to fix cross-build from linux to windows via MinGW.
-* https://github.com/google/benchmark/commit/a77d5f70efaebe2b7e8c10134526a23a7ce7ef35
-  and
-  https://github.com/google/benchmark/commit/ecc1685340f58f7fe6b707036bc0bb1fccabb0c1
-  are applied on top of the previous cherrypick to fix timestamp-related inline
-  asm issues and 32-bit RISC-V build failures. The second cherrypicked commit
-  fixes formatting issues introduced by the preceding change.
-* https://github.com/google/benchmark/commit/ffe1342eb2faa7d2e7c35b4db2ccf99fab81ec20
-  is applied to add the CycleTimer implementation for M68k
-* https://github.com/google/benchmark/commit/d9abf017632be4a00b92cf4289539b353fcea5d2
-  is applied to rename 'mftbl' to 'mftb'.
diff --git a/gnu/llvm/llvm/utils/benchmark/README.md b/gnu/llvm/llvm/utils/benchmark/README.md
deleted file mode 100644
index bba89afd0c0..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/README.md
+++ /dev/null
@@ -1,950 +0,0 @@
-# benchmark
-[![Build Status](https://travis-ci.org/google/benchmark.svg?branch=master)](https://travis-ci.org/google/benchmark)
-[![Build status](https://ci.appveyor.com/api/projects/status/u0qsyp7t1tk7cpxs/branch/master?svg=true)](https://ci.appveyor.com/project/google/benchmark/branch/master)
-[![Coverage Status](https://coveralls.io/repos/google/benchmark/badge.svg)](https://coveralls.io/r/google/benchmark)
-[![slackin](https://slackin-iqtfqnpzxd.now.sh/badge.svg)](https://slackin-iqtfqnpzxd.now.sh/)
-
-A library to support the benchmarking of functions, similar to unit-tests.
-
-Discussion group: https://groups.google.com/d/forum/benchmark-discuss
-
-IRC channel: https://freenode.net #googlebenchmark
-
-[Known issues and common problems](#known-issues)
-
-[Additional Tooling Documentation](docs/tools.md)
-
-[Assembly Testing Documentation](docs/AssemblyTests.md)
-
-
-## Building
-
-The basic steps for configuring and building the library look like this:
-
-```bash
-$ git clone https://github.com/google/benchmark.git
-# Benchmark requires Google Test as a dependency. Add the source tree as a subdirectory.
-$ git clone https://github.com/google/googletest.git benchmark/googletest
-$ mkdir build && cd build
-$ cmake -G <generator> [options] ../benchmark
-# Assuming a makefile generator was used
-$ make
-```
-
-Note that Google Benchmark requires Google Test to build and run the tests. This
-dependency can be provided two ways:
-
-* Checkout the Google Test sources into `benchmark/googletest` as above.
-* Otherwise, if `-DBENCHMARK_DOWNLOAD_DEPENDENCIES=ON` is specified during
-  configuration, the library will automatically download and build any required
-  dependencies.
-
-If you do not wish to build and run the tests, add `-DBENCHMARK_ENABLE_GTEST_TESTS=OFF`
-to `CMAKE_ARGS`.
-
-
-## Installation Guide
-
-For Ubuntu and Debian Based System
-
-First make sure you have git and cmake installed (If not please install it)
-
-```
-sudo apt-get install git
-sudo apt-get install cmake
-```
-
-Now, let's clone the repository and build it
-
-```
-git clone https://github.com/google/benchmark.git
-cd benchmark
-git clone https://github.com/google/googletest.git
-mkdir build
-cd build
-cmake .. -DCMAKE_BUILD_TYPE=RELEASE
-make
-```
-
-We need to install the library globally now
-
-```
-sudo make install
-```
-
-Now you have google/benchmark installed in your machine
-Note: Don't forget to link to pthread library while building
-
-## Stable and Experimental Library Versions
-
-The main branch contains the latest stable version of the benchmarking library;
-the API of which can be considered largely stable, with source breaking changes
-being made only upon the release of a new major version.
-
-Newer, experimental, features are implemented and tested on the
-[`v2` branch](https://github.com/google/benchmark/tree/v2). Users who wish
-to use, test, and provide feedback on the new features are encouraged to try
-this branch. However, this branch provides no stability guarantees and reserves
-the right to change and break the API at any time.
-
-##Prerequisite knowledge
-
-Before attempting to understand this framework one should ideally have some familiarity with the structure and format of the Google Test framework, upon which it is based. Documentation for Google Test, including a "Getting Started" (primer) guide, is available here:
-https://github.com/google/googletest/blob/master/googletest/docs/Documentation.md
-
-
-## Example usage
-### Basic usage
-Define a function that executes the code to be measured.
-
-```c++
-#include <benchmark/benchmark.h>
-
-static void BM_StringCreation(benchmark::State& state) {
-  for (auto _ : state)
-    std::string empty_string;
-}
-// Register the function as a benchmark
-BENCHMARK(BM_StringCreation);
-
-// Define another benchmark
-static void BM_StringCopy(benchmark::State& state) {
-  std::string x = "hello";
-  for (auto _ : state)
-    std::string copy(x);
-}
-BENCHMARK(BM_StringCopy);
-
-BENCHMARK_MAIN();
-```
-
-Don't forget to inform your linker to add benchmark library e.g. through
-`-lbenchmark` compilation flag. Alternatively, you may leave out the
-`BENCHMARK_MAIN();` at the end of the source file and link against
-`-lbenchmark_main` to get the same default behavior.
-
-The benchmark library will reporting the timing for the code within the `for(...)` loop.
-
-### Passing arguments
-Sometimes a family of benchmarks can be implemented with just one routine that
-takes an extra argument to specify which one of the family of benchmarks to
-run. For example, the following code defines a family of benchmarks for
-measuring the speed of `memcpy()` calls of different lengths:
-
-```c++
-static void BM_memcpy(benchmark::State& state) {
-  char* src = new char[state.range(0)];
-  char* dst = new char[state.range(0)];
-  memset(src, 'x', state.range(0));
-  for (auto _ : state)
-    memcpy(dst, src, state.range(0));
-  state.SetBytesProcessed(int64_t(state.iterations()) *
-                          int64_t(state.range(0)));
-  delete[] src;
-  delete[] dst;
-}
-BENCHMARK(BM_memcpy)->Arg(8)->Arg(64)->Arg(512)->Arg(1<<10)->Arg(8<<10);
-```
-
-The preceding code is quite repetitive, and can be replaced with the following
-short-hand. The following invocation will pick a few appropriate arguments in
-the specified range and will generate a benchmark for each such argument.
-
-```c++
-BENCHMARK(BM_memcpy)->Range(8, 8<<10);
-```
-
-By default the arguments in the range are generated in multiples of eight and
-the command above selects [ 8, 64, 512, 4k, 8k ]. In the following code the
-range multiplier is changed to multiples of two.
-
-```c++
-BENCHMARK(BM_memcpy)->RangeMultiplier(2)->Range(8, 8<<10);
-```
-Now arguments generated are [ 8, 16, 32, 64, 128, 256, 512, 1024, 2k, 4k, 8k ].
-
-You might have a benchmark that depends on two or more inputs. For example, the
-following code defines a family of benchmarks for measuring the speed of set
-insertion.
-
-```c++
-static void BM_SetInsert(benchmark::State& state) {
-  std::set<int> data;
-  for (auto _ : state) {
-    state.PauseTiming();
-    data = ConstructRandomSet(state.range(0));
-    state.ResumeTiming();
-    for (int j = 0; j < state.range(1); ++j)
-      data.insert(RandomNumber());
-  }
-}
-BENCHMARK(BM_SetInsert)
-    ->Args({1<<10, 128})
-    ->Args({2<<10, 128})
-    ->Args({4<<10, 128})
-    ->Args({8<<10, 128})
-    ->Args({1<<10, 512})
-    ->Args({2<<10, 512})
-    ->Args({4<<10, 512})
-    ->Args({8<<10, 512});
-```
-
-The preceding code is quite repetitive, and can be replaced with the following
-short-hand. The following macro will pick a few appropriate arguments in the
-product of the two specified ranges and will generate a benchmark for each such
-pair.
-
-```c++
-BENCHMARK(BM_SetInsert)->Ranges({{1<<10, 8<<10}, {128, 512}});
-```
-
-For more complex patterns of inputs, passing a custom function to `Apply` allows
-programmatic specification of an arbitrary set of arguments on which to run the
-benchmark. The following example enumerates a dense range on one parameter,
-and a sparse range on the second.
-
-```c++
-static void CustomArguments(benchmark::internal::Benchmark* b) {
-  for (int i = 0; i <= 10; ++i)
-    for (int j = 32; j <= 1024*1024; j *= 8)
-      b->Args({i, j});
-}
-BENCHMARK(BM_SetInsert)->Apply(CustomArguments);
-```
-
-### Calculate asymptotic complexity (Big O)
-Asymptotic complexity might be calculated for a family of benchmarks. The
-following code will calculate the coefficient for the high-order term in the
-running time and the normalized root-mean square error of string comparison.
-
-```c++
-static void BM_StringCompare(benchmark::State& state) {
-  std::string s1(state.range(0), '-');
-  std::string s2(state.range(0), '-');
-  for (auto _ : state) {
-    benchmark::DoNotOptimize(s1.compare(s2));
-  }
-  state.SetComplexityN(state.range(0));
-}
-BENCHMARK(BM_StringCompare)
-    ->RangeMultiplier(2)->Range(1<<10, 1<<18)->Complexity(benchmark::oN);
-```
-
-As shown in the following invocation, asymptotic complexity might also be
-calculated automatically.
-
-```c++
-BENCHMARK(BM_StringCompare)
-    ->RangeMultiplier(2)->Range(1<<10, 1<<18)->Complexity();
-```
-
-The following code will specify asymptotic complexity with a lambda function,
-that might be used to customize high-order term calculation.
-
-```c++
-BENCHMARK(BM_StringCompare)->RangeMultiplier(2)
-    ->Range(1<<10, 1<<18)->Complexity([](int n)->double{return n; });
-```
-
-### Templated benchmarks
-Templated benchmarks work the same way: This example produces and consumes
-messages of size `sizeof(v)` `range_x` times. It also outputs throughput in the
-absence of multiprogramming.
-
-```c++
-template <class Q> int BM_Sequential(benchmark::State& state) {
-  Q q;
-  typename Q::value_type v;
-  for (auto _ : state) {
-    for (int i = state.range(0); i--; )
-      q.push(v);
-    for (int e = state.range(0); e--; )
-      q.Wait(&v);
-  }
-  // actually messages, not bytes:
-  state.SetBytesProcessed(
-      static_cast<int64_t>(state.iterations())*state.range(0));
-}
-BENCHMARK_TEMPLATE(BM_Sequential, WaitQueue<int>)->Range(1<<0, 1<<10);
-```
-
-Three macros are provided for adding benchmark templates.
-
-```c++
-#ifdef BENCHMARK_HAS_CXX11
-#define BENCHMARK_TEMPLATE(func, ...) // Takes any number of parameters.
-#else // C++ < C++11
-#define BENCHMARK_TEMPLATE(func, arg1)
-#endif
-#define BENCHMARK_TEMPLATE1(func, arg1)
-#define BENCHMARK_TEMPLATE2(func, arg1, arg2)
-```
-
-### A Faster KeepRunning loop
-
-In C++11 mode, a ranged-based for loop should be used in preference to
-the `KeepRunning` loop for running the benchmarks. For example:
-
-```c++
-static void BM_Fast(benchmark::State &state) {
-  for (auto _ : state) {
-    FastOperation();
-  }
-}
-BENCHMARK(BM_Fast);
-```
-
-The reason the ranged-for loop is faster than using `KeepRunning`, is
-because `KeepRunning` requires a memory load and store of the iteration count
-ever iteration, whereas the ranged-for variant is able to keep the iteration count
-in a register.
-
-For example, an empty inner loop of using the ranged-based for method looks like:
-
-```asm
-# Loop Init
-  mov rbx, qword ptr [r14 + 104]
-  call benchmark::State::StartKeepRunning()
-  test rbx, rbx
-  je .LoopEnd
-.LoopHeader: # =>This Inner Loop Header: Depth=1
-  add rbx, -1
-  jne .LoopHeader
-.LoopEnd:
-```
-
-Compared to an empty `KeepRunning` loop, which looks like:
-
-```asm
-.LoopHeader: # in Loop: Header=BB0_3 Depth=1
-  cmp byte ptr [rbx], 1
-  jne .LoopInit
-.LoopBody: # =>This Inner Loop Header: Depth=1
-  mov rax, qword ptr [rbx + 8]
-  lea rcx, [rax + 1]
-  mov qword ptr [rbx + 8], rcx
-  cmp rax, qword ptr [rbx + 104]
-  jb .LoopHeader
-  jmp .LoopEnd
-.LoopInit:
-  mov rdi, rbx
-  call benchmark::State::StartKeepRunning()
-  jmp .LoopBody
-.LoopEnd:
-```
-
-Unless C++03 compatibility is required, the ranged-for variant of writing
-the benchmark loop should be preferred.
-
-## Passing arbitrary arguments to a benchmark
-In C++11 it is possible to define a benchmark that takes an arbitrary number
-of extra arguments. The `BENCHMARK_CAPTURE(func, test_case_name, ...args)`
-macro creates a benchmark that invokes `func`  with the `benchmark::State` as
-the first argument followed by the specified `args...`.
-The `test_case_name` is appended to the name of the benchmark and
-should describe the values passed.
-
-```c++
-template <class ...ExtraArgs>
-void BM_takes_args(benchmark::State& state, ExtraArgs&&... extra_args) {
-  [...]
-}
-// Registers a benchmark named "BM_takes_args/int_string_test" that passes
-// the specified values to `extra_args`.
-BENCHMARK_CAPTURE(BM_takes_args, int_string_test, 42, std::string("abc"));
-```
-Note that elements of `...args` may refer to global variables. Users should
-avoid modifying global state inside of a benchmark.
-
-## Using RegisterBenchmark(name, fn, args...)
-
-The `RegisterBenchmark(name, func, args...)` function provides an alternative
-way to create and register benchmarks.
-`RegisterBenchmark(name, func, args...)` creates, registers, and returns a
-pointer to a new benchmark with the specified `name` that invokes
-`func(st, args...)` where `st` is a `benchmark::State` object.
-
-Unlike the `BENCHMARK` registration macros, which can only be used at the global
-scope, the `RegisterBenchmark` can be called anywhere. This allows for
-benchmark tests to be registered programmatically.
-
-Additionally `RegisterBenchmark` allows any callable object to be registered
-as a benchmark. Including capturing lambdas and function objects.
-
-For Example:
-```c++
-auto BM_test = [](benchmark::State& st, auto Inputs) { /* ... */ };
-
-int main(int argc, char** argv) {
-  for (auto& test_input : { /* ... */ })
-      benchmark::RegisterBenchmark(test_input.name(), BM_test, test_input);
-  benchmark::Initialize(&argc, argv);
-  benchmark::RunSpecifiedBenchmarks();
-}
-```
-
-### Multithreaded benchmarks
-In a multithreaded test (benchmark invoked by multiple threads simultaneously),
-it is guaranteed that none of the threads will start until all have reached
-the start of the benchmark loop, and all will have finished before any thread
-exits the benchmark loop. (This behavior is also provided by the `KeepRunning()`
-API) As such, any global setup or teardown can be wrapped in a check against the thread
-index:
-
-```c++
-static void BM_MultiThreaded(benchmark::State& state) {
-  if (state.thread_index == 0) {
-    // Setup code here.
-  }
-  for (auto _ : state) {
-    // Run the test as normal.
-  }
-  if (state.thread_index == 0) {
-    // Teardown code here.
-  }
-}
-BENCHMARK(BM_MultiThreaded)->Threads(2);
-```
-
-If the benchmarked code itself uses threads and you want to compare it to
-single-threaded code, you may want to use real-time ("wallclock") measurements
-for latency comparisons:
-
-```c++
-BENCHMARK(BM_test)->Range(8, 8<<10)->UseRealTime();
-```
-
-Without `UseRealTime`, CPU time is used by default.
-
-
-## Manual timing
-For benchmarking something for which neither CPU time nor real-time are
-correct or accurate enough, completely manual timing is supported using
-the `UseManualTime` function.
-
-When `UseManualTime` is used, the benchmarked code must call
-`SetIterationTime` once per iteration of the benchmark loop to
-report the manually measured time.
-
-An example use case for this is benchmarking GPU execution (e.g. OpenCL
-or CUDA kernels, OpenGL or Vulkan or Direct3D draw calls), which cannot
-be accurately measured using CPU time or real-time. Instead, they can be
-measured accurately using a dedicated API, and these measurement results
-can be reported back with `SetIterationTime`.
-
-```c++
-static void BM_ManualTiming(benchmark::State& state) {
-  int microseconds = state.range(0);
-  std::chrono::duration<double, std::micro> sleep_duration {
-    static_cast<double>(microseconds)
-  };
-
-  for (auto _ : state) {
-    auto start = std::chrono::high_resolution_clock::now();
-    // Simulate some useful workload with a sleep
-    std::this_thread::sleep_for(sleep_duration);
-    auto end   = std::chrono::high_resolution_clock::now();
-
-    auto elapsed_seconds =
-      std::chrono::duration_cast<std::chrono::duration<double>>(
-        end - start);
-
-    state.SetIterationTime(elapsed_seconds.count());
-  }
-}
-BENCHMARK(BM_ManualTiming)->Range(1, 1<<17)->UseManualTime();
-```
-
-### Preventing optimisation
-To prevent a value or expression from being optimized away by the compiler
-the `benchmark::DoNotOptimize(...)` and `benchmark::ClobberMemory()`
-functions can be used.
-
-```c++
-static void BM_test(benchmark::State& state) {
-  for (auto _ : state) {
-      int x = 0;
-      for (int i=0; i < 64; ++i) {
-        benchmark::DoNotOptimize(x += i);
-      }
-  }
-}
-```
-
-`DoNotOptimize(<expr>)` forces the  *result* of `<expr>` to be stored in either
-memory or a register. For GNU based compilers it acts as read/write barrier
-for global memory. More specifically it forces the compiler to flush pending
-writes to memory and reload any other values as necessary.
-
-Note that `DoNotOptimize(<expr>)` does not prevent optimizations on `<expr>`
-in any way. `<expr>` may even be removed entirely when the result is already
-known. For example:
-
-```c++
-  /* Example 1: `<expr>` is removed entirely. */
-  int foo(int x) { return x + 42; }
-  while (...) DoNotOptimize(foo(0)); // Optimized to DoNotOptimize(42);
-
-  /*  Example 2: Result of '<expr>' is only reused */
-  int bar(int) __attribute__((const));
-  while (...) DoNotOptimize(bar(0)); // Optimized to:
-  // int __result__ = bar(0);
-  // while (...) DoNotOptimize(__result__);
-```
-
-The second tool for preventing optimizations is `ClobberMemory()`. In essence
-`ClobberMemory()` forces the compiler to perform all pending writes to global
-memory. Memory managed by block scope objects must be "escaped" using
-`DoNotOptimize(...)` before it can be clobbered. In the below example
-`ClobberMemory()` prevents the call to `v.push_back(42)` from being optimized
-away.
-
-```c++
-static void BM_vector_push_back(benchmark::State& state) {
-  for (auto _ : state) {
-    std::vector<int> v;
-    v.reserve(1);
-    benchmark::DoNotOptimize(v.data()); // Allow v.data() to be clobbered.
-    v.push_back(42);
-    benchmark::ClobberMemory(); // Force 42 to be written to memory.
-  }
-}
-```
-
-Note that `ClobberMemory()` is only available for GNU or MSVC based compilers.
-
-### Set time unit manually
-If a benchmark runs a few milliseconds it may be hard to visually compare the
-measured times, since the output data is given in nanoseconds per default. In
-order to manually set the time unit, you can specify it manually:
-
-```c++
-BENCHMARK(BM_test)->Unit(benchmark::kMillisecond);
-```
-
-## Controlling number of iterations
-In all cases, the number of iterations for which the benchmark is run is
-governed by the amount of time the benchmark takes. Concretely, the number of
-iterations is at least one, not more than 1e9, until CPU time is greater than
-the minimum time, or the wallclock time is 5x minimum time. The minimum time is
-set as a flag `--benchmark_min_time` or per benchmark by calling `MinTime` on
-the registered benchmark object.
-
-## Reporting the mean, median and standard deviation by repeated benchmarks
-By default each benchmark is run once and that single result is reported.
-However benchmarks are often noisy and a single result may not be representative
-of the overall behavior. For this reason it's possible to repeatedly rerun the
-benchmark.
-
-The number of runs of each benchmark is specified globally by the
-`--benchmark_repetitions` flag or on a per benchmark basis by calling
-`Repetitions` on the registered benchmark object. When a benchmark is run more
-than once the mean, median and standard deviation of the runs will be reported.
-
-Additionally the `--benchmark_report_aggregates_only={true|false}` flag or
-`ReportAggregatesOnly(bool)` function can be used to change how repeated tests
-are reported. By default the result of each repeated run is reported. When this
-option is `true` only the mean, median and standard deviation of the runs is reported.
-Calling `ReportAggregatesOnly(bool)` on a registered benchmark object overrides
-the value of the flag for that benchmark.
-
-## User-defined statistics for repeated benchmarks
-While having mean, median and standard deviation is nice, this may not be
-enough for everyone. For example you may want to know what is the largest
-observation, e.g. because you have some real-time constraints. This is easy.
-The following code will specify a custom statistic to be calculated, defined
-by a lambda function.
-
-```c++
-void BM_spin_empty(benchmark::State& state) {
-  for (auto _ : state) {
-    for (int x = 0; x < state.range(0); ++x) {
-      benchmark::DoNotOptimize(x);
-    }
-  }
-}
-
-BENCHMARK(BM_spin_empty)
-  ->ComputeStatistics("max", [](const std::vector<double>& v) -> double {
-    return *(std::max_element(std::begin(v), std::end(v)));
-  })
-  ->Arg(512);
-```
-
-## Fixtures
-Fixture tests are created by
-first defining a type that derives from `::benchmark::Fixture` and then
-creating/registering the tests using the following macros:
-
-* `BENCHMARK_F(ClassName, Method)`
-* `BENCHMARK_DEFINE_F(ClassName, Method)`
-* `BENCHMARK_REGISTER_F(ClassName, Method)`
-
-For Example:
-
-```c++
-class MyFixture : public benchmark::Fixture {};
-
-BENCHMARK_F(MyFixture, FooTest)(benchmark::State& st) {
-   for (auto _ : st) {
-     ...
-  }
-}
-
-BENCHMARK_DEFINE_F(MyFixture, BarTest)(benchmark::State& st) {
-   for (auto _ : st) {
-     ...
-  }
-}
-/* BarTest is NOT registered */
-BENCHMARK_REGISTER_F(MyFixture, BarTest)->Threads(2);
-/* BarTest is now registered */
-```
-
-### Templated fixtures
-Also you can create templated fixture by using the following macros:
-
-* `BENCHMARK_TEMPLATE_F(ClassName, Method, ...)`
-* `BENCHMARK_TEMPLATE_DEFINE_F(ClassName, Method, ...)`
-
-For example:
-```c++
-template<typename T>
-class MyFixture : public benchmark::Fixture {};
-
-BENCHMARK_TEMPLATE_F(MyFixture, IntTest, int)(benchmark::State& st) {
-   for (auto _ : st) {
-     ...
-  }
-}
-
-BENCHMARK_TEMPLATE_DEFINE_F(MyFixture, DoubleTest, double)(benchmark::State& st) {
-   for (auto _ : st) {
-     ...
-  }
-}
-
-BENCHMARK_REGISTER_F(MyFixture, DoubleTest)->Threads(2);
-```
-
-## User-defined counters
-
-You can add your own counters with user-defined names. The example below
-will add columns "Foo", "Bar" and "Baz" in its output:
-
-```c++
-static void UserCountersExample1(benchmark::State& state) {
-  double numFoos = 0, numBars = 0, numBazs = 0;
-  for (auto _ : state) {
-    // ... count Foo,Bar,Baz events
-  }
-  state.counters["Foo"] = numFoos;
-  state.counters["Bar"] = numBars;
-  state.counters["Baz"] = numBazs;
-}
-```
-
-The `state.counters` object is a `std::map` with `std::string` keys
-and `Counter` values. The latter is a `double`-like class, via an implicit
-conversion to `double&`. Thus you can use all of the standard arithmetic
-assignment operators (`=,+=,-=,*=,/=`) to change the value of each counter.
-
-In multithreaded benchmarks, each counter is set on the calling thread only.
-When the benchmark finishes, the counters from each thread will be summed;
-the resulting sum is the value which will be shown for the benchmark.
-
-The `Counter` constructor accepts two parameters: the value as a `double`
-and a bit flag which allows you to show counters as rates and/or as
-per-thread averages:
-
-```c++
-  // sets a simple counter
-  state.counters["Foo"] = numFoos;
-
-  // Set the counter as a rate. It will be presented divided
-  // by the duration of the benchmark.
-  state.counters["FooRate"] = Counter(numFoos, benchmark::Counter::kIsRate);
-
-  // Set the counter as a thread-average quantity. It will
-  // be presented divided by the number of threads.
-  state.counters["FooAvg"] = Counter(numFoos, benchmark::Counter::kAvgThreads);
-
-  // There's also a combined flag:
-  state.counters["FooAvgRate"] = Counter(numFoos,benchmark::Counter::kAvgThreadsRate);
-```
-
-When you're compiling in C++11 mode or later you can use `insert()` with
-`std::initializer_list`:
-
-```c++
-  // With C++11, this can be done:
-  state.counters.insert({{"Foo", numFoos}, {"Bar", numBars}, {"Baz", numBazs}});
-  // ... instead of:
-  state.counters["Foo"] = numFoos;
-  state.counters["Bar"] = numBars;
-  state.counters["Baz"] = numBazs;
-```
-
-### Counter reporting
-
-When using the console reporter, by default, user counters are are printed at
-the end after the table, the same way as ``bytes_processed`` and
-``items_processed``. This is best for cases in which there are few counters,
-or where there are only a couple of lines per benchmark. Here's an example of
-the default output:
-
-```
-------------------------------------------------------------------------------
-Benchmark                        Time           CPU Iterations UserCounters...
-------------------------------------------------------------------------------
-BM_UserCounter/threads:8      2248 ns      10277 ns      68808 Bar=16 Bat=40 Baz=24 Foo=8
-BM_UserCounter/threads:1      9797 ns       9788 ns      71523 Bar=2 Bat=5 Baz=3 Foo=1024m
-BM_UserCounter/threads:2      4924 ns       9842 ns      71036 Bar=4 Bat=10 Baz=6 Foo=2
-BM_UserCounter/threads:4      2589 ns      10284 ns      68012 Bar=8 Bat=20 Baz=12 Foo=4
-BM_UserCounter/threads:8      2212 ns      10287 ns      68040 Bar=16 Bat=40 Baz=24 Foo=8
-BM_UserCounter/threads:16     1782 ns      10278 ns      68144 Bar=32 Bat=80 Baz=48 Foo=16
-BM_UserCounter/threads:32     1291 ns      10296 ns      68256 Bar=64 Bat=160 Baz=96 Foo=32
-BM_UserCounter/threads:4      2615 ns      10307 ns      68040 Bar=8 Bat=20 Baz=12 Foo=4
-BM_Factorial                    26 ns         26 ns   26608979 40320
-BM_Factorial/real_time          26 ns         26 ns   26587936 40320
-BM_CalculatePiRange/1           16 ns         16 ns   45704255 0
-BM_CalculatePiRange/8           73 ns         73 ns    9520927 3.28374
-BM_CalculatePiRange/64         609 ns        609 ns    1140647 3.15746
-BM_CalculatePiRange/512       4900 ns       4901 ns     142696 3.14355
-```
-
-If this doesn't suit you, you can print each counter as a table column by
-passing the flag `--benchmark_counters_tabular=true` to the benchmark
-application. This is best for cases in which there are a lot of counters, or
-a lot of lines per individual benchmark. Note that this will trigger a
-reprinting of the table header any time the counter set changes between
-individual benchmarks. Here's an example of corresponding output when
-`--benchmark_counters_tabular=true` is passed:
-
-```
----------------------------------------------------------------------------------------
-Benchmark                        Time           CPU Iterations    Bar   Bat   Baz   Foo
----------------------------------------------------------------------------------------
-BM_UserCounter/threads:8      2198 ns       9953 ns      70688     16    40    24     8
-BM_UserCounter/threads:1      9504 ns       9504 ns      73787      2     5     3     1
-BM_UserCounter/threads:2      4775 ns       9550 ns      72606      4    10     6     2
-BM_UserCounter/threads:4      2508 ns       9951 ns      70332      8    20    12     4
-BM_UserCounter/threads:8      2055 ns       9933 ns      70344     16    40    24     8
-BM_UserCounter/threads:16     1610 ns       9946 ns      70720     32    80    48    16
-BM_UserCounter/threads:32     1192 ns       9948 ns      70496     64   160    96    32
-BM_UserCounter/threads:4      2506 ns       9949 ns      70332      8    20    12     4
---------------------------------------------------------------
-Benchmark                        Time           CPU Iterations
---------------------------------------------------------------
-BM_Factorial                    26 ns         26 ns   26392245 40320
-BM_Factorial/real_time          26 ns         26 ns   26494107 40320
-BM_CalculatePiRange/1           15 ns         15 ns   45571597 0
-BM_CalculatePiRange/8           74 ns         74 ns    9450212 3.28374
-BM_CalculatePiRange/64         595 ns        595 ns    1173901 3.15746
-BM_CalculatePiRange/512       4752 ns       4752 ns     147380 3.14355
-BM_CalculatePiRange/4k       37970 ns      37972 ns      18453 3.14184
-BM_CalculatePiRange/32k     303733 ns     303744 ns       2305 3.14162
-BM_CalculatePiRange/256k   2434095 ns    2434186 ns        288 3.1416
-BM_CalculatePiRange/1024k  9721140 ns    9721413 ns         71 3.14159
-BM_CalculatePi/threads:8      2255 ns       9943 ns      70936
-```
-Note above the additional header printed when the benchmark changes from
-``BM_UserCounter`` to ``BM_Factorial``. This is because ``BM_Factorial`` does
-not have the same counter set as ``BM_UserCounter``.
-
-## Exiting Benchmarks in Error
-
-When errors caused by external influences, such as file I/O and network
-communication, occur within a benchmark the
-`State::SkipWithError(const char* msg)` function can be used to skip that run
-of benchmark and report the error. Note that only future iterations of the
-`KeepRunning()` are skipped. For the ranged-for version of the benchmark loop
-Users must explicitly exit the loop, otherwise all iterations will be performed.
-Users may explicitly return to exit the benchmark immediately.
-
-The `SkipWithError(...)` function may be used at any point within the benchmark,
-including before and after the benchmark loop.
-
-For example:
-
-```c++
-static void BM_test(benchmark::State& state) {
-  auto resource = GetResource();
-  if (!resource.good()) {
-      state.SkipWithError("Resource is not good!");
-      // KeepRunning() loop will not be entered.
-  }
-  for (state.KeepRunning()) {
-      auto data = resource.read_data();
-      if (!resource.good()) {
-        state.SkipWithError("Failed to read data!");
-        break; // Needed to skip the rest of the iteration.
-     }
-     do_stuff(data);
-  }
-}
-
-static void BM_test_ranged_fo(benchmark::State & state) {
-  state.SkipWithError("test will not be entered");
-  for (auto _ : state) {
-    state.SkipWithError("Failed!");
-    break; // REQUIRED to prevent all further iterations.
-  }
-}
-```
-
-## Running a subset of the benchmarks
-
-The `--benchmark_filter=<regex>` option can be used to only run the benchmarks
-which match the specified `<regex>`. For example:
-
-```bash
-$ ./run_benchmarks.x --benchmark_filter=BM_memcpy/32
-Run on (1 X 2300 MHz CPU )
-2016-06-25 19:34:24
-Benchmark              Time           CPU Iterations
-----------------------------------------------------
-BM_memcpy/32          11 ns         11 ns   79545455
-BM_memcpy/32k       2181 ns       2185 ns     324074
-BM_memcpy/32          12 ns         12 ns   54687500
-BM_memcpy/32k       1834 ns       1837 ns     357143
-```
-
-
-## Output Formats
-The library supports multiple output formats. Use the
-`--benchmark_format=<console|json|csv>` flag to set the format type. `console`
-is the default format.
-
-The Console format is intended to be a human readable format. By default
-the format generates color output. Context is output on stderr and the
-tabular data on stdout. Example tabular output looks like:
-```
-Benchmark                               Time(ns)    CPU(ns) Iterations
-----------------------------------------------------------------------
-BM_SetInsert/1024/1                        28928      29349      23853  133.097kB/s   33.2742k items/s
-BM_SetInsert/1024/8                        32065      32913      21375  949.487kB/s   237.372k items/s
-BM_SetInsert/1024/10                       33157      33648      21431  1.13369MB/s   290.225k items/s
-```
-
-The JSON format outputs human readable json split into two top level attributes.
-The `context` attribute contains information about the run in general, including
-information about the CPU and the date.
-The `benchmarks` attribute contains a list of every benchmark run. Example json
-output looks like:
-```json
-{
-  "context": {
-    "date": "2015/03/17-18:40:25",
-    "num_cpus": 40,
-    "mhz_per_cpu": 2801,
-    "cpu_scaling_enabled": false,
-    "build_type": "debug"
-  },
-  "benchmarks": [
-    {
-      "name": "BM_SetInsert/1024/1",
-      "iterations": 94877,
-      "real_time": 29275,
-      "cpu_time": 29836,
-      "bytes_per_second": 134066,
-      "items_per_second": 33516
-    },
-    {
-      "name": "BM_SetInsert/1024/8",
-      "iterations": 21609,
-      "real_time": 32317,
-      "cpu_time": 32429,
-      "bytes_per_second": 986770,
-      "items_per_second": 246693
-    },
-    {
-      "name": "BM_SetInsert/1024/10",
-      "iterations": 21393,
-      "real_time": 32724,
-      "cpu_time": 33355,
-      "bytes_per_second": 1199226,
-      "items_per_second": 299807
-    }
-  ]
-}
-```
-
-The CSV format outputs comma-separated values. The `context` is output on stderr
-and the CSV itself on stdout. Example CSV output looks like:
-```
-name,iterations,real_time,cpu_time,bytes_per_second,items_per_second,label
-"BM_SetInsert/1024/1",65465,17890.7,8407.45,475768,118942,
-"BM_SetInsert/1024/8",116606,18810.1,9766.64,3.27646e+06,819115,
-"BM_SetInsert/1024/10",106365,17238.4,8421.53,4.74973e+06,1.18743e+06,
-```
-
-## Output Files
-The library supports writing the output of the benchmark to a file specified
-by `--benchmark_out=<filename>`. The format of the output can be specified
-using `--benchmark_out_format={json|console|csv}`. Specifying
-`--benchmark_out` does not suppress the console output.
-
-## Debug vs Release
-By default, benchmark builds as a debug library. You will see a warning in the output when this is the case. To build it as a release library instead, use:
-
-```
-cmake -DCMAKE_BUILD_TYPE=Release
-```
-
-To enable link-time optimisation, use
-
-```
-cmake -DCMAKE_BUILD_TYPE=Release -DBENCHMARK_ENABLE_LTO=true
-```
-
-If you are using gcc, you might need to set `GCC_AR` and `GCC_RANLIB` cmake cache variables, if autodetection fails.
-If you are using clang, you may need to set `LLVMAR_EXECUTABLE`, `LLVMNM_EXECUTABLE` and `LLVMRANLIB_EXECUTABLE` cmake cache variables.
-
-## Linking against the library
-
-When the library is built using GCC it is necessary to link with `-pthread`,
-due to how GCC implements `std::thread`.
-
-For GCC 4.x failing to link to pthreads will lead to runtime exceptions, not linker errors.
-See [issue #67](https://github.com/google/benchmark/issues/67) for more details.
-
-## Compiler Support
-
-Google Benchmark uses C++11 when building the library. As such we require
-a modern C++ toolchain, both compiler and standard library.
-
-The following minimum versions are strongly recommended build the library:
-
-* GCC 4.8
-* Clang 3.4
-* Visual Studio 2013
-* Intel 2015 Update 1
-
-Anything older *may* work.
-
-Note: Using the library and its headers in C++03 is supported. C++11 is only
-required to build the library.
-
-## Disable CPU frequency scaling
-If you see this error:
-```
-***WARNING*** CPU scaling is enabled, the benchmark real time measurements may be noisy and will incur extra overhead.
-```
-you might want to disable the CPU frequency scaling while running the benchmark:
-```bash
-sudo cpupower frequency-set --governor performance
-./mybench
-sudo cpupower frequency-set --governor powersave
-```
-
-# Known Issues
-
-### Windows with CMake
-
-* Users must manually link `shlwapi.lib`. Failure to do so may result
-in unresolved symbols.
-
-### Solaris
-
-* Users must explicitly link with kstat library (-lkstat compilation flag).
diff --git a/gnu/llvm/llvm/utils/benchmark/WORKSPACE b/gnu/llvm/llvm/utils/benchmark/WORKSPACE
deleted file mode 100644
index 54734f1ea55..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/WORKSPACE
+++ /dev/null
@@ -1,7 +0,0 @@
-workspace(name = "com_github_google_benchmark")
-
-http_archive(
-     name = "com_google_googletest",
-     urls = ["https://github.com/google/googletest/archive/3f0cf6b62ad1eb50d8736538363d3580dd640c3e.zip"],
-     strip_prefix = "googletest-3f0cf6b62ad1eb50d8736538363d3580dd640c3e",
-)
diff --git a/gnu/llvm/llvm/utils/benchmark/appveyor.yml b/gnu/llvm/llvm/utils/benchmark/appveyor.yml
deleted file mode 100644
index e99c6e77f00..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/appveyor.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-version: '{build}'
-
-image: Visual Studio 2017
-
-configuration:
-  - Debug
-  - Release
-
-environment:
-  matrix:
-    - compiler: msvc-15-seh
-      generator: "Visual Studio 15 2017"
-
-    - compiler: msvc-15-seh
-      generator: "Visual Studio 15 2017 Win64"
-
-    - compiler: msvc-14-seh
-      generator: "Visual Studio 14 2015"
-
-    - compiler: msvc-14-seh
-      generator: "Visual Studio 14 2015 Win64"
-
-    - compiler: msvc-12-seh
-      generator: "Visual Studio 12 2013"
-
-    - compiler: msvc-12-seh
-      generator: "Visual Studio 12 2013 Win64"
-
-    - compiler: gcc-5.3.0-posix
-      generator: "MinGW Makefiles"
-      cxx_path: 'C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin'
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-
-matrix:
-  fast_finish: true
-
-install:
-  # git bash conflicts with MinGW makefiles
-  - if "%generator%"=="MinGW Makefiles" (set "PATH=%PATH:C:\Program Files\Git\usr\bin;=%")
-  - if not "%cxx_path%"=="" (set "PATH=%PATH%;%cxx_path%")
-
-build_script:
-  - md _build -Force
-  - cd _build
-  - echo %configuration%
-  - cmake -G "%generator%" "-DCMAKE_BUILD_TYPE=%configuration%" -DBENCHMARK_DOWNLOAD_DEPENDENCIES=ON ..
-  - cmake --build . --config %configuration%
-
-test_script:
-  - ctest -c %configuration% --timeout 300 --output-on-failure
-
-artifacts:
-  - path: '_build/CMakeFiles/*.log'
-    name: logs
-  - path: '_build/Testing/**/*.xml'
-    name: test_results
diff --git a/gnu/llvm/llvm/utils/benchmark/cmake/AddCXXCompilerFlag.cmake b/gnu/llvm/llvm/utils/benchmark/cmake/AddCXXCompilerFlag.cmake
deleted file mode 100644
index d0d20998144..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/cmake/AddCXXCompilerFlag.cmake
+++ /dev/null
@@ -1,74 +0,0 @@
-# - Adds a compiler flag if it is supported by the compiler
-#
-# This function checks that the supplied compiler flag is supported and then
-# adds it to the corresponding compiler flags
-#
-#  add_cxx_compiler_flag(<FLAG> [<VARIANT>])
-#
-# - Example
-#
-# include(AddCXXCompilerFlag)
-# add_cxx_compiler_flag(-Wall)
-# add_cxx_compiler_flag(-no-strict-aliasing RELEASE)
-# Requires CMake 2.6+
-
-if(__add_cxx_compiler_flag)
-  return()
-endif()
-set(__add_cxx_compiler_flag INCLUDED)
-
-include(CheckCXXCompilerFlag)
-
-function(mangle_compiler_flag FLAG OUTPUT)
-  string(TOUPPER "HAVE_CXX_FLAG_${FLAG}" SANITIZED_FLAG)
-  string(REPLACE "+" "X" SANITIZED_FLAG ${SANITIZED_FLAG})
-  string(REGEX REPLACE "[^A-Za-z_0-9]" "_" SANITIZED_FLAG ${SANITIZED_FLAG})
-  string(REGEX REPLACE "_+" "_" SANITIZED_FLAG ${SANITIZED_FLAG})
-  set(${OUTPUT} "${SANITIZED_FLAG}" PARENT_SCOPE)
-endfunction(mangle_compiler_flag)
-
-function(add_cxx_compiler_flag FLAG)
-  mangle_compiler_flag("${FLAG}" MANGLED_FLAG)
-  set(OLD_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
-  set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${FLAG}")
-  check_cxx_compiler_flag("${FLAG}" ${MANGLED_FLAG})
-  set(CMAKE_REQUIRED_FLAGS "${OLD_CMAKE_REQUIRED_FLAGS}")
-  if(${MANGLED_FLAG})
-    set(VARIANT ${ARGV1})
-    if(ARGV1)
-      string(TOUPPER "_${VARIANT}" VARIANT)
-    endif()
-    set(CMAKE_CXX_FLAGS${VARIANT} "${CMAKE_CXX_FLAGS${VARIANT}} ${BENCHMARK_CXX_FLAGS${VARIANT}} ${FLAG}" PARENT_SCOPE)
-  endif()
-endfunction()
-
-function(add_required_cxx_compiler_flag FLAG)
-  mangle_compiler_flag("${FLAG}" MANGLED_FLAG)
-  set(OLD_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
-  set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${FLAG}")
-  check_cxx_compiler_flag("${FLAG}" ${MANGLED_FLAG})
-  set(CMAKE_REQUIRED_FLAGS "${OLD_CMAKE_REQUIRED_FLAGS}")
-  if(${MANGLED_FLAG})
-    set(VARIANT ${ARGV1})
-    if(ARGV1)
-      string(TOUPPER "_${VARIANT}" VARIANT)
-    endif()
-    set(CMAKE_CXX_FLAGS${VARIANT} "${CMAKE_CXX_FLAGS${VARIANT}} ${FLAG}" PARENT_SCOPE)
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${FLAG}" PARENT_SCOPE)
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${FLAG}" PARENT_SCOPE)
-    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${FLAG}" PARENT_SCOPE)
-    set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${FLAG}" PARENT_SCOPE)
-  else()
-    message(FATAL_ERROR "Required flag '${FLAG}' is not supported by the compiler")
-  endif()
-endfunction()
-
-function(check_cxx_warning_flag FLAG)
-  mangle_compiler_flag("${FLAG}" MANGLED_FLAG)
-  set(OLD_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
-  # Add -Werror to ensure the compiler generates an error if the warning flag
-  # doesn't exist.
-  set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Werror ${FLAG}")
-  check_cxx_compiler_flag("${FLAG}" ${MANGLED_FLAG})
-  set(CMAKE_REQUIRED_FLAGS "${OLD_CMAKE_REQUIRED_FLAGS}")
-endfunction()
diff --git a/gnu/llvm/llvm/utils/benchmark/cmake/CXXFeatureCheck.cmake b/gnu/llvm/llvm/utils/benchmark/cmake/CXXFeatureCheck.cmake
deleted file mode 100644
index c4c4d660f1e..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/cmake/CXXFeatureCheck.cmake
+++ /dev/null
@@ -1,64 +0,0 @@
-# - Compile and run code to check for C++ features
-#
-# This functions compiles a source file under the `cmake` folder
-# and adds the corresponding `HAVE_[FILENAME]` flag to the CMake
-# environment
-#
-#  cxx_feature_check(<FLAG> [<VARIANT>])
-#
-# - Example
-#
-# include(CXXFeatureCheck)
-# cxx_feature_check(STD_REGEX)
-# Requires CMake 2.8.12+
-
-if(__cxx_feature_check)
-  return()
-endif()
-set(__cxx_feature_check INCLUDED)
-
-function(cxx_feature_check FILE)
-  string(TOLOWER ${FILE} FILE)
-  string(TOUPPER ${FILE} VAR)
-  string(TOUPPER "HAVE_${VAR}" FEATURE)
-  if (DEFINED HAVE_${VAR})
-    set(HAVE_${VAR} 1 PARENT_SCOPE)
-    add_definitions(-DHAVE_${VAR})
-    return()
-  endif()
-
-  if (NOT DEFINED COMPILE_${FEATURE})
-    message("-- Performing Test ${FEATURE}")
-    if(CMAKE_CROSSCOMPILING)
-      try_compile(COMPILE_${FEATURE}
-              ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/${FILE}.cpp
-              CMAKE_FLAGS ${BENCHMARK_CXX_LINKER_FLAGS}
-              LINK_LIBRARIES ${BENCHMARK_CXX_LIBRARIES})
-      if(COMPILE_${FEATURE})
-        message(WARNING
-              "If you see build failures due to cross compilation, try setting HAVE_${VAR} to 0")
-        set(RUN_${FEATURE} 0)
-      else()
-        set(RUN_${FEATURE} 1)
-      endif()
-    else()
-      message("-- Performing Test ${FEATURE}")
-      try_run(RUN_${FEATURE} COMPILE_${FEATURE}
-              ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/${FILE}.cpp
-              CMAKE_FLAGS ${BENCHMARK_CXX_LINKER_FLAGS}
-              LINK_LIBRARIES ${BENCHMARK_CXX_LIBRARIES})
-    endif()
-  endif()
-
-  if(RUN_${FEATURE} EQUAL 0)
-    message("-- Performing Test ${FEATURE} -- success")
-    set(HAVE_${VAR} 1 PARENT_SCOPE)
-    add_definitions(-DHAVE_${VAR})
-  else()
-    if(NOT COMPILE_${FEATURE})
-      message("-- Performing Test ${FEATURE} -- failed to compile")
-    else()
-      message("-- Performing Test ${FEATURE} -- compiled but failed to run")
-    endif()
-  endif()
-endfunction()
diff --git a/gnu/llvm/llvm/utils/benchmark/cmake/Config.cmake.in b/gnu/llvm/llvm/utils/benchmark/cmake/Config.cmake.in
deleted file mode 100644
index 6e9256eea8a..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/cmake/Config.cmake.in
+++ /dev/null
@@ -1 +0,0 @@
-include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake")
diff --git a/gnu/llvm/llvm/utils/benchmark/cmake/GetGitVersion.cmake b/gnu/llvm/llvm/utils/benchmark/cmake/GetGitVersion.cmake
deleted file mode 100644
index 88cebe3a1ca..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/cmake/GetGitVersion.cmake
+++ /dev/null
@@ -1,54 +0,0 @@
-# - Returns a version string from Git tags
-#
-# This function inspects the annotated git tags for the project and returns a string
-# into a CMake variable
-#
-#  get_git_version(<var>)
-#
-# - Example
-#
-# include(GetGitVersion)
-# get_git_version(GIT_VERSION)
-#
-# Requires CMake 2.8.11+
-find_package(Git)
-
-if(__get_git_version)
-  return()
-endif()
-set(__get_git_version INCLUDED)
-
-function(get_git_version var)
-  if(GIT_EXECUTABLE)
-      execute_process(COMMAND ${GIT_EXECUTABLE} describe --match "v[0-9]*.[0-9]*.[0-9]*" --abbrev=8
-          WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-          RESULT_VARIABLE status
-          OUTPUT_VARIABLE GIT_VERSION
-          ERROR_QUIET)
-      if(${status})
-          set(GIT_VERSION "v0.0.0")
-      else()
-          string(STRIP ${GIT_VERSION} GIT_VERSION)
-          string(REGEX REPLACE "-[0-9]+-g" "-" GIT_VERSION ${GIT_VERSION})
-      endif()
-
-      # Work out if the repository is dirty
-      execute_process(COMMAND ${GIT_EXECUTABLE} update-index -q --refresh
-          WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-          OUTPUT_QUIET
-          ERROR_QUIET)
-      execute_process(COMMAND ${GIT_EXECUTABLE} diff-index --name-only HEAD --
-          WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-          OUTPUT_VARIABLE GIT_DIFF_INDEX
-          ERROR_QUIET)
-      string(COMPARE NOTEQUAL "${GIT_DIFF_INDEX}" "" GIT_DIRTY)
-      if (${GIT_DIRTY})
-          set(GIT_VERSION "${GIT_VERSION}-dirty")
-      endif()
-  else()
-      set(GIT_VERSION "v0.0.0")
-  endif()
-
-  message("-- git Version: ${GIT_VERSION}")
-  set(${var} ${GIT_VERSION} PARENT_SCOPE)
-endfunction()
diff --git a/gnu/llvm/llvm/utils/benchmark/cmake/HandleGTest.cmake b/gnu/llvm/llvm/utils/benchmark/cmake/HandleGTest.cmake
deleted file mode 100644
index 7ce1a633d65..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/cmake/HandleGTest.cmake
+++ /dev/null
@@ -1,113 +0,0 @@
-
-include(split_list)
-
-macro(build_external_gtest)
-  include(ExternalProject)
-  set(GTEST_FLAGS "")
-  if (BENCHMARK_USE_LIBCXX)
-    if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-      list(APPEND GTEST_FLAGS -stdlib=libc++)
-    else()
-      message(WARNING "Unsupported compiler (${CMAKE_CXX_COMPILER}) when using libc++")
-    endif()
-  endif()
-  if (BENCHMARK_BUILD_32_BITS)
-    list(APPEND GTEST_FLAGS -m32)
-  endif()
-  if (NOT "${CMAKE_CXX_FLAGS}" STREQUAL "")
-    list(APPEND GTEST_FLAGS ${CMAKE_CXX_FLAGS})
-  endif()
-  string(TOUPPER "${CMAKE_BUILD_TYPE}" GTEST_BUILD_TYPE)
-  if ("${GTEST_BUILD_TYPE}" STREQUAL "COVERAGE")
-    set(GTEST_BUILD_TYPE "DEBUG")
-  endif()
-  # FIXME: Since 10/Feb/2017 the googletest trunk has had a bug where
-  # -Werror=unused-function fires during the build on OS X. This is a temporary
-  # workaround to keep our travis bots from failing. It should be removed
-  # once gtest is fixed.
-  if (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-    list(APPEND GTEST_FLAGS "-Wno-unused-function")
-  endif()
-  split_list(GTEST_FLAGS)
-  set(EXCLUDE_FROM_ALL_OPT "")
-  set(EXCLUDE_FROM_ALL_VALUE "")
-  if (${CMAKE_VERSION} VERSION_GREATER "3.0.99")
-      set(EXCLUDE_FROM_ALL_OPT "EXCLUDE_FROM_ALL")
-      set(EXCLUDE_FROM_ALL_VALUE "ON")
-  endif()
-  ExternalProject_Add(googletest
-      ${EXCLUDE_FROM_ALL_OPT} ${EXCLUDE_FROM_ALL_VALUE}
-      GIT_REPOSITORY https://github.com/google/googletest.git
-      GIT_TAG master
-      PREFIX "${CMAKE_BINARY_DIR}/googletest"
-      INSTALL_DIR "${CMAKE_BINARY_DIR}/googletest"
-      CMAKE_CACHE_ARGS
-        -DCMAKE_BUILD_TYPE:STRING=${GTEST_BUILD_TYPE}
-        -DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER}
-        -DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER}
-        -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-        -DCMAKE_INSTALL_LIBDIR:PATH=<INSTALL_DIR>/lib
-        -DCMAKE_CXX_FLAGS:STRING=${GTEST_FLAGS}
-        -Dgtest_force_shared_crt:BOOL=ON
-      )
-
-  ExternalProject_Get_Property(googletest install_dir)
-  set(GTEST_INCLUDE_DIRS ${install_dir}/include)
-  file(MAKE_DIRECTORY ${GTEST_INCLUDE_DIRS})
-
-  set(LIB_SUFFIX "${CMAKE_STATIC_LIBRARY_SUFFIX}")
-  set(LIB_PREFIX "${CMAKE_STATIC_LIBRARY_PREFIX}")
-  if("${GTEST_BUILD_TYPE}" STREQUAL "DEBUG")
-    set(LIB_SUFFIX "d${CMAKE_STATIC_LIBRARY_SUFFIX}")
-  endif()
-
-  # Use gmock_main instead of gtest_main because it initializes gtest as well.
-  # Note: The libraries are listed in reverse order of their dependancies.
-  foreach(LIB gtest gmock gmock_main)
-    add_library(${LIB} UNKNOWN IMPORTED)
-    set_target_properties(${LIB} PROPERTIES
-      IMPORTED_LOCATION ${install_dir}/lib/${LIB_PREFIX}${LIB}${LIB_SUFFIX}
-      INTERFACE_INCLUDE_DIRECTORIES ${GTEST_INCLUDE_DIRS}
-      INTERFACE_LINK_LIBRARIES "${GTEST_BOTH_LIBRARIES}"
-    )
-    add_dependencies(${LIB} googletest)
-    list(APPEND GTEST_BOTH_LIBRARIES ${LIB})
-  endforeach()
-endmacro(build_external_gtest)
-
-if (BENCHMARK_ENABLE_GTEST_TESTS)
-  if (IS_DIRECTORY ${CMAKE_SOURCE_DIR}/googletest)
-    set(GTEST_ROOT "${CMAKE_SOURCE_DIR}/googletest")
-    set(INSTALL_GTEST OFF CACHE INTERNAL "")
-    set(INSTALL_GMOCK OFF CACHE INTERNAL "")
-    add_subdirectory(${CMAKE_SOURCE_DIR}/googletest)
-    set(GTEST_BOTH_LIBRARIES gtest gmock gmock_main)
-    foreach(HEADER test mock)
-      # CMake 2.8 and older don't respect INTERFACE_INCLUDE_DIRECTORIES, so we
-      # have to add the paths ourselves.
-      set(HFILE g${HEADER}/g${HEADER}.h)
-      set(HPATH ${GTEST_ROOT}/google${HEADER}/include)
-      find_path(HEADER_PATH_${HEADER} ${HFILE}
-          NO_DEFAULT_PATHS
-          HINTS ${HPATH}
-      )
-      if (NOT HEADER_PATH_${HEADER})
-        message(FATAL_ERROR "Failed to find header ${HFILE} in ${HPATH}")
-      endif()
-      list(APPEND GTEST_INCLUDE_DIRS ${HEADER_PATH_${HEADER}})
-    endforeach()
-  elseif(BENCHMARK_DOWNLOAD_DEPENDENCIES)
-    build_external_gtest()
-  else()
-    find_package(GTest REQUIRED)
-    find_path(GMOCK_INCLUDE_DIRS gmock/gmock.h
-        HINTS ${GTEST_INCLUDE_DIRS})
-    if (NOT GMOCK_INCLUDE_DIRS)
-      message(FATAL_ERROR "Failed to find header gmock/gmock.h with hint ${GTEST_INCLUDE_DIRS}")
-    endif()
-    set(GTEST_INCLUDE_DIRS ${GTEST_INCLUDE_DIRS} ${GMOCK_INCLUDE_DIRS})
-    # FIXME: We don't currently require the gmock library to build the tests,
-    # and it's likely we won't find it, so we don't try. As long as we've
-    # found the gmock/gmock.h header and gtest_main that should be good enough.
-  endif()
-endif()
diff --git a/gnu/llvm/llvm/utils/benchmark/cmake/Modules/FindLLVMAr.cmake b/gnu/llvm/llvm/utils/benchmark/cmake/Modules/FindLLVMAr.cmake
deleted file mode 100644
index 23469813cfa..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/cmake/Modules/FindLLVMAr.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-include(FeatureSummary)
-
-find_program(LLVMAR_EXECUTABLE
-  NAMES llvm-ar
-  DOC "The llvm-ar executable"
-  )
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(LLVMAr
-  DEFAULT_MSG
-  LLVMAR_EXECUTABLE)
-
-SET_PACKAGE_PROPERTIES(LLVMAr PROPERTIES
-  URL https://llvm.org/docs/CommandGuide/llvm-ar.html
-  DESCRIPTION "create, modify, and extract from archives"
-)
diff --git a/gnu/llvm/llvm/utils/benchmark/cmake/Modules/FindLLVMNm.cmake b/gnu/llvm/llvm/utils/benchmark/cmake/Modules/FindLLVMNm.cmake
deleted file mode 100644
index e56430a04f6..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/cmake/Modules/FindLLVMNm.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-include(FeatureSummary)
-
-find_program(LLVMNM_EXECUTABLE
-  NAMES llvm-nm
-  DOC "The llvm-nm executable"
-  )
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(LLVMNm
-  DEFAULT_MSG
-  LLVMNM_EXECUTABLE)
-
-SET_PACKAGE_PROPERTIES(LLVMNm PROPERTIES
-  URL https://llvm.org/docs/CommandGuide/llvm-nm.html
-  DESCRIPTION "list LLVM bitcode and object file’s symbol table"
-)
diff --git a/gnu/llvm/llvm/utils/benchmark/cmake/Modules/FindLLVMRanLib.cmake b/gnu/llvm/llvm/utils/benchmark/cmake/Modules/FindLLVMRanLib.cmake
deleted file mode 100644
index 7b53e1a7905..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/cmake/Modules/FindLLVMRanLib.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-include(FeatureSummary)
-
-find_program(LLVMRANLIB_EXECUTABLE
-  NAMES llvm-ranlib
-  DOC "The llvm-ranlib executable"
-  )
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(LLVMRanLib
-  DEFAULT_MSG
-  LLVMRANLIB_EXECUTABLE)
-
-SET_PACKAGE_PROPERTIES(LLVMRanLib PROPERTIES
-  DESCRIPTION "generate index for LLVM archive"
-)
diff --git a/gnu/llvm/llvm/utils/benchmark/cmake/benchmark.pc.in b/gnu/llvm/llvm/utils/benchmark/cmake/benchmark.pc.in
deleted file mode 100644
index 1e84bff68d8..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/cmake/benchmark.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=${prefix}/lib
-includedir=${prefix}/include
-
-Name: @PROJECT_NAME@
-Description: Google microbenchmark framework
-Version: @VERSION@
-
-Libs: -L${libdir} -lbenchmark
-Cflags: -I${includedir}
diff --git a/gnu/llvm/llvm/utils/benchmark/cmake/gnu_posix_regex.cpp b/gnu/llvm/llvm/utils/benchmark/cmake/gnu_posix_regex.cpp
deleted file mode 100644
index 105189f02ee..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/cmake/gnu_posix_regex.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <gnuregex.h>
-#include <string>
-int main() {
-  std::string str = "test0159";
-  regex_t re;
-  int ec = regcomp(&re, "^[a-z]+[0-9]+$", REG_EXTENDED | REG_NOSUB);
-  if (ec != 0) {
-    return ec;
-  }
-  return regexec(&re, str.c_str(), 0, nullptr, 0) ? -1 : 0;
-}
diff --git a/gnu/llvm/llvm/utils/benchmark/cmake/llvm-toolchain.cmake b/gnu/llvm/llvm/utils/benchmark/cmake/llvm-toolchain.cmake
deleted file mode 100644
index fc119e52fd2..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/cmake/llvm-toolchain.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-find_package(LLVMAr REQUIRED)
-set(CMAKE_AR "${LLVMAR_EXECUTABLE}" CACHE FILEPATH "" FORCE)
-
-find_package(LLVMNm REQUIRED)
-set(CMAKE_NM "${LLVMNM_EXECUTABLE}" CACHE FILEPATH "" FORCE)
-
-find_package(LLVMRanLib REQUIRED)
-set(CMAKE_RANLIB "${LLVMRANLIB_EXECUTABLE}" CACHE FILEPATH "" FORCE)
diff --git a/gnu/llvm/llvm/utils/benchmark/cmake/posix_regex.cpp b/gnu/llvm/llvm/utils/benchmark/cmake/posix_regex.cpp
deleted file mode 100644
index 02f6dfc278a..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/cmake/posix_regex.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <regex.h>
-#include <string>
-int main() {
-  std::string str = "test0159";
-  regex_t re;
-  int ec = regcomp(&re, "^[a-z]+[0-9]+$", REG_EXTENDED | REG_NOSUB);
-  if (ec != 0) {
-    return ec;
-  }
-  int ret = regexec(&re, str.c_str(), 0, nullptr, 0) ? -1 : 0;
-  regfree(&re);
-  return ret;
-}
diff --git a/gnu/llvm/llvm/utils/benchmark/cmake/split_list.cmake b/gnu/llvm/llvm/utils/benchmark/cmake/split_list.cmake
deleted file mode 100644
index 67aed3fdc85..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/cmake/split_list.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-macro(split_list listname)
-  string(REPLACE ";" " " ${listname} "${${listname}}")
-endmacro()
diff --git a/gnu/llvm/llvm/utils/benchmark/cmake/std_regex.cpp b/gnu/llvm/llvm/utils/benchmark/cmake/std_regex.cpp
deleted file mode 100644
index 8177c482e83..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/cmake/std_regex.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <regex>
-#include <string>
-int main() {
-  const std::string str = "test0159";
-  std::regex re;
-  re = std::regex("^[a-z]+[0-9]+$",
-       std::regex_constants::extended | std::regex_constants::nosubs);
-  return std::regex_search(str, re) ? 0 : -1;
-}
diff --git a/gnu/llvm/llvm/utils/benchmark/cmake/steady_clock.cpp b/gnu/llvm/llvm/utils/benchmark/cmake/steady_clock.cpp
deleted file mode 100644
index 66d50d17e9e..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/cmake/steady_clock.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <chrono>
-
-int main() {
-    typedef std::chrono::steady_clock Clock;
-    Clock::time_point tp = Clock::now();
-    ((void)tp);
-}
diff --git a/gnu/llvm/llvm/utils/benchmark/cmake/thread_safety_attributes.cpp b/gnu/llvm/llvm/utils/benchmark/cmake/thread_safety_attributes.cpp
deleted file mode 100644
index 46161babdb1..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/cmake/thread_safety_attributes.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-#define HAVE_THREAD_SAFETY_ATTRIBUTES
-#include "../src/mutex.h"
-
-int main() {}
diff --git a/gnu/llvm/llvm/utils/benchmark/docs/AssemblyTests.md b/gnu/llvm/llvm/utils/benchmark/docs/AssemblyTests.md
deleted file mode 100644
index 0d06f50ac65..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/docs/AssemblyTests.md
+++ /dev/null
@@ -1,146 +0,0 @@
-# Assembly Tests
-
-The Benchmark library provides a number of functions whose primary
-purpose in to affect assembly generation, including `DoNotOptimize`
-and `ClobberMemory`. In addition there are other functions,
-such as `KeepRunning`, for which generating good assembly is paramount.
-
-For these functions it's important to have tests that verify the
-correctness and quality of the implementation. This requires testing
-the code generated by the compiler.
-
-This document describes how the Benchmark library tests compiler output,
-as well as how to properly write new tests.
-
-
-## Anatomy of a Test
-
-Writing a test has two steps:
-
-* Write the code you want to generate assembly for.
-* Add `// CHECK` lines to match against the verified assembly.
-
-Example:
-```c++
-
-// CHECK-LABEL: test_add:
-extern "C" int test_add() {
-    extern int ExternInt;
-    return ExternInt + 1;
-
-    // CHECK: movl ExternInt(%rip), %eax
-    // CHECK: addl %eax
-    // CHECK: ret
-}
-
-```
-
-#### LLVM Filecheck
-
-[LLVM's Filecheck](https://llvm.org/docs/CommandGuide/FileCheck.html)
-is used to test the generated assembly against the `// CHECK` lines
-specified in the tests source file. Please see the documentation
-linked above for information on how to write `CHECK` directives.
-
-#### Tips and Tricks:
-
-* Tests should match the minimal amount of output required to establish
-correctness. `CHECK` directives don't have to match on the exact next line
-after the previous match, so tests should omit checks for unimportant
-bits of assembly. ([`CHECK-NEXT`](https://llvm.org/docs/CommandGuide/FileCheck.html#the-check-next-directive)
-can be used to ensure a match occurs exactly after the previous match).
-
-* The tests are compiled with `-O3 -g0`. So we're only testing the
-optimized output.
-
-* The assembly output is further cleaned up using `tools/strip_asm.py`.
-This removes comments, assembler directives, and unused labels before
-the test is run.
-
-* The generated and stripped assembly file for a test is output under
-`<build-directory>/test/<test-name>.s`
-
-* Filecheck supports using [`CHECK` prefixes](https://llvm.org/docs/CommandGuide/FileCheck.html#cmdoption-check-prefixes)
-to specify lines that should only match in certain situations.
-The Benchmark tests use `CHECK-CLANG` and `CHECK-GNU` for lines that
-are only expected to match Clang or GCC's output respectively. Normal
-`CHECK` lines match against all compilers. (Note: `CHECK-NOT` and
-`CHECK-LABEL` are NOT prefixes. They are versions of non-prefixed
-`CHECK` lines)
-
-* Use `extern "C"` to disable name mangling for specific functions. This
-makes them easier to name in the `CHECK` lines.
-
-
-## Problems Writing Portable Tests
-
-Writing tests which check the code generated by a compiler are
-inherently non-portable. Different compilers and even different compiler
-versions may generate entirely different code. The Benchmark tests
-must tolerate this.
-
-LLVM Filecheck provides a number of mechanisms to help write
-"more portable" tests; including [matching using regular expressions](https://llvm.org/docs/CommandGuide/FileCheck.html#filecheck-pattern-matching-syntax),
-allowing the creation of [named variables](https://llvm.org/docs/CommandGuide/FileCheck.html#filecheck-variables)
-for later matching, and [checking non-sequential matches](https://llvm.org/docs/CommandGuide/FileCheck.html#the-check-dag-directive).
-
-#### Capturing Variables
-
-For example, say GCC stores a variable in a register but Clang stores
-it in memory. To write a test that tolerates both cases we "capture"
-the destination of the store, and then use the captured expression
-to write the remainder of the test.
-
-```c++
-// CHECK-LABEL: test_div_no_op_into_shr:
-extern "C" void test_div_no_op_into_shr(int value) {
-    int divisor = 2;
-    benchmark::DoNotOptimize(divisor); // hide the value from the optimizer
-    return value / divisor;
-
-    // CHECK: movl $2, [[DEST:.*]]
-    // CHECK: idivl [[DEST]]
-    // CHECK: ret
-}
-```
-
-#### Using Regular Expressions to Match Differing Output
-
-Often tests require testing assembly lines which may subtly differ
-between compilers or compiler versions. A common example of this
-is matching stack frame addresses. In this case regular expressions
-can be used to match the differing bits of output. For example:
-
-```c++
-int ExternInt;
-struct Point { int x, y, z; };
-
-// CHECK-LABEL: test_store_point:
-extern "C" void test_store_point() {
-    Point p{ExternInt, ExternInt, ExternInt};
-    benchmark::DoNotOptimize(p);
-
-    // CHECK: movl ExternInt(%rip), %eax
-    // CHECK: movl %eax, -{{[0-9]+}}(%rsp)
-    // CHECK: movl %eax, -{{[0-9]+}}(%rsp)
-    // CHECK: movl %eax, -{{[0-9]+}}(%rsp)
-    // CHECK: ret
-}
-```
-
-## Current Requirements and Limitations
-
-The tests require Filecheck to be installed along the `PATH` of the
-build machine. Otherwise the tests will be disabled.
-
-Additionally, as mentioned in the previous section, codegen tests are
-inherently non-portable. Currently the tests are limited to:
-
-* x86_64 targets.
-* Compiled with GCC or Clang
-
-Further work could be done, at least on a limited basis, to extend the
-tests to other architectures and compilers (using `CHECK` prefixes).
-
-Furthermore, the tests fail for builds which specify additional flags
-that modify code generation, including `--coverage` or `-fsanitize=`.
diff --git a/gnu/llvm/llvm/utils/benchmark/docs/tools.md b/gnu/llvm/llvm/utils/benchmark/docs/tools.md
deleted file mode 100644
index 70500bd3223..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/docs/tools.md
+++ /dev/null
@@ -1,242 +0,0 @@
-# Benchmark Tools
-
-## compare_bench.py
-
-The `compare_bench.py` utility which can be used to compare the result of benchmarks.
-The program is invoked like:
-
-``` bash
-$ compare_bench.py <old-benchmark> <new-benchmark> [benchmark options]...
-```
-
-Where `<old-benchmark>` and `<new-benchmark>` either specify a benchmark executable file, or a JSON output file. The type of the input file is automatically detected. If a benchmark executable is specified then the benchmark is run to obtain the results. Otherwise the results are simply loaded from the output file.
-
-`[benchmark options]` will be passed to the benchmarks invocations. They can be anything that binary accepts, be it either normal `--benchmark_*` parameters, or some custom parameters your binary takes.
-
-The sample output using the JSON test files under `Inputs/` gives:
-
-``` bash
-$ ./compare_bench.py ./gbench/Inputs/test1_run1.json ./gbench/Inputs/test1_run2.json
-Comparing ./gbench/Inputs/test1_run1.json to ./gbench/Inputs/test1_run2.json
-Benchmark                        Time             CPU      Time Old      Time New       CPU Old       CPU New
--------------------------------------------------------------------------------------------------------------
-BM_SameTimes                  +0.0000         +0.0000            10            10            10            10
-BM_2xFaster                   -0.5000         -0.5000            50            25            50            25
-BM_2xSlower                   +1.0000         +1.0000            50           100            50           100
-BM_1PercentFaster             -0.0100         -0.0100           100            99           100            99
-BM_1PercentSlower             +0.0100         +0.0100           100           101           100           101
-BM_10PercentFaster            -0.1000         -0.1000           100            90           100            90
-BM_10PercentSlower            +0.1000         +0.1000           100           110           100           110
-BM_100xSlower                +99.0000        +99.0000           100         10000           100         10000
-BM_100xFaster                 -0.9900         -0.9900         10000           100         10000           100
-BM_10PercentCPUToTime         +0.1000         -0.1000           100           110           100            90
-BM_ThirdFaster                -0.3333         -0.3334           100            67           100            67
-BM_BadTimeUnit                -0.9000         +0.2000             0             0             0             1
-```
-
-As you can note, the values in `Time` and `CPU` columns are calculated as `(new - old) / |old|`.
-
-When a benchmark executable is run, the raw output from the benchmark is printed in real time to stdout. The sample output using `benchmark/basic_test` for both arguments looks like:
-
-```
-./compare_bench.py  test/basic_test test/basic_test  --benchmark_filter=BM_empty.*
-RUNNING: test/basic_test --benchmark_filter=BM_empty.* --benchmark_out=/tmp/tmpN7LF3a
-Run on (8 X 4000 MHz CPU s)
-2017-11-07 23:28:36
----------------------------------------------------------------------
-Benchmark                              Time           CPU Iterations
----------------------------------------------------------------------
-BM_empty                               4 ns          4 ns  170178757
-BM_empty/threads:8                     1 ns          7 ns  103868920
-BM_empty_stop_start                    0 ns          0 ns 1000000000
-BM_empty_stop_start/threads:8          0 ns          0 ns 1403031720
-RUNNING: /test/basic_test --benchmark_filter=BM_empty.* --benchmark_out=/tmp/tmplvrIp8
-Run on (8 X 4000 MHz CPU s)
-2017-11-07 23:28:38
----------------------------------------------------------------------
-Benchmark                              Time           CPU Iterations
----------------------------------------------------------------------
-BM_empty                               4 ns          4 ns  169534855
-BM_empty/threads:8                     1 ns          7 ns  104188776
-BM_empty_stop_start                    0 ns          0 ns 1000000000
-BM_empty_stop_start/threads:8          0 ns          0 ns 1404159424
-Comparing ../build/test/basic_test to ../build/test/basic_test
-Benchmark                                Time             CPU      Time Old      Time New       CPU Old       CPU New
----------------------------------------------------------------------------------------------------------------------
-BM_empty                              -0.0048         -0.0049             4             4             4             4
-BM_empty/threads:8                    -0.0123         -0.0054             1             1             7             7
-BM_empty_stop_start                   -0.0000         -0.0000             0             0             0             0
-BM_empty_stop_start/threads:8         -0.0029         +0.0001             0             0             0             0
-
-```
-
-As you can note, the values in `Time` and `CPU` columns are calculated as `(new - old) / |old|`.
-Obviously this example doesn't give any useful output, but it's intended to show the output format when 'compare_bench.py' needs to run benchmarks.
-
-## compare.py
-
-The `compare.py` can be used to compare the result of benchmarks.
-There are three modes of operation:
-
-1. Just compare two benchmarks, what `compare_bench.py` did.
-The program is invoked like:
-
-``` bash
-$ compare.py benchmarks <benchmark_baseline> <benchmark_contender> [benchmark options]...
-```
-Where `<benchmark_baseline>` and `<benchmark_contender>` either specify a benchmark executable file, or a JSON output file. The type of the input file is automatically detected. If a benchmark executable is specified then the benchmark is run to obtain the results. Otherwise the results are simply loaded from the output file.
-
-`[benchmark options]` will be passed to the benchmarks invocations. They can be anything that binary accepts, be it either normal `--benchmark_*` parameters, or some custom parameters your binary takes.
-
-Example output:
-```
-$ ./compare.py benchmarks ./a.out ./a.out
-RUNNING: ./a.out --benchmark_out=/tmp/tmprBT5nW
-Run on (8 X 4000 MHz CPU s)
-2017-11-07 21:16:44
-------------------------------------------------------
-Benchmark               Time           CPU Iterations
-------------------------------------------------------
-BM_memcpy/8            36 ns         36 ns   19101577   211.669MB/s
-BM_memcpy/64           76 ns         76 ns    9412571   800.199MB/s
-BM_memcpy/512          84 ns         84 ns    8249070   5.64771GB/s
-BM_memcpy/1024        116 ns        116 ns    6181763   8.19505GB/s
-BM_memcpy/8192        643 ns        643 ns    1062855   11.8636GB/s
-BM_copy/8             222 ns        222 ns    3137987   34.3772MB/s
-BM_copy/64           1608 ns       1608 ns     432758   37.9501MB/s
-BM_copy/512         12589 ns      12589 ns      54806   38.7867MB/s
-BM_copy/1024        25169 ns      25169 ns      27713   38.8003MB/s
-BM_copy/8192       201165 ns     201112 ns       3486   38.8466MB/s
-RUNNING: ./a.out --benchmark_out=/tmp/tmpt1wwG_
-Run on (8 X 4000 MHz CPU s)
-2017-11-07 21:16:53
-------------------------------------------------------
-Benchmark               Time           CPU Iterations
-------------------------------------------------------
-BM_memcpy/8            36 ns         36 ns   19397903   211.255MB/s
-BM_memcpy/64           73 ns         73 ns    9691174   839.635MB/s
-BM_memcpy/512          85 ns         85 ns    8312329   5.60101GB/s
-BM_memcpy/1024        118 ns        118 ns    6438774   8.11608GB/s
-BM_memcpy/8192        656 ns        656 ns    1068644   11.6277GB/s
-BM_copy/8             223 ns        223 ns    3146977   34.2338MB/s
-BM_copy/64           1611 ns       1611 ns     435340   37.8751MB/s
-BM_copy/512         12622 ns      12622 ns      54818   38.6844MB/s
-BM_copy/1024        25257 ns      25239 ns      27779   38.6927MB/s
-BM_copy/8192       205013 ns     205010 ns       3479    38.108MB/s
-Comparing ./a.out to ./a.out
-Benchmark                 Time             CPU      Time Old      Time New       CPU Old       CPU New
-------------------------------------------------------------------------------------------------------
-BM_memcpy/8            +0.0020         +0.0020            36            36            36            36
-BM_memcpy/64           -0.0468         -0.0470            76            73            76            73
-BM_memcpy/512          +0.0081         +0.0083            84            85            84            85
-BM_memcpy/1024         +0.0098         +0.0097           116           118           116           118
-BM_memcpy/8192         +0.0200         +0.0203           643           656           643           656
-BM_copy/8              +0.0046         +0.0042           222           223           222           223
-BM_copy/64             +0.0020         +0.0020          1608          1611          1608          1611
-BM_copy/512            +0.0027         +0.0026         12589         12622         12589         12622
-BM_copy/1024           +0.0035         +0.0028         25169         25257         25169         25239
-BM_copy/8192           +0.0191         +0.0194        201165        205013        201112        205010
-```
-
-What it does is for the every benchmark from the first run it looks for the benchmark with exactly the same name in the second run, and then compares the results. If the names differ, the benchmark is omitted from the diff.
-As you can note, the values in `Time` and `CPU` columns are calculated as `(new - old) / |old|`.
-
-2. Compare two different filters of one benchmark
-The program is invoked like:
-
-``` bash
-$ compare.py filters <benchmark> <filter_baseline> <filter_contender> [benchmark options]...
-```
-Where `<benchmark>` either specify a benchmark executable file, or a JSON output file. The type of the input file is automatically detected. If a benchmark executable is specified then the benchmark is run to obtain the results. Otherwise the results are simply loaded from the output file.
-
-Where `<filter_baseline>` and `<filter_contender>` are the same regex filters that you would pass to the `[--benchmark_filter=<regex>]` parameter of the benchmark binary.
-
-`[benchmark options]` will be passed to the benchmarks invocations. They can be anything that binary accepts, be it either normal `--benchmark_*` parameters, or some custom parameters your binary takes.
-
-Example output:
-```
-$ ./compare.py filters ./a.out BM_memcpy BM_copy
-RUNNING: ./a.out --benchmark_filter=BM_memcpy --benchmark_out=/tmp/tmpBWKk0k
-Run on (8 X 4000 MHz CPU s)
-2017-11-07 21:37:28
-------------------------------------------------------
-Benchmark               Time           CPU Iterations
-------------------------------------------------------
-BM_memcpy/8            36 ns         36 ns   17891491   211.215MB/s
-BM_memcpy/64           74 ns         74 ns    9400999   825.646MB/s
-BM_memcpy/512          87 ns         87 ns    8027453   5.46126GB/s
-BM_memcpy/1024        111 ns        111 ns    6116853    8.5648GB/s
-BM_memcpy/8192        657 ns        656 ns    1064679   11.6247GB/s
-RUNNING: ./a.out --benchmark_filter=BM_copy --benchmark_out=/tmp/tmpAvWcOM
-Run on (8 X 4000 MHz CPU s)
-2017-11-07 21:37:33
-----------------------------------------------------
-Benchmark             Time           CPU Iterations
-----------------------------------------------------
-BM_copy/8           227 ns        227 ns    3038700   33.6264MB/s
-BM_copy/64         1640 ns       1640 ns     426893   37.2154MB/s
-BM_copy/512       12804 ns      12801 ns      55417   38.1444MB/s
-BM_copy/1024      25409 ns      25407 ns      27516   38.4365MB/s
-BM_copy/8192     202986 ns     202990 ns       3454   38.4871MB/s
-Comparing BM_memcpy to BM_copy (from ./a.out)
-Benchmark                               Time             CPU      Time Old      Time New       CPU Old       CPU New
---------------------------------------------------------------------------------------------------------------------
-[BM_memcpy vs. BM_copy]/8            +5.2829         +5.2812            36           227            36           227
-[BM_memcpy vs. BM_copy]/64          +21.1719        +21.1856            74          1640            74          1640
-[BM_memcpy vs. BM_copy]/512        +145.6487       +145.6097            87         12804            87         12801
-[BM_memcpy vs. BM_copy]/1024       +227.1860       +227.1776           111         25409           111         25407
-[BM_memcpy vs. BM_copy]/8192       +308.1664       +308.2898           657        202986           656        202990
-```
-
-As you can see, it applies filter to the benchmarks, both when running the benchmark, and before doing the diff. And to make the diff work, the matches are replaced with some common string. Thus, you can compare two different benchmark families within one benchmark binary.
-As you can note, the values in `Time` and `CPU` columns are calculated as `(new - old) / |old|`.
-
-3. Compare filter one from benchmark one to filter two from benchmark two:
-The program is invoked like:
-
-``` bash
-$ compare.py filters <benchmark_baseline> <filter_baseline> <benchmark_contender> <filter_contender> [benchmark options]...
-```
-
-Where `<benchmark_baseline>` and `<benchmark_contender>` either specify a benchmark executable file, or a JSON output file. The type of the input file is automatically detected. If a benchmark executable is specified then the benchmark is run to obtain the results. Otherwise the results are simply loaded from the output file.
-
-Where `<filter_baseline>` and `<filter_contender>` are the same regex filters that you would pass to the `[--benchmark_filter=<regex>]` parameter of the benchmark binary.
-
-`[benchmark options]` will be passed to the benchmarks invocations. They can be anything that binary accepts, be it either normal `--benchmark_*` parameters, or some custom parameters your binary takes.
-
-Example output:
-```
-$ ./compare.py benchmarksfiltered ./a.out BM_memcpy ./a.out BM_copy
-RUNNING: ./a.out --benchmark_filter=BM_memcpy --benchmark_out=/tmp/tmp_FvbYg
-Run on (8 X 4000 MHz CPU s)
-2017-11-07 21:38:27
-------------------------------------------------------
-Benchmark               Time           CPU Iterations
-------------------------------------------------------
-BM_memcpy/8            37 ns         37 ns   18953482   204.118MB/s
-BM_memcpy/64           74 ns         74 ns    9206578   828.245MB/s
-BM_memcpy/512          91 ns         91 ns    8086195   5.25476GB/s
-BM_memcpy/1024        120 ns        120 ns    5804513   7.95662GB/s
-BM_memcpy/8192        664 ns        664 ns    1028363   11.4948GB/s
-RUNNING: ./a.out --benchmark_filter=BM_copy --benchmark_out=/tmp/tmpDfL5iE
-Run on (8 X 4000 MHz CPU s)
-2017-11-07 21:38:32
-----------------------------------------------------
-Benchmark             Time           CPU Iterations
-----------------------------------------------------
-BM_copy/8           230 ns        230 ns    2985909   33.1161MB/s
-BM_copy/64         1654 ns       1653 ns     419408   36.9137MB/s
-BM_copy/512       13122 ns      13120 ns      53403   37.2156MB/s
-BM_copy/1024      26679 ns      26666 ns      26575   36.6218MB/s
-BM_copy/8192     215068 ns     215053 ns       3221   36.3283MB/s
-Comparing BM_memcpy (from ./a.out) to BM_copy (from ./a.out)
-Benchmark                               Time             CPU      Time Old      Time New       CPU Old       CPU New
---------------------------------------------------------------------------------------------------------------------
-[BM_memcpy vs. BM_copy]/8            +5.1649         +5.1637            37           230            37           230
-[BM_memcpy vs. BM_copy]/64          +21.4352        +21.4374            74          1654            74          1653
-[BM_memcpy vs. BM_copy]/512        +143.6022       +143.5865            91         13122            91         13120
-[BM_memcpy vs. BM_copy]/1024       +221.5903       +221.4790           120         26679           120         26666
-[BM_memcpy vs. BM_copy]/8192       +322.9059       +323.0096           664        215068           664        215053
-```
-This is a mix of the previous two modes, two (potentially different) benchmark binaries are run, and a different filter is applied to each one.
-As you can note, the values in `Time` and `CPU` columns are calculated as `(new - old) / |old|`.
diff --git a/gnu/llvm/llvm/utils/benchmark/include/benchmark/benchmark.h b/gnu/llvm/llvm/utils/benchmark/include/benchmark/benchmark.h
deleted file mode 100644
index 528aa7f9c8b..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/include/benchmark/benchmark.h
+++ /dev/null
@@ -1,1467 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Support for registering benchmarks for functions.
-
-/* Example usage:
-// Define a function that executes the code to be measured a
-// specified number of times:
-static void BM_StringCreation(benchmark::State& state) {
-  for (auto _ : state)
-    std::string empty_string;
-}
-
-// Register the function as a benchmark
-BENCHMARK(BM_StringCreation);
-
-// Define another benchmark
-static void BM_StringCopy(benchmark::State& state) {
-  std::string x = "hello";
-  for (auto _ : state)
-    std::string copy(x);
-}
-BENCHMARK(BM_StringCopy);
-
-// Augment the main() program to invoke benchmarks if specified
-// via the --benchmarks command line flag.  E.g.,
-//       my_unittest --benchmark_filter=all
-//       my_unittest --benchmark_filter=BM_StringCreation
-//       my_unittest --benchmark_filter=String
-//       my_unittest --benchmark_filter='Copy|Creation'
-int main(int argc, char** argv) {
-  benchmark::Initialize(&argc, argv);
-  benchmark::RunSpecifiedBenchmarks();
-  return 0;
-}
-
-// Sometimes a family of microbenchmarks can be implemented with
-// just one routine that takes an extra argument to specify which
-// one of the family of benchmarks to run.  For example, the following
-// code defines a family of microbenchmarks for measuring the speed
-// of memcpy() calls of different lengths:
-
-static void BM_memcpy(benchmark::State& state) {
-  char* src = new char[state.range(0)]; char* dst = new char[state.range(0)];
-  memset(src, 'x', state.range(0));
-  for (auto _ : state)
-    memcpy(dst, src, state.range(0));
-  state.SetBytesProcessed(int64_t(state.iterations()) *
-                          int64_t(state.range(0)));
-  delete[] src; delete[] dst;
-}
-BENCHMARK(BM_memcpy)->Arg(8)->Arg(64)->Arg(512)->Arg(1<<10)->Arg(8<<10);
-
-// The preceding code is quite repetitive, and can be replaced with the
-// following short-hand.  The following invocation will pick a few
-// appropriate arguments in the specified range and will generate a
-// microbenchmark for each such argument.
-BENCHMARK(BM_memcpy)->Range(8, 8<<10);
-
-// You might have a microbenchmark that depends on two inputs.  For
-// example, the following code defines a family of microbenchmarks for
-// measuring the speed of set insertion.
-static void BM_SetInsert(benchmark::State& state) {
-  set<int> data;
-  for (auto _ : state) {
-    state.PauseTiming();
-    data = ConstructRandomSet(state.range(0));
-    state.ResumeTiming();
-    for (int j = 0; j < state.range(1); ++j)
-      data.insert(RandomNumber());
-  }
-}
-BENCHMARK(BM_SetInsert)
-   ->Args({1<<10, 128})
-   ->Args({2<<10, 128})
-   ->Args({4<<10, 128})
-   ->Args({8<<10, 128})
-   ->Args({1<<10, 512})
-   ->Args({2<<10, 512})
-   ->Args({4<<10, 512})
-   ->Args({8<<10, 512});
-
-// The preceding code is quite repetitive, and can be replaced with
-// the following short-hand.  The following macro will pick a few
-// appropriate arguments in the product of the two specified ranges
-// and will generate a microbenchmark for each such pair.
-BENCHMARK(BM_SetInsert)->Ranges({{1<<10, 8<<10}, {128, 512}});
-
-// For more complex patterns of inputs, passing a custom function
-// to Apply allows programmatic specification of an
-// arbitrary set of arguments to run the microbenchmark on.
-// The following example enumerates a dense range on
-// one parameter, and a sparse range on the second.
-static void CustomArguments(benchmark::internal::Benchmark* b) {
-  for (int i = 0; i <= 10; ++i)
-    for (int j = 32; j <= 1024*1024; j *= 8)
-      b->Args({i, j});
-}
-BENCHMARK(BM_SetInsert)->Apply(CustomArguments);
-
-// Templated microbenchmarks work the same way:
-// Produce then consume 'size' messages 'iters' times
-// Measures throughput in the absence of multiprogramming.
-template <class Q> int BM_Sequential(benchmark::State& state) {
-  Q q;
-  typename Q::value_type v;
-  for (auto _ : state) {
-    for (int i = state.range(0); i--; )
-      q.push(v);
-    for (int e = state.range(0); e--; )
-      q.Wait(&v);
-  }
-  // actually messages, not bytes:
-  state.SetBytesProcessed(
-      static_cast<int64_t>(state.iterations())*state.range(0));
-}
-BENCHMARK_TEMPLATE(BM_Sequential, WaitQueue<int>)->Range(1<<0, 1<<10);
-
-Use `Benchmark::MinTime(double t)` to set the minimum time used to run the
-benchmark. This option overrides the `benchmark_min_time` flag.
-
-void BM_test(benchmark::State& state) {
- ... body ...
-}
-BENCHMARK(BM_test)->MinTime(2.0); // Run for at least 2 seconds.
-
-In a multithreaded test, it is guaranteed that none of the threads will start
-until all have reached the loop start, and all will have finished before any
-thread exits the loop body. As such, any global setup or teardown you want to
-do can be wrapped in a check against the thread index:
-
-static void BM_MultiThreaded(benchmark::State& state) {
-  if (state.thread_index == 0) {
-    // Setup code here.
-  }
-  for (auto _ : state) {
-    // Run the test as normal.
-  }
-  if (state.thread_index == 0) {
-    // Teardown code here.
-  }
-}
-BENCHMARK(BM_MultiThreaded)->Threads(4);
-
-
-If a benchmark runs a few milliseconds it may be hard to visually compare the
-measured times, since the output data is given in nanoseconds per default. In
-order to manually set the time unit, you can specify it manually:
-
-BENCHMARK(BM_test)->Unit(benchmark::kMillisecond);
-*/
-
-#ifndef BENCHMARK_BENCHMARK_H_
-#define BENCHMARK_BENCHMARK_H_
-
-
-// The _MSVC_LANG check should detect Visual Studio 2015 Update 3 and newer.
-#if __cplusplus >= 201103L || (defined(_MSVC_LANG) && _MSVC_LANG >= 201103L)
-#define BENCHMARK_HAS_CXX11
-#endif
-
-#include <stdint.h>
-
-#include <algorithm>
-#include <cassert>
-#include <cstddef>
-#include <iosfwd>
-#include <string>
-#include <vector>
-#include <map>
-#include <set>
-
-#if defined(BENCHMARK_HAS_CXX11)
-#include <type_traits>
-#include <initializer_list>
-#include <utility>
-#endif
-
-#if defined(_MSC_VER)
-#include <intrin.h> // for _ReadWriteBarrier
-#endif
-
-#ifndef BENCHMARK_HAS_CXX11
-#define BENCHMARK_DISALLOW_COPY_AND_ASSIGN(TypeName) \
-  TypeName(const TypeName&);                         \
-  TypeName& operator=(const TypeName&)
-#else
-#define BENCHMARK_DISALLOW_COPY_AND_ASSIGN(TypeName) \
-  TypeName(const TypeName&) = delete;                \
-  TypeName& operator=(const TypeName&) = delete
-#endif
-
-#if defined(__GNUC__)
-#define BENCHMARK_UNUSED __attribute__((unused))
-#define BENCHMARK_ALWAYS_INLINE __attribute__((always_inline))
-#define BENCHMARK_NOEXCEPT noexcept
-#define BENCHMARK_NOEXCEPT_OP(x) noexcept(x)
-#elif defined(_MSC_VER) && !defined(__clang__)
-#define BENCHMARK_UNUSED
-#define BENCHMARK_ALWAYS_INLINE __forceinline
-#if _MSC_VER >= 1900
-#define BENCHMARK_NOEXCEPT noexcept
-#define BENCHMARK_NOEXCEPT_OP(x) noexcept(x)
-#else
-#define BENCHMARK_NOEXCEPT
-#define BENCHMARK_NOEXCEPT_OP(x)
-#endif
-#define __func__ __FUNCTION__
-#else
-#define BENCHMARK_UNUSED
-#define BENCHMARK_ALWAYS_INLINE
-#define BENCHMARK_NOEXCEPT
-#define BENCHMARK_NOEXCEPT_OP(x)
-#endif
-
-#define BENCHMARK_INTERNAL_TOSTRING2(x) #x
-#define BENCHMARK_INTERNAL_TOSTRING(x) BENCHMARK_INTERNAL_TOSTRING2(x)
-
-#if defined(__GNUC__)
-#define BENCHMARK_BUILTIN_EXPECT(x, y) __builtin_expect(x, y)
-#define BENCHMARK_DEPRECATED_MSG(msg) __attribute__((deprecated(msg)))
-#else
-#define BENCHMARK_BUILTIN_EXPECT(x, y) x
-#define BENCHMARK_DEPRECATED_MSG(msg)
-#define BENCHMARK_WARNING_MSG(msg) __pragma(message(__FILE__ "(" BENCHMARK_INTERNAL_TOSTRING(__LINE__) ") : warning note: " msg))
-#endif
-
-#if defined(__GNUC__) && !defined(__clang__)
-#define BENCHMARK_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
-#endif
-
-#ifndef __has_builtin
-#define __has_builtin(x) 0
-#endif
-
-#if defined(__GNUC__) || __has_builtin(__builtin_unreachable)
-  #define BENCHMARK_UNREACHABLE() __builtin_unreachable()
-#elif defined(_MSC_VER)
-  #define BENCHMARK_UNREACHABLE() __assume(false)
-#else
-  #define BENCHMARK_UNREACHABLE() ((void)0)
-#endif
-
-namespace benchmark {
-class BenchmarkReporter;
-
-void Initialize(int* argc, char** argv);
-
-// Report to stdout all arguments in 'argv' as unrecognized except the first.
-// Returns true there is at least on unrecognized argument (i.e. 'argc' > 1).
-bool ReportUnrecognizedArguments(int argc, char** argv);
-
-// Generate a list of benchmarks matching the specified --benchmark_filter flag
-// and if --benchmark_list_tests is specified return after printing the name
-// of each matching benchmark. Otherwise run each matching benchmark and
-// report the results.
-//
-// The second and third overload use the specified 'console_reporter' and
-//  'file_reporter' respectively. 'file_reporter' will write to the file
-//  specified
-//   by '--benchmark_output'. If '--benchmark_output' is not given the
-//  'file_reporter' is ignored.
-//
-// RETURNS: The number of matching benchmarks.
-size_t RunSpecifiedBenchmarks();
-size_t RunSpecifiedBenchmarks(BenchmarkReporter* console_reporter);
-size_t RunSpecifiedBenchmarks(BenchmarkReporter* console_reporter,
-                              BenchmarkReporter* file_reporter);
-
-// If this routine is called, peak memory allocation past this point in the
-// benchmark is reported at the end of the benchmark report line. (It is
-// computed by running the benchmark once with a single iteration and a memory
-// tracer.)
-// TODO(dominic)
-// void MemoryUsage();
-
-namespace internal {
-class Benchmark;
-class BenchmarkImp;
-class BenchmarkFamilies;
-
-void UseCharPointer(char const volatile*);
-
-// Take ownership of the pointer and register the benchmark. Return the
-// registered benchmark.
-Benchmark* RegisterBenchmarkInternal(Benchmark*);
-
-// Ensure that the standard streams are properly initialized in every TU.
-int InitializeStreams();
-BENCHMARK_UNUSED static int stream_init_anchor = InitializeStreams();
-
-}  // namespace internal
-
-
-#if (!defined(__GNUC__) && !defined(__clang__)) || defined(__pnacl__) || \
-    defined(__EMSCRIPTEN__)
-# define BENCHMARK_HAS_NO_INLINE_ASSEMBLY
-#endif
-
-
-// The DoNotOptimize(...) function can be used to prevent a value or
-// expression from being optimized away by the compiler. This function is
-// intended to add little to no overhead.
-// See: https://youtu.be/nXaxk27zwlk?t=2441
-#ifndef BENCHMARK_HAS_NO_INLINE_ASSEMBLY
-template <class Tp>
-inline BENCHMARK_ALWAYS_INLINE
-void DoNotOptimize(Tp const& value) {
-    asm volatile("" : : "r,m"(value) : "memory");
-}
-
-template <class Tp>
-inline BENCHMARK_ALWAYS_INLINE void DoNotOptimize(Tp& value) {
-#if defined(__clang__)
-  asm volatile("" : "+r,m"(value) : : "memory");
-#else
-  asm volatile("" : "+m,r"(value) : : "memory");
-#endif
-}
-
-// Force the compiler to flush pending writes to global memory. Acts as an
-// effective read/write barrier
-inline BENCHMARK_ALWAYS_INLINE void ClobberMemory() {
-  asm volatile("" : : : "memory");
-}
-#elif defined(_MSC_VER)
-template <class Tp>
-inline BENCHMARK_ALWAYS_INLINE void DoNotOptimize(Tp const& value) {
-  internal::UseCharPointer(&reinterpret_cast<char const volatile&>(value));
-  _ReadWriteBarrier();
-}
-
-inline BENCHMARK_ALWAYS_INLINE void ClobberMemory() {
-  _ReadWriteBarrier();
-}
-#else
-template <class Tp>
-inline BENCHMARK_ALWAYS_INLINE void DoNotOptimize(Tp const& value) {
-  internal::UseCharPointer(&reinterpret_cast<char const volatile&>(value));
-}
-// FIXME Add ClobberMemory() for non-gnu and non-msvc compilers
-#endif
-
-
-
-// This class is used for user-defined counters.
-class Counter {
-public:
-
-  enum Flags {
-    kDefaults   = 0,
-    // Mark the counter as a rate. It will be presented divided
-    // by the duration of the benchmark.
-    kIsRate     = 1,
-    // Mark the counter as a thread-average quantity. It will be
-    // presented divided by the number of threads.
-    kAvgThreads = 2,
-    // Mark the counter as a thread-average rate. See above.
-    kAvgThreadsRate = kIsRate|kAvgThreads
-  };
-
-  double value;
-  Flags  flags;
-
-  BENCHMARK_ALWAYS_INLINE
-  Counter(double v = 0., Flags f = kDefaults) : value(v), flags(f) {}
-
-  BENCHMARK_ALWAYS_INLINE operator double const& () const { return value; }
-  BENCHMARK_ALWAYS_INLINE operator double      & ()       { return value; }
-
-};
-
-// This is the container for the user-defined counters.
-typedef std::map<std::string, Counter> UserCounters;
-
-
-// TimeUnit is passed to a benchmark in order to specify the order of magnitude
-// for the measured time.
-enum TimeUnit { kNanosecond, kMicrosecond, kMillisecond };
-
-// BigO is passed to a benchmark in order to specify the asymptotic
-// computational
-// complexity for the benchmark. In case oAuto is selected, complexity will be
-// calculated automatically to the best fit.
-enum BigO { oNone, o1, oN, oNSquared, oNCubed, oLogN, oNLogN, oAuto, oLambda };
-
-// BigOFunc is passed to a benchmark in order to specify the asymptotic
-// computational complexity for the benchmark.
-typedef double(BigOFunc)(int64_t);
-
-// StatisticsFunc is passed to a benchmark in order to compute some descriptive
-// statistics over all the measurements of some type
-typedef double(StatisticsFunc)(const std::vector<double>&);
-
-struct Statistics {
-  std::string name_;
-  StatisticsFunc* compute_;
-
-  Statistics(std::string name, StatisticsFunc* compute)
-    : name_(name), compute_(compute) {}
-};
-
-namespace internal {
-class ThreadTimer;
-class ThreadManager;
-
-enum ReportMode
-#if defined(BENCHMARK_HAS_CXX11)
-  : unsigned
-#else
-#endif
-  {
-  RM_Unspecified,  // The mode has not been manually specified
-  RM_Default,      // The mode is user-specified as default.
-  RM_ReportAggregatesOnly
-};
-}  // namespace internal
-
-// State is passed to a running Benchmark and contains state for the
-// benchmark to use.
-class State {
- public:
-  struct StateIterator;
-  friend struct StateIterator;
-
-  // Returns iterators used to run each iteration of a benchmark using a
-  // C++11 ranged-based for loop. These functions should not be called directly.
-  //
-  // REQUIRES: The benchmark has not started running yet. Neither begin nor end
-  // have been called previously.
-  //
-  // NOTE: KeepRunning may not be used after calling either of these functions.
-  BENCHMARK_ALWAYS_INLINE StateIterator begin();
-  BENCHMARK_ALWAYS_INLINE StateIterator end();
-
-  // Returns true if the benchmark should continue through another iteration.
-  // NOTE: A benchmark may not return from the test until KeepRunning() has
-  // returned false.
-  bool KeepRunning();
-
-  // Returns true iff the benchmark should run n more iterations.
-  // REQUIRES: 'n' > 0.
-  // NOTE: A benchmark must not return from the test until KeepRunningBatch()
-  // has returned false.
-  // NOTE: KeepRunningBatch() may overshoot by up to 'n' iterations.
-  //
-  // Intended usage:
-  //   while (state.KeepRunningBatch(1000)) {
-  //     // process 1000 elements
-  //   }
-  bool KeepRunningBatch(size_t n);
-
-  // REQUIRES: timer is running and 'SkipWithError(...)' has not been called
-  //           by the current thread.
-  // Stop the benchmark timer.  If not called, the timer will be
-  // automatically stopped after the last iteration of the benchmark loop.
-  //
-  // For threaded benchmarks the PauseTiming() function only pauses the timing
-  // for the current thread.
-  //
-  // NOTE: The "real time" measurement is per-thread. If different threads
-  // report different measurements the largest one is reported.
-  //
-  // NOTE: PauseTiming()/ResumeTiming() are relatively
-  // heavyweight, and so their use should generally be avoided
-  // within each benchmark iteration, if possible.
-  void PauseTiming();
-
-  // REQUIRES: timer is not running and 'SkipWithError(...)' has not been called
-  //           by the current thread.
-  // Start the benchmark timer.  The timer is NOT running on entrance to the
-  // benchmark function. It begins running after control flow enters the
-  // benchmark loop.
-  //
-  // NOTE: PauseTiming()/ResumeTiming() are relatively
-  // heavyweight, and so their use should generally be avoided
-  // within each benchmark iteration, if possible.
-  void ResumeTiming();
-
-  // REQUIRES: 'SkipWithError(...)' has not been called previously by the
-  //            current thread.
-  // Report the benchmark as resulting in an error with the specified 'msg'.
-  // After this call the user may explicitly 'return' from the benchmark.
-  //
-  // If the ranged-for style of benchmark loop is used, the user must explicitly
-  // break from the loop, otherwise all future iterations will be run.
-  // If the 'KeepRunning()' loop is used the current thread will automatically
-  // exit the loop at the end of the current iteration.
-  //
-  // For threaded benchmarks only the current thread stops executing and future
-  // calls to `KeepRunning()` will block until all threads have completed
-  // the `KeepRunning()` loop. If multiple threads report an error only the
-  // first error message is used.
-  //
-  // NOTE: Calling 'SkipWithError(...)' does not cause the benchmark to exit
-  // the current scope immediately. If the function is called from within
-  // the 'KeepRunning()' loop the current iteration will finish. It is the users
-  // responsibility to exit the scope as needed.
-  void SkipWithError(const char* msg);
-
-  // REQUIRES: called exactly once per iteration of the benchmarking loop.
-  // Set the manually measured time for this benchmark iteration, which
-  // is used instead of automatically measured time if UseManualTime() was
-  // specified.
-  //
-  // For threaded benchmarks the final value will be set to the largest
-  // reported values.
-  void SetIterationTime(double seconds);
-
-  // Set the number of bytes processed by the current benchmark
-  // execution.  This routine is typically called once at the end of a
-  // throughput oriented benchmark.  If this routine is called with a
-  // value > 0, the report is printed in MB/sec instead of nanoseconds
-  // per iteration.
-  //
-  // REQUIRES: a benchmark has exited its benchmarking loop.
-  BENCHMARK_ALWAYS_INLINE
-  void SetBytesProcessed(int64_t bytes) { bytes_processed_ = bytes; }
-
-  BENCHMARK_ALWAYS_INLINE
-  int64_t bytes_processed() const { return bytes_processed_; }
-
-  // If this routine is called with complexity_n > 0 and complexity report is
-  // requested for the
-  // family benchmark, then current benchmark will be part of the computation
-  // and complexity_n will
-  // represent the length of N.
-  BENCHMARK_ALWAYS_INLINE
-  void SetComplexityN(int64_t complexity_n) { complexity_n_ = complexity_n; }
-
-  BENCHMARK_ALWAYS_INLINE
-  int64_t complexity_length_n() { return complexity_n_; }
-
-  // If this routine is called with items > 0, then an items/s
-  // label is printed on the benchmark report line for the currently
-  // executing benchmark. It is typically called at the end of a processing
-  // benchmark where a processing items/second output is desired.
-  //
-  // REQUIRES: a benchmark has exited its benchmarking loop.
-  BENCHMARK_ALWAYS_INLINE
-  void SetItemsProcessed(int64_t items) { items_processed_ = items; }
-
-  BENCHMARK_ALWAYS_INLINE
-  int64_t items_processed() const { return items_processed_; }
-
-  // If this routine is called, the specified label is printed at the
-  // end of the benchmark report line for the currently executing
-  // benchmark.  Example:
-  //  static void BM_Compress(benchmark::State& state) {
-  //    ...
-  //    double compress = input_size / output_size;
-  //    state.SetLabel(StrFormat("compress:%.1f%%", 100.0*compression));
-  //  }
-  // Produces output that looks like:
-  //  BM_Compress   50         50   14115038  compress:27.3%
-  //
-  // REQUIRES: a benchmark has exited its benchmarking loop.
-  void SetLabel(const char* label);
-
-  void BENCHMARK_ALWAYS_INLINE SetLabel(const std::string& str) {
-    this->SetLabel(str.c_str());
-  }
-
-  // Range arguments for this run. CHECKs if the argument has been set.
-  BENCHMARK_ALWAYS_INLINE
-  int64_t range(std::size_t pos = 0) const {
-    assert(range_.size() > pos);
-    return range_[pos];
-  }
-
-  BENCHMARK_DEPRECATED_MSG("use 'range(0)' instead")
-  int64_t range_x() const { return range(0); }
-
-  BENCHMARK_DEPRECATED_MSG("use 'range(1)' instead")
-  int64_t range_y() const { return range(1); }
-
-  BENCHMARK_ALWAYS_INLINE
-  size_t iterations() const {
-    if (BENCHMARK_BUILTIN_EXPECT(!started_, false)) {
-      return 0;
-    }
-    return max_iterations - total_iterations_ + batch_leftover_;
-  }
-
-private: // items we expect on the first cache line (ie 64 bytes of the struct)
-
-  // When total_iterations_ is 0, KeepRunning() and friends will return false.
-  // May be larger than max_iterations.
-  size_t total_iterations_;
-
-  // When using KeepRunningBatch(), batch_leftover_ holds the number of
-  // iterations beyond max_iters that were run. Used to track
-  // completed_iterations_ accurately.
-  size_t batch_leftover_;
-
-public:
-  const size_t max_iterations;
-
-private:
-  bool started_;
-  bool finished_;
-  bool error_occurred_;
-
-private: // items we don't need on the first cache line
-  std::vector<int64_t> range_;
-
-  int64_t bytes_processed_;
-  int64_t items_processed_;
-
-  int64_t complexity_n_;
-
- public:
-  // Container for user-defined counters.
-  UserCounters counters;
-  // Index of the executing thread. Values from [0, threads).
-  const int thread_index;
-  // Number of threads concurrently executing the benchmark.
-  const int threads;
-
-
-  // TODO(EricWF) make me private
-  State(size_t max_iters, const std::vector<int64_t>& ranges, int thread_i,
-        int n_threads, internal::ThreadTimer* timer,
-        internal::ThreadManager* manager);
-
- private:
-  void StartKeepRunning();
-  // Implementation of KeepRunning() and KeepRunningBatch().
-  // is_batch must be true unless n is 1.
-  bool KeepRunningInternal(size_t n, bool is_batch);
-  void FinishKeepRunning();
-  internal::ThreadTimer* timer_;
-  internal::ThreadManager* manager_;
-  BENCHMARK_DISALLOW_COPY_AND_ASSIGN(State);
-};
-
-inline BENCHMARK_ALWAYS_INLINE
-bool State::KeepRunning() {
-  return KeepRunningInternal(1, /*is_batch=*/ false);
-}
-
-inline BENCHMARK_ALWAYS_INLINE
-bool State::KeepRunningBatch(size_t n) {
-  return KeepRunningInternal(n, /*is_batch=*/ true);
-}
-
-inline BENCHMARK_ALWAYS_INLINE
-bool State::KeepRunningInternal(size_t n, bool is_batch) {
-  // total_iterations_ is set to 0 by the constructor, and always set to a
-  // nonzero value by StartKepRunning().
-  assert(n > 0);
-  // n must be 1 unless is_batch is true.
-  assert(is_batch || n == 1);
-  if (BENCHMARK_BUILTIN_EXPECT(total_iterations_ >= n, true)) {
-    total_iterations_ -= n;
-    return true;
-  }
-  if (!started_) {
-    StartKeepRunning();
-    if (!error_occurred_ && total_iterations_ >= n) {
-      total_iterations_-= n;
-      return true;
-    }
-  }
-  // For non-batch runs, total_iterations_ must be 0 by now.
-  if (is_batch && total_iterations_ != 0) {
-    batch_leftover_  = n - total_iterations_;
-    total_iterations_ = 0;
-    return true;
-  }
-  FinishKeepRunning();
-  return false;
-}
-
-struct State::StateIterator {
-  struct BENCHMARK_UNUSED Value {};
-  typedef std::forward_iterator_tag iterator_category;
-  typedef Value value_type;
-  typedef Value reference;
-  typedef Value pointer;
-  typedef std::ptrdiff_t difference_type;
-
- private:
-  friend class State;
-  BENCHMARK_ALWAYS_INLINE
-  StateIterator() : cached_(0), parent_() {}
-
-  BENCHMARK_ALWAYS_INLINE
-  explicit StateIterator(State* st)
-      : cached_(st->error_occurred_ ? 0 : st->max_iterations), parent_(st) {}
-
- public:
-  BENCHMARK_ALWAYS_INLINE
-  Value operator*() const { return Value(); }
-
-  BENCHMARK_ALWAYS_INLINE
-  StateIterator& operator++() {
-    assert(cached_ > 0);
-    --cached_;
-    return *this;
-  }
-
-  BENCHMARK_ALWAYS_INLINE
-  bool operator!=(StateIterator const&) const {
-    if (BENCHMARK_BUILTIN_EXPECT(cached_ != 0, true)) return true;
-    parent_->FinishKeepRunning();
-    return false;
-  }
-
- private:
-  size_t cached_;
-  State* const parent_;
-};
-
-inline BENCHMARK_ALWAYS_INLINE State::StateIterator State::begin() {
-  return StateIterator(this);
-}
-inline BENCHMARK_ALWAYS_INLINE State::StateIterator State::end() {
-  StartKeepRunning();
-  return StateIterator();
-}
-
-namespace internal {
-
-typedef void(Function)(State&);
-
-// ------------------------------------------------------
-// Benchmark registration object.  The BENCHMARK() macro expands
-// into an internal::Benchmark* object.  Various methods can
-// be called on this object to change the properties of the benchmark.
-// Each method returns "this" so that multiple method calls can
-// chained into one expression.
-class Benchmark {
- public:
-  virtual ~Benchmark();
-
-  // Note: the following methods all return "this" so that multiple
-  // method calls can be chained together in one expression.
-
-  // Run this benchmark once with "x" as the extra argument passed
-  // to the function.
-  // REQUIRES: The function passed to the constructor must accept an arg1.
-  Benchmark* Arg(int64_t x);
-
-  // Run this benchmark with the given time unit for the generated output report
-  Benchmark* Unit(TimeUnit unit);
-
-  // Run this benchmark once for a number of values picked from the
-  // range [start..limit].  (start and limit are always picked.)
-  // REQUIRES: The function passed to the constructor must accept an arg1.
-  Benchmark* Range(int64_t start, int64_t limit);
-
-  // Run this benchmark once for all values in the range [start..limit] with
-  // specific step
-  // REQUIRES: The function passed to the constructor must accept an arg1.
-  Benchmark* DenseRange(int64_t start, int64_t limit, int step = 1);
-
-  // Run this benchmark once with "args" as the extra arguments passed
-  // to the function.
-  // REQUIRES: The function passed to the constructor must accept arg1, arg2 ...
-  Benchmark* Args(const std::vector<int64_t>& args);
-
-  // Equivalent to Args({x, y})
-  // NOTE: This is a legacy C++03 interface provided for compatibility only.
-  //   New code should use 'Args'.
-  Benchmark* ArgPair(int64_t x, int64_t y) {
-    std::vector<int64_t> args;
-    args.push_back(x);
-    args.push_back(y);
-    return Args(args);
-  }
-
-  // Run this benchmark once for a number of values picked from the
-  // ranges [start..limit].  (starts and limits are always picked.)
-  // REQUIRES: The function passed to the constructor must accept arg1, arg2 ...
-  Benchmark* Ranges(const std::vector<std::pair<int64_t, int64_t> >& ranges);
-
-  // Equivalent to ArgNames({name})
-  Benchmark* ArgName(const std::string& name);
-
-  // Set the argument names to display in the benchmark name. If not called,
-  // only argument values will be shown.
-  Benchmark* ArgNames(const std::vector<std::string>& names);
-
-  // Equivalent to Ranges({{lo1, hi1}, {lo2, hi2}}).
-  // NOTE: This is a legacy C++03 interface provided for compatibility only.
-  //   New code should use 'Ranges'.
-  Benchmark* RangePair(int64_t lo1, int64_t hi1, int64_t lo2, int64_t hi2) {
-    std::vector<std::pair<int64_t, int64_t> > ranges;
-    ranges.push_back(std::make_pair(lo1, hi1));
-    ranges.push_back(std::make_pair(lo2, hi2));
-    return Ranges(ranges);
-  }
-
-  // Pass this benchmark object to *func, which can customize
-  // the benchmark by calling various methods like Arg, Args,
-  // Threads, etc.
-  Benchmark* Apply(void (*func)(Benchmark* benchmark));
-
-  // Set the range multiplier for non-dense range. If not called, the range
-  // multiplier kRangeMultiplier will be used.
-  Benchmark* RangeMultiplier(int multiplier);
-
-  // Set the minimum amount of time to use when running this benchmark. This
-  // option overrides the `benchmark_min_time` flag.
-  // REQUIRES: `t > 0` and `Iterations` has not been called on this benchmark.
-  Benchmark* MinTime(double t);
-
-  // Specify the amount of iterations that should be run by this benchmark.
-  // REQUIRES: 'n > 0' and `MinTime` has not been called on this benchmark.
-  //
-  // NOTE: This function should only be used when *exact* iteration control is
-  //   needed and never to control or limit how long a benchmark runs, where
-  // `--benchmark_min_time=N` or `MinTime(...)` should be used instead.
-  Benchmark* Iterations(size_t n);
-
-  // Specify the amount of times to repeat this benchmark. This option overrides
-  // the `benchmark_repetitions` flag.
-  // REQUIRES: `n > 0`
-  Benchmark* Repetitions(int n);
-
-  // Specify if each repetition of the benchmark should be reported separately
-  // or if only the final statistics should be reported. If the benchmark
-  // is not repeated then the single result is always reported.
-  Benchmark* ReportAggregatesOnly(bool value = true);
-
-  // If a particular benchmark is I/O bound, runs multiple threads internally or
-  // if for some reason CPU timings are not representative, call this method. If
-  // called, the elapsed time will be used to control how many iterations are
-  // run, and in the printing of items/second or MB/seconds values.  If not
-  // called, the cpu time used by the benchmark will be used.
-  Benchmark* UseRealTime();
-
-  // If a benchmark must measure time manually (e.g. if GPU execution time is
-  // being
-  // measured), call this method. If called, each benchmark iteration should
-  // call
-  // SetIterationTime(seconds) to report the measured time, which will be used
-  // to control how many iterations are run, and in the printing of items/second
-  // or MB/second values.
-  Benchmark* UseManualTime();
-
-  // Set the asymptotic computational complexity for the benchmark. If called
-  // the asymptotic computational complexity will be shown on the output.
-  Benchmark* Complexity(BigO complexity = benchmark::oAuto);
-
-  // Set the asymptotic computational complexity for the benchmark. If called
-  // the asymptotic computational complexity will be shown on the output.
-  Benchmark* Complexity(BigOFunc* complexity);
-
-  // Add this statistics to be computed over all the values of benchmark run
-  Benchmark* ComputeStatistics(std::string name, StatisticsFunc* statistics);
-
-  // Support for running multiple copies of the same benchmark concurrently
-  // in multiple threads.  This may be useful when measuring the scaling
-  // of some piece of code.
-
-  // Run one instance of this benchmark concurrently in t threads.
-  Benchmark* Threads(int t);
-
-  // Pick a set of values T from [min_threads,max_threads].
-  // min_threads and max_threads are always included in T.  Run this
-  // benchmark once for each value in T.  The benchmark run for a
-  // particular value t consists of t threads running the benchmark
-  // function concurrently.  For example, consider:
-  //    BENCHMARK(Foo)->ThreadRange(1,16);
-  // This will run the following benchmarks:
-  //    Foo in 1 thread
-  //    Foo in 2 threads
-  //    Foo in 4 threads
-  //    Foo in 8 threads
-  //    Foo in 16 threads
-  Benchmark* ThreadRange(int min_threads, int max_threads);
-
-  // For each value n in the range, run this benchmark once using n threads.
-  // min_threads and max_threads are always included in the range.
-  // stride specifies the increment. E.g. DenseThreadRange(1, 8, 3) starts
-  // a benchmark with 1, 4, 7 and 8 threads.
-  Benchmark* DenseThreadRange(int min_threads, int max_threads, int stride = 1);
-
-  // Equivalent to ThreadRange(NumCPUs(), NumCPUs())
-  Benchmark* ThreadPerCpu();
-
-  virtual void Run(State& state) = 0;
-
-  // Used inside the benchmark implementation
-  struct Instance;
-
- protected:
-  explicit Benchmark(const char* name);
-  Benchmark(Benchmark const&);
-  void SetName(const char* name);
-
-  int ArgsCnt() const;
-
- private:
-  friend class BenchmarkFamilies;
-
-  std::string name_;
-  ReportMode report_mode_;
-  std::vector<std::string> arg_names_;   // Args for all benchmark runs
-  std::vector<std::vector<int64_t> > args_;  // Args for all benchmark runs
-  TimeUnit time_unit_;
-  int range_multiplier_;
-  double min_time_;
-  size_t iterations_;
-  int repetitions_;
-  bool use_real_time_;
-  bool use_manual_time_;
-  BigO complexity_;
-  BigOFunc* complexity_lambda_;
-  std::vector<Statistics> statistics_;
-  std::vector<int> thread_counts_;
-
-  Benchmark& operator=(Benchmark const&);
-};
-
-}  // namespace internal
-
-// Create and register a benchmark with the specified 'name' that invokes
-// the specified functor 'fn'.
-//
-// RETURNS: A pointer to the registered benchmark.
-internal::Benchmark* RegisterBenchmark(const char* name,
-                                       internal::Function* fn);
-
-#if defined(BENCHMARK_HAS_CXX11)
-template <class Lambda>
-internal::Benchmark* RegisterBenchmark(const char* name, Lambda&& fn);
-#endif
-
-// Remove all registered benchmarks. All pointers to previously registered
-// benchmarks are invalidated.
-void ClearRegisteredBenchmarks();
-
-namespace internal {
-// The class used to hold all Benchmarks created from static function.
-// (ie those created using the BENCHMARK(...) macros.
-class FunctionBenchmark : public Benchmark {
- public:
-  FunctionBenchmark(const char* name, Function* func)
-      : Benchmark(name), func_(func) {}
-
-  void Run(State& st) override;
-
- private:
-  Function* func_;
-};
-
-#ifdef BENCHMARK_HAS_CXX11
-template <class Lambda>
-class LambdaBenchmark : public Benchmark {
- public:
-  void Run(State& st) override { lambda_(st); }
-
- private:
-  template <class OLambda>
-  LambdaBenchmark(const char* name, OLambda&& lam)
-      : Benchmark(name), lambda_(std::forward<OLambda>(lam)) {}
-
-  LambdaBenchmark(LambdaBenchmark const&) = delete;
-
- private:
-  template <class Lam>
-  friend Benchmark* ::benchmark::RegisterBenchmark(const char*, Lam&&);
-
-  Lambda lambda_;
-};
-#endif
-
-}  // namespace internal
-
-inline internal::Benchmark* RegisterBenchmark(const char* name,
-                                              internal::Function* fn) {
-  return internal::RegisterBenchmarkInternal(
-      ::new internal::FunctionBenchmark(name, fn));
-}
-
-#ifdef BENCHMARK_HAS_CXX11
-template <class Lambda>
-internal::Benchmark* RegisterBenchmark(const char* name, Lambda&& fn) {
-  using BenchType = internal::LambdaBenchmark<typename std::decay<Lambda>::type>;
-  return internal::RegisterBenchmarkInternal(
-      ::new BenchType(name, std::forward<Lambda>(fn)));
-}
-#endif
-
-#if defined(BENCHMARK_HAS_CXX11) && \
-    (!defined(BENCHMARK_GCC_VERSION) || BENCHMARK_GCC_VERSION >= 409)
-template <class Lambda, class... Args>
-internal::Benchmark* RegisterBenchmark(const char* name, Lambda&& fn,
-                                       Args&&... args) {
-  return benchmark::RegisterBenchmark(
-      name, [=](benchmark::State& st) { fn(st, args...); });
-}
-#else
-#define BENCHMARK_HAS_NO_VARIADIC_REGISTER_BENCHMARK
-#endif
-
-// The base class for all fixture tests.
-class Fixture : public internal::Benchmark {
- public:
-  Fixture() : internal::Benchmark("") {}
-
-  void Run(State& st) override {
-    this->SetUp(st);
-    this->BenchmarkCase(st);
-    this->TearDown(st);
-  }
-
-  // These will be deprecated ...
-  virtual void SetUp(const State&) {}
-  virtual void TearDown(const State&) {}
-  // ... In favor of these.
-  virtual void SetUp(State& st) { SetUp(const_cast<const State&>(st)); }
-  virtual void TearDown(State& st) { TearDown(const_cast<const State&>(st)); }
-
- protected:
-  virtual void BenchmarkCase(State&) = 0;
-};
-
-}  // namespace benchmark
-
-// ------------------------------------------------------
-// Macro to register benchmarks
-
-// Check that __COUNTER__ is defined and that __COUNTER__ increases by 1
-// every time it is expanded. X + 1 == X + 0 is used in case X is defined to be
-// empty. If X is empty the expression becomes (+1 == +0).
-#if defined(__COUNTER__) && (__COUNTER__ + 1 == __COUNTER__ + 0)
-#define BENCHMARK_PRIVATE_UNIQUE_ID __COUNTER__
-#else
-#define BENCHMARK_PRIVATE_UNIQUE_ID __LINE__
-#endif
-
-// Helpers for generating unique variable names
-#define BENCHMARK_PRIVATE_NAME(n) \
-  BENCHMARK_PRIVATE_CONCAT(_benchmark_, BENCHMARK_PRIVATE_UNIQUE_ID, n)
-#define BENCHMARK_PRIVATE_CONCAT(a, b, c) BENCHMARK_PRIVATE_CONCAT2(a, b, c)
-#define BENCHMARK_PRIVATE_CONCAT2(a, b, c) a##b##c
-
-#define BENCHMARK_PRIVATE_DECLARE(n)                                 \
-  static ::benchmark::internal::Benchmark* BENCHMARK_PRIVATE_NAME(n) \
-      BENCHMARK_UNUSED
-
-#define BENCHMARK(n)                                     \
-  BENCHMARK_PRIVATE_DECLARE(n) =                         \
-      (::benchmark::internal::RegisterBenchmarkInternal( \
-          new ::benchmark::internal::FunctionBenchmark(#n, n)))
-
-// Old-style macros
-#define BENCHMARK_WITH_ARG(n, a) BENCHMARK(n)->Arg((a))
-#define BENCHMARK_WITH_ARG2(n, a1, a2) BENCHMARK(n)->Args({(a1), (a2)})
-#define BENCHMARK_WITH_UNIT(n, t) BENCHMARK(n)->Unit((t))
-#define BENCHMARK_RANGE(n, lo, hi) BENCHMARK(n)->Range((lo), (hi))
-#define BENCHMARK_RANGE2(n, l1, h1, l2, h2) \
-  BENCHMARK(n)->RangePair({{(l1), (h1)}, {(l2), (h2)}})
-
-#ifdef BENCHMARK_HAS_CXX11
-
-// Register a benchmark which invokes the function specified by `func`
-// with the additional arguments specified by `...`.
-//
-// For example:
-//
-// template <class ...ExtraArgs>`
-// void BM_takes_args(benchmark::State& state, ExtraArgs&&... extra_args) {
-//  [...]
-//}
-// /* Registers a benchmark named "BM_takes_args/int_string_test` */
-// BENCHMARK_CAPTURE(BM_takes_args, int_string_test, 42, std::string("abc"));
-#define BENCHMARK_CAPTURE(func, test_case_name, ...)     \
-  BENCHMARK_PRIVATE_DECLARE(func) =                      \
-      (::benchmark::internal::RegisterBenchmarkInternal( \
-          new ::benchmark::internal::FunctionBenchmark(  \
-              #func "/" #test_case_name,                 \
-              [](::benchmark::State& st) { func(st, __VA_ARGS__); })))
-
-#endif  // BENCHMARK_HAS_CXX11
-
-// This will register a benchmark for a templatized function.  For example:
-//
-// template<int arg>
-// void BM_Foo(int iters);
-//
-// BENCHMARK_TEMPLATE(BM_Foo, 1);
-//
-// will register BM_Foo<1> as a benchmark.
-#define BENCHMARK_TEMPLATE1(n, a)                        \
-  BENCHMARK_PRIVATE_DECLARE(n) =                         \
-      (::benchmark::internal::RegisterBenchmarkInternal( \
-          new ::benchmark::internal::FunctionBenchmark(#n "<" #a ">", n<a>)))
-
-#define BENCHMARK_TEMPLATE2(n, a, b)                                         \
-  BENCHMARK_PRIVATE_DECLARE(n) =                                             \
-      (::benchmark::internal::RegisterBenchmarkInternal(                     \
-          new ::benchmark::internal::FunctionBenchmark(#n "<" #a "," #b ">", \
-                                                       n<a, b>)))
-
-#ifdef BENCHMARK_HAS_CXX11
-#define BENCHMARK_TEMPLATE(n, ...)                       \
-  BENCHMARK_PRIVATE_DECLARE(n) =                         \
-      (::benchmark::internal::RegisterBenchmarkInternal( \
-          new ::benchmark::internal::FunctionBenchmark(  \
-              #n "<" #__VA_ARGS__ ">", n<__VA_ARGS__>)))
-#else
-#define BENCHMARK_TEMPLATE(n, a) BENCHMARK_TEMPLATE1(n, a)
-#endif
-
-#define BENCHMARK_PRIVATE_DECLARE_F(BaseClass, Method)        \
-  class BaseClass##_##Method##_Benchmark : public BaseClass { \
-   public:                                                    \
-    BaseClass##_##Method##_Benchmark() : BaseClass() {        \
-      this->SetName(#BaseClass "/" #Method);                  \
-    }                                                         \
-                                                              \
-   protected:                                                 \
-    virtual void BenchmarkCase(::benchmark::State&);          \
-  };
-
-#define BENCHMARK_TEMPLATE1_PRIVATE_DECLARE_F(BaseClass, Method, a) \
-  class BaseClass##_##Method##_Benchmark : public BaseClass<a> {    \
-   public:                                                          \
-    BaseClass##_##Method##_Benchmark() : BaseClass<a>() {           \
-      this->SetName(#BaseClass"<" #a ">/" #Method);                 \
-    }                                                               \
-                                                                    \
-   protected:                                                       \
-    virtual void BenchmarkCase(::benchmark::State&);                \
-  };
-
-#define BENCHMARK_TEMPLATE2_PRIVATE_DECLARE_F(BaseClass, Method, a, b) \
-  class BaseClass##_##Method##_Benchmark : public BaseClass<a, b> {    \
-   public:                                                             \
-    BaseClass##_##Method##_Benchmark() : BaseClass<a, b>() {           \
-      this->SetName(#BaseClass"<" #a "," #b ">/" #Method);             \
-    }                                                                  \
-                                                                       \
-   protected:                                                          \
-    virtual void BenchmarkCase(::benchmark::State&);                   \
-  };
-
-#ifdef BENCHMARK_HAS_CXX11
-#define BENCHMARK_TEMPLATE_PRIVATE_DECLARE_F(BaseClass, Method, ...)       \
-  class BaseClass##_##Method##_Benchmark : public BaseClass<__VA_ARGS__> { \
-   public:                                                                 \
-    BaseClass##_##Method##_Benchmark() : BaseClass<__VA_ARGS__>() {        \
-      this->SetName(#BaseClass"<" #__VA_ARGS__ ">/" #Method);              \
-    }                                                                      \
-                                                                           \
-   protected:                                                              \
-    virtual void BenchmarkCase(::benchmark::State&);                       \
-  };
-#else
-#define BENCHMARK_TEMPLATE_PRIVATE_DECLARE_F(n, a) BENCHMARK_TEMPLATE1_PRIVATE_DECLARE_F(n, a)
-#endif
-
-#define BENCHMARK_DEFINE_F(BaseClass, Method)    \
-  BENCHMARK_PRIVATE_DECLARE_F(BaseClass, Method) \
-  void BaseClass##_##Method##_Benchmark::BenchmarkCase
-
-#define BENCHMARK_TEMPLATE1_DEFINE_F(BaseClass, Method, a)    \
-  BENCHMARK_TEMPLATE1_PRIVATE_DECLARE_F(BaseClass, Method, a) \
-  void BaseClass##_##Method##_Benchmark::BenchmarkCase
-
-#define BENCHMARK_TEMPLATE2_DEFINE_F(BaseClass, Method, a, b)    \
-  BENCHMARK_TEMPLATE2_PRIVATE_DECLARE_F(BaseClass, Method, a, b) \
-  void BaseClass##_##Method##_Benchmark::BenchmarkCase
-
-#ifdef BENCHMARK_HAS_CXX11
-#define BENCHMARK_TEMPLATE_DEFINE_F(BaseClass, Method, ...)            \
-  BENCHMARK_TEMPLATE_PRIVATE_DECLARE_F(BaseClass, Method, __VA_ARGS__) \
-  void BaseClass##_##Method##_Benchmark::BenchmarkCase
-#else
-#define BENCHMARK_TEMPLATE_DEFINE_F(BaseClass, Method, a) BENCHMARK_TEMPLATE1_DEFINE_F(BaseClass, Method, a)
-#endif
-
-#define BENCHMARK_REGISTER_F(BaseClass, Method) \
-  BENCHMARK_PRIVATE_REGISTER_F(BaseClass##_##Method##_Benchmark)
-
-#define BENCHMARK_PRIVATE_REGISTER_F(TestName) \
-  BENCHMARK_PRIVATE_DECLARE(TestName) =        \
-      (::benchmark::internal::RegisterBenchmarkInternal(new TestName()))
-
-// This macro will define and register a benchmark within a fixture class.
-#define BENCHMARK_F(BaseClass, Method)           \
-  BENCHMARK_PRIVATE_DECLARE_F(BaseClass, Method) \
-  BENCHMARK_REGISTER_F(BaseClass, Method);       \
-  void BaseClass##_##Method##_Benchmark::BenchmarkCase
-
-#define BENCHMARK_TEMPLATE1_F(BaseClass, Method, a)           \
-  BENCHMARK_TEMPLATE1_PRIVATE_DECLARE_F(BaseClass, Method, a) \
-  BENCHMARK_REGISTER_F(BaseClass, Method);                    \
-  void BaseClass##_##Method##_Benchmark::BenchmarkCase
-
-#define BENCHMARK_TEMPLATE2_F(BaseClass, Method, a, b)           \
-  BENCHMARK_TEMPLATE2_PRIVATE_DECLARE_F(BaseClass, Method, a, b) \
-  BENCHMARK_REGISTER_F(BaseClass, Method);                       \
-  void BaseClass##_##Method##_Benchmark::BenchmarkCase
-
-#ifdef BENCHMARK_HAS_CXX11
-#define BENCHMARK_TEMPLATE_F(BaseClass, Method, ...)           \
-  BENCHMARK_TEMPLATE_PRIVATE_DECLARE_F(BaseClass, Method, __VA_ARGS__) \
-  BENCHMARK_REGISTER_F(BaseClass, Method);                     \
-  void BaseClass##_##Method##_Benchmark::BenchmarkCase
-#else
-#define BENCHMARK_TEMPLATE_F(BaseClass, Method, a) BENCHMARK_TEMPLATE1_F(BaseClass, Method, a)
-#endif
-
-// Helper macro to create a main routine in a test that runs the benchmarks
-#define BENCHMARK_MAIN()                   \
-  int main(int argc, char** argv) {        \
-    ::benchmark::Initialize(&argc, argv);  \
-    if (::benchmark::ReportUnrecognizedArguments(argc, argv)) return 1; \
-    ::benchmark::RunSpecifiedBenchmarks(); \
-  }                                        \
-  int main(int, char**)
-
-
-// ------------------------------------------------------
-// Benchmark Reporters
-
-namespace benchmark {
-
-struct CPUInfo {
-  struct CacheInfo {
-    std::string type;
-    int level;
-    int size;
-    int num_sharing;
-  };
-
-  int num_cpus;
-  double cycles_per_second;
-  std::vector<CacheInfo> caches;
-  bool scaling_enabled;
-
-  static const CPUInfo& Get();
-
- private:
-  CPUInfo();
-  BENCHMARK_DISALLOW_COPY_AND_ASSIGN(CPUInfo);
-};
-
-// Interface for custom benchmark result printers.
-// By default, benchmark reports are printed to stdout. However an application
-// can control the destination of the reports by calling
-// RunSpecifiedBenchmarks and passing it a custom reporter object.
-// The reporter object must implement the following interface.
-class BenchmarkReporter {
- public:
-  struct Context {
-    CPUInfo const& cpu_info;
-    // The number of chars in the longest benchmark name.
-    size_t name_field_width;
-    static const char *executable_name;
-    Context();
-  };
-
-  struct Run {
-    Run()
-        : error_occurred(false),
-          iterations(1),
-          time_unit(kNanosecond),
-          real_accumulated_time(0),
-          cpu_accumulated_time(0),
-          bytes_per_second(0),
-          items_per_second(0),
-          max_heapbytes_used(0),
-          complexity(oNone),
-          complexity_lambda(),
-          complexity_n(0),
-          report_big_o(false),
-          report_rms(false),
-          counters() {}
-
-    std::string benchmark_name;
-    std::string report_label;  // Empty if not set by benchmark.
-    bool error_occurred;
-    std::string error_message;
-
-    int64_t iterations;
-    TimeUnit time_unit;
-    double real_accumulated_time;
-    double cpu_accumulated_time;
-
-    // Return a value representing the real time per iteration in the unit
-    // specified by 'time_unit'.
-    // NOTE: If 'iterations' is zero the returned value represents the
-    // accumulated time.
-    double GetAdjustedRealTime() const;
-
-    // Return a value representing the cpu time per iteration in the unit
-    // specified by 'time_unit'.
-    // NOTE: If 'iterations' is zero the returned value represents the
-    // accumulated time.
-    double GetAdjustedCPUTime() const;
-
-    // Zero if not set by benchmark.
-    double bytes_per_second;
-    double items_per_second;
-
-    // This is set to 0.0 if memory tracing is not enabled.
-    double max_heapbytes_used;
-
-    // Keep track of arguments to compute asymptotic complexity
-    BigO complexity;
-    BigOFunc* complexity_lambda;
-    int64_t complexity_n;
-
-    // what statistics to compute from the measurements
-    const std::vector<Statistics>* statistics;
-
-    // Inform print function whether the current run is a complexity report
-    bool report_big_o;
-    bool report_rms;
-
-    UserCounters counters;
-  };
-
-  // Construct a BenchmarkReporter with the output stream set to 'std::cout'
-  // and the error stream set to 'std::cerr'
-  BenchmarkReporter();
-
-  // Called once for every suite of benchmarks run.
-  // The parameter "context" contains information that the
-  // reporter may wish to use when generating its report, for example the
-  // platform under which the benchmarks are running. The benchmark run is
-  // never started if this function returns false, allowing the reporter
-  // to skip runs based on the context information.
-  virtual bool ReportContext(const Context& context) = 0;
-
-  // Called once for each group of benchmark runs, gives information about
-  // cpu-time and heap memory usage during the benchmark run. If the group
-  // of runs contained more than two entries then 'report' contains additional
-  // elements representing the mean and standard deviation of those runs.
-  // Additionally if this group of runs was the last in a family of benchmarks
-  // 'reports' contains additional entries representing the asymptotic
-  // complexity and RMS of that benchmark family.
-  virtual void ReportRuns(const std::vector<Run>& report) = 0;
-
-  // Called once and only once after ever group of benchmarks is run and
-  // reported.
-  virtual void Finalize() {}
-
-  // REQUIRES: The object referenced by 'out' is valid for the lifetime
-  // of the reporter.
-  void SetOutputStream(std::ostream* out) {
-    assert(out);
-    output_stream_ = out;
-  }
-
-  // REQUIRES: The object referenced by 'err' is valid for the lifetime
-  // of the reporter.
-  void SetErrorStream(std::ostream* err) {
-    assert(err);
-    error_stream_ = err;
-  }
-
-  std::ostream& GetOutputStream() const { return *output_stream_; }
-
-  std::ostream& GetErrorStream() const { return *error_stream_; }
-
-  virtual ~BenchmarkReporter();
-
-  // Write a human readable string to 'out' representing the specified
-  // 'context'.
-  // REQUIRES: 'out' is non-null.
-  static void PrintBasicContext(std::ostream* out, Context const& context);
-
- private:
-  std::ostream* output_stream_;
-  std::ostream* error_stream_;
-};
-
-// Simple reporter that outputs benchmark data to the console. This is the
-// default reporter used by RunSpecifiedBenchmarks().
-class ConsoleReporter : public BenchmarkReporter {
-public:
-  enum OutputOptions {
-    OO_None = 0,
-    OO_Color = 1,
-    OO_Tabular = 2,
-    OO_ColorTabular = OO_Color|OO_Tabular,
-    OO_Defaults = OO_ColorTabular
-  };
-  explicit ConsoleReporter(OutputOptions opts_ = OO_Defaults)
-      : output_options_(opts_), name_field_width_(0),
-        prev_counters_(), printed_header_(false) {}
-
-  bool ReportContext(const Context& context) override;
-  void ReportRuns(const std::vector<Run>& reports) override;
-
- protected:
-  virtual void PrintRunData(const Run& report);
-  virtual void PrintHeader(const Run& report);
-
-  OutputOptions output_options_;
-  size_t name_field_width_;
-  UserCounters prev_counters_;
-  bool printed_header_;
-};
-
-class JSONReporter : public BenchmarkReporter {
- public:
-  JSONReporter() : first_report_(true) {}
-  bool ReportContext(const Context& context) override;
-  void ReportRuns(const std::vector<Run>& reports) override;
-  void Finalize() override;
-
- private:
-  void PrintRunData(const Run& report);
-
-  bool first_report_;
-};
-
-class CSVReporter : public BenchmarkReporter {
- public:
-  CSVReporter() : printed_header_(false) {}
-  bool ReportContext(const Context& context) override;
-  void ReportRuns(const std::vector<Run>& reports) override;
-
- private:
-  void PrintRunData(const Run& report);
-
-  bool printed_header_;
-  std::set< std::string > user_counter_names_;
-};
-
-inline const char* GetTimeUnitString(TimeUnit unit) {
-  switch (unit) {
-    case kMillisecond:
-      return "ms";
-    case kMicrosecond:
-      return "us";
-    case kNanosecond:
-      return "ns";
-  }
-  BENCHMARK_UNREACHABLE();
-}
-
-inline double GetTimeUnitMultiplier(TimeUnit unit) {
-  switch (unit) {
-    case kMillisecond:
-      return 1e3;
-    case kMicrosecond:
-      return 1e6;
-    case kNanosecond:
-      return 1e9;
-  }
-  BENCHMARK_UNREACHABLE();
-}
-
-} // namespace benchmark
-
-#endif  // BENCHMARK_BENCHMARK_H_
diff --git a/gnu/llvm/llvm/utils/benchmark/mingw.py b/gnu/llvm/llvm/utils/benchmark/mingw.py
deleted file mode 100644
index 0b69692ca2a..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/mingw.py
+++ /dev/null
@@ -1,320 +0,0 @@
-#!/usr/bin/env python
-# encoding: utf-8
-
-import argparse
-import errno
-import logging
-import os
-import platform
-import re
-import sys
-import subprocess
-import tempfile
-
-try:
-    import winreg
-except ImportError:
-    import _winreg as winreg
-try:
-    import urllib.request as request
-except ImportError:
-    import urllib as request
-try:
-    import urllib.parse as parse
-except ImportError:
-    import urlparse as parse
-
-class EmptyLogger(object):
-    '''
-    Provides an implementation that performs no logging
-    '''
-    def debug(self, *k, **kw):
-        pass
-    def info(self, *k, **kw):
-        pass
-    def warn(self, *k, **kw):
-        pass
-    def error(self, *k, **kw):
-        pass
-    def critical(self, *k, **kw):
-        pass
-    def setLevel(self, *k, **kw):
-        pass
-
-urls = (
-    'http://downloads.sourceforge.net/project/mingw-w64/Toolchains%20'
-        'targetting%20Win32/Personal%20Builds/mingw-builds/installer/'
-        'repository.txt',
-    'http://downloads.sourceforge.net/project/mingwbuilds/host-windows/'
-        'repository.txt'
-)
-'''
-A list of mingw-build repositories
-'''
-
-def repository(urls = urls, log = EmptyLogger()):
-    '''
-    Downloads and parse mingw-build repository files and parses them
-    '''
-    log.info('getting mingw-builds repository')
-    versions = {}
-    re_sourceforge = re.compile(r'http://sourceforge.net/projects/([^/]+)/files')
-    re_sub = r'http://downloads.sourceforge.net/project/\1'
-    for url in urls:
-        log.debug(' - requesting: %s', url)
-        socket = request.urlopen(url)
-        repo = socket.read()
-        if not isinstance(repo, str):
-            repo = repo.decode();
-        socket.close()
-        for entry in repo.split('\n')[:-1]:
-            value = entry.split('|')
-            version = tuple([int(n) for n in value[0].strip().split('.')])
-            version = versions.setdefault(version, {})
-            arch = value[1].strip()
-            if arch == 'x32':
-                arch = 'i686'
-            elif arch == 'x64':
-                arch = 'x86_64'
-            arch = version.setdefault(arch, {})
-            threading = arch.setdefault(value[2].strip(), {})
-            exceptions = threading.setdefault(value[3].strip(), {})
-            revision = exceptions.setdefault(int(value[4].strip()[3:]),
-                re_sourceforge.sub(re_sub, value[5].strip()))
-    return versions
-
-def find_in_path(file, path=None):
-    '''
-    Attempts to find an executable in the path
-    '''
-    if platform.system() == 'Windows':
-        file += '.exe'
-    if path is None:
-        path = os.environ.get('PATH', '')
-    if type(path) is type(''):
-        path = path.split(os.pathsep)
-    return list(filter(os.path.exists,
-        map(lambda dir, file=file: os.path.join(dir, file), path)))
-
-def find_7zip(log = EmptyLogger()):
-    '''
-    Attempts to find 7zip for unpacking the mingw-build archives
-    '''
-    log.info('finding 7zip')
-    path = find_in_path('7z')
-    if not path:
-        key = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, r'SOFTWARE\7-Zip')
-        path, _ = winreg.QueryValueEx(key, 'Path')
-        path = [os.path.join(path, '7z.exe')]
-    log.debug('found \'%s\'', path[0])
-    return path[0]
-
-find_7zip()
-
-def unpack(archive, location, log = EmptyLogger()):
-    '''
-    Unpacks a mingw-builds archive
-    '''
-    sevenzip = find_7zip(log)
-    log.info('unpacking %s', os.path.basename(archive))
-    cmd = [sevenzip, 'x', archive, '-o' + location, '-y']
-    log.debug(' - %r', cmd)
-    with open(os.devnull, 'w') as devnull:
-        subprocess.check_call(cmd, stdout = devnull)
-
-def download(url, location, log = EmptyLogger()):
-    '''
-    Downloads and unpacks a mingw-builds archive
-    '''
-    log.info('downloading MinGW')
-    log.debug(' - url: %s', url)
-    log.debug(' - location: %s', location)
-
-    re_content = re.compile(r'attachment;[ \t]*filename=(")?([^"]*)(")?[\r\n]*')
-
-    stream = request.urlopen(url)
-    try:
-        content = stream.getheader('Content-Disposition') or ''
-    except AttributeError:
-        content = stream.headers.getheader('Content-Disposition') or ''
-    matches = re_content.match(content)
-    if matches:
-        filename = matches.group(2)
-    else:
-        parsed = parse.urlparse(stream.geturl())
-        filename = os.path.basename(parsed.path)
-
-    try:
-        os.makedirs(location)
-    except OSError as e:
-        if e.errno == errno.EEXIST and os.path.isdir(location):
-            pass
-        else:
-            raise
-
-    archive = os.path.join(location, filename)
-    with open(archive, 'wb') as out:
-        while True:
-            buf = stream.read(1024)
-            if not buf:
-                break
-            out.write(buf)
-    unpack(archive, location, log = log)
-    os.remove(archive)
-
-    possible = os.path.join(location, 'mingw64')
-    if not os.path.exists(possible):
-        possible = os.path.join(location, 'mingw32')
-        if not os.path.exists(possible):
-            raise ValueError('Failed to find unpacked MinGW: ' + possible)
-    return possible
-
-def root(location = None, arch = None, version = None, threading = None,
-        exceptions = None, revision = None, log = EmptyLogger()):
-    '''
-    Returns the root folder of a specific version of the mingw-builds variant
-    of gcc. Will download the compiler if needed
-    '''
-
-    # Get the repository if we don't have all the information
-    if not (arch and version and threading and exceptions and revision):
-        versions = repository(log = log)
-
-    # Determine some defaults
-    version = version or max(versions.keys())
-    if not arch:
-        arch = platform.machine().lower()
-        if arch == 'x86':
-            arch = 'i686'
-        elif arch == 'amd64':
-            arch = 'x86_64'
-    if not threading:
-        keys = versions[version][arch].keys()
-        if 'posix' in keys:
-            threading = 'posix'
-        elif 'win32' in keys:
-            threading = 'win32'
-        else:
-            threading = keys[0]
-    if not exceptions:
-        keys = versions[version][arch][threading].keys()
-        if 'seh' in keys:
-            exceptions = 'seh'
-        elif 'sjlj' in keys:
-            exceptions = 'sjlj'
-        else:
-            exceptions = keys[0]
-    if revision == None:
-        revision = max(versions[version][arch][threading][exceptions].keys())
-    if not location:
-        location = os.path.join(tempfile.gettempdir(), 'mingw-builds')
-
-    # Get the download url
-    url = versions[version][arch][threading][exceptions][revision]
-
-    # Tell the user whatzzup
-    log.info('finding MinGW %s', '.'.join(str(v) for v in version))
-    log.debug(' - arch: %s', arch)
-    log.debug(' - threading: %s', threading)
-    log.debug(' - exceptions: %s', exceptions)
-    log.debug(' - revision: %s', revision)
-    log.debug(' - url: %s', url)
-
-    # Store each specific revision differently
-    slug = '{version}-{arch}-{threading}-{exceptions}-rev{revision}'
-    slug = slug.format(
-        version = '.'.join(str(v) for v in version),
-        arch = arch,
-        threading = threading,
-        exceptions = exceptions,
-        revision = revision
-    )
-    if arch == 'x86_64':
-        root_dir = os.path.join(location, slug, 'mingw64')
-    elif arch == 'i686':
-        root_dir = os.path.join(location, slug, 'mingw32')
-    else:
-        raise ValueError('Unknown MinGW arch: ' + arch)
-
-    # Download if needed
-    if not os.path.exists(root_dir):
-        downloaded = download(url, os.path.join(location, slug), log = log)
-        if downloaded != root_dir:
-            raise ValueError('The location of mingw did not match\n%s\n%s'
-                % (downloaded, root_dir))
-
-    return root_dir
-
-def str2ver(string):
-    '''
-    Converts a version string into a tuple
-    '''
-    try:
-        version = tuple(int(v) for v in string.split('.'))
-        if len(version) is not 3:
-            raise ValueError()
-    except ValueError:
-        raise argparse.ArgumentTypeError(
-            'please provide a three digit version string')
-    return version
-
-def main():
-    '''
-    Invoked when the script is run directly by the python interpreter
-    '''
-    parser = argparse.ArgumentParser(
-        description = 'Downloads a specific version of MinGW',
-        formatter_class = argparse.ArgumentDefaultsHelpFormatter
-    )
-    parser.add_argument('--location',
-        help = 'the location to download the compiler to',
-        default = os.path.join(tempfile.gettempdir(), 'mingw-builds'))
-    parser.add_argument('--arch', required = True, choices = ['i686', 'x86_64'],
-        help = 'the target MinGW architecture string')
-    parser.add_argument('--version', type = str2ver,
-        help = 'the version of GCC to download')
-    parser.add_argument('--threading', choices = ['posix', 'win32'],
-        help = 'the threading type of the compiler')
-    parser.add_argument('--exceptions', choices = ['sjlj', 'seh', 'dwarf'],
-        help = 'the method to throw exceptions')
-    parser.add_argument('--revision', type=int,
-        help = 'the revision of the MinGW release')
-    group = parser.add_mutually_exclusive_group()
-    group.add_argument('-v', '--verbose', action='store_true',
-        help='increase the script output verbosity')
-    group.add_argument('-q', '--quiet', action='store_true',
-        help='only print errors and warning')
-    args = parser.parse_args()
-
-    # Create the logger
-    logger = logging.getLogger('mingw')
-    handler = logging.StreamHandler()
-    formatter = logging.Formatter('%(message)s')
-    handler.setFormatter(formatter)
-    logger.addHandler(handler)
-    logger.setLevel(logging.INFO)
-    if args.quiet:
-        logger.setLevel(logging.WARN)
-    if args.verbose:
-        logger.setLevel(logging.DEBUG)
-
-    # Get MinGW
-    root_dir = root(location = args.location, arch = args.arch,
-        version = args.version, threading = args.threading,
-        exceptions = args.exceptions, revision = args.revision,
-        log = logger)
-
-    sys.stdout.write('%s\n' % os.path.join(root_dir, 'bin'))
-
-if __name__ == '__main__':
-    try:
-        main()
-    except IOError as e:
-        sys.stderr.write('IO error: %s\n' % e)
-        sys.exit(1)
-    except OSError as e:
-        sys.stderr.write('OS error: %s\n' % e)
-        sys.exit(1)
-    except KeyboardInterrupt as e:
-        sys.stderr.write('Killed\n')
-        sys.exit(1)
diff --git a/gnu/llvm/llvm/utils/benchmark/releasing.md b/gnu/llvm/llvm/utils/benchmark/releasing.md
deleted file mode 100644
index f0cd7010e3a..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/releasing.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# How to release
-
-* Make sure you're on master and synced to HEAD
-* Ensure the project builds and tests run (sanity check only, obviously)
-    * `parallel -j0 exec ::: test/*_test` can help ensure everything at least
-      passes
-* Prepare release notes
-    * `git log $(git describe --abbrev=0 --tags)..HEAD` gives you the list of
-      commits between the last annotated tag and HEAD
-    * Pick the most interesting.
-* Create a release through github's interface
-    * Note this will create a lightweight tag.
-    * Update this to an annotated tag:
-      * `git pull --tags`
-      * `git tag -a -f <tag> <tag>`
-      * `git push --force origin`
diff --git a/gnu/llvm/llvm/utils/benchmark/src/CMakeLists.txt b/gnu/llvm/llvm/utils/benchmark/src/CMakeLists.txt
deleted file mode 100644
index 0abfe3cfd53..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/CMakeLists.txt
+++ /dev/null
@@ -1,110 +0,0 @@
-# Allow the source files to find headers in src/
-include_directories(${PROJECT_SOURCE_DIR}/src)
-
-if (DEFINED BENCHMARK_CXX_LINKER_FLAGS)
-  list(APPEND CMAKE_SHARED_LINKER_FLAGS ${BENCHMARK_CXX_LINKER_FLAGS})
-  list(APPEND CMAKE_MODULE_LINKER_FLAGS ${BENCHMARK_CXX_LINKER_FLAGS})
-endif()
-
-file(GLOB
-  SOURCE_FILES
-    *.cc
-    ${PROJECT_SOURCE_DIR}/include/benchmark/*.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
-file(GLOB BENCHMARK_MAIN "benchmark_main.cc")
-foreach(item ${BENCHMARK_MAIN})
-  list(REMOVE_ITEM SOURCE_FILES "${item}")
-endforeach()
-
-add_library(benchmark ${SOURCE_FILES})
-set_target_properties(benchmark PROPERTIES
-  OUTPUT_NAME "benchmark"
-  VERSION ${GENERIC_LIB_VERSION}
-  SOVERSION ${GENERIC_LIB_SOVERSION}
-  FOLDER "Utils"
-)
-target_include_directories(benchmark PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
-    )
-
-# Link threads.
-target_link_libraries(benchmark  ${BENCHMARK_CXX_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-find_library(LIBRT rt)
-if(LIBRT)
-  target_link_libraries(benchmark ${LIBRT})
-endif()
-
-# We need extra libraries on Windows
-if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-  target_link_libraries(benchmark shlwapi)
-endif()
-
-# We need extra libraries on Solaris
-if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
-  target_link_libraries(benchmark kstat)
-endif()
-
-# Benchmark main library
-add_library(benchmark_main "benchmark_main.cc")
-set_target_properties(benchmark_main PROPERTIES
-  OUTPUT_NAME "benchmark_main"
-  VERSION ${GENERIC_LIB_VERSION}
-  SOVERSION ${GENERIC_LIB_SOVERSION}
-  FOLDER "Utils"
-)
-target_include_directories(benchmark PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
-    )
-target_link_libraries(benchmark_main benchmark)
-
-set(include_install_dir "include")
-set(lib_install_dir "lib/")
-set(bin_install_dir "bin/")
-set(config_install_dir "lib/cmake/${PROJECT_NAME}")
-set(pkgconfig_install_dir "lib/pkgconfig")
-
-set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated")
-
-set(version_config "${generated_dir}/${PROJECT_NAME}ConfigVersion.cmake")
-set(project_config "${generated_dir}/${PROJECT_NAME}Config.cmake")
-set(pkg_config "${generated_dir}/${PROJECT_NAME}.pc")
-set(targets_export_name "${PROJECT_NAME}Targets")
-
-set(namespace "${PROJECT_NAME}::")
-
-include(CMakePackageConfigHelpers)
-write_basic_package_version_file(
-    "${version_config}" VERSION ${GIT_VERSION} COMPATIBILITY SameMajorVersion
-)
-
-configure_file("${PROJECT_SOURCE_DIR}/cmake/Config.cmake.in" "${project_config}" @ONLY)
-configure_file("${PROJECT_SOURCE_DIR}/cmake/benchmark.pc.in" "${pkg_config}" @ONLY)
-
-if (BENCHMARK_ENABLE_INSTALL)
-  # Install target (will install the library to specified CMAKE_INSTALL_PREFIX variable)
-  install(
-    TARGETS benchmark benchmark_main
-    EXPORT ${targets_export_name}
-    ARCHIVE DESTINATION ${lib_install_dir}
-    LIBRARY DESTINATION ${lib_install_dir}
-    RUNTIME DESTINATION ${bin_install_dir}
-    INCLUDES DESTINATION ${include_install_dir})
-
-  install(
-    DIRECTORY "${PROJECT_SOURCE_DIR}/include/benchmark"
-    DESTINATION ${include_install_dir}
-    FILES_MATCHING PATTERN "*.*h")
-
-  install(
-      FILES "${project_config}" "${version_config}"
-      DESTINATION "${config_install_dir}")
-
-  install(
-      FILES "${pkg_config}"
-      DESTINATION "${pkgconfig_install_dir}")
-
-  install(
-      EXPORT "${targets_export_name}"
-      NAMESPACE "${namespace}"
-      DESTINATION "${config_install_dir}")
-endif()
diff --git a/gnu/llvm/llvm/utils/benchmark/src/arraysize.h b/gnu/llvm/llvm/utils/benchmark/src/arraysize.h
deleted file mode 100644
index 51a50f2dff2..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/arraysize.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef BENCHMARK_ARRAYSIZE_H_
-#define BENCHMARK_ARRAYSIZE_H_
-
-#include "internal_macros.h"
-
-namespace benchmark {
-namespace internal {
-// The arraysize(arr) macro returns the # of elements in an array arr.
-// The expression is a compile-time constant, and therefore can be
-// used in defining new arrays, for example.  If you use arraysize on
-// a pointer by mistake, you will get a compile-time error.
-//
-
-// This template function declaration is used in defining arraysize.
-// Note that the function doesn't need an implementation, as we only
-// use its type.
-template <typename T, size_t N>
-char (&ArraySizeHelper(T (&array)[N]))[N];
-
-// That gcc wants both of these prototypes seems mysterious. VC, for
-// its part, can't decide which to use (another mystery). Matching of
-// template overloads: the final frontier.
-#ifndef COMPILER_MSVC
-template <typename T, size_t N>
-char (&ArraySizeHelper(const T (&array)[N]))[N];
-#endif
-
-#define arraysize(array) (sizeof(::benchmark::internal::ArraySizeHelper(array)))
-
-}  // end namespace internal
-}  // end namespace benchmark
-
-#endif  // BENCHMARK_ARRAYSIZE_H_
diff --git a/gnu/llvm/llvm/utils/benchmark/src/benchmark.cc b/gnu/llvm/llvm/utils/benchmark/src/benchmark.cc
deleted file mode 100644
index 82b15ac7090..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/benchmark.cc
+++ /dev/null
@@ -1,630 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "benchmark/benchmark.h"
-#include "benchmark_api_internal.h"
-#include "internal_macros.h"
-
-#ifndef BENCHMARK_OS_WINDOWS
-#ifndef BENCHMARK_OS_FUCHSIA
-#include <sys/resource.h>
-#endif
-#include <sys/time.h>
-#include <unistd.h>
-#endif
-
-#include <algorithm>
-#include <atomic>
-#include <condition_variable>
-#include <cstdio>
-#include <cstdlib>
-#include <fstream>
-#include <iostream>
-#include <memory>
-#include <string>
-#include <thread>
-
-#include "check.h"
-#include "colorprint.h"
-#include "commandlineflags.h"
-#include "complexity.h"
-#include "counter.h"
-#include "internal_macros.h"
-#include "log.h"
-#include "mutex.h"
-#include "re.h"
-#include "statistics.h"
-#include "string_util.h"
-#include "thread_manager.h"
-#include "thread_timer.h"
-
-DEFINE_bool(benchmark_list_tests, false,
-            "Print a list of benchmarks. This option overrides all other "
-            "options.");
-
-DEFINE_string(benchmark_filter, ".",
-              "A regular expression that specifies the set of benchmarks "
-              "to execute.  If this flag is empty, no benchmarks are run.  "
-              "If this flag is the string \"all\", all benchmarks linked "
-              "into the process are run.");
-
-DEFINE_double(benchmark_min_time, 0.5,
-              "Minimum number of seconds we should run benchmark before "
-              "results are considered significant.  For cpu-time based "
-              "tests, this is the lower bound on the total cpu time "
-              "used by all threads that make up the test.  For real-time "
-              "based tests, this is the lower bound on the elapsed time "
-              "of the benchmark execution, regardless of number of "
-              "threads.");
-
-DEFINE_int32(benchmark_repetitions, 1,
-             "The number of runs of each benchmark. If greater than 1, the "
-             "mean and standard deviation of the runs will be reported.");
-
-DEFINE_bool(benchmark_report_aggregates_only, false,
-            "Report the result of each benchmark repetitions. When 'true' is "
-            "specified only the mean, standard deviation, and other statistics "
-            "are reported for repeated benchmarks.");
-
-DEFINE_string(benchmark_format, "console",
-              "The format to use for console output. Valid values are "
-              "'console', 'json', or 'csv'.");
-
-DEFINE_string(benchmark_out_format, "json",
-              "The format to use for file output. Valid values are "
-              "'console', 'json', or 'csv'.");
-
-DEFINE_string(benchmark_out, "", "The file to write additional output to");
-
-DEFINE_string(benchmark_color, "auto",
-              "Whether to use colors in the output.  Valid values: "
-              "'true'/'yes'/1, 'false'/'no'/0, and 'auto'. 'auto' means to use "
-              "colors if the output is being sent to a terminal and the TERM "
-              "environment variable is set to a terminal type that supports "
-              "colors.");
-
-DEFINE_bool(benchmark_counters_tabular, false,
-            "Whether to use tabular format when printing user counters to "
-            "the console.  Valid values: 'true'/'yes'/1, 'false'/'no'/0."
-            "Defaults to false.");
-
-DEFINE_int32(v, 0, "The level of verbose logging to output");
-
-namespace benchmark {
-
-namespace {
-static const size_t kMaxIterations = 1000000000;
-}  // end namespace
-
-namespace internal {
-
-void UseCharPointer(char const volatile*) {}
-
-namespace {
-
-BenchmarkReporter::Run CreateRunReport(
-    const benchmark::internal::Benchmark::Instance& b,
-    const internal::ThreadManager::Result& results,
-    double seconds) {
-  // Create report about this benchmark run.
-  BenchmarkReporter::Run report;
-
-  report.benchmark_name = b.name;
-  report.error_occurred = results.has_error_;
-  report.error_message = results.error_message_;
-  report.report_label = results.report_label_;
-  // This is the total iterations across all threads.
-  report.iterations = results.iterations;
-  report.time_unit = b.time_unit;
-
-  if (!report.error_occurred) {
-    double bytes_per_second = 0;
-    if (results.bytes_processed > 0 && seconds > 0.0) {
-      bytes_per_second = (results.bytes_processed / seconds);
-    }
-    double items_per_second = 0;
-    if (results.items_processed > 0 && seconds > 0.0) {
-      items_per_second = (results.items_processed / seconds);
-    }
-
-    if (b.use_manual_time) {
-      report.real_accumulated_time = results.manual_time_used;
-    } else {
-      report.real_accumulated_time = results.real_time_used;
-    }
-    report.cpu_accumulated_time = results.cpu_time_used;
-    report.bytes_per_second = bytes_per_second;
-    report.items_per_second = items_per_second;
-    report.complexity_n = results.complexity_n;
-    report.complexity = b.complexity;
-    report.complexity_lambda = b.complexity_lambda;
-    report.statistics = b.statistics;
-    report.counters = results.counters;
-    internal::Finish(&report.counters, seconds, b.threads);
-  }
-  return report;
-}
-
-// Execute one thread of benchmark b for the specified number of iterations.
-// Adds the stats collected for the thread into *total.
-void RunInThread(const benchmark::internal::Benchmark::Instance* b,
-                 size_t iters, int thread_id,
-                 internal::ThreadManager* manager) {
-  internal::ThreadTimer timer;
-  State st(iters, b->arg, thread_id, b->threads, &timer, manager);
-  b->benchmark->Run(st);
-  CHECK(st.iterations() >= st.max_iterations)
-      << "Benchmark returned before State::KeepRunning() returned false!";
-  {
-    MutexLock l(manager->GetBenchmarkMutex());
-    internal::ThreadManager::Result& results = manager->results;
-    results.iterations += st.iterations();
-    results.cpu_time_used += timer.cpu_time_used();
-    results.real_time_used += timer.real_time_used();
-    results.manual_time_used += timer.manual_time_used();
-    results.bytes_processed += st.bytes_processed();
-    results.items_processed += st.items_processed();
-    results.complexity_n += st.complexity_length_n();
-    internal::Increment(&results.counters, st.counters);
-  }
-  manager->NotifyThreadComplete();
-}
-
-std::vector<BenchmarkReporter::Run> RunBenchmark(
-    const benchmark::internal::Benchmark::Instance& b,
-    std::vector<BenchmarkReporter::Run>* complexity_reports) {
-  std::vector<BenchmarkReporter::Run> reports;  // return value
-
-  const bool has_explicit_iteration_count = b.iterations != 0;
-  size_t iters = has_explicit_iteration_count ? b.iterations : 1;
-  std::unique_ptr<internal::ThreadManager> manager;
-  std::vector<std::thread> pool(b.threads - 1);
-  const int repeats =
-      b.repetitions != 0 ? b.repetitions : FLAGS_benchmark_repetitions;
-  const bool report_aggregates_only =
-      repeats != 1 &&
-      (b.report_mode == internal::RM_Unspecified
-           ? FLAGS_benchmark_report_aggregates_only
-           : b.report_mode == internal::RM_ReportAggregatesOnly);
-  for (int repetition_num = 0; repetition_num < repeats; repetition_num++) {
-    for (;;) {
-      // Try benchmark
-      VLOG(2) << "Running " << b.name << " for " << iters << "\n";
-
-      manager.reset(new internal::ThreadManager(b.threads));
-      for (std::size_t ti = 0; ti < pool.size(); ++ti) {
-        pool[ti] = std::thread(&RunInThread, &b, iters,
-                               static_cast<int>(ti + 1), manager.get());
-      }
-      RunInThread(&b, iters, 0, manager.get());
-      manager->WaitForAllThreads();
-      for (std::thread& thread : pool) thread.join();
-      internal::ThreadManager::Result results;
-      {
-        MutexLock l(manager->GetBenchmarkMutex());
-        results = manager->results;
-      }
-      manager.reset();
-      // Adjust real/manual time stats since they were reported per thread.
-      results.real_time_used /= b.threads;
-      results.manual_time_used /= b.threads;
-
-      VLOG(2) << "Ran in " << results.cpu_time_used << "/"
-              << results.real_time_used << "\n";
-
-      // Base decisions off of real time if requested by this benchmark.
-      double seconds = results.cpu_time_used;
-      if (b.use_manual_time) {
-        seconds = results.manual_time_used;
-      } else if (b.use_real_time) {
-        seconds = results.real_time_used;
-      }
-
-      const double min_time =
-          !IsZero(b.min_time) ? b.min_time : FLAGS_benchmark_min_time;
-
-      // Determine if this run should be reported; Either it has
-      // run for a sufficient amount of time or because an error was reported.
-      const bool should_report =  repetition_num > 0
-        || has_explicit_iteration_count  // An exact iteration count was requested
-        || results.has_error_
-        || iters >= kMaxIterations  // No chance to try again, we hit the limit.
-        || seconds >= min_time  // the elapsed time is large enough
-        // CPU time is specified but the elapsed real time greatly exceeds the
-        // minimum time. Note that user provided timers are except from this
-        // sanity check.
-        || ((results.real_time_used >= 5 * min_time) && !b.use_manual_time);
-
-      if (should_report) {
-        BenchmarkReporter::Run report = CreateRunReport(b, results, seconds);
-        if (!report.error_occurred && b.complexity != oNone)
-          complexity_reports->push_back(report);
-        reports.push_back(report);
-        break;
-      }
-
-      // See how much iterations should be increased by
-      // Note: Avoid division by zero with max(seconds, 1ns).
-      double multiplier = min_time * 1.4 / std::max(seconds, 1e-9);
-      // If our last run was at least 10% of FLAGS_benchmark_min_time then we
-      // use the multiplier directly. Otherwise we use at most 10 times
-      // expansion.
-      // NOTE: When the last run was at least 10% of the min time the max
-      // expansion should be 14x.
-      bool is_significant = (seconds / min_time) > 0.1;
-      multiplier = is_significant ? multiplier : std::min(10.0, multiplier);
-      if (multiplier <= 1.0) multiplier = 2.0;
-      double next_iters = std::max(multiplier * iters, iters + 1.0);
-      if (next_iters > kMaxIterations) {
-        next_iters = kMaxIterations;
-      }
-      VLOG(3) << "Next iters: " << next_iters << ", " << multiplier << "\n";
-      iters = static_cast<int>(next_iters + 0.5);
-    }
-  }
-  // Calculate additional statistics
-  auto stat_reports = ComputeStats(reports);
-  if ((b.complexity != oNone) && b.last_benchmark_instance) {
-    auto additional_run_stats = ComputeBigO(*complexity_reports);
-    stat_reports.insert(stat_reports.end(), additional_run_stats.begin(),
-                        additional_run_stats.end());
-    complexity_reports->clear();
-  }
-
-  if (report_aggregates_only) reports.clear();
-  reports.insert(reports.end(), stat_reports.begin(), stat_reports.end());
-  return reports;
-}
-
-}  // namespace
-}  // namespace internal
-
-State::State(size_t max_iters, const std::vector<int64_t>& ranges, int thread_i,
-             int n_threads, internal::ThreadTimer* timer,
-             internal::ThreadManager* manager)
-    : total_iterations_(0),
-      batch_leftover_(0),
-      max_iterations(max_iters),
-      started_(false),
-      finished_(false),
-      error_occurred_(false),
-      range_(ranges),
-      bytes_processed_(0),
-      items_processed_(0),
-      complexity_n_(0),
-      counters(),
-      thread_index(thread_i),
-      threads(n_threads),
-      timer_(timer),
-      manager_(manager) {
-  CHECK(max_iterations != 0) << "At least one iteration must be run";
-  CHECK_LT(thread_index, threads) << "thread_index must be less than threads";
-
-  // Note: The use of offsetof below is technically undefined until C++17
-  // because State is not a standard layout type. However, all compilers
-  // currently provide well-defined behavior as an extension (which is
-  // demonstrated since constexpr evaluation must diagnose all undefined
-  // behavior). However, GCC and Clang also warn about this use of offsetof,
-  // which must be suppressed.
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Winvalid-offsetof"
-#endif
-  // Offset tests to ensure commonly accessed data is on the first cache line.
-  const int cache_line_size = 64;
-  static_assert(offsetof(State, error_occurred_) <=
-                (cache_line_size - sizeof(error_occurred_)), "");
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-}
-
-void State::PauseTiming() {
-  // Add in time accumulated so far
-  CHECK(started_ && !finished_ && !error_occurred_);
-  timer_->StopTimer();
-}
-
-void State::ResumeTiming() {
-  CHECK(started_ && !finished_ && !error_occurred_);
-  timer_->StartTimer();
-}
-
-void State::SkipWithError(const char* msg) {
-  CHECK(msg);
-  error_occurred_ = true;
-  {
-    MutexLock l(manager_->GetBenchmarkMutex());
-    if (manager_->results.has_error_ == false) {
-      manager_->results.error_message_ = msg;
-      manager_->results.has_error_ = true;
-    }
-  }
-  total_iterations_ = 0;
-  if (timer_->running()) timer_->StopTimer();
-}
-
-void State::SetIterationTime(double seconds) {
-  timer_->SetIterationTime(seconds);
-}
-
-void State::SetLabel(const char* label) {
-  MutexLock l(manager_->GetBenchmarkMutex());
-  manager_->results.report_label_ = label;
-}
-
-void State::StartKeepRunning() {
-  CHECK(!started_ && !finished_);
-  started_ = true;
-  total_iterations_ = error_occurred_ ? 0 : max_iterations;
-  manager_->StartStopBarrier();
-  if (!error_occurred_) ResumeTiming();
-}
-
-void State::FinishKeepRunning() {
-  CHECK(started_ && (!finished_ || error_occurred_));
-  if (!error_occurred_) {
-    PauseTiming();
-  }
-  // Total iterations has now wrapped around past 0. Fix this.
-  total_iterations_ = 0;
-  finished_ = true;
-  manager_->StartStopBarrier();
-}
-
-namespace internal {
-namespace {
-
-void RunBenchmarks(const std::vector<Benchmark::Instance>& benchmarks,
-                           BenchmarkReporter* console_reporter,
-                           BenchmarkReporter* file_reporter) {
-  // Note the file_reporter can be null.
-  CHECK(console_reporter != nullptr);
-
-  // Determine the width of the name field using a minimum width of 10.
-  bool has_repetitions = FLAGS_benchmark_repetitions > 1;
-  size_t name_field_width = 10;
-  size_t stat_field_width = 0;
-  for (const Benchmark::Instance& benchmark : benchmarks) {
-    name_field_width =
-        std::max<size_t>(name_field_width, benchmark.name.size());
-    has_repetitions |= benchmark.repetitions > 1;
-
-    for(const auto& Stat : *benchmark.statistics)
-      stat_field_width = std::max<size_t>(stat_field_width, Stat.name_.size());
-  }
-  if (has_repetitions) name_field_width += 1 + stat_field_width;
-
-  // Print header here
-  BenchmarkReporter::Context context;
-  context.name_field_width = name_field_width;
-
-  // Keep track of running times of all instances of current benchmark
-  std::vector<BenchmarkReporter::Run> complexity_reports;
-
-  // We flush streams after invoking reporter methods that write to them. This
-  // ensures users get timely updates even when streams are not line-buffered.
-  auto flushStreams = [](BenchmarkReporter* reporter) {
-    if (!reporter) return;
-    std::flush(reporter->GetOutputStream());
-    std::flush(reporter->GetErrorStream());
-  };
-
-  if (console_reporter->ReportContext(context) &&
-      (!file_reporter || file_reporter->ReportContext(context))) {
-    flushStreams(console_reporter);
-    flushStreams(file_reporter);
-    for (const auto& benchmark : benchmarks) {
-      std::vector<BenchmarkReporter::Run> reports =
-          RunBenchmark(benchmark, &complexity_reports);
-      console_reporter->ReportRuns(reports);
-      if (file_reporter) file_reporter->ReportRuns(reports);
-      flushStreams(console_reporter);
-      flushStreams(file_reporter);
-    }
-  }
-  console_reporter->Finalize();
-  if (file_reporter) file_reporter->Finalize();
-  flushStreams(console_reporter);
-  flushStreams(file_reporter);
-}
-
-std::unique_ptr<BenchmarkReporter> CreateReporter(
-    std::string const& name, ConsoleReporter::OutputOptions output_opts) {
-  typedef std::unique_ptr<BenchmarkReporter> PtrType;
-  if (name == "console") {
-    return PtrType(new ConsoleReporter(output_opts));
-  } else if (name == "json") {
-    return PtrType(new JSONReporter);
-  } else if (name == "csv") {
-    return PtrType(new CSVReporter);
-  } else {
-    std::cerr << "Unexpected format: '" << name << "'\n";
-    std::exit(1);
-  }
-}
-
-}  // end namespace
-
-bool IsZero(double n) {
-  return std::abs(n) < std::numeric_limits<double>::epsilon();
-}
-
-ConsoleReporter::OutputOptions GetOutputOptions(bool force_no_color) {
-  int output_opts = ConsoleReporter::OO_Defaults;
-  if ((FLAGS_benchmark_color == "auto" && IsColorTerminal()) ||
-      IsTruthyFlagValue(FLAGS_benchmark_color)) {
-    output_opts |= ConsoleReporter::OO_Color;
-  } else {
-    output_opts &= ~ConsoleReporter::OO_Color;
-  }
-  if(force_no_color) {
-    output_opts &= ~ConsoleReporter::OO_Color;
-  }
-  if(FLAGS_benchmark_counters_tabular) {
-    output_opts |= ConsoleReporter::OO_Tabular;
-  } else {
-    output_opts &= ~ConsoleReporter::OO_Tabular;
-  }
-  return static_cast< ConsoleReporter::OutputOptions >(output_opts);
-}
-
-}  // end namespace internal
-
-size_t RunSpecifiedBenchmarks() {
-  return RunSpecifiedBenchmarks(nullptr, nullptr);
-}
-
-size_t RunSpecifiedBenchmarks(BenchmarkReporter* console_reporter) {
-  return RunSpecifiedBenchmarks(console_reporter, nullptr);
-}
-
-size_t RunSpecifiedBenchmarks(BenchmarkReporter* console_reporter,
-                              BenchmarkReporter* file_reporter) {
-  std::string spec = FLAGS_benchmark_filter;
-  if (spec.empty() || spec == "all")
-    spec = ".";  // Regexp that matches all benchmarks
-
-  // Setup the reporters
-  std::ofstream output_file;
-  std::unique_ptr<BenchmarkReporter> default_console_reporter;
-  std::unique_ptr<BenchmarkReporter> default_file_reporter;
-  if (!console_reporter) {
-    default_console_reporter = internal::CreateReporter(
-          FLAGS_benchmark_format, internal::GetOutputOptions());
-    console_reporter = default_console_reporter.get();
-  }
-  auto& Out = console_reporter->GetOutputStream();
-  auto& Err = console_reporter->GetErrorStream();
-
-  std::string const& fname = FLAGS_benchmark_out;
-  if (fname.empty() && file_reporter) {
-    Err << "A custom file reporter was provided but "
-           "--benchmark_out=<file> was not specified."
-        << std::endl;
-    std::exit(1);
-  }
-  if (!fname.empty()) {
-    output_file.open(fname);
-    if (!output_file.is_open()) {
-      Err << "invalid file name: '" << fname << std::endl;
-      std::exit(1);
-    }
-    if (!file_reporter) {
-      default_file_reporter = internal::CreateReporter(
-          FLAGS_benchmark_out_format, ConsoleReporter::OO_None);
-      file_reporter = default_file_reporter.get();
-    }
-    file_reporter->SetOutputStream(&output_file);
-    file_reporter->SetErrorStream(&output_file);
-  }
-
-  std::vector<internal::Benchmark::Instance> benchmarks;
-  if (!FindBenchmarksInternal(spec, &benchmarks, &Err)) return 0;
-
-  if (benchmarks.empty()) {
-    Err << "Failed to match any benchmarks against regex: " << spec << "\n";
-    return 0;
-  }
-
-  if (FLAGS_benchmark_list_tests) {
-    for (auto const& benchmark : benchmarks) Out << benchmark.name << "\n";
-  } else {
-    internal::RunBenchmarks(benchmarks, console_reporter, file_reporter);
-  }
-
-  return benchmarks.size();
-}
-
-namespace internal {
-
-void PrintUsageAndExit() {
-  fprintf(stdout,
-          "benchmark"
-          " [--benchmark_list_tests={true|false}]\n"
-          "          [--benchmark_filter=<regex>]\n"
-          "          [--benchmark_min_time=<min_time>]\n"
-          "          [--benchmark_repetitions=<num_repetitions>]\n"
-          "          [--benchmark_report_aggregates_only={true|false}\n"
-          "          [--benchmark_format=<console|json|csv>]\n"
-          "          [--benchmark_out=<filename>]\n"
-          "          [--benchmark_out_format=<json|console|csv>]\n"
-          "          [--benchmark_color={auto|true|false}]\n"
-          "          [--benchmark_counters_tabular={true|false}]\n"
-          "          [--v=<verbosity>]\n");
-  exit(0);
-}
-
-void ParseCommandLineFlags(int* argc, char** argv) {
-  using namespace benchmark;
-  BenchmarkReporter::Context::executable_name = argv[0];
-  for (int i = 1; i < *argc; ++i) {
-    if (ParseBoolFlag(argv[i], "benchmark_list_tests",
-                      &FLAGS_benchmark_list_tests) ||
-        ParseStringFlag(argv[i], "benchmark_filter", &FLAGS_benchmark_filter) ||
-        ParseDoubleFlag(argv[i], "benchmark_min_time",
-                        &FLAGS_benchmark_min_time) ||
-        ParseInt32Flag(argv[i], "benchmark_repetitions",
-                       &FLAGS_benchmark_repetitions) ||
-        ParseBoolFlag(argv[i], "benchmark_report_aggregates_only",
-                      &FLAGS_benchmark_report_aggregates_only) ||
-        ParseStringFlag(argv[i], "benchmark_format", &FLAGS_benchmark_format) ||
-        ParseStringFlag(argv[i], "benchmark_out", &FLAGS_benchmark_out) ||
-        ParseStringFlag(argv[i], "benchmark_out_format",
-                        &FLAGS_benchmark_out_format) ||
-        ParseStringFlag(argv[i], "benchmark_color", &FLAGS_benchmark_color) ||
-        // "color_print" is the deprecated name for "benchmark_color".
-        // TODO: Remove this.
-        ParseStringFlag(argv[i], "color_print", &FLAGS_benchmark_color) ||
-        ParseBoolFlag(argv[i], "benchmark_counters_tabular",
-                        &FLAGS_benchmark_counters_tabular) ||
-        ParseInt32Flag(argv[i], "v", &FLAGS_v)) {
-      for (int j = i; j != *argc - 1; ++j) argv[j] = argv[j + 1];
-
-      --(*argc);
-      --i;
-    } else if (IsFlag(argv[i], "help")) {
-      PrintUsageAndExit();
-    }
-  }
-  for (auto const* flag :
-       {&FLAGS_benchmark_format, &FLAGS_benchmark_out_format})
-    if (*flag != "console" && *flag != "json" && *flag != "csv") {
-      PrintUsageAndExit();
-    }
-  if (FLAGS_benchmark_color.empty()) {
-    PrintUsageAndExit();
-  }
-}
-
-int InitializeStreams() {
-  static std::ios_base::Init init;
-  return 0;
-}
-
-}  // end namespace internal
-
-void Initialize(int* argc, char** argv) {
-  internal::ParseCommandLineFlags(argc, argv);
-  internal::LogLevel() = FLAGS_v;
-}
-
-bool ReportUnrecognizedArguments(int argc, char** argv) {
-  for (int i = 1; i < argc; ++i) {
-    fprintf(stderr, "%s: error: unrecognized command-line flag: %s\n", argv[0], argv[i]);
-  }
-  return argc > 1;
-}
-
-}  // end namespace benchmark
diff --git a/gnu/llvm/llvm/utils/benchmark/src/benchmark_api_internal.h b/gnu/llvm/llvm/utils/benchmark/src/benchmark_api_internal.h
deleted file mode 100644
index dd7a3ffe8cb..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/benchmark_api_internal.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef BENCHMARK_API_INTERNAL_H
-#define BENCHMARK_API_INTERNAL_H
-
-#include "benchmark/benchmark.h"
-
-#include <cmath>
-#include <iosfwd>
-#include <limits>
-#include <string>
-#include <vector>
-
-namespace benchmark {
-namespace internal {
-
-// Information kept per benchmark we may want to run
-struct Benchmark::Instance {
-  std::string name;
-  Benchmark* benchmark;
-  ReportMode report_mode;
-  std::vector<int64_t> arg;
-  TimeUnit time_unit;
-  int range_multiplier;
-  bool use_real_time;
-  bool use_manual_time;
-  BigO complexity;
-  BigOFunc* complexity_lambda;
-  UserCounters counters;
-  const std::vector<Statistics>* statistics;
-  bool last_benchmark_instance;
-  int repetitions;
-  double min_time;
-  size_t iterations;
-  int threads;  // Number of concurrent threads to us
-};
-
-bool FindBenchmarksInternal(const std::string& re,
-                            std::vector<Benchmark::Instance>* benchmarks,
-                            std::ostream* Err);
-
-bool IsZero(double n);
-
-ConsoleReporter::OutputOptions GetOutputOptions(bool force_no_color = false);
-
-}  // end namespace internal
-}  // end namespace benchmark
-
-#endif  // BENCHMARK_API_INTERNAL_H
diff --git a/gnu/llvm/llvm/utils/benchmark/src/benchmark_main.cc b/gnu/llvm/llvm/utils/benchmark/src/benchmark_main.cc
deleted file mode 100644
index b3b24783149..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/benchmark_main.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2018 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "benchmark/benchmark.h"
-
-BENCHMARK_MAIN();
diff --git a/gnu/llvm/llvm/utils/benchmark/src/benchmark_register.cc b/gnu/llvm/llvm/utils/benchmark/src/benchmark_register.cc
deleted file mode 100644
index dc6f9356853..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/benchmark_register.cc
+++ /dev/null
@@ -1,461 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "benchmark_register.h"
-
-#ifndef BENCHMARK_OS_WINDOWS
-#ifndef BENCHMARK_OS_FUCHSIA
-#include <sys/resource.h>
-#endif
-#include <sys/time.h>
-#include <unistd.h>
-#endif
-
-#include <algorithm>
-#include <atomic>
-#include <condition_variable>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <fstream>
-#include <iostream>
-#include <memory>
-#include <sstream>
-#include <thread>
-
-#include "benchmark/benchmark.h"
-#include "benchmark_api_internal.h"
-#include "check.h"
-#include "commandlineflags.h"
-#include "complexity.h"
-#include "internal_macros.h"
-#include "log.h"
-#include "mutex.h"
-#include "re.h"
-#include "statistics.h"
-#include "string_util.h"
-#include "timers.h"
-
-namespace benchmark {
-
-namespace {
-// For non-dense Range, intermediate values are powers of kRangeMultiplier.
-static const int kRangeMultiplier = 8;
-// The size of a benchmark family determines is the number of inputs to repeat
-// the benchmark on. If this is "large" then warn the user during configuration.
-static const size_t kMaxFamilySize = 100;
-}  // end namespace
-
-namespace internal {
-
-//=============================================================================//
-//                         BenchmarkFamilies
-//=============================================================================//
-
-// Class for managing registered benchmarks.  Note that each registered
-// benchmark identifies a family of related benchmarks to run.
-class BenchmarkFamilies {
- public:
-  static BenchmarkFamilies* GetInstance();
-
-  // Registers a benchmark family and returns the index assigned to it.
-  size_t AddBenchmark(std::unique_ptr<Benchmark> family);
-
-  // Clear all registered benchmark families.
-  void ClearBenchmarks();
-
-  // Extract the list of benchmark instances that match the specified
-  // regular expression.
-  bool FindBenchmarks(std::string re,
-                      std::vector<Benchmark::Instance>* benchmarks,
-                      std::ostream* Err);
-
- private:
-  BenchmarkFamilies() {}
-
-  std::vector<std::unique_ptr<Benchmark>> families_;
-  Mutex mutex_;
-};
-
-BenchmarkFamilies* BenchmarkFamilies::GetInstance() {
-  static BenchmarkFamilies instance;
-  return &instance;
-}
-
-size_t BenchmarkFamilies::AddBenchmark(std::unique_ptr<Benchmark> family) {
-  MutexLock l(mutex_);
-  size_t index = families_.size();
-  families_.push_back(std::move(family));
-  return index;
-}
-
-void BenchmarkFamilies::ClearBenchmarks() {
-  MutexLock l(mutex_);
-  families_.clear();
-  families_.shrink_to_fit();
-}
-
-bool BenchmarkFamilies::FindBenchmarks(
-    std::string spec, std::vector<Benchmark::Instance>* benchmarks,
-    std::ostream* ErrStream) {
-  CHECK(ErrStream);
-  auto& Err = *ErrStream;
-  // Make regular expression out of command-line flag
-  std::string error_msg;
-  Regex re;
-  bool isNegativeFilter = false;
-  if(spec[0] == '-') {
-      spec.replace(0, 1, "");
-      isNegativeFilter = true;
-  }
-  if (!re.Init(spec, &error_msg)) {
-    Err << "Could not compile benchmark re: " << error_msg << std::endl;
-    return false;
-  }
-
-  // Special list of thread counts to use when none are specified
-  const std::vector<int> one_thread = {1};
-
-  MutexLock l(mutex_);
-  for (std::unique_ptr<Benchmark>& family : families_) {
-    // Family was deleted or benchmark doesn't match
-    if (!family) continue;
-
-    if (family->ArgsCnt() == -1) {
-      family->Args({});
-    }
-    const std::vector<int>* thread_counts =
-        (family->thread_counts_.empty()
-             ? &one_thread
-             : &static_cast<const std::vector<int>&>(family->thread_counts_));
-    const size_t family_size = family->args_.size() * thread_counts->size();
-    // The benchmark will be run at least 'family_size' different inputs.
-    // If 'family_size' is very large warn the user.
-    if (family_size > kMaxFamilySize) {
-      Err << "The number of inputs is very large. " << family->name_
-          << " will be repeated at least " << family_size << " times.\n";
-    }
-    // reserve in the special case the regex ".", since we know the final
-    // family size.
-    if (spec == ".") benchmarks->reserve(family_size);
-
-    for (auto const& args : family->args_) {
-      for (int num_threads : *thread_counts) {
-        Benchmark::Instance instance;
-        instance.name = family->name_;
-        instance.benchmark = family.get();
-        instance.report_mode = family->report_mode_;
-        instance.arg = args;
-        instance.time_unit = family->time_unit_;
-        instance.range_multiplier = family->range_multiplier_;
-        instance.min_time = family->min_time_;
-        instance.iterations = family->iterations_;
-        instance.repetitions = family->repetitions_;
-        instance.use_real_time = family->use_real_time_;
-        instance.use_manual_time = family->use_manual_time_;
-        instance.complexity = family->complexity_;
-        instance.complexity_lambda = family->complexity_lambda_;
-        instance.statistics = &family->statistics_;
-        instance.threads = num_threads;
-
-        // Add arguments to instance name
-        size_t arg_i = 0;
-        for (auto const& arg : args) {
-          instance.name += "/";
-
-          if (arg_i < family->arg_names_.size()) {
-            const auto& arg_name = family->arg_names_[arg_i];
-            if (!arg_name.empty()) {
-              instance.name +=
-                  StrFormat("%s:", family->arg_names_[arg_i].c_str());
-            }
-          }
-
-          instance.name += StrFormat("%d", arg);
-          ++arg_i;
-        }
-
-        if (!IsZero(family->min_time_))
-          instance.name += StrFormat("/min_time:%0.3f", family->min_time_);
-        if (family->iterations_ != 0)
-          instance.name += StrFormat("/iterations:%d", family->iterations_);
-        if (family->repetitions_ != 0)
-          instance.name += StrFormat("/repeats:%d", family->repetitions_);
-
-        if (family->use_manual_time_) {
-          instance.name += "/manual_time";
-        } else if (family->use_real_time_) {
-          instance.name += "/real_time";
-        }
-
-        // Add the number of threads used to the name
-        if (!family->thread_counts_.empty()) {
-          instance.name += StrFormat("/threads:%d", instance.threads);
-        }
-
-        if ((re.Match(instance.name) && !isNegativeFilter) ||
-            (!re.Match(instance.name) && isNegativeFilter)) {
-          instance.last_benchmark_instance = (&args == &family->args_.back());
-          benchmarks->push_back(std::move(instance));
-        }
-      }
-    }
-  }
-  return true;
-}
-
-Benchmark* RegisterBenchmarkInternal(Benchmark* bench) {
-  std::unique_ptr<Benchmark> bench_ptr(bench);
-  BenchmarkFamilies* families = BenchmarkFamilies::GetInstance();
-  families->AddBenchmark(std::move(bench_ptr));
-  return bench;
-}
-
-// FIXME: This function is a hack so that benchmark.cc can access
-// `BenchmarkFamilies`
-bool FindBenchmarksInternal(const std::string& re,
-                            std::vector<Benchmark::Instance>* benchmarks,
-                            std::ostream* Err) {
-  return BenchmarkFamilies::GetInstance()->FindBenchmarks(re, benchmarks, Err);
-}
-
-//=============================================================================//
-//                               Benchmark
-//=============================================================================//
-
-Benchmark::Benchmark(const char* name)
-    : name_(name),
-      report_mode_(RM_Unspecified),
-      time_unit_(kNanosecond),
-      range_multiplier_(kRangeMultiplier),
-      min_time_(0),
-      iterations_(0),
-      repetitions_(0),
-      use_real_time_(false),
-      use_manual_time_(false),
-      complexity_(oNone),
-      complexity_lambda_(nullptr) {
-  ComputeStatistics("mean", StatisticsMean);
-  ComputeStatistics("median", StatisticsMedian);
-  ComputeStatistics("stddev", StatisticsStdDev);
-}
-
-Benchmark::~Benchmark() {}
-
-Benchmark* Benchmark::Arg(int64_t x) {
-  CHECK(ArgsCnt() == -1 || ArgsCnt() == 1);
-  args_.push_back({x});
-  return this;
-}
-
-Benchmark* Benchmark::Unit(TimeUnit unit) {
-  time_unit_ = unit;
-  return this;
-}
-
-Benchmark* Benchmark::Range(int64_t start, int64_t limit) {
-  CHECK(ArgsCnt() == -1 || ArgsCnt() == 1);
-  std::vector<int64_t> arglist;
-  AddRange(&arglist, start, limit, range_multiplier_);
-
-  for (int64_t i : arglist) {
-    args_.push_back({i});
-  }
-  return this;
-}
-
-Benchmark* Benchmark::Ranges(
-    const std::vector<std::pair<int64_t, int64_t>>& ranges) {
-  CHECK(ArgsCnt() == -1 || ArgsCnt() == static_cast<int>(ranges.size()));
-  std::vector<std::vector<int64_t>> arglists(ranges.size());
-  std::size_t total = 1;
-  for (std::size_t i = 0; i < ranges.size(); i++) {
-    AddRange(&arglists[i], ranges[i].first, ranges[i].second,
-             range_multiplier_);
-    total *= arglists[i].size();
-  }
-
-  std::vector<std::size_t> ctr(arglists.size(), 0);
-
-  for (std::size_t i = 0; i < total; i++) {
-    std::vector<int64_t> tmp;
-    tmp.reserve(arglists.size());
-
-    for (std::size_t j = 0; j < arglists.size(); j++) {
-      tmp.push_back(arglists[j].at(ctr[j]));
-    }
-
-    args_.push_back(std::move(tmp));
-
-    for (std::size_t j = 0; j < arglists.size(); j++) {
-      if (ctr[j] + 1 < arglists[j].size()) {
-        ++ctr[j];
-        break;
-      }
-      ctr[j] = 0;
-    }
-  }
-  return this;
-}
-
-Benchmark* Benchmark::ArgName(const std::string& name) {
-  CHECK(ArgsCnt() == -1 || ArgsCnt() == 1);
-  arg_names_ = {name};
-  return this;
-}
-
-Benchmark* Benchmark::ArgNames(const std::vector<std::string>& names) {
-  CHECK(ArgsCnt() == -1 || ArgsCnt() == static_cast<int>(names.size()));
-  arg_names_ = names;
-  return this;
-}
-
-Benchmark* Benchmark::DenseRange(int64_t start, int64_t limit, int step) {
-  CHECK(ArgsCnt() == -1 || ArgsCnt() == 1);
-  CHECK_GE(start, 0);
-  CHECK_LE(start, limit);
-  for (int64_t arg = start; arg <= limit; arg += step) {
-    args_.push_back({arg});
-  }
-  return this;
-}
-
-Benchmark* Benchmark::Args(const std::vector<int64_t>& args) {
-  CHECK(ArgsCnt() == -1 || ArgsCnt() == static_cast<int>(args.size()));
-  args_.push_back(args);
-  return this;
-}
-
-Benchmark* Benchmark::Apply(void (*custom_arguments)(Benchmark* benchmark)) {
-  custom_arguments(this);
-  return this;
-}
-
-Benchmark* Benchmark::RangeMultiplier(int multiplier) {
-  CHECK(multiplier > 1);
-  range_multiplier_ = multiplier;
-  return this;
-}
-
-Benchmark* Benchmark::MinTime(double t) {
-  CHECK(t > 0.0);
-  CHECK(iterations_ == 0);
-  min_time_ = t;
-  return this;
-}
-
-Benchmark* Benchmark::Iterations(size_t n) {
-  CHECK(n > 0);
-  CHECK(IsZero(min_time_));
-  iterations_ = n;
-  return this;
-}
-
-Benchmark* Benchmark::Repetitions(int n) {
-  CHECK(n > 0);
-  repetitions_ = n;
-  return this;
-}
-
-Benchmark* Benchmark::ReportAggregatesOnly(bool value) {
-  report_mode_ = value ? RM_ReportAggregatesOnly : RM_Default;
-  return this;
-}
-
-Benchmark* Benchmark::UseRealTime() {
-  CHECK(!use_manual_time_)
-      << "Cannot set UseRealTime and UseManualTime simultaneously.";
-  use_real_time_ = true;
-  return this;
-}
-
-Benchmark* Benchmark::UseManualTime() {
-  CHECK(!use_real_time_)
-      << "Cannot set UseRealTime and UseManualTime simultaneously.";
-  use_manual_time_ = true;
-  return this;
-}
-
-Benchmark* Benchmark::Complexity(BigO complexity) {
-  complexity_ = complexity;
-  return this;
-}
-
-Benchmark* Benchmark::Complexity(BigOFunc* complexity) {
-  complexity_lambda_ = complexity;
-  complexity_ = oLambda;
-  return this;
-}
-
-Benchmark* Benchmark::ComputeStatistics(std::string name,
-                                        StatisticsFunc* statistics) {
-  statistics_.emplace_back(name, statistics);
-  return this;
-}
-
-Benchmark* Benchmark::Threads(int t) {
-  CHECK_GT(t, 0);
-  thread_counts_.push_back(t);
-  return this;
-}
-
-Benchmark* Benchmark::ThreadRange(int min_threads, int max_threads) {
-  CHECK_GT(min_threads, 0);
-  CHECK_GE(max_threads, min_threads);
-
-  AddRange(&thread_counts_, min_threads, max_threads, 2);
-  return this;
-}
-
-Benchmark* Benchmark::DenseThreadRange(int min_threads, int max_threads,
-                                       int stride) {
-  CHECK_GT(min_threads, 0);
-  CHECK_GE(max_threads, min_threads);
-  CHECK_GE(stride, 1);
-
-  for (auto i = min_threads; i < max_threads; i += stride) {
-    thread_counts_.push_back(i);
-  }
-  thread_counts_.push_back(max_threads);
-  return this;
-}
-
-Benchmark* Benchmark::ThreadPerCpu() {
-  thread_counts_.push_back(CPUInfo::Get().num_cpus);
-  return this;
-}
-
-void Benchmark::SetName(const char* name) { name_ = name; }
-
-int Benchmark::ArgsCnt() const {
-  if (args_.empty()) {
-    if (arg_names_.empty()) return -1;
-    return static_cast<int>(arg_names_.size());
-  }
-  return static_cast<int>(args_.front().size());
-}
-
-//=============================================================================//
-//                            FunctionBenchmark
-//=============================================================================//
-
-void FunctionBenchmark::Run(State& st) { func_(st); }
-
-}  // end namespace internal
-
-void ClearRegisteredBenchmarks() {
-  internal::BenchmarkFamilies::GetInstance()->ClearBenchmarks();
-}
-
-}  // end namespace benchmark
diff --git a/gnu/llvm/llvm/utils/benchmark/src/benchmark_register.h b/gnu/llvm/llvm/utils/benchmark/src/benchmark_register.h
deleted file mode 100644
index 4caa5ad4da0..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/benchmark_register.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef BENCHMARK_REGISTER_H
-#define BENCHMARK_REGISTER_H
-
-#include <limits>
-#include <vector>
-
-#include "check.h"
-
-template <typename T>
-void AddRange(std::vector<T>* dst, T lo, T hi, int mult) {
-  CHECK_GE(lo, 0);
-  CHECK_GE(hi, lo);
-  CHECK_GE(mult, 2);
-
-  // Add "lo"
-  dst->push_back(lo);
-
-  static const T kmax = std::numeric_limits<T>::max();
-
-  // Now space out the benchmarks in multiples of "mult"
-  for (T i = 1; i < kmax / mult; i *= mult) {
-    if (i >= hi) break;
-    if (i > lo) {
-      dst->push_back(i);
-    }
-  }
-
-  // Add "hi" (if different from "lo")
-  if (hi != lo) {
-    dst->push_back(hi);
-  }
-}
-
-#endif  // BENCHMARK_REGISTER_H
diff --git a/gnu/llvm/llvm/utils/benchmark/src/check.h b/gnu/llvm/llvm/utils/benchmark/src/check.h
deleted file mode 100644
index 73bead2fb55..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/check.h
+++ /dev/null
@@ -1,79 +0,0 @@
-#ifndef CHECK_H_
-#define CHECK_H_
-
-#include <cstdlib>
-#include <ostream>
-#include <cmath>
-
-#include "internal_macros.h"
-#include "log.h"
-
-namespace benchmark {
-namespace internal {
-
-typedef void(AbortHandlerT)();
-
-inline AbortHandlerT*& GetAbortHandler() {
-  static AbortHandlerT* handler = &std::abort;
-  return handler;
-}
-
-BENCHMARK_NORETURN inline void CallAbortHandler() {
-  GetAbortHandler()();
-  std::abort();  // fallback to enforce noreturn
-}
-
-// CheckHandler is the class constructed by failing CHECK macros. CheckHandler
-// will log information about the failures and abort when it is destructed.
-class CheckHandler {
- public:
-  CheckHandler(const char* check, const char* file, const char* func, int line)
-      : log_(GetErrorLogInstance()) {
-    log_ << file << ":" << line << ": " << func << ": Check `" << check
-         << "' failed. ";
-  }
-
-  LogType& GetLog() { return log_; }
-
-  BENCHMARK_NORETURN ~CheckHandler() BENCHMARK_NOEXCEPT_OP(false) {
-    log_ << std::endl;
-    CallAbortHandler();
-  }
-
-  CheckHandler& operator=(const CheckHandler&) = delete;
-  CheckHandler(const CheckHandler&) = delete;
-  CheckHandler() = delete;
-
- private:
-  LogType& log_;
-};
-
-}  // end namespace internal
-}  // end namespace benchmark
-
-// The CHECK macro returns a std::ostream object that can have extra information
-// written to it.
-#ifndef NDEBUG
-#define CHECK(b)                                                             \
-  (b ? ::benchmark::internal::GetNullLogInstance()                           \
-     : ::benchmark::internal::CheckHandler(#b, __FILE__, __func__, __LINE__) \
-           .GetLog())
-#else
-#define CHECK(b) ::benchmark::internal::GetNullLogInstance()
-#endif
-
-#define CHECK_EQ(a, b) CHECK((a) == (b))
-#define CHECK_NE(a, b) CHECK((a) != (b))
-#define CHECK_GE(a, b) CHECK((a) >= (b))
-#define CHECK_LE(a, b) CHECK((a) <= (b))
-#define CHECK_GT(a, b) CHECK((a) > (b))
-#define CHECK_LT(a, b) CHECK((a) < (b))
-
-#define CHECK_FLOAT_EQ(a, b, eps) CHECK(std::fabs((a) - (b)) <  (eps))
-#define CHECK_FLOAT_NE(a, b, eps) CHECK(std::fabs((a) - (b)) >= (eps))
-#define CHECK_FLOAT_GE(a, b, eps) CHECK((a) - (b) > -(eps))
-#define CHECK_FLOAT_LE(a, b, eps) CHECK((b) - (a) > -(eps))
-#define CHECK_FLOAT_GT(a, b, eps) CHECK((a) - (b) >  (eps))
-#define CHECK_FLOAT_LT(a, b, eps) CHECK((b) - (a) >  (eps))
-
-#endif  // CHECK_H_
diff --git a/gnu/llvm/llvm/utils/benchmark/src/colorprint.cc b/gnu/llvm/llvm/utils/benchmark/src/colorprint.cc
deleted file mode 100644
index fff6a98818b..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/colorprint.cc
+++ /dev/null
@@ -1,188 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "colorprint.h"
-
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <memory>
-#include <string>
-
-#include "check.h"
-#include "internal_macros.h"
-
-#ifdef BENCHMARK_OS_WINDOWS
-#include <windows.h>
-#include <io.h>
-#else
-#include <unistd.h>
-#endif  // BENCHMARK_OS_WINDOWS
-
-namespace benchmark {
-namespace {
-#ifdef BENCHMARK_OS_WINDOWS
-typedef WORD PlatformColorCode;
-#else
-typedef const char* PlatformColorCode;
-#endif
-
-PlatformColorCode GetPlatformColorCode(LogColor color) {
-#ifdef BENCHMARK_OS_WINDOWS
-  switch (color) {
-    case COLOR_RED:
-      return FOREGROUND_RED;
-    case COLOR_GREEN:
-      return FOREGROUND_GREEN;
-    case COLOR_YELLOW:
-      return FOREGROUND_RED | FOREGROUND_GREEN;
-    case COLOR_BLUE:
-      return FOREGROUND_BLUE;
-    case COLOR_MAGENTA:
-      return FOREGROUND_BLUE | FOREGROUND_RED;
-    case COLOR_CYAN:
-      return FOREGROUND_BLUE | FOREGROUND_GREEN;
-    case COLOR_WHITE:  // fall through to default
-    default:
-      return 0;
-  }
-#else
-  switch (color) {
-    case COLOR_RED:
-      return "1";
-    case COLOR_GREEN:
-      return "2";
-    case COLOR_YELLOW:
-      return "3";
-    case COLOR_BLUE:
-      return "4";
-    case COLOR_MAGENTA:
-      return "5";
-    case COLOR_CYAN:
-      return "6";
-    case COLOR_WHITE:
-      return "7";
-    default:
-      return nullptr;
-  };
-#endif
-}
-
-}  // end namespace
-
-std::string FormatString(const char* msg, va_list args) {
-  // we might need a second shot at this, so pre-emptivly make a copy
-  va_list args_cp;
-  va_copy(args_cp, args);
-
-  std::size_t size = 256;
-  char local_buff[256];
-  auto ret = vsnprintf(local_buff, size, msg, args_cp);
-
-  va_end(args_cp);
-
-  // currently there is no error handling for failure, so this is hack.
-  CHECK(ret >= 0);
-
-  if (ret == 0)  // handle empty expansion
-    return {};
-  else if (static_cast<size_t>(ret) < size)
-    return local_buff;
-  else {
-    // we did not provide a long enough buffer on our first attempt.
-    size = (size_t)ret + 1;  // + 1 for the null byte
-    std::unique_ptr<char[]> buff(new char[size]);
-    ret = vsnprintf(buff.get(), size, msg, args);
-    CHECK(ret > 0 && ((size_t)ret) < size);
-    return buff.get();
-  }
-}
-
-std::string FormatString(const char* msg, ...) {
-  va_list args;
-  va_start(args, msg);
-  auto tmp = FormatString(msg, args);
-  va_end(args);
-  return tmp;
-}
-
-void ColorPrintf(std::ostream& out, LogColor color, const char* fmt, ...) {
-  va_list args;
-  va_start(args, fmt);
-  ColorPrintf(out, color, fmt, args);
-  va_end(args);
-}
-
-void ColorPrintf(std::ostream& out, LogColor color, const char* fmt,
-                 va_list args) {
-#ifdef BENCHMARK_OS_WINDOWS
-  ((void)out);  // suppress unused warning
-
-  const HANDLE stdout_handle = GetStdHandle(STD_OUTPUT_HANDLE);
-
-  // Gets the current text color.
-  CONSOLE_SCREEN_BUFFER_INFO buffer_info;
-  GetConsoleScreenBufferInfo(stdout_handle, &buffer_info);
-  const WORD old_color_attrs = buffer_info.wAttributes;
-
-  // We need to flush the stream buffers into the console before each
-  // SetConsoleTextAttribute call lest it affect the text that is already
-  // printed but has not yet reached the console.
-  fflush(stdout);
-  SetConsoleTextAttribute(stdout_handle,
-                          GetPlatformColorCode(color) | FOREGROUND_INTENSITY);
-  vprintf(fmt, args);
-
-  fflush(stdout);
-  // Restores the text color.
-  SetConsoleTextAttribute(stdout_handle, old_color_attrs);
-#else
-  const char* color_code = GetPlatformColorCode(color);
-  if (color_code) out << FormatString("\033[0;3%sm", color_code);
-  out << FormatString(fmt, args) << "\033[m";
-#endif
-}
-
-bool IsColorTerminal() {
-#if BENCHMARK_OS_WINDOWS
-  // On Windows the TERM variable is usually not set, but the
-  // console there does support colors.
-  return 0 != _isatty(_fileno(stdout));
-#else
-  // On non-Windows platforms, we rely on the TERM variable. This list of
-  // supported TERM values is copied from Google Test:
-  // <https://github.com/google/googletest/blob/master/googletest/src/gtest.cc#L2925>.
-  const char* const SUPPORTED_TERM_VALUES[] = {
-      "xterm",         "xterm-color",     "xterm-256color",
-      "screen",        "screen-256color", "tmux",
-      "tmux-256color", "rxvt-unicode",    "rxvt-unicode-256color",
-      "linux",         "cygwin",
-  };
-
-  const char* const term = getenv("TERM");
-
-  bool term_supports_color = false;
-  for (const char* candidate : SUPPORTED_TERM_VALUES) {
-    if (term && 0 == strcmp(term, candidate)) {
-      term_supports_color = true;
-      break;
-    }
-  }
-
-  return 0 != isatty(fileno(stdout)) && term_supports_color;
-#endif  // BENCHMARK_OS_WINDOWS
-}
-
-}  // end namespace benchmark
diff --git a/gnu/llvm/llvm/utils/benchmark/src/colorprint.h b/gnu/llvm/llvm/utils/benchmark/src/colorprint.h
deleted file mode 100644
index 9f6fab9b342..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/colorprint.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef BENCHMARK_COLORPRINT_H_
-#define BENCHMARK_COLORPRINT_H_
-
-#include <cstdarg>
-#include <iostream>
-#include <string>
-
-namespace benchmark {
-enum LogColor {
-  COLOR_DEFAULT,
-  COLOR_RED,
-  COLOR_GREEN,
-  COLOR_YELLOW,
-  COLOR_BLUE,
-  COLOR_MAGENTA,
-  COLOR_CYAN,
-  COLOR_WHITE
-};
-
-std::string FormatString(const char* msg, va_list args);
-std::string FormatString(const char* msg, ...);
-
-void ColorPrintf(std::ostream& out, LogColor color, const char* fmt,
-                 va_list args);
-void ColorPrintf(std::ostream& out, LogColor color, const char* fmt, ...);
-
-// Returns true if stdout appears to be a terminal that supports colored
-// output, false otherwise.
-bool IsColorTerminal();
-
-}  // end namespace benchmark
-
-#endif  // BENCHMARK_COLORPRINT_H_
diff --git a/gnu/llvm/llvm/utils/benchmark/src/commandlineflags.cc b/gnu/llvm/llvm/utils/benchmark/src/commandlineflags.cc
deleted file mode 100644
index 2fc92517a32..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/commandlineflags.cc
+++ /dev/null
@@ -1,218 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "commandlineflags.h"
-
-#include <cctype>
-#include <cstdlib>
-#include <cstring>
-#include <iostream>
-#include <limits>
-
-namespace benchmark {
-// Parses 'str' for a 32-bit signed integer.  If successful, writes
-// the result to *value and returns true; otherwise leaves *value
-// unchanged and returns false.
-bool ParseInt32(const std::string& src_text, const char* str, int32_t* value) {
-  // Parses the environment variable as a decimal integer.
-  char* end = nullptr;
-  const long long_value = strtol(str, &end, 10);  // NOLINT
-
-  // Has strtol() consumed all characters in the string?
-  if (*end != '\0') {
-    // No - an invalid character was encountered.
-    std::cerr << src_text << " is expected to be a 32-bit integer, "
-              << "but actually has value \"" << str << "\".\n";
-    return false;
-  }
-
-  // Is the parsed value in the range of an Int32?
-  const int32_t result = static_cast<int32_t>(long_value);
-  if (long_value == std::numeric_limits<long>::max() ||
-      long_value == std::numeric_limits<long>::min() ||
-      // The parsed value overflows as a long.  (strtol() returns
-      // LONG_MAX or LONG_MIN when the input overflows.)
-      result != long_value
-      // The parsed value overflows as an Int32.
-      ) {
-    std::cerr << src_text << " is expected to be a 32-bit integer, "
-              << "but actually has value \"" << str << "\", "
-              << "which overflows.\n";
-    return false;
-  }
-
-  *value = result;
-  return true;
-}
-
-// Parses 'str' for a double.  If successful, writes the result to *value and
-// returns true; otherwise leaves *value unchanged and returns false.
-bool ParseDouble(const std::string& src_text, const char* str, double* value) {
-  // Parses the environment variable as a decimal integer.
-  char* end = nullptr;
-  const double double_value = strtod(str, &end);  // NOLINT
-
-  // Has strtol() consumed all characters in the string?
-  if (*end != '\0') {
-    // No - an invalid character was encountered.
-    std::cerr << src_text << " is expected to be a double, "
-              << "but actually has value \"" << str << "\".\n";
-    return false;
-  }
-
-  *value = double_value;
-  return true;
-}
-
-// Returns the name of the environment variable corresponding to the
-// given flag.  For example, FlagToEnvVar("foo") will return
-// "BENCHMARK_FOO" in the open-source version.
-static std::string FlagToEnvVar(const char* flag) {
-  const std::string flag_str(flag);
-
-  std::string env_var;
-  for (size_t i = 0; i != flag_str.length(); ++i)
-    env_var += static_cast<char>(::toupper(flag_str.c_str()[i]));
-
-  return "BENCHMARK_" + env_var;
-}
-
-// Reads and returns the Boolean environment variable corresponding to
-// the given flag; if it's not set, returns default_value.
-//
-// The value is considered true iff it's not "0".
-bool BoolFromEnv(const char* flag, bool default_value) {
-  const std::string env_var = FlagToEnvVar(flag);
-  const char* const string_value = getenv(env_var.c_str());
-  return string_value == nullptr ? default_value
-                                 : strcmp(string_value, "0") != 0;
-}
-
-// Reads and returns a 32-bit integer stored in the environment
-// variable corresponding to the given flag; if it isn't set or
-// doesn't represent a valid 32-bit integer, returns default_value.
-int32_t Int32FromEnv(const char* flag, int32_t default_value) {
-  const std::string env_var = FlagToEnvVar(flag);
-  const char* const string_value = getenv(env_var.c_str());
-  if (string_value == nullptr) {
-    // The environment variable is not set.
-    return default_value;
-  }
-
-  int32_t result = default_value;
-  if (!ParseInt32(std::string("Environment variable ") + env_var, string_value,
-                  &result)) {
-    std::cout << "The default value " << default_value << " is used.\n";
-    return default_value;
-  }
-
-  return result;
-}
-
-// Reads and returns the string environment variable corresponding to
-// the given flag; if it's not set, returns default_value.
-const char* StringFromEnv(const char* flag, const char* default_value) {
-  const std::string env_var = FlagToEnvVar(flag);
-  const char* const value = getenv(env_var.c_str());
-  return value == nullptr ? default_value : value;
-}
-
-// Parses a string as a command line flag.  The string should have
-// the format "--flag=value".  When def_optional is true, the "=value"
-// part can be omitted.
-//
-// Returns the value of the flag, or nullptr if the parsing failed.
-const char* ParseFlagValue(const char* str, const char* flag,
-                           bool def_optional) {
-  // str and flag must not be nullptr.
-  if (str == nullptr || flag == nullptr) return nullptr;
-
-  // The flag must start with "--".
-  const std::string flag_str = std::string("--") + std::string(flag);
-  const size_t flag_len = flag_str.length();
-  if (strncmp(str, flag_str.c_str(), flag_len) != 0) return nullptr;
-
-  // Skips the flag name.
-  const char* flag_end = str + flag_len;
-
-  // When def_optional is true, it's OK to not have a "=value" part.
-  if (def_optional && (flag_end[0] == '\0')) return flag_end;
-
-  // If def_optional is true and there are more characters after the
-  // flag name, or if def_optional is false, there must be a '=' after
-  // the flag name.
-  if (flag_end[0] != '=') return nullptr;
-
-  // Returns the string after "=".
-  return flag_end + 1;
-}
-
-bool ParseBoolFlag(const char* str, const char* flag, bool* value) {
-  // Gets the value of the flag as a string.
-  const char* const value_str = ParseFlagValue(str, flag, true);
-
-  // Aborts if the parsing failed.
-  if (value_str == nullptr) return false;
-
-  // Converts the string value to a bool.
-  *value = IsTruthyFlagValue(value_str);
-  return true;
-}
-
-bool ParseInt32Flag(const char* str, const char* flag, int32_t* value) {
-  // Gets the value of the flag as a string.
-  const char* const value_str = ParseFlagValue(str, flag, false);
-
-  // Aborts if the parsing failed.
-  if (value_str == nullptr) return false;
-
-  // Sets *value to the value of the flag.
-  return ParseInt32(std::string("The value of flag --") + flag, value_str,
-                    value);
-}
-
-bool ParseDoubleFlag(const char* str, const char* flag, double* value) {
-  // Gets the value of the flag as a string.
-  const char* const value_str = ParseFlagValue(str, flag, false);
-
-  // Aborts if the parsing failed.
-  if (value_str == nullptr) return false;
-
-  // Sets *value to the value of the flag.
-  return ParseDouble(std::string("The value of flag --") + flag, value_str,
-                     value);
-}
-
-bool ParseStringFlag(const char* str, const char* flag, std::string* value) {
-  // Gets the value of the flag as a string.
-  const char* const value_str = ParseFlagValue(str, flag, false);
-
-  // Aborts if the parsing failed.
-  if (value_str == nullptr) return false;
-
-  *value = value_str;
-  return true;
-}
-
-bool IsFlag(const char* str, const char* flag) {
-  return (ParseFlagValue(str, flag, true) != nullptr);
-}
-
-bool IsTruthyFlagValue(const std::string& value) {
-  if (value.empty()) return true;
-  char ch = value[0];
-  return isalnum(ch) &&
-         !(ch == '0' || ch == 'f' || ch == 'F' || ch == 'n' || ch == 'N');
-}
-}  // end namespace benchmark
diff --git a/gnu/llvm/llvm/utils/benchmark/src/commandlineflags.h b/gnu/llvm/llvm/utils/benchmark/src/commandlineflags.h
deleted file mode 100644
index 945c9a9fc4a..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/commandlineflags.h
+++ /dev/null
@@ -1,79 +0,0 @@
-#ifndef BENCHMARK_COMMANDLINEFLAGS_H_
-#define BENCHMARK_COMMANDLINEFLAGS_H_
-
-#include <cstdint>
-#include <string>
-
-// Macro for referencing flags.
-#define FLAG(name) FLAGS_##name
-
-// Macros for declaring flags.
-#define DECLARE_bool(name) extern bool FLAG(name)
-#define DECLARE_int32(name) extern int32_t FLAG(name)
-#define DECLARE_int64(name) extern int64_t FLAG(name)
-#define DECLARE_double(name) extern double FLAG(name)
-#define DECLARE_string(name) extern std::string FLAG(name)
-
-// Macros for defining flags.
-#define DEFINE_bool(name, default_val, doc) bool FLAG(name) = (default_val)
-#define DEFINE_int32(name, default_val, doc) int32_t FLAG(name) = (default_val)
-#define DEFINE_int64(name, default_val, doc) int64_t FLAG(name) = (default_val)
-#define DEFINE_double(name, default_val, doc) double FLAG(name) = (default_val)
-#define DEFINE_string(name, default_val, doc) \
-  std::string FLAG(name) = (default_val)
-
-namespace benchmark {
-// Parses 'str' for a 32-bit signed integer.  If successful, writes the result
-// to *value and returns true; otherwise leaves *value unchanged and returns
-// false.
-bool ParseInt32(const std::string& src_text, const char* str, int32_t* value);
-
-// Parses a bool/Int32/string from the environment variable
-// corresponding to the given Google Test flag.
-bool BoolFromEnv(const char* flag, bool default_val);
-int32_t Int32FromEnv(const char* flag, int32_t default_val);
-double DoubleFromEnv(const char* flag, double default_val);
-const char* StringFromEnv(const char* flag, const char* default_val);
-
-// Parses a string for a bool flag, in the form of either
-// "--flag=value" or "--flag".
-//
-// In the former case, the value is taken as true if it passes IsTruthyValue().
-//
-// In the latter case, the value is taken as true.
-//
-// On success, stores the value of the flag in *value, and returns
-// true.  On failure, returns false without changing *value.
-bool ParseBoolFlag(const char* str, const char* flag, bool* value);
-
-// Parses a string for an Int32 flag, in the form of
-// "--flag=value".
-//
-// On success, stores the value of the flag in *value, and returns
-// true.  On failure, returns false without changing *value.
-bool ParseInt32Flag(const char* str, const char* flag, int32_t* value);
-
-// Parses a string for a Double flag, in the form of
-// "--flag=value".
-//
-// On success, stores the value of the flag in *value, and returns
-// true.  On failure, returns false without changing *value.
-bool ParseDoubleFlag(const char* str, const char* flag, double* value);
-
-// Parses a string for a string flag, in the form of
-// "--flag=value".
-//
-// On success, stores the value of the flag in *value, and returns
-// true.  On failure, returns false without changing *value.
-bool ParseStringFlag(const char* str, const char* flag, std::string* value);
-
-// Returns true if the string matches the flag.
-bool IsFlag(const char* str, const char* flag);
-
-// Returns true unless value starts with one of: '0', 'f', 'F', 'n' or 'N', or
-// some non-alphanumeric character. As a special case, also returns true if
-// value is the empty string.
-bool IsTruthyFlagValue(const std::string& value);
-}  // end namespace benchmark
-
-#endif  // BENCHMARK_COMMANDLINEFLAGS_H_
diff --git a/gnu/llvm/llvm/utils/benchmark/src/complexity.cc b/gnu/llvm/llvm/utils/benchmark/src/complexity.cc
deleted file mode 100644
index 97cb0a88271..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/complexity.cc
+++ /dev/null
@@ -1,218 +0,0 @@
-// Copyright 2016 Ismael Jimenez Martinez. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Source project : https://github.com/ismaelJimenez/cpp.leastsq
-// Adapted to be used with google benchmark
-
-#include "benchmark/benchmark.h"
-
-#include <algorithm>
-#include <cmath>
-#include "check.h"
-#include "complexity.h"
-
-namespace benchmark {
-
-// Internal function to calculate the different scalability forms
-BigOFunc* FittingCurve(BigO complexity) {
-  switch (complexity) {
-    case oN:
-      return [](int64_t n) -> double { return static_cast<double>(n); };
-    case oNSquared:
-      return [](int64_t n) -> double { return std::pow(n, 2); };
-    case oNCubed:
-      return [](int64_t n) -> double { return std::pow(n, 3); };
-    case oLogN:
-      return [](int64_t n) { return log2(n); };
-    case oNLogN:
-      return [](int64_t n) { return n * log2(n); };
-    case o1:
-    default:
-      return [](int64_t) { return 1.0; };
-  }
-}
-
-// Function to return an string for the calculated complexity
-std::string GetBigOString(BigO complexity) {
-  switch (complexity) {
-    case oN:
-      return "N";
-    case oNSquared:
-      return "N^2";
-    case oNCubed:
-      return "N^3";
-    case oLogN:
-      return "lgN";
-    case oNLogN:
-      return "NlgN";
-    case o1:
-      return "(1)";
-    default:
-      return "f(N)";
-  }
-}
-
-// Find the coefficient for the high-order term in the running time, by
-// minimizing the sum of squares of relative error, for the fitting curve
-// given by the lambda expression.
-//   - n             : Vector containing the size of the benchmark tests.
-//   - time          : Vector containing the times for the benchmark tests.
-//   - fitting_curve : lambda expression (e.g. [](int64_t n) {return n; };).
-
-// For a deeper explanation on the algorithm logic, look the README file at
-// http://github.com/ismaelJimenez/Minimal-Cpp-Least-Squared-Fit
-
-LeastSq MinimalLeastSq(const std::vector<int64_t>& n,
-                       const std::vector<double>& time,
-                       BigOFunc* fitting_curve) {
-  double sigma_gn_squared = 0.0;
-  double sigma_time = 0.0;
-  double sigma_time_gn = 0.0;
-
-  // Calculate least square fitting parameter
-  for (size_t i = 0; i < n.size(); ++i) {
-    double gn_i = fitting_curve(n[i]);
-    sigma_gn_squared += gn_i * gn_i;
-    sigma_time += time[i];
-    sigma_time_gn += time[i] * gn_i;
-  }
-
-  LeastSq result;
-  result.complexity = oLambda;
-
-  // Calculate complexity.
-  result.coef = sigma_time_gn / sigma_gn_squared;
-
-  // Calculate RMS
-  double rms = 0.0;
-  for (size_t i = 0; i < n.size(); ++i) {
-    double fit = result.coef * fitting_curve(n[i]);
-    rms += pow((time[i] - fit), 2);
-  }
-
-  // Normalized RMS by the mean of the observed values
-  double mean = sigma_time / n.size();
-  result.rms = sqrt(rms / n.size()) / mean;
-
-  return result;
-}
-
-// Find the coefficient for the high-order term in the running time, by
-// minimizing the sum of squares of relative error.
-//   - n          : Vector containing the size of the benchmark tests.
-//   - time       : Vector containing the times for the benchmark tests.
-//   - complexity : If different than oAuto, the fitting curve will stick to
-//                  this one. If it is oAuto, it will be calculated the best
-//                  fitting curve.
-LeastSq MinimalLeastSq(const std::vector<int64_t>& n,
-                       const std::vector<double>& time, const BigO complexity) {
-  CHECK_EQ(n.size(), time.size());
-  CHECK_GE(n.size(), 2);  // Do not compute fitting curve is less than two
-                          // benchmark runs are given
-  CHECK_NE(complexity, oNone);
-
-  LeastSq best_fit;
-
-  if (complexity == oAuto) {
-    std::vector<BigO> fit_curves = {oLogN, oN, oNLogN, oNSquared, oNCubed};
-
-    // Take o1 as default best fitting curve
-    best_fit = MinimalLeastSq(n, time, FittingCurve(o1));
-    best_fit.complexity = o1;
-
-    // Compute all possible fitting curves and stick to the best one
-    for (const auto& fit : fit_curves) {
-      LeastSq current_fit = MinimalLeastSq(n, time, FittingCurve(fit));
-      if (current_fit.rms < best_fit.rms) {
-        best_fit = current_fit;
-        best_fit.complexity = fit;
-      }
-    }
-  } else {
-    best_fit = MinimalLeastSq(n, time, FittingCurve(complexity));
-    best_fit.complexity = complexity;
-  }
-
-  return best_fit;
-}
-
-std::vector<BenchmarkReporter::Run> ComputeBigO(
-    const std::vector<BenchmarkReporter::Run>& reports) {
-  typedef BenchmarkReporter::Run Run;
-  std::vector<Run> results;
-
-  if (reports.size() < 2) return results;
-
-  // Accumulators.
-  std::vector<int64_t> n;
-  std::vector<double> real_time;
-  std::vector<double> cpu_time;
-
-  // Populate the accumulators.
-  for (const Run& run : reports) {
-    CHECK_GT(run.complexity_n, 0) << "Did you forget to call SetComplexityN?";
-    n.push_back(run.complexity_n);
-    real_time.push_back(run.real_accumulated_time / run.iterations);
-    cpu_time.push_back(run.cpu_accumulated_time / run.iterations);
-  }
-
-  LeastSq result_cpu;
-  LeastSq result_real;
-
-  if (reports[0].complexity == oLambda) {
-    result_cpu = MinimalLeastSq(n, cpu_time, reports[0].complexity_lambda);
-    result_real = MinimalLeastSq(n, real_time, reports[0].complexity_lambda);
-  } else {
-    result_cpu = MinimalLeastSq(n, cpu_time, reports[0].complexity);
-    result_real = MinimalLeastSq(n, real_time, result_cpu.complexity);
-  }
-  std::string benchmark_name =
-      reports[0].benchmark_name.substr(0, reports[0].benchmark_name.find('/'));
-
-  // Get the data from the accumulator to BenchmarkReporter::Run's.
-  Run big_o;
-  big_o.benchmark_name = benchmark_name + "_BigO";
-  big_o.iterations = 0;
-  big_o.real_accumulated_time = result_real.coef;
-  big_o.cpu_accumulated_time = result_cpu.coef;
-  big_o.report_big_o = true;
-  big_o.complexity = result_cpu.complexity;
-
-  // All the time results are reported after being multiplied by the
-  // time unit multiplier. But since RMS is a relative quantity it
-  // should not be multiplied at all. So, here, we _divide_ it by the
-  // multiplier so that when it is multiplied later the result is the
-  // correct one.
-  double multiplier = GetTimeUnitMultiplier(reports[0].time_unit);
-
-  // Only add label to mean/stddev if it is same for all runs
-  Run rms;
-  big_o.report_label = reports[0].report_label;
-  rms.benchmark_name = benchmark_name + "_RMS";
-  rms.report_label = big_o.report_label;
-  rms.iterations = 0;
-  rms.real_accumulated_time = result_real.rms / multiplier;
-  rms.cpu_accumulated_time = result_cpu.rms / multiplier;
-  rms.report_rms = true;
-  rms.complexity = result_cpu.complexity;
-  // don't forget to keep the time unit, or we won't be able to
-  // recover the correct value.
-  rms.time_unit = reports[0].time_unit;
-
-  results.push_back(big_o);
-  results.push_back(rms);
-  return results;
-}
-
-}  // end namespace benchmark
diff --git a/gnu/llvm/llvm/utils/benchmark/src/complexity.h b/gnu/llvm/llvm/utils/benchmark/src/complexity.h
deleted file mode 100644
index df29b48d29b..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/complexity.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2016 Ismael Jimenez Martinez. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Source project : https://github.com/ismaelJimenez/cpp.leastsq
-// Adapted to be used with google benchmark
-
-#ifndef COMPLEXITY_H_
-#define COMPLEXITY_H_
-
-#include <string>
-#include <vector>
-
-#include "benchmark/benchmark.h"
-
-namespace benchmark {
-
-// Return a vector containing the bigO and RMS information for the specified
-// list of reports. If 'reports.size() < 2' an empty vector is returned.
-std::vector<BenchmarkReporter::Run> ComputeBigO(
-    const std::vector<BenchmarkReporter::Run>& reports);
-
-// This data structure will contain the result returned by MinimalLeastSq
-//   - coef        : Estimated coeficient for the high-order term as
-//                   interpolated from data.
-//   - rms         : Normalized Root Mean Squared Error.
-//   - complexity  : Scalability form (e.g. oN, oNLogN). In case a scalability
-//                   form has been provided to MinimalLeastSq this will return
-//                   the same value. In case BigO::oAuto has been selected, this
-//                   parameter will return the best fitting curve detected.
-
-struct LeastSq {
-  LeastSq() : coef(0.0), rms(0.0), complexity(oNone) {}
-
-  double coef;
-  double rms;
-  BigO complexity;
-};
-
-// Function to return an string for the calculated complexity
-std::string GetBigOString(BigO complexity);
-
-}  // end namespace benchmark
-
-#endif  // COMPLEXITY_H_
diff --git a/gnu/llvm/llvm/utils/benchmark/src/console_reporter.cc b/gnu/llvm/llvm/utils/benchmark/src/console_reporter.cc
deleted file mode 100644
index 48920ca7829..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/console_reporter.cc
+++ /dev/null
@@ -1,182 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "benchmark/benchmark.h"
-#include "complexity.h"
-#include "counter.h"
-
-#include <algorithm>
-#include <cstdint>
-#include <cstdio>
-#include <iostream>
-#include <string>
-#include <tuple>
-#include <vector>
-
-#include "check.h"
-#include "colorprint.h"
-#include "commandlineflags.h"
-#include "internal_macros.h"
-#include "string_util.h"
-#include "timers.h"
-
-namespace benchmark {
-
-bool ConsoleReporter::ReportContext(const Context& context) {
-  name_field_width_ = context.name_field_width;
-  printed_header_ = false;
-  prev_counters_.clear();
-
-  PrintBasicContext(&GetErrorStream(), context);
-
-#ifdef BENCHMARK_OS_WINDOWS
-  if ((output_options_ & OO_Color) && &std::cout != &GetOutputStream()) {
-    GetErrorStream()
-        << "Color printing is only supported for stdout on windows."
-           " Disabling color printing\n";
-    output_options_ = static_cast< OutputOptions >(output_options_ & ~OO_Color);
-  }
-#endif
-
-  return true;
-}
-
-void ConsoleReporter::PrintHeader(const Run& run) {
-  std::string str = FormatString("%-*s %13s %13s %10s", static_cast<int>(name_field_width_),
-                                 "Benchmark", "Time", "CPU", "Iterations");
-  if(!run.counters.empty()) {
-    if(output_options_ & OO_Tabular) {
-      for(auto const& c : run.counters) {
-        str += FormatString(" %10s", c.first.c_str());
-      }
-    } else {
-      str += " UserCounters...";
-    }
-  }
-  str += "\n";
-  std::string line = std::string(str.length(), '-');
-  GetOutputStream() << line << "\n" << str << line << "\n";
-}
-
-void ConsoleReporter::ReportRuns(const std::vector<Run>& reports) {
-  for (const auto& run : reports) {
-    // print the header:
-    // --- if none was printed yet
-    bool print_header = !printed_header_;
-    // --- or if the format is tabular and this run
-    //     has different fields from the prev header
-    print_header |= (output_options_ & OO_Tabular) &&
-                    (!internal::SameNames(run.counters, prev_counters_));
-    if (print_header) {
-      printed_header_ = true;
-      prev_counters_ = run.counters;
-      PrintHeader(run);
-    }
-    // As an alternative to printing the headers like this, we could sort
-    // the benchmarks by header and then print. But this would require
-    // waiting for the full results before printing, or printing twice.
-    PrintRunData(run);
-  }
-}
-
-static void IgnoreColorPrint(std::ostream& out, LogColor, const char* fmt,
-                             ...) {
-  va_list args;
-  va_start(args, fmt);
-  out << FormatString(fmt, args);
-  va_end(args);
-}
-
-void ConsoleReporter::PrintRunData(const Run& result) {
-  typedef void(PrinterFn)(std::ostream&, LogColor, const char*, ...);
-  auto& Out = GetOutputStream();
-  PrinterFn* printer = (output_options_ & OO_Color) ?
-                         (PrinterFn*)ColorPrintf : IgnoreColorPrint;
-  auto name_color =
-      (result.report_big_o || result.report_rms) ? COLOR_BLUE : COLOR_GREEN;
-  printer(Out, name_color, "%-*s ", name_field_width_,
-          result.benchmark_name.c_str());
-
-  if (result.error_occurred) {
-    printer(Out, COLOR_RED, "ERROR OCCURRED: \'%s\'",
-            result.error_message.c_str());
-    printer(Out, COLOR_DEFAULT, "\n");
-    return;
-  }
-  // Format bytes per second
-  std::string rate;
-  if (result.bytes_per_second > 0) {
-    rate = StrCat(" ", HumanReadableNumber(result.bytes_per_second), "B/s");
-  }
-
-  // Format items per second
-  std::string items;
-  if (result.items_per_second > 0) {
-    items =
-        StrCat(" ", HumanReadableNumber(result.items_per_second), " items/s");
-  }
-
-  const double real_time = result.GetAdjustedRealTime();
-  const double cpu_time = result.GetAdjustedCPUTime();
-
-  if (result.report_big_o) {
-    std::string big_o = GetBigOString(result.complexity);
-    printer(Out, COLOR_YELLOW, "%10.2f %s %10.2f %s ", real_time, big_o.c_str(),
-            cpu_time, big_o.c_str());
-  } else if (result.report_rms) {
-    printer(Out, COLOR_YELLOW, "%10.0f %% %10.0f %% ", real_time * 100,
-            cpu_time * 100);
-  } else {
-    const char* timeLabel = GetTimeUnitString(result.time_unit);
-    printer(Out, COLOR_YELLOW, "%10.0f %s %10.0f %s ", real_time, timeLabel,
-            cpu_time, timeLabel);
-  }
-
-  if (!result.report_big_o && !result.report_rms) {
-    printer(Out, COLOR_CYAN, "%10lld", result.iterations);
-  }
-
-  for (auto& c : result.counters) {
-    const std::size_t cNameLen = std::max(std::string::size_type(10),
-                                          c.first.length());
-    auto const& s = HumanReadableNumber(c.second.value, 1000);
-    if (output_options_ & OO_Tabular) {
-      if (c.second.flags & Counter::kIsRate) {
-        printer(Out, COLOR_DEFAULT, " %*s/s", cNameLen - 2, s.c_str());
-      } else {
-        printer(Out, COLOR_DEFAULT, " %*s", cNameLen, s.c_str());
-      }
-    } else {
-      const char* unit = (c.second.flags & Counter::kIsRate) ? "/s" : "";
-      printer(Out, COLOR_DEFAULT, " %s=%s%s", c.first.c_str(), s.c_str(),
-              unit);
-    }
-  }
-
-  if (!rate.empty()) {
-    printer(Out, COLOR_DEFAULT, " %*s", 13, rate.c_str());
-  }
-
-  if (!items.empty()) {
-    printer(Out, COLOR_DEFAULT, " %*s", 18, items.c_str());
-  }
-
-  if (!result.report_label.empty()) {
-    printer(Out, COLOR_DEFAULT, " %s", result.report_label.c_str());
-  }
-
-  printer(Out, COLOR_DEFAULT, "\n");
-}
-
-}  // end namespace benchmark
diff --git a/gnu/llvm/llvm/utils/benchmark/src/counter.cc b/gnu/llvm/llvm/utils/benchmark/src/counter.cc
deleted file mode 100644
index ed1aa044ee7..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/counter.cc
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "counter.h"
-
-namespace benchmark {
-namespace internal {
-
-double Finish(Counter const& c, double cpu_time, double num_threads) {
-  double v = c.value;
-  if (c.flags & Counter::kIsRate) {
-    v /= cpu_time;
-  }
-  if (c.flags & Counter::kAvgThreads) {
-    v /= num_threads;
-  }
-  return v;
-}
-
-void Finish(UserCounters *l, double cpu_time, double num_threads) {
-  for (auto &c : *l) {
-    c.second.value = Finish(c.second, cpu_time, num_threads);
-  }
-}
-
-void Increment(UserCounters *l, UserCounters const& r) {
-  // add counters present in both or just in *l
-  for (auto &c : *l) {
-    auto it = r.find(c.first);
-    if (it != r.end()) {
-      c.second.value = c.second + it->second;
-    }
-  }
-  // add counters present in r, but not in *l
-  for (auto const &tc : r) {
-    auto it = l->find(tc.first);
-    if (it == l->end()) {
-      (*l)[tc.first] = tc.second;
-    }
-  }
-}
-
-bool SameNames(UserCounters const& l, UserCounters const& r) {
-  if (&l == &r) return true;
-  if (l.size() != r.size()) {
-    return false;
-  }
-  for (auto const& c : l) {
-    if (r.find(c.first) == r.end()) {
-      return false;
-    }
-  }
-  return true;
-}
-
-} // end namespace internal
-} // end namespace benchmark
diff --git a/gnu/llvm/llvm/utils/benchmark/src/counter.h b/gnu/llvm/llvm/utils/benchmark/src/counter.h
deleted file mode 100644
index dd6865a31d7..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/counter.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "benchmark/benchmark.h"
-
-namespace benchmark {
-
-// these counter-related functions are hidden to reduce API surface.
-namespace internal {
-void Finish(UserCounters *l, double time, double num_threads);
-void Increment(UserCounters *l, UserCounters const& r);
-bool SameNames(UserCounters const& l, UserCounters const& r);
-} // end namespace internal
-
-} //end namespace benchmark
diff --git a/gnu/llvm/llvm/utils/benchmark/src/csv_reporter.cc b/gnu/llvm/llvm/utils/benchmark/src/csv_reporter.cc
deleted file mode 100644
index 35510645b08..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/csv_reporter.cc
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "benchmark/benchmark.h"
-#include "complexity.h"
-
-#include <algorithm>
-#include <cstdint>
-#include <iostream>
-#include <string>
-#include <tuple>
-#include <vector>
-
-#include "string_util.h"
-#include "timers.h"
-#include "check.h"
-
-// File format reference: http://edoceo.com/utilitas/csv-file-format.
-
-namespace benchmark {
-
-namespace {
-std::vector<std::string> elements = {
-    "name",           "iterations",       "real_time",        "cpu_time",
-    "time_unit",      "bytes_per_second", "items_per_second", "label",
-    "error_occurred", "error_message"};
-}  // namespace
-
-bool CSVReporter::ReportContext(const Context& context) {
-  PrintBasicContext(&GetErrorStream(), context);
-  return true;
-}
-
-void CSVReporter::ReportRuns(const std::vector<Run> & reports) {
-  std::ostream& Out = GetOutputStream();
-
-  if (!printed_header_) {
-    // save the names of all the user counters
-    for (const auto& run : reports) {
-      for (const auto& cnt : run.counters) {
-        user_counter_names_.insert(cnt.first);
-      }
-    }
-
-    // print the header
-    for (auto B = elements.begin(); B != elements.end();) {
-      Out << *B++;
-      if (B != elements.end()) Out << ",";
-    }
-    for (auto B = user_counter_names_.begin(); B != user_counter_names_.end();) {
-      Out << ",\"" << *B++ << "\"";
-    }
-    Out << "\n";
-
-    printed_header_ = true;
-  } else {
-    // check that all the current counters are saved in the name set
-    for (const auto& run : reports) {
-      for (const auto& cnt : run.counters) {
-        CHECK(user_counter_names_.find(cnt.first) != user_counter_names_.end())
-              << "All counters must be present in each run. "
-              << "Counter named \"" << cnt.first
-              << "\" was not in a run after being added to the header";
-      }
-    }
-  }
-
-  // print results for each run
-  for (const auto& run : reports) {
-    PrintRunData(run);
-  }
-
-}
-
-void CSVReporter::PrintRunData(const Run & run) {
-  std::ostream& Out = GetOutputStream();
-
-  // Field with embedded double-quote characters must be doubled and the field
-  // delimited with double-quotes.
-  std::string name = run.benchmark_name;
-  ReplaceAll(&name, "\"", "\"\"");
-  Out << '"' << name << "\",";
-  if (run.error_occurred) {
-    Out << std::string(elements.size() - 3, ',');
-    Out << "true,";
-    std::string msg = run.error_message;
-    ReplaceAll(&msg, "\"", "\"\"");
-    Out << '"' << msg << "\"\n";
-    return;
-  }
-
-  // Do not print iteration on bigO and RMS report
-  if (!run.report_big_o && !run.report_rms) {
-    Out << run.iterations;
-  }
-  Out << ",";
-
-  Out << run.GetAdjustedRealTime() << ",";
-  Out << run.GetAdjustedCPUTime() << ",";
-
-  // Do not print timeLabel on bigO and RMS report
-  if (run.report_big_o) {
-    Out << GetBigOString(run.complexity);
-  } else if (!run.report_rms) {
-    Out << GetTimeUnitString(run.time_unit);
-  }
-  Out << ",";
-
-  if (run.bytes_per_second > 0.0) {
-    Out << run.bytes_per_second;
-  }
-  Out << ",";
-  if (run.items_per_second > 0.0) {
-    Out << run.items_per_second;
-  }
-  Out << ",";
-  if (!run.report_label.empty()) {
-    // Field with embedded double-quote characters must be doubled and the field
-    // delimited with double-quotes.
-    std::string label = run.report_label;
-    ReplaceAll(&label, "\"", "\"\"");
-    Out << "\"" << label << "\"";
-  }
-  Out << ",,";  // for error_occurred and error_message
-
-  // Print user counters
-  for (const auto &ucn : user_counter_names_) {
-    auto it = run.counters.find(ucn);
-    if(it == run.counters.end()) {
-      Out << ",";
-    } else {
-      Out << "," << it->second;
-    }
-  }
-  Out << '\n';
-}
-
-}  // end namespace benchmark
diff --git a/gnu/llvm/llvm/utils/benchmark/src/cycleclock.h b/gnu/llvm/llvm/utils/benchmark/src/cycleclock.h
deleted file mode 100644
index 040ec22c20a..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/cycleclock.h
+++ /dev/null
@@ -1,206 +0,0 @@
-// ----------------------------------------------------------------------
-// CycleClock
-//    A CycleClock tells you the current time in Cycles.  The "time"
-//    is actually time since power-on.  This is like time() but doesn't
-//    involve a system call and is much more precise.
-//
-// NOTE: Not all cpu/platform/kernel combinations guarantee that this
-// clock increments at a constant rate or is synchronized across all logical
-// cpus in a system.
-//
-// If you need the above guarantees, please consider using a different
-// API. There are efforts to provide an interface which provides a millisecond
-// granularity and implemented as a memory read. A memory read is generally
-// cheaper than the CycleClock for many architectures.
-//
-// Also, in some out of order CPU implementations, the CycleClock is not
-// serializing. So if you're trying to count at cycles granularity, your
-// data might be inaccurate due to out of order instruction execution.
-// ----------------------------------------------------------------------
-
-#ifndef BENCHMARK_CYCLECLOCK_H_
-#define BENCHMARK_CYCLECLOCK_H_
-
-#include <cstdint>
-
-#include "benchmark/benchmark.h"
-#include "internal_macros.h"
-
-#if defined(BENCHMARK_OS_MACOSX)
-#include <mach/mach_time.h>
-#endif
-// For MSVC, we want to use '_asm rdtsc' when possible (since it works
-// with even ancient MSVC compilers), and when not possible the
-// __rdtsc intrinsic, declared in <intrin.h>.  Unfortunately, in some
-// environments, <windows.h> and <intrin.h> have conflicting
-// declarations of some other intrinsics, breaking compilation.
-// Therefore, we simply declare __rdtsc ourselves. See also
-// http://connect.microsoft.com/VisualStudio/feedback/details/262047
-#if defined(COMPILER_MSVC) && !defined(_M_IX86)
-extern "C" uint64_t __rdtsc();
-#pragma intrinsic(__rdtsc)
-#endif
-
-#if !defined(BENCHMARK_OS_WINDOWS) || defined(BENCHMARK_OS_MINGW)
-#include <sys/time.h>
-#include <time.h>
-#endif
-
-#ifdef BENCHMARK_OS_EMSCRIPTEN
-#include <emscripten.h>
-#endif
-
-namespace benchmark {
-// NOTE: only i386 and x86_64 have been well tested.
-// PPC, sparc, alpha, and ia64 are based on
-//    http://peter.kuscsik.com/wordpress/?p=14
-// with modifications by m3b.  See also
-//    https://setisvn.ssl.berkeley.edu/svn/lib/fftw-3.0.1/kernel/cycle.h
-namespace cycleclock {
-// This should return the number of cycles since power-on.  Thread-safe.
-inline BENCHMARK_ALWAYS_INLINE int64_t Now() {
-#if defined(BENCHMARK_OS_MACOSX)
-  // this goes at the top because we need ALL Macs, regardless of
-  // architecture, to return the number of "mach time units" that
-  // have passed since startup.  See sysinfo.cc where
-  // InitializeSystemInfo() sets the supposed cpu clock frequency of
-  // macs to the number of mach time units per second, not actual
-  // CPU clock frequency (which can change in the face of CPU
-  // frequency scaling).  Also note that when the Mac sleeps, this
-  // counter pauses; it does not continue counting, nor does it
-  // reset to zero.
-  return mach_absolute_time();
-#elif defined(BENCHMARK_OS_EMSCRIPTEN)
-  // this goes above x86-specific code because old versions of Emscripten
-  // define __x86_64__, although they have nothing to do with it.
-  return static_cast<int64_t>(emscripten_get_now() * 1e+6);
-#elif defined(__i386__)
-  int64_t ret;
-  __asm__ volatile("rdtsc" : "=A"(ret));
-  return ret;
-#elif defined(__x86_64__) || defined(__amd64__)
-  uint64_t low, high;
-  __asm__ volatile("rdtsc" : "=a"(low), "=d"(high));
-  return (high << 32) | low;
-#elif defined(__powerpc__) || defined(__ppc__)
-  // This returns a time-base, which is not always precisely a cycle-count.
-#if defined(__powerpc64__) || defined(__ppc64__)
-  int64_t tb;
-  asm volatile("mfspr %0, 268" : "=r"(tb));
-  return tb;
-#else
-  uint32_t tbl, tbu0, tbu1;
-  asm volatile(
-      "mftbu %0\n"
-      "mftb %1\n"
-      "mftbu %2"
-      : "=r"(tbu0), "=r"(tbl), "=r"(tbu1));
-  tbl &= -static_cast<int32_t>(tbu0 == tbu1);
-  // high 32 bits in tbu1; low 32 bits in tbl  (tbu0 is no longer needed)
-  return (static_cast<uint64_t>(tbu1) << 32) | tbl;
-#endif
-#elif defined(__sparc__)
-  int64_t tick;
-  asm(".byte 0x83, 0x41, 0x00, 0x00");
-  asm("mov   %%g1, %0" : "=r"(tick));
-  return tick;
-#elif defined(__ia64__)
-  int64_t itc;
-  asm("mov %0 = ar.itc" : "=r"(itc));
-  return itc;
-#elif defined(COMPILER_MSVC) && defined(_M_IX86)
-  // Older MSVC compilers (like 7.x) don't seem to support the
-  // __rdtsc intrinsic properly, so I prefer to use _asm instead
-  // when I know it will work.  Otherwise, I'll use __rdtsc and hope
-  // the code is being compiled with a non-ancient compiler.
-  _asm rdtsc
-#elif defined(COMPILER_MSVC)
-  return __rdtsc();
-#elif defined(BENCHMARK_OS_NACL)
-  // Native Client validator on x86/x86-64 allows RDTSC instructions,
-  // and this case is handled above. Native Client validator on ARM
-  // rejects MRC instructions (used in the ARM-specific sequence below),
-  // so we handle it here. Portable Native Client compiles to
-  // architecture-agnostic bytecode, which doesn't provide any
-  // cycle counter access mnemonics.
-
-  // Native Client does not provide any API to access cycle counter.
-  // Use clock_gettime(CLOCK_MONOTONIC, ...) instead of gettimeofday
-  // because is provides nanosecond resolution (which is noticable at
-  // least for PNaCl modules running on x86 Mac & Linux).
-  // Initialize to always return 0 if clock_gettime fails.
-  struct timespec ts = { 0, 0 };
-  clock_gettime(CLOCK_MONOTONIC, &ts);
-  return static_cast<int64_t>(ts.tv_sec) * 1000000000 + ts.tv_nsec;
-#elif defined(__aarch64__)
-  // System timer of ARMv8 runs at a different frequency than the CPU's.
-  // The frequency is fixed, typically in the range 1-50MHz.  It can be
-  // read at CNTFRQ special register.  We assume the OS has set up
-  // the virtual timer properly.
-  int64_t virtual_timer_value;
-  asm volatile("mrs %0, cntvct_el0" : "=r"(virtual_timer_value));
-  return virtual_timer_value;
-#elif defined(__ARM_ARCH)
-  // V6 is the earliest arch that has a standard cyclecount
-  // Native Client validator doesn't allow MRC instructions.
-#if (__ARM_ARCH >= 6)
-  uint32_t pmccntr;
-  uint32_t pmuseren;
-  uint32_t pmcntenset;
-  // Read the user mode perf monitor counter access permissions.
-  asm volatile("mrc p15, 0, %0, c9, c14, 0" : "=r"(pmuseren));
-  if (pmuseren & 1) {  // Allows reading perfmon counters for user mode code.
-    asm volatile("mrc p15, 0, %0, c9, c12, 1" : "=r"(pmcntenset));
-    if (pmcntenset & 0x80000000ul) {  // Is it counting?
-      asm volatile("mrc p15, 0, %0, c9, c13, 0" : "=r"(pmccntr));
-      // The counter is set up to count every 64th cycle
-      return static_cast<int64_t>(pmccntr) * 64;  // Should optimize to << 6
-    }
-  }
-#endif
-  struct timeval tv;
-  gettimeofday(&tv, nullptr);
-  return static_cast<int64_t>(tv.tv_sec) * 1000000 + tv.tv_usec;
-#elif defined(__mips__) || defined(__m68k__)
-  // mips apparently only allows rdtsc for superusers, so we fall
-  // back to gettimeofday.  It's possible clock_gettime would be better.
-  struct timeval tv;
-  gettimeofday(&tv, nullptr);
-  return static_cast<int64_t>(tv.tv_sec) * 1000000 + tv.tv_usec;
-#elif defined(__s390__) // Covers both s390 and s390x.
-  // Return the CPU clock.
-  uint64_t tsc;
-  asm("stck %0" : "=Q" (tsc) : : "cc");
-  return tsc;
-#elif defined(__riscv) // RISC-V
-  // Use RDCYCLE (and RDCYCLEH on riscv32)
-#if __riscv_xlen == 32
-  uint32_t cycles_lo, cycles_hi0, cycles_hi1;
-  // This asm also includes the PowerPC overflow handling strategy, as above.
-  // Implemented in assembly because Clang insisted on branching.
-  asm volatile(
-      "rdcycleh %0\n"
-      "rdcycle %1\n"
-      "rdcycleh %2\n"
-      "sub %0, %0, %2\n"
-      "seqz %0, %0\n"
-      "sub %0, zero, %0\n"
-      "and %1, %1, %0\n"
-      : "=r"(cycles_hi0), "=r"(cycles_lo), "=r"(cycles_hi1));
-  return (static_cast<uint64_t>(cycles_hi1) << 32) | cycles_lo;
-#else
-  uint64_t cycles;
-  asm volatile("rdcycle %0" : "=r"(cycles));
-  return cycles;
-#endif
-#else
-// The soft failover to a generic implementation is automatic only for ARM.
-// For other platforms the developer is expected to make an attempt to create
-// a fast implementation and use generic version if nothing better is available.
-#error You need to define CycleTimer for your OS and CPU
-#endif
-}
-}  // end namespace cycleclock
-}  // end namespace benchmark
-
-#endif  // BENCHMARK_CYCLECLOCK_H_
diff --git a/gnu/llvm/llvm/utils/benchmark/src/internal_macros.h b/gnu/llvm/llvm/utils/benchmark/src/internal_macros.h
deleted file mode 100644
index f2d54bfcbd9..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/internal_macros.h
+++ /dev/null
@@ -1,81 +0,0 @@
-#ifndef BENCHMARK_INTERNAL_MACROS_H_
-#define BENCHMARK_INTERNAL_MACROS_H_
-
-#include "benchmark/benchmark.h"
-
-#ifndef __has_feature
-#define __has_feature(x) 0
-#endif
-
-#if defined(__clang__)
-  #if !defined(COMPILER_CLANG)
-    #define COMPILER_CLANG
-  #endif
-#elif defined(_MSC_VER)
-  #if !defined(COMPILER_MSVC)
-    #define COMPILER_MSVC
-  #endif
-#elif defined(__GNUC__)
-  #if !defined(COMPILER_GCC)
-    #define COMPILER_GCC
-  #endif
-#endif
-
-#if __has_feature(cxx_attributes)
-  #define BENCHMARK_NORETURN [[noreturn]]
-#elif defined(__GNUC__)
-  #define BENCHMARK_NORETURN __attribute__((noreturn))
-#elif defined(COMPILER_MSVC)
-  #define BENCHMARK_NORETURN __declspec(noreturn)
-#else
-  #define BENCHMARK_NORETURN
-#endif
-
-#if defined(__CYGWIN__)
-  #define BENCHMARK_OS_CYGWIN 1
-#elif defined(_WIN32)
-  #define BENCHMARK_OS_WINDOWS 1
-  #if defined(__MINGW32__)
-    #define BENCHMARK_OS_MINGW 1
-  #endif
-#elif defined(__APPLE__)
-  #define BENCHMARK_OS_APPLE 1
-  #include "TargetConditionals.h"
-  #if defined(TARGET_OS_MAC)
-    #define BENCHMARK_OS_MACOSX 1
-    #if defined(TARGET_OS_IPHONE)
-      #define BENCHMARK_OS_IOS 1
-    #endif
-  #endif
-#elif defined(__FreeBSD__)
-  #define BENCHMARK_OS_FREEBSD 1
-#elif defined(__NetBSD__)
-  #define BENCHMARK_OS_NETBSD 1
-#elif defined(__OpenBSD__)
-  #define BENCHMARK_OS_OPENBSD 1
-#elif defined(__linux__)
-  #define BENCHMARK_OS_LINUX 1
-#elif defined(__native_client__)
-  #define BENCHMARK_OS_NACL 1
-#elif defined(__EMSCRIPTEN__)
-  #define BENCHMARK_OS_EMSCRIPTEN 1
-#elif defined(__rtems__)
-  #define BENCHMARK_OS_RTEMS 1
-#elif defined(__Fuchsia__)
-#define BENCHMARK_OS_FUCHSIA 1
-#elif defined (__SVR4) && defined (__sun)
-#define BENCHMARK_OS_SOLARIS 1
-#endif
-
-#if !__has_feature(cxx_exceptions) && !defined(__cpp_exceptions) \
-     && !defined(__EXCEPTIONS)
-  #define BENCHMARK_HAS_NO_EXCEPTIONS
-#endif
-
-#if defined(COMPILER_CLANG) || defined(COMPILER_GCC)
-  #define BENCHMARK_MAYBE_UNUSED __attribute__((unused))
-#else
-  #define BENCHMARK_MAYBE_UNUSED
-#endif
-
-#endif  // BENCHMARK_INTERNAL_MACROS_H_
diff --git a/gnu/llvm/llvm/utils/benchmark/src/json_reporter.cc b/gnu/llvm/llvm/utils/benchmark/src/json_reporter.cc
deleted file mode 100644
index 685d6b097dc..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/json_reporter.cc
+++ /dev/null
@@ -1,205 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "benchmark/benchmark.h"
-#include "complexity.h"
-
-#include <algorithm>
-#include <cstdint>
-#include <iostream>
-#include <string>
-#include <tuple>
-#include <vector>
-#include <iomanip> // for setprecision
-#include <limits>
-
-#include "string_util.h"
-#include "timers.h"
-
-namespace benchmark {
-
-namespace {
-
-std::string FormatKV(std::string const& key, std::string const& value) {
-  return StrFormat("\"%s\": \"%s\"", key.c_str(), value.c_str());
-}
-
-std::string FormatKV(std::string const& key, const char* value) {
-  return StrFormat("\"%s\": \"%s\"", key.c_str(), value);
-}
-
-std::string FormatKV(std::string const& key, bool value) {
-  return StrFormat("\"%s\": %s", key.c_str(), value ? "true" : "false");
-}
-
-std::string FormatKV(std::string const& key, int64_t value) {
-  std::stringstream ss;
-  ss << '"' << key << "\": " << value;
-  return ss.str();
-}
-
-std::string FormatKV(std::string const& key, double value) {
-  std::stringstream ss;
-  ss << '"' << key << "\": ";
-
-  const auto max_digits10 = std::numeric_limits<decltype (value)>::max_digits10;
-  const auto max_fractional_digits10 = max_digits10 - 1;
-
-  ss << std::scientific << std::setprecision(max_fractional_digits10) << value;
-  return ss.str();
-}
-
-int64_t RoundDouble(double v) { return static_cast<int64_t>(v + 0.5); }
-
-}  // end namespace
-
-bool JSONReporter::ReportContext(const Context& context) {
-  std::ostream& out = GetOutputStream();
-
-  out << "{\n";
-  std::string inner_indent(2, ' ');
-
-  // Open context block and print context information.
-  out << inner_indent << "\"context\": {\n";
-  std::string indent(4, ' ');
-
-  std::string walltime_value = LocalDateTimeString();
-  out << indent << FormatKV("date", walltime_value) << ",\n";
-
-  if (Context::executable_name) {
-    out << indent << FormatKV("executable", Context::executable_name) << ",\n";
-  }
-
-  CPUInfo const& info = context.cpu_info;
-  out << indent << FormatKV("num_cpus", static_cast<int64_t>(info.num_cpus))
-      << ",\n";
-  out << indent
-      << FormatKV("mhz_per_cpu",
-                  RoundDouble(info.cycles_per_second / 1000000.0))
-      << ",\n";
-  out << indent << FormatKV("cpu_scaling_enabled", info.scaling_enabled)
-      << ",\n";
-
-  out << indent << "\"caches\": [\n";
-  indent = std::string(6, ' ');
-  std::string cache_indent(8, ' ');
-  for (size_t i = 0; i < info.caches.size(); ++i) {
-    auto& CI = info.caches[i];
-    out << indent << "{\n";
-    out << cache_indent << FormatKV("type", CI.type) << ",\n";
-    out << cache_indent << FormatKV("level", static_cast<int64_t>(CI.level))
-        << ",\n";
-    out << cache_indent
-        << FormatKV("size", static_cast<int64_t>(CI.size) * 1000u) << ",\n";
-    out << cache_indent
-        << FormatKV("num_sharing", static_cast<int64_t>(CI.num_sharing))
-        << "\n";
-    out << indent << "}";
-    if (i != info.caches.size() - 1) out << ",";
-    out << "\n";
-  }
-  indent = std::string(4, ' ');
-  out << indent << "],\n";
-
-#if defined(NDEBUG)
-  const char build_type[] = "release";
-#else
-  const char build_type[] = "debug";
-#endif
-  out << indent << FormatKV("library_build_type", build_type) << "\n";
-  // Close context block and open the list of benchmarks.
-  out << inner_indent << "},\n";
-  out << inner_indent << "\"benchmarks\": [\n";
-  return true;
-}
-
-void JSONReporter::ReportRuns(std::vector<Run> const& reports) {
-  if (reports.empty()) {
-    return;
-  }
-  std::string indent(4, ' ');
-  std::ostream& out = GetOutputStream();
-  if (!first_report_) {
-    out << ",\n";
-  }
-  first_report_ = false;
-
-  for (auto it = reports.begin(); it != reports.end(); ++it) {
-    out << indent << "{\n";
-    PrintRunData(*it);
-    out << indent << '}';
-    auto it_cp = it;
-    if (++it_cp != reports.end()) {
-      out << ",\n";
-    }
-  }
-}
-
-void JSONReporter::Finalize() {
-  // Close the list of benchmarks and the top level object.
-  GetOutputStream() << "\n  ]\n}\n";
-}
-
-void JSONReporter::PrintRunData(Run const& run) {
-  std::string indent(6, ' ');
-  std::ostream& out = GetOutputStream();
-  out << indent << FormatKV("name", run.benchmark_name) << ",\n";
-  if (run.error_occurred) {
-    out << indent << FormatKV("error_occurred", run.error_occurred) << ",\n";
-    out << indent << FormatKV("error_message", run.error_message) << ",\n";
-  }
-  if (!run.report_big_o && !run.report_rms) {
-    out << indent << FormatKV("iterations", run.iterations) << ",\n";
-    out << indent
-        << FormatKV("real_time", run.GetAdjustedRealTime())
-        << ",\n";
-    out << indent
-        << FormatKV("cpu_time", run.GetAdjustedCPUTime());
-    out << ",\n"
-        << indent << FormatKV("time_unit", GetTimeUnitString(run.time_unit));
-  } else if (run.report_big_o) {
-    out << indent
-        << FormatKV("cpu_coefficient", run.GetAdjustedCPUTime())
-        << ",\n";
-    out << indent
-        << FormatKV("real_coefficient", run.GetAdjustedRealTime())
-        << ",\n";
-    out << indent << FormatKV("big_o", GetBigOString(run.complexity)) << ",\n";
-    out << indent << FormatKV("time_unit", GetTimeUnitString(run.time_unit));
-  } else if (run.report_rms) {
-    out << indent
-        << FormatKV("rms", run.GetAdjustedCPUTime());
-  }
-  if (run.bytes_per_second > 0.0) {
-    out << ",\n"
-        << indent
-        << FormatKV("bytes_per_second", run.bytes_per_second);
-  }
-  if (run.items_per_second > 0.0) {
-    out << ",\n"
-        << indent
-        << FormatKV("items_per_second", run.items_per_second);
-  }
-  for(auto &c : run.counters) {
-    out << ",\n"
-        << indent
-        << FormatKV(c.first, c.second);
-  }
-  if (!run.report_label.empty()) {
-    out << ",\n" << indent << FormatKV("label", run.report_label);
-  }
-  out << '\n';
-}
-
-} // end namespace benchmark
diff --git a/gnu/llvm/llvm/utils/benchmark/src/log.h b/gnu/llvm/llvm/utils/benchmark/src/log.h
deleted file mode 100644
index d06e1031db1..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/log.h
+++ /dev/null
@@ -1,73 +0,0 @@
-#ifndef BENCHMARK_LOG_H_
-#define BENCHMARK_LOG_H_
-
-#include <iostream>
-#include <ostream>
-
-#include "benchmark/benchmark.h"
-
-namespace benchmark {
-namespace internal {
-
-typedef std::basic_ostream<char>&(EndLType)(std::basic_ostream<char>&);
-
-class LogType {
-  friend LogType& GetNullLogInstance();
-  friend LogType& GetErrorLogInstance();
-
-  // FIXME: Add locking to output.
-  template <class Tp>
-  friend LogType& operator<<(LogType&, Tp const&);
-  friend LogType& operator<<(LogType&, EndLType*);
-
- private:
-  LogType(std::ostream* out) : out_(out) {}
-  std::ostream* out_;
-  BENCHMARK_DISALLOW_COPY_AND_ASSIGN(LogType);
-};
-
-template <class Tp>
-LogType& operator<<(LogType& log, Tp const& value) {
-  if (log.out_) {
-    *log.out_ << value;
-  }
-  return log;
-}
-
-inline LogType& operator<<(LogType& log, EndLType* m) {
-  if (log.out_) {
-    *log.out_ << m;
-  }
-  return log;
-}
-
-inline int& LogLevel() {
-  static int log_level = 0;
-  return log_level;
-}
-
-inline LogType& GetNullLogInstance() {
-  static LogType log(nullptr);
-  return log;
-}
-
-inline LogType& GetErrorLogInstance() {
-  static LogType log(&std::clog);
-  return log;
-}
-
-inline LogType& GetLogInstanceForLevel(int level) {
-  if (level <= LogLevel()) {
-    return GetErrorLogInstance();
-  }
-  return GetNullLogInstance();
-}
-
-}  // end namespace internal
-}  // end namespace benchmark
-
-#define VLOG(x)                                                               \
-  (::benchmark::internal::GetLogInstanceForLevel(x) << "-- LOG(" << x << "):" \
-                                                                         " ")
-
-#endif
diff --git a/gnu/llvm/llvm/utils/benchmark/src/mutex.h b/gnu/llvm/llvm/utils/benchmark/src/mutex.h
deleted file mode 100644
index 5f461d05a0c..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/mutex.h
+++ /dev/null
@@ -1,155 +0,0 @@
-#ifndef BENCHMARK_MUTEX_H_
-#define BENCHMARK_MUTEX_H_
-
-#include <condition_variable>
-#include <mutex>
-
-#include "check.h"
-
-// Enable thread safety attributes only with clang.
-// The attributes can be safely erased when compiling with other compilers.
-#if defined(HAVE_THREAD_SAFETY_ATTRIBUTES)
-#define THREAD_ANNOTATION_ATTRIBUTE__(x) __attribute__((x))
-#else
-#define THREAD_ANNOTATION_ATTRIBUTE__(x)  // no-op
-#endif
-
-#define CAPABILITY(x) THREAD_ANNOTATION_ATTRIBUTE__(capability(x))
-
-#define SCOPED_CAPABILITY THREAD_ANNOTATION_ATTRIBUTE__(scoped_lockable)
-
-#define GUARDED_BY(x) THREAD_ANNOTATION_ATTRIBUTE__(guarded_by(x))
-
-#define PT_GUARDED_BY(x) THREAD_ANNOTATION_ATTRIBUTE__(pt_guarded_by(x))
-
-#define ACQUIRED_BEFORE(...) \
-  THREAD_ANNOTATION_ATTRIBUTE__(acquired_before(__VA_ARGS__))
-
-#define ACQUIRED_AFTER(...) \
-  THREAD_ANNOTATION_ATTRIBUTE__(acquired_after(__VA_ARGS__))
-
-#define REQUIRES(...) \
-  THREAD_ANNOTATION_ATTRIBUTE__(requires_capability(__VA_ARGS__))
-
-#define REQUIRES_SHARED(...) \
-  THREAD_ANNOTATION_ATTRIBUTE__(requires_shared_capability(__VA_ARGS__))
-
-#define ACQUIRE(...) \
-  THREAD_ANNOTATION_ATTRIBUTE__(acquire_capability(__VA_ARGS__))
-
-#define ACQUIRE_SHARED(...) \
-  THREAD_ANNOTATION_ATTRIBUTE__(acquire_shared_capability(__VA_ARGS__))
-
-#define RELEASE(...) \
-  THREAD_ANNOTATION_ATTRIBUTE__(release_capability(__VA_ARGS__))
-
-#define RELEASE_SHARED(...) \
-  THREAD_ANNOTATION_ATTRIBUTE__(release_shared_capability(__VA_ARGS__))
-
-#define TRY_ACQUIRE(...) \
-  THREAD_ANNOTATION_ATTRIBUTE__(try_acquire_capability(__VA_ARGS__))
-
-#define TRY_ACQUIRE_SHARED(...) \
-  THREAD_ANNOTATION_ATTRIBUTE__(try_acquire_shared_capability(__VA_ARGS__))
-
-#define EXCLUDES(...) THREAD_ANNOTATION_ATTRIBUTE__(locks_excluded(__VA_ARGS__))
-
-#define ASSERT_CAPABILITY(x) THREAD_ANNOTATION_ATTRIBUTE__(assert_capability(x))
-
-#define ASSERT_SHARED_CAPABILITY(x) \
-  THREAD_ANNOTATION_ATTRIBUTE__(assert_shared_capability(x))
-
-#define RETURN_CAPABILITY(x) THREAD_ANNOTATION_ATTRIBUTE__(lock_returned(x))
-
-#define NO_THREAD_SAFETY_ANALYSIS \
-  THREAD_ANNOTATION_ATTRIBUTE__(no_thread_safety_analysis)
-
-namespace benchmark {
-
-typedef std::condition_variable Condition;
-
-// NOTE: Wrappers for std::mutex and std::unique_lock are provided so that
-// we can annotate them with thread safety attributes and use the
-// -Wthread-safety warning with clang. The standard library types cannot be
-// used directly because they do not provided the required annotations.
-class CAPABILITY("mutex") Mutex {
- public:
-  Mutex() {}
-
-  void lock() ACQUIRE() { mut_.lock(); }
-  void unlock() RELEASE() { mut_.unlock(); }
-  std::mutex& native_handle() { return mut_; }
-
- private:
-  std::mutex mut_;
-};
-
-class SCOPED_CAPABILITY MutexLock {
-  typedef std::unique_lock<std::mutex> MutexLockImp;
-
- public:
-  MutexLock(Mutex& m) ACQUIRE(m) : ml_(m.native_handle()) {}
-  ~MutexLock() RELEASE() {}
-  MutexLockImp& native_handle() { return ml_; }
-
- private:
-  MutexLockImp ml_;
-};
-
-class Barrier {
- public:
-  Barrier(int num_threads) : running_threads_(num_threads) {}
-
-  // Called by each thread
-  bool wait() EXCLUDES(lock_) {
-    bool last_thread = false;
-    {
-      MutexLock ml(lock_);
-      last_thread = createBarrier(ml);
-    }
-    if (last_thread) phase_condition_.notify_all();
-    return last_thread;
-  }
-
-  void removeThread() EXCLUDES(lock_) {
-    MutexLock ml(lock_);
-    --running_threads_;
-    if (entered_ != 0) phase_condition_.notify_all();
-  }
-
- private:
-  Mutex lock_;
-  Condition phase_condition_;
-  int running_threads_;
-
-  // State for barrier management
-  int phase_number_ = 0;
-  int entered_ = 0;  // Number of threads that have entered this barrier
-
-  // Enter the barrier and wait until all other threads have also
-  // entered the barrier.  Returns iff this is the last thread to
-  // enter the barrier.
-  bool createBarrier(MutexLock& ml) REQUIRES(lock_) {
-    CHECK_LT(entered_, running_threads_);
-    entered_++;
-    if (entered_ < running_threads_) {
-      // Wait for all threads to enter
-      int phase_number_cp = phase_number_;
-      auto cb = [this, phase_number_cp]() {
-        return this->phase_number_ > phase_number_cp ||
-               entered_ == running_threads_;  // A thread has aborted in error
-      };
-      phase_condition_.wait(ml.native_handle(), cb);
-      if (phase_number_ > phase_number_cp) return false;
-      // else (running_threads_ == entered_) and we are the last thread.
-    }
-    // Last thread has reached the barrier
-    phase_number_++;
-    entered_ = 0;
-    return true;
-  }
-};
-
-}  // end namespace benchmark
-
-#endif  // BENCHMARK_MUTEX_H_
diff --git a/gnu/llvm/llvm/utils/benchmark/src/re.h b/gnu/llvm/llvm/utils/benchmark/src/re.h
deleted file mode 100644
index 924d2f0ba7e..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/re.h
+++ /dev/null
@@ -1,152 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef BENCHMARK_RE_H_
-#define BENCHMARK_RE_H_
-
-#include "internal_macros.h"
-
-#if !defined(HAVE_STD_REGEX) && \
-    !defined(HAVE_GNU_POSIX_REGEX) && \
-    !defined(HAVE_POSIX_REGEX)
-  // No explicit regex selection; detect based on builtin hints.
-  #if defined(BENCHMARK_OS_LINUX) || defined(BENCHMARK_OS_APPLE)
-    #define HAVE_POSIX_REGEX 1
-  #elif __cplusplus >= 199711L
-    #define HAVE_STD_REGEX 1
-  #endif
-#endif
-
-// Prefer C regex libraries when compiling w/o exceptions so that we can
-// correctly report errors.
-#if defined(BENCHMARK_HAS_NO_EXCEPTIONS) && \
-    defined(BENCHMARK_HAVE_STD_REGEX) && \
-    (defined(HAVE_GNU_POSIX_REGEX) || defined(HAVE_POSIX_REGEX))
-  #undef HAVE_STD_REGEX
-#endif
-
-#if defined(HAVE_STD_REGEX)
-  #include <regex>
-#elif defined(HAVE_GNU_POSIX_REGEX)
-  #include <gnuregex.h>
-#elif defined(HAVE_POSIX_REGEX)
-  #include <regex.h>
-#else
-#error No regular expression backend was found!
-#endif
-#include <string>
-
-#include "check.h"
-
-namespace benchmark {
-
-// A wrapper around the POSIX regular expression API that provides automatic
-// cleanup
-class Regex {
- public:
-  Regex() : init_(false) {}
-
-  ~Regex();
-
-  // Compile a regular expression matcher from spec.  Returns true on success.
-  //
-  // On failure (and if error is not nullptr), error is populated with a human
-  // readable error message if an error occurs.
-  bool Init(const std::string& spec, std::string* error);
-
-  // Returns whether str matches the compiled regular expression.
-  bool Match(const std::string& str);
-
- private:
-  bool init_;
-// Underlying regular expression object
-#if defined(HAVE_STD_REGEX)
-  std::regex re_;
-#elif defined(HAVE_POSIX_REGEX) || defined(HAVE_GNU_POSIX_REGEX)
-  regex_t re_;
-#else
-  #error No regular expression backend implementation available
-#endif
-};
-
-#if defined(HAVE_STD_REGEX)
-
-inline bool Regex::Init(const std::string& spec, std::string* error) {
-#ifdef BENCHMARK_HAS_NO_EXCEPTIONS
-  ((void)error); // suppress unused warning
-#else
-  try {
-#endif
-    re_ = std::regex(spec, std::regex_constants::extended);
-    init_ = true;
-#ifndef BENCHMARK_HAS_NO_EXCEPTIONS
-  } catch (const std::regex_error& e) {
-    if (error) {
-      *error = e.what();
-    }
-  }
-#endif
-  return init_;
-}
-
-inline Regex::~Regex() {}
-
-inline bool Regex::Match(const std::string& str) {
-  if (!init_) {
-    return false;
-  }
-  return std::regex_search(str, re_);
-}
-
-#else
-inline bool Regex::Init(const std::string& spec, std::string* error) {
-  int ec = regcomp(&re_, spec.c_str(), REG_EXTENDED | REG_NOSUB);
-  if (ec != 0) {
-    if (error) {
-      size_t needed = regerror(ec, &re_, nullptr, 0);
-      char* errbuf = new char[needed];
-      regerror(ec, &re_, errbuf, needed);
-
-      // regerror returns the number of bytes necessary to null terminate
-      // the string, so we move that when assigning to error.
-      CHECK_NE(needed, 0);
-      error->assign(errbuf, needed - 1);
-
-      delete[] errbuf;
-    }
-
-    return false;
-  }
-
-  init_ = true;
-  return true;
-}
-
-inline Regex::~Regex() {
-  if (init_) {
-    regfree(&re_);
-  }
-}
-
-inline bool Regex::Match(const std::string& str) {
-  if (!init_) {
-    return false;
-  }
-  return regexec(&re_, str.c_str(), 0, nullptr, 0) == 0;
-}
-#endif
-
-}  // end namespace benchmark
-
-#endif  // BENCHMARK_RE_H_
diff --git a/gnu/llvm/llvm/utils/benchmark/src/reporter.cc b/gnu/llvm/llvm/utils/benchmark/src/reporter.cc
deleted file mode 100644
index 4b40aaec8b9..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/reporter.cc
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "benchmark/benchmark.h"
-#include "timers.h"
-
-#include <cstdlib>
-
-#include <iostream>
-#include <tuple>
-#include <vector>
-
-#include "check.h"
-
-namespace benchmark {
-
-BenchmarkReporter::BenchmarkReporter()
-    : output_stream_(&std::cout), error_stream_(&std::cerr) {}
-
-BenchmarkReporter::~BenchmarkReporter() {}
-
-void BenchmarkReporter::PrintBasicContext(std::ostream *out,
-                                          Context const &context) {
-  CHECK(out) << "cannot be null";
-  auto &Out = *out;
-
-  Out << LocalDateTimeString() << "\n";
-
-  if (context.executable_name)
-    Out << "Running " << context.executable_name << "\n";
-
-  const CPUInfo &info = context.cpu_info;
-  Out << "Run on (" << info.num_cpus << " X "
-      << (info.cycles_per_second / 1000000.0) << " MHz CPU "
-      << ((info.num_cpus > 1) ? "s" : "") << ")\n";
-  if (info.caches.size() != 0) {
-    Out << "CPU Caches:\n";
-    for (auto &CInfo : info.caches) {
-      Out << "  L" << CInfo.level << " " << CInfo.type << " "
-          << (CInfo.size / 1000) << "K";
-      if (CInfo.num_sharing != 0)
-        Out << " (x" << (info.num_cpus / CInfo.num_sharing) << ")";
-      Out << "\n";
-    }
-  }
-
-  if (info.scaling_enabled) {
-    Out << "***WARNING*** CPU scaling is enabled, the benchmark "
-           "real time measurements may be noisy and will incur extra "
-           "overhead.\n";
-  }
-
-#ifndef NDEBUG
-  Out << "***WARNING*** Library was built as DEBUG. Timings may be "
-         "affected.\n";
-#endif
-}
-
-// No initializer because it's already initialized to NULL.
-const char* BenchmarkReporter::Context::executable_name;
-
-BenchmarkReporter::Context::Context() : cpu_info(CPUInfo::Get()) {}
-
-double BenchmarkReporter::Run::GetAdjustedRealTime() const {
-  double new_time = real_accumulated_time * GetTimeUnitMultiplier(time_unit);
-  if (iterations != 0) new_time /= static_cast<double>(iterations);
-  return new_time;
-}
-
-double BenchmarkReporter::Run::GetAdjustedCPUTime() const {
-  double new_time = cpu_accumulated_time * GetTimeUnitMultiplier(time_unit);
-  if (iterations != 0) new_time /= static_cast<double>(iterations);
-  return new_time;
-}
-
-}  // end namespace benchmark
diff --git a/gnu/llvm/llvm/utils/benchmark/src/sleep.cc b/gnu/llvm/llvm/utils/benchmark/src/sleep.cc
deleted file mode 100644
index 1512ac90f7e..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/sleep.cc
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "sleep.h"
-
-#include <cerrno>
-#include <cstdlib>
-#include <ctime>
-
-#include "internal_macros.h"
-
-#ifdef BENCHMARK_OS_WINDOWS
-#include <windows.h>
-#endif
-
-namespace benchmark {
-#ifdef BENCHMARK_OS_WINDOWS
-// Window's Sleep takes milliseconds argument.
-void SleepForMilliseconds(int milliseconds) { Sleep(milliseconds); }
-void SleepForSeconds(double seconds) {
-  SleepForMilliseconds(static_cast<int>(kNumMillisPerSecond * seconds));
-}
-#else   // BENCHMARK_OS_WINDOWS
-void SleepForMicroseconds(int microseconds) {
-  struct timespec sleep_time;
-  sleep_time.tv_sec = microseconds / kNumMicrosPerSecond;
-  sleep_time.tv_nsec = (microseconds % kNumMicrosPerSecond) * kNumNanosPerMicro;
-  while (nanosleep(&sleep_time, &sleep_time) != 0 && errno == EINTR)
-    ;  // Ignore signals and wait for the full interval to elapse.
-}
-
-void SleepForMilliseconds(int milliseconds) {
-  SleepForMicroseconds(milliseconds * kNumMicrosPerMilli);
-}
-
-void SleepForSeconds(double seconds) {
-  SleepForMicroseconds(static_cast<int>(seconds * kNumMicrosPerSecond));
-}
-#endif  // BENCHMARK_OS_WINDOWS
-}  // end namespace benchmark
diff --git a/gnu/llvm/llvm/utils/benchmark/src/sleep.h b/gnu/llvm/llvm/utils/benchmark/src/sleep.h
deleted file mode 100644
index f98551afe28..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/sleep.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef BENCHMARK_SLEEP_H_
-#define BENCHMARK_SLEEP_H_
-
-namespace benchmark {
-const int kNumMillisPerSecond = 1000;
-const int kNumMicrosPerMilli = 1000;
-const int kNumMicrosPerSecond = kNumMillisPerSecond * 1000;
-const int kNumNanosPerMicro = 1000;
-const int kNumNanosPerSecond = kNumNanosPerMicro * kNumMicrosPerSecond;
-
-void SleepForMilliseconds(int milliseconds);
-void SleepForSeconds(double seconds);
-}  // end namespace benchmark
-
-#endif  // BENCHMARK_SLEEP_H_
diff --git a/gnu/llvm/llvm/utils/benchmark/src/statistics.cc b/gnu/llvm/llvm/utils/benchmark/src/statistics.cc
deleted file mode 100644
index 1c91e1015ab..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/statistics.cc
+++ /dev/null
@@ -1,178 +0,0 @@
-// Copyright 2016 Ismael Jimenez Martinez. All rights reserved.
-// Copyright 2017 Roman Lebedev. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "benchmark/benchmark.h"
-
-#include <algorithm>
-#include <cmath>
-#include <string>
-#include <vector>
-#include <numeric>
-#include "check.h"
-#include "statistics.h"
-
-namespace benchmark {
-
-auto StatisticsSum = [](const std::vector<double>& v) {
-  return std::accumulate(v.begin(), v.end(), 0.0);
-};
-
-double StatisticsMean(const std::vector<double>& v) {
-  if (v.empty()) return 0.0;
-  return StatisticsSum(v) * (1.0 / v.size());
-}
-
-double StatisticsMedian(const std::vector<double>& v) {
-  if (v.size() < 3) return StatisticsMean(v);
-  std::vector<double> copy(v);
-
-  auto center = copy.begin() + v.size() / 2;
-  std::nth_element(copy.begin(), center, copy.end());
-
-  // did we have an odd number of samples?
-  // if yes, then center is the median
-  // it no, then we are looking for the average between center and the value before
-  if(v.size() % 2 == 1)
-    return *center;
-  auto center2 = copy.begin() + v.size() / 2 - 1;
-  std::nth_element(copy.begin(), center2, copy.end());
-  return (*center + *center2) / 2.0;
-}
-
-// Return the sum of the squares of this sample set
-auto SumSquares = [](const std::vector<double>& v) {
-  return std::inner_product(v.begin(), v.end(), v.begin(), 0.0);
-};
-
-auto Sqr = [](const double dat) { return dat * dat; };
-auto Sqrt = [](const double dat) {
-  // Avoid NaN due to imprecision in the calculations
-  if (dat < 0.0) return 0.0;
-  return std::sqrt(dat);
-};
-
-double StatisticsStdDev(const std::vector<double>& v) {
-  const auto mean = StatisticsMean(v);
-  if (v.empty()) return mean;
-
-  // Sample standard deviation is undefined for n = 1
-  if (v.size() == 1)
-    return 0.0;
-
-  const double avg_squares = SumSquares(v) * (1.0 / v.size());
-  return Sqrt(v.size() / (v.size() - 1.0) * (avg_squares - Sqr(mean)));
-}
-
-std::vector<BenchmarkReporter::Run> ComputeStats(
-    const std::vector<BenchmarkReporter::Run>& reports) {
-  typedef BenchmarkReporter::Run Run;
-  std::vector<Run> results;
-
-  auto error_count =
-      std::count_if(reports.begin(), reports.end(),
-                    [](Run const& run) { return run.error_occurred; });
-
-  if (reports.size() - error_count < 2) {
-    // We don't report aggregated data if there was a single run.
-    return results;
-  }
-
-  // Accumulators.
-  std::vector<double> real_accumulated_time_stat;
-  std::vector<double> cpu_accumulated_time_stat;
-  std::vector<double> bytes_per_second_stat;
-  std::vector<double> items_per_second_stat;
-
-  real_accumulated_time_stat.reserve(reports.size());
-  cpu_accumulated_time_stat.reserve(reports.size());
-  bytes_per_second_stat.reserve(reports.size());
-  items_per_second_stat.reserve(reports.size());
-
-  // All repetitions should be run with the same number of iterations so we
-  // can take this information from the first benchmark.
-  int64_t const run_iterations = reports.front().iterations;
-  // create stats for user counters
-  struct CounterStat {
-    Counter c;
-    std::vector<double> s;
-  };
-  std::map< std::string, CounterStat > counter_stats;
-  for(Run const& r : reports) {
-    for(auto const& cnt : r.counters) {
-      auto it = counter_stats.find(cnt.first);
-      if(it == counter_stats.end()) {
-        counter_stats.insert({cnt.first, {cnt.second, std::vector<double>{}}});
-        it = counter_stats.find(cnt.first);
-        it->second.s.reserve(reports.size());
-      } else {
-        CHECK_EQ(counter_stats[cnt.first].c.flags, cnt.second.flags);
-      }
-    }
-  }
-
-  // Populate the accumulators.
-  for (Run const& run : reports) {
-    CHECK_EQ(reports[0].benchmark_name, run.benchmark_name);
-    CHECK_EQ(run_iterations, run.iterations);
-    if (run.error_occurred) continue;
-    real_accumulated_time_stat.emplace_back(run.real_accumulated_time);
-    cpu_accumulated_time_stat.emplace_back(run.cpu_accumulated_time);
-    items_per_second_stat.emplace_back(run.items_per_second);
-    bytes_per_second_stat.emplace_back(run.bytes_per_second);
-    // user counters
-    for(auto const& cnt : run.counters) {
-      auto it = counter_stats.find(cnt.first);
-      CHECK_NE(it, counter_stats.end());
-      it->second.s.emplace_back(cnt.second);
-    }
-  }
-
-  // Only add label if it is same for all runs
-  std::string report_label = reports[0].report_label;
-  for (std::size_t i = 1; i < reports.size(); i++) {
-    if (reports[i].report_label != report_label) {
-      report_label = "";
-      break;
-    }
-  }
-
-  for(const auto& Stat : *reports[0].statistics) {
-    // Get the data from the accumulator to BenchmarkReporter::Run's.
-    Run data;
-    data.benchmark_name = reports[0].benchmark_name + "_" + Stat.name_;
-    data.report_label = report_label;
-    data.iterations = run_iterations;
-
-    data.real_accumulated_time = Stat.compute_(real_accumulated_time_stat);
-    data.cpu_accumulated_time = Stat.compute_(cpu_accumulated_time_stat);
-    data.bytes_per_second = Stat.compute_(bytes_per_second_stat);
-    data.items_per_second = Stat.compute_(items_per_second_stat);
-
-    data.time_unit = reports[0].time_unit;
-
-    // user counters
-    for(auto const& kv : counter_stats) {
-      const auto uc_stat = Stat.compute_(kv.second.s);
-      auto c = Counter(uc_stat, counter_stats[kv.first].c.flags);
-      data.counters[kv.first] = c;
-    }
-
-    results.push_back(data);
-  }
-
-  return results;
-}
-
-}  // end namespace benchmark
diff --git a/gnu/llvm/llvm/utils/benchmark/src/statistics.h b/gnu/llvm/llvm/utils/benchmark/src/statistics.h
deleted file mode 100644
index 7eccc85536a..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/statistics.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2016 Ismael Jimenez Martinez. All rights reserved.
-// Copyright 2017 Roman Lebedev. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef STATISTICS_H_
-#define STATISTICS_H_
-
-#include <vector>
-
-#include "benchmark/benchmark.h"
-
-namespace benchmark {
-
-// Return a vector containing the mean, median and standard devation information
-// (and any user-specified info) for the specified list of reports. If 'reports'
-// contains less than two non-errored runs an empty vector is returned
-std::vector<BenchmarkReporter::Run> ComputeStats(
-    const std::vector<BenchmarkReporter::Run>& reports);
-
-double StatisticsMean(const std::vector<double>& v);
-double StatisticsMedian(const std::vector<double>& v);
-double StatisticsStdDev(const std::vector<double>& v);
-
-}  // end namespace benchmark
-
-#endif  // STATISTICS_H_
diff --git a/gnu/llvm/llvm/utils/benchmark/src/string_util.cc b/gnu/llvm/llvm/utils/benchmark/src/string_util.cc
deleted file mode 100644
index ebc3acebd2a..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/string_util.cc
+++ /dev/null
@@ -1,172 +0,0 @@
-#include "string_util.h"
-
-#include <array>
-#include <cmath>
-#include <cstdarg>
-#include <cstdio>
-#include <memory>
-#include <sstream>
-
-#include "arraysize.h"
-
-namespace benchmark {
-namespace {
-
-// kilo, Mega, Giga, Tera, Peta, Exa, Zetta, Yotta.
-const char kBigSIUnits[] = "kMGTPEZY";
-// Kibi, Mebi, Gibi, Tebi, Pebi, Exbi, Zebi, Yobi.
-const char kBigIECUnits[] = "KMGTPEZY";
-// milli, micro, nano, pico, femto, atto, zepto, yocto.
-const char kSmallSIUnits[] = "munpfazy";
-
-// We require that all three arrays have the same size.
-static_assert(arraysize(kBigSIUnits) == arraysize(kBigIECUnits),
-              "SI and IEC unit arrays must be the same size");
-static_assert(arraysize(kSmallSIUnits) == arraysize(kBigSIUnits),
-              "Small SI and Big SI unit arrays must be the same size");
-
-static const int64_t kUnitsSize = arraysize(kBigSIUnits);
-
-void ToExponentAndMantissa(double val, double thresh, int precision,
-                           double one_k, std::string* mantissa,
-                           int64_t* exponent) {
-  std::stringstream mantissa_stream;
-
-  if (val < 0) {
-    mantissa_stream << "-";
-    val = -val;
-  }
-
-  // Adjust threshold so that it never excludes things which can't be rendered
-  // in 'precision' digits.
-  const double adjusted_threshold =
-      std::max(thresh, 1.0 / std::pow(10.0, precision));
-  const double big_threshold = adjusted_threshold * one_k;
-  const double small_threshold = adjusted_threshold;
-  // Values in ]simple_threshold,small_threshold[ will be printed as-is
-  const double simple_threshold = 0.01;
-
-  if (val > big_threshold) {
-    // Positive powers
-    double scaled = val;
-    for (size_t i = 0; i < arraysize(kBigSIUnits); ++i) {
-      scaled /= one_k;
-      if (scaled <= big_threshold) {
-        mantissa_stream << scaled;
-        *exponent = i + 1;
-        *mantissa = mantissa_stream.str();
-        return;
-      }
-    }
-    mantissa_stream << val;
-    *exponent = 0;
-  } else if (val < small_threshold) {
-    // Negative powers
-    if (val < simple_threshold) {
-      double scaled = val;
-      for (size_t i = 0; i < arraysize(kSmallSIUnits); ++i) {
-        scaled *= one_k;
-        if (scaled >= small_threshold) {
-          mantissa_stream << scaled;
-          *exponent = -static_cast<int64_t>(i + 1);
-          *mantissa = mantissa_stream.str();
-          return;
-        }
-      }
-    }
-    mantissa_stream << val;
-    *exponent = 0;
-  } else {
-    mantissa_stream << val;
-    *exponent = 0;
-  }
-  *mantissa = mantissa_stream.str();
-}
-
-std::string ExponentToPrefix(int64_t exponent, bool iec) {
-  if (exponent == 0) return "";
-
-  const int64_t index = (exponent > 0 ? exponent - 1 : -exponent - 1);
-  if (index >= kUnitsSize) return "";
-
-  const char* array =
-      (exponent > 0 ? (iec ? kBigIECUnits : kBigSIUnits) : kSmallSIUnits);
-  if (iec)
-    return array[index] + std::string("i");
-  else
-    return std::string(1, array[index]);
-}
-
-std::string ToBinaryStringFullySpecified(double value, double threshold,
-                                         int precision, double one_k = 1024.0) {
-  std::string mantissa;
-  int64_t exponent;
-  ToExponentAndMantissa(value, threshold, precision, one_k, &mantissa,
-                        &exponent);
-  return mantissa + ExponentToPrefix(exponent, false);
-}
-
-}  // end namespace
-
-void AppendHumanReadable(int n, std::string* str) {
-  std::stringstream ss;
-  // Round down to the nearest SI prefix.
-  ss << ToBinaryStringFullySpecified(n, 1.0, 0);
-  *str += ss.str();
-}
-
-std::string HumanReadableNumber(double n, double one_k) {
-  // 1.1 means that figures up to 1.1k should be shown with the next unit down;
-  // this softens edge effects.
-  // 1 means that we should show one decimal place of precision.
-  return ToBinaryStringFullySpecified(n, 1.1, 1, one_k);
-}
-
-std::string StrFormatImp(const char* msg, va_list args) {
-  // we might need a second shot at this, so pre-emptivly make a copy
-  va_list args_cp;
-  va_copy(args_cp, args);
-
-  // TODO(ericwf): use std::array for first attempt to avoid one memory
-  // allocation guess what the size might be
-  std::array<char, 256> local_buff;
-  std::size_t size = local_buff.size();
-  // 2015-10-08: vsnprintf is used instead of snd::vsnprintf due to a limitation
-  // in the android-ndk
-  auto ret = vsnprintf(local_buff.data(), size, msg, args_cp);
-
-  va_end(args_cp);
-
-  // handle empty expansion
-  if (ret == 0) return std::string{};
-  if (static_cast<std::size_t>(ret) < size)
-    return std::string(local_buff.data());
-
-  // we did not provide a long enough buffer on our first attempt.
-  // add 1 to size to account for null-byte in size cast to prevent overflow
-  size = static_cast<std::size_t>(ret) + 1;
-  auto buff_ptr = std::unique_ptr<char[]>(new char[size]);
-  // 2015-10-08: vsnprintf is used instead of snd::vsnprintf due to a limitation
-  // in the android-ndk
-  ret = vsnprintf(buff_ptr.get(), size, msg, args);
-  return std::string(buff_ptr.get());
-}
-
-std::string StrFormat(const char* format, ...) {
-  va_list args;
-  va_start(args, format);
-  std::string tmp = StrFormatImp(format, args);
-  va_end(args);
-  return tmp;
-}
-
-void ReplaceAll(std::string* str, const std::string& from,
-                const std::string& to) {
-  std::size_t start = 0;
-  while ((start = str->find(from, start)) != std::string::npos) {
-    str->replace(start, from.length(), to);
-    start += to.length();
-  }
-}
-
-}  // end namespace benchmark
diff --git a/gnu/llvm/llvm/utils/benchmark/src/string_util.h b/gnu/llvm/llvm/utils/benchmark/src/string_util.h
deleted file mode 100644
index e70e7698724..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/string_util.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef BENCHMARK_STRING_UTIL_H_
-#define BENCHMARK_STRING_UTIL_H_
-
-#include <sstream>
-#include <string>
-#include <utility>
-#include "internal_macros.h"
-
-namespace benchmark {
-
-void AppendHumanReadable(int n, std::string* str);
-
-std::string HumanReadableNumber(double n, double one_k = 1024.0);
-
-std::string StrFormat(const char* format, ...);
-
-inline std::ostream& StrCatImp(std::ostream& out) BENCHMARK_NOEXCEPT {
-  return out;
-}
-
-template <class First, class... Rest>
-inline std::ostream& StrCatImp(std::ostream& out, First&& f,
-                                  Rest&&... rest) {
-  out << std::forward<First>(f);
-  return StrCatImp(out, std::forward<Rest>(rest)...);
-}
-
-template <class... Args>
-inline std::string StrCat(Args&&... args) {
-  std::ostringstream ss;
-  StrCatImp(ss, std::forward<Args>(args)...);
-  return ss.str();
-}
-
-void ReplaceAll(std::string* str, const std::string& from,
-                const std::string& to);
-
-}  // end namespace benchmark
-
-#endif  // BENCHMARK_STRING_UTIL_H_
diff --git a/gnu/llvm/llvm/utils/benchmark/src/sysinfo.cc b/gnu/llvm/llvm/utils/benchmark/src/sysinfo.cc
deleted file mode 100644
index 01dd8a0317b..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/sysinfo.cc
+++ /dev/null
@@ -1,585 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "internal_macros.h"
-
-#ifdef BENCHMARK_OS_WINDOWS
-#include <shlwapi.h>
-#undef StrCat  // Don't let StrCat in string_util.h be renamed to lstrcatA
-#include <versionhelpers.h>
-#include <windows.h>
-#else
-#include <fcntl.h>
-#ifndef BENCHMARK_OS_FUCHSIA
-#include <sys/resource.h>
-#endif
-#include <sys/time.h>
-#include <sys/types.h>  // this header must be included before 'sys/sysctl.h' to avoid compilation error on FreeBSD
-#include <unistd.h>
-#if defined BENCHMARK_OS_FREEBSD || defined BENCHMARK_OS_MACOSX || \
-    defined BENCHMARK_OS_NETBSD || defined BENCHMARK_OS_OPENBSD
-#define BENCHMARK_HAS_SYSCTL
-#include <sys/sysctl.h>
-#endif
-#endif
-#if defined(BENCHMARK_OS_SOLARIS)
-#include <kstat.h>
-#endif
-
-#include <algorithm>
-#include <array>
-#include <bitset>
-#include <cerrno>
-#include <climits>
-#include <cstdint>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <fstream>
-#include <iostream>
-#include <iterator>
-#include <limits>
-#include <memory>
-#include <sstream>
-
-#include "check.h"
-#include "cycleclock.h"
-#include "internal_macros.h"
-#include "log.h"
-#include "sleep.h"
-#include "string_util.h"
-
-namespace benchmark {
-namespace {
-
-void PrintImp(std::ostream& out) { out << std::endl; }
-
-template <class First, class... Rest>
-void PrintImp(std::ostream& out, First&& f, Rest&&... rest) {
-  out << std::forward<First>(f);
-  PrintImp(out, std::forward<Rest>(rest)...);
-}
-
-template <class... Args>
-BENCHMARK_NORETURN void PrintErrorAndDie(Args&&... args) {
-  PrintImp(std::cerr, std::forward<Args>(args)...);
-  std::exit(EXIT_FAILURE);
-}
-
-#ifdef BENCHMARK_HAS_SYSCTL
-
-/// ValueUnion - A type used to correctly alias the byte-for-byte output of
-/// `sysctl` with the result type it's to be interpreted as.
-struct ValueUnion {
-  union DataT {
-    uint32_t uint32_value;
-    uint64_t uint64_value;
-    // For correct aliasing of union members from bytes.
-    char bytes[8];
-  };
-  using DataPtr = std::unique_ptr<DataT, decltype(&std::free)>;
-
-  // The size of the data union member + its trailing array size.
-  size_t Size;
-  DataPtr Buff;
-
- public:
-  ValueUnion() : Size(0), Buff(nullptr, &std::free) {}
-
-  explicit ValueUnion(size_t BuffSize)
-      : Size(sizeof(DataT) + BuffSize),
-        Buff(::new (std::malloc(Size)) DataT(), &std::free) {}
-
-  ValueUnion(ValueUnion&& other) = default;
-
-  explicit operator bool() const { return bool(Buff); }
-
-  char* data() const { return Buff->bytes; }
-
-  std::string GetAsString() const { return std::string(data()); }
-
-  int64_t GetAsInteger() const {
-    if (Size == sizeof(Buff->uint32_value))
-      return static_cast<int32_t>(Buff->uint32_value);
-    else if (Size == sizeof(Buff->uint64_value))
-      return static_cast<int64_t>(Buff->uint64_value);
-    BENCHMARK_UNREACHABLE();
-  }
-
-  uint64_t GetAsUnsigned() const {
-    if (Size == sizeof(Buff->uint32_value))
-      return Buff->uint32_value;
-    else if (Size == sizeof(Buff->uint64_value))
-      return Buff->uint64_value;
-    BENCHMARK_UNREACHABLE();
-  }
-
-  template <class T, int N>
-  std::array<T, N> GetAsArray() {
-    const int ArrSize = sizeof(T) * N;
-    CHECK_LE(ArrSize, Size);
-    std::array<T, N> Arr;
-    std::memcpy(Arr.data(), data(), ArrSize);
-    return Arr;
-  }
-};
-
-ValueUnion GetSysctlImp(std::string const& Name) {
-#if defined BENCHMARK_OS_OPENBSD
-  int mib[2];
-
-  mib[0] = CTL_HW;
-  if ((Name == "hw.ncpu") || (Name == "hw.cpuspeed")){
-    ValueUnion buff(sizeof(int));
-
-    if (Name == "hw.ncpu") {
-      mib[1] = HW_NCPU;
-    } else {
-      mib[1] = HW_CPUSPEED;
-    }
-
-    if (sysctl(mib, 2, buff.data(), &buff.Size, nullptr, 0) == -1) {
-      return ValueUnion();
-    }
-    return buff;
-  }
-  return ValueUnion();
-#else
-  size_t CurBuffSize = 0;
-  if (sysctlbyname(Name.c_str(), nullptr, &CurBuffSize, nullptr, 0) == -1)
-    return ValueUnion();
-
-  ValueUnion buff(CurBuffSize);
-  if (sysctlbyname(Name.c_str(), buff.data(), &buff.Size, nullptr, 0) == 0)
-    return buff;
-  return ValueUnion();
-#endif
-}
-
-BENCHMARK_MAYBE_UNUSED
-bool GetSysctl(std::string const& Name, std::string* Out) {
-  Out->clear();
-  auto Buff = GetSysctlImp(Name);
-  if (!Buff) return false;
-  Out->assign(Buff.data());
-  return true;
-}
-
-template <class Tp,
-          class = typename std::enable_if<std::is_integral<Tp>::value>::type>
-bool GetSysctl(std::string const& Name, Tp* Out) {
-  *Out = 0;
-  auto Buff = GetSysctlImp(Name);
-  if (!Buff) return false;
-  *Out = static_cast<Tp>(Buff.GetAsUnsigned());
-  return true;
-}
-
-template <class Tp, size_t N>
-bool GetSysctl(std::string const& Name, std::array<Tp, N>* Out) {
-  auto Buff = GetSysctlImp(Name);
-  if (!Buff) return false;
-  *Out = Buff.GetAsArray<Tp, N>();
-  return true;
-}
-#endif
-
-template <class ArgT>
-bool ReadFromFile(std::string const& fname, ArgT* arg) {
-  *arg = ArgT();
-  std::ifstream f(fname.c_str());
-  if (!f.is_open()) return false;
-  f >> *arg;
-  return f.good();
-}
-
-bool CpuScalingEnabled(int num_cpus) {
-  // We don't have a valid CPU count, so don't even bother.
-  if (num_cpus <= 0) return false;
-#ifndef BENCHMARK_OS_WINDOWS
-  // On Linux, the CPUfreq subsystem exposes CPU information as files on the
-  // local file system. If reading the exported files fails, then we may not be
-  // running on Linux, so we silently ignore all the read errors.
-  std::string res;
-  for (int cpu = 0; cpu < num_cpus; ++cpu) {
-    std::string governor_file =
-        StrCat("/sys/devices/system/cpu/cpu", cpu, "/cpufreq/scaling_governor");
-    if (ReadFromFile(governor_file, &res) && res != "performance") return true;
-  }
-#endif
-  return false;
-}
-
-int CountSetBitsInCPUMap(std::string Val) {
-  auto CountBits = [](std::string Part) {
-    using CPUMask = std::bitset<sizeof(std::uintptr_t) * CHAR_BIT>;
-    Part = "0x" + Part;
-    CPUMask Mask(std::stoul(Part, nullptr, 16));
-    return static_cast<int>(Mask.count());
-  };
-  size_t Pos;
-  int total = 0;
-  while ((Pos = Val.find(',')) != std::string::npos) {
-    total += CountBits(Val.substr(0, Pos));
-    Val = Val.substr(Pos + 1);
-  }
-  if (!Val.empty()) {
-    total += CountBits(Val);
-  }
-  return total;
-}
-
-BENCHMARK_MAYBE_UNUSED
-std::vector<CPUInfo::CacheInfo> GetCacheSizesFromKVFS() {
-  std::vector<CPUInfo::CacheInfo> res;
-  std::string dir = "/sys/devices/system/cpu/cpu0/cache/";
-  int Idx = 0;
-  while (true) {
-    CPUInfo::CacheInfo info;
-    std::string FPath = StrCat(dir, "index", Idx++, "/");
-    std::ifstream f(StrCat(FPath, "size").c_str());
-    if (!f.is_open()) break;
-    std::string suffix;
-    f >> info.size;
-    if (f.fail())
-      PrintErrorAndDie("Failed while reading file '", FPath, "size'");
-    if (f.good()) {
-      f >> suffix;
-      if (f.bad())
-        PrintErrorAndDie(
-            "Invalid cache size format: failed to read size suffix");
-      else if (f && suffix != "K")
-        PrintErrorAndDie("Invalid cache size format: Expected bytes ", suffix);
-      else if (suffix == "K")
-        info.size *= 1000;
-    }
-    if (!ReadFromFile(StrCat(FPath, "type"), &info.type))
-      PrintErrorAndDie("Failed to read from file ", FPath, "type");
-    if (!ReadFromFile(StrCat(FPath, "level"), &info.level))
-      PrintErrorAndDie("Failed to read from file ", FPath, "level");
-    std::string map_str;
-    if (!ReadFromFile(StrCat(FPath, "shared_cpu_map"), &map_str))
-      PrintErrorAndDie("Failed to read from file ", FPath, "shared_cpu_map");
-    info.num_sharing = CountSetBitsInCPUMap(map_str);
-    res.push_back(info);
-  }
-
-  return res;
-}
-
-#ifdef BENCHMARK_OS_MACOSX
-std::vector<CPUInfo::CacheInfo> GetCacheSizesMacOSX() {
-  std::vector<CPUInfo::CacheInfo> res;
-  std::array<uint64_t, 4> CacheCounts{{0, 0, 0, 0}};
-  GetSysctl("hw.cacheconfig", &CacheCounts);
-
-  struct {
-    std::string name;
-    std::string type;
-    int level;
-    uint64_t num_sharing;
-  } Cases[] = {{"hw.l1dcachesize", "Data", 1, CacheCounts[1]},
-               {"hw.l1icachesize", "Instruction", 1, CacheCounts[1]},
-               {"hw.l2cachesize", "Unified", 2, CacheCounts[2]},
-               {"hw.l3cachesize", "Unified", 3, CacheCounts[3]}};
-  for (auto& C : Cases) {
-    int val;
-    if (!GetSysctl(C.name, &val)) continue;
-    CPUInfo::CacheInfo info;
-    info.type = C.type;
-    info.level = C.level;
-    info.size = val;
-    info.num_sharing = static_cast<int>(C.num_sharing);
-    res.push_back(std::move(info));
-  }
-  return res;
-}
-#elif defined(BENCHMARK_OS_WINDOWS)
-std::vector<CPUInfo::CacheInfo> GetCacheSizesWindows() {
-  std::vector<CPUInfo::CacheInfo> res;
-  DWORD buffer_size = 0;
-  using PInfo = SYSTEM_LOGICAL_PROCESSOR_INFORMATION;
-  using CInfo = CACHE_DESCRIPTOR;
-
-  using UPtr = std::unique_ptr<PInfo, decltype(&std::free)>;
-  GetLogicalProcessorInformation(nullptr, &buffer_size);
-  UPtr buff((PInfo*)malloc(buffer_size), &std::free);
-  if (!GetLogicalProcessorInformation(buff.get(), &buffer_size))
-    PrintErrorAndDie("Failed during call to GetLogicalProcessorInformation: ",
-                     GetLastError());
-
-  PInfo* it = buff.get();
-  PInfo* end = buff.get() + (buffer_size / sizeof(PInfo));
-
-  for (; it != end; ++it) {
-    if (it->Relationship != RelationCache) continue;
-    using BitSet = std::bitset<sizeof(ULONG_PTR) * CHAR_BIT>;
-    BitSet B(it->ProcessorMask);
-    // To prevent duplicates, only consider caches where CPU 0 is specified
-    if (!B.test(0)) continue;
-    CInfo* Cache = &it->Cache;
-    CPUInfo::CacheInfo C;
-    C.num_sharing = static_cast<int>(B.count());
-    C.level = Cache->Level;
-    C.size = Cache->Size;
-    C.type = "Unknown";
-    switch (Cache->Type) {
-      case CacheUnified:
-        C.type = "Unified";
-        break;
-      case CacheInstruction:
-        C.type = "Instruction";
-        break;
-      case CacheData:
-        C.type = "Data";
-        break;
-      case CacheTrace:
-        C.type = "Trace";
-        break;
-    }
-    res.push_back(C);
-  }
-  return res;
-}
-#endif
-
-std::vector<CPUInfo::CacheInfo> GetCacheSizes() {
-#ifdef BENCHMARK_OS_MACOSX
-  return GetCacheSizesMacOSX();
-#elif defined(BENCHMARK_OS_WINDOWS)
-  return GetCacheSizesWindows();
-#else
-  return GetCacheSizesFromKVFS();
-#endif
-}
-
-int GetNumCPUs() {
-#ifdef BENCHMARK_HAS_SYSCTL
-  int NumCPU = -1;
-  if (GetSysctl("hw.ncpu", &NumCPU)) return NumCPU;
-  fprintf(stderr, "Err: %s\n", strerror(errno));
-  std::exit(EXIT_FAILURE);
-#elif defined(BENCHMARK_OS_WINDOWS)
-  SYSTEM_INFO sysinfo;
-  // Use memset as opposed to = {} to avoid GCC missing initializer false
-  // positives.
-  std::memset(&sysinfo, 0, sizeof(SYSTEM_INFO));
-  GetSystemInfo(&sysinfo);
-  return sysinfo.dwNumberOfProcessors;  // number of logical
-                                        // processors in the current
-                                        // group
-#elif defined(BENCHMARK_OS_SOLARIS)
-  // Returns -1 in case of a failure.
-  int NumCPU = sysconf(_SC_NPROCESSORS_ONLN);
-  if (NumCPU < 0) {
-    fprintf(stderr,
-            "sysconf(_SC_NPROCESSORS_ONLN) failed with error: %s\n",
-            strerror(errno));
-  }
-  return NumCPU;
-#else
-  int NumCPUs = 0;
-  int MaxID = -1;
-  std::ifstream f("/proc/cpuinfo");
-  if (!f.is_open()) {
-    std::cerr << "failed to open /proc/cpuinfo\n";
-    return -1;
-  }
-  const std::string Key = "processor";
-  std::string ln;
-  while (std::getline(f, ln)) {
-    if (ln.empty()) continue;
-    size_t SplitIdx = ln.find(':');
-    std::string value;
-    if (SplitIdx != std::string::npos) value = ln.substr(SplitIdx + 1);
-    if (ln.size() >= Key.size() && ln.compare(0, Key.size(), Key) == 0) {
-      NumCPUs++;
-      if (!value.empty()) {
-        int CurID = std::stoi(value);
-        MaxID = std::max(CurID, MaxID);
-      }
-    }
-  }
-  if (f.bad()) {
-    std::cerr << "Failure reading /proc/cpuinfo\n";
-    return -1;
-  }
-  if (!f.eof()) {
-    std::cerr << "Failed to read to end of /proc/cpuinfo\n";
-    return -1;
-  }
-  f.close();
-
-  if ((MaxID + 1) != NumCPUs) {
-    fprintf(stderr,
-            "CPU ID assignments in /proc/cpuinfo seem messed up."
-            " This is usually caused by a bad BIOS.\n");
-  }
-  return NumCPUs;
-#endif
-  BENCHMARK_UNREACHABLE();
-}
-
-double GetCPUCyclesPerSecond() {
-#if defined BENCHMARK_OS_LINUX || defined BENCHMARK_OS_CYGWIN
-  long freq;
-
-  // If the kernel is exporting the tsc frequency use that. There are issues
-  // where cpuinfo_max_freq cannot be relied on because the BIOS may be
-  // exporintg an invalid p-state (on x86) or p-states may be used to put the
-  // processor in a new mode (turbo mode). Essentially, those frequencies
-  // cannot always be relied upon. The same reasons apply to /proc/cpuinfo as
-  // well.
-  if (ReadFromFile("/sys/devices/system/cpu/cpu0/tsc_freq_khz", &freq)
-      // If CPU scaling is in effect, we want to use the *maximum* frequency,
-      // not whatever CPU speed some random processor happens to be using now.
-      || ReadFromFile("/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq",
-                      &freq)) {
-    // The value is in kHz (as the file name suggests).  For example, on a
-    // 2GHz warpstation, the file contains the value "2000000".
-    return freq * 1000.0;
-  }
-
-  const double error_value = -1;
-  double bogo_clock = error_value;
-
-  std::ifstream f("/proc/cpuinfo");
-  if (!f.is_open()) {
-    std::cerr << "failed to open /proc/cpuinfo\n";
-    return error_value;
-  }
-
-  auto startsWithKey = [](std::string const& Value, std::string const& Key) {
-    if (Key.size() > Value.size()) return false;
-    auto Cmp = [&](char X, char Y) {
-      return std::tolower(X) == std::tolower(Y);
-    };
-    return std::equal(Key.begin(), Key.end(), Value.begin(), Cmp);
-  };
-
-  std::string ln;
-  while (std::getline(f, ln)) {
-    if (ln.empty()) continue;
-    size_t SplitIdx = ln.find(':');
-    std::string value;
-    if (SplitIdx != std::string::npos) value = ln.substr(SplitIdx + 1);
-    // When parsing the "cpu MHz" and "bogomips" (fallback) entries, we only
-    // accept positive values. Some environments (virtual machines) report zero,
-    // which would cause infinite looping in WallTime_Init.
-    if (startsWithKey(ln, "cpu MHz")) {
-      if (!value.empty()) {
-        double cycles_per_second = std::stod(value) * 1000000.0;
-        if (cycles_per_second > 0) return cycles_per_second;
-      }
-    } else if (startsWithKey(ln, "bogomips")) {
-      if (!value.empty()) {
-        bogo_clock = std::stod(value) * 1000000.0;
-        if (bogo_clock < 0.0) bogo_clock = error_value;
-      }
-    }
-  }
-  if (f.bad()) {
-    std::cerr << "Failure reading /proc/cpuinfo\n";
-    return error_value;
-  }
-  if (!f.eof()) {
-    std::cerr << "Failed to read to end of /proc/cpuinfo\n";
-    return error_value;
-  }
-  f.close();
-  // If we found the bogomips clock, but nothing better, we'll use it (but
-  // we're not happy about it); otherwise, fallback to the rough estimation
-  // below.
-  if (bogo_clock >= 0.0) return bogo_clock;
-
-#elif defined BENCHMARK_HAS_SYSCTL
-  constexpr auto* FreqStr =
-#if defined(BENCHMARK_OS_FREEBSD) || defined(BENCHMARK_OS_NETBSD)
-      "machdep.tsc_freq";
-#elif defined BENCHMARK_OS_OPENBSD
-      "hw.cpuspeed";
-#else
-      "hw.cpufrequency";
-#endif
-  unsigned long long hz = 0;
-#if defined BENCHMARK_OS_OPENBSD
-  if (GetSysctl(FreqStr, &hz)) return hz * 1000000;
-#else
-  if (GetSysctl(FreqStr, &hz)) return hz;
-#endif
-  fprintf(stderr, "Unable to determine clock rate from sysctl: %s: %s\n",
-          FreqStr, strerror(errno));
-
-#elif defined BENCHMARK_OS_WINDOWS
-  // In NT, read MHz from the registry. If we fail to do so or we're in win9x
-  // then make a crude estimate.
-  DWORD data, data_size = sizeof(data);
-  if (IsWindowsXPOrGreater() &&
-      SUCCEEDED(
-          SHGetValueA(HKEY_LOCAL_MACHINE,
-                      "HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0",
-                      "~MHz", nullptr, &data, &data_size)))
-    return static_cast<double>((int64_t)data *
-                               (int64_t)(1000 * 1000));  // was mhz
-#elif defined (BENCHMARK_OS_SOLARIS)
-  kstat_ctl_t *kc = kstat_open();
-  if (!kc) {
-    std::cerr << "failed to open /dev/kstat\n";
-    return -1;
-  }
-  kstat_t *ksp = kstat_lookup(kc, (char*)"cpu_info", -1, (char*)"cpu_info0");
-  if (!ksp) {
-    std::cerr << "failed to lookup in /dev/kstat\n";
-    return -1;
-  }
-  if (kstat_read(kc, ksp, NULL) < 0) {
-    std::cerr << "failed to read from /dev/kstat\n";
-    return -1;
-  }
-  kstat_named_t *knp =
-      (kstat_named_t*)kstat_data_lookup(ksp, (char*)"current_clock_Hz");
-  if (!knp) {
-    std::cerr << "failed to lookup data in /dev/kstat\n";
-    return -1;
-  }
-  if (knp->data_type != KSTAT_DATA_UINT64) {
-    std::cerr << "current_clock_Hz is of unexpected data type: "
-              << knp->data_type << "\n";
-    return -1;
-  }
-  double clock_hz = knp->value.ui64;
-  kstat_close(kc);
-  return clock_hz;
-#endif
-  // If we've fallen through, attempt to roughly estimate the CPU clock rate.
-  const int estimate_time_ms = 1000;
-  const auto start_ticks = cycleclock::Now();
-  SleepForMilliseconds(estimate_time_ms);
-  return static_cast<double>(cycleclock::Now() - start_ticks);
-}
-
-}  // end namespace
-
-const CPUInfo& CPUInfo::Get() {
-  static const CPUInfo* info = new CPUInfo();
-  return *info;
-}
-
-CPUInfo::CPUInfo()
-    : num_cpus(GetNumCPUs()),
-      cycles_per_second(GetCPUCyclesPerSecond()),
-      caches(GetCacheSizes()),
-      scaling_enabled(CpuScalingEnabled(num_cpus)) {}
-
-}  // end namespace benchmark
diff --git a/gnu/llvm/llvm/utils/benchmark/src/thread_manager.h b/gnu/llvm/llvm/utils/benchmark/src/thread_manager.h
deleted file mode 100644
index 82b4d72b62f..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/thread_manager.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef BENCHMARK_THREAD_MANAGER_H
-#define BENCHMARK_THREAD_MANAGER_H
-
-#include <atomic>
-
-#include "benchmark/benchmark.h"
-#include "mutex.h"
-
-namespace benchmark {
-namespace internal {
-
-class ThreadManager {
- public:
-  ThreadManager(int num_threads)
-      : alive_threads_(num_threads), start_stop_barrier_(num_threads) {}
-
-  Mutex& GetBenchmarkMutex() const RETURN_CAPABILITY(benchmark_mutex_) {
-    return benchmark_mutex_;
-  }
-
-  bool StartStopBarrier() EXCLUDES(end_cond_mutex_) {
-    return start_stop_barrier_.wait();
-  }
-
-  void NotifyThreadComplete() EXCLUDES(end_cond_mutex_) {
-    start_stop_barrier_.removeThread();
-    if (--alive_threads_ == 0) {
-      MutexLock lock(end_cond_mutex_);
-      end_condition_.notify_all();
-    }
-  }
-
-  void WaitForAllThreads() EXCLUDES(end_cond_mutex_) {
-    MutexLock lock(end_cond_mutex_);
-    end_condition_.wait(lock.native_handle(),
-                        [this]() { return alive_threads_ == 0; });
-  }
-
- public:
-  struct Result {
-    int64_t iterations = 0;
-    double real_time_used = 0;
-    double cpu_time_used = 0;
-    double manual_time_used = 0;
-    int64_t bytes_processed = 0;
-    int64_t items_processed = 0;
-    int64_t complexity_n = 0;
-    std::string report_label_;
-    std::string error_message_;
-    bool has_error_ = false;
-    UserCounters counters;
-  };
-  GUARDED_BY(GetBenchmarkMutex()) Result results;
-
- private:
-  mutable Mutex benchmark_mutex_;
-  std::atomic<int> alive_threads_;
-  Barrier start_stop_barrier_;
-  Mutex end_cond_mutex_;
-  Condition end_condition_;
-};
-
-}  // namespace internal
-}  // namespace benchmark
-
-#endif  // BENCHMARK_THREAD_MANAGER_H
diff --git a/gnu/llvm/llvm/utils/benchmark/src/thread_timer.h b/gnu/llvm/llvm/utils/benchmark/src/thread_timer.h
deleted file mode 100644
index eaf108e017d..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/thread_timer.h
+++ /dev/null
@@ -1,69 +0,0 @@
-#ifndef BENCHMARK_THREAD_TIMER_H
-#define BENCHMARK_THREAD_TIMER_H
-
-#include "check.h"
-#include "timers.h"
-
-namespace benchmark {
-namespace internal {
-
-class ThreadTimer {
- public:
-  ThreadTimer() = default;
-
-  // Called by each thread
-  void StartTimer() {
-    running_ = true;
-    start_real_time_ = ChronoClockNow();
-    start_cpu_time_ = ThreadCPUUsage();
-  }
-
-  // Called by each thread
-  void StopTimer() {
-    CHECK(running_);
-    running_ = false;
-    real_time_used_ += ChronoClockNow() - start_real_time_;
-    // Floating point error can result in the subtraction producing a negative
-    // time. Guard against that.
-    cpu_time_used_ += std::max<double>(ThreadCPUUsage() - start_cpu_time_, 0);
-  }
-
-  // Called by each thread
-  void SetIterationTime(double seconds) { manual_time_used_ += seconds; }
-
-  bool running() const { return running_; }
-
-  // REQUIRES: timer is not running
-  double real_time_used() {
-    CHECK(!running_);
-    return real_time_used_;
-  }
-
-  // REQUIRES: timer is not running
-  double cpu_time_used() {
-    CHECK(!running_);
-    return cpu_time_used_;
-  }
-
-  // REQUIRES: timer is not running
-  double manual_time_used() {
-    CHECK(!running_);
-    return manual_time_used_;
-  }
-
- private:
-  bool running_ = false;        // Is the timer running
-  double start_real_time_ = 0;  // If running_
-  double start_cpu_time_ = 0;   // If running_
-
-  // Accumulated time so far (does not contain current slice if running_)
-  double real_time_used_ = 0;
-  double cpu_time_used_ = 0;
-  // Manually set iteration time. User sets this with SetIterationTime(seconds).
-  double manual_time_used_ = 0;
-};
-
-}  // namespace internal
-}  // namespace benchmark
-
-#endif  // BENCHMARK_THREAD_TIMER_H
diff --git a/gnu/llvm/llvm/utils/benchmark/src/timers.cc b/gnu/llvm/llvm/utils/benchmark/src/timers.cc
deleted file mode 100644
index 7613ff92c6e..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/timers.cc
+++ /dev/null
@@ -1,217 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "timers.h"
-#include "internal_macros.h"
-
-#ifdef BENCHMARK_OS_WINDOWS
-#include <shlwapi.h>
-#undef StrCat  // Don't let StrCat in string_util.h be renamed to lstrcatA
-#include <versionhelpers.h>
-#include <windows.h>
-#else
-#include <fcntl.h>
-#ifndef BENCHMARK_OS_FUCHSIA
-#include <sys/resource.h>
-#endif
-#include <sys/time.h>
-#include <sys/types.h>  // this header must be included before 'sys/sysctl.h' to avoid compilation error on FreeBSD
-#include <unistd.h>
-#if defined BENCHMARK_OS_FREEBSD || defined BENCHMARK_OS_MACOSX
-#include <sys/sysctl.h>
-#endif
-#if defined(BENCHMARK_OS_MACOSX)
-#include <mach/mach_init.h>
-#include <mach/mach_port.h>
-#include <mach/thread_act.h>
-#endif
-#endif
-
-#ifdef BENCHMARK_OS_EMSCRIPTEN
-#include <emscripten.h>
-#endif
-
-#include <cerrno>
-#include <cstdint>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <ctime>
-#include <iostream>
-#include <limits>
-#include <mutex>
-
-#include "check.h"
-#include "log.h"
-#include "sleep.h"
-#include "string_util.h"
-
-namespace benchmark {
-
-// Suppress unused warnings on helper functions.
-#if defined(__GNUC__)
-#pragma GCC diagnostic ignored "-Wunused-function"
-#endif
-
-namespace {
-#if defined(BENCHMARK_OS_WINDOWS)
-double MakeTime(FILETIME const& kernel_time, FILETIME const& user_time) {
-  ULARGE_INTEGER kernel;
-  ULARGE_INTEGER user;
-  kernel.HighPart = kernel_time.dwHighDateTime;
-  kernel.LowPart = kernel_time.dwLowDateTime;
-  user.HighPart = user_time.dwHighDateTime;
-  user.LowPart = user_time.dwLowDateTime;
-  return (static_cast<double>(kernel.QuadPart) +
-          static_cast<double>(user.QuadPart)) *
-         1e-7;
-}
-#elif !defined(BENCHMARK_OS_FUCHSIA)
-double MakeTime(struct rusage const& ru) {
-  return (static_cast<double>(ru.ru_utime.tv_sec) +
-          static_cast<double>(ru.ru_utime.tv_usec) * 1e-6 +
-          static_cast<double>(ru.ru_stime.tv_sec) +
-          static_cast<double>(ru.ru_stime.tv_usec) * 1e-6);
-}
-#endif
-#if defined(BENCHMARK_OS_MACOSX)
-double MakeTime(thread_basic_info_data_t const& info) {
-  return (static_cast<double>(info.user_time.seconds) +
-          static_cast<double>(info.user_time.microseconds) * 1e-6 +
-          static_cast<double>(info.system_time.seconds) +
-          static_cast<double>(info.system_time.microseconds) * 1e-6);
-}
-#endif
-#if defined(CLOCK_PROCESS_CPUTIME_ID) || defined(CLOCK_THREAD_CPUTIME_ID)
-double MakeTime(struct timespec const& ts) {
-  return ts.tv_sec + (static_cast<double>(ts.tv_nsec) * 1e-9);
-}
-#endif
-
-BENCHMARK_NORETURN static void DiagnoseAndExit(const char* msg) {
-  std::cerr << "ERROR: " << msg << std::endl;
-  std::exit(EXIT_FAILURE);
-}
-
-}  // end namespace
-
-double ProcessCPUUsage() {
-#if defined(BENCHMARK_OS_WINDOWS)
-  HANDLE proc = GetCurrentProcess();
-  FILETIME creation_time;
-  FILETIME exit_time;
-  FILETIME kernel_time;
-  FILETIME user_time;
-  if (GetProcessTimes(proc, &creation_time, &exit_time, &kernel_time,
-                      &user_time))
-    return MakeTime(kernel_time, user_time);
-  DiagnoseAndExit("GetProccessTimes() failed");
-#elif defined(BENCHMARK_OS_EMSCRIPTEN)
-  // clock_gettime(CLOCK_PROCESS_CPUTIME_ID, ...) returns 0 on Emscripten.
-  // Use Emscripten-specific API. Reported CPU time would be exactly the
-  // same as total time, but this is ok because there aren't long-latency
-  // syncronous system calls in Emscripten.
-  return emscripten_get_now() * 1e-3;
-#elif defined(CLOCK_PROCESS_CPUTIME_ID) && !defined(BENCHMARK_OS_MACOSX)
-  // FIXME We want to use clock_gettime, but its not available in MacOS 10.11. See
-  // https://github.com/google/benchmark/pull/292
-  struct timespec spec;
-  if (clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &spec) == 0)
-    return MakeTime(spec);
-  DiagnoseAndExit("clock_gettime(CLOCK_PROCESS_CPUTIME_ID, ...) failed");
-#else
-  struct rusage ru;
-  if (getrusage(RUSAGE_SELF, &ru) == 0) return MakeTime(ru);
-  DiagnoseAndExit("getrusage(RUSAGE_SELF, ...) failed");
-#endif
-}
-
-double ThreadCPUUsage() {
-#if defined(BENCHMARK_OS_WINDOWS)
-  HANDLE this_thread = GetCurrentThread();
-  FILETIME creation_time;
-  FILETIME exit_time;
-  FILETIME kernel_time;
-  FILETIME user_time;
-  GetThreadTimes(this_thread, &creation_time, &exit_time, &kernel_time,
-                 &user_time);
-  return MakeTime(kernel_time, user_time);
-#elif defined(BENCHMARK_OS_MACOSX)
-  // FIXME We want to use clock_gettime, but its not available in MacOS 10.11. See
-  // https://github.com/google/benchmark/pull/292
-  mach_msg_type_number_t count = THREAD_BASIC_INFO_COUNT;
-  thread_basic_info_data_t info;
-  mach_port_t thread = pthread_mach_thread_np(pthread_self());
-  if (thread_info(thread, THREAD_BASIC_INFO, (thread_info_t)&info, &count) ==
-      KERN_SUCCESS) {
-    return MakeTime(info);
-  }
-  DiagnoseAndExit("ThreadCPUUsage() failed when evaluating thread_info");
-#elif defined(BENCHMARK_OS_EMSCRIPTEN)
-  // Emscripten doesn't support traditional threads
-  return ProcessCPUUsage();
-#elif defined(BENCHMARK_OS_RTEMS)
-  // RTEMS doesn't support CLOCK_THREAD_CPUTIME_ID. See
-  // https://github.com/RTEMS/rtems/blob/master/cpukit/posix/src/clockgettime.c
-  return ProcessCPUUsage();
-#elif defined(BENCHMARK_OS_SOLARIS)
-  struct rusage ru;
-  if (getrusage(RUSAGE_LWP, &ru) == 0) return MakeTime(ru);
-  DiagnoseAndExit("getrusage(RUSAGE_LWP, ...) failed");
-#elif defined(CLOCK_THREAD_CPUTIME_ID)
-  struct timespec ts;
-  if (clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts) == 0) return MakeTime(ts);
-  DiagnoseAndExit("clock_gettime(CLOCK_THREAD_CPUTIME_ID, ...) failed");
-#else
-#error Per-thread timing is not available on your system.
-#endif
-}
-
-namespace {
-
-std::string DateTimeString(bool local) {
-  typedef std::chrono::system_clock Clock;
-  std::time_t now = Clock::to_time_t(Clock::now());
-  const std::size_t kStorageSize = 128;
-  char storage[kStorageSize];
-  std::size_t written;
-
-  if (local) {
-#if defined(BENCHMARK_OS_WINDOWS)
-    written =
-        std::strftime(storage, sizeof(storage), "%x %X", ::localtime(&now));
-#else
-    std::tm timeinfo;
-    ::localtime_r(&now, &timeinfo);
-    written = std::strftime(storage, sizeof(storage), "%F %T", &timeinfo);
-#endif
-  } else {
-#if defined(BENCHMARK_OS_WINDOWS)
-    written = std::strftime(storage, sizeof(storage), "%x %X", ::gmtime(&now));
-#else
-    std::tm timeinfo;
-    ::gmtime_r(&now, &timeinfo);
-    written = std::strftime(storage, sizeof(storage), "%F %T", &timeinfo);
-#endif
-  }
-  CHECK(written < kStorageSize);
-  ((void)written);  // prevent unused variable in optimized mode.
-  return std::string(storage);
-}
-
-}  // end namespace
-
-std::string LocalDateTimeString() { return DateTimeString(true); }
-
-}  // end namespace benchmark
diff --git a/gnu/llvm/llvm/utils/benchmark/src/timers.h b/gnu/llvm/llvm/utils/benchmark/src/timers.h
deleted file mode 100644
index 65606ccd93d..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/src/timers.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef BENCHMARK_TIMERS_H
-#define BENCHMARK_TIMERS_H
-
-#include <chrono>
-#include <string>
-
-namespace benchmark {
-
-// Return the CPU usage of the current process
-double ProcessCPUUsage();
-
-// Return the CPU usage of the children of the current process
-double ChildrenCPUUsage();
-
-// Return the CPU usage of the current thread
-double ThreadCPUUsage();
-
-#if defined(HAVE_STEADY_CLOCK)
-template <bool HighResIsSteady = std::chrono::high_resolution_clock::is_steady>
-struct ChooseSteadyClock {
-  typedef std::chrono::high_resolution_clock type;
-};
-
-template <>
-struct ChooseSteadyClock<false> {
-  typedef std::chrono::steady_clock type;
-};
-#endif
-
-struct ChooseClockType {
-#if defined(HAVE_STEADY_CLOCK)
-  typedef ChooseSteadyClock<>::type type;
-#else
-  typedef std::chrono::high_resolution_clock type;
-#endif
-};
-
-inline double ChronoClockNow() {
-  typedef ChooseClockType::type ClockType;
-  using FpSeconds = std::chrono::duration<double, std::chrono::seconds::period>;
-  return FpSeconds(ClockType::now().time_since_epoch()).count();
-}
-
-std::string LocalDateTimeString();
-
-}  // end namespace benchmark
-
-#endif  // BENCHMARK_TIMERS_H
diff --git a/gnu/llvm/llvm/utils/benchmark/test/AssemblyTests.cmake b/gnu/llvm/llvm/utils/benchmark/test/AssemblyTests.cmake
deleted file mode 100644
index 8605221ff71..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/test/AssemblyTests.cmake
+++ /dev/null
@@ -1,45 +0,0 @@
-
-include(split_list)
-
-set(ASM_TEST_FLAGS "")
-check_cxx_compiler_flag(-O3 BENCHMARK_HAS_O3_FLAG)
-if (BENCHMARK_HAS_O3_FLAG)
-  list(APPEND ASM_TEST_FLAGS -O3)
-endif()
-
-check_cxx_compiler_flag(-g0 BENCHMARK_HAS_G0_FLAG)
-if (BENCHMARK_HAS_G0_FLAG)
-  list(APPEND ASM_TEST_FLAGS -g0)
-endif()
-
-check_cxx_compiler_flag(-fno-stack-protector BENCHMARK_HAS_FNO_STACK_PROTECTOR_FLAG)
-if (BENCHMARK_HAS_FNO_STACK_PROTECTOR_FLAG)
-  list(APPEND ASM_TEST_FLAGS -fno-stack-protector)
-endif()
-
-split_list(ASM_TEST_FLAGS)
-string(TOUPPER "${CMAKE_CXX_COMPILER_ID}" ASM_TEST_COMPILER)
-
-macro(add_filecheck_test name)
-  cmake_parse_arguments(ARG "" "" "CHECK_PREFIXES" ${ARGV})
-  add_library(${name} OBJECT ${name}.cc)
-  set_target_properties(${name} PROPERTIES COMPILE_FLAGS "-S ${ASM_TEST_FLAGS}")
-  set(ASM_OUTPUT_FILE "${CMAKE_CURRENT_BINARY_DIR}/${name}.s")
-  add_custom_target(copy_${name} ALL
-      COMMAND ${PROJECT_SOURCE_DIR}/tools/strip_asm.py
-        $<TARGET_OBJECTS:${name}>
-        ${ASM_OUTPUT_FILE}
-      BYPRODUCTS ${ASM_OUTPUT_FILE})
-  add_dependencies(copy_${name} ${name})
-  if (NOT ARG_CHECK_PREFIXES)
-    set(ARG_CHECK_PREFIXES "CHECK")
-  endif()
-  foreach(prefix ${ARG_CHECK_PREFIXES})
-    add_test(NAME run_${name}_${prefix}
-        COMMAND
-          ${LLVM_FILECHECK_EXE} ${name}.cc
-          --input-file=${ASM_OUTPUT_FILE}
-          --check-prefixes=CHECK,CHECK-${ASM_TEST_COMPILER}
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-  endforeach()
-endmacro()
diff --git a/gnu/llvm/llvm/utils/benchmark/test/CMakeLists.txt b/gnu/llvm/llvm/utils/benchmark/test/CMakeLists.txt
deleted file mode 100644
index 05ae804bfe3..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/test/CMakeLists.txt
+++ /dev/null
@@ -1,247 +0,0 @@
-# Enable the tests
-
-find_package(Threads REQUIRED)
-include(CheckCXXCompilerFlag)
-
-# NOTE: Some tests use `<cassert>` to perform the test. Therefore we must
-# strip -DNDEBUG from the default CMake flags in DEBUG mode.
-string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
-if( NOT uppercase_CMAKE_BUILD_TYPE STREQUAL "DEBUG" )
-  add_definitions( -UNDEBUG )
-  add_definitions(-DTEST_BENCHMARK_LIBRARY_HAS_NO_ASSERTIONS)
-  # Also remove /D NDEBUG to avoid MSVC warnings about conflicting defines.
-  foreach (flags_var_to_scrub
-      CMAKE_CXX_FLAGS_RELEASE
-      CMAKE_CXX_FLAGS_RELWITHDEBINFO
-      CMAKE_CXX_FLAGS_MINSIZEREL
-      CMAKE_C_FLAGS_RELEASE
-      CMAKE_C_FLAGS_RELWITHDEBINFO
-      CMAKE_C_FLAGS_MINSIZEREL)
-    string (REGEX REPLACE "(^| )[/-]D *NDEBUG($| )" " "
-      "${flags_var_to_scrub}" "${${flags_var_to_scrub}}")
-  endforeach()
-endif()
-
-check_cxx_compiler_flag(-O3 BENCHMARK_HAS_O3_FLAG)
-set(BENCHMARK_O3_FLAG "")
-if (BENCHMARK_HAS_O3_FLAG)
-  set(BENCHMARK_O3_FLAG "-O3")
-endif()
-
-# NOTE: These flags must be added after find_package(Threads REQUIRED) otherwise
-# they will break the configuration check.
-if (DEFINED BENCHMARK_CXX_LINKER_FLAGS)
-  list(APPEND CMAKE_EXE_LINKER_FLAGS ${BENCHMARK_CXX_LINKER_FLAGS})
-endif()
-
-add_library(output_test_helper STATIC output_test_helper.cc output_test.h)
-
-macro(compile_benchmark_test name)
-  add_executable(${name} "${name}.cc")
-  target_link_libraries(${name} benchmark ${CMAKE_THREAD_LIBS_INIT})
-endmacro(compile_benchmark_test)
-
-macro(compile_benchmark_test_with_main name)
-  add_executable(${name} "${name}.cc")
-  target_link_libraries(${name} benchmark_main)
-endmacro(compile_benchmark_test_with_main)
-
-macro(compile_output_test name)
-  add_executable(${name} "${name}.cc" output_test.h)
-  target_link_libraries(${name} output_test_helper benchmark
-          ${BENCHMARK_CXX_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-endmacro(compile_output_test)
-
-# Demonstration executable
-compile_benchmark_test(benchmark_test)
-add_test(benchmark benchmark_test --benchmark_min_time=0.01)
-
-compile_benchmark_test(filter_test)
-macro(add_filter_test name filter expect)
-  add_test(${name} filter_test --benchmark_min_time=0.01 --benchmark_filter=${filter} ${expect})
-  add_test(${name}_list_only filter_test --benchmark_list_tests --benchmark_filter=${filter} ${expect})
-endmacro(add_filter_test)
-
-add_filter_test(filter_simple "Foo" 3)
-add_filter_test(filter_simple_negative "-Foo" 2)
-add_filter_test(filter_suffix "BM_.*" 4)
-add_filter_test(filter_suffix_negative "-BM_.*" 1)
-add_filter_test(filter_regex_all ".*" 5)
-add_filter_test(filter_regex_all_negative "-.*" 0)
-add_filter_test(filter_regex_blank "" 5)
-add_filter_test(filter_regex_blank_negative "-" 0)
-add_filter_test(filter_regex_none "monkey" 0)
-add_filter_test(filter_regex_none_negative "-monkey" 5)
-add_filter_test(filter_regex_wildcard ".*Foo.*" 3)
-add_filter_test(filter_regex_wildcard_negative "-.*Foo.*" 2)
-add_filter_test(filter_regex_begin "^BM_.*" 4)
-add_filter_test(filter_regex_begin_negative "-^BM_.*" 1)
-add_filter_test(filter_regex_begin2 "^N" 1)
-add_filter_test(filter_regex_begin2_negative "-^N" 4)
-add_filter_test(filter_regex_end ".*Ba$" 1)
-add_filter_test(filter_regex_end_negative "-.*Ba$" 4)
-
-compile_benchmark_test(options_test)
-add_test(options_benchmarks options_test --benchmark_min_time=0.01)
-
-compile_benchmark_test(basic_test)
-add_test(basic_benchmark basic_test --benchmark_min_time=0.01)
-
-compile_benchmark_test(diagnostics_test)
-add_test(diagnostics_test diagnostics_test --benchmark_min_time=0.01)
-
-compile_benchmark_test(skip_with_error_test)
-add_test(skip_with_error_test skip_with_error_test --benchmark_min_time=0.01)
-
-compile_benchmark_test(donotoptimize_test)
-# Some of the issues with DoNotOptimize only occur when optimization is enabled
-check_cxx_compiler_flag(-O3 BENCHMARK_HAS_O3_FLAG)
-if (BENCHMARK_HAS_O3_FLAG)
-  set_target_properties(donotoptimize_test PROPERTIES COMPILE_FLAGS "-O3")
-endif()
-add_test(donotoptimize_test donotoptimize_test --benchmark_min_time=0.01)
-
-compile_benchmark_test(fixture_test)
-add_test(fixture_test fixture_test --benchmark_min_time=0.01)
-
-compile_benchmark_test(register_benchmark_test)
-add_test(register_benchmark_test register_benchmark_test --benchmark_min_time=0.01)
-
-compile_benchmark_test(map_test)
-add_test(map_test map_test --benchmark_min_time=0.01)
-
-compile_benchmark_test(multiple_ranges_test)
-add_test(multiple_ranges_test multiple_ranges_test --benchmark_min_time=0.01)
-
-compile_benchmark_test_with_main(link_main_test)
-add_test(link_main_test link_main_test --benchmark_min_time=0.01)
-
-compile_output_test(reporter_output_test)
-add_test(reporter_output_test reporter_output_test --benchmark_min_time=0.01)
-
-compile_output_test(templated_fixture_test)
-add_test(templated_fixture_test templated_fixture_test --benchmark_min_time=0.01)
-
-compile_output_test(user_counters_test)
-add_test(user_counters_test user_counters_test --benchmark_min_time=0.01)
-
-compile_output_test(user_counters_tabular_test)
-add_test(user_counters_tabular_test user_counters_tabular_test --benchmark_counters_tabular=true --benchmark_min_time=0.01)
-
-check_cxx_compiler_flag(-std=c++03 BENCHMARK_HAS_CXX03_FLAG)
-if (BENCHMARK_HAS_CXX03_FLAG)
-  compile_benchmark_test(cxx03_test)
-  set_target_properties(cxx03_test
-      PROPERTIES
-      COMPILE_FLAGS "-std=c++03")
-  # libstdc++ provides different definitions within <map> between dialects. When
-  # LTO is enabled and -Werror is specified GCC diagnoses this ODR violation
-  # causing the test to fail to compile. To prevent this we explicitly disable
-  # the warning.
-  check_cxx_compiler_flag(-Wno-odr BENCHMARK_HAS_WNO_ODR)
-  if (BENCHMARK_ENABLE_LTO AND BENCHMARK_HAS_WNO_ODR)
-    set_target_properties(cxx03_test
-        PROPERTIES
-        LINK_FLAGS "-Wno-odr")
-  endif()
-  add_test(cxx03 cxx03_test --benchmark_min_time=0.01)
-endif()
-
-# Attempt to work around flaky test failures when running on Appveyor servers.
-if (DEFINED ENV{APPVEYOR})
-  set(COMPLEXITY_MIN_TIME "0.5")
-else()
-  set(COMPLEXITY_MIN_TIME "0.01")
-endif()
-compile_output_test(complexity_test)
-add_test(complexity_benchmark complexity_test --benchmark_min_time=${COMPLEXITY_MIN_TIME})
-
-###############################################################################
-# GoogleTest Unit Tests
-###############################################################################
-
-if (BENCHMARK_ENABLE_GTEST_TESTS)
-  macro(compile_gtest name)
-    add_executable(${name} "${name}.cc")
-    if (TARGET googletest)
-      add_dependencies(${name} googletest)
-    endif()
-    if (GTEST_INCLUDE_DIRS)
-      target_include_directories(${name} PRIVATE ${GTEST_INCLUDE_DIRS})
-    endif()
-    target_link_libraries(${name} benchmark
-        ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-  endmacro(compile_gtest)
-
-  macro(add_gtest name)
-    compile_gtest(${name})
-    add_test(${name} ${name})
-  endmacro()
-
-  add_gtest(benchmark_gtest)
-  add_gtest(statistics_gtest)
-endif(BENCHMARK_ENABLE_GTEST_TESTS)
-
-###############################################################################
-# Assembly Unit Tests
-###############################################################################
-
-if (BENCHMARK_ENABLE_ASSEMBLY_TESTS)
-  if (NOT LLVM_FILECHECK_EXE)
-    message(FATAL_ERROR "LLVM FileCheck is required when including this file")
-  endif()
-  include(AssemblyTests.cmake)
-  add_filecheck_test(donotoptimize_assembly_test)
-  add_filecheck_test(state_assembly_test)
-  add_filecheck_test(clobber_memory_assembly_test)
-endif()
-
-
-
-###############################################################################
-# Code Coverage Configuration
-###############################################################################
-
-# Add the coverage command(s)
-if(CMAKE_BUILD_TYPE)
-  string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER)
-endif()
-if (${CMAKE_BUILD_TYPE_LOWER} MATCHES "coverage")
-  find_program(GCOV gcov)
-  find_program(LCOV lcov)
-  find_program(GENHTML genhtml)
-  find_program(CTEST ctest)
-  if (GCOV AND LCOV AND GENHTML AND CTEST AND HAVE_CXX_FLAG_COVERAGE)
-    add_custom_command(
-      OUTPUT ${CMAKE_BINARY_DIR}/lcov/index.html
-      COMMAND ${LCOV} -q -z -d .
-      COMMAND ${LCOV} -q --no-external -c -b "${CMAKE_SOURCE_DIR}" -d . -o before.lcov -i
-      COMMAND ${CTEST} --force-new-ctest-process
-      COMMAND ${LCOV} -q --no-external -c -b "${CMAKE_SOURCE_DIR}" -d . -o after.lcov
-      COMMAND ${LCOV} -q -a before.lcov -a after.lcov --output-file final.lcov
-      COMMAND ${LCOV} -q -r final.lcov "'${CMAKE_SOURCE_DIR}/test/*'" -o final.lcov
-      COMMAND ${GENHTML} final.lcov -o lcov --demangle-cpp --sort -p "${CMAKE_BINARY_DIR}" -t benchmark
-      DEPENDS filter_test benchmark_test options_test basic_test fixture_test cxx03_test complexity_test
-      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-      COMMENT "Running LCOV"
-    )
-    add_custom_target(coverage
-      DEPENDS ${CMAKE_BINARY_DIR}/lcov/index.html
-      COMMENT "LCOV report at lcov/index.html"
-    )
-    message(STATUS "Coverage command added")
-  else()
-    if (HAVE_CXX_FLAG_COVERAGE)
-      set(CXX_FLAG_COVERAGE_MESSAGE supported)
-    else()
-      set(CXX_FLAG_COVERAGE_MESSAGE unavailable)
-    endif()
-    message(WARNING
-      "Coverage not available:\n"
-      "  gcov: ${GCOV}\n"
-      "  lcov: ${LCOV}\n"
-      "  genhtml: ${GENHTML}\n"
-      "  ctest: ${CTEST}\n"
-      "  --coverage flag: ${CXX_FLAG_COVERAGE_MESSAGE}")
-  endif()
-endif()
diff --git a/gnu/llvm/llvm/utils/benchmark/test/basic_test.cc b/gnu/llvm/llvm/utils/benchmark/test/basic_test.cc
deleted file mode 100644
index d07fbc00b15..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/test/basic_test.cc
+++ /dev/null
@@ -1,136 +0,0 @@
-
-#include "benchmark/benchmark.h"
-
-#define BASIC_BENCHMARK_TEST(x) BENCHMARK(x)->Arg(8)->Arg(512)->Arg(8192)
-
-void BM_empty(benchmark::State& state) {
-  for (auto _ : state) {
-    benchmark::DoNotOptimize(state.iterations());
-  }
-}
-BENCHMARK(BM_empty);
-BENCHMARK(BM_empty)->ThreadPerCpu();
-
-void BM_spin_empty(benchmark::State& state) {
-  for (auto _ : state) {
-    for (int x = 0; x < state.range(0); ++x) {
-      benchmark::DoNotOptimize(x);
-    }
-  }
-}
-BASIC_BENCHMARK_TEST(BM_spin_empty);
-BASIC_BENCHMARK_TEST(BM_spin_empty)->ThreadPerCpu();
-
-void BM_spin_pause_before(benchmark::State& state) {
-  for (int i = 0; i < state.range(0); ++i) {
-    benchmark::DoNotOptimize(i);
-  }
-  for (auto _ : state) {
-    for (int i = 0; i < state.range(0); ++i) {
-      benchmark::DoNotOptimize(i);
-    }
-  }
-}
-BASIC_BENCHMARK_TEST(BM_spin_pause_before);
-BASIC_BENCHMARK_TEST(BM_spin_pause_before)->ThreadPerCpu();
-
-void BM_spin_pause_during(benchmark::State& state) {
-  for (auto _ : state) {
-    state.PauseTiming();
-    for (int i = 0; i < state.range(0); ++i) {
-      benchmark::DoNotOptimize(i);
-    }
-    state.ResumeTiming();
-    for (int i = 0; i < state.range(0); ++i) {
-      benchmark::DoNotOptimize(i);
-    }
-  }
-}
-BASIC_BENCHMARK_TEST(BM_spin_pause_during);
-BASIC_BENCHMARK_TEST(BM_spin_pause_during)->ThreadPerCpu();
-
-void BM_pause_during(benchmark::State& state) {
-  for (auto _ : state) {
-    state.PauseTiming();
-    state.ResumeTiming();
-  }
-}
-BENCHMARK(BM_pause_during);
-BENCHMARK(BM_pause_during)->ThreadPerCpu();
-BENCHMARK(BM_pause_during)->UseRealTime();
-BENCHMARK(BM_pause_during)->UseRealTime()->ThreadPerCpu();
-
-void BM_spin_pause_after(benchmark::State& state) {
-  for (auto _ : state) {
-    for (int i = 0; i < state.range(0); ++i) {
-      benchmark::DoNotOptimize(i);
-    }
-  }
-  for (int i = 0; i < state.range(0); ++i) {
-    benchmark::DoNotOptimize(i);
-  }
-}
-BASIC_BENCHMARK_TEST(BM_spin_pause_after);
-BASIC_BENCHMARK_TEST(BM_spin_pause_after)->ThreadPerCpu();
-
-void BM_spin_pause_before_and_after(benchmark::State& state) {
-  for (int i = 0; i < state.range(0); ++i) {
-    benchmark::DoNotOptimize(i);
-  }
-  for (auto _ : state) {
-    for (int i = 0; i < state.range(0); ++i) {
-      benchmark::DoNotOptimize(i);
-    }
-  }
-  for (int i = 0; i < state.range(0); ++i) {
-    benchmark::DoNotOptimize(i);
-  }
-}
-BASIC_BENCHMARK_TEST(BM_spin_pause_before_and_after);
-BASIC_BENCHMARK_TEST(BM_spin_pause_before_and_after)->ThreadPerCpu();
-
-void BM_empty_stop_start(benchmark::State& state) {
-  for (auto _ : state) {
-  }
-}
-BENCHMARK(BM_empty_stop_start);
-BENCHMARK(BM_empty_stop_start)->ThreadPerCpu();
-
-
-void BM_KeepRunning(benchmark::State& state) {
-  size_t iter_count = 0;
-  assert(iter_count == state.iterations());
-  while (state.KeepRunning()) {
-    ++iter_count;
-  }
-  assert(iter_count == state.iterations());
-}
-BENCHMARK(BM_KeepRunning);
-
-void BM_KeepRunningBatch(benchmark::State& state) {
-  // Choose a prime batch size to avoid evenly dividing max_iterations.
-  const size_t batch_size = 101;
-  size_t iter_count = 0;
-  while (state.KeepRunningBatch(batch_size)) {
-    iter_count += batch_size;
-  }
-  assert(state.iterations() == iter_count);
-}
-BENCHMARK(BM_KeepRunningBatch);
-
-void BM_RangedFor(benchmark::State& state) {
-  size_t iter_count = 0;
-  for (auto _ : state) {
-    ++iter_count;
-  }
-  assert(iter_count == state.max_iterations);
-}
-BENCHMARK(BM_RangedFor);
-
-// Ensure that StateIterator provides all the necessary typedefs required to
-// instantiate std::iterator_traits.
-static_assert(std::is_same<
-  typename std::iterator_traits<benchmark::State::StateIterator>::value_type,
-  typename benchmark::State::StateIterator::value_type>::value, "");
-
-BENCHMARK_MAIN();
diff --git a/gnu/llvm/llvm/utils/benchmark/test/benchmark_gtest.cc b/gnu/llvm/llvm/utils/benchmark/test/benchmark_gtest.cc
deleted file mode 100644
index 10683b433ab..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/test/benchmark_gtest.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <vector>
-
-#include "../src/benchmark_register.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-namespace {
-
-TEST(AddRangeTest, Simple) {
-  std::vector<int> dst;
-  AddRange(&dst, 1, 2, 2);
-  EXPECT_THAT(dst, testing::ElementsAre(1, 2));
-}
-
-TEST(AddRangeTest, Simple64) {
-  std::vector<int64_t> dst;
-  AddRange(&dst, static_cast<int64_t>(1), static_cast<int64_t>(2), 2);
-  EXPECT_THAT(dst, testing::ElementsAre(1, 2));
-}
-
-TEST(AddRangeTest, Advanced) {
-  std::vector<int> dst;
-  AddRange(&dst, 5, 15, 2);
-  EXPECT_THAT(dst, testing::ElementsAre(5, 8, 15));
-}
-
-TEST(AddRangeTest, Advanced64) {
-  std::vector<int64_t> dst;
-  AddRange(&dst, static_cast<int64_t>(5), static_cast<int64_t>(15), 2);
-  EXPECT_THAT(dst, testing::ElementsAre(5, 8, 15));
-}
-
-}  // end namespace
diff --git a/gnu/llvm/llvm/utils/benchmark/test/benchmark_test.cc b/gnu/llvm/llvm/utils/benchmark/test/benchmark_test.cc
deleted file mode 100644
index 3cd4f5565fa..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/test/benchmark_test.cc
+++ /dev/null
@@ -1,245 +0,0 @@
-#include "benchmark/benchmark.h"
-
-#include <assert.h>
-#include <math.h>
-#include <stdint.h>
-
-#include <chrono>
-#include <cstdlib>
-#include <iostream>
-#include <limits>
-#include <list>
-#include <map>
-#include <mutex>
-#include <set>
-#include <sstream>
-#include <string>
-#include <thread>
-#include <utility>
-#include <vector>
-
-#if defined(__GNUC__)
-#define BENCHMARK_NOINLINE __attribute__((noinline))
-#else
-#define BENCHMARK_NOINLINE
-#endif
-
-namespace {
-
-int BENCHMARK_NOINLINE Factorial(uint32_t n) {
-  return (n == 1) ? 1 : n * Factorial(n - 1);
-}
-
-double CalculatePi(int depth) {
-  double pi = 0.0;
-  for (int i = 0; i < depth; ++i) {
-    double numerator = static_cast<double>(((i % 2) * 2) - 1);
-    double denominator = static_cast<double>((2 * i) - 1);
-    pi += numerator / denominator;
-  }
-  return (pi - 1.0) * 4;
-}
-
-std::set<int64_t> ConstructRandomSet(int64_t size) {
-  std::set<int64_t> s;
-  for (int i = 0; i < size; ++i) s.insert(s.end(), i);
-  return s;
-}
-
-std::mutex test_vector_mu;
-std::vector<int>* test_vector = nullptr;
-
-}  // end namespace
-
-static void BM_Factorial(benchmark::State& state) {
-  int fac_42 = 0;
-  for (auto _ : state) fac_42 = Factorial(8);
-  // Prevent compiler optimizations
-  std::stringstream ss;
-  ss << fac_42;
-  state.SetLabel(ss.str());
-}
-BENCHMARK(BM_Factorial);
-BENCHMARK(BM_Factorial)->UseRealTime();
-
-static void BM_CalculatePiRange(benchmark::State& state) {
-  double pi = 0.0;
-  for (auto _ : state) pi = CalculatePi(static_cast<int>(state.range(0)));
-  std::stringstream ss;
-  ss << pi;
-  state.SetLabel(ss.str());
-}
-BENCHMARK_RANGE(BM_CalculatePiRange, 1, 1024 * 1024);
-
-static void BM_CalculatePi(benchmark::State& state) {
-  static const int depth = 1024;
-  for (auto _ : state) {
-    benchmark::DoNotOptimize(CalculatePi(static_cast<int>(depth)));
-  }
-}
-BENCHMARK(BM_CalculatePi)->Threads(8);
-BENCHMARK(BM_CalculatePi)->ThreadRange(1, 32);
-BENCHMARK(BM_CalculatePi)->ThreadPerCpu();
-
-static void BM_SetInsert(benchmark::State& state) {
-  std::set<int64_t> data;
-  for (auto _ : state) {
-    state.PauseTiming();
-    data = ConstructRandomSet(state.range(0));
-    state.ResumeTiming();
-    for (int j = 0; j < state.range(1); ++j) data.insert(rand());
-  }
-  state.SetItemsProcessed(state.iterations() * state.range(1));
-  state.SetBytesProcessed(state.iterations() * state.range(1) * sizeof(int));
-}
-
-// Test many inserts at once to reduce the total iterations needed. Otherwise, the slower,
-// non-timed part of each iteration will make the benchmark take forever.
-BENCHMARK(BM_SetInsert)->Ranges({{1 << 10, 8 << 10}, {128, 512}});
-
-template <typename Container,
-          typename ValueType = typename Container::value_type>
-static void BM_Sequential(benchmark::State& state) {
-  ValueType v = 42;
-  for (auto _ : state) {
-    Container c;
-    for (int64_t i = state.range(0); --i;) c.push_back(v);
-  }
-  const int64_t items_processed = state.iterations() * state.range(0);
-  state.SetItemsProcessed(items_processed);
-  state.SetBytesProcessed(items_processed * sizeof(v));
-}
-BENCHMARK_TEMPLATE2(BM_Sequential, std::vector<int>, int)
-    ->Range(1 << 0, 1 << 10);
-BENCHMARK_TEMPLATE(BM_Sequential, std::list<int>)->Range(1 << 0, 1 << 10);
-// Test the variadic version of BENCHMARK_TEMPLATE in C++11 and beyond.
-#ifdef BENCHMARK_HAS_CXX11
-BENCHMARK_TEMPLATE(BM_Sequential, std::vector<int>, int)->Arg(512);
-#endif
-
-static void BM_StringCompare(benchmark::State& state) {
-  size_t len = static_cast<size_t>(state.range(0));
-  std::string s1(len, '-');
-  std::string s2(len, '-');
-  for (auto _ : state) benchmark::DoNotOptimize(s1.compare(s2));
-}
-BENCHMARK(BM_StringCompare)->Range(1, 1 << 20);
-
-static void BM_SetupTeardown(benchmark::State& state) {
-  if (state.thread_index == 0) {
-    // No need to lock test_vector_mu here as this is running single-threaded.
-    test_vector = new std::vector<int>();
-  }
-  int i = 0;
-  for (auto _ : state) {
-    std::lock_guard<std::mutex> l(test_vector_mu);
-    if (i % 2 == 0)
-      test_vector->push_back(i);
-    else
-      test_vector->pop_back();
-    ++i;
-  }
-  if (state.thread_index == 0) {
-    delete test_vector;
-  }
-}
-BENCHMARK(BM_SetupTeardown)->ThreadPerCpu();
-
-static void BM_LongTest(benchmark::State& state) {
-  double tracker = 0.0;
-  for (auto _ : state) {
-    for (int i = 0; i < state.range(0); ++i)
-      benchmark::DoNotOptimize(tracker += i);
-  }
-}
-BENCHMARK(BM_LongTest)->Range(1 << 16, 1 << 28);
-
-static void BM_ParallelMemset(benchmark::State& state) {
-  int64_t size = state.range(0) / static_cast<int64_t>(sizeof(int));
-  int thread_size = static_cast<int>(size) / state.threads;
-  int from = thread_size * state.thread_index;
-  int to = from + thread_size;
-
-  if (state.thread_index == 0) {
-    test_vector = new std::vector<int>(static_cast<size_t>(size));
-  }
-
-  for (auto _ : state) {
-    for (int i = from; i < to; i++) {
-      // No need to lock test_vector_mu as ranges
-      // do not overlap between threads.
-      benchmark::DoNotOptimize(test_vector->at(i) = 1);
-    }
-  }
-
-  if (state.thread_index == 0) {
-    delete test_vector;
-  }
-}
-BENCHMARK(BM_ParallelMemset)->Arg(10 << 20)->ThreadRange(1, 4);
-
-static void BM_ManualTiming(benchmark::State& state) {
-  int64_t slept_for = 0;
-  int64_t microseconds = state.range(0);
-  std::chrono::duration<double, std::micro> sleep_duration{
-      static_cast<double>(microseconds)};
-
-  for (auto _ : state) {
-    auto start = std::chrono::high_resolution_clock::now();
-    // Simulate some useful workload with a sleep
-    std::this_thread::sleep_for(
-        std::chrono::duration_cast<std::chrono::nanoseconds>(sleep_duration));
-    auto end = std::chrono::high_resolution_clock::now();
-
-    auto elapsed =
-        std::chrono::duration_cast<std::chrono::duration<double>>(end - start);
-
-    state.SetIterationTime(elapsed.count());
-    slept_for += microseconds;
-  }
-  state.SetItemsProcessed(slept_for);
-}
-BENCHMARK(BM_ManualTiming)->Range(1, 1 << 14)->UseRealTime();
-BENCHMARK(BM_ManualTiming)->Range(1, 1 << 14)->UseManualTime();
-
-#ifdef BENCHMARK_HAS_CXX11
-
-template <class... Args>
-void BM_with_args(benchmark::State& state, Args&&...) {
-  for (auto _ : state) {
-  }
-}
-BENCHMARK_CAPTURE(BM_with_args, int_test, 42, 43, 44);
-BENCHMARK_CAPTURE(BM_with_args, string_and_pair_test, std::string("abc"),
-                  std::pair<int, double>(42, 3.8));
-
-void BM_non_template_args(benchmark::State& state, int, double) {
-  while(state.KeepRunning()) {}
-}
-BENCHMARK_CAPTURE(BM_non_template_args, basic_test, 0, 0);
-
-#endif  // BENCHMARK_HAS_CXX11
-
-static void BM_DenseThreadRanges(benchmark::State& st) {
-  switch (st.range(0)) {
-    case 1:
-      assert(st.threads == 1 || st.threads == 2 || st.threads == 3);
-      break;
-    case 2:
-      assert(st.threads == 1 || st.threads == 3 || st.threads == 4);
-      break;
-    case 3:
-      assert(st.threads == 5 || st.threads == 8 || st.threads == 11 ||
-             st.threads == 14);
-      break;
-    default:
-      assert(false && "Invalid test case number");
-  }
-  while (st.KeepRunning()) {
-  }
-}
-BENCHMARK(BM_DenseThreadRanges)->Arg(1)->DenseThreadRange(1, 3);
-BENCHMARK(BM_DenseThreadRanges)->Arg(2)->DenseThreadRange(1, 4, 2);
-BENCHMARK(BM_DenseThreadRanges)->Arg(3)->DenseThreadRange(5, 14, 3);
-
-BENCHMARK_MAIN();
diff --git a/gnu/llvm/llvm/utils/benchmark/test/clobber_memory_assembly_test.cc b/gnu/llvm/llvm/utils/benchmark/test/clobber_memory_assembly_test.cc
deleted file mode 100644
index f41911a39ce..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/test/clobber_memory_assembly_test.cc
+++ /dev/null
@@ -1,64 +0,0 @@
-#include <benchmark/benchmark.h>
-
-#ifdef __clang__
-#pragma clang diagnostic ignored "-Wreturn-type"
-#endif
-
-extern "C" {
-
-extern int ExternInt;
-extern int ExternInt2;
-extern int ExternInt3;
-
-}
-
-// CHECK-LABEL: test_basic:
-extern "C" void test_basic() {
-  int x;
-  benchmark::DoNotOptimize(&x);
-  x = 101;
-  benchmark::ClobberMemory();
-  // CHECK: leaq [[DEST:[^,]+]], %rax
-  // CHECK: movl $101, [[DEST]]
-  // CHECK: ret
-}
-
-// CHECK-LABEL: test_redundant_store:
-extern "C" void test_redundant_store() {
-  ExternInt = 3;
-  benchmark::ClobberMemory();
-  ExternInt = 51;
-  // CHECK-DAG: ExternInt
-  // CHECK-DAG: movl $3
-  // CHECK: movl $51
-}
-
-// CHECK-LABEL: test_redundant_read:
-extern "C" void test_redundant_read() {
-  int x;
-  benchmark::DoNotOptimize(&x);
-  x = ExternInt;
-  benchmark::ClobberMemory();
-  x = ExternInt2;
-  // CHECK: leaq [[DEST:[^,]+]], %rax
-  // CHECK: ExternInt(%rip)
-  // CHECK: movl %eax, [[DEST]]
-  // CHECK-NOT: ExternInt2
-  // CHECK: ret
-}
-
-// CHECK-LABEL: test_redundant_read2:
-extern "C" void test_redundant_read2() {
-  int x;
-  benchmark::DoNotOptimize(&x);
-  x = ExternInt;
-  benchmark::ClobberMemory();
-  x = ExternInt2;
-  benchmark::ClobberMemory();
-  // CHECK: leaq [[DEST:[^,]+]], %rax
-  // CHECK: ExternInt(%rip)
-  // CHECK: movl %eax, [[DEST]]
-  // CHECK: ExternInt2(%rip)
-  // CHECK: movl %eax, [[DEST]]
-  // CHECK: ret
-}
diff --git a/gnu/llvm/llvm/utils/benchmark/test/complexity_test.cc b/gnu/llvm/llvm/utils/benchmark/test/complexity_test.cc
deleted file mode 100644
index ab832861ece..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/test/complexity_test.cc
+++ /dev/null
@@ -1,167 +0,0 @@
-#undef NDEBUG
-#include <algorithm>
-#include <cassert>
-#include <cmath>
-#include <cstdlib>
-#include <vector>
-#include "benchmark/benchmark.h"
-#include "output_test.h"
-
-namespace {
-
-#define ADD_COMPLEXITY_CASES(...) \
-  int CONCAT(dummy, __LINE__) = AddComplexityTest(__VA_ARGS__)
-
-int AddComplexityTest(std::string big_o_test_name, std::string rms_test_name,
-                      std::string big_o) {
-  SetSubstitutions({{"%bigo_name", big_o_test_name},
-                    {"%rms_name", rms_test_name},
-                    {"%bigo_str", "[ ]* %float " + big_o},
-                    {"%bigo", big_o},
-                    {"%rms", "[ ]*[0-9]+ %"}});
-  AddCases(
-      TC_ConsoleOut,
-      {{"^%bigo_name %bigo_str %bigo_str[ ]*$"},
-       {"^%bigo_name", MR_Not},  // Assert we we didn't only matched a name.
-       {"^%rms_name %rms %rms[ ]*$", MR_Next}});
-  AddCases(TC_JSONOut, {{"\"name\": \"%bigo_name\",$"},
-                        {"\"cpu_coefficient\": %float,$", MR_Next},
-                        {"\"real_coefficient\": %float,$", MR_Next},
-                        {"\"big_o\": \"%bigo\",$", MR_Next},
-                        {"\"time_unit\": \"ns\"$", MR_Next},
-                        {"}", MR_Next},
-                        {"\"name\": \"%rms_name\",$"},
-                        {"\"rms\": %float$", MR_Next},
-                        {"}", MR_Next}});
-  AddCases(TC_CSVOut, {{"^\"%bigo_name\",,%float,%float,%bigo,,,,,$"},
-                       {"^\"%bigo_name\"", MR_Not},
-                       {"^\"%rms_name\",,%float,%float,,,,,,$", MR_Next}});
-  return 0;
-}
-
-}  // end namespace
-
-// ========================================================================= //
-// --------------------------- Testing BigO O(1) --------------------------- //
-// ========================================================================= //
-
-void BM_Complexity_O1(benchmark::State& state) {
-  for (auto _ : state) {
-    for (int i = 0; i < 1024; ++i) {
-      benchmark::DoNotOptimize(&i);
-    }
-  }
-  state.SetComplexityN(state.range(0));
-}
-BENCHMARK(BM_Complexity_O1)->Range(1, 1 << 18)->Complexity(benchmark::o1);
-BENCHMARK(BM_Complexity_O1)->Range(1, 1 << 18)->Complexity();
-BENCHMARK(BM_Complexity_O1)->Range(1, 1 << 18)->Complexity([](int64_t) {
-  return 1.0;
-});
-
-const char *big_o_1_test_name = "BM_Complexity_O1_BigO";
-const char *rms_o_1_test_name = "BM_Complexity_O1_RMS";
-const char *enum_big_o_1 = "\\([0-9]+\\)";
-// FIXME: Tolerate both '(1)' and 'lgN' as output when the complexity is auto
-// deduced.
-// See https://github.com/google/benchmark/issues/272
-const char *auto_big_o_1 = "(\\([0-9]+\\))|(lgN)";
-const char *lambda_big_o_1 = "f\\(N\\)";
-
-// Add enum tests
-ADD_COMPLEXITY_CASES(big_o_1_test_name, rms_o_1_test_name, enum_big_o_1);
-
-// Add auto enum tests
-ADD_COMPLEXITY_CASES(big_o_1_test_name, rms_o_1_test_name, auto_big_o_1);
-
-// Add lambda tests
-ADD_COMPLEXITY_CASES(big_o_1_test_name, rms_o_1_test_name, lambda_big_o_1);
-
-// ========================================================================= //
-// --------------------------- Testing BigO O(N) --------------------------- //
-// ========================================================================= //
-
-std::vector<int> ConstructRandomVector(int64_t size) {
-  std::vector<int> v;
-  v.reserve(static_cast<int>(size));
-  for (int i = 0; i < size; ++i) {
-    v.push_back(std::rand() % size);
-  }
-  return v;
-}
-
-void BM_Complexity_O_N(benchmark::State& state) {
-  auto v = ConstructRandomVector(state.range(0));
-  // Test worst case scenario (item not in vector)
-  const int64_t item_not_in_vector = state.range(0) * 2;
-  for (auto _ : state) {
-    benchmark::DoNotOptimize(std::find(v.begin(), v.end(), item_not_in_vector));
-  }
-  state.SetComplexityN(state.range(0));
-}
-BENCHMARK(BM_Complexity_O_N)
-    ->RangeMultiplier(2)
-    ->Range(1 << 10, 1 << 16)
-    ->Complexity(benchmark::oN);
-BENCHMARK(BM_Complexity_O_N)
-    ->RangeMultiplier(2)
-    ->Range(1 << 10, 1 << 16)
-    ->Complexity([](int64_t n) -> double { return n; });
-BENCHMARK(BM_Complexity_O_N)
-    ->RangeMultiplier(2)
-    ->Range(1 << 10, 1 << 16)
-    ->Complexity();
-
-const char *big_o_n_test_name = "BM_Complexity_O_N_BigO";
-const char *rms_o_n_test_name = "BM_Complexity_O_N_RMS";
-const char *enum_auto_big_o_n = "N";
-const char *lambda_big_o_n = "f\\(N\\)";
-
-// Add enum tests
-ADD_COMPLEXITY_CASES(big_o_n_test_name, rms_o_n_test_name, enum_auto_big_o_n);
-
-// Add lambda tests
-ADD_COMPLEXITY_CASES(big_o_n_test_name, rms_o_n_test_name, lambda_big_o_n);
-
-// ========================================================================= //
-// ------------------------- Testing BigO O(N*lgN) ------------------------- //
-// ========================================================================= //
-
-static void BM_Complexity_O_N_log_N(benchmark::State& state) {
-  auto v = ConstructRandomVector(state.range(0));
-  for (auto _ : state) {
-    std::sort(v.begin(), v.end());
-  }
-  state.SetComplexityN(state.range(0));
-}
-BENCHMARK(BM_Complexity_O_N_log_N)
-    ->RangeMultiplier(2)
-    ->Range(1 << 10, 1 << 16)
-    ->Complexity(benchmark::oNLogN);
-BENCHMARK(BM_Complexity_O_N_log_N)
-    ->RangeMultiplier(2)
-    ->Range(1 << 10, 1 << 16)
-    ->Complexity([](int64_t n) { return n * log2(n); });
-BENCHMARK(BM_Complexity_O_N_log_N)
-    ->RangeMultiplier(2)
-    ->Range(1 << 10, 1 << 16)
-    ->Complexity();
-
-const char *big_o_n_lg_n_test_name = "BM_Complexity_O_N_log_N_BigO";
-const char *rms_o_n_lg_n_test_name = "BM_Complexity_O_N_log_N_RMS";
-const char *enum_auto_big_o_n_lg_n = "NlgN";
-const char *lambda_big_o_n_lg_n = "f\\(N\\)";
-
-// Add enum tests
-ADD_COMPLEXITY_CASES(big_o_n_lg_n_test_name, rms_o_n_lg_n_test_name,
-                     enum_auto_big_o_n_lg_n);
-
-// Add lambda tests
-ADD_COMPLEXITY_CASES(big_o_n_lg_n_test_name, rms_o_n_lg_n_test_name,
-                     lambda_big_o_n_lg_n);
-
-// ========================================================================= //
-// --------------------------- TEST CASES END ------------------------------ //
-// ========================================================================= //
-
-int main(int argc, char *argv[]) { RunOutputTests(argc, argv); }
diff --git a/gnu/llvm/llvm/utils/benchmark/test/cxx03_test.cc b/gnu/llvm/llvm/utils/benchmark/test/cxx03_test.cc
deleted file mode 100644
index baa9ed9262b..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/test/cxx03_test.cc
+++ /dev/null
@@ -1,63 +0,0 @@
-#undef NDEBUG
-#include <cassert>
-#include <cstddef>
-
-#include "benchmark/benchmark.h"
-
-#if __cplusplus >= 201103L
-#error C++11 or greater detected. Should be C++03.
-#endif
-
-#ifdef BENCHMARK_HAS_CXX11
-#error C++11 or greater detected by the library. BENCHMARK_HAS_CXX11 is defined.
-#endif
-
-void BM_empty(benchmark::State& state) {
-  while (state.KeepRunning()) {
-    volatile std::size_t x = state.iterations();
-    ((void)x);
-  }
-}
-BENCHMARK(BM_empty);
-
-// The new C++11 interface for args/ranges requires initializer list support.
-// Therefore we provide the old interface to support C++03.
-void BM_old_arg_range_interface(benchmark::State& state) {
-  assert((state.range(0) == 1 && state.range(1) == 2) ||
-         (state.range(0) == 5 && state.range(1) == 6));
-  while (state.KeepRunning()) {
-  }
-}
-BENCHMARK(BM_old_arg_range_interface)->ArgPair(1, 2)->RangePair(5, 5, 6, 6);
-
-template <class T, class U>
-void BM_template2(benchmark::State& state) {
-  BM_empty(state);
-}
-BENCHMARK_TEMPLATE2(BM_template2, int, long);
-
-template <class T>
-void BM_template1(benchmark::State& state) {
-  BM_empty(state);
-}
-BENCHMARK_TEMPLATE(BM_template1, long);
-BENCHMARK_TEMPLATE1(BM_template1, int);
-
-template <class T>
-struct BM_Fixture : public ::benchmark::Fixture {
-};
-
-BENCHMARK_TEMPLATE_F(BM_Fixture, BM_template1, long)(benchmark::State& state) {
-  BM_empty(state);
-}
-BENCHMARK_TEMPLATE1_F(BM_Fixture, BM_template2, int)(benchmark::State& state) {
-  BM_empty(state);
-}
-
-void BM_counters(benchmark::State& state) {
-    BM_empty(state);
-    state.counters["Foo"] = 2;
-}
-BENCHMARK(BM_counters);
-
-BENCHMARK_MAIN();
diff --git a/gnu/llvm/llvm/utils/benchmark/test/diagnostics_test.cc b/gnu/llvm/llvm/utils/benchmark/test/diagnostics_test.cc
deleted file mode 100644
index dd64a336553..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/test/diagnostics_test.cc
+++ /dev/null
@@ -1,80 +0,0 @@
-// Testing:
-//   State::PauseTiming()
-//   State::ResumeTiming()
-// Test that CHECK's within these function diagnose when they are called
-// outside of the KeepRunning() loop.
-//
-// NOTE: Users should NOT include or use src/check.h. This is only done in
-// order to test library internals.
-
-#include <cstdlib>
-#include <stdexcept>
-
-#include "../src/check.h"
-#include "benchmark/benchmark.h"
-
-#if defined(__GNUC__) && !defined(__EXCEPTIONS)
-#define TEST_HAS_NO_EXCEPTIONS
-#endif
-
-void TestHandler() {
-#ifndef TEST_HAS_NO_EXCEPTIONS
-  throw std::logic_error("");
-#else
-  std::abort();
-#endif
-}
-
-void try_invalid_pause_resume(benchmark::State& state) {
-#if !defined(TEST_BENCHMARK_LIBRARY_HAS_NO_ASSERTIONS) && !defined(TEST_HAS_NO_EXCEPTIONS)
-  try {
-    state.PauseTiming();
-    std::abort();
-  } catch (std::logic_error const&) {
-  }
-  try {
-    state.ResumeTiming();
-    std::abort();
-  } catch (std::logic_error const&) {
-  }
-#else
-  (void)state;  // avoid unused warning
-#endif
-}
-
-void BM_diagnostic_test(benchmark::State& state) {
-  static bool called_once = false;
-
-  if (called_once == false) try_invalid_pause_resume(state);
-
-  for (auto _ : state) {
-    benchmark::DoNotOptimize(state.iterations());
-  }
-
-  if (called_once == false) try_invalid_pause_resume(state);
-
-  called_once = true;
-}
-BENCHMARK(BM_diagnostic_test);
-
-
-void BM_diagnostic_test_keep_running(benchmark::State& state) {
-  static bool called_once = false;
-
-  if (called_once == false) try_invalid_pause_resume(state);
-
-  while(state.KeepRunning()) {
-    benchmark::DoNotOptimize(state.iterations());
-  }
-
-  if (called_once == false) try_invalid_pause_resume(state);
-
-  called_once = true;
-}
-BENCHMARK(BM_diagnostic_test_keep_running);
-
-int main(int argc, char* argv[]) {
-  benchmark::internal::GetAbortHandler() = &TestHandler;
-  benchmark::Initialize(&argc, argv);
-  benchmark::RunSpecifiedBenchmarks();
-}
diff --git a/gnu/llvm/llvm/utils/benchmark/test/donotoptimize_assembly_test.cc b/gnu/llvm/llvm/utils/benchmark/test/donotoptimize_assembly_test.cc
deleted file mode 100644
index d4b0bab70e7..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/test/donotoptimize_assembly_test.cc
+++ /dev/null
@@ -1,163 +0,0 @@
-#include <benchmark/benchmark.h>
-
-#ifdef __clang__
-#pragma clang diagnostic ignored "-Wreturn-type"
-#endif
-
-extern "C" {
-
-extern int ExternInt;
-extern int ExternInt2;
-extern int ExternInt3;
-
-inline int Add42(int x) { return x + 42; }
-
-struct NotTriviallyCopyable {
-  NotTriviallyCopyable();
-  explicit NotTriviallyCopyable(int x) : value(x) {}
-  NotTriviallyCopyable(NotTriviallyCopyable const&);
-  int value;
-};
-
-struct Large {
-  int value;
-  int data[2];
-};
-
-}
-// CHECK-LABEL: test_with_rvalue:
-extern "C" void test_with_rvalue() {
-  benchmark::DoNotOptimize(Add42(0));
-  // CHECK: movl $42, %eax
-  // CHECK: ret
-}
-
-// CHECK-LABEL: test_with_large_rvalue:
-extern "C" void test_with_large_rvalue() {
-  benchmark::DoNotOptimize(Large{ExternInt, {ExternInt, ExternInt}});
-  // CHECK: ExternInt(%rip)
-  // CHECK: movl %eax, -{{[0-9]+}}(%[[REG:[a-z]+]]
-  // CHECK: movl %eax, -{{[0-9]+}}(%[[REG]])
-  // CHECK: movl %eax, -{{[0-9]+}}(%[[REG]])
-  // CHECK: ret
-}
-
-// CHECK-LABEL: test_with_non_trivial_rvalue:
-extern "C" void test_with_non_trivial_rvalue() {
-  benchmark::DoNotOptimize(NotTriviallyCopyable(ExternInt));
-  // CHECK: mov{{l|q}} ExternInt(%rip)
-  // CHECK: ret
-}
-
-// CHECK-LABEL: test_with_lvalue:
-extern "C" void test_with_lvalue() {
-  int x = 101;
-  benchmark::DoNotOptimize(x);
-  // CHECK-GNU: movl $101, %eax
-  // CHECK-CLANG: movl $101, -{{[0-9]+}}(%[[REG:[a-z]+]])
-  // CHECK: ret
-}
-
-// CHECK-LABEL: test_with_large_lvalue:
-extern "C" void test_with_large_lvalue() {
-  Large L{ExternInt, {ExternInt, ExternInt}};
-  benchmark::DoNotOptimize(L);
-  // CHECK: ExternInt(%rip)
-  // CHECK: movl %eax, -{{[0-9]+}}(%[[REG:[a-z]+]])
-  // CHECK: movl %eax, -{{[0-9]+}}(%[[REG]])
-  // CHECK: movl %eax, -{{[0-9]+}}(%[[REG]])
-  // CHECK: ret
-}
-
-// CHECK-LABEL: test_with_non_trivial_lvalue:
-extern "C" void test_with_non_trivial_lvalue() {
-  NotTriviallyCopyable NTC(ExternInt);
-  benchmark::DoNotOptimize(NTC);
-  // CHECK: ExternInt(%rip)
-  // CHECK: movl %eax, -{{[0-9]+}}(%[[REG:[a-z]+]])
-  // CHECK: ret
-}
-
-// CHECK-LABEL: test_with_const_lvalue:
-extern "C" void test_with_const_lvalue() {
-  const int x = 123;
-  benchmark::DoNotOptimize(x);
-  // CHECK: movl $123, %eax
-  // CHECK: ret
-}
-
-// CHECK-LABEL: test_with_large_const_lvalue:
-extern "C" void test_with_large_const_lvalue() {
-  const Large L{ExternInt, {ExternInt, ExternInt}};
-  benchmark::DoNotOptimize(L);
-  // CHECK: ExternInt(%rip)
-  // CHECK: movl %eax, -{{[0-9]+}}(%[[REG:[a-z]+]])
-  // CHECK: movl %eax, -{{[0-9]+}}(%[[REG]])
-  // CHECK: movl %eax, -{{[0-9]+}}(%[[REG]])
-  // CHECK: ret
-}
-
-// CHECK-LABEL: test_with_non_trivial_const_lvalue:
-extern "C" void test_with_non_trivial_const_lvalue() {
-  const NotTriviallyCopyable Obj(ExternInt);
-  benchmark::DoNotOptimize(Obj);
-  // CHECK: mov{{q|l}} ExternInt(%rip)
-  // CHECK: ret
-}
-
-// CHECK-LABEL: test_div_by_two:
-extern "C" int test_div_by_two(int input) {
-  int divisor = 2;
-  benchmark::DoNotOptimize(divisor);
-  return input / divisor;
-  // CHECK: movl $2, [[DEST:.*]]
-  // CHECK: idivl [[DEST]]
-  // CHECK: ret
-}
-
-// CHECK-LABEL: test_inc_integer:
-extern "C" int test_inc_integer() {
-  int x = 0;
-  for (int i=0; i < 5; ++i)
-    benchmark::DoNotOptimize(++x);
-  // CHECK: movl $1, [[DEST:.*]]
-  // CHECK: {{(addl \$1,|incl)}} [[DEST]]
-  // CHECK: {{(addl \$1,|incl)}} [[DEST]]
-  // CHECK: {{(addl \$1,|incl)}} [[DEST]]
-  // CHECK: {{(addl \$1,|incl)}} [[DEST]]
-  // CHECK-CLANG: movl [[DEST]], %eax
-  // CHECK: ret
-  return x;
-}
-
-// CHECK-LABEL: test_pointer_rvalue
-extern "C" void test_pointer_rvalue() {
-  // CHECK: movl $42, [[DEST:.*]]
-  // CHECK: leaq [[DEST]], %rax
-  // CHECK-CLANG: movq %rax, -{{[0-9]+}}(%[[REG:[a-z]+]])
-  // CHECK: ret
-  int x = 42;
-  benchmark::DoNotOptimize(&x);
-}
-
-// CHECK-LABEL: test_pointer_const_lvalue:
-extern "C" void test_pointer_const_lvalue() {
-  // CHECK: movl $42, [[DEST:.*]]
-  // CHECK: leaq [[DEST]], %rax
-  // CHECK-CLANG: movq %rax, -{{[0-9]+}}(%[[REG:[a-z]+]])
-  // CHECK: ret
-  int x = 42;
-  int * const xp = &x;
-  benchmark::DoNotOptimize(xp);
-}
-
-// CHECK-LABEL: test_pointer_lvalue:
-extern "C" void test_pointer_lvalue() {
-  // CHECK: movl $42, [[DEST:.*]]
-  // CHECK: leaq [[DEST]], %rax
-  // CHECK-CLANG: movq %rax, -{{[0-9]+}}(%[[REG:[a-z+]+]])
-  // CHECK: ret
-  int x = 42;
-  int *xp = &x;
-  benchmark::DoNotOptimize(xp);
-}
diff --git a/gnu/llvm/llvm/utils/benchmark/test/donotoptimize_test.cc b/gnu/llvm/llvm/utils/benchmark/test/donotoptimize_test.cc
deleted file mode 100644
index 2ce92d1c72b..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/test/donotoptimize_test.cc
+++ /dev/null
@@ -1,52 +0,0 @@
-#include "benchmark/benchmark.h"
-
-#include <cstdint>
-
-namespace {
-#if defined(__GNUC__)
-std::uint64_t double_up(const std::uint64_t x) __attribute__((const));
-#endif
-std::uint64_t double_up(const std::uint64_t x) { return x * 2; }
-}
-
-// Using DoNotOptimize on types like BitRef seem to cause a lot of problems
-// with the inline assembly on both GCC and Clang.
-struct BitRef {
-  int index;
-  unsigned char &byte;
-
-public:
-  static BitRef Make() {
-    static unsigned char arr[2] = {};
-    BitRef b(1, arr[0]);
-    return b;
-  }
-private:
-  BitRef(int i, unsigned char& b) : index(i), byte(b) {}
-};
-
-int main(int, char*[]) {
-  // this test verifies compilation of DoNotOptimize() for some types
-
-  char buffer8[8] = "";
-  benchmark::DoNotOptimize(buffer8);
-
-  char buffer20[20] = "";
-  benchmark::DoNotOptimize(buffer20);
-
-  char buffer1024[1024] = "";
-  benchmark::DoNotOptimize(buffer1024);
-  benchmark::DoNotOptimize(&buffer1024[0]);
-
-  int x = 123;
-  benchmark::DoNotOptimize(x);
-  benchmark::DoNotOptimize(&x);
-  benchmark::DoNotOptimize(x += 42);
-
-  benchmark::DoNotOptimize(double_up(x));
-
-  // These tests are to e
-  benchmark::DoNotOptimize(BitRef::Make());
-  BitRef lval = BitRef::Make();
-  benchmark::DoNotOptimize(lval);
-}
diff --git a/gnu/llvm/llvm/utils/benchmark/test/filter_test.cc b/gnu/llvm/llvm/utils/benchmark/test/filter_test.cc
deleted file mode 100644
index 0e27065c155..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/test/filter_test.cc
+++ /dev/null
@@ -1,104 +0,0 @@
-#include "benchmark/benchmark.h"
-
-#include <cassert>
-#include <cmath>
-#include <cstdint>
-#include <cstdlib>
-
-#include <iostream>
-#include <limits>
-#include <sstream>
-#include <string>
-
-namespace {
-
-class TestReporter : public benchmark::ConsoleReporter {
- public:
-  virtual bool ReportContext(const Context& context) {
-    return ConsoleReporter::ReportContext(context);
-  };
-
-  virtual void ReportRuns(const std::vector<Run>& report) {
-    ++count_;
-    ConsoleReporter::ReportRuns(report);
-  };
-
-  TestReporter() : count_(0) {}
-
-  virtual ~TestReporter() {}
-
-  size_t GetCount() const { return count_; }
-
- private:
-  mutable size_t count_;
-};
-
-}  // end namespace
-
-static void NoPrefix(benchmark::State& state) {
-  for (auto _ : state) {
-  }
-}
-BENCHMARK(NoPrefix);
-
-static void BM_Foo(benchmark::State& state) {
-  for (auto _ : state) {
-  }
-}
-BENCHMARK(BM_Foo);
-
-static void BM_Bar(benchmark::State& state) {
-  for (auto _ : state) {
-  }
-}
-BENCHMARK(BM_Bar);
-
-static void BM_FooBar(benchmark::State& state) {
-  for (auto _ : state) {
-  }
-}
-BENCHMARK(BM_FooBar);
-
-static void BM_FooBa(benchmark::State& state) {
-  for (auto _ : state) {
-  }
-}
-BENCHMARK(BM_FooBa);
-
-int main(int argc, char **argv) {
-  bool list_only = false;
-  for (int i = 0; i < argc; ++i)
-    list_only |= std::string(argv[i]).find("--benchmark_list_tests") !=
-                 std::string::npos;
-
-  benchmark::Initialize(&argc, argv);
-
-  TestReporter test_reporter;
-  const size_t returned_count =
-      benchmark::RunSpecifiedBenchmarks(&test_reporter);
-
-  if (argc == 2) {
-    // Make sure we ran all of the tests
-    std::stringstream ss(argv[1]);
-    size_t expected_return;
-    ss >> expected_return;
-
-    if (returned_count != expected_return) {
-      std::cerr << "ERROR: Expected " << expected_return
-                << " tests to match the filter but returned_count = "
-                << returned_count << std::endl;
-      return -1;
-    }
-
-    const size_t expected_reports = list_only ? 0 : expected_return;
-    const size_t reports_count = test_reporter.GetCount();
-    if (reports_count != expected_reports) {
-      std::cerr << "ERROR: Expected " << expected_reports
-                << " tests to be run but reported_count = " << reports_count
-                << std::endl;
-      return -1;
-    }
-  }
-
-  return 0;
-}
diff --git a/gnu/llvm/llvm/utils/benchmark/test/fixture_test.cc b/gnu/llvm/llvm/utils/benchmark/test/fixture_test.cc
deleted file mode 100644
index 1462b10f02f..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/test/fixture_test.cc
+++ /dev/null
@@ -1,49 +0,0 @@
-
-#include "benchmark/benchmark.h"
-
-#include <cassert>
-#include <memory>
-
-class MyFixture : public ::benchmark::Fixture {
- public:
-  void SetUp(const ::benchmark::State& state) {
-    if (state.thread_index == 0) {
-      assert(data.get() == nullptr);
-      data.reset(new int(42));
-    }
-  }
-
-  void TearDown(const ::benchmark::State& state) {
-    if (state.thread_index == 0) {
-      assert(data.get() != nullptr);
-      data.reset();
-    }
-  }
-
-  ~MyFixture() { assert(data == nullptr); }
-
-  std::unique_ptr<int> data;
-};
-
-BENCHMARK_F(MyFixture, Foo)(benchmark::State &st) {
-  assert(data.get() != nullptr);
-  assert(*data == 42);
-  for (auto _ : st) {
-  }
-}
-
-BENCHMARK_DEFINE_F(MyFixture, Bar)(benchmark::State& st) {
-  if (st.thread_index == 0) {
-    assert(data.get() != nullptr);
-    assert(*data == 42);
-  }
-  for (auto _ : st) {
-    assert(data.get() != nullptr);
-    assert(*data == 42);
-  }
-  st.SetItemsProcessed(st.range(0));
-}
-BENCHMARK_REGISTER_F(MyFixture, Bar)->Arg(42);
-BENCHMARK_REGISTER_F(MyFixture, Bar)->Arg(42)->ThreadPerCpu();
-
-BENCHMARK_MAIN();
diff --git a/gnu/llvm/llvm/utils/benchmark/test/link_main_test.cc b/gnu/llvm/llvm/utils/benchmark/test/link_main_test.cc
deleted file mode 100644
index 241ad5c3905..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/test/link_main_test.cc
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "benchmark/benchmark.h"
-
-void BM_empty(benchmark::State& state) {
-  for (auto _ : state) {
-    benchmark::DoNotOptimize(state.iterations());
-  }
-}
-BENCHMARK(BM_empty);
diff --git a/gnu/llvm/llvm/utils/benchmark/test/map_test.cc b/gnu/llvm/llvm/utils/benchmark/test/map_test.cc
deleted file mode 100644
index dbf7982a368..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/test/map_test.cc
+++ /dev/null
@@ -1,57 +0,0 @@
-#include "benchmark/benchmark.h"
-
-#include <cstdlib>
-#include <map>
-
-namespace {
-
-std::map<int, int> ConstructRandomMap(int size) {
-  std::map<int, int> m;
-  for (int i = 0; i < size; ++i) {
-    m.insert(std::make_pair(std::rand() % size, std::rand() % size));
-  }
-  return m;
-}
-
-}  // namespace
-
-// Basic version.
-static void BM_MapLookup(benchmark::State& state) {
-  const int size = static_cast<int>(state.range(0));
-  std::map<int, int> m;
-  for (auto _ : state) {
-    state.PauseTiming();
-    m = ConstructRandomMap(size);
-    state.ResumeTiming();
-    for (int i = 0; i < size; ++i) {
-      benchmark::DoNotOptimize(m.find(std::rand() % size));
-    }
-  }
-  state.SetItemsProcessed(state.iterations() * size);
-}
-BENCHMARK(BM_MapLookup)->Range(1 << 3, 1 << 12);
-
-// Using fixtures.
-class MapFixture : public ::benchmark::Fixture {
- public:
-  void SetUp(const ::benchmark::State& st) {
-    m = ConstructRandomMap(static_cast<int>(st.range(0)));
-  }
-
-  void TearDown(const ::benchmark::State&) { m.clear(); }
-
-  std::map<int, int> m;
-};
-
-BENCHMARK_DEFINE_F(MapFixture, Lookup)(benchmark::State& state) {
-  const int size = static_cast<int>(state.range(0));
-  for (auto _ : state) {
-    for (int i = 0; i < size; ++i) {
-      benchmark::DoNotOptimize(m.find(std::rand() % size));
-    }
-  }
-  state.SetItemsProcessed(state.iterations() * size);
-}
-BENCHMARK_REGISTER_F(MapFixture, Lookup)->Range(1 << 3, 1 << 12);
-
-BENCHMARK_MAIN();
diff --git a/gnu/llvm/llvm/utils/benchmark/test/multiple_ranges_test.cc b/gnu/llvm/llvm/utils/benchmark/test/multiple_ranges_test.cc
deleted file mode 100644
index c64acabc25c..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/test/multiple_ranges_test.cc
+++ /dev/null
@@ -1,97 +0,0 @@
-#include "benchmark/benchmark.h"
-
-#include <cassert>
-#include <iostream>
-#include <set>
-#include <vector>
-
-class MultipleRangesFixture : public ::benchmark::Fixture {
- public:
-  MultipleRangesFixture()
-      : expectedValues({{1, 3, 5},
-                        {1, 3, 8},
-                        {1, 3, 15},
-                        {2, 3, 5},
-                        {2, 3, 8},
-                        {2, 3, 15},
-                        {1, 4, 5},
-                        {1, 4, 8},
-                        {1, 4, 15},
-                        {2, 4, 5},
-                        {2, 4, 8},
-                        {2, 4, 15},
-                        {1, 7, 5},
-                        {1, 7, 8},
-                        {1, 7, 15},
-                        {2, 7, 5},
-                        {2, 7, 8},
-                        {2, 7, 15},
-                        {7, 6, 3}}) {}
-
-  void SetUp(const ::benchmark::State& state) {
-    std::vector<int64_t> ranges = {state.range(0), state.range(1),
-                                   state.range(2)};
-
-    assert(expectedValues.find(ranges) != expectedValues.end());
-
-    actualValues.insert(ranges);
-  }
-
-  // NOTE: This is not TearDown as we want to check after _all_ runs are
-  // complete.
-  virtual ~MultipleRangesFixture() {
-    assert(actualValues.size() == expectedValues.size());
-    if (actualValues.size() != expectedValues.size()) {
-      std::cout << "EXPECTED\n";
-      for (auto v : expectedValues) {
-        std::cout << "{";
-        for (int64_t iv : v) {
-          std::cout << iv << ", ";
-        }
-        std::cout << "}\n";
-      }
-      std::cout << "ACTUAL\n";
-      for (auto v : actualValues) {
-        std::cout << "{";
-        for (int64_t iv : v) {
-          std::cout << iv << ", ";
-        }
-        std::cout << "}\n";
-      }
-    }
-  }
-
-  std::set<std::vector<int64_t>> expectedValues;
-  std::set<std::vector<int64_t>> actualValues;
-};
-
-BENCHMARK_DEFINE_F(MultipleRangesFixture, Empty)(benchmark::State& state) {
-  for (auto _ : state) {
-    int64_t product = state.range(0) * state.range(1) * state.range(2);
-    for (int64_t x = 0; x < product; x++) {
-      benchmark::DoNotOptimize(x);
-    }
-  }
-}
-
-BENCHMARK_REGISTER_F(MultipleRangesFixture, Empty)
-    ->RangeMultiplier(2)
-    ->Ranges({{1, 2}, {3, 7}, {5, 15}})
-    ->Args({7, 6, 3});
-
-void BM_CheckDefaultArgument(benchmark::State& state) {
-  // Test that the 'range()' without an argument is the same as 'range(0)'.
-  assert(state.range() == state.range(0));
-  assert(state.range() != state.range(1));
-  for (auto _ : state) {
-  }
-}
-BENCHMARK(BM_CheckDefaultArgument)->Ranges({{1, 5}, {6, 10}});
-
-static void BM_MultipleRanges(benchmark::State& st) {
-  for (auto _ : st) {
-  }
-}
-BENCHMARK(BM_MultipleRanges)->Ranges({{5, 5}, {6, 6}});
-
-BENCHMARK_MAIN();
diff --git a/gnu/llvm/llvm/utils/benchmark/test/options_test.cc b/gnu/llvm/llvm/utils/benchmark/test/options_test.cc
deleted file mode 100644
index fdec69174ee..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/test/options_test.cc
+++ /dev/null
@@ -1,65 +0,0 @@
-#include "benchmark/benchmark.h"
-#include <chrono>
-#include <thread>
-
-#if defined(NDEBUG)
-#undef NDEBUG
-#endif
-#include <cassert>
-
-void BM_basic(benchmark::State& state) {
-  for (auto _ : state) {
-  }
-}
-
-void BM_basic_slow(benchmark::State& state) {
-  std::chrono::milliseconds sleep_duration(state.range(0));
-  for (auto _ : state) {
-    std::this_thread::sleep_for(
-        std::chrono::duration_cast<std::chrono::nanoseconds>(sleep_duration));
-  }
-}
-
-BENCHMARK(BM_basic);
-BENCHMARK(BM_basic)->Arg(42);
-BENCHMARK(BM_basic_slow)->Arg(10)->Unit(benchmark::kNanosecond);
-BENCHMARK(BM_basic_slow)->Arg(100)->Unit(benchmark::kMicrosecond);
-BENCHMARK(BM_basic_slow)->Arg(1000)->Unit(benchmark::kMillisecond);
-BENCHMARK(BM_basic)->Range(1, 8);
-BENCHMARK(BM_basic)->RangeMultiplier(2)->Range(1, 8);
-BENCHMARK(BM_basic)->DenseRange(10, 15);
-BENCHMARK(BM_basic)->Args({42, 42});
-BENCHMARK(BM_basic)->Ranges({{64, 512}, {64, 512}});
-BENCHMARK(BM_basic)->MinTime(0.7);
-BENCHMARK(BM_basic)->UseRealTime();
-BENCHMARK(BM_basic)->ThreadRange(2, 4);
-BENCHMARK(BM_basic)->ThreadPerCpu();
-BENCHMARK(BM_basic)->Repetitions(3);
-
-void CustomArgs(benchmark::internal::Benchmark* b) {
-  for (int i = 0; i < 10; ++i) {
-    b->Arg(i);
-  }
-}
-
-BENCHMARK(BM_basic)->Apply(CustomArgs);
-
-void BM_explicit_iteration_count(benchmark::State& state) {
-  // Test that benchmarks specified with an explicit iteration count are
-  // only run once.
-  static bool invoked_before = false;
-  assert(!invoked_before);
-  invoked_before = true;
-
-  // Test that the requested iteration count is respected.
-  assert(state.max_iterations == 42);
-  size_t actual_iterations = 0;
-  for (auto _ : state)
-    ++actual_iterations;
-  assert(state.iterations() == state.max_iterations);
-  assert(state.iterations() == 42);
-
-}
-BENCHMARK(BM_explicit_iteration_count)->Iterations(42);
-
-BENCHMARK_MAIN();
diff --git a/gnu/llvm/llvm/utils/benchmark/test/output_test.h b/gnu/llvm/llvm/utils/benchmark/test/output_test.h
deleted file mode 100644
index 897a13866ba..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/test/output_test.h
+++ /dev/null
@@ -1,201 +0,0 @@
-#ifndef TEST_OUTPUT_TEST_H
-#define TEST_OUTPUT_TEST_H
-
-#undef NDEBUG
-#include <initializer_list>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-#include <functional>
-#include <sstream>
-
-#include "../src/re.h"
-#include "benchmark/benchmark.h"
-
-#define CONCAT2(x, y) x##y
-#define CONCAT(x, y) CONCAT2(x, y)
-
-#define ADD_CASES(...) int CONCAT(dummy, __LINE__) = ::AddCases(__VA_ARGS__)
-
-#define SET_SUBSTITUTIONS(...) \
-  int CONCAT(dummy, __LINE__) = ::SetSubstitutions(__VA_ARGS__)
-
-enum MatchRules {
-  MR_Default,  // Skip non-matching lines until a match is found.
-  MR_Next,     // Match must occur on the next line.
-  MR_Not  // No line between the current position and the next match matches
-          // the regex
-};
-
-struct TestCase {
-  TestCase(std::string re, int rule = MR_Default);
-
-  std::string regex_str;
-  int match_rule;
-  std::string substituted_regex;
-  std::shared_ptr<benchmark::Regex> regex;
-};
-
-enum TestCaseID {
-  TC_ConsoleOut,
-  TC_ConsoleErr,
-  TC_JSONOut,
-  TC_JSONErr,
-  TC_CSVOut,
-  TC_CSVErr,
-
-  TC_NumID  // PRIVATE
-};
-
-// Add a list of test cases to be run against the output specified by
-// 'ID'
-int AddCases(TestCaseID ID, std::initializer_list<TestCase> il);
-
-// Add or set a list of substitutions to be performed on constructed regex's
-// See 'output_test_helper.cc' for a list of default substitutions.
-int SetSubstitutions(
-    std::initializer_list<std::pair<std::string, std::string>> il);
-
-// Run all output tests.
-void RunOutputTests(int argc, char* argv[]);
-
-// ========================================================================= //
-// ------------------------- Results checking ------------------------------ //
-// ========================================================================= //
-
-// Call this macro to register a benchmark for checking its results. This
-// should be all that's needed. It subscribes a function to check the (CSV)
-// results of a benchmark. This is done only after verifying that the output
-// strings are really as expected.
-// bm_name_pattern: a name or a regex pattern which will be matched against
-//                  all the benchmark names. Matching benchmarks
-//                  will be the subject of a call to checker_function
-// checker_function: should be of type ResultsCheckFn (see below)
-#define CHECK_BENCHMARK_RESULTS(bm_name_pattern, checker_function) \
-    size_t CONCAT(dummy, __LINE__) = AddChecker(bm_name_pattern, checker_function)
-
-struct Results;
-typedef std::function< void(Results const&) > ResultsCheckFn;
-
-size_t AddChecker(const char* bm_name_pattern, ResultsCheckFn fn);
-
-// Class holding the results of a benchmark.
-// It is passed in calls to checker functions.
-struct Results {
-
-  // the benchmark name
-  std::string name;
-  // the benchmark fields
-  std::map< std::string, std::string > values;
-
-  Results(const std::string& n) : name(n) {}
-
-  int NumThreads() const;
-
-  typedef enum { kCpuTime, kRealTime } BenchmarkTime;
-
-  // get cpu_time or real_time in seconds
-  double GetTime(BenchmarkTime which) const;
-
-  // get the real_time duration of the benchmark in seconds.
-  // it is better to use fuzzy float checks for this, as the float
-  // ASCII formatting is lossy.
-  double DurationRealTime() const {
-    return GetAs< double >("iterations") * GetTime(kRealTime);
-  }
-  // get the cpu_time duration of the benchmark in seconds
-  double DurationCPUTime() const {
-    return GetAs< double >("iterations") * GetTime(kCpuTime);
-  }
-
-  // get the string for a result by name, or nullptr if the name
-  // is not found
-  const std::string* Get(const char* entry_name) const {
-    auto it = values.find(entry_name);
-    if(it == values.end()) return nullptr;
-    return &it->second;
-  }
-
-  // get a result by name, parsed as a specific type.
-  // NOTE: for counters, use GetCounterAs instead.
-  template <class T>
-  T GetAs(const char* entry_name) const;
-
-  // counters are written as doubles, so they have to be read first
-  // as a double, and only then converted to the asked type.
-  template <class T>
-  T GetCounterAs(const char* entry_name) const {
-    double dval = GetAs< double >(entry_name);
-    T tval = static_cast< T >(dval);
-    return tval;
-  }
-};
-
-template <class T>
-T Results::GetAs(const char* entry_name) const {
-  auto *sv = Get(entry_name);
-  CHECK(sv != nullptr && !sv->empty());
-  std::stringstream ss;
-  ss << *sv;
-  T out;
-  ss >> out;
-  CHECK(!ss.fail());
-  return out;
-}
-
-//----------------------------------
-// Macros to help in result checking. Do not use them with arguments causing
-// side-effects.
-
-#define _CHECK_RESULT_VALUE(entry, getfn, var_type, var_name, relationship, value) \
-    CONCAT(CHECK_, relationship)                                        \
-    (entry.getfn< var_type >(var_name), (value)) << "\n"                \
-    << __FILE__ << ":" << __LINE__ << ": " << (entry).name << ":\n"     \
-    << __FILE__ << ":" << __LINE__ << ": "                              \
-    << "expected (" << #var_type << ")" << (var_name)                   \
-    << "=" << (entry).getfn< var_type >(var_name)                       \
-    << " to be " #relationship " to " << (value) << "\n"
-
-// check with tolerance. eps_factor is the tolerance window, which is
-// interpreted relative to value (eg, 0.1 means 10% of value).
-#define _CHECK_FLOAT_RESULT_VALUE(entry, getfn, var_type, var_name, relationship, value, eps_factor) \
-    CONCAT(CHECK_FLOAT_, relationship)                                  \
-    (entry.getfn< var_type >(var_name), (value), (eps_factor) * (value)) << "\n" \
-    << __FILE__ << ":" << __LINE__ << ": " << (entry).name << ":\n"     \
-    << __FILE__ << ":" << __LINE__ << ": "                              \
-    << "expected (" << #var_type << ")" << (var_name)                   \
-    << "=" << (entry).getfn< var_type >(var_name)                       \
-    << " to be " #relationship " to " << (value) << "\n"                \
-    << __FILE__ << ":" << __LINE__ << ": "                              \
-    << "with tolerance of " << (eps_factor) * (value)                   \
-    << " (" << (eps_factor)*100. << "%), "                              \
-    << "but delta was " << ((entry).getfn< var_type >(var_name) - (value)) \
-    << " (" << (((entry).getfn< var_type >(var_name) - (value))         \
-               /                                                        \
-               ((value) > 1.e-5 || value < -1.e-5 ? value : 1.e-5)*100.) \
-    << "%)"
-
-#define CHECK_RESULT_VALUE(entry, var_type, var_name, relationship, value) \
-    _CHECK_RESULT_VALUE(entry, GetAs, var_type, var_name, relationship, value)
-
-#define CHECK_COUNTER_VALUE(entry, var_type, var_name, relationship, value) \
-    _CHECK_RESULT_VALUE(entry, GetCounterAs, var_type, var_name, relationship, value)
-
-#define CHECK_FLOAT_RESULT_VALUE(entry, var_name, relationship, value, eps_factor) \
-    _CHECK_FLOAT_RESULT_VALUE(entry, GetAs, double, var_name, relationship, value, eps_factor)
-
-#define CHECK_FLOAT_COUNTER_VALUE(entry, var_name, relationship, value, eps_factor) \
-    _CHECK_FLOAT_RESULT_VALUE(entry, GetCounterAs, double, var_name, relationship, value, eps_factor)
-
-// ========================================================================= //
-// --------------------------- Misc Utilities ------------------------------ //
-// ========================================================================= //
-
-namespace {
-
-const char* const dec_re = "[0-9]*[.]?[0-9]+([eE][-+][0-9]+)?";
-
-}  //  end namespace
-
-#endif  // TEST_OUTPUT_TEST_H
diff --git a/gnu/llvm/llvm/utils/benchmark/test/output_test_helper.cc b/gnu/llvm/llvm/utils/benchmark/test/output_test_helper.cc
deleted file mode 100644
index 6b18fe43593..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/test/output_test_helper.cc
+++ /dev/null
@@ -1,423 +0,0 @@
-#include <iostream>
-#include <map>
-#include <memory>
-#include <sstream>
-#include <cstring>
-
-#include "../src/check.h"  // NOTE: check.h is for internal use only!
-#include "../src/re.h"     // NOTE: re.h is for internal use only
-#include "output_test.h"
-#include "../src/benchmark_api_internal.h"
-
-// ========================================================================= //
-// ------------------------------ Internals -------------------------------- //
-// ========================================================================= //
-namespace internal {
-namespace {
-
-using TestCaseList = std::vector<TestCase>;
-
-// Use a vector because the order elements are added matters during iteration.
-// std::map/unordered_map don't guarantee that.
-// For example:
-//  SetSubstitutions({{"%HelloWorld", "Hello"}, {"%Hello", "Hi"}});
-//     Substitute("%HelloWorld") // Always expands to Hello.
-using SubMap = std::vector<std::pair<std::string, std::string>>;
-
-TestCaseList& GetTestCaseList(TestCaseID ID) {
-  // Uses function-local statics to ensure initialization occurs
-  // before first use.
-  static TestCaseList lists[TC_NumID];
-  return lists[ID];
-}
-
-SubMap& GetSubstitutions() {
-  // Don't use 'dec_re' from header because it may not yet be initialized.
-  static std::string safe_dec_re = "[0-9]*[.]?[0-9]+([eE][-+][0-9]+)?";
-  static SubMap map = {
-      {"%float", "[0-9]*[.]?[0-9]+([eE][-+][0-9]+)?"},
-      // human-readable float
-      {"%hrfloat", "[0-9]*[.]?[0-9]+([eE][-+][0-9]+)?[kMGTPEZYmunpfazy]?"},
-      {"%int", "[ ]*[0-9]+"},
-      {" %s ", "[ ]+"},
-      {"%time", "[ ]*[0-9]{1,6} ns"},
-      {"%console_report", "[ ]*[0-9]{1,6} ns [ ]*[0-9]{1,6} ns [ ]*[0-9]+"},
-      {"%console_us_report", "[ ]*[0-9] us [ ]*[0-9] us [ ]*[0-9]+"},
-      {"%csv_header",
-       "name,iterations,real_time,cpu_time,time_unit,bytes_per_second,"
-       "items_per_second,label,error_occurred,error_message"},
-      {"%csv_report", "[0-9]+," + safe_dec_re + "," + safe_dec_re + ",ns,,,,,"},
-      {"%csv_us_report", "[0-9]+," + safe_dec_re + "," + safe_dec_re + ",us,,,,,"},
-      {"%csv_bytes_report",
-       "[0-9]+," + safe_dec_re + "," + safe_dec_re + ",ns," + safe_dec_re + ",,,,"},
-      {"%csv_items_report",
-       "[0-9]+," + safe_dec_re + "," + safe_dec_re + ",ns,," + safe_dec_re + ",,,"},
-      {"%csv_bytes_items_report",
-       "[0-9]+," + safe_dec_re + "," + safe_dec_re + ",ns," + safe_dec_re +
-       "," + safe_dec_re + ",,,"},
-      {"%csv_label_report_begin", "[0-9]+," + safe_dec_re + "," + safe_dec_re + ",ns,,,"},
-      {"%csv_label_report_end", ",,"}};
-  return map;
-}
-
-std::string PerformSubstitutions(std::string source) {
-  SubMap const& subs = GetSubstitutions();
-  using SizeT = std::string::size_type;
-  for (auto const& KV : subs) {
-    SizeT pos;
-    SizeT next_start = 0;
-    while ((pos = source.find(KV.first, next_start)) != std::string::npos) {
-      next_start = pos + KV.second.size();
-      source.replace(pos, KV.first.size(), KV.second);
-    }
-  }
-  return source;
-}
-
-void CheckCase(std::stringstream& remaining_output, TestCase const& TC,
-               TestCaseList const& not_checks) {
-  std::string first_line;
-  bool on_first = true;
-  std::string line;
-  while (remaining_output.eof() == false) {
-    CHECK(remaining_output.good());
-    std::getline(remaining_output, line);
-    if (on_first) {
-      first_line = line;
-      on_first = false;
-    }
-    for (const auto& NC : not_checks) {
-      CHECK(!NC.regex->Match(line))
-          << "Unexpected match for line \"" << line << "\" for MR_Not regex \""
-          << NC.regex_str << "\""
-          << "\n    actual regex string \"" << TC.substituted_regex << "\""
-          << "\n    started matching near: " << first_line;
-    }
-    if (TC.regex->Match(line)) return;
-    CHECK(TC.match_rule != MR_Next)
-        << "Expected line \"" << line << "\" to match regex \"" << TC.regex_str
-        << "\""
-        << "\n    actual regex string \"" << TC.substituted_regex << "\""
-        << "\n    started matching near: " << first_line;
-  }
-  CHECK(remaining_output.eof() == false)
-      << "End of output reached before match for regex \"" << TC.regex_str
-      << "\" was found"
-      << "\n    actual regex string \"" << TC.substituted_regex << "\""
-      << "\n    started matching near: " << first_line;
-}
-
-void CheckCases(TestCaseList const& checks, std::stringstream& output) {
-  std::vector<TestCase> not_checks;
-  for (size_t i = 0; i < checks.size(); ++i) {
-    const auto& TC = checks[i];
-    if (TC.match_rule == MR_Not) {
-      not_checks.push_back(TC);
-      continue;
-    }
-    CheckCase(output, TC, not_checks);
-    not_checks.clear();
-  }
-}
-
-class TestReporter : public benchmark::BenchmarkReporter {
- public:
-  TestReporter(std::vector<benchmark::BenchmarkReporter*> reps)
-      : reporters_(reps) {}
-
-  virtual bool ReportContext(const Context& context) {
-    bool last_ret = false;
-    bool first = true;
-    for (auto rep : reporters_) {
-      bool new_ret = rep->ReportContext(context);
-      CHECK(first || new_ret == last_ret)
-          << "Reports return different values for ReportContext";
-      first = false;
-      last_ret = new_ret;
-    }
-    (void)first;
-    return last_ret;
-  }
-
-  void ReportRuns(const std::vector<Run>& report) {
-    for (auto rep : reporters_) rep->ReportRuns(report);
-  }
-  void Finalize() {
-    for (auto rep : reporters_) rep->Finalize();
-  }
-
- private:
-  std::vector<benchmark::BenchmarkReporter *> reporters_;
-};
-}
-
-}  // end namespace internal
-
-// ========================================================================= //
-// -------------------------- Results checking ----------------------------- //
-// ========================================================================= //
-
-namespace internal {
-
-// Utility class to manage subscribers for checking benchmark results.
-// It works by parsing the CSV output to read the results.
-class ResultsChecker {
- public:
-
-  struct PatternAndFn : public TestCase { // reusing TestCase for its regexes
-    PatternAndFn(const std::string& rx, ResultsCheckFn fn_)
-    : TestCase(rx), fn(fn_) {}
-    ResultsCheckFn fn;
-  };
-
-  std::vector< PatternAndFn > check_patterns;
-  std::vector< Results > results;
-  std::vector< std::string > field_names;
-
-  void Add(const std::string& entry_pattern, ResultsCheckFn fn);
-
-  void CheckResults(std::stringstream& output);
-
- private:
-
-  void SetHeader_(const std::string& csv_header);
-  void SetValues_(const std::string& entry_csv_line);
-
-  std::vector< std::string > SplitCsv_(const std::string& line);
-
-};
-
-// store the static ResultsChecker in a function to prevent initialization
-// order problems
-ResultsChecker& GetResultsChecker() {
-  static ResultsChecker rc;
-  return rc;
-}
-
-// add a results checker for a benchmark
-void ResultsChecker::Add(const std::string& entry_pattern, ResultsCheckFn fn) {
-  check_patterns.emplace_back(entry_pattern, fn);
-}
-
-// check the results of all subscribed benchmarks
-void ResultsChecker::CheckResults(std::stringstream& output) {
-  // first reset the stream to the start
-  {
-    auto start = std::ios::streampos(0);
-    // clear before calling tellg()
-    output.clear();
-    // seek to zero only when needed
-    if(output.tellg() > start) output.seekg(start);
-    // and just in case
-    output.clear();
-  }
-  // now go over every line and publish it to the ResultsChecker
-  std::string line;
-  bool on_first = true;
-  while (output.eof() == false) {
-    CHECK(output.good());
-    std::getline(output, line);
-    if (on_first) {
-      SetHeader_(line); // this is important
-      on_first = false;
-      continue;
-    }
-    SetValues_(line);
-  }
-  // finally we can call the subscribed check functions
-  for(const auto& p : check_patterns) {
-    VLOG(2) << "--------------------------------\n";
-    VLOG(2) << "checking for benchmarks matching " << p.regex_str << "...\n";
-    for(const auto& r : results) {
-      if(!p.regex->Match(r.name)) {
-        VLOG(2) << p.regex_str << " is not matched by " << r.name << "\n";
-        continue;
-      } else {
-        VLOG(2) << p.regex_str << " is matched by " << r.name << "\n";
-      }
-      VLOG(1) << "Checking results of " << r.name << ": ... \n";
-      p.fn(r);
-      VLOG(1) << "Checking results of " << r.name << ": OK.\n";
-    }
-  }
-}
-
-// prepare for the names in this header
-void ResultsChecker::SetHeader_(const std::string& csv_header) {
-  field_names = SplitCsv_(csv_header);
-}
-
-// set the values for a benchmark
-void ResultsChecker::SetValues_(const std::string& entry_csv_line) {
-  if(entry_csv_line.empty()) return; // some lines are empty
-  CHECK(!field_names.empty());
-  auto vals = SplitCsv_(entry_csv_line);
-  CHECK_EQ(vals.size(), field_names.size());
-  results.emplace_back(vals[0]); // vals[0] is the benchmark name
-  auto &entry = results.back();
-  for (size_t i = 1, e = vals.size(); i < e; ++i) {
-    entry.values[field_names[i]] = vals[i];
-  }
-}
-
-// a quick'n'dirty csv splitter (eliminating quotes)
-std::vector< std::string > ResultsChecker::SplitCsv_(const std::string& line) {
-  std::vector< std::string > out;
-  if(line.empty()) return out;
-  if(!field_names.empty()) out.reserve(field_names.size());
-  size_t prev = 0, pos = line.find_first_of(','), curr = pos;
-  while(pos != line.npos) {
-    CHECK(curr > 0);
-    if(line[prev] == '"') ++prev;
-    if(line[curr-1] == '"') --curr;
-    out.push_back(line.substr(prev, curr-prev));
-    prev = pos + 1;
-    pos = line.find_first_of(',', pos + 1);
-    curr = pos;
-  }
-  curr = line.size();
-  if(line[prev] == '"') ++prev;
-  if(line[curr-1] == '"') --curr;
-  out.push_back(line.substr(prev, curr-prev));
-  return out;
-}
-
-}  // end namespace internal
-
-size_t AddChecker(const char* bm_name, ResultsCheckFn fn)
-{
-  auto &rc = internal::GetResultsChecker();
-  rc.Add(bm_name, fn);
-  return rc.results.size();
-}
-
-int Results::NumThreads() const {
-  auto pos = name.find("/threads:");
-  if(pos == name.npos) return 1;
-  auto end = name.find('/', pos + 9);
-  std::stringstream ss;
-  ss << name.substr(pos + 9, end);
-  int num = 1;
-  ss >> num;
-  CHECK(!ss.fail());
-  return num;
-}
-
-double Results::GetTime(BenchmarkTime which) const {
-  CHECK(which == kCpuTime || which == kRealTime);
-  const char *which_str = which == kCpuTime ? "cpu_time" : "real_time";
-  double val = GetAs< double >(which_str);
-  auto unit = Get("time_unit");
-  CHECK(unit);
-  if(*unit == "ns") {
-    return val * 1.e-9;
-  } else if(*unit == "us") {
-    return val * 1.e-6;
-  } else if(*unit == "ms") {
-    return val * 1.e-3;
-  } else if(*unit == "s") {
-    return val;
-  } else {
-    CHECK(1 == 0) << "unknown time unit: " << *unit;
-    return 0;
-  }
-}
-
-// ========================================================================= //
-// -------------------------- Public API Definitions------------------------ //
-// ========================================================================= //
-
-TestCase::TestCase(std::string re, int rule)
-    : regex_str(std::move(re)),
-      match_rule(rule),
-      substituted_regex(internal::PerformSubstitutions(regex_str)),
-      regex(std::make_shared<benchmark::Regex>()) {
-  std::string err_str;
-  regex->Init(substituted_regex,& err_str);
-  CHECK(err_str.empty()) << "Could not construct regex \"" << substituted_regex
-                         << "\""
-                         << "\n    originally \"" << regex_str << "\""
-                         << "\n    got error: " << err_str;
-}
-
-int AddCases(TestCaseID ID, std::initializer_list<TestCase> il) {
-  auto& L = internal::GetTestCaseList(ID);
-  L.insert(L.end(), il);
-  return 0;
-}
-
-int SetSubstitutions(
-    std::initializer_list<std::pair<std::string, std::string>> il) {
-  auto& subs = internal::GetSubstitutions();
-  for (auto KV : il) {
-    bool exists = false;
-    KV.second = internal::PerformSubstitutions(KV.second);
-    for (auto& EKV : subs) {
-      if (EKV.first == KV.first) {
-        EKV.second = std::move(KV.second);
-        exists = true;
-        break;
-      }
-    }
-    if (!exists) subs.push_back(std::move(KV));
-  }
-  return 0;
-}
-
-void RunOutputTests(int argc, char* argv[]) {
-  using internal::GetTestCaseList;
-  benchmark::Initialize(&argc, argv);
-  auto options = benchmark::internal::GetOutputOptions(/*force_no_color*/true);
-  benchmark::ConsoleReporter CR(options);
-  benchmark::JSONReporter JR;
-  benchmark::CSVReporter CSVR;
-  struct ReporterTest {
-    const char* name;
-    std::vector<TestCase>& output_cases;
-    std::vector<TestCase>& error_cases;
-    benchmark::BenchmarkReporter& reporter;
-    std::stringstream out_stream;
-    std::stringstream err_stream;
-
-    ReporterTest(const char* n, std::vector<TestCase>& out_tc,
-                 std::vector<TestCase>& err_tc,
-                 benchmark::BenchmarkReporter& br)
-        : name(n), output_cases(out_tc), error_cases(err_tc), reporter(br) {
-      reporter.SetOutputStream(&out_stream);
-      reporter.SetErrorStream(&err_stream);
-    }
-  } TestCases[] = {
-      {"ConsoleReporter", GetTestCaseList(TC_ConsoleOut),
-       GetTestCaseList(TC_ConsoleErr), CR},
-      {"JSONReporter", GetTestCaseList(TC_JSONOut), GetTestCaseList(TC_JSONErr),
-       JR},
-      {"CSVReporter", GetTestCaseList(TC_CSVOut), GetTestCaseList(TC_CSVErr),
-       CSVR},
-  };
-
-  // Create the test reporter and run the benchmarks.
-  std::cout << "Running benchmarks...\n";
-  internal::TestReporter test_rep({&CR, &JR, &CSVR});
-  benchmark::RunSpecifiedBenchmarks(&test_rep);
-
-  for (auto& rep_test : TestCases) {
-    std::string msg = std::string("\nTesting ") + rep_test.name + " Output\n";
-    std::string banner(msg.size() - 1, '-');
-    std::cout << banner << msg << banner << "\n";
-
-    std::cerr << rep_test.err_stream.str();
-    std::cout << rep_test.out_stream.str();
-
-    internal::CheckCases(rep_test.error_cases, rep_test.err_stream);
-    internal::CheckCases(rep_test.output_cases, rep_test.out_stream);
-
-    std::cout << "\n";
-  }
-
-  // now that we know the output is as expected, we can dispatch
-  // the checks to subscribees.
-  auto &csv = TestCases[2];
-  // would use == but gcc spits a warning
-  CHECK(std::strcmp(csv.name, "CSVReporter") == 0);
-  internal::GetResultsChecker().CheckResults(csv.out_stream);
-}
diff --git a/gnu/llvm/llvm/utils/benchmark/test/register_benchmark_test.cc b/gnu/llvm/llvm/utils/benchmark/test/register_benchmark_test.cc
deleted file mode 100644
index 8ab2c299393..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/test/register_benchmark_test.cc
+++ /dev/null
@@ -1,182 +0,0 @@
-
-#undef NDEBUG
-#include <cassert>
-#include <vector>
-
-#include "../src/check.h"  // NOTE: check.h is for internal use only!
-#include "benchmark/benchmark.h"
-
-namespace {
-
-class TestReporter : public benchmark::ConsoleReporter {
- public:
-  virtual void ReportRuns(const std::vector<Run>& report) {
-    all_runs_.insert(all_runs_.end(), begin(report), end(report));
-    ConsoleReporter::ReportRuns(report);
-  }
-
-  std::vector<Run> all_runs_;
-};
-
-struct TestCase {
-  std::string name;
-  const char* label;
-  // Note: not explicit as we rely on it being converted through ADD_CASES.
-  TestCase(const char* xname) : TestCase(xname, nullptr) {}
-  TestCase(const char* xname, const char* xlabel)
-      : name(xname), label(xlabel) {}
-
-  typedef benchmark::BenchmarkReporter::Run Run;
-
-  void CheckRun(Run const& run) const {
-    CHECK(name == run.benchmark_name) << "expected " << name << " got "
-                                      << run.benchmark_name;
-    if (label) {
-      CHECK(run.report_label == label) << "expected " << label << " got "
-                                       << run.report_label;
-    } else {
-      CHECK(run.report_label == "");
-    }
-  }
-};
-
-std::vector<TestCase> ExpectedResults;
-
-int AddCases(std::initializer_list<TestCase> const& v) {
-  for (auto N : v) {
-    ExpectedResults.push_back(N);
-  }
-  return 0;
-}
-
-#define CONCAT(x, y) CONCAT2(x, y)
-#define CONCAT2(x, y) x##y
-#define ADD_CASES(...) int CONCAT(dummy, __LINE__) = AddCases({__VA_ARGS__})
-
-}  // end namespace
-
-typedef benchmark::internal::Benchmark* ReturnVal;
-
-//----------------------------------------------------------------------------//
-// Test RegisterBenchmark with no additional arguments
-//----------------------------------------------------------------------------//
-void BM_function(benchmark::State& state) {
-  for (auto _ : state) {
-  }
-}
-BENCHMARK(BM_function);
-ReturnVal dummy = benchmark::RegisterBenchmark(
-    "BM_function_manual_registration", BM_function);
-ADD_CASES({"BM_function"}, {"BM_function_manual_registration"});
-
-//----------------------------------------------------------------------------//
-// Test RegisterBenchmark with additional arguments
-// Note: GCC <= 4.8 do not support this form of RegisterBenchmark because they
-//       reject the variadic pack expansion of lambda captures.
-//----------------------------------------------------------------------------//
-#ifndef BENCHMARK_HAS_NO_VARIADIC_REGISTER_BENCHMARK
-
-void BM_extra_args(benchmark::State& st, const char* label) {
-  for (auto _ : st) {
-  }
-  st.SetLabel(label);
-}
-int RegisterFromFunction() {
-  std::pair<const char*, const char*> cases[] = {
-      {"test1", "One"}, {"test2", "Two"}, {"test3", "Three"}};
-  for (auto const& c : cases)
-    benchmark::RegisterBenchmark(c.first, &BM_extra_args, c.second);
-  return 0;
-}
-int dummy2 = RegisterFromFunction();
-ADD_CASES({"test1", "One"}, {"test2", "Two"}, {"test3", "Three"});
-
-#endif  // BENCHMARK_HAS_NO_VARIADIC_REGISTER_BENCHMARK
-
-//----------------------------------------------------------------------------//
-// Test RegisterBenchmark with different callable types
-//----------------------------------------------------------------------------//
-
-struct CustomFixture {
-  void operator()(benchmark::State& st) {
-    for (auto _ : st) {
-    }
-  }
-};
-
-void TestRegistrationAtRuntime() {
-#ifdef BENCHMARK_HAS_CXX11
-  {
-    CustomFixture fx;
-    benchmark::RegisterBenchmark("custom_fixture", fx);
-    AddCases({"custom_fixture"});
-  }
-#endif
-#ifndef BENCHMARK_HAS_NO_VARIADIC_REGISTER_BENCHMARK
-  {
-    const char* x = "42";
-    auto capturing_lam = [=](benchmark::State& st) {
-      for (auto _ : st) {
-      }
-      st.SetLabel(x);
-    };
-    benchmark::RegisterBenchmark("lambda_benchmark", capturing_lam);
-    AddCases({{"lambda_benchmark", x}});
-  }
-#endif
-}
-
-// Test that all benchmarks, registered at either during static init or runtime,
-// are run and the results are passed to the reported.
-void RunTestOne() {
-  TestRegistrationAtRuntime();
-
-  TestReporter test_reporter;
-  benchmark::RunSpecifiedBenchmarks(&test_reporter);
-
-  typedef benchmark::BenchmarkReporter::Run Run;
-  auto EB = ExpectedResults.begin();
-
-  for (Run const& run : test_reporter.all_runs_) {
-    assert(EB != ExpectedResults.end());
-    EB->CheckRun(run);
-    ++EB;
-  }
-  assert(EB == ExpectedResults.end());
-}
-
-// Test that ClearRegisteredBenchmarks() clears all previously registered
-// benchmarks.
-// Also test that new benchmarks can be registered and ran afterwards.
-void RunTestTwo() {
-  assert(ExpectedResults.size() != 0 &&
-         "must have at least one registered benchmark");
-  ExpectedResults.clear();
-  benchmark::ClearRegisteredBenchmarks();
-
-  TestReporter test_reporter;
-  size_t num_ran = benchmark::RunSpecifiedBenchmarks(&test_reporter);
-  assert(num_ran == 0);
-  assert(test_reporter.all_runs_.begin() == test_reporter.all_runs_.end());
-
-  TestRegistrationAtRuntime();
-  num_ran = benchmark::RunSpecifiedBenchmarks(&test_reporter);
-  assert(num_ran == ExpectedResults.size());
-
-  typedef benchmark::BenchmarkReporter::Run Run;
-  auto EB = ExpectedResults.begin();
-
-  for (Run const& run : test_reporter.all_runs_) {
-    assert(EB != ExpectedResults.end());
-    EB->CheckRun(run);
-    ++EB;
-  }
-  assert(EB == ExpectedResults.end());
-}
-
-int main(int argc, char* argv[]) {
-  benchmark::Initialize(&argc, argv);
-
-  RunTestOne();
-  RunTestTwo();
-}
diff --git a/gnu/llvm/llvm/utils/benchmark/test/reporter_output_test.cc b/gnu/llvm/llvm/utils/benchmark/test/reporter_output_test.cc
deleted file mode 100644
index 23eb1baf633..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/test/reporter_output_test.cc
+++ /dev/null
@@ -1,382 +0,0 @@
-
-#undef NDEBUG
-#include <utility>
-
-#include "benchmark/benchmark.h"
-#include "output_test.h"
-
-// ========================================================================= //
-// ---------------------- Testing Prologue Output -------------------------- //
-// ========================================================================= //
-
-ADD_CASES(TC_ConsoleOut,
-          {{"^[-]+$", MR_Next},
-           {"^Benchmark %s Time %s CPU %s Iterations$", MR_Next},
-           {"^[-]+$", MR_Next}});
-static int AddContextCases() {
-  AddCases(TC_ConsoleErr,
-           {
-               {"%int[-/]%int[-/]%int %int:%int:%int$", MR_Default},
-               {"Running .*/reporter_output_test(\\.exe)?$", MR_Next},
-               {"Run on \\(%int X %float MHz CPU s\\)", MR_Next},
-           });
-  AddCases(TC_JSONOut, {{"^\\{", MR_Default},
-                        {"\"context\":", MR_Next},
-                        {"\"date\": \"", MR_Next},
-                        {"\"executable\": \".*/reporter_output_test(\\.exe)?\",", MR_Next},
-                        {"\"num_cpus\": %int,$", MR_Next},
-                        {"\"mhz_per_cpu\": %float,$", MR_Next},
-                        {"\"cpu_scaling_enabled\": ", MR_Next},
-                        {"\"caches\": \\[$", MR_Next}});
-  auto const& Caches = benchmark::CPUInfo::Get().caches;
-  if (!Caches.empty()) {
-    AddCases(TC_ConsoleErr, {{"CPU Caches:$", MR_Next}});
-  }
-  for (size_t I = 0; I < Caches.size(); ++I) {
-    std::string num_caches_str =
-        Caches[I].num_sharing != 0 ? " \\(x%int\\)$" : "$";
-    AddCases(
-        TC_ConsoleErr,
-        {{"L%int (Data|Instruction|Unified) %intK" + num_caches_str, MR_Next}});
-    AddCases(TC_JSONOut, {{"\\{$", MR_Next},
-                          {"\"type\": \"", MR_Next},
-                          {"\"level\": %int,$", MR_Next},
-                          {"\"size\": %int,$", MR_Next},
-                          {"\"num_sharing\": %int$", MR_Next},
-                          {"}[,]{0,1}$", MR_Next}});
-  }
-
-  AddCases(TC_JSONOut, {{"],$"}});
-  return 0;
-}
-int dummy_register = AddContextCases();
-ADD_CASES(TC_CSVOut, {{"%csv_header"}});
-
-// ========================================================================= //
-// ------------------------ Testing Basic Output --------------------------- //
-// ========================================================================= //
-
-void BM_basic(benchmark::State& state) {
-  for (auto _ : state) {
-  }
-}
-BENCHMARK(BM_basic);
-
-ADD_CASES(TC_ConsoleOut, {{"^BM_basic %console_report$"}});
-ADD_CASES(TC_JSONOut, {{"\"name\": \"BM_basic\",$"},
-                       {"\"iterations\": %int,$", MR_Next},
-                       {"\"real_time\": %float,$", MR_Next},
-                       {"\"cpu_time\": %float,$", MR_Next},
-                       {"\"time_unit\": \"ns\"$", MR_Next},
-                       {"}", MR_Next}});
-ADD_CASES(TC_CSVOut, {{"^\"BM_basic\",%csv_report$"}});
-
-// ========================================================================= //
-// ------------------------ Testing Bytes per Second Output ---------------- //
-// ========================================================================= //
-
-void BM_bytes_per_second(benchmark::State& state) {
-  for (auto _ : state) {
-  }
-  state.SetBytesProcessed(1);
-}
-BENCHMARK(BM_bytes_per_second);
-
-ADD_CASES(TC_ConsoleOut,
-          {{"^BM_bytes_per_second %console_report +%float[kM]{0,1}B/s$"}});
-ADD_CASES(TC_JSONOut, {{"\"name\": \"BM_bytes_per_second\",$"},
-                       {"\"iterations\": %int,$", MR_Next},
-                       {"\"real_time\": %float,$", MR_Next},
-                       {"\"cpu_time\": %float,$", MR_Next},
-                       {"\"time_unit\": \"ns\",$", MR_Next},
-                       {"\"bytes_per_second\": %float$", MR_Next},
-                       {"}", MR_Next}});
-ADD_CASES(TC_CSVOut, {{"^\"BM_bytes_per_second\",%csv_bytes_report$"}});
-
-// ========================================================================= //
-// ------------------------ Testing Items per Second Output ---------------- //
-// ========================================================================= //
-
-void BM_items_per_second(benchmark::State& state) {
-  for (auto _ : state) {
-  }
-  state.SetItemsProcessed(1);
-}
-BENCHMARK(BM_items_per_second);
-
-ADD_CASES(TC_ConsoleOut,
-          {{"^BM_items_per_second %console_report +%float[kM]{0,1} items/s$"}});
-ADD_CASES(TC_JSONOut, {{"\"name\": \"BM_items_per_second\",$"},
-                       {"\"iterations\": %int,$", MR_Next},
-                       {"\"real_time\": %float,$", MR_Next},
-                       {"\"cpu_time\": %float,$", MR_Next},
-                       {"\"time_unit\": \"ns\",$", MR_Next},
-                       {"\"items_per_second\": %float$", MR_Next},
-                       {"}", MR_Next}});
-ADD_CASES(TC_CSVOut, {{"^\"BM_items_per_second\",%csv_items_report$"}});
-
-// ========================================================================= //
-// ------------------------ Testing Label Output --------------------------- //
-// ========================================================================= //
-
-void BM_label(benchmark::State& state) {
-  for (auto _ : state) {
-  }
-  state.SetLabel("some label");
-}
-BENCHMARK(BM_label);
-
-ADD_CASES(TC_ConsoleOut, {{"^BM_label %console_report some label$"}});
-ADD_CASES(TC_JSONOut, {{"\"name\": \"BM_label\",$"},
-                       {"\"iterations\": %int,$", MR_Next},
-                       {"\"real_time\": %float,$", MR_Next},
-                       {"\"cpu_time\": %float,$", MR_Next},
-                       {"\"time_unit\": \"ns\",$", MR_Next},
-                       {"\"label\": \"some label\"$", MR_Next},
-                       {"}", MR_Next}});
-ADD_CASES(TC_CSVOut, {{"^\"BM_label\",%csv_label_report_begin\"some "
-                       "label\"%csv_label_report_end$"}});
-
-// ========================================================================= //
-// ------------------------ Testing Error Output --------------------------- //
-// ========================================================================= //
-
-void BM_error(benchmark::State& state) {
-  state.SkipWithError("message");
-  for (auto _ : state) {
-  }
-}
-BENCHMARK(BM_error);
-ADD_CASES(TC_ConsoleOut, {{"^BM_error[ ]+ERROR OCCURRED: 'message'$"}});
-ADD_CASES(TC_JSONOut, {{"\"name\": \"BM_error\",$"},
-                       {"\"error_occurred\": true,$", MR_Next},
-                       {"\"error_message\": \"message\",$", MR_Next}});
-
-ADD_CASES(TC_CSVOut, {{"^\"BM_error\",,,,,,,,true,\"message\"$"}});
-
-// ========================================================================= //
-// ------------------------ Testing No Arg Name Output -----------------------
-// //
-// ========================================================================= //
-
-void BM_no_arg_name(benchmark::State& state) {
-  for (auto _ : state) {
-  }
-}
-BENCHMARK(BM_no_arg_name)->Arg(3);
-ADD_CASES(TC_ConsoleOut, {{"^BM_no_arg_name/3 %console_report$"}});
-ADD_CASES(TC_JSONOut, {{"\"name\": \"BM_no_arg_name/3\",$"}});
-ADD_CASES(TC_CSVOut, {{"^\"BM_no_arg_name/3\",%csv_report$"}});
-
-// ========================================================================= //
-// ------------------------ Testing Arg Name Output ----------------------- //
-// ========================================================================= //
-
-void BM_arg_name(benchmark::State& state) {
-  for (auto _ : state) {
-  }
-}
-BENCHMARK(BM_arg_name)->ArgName("first")->Arg(3);
-ADD_CASES(TC_ConsoleOut, {{"^BM_arg_name/first:3 %console_report$"}});
-ADD_CASES(TC_JSONOut, {{"\"name\": \"BM_arg_name/first:3\",$"}});
-ADD_CASES(TC_CSVOut, {{"^\"BM_arg_name/first:3\",%csv_report$"}});
-
-// ========================================================================= //
-// ------------------------ Testing Arg Names Output ----------------------- //
-// ========================================================================= //
-
-void BM_arg_names(benchmark::State& state) {
-  for (auto _ : state) {
-  }
-}
-BENCHMARK(BM_arg_names)->Args({2, 5, 4})->ArgNames({"first", "", "third"});
-ADD_CASES(TC_ConsoleOut,
-          {{"^BM_arg_names/first:2/5/third:4 %console_report$"}});
-ADD_CASES(TC_JSONOut, {{"\"name\": \"BM_arg_names/first:2/5/third:4\",$"}});
-ADD_CASES(TC_CSVOut, {{"^\"BM_arg_names/first:2/5/third:4\",%csv_report$"}});
-
-// ========================================================================= //
-// ----------------------- Testing Complexity Output ----------------------- //
-// ========================================================================= //
-
-void BM_Complexity_O1(benchmark::State& state) {
-  for (auto _ : state) {
-  }
-  state.SetComplexityN(state.range(0));
-}
-BENCHMARK(BM_Complexity_O1)->Range(1, 1 << 18)->Complexity(benchmark::o1);
-SET_SUBSTITUTIONS({{"%bigOStr", "[ ]* %float \\([0-9]+\\)"},
-                   {"%RMS", "[ ]*[0-9]+ %"}});
-ADD_CASES(TC_ConsoleOut, {{"^BM_Complexity_O1_BigO %bigOStr %bigOStr[ ]*$"},
-                          {"^BM_Complexity_O1_RMS %RMS %RMS[ ]*$"}});
-
-// ========================================================================= //
-// ----------------------- Testing Aggregate Output ------------------------ //
-// ========================================================================= //
-
-// Test that non-aggregate data is printed by default
-void BM_Repeat(benchmark::State& state) {
-  for (auto _ : state) {
-  }
-}
-// need two repetitions min to be able to output any aggregate output
-BENCHMARK(BM_Repeat)->Repetitions(2);
-ADD_CASES(TC_ConsoleOut, {{"^BM_Repeat/repeats:2 %console_report$"},
-                          {"^BM_Repeat/repeats:2 %console_report$"},
-                          {"^BM_Repeat/repeats:2_mean %console_report$"},
-                          {"^BM_Repeat/repeats:2_median %console_report$"},
-                          {"^BM_Repeat/repeats:2_stddev %console_report$"}});
-ADD_CASES(TC_JSONOut, {{"\"name\": \"BM_Repeat/repeats:2\",$"},
-                       {"\"name\": \"BM_Repeat/repeats:2\",$"},
-                       {"\"name\": \"BM_Repeat/repeats:2_mean\",$"},
-                       {"\"name\": \"BM_Repeat/repeats:2_median\",$"},
-                       {"\"name\": \"BM_Repeat/repeats:2_stddev\",$"}});
-ADD_CASES(TC_CSVOut, {{"^\"BM_Repeat/repeats:2\",%csv_report$"},
-                      {"^\"BM_Repeat/repeats:2\",%csv_report$"},
-                      {"^\"BM_Repeat/repeats:2_mean\",%csv_report$"},
-                      {"^\"BM_Repeat/repeats:2_median\",%csv_report$"},
-                      {"^\"BM_Repeat/repeats:2_stddev\",%csv_report$"}});
-// but for two repetitions, mean and median is the same, so let's repeat..
-BENCHMARK(BM_Repeat)->Repetitions(3);
-ADD_CASES(TC_ConsoleOut, {{"^BM_Repeat/repeats:3 %console_report$"},
-                          {"^BM_Repeat/repeats:3 %console_report$"},
-                          {"^BM_Repeat/repeats:3 %console_report$"},
-                          {"^BM_Repeat/repeats:3_mean %console_report$"},
-                          {"^BM_Repeat/repeats:3_median %console_report$"},
-                          {"^BM_Repeat/repeats:3_stddev %console_report$"}});
-ADD_CASES(TC_JSONOut, {{"\"name\": \"BM_Repeat/repeats:3\",$"},
-                       {"\"name\": \"BM_Repeat/repeats:3\",$"},
-                       {"\"name\": \"BM_Repeat/repeats:3\",$"},
-                       {"\"name\": \"BM_Repeat/repeats:3_mean\",$"},
-                       {"\"name\": \"BM_Repeat/repeats:3_median\",$"},
-                       {"\"name\": \"BM_Repeat/repeats:3_stddev\",$"}});
-ADD_CASES(TC_CSVOut, {{"^\"BM_Repeat/repeats:3\",%csv_report$"},
-                      {"^\"BM_Repeat/repeats:3\",%csv_report$"},
-                      {"^\"BM_Repeat/repeats:3\",%csv_report$"},
-                      {"^\"BM_Repeat/repeats:3_mean\",%csv_report$"},
-                      {"^\"BM_Repeat/repeats:3_median\",%csv_report$"},
-                      {"^\"BM_Repeat/repeats:3_stddev\",%csv_report$"}});
-// median differs between even/odd number of repetitions, so just to be sure
-BENCHMARK(BM_Repeat)->Repetitions(4);
-ADD_CASES(TC_ConsoleOut, {{"^BM_Repeat/repeats:4 %console_report$"},
-                          {"^BM_Repeat/repeats:4 %console_report$"},
-                          {"^BM_Repeat/repeats:4 %console_report$"},
-                          {"^BM_Repeat/repeats:4 %console_report$"},
-                          {"^BM_Repeat/repeats:4_mean %console_report$"},
-                          {"^BM_Repeat/repeats:4_median %console_report$"},
-                          {"^BM_Repeat/repeats:4_stddev %console_report$"}});
-ADD_CASES(TC_JSONOut, {{"\"name\": \"BM_Repeat/repeats:4\",$"},
-                       {"\"name\": \"BM_Repeat/repeats:4\",$"},
-                       {"\"name\": \"BM_Repeat/repeats:4\",$"},
-                       {"\"name\": \"BM_Repeat/repeats:4\",$"},
-                       {"\"name\": \"BM_Repeat/repeats:4_mean\",$"},
-                       {"\"name\": \"BM_Repeat/repeats:4_median\",$"},
-                       {"\"name\": \"BM_Repeat/repeats:4_stddev\",$"}});
-ADD_CASES(TC_CSVOut, {{"^\"BM_Repeat/repeats:4\",%csv_report$"},
-                      {"^\"BM_Repeat/repeats:4\",%csv_report$"},
-                      {"^\"BM_Repeat/repeats:4\",%csv_report$"},
-                      {"^\"BM_Repeat/repeats:4\",%csv_report$"},
-                      {"^\"BM_Repeat/repeats:4_mean\",%csv_report$"},
-                      {"^\"BM_Repeat/repeats:4_median\",%csv_report$"},
-                      {"^\"BM_Repeat/repeats:4_stddev\",%csv_report$"}});
-
-// Test that a non-repeated test still prints non-aggregate results even when
-// only-aggregate reports have been requested
-void BM_RepeatOnce(benchmark::State& state) {
-  for (auto _ : state) {
-  }
-}
-BENCHMARK(BM_RepeatOnce)->Repetitions(1)->ReportAggregatesOnly();
-ADD_CASES(TC_ConsoleOut, {{"^BM_RepeatOnce/repeats:1 %console_report$"}});
-ADD_CASES(TC_JSONOut, {{"\"name\": \"BM_RepeatOnce/repeats:1\",$"}});
-ADD_CASES(TC_CSVOut, {{"^\"BM_RepeatOnce/repeats:1\",%csv_report$"}});
-
-// Test that non-aggregate data is not reported
-void BM_SummaryRepeat(benchmark::State& state) {
-  for (auto _ : state) {
-  }
-}
-BENCHMARK(BM_SummaryRepeat)->Repetitions(3)->ReportAggregatesOnly();
-ADD_CASES(TC_ConsoleOut,
-          {{".*BM_SummaryRepeat/repeats:3 ", MR_Not},
-           {"^BM_SummaryRepeat/repeats:3_mean %console_report$"},
-           {"^BM_SummaryRepeat/repeats:3_median %console_report$"},
-           {"^BM_SummaryRepeat/repeats:3_stddev %console_report$"}});
-ADD_CASES(TC_JSONOut, {{".*BM_SummaryRepeat/repeats:3 ", MR_Not},
-                       {"\"name\": \"BM_SummaryRepeat/repeats:3_mean\",$"},
-                       {"\"name\": \"BM_SummaryRepeat/repeats:3_median\",$"},
-                       {"\"name\": \"BM_SummaryRepeat/repeats:3_stddev\",$"}});
-ADD_CASES(TC_CSVOut, {{".*BM_SummaryRepeat/repeats:3 ", MR_Not},
-                      {"^\"BM_SummaryRepeat/repeats:3_mean\",%csv_report$"},
-                      {"^\"BM_SummaryRepeat/repeats:3_median\",%csv_report$"},
-                      {"^\"BM_SummaryRepeat/repeats:3_stddev\",%csv_report$"}});
-
-void BM_RepeatTimeUnit(benchmark::State& state) {
-  for (auto _ : state) {
-  }
-}
-BENCHMARK(BM_RepeatTimeUnit)
-    ->Repetitions(3)
-    ->ReportAggregatesOnly()
-    ->Unit(benchmark::kMicrosecond);
-ADD_CASES(TC_ConsoleOut,
-          {{".*BM_RepeatTimeUnit/repeats:3 ", MR_Not},
-           {"^BM_RepeatTimeUnit/repeats:3_mean %console_us_report$"},
-           {"^BM_RepeatTimeUnit/repeats:3_median %console_us_report$"},
-           {"^BM_RepeatTimeUnit/repeats:3_stddev %console_us_report$"}});
-ADD_CASES(TC_JSONOut, {{".*BM_RepeatTimeUnit/repeats:3 ", MR_Not},
-                       {"\"name\": \"BM_RepeatTimeUnit/repeats:3_mean\",$"},
-                       {"\"time_unit\": \"us\",?$"},
-                       {"\"name\": \"BM_RepeatTimeUnit/repeats:3_median\",$"},
-                       {"\"time_unit\": \"us\",?$"},
-                       {"\"name\": \"BM_RepeatTimeUnit/repeats:3_stddev\",$"},
-                       {"\"time_unit\": \"us\",?$"}});
-ADD_CASES(TC_CSVOut,
-          {{".*BM_RepeatTimeUnit/repeats:3 ", MR_Not},
-           {"^\"BM_RepeatTimeUnit/repeats:3_mean\",%csv_us_report$"},
-           {"^\"BM_RepeatTimeUnit/repeats:3_median\",%csv_us_report$"},
-           {"^\"BM_RepeatTimeUnit/repeats:3_stddev\",%csv_us_report$"}});
-
-// ========================================================================= //
-// -------------------- Testing user-provided statistics ------------------- //
-// ========================================================================= //
-
-const auto UserStatistics = [](const std::vector<double>& v) {
-  return v.back();
-};
-void BM_UserStats(benchmark::State& state) {
-  for (auto _ : state) {
-  }
-}
-BENCHMARK(BM_UserStats)
-    ->Repetitions(3)
-    ->ComputeStatistics("", UserStatistics);
-// check that user-provided stats is calculated, and is after the default-ones
-// empty string as name is intentional, it would sort before anything else
-ADD_CASES(TC_ConsoleOut, {{"^BM_UserStats/repeats:3 %console_report$"},
-                          {"^BM_UserStats/repeats:3 %console_report$"},
-                          {"^BM_UserStats/repeats:3 %console_report$"},
-                          {"^BM_UserStats/repeats:3_mean %console_report$"},
-                          {"^BM_UserStats/repeats:3_median %console_report$"},
-                          {"^BM_UserStats/repeats:3_stddev %console_report$"},
-                          {"^BM_UserStats/repeats:3_ %console_report$"}});
-ADD_CASES(TC_JSONOut, {{"\"name\": \"BM_UserStats/repeats:3\",$"},
-                       {"\"name\": \"BM_UserStats/repeats:3\",$"},
-                       {"\"name\": \"BM_UserStats/repeats:3\",$"},
-                       {"\"name\": \"BM_UserStats/repeats:3_mean\",$"},
-                       {"\"name\": \"BM_UserStats/repeats:3_median\",$"},
-                       {"\"name\": \"BM_UserStats/repeats:3_stddev\",$"},
-                       {"\"name\": \"BM_UserStats/repeats:3_\",$"}});
-ADD_CASES(TC_CSVOut, {{"^\"BM_UserStats/repeats:3\",%csv_report$"},
-                      {"^\"BM_UserStats/repeats:3\",%csv_report$"},
-                      {"^\"BM_UserStats/repeats:3\",%csv_report$"},
-                      {"^\"BM_UserStats/repeats:3_mean\",%csv_report$"},
-                      {"^\"BM_UserStats/repeats:3_median\",%csv_report$"},
-                      {"^\"BM_UserStats/repeats:3_stddev\",%csv_report$"},
-                      {"^\"BM_UserStats/repeats:3_\",%csv_report$"}});
-
-// ========================================================================= //
-// --------------------------- TEST CASES END ------------------------------ //
-// ========================================================================= //
-
-int main(int argc, char* argv[]) { RunOutputTests(argc, argv); }
diff --git a/gnu/llvm/llvm/utils/benchmark/test/skip_with_error_test.cc b/gnu/llvm/llvm/utils/benchmark/test/skip_with_error_test.cc
deleted file mode 100644
index 8d2c342a9af..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/test/skip_with_error_test.cc
+++ /dev/null
@@ -1,192 +0,0 @@
-
-#undef NDEBUG
-#include <cassert>
-#include <vector>
-
-#include "../src/check.h"  // NOTE: check.h is for internal use only!
-#include "benchmark/benchmark.h"
-
-namespace {
-
-class TestReporter : public benchmark::ConsoleReporter {
- public:
-  virtual bool ReportContext(const Context& context) {
-    return ConsoleReporter::ReportContext(context);
-  };
-
-  virtual void ReportRuns(const std::vector<Run>& report) {
-    all_runs_.insert(all_runs_.end(), begin(report), end(report));
-    ConsoleReporter::ReportRuns(report);
-  }
-
-  TestReporter() {}
-  virtual ~TestReporter() {}
-
-  mutable std::vector<Run> all_runs_;
-};
-
-struct TestCase {
-  std::string name;
-  bool error_occurred;
-  std::string error_message;
-
-  typedef benchmark::BenchmarkReporter::Run Run;
-
-  void CheckRun(Run const& run) const {
-    CHECK(name == run.benchmark_name) << "expected " << name << " got "
-                                      << run.benchmark_name;
-    CHECK(error_occurred == run.error_occurred);
-    CHECK(error_message == run.error_message);
-    if (error_occurred) {
-      // CHECK(run.iterations == 0);
-    } else {
-      CHECK(run.iterations != 0);
-    }
-  }
-};
-
-std::vector<TestCase> ExpectedResults;
-
-int AddCases(const char* base_name, std::initializer_list<TestCase> const& v) {
-  for (auto TC : v) {
-    TC.name = base_name + TC.name;
-    ExpectedResults.push_back(std::move(TC));
-  }
-  return 0;
-}
-
-#define CONCAT(x, y) CONCAT2(x, y)
-#define CONCAT2(x, y) x##y
-#define ADD_CASES(...) int CONCAT(dummy, __LINE__) = AddCases(__VA_ARGS__)
-
-}  // end namespace
-
-void BM_error_before_running(benchmark::State& state) {
-  state.SkipWithError("error message");
-  while (state.KeepRunning()) {
-    assert(false);
-  }
-}
-BENCHMARK(BM_error_before_running);
-ADD_CASES("BM_error_before_running", {{"", true, "error message"}});
-
-
-void BM_error_before_running_batch(benchmark::State& state) {
-  state.SkipWithError("error message");
-  while (state.KeepRunningBatch(17)) {
-    assert(false);
-  }
-}
-BENCHMARK(BM_error_before_running_batch);
-ADD_CASES("BM_error_before_running_batch", {{"", true, "error message"}});
-
-void BM_error_before_running_range_for(benchmark::State& state) {
-  state.SkipWithError("error message");
-  for (auto _ : state) {
-    assert(false);
-  }
-}
-BENCHMARK(BM_error_before_running_range_for);
-ADD_CASES("BM_error_before_running_range_for", {{"", true, "error message"}});
-
-void BM_error_during_running(benchmark::State& state) {
-  int first_iter = true;
-  while (state.KeepRunning()) {
-    if (state.range(0) == 1 && state.thread_index <= (state.threads / 2)) {
-      assert(first_iter);
-      first_iter = false;
-      state.SkipWithError("error message");
-    } else {
-      state.PauseTiming();
-      state.ResumeTiming();
-    }
-  }
-}
-BENCHMARK(BM_error_during_running)->Arg(1)->Arg(2)->ThreadRange(1, 8);
-ADD_CASES("BM_error_during_running", {{"/1/threads:1", true, "error message"},
-                                      {"/1/threads:2", true, "error message"},
-                                      {"/1/threads:4", true, "error message"},
-                                      {"/1/threads:8", true, "error message"},
-                                      {"/2/threads:1", false, ""},
-                                      {"/2/threads:2", false, ""},
-                                      {"/2/threads:4", false, ""},
-                                      {"/2/threads:8", false, ""}});
-
-void BM_error_during_running_ranged_for(benchmark::State& state) {
-  assert(state.max_iterations > 3 && "test requires at least a few iterations");
-  int first_iter = true;
-  // NOTE: Users should not write the for loop explicitly.
-  for (auto It = state.begin(), End = state.end(); It != End; ++It) {
-    if (state.range(0) == 1) {
-      assert(first_iter);
-      first_iter = false;
-      state.SkipWithError("error message");
-      // Test the unfortunate but documented behavior that the ranged-for loop
-      // doesn't automatically terminate when SkipWithError is set.
-      assert(++It != End);
-      break; // Required behavior
-    }
-  }
-}
-BENCHMARK(BM_error_during_running_ranged_for)->Arg(1)->Arg(2)->Iterations(5);
-ADD_CASES("BM_error_during_running_ranged_for",
-          {{"/1/iterations:5", true, "error message"},
-           {"/2/iterations:5", false, ""}});
-
-
-
-void BM_error_after_running(benchmark::State& state) {
-  for (auto _ : state) {
-    benchmark::DoNotOptimize(state.iterations());
-  }
-  if (state.thread_index <= (state.threads / 2))
-    state.SkipWithError("error message");
-}
-BENCHMARK(BM_error_after_running)->ThreadRange(1, 8);
-ADD_CASES("BM_error_after_running", {{"/threads:1", true, "error message"},
-                                     {"/threads:2", true, "error message"},
-                                     {"/threads:4", true, "error message"},
-                                     {"/threads:8", true, "error message"}});
-
-void BM_error_while_paused(benchmark::State& state) {
-  bool first_iter = true;
-  while (state.KeepRunning()) {
-    if (state.range(0) == 1 && state.thread_index <= (state.threads / 2)) {
-      assert(first_iter);
-      first_iter = false;
-      state.PauseTiming();
-      state.SkipWithError("error message");
-    } else {
-      state.PauseTiming();
-      state.ResumeTiming();
-    }
-  }
-}
-BENCHMARK(BM_error_while_paused)->Arg(1)->Arg(2)->ThreadRange(1, 8);
-ADD_CASES("BM_error_while_paused", {{"/1/threads:1", true, "error message"},
-                                    {"/1/threads:2", true, "error message"},
-                                    {"/1/threads:4", true, "error message"},
-                                    {"/1/threads:8", true, "error message"},
-                                    {"/2/threads:1", false, ""},
-                                    {"/2/threads:2", false, ""},
-                                    {"/2/threads:4", false, ""},
-                                    {"/2/threads:8", false, ""}});
-
-int main(int argc, char* argv[]) {
-  benchmark::Initialize(&argc, argv);
-
-  TestReporter test_reporter;
-  benchmark::RunSpecifiedBenchmarks(&test_reporter);
-
-  typedef benchmark::BenchmarkReporter::Run Run;
-  auto EB = ExpectedResults.begin();
-
-  for (Run const& run : test_reporter.all_runs_) {
-    assert(EB != ExpectedResults.end());
-    EB->CheckRun(run);
-    ++EB;
-  }
-  assert(EB == ExpectedResults.end());
-
-  return 0;
-}
diff --git a/gnu/llvm/llvm/utils/benchmark/test/state_assembly_test.cc b/gnu/llvm/llvm/utils/benchmark/test/state_assembly_test.cc
deleted file mode 100644
index e2c5c8648d0..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/test/state_assembly_test.cc
+++ /dev/null
@@ -1,66 +0,0 @@
-#include <benchmark/benchmark.h>
-
-#ifdef __clang__
-#pragma clang diagnostic ignored "-Wreturn-type"
-#endif
-
-extern "C" {
-  extern int ExternInt;
-  benchmark::State& GetState();
-  void Fn();
-}
-
-using benchmark::State;
-
-// CHECK-LABEL: test_for_auto_loop:
-extern "C" int test_for_auto_loop() {
-  State& S = GetState();
-  int x = 42;
-  // CHECK: 	[[CALL:call(q)*]]	_ZN9benchmark5State16StartKeepRunningEv
-  // CHECK-NEXT: testq %rbx, %rbx
-  // CHECK-NEXT: je [[LOOP_END:.*]]
-
-  for (auto _ : S) {
-    // CHECK: .L[[LOOP_HEAD:[a-zA-Z0-9_]+]]:
-    // CHECK-GNU-NEXT: subq $1, %rbx
-    // CHECK-CLANG-NEXT: {{(addq \$1,|incq)}} %rax
-    // CHECK-NEXT: jne .L[[LOOP_HEAD]]
-    benchmark::DoNotOptimize(x);
-  }
-  // CHECK: [[LOOP_END]]:
-  // CHECK: [[CALL]]	_ZN9benchmark5State17FinishKeepRunningEv
-
-  // CHECK: movl $101, %eax
-  // CHECK: ret
-  return 101;
-}
-
-// CHECK-LABEL: test_while_loop:
-extern "C" int test_while_loop() {
-  State& S = GetState();
-  int x = 42;
-
-  // CHECK: j{{(e|mp)}} .L[[LOOP_HEADER:[a-zA-Z0-9_]+]]
-  // CHECK-NEXT: .L[[LOOP_BODY:[a-zA-Z0-9_]+]]:
-  while (S.KeepRunning()) {
-    // CHECK-GNU-NEXT: subq $1, %[[IREG:[a-z]+]]
-    // CHECK-CLANG-NEXT: {{(addq \$-1,|decq)}} %[[IREG:[a-z]+]]
-    // CHECK: movq %[[IREG]], [[DEST:.*]]
-    benchmark::DoNotOptimize(x);
-  }
-  // CHECK-DAG: movq [[DEST]], %[[IREG]]
-  // CHECK-DAG: testq %[[IREG]], %[[IREG]]
-  // CHECK-DAG: jne .L[[LOOP_BODY]]
-  // CHECK-DAG: .L[[LOOP_HEADER]]:
-
-  // CHECK: cmpb $0
-  // CHECK-NEXT: jne .L[[LOOP_END:[a-zA-Z0-9_]+]]
-  // CHECK: [[CALL:call(q)*]] _ZN9benchmark5State16StartKeepRunningEv
-
-  // CHECK: .L[[LOOP_END]]:
-  // CHECK: [[CALL]] _ZN9benchmark5State17FinishKeepRunningEv
-
-  // CHECK: movl $101, %eax
-  // CHECK: ret
-  return 101;
-}
diff --git a/gnu/llvm/llvm/utils/benchmark/test/statistics_gtest.cc b/gnu/llvm/llvm/utils/benchmark/test/statistics_gtest.cc
deleted file mode 100644
index b4d6abbb578..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/test/statistics_gtest.cc
+++ /dev/null
@@ -1,61 +0,0 @@
-//===---------------------------------------------------------------------===//
-// statistics_test - Unit tests for src/statistics.cc
-//===---------------------------------------------------------------------===//
-
-#include "../src/statistics.h"
-#include "gtest/gtest.h"
-
-namespace {
-TEST(StatisticsTest, Mean) {
-  std::vector<double> Inputs;
-  {
-    Inputs = {42, 42, 42, 42};
-    double Res = benchmark::StatisticsMean(Inputs);
-    EXPECT_DOUBLE_EQ(Res, 42.0);
-  }
-  {
-    Inputs = {1, 2, 3, 4};
-    double Res = benchmark::StatisticsMean(Inputs);
-    EXPECT_DOUBLE_EQ(Res, 2.5);
-  }
-  {
-    Inputs = {1, 2, 5, 10, 10, 14};
-    double Res = benchmark::StatisticsMean(Inputs);
-    EXPECT_DOUBLE_EQ(Res, 7.0);
-  }
-}
-
-TEST(StatisticsTest, Median) {
-  std::vector<double> Inputs;
-  {
-    Inputs = {42, 42, 42, 42};
-    double Res = benchmark::StatisticsMedian(Inputs);
-    EXPECT_DOUBLE_EQ(Res, 42.0);
-  }
-  {
-    Inputs = {1, 2, 3, 4};
-    double Res = benchmark::StatisticsMedian(Inputs);
-    EXPECT_DOUBLE_EQ(Res, 2.5);
-  }
-  {
-    Inputs = {1, 2, 5, 10, 10};
-    double Res = benchmark::StatisticsMedian(Inputs);
-    EXPECT_DOUBLE_EQ(Res, 5.0);
-  }
-}
-
-TEST(StatisticsTest, StdDev) {
-  std::vector<double> Inputs;
-  {
-    Inputs = {101, 101, 101, 101};
-    double Res = benchmark::StatisticsStdDev(Inputs);
-    EXPECT_DOUBLE_EQ(Res, 0.0);
-  }
-  {
-    Inputs = {1, 2, 3};
-    double Res = benchmark::StatisticsStdDev(Inputs);
-    EXPECT_DOUBLE_EQ(Res, 1.0);
-  }
-}
-
-}  // end namespace
diff --git a/gnu/llvm/llvm/utils/benchmark/test/templated_fixture_test.cc b/gnu/llvm/llvm/utils/benchmark/test/templated_fixture_test.cc
deleted file mode 100644
index ec5b4c0cc07..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/test/templated_fixture_test.cc
+++ /dev/null
@@ -1,28 +0,0 @@
-
-#include "benchmark/benchmark.h"
-
-#include <cassert>
-#include <memory>
-
-template<typename T>
-class MyFixture : public ::benchmark::Fixture {
-public:
-  MyFixture() : data(0) {}
-
-  T data;
-};
-
-BENCHMARK_TEMPLATE_F(MyFixture, Foo, int)(benchmark::State &st) {
-  for (auto _ : st) {
-    data += 1;
-  }
-}
-
-BENCHMARK_TEMPLATE_DEFINE_F(MyFixture, Bar, double)(benchmark::State& st) {
-  for (auto _ : st) {
-    data += 1.0;
-  }
-}
-BENCHMARK_REGISTER_F(MyFixture, Bar);
-
-BENCHMARK_MAIN();
diff --git a/gnu/llvm/llvm/utils/benchmark/test/user_counters_tabular_test.cc b/gnu/llvm/llvm/utils/benchmark/test/user_counters_tabular_test.cc
deleted file mode 100644
index 9b8a6132e6d..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/test/user_counters_tabular_test.cc
+++ /dev/null
@@ -1,250 +0,0 @@
-
-#undef NDEBUG
-
-#include "benchmark/benchmark.h"
-#include "output_test.h"
-
-// @todo: <jpmag> this checks the full output at once; the rule for
-// CounterSet1 was failing because it was not matching "^[-]+$".
-// @todo: <jpmag> check that the counters are vertically aligned.
-ADD_CASES(TC_ConsoleOut, {
-// keeping these lines long improves readability, so:
-// clang-format off
-    {"^[-]+$", MR_Next},
-    {"^Benchmark %s Time %s CPU %s Iterations %s Bar %s Bat %s Baz %s Foo %s Frob %s Lob$", MR_Next},
-    {"^[-]+$", MR_Next},
-    {"^BM_Counters_Tabular/threads:%int %console_report [ ]*%hrfloat [ ]*%hrfloat [ ]*%hrfloat [ ]*%hrfloat [ ]*%hrfloat [ ]*%hrfloat$", MR_Next},
-    {"^BM_Counters_Tabular/threads:%int %console_report [ ]*%hrfloat [ ]*%hrfloat [ ]*%hrfloat [ ]*%hrfloat [ ]*%hrfloat [ ]*%hrfloat$", MR_Next},
-    {"^BM_Counters_Tabular/threads:%int %console_report [ ]*%hrfloat [ ]*%hrfloat [ ]*%hrfloat [ ]*%hrfloat [ ]*%hrfloat [ ]*%hrfloat$", MR_Next},
-    {"^BM_Counters_Tabular/threads:%int %console_report [ ]*%hrfloat [ ]*%hrfloat [ ]*%hrfloat [ ]*%hrfloat [ ]*%hrfloat [ ]*%hrfloat$", MR_Next},
-    {"^BM_Counters_Tabular/threads:%int %console_report [ ]*%hrfloat [ ]*%hrfloat [ ]*%hrfloat [ ]*%hrfloat [ ]*%hrfloat [ ]*%hrfloat$", MR_Next},
-    {"^BM_CounterRates_Tabular/threads:%int %console_report [ ]*%hrfloat/s [ ]*%hrfloat/s [ ]*%hrfloat/s [ ]*%hrfloat/s [ ]*%hrfloat/s [ ]*%hrfloat/s$", MR_Next},
-    {"^BM_CounterRates_Tabular/threads:%int %console_report [ ]*%hrfloat/s [ ]*%hrfloat/s [ ]*%hrfloat/s [ ]*%hrfloat/s [ ]*%hrfloat/s [ ]*%hrfloat/s$", MR_Next},
-    {"^BM_CounterRates_Tabular/threads:%int %console_report [ ]*%hrfloat/s [ ]*%hrfloat/s [ ]*%hrfloat/s [ ]*%hrfloat/s [ ]*%hrfloat/s [ ]*%hrfloat/s$", MR_Next},
-    {"^BM_CounterRates_Tabular/threads:%int %console_report [ ]*%hrfloat/s [ ]*%hrfloat/s [ ]*%hrfloat/s [ ]*%hrfloat/s [ ]*%hrfloat/s [ ]*%hrfloat/s$", MR_Next},
-    {"^BM_CounterRates_Tabular/threads:%int %console_report [ ]*%hrfloat/s [ ]*%hrfloat/s [ ]*%hrfloat/s [ ]*%hrfloat/s [ ]*%hrfloat/s [ ]*%hrfloat/s$", MR_Next},
-    {"^[-]+$", MR_Next},
-    {"^Benchmark %s Time %s CPU %s Iterations %s Bar %s Baz %s Foo$", MR_Next},
-    {"^[-]+$", MR_Next},
-    {"^BM_CounterSet0_Tabular/threads:%int %console_report [ ]*%hrfloat [ ]*%hrfloat [ ]*%hrfloat$", MR_Next},
-    {"^BM_CounterSet0_Tabular/threads:%int %console_report [ ]*%hrfloat [ ]*%hrfloat [ ]*%hrfloat$", MR_Next},
-    {"^BM_CounterSet0_Tabular/threads:%int %console_report [ ]*%hrfloat [ ]*%hrfloat [ ]*%hrfloat$", MR_Next},
-    {"^BM_CounterSet0_Tabular/threads:%int %console_report [ ]*%hrfloat [ ]*%hrfloat [ ]*%hrfloat$", MR_Next},
-    {"^BM_CounterSet0_Tabular/threads:%int %console_report [ ]*%hrfloat [ ]*%hrfloat [ ]*%hrfloat$", MR_Next},
-    {"^BM_CounterSet1_Tabular/threads:%int %console_report [ ]*%hrfloat [ ]*%hrfloat [ ]*%hrfloat$", MR_Next},
-    {"^BM_CounterSet1_Tabular/threads:%int %console_report [ ]*%hrfloat [ ]*%hrfloat [ ]*%hrfloat$", MR_Next},
-    {"^BM_CounterSet1_Tabular/threads:%int %console_report [ ]*%hrfloat [ ]*%hrfloat [ ]*%hrfloat$", MR_Next},
-    {"^BM_CounterSet1_Tabular/threads:%int %console_report [ ]*%hrfloat [ ]*%hrfloat [ ]*%hrfloat$", MR_Next},
-    {"^BM_CounterSet1_Tabular/threads:%int %console_report [ ]*%hrfloat [ ]*%hrfloat [ ]*%hrfloat$", MR_Next},
-    {"^[-]+$", MR_Next},
-    {"^Benchmark %s Time %s CPU %s Iterations %s Bat %s Baz %s Foo$", MR_Next},
-    {"^[-]+$", MR_Next},
-    {"^BM_CounterSet2_Tabular/threads:%int %console_report [ ]*%hrfloat [ ]*%hrfloat [ ]*%hrfloat$", MR_Next},
-    {"^BM_CounterSet2_Tabular/threads:%int %console_report [ ]*%hrfloat [ ]*%hrfloat [ ]*%hrfloat$", MR_Next},
-    {"^BM_CounterSet2_Tabular/threads:%int %console_report [ ]*%hrfloat [ ]*%hrfloat [ ]*%hrfloat$", MR_Next},
-    {"^BM_CounterSet2_Tabular/threads:%int %console_report [ ]*%hrfloat [ ]*%hrfloat [ ]*%hrfloat$", MR_Next},
-    {"^BM_CounterSet2_Tabular/threads:%int %console_report [ ]*%hrfloat [ ]*%hrfloat [ ]*%hrfloat$"},
-// clang-format on
-});
-ADD_CASES(TC_CSVOut, {{"%csv_header,"
-                       "\"Bar\",\"Bat\",\"Baz\",\"Foo\",\"Frob\",\"Lob\""}});
-
-// ========================================================================= //
-// ------------------------- Tabular Counters Output ----------------------- //
-// ========================================================================= //
-
-void BM_Counters_Tabular(benchmark::State& state) {
-  for (auto _ : state) {
-  }
-  namespace bm = benchmark;
-  state.counters.insert({
-    {"Foo",  { 1, bm::Counter::kAvgThreads}},
-    {"Bar",  { 2, bm::Counter::kAvgThreads}},
-    {"Baz",  { 4, bm::Counter::kAvgThreads}},
-    {"Bat",  { 8, bm::Counter::kAvgThreads}},
-    {"Frob", {16, bm::Counter::kAvgThreads}},
-    {"Lob",  {32, bm::Counter::kAvgThreads}},
-  });
-}
-BENCHMARK(BM_Counters_Tabular)->ThreadRange(1, 16);
-ADD_CASES(TC_JSONOut, {{"\"name\": \"BM_Counters_Tabular/threads:%int\",$"},
-                       {"\"iterations\": %int,$", MR_Next},
-                       {"\"real_time\": %float,$", MR_Next},
-                       {"\"cpu_time\": %float,$", MR_Next},
-                       {"\"time_unit\": \"ns\",$", MR_Next},
-                       {"\"Bar\": %float,$", MR_Next},
-                       {"\"Bat\": %float,$", MR_Next},
-                       {"\"Baz\": %float,$", MR_Next},
-                       {"\"Foo\": %float,$", MR_Next},
-                       {"\"Frob\": %float,$", MR_Next},
-                       {"\"Lob\": %float$", MR_Next},
-                       {"}", MR_Next}});
-ADD_CASES(TC_CSVOut, {{"^\"BM_Counters_Tabular/threads:%int\",%csv_report,"
-                       "%float,%float,%float,%float,%float,%float$"}});
-// VS2013 does not allow this function to be passed as a lambda argument
-// to CHECK_BENCHMARK_RESULTS()
-void CheckTabular(Results const& e) {
-  CHECK_COUNTER_VALUE(e, int, "Foo", EQ, 1);
-  CHECK_COUNTER_VALUE(e, int, "Bar", EQ, 2);
-  CHECK_COUNTER_VALUE(e, int, "Baz", EQ, 4);
-  CHECK_COUNTER_VALUE(e, int, "Bat", EQ, 8);
-  CHECK_COUNTER_VALUE(e, int, "Frob", EQ, 16);
-  CHECK_COUNTER_VALUE(e, int, "Lob", EQ, 32);
-}
-CHECK_BENCHMARK_RESULTS("BM_Counters_Tabular/threads:%int", &CheckTabular);
-
-// ========================================================================= //
-// -------------------- Tabular+Rate Counters Output ----------------------- //
-// ========================================================================= //
-
-void BM_CounterRates_Tabular(benchmark::State& state) {
-  for (auto _ : state) {
-  }
-  namespace bm = benchmark;
-  state.counters.insert({
-    {"Foo",  { 1, bm::Counter::kAvgThreadsRate}},
-    {"Bar",  { 2, bm::Counter::kAvgThreadsRate}},
-    {"Baz",  { 4, bm::Counter::kAvgThreadsRate}},
-    {"Bat",  { 8, bm::Counter::kAvgThreadsRate}},
-    {"Frob", {16, bm::Counter::kAvgThreadsRate}},
-    {"Lob",  {32, bm::Counter::kAvgThreadsRate}},
-  });
-}
-BENCHMARK(BM_CounterRates_Tabular)->ThreadRange(1, 16);
-ADD_CASES(TC_JSONOut, {{"\"name\": \"BM_CounterRates_Tabular/threads:%int\",$"},
-                       {"\"iterations\": %int,$", MR_Next},
-                       {"\"real_time\": %float,$", MR_Next},
-                       {"\"cpu_time\": %float,$", MR_Next},
-                       {"\"time_unit\": \"ns\",$", MR_Next},
-                       {"\"Bar\": %float,$", MR_Next},
-                       {"\"Bat\": %float,$", MR_Next},
-                       {"\"Baz\": %float,$", MR_Next},
-                       {"\"Foo\": %float,$", MR_Next},
-                       {"\"Frob\": %float,$", MR_Next},
-                       {"\"Lob\": %float$", MR_Next},
-                       {"}", MR_Next}});
-ADD_CASES(TC_CSVOut, {{"^\"BM_CounterRates_Tabular/threads:%int\",%csv_report,"
-                       "%float,%float,%float,%float,%float,%float$"}});
-// VS2013 does not allow this function to be passed as a lambda argument
-// to CHECK_BENCHMARK_RESULTS()
-void CheckTabularRate(Results const& e) {
-  double t = e.DurationCPUTime();
-  CHECK_FLOAT_COUNTER_VALUE(e, "Foo", EQ, 1./t, 0.001);
-  CHECK_FLOAT_COUNTER_VALUE(e, "Bar", EQ, 2./t, 0.001);
-  CHECK_FLOAT_COUNTER_VALUE(e, "Baz", EQ, 4./t, 0.001);
-  CHECK_FLOAT_COUNTER_VALUE(e, "Bat", EQ, 8./t, 0.001);
-  CHECK_FLOAT_COUNTER_VALUE(e, "Frob", EQ, 16./t, 0.001);
-  CHECK_FLOAT_COUNTER_VALUE(e, "Lob", EQ, 32./t, 0.001);
-}
-CHECK_BENCHMARK_RESULTS("BM_CounterRates_Tabular/threads:%int",
-                        &CheckTabularRate);
-
-// ========================================================================= //
-// ------------------------- Tabular Counters Output ----------------------- //
-// ========================================================================= //
-
-// set only some of the counters
-void BM_CounterSet0_Tabular(benchmark::State& state) {
-  for (auto _ : state) {
-  }
-  namespace bm = benchmark;
-  state.counters.insert({
-    {"Foo", {10, bm::Counter::kAvgThreads}},
-    {"Bar", {20, bm::Counter::kAvgThreads}},
-    {"Baz", {40, bm::Counter::kAvgThreads}},
-  });
-}
-BENCHMARK(BM_CounterSet0_Tabular)->ThreadRange(1, 16);
-ADD_CASES(TC_JSONOut, {{"\"name\": \"BM_CounterSet0_Tabular/threads:%int\",$"},
-                       {"\"iterations\": %int,$", MR_Next},
-                       {"\"real_time\": %float,$", MR_Next},
-                       {"\"cpu_time\": %float,$", MR_Next},
-                       {"\"time_unit\": \"ns\",$", MR_Next},
-                       {"\"Bar\": %float,$", MR_Next},
-                       {"\"Baz\": %float,$", MR_Next},
-                       {"\"Foo\": %float$", MR_Next},
-                       {"}", MR_Next}});
-ADD_CASES(TC_CSVOut, {{"^\"BM_CounterSet0_Tabular/threads:%int\",%csv_report,"
-                       "%float,,%float,%float,,"}});
-// VS2013 does not allow this function to be passed as a lambda argument
-// to CHECK_BENCHMARK_RESULTS()
-void CheckSet0(Results const& e) {
-  CHECK_COUNTER_VALUE(e, int, "Foo", EQ, 10);
-  CHECK_COUNTER_VALUE(e, int, "Bar", EQ, 20);
-  CHECK_COUNTER_VALUE(e, int, "Baz", EQ, 40);
-}
-CHECK_BENCHMARK_RESULTS("BM_CounterSet0_Tabular", &CheckSet0);
-
-// again.
-void BM_CounterSet1_Tabular(benchmark::State& state) {
-  for (auto _ : state) {
-  }
-  namespace bm = benchmark;
-  state.counters.insert({
-    {"Foo", {15, bm::Counter::kAvgThreads}},
-    {"Bar", {25, bm::Counter::kAvgThreads}},
-    {"Baz", {45, bm::Counter::kAvgThreads}},
-  });
-}
-BENCHMARK(BM_CounterSet1_Tabular)->ThreadRange(1, 16);
-ADD_CASES(TC_JSONOut, {{"\"name\": \"BM_CounterSet1_Tabular/threads:%int\",$"},
-                       {"\"iterations\": %int,$", MR_Next},
-                       {"\"real_time\": %float,$", MR_Next},
-                       {"\"cpu_time\": %float,$", MR_Next},
-                       {"\"time_unit\": \"ns\",$", MR_Next},
-                       {"\"Bar\": %float,$", MR_Next},
-                       {"\"Baz\": %float,$", MR_Next},
-                       {"\"Foo\": %float$", MR_Next},
-                       {"}", MR_Next}});
-ADD_CASES(TC_CSVOut, {{"^\"BM_CounterSet1_Tabular/threads:%int\",%csv_report,"
-                       "%float,,%float,%float,,"}});
-// VS2013 does not allow this function to be passed as a lambda argument
-// to CHECK_BENCHMARK_RESULTS()
-void CheckSet1(Results const& e) {
-  CHECK_COUNTER_VALUE(e, int, "Foo", EQ, 15);
-  CHECK_COUNTER_VALUE(e, int, "Bar", EQ, 25);
-  CHECK_COUNTER_VALUE(e, int, "Baz", EQ, 45);
-}
-CHECK_BENCHMARK_RESULTS("BM_CounterSet1_Tabular/threads:%int", &CheckSet1);
-
-// ========================================================================= //
-// ------------------------- Tabular Counters Output ----------------------- //
-// ========================================================================= //
-
-// set only some of the counters, different set now.
-void BM_CounterSet2_Tabular(benchmark::State& state) {
-  for (auto _ : state) {
-  }
-  namespace bm = benchmark;
-  state.counters.insert({
-    {"Foo", {10, bm::Counter::kAvgThreads}},
-    {"Bat", {30, bm::Counter::kAvgThreads}},
-    {"Baz", {40, bm::Counter::kAvgThreads}},
-  });
-}
-BENCHMARK(BM_CounterSet2_Tabular)->ThreadRange(1, 16);
-ADD_CASES(TC_JSONOut, {{"\"name\": \"BM_CounterSet2_Tabular/threads:%int\",$"},
-                       {"\"iterations\": %int,$", MR_Next},
-                       {"\"real_time\": %float,$", MR_Next},
-                       {"\"cpu_time\": %float,$", MR_Next},
-                       {"\"time_unit\": \"ns\",$", MR_Next},
-                       {"\"Bat\": %float,$", MR_Next},
-                       {"\"Baz\": %float,$", MR_Next},
-                       {"\"Foo\": %float$", MR_Next},
-                       {"}", MR_Next}});
-ADD_CASES(TC_CSVOut, {{"^\"BM_CounterSet2_Tabular/threads:%int\",%csv_report,"
-                       ",%float,%float,%float,,"}});
-// VS2013 does not allow this function to be passed as a lambda argument
-// to CHECK_BENCHMARK_RESULTS()
-void CheckSet2(Results const& e) {
-  CHECK_COUNTER_VALUE(e, int, "Foo", EQ, 10);
-  CHECK_COUNTER_VALUE(e, int, "Bat", EQ, 30);
-  CHECK_COUNTER_VALUE(e, int, "Baz", EQ, 40);
-}
-CHECK_BENCHMARK_RESULTS("BM_CounterSet2_Tabular", &CheckSet2);
-
-// ========================================================================= //
-// --------------------------- TEST CASES END ------------------------------ //
-// ========================================================================= //
-
-int main(int argc, char* argv[]) { RunOutputTests(argc, argv); }
diff --git a/gnu/llvm/llvm/utils/benchmark/test/user_counters_test.cc b/gnu/llvm/llvm/utils/benchmark/test/user_counters_test.cc
deleted file mode 100644
index 06aafb1fa14..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/test/user_counters_test.cc
+++ /dev/null
@@ -1,217 +0,0 @@
-
-#undef NDEBUG
-
-#include "benchmark/benchmark.h"
-#include "output_test.h"
-
-// ========================================================================= //
-// ---------------------- Testing Prologue Output -------------------------- //
-// ========================================================================= //
-
-ADD_CASES(TC_ConsoleOut,
-          {{"^[-]+$", MR_Next},
-           {"^Benchmark %s Time %s CPU %s Iterations UserCounters...$", MR_Next},
-           {"^[-]+$", MR_Next}});
-ADD_CASES(TC_CSVOut, {{"%csv_header,\"bar\",\"foo\""}});
-
-// ========================================================================= //
-// ------------------------- Simple Counters Output ------------------------ //
-// ========================================================================= //
-
-void BM_Counters_Simple(benchmark::State& state) {
-  for (auto _ : state) {
-  }
-  state.counters["foo"] = 1;
-  state.counters["bar"] = 2 * (double)state.iterations();
-}
-BENCHMARK(BM_Counters_Simple);
-ADD_CASES(TC_ConsoleOut, {{"^BM_Counters_Simple %console_report bar=%hrfloat foo=%hrfloat$"}});
-ADD_CASES(TC_JSONOut, {{"\"name\": \"BM_Counters_Simple\",$"},
-                       {"\"iterations\": %int,$", MR_Next},
-                       {"\"real_time\": %float,$", MR_Next},
-                       {"\"cpu_time\": %float,$", MR_Next},
-                       {"\"time_unit\": \"ns\",$", MR_Next},
-                       {"\"bar\": %float,$", MR_Next},
-                       {"\"foo\": %float$", MR_Next},
-                       {"}", MR_Next}});
-ADD_CASES(TC_CSVOut, {{"^\"BM_Counters_Simple\",%csv_report,%float,%float$"}});
-// VS2013 does not allow this function to be passed as a lambda argument
-// to CHECK_BENCHMARK_RESULTS()
-void CheckSimple(Results const& e) {
-  double its = e.GetAs< double >("iterations");
-  CHECK_COUNTER_VALUE(e, int, "foo", EQ, 1);
-  // check that the value of bar is within 0.1% of the expected value
-  CHECK_FLOAT_COUNTER_VALUE(e, "bar", EQ, 2.*its, 0.001);
-}
-CHECK_BENCHMARK_RESULTS("BM_Counters_Simple", &CheckSimple);
-
-// ========================================================================= //
-// --------------------- Counters+Items+Bytes/s Output --------------------- //
-// ========================================================================= //
-
-namespace { int num_calls1 = 0; }
-void BM_Counters_WithBytesAndItemsPSec(benchmark::State& state) {
-  for (auto _ : state) {
-  }
-  state.counters["foo"] = 1;
-  state.counters["bar"] = ++num_calls1;
-  state.SetBytesProcessed(364);
-  state.SetItemsProcessed(150);
-}
-BENCHMARK(BM_Counters_WithBytesAndItemsPSec);
-ADD_CASES(TC_ConsoleOut,
-          {{"^BM_Counters_WithBytesAndItemsPSec %console_report "
-            "bar=%hrfloat foo=%hrfloat +%hrfloatB/s +%hrfloat items/s$"}});
-ADD_CASES(TC_JSONOut, {{"\"name\": \"BM_Counters_WithBytesAndItemsPSec\",$"},
-                       {"\"iterations\": %int,$", MR_Next},
-                       {"\"real_time\": %float,$", MR_Next},
-                       {"\"cpu_time\": %float,$", MR_Next},
-                       {"\"time_unit\": \"ns\",$", MR_Next},
-                       {"\"bytes_per_second\": %float,$", MR_Next},
-                       {"\"items_per_second\": %float,$", MR_Next},
-                       {"\"bar\": %float,$", MR_Next},
-                       {"\"foo\": %float$", MR_Next},
-                       {"}", MR_Next}});
-ADD_CASES(TC_CSVOut, {{"^\"BM_Counters_WithBytesAndItemsPSec\","
-                       "%csv_bytes_items_report,%float,%float$"}});
-// VS2013 does not allow this function to be passed as a lambda argument
-// to CHECK_BENCHMARK_RESULTS()
-void CheckBytesAndItemsPSec(Results const& e) {
-  double t = e.DurationCPUTime(); // this (and not real time) is the time used
-  CHECK_COUNTER_VALUE(e, int, "foo", EQ, 1);
-  CHECK_COUNTER_VALUE(e, int, "bar", EQ, num_calls1);
-  // check that the values are within 0.1% of the expected values
-  CHECK_FLOAT_RESULT_VALUE(e, "bytes_per_second", EQ, 364./t, 0.001);
-  CHECK_FLOAT_RESULT_VALUE(e, "items_per_second", EQ, 150./t, 0.001);
-}
-CHECK_BENCHMARK_RESULTS("BM_Counters_WithBytesAndItemsPSec",
-                        &CheckBytesAndItemsPSec);
-
-// ========================================================================= //
-// ------------------------- Rate Counters Output -------------------------- //
-// ========================================================================= //
-
-void BM_Counters_Rate(benchmark::State& state) {
-  for (auto _ : state) {
-  }
-  namespace bm = benchmark;
-  state.counters["foo"] = bm::Counter{1, bm::Counter::kIsRate};
-  state.counters["bar"] = bm::Counter{2, bm::Counter::kIsRate};
-}
-BENCHMARK(BM_Counters_Rate);
-ADD_CASES(TC_ConsoleOut, {{"^BM_Counters_Rate %console_report bar=%hrfloat/s foo=%hrfloat/s$"}});
-ADD_CASES(TC_JSONOut, {{"\"name\": \"BM_Counters_Rate\",$"},
-                       {"\"iterations\": %int,$", MR_Next},
-                       {"\"real_time\": %float,$", MR_Next},
-                       {"\"cpu_time\": %float,$", MR_Next},
-                       {"\"time_unit\": \"ns\",$", MR_Next},
-                       {"\"bar\": %float,$", MR_Next},
-                       {"\"foo\": %float$", MR_Next},
-                       {"}", MR_Next}});
-ADD_CASES(TC_CSVOut, {{"^\"BM_Counters_Rate\",%csv_report,%float,%float$"}});
-// VS2013 does not allow this function to be passed as a lambda argument
-// to CHECK_BENCHMARK_RESULTS()
-void CheckRate(Results const& e) {
-  double t = e.DurationCPUTime(); // this (and not real time) is the time used
-  // check that the values are within 0.1% of the expected values
-  CHECK_FLOAT_COUNTER_VALUE(e, "foo", EQ, 1./t, 0.001);
-  CHECK_FLOAT_COUNTER_VALUE(e, "bar", EQ, 2./t, 0.001);
-}
-CHECK_BENCHMARK_RESULTS("BM_Counters_Rate", &CheckRate);
-
-// ========================================================================= //
-// ------------------------- Thread Counters Output ------------------------ //
-// ========================================================================= //
-
-void BM_Counters_Threads(benchmark::State& state) {
-  for (auto _ : state) {
-  }
-  state.counters["foo"] = 1;
-  state.counters["bar"] = 2;
-}
-BENCHMARK(BM_Counters_Threads)->ThreadRange(1, 8);
-ADD_CASES(TC_ConsoleOut, {{"^BM_Counters_Threads/threads:%int %console_report bar=%hrfloat foo=%hrfloat$"}});
-ADD_CASES(TC_JSONOut, {{"\"name\": \"BM_Counters_Threads/threads:%int\",$"},
-                       {"\"iterations\": %int,$", MR_Next},
-                       {"\"real_time\": %float,$", MR_Next},
-                       {"\"cpu_time\": %float,$", MR_Next},
-                       {"\"time_unit\": \"ns\",$", MR_Next},
-                       {"\"bar\": %float,$", MR_Next},
-                       {"\"foo\": %float$", MR_Next},
-                       {"}", MR_Next}});
-ADD_CASES(TC_CSVOut, {{"^\"BM_Counters_Threads/threads:%int\",%csv_report,%float,%float$"}});
-// VS2013 does not allow this function to be passed as a lambda argument
-// to CHECK_BENCHMARK_RESULTS()
-void CheckThreads(Results const& e) {
-  CHECK_COUNTER_VALUE(e, int, "foo", EQ, e.NumThreads());
-  CHECK_COUNTER_VALUE(e, int, "bar", EQ, 2 * e.NumThreads());
-}
-CHECK_BENCHMARK_RESULTS("BM_Counters_Threads/threads:%int", &CheckThreads);
-
-// ========================================================================= //
-// ---------------------- ThreadAvg Counters Output ------------------------ //
-// ========================================================================= //
-
-void BM_Counters_AvgThreads(benchmark::State& state) {
-  for (auto _ : state) {
-  }
-  namespace bm = benchmark;
-  state.counters["foo"] = bm::Counter{1, bm::Counter::kAvgThreads};
-  state.counters["bar"] = bm::Counter{2, bm::Counter::kAvgThreads};
-}
-BENCHMARK(BM_Counters_AvgThreads)->ThreadRange(1, 8);
-ADD_CASES(TC_ConsoleOut, {{"^BM_Counters_AvgThreads/threads:%int %console_report bar=%hrfloat foo=%hrfloat$"}});
-ADD_CASES(TC_JSONOut, {{"\"name\": \"BM_Counters_AvgThreads/threads:%int\",$"},
-                       {"\"iterations\": %int,$", MR_Next},
-                       {"\"real_time\": %float,$", MR_Next},
-                       {"\"cpu_time\": %float,$", MR_Next},
-                       {"\"time_unit\": \"ns\",$", MR_Next},
-                       {"\"bar\": %float,$", MR_Next},
-                       {"\"foo\": %float$", MR_Next},
-                       {"}", MR_Next}});
-ADD_CASES(TC_CSVOut, {{"^\"BM_Counters_AvgThreads/threads:%int\",%csv_report,%float,%float$"}});
-// VS2013 does not allow this function to be passed as a lambda argument
-// to CHECK_BENCHMARK_RESULTS()
-void CheckAvgThreads(Results const& e) {
-  CHECK_COUNTER_VALUE(e, int, "foo", EQ, 1);
-  CHECK_COUNTER_VALUE(e, int, "bar", EQ, 2);
-}
-CHECK_BENCHMARK_RESULTS("BM_Counters_AvgThreads/threads:%int",
-                        &CheckAvgThreads);
-
-// ========================================================================= //
-// ---------------------- ThreadAvg Counters Output ------------------------ //
-// ========================================================================= //
-
-void BM_Counters_AvgThreadsRate(benchmark::State& state) {
-  for (auto _ : state) {
-  }
-  namespace bm = benchmark;
-  state.counters["foo"] = bm::Counter{1, bm::Counter::kAvgThreadsRate};
-  state.counters["bar"] = bm::Counter{2, bm::Counter::kAvgThreadsRate};
-}
-BENCHMARK(BM_Counters_AvgThreadsRate)->ThreadRange(1, 8);
-ADD_CASES(TC_ConsoleOut, {{"^BM_Counters_AvgThreadsRate/threads:%int %console_report bar=%hrfloat/s foo=%hrfloat/s$"}});
-ADD_CASES(TC_JSONOut, {{"\"name\": \"BM_Counters_AvgThreadsRate/threads:%int\",$"},
-                       {"\"iterations\": %int,$", MR_Next},
-                       {"\"real_time\": %float,$", MR_Next},
-                       {"\"cpu_time\": %float,$", MR_Next},
-                       {"\"time_unit\": \"ns\",$", MR_Next},
-                       {"\"bar\": %float,$", MR_Next},
-                       {"\"foo\": %float$", MR_Next},
-                       {"}", MR_Next}});
-ADD_CASES(TC_CSVOut, {{"^\"BM_Counters_AvgThreadsRate/threads:%int\",%csv_report,%float,%float$"}});
-// VS2013 does not allow this function to be passed as a lambda argument
-// to CHECK_BENCHMARK_RESULTS()
-void CheckAvgThreadsRate(Results const& e) {
-  CHECK_FLOAT_COUNTER_VALUE(e, "foo", EQ, 1./e.DurationCPUTime(), 0.001);
-  CHECK_FLOAT_COUNTER_VALUE(e, "bar", EQ, 2./e.DurationCPUTime(), 0.001);
-}
-CHECK_BENCHMARK_RESULTS("BM_Counters_AvgThreadsRate/threads:%int",
-                        &CheckAvgThreadsRate);
-
-// ========================================================================= //
-// --------------------------- TEST CASES END ------------------------------ //
-// ========================================================================= //
-
-int main(int argc, char* argv[]) { RunOutputTests(argc, argv); }
diff --git a/gnu/llvm/llvm/utils/benchmark/tools/compare.py b/gnu/llvm/llvm/utils/benchmark/tools/compare.py
deleted file mode 100644
index f0a4455f5fb..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/tools/compare.py
+++ /dev/null
@@ -1,316 +0,0 @@
-#!/usr/bin/env python
-
-"""
-compare.py - versatile benchmark output compare tool
-"""
-
-import argparse
-from argparse import ArgumentParser
-import sys
-import gbench
-from gbench import util, report
-from gbench.util import *
-
-
-def check_inputs(in1, in2, flags):
-    """
-    Perform checking on the user provided inputs and diagnose any abnormalities
-    """
-    in1_kind, in1_err = classify_input_file(in1)
-    in2_kind, in2_err = classify_input_file(in2)
-    output_file = find_benchmark_flag('--benchmark_out=', flags)
-    output_type = find_benchmark_flag('--benchmark_out_format=', flags)
-    if in1_kind == IT_Executable and in2_kind == IT_Executable and output_file:
-        print(("WARNING: '--benchmark_out=%s' will be passed to both "
-               "benchmarks causing it to be overwritten") % output_file)
-    if in1_kind == IT_JSON and in2_kind == IT_JSON and len(flags) > 0:
-        print("WARNING: passing optional flags has no effect since both "
-              "inputs are JSON")
-    if output_type is not None and output_type != 'json':
-        print(("ERROR: passing '--benchmark_out_format=%s' to 'compare.py`"
-               " is not supported.") % output_type)
-        sys.exit(1)
-
-
-def create_parser():
-    parser = ArgumentParser(
-        description='versatile benchmark output compare tool')
-    subparsers = parser.add_subparsers(
-        help='This tool has multiple modes of operation:',
-        dest='mode')
-
-    parser_a = subparsers.add_parser(
-        'benchmarks',
-        help='The most simple use-case, compare all the output of these two benchmarks')
-    baseline = parser_a.add_argument_group(
-        'baseline', 'The benchmark baseline')
-    baseline.add_argument(
-        'test_baseline',
-        metavar='test_baseline',
-        type=argparse.FileType('r'),
-        nargs=1,
-        help='A benchmark executable or JSON output file')
-    contender = parser_a.add_argument_group(
-        'contender', 'The benchmark that will be compared against the baseline')
-    contender.add_argument(
-        'test_contender',
-        metavar='test_contender',
-        type=argparse.FileType('r'),
-        nargs=1,
-        help='A benchmark executable or JSON output file')
-    parser_a.add_argument(
-        'benchmark_options',
-        metavar='benchmark_options',
-        nargs=argparse.REMAINDER,
-        help='Arguments to pass when running benchmark executables')
-
-    parser_b = subparsers.add_parser(
-        'filters', help='Compare filter one with the filter two of benchmark')
-    baseline = parser_b.add_argument_group(
-        'baseline', 'The benchmark baseline')
-    baseline.add_argument(
-        'test',
-        metavar='test',
-        type=argparse.FileType('r'),
-        nargs=1,
-        help='A benchmark executable or JSON output file')
-    baseline.add_argument(
-        'filter_baseline',
-        metavar='filter_baseline',
-        type=str,
-        nargs=1,
-        help='The first filter, that will be used as baseline')
-    contender = parser_b.add_argument_group(
-        'contender', 'The benchmark that will be compared against the baseline')
-    contender.add_argument(
-        'filter_contender',
-        metavar='filter_contender',
-        type=str,
-        nargs=1,
-        help='The second filter, that will be compared against the baseline')
-    parser_b.add_argument(
-        'benchmark_options',
-        metavar='benchmark_options',
-        nargs=argparse.REMAINDER,
-        help='Arguments to pass when running benchmark executables')
-
-    parser_c = subparsers.add_parser(
-        'benchmarksfiltered',
-        help='Compare filter one of first benchmark with filter two of the second benchmark')
-    baseline = parser_c.add_argument_group(
-        'baseline', 'The benchmark baseline')
-    baseline.add_argument(
-        'test_baseline',
-        metavar='test_baseline',
-        type=argparse.FileType('r'),
-        nargs=1,
-        help='A benchmark executable or JSON output file')
-    baseline.add_argument(
-        'filter_baseline',
-        metavar='filter_baseline',
-        type=str,
-        nargs=1,
-        help='The first filter, that will be used as baseline')
-    contender = parser_c.add_argument_group(
-        'contender', 'The benchmark that will be compared against the baseline')
-    contender.add_argument(
-        'test_contender',
-        metavar='test_contender',
-        type=argparse.FileType('r'),
-        nargs=1,
-        help='The second benchmark executable or JSON output file, that will be compared against the baseline')
-    contender.add_argument(
-        'filter_contender',
-        metavar='filter_contender',
-        type=str,
-        nargs=1,
-        help='The second filter, that will be compared against the baseline')
-    parser_c.add_argument(
-        'benchmark_options',
-        metavar='benchmark_options',
-        nargs=argparse.REMAINDER,
-        help='Arguments to pass when running benchmark executables')
-
-    return parser
-
-
-def main():
-    # Parse the command line flags
-    parser = create_parser()
-    args, unknown_args = parser.parse_known_args()
-    if args.mode is None:
-      parser.print_help()
-      exit(1)
-    assert not unknown_args
-    benchmark_options = args.benchmark_options
-
-    if args.mode == 'benchmarks':
-        test_baseline = args.test_baseline[0].name
-        test_contender = args.test_contender[0].name
-        filter_baseline = ''
-        filter_contender = ''
-
-        # NOTE: if test_baseline == test_contender, you are analyzing the stdev
-
-        description = 'Comparing %s to %s' % (test_baseline, test_contender)
-    elif args.mode == 'filters':
-        test_baseline = args.test[0].name
-        test_contender = args.test[0].name
-        filter_baseline = args.filter_baseline[0]
-        filter_contender = args.filter_contender[0]
-
-        # NOTE: if filter_baseline == filter_contender, you are analyzing the
-        # stdev
-
-        description = 'Comparing %s to %s (from %s)' % (
-            filter_baseline, filter_contender, args.test[0].name)
-    elif args.mode == 'benchmarksfiltered':
-        test_baseline = args.test_baseline[0].name
-        test_contender = args.test_contender[0].name
-        filter_baseline = args.filter_baseline[0]
-        filter_contender = args.filter_contender[0]
-
-        # NOTE: if test_baseline == test_contender and
-        # filter_baseline == filter_contender, you are analyzing the stdev
-
-        description = 'Comparing %s (from %s) to %s (from %s)' % (
-            filter_baseline, test_baseline, filter_contender, test_contender)
-    else:
-        # should never happen
-        print("Unrecognized mode of operation: '%s'" % args.mode)
-        parser.print_help()
-        exit(1)
-
-    check_inputs(test_baseline, test_contender, benchmark_options)
-
-    options_baseline = []
-    options_contender = []
-
-    if filter_baseline and filter_contender:
-        options_baseline = ['--benchmark_filter=%s' % filter_baseline]
-        options_contender = ['--benchmark_filter=%s' % filter_contender]
-
-    # Run the benchmarks and report the results
-    json1 = json1_orig = gbench.util.run_or_load_benchmark(
-        test_baseline, benchmark_options + options_baseline)
-    json2 = json2_orig = gbench.util.run_or_load_benchmark(
-        test_contender, benchmark_options + options_contender)
-
-    # Now, filter the benchmarks so that the difference report can work
-    if filter_baseline and filter_contender:
-        replacement = '[%s vs. %s]' % (filter_baseline, filter_contender)
-        json1 = gbench.report.filter_benchmark(
-            json1_orig, filter_baseline, replacement)
-        json2 = gbench.report.filter_benchmark(
-            json2_orig, filter_contender, replacement)
-
-    # Diff and output
-    output_lines = gbench.report.generate_difference_report(json1, json2)
-    print(description)
-    for ln in output_lines:
-        print(ln)
-
-
-import unittest
-
-
-class TestParser(unittest.TestCase):
-    def setUp(self):
-        self.parser = create_parser()
-        testInputs = os.path.join(
-            os.path.dirname(
-                os.path.realpath(__file__)),
-            'gbench',
-            'Inputs')
-        self.testInput0 = os.path.join(testInputs, 'test1_run1.json')
-        self.testInput1 = os.path.join(testInputs, 'test1_run2.json')
-
-    def test_benchmarks_basic(self):
-        parsed = self.parser.parse_args(
-            ['benchmarks', self.testInput0, self.testInput1])
-        self.assertEqual(parsed.mode, 'benchmarks')
-        self.assertEqual(parsed.test_baseline[0].name, self.testInput0)
-        self.assertEqual(parsed.test_contender[0].name, self.testInput1)
-        self.assertFalse(parsed.benchmark_options)
-
-    def test_benchmarks_with_remainder(self):
-        parsed = self.parser.parse_args(
-            ['benchmarks', self.testInput0, self.testInput1, 'd'])
-        self.assertEqual(parsed.mode, 'benchmarks')
-        self.assertEqual(parsed.test_baseline[0].name, self.testInput0)
-        self.assertEqual(parsed.test_contender[0].name, self.testInput1)
-        self.assertEqual(parsed.benchmark_options, ['d'])
-
-    def test_benchmarks_with_remainder_after_doubleminus(self):
-        parsed = self.parser.parse_args(
-            ['benchmarks', self.testInput0, self.testInput1, '--', 'e'])
-        self.assertEqual(parsed.mode, 'benchmarks')
-        self.assertEqual(parsed.test_baseline[0].name, self.testInput0)
-        self.assertEqual(parsed.test_contender[0].name, self.testInput1)
-        self.assertEqual(parsed.benchmark_options, ['e'])
-
-    def test_filters_basic(self):
-        parsed = self.parser.parse_args(
-            ['filters', self.testInput0, 'c', 'd'])
-        self.assertEqual(parsed.mode, 'filters')
-        self.assertEqual(parsed.test[0].name, self.testInput0)
-        self.assertEqual(parsed.filter_baseline[0], 'c')
-        self.assertEqual(parsed.filter_contender[0], 'd')
-        self.assertFalse(parsed.benchmark_options)
-
-    def test_filters_with_remainder(self):
-        parsed = self.parser.parse_args(
-            ['filters', self.testInput0, 'c', 'd', 'e'])
-        self.assertEqual(parsed.mode, 'filters')
-        self.assertEqual(parsed.test[0].name, self.testInput0)
-        self.assertEqual(parsed.filter_baseline[0], 'c')
-        self.assertEqual(parsed.filter_contender[0], 'd')
-        self.assertEqual(parsed.benchmark_options, ['e'])
-
-    def test_filters_with_remainder_after_doubleminus(self):
-        parsed = self.parser.parse_args(
-            ['filters', self.testInput0, 'c', 'd', '--', 'f'])
-        self.assertEqual(parsed.mode, 'filters')
-        self.assertEqual(parsed.test[0].name, self.testInput0)
-        self.assertEqual(parsed.filter_baseline[0], 'c')
-        self.assertEqual(parsed.filter_contender[0], 'd')
-        self.assertEqual(parsed.benchmark_options, ['f'])
-
-    def test_benchmarksfiltered_basic(self):
-        parsed = self.parser.parse_args(
-            ['benchmarksfiltered', self.testInput0, 'c', self.testInput1, 'e'])
-        self.assertEqual(parsed.mode, 'benchmarksfiltered')
-        self.assertEqual(parsed.test_baseline[0].name, self.testInput0)
-        self.assertEqual(parsed.filter_baseline[0], 'c')
-        self.assertEqual(parsed.test_contender[0].name, self.testInput1)
-        self.assertEqual(parsed.filter_contender[0], 'e')
-        self.assertFalse(parsed.benchmark_options)
-
-    def test_benchmarksfiltered_with_remainder(self):
-        parsed = self.parser.parse_args(
-            ['benchmarksfiltered', self.testInput0, 'c', self.testInput1, 'e', 'f'])
-        self.assertEqual(parsed.mode, 'benchmarksfiltered')
-        self.assertEqual(parsed.test_baseline[0].name, self.testInput0)
-        self.assertEqual(parsed.filter_baseline[0], 'c')
-        self.assertEqual(parsed.test_contender[0].name, self.testInput1)
-        self.assertEqual(parsed.filter_contender[0], 'e')
-        self.assertEqual(parsed.benchmark_options[0], 'f')
-
-    def test_benchmarksfiltered_with_remainder_after_doubleminus(self):
-        parsed = self.parser.parse_args(
-            ['benchmarksfiltered', self.testInput0, 'c', self.testInput1, 'e', '--', 'g'])
-        self.assertEqual(parsed.mode, 'benchmarksfiltered')
-        self.assertEqual(parsed.test_baseline[0].name, self.testInput0)
-        self.assertEqual(parsed.filter_baseline[0], 'c')
-        self.assertEqual(parsed.test_contender[0].name, self.testInput1)
-        self.assertEqual(parsed.filter_contender[0], 'e')
-        self.assertEqual(parsed.benchmark_options[0], 'g')
-
-
-if __name__ == '__main__':
-    # unittest.main()
-    main()
-
-# vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4
-# kate: tab-width: 4; replace-tabs on; indent-width 4; tab-indents: off;
-# kate: indent-mode python; remove-trailing-spaces modified;
diff --git a/gnu/llvm/llvm/utils/benchmark/tools/gbench/Inputs/test1_run1.json b/gnu/llvm/llvm/utils/benchmark/tools/gbench/Inputs/test1_run1.json
deleted file mode 100644
index d7ec6a9c8f6..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/tools/gbench/Inputs/test1_run1.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-  "context": {
-    "date": "2016-08-02 17:44:46",
-    "num_cpus": 4,
-    "mhz_per_cpu": 4228,
-    "cpu_scaling_enabled": false,
-    "library_build_type": "release"
-  },
-  "benchmarks": [
-    {
-      "name": "BM_SameTimes",
-      "iterations": 1000,
-      "real_time": 10,
-      "cpu_time": 10,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_2xFaster",
-      "iterations": 1000,
-      "real_time": 50,
-      "cpu_time": 50,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_2xSlower",
-      "iterations": 1000,
-      "real_time": 50,
-      "cpu_time": 50,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_1PercentFaster",
-      "iterations": 1000,
-      "real_time": 100,
-      "cpu_time": 100,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_1PercentSlower",
-      "iterations": 1000,
-      "real_time": 100,
-      "cpu_time": 100,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_10PercentFaster",
-      "iterations": 1000,
-      "real_time": 100,
-      "cpu_time": 100,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_10PercentSlower",
-      "iterations": 1000,
-      "real_time": 100,
-      "cpu_time": 100,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_100xSlower",
-      "iterations": 1000,
-      "real_time": 100,
-      "cpu_time": 100,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_100xFaster",
-      "iterations": 1000,
-      "real_time": 10000,
-      "cpu_time": 10000,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_10PercentCPUToTime",
-      "iterations": 1000,
-      "real_time": 100,
-      "cpu_time": 100,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_ThirdFaster",
-      "iterations": 1000,
-      "real_time": 100,
-      "cpu_time": 100,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_BadTimeUnit",
-      "iterations": 1000,
-      "real_time": 0.4,
-      "cpu_time": 0.5,
-      "time_unit": "s"
-    },
-    {
-      "name": "BM_DifferentTimeUnit",
-      "iterations": 1,
-      "real_time": 1,
-      "cpu_time": 1,
-      "time_unit": "s"
-    }
-  ]
-}
diff --git a/gnu/llvm/llvm/utils/benchmark/tools/gbench/Inputs/test1_run2.json b/gnu/llvm/llvm/utils/benchmark/tools/gbench/Inputs/test1_run2.json
deleted file mode 100644
index 59a5ffaca4d..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/tools/gbench/Inputs/test1_run2.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-  "context": {
-    "date": "2016-08-02 17:44:46",
-    "num_cpus": 4,
-    "mhz_per_cpu": 4228,
-    "cpu_scaling_enabled": false,
-    "library_build_type": "release"
-  },
-  "benchmarks": [
-    {
-      "name": "BM_SameTimes",
-      "iterations": 1000,
-      "real_time": 10,
-      "cpu_time": 10,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_2xFaster",
-      "iterations": 1000,
-      "real_time": 25,
-      "cpu_time": 25,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_2xSlower",
-      "iterations": 20833333,
-      "real_time": 100,
-      "cpu_time": 100,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_1PercentFaster",
-      "iterations": 1000,
-      "real_time": 98.9999999,
-      "cpu_time": 98.9999999,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_1PercentSlower",
-      "iterations": 1000,
-      "real_time": 100.9999999,
-      "cpu_time": 100.9999999,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_10PercentFaster",
-      "iterations": 1000,
-      "real_time": 90,
-      "cpu_time": 90,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_10PercentSlower",
-      "iterations": 1000,
-      "real_time": 110,
-      "cpu_time": 110,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_100xSlower",
-      "iterations": 1000,
-      "real_time": 1.0000e+04,
-      "cpu_time": 1.0000e+04,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_100xFaster",
-      "iterations": 1000,
-      "real_time": 100,
-      "cpu_time": 100,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_10PercentCPUToTime",
-      "iterations": 1000,
-      "real_time": 110,
-      "cpu_time": 90,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_ThirdFaster",
-      "iterations": 1000,
-      "real_time": 66.665,
-      "cpu_time": 66.664,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_BadTimeUnit",
-      "iterations": 1000,
-      "real_time": 0.04,
-      "cpu_time": 0.6,
-      "time_unit": "s"
-    },
-    {
-      "name": "BM_DifferentTimeUnit",
-      "iterations": 1,
-      "real_time": 1,
-      "cpu_time": 1,
-      "time_unit": "ns"
-    }
-  ]
-}
diff --git a/gnu/llvm/llvm/utils/benchmark/tools/gbench/Inputs/test2_run.json b/gnu/llvm/llvm/utils/benchmark/tools/gbench/Inputs/test2_run.json
deleted file mode 100644
index 15bc6980304..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/tools/gbench/Inputs/test2_run.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  "context": {
-    "date": "2016-08-02 17:44:46",
-    "num_cpus": 4,
-    "mhz_per_cpu": 4228,
-    "cpu_scaling_enabled": false,
-    "library_build_type": "release"
-  },
-  "benchmarks": [
-    {
-      "name": "BM_Hi",
-      "iterations": 1234,
-      "real_time": 42,
-      "cpu_time": 24,
-      "time_unit": "ms"
-    },
-    {
-      "name": "BM_Zero",
-      "iterations": 1000,
-      "real_time": 10,
-      "cpu_time": 10,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_Zero/4",
-      "iterations": 4000,
-      "real_time": 40,
-      "cpu_time": 40,
-      "time_unit": "ns"
-    },
-    {
-      "name": "Prefix/BM_Zero",
-      "iterations": 2000,
-      "real_time": 20,
-      "cpu_time": 20,
-      "time_unit": "ns"
-    },
-    {
-      "name": "Prefix/BM_Zero/3",
-      "iterations": 3000,
-      "real_time": 30,
-      "cpu_time": 30,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_One",
-      "iterations": 5000,
-      "real_time": 5,
-      "cpu_time": 5,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_One/4",
-      "iterations": 2000,
-      "real_time": 20,
-      "cpu_time": 20,
-      "time_unit": "ns"
-    },
-    {
-      "name": "Prefix/BM_One",
-      "iterations": 1000,
-      "real_time": 10,
-      "cpu_time": 10,
-      "time_unit": "ns"
-    },
-    {
-      "name": "Prefix/BM_One/3",
-      "iterations": 1500,
-      "real_time": 15,
-      "cpu_time": 15,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_Bye",
-      "iterations": 5321,
-      "real_time": 11,
-      "cpu_time": 63,
-      "time_unit": "ns"
-    }
-  ]
-}
diff --git a/gnu/llvm/llvm/utils/benchmark/tools/gbench/__init__.py b/gnu/llvm/llvm/utils/benchmark/tools/gbench/__init__.py
deleted file mode 100644
index fce1a1acfbb..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/tools/gbench/__init__.py
+++ /dev/null
@@ -1,8 +0,0 @@
-"""Google Benchmark tooling"""
-
-__author__ = 'Eric Fiselier'
-__email__ = 'eric@efcs.ca'
-__versioninfo__ = (0, 5, 0)
-__version__ = '.'.join(str(v) for v in __versioninfo__) + 'dev'
-
-__all__ = []
diff --git a/gnu/llvm/llvm/utils/benchmark/tools/gbench/report.py b/gnu/llvm/llvm/utils/benchmark/tools/gbench/report.py
deleted file mode 100644
index 0c090981a83..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/tools/gbench/report.py
+++ /dev/null
@@ -1,208 +0,0 @@
-"""report.py - Utilities for reporting statistics about benchmark results
-"""
-import os
-import re
-import copy
-
-class BenchmarkColor(object):
-    def __init__(self, name, code):
-        self.name = name
-        self.code = code
-
-    def __repr__(self):
-        return '%s%r' % (self.__class__.__name__,
-                         (self.name, self.code))
-
-    def __format__(self, format):
-        return self.code
-
-# Benchmark Colors Enumeration
-BC_NONE = BenchmarkColor('NONE', '')
-BC_MAGENTA = BenchmarkColor('MAGENTA', '\033[95m')
-BC_CYAN = BenchmarkColor('CYAN', '\033[96m')
-BC_OKBLUE = BenchmarkColor('OKBLUE', '\033[94m')
-BC_HEADER = BenchmarkColor('HEADER', '\033[92m')
-BC_WARNING = BenchmarkColor('WARNING', '\033[93m')
-BC_WHITE = BenchmarkColor('WHITE', '\033[97m')
-BC_FAIL = BenchmarkColor('FAIL', '\033[91m')
-BC_ENDC = BenchmarkColor('ENDC', '\033[0m')
-BC_BOLD = BenchmarkColor('BOLD', '\033[1m')
-BC_UNDERLINE = BenchmarkColor('UNDERLINE', '\033[4m')
-
-def color_format(use_color, fmt_str, *args, **kwargs):
-    """
-    Return the result of 'fmt_str.format(*args, **kwargs)' after transforming
-    'args' and 'kwargs' according to the value of 'use_color'. If 'use_color'
-    is False then all color codes in 'args' and 'kwargs' are replaced with
-    the empty string.
-    """
-    assert use_color is True or use_color is False
-    if not use_color:
-        args = [arg if not isinstance(arg, BenchmarkColor) else BC_NONE
-                for arg in args]
-        kwargs = {key: arg if not isinstance(arg, BenchmarkColor) else BC_NONE
-                  for key, arg in kwargs.items()}
-    return fmt_str.format(*args, **kwargs)
-
-
-def find_longest_name(benchmark_list):
-    """
-    Return the length of the longest benchmark name in a given list of
-    benchmark JSON objects
-    """
-    longest_name = 1
-    for bc in benchmark_list:
-        if len(bc['name']) > longest_name:
-            longest_name = len(bc['name'])
-    return longest_name
-
-
-def calculate_change(old_val, new_val):
-    """
-    Return a float representing the decimal change between old_val and new_val.
-    """
-    if old_val == 0 and new_val == 0:
-        return 0.0
-    if old_val == 0:
-        return float(new_val - old_val) / (float(old_val + new_val) / 2)
-    return float(new_val - old_val) / abs(old_val)
-
-
-def filter_benchmark(json_orig, family, replacement=""):
-    """
-    Apply a filter to the json, and only leave the 'family' of benchmarks.
-    """
-    regex = re.compile(family)
-    filtered = {}
-    filtered['benchmarks'] = []
-    for be in json_orig['benchmarks']:
-        if not regex.search(be['name']):
-            continue
-        filteredbench = copy.deepcopy(be) # Do NOT modify the old name!
-        filteredbench['name'] = regex.sub(replacement, filteredbench['name'])
-        filtered['benchmarks'].append(filteredbench)
-    return filtered
-
-
-def generate_difference_report(json1, json2, use_color=True):
-    """
-    Calculate and report the difference between each test of two benchmarks
-    runs specified as 'json1' and 'json2'.
-    """
-    first_col_width = find_longest_name(json1['benchmarks'])
-    def find_test(name):
-        for b in json2['benchmarks']:
-            if b['name'] == name:
-                return b
-        return None
-    first_col_width = max(first_col_width, len('Benchmark'))
-    first_line = "{:<{}s}Time             CPU      Time Old      Time New       CPU Old       CPU New".format(
-        'Benchmark', 12 + first_col_width)
-    output_strs = [first_line, '-' * len(first_line)]
-
-    gen = (bn for bn in json1['benchmarks'] if 'real_time' in bn and 'cpu_time' in bn)
-    for bn in gen:
-        other_bench = find_test(bn['name'])
-        if not other_bench:
-            continue
-
-        if bn['time_unit'] != other_bench['time_unit']:
-            continue
-
-        def get_color(res):
-            if res > 0.05:
-                return BC_FAIL
-            elif res > -0.07:
-                return BC_WHITE
-            else:
-                return BC_CYAN
-        fmt_str = "{}{:<{}s}{endc}{}{:+16.4f}{endc}{}{:+16.4f}{endc}{:14.0f}{:14.0f}{endc}{:14.0f}{:14.0f}"
-        tres = calculate_change(bn['real_time'], other_bench['real_time'])
-        cpures = calculate_change(bn['cpu_time'], other_bench['cpu_time'])
-        output_strs += [color_format(use_color, fmt_str,
-            BC_HEADER, bn['name'], first_col_width,
-            get_color(tres), tres, get_color(cpures), cpures,
-            bn['real_time'], other_bench['real_time'],
-            bn['cpu_time'], other_bench['cpu_time'],
-            endc=BC_ENDC)]
-    return output_strs
-
-###############################################################################
-# Unit tests
-
-import unittest
-
-class TestReportDifference(unittest.TestCase):
-    def load_results(self):
-        import json
-        testInputs = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'Inputs')
-        testOutput1 = os.path.join(testInputs, 'test1_run1.json')
-        testOutput2 = os.path.join(testInputs, 'test1_run2.json')
-        with open(testOutput1, 'r') as f:
-            json1 = json.load(f)
-        with open(testOutput2, 'r') as f:
-            json2 = json.load(f)
-        return json1, json2
-
-    def test_basic(self):
-        expect_lines = [
-            ['BM_SameTimes', '+0.0000', '+0.0000', '10', '10', '10', '10'],
-            ['BM_2xFaster', '-0.5000', '-0.5000', '50', '25', '50', '25'],
-            ['BM_2xSlower', '+1.0000', '+1.0000', '50', '100', '50', '100'],
-            ['BM_1PercentFaster', '-0.0100', '-0.0100', '100', '99', '100', '99'],
-            ['BM_1PercentSlower', '+0.0100', '+0.0100', '100', '101', '100', '101'],
-            ['BM_10PercentFaster', '-0.1000', '-0.1000', '100', '90', '100', '90'],
-            ['BM_10PercentSlower', '+0.1000', '+0.1000', '100', '110', '100', '110'],
-            ['BM_100xSlower', '+99.0000', '+99.0000', '100', '10000', '100', '10000'],
-            ['BM_100xFaster', '-0.9900', '-0.9900', '10000', '100', '10000', '100'],
-            ['BM_10PercentCPUToTime', '+0.1000', '-0.1000', '100', '110', '100', '90'],
-            ['BM_ThirdFaster', '-0.3333', '-0.3334', '100', '67', '100', '67'],
-            ['BM_BadTimeUnit', '-0.9000', '+0.2000', '0', '0', '0', '1'],
-        ]
-        json1, json2 = self.load_results()
-        output_lines_with_header = generate_difference_report(json1, json2, use_color=False)
-        output_lines = output_lines_with_header[2:]
-        print("\n".join(output_lines_with_header))
-        self.assertEqual(len(output_lines), len(expect_lines))
-        for i in range(0, len(output_lines)):
-            parts = [x for x in output_lines[i].split(' ') if x]
-            self.assertEqual(len(parts), 7)
-            self.assertEqual(parts, expect_lines[i])
-
-
-class TestReportDifferenceBetweenFamilies(unittest.TestCase):
-    def load_result(self):
-        import json
-        testInputs = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'Inputs')
-        testOutput = os.path.join(testInputs, 'test2_run.json')
-        with open(testOutput, 'r') as f:
-            json = json.load(f)
-        return json
-
-    def test_basic(self):
-        expect_lines = [
-            ['.', '-0.5000', '-0.5000', '10', '5', '10', '5'],
-            ['./4', '-0.5000', '-0.5000', '40', '20', '40', '20'],
-            ['Prefix/.', '-0.5000', '-0.5000', '20', '10', '20', '10'],
-            ['Prefix/./3', '-0.5000', '-0.5000', '30', '15', '30', '15'],
-        ]
-        json = self.load_result()
-        json1 = filter_benchmark(json, "BM_Z.ro", ".")
-        json2 = filter_benchmark(json, "BM_O.e", ".")
-        output_lines_with_header = generate_difference_report(json1, json2, use_color=False)
-        output_lines = output_lines_with_header[2:]
-        print("\n")
-        print("\n".join(output_lines_with_header))
-        self.assertEqual(len(output_lines), len(expect_lines))
-        for i in range(0, len(output_lines)):
-            parts = [x for x in output_lines[i].split(' ') if x]
-            self.assertEqual(len(parts), 7)
-            self.assertEqual(parts, expect_lines[i])
-
-
-if __name__ == '__main__':
-    unittest.main()
-
-# vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4
-# kate: tab-width: 4; replace-tabs on; indent-width 4; tab-indents: off;
-# kate: indent-mode python; remove-trailing-spaces modified;
diff --git a/gnu/llvm/llvm/utils/benchmark/tools/gbench/util.py b/gnu/llvm/llvm/utils/benchmark/tools/gbench/util.py
deleted file mode 100644
index 07c23772754..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/tools/gbench/util.py
+++ /dev/null
@@ -1,159 +0,0 @@
-"""util.py - General utilities for running, loading, and processing benchmarks
-"""
-import json
-import os
-import tempfile
-import subprocess
-import sys
-
-# Input file type enumeration
-IT_Invalid    = 0
-IT_JSON       = 1
-IT_Executable = 2
-
-_num_magic_bytes = 2 if sys.platform.startswith('win') else 4
-def is_executable_file(filename):
-    """
-    Return 'True' if 'filename' names a valid file which is likely
-    an executable. A file is considered an executable if it starts with the
-    magic bytes for a EXE, Mach O, or ELF file.
-    """
-    if not os.path.isfile(filename):
-        return False
-    with open(filename, mode='rb') as f:
-        magic_bytes = f.read(_num_magic_bytes)
-    if sys.platform == 'darwin':
-        return magic_bytes in [
-            b'\xfe\xed\xfa\xce',  # MH_MAGIC
-            b'\xce\xfa\xed\xfe',  # MH_CIGAM
-            b'\xfe\xed\xfa\xcf',  # MH_MAGIC_64
-            b'\xcf\xfa\xed\xfe',  # MH_CIGAM_64
-            b'\xca\xfe\xba\xbe',  # FAT_MAGIC
-            b'\xbe\xba\xfe\xca'   # FAT_CIGAM
-        ]
-    elif sys.platform.startswith('win'):
-        return magic_bytes == b'MZ'
-    else:
-        return magic_bytes == b'\x7FELF'
-
-
-def is_json_file(filename):
-    """
-    Returns 'True' if 'filename' names a valid JSON output file.
-    'False' otherwise.
-    """
-    try:
-        with open(filename, 'r') as f:
-            json.load(f)
-        return True
-    except:
-        pass
-    return False
-
-
-def classify_input_file(filename):
-    """
-    Return a tuple (type, msg) where 'type' specifies the classified type
-    of 'filename'. If 'type' is 'IT_Invalid' then 'msg' is a human readable
-    string represeting the error.
-    """
-    ftype = IT_Invalid
-    err_msg = None
-    if not os.path.exists(filename):
-        err_msg = "'%s' does not exist" % filename
-    elif not os.path.isfile(filename):
-        err_msg = "'%s' does not name a file" % filename
-    elif is_executable_file(filename):
-        ftype = IT_Executable
-    elif is_json_file(filename):
-        ftype = IT_JSON
-    else:
-        err_msg = "'%s' does not name a valid benchmark executable or JSON file" % filename
-    return ftype, err_msg
-
-
-def check_input_file(filename):
-    """
-    Classify the file named by 'filename' and return the classification.
-    If the file is classified as 'IT_Invalid' print an error message and exit
-    the program.
-    """
-    ftype, msg = classify_input_file(filename)
-    if ftype == IT_Invalid:
-        print("Invalid input file: %s" % msg)
-        sys.exit(1)
-    return ftype
-
-def find_benchmark_flag(prefix, benchmark_flags):
-    """
-    Search the specified list of flags for a flag matching `<prefix><arg>` and
-    if it is found return the arg it specifies. If specified more than once the
-    last value is returned. If the flag is not found None is returned.
-    """
-    assert prefix.startswith('--') and prefix.endswith('=')
-    result = None
-    for f in benchmark_flags:
-        if f.startswith(prefix):
-            result = f[len(prefix):]
-    return result
-
-def remove_benchmark_flags(prefix, benchmark_flags):
-    """
-    Return a new list containing the specified benchmark_flags except those
-    with the specified prefix.
-    """
-    assert prefix.startswith('--') and prefix.endswith('=')
-    return [f for f in benchmark_flags if not f.startswith(prefix)]
-
-def load_benchmark_results(fname):
-    """
-    Read benchmark output from a file and return the JSON object.
-    REQUIRES: 'fname' names a file containing JSON benchmark output.
-    """
-    with open(fname, 'r') as f:
-        return json.load(f)
-
-
-def run_benchmark(exe_name, benchmark_flags):
-    """
-    Run a benchmark specified by 'exe_name' with the specified
-    'benchmark_flags'. The benchmark is run directly as a subprocess to preserve
-    real time console output.
-    RETURNS: A JSON object representing the benchmark output
-    """
-    output_name = find_benchmark_flag('--benchmark_out=',
-                                      benchmark_flags)
-    is_temp_output = False
-    if output_name is None:
-        is_temp_output = True
-        thandle, output_name = tempfile.mkstemp()
-        os.close(thandle)
-        benchmark_flags = list(benchmark_flags) + \
-                          ['--benchmark_out=%s' % output_name]
-
-    cmd = [exe_name] + benchmark_flags
-    print("RUNNING: %s" % ' '.join(cmd))
-    exitCode = subprocess.call(cmd)
-    if exitCode != 0:
-        print('TEST FAILED...')
-        sys.exit(exitCode)
-    json_res = load_benchmark_results(output_name)
-    if is_temp_output:
-        os.unlink(output_name)
-    return json_res
-
-
-def run_or_load_benchmark(filename, benchmark_flags):
-    """
-    Get the results for a specified benchmark. If 'filename' specifies
-    an executable benchmark then the results are generated by running the
-    benchmark. Otherwise 'filename' must name a valid JSON output file,
-    which is loaded and the result returned.
-    """
-    ftype = check_input_file(filename)
-    if ftype == IT_JSON:
-        return load_benchmark_results(filename)
-    elif ftype == IT_Executable:
-        return run_benchmark(filename, benchmark_flags)
-    else:
-        assert False # This branch is unreachable
\ No newline at end of file
diff --git a/gnu/llvm/llvm/utils/benchmark/tools/strip_asm.py b/gnu/llvm/llvm/utils/benchmark/tools/strip_asm.py
deleted file mode 100644
index 9030550b43b..00000000000
--- a/gnu/llvm/llvm/utils/benchmark/tools/strip_asm.py
+++ /dev/null
@@ -1,151 +0,0 @@
-#!/usr/bin/env python
-
-"""
-strip_asm.py - Cleanup ASM output for the specified file
-"""
-
-from argparse import ArgumentParser
-import sys
-import os
-import re
-
-def find_used_labels(asm):
-    found = set()
-    label_re = re.compile("\s*j[a-z]+\s+\.L([a-zA-Z0-9][a-zA-Z0-9_]*)")
-    for l in asm.splitlines():
-        m = label_re.match(l)
-        if m:
-            found.add('.L%s' % m.group(1))
-    return found
-
-
-def normalize_labels(asm):
-    decls = set()
-    label_decl = re.compile("^[.]{0,1}L([a-zA-Z0-9][a-zA-Z0-9_]*)(?=:)")
-    for l in asm.splitlines():
-        m = label_decl.match(l)
-        if m:
-            decls.add(m.group(0))
-    if len(decls) == 0:
-        return asm
-    needs_dot = next(iter(decls))[0] != '.'
-    if not needs_dot:
-        return asm
-    for ld in decls:
-        asm = re.sub("(^|\s+)" + ld + "(?=:|\s)", '\\1.' + ld, asm)
-    return asm
-
-
-def transform_labels(asm):
-    asm = normalize_labels(asm)
-    used_decls = find_used_labels(asm)
-    new_asm = ''
-    label_decl = re.compile("^\.L([a-zA-Z0-9][a-zA-Z0-9_]*)(?=:)")
-    for l in asm.splitlines():
-        m = label_decl.match(l)
-        if not m or m.group(0) in used_decls:
-            new_asm += l
-            new_asm += '\n'
-    return new_asm
-
-
-def is_identifier(tk):
-    if len(tk) == 0:
-        return False
-    first = tk[0]
-    if not first.isalpha() and first != '_':
-        return False
-    for i in range(1, len(tk)):
-        c = tk[i]
-        if not c.isalnum() and c != '_':
-            return False
-    return True
-
-def process_identifiers(l):
-    """
-    process_identifiers - process all identifiers and modify them to have
-    consistent names across all platforms; specifically across ELF and MachO.
-    For example, MachO inserts an additional understore at the beginning of
-    names. This function removes that.
-    """
-    parts = re.split(r'([a-zA-Z0-9_]+)', l)
-    new_line = ''
-    for tk in parts:
-        if is_identifier(tk):
-            if tk.startswith('__Z'):
-                tk = tk[1:]
-            elif tk.startswith('_') and len(tk) > 1 and \
-                    tk[1].isalpha() and tk[1] != 'Z':
-                tk = tk[1:]
-        new_line += tk
-    return new_line
-
-
-def process_asm(asm):
-    """
-    Strip the ASM of unwanted directives and lines
-    """
-    new_contents = ''
-    asm = transform_labels(asm)
-
-    # TODO: Add more things we want to remove
-    discard_regexes = [
-        re.compile("\s+\..*$"), # directive
-        re.compile("\s*#(NO_APP|APP)$"), #inline ASM
-        re.compile("\s*#.*$"), # comment line
-        re.compile("\s*\.globa?l\s*([.a-zA-Z_][a-zA-Z0-9$_.]*)"), #global directive
-        re.compile("\s*\.(string|asciz|ascii|[1248]?byte|short|word|long|quad|value|zero)"),
-    ]
-    keep_regexes = [
-
-    ]
-    fn_label_def = re.compile("^[a-zA-Z_][a-zA-Z0-9_.]*:")
-    for l in asm.splitlines():
-        # Remove Mach-O attribute
-        l = l.replace('@GOTPCREL', '')
-        add_line = True
-        for reg in discard_regexes:
-            if reg.match(l) is not None:
-                add_line = False
-                break
-        for reg in keep_regexes:
-            if reg.match(l) is not None:
-                add_line = True
-                break
-        if add_line:
-            if fn_label_def.match(l) and len(new_contents) != 0:
-                new_contents += '\n'
-            l = process_identifiers(l)
-            new_contents += l
-            new_contents += '\n'
-    return new_contents
-
-def main():
-    parser = ArgumentParser(
-        description='generate a stripped assembly file')
-    parser.add_argument(
-        'input', metavar='input', type=str, nargs=1,
-        help='An input assembly file')
-    parser.add_argument(
-        'out', metavar='output', type=str, nargs=1,
-        help='The output file')
-    args, unknown_args = parser.parse_known_args()
-    input = args.input[0]
-    output = args.out[0]
-    if not os.path.isfile(input):
-        print(("ERROR: input file '%s' does not exist") % input)
-        sys.exit(1)
-    contents = None
-    with open(input, 'r') as f:
-        contents = f.read()
-    new_contents = process_asm(contents)
-    with open(output, 'w') as f:
-        f.write(new_contents)
-
-
-if __name__ == '__main__':
-    main()
-
-# vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4
-# kate: tab-width: 4; replace-tabs on; indent-width 4; tab-indents: off;
-# kate: indent-mode python; remove-trailing-spaces modified;
diff --git a/gnu/llvm/llvm/utils/countloc.sh b/gnu/llvm/llvm/utils/countloc.sh
deleted file mode 100755
index 497fab0a722..00000000000
--- a/gnu/llvm/llvm/utils/countloc.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-##===- utils/countloc.sh - Counts Lines Of Code --------------*- Script -*-===##
-# 
-# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-# See https://llvm.org/LICENSE.txt for license information.
-# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-# 
-##===----------------------------------------------------------------------===##
-#
-# This script finds all the source code files in the source code directories
-# (excluding certain things), runs "wc -l" on them to get the number of lines in
-# each file and then sums up and prints the total with awk. 
-#
-# The script takes one optional option, -topdir, which specifies the top llvm
-# source directory. If it is not specified then the llvm-config tool is 
-# consulted to find top source dir.  
-#
-# Note that the implementation is based on llvmdo. See that script for more
-# details.
-##===----------------------------------------------------------------------===##
-
-if test $# -gt 1 ; then
-  if test "$1" = "-topdir" ; then
-    TOPDIR="$2"
-    shift; shift;
-  else
-    TOPDIR=`llvm-config --src-root`
-  fi
-fi
-
-if test -d "$TOPDIR" ; then
-  cd $TOPDIR
-  ./utils/llvmdo -topdir "$TOPDIR" -dirs "include lib tools test utils examples" -code-only wc -l | awk '\
-      BEGIN { loc=0; } \
-      { loc += $1; } \
-      END { print loc; }'
-else
-  echo "Can't find LLVM top directory"
-fi
diff --git a/gnu/llvm/llvm/utils/docker/debian8/Dockerfile b/gnu/llvm/llvm/utils/docker/debian8/Dockerfile
deleted file mode 100644
index 9d0e2b8d795..00000000000
--- a/gnu/llvm/llvm/utils/docker/debian8/Dockerfile
+++ /dev/null
@@ -1,60 +0,0 @@
-#===- llvm/utils/docker/debian8/build/Dockerfile -------------------------===//
-#
-# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-# See https://llvm.org/LICENSE.txt for license information.
-# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-#
-#===----------------------------------------------------------------------===//
-# Stage 1. Check out LLVM source code and run the build.
-FROM launcher.gcr.io/google/debian8:latest as builder
-LABEL maintainer "LLVM Developers"
-# Install build dependencies of llvm.
-# First, Update the apt's source list and include the sources of the packages.
-RUN grep deb /etc/apt/sources.list | \
-    sed 's/^deb/deb-src /g' >> /etc/apt/sources.list
-# Install compiler, python and subversion.
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends ca-certificates gnupg \
-           build-essential python wget subversion unzip && \
-    rm -rf /var/lib/apt/lists/*
-# Install a newer ninja release. It seems the older version in the debian repos
-# randomly crashes when compiling llvm.
-RUN wget "https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip" && \
-    echo "d2fea9ff33b3ef353161ed906f260d565ca55b8ca0568fa07b1d2cab90a84a07 ninja-linux.zip" \
-        | sha256sum -c  && \
-    unzip ninja-linux.zip -d /usr/local/bin && \
-    rm ninja-linux.zip
-# Import public key required for verifying signature of cmake download.
-RUN gpg --keyserver hkp://pgp.mit.edu --recv 0x2D2CEF1034921684
-# Download, verify and install cmake version that can compile clang into /usr/local.
-# (Version in debian8 repos is is too old)
-RUN mkdir /tmp/cmake-install && cd /tmp/cmake-install && \
-    wget "https://cmake.org/files/v3.7/cmake-3.7.2-SHA-256.txt.asc" && \
-    wget "https://cmake.org/files/v3.7/cmake-3.7.2-SHA-256.txt" && \
-    gpg --verify cmake-3.7.2-SHA-256.txt.asc cmake-3.7.2-SHA-256.txt && \
-    wget "https://cmake.org/files/v3.7/cmake-3.7.2-Linux-x86_64.tar.gz" && \
-    ( grep "cmake-3.7.2-Linux-x86_64.tar.gz" cmake-3.7.2-SHA-256.txt | \
-      sha256sum -c - ) && \
-    tar xzf cmake-3.7.2-Linux-x86_64.tar.gz -C /usr/local --strip-components=1 && \
-    cd / && rm -rf /tmp/cmake-install
-
-ADD checksums /tmp/checksums
-ADD scripts /tmp/scripts
-
-# Checkout the source code.
-ARG checkout_args
-RUN /tmp/scripts/checkout.sh ${checkout_args}
-# Run the build. Results of the build will be available at /tmp/clang-install/.
-ARG buildscript_args
-RUN /tmp/scripts/build_install_llvm.sh --to /tmp/clang-install ${buildscript_args}
-
-
-# Stage 2. Produce a minimal release image with build results.
-FROM launcher.gcr.io/google/debian8:latest
-LABEL maintainer "LLVM Developers"
-# Install packages for minimal useful image.
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends libstdc++-4.9-dev binutils && \
-    rm -rf /var/lib/apt/lists/*
-# Copy build results of stage 1 to /usr/local.
-COPY --from=builder /tmp/clang-install/ /usr/local/
diff --git a/gnu/llvm/llvm/utils/getsrcs.sh b/gnu/llvm/llvm/utils/getsrcs.sh
deleted file mode 100755
index ef0ad726774..00000000000
--- a/gnu/llvm/llvm/utils/getsrcs.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-##===- utils/getsrcs.sh - Counts Lines Of Code ---------------*- Script -*-===##
-# 
-# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-# See https://llvm.org/LICENSE.txt for license information.
-# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-# details.
-# 
-##===----------------------------------------------------------------------===##
-#
-# This script just prints out the path names for all the source files in LLVM.
-# The optional -topdir option can be used to specify the top LLVM source 
-# directory. Without it, the llvm-config command is consulted to find the
-# top source directory.
-#
-# Note that the implementation is based on llvmdo. See that script for more
-# details.
-##===----------------------------------------------------------------------===##
-
-if test "$1" = "-topdir" ; then
-  TOPDIR="$2"
-  shift; shift;
-else
-  TOPDIR=`llvm-config --src-root`
-fi
-
-if test -d "$TOPDIR" ; then
-  cd $TOPDIR
-  ./utils/llvmdo -topdir "$TOPDIR" \
-    -dirs "include lib tools utils examples projects" echo
-else
-  echo "Can't find LLVM top directory"
-fi
diff --git a/gnu/llvm/llvm/utils/gn/build/run_tablegen.py b/gnu/llvm/llvm/utils/gn/build/run_tablegen.py
deleted file mode 100755
index c7694236be5..00000000000
--- a/gnu/llvm/llvm/utils/gn/build/run_tablegen.py
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env python
-"""Runs tablegen."""
-
-import subprocess
-import sys
-
-# Prefix with ./ to run built binary, not arbitrary stuff from PATH.
-sys.exit(subprocess.call(['./' + sys.argv[1]] + sys.argv[2:]))
diff --git a/gnu/llvm/llvm/utils/gn/secondary/clang/tools/clang-offload-wrapper/BUILD.gn b/gnu/llvm/llvm/utils/gn/secondary/clang/tools/clang-offload-wrapper/BUILD.gn
deleted file mode 100644
index 660b223f20d..00000000000
--- a/gnu/llvm/llvm/utils/gn/secondary/clang/tools/clang-offload-wrapper/BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
-executable("clang-offload-wrapper") {
-  configs += [ "//llvm/utils/gn/build:clang_code" ]
-  deps = [
-    "//clang/lib/Basic",
-    "//llvm/lib/Bitcode/Writer",
-    "//llvm/lib/IR",
-    "//llvm/lib/Support",
-    "//llvm/lib/Transforms/Utils",
-  ]
-  sources = [ "ClangOffloadWrapper.cpp" ]
-}
diff --git a/gnu/llvm/llvm/utils/gn/secondary/compiler-rt/lib/tsan/BUILD.gn b/gnu/llvm/llvm/utils/gn/secondary/compiler-rt/lib/tsan/BUILD.gn
deleted file mode 100644
index d3b726effd8..00000000000
--- a/gnu/llvm/llvm/utils/gn/secondary/compiler-rt/lib/tsan/BUILD.gn
+++ /dev/null
@@ -1,180 +0,0 @@
-import("//compiler-rt/target.gni")
-
-source_set("cxx_sources") {
-  configs -= [ "//llvm/utils/gn/build:llvm_code" ]
-  configs += [ "//llvm/utils/gn/build:crt_code" ]
-  sources = [ "rtl/tsan_new_delete.cpp" ]
-}
-
-if (current_os == "mac") {
-  tsan_target_type = "shared_library"
-} else {
-  tsan_target_type = "static_library"
-}
-
-target(tsan_target_type, "tsan") {
-  configs -= [ "//llvm/utils/gn/build:llvm_code" ]
-  configs += [ "//llvm/utils/gn/build:crt_code" ]
-
-  output_dir = crt_current_out_dir
-  if (current_os == "mac") {
-    output_name = "clang_rt.tsan_osx_dynamic"
-  } else {
-    assert(current_os != "win", "Tsan does not work on Windows")
-    output_name = "clang_rt.tsan$crt_current_target_suffix"
-  }
-
-  deps = [
-    "//compiler-rt/lib/interception:sources",
-    "//compiler-rt/lib/sanitizer_common:sources",
-    "//compiler-rt/lib/ubsan:sources",
-  ]
-
-  if (tsan_target_type == "static_library") {
-    complete_static_lib = true
-    configs -= [ "//llvm/utils/gn/build:thin_archive" ]
-    deps += [ ":tsan_cxx" ]
-  } else {
-    deps += [
-      ":cxx_sources",
-      "//compiler-rt/lib/ubsan:cxx_sources",
-    ]
-  }
-
-  # It's performance-critical for TSan runtime to be built with -fPIE to reduce
-  # the number of register spills.
-  cflags = [ "-fPIE" ]
-
-  sources = [
-    "rtl/tsan_clock.cpp",
-    "rtl/tsan_clock.h",
-    "rtl/tsan_debugging.cpp",
-    "rtl/tsan_defs.h",
-    "rtl/tsan_dense_alloc.h",
-    "rtl/tsan_external.cpp",
-    "rtl/tsan_fd.cpp",
-    "rtl/tsan_fd.h",
-    "rtl/tsan_flags.cpp",
-    "rtl/tsan_flags.h",
-    "rtl/tsan_flags.inc",
-    "rtl/tsan_ignoreset.cpp",
-    "rtl/tsan_ignoreset.h",
-    "rtl/tsan_interceptors.h",
-    "rtl/tsan_interceptors_posix.cpp",
-    "rtl/tsan_interface.cpp",
-    "rtl/tsan_interface.h",
-    "rtl/tsan_interface_ann.cpp",
-    "rtl/tsan_interface_ann.h",
-    "rtl/tsan_interface_atomic.cpp",
-    "rtl/tsan_interface_inl.h",
-    "rtl/tsan_interface_java.cpp",
-    "rtl/tsan_interface_java.h",
-    "rtl/tsan_malloc_mac.cpp",
-    "rtl/tsan_md5.cpp",
-    "rtl/tsan_mman.cpp",
-    "rtl/tsan_mman.h",
-    "rtl/tsan_mutexset.cpp",
-    "rtl/tsan_mutexset.h",
-    "rtl/tsan_platform.h",
-    "rtl/tsan_ppc_regs.h",
-    "rtl/tsan_preinit.cpp",
-    "rtl/tsan_report.cpp",
-    "rtl/tsan_report.h",
-    "rtl/tsan_rtl.cpp",
-    "rtl/tsan_rtl.h",
-    "rtl/tsan_rtl_mutex.cpp",
-    "rtl/tsan_rtl_proc.cpp",
-    "rtl/tsan_rtl_report.cpp",
-    "rtl/tsan_rtl_thread.cpp",
-    "rtl/tsan_stack_trace.cpp",
-    "rtl/tsan_stack_trace.h",
-    "rtl/tsan_suppressions.cpp",
-    "rtl/tsan_suppressions.h",
-    "rtl/tsan_symbolize.cpp",
-    "rtl/tsan_symbolize.h",
-    "rtl/tsan_sync.cpp",
-    "rtl/tsan_sync.h",
-    "rtl/tsan_trace.h",
-    "rtl/tsan_update_shadow_word_inl.h",
-  ]
-  if (target_os == "mac") {
-    sources += [
-      "rtl/tsan_interceptors_libdispatch.cpp",
-      "rtl/tsan_interceptors_mac.cpp",
-      "rtl/tsan_interceptors_mach_vm.cpp",
-      "rtl/tsan_platform_mac.cpp",
-      "rtl/tsan_platform_posix.cpp",
-    ]
-    cflags += [ "-fblocks" ]
-  } else {
-    # Assume Linux
-    sources += [
-      "rtl/tsan_platform_linux.cpp",
-      "rtl/tsan_platform_posix.cpp",
-    ]
-  }
-  if (target_cpu == "x64") {
-    sources += [ "rtl/tsan_rtl_amd64.S" ]
-  } else if (target_cpu == "arm64") {
-    sources += [ "rtl/tsan_rtl_aarch64.S" ]
-  } else if (target_cpu == "powerpc64") {
-    sources += [ "rtl/tsan_rtl_ppc64.S" ]
-  } else if (target_cpu == "mips64") {
-    sources += [ "rtl/tsan_rtl_mips64.S" ]
-  } else if (target_cpu == "s390x") {
-    sources += [ "rtl/tsan_rtl_s390x.S" ]
-  }
-
-  # To be able to include sanitizer_common.
-  include_dirs = [ ".." ]
-
-  # FIXME: have SANITIZER_COMMON_CFLAGS thingy? should fno-builtin be in
-  # crt_code?
-  cflags += [ "-fno-builtin" ]
-
-  # FIXME: link rt dl m pthread log
-  # FIXME: dep on libcxx-headers?
-  # FIXME: add_sanitizer_rt_version_list (cf hwasan)
-  # FIXME: need libclang_rt.tsan*.a.syms?
-  # FIXME: tsan_ignorelist.txt
-
-  if (target_os == "mac") {
-    # The -U flags below correspond to the add_weak_symbols() calls in CMake.
-    ldflags = [
-      "-lc++",
-      "-lc++abi",
-      "-lobjc",
-
-      # sanitizer_common
-      "-Wl,-U,___sanitizer_free_hook",
-      "-Wl,-U,___sanitizer_malloc_hook",
-      "-Wl,-U,___sanitizer_report_error_summary",
-      "-Wl,-U,___sanitizer_sandbox_on_notify",
-      "-Wl,-U,___sanitizer_symbolize_code",
-      "-Wl,-U,___sanitizer_symbolize_data",
-      "-Wl,-U,___sanitizer_symbolize_demangle",
-      "-Wl,-U,___sanitizer_symbolize_flush",
-
-      # FIXME: better
-      "-Wl,-install_name,@rpath/libclang_rt.tsan_osx_dynamic.dylib",
-    ]
-    # FIXME: -Wl,-rpath
-    # FIXME: codesign (??)
-  }
-}
-
-if (tsan_target_type == "static_library") {
-  static_library("tsan_cxx") {
-    assert(current_os != "win", "FIXME")
-    output_dir = crt_current_out_dir
-    output_name = "clang_rt.tsan_cxx$crt_current_target_suffix"
-    complete_static_lib = true
-    configs -= [ "//llvm/utils/gn/build:thin_archive" ]
-    deps = [
-      ":cxx_sources",
-      "//compiler-rt/lib/ubsan:cxx_sources",
-    ]
-  }
-}
-# FIXME:
-# Build libcxx instrumented with TSan.
diff --git a/gnu/llvm/llvm/utils/gn/secondary/lld/lib/Core/BUILD.gn b/gnu/llvm/llvm/utils/gn/secondary/lld/lib/Core/BUILD.gn
deleted file mode 100644
index a1c974dccd7..00000000000
--- a/gnu/llvm/llvm/utils/gn/secondary/lld/lib/Core/BUILD.gn
+++ /dev/null
@@ -1,20 +0,0 @@
-static_library("Core") {
-  output_name = "lldCore"
-  configs += [ "//llvm/utils/gn/build:lld_code" ]
-  deps = [
-    "//llvm/lib/BinaryFormat",
-    "//llvm/lib/MC",
-    "//llvm/lib/Support",
-    "//llvm/utils/gn/build/libs/pthread",
-  ]
-  sources = [
-    "DefinedAtom.cpp",
-    "Error.cpp",
-    "File.cpp",
-    "LinkingContext.cpp",
-    "Reader.cpp",
-    "Resolver.cpp",
-    "SymbolTable.cpp",
-    "Writer.cpp",
-  ]
-}
diff --git a/gnu/llvm/llvm/utils/gn/secondary/lld/lib/Driver/BUILD.gn b/gnu/llvm/llvm/utils/gn/secondary/lld/lib/Driver/BUILD.gn
deleted file mode 100644
index 2f20b57f43a..00000000000
--- a/gnu/llvm/llvm/utils/gn/secondary/lld/lib/Driver/BUILD.gn
+++ /dev/null
@@ -1,22 +0,0 @@
-import("//llvm/utils/TableGen/tablegen.gni")
-
-tablegen("DarwinLdOptions") {
-  visibility = [ ":Driver" ]
-  args = [ "-gen-opt-parser-defs" ]
-}
-
-static_library("Driver") {
-  output_name = "lldDriver"
-  configs += [ "//llvm/utils/gn/build:lld_code" ]
-  deps = [
-    ":DarwinLdOptions",
-    "//lld/Common",
-    "//lld/lib/Core",
-    "//lld/lib/ReaderWriter",
-    "//lld/lib/ReaderWriter/MachO",
-    "//lld/lib/ReaderWriter/YAML",
-    "//llvm/lib/Option",
-    "//llvm/lib/Support",
-  ]
-  sources = [ "DarwinLdDriver.cpp" ]
-}
diff --git a/gnu/llvm/llvm/utils/gn/secondary/lld/lib/ReaderWriter/BUILD.gn b/gnu/llvm/llvm/utils/gn/secondary/lld/lib/ReaderWriter/BUILD.gn
deleted file mode 100644
index 295a68e652b..00000000000
--- a/gnu/llvm/llvm/utils/gn/secondary/lld/lib/ReaderWriter/BUILD.gn
+++ /dev/null
@@ -1,15 +0,0 @@
-static_library("ReaderWriter") {
-  output_name = "lldReaderWriter"
-  configs += [ "//llvm/utils/gn/build:lld_code" ]
-  deps = [
-    "//lld/lib/Core",
-    "//llvm/lib/Object",
-    "//llvm/lib/Support",
-  ]
-  sources = [ "FileArchive.cpp" ]
-
-  # FIXME:
-  # if (is_msvc) {
-  #    cflags = [ "-wd4062" ]
-  # }
-}
diff --git a/gnu/llvm/llvm/utils/gn/secondary/lld/lib/ReaderWriter/MachO/BUILD.gn b/gnu/llvm/llvm/utils/gn/secondary/lld/lib/ReaderWriter/MachO/BUILD.gn
deleted file mode 100644
index 746bb901a29..00000000000
--- a/gnu/llvm/llvm/utils/gn/secondary/lld/lib/ReaderWriter/MachO/BUILD.gn
+++ /dev/null
@@ -1,33 +0,0 @@
-static_library("MachO") {
-  output_name = "lldMachO"
-  configs += [ "//llvm/utils/gn/build:lld_code" ]
-  deps = [
-    "//lld/lib/Core",
-    "//lld/lib/ReaderWriter/YAML",
-    "//llvm/lib/DebugInfo/DWARF",
-    "//llvm/lib/Demangle",
-    "//llvm/lib/Object",
-    "//llvm/lib/Support",
-  ]
-  sources = [
-    "ArchHandler.cpp",
-    "ArchHandler_arm.cpp",
-    "ArchHandler_arm64.cpp",
-    "ArchHandler_x86.cpp",
-    "ArchHandler_x86_64.cpp",
-    "CompactUnwindPass.cpp",
-    "GOTPass.cpp",
-    "LayoutPass.cpp",
-    "MachOLinkingContext.cpp",
-    "MachONormalizedFileBinaryReader.cpp",
-    "MachONormalizedFileBinaryWriter.cpp",
-    "MachONormalizedFileFromAtoms.cpp",
-    "MachONormalizedFileToAtoms.cpp",
-    "MachONormalizedFileYAML.cpp",
-    "ObjCPass.cpp",
-    "ShimPass.cpp",
-    "StubsPass.cpp",
-    "TLVPass.cpp",
-    "WriterMachO.cpp",
-  ]
-}
diff --git a/gnu/llvm/llvm/utils/gn/secondary/lld/lib/ReaderWriter/YAML/BUILD.gn b/gnu/llvm/llvm/utils/gn/secondary/lld/lib/ReaderWriter/YAML/BUILD.gn
deleted file mode 100644
index c3339efdd99..00000000000
--- a/gnu/llvm/llvm/utils/gn/secondary/lld/lib/ReaderWriter/YAML/BUILD.gn
+++ /dev/null
@@ -1,9 +0,0 @@
-static_library("YAML") {
-  output_name = "lldYAML"
-  configs += [ "//llvm/utils/gn/build:lld_code" ]
-  deps = [
-    "//lld/lib/Core",
-    "//llvm/lib/Support",
-  ]
-  sources = [ "ReaderWriterYAML.cpp" ]
-}
diff --git a/gnu/llvm/llvm/utils/gn/secondary/lld/unittests/BUILD.gn b/gnu/llvm/llvm/utils/gn/secondary/lld/unittests/BUILD.gn
deleted file mode 100644
index 275637c1ef8..00000000000
--- a/gnu/llvm/llvm/utils/gn/secondary/lld/unittests/BUILD.gn
+++ /dev/null
@@ -1,7 +0,0 @@
-group("unittests") {
-  deps = [
-    "DriverTests",
-    "MachOTests",
-  ]
-  testonly = true
-}
diff --git a/gnu/llvm/llvm/utils/gn/secondary/lld/unittests/DriverTests/BUILD.gn b/gnu/llvm/llvm/utils/gn/secondary/lld/unittests/DriverTests/BUILD.gn
deleted file mode 100644
index e5cc57e8812..00000000000
--- a/gnu/llvm/llvm/utils/gn/secondary/lld/unittests/DriverTests/BUILD.gn
+++ /dev/null
@@ -1,10 +0,0 @@
-import("//llvm/utils/unittest/unittest.gni")
-
-unittest("DriverTests") {
-  configs += [ "//llvm/utils/gn/build:lld_code" ]
-  deps = [
-    "//lld/lib/Driver",
-    "//lld/lib/ReaderWriter/MachO",
-  ]
-  sources = [ "DarwinLdDriverTest.cpp" ]
-}
diff --git a/gnu/llvm/llvm/utils/gn/secondary/lld/unittests/MachOTests/BUILD.gn b/gnu/llvm/llvm/utils/gn/secondary/lld/unittests/MachOTests/BUILD.gn
deleted file mode 100644
index 90d0a618c30..00000000000
--- a/gnu/llvm/llvm/utils/gn/secondary/lld/unittests/MachOTests/BUILD.gn
+++ /dev/null
@@ -1,16 +0,0 @@
-import("//llvm/utils/unittest/unittest.gni")
-
-unittest("MachOTests") {
-  configs += [ "//llvm/utils/gn/build:lld_code" ]
-  deps = [
-    "//lld/lib/Driver",
-    "//lld/lib/ReaderWriter/MachO",
-    "//lld/lib/ReaderWriter/YAML",
-  ]
-  sources = [
-    "MachONormalizedFileBinaryReaderTests.cpp",
-    "MachONormalizedFileBinaryWriterTests.cpp",
-    "MachONormalizedFileToAtomsTests.cpp",
-    "MachONormalizedFileYAMLTests.cpp",
-  ]
-}
diff --git a/gnu/llvm/llvm/utils/gn/secondary/llvm/tools/llvm-mca/lib/AMDGPU/BUILD.gn b/gnu/llvm/llvm/utils/gn/secondary/llvm/tools/llvm-mca/lib/AMDGPU/BUILD.gn
deleted file mode 100644
index 3bde981c58a..00000000000
--- a/gnu/llvm/llvm/utils/gn/secondary/llvm/tools/llvm-mca/lib/AMDGPU/BUILD.gn
+++ /dev/null
@@ -1,15 +0,0 @@
-static_library("AMDGPU") {
-  output_name = "LLVMMCACustomBehaviourAMDGPU"
-  deps = [
-    "//llvm/lib/IR",
-    "//llvm/lib/Support",
-    "//llvm/lib/Target/AMDGPU",
-
-    # llvm-mca/libAMDGPU reaches inside the Target/AMDGPU tablegen internals
-    # and must depend on these Target/AMDGPU-internal build targets.
-    "//llvm/lib/Target/AMDGPU/MCTargetDesc",
-    "//llvm/lib/Target/AMDGPU/Utils",
-  ]
-  include_dirs = [ "//llvm/lib/Target/AMDGPU" ]
-  sources = [ "AMDGPUCustomBehaviour.cpp" ]
-}
diff --git a/gnu/llvm/llvm/utils/gn/secondary/llvm/tools/split-file/BUILD.gn b/gnu/llvm/llvm/utils/gn/secondary/llvm/tools/split-file/BUILD.gn
deleted file mode 100644
index 4bf9269c3c3..00000000000
--- a/gnu/llvm/llvm/utils/gn/secondary/llvm/tools/split-file/BUILD.gn
+++ /dev/null
@@ -1,4 +0,0 @@
-executable("split-file") {
-  deps = [ "//llvm/lib/Support" ]
-  sources = [ "split-file.cpp" ]
-}
diff --git a/gnu/llvm/llvm/utils/gn/secondary/llvm/utils/benchmark/BUILD.gn b/gnu/llvm/llvm/utils/gn/secondary/llvm/utils/benchmark/BUILD.gn
deleted file mode 100644
index 39f5a226e55..00000000000
--- a/gnu/llvm/llvm/utils/gn/secondary/llvm/utils/benchmark/BUILD.gn
+++ /dev/null
@@ -1,25 +0,0 @@
-static_library("benchmark") {
-  sources = [
-    "src/benchmark.cc",
-    "src/benchmark_register.cc",
-    "src/colorprint.cc",
-    "src/commandlineflags.cc",
-    "src/complexity.cc",
-    "src/console_reporter.cc",
-    "src/counter.cc",
-    "src/csv_reporter.cc",
-    "src/json_reporter.cc",
-    "src/reporter.cc",
-    "src/sleep.cc",
-    "src/statistics.cc",
-    "src/string_util.cc",
-    "src/sysinfo.cc",
-    "src/timers.cc",
-  ]
-  deps = [ "//llvm/utils/gn/build/libs/pthread" ]
-  public_configs = [ ":benchmark_config" ]
-}
-
-config("benchmark_config") {
-  include_dirs = [ "include" ]
-}
diff --git a/gnu/llvm/llvm/utils/gn/secondary/llvm/utils/unittest/BUILD.gn b/gnu/llvm/llvm/utils/gn/secondary/llvm/utils/unittest/BUILD.gn
deleted file mode 100644
index ccdb401a4b8..00000000000
--- a/gnu/llvm/llvm/utils/gn/secondary/llvm/utils/unittest/BUILD.gn
+++ /dev/null
@@ -1,35 +0,0 @@
-import("//llvm/utils/gn/build/libs/pthread/enable.gni")
-
-# Used to push the gtest include directories to things depending on :googletest.
-config("googletest_config") {
-  include_dirs = [
-    "googlemock/include",
-    "googletest/include",
-  ]
-
-  # LLVM requires C++11 but gtest doesn't correctly detect the availability
-  # of C++11 on MSVC, so we force it on.
-  defines = [ "GTEST_LANG_CXX11" ]
-  if (host_os == "win") {
-    defines += [ "GTEST_OS_WINDOWS" ]
-  }
-  if (!llvm_enable_threads) {
-    defines += [ "GTEST_HAS_PTHREAD=0" ]
-  }
-  defines += [ "GTEST_HAS_RTTI=0" ]
-}
-
-static_library("gtest") {
-  deps = [ "//llvm/lib/Support" ]
-  include_dirs = [
-    "googletest",  # For including src/gtest.cc
-    "googlemock",  # For including src/gmock.cc
-  ]
-  public_configs = [ ":googletest_config" ]
-  configs -= [ "//llvm/utils/gn/build:warn_covered_switch_default" ]
-  sources = [
-    "googlemock/src/gmock-all.cc",
-    "googletest/src/gtest-all.cc",
-  ]
-  testonly = true
-}
diff --git a/gnu/llvm/llvm/utils/gn/secondary/llvm/utils/unittest/UnitTestMain/BUILD.gn b/gnu/llvm/llvm/utils/gn/secondary/llvm/utils/unittest/UnitTestMain/BUILD.gn
deleted file mode 100644
index 66d0dd338d2..00000000000
--- a/gnu/llvm/llvm/utils/gn/secondary/llvm/utils/unittest/UnitTestMain/BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-source_set("UnitTestMain") {
-  deps = [ "//llvm/lib/Support" ]
-
-  # Make targets depending on this also depend on gtest, to get the gtest
-  # include_dir.
-  public_deps = [ "..:gtest" ]
-  sources = [ "TestMain.cpp" ]
-  testonly = true
-}
-
-# Nothing depends on this target, but llvm-config expects it to exist when
-# it runs with `--link-static --system-libs`, so humor it.
-static_library("gtest_main") {
-  deps = [ ":UnitTestMain" ]
-  complete_static_lib = true
-  testonly = true
-}
diff --git a/gnu/llvm/llvm/utils/gn/secondary/llvm/utils/unittest/unittest.gni b/gnu/llvm/llvm/utils/gn/secondary/llvm/utils/unittest/unittest.gni
deleted file mode 100644
index f0c8309a9af..00000000000
--- a/gnu/llvm/llvm/utils/gn/secondary/llvm/utils/unittest/unittest.gni
+++ /dev/null
@@ -1,58 +0,0 @@
-# This file defines a template for adding a unittest binary.
-#
-# It's a thin wrapper around GN's built-in executable() target type and
-# accepts the same parameters, and in addition this paramater:
-#
-#   has_custom_main (optional)
-#       [bool] If set, link against gtest instead of UnitTestMain; for tests
-#              that define their own main() function.
-#
-# Example use:
-#
-#   unittest("FormatTest") {
-#     sources = [ ... ]
-#     ...
-#   }
-
-template("unittest") {
-  executable(target_name) {
-    has_custom_main = false  # Default value.
-
-    # Foward everything (has_custom_main if set; configs, sources, deps, ...).
-    forward_variables_from(invoker, "*")
-    assert(!defined(invoker.output_dir), "cannot set unittest output_dir")
-    assert(!defined(invoker.testonly), "cannot set unittest testonly")
-
-    # Common settings for all unit tests.
-    # Unit test binaries shouldn't go right in out/gn/bin, for two reasons:
-    # 1. That's where production binaries go.
-    # 2. The CMake build doesn't put the unit tests of all projects (clang,
-    #    lld,...) in one directory, so it's not guaranteed that there won't
-    #    be name collisions between test binaries from separate projects.
-    # Each lit suite takes an foo_obj_root parameter and puts temporary files
-    # for lit tests at foo_obj_root/test and looks for unit test binaries
-    # below foo_obj_root/unittests. As long as the BUILD.gn files processing
-    # the lit.site.cfg.py.in files match the output dir here, it doesn't
-    # matter all that much where the unit test binaries go, with the weak
-    # constraints that test binaries of different projects should go in
-    # different folders, and that it's not too difficult to manually
-    # run the unit test binary if necessary. Using target_out_dir here
-    # means that //clang/unittests/Format gets its binary in
-    # out/gn/obj/clang/unittests/Format/FormatTests, which seems fine.
-    #
-    # If you change output_dir here, look through
-    # `git grep target_out_dir '*/unittests/*'` and update those too.
-    output_dir = target_out_dir
-
-    if (has_custom_main) {
-      deps += [ "//llvm/utils/unittest:gtest" ]
-    } else {
-      deps += [ "//llvm/utils/unittest/UnitTestMain" ]
-    }
-    testonly = true
-  }
-}
-
-set_defaults("unittest") {
-  configs = shared_binary_target_configs
-}
diff --git a/gnu/llvm/llvm/utils/lit/README.txt b/gnu/llvm/llvm/utils/lit/README.txt
deleted file mode 100644
index 12cf7ae3949..00000000000
--- a/gnu/llvm/llvm/utils/lit/README.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-===============================
- lit - A Software Testing Tool
-===============================
-
-lit is a portable tool for executing LLVM and Clang style test suites,
-summarizing their results, and providing indication of failures. lit is designed
-to be a lightweight testing tool with as simple a user interface as possible.
-
-=====================
- Contributing to lit
-=====================
-
-Please browse the Test Suite > lit category in LLVM's Bugzilla for ideas on
-what to work on.
-
-Before submitting patches, run the test suite to ensure nothing has regressed:
-
-    # From within your LLVM source directory.
-    utils/lit/lit.py \
-        --path /path/to/your/llvm/build/bin \
-        utils/lit/tests
-
-Note that lit's tests depend on 'not' and 'FileCheck', LLVM utilities.
-You will need to have built LLVM tools in order to run lit's test suite
-successfully.
-
-You'll also want to confirm that lit continues to work when testing LLVM.
-Follow the instructions in http://llvm.org/docs/TestingGuide.html to run the
-regression test suite:
-
-    make check-llvm
-
-And be sure to run the llvm-lit wrapper script as well:
-
-    /path/to/your/llvm/build/bin/llvm-lit utils/lit/tests
-
-Finally, make sure lit works when installed via setuptools:
-
-    python utils/lit/setup.py install
-    lit --path /path/to/your/llvm/build/bin utils/lit/tests
-
diff --git a/gnu/llvm/llvm/utils/lit/tests/Inputs/googletest-upstream-format/DummySubDir/OneTest.py b/gnu/llvm/llvm/utils/lit/tests/Inputs/googletest-upstream-format/DummySubDir/OneTest.py
deleted file mode 100644
index 1061e39ec20..00000000000
--- a/gnu/llvm/llvm/utils/lit/tests/Inputs/googletest-upstream-format/DummySubDir/OneTest.py
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-
-if len(sys.argv) != 2:
-    raise ValueError("unexpected number of args")
-
-if sys.argv[1] == "--gtest_list_tests":
-    print("""\
-Running main() from gtest_main.cc
-FirstTest.
-  subTestA
-  subTestB
-  subTestC
-  subTestD
-ParameterizedTest/0.
-  subTest
-ParameterizedTest/1.
-  subTest""")
-    sys.exit(0)
-elif not sys.argv[1].startswith("--gtest_filter="):
-    raise ValueError("unexpected argument: %r" % (sys.argv[1]))
-
-test_name = sys.argv[1].split('=',1)[1]
-print('Running main() from gtest_main.cc')
-if test_name == 'FirstTest.subTestA':
-    print('I am subTest A, I PASS')
-    print('[  PASSED  ] 1 test.')
-    sys.exit(0)
-elif test_name == 'FirstTest.subTestB':
-    print('I am subTest B, I FAIL')
-    print('And I have two lines of output')
-    sys.exit(1)
-elif test_name == 'FirstTest.subTestC':
-    print('I am subTest C, I am SKIPPED')
-    print('[  PASSED  ] 0 tests.')
-    print('[  SKIPPED ] 1 test, listed below:')
-    print('[  SKIPPED ] FirstTest.subTestC')
-    sys.exit(0)
-elif test_name == 'FirstTest.subTestD':
-    print('I am subTest D, I am UNRESOLVED')
-    sys.exit(0)
-elif test_name in ('ParameterizedTest/0.subTest',
-                   'ParameterizedTest/1.subTest'):
-    print('I am a parameterized test, I also PASS')
-    print('[  PASSED  ] 1 test.')
-    sys.exit(0)
-else:
-    raise SystemExit("error: invalid test name: %r" % (test_name,))
diff --git a/gnu/llvm/llvm/utils/lit/tests/Inputs/googletest-upstream-format/lit.cfg b/gnu/llvm/llvm/utils/lit/tests/Inputs/googletest-upstream-format/lit.cfg
deleted file mode 100644
index 9fb5d2b0247..00000000000
--- a/gnu/llvm/llvm/utils/lit/tests/Inputs/googletest-upstream-format/lit.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-import lit.formats
-config.name = 'googletest-upstream-format'
-config.test_format = lit.formats.GoogleTest('DummySubDir', 'Test')
diff --git a/gnu/llvm/llvm/utils/lit/tests/Inputs/reorder/.lit_test_times.txt b/gnu/llvm/llvm/utils/lit/tests/Inputs/reorder/.lit_test_times.txt
deleted file mode 100644
index 73d55debc60..00000000000
--- a/gnu/llvm/llvm/utils/lit/tests/Inputs/reorder/.lit_test_times.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-42.0 not-executed.txt
-3.0 subdir/ccc.txt
-2.0 bbb.txt
-0.1 aaa.txt
diff --git a/gnu/llvm/llvm/utils/lit/tests/googletest-upstream-format.py b/gnu/llvm/llvm/utils/lit/tests/googletest-upstream-format.py
deleted file mode 100644
index 8811b1eb308..00000000000
--- a/gnu/llvm/llvm/utils/lit/tests/googletest-upstream-format.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# Check the various features of the GoogleTest format.
-
-# FIXME: this test depends on order of tests
-# RUN: rm -f %{inputs}/googletest-upstream-format/.lit_test_times.txt
-
-# RUN: not %{lit} -j 1 -v %{inputs}/googletest-upstream-format > %t.out
-# RUN: FileCheck < %t.out %s
-#
-# END.
-
-# CHECK: -- Testing:
-# CHECK: PASS: googletest-upstream-format :: [[PATH:[Dd]ummy[Ss]ub[Dd]ir/]][[FILE:OneTest\.py]]/FirstTest.subTestA
-# CHECK: FAIL: googletest-upstream-format :: [[PATH]][[FILE]]/[[TEST:FirstTest\.subTestB]]
-# CHECK-NEXT: *** TEST 'googletest-upstream-format :: [[PATH]][[FILE]]/[[TEST]]' FAILED ***
-# CHECK-NEXT: Script:
-# CHECK-NEXT: --
-# CHECK-NEXT: [[FILE]] --gtest_filter=[[TEST]]
-# CHECK-NEXT: --
-# CHECK-NEXT: Running main() from gtest_main.cc
-# CHECK-NEXT: I am subTest B, I FAIL
-# CHECK-NEXT: And I have two lines of output
-# CHECK: SKIPPED: googletest-upstream-format :: [[PATH]][[FILE]]/FirstTest.subTestC
-# CHECK: UNRESOLVED: googletest-upstream-format :: [[PATH]][[FILE]]/[[TEST:FirstTest\.subTestD]]
-# CHECK-NEXT: *** TEST 'googletest-upstream-format :: [[PATH]][[FILE]]/[[TEST]]' FAILED ***
-# CHECK-NEXT: Script:
-# CHECK-NEXT: --
-# CHECK-NEXT: [[FILE]] --gtest_filter=[[TEST]]
-# CHECK-NEXT: --
-# CHECK-NEXT: Unable to find [ PASSED ] 1 test. in gtest output
-# CHECK: I am subTest D, I am UNRESOLVED
-# CHECK: ***
-# CHECK: PASS: googletest-upstream-format :: [[PATH]][[FILE]]/ParameterizedTest/0.subTest
-# CHECK: PASS: googletest-upstream-format :: [[PATH]][[FILE]]/ParameterizedTest/1.subTest
-# CHECK: Failed Tests (1)
-# CHECK: Skipped{{ *}}: 1
-# CHECK: Passed{{ *}}: 3
-# CHECK: Unresolved{{ *}}: 1
-# CHECK: Failed{{ *}}: 1
diff --git a/gnu/llvm/llvm/utils/llvmdo b/gnu/llvm/llvm/utils/llvmdo
deleted file mode 100755
index f54c752181d..00000000000
--- a/gnu/llvm/llvm/utils/llvmdo
+++ /dev/null
@@ -1,183 +0,0 @@
-#!/bin/sh
-##===- utils/llvmdo - Counts Lines Of Code -------------------*- Script -*-===##
-# 
-# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-# See https://llvm.org/LICENSE.txt for license information.
-# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-# 
-##===----------------------------------------------------------------------===##
-#
-# This script is a general purpose "apply" function for the source files in LLVM
-# It uses "find" to locate all the source files and then applies the user's 
-# command to them. As such, this command is often not used by itself much but
-# the other find related tools (countloc.sh,llvmgrep,getsrcs.sh,userloc.sh) are
-# all based on this script.  This script defines "what is a source file" in 
-# LLVM and so should be maintained if new directories, new file extensions, 
-# etc. are used in LLVM as it progresses.
-#
-# Usage:
-#  llvmdo [-topdir DIR] [-dirs "DIRNAMES..."] [-code-only] PROGRAM ARGS...
-#
-# The -topdir option allows you to specify the llvm source root directly. If it
-# is not specified then it will be obtained with llvm-config which must be built
-# and in your path.
-#
-# The -dirs argument allows you to specify the set of directories that are 
-# searched. The default list of directories searched is:
-#   include lib tools utils runtime autoconf docs test examples projects
-# Note that you must use quotes around the list of directory names. 
-#
-# The -code-only option specifies that only those files that are considered 
-# "code" should be visited. HTML documentation is considered code, but things 
-# like README files, etc. are not.
-#
-# Finally, you simply specify whatever program you want to run against each 
-# file and the arguments to give it. The PROGRAM will be given the file name 
-# as its last argument.
-##===----------------------------------------------------------------------===##
-
-if test $# -lt 1 ; then
-  echo "Usage: llvmdo [-topdir DIR] [-dirs "DIRNAMES..."] [-code-only] PROGRAM ARGS..."
-  exit 1
-fi
-
-if test "$1" = "-topdir" ; then
-  TOPDIR="$2"
-  shift; shift;
-else
-  TOPDIR=`llvm-config --src-root`
-fi
-
-if test "$1" = "-dirs" ; then
-  LLVMDO_DIRS="$2"
-  shift ; shift
-elif test -z "$LLVMDO_DIRS" ; then
-  LLVMDO_DIRS="include lib tools utils runtime autoconf docs test examples projects cmake"
-fi
-
-if test "$1" = "-code-only" ; then
-  CODE_ONLY="set"
-  shift
-else
-  CODE_ONLY=""
-fi
-
-if test "$1" = "" ; then
-  echo "Missing program name to run"
-  exit 1
-fi
-
-PROGRAM=`which $1`
-if test ! -x "$PROGRAM" ; then
-  echo "Can't execute $1"
-  exit 1
-fi
-shift;
-
-paths_to_ignore="\
-  -path */.svn/ -o \
-  -path */.svn/* -o \
-  -path docs/doxygen/* -o \
-  -path docs/CommandGuide/html/* -o \
-  -path docs/CommandGuide/man/* -o \
-  -path docs/CommandGuide/ps/* -o \
-  -path docs/CommandGuide/man/* -o \
-  -path docs/HistoricalNotes/* -o \
-  -path docs/img/* -o \
-  -path */.libs/* -o \
-  -path lib/Support/bzip2/* -o \
-  -path projects/llvm-test/* \
-"
-files_to_match="\
-     -name *.ac \
-  -o -name *.b \
-  -o -name *.c \
-  -o -name *.cc \
-  -o -name *.cfg \
-  -o -name *.cpp \
-  -o -name *.css \
-  -o -name *.def \
-  -o -name *.el \
-  -o -name *.exp \
-  -o -name *.footer \
-  -o -name *.gnuplot' \
-  -o -name *.h \
-  -o -name *.header \
-  -o -name *.html \
-  -o -name *.in \
-  -o -name *.inc \
-  -o -name *.intro \
-  -o -name *.l \
-  -o -name *.ll \
-  -o -name *.lst \
-  -o -name *.m4 \
-  -o -name *.pod \
-  -o -name *.pl \
-  -o -name *.py \
-  -o -name *.sh \
-  -o -name *.schema \
-  -o -name *.st \
-  -o -name *.tcl \
-  -o -name *.td \
-  -o -name *.tr \
-  -o -name *.y \
-  -o -name Make* \
-  -o -name *.cmake \
-  -o -name llvmdo \
-  -o -name llvmgrep \
-  -o -name check-each-file \
-  -o -name codgen-diff \
-  -o -name llvm-native-gcc \
-  -o -name llvm-native-gxx \
-  -o -name makellvm \
-  -o -path include/llvm/ADT/ilist \
-  -o -path test/\*.ll \
-  -o -path test/Scripts/not \
-  -o -path runtime/\*.ll \
-"
-if test -z "$CODE_ONLY" ; then
-  files_to_match="$files_to_match \
-    -o -name *.txt \
-    -o -name *.TXT \
-    -o -name *.vim \
-    -o -name vimrc \
-    -o -name README \
-    -o -name COPYING.LIB \
-    -o -name LICENSE* "
-fi
-files_to_ignore="\
-     -name \.* \
-  -o -name *~ \
-  -o -name #* \
-  -o -name configure \
-  -o -name slow.ll \
-  -o -name *libtool* \
-  -o -name ltdl* \
-  -o -name ltdl.m4 \
-  -o -name ltmain.m4 \
-  -o -name ltmain.sh \
-  -o -name aclocal.m4 \
-  -o -name acinclude.m4 \
-  -o -name *LoopSimplifyCrash.ll \
-  -o -name *AST-Remove.ll \
-  -o -name PPCPerfectShuffle.h \
-"
-
-if test -d "$TOPDIR" ; then
-  cd $TOPDIR
-  # Have to use the right "find" on a per-platform basis. Most platforms have
-  # Gnu find as "find", but Solaris does not.
-  case `uname -s` in
-    SunOS) find_prog=gfind ;;
-    *) find_prog=find ;;
-  esac
-  # Turn off file name generation (globbing) so that substitution of the
-  # variables doesn't cause the shell to create lists of file names
-  set -f
-  $find_prog $LLVMDO_DIRS -type f \
-    \( $paths_to_ignore \) -prune \
-    -o \( \( $files_to_match \) \! \( $files_to_ignore \) \
-    -exec $PROGRAM "$@" {} \; \)
-else
-  echo "Can't find LLVM top directory in $TOPDIR"
-fi
diff --git a/gnu/llvm/llvm/utils/llvmgrep b/gnu/llvm/llvm/utils/llvmgrep
deleted file mode 100755
index 28b2f95f979..00000000000
--- a/gnu/llvm/llvm/utils/llvmgrep
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-##===- utils/llvmgrep - Counts Lines Of Code -----------------*- Script -*-===##
-# 
-# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-# See https://llvm.org/LICENSE.txt for license information.
-# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-# 
-##===----------------------------------------------------------------------===##
-#
-# This script searches your srcdir for an egrep style pattern. This can quickly
-# help you build a list of the places you need to modify when changing a header
-# or other "global" name. The only argument is the pattern you want to search
-# for. It should be quoted to escape shell interpretation of the pattern's
-# special characters.
-#
-# Note that the implementation is based on llvmdo. See that script for more
-# details.
-##===----------------------------------------------------------------------===##
-
-if test "$1" = "-topdir" ; then
-  TOPDIR="$2"
-  shift; shift;
-else
-  TOPDIR=`llvm-config --src-root`
-fi
-
-if test -d "$TOPDIR" ; then
-  cd $TOPDIR
-  case `uname -s` in
-    SunOS) grep_cmd="ggrep -H -n" ;;
-    Linux|Darwin) grep_cmd="egrep -H -n" ;;
-    *) grep_cmd="egrep -l -n" ;;
-  esac
-  ./utils/llvmdo -topdir "$TOPDIR" \
-    -dirs "include lib tools utils docs examples test unittests projects cmake" $grep_cmd "$*"
-else
-  echo "Can't find LLVM top directory"
-fi
diff --git a/gnu/llvm/llvm/utils/release/build_llvm_package.bat b/gnu/llvm/llvm/utils/release/build_llvm_package.bat
deleted file mode 100755
index be207244c69..00000000000
--- a/gnu/llvm/llvm/utils/release/build_llvm_package.bat
+++ /dev/null
@@ -1,149 +0,0 @@
-@echo off
-setlocal
-
-REM Script for building the LLVM installer on Windows,
-REM used for the the weekly snapshots at http://www.llvm.org/builds.
-REM
-REM Usage: build_llvm_package.bat <revision>
-
-REM Prerequisites:
-REM
-REM   Visual Studio 2019, CMake, Ninja, GNUWin32, SWIG, Python 3,
-REM   NSIS with the strlen_8192 patch,
-REM   Visual Studio 2019 SDK and Nuget (for the clang-format plugin),
-REM   Perl (for the OpenMP run-time), 7Zip.
-REM
-REM
-REM   For LLDB, SWIG version <= 3.0.8 needs to be used to work around
-REM   https://github.com/swig/swig/issues/769
-
-
-REM You need to modify the paths below:
-set vsdevcmd=C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\Common7\Tools\VsDevCmd.bat
-
-set python32_dir=C:\Users\%USERNAME%\AppData\Local\Programs\Python\Python36-32
-set python64_dir=C:\Users\%USERNAME%\AppData\Local\Programs\Python\Python36
-
-for /f "usebackq" %%i in (`PowerShell ^(Get-Date^).ToString^('yyyyMMdd'^)`) do set datestamp=%%i
-
-set revision=%1
-set package_version=13.0.0-%revision:~0,8%
-set clang_format_vs_version=13.0.0.%datestamp%
-set build_dir=llvm_package_%revision:~0,8%
-
-echo Revision: %revision%
-echo Package version: %package_version%
-echo Clang format plugin version: %clang_format_vs_version%
-echo Build dir: %build_dir%
-echo.
-pause
-
-mkdir %build_dir%
-cd %build_dir%
-
-echo Checking out %revision%
-curl -L https://github.com/llvm/llvm-project/archive/%revision%.zip -o src.zip || exit /b
-7z x src.zip || exit /b
-mv llvm-project-* llvm-project || exit /b
-
-REM Setting CMAKE_CL_SHOWINCLUDES_PREFIX to work around PR27226.
-set cmake_flags=^
-  -DCMAKE_BUILD_TYPE=Release ^
-  -DLLVM_ENABLE_ASSERTIONS=ON ^
-  -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON ^
-  -DLLVM_BUILD_LLVM_C_DYLIB=ON ^
-  -DCMAKE_INSTALL_UCRT_LIBRARIES=ON ^
-  -DCLANG_FORMAT_VS_VERSION=%clang_format_vs_version% ^
-  -DPACKAGE_VERSION=%package_version% ^
-  -DLLDB_RELOCATABLE_PYTHON=1 ^
-  -DLLDB_TEST_COMPILER=%cd%\build32_stage0\bin\clang.exe ^
-  -DCMAKE_CL_SHOWINCLUDES_PREFIX="Note: including file: " ^
-  -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;lld;compiler-rt;openmp;lldb"
-
-REM TODO: Run the "check-all" tests.
-
-set "VSCMD_START_DIR=%CD%"
-call "%vsdevcmd%" -arch=x86
-set CC=
-set CXX=
-mkdir build32_stage0
-cd build32_stage0
-cmake -GNinja %cmake_flags% -DPYTHON_HOME=%python32_dir% -DPYTHON_EXECUTABLE=%python32_dir%\python.exe ..\llvm-project\llvm || exit /b
-ninja all || ninja all || ninja all || exit /b
-ninja check || ninja check || ninja check || exit /b
-ninja check-clang || ninja check-clang || ninja check-clang || exit /b
-ninja check-lld || ninja check-lld || ninja check-lld || exit /b
-ninja check-sanitizer || ninja check-sanitizer || ninja check-sanitizer || exit /b
-ninja check-clang-tools || ninja check-clang-tools || ninja check-clang-tools || exit /b
-ninja check-clangd || ninja check-clangd || ninja check-clangd || exit /b
-cd..
-
-mkdir build32
-cd build32
-set CC=..\build32_stage0\bin\clang-cl
-set CXX=..\build32_stage0\bin\clang-cl
-cmake -GNinja %cmake_flags% -DPYTHON_HOME=%python32_dir% -DPYTHON_EXECUTABLE=%python32_dir%\python.exe ..\llvm-project\llvm || exit /b
-ninja all || ninja all || ninja all || exit /b
-ninja check || ninja check || ninja check || exit /b
-ninja check-clang || ninja check-clang || ninja check-clang || exit /b
-ninja check-lld || ninja check-lld || ninja check-lld || exit /b
-ninja check-sanitizer || ninja check-sanitizer || ninja check-sanitizer || exit /b
-ninja check-clang-tools || ninja check-clang-tools || ninja check-clang-tools || exit /b
-ninja check-clangd || ninja check-clangd || ninja check-clangd || exit /b
-ninja package || exit /b
-
-7z x LLVM-%package_version%-win32.exe -orepack
-rmdir /s /q repack\$PLUGINSDIR
-del repack\Uninstall.exe
-7z a LLVM-%package_version%-win32.zip .\repack\* -mx9
-cd ..
-
-
-REM The plug-in is built separately as it uses a statically linked clang-format.exe.
-mkdir build_vsix
-cd build_vsix
-REM Having VSSDKINSTALL set makes devenv *not* find the SDK for some reason.
-set VSSDKINSTALL=
-set CC=..\build32_stage0\bin\clang-cl
-set CXX=..\build32_stage0\bin\clang-cl
-cmake -GNinja %cmake_flags% -DLLVM_USE_CRT_RELEASE=MT -DBUILD_CLANG_FORMAT_VS_PLUGIN=ON -DPYTHON_HOME=%python32_dir% -DPYTHON_EXECUTABLE=%python32_dir%\python.exe ..\llvm-project\llvm || exit /b
-ninja clang_format_vsix || exit /b
-copy ..\llvm-project\llvm\tools\clang\tools\clang-format-vs\ClangFormat\bin\Release\ClangFormat.vsix ClangFormat-r%revision%.vsix
-cd ..
-
-
-set "VSCMD_START_DIR=%CD%"
-call "%vsdevcmd%" -arch=amd64
-set CC=
-set CXX=
-mkdir build64_stage0
-cd build64_stage0
-cmake -GNinja %cmake_flags% -DPYTHON_HOME=%python64_dir% -DPYTHON_EXECUTABLE=%python64_dir%\python.exe ..\llvm-project\llvm || exit /b
-ninja all || ninja all || ninja all || exit /b
-ninja check || ninja check || ninja check || exit /b
-ninja check-clang || ninja check-clang || ninja check-clang || exit /b
-ninja check-lld || ninja check-lld || ninja check-lld || exit /b
-ninja check-sanitizer || ninja check-sanitizer || ninja check-sanitizer || exit /b
-ninja check-clang-tools || ninja check-clang-tools || ninja check-clang-tools || exit /b
-ninja check-clangd || ninja check-clangd || ninja check-clangd || exit /b
-cd..
-
-mkdir build64
-cd build64
-set CC=..\build64_stage0\bin\clang-cl
-set CXX=..\build64_stage0\bin\clang-cl
-cmake -GNinja %cmake_flags% -DPYTHON_HOME=%python64_dir% -DPYTHON_EXECUTABLE=%python64_dir%\python.exe ..\llvm-project\llvm || exit /b
-ninja all || ninja all || ninja all || exit /b
-ninja check || ninja check || ninja check || exit /b
-ninja check-clang || ninja check-clang || ninja check-clang || exit /b
-ninja check-lld || ninja check-lld || ninja check-lld || exit /b
-ninja check-sanitizer || ninja check-sanitizer || ninja check-sanitizer || exit /b
-ninja check-clang-tools || ninja check-clang-tools || ninja check-clang-tools || exit /b
-ninja check-clangd || ninja check-clangd || ninja check-clangd || exit /b
-ninja package || exit /b
-
-7z x LLVM-%package_version%-win64.exe -orepack
-rmdir /s /q repack\$PLUGINSDIR
-del repack\Uninstall.exe
-7z a LLVM-%package_version%-win64.zip .\repack\* -mx9
-cd ..
diff --git a/gnu/llvm/llvm/utils/sanitizers/ubsan_blacklist.txt b/gnu/llvm/llvm/utils/sanitizers/ubsan_blacklist.txt
deleted file mode 100644
index 144ab1f4685..00000000000
--- a/gnu/llvm/llvm/utils/sanitizers/ubsan_blacklist.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-# This blacklist should be applied when LLVM is built
-# with -fsanitize=undefined instrumentation. It exists
-# because libstdc++ has some undefined behavior issues
-# in some of the headers, in particular, stl_tree.h.
-
-# upcast of address with insufficient space for an object of type std::_Rb_tree_node<...>
-src:*bits/stl_tree.h
-
-# libstdc++ 4.8 creates a null reference when calling
-# data() on an empty vector: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59829
-src:*bits/stl_iterator.h
-src:*bits/stl_vector.h
-
-# libstdc++ 8.0.1 casts an under-aligned pointer to type type_info:
-# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85930
-src:*bits/shared_ptr_base.h
diff --git a/gnu/llvm/llvm/utils/unittest/CMakeLists.txt b/gnu/llvm/llvm/utils/unittest/CMakeLists.txt
deleted file mode 100644
index 90037ae2e44..00000000000
--- a/gnu/llvm/llvm/utils/unittest/CMakeLists.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-########################################################################
-# Experimental CMake build script for Google Test.
-#
-# Consider this a prototype.  It will change drastically.  For now,
-# this is only for people on the cutting edge.
-#
-# To run the tests for Google Test itself on Linux, use 'make test' or
-# ctest.  You can select which tests to run using 'ctest -R regex'.
-# For more options, run 'ctest --help'.
-########################################################################
-#
-# Project-wide settings
-
-if(WIN32)
-  add_definitions(-DGTEST_OS_WINDOWS=1)
-endif()
-
-# Google Test requires headers which need _ALL_SOURCE to build on AIX
-if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHES "AIX")
-  remove_definitions("-D_XOPEN_SOURCE=700")
-  add_definitions("-D_ALL_SOURCE")
-endif()
-
-if(SUPPORTS_VARIADIC_MACROS_FLAG)
-  add_definitions("-Wno-variadic-macros")
-endif()
-if(SUPPORTS_GNU_ZERO_VARIADIC_MACRO_ARGUMENTS_FLAG)
-  add_definitions("-Wno-gnu-zero-variadic-macro-arguments")
-endif()
-if(CXX_SUPPORTS_COVERED_SWITCH_DEFAULT_FLAG)
-  add_definitions("-Wno-covered-switch-default")
-endif()
-
-set(LLVM_REQUIRES_RTTI 1)
-add_definitions( -DGTEST_HAS_RTTI=0 )
-
-find_library(LLVM_PTHREAD_LIBRARY_PATH pthread)
-if (LLVM_PTHREAD_LIBRARY_PATH)
-  list(APPEND LIBS pthread)
-endif()
-
-add_llvm_library(gtest
-  googletest/src/gtest-all.cc
-  googlemock/src/gmock-all.cc
-
-  LINK_LIBS
-  ${LIBS}
-
-  LINK_COMPONENTS
-  Support # Depends on llvm::raw_ostream
-
-  # This is a library meant only for the build tree.
-  BUILDTREE_ONLY
-)
-
-# The googletest and googlemock sources don't presently use the 'override'
-# keyword, which leads to lots of warnings from -Wsuggest-override. Disable
-# that warning here for any targets that link to gtest.
-if(CXX_SUPPORTS_SUGGEST_OVERRIDE_FLAG)
-  add_definitions("-Wno-suggest-override")
-  set_target_properties(gtest PROPERTIES INTERFACE_COMPILE_OPTIONS "-Wno-suggest-override")
-endif()
-
-if (NOT LLVM_ENABLE_THREADS)
-  target_compile_definitions(gtest PUBLIC GTEST_HAS_PTHREAD=0)
-endif ()
-
-target_include_directories(gtest
-  PUBLIC googletest/include googlemock/include
-  PRIVATE googletest googlemock
-  )
-
-add_subdirectory(UnitTestMain)
-
-# When LLVM_LINK_LLVM_DYLIB is enabled, libLLVM.so is added to the interface
-# link libraries for gtest and gtest_main.  This means that any target, like
-# unittests for example, that links against gtest will be forced to link
-# against libLLVM.so.  In some cases we may want to statically unittests if they
-# need access to symbols that are marked private in libLLVM.so.  The only
-# way we can make this work is to remove libLLVM.so from the list of interface
-# link libraries for gtest and then make gtest users responsible for explicitly
-# adding libLLVM.so to their targets link libraries if they need it.
-
-function (gtest_remove_dylib_from_link_interface target)
-  get_target_property(interface_libs ${target} INTERFACE_LINK_LIBRARIES)
-  if (interface_libs)
-    list(REMOVE_ITEM interface_libs LLVM)
-    set_target_properties(${target} PROPERTIES INTERFACE_LINK_LIBRARIES "${interface_libs}")
-  endif()
-endfunction()
-
-gtest_remove_dylib_from_link_interface(gtest)
-gtest_remove_dylib_from_link_interface(gtest_main)
diff --git a/gnu/llvm/llvm/utils/unittest/UnitTestMain/CMakeLists.txt b/gnu/llvm/llvm/utils/unittest/UnitTestMain/CMakeLists.txt
deleted file mode 100644
index 32f0f25a60f..00000000000
--- a/gnu/llvm/llvm/utils/unittest/UnitTestMain/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-add_llvm_library(gtest_main
-  TestMain.cpp
-
-  LINK_LIBS
-  gtest
-
-  LINK_COMPONENTS
-  Support # Depends on llvm::cl
-
-  # This library is not meant to be in the install tree, only the build tree.
-  BUILDTREE_ONLY
-  )
diff --git a/gnu/llvm/llvm/utils/unittest/UnitTestMain/TestMain.cpp b/gnu/llvm/llvm/utils/unittest/UnitTestMain/TestMain.cpp
deleted file mode 100644
index 1be819fab72..00000000000
--- a/gnu/llvm/llvm/utils/unittest/UnitTestMain/TestMain.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-//===--- utils/unittest/UnitTestMain/TestMain.cpp - unittest driver -------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/Signals.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-#if defined(_WIN32)
-# include <windows.h>
-# if defined(_MSC_VER)
-#   include <crtdbg.h>
-# endif
-#endif
-
-const char *TestMainArgv0;
-
-int main(int argc, char **argv) {
-  llvm::sys::PrintStackTraceOnErrorSignal(argv[0],
-                                          true /* Disable crash reporting */);
-
-  // Initialize both gmock and gtest.
-  testing::InitGoogleMock(&argc, argv);
-
-  llvm::cl::ParseCommandLineOptions(argc, argv);
-
-  // Make it easy for a test to re-execute itself by saving argv[0].
-  TestMainArgv0 = argv[0];
-
-# if defined(_WIN32)
-  // Disable all of the possible ways Windows conspires to make automated
-  // testing impossible.
-  ::SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX);
-#   if defined(_MSC_VER)
-    ::_set_error_mode(_OUT_TO_STDERR);
-    _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
-    _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
-    _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
-    _CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR);
-    _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
-    _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);
-#   endif
-# endif
-
-  return RUN_ALL_TESTS();
-}
diff --git a/gnu/llvm/llvm/utils/unittest/googlemock/LICENSE.txt b/gnu/llvm/llvm/utils/unittest/googlemock/LICENSE.txt
deleted file mode 100644
index 1941a11f8ce..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googlemock/LICENSE.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-Copyright 2008, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/gnu/llvm/llvm/utils/unittest/googlemock/README.LLVM b/gnu/llvm/llvm/utils/unittest/googlemock/README.LLVM
deleted file mode 100644
index dbeb4af08e9..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googlemock/README.LLVM
+++ /dev/null
@@ -1,22 +0,0 @@
-LLVM notes
-----------
-
-This directory contains the 'googlemock' component of Google Test 1.10.0, with
-all elements removed except for the actual source code, to minimize the
-addition to the LLVM distribution.
-
-Cleaned up as follows:
-
-# Remove all the unnecessary files and directories
-$ rm -f CMakeLists.txt configure* Makefile* CHANGES CONTRIBUTORS README README.md .gitignore
-$ rm -rf build-aux make msvc scripts test docs
-$ rm -f `find . -name \*\.pump`
-$ rm -f src/gmock_main.cc
-
-# Put the license in the consistent place for LLVM.
-$ mv LICENSE LICENSE.TXT
-
-Modified as follows:
-* Support for std::begin/std::end in gmock-matchers.h
-* IWYU pragmas
-* Disabled -Wdeprecated-copy for clang
diff --git a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-actions.h b/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-actions.h
deleted file mode 100644
index 0a997a29844..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-actions.h
+++ /dev/null
@@ -1,1157 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file implements some commonly used actions.
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-// IWYU pragma: private, include "gmock/gmock.h"
-
-#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_ACTIONS_H_
-#define GMOCK_INCLUDE_GMOCK_GMOCK_ACTIONS_H_
-
-#ifndef _WIN32_WCE
-# include <errno.h>
-#endif
-
-#include <algorithm>
-#include <functional>
-#include <memory>
-#include <string>
-#include <type_traits>
-#include <utility>
-
-#include "gmock/internal/gmock-internal-utils.h"
-#include "gmock/internal/gmock-port.h"
-
-#ifdef _MSC_VER
-# pragma warning(push)
-# pragma warning(disable:4100)
-#endif
-
-#ifdef __clang__
-#if __has_warning("-Wdeprecated-copy")
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-copy"
-#endif
-#endif
-
-namespace testing {
-
-// To implement an action Foo, define:
-//   1. a class FooAction that implements the ActionInterface interface, and
-//   2. a factory function that creates an Action object from a
-//      const FooAction*.
-//
-// The two-level delegation design follows that of Matcher, providing
-// consistency for extension developers.  It also eases ownership
-// management as Action objects can now be copied like plain values.
-
-namespace internal {
-
-// BuiltInDefaultValueGetter<T, true>::Get() returns a
-// default-constructed T value.  BuiltInDefaultValueGetter<T,
-// false>::Get() crashes with an error.
-//
-// This primary template is used when kDefaultConstructible is true.
-template <typename T, bool kDefaultConstructible>
-struct BuiltInDefaultValueGetter {
-  static T Get() { return T(); }
-};
-template <typename T>
-struct BuiltInDefaultValueGetter<T, false> {
-  static T Get() {
-    Assert(false, __FILE__, __LINE__,
-           "Default action undefined for the function return type.");
-    return internal::Invalid<T>();
-    // The above statement will never be reached, but is required in
-    // order for this function to compile.
-  }
-};
-
-// BuiltInDefaultValue<T>::Get() returns the "built-in" default value
-// for type T, which is NULL when T is a raw pointer type, 0 when T is
-// a numeric type, false when T is bool, or "" when T is string or
-// std::string.  In addition, in C++11 and above, it turns a
-// default-constructed T value if T is default constructible.  For any
-// other type T, the built-in default T value is undefined, and the
-// function will abort the process.
-template <typename T>
-class BuiltInDefaultValue {
- public:
-  // This function returns true if and only if type T has a built-in default
-  // value.
-  static bool Exists() {
-    return ::std::is_default_constructible<T>::value;
-  }
-
-  static T Get() {
-    return BuiltInDefaultValueGetter<
-        T, ::std::is_default_constructible<T>::value>::Get();
-  }
-};
-
-// This partial specialization says that we use the same built-in
-// default value for T and const T.
-template <typename T>
-class BuiltInDefaultValue<const T> {
- public:
-  static bool Exists() { return BuiltInDefaultValue<T>::Exists(); }
-  static T Get() { return BuiltInDefaultValue<T>::Get(); }
-};
-
-// This partial specialization defines the default values for pointer
-// types.
-template <typename T>
-class BuiltInDefaultValue<T*> {
- public:
-  static bool Exists() { return true; }
-  static T* Get() { return nullptr; }
-};
-
-// The following specializations define the default values for
-// specific types we care about.
-#define GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(type, value) \
-  template <> \
-  class BuiltInDefaultValue<type> { \
-   public: \
-    static bool Exists() { return true; } \
-    static type Get() { return value; } \
-  }
-
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(void, );  // NOLINT
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(::std::string, "");
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(bool, false);
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(unsigned char, '\0');
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(signed char, '\0');
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(char, '\0');
-
-// There's no need for a default action for signed wchar_t, as that
-// type is the same as wchar_t for gcc, and invalid for MSVC.
-//
-// There's also no need for a default action for unsigned wchar_t, as
-// that type is the same as unsigned int for gcc, and invalid for
-// MSVC.
-#if GMOCK_WCHAR_T_IS_NATIVE_
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(wchar_t, 0U);  // NOLINT
-#endif
-
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(unsigned short, 0U);  // NOLINT
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(signed short, 0);     // NOLINT
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(unsigned int, 0U);
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(signed int, 0);
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(unsigned long, 0UL);  // NOLINT
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(signed long, 0L);     // NOLINT
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(UInt64, 0);
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(Int64, 0);
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(float, 0);
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(double, 0);
-
-#undef GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_
-
-}  // namespace internal
-
-// When an unexpected function call is encountered, Google Mock will
-// let it return a default value if the user has specified one for its
-// return type, or if the return type has a built-in default value;
-// otherwise Google Mock won't know what value to return and will have
-// to abort the process.
-//
-// The DefaultValue<T> class allows a user to specify the
-// default value for a type T that is both copyable and publicly
-// destructible (i.e. anything that can be used as a function return
-// type).  The usage is:
-//
-//   // Sets the default value for type T to be foo.
-//   DefaultValue<T>::Set(foo);
-template <typename T>
-class DefaultValue {
- public:
-  // Sets the default value for type T; requires T to be
-  // copy-constructable and have a public destructor.
-  static void Set(T x) {
-    delete producer_;
-    producer_ = new FixedValueProducer(x);
-  }
-
-  // Provides a factory function to be called to generate the default value.
-  // This method can be used even if T is only move-constructible, but it is not
-  // limited to that case.
-  typedef T (*FactoryFunction)();
-  static void SetFactory(FactoryFunction factory) {
-    delete producer_;
-    producer_ = new FactoryValueProducer(factory);
-  }
-
-  // Unsets the default value for type T.
-  static void Clear() {
-    delete producer_;
-    producer_ = nullptr;
-  }
-
-  // Returns true if and only if the user has set the default value for type T.
-  static bool IsSet() { return producer_ != nullptr; }
-
-  // Returns true if T has a default return value set by the user or there
-  // exists a built-in default value.
-  static bool Exists() {
-    return IsSet() || internal::BuiltInDefaultValue<T>::Exists();
-  }
-
-  // Returns the default value for type T if the user has set one;
-  // otherwise returns the built-in default value. Requires that Exists()
-  // is true, which ensures that the return value is well-defined.
-  static T Get() {
-    return producer_ == nullptr ? internal::BuiltInDefaultValue<T>::Get()
-                                : producer_->Produce();
-  }
-
- private:
-  class ValueProducer {
-   public:
-    virtual ~ValueProducer() {}
-    virtual T Produce() = 0;
-  };
-
-  class FixedValueProducer : public ValueProducer {
-   public:
-    explicit FixedValueProducer(T value) : value_(value) {}
-    T Produce() override { return value_; }
-
-   private:
-    const T value_;
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(FixedValueProducer);
-  };
-
-  class FactoryValueProducer : public ValueProducer {
-   public:
-    explicit FactoryValueProducer(FactoryFunction factory)
-        : factory_(factory) {}
-    T Produce() override { return factory_(); }
-
-   private:
-    const FactoryFunction factory_;
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(FactoryValueProducer);
-  };
-
-  static ValueProducer* producer_;
-};
-
-// This partial specialization allows a user to set default values for
-// reference types.
-template <typename T>
-class DefaultValue<T&> {
- public:
-  // Sets the default value for type T&.
-  static void Set(T& x) {  // NOLINT
-    address_ = &x;
-  }
-
-  // Unsets the default value for type T&.
-  static void Clear() { address_ = nullptr; }
-
-  // Returns true if and only if the user has set the default value for type T&.
-  static bool IsSet() { return address_ != nullptr; }
-
-  // Returns true if T has a default return value set by the user or there
-  // exists a built-in default value.
-  static bool Exists() {
-    return IsSet() || internal::BuiltInDefaultValue<T&>::Exists();
-  }
-
-  // Returns the default value for type T& if the user has set one;
-  // otherwise returns the built-in default value if there is one;
-  // otherwise aborts the process.
-  static T& Get() {
-    return address_ == nullptr ? internal::BuiltInDefaultValue<T&>::Get()
-                               : *address_;
-  }
-
- private:
-  static T* address_;
-};
-
-// This specialization allows DefaultValue<void>::Get() to
-// compile.
-template <>
-class DefaultValue<void> {
- public:
-  static bool Exists() { return true; }
-  static void Get() {}
-};
-
-// Points to the user-set default value for type T.
-template <typename T>
-typename DefaultValue<T>::ValueProducer* DefaultValue<T>::producer_ = nullptr;
-
-// Points to the user-set default value for type T&.
-template <typename T>
-T* DefaultValue<T&>::address_ = nullptr;
-
-// Implement this interface to define an action for function type F.
-template <typename F>
-class ActionInterface {
- public:
-  typedef typename internal::Function<F>::Result Result;
-  typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
-
-  ActionInterface() {}
-  virtual ~ActionInterface() {}
-
-  // Performs the action.  This method is not const, as in general an
-  // action can have side effects and be stateful.  For example, a
-  // get-the-next-element-from-the-collection action will need to
-  // remember the current element.
-  virtual Result Perform(const ArgumentTuple& args) = 0;
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ActionInterface);
-};
-
-// An Action<F> is a copyable and IMMUTABLE (except by assignment)
-// object that represents an action to be taken when a mock function
-// of type F is called.  The implementation of Action<T> is just a
-// std::shared_ptr to const ActionInterface<T>. Don't inherit from Action!
-// You can view an object implementing ActionInterface<F> as a
-// concrete action (including its current state), and an Action<F>
-// object as a handle to it.
-template <typename F>
-class Action {
-  // Adapter class to allow constructing Action from a legacy ActionInterface.
-  // New code should create Actions from functors instead.
-  struct ActionAdapter {
-    // Adapter must be copyable to satisfy std::function requirements.
-    ::std::shared_ptr<ActionInterface<F>> impl_;
-
-    template <typename... Args>
-    typename internal::Function<F>::Result operator()(Args&&... args) {
-      return impl_->Perform(
-          ::std::forward_as_tuple(::std::forward<Args>(args)...));
-    }
-  };
-
- public:
-  typedef typename internal::Function<F>::Result Result;
-  typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
-
-  // Constructs a null Action.  Needed for storing Action objects in
-  // STL containers.
-  Action() {}
-
-  // Construct an Action from a specified callable.
-  // This cannot take std::function directly, because then Action would not be
-  // directly constructible from lambda (it would require two conversions).
-  template <typename G,
-            typename = typename ::std::enable_if<
-                ::std::is_constructible<::std::function<F>, G>::value>::type>
-  Action(G&& fun) : fun_(::std::forward<G>(fun)) {}  // NOLINT
-
-  // Constructs an Action from its implementation.
-  explicit Action(ActionInterface<F>* impl)
-      : fun_(ActionAdapter{::std::shared_ptr<ActionInterface<F>>(impl)}) {}
-
-  // This constructor allows us to turn an Action<Func> object into an
-  // Action<F>, as long as F's arguments can be implicitly converted
-  // to Func's and Func's return type can be implicitly converted to F's.
-  template <typename Func>
-  explicit Action(const Action<Func>& action) : fun_(action.fun_) {}
-
-  // Returns true if and only if this is the DoDefault() action.
-  bool IsDoDefault() const { return fun_ == nullptr; }
-
-  // Performs the action.  Note that this method is const even though
-  // the corresponding method in ActionInterface is not.  The reason
-  // is that a const Action<F> means that it cannot be re-bound to
-  // another concrete action, not that the concrete action it binds to
-  // cannot change state.  (Think of the difference between a const
-  // pointer and a pointer to const.)
-  Result Perform(ArgumentTuple args) const {
-    if (IsDoDefault()) {
-      internal::IllegalDoDefault(__FILE__, __LINE__);
-    }
-    return internal::Apply(fun_, ::std::move(args));
-  }
-
- private:
-  template <typename G>
-  friend class Action;
-
-  // fun_ is an empty function if and only if this is the DoDefault() action.
-  ::std::function<F> fun_;
-};
-
-// The PolymorphicAction class template makes it easy to implement a
-// polymorphic action (i.e. an action that can be used in mock
-// functions of than one type, e.g. Return()).
-//
-// To define a polymorphic action, a user first provides a COPYABLE
-// implementation class that has a Perform() method template:
-//
-//   class FooAction {
-//    public:
-//     template <typename Result, typename ArgumentTuple>
-//     Result Perform(const ArgumentTuple& args) const {
-//       // Processes the arguments and returns a result, using
-//       // std::get<N>(args) to get the N-th (0-based) argument in the tuple.
-//     }
-//     ...
-//   };
-//
-// Then the user creates the polymorphic action using
-// MakePolymorphicAction(object) where object has type FooAction.  See
-// the definition of Return(void) and SetArgumentPointee<N>(value) for
-// complete examples.
-template <typename Impl>
-class PolymorphicAction {
- public:
-  explicit PolymorphicAction(const Impl& impl) : impl_(impl) {}
-
-  template <typename F>
-  operator Action<F>() const {
-    return Action<F>(new MonomorphicImpl<F>(impl_));
-  }
-
- private:
-  template <typename F>
-  class MonomorphicImpl : public ActionInterface<F> {
-   public:
-    typedef typename internal::Function<F>::Result Result;
-    typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
-
-    explicit MonomorphicImpl(const Impl& impl) : impl_(impl) {}
-
-    Result Perform(const ArgumentTuple& args) override {
-      return impl_.template Perform<Result>(args);
-    }
-
-   private:
-    Impl impl_;
-
-    GTEST_DISALLOW_ASSIGN_(MonomorphicImpl);
-  };
-
-  Impl impl_;
-
-  GTEST_DISALLOW_ASSIGN_(PolymorphicAction);
-};
-
-// Creates an Action from its implementation and returns it.  The
-// created Action object owns the implementation.
-template <typename F>
-Action<F> MakeAction(ActionInterface<F>* impl) {
-  return Action<F>(impl);
-}
-
-// Creates a polymorphic action from its implementation.  This is
-// easier to use than the PolymorphicAction<Impl> constructor as it
-// doesn't require you to explicitly write the template argument, e.g.
-//
-//   MakePolymorphicAction(foo);
-// vs
-//   PolymorphicAction<TypeOfFoo>(foo);
-template <typename Impl>
-inline PolymorphicAction<Impl> MakePolymorphicAction(const Impl& impl) {
-  return PolymorphicAction<Impl>(impl);
-}
-
-namespace internal {
-
-// Helper struct to specialize ReturnAction to execute a move instead of a copy
-// on return. Useful for move-only types, but could be used on any type.
-template <typename T>
-struct ByMoveWrapper {
-  explicit ByMoveWrapper(T value) : payload(std::move(value)) {}
-  T payload;
-};
-
-// Implements the polymorphic Return(x) action, which can be used in
-// any function that returns the type of x, regardless of the argument
-// types.
-//
-// Note: The value passed into Return must be converted into
-// Function<F>::Result when this action is cast to Action<F> rather than
-// when that action is performed. This is important in scenarios like
-//
-// MOCK_METHOD1(Method, T(U));
-// ...
-// {
-//   Foo foo;
-//   X x(&foo);
-//   EXPECT_CALL(mock, Method(_)).WillOnce(Return(x));
-// }
-//
-// In the example above the variable x holds reference to foo which leaves
-// scope and gets destroyed.  If copying X just copies a reference to foo,
-// that copy will be left with a hanging reference.  If conversion to T
-// makes a copy of foo, the above code is safe. To support that scenario, we
-// need to make sure that the type conversion happens inside the EXPECT_CALL
-// statement, and conversion of the result of Return to Action<T(U)> is a
-// good place for that.
-//
-// The real life example of the above scenario happens when an invocation
-// of gtl::Container() is passed into Return.
-//
-template <typename R>
-class ReturnAction {
- public:
-  // Constructs a ReturnAction object from the value to be returned.
-  // 'value' is passed by value instead of by const reference in order
-  // to allow Return("string literal") to compile.
-  explicit ReturnAction(R value) : value_(new R(std::move(value))) {}
-
-  // This template type conversion operator allows Return(x) to be
-  // used in ANY function that returns x's type.
-  template <typename F>
-  operator Action<F>() const {  // NOLINT
-    // Assert statement belongs here because this is the best place to verify
-    // conditions on F. It produces the clearest error messages
-    // in most compilers.
-    // Impl really belongs in this scope as a local class but can't
-    // because MSVC produces duplicate symbols in different translation units
-    // in this case. Until MS fixes that bug we put Impl into the class scope
-    // and put the typedef both here (for use in assert statement) and
-    // in the Impl class. But both definitions must be the same.
-    typedef typename Function<F>::Result Result;
-    GTEST_COMPILE_ASSERT_(
-        !std::is_reference<Result>::value,
-        use_ReturnRef_instead_of_Return_to_return_a_reference);
-    static_assert(!std::is_void<Result>::value,
-                  "Can't use Return() on an action expected to return `void`.");
-    return Action<F>(new Impl<R, F>(value_));
-  }
-
- private:
-  // Implements the Return(x) action for a particular function type F.
-  template <typename R_, typename F>
-  class Impl : public ActionInterface<F> {
-   public:
-    typedef typename Function<F>::Result Result;
-    typedef typename Function<F>::ArgumentTuple ArgumentTuple;
-
-    // The implicit cast is necessary when Result has more than one
-    // single-argument constructor (e.g. Result is std::vector<int>) and R
-    // has a type conversion operator template.  In that case, value_(value)
-    // won't compile as the compiler doesn't known which constructor of
-    // Result to call.  ImplicitCast_ forces the compiler to convert R to
-    // Result without considering explicit constructors, thus resolving the
-    // ambiguity. value_ is then initialized using its copy constructor.
-    explicit Impl(const std::shared_ptr<R>& value)
-        : value_before_cast_(*value),
-          value_(ImplicitCast_<Result>(value_before_cast_)) {}
-
-    Result Perform(const ArgumentTuple&) override { return value_; }
-
-   private:
-    GTEST_COMPILE_ASSERT_(!std::is_reference<Result>::value,
-                          Result_cannot_be_a_reference_type);
-    // We save the value before casting just in case it is being cast to a
-    // wrapper type.
-    R value_before_cast_;
-    Result value_;
-
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(Impl);
-  };
-
-  // Partially specialize for ByMoveWrapper. This version of ReturnAction will
-  // move its contents instead.
-  template <typename R_, typename F>
-  class Impl<ByMoveWrapper<R_>, F> : public ActionInterface<F> {
-   public:
-    typedef typename Function<F>::Result Result;
-    typedef typename Function<F>::ArgumentTuple ArgumentTuple;
-
-    explicit Impl(const std::shared_ptr<R>& wrapper)
-        : performed_(false), wrapper_(wrapper) {}
-
-    Result Perform(const ArgumentTuple&) override {
-      GTEST_CHECK_(!performed_)
-          << "A ByMove() action should only be performed once.";
-      performed_ = true;
-      return std::move(wrapper_->payload);
-    }
-
-   private:
-    bool performed_;
-    const std::shared_ptr<R> wrapper_;
-
-    GTEST_DISALLOW_ASSIGN_(Impl);
-  };
-
-  const std::shared_ptr<R> value_;
-
-  GTEST_DISALLOW_ASSIGN_(ReturnAction);
-};
-
-// Implements the ReturnNull() action.
-class ReturnNullAction {
- public:
-  // Allows ReturnNull() to be used in any pointer-returning function. In C++11
-  // this is enforced by returning nullptr, and in non-C++11 by asserting a
-  // pointer type on compile time.
-  template <typename Result, typename ArgumentTuple>
-  static Result Perform(const ArgumentTuple&) {
-    return nullptr;
-  }
-};
-
-// Implements the Return() action.
-class ReturnVoidAction {
- public:
-  // Allows Return() to be used in any void-returning function.
-  template <typename Result, typename ArgumentTuple>
-  static void Perform(const ArgumentTuple&) {
-    static_assert(std::is_void<Result>::value, "Result should be void.");
-  }
-};
-
-// Implements the polymorphic ReturnRef(x) action, which can be used
-// in any function that returns a reference to the type of x,
-// regardless of the argument types.
-template <typename T>
-class ReturnRefAction {
- public:
-  // Constructs a ReturnRefAction object from the reference to be returned.
-  explicit ReturnRefAction(T& ref) : ref_(ref) {}  // NOLINT
-
-  // This template type conversion operator allows ReturnRef(x) to be
-  // used in ANY function that returns a reference to x's type.
-  template <typename F>
-  operator Action<F>() const {
-    typedef typename Function<F>::Result Result;
-    // Asserts that the function return type is a reference.  This
-    // catches the user error of using ReturnRef(x) when Return(x)
-    // should be used, and generates some helpful error message.
-    GTEST_COMPILE_ASSERT_(std::is_reference<Result>::value,
-                          use_Return_instead_of_ReturnRef_to_return_a_value);
-    return Action<F>(new Impl<F>(ref_));
-  }
-
- private:
-  // Implements the ReturnRef(x) action for a particular function type F.
-  template <typename F>
-  class Impl : public ActionInterface<F> {
-   public:
-    typedef typename Function<F>::Result Result;
-    typedef typename Function<F>::ArgumentTuple ArgumentTuple;
-
-    explicit Impl(T& ref) : ref_(ref) {}  // NOLINT
-
-    Result Perform(const ArgumentTuple&) override { return ref_; }
-
-   private:
-    T& ref_;
-
-    GTEST_DISALLOW_ASSIGN_(Impl);
-  };
-
-  T& ref_;
-
-  GTEST_DISALLOW_ASSIGN_(ReturnRefAction);
-};
-
-// Implements the polymorphic ReturnRefOfCopy(x) action, which can be
-// used in any function that returns a reference to the type of x,
-// regardless of the argument types.
-template <typename T>
-class ReturnRefOfCopyAction {
- public:
-  // Constructs a ReturnRefOfCopyAction object from the reference to
-  // be returned.
-  explicit ReturnRefOfCopyAction(const T& value) : value_(value) {}  // NOLINT
-
-  // This template type conversion operator allows ReturnRefOfCopy(x) to be
-  // used in ANY function that returns a reference to x's type.
-  template <typename F>
-  operator Action<F>() const {
-    typedef typename Function<F>::Result Result;
-    // Asserts that the function return type is a reference.  This
-    // catches the user error of using ReturnRefOfCopy(x) when Return(x)
-    // should be used, and generates some helpful error message.
-    GTEST_COMPILE_ASSERT_(
-        std::is_reference<Result>::value,
-        use_Return_instead_of_ReturnRefOfCopy_to_return_a_value);
-    return Action<F>(new Impl<F>(value_));
-  }
-
- private:
-  // Implements the ReturnRefOfCopy(x) action for a particular function type F.
-  template <typename F>
-  class Impl : public ActionInterface<F> {
-   public:
-    typedef typename Function<F>::Result Result;
-    typedef typename Function<F>::ArgumentTuple ArgumentTuple;
-
-    explicit Impl(const T& value) : value_(value) {}  // NOLINT
-
-    Result Perform(const ArgumentTuple&) override { return value_; }
-
-   private:
-    T value_;
-
-    GTEST_DISALLOW_ASSIGN_(Impl);
-  };
-
-  const T value_;
-
-  GTEST_DISALLOW_ASSIGN_(ReturnRefOfCopyAction);
-};
-
-// Implements the polymorphic DoDefault() action.
-class DoDefaultAction {
- public:
-  // This template type conversion operator allows DoDefault() to be
-  // used in any function.
-  template <typename F>
-  operator Action<F>() const { return Action<F>(); }  // NOLINT
-};
-
-// Implements the Assign action to set a given pointer referent to a
-// particular value.
-template <typename T1, typename T2>
-class AssignAction {
- public:
-  AssignAction(T1* ptr, T2 value) : ptr_(ptr), value_(value) {}
-
-  template <typename Result, typename ArgumentTuple>
-  void Perform(const ArgumentTuple& /* args */) const {
-    *ptr_ = value_;
-  }
-
- private:
-  T1* const ptr_;
-  const T2 value_;
-
-  GTEST_DISALLOW_ASSIGN_(AssignAction);
-};
-
-#if !GTEST_OS_WINDOWS_MOBILE
-
-// Implements the SetErrnoAndReturn action to simulate return from
-// various system calls and libc functions.
-template <typename T>
-class SetErrnoAndReturnAction {
- public:
-  SetErrnoAndReturnAction(int errno_value, T result)
-      : errno_(errno_value),
-        result_(result) {}
-  template <typename Result, typename ArgumentTuple>
-  Result Perform(const ArgumentTuple& /* args */) const {
-    errno = errno_;
-    return result_;
-  }
-
- private:
-  const int errno_;
-  const T result_;
-
-  GTEST_DISALLOW_ASSIGN_(SetErrnoAndReturnAction);
-};
-
-#endif  // !GTEST_OS_WINDOWS_MOBILE
-
-// Implements the SetArgumentPointee<N>(x) action for any function
-// whose N-th argument (0-based) is a pointer to x's type.
-template <size_t N, typename A, typename = void>
-struct SetArgumentPointeeAction {
-  A value;
-
-  template <typename... Args>
-  void operator()(const Args&... args) const {
-    *::std::get<N>(std::tie(args...)) = value;
-  }
-};
-
-// Implements the Invoke(object_ptr, &Class::Method) action.
-template <class Class, typename MethodPtr>
-struct InvokeMethodAction {
-  Class* const obj_ptr;
-  const MethodPtr method_ptr;
-
-  template <typename... Args>
-  auto operator()(Args&&... args) const
-      -> decltype((obj_ptr->*method_ptr)(std::forward<Args>(args)...)) {
-    return (obj_ptr->*method_ptr)(std::forward<Args>(args)...);
-  }
-};
-
-// Implements the InvokeWithoutArgs(f) action.  The template argument
-// FunctionImpl is the implementation type of f, which can be either a
-// function pointer or a functor.  InvokeWithoutArgs(f) can be used as an
-// Action<F> as long as f's type is compatible with F.
-template <typename FunctionImpl>
-struct InvokeWithoutArgsAction {
-  FunctionImpl function_impl;
-
-  // Allows InvokeWithoutArgs(f) to be used as any action whose type is
-  // compatible with f.
-  template <typename... Args>
-  auto operator()(const Args&...) -> decltype(function_impl()) {
-    return function_impl();
-  }
-};
-
-// Implements the InvokeWithoutArgs(object_ptr, &Class::Method) action.
-template <class Class, typename MethodPtr>
-struct InvokeMethodWithoutArgsAction {
-  Class* const obj_ptr;
-  const MethodPtr method_ptr;
-
-  using ReturnType = typename std::result_of<MethodPtr(Class*)>::type;
-
-  template <typename... Args>
-  ReturnType operator()(const Args&...) const {
-    return (obj_ptr->*method_ptr)();
-  }
-};
-
-// Implements the IgnoreResult(action) action.
-template <typename A>
-class IgnoreResultAction {
- public:
-  explicit IgnoreResultAction(const A& action) : action_(action) {}
-
-  template <typename F>
-  operator Action<F>() const {
-    // Assert statement belongs here because this is the best place to verify
-    // conditions on F. It produces the clearest error messages
-    // in most compilers.
-    // Impl really belongs in this scope as a local class but can't
-    // because MSVC produces duplicate symbols in different translation units
-    // in this case. Until MS fixes that bug we put Impl into the class scope
-    // and put the typedef both here (for use in assert statement) and
-    // in the Impl class. But both definitions must be the same.
-    typedef typename internal::Function<F>::Result Result;
-
-    // Asserts at compile time that F returns void.
-    static_assert(std::is_void<Result>::value, "Result type should be void.");
-
-    return Action<F>(new Impl<F>(action_));
-  }
-
- private:
-  template <typename F>
-  class Impl : public ActionInterface<F> {
-   public:
-    typedef typename internal::Function<F>::Result Result;
-    typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
-
-    explicit Impl(const A& action) : action_(action) {}
-
-    void Perform(const ArgumentTuple& args) override {
-      // Performs the action and ignores its result.
-      action_.Perform(args);
-    }
-
-   private:
-    // Type OriginalFunction is the same as F except that its return
-    // type is IgnoredValue.
-    typedef typename internal::Function<F>::MakeResultIgnoredValue
-        OriginalFunction;
-
-    const Action<OriginalFunction> action_;
-
-    GTEST_DISALLOW_ASSIGN_(Impl);
-  };
-
-  const A action_;
-
-  GTEST_DISALLOW_ASSIGN_(IgnoreResultAction);
-};
-
-template <typename InnerAction, size_t... I>
-struct WithArgsAction {
-  InnerAction action;
-
-  // The inner action could be anything convertible to Action<X>.
-  // We use the conversion operator to detect the signature of the inner Action.
-  template <typename R, typename... Args>
-  operator Action<R(Args...)>() const {  // NOLINT
-    Action<R(typename std::tuple_element<I, std::tuple<Args...>>::type...)>
-        converted(action);
-
-    return [converted](Args... args) -> R {
-      return converted.Perform(std::forward_as_tuple(
-        std::get<I>(std::forward_as_tuple(std::forward<Args>(args)...))...));
-    };
-  }
-};
-
-template <typename... Actions>
-struct DoAllAction {
- private:
-  template <typename... Args, size_t... I>
-  std::vector<Action<void(Args...)>> Convert(IndexSequence<I...>) const {
-    return {std::get<I>(actions)...};
-  }
-
- public:
-  std::tuple<Actions...> actions;
-
-  template <typename R, typename... Args>
-  operator Action<R(Args...)>() const {  // NOLINT
-    struct Op {
-      std::vector<Action<void(Args...)>> converted;
-      Action<R(Args...)> last;
-      R operator()(Args... args) const {
-        auto tuple_args = std::forward_as_tuple(std::forward<Args>(args)...);
-        for (auto& a : converted) {
-          a.Perform(tuple_args);
-        }
-        return last.Perform(tuple_args);
-      }
-    };
-    return Op{Convert<Args...>(MakeIndexSequence<sizeof...(Actions) - 1>()),
-              std::get<sizeof...(Actions) - 1>(actions)};
-  }
-};
-
-}  // namespace internal
-
-// An Unused object can be implicitly constructed from ANY value.
-// This is handy when defining actions that ignore some or all of the
-// mock function arguments.  For example, given
-//
-//   MOCK_METHOD3(Foo, double(const string& label, double x, double y));
-//   MOCK_METHOD3(Bar, double(int index, double x, double y));
-//
-// instead of
-//
-//   double DistanceToOriginWithLabel(const string& label, double x, double y) {
-//     return sqrt(x*x + y*y);
-//   }
-//   double DistanceToOriginWithIndex(int index, double x, double y) {
-//     return sqrt(x*x + y*y);
-//   }
-//   ...
-//   EXPECT_CALL(mock, Foo("abc", _, _))
-//       .WillOnce(Invoke(DistanceToOriginWithLabel));
-//   EXPECT_CALL(mock, Bar(5, _, _))
-//       .WillOnce(Invoke(DistanceToOriginWithIndex));
-//
-// you could write
-//
-//   // We can declare any uninteresting argument as Unused.
-//   double DistanceToOrigin(Unused, double x, double y) {
-//     return sqrt(x*x + y*y);
-//   }
-//   ...
-//   EXPECT_CALL(mock, Foo("abc", _, _)).WillOnce(Invoke(DistanceToOrigin));
-//   EXPECT_CALL(mock, Bar(5, _, _)).WillOnce(Invoke(DistanceToOrigin));
-typedef internal::IgnoredValue Unused;
-
-// Creates an action that does actions a1, a2, ..., sequentially in
-// each invocation.
-template <typename... Action>
-internal::DoAllAction<typename std::decay<Action>::type...> DoAll(
-    Action&&... action) {
-  return {std::forward_as_tuple(std::forward<Action>(action)...)};
-}
-
-// WithArg<k>(an_action) creates an action that passes the k-th
-// (0-based) argument of the mock function to an_action and performs
-// it.  It adapts an action accepting one argument to one that accepts
-// multiple arguments.  For convenience, we also provide
-// WithArgs<k>(an_action) (defined below) as a synonym.
-template <size_t k, typename InnerAction>
-internal::WithArgsAction<typename std::decay<InnerAction>::type, k>
-WithArg(InnerAction&& action) {
-  return {std::forward<InnerAction>(action)};
-}
-
-// WithArgs<N1, N2, ..., Nk>(an_action) creates an action that passes
-// the selected arguments of the mock function to an_action and
-// performs it.  It serves as an adaptor between actions with
-// different argument lists.
-template <size_t k, size_t... ks, typename InnerAction>
-internal::WithArgsAction<typename std::decay<InnerAction>::type, k, ks...>
-WithArgs(InnerAction&& action) {
-  return {std::forward<InnerAction>(action)};
-}
-
-// WithoutArgs(inner_action) can be used in a mock function with a
-// non-empty argument list to perform inner_action, which takes no
-// argument.  In other words, it adapts an action accepting no
-// argument to one that accepts (and ignores) arguments.
-template <typename InnerAction>
-internal::WithArgsAction<typename std::decay<InnerAction>::type>
-WithoutArgs(InnerAction&& action) {
-  return {std::forward<InnerAction>(action)};
-}
-
-// Creates an action that returns 'value'.  'value' is passed by value
-// instead of const reference - otherwise Return("string literal")
-// will trigger a compiler error about using array as initializer.
-template <typename R>
-internal::ReturnAction<R> Return(R value) {
-  return internal::ReturnAction<R>(std::move(value));
-}
-
-// Creates an action that returns NULL.
-inline PolymorphicAction<internal::ReturnNullAction> ReturnNull() {
-  return MakePolymorphicAction(internal::ReturnNullAction());
-}
-
-// Creates an action that returns from a void function.
-inline PolymorphicAction<internal::ReturnVoidAction> Return() {
-  return MakePolymorphicAction(internal::ReturnVoidAction());
-}
-
-// Creates an action that returns the reference to a variable.
-template <typename R>
-inline internal::ReturnRefAction<R> ReturnRef(R& x) {  // NOLINT
-  return internal::ReturnRefAction<R>(x);
-}
-
-// Creates an action that returns the reference to a copy of the
-// argument.  The copy is created when the action is constructed and
-// lives as long as the action.
-template <typename R>
-inline internal::ReturnRefOfCopyAction<R> ReturnRefOfCopy(const R& x) {
-  return internal::ReturnRefOfCopyAction<R>(x);
-}
-
-// Modifies the parent action (a Return() action) to perform a move of the
-// argument instead of a copy.
-// Return(ByMove()) actions can only be executed once and will assert this
-// invariant.
-template <typename R>
-internal::ByMoveWrapper<R> ByMove(R x) {
-  return internal::ByMoveWrapper<R>(std::move(x));
-}
-
-// Creates an action that does the default action for the give mock function.
-inline internal::DoDefaultAction DoDefault() {
-  return internal::DoDefaultAction();
-}
-
-// Creates an action that sets the variable pointed by the N-th
-// (0-based) function argument to 'value'.
-template <size_t N, typename T>
-internal::SetArgumentPointeeAction<N, T> SetArgPointee(T x) {
-  return {std::move(x)};
-}
-
-// The following version is DEPRECATED.
-template <size_t N, typename T>
-internal::SetArgumentPointeeAction<N, T> SetArgumentPointee(T x) {
-  return {std::move(x)};
-}
-
-// Creates an action that sets a pointer referent to a given value.
-template <typename T1, typename T2>
-PolymorphicAction<internal::AssignAction<T1, T2> > Assign(T1* ptr, T2 val) {
-  return MakePolymorphicAction(internal::AssignAction<T1, T2>(ptr, val));
-}
-
-#if !GTEST_OS_WINDOWS_MOBILE
-
-// Creates an action that sets errno and returns the appropriate error.
-template <typename T>
-PolymorphicAction<internal::SetErrnoAndReturnAction<T> >
-SetErrnoAndReturn(int errval, T result) {
-  return MakePolymorphicAction(
-      internal::SetErrnoAndReturnAction<T>(errval, result));
-}
-
-#endif  // !GTEST_OS_WINDOWS_MOBILE
-
-// Various overloads for Invoke().
-
-// Legacy function.
-// Actions can now be implicitly constructed from callables. No need to create
-// wrapper objects.
-// This function exists for backwards compatibility.
-template <typename FunctionImpl>
-typename std::decay<FunctionImpl>::type Invoke(FunctionImpl&& function_impl) {
-  return std::forward<FunctionImpl>(function_impl);
-}
-
-// Creates an action that invokes the given method on the given object
-// with the mock function's arguments.
-template <class Class, typename MethodPtr>
-internal::InvokeMethodAction<Class, MethodPtr> Invoke(Class* obj_ptr,
-                                                      MethodPtr method_ptr) {
-  return {obj_ptr, method_ptr};
-}
-
-// Creates an action that invokes 'function_impl' with no argument.
-template <typename FunctionImpl>
-internal::InvokeWithoutArgsAction<typename std::decay<FunctionImpl>::type>
-InvokeWithoutArgs(FunctionImpl function_impl) {
-  return {std::move(function_impl)};
-}
-
-// Creates an action that invokes the given method on the given object
-// with no argument.
-template <class Class, typename MethodPtr>
-internal::InvokeMethodWithoutArgsAction<Class, MethodPtr> InvokeWithoutArgs(
-    Class* obj_ptr, MethodPtr method_ptr) {
-  return {obj_ptr, method_ptr};
-}
-
-// Creates an action that performs an_action and throws away its
-// result.  In other words, it changes the return type of an_action to
-// void.  an_action MUST NOT return void, or the code won't compile.
-template <typename A>
-inline internal::IgnoreResultAction<A> IgnoreResult(const A& an_action) {
-  return internal::IgnoreResultAction<A>(an_action);
-}
-
-// Creates a reference wrapper for the given L-value.  If necessary,
-// you can explicitly specify the type of the reference.  For example,
-// suppose 'derived' is an object of type Derived, ByRef(derived)
-// would wrap a Derived&.  If you want to wrap a const Base& instead,
-// where Base is a base class of Derived, just write:
-//
-//   ByRef<const Base>(derived)
-//
-// N.B. ByRef is redundant with std::ref, std::cref and std::reference_wrapper.
-// However, it may still be used for consistency with ByMove().
-template <typename T>
-inline ::std::reference_wrapper<T> ByRef(T& l_value) {  // NOLINT
-  return ::std::reference_wrapper<T>(l_value);
-}
-
-}  // namespace testing
-
-#ifdef __clang__
-#if __has_warning("-Wdeprecated-copy")
-#pragma clang diagnostic pop
-#endif
-#endif
-
-#ifdef _MSC_VER
-# pragma warning(pop)
-#endif
-
-
-#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_ACTIONS_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-cardinalities.h b/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-cardinalities.h
deleted file mode 100644
index 05b66d4fffd..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-cardinalities.h
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file implements some commonly used cardinalities.  More
-// cardinalities can be defined by the user implementing the
-// CardinalityInterface interface if necessary.
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-// IWYU pragma: private, include "gmock/gmock.h"
-
-#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_
-#define GMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_
-
-#include <limits.h>
-#include <memory>
-#include <ostream>  // NOLINT
-#include "gmock/internal/gmock-port.h"
-#include "gtest/gtest.h"
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
-/* class A needs to have dll-interface to be used by clients of class B */)
-
-namespace testing {
-
-// To implement a cardinality Foo, define:
-//   1. a class FooCardinality that implements the
-//      CardinalityInterface interface, and
-//   2. a factory function that creates a Cardinality object from a
-//      const FooCardinality*.
-//
-// The two-level delegation design follows that of Matcher, providing
-// consistency for extension developers.  It also eases ownership
-// management as Cardinality objects can now be copied like plain values.
-
-// The implementation of a cardinality.
-class CardinalityInterface {
- public:
-  virtual ~CardinalityInterface() {}
-
-  // Conservative estimate on the lower/upper bound of the number of
-  // calls allowed.
-  virtual int ConservativeLowerBound() const { return 0; }
-  virtual int ConservativeUpperBound() const { return INT_MAX; }
-
-  // Returns true if and only if call_count calls will satisfy this
-  // cardinality.
-  virtual bool IsSatisfiedByCallCount(int call_count) const = 0;
-
-  // Returns true if and only if call_count calls will saturate this
-  // cardinality.
-  virtual bool IsSaturatedByCallCount(int call_count) const = 0;
-
-  // Describes self to an ostream.
-  virtual void DescribeTo(::std::ostream* os) const = 0;
-};
-
-// A Cardinality is a copyable and IMMUTABLE (except by assignment)
-// object that specifies how many times a mock function is expected to
-// be called.  The implementation of Cardinality is just a std::shared_ptr
-// to const CardinalityInterface. Don't inherit from Cardinality!
-class GTEST_API_ Cardinality {
- public:
-  // Constructs a null cardinality.  Needed for storing Cardinality
-  // objects in STL containers.
-  Cardinality() {}
-
-  // Constructs a Cardinality from its implementation.
-  explicit Cardinality(const CardinalityInterface* impl) : impl_(impl) {}
-
-  // Conservative estimate on the lower/upper bound of the number of
-  // calls allowed.
-  int ConservativeLowerBound() const { return impl_->ConservativeLowerBound(); }
-  int ConservativeUpperBound() const { return impl_->ConservativeUpperBound(); }
-
-  // Returns true if and only if call_count calls will satisfy this
-  // cardinality.
-  bool IsSatisfiedByCallCount(int call_count) const {
-    return impl_->IsSatisfiedByCallCount(call_count);
-  }
-
-  // Returns true if and only if call_count calls will saturate this
-  // cardinality.
-  bool IsSaturatedByCallCount(int call_count) const {
-    return impl_->IsSaturatedByCallCount(call_count);
-  }
-
-  // Returns true if and only if call_count calls will over-saturate this
-  // cardinality, i.e. exceed the maximum number of allowed calls.
-  bool IsOverSaturatedByCallCount(int call_count) const {
-    return impl_->IsSaturatedByCallCount(call_count) &&
-        !impl_->IsSatisfiedByCallCount(call_count);
-  }
-
-  // Describes self to an ostream
-  void DescribeTo(::std::ostream* os) const { impl_->DescribeTo(os); }
-
-  // Describes the given actual call count to an ostream.
-  static void DescribeActualCallCountTo(int actual_call_count,
-                                        ::std::ostream* os);
-
- private:
-  std::shared_ptr<const CardinalityInterface> impl_;
-};
-
-// Creates a cardinality that allows at least n calls.
-GTEST_API_ Cardinality AtLeast(int n);
-
-// Creates a cardinality that allows at most n calls.
-GTEST_API_ Cardinality AtMost(int n);
-
-// Creates a cardinality that allows any number of calls.
-GTEST_API_ Cardinality AnyNumber();
-
-// Creates a cardinality that allows between min and max calls.
-GTEST_API_ Cardinality Between(int min, int max);
-
-// Creates a cardinality that allows exactly n calls.
-GTEST_API_ Cardinality Exactly(int n);
-
-// Creates a cardinality from its implementation.
-inline Cardinality MakeCardinality(const CardinalityInterface* c) {
-  return Cardinality(c);
-}
-
-}  // namespace testing
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
-
-#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-function-mocker.h b/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-function-mocker.h
deleted file mode 100644
index cc1535c806b..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-function-mocker.h
+++ /dev/null
@@ -1,253 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file implements MOCK_METHOD.
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-#ifndef THIRD_PARTY_GOOGLETEST_GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_FUNCTION_MOCKER_H_  // NOLINT
-#define THIRD_PARTY_GOOGLETEST_GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_FUNCTION_MOCKER_H_  // NOLINT
-
-#include "gmock/gmock-generated-function-mockers.h"  // NOLINT
-#include "gmock/internal/gmock-pp.h"
-
-#define MOCK_METHOD(...) \
-  GMOCK_PP_VARIADIC_CALL(GMOCK_INTERNAL_MOCK_METHOD_ARG_, __VA_ARGS__)
-
-#define GMOCK_INTERNAL_MOCK_METHOD_ARG_1(...) \
-  GMOCK_INTERNAL_WRONG_ARITY(__VA_ARGS__)
-
-#define GMOCK_INTERNAL_MOCK_METHOD_ARG_2(...) \
-  GMOCK_INTERNAL_WRONG_ARITY(__VA_ARGS__)
-
-#define GMOCK_INTERNAL_MOCK_METHOD_ARG_3(_Ret, _MethodName, _Args) \
-  GMOCK_INTERNAL_MOCK_METHOD_ARG_4(_Ret, _MethodName, _Args, ())
-
-#define GMOCK_INTERNAL_MOCK_METHOD_ARG_4(_Ret, _MethodName, _Args, _Spec)     \
-  GMOCK_INTERNAL_ASSERT_PARENTHESIS(_Args);                                   \
-  GMOCK_INTERNAL_ASSERT_PARENTHESIS(_Spec);                                   \
-  GMOCK_INTERNAL_ASSERT_VALID_SIGNATURE(                                      \
-      GMOCK_PP_NARG0 _Args, GMOCK_INTERNAL_SIGNATURE(_Ret, _Args));           \
-  GMOCK_INTERNAL_ASSERT_VALID_SPEC(_Spec)                                     \
-  GMOCK_INTERNAL_MOCK_METHOD_IMPL(                                            \
-      GMOCK_PP_NARG0 _Args, _MethodName, GMOCK_INTERNAL_HAS_CONST(_Spec),     \
-      GMOCK_INTERNAL_HAS_OVERRIDE(_Spec), GMOCK_INTERNAL_HAS_FINAL(_Spec),    \
-      GMOCK_INTERNAL_HAS_NOEXCEPT(_Spec), GMOCK_INTERNAL_GET_CALLTYPE(_Spec), \
-      (GMOCK_INTERNAL_SIGNATURE(_Ret, _Args)))
-
-#define GMOCK_INTERNAL_MOCK_METHOD_ARG_5(...) \
-  GMOCK_INTERNAL_WRONG_ARITY(__VA_ARGS__)
-
-#define GMOCK_INTERNAL_MOCK_METHOD_ARG_6(...) \
-  GMOCK_INTERNAL_WRONG_ARITY(__VA_ARGS__)
-
-#define GMOCK_INTERNAL_MOCK_METHOD_ARG_7(...) \
-  GMOCK_INTERNAL_WRONG_ARITY(__VA_ARGS__)
-
-#define GMOCK_INTERNAL_WRONG_ARITY(...)                                      \
-  static_assert(                                                             \
-      false,                                                                 \
-      "MOCK_METHOD must be called with 3 or 4 arguments. _Ret, "             \
-      "_MethodName, _Args and optionally _Spec. _Args and _Spec must be "    \
-      "enclosed in parentheses. If _Ret is a type with unprotected commas, " \
-      "it must also be enclosed in parentheses.")
-
-#define GMOCK_INTERNAL_ASSERT_PARENTHESIS(_Tuple) \
-  static_assert(                                  \
-      GMOCK_PP_IS_ENCLOSED_PARENS(_Tuple),        \
-      GMOCK_PP_STRINGIZE(_Tuple) " should be enclosed in parentheses.")
-
-#define GMOCK_INTERNAL_ASSERT_VALID_SIGNATURE(_N, ...)                 \
-  static_assert(                                                       \
-      std::is_function<__VA_ARGS__>::value,                            \
-      "Signature must be a function type, maybe return type contains " \
-      "unprotected comma.");                                           \
-  static_assert(                                                       \
-      ::testing::tuple_size<typename ::testing::internal::Function<    \
-              __VA_ARGS__>::ArgumentTuple>::value == _N,               \
-      "This method does not take " GMOCK_PP_STRINGIZE(                 \
-          _N) " arguments. Parenthesize all types with unproctected commas.")
-
-#define GMOCK_INTERNAL_ASSERT_VALID_SPEC(_Spec) \
-  GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_ASSERT_VALID_SPEC_ELEMENT, ~, _Spec)
-
-#define GMOCK_INTERNAL_MOCK_METHOD_IMPL(_N, _MethodName, _Constness,           \
-                                        _Override, _Final, _Noexcept,          \
-                                        _CallType, _Signature)                 \
-  typename ::testing::internal::Function<GMOCK_PP_REMOVE_PARENS(               \
-      _Signature)>::Result                                                     \
-  GMOCK_INTERNAL_EXPAND(_CallType)                                             \
-      _MethodName(GMOCK_PP_REPEAT(GMOCK_INTERNAL_PARAMETER, _Signature, _N))   \
-          GMOCK_PP_IF(_Constness, const, ) GMOCK_PP_IF(_Noexcept, noexcept, )  \
-              GMOCK_PP_IF(_Override, override, )                               \
-                  GMOCK_PP_IF(_Final, final, ) {                               \
-    GMOCK_MOCKER_(_N, _Constness, _MethodName)                                 \
-        .SetOwnerAndName(this, #_MethodName);                                  \
-    return GMOCK_MOCKER_(_N, _Constness, _MethodName)                          \
-        .Invoke(GMOCK_PP_REPEAT(GMOCK_INTERNAL_FORWARD_ARG, _Signature, _N));  \
-  }                                                                            \
-  ::testing::MockSpec<GMOCK_PP_REMOVE_PARENS(_Signature)> gmock_##_MethodName( \
-      GMOCK_PP_REPEAT(GMOCK_INTERNAL_MATCHER_PARAMETER, _Signature, _N))       \
-      GMOCK_PP_IF(_Constness, const, ) {                                       \
-    GMOCK_MOCKER_(_N, _Constness, _MethodName).RegisterOwner(this);            \
-    return GMOCK_MOCKER_(_N, _Constness, _MethodName)                          \
-        .With(GMOCK_PP_REPEAT(GMOCK_INTERNAL_MATCHER_ARGUMENT, , _N));         \
-  }                                                                            \
-  ::testing::MockSpec<GMOCK_PP_REMOVE_PARENS(_Signature)> gmock_##_MethodName( \
-      const ::testing::internal::WithoutMatchers&,                             \
-      GMOCK_PP_IF(_Constness, const, )::testing::internal::Function<           \
-          GMOCK_PP_REMOVE_PARENS(_Signature)>*)                                \
-      const GMOCK_PP_IF(_Noexcept, noexcept, ) {                               \
-    return GMOCK_PP_CAT(::testing::internal::AdjustConstness_,                 \
-                        GMOCK_PP_IF(_Constness, const, ))(this)                \
-        ->gmock_##_MethodName(GMOCK_PP_REPEAT(                                 \
-            GMOCK_INTERNAL_A_MATCHER_ARGUMENT, _Signature, _N));               \
-  }                                                                            \
-  mutable ::testing::FunctionMocker<GMOCK_PP_REMOVE_PARENS(_Signature)>        \
-      GMOCK_MOCKER_(_N, _Constness, _MethodName)
-
-#define GMOCK_INTERNAL_EXPAND(...) __VA_ARGS__
-
-// Five Valid modifiers.
-#define GMOCK_INTERNAL_HAS_CONST(_Tuple) \
-  GMOCK_PP_HAS_COMMA(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_DETECT_CONST, ~, _Tuple))
-
-#define GMOCK_INTERNAL_HAS_OVERRIDE(_Tuple) \
-  GMOCK_PP_HAS_COMMA(                       \
-      GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_DETECT_OVERRIDE, ~, _Tuple))
-
-#define GMOCK_INTERNAL_HAS_FINAL(_Tuple) \
-  GMOCK_PP_HAS_COMMA(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_DETECT_FINAL, ~, _Tuple))
-
-#define GMOCK_INTERNAL_HAS_NOEXCEPT(_Tuple) \
-  GMOCK_PP_HAS_COMMA(                       \
-      GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_DETECT_NOEXCEPT, ~, _Tuple))
-
-#define GMOCK_INTERNAL_GET_CALLTYPE(_Tuple) \
-  GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_GET_CALLTYPE_IMPL, ~, _Tuple)
-
-#define GMOCK_INTERNAL_ASSERT_VALID_SPEC_ELEMENT(_i, _, _elem)            \
-  static_assert(                                                          \
-      (GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_CONST(_i, _, _elem)) +    \
-       GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_OVERRIDE(_i, _, _elem)) + \
-       GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_FINAL(_i, _, _elem)) +    \
-       GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_NOEXCEPT(_i, _, _elem)) + \
-       GMOCK_INTERNAL_IS_CALLTYPE(_elem)) == 1,                           \
-      GMOCK_PP_STRINGIZE(                                                 \
-          _elem) " cannot be recognized as a valid specification modifier.");
-
-// Modifiers implementation.
-#define GMOCK_INTERNAL_DETECT_CONST(_i, _, _elem) \
-  GMOCK_PP_CAT(GMOCK_INTERNAL_DETECT_CONST_I_, _elem)
-
-#define GMOCK_INTERNAL_DETECT_CONST_I_const ,
-
-#define GMOCK_INTERNAL_DETECT_OVERRIDE(_i, _, _elem) \
-  GMOCK_PP_CAT(GMOCK_INTERNAL_DETECT_OVERRIDE_I_, _elem)
-
-#define GMOCK_INTERNAL_DETECT_OVERRIDE_I_override ,
-
-#define GMOCK_INTERNAL_DETECT_FINAL(_i, _, _elem) \
-  GMOCK_PP_CAT(GMOCK_INTERNAL_DETECT_FINAL_I_, _elem)
-
-#define GMOCK_INTERNAL_DETECT_FINAL_I_final ,
-
-// TODO(iserna): Maybe noexcept should accept an argument here as well.
-#define GMOCK_INTERNAL_DETECT_NOEXCEPT(_i, _, _elem) \
-  GMOCK_PP_CAT(GMOCK_INTERNAL_DETECT_NOEXCEPT_I_, _elem)
-
-#define GMOCK_INTERNAL_DETECT_NOEXCEPT_I_noexcept ,
-
-#define GMOCK_INTERNAL_GET_CALLTYPE_IMPL(_i, _, _elem)           \
-  GMOCK_PP_IF(GMOCK_INTERNAL_IS_CALLTYPE(_elem),                 \
-              GMOCK_INTERNAL_GET_VALUE_CALLTYPE, GMOCK_PP_EMPTY) \
-  (_elem)
-
-// TODO(iserna): GMOCK_INTERNAL_IS_CALLTYPE and
-// GMOCK_INTERNAL_GET_VALUE_CALLTYPE needed more expansions to work on windows
-// maybe they can be simplified somehow.
-#define GMOCK_INTERNAL_IS_CALLTYPE(_arg) \
-  GMOCK_INTERNAL_IS_CALLTYPE_I(          \
-      GMOCK_PP_CAT(GMOCK_INTERNAL_IS_CALLTYPE_HELPER_, _arg))
-#define GMOCK_INTERNAL_IS_CALLTYPE_I(_arg) GMOCK_PP_IS_ENCLOSED_PARENS(_arg)
-
-#define GMOCK_INTERNAL_GET_VALUE_CALLTYPE(_arg) \
-  GMOCK_INTERNAL_GET_VALUE_CALLTYPE_I(          \
-      GMOCK_PP_CAT(GMOCK_INTERNAL_IS_CALLTYPE_HELPER_, _arg))
-#define GMOCK_INTERNAL_GET_VALUE_CALLTYPE_I(_arg) \
-  GMOCK_PP_CAT(GMOCK_PP_IDENTITY, _arg)
-
-#define GMOCK_INTERNAL_IS_CALLTYPE_HELPER_Calltype
-
-#define GMOCK_INTERNAL_SIGNATURE(_Ret, _Args)                         \
-  GMOCK_PP_IF(GMOCK_PP_IS_BEGIN_PARENS(_Ret), GMOCK_PP_REMOVE_PARENS, \
-              GMOCK_PP_IDENTITY)                                      \
-  (_Ret)(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_GET_TYPE, _, _Args))
-
-#define GMOCK_INTERNAL_GET_TYPE(_i, _, _elem)                          \
-  GMOCK_PP_COMMA_IF(_i)                                                \
-  GMOCK_PP_IF(GMOCK_PP_IS_BEGIN_PARENS(_elem), GMOCK_PP_REMOVE_PARENS, \
-              GMOCK_PP_IDENTITY)                                       \
-  (_elem)
-
-#define GMOCK_INTERNAL_PARAMETER(_i, _Signature, _)        \
-  GMOCK_PP_COMMA_IF(_i)                                    \
-  GMOCK_INTERNAL_ARG_O(typename, GMOCK_PP_INC(_i),         \
-                       GMOCK_PP_REMOVE_PARENS(_Signature)) \
-  gmock_a##_i
-
-#define GMOCK_INTERNAL_FORWARD_ARG(_i, _Signature, _)                       \
-  GMOCK_PP_COMMA_IF(_i)                                                     \
-  ::std::forward<GMOCK_INTERNAL_ARG_O(typename, GMOCK_PP_INC(_i),           \
-                                      GMOCK_PP_REMOVE_PARENS(_Signature))>( \
-      gmock_a##_i)
-
-#define GMOCK_INTERNAL_MATCHER_PARAMETER(_i, _Signature, _)    \
-  GMOCK_PP_COMMA_IF(_i)                                        \
-  GMOCK_INTERNAL_MATCHER_O(typename, GMOCK_PP_INC(_i),         \
-                           GMOCK_PP_REMOVE_PARENS(_Signature)) \
-  gmock_a##_i
-
-#define GMOCK_INTERNAL_MATCHER_ARGUMENT(_i, _1, _2) \
-  GMOCK_PP_COMMA_IF(_i)                             \
-  gmock_a##_i
-
-#define GMOCK_INTERNAL_A_MATCHER_ARGUMENT(_i, _Signature, _)    \
-  GMOCK_PP_COMMA_IF(_i)                                         \
-  ::testing::A<GMOCK_INTERNAL_ARG_O(typename, GMOCK_PP_INC(_i), \
-                                    GMOCK_PP_REMOVE_PARENS(_Signature))>()
-
-#define GMOCK_INTERNAL_ARG_O(_tn, _i, ...) GMOCK_ARG_(_tn, _i, __VA_ARGS__)
-
-#define GMOCK_INTERNAL_MATCHER_O(_tn, _i, ...) \
-  GMOCK_MATCHER_(_tn, _i, __VA_ARGS__)
-
-#endif  // THIRD_PARTY_GOOGLETEST_GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_FUNCTION_MOCKER_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-generated-actions.h b/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-generated-actions.h
deleted file mode 100644
index c538dce8d27..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-generated-actions.h
+++ /dev/null
@@ -1,1888 +0,0 @@
-// This file was GENERATED by command:
-//     pump.py gmock-generated-actions.h.pump
-// DO NOT EDIT BY HAND!!!
-
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file implements some commonly used variadic actions.
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-// IWYU pragma: private, include "gmock/gmock.h"
-
-#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_
-#define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_
-
-#include <memory>
-#include <utility>
-
-#include "gmock/gmock-actions.h"
-#include "gmock/internal/gmock-port.h"
-
-namespace testing {
-namespace internal {
-
-// A macro from the ACTION* family (defined later in this file)
-// defines an action that can be used in a mock function.  Typically,
-// these actions only care about a subset of the arguments of the mock
-// function.  For example, if such an action only uses the second
-// argument, it can be used in any mock function that takes >= 2
-// arguments where the type of the second argument is compatible.
-//
-// Therefore, the action implementation must be prepared to take more
-// arguments than it needs.  The ExcessiveArg type is used to
-// represent those excessive arguments.  In order to keep the compiler
-// error messages tractable, we define it in the testing namespace
-// instead of testing::internal.  However, this is an INTERNAL TYPE
-// and subject to change without notice, so a user MUST NOT USE THIS
-// TYPE DIRECTLY.
-struct ExcessiveArg {};
-
-// A helper class needed for implementing the ACTION* macros.
-template <typename Result, class Impl>
-class ActionHelper {
- public:
-  static Result Perform(Impl* impl, const ::std::tuple<>& args) {
-    return impl->template gmock_PerformImpl<>(args, ExcessiveArg(),
-        ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(),
-        ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(),
-        ExcessiveArg());
-  }
-
-  template <typename A0>
-  static Result Perform(Impl* impl, const ::std::tuple<A0>& args) {
-    return impl->template gmock_PerformImpl<A0>(args, std::get<0>(args),
-        ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(),
-        ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(),
-        ExcessiveArg());
-  }
-
-  template <typename A0, typename A1>
-  static Result Perform(Impl* impl, const ::std::tuple<A0, A1>& args) {
-    return impl->template gmock_PerformImpl<A0, A1>(args, std::get<0>(args),
-        std::get<1>(args), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(),
-        ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(),
-        ExcessiveArg());
-  }
-
-  template <typename A0, typename A1, typename A2>
-  static Result Perform(Impl* impl, const ::std::tuple<A0, A1, A2>& args) {
-    return impl->template gmock_PerformImpl<A0, A1, A2>(args,
-        std::get<0>(args), std::get<1>(args), std::get<2>(args),
-        ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(),
-        ExcessiveArg(), ExcessiveArg(), ExcessiveArg());
-  }
-
-  template <typename A0, typename A1, typename A2, typename A3>
-  static Result Perform(Impl* impl, const ::std::tuple<A0, A1, A2, A3>& args) {
-    return impl->template gmock_PerformImpl<A0, A1, A2, A3>(args,
-        std::get<0>(args), std::get<1>(args), std::get<2>(args),
-        std::get<3>(args), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(),
-        ExcessiveArg(), ExcessiveArg(), ExcessiveArg());
-  }
-
-  template <typename A0, typename A1, typename A2, typename A3, typename A4>
-  static Result Perform(Impl* impl, const ::std::tuple<A0, A1, A2, A3,
-      A4>& args) {
-    return impl->template gmock_PerformImpl<A0, A1, A2, A3, A4>(args,
-        std::get<0>(args), std::get<1>(args), std::get<2>(args),
-        std::get<3>(args), std::get<4>(args), ExcessiveArg(), ExcessiveArg(),
-        ExcessiveArg(), ExcessiveArg(), ExcessiveArg());
-  }
-
-  template <typename A0, typename A1, typename A2, typename A3, typename A4,
-      typename A5>
-  static Result Perform(Impl* impl, const ::std::tuple<A0, A1, A2, A3, A4,
-      A5>& args) {
-    return impl->template gmock_PerformImpl<A0, A1, A2, A3, A4, A5>(args,
-        std::get<0>(args), std::get<1>(args), std::get<2>(args),
-        std::get<3>(args), std::get<4>(args), std::get<5>(args),
-        ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), ExcessiveArg());
-  }
-
-  template <typename A0, typename A1, typename A2, typename A3, typename A4,
-      typename A5, typename A6>
-  static Result Perform(Impl* impl, const ::std::tuple<A0, A1, A2, A3, A4, A5,
-      A6>& args) {
-    return impl->template gmock_PerformImpl<A0, A1, A2, A3, A4, A5, A6>(args,
-        std::get<0>(args), std::get<1>(args), std::get<2>(args),
-        std::get<3>(args), std::get<4>(args), std::get<5>(args),
-        std::get<6>(args), ExcessiveArg(), ExcessiveArg(), ExcessiveArg());
-  }
-
-  template <typename A0, typename A1, typename A2, typename A3, typename A4,
-      typename A5, typename A6, typename A7>
-  static Result Perform(Impl* impl, const ::std::tuple<A0, A1, A2, A3, A4, A5,
-      A6, A7>& args) {
-    return impl->template gmock_PerformImpl<A0, A1, A2, A3, A4, A5, A6,
-        A7>(args, std::get<0>(args), std::get<1>(args), std::get<2>(args),
-        std::get<3>(args), std::get<4>(args), std::get<5>(args),
-        std::get<6>(args), std::get<7>(args), ExcessiveArg(), ExcessiveArg());
-  }
-
-  template <typename A0, typename A1, typename A2, typename A3, typename A4,
-      typename A5, typename A6, typename A7, typename A8>
-  static Result Perform(Impl* impl, const ::std::tuple<A0, A1, A2, A3, A4, A5,
-      A6, A7, A8>& args) {
-    return impl->template gmock_PerformImpl<A0, A1, A2, A3, A4, A5, A6, A7,
-        A8>(args, std::get<0>(args), std::get<1>(args), std::get<2>(args),
-        std::get<3>(args), std::get<4>(args), std::get<5>(args),
-        std::get<6>(args), std::get<7>(args), std::get<8>(args),
-        ExcessiveArg());
-  }
-
-  template <typename A0, typename A1, typename A2, typename A3, typename A4,
-      typename A5, typename A6, typename A7, typename A8, typename A9>
-  static Result Perform(Impl* impl, const ::std::tuple<A0, A1, A2, A3, A4, A5,
-      A6, A7, A8, A9>& args) {
-    return impl->template gmock_PerformImpl<A0, A1, A2, A3, A4, A5, A6, A7, A8,
-        A9>(args, std::get<0>(args), std::get<1>(args), std::get<2>(args),
-        std::get<3>(args), std::get<4>(args), std::get<5>(args),
-        std::get<6>(args), std::get<7>(args), std::get<8>(args),
-        std::get<9>(args));
-  }
-};
-
-}  // namespace internal
-}  // namespace testing
-
-// The ACTION* family of macros can be used in a namespace scope to
-// define custom actions easily.  The syntax:
-//
-//   ACTION(name) { statements; }
-//
-// will define an action with the given name that executes the
-// statements.  The value returned by the statements will be used as
-// the return value of the action.  Inside the statements, you can
-// refer to the K-th (0-based) argument of the mock function by
-// 'argK', and refer to its type by 'argK_type'.  For example:
-//
-//   ACTION(IncrementArg1) {
-//     arg1_type temp = arg1;
-//     return ++(*temp);
-//   }
-//
-// allows you to write
-//
-//   ...WillOnce(IncrementArg1());
-//
-// You can also refer to the entire argument tuple and its type by
-// 'args' and 'args_type', and refer to the mock function type and its
-// return type by 'function_type' and 'return_type'.
-//
-// Note that you don't need to specify the types of the mock function
-// arguments.  However rest assured that your code is still type-safe:
-// you'll get a compiler error if *arg1 doesn't support the ++
-// operator, or if the type of ++(*arg1) isn't compatible with the
-// mock function's return type, for example.
-//
-// Sometimes you'll want to parameterize the action.   For that you can use
-// another macro:
-//
-//   ACTION_P(name, param_name) { statements; }
-//
-// For example:
-//
-//   ACTION_P(Add, n) { return arg0 + n; }
-//
-// will allow you to write:
-//
-//   ...WillOnce(Add(5));
-//
-// Note that you don't need to provide the type of the parameter
-// either.  If you need to reference the type of a parameter named
-// 'foo', you can write 'foo_type'.  For example, in the body of
-// ACTION_P(Add, n) above, you can write 'n_type' to refer to the type
-// of 'n'.
-//
-// We also provide ACTION_P2, ACTION_P3, ..., up to ACTION_P10 to support
-// multi-parameter actions.
-//
-// For the purpose of typing, you can view
-//
-//   ACTION_Pk(Foo, p1, ..., pk) { ... }
-//
-// as shorthand for
-//
-//   template <typename p1_type, ..., typename pk_type>
-//   FooActionPk<p1_type, ..., pk_type> Foo(p1_type p1, ..., pk_type pk) { ... }
-//
-// In particular, you can provide the template type arguments
-// explicitly when invoking Foo(), as in Foo<long, bool>(5, false);
-// although usually you can rely on the compiler to infer the types
-// for you automatically.  You can assign the result of expression
-// Foo(p1, ..., pk) to a variable of type FooActionPk<p1_type, ...,
-// pk_type>.  This can be useful when composing actions.
-//
-// You can also overload actions with different numbers of parameters:
-//
-//   ACTION_P(Plus, a) { ... }
-//   ACTION_P2(Plus, a, b) { ... }
-//
-// While it's tempting to always use the ACTION* macros when defining
-// a new action, you should also consider implementing ActionInterface
-// or using MakePolymorphicAction() instead, especially if you need to
-// use the action a lot.  While these approaches require more work,
-// they give you more control on the types of the mock function
-// arguments and the action parameters, which in general leads to
-// better compiler error messages that pay off in the long run.  They
-// also allow overloading actions based on parameter types (as opposed
-// to just based on the number of parameters).
-//
-// CAVEAT:
-//
-// ACTION*() can only be used in a namespace scope as templates cannot be
-// declared inside of a local class.
-// Users can, however, define any local functors (e.g. a lambda) that
-// can be used as actions.
-//
-// MORE INFORMATION:
-//
-// To learn more about using these macros, please search for 'ACTION' on
-// https://github.com/google/googletest/blob/master/googlemock/docs/cook_book.md
-
-// An internal macro needed for implementing ACTION*().
-#define GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_\
-    const args_type& args GTEST_ATTRIBUTE_UNUSED_, \
-    const arg0_type& arg0 GTEST_ATTRIBUTE_UNUSED_, \
-    const arg1_type& arg1 GTEST_ATTRIBUTE_UNUSED_, \
-    const arg2_type& arg2 GTEST_ATTRIBUTE_UNUSED_, \
-    const arg3_type& arg3 GTEST_ATTRIBUTE_UNUSED_, \
-    const arg4_type& arg4 GTEST_ATTRIBUTE_UNUSED_, \
-    const arg5_type& arg5 GTEST_ATTRIBUTE_UNUSED_, \
-    const arg6_type& arg6 GTEST_ATTRIBUTE_UNUSED_, \
-    const arg7_type& arg7 GTEST_ATTRIBUTE_UNUSED_, \
-    const arg8_type& arg8 GTEST_ATTRIBUTE_UNUSED_, \
-    const arg9_type& arg9 GTEST_ATTRIBUTE_UNUSED_
-
-// Sometimes you want to give an action explicit template parameters
-// that cannot be inferred from its value parameters.  ACTION() and
-// ACTION_P*() don't support that.  ACTION_TEMPLATE() remedies that
-// and can be viewed as an extension to ACTION() and ACTION_P*().
-//
-// The syntax:
-//
-//   ACTION_TEMPLATE(ActionName,
-//                   HAS_m_TEMPLATE_PARAMS(kind1, name1, ..., kind_m, name_m),
-//                   AND_n_VALUE_PARAMS(p1, ..., p_n)) { statements; }
-//
-// defines an action template that takes m explicit template
-// parameters and n value parameters.  name_i is the name of the i-th
-// template parameter, and kind_i specifies whether it's a typename,
-// an integral constant, or a template.  p_i is the name of the i-th
-// value parameter.
-//
-// Example:
-//
-//   // DuplicateArg<k, T>(output) converts the k-th argument of the mock
-//   // function to type T and copies it to *output.
-//   ACTION_TEMPLATE(DuplicateArg,
-//                   HAS_2_TEMPLATE_PARAMS(int, k, typename, T),
-//                   AND_1_VALUE_PARAMS(output)) {
-//     *output = T(::std::get<k>(args));
-//   }
-//   ...
-//     int n;
-//     EXPECT_CALL(mock, Foo(_, _))
-//         .WillOnce(DuplicateArg<1, unsigned char>(&n));
-//
-// To create an instance of an action template, write:
-//
-//   ActionName<t1, ..., t_m>(v1, ..., v_n)
-//
-// where the ts are the template arguments and the vs are the value
-// arguments.  The value argument types are inferred by the compiler.
-// If you want to explicitly specify the value argument types, you can
-// provide additional template arguments:
-//
-//   ActionName<t1, ..., t_m, u1, ..., u_k>(v1, ..., v_n)
-//
-// where u_i is the desired type of v_i.
-//
-// ACTION_TEMPLATE and ACTION/ACTION_P* can be overloaded on the
-// number of value parameters, but not on the number of template
-// parameters.  Without the restriction, the meaning of the following
-// is unclear:
-//
-//   OverloadedAction<int, bool>(x);
-//
-// Are we using a single-template-parameter action where 'bool' refers
-// to the type of x, or are we using a two-template-parameter action
-// where the compiler is asked to infer the type of x?
-//
-// Implementation notes:
-//
-// GMOCK_INTERNAL_*_HAS_m_TEMPLATE_PARAMS and
-// GMOCK_INTERNAL_*_AND_n_VALUE_PARAMS are internal macros for
-// implementing ACTION_TEMPLATE.  The main trick we use is to create
-// new macro invocations when expanding a macro.  For example, we have
-//
-//   #define ACTION_TEMPLATE(name, template_params, value_params)
-//       ... GMOCK_INTERNAL_DECL_##template_params ...
-//
-// which causes ACTION_TEMPLATE(..., HAS_1_TEMPLATE_PARAMS(typename, T), ...)
-// to expand to
-//
-//       ... GMOCK_INTERNAL_DECL_HAS_1_TEMPLATE_PARAMS(typename, T) ...
-//
-// Since GMOCK_INTERNAL_DECL_HAS_1_TEMPLATE_PARAMS is a macro, the
-// preprocessor will continue to expand it to
-//
-//       ... typename T ...
-//
-// This technique conforms to the C++ standard and is portable.  It
-// allows us to implement action templates using O(N) code, where N is
-// the maximum number of template/value parameters supported.  Without
-// using it, we'd have to devote O(N^2) amount of code to implement all
-// combinations of m and n.
-
-// Declares the template parameters.
-#define GMOCK_INTERNAL_DECL_HAS_1_TEMPLATE_PARAMS(kind0, name0) kind0 name0
-#define GMOCK_INTERNAL_DECL_HAS_2_TEMPLATE_PARAMS(kind0, name0, kind1, \
-    name1) kind0 name0, kind1 name1
-#define GMOCK_INTERNAL_DECL_HAS_3_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2) kind0 name0, kind1 name1, kind2 name2
-#define GMOCK_INTERNAL_DECL_HAS_4_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3) kind0 name0, kind1 name1, kind2 name2, \
-    kind3 name3
-#define GMOCK_INTERNAL_DECL_HAS_5_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4) kind0 name0, kind1 name1, \
-    kind2 name2, kind3 name3, kind4 name4
-#define GMOCK_INTERNAL_DECL_HAS_6_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4, kind5, name5) kind0 name0, \
-    kind1 name1, kind2 name2, kind3 name3, kind4 name4, kind5 name5
-#define GMOCK_INTERNAL_DECL_HAS_7_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, \
-    name6) kind0 name0, kind1 name1, kind2 name2, kind3 name3, kind4 name4, \
-    kind5 name5, kind6 name6
-#define GMOCK_INTERNAL_DECL_HAS_8_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, name6, \
-    kind7, name7) kind0 name0, kind1 name1, kind2 name2, kind3 name3, \
-    kind4 name4, kind5 name5, kind6 name6, kind7 name7
-#define GMOCK_INTERNAL_DECL_HAS_9_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, name6, \
-    kind7, name7, kind8, name8) kind0 name0, kind1 name1, kind2 name2, \
-    kind3 name3, kind4 name4, kind5 name5, kind6 name6, kind7 name7, \
-    kind8 name8
-#define GMOCK_INTERNAL_DECL_HAS_10_TEMPLATE_PARAMS(kind0, name0, kind1, \
-    name1, kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, \
-    name6, kind7, name7, kind8, name8, kind9, name9) kind0 name0, \
-    kind1 name1, kind2 name2, kind3 name3, kind4 name4, kind5 name5, \
-    kind6 name6, kind7 name7, kind8 name8, kind9 name9
-
-// Lists the template parameters.
-#define GMOCK_INTERNAL_LIST_HAS_1_TEMPLATE_PARAMS(kind0, name0) name0
-#define GMOCK_INTERNAL_LIST_HAS_2_TEMPLATE_PARAMS(kind0, name0, kind1, \
-    name1) name0, name1
-#define GMOCK_INTERNAL_LIST_HAS_3_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2) name0, name1, name2
-#define GMOCK_INTERNAL_LIST_HAS_4_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3) name0, name1, name2, name3
-#define GMOCK_INTERNAL_LIST_HAS_5_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4) name0, name1, name2, name3, \
-    name4
-#define GMOCK_INTERNAL_LIST_HAS_6_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4, kind5, name5) name0, name1, \
-    name2, name3, name4, name5
-#define GMOCK_INTERNAL_LIST_HAS_7_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, \
-    name6) name0, name1, name2, name3, name4, name5, name6
-#define GMOCK_INTERNAL_LIST_HAS_8_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, name6, \
-    kind7, name7) name0, name1, name2, name3, name4, name5, name6, name7
-#define GMOCK_INTERNAL_LIST_HAS_9_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, name6, \
-    kind7, name7, kind8, name8) name0, name1, name2, name3, name4, name5, \
-    name6, name7, name8
-#define GMOCK_INTERNAL_LIST_HAS_10_TEMPLATE_PARAMS(kind0, name0, kind1, \
-    name1, kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, \
-    name6, kind7, name7, kind8, name8, kind9, name9) name0, name1, name2, \
-    name3, name4, name5, name6, name7, name8, name9
-
-// Declares the types of value parameters.
-#define GMOCK_INTERNAL_DECL_TYPE_AND_0_VALUE_PARAMS()
-#define GMOCK_INTERNAL_DECL_TYPE_AND_1_VALUE_PARAMS(p0) , typename p0##_type
-#define GMOCK_INTERNAL_DECL_TYPE_AND_2_VALUE_PARAMS(p0, p1) , \
-    typename p0##_type, typename p1##_type
-#define GMOCK_INTERNAL_DECL_TYPE_AND_3_VALUE_PARAMS(p0, p1, p2) , \
-    typename p0##_type, typename p1##_type, typename p2##_type
-#define GMOCK_INTERNAL_DECL_TYPE_AND_4_VALUE_PARAMS(p0, p1, p2, p3) , \
-    typename p0##_type, typename p1##_type, typename p2##_type, \
-    typename p3##_type
-#define GMOCK_INTERNAL_DECL_TYPE_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) , \
-    typename p0##_type, typename p1##_type, typename p2##_type, \
-    typename p3##_type, typename p4##_type
-#define GMOCK_INTERNAL_DECL_TYPE_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) , \
-    typename p0##_type, typename p1##_type, typename p2##_type, \
-    typename p3##_type, typename p4##_type, typename p5##_type
-#define GMOCK_INTERNAL_DECL_TYPE_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6) , typename p0##_type, typename p1##_type, typename p2##_type, \
-    typename p3##_type, typename p4##_type, typename p5##_type, \
-    typename p6##_type
-#define GMOCK_INTERNAL_DECL_TYPE_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6, p7) , typename p0##_type, typename p1##_type, typename p2##_type, \
-    typename p3##_type, typename p4##_type, typename p5##_type, \
-    typename p6##_type, typename p7##_type
-#define GMOCK_INTERNAL_DECL_TYPE_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6, p7, p8) , typename p0##_type, typename p1##_type, typename p2##_type, \
-    typename p3##_type, typename p4##_type, typename p5##_type, \
-    typename p6##_type, typename p7##_type, typename p8##_type
-#define GMOCK_INTERNAL_DECL_TYPE_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6, p7, p8, p9) , typename p0##_type, typename p1##_type, \
-    typename p2##_type, typename p3##_type, typename p4##_type, \
-    typename p5##_type, typename p6##_type, typename p7##_type, \
-    typename p8##_type, typename p9##_type
-
-// Initializes the value parameters.
-#define GMOCK_INTERNAL_INIT_AND_0_VALUE_PARAMS()\
-    ()
-#define GMOCK_INTERNAL_INIT_AND_1_VALUE_PARAMS(p0)\
-    (p0##_type gmock_p0) : p0(::std::move(gmock_p0))
-#define GMOCK_INTERNAL_INIT_AND_2_VALUE_PARAMS(p0, p1)\
-    (p0##_type gmock_p0, p1##_type gmock_p1) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1))
-#define GMOCK_INTERNAL_INIT_AND_3_VALUE_PARAMS(p0, p1, p2)\
-    (p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2))
-#define GMOCK_INTERNAL_INIT_AND_4_VALUE_PARAMS(p0, p1, p2, p3)\
-    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-        p3##_type gmock_p3) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3))
-#define GMOCK_INTERNAL_INIT_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4)\
-    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-        p3##_type gmock_p3, p4##_type gmock_p4) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4))
-#define GMOCK_INTERNAL_INIT_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5)\
-    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-        p3##_type gmock_p3, p4##_type gmock_p4, \
-        p5##_type gmock_p5) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \
-        p5(::std::move(gmock_p5))
-#define GMOCK_INTERNAL_INIT_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6)\
-    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-        p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
-        p6##_type gmock_p6) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \
-        p5(::std::move(gmock_p5)), p6(::std::move(gmock_p6))
-#define GMOCK_INTERNAL_INIT_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7)\
-    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-        p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
-        p6##_type gmock_p6, p7##_type gmock_p7) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \
-        p5(::std::move(gmock_p5)), p6(::std::move(gmock_p6)), \
-        p7(::std::move(gmock_p7))
-#define GMOCK_INTERNAL_INIT_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8)\
-    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-        p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
-        p6##_type gmock_p6, p7##_type gmock_p7, \
-        p8##_type gmock_p8) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \
-        p5(::std::move(gmock_p5)), p6(::std::move(gmock_p6)), \
-        p7(::std::move(gmock_p7)), p8(::std::move(gmock_p8))
-#define GMOCK_INTERNAL_INIT_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8, p9)\
-    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-        p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
-        p6##_type gmock_p6, p7##_type gmock_p7, p8##_type gmock_p8, \
-        p9##_type gmock_p9) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \
-        p5(::std::move(gmock_p5)), p6(::std::move(gmock_p6)), \
-        p7(::std::move(gmock_p7)), p8(::std::move(gmock_p8)), \
-        p9(::std::move(gmock_p9))
-
-// Declares the fields for storing the value parameters.
-#define GMOCK_INTERNAL_DEFN_AND_0_VALUE_PARAMS()
-#define GMOCK_INTERNAL_DEFN_AND_1_VALUE_PARAMS(p0) p0##_type p0;
-#define GMOCK_INTERNAL_DEFN_AND_2_VALUE_PARAMS(p0, p1) p0##_type p0; \
-    p1##_type p1;
-#define GMOCK_INTERNAL_DEFN_AND_3_VALUE_PARAMS(p0, p1, p2) p0##_type p0; \
-    p1##_type p1; p2##_type p2;
-#define GMOCK_INTERNAL_DEFN_AND_4_VALUE_PARAMS(p0, p1, p2, p3) p0##_type p0; \
-    p1##_type p1; p2##_type p2; p3##_type p3;
-#define GMOCK_INTERNAL_DEFN_AND_5_VALUE_PARAMS(p0, p1, p2, p3, \
-    p4) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; p4##_type p4;
-#define GMOCK_INTERNAL_DEFN_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, \
-    p5) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; p4##_type p4; \
-    p5##_type p5;
-#define GMOCK_INTERNAL_DEFN_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; p4##_type p4; \
-    p5##_type p5; p6##_type p6;
-#define GMOCK_INTERNAL_DEFN_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; p4##_type p4; \
-    p5##_type p5; p6##_type p6; p7##_type p7;
-#define GMOCK_INTERNAL_DEFN_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; \
-    p4##_type p4; p5##_type p5; p6##_type p6; p7##_type p7; p8##_type p8;
-#define GMOCK_INTERNAL_DEFN_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8, p9) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; \
-    p4##_type p4; p5##_type p5; p6##_type p6; p7##_type p7; p8##_type p8; \
-    p9##_type p9;
-
-// Lists the value parameters.
-#define GMOCK_INTERNAL_LIST_AND_0_VALUE_PARAMS()
-#define GMOCK_INTERNAL_LIST_AND_1_VALUE_PARAMS(p0) p0
-#define GMOCK_INTERNAL_LIST_AND_2_VALUE_PARAMS(p0, p1) p0, p1
-#define GMOCK_INTERNAL_LIST_AND_3_VALUE_PARAMS(p0, p1, p2) p0, p1, p2
-#define GMOCK_INTERNAL_LIST_AND_4_VALUE_PARAMS(p0, p1, p2, p3) p0, p1, p2, p3
-#define GMOCK_INTERNAL_LIST_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) p0, p1, \
-    p2, p3, p4
-#define GMOCK_INTERNAL_LIST_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) p0, \
-    p1, p2, p3, p4, p5
-#define GMOCK_INTERNAL_LIST_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6) p0, p1, p2, p3, p4, p5, p6
-#define GMOCK_INTERNAL_LIST_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7) p0, p1, p2, p3, p4, p5, p6, p7
-#define GMOCK_INTERNAL_LIST_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8) p0, p1, p2, p3, p4, p5, p6, p7, p8
-#define GMOCK_INTERNAL_LIST_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8, p9) p0, p1, p2, p3, p4, p5, p6, p7, p8, p9
-
-// Lists the value parameter types.
-#define GMOCK_INTERNAL_LIST_TYPE_AND_0_VALUE_PARAMS()
-#define GMOCK_INTERNAL_LIST_TYPE_AND_1_VALUE_PARAMS(p0) , p0##_type
-#define GMOCK_INTERNAL_LIST_TYPE_AND_2_VALUE_PARAMS(p0, p1) , p0##_type, \
-    p1##_type
-#define GMOCK_INTERNAL_LIST_TYPE_AND_3_VALUE_PARAMS(p0, p1, p2) , p0##_type, \
-    p1##_type, p2##_type
-#define GMOCK_INTERNAL_LIST_TYPE_AND_4_VALUE_PARAMS(p0, p1, p2, p3) , \
-    p0##_type, p1##_type, p2##_type, p3##_type
-#define GMOCK_INTERNAL_LIST_TYPE_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) , \
-    p0##_type, p1##_type, p2##_type, p3##_type, p4##_type
-#define GMOCK_INTERNAL_LIST_TYPE_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) , \
-    p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, p5##_type
-#define GMOCK_INTERNAL_LIST_TYPE_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6) , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, p5##_type, \
-    p6##_type
-#define GMOCK_INTERNAL_LIST_TYPE_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6, p7) , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
-    p5##_type, p6##_type, p7##_type
-#define GMOCK_INTERNAL_LIST_TYPE_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6, p7, p8) , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
-    p5##_type, p6##_type, p7##_type, p8##_type
-#define GMOCK_INTERNAL_LIST_TYPE_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6, p7, p8, p9) , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
-    p5##_type, p6##_type, p7##_type, p8##_type, p9##_type
-
-// Declares the value parameters.
-#define GMOCK_INTERNAL_DECL_AND_0_VALUE_PARAMS()
-#define GMOCK_INTERNAL_DECL_AND_1_VALUE_PARAMS(p0) p0##_type p0
-#define GMOCK_INTERNAL_DECL_AND_2_VALUE_PARAMS(p0, p1) p0##_type p0, \
-    p1##_type p1
-#define GMOCK_INTERNAL_DECL_AND_3_VALUE_PARAMS(p0, p1, p2) p0##_type p0, \
-    p1##_type p1, p2##_type p2
-#define GMOCK_INTERNAL_DECL_AND_4_VALUE_PARAMS(p0, p1, p2, p3) p0##_type p0, \
-    p1##_type p1, p2##_type p2, p3##_type p3
-#define GMOCK_INTERNAL_DECL_AND_5_VALUE_PARAMS(p0, p1, p2, p3, \
-    p4) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4
-#define GMOCK_INTERNAL_DECL_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, \
-    p5) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4, \
-    p5##_type p5
-#define GMOCK_INTERNAL_DECL_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4, \
-    p5##_type p5, p6##_type p6
-#define GMOCK_INTERNAL_DECL_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4, \
-    p5##_type p5, p6##_type p6, p7##_type p7
-#define GMOCK_INTERNAL_DECL_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \
-    p4##_type p4, p5##_type p5, p6##_type p6, p7##_type p7, p8##_type p8
-#define GMOCK_INTERNAL_DECL_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8, p9) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \
-    p4##_type p4, p5##_type p5, p6##_type p6, p7##_type p7, p8##_type p8, \
-    p9##_type p9
-
-// The suffix of the class template implementing the action template.
-#define GMOCK_INTERNAL_COUNT_AND_0_VALUE_PARAMS()
-#define GMOCK_INTERNAL_COUNT_AND_1_VALUE_PARAMS(p0) P
-#define GMOCK_INTERNAL_COUNT_AND_2_VALUE_PARAMS(p0, p1) P2
-#define GMOCK_INTERNAL_COUNT_AND_3_VALUE_PARAMS(p0, p1, p2) P3
-#define GMOCK_INTERNAL_COUNT_AND_4_VALUE_PARAMS(p0, p1, p2, p3) P4
-#define GMOCK_INTERNAL_COUNT_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) P5
-#define GMOCK_INTERNAL_COUNT_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) P6
-#define GMOCK_INTERNAL_COUNT_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6) P7
-#define GMOCK_INTERNAL_COUNT_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7) P8
-#define GMOCK_INTERNAL_COUNT_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8) P9
-#define GMOCK_INTERNAL_COUNT_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8, p9) P10
-
-// The name of the class template implementing the action template.
-#define GMOCK_ACTION_CLASS_(name, value_params)\
-    GTEST_CONCAT_TOKEN_(name##Action, GMOCK_INTERNAL_COUNT_##value_params)
-
-#define ACTION_TEMPLATE(name, template_params, value_params)\
-  template <GMOCK_INTERNAL_DECL_##template_params\
-            GMOCK_INTERNAL_DECL_TYPE_##value_params>\
-  class GMOCK_ACTION_CLASS_(name, value_params) {\
-   public:\
-    explicit GMOCK_ACTION_CLASS_(name, value_params)\
-        GMOCK_INTERNAL_INIT_##value_params {}\
-    GMOCK_ACTION_CLASS_(name, value_params)(\
-        const GMOCK_ACTION_CLASS_(name, value_params)&) noexcept = default;\
-    GMOCK_ACTION_CLASS_(name, value_params)(\
-        GMOCK_ACTION_CLASS_(name, value_params)&&) noexcept = default;\
-    template <typename F>\
-    class gmock_Impl : public ::testing::ActionInterface<F> {\
-     public:\
-      typedef F function_type;\
-      typedef typename ::testing::internal::Function<F>::Result return_type;\
-      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
-          args_type;\
-      explicit gmock_Impl GMOCK_INTERNAL_INIT_##value_params {}\
-      virtual return_type Perform(const args_type& args) {\
-        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
-            Perform(this, args);\
-      }\
-      template <typename arg0_type, typename arg1_type, typename arg2_type, \
-          typename arg3_type, typename arg4_type, typename arg5_type, \
-          typename arg6_type, typename arg7_type, typename arg8_type, \
-          typename arg9_type>\
-      return_type gmock_PerformImpl(const args_type& args, \
-          const arg0_type& arg0, const arg1_type& arg1, \
-          const arg2_type& arg2, const arg3_type& arg3, \
-          const arg4_type& arg4, const arg5_type& arg5, \
-          const arg6_type& arg6, const arg7_type& arg7, \
-          const arg8_type& arg8, const arg9_type& arg9) const;\
-      GMOCK_INTERNAL_DEFN_##value_params\
-     private:\
-      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
-    };\
-    template <typename F> operator ::testing::Action<F>() const {\
-      return ::testing::Action<F>(\
-          new gmock_Impl<F>(GMOCK_INTERNAL_LIST_##value_params));\
-    }\
-    GMOCK_INTERNAL_DEFN_##value_params\
-  };\
-  template <GMOCK_INTERNAL_DECL_##template_params\
-            GMOCK_INTERNAL_DECL_TYPE_##value_params>\
-  inline GMOCK_ACTION_CLASS_(name, value_params)<\
-      GMOCK_INTERNAL_LIST_##template_params\
-      GMOCK_INTERNAL_LIST_TYPE_##value_params> name(\
-          GMOCK_INTERNAL_DECL_##value_params) {\
-    return GMOCK_ACTION_CLASS_(name, value_params)<\
-        GMOCK_INTERNAL_LIST_##template_params\
-        GMOCK_INTERNAL_LIST_TYPE_##value_params>(\
-            GMOCK_INTERNAL_LIST_##value_params);\
-  }\
-  template <GMOCK_INTERNAL_DECL_##template_params\
-            GMOCK_INTERNAL_DECL_TYPE_##value_params>\
-  template <typename F>\
-  template <typename arg0_type, typename arg1_type, typename arg2_type, \
-      typename arg3_type, typename arg4_type, typename arg5_type, \
-      typename arg6_type, typename arg7_type, typename arg8_type, \
-      typename arg9_type>\
-  typename ::testing::internal::Function<F>::Result\
-      GMOCK_ACTION_CLASS_(name, value_params)<\
-          GMOCK_INTERNAL_LIST_##template_params\
-          GMOCK_INTERNAL_LIST_TYPE_##value_params>::gmock_Impl<F>::\
-              gmock_PerformImpl(\
-          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
-
-#define ACTION(name)\
-  class name##Action {\
-   public:\
-    name##Action() {}\
-    template <typename F>\
-    class gmock_Impl : public ::testing::ActionInterface<F> {\
-     public:\
-      typedef F function_type;\
-      typedef typename ::testing::internal::Function<F>::Result return_type;\
-      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
-          args_type;\
-      gmock_Impl() {}\
-      virtual return_type Perform(const args_type& args) {\
-        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
-            Perform(this, args);\
-      }\
-      template <typename arg0_type, typename arg1_type, typename arg2_type, \
-          typename arg3_type, typename arg4_type, typename arg5_type, \
-          typename arg6_type, typename arg7_type, typename arg8_type, \
-          typename arg9_type>\
-      return_type gmock_PerformImpl(const args_type& args, \
-          const arg0_type& arg0, const arg1_type& arg1, \
-          const arg2_type& arg2, const arg3_type& arg3, \
-          const arg4_type& arg4, const arg5_type& arg5, \
-          const arg6_type& arg6, const arg7_type& arg7, \
-          const arg8_type& arg8, const arg9_type& arg9) const;\
-     private:\
-      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
-    };\
-    template <typename F> operator ::testing::Action<F>() const {\
-      return ::testing::Action<F>(new gmock_Impl<F>());\
-    }\
-   private:\
-    GTEST_DISALLOW_ASSIGN_(name##Action);\
-  };\
-  inline name##Action name() {\
-    return name##Action();\
-  }\
-  template <typename F>\
-  template <typename arg0_type, typename arg1_type, typename arg2_type, \
-      typename arg3_type, typename arg4_type, typename arg5_type, \
-      typename arg6_type, typename arg7_type, typename arg8_type, \
-      typename arg9_type>\
-  typename ::testing::internal::Function<F>::Result\
-      name##Action::gmock_Impl<F>::gmock_PerformImpl(\
-          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
-
-#define ACTION_P(name, p0)\
-  template <typename p0##_type>\
-  class name##ActionP {\
-   public:\
-    explicit name##ActionP(p0##_type gmock_p0) : \
-        p0(::std::forward<p0##_type>(gmock_p0)) {}\
-    template <typename F>\
-    class gmock_Impl : public ::testing::ActionInterface<F> {\
-     public:\
-      typedef F function_type;\
-      typedef typename ::testing::internal::Function<F>::Result return_type;\
-      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
-          args_type;\
-      explicit gmock_Impl(p0##_type gmock_p0) : \
-          p0(::std::forward<p0##_type>(gmock_p0)) {}\
-      virtual return_type Perform(const args_type& args) {\
-        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
-            Perform(this, args);\
-      }\
-      template <typename arg0_type, typename arg1_type, typename arg2_type, \
-          typename arg3_type, typename arg4_type, typename arg5_type, \
-          typename arg6_type, typename arg7_type, typename arg8_type, \
-          typename arg9_type>\
-      return_type gmock_PerformImpl(const args_type& args, \
-          const arg0_type& arg0, const arg1_type& arg1, \
-          const arg2_type& arg2, const arg3_type& arg3, \
-          const arg4_type& arg4, const arg5_type& arg5, \
-          const arg6_type& arg6, const arg7_type& arg7, \
-          const arg8_type& arg8, const arg9_type& arg9) const;\
-      p0##_type p0;\
-     private:\
-      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
-    };\
-    template <typename F> operator ::testing::Action<F>() const {\
-      return ::testing::Action<F>(new gmock_Impl<F>(p0));\
-    }\
-    p0##_type p0;\
-   private:\
-    GTEST_DISALLOW_ASSIGN_(name##ActionP);\
-  };\
-  template <typename p0##_type>\
-  inline name##ActionP<p0##_type> name(p0##_type p0) {\
-    return name##ActionP<p0##_type>(p0);\
-  }\
-  template <typename p0##_type>\
-  template <typename F>\
-  template <typename arg0_type, typename arg1_type, typename arg2_type, \
-      typename arg3_type, typename arg4_type, typename arg5_type, \
-      typename arg6_type, typename arg7_type, typename arg8_type, \
-      typename arg9_type>\
-  typename ::testing::internal::Function<F>::Result\
-      name##ActionP<p0##_type>::gmock_Impl<F>::gmock_PerformImpl(\
-          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
-
-#define ACTION_P2(name, p0, p1)\
-  template <typename p0##_type, typename p1##_type>\
-  class name##ActionP2 {\
-   public:\
-    name##ActionP2(p0##_type gmock_p0, \
-        p1##_type gmock_p1) : p0(::std::forward<p0##_type>(gmock_p0)), \
-        p1(::std::forward<p1##_type>(gmock_p1)) {}\
-    template <typename F>\
-    class gmock_Impl : public ::testing::ActionInterface<F> {\
-     public:\
-      typedef F function_type;\
-      typedef typename ::testing::internal::Function<F>::Result return_type;\
-      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
-          args_type;\
-      gmock_Impl(p0##_type gmock_p0, \
-          p1##_type gmock_p1) : p0(::std::forward<p0##_type>(gmock_p0)), \
-          p1(::std::forward<p1##_type>(gmock_p1)) {}\
-      virtual return_type Perform(const args_type& args) {\
-        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
-            Perform(this, args);\
-      }\
-      template <typename arg0_type, typename arg1_type, typename arg2_type, \
-          typename arg3_type, typename arg4_type, typename arg5_type, \
-          typename arg6_type, typename arg7_type, typename arg8_type, \
-          typename arg9_type>\
-      return_type gmock_PerformImpl(const args_type& args, \
-          const arg0_type& arg0, const arg1_type& arg1, \
-          const arg2_type& arg2, const arg3_type& arg3, \
-          const arg4_type& arg4, const arg5_type& arg5, \
-          const arg6_type& arg6, const arg7_type& arg7, \
-          const arg8_type& arg8, const arg9_type& arg9) const;\
-      p0##_type p0;\
-      p1##_type p1;\
-     private:\
-      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
-    };\
-    template <typename F> operator ::testing::Action<F>() const {\
-      return ::testing::Action<F>(new gmock_Impl<F>(p0, p1));\
-    }\
-    p0##_type p0;\
-    p1##_type p1;\
-   private:\
-    GTEST_DISALLOW_ASSIGN_(name##ActionP2);\
-  };\
-  template <typename p0##_type, typename p1##_type>\
-  inline name##ActionP2<p0##_type, p1##_type> name(p0##_type p0, \
-      p1##_type p1) {\
-    return name##ActionP2<p0##_type, p1##_type>(p0, p1);\
-  }\
-  template <typename p0##_type, typename p1##_type>\
-  template <typename F>\
-  template <typename arg0_type, typename arg1_type, typename arg2_type, \
-      typename arg3_type, typename arg4_type, typename arg5_type, \
-      typename arg6_type, typename arg7_type, typename arg8_type, \
-      typename arg9_type>\
-  typename ::testing::internal::Function<F>::Result\
-      name##ActionP2<p0##_type, p1##_type>::gmock_Impl<F>::gmock_PerformImpl(\
-          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
-
-#define ACTION_P3(name, p0, p1, p2)\
-  template <typename p0##_type, typename p1##_type, typename p2##_type>\
-  class name##ActionP3 {\
-   public:\
-    name##ActionP3(p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2) : p0(::std::forward<p0##_type>(gmock_p0)), \
-        p1(::std::forward<p1##_type>(gmock_p1)), \
-        p2(::std::forward<p2##_type>(gmock_p2)) {}\
-    template <typename F>\
-    class gmock_Impl : public ::testing::ActionInterface<F> {\
-     public:\
-      typedef F function_type;\
-      typedef typename ::testing::internal::Function<F>::Result return_type;\
-      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
-          args_type;\
-      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, \
-          p2##_type gmock_p2) : p0(::std::forward<p0##_type>(gmock_p0)), \
-          p1(::std::forward<p1##_type>(gmock_p1)), \
-          p2(::std::forward<p2##_type>(gmock_p2)) {}\
-      virtual return_type Perform(const args_type& args) {\
-        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
-            Perform(this, args);\
-      }\
-      template <typename arg0_type, typename arg1_type, typename arg2_type, \
-          typename arg3_type, typename arg4_type, typename arg5_type, \
-          typename arg6_type, typename arg7_type, typename arg8_type, \
-          typename arg9_type>\
-      return_type gmock_PerformImpl(const args_type& args, \
-          const arg0_type& arg0, const arg1_type& arg1, \
-          const arg2_type& arg2, const arg3_type& arg3, \
-          const arg4_type& arg4, const arg5_type& arg5, \
-          const arg6_type& arg6, const arg7_type& arg7, \
-          const arg8_type& arg8, const arg9_type& arg9) const;\
-      p0##_type p0;\
-      p1##_type p1;\
-      p2##_type p2;\
-     private:\
-      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
-    };\
-    template <typename F> operator ::testing::Action<F>() const {\
-      return ::testing::Action<F>(new gmock_Impl<F>(p0, p1, p2));\
-    }\
-    p0##_type p0;\
-    p1##_type p1;\
-    p2##_type p2;\
-   private:\
-    GTEST_DISALLOW_ASSIGN_(name##ActionP3);\
-  };\
-  template <typename p0##_type, typename p1##_type, typename p2##_type>\
-  inline name##ActionP3<p0##_type, p1##_type, p2##_type> name(p0##_type p0, \
-      p1##_type p1, p2##_type p2) {\
-    return name##ActionP3<p0##_type, p1##_type, p2##_type>(p0, p1, p2);\
-  }\
-  template <typename p0##_type, typename p1##_type, typename p2##_type>\
-  template <typename F>\
-  template <typename arg0_type, typename arg1_type, typename arg2_type, \
-      typename arg3_type, typename arg4_type, typename arg5_type, \
-      typename arg6_type, typename arg7_type, typename arg8_type, \
-      typename arg9_type>\
-  typename ::testing::internal::Function<F>::Result\
-      name##ActionP3<p0##_type, p1##_type, \
-          p2##_type>::gmock_Impl<F>::gmock_PerformImpl(\
-          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
-
-#define ACTION_P4(name, p0, p1, p2, p3)\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type>\
-  class name##ActionP4 {\
-   public:\
-    name##ActionP4(p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2, \
-        p3##_type gmock_p3) : p0(::std::forward<p0##_type>(gmock_p0)), \
-        p1(::std::forward<p1##_type>(gmock_p1)), \
-        p2(::std::forward<p2##_type>(gmock_p2)), \
-        p3(::std::forward<p3##_type>(gmock_p3)) {}\
-    template <typename F>\
-    class gmock_Impl : public ::testing::ActionInterface<F> {\
-     public:\
-      typedef F function_type;\
-      typedef typename ::testing::internal::Function<F>::Result return_type;\
-      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
-          args_type;\
-      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-          p3##_type gmock_p3) : p0(::std::forward<p0##_type>(gmock_p0)), \
-          p1(::std::forward<p1##_type>(gmock_p1)), \
-          p2(::std::forward<p2##_type>(gmock_p2)), \
-          p3(::std::forward<p3##_type>(gmock_p3)) {}\
-      virtual return_type Perform(const args_type& args) {\
-        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
-            Perform(this, args);\
-      }\
-      template <typename arg0_type, typename arg1_type, typename arg2_type, \
-          typename arg3_type, typename arg4_type, typename arg5_type, \
-          typename arg6_type, typename arg7_type, typename arg8_type, \
-          typename arg9_type>\
-      return_type gmock_PerformImpl(const args_type& args, \
-          const arg0_type& arg0, const arg1_type& arg1, \
-          const arg2_type& arg2, const arg3_type& arg3, \
-          const arg4_type& arg4, const arg5_type& arg5, \
-          const arg6_type& arg6, const arg7_type& arg7, \
-          const arg8_type& arg8, const arg9_type& arg9) const;\
-      p0##_type p0;\
-      p1##_type p1;\
-      p2##_type p2;\
-      p3##_type p3;\
-     private:\
-      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
-    };\
-    template <typename F> operator ::testing::Action<F>() const {\
-      return ::testing::Action<F>(new gmock_Impl<F>(p0, p1, p2, p3));\
-    }\
-    p0##_type p0;\
-    p1##_type p1;\
-    p2##_type p2;\
-    p3##_type p3;\
-   private:\
-    GTEST_DISALLOW_ASSIGN_(name##ActionP4);\
-  };\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type>\
-  inline name##ActionP4<p0##_type, p1##_type, p2##_type, \
-      p3##_type> name(p0##_type p0, p1##_type p1, p2##_type p2, \
-      p3##_type p3) {\
-    return name##ActionP4<p0##_type, p1##_type, p2##_type, p3##_type>(p0, p1, \
-        p2, p3);\
-  }\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type>\
-  template <typename F>\
-  template <typename arg0_type, typename arg1_type, typename arg2_type, \
-      typename arg3_type, typename arg4_type, typename arg5_type, \
-      typename arg6_type, typename arg7_type, typename arg8_type, \
-      typename arg9_type>\
-  typename ::testing::internal::Function<F>::Result\
-      name##ActionP4<p0##_type, p1##_type, p2##_type, \
-          p3##_type>::gmock_Impl<F>::gmock_PerformImpl(\
-          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
-
-#define ACTION_P5(name, p0, p1, p2, p3, p4)\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type>\
-  class name##ActionP5 {\
-   public:\
-    name##ActionP5(p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2, p3##_type gmock_p3, \
-        p4##_type gmock_p4) : p0(::std::forward<p0##_type>(gmock_p0)), \
-        p1(::std::forward<p1##_type>(gmock_p1)), \
-        p2(::std::forward<p2##_type>(gmock_p2)), \
-        p3(::std::forward<p3##_type>(gmock_p3)), \
-        p4(::std::forward<p4##_type>(gmock_p4)) {}\
-    template <typename F>\
-    class gmock_Impl : public ::testing::ActionInterface<F> {\
-     public:\
-      typedef F function_type;\
-      typedef typename ::testing::internal::Function<F>::Result return_type;\
-      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
-          args_type;\
-      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-          p3##_type gmock_p3, \
-          p4##_type gmock_p4) : p0(::std::forward<p0##_type>(gmock_p0)), \
-          p1(::std::forward<p1##_type>(gmock_p1)), \
-          p2(::std::forward<p2##_type>(gmock_p2)), \
-          p3(::std::forward<p3##_type>(gmock_p3)), \
-          p4(::std::forward<p4##_type>(gmock_p4)) {}\
-      virtual return_type Perform(const args_type& args) {\
-        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
-            Perform(this, args);\
-      }\
-      template <typename arg0_type, typename arg1_type, typename arg2_type, \
-          typename arg3_type, typename arg4_type, typename arg5_type, \
-          typename arg6_type, typename arg7_type, typename arg8_type, \
-          typename arg9_type>\
-      return_type gmock_PerformImpl(const args_type& args, \
-          const arg0_type& arg0, const arg1_type& arg1, \
-          const arg2_type& arg2, const arg3_type& arg3, \
-          const arg4_type& arg4, const arg5_type& arg5, \
-          const arg6_type& arg6, const arg7_type& arg7, \
-          const arg8_type& arg8, const arg9_type& arg9) const;\
-      p0##_type p0;\
-      p1##_type p1;\
-      p2##_type p2;\
-      p3##_type p3;\
-      p4##_type p4;\
-     private:\
-      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
-    };\
-    template <typename F> operator ::testing::Action<F>() const {\
-      return ::testing::Action<F>(new gmock_Impl<F>(p0, p1, p2, p3, p4));\
-    }\
-    p0##_type p0;\
-    p1##_type p1;\
-    p2##_type p2;\
-    p3##_type p3;\
-    p4##_type p4;\
-   private:\
-    GTEST_DISALLOW_ASSIGN_(name##ActionP5);\
-  };\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type>\
-  inline name##ActionP5<p0##_type, p1##_type, p2##_type, p3##_type, \
-      p4##_type> name(p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \
-      p4##_type p4) {\
-    return name##ActionP5<p0##_type, p1##_type, p2##_type, p3##_type, \
-        p4##_type>(p0, p1, p2, p3, p4);\
-  }\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type>\
-  template <typename F>\
-  template <typename arg0_type, typename arg1_type, typename arg2_type, \
-      typename arg3_type, typename arg4_type, typename arg5_type, \
-      typename arg6_type, typename arg7_type, typename arg8_type, \
-      typename arg9_type>\
-  typename ::testing::internal::Function<F>::Result\
-      name##ActionP5<p0##_type, p1##_type, p2##_type, p3##_type, \
-          p4##_type>::gmock_Impl<F>::gmock_PerformImpl(\
-          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
-
-#define ACTION_P6(name, p0, p1, p2, p3, p4, p5)\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type>\
-  class name##ActionP6 {\
-   public:\
-    name##ActionP6(p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2, p3##_type gmock_p3, p4##_type gmock_p4, \
-        p5##_type gmock_p5) : p0(::std::forward<p0##_type>(gmock_p0)), \
-        p1(::std::forward<p1##_type>(gmock_p1)), \
-        p2(::std::forward<p2##_type>(gmock_p2)), \
-        p3(::std::forward<p3##_type>(gmock_p3)), \
-        p4(::std::forward<p4##_type>(gmock_p4)), \
-        p5(::std::forward<p5##_type>(gmock_p5)) {}\
-    template <typename F>\
-    class gmock_Impl : public ::testing::ActionInterface<F> {\
-     public:\
-      typedef F function_type;\
-      typedef typename ::testing::internal::Function<F>::Result return_type;\
-      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
-          args_type;\
-      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-          p3##_type gmock_p3, p4##_type gmock_p4, \
-          p5##_type gmock_p5) : p0(::std::forward<p0##_type>(gmock_p0)), \
-          p1(::std::forward<p1##_type>(gmock_p1)), \
-          p2(::std::forward<p2##_type>(gmock_p2)), \
-          p3(::std::forward<p3##_type>(gmock_p3)), \
-          p4(::std::forward<p4##_type>(gmock_p4)), \
-          p5(::std::forward<p5##_type>(gmock_p5)) {}\
-      virtual return_type Perform(const args_type& args) {\
-        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
-            Perform(this, args);\
-      }\
-      template <typename arg0_type, typename arg1_type, typename arg2_type, \
-          typename arg3_type, typename arg4_type, typename arg5_type, \
-          typename arg6_type, typename arg7_type, typename arg8_type, \
-          typename arg9_type>\
-      return_type gmock_PerformImpl(const args_type& args, \
-          const arg0_type& arg0, const arg1_type& arg1, \
-          const arg2_type& arg2, const arg3_type& arg3, \
-          const arg4_type& arg4, const arg5_type& arg5, \
-          const arg6_type& arg6, const arg7_type& arg7, \
-          const arg8_type& arg8, const arg9_type& arg9) const;\
-      p0##_type p0;\
-      p1##_type p1;\
-      p2##_type p2;\
-      p3##_type p3;\
-      p4##_type p4;\
-      p5##_type p5;\
-     private:\
-      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
-    };\
-    template <typename F> operator ::testing::Action<F>() const {\
-      return ::testing::Action<F>(new gmock_Impl<F>(p0, p1, p2, p3, p4, p5));\
-    }\
-    p0##_type p0;\
-    p1##_type p1;\
-    p2##_type p2;\
-    p3##_type p3;\
-    p4##_type p4;\
-    p5##_type p5;\
-   private:\
-    GTEST_DISALLOW_ASSIGN_(name##ActionP6);\
-  };\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type>\
-  inline name##ActionP6<p0##_type, p1##_type, p2##_type, p3##_type, \
-      p4##_type, p5##_type> name(p0##_type p0, p1##_type p1, p2##_type p2, \
-      p3##_type p3, p4##_type p4, p5##_type p5) {\
-    return name##ActionP6<p0##_type, p1##_type, p2##_type, p3##_type, \
-        p4##_type, p5##_type>(p0, p1, p2, p3, p4, p5);\
-  }\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type>\
-  template <typename F>\
-  template <typename arg0_type, typename arg1_type, typename arg2_type, \
-      typename arg3_type, typename arg4_type, typename arg5_type, \
-      typename arg6_type, typename arg7_type, typename arg8_type, \
-      typename arg9_type>\
-  typename ::testing::internal::Function<F>::Result\
-      name##ActionP6<p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
-          p5##_type>::gmock_Impl<F>::gmock_PerformImpl(\
-          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
-
-#define ACTION_P7(name, p0, p1, p2, p3, p4, p5, p6)\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type>\
-  class name##ActionP7 {\
-   public:\
-    name##ActionP7(p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2, p3##_type gmock_p3, p4##_type gmock_p4, \
-        p5##_type gmock_p5, \
-        p6##_type gmock_p6) : p0(::std::forward<p0##_type>(gmock_p0)), \
-        p1(::std::forward<p1##_type>(gmock_p1)), \
-        p2(::std::forward<p2##_type>(gmock_p2)), \
-        p3(::std::forward<p3##_type>(gmock_p3)), \
-        p4(::std::forward<p4##_type>(gmock_p4)), \
-        p5(::std::forward<p5##_type>(gmock_p5)), \
-        p6(::std::forward<p6##_type>(gmock_p6)) {}\
-    template <typename F>\
-    class gmock_Impl : public ::testing::ActionInterface<F> {\
-     public:\
-      typedef F function_type;\
-      typedef typename ::testing::internal::Function<F>::Result return_type;\
-      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
-          args_type;\
-      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-          p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
-          p6##_type gmock_p6) : p0(::std::forward<p0##_type>(gmock_p0)), \
-          p1(::std::forward<p1##_type>(gmock_p1)), \
-          p2(::std::forward<p2##_type>(gmock_p2)), \
-          p3(::std::forward<p3##_type>(gmock_p3)), \
-          p4(::std::forward<p4##_type>(gmock_p4)), \
-          p5(::std::forward<p5##_type>(gmock_p5)), \
-          p6(::std::forward<p6##_type>(gmock_p6)) {}\
-      virtual return_type Perform(const args_type& args) {\
-        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
-            Perform(this, args);\
-      }\
-      template <typename arg0_type, typename arg1_type, typename arg2_type, \
-          typename arg3_type, typename arg4_type, typename arg5_type, \
-          typename arg6_type, typename arg7_type, typename arg8_type, \
-          typename arg9_type>\
-      return_type gmock_PerformImpl(const args_type& args, \
-          const arg0_type& arg0, const arg1_type& arg1, \
-          const arg2_type& arg2, const arg3_type& arg3, \
-          const arg4_type& arg4, const arg5_type& arg5, \
-          const arg6_type& arg6, const arg7_type& arg7, \
-          const arg8_type& arg8, const arg9_type& arg9) const;\
-      p0##_type p0;\
-      p1##_type p1;\
-      p2##_type p2;\
-      p3##_type p3;\
-      p4##_type p4;\
-      p5##_type p5;\
-      p6##_type p6;\
-     private:\
-      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
-    };\
-    template <typename F> operator ::testing::Action<F>() const {\
-      return ::testing::Action<F>(new gmock_Impl<F>(p0, p1, p2, p3, p4, p5, \
-          p6));\
-    }\
-    p0##_type p0;\
-    p1##_type p1;\
-    p2##_type p2;\
-    p3##_type p3;\
-    p4##_type p4;\
-    p5##_type p5;\
-    p6##_type p6;\
-   private:\
-    GTEST_DISALLOW_ASSIGN_(name##ActionP7);\
-  };\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type>\
-  inline name##ActionP7<p0##_type, p1##_type, p2##_type, p3##_type, \
-      p4##_type, p5##_type, p6##_type> name(p0##_type p0, p1##_type p1, \
-      p2##_type p2, p3##_type p3, p4##_type p4, p5##_type p5, \
-      p6##_type p6) {\
-    return name##ActionP7<p0##_type, p1##_type, p2##_type, p3##_type, \
-        p4##_type, p5##_type, p6##_type>(p0, p1, p2, p3, p4, p5, p6);\
-  }\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type>\
-  template <typename F>\
-  template <typename arg0_type, typename arg1_type, typename arg2_type, \
-      typename arg3_type, typename arg4_type, typename arg5_type, \
-      typename arg6_type, typename arg7_type, typename arg8_type, \
-      typename arg9_type>\
-  typename ::testing::internal::Function<F>::Result\
-      name##ActionP7<p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
-          p5##_type, p6##_type>::gmock_Impl<F>::gmock_PerformImpl(\
-          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
-
-#define ACTION_P8(name, p0, p1, p2, p3, p4, p5, p6, p7)\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type>\
-  class name##ActionP8 {\
-   public:\
-    name##ActionP8(p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2, p3##_type gmock_p3, p4##_type gmock_p4, \
-        p5##_type gmock_p5, p6##_type gmock_p6, \
-        p7##_type gmock_p7) : p0(::std::forward<p0##_type>(gmock_p0)), \
-        p1(::std::forward<p1##_type>(gmock_p1)), \
-        p2(::std::forward<p2##_type>(gmock_p2)), \
-        p3(::std::forward<p3##_type>(gmock_p3)), \
-        p4(::std::forward<p4##_type>(gmock_p4)), \
-        p5(::std::forward<p5##_type>(gmock_p5)), \
-        p6(::std::forward<p6##_type>(gmock_p6)), \
-        p7(::std::forward<p7##_type>(gmock_p7)) {}\
-    template <typename F>\
-    class gmock_Impl : public ::testing::ActionInterface<F> {\
-     public:\
-      typedef F function_type;\
-      typedef typename ::testing::internal::Function<F>::Result return_type;\
-      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
-          args_type;\
-      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-          p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
-          p6##_type gmock_p6, \
-          p7##_type gmock_p7) : p0(::std::forward<p0##_type>(gmock_p0)), \
-          p1(::std::forward<p1##_type>(gmock_p1)), \
-          p2(::std::forward<p2##_type>(gmock_p2)), \
-          p3(::std::forward<p3##_type>(gmock_p3)), \
-          p4(::std::forward<p4##_type>(gmock_p4)), \
-          p5(::std::forward<p5##_type>(gmock_p5)), \
-          p6(::std::forward<p6##_type>(gmock_p6)), \
-          p7(::std::forward<p7##_type>(gmock_p7)) {}\
-      virtual return_type Perform(const args_type& args) {\
-        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
-            Perform(this, args);\
-      }\
-      template <typename arg0_type, typename arg1_type, typename arg2_type, \
-          typename arg3_type, typename arg4_type, typename arg5_type, \
-          typename arg6_type, typename arg7_type, typename arg8_type, \
-          typename arg9_type>\
-      return_type gmock_PerformImpl(const args_type& args, \
-          const arg0_type& arg0, const arg1_type& arg1, \
-          const arg2_type& arg2, const arg3_type& arg3, \
-          const arg4_type& arg4, const arg5_type& arg5, \
-          const arg6_type& arg6, const arg7_type& arg7, \
-          const arg8_type& arg8, const arg9_type& arg9) const;\
-      p0##_type p0;\
-      p1##_type p1;\
-      p2##_type p2;\
-      p3##_type p3;\
-      p4##_type p4;\
-      p5##_type p5;\
-      p6##_type p6;\
-      p7##_type p7;\
-     private:\
-      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
-    };\
-    template <typename F> operator ::testing::Action<F>() const {\
-      return ::testing::Action<F>(new gmock_Impl<F>(p0, p1, p2, p3, p4, p5, \
-          p6, p7));\
-    }\
-    p0##_type p0;\
-    p1##_type p1;\
-    p2##_type p2;\
-    p3##_type p3;\
-    p4##_type p4;\
-    p5##_type p5;\
-    p6##_type p6;\
-    p7##_type p7;\
-   private:\
-    GTEST_DISALLOW_ASSIGN_(name##ActionP8);\
-  };\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type>\
-  inline name##ActionP8<p0##_type, p1##_type, p2##_type, p3##_type, \
-      p4##_type, p5##_type, p6##_type, p7##_type> name(p0##_type p0, \
-      p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4, p5##_type p5, \
-      p6##_type p6, p7##_type p7) {\
-    return name##ActionP8<p0##_type, p1##_type, p2##_type, p3##_type, \
-        p4##_type, p5##_type, p6##_type, p7##_type>(p0, p1, p2, p3, p4, p5, \
-        p6, p7);\
-  }\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type>\
-  template <typename F>\
-  template <typename arg0_type, typename arg1_type, typename arg2_type, \
-      typename arg3_type, typename arg4_type, typename arg5_type, \
-      typename arg6_type, typename arg7_type, typename arg8_type, \
-      typename arg9_type>\
-  typename ::testing::internal::Function<F>::Result\
-      name##ActionP8<p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
-          p5##_type, p6##_type, \
-          p7##_type>::gmock_Impl<F>::gmock_PerformImpl(\
-          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
-
-#define ACTION_P9(name, p0, p1, p2, p3, p4, p5, p6, p7, p8)\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type, typename p8##_type>\
-  class name##ActionP9 {\
-   public:\
-    name##ActionP9(p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2, p3##_type gmock_p3, p4##_type gmock_p4, \
-        p5##_type gmock_p5, p6##_type gmock_p6, p7##_type gmock_p7, \
-        p8##_type gmock_p8) : p0(::std::forward<p0##_type>(gmock_p0)), \
-        p1(::std::forward<p1##_type>(gmock_p1)), \
-        p2(::std::forward<p2##_type>(gmock_p2)), \
-        p3(::std::forward<p3##_type>(gmock_p3)), \
-        p4(::std::forward<p4##_type>(gmock_p4)), \
-        p5(::std::forward<p5##_type>(gmock_p5)), \
-        p6(::std::forward<p6##_type>(gmock_p6)), \
-        p7(::std::forward<p7##_type>(gmock_p7)), \
-        p8(::std::forward<p8##_type>(gmock_p8)) {}\
-    template <typename F>\
-    class gmock_Impl : public ::testing::ActionInterface<F> {\
-     public:\
-      typedef F function_type;\
-      typedef typename ::testing::internal::Function<F>::Result return_type;\
-      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
-          args_type;\
-      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-          p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
-          p6##_type gmock_p6, p7##_type gmock_p7, \
-          p8##_type gmock_p8) : p0(::std::forward<p0##_type>(gmock_p0)), \
-          p1(::std::forward<p1##_type>(gmock_p1)), \
-          p2(::std::forward<p2##_type>(gmock_p2)), \
-          p3(::std::forward<p3##_type>(gmock_p3)), \
-          p4(::std::forward<p4##_type>(gmock_p4)), \
-          p5(::std::forward<p5##_type>(gmock_p5)), \
-          p6(::std::forward<p6##_type>(gmock_p6)), \
-          p7(::std::forward<p7##_type>(gmock_p7)), \
-          p8(::std::forward<p8##_type>(gmock_p8)) {}\
-      virtual return_type Perform(const args_type& args) {\
-        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
-            Perform(this, args);\
-      }\
-      template <typename arg0_type, typename arg1_type, typename arg2_type, \
-          typename arg3_type, typename arg4_type, typename arg5_type, \
-          typename arg6_type, typename arg7_type, typename arg8_type, \
-          typename arg9_type>\
-      return_type gmock_PerformImpl(const args_type& args, \
-          const arg0_type& arg0, const arg1_type& arg1, \
-          const arg2_type& arg2, const arg3_type& arg3, \
-          const arg4_type& arg4, const arg5_type& arg5, \
-          const arg6_type& arg6, const arg7_type& arg7, \
-          const arg8_type& arg8, const arg9_type& arg9) const;\
-      p0##_type p0;\
-      p1##_type p1;\
-      p2##_type p2;\
-      p3##_type p3;\
-      p4##_type p4;\
-      p5##_type p5;\
-      p6##_type p6;\
-      p7##_type p7;\
-      p8##_type p8;\
-     private:\
-      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
-    };\
-    template <typename F> operator ::testing::Action<F>() const {\
-      return ::testing::Action<F>(new gmock_Impl<F>(p0, p1, p2, p3, p4, p5, \
-          p6, p7, p8));\
-    }\
-    p0##_type p0;\
-    p1##_type p1;\
-    p2##_type p2;\
-    p3##_type p3;\
-    p4##_type p4;\
-    p5##_type p5;\
-    p6##_type p6;\
-    p7##_type p7;\
-    p8##_type p8;\
-   private:\
-    GTEST_DISALLOW_ASSIGN_(name##ActionP9);\
-  };\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type, typename p8##_type>\
-  inline name##ActionP9<p0##_type, p1##_type, p2##_type, p3##_type, \
-      p4##_type, p5##_type, p6##_type, p7##_type, \
-      p8##_type> name(p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \
-      p4##_type p4, p5##_type p5, p6##_type p6, p7##_type p7, \
-      p8##_type p8) {\
-    return name##ActionP9<p0##_type, p1##_type, p2##_type, p3##_type, \
-        p4##_type, p5##_type, p6##_type, p7##_type, p8##_type>(p0, p1, p2, \
-        p3, p4, p5, p6, p7, p8);\
-  }\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type, typename p8##_type>\
-  template <typename F>\
-  template <typename arg0_type, typename arg1_type, typename arg2_type, \
-      typename arg3_type, typename arg4_type, typename arg5_type, \
-      typename arg6_type, typename arg7_type, typename arg8_type, \
-      typename arg9_type>\
-  typename ::testing::internal::Function<F>::Result\
-      name##ActionP9<p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
-          p5##_type, p6##_type, p7##_type, \
-          p8##_type>::gmock_Impl<F>::gmock_PerformImpl(\
-          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
-
-#define ACTION_P10(name, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9)\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type, typename p8##_type, \
-      typename p9##_type>\
-  class name##ActionP10 {\
-   public:\
-    name##ActionP10(p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2, p3##_type gmock_p3, p4##_type gmock_p4, \
-        p5##_type gmock_p5, p6##_type gmock_p6, p7##_type gmock_p7, \
-        p8##_type gmock_p8, \
-        p9##_type gmock_p9) : p0(::std::forward<p0##_type>(gmock_p0)), \
-        p1(::std::forward<p1##_type>(gmock_p1)), \
-        p2(::std::forward<p2##_type>(gmock_p2)), \
-        p3(::std::forward<p3##_type>(gmock_p3)), \
-        p4(::std::forward<p4##_type>(gmock_p4)), \
-        p5(::std::forward<p5##_type>(gmock_p5)), \
-        p6(::std::forward<p6##_type>(gmock_p6)), \
-        p7(::std::forward<p7##_type>(gmock_p7)), \
-        p8(::std::forward<p8##_type>(gmock_p8)), \
-        p9(::std::forward<p9##_type>(gmock_p9)) {}\
-    template <typename F>\
-    class gmock_Impl : public ::testing::ActionInterface<F> {\
-     public:\
-      typedef F function_type;\
-      typedef typename ::testing::internal::Function<F>::Result return_type;\
-      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
-          args_type;\
-      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-          p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
-          p6##_type gmock_p6, p7##_type gmock_p7, p8##_type gmock_p8, \
-          p9##_type gmock_p9) : p0(::std::forward<p0##_type>(gmock_p0)), \
-          p1(::std::forward<p1##_type>(gmock_p1)), \
-          p2(::std::forward<p2##_type>(gmock_p2)), \
-          p3(::std::forward<p3##_type>(gmock_p3)), \
-          p4(::std::forward<p4##_type>(gmock_p4)), \
-          p5(::std::forward<p5##_type>(gmock_p5)), \
-          p6(::std::forward<p6##_type>(gmock_p6)), \
-          p7(::std::forward<p7##_type>(gmock_p7)), \
-          p8(::std::forward<p8##_type>(gmock_p8)), \
-          p9(::std::forward<p9##_type>(gmock_p9)) {}\
-      virtual return_type Perform(const args_type& args) {\
-        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
-            Perform(this, args);\
-      }\
-      template <typename arg0_type, typename arg1_type, typename arg2_type, \
-          typename arg3_type, typename arg4_type, typename arg5_type, \
-          typename arg6_type, typename arg7_type, typename arg8_type, \
-          typename arg9_type>\
-      return_type gmock_PerformImpl(const args_type& args, \
-          const arg0_type& arg0, const arg1_type& arg1, \
-          const arg2_type& arg2, const arg3_type& arg3, \
-          const arg4_type& arg4, const arg5_type& arg5, \
-          const arg6_type& arg6, const arg7_type& arg7, \
-          const arg8_type& arg8, const arg9_type& arg9) const;\
-      p0##_type p0;\
-      p1##_type p1;\
-      p2##_type p2;\
-      p3##_type p3;\
-      p4##_type p4;\
-      p5##_type p5;\
-      p6##_type p6;\
-      p7##_type p7;\
-      p8##_type p8;\
-      p9##_type p9;\
-     private:\
-      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
-    };\
-    template <typename F> operator ::testing::Action<F>() const {\
-      return ::testing::Action<F>(new gmock_Impl<F>(p0, p1, p2, p3, p4, p5, \
-          p6, p7, p8, p9));\
-    }\
-    p0##_type p0;\
-    p1##_type p1;\
-    p2##_type p2;\
-    p3##_type p3;\
-    p4##_type p4;\
-    p5##_type p5;\
-    p6##_type p6;\
-    p7##_type p7;\
-    p8##_type p8;\
-    p9##_type p9;\
-   private:\
-    GTEST_DISALLOW_ASSIGN_(name##ActionP10);\
-  };\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type, typename p8##_type, \
-      typename p9##_type>\
-  inline name##ActionP10<p0##_type, p1##_type, p2##_type, p3##_type, \
-      p4##_type, p5##_type, p6##_type, p7##_type, p8##_type, \
-      p9##_type> name(p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \
-      p4##_type p4, p5##_type p5, p6##_type p6, p7##_type p7, p8##_type p8, \
-      p9##_type p9) {\
-    return name##ActionP10<p0##_type, p1##_type, p2##_type, p3##_type, \
-        p4##_type, p5##_type, p6##_type, p7##_type, p8##_type, p9##_type>(p0, \
-        p1, p2, p3, p4, p5, p6, p7, p8, p9);\
-  }\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type, typename p8##_type, \
-      typename p9##_type>\
-  template <typename F>\
-  template <typename arg0_type, typename arg1_type, typename arg2_type, \
-      typename arg3_type, typename arg4_type, typename arg5_type, \
-      typename arg6_type, typename arg7_type, typename arg8_type, \
-      typename arg9_type>\
-  typename ::testing::internal::Function<F>::Result\
-      name##ActionP10<p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
-          p5##_type, p6##_type, p7##_type, p8##_type, \
-          p9##_type>::gmock_Impl<F>::gmock_PerformImpl(\
-          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
-
-namespace testing {
-
-
-// The ACTION*() macros trigger warning C4100 (unreferenced formal
-// parameter) in MSVC with -W4.  Unfortunately they cannot be fixed in
-// the macro definition, as the warnings are generated when the macro
-// is expanded and macro expansion cannot contain #pragma.  Therefore
-// we suppress them here.
-#ifdef _MSC_VER
-# pragma warning(push)
-# pragma warning(disable:4100)
-#endif
-
-// Various overloads for InvokeArgument<N>().
-//
-// The InvokeArgument<N>(a1, a2, ..., a_k) action invokes the N-th
-// (0-based) argument, which must be a k-ary callable, of the mock
-// function, with arguments a1, a2, ..., a_k.
-//
-// Notes:
-//
-//   1. The arguments are passed by value by default.  If you need to
-//   pass an argument by reference, wrap it inside ByRef().  For
-//   example,
-//
-//     InvokeArgument<1>(5, string("Hello"), ByRef(foo))
-//
-//   passes 5 and string("Hello") by value, and passes foo by
-//   reference.
-//
-//   2. If the callable takes an argument by reference but ByRef() is
-//   not used, it will receive the reference to a copy of the value,
-//   instead of the original value.  For example, when the 0-th
-//   argument of the mock function takes a const string&, the action
-//
-//     InvokeArgument<0>(string("Hello"))
-//
-//   makes a copy of the temporary string("Hello") object and passes a
-//   reference of the copy, instead of the original temporary object,
-//   to the callable.  This makes it easy for a user to define an
-//   InvokeArgument action from temporary values and have it performed
-//   later.
-
-namespace internal {
-namespace invoke_argument {
-
-// Appears in InvokeArgumentAdl's argument list to help avoid
-// accidental calls to user functions of the same name.
-struct AdlTag {};
-
-// InvokeArgumentAdl - a helper for InvokeArgument.
-// The basic overloads are provided here for generic functors.
-// Overloads for other custom-callables are provided in the
-// internal/custom/callback-actions.h header.
-
-template <typename R, typename F>
-R InvokeArgumentAdl(AdlTag, F f) {
-  return f();
-}
-template <typename R, typename F, typename A1>
-R InvokeArgumentAdl(AdlTag, F f, A1 a1) {
-  return f(a1);
-}
-template <typename R, typename F, typename A1, typename A2>
-R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2) {
-  return f(a1, a2);
-}
-template <typename R, typename F, typename A1, typename A2, typename A3>
-R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2, A3 a3) {
-  return f(a1, a2, a3);
-}
-template <typename R, typename F, typename A1, typename A2, typename A3,
-    typename A4>
-R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2, A3 a3, A4 a4) {
-  return f(a1, a2, a3, a4);
-}
-template <typename R, typename F, typename A1, typename A2, typename A3,
-    typename A4, typename A5>
-R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5) {
-  return f(a1, a2, a3, a4, a5);
-}
-template <typename R, typename F, typename A1, typename A2, typename A3,
-    typename A4, typename A5, typename A6>
-R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6) {
-  return f(a1, a2, a3, a4, a5, a6);
-}
-template <typename R, typename F, typename A1, typename A2, typename A3,
-    typename A4, typename A5, typename A6, typename A7>
-R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6,
-    A7 a7) {
-  return f(a1, a2, a3, a4, a5, a6, a7);
-}
-template <typename R, typename F, typename A1, typename A2, typename A3,
-    typename A4, typename A5, typename A6, typename A7, typename A8>
-R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6,
-    A7 a7, A8 a8) {
-  return f(a1, a2, a3, a4, a5, a6, a7, a8);
-}
-template <typename R, typename F, typename A1, typename A2, typename A3,
-    typename A4, typename A5, typename A6, typename A7, typename A8,
-    typename A9>
-R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6,
-    A7 a7, A8 a8, A9 a9) {
-  return f(a1, a2, a3, a4, a5, a6, a7, a8, a9);
-}
-template <typename R, typename F, typename A1, typename A2, typename A3,
-    typename A4, typename A5, typename A6, typename A7, typename A8,
-    typename A9, typename A10>
-R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6,
-    A7 a7, A8 a8, A9 a9, A10 a10) {
-  return f(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10);
-}
-}  // namespace invoke_argument
-}  // namespace internal
-
-ACTION_TEMPLATE(InvokeArgument,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_0_VALUE_PARAMS()) {
-  using internal::invoke_argument::InvokeArgumentAdl;
-  return InvokeArgumentAdl<return_type>(
-      internal::invoke_argument::AdlTag(),
-      ::std::get<k>(args));
-}
-
-ACTION_TEMPLATE(InvokeArgument,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_1_VALUE_PARAMS(p0)) {
-  using internal::invoke_argument::InvokeArgumentAdl;
-  return InvokeArgumentAdl<return_type>(
-      internal::invoke_argument::AdlTag(),
-      ::std::get<k>(args), p0);
-}
-
-ACTION_TEMPLATE(InvokeArgument,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_2_VALUE_PARAMS(p0, p1)) {
-  using internal::invoke_argument::InvokeArgumentAdl;
-  return InvokeArgumentAdl<return_type>(
-      internal::invoke_argument::AdlTag(),
-      ::std::get<k>(args), p0, p1);
-}
-
-ACTION_TEMPLATE(InvokeArgument,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_3_VALUE_PARAMS(p0, p1, p2)) {
-  using internal::invoke_argument::InvokeArgumentAdl;
-  return InvokeArgumentAdl<return_type>(
-      internal::invoke_argument::AdlTag(),
-      ::std::get<k>(args), p0, p1, p2);
-}
-
-ACTION_TEMPLATE(InvokeArgument,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_4_VALUE_PARAMS(p0, p1, p2, p3)) {
-  using internal::invoke_argument::InvokeArgumentAdl;
-  return InvokeArgumentAdl<return_type>(
-      internal::invoke_argument::AdlTag(),
-      ::std::get<k>(args), p0, p1, p2, p3);
-}
-
-ACTION_TEMPLATE(InvokeArgument,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4)) {
-  using internal::invoke_argument::InvokeArgumentAdl;
-  return InvokeArgumentAdl<return_type>(
-      internal::invoke_argument::AdlTag(),
-      ::std::get<k>(args), p0, p1, p2, p3, p4);
-}
-
-ACTION_TEMPLATE(InvokeArgument,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5)) {
-  using internal::invoke_argument::InvokeArgumentAdl;
-  return InvokeArgumentAdl<return_type>(
-      internal::invoke_argument::AdlTag(),
-      ::std::get<k>(args), p0, p1, p2, p3, p4, p5);
-}
-
-ACTION_TEMPLATE(InvokeArgument,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6)) {
-  using internal::invoke_argument::InvokeArgumentAdl;
-  return InvokeArgumentAdl<return_type>(
-      internal::invoke_argument::AdlTag(),
-      ::std::get<k>(args), p0, p1, p2, p3, p4, p5, p6);
-}
-
-ACTION_TEMPLATE(InvokeArgument,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7)) {
-  using internal::invoke_argument::InvokeArgumentAdl;
-  return InvokeArgumentAdl<return_type>(
-      internal::invoke_argument::AdlTag(),
-      ::std::get<k>(args), p0, p1, p2, p3, p4, p5, p6, p7);
-}
-
-ACTION_TEMPLATE(InvokeArgument,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7, p8)) {
-  using internal::invoke_argument::InvokeArgumentAdl;
-  return InvokeArgumentAdl<return_type>(
-      internal::invoke_argument::AdlTag(),
-      ::std::get<k>(args), p0, p1, p2, p3, p4, p5, p6, p7, p8);
-}
-
-ACTION_TEMPLATE(InvokeArgument,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9)) {
-  using internal::invoke_argument::InvokeArgumentAdl;
-  return InvokeArgumentAdl<return_type>(
-      internal::invoke_argument::AdlTag(),
-      ::std::get<k>(args), p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
-}
-
-// Various overloads for ReturnNew<T>().
-//
-// The ReturnNew<T>(a1, a2, ..., a_k) action returns a pointer to a new
-// instance of type T, constructed on the heap with constructor arguments
-// a1, a2, ..., and a_k. The caller assumes ownership of the returned value.
-ACTION_TEMPLATE(ReturnNew,
-                HAS_1_TEMPLATE_PARAMS(typename, T),
-                AND_0_VALUE_PARAMS()) {
-  return new T();
-}
-
-ACTION_TEMPLATE(ReturnNew,
-                HAS_1_TEMPLATE_PARAMS(typename, T),
-                AND_1_VALUE_PARAMS(p0)) {
-  return new T(p0);
-}
-
-ACTION_TEMPLATE(ReturnNew,
-                HAS_1_TEMPLATE_PARAMS(typename, T),
-                AND_2_VALUE_PARAMS(p0, p1)) {
-  return new T(p0, p1);
-}
-
-ACTION_TEMPLATE(ReturnNew,
-                HAS_1_TEMPLATE_PARAMS(typename, T),
-                AND_3_VALUE_PARAMS(p0, p1, p2)) {
-  return new T(p0, p1, p2);
-}
-
-ACTION_TEMPLATE(ReturnNew,
-                HAS_1_TEMPLATE_PARAMS(typename, T),
-                AND_4_VALUE_PARAMS(p0, p1, p2, p3)) {
-  return new T(p0, p1, p2, p3);
-}
-
-ACTION_TEMPLATE(ReturnNew,
-                HAS_1_TEMPLATE_PARAMS(typename, T),
-                AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4)) {
-  return new T(p0, p1, p2, p3, p4);
-}
-
-ACTION_TEMPLATE(ReturnNew,
-                HAS_1_TEMPLATE_PARAMS(typename, T),
-                AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5)) {
-  return new T(p0, p1, p2, p3, p4, p5);
-}
-
-ACTION_TEMPLATE(ReturnNew,
-                HAS_1_TEMPLATE_PARAMS(typename, T),
-                AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6)) {
-  return new T(p0, p1, p2, p3, p4, p5, p6);
-}
-
-ACTION_TEMPLATE(ReturnNew,
-                HAS_1_TEMPLATE_PARAMS(typename, T),
-                AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7)) {
-  return new T(p0, p1, p2, p3, p4, p5, p6, p7);
-}
-
-ACTION_TEMPLATE(ReturnNew,
-                HAS_1_TEMPLATE_PARAMS(typename, T),
-                AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7, p8)) {
-  return new T(p0, p1, p2, p3, p4, p5, p6, p7, p8);
-}
-
-ACTION_TEMPLATE(ReturnNew,
-                HAS_1_TEMPLATE_PARAMS(typename, T),
-                AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9)) {
-  return new T(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
-}
-
-#ifdef _MSC_VER
-# pragma warning(pop)
-#endif
-
-}  // namespace testing
-
-// Include any custom callback actions added by the local installation.
-// We must include this header at the end to make sure it can use the
-// declarations from this file.
-#include "gmock/internal/custom/gmock-generated-actions.h"
-
-#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-generated-function-mockers.h b/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-generated-function-mockers.h
deleted file mode 100644
index d131bea8158..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-generated-function-mockers.h
+++ /dev/null
@@ -1,754 +0,0 @@
-// This file was GENERATED by command:
-//     pump.py gmock-generated-function-mockers.h.pump
-// DO NOT EDIT BY HAND!!!
-
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file implements function mockers of various arities.
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-// IWYU pragma: private, include "gmock/gmock.h"
-
-#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_
-#define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_
-
-#include <functional>
-#include <utility>
-
-#include "gmock/gmock-spec-builders.h"
-#include "gmock/internal/gmock-internal-utils.h"
-
-namespace testing {
-namespace internal {
-// Removes the given pointer; this is a helper for the expectation setter method
-// for parameterless matchers.
-//
-// We want to make sure that the user cannot set a parameterless expectation on
-// overloaded methods, including methods which are overloaded on const. Example:
-//
-//   class MockClass {
-//     MOCK_METHOD0(GetName, string&());
-//     MOCK_CONST_METHOD0(GetName, const string&());
-//   };
-//
-//   TEST() {
-//     // This should be an error, as it's not clear which overload is expected.
-//     EXPECT_CALL(mock, GetName).WillOnce(ReturnRef(value));
-//   }
-//
-// Here are the generated expectation-setter methods:
-//
-//   class MockClass {
-//     // Overload 1
-//     MockSpec<string&()> gmock_GetName() { ... }
-//     // Overload 2. Declared const so that the compiler will generate an
-//     // error when trying to resolve between this and overload 4 in
-//     // 'gmock_GetName(WithoutMatchers(), nullptr)'.
-//     MockSpec<string&()> gmock_GetName(
-//         const WithoutMatchers&, const Function<string&()>*) const {
-//       // Removes const from this, calls overload 1
-//       return AdjustConstness_(this)->gmock_GetName();
-//     }
-//
-//     // Overload 3
-//     const string& gmock_GetName() const { ... }
-//     // Overload 4
-//     MockSpec<const string&()> gmock_GetName(
-//         const WithoutMatchers&, const Function<const string&()>*) const {
-//       // Does not remove const, calls overload 3
-//       return AdjustConstness_const(this)->gmock_GetName();
-//     }
-//   }
-//
-template <typename MockType>
-const MockType* AdjustConstness_const(const MockType* mock) {
-  return mock;
-}
-
-// Removes const from and returns the given pointer; this is a helper for the
-// expectation setter method for parameterless matchers.
-template <typename MockType>
-MockType* AdjustConstness_(const MockType* mock) {
-  return const_cast<MockType*>(mock);
-}
-
-}  // namespace internal
-
-// The style guide prohibits "using" statements in a namespace scope
-// inside a header file.  However, the FunctionMocker class template
-// is meant to be defined in the ::testing namespace.  The following
-// line is just a trick for working around a bug in MSVC 8.0, which
-// cannot handle it if we define FunctionMocker in ::testing.
-using internal::FunctionMocker;
-
-// GMOCK_RESULT_(tn, F) expands to the result type of function type F.
-// We define this as a variadic macro in case F contains unprotected
-// commas (the same reason that we use variadic macros in other places
-// in this file).
-// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
-#define GMOCK_RESULT_(tn, ...) \
-    tn ::testing::internal::Function<__VA_ARGS__>::Result
-
-// The type of argument N of the given function type.
-// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
-#define GMOCK_ARG_(tn, N, ...) \
-    tn ::testing::internal::Function<__VA_ARGS__>::template Arg<N-1>::type
-
-// The matcher type for argument N of the given function type.
-// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
-#define GMOCK_MATCHER_(tn, N, ...) \
-    const ::testing::Matcher<GMOCK_ARG_(tn, N, __VA_ARGS__)>&
-
-// The variable for mocking the given method.
-// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
-#define GMOCK_MOCKER_(arity, constness, Method) \
-    GTEST_CONCAT_TOKEN_(gmock##constness##arity##_##Method##_, __LINE__)
-
-// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
-#define GMOCK_METHOD0_(tn, constness, ct, Method, ...) \
-  static_assert(0 == \
-      ::testing::internal::Function<__VA_ARGS__>::ArgumentCount, \
-      "MOCK_METHOD<N> must match argument count.");\
-  GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \
-      ) constness { \
-    GMOCK_MOCKER_(0, constness, Method).SetOwnerAndName(this, #Method); \
-    return GMOCK_MOCKER_(0, constness, Method).Invoke(); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> \
-      gmock_##Method() constness { \
-    GMOCK_MOCKER_(0, constness, Method).RegisterOwner(this); \
-    return GMOCK_MOCKER_(0, constness, Method).With(); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> gmock_##Method( \
-      const ::testing::internal::WithoutMatchers&, \
-      constness ::testing::internal::Function<__VA_ARGS__>* ) const { \
-        return ::testing::internal::AdjustConstness_##constness(this)-> \
-            gmock_##Method(); \
-      } \
-  mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_MOCKER_(0, constness, \
-      Method)
-
-// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
-#define GMOCK_METHOD1_(tn, constness, ct, Method, ...) \
-  static_assert(1 == \
-      ::testing::internal::Function<__VA_ARGS__>::ArgumentCount, \
-      "MOCK_METHOD<N> must match argument count.");\
-  GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \
-      GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1) constness { \
-    GMOCK_MOCKER_(1, constness, Method).SetOwnerAndName(this, #Method); \
-    return GMOCK_MOCKER_(1, constness, \
-        Method).Invoke(::std::forward<GMOCK_ARG_(tn, 1, \
-        __VA_ARGS__)>(gmock_a1)); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> \
-      gmock_##Method(GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1) constness { \
-    GMOCK_MOCKER_(1, constness, Method).RegisterOwner(this); \
-    return GMOCK_MOCKER_(1, constness, Method).With(gmock_a1); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> gmock_##Method( \
-      const ::testing::internal::WithoutMatchers&, \
-      constness ::testing::internal::Function<__VA_ARGS__>* ) const { \
-        return ::testing::internal::AdjustConstness_##constness(this)-> \
-            gmock_##Method(::testing::A<GMOCK_ARG_(tn, 1, __VA_ARGS__)>()); \
-      } \
-  mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_MOCKER_(1, constness, \
-      Method)
-
-// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
-#define GMOCK_METHOD2_(tn, constness, ct, Method, ...) \
-  static_assert(2 == \
-      ::testing::internal::Function<__VA_ARGS__>::ArgumentCount, \
-      "MOCK_METHOD<N> must match argument count.");\
-  GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \
-      GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1, GMOCK_ARG_(tn, 2, \
-          __VA_ARGS__) gmock_a2) constness { \
-    GMOCK_MOCKER_(2, constness, Method).SetOwnerAndName(this, #Method); \
-    return GMOCK_MOCKER_(2, constness, \
-        Method).Invoke(::std::forward<GMOCK_ARG_(tn, 1, \
-        __VA_ARGS__)>(gmock_a1), \
-  ::std::forward<GMOCK_ARG_(tn, 2, __VA_ARGS__)>(gmock_a2)); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> \
-      gmock_##Method(GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1, \
-                     GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2) constness { \
-    GMOCK_MOCKER_(2, constness, Method).RegisterOwner(this); \
-    return GMOCK_MOCKER_(2, constness, Method).With(gmock_a1, gmock_a2); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> gmock_##Method( \
-      const ::testing::internal::WithoutMatchers&, \
-      constness ::testing::internal::Function<__VA_ARGS__>* ) const { \
-        return ::testing::internal::AdjustConstness_##constness(this)-> \
-            gmock_##Method(::testing::A<GMOCK_ARG_(tn, 1, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 2, __VA_ARGS__)>()); \
-      } \
-  mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_MOCKER_(2, constness, \
-      Method)
-
-// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
-#define GMOCK_METHOD3_(tn, constness, ct, Method, ...) \
-  static_assert(3 == \
-      ::testing::internal::Function<__VA_ARGS__>::ArgumentCount, \
-      "MOCK_METHOD<N> must match argument count.");\
-  GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \
-      GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1, GMOCK_ARG_(tn, 2, \
-          __VA_ARGS__) gmock_a2, GMOCK_ARG_(tn, 3, \
-          __VA_ARGS__) gmock_a3) constness { \
-    GMOCK_MOCKER_(3, constness, Method).SetOwnerAndName(this, #Method); \
-    return GMOCK_MOCKER_(3, constness, \
-        Method).Invoke(::std::forward<GMOCK_ARG_(tn, 1, \
-        __VA_ARGS__)>(gmock_a1), \
-  ::std::forward<GMOCK_ARG_(tn, 2, __VA_ARGS__)>(gmock_a2), \
-  ::std::forward<GMOCK_ARG_(tn, 3, __VA_ARGS__)>(gmock_a3)); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> \
-      gmock_##Method(GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1, \
-                     GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2, \
-                     GMOCK_MATCHER_(tn, 3, __VA_ARGS__) gmock_a3) constness { \
-    GMOCK_MOCKER_(3, constness, Method).RegisterOwner(this); \
-    return GMOCK_MOCKER_(3, constness, Method).With(gmock_a1, gmock_a2, \
-        gmock_a3); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> gmock_##Method( \
-      const ::testing::internal::WithoutMatchers&, \
-      constness ::testing::internal::Function<__VA_ARGS__>* ) const { \
-        return ::testing::internal::AdjustConstness_##constness(this)-> \
-            gmock_##Method(::testing::A<GMOCK_ARG_(tn, 1, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 2, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 3, __VA_ARGS__)>()); \
-      } \
-  mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_MOCKER_(3, constness, \
-      Method)
-
-// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
-#define GMOCK_METHOD4_(tn, constness, ct, Method, ...) \
-  static_assert(4 == \
-      ::testing::internal::Function<__VA_ARGS__>::ArgumentCount, \
-      "MOCK_METHOD<N> must match argument count.");\
-  GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \
-      GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1, GMOCK_ARG_(tn, 2, \
-          __VA_ARGS__) gmock_a2, GMOCK_ARG_(tn, 3, __VA_ARGS__) gmock_a3, \
-          GMOCK_ARG_(tn, 4, __VA_ARGS__) gmock_a4) constness { \
-    GMOCK_MOCKER_(4, constness, Method).SetOwnerAndName(this, #Method); \
-    return GMOCK_MOCKER_(4, constness, \
-        Method).Invoke(::std::forward<GMOCK_ARG_(tn, 1, \
-        __VA_ARGS__)>(gmock_a1), \
-  ::std::forward<GMOCK_ARG_(tn, 2, __VA_ARGS__)>(gmock_a2), \
-  ::std::forward<GMOCK_ARG_(tn, 3, __VA_ARGS__)>(gmock_a3), \
-  ::std::forward<GMOCK_ARG_(tn, 4, __VA_ARGS__)>(gmock_a4)); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> \
-      gmock_##Method(GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1, \
-                     GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2, \
-                     GMOCK_MATCHER_(tn, 3, __VA_ARGS__) gmock_a3, \
-                     GMOCK_MATCHER_(tn, 4, __VA_ARGS__) gmock_a4) constness { \
-    GMOCK_MOCKER_(4, constness, Method).RegisterOwner(this); \
-    return GMOCK_MOCKER_(4, constness, Method).With(gmock_a1, gmock_a2, \
-        gmock_a3, gmock_a4); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> gmock_##Method( \
-      const ::testing::internal::WithoutMatchers&, \
-      constness ::testing::internal::Function<__VA_ARGS__>* ) const { \
-        return ::testing::internal::AdjustConstness_##constness(this)-> \
-            gmock_##Method(::testing::A<GMOCK_ARG_(tn, 1, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 2, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 3, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 4, __VA_ARGS__)>()); \
-      } \
-  mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_MOCKER_(4, constness, \
-      Method)
-
-// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
-#define GMOCK_METHOD5_(tn, constness, ct, Method, ...) \
-  static_assert(5 == \
-      ::testing::internal::Function<__VA_ARGS__>::ArgumentCount, \
-      "MOCK_METHOD<N> must match argument count.");\
-  GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \
-      GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1, GMOCK_ARG_(tn, 2, \
-          __VA_ARGS__) gmock_a2, GMOCK_ARG_(tn, 3, __VA_ARGS__) gmock_a3, \
-          GMOCK_ARG_(tn, 4, __VA_ARGS__) gmock_a4, GMOCK_ARG_(tn, 5, \
-          __VA_ARGS__) gmock_a5) constness { \
-    GMOCK_MOCKER_(5, constness, Method).SetOwnerAndName(this, #Method); \
-    return GMOCK_MOCKER_(5, constness, \
-        Method).Invoke(::std::forward<GMOCK_ARG_(tn, 1, \
-        __VA_ARGS__)>(gmock_a1), \
-  ::std::forward<GMOCK_ARG_(tn, 2, __VA_ARGS__)>(gmock_a2), \
-  ::std::forward<GMOCK_ARG_(tn, 3, __VA_ARGS__)>(gmock_a3), \
-  ::std::forward<GMOCK_ARG_(tn, 4, __VA_ARGS__)>(gmock_a4), \
-  ::std::forward<GMOCK_ARG_(tn, 5, __VA_ARGS__)>(gmock_a5)); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> \
-      gmock_##Method(GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1, \
-                     GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2, \
-                     GMOCK_MATCHER_(tn, 3, __VA_ARGS__) gmock_a3, \
-                     GMOCK_MATCHER_(tn, 4, __VA_ARGS__) gmock_a4, \
-                     GMOCK_MATCHER_(tn, 5, __VA_ARGS__) gmock_a5) constness { \
-    GMOCK_MOCKER_(5, constness, Method).RegisterOwner(this); \
-    return GMOCK_MOCKER_(5, constness, Method).With(gmock_a1, gmock_a2, \
-        gmock_a3, gmock_a4, gmock_a5); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> gmock_##Method( \
-      const ::testing::internal::WithoutMatchers&, \
-      constness ::testing::internal::Function<__VA_ARGS__>* ) const { \
-        return ::testing::internal::AdjustConstness_##constness(this)-> \
-            gmock_##Method(::testing::A<GMOCK_ARG_(tn, 1, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 2, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 3, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 4, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 5, __VA_ARGS__)>()); \
-      } \
-  mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_MOCKER_(5, constness, \
-      Method)
-
-// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
-#define GMOCK_METHOD6_(tn, constness, ct, Method, ...) \
-  static_assert(6 == \
-      ::testing::internal::Function<__VA_ARGS__>::ArgumentCount, \
-      "MOCK_METHOD<N> must match argument count.");\
-  GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \
-      GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1, GMOCK_ARG_(tn, 2, \
-          __VA_ARGS__) gmock_a2, GMOCK_ARG_(tn, 3, __VA_ARGS__) gmock_a3, \
-          GMOCK_ARG_(tn, 4, __VA_ARGS__) gmock_a4, GMOCK_ARG_(tn, 5, \
-          __VA_ARGS__) gmock_a5, GMOCK_ARG_(tn, 6, \
-          __VA_ARGS__) gmock_a6) constness { \
-    GMOCK_MOCKER_(6, constness, Method).SetOwnerAndName(this, #Method); \
-    return GMOCK_MOCKER_(6, constness, \
-        Method).Invoke(::std::forward<GMOCK_ARG_(tn, 1, \
-        __VA_ARGS__)>(gmock_a1), \
-  ::std::forward<GMOCK_ARG_(tn, 2, __VA_ARGS__)>(gmock_a2), \
-  ::std::forward<GMOCK_ARG_(tn, 3, __VA_ARGS__)>(gmock_a3), \
-  ::std::forward<GMOCK_ARG_(tn, 4, __VA_ARGS__)>(gmock_a4), \
-  ::std::forward<GMOCK_ARG_(tn, 5, __VA_ARGS__)>(gmock_a5), \
-  ::std::forward<GMOCK_ARG_(tn, 6, __VA_ARGS__)>(gmock_a6)); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> \
-      gmock_##Method(GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1, \
-                     GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2, \
-                     GMOCK_MATCHER_(tn, 3, __VA_ARGS__) gmock_a3, \
-                     GMOCK_MATCHER_(tn, 4, __VA_ARGS__) gmock_a4, \
-                     GMOCK_MATCHER_(tn, 5, __VA_ARGS__) gmock_a5, \
-                     GMOCK_MATCHER_(tn, 6, __VA_ARGS__) gmock_a6) constness { \
-    GMOCK_MOCKER_(6, constness, Method).RegisterOwner(this); \
-    return GMOCK_MOCKER_(6, constness, Method).With(gmock_a1, gmock_a2, \
-        gmock_a3, gmock_a4, gmock_a5, gmock_a6); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> gmock_##Method( \
-      const ::testing::internal::WithoutMatchers&, \
-      constness ::testing::internal::Function<__VA_ARGS__>* ) const { \
-        return ::testing::internal::AdjustConstness_##constness(this)-> \
-            gmock_##Method(::testing::A<GMOCK_ARG_(tn, 1, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 2, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 3, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 4, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 5, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 6, __VA_ARGS__)>()); \
-      } \
-  mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_MOCKER_(6, constness, \
-      Method)
-
-// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
-#define GMOCK_METHOD7_(tn, constness, ct, Method, ...) \
-  static_assert(7 == \
-      ::testing::internal::Function<__VA_ARGS__>::ArgumentCount, \
-      "MOCK_METHOD<N> must match argument count.");\
-  GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \
-      GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1, GMOCK_ARG_(tn, 2, \
-          __VA_ARGS__) gmock_a2, GMOCK_ARG_(tn, 3, __VA_ARGS__) gmock_a3, \
-          GMOCK_ARG_(tn, 4, __VA_ARGS__) gmock_a4, GMOCK_ARG_(tn, 5, \
-          __VA_ARGS__) gmock_a5, GMOCK_ARG_(tn, 6, __VA_ARGS__) gmock_a6, \
-          GMOCK_ARG_(tn, 7, __VA_ARGS__) gmock_a7) constness { \
-    GMOCK_MOCKER_(7, constness, Method).SetOwnerAndName(this, #Method); \
-    return GMOCK_MOCKER_(7, constness, \
-        Method).Invoke(::std::forward<GMOCK_ARG_(tn, 1, \
-        __VA_ARGS__)>(gmock_a1), \
-  ::std::forward<GMOCK_ARG_(tn, 2, __VA_ARGS__)>(gmock_a2), \
-  ::std::forward<GMOCK_ARG_(tn, 3, __VA_ARGS__)>(gmock_a3), \
-  ::std::forward<GMOCK_ARG_(tn, 4, __VA_ARGS__)>(gmock_a4), \
-  ::std::forward<GMOCK_ARG_(tn, 5, __VA_ARGS__)>(gmock_a5), \
-  ::std::forward<GMOCK_ARG_(tn, 6, __VA_ARGS__)>(gmock_a6), \
-  ::std::forward<GMOCK_ARG_(tn, 7, __VA_ARGS__)>(gmock_a7)); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> \
-      gmock_##Method(GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1, \
-                     GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2, \
-                     GMOCK_MATCHER_(tn, 3, __VA_ARGS__) gmock_a3, \
-                     GMOCK_MATCHER_(tn, 4, __VA_ARGS__) gmock_a4, \
-                     GMOCK_MATCHER_(tn, 5, __VA_ARGS__) gmock_a5, \
-                     GMOCK_MATCHER_(tn, 6, __VA_ARGS__) gmock_a6, \
-                     GMOCK_MATCHER_(tn, 7, __VA_ARGS__) gmock_a7) constness { \
-    GMOCK_MOCKER_(7, constness, Method).RegisterOwner(this); \
-    return GMOCK_MOCKER_(7, constness, Method).With(gmock_a1, gmock_a2, \
-        gmock_a3, gmock_a4, gmock_a5, gmock_a6, gmock_a7); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> gmock_##Method( \
-      const ::testing::internal::WithoutMatchers&, \
-      constness ::testing::internal::Function<__VA_ARGS__>* ) const { \
-        return ::testing::internal::AdjustConstness_##constness(this)-> \
-            gmock_##Method(::testing::A<GMOCK_ARG_(tn, 1, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 2, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 3, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 4, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 5, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 6, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 7, __VA_ARGS__)>()); \
-      } \
-  mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_MOCKER_(7, constness, \
-      Method)
-
-// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
-#define GMOCK_METHOD8_(tn, constness, ct, Method, ...) \
-  static_assert(8 == \
-      ::testing::internal::Function<__VA_ARGS__>::ArgumentCount, \
-      "MOCK_METHOD<N> must match argument count.");\
-  GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \
-      GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1, GMOCK_ARG_(tn, 2, \
-          __VA_ARGS__) gmock_a2, GMOCK_ARG_(tn, 3, __VA_ARGS__) gmock_a3, \
-          GMOCK_ARG_(tn, 4, __VA_ARGS__) gmock_a4, GMOCK_ARG_(tn, 5, \
-          __VA_ARGS__) gmock_a5, GMOCK_ARG_(tn, 6, __VA_ARGS__) gmock_a6, \
-          GMOCK_ARG_(tn, 7, __VA_ARGS__) gmock_a7, GMOCK_ARG_(tn, 8, \
-          __VA_ARGS__) gmock_a8) constness { \
-    GMOCK_MOCKER_(8, constness, Method).SetOwnerAndName(this, #Method); \
-    return GMOCK_MOCKER_(8, constness, \
-        Method).Invoke(::std::forward<GMOCK_ARG_(tn, 1, \
-        __VA_ARGS__)>(gmock_a1), \
-  ::std::forward<GMOCK_ARG_(tn, 2, __VA_ARGS__)>(gmock_a2), \
-  ::std::forward<GMOCK_ARG_(tn, 3, __VA_ARGS__)>(gmock_a3), \
-  ::std::forward<GMOCK_ARG_(tn, 4, __VA_ARGS__)>(gmock_a4), \
-  ::std::forward<GMOCK_ARG_(tn, 5, __VA_ARGS__)>(gmock_a5), \
-  ::std::forward<GMOCK_ARG_(tn, 6, __VA_ARGS__)>(gmock_a6), \
-  ::std::forward<GMOCK_ARG_(tn, 7, __VA_ARGS__)>(gmock_a7), \
-  ::std::forward<GMOCK_ARG_(tn, 8, __VA_ARGS__)>(gmock_a8)); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> \
-      gmock_##Method(GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1, \
-                     GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2, \
-                     GMOCK_MATCHER_(tn, 3, __VA_ARGS__) gmock_a3, \
-                     GMOCK_MATCHER_(tn, 4, __VA_ARGS__) gmock_a4, \
-                     GMOCK_MATCHER_(tn, 5, __VA_ARGS__) gmock_a5, \
-                     GMOCK_MATCHER_(tn, 6, __VA_ARGS__) gmock_a6, \
-                     GMOCK_MATCHER_(tn, 7, __VA_ARGS__) gmock_a7, \
-                     GMOCK_MATCHER_(tn, 8, __VA_ARGS__) gmock_a8) constness { \
-    GMOCK_MOCKER_(8, constness, Method).RegisterOwner(this); \
-    return GMOCK_MOCKER_(8, constness, Method).With(gmock_a1, gmock_a2, \
-        gmock_a3, gmock_a4, gmock_a5, gmock_a6, gmock_a7, gmock_a8); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> gmock_##Method( \
-      const ::testing::internal::WithoutMatchers&, \
-      constness ::testing::internal::Function<__VA_ARGS__>* ) const { \
-        return ::testing::internal::AdjustConstness_##constness(this)-> \
-            gmock_##Method(::testing::A<GMOCK_ARG_(tn, 1, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 2, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 3, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 4, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 5, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 6, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 7, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 8, __VA_ARGS__)>()); \
-      } \
-  mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_MOCKER_(8, constness, \
-      Method)
-
-// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
-#define GMOCK_METHOD9_(tn, constness, ct, Method, ...) \
-  static_assert(9 == \
-      ::testing::internal::Function<__VA_ARGS__>::ArgumentCount, \
-      "MOCK_METHOD<N> must match argument count.");\
-  GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \
-      GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1, GMOCK_ARG_(tn, 2, \
-          __VA_ARGS__) gmock_a2, GMOCK_ARG_(tn, 3, __VA_ARGS__) gmock_a3, \
-          GMOCK_ARG_(tn, 4, __VA_ARGS__) gmock_a4, GMOCK_ARG_(tn, 5, \
-          __VA_ARGS__) gmock_a5, GMOCK_ARG_(tn, 6, __VA_ARGS__) gmock_a6, \
-          GMOCK_ARG_(tn, 7, __VA_ARGS__) gmock_a7, GMOCK_ARG_(tn, 8, \
-          __VA_ARGS__) gmock_a8, GMOCK_ARG_(tn, 9, \
-          __VA_ARGS__) gmock_a9) constness { \
-    GMOCK_MOCKER_(9, constness, Method).SetOwnerAndName(this, #Method); \
-    return GMOCK_MOCKER_(9, constness, \
-        Method).Invoke(::std::forward<GMOCK_ARG_(tn, 1, \
-        __VA_ARGS__)>(gmock_a1), \
-  ::std::forward<GMOCK_ARG_(tn, 2, __VA_ARGS__)>(gmock_a2), \
-  ::std::forward<GMOCK_ARG_(tn, 3, __VA_ARGS__)>(gmock_a3), \
-  ::std::forward<GMOCK_ARG_(tn, 4, __VA_ARGS__)>(gmock_a4), \
-  ::std::forward<GMOCK_ARG_(tn, 5, __VA_ARGS__)>(gmock_a5), \
-  ::std::forward<GMOCK_ARG_(tn, 6, __VA_ARGS__)>(gmock_a6), \
-  ::std::forward<GMOCK_ARG_(tn, 7, __VA_ARGS__)>(gmock_a7), \
-  ::std::forward<GMOCK_ARG_(tn, 8, __VA_ARGS__)>(gmock_a8), \
-  ::std::forward<GMOCK_ARG_(tn, 9, __VA_ARGS__)>(gmock_a9)); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> \
-      gmock_##Method(GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1, \
-                     GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2, \
-                     GMOCK_MATCHER_(tn, 3, __VA_ARGS__) gmock_a3, \
-                     GMOCK_MATCHER_(tn, 4, __VA_ARGS__) gmock_a4, \
-                     GMOCK_MATCHER_(tn, 5, __VA_ARGS__) gmock_a5, \
-                     GMOCK_MATCHER_(tn, 6, __VA_ARGS__) gmock_a6, \
-                     GMOCK_MATCHER_(tn, 7, __VA_ARGS__) gmock_a7, \
-                     GMOCK_MATCHER_(tn, 8, __VA_ARGS__) gmock_a8, \
-                     GMOCK_MATCHER_(tn, 9, __VA_ARGS__) gmock_a9) constness { \
-    GMOCK_MOCKER_(9, constness, Method).RegisterOwner(this); \
-    return GMOCK_MOCKER_(9, constness, Method).With(gmock_a1, gmock_a2, \
-        gmock_a3, gmock_a4, gmock_a5, gmock_a6, gmock_a7, gmock_a8, \
-        gmock_a9); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> gmock_##Method( \
-      const ::testing::internal::WithoutMatchers&, \
-      constness ::testing::internal::Function<__VA_ARGS__>* ) const { \
-        return ::testing::internal::AdjustConstness_##constness(this)-> \
-            gmock_##Method(::testing::A<GMOCK_ARG_(tn, 1, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 2, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 3, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 4, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 5, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 6, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 7, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 8, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 9, __VA_ARGS__)>()); \
-      } \
-  mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_MOCKER_(9, constness, \
-      Method)
-
-// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
-#define GMOCK_METHOD10_(tn, constness, ct, Method, ...) \
-  static_assert(10 == \
-      ::testing::internal::Function<__VA_ARGS__>::ArgumentCount, \
-      "MOCK_METHOD<N> must match argument count.");\
-  GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \
-      GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1, GMOCK_ARG_(tn, 2, \
-          __VA_ARGS__) gmock_a2, GMOCK_ARG_(tn, 3, __VA_ARGS__) gmock_a3, \
-          GMOCK_ARG_(tn, 4, __VA_ARGS__) gmock_a4, GMOCK_ARG_(tn, 5, \
-          __VA_ARGS__) gmock_a5, GMOCK_ARG_(tn, 6, __VA_ARGS__) gmock_a6, \
-          GMOCK_ARG_(tn, 7, __VA_ARGS__) gmock_a7, GMOCK_ARG_(tn, 8, \
-          __VA_ARGS__) gmock_a8, GMOCK_ARG_(tn, 9, __VA_ARGS__) gmock_a9, \
-          GMOCK_ARG_(tn, 10, __VA_ARGS__) gmock_a10) constness { \
-    GMOCK_MOCKER_(10, constness, Method).SetOwnerAndName(this, #Method); \
-    return GMOCK_MOCKER_(10, constness, \
-        Method).Invoke(::std::forward<GMOCK_ARG_(tn, 1, \
-        __VA_ARGS__)>(gmock_a1), \
-  ::std::forward<GMOCK_ARG_(tn, 2, __VA_ARGS__)>(gmock_a2), \
-  ::std::forward<GMOCK_ARG_(tn, 3, __VA_ARGS__)>(gmock_a3), \
-  ::std::forward<GMOCK_ARG_(tn, 4, __VA_ARGS__)>(gmock_a4), \
-  ::std::forward<GMOCK_ARG_(tn, 5, __VA_ARGS__)>(gmock_a5), \
-  ::std::forward<GMOCK_ARG_(tn, 6, __VA_ARGS__)>(gmock_a6), \
-  ::std::forward<GMOCK_ARG_(tn, 7, __VA_ARGS__)>(gmock_a7), \
-  ::std::forward<GMOCK_ARG_(tn, 8, __VA_ARGS__)>(gmock_a8), \
-  ::std::forward<GMOCK_ARG_(tn, 9, __VA_ARGS__)>(gmock_a9), \
-  ::std::forward<GMOCK_ARG_(tn, 10, __VA_ARGS__)>(gmock_a10)); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> \
-      gmock_##Method(GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1, \
-                     GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2, \
-                     GMOCK_MATCHER_(tn, 3, __VA_ARGS__) gmock_a3, \
-                     GMOCK_MATCHER_(tn, 4, __VA_ARGS__) gmock_a4, \
-                     GMOCK_MATCHER_(tn, 5, __VA_ARGS__) gmock_a5, \
-                     GMOCK_MATCHER_(tn, 6, __VA_ARGS__) gmock_a6, \
-                     GMOCK_MATCHER_(tn, 7, __VA_ARGS__) gmock_a7, \
-                     GMOCK_MATCHER_(tn, 8, __VA_ARGS__) gmock_a8, \
-                     GMOCK_MATCHER_(tn, 9, __VA_ARGS__) gmock_a9, \
-                     GMOCK_MATCHER_(tn, 10, \
-                         __VA_ARGS__) gmock_a10) constness { \
-    GMOCK_MOCKER_(10, constness, Method).RegisterOwner(this); \
-    return GMOCK_MOCKER_(10, constness, Method).With(gmock_a1, gmock_a2, \
-        gmock_a3, gmock_a4, gmock_a5, gmock_a6, gmock_a7, gmock_a8, gmock_a9, \
-        gmock_a10); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> gmock_##Method( \
-      const ::testing::internal::WithoutMatchers&, \
-      constness ::testing::internal::Function<__VA_ARGS__>* ) const { \
-        return ::testing::internal::AdjustConstness_##constness(this)-> \
-            gmock_##Method(::testing::A<GMOCK_ARG_(tn, 1, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 2, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 3, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 4, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 5, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 6, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 7, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 8, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 9, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 10, __VA_ARGS__)>()); \
-      } \
-  mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_MOCKER_(10, constness, \
-      Method)
-
-#define MOCK_METHOD0(m, ...) GMOCK_METHOD0_(, , , m, __VA_ARGS__)
-#define MOCK_METHOD1(m, ...) GMOCK_METHOD1_(, , , m, __VA_ARGS__)
-#define MOCK_METHOD2(m, ...) GMOCK_METHOD2_(, , , m, __VA_ARGS__)
-#define MOCK_METHOD3(m, ...) GMOCK_METHOD3_(, , , m, __VA_ARGS__)
-#define MOCK_METHOD4(m, ...) GMOCK_METHOD4_(, , , m, __VA_ARGS__)
-#define MOCK_METHOD5(m, ...) GMOCK_METHOD5_(, , , m, __VA_ARGS__)
-#define MOCK_METHOD6(m, ...) GMOCK_METHOD6_(, , , m, __VA_ARGS__)
-#define MOCK_METHOD7(m, ...) GMOCK_METHOD7_(, , , m, __VA_ARGS__)
-#define MOCK_METHOD8(m, ...) GMOCK_METHOD8_(, , , m, __VA_ARGS__)
-#define MOCK_METHOD9(m, ...) GMOCK_METHOD9_(, , , m, __VA_ARGS__)
-#define MOCK_METHOD10(m, ...) GMOCK_METHOD10_(, , , m, __VA_ARGS__)
-
-#define MOCK_CONST_METHOD0(m, ...) GMOCK_METHOD0_(, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD1(m, ...) GMOCK_METHOD1_(, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD2(m, ...) GMOCK_METHOD2_(, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD3(m, ...) GMOCK_METHOD3_(, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD4(m, ...) GMOCK_METHOD4_(, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD5(m, ...) GMOCK_METHOD5_(, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD6(m, ...) GMOCK_METHOD6_(, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD7(m, ...) GMOCK_METHOD7_(, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD8(m, ...) GMOCK_METHOD8_(, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD9(m, ...) GMOCK_METHOD9_(, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD10(m, ...) GMOCK_METHOD10_(, const, , m, __VA_ARGS__)
-
-#define MOCK_METHOD0_T(m, ...) GMOCK_METHOD0_(typename, , , m, __VA_ARGS__)
-#define MOCK_METHOD1_T(m, ...) GMOCK_METHOD1_(typename, , , m, __VA_ARGS__)
-#define MOCK_METHOD2_T(m, ...) GMOCK_METHOD2_(typename, , , m, __VA_ARGS__)
-#define MOCK_METHOD3_T(m, ...) GMOCK_METHOD3_(typename, , , m, __VA_ARGS__)
-#define MOCK_METHOD4_T(m, ...) GMOCK_METHOD4_(typename, , , m, __VA_ARGS__)
-#define MOCK_METHOD5_T(m, ...) GMOCK_METHOD5_(typename, , , m, __VA_ARGS__)
-#define MOCK_METHOD6_T(m, ...) GMOCK_METHOD6_(typename, , , m, __VA_ARGS__)
-#define MOCK_METHOD7_T(m, ...) GMOCK_METHOD7_(typename, , , m, __VA_ARGS__)
-#define MOCK_METHOD8_T(m, ...) GMOCK_METHOD8_(typename, , , m, __VA_ARGS__)
-#define MOCK_METHOD9_T(m, ...) GMOCK_METHOD9_(typename, , , m, __VA_ARGS__)
-#define MOCK_METHOD10_T(m, ...) GMOCK_METHOD10_(typename, , , m, __VA_ARGS__)
-
-#define MOCK_CONST_METHOD0_T(m, ...) \
-    GMOCK_METHOD0_(typename, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD1_T(m, ...) \
-    GMOCK_METHOD1_(typename, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD2_T(m, ...) \
-    GMOCK_METHOD2_(typename, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD3_T(m, ...) \
-    GMOCK_METHOD3_(typename, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD4_T(m, ...) \
-    GMOCK_METHOD4_(typename, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD5_T(m, ...) \
-    GMOCK_METHOD5_(typename, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD6_T(m, ...) \
-    GMOCK_METHOD6_(typename, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD7_T(m, ...) \
-    GMOCK_METHOD7_(typename, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD8_T(m, ...) \
-    GMOCK_METHOD8_(typename, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD9_T(m, ...) \
-    GMOCK_METHOD9_(typename, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD10_T(m, ...) \
-    GMOCK_METHOD10_(typename, const, , m, __VA_ARGS__)
-
-#define MOCK_METHOD0_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD0_(, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD1_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD1_(, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD2_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD2_(, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD3_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD3_(, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD4_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD4_(, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD5_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD5_(, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD6_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD6_(, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD7_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD7_(, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD8_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD8_(, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD9_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD9_(, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD10_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD10_(, , ct, m, __VA_ARGS__)
-
-#define MOCK_CONST_METHOD0_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD0_(, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD1_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD1_(, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD2_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD2_(, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD3_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD3_(, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD4_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD4_(, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD5_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD5_(, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD6_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD6_(, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD7_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD7_(, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD8_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD8_(, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD9_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD9_(, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD10_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD10_(, const, ct, m, __VA_ARGS__)
-
-#define MOCK_METHOD0_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD0_(typename, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD1_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD1_(typename, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD2_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD2_(typename, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD3_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD3_(typename, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD4_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD4_(typename, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD5_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD5_(typename, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD6_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD6_(typename, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD7_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD7_(typename, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD8_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD8_(typename, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD9_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD9_(typename, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD10_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD10_(typename, , ct, m, __VA_ARGS__)
-
-#define MOCK_CONST_METHOD0_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD0_(typename, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD1_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD1_(typename, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD2_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD2_(typename, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD3_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD3_(typename, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD4_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD4_(typename, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD5_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD5_(typename, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD6_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD6_(typename, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD7_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD7_(typename, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD8_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD8_(typename, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD9_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD9_(typename, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD10_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD10_(typename, const, ct, m, __VA_ARGS__)
-
-}  // namespace testing
-
-#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-generated-matchers.h b/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-generated-matchers.h
deleted file mode 100644
index 48ea9358d7c..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-generated-matchers.h
+++ /dev/null
@@ -1,1099 +0,0 @@
-// This file was GENERATED by command:
-//     pump.py gmock-generated-matchers.h.pump
-// DO NOT EDIT BY HAND!!!
-
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file implements some commonly used variadic matchers.
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-// IWYU pragma: private, include "gmock/gmock.h"
-
-#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_MATCHERS_H_
-#define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_MATCHERS_H_
-
-#include <iterator>
-#include <sstream>
-#include <string>
-#include <utility>
-#include <vector>
-#include "gmock/gmock-matchers.h"
-
-// The MATCHER* family of macros can be used in a namespace scope to
-// define custom matchers easily.
-//
-// Basic Usage
-// ===========
-//
-// The syntax
-//
-//   MATCHER(name, description_string) { statements; }
-//
-// defines a matcher with the given name that executes the statements,
-// which must return a bool to indicate if the match succeeds.  Inside
-// the statements, you can refer to the value being matched by 'arg',
-// and refer to its type by 'arg_type'.
-//
-// The description string documents what the matcher does, and is used
-// to generate the failure message when the match fails.  Since a
-// MATCHER() is usually defined in a header file shared by multiple
-// C++ source files, we require the description to be a C-string
-// literal to avoid possible side effects.  It can be empty, in which
-// case we'll use the sequence of words in the matcher name as the
-// description.
-//
-// For example:
-//
-//   MATCHER(IsEven, "") { return (arg % 2) == 0; }
-//
-// allows you to write
-//
-//   // Expects mock_foo.Bar(n) to be called where n is even.
-//   EXPECT_CALL(mock_foo, Bar(IsEven()));
-//
-// or,
-//
-//   // Verifies that the value of some_expression is even.
-//   EXPECT_THAT(some_expression, IsEven());
-//
-// If the above assertion fails, it will print something like:
-//
-//   Value of: some_expression
-//   Expected: is even
-//     Actual: 7
-//
-// where the description "is even" is automatically calculated from the
-// matcher name IsEven.
-//
-// Argument Type
-// =============
-//
-// Note that the type of the value being matched (arg_type) is
-// determined by the context in which you use the matcher and is
-// supplied to you by the compiler, so you don't need to worry about
-// declaring it (nor can you).  This allows the matcher to be
-// polymorphic.  For example, IsEven() can be used to match any type
-// where the value of "(arg % 2) == 0" can be implicitly converted to
-// a bool.  In the "Bar(IsEven())" example above, if method Bar()
-// takes an int, 'arg_type' will be int; if it takes an unsigned long,
-// 'arg_type' will be unsigned long; and so on.
-//
-// Parameterizing Matchers
-// =======================
-//
-// Sometimes you'll want to parameterize the matcher.  For that you
-// can use another macro:
-//
-//   MATCHER_P(name, param_name, description_string) { statements; }
-//
-// For example:
-//
-//   MATCHER_P(HasAbsoluteValue, value, "") { return abs(arg) == value; }
-//
-// will allow you to write:
-//
-//   EXPECT_THAT(Blah("a"), HasAbsoluteValue(n));
-//
-// which may lead to this message (assuming n is 10):
-//
-//   Value of: Blah("a")
-//   Expected: has absolute value 10
-//     Actual: -9
-//
-// Note that both the matcher description and its parameter are
-// printed, making the message human-friendly.
-//
-// In the matcher definition body, you can write 'foo_type' to
-// reference the type of a parameter named 'foo'.  For example, in the
-// body of MATCHER_P(HasAbsoluteValue, value) above, you can write
-// 'value_type' to refer to the type of 'value'.
-//
-// We also provide MATCHER_P2, MATCHER_P3, ..., up to MATCHER_P10 to
-// support multi-parameter matchers.
-//
-// Describing Parameterized Matchers
-// =================================
-//
-// The last argument to MATCHER*() is a string-typed expression.  The
-// expression can reference all of the matcher's parameters and a
-// special bool-typed variable named 'negation'.  When 'negation' is
-// false, the expression should evaluate to the matcher's description;
-// otherwise it should evaluate to the description of the negation of
-// the matcher.  For example,
-//
-//   using testing::PrintToString;
-//
-//   MATCHER_P2(InClosedRange, low, hi,
-//       std::string(negation ? "is not" : "is") + " in range [" +
-//       PrintToString(low) + ", " + PrintToString(hi) + "]") {
-//     return low <= arg && arg <= hi;
-//   }
-//   ...
-//   EXPECT_THAT(3, InClosedRange(4, 6));
-//   EXPECT_THAT(3, Not(InClosedRange(2, 4)));
-//
-// would generate two failures that contain the text:
-//
-//   Expected: is in range [4, 6]
-//   ...
-//   Expected: is not in range [2, 4]
-//
-// If you specify "" as the description, the failure message will
-// contain the sequence of words in the matcher name followed by the
-// parameter values printed as a tuple.  For example,
-//
-//   MATCHER_P2(InClosedRange, low, hi, "") { ... }
-//   ...
-//   EXPECT_THAT(3, InClosedRange(4, 6));
-//   EXPECT_THAT(3, Not(InClosedRange(2, 4)));
-//
-// would generate two failures that contain the text:
-//
-//   Expected: in closed range (4, 6)
-//   ...
-//   Expected: not (in closed range (2, 4))
-//
-// Types of Matcher Parameters
-// ===========================
-//
-// For the purpose of typing, you can view
-//
-//   MATCHER_Pk(Foo, p1, ..., pk, description_string) { ... }
-//
-// as shorthand for
-//
-//   template <typename p1_type, ..., typename pk_type>
-//   FooMatcherPk<p1_type, ..., pk_type>
-//   Foo(p1_type p1, ..., pk_type pk) { ... }
-//
-// When you write Foo(v1, ..., vk), the compiler infers the types of
-// the parameters v1, ..., and vk for you.  If you are not happy with
-// the result of the type inference, you can specify the types by
-// explicitly instantiating the template, as in Foo<long, bool>(5,
-// false).  As said earlier, you don't get to (or need to) specify
-// 'arg_type' as that's determined by the context in which the matcher
-// is used.  You can assign the result of expression Foo(p1, ..., pk)
-// to a variable of type FooMatcherPk<p1_type, ..., pk_type>.  This
-// can be useful when composing matchers.
-//
-// While you can instantiate a matcher template with reference types,
-// passing the parameters by pointer usually makes your code more
-// readable.  If, however, you still want to pass a parameter by
-// reference, be aware that in the failure message generated by the
-// matcher you will see the value of the referenced object but not its
-// address.
-//
-// Explaining Match Results
-// ========================
-//
-// Sometimes the matcher description alone isn't enough to explain why
-// the match has failed or succeeded.  For example, when expecting a
-// long string, it can be very helpful to also print the diff between
-// the expected string and the actual one.  To achieve that, you can
-// optionally stream additional information to a special variable
-// named result_listener, whose type is a pointer to class
-// MatchResultListener:
-//
-//   MATCHER_P(EqualsLongString, str, "") {
-//     if (arg == str) return true;
-//
-//     *result_listener << "the difference: "
-///                     << DiffStrings(str, arg);
-//     return false;
-//   }
-//
-// Overloading Matchers
-// ====================
-//
-// You can overload matchers with different numbers of parameters:
-//
-//   MATCHER_P(Blah, a, description_string1) { ... }
-//   MATCHER_P2(Blah, a, b, description_string2) { ... }
-//
-// Caveats
-// =======
-//
-// When defining a new matcher, you should also consider implementing
-// MatcherInterface or using MakePolymorphicMatcher().  These
-// approaches require more work than the MATCHER* macros, but also
-// give you more control on the types of the value being matched and
-// the matcher parameters, which may leads to better compiler error
-// messages when the matcher is used wrong.  They also allow
-// overloading matchers based on parameter types (as opposed to just
-// based on the number of parameters).
-//
-// MATCHER*() can only be used in a namespace scope as templates cannot be
-// declared inside of a local class.
-//
-// More Information
-// ================
-//
-// To learn more about using these macros, please search for 'MATCHER'
-// on
-// https://github.com/google/googletest/blob/master/googlemock/docs/cook_book.md
-
-#define MATCHER(name, description)\
-  class name##Matcher {\
-   public:\
-    template <typename arg_type>\
-    class gmock_Impl : public ::testing::MatcherInterface<\
-        GTEST_REFERENCE_TO_CONST_(arg_type)> {\
-     public:\
-      gmock_Impl()\
-           {}\
-      virtual bool MatchAndExplain(\
-          GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-          ::testing::MatchResultListener* result_listener) const;\
-      virtual void DescribeTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(false);\
-      }\
-      virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(true);\
-      }\
-     private:\
-      ::std::string FormatDescription(bool negation) const {\
-        ::std::string gmock_description = (description);\
-        if (!gmock_description.empty()) {\
-          return gmock_description;\
-        }\
-        return ::testing::internal::FormatMatcherDescription(\
-            negation, #name, \
-            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
-                ::std::tuple<>()));\
-      }\
-    };\
-    template <typename arg_type>\
-    operator ::testing::Matcher<arg_type>() const {\
-      return ::testing::Matcher<arg_type>(\
-          new gmock_Impl<arg_type>());\
-    }\
-    name##Matcher() {\
-    }\
-   private:\
-  };\
-  inline name##Matcher name() {\
-    return name##Matcher();\
-  }\
-  template <typename arg_type>\
-  bool name##Matcher::gmock_Impl<arg_type>::MatchAndExplain(\
-      GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_)\
-          const
-
-#define MATCHER_P(name, p0, description)\
-  template <typename p0##_type>\
-  class name##MatcherP {\
-   public:\
-    template <typename arg_type>\
-    class gmock_Impl : public ::testing::MatcherInterface<\
-        GTEST_REFERENCE_TO_CONST_(arg_type)> {\
-     public:\
-      explicit gmock_Impl(p0##_type gmock_p0)\
-           : p0(::std::move(gmock_p0)) {}\
-      virtual bool MatchAndExplain(\
-          GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-          ::testing::MatchResultListener* result_listener) const;\
-      virtual void DescribeTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(false);\
-      }\
-      virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(true);\
-      }\
-      p0##_type const p0;\
-     private:\
-      ::std::string FormatDescription(bool negation) const {\
-        ::std::string gmock_description = (description);\
-        if (!gmock_description.empty()) {\
-          return gmock_description;\
-        }\
-        return ::testing::internal::FormatMatcherDescription(\
-            negation, #name, \
-            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
-                ::std::tuple<p0##_type>(p0)));\
-      }\
-    };\
-    template <typename arg_type>\
-    operator ::testing::Matcher<arg_type>() const {\
-      return ::testing::Matcher<arg_type>(\
-          new gmock_Impl<arg_type>(p0));\
-    }\
-    explicit name##MatcherP(p0##_type gmock_p0) : p0(::std::move(gmock_p0)) {\
-    }\
-    p0##_type const p0;\
-   private:\
-  };\
-  template <typename p0##_type>\
-  inline name##MatcherP<p0##_type> name(p0##_type p0) {\
-    return name##MatcherP<p0##_type>(p0);\
-  }\
-  template <typename p0##_type>\
-  template <typename arg_type>\
-  bool name##MatcherP<p0##_type>::gmock_Impl<arg_type>::MatchAndExplain(\
-      GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_)\
-          const
-
-#define MATCHER_P2(name, p0, p1, description)\
-  template <typename p0##_type, typename p1##_type>\
-  class name##MatcherP2 {\
-   public:\
-    template <typename arg_type>\
-    class gmock_Impl : public ::testing::MatcherInterface<\
-        GTEST_REFERENCE_TO_CONST_(arg_type)> {\
-     public:\
-      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1)\
-           : p0(::std::move(gmock_p0)), p1(::std::move(gmock_p1)) {}\
-      virtual bool MatchAndExplain(\
-          GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-          ::testing::MatchResultListener* result_listener) const;\
-      virtual void DescribeTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(false);\
-      }\
-      virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(true);\
-      }\
-      p0##_type const p0;\
-      p1##_type const p1;\
-     private:\
-      ::std::string FormatDescription(bool negation) const {\
-        ::std::string gmock_description = (description);\
-        if (!gmock_description.empty()) {\
-          return gmock_description;\
-        }\
-        return ::testing::internal::FormatMatcherDescription(\
-            negation, #name, \
-            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
-                ::std::tuple<p0##_type, p1##_type>(p0, p1)));\
-      }\
-    };\
-    template <typename arg_type>\
-    operator ::testing::Matcher<arg_type>() const {\
-      return ::testing::Matcher<arg_type>(\
-          new gmock_Impl<arg_type>(p0, p1));\
-    }\
-    name##MatcherP2(p0##_type gmock_p0, \
-        p1##_type gmock_p1) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)) {\
-    }\
-    p0##_type const p0;\
-    p1##_type const p1;\
-   private:\
-  };\
-  template <typename p0##_type, typename p1##_type>\
-  inline name##MatcherP2<p0##_type, p1##_type> name(p0##_type p0, \
-      p1##_type p1) {\
-    return name##MatcherP2<p0##_type, p1##_type>(p0, p1);\
-  }\
-  template <typename p0##_type, typename p1##_type>\
-  template <typename arg_type>\
-  bool name##MatcherP2<p0##_type, \
-      p1##_type>::gmock_Impl<arg_type>::MatchAndExplain(\
-      GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_)\
-          const
-
-#define MATCHER_P3(name, p0, p1, p2, description)\
-  template <typename p0##_type, typename p1##_type, typename p2##_type>\
-  class name##MatcherP3 {\
-   public:\
-    template <typename arg_type>\
-    class gmock_Impl : public ::testing::MatcherInterface<\
-        GTEST_REFERENCE_TO_CONST_(arg_type)> {\
-     public:\
-      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2)\
-           : p0(::std::move(gmock_p0)), p1(::std::move(gmock_p1)), \
-               p2(::std::move(gmock_p2)) {}\
-      virtual bool MatchAndExplain(\
-          GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-          ::testing::MatchResultListener* result_listener) const;\
-      virtual void DescribeTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(false);\
-      }\
-      virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(true);\
-      }\
-      p0##_type const p0;\
-      p1##_type const p1;\
-      p2##_type const p2;\
-     private:\
-      ::std::string FormatDescription(bool negation) const {\
-        ::std::string gmock_description = (description);\
-        if (!gmock_description.empty()) {\
-          return gmock_description;\
-        }\
-        return ::testing::internal::FormatMatcherDescription(\
-            negation, #name, \
-            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
-                ::std::tuple<p0##_type, p1##_type, p2##_type>(p0, p1, p2)));\
-      }\
-    };\
-    template <typename arg_type>\
-    operator ::testing::Matcher<arg_type>() const {\
-      return ::testing::Matcher<arg_type>(\
-          new gmock_Impl<arg_type>(p0, p1, p2));\
-    }\
-    name##MatcherP3(p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)) {\
-    }\
-    p0##_type const p0;\
-    p1##_type const p1;\
-    p2##_type const p2;\
-   private:\
-  };\
-  template <typename p0##_type, typename p1##_type, typename p2##_type>\
-  inline name##MatcherP3<p0##_type, p1##_type, p2##_type> name(p0##_type p0, \
-      p1##_type p1, p2##_type p2) {\
-    return name##MatcherP3<p0##_type, p1##_type, p2##_type>(p0, p1, p2);\
-  }\
-  template <typename p0##_type, typename p1##_type, typename p2##_type>\
-  template <typename arg_type>\
-  bool name##MatcherP3<p0##_type, p1##_type, \
-      p2##_type>::gmock_Impl<arg_type>::MatchAndExplain(\
-      GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_)\
-          const
-
-#define MATCHER_P4(name, p0, p1, p2, p3, description)\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type>\
-  class name##MatcherP4 {\
-   public:\
-    template <typename arg_type>\
-    class gmock_Impl : public ::testing::MatcherInterface<\
-        GTEST_REFERENCE_TO_CONST_(arg_type)> {\
-     public:\
-      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-          p3##_type gmock_p3)\
-           : p0(::std::move(gmock_p0)), p1(::std::move(gmock_p1)), \
-               p2(::std::move(gmock_p2)), p3(::std::move(gmock_p3)) {}\
-      virtual bool MatchAndExplain(\
-          GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-          ::testing::MatchResultListener* result_listener) const;\
-      virtual void DescribeTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(false);\
-      }\
-      virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(true);\
-      }\
-      p0##_type const p0;\
-      p1##_type const p1;\
-      p2##_type const p2;\
-      p3##_type const p3;\
-     private:\
-      ::std::string FormatDescription(bool negation) const {\
-        ::std::string gmock_description = (description);\
-        if (!gmock_description.empty()) {\
-          return gmock_description;\
-        }\
-        return ::testing::internal::FormatMatcherDescription(\
-            negation, #name, \
-            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
-                ::std::tuple<p0##_type, p1##_type, p2##_type, p3##_type>(p0, \
-                    p1, p2, p3)));\
-      }\
-    };\
-    template <typename arg_type>\
-    operator ::testing::Matcher<arg_type>() const {\
-      return ::testing::Matcher<arg_type>(\
-          new gmock_Impl<arg_type>(p0, p1, p2, p3));\
-    }\
-    name##MatcherP4(p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2, p3##_type gmock_p3) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)) {\
-    }\
-    p0##_type const p0;\
-    p1##_type const p1;\
-    p2##_type const p2;\
-    p3##_type const p3;\
-   private:\
-  };\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type>\
-  inline name##MatcherP4<p0##_type, p1##_type, p2##_type, \
-      p3##_type> name(p0##_type p0, p1##_type p1, p2##_type p2, \
-      p3##_type p3) {\
-    return name##MatcherP4<p0##_type, p1##_type, p2##_type, p3##_type>(p0, \
-        p1, p2, p3);\
-  }\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type>\
-  template <typename arg_type>\
-  bool name##MatcherP4<p0##_type, p1##_type, p2##_type, \
-      p3##_type>::gmock_Impl<arg_type>::MatchAndExplain(\
-      GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_)\
-          const
-
-#define MATCHER_P5(name, p0, p1, p2, p3, p4, description)\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type>\
-  class name##MatcherP5 {\
-   public:\
-    template <typename arg_type>\
-    class gmock_Impl : public ::testing::MatcherInterface<\
-        GTEST_REFERENCE_TO_CONST_(arg_type)> {\
-     public:\
-      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-          p3##_type gmock_p3, p4##_type gmock_p4)\
-           : p0(::std::move(gmock_p0)), p1(::std::move(gmock_p1)), \
-               p2(::std::move(gmock_p2)), p3(::std::move(gmock_p3)), \
-               p4(::std::move(gmock_p4)) {}\
-      virtual bool MatchAndExplain(\
-          GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-          ::testing::MatchResultListener* result_listener) const;\
-      virtual void DescribeTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(false);\
-      }\
-      virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(true);\
-      }\
-      p0##_type const p0;\
-      p1##_type const p1;\
-      p2##_type const p2;\
-      p3##_type const p3;\
-      p4##_type const p4;\
-     private:\
-      ::std::string FormatDescription(bool negation) const {\
-        ::std::string gmock_description = (description);\
-        if (!gmock_description.empty()) {\
-          return gmock_description;\
-        }\
-        return ::testing::internal::FormatMatcherDescription(\
-            negation, #name, \
-            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
-                ::std::tuple<p0##_type, p1##_type, p2##_type, p3##_type, \
-                    p4##_type>(p0, p1, p2, p3, p4)));\
-      }\
-    };\
-    template <typename arg_type>\
-    operator ::testing::Matcher<arg_type>() const {\
-      return ::testing::Matcher<arg_type>(\
-          new gmock_Impl<arg_type>(p0, p1, p2, p3, p4));\
-    }\
-    name##MatcherP5(p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2, p3##_type gmock_p3, \
-        p4##_type gmock_p4) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)) {\
-    }\
-    p0##_type const p0;\
-    p1##_type const p1;\
-    p2##_type const p2;\
-    p3##_type const p3;\
-    p4##_type const p4;\
-   private:\
-  };\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type>\
-  inline name##MatcherP5<p0##_type, p1##_type, p2##_type, p3##_type, \
-      p4##_type> name(p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \
-      p4##_type p4) {\
-    return name##MatcherP5<p0##_type, p1##_type, p2##_type, p3##_type, \
-        p4##_type>(p0, p1, p2, p3, p4);\
-  }\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type>\
-  template <typename arg_type>\
-  bool name##MatcherP5<p0##_type, p1##_type, p2##_type, p3##_type, \
-      p4##_type>::gmock_Impl<arg_type>::MatchAndExplain(\
-      GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_)\
-          const
-
-#define MATCHER_P6(name, p0, p1, p2, p3, p4, p5, description)\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type>\
-  class name##MatcherP6 {\
-   public:\
-    template <typename arg_type>\
-    class gmock_Impl : public ::testing::MatcherInterface<\
-        GTEST_REFERENCE_TO_CONST_(arg_type)> {\
-     public:\
-      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-          p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5)\
-           : p0(::std::move(gmock_p0)), p1(::std::move(gmock_p1)), \
-               p2(::std::move(gmock_p2)), p3(::std::move(gmock_p3)), \
-               p4(::std::move(gmock_p4)), p5(::std::move(gmock_p5)) {}\
-      virtual bool MatchAndExplain(\
-          GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-          ::testing::MatchResultListener* result_listener) const;\
-      virtual void DescribeTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(false);\
-      }\
-      virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(true);\
-      }\
-      p0##_type const p0;\
-      p1##_type const p1;\
-      p2##_type const p2;\
-      p3##_type const p3;\
-      p4##_type const p4;\
-      p5##_type const p5;\
-     private:\
-      ::std::string FormatDescription(bool negation) const {\
-        ::std::string gmock_description = (description);\
-        if (!gmock_description.empty()) {\
-          return gmock_description;\
-        }\
-        return ::testing::internal::FormatMatcherDescription(\
-            negation, #name, \
-            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
-                ::std::tuple<p0##_type, p1##_type, p2##_type, p3##_type, \
-                    p4##_type, p5##_type>(p0, p1, p2, p3, p4, p5)));\
-      }\
-    };\
-    template <typename arg_type>\
-    operator ::testing::Matcher<arg_type>() const {\
-      return ::testing::Matcher<arg_type>(\
-          new gmock_Impl<arg_type>(p0, p1, p2, p3, p4, p5));\
-    }\
-    name##MatcherP6(p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2, p3##_type gmock_p3, p4##_type gmock_p4, \
-        p5##_type gmock_p5) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \
-        p5(::std::move(gmock_p5)) {\
-    }\
-    p0##_type const p0;\
-    p1##_type const p1;\
-    p2##_type const p2;\
-    p3##_type const p3;\
-    p4##_type const p4;\
-    p5##_type const p5;\
-   private:\
-  };\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type>\
-  inline name##MatcherP6<p0##_type, p1##_type, p2##_type, p3##_type, \
-      p4##_type, p5##_type> name(p0##_type p0, p1##_type p1, p2##_type p2, \
-      p3##_type p3, p4##_type p4, p5##_type p5) {\
-    return name##MatcherP6<p0##_type, p1##_type, p2##_type, p3##_type, \
-        p4##_type, p5##_type>(p0, p1, p2, p3, p4, p5);\
-  }\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type>\
-  template <typename arg_type>\
-  bool name##MatcherP6<p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
-      p5##_type>::gmock_Impl<arg_type>::MatchAndExplain(\
-      GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_)\
-          const
-
-#define MATCHER_P7(name, p0, p1, p2, p3, p4, p5, p6, description)\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type>\
-  class name##MatcherP7 {\
-   public:\
-    template <typename arg_type>\
-    class gmock_Impl : public ::testing::MatcherInterface<\
-        GTEST_REFERENCE_TO_CONST_(arg_type)> {\
-     public:\
-      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-          p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
-          p6##_type gmock_p6)\
-           : p0(::std::move(gmock_p0)), p1(::std::move(gmock_p1)), \
-               p2(::std::move(gmock_p2)), p3(::std::move(gmock_p3)), \
-               p4(::std::move(gmock_p4)), p5(::std::move(gmock_p5)), \
-               p6(::std::move(gmock_p6)) {}\
-      virtual bool MatchAndExplain(\
-          GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-          ::testing::MatchResultListener* result_listener) const;\
-      virtual void DescribeTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(false);\
-      }\
-      virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(true);\
-      }\
-      p0##_type const p0;\
-      p1##_type const p1;\
-      p2##_type const p2;\
-      p3##_type const p3;\
-      p4##_type const p4;\
-      p5##_type const p5;\
-      p6##_type const p6;\
-     private:\
-      ::std::string FormatDescription(bool negation) const {\
-        ::std::string gmock_description = (description);\
-        if (!gmock_description.empty()) {\
-          return gmock_description;\
-        }\
-        return ::testing::internal::FormatMatcherDescription(\
-            negation, #name, \
-            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
-                ::std::tuple<p0##_type, p1##_type, p2##_type, p3##_type, \
-                    p4##_type, p5##_type, p6##_type>(p0, p1, p2, p3, p4, p5, \
-                    p6)));\
-      }\
-    };\
-    template <typename arg_type>\
-    operator ::testing::Matcher<arg_type>() const {\
-      return ::testing::Matcher<arg_type>(\
-          new gmock_Impl<arg_type>(p0, p1, p2, p3, p4, p5, p6));\
-    }\
-    name##MatcherP7(p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2, p3##_type gmock_p3, p4##_type gmock_p4, \
-        p5##_type gmock_p5, p6##_type gmock_p6) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \
-        p5(::std::move(gmock_p5)), p6(::std::move(gmock_p6)) {\
-    }\
-    p0##_type const p0;\
-    p1##_type const p1;\
-    p2##_type const p2;\
-    p3##_type const p3;\
-    p4##_type const p4;\
-    p5##_type const p5;\
-    p6##_type const p6;\
-   private:\
-  };\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type>\
-  inline name##MatcherP7<p0##_type, p1##_type, p2##_type, p3##_type, \
-      p4##_type, p5##_type, p6##_type> name(p0##_type p0, p1##_type p1, \
-      p2##_type p2, p3##_type p3, p4##_type p4, p5##_type p5, \
-      p6##_type p6) {\
-    return name##MatcherP7<p0##_type, p1##_type, p2##_type, p3##_type, \
-        p4##_type, p5##_type, p6##_type>(p0, p1, p2, p3, p4, p5, p6);\
-  }\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type>\
-  template <typename arg_type>\
-  bool name##MatcherP7<p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
-      p5##_type, p6##_type>::gmock_Impl<arg_type>::MatchAndExplain(\
-      GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_)\
-          const
-
-#define MATCHER_P8(name, p0, p1, p2, p3, p4, p5, p6, p7, description)\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type>\
-  class name##MatcherP8 {\
-   public:\
-    template <typename arg_type>\
-    class gmock_Impl : public ::testing::MatcherInterface<\
-        GTEST_REFERENCE_TO_CONST_(arg_type)> {\
-     public:\
-      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-          p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
-          p6##_type gmock_p6, p7##_type gmock_p7)\
-           : p0(::std::move(gmock_p0)), p1(::std::move(gmock_p1)), \
-               p2(::std::move(gmock_p2)), p3(::std::move(gmock_p3)), \
-               p4(::std::move(gmock_p4)), p5(::std::move(gmock_p5)), \
-               p6(::std::move(gmock_p6)), p7(::std::move(gmock_p7)) {}\
-      virtual bool MatchAndExplain(\
-          GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-          ::testing::MatchResultListener* result_listener) const;\
-      virtual void DescribeTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(false);\
-      }\
-      virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(true);\
-      }\
-      p0##_type const p0;\
-      p1##_type const p1;\
-      p2##_type const p2;\
-      p3##_type const p3;\
-      p4##_type const p4;\
-      p5##_type const p5;\
-      p6##_type const p6;\
-      p7##_type const p7;\
-     private:\
-      ::std::string FormatDescription(bool negation) const {\
-        ::std::string gmock_description = (description);\
-        if (!gmock_description.empty()) {\
-          return gmock_description;\
-        }\
-        return ::testing::internal::FormatMatcherDescription(\
-            negation, #name, \
-            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
-                ::std::tuple<p0##_type, p1##_type, p2##_type, p3##_type, \
-                    p4##_type, p5##_type, p6##_type, p7##_type>(p0, p1, p2, \
-                    p3, p4, p5, p6, p7)));\
-      }\
-    };\
-    template <typename arg_type>\
-    operator ::testing::Matcher<arg_type>() const {\
-      return ::testing::Matcher<arg_type>(\
-          new gmock_Impl<arg_type>(p0, p1, p2, p3, p4, p5, p6, p7));\
-    }\
-    name##MatcherP8(p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2, p3##_type gmock_p3, p4##_type gmock_p4, \
-        p5##_type gmock_p5, p6##_type gmock_p6, \
-        p7##_type gmock_p7) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \
-        p5(::std::move(gmock_p5)), p6(::std::move(gmock_p6)), \
-        p7(::std::move(gmock_p7)) {\
-    }\
-    p0##_type const p0;\
-    p1##_type const p1;\
-    p2##_type const p2;\
-    p3##_type const p3;\
-    p4##_type const p4;\
-    p5##_type const p5;\
-    p6##_type const p6;\
-    p7##_type const p7;\
-   private:\
-  };\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type>\
-  inline name##MatcherP8<p0##_type, p1##_type, p2##_type, p3##_type, \
-      p4##_type, p5##_type, p6##_type, p7##_type> name(p0##_type p0, \
-      p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4, p5##_type p5, \
-      p6##_type p6, p7##_type p7) {\
-    return name##MatcherP8<p0##_type, p1##_type, p2##_type, p3##_type, \
-        p4##_type, p5##_type, p6##_type, p7##_type>(p0, p1, p2, p3, p4, p5, \
-        p6, p7);\
-  }\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type>\
-  template <typename arg_type>\
-  bool name##MatcherP8<p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
-      p5##_type, p6##_type, \
-      p7##_type>::gmock_Impl<arg_type>::MatchAndExplain(\
-      GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_)\
-          const
-
-#define MATCHER_P9(name, p0, p1, p2, p3, p4, p5, p6, p7, p8, description)\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type, typename p8##_type>\
-  class name##MatcherP9 {\
-   public:\
-    template <typename arg_type>\
-    class gmock_Impl : public ::testing::MatcherInterface<\
-        GTEST_REFERENCE_TO_CONST_(arg_type)> {\
-     public:\
-      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-          p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
-          p6##_type gmock_p6, p7##_type gmock_p7, p8##_type gmock_p8)\
-           : p0(::std::move(gmock_p0)), p1(::std::move(gmock_p1)), \
-               p2(::std::move(gmock_p2)), p3(::std::move(gmock_p3)), \
-               p4(::std::move(gmock_p4)), p5(::std::move(gmock_p5)), \
-               p6(::std::move(gmock_p6)), p7(::std::move(gmock_p7)), \
-               p8(::std::move(gmock_p8)) {}\
-      virtual bool MatchAndExplain(\
-          GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-          ::testing::MatchResultListener* result_listener) const;\
-      virtual void DescribeTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(false);\
-      }\
-      virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(true);\
-      }\
-      p0##_type const p0;\
-      p1##_type const p1;\
-      p2##_type const p2;\
-      p3##_type const p3;\
-      p4##_type const p4;\
-      p5##_type const p5;\
-      p6##_type const p6;\
-      p7##_type const p7;\
-      p8##_type const p8;\
-     private:\
-      ::std::string FormatDescription(bool negation) const {\
-        ::std::string gmock_description = (description);\
-        if (!gmock_description.empty()) {\
-          return gmock_description;\
-        }\
-        return ::testing::internal::FormatMatcherDescription(\
-            negation, #name, \
-            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
-                ::std::tuple<p0##_type, p1##_type, p2##_type, p3##_type, \
-                    p4##_type, p5##_type, p6##_type, p7##_type, \
-                    p8##_type>(p0, p1, p2, p3, p4, p5, p6, p7, p8)));\
-      }\
-    };\
-    template <typename arg_type>\
-    operator ::testing::Matcher<arg_type>() const {\
-      return ::testing::Matcher<arg_type>(\
-          new gmock_Impl<arg_type>(p0, p1, p2, p3, p4, p5, p6, p7, p8));\
-    }\
-    name##MatcherP9(p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2, p3##_type gmock_p3, p4##_type gmock_p4, \
-        p5##_type gmock_p5, p6##_type gmock_p6, p7##_type gmock_p7, \
-        p8##_type gmock_p8) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \
-        p5(::std::move(gmock_p5)), p6(::std::move(gmock_p6)), \
-        p7(::std::move(gmock_p7)), p8(::std::move(gmock_p8)) {\
-    }\
-    p0##_type const p0;\
-    p1##_type const p1;\
-    p2##_type const p2;\
-    p3##_type const p3;\
-    p4##_type const p4;\
-    p5##_type const p5;\
-    p6##_type const p6;\
-    p7##_type const p7;\
-    p8##_type const p8;\
-   private:\
-  };\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type, typename p8##_type>\
-  inline name##MatcherP9<p0##_type, p1##_type, p2##_type, p3##_type, \
-      p4##_type, p5##_type, p6##_type, p7##_type, \
-      p8##_type> name(p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \
-      p4##_type p4, p5##_type p5, p6##_type p6, p7##_type p7, \
-      p8##_type p8) {\
-    return name##MatcherP9<p0##_type, p1##_type, p2##_type, p3##_type, \
-        p4##_type, p5##_type, p6##_type, p7##_type, p8##_type>(p0, p1, p2, \
-        p3, p4, p5, p6, p7, p8);\
-  }\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type, typename p8##_type>\
-  template <typename arg_type>\
-  bool name##MatcherP9<p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
-      p5##_type, p6##_type, p7##_type, \
-      p8##_type>::gmock_Impl<arg_type>::MatchAndExplain(\
-      GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_)\
-          const
-
-#define MATCHER_P10(name, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, description)\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type, typename p8##_type, \
-      typename p9##_type>\
-  class name##MatcherP10 {\
-   public:\
-    template <typename arg_type>\
-    class gmock_Impl : public ::testing::MatcherInterface<\
-        GTEST_REFERENCE_TO_CONST_(arg_type)> {\
-     public:\
-      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-          p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
-          p6##_type gmock_p6, p7##_type gmock_p7, p8##_type gmock_p8, \
-          p9##_type gmock_p9)\
-           : p0(::std::move(gmock_p0)), p1(::std::move(gmock_p1)), \
-               p2(::std::move(gmock_p2)), p3(::std::move(gmock_p3)), \
-               p4(::std::move(gmock_p4)), p5(::std::move(gmock_p5)), \
-               p6(::std::move(gmock_p6)), p7(::std::move(gmock_p7)), \
-               p8(::std::move(gmock_p8)), p9(::std::move(gmock_p9)) {}\
-      virtual bool MatchAndExplain(\
-          GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-          ::testing::MatchResultListener* result_listener) const;\
-      virtual void DescribeTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(false);\
-      }\
-      virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(true);\
-      }\
-      p0##_type const p0;\
-      p1##_type const p1;\
-      p2##_type const p2;\
-      p3##_type const p3;\
-      p4##_type const p4;\
-      p5##_type const p5;\
-      p6##_type const p6;\
-      p7##_type const p7;\
-      p8##_type const p8;\
-      p9##_type const p9;\
-     private:\
-      ::std::string FormatDescription(bool negation) const {\
-        ::std::string gmock_description = (description);\
-        if (!gmock_description.empty()) {\
-          return gmock_description;\
-        }\
-        return ::testing::internal::FormatMatcherDescription(\
-            negation, #name, \
-            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
-                ::std::tuple<p0##_type, p1##_type, p2##_type, p3##_type, \
-                    p4##_type, p5##_type, p6##_type, p7##_type, p8##_type, \
-                    p9##_type>(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9)));\
-      }\
-    };\
-    template <typename arg_type>\
-    operator ::testing::Matcher<arg_type>() const {\
-      return ::testing::Matcher<arg_type>(\
-          new gmock_Impl<arg_type>(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9));\
-    }\
-    name##MatcherP10(p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2, p3##_type gmock_p3, p4##_type gmock_p4, \
-        p5##_type gmock_p5, p6##_type gmock_p6, p7##_type gmock_p7, \
-        p8##_type gmock_p8, p9##_type gmock_p9) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \
-        p5(::std::move(gmock_p5)), p6(::std::move(gmock_p6)), \
-        p7(::std::move(gmock_p7)), p8(::std::move(gmock_p8)), \
-        p9(::std::move(gmock_p9)) {\
-    }\
-    p0##_type const p0;\
-    p1##_type const p1;\
-    p2##_type const p2;\
-    p3##_type const p3;\
-    p4##_type const p4;\
-    p5##_type const p5;\
-    p6##_type const p6;\
-    p7##_type const p7;\
-    p8##_type const p8;\
-    p9##_type const p9;\
-   private:\
-  };\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type, typename p8##_type, \
-      typename p9##_type>\
-  inline name##MatcherP10<p0##_type, p1##_type, p2##_type, p3##_type, \
-      p4##_type, p5##_type, p6##_type, p7##_type, p8##_type, \
-      p9##_type> name(p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \
-      p4##_type p4, p5##_type p5, p6##_type p6, p7##_type p7, p8##_type p8, \
-      p9##_type p9) {\
-    return name##MatcherP10<p0##_type, p1##_type, p2##_type, p3##_type, \
-        p4##_type, p5##_type, p6##_type, p7##_type, p8##_type, p9##_type>(p0, \
-        p1, p2, p3, p4, p5, p6, p7, p8, p9);\
-  }\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type, typename p8##_type, \
-      typename p9##_type>\
-  template <typename arg_type>\
-  bool name##MatcherP10<p0##_type, p1##_type, p2##_type, p3##_type, \
-      p4##_type, p5##_type, p6##_type, p7##_type, p8##_type, \
-      p9##_type>::gmock_Impl<arg_type>::MatchAndExplain(\
-      GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_)\
-          const
-
-#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_MATCHERS_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-matchers.h b/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-matchers.h
deleted file mode 100644
index 8c604cf14f1..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-matchers.h
+++ /dev/null
@@ -1,4599 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file implements some commonly used argument matchers.  More
-// matchers can be defined by the user implementing the
-// MatcherInterface<T> interface if necessary.
-//
-// See googletest/include/gtest/gtest-matchers.h for the definition of class
-// Matcher, class MatcherInterface, and others.
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-// IWYU pragma: private, include "gmock/gmock.h"
-
-#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_MATCHERS_H_
-#define GMOCK_INCLUDE_GMOCK_GMOCK_MATCHERS_H_
-
-#include <math.h>
-#include <algorithm>
-#include <initializer_list>
-#include <iterator>
-#include <limits>
-#include <memory>
-#include <ostream>  // NOLINT
-#include <sstream>
-#include <string>
-#include <type_traits>
-#include <utility>
-#include <vector>
-#include "gmock/internal/gmock-internal-utils.h"
-#include "gmock/internal/gmock-port.h"
-#include "gtest/gtest.h"
-
-// MSVC warning C5046 is new as of VS2017 version 15.8.
-#if defined(_MSC_VER) && _MSC_VER >= 1915
-#define GMOCK_MAYBE_5046_ 5046
-#else
-#define GMOCK_MAYBE_5046_
-#endif
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(
-    4251 GMOCK_MAYBE_5046_ /* class A needs to have dll-interface to be used by
-                              clients of class B */
-    /* Symbol involving type with internal linkage not defined */)
-
-#ifdef __clang__
-#if __has_warning("-Wdeprecated-copy")
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-copy"
-#endif
-#endif
-
-namespace testing {
-
-// To implement a matcher Foo for type T, define:
-//   1. a class FooMatcherImpl that implements the
-//      MatcherInterface<T> interface, and
-//   2. a factory function that creates a Matcher<T> object from a
-//      FooMatcherImpl*.
-//
-// The two-level delegation design makes it possible to allow a user
-// to write "v" instead of "Eq(v)" where a Matcher is expected, which
-// is impossible if we pass matchers by pointers.  It also eases
-// ownership management as Matcher objects can now be copied like
-// plain values.
-
-// A match result listener that stores the explanation in a string.
-class StringMatchResultListener : public MatchResultListener {
- public:
-  StringMatchResultListener() : MatchResultListener(&ss_) {}
-
-  // Returns the explanation accumulated so far.
-  std::string str() const { return ss_.str(); }
-
-  // Clears the explanation accumulated so far.
-  void Clear() { ss_.str(""); }
-
- private:
-  ::std::stringstream ss_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(StringMatchResultListener);
-};
-
-// Anything inside the 'internal' namespace IS INTERNAL IMPLEMENTATION
-// and MUST NOT BE USED IN USER CODE!!!
-namespace internal {
-
-// The MatcherCastImpl class template is a helper for implementing
-// MatcherCast().  We need this helper in order to partially
-// specialize the implementation of MatcherCast() (C++ allows
-// class/struct templates to be partially specialized, but not
-// function templates.).
-
-// This general version is used when MatcherCast()'s argument is a
-// polymorphic matcher (i.e. something that can be converted to a
-// Matcher but is not one yet; for example, Eq(value)) or a value (for
-// example, "hello").
-template <typename T, typename M>
-class MatcherCastImpl {
- public:
-  static Matcher<T> Cast(const M& polymorphic_matcher_or_value) {
-    // M can be a polymorphic matcher, in which case we want to use
-    // its conversion operator to create Matcher<T>.  Or it can be a value
-    // that should be passed to the Matcher<T>'s constructor.
-    //
-    // We can't call Matcher<T>(polymorphic_matcher_or_value) when M is a
-    // polymorphic matcher because it'll be ambiguous if T has an implicit
-    // constructor from M (this usually happens when T has an implicit
-    // constructor from any type).
-    //
-    // It won't work to unconditionally implict_cast
-    // polymorphic_matcher_or_value to Matcher<T> because it won't trigger
-    // a user-defined conversion from M to T if one exists (assuming M is
-    // a value).
-    return CastImpl(polymorphic_matcher_or_value,
-                    std::is_convertible<M, Matcher<T>>{},
-                    std::is_convertible<M, T>{});
-  }
-
- private:
-  template <bool Ignore>
-  static Matcher<T> CastImpl(const M& polymorphic_matcher_or_value,
-                             std::true_type /* convertible_to_matcher */,
-                             bool_constant<Ignore>) {
-    // M is implicitly convertible to Matcher<T>, which means that either
-    // M is a polymorphic matcher or Matcher<T> has an implicit constructor
-    // from M.  In both cases using the implicit conversion will produce a
-    // matcher.
-    //
-    // Even if T has an implicit constructor from M, it won't be called because
-    // creating Matcher<T> would require a chain of two user-defined conversions
-    // (first to create T from M and then to create Matcher<T> from T).
-    return polymorphic_matcher_or_value;
-  }
-
-  // M can't be implicitly converted to Matcher<T>, so M isn't a polymorphic
-  // matcher. It's a value of a type implicitly convertible to T. Use direct
-  // initialization to create a matcher.
-  static Matcher<T> CastImpl(const M& value,
-                             std::false_type /* convertible_to_matcher */,
-                             std::true_type /* convertible_to_T */) {
-    return Matcher<T>(ImplicitCast_<T>(value));
-  }
-
-  // M can't be implicitly converted to either Matcher<T> or T. Attempt to use
-  // polymorphic matcher Eq(value) in this case.
-  //
-  // Note that we first attempt to perform an implicit cast on the value and
-  // only fall back to the polymorphic Eq() matcher afterwards because the
-  // latter calls bool operator==(const Lhs& lhs, const Rhs& rhs) in the end
-  // which might be undefined even when Rhs is implicitly convertible to Lhs
-  // (e.g. std::pair<const int, int> vs. std::pair<int, int>).
-  //
-  // We don't define this method inline as we need the declaration of Eq().
-  static Matcher<T> CastImpl(const M& value,
-                             std::false_type /* convertible_to_matcher */,
-                             std::false_type /* convertible_to_T */);
-};
-
-// This more specialized version is used when MatcherCast()'s argument
-// is already a Matcher.  This only compiles when type T can be
-// statically converted to type U.
-template <typename T, typename U>
-class MatcherCastImpl<T, Matcher<U> > {
- public:
-  static Matcher<T> Cast(const Matcher<U>& source_matcher) {
-    return Matcher<T>(new Impl(source_matcher));
-  }
-
- private:
-  class Impl : public MatcherInterface<T> {
-   public:
-    explicit Impl(const Matcher<U>& source_matcher)
-        : source_matcher_(source_matcher) {}
-
-    // We delegate the matching logic to the source matcher.
-    bool MatchAndExplain(T x, MatchResultListener* listener) const override {
-      using FromType = typename std::remove_cv<typename std::remove_pointer<
-          typename std::remove_reference<T>::type>::type>::type;
-      using ToType = typename std::remove_cv<typename std::remove_pointer<
-          typename std::remove_reference<U>::type>::type>::type;
-      // Do not allow implicitly converting base*/& to derived*/&.
-      static_assert(
-          // Do not trigger if only one of them is a pointer. That implies a
-          // regular conversion and not a down_cast.
-          (std::is_pointer<typename std::remove_reference<T>::type>::value !=
-           std::is_pointer<typename std::remove_reference<U>::type>::value) ||
-              std::is_same<FromType, ToType>::value ||
-              !std::is_base_of<FromType, ToType>::value,
-          "Can't implicitly convert from <base> to <derived>");
-
-      return source_matcher_.MatchAndExplain(static_cast<U>(x), listener);
-    }
-
-    void DescribeTo(::std::ostream* os) const override {
-      source_matcher_.DescribeTo(os);
-    }
-
-    void DescribeNegationTo(::std::ostream* os) const override {
-      source_matcher_.DescribeNegationTo(os);
-    }
-
-   private:
-    const Matcher<U> source_matcher_;
-
-    GTEST_DISALLOW_ASSIGN_(Impl);
-  };
-};
-
-// This even more specialized version is used for efficiently casting
-// a matcher to its own type.
-template <typename T>
-class MatcherCastImpl<T, Matcher<T> > {
- public:
-  static Matcher<T> Cast(const Matcher<T>& matcher) { return matcher; }
-};
-
-}  // namespace internal
-
-// In order to be safe and clear, casting between different matcher
-// types is done explicitly via MatcherCast<T>(m), which takes a
-// matcher m and returns a Matcher<T>.  It compiles only when T can be
-// statically converted to the argument type of m.
-template <typename T, typename M>
-inline Matcher<T> MatcherCast(const M& matcher) {
-  return internal::MatcherCastImpl<T, M>::Cast(matcher);
-}
-
-// Implements SafeMatcherCast().
-//
-// FIXME: The intermediate SafeMatcherCastImpl class was introduced as a
-// workaround for a compiler bug, and can now be removed.
-template <typename T>
-class SafeMatcherCastImpl {
- public:
-  // This overload handles polymorphic matchers and values only since
-  // monomorphic matchers are handled by the next one.
-  template <typename M>
-  static inline Matcher<T> Cast(const M& polymorphic_matcher_or_value) {
-    return internal::MatcherCastImpl<T, M>::Cast(polymorphic_matcher_or_value);
-  }
-
-  // This overload handles monomorphic matchers.
-  //
-  // In general, if type T can be implicitly converted to type U, we can
-  // safely convert a Matcher<U> to a Matcher<T> (i.e. Matcher is
-  // contravariant): just keep a copy of the original Matcher<U>, convert the
-  // argument from type T to U, and then pass it to the underlying Matcher<U>.
-  // The only exception is when U is a reference and T is not, as the
-  // underlying Matcher<U> may be interested in the argument's address, which
-  // is not preserved in the conversion from T to U.
-  template <typename U>
-  static inline Matcher<T> Cast(const Matcher<U>& matcher) {
-    // Enforce that T can be implicitly converted to U.
-    GTEST_COMPILE_ASSERT_((std::is_convertible<T, U>::value),
-                          "T must be implicitly convertible to U");
-    // Enforce that we are not converting a non-reference type T to a reference
-    // type U.
-    GTEST_COMPILE_ASSERT_(
-        std::is_reference<T>::value || !std::is_reference<U>::value,
-        cannot_convert_non_reference_arg_to_reference);
-    // In case both T and U are arithmetic types, enforce that the
-    // conversion is not lossy.
-    typedef GTEST_REMOVE_REFERENCE_AND_CONST_(T) RawT;
-    typedef GTEST_REMOVE_REFERENCE_AND_CONST_(U) RawU;
-    const bool kTIsOther = GMOCK_KIND_OF_(RawT) == internal::kOther;
-    const bool kUIsOther = GMOCK_KIND_OF_(RawU) == internal::kOther;
-    GTEST_COMPILE_ASSERT_(
-        kTIsOther || kUIsOther ||
-        (internal::LosslessArithmeticConvertible<RawT, RawU>::value),
-        conversion_of_arithmetic_types_must_be_lossless);
-    return MatcherCast<T>(matcher);
-  }
-};
-
-template <typename T, typename M>
-inline Matcher<T> SafeMatcherCast(const M& polymorphic_matcher) {
-  return SafeMatcherCastImpl<T>::Cast(polymorphic_matcher);
-}
-
-// A<T>() returns a matcher that matches any value of type T.
-template <typename T>
-Matcher<T> A();
-
-// Anything inside the 'internal' namespace IS INTERNAL IMPLEMENTATION
-// and MUST NOT BE USED IN USER CODE!!!
-namespace internal {
-
-// If the explanation is not empty, prints it to the ostream.
-inline void PrintIfNotEmpty(const std::string& explanation,
-                            ::std::ostream* os) {
-  if (explanation != "" && os != nullptr) {
-    *os << ", " << explanation;
-  }
-}
-
-// Returns true if the given type name is easy to read by a human.
-// This is used to decide whether printing the type of a value might
-// be helpful.
-inline bool IsReadableTypeName(const std::string& type_name) {
-  // We consider a type name readable if it's short or doesn't contain
-  // a template or function type.
-  return (type_name.length() <= 20 ||
-          type_name.find_first_of("<(") == std::string::npos);
-}
-
-// Matches the value against the given matcher, prints the value and explains
-// the match result to the listener. Returns the match result.
-// 'listener' must not be NULL.
-// Value cannot be passed by const reference, because some matchers take a
-// non-const argument.
-template <typename Value, typename T>
-bool MatchPrintAndExplain(Value& value, const Matcher<T>& matcher,
-                          MatchResultListener* listener) {
-  if (!listener->IsInterested()) {
-    // If the listener is not interested, we do not need to construct the
-    // inner explanation.
-    return matcher.Matches(value);
-  }
-
-  StringMatchResultListener inner_listener;
-  const bool match = matcher.MatchAndExplain(value, &inner_listener);
-
-  UniversalPrint(value, listener->stream());
-#if GTEST_HAS_RTTI
-  const std::string& type_name = GetTypeName<Value>();
-  if (IsReadableTypeName(type_name))
-    *listener->stream() << " (of type " << type_name << ")";
-#endif
-  PrintIfNotEmpty(inner_listener.str(), listener->stream());
-
-  return match;
-}
-
-// An internal helper class for doing compile-time loop on a tuple's
-// fields.
-template <size_t N>
-class TuplePrefix {
- public:
-  // TuplePrefix<N>::Matches(matcher_tuple, value_tuple) returns true
-  // if and only if the first N fields of matcher_tuple matches
-  // the first N fields of value_tuple, respectively.
-  template <typename MatcherTuple, typename ValueTuple>
-  static bool Matches(const MatcherTuple& matcher_tuple,
-                      const ValueTuple& value_tuple) {
-    return TuplePrefix<N - 1>::Matches(matcher_tuple, value_tuple) &&
-           std::get<N - 1>(matcher_tuple).Matches(std::get<N - 1>(value_tuple));
-  }
-
-  // TuplePrefix<N>::ExplainMatchFailuresTo(matchers, values, os)
-  // describes failures in matching the first N fields of matchers
-  // against the first N fields of values.  If there is no failure,
-  // nothing will be streamed to os.
-  template <typename MatcherTuple, typename ValueTuple>
-  static void ExplainMatchFailuresTo(const MatcherTuple& matchers,
-                                     const ValueTuple& values,
-                                     ::std::ostream* os) {
-    // First, describes failures in the first N - 1 fields.
-    TuplePrefix<N - 1>::ExplainMatchFailuresTo(matchers, values, os);
-
-    // Then describes the failure (if any) in the (N - 1)-th (0-based)
-    // field.
-    typename std::tuple_element<N - 1, MatcherTuple>::type matcher =
-        std::get<N - 1>(matchers);
-    typedef typename std::tuple_element<N - 1, ValueTuple>::type Value;
-    const Value& value = std::get<N - 1>(values);
-    StringMatchResultListener listener;
-    if (!matcher.MatchAndExplain(value, &listener)) {
-      *os << "  Expected arg #" << N - 1 << ": ";
-      std::get<N - 1>(matchers).DescribeTo(os);
-      *os << "\n           Actual: ";
-      // We remove the reference in type Value to prevent the
-      // universal printer from printing the address of value, which
-      // isn't interesting to the user most of the time.  The
-      // matcher's MatchAndExplain() method handles the case when
-      // the address is interesting.
-      internal::UniversalPrint(value, os);
-      PrintIfNotEmpty(listener.str(), os);
-      *os << "\n";
-    }
-  }
-};
-
-// The base case.
-template <>
-class TuplePrefix<0> {
- public:
-  template <typename MatcherTuple, typename ValueTuple>
-  static bool Matches(const MatcherTuple& /* matcher_tuple */,
-                      const ValueTuple& /* value_tuple */) {
-    return true;
-  }
-
-  template <typename MatcherTuple, typename ValueTuple>
-  static void ExplainMatchFailuresTo(const MatcherTuple& /* matchers */,
-                                     const ValueTuple& /* values */,
-                                     ::std::ostream* /* os */) {}
-};
-
-// TupleMatches(matcher_tuple, value_tuple) returns true if and only if
-// all matchers in matcher_tuple match the corresponding fields in
-// value_tuple.  It is a compiler error if matcher_tuple and
-// value_tuple have different number of fields or incompatible field
-// types.
-template <typename MatcherTuple, typename ValueTuple>
-bool TupleMatches(const MatcherTuple& matcher_tuple,
-                  const ValueTuple& value_tuple) {
-  // Makes sure that matcher_tuple and value_tuple have the same
-  // number of fields.
-  GTEST_COMPILE_ASSERT_(std::tuple_size<MatcherTuple>::value ==
-                            std::tuple_size<ValueTuple>::value,
-                        matcher_and_value_have_different_numbers_of_fields);
-  return TuplePrefix<std::tuple_size<ValueTuple>::value>::Matches(matcher_tuple,
-                                                                  value_tuple);
-}
-
-// Describes failures in matching matchers against values.  If there
-// is no failure, nothing will be streamed to os.
-template <typename MatcherTuple, typename ValueTuple>
-void ExplainMatchFailureTupleTo(const MatcherTuple& matchers,
-                                const ValueTuple& values,
-                                ::std::ostream* os) {
-  TuplePrefix<std::tuple_size<MatcherTuple>::value>::ExplainMatchFailuresTo(
-      matchers, values, os);
-}
-
-// TransformTupleValues and its helper.
-//
-// TransformTupleValuesHelper hides the internal machinery that
-// TransformTupleValues uses to implement a tuple traversal.
-template <typename Tuple, typename Func, typename OutIter>
-class TransformTupleValuesHelper {
- private:
-  typedef ::std::tuple_size<Tuple> TupleSize;
-
- public:
-  // For each member of tuple 't', taken in order, evaluates '*out++ = f(t)'.
-  // Returns the final value of 'out' in case the caller needs it.
-  static OutIter Run(Func f, const Tuple& t, OutIter out) {
-    return IterateOverTuple<Tuple, TupleSize::value>()(f, t, out);
-  }
-
- private:
-  template <typename Tup, size_t kRemainingSize>
-  struct IterateOverTuple {
-    OutIter operator() (Func f, const Tup& t, OutIter out) const {
-      *out++ = f(::std::get<TupleSize::value - kRemainingSize>(t));
-      return IterateOverTuple<Tup, kRemainingSize - 1>()(f, t, out);
-    }
-  };
-  template <typename Tup>
-  struct IterateOverTuple<Tup, 0> {
-    OutIter operator() (Func /* f */, const Tup& /* t */, OutIter out) const {
-      return out;
-    }
-  };
-};
-
-// Successively invokes 'f(element)' on each element of the tuple 't',
-// appending each result to the 'out' iterator. Returns the final value
-// of 'out'.
-template <typename Tuple, typename Func, typename OutIter>
-OutIter TransformTupleValues(Func f, const Tuple& t, OutIter out) {
-  return TransformTupleValuesHelper<Tuple, Func, OutIter>::Run(f, t, out);
-}
-
-// Implements A<T>().
-template <typename T>
-class AnyMatcherImpl : public MatcherInterface<const T&> {
- public:
-  bool MatchAndExplain(const T& /* x */,
-                       MatchResultListener* /* listener */) const override {
-    return true;
-  }
-  void DescribeTo(::std::ostream* os) const override { *os << "is anything"; }
-  void DescribeNegationTo(::std::ostream* os) const override {
-    // This is mostly for completeness' safe, as it's not very useful
-    // to write Not(A<bool>()).  However we cannot completely rule out
-    // such a possibility, and it doesn't hurt to be prepared.
-    *os << "never matches";
-  }
-};
-
-// Implements _, a matcher that matches any value of any
-// type.  This is a polymorphic matcher, so we need a template type
-// conversion operator to make it appearing as a Matcher<T> for any
-// type T.
-class AnythingMatcher {
- public:
-  template <typename T>
-  operator Matcher<T>() const { return A<T>(); }
-};
-
-// Implements the polymorphic IsNull() matcher, which matches any raw or smart
-// pointer that is NULL.
-class IsNullMatcher {
- public:
-  template <typename Pointer>
-  bool MatchAndExplain(const Pointer& p,
-                       MatchResultListener* /* listener */) const {
-    return p == nullptr;
-  }
-
-  void DescribeTo(::std::ostream* os) const { *os << "is NULL"; }
-  void DescribeNegationTo(::std::ostream* os) const {
-    *os << "isn't NULL";
-  }
-};
-
-// Implements the polymorphic NotNull() matcher, which matches any raw or smart
-// pointer that is not NULL.
-class NotNullMatcher {
- public:
-  template <typename Pointer>
-  bool MatchAndExplain(const Pointer& p,
-                       MatchResultListener* /* listener */) const {
-    return p != nullptr;
-  }
-
-  void DescribeTo(::std::ostream* os) const { *os << "isn't NULL"; }
-  void DescribeNegationTo(::std::ostream* os) const {
-    *os << "is NULL";
-  }
-};
-
-// Ref(variable) matches any argument that is a reference to
-// 'variable'.  This matcher is polymorphic as it can match any
-// super type of the type of 'variable'.
-//
-// The RefMatcher template class implements Ref(variable).  It can
-// only be instantiated with a reference type.  This prevents a user
-// from mistakenly using Ref(x) to match a non-reference function
-// argument.  For example, the following will righteously cause a
-// compiler error:
-//
-//   int n;
-//   Matcher<int> m1 = Ref(n);   // This won't compile.
-//   Matcher<int&> m2 = Ref(n);  // This will compile.
-template <typename T>
-class RefMatcher;
-
-template <typename T>
-class RefMatcher<T&> {
-  // Google Mock is a generic framework and thus needs to support
-  // mocking any function types, including those that take non-const
-  // reference arguments.  Therefore the template parameter T (and
-  // Super below) can be instantiated to either a const type or a
-  // non-const type.
- public:
-  // RefMatcher() takes a T& instead of const T&, as we want the
-  // compiler to catch using Ref(const_value) as a matcher for a
-  // non-const reference.
-  explicit RefMatcher(T& x) : object_(x) {}  // NOLINT
-
-  template <typename Super>
-  operator Matcher<Super&>() const {
-    // By passing object_ (type T&) to Impl(), which expects a Super&,
-    // we make sure that Super is a super type of T.  In particular,
-    // this catches using Ref(const_value) as a matcher for a
-    // non-const reference, as you cannot implicitly convert a const
-    // reference to a non-const reference.
-    return MakeMatcher(new Impl<Super>(object_));
-  }
-
- private:
-  template <typename Super>
-  class Impl : public MatcherInterface<Super&> {
-   public:
-    explicit Impl(Super& x) : object_(x) {}  // NOLINT
-
-    // MatchAndExplain() takes a Super& (as opposed to const Super&)
-    // in order to match the interface MatcherInterface<Super&>.
-    bool MatchAndExplain(Super& x,
-                         MatchResultListener* listener) const override {
-      *listener << "which is located @" << static_cast<const void*>(&x);
-      return &x == &object_;
-    }
-
-    void DescribeTo(::std::ostream* os) const override {
-      *os << "references the variable ";
-      UniversalPrinter<Super&>::Print(object_, os);
-    }
-
-    void DescribeNegationTo(::std::ostream* os) const override {
-      *os << "does not reference the variable ";
-      UniversalPrinter<Super&>::Print(object_, os);
-    }
-
-   private:
-    const Super& object_;
-
-    GTEST_DISALLOW_ASSIGN_(Impl);
-  };
-
-  T& object_;
-
-  GTEST_DISALLOW_ASSIGN_(RefMatcher);
-};
-
-// Polymorphic helper functions for narrow and wide string matchers.
-inline bool CaseInsensitiveCStringEquals(const char* lhs, const char* rhs) {
-  return String::CaseInsensitiveCStringEquals(lhs, rhs);
-}
-
-inline bool CaseInsensitiveCStringEquals(const wchar_t* lhs,
-                                         const wchar_t* rhs) {
-  return String::CaseInsensitiveWideCStringEquals(lhs, rhs);
-}
-
-// String comparison for narrow or wide strings that can have embedded NUL
-// characters.
-template <typename StringType>
-bool CaseInsensitiveStringEquals(const StringType& s1,
-                                 const StringType& s2) {
-  // Are the heads equal?
-  if (!CaseInsensitiveCStringEquals(s1.c_str(), s2.c_str())) {
-    return false;
-  }
-
-  // Skip the equal heads.
-  const typename StringType::value_type nul = 0;
-  const size_t i1 = s1.find(nul), i2 = s2.find(nul);
-
-  // Are we at the end of either s1 or s2?
-  if (i1 == StringType::npos || i2 == StringType::npos) {
-    return i1 == i2;
-  }
-
-  // Are the tails equal?
-  return CaseInsensitiveStringEquals(s1.substr(i1 + 1), s2.substr(i2 + 1));
-}
-
-// String matchers.
-
-// Implements equality-based string matchers like StrEq, StrCaseNe, and etc.
-template <typename StringType>
-class StrEqualityMatcher {
- public:
-  StrEqualityMatcher(const StringType& str, bool expect_eq,
-                     bool case_sensitive)
-      : string_(str), expect_eq_(expect_eq), case_sensitive_(case_sensitive) {}
-
-#if GTEST_HAS_ABSL
-  bool MatchAndExplain(const absl::string_view& s,
-                       MatchResultListener* listener) const {
-    // This should fail to compile if absl::string_view is used with wide
-    // strings.
-    const StringType& str = std::string(s);
-    return MatchAndExplain(str, listener);
-  }
-#endif  // GTEST_HAS_ABSL
-
-  // Accepts pointer types, particularly:
-  //   const char*
-  //   char*
-  //   const wchar_t*
-  //   wchar_t*
-  template <typename CharType>
-  bool MatchAndExplain(CharType* s, MatchResultListener* listener) const {
-    if (s == nullptr) {
-      return !expect_eq_;
-    }
-    return MatchAndExplain(StringType(s), listener);
-  }
-
-  // Matches anything that can convert to StringType.
-  //
-  // This is a template, not just a plain function with const StringType&,
-  // because absl::string_view has some interfering non-explicit constructors.
-  template <typename MatcheeStringType>
-  bool MatchAndExplain(const MatcheeStringType& s,
-                       MatchResultListener* /* listener */) const {
-    const StringType& s2(s);
-    const bool eq = case_sensitive_ ? s2 == string_ :
-        CaseInsensitiveStringEquals(s2, string_);
-    return expect_eq_ == eq;
-  }
-
-  void DescribeTo(::std::ostream* os) const {
-    DescribeToHelper(expect_eq_, os);
-  }
-
-  void DescribeNegationTo(::std::ostream* os) const {
-    DescribeToHelper(!expect_eq_, os);
-  }
-
- private:
-  void DescribeToHelper(bool expect_eq, ::std::ostream* os) const {
-    *os << (expect_eq ? "is " : "isn't ");
-    *os << "equal to ";
-    if (!case_sensitive_) {
-      *os << "(ignoring case) ";
-    }
-    UniversalPrint(string_, os);
-  }
-
-  const StringType string_;
-  const bool expect_eq_;
-  const bool case_sensitive_;
-
-  GTEST_DISALLOW_ASSIGN_(StrEqualityMatcher);
-};
-
-// Implements the polymorphic HasSubstr(substring) matcher, which
-// can be used as a Matcher<T> as long as T can be converted to a
-// string.
-template <typename StringType>
-class HasSubstrMatcher {
- public:
-  explicit HasSubstrMatcher(const StringType& substring)
-      : substring_(substring) {}
-
-#if GTEST_HAS_ABSL
-  bool MatchAndExplain(const absl::string_view& s,
-                       MatchResultListener* listener) const {
-    // This should fail to compile if absl::string_view is used with wide
-    // strings.
-    const StringType& str = std::string(s);
-    return MatchAndExplain(str, listener);
-  }
-#endif  // GTEST_HAS_ABSL
-
-  // Accepts pointer types, particularly:
-  //   const char*
-  //   char*
-  //   const wchar_t*
-  //   wchar_t*
-  template <typename CharType>
-  bool MatchAndExplain(CharType* s, MatchResultListener* listener) const {
-    return s != nullptr && MatchAndExplain(StringType(s), listener);
-  }
-
-  // Matches anything that can convert to StringType.
-  //
-  // This is a template, not just a plain function with const StringType&,
-  // because absl::string_view has some interfering non-explicit constructors.
-  template <typename MatcheeStringType>
-  bool MatchAndExplain(const MatcheeStringType& s,
-                       MatchResultListener* /* listener */) const {
-    const StringType& s2(s);
-    return s2.find(substring_) != StringType::npos;
-  }
-
-  // Describes what this matcher matches.
-  void DescribeTo(::std::ostream* os) const {
-    *os << "has substring ";
-    UniversalPrint(substring_, os);
-  }
-
-  void DescribeNegationTo(::std::ostream* os) const {
-    *os << "has no substring ";
-    UniversalPrint(substring_, os);
-  }
-
- private:
-  const StringType substring_;
-
-  GTEST_DISALLOW_ASSIGN_(HasSubstrMatcher);
-};
-
-// Implements the polymorphic StartsWith(substring) matcher, which
-// can be used as a Matcher<T> as long as T can be converted to a
-// string.
-template <typename StringType>
-class StartsWithMatcher {
- public:
-  explicit StartsWithMatcher(const StringType& prefix) : prefix_(prefix) {
-  }
-
-#if GTEST_HAS_ABSL
-  bool MatchAndExplain(const absl::string_view& s,
-                       MatchResultListener* listener) const {
-    // This should fail to compile if absl::string_view is used with wide
-    // strings.
-    const StringType& str = std::string(s);
-    return MatchAndExplain(str, listener);
-  }
-#endif  // GTEST_HAS_ABSL
-
-  // Accepts pointer types, particularly:
-  //   const char*
-  //   char*
-  //   const wchar_t*
-  //   wchar_t*
-  template <typename CharType>
-  bool MatchAndExplain(CharType* s, MatchResultListener* listener) const {
-    return s != nullptr && MatchAndExplain(StringType(s), listener);
-  }
-
-  // Matches anything that can convert to StringType.
-  //
-  // This is a template, not just a plain function with const StringType&,
-  // because absl::string_view has some interfering non-explicit constructors.
-  template <typename MatcheeStringType>
-  bool MatchAndExplain(const MatcheeStringType& s,
-                       MatchResultListener* /* listener */) const {
-    const StringType& s2(s);
-    return s2.length() >= prefix_.length() &&
-        s2.substr(0, prefix_.length()) == prefix_;
-  }
-
-  void DescribeTo(::std::ostream* os) const {
-    *os << "starts with ";
-    UniversalPrint(prefix_, os);
-  }
-
-  void DescribeNegationTo(::std::ostream* os) const {
-    *os << "doesn't start with ";
-    UniversalPrint(prefix_, os);
-  }
-
- private:
-  const StringType prefix_;
-
-  GTEST_DISALLOW_ASSIGN_(StartsWithMatcher);
-};
-
-// Implements the polymorphic EndsWith(substring) matcher, which
-// can be used as a Matcher<T> as long as T can be converted to a
-// string.
-template <typename StringType>
-class EndsWithMatcher {
- public:
-  explicit EndsWithMatcher(const StringType& suffix) : suffix_(suffix) {}
-
-#if GTEST_HAS_ABSL
-  bool MatchAndExplain(const absl::string_view& s,
-                       MatchResultListener* listener) const {
-    // This should fail to compile if absl::string_view is used with wide
-    // strings.
-    const StringType& str = std::string(s);
-    return MatchAndExplain(str, listener);
-  }
-#endif  // GTEST_HAS_ABSL
-
-  // Accepts pointer types, particularly:
-  //   const char*
-  //   char*
-  //   const wchar_t*
-  //   wchar_t*
-  template <typename CharType>
-  bool MatchAndExplain(CharType* s, MatchResultListener* listener) const {
-    return s != nullptr && MatchAndExplain(StringType(s), listener);
-  }
-
-  // Matches anything that can convert to StringType.
-  //
-  // This is a template, not just a plain function with const StringType&,
-  // because absl::string_view has some interfering non-explicit constructors.
-  template <typename MatcheeStringType>
-  bool MatchAndExplain(const MatcheeStringType& s,
-                       MatchResultListener* /* listener */) const {
-    const StringType& s2(s);
-    return s2.length() >= suffix_.length() &&
-        s2.substr(s2.length() - suffix_.length()) == suffix_;
-  }
-
-  void DescribeTo(::std::ostream* os) const {
-    *os << "ends with ";
-    UniversalPrint(suffix_, os);
-  }
-
-  void DescribeNegationTo(::std::ostream* os) const {
-    *os << "doesn't end with ";
-    UniversalPrint(suffix_, os);
-  }
-
- private:
-  const StringType suffix_;
-
-  GTEST_DISALLOW_ASSIGN_(EndsWithMatcher);
-};
-
-// Implements a matcher that compares the two fields of a 2-tuple
-// using one of the ==, <=, <, etc, operators.  The two fields being
-// compared don't have to have the same type.
-//
-// The matcher defined here is polymorphic (for example, Eq() can be
-// used to match a std::tuple<int, short>, a std::tuple<const long&, double>,
-// etc).  Therefore we use a template type conversion operator in the
-// implementation.
-template <typename D, typename Op>
-class PairMatchBase {
- public:
-  template <typename T1, typename T2>
-  operator Matcher<::std::tuple<T1, T2>>() const {
-    return Matcher<::std::tuple<T1, T2>>(new Impl<const ::std::tuple<T1, T2>&>);
-  }
-  template <typename T1, typename T2>
-  operator Matcher<const ::std::tuple<T1, T2>&>() const {
-    return MakeMatcher(new Impl<const ::std::tuple<T1, T2>&>);
-  }
-
- private:
-  static ::std::ostream& GetDesc(::std::ostream& os) {  // NOLINT
-    return os << D::Desc();
-  }
-
-  template <typename Tuple>
-  class Impl : public MatcherInterface<Tuple> {
-   public:
-    bool MatchAndExplain(Tuple args,
-                         MatchResultListener* /* listener */) const override {
-      return Op()(::std::get<0>(args), ::std::get<1>(args));
-    }
-    void DescribeTo(::std::ostream* os) const override {
-      *os << "are " << GetDesc;
-    }
-    void DescribeNegationTo(::std::ostream* os) const override {
-      *os << "aren't " << GetDesc;
-    }
-  };
-};
-
-class Eq2Matcher : public PairMatchBase<Eq2Matcher, AnyEq> {
- public:
-  static const char* Desc() { return "an equal pair"; }
-};
-class Ne2Matcher : public PairMatchBase<Ne2Matcher, AnyNe> {
- public:
-  static const char* Desc() { return "an unequal pair"; }
-};
-class Lt2Matcher : public PairMatchBase<Lt2Matcher, AnyLt> {
- public:
-  static const char* Desc() { return "a pair where the first < the second"; }
-};
-class Gt2Matcher : public PairMatchBase<Gt2Matcher, AnyGt> {
- public:
-  static const char* Desc() { return "a pair where the first > the second"; }
-};
-class Le2Matcher : public PairMatchBase<Le2Matcher, AnyLe> {
- public:
-  static const char* Desc() { return "a pair where the first <= the second"; }
-};
-class Ge2Matcher : public PairMatchBase<Ge2Matcher, AnyGe> {
- public:
-  static const char* Desc() { return "a pair where the first >= the second"; }
-};
-
-// Implements the Not(...) matcher for a particular argument type T.
-// We do not nest it inside the NotMatcher class template, as that
-// will prevent different instantiations of NotMatcher from sharing
-// the same NotMatcherImpl<T> class.
-template <typename T>
-class NotMatcherImpl : public MatcherInterface<const T&> {
- public:
-  explicit NotMatcherImpl(const Matcher<T>& matcher)
-      : matcher_(matcher) {}
-
-  bool MatchAndExplain(const T& x,
-                       MatchResultListener* listener) const override {
-    return !matcher_.MatchAndExplain(x, listener);
-  }
-
-  void DescribeTo(::std::ostream* os) const override {
-    matcher_.DescribeNegationTo(os);
-  }
-
-  void DescribeNegationTo(::std::ostream* os) const override {
-    matcher_.DescribeTo(os);
-  }
-
- private:
-  const Matcher<T> matcher_;
-
-  GTEST_DISALLOW_ASSIGN_(NotMatcherImpl);
-};
-
-// Implements the Not(m) matcher, which matches a value that doesn't
-// match matcher m.
-template <typename InnerMatcher>
-class NotMatcher {
- public:
-  explicit NotMatcher(InnerMatcher matcher) : matcher_(matcher) {}
-
-  // This template type conversion operator allows Not(m) to be used
-  // to match any type m can match.
-  template <typename T>
-  operator Matcher<T>() const {
-    return Matcher<T>(new NotMatcherImpl<T>(SafeMatcherCast<T>(matcher_)));
-  }
-
- private:
-  InnerMatcher matcher_;
-
-  GTEST_DISALLOW_ASSIGN_(NotMatcher);
-};
-
-// Implements the AllOf(m1, m2) matcher for a particular argument type
-// T. We do not nest it inside the BothOfMatcher class template, as
-// that will prevent different instantiations of BothOfMatcher from
-// sharing the same BothOfMatcherImpl<T> class.
-template <typename T>
-class AllOfMatcherImpl : public MatcherInterface<const T&> {
- public:
-  explicit AllOfMatcherImpl(std::vector<Matcher<T> > matchers)
-      : matchers_(std::move(matchers)) {}
-
-  void DescribeTo(::std::ostream* os) const override {
-    *os << "(";
-    for (size_t i = 0; i < matchers_.size(); ++i) {
-      if (i != 0) *os << ") and (";
-      matchers_[i].DescribeTo(os);
-    }
-    *os << ")";
-  }
-
-  void DescribeNegationTo(::std::ostream* os) const override {
-    *os << "(";
-    for (size_t i = 0; i < matchers_.size(); ++i) {
-      if (i != 0) *os << ") or (";
-      matchers_[i].DescribeNegationTo(os);
-    }
-    *os << ")";
-  }
-
-  bool MatchAndExplain(const T& x,
-                       MatchResultListener* listener) const override {
-    // If either matcher1_ or matcher2_ doesn't match x, we only need
-    // to explain why one of them fails.
-    std::string all_match_result;
-
-    for (size_t i = 0; i < matchers_.size(); ++i) {
-      StringMatchResultListener slistener;
-      if (matchers_[i].MatchAndExplain(x, &slistener)) {
-        if (all_match_result.empty()) {
-          all_match_result = slistener.str();
-        } else {
-          std::string result = slistener.str();
-          if (!result.empty()) {
-            all_match_result += ", and ";
-            all_match_result += result;
-          }
-        }
-      } else {
-        *listener << slistener.str();
-        return false;
-      }
-    }
-
-    // Otherwise we need to explain why *both* of them match.
-    *listener << all_match_result;
-    return true;
-  }
-
- private:
-  const std::vector<Matcher<T> > matchers_;
-
-  GTEST_DISALLOW_ASSIGN_(AllOfMatcherImpl);
-};
-
-// VariadicMatcher is used for the variadic implementation of
-// AllOf(m_1, m_2, ...) and AnyOf(m_1, m_2, ...).
-// CombiningMatcher<T> is used to recursively combine the provided matchers
-// (of type Args...).
-template <template <typename T> class CombiningMatcher, typename... Args>
-class VariadicMatcher {
- public:
-  VariadicMatcher(const Args&... matchers)  // NOLINT
-      : matchers_(matchers...) {
-    static_assert(sizeof...(Args) > 0, "Must have at least one matcher.");
-  }
-
-  // This template type conversion operator allows an
-  // VariadicMatcher<Matcher1, Matcher2...> object to match any type that
-  // all of the provided matchers (Matcher1, Matcher2, ...) can match.
-  template <typename T>
-  operator Matcher<T>() const {
-    std::vector<Matcher<T> > values;
-    CreateVariadicMatcher<T>(&values, std::integral_constant<size_t, 0>());
-    return Matcher<T>(new CombiningMatcher<T>(std::move(values)));
-  }
-
- private:
-  template <typename T, size_t I>
-  void CreateVariadicMatcher(std::vector<Matcher<T> >* values,
-                             std::integral_constant<size_t, I>) const {
-    values->push_back(SafeMatcherCast<T>(std::get<I>(matchers_)));
-    CreateVariadicMatcher<T>(values, std::integral_constant<size_t, I + 1>());
-  }
-
-  template <typename T>
-  void CreateVariadicMatcher(
-      std::vector<Matcher<T> >*,
-      std::integral_constant<size_t, sizeof...(Args)>) const {}
-
-  std::tuple<Args...> matchers_;
-
-  GTEST_DISALLOW_ASSIGN_(VariadicMatcher);
-};
-
-template <typename... Args>
-using AllOfMatcher = VariadicMatcher<AllOfMatcherImpl, Args...>;
-
-// Implements the AnyOf(m1, m2) matcher for a particular argument type
-// T.  We do not nest it inside the AnyOfMatcher class template, as
-// that will prevent different instantiations of AnyOfMatcher from
-// sharing the same EitherOfMatcherImpl<T> class.
-template <typename T>
-class AnyOfMatcherImpl : public MatcherInterface<const T&> {
- public:
-  explicit AnyOfMatcherImpl(std::vector<Matcher<T> > matchers)
-      : matchers_(std::move(matchers)) {}
-
-  void DescribeTo(::std::ostream* os) const override {
-    *os << "(";
-    for (size_t i = 0; i < matchers_.size(); ++i) {
-      if (i != 0) *os << ") or (";
-      matchers_[i].DescribeTo(os);
-    }
-    *os << ")";
-  }
-
-  void DescribeNegationTo(::std::ostream* os) const override {
-    *os << "(";
-    for (size_t i = 0; i < matchers_.size(); ++i) {
-      if (i != 0) *os << ") and (";
-      matchers_[i].DescribeNegationTo(os);
-    }
-    *os << ")";
-  }
-
-  bool MatchAndExplain(const T& x,
-                       MatchResultListener* listener) const override {
-    std::string no_match_result;
-
-    // If either matcher1_ or matcher2_ matches x, we just need to
-    // explain why *one* of them matches.
-    for (size_t i = 0; i < matchers_.size(); ++i) {
-      StringMatchResultListener slistener;
-      if (matchers_[i].MatchAndExplain(x, &slistener)) {
-        *listener << slistener.str();
-        return true;
-      } else {
-        if (no_match_result.empty()) {
-          no_match_result = slistener.str();
-        } else {
-          std::string result = slistener.str();
-          if (!result.empty()) {
-            no_match_result += ", and ";
-            no_match_result += result;
-          }
-        }
-      }
-    }
-
-    // Otherwise we need to explain why *both* of them fail.
-    *listener << no_match_result;
-    return false;
-  }
-
- private:
-  const std::vector<Matcher<T> > matchers_;
-
-  GTEST_DISALLOW_ASSIGN_(AnyOfMatcherImpl);
-};
-
-// AnyOfMatcher is used for the variadic implementation of AnyOf(m_1, m_2, ...).
-template <typename... Args>
-using AnyOfMatcher = VariadicMatcher<AnyOfMatcherImpl, Args...>;
-
-// Wrapper for implementation of Any/AllOfArray().
-template <template <class> class MatcherImpl, typename T>
-class SomeOfArrayMatcher {
- public:
-  // Constructs the matcher from a sequence of element values or
-  // element matchers.
-  template <typename Iter>
-  SomeOfArrayMatcher(Iter first, Iter last) : matchers_(first, last) {}
-
-  template <typename U>
-  operator Matcher<U>() const {  // NOLINT
-    using RawU = typename std::decay<U>::type;
-    std::vector<Matcher<RawU>> matchers;
-    for (const auto& matcher : matchers_) {
-      matchers.push_back(MatcherCast<RawU>(matcher));
-    }
-    return Matcher<U>(new MatcherImpl<RawU>(std::move(matchers)));
-  }
-
- private:
-  const ::std::vector<T> matchers_;
-
-  GTEST_DISALLOW_ASSIGN_(SomeOfArrayMatcher);
-};
-
-template <typename T>
-using AllOfArrayMatcher = SomeOfArrayMatcher<AllOfMatcherImpl, T>;
-
-template <typename T>
-using AnyOfArrayMatcher = SomeOfArrayMatcher<AnyOfMatcherImpl, T>;
-
-// Used for implementing Truly(pred), which turns a predicate into a
-// matcher.
-template <typename Predicate>
-class TrulyMatcher {
- public:
-  explicit TrulyMatcher(Predicate pred) : predicate_(pred) {}
-
-  // This method template allows Truly(pred) to be used as a matcher
-  // for type T where T is the argument type of predicate 'pred'.  The
-  // argument is passed by reference as the predicate may be
-  // interested in the address of the argument.
-  template <typename T>
-  bool MatchAndExplain(T& x,  // NOLINT
-                       MatchResultListener* /* listener */) const {
-    // Without the if-statement, MSVC sometimes warns about converting
-    // a value to bool (warning 4800).
-    //
-    // We cannot write 'return !!predicate_(x);' as that doesn't work
-    // when predicate_(x) returns a class convertible to bool but
-    // having no operator!().
-    if (predicate_(x))
-      return true;
-    return false;
-  }
-
-  void DescribeTo(::std::ostream* os) const {
-    *os << "satisfies the given predicate";
-  }
-
-  void DescribeNegationTo(::std::ostream* os) const {
-    *os << "doesn't satisfy the given predicate";
-  }
-
- private:
-  Predicate predicate_;
-
-  GTEST_DISALLOW_ASSIGN_(TrulyMatcher);
-};
-
-// Used for implementing Matches(matcher), which turns a matcher into
-// a predicate.
-template <typename M>
-class MatcherAsPredicate {
- public:
-  explicit MatcherAsPredicate(M matcher) : matcher_(matcher) {}
-
-  // This template operator() allows Matches(m) to be used as a
-  // predicate on type T where m is a matcher on type T.
-  //
-  // The argument x is passed by reference instead of by value, as
-  // some matcher may be interested in its address (e.g. as in
-  // Matches(Ref(n))(x)).
-  template <typename T>
-  bool operator()(const T& x) const {
-    // We let matcher_ commit to a particular type here instead of
-    // when the MatcherAsPredicate object was constructed.  This
-    // allows us to write Matches(m) where m is a polymorphic matcher
-    // (e.g. Eq(5)).
-    //
-    // If we write Matcher<T>(matcher_).Matches(x) here, it won't
-    // compile when matcher_ has type Matcher<const T&>; if we write
-    // Matcher<const T&>(matcher_).Matches(x) here, it won't compile
-    // when matcher_ has type Matcher<T>; if we just write
-    // matcher_.Matches(x), it won't compile when matcher_ is
-    // polymorphic, e.g. Eq(5).
-    //
-    // MatcherCast<const T&>() is necessary for making the code work
-    // in all of the above situations.
-    return MatcherCast<const T&>(matcher_).Matches(x);
-  }
-
- private:
-  M matcher_;
-
-  GTEST_DISALLOW_ASSIGN_(MatcherAsPredicate);
-};
-
-// For implementing ASSERT_THAT() and EXPECT_THAT().  The template
-// argument M must be a type that can be converted to a matcher.
-template <typename M>
-class PredicateFormatterFromMatcher {
- public:
-  explicit PredicateFormatterFromMatcher(M m) : matcher_(std::move(m)) {}
-
-  // This template () operator allows a PredicateFormatterFromMatcher
-  // object to act as a predicate-formatter suitable for using with
-  // Google Test's EXPECT_PRED_FORMAT1() macro.
-  template <typename T>
-  AssertionResult operator()(const char* value_text, const T& x) const {
-    // We convert matcher_ to a Matcher<const T&> *now* instead of
-    // when the PredicateFormatterFromMatcher object was constructed,
-    // as matcher_ may be polymorphic (e.g. NotNull()) and we won't
-    // know which type to instantiate it to until we actually see the
-    // type of x here.
-    //
-    // We write SafeMatcherCast<const T&>(matcher_) instead of
-    // Matcher<const T&>(matcher_), as the latter won't compile when
-    // matcher_ has type Matcher<T> (e.g. An<int>()).
-    // We don't write MatcherCast<const T&> either, as that allows
-    // potentially unsafe downcasting of the matcher argument.
-    const Matcher<const T&> matcher = SafeMatcherCast<const T&>(matcher_);
-
-    // The expected path here is that the matcher should match (i.e. that most
-    // tests pass) so optimize for this case.
-    if (matcher.Matches(x)) {
-      return AssertionSuccess();
-    }
-
-    ::std::stringstream ss;
-    ss << "Value of: " << value_text << "\n"
-       << "Expected: ";
-    matcher.DescribeTo(&ss);
-
-    // Rerun the matcher to "PrintAndExain" the failure.
-    StringMatchResultListener listener;
-    if (MatchPrintAndExplain(x, matcher, &listener)) {
-      ss << "\n  The matcher failed on the initial attempt; but passed when "
-            "rerun to generate the explanation.";
-    }
-    ss << "\n  Actual: " << listener.str();
-    return AssertionFailure() << ss.str();
-  }
-
- private:
-  const M matcher_;
-
-  GTEST_DISALLOW_ASSIGN_(PredicateFormatterFromMatcher);
-};
-
-// A helper function for converting a matcher to a predicate-formatter
-// without the user needing to explicitly write the type.  This is
-// used for implementing ASSERT_THAT() and EXPECT_THAT().
-// Implementation detail: 'matcher' is received by-value to force decaying.
-template <typename M>
-inline PredicateFormatterFromMatcher<M>
-MakePredicateFormatterFromMatcher(M matcher) {
-  return PredicateFormatterFromMatcher<M>(std::move(matcher));
-}
-
-// Implements the polymorphic floating point equality matcher, which matches
-// two float values using ULP-based approximation or, optionally, a
-// user-specified epsilon.  The template is meant to be instantiated with
-// FloatType being either float or double.
-template <typename FloatType>
-class FloatingEqMatcher {
- public:
-  // Constructor for FloatingEqMatcher.
-  // The matcher's input will be compared with expected.  The matcher treats two
-  // NANs as equal if nan_eq_nan is true.  Otherwise, under IEEE standards,
-  // equality comparisons between NANs will always return false.  We specify a
-  // negative max_abs_error_ term to indicate that ULP-based approximation will
-  // be used for comparison.
-  FloatingEqMatcher(FloatType expected, bool nan_eq_nan) :
-    expected_(expected), nan_eq_nan_(nan_eq_nan), max_abs_error_(-1) {
-  }
-
-  // Constructor that supports a user-specified max_abs_error that will be used
-  // for comparison instead of ULP-based approximation.  The max absolute
-  // should be non-negative.
-  FloatingEqMatcher(FloatType expected, bool nan_eq_nan,
-                    FloatType max_abs_error)
-      : expected_(expected),
-        nan_eq_nan_(nan_eq_nan),
-        max_abs_error_(max_abs_error) {
-    GTEST_CHECK_(max_abs_error >= 0)
-        << ", where max_abs_error is" << max_abs_error;
-  }
-
-  // Implements floating point equality matcher as a Matcher<T>.
-  template <typename T>
-  class Impl : public MatcherInterface<T> {
-   public:
-    Impl(FloatType expected, bool nan_eq_nan, FloatType max_abs_error)
-        : expected_(expected),
-          nan_eq_nan_(nan_eq_nan),
-          max_abs_error_(max_abs_error) {}
-
-    bool MatchAndExplain(T value,
-                         MatchResultListener* listener) const override {
-      const FloatingPoint<FloatType> actual(value), expected(expected_);
-
-      // Compares NaNs first, if nan_eq_nan_ is true.
-      if (actual.is_nan() || expected.is_nan()) {
-        if (actual.is_nan() && expected.is_nan()) {
-          return nan_eq_nan_;
-        }
-        // One is nan; the other is not nan.
-        return false;
-      }
-      if (HasMaxAbsError()) {
-        // We perform an equality check so that inf will match inf, regardless
-        // of error bounds.  If the result of value - expected_ would result in
-        // overflow or if either value is inf, the default result is infinity,
-        // which should only match if max_abs_error_ is also infinity.
-        if (value == expected_) {
-          return true;
-        }
-
-        const FloatType diff = value - expected_;
-        if (fabs(diff) <= max_abs_error_) {
-          return true;
-        }
-
-        if (listener->IsInterested()) {
-          *listener << "which is " << diff << " from " << expected_;
-        }
-        return false;
-      } else {
-        return actual.AlmostEquals(expected);
-      }
-    }
-
-    void DescribeTo(::std::ostream* os) const override {
-      // os->precision() returns the previously set precision, which we
-      // store to restore the ostream to its original configuration
-      // after outputting.
-      const ::std::streamsize old_precision = os->precision(
-          ::std::numeric_limits<FloatType>::digits10 + 2);
-      if (FloatingPoint<FloatType>(expected_).is_nan()) {
-        if (nan_eq_nan_) {
-          *os << "is NaN";
-        } else {
-          *os << "never matches";
-        }
-      } else {
-        *os << "is approximately " << expected_;
-        if (HasMaxAbsError()) {
-          *os << " (absolute error <= " << max_abs_error_ << ")";
-        }
-      }
-      os->precision(old_precision);
-    }
-
-    void DescribeNegationTo(::std::ostream* os) const override {
-      // As before, get original precision.
-      const ::std::streamsize old_precision = os->precision(
-          ::std::numeric_limits<FloatType>::digits10 + 2);
-      if (FloatingPoint<FloatType>(expected_).is_nan()) {
-        if (nan_eq_nan_) {
-          *os << "isn't NaN";
-        } else {
-          *os << "is anything";
-        }
-      } else {
-        *os << "isn't approximately " << expected_;
-        if (HasMaxAbsError()) {
-          *os << " (absolute error > " << max_abs_error_ << ")";
-        }
-      }
-      // Restore original precision.
-      os->precision(old_precision);
-    }
-
-   private:
-    bool HasMaxAbsError() const {
-      return max_abs_error_ >= 0;
-    }
-
-    const FloatType expected_;
-    const bool nan_eq_nan_;
-    // max_abs_error will be used for value comparison when >= 0.
-    const FloatType max_abs_error_;
-
-    GTEST_DISALLOW_ASSIGN_(Impl);
-  };
-
-  // The following 3 type conversion operators allow FloatEq(expected) and
-  // NanSensitiveFloatEq(expected) to be used as a Matcher<float>, a
-  // Matcher<const float&>, or a Matcher<float&>, but nothing else.
-  // (While Google's C++ coding style doesn't allow arguments passed
-  // by non-const reference, we may see them in code not conforming to
-  // the style.  Therefore Google Mock needs to support them.)
-  operator Matcher<FloatType>() const {
-    return MakeMatcher(
-        new Impl<FloatType>(expected_, nan_eq_nan_, max_abs_error_));
-  }
-
-  operator Matcher<const FloatType&>() const {
-    return MakeMatcher(
-        new Impl<const FloatType&>(expected_, nan_eq_nan_, max_abs_error_));
-  }
-
-  operator Matcher<FloatType&>() const {
-    return MakeMatcher(
-        new Impl<FloatType&>(expected_, nan_eq_nan_, max_abs_error_));
-  }
-
- private:
-  const FloatType expected_;
-  const bool nan_eq_nan_;
-  // max_abs_error will be used for value comparison when >= 0.
-  const FloatType max_abs_error_;
-
-  GTEST_DISALLOW_ASSIGN_(FloatingEqMatcher);
-};
-
-// A 2-tuple ("binary") wrapper around FloatingEqMatcher:
-// FloatingEq2Matcher() matches (x, y) by matching FloatingEqMatcher(x, false)
-// against y, and FloatingEq2Matcher(e) matches FloatingEqMatcher(x, false, e)
-// against y. The former implements "Eq", the latter "Near". At present, there
-// is no version that compares NaNs as equal.
-template <typename FloatType>
-class FloatingEq2Matcher {
- public:
-  FloatingEq2Matcher() { Init(-1, false); }
-
-  explicit FloatingEq2Matcher(bool nan_eq_nan) { Init(-1, nan_eq_nan); }
-
-  explicit FloatingEq2Matcher(FloatType max_abs_error) {
-    Init(max_abs_error, false);
-  }
-
-  FloatingEq2Matcher(FloatType max_abs_error, bool nan_eq_nan) {
-    Init(max_abs_error, nan_eq_nan);
-  }
-
-  template <typename T1, typename T2>
-  operator Matcher<::std::tuple<T1, T2>>() const {
-    return MakeMatcher(
-        new Impl<::std::tuple<T1, T2>>(max_abs_error_, nan_eq_nan_));
-  }
-  template <typename T1, typename T2>
-  operator Matcher<const ::std::tuple<T1, T2>&>() const {
-    return MakeMatcher(
-        new Impl<const ::std::tuple<T1, T2>&>(max_abs_error_, nan_eq_nan_));
-  }
-
- private:
-  static ::std::ostream& GetDesc(::std::ostream& os) {  // NOLINT
-    return os << "an almost-equal pair";
-  }
-
-  template <typename Tuple>
-  class Impl : public MatcherInterface<Tuple> {
-   public:
-    Impl(FloatType max_abs_error, bool nan_eq_nan) :
-        max_abs_error_(max_abs_error),
-        nan_eq_nan_(nan_eq_nan) {}
-
-    bool MatchAndExplain(Tuple args,
-                         MatchResultListener* listener) const override {
-      if (max_abs_error_ == -1) {
-        FloatingEqMatcher<FloatType> fm(::std::get<0>(args), nan_eq_nan_);
-        return static_cast<Matcher<FloatType>>(fm).MatchAndExplain(
-            ::std::get<1>(args), listener);
-      } else {
-        FloatingEqMatcher<FloatType> fm(::std::get<0>(args), nan_eq_nan_,
-                                        max_abs_error_);
-        return static_cast<Matcher<FloatType>>(fm).MatchAndExplain(
-            ::std::get<1>(args), listener);
-      }
-    }
-    void DescribeTo(::std::ostream* os) const override {
-      *os << "are " << GetDesc;
-    }
-    void DescribeNegationTo(::std::ostream* os) const override {
-      *os << "aren't " << GetDesc;
-    }
-
-   private:
-    FloatType max_abs_error_;
-    const bool nan_eq_nan_;
-  };
-
-  void Init(FloatType max_abs_error_val, bool nan_eq_nan_val) {
-    max_abs_error_ = max_abs_error_val;
-    nan_eq_nan_ = nan_eq_nan_val;
-  }
-  FloatType max_abs_error_;
-  bool nan_eq_nan_;
-};
-
-// Implements the Pointee(m) matcher for matching a pointer whose
-// pointee matches matcher m.  The pointer can be either raw or smart.
-template <typename InnerMatcher>
-class PointeeMatcher {
- public:
-  explicit PointeeMatcher(const InnerMatcher& matcher) : matcher_(matcher) {}
-
-  // This type conversion operator template allows Pointee(m) to be
-  // used as a matcher for any pointer type whose pointee type is
-  // compatible with the inner matcher, where type Pointer can be
-  // either a raw pointer or a smart pointer.
-  //
-  // The reason we do this instead of relying on
-  // MakePolymorphicMatcher() is that the latter is not flexible
-  // enough for implementing the DescribeTo() method of Pointee().
-  template <typename Pointer>
-  operator Matcher<Pointer>() const {
-    return Matcher<Pointer>(new Impl<const Pointer&>(matcher_));
-  }
-
- private:
-  // The monomorphic implementation that works for a particular pointer type.
-  template <typename Pointer>
-  class Impl : public MatcherInterface<Pointer> {
-   public:
-    typedef typename PointeeOf<typename std::remove_const<
-        typename std::remove_reference<Pointer>::type>::type>::type Pointee;
-
-    explicit Impl(const InnerMatcher& matcher)
-        : matcher_(MatcherCast<const Pointee&>(matcher)) {}
-
-    void DescribeTo(::std::ostream* os) const override {
-      *os << "points to a value that ";
-      matcher_.DescribeTo(os);
-    }
-
-    void DescribeNegationTo(::std::ostream* os) const override {
-      *os << "does not point to a value that ";
-      matcher_.DescribeTo(os);
-    }
-
-    bool MatchAndExplain(Pointer pointer,
-                         MatchResultListener* listener) const override {
-      if (GetRawPointer(pointer) == nullptr) return false;
-
-      *listener << "which points to ";
-      return MatchPrintAndExplain(*pointer, matcher_, listener);
-    }
-
-   private:
-    const Matcher<const Pointee&> matcher_;
-
-    GTEST_DISALLOW_ASSIGN_(Impl);
-  };
-
-  const InnerMatcher matcher_;
-
-  GTEST_DISALLOW_ASSIGN_(PointeeMatcher);
-};
-
-#if GTEST_HAS_RTTI
-// Implements the WhenDynamicCastTo<T>(m) matcher that matches a pointer or
-// reference that matches inner_matcher when dynamic_cast<T> is applied.
-// The result of dynamic_cast<To> is forwarded to the inner matcher.
-// If To is a pointer and the cast fails, the inner matcher will receive NULL.
-// If To is a reference and the cast fails, this matcher returns false
-// immediately.
-template <typename To>
-class WhenDynamicCastToMatcherBase {
- public:
-  explicit WhenDynamicCastToMatcherBase(const Matcher<To>& matcher)
-      : matcher_(matcher) {}
-
-  void DescribeTo(::std::ostream* os) const {
-    GetCastTypeDescription(os);
-    matcher_.DescribeTo(os);
-  }
-
-  void DescribeNegationTo(::std::ostream* os) const {
-    GetCastTypeDescription(os);
-    matcher_.DescribeNegationTo(os);
-  }
-
- protected:
-  const Matcher<To> matcher_;
-
-  static std::string GetToName() {
-    return GetTypeName<To>();
-  }
-
- private:
-  static void GetCastTypeDescription(::std::ostream* os) {
-    *os << "when dynamic_cast to " << GetToName() << ", ";
-  }
-
-  GTEST_DISALLOW_ASSIGN_(WhenDynamicCastToMatcherBase);
-};
-
-// Primary template.
-// To is a pointer. Cast and forward the result.
-template <typename To>
-class WhenDynamicCastToMatcher : public WhenDynamicCastToMatcherBase<To> {
- public:
-  explicit WhenDynamicCastToMatcher(const Matcher<To>& matcher)
-      : WhenDynamicCastToMatcherBase<To>(matcher) {}
-
-  template <typename From>
-  bool MatchAndExplain(From from, MatchResultListener* listener) const {
-    To to = dynamic_cast<To>(from);
-    return MatchPrintAndExplain(to, this->matcher_, listener);
-  }
-};
-
-// Specialize for references.
-// In this case we return false if the dynamic_cast fails.
-template <typename To>
-class WhenDynamicCastToMatcher<To&> : public WhenDynamicCastToMatcherBase<To&> {
- public:
-  explicit WhenDynamicCastToMatcher(const Matcher<To&>& matcher)
-      : WhenDynamicCastToMatcherBase<To&>(matcher) {}
-
-  template <typename From>
-  bool MatchAndExplain(From& from, MatchResultListener* listener) const {
-    // We don't want an std::bad_cast here, so do the cast with pointers.
-    To* to = dynamic_cast<To*>(&from);
-    if (to == nullptr) {
-      *listener << "which cannot be dynamic_cast to " << this->GetToName();
-      return false;
-    }
-    return MatchPrintAndExplain(*to, this->matcher_, listener);
-  }
-};
-#endif  // GTEST_HAS_RTTI
-
-// Implements the Field() matcher for matching a field (i.e. member
-// variable) of an object.
-template <typename Class, typename FieldType>
-class FieldMatcher {
- public:
-  FieldMatcher(FieldType Class::*field,
-               const Matcher<const FieldType&>& matcher)
-      : field_(field), matcher_(matcher), whose_field_("whose given field ") {}
-
-  FieldMatcher(const std::string& field_name, FieldType Class::*field,
-               const Matcher<const FieldType&>& matcher)
-      : field_(field),
-        matcher_(matcher),
-        whose_field_("whose field `" + field_name + "` ") {}
-
-  void DescribeTo(::std::ostream* os) const {
-    *os << "is an object " << whose_field_;
-    matcher_.DescribeTo(os);
-  }
-
-  void DescribeNegationTo(::std::ostream* os) const {
-    *os << "is an object " << whose_field_;
-    matcher_.DescribeNegationTo(os);
-  }
-
-  template <typename T>
-  bool MatchAndExplain(const T& value, MatchResultListener* listener) const {
-    // FIXME: The dispatch on std::is_pointer was introduced as a workaround for
-    // a compiler bug, and can now be removed.
-    return MatchAndExplainImpl(
-        typename std::is_pointer<typename std::remove_const<T>::type>::type(),
-        value, listener);
-  }
-
- private:
-  bool MatchAndExplainImpl(std::false_type /* is_not_pointer */,
-                           const Class& obj,
-                           MatchResultListener* listener) const {
-    *listener << whose_field_ << "is ";
-    return MatchPrintAndExplain(obj.*field_, matcher_, listener);
-  }
-
-  bool MatchAndExplainImpl(std::true_type /* is_pointer */, const Class* p,
-                           MatchResultListener* listener) const {
-    if (p == nullptr) return false;
-
-    *listener << "which points to an object ";
-    // Since *p has a field, it must be a class/struct/union type and
-    // thus cannot be a pointer.  Therefore we pass false_type() as
-    // the first argument.
-    return MatchAndExplainImpl(std::false_type(), *p, listener);
-  }
-
-  const FieldType Class::*field_;
-  const Matcher<const FieldType&> matcher_;
-
-  // Contains either "whose given field " if the name of the field is unknown
-  // or "whose field `name_of_field` " if the name is known.
-  const std::string whose_field_;
-
-  GTEST_DISALLOW_ASSIGN_(FieldMatcher);
-};
-
-// Implements the Property() matcher for matching a property
-// (i.e. return value of a getter method) of an object.
-//
-// Property is a const-qualified member function of Class returning
-// PropertyType.
-template <typename Class, typename PropertyType, typename Property>
-class PropertyMatcher {
- public:
-  typedef const PropertyType& RefToConstProperty;
-
-  PropertyMatcher(Property property, const Matcher<RefToConstProperty>& matcher)
-      : property_(property),
-        matcher_(matcher),
-        whose_property_("whose given property ") {}
-
-  PropertyMatcher(const std::string& property_name, Property property,
-                  const Matcher<RefToConstProperty>& matcher)
-      : property_(property),
-        matcher_(matcher),
-        whose_property_("whose property `" + property_name + "` ") {}
-
-  void DescribeTo(::std::ostream* os) const {
-    *os << "is an object " << whose_property_;
-    matcher_.DescribeTo(os);
-  }
-
-  void DescribeNegationTo(::std::ostream* os) const {
-    *os << "is an object " << whose_property_;
-    matcher_.DescribeNegationTo(os);
-  }
-
-  template <typename T>
-  bool MatchAndExplain(const T&value, MatchResultListener* listener) const {
-    return MatchAndExplainImpl(
-        typename std::is_pointer<typename std::remove_const<T>::type>::type(),
-        value, listener);
-  }
-
- private:
-  bool MatchAndExplainImpl(std::false_type /* is_not_pointer */,
-                           const Class& obj,
-                           MatchResultListener* listener) const {
-    *listener << whose_property_ << "is ";
-    // Cannot pass the return value (for example, int) to MatchPrintAndExplain,
-    // which takes a non-const reference as argument.
-    RefToConstProperty result = (obj.*property_)();
-    return MatchPrintAndExplain(result, matcher_, listener);
-  }
-
-  bool MatchAndExplainImpl(std::true_type /* is_pointer */, const Class* p,
-                           MatchResultListener* listener) const {
-    if (p == nullptr) return false;
-
-    *listener << "which points to an object ";
-    // Since *p has a property method, it must be a class/struct/union
-    // type and thus cannot be a pointer.  Therefore we pass
-    // false_type() as the first argument.
-    return MatchAndExplainImpl(std::false_type(), *p, listener);
-  }
-
-  Property property_;
-  const Matcher<RefToConstProperty> matcher_;
-
-  // Contains either "whose given property " if the name of the property is
-  // unknown or "whose property `name_of_property` " if the name is known.
-  const std::string whose_property_;
-
-  GTEST_DISALLOW_ASSIGN_(PropertyMatcher);
-};
-
-// Type traits specifying various features of different functors for ResultOf.
-// The default template specifies features for functor objects.
-template <typename Functor>
-struct CallableTraits {
-  typedef Functor StorageType;
-
-  static void CheckIsValid(Functor /* functor */) {}
-
-  template <typename T>
-  static auto Invoke(Functor f, const T& arg) -> decltype(f(arg)) {
-    return f(arg);
-  }
-};
-
-// Specialization for function pointers.
-template <typename ArgType, typename ResType>
-struct CallableTraits<ResType(*)(ArgType)> {
-  typedef ResType ResultType;
-  typedef ResType(*StorageType)(ArgType);
-
-  static void CheckIsValid(ResType(*f)(ArgType)) {
-    GTEST_CHECK_(f != nullptr)
-        << "NULL function pointer is passed into ResultOf().";
-  }
-  template <typename T>
-  static ResType Invoke(ResType(*f)(ArgType), T arg) {
-    return (*f)(arg);
-  }
-};
-
-// Implements the ResultOf() matcher for matching a return value of a
-// unary function of an object.
-template <typename Callable, typename InnerMatcher>
-class ResultOfMatcher {
- public:
-  ResultOfMatcher(Callable callable, InnerMatcher matcher)
-      : callable_(std::move(callable)), matcher_(std::move(matcher)) {
-    CallableTraits<Callable>::CheckIsValid(callable_);
-  }
-
-  template <typename T>
-  operator Matcher<T>() const {
-    return Matcher<T>(new Impl<const T&>(callable_, matcher_));
-  }
-
- private:
-  typedef typename CallableTraits<Callable>::StorageType CallableStorageType;
-
-  template <typename T>
-  class Impl : public MatcherInterface<T> {
-    using ResultType = decltype(CallableTraits<Callable>::template Invoke<T>(
-        std::declval<CallableStorageType>(), std::declval<T>()));
-
-   public:
-    template <typename M>
-    Impl(const CallableStorageType& callable, const M& matcher)
-        : callable_(callable), matcher_(MatcherCast<ResultType>(matcher)) {}
-
-    void DescribeTo(::std::ostream* os) const override {
-      *os << "is mapped by the given callable to a value that ";
-      matcher_.DescribeTo(os);
-    }
-
-    void DescribeNegationTo(::std::ostream* os) const override {
-      *os << "is mapped by the given callable to a value that ";
-      matcher_.DescribeNegationTo(os);
-    }
-
-    bool MatchAndExplain(T obj, MatchResultListener* listener) const override {
-      *listener << "which is mapped by the given callable to ";
-      // Cannot pass the return value directly to MatchPrintAndExplain, which
-      // takes a non-const reference as argument.
-      // Also, specifying template argument explicitly is needed because T could
-      // be a non-const reference (e.g. Matcher<Uncopyable&>).
-      ResultType result =
-          CallableTraits<Callable>::template Invoke<T>(callable_, obj);
-      return MatchPrintAndExplain(result, matcher_, listener);
-    }
-
-   private:
-    // Functors often define operator() as non-const method even though
-    // they are actually stateless. But we need to use them even when
-    // 'this' is a const pointer. It's the user's responsibility not to
-    // use stateful callables with ResultOf(), which doesn't guarantee
-    // how many times the callable will be invoked.
-    mutable CallableStorageType callable_;
-    const Matcher<ResultType> matcher_;
-
-    GTEST_DISALLOW_ASSIGN_(Impl);
-  };  // class Impl
-
-  const CallableStorageType callable_;
-  const InnerMatcher matcher_;
-
-  GTEST_DISALLOW_ASSIGN_(ResultOfMatcher);
-};
-
-// Implements a matcher that checks the size of an STL-style container.
-template <typename SizeMatcher>
-class SizeIsMatcher {
- public:
-  explicit SizeIsMatcher(const SizeMatcher& size_matcher)
-       : size_matcher_(size_matcher) {
-  }
-
-  template <typename Container>
-  operator Matcher<Container>() const {
-    return Matcher<Container>(new Impl<const Container&>(size_matcher_));
-  }
-
-  template <typename Container>
-  class Impl : public MatcherInterface<Container> {
-   public:
-    using SizeType = decltype(std::declval<Container>().size());
-    explicit Impl(const SizeMatcher& size_matcher)
-        : size_matcher_(MatcherCast<SizeType>(size_matcher)) {}
-
-    void DescribeTo(::std::ostream* os) const override {
-      *os << "size ";
-      size_matcher_.DescribeTo(os);
-    }
-    void DescribeNegationTo(::std::ostream* os) const override {
-      *os << "size ";
-      size_matcher_.DescribeNegationTo(os);
-    }
-
-    bool MatchAndExplain(Container container,
-                         MatchResultListener* listener) const override {
-      SizeType size = container.size();
-      StringMatchResultListener size_listener;
-      const bool result = size_matcher_.MatchAndExplain(size, &size_listener);
-      *listener
-          << "whose size " << size << (result ? " matches" : " doesn't match");
-      PrintIfNotEmpty(size_listener.str(), listener->stream());
-      return result;
-    }
-
-   private:
-    const Matcher<SizeType> size_matcher_;
-    GTEST_DISALLOW_ASSIGN_(Impl);
-  };
-
- private:
-  const SizeMatcher size_matcher_;
-  GTEST_DISALLOW_ASSIGN_(SizeIsMatcher);
-};
-
-// Implements a matcher that checks the begin()..end() distance of an STL-style
-// container.
-template <typename DistanceMatcher>
-class BeginEndDistanceIsMatcher {
- public:
-  explicit BeginEndDistanceIsMatcher(const DistanceMatcher& distance_matcher)
-      : distance_matcher_(distance_matcher) {}
-
-  template <typename Container>
-  operator Matcher<Container>() const {
-    return Matcher<Container>(new Impl<const Container&>(distance_matcher_));
-  }
-
-  template <typename Container>
-  class Impl : public MatcherInterface<Container> {
-  public:
-    typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Container) RawContainer;
-    typedef internal::StlContainerView<RawContainer> View;
-    typedef typename View::type StlContainer;
-    typedef typename View::const_reference StlContainerReference;
-    typedef decltype(std::begin(
-        std::declval<StlContainerReference>())) StlContainerConstIterator;
-    typedef typename std::iterator_traits<
-        StlContainerConstIterator>::difference_type DistanceType;
-    explicit Impl(const DistanceMatcher& distance_matcher)
-        : distance_matcher_(MatcherCast<DistanceType>(distance_matcher)) {}
-
-    void DescribeTo(::std::ostream* os) const override {
-      *os << "distance between begin() and end() ";
-      distance_matcher_.DescribeTo(os);
-    }
-    void DescribeNegationTo(::std::ostream* os) const override {
-      *os << "distance between begin() and end() ";
-      distance_matcher_.DescribeNegationTo(os);
-    }
-
-    bool MatchAndExplain(Container container,
-                         MatchResultListener* listener) const override {
-      using std::begin;
-      using std::end;
-      DistanceType distance = std::distance(begin(container), end(container));
-      StringMatchResultListener distance_listener;
-      const bool result =
-          distance_matcher_.MatchAndExplain(distance, &distance_listener);
-      *listener << "whose distance between begin() and end() " << distance
-                << (result ? " matches" : " doesn't match");
-      PrintIfNotEmpty(distance_listener.str(), listener->stream());
-      return result;
-    }
-
-   private:
-    const Matcher<DistanceType> distance_matcher_;
-    GTEST_DISALLOW_ASSIGN_(Impl);
-  };
-
- private:
-  const DistanceMatcher distance_matcher_;
-  GTEST_DISALLOW_ASSIGN_(BeginEndDistanceIsMatcher);
-};
-
-// Implements an equality matcher for any STL-style container whose elements
-// support ==. This matcher is like Eq(), but its failure explanations provide
-// more detailed information that is useful when the container is used as a set.
-// The failure message reports elements that are in one of the operands but not
-// the other. The failure messages do not report duplicate or out-of-order
-// elements in the containers (which don't properly matter to sets, but can
-// occur if the containers are vectors or lists, for example).
-//
-// Uses the container's const_iterator, value_type, operator ==,
-// begin(), and end().
-template <typename Container>
-class ContainerEqMatcher {
- public:
-  typedef internal::StlContainerView<Container> View;
-  typedef typename View::type StlContainer;
-  typedef typename View::const_reference StlContainerReference;
-
-  static_assert(!std::is_const<Container>::value,
-                "Container type must not be const");
-  static_assert(!std::is_reference<Container>::value,
-                "Container type must not be a reference");
-
-  // We make a copy of expected in case the elements in it are modified
-  // after this matcher is created.
-  explicit ContainerEqMatcher(const Container& expected)
-      : expected_(View::Copy(expected)) {}
-
-  void DescribeTo(::std::ostream* os) const {
-    *os << "equals ";
-    UniversalPrint(expected_, os);
-  }
-  void DescribeNegationTo(::std::ostream* os) const {
-    *os << "does not equal ";
-    UniversalPrint(expected_, os);
-  }
-
-  template <typename LhsContainer>
-  bool MatchAndExplain(const LhsContainer& lhs,
-                       MatchResultListener* listener) const {
-    typedef internal::StlContainerView<
-        typename std::remove_const<LhsContainer>::type>
-        LhsView;
-    typedef typename LhsView::type LhsStlContainer;
-    StlContainerReference lhs_stl_container = LhsView::ConstReference(lhs);
-    if (lhs_stl_container == expected_)
-      return true;
-
-    ::std::ostream* const os = listener->stream();
-    if (os != nullptr) {
-      // Something is different. Check for extra values first.
-      bool printed_header = false;
-      for (typename LhsStlContainer::const_iterator it =
-               lhs_stl_container.begin();
-           it != lhs_stl_container.end(); ++it) {
-        if (internal::ArrayAwareFind(expected_.begin(), expected_.end(), *it) ==
-            expected_.end()) {
-          if (printed_header) {
-            *os << ", ";
-          } else {
-            *os << "which has these unexpected elements: ";
-            printed_header = true;
-          }
-          UniversalPrint(*it, os);
-        }
-      }
-
-      // Now check for missing values.
-      bool printed_header2 = false;
-      for (typename StlContainer::const_iterator it = expected_.begin();
-           it != expected_.end(); ++it) {
-        if (internal::ArrayAwareFind(
-                lhs_stl_container.begin(), lhs_stl_container.end(), *it) ==
-            lhs_stl_container.end()) {
-          if (printed_header2) {
-            *os << ", ";
-          } else {
-            *os << (printed_header ? ",\nand" : "which")
-                << " doesn't have these expected elements: ";
-            printed_header2 = true;
-          }
-          UniversalPrint(*it, os);
-        }
-      }
-    }
-
-    return false;
-  }
-
- private:
-  const StlContainer expected_;
-
-  GTEST_DISALLOW_ASSIGN_(ContainerEqMatcher);
-};
-
-// A comparator functor that uses the < operator to compare two values.
-struct LessComparator {
-  template <typename T, typename U>
-  bool operator()(const T& lhs, const U& rhs) const { return lhs < rhs; }
-};
-
-// Implements WhenSortedBy(comparator, container_matcher).
-template <typename Comparator, typename ContainerMatcher>
-class WhenSortedByMatcher {
- public:
-  WhenSortedByMatcher(const Comparator& comparator,
-                      const ContainerMatcher& matcher)
-      : comparator_(comparator), matcher_(matcher) {}
-
-  template <typename LhsContainer>
-  operator Matcher<LhsContainer>() const {
-    return MakeMatcher(new Impl<LhsContainer>(comparator_, matcher_));
-  }
-
-  template <typename LhsContainer>
-  class Impl : public MatcherInterface<LhsContainer> {
-   public:
-    typedef internal::StlContainerView<
-         GTEST_REMOVE_REFERENCE_AND_CONST_(LhsContainer)> LhsView;
-    typedef typename LhsView::type LhsStlContainer;
-    typedef typename LhsView::const_reference LhsStlContainerReference;
-    // Transforms std::pair<const Key, Value> into std::pair<Key, Value>
-    // so that we can match associative containers.
-    typedef typename RemoveConstFromKey<
-        typename LhsStlContainer::value_type>::type LhsValue;
-
-    Impl(const Comparator& comparator, const ContainerMatcher& matcher)
-        : comparator_(comparator), matcher_(matcher) {}
-
-    void DescribeTo(::std::ostream* os) const override {
-      *os << "(when sorted) ";
-      matcher_.DescribeTo(os);
-    }
-
-    void DescribeNegationTo(::std::ostream* os) const override {
-      *os << "(when sorted) ";
-      matcher_.DescribeNegationTo(os);
-    }
-
-    bool MatchAndExplain(LhsContainer lhs,
-                         MatchResultListener* listener) const override {
-      LhsStlContainerReference lhs_stl_container = LhsView::ConstReference(lhs);
-      ::std::vector<LhsValue> sorted_container(lhs_stl_container.begin(),
-                                               lhs_stl_container.end());
-      ::std::sort(
-           sorted_container.begin(), sorted_container.end(), comparator_);
-
-      if (!listener->IsInterested()) {
-        // If the listener is not interested, we do not need to
-        // construct the inner explanation.
-        return matcher_.Matches(sorted_container);
-      }
-
-      *listener << "which is ";
-      UniversalPrint(sorted_container, listener->stream());
-      *listener << " when sorted";
-
-      StringMatchResultListener inner_listener;
-      const bool match = matcher_.MatchAndExplain(sorted_container,
-                                                  &inner_listener);
-      PrintIfNotEmpty(inner_listener.str(), listener->stream());
-      return match;
-    }
-
-   private:
-    const Comparator comparator_;
-    const Matcher<const ::std::vector<LhsValue>&> matcher_;
-
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(Impl);
-  };
-
- private:
-  const Comparator comparator_;
-  const ContainerMatcher matcher_;
-
-  GTEST_DISALLOW_ASSIGN_(WhenSortedByMatcher);
-};
-
-// Implements Pointwise(tuple_matcher, rhs_container).  tuple_matcher
-// must be able to be safely cast to Matcher<std::tuple<const T1&, const
-// T2&> >, where T1 and T2 are the types of elements in the LHS
-// container and the RHS container respectively.
-template <typename TupleMatcher, typename RhsContainer>
-class PointwiseMatcher {
-  GTEST_COMPILE_ASSERT_(
-      !IsHashTable<GTEST_REMOVE_REFERENCE_AND_CONST_(RhsContainer)>::value,
-      use_UnorderedPointwise_with_hash_tables);
-
- public:
-  typedef internal::StlContainerView<RhsContainer> RhsView;
-  typedef typename RhsView::type RhsStlContainer;
-  typedef typename RhsStlContainer::value_type RhsValue;
-
-  static_assert(!std::is_const<RhsContainer>::value,
-                "RhsContainer type must not be const");
-  static_assert(!std::is_reference<RhsContainer>::value,
-                "RhsContainer type must not be a reference");
-
-  // Like ContainerEq, we make a copy of rhs in case the elements in
-  // it are modified after this matcher is created.
-  PointwiseMatcher(const TupleMatcher& tuple_matcher, const RhsContainer& rhs)
-      : tuple_matcher_(tuple_matcher), rhs_(RhsView::Copy(rhs)) {}
-
-  template <typename LhsContainer>
-  operator Matcher<LhsContainer>() const {
-    GTEST_COMPILE_ASSERT_(
-        !IsHashTable<GTEST_REMOVE_REFERENCE_AND_CONST_(LhsContainer)>::value,
-        use_UnorderedPointwise_with_hash_tables);
-
-    return Matcher<LhsContainer>(
-        new Impl<const LhsContainer&>(tuple_matcher_, rhs_));
-  }
-
-  template <typename LhsContainer>
-  class Impl : public MatcherInterface<LhsContainer> {
-   public:
-    typedef internal::StlContainerView<
-         GTEST_REMOVE_REFERENCE_AND_CONST_(LhsContainer)> LhsView;
-    typedef typename LhsView::type LhsStlContainer;
-    typedef typename LhsView::const_reference LhsStlContainerReference;
-    typedef typename LhsStlContainer::value_type LhsValue;
-    // We pass the LHS value and the RHS value to the inner matcher by
-    // reference, as they may be expensive to copy.  We must use tuple
-    // instead of pair here, as a pair cannot hold references (C++ 98,
-    // 20.2.2 [lib.pairs]).
-    typedef ::std::tuple<const LhsValue&, const RhsValue&> InnerMatcherArg;
-
-    Impl(const TupleMatcher& tuple_matcher, const RhsStlContainer& rhs)
-        // mono_tuple_matcher_ holds a monomorphic version of the tuple matcher.
-        : mono_tuple_matcher_(SafeMatcherCast<InnerMatcherArg>(tuple_matcher)),
-          rhs_(rhs) {}
-
-    void DescribeTo(::std::ostream* os) const override {
-      *os << "contains " << rhs_.size()
-          << " values, where each value and its corresponding value in ";
-      UniversalPrinter<RhsStlContainer>::Print(rhs_, os);
-      *os << " ";
-      mono_tuple_matcher_.DescribeTo(os);
-    }
-    void DescribeNegationTo(::std::ostream* os) const override {
-      *os << "doesn't contain exactly " << rhs_.size()
-          << " values, or contains a value x at some index i"
-          << " where x and the i-th value of ";
-      UniversalPrint(rhs_, os);
-      *os << " ";
-      mono_tuple_matcher_.DescribeNegationTo(os);
-    }
-
-    bool MatchAndExplain(LhsContainer lhs,
-                         MatchResultListener* listener) const override {
-      LhsStlContainerReference lhs_stl_container = LhsView::ConstReference(lhs);
-      const size_t actual_size = lhs_stl_container.size();
-      if (actual_size != rhs_.size()) {
-        *listener << "which contains " << actual_size << " values";
-        return false;
-      }
-
-      typename LhsStlContainer::const_iterator left = lhs_stl_container.begin();
-      typename RhsStlContainer::const_iterator right = rhs_.begin();
-      for (size_t i = 0; i != actual_size; ++i, ++left, ++right) {
-        if (listener->IsInterested()) {
-          StringMatchResultListener inner_listener;
-          // Create InnerMatcherArg as a temporarily object to avoid it outlives
-          // *left and *right. Dereference or the conversion to `const T&` may
-          // return temp objects, e.g for vector<bool>.
-          if (!mono_tuple_matcher_.MatchAndExplain(
-                  InnerMatcherArg(ImplicitCast_<const LhsValue&>(*left),
-                                  ImplicitCast_<const RhsValue&>(*right)),
-                  &inner_listener)) {
-            *listener << "where the value pair (";
-            UniversalPrint(*left, listener->stream());
-            *listener << ", ";
-            UniversalPrint(*right, listener->stream());
-            *listener << ") at index #" << i << " don't match";
-            PrintIfNotEmpty(inner_listener.str(), listener->stream());
-            return false;
-          }
-        } else {
-          if (!mono_tuple_matcher_.Matches(
-                  InnerMatcherArg(ImplicitCast_<const LhsValue&>(*left),
-                                  ImplicitCast_<const RhsValue&>(*right))))
-            return false;
-        }
-      }
-
-      return true;
-    }
-
-   private:
-    const Matcher<InnerMatcherArg> mono_tuple_matcher_;
-    const RhsStlContainer rhs_;
-
-    GTEST_DISALLOW_ASSIGN_(Impl);
-  };
-
- private:
-  const TupleMatcher tuple_matcher_;
-  const RhsStlContainer rhs_;
-
-  GTEST_DISALLOW_ASSIGN_(PointwiseMatcher);
-};
-
-// Holds the logic common to ContainsMatcherImpl and EachMatcherImpl.
-template <typename Container>
-class QuantifierMatcherImpl : public MatcherInterface<Container> {
- public:
-  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Container) RawContainer;
-  typedef StlContainerView<RawContainer> View;
-  typedef typename View::type StlContainer;
-  typedef typename View::const_reference StlContainerReference;
-  typedef typename StlContainer::value_type Element;
-
-  template <typename InnerMatcher>
-  explicit QuantifierMatcherImpl(InnerMatcher inner_matcher)
-      : inner_matcher_(
-           testing::SafeMatcherCast<const Element&>(inner_matcher)) {}
-
-  // Checks whether:
-  // * All elements in the container match, if all_elements_should_match.
-  // * Any element in the container matches, if !all_elements_should_match.
-  bool MatchAndExplainImpl(bool all_elements_should_match,
-                           Container container,
-                           MatchResultListener* listener) const {
-    StlContainerReference stl_container = View::ConstReference(container);
-    size_t i = 0;
-    for (typename StlContainer::const_iterator it = stl_container.begin();
-         it != stl_container.end(); ++it, ++i) {
-      StringMatchResultListener inner_listener;
-      const bool matches = inner_matcher_.MatchAndExplain(*it, &inner_listener);
-
-      if (matches != all_elements_should_match) {
-        *listener << "whose element #" << i
-                  << (matches ? " matches" : " doesn't match");
-        PrintIfNotEmpty(inner_listener.str(), listener->stream());
-        return !all_elements_should_match;
-      }
-    }
-    return all_elements_should_match;
-  }
-
- protected:
-  const Matcher<const Element&> inner_matcher_;
-
-  GTEST_DISALLOW_ASSIGN_(QuantifierMatcherImpl);
-};
-
-// Implements Contains(element_matcher) for the given argument type Container.
-// Symmetric to EachMatcherImpl.
-template <typename Container>
-class ContainsMatcherImpl : public QuantifierMatcherImpl<Container> {
- public:
-  template <typename InnerMatcher>
-  explicit ContainsMatcherImpl(InnerMatcher inner_matcher)
-      : QuantifierMatcherImpl<Container>(inner_matcher) {}
-
-  // Describes what this matcher does.
-  void DescribeTo(::std::ostream* os) const override {
-    *os << "contains at least one element that ";
-    this->inner_matcher_.DescribeTo(os);
-  }
-
-  void DescribeNegationTo(::std::ostream* os) const override {
-    *os << "doesn't contain any element that ";
-    this->inner_matcher_.DescribeTo(os);
-  }
-
-  bool MatchAndExplain(Container container,
-                       MatchResultListener* listener) const override {
-    return this->MatchAndExplainImpl(false, container, listener);
-  }
-
- private:
-  GTEST_DISALLOW_ASSIGN_(ContainsMatcherImpl);
-};
-
-// Implements Each(element_matcher) for the given argument type Container.
-// Symmetric to ContainsMatcherImpl.
-template <typename Container>
-class EachMatcherImpl : public QuantifierMatcherImpl<Container> {
- public:
-  template <typename InnerMatcher>
-  explicit EachMatcherImpl(InnerMatcher inner_matcher)
-      : QuantifierMatcherImpl<Container>(inner_matcher) {}
-
-  // Describes what this matcher does.
-  void DescribeTo(::std::ostream* os) const override {
-    *os << "only contains elements that ";
-    this->inner_matcher_.DescribeTo(os);
-  }
-
-  void DescribeNegationTo(::std::ostream* os) const override {
-    *os << "contains some element that ";
-    this->inner_matcher_.DescribeNegationTo(os);
-  }
-
-  bool MatchAndExplain(Container container,
-                       MatchResultListener* listener) const override {
-    return this->MatchAndExplainImpl(true, container, listener);
-  }
-
- private:
-  GTEST_DISALLOW_ASSIGN_(EachMatcherImpl);
-};
-
-// Implements polymorphic Contains(element_matcher).
-template <typename M>
-class ContainsMatcher {
- public:
-  explicit ContainsMatcher(M m) : inner_matcher_(m) {}
-
-  template <typename Container>
-  operator Matcher<Container>() const {
-    return Matcher<Container>(
-        new ContainsMatcherImpl<const Container&>(inner_matcher_));
-  }
-
- private:
-  const M inner_matcher_;
-
-  GTEST_DISALLOW_ASSIGN_(ContainsMatcher);
-};
-
-// Implements polymorphic Each(element_matcher).
-template <typename M>
-class EachMatcher {
- public:
-  explicit EachMatcher(M m) : inner_matcher_(m) {}
-
-  template <typename Container>
-  operator Matcher<Container>() const {
-    return Matcher<Container>(
-        new EachMatcherImpl<const Container&>(inner_matcher_));
-  }
-
- private:
-  const M inner_matcher_;
-
-  GTEST_DISALLOW_ASSIGN_(EachMatcher);
-};
-
-struct Rank1 {};
-struct Rank0 : Rank1 {};
-
-namespace pair_getters {
-using std::get;
-template <typename T>
-auto First(T& x, Rank1) -> decltype(get<0>(x)) {  // NOLINT
-  return get<0>(x);
-}
-template <typename T>
-auto First(T& x, Rank0) -> decltype((x.first)) {  // NOLINT
-  return x.first;
-}
-
-template <typename T>
-auto Second(T& x, Rank1) -> decltype(get<1>(x)) {  // NOLINT
-  return get<1>(x);
-}
-template <typename T>
-auto Second(T& x, Rank0) -> decltype((x.second)) {  // NOLINT
-  return x.second;
-}
-}  // namespace pair_getters
-
-// Implements Key(inner_matcher) for the given argument pair type.
-// Key(inner_matcher) matches an std::pair whose 'first' field matches
-// inner_matcher.  For example, Contains(Key(Ge(5))) can be used to match an
-// std::map that contains at least one element whose key is >= 5.
-template <typename PairType>
-class KeyMatcherImpl : public MatcherInterface<PairType> {
- public:
-  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(PairType) RawPairType;
-  typedef typename RawPairType::first_type KeyType;
-
-  template <typename InnerMatcher>
-  explicit KeyMatcherImpl(InnerMatcher inner_matcher)
-      : inner_matcher_(
-          testing::SafeMatcherCast<const KeyType&>(inner_matcher)) {
-  }
-
-  // Returns true if and only if 'key_value.first' (the key) matches the inner
-  // matcher.
-  bool MatchAndExplain(PairType key_value,
-                       MatchResultListener* listener) const override {
-    StringMatchResultListener inner_listener;
-    const bool match = inner_matcher_.MatchAndExplain(
-        pair_getters::First(key_value, Rank0()), &inner_listener);
-    const std::string explanation = inner_listener.str();
-    if (explanation != "") {
-      *listener << "whose first field is a value " << explanation;
-    }
-    return match;
-  }
-
-  // Describes what this matcher does.
-  void DescribeTo(::std::ostream* os) const override {
-    *os << "has a key that ";
-    inner_matcher_.DescribeTo(os);
-  }
-
-  // Describes what the negation of this matcher does.
-  void DescribeNegationTo(::std::ostream* os) const override {
-    *os << "doesn't have a key that ";
-    inner_matcher_.DescribeTo(os);
-  }
-
- private:
-  const Matcher<const KeyType&> inner_matcher_;
-
-  GTEST_DISALLOW_ASSIGN_(KeyMatcherImpl);
-};
-
-// Implements polymorphic Key(matcher_for_key).
-template <typename M>
-class KeyMatcher {
- public:
-  explicit KeyMatcher(M m) : matcher_for_key_(m) {}
-
-  template <typename PairType>
-  operator Matcher<PairType>() const {
-    return Matcher<PairType>(
-        new KeyMatcherImpl<const PairType&>(matcher_for_key_));
-  }
-
- private:
-  const M matcher_for_key_;
-
-  GTEST_DISALLOW_ASSIGN_(KeyMatcher);
-};
-
-// Implements Pair(first_matcher, second_matcher) for the given argument pair
-// type with its two matchers. See Pair() function below.
-template <typename PairType>
-class PairMatcherImpl : public MatcherInterface<PairType> {
- public:
-  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(PairType) RawPairType;
-  typedef typename RawPairType::first_type FirstType;
-  typedef typename RawPairType::second_type SecondType;
-
-  template <typename FirstMatcher, typename SecondMatcher>
-  PairMatcherImpl(FirstMatcher first_matcher, SecondMatcher second_matcher)
-      : first_matcher_(
-            testing::SafeMatcherCast<const FirstType&>(first_matcher)),
-        second_matcher_(
-            testing::SafeMatcherCast<const SecondType&>(second_matcher)) {
-  }
-
-  // Describes what this matcher does.
-  void DescribeTo(::std::ostream* os) const override {
-    *os << "has a first field that ";
-    first_matcher_.DescribeTo(os);
-    *os << ", and has a second field that ";
-    second_matcher_.DescribeTo(os);
-  }
-
-  // Describes what the negation of this matcher does.
-  void DescribeNegationTo(::std::ostream* os) const override {
-    *os << "has a first field that ";
-    first_matcher_.DescribeNegationTo(os);
-    *os << ", or has a second field that ";
-    second_matcher_.DescribeNegationTo(os);
-  }
-
-  // Returns true if and only if 'a_pair.first' matches first_matcher and
-  // 'a_pair.second' matches second_matcher.
-  bool MatchAndExplain(PairType a_pair,
-                       MatchResultListener* listener) const override {
-    if (!listener->IsInterested()) {
-      // If the listener is not interested, we don't need to construct the
-      // explanation.
-      return first_matcher_.Matches(pair_getters::First(a_pair, Rank0())) &&
-             second_matcher_.Matches(pair_getters::Second(a_pair, Rank0()));
-    }
-    StringMatchResultListener first_inner_listener;
-    if (!first_matcher_.MatchAndExplain(pair_getters::First(a_pair, Rank0()),
-                                        &first_inner_listener)) {
-      *listener << "whose first field does not match";
-      PrintIfNotEmpty(first_inner_listener.str(), listener->stream());
-      return false;
-    }
-    StringMatchResultListener second_inner_listener;
-    if (!second_matcher_.MatchAndExplain(pair_getters::Second(a_pair, Rank0()),
-                                         &second_inner_listener)) {
-      *listener << "whose second field does not match";
-      PrintIfNotEmpty(second_inner_listener.str(), listener->stream());
-      return false;
-    }
-    ExplainSuccess(first_inner_listener.str(), second_inner_listener.str(),
-                   listener);
-    return true;
-  }
-
- private:
-  void ExplainSuccess(const std::string& first_explanation,
-                      const std::string& second_explanation,
-                      MatchResultListener* listener) const {
-    *listener << "whose both fields match";
-    if (first_explanation != "") {
-      *listener << ", where the first field is a value " << first_explanation;
-    }
-    if (second_explanation != "") {
-      *listener << ", ";
-      if (first_explanation != "") {
-        *listener << "and ";
-      } else {
-        *listener << "where ";
-      }
-      *listener << "the second field is a value " << second_explanation;
-    }
-  }
-
-  const Matcher<const FirstType&> first_matcher_;
-  const Matcher<const SecondType&> second_matcher_;
-
-  GTEST_DISALLOW_ASSIGN_(PairMatcherImpl);
-};
-
-// Implements polymorphic Pair(first_matcher, second_matcher).
-template <typename FirstMatcher, typename SecondMatcher>
-class PairMatcher {
- public:
-  PairMatcher(FirstMatcher first_matcher, SecondMatcher second_matcher)
-      : first_matcher_(first_matcher), second_matcher_(second_matcher) {}
-
-  template <typename PairType>
-  operator Matcher<PairType> () const {
-    return Matcher<PairType>(
-        new PairMatcherImpl<const PairType&>(first_matcher_, second_matcher_));
-  }
-
- private:
-  const FirstMatcher first_matcher_;
-  const SecondMatcher second_matcher_;
-
-  GTEST_DISALLOW_ASSIGN_(PairMatcher);
-};
-
-// Implements ElementsAre() and ElementsAreArray().
-template <typename Container>
-class ElementsAreMatcherImpl : public MatcherInterface<Container> {
- public:
-  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Container) RawContainer;
-  typedef internal::StlContainerView<RawContainer> View;
-  typedef typename View::type StlContainer;
-  typedef typename View::const_reference StlContainerReference;
-  typedef decltype(std::begin(
-      std::declval<StlContainerReference>())) StlContainerConstIterator;
-  typedef typename std::remove_reference<
-      decltype(*std::declval<StlContainerConstIterator &>())>::type Element;
-
-  // Constructs the matcher from a sequence of element values or
-  // element matchers.
-  template <typename InputIter>
-  ElementsAreMatcherImpl(InputIter first, InputIter last) {
-    while (first != last) {
-      matchers_.push_back(MatcherCast<const Element&>(*first++));
-    }
-  }
-
-  // Describes what this matcher does.
-  void DescribeTo(::std::ostream* os) const override {
-    if (count() == 0) {
-      *os << "is empty";
-    } else if (count() == 1) {
-      *os << "has 1 element that ";
-      matchers_[0].DescribeTo(os);
-    } else {
-      *os << "has " << Elements(count()) << " where\n";
-      for (size_t i = 0; i != count(); ++i) {
-        *os << "element #" << i << " ";
-        matchers_[i].DescribeTo(os);
-        if (i + 1 < count()) {
-          *os << ",\n";
-        }
-      }
-    }
-  }
-
-  // Describes what the negation of this matcher does.
-  void DescribeNegationTo(::std::ostream* os) const override {
-    if (count() == 0) {
-      *os << "isn't empty";
-      return;
-    }
-
-    *os << "doesn't have " << Elements(count()) << ", or\n";
-    for (size_t i = 0; i != count(); ++i) {
-      *os << "element #" << i << " ";
-      matchers_[i].DescribeNegationTo(os);
-      if (i + 1 < count()) {
-        *os << ", or\n";
-      }
-    }
-  }
-
-  bool MatchAndExplain(Container container,
-                       MatchResultListener* listener) const override {
-    // To work with stream-like "containers", we must only walk
-    // through the elements in one pass.
-
-    const bool listener_interested = listener->IsInterested();
-
-    // explanations[i] is the explanation of the element at index i.
-    ::std::vector<std::string> explanations(count());
-    StlContainerReference stl_container = View::ConstReference(container);
-    StlContainerConstIterator it = stl_container.begin();
-    size_t exam_pos = 0;
-    bool mismatch_found = false;  // Have we found a mismatched element yet?
-
-    // Go through the elements and matchers in pairs, until we reach
-    // the end of either the elements or the matchers, or until we find a
-    // mismatch.
-    for (; it != stl_container.end() && exam_pos != count(); ++it, ++exam_pos) {
-      bool match;  // Does the current element match the current matcher?
-      if (listener_interested) {
-        StringMatchResultListener s;
-        match = matchers_[exam_pos].MatchAndExplain(*it, &s);
-        explanations[exam_pos] = s.str();
-      } else {
-        match = matchers_[exam_pos].Matches(*it);
-      }
-
-      if (!match) {
-        mismatch_found = true;
-        break;
-      }
-    }
-    // If mismatch_found is true, 'exam_pos' is the index of the mismatch.
-
-    // Find how many elements the actual container has.  We avoid
-    // calling size() s.t. this code works for stream-like "containers"
-    // that don't define size().
-    size_t actual_count = exam_pos;
-    for (; it != stl_container.end(); ++it) {
-      ++actual_count;
-    }
-
-    if (actual_count != count()) {
-      // The element count doesn't match.  If the container is empty,
-      // there's no need to explain anything as Google Mock already
-      // prints the empty container.  Otherwise we just need to show
-      // how many elements there actually are.
-      if (listener_interested && (actual_count != 0)) {
-        *listener << "which has " << Elements(actual_count);
-      }
-      return false;
-    }
-
-    if (mismatch_found) {
-      // The element count matches, but the exam_pos-th element doesn't match.
-      if (listener_interested) {
-        *listener << "whose element #" << exam_pos << " doesn't match";
-        PrintIfNotEmpty(explanations[exam_pos], listener->stream());
-      }
-      return false;
-    }
-
-    // Every element matches its expectation.  We need to explain why
-    // (the obvious ones can be skipped).
-    if (listener_interested) {
-      bool reason_printed = false;
-      for (size_t i = 0; i != count(); ++i) {
-        const std::string& s = explanations[i];
-        if (!s.empty()) {
-          if (reason_printed) {
-            *listener << ",\nand ";
-          }
-          *listener << "whose element #" << i << " matches, " << s;
-          reason_printed = true;
-        }
-      }
-    }
-    return true;
-  }
-
- private:
-  static Message Elements(size_t count) {
-    return Message() << count << (count == 1 ? " element" : " elements");
-  }
-
-  size_t count() const { return matchers_.size(); }
-
-  ::std::vector<Matcher<const Element&> > matchers_;
-
-  GTEST_DISALLOW_ASSIGN_(ElementsAreMatcherImpl);
-};
-
-// Connectivity matrix of (elements X matchers), in element-major order.
-// Initially, there are no edges.
-// Use NextGraph() to iterate over all possible edge configurations.
-// Use Randomize() to generate a random edge configuration.
-class GTEST_API_ MatchMatrix {
- public:
-  MatchMatrix(size_t num_elements, size_t num_matchers)
-      : num_elements_(num_elements),
-        num_matchers_(num_matchers),
-        matched_(num_elements_* num_matchers_, 0) {
-  }
-
-  size_t LhsSize() const { return num_elements_; }
-  size_t RhsSize() const { return num_matchers_; }
-  bool HasEdge(size_t ilhs, size_t irhs) const {
-    return matched_[SpaceIndex(ilhs, irhs)] == 1;
-  }
-  void SetEdge(size_t ilhs, size_t irhs, bool b) {
-    matched_[SpaceIndex(ilhs, irhs)] = b ? 1 : 0;
-  }
-
-  // Treating the connectivity matrix as a (LhsSize()*RhsSize())-bit number,
-  // adds 1 to that number; returns false if incrementing the graph left it
-  // empty.
-  bool NextGraph();
-
-  void Randomize();
-
-  std::string DebugString() const;
-
- private:
-  size_t SpaceIndex(size_t ilhs, size_t irhs) const {
-    return ilhs * num_matchers_ + irhs;
-  }
-
-  size_t num_elements_;
-  size_t num_matchers_;
-
-  // Each element is a char interpreted as bool. They are stored as a
-  // flattened array in lhs-major order, use 'SpaceIndex()' to translate
-  // a (ilhs, irhs) matrix coordinate into an offset.
-  ::std::vector<char> matched_;
-};
-
-typedef ::std::pair<size_t, size_t> ElementMatcherPair;
-typedef ::std::vector<ElementMatcherPair> ElementMatcherPairs;
-
-// Returns a maximum bipartite matching for the specified graph 'g'.
-// The matching is represented as a vector of {element, matcher} pairs.
-GTEST_API_ ElementMatcherPairs
-FindMaxBipartiteMatching(const MatchMatrix& g);
-
-struct UnorderedMatcherRequire {
-  enum Flags {
-    Superset = 1 << 0,
-    Subset = 1 << 1,
-    ExactMatch = Superset | Subset,
-  };
-};
-
-// Untyped base class for implementing UnorderedElementsAre.  By
-// putting logic that's not specific to the element type here, we
-// reduce binary bloat and increase compilation speed.
-class GTEST_API_ UnorderedElementsAreMatcherImplBase {
- protected:
-  explicit UnorderedElementsAreMatcherImplBase(
-      UnorderedMatcherRequire::Flags matcher_flags)
-      : match_flags_(matcher_flags) {}
-
-  // A vector of matcher describers, one for each element matcher.
-  // Does not own the describers (and thus can be used only when the
-  // element matchers are alive).
-  typedef ::std::vector<const MatcherDescriberInterface*> MatcherDescriberVec;
-
-  // Describes this UnorderedElementsAre matcher.
-  void DescribeToImpl(::std::ostream* os) const;
-
-  // Describes the negation of this UnorderedElementsAre matcher.
-  void DescribeNegationToImpl(::std::ostream* os) const;
-
-  bool VerifyMatchMatrix(const ::std::vector<std::string>& element_printouts,
-                         const MatchMatrix& matrix,
-                         MatchResultListener* listener) const;
-
-  bool FindPairing(const MatchMatrix& matrix,
-                   MatchResultListener* listener) const;
-
-  MatcherDescriberVec& matcher_describers() {
-    return matcher_describers_;
-  }
-
-  static Message Elements(size_t n) {
-    return Message() << n << " element" << (n == 1 ? "" : "s");
-  }
-
-  UnorderedMatcherRequire::Flags match_flags() const { return match_flags_; }
-
- private:
-  UnorderedMatcherRequire::Flags match_flags_;
-  MatcherDescriberVec matcher_describers_;
-
-  GTEST_DISALLOW_ASSIGN_(UnorderedElementsAreMatcherImplBase);
-};
-
-// Implements UnorderedElementsAre, UnorderedElementsAreArray, IsSubsetOf, and
-// IsSupersetOf.
-template <typename Container>
-class UnorderedElementsAreMatcherImpl
-    : public MatcherInterface<Container>,
-      public UnorderedElementsAreMatcherImplBase {
- public:
-  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Container) RawContainer;
-  typedef internal::StlContainerView<RawContainer> View;
-  typedef typename View::type StlContainer;
-  typedef typename View::const_reference StlContainerReference;
-  typedef decltype(std::begin(
-      std::declval<StlContainerReference>())) StlContainerConstIterator;
-  typedef typename std::remove_reference<
-      decltype(*std::declval<StlContainerConstIterator &>())>::type Element;
-
-  template <typename InputIter>
-  UnorderedElementsAreMatcherImpl(UnorderedMatcherRequire::Flags matcher_flags,
-                                  InputIter first, InputIter last)
-      : UnorderedElementsAreMatcherImplBase(matcher_flags) {
-    for (; first != last; ++first) {
-      matchers_.push_back(MatcherCast<const Element&>(*first));
-      matcher_describers().push_back(matchers_.back().GetDescriber());
-    }
-  }
-
-  // Describes what this matcher does.
-  void DescribeTo(::std::ostream* os) const override {
-    return UnorderedElementsAreMatcherImplBase::DescribeToImpl(os);
-  }
-
-  // Describes what the negation of this matcher does.
-  void DescribeNegationTo(::std::ostream* os) const override {
-    return UnorderedElementsAreMatcherImplBase::DescribeNegationToImpl(os);
-  }
-
-  bool MatchAndExplain(Container container,
-                       MatchResultListener* listener) const override {
-    StlContainerReference stl_container = View::ConstReference(container);
-    ::std::vector<std::string> element_printouts;
-    MatchMatrix matrix =
-        AnalyzeElements(stl_container.begin(), stl_container.end(),
-                        &element_printouts, listener);
-
-    if (matrix.LhsSize() == 0 && matrix.RhsSize() == 0) {
-      return true;
-    }
-
-    if (match_flags() == UnorderedMatcherRequire::ExactMatch) {
-      if (matrix.LhsSize() != matrix.RhsSize()) {
-        // The element count doesn't match.  If the container is empty,
-        // there's no need to explain anything as Google Mock already
-        // prints the empty container. Otherwise we just need to show
-        // how many elements there actually are.
-        if (matrix.LhsSize() != 0 && listener->IsInterested()) {
-          *listener << "which has " << Elements(matrix.LhsSize());
-        }
-        return false;
-      }
-    }
-
-    return VerifyMatchMatrix(element_printouts, matrix, listener) &&
-           FindPairing(matrix, listener);
-  }
-
- private:
-  template <typename ElementIter>
-  MatchMatrix AnalyzeElements(ElementIter elem_first, ElementIter elem_last,
-                              ::std::vector<std::string>* element_printouts,
-                              MatchResultListener* listener) const {
-    element_printouts->clear();
-    ::std::vector<char> did_match;
-    size_t num_elements = 0;
-    for (; elem_first != elem_last; ++num_elements, ++elem_first) {
-      if (listener->IsInterested()) {
-        element_printouts->push_back(PrintToString(*elem_first));
-      }
-      for (size_t irhs = 0; irhs != matchers_.size(); ++irhs) {
-        did_match.push_back(Matches(matchers_[irhs])(*elem_first));
-      }
-    }
-
-    MatchMatrix matrix(num_elements, matchers_.size());
-    ::std::vector<char>::const_iterator did_match_iter = did_match.begin();
-    for (size_t ilhs = 0; ilhs != num_elements; ++ilhs) {
-      for (size_t irhs = 0; irhs != matchers_.size(); ++irhs) {
-        matrix.SetEdge(ilhs, irhs, *did_match_iter++ != 0);
-      }
-    }
-    return matrix;
-  }
-
-  ::std::vector<Matcher<const Element&> > matchers_;
-
-  GTEST_DISALLOW_ASSIGN_(UnorderedElementsAreMatcherImpl);
-};
-
-// Functor for use in TransformTuple.
-// Performs MatcherCast<Target> on an input argument of any type.
-template <typename Target>
-struct CastAndAppendTransform {
-  template <typename Arg>
-  Matcher<Target> operator()(const Arg& a) const {
-    return MatcherCast<Target>(a);
-  }
-};
-
-// Implements UnorderedElementsAre.
-template <typename MatcherTuple>
-class UnorderedElementsAreMatcher {
- public:
-  explicit UnorderedElementsAreMatcher(const MatcherTuple& args)
-      : matchers_(args) {}
-
-  template <typename Container>
-  operator Matcher<Container>() const {
-    typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Container) RawContainer;
-    typedef internal::StlContainerView<RawContainer> View;
-    typedef typename View::const_reference StlContainerReference;
-    typedef decltype(std::begin(
-        std::declval<StlContainerReference>())) StlContainerConstIterator;
-    typedef typename std::remove_reference<
-        decltype(*std::declval<StlContainerConstIterator &>())>::type Element;
-    typedef ::std::vector<Matcher<const Element&> > MatcherVec;
-    MatcherVec matchers;
-    matchers.reserve(::std::tuple_size<MatcherTuple>::value);
-    TransformTupleValues(CastAndAppendTransform<const Element&>(), matchers_,
-                         ::std::back_inserter(matchers));
-    return Matcher<Container>(
-        new UnorderedElementsAreMatcherImpl<const Container&>(
-            UnorderedMatcherRequire::ExactMatch, matchers.begin(),
-            matchers.end()));
-  }
-
- private:
-  const MatcherTuple matchers_;
-  GTEST_DISALLOW_ASSIGN_(UnorderedElementsAreMatcher);
-};
-
-// Implements ElementsAre.
-template <typename MatcherTuple>
-class ElementsAreMatcher {
- public:
-  explicit ElementsAreMatcher(const MatcherTuple& args) : matchers_(args) {}
-
-  template <typename Container>
-  operator Matcher<Container>() const {
-    GTEST_COMPILE_ASSERT_(
-        !IsHashTable<GTEST_REMOVE_REFERENCE_AND_CONST_(Container)>::value ||
-            ::std::tuple_size<MatcherTuple>::value < 2,
-        use_UnorderedElementsAre_with_hash_tables);
-
-    typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Container) RawContainer;
-    typedef internal::StlContainerView<RawContainer> View;
-    typedef typename View::const_reference StlContainerReference;
-    typedef decltype(std::begin(
-        std::declval<StlContainerReference>())) StlContainerConstIterator;
-    typedef typename std::remove_reference<
-        decltype(*std::declval<StlContainerConstIterator &>())>::type Element;
-    typedef ::std::vector<Matcher<const Element&> > MatcherVec;
-    MatcherVec matchers;
-    matchers.reserve(::std::tuple_size<MatcherTuple>::value);
-    TransformTupleValues(CastAndAppendTransform<const Element&>(), matchers_,
-                         ::std::back_inserter(matchers));
-    return Matcher<Container>(new ElementsAreMatcherImpl<const Container&>(
-        matchers.begin(), matchers.end()));
-  }
-
- private:
-  const MatcherTuple matchers_;
-  GTEST_DISALLOW_ASSIGN_(ElementsAreMatcher);
-};
-
-// Implements UnorderedElementsAreArray(), IsSubsetOf(), and IsSupersetOf().
-template <typename T>
-class UnorderedElementsAreArrayMatcher {
- public:
-  template <typename Iter>
-  UnorderedElementsAreArrayMatcher(UnorderedMatcherRequire::Flags match_flags,
-                                   Iter first, Iter last)
-      : match_flags_(match_flags), matchers_(first, last) {}
-
-  template <typename Container>
-  operator Matcher<Container>() const {
-    return Matcher<Container>(
-        new UnorderedElementsAreMatcherImpl<const Container&>(
-            match_flags_, matchers_.begin(), matchers_.end()));
-  }
-
- private:
-  UnorderedMatcherRequire::Flags match_flags_;
-  ::std::vector<T> matchers_;
-
-  GTEST_DISALLOW_ASSIGN_(UnorderedElementsAreArrayMatcher);
-};
-
-// Implements ElementsAreArray().
-template <typename T>
-class ElementsAreArrayMatcher {
- public:
-  template <typename Iter>
-  ElementsAreArrayMatcher(Iter first, Iter last) : matchers_(first, last) {}
-
-  template <typename Container>
-  operator Matcher<Container>() const {
-    GTEST_COMPILE_ASSERT_(
-        !IsHashTable<GTEST_REMOVE_REFERENCE_AND_CONST_(Container)>::value,
-        use_UnorderedElementsAreArray_with_hash_tables);
-
-    return Matcher<Container>(new ElementsAreMatcherImpl<const Container&>(
-        matchers_.begin(), matchers_.end()));
-  }
-
- private:
-  const ::std::vector<T> matchers_;
-
-  GTEST_DISALLOW_ASSIGN_(ElementsAreArrayMatcher);
-};
-
-// Given a 2-tuple matcher tm of type Tuple2Matcher and a value second
-// of type Second, BoundSecondMatcher<Tuple2Matcher, Second>(tm,
-// second) is a polymorphic matcher that matches a value x if and only if
-// tm matches tuple (x, second).  Useful for implementing
-// UnorderedPointwise() in terms of UnorderedElementsAreArray().
-//
-// BoundSecondMatcher is copyable and assignable, as we need to put
-// instances of this class in a vector when implementing
-// UnorderedPointwise().
-template <typename Tuple2Matcher, typename Second>
-class BoundSecondMatcher {
- public:
-  BoundSecondMatcher(const Tuple2Matcher& tm, const Second& second)
-      : tuple2_matcher_(tm), second_value_(second) {}
-
-  template <typename T>
-  operator Matcher<T>() const {
-    return MakeMatcher(new Impl<T>(tuple2_matcher_, second_value_));
-  }
-
-  // We have to define this for UnorderedPointwise() to compile in
-  // C++98 mode, as it puts BoundSecondMatcher instances in a vector,
-  // which requires the elements to be assignable in C++98.  The
-  // compiler cannot generate the operator= for us, as Tuple2Matcher
-  // and Second may not be assignable.
-  //
-  // However, this should never be called, so the implementation just
-  // need to assert.
-  void operator=(const BoundSecondMatcher& /*rhs*/) {
-    GTEST_LOG_(FATAL) << "BoundSecondMatcher should never be assigned.";
-  }
-
- private:
-  template <typename T>
-  class Impl : public MatcherInterface<T> {
-   public:
-    typedef ::std::tuple<T, Second> ArgTuple;
-
-    Impl(const Tuple2Matcher& tm, const Second& second)
-        : mono_tuple2_matcher_(SafeMatcherCast<const ArgTuple&>(tm)),
-          second_value_(second) {}
-
-    void DescribeTo(::std::ostream* os) const override {
-      *os << "and ";
-      UniversalPrint(second_value_, os);
-      *os << " ";
-      mono_tuple2_matcher_.DescribeTo(os);
-    }
-
-    bool MatchAndExplain(T x, MatchResultListener* listener) const override {
-      return mono_tuple2_matcher_.MatchAndExplain(ArgTuple(x, second_value_),
-                                                  listener);
-    }
-
-   private:
-    const Matcher<const ArgTuple&> mono_tuple2_matcher_;
-    const Second second_value_;
-
-    GTEST_DISALLOW_ASSIGN_(Impl);
-  };
-
-  const Tuple2Matcher tuple2_matcher_;
-  const Second second_value_;
-};
-
-// Given a 2-tuple matcher tm and a value second,
-// MatcherBindSecond(tm, second) returns a matcher that matches a
-// value x if and only if tm matches tuple (x, second).  Useful for
-// implementing UnorderedPointwise() in terms of UnorderedElementsAreArray().
-template <typename Tuple2Matcher, typename Second>
-BoundSecondMatcher<Tuple2Matcher, Second> MatcherBindSecond(
-    const Tuple2Matcher& tm, const Second& second) {
-  return BoundSecondMatcher<Tuple2Matcher, Second>(tm, second);
-}
-
-// Returns the description for a matcher defined using the MATCHER*()
-// macro where the user-supplied description string is "", if
-// 'negation' is false; otherwise returns the description of the
-// negation of the matcher.  'param_values' contains a list of strings
-// that are the print-out of the matcher's parameters.
-GTEST_API_ std::string FormatMatcherDescription(bool negation,
-                                                const char* matcher_name,
-                                                const Strings& param_values);
-
-// Implements a matcher that checks the value of a optional<> type variable.
-template <typename ValueMatcher>
-class OptionalMatcher {
- public:
-  explicit OptionalMatcher(const ValueMatcher& value_matcher)
-      : value_matcher_(value_matcher) {}
-
-  template <typename Optional>
-  operator Matcher<Optional>() const {
-    return Matcher<Optional>(new Impl<const Optional&>(value_matcher_));
-  }
-
-  template <typename Optional>
-  class Impl : public MatcherInterface<Optional> {
-   public:
-    typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Optional) OptionalView;
-    typedef typename OptionalView::value_type ValueType;
-    explicit Impl(const ValueMatcher& value_matcher)
-        : value_matcher_(MatcherCast<ValueType>(value_matcher)) {}
-
-    void DescribeTo(::std::ostream* os) const override {
-      *os << "value ";
-      value_matcher_.DescribeTo(os);
-    }
-
-    void DescribeNegationTo(::std::ostream* os) const override {
-      *os << "value ";
-      value_matcher_.DescribeNegationTo(os);
-    }
-
-    bool MatchAndExplain(Optional optional,
-                         MatchResultListener* listener) const override {
-      if (!optional) {
-        *listener << "which is not engaged";
-        return false;
-      }
-      const ValueType& value = *optional;
-      StringMatchResultListener value_listener;
-      const bool match = value_matcher_.MatchAndExplain(value, &value_listener);
-      *listener << "whose value " << PrintToString(value)
-                << (match ? " matches" : " doesn't match");
-      PrintIfNotEmpty(value_listener.str(), listener->stream());
-      return match;
-    }
-
-   private:
-    const Matcher<ValueType> value_matcher_;
-    GTEST_DISALLOW_ASSIGN_(Impl);
-  };
-
- private:
-  const ValueMatcher value_matcher_;
-  GTEST_DISALLOW_ASSIGN_(OptionalMatcher);
-};
-
-namespace variant_matcher {
-// Overloads to allow VariantMatcher to do proper ADL lookup.
-template <typename T>
-void holds_alternative() {}
-template <typename T>
-void get() {}
-
-// Implements a matcher that checks the value of a variant<> type variable.
-template <typename T>
-class VariantMatcher {
- public:
-  explicit VariantMatcher(::testing::Matcher<const T&> matcher)
-      : matcher_(std::move(matcher)) {}
-
-  template <typename Variant>
-  bool MatchAndExplain(const Variant& value,
-                       ::testing::MatchResultListener* listener) const {
-    using std::get;
-    if (!listener->IsInterested()) {
-      return holds_alternative<T>(value) && matcher_.Matches(get<T>(value));
-    }
-
-    if (!holds_alternative<T>(value)) {
-      *listener << "whose value is not of type '" << GetTypeName() << "'";
-      return false;
-    }
-
-    const T& elem = get<T>(value);
-    StringMatchResultListener elem_listener;
-    const bool match = matcher_.MatchAndExplain(elem, &elem_listener);
-    *listener << "whose value " << PrintToString(elem)
-              << (match ? " matches" : " doesn't match");
-    PrintIfNotEmpty(elem_listener.str(), listener->stream());
-    return match;
-  }
-
-  void DescribeTo(std::ostream* os) const {
-    *os << "is a variant<> with value of type '" << GetTypeName()
-        << "' and the value ";
-    matcher_.DescribeTo(os);
-  }
-
-  void DescribeNegationTo(std::ostream* os) const {
-    *os << "is a variant<> with value of type other than '" << GetTypeName()
-        << "' or the value ";
-    matcher_.DescribeNegationTo(os);
-  }
-
- private:
-  static std::string GetTypeName() {
-#if GTEST_HAS_RTTI
-    GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(
-        return internal::GetTypeName<T>());
-#endif
-    return "the element type";
-  }
-
-  const ::testing::Matcher<const T&> matcher_;
-};
-
-}  // namespace variant_matcher
-
-namespace any_cast_matcher {
-
-// Overloads to allow AnyCastMatcher to do proper ADL lookup.
-template <typename T>
-void any_cast() {}
-
-// Implements a matcher that any_casts the value.
-template <typename T>
-class AnyCastMatcher {
- public:
-  explicit AnyCastMatcher(const ::testing::Matcher<const T&>& matcher)
-      : matcher_(matcher) {}
-
-  template <typename AnyType>
-  bool MatchAndExplain(const AnyType& value,
-                       ::testing::MatchResultListener* listener) const {
-    if (!listener->IsInterested()) {
-      const T* ptr = any_cast<T>(&value);
-      return ptr != nullptr && matcher_.Matches(*ptr);
-    }
-
-    const T* elem = any_cast<T>(&value);
-    if (elem == nullptr) {
-      *listener << "whose value is not of type '" << GetTypeName() << "'";
-      return false;
-    }
-
-    StringMatchResultListener elem_listener;
-    const bool match = matcher_.MatchAndExplain(*elem, &elem_listener);
-    *listener << "whose value " << PrintToString(*elem)
-              << (match ? " matches" : " doesn't match");
-    PrintIfNotEmpty(elem_listener.str(), listener->stream());
-    return match;
-  }
-
-  void DescribeTo(std::ostream* os) const {
-    *os << "is an 'any' type with value of type '" << GetTypeName()
-        << "' and the value ";
-    matcher_.DescribeTo(os);
-  }
-
-  void DescribeNegationTo(std::ostream* os) const {
-    *os << "is an 'any' type with value of type other than '" << GetTypeName()
-        << "' or the value ";
-    matcher_.DescribeNegationTo(os);
-  }
-
- private:
-  static std::string GetTypeName() {
-#if GTEST_HAS_RTTI
-    GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(
-        return internal::GetTypeName<T>());
-#endif
-    return "the element type";
-  }
-
-  const ::testing::Matcher<const T&> matcher_;
-};
-
-}  // namespace any_cast_matcher
-
-// Implements the Args() matcher.
-template <class ArgsTuple, size_t... k>
-class ArgsMatcherImpl : public MatcherInterface<ArgsTuple> {
- public:
-  using RawArgsTuple = typename std::decay<ArgsTuple>::type;
-  using SelectedArgs =
-      std::tuple<typename std::tuple_element<k, RawArgsTuple>::type...>;
-  using MonomorphicInnerMatcher = Matcher<const SelectedArgs&>;
-
-  template <typename InnerMatcher>
-  explicit ArgsMatcherImpl(const InnerMatcher& inner_matcher)
-      : inner_matcher_(SafeMatcherCast<const SelectedArgs&>(inner_matcher)) {}
-
-  bool MatchAndExplain(ArgsTuple args,
-                       MatchResultListener* listener) const override {
-    // Workaround spurious C4100 on MSVC<=15.7 when k is empty.
-    (void)args;
-    const SelectedArgs& selected_args =
-        std::forward_as_tuple(std::get<k>(args)...);
-    if (!listener->IsInterested()) return inner_matcher_.Matches(selected_args);
-
-    PrintIndices(listener->stream());
-    *listener << "are " << PrintToString(selected_args);
-
-    StringMatchResultListener inner_listener;
-    const bool match =
-        inner_matcher_.MatchAndExplain(selected_args, &inner_listener);
-    PrintIfNotEmpty(inner_listener.str(), listener->stream());
-    return match;
-  }
-
-  void DescribeTo(::std::ostream* os) const override {
-    *os << "are a tuple ";
-    PrintIndices(os);
-    inner_matcher_.DescribeTo(os);
-  }
-
-  void DescribeNegationTo(::std::ostream* os) const override {
-    *os << "are a tuple ";
-    PrintIndices(os);
-    inner_matcher_.DescribeNegationTo(os);
-  }
-
- private:
-  // Prints the indices of the selected fields.
-  static void PrintIndices(::std::ostream* os) {
-    *os << "whose fields (";
-    const char* sep = "";
-    // Workaround spurious C4189 on MSVC<=15.7 when k is empty.
-    (void)sep;
-    const char* dummy[] = {"", (*os << sep << "#" << k, sep = ", ")...};
-    (void)dummy;
-    *os << ") ";
-  }
-
-  MonomorphicInnerMatcher inner_matcher_;
-};
-
-template <class InnerMatcher, size_t... k>
-class ArgsMatcher {
- public:
-  explicit ArgsMatcher(InnerMatcher inner_matcher)
-      : inner_matcher_(std::move(inner_matcher)) {}
-
-  template <typename ArgsTuple>
-  operator Matcher<ArgsTuple>() const {  // NOLINT
-    return MakeMatcher(new ArgsMatcherImpl<ArgsTuple, k...>(inner_matcher_));
-  }
-
- private:
-  InnerMatcher inner_matcher_;
-};
-
-}  // namespace internal
-
-// ElementsAreArray(iterator_first, iterator_last)
-// ElementsAreArray(pointer, count)
-// ElementsAreArray(array)
-// ElementsAreArray(container)
-// ElementsAreArray({ e1, e2, ..., en })
-//
-// The ElementsAreArray() functions are like ElementsAre(...), except
-// that they are given a homogeneous sequence rather than taking each
-// element as a function argument. The sequence can be specified as an
-// array, a pointer and count, a vector, an initializer list, or an
-// STL iterator range. In each of these cases, the underlying sequence
-// can be either a sequence of values or a sequence of matchers.
-//
-// All forms of ElementsAreArray() make a copy of the input matcher sequence.
-
-template <typename Iter>
-inline internal::ElementsAreArrayMatcher<
-    typename ::std::iterator_traits<Iter>::value_type>
-ElementsAreArray(Iter first, Iter last) {
-  typedef typename ::std::iterator_traits<Iter>::value_type T;
-  return internal::ElementsAreArrayMatcher<T>(first, last);
-}
-
-template <typename T>
-inline internal::ElementsAreArrayMatcher<T> ElementsAreArray(
-    const T* pointer, size_t count) {
-  return ElementsAreArray(pointer, pointer + count);
-}
-
-template <typename T, size_t N>
-inline internal::ElementsAreArrayMatcher<T> ElementsAreArray(
-    const T (&array)[N]) {
-  return ElementsAreArray(array, N);
-}
-
-template <typename Container>
-inline internal::ElementsAreArrayMatcher<typename Container::value_type>
-ElementsAreArray(const Container& container) {
-  return ElementsAreArray(container.begin(), container.end());
-}
-
-template <typename T>
-inline internal::ElementsAreArrayMatcher<T>
-ElementsAreArray(::std::initializer_list<T> xs) {
-  return ElementsAreArray(xs.begin(), xs.end());
-}
-
-// UnorderedElementsAreArray(iterator_first, iterator_last)
-// UnorderedElementsAreArray(pointer, count)
-// UnorderedElementsAreArray(array)
-// UnorderedElementsAreArray(container)
-// UnorderedElementsAreArray({ e1, e2, ..., en })
-//
-// UnorderedElementsAreArray() verifies that a bijective mapping onto a
-// collection of matchers exists.
-//
-// The matchers can be specified as an array, a pointer and count, a container,
-// an initializer list, or an STL iterator range. In each of these cases, the
-// underlying matchers can be either values or matchers.
-
-template <typename Iter>
-inline internal::UnorderedElementsAreArrayMatcher<
-    typename ::std::iterator_traits<Iter>::value_type>
-UnorderedElementsAreArray(Iter first, Iter last) {
-  typedef typename ::std::iterator_traits<Iter>::value_type T;
-  return internal::UnorderedElementsAreArrayMatcher<T>(
-      internal::UnorderedMatcherRequire::ExactMatch, first, last);
-}
-
-template <typename T>
-inline internal::UnorderedElementsAreArrayMatcher<T>
-UnorderedElementsAreArray(const T* pointer, size_t count) {
-  return UnorderedElementsAreArray(pointer, pointer + count);
-}
-
-template <typename T, size_t N>
-inline internal::UnorderedElementsAreArrayMatcher<T>
-UnorderedElementsAreArray(const T (&array)[N]) {
-  return UnorderedElementsAreArray(array, N);
-}
-
-template <typename Container>
-inline internal::UnorderedElementsAreArrayMatcher<
-    typename Container::value_type>
-UnorderedElementsAreArray(const Container& container) {
-  return UnorderedElementsAreArray(container.begin(), container.end());
-}
-
-template <typename T>
-inline internal::UnorderedElementsAreArrayMatcher<T>
-UnorderedElementsAreArray(::std::initializer_list<T> xs) {
-  return UnorderedElementsAreArray(xs.begin(), xs.end());
-}
-
-// _ is a matcher that matches anything of any type.
-//
-// This definition is fine as:
-//
-//   1. The C++ standard permits using the name _ in a namespace that
-//      is not the global namespace or ::std.
-//   2. The AnythingMatcher class has no data member or constructor,
-//      so it's OK to create global variables of this type.
-//   3. c-style has approved of using _ in this case.
-const internal::AnythingMatcher _ = {};
-// Creates a matcher that matches any value of the given type T.
-template <typename T>
-inline Matcher<T> A() {
-  return Matcher<T>(new internal::AnyMatcherImpl<T>());
-}
-
-// Creates a matcher that matches any value of the given type T.
-template <typename T>
-inline Matcher<T> An() { return A<T>(); }
-
-template <typename T, typename M>
-Matcher<T> internal::MatcherCastImpl<T, M>::CastImpl(
-    const M& value, std::false_type /* convertible_to_matcher */,
-    std::false_type /* convertible_to_T */) {
-  return Eq(value);
-}
-
-// Creates a polymorphic matcher that matches any NULL pointer.
-inline PolymorphicMatcher<internal::IsNullMatcher > IsNull() {
-  return MakePolymorphicMatcher(internal::IsNullMatcher());
-}
-
-// Creates a polymorphic matcher that matches any non-NULL pointer.
-// This is convenient as Not(NULL) doesn't compile (the compiler
-// thinks that that expression is comparing a pointer with an integer).
-inline PolymorphicMatcher<internal::NotNullMatcher > NotNull() {
-  return MakePolymorphicMatcher(internal::NotNullMatcher());
-}
-
-// Creates a polymorphic matcher that matches any argument that
-// references variable x.
-template <typename T>
-inline internal::RefMatcher<T&> Ref(T& x) {  // NOLINT
-  return internal::RefMatcher<T&>(x);
-}
-
-// Creates a matcher that matches any double argument approximately
-// equal to rhs, where two NANs are considered unequal.
-inline internal::FloatingEqMatcher<double> DoubleEq(double rhs) {
-  return internal::FloatingEqMatcher<double>(rhs, false);
-}
-
-// Creates a matcher that matches any double argument approximately
-// equal to rhs, including NaN values when rhs is NaN.
-inline internal::FloatingEqMatcher<double> NanSensitiveDoubleEq(double rhs) {
-  return internal::FloatingEqMatcher<double>(rhs, true);
-}
-
-// Creates a matcher that matches any double argument approximately equal to
-// rhs, up to the specified max absolute error bound, where two NANs are
-// considered unequal.  The max absolute error bound must be non-negative.
-inline internal::FloatingEqMatcher<double> DoubleNear(
-    double rhs, double max_abs_error) {
-  return internal::FloatingEqMatcher<double>(rhs, false, max_abs_error);
-}
-
-// Creates a matcher that matches any double argument approximately equal to
-// rhs, up to the specified max absolute error bound, including NaN values when
-// rhs is NaN.  The max absolute error bound must be non-negative.
-inline internal::FloatingEqMatcher<double> NanSensitiveDoubleNear(
-    double rhs, double max_abs_error) {
-  return internal::FloatingEqMatcher<double>(rhs, true, max_abs_error);
-}
-
-// Creates a matcher that matches any float argument approximately
-// equal to rhs, where two NANs are considered unequal.
-inline internal::FloatingEqMatcher<float> FloatEq(float rhs) {
-  return internal::FloatingEqMatcher<float>(rhs, false);
-}
-
-// Creates a matcher that matches any float argument approximately
-// equal to rhs, including NaN values when rhs is NaN.
-inline internal::FloatingEqMatcher<float> NanSensitiveFloatEq(float rhs) {
-  return internal::FloatingEqMatcher<float>(rhs, true);
-}
-
-// Creates a matcher that matches any float argument approximately equal to
-// rhs, up to the specified max absolute error bound, where two NANs are
-// considered unequal.  The max absolute error bound must be non-negative.
-inline internal::FloatingEqMatcher<float> FloatNear(
-    float rhs, float max_abs_error) {
-  return internal::FloatingEqMatcher<float>(rhs, false, max_abs_error);
-}
-
-// Creates a matcher that matches any float argument approximately equal to
-// rhs, up to the specified max absolute error bound, including NaN values when
-// rhs is NaN.  The max absolute error bound must be non-negative.
-inline internal::FloatingEqMatcher<float> NanSensitiveFloatNear(
-    float rhs, float max_abs_error) {
-  return internal::FloatingEqMatcher<float>(rhs, true, max_abs_error);
-}
-
-// Creates a matcher that matches a pointer (raw or smart) that points
-// to a value that matches inner_matcher.
-template <typename InnerMatcher>
-inline internal::PointeeMatcher<InnerMatcher> Pointee(
-    const InnerMatcher& inner_matcher) {
-  return internal::PointeeMatcher<InnerMatcher>(inner_matcher);
-}
-
-#if GTEST_HAS_RTTI
-// Creates a matcher that matches a pointer or reference that matches
-// inner_matcher when dynamic_cast<To> is applied.
-// The result of dynamic_cast<To> is forwarded to the inner matcher.
-// If To is a pointer and the cast fails, the inner matcher will receive NULL.
-// If To is a reference and the cast fails, this matcher returns false
-// immediately.
-template <typename To>
-inline PolymorphicMatcher<internal::WhenDynamicCastToMatcher<To> >
-WhenDynamicCastTo(const Matcher<To>& inner_matcher) {
-  return MakePolymorphicMatcher(
-      internal::WhenDynamicCastToMatcher<To>(inner_matcher));
-}
-#endif  // GTEST_HAS_RTTI
-
-// Creates a matcher that matches an object whose given field matches
-// 'matcher'.  For example,
-//   Field(&Foo::number, Ge(5))
-// matches a Foo object x if and only if x.number >= 5.
-template <typename Class, typename FieldType, typename FieldMatcher>
-inline PolymorphicMatcher<
-  internal::FieldMatcher<Class, FieldType> > Field(
-    FieldType Class::*field, const FieldMatcher& matcher) {
-  return MakePolymorphicMatcher(
-      internal::FieldMatcher<Class, FieldType>(
-          field, MatcherCast<const FieldType&>(matcher)));
-  // The call to MatcherCast() is required for supporting inner
-  // matchers of compatible types.  For example, it allows
-  //   Field(&Foo::bar, m)
-  // to compile where bar is an int32 and m is a matcher for int64.
-}
-
-// Same as Field() but also takes the name of the field to provide better error
-// messages.
-template <typename Class, typename FieldType, typename FieldMatcher>
-inline PolymorphicMatcher<internal::FieldMatcher<Class, FieldType> > Field(
-    const std::string& field_name, FieldType Class::*field,
-    const FieldMatcher& matcher) {
-  return MakePolymorphicMatcher(internal::FieldMatcher<Class, FieldType>(
-      field_name, field, MatcherCast<const FieldType&>(matcher)));
-}
-
-// Creates a matcher that matches an object whose given property
-// matches 'matcher'.  For example,
-//   Property(&Foo::str, StartsWith("hi"))
-// matches a Foo object x if and only if x.str() starts with "hi".
-template <typename Class, typename PropertyType, typename PropertyMatcher>
-inline PolymorphicMatcher<internal::PropertyMatcher<
-    Class, PropertyType, PropertyType (Class::*)() const> >
-Property(PropertyType (Class::*property)() const,
-         const PropertyMatcher& matcher) {
-  return MakePolymorphicMatcher(
-      internal::PropertyMatcher<Class, PropertyType,
-                                PropertyType (Class::*)() const>(
-          property, MatcherCast<const PropertyType&>(matcher)));
-  // The call to MatcherCast() is required for supporting inner
-  // matchers of compatible types.  For example, it allows
-  //   Property(&Foo::bar, m)
-  // to compile where bar() returns an int32 and m is a matcher for int64.
-}
-
-// Same as Property() above, but also takes the name of the property to provide
-// better error messages.
-template <typename Class, typename PropertyType, typename PropertyMatcher>
-inline PolymorphicMatcher<internal::PropertyMatcher<
-    Class, PropertyType, PropertyType (Class::*)() const> >
-Property(const std::string& property_name,
-         PropertyType (Class::*property)() const,
-         const PropertyMatcher& matcher) {
-  return MakePolymorphicMatcher(
-      internal::PropertyMatcher<Class, PropertyType,
-                                PropertyType (Class::*)() const>(
-          property_name, property, MatcherCast<const PropertyType&>(matcher)));
-}
-
-// The same as above but for reference-qualified member functions.
-template <typename Class, typename PropertyType, typename PropertyMatcher>
-inline PolymorphicMatcher<internal::PropertyMatcher<
-    Class, PropertyType, PropertyType (Class::*)() const &> >
-Property(PropertyType (Class::*property)() const &,
-         const PropertyMatcher& matcher) {
-  return MakePolymorphicMatcher(
-      internal::PropertyMatcher<Class, PropertyType,
-                                PropertyType (Class::*)() const&>(
-          property, MatcherCast<const PropertyType&>(matcher)));
-}
-
-// Three-argument form for reference-qualified member functions.
-template <typename Class, typename PropertyType, typename PropertyMatcher>
-inline PolymorphicMatcher<internal::PropertyMatcher<
-    Class, PropertyType, PropertyType (Class::*)() const &> >
-Property(const std::string& property_name,
-         PropertyType (Class::*property)() const &,
-         const PropertyMatcher& matcher) {
-  return MakePolymorphicMatcher(
-      internal::PropertyMatcher<Class, PropertyType,
-                                PropertyType (Class::*)() const&>(
-          property_name, property, MatcherCast<const PropertyType&>(matcher)));
-}
-
-// Creates a matcher that matches an object if and only if the result of
-// applying a callable to x matches 'matcher'. For example,
-//   ResultOf(f, StartsWith("hi"))
-// matches a Foo object x if and only if f(x) starts with "hi".
-// `callable` parameter can be a function, function pointer, or a functor. It is
-// required to keep no state affecting the results of the calls on it and make
-// no assumptions about how many calls will be made. Any state it keeps must be
-// protected from the concurrent access.
-template <typename Callable, typename InnerMatcher>
-internal::ResultOfMatcher<Callable, InnerMatcher> ResultOf(
-    Callable callable, InnerMatcher matcher) {
-  return internal::ResultOfMatcher<Callable, InnerMatcher>(
-      std::move(callable), std::move(matcher));
-}
-
-// String matchers.
-
-// Matches a string equal to str.
-inline PolymorphicMatcher<internal::StrEqualityMatcher<std::string> > StrEq(
-    const std::string& str) {
-  return MakePolymorphicMatcher(
-      internal::StrEqualityMatcher<std::string>(str, true, true));
-}
-
-// Matches a string not equal to str.
-inline PolymorphicMatcher<internal::StrEqualityMatcher<std::string> > StrNe(
-    const std::string& str) {
-  return MakePolymorphicMatcher(
-      internal::StrEqualityMatcher<std::string>(str, false, true));
-}
-
-// Matches a string equal to str, ignoring case.
-inline PolymorphicMatcher<internal::StrEqualityMatcher<std::string> > StrCaseEq(
-    const std::string& str) {
-  return MakePolymorphicMatcher(
-      internal::StrEqualityMatcher<std::string>(str, true, false));
-}
-
-// Matches a string not equal to str, ignoring case.
-inline PolymorphicMatcher<internal::StrEqualityMatcher<std::string> > StrCaseNe(
-    const std::string& str) {
-  return MakePolymorphicMatcher(
-      internal::StrEqualityMatcher<std::string>(str, false, false));
-}
-
-// Creates a matcher that matches any string, std::string, or C string
-// that contains the given substring.
-inline PolymorphicMatcher<internal::HasSubstrMatcher<std::string> > HasSubstr(
-    const std::string& substring) {
-  return MakePolymorphicMatcher(
-      internal::HasSubstrMatcher<std::string>(substring));
-}
-
-// Matches a string that starts with 'prefix' (case-sensitive).
-inline PolymorphicMatcher<internal::StartsWithMatcher<std::string> > StartsWith(
-    const std::string& prefix) {
-  return MakePolymorphicMatcher(
-      internal::StartsWithMatcher<std::string>(prefix));
-}
-
-// Matches a string that ends with 'suffix' (case-sensitive).
-inline PolymorphicMatcher<internal::EndsWithMatcher<std::string> > EndsWith(
-    const std::string& suffix) {
-  return MakePolymorphicMatcher(internal::EndsWithMatcher<std::string>(suffix));
-}
-
-#if GTEST_HAS_STD_WSTRING
-// Wide string matchers.
-
-// Matches a string equal to str.
-inline PolymorphicMatcher<internal::StrEqualityMatcher<std::wstring> > StrEq(
-    const std::wstring& str) {
-  return MakePolymorphicMatcher(
-      internal::StrEqualityMatcher<std::wstring>(str, true, true));
-}
-
-// Matches a string not equal to str.
-inline PolymorphicMatcher<internal::StrEqualityMatcher<std::wstring> > StrNe(
-    const std::wstring& str) {
-  return MakePolymorphicMatcher(
-      internal::StrEqualityMatcher<std::wstring>(str, false, true));
-}
-
-// Matches a string equal to str, ignoring case.
-inline PolymorphicMatcher<internal::StrEqualityMatcher<std::wstring> >
-StrCaseEq(const std::wstring& str) {
-  return MakePolymorphicMatcher(
-      internal::StrEqualityMatcher<std::wstring>(str, true, false));
-}
-
-// Matches a string not equal to str, ignoring case.
-inline PolymorphicMatcher<internal::StrEqualityMatcher<std::wstring> >
-StrCaseNe(const std::wstring& str) {
-  return MakePolymorphicMatcher(
-      internal::StrEqualityMatcher<std::wstring>(str, false, false));
-}
-
-// Creates a matcher that matches any ::wstring, std::wstring, or C wide string
-// that contains the given substring.
-inline PolymorphicMatcher<internal::HasSubstrMatcher<std::wstring> > HasSubstr(
-    const std::wstring& substring) {
-  return MakePolymorphicMatcher(
-      internal::HasSubstrMatcher<std::wstring>(substring));
-}
-
-// Matches a string that starts with 'prefix' (case-sensitive).
-inline PolymorphicMatcher<internal::StartsWithMatcher<std::wstring> >
-StartsWith(const std::wstring& prefix) {
-  return MakePolymorphicMatcher(
-      internal::StartsWithMatcher<std::wstring>(prefix));
-}
-
-// Matches a string that ends with 'suffix' (case-sensitive).
-inline PolymorphicMatcher<internal::EndsWithMatcher<std::wstring> > EndsWith(
-    const std::wstring& suffix) {
-  return MakePolymorphicMatcher(
-      internal::EndsWithMatcher<std::wstring>(suffix));
-}
-
-#endif  // GTEST_HAS_STD_WSTRING
-
-// Creates a polymorphic matcher that matches a 2-tuple where the
-// first field == the second field.
-inline internal::Eq2Matcher Eq() { return internal::Eq2Matcher(); }
-
-// Creates a polymorphic matcher that matches a 2-tuple where the
-// first field >= the second field.
-inline internal::Ge2Matcher Ge() { return internal::Ge2Matcher(); }
-
-// Creates a polymorphic matcher that matches a 2-tuple where the
-// first field > the second field.
-inline internal::Gt2Matcher Gt() { return internal::Gt2Matcher(); }
-
-// Creates a polymorphic matcher that matches a 2-tuple where the
-// first field <= the second field.
-inline internal::Le2Matcher Le() { return internal::Le2Matcher(); }
-
-// Creates a polymorphic matcher that matches a 2-tuple where the
-// first field < the second field.
-inline internal::Lt2Matcher Lt() { return internal::Lt2Matcher(); }
-
-// Creates a polymorphic matcher that matches a 2-tuple where the
-// first field != the second field.
-inline internal::Ne2Matcher Ne() { return internal::Ne2Matcher(); }
-
-// Creates a polymorphic matcher that matches a 2-tuple where
-// FloatEq(first field) matches the second field.
-inline internal::FloatingEq2Matcher<float> FloatEq() {
-  return internal::FloatingEq2Matcher<float>();
-}
-
-// Creates a polymorphic matcher that matches a 2-tuple where
-// DoubleEq(first field) matches the second field.
-inline internal::FloatingEq2Matcher<double> DoubleEq() {
-  return internal::FloatingEq2Matcher<double>();
-}
-
-// Creates a polymorphic matcher that matches a 2-tuple where
-// FloatEq(first field) matches the second field with NaN equality.
-inline internal::FloatingEq2Matcher<float> NanSensitiveFloatEq() {
-  return internal::FloatingEq2Matcher<float>(true);
-}
-
-// Creates a polymorphic matcher that matches a 2-tuple where
-// DoubleEq(first field) matches the second field with NaN equality.
-inline internal::FloatingEq2Matcher<double> NanSensitiveDoubleEq() {
-  return internal::FloatingEq2Matcher<double>(true);
-}
-
-// Creates a polymorphic matcher that matches a 2-tuple where
-// FloatNear(first field, max_abs_error) matches the second field.
-inline internal::FloatingEq2Matcher<float> FloatNear(float max_abs_error) {
-  return internal::FloatingEq2Matcher<float>(max_abs_error);
-}
-
-// Creates a polymorphic matcher that matches a 2-tuple where
-// DoubleNear(first field, max_abs_error) matches the second field.
-inline internal::FloatingEq2Matcher<double> DoubleNear(double max_abs_error) {
-  return internal::FloatingEq2Matcher<double>(max_abs_error);
-}
-
-// Creates a polymorphic matcher that matches a 2-tuple where
-// FloatNear(first field, max_abs_error) matches the second field with NaN
-// equality.
-inline internal::FloatingEq2Matcher<float> NanSensitiveFloatNear(
-    float max_abs_error) {
-  return internal::FloatingEq2Matcher<float>(max_abs_error, true);
-}
-
-// Creates a polymorphic matcher that matches a 2-tuple where
-// DoubleNear(first field, max_abs_error) matches the second field with NaN
-// equality.
-inline internal::FloatingEq2Matcher<double> NanSensitiveDoubleNear(
-    double max_abs_error) {
-  return internal::FloatingEq2Matcher<double>(max_abs_error, true);
-}
-
-// Creates a matcher that matches any value of type T that m doesn't
-// match.
-template <typename InnerMatcher>
-inline internal::NotMatcher<InnerMatcher> Not(InnerMatcher m) {
-  return internal::NotMatcher<InnerMatcher>(m);
-}
-
-// Returns a matcher that matches anything that satisfies the given
-// predicate.  The predicate can be any unary function or functor
-// whose return type can be implicitly converted to bool.
-template <typename Predicate>
-inline PolymorphicMatcher<internal::TrulyMatcher<Predicate> >
-Truly(Predicate pred) {
-  return MakePolymorphicMatcher(internal::TrulyMatcher<Predicate>(pred));
-}
-
-// Returns a matcher that matches the container size. The container must
-// support both size() and size_type which all STL-like containers provide.
-// Note that the parameter 'size' can be a value of type size_type as well as
-// matcher. For instance:
-//   EXPECT_THAT(container, SizeIs(2));     // Checks container has 2 elements.
-//   EXPECT_THAT(container, SizeIs(Le(2));  // Checks container has at most 2.
-template <typename SizeMatcher>
-inline internal::SizeIsMatcher<SizeMatcher>
-SizeIs(const SizeMatcher& size_matcher) {
-  return internal::SizeIsMatcher<SizeMatcher>(size_matcher);
-}
-
-// Returns a matcher that matches the distance between the container's begin()
-// iterator and its end() iterator, i.e. the size of the container. This matcher
-// can be used instead of SizeIs with containers such as std::forward_list which
-// do not implement size(). The container must provide const_iterator (with
-// valid iterator_traits), begin() and end().
-template <typename DistanceMatcher>
-inline internal::BeginEndDistanceIsMatcher<DistanceMatcher>
-BeginEndDistanceIs(const DistanceMatcher& distance_matcher) {
-  return internal::BeginEndDistanceIsMatcher<DistanceMatcher>(distance_matcher);
-}
-
-// Returns a matcher that matches an equal container.
-// This matcher behaves like Eq(), but in the event of mismatch lists the
-// values that are included in one container but not the other. (Duplicate
-// values and order differences are not explained.)
-template <typename Container>
-inline PolymorphicMatcher<internal::ContainerEqMatcher<
-    typename std::remove_const<Container>::type>>
-ContainerEq(const Container& rhs) {
-  // This following line is for working around a bug in MSVC 8.0,
-  // which causes Container to be a const type sometimes.
-  typedef typename std::remove_const<Container>::type RawContainer;
-  return MakePolymorphicMatcher(
-      internal::ContainerEqMatcher<RawContainer>(rhs));
-}
-
-// Returns a matcher that matches a container that, when sorted using
-// the given comparator, matches container_matcher.
-template <typename Comparator, typename ContainerMatcher>
-inline internal::WhenSortedByMatcher<Comparator, ContainerMatcher>
-WhenSortedBy(const Comparator& comparator,
-             const ContainerMatcher& container_matcher) {
-  return internal::WhenSortedByMatcher<Comparator, ContainerMatcher>(
-      comparator, container_matcher);
-}
-
-// Returns a matcher that matches a container that, when sorted using
-// the < operator, matches container_matcher.
-template <typename ContainerMatcher>
-inline internal::WhenSortedByMatcher<internal::LessComparator, ContainerMatcher>
-WhenSorted(const ContainerMatcher& container_matcher) {
-  return
-      internal::WhenSortedByMatcher<internal::LessComparator, ContainerMatcher>(
-          internal::LessComparator(), container_matcher);
-}
-
-// Matches an STL-style container or a native array that contains the
-// same number of elements as in rhs, where its i-th element and rhs's
-// i-th element (as a pair) satisfy the given pair matcher, for all i.
-// TupleMatcher must be able to be safely cast to Matcher<std::tuple<const
-// T1&, const T2&> >, where T1 and T2 are the types of elements in the
-// LHS container and the RHS container respectively.
-template <typename TupleMatcher, typename Container>
-inline internal::PointwiseMatcher<TupleMatcher,
-                                  typename std::remove_const<Container>::type>
-Pointwise(const TupleMatcher& tuple_matcher, const Container& rhs) {
-  // This following line is for working around a bug in MSVC 8.0,
-  // which causes Container to be a const type sometimes (e.g. when
-  // rhs is a const int[])..
-  typedef typename std::remove_const<Container>::type RawContainer;
-  return internal::PointwiseMatcher<TupleMatcher, RawContainer>(
-      tuple_matcher, rhs);
-}
-
-
-// Supports the Pointwise(m, {a, b, c}) syntax.
-template <typename TupleMatcher, typename T>
-inline internal::PointwiseMatcher<TupleMatcher, std::vector<T> > Pointwise(
-    const TupleMatcher& tuple_matcher, std::initializer_list<T> rhs) {
-  return Pointwise(tuple_matcher, std::vector<T>(rhs));
-}
-
-
-// UnorderedPointwise(pair_matcher, rhs) matches an STL-style
-// container or a native array that contains the same number of
-// elements as in rhs, where in some permutation of the container, its
-// i-th element and rhs's i-th element (as a pair) satisfy the given
-// pair matcher, for all i.  Tuple2Matcher must be able to be safely
-// cast to Matcher<std::tuple<const T1&, const T2&> >, where T1 and T2 are
-// the types of elements in the LHS container and the RHS container
-// respectively.
-//
-// This is like Pointwise(pair_matcher, rhs), except that the element
-// order doesn't matter.
-template <typename Tuple2Matcher, typename RhsContainer>
-inline internal::UnorderedElementsAreArrayMatcher<
-    typename internal::BoundSecondMatcher<
-        Tuple2Matcher,
-        typename internal::StlContainerView<
-            typename std::remove_const<RhsContainer>::type>::type::value_type>>
-UnorderedPointwise(const Tuple2Matcher& tuple2_matcher,
-                   const RhsContainer& rhs_container) {
-  // This following line is for working around a bug in MSVC 8.0,
-  // which causes RhsContainer to be a const type sometimes (e.g. when
-  // rhs_container is a const int[]).
-  typedef typename std::remove_const<RhsContainer>::type RawRhsContainer;
-
-  // RhsView allows the same code to handle RhsContainer being a
-  // STL-style container and it being a native C-style array.
-  typedef typename internal::StlContainerView<RawRhsContainer> RhsView;
-  typedef typename RhsView::type RhsStlContainer;
-  typedef typename RhsStlContainer::value_type Second;
-  const RhsStlContainer& rhs_stl_container =
-      RhsView::ConstReference(rhs_container);
-
-  // Create a matcher for each element in rhs_container.
-  ::std::vector<internal::BoundSecondMatcher<Tuple2Matcher, Second> > matchers;
-  for (typename RhsStlContainer::const_iterator it = rhs_stl_container.begin();
-       it != rhs_stl_container.end(); ++it) {
-    matchers.push_back(
-        internal::MatcherBindSecond(tuple2_matcher, *it));
-  }
-
-  // Delegate the work to UnorderedElementsAreArray().
-  return UnorderedElementsAreArray(matchers);
-}
-
-
-// Supports the UnorderedPointwise(m, {a, b, c}) syntax.
-template <typename Tuple2Matcher, typename T>
-inline internal::UnorderedElementsAreArrayMatcher<
-    typename internal::BoundSecondMatcher<Tuple2Matcher, T> >
-UnorderedPointwise(const Tuple2Matcher& tuple2_matcher,
-                   std::initializer_list<T> rhs) {
-  return UnorderedPointwise(tuple2_matcher, std::vector<T>(rhs));
-}
-
-
-// Matches an STL-style container or a native array that contains at
-// least one element matching the given value or matcher.
-//
-// Examples:
-//   ::std::set<int> page_ids;
-//   page_ids.insert(3);
-//   page_ids.insert(1);
-//   EXPECT_THAT(page_ids, Contains(1));
-//   EXPECT_THAT(page_ids, Contains(Gt(2)));
-//   EXPECT_THAT(page_ids, Not(Contains(4)));
-//
-//   ::std::map<int, size_t> page_lengths;
-//   page_lengths[1] = 100;
-//   EXPECT_THAT(page_lengths,
-//               Contains(::std::pair<const int, size_t>(1, 100)));
-//
-//   const char* user_ids[] = { "joe", "mike", "tom" };
-//   EXPECT_THAT(user_ids, Contains(Eq(::std::string("tom"))));
-template <typename M>
-inline internal::ContainsMatcher<M> Contains(M matcher) {
-  return internal::ContainsMatcher<M>(matcher);
-}
-
-// IsSupersetOf(iterator_first, iterator_last)
-// IsSupersetOf(pointer, count)
-// IsSupersetOf(array)
-// IsSupersetOf(container)
-// IsSupersetOf({e1, e2, ..., en})
-//
-// IsSupersetOf() verifies that a surjective partial mapping onto a collection
-// of matchers exists. In other words, a container matches
-// IsSupersetOf({e1, ..., en}) if and only if there is a permutation
-// {y1, ..., yn} of some of the container's elements where y1 matches e1,
-// ..., and yn matches en. Obviously, the size of the container must be >= n
-// in order to have a match. Examples:
-//
-// - {1, 2, 3} matches IsSupersetOf({Ge(3), Ne(0)}), as 3 matches Ge(3) and
-//   1 matches Ne(0).
-// - {1, 2} doesn't match IsSupersetOf({Eq(1), Lt(2)}), even though 1 matches
-//   both Eq(1) and Lt(2). The reason is that different matchers must be used
-//   for elements in different slots of the container.
-// - {1, 1, 2} matches IsSupersetOf({Eq(1), Lt(2)}), as (the first) 1 matches
-//   Eq(1) and (the second) 1 matches Lt(2).
-// - {1, 2, 3} matches IsSupersetOf(Gt(1), Gt(1)), as 2 matches (the first)
-//   Gt(1) and 3 matches (the second) Gt(1).
-//
-// The matchers can be specified as an array, a pointer and count, a container,
-// an initializer list, or an STL iterator range. In each of these cases, the
-// underlying matchers can be either values or matchers.
-
-template <typename Iter>
-inline internal::UnorderedElementsAreArrayMatcher<
-    typename ::std::iterator_traits<Iter>::value_type>
-IsSupersetOf(Iter first, Iter last) {
-  typedef typename ::std::iterator_traits<Iter>::value_type T;
-  return internal::UnorderedElementsAreArrayMatcher<T>(
-      internal::UnorderedMatcherRequire::Superset, first, last);
-}
-
-template <typename T>
-inline internal::UnorderedElementsAreArrayMatcher<T> IsSupersetOf(
-    const T* pointer, size_t count) {
-  return IsSupersetOf(pointer, pointer + count);
-}
-
-template <typename T, size_t N>
-inline internal::UnorderedElementsAreArrayMatcher<T> IsSupersetOf(
-    const T (&array)[N]) {
-  return IsSupersetOf(array, N);
-}
-
-template <typename Container>
-inline internal::UnorderedElementsAreArrayMatcher<
-    typename Container::value_type>
-IsSupersetOf(const Container& container) {
-  return IsSupersetOf(container.begin(), container.end());
-}
-
-template <typename T>
-inline internal::UnorderedElementsAreArrayMatcher<T> IsSupersetOf(
-    ::std::initializer_list<T> xs) {
-  return IsSupersetOf(xs.begin(), xs.end());
-}
-
-// IsSubsetOf(iterator_first, iterator_last)
-// IsSubsetOf(pointer, count)
-// IsSubsetOf(array)
-// IsSubsetOf(container)
-// IsSubsetOf({e1, e2, ..., en})
-//
-// IsSubsetOf() verifies that an injective mapping onto a collection of matchers
-// exists.  In other words, a container matches IsSubsetOf({e1, ..., en}) if and
-// only if there is a subset of matchers {m1, ..., mk} which would match the
-// container using UnorderedElementsAre.  Obviously, the size of the container
-// must be <= n in order to have a match. Examples:
-//
-// - {1} matches IsSubsetOf({Gt(0), Lt(0)}), as 1 matches Gt(0).
-// - {1, -1} matches IsSubsetOf({Lt(0), Gt(0)}), as 1 matches Gt(0) and -1
-//   matches Lt(0).
-// - {1, 2} doesn't matches IsSubsetOf({Gt(0), Lt(0)}), even though 1 and 2 both
-//   match Gt(0). The reason is that different matchers must be used for
-//   elements in different slots of the container.
-//
-// The matchers can be specified as an array, a pointer and count, a container,
-// an initializer list, or an STL iterator range. In each of these cases, the
-// underlying matchers can be either values or matchers.
-
-template <typename Iter>
-inline internal::UnorderedElementsAreArrayMatcher<
-    typename ::std::iterator_traits<Iter>::value_type>
-IsSubsetOf(Iter first, Iter last) {
-  typedef typename ::std::iterator_traits<Iter>::value_type T;
-  return internal::UnorderedElementsAreArrayMatcher<T>(
-      internal::UnorderedMatcherRequire::Subset, first, last);
-}
-
-template <typename T>
-inline internal::UnorderedElementsAreArrayMatcher<T> IsSubsetOf(
-    const T* pointer, size_t count) {
-  return IsSubsetOf(pointer, pointer + count);
-}
-
-template <typename T, size_t N>
-inline internal::UnorderedElementsAreArrayMatcher<T> IsSubsetOf(
-    const T (&array)[N]) {
-  return IsSubsetOf(array, N);
-}
-
-template <typename Container>
-inline internal::UnorderedElementsAreArrayMatcher<
-    typename Container::value_type>
-IsSubsetOf(const Container& container) {
-  return IsSubsetOf(container.begin(), container.end());
-}
-
-template <typename T>
-inline internal::UnorderedElementsAreArrayMatcher<T> IsSubsetOf(
-    ::std::initializer_list<T> xs) {
-  return IsSubsetOf(xs.begin(), xs.end());
-}
-
-// Matches an STL-style container or a native array that contains only
-// elements matching the given value or matcher.
-//
-// Each(m) is semantically equivalent to Not(Contains(Not(m))). Only
-// the messages are different.
-//
-// Examples:
-//   ::std::set<int> page_ids;
-//   // Each(m) matches an empty container, regardless of what m is.
-//   EXPECT_THAT(page_ids, Each(Eq(1)));
-//   EXPECT_THAT(page_ids, Each(Eq(77)));
-//
-//   page_ids.insert(3);
-//   EXPECT_THAT(page_ids, Each(Gt(0)));
-//   EXPECT_THAT(page_ids, Not(Each(Gt(4))));
-//   page_ids.insert(1);
-//   EXPECT_THAT(page_ids, Not(Each(Lt(2))));
-//
-//   ::std::map<int, size_t> page_lengths;
-//   page_lengths[1] = 100;
-//   page_lengths[2] = 200;
-//   page_lengths[3] = 300;
-//   EXPECT_THAT(page_lengths, Not(Each(Pair(1, 100))));
-//   EXPECT_THAT(page_lengths, Each(Key(Le(3))));
-//
-//   const char* user_ids[] = { "joe", "mike", "tom" };
-//   EXPECT_THAT(user_ids, Not(Each(Eq(::std::string("tom")))));
-template <typename M>
-inline internal::EachMatcher<M> Each(M matcher) {
-  return internal::EachMatcher<M>(matcher);
-}
-
-// Key(inner_matcher) matches an std::pair whose 'first' field matches
-// inner_matcher.  For example, Contains(Key(Ge(5))) can be used to match an
-// std::map that contains at least one element whose key is >= 5.
-template <typename M>
-inline internal::KeyMatcher<M> Key(M inner_matcher) {
-  return internal::KeyMatcher<M>(inner_matcher);
-}
-
-// Pair(first_matcher, second_matcher) matches a std::pair whose 'first' field
-// matches first_matcher and whose 'second' field matches second_matcher.  For
-// example, EXPECT_THAT(map_type, ElementsAre(Pair(Ge(5), "foo"))) can be used
-// to match a std::map<int, string> that contains exactly one element whose key
-// is >= 5 and whose value equals "foo".
-template <typename FirstMatcher, typename SecondMatcher>
-inline internal::PairMatcher<FirstMatcher, SecondMatcher>
-Pair(FirstMatcher first_matcher, SecondMatcher second_matcher) {
-  return internal::PairMatcher<FirstMatcher, SecondMatcher>(
-      first_matcher, second_matcher);
-}
-
-// Returns a predicate that is satisfied by anything that matches the
-// given matcher.
-template <typename M>
-inline internal::MatcherAsPredicate<M> Matches(M matcher) {
-  return internal::MatcherAsPredicate<M>(matcher);
-}
-
-// Returns true if and only if the value matches the matcher.
-template <typename T, typename M>
-inline bool Value(const T& value, M matcher) {
-  return testing::Matches(matcher)(value);
-}
-
-// Matches the value against the given matcher and explains the match
-// result to listener.
-template <typename T, typename M>
-inline bool ExplainMatchResult(
-    M matcher, const T& value, MatchResultListener* listener) {
-  return SafeMatcherCast<const T&>(matcher).MatchAndExplain(value, listener);
-}
-
-// Returns a string representation of the given matcher.  Useful for description
-// strings of matchers defined using MATCHER_P* macros that accept matchers as
-// their arguments.  For example:
-//
-// MATCHER_P(XAndYThat, matcher,
-//           "X that " + DescribeMatcher<int>(matcher, negation) +
-//               " and Y that " + DescribeMatcher<double>(matcher, negation)) {
-//   return ExplainMatchResult(matcher, arg.x(), result_listener) &&
-//          ExplainMatchResult(matcher, arg.y(), result_listener);
-// }
-template <typename T, typename M>
-std::string DescribeMatcher(const M& matcher, bool negation = false) {
-  ::std::stringstream ss;
-  Matcher<T> monomorphic_matcher = SafeMatcherCast<T>(matcher);
-  if (negation) {
-    monomorphic_matcher.DescribeNegationTo(&ss);
-  } else {
-    monomorphic_matcher.DescribeTo(&ss);
-  }
-  return ss.str();
-}
-
-template <typename... Args>
-internal::ElementsAreMatcher<
-    std::tuple<typename std::decay<const Args&>::type...>>
-ElementsAre(const Args&... matchers) {
-  return internal::ElementsAreMatcher<
-      std::tuple<typename std::decay<const Args&>::type...>>(
-      std::make_tuple(matchers...));
-}
-
-template <typename... Args>
-internal::UnorderedElementsAreMatcher<
-    std::tuple<typename std::decay<const Args&>::type...>>
-UnorderedElementsAre(const Args&... matchers) {
-  return internal::UnorderedElementsAreMatcher<
-      std::tuple<typename std::decay<const Args&>::type...>>(
-      std::make_tuple(matchers...));
-}
-
-// Define variadic matcher versions.
-template <typename... Args>
-internal::AllOfMatcher<typename std::decay<const Args&>::type...> AllOf(
-    const Args&... matchers) {
-  return internal::AllOfMatcher<typename std::decay<const Args&>::type...>(
-      matchers...);
-}
-
-template <typename... Args>
-internal::AnyOfMatcher<typename std::decay<const Args&>::type...> AnyOf(
-    const Args&... matchers) {
-  return internal::AnyOfMatcher<typename std::decay<const Args&>::type...>(
-      matchers...);
-}
-
-// AnyOfArray(array)
-// AnyOfArray(pointer, count)
-// AnyOfArray(container)
-// AnyOfArray({ e1, e2, ..., en })
-// AnyOfArray(iterator_first, iterator_last)
-//
-// AnyOfArray() verifies whether a given value matches any member of a
-// collection of matchers.
-//
-// AllOfArray(array)
-// AllOfArray(pointer, count)
-// AllOfArray(container)
-// AllOfArray({ e1, e2, ..., en })
-// AllOfArray(iterator_first, iterator_last)
-//
-// AllOfArray() verifies whether a given value matches all members of a
-// collection of matchers.
-//
-// The matchers can be specified as an array, a pointer and count, a container,
-// an initializer list, or an STL iterator range. In each of these cases, the
-// underlying matchers can be either values or matchers.
-
-template <typename Iter>
-inline internal::AnyOfArrayMatcher<
-    typename ::std::iterator_traits<Iter>::value_type>
-AnyOfArray(Iter first, Iter last) {
-  return internal::AnyOfArrayMatcher<
-      typename ::std::iterator_traits<Iter>::value_type>(first, last);
-}
-
-template <typename Iter>
-inline internal::AllOfArrayMatcher<
-    typename ::std::iterator_traits<Iter>::value_type>
-AllOfArray(Iter first, Iter last) {
-  return internal::AllOfArrayMatcher<
-      typename ::std::iterator_traits<Iter>::value_type>(first, last);
-}
-
-template <typename T>
-inline internal::AnyOfArrayMatcher<T> AnyOfArray(const T* ptr, size_t count) {
-  return AnyOfArray(ptr, ptr + count);
-}
-
-template <typename T>
-inline internal::AllOfArrayMatcher<T> AllOfArray(const T* ptr, size_t count) {
-  return AllOfArray(ptr, ptr + count);
-}
-
-template <typename T, size_t N>
-inline internal::AnyOfArrayMatcher<T> AnyOfArray(const T (&array)[N]) {
-  return AnyOfArray(array, N);
-}
-
-template <typename T, size_t N>
-inline internal::AllOfArrayMatcher<T> AllOfArray(const T (&array)[N]) {
-  return AllOfArray(array, N);
-}
-
-template <typename Container>
-inline internal::AnyOfArrayMatcher<typename Container::value_type> AnyOfArray(
-    const Container& container) {
-  return AnyOfArray(container.begin(), container.end());
-}
-
-template <typename Container>
-inline internal::AllOfArrayMatcher<typename Container::value_type> AllOfArray(
-    const Container& container) {
-  return AllOfArray(container.begin(), container.end());
-}
-
-template <typename T>
-inline internal::AnyOfArrayMatcher<T> AnyOfArray(
-    ::std::initializer_list<T> xs) {
-  return AnyOfArray(xs.begin(), xs.end());
-}
-
-template <typename T>
-inline internal::AllOfArrayMatcher<T> AllOfArray(
-    ::std::initializer_list<T> xs) {
-  return AllOfArray(xs.begin(), xs.end());
-}
-
-// Args<N1, N2, ..., Nk>(a_matcher) matches a tuple if the selected
-// fields of it matches a_matcher.  C++ doesn't support default
-// arguments for function templates, so we have to overload it.
-template <size_t... k, typename InnerMatcher>
-internal::ArgsMatcher<typename std::decay<InnerMatcher>::type, k...> Args(
-    InnerMatcher&& matcher) {
-  return internal::ArgsMatcher<typename std::decay<InnerMatcher>::type, k...>(
-      std::forward<InnerMatcher>(matcher));
-}
-
-// AllArgs(m) is a synonym of m.  This is useful in
-//
-//   EXPECT_CALL(foo, Bar(_, _)).With(AllArgs(Eq()));
-//
-// which is easier to read than
-//
-//   EXPECT_CALL(foo, Bar(_, _)).With(Eq());
-template <typename InnerMatcher>
-inline InnerMatcher AllArgs(const InnerMatcher& matcher) { return matcher; }
-
-// Returns a matcher that matches the value of an optional<> type variable.
-// The matcher implementation only uses '!arg' and requires that the optional<>
-// type has a 'value_type' member type and that '*arg' is of type 'value_type'
-// and is printable using 'PrintToString'. It is compatible with
-// std::optional/std::experimental::optional.
-// Note that to compare an optional type variable against nullopt you should
-// use Eq(nullopt) and not Optional(Eq(nullopt)). The latter implies that the
-// optional value contains an optional itself.
-template <typename ValueMatcher>
-inline internal::OptionalMatcher<ValueMatcher> Optional(
-    const ValueMatcher& value_matcher) {
-  return internal::OptionalMatcher<ValueMatcher>(value_matcher);
-}
-
-// Returns a matcher that matches the value of a absl::any type variable.
-template <typename T>
-PolymorphicMatcher<internal::any_cast_matcher::AnyCastMatcher<T> > AnyWith(
-    const Matcher<const T&>& matcher) {
-  return MakePolymorphicMatcher(
-      internal::any_cast_matcher::AnyCastMatcher<T>(matcher));
-}
-
-// Returns a matcher that matches the value of a variant<> type variable.
-// The matcher implementation uses ADL to find the holds_alternative and get
-// functions.
-// It is compatible with std::variant.
-template <typename T>
-PolymorphicMatcher<internal::variant_matcher::VariantMatcher<T> > VariantWith(
-    const Matcher<const T&>& matcher) {
-  return MakePolymorphicMatcher(
-      internal::variant_matcher::VariantMatcher<T>(matcher));
-}
-
-// These macros allow using matchers to check values in Google Test
-// tests.  ASSERT_THAT(value, matcher) and EXPECT_THAT(value, matcher)
-// succeed if and only if the value matches the matcher.  If the assertion
-// fails, the value and the description of the matcher will be printed.
-#define ASSERT_THAT(value, matcher) ASSERT_PRED_FORMAT1(\
-    ::testing::internal::MakePredicateFormatterFromMatcher(matcher), value)
-#define EXPECT_THAT(value, matcher) EXPECT_PRED_FORMAT1(\
-    ::testing::internal::MakePredicateFormatterFromMatcher(matcher), value)
-
-}  // namespace testing
-
-#ifdef __clang__
-#if __has_warning("-Wdeprecated-copy")
-#pragma clang diagnostic pop
-#endif
-#endif
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251 5046
-
-// Include any custom callback matchers added by the local installation.
-// We must include this header at the end to make sure it can use the
-// declarations from this file.
-#include "gmock/internal/custom/gmock-matchers.h"
-
-#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_MATCHERS_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-more-actions.h b/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-more-actions.h
deleted file mode 100644
index 56de2d10681..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-more-actions.h
+++ /dev/null
@@ -1,164 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file implements some actions that depend on gmock-generated-actions.h.
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-// IWYU pragma: private, include "gmock/gmock.h"
-
-#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_
-#define GMOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_
-
-#include <algorithm>
-#include <type_traits>
-
-#include "gmock/gmock-generated-actions.h"
-
-namespace testing {
-namespace internal {
-
-// An internal replacement for std::copy which mimics its behavior. This is
-// necessary because Visual Studio deprecates ::std::copy, issuing warning 4996.
-// However Visual Studio 2010 and later do not honor #pragmas which disable that
-// warning.
-template<typename InputIterator, typename OutputIterator>
-inline OutputIterator CopyElements(InputIterator first,
-                                   InputIterator last,
-                                   OutputIterator output) {
-  for (; first != last; ++first, ++output) {
-    *output = *first;
-  }
-  return output;
-}
-
-}  // namespace internal
-
-// Various overloads for Invoke().
-
-// The ACTION*() macros trigger warning C4100 (unreferenced formal
-// parameter) in MSVC with -W4.  Unfortunately they cannot be fixed in
-// the macro definition, as the warnings are generated when the macro
-// is expanded and macro expansion cannot contain #pragma.  Therefore
-// we suppress them here.
-#ifdef _MSC_VER
-# pragma warning(push)
-# pragma warning(disable:4100)
-#endif
-
-// Action ReturnArg<k>() returns the k-th argument of the mock function.
-ACTION_TEMPLATE(ReturnArg,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_0_VALUE_PARAMS()) {
-  return ::std::get<k>(args);
-}
-
-// Action SaveArg<k>(pointer) saves the k-th (0-based) argument of the
-// mock function to *pointer.
-ACTION_TEMPLATE(SaveArg,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_1_VALUE_PARAMS(pointer)) {
-  *pointer = ::std::get<k>(args);
-}
-
-// Action SaveArgPointee<k>(pointer) saves the value pointed to
-// by the k-th (0-based) argument of the mock function to *pointer.
-ACTION_TEMPLATE(SaveArgPointee,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_1_VALUE_PARAMS(pointer)) {
-  *pointer = *::std::get<k>(args);
-}
-
-// Action SetArgReferee<k>(value) assigns 'value' to the variable
-// referenced by the k-th (0-based) argument of the mock function.
-ACTION_TEMPLATE(SetArgReferee,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_1_VALUE_PARAMS(value)) {
-  typedef typename ::std::tuple_element<k, args_type>::type argk_type;
-  // Ensures that argument #k is a reference.  If you get a compiler
-  // error on the next line, you are using SetArgReferee<k>(value) in
-  // a mock function whose k-th (0-based) argument is not a reference.
-  GTEST_COMPILE_ASSERT_(std::is_reference<argk_type>::value,
-                        SetArgReferee_must_be_used_with_a_reference_argument);
-  ::std::get<k>(args) = value;
-}
-
-// Action SetArrayArgument<k>(first, last) copies the elements in
-// source range [first, last) to the array pointed to by the k-th
-// (0-based) argument, which can be either a pointer or an
-// iterator. The action does not take ownership of the elements in the
-// source range.
-ACTION_TEMPLATE(SetArrayArgument,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_2_VALUE_PARAMS(first, last)) {
-  // Visual Studio deprecates ::std::copy, so we use our own copy in that case.
-#ifdef _MSC_VER
-  internal::CopyElements(first, last, ::std::get<k>(args));
-#else
-  ::std::copy(first, last, ::std::get<k>(args));
-#endif
-}
-
-// Action DeleteArg<k>() deletes the k-th (0-based) argument of the mock
-// function.
-ACTION_TEMPLATE(DeleteArg,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_0_VALUE_PARAMS()) {
-  delete ::std::get<k>(args);
-}
-
-// This action returns the value pointed to by 'pointer'.
-ACTION_P(ReturnPointee, pointer) { return *pointer; }
-
-// Action Throw(exception) can be used in a mock function of any type
-// to throw the given exception.  Any copyable value can be thrown.
-#if GTEST_HAS_EXCEPTIONS
-
-// Suppresses the 'unreachable code' warning that VC generates in opt modes.
-# ifdef _MSC_VER
-#  pragma warning(push)          // Saves the current warning state.
-#  pragma warning(disable:4702)  // Temporarily disables warning 4702.
-# endif
-ACTION_P(Throw, exception) { throw exception; }
-# ifdef _MSC_VER
-#  pragma warning(pop)           // Restores the warning state.
-# endif
-
-#endif  // GTEST_HAS_EXCEPTIONS
-
-#ifdef _MSC_VER
-# pragma warning(pop)
-#endif
-
-}  // namespace testing
-
-#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-more-matchers.h b/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-more-matchers.h
deleted file mode 100644
index 5b29a9d024d..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-more-matchers.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 2013, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file implements some matchers that depend on gmock-generated-matchers.h.
-//
-// Note that tests are implemented in gmock-matchers_test.cc rather than
-// gmock-more-matchers-test.cc.
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-// IWYU pragma: private, include "gmock/gmock.h"
-
-#ifndef GMOCK_INCLUDE_GMOCK_MORE_MATCHERS_H_
-#define GMOCK_INCLUDE_GMOCK_MORE_MATCHERS_H_
-
-#include "gmock/gmock-generated-matchers.h"
-
-namespace testing {
-
-// Silence C4100 (unreferenced formal
-// parameter) for MSVC
-#ifdef _MSC_VER
-# pragma warning(push)
-# pragma warning(disable:4100)
-#if (_MSC_VER == 1900)
-// and silence C4800 (C4800: 'int *const ': forcing value
-// to bool 'true' or 'false') for MSVC 14
-# pragma warning(disable:4800)
-  #endif
-#endif
-
-// Defines a matcher that matches an empty container. The container must
-// support both size() and empty(), which all STL-like containers provide.
-MATCHER(IsEmpty, negation ? "isn't empty" : "is empty") {
-  if (arg.empty()) {
-    return true;
-  }
-  *result_listener << "whose size is " << arg.size();
-  return false;
-}
-
-// Define a matcher that matches a value that evaluates in boolean
-// context to true.  Useful for types that define "explicit operator
-// bool" operators and so can't be compared for equality with true
-// and false.
-MATCHER(IsTrue, negation ? "is false" : "is true") {
-  return static_cast<bool>(arg);
-}
-
-// Define a matcher that matches a value that evaluates in boolean
-// context to false.  Useful for types that define "explicit operator
-// bool" operators and so can't be compared for equality with true
-// and false.
-MATCHER(IsFalse, negation ? "is true" : "is false") {
-  return !static_cast<bool>(arg);
-}
-
-#ifdef _MSC_VER
-# pragma warning(pop)
-#endif
-
-
-}  // namespace testing
-
-#endif  // GMOCK_INCLUDE_GMOCK_MORE_MATCHERS_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-nice-strict.h b/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-nice-strict.h
deleted file mode 100644
index 5495a9805b5..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-nice-strict.h
+++ /dev/null
@@ -1,215 +0,0 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Implements class templates NiceMock, NaggyMock, and StrictMock.
-//
-// Given a mock class MockFoo that is created using Google Mock,
-// NiceMock<MockFoo> is a subclass of MockFoo that allows
-// uninteresting calls (i.e. calls to mock methods that have no
-// EXPECT_CALL specs), NaggyMock<MockFoo> is a subclass of MockFoo
-// that prints a warning when an uninteresting call occurs, and
-// StrictMock<MockFoo> is a subclass of MockFoo that treats all
-// uninteresting calls as errors.
-//
-// Currently a mock is naggy by default, so MockFoo and
-// NaggyMock<MockFoo> behave like the same.  However, we will soon
-// switch the default behavior of mocks to be nice, as that in general
-// leads to more maintainable tests.  When that happens, MockFoo will
-// stop behaving like NaggyMock<MockFoo> and start behaving like
-// NiceMock<MockFoo>.
-//
-// NiceMock, NaggyMock, and StrictMock "inherit" the constructors of
-// their respective base class.  Therefore you can write
-// NiceMock<MockFoo>(5, "a") to construct a nice mock where MockFoo
-// has a constructor that accepts (int, const char*), for example.
-//
-// A known limitation is that NiceMock<MockFoo>, NaggyMock<MockFoo>,
-// and StrictMock<MockFoo> only works for mock methods defined using
-// the MOCK_METHOD* family of macros DIRECTLY in the MockFoo class.
-// If a mock method is defined in a base class of MockFoo, the "nice"
-// or "strict" modifier may not affect it, depending on the compiler.
-// In particular, nesting NiceMock, NaggyMock, and StrictMock is NOT
-// supported.
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_NICE_STRICT_H_
-#define GMOCK_INCLUDE_GMOCK_GMOCK_NICE_STRICT_H_
-
-#include "gmock/gmock-spec-builders.h"
-#include "gmock/internal/gmock-port.h"
-
-namespace testing {
-
-template <class MockClass>
-class NiceMock : public MockClass {
- public:
-  NiceMock() : MockClass() {
-    ::testing::Mock::AllowUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  // Ideally, we would inherit base class's constructors through a using
-  // declaration, which would preserve their visibility. However, many existing
-  // tests rely on the fact that current implementation reexports protected
-  // constructors as public. These tests would need to be cleaned up first.
-
-  // Single argument constructor is special-cased so that it can be
-  // made explicit.
-  template <typename A>
-  explicit NiceMock(A&& arg) : MockClass(std::forward<A>(arg)) {
-    ::testing::Mock::AllowUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  template <typename A1, typename A2, typename... An>
-  NiceMock(A1&& arg1, A2&& arg2, An&&... args)
-      : MockClass(std::forward<A1>(arg1), std::forward<A2>(arg2),
-                  std::forward<An>(args)...) {
-    ::testing::Mock::AllowUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  ~NiceMock() {  // NOLINT
-    ::testing::Mock::UnregisterCallReaction(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(NiceMock);
-};
-
-template <class MockClass>
-class NaggyMock : public MockClass {
- public:
-  NaggyMock() : MockClass() {
-    ::testing::Mock::WarnUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  // Ideally, we would inherit base class's constructors through a using
-  // declaration, which would preserve their visibility. However, many existing
-  // tests rely on the fact that current implementation reexports protected
-  // constructors as public. These tests would need to be cleaned up first.
-
-  // Single argument constructor is special-cased so that it can be
-  // made explicit.
-  template <typename A>
-  explicit NaggyMock(A&& arg) : MockClass(std::forward<A>(arg)) {
-    ::testing::Mock::WarnUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  template <typename A1, typename A2, typename... An>
-  NaggyMock(A1&& arg1, A2&& arg2, An&&... args)
-      : MockClass(std::forward<A1>(arg1), std::forward<A2>(arg2),
-                  std::forward<An>(args)...) {
-    ::testing::Mock::WarnUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  ~NaggyMock() {  // NOLINT
-    ::testing::Mock::UnregisterCallReaction(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(NaggyMock);
-};
-
-template <class MockClass>
-class StrictMock : public MockClass {
- public:
-  StrictMock() : MockClass() {
-    ::testing::Mock::FailUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  // Ideally, we would inherit base class's constructors through a using
-  // declaration, which would preserve their visibility. However, many existing
-  // tests rely on the fact that current implementation reexports protected
-  // constructors as public. These tests would need to be cleaned up first.
-
-  // Single argument constructor is special-cased so that it can be
-  // made explicit.
-  template <typename A>
-  explicit StrictMock(A&& arg) : MockClass(std::forward<A>(arg)) {
-    ::testing::Mock::FailUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  template <typename A1, typename A2, typename... An>
-  StrictMock(A1&& arg1, A2&& arg2, An&&... args)
-      : MockClass(std::forward<A1>(arg1), std::forward<A2>(arg2),
-                  std::forward<An>(args)...) {
-    ::testing::Mock::FailUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  ~StrictMock() {  // NOLINT
-    ::testing::Mock::UnregisterCallReaction(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(StrictMock);
-};
-
-// The following specializations catch some (relatively more common)
-// user errors of nesting nice and strict mocks.  They do NOT catch
-// all possible errors.
-
-// These specializations are declared but not defined, as NiceMock,
-// NaggyMock, and StrictMock cannot be nested.
-
-template <typename MockClass>
-class NiceMock<NiceMock<MockClass> >;
-template <typename MockClass>
-class NiceMock<NaggyMock<MockClass> >;
-template <typename MockClass>
-class NiceMock<StrictMock<MockClass> >;
-
-template <typename MockClass>
-class NaggyMock<NiceMock<MockClass> >;
-template <typename MockClass>
-class NaggyMock<NaggyMock<MockClass> >;
-template <typename MockClass>
-class NaggyMock<StrictMock<MockClass> >;
-
-template <typename MockClass>
-class StrictMock<NiceMock<MockClass> >;
-template <typename MockClass>
-class StrictMock<NaggyMock<MockClass> >;
-template <typename MockClass>
-class StrictMock<StrictMock<MockClass> >;
-
-}  // namespace testing
-
-#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_NICE_STRICT_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-spec-builders.h b/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-spec-builders.h
deleted file mode 100644
index 4fc4a546ef2..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-spec-builders.h
+++ /dev/null
@@ -1,1985 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file implements the ON_CALL() and EXPECT_CALL() macros.
-//
-// A user can use the ON_CALL() macro to specify the default action of
-// a mock method.  The syntax is:
-//
-//   ON_CALL(mock_object, Method(argument-matchers))
-//       .With(multi-argument-matcher)
-//       .WillByDefault(action);
-//
-//  where the .With() clause is optional.
-//
-// A user can use the EXPECT_CALL() macro to specify an expectation on
-// a mock method.  The syntax is:
-//
-//   EXPECT_CALL(mock_object, Method(argument-matchers))
-//       .With(multi-argument-matchers)
-//       .Times(cardinality)
-//       .InSequence(sequences)
-//       .After(expectations)
-//       .WillOnce(action)
-//       .WillRepeatedly(action)
-//       .RetiresOnSaturation();
-//
-// where all clauses are optional, and .InSequence()/.After()/
-// .WillOnce() can appear any number of times.
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-// IWYU pragma: private, include "gmock/gmock.h"
-
-#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_
-#define GMOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_
-
-#include <functional>
-#include <map>
-#include <memory>
-#include <set>
-#include <sstream>
-#include <string>
-#include <type_traits>
-#include <utility>
-#include <vector>
-#include "gmock/gmock-actions.h"
-#include "gmock/gmock-cardinalities.h"
-#include "gmock/gmock-matchers.h"
-#include "gmock/internal/gmock-internal-utils.h"
-#include "gmock/internal/gmock-port.h"
-#include "gtest/gtest.h"
-
-#if GTEST_HAS_EXCEPTIONS
-# include <stdexcept>  // NOLINT
-#endif
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
-/* class A needs to have dll-interface to be used by clients of class B */)
-
-namespace testing {
-
-// An abstract handle of an expectation.
-class Expectation;
-
-// A set of expectation handles.
-class ExpectationSet;
-
-// Anything inside the 'internal' namespace IS INTERNAL IMPLEMENTATION
-// and MUST NOT BE USED IN USER CODE!!!
-namespace internal {
-
-// Implements a mock function.
-template <typename F> class FunctionMocker;
-
-// Base class for expectations.
-class ExpectationBase;
-
-// Implements an expectation.
-template <typename F> class TypedExpectation;
-
-// Helper class for testing the Expectation class template.
-class ExpectationTester;
-
-// Protects the mock object registry (in class Mock), all function
-// mockers, and all expectations.
-//
-// The reason we don't use more fine-grained protection is: when a
-// mock function Foo() is called, it needs to consult its expectations
-// to see which one should be picked.  If another thread is allowed to
-// call a mock function (either Foo() or a different one) at the same
-// time, it could affect the "retired" attributes of Foo()'s
-// expectations when InSequence() is used, and thus affect which
-// expectation gets picked.  Therefore, we sequence all mock function
-// calls to ensure the integrity of the mock objects' states.
-GTEST_API_ GTEST_DECLARE_STATIC_MUTEX_(g_gmock_mutex);
-
-// Untyped base class for ActionResultHolder<R>.
-class UntypedActionResultHolderBase;
-
-// Abstract base class of FunctionMocker.  This is the
-// type-agnostic part of the function mocker interface.  Its pure
-// virtual methods are implemented by FunctionMocker.
-class GTEST_API_ UntypedFunctionMockerBase {
- public:
-  UntypedFunctionMockerBase();
-  virtual ~UntypedFunctionMockerBase();
-
-  // Verifies that all expectations on this mock function have been
-  // satisfied.  Reports one or more Google Test non-fatal failures
-  // and returns false if not.
-  bool VerifyAndClearExpectationsLocked()
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex);
-
-  // Clears the ON_CALL()s set on this mock function.
-  virtual void ClearDefaultActionsLocked()
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) = 0;
-
-  // In all of the following Untyped* functions, it's the caller's
-  // responsibility to guarantee the correctness of the arguments'
-  // types.
-
-  // Performs the default action with the given arguments and returns
-  // the action's result.  The call description string will be used in
-  // the error message to describe the call in the case the default
-  // action fails.
-  // L = *
-  virtual UntypedActionResultHolderBase* UntypedPerformDefaultAction(
-      void* untyped_args, const std::string& call_description) const = 0;
-
-  // Performs the given action with the given arguments and returns
-  // the action's result.
-  // L = *
-  virtual UntypedActionResultHolderBase* UntypedPerformAction(
-      const void* untyped_action, void* untyped_args) const = 0;
-
-  // Writes a message that the call is uninteresting (i.e. neither
-  // explicitly expected nor explicitly unexpected) to the given
-  // ostream.
-  virtual void UntypedDescribeUninterestingCall(
-      const void* untyped_args,
-      ::std::ostream* os) const
-          GTEST_LOCK_EXCLUDED_(g_gmock_mutex) = 0;
-
-  // Returns the expectation that matches the given function arguments
-  // (or NULL is there's no match); when a match is found,
-  // untyped_action is set to point to the action that should be
-  // performed (or NULL if the action is "do default"), and
-  // is_excessive is modified to indicate whether the call exceeds the
-  // expected number.
-  virtual const ExpectationBase* UntypedFindMatchingExpectation(
-      const void* untyped_args,
-      const void** untyped_action, bool* is_excessive,
-      ::std::ostream* what, ::std::ostream* why)
-          GTEST_LOCK_EXCLUDED_(g_gmock_mutex) = 0;
-
-  // Prints the given function arguments to the ostream.
-  virtual void UntypedPrintArgs(const void* untyped_args,
-                                ::std::ostream* os) const = 0;
-
-  // Sets the mock object this mock method belongs to, and registers
-  // this information in the global mock registry.  Will be called
-  // whenever an EXPECT_CALL() or ON_CALL() is executed on this mock
-  // method.
-  void RegisterOwner(const void* mock_obj)
-      GTEST_LOCK_EXCLUDED_(g_gmock_mutex);
-
-  // Sets the mock object this mock method belongs to, and sets the
-  // name of the mock function.  Will be called upon each invocation
-  // of this mock function.
-  void SetOwnerAndName(const void* mock_obj, const char* name)
-      GTEST_LOCK_EXCLUDED_(g_gmock_mutex);
-
-  // Returns the mock object this mock method belongs to.  Must be
-  // called after RegisterOwner() or SetOwnerAndName() has been
-  // called.
-  const void* MockObject() const
-      GTEST_LOCK_EXCLUDED_(g_gmock_mutex);
-
-  // Returns the name of this mock method.  Must be called after
-  // SetOwnerAndName() has been called.
-  const char* Name() const
-      GTEST_LOCK_EXCLUDED_(g_gmock_mutex);
-
-  // Returns the result of invoking this mock function with the given
-  // arguments.  This function can be safely called from multiple
-  // threads concurrently.  The caller is responsible for deleting the
-  // result.
-  UntypedActionResultHolderBase* UntypedInvokeWith(void* untyped_args)
-      GTEST_LOCK_EXCLUDED_(g_gmock_mutex);
-
- protected:
-  typedef std::vector<const void*> UntypedOnCallSpecs;
-
-  using UntypedExpectations = std::vector<std::shared_ptr<ExpectationBase>>;
-
-  // Returns an Expectation object that references and co-owns exp,
-  // which must be an expectation on this mock function.
-  Expectation GetHandleOf(ExpectationBase* exp);
-
-  // Address of the mock object this mock method belongs to.  Only
-  // valid after this mock method has been called or
-  // ON_CALL/EXPECT_CALL has been invoked on it.
-  const void* mock_obj_;  // Protected by g_gmock_mutex.
-
-  // Name of the function being mocked.  Only valid after this mock
-  // method has been called.
-  const char* name_;  // Protected by g_gmock_mutex.
-
-  // All default action specs for this function mocker.
-  UntypedOnCallSpecs untyped_on_call_specs_;
-
-  // All expectations for this function mocker.
-  //
-  // It's undefined behavior to interleave expectations (EXPECT_CALLs
-  // or ON_CALLs) and mock function calls.  Also, the order of
-  // expectations is important.  Therefore it's a logic race condition
-  // to read/write untyped_expectations_ concurrently.  In order for
-  // tools like tsan to catch concurrent read/write accesses to
-  // untyped_expectations, we deliberately leave accesses to it
-  // unprotected.
-  UntypedExpectations untyped_expectations_;
-};  // class UntypedFunctionMockerBase
-
-// Untyped base class for OnCallSpec<F>.
-class UntypedOnCallSpecBase {
- public:
-  // The arguments are the location of the ON_CALL() statement.
-  UntypedOnCallSpecBase(const char* a_file, int a_line)
-      : file_(a_file), line_(a_line), last_clause_(kNone) {}
-
-  // Where in the source file was the default action spec defined?
-  const char* file() const { return file_; }
-  int line() const { return line_; }
-
- protected:
-  // Gives each clause in the ON_CALL() statement a name.
-  enum Clause {
-    // Do not change the order of the enum members!  The run-time
-    // syntax checking relies on it.
-    kNone,
-    kWith,
-    kWillByDefault
-  };
-
-  // Asserts that the ON_CALL() statement has a certain property.
-  void AssertSpecProperty(bool property,
-                          const std::string& failure_message) const {
-    Assert(property, file_, line_, failure_message);
-  }
-
-  // Expects that the ON_CALL() statement has a certain property.
-  void ExpectSpecProperty(bool property,
-                          const std::string& failure_message) const {
-    Expect(property, file_, line_, failure_message);
-  }
-
-  const char* file_;
-  int line_;
-
-  // The last clause in the ON_CALL() statement as seen so far.
-  // Initially kNone and changes as the statement is parsed.
-  Clause last_clause_;
-};  // class UntypedOnCallSpecBase
-
-// This template class implements an ON_CALL spec.
-template <typename F>
-class OnCallSpec : public UntypedOnCallSpecBase {
- public:
-  typedef typename Function<F>::ArgumentTuple ArgumentTuple;
-  typedef typename Function<F>::ArgumentMatcherTuple ArgumentMatcherTuple;
-
-  // Constructs an OnCallSpec object from the information inside
-  // the parenthesis of an ON_CALL() statement.
-  OnCallSpec(const char* a_file, int a_line,
-             const ArgumentMatcherTuple& matchers)
-      : UntypedOnCallSpecBase(a_file, a_line),
-        matchers_(matchers),
-        // By default, extra_matcher_ should match anything.  However,
-        // we cannot initialize it with _ as that causes ambiguity between
-        // Matcher's copy and move constructor for some argument types.
-        extra_matcher_(A<const ArgumentTuple&>()) {}
-
-  // Implements the .With() clause.
-  OnCallSpec& With(const Matcher<const ArgumentTuple&>& m) {
-    // Makes sure this is called at most once.
-    ExpectSpecProperty(last_clause_ < kWith,
-                       ".With() cannot appear "
-                       "more than once in an ON_CALL().");
-    last_clause_ = kWith;
-
-    extra_matcher_ = m;
-    return *this;
-  }
-
-  // Implements the .WillByDefault() clause.
-  OnCallSpec& WillByDefault(const Action<F>& action) {
-    ExpectSpecProperty(last_clause_ < kWillByDefault,
-                       ".WillByDefault() must appear "
-                       "exactly once in an ON_CALL().");
-    last_clause_ = kWillByDefault;
-
-    ExpectSpecProperty(!action.IsDoDefault(),
-                       "DoDefault() cannot be used in ON_CALL().");
-    action_ = action;
-    return *this;
-  }
-
-  // Returns true if and only if the given arguments match the matchers.
-  bool Matches(const ArgumentTuple& args) const {
-    return TupleMatches(matchers_, args) && extra_matcher_.Matches(args);
-  }
-
-  // Returns the action specified by the user.
-  const Action<F>& GetAction() const {
-    AssertSpecProperty(last_clause_ == kWillByDefault,
-                       ".WillByDefault() must appear exactly "
-                       "once in an ON_CALL().");
-    return action_;
-  }
-
- private:
-  // The information in statement
-  //
-  //   ON_CALL(mock_object, Method(matchers))
-  //       .With(multi-argument-matcher)
-  //       .WillByDefault(action);
-  //
-  // is recorded in the data members like this:
-  //
-  //   source file that contains the statement => file_
-  //   line number of the statement            => line_
-  //   matchers                                => matchers_
-  //   multi-argument-matcher                  => extra_matcher_
-  //   action                                  => action_
-  ArgumentMatcherTuple matchers_;
-  Matcher<const ArgumentTuple&> extra_matcher_;
-  Action<F> action_;
-};  // class OnCallSpec
-
-// Possible reactions on uninteresting calls.
-enum CallReaction {
-  kAllow,
-  kWarn,
-  kFail,
-};
-
-}  // namespace internal
-
-// Utilities for manipulating mock objects.
-class GTEST_API_ Mock {
- public:
-  // The following public methods can be called concurrently.
-
-  // Tells Google Mock to ignore mock_obj when checking for leaked
-  // mock objects.
-  static void AllowLeak(const void* mock_obj)
-      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
-
-  // Verifies and clears all expectations on the given mock object.
-  // If the expectations aren't satisfied, generates one or more
-  // Google Test non-fatal failures and returns false.
-  static bool VerifyAndClearExpectations(void* mock_obj)
-      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
-
-  // Verifies all expectations on the given mock object and clears its
-  // default actions and expectations.  Returns true if and only if the
-  // verification was successful.
-  static bool VerifyAndClear(void* mock_obj)
-      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
-
-  // Returns whether the mock was created as a naggy mock (default)
-  static bool IsNaggy(void* mock_obj)
-      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
-  // Returns whether the mock was created as a nice mock
-  static bool IsNice(void* mock_obj)
-      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
-  // Returns whether the mock was created as a strict mock
-  static bool IsStrict(void* mock_obj)
-      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
-
- private:
-  friend class internal::UntypedFunctionMockerBase;
-
-  // Needed for a function mocker to register itself (so that we know
-  // how to clear a mock object).
-  template <typename F>
-  friend class internal::FunctionMocker;
-
-  template <typename M>
-  friend class NiceMock;
-
-  template <typename M>
-  friend class NaggyMock;
-
-  template <typename M>
-  friend class StrictMock;
-
-  // Tells Google Mock to allow uninteresting calls on the given mock
-  // object.
-  static void AllowUninterestingCalls(const void* mock_obj)
-      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
-
-  // Tells Google Mock to warn the user about uninteresting calls on
-  // the given mock object.
-  static void WarnUninterestingCalls(const void* mock_obj)
-      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
-
-  // Tells Google Mock to fail uninteresting calls on the given mock
-  // object.
-  static void FailUninterestingCalls(const void* mock_obj)
-      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
-
-  // Tells Google Mock the given mock object is being destroyed and
-  // its entry in the call-reaction table should be removed.
-  static void UnregisterCallReaction(const void* mock_obj)
-      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
-
-  // Returns the reaction Google Mock will have on uninteresting calls
-  // made on the given mock object.
-  static internal::CallReaction GetReactionOnUninterestingCalls(
-      const void* mock_obj)
-          GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
-
-  // Verifies that all expectations on the given mock object have been
-  // satisfied.  Reports one or more Google Test non-fatal failures
-  // and returns false if not.
-  static bool VerifyAndClearExpectationsLocked(void* mock_obj)
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex);
-
-  // Clears all ON_CALL()s set on the given mock object.
-  static void ClearDefaultActionsLocked(void* mock_obj)
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex);
-
-  // Registers a mock object and a mock method it owns.
-  static void Register(
-      const void* mock_obj,
-      internal::UntypedFunctionMockerBase* mocker)
-          GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
-
-  // Tells Google Mock where in the source code mock_obj is used in an
-  // ON_CALL or EXPECT_CALL.  In case mock_obj is leaked, this
-  // information helps the user identify which object it is.
-  static void RegisterUseByOnCallOrExpectCall(
-      const void* mock_obj, const char* file, int line)
-          GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
-
-  // Unregisters a mock method; removes the owning mock object from
-  // the registry when the last mock method associated with it has
-  // been unregistered.  This is called only in the destructor of
-  // FunctionMocker.
-  static void UnregisterLocked(internal::UntypedFunctionMockerBase* mocker)
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex);
-};  // class Mock
-
-// An abstract handle of an expectation.  Useful in the .After()
-// clause of EXPECT_CALL() for setting the (partial) order of
-// expectations.  The syntax:
-//
-//   Expectation e1 = EXPECT_CALL(...)...;
-//   EXPECT_CALL(...).After(e1)...;
-//
-// sets two expectations where the latter can only be matched after
-// the former has been satisfied.
-//
-// Notes:
-//   - This class is copyable and has value semantics.
-//   - Constness is shallow: a const Expectation object itself cannot
-//     be modified, but the mutable methods of the ExpectationBase
-//     object it references can be called via expectation_base().
-
-class GTEST_API_ Expectation {
- public:
-  // Constructs a null object that doesn't reference any expectation.
-  Expectation();
-
-  ~Expectation();
-
-  // This single-argument ctor must not be explicit, in order to support the
-  //   Expectation e = EXPECT_CALL(...);
-  // syntax.
-  //
-  // A TypedExpectation object stores its pre-requisites as
-  // Expectation objects, and needs to call the non-const Retire()
-  // method on the ExpectationBase objects they reference.  Therefore
-  // Expectation must receive a *non-const* reference to the
-  // ExpectationBase object.
-  Expectation(internal::ExpectationBase& exp);  // NOLINT
-
-  // The compiler-generated copy ctor and operator= work exactly as
-  // intended, so we don't need to define our own.
-
-  // Returns true if and only if rhs references the same expectation as this
-  // object does.
-  bool operator==(const Expectation& rhs) const {
-    return expectation_base_ == rhs.expectation_base_;
-  }
-
-  bool operator!=(const Expectation& rhs) const { return !(*this == rhs); }
-
- private:
-  friend class ExpectationSet;
-  friend class Sequence;
-  friend class ::testing::internal::ExpectationBase;
-  friend class ::testing::internal::UntypedFunctionMockerBase;
-
-  template <typename F>
-  friend class ::testing::internal::FunctionMocker;
-
-  template <typename F>
-  friend class ::testing::internal::TypedExpectation;
-
-  // This comparator is needed for putting Expectation objects into a set.
-  class Less {
-   public:
-    bool operator()(const Expectation& lhs, const Expectation& rhs) const {
-      return lhs.expectation_base_.get() < rhs.expectation_base_.get();
-    }
-  };
-
-  typedef ::std::set<Expectation, Less> Set;
-
-  Expectation(
-      const std::shared_ptr<internal::ExpectationBase>& expectation_base);
-
-  // Returns the expectation this object references.
-  const std::shared_ptr<internal::ExpectationBase>& expectation_base() const {
-    return expectation_base_;
-  }
-
-  // A shared_ptr that co-owns the expectation this handle references.
-  std::shared_ptr<internal::ExpectationBase> expectation_base_;
-};
-
-// A set of expectation handles.  Useful in the .After() clause of
-// EXPECT_CALL() for setting the (partial) order of expectations.  The
-// syntax:
-//
-//   ExpectationSet es;
-//   es += EXPECT_CALL(...)...;
-//   es += EXPECT_CALL(...)...;
-//   EXPECT_CALL(...).After(es)...;
-//
-// sets three expectations where the last one can only be matched
-// after the first two have both been satisfied.
-//
-// This class is copyable and has value semantics.
-class ExpectationSet {
- public:
-  // A bidirectional iterator that can read a const element in the set.
-  typedef Expectation::Set::const_iterator const_iterator;
-
-  // An object stored in the set.  This is an alias of Expectation.
-  typedef Expectation::Set::value_type value_type;
-
-  // Constructs an empty set.
-  ExpectationSet() {}
-
-  // This single-argument ctor must not be explicit, in order to support the
-  //   ExpectationSet es = EXPECT_CALL(...);
-  // syntax.
-  ExpectationSet(internal::ExpectationBase& exp) {  // NOLINT
-    *this += Expectation(exp);
-  }
-
-  // This single-argument ctor implements implicit conversion from
-  // Expectation and thus must not be explicit.  This allows either an
-  // Expectation or an ExpectationSet to be used in .After().
-  ExpectationSet(const Expectation& e) {  // NOLINT
-    *this += e;
-  }
-
-  // The compiler-generator ctor and operator= works exactly as
-  // intended, so we don't need to define our own.
-
-  // Returns true if and only if rhs contains the same set of Expectation
-  // objects as this does.
-  bool operator==(const ExpectationSet& rhs) const {
-    return expectations_ == rhs.expectations_;
-  }
-
-  bool operator!=(const ExpectationSet& rhs) const { return !(*this == rhs); }
-
-  // Implements the syntax
-  //   expectation_set += EXPECT_CALL(...);
-  ExpectationSet& operator+=(const Expectation& e) {
-    expectations_.insert(e);
-    return *this;
-  }
-
-  int size() const { return static_cast<int>(expectations_.size()); }
-
-  const_iterator begin() const { return expectations_.begin(); }
-  const_iterator end() const { return expectations_.end(); }
-
- private:
-  Expectation::Set expectations_;
-};
-
-
-// Sequence objects are used by a user to specify the relative order
-// in which the expectations should match.  They are copyable (we rely
-// on the compiler-defined copy constructor and assignment operator).
-class GTEST_API_ Sequence {
- public:
-  // Constructs an empty sequence.
-  Sequence() : last_expectation_(new Expectation) {}
-
-  // Adds an expectation to this sequence.  The caller must ensure
-  // that no other thread is accessing this Sequence object.
-  void AddExpectation(const Expectation& expectation) const;
-
- private:
-  // The last expectation in this sequence.
-  std::shared_ptr<Expectation> last_expectation_;
-};  // class Sequence
-
-// An object of this type causes all EXPECT_CALL() statements
-// encountered in its scope to be put in an anonymous sequence.  The
-// work is done in the constructor and destructor.  You should only
-// create an InSequence object on the stack.
-//
-// The sole purpose for this class is to support easy definition of
-// sequential expectations, e.g.
-//
-//   {
-//     InSequence dummy;  // The name of the object doesn't matter.
-//
-//     // The following expectations must match in the order they appear.
-//     EXPECT_CALL(a, Bar())...;
-//     EXPECT_CALL(a, Baz())...;
-//     ...
-//     EXPECT_CALL(b, Xyz())...;
-//   }
-//
-// You can create InSequence objects in multiple threads, as long as
-// they are used to affect different mock objects.  The idea is that
-// each thread can create and set up its own mocks as if it's the only
-// thread.  However, for clarity of your tests we recommend you to set
-// up mocks in the main thread unless you have a good reason not to do
-// so.
-class GTEST_API_ InSequence {
- public:
-  InSequence();
-  ~InSequence();
- private:
-  bool sequence_created_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(InSequence);  // NOLINT
-} GTEST_ATTRIBUTE_UNUSED_;
-
-namespace internal {
-
-// Points to the implicit sequence introduced by a living InSequence
-// object (if any) in the current thread or NULL.
-GTEST_API_ extern ThreadLocal<Sequence*> g_gmock_implicit_sequence;
-
-// Base class for implementing expectations.
-//
-// There are two reasons for having a type-agnostic base class for
-// Expectation:
-//
-//   1. We need to store collections of expectations of different
-//   types (e.g. all pre-requisites of a particular expectation, all
-//   expectations in a sequence).  Therefore these expectation objects
-//   must share a common base class.
-//
-//   2. We can avoid binary code bloat by moving methods not depending
-//   on the template argument of Expectation to the base class.
-//
-// This class is internal and mustn't be used by user code directly.
-class GTEST_API_ ExpectationBase {
- public:
-  // source_text is the EXPECT_CALL(...) source that created this Expectation.
-  ExpectationBase(const char* file, int line, const std::string& source_text);
-
-  virtual ~ExpectationBase();
-
-  // Where in the source file was the expectation spec defined?
-  const char* file() const { return file_; }
-  int line() const { return line_; }
-  const char* source_text() const { return source_text_.c_str(); }
-  // Returns the cardinality specified in the expectation spec.
-  const Cardinality& cardinality() const { return cardinality_; }
-
-  // Describes the source file location of this expectation.
-  void DescribeLocationTo(::std::ostream* os) const {
-    *os << FormatFileLocation(file(), line()) << " ";
-  }
-
-  // Describes how many times a function call matching this
-  // expectation has occurred.
-  void DescribeCallCountTo(::std::ostream* os) const
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex);
-
-  // If this mock method has an extra matcher (i.e. .With(matcher)),
-  // describes it to the ostream.
-  virtual void MaybeDescribeExtraMatcherTo(::std::ostream* os) = 0;
-
- protected:
-  friend class ::testing::Expectation;
-  friend class UntypedFunctionMockerBase;
-
-  enum Clause {
-    // Don't change the order of the enum members!
-    kNone,
-    kWith,
-    kTimes,
-    kInSequence,
-    kAfter,
-    kWillOnce,
-    kWillRepeatedly,
-    kRetiresOnSaturation
-  };
-
-  typedef std::vector<const void*> UntypedActions;
-
-  // Returns an Expectation object that references and co-owns this
-  // expectation.
-  virtual Expectation GetHandle() = 0;
-
-  // Asserts that the EXPECT_CALL() statement has the given property.
-  void AssertSpecProperty(bool property,
-                          const std::string& failure_message) const {
-    Assert(property, file_, line_, failure_message);
-  }
-
-  // Expects that the EXPECT_CALL() statement has the given property.
-  void ExpectSpecProperty(bool property,
-                          const std::string& failure_message) const {
-    Expect(property, file_, line_, failure_message);
-  }
-
-  // Explicitly specifies the cardinality of this expectation.  Used
-  // by the subclasses to implement the .Times() clause.
-  void SpecifyCardinality(const Cardinality& cardinality);
-
-  // Returns true if and only if the user specified the cardinality
-  // explicitly using a .Times().
-  bool cardinality_specified() const { return cardinality_specified_; }
-
-  // Sets the cardinality of this expectation spec.
-  void set_cardinality(const Cardinality& a_cardinality) {
-    cardinality_ = a_cardinality;
-  }
-
-  // The following group of methods should only be called after the
-  // EXPECT_CALL() statement, and only when g_gmock_mutex is held by
-  // the current thread.
-
-  // Retires all pre-requisites of this expectation.
-  void RetireAllPreRequisites()
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex);
-
-  // Returns true if and only if this expectation is retired.
-  bool is_retired() const
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-    g_gmock_mutex.AssertHeld();
-    return retired_;
-  }
-
-  // Retires this expectation.
-  void Retire()
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-    g_gmock_mutex.AssertHeld();
-    retired_ = true;
-  }
-
-  // Returns true if and only if this expectation is satisfied.
-  bool IsSatisfied() const
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-    g_gmock_mutex.AssertHeld();
-    return cardinality().IsSatisfiedByCallCount(call_count_);
-  }
-
-  // Returns true if and only if this expectation is saturated.
-  bool IsSaturated() const
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-    g_gmock_mutex.AssertHeld();
-    return cardinality().IsSaturatedByCallCount(call_count_);
-  }
-
-  // Returns true if and only if this expectation is over-saturated.
-  bool IsOverSaturated() const
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-    g_gmock_mutex.AssertHeld();
-    return cardinality().IsOverSaturatedByCallCount(call_count_);
-  }
-
-  // Returns true if and only if all pre-requisites of this expectation are
-  // satisfied.
-  bool AllPrerequisitesAreSatisfied() const
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex);
-
-  // Adds unsatisfied pre-requisites of this expectation to 'result'.
-  void FindUnsatisfiedPrerequisites(ExpectationSet* result) const
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex);
-
-  // Returns the number this expectation has been invoked.
-  int call_count() const
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-    g_gmock_mutex.AssertHeld();
-    return call_count_;
-  }
-
-  // Increments the number this expectation has been invoked.
-  void IncrementCallCount()
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-    g_gmock_mutex.AssertHeld();
-    call_count_++;
-  }
-
-  // Checks the action count (i.e. the number of WillOnce() and
-  // WillRepeatedly() clauses) against the cardinality if this hasn't
-  // been done before.  Prints a warning if there are too many or too
-  // few actions.
-  void CheckActionCountIfNotDone() const
-      GTEST_LOCK_EXCLUDED_(mutex_);
-
-  friend class ::testing::Sequence;
-  friend class ::testing::internal::ExpectationTester;
-
-  template <typename Function>
-  friend class TypedExpectation;
-
-  // Implements the .Times() clause.
-  void UntypedTimes(const Cardinality& a_cardinality);
-
-  // This group of fields are part of the spec and won't change after
-  // an EXPECT_CALL() statement finishes.
-  const char* file_;          // The file that contains the expectation.
-  int line_;                  // The line number of the expectation.
-  const std::string source_text_;  // The EXPECT_CALL(...) source text.
-  // True if and only if the cardinality is specified explicitly.
-  bool cardinality_specified_;
-  Cardinality cardinality_;            // The cardinality of the expectation.
-  // The immediate pre-requisites (i.e. expectations that must be
-  // satisfied before this expectation can be matched) of this
-  // expectation.  We use std::shared_ptr in the set because we want an
-  // Expectation object to be co-owned by its FunctionMocker and its
-  // successors.  This allows multiple mock objects to be deleted at
-  // different times.
-  ExpectationSet immediate_prerequisites_;
-
-  // This group of fields are the current state of the expectation,
-  // and can change as the mock function is called.
-  int call_count_;  // How many times this expectation has been invoked.
-  bool retired_;    // True if and only if this expectation has retired.
-  UntypedActions untyped_actions_;
-  bool extra_matcher_specified_;
-  bool repeated_action_specified_;  // True if a WillRepeatedly() was specified.
-  bool retires_on_saturation_;
-  Clause last_clause_;
-  mutable bool action_count_checked_;  // Under mutex_.
-  mutable Mutex mutex_;  // Protects action_count_checked_.
-
-  GTEST_DISALLOW_ASSIGN_(ExpectationBase);
-};  // class ExpectationBase
-
-// Impements an expectation for the given function type.
-template <typename F>
-class TypedExpectation : public ExpectationBase {
- public:
-  typedef typename Function<F>::ArgumentTuple ArgumentTuple;
-  typedef typename Function<F>::ArgumentMatcherTuple ArgumentMatcherTuple;
-  typedef typename Function<F>::Result Result;
-
-  TypedExpectation(FunctionMocker<F>* owner, const char* a_file, int a_line,
-                   const std::string& a_source_text,
-                   const ArgumentMatcherTuple& m)
-      : ExpectationBase(a_file, a_line, a_source_text),
-        owner_(owner),
-        matchers_(m),
-        // By default, extra_matcher_ should match anything.  However,
-        // we cannot initialize it with _ as that causes ambiguity between
-        // Matcher's copy and move constructor for some argument types.
-        extra_matcher_(A<const ArgumentTuple&>()),
-        repeated_action_(DoDefault()) {}
-
-  ~TypedExpectation() override {
-    // Check the validity of the action count if it hasn't been done
-    // yet (for example, if the expectation was never used).
-    CheckActionCountIfNotDone();
-    for (UntypedActions::const_iterator it = untyped_actions_.begin();
-         it != untyped_actions_.end(); ++it) {
-      delete static_cast<const Action<F>*>(*it);
-    }
-  }
-
-  // Implements the .With() clause.
-  TypedExpectation& With(const Matcher<const ArgumentTuple&>& m) {
-    if (last_clause_ == kWith) {
-      ExpectSpecProperty(false,
-                         ".With() cannot appear "
-                         "more than once in an EXPECT_CALL().");
-    } else {
-      ExpectSpecProperty(last_clause_ < kWith,
-                         ".With() must be the first "
-                         "clause in an EXPECT_CALL().");
-    }
-    last_clause_ = kWith;
-
-    extra_matcher_ = m;
-    extra_matcher_specified_ = true;
-    return *this;
-  }
-
-  // Implements the .Times() clause.
-  TypedExpectation& Times(const Cardinality& a_cardinality) {
-    ExpectationBase::UntypedTimes(a_cardinality);
-    return *this;
-  }
-
-  // Implements the .Times() clause.
-  TypedExpectation& Times(int n) {
-    return Times(Exactly(n));
-  }
-
-  // Implements the .InSequence() clause.
-  TypedExpectation& InSequence(const Sequence& s) {
-    ExpectSpecProperty(last_clause_ <= kInSequence,
-                       ".InSequence() cannot appear after .After(),"
-                       " .WillOnce(), .WillRepeatedly(), or "
-                       ".RetiresOnSaturation().");
-    last_clause_ = kInSequence;
-
-    s.AddExpectation(GetHandle());
-    return *this;
-  }
-  TypedExpectation& InSequence(const Sequence& s1, const Sequence& s2) {
-    return InSequence(s1).InSequence(s2);
-  }
-  TypedExpectation& InSequence(const Sequence& s1, const Sequence& s2,
-                               const Sequence& s3) {
-    return InSequence(s1, s2).InSequence(s3);
-  }
-  TypedExpectation& InSequence(const Sequence& s1, const Sequence& s2,
-                               const Sequence& s3, const Sequence& s4) {
-    return InSequence(s1, s2, s3).InSequence(s4);
-  }
-  TypedExpectation& InSequence(const Sequence& s1, const Sequence& s2,
-                               const Sequence& s3, const Sequence& s4,
-                               const Sequence& s5) {
-    return InSequence(s1, s2, s3, s4).InSequence(s5);
-  }
-
-  // Implements that .After() clause.
-  TypedExpectation& After(const ExpectationSet& s) {
-    ExpectSpecProperty(last_clause_ <= kAfter,
-                       ".After() cannot appear after .WillOnce(),"
-                       " .WillRepeatedly(), or "
-                       ".RetiresOnSaturation().");
-    last_clause_ = kAfter;
-
-    for (ExpectationSet::const_iterator it = s.begin(); it != s.end(); ++it) {
-      immediate_prerequisites_ += *it;
-    }
-    return *this;
-  }
-  TypedExpectation& After(const ExpectationSet& s1, const ExpectationSet& s2) {
-    return After(s1).After(s2);
-  }
-  TypedExpectation& After(const ExpectationSet& s1, const ExpectationSet& s2,
-                          const ExpectationSet& s3) {
-    return After(s1, s2).After(s3);
-  }
-  TypedExpectation& After(const ExpectationSet& s1, const ExpectationSet& s2,
-                          const ExpectationSet& s3, const ExpectationSet& s4) {
-    return After(s1, s2, s3).After(s4);
-  }
-  TypedExpectation& After(const ExpectationSet& s1, const ExpectationSet& s2,
-                          const ExpectationSet& s3, const ExpectationSet& s4,
-                          const ExpectationSet& s5) {
-    return After(s1, s2, s3, s4).After(s5);
-  }
-
-  // Implements the .WillOnce() clause.
-  TypedExpectation& WillOnce(const Action<F>& action) {
-    ExpectSpecProperty(last_clause_ <= kWillOnce,
-                       ".WillOnce() cannot appear after "
-                       ".WillRepeatedly() or .RetiresOnSaturation().");
-    last_clause_ = kWillOnce;
-
-    untyped_actions_.push_back(new Action<F>(action));
-    if (!cardinality_specified()) {
-      set_cardinality(Exactly(static_cast<int>(untyped_actions_.size())));
-    }
-    return *this;
-  }
-
-  // Implements the .WillRepeatedly() clause.
-  TypedExpectation& WillRepeatedly(const Action<F>& action) {
-    if (last_clause_ == kWillRepeatedly) {
-      ExpectSpecProperty(false,
-                         ".WillRepeatedly() cannot appear "
-                         "more than once in an EXPECT_CALL().");
-    } else {
-      ExpectSpecProperty(last_clause_ < kWillRepeatedly,
-                         ".WillRepeatedly() cannot appear "
-                         "after .RetiresOnSaturation().");
-    }
-    last_clause_ = kWillRepeatedly;
-    repeated_action_specified_ = true;
-
-    repeated_action_ = action;
-    if (!cardinality_specified()) {
-      set_cardinality(AtLeast(static_cast<int>(untyped_actions_.size())));
-    }
-
-    // Now that no more action clauses can be specified, we check
-    // whether their count makes sense.
-    CheckActionCountIfNotDone();
-    return *this;
-  }
-
-  // Implements the .RetiresOnSaturation() clause.
-  TypedExpectation& RetiresOnSaturation() {
-    ExpectSpecProperty(last_clause_ < kRetiresOnSaturation,
-                       ".RetiresOnSaturation() cannot appear "
-                       "more than once.");
-    last_clause_ = kRetiresOnSaturation;
-    retires_on_saturation_ = true;
-
-    // Now that no more action clauses can be specified, we check
-    // whether their count makes sense.
-    CheckActionCountIfNotDone();
-    return *this;
-  }
-
-  // Returns the matchers for the arguments as specified inside the
-  // EXPECT_CALL() macro.
-  const ArgumentMatcherTuple& matchers() const {
-    return matchers_;
-  }
-
-  // Returns the matcher specified by the .With() clause.
-  const Matcher<const ArgumentTuple&>& extra_matcher() const {
-    return extra_matcher_;
-  }
-
-  // Returns the action specified by the .WillRepeatedly() clause.
-  const Action<F>& repeated_action() const { return repeated_action_; }
-
-  // If this mock method has an extra matcher (i.e. .With(matcher)),
-  // describes it to the ostream.
-  void MaybeDescribeExtraMatcherTo(::std::ostream* os) override {
-    if (extra_matcher_specified_) {
-      *os << "    Expected args: ";
-      extra_matcher_.DescribeTo(os);
-      *os << "\n";
-    }
-  }
-
- private:
-  template <typename Function>
-  friend class FunctionMocker;
-
-  // Returns an Expectation object that references and co-owns this
-  // expectation.
-  Expectation GetHandle() override { return owner_->GetHandleOf(this); }
-
-  // The following methods will be called only after the EXPECT_CALL()
-  // statement finishes and when the current thread holds
-  // g_gmock_mutex.
-
-  // Returns true if and only if this expectation matches the given arguments.
-  bool Matches(const ArgumentTuple& args) const
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-    g_gmock_mutex.AssertHeld();
-    return TupleMatches(matchers_, args) && extra_matcher_.Matches(args);
-  }
-
-  // Returns true if and only if this expectation should handle the given
-  // arguments.
-  bool ShouldHandleArguments(const ArgumentTuple& args) const
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-    g_gmock_mutex.AssertHeld();
-
-    // In case the action count wasn't checked when the expectation
-    // was defined (e.g. if this expectation has no WillRepeatedly()
-    // or RetiresOnSaturation() clause), we check it when the
-    // expectation is used for the first time.
-    CheckActionCountIfNotDone();
-    return !is_retired() && AllPrerequisitesAreSatisfied() && Matches(args);
-  }
-
-  // Describes the result of matching the arguments against this
-  // expectation to the given ostream.
-  void ExplainMatchResultTo(
-      const ArgumentTuple& args,
-      ::std::ostream* os) const
-          GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-    g_gmock_mutex.AssertHeld();
-
-    if (is_retired()) {
-      *os << "         Expected: the expectation is active\n"
-          << "           Actual: it is retired\n";
-    } else if (!Matches(args)) {
-      if (!TupleMatches(matchers_, args)) {
-        ExplainMatchFailureTupleTo(matchers_, args, os);
-      }
-      StringMatchResultListener listener;
-      if (!extra_matcher_.MatchAndExplain(args, &listener)) {
-        *os << "    Expected args: ";
-        extra_matcher_.DescribeTo(os);
-        *os << "\n           Actual: don't match";
-
-        internal::PrintIfNotEmpty(listener.str(), os);
-        *os << "\n";
-      }
-    } else if (!AllPrerequisitesAreSatisfied()) {
-      *os << "         Expected: all pre-requisites are satisfied\n"
-          << "           Actual: the following immediate pre-requisites "
-          << "are not satisfied:\n";
-      ExpectationSet unsatisfied_prereqs;
-      FindUnsatisfiedPrerequisites(&unsatisfied_prereqs);
-      int i = 0;
-      for (ExpectationSet::const_iterator it = unsatisfied_prereqs.begin();
-           it != unsatisfied_prereqs.end(); ++it) {
-        it->expectation_base()->DescribeLocationTo(os);
-        *os << "pre-requisite #" << i++ << "\n";
-      }
-      *os << "                   (end of pre-requisites)\n";
-    } else {
-      // This line is here just for completeness' sake.  It will never
-      // be executed as currently the ExplainMatchResultTo() function
-      // is called only when the mock function call does NOT match the
-      // expectation.
-      *os << "The call matches the expectation.\n";
-    }
-  }
-
-  // Returns the action that should be taken for the current invocation.
-  const Action<F>& GetCurrentAction(const FunctionMocker<F>* mocker,
-                                    const ArgumentTuple& args) const
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-    g_gmock_mutex.AssertHeld();
-    const int count = call_count();
-    Assert(count >= 1, __FILE__, __LINE__,
-           "call_count() is <= 0 when GetCurrentAction() is "
-           "called - this should never happen.");
-
-    const int action_count = static_cast<int>(untyped_actions_.size());
-    if (action_count > 0 && !repeated_action_specified_ &&
-        count > action_count) {
-      // If there is at least one WillOnce() and no WillRepeatedly(),
-      // we warn the user when the WillOnce() clauses ran out.
-      ::std::stringstream ss;
-      DescribeLocationTo(&ss);
-      ss << "Actions ran out in " << source_text() << "...\n"
-         << "Called " << count << " times, but only "
-         << action_count << " WillOnce()"
-         << (action_count == 1 ? " is" : "s are") << " specified - ";
-      mocker->DescribeDefaultActionTo(args, &ss);
-      Log(kWarning, ss.str(), 1);
-    }
-
-    return count <= action_count
-               ? *static_cast<const Action<F>*>(
-                     untyped_actions_[static_cast<size_t>(count - 1)])
-               : repeated_action();
-  }
-
-  // Given the arguments of a mock function call, if the call will
-  // over-saturate this expectation, returns the default action;
-  // otherwise, returns the next action in this expectation.  Also
-  // describes *what* happened to 'what', and explains *why* Google
-  // Mock does it to 'why'.  This method is not const as it calls
-  // IncrementCallCount().  A return value of NULL means the default
-  // action.
-  const Action<F>* GetActionForArguments(const FunctionMocker<F>* mocker,
-                                         const ArgumentTuple& args,
-                                         ::std::ostream* what,
-                                         ::std::ostream* why)
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-    g_gmock_mutex.AssertHeld();
-    if (IsSaturated()) {
-      // We have an excessive call.
-      IncrementCallCount();
-      *what << "Mock function called more times than expected - ";
-      mocker->DescribeDefaultActionTo(args, what);
-      DescribeCallCountTo(why);
-
-      return nullptr;
-    }
-
-    IncrementCallCount();
-    RetireAllPreRequisites();
-
-    if (retires_on_saturation_ && IsSaturated()) {
-      Retire();
-    }
-
-    // Must be done after IncrementCount()!
-    *what << "Mock function call matches " << source_text() <<"...\n";
-    return &(GetCurrentAction(mocker, args));
-  }
-
-  // All the fields below won't change once the EXPECT_CALL()
-  // statement finishes.
-  FunctionMocker<F>* const owner_;
-  ArgumentMatcherTuple matchers_;
-  Matcher<const ArgumentTuple&> extra_matcher_;
-  Action<F> repeated_action_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TypedExpectation);
-};  // class TypedExpectation
-
-// A MockSpec object is used by ON_CALL() or EXPECT_CALL() for
-// specifying the default behavior of, or expectation on, a mock
-// function.
-
-// Note: class MockSpec really belongs to the ::testing namespace.
-// However if we define it in ::testing, MSVC will complain when
-// classes in ::testing::internal declare it as a friend class
-// template.  To workaround this compiler bug, we define MockSpec in
-// ::testing::internal and import it into ::testing.
-
-// Logs a message including file and line number information.
-GTEST_API_ void LogWithLocation(testing::internal::LogSeverity severity,
-                                const char* file, int line,
-                                const std::string& message);
-
-template <typename F>
-class MockSpec {
- public:
-  typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
-  typedef typename internal::Function<F>::ArgumentMatcherTuple
-      ArgumentMatcherTuple;
-
-  // Constructs a MockSpec object, given the function mocker object
-  // that the spec is associated with.
-  MockSpec(internal::FunctionMocker<F>* function_mocker,
-           const ArgumentMatcherTuple& matchers)
-      : function_mocker_(function_mocker), matchers_(matchers) {}
-
-  // Adds a new default action spec to the function mocker and returns
-  // the newly created spec.
-  internal::OnCallSpec<F>& InternalDefaultActionSetAt(
-      const char* file, int line, const char* obj, const char* call) {
-    LogWithLocation(internal::kInfo, file, line,
-                    std::string("ON_CALL(") + obj + ", " + call + ") invoked");
-    return function_mocker_->AddNewOnCallSpec(file, line, matchers_);
-  }
-
-  // Adds a new expectation spec to the function mocker and returns
-  // the newly created spec.
-  internal::TypedExpectation<F>& InternalExpectedAt(
-      const char* file, int line, const char* obj, const char* call) {
-    const std::string source_text(std::string("EXPECT_CALL(") + obj + ", " +
-                                  call + ")");
-    LogWithLocation(internal::kInfo, file, line, source_text + " invoked");
-    return function_mocker_->AddNewExpectation(
-        file, line, source_text, matchers_);
-  }
-
-  // This operator overload is used to swallow the superfluous parameter list
-  // introduced by the ON/EXPECT_CALL macros. See the macro comments for more
-  // explanation.
-  MockSpec<F>& operator()(const internal::WithoutMatchers&, void* const) {
-    return *this;
-  }
-
- private:
-  template <typename Function>
-  friend class internal::FunctionMocker;
-
-  // The function mocker that owns this spec.
-  internal::FunctionMocker<F>* const function_mocker_;
-  // The argument matchers specified in the spec.
-  ArgumentMatcherTuple matchers_;
-};  // class MockSpec
-
-// Wrapper type for generically holding an ordinary value or lvalue reference.
-// If T is not a reference type, it must be copyable or movable.
-// ReferenceOrValueWrapper<T> is movable, and will also be copyable unless
-// T is a move-only value type (which means that it will always be copyable
-// if the current platform does not support move semantics).
-//
-// The primary template defines handling for values, but function header
-// comments describe the contract for the whole template (including
-// specializations).
-template <typename T>
-class ReferenceOrValueWrapper {
- public:
-  // Constructs a wrapper from the given value/reference.
-  explicit ReferenceOrValueWrapper(T value)
-      : value_(std::move(value)) {
-  }
-
-  // Unwraps and returns the underlying value/reference, exactly as
-  // originally passed. The behavior of calling this more than once on
-  // the same object is unspecified.
-  T Unwrap() { return std::move(value_); }
-
-  // Provides nondestructive access to the underlying value/reference.
-  // Always returns a const reference (more precisely,
-  // const std::add_lvalue_reference<T>::type). The behavior of calling this
-  // after calling Unwrap on the same object is unspecified.
-  const T& Peek() const {
-    return value_;
-  }
-
- private:
-  T value_;
-};
-
-// Specialization for lvalue reference types. See primary template
-// for documentation.
-template <typename T>
-class ReferenceOrValueWrapper<T&> {
- public:
-  // Workaround for debatable pass-by-reference lint warning (c-library-team
-  // policy precludes NOLINT in this context)
-  typedef T& reference;
-  explicit ReferenceOrValueWrapper(reference ref)
-      : value_ptr_(&ref) {}
-  T& Unwrap() { return *value_ptr_; }
-  const T& Peek() const { return *value_ptr_; }
-
- private:
-  T* value_ptr_;
-};
-
-// MSVC warns about using 'this' in base member initializer list, so
-// we need to temporarily disable the warning.  We have to do it for
-// the entire class to suppress the warning, even though it's about
-// the constructor only.
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4355)
-
-// C++ treats the void type specially.  For example, you cannot define
-// a void-typed variable or pass a void value to a function.
-// ActionResultHolder<T> holds a value of type T, where T must be a
-// copyable type or void (T doesn't need to be default-constructable).
-// It hides the syntactic difference between void and other types, and
-// is used to unify the code for invoking both void-returning and
-// non-void-returning mock functions.
-
-// Untyped base class for ActionResultHolder<T>.
-class UntypedActionResultHolderBase {
- public:
-  virtual ~UntypedActionResultHolderBase() {}
-
-  // Prints the held value as an action's result to os.
-  virtual void PrintAsActionResult(::std::ostream* os) const = 0;
-};
-
-// This generic definition is used when T is not void.
-template <typename T>
-class ActionResultHolder : public UntypedActionResultHolderBase {
- public:
-  // Returns the held value. Must not be called more than once.
-  T Unwrap() {
-    return result_.Unwrap();
-  }
-
-  // Prints the held value as an action's result to os.
-  void PrintAsActionResult(::std::ostream* os) const override {
-    *os << "\n          Returns: ";
-    // T may be a reference type, so we don't use UniversalPrint().
-    UniversalPrinter<T>::Print(result_.Peek(), os);
-  }
-
-  // Performs the given mock function's default action and returns the
-  // result in a new-ed ActionResultHolder.
-  template <typename F>
-  static ActionResultHolder* PerformDefaultAction(
-      const FunctionMocker<F>* func_mocker,
-      typename Function<F>::ArgumentTuple&& args,
-      const std::string& call_description) {
-    return new ActionResultHolder(Wrapper(func_mocker->PerformDefaultAction(
-        std::move(args), call_description)));
-  }
-
-  // Performs the given action and returns the result in a new-ed
-  // ActionResultHolder.
-  template <typename F>
-  static ActionResultHolder* PerformAction(
-      const Action<F>& action, typename Function<F>::ArgumentTuple&& args) {
-    return new ActionResultHolder(
-        Wrapper(action.Perform(std::move(args))));
-  }
-
- private:
-  typedef ReferenceOrValueWrapper<T> Wrapper;
-
-  explicit ActionResultHolder(Wrapper result)
-      : result_(std::move(result)) {
-  }
-
-  Wrapper result_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ActionResultHolder);
-};
-
-// Specialization for T = void.
-template <>
-class ActionResultHolder<void> : public UntypedActionResultHolderBase {
- public:
-  void Unwrap() { }
-
-  void PrintAsActionResult(::std::ostream* /* os */) const override {}
-
-  // Performs the given mock function's default action and returns ownership
-  // of an empty ActionResultHolder*.
-  template <typename F>
-  static ActionResultHolder* PerformDefaultAction(
-      const FunctionMocker<F>* func_mocker,
-      typename Function<F>::ArgumentTuple&& args,
-      const std::string& call_description) {
-    func_mocker->PerformDefaultAction(std::move(args), call_description);
-    return new ActionResultHolder;
-  }
-
-  // Performs the given action and returns ownership of an empty
-  // ActionResultHolder*.
-  template <typename F>
-  static ActionResultHolder* PerformAction(
-      const Action<F>& action, typename Function<F>::ArgumentTuple&& args) {
-    action.Perform(std::move(args));
-    return new ActionResultHolder;
-  }
-
- private:
-  ActionResultHolder() {}
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ActionResultHolder);
-};
-
-template <typename F>
-class FunctionMocker;
-
-template <typename R, typename... Args>
-class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
-  using F = R(Args...);
-
- public:
-  using Result = R;
-  using ArgumentTuple = std::tuple<Args...>;
-  using ArgumentMatcherTuple = std::tuple<Matcher<Args>...>;
-
-  FunctionMocker() {}
-
-  // There is no generally useful and implementable semantics of
-  // copying a mock object, so copying a mock is usually a user error.
-  // Thus we disallow copying function mockers.  If the user really
-  // wants to copy a mock object, they should implement their own copy
-  // operation, for example:
-  //
-  //   class MockFoo : public Foo {
-  //    public:
-  //     // Defines a copy constructor explicitly.
-  //     MockFoo(const MockFoo& src) {}
-  //     ...
-  //   };
-  FunctionMocker(const FunctionMocker&) = delete;
-  FunctionMocker& operator=(const FunctionMocker&) = delete;
-
-  // The destructor verifies that all expectations on this mock
-  // function have been satisfied.  If not, it will report Google Test
-  // non-fatal failures for the violations.
-  ~FunctionMocker() override GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
-    MutexLock l(&g_gmock_mutex);
-    VerifyAndClearExpectationsLocked();
-    Mock::UnregisterLocked(this);
-    ClearDefaultActionsLocked();
-  }
-
-  // Returns the ON_CALL spec that matches this mock function with the
-  // given arguments; returns NULL if no matching ON_CALL is found.
-  // L = *
-  const OnCallSpec<F>* FindOnCallSpec(
-      const ArgumentTuple& args) const {
-    for (UntypedOnCallSpecs::const_reverse_iterator it
-             = untyped_on_call_specs_.rbegin();
-         it != untyped_on_call_specs_.rend(); ++it) {
-      const OnCallSpec<F>* spec = static_cast<const OnCallSpec<F>*>(*it);
-      if (spec->Matches(args))
-        return spec;
-    }
-
-    return nullptr;
-  }
-
-  // Performs the default action of this mock function on the given
-  // arguments and returns the result. Asserts (or throws if
-  // exceptions are enabled) with a helpful call descrption if there
-  // is no valid return value. This method doesn't depend on the
-  // mutable state of this object, and thus can be called concurrently
-  // without locking.
-  // L = *
-  Result PerformDefaultAction(ArgumentTuple&& args,
-                              const std::string& call_description) const {
-    const OnCallSpec<F>* const spec =
-        this->FindOnCallSpec(args);
-    if (spec != nullptr) {
-      return spec->GetAction().Perform(std::move(args));
-    }
-    const std::string message =
-        call_description +
-        "\n    The mock function has no default action "
-        "set, and its return type has no default value set.";
-#if GTEST_HAS_EXCEPTIONS
-    if (!DefaultValue<Result>::Exists()) {
-      throw std::runtime_error(message);
-    }
-#else
-    Assert(DefaultValue<Result>::Exists(), "", -1, message);
-#endif
-    return DefaultValue<Result>::Get();
-  }
-
-  // Performs the default action with the given arguments and returns
-  // the action's result.  The call description string will be used in
-  // the error message to describe the call in the case the default
-  // action fails.  The caller is responsible for deleting the result.
-  // L = *
-  UntypedActionResultHolderBase* UntypedPerformDefaultAction(
-      void* untyped_args,  // must point to an ArgumentTuple
-      const std::string& call_description) const override {
-    ArgumentTuple* args = static_cast<ArgumentTuple*>(untyped_args);
-    return ResultHolder::PerformDefaultAction(this, std::move(*args),
-                                              call_description);
-  }
-
-  // Performs the given action with the given arguments and returns
-  // the action's result.  The caller is responsible for deleting the
-  // result.
-  // L = *
-  UntypedActionResultHolderBase* UntypedPerformAction(
-      const void* untyped_action, void* untyped_args) const override {
-    // Make a copy of the action before performing it, in case the
-    // action deletes the mock object (and thus deletes itself).
-    const Action<F> action = *static_cast<const Action<F>*>(untyped_action);
-    ArgumentTuple* args = static_cast<ArgumentTuple*>(untyped_args);
-    return ResultHolder::PerformAction(action, std::move(*args));
-  }
-
-  // Implements UntypedFunctionMockerBase::ClearDefaultActionsLocked():
-  // clears the ON_CALL()s set on this mock function.
-  void ClearDefaultActionsLocked() override
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-    g_gmock_mutex.AssertHeld();
-
-    // Deleting our default actions may trigger other mock objects to be
-    // deleted, for example if an action contains a reference counted smart
-    // pointer to that mock object, and that is the last reference. So if we
-    // delete our actions within the context of the global mutex we may deadlock
-    // when this method is called again. Instead, make a copy of the set of
-    // actions to delete, clear our set within the mutex, and then delete the
-    // actions outside of the mutex.
-    UntypedOnCallSpecs specs_to_delete;
-    untyped_on_call_specs_.swap(specs_to_delete);
-
-    g_gmock_mutex.Unlock();
-    for (UntypedOnCallSpecs::const_iterator it =
-             specs_to_delete.begin();
-         it != specs_to_delete.end(); ++it) {
-      delete static_cast<const OnCallSpec<F>*>(*it);
-    }
-
-    // Lock the mutex again, since the caller expects it to be locked when we
-    // return.
-    g_gmock_mutex.Lock();
-  }
-
-  // Returns the result of invoking this mock function with the given
-  // arguments.  This function can be safely called from multiple
-  // threads concurrently.
-  Result Invoke(Args... args) GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
-    ArgumentTuple tuple(std::forward<Args>(args)...);
-    std::unique_ptr<ResultHolder> holder(DownCast_<ResultHolder*>(
-        this->UntypedInvokeWith(static_cast<void*>(&tuple))));
-    return holder->Unwrap();
-  }
-
-  MockSpec<F> With(Matcher<Args>... m) {
-    return MockSpec<F>(this, ::std::make_tuple(std::move(m)...));
-  }
-
- protected:
-  template <typename Function>
-  friend class MockSpec;
-
-  typedef ActionResultHolder<Result> ResultHolder;
-
-  // Adds and returns a default action spec for this mock function.
-  OnCallSpec<F>& AddNewOnCallSpec(
-      const char* file, int line,
-      const ArgumentMatcherTuple& m)
-          GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
-    Mock::RegisterUseByOnCallOrExpectCall(MockObject(), file, line);
-    OnCallSpec<F>* const on_call_spec = new OnCallSpec<F>(file, line, m);
-    untyped_on_call_specs_.push_back(on_call_spec);
-    return *on_call_spec;
-  }
-
-  // Adds and returns an expectation spec for this mock function.
-  TypedExpectation<F>& AddNewExpectation(const char* file, int line,
-                                         const std::string& source_text,
-                                         const ArgumentMatcherTuple& m)
-      GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
-    Mock::RegisterUseByOnCallOrExpectCall(MockObject(), file, line);
-    TypedExpectation<F>* const expectation =
-        new TypedExpectation<F>(this, file, line, source_text, m);
-    const std::shared_ptr<ExpectationBase> untyped_expectation(expectation);
-    // See the definition of untyped_expectations_ for why access to
-    // it is unprotected here.
-    untyped_expectations_.push_back(untyped_expectation);
-
-    // Adds this expectation into the implicit sequence if there is one.
-    Sequence* const implicit_sequence = g_gmock_implicit_sequence.get();
-    if (implicit_sequence != nullptr) {
-      implicit_sequence->AddExpectation(Expectation(untyped_expectation));
-    }
-
-    return *expectation;
-  }
-
- private:
-  template <typename Func> friend class TypedExpectation;
-
-  // Some utilities needed for implementing UntypedInvokeWith().
-
-  // Describes what default action will be performed for the given
-  // arguments.
-  // L = *
-  void DescribeDefaultActionTo(const ArgumentTuple& args,
-                               ::std::ostream* os) const {
-    const OnCallSpec<F>* const spec = FindOnCallSpec(args);
-
-    if (spec == nullptr) {
-      *os << (std::is_void<Result>::value ? "returning directly.\n"
-                                          : "returning default value.\n");
-    } else {
-      *os << "taking default action specified at:\n"
-          << FormatFileLocation(spec->file(), spec->line()) << "\n";
-    }
-  }
-
-  // Writes a message that the call is uninteresting (i.e. neither
-  // explicitly expected nor explicitly unexpected) to the given
-  // ostream.
-  void UntypedDescribeUninterestingCall(const void* untyped_args,
-                                        ::std::ostream* os) const override
-      GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
-    const ArgumentTuple& args =
-        *static_cast<const ArgumentTuple*>(untyped_args);
-    *os << "Uninteresting mock function call - ";
-    DescribeDefaultActionTo(args, os);
-    *os << "    Function call: " << Name();
-    UniversalPrint(args, os);
-  }
-
-  // Returns the expectation that matches the given function arguments
-  // (or NULL is there's no match); when a match is found,
-  // untyped_action is set to point to the action that should be
-  // performed (or NULL if the action is "do default"), and
-  // is_excessive is modified to indicate whether the call exceeds the
-  // expected number.
-  //
-  // Critical section: We must find the matching expectation and the
-  // corresponding action that needs to be taken in an ATOMIC
-  // transaction.  Otherwise another thread may call this mock
-  // method in the middle and mess up the state.
-  //
-  // However, performing the action has to be left out of the critical
-  // section.  The reason is that we have no control on what the
-  // action does (it can invoke an arbitrary user function or even a
-  // mock function) and excessive locking could cause a dead lock.
-  const ExpectationBase* UntypedFindMatchingExpectation(
-      const void* untyped_args, const void** untyped_action, bool* is_excessive,
-      ::std::ostream* what, ::std::ostream* why) override
-      GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
-    const ArgumentTuple& args =
-        *static_cast<const ArgumentTuple*>(untyped_args);
-    MutexLock l(&g_gmock_mutex);
-    TypedExpectation<F>* exp = this->FindMatchingExpectationLocked(args);
-    if (exp == nullptr) {  // A match wasn't found.
-      this->FormatUnexpectedCallMessageLocked(args, what, why);
-      return nullptr;
-    }
-
-    // This line must be done before calling GetActionForArguments(),
-    // which will increment the call count for *exp and thus affect
-    // its saturation status.
-    *is_excessive = exp->IsSaturated();
-    const Action<F>* action = exp->GetActionForArguments(this, args, what, why);
-    if (action != nullptr && action->IsDoDefault())
-      action = nullptr;  // Normalize "do default" to NULL.
-    *untyped_action = action;
-    return exp;
-  }
-
-  // Prints the given function arguments to the ostream.
-  void UntypedPrintArgs(const void* untyped_args,
-                        ::std::ostream* os) const override {
-    const ArgumentTuple& args =
-        *static_cast<const ArgumentTuple*>(untyped_args);
-    UniversalPrint(args, os);
-  }
-
-  // Returns the expectation that matches the arguments, or NULL if no
-  // expectation matches them.
-  TypedExpectation<F>* FindMatchingExpectationLocked(
-      const ArgumentTuple& args) const
-          GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-    g_gmock_mutex.AssertHeld();
-    // See the definition of untyped_expectations_ for why access to
-    // it is unprotected here.
-    for (typename UntypedExpectations::const_reverse_iterator it =
-             untyped_expectations_.rbegin();
-         it != untyped_expectations_.rend(); ++it) {
-      TypedExpectation<F>* const exp =
-          static_cast<TypedExpectation<F>*>(it->get());
-      if (exp->ShouldHandleArguments(args)) {
-        return exp;
-      }
-    }
-    return nullptr;
-  }
-
-  // Returns a message that the arguments don't match any expectation.
-  void FormatUnexpectedCallMessageLocked(
-      const ArgumentTuple& args,
-      ::std::ostream* os,
-      ::std::ostream* why) const
-          GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-    g_gmock_mutex.AssertHeld();
-    *os << "\nUnexpected mock function call - ";
-    DescribeDefaultActionTo(args, os);
-    PrintTriedExpectationsLocked(args, why);
-  }
-
-  // Prints a list of expectations that have been tried against the
-  // current mock function call.
-  void PrintTriedExpectationsLocked(
-      const ArgumentTuple& args,
-      ::std::ostream* why) const
-          GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-    g_gmock_mutex.AssertHeld();
-    const size_t count = untyped_expectations_.size();
-    *why << "Google Mock tried the following " << count << " "
-         << (count == 1 ? "expectation, but it didn't match" :
-             "expectations, but none matched")
-         << ":\n";
-    for (size_t i = 0; i < count; i++) {
-      TypedExpectation<F>* const expectation =
-          static_cast<TypedExpectation<F>*>(untyped_expectations_[i].get());
-      *why << "\n";
-      expectation->DescribeLocationTo(why);
-      if (count > 1) {
-        *why << "tried expectation #" << i << ": ";
-      }
-      *why << expectation->source_text() << "...\n";
-      expectation->ExplainMatchResultTo(args, why);
-      expectation->DescribeCallCountTo(why);
-    }
-  }
-};  // class FunctionMocker
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4355
-
-// Reports an uninteresting call (whose description is in msg) in the
-// manner specified by 'reaction'.
-void ReportUninterestingCall(CallReaction reaction, const std::string& msg);
-
-}  // namespace internal
-
-// A MockFunction<F> class has one mock method whose type is F.  It is
-// useful when you just want your test code to emit some messages and
-// have Google Mock verify the right messages are sent (and perhaps at
-// the right times).  For example, if you are exercising code:
-//
-//   Foo(1);
-//   Foo(2);
-//   Foo(3);
-//
-// and want to verify that Foo(1) and Foo(3) both invoke
-// mock.Bar("a"), but Foo(2) doesn't invoke anything, you can write:
-//
-// TEST(FooTest, InvokesBarCorrectly) {
-//   MyMock mock;
-//   MockFunction<void(string check_point_name)> check;
-//   {
-//     InSequence s;
-//
-//     EXPECT_CALL(mock, Bar("a"));
-//     EXPECT_CALL(check, Call("1"));
-//     EXPECT_CALL(check, Call("2"));
-//     EXPECT_CALL(mock, Bar("a"));
-//   }
-//   Foo(1);
-//   check.Call("1");
-//   Foo(2);
-//   check.Call("2");
-//   Foo(3);
-// }
-//
-// The expectation spec says that the first Bar("a") must happen
-// before check point "1", the second Bar("a") must happen after check
-// point "2", and nothing should happen between the two check
-// points. The explicit check points make it easy to tell which
-// Bar("a") is called by which call to Foo().
-//
-// MockFunction<F> can also be used to exercise code that accepts
-// std::function<F> callbacks. To do so, use AsStdFunction() method
-// to create std::function proxy forwarding to original object's Call.
-// Example:
-//
-// TEST(FooTest, RunsCallbackWithBarArgument) {
-//   MockFunction<int(string)> callback;
-//   EXPECT_CALL(callback, Call("bar")).WillOnce(Return(1));
-//   Foo(callback.AsStdFunction());
-// }
-template <typename F>
-class MockFunction;
-
-template <typename R, typename... Args>
-class MockFunction<R(Args...)> {
- public:
-  MockFunction() {}
-  MockFunction(const MockFunction&) = delete;
-  MockFunction& operator=(const MockFunction&) = delete;
-
-  std::function<R(Args...)> AsStdFunction() {
-    return [this](Args... args) -> R {
-      return this->Call(std::forward<Args>(args)...);
-    };
-  }
-
-  // Implementation detail: the expansion of the MOCK_METHOD macro.
-  R Call(Args... args) {
-    mock_.SetOwnerAndName(this, "Call");
-    return mock_.Invoke(std::forward<Args>(args)...);
-  }
-
-  internal::MockSpec<R(Args...)> gmock_Call(Matcher<Args>... m) {
-    mock_.RegisterOwner(this);
-    return mock_.With(std::move(m)...);
-  }
-
-  internal::MockSpec<R(Args...)> gmock_Call(const internal::WithoutMatchers&,
-                                            R (*)(Args...)) {
-    return this->gmock_Call(::testing::A<Args>()...);
-  }
-
- private:
-  internal::FunctionMocker<R(Args...)> mock_;
-};
-
-// The style guide prohibits "using" statements in a namespace scope
-// inside a header file.  However, the MockSpec class template is
-// meant to be defined in the ::testing namespace.  The following line
-// is just a trick for working around a bug in MSVC 8.0, which cannot
-// handle it if we define MockSpec in ::testing.
-using internal::MockSpec;
-
-// Const(x) is a convenient function for obtaining a const reference
-// to x.  This is useful for setting expectations on an overloaded
-// const mock method, e.g.
-//
-//   class MockFoo : public FooInterface {
-//    public:
-//     MOCK_METHOD0(Bar, int());
-//     MOCK_CONST_METHOD0(Bar, int&());
-//   };
-//
-//   MockFoo foo;
-//   // Expects a call to non-const MockFoo::Bar().
-//   EXPECT_CALL(foo, Bar());
-//   // Expects a call to const MockFoo::Bar().
-//   EXPECT_CALL(Const(foo), Bar());
-template <typename T>
-inline const T& Const(const T& x) { return x; }
-
-// Constructs an Expectation object that references and co-owns exp.
-inline Expectation::Expectation(internal::ExpectationBase& exp)  // NOLINT
-    : expectation_base_(exp.GetHandle().expectation_base()) {}
-
-}  // namespace testing
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
-
-// Implementation for ON_CALL and EXPECT_CALL macros. A separate macro is
-// required to avoid compile errors when the name of the method used in call is
-// a result of macro expansion. See CompilesWithMethodNameExpandedFromMacro
-// tests in internal/gmock-spec-builders_test.cc for more details.
-//
-// This macro supports statements both with and without parameter matchers. If
-// the parameter list is omitted, gMock will accept any parameters, which allows
-// tests to be written that don't need to encode the number of method
-// parameter. This technique may only be used for non-overloaded methods.
-//
-//   // These are the same:
-//   ON_CALL(mock, NoArgsMethod()).WillByDefault(...);
-//   ON_CALL(mock, NoArgsMethod).WillByDefault(...);
-//
-//   // As are these:
-//   ON_CALL(mock, TwoArgsMethod(_, _)).WillByDefault(...);
-//   ON_CALL(mock, TwoArgsMethod).WillByDefault(...);
-//
-//   // Can also specify args if you want, of course:
-//   ON_CALL(mock, TwoArgsMethod(_, 45)).WillByDefault(...);
-//
-//   // Overloads work as long as you specify parameters:
-//   ON_CALL(mock, OverloadedMethod(_)).WillByDefault(...);
-//   ON_CALL(mock, OverloadedMethod(_, _)).WillByDefault(...);
-//
-//   // Oops! Which overload did you want?
-//   ON_CALL(mock, OverloadedMethod).WillByDefault(...);
-//     => ERROR: call to member function 'gmock_OverloadedMethod' is ambiguous
-//
-// How this works: The mock class uses two overloads of the gmock_Method
-// expectation setter method plus an operator() overload on the MockSpec object.
-// In the matcher list form, the macro expands to:
-//
-//   // This statement:
-//   ON_CALL(mock, TwoArgsMethod(_, 45))...
-//
-//   // ...expands to:
-//   mock.gmock_TwoArgsMethod(_, 45)(WithoutMatchers(), nullptr)...
-//   |-------------v---------------||------------v-------------|
-//       invokes first overload        swallowed by operator()
-//
-//   // ...which is essentially:
-//   mock.gmock_TwoArgsMethod(_, 45)...
-//
-// Whereas the form without a matcher list:
-//
-//   // This statement:
-//   ON_CALL(mock, TwoArgsMethod)...
-//
-//   // ...expands to:
-//   mock.gmock_TwoArgsMethod(WithoutMatchers(), nullptr)...
-//   |-----------------------v--------------------------|
-//                 invokes second overload
-//
-//   // ...which is essentially:
-//   mock.gmock_TwoArgsMethod(_, _)...
-//
-// The WithoutMatchers() argument is used to disambiguate overloads and to
-// block the caller from accidentally invoking the second overload directly. The
-// second argument is an internal type derived from the method signature. The
-// failure to disambiguate two overloads of this method in the ON_CALL statement
-// is how we block callers from setting expectations on overloaded methods.
-#define GMOCK_ON_CALL_IMPL_(mock_expr, Setter, call)                    \
-  ((mock_expr).gmock_##call)(::testing::internal::GetWithoutMatchers(), \
-                             nullptr)                                   \
-      .Setter(__FILE__, __LINE__, #mock_expr, #call)
-
-#define ON_CALL(obj, call) \
-  GMOCK_ON_CALL_IMPL_(obj, InternalDefaultActionSetAt, call)
-
-#define EXPECT_CALL(obj, call) \
-  GMOCK_ON_CALL_IMPL_(obj, InternalExpectedAt, call)
-
-#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock.h b/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock.h
deleted file mode 100644
index 45645ff6377..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock.h
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This is the main header file a user should include.
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_H_
-#define GMOCK_INCLUDE_GMOCK_GMOCK_H_
-
-// This file implements the following syntax:
-//
-//   ON_CALL(mock_object, Method(...))
-//     .With(...) ?
-//     .WillByDefault(...);
-//
-// where With() is optional and WillByDefault() must appear exactly
-// once.
-//
-//   EXPECT_CALL(mock_object, Method(...))
-//     .With(...) ?
-//     .Times(...) ?
-//     .InSequence(...) *
-//     .WillOnce(...) *
-//     .WillRepeatedly(...) ?
-//     .RetiresOnSaturation() ? ;
-//
-// where all clauses are optional and WillOnce() can be repeated.
-
-#include "gmock/gmock-actions.h"
-#include "gmock/gmock-cardinalities.h"
-#include "gmock/gmock-function-mocker.h"
-#include "gmock/gmock-generated-actions.h"
-#include "gmock/gmock-generated-function-mockers.h"
-#include "gmock/gmock-generated-matchers.h"
-#include "gmock/gmock-matchers.h"
-#include "gmock/gmock-more-actions.h"
-#include "gmock/gmock-more-matchers.h"
-#include "gmock/gmock-nice-strict.h"
-#include "gmock/internal/gmock-internal-utils.h"
-
-#ifdef __clang__
-#if __has_warning("-Wdeprecated-copy")
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-copy"
-#endif
-#endif
-
-namespace testing {
-
-// Declares Google Mock flags that we want a user to use programmatically.
-GMOCK_DECLARE_bool_(catch_leaked_mocks);
-GMOCK_DECLARE_string_(verbose);
-GMOCK_DECLARE_int32_(default_mock_behavior);
-
-// Initializes Google Mock.  This must be called before running the
-// tests.  In particular, it parses the command line for the flags
-// that Google Mock recognizes.  Whenever a Google Mock flag is seen,
-// it is removed from argv, and *argc is decremented.
-//
-// No value is returned.  Instead, the Google Mock flag variables are
-// updated.
-//
-// Since Google Test is needed for Google Mock to work, this function
-// also initializes Google Test and parses its flags, if that hasn't
-// been done.
-GTEST_API_ void InitGoogleMock(int* argc, char** argv);
-
-// This overloaded version can be used in Windows programs compiled in
-// UNICODE mode.
-GTEST_API_ void InitGoogleMock(int* argc, wchar_t** argv);
-
-// This overloaded version can be used on Arduino/embedded platforms where
-// there is no argc/argv.
-GTEST_API_ void InitGoogleMock();
-
-}  // namespace testing
-
-#ifdef __clang__
-#if __has_warning("-Wdeprecated-copy")
-#pragma clang diagnostic pop
-#endif
-#endif
-
-#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h b/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h
deleted file mode 100644
index 92d910cf06d..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h
+++ /dev/null
@@ -1,10 +0,0 @@
-// This file was GENERATED by command:
-//     pump.py gmock-generated-actions.h.pump
-// DO NOT EDIT BY HAND!!!
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_
-#define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_
-
-#endif  // GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/internal/custom/gmock-matchers.h b/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/internal/custom/gmock-matchers.h
deleted file mode 100644
index 14aafaabe6b..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/internal/custom/gmock-matchers.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2015, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Injection point for custom user configurations. See README for details
-//
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_
-#define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_
-#endif  // GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/internal/custom/gmock-port.h b/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/internal/custom/gmock-port.h
deleted file mode 100644
index 0030fe91118..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/internal/custom/gmock-port.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2015, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Injection point for custom user configurations. See README for details
-//
-// ** Custom implementation starts here **
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
-#define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
-
-#endif  // GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/internal/gmock-internal-utils.h b/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/internal/gmock-internal-utils.h
deleted file mode 100644
index b9533508ef7..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/internal/gmock-internal-utils.h
+++ /dev/null
@@ -1,515 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file defines some utilities useful for implementing Google
-// Mock.  They are subject to change without notice, so please DO NOT
-// USE THEM IN USER CODE.
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-// IWYU pragma: private, include "gmock/gmock.h"
-
-#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_INTERNAL_UTILS_H_
-#define GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_INTERNAL_UTILS_H_
-
-#include <stdio.h>
-#include <ostream>  // NOLINT
-#include <string>
-#include <type_traits>
-#include "gmock/internal/gmock-port.h"
-#include "gtest/gtest.h"
-
-namespace testing {
-
-template <typename>
-class Matcher;
-
-namespace internal {
-
-// Silence MSVC C4100 (unreferenced formal parameter) and
-// C4805('==': unsafe mix of type 'const int' and type 'const bool')
-#ifdef _MSC_VER
-# pragma warning(push)
-# pragma warning(disable:4100)
-# pragma warning(disable:4805)
-#endif
-
-// Joins a vector of strings as if they are fields of a tuple; returns
-// the joined string.
-GTEST_API_ std::string JoinAsTuple(const Strings& fields);
-
-// Converts an identifier name to a space-separated list of lower-case
-// words.  Each maximum substring of the form [A-Za-z][a-z]*|\d+ is
-// treated as one word.  For example, both "FooBar123" and
-// "foo_bar_123" are converted to "foo bar 123".
-GTEST_API_ std::string ConvertIdentifierNameToWords(const char* id_name);
-
-// PointeeOf<Pointer>::type is the type of a value pointed to by a
-// Pointer, which can be either a smart pointer or a raw pointer.  The
-// following default implementation is for the case where Pointer is a
-// smart pointer.
-template <typename Pointer>
-struct PointeeOf {
-  // Smart pointer classes define type element_type as the type of
-  // their pointees.
-  typedef typename Pointer::element_type type;
-};
-// This specialization is for the raw pointer case.
-template <typename T>
-struct PointeeOf<T*> { typedef T type; };  // NOLINT
-
-// GetRawPointer(p) returns the raw pointer underlying p when p is a
-// smart pointer, or returns p itself when p is already a raw pointer.
-// The following default implementation is for the smart pointer case.
-template <typename Pointer>
-inline const typename Pointer::element_type* GetRawPointer(const Pointer& p) {
-  return p.get();
-}
-// This overloaded version is for the raw pointer case.
-template <typename Element>
-inline Element* GetRawPointer(Element* p) { return p; }
-
-// MSVC treats wchar_t as a native type usually, but treats it as the
-// same as unsigned short when the compiler option /Zc:wchar_t- is
-// specified.  It defines _NATIVE_WCHAR_T_DEFINED symbol when wchar_t
-// is a native type.
-#if defined(_MSC_VER) && !defined(_NATIVE_WCHAR_T_DEFINED)
-// wchar_t is a typedef.
-#else
-# define GMOCK_WCHAR_T_IS_NATIVE_ 1
-#endif
-
-// In what follows, we use the term "kind" to indicate whether a type
-// is bool, an integer type (excluding bool), a floating-point type,
-// or none of them.  This categorization is useful for determining
-// when a matcher argument type can be safely converted to another
-// type in the implementation of SafeMatcherCast.
-enum TypeKind {
-  kBool, kInteger, kFloatingPoint, kOther
-};
-
-// KindOf<T>::value is the kind of type T.
-template <typename T> struct KindOf {
-  enum { value = kOther };  // The default kind.
-};
-
-// This macro declares that the kind of 'type' is 'kind'.
-#define GMOCK_DECLARE_KIND_(type, kind) \
-  template <> struct KindOf<type> { enum { value = kind }; }
-
-GMOCK_DECLARE_KIND_(bool, kBool);
-
-// All standard integer types.
-GMOCK_DECLARE_KIND_(char, kInteger);
-GMOCK_DECLARE_KIND_(signed char, kInteger);
-GMOCK_DECLARE_KIND_(unsigned char, kInteger);
-GMOCK_DECLARE_KIND_(short, kInteger);  // NOLINT
-GMOCK_DECLARE_KIND_(unsigned short, kInteger);  // NOLINT
-GMOCK_DECLARE_KIND_(int, kInteger);
-GMOCK_DECLARE_KIND_(unsigned int, kInteger);
-GMOCK_DECLARE_KIND_(long, kInteger);  // NOLINT
-GMOCK_DECLARE_KIND_(unsigned long, kInteger);  // NOLINT
-
-#if GMOCK_WCHAR_T_IS_NATIVE_
-GMOCK_DECLARE_KIND_(wchar_t, kInteger);
-#endif
-
-// Non-standard integer types.
-GMOCK_DECLARE_KIND_(Int64, kInteger);
-GMOCK_DECLARE_KIND_(UInt64, kInteger);
-
-// All standard floating-point types.
-GMOCK_DECLARE_KIND_(float, kFloatingPoint);
-GMOCK_DECLARE_KIND_(double, kFloatingPoint);
-GMOCK_DECLARE_KIND_(long double, kFloatingPoint);
-
-#undef GMOCK_DECLARE_KIND_
-
-// Evaluates to the kind of 'type'.
-#define GMOCK_KIND_OF_(type) \
-  static_cast< ::testing::internal::TypeKind>( \
-      ::testing::internal::KindOf<type>::value)
-
-// Evaluates to true if and only if integer type T is signed.
-#define GMOCK_IS_SIGNED_(T) (static_cast<T>(-1) < 0)
-
-// LosslessArithmeticConvertibleImpl<kFromKind, From, kToKind, To>::value
-// is true if and only if arithmetic type From can be losslessly converted to
-// arithmetic type To.
-//
-// It's the user's responsibility to ensure that both From and To are
-// raw (i.e. has no CV modifier, is not a pointer, and is not a
-// reference) built-in arithmetic types, kFromKind is the kind of
-// From, and kToKind is the kind of To; the value is
-// implementation-defined when the above pre-condition is violated.
-template <TypeKind kFromKind, typename From, TypeKind kToKind, typename To>
-struct LosslessArithmeticConvertibleImpl : public std::false_type {};
-
-// Converting bool to bool is lossless.
-template <>
-struct LosslessArithmeticConvertibleImpl<kBool, bool, kBool, bool>
-    : public std::true_type {};
-
-// Converting bool to any integer type is lossless.
-template <typename To>
-struct LosslessArithmeticConvertibleImpl<kBool, bool, kInteger, To>
-    : public std::true_type {};
-
-// Converting bool to any floating-point type is lossless.
-template <typename To>
-struct LosslessArithmeticConvertibleImpl<kBool, bool, kFloatingPoint, To>
-    : public std::true_type {};
-
-// Converting an integer to bool is lossy.
-template <typename From>
-struct LosslessArithmeticConvertibleImpl<kInteger, From, kBool, bool>
-    : public std::false_type {};
-
-// Converting an integer to another non-bool integer is lossless
-// if and only if the target type's range encloses the source type's range.
-template <typename From, typename To>
-struct LosslessArithmeticConvertibleImpl<kInteger, From, kInteger, To>
-    : public bool_constant<
-      // When converting from a smaller size to a larger size, we are
-      // fine as long as we are not converting from signed to unsigned.
-      ((sizeof(From) < sizeof(To)) &&
-       (!GMOCK_IS_SIGNED_(From) || GMOCK_IS_SIGNED_(To))) ||
-      // When converting between the same size, the signedness must match.
-      ((sizeof(From) == sizeof(To)) &&
-       (GMOCK_IS_SIGNED_(From) == GMOCK_IS_SIGNED_(To)))> {};  // NOLINT
-
-#undef GMOCK_IS_SIGNED_
-
-// Converting an integer to a floating-point type may be lossy, since
-// the format of a floating-point number is implementation-defined.
-template <typename From, typename To>
-struct LosslessArithmeticConvertibleImpl<kInteger, From, kFloatingPoint, To>
-    : public std::false_type {};
-
-// Converting a floating-point to bool is lossy.
-template <typename From>
-struct LosslessArithmeticConvertibleImpl<kFloatingPoint, From, kBool, bool>
-    : public std::false_type {};
-
-// Converting a floating-point to an integer is lossy.
-template <typename From, typename To>
-struct LosslessArithmeticConvertibleImpl<kFloatingPoint, From, kInteger, To>
-    : public std::false_type {};
-
-// Converting a floating-point to another floating-point is lossless
-// if and only if the target type is at least as big as the source type.
-template <typename From, typename To>
-struct LosslessArithmeticConvertibleImpl<
-  kFloatingPoint, From, kFloatingPoint, To>
-    : public bool_constant<sizeof(From) <= sizeof(To)> {};  // NOLINT
-
-// LosslessArithmeticConvertible<From, To>::value is true if and only if
-// arithmetic type From can be losslessly converted to arithmetic type To.
-//
-// It's the user's responsibility to ensure that both From and To are
-// raw (i.e. has no CV modifier, is not a pointer, and is not a
-// reference) built-in arithmetic types; the value is
-// implementation-defined when the above pre-condition is violated.
-template <typename From, typename To>
-struct LosslessArithmeticConvertible
-    : public LosslessArithmeticConvertibleImpl<
-  GMOCK_KIND_OF_(From), From, GMOCK_KIND_OF_(To), To> {};  // NOLINT
-
-// This interface knows how to report a Google Mock failure (either
-// non-fatal or fatal).
-class FailureReporterInterface {
- public:
-  // The type of a failure (either non-fatal or fatal).
-  enum FailureType {
-    kNonfatal, kFatal
-  };
-
-  virtual ~FailureReporterInterface() {}
-
-  // Reports a failure that occurred at the given source file location.
-  virtual void ReportFailure(FailureType type, const char* file, int line,
-                             const std::string& message) = 0;
-};
-
-// Returns the failure reporter used by Google Mock.
-GTEST_API_ FailureReporterInterface* GetFailureReporter();
-
-// Asserts that condition is true; aborts the process with the given
-// message if condition is false.  We cannot use LOG(FATAL) or CHECK()
-// as Google Mock might be used to mock the log sink itself.  We
-// inline this function to prevent it from showing up in the stack
-// trace.
-inline void Assert(bool condition, const char* file, int line,
-                   const std::string& msg) {
-  if (!condition) {
-    GetFailureReporter()->ReportFailure(FailureReporterInterface::kFatal,
-                                        file, line, msg);
-  }
-}
-inline void Assert(bool condition, const char* file, int line) {
-  Assert(condition, file, line, "Assertion failed.");
-}
-
-// Verifies that condition is true; generates a non-fatal failure if
-// condition is false.
-inline void Expect(bool condition, const char* file, int line,
-                   const std::string& msg) {
-  if (!condition) {
-    GetFailureReporter()->ReportFailure(FailureReporterInterface::kNonfatal,
-                                        file, line, msg);
-  }
-}
-inline void Expect(bool condition, const char* file, int line) {
-  Expect(condition, file, line, "Expectation failed.");
-}
-
-// Severity level of a log.
-enum LogSeverity {
-  kInfo = 0,
-  kWarning = 1
-};
-
-// Valid values for the --gmock_verbose flag.
-
-// All logs (informational and warnings) are printed.
-const char kInfoVerbosity[] = "info";
-// Only warnings are printed.
-const char kWarningVerbosity[] = "warning";
-// No logs are printed.
-const char kErrorVerbosity[] = "error";
-
-// Returns true if and only if a log with the given severity is visible
-// according to the --gmock_verbose flag.
-GTEST_API_ bool LogIsVisible(LogSeverity severity);
-
-// Prints the given message to stdout if and only if 'severity' >= the level
-// specified by the --gmock_verbose flag.  If stack_frames_to_skip >=
-// 0, also prints the stack trace excluding the top
-// stack_frames_to_skip frames.  In opt mode, any positive
-// stack_frames_to_skip is treated as 0, since we don't know which
-// function calls will be inlined by the compiler and need to be
-// conservative.
-GTEST_API_ void Log(LogSeverity severity, const std::string& message,
-                    int stack_frames_to_skip);
-
-// A marker class that is used to resolve parameterless expectations to the
-// correct overload. This must not be instantiable, to prevent client code from
-// accidentally resolving to the overload; for example:
-//
-//    ON_CALL(mock, Method({}, nullptr))...
-//
-class WithoutMatchers {
- private:
-  WithoutMatchers() {}
-  friend GTEST_API_ WithoutMatchers GetWithoutMatchers();
-};
-
-// Internal use only: access the singleton instance of WithoutMatchers.
-GTEST_API_ WithoutMatchers GetWithoutMatchers();
-
-// Type traits.
-
-// Disable MSVC warnings for infinite recursion, since in this case the
-// the recursion is unreachable.
-#ifdef _MSC_VER
-# pragma warning(push)
-# pragma warning(disable:4717)
-#endif
-
-// Invalid<T>() is usable as an expression of type T, but will terminate
-// the program with an assertion failure if actually run.  This is useful
-// when a value of type T is needed for compilation, but the statement
-// will not really be executed (or we don't care if the statement
-// crashes).
-template <typename T>
-inline T Invalid() {
-  Assert(false, "", -1, "Internal error: attempt to return invalid value");
-  // This statement is unreachable, and would never terminate even if it
-  // could be reached. It is provided only to placate compiler warnings
-  // about missing return statements.
-  return Invalid<T>();
-}
-
-#ifdef _MSC_VER
-# pragma warning(pop)
-#endif
-
-// Given a raw type (i.e. having no top-level reference or const
-// modifier) RawContainer that's either an STL-style container or a
-// native array, class StlContainerView<RawContainer> has the
-// following members:
-//
-//   - type is a type that provides an STL-style container view to
-//     (i.e. implements the STL container concept for) RawContainer;
-//   - const_reference is a type that provides a reference to a const
-//     RawContainer;
-//   - ConstReference(raw_container) returns a const reference to an STL-style
-//     container view to raw_container, which is a RawContainer.
-//   - Copy(raw_container) returns an STL-style container view of a
-//     copy of raw_container, which is a RawContainer.
-//
-// This generic version is used when RawContainer itself is already an
-// STL-style container.
-template <class RawContainer>
-class StlContainerView {
- public:
-  typedef RawContainer type;
-  typedef const type& const_reference;
-
-  static const_reference ConstReference(const RawContainer& container) {
-    static_assert(!std::is_const<RawContainer>::value,
-                  "RawContainer type must not be const");
-    return container;
-  }
-  static type Copy(const RawContainer& container) { return container; }
-};
-
-// This specialization is used when RawContainer is a native array type.
-template <typename Element, size_t N>
-class StlContainerView<Element[N]> {
- public:
-  typedef typename std::remove_const<Element>::type RawElement;
-  typedef internal::NativeArray<RawElement> type;
-  // NativeArray<T> can represent a native array either by value or by
-  // reference (selected by a constructor argument), so 'const type'
-  // can be used to reference a const native array.  We cannot
-  // 'typedef const type& const_reference' here, as that would mean
-  // ConstReference() has to return a reference to a local variable.
-  typedef const type const_reference;
-
-  static const_reference ConstReference(const Element (&array)[N]) {
-    static_assert(std::is_same<Element, RawElement>::value,
-                  "Element type must not be const");
-    return type(array, N, RelationToSourceReference());
-  }
-  static type Copy(const Element (&array)[N]) {
-    return type(array, N, RelationToSourceCopy());
-  }
-};
-
-// This specialization is used when RawContainer is a native array
-// represented as a (pointer, size) tuple.
-template <typename ElementPointer, typename Size>
-class StlContainerView< ::std::tuple<ElementPointer, Size> > {
- public:
-  typedef typename std::remove_const<
-      typename internal::PointeeOf<ElementPointer>::type>::type RawElement;
-  typedef internal::NativeArray<RawElement> type;
-  typedef const type const_reference;
-
-  static const_reference ConstReference(
-      const ::std::tuple<ElementPointer, Size>& array) {
-    return type(std::get<0>(array), std::get<1>(array),
-                RelationToSourceReference());
-  }
-  static type Copy(const ::std::tuple<ElementPointer, Size>& array) {
-    return type(std::get<0>(array), std::get<1>(array), RelationToSourceCopy());
-  }
-};
-
-// The following specialization prevents the user from instantiating
-// StlContainer with a reference type.
-template <typename T> class StlContainerView<T&>;
-
-// A type transform to remove constness from the first part of a pair.
-// Pairs like that are used as the value_type of associative containers,
-// and this transform produces a similar but assignable pair.
-template <typename T>
-struct RemoveConstFromKey {
-  typedef T type;
-};
-
-// Partially specialized to remove constness from std::pair<const K, V>.
-template <typename K, typename V>
-struct RemoveConstFromKey<std::pair<const K, V> > {
-  typedef std::pair<K, V> type;
-};
-
-// Emit an assertion failure due to incorrect DoDefault() usage. Out-of-lined to
-// reduce code size.
-GTEST_API_ void IllegalDoDefault(const char* file, int line);
-
-template <typename F, typename Tuple, size_t... Idx>
-auto ApplyImpl(F&& f, Tuple&& args, IndexSequence<Idx...>) -> decltype(
-    std::forward<F>(f)(std::get<Idx>(std::forward<Tuple>(args))...)) {
-  return std::forward<F>(f)(std::get<Idx>(std::forward<Tuple>(args))...);
-}
-
-// Apply the function to a tuple of arguments.
-template <typename F, typename Tuple>
-auto Apply(F&& f, Tuple&& args)
-    -> decltype(ApplyImpl(std::forward<F>(f), std::forward<Tuple>(args),
-                          MakeIndexSequence<std::tuple_size<Tuple>::value>())) {
-  return ApplyImpl(std::forward<F>(f), std::forward<Tuple>(args),
-                   MakeIndexSequence<std::tuple_size<Tuple>::value>());
-}
-
-// Template struct Function<F>, where F must be a function type, contains
-// the following typedefs:
-//
-//   Result:               the function's return type.
-//   Arg<N>:               the type of the N-th argument, where N starts with 0.
-//   ArgumentTuple:        the tuple type consisting of all parameters of F.
-//   ArgumentMatcherTuple: the tuple type consisting of Matchers for all
-//                         parameters of F.
-//   MakeResultVoid:       the function type obtained by substituting void
-//                         for the return type of F.
-//   MakeResultIgnoredValue:
-//                         the function type obtained by substituting Something
-//                         for the return type of F.
-template <typename T>
-struct Function;
-
-template <typename R, typename... Args>
-struct Function<R(Args...)> {
-  using Result = R;
-  static constexpr size_t ArgumentCount = sizeof...(Args);
-  template <size_t I>
-  using Arg = ElemFromList<I, typename MakeIndexSequence<sizeof...(Args)>::type,
-                           Args...>;
-  using ArgumentTuple = std::tuple<Args...>;
-  using ArgumentMatcherTuple = std::tuple<Matcher<Args>...>;
-  using MakeResultVoid = void(Args...);
-  using MakeResultIgnoredValue = IgnoredValue(Args...);
-};
-
-template <typename R, typename... Args>
-constexpr size_t Function<R(Args...)>::ArgumentCount;
-
-#ifdef _MSC_VER
-# pragma warning(pop)
-#endif
-
-}  // namespace internal
-}  // namespace testing
-
-#endif  // GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_INTERNAL_UTILS_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/internal/gmock-port.h b/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/internal/gmock-port.h
deleted file mode 100644
index 27e4c0caf2b..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/internal/gmock-port.h
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-//
-// Low-level types and utilities for porting Google Mock to various
-// platforms.  All macros ending with _ and symbols defined in an
-// internal namespace are subject to change without notice.  Code
-// outside Google Mock MUST NOT USE THEM DIRECTLY.  Macros that don't
-// end with _ are part of Google Mock's public API and can be used by
-// code outside Google Mock.
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-// IWYU pragma: private, include "gmock/gmock.h"
-
-#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_
-#define GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_
-
-#include <assert.h>
-#include <stdlib.h>
-#include <iostream>
-
-// Most of the utilities needed for porting Google Mock are also
-// required for Google Test and are defined in gtest-port.h.
-//
-// Note to maintainers: to reduce code duplication, prefer adding
-// portability utilities to Google Test's gtest-port.h instead of
-// here, as Google Mock depends on Google Test.  Only add a utility
-// here if it's truly specific to Google Mock.
-
-#include "gtest/internal/gtest-port.h"
-#include "gmock/internal/custom/gmock-port.h"
-
-// For MS Visual C++, check the compiler version. At least VS 2015 is
-// required to compile Google Mock.
-#if defined(_MSC_VER) && _MSC_VER < 1900
-# error "At least Visual C++ 2015 (14.0) is required to compile Google Mock."
-#endif
-
-// Macro for referencing flags.  This is public as we want the user to
-// use this syntax to reference Google Mock flags.
-#define GMOCK_FLAG(name) FLAGS_gmock_##name
-
-#if !defined(GMOCK_DECLARE_bool_)
-
-// Macros for declaring flags.
-# define GMOCK_DECLARE_bool_(name) extern GTEST_API_ bool GMOCK_FLAG(name)
-# define GMOCK_DECLARE_int32_(name) \
-    extern GTEST_API_ ::testing::internal::Int32 GMOCK_FLAG(name)
-# define GMOCK_DECLARE_string_(name) \
-    extern GTEST_API_ ::std::string GMOCK_FLAG(name)
-
-// Macros for defining flags.
-# define GMOCK_DEFINE_bool_(name, default_val, doc) \
-    GTEST_API_ bool GMOCK_FLAG(name) = (default_val)
-# define GMOCK_DEFINE_int32_(name, default_val, doc) \
-    GTEST_API_ ::testing::internal::Int32 GMOCK_FLAG(name) = (default_val)
-# define GMOCK_DEFINE_string_(name, default_val, doc) \
-    GTEST_API_ ::std::string GMOCK_FLAG(name) = (default_val)
-
-#endif  // !defined(GMOCK_DECLARE_bool_)
-
-#endif  // GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/internal/gmock-pp.h b/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/internal/gmock-pp.h
deleted file mode 100644
index 1ab80e1cdbe..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googlemock/include/gmock/internal/gmock-pp.h
+++ /dev/null
@@ -1,317 +0,0 @@
-#ifndef THIRD_PARTY_GOOGLETEST_GOOGLEMOCK_INCLUDE_GMOCK_PP_H_
-#define THIRD_PARTY_GOOGLETEST_GOOGLEMOCK_INCLUDE_GMOCK_PP_H_
-
-#undef GMOCK_PP_INTERNAL_USE_MSVC
-#if defined(__clang__)
-#define GMOCK_PP_INTERNAL_USE_MSVC 0
-#elif defined(_MSC_VER)
-// TODO(iserna): Also verify tradional versus comformant preprocessor.
-static_assert(
-    _MSC_VER >= 1900,
-    "MSVC version not supported. There is support for MSVC 14.0 and above.");
-#define GMOCK_PP_INTERNAL_USE_MSVC 1
-#else
-#define GMOCK_PP_INTERNAL_USE_MSVC 0
-#endif
-
-// Expands and concatenates the arguments. Constructed macros reevaluate.
-#define GMOCK_PP_CAT(_1, _2) GMOCK_PP_INTERNAL_CAT(_1, _2)
-
-// Expands and stringifies the only argument.
-#define GMOCK_PP_STRINGIZE(...) GMOCK_PP_INTERNAL_STRINGIZE(__VA_ARGS__)
-
-// Returns empty. Given a variadic number of arguments.
-#define GMOCK_PP_EMPTY(...)
-
-// Returns a comma. Given a variadic number of arguments.
-#define GMOCK_PP_COMMA(...) ,
-
-// Returns the only argument.
-#define GMOCK_PP_IDENTITY(_1) _1
-
-// MSVC preprocessor collapses __VA_ARGS__ in a single argument, we use a
-// CAT-like directive to force correct evaluation. Each macro has its own.
-#if GMOCK_PP_INTERNAL_USE_MSVC
-
-// Evaluates to the number of arguments after expansion.
-//
-//   #define PAIR x, y
-//
-//   GMOCK_PP_NARG() => 1
-//   GMOCK_PP_NARG(x) => 1
-//   GMOCK_PP_NARG(x, y) => 2
-//   GMOCK_PP_NARG(PAIR) => 2
-//
-// Requires: the number of arguments after expansion is at most 15.
-#define GMOCK_PP_NARG(...)                                                    \
-  GMOCK_PP_INTERNAL_NARG_CAT(                                                 \
-      GMOCK_PP_INTERNAL_INTERNAL_16TH(__VA_ARGS__, 15, 14, 13, 12, 11, 10, 9, \
-                                      8, 7, 6, 5, 4, 3, 2, 1), )
-
-// Returns 1 if the expansion of arguments has an unprotected comma. Otherwise
-// returns 0. Requires no more than 15 unprotected commas.
-#define GMOCK_PP_HAS_COMMA(...)                                               \
-  GMOCK_PP_INTERNAL_HAS_COMMA_CAT(                                            \
-      GMOCK_PP_INTERNAL_INTERNAL_16TH(__VA_ARGS__, 1, 1, 1, 1, 1, 1, 1, 1, 1, \
-                                      1, 1, 1, 1, 1, 0), )
-// Returns the first argument.
-#define GMOCK_PP_HEAD(...) \
-  GMOCK_PP_INTERNAL_HEAD_CAT(GMOCK_PP_INTERNAL_HEAD(__VA_ARGS__), )
-
-// Returns the tail. A variadic list of all arguments minus the first. Requires
-// at least one argument.
-#define GMOCK_PP_TAIL(...) \
-  GMOCK_PP_INTERNAL_TAIL_CAT(GMOCK_PP_INTERNAL_TAIL(__VA_ARGS__), )
-
-// Calls CAT(_Macro, NARG(__VA_ARGS__))(__VA_ARGS__)
-#define GMOCK_PP_VARIADIC_CALL(_Macro, ...) \
-  GMOCK_PP_INTERNAL_VARIADIC_CALL_CAT(      \
-      GMOCK_PP_CAT(_Macro, GMOCK_PP_NARG(__VA_ARGS__))(__VA_ARGS__), )
-
-#else  // GMOCK_PP_INTERNAL_USE_MSVC
-
-#define GMOCK_PP_NARG(...)                                                   \
-  GMOCK_PP_INTERNAL_INTERNAL_16TH(__VA_ARGS__, 15, 14, 13, 12, 11, 10, 9, 8, \
-                                  7, 6, 5, 4, 3, 2, 1)
-#define GMOCK_PP_HAS_COMMA(...)                                              \
-  GMOCK_PP_INTERNAL_INTERNAL_16TH(__VA_ARGS__, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \
-                                  1, 1, 1, 1, 0)
-#define GMOCK_PP_HEAD(...) GMOCK_PP_INTERNAL_HEAD(__VA_ARGS__)
-#define GMOCK_PP_TAIL(...) GMOCK_PP_INTERNAL_TAIL(__VA_ARGS__)
-#define GMOCK_PP_VARIADIC_CALL(_Macro, ...) \
-  GMOCK_PP_CAT(_Macro, GMOCK_PP_NARG(__VA_ARGS__))(__VA_ARGS__)
-
-#endif  // GMOCK_PP_INTERNAL_USE_MSVC
-
-// If the arguments after expansion have no tokens, evaluates to `1`. Otherwise
-// evaluates to `0`.
-//
-// Requires: * the number of arguments after expansion is at most 15.
-//           * If the argument is a macro, it must be able to be called with one
-//             argument.
-//
-// Implementation details:
-//
-// There is one case when it generates a compile error: if the argument is macro
-// that cannot be called with one argument.
-//
-//   #define M(a, b)  // it doesn't matter what it expands to
-//
-//   // Expected: expands to `0`.
-//   // Actual: compile error.
-//   GMOCK_PP_IS_EMPTY(M)
-//
-// There are 4 cases tested:
-//
-// * __VA_ARGS__ possible expansion has no unparen'd commas. Expected 0.
-// * __VA_ARGS__ possible expansion is not enclosed in parenthesis. Expected 0.
-// * __VA_ARGS__ possible expansion is not a macro that ()-evaluates to a comma.
-//   Expected 0
-// * __VA_ARGS__ is empty, or has unparen'd commas, or is enclosed in
-//   parenthesis, or is a macro that ()-evaluates to comma. Expected 1.
-//
-// We trigger detection on '0001', i.e. on empty.
-#define GMOCK_PP_IS_EMPTY(...)                                               \
-  GMOCK_PP_INTERNAL_IS_EMPTY(GMOCK_PP_HAS_COMMA(__VA_ARGS__),                \
-                             GMOCK_PP_HAS_COMMA(GMOCK_PP_COMMA __VA_ARGS__), \
-                             GMOCK_PP_HAS_COMMA(__VA_ARGS__()),              \
-                             GMOCK_PP_HAS_COMMA(GMOCK_PP_COMMA __VA_ARGS__()))
-
-// Evaluates to _Then if _Cond is 1 and _Else if _Cond is 0.
-#define GMOCK_PP_IF(_Cond, _Then, _Else) \
-  GMOCK_PP_CAT(GMOCK_PP_INTERNAL_IF_, _Cond)(_Then, _Else)
-
-// Evaluates to the number of arguments after expansion. Identifies 'empty' as
-// 0.
-//
-//   #define PAIR x, y
-//
-//   GMOCK_PP_NARG0() => 0
-//   GMOCK_PP_NARG0(x) => 1
-//   GMOCK_PP_NARG0(x, y) => 2
-//   GMOCK_PP_NARG0(PAIR) => 2
-//
-// Requires: * the number of arguments after expansion is at most 15.
-//           * If the argument is a macro, it must be able to be called with one
-//             argument.
-#define GMOCK_PP_NARG0(...) \
-  GMOCK_PP_IF(GMOCK_PP_IS_EMPTY(__VA_ARGS__), 0, GMOCK_PP_NARG(__VA_ARGS__))
-
-// Expands to 1 if the first argument starts with something in parentheses,
-// otherwise to 0.
-#define GMOCK_PP_IS_BEGIN_PARENS(...)                    \
-  GMOCK_PP_INTERNAL_ALTERNATE_HEAD(                      \
-      GMOCK_PP_CAT(GMOCK_PP_INTERNAL_IBP_IS_VARIADIC_R_, \
-                   GMOCK_PP_INTERNAL_IBP_IS_VARIADIC_C __VA_ARGS__))
-
-// Expands to 1 is there is only one argument and it is enclosed in parentheses.
-#define GMOCK_PP_IS_ENCLOSED_PARENS(...)             \
-  GMOCK_PP_IF(GMOCK_PP_IS_BEGIN_PARENS(__VA_ARGS__), \
-              GMOCK_PP_IS_EMPTY(GMOCK_PP_EMPTY __VA_ARGS__), 0)
-
-// Remove the parens, requires GMOCK_PP_IS_ENCLOSED_PARENS(args) => 1.
-#define GMOCK_PP_REMOVE_PARENS(...) GMOCK_PP_INTERNAL_REMOVE_PARENS __VA_ARGS__
-
-// Expands to _Macro(0, _Data, e1) _Macro(1, _Data, e2) ... _Macro(K -1, _Data,
-// eK) as many of GMOCK_INTERNAL_NARG0 _Tuple.
-// Requires: * |_Macro| can be called with 3 arguments.
-//           * |_Tuple| expansion has no more than 15 elements.
-#define GMOCK_PP_FOR_EACH(_Macro, _Data, _Tuple)                        \
-  GMOCK_PP_CAT(GMOCK_PP_INTERNAL_FOR_EACH_IMPL_, GMOCK_PP_NARG0 _Tuple) \
-  (0, _Macro, _Data, _Tuple)
-
-// Expands to _Macro(0, _Data, ) _Macro(1, _Data, ) ... _Macro(K - 1, _Data, )
-// Empty if _K = 0.
-// Requires: * |_Macro| can be called with 3 arguments.
-//           * |_K| literal between 0 and 15
-#define GMOCK_PP_REPEAT(_Macro, _Data, _N)           \
-  GMOCK_PP_CAT(GMOCK_PP_INTERNAL_FOR_EACH_IMPL_, _N) \
-  (0, _Macro, _Data, GMOCK_PP_INTENRAL_EMPTY_TUPLE)
-
-// Increments the argument, requires the argument to be between 0 and 15.
-#define GMOCK_PP_INC(_i) GMOCK_PP_CAT(GMOCK_PP_INTERNAL_INC_, _i)
-
-// Returns comma if _i != 0. Requires _i to be between 0 and 15.
-#define GMOCK_PP_COMMA_IF(_i) GMOCK_PP_CAT(GMOCK_PP_INTERNAL_COMMA_IF_, _i)
-
-// Internal details follow. Do not use any of these symbols outside of this
-// file or we will break your code.
-#define GMOCK_PP_INTENRAL_EMPTY_TUPLE (, , , , , , , , , , , , , , , )
-#define GMOCK_PP_INTERNAL_CAT(_1, _2) _1##_2
-#define GMOCK_PP_INTERNAL_STRINGIZE(...) #__VA_ARGS__
-#define GMOCK_PP_INTERNAL_INTERNAL_16TH(_1, _2, _3, _4, _5, _6, _7, _8, _9, \
-                                        _10, _11, _12, _13, _14, _15, _16,  \
-                                        ...)                                \
-  _16
-#define GMOCK_PP_INTERNAL_CAT_5(_1, _2, _3, _4, _5) _1##_2##_3##_4##_5
-#define GMOCK_PP_INTERNAL_IS_EMPTY(_1, _2, _3, _4)                             \
-  GMOCK_PP_HAS_COMMA(GMOCK_PP_INTERNAL_CAT_5(GMOCK_PP_INTERNAL_IS_EMPTY_CASE_, \
-                                             _1, _2, _3, _4))
-#define GMOCK_PP_INTERNAL_IS_EMPTY_CASE_0001 ,
-#define GMOCK_PP_INTERNAL_IF_1(_Then, _Else) _Then
-#define GMOCK_PP_INTERNAL_IF_0(_Then, _Else) _Else
-#define GMOCK_PP_INTERNAL_HEAD(_1, ...) _1
-#define GMOCK_PP_INTERNAL_TAIL(_1, ...) __VA_ARGS__
-
-#if GMOCK_PP_INTERNAL_USE_MSVC
-#define GMOCK_PP_INTERNAL_NARG_CAT(_1, _2) GMOCK_PP_INTERNAL_NARG_CAT_I(_1, _2)
-#define GMOCK_PP_INTERNAL_HEAD_CAT(_1, _2) GMOCK_PP_INTERNAL_HEAD_CAT_I(_1, _2)
-#define GMOCK_PP_INTERNAL_HAS_COMMA_CAT(_1, _2) \
-  GMOCK_PP_INTERNAL_HAS_COMMA_CAT_I(_1, _2)
-#define GMOCK_PP_INTERNAL_TAIL_CAT(_1, _2) GMOCK_PP_INTERNAL_TAIL_CAT_I(_1, _2)
-#define GMOCK_PP_INTERNAL_VARIADIC_CALL_CAT(_1, _2) \
-  GMOCK_PP_INTERNAL_VARIADIC_CALL_CAT_I(_1, _2)
-#define GMOCK_PP_INTERNAL_NARG_CAT_I(_1, _2) _1##_2
-#define GMOCK_PP_INTERNAL_HEAD_CAT_I(_1, _2) _1##_2
-#define GMOCK_PP_INTERNAL_HAS_COMMA_CAT_I(_1, _2) _1##_2
-#define GMOCK_PP_INTERNAL_TAIL_CAT_I(_1, _2) _1##_2
-#define GMOCK_PP_INTERNAL_VARIADIC_CALL_CAT_I(_1, _2) _1##_2
-#define GMOCK_PP_INTERNAL_ALTERNATE_HEAD(...) \
-  GMOCK_PP_INTERNAL_ALTERNATE_HEAD_CAT(GMOCK_PP_HEAD(__VA_ARGS__), )
-#define GMOCK_PP_INTERNAL_ALTERNATE_HEAD_CAT(_1, _2) \
-  GMOCK_PP_INTERNAL_ALTERNATE_HEAD_CAT_I(_1, _2)
-#define GMOCK_PP_INTERNAL_ALTERNATE_HEAD_CAT_I(_1, _2) _1##_2
-#else  // GMOCK_PP_INTERNAL_USE_MSVC
-#define GMOCK_PP_INTERNAL_ALTERNATE_HEAD(...) GMOCK_PP_HEAD(__VA_ARGS__)
-#endif  // GMOCK_PP_INTERNAL_USE_MSVC
-
-#define GMOCK_PP_INTERNAL_IBP_IS_VARIADIC_C(...) 1 _
-#define GMOCK_PP_INTERNAL_IBP_IS_VARIADIC_R_1 1,
-#define GMOCK_PP_INTERNAL_IBP_IS_VARIADIC_R_GMOCK_PP_INTERNAL_IBP_IS_VARIADIC_C \
-  0,
-#define GMOCK_PP_INTERNAL_REMOVE_PARENS(...) __VA_ARGS__
-#define GMOCK_PP_INTERNAL_INC_0 1
-#define GMOCK_PP_INTERNAL_INC_1 2
-#define GMOCK_PP_INTERNAL_INC_2 3
-#define GMOCK_PP_INTERNAL_INC_3 4
-#define GMOCK_PP_INTERNAL_INC_4 5
-#define GMOCK_PP_INTERNAL_INC_5 6
-#define GMOCK_PP_INTERNAL_INC_6 7
-#define GMOCK_PP_INTERNAL_INC_7 8
-#define GMOCK_PP_INTERNAL_INC_8 9
-#define GMOCK_PP_INTERNAL_INC_9 10
-#define GMOCK_PP_INTERNAL_INC_10 11
-#define GMOCK_PP_INTERNAL_INC_11 12
-#define GMOCK_PP_INTERNAL_INC_12 13
-#define GMOCK_PP_INTERNAL_INC_13 14
-#define GMOCK_PP_INTERNAL_INC_14 15
-#define GMOCK_PP_INTERNAL_INC_15 16
-#define GMOCK_PP_INTERNAL_COMMA_IF_0
-#define GMOCK_PP_INTERNAL_COMMA_IF_1 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_2 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_3 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_4 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_5 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_6 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_7 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_8 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_9 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_10 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_11 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_12 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_13 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_14 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_15 ,
-#define GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, _element) \
-  _Macro(_i, _Data, _element)
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_0(_i, _Macro, _Data, _Tuple)
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_1(_i, _Macro, _Data, _Tuple) \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple)
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_2(_i, _Macro, _Data, _Tuple)    \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_1(GMOCK_PP_INC(_i), _Macro, _Data,    \
-                                    (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_3(_i, _Macro, _Data, _Tuple)    \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_2(GMOCK_PP_INC(_i), _Macro, _Data,    \
-                                    (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_4(_i, _Macro, _Data, _Tuple)    \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_3(GMOCK_PP_INC(_i), _Macro, _Data,    \
-                                    (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_5(_i, _Macro, _Data, _Tuple)    \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_4(GMOCK_PP_INC(_i), _Macro, _Data,    \
-                                    (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_6(_i, _Macro, _Data, _Tuple)    \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_5(GMOCK_PP_INC(_i), _Macro, _Data,    \
-                                    (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_7(_i, _Macro, _Data, _Tuple)    \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_6(GMOCK_PP_INC(_i), _Macro, _Data,    \
-                                    (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_8(_i, _Macro, _Data, _Tuple)    \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_7(GMOCK_PP_INC(_i), _Macro, _Data,    \
-                                    (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_9(_i, _Macro, _Data, _Tuple)    \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_8(GMOCK_PP_INC(_i), _Macro, _Data,    \
-                                    (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_10(_i, _Macro, _Data, _Tuple)   \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_9(GMOCK_PP_INC(_i), _Macro, _Data,    \
-                                    (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_11(_i, _Macro, _Data, _Tuple)   \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_10(GMOCK_PP_INC(_i), _Macro, _Data,   \
-                                     (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_12(_i, _Macro, _Data, _Tuple)   \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_11(GMOCK_PP_INC(_i), _Macro, _Data,   \
-                                     (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_13(_i, _Macro, _Data, _Tuple)   \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_12(GMOCK_PP_INC(_i), _Macro, _Data,   \
-                                     (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_14(_i, _Macro, _Data, _Tuple)   \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_13(GMOCK_PP_INC(_i), _Macro, _Data,   \
-                                     (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_15(_i, _Macro, _Data, _Tuple)   \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_14(GMOCK_PP_INC(_i), _Macro, _Data,   \
-                                     (GMOCK_PP_TAIL _Tuple))
-
-#endif  // THIRD_PARTY_GOOGLETEST_GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PP_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googlemock/src/gmock-all.cc b/gnu/llvm/llvm/utils/unittest/googlemock/src/gmock-all.cc
deleted file mode 100644
index e43c9b7b4c1..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googlemock/src/gmock-all.cc
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-//
-// Google C++ Mocking Framework (Google Mock)
-//
-// This file #includes all Google Mock implementation .cc files.  The
-// purpose is to allow a user to build Google Mock by compiling this
-// file alone.
-
-// This line ensures that gmock.h can be compiled on its own, even
-// when it's fused.
-#include "gmock/gmock.h"
-
-// The following lines pull in the real gmock *.cc files.
-#include "src/gmock-cardinalities.cc"
-#include "src/gmock-internal-utils.cc"
-#include "src/gmock-matchers.cc"
-#include "src/gmock-spec-builders.cc"
-#include "src/gmock.cc"
diff --git a/gnu/llvm/llvm/utils/unittest/googlemock/src/gmock-cardinalities.cc b/gnu/llvm/llvm/utils/unittest/googlemock/src/gmock-cardinalities.cc
deleted file mode 100644
index 7463f438323..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googlemock/src/gmock-cardinalities.cc
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file implements cardinalities.
-
-#include "gmock/gmock-cardinalities.h"
-
-#include <limits.h>
-#include <ostream>  // NOLINT
-#include <sstream>
-#include <string>
-#include "gmock/internal/gmock-internal-utils.h"
-#include "gtest/gtest.h"
-
-namespace testing {
-
-namespace {
-
-// Implements the Between(m, n) cardinality.
-class BetweenCardinalityImpl : public CardinalityInterface {
- public:
-  BetweenCardinalityImpl(int min, int max)
-      : min_(min >= 0 ? min : 0),
-        max_(max >= min_ ? max : min_) {
-    std::stringstream ss;
-    if (min < 0) {
-      ss << "The invocation lower bound must be >= 0, "
-         << "but is actually " << min << ".";
-      internal::Expect(false, __FILE__, __LINE__, ss.str());
-    } else if (max < 0) {
-      ss << "The invocation upper bound must be >= 0, "
-         << "but is actually " << max << ".";
-      internal::Expect(false, __FILE__, __LINE__, ss.str());
-    } else if (min > max) {
-      ss << "The invocation upper bound (" << max
-         << ") must be >= the invocation lower bound (" << min
-         << ").";
-      internal::Expect(false, __FILE__, __LINE__, ss.str());
-    }
-  }
-
-  // Conservative estimate on the lower/upper bound of the number of
-  // calls allowed.
-  int ConservativeLowerBound() const override { return min_; }
-  int ConservativeUpperBound() const override { return max_; }
-
-  bool IsSatisfiedByCallCount(int call_count) const override {
-    return min_ <= call_count && call_count <= max_;
-  }
-
-  bool IsSaturatedByCallCount(int call_count) const override {
-    return call_count >= max_;
-  }
-
-  void DescribeTo(::std::ostream* os) const override;
-
- private:
-  const int min_;
-  const int max_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(BetweenCardinalityImpl);
-};
-
-// Formats "n times" in a human-friendly way.
-inline std::string FormatTimes(int n) {
-  if (n == 1) {
-    return "once";
-  } else if (n == 2) {
-    return "twice";
-  } else {
-    std::stringstream ss;
-    ss << n << " times";
-    return ss.str();
-  }
-}
-
-// Describes the Between(m, n) cardinality in human-friendly text.
-void BetweenCardinalityImpl::DescribeTo(::std::ostream* os) const {
-  if (min_ == 0) {
-    if (max_ == 0) {
-      *os << "never called";
-    } else if (max_ == INT_MAX) {
-      *os << "called any number of times";
-    } else {
-      *os << "called at most " << FormatTimes(max_);
-    }
-  } else if (min_ == max_) {
-    *os << "called " << FormatTimes(min_);
-  } else if (max_ == INT_MAX) {
-    *os << "called at least " << FormatTimes(min_);
-  } else {
-    // 0 < min_ < max_ < INT_MAX
-    *os << "called between " << min_ << " and " << max_ << " times";
-  }
-}
-
-}  // Unnamed namespace
-
-// Describes the given call count to an ostream.
-void Cardinality::DescribeActualCallCountTo(int actual_call_count,
-                                            ::std::ostream* os) {
-  if (actual_call_count > 0) {
-    *os << "called " << FormatTimes(actual_call_count);
-  } else {
-    *os << "never called";
-  }
-}
-
-// Creates a cardinality that allows at least n calls.
-GTEST_API_ Cardinality AtLeast(int n) { return Between(n, INT_MAX); }
-
-// Creates a cardinality that allows at most n calls.
-GTEST_API_ Cardinality AtMost(int n) { return Between(0, n); }
-
-// Creates a cardinality that allows any number of calls.
-GTEST_API_ Cardinality AnyNumber() { return AtLeast(0); }
-
-// Creates a cardinality that allows between min and max calls.
-GTEST_API_ Cardinality Between(int min, int max) {
-  return Cardinality(new BetweenCardinalityImpl(min, max));
-}
-
-// Creates a cardinality that allows exactly n calls.
-GTEST_API_ Cardinality Exactly(int n) { return Between(n, n); }
-
-}  // namespace testing
diff --git a/gnu/llvm/llvm/utils/unittest/googlemock/src/gmock-internal-utils.cc b/gnu/llvm/llvm/utils/unittest/googlemock/src/gmock-internal-utils.cc
deleted file mode 100644
index e5b547981d1..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googlemock/src/gmock-internal-utils.cc
+++ /dev/null
@@ -1,200 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file defines some utilities useful for implementing Google
-// Mock.  They are subject to change without notice, so please DO NOT
-// USE THEM IN USER CODE.
-
-#include "gmock/internal/gmock-internal-utils.h"
-
-#include <ctype.h>
-#include <ostream>  // NOLINT
-#include <string>
-#include "gmock/gmock.h"
-#include "gmock/internal/gmock-port.h"
-#include "gtest/gtest.h"
-
-namespace testing {
-namespace internal {
-
-// Joins a vector of strings as if they are fields of a tuple; returns
-// the joined string.
-GTEST_API_ std::string JoinAsTuple(const Strings& fields) {
-  switch (fields.size()) {
-    case 0:
-      return "";
-    case 1:
-      return fields[0];
-    default:
-      std::string result = "(" + fields[0];
-      for (size_t i = 1; i < fields.size(); i++) {
-        result += ", ";
-        result += fields[i];
-      }
-      result += ")";
-      return result;
-  }
-}
-
-// Converts an identifier name to a space-separated list of lower-case
-// words.  Each maximum substring of the form [A-Za-z][a-z]*|\d+ is
-// treated as one word.  For example, both "FooBar123" and
-// "foo_bar_123" are converted to "foo bar 123".
-GTEST_API_ std::string ConvertIdentifierNameToWords(const char* id_name) {
-  std::string result;
-  char prev_char = '\0';
-  for (const char* p = id_name; *p != '\0'; prev_char = *(p++)) {
-    // We don't care about the current locale as the input is
-    // guaranteed to be a valid C++ identifier name.
-    const bool starts_new_word = IsUpper(*p) ||
-        (!IsAlpha(prev_char) && IsLower(*p)) ||
-        (!IsDigit(prev_char) && IsDigit(*p));
-
-    if (IsAlNum(*p)) {
-      if (starts_new_word && result != "")
-        result += ' ';
-      result += ToLower(*p);
-    }
-  }
-  return result;
-}
-
-// This class reports Google Mock failures as Google Test failures.  A
-// user can define another class in a similar fashion if they intend to
-// use Google Mock with a testing framework other than Google Test.
-class GoogleTestFailureReporter : public FailureReporterInterface {
- public:
-  void ReportFailure(FailureType type, const char* file, int line,
-                     const std::string& message) override {
-    AssertHelper(type == kFatal ?
-                 TestPartResult::kFatalFailure :
-                 TestPartResult::kNonFatalFailure,
-                 file,
-                 line,
-                 message.c_str()) = Message();
-    if (type == kFatal) {
-      posix::Abort();
-    }
-  }
-};
-
-// Returns the global failure reporter.  Will create a
-// GoogleTestFailureReporter and return it the first time called.
-GTEST_API_ FailureReporterInterface* GetFailureReporter() {
-  // Points to the global failure reporter used by Google Mock.  gcc
-  // guarantees that the following use of failure_reporter is
-  // thread-safe.  We may need to add additional synchronization to
-  // protect failure_reporter if we port Google Mock to other
-  // compilers.
-  static FailureReporterInterface* const failure_reporter =
-      new GoogleTestFailureReporter();
-  return failure_reporter;
-}
-
-// Protects global resources (stdout in particular) used by Log().
-static GTEST_DEFINE_STATIC_MUTEX_(g_log_mutex);
-
-// Returns true if and only if a log with the given severity is visible
-// according to the --gmock_verbose flag.
-GTEST_API_ bool LogIsVisible(LogSeverity severity) {
-  if (GMOCK_FLAG(verbose) == kInfoVerbosity) {
-    // Always show the log if --gmock_verbose=info.
-    return true;
-  } else if (GMOCK_FLAG(verbose) == kErrorVerbosity) {
-    // Always hide it if --gmock_verbose=error.
-    return false;
-  } else {
-    // If --gmock_verbose is neither "info" nor "error", we treat it
-    // as "warning" (its default value).
-    return severity == kWarning;
-  }
-}
-
-// Prints the given message to stdout if and only if 'severity' >= the level
-// specified by the --gmock_verbose flag.  If stack_frames_to_skip >=
-// 0, also prints the stack trace excluding the top
-// stack_frames_to_skip frames.  In opt mode, any positive
-// stack_frames_to_skip is treated as 0, since we don't know which
-// function calls will be inlined by the compiler and need to be
-// conservative.
-GTEST_API_ void Log(LogSeverity severity, const std::string& message,
-                    int stack_frames_to_skip) {
-  if (!LogIsVisible(severity))
-    return;
-
-  // Ensures that logs from different threads don't interleave.
-  MutexLock l(&g_log_mutex);
-
-  if (severity == kWarning) {
-    // Prints a GMOCK WARNING marker to make the warnings easily searchable.
-    std::cout << "\nGMOCK WARNING:";
-  }
-  // Pre-pends a new-line to message if it doesn't start with one.
-  if (message.empty() || message[0] != '\n') {
-    std::cout << "\n";
-  }
-  std::cout << message;
-  if (stack_frames_to_skip >= 0) {
-#ifdef NDEBUG
-    // In opt mode, we have to be conservative and skip no stack frame.
-    const int actual_to_skip = 0;
-#else
-    // In dbg mode, we can do what the caller tell us to do (plus one
-    // for skipping this function's stack frame).
-    const int actual_to_skip = stack_frames_to_skip + 1;
-#endif  // NDEBUG
-
-    // Appends a new-line to message if it doesn't end with one.
-    if (!message.empty() && *message.rbegin() != '\n') {
-      std::cout << "\n";
-    }
-    std::cout << "Stack trace:\n"
-         << ::testing::internal::GetCurrentOsStackTraceExceptTop(
-             ::testing::UnitTest::GetInstance(), actual_to_skip);
-  }
-  std::cout << ::std::flush;
-}
-
-GTEST_API_ WithoutMatchers GetWithoutMatchers() { return WithoutMatchers(); }
-
-GTEST_API_ void IllegalDoDefault(const char* file, int line) {
-  internal::Assert(
-      false, file, line,
-      "You are using DoDefault() inside a composite action like "
-      "DoAll() or WithArgs().  This is not supported for technical "
-      "reasons.  Please instead spell out the default action, or "
-      "assign the default action to an Action variable and use "
-      "the variable in various places.");
-}
-
-}  // namespace internal
-}  // namespace testing
diff --git a/gnu/llvm/llvm/utils/unittest/googlemock/src/gmock-matchers.cc b/gnu/llvm/llvm/utils/unittest/googlemock/src/gmock-matchers.cc
deleted file mode 100644
index 4a3f7af2351..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googlemock/src/gmock-matchers.cc
+++ /dev/null
@@ -1,462 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file implements Matcher<const string&>, Matcher<string>, and
-// utilities for defining matchers.
-
-#include "gmock/gmock-matchers.h"
-#include "gmock/gmock-generated-matchers.h"
-
-#include <string.h>
-#include <iostream>
-#include <sstream>
-#include <string>
-
-namespace testing {
-namespace internal {
-
-// Returns the description for a matcher defined using the MATCHER*()
-// macro where the user-supplied description string is "", if
-// 'negation' is false; otherwise returns the description of the
-// negation of the matcher.  'param_values' contains a list of strings
-// that are the print-out of the matcher's parameters.
-GTEST_API_ std::string FormatMatcherDescription(bool negation,
-                                                const char* matcher_name,
-                                                const Strings& param_values) {
-  std::string result = ConvertIdentifierNameToWords(matcher_name);
-  if (param_values.size() >= 1) result += " " + JoinAsTuple(param_values);
-  return negation ? "not (" + result + ")" : result;
-}
-
-// FindMaxBipartiteMatching and its helper class.
-//
-// Uses the well-known Ford-Fulkerson max flow method to find a maximum
-// bipartite matching. Flow is considered to be from left to right.
-// There is an implicit source node that is connected to all of the left
-// nodes, and an implicit sink node that is connected to all of the
-// right nodes. All edges have unit capacity.
-//
-// Neither the flow graph nor the residual flow graph are represented
-// explicitly. Instead, they are implied by the information in 'graph' and
-// a vector<int> called 'left_' whose elements are initialized to the
-// value kUnused. This represents the initial state of the algorithm,
-// where the flow graph is empty, and the residual flow graph has the
-// following edges:
-//   - An edge from source to each left_ node
-//   - An edge from each right_ node to sink
-//   - An edge from each left_ node to each right_ node, if the
-//     corresponding edge exists in 'graph'.
-//
-// When the TryAugment() method adds a flow, it sets left_[l] = r for some
-// nodes l and r. This induces the following changes:
-//   - The edges (source, l), (l, r), and (r, sink) are added to the
-//     flow graph.
-//   - The same three edges are removed from the residual flow graph.
-//   - The reverse edges (l, source), (r, l), and (sink, r) are added
-//     to the residual flow graph, which is a directional graph
-//     representing unused flow capacity.
-//
-// When the method augments a flow (moving left_[l] from some r1 to some
-// other r2), this can be thought of as "undoing" the above steps with
-// respect to r1 and "redoing" them with respect to r2.
-//
-// It bears repeating that the flow graph and residual flow graph are
-// never represented explicitly, but can be derived by looking at the
-// information in 'graph' and in left_.
-//
-// As an optimization, there is a second vector<int> called right_ which
-// does not provide any new information. Instead, it enables more
-// efficient queries about edges entering or leaving the right-side nodes
-// of the flow or residual flow graphs. The following invariants are
-// maintained:
-//
-// left[l] == kUnused or right[left[l]] == l
-// right[r] == kUnused or left[right[r]] == r
-//
-// . [ source ]                                        .
-// .   |||                                             .
-// .   |||                                             .
-// .   ||\--> left[0]=1  ---\    right[0]=-1 ----\     .
-// .   ||                   |                    |     .
-// .   |\---> left[1]=-1    \--> right[1]=0  ---\|     .
-// .   |                                        ||     .
-// .   \----> left[2]=2  ------> right[2]=2  --\||     .
-// .                                           |||     .
-// .         elements           matchers       vvv     .
-// .                                         [ sink ]  .
-//
-// See Also:
-//   [1] Cormen, et al (2001). "Section 26.2: The Ford-Fulkerson method".
-//       "Introduction to Algorithms (Second ed.)", pp. 651-664.
-//   [2] "Ford-Fulkerson algorithm", Wikipedia,
-//       'http://en.wikipedia.org/wiki/Ford%E2%80%93Fulkerson_algorithm'
-class MaxBipartiteMatchState {
- public:
-  explicit MaxBipartiteMatchState(const MatchMatrix& graph)
-      : graph_(&graph),
-        left_(graph_->LhsSize(), kUnused),
-        right_(graph_->RhsSize(), kUnused) {}
-
-  // Returns the edges of a maximal match, each in the form {left, right}.
-  ElementMatcherPairs Compute() {
-    // 'seen' is used for path finding { 0: unseen, 1: seen }.
-    ::std::vector<char> seen;
-    // Searches the residual flow graph for a path from each left node to
-    // the sink in the residual flow graph, and if one is found, add flow
-    // to the graph. It's okay to search through the left nodes once. The
-    // edge from the implicit source node to each previously-visited left
-    // node will have flow if that left node has any path to the sink
-    // whatsoever. Subsequent augmentations can only add flow to the
-    // network, and cannot take away that previous flow unit from the source.
-    // Since the source-to-left edge can only carry one flow unit (or,
-    // each element can be matched to only one matcher), there is no need
-    // to visit the left nodes more than once looking for augmented paths.
-    // The flow is known to be possible or impossible by looking at the
-    // node once.
-    for (size_t ilhs = 0; ilhs < graph_->LhsSize(); ++ilhs) {
-      // Reset the path-marking vector and try to find a path from
-      // source to sink starting at the left_[ilhs] node.
-      GTEST_CHECK_(left_[ilhs] == kUnused)
-          << "ilhs: " << ilhs << ", left_[ilhs]: " << left_[ilhs];
-      // 'seen' initialized to 'graph_->RhsSize()' copies of 0.
-      seen.assign(graph_->RhsSize(), 0);
-      TryAugment(ilhs, &seen);
-    }
-    ElementMatcherPairs result;
-    for (size_t ilhs = 0; ilhs < left_.size(); ++ilhs) {
-      size_t irhs = left_[ilhs];
-      if (irhs == kUnused) continue;
-      result.push_back(ElementMatcherPair(ilhs, irhs));
-    }
-    return result;
-  }
-
- private:
-  static const size_t kUnused = static_cast<size_t>(-1);
-
-  // Perform a depth-first search from left node ilhs to the sink.  If a
-  // path is found, flow is added to the network by linking the left and
-  // right vector elements corresponding each segment of the path.
-  // Returns true if a path to sink was found, which means that a unit of
-  // flow was added to the network. The 'seen' vector elements correspond
-  // to right nodes and are marked to eliminate cycles from the search.
-  //
-  // Left nodes will only be explored at most once because they
-  // are accessible from at most one right node in the residual flow
-  // graph.
-  //
-  // Note that left_[ilhs] is the only element of left_ that TryAugment will
-  // potentially transition from kUnused to another value. Any other
-  // left_ element holding kUnused before TryAugment will be holding it
-  // when TryAugment returns.
-  //
-  bool TryAugment(size_t ilhs, ::std::vector<char>* seen) {
-    for (size_t irhs = 0; irhs < graph_->RhsSize(); ++irhs) {
-      if ((*seen)[irhs]) continue;
-      if (!graph_->HasEdge(ilhs, irhs)) continue;
-      // There's an available edge from ilhs to irhs.
-      (*seen)[irhs] = 1;
-      // Next a search is performed to determine whether
-      // this edge is a dead end or leads to the sink.
-      //
-      // right_[irhs] == kUnused means that there is residual flow from
-      // right node irhs to the sink, so we can use that to finish this
-      // flow path and return success.
-      //
-      // Otherwise there is residual flow to some ilhs. We push flow
-      // along that path and call ourselves recursively to see if this
-      // ultimately leads to sink.
-      if (right_[irhs] == kUnused || TryAugment(right_[irhs], seen)) {
-        // Add flow from left_[ilhs] to right_[irhs].
-        left_[ilhs] = irhs;
-        right_[irhs] = ilhs;
-        return true;
-      }
-    }
-    return false;
-  }
-
-  const MatchMatrix* graph_;  // not owned
-  // Each element of the left_ vector represents a left hand side node
-  // (i.e. an element) and each element of right_ is a right hand side
-  // node (i.e. a matcher). The values in the left_ vector indicate
-  // outflow from that node to a node on the right_ side. The values
-  // in the right_ indicate inflow, and specify which left_ node is
-  // feeding that right_ node, if any. For example, left_[3] == 1 means
-  // there's a flow from element #3 to matcher #1. Such a flow would also
-  // be redundantly represented in the right_ vector as right_[1] == 3.
-  // Elements of left_ and right_ are either kUnused or mutually
-  // referent. Mutually referent means that left_[right_[i]] = i and
-  // right_[left_[i]] = i.
-  ::std::vector<size_t> left_;
-  ::std::vector<size_t> right_;
-
-  GTEST_DISALLOW_ASSIGN_(MaxBipartiteMatchState);
-};
-
-const size_t MaxBipartiteMatchState::kUnused;
-
-GTEST_API_ ElementMatcherPairs FindMaxBipartiteMatching(const MatchMatrix& g) {
-  return MaxBipartiteMatchState(g).Compute();
-}
-
-static void LogElementMatcherPairVec(const ElementMatcherPairs& pairs,
-                                     ::std::ostream* stream) {
-  typedef ElementMatcherPairs::const_iterator Iter;
-  ::std::ostream& os = *stream;
-  os << "{";
-  const char* sep = "";
-  for (Iter it = pairs.begin(); it != pairs.end(); ++it) {
-    os << sep << "\n  ("
-       << "element #" << it->first << ", "
-       << "matcher #" << it->second << ")";
-    sep = ",";
-  }
-  os << "\n}";
-}
-
-bool MatchMatrix::NextGraph() {
-  for (size_t ilhs = 0; ilhs < LhsSize(); ++ilhs) {
-    for (size_t irhs = 0; irhs < RhsSize(); ++irhs) {
-      char& b = matched_[SpaceIndex(ilhs, irhs)];
-      if (!b) {
-        b = 1;
-        return true;
-      }
-      b = 0;
-    }
-  }
-  return false;
-}
-
-void MatchMatrix::Randomize() {
-  for (size_t ilhs = 0; ilhs < LhsSize(); ++ilhs) {
-    for (size_t irhs = 0; irhs < RhsSize(); ++irhs) {
-      char& b = matched_[SpaceIndex(ilhs, irhs)];
-      b = static_cast<char>(rand() & 1);  // NOLINT
-    }
-  }
-}
-
-std::string MatchMatrix::DebugString() const {
-  ::std::stringstream ss;
-  const char* sep = "";
-  for (size_t i = 0; i < LhsSize(); ++i) {
-    ss << sep;
-    for (size_t j = 0; j < RhsSize(); ++j) {
-      ss << HasEdge(i, j);
-    }
-    sep = ";";
-  }
-  return ss.str();
-}
-
-void UnorderedElementsAreMatcherImplBase::DescribeToImpl(
-    ::std::ostream* os) const {
-  switch (match_flags()) {
-    case UnorderedMatcherRequire::ExactMatch:
-      if (matcher_describers_.empty()) {
-        *os << "is empty";
-        return;
-      }
-      if (matcher_describers_.size() == 1) {
-        *os << "has " << Elements(1) << " and that element ";
-        matcher_describers_[0]->DescribeTo(os);
-        return;
-      }
-      *os << "has " << Elements(matcher_describers_.size())
-          << " and there exists some permutation of elements such that:\n";
-      break;
-    case UnorderedMatcherRequire::Superset:
-      *os << "a surjection from elements to requirements exists such that:\n";
-      break;
-    case UnorderedMatcherRequire::Subset:
-      *os << "an injection from elements to requirements exists such that:\n";
-      break;
-  }
-
-  const char* sep = "";
-  for (size_t i = 0; i != matcher_describers_.size(); ++i) {
-    *os << sep;
-    if (match_flags() == UnorderedMatcherRequire::ExactMatch) {
-      *os << " - element #" << i << " ";
-    } else {
-      *os << " - an element ";
-    }
-    matcher_describers_[i]->DescribeTo(os);
-    if (match_flags() == UnorderedMatcherRequire::ExactMatch) {
-      sep = ", and\n";
-    } else {
-      sep = "\n";
-    }
-  }
-}
-
-void UnorderedElementsAreMatcherImplBase::DescribeNegationToImpl(
-    ::std::ostream* os) const {
-  switch (match_flags()) {
-    case UnorderedMatcherRequire::ExactMatch:
-      if (matcher_describers_.empty()) {
-        *os << "isn't empty";
-        return;
-      }
-      if (matcher_describers_.size() == 1) {
-        *os << "doesn't have " << Elements(1) << ", or has " << Elements(1)
-            << " that ";
-        matcher_describers_[0]->DescribeNegationTo(os);
-        return;
-      }
-      *os << "doesn't have " << Elements(matcher_describers_.size())
-          << ", or there exists no permutation of elements such that:\n";
-      break;
-    case UnorderedMatcherRequire::Superset:
-      *os << "no surjection from elements to requirements exists such that:\n";
-      break;
-    case UnorderedMatcherRequire::Subset:
-      *os << "no injection from elements to requirements exists such that:\n";
-      break;
-  }
-  const char* sep = "";
-  for (size_t i = 0; i != matcher_describers_.size(); ++i) {
-    *os << sep;
-    if (match_flags() == UnorderedMatcherRequire::ExactMatch) {
-      *os << " - element #" << i << " ";
-    } else {
-      *os << " - an element ";
-    }
-    matcher_describers_[i]->DescribeTo(os);
-    if (match_flags() == UnorderedMatcherRequire::ExactMatch) {
-      sep = ", and\n";
-    } else {
-      sep = "\n";
-    }
-  }
-}
-
-// Checks that all matchers match at least one element, and that all
-// elements match at least one matcher. This enables faster matching
-// and better error reporting.
-// Returns false, writing an explanation to 'listener', if and only
-// if the success criteria are not met.
-bool UnorderedElementsAreMatcherImplBase::VerifyMatchMatrix(
-    const ::std::vector<std::string>& element_printouts,
-    const MatchMatrix& matrix, MatchResultListener* listener) const {
-  bool result = true;
-  ::std::vector<char> element_matched(matrix.LhsSize(), 0);
-  ::std::vector<char> matcher_matched(matrix.RhsSize(), 0);
-
-  for (size_t ilhs = 0; ilhs < matrix.LhsSize(); ilhs++) {
-    for (size_t irhs = 0; irhs < matrix.RhsSize(); irhs++) {
-      char matched = matrix.HasEdge(ilhs, irhs);
-      element_matched[ilhs] |= matched;
-      matcher_matched[irhs] |= matched;
-    }
-  }
-
-  if (match_flags() & UnorderedMatcherRequire::Superset) {
-    const char* sep =
-        "where the following matchers don't match any elements:\n";
-    for (size_t mi = 0; mi < matcher_matched.size(); ++mi) {
-      if (matcher_matched[mi]) continue;
-      result = false;
-      if (listener->IsInterested()) {
-        *listener << sep << "matcher #" << mi << ": ";
-        matcher_describers_[mi]->DescribeTo(listener->stream());
-        sep = ",\n";
-      }
-    }
-  }
-
-  if (match_flags() & UnorderedMatcherRequire::Subset) {
-    const char* sep =
-        "where the following elements don't match any matchers:\n";
-    const char* outer_sep = "";
-    if (!result) {
-      outer_sep = "\nand ";
-    }
-    for (size_t ei = 0; ei < element_matched.size(); ++ei) {
-      if (element_matched[ei]) continue;
-      result = false;
-      if (listener->IsInterested()) {
-        *listener << outer_sep << sep << "element #" << ei << ": "
-                  << element_printouts[ei];
-        sep = ",\n";
-        outer_sep = "";
-      }
-    }
-  }
-  return result;
-}
-
-bool UnorderedElementsAreMatcherImplBase::FindPairing(
-    const MatchMatrix& matrix, MatchResultListener* listener) const {
-  ElementMatcherPairs matches = FindMaxBipartiteMatching(matrix);
-
-  size_t max_flow = matches.size();
-  if ((match_flags() & UnorderedMatcherRequire::Superset) &&
-      max_flow < matrix.RhsSize()) {
-    if (listener->IsInterested()) {
-      *listener << "where no permutation of the elements can satisfy all "
-                   "matchers, and the closest match is "
-                << max_flow << " of " << matrix.RhsSize()
-                << " matchers with the pairings:\n";
-      LogElementMatcherPairVec(matches, listener->stream());
-    }
-    return false;
-  }
-  if ((match_flags() & UnorderedMatcherRequire::Subset) &&
-      max_flow < matrix.LhsSize()) {
-    if (listener->IsInterested()) {
-      *listener
-          << "where not all elements can be matched, and the closest match is "
-          << max_flow << " of " << matrix.RhsSize()
-          << " matchers with the pairings:\n";
-      LogElementMatcherPairVec(matches, listener->stream());
-    }
-    return false;
-  }
-
-  if (matches.size() > 1) {
-    if (listener->IsInterested()) {
-      const char* sep = "where:\n";
-      for (size_t mi = 0; mi < matches.size(); ++mi) {
-        *listener << sep << " - element #" << matches[mi].first
-                  << " is matched by matcher #" << matches[mi].second;
-        sep = ",\n";
-      }
-    }
-  }
-  return true;
-}
-
-}  // namespace internal
-}  // namespace testing
diff --git a/gnu/llvm/llvm/utils/unittest/googlemock/src/gmock-spec-builders.cc b/gnu/llvm/llvm/utils/unittest/googlemock/src/gmock-spec-builders.cc
deleted file mode 100644
index f9d3434560b..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googlemock/src/gmock-spec-builders.cc
+++ /dev/null
@@ -1,888 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file implements the spec builder syntax (ON_CALL and
-// EXPECT_CALL).
-
-#include "gmock/gmock-spec-builders.h"
-
-#include <stdlib.h>
-#include <iostream>  // NOLINT
-#include <map>
-#include <memory>
-#include <set>
-#include <string>
-#include <vector>
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-#if GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC
-# include <unistd.h>  // NOLINT
-#endif
-
-// Silence C4800 (C4800: 'int *const ': forcing value
-// to bool 'true' or 'false') for MSVC 15
-#ifdef _MSC_VER
-#if _MSC_VER == 1900
-#  pragma warning(push)
-#  pragma warning(disable:4800)
-#endif
-#endif
-
-namespace testing {
-namespace internal {
-
-// Protects the mock object registry (in class Mock), all function
-// mockers, and all expectations.
-GTEST_API_ GTEST_DEFINE_STATIC_MUTEX_(g_gmock_mutex);
-
-// Logs a message including file and line number information.
-GTEST_API_ void LogWithLocation(testing::internal::LogSeverity severity,
-                                const char* file, int line,
-                                const std::string& message) {
-  ::std::ostringstream s;
-  s << file << ":" << line << ": " << message << ::std::endl;
-  Log(severity, s.str(), 0);
-}
-
-// Constructs an ExpectationBase object.
-ExpectationBase::ExpectationBase(const char* a_file, int a_line,
-                                 const std::string& a_source_text)
-    : file_(a_file),
-      line_(a_line),
-      source_text_(a_source_text),
-      cardinality_specified_(false),
-      cardinality_(Exactly(1)),
-      call_count_(0),
-      retired_(false),
-      extra_matcher_specified_(false),
-      repeated_action_specified_(false),
-      retires_on_saturation_(false),
-      last_clause_(kNone),
-      action_count_checked_(false) {}
-
-// Destructs an ExpectationBase object.
-ExpectationBase::~ExpectationBase() {}
-
-// Explicitly specifies the cardinality of this expectation.  Used by
-// the subclasses to implement the .Times() clause.
-void ExpectationBase::SpecifyCardinality(const Cardinality& a_cardinality) {
-  cardinality_specified_ = true;
-  cardinality_ = a_cardinality;
-}
-
-// Retires all pre-requisites of this expectation.
-void ExpectationBase::RetireAllPreRequisites()
-    GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-  if (is_retired()) {
-    // We can take this short-cut as we never retire an expectation
-    // until we have retired all its pre-requisites.
-    return;
-  }
-
-  ::std::vector<ExpectationBase*> expectations(1, this);
-  while (!expectations.empty()) {
-    ExpectationBase* exp = expectations.back();
-    expectations.pop_back();
-
-    for (ExpectationSet::const_iterator it =
-             exp->immediate_prerequisites_.begin();
-         it != exp->immediate_prerequisites_.end(); ++it) {
-      ExpectationBase* next = it->expectation_base().get();
-      if (!next->is_retired()) {
-        next->Retire();
-        expectations.push_back(next);
-      }
-    }
-  }
-}
-
-// Returns true if and only if all pre-requisites of this expectation
-// have been satisfied.
-bool ExpectationBase::AllPrerequisitesAreSatisfied() const
-    GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-  g_gmock_mutex.AssertHeld();
-  ::std::vector<const ExpectationBase*> expectations(1, this);
-  while (!expectations.empty()) {
-    const ExpectationBase* exp = expectations.back();
-    expectations.pop_back();
-
-    for (ExpectationSet::const_iterator it =
-             exp->immediate_prerequisites_.begin();
-         it != exp->immediate_prerequisites_.end(); ++it) {
-      const ExpectationBase* next = it->expectation_base().get();
-      if (!next->IsSatisfied()) return false;
-      expectations.push_back(next);
-    }
-  }
-  return true;
-}
-
-// Adds unsatisfied pre-requisites of this expectation to 'result'.
-void ExpectationBase::FindUnsatisfiedPrerequisites(ExpectationSet* result) const
-    GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-  g_gmock_mutex.AssertHeld();
-  ::std::vector<const ExpectationBase*> expectations(1, this);
-  while (!expectations.empty()) {
-    const ExpectationBase* exp = expectations.back();
-    expectations.pop_back();
-
-    for (ExpectationSet::const_iterator it =
-             exp->immediate_prerequisites_.begin();
-         it != exp->immediate_prerequisites_.end(); ++it) {
-      const ExpectationBase* next = it->expectation_base().get();
-
-      if (next->IsSatisfied()) {
-        // If *it is satisfied and has a call count of 0, some of its
-        // pre-requisites may not be satisfied yet.
-        if (next->call_count_ == 0) {
-          expectations.push_back(next);
-        }
-      } else {
-        // Now that we know next is unsatisfied, we are not so interested
-        // in whether its pre-requisites are satisfied.  Therefore we
-        // don't iterate into it here.
-        *result += *it;
-      }
-    }
-  }
-}
-
-// Describes how many times a function call matching this
-// expectation has occurred.
-void ExpectationBase::DescribeCallCountTo(::std::ostream* os) const
-    GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-  g_gmock_mutex.AssertHeld();
-
-  // Describes how many times the function is expected to be called.
-  *os << "         Expected: to be ";
-  cardinality().DescribeTo(os);
-  *os << "\n           Actual: ";
-  Cardinality::DescribeActualCallCountTo(call_count(), os);
-
-  // Describes the state of the expectation (e.g. is it satisfied?
-  // is it active?).
-  *os << " - " << (IsOverSaturated() ? "over-saturated" :
-                   IsSaturated() ? "saturated" :
-                   IsSatisfied() ? "satisfied" : "unsatisfied")
-      << " and "
-      << (is_retired() ? "retired" : "active");
-}
-
-// Checks the action count (i.e. the number of WillOnce() and
-// WillRepeatedly() clauses) against the cardinality if this hasn't
-// been done before.  Prints a warning if there are too many or too
-// few actions.
-void ExpectationBase::CheckActionCountIfNotDone() const
-    GTEST_LOCK_EXCLUDED_(mutex_) {
-  bool should_check = false;
-  {
-    MutexLock l(&mutex_);
-    if (!action_count_checked_) {
-      action_count_checked_ = true;
-      should_check = true;
-    }
-  }
-
-  if (should_check) {
-    if (!cardinality_specified_) {
-      // The cardinality was inferred - no need to check the action
-      // count against it.
-      return;
-    }
-
-    // The cardinality was explicitly specified.
-    const int action_count = static_cast<int>(untyped_actions_.size());
-    const int upper_bound = cardinality().ConservativeUpperBound();
-    const int lower_bound = cardinality().ConservativeLowerBound();
-    bool too_many;  // True if there are too many actions, or false
-    // if there are too few.
-    if (action_count > upper_bound ||
-        (action_count == upper_bound && repeated_action_specified_)) {
-      too_many = true;
-    } else if (0 < action_count && action_count < lower_bound &&
-               !repeated_action_specified_) {
-      too_many = false;
-    } else {
-      return;
-    }
-
-    ::std::stringstream ss;
-    DescribeLocationTo(&ss);
-    ss << "Too " << (too_many ? "many" : "few")
-       << " actions specified in " << source_text() << "...\n"
-       << "Expected to be ";
-    cardinality().DescribeTo(&ss);
-    ss << ", but has " << (too_many ? "" : "only ")
-       << action_count << " WillOnce()"
-       << (action_count == 1 ? "" : "s");
-    if (repeated_action_specified_) {
-      ss << " and a WillRepeatedly()";
-    }
-    ss << ".";
-    Log(kWarning, ss.str(), -1);  // -1 means "don't print stack trace".
-  }
-}
-
-// Implements the .Times() clause.
-void ExpectationBase::UntypedTimes(const Cardinality& a_cardinality) {
-  if (last_clause_ == kTimes) {
-    ExpectSpecProperty(false,
-                       ".Times() cannot appear "
-                       "more than once in an EXPECT_CALL().");
-  } else {
-    ExpectSpecProperty(last_clause_ < kTimes,
-                       ".Times() cannot appear after "
-                       ".InSequence(), .WillOnce(), .WillRepeatedly(), "
-                       "or .RetiresOnSaturation().");
-  }
-  last_clause_ = kTimes;
-
-  SpecifyCardinality(a_cardinality);
-}
-
-// Points to the implicit sequence introduced by a living InSequence
-// object (if any) in the current thread or NULL.
-GTEST_API_ ThreadLocal<Sequence*> g_gmock_implicit_sequence;
-
-// Reports an uninteresting call (whose description is in msg) in the
-// manner specified by 'reaction'.
-void ReportUninterestingCall(CallReaction reaction, const std::string& msg) {
-  // Include a stack trace only if --gmock_verbose=info is specified.
-  const int stack_frames_to_skip =
-      GMOCK_FLAG(verbose) == kInfoVerbosity ? 3 : -1;
-  switch (reaction) {
-    case kAllow:
-      Log(kInfo, msg, stack_frames_to_skip);
-      break;
-    case kWarn:
-      Log(kWarning,
-          msg +
-              "\nNOTE: You can safely ignore the above warning unless this "
-              "call should not happen.  Do not suppress it by blindly adding "
-              "an EXPECT_CALL() if you don't mean to enforce the call.  "
-              "See "
-              "https://github.com/google/googletest/blob/master/googlemock/"
-              "docs/cook_book.md#"
-              "knowing-when-to-expect for details.\n",
-          stack_frames_to_skip);
-      break;
-    default:  // FAIL
-      Expect(false, nullptr, -1, msg);
-  }
-}
-
-UntypedFunctionMockerBase::UntypedFunctionMockerBase()
-    : mock_obj_(nullptr), name_("") {}
-
-UntypedFunctionMockerBase::~UntypedFunctionMockerBase() {}
-
-// Sets the mock object this mock method belongs to, and registers
-// this information in the global mock registry.  Will be called
-// whenever an EXPECT_CALL() or ON_CALL() is executed on this mock
-// method.
-void UntypedFunctionMockerBase::RegisterOwner(const void* mock_obj)
-    GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
-  {
-    MutexLock l(&g_gmock_mutex);
-    mock_obj_ = mock_obj;
-  }
-  Mock::Register(mock_obj, this);
-}
-
-// Sets the mock object this mock method belongs to, and sets the name
-// of the mock function.  Will be called upon each invocation of this
-// mock function.
-void UntypedFunctionMockerBase::SetOwnerAndName(const void* mock_obj,
-                                                const char* name)
-    GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
-  // We protect name_ under g_gmock_mutex in case this mock function
-  // is called from two threads concurrently.
-  MutexLock l(&g_gmock_mutex);
-  mock_obj_ = mock_obj;
-  name_ = name;
-}
-
-// Returns the name of the function being mocked.  Must be called
-// after RegisterOwner() or SetOwnerAndName() has been called.
-const void* UntypedFunctionMockerBase::MockObject() const
-    GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
-  const void* mock_obj;
-  {
-    // We protect mock_obj_ under g_gmock_mutex in case this mock
-    // function is called from two threads concurrently.
-    MutexLock l(&g_gmock_mutex);
-    Assert(mock_obj_ != nullptr, __FILE__, __LINE__,
-           "MockObject() must not be called before RegisterOwner() or "
-           "SetOwnerAndName() has been called.");
-    mock_obj = mock_obj_;
-  }
-  return mock_obj;
-}
-
-// Returns the name of this mock method.  Must be called after
-// SetOwnerAndName() has been called.
-const char* UntypedFunctionMockerBase::Name() const
-    GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
-  const char* name;
-  {
-    // We protect name_ under g_gmock_mutex in case this mock
-    // function is called from two threads concurrently.
-    MutexLock l(&g_gmock_mutex);
-    Assert(name_ != nullptr, __FILE__, __LINE__,
-           "Name() must not be called before SetOwnerAndName() has "
-           "been called.");
-    name = name_;
-  }
-  return name;
-}
-
-// Calculates the result of invoking this mock function with the given
-// arguments, prints it, and returns it.  The caller is responsible
-// for deleting the result.
-UntypedActionResultHolderBase* UntypedFunctionMockerBase::UntypedInvokeWith(
-    void* const untyped_args) GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
-  // See the definition of untyped_expectations_ for why access to it
-  // is unprotected here.
-  if (untyped_expectations_.size() == 0) {
-    // No expectation is set on this mock method - we have an
-    // uninteresting call.
-
-    // We must get Google Mock's reaction on uninteresting calls
-    // made on this mock object BEFORE performing the action,
-    // because the action may DELETE the mock object and make the
-    // following expression meaningless.
-    const CallReaction reaction =
-        Mock::GetReactionOnUninterestingCalls(MockObject());
-
-    // True if and only if we need to print this call's arguments and return
-    // value.  This definition must be kept in sync with
-    // the behavior of ReportUninterestingCall().
-    const bool need_to_report_uninteresting_call =
-        // If the user allows this uninteresting call, we print it
-        // only when they want informational messages.
-        reaction == kAllow ? LogIsVisible(kInfo) :
-                           // If the user wants this to be a warning, we print
-                           // it only when they want to see warnings.
-            reaction == kWarn
-                ? LogIsVisible(kWarning)
-                :
-                // Otherwise, the user wants this to be an error, and we
-                // should always print detailed information in the error.
-                true;
-
-    if (!need_to_report_uninteresting_call) {
-      // Perform the action without printing the call information.
-      return this->UntypedPerformDefaultAction(
-          untyped_args, "Function call: " + std::string(Name()));
-    }
-
-    // Warns about the uninteresting call.
-    ::std::stringstream ss;
-    this->UntypedDescribeUninterestingCall(untyped_args, &ss);
-
-    // Calculates the function result.
-    UntypedActionResultHolderBase* const result =
-        this->UntypedPerformDefaultAction(untyped_args, ss.str());
-
-    // Prints the function result.
-    if (result != nullptr) result->PrintAsActionResult(&ss);
-
-    ReportUninterestingCall(reaction, ss.str());
-    return result;
-  }
-
-  bool is_excessive = false;
-  ::std::stringstream ss;
-  ::std::stringstream why;
-  ::std::stringstream loc;
-  const void* untyped_action = nullptr;
-
-  // The UntypedFindMatchingExpectation() function acquires and
-  // releases g_gmock_mutex.
-  const ExpectationBase* const untyped_expectation =
-      this->UntypedFindMatchingExpectation(
-          untyped_args, &untyped_action, &is_excessive,
-          &ss, &why);
-  const bool found = untyped_expectation != nullptr;
-
-  // True if and only if we need to print the call's arguments
-  // and return value.
-  // This definition must be kept in sync with the uses of Expect()
-  // and Log() in this function.
-  const bool need_to_report_call =
-      !found || is_excessive || LogIsVisible(kInfo);
-  if (!need_to_report_call) {
-    // Perform the action without printing the call information.
-    return untyped_action == nullptr
-               ? this->UntypedPerformDefaultAction(untyped_args, "")
-               : this->UntypedPerformAction(untyped_action, untyped_args);
-  }
-
-  ss << "    Function call: " << Name();
-  this->UntypedPrintArgs(untyped_args, &ss);
-
-  // In case the action deletes a piece of the expectation, we
-  // generate the message beforehand.
-  if (found && !is_excessive) {
-    untyped_expectation->DescribeLocationTo(&loc);
-  }
-
-  UntypedActionResultHolderBase* const result =
-      untyped_action == nullptr
-          ? this->UntypedPerformDefaultAction(untyped_args, ss.str())
-          : this->UntypedPerformAction(untyped_action, untyped_args);
-  if (result != nullptr) result->PrintAsActionResult(&ss);
-  ss << "\n" << why.str();
-
-  if (!found) {
-    // No expectation matches this call - reports a failure.
-    Expect(false, nullptr, -1, ss.str());
-  } else if (is_excessive) {
-    // We had an upper-bound violation and the failure message is in ss.
-    Expect(false, untyped_expectation->file(),
-           untyped_expectation->line(), ss.str());
-  } else {
-    // We had an expected call and the matching expectation is
-    // described in ss.
-    Log(kInfo, loc.str() + ss.str(), 2);
-  }
-
-  return result;
-}
-
-// Returns an Expectation object that references and co-owns exp,
-// which must be an expectation on this mock function.
-Expectation UntypedFunctionMockerBase::GetHandleOf(ExpectationBase* exp) {
-  // See the definition of untyped_expectations_ for why access to it
-  // is unprotected here.
-  for (UntypedExpectations::const_iterator it =
-           untyped_expectations_.begin();
-       it != untyped_expectations_.end(); ++it) {
-    if (it->get() == exp) {
-      return Expectation(*it);
-    }
-  }
-
-  Assert(false, __FILE__, __LINE__, "Cannot find expectation.");
-  return Expectation();
-  // The above statement is just to make the code compile, and will
-  // never be executed.
-}
-
-// Verifies that all expectations on this mock function have been
-// satisfied.  Reports one or more Google Test non-fatal failures
-// and returns false if not.
-bool UntypedFunctionMockerBase::VerifyAndClearExpectationsLocked()
-    GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-  g_gmock_mutex.AssertHeld();
-  bool expectations_met = true;
-  for (UntypedExpectations::const_iterator it =
-           untyped_expectations_.begin();
-       it != untyped_expectations_.end(); ++it) {
-    ExpectationBase* const untyped_expectation = it->get();
-    if (untyped_expectation->IsOverSaturated()) {
-      // There was an upper-bound violation.  Since the error was
-      // already reported when it occurred, there is no need to do
-      // anything here.
-      expectations_met = false;
-    } else if (!untyped_expectation->IsSatisfied()) {
-      expectations_met = false;
-      ::std::stringstream ss;
-      ss  << "Actual function call count doesn't match "
-          << untyped_expectation->source_text() << "...\n";
-      // No need to show the source file location of the expectation
-      // in the description, as the Expect() call that follows already
-      // takes care of it.
-      untyped_expectation->MaybeDescribeExtraMatcherTo(&ss);
-      untyped_expectation->DescribeCallCountTo(&ss);
-      Expect(false, untyped_expectation->file(),
-             untyped_expectation->line(), ss.str());
-    }
-  }
-
-  // Deleting our expectations may trigger other mock objects to be deleted, for
-  // example if an action contains a reference counted smart pointer to that
-  // mock object, and that is the last reference. So if we delete our
-  // expectations within the context of the global mutex we may deadlock when
-  // this method is called again. Instead, make a copy of the set of
-  // expectations to delete, clear our set within the mutex, and then clear the
-  // copied set outside of it.
-  UntypedExpectations expectations_to_delete;
-  untyped_expectations_.swap(expectations_to_delete);
-
-  g_gmock_mutex.Unlock();
-  expectations_to_delete.clear();
-  g_gmock_mutex.Lock();
-
-  return expectations_met;
-}
-
-CallReaction intToCallReaction(int mock_behavior) {
-  if (mock_behavior >= kAllow && mock_behavior <= kFail) {
-    return static_cast<internal::CallReaction>(mock_behavior);
-  }
-  return kWarn;
-}
-
-}  // namespace internal
-
-// Class Mock.
-
-namespace {
-
-typedef std::set<internal::UntypedFunctionMockerBase*> FunctionMockers;
-
-// The current state of a mock object.  Such information is needed for
-// detecting leaked mock objects and explicitly verifying a mock's
-// expectations.
-struct MockObjectState {
-  MockObjectState()
-      : first_used_file(nullptr), first_used_line(-1), leakable(false) {}
-
-  // Where in the source file an ON_CALL or EXPECT_CALL is first
-  // invoked on this mock object.
-  const char* first_used_file;
-  int first_used_line;
-  ::std::string first_used_test_suite;
-  ::std::string first_used_test;
-  bool leakable;  // true if and only if it's OK to leak the object.
-  FunctionMockers function_mockers;  // All registered methods of the object.
-};
-
-// A global registry holding the state of all mock objects that are
-// alive.  A mock object is added to this registry the first time
-// Mock::AllowLeak(), ON_CALL(), or EXPECT_CALL() is called on it.  It
-// is removed from the registry in the mock object's destructor.
-class MockObjectRegistry {
- public:
-  // Maps a mock object (identified by its address) to its state.
-  typedef std::map<const void*, MockObjectState> StateMap;
-
-  // This destructor will be called when a program exits, after all
-  // tests in it have been run.  By then, there should be no mock
-  // object alive.  Therefore we report any living object as test
-  // failure, unless the user explicitly asked us to ignore it.
-  ~MockObjectRegistry() {
-    if (!GMOCK_FLAG(catch_leaked_mocks))
-      return;
-
-    int leaked_count = 0;
-    for (StateMap::const_iterator it = states_.begin(); it != states_.end();
-         ++it) {
-      if (it->second.leakable)  // The user said it's fine to leak this object.
-        continue;
-
-      // FIXME: Print the type of the leaked object.
-      // This can help the user identify the leaked object.
-      std::cout << "\n";
-      const MockObjectState& state = it->second;
-      std::cout << internal::FormatFileLocation(state.first_used_file,
-                                                state.first_used_line);
-      std::cout << " ERROR: this mock object";
-      if (state.first_used_test != "") {
-        std::cout << " (used in test " << state.first_used_test_suite << "."
-                  << state.first_used_test << ")";
-      }
-      std::cout << " should be deleted but never is. Its address is @"
-           << it->first << ".";
-      leaked_count++;
-    }
-    if (leaked_count > 0) {
-      std::cout << "\nERROR: " << leaked_count << " leaked mock "
-                << (leaked_count == 1 ? "object" : "objects")
-                << " found at program exit. Expectations on a mock object is "
-                   "verified when the object is destructed. Leaking a mock "
-                   "means that its expectations aren't verified, which is "
-                   "usually a test bug. If you really intend to leak a mock, "
-                   "you can suppress this error using "
-                   "testing::Mock::AllowLeak(mock_object), or you may use a "
-                   "fake or stub instead of a mock.\n";
-      std::cout.flush();
-      ::std::cerr.flush();
-      // RUN_ALL_TESTS() has already returned when this destructor is
-      // called.  Therefore we cannot use the normal Google Test
-      // failure reporting mechanism.
-      _exit(1);  // We cannot call exit() as it is not reentrant and
-                 // may already have been called.
-    }
-  }
-
-  StateMap& states() { return states_; }
-
- private:
-  StateMap states_;
-};
-
-// Protected by g_gmock_mutex.
-MockObjectRegistry g_mock_object_registry;
-
-// Maps a mock object to the reaction Google Mock should have when an
-// uninteresting method is called.  Protected by g_gmock_mutex.
-std::map<const void*, internal::CallReaction> g_uninteresting_call_reaction;
-
-// Sets the reaction Google Mock should have when an uninteresting
-// method of the given mock object is called.
-void SetReactionOnUninterestingCalls(const void* mock_obj,
-                                     internal::CallReaction reaction)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  internal::MutexLock l(&internal::g_gmock_mutex);
-  g_uninteresting_call_reaction[mock_obj] = reaction;
-}
-
-}  // namespace
-
-// Tells Google Mock to allow uninteresting calls on the given mock
-// object.
-void Mock::AllowUninterestingCalls(const void* mock_obj)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  SetReactionOnUninterestingCalls(mock_obj, internal::kAllow);
-}
-
-// Tells Google Mock to warn the user about uninteresting calls on the
-// given mock object.
-void Mock::WarnUninterestingCalls(const void* mock_obj)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  SetReactionOnUninterestingCalls(mock_obj, internal::kWarn);
-}
-
-// Tells Google Mock to fail uninteresting calls on the given mock
-// object.
-void Mock::FailUninterestingCalls(const void* mock_obj)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  SetReactionOnUninterestingCalls(mock_obj, internal::kFail);
-}
-
-// Tells Google Mock the given mock object is being destroyed and its
-// entry in the call-reaction table should be removed.
-void Mock::UnregisterCallReaction(const void* mock_obj)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  internal::MutexLock l(&internal::g_gmock_mutex);
-  g_uninteresting_call_reaction.erase(mock_obj);
-}
-
-// Returns the reaction Google Mock will have on uninteresting calls
-// made on the given mock object.
-internal::CallReaction Mock::GetReactionOnUninterestingCalls(
-    const void* mock_obj)
-        GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  internal::MutexLock l(&internal::g_gmock_mutex);
-  return (g_uninteresting_call_reaction.count(mock_obj) == 0) ?
-      internal::intToCallReaction(GMOCK_FLAG(default_mock_behavior)) :
-      g_uninteresting_call_reaction[mock_obj];
-}
-
-// Tells Google Mock to ignore mock_obj when checking for leaked mock
-// objects.
-void Mock::AllowLeak(const void* mock_obj)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  internal::MutexLock l(&internal::g_gmock_mutex);
-  g_mock_object_registry.states()[mock_obj].leakable = true;
-}
-
-// Verifies and clears all expectations on the given mock object.  If
-// the expectations aren't satisfied, generates one or more Google
-// Test non-fatal failures and returns false.
-bool Mock::VerifyAndClearExpectations(void* mock_obj)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  internal::MutexLock l(&internal::g_gmock_mutex);
-  return VerifyAndClearExpectationsLocked(mock_obj);
-}
-
-// Verifies all expectations on the given mock object and clears its
-// default actions and expectations.  Returns true if and only if the
-// verification was successful.
-bool Mock::VerifyAndClear(void* mock_obj)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  internal::MutexLock l(&internal::g_gmock_mutex);
-  ClearDefaultActionsLocked(mock_obj);
-  return VerifyAndClearExpectationsLocked(mock_obj);
-}
-
-// Verifies and clears all expectations on the given mock object.  If
-// the expectations aren't satisfied, generates one or more Google
-// Test non-fatal failures and returns false.
-bool Mock::VerifyAndClearExpectationsLocked(void* mock_obj)
-    GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex) {
-  internal::g_gmock_mutex.AssertHeld();
-  if (g_mock_object_registry.states().count(mock_obj) == 0) {
-    // No EXPECT_CALL() was set on the given mock object.
-    return true;
-  }
-
-  // Verifies and clears the expectations on each mock method in the
-  // given mock object.
-  bool expectations_met = true;
-  FunctionMockers& mockers =
-      g_mock_object_registry.states()[mock_obj].function_mockers;
-  for (FunctionMockers::const_iterator it = mockers.begin();
-       it != mockers.end(); ++it) {
-    if (!(*it)->VerifyAndClearExpectationsLocked()) {
-      expectations_met = false;
-    }
-  }
-
-  // We don't clear the content of mockers, as they may still be
-  // needed by ClearDefaultActionsLocked().
-  return expectations_met;
-}
-
-bool Mock::IsNaggy(void* mock_obj)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  return Mock::GetReactionOnUninterestingCalls(mock_obj) == internal::kWarn;
-}
-bool Mock::IsNice(void* mock_obj)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  return Mock::GetReactionOnUninterestingCalls(mock_obj) == internal::kAllow;
-}
-bool Mock::IsStrict(void* mock_obj)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  return Mock::GetReactionOnUninterestingCalls(mock_obj) == internal::kFail;
-}
-
-// Registers a mock object and a mock method it owns.
-void Mock::Register(const void* mock_obj,
-                    internal::UntypedFunctionMockerBase* mocker)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  internal::MutexLock l(&internal::g_gmock_mutex);
-  g_mock_object_registry.states()[mock_obj].function_mockers.insert(mocker);
-}
-
-// Tells Google Mock where in the source code mock_obj is used in an
-// ON_CALL or EXPECT_CALL.  In case mock_obj is leaked, this
-// information helps the user identify which object it is.
-void Mock::RegisterUseByOnCallOrExpectCall(const void* mock_obj,
-                                           const char* file, int line)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  internal::MutexLock l(&internal::g_gmock_mutex);
-  MockObjectState& state = g_mock_object_registry.states()[mock_obj];
-  if (state.first_used_file == nullptr) {
-    state.first_used_file = file;
-    state.first_used_line = line;
-    const TestInfo* const test_info =
-        UnitTest::GetInstance()->current_test_info();
-    if (test_info != nullptr) {
-      state.first_used_test_suite = test_info->test_suite_name();
-      state.first_used_test = test_info->name();
-    }
-  }
-}
-
-// Unregisters a mock method; removes the owning mock object from the
-// registry when the last mock method associated with it has been
-// unregistered.  This is called only in the destructor of
-// FunctionMockerBase.
-void Mock::UnregisterLocked(internal::UntypedFunctionMockerBase* mocker)
-    GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex) {
-  internal::g_gmock_mutex.AssertHeld();
-  for (MockObjectRegistry::StateMap::iterator it =
-           g_mock_object_registry.states().begin();
-       it != g_mock_object_registry.states().end(); ++it) {
-    FunctionMockers& mockers = it->second.function_mockers;
-    if (mockers.erase(mocker) > 0) {
-      // mocker was in mockers and has been just removed.
-      if (mockers.empty()) {
-        g_mock_object_registry.states().erase(it);
-      }
-      return;
-    }
-  }
-}
-
-// Clears all ON_CALL()s set on the given mock object.
-void Mock::ClearDefaultActionsLocked(void* mock_obj)
-    GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex) {
-  internal::g_gmock_mutex.AssertHeld();
-
-  if (g_mock_object_registry.states().count(mock_obj) == 0) {
-    // No ON_CALL() was set on the given mock object.
-    return;
-  }
-
-  // Clears the default actions for each mock method in the given mock
-  // object.
-  FunctionMockers& mockers =
-      g_mock_object_registry.states()[mock_obj].function_mockers;
-  for (FunctionMockers::const_iterator it = mockers.begin();
-       it != mockers.end(); ++it) {
-    (*it)->ClearDefaultActionsLocked();
-  }
-
-  // We don't clear the content of mockers, as they may still be
-  // needed by VerifyAndClearExpectationsLocked().
-}
-
-Expectation::Expectation() {}
-
-Expectation::Expectation(
-    const std::shared_ptr<internal::ExpectationBase>& an_expectation_base)
-    : expectation_base_(an_expectation_base) {}
-
-Expectation::~Expectation() {}
-
-// Adds an expectation to a sequence.
-void Sequence::AddExpectation(const Expectation& expectation) const {
-  if (*last_expectation_ != expectation) {
-    if (last_expectation_->expectation_base() != nullptr) {
-      expectation.expectation_base()->immediate_prerequisites_
-          += *last_expectation_;
-    }
-    *last_expectation_ = expectation;
-  }
-}
-
-// Creates the implicit sequence if there isn't one.
-InSequence::InSequence() {
-  if (internal::g_gmock_implicit_sequence.get() == nullptr) {
-    internal::g_gmock_implicit_sequence.set(new Sequence);
-    sequence_created_ = true;
-  } else {
-    sequence_created_ = false;
-  }
-}
-
-// Deletes the implicit sequence if it was created by the constructor
-// of this object.
-InSequence::~InSequence() {
-  if (sequence_created_) {
-    delete internal::g_gmock_implicit_sequence.get();
-    internal::g_gmock_implicit_sequence.set(nullptr);
-  }
-}
-
-}  // namespace testing
-
-#ifdef _MSC_VER
-#if _MSC_VER == 1900
-#  pragma warning(pop)
-#endif
-#endif
diff --git a/gnu/llvm/llvm/utils/unittest/googlemock/src/gmock.cc b/gnu/llvm/llvm/utils/unittest/googlemock/src/gmock.cc
deleted file mode 100644
index 32b2a7394fd..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googlemock/src/gmock.cc
+++ /dev/null
@@ -1,213 +0,0 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-#include "gmock/gmock.h"
-#include "gmock/internal/gmock-port.h"
-
-namespace testing {
-
-GMOCK_DEFINE_bool_(catch_leaked_mocks, true,
-                   "true if and only if Google Mock should report leaked "
-                   "mock objects as failures.");
-
-GMOCK_DEFINE_string_(verbose, internal::kWarningVerbosity,
-                     "Controls how verbose Google Mock's output is."
-                     "  Valid values:\n"
-                     "  info    - prints all messages.\n"
-                     "  warning - prints warnings and errors.\n"
-                     "  error   - prints errors only.");
-
-GMOCK_DEFINE_int32_(default_mock_behavior, 1,
-                    "Controls the default behavior of mocks."
-                    "  Valid values:\n"
-                    "  0 - by default, mocks act as NiceMocks.\n"
-                    "  1 - by default, mocks act as NaggyMocks.\n"
-                    "  2 - by default, mocks act as StrictMocks.");
-
-namespace internal {
-
-// Parses a string as a command line flag.  The string should have the
-// format "--gmock_flag=value".  When def_optional is true, the
-// "=value" part can be omitted.
-//
-// Returns the value of the flag, or NULL if the parsing failed.
-static const char* ParseGoogleMockFlagValue(const char* str,
-                                            const char* flag,
-                                            bool def_optional) {
-  // str and flag must not be NULL.
-  if (str == nullptr || flag == nullptr) return nullptr;
-
-  // The flag must start with "--gmock_".
-  const std::string flag_str = std::string("--gmock_") + flag;
-  const size_t flag_len = flag_str.length();
-  if (strncmp(str, flag_str.c_str(), flag_len) != 0) return nullptr;
-
-  // Skips the flag name.
-  const char* flag_end = str + flag_len;
-
-  // When def_optional is true, it's OK to not have a "=value" part.
-  if (def_optional && (flag_end[0] == '\0')) {
-    return flag_end;
-  }
-
-  // If def_optional is true and there are more characters after the
-  // flag name, or if def_optional is false, there must be a '=' after
-  // the flag name.
-  if (flag_end[0] != '=') return nullptr;
-
-  // Returns the string after "=".
-  return flag_end + 1;
-}
-
-// Parses a string for a Google Mock bool flag, in the form of
-// "--gmock_flag=value".
-//
-// On success, stores the value of the flag in *value, and returns
-// true.  On failure, returns false without changing *value.
-static bool ParseGoogleMockBoolFlag(const char* str, const char* flag,
-                                    bool* value) {
-  // Gets the value of the flag as a string.
-  const char* const value_str = ParseGoogleMockFlagValue(str, flag, true);
-
-  // Aborts if the parsing failed.
-  if (value_str == nullptr) return false;
-
-  // Converts the string value to a bool.
-  *value = !(*value_str == '0' || *value_str == 'f' || *value_str == 'F');
-  return true;
-}
-
-// Parses a string for a Google Mock string flag, in the form of
-// "--gmock_flag=value".
-//
-// On success, stores the value of the flag in *value, and returns
-// true.  On failure, returns false without changing *value.
-template <typename String>
-static bool ParseGoogleMockStringFlag(const char* str, const char* flag,
-                                      String* value) {
-  // Gets the value of the flag as a string.
-  const char* const value_str = ParseGoogleMockFlagValue(str, flag, false);
-
-  // Aborts if the parsing failed.
-  if (value_str == nullptr) return false;
-
-  // Sets *value to the value of the flag.
-  *value = value_str;
-  return true;
-}
-
-static bool ParseGoogleMockIntFlag(const char* str, const char* flag,
-                                   int* value) {
-  // Gets the value of the flag as a string.
-  const char* const value_str = ParseGoogleMockFlagValue(str, flag, true);
-
-  // Aborts if the parsing failed.
-  if (value_str == nullptr) return false;
-
-  // Sets *value to the value of the flag.
-  return ParseInt32(Message() << "The value of flag --" << flag,
-                    value_str, value);
-}
-
-// The internal implementation of InitGoogleMock().
-//
-// The type parameter CharType can be instantiated to either char or
-// wchar_t.
-template <typename CharType>
-void InitGoogleMockImpl(int* argc, CharType** argv) {
-  // Makes sure Google Test is initialized.  InitGoogleTest() is
-  // idempotent, so it's fine if the user has already called it.
-  InitGoogleTest(argc, argv);
-  if (*argc <= 0) return;
-
-  for (int i = 1; i != *argc; i++) {
-    const std::string arg_string = StreamableToString(argv[i]);
-    const char* const arg = arg_string.c_str();
-
-    // Do we see a Google Mock flag?
-    if (ParseGoogleMockBoolFlag(arg, "catch_leaked_mocks",
-                                &GMOCK_FLAG(catch_leaked_mocks)) ||
-        ParseGoogleMockStringFlag(arg, "verbose", &GMOCK_FLAG(verbose)) ||
-        ParseGoogleMockIntFlag(arg, "default_mock_behavior",
-                               &GMOCK_FLAG(default_mock_behavior))) {
-      // Yes.  Shift the remainder of the argv list left by one.  Note
-      // that argv has (*argc + 1) elements, the last one always being
-      // NULL.  The following loop moves the trailing NULL element as
-      // well.
-      for (int j = i; j != *argc; j++) {
-        argv[j] = argv[j + 1];
-      }
-
-      // Decrements the argument count.
-      (*argc)--;
-
-      // We also need to decrement the iterator as we just removed
-      // an element.
-      i--;
-    }
-  }
-}
-
-}  // namespace internal
-
-// Initializes Google Mock.  This must be called before running the
-// tests.  In particular, it parses a command line for the flags that
-// Google Mock recognizes.  Whenever a Google Mock flag is seen, it is
-// removed from argv, and *argc is decremented.
-//
-// No value is returned.  Instead, the Google Mock flag variables are
-// updated.
-//
-// Since Google Test is needed for Google Mock to work, this function
-// also initializes Google Test and parses its flags, if that hasn't
-// been done.
-GTEST_API_ void InitGoogleMock(int* argc, char** argv) {
-  internal::InitGoogleMockImpl(argc, argv);
-}
-
-// This overloaded version can be used in Windows programs compiled in
-// UNICODE mode.
-GTEST_API_ void InitGoogleMock(int* argc, wchar_t** argv) {
-  internal::InitGoogleMockImpl(argc, argv);
-}
-
-// This overloaded version can be used on Arduino/embedded platforms where
-// there is no argc/argv.
-GTEST_API_ void InitGoogleMock() {
-  // Since Arduino doesn't have a command line, fake out the argc/argv arguments
-  int argc = 1;
-  const auto arg0 = "dummy";
-  char* argv0 = const_cast<char*>(arg0);
-  char** argv = &argv0;
-
-  internal::InitGoogleMockImpl(&argc, argv);
-}
-
-}  // namespace testing
diff --git a/gnu/llvm/llvm/utils/unittest/googletest/LICENSE.TXT b/gnu/llvm/llvm/utils/unittest/googletest/LICENSE.TXT
deleted file mode 100644
index 1941a11f8ce..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googletest/LICENSE.TXT
+++ /dev/null
@@ -1,28 +0,0 @@
-Copyright 2008, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/gnu/llvm/llvm/utils/unittest/googletest/README.LLVM b/gnu/llvm/llvm/utils/unittest/googletest/README.LLVM
deleted file mode 100644
index fea59e5e068..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googletest/README.LLVM
+++ /dev/null
@@ -1,21 +0,0 @@
-LLVM notes
-----------
-
-This directory contains Google Test 1.10.0, with all elements removed except for
-the actual source code, to minimize the addition to the LLVM distribution.
-
-Cleaned up as follows:
-
-# Remove all the unnecessary files and directories
-$ rm -f CMakeLists.txt configure* Makefile* CHANGES CONTRIBUTORS README README.md .gitignore
-$ rm -rf build-aux cmake codegear m4 make msvc samples scripts test xcode docs
-$ rm -f `find . -name \*\.pump`
-$ rm -f src/gtest_main.cc
-
-# Put the license in the consistent place for LLVM.
-$ mv LICENSE LICENSE.TXT
-
-Modified as follows:
-* Added support for NetBSD, Minix and Haiku.
-* Added raw_os_ostream support to include/gtest/internal/custom/gtest-printers.h.
-* Added StringRef support to include/gtest/internal/custom/gtest-printers.h.
diff --git a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-death-test.h b/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-death-test.h
deleted file mode 100644
index dc878ffbb3a..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-death-test.h
+++ /dev/null
@@ -1,343 +0,0 @@
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-//
-// The Google C++ Testing and Mocking Framework (Google Test)
-//
-// This header file defines the public API for death tests.  It is
-// #included by gtest.h so a user doesn't need to include this
-// directly.
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GTEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_
-#define GTEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_
-
-#include "gtest/internal/gtest-death-test-internal.h"
-
-namespace testing {
-
-// This flag controls the style of death tests.  Valid values are "threadsafe",
-// meaning that the death test child process will re-execute the test binary
-// from the start, running only a single death test, or "fast",
-// meaning that the child process will execute the test logic immediately
-// after forking.
-GTEST_DECLARE_string_(death_test_style);
-
-#if GTEST_HAS_DEATH_TEST
-
-namespace internal {
-
-// Returns a Boolean value indicating whether the caller is currently
-// executing in the context of the death test child process.  Tools such as
-// Valgrind heap checkers may need this to modify their behavior in death
-// tests.  IMPORTANT: This is an internal utility.  Using it may break the
-// implementation of death tests.  User code MUST NOT use it.
-GTEST_API_ bool InDeathTestChild();
-
-}  // namespace internal
-
-// The following macros are useful for writing death tests.
-
-// Here's what happens when an ASSERT_DEATH* or EXPECT_DEATH* is
-// executed:
-//
-//   1. It generates a warning if there is more than one active
-//   thread.  This is because it's safe to fork() or clone() only
-//   when there is a single thread.
-//
-//   2. The parent process clone()s a sub-process and runs the death
-//   test in it; the sub-process exits with code 0 at the end of the
-//   death test, if it hasn't exited already.
-//
-//   3. The parent process waits for the sub-process to terminate.
-//
-//   4. The parent process checks the exit code and error message of
-//   the sub-process.
-//
-// Examples:
-//
-//   ASSERT_DEATH(server.SendMessage(56, "Hello"), "Invalid port number");
-//   for (int i = 0; i < 5; i++) {
-//     EXPECT_DEATH(server.ProcessRequest(i),
-//                  "Invalid request .* in ProcessRequest()")
-//                  << "Failed to die on request " << i;
-//   }
-//
-//   ASSERT_EXIT(server.ExitNow(), ::testing::ExitedWithCode(0), "Exiting");
-//
-//   bool KilledBySIGHUP(int exit_code) {
-//     return WIFSIGNALED(exit_code) && WTERMSIG(exit_code) == SIGHUP;
-//   }
-//
-//   ASSERT_EXIT(client.HangUpServer(), KilledBySIGHUP, "Hanging up!");
-//
-// On the regular expressions used in death tests:
-//
-//   GOOGLETEST_CM0005 DO NOT DELETE
-//   On POSIX-compliant systems (*nix), we use the <regex.h> library,
-//   which uses the POSIX extended regex syntax.
-//
-//   On other platforms (e.g. Windows or Mac), we only support a simple regex
-//   syntax implemented as part of Google Test.  This limited
-//   implementation should be enough most of the time when writing
-//   death tests; though it lacks many features you can find in PCRE
-//   or POSIX extended regex syntax.  For example, we don't support
-//   union ("x|y"), grouping ("(xy)"), brackets ("[xy]"), and
-//   repetition count ("x{5,7}"), among others.
-//
-//   Below is the syntax that we do support.  We chose it to be a
-//   subset of both PCRE and POSIX extended regex, so it's easy to
-//   learn wherever you come from.  In the following: 'A' denotes a
-//   literal character, period (.), or a single \\ escape sequence;
-//   'x' and 'y' denote regular expressions; 'm' and 'n' are for
-//   natural numbers.
-//
-//     c     matches any literal character c
-//     \\d   matches any decimal digit
-//     \\D   matches any character that's not a decimal digit
-//     \\f   matches \f
-//     \\n   matches \n
-//     \\r   matches \r
-//     \\s   matches any ASCII whitespace, including \n
-//     \\S   matches any character that's not a whitespace
-//     \\t   matches \t
-//     \\v   matches \v
-//     \\w   matches any letter, _, or decimal digit
-//     \\W   matches any character that \\w doesn't match
-//     \\c   matches any literal character c, which must be a punctuation
-//     .     matches any single character except \n
-//     A?    matches 0 or 1 occurrences of A
-//     A*    matches 0 or many occurrences of A
-//     A+    matches 1 or many occurrences of A
-//     ^     matches the beginning of a string (not that of each line)
-//     $     matches the end of a string (not that of each line)
-//     xy    matches x followed by y
-//
-//   If you accidentally use PCRE or POSIX extended regex features
-//   not implemented by us, you will get a run-time failure.  In that
-//   case, please try to rewrite your regular expression within the
-//   above syntax.
-//
-//   This implementation is *not* meant to be as highly tuned or robust
-//   as a compiled regex library, but should perform well enough for a
-//   death test, which already incurs significant overhead by launching
-//   a child process.
-//
-// Known caveats:
-//
-//   A "threadsafe" style death test obtains the path to the test
-//   program from argv[0] and re-executes it in the sub-process.  For
-//   simplicity, the current implementation doesn't search the PATH
-//   when launching the sub-process.  This means that the user must
-//   invoke the test program via a path that contains at least one
-//   path separator (e.g. path/to/foo_test and
-//   /absolute/path/to/bar_test are fine, but foo_test is not).  This
-//   is rarely a problem as people usually don't put the test binary
-//   directory in PATH.
-//
-
-// Asserts that a given statement causes the program to exit, with an
-// integer exit status that satisfies predicate, and emitting error output
-// that matches regex.
-# define ASSERT_EXIT(statement, predicate, regex) \
-    GTEST_DEATH_TEST_(statement, predicate, regex, GTEST_FATAL_FAILURE_)
-
-// Like ASSERT_EXIT, but continues on to successive tests in the
-// test suite, if any:
-# define EXPECT_EXIT(statement, predicate, regex) \
-    GTEST_DEATH_TEST_(statement, predicate, regex, GTEST_NONFATAL_FAILURE_)
-
-// Asserts that a given statement causes the program to exit, either by
-// explicitly exiting with a nonzero exit code or being killed by a
-// signal, and emitting error output that matches regex.
-# define ASSERT_DEATH(statement, regex) \
-    ASSERT_EXIT(statement, ::testing::internal::ExitedUnsuccessfully, regex)
-
-// Like ASSERT_DEATH, but continues on to successive tests in the
-// test suite, if any:
-# define EXPECT_DEATH(statement, regex) \
-    EXPECT_EXIT(statement, ::testing::internal::ExitedUnsuccessfully, regex)
-
-// Two predicate classes that can be used in {ASSERT,EXPECT}_EXIT*:
-
-// Tests that an exit code describes a normal exit with a given exit code.
-class GTEST_API_ ExitedWithCode {
- public:
-  explicit ExitedWithCode(int exit_code);
-  bool operator()(int exit_status) const;
- private:
-  // No implementation - assignment is unsupported.
-  void operator=(const ExitedWithCode& other);
-
-  const int exit_code_;
-};
-
-# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
-// Tests that an exit code describes an exit due to termination by a
-// given signal.
-// GOOGLETEST_CM0006 DO NOT DELETE
-class GTEST_API_ KilledBySignal {
- public:
-  explicit KilledBySignal(int signum);
-  bool operator()(int exit_status) const;
- private:
-  const int signum_;
-};
-# endif  // !GTEST_OS_WINDOWS
-
-// EXPECT_DEBUG_DEATH asserts that the given statements die in debug mode.
-// The death testing framework causes this to have interesting semantics,
-// since the sideeffects of the call are only visible in opt mode, and not
-// in debug mode.
-//
-// In practice, this can be used to test functions that utilize the
-// LOG(DFATAL) macro using the following style:
-//
-// int DieInDebugOr12(int* sideeffect) {
-//   if (sideeffect) {
-//     *sideeffect = 12;
-//   }
-//   LOG(DFATAL) << "death";
-//   return 12;
-// }
-//
-// TEST(TestSuite, TestDieOr12WorksInDgbAndOpt) {
-//   int sideeffect = 0;
-//   // Only asserts in dbg.
-//   EXPECT_DEBUG_DEATH(DieInDebugOr12(&sideeffect), "death");
-//
-// #ifdef NDEBUG
-//   // opt-mode has sideeffect visible.
-//   EXPECT_EQ(12, sideeffect);
-// #else
-//   // dbg-mode no visible sideeffect.
-//   EXPECT_EQ(0, sideeffect);
-// #endif
-// }
-//
-// This will assert that DieInDebugReturn12InOpt() crashes in debug
-// mode, usually due to a DCHECK or LOG(DFATAL), but returns the
-// appropriate fallback value (12 in this case) in opt mode. If you
-// need to test that a function has appropriate side-effects in opt
-// mode, include assertions against the side-effects.  A general
-// pattern for this is:
-//
-// EXPECT_DEBUG_DEATH({
-//   // Side-effects here will have an effect after this statement in
-//   // opt mode, but none in debug mode.
-//   EXPECT_EQ(12, DieInDebugOr12(&sideeffect));
-// }, "death");
-//
-# ifdef NDEBUG
-
-#  define EXPECT_DEBUG_DEATH(statement, regex) \
-  GTEST_EXECUTE_STATEMENT_(statement, regex)
-
-#  define ASSERT_DEBUG_DEATH(statement, regex) \
-  GTEST_EXECUTE_STATEMENT_(statement, regex)
-
-# else
-
-#  define EXPECT_DEBUG_DEATH(statement, regex) \
-  EXPECT_DEATH(statement, regex)
-
-#  define ASSERT_DEBUG_DEATH(statement, regex) \
-  ASSERT_DEATH(statement, regex)
-
-# endif  // NDEBUG for EXPECT_DEBUG_DEATH
-#endif  // GTEST_HAS_DEATH_TEST
-
-// This macro is used for implementing macros such as
-// EXPECT_DEATH_IF_SUPPORTED and ASSERT_DEATH_IF_SUPPORTED on systems where
-// death tests are not supported. Those macros must compile on such systems
-// if and only if EXPECT_DEATH and ASSERT_DEATH compile with the same parameters
-// on systems that support death tests. This allows one to write such a macro on
-// a system that does not support death tests and be sure that it will compile
-// on a death-test supporting system. It is exposed publicly so that systems
-// that have death-tests with stricter requirements than GTEST_HAS_DEATH_TEST
-// can write their own equivalent of EXPECT_DEATH_IF_SUPPORTED and
-// ASSERT_DEATH_IF_SUPPORTED.
-//
-// Parameters:
-//   statement -  A statement that a macro such as EXPECT_DEATH would test
-//                for program termination. This macro has to make sure this
-//                statement is compiled but not executed, to ensure that
-//                EXPECT_DEATH_IF_SUPPORTED compiles with a certain
-//                parameter if and only if EXPECT_DEATH compiles with it.
-//   regex     -  A regex that a macro such as EXPECT_DEATH would use to test
-//                the output of statement.  This parameter has to be
-//                compiled but not evaluated by this macro, to ensure that
-//                this macro only accepts expressions that a macro such as
-//                EXPECT_DEATH would accept.
-//   terminator - Must be an empty statement for EXPECT_DEATH_IF_SUPPORTED
-//                and a return statement for ASSERT_DEATH_IF_SUPPORTED.
-//                This ensures that ASSERT_DEATH_IF_SUPPORTED will not
-//                compile inside functions where ASSERT_DEATH doesn't
-//                compile.
-//
-//  The branch that has an always false condition is used to ensure that
-//  statement and regex are compiled (and thus syntactically correct) but
-//  never executed. The unreachable code macro protects the terminator
-//  statement from generating an 'unreachable code' warning in case
-//  statement unconditionally returns or throws. The Message constructor at
-//  the end allows the syntax of streaming additional messages into the
-//  macro, for compilational compatibility with EXPECT_DEATH/ASSERT_DEATH.
-# define GTEST_UNSUPPORTED_DEATH_TEST(statement, regex, terminator) \
-    GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
-    if (::testing::internal::AlwaysTrue()) { \
-      GTEST_LOG_(WARNING) \
-          << "Death tests are not supported on this platform.\n" \
-          << "Statement '" #statement "' cannot be verified."; \
-    } else if (::testing::internal::AlwaysFalse()) { \
-      ::testing::internal::RE::PartialMatch(".*", (regex)); \
-      GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
-      terminator; \
-    } else \
-      ::testing::Message()
-
-// EXPECT_DEATH_IF_SUPPORTED(statement, regex) and
-// ASSERT_DEATH_IF_SUPPORTED(statement, regex) expand to real death tests if
-// death tests are supported; otherwise they just issue a warning.  This is
-// useful when you are combining death test assertions with normal test
-// assertions in one test.
-#if GTEST_HAS_DEATH_TEST
-# define EXPECT_DEATH_IF_SUPPORTED(statement, regex) \
-    EXPECT_DEATH(statement, regex)
-# define ASSERT_DEATH_IF_SUPPORTED(statement, regex) \
-    ASSERT_DEATH(statement, regex)
-#else
-# define EXPECT_DEATH_IF_SUPPORTED(statement, regex) \
-    GTEST_UNSUPPORTED_DEATH_TEST(statement, regex, )
-# define ASSERT_DEATH_IF_SUPPORTED(statement, regex) \
-    GTEST_UNSUPPORTED_DEATH_TEST(statement, regex, return)
-#endif
-
-}  // namespace testing
-
-#endif  // GTEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-matchers.h b/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-matchers.h
deleted file mode 100644
index 9de6c2e10a2..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-matchers.h
+++ /dev/null
@@ -1,750 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// The Google C++ Testing and Mocking Framework (Google Test)
-//
-// This file implements just enough of the matcher interface to allow
-// EXPECT_DEATH and friends to accept a matcher argument.
-
-// IWYU pragma: private, include "testing/base/public/gunit.h"
-// IWYU pragma: friend third_party/googletest/googlemock/.*
-// IWYU pragma: friend third_party/googletest/googletest/.*
-
-#ifndef GTEST_INCLUDE_GTEST_GTEST_MATCHERS_H_
-#define GTEST_INCLUDE_GTEST_GTEST_MATCHERS_H_
-
-#include <memory>
-#include <ostream>
-#include <string>
-#include <type_traits>
-
-#include "gtest/gtest-printers.h"
-#include "gtest/internal/gtest-internal.h"
-#include "gtest/internal/gtest-port.h"
-
-// MSVC warning C5046 is new as of VS2017 version 15.8.
-#if defined(_MSC_VER) && _MSC_VER >= 1915
-#define GTEST_MAYBE_5046_ 5046
-#else
-#define GTEST_MAYBE_5046_
-#endif
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(
-    4251 GTEST_MAYBE_5046_ /* class A needs to have dll-interface to be used by
-                              clients of class B */
-    /* Symbol involving type with internal linkage not defined */)
-
-namespace testing {
-
-// To implement a matcher Foo for type T, define:
-//   1. a class FooMatcherImpl that implements the
-//      MatcherInterface<T> interface, and
-//   2. a factory function that creates a Matcher<T> object from a
-//      FooMatcherImpl*.
-//
-// The two-level delegation design makes it possible to allow a user
-// to write "v" instead of "Eq(v)" where a Matcher is expected, which
-// is impossible if we pass matchers by pointers.  It also eases
-// ownership management as Matcher objects can now be copied like
-// plain values.
-
-// MatchResultListener is an abstract class.  Its << operator can be
-// used by a matcher to explain why a value matches or doesn't match.
-//
-class MatchResultListener {
- public:
-  // Creates a listener object with the given underlying ostream.  The
-  // listener does not own the ostream, and does not dereference it
-  // in the constructor or destructor.
-  explicit MatchResultListener(::std::ostream* os) : stream_(os) {}
-  virtual ~MatchResultListener() = 0;  // Makes this class abstract.
-
-  // Streams x to the underlying ostream; does nothing if the ostream
-  // is NULL.
-  template <typename T>
-  MatchResultListener& operator<<(const T& x) {
-    if (stream_ != nullptr) *stream_ << x;
-    return *this;
-  }
-
-  // Returns the underlying ostream.
-  ::std::ostream* stream() { return stream_; }
-
-  // Returns true if and only if the listener is interested in an explanation
-  // of the match result.  A matcher's MatchAndExplain() method can use
-  // this information to avoid generating the explanation when no one
-  // intends to hear it.
-  bool IsInterested() const { return stream_ != nullptr; }
-
- private:
-  ::std::ostream* const stream_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(MatchResultListener);
-};
-
-inline MatchResultListener::~MatchResultListener() {
-}
-
-// An instance of a subclass of this knows how to describe itself as a
-// matcher.
-class MatcherDescriberInterface {
- public:
-  virtual ~MatcherDescriberInterface() {}
-
-  // Describes this matcher to an ostream.  The function should print
-  // a verb phrase that describes the property a value matching this
-  // matcher should have.  The subject of the verb phrase is the value
-  // being matched.  For example, the DescribeTo() method of the Gt(7)
-  // matcher prints "is greater than 7".
-  virtual void DescribeTo(::std::ostream* os) const = 0;
-
-  // Describes the negation of this matcher to an ostream.  For
-  // example, if the description of this matcher is "is greater than
-  // 7", the negated description could be "is not greater than 7".
-  // You are not required to override this when implementing
-  // MatcherInterface, but it is highly advised so that your matcher
-  // can produce good error messages.
-  virtual void DescribeNegationTo(::std::ostream* os) const {
-    *os << "not (";
-    DescribeTo(os);
-    *os << ")";
-  }
-};
-
-// The implementation of a matcher.
-template <typename T>
-class MatcherInterface : public MatcherDescriberInterface {
- public:
-  // Returns true if and only if the matcher matches x; also explains the
-  // match result to 'listener' if necessary (see the next paragraph), in
-  // the form of a non-restrictive relative clause ("which ...",
-  // "whose ...", etc) that describes x.  For example, the
-  // MatchAndExplain() method of the Pointee(...) matcher should
-  // generate an explanation like "which points to ...".
-  //
-  // Implementations of MatchAndExplain() should add an explanation of
-  // the match result *if and only if* they can provide additional
-  // information that's not already present (or not obvious) in the
-  // print-out of x and the matcher's description.  Whether the match
-  // succeeds is not a factor in deciding whether an explanation is
-  // needed, as sometimes the caller needs to print a failure message
-  // when the match succeeds (e.g. when the matcher is used inside
-  // Not()).
-  //
-  // For example, a "has at least 10 elements" matcher should explain
-  // what the actual element count is, regardless of the match result,
-  // as it is useful information to the reader; on the other hand, an
-  // "is empty" matcher probably only needs to explain what the actual
-  // size is when the match fails, as it's redundant to say that the
-  // size is 0 when the value is already known to be empty.
-  //
-  // You should override this method when defining a new matcher.
-  //
-  // It's the responsibility of the caller (Google Test) to guarantee
-  // that 'listener' is not NULL.  This helps to simplify a matcher's
-  // implementation when it doesn't care about the performance, as it
-  // can talk to 'listener' without checking its validity first.
-  // However, in order to implement dummy listeners efficiently,
-  // listener->stream() may be NULL.
-  virtual bool MatchAndExplain(T x, MatchResultListener* listener) const = 0;
-
-  // Inherits these methods from MatcherDescriberInterface:
-  //   virtual void DescribeTo(::std::ostream* os) const = 0;
-  //   virtual void DescribeNegationTo(::std::ostream* os) const;
-};
-
-namespace internal {
-
-// Converts a MatcherInterface<T> to a MatcherInterface<const T&>.
-template <typename T>
-class MatcherInterfaceAdapter : public MatcherInterface<const T&> {
- public:
-  explicit MatcherInterfaceAdapter(const MatcherInterface<T>* impl)
-      : impl_(impl) {}
-  ~MatcherInterfaceAdapter() override { delete impl_; }
-
-  void DescribeTo(::std::ostream* os) const override { impl_->DescribeTo(os); }
-
-  void DescribeNegationTo(::std::ostream* os) const override {
-    impl_->DescribeNegationTo(os);
-  }
-
-  bool MatchAndExplain(const T& x,
-                       MatchResultListener* listener) const override {
-    return impl_->MatchAndExplain(x, listener);
-  }
-
- private:
-  const MatcherInterface<T>* const impl_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(MatcherInterfaceAdapter);
-};
-
-struct AnyEq {
-  template <typename A, typename B>
-  bool operator()(const A& a, const B& b) const { return a == b; }
-};
-struct AnyNe {
-  template <typename A, typename B>
-  bool operator()(const A& a, const B& b) const { return a != b; }
-};
-struct AnyLt {
-  template <typename A, typename B>
-  bool operator()(const A& a, const B& b) const { return a < b; }
-};
-struct AnyGt {
-  template <typename A, typename B>
-  bool operator()(const A& a, const B& b) const { return a > b; }
-};
-struct AnyLe {
-  template <typename A, typename B>
-  bool operator()(const A& a, const B& b) const { return a <= b; }
-};
-struct AnyGe {
-  template <typename A, typename B>
-  bool operator()(const A& a, const B& b) const { return a >= b; }
-};
-
-// A match result listener that ignores the explanation.
-class DummyMatchResultListener : public MatchResultListener {
- public:
-  DummyMatchResultListener() : MatchResultListener(nullptr) {}
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(DummyMatchResultListener);
-};
-
-// A match result listener that forwards the explanation to a given
-// ostream.  The difference between this and MatchResultListener is
-// that the former is concrete.
-class StreamMatchResultListener : public MatchResultListener {
- public:
-  explicit StreamMatchResultListener(::std::ostream* os)
-      : MatchResultListener(os) {}
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(StreamMatchResultListener);
-};
-
-// An internal class for implementing Matcher<T>, which will derive
-// from it.  We put functionalities common to all Matcher<T>
-// specializations here to avoid code duplication.
-template <typename T>
-class MatcherBase {
- public:
-  // Returns true if and only if the matcher matches x; also explains the
-  // match result to 'listener'.
-  bool MatchAndExplain(const T& x, MatchResultListener* listener) const {
-    return impl_->MatchAndExplain(x, listener);
-  }
-
-  // Returns true if and only if this matcher matches x.
-  bool Matches(const T& x) const {
-    DummyMatchResultListener dummy;
-    return MatchAndExplain(x, &dummy);
-  }
-
-  // Describes this matcher to an ostream.
-  void DescribeTo(::std::ostream* os) const { impl_->DescribeTo(os); }
-
-  // Describes the negation of this matcher to an ostream.
-  void DescribeNegationTo(::std::ostream* os) const {
-    impl_->DescribeNegationTo(os);
-  }
-
-  // Explains why x matches, or doesn't match, the matcher.
-  void ExplainMatchResultTo(const T& x, ::std::ostream* os) const {
-    StreamMatchResultListener listener(os);
-    MatchAndExplain(x, &listener);
-  }
-
-  // Returns the describer for this matcher object; retains ownership
-  // of the describer, which is only guaranteed to be alive when
-  // this matcher object is alive.
-  const MatcherDescriberInterface* GetDescriber() const {
-    return impl_.get();
-  }
-
- protected:
-  MatcherBase() {}
-
-  // Constructs a matcher from its implementation.
-  explicit MatcherBase(const MatcherInterface<const T&>* impl) : impl_(impl) {}
-
-  template <typename U>
-  explicit MatcherBase(
-      const MatcherInterface<U>* impl,
-      typename std::enable_if<!std::is_same<U, const U&>::value>::type* =
-          nullptr)
-      : impl_(new internal::MatcherInterfaceAdapter<U>(impl)) {}
-
-  MatcherBase(const MatcherBase&) = default;
-  MatcherBase& operator=(const MatcherBase&) = default;
-  MatcherBase(MatcherBase&&) = default;
-  MatcherBase& operator=(MatcherBase&&) = default;
-
-  virtual ~MatcherBase() {}
-
- private:
-  std::shared_ptr<const MatcherInterface<const T&>> impl_;
-};
-
-}  // namespace internal
-
-// A Matcher<T> is a copyable and IMMUTABLE (except by assignment)
-// object that can check whether a value of type T matches.  The
-// implementation of Matcher<T> is just a std::shared_ptr to const
-// MatcherInterface<T>.  Don't inherit from Matcher!
-template <typename T>
-class Matcher : public internal::MatcherBase<T> {
- public:
-  // Constructs a null matcher.  Needed for storing Matcher objects in STL
-  // containers.  A default-constructed matcher is not yet initialized.  You
-  // cannot use it until a valid value has been assigned to it.
-  explicit Matcher() {}  // NOLINT
-
-  // Constructs a matcher from its implementation.
-  explicit Matcher(const MatcherInterface<const T&>* impl)
-      : internal::MatcherBase<T>(impl) {}
-
-  template <typename U>
-  explicit Matcher(
-      const MatcherInterface<U>* impl,
-      typename std::enable_if<!std::is_same<U, const U&>::value>::type* =
-          nullptr)
-      : internal::MatcherBase<T>(impl) {}
-
-  // Implicit constructor here allows people to write
-  // EXPECT_CALL(foo, Bar(5)) instead of EXPECT_CALL(foo, Bar(Eq(5))) sometimes
-  Matcher(T value);  // NOLINT
-};
-
-// The following two specializations allow the user to write str
-// instead of Eq(str) and "foo" instead of Eq("foo") when a std::string
-// matcher is expected.
-template <>
-class GTEST_API_ Matcher<const std::string&>
-    : public internal::MatcherBase<const std::string&> {
- public:
-  Matcher() {}
-
-  explicit Matcher(const MatcherInterface<const std::string&>* impl)
-      : internal::MatcherBase<const std::string&>(impl) {}
-
-  // Allows the user to write str instead of Eq(str) sometimes, where
-  // str is a std::string object.
-  Matcher(const std::string& s);  // NOLINT
-
-  // Allows the user to write "foo" instead of Eq("foo") sometimes.
-  Matcher(const char* s);  // NOLINT
-};
-
-template <>
-class GTEST_API_ Matcher<std::string>
-    : public internal::MatcherBase<std::string> {
- public:
-  Matcher() {}
-
-  explicit Matcher(const MatcherInterface<const std::string&>* impl)
-      : internal::MatcherBase<std::string>(impl) {}
-  explicit Matcher(const MatcherInterface<std::string>* impl)
-      : internal::MatcherBase<std::string>(impl) {}
-
-  // Allows the user to write str instead of Eq(str) sometimes, where
-  // str is a string object.
-  Matcher(const std::string& s);  // NOLINT
-
-  // Allows the user to write "foo" instead of Eq("foo") sometimes.
-  Matcher(const char* s);  // NOLINT
-};
-
-#if GTEST_HAS_ABSL
-// The following two specializations allow the user to write str
-// instead of Eq(str) and "foo" instead of Eq("foo") when a absl::string_view
-// matcher is expected.
-template <>
-class GTEST_API_ Matcher<const absl::string_view&>
-    : public internal::MatcherBase<const absl::string_view&> {
- public:
-  Matcher() {}
-
-  explicit Matcher(const MatcherInterface<const absl::string_view&>* impl)
-      : internal::MatcherBase<const absl::string_view&>(impl) {}
-
-  // Allows the user to write str instead of Eq(str) sometimes, where
-  // str is a std::string object.
-  Matcher(const std::string& s);  // NOLINT
-
-  // Allows the user to write "foo" instead of Eq("foo") sometimes.
-  Matcher(const char* s);  // NOLINT
-
-  // Allows the user to pass absl::string_views directly.
-  Matcher(absl::string_view s);  // NOLINT
-};
-
-template <>
-class GTEST_API_ Matcher<absl::string_view>
-    : public internal::MatcherBase<absl::string_view> {
- public:
-  Matcher() {}
-
-  explicit Matcher(const MatcherInterface<const absl::string_view&>* impl)
-      : internal::MatcherBase<absl::string_view>(impl) {}
-  explicit Matcher(const MatcherInterface<absl::string_view>* impl)
-      : internal::MatcherBase<absl::string_view>(impl) {}
-
-  // Allows the user to write str instead of Eq(str) sometimes, where
-  // str is a std::string object.
-  Matcher(const std::string& s);  // NOLINT
-
-  // Allows the user to write "foo" instead of Eq("foo") sometimes.
-  Matcher(const char* s);  // NOLINT
-
-  // Allows the user to pass absl::string_views directly.
-  Matcher(absl::string_view s);  // NOLINT
-};
-#endif  // GTEST_HAS_ABSL
-
-// Prints a matcher in a human-readable format.
-template <typename T>
-std::ostream& operator<<(std::ostream& os, const Matcher<T>& matcher) {
-  matcher.DescribeTo(&os);
-  return os;
-}
-
-// The PolymorphicMatcher class template makes it easy to implement a
-// polymorphic matcher (i.e. a matcher that can match values of more
-// than one type, e.g. Eq(n) and NotNull()).
-//
-// To define a polymorphic matcher, a user should provide an Impl
-// class that has a DescribeTo() method and a DescribeNegationTo()
-// method, and define a member function (or member function template)
-//
-//   bool MatchAndExplain(const Value& value,
-//                        MatchResultListener* listener) const;
-//
-// See the definition of NotNull() for a complete example.
-template <class Impl>
-class PolymorphicMatcher {
- public:
-  explicit PolymorphicMatcher(const Impl& an_impl) : impl_(an_impl) {}
-
-  // Returns a mutable reference to the underlying matcher
-  // implementation object.
-  Impl& mutable_impl() { return impl_; }
-
-  // Returns an immutable reference to the underlying matcher
-  // implementation object.
-  const Impl& impl() const { return impl_; }
-
-  template <typename T>
-  operator Matcher<T>() const {
-    return Matcher<T>(new MonomorphicImpl<const T&>(impl_));
-  }
-
- private:
-  template <typename T>
-  class MonomorphicImpl : public MatcherInterface<T> {
-   public:
-    explicit MonomorphicImpl(const Impl& impl) : impl_(impl) {}
-
-    virtual void DescribeTo(::std::ostream* os) const { impl_.DescribeTo(os); }
-
-    virtual void DescribeNegationTo(::std::ostream* os) const {
-      impl_.DescribeNegationTo(os);
-    }
-
-    virtual bool MatchAndExplain(T x, MatchResultListener* listener) const {
-      return impl_.MatchAndExplain(x, listener);
-    }
-
-   private:
-    const Impl impl_;
-  };
-
-  Impl impl_;
-};
-
-// Creates a matcher from its implementation.
-// DEPRECATED: Especially in the generic code, prefer:
-//   Matcher<T>(new MyMatcherImpl<const T&>(...));
-//
-// MakeMatcher may create a Matcher that accepts its argument by value, which
-// leads to unnecessary copies & lack of support for non-copyable types.
-template <typename T>
-inline Matcher<T> MakeMatcher(const MatcherInterface<T>* impl) {
-  return Matcher<T>(impl);
-}
-
-// Creates a polymorphic matcher from its implementation.  This is
-// easier to use than the PolymorphicMatcher<Impl> constructor as it
-// doesn't require you to explicitly write the template argument, e.g.
-//
-//   MakePolymorphicMatcher(foo);
-// vs
-//   PolymorphicMatcher<TypeOfFoo>(foo);
-template <class Impl>
-inline PolymorphicMatcher<Impl> MakePolymorphicMatcher(const Impl& impl) {
-  return PolymorphicMatcher<Impl>(impl);
-}
-
-namespace internal {
-// Implements a matcher that compares a given value with a
-// pre-supplied value using one of the ==, <=, <, etc, operators.  The
-// two values being compared don't have to have the same type.
-//
-// The matcher defined here is polymorphic (for example, Eq(5) can be
-// used to match an int, a short, a double, etc).  Therefore we use
-// a template type conversion operator in the implementation.
-//
-// The following template definition assumes that the Rhs parameter is
-// a "bare" type (i.e. neither 'const T' nor 'T&').
-template <typename D, typename Rhs, typename Op>
-class ComparisonBase {
- public:
-  explicit ComparisonBase(const Rhs& rhs) : rhs_(rhs) {}
-  template <typename Lhs>
-  operator Matcher<Lhs>() const {
-    return Matcher<Lhs>(new Impl<const Lhs&>(rhs_));
-  }
-
- private:
-  template <typename T>
-  static const T& Unwrap(const T& v) { return v; }
-  template <typename T>
-  static const T& Unwrap(std::reference_wrapper<T> v) { return v; }
-
-  template <typename Lhs, typename = Rhs>
-  class Impl : public MatcherInterface<Lhs> {
-   public:
-    explicit Impl(const Rhs& rhs) : rhs_(rhs) {}
-    bool MatchAndExplain(Lhs lhs,
-                         MatchResultListener* /* listener */) const override {
-      return Op()(lhs, Unwrap(rhs_));
-    }
-    void DescribeTo(::std::ostream* os) const override {
-      *os << D::Desc() << " ";
-      UniversalPrint(Unwrap(rhs_), os);
-    }
-    void DescribeNegationTo(::std::ostream* os) const override {
-      *os << D::NegatedDesc() <<  " ";
-      UniversalPrint(Unwrap(rhs_), os);
-    }
-
-   private:
-    Rhs rhs_;
-  };
-  Rhs rhs_;
-};
-
-template <typename Rhs>
-class EqMatcher : public ComparisonBase<EqMatcher<Rhs>, Rhs, AnyEq> {
- public:
-  explicit EqMatcher(const Rhs& rhs)
-      : ComparisonBase<EqMatcher<Rhs>, Rhs, AnyEq>(rhs) { }
-  static const char* Desc() { return "is equal to"; }
-  static const char* NegatedDesc() { return "isn't equal to"; }
-};
-template <typename Rhs>
-class NeMatcher : public ComparisonBase<NeMatcher<Rhs>, Rhs, AnyNe> {
- public:
-  explicit NeMatcher(const Rhs& rhs)
-      : ComparisonBase<NeMatcher<Rhs>, Rhs, AnyNe>(rhs) { }
-  static const char* Desc() { return "isn't equal to"; }
-  static const char* NegatedDesc() { return "is equal to"; }
-};
-template <typename Rhs>
-class LtMatcher : public ComparisonBase<LtMatcher<Rhs>, Rhs, AnyLt> {
- public:
-  explicit LtMatcher(const Rhs& rhs)
-      : ComparisonBase<LtMatcher<Rhs>, Rhs, AnyLt>(rhs) { }
-  static const char* Desc() { return "is <"; }
-  static const char* NegatedDesc() { return "isn't <"; }
-};
-template <typename Rhs>
-class GtMatcher : public ComparisonBase<GtMatcher<Rhs>, Rhs, AnyGt> {
- public:
-  explicit GtMatcher(const Rhs& rhs)
-      : ComparisonBase<GtMatcher<Rhs>, Rhs, AnyGt>(rhs) { }
-  static const char* Desc() { return "is >"; }
-  static const char* NegatedDesc() { return "isn't >"; }
-};
-template <typename Rhs>
-class LeMatcher : public ComparisonBase<LeMatcher<Rhs>, Rhs, AnyLe> {
- public:
-  explicit LeMatcher(const Rhs& rhs)
-      : ComparisonBase<LeMatcher<Rhs>, Rhs, AnyLe>(rhs) { }
-  static const char* Desc() { return "is <="; }
-  static const char* NegatedDesc() { return "isn't <="; }
-};
-template <typename Rhs>
-class GeMatcher : public ComparisonBase<GeMatcher<Rhs>, Rhs, AnyGe> {
- public:
-  explicit GeMatcher(const Rhs& rhs)
-      : ComparisonBase<GeMatcher<Rhs>, Rhs, AnyGe>(rhs) { }
-  static const char* Desc() { return "is >="; }
-  static const char* NegatedDesc() { return "isn't >="; }
-};
-
-// Implements polymorphic matchers MatchesRegex(regex) and
-// ContainsRegex(regex), which can be used as a Matcher<T> as long as
-// T can be converted to a string.
-class MatchesRegexMatcher {
- public:
-  MatchesRegexMatcher(const RE* regex, bool full_match)
-      : regex_(regex), full_match_(full_match) {}
-
-#if GTEST_HAS_ABSL
-  bool MatchAndExplain(const absl::string_view& s,
-                       MatchResultListener* listener) const {
-    return MatchAndExplain(std::string(s), listener);
-  }
-#endif  // GTEST_HAS_ABSL
-
-  // Accepts pointer types, particularly:
-  //   const char*
-  //   char*
-  //   const wchar_t*
-  //   wchar_t*
-  template <typename CharType>
-  bool MatchAndExplain(CharType* s, MatchResultListener* listener) const {
-    return s != nullptr && MatchAndExplain(std::string(s), listener);
-  }
-
-  // Matches anything that can convert to std::string.
-  //
-  // This is a template, not just a plain function with const std::string&,
-  // because absl::string_view has some interfering non-explicit constructors.
-  template <class MatcheeStringType>
-  bool MatchAndExplain(const MatcheeStringType& s,
-                       MatchResultListener* /* listener */) const {
-    const std::string& s2(s);
-    return full_match_ ? RE::FullMatch(s2, *regex_)
-                       : RE::PartialMatch(s2, *regex_);
-  }
-
-  void DescribeTo(::std::ostream* os) const {
-    *os << (full_match_ ? "matches" : "contains") << " regular expression ";
-    UniversalPrinter<std::string>::Print(regex_->pattern(), os);
-  }
-
-  void DescribeNegationTo(::std::ostream* os) const {
-    *os << "doesn't " << (full_match_ ? "match" : "contain")
-        << " regular expression ";
-    UniversalPrinter<std::string>::Print(regex_->pattern(), os);
-  }
-
- private:
-  const std::shared_ptr<const RE> regex_;
-  const bool full_match_;
-};
-}  // namespace internal
-
-// Matches a string that fully matches regular expression 'regex'.
-// The matcher takes ownership of 'regex'.
-inline PolymorphicMatcher<internal::MatchesRegexMatcher> MatchesRegex(
-    const internal::RE* regex) {
-  return MakePolymorphicMatcher(internal::MatchesRegexMatcher(regex, true));
-}
-inline PolymorphicMatcher<internal::MatchesRegexMatcher> MatchesRegex(
-    const std::string& regex) {
-  return MatchesRegex(new internal::RE(regex));
-}
-
-// Matches a string that contains regular expression 'regex'.
-// The matcher takes ownership of 'regex'.
-inline PolymorphicMatcher<internal::MatchesRegexMatcher> ContainsRegex(
-    const internal::RE* regex) {
-  return MakePolymorphicMatcher(internal::MatchesRegexMatcher(regex, false));
-}
-inline PolymorphicMatcher<internal::MatchesRegexMatcher> ContainsRegex(
-    const std::string& regex) {
-  return ContainsRegex(new internal::RE(regex));
-}
-
-// Creates a polymorphic matcher that matches anything equal to x.
-// Note: if the parameter of Eq() were declared as const T&, Eq("foo")
-// wouldn't compile.
-template <typename T>
-inline internal::EqMatcher<T> Eq(T x) { return internal::EqMatcher<T>(x); }
-
-// Constructs a Matcher<T> from a 'value' of type T.  The constructed
-// matcher matches any value that's equal to 'value'.
-template <typename T>
-Matcher<T>::Matcher(T value) { *this = Eq(value); }
-
-// Creates a monomorphic matcher that matches anything with type Lhs
-// and equal to rhs.  A user may need to use this instead of Eq(...)
-// in order to resolve an overloading ambiguity.
-//
-// TypedEq<T>(x) is just a convenient short-hand for Matcher<T>(Eq(x))
-// or Matcher<T>(x), but more readable than the latter.
-//
-// We could define similar monomorphic matchers for other comparison
-// operations (e.g. TypedLt, TypedGe, and etc), but decided not to do
-// it yet as those are used much less than Eq() in practice.  A user
-// can always write Matcher<T>(Lt(5)) to be explicit about the type,
-// for example.
-template <typename Lhs, typename Rhs>
-inline Matcher<Lhs> TypedEq(const Rhs& rhs) { return Eq(rhs); }
-
-// Creates a polymorphic matcher that matches anything >= x.
-template <typename Rhs>
-inline internal::GeMatcher<Rhs> Ge(Rhs x) {
-  return internal::GeMatcher<Rhs>(x);
-}
-
-// Creates a polymorphic matcher that matches anything > x.
-template <typename Rhs>
-inline internal::GtMatcher<Rhs> Gt(Rhs x) {
-  return internal::GtMatcher<Rhs>(x);
-}
-
-// Creates a polymorphic matcher that matches anything <= x.
-template <typename Rhs>
-inline internal::LeMatcher<Rhs> Le(Rhs x) {
-  return internal::LeMatcher<Rhs>(x);
-}
-
-// Creates a polymorphic matcher that matches anything < x.
-template <typename Rhs>
-inline internal::LtMatcher<Rhs> Lt(Rhs x) {
-  return internal::LtMatcher<Rhs>(x);
-}
-
-// Creates a polymorphic matcher that matches anything != x.
-template <typename Rhs>
-inline internal::NeMatcher<Rhs> Ne(Rhs x) {
-  return internal::NeMatcher<Rhs>(x);
-}
-}  // namespace testing
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251 5046
-
-#endif  // GTEST_INCLUDE_GTEST_GTEST_MATCHERS_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-message.h b/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-message.h
deleted file mode 100644
index cbabe5defd7..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-message.h
+++ /dev/null
@@ -1,219 +0,0 @@
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-//
-// The Google C++ Testing and Mocking Framework (Google Test)
-//
-// This header file defines the Message class.
-//
-// IMPORTANT NOTE: Due to limitation of the C++ language, we have to
-// leave some internal implementation details in this header file.
-// They are clearly marked by comments like this:
-//
-//   // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-//
-// Such code is NOT meant to be used by a user directly, and is subject
-// to CHANGE WITHOUT NOTICE.  Therefore DO NOT DEPEND ON IT in a user
-// program!
-
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GTEST_INCLUDE_GTEST_GTEST_MESSAGE_H_
-#define GTEST_INCLUDE_GTEST_GTEST_MESSAGE_H_
-
-#include <limits>
-#include <memory>
-
-#include "gtest/internal/gtest-port.h"
-#include "gtest/internal/custom/raw-ostream.h"
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
-/* class A needs to have dll-interface to be used by clients of class B */)
-
-// Ensures that there is at least one operator<< in the global namespace.
-// See Message& operator<<(...) below for why.
-void operator<<(const testing::internal::Secret&, int);
-
-namespace testing {
-
-// The Message class works like an ostream repeater.
-//
-// Typical usage:
-//
-//   1. You stream a bunch of values to a Message object.
-//      It will remember the text in a stringstream.
-//   2. Then you stream the Message object to an ostream.
-//      This causes the text in the Message to be streamed
-//      to the ostream.
-//
-// For example;
-//
-//   testing::Message foo;
-//   foo << 1 << " != " << 2;
-//   std::cout << foo;
-//
-// will print "1 != 2".
-//
-// Message is not intended to be inherited from.  In particular, its
-// destructor is not virtual.
-//
-// Note that stringstream behaves differently in gcc and in MSVC.  You
-// can stream a NULL char pointer to it in the former, but not in the
-// latter (it causes an access violation if you do).  The Message
-// class hides this difference by treating a NULL char pointer as
-// "(null)".
-class GTEST_API_ Message {
- private:
-  // The type of basic IO manipulators (endl, ends, and flush) for
-  // narrow streams.
-  typedef std::ostream& (*BasicNarrowIoManip)(std::ostream&);
-
- public:
-  // Constructs an empty Message.
-  Message();
-
-  // Copy constructor.
-  Message(const Message& msg) : ss_(new ::std::stringstream) {  // NOLINT
-    *ss_ << msg.GetString();
-  }
-
-  // Constructs a Message from a C-string.
-  explicit Message(const char* str) : ss_(new ::std::stringstream) {
-    *ss_ << str;
-  }
-
-  // Streams a non-pointer value to this object.
-  template <typename T>
-  inline Message& operator <<(const T& val) {
-    // Some libraries overload << for STL containers.  These
-    // overloads are defined in the global namespace instead of ::std.
-    //
-    // C++'s symbol lookup rule (i.e. Koenig lookup) says that these
-    // overloads are visible in either the std namespace or the global
-    // namespace, but not other namespaces, including the testing
-    // namespace which Google Test's Message class is in.
-    //
-    // To allow STL containers (and other types that has a << operator
-    // defined in the global namespace) to be used in Google Test
-    // assertions, testing::Message must access the custom << operator
-    // from the global namespace.  With this using declaration,
-    // overloads of << defined in the global namespace and those
-    // visible via Koenig lookup are both exposed in this function.
-    using ::operator <<;
-    *ss_ << llvm_gtest::printable(val);
-    return *this;
-  }
-
-  // Streams a pointer value to this object.
-  //
-  // This function is an overload of the previous one.  When you
-  // stream a pointer to a Message, this definition will be used as it
-  // is more specialized.  (The C++ Standard, section
-  // [temp.func.order].)  If you stream a non-pointer, then the
-  // previous definition will be used.
-  //
-  // The reason for this overload is that streaming a NULL pointer to
-  // ostream is undefined behavior.  Depending on the compiler, you
-  // may get "0", "(nil)", "(null)", or an access violation.  To
-  // ensure consistent result across compilers, we always treat NULL
-  // as "(null)".
-  template <typename T>
-  inline Message& operator <<(T* const& pointer) {  // NOLINT
-    if (pointer == nullptr) {
-      *ss_ << "(null)";
-    } else {
-      *ss_ << llvm_gtest::printable(pointer);
-    }
-    return *this;
-  }
-
-  // Since the basic IO manipulators are overloaded for both narrow
-  // and wide streams, we have to provide this specialized definition
-  // of operator <<, even though its body is the same as the
-  // templatized version above.  Without this definition, streaming
-  // endl or other basic IO manipulators to Message will confuse the
-  // compiler.
-  Message& operator <<(BasicNarrowIoManip val) {
-    *ss_ << val;
-    return *this;
-  }
-
-  // Instead of 1/0, we want to see true/false for bool values.
-  Message& operator <<(bool b) {
-    return *this << (b ? "true" : "false");
-  }
-
-  // These two overloads allow streaming a wide C string to a Message
-  // using the UTF-8 encoding.
-  Message& operator <<(const wchar_t* wide_c_str);
-  Message& operator <<(wchar_t* wide_c_str);
-
-#if GTEST_HAS_STD_WSTRING
-  // Converts the given wide string to a narrow string using the UTF-8
-  // encoding, and streams the result to this Message object.
-  Message& operator <<(const ::std::wstring& wstr);
-#endif  // GTEST_HAS_STD_WSTRING
-
-  // Gets the text streamed to this object so far as an std::string.
-  // Each '\0' character in the buffer is replaced with "\\0".
-  //
-  // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-  std::string GetString() const;
-
- private:
-  // We'll hold the text streamed to this object here.
-  const std::unique_ptr< ::std::stringstream> ss_;
-
-  // We declare (but don't implement) this to prevent the compiler
-  // from implementing the assignment operator.
-  void operator=(const Message&);
-};
-
-// Streams a Message to an ostream.
-inline std::ostream& operator <<(std::ostream& os, const Message& sb) {
-  return os << sb.GetString();
-}
-
-namespace internal {
-
-// Converts a streamable value to an std::string.  A NULL pointer is
-// converted to "(null)".  When the input value is a ::string,
-// ::std::string, ::wstring, or ::std::wstring object, each NUL
-// character in it is replaced with "\\0".
-template <typename T>
-std::string StreamableToString(const T& streamable) {
-  return (Message() << streamable).GetString();
-}
-
-}  // namespace internal
-}  // namespace testing
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
-
-#endif  // GTEST_INCLUDE_GTEST_GTEST_MESSAGE_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-param-test.h b/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-param-test.h
deleted file mode 100644
index c2e6eae3d83..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-param-test.h
+++ /dev/null
@@ -1,503 +0,0 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Macros and functions for implementing parameterized tests
-// in Google C++ Testing and Mocking Framework (Google Test)
-//
-// This file is generated by a SCRIPT.  DO NOT EDIT BY HAND!
-//
-// GOOGLETEST_CM0001 DO NOT DELETE
-#ifndef GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
-#define GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
-
-
-// Value-parameterized tests allow you to test your code with different
-// parameters without writing multiple copies of the same test.
-//
-// Here is how you use value-parameterized tests:
-
-#if 0
-
-// To write value-parameterized tests, first you should define a fixture
-// class. It is usually derived from testing::TestWithParam<T> (see below for
-// another inheritance scheme that's sometimes useful in more complicated
-// class hierarchies), where the type of your parameter values.
-// TestWithParam<T> is itself derived from testing::Test. T can be any
-// copyable type. If it's a raw pointer, you are responsible for managing the
-// lifespan of the pointed values.
-
-class FooTest : public ::testing::TestWithParam<const char*> {
-  // You can implement all the usual class fixture members here.
-};
-
-// Then, use the TEST_P macro to define as many parameterized tests
-// for this fixture as you want. The _P suffix is for "parameterized"
-// or "pattern", whichever you prefer to think.
-
-TEST_P(FooTest, DoesBlah) {
-  // Inside a test, access the test parameter with the GetParam() method
-  // of the TestWithParam<T> class:
-  EXPECT_TRUE(foo.Blah(GetParam()));
-  ...
-}
-
-TEST_P(FooTest, HasBlahBlah) {
-  ...
-}
-
-// Finally, you can use INSTANTIATE_TEST_SUITE_P to instantiate the test
-// case with any set of parameters you want. Google Test defines a number
-// of functions for generating test parameters. They return what we call
-// (surprise!) parameter generators. Here is a summary of them, which
-// are all in the testing namespace:
-//
-//
-//  Range(begin, end [, step]) - Yields values {begin, begin+step,
-//                               begin+step+step, ...}. The values do not
-//                               include end. step defaults to 1.
-//  Values(v1, v2, ..., vN)    - Yields values {v1, v2, ..., vN}.
-//  ValuesIn(container)        - Yields values from a C-style array, an STL
-//  ValuesIn(begin,end)          container, or an iterator range [begin, end).
-//  Bool()                     - Yields sequence {false, true}.
-//  Combine(g1, g2, ..., gN)   - Yields all combinations (the Cartesian product
-//                               for the math savvy) of the values generated
-//                               by the N generators.
-//
-// For more details, see comments at the definitions of these functions below
-// in this file.
-//
-// The following statement will instantiate tests from the FooTest test suite
-// each with parameter values "meeny", "miny", and "moe".
-
-INSTANTIATE_TEST_SUITE_P(InstantiationName,
-                         FooTest,
-                         Values("meeny", "miny", "moe"));
-
-// To distinguish different instances of the pattern, (yes, you
-// can instantiate it more than once) the first argument to the
-// INSTANTIATE_TEST_SUITE_P macro is a prefix that will be added to the
-// actual test suite name. Remember to pick unique prefixes for different
-// instantiations. The tests from the instantiation above will have
-// these names:
-//
-//    * InstantiationName/FooTest.DoesBlah/0 for "meeny"
-//    * InstantiationName/FooTest.DoesBlah/1 for "miny"
-//    * InstantiationName/FooTest.DoesBlah/2 for "moe"
-//    * InstantiationName/FooTest.HasBlahBlah/0 for "meeny"
-//    * InstantiationName/FooTest.HasBlahBlah/1 for "miny"
-//    * InstantiationName/FooTest.HasBlahBlah/2 for "moe"
-//
-// You can use these names in --gtest_filter.
-//
-// This statement will instantiate all tests from FooTest again, each
-// with parameter values "cat" and "dog":
-
-const char* pets[] = {"cat", "dog"};
-INSTANTIATE_TEST_SUITE_P(AnotherInstantiationName, FooTest, ValuesIn(pets));
-
-// The tests from the instantiation above will have these names:
-//
-//    * AnotherInstantiationName/FooTest.DoesBlah/0 for "cat"
-//    * AnotherInstantiationName/FooTest.DoesBlah/1 for "dog"
-//    * AnotherInstantiationName/FooTest.HasBlahBlah/0 for "cat"
-//    * AnotherInstantiationName/FooTest.HasBlahBlah/1 for "dog"
-//
-// Please note that INSTANTIATE_TEST_SUITE_P will instantiate all tests
-// in the given test suite, whether their definitions come before or
-// AFTER the INSTANTIATE_TEST_SUITE_P statement.
-//
-// Please also note that generator expressions (including parameters to the
-// generators) are evaluated in InitGoogleTest(), after main() has started.
-// This allows the user on one hand, to adjust generator parameters in order
-// to dynamically determine a set of tests to run and on the other hand,
-// give the user a chance to inspect the generated tests with Google Test
-// reflection API before RUN_ALL_TESTS() is executed.
-//
-// You can see samples/sample7_unittest.cc and samples/sample8_unittest.cc
-// for more examples.
-//
-// In the future, we plan to publish the API for defining new parameter
-// generators. But for now this interface remains part of the internal
-// implementation and is subject to change.
-//
-//
-// A parameterized test fixture must be derived from testing::Test and from
-// testing::WithParamInterface<T>, where T is the type of the parameter
-// values. Inheriting from TestWithParam<T> satisfies that requirement because
-// TestWithParam<T> inherits from both Test and WithParamInterface. In more
-// complicated hierarchies, however, it is occasionally useful to inherit
-// separately from Test and WithParamInterface. For example:
-
-class BaseTest : public ::testing::Test {
-  // You can inherit all the usual members for a non-parameterized test
-  // fixture here.
-};
-
-class DerivedTest : public BaseTest, public ::testing::WithParamInterface<int> {
-  // The usual test fixture members go here too.
-};
-
-TEST_F(BaseTest, HasFoo) {
-  // This is an ordinary non-parameterized test.
-}
-
-TEST_P(DerivedTest, DoesBlah) {
-  // GetParam works just the same here as if you inherit from TestWithParam.
-  EXPECT_TRUE(foo.Blah(GetParam()));
-}
-
-#endif  // 0
-
-#include <iterator>
-#include <utility>
-
-#include "gtest/internal/gtest-internal.h"
-#include "gtest/internal/gtest-param-util.h"
-#include "gtest/internal/gtest-port.h"
-
-namespace testing {
-
-// Functions producing parameter generators.
-//
-// Google Test uses these generators to produce parameters for value-
-// parameterized tests. When a parameterized test suite is instantiated
-// with a particular generator, Google Test creates and runs tests
-// for each element in the sequence produced by the generator.
-//
-// In the following sample, tests from test suite FooTest are instantiated
-// each three times with parameter values 3, 5, and 8:
-//
-// class FooTest : public TestWithParam<int> { ... };
-//
-// TEST_P(FooTest, TestThis) {
-// }
-// TEST_P(FooTest, TestThat) {
-// }
-// INSTANTIATE_TEST_SUITE_P(TestSequence, FooTest, Values(3, 5, 8));
-//
-
-// Range() returns generators providing sequences of values in a range.
-//
-// Synopsis:
-// Range(start, end)
-//   - returns a generator producing a sequence of values {start, start+1,
-//     start+2, ..., }.
-// Range(start, end, step)
-//   - returns a generator producing a sequence of values {start, start+step,
-//     start+step+step, ..., }.
-// Notes:
-//   * The generated sequences never include end. For example, Range(1, 5)
-//     returns a generator producing a sequence {1, 2, 3, 4}. Range(1, 9, 2)
-//     returns a generator producing {1, 3, 5, 7}.
-//   * start and end must have the same type. That type may be any integral or
-//     floating-point type or a user defined type satisfying these conditions:
-//     * It must be assignable (have operator=() defined).
-//     * It must have operator+() (operator+(int-compatible type) for
-//       two-operand version).
-//     * It must have operator<() defined.
-//     Elements in the resulting sequences will also have that type.
-//   * Condition start < end must be satisfied in order for resulting sequences
-//     to contain any elements.
-//
-template <typename T, typename IncrementT>
-internal::ParamGenerator<T> Range(T start, T end, IncrementT step) {
-  return internal::ParamGenerator<T>(
-      new internal::RangeGenerator<T, IncrementT>(start, end, step));
-}
-
-template <typename T>
-internal::ParamGenerator<T> Range(T start, T end) {
-  return Range(start, end, 1);
-}
-
-// ValuesIn() function allows generation of tests with parameters coming from
-// a container.
-//
-// Synopsis:
-// ValuesIn(const T (&array)[N])
-//   - returns a generator producing sequences with elements from
-//     a C-style array.
-// ValuesIn(const Container& container)
-//   - returns a generator producing sequences with elements from
-//     an STL-style container.
-// ValuesIn(Iterator begin, Iterator end)
-//   - returns a generator producing sequences with elements from
-//     a range [begin, end) defined by a pair of STL-style iterators. These
-//     iterators can also be plain C pointers.
-//
-// Please note that ValuesIn copies the values from the containers
-// passed in and keeps them to generate tests in RUN_ALL_TESTS().
-//
-// Examples:
-//
-// This instantiates tests from test suite StringTest
-// each with C-string values of "foo", "bar", and "baz":
-//
-// const char* strings[] = {"foo", "bar", "baz"};
-// INSTANTIATE_TEST_SUITE_P(StringSequence, StringTest, ValuesIn(strings));
-//
-// This instantiates tests from test suite StlStringTest
-// each with STL strings with values "a" and "b":
-//
-// ::std::vector< ::std::string> GetParameterStrings() {
-//   ::std::vector< ::std::string> v;
-//   v.push_back("a");
-//   v.push_back("b");
-//   return v;
-// }
-//
-// INSTANTIATE_TEST_SUITE_P(CharSequence,
-//                          StlStringTest,
-//                          ValuesIn(GetParameterStrings()));
-//
-//
-// This will also instantiate tests from CharTest
-// each with parameter values 'a' and 'b':
-//
-// ::std::list<char> GetParameterChars() {
-//   ::std::list<char> list;
-//   list.push_back('a');
-//   list.push_back('b');
-//   return list;
-// }
-// ::std::list<char> l = GetParameterChars();
-// INSTANTIATE_TEST_SUITE_P(CharSequence2,
-//                          CharTest,
-//                          ValuesIn(l.begin(), l.end()));
-//
-template <typename ForwardIterator>
-internal::ParamGenerator<
-    typename std::iterator_traits<ForwardIterator>::value_type>
-ValuesIn(ForwardIterator begin, ForwardIterator end) {
-  typedef typename std::iterator_traits<ForwardIterator>::value_type ParamType;
-  return internal::ParamGenerator<ParamType>(
-      new internal::ValuesInIteratorRangeGenerator<ParamType>(begin, end));
-}
-
-template <typename T, size_t N>
-internal::ParamGenerator<T> ValuesIn(const T (&array)[N]) {
-  return ValuesIn(array, array + N);
-}
-
-template <class Container>
-internal::ParamGenerator<typename Container::value_type> ValuesIn(
-    const Container& container) {
-  return ValuesIn(container.begin(), container.end());
-}
-
-// Values() allows generating tests from explicitly specified list of
-// parameters.
-//
-// Synopsis:
-// Values(T v1, T v2, ..., T vN)
-//   - returns a generator producing sequences with elements v1, v2, ..., vN.
-//
-// For example, this instantiates tests from test suite BarTest each
-// with values "one", "two", and "three":
-//
-// INSTANTIATE_TEST_SUITE_P(NumSequence,
-//                          BarTest,
-//                          Values("one", "two", "three"));
-//
-// This instantiates tests from test suite BazTest each with values 1, 2, 3.5.
-// The exact type of values will depend on the type of parameter in BazTest.
-//
-// INSTANTIATE_TEST_SUITE_P(FloatingNumbers, BazTest, Values(1, 2, 3.5));
-//
-//
-template <typename... T>
-internal::ValueArray<T...> Values(T... v) {
-  return internal::ValueArray<T...>(std::move(v)...);
-}
-
-// Bool() allows generating tests with parameters in a set of (false, true).
-//
-// Synopsis:
-// Bool()
-//   - returns a generator producing sequences with elements {false, true}.
-//
-// It is useful when testing code that depends on Boolean flags. Combinations
-// of multiple flags can be tested when several Bool()'s are combined using
-// Combine() function.
-//
-// In the following example all tests in the test suite FlagDependentTest
-// will be instantiated twice with parameters false and true.
-//
-// class FlagDependentTest : public testing::TestWithParam<bool> {
-//   virtual void SetUp() {
-//     external_flag = GetParam();
-//   }
-// }
-// INSTANTIATE_TEST_SUITE_P(BoolSequence, FlagDependentTest, Bool());
-//
-inline internal::ParamGenerator<bool> Bool() {
-  return Values(false, true);
-}
-
-// Combine() allows the user to combine two or more sequences to produce
-// values of a Cartesian product of those sequences' elements.
-//
-// Synopsis:
-// Combine(gen1, gen2, ..., genN)
-//   - returns a generator producing sequences with elements coming from
-//     the Cartesian product of elements from the sequences generated by
-//     gen1, gen2, ..., genN. The sequence elements will have a type of
-//     std::tuple<T1, T2, ..., TN> where T1, T2, ..., TN are the types
-//     of elements from sequences produces by gen1, gen2, ..., genN.
-//
-// Combine can have up to 10 arguments.
-//
-// Example:
-//
-// This will instantiate tests in test suite AnimalTest each one with
-// the parameter values tuple("cat", BLACK), tuple("cat", WHITE),
-// tuple("dog", BLACK), and tuple("dog", WHITE):
-//
-// enum Color { BLACK, GRAY, WHITE };
-// class AnimalTest
-//     : public testing::TestWithParam<std::tuple<const char*, Color> > {...};
-//
-// TEST_P(AnimalTest, AnimalLooksNice) {...}
-//
-// INSTANTIATE_TEST_SUITE_P(AnimalVariations, AnimalTest,
-//                          Combine(Values("cat", "dog"),
-//                                  Values(BLACK, WHITE)));
-//
-// This will instantiate tests in FlagDependentTest with all variations of two
-// Boolean flags:
-//
-// class FlagDependentTest
-//     : public testing::TestWithParam<std::tuple<bool, bool> > {
-//   virtual void SetUp() {
-//     // Assigns external_flag_1 and external_flag_2 values from the tuple.
-//     std::tie(external_flag_1, external_flag_2) = GetParam();
-//   }
-// };
-//
-// TEST_P(FlagDependentTest, TestFeature1) {
-//   // Test your code using external_flag_1 and external_flag_2 here.
-// }
-// INSTANTIATE_TEST_SUITE_P(TwoBoolSequence, FlagDependentTest,
-//                          Combine(Bool(), Bool()));
-//
-template <typename... Generator>
-internal::CartesianProductHolder<Generator...> Combine(const Generator&... g) {
-  return internal::CartesianProductHolder<Generator...>(g...);
-}
-
-#define TEST_P(test_suite_name, test_name)                                     \
-  class GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)                     \
-      : public test_suite_name {                                               \
-   public:                                                                     \
-    GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)() {}                    \
-    virtual void TestBody();                                                   \
-                                                                               \
-   private:                                                                    \
-    static int AddToRegistry() {                                               \
-      ::testing::UnitTest::GetInstance()                                       \
-          ->parameterized_test_registry()                                      \
-          .GetTestSuitePatternHolder<test_suite_name>(                         \
-              #test_suite_name,                                                \
-              ::testing::internal::CodeLocation(__FILE__, __LINE__))           \
-          ->AddTestPattern(                                                    \
-              GTEST_STRINGIFY_(test_suite_name), GTEST_STRINGIFY_(test_name),  \
-              new ::testing::internal::TestMetaFactory<GTEST_TEST_CLASS_NAME_( \
-                  test_suite_name, test_name)>());                             \
-      return 0;                                                                \
-    }                                                                          \
-    static int gtest_registering_dummy_ GTEST_ATTRIBUTE_UNUSED_;               \
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(GTEST_TEST_CLASS_NAME_(test_suite_name,    \
-                                                           test_name));        \
-  };                                                                           \
-  int GTEST_TEST_CLASS_NAME_(test_suite_name,                                  \
-                             test_name)::gtest_registering_dummy_ =            \
-      GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::AddToRegistry();     \
-  void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::TestBody()
-
-// The last argument to INSTANTIATE_TEST_SUITE_P allows the user to specify
-// generator and an optional function or functor that generates custom test name
-// suffixes based on the test parameters. Such a function or functor should
-// accept one argument of type testing::TestParamInfo<class ParamType>, and
-// return std::string.
-//
-// testing::PrintToStringParamName is a builtin test suffix generator that
-// returns the value of testing::PrintToString(GetParam()).
-//
-// Note: test names must be non-empty, unique, and may only contain ASCII
-// alphanumeric characters or underscore. Because PrintToString adds quotes
-// to std::string and C strings, it won't work for these types.
-
-#define GTEST_EXPAND_(arg) arg
-#define GTEST_GET_FIRST_(first, ...) first
-#define GTEST_GET_SECOND_(first, second, ...) second
-
-#define INSTANTIATE_TEST_SUITE_P(prefix, test_suite_name, ...)                \
-  static ::testing::internal::ParamGenerator<test_suite_name::ParamType>      \
-      gtest_##prefix##test_suite_name##_EvalGenerator_() {                    \
-    return GTEST_EXPAND_(GTEST_GET_FIRST_(__VA_ARGS__, DUMMY_PARAM_));        \
-  }                                                                           \
-  static ::std::string gtest_##prefix##test_suite_name##_EvalGenerateName_(   \
-      const ::testing::TestParamInfo<test_suite_name::ParamType>& info) {     \
-    if (::testing::internal::AlwaysFalse()) {                                 \
-      ::testing::internal::TestNotEmpty(GTEST_EXPAND_(GTEST_GET_SECOND_(      \
-          __VA_ARGS__,                                                        \
-          ::testing::internal::DefaultParamName<test_suite_name::ParamType>,  \
-          DUMMY_PARAM_)));                                                    \
-      auto t = std::make_tuple(__VA_ARGS__);                                  \
-      static_assert(std::tuple_size<decltype(t)>::value <= 2,                 \
-                    "Too Many Args!");                                        \
-    }                                                                         \
-    return ((GTEST_EXPAND_(GTEST_GET_SECOND_(                                 \
-        __VA_ARGS__,                                                          \
-        ::testing::internal::DefaultParamName<test_suite_name::ParamType>,    \
-        DUMMY_PARAM_))))(info);                                               \
-  }                                                                           \
-  static int gtest_##prefix##test_suite_name##_dummy_                         \
-      GTEST_ATTRIBUTE_UNUSED_ =                                               \
-          ::testing::UnitTest::GetInstance()                                  \
-              ->parameterized_test_registry()                                 \
-              .GetTestSuitePatternHolder<test_suite_name>(                    \
-                  #test_suite_name,                                           \
-                  ::testing::internal::CodeLocation(__FILE__, __LINE__))      \
-              ->AddTestSuiteInstantiation(                                    \
-                  #prefix, &gtest_##prefix##test_suite_name##_EvalGenerator_, \
-                  &gtest_##prefix##test_suite_name##_EvalGenerateName_,       \
-                  __FILE__, __LINE__)
-
-// Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-#define INSTANTIATE_TEST_CASE_P                                            \
-  static_assert(::testing::internal::InstantiateTestCase_P_IsDeprecated(), \
-                "");                                                       \
-  INSTANTIATE_TEST_SUITE_P
-#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-}  // namespace testing
-
-#endif  // GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-printers.h b/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-printers.h
deleted file mode 100644
index 956f0791048..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-printers.h
+++ /dev/null
@@ -1,929 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Test - The Google C++ Testing and Mocking Framework
-//
-// This file implements a universal value printer that can print a
-// value of any type T:
-//
-//   void ::testing::internal::UniversalPrinter<T>::Print(value, ostream_ptr);
-//
-// A user can teach this function how to print a class type T by
-// defining either operator<<() or PrintTo() in the namespace that
-// defines T.  More specifically, the FIRST defined function in the
-// following list will be used (assuming T is defined in namespace
-// foo):
-//
-//   1. foo::PrintTo(const T&, ostream*)
-//   2. operator<<(ostream&, const T&) defined in either foo or the
-//      global namespace.
-//
-// However if T is an STL-style container then it is printed element-wise
-// unless foo::PrintTo(const T&, ostream*) is defined. Note that
-// operator<<() is ignored for container types.
-//
-// If none of the above is defined, it will print the debug string of
-// the value if it is a protocol buffer, or print the raw bytes in the
-// value otherwise.
-//
-// To aid debugging: when T is a reference type, the address of the
-// value is also printed; when T is a (const) char pointer, both the
-// pointer value and the NUL-terminated string it points to are
-// printed.
-//
-// We also provide some convenient wrappers:
-//
-//   // Prints a value to a string.  For a (const or not) char
-//   // pointer, the NUL-terminated string (but not the pointer) is
-//   // printed.
-//   std::string ::testing::PrintToString(const T& value);
-//
-//   // Prints a value tersely: for a reference type, the referenced
-//   // value (but not the address) is printed; for a (const or not) char
-//   // pointer, the NUL-terminated string (but not the pointer) is
-//   // printed.
-//   void ::testing::internal::UniversalTersePrint(const T& value, ostream*);
-//
-//   // Prints value using the type inferred by the compiler.  The difference
-//   // from UniversalTersePrint() is that this function prints both the
-//   // pointer and the NUL-terminated string for a (const or not) char pointer.
-//   void ::testing::internal::UniversalPrint(const T& value, ostream*);
-//
-//   // Prints the fields of a tuple tersely to a string vector, one
-//   // element for each field. Tuple support must be enabled in
-//   // gtest-port.h.
-//   std::vector<string> UniversalTersePrintTupleFieldsToStrings(
-//       const Tuple& value);
-//
-// Known limitation:
-//
-// The print primitives print the elements of an STL-style container
-// using the compiler-inferred type of *iter where iter is a
-// const_iterator of the container.  When const_iterator is an input
-// iterator but not a forward iterator, this inferred type may not
-// match value_type, and the print output may be incorrect.  In
-// practice, this is rarely a problem as for most containers
-// const_iterator is a forward iterator.  We'll fix this if there's an
-// actual need for it.  Note that this fix cannot rely on value_type
-// being defined as many user-defined container types don't have
-// value_type.
-
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GTEST_INCLUDE_GTEST_GTEST_PRINTERS_H_
-#define GTEST_INCLUDE_GTEST_GTEST_PRINTERS_H_
-
-#include <functional>
-#include <ostream>  // NOLINT
-#include <sstream>
-#include <string>
-#include <tuple>
-#include <type_traits>
-#include <utility>
-#include <vector>
-#include "gtest/internal/gtest-internal.h"
-#include "gtest/internal/gtest-port.h"
-#include "gtest/internal/custom/raw-ostream.h"
-
-#if GTEST_HAS_ABSL
-#include "absl/strings/string_view.h"
-#include "absl/types/optional.h"
-#include "absl/types/variant.h"
-#endif  // GTEST_HAS_ABSL
-
-namespace testing {
-
-// Definitions in the 'internal' and 'internal2' name spaces are
-// subject to change without notice.  DO NOT USE THEM IN USER CODE!
-namespace internal2 {
-
-// Prints the given number of bytes in the given object to the given
-// ostream.
-GTEST_API_ void PrintBytesInObjectTo(const unsigned char* obj_bytes,
-                                     size_t count,
-                                     ::std::ostream* os);
-
-// For selecting which printer to use when a given type has neither <<
-// nor PrintTo().
-enum TypeKind {
-  kProtobuf,              // a protobuf type
-  kConvertibleToInteger,  // a type implicitly convertible to BiggestInt
-                          // (e.g. a named or unnamed enum type)
-#if GTEST_HAS_ABSL
-  kConvertibleToStringView,  // a type implicitly convertible to
-                             // absl::string_view
-#endif
-  kOtherType  // anything else
-};
-
-// TypeWithoutFormatter<T, kTypeKind>::PrintValue(value, os) is called
-// by the universal printer to print a value of type T when neither
-// operator<< nor PrintTo() is defined for T, where kTypeKind is the
-// "kind" of T as defined by enum TypeKind.
-template <typename T, TypeKind kTypeKind>
-class TypeWithoutFormatter {
- public:
-  // This default version is called when kTypeKind is kOtherType.
-  static void PrintValue(const T& value, ::std::ostream* os) {
-    PrintBytesInObjectTo(
-        static_cast<const unsigned char*>(
-            reinterpret_cast<const void*>(std::addressof(value))),
-        sizeof(value), os);
-  }
-};
-
-// We print a protobuf using its ShortDebugString() when the string
-// doesn't exceed this many characters; otherwise we print it using
-// DebugString() for better readability.
-const size_t kProtobufOneLinerMaxLength = 50;
-
-template <typename T>
-class TypeWithoutFormatter<T, kProtobuf> {
- public:
-  static void PrintValue(const T& value, ::std::ostream* os) {
-    std::string pretty_str = value.ShortDebugString();
-    if (pretty_str.length() > kProtobufOneLinerMaxLength) {
-      pretty_str = "\n" + value.DebugString();
-    }
-    *os << ("<" + pretty_str + ">");
-  }
-};
-
-template <typename T>
-class TypeWithoutFormatter<T, kConvertibleToInteger> {
- public:
-  // Since T has no << operator or PrintTo() but can be implicitly
-  // converted to BiggestInt, we print it as a BiggestInt.
-  //
-  // Most likely T is an enum type (either named or unnamed), in which
-  // case printing it as an integer is the desired behavior.  In case
-  // T is not an enum, printing it as an integer is the best we can do
-  // given that it has no user-defined printer.
-  static void PrintValue(const T& value, ::std::ostream* os) {
-    const internal::BiggestInt kBigInt = value;
-    *os << kBigInt;
-  }
-};
-
-#if GTEST_HAS_ABSL
-template <typename T>
-class TypeWithoutFormatter<T, kConvertibleToStringView> {
- public:
-  // Since T has neither operator<< nor PrintTo() but can be implicitly
-  // converted to absl::string_view, we print it as a absl::string_view.
-  //
-  // Note: the implementation is further below, as it depends on
-  // internal::PrintTo symbol which is defined later in the file.
-  static void PrintValue(const T& value, ::std::ostream* os);
-};
-#endif
-
-// Prints the given value to the given ostream.  If the value is a
-// protocol message, its debug string is printed; if it's an enum or
-// of a type implicitly convertible to BiggestInt, it's printed as an
-// integer; otherwise the bytes in the value are printed.  This is
-// what UniversalPrinter<T>::Print() does when it knows nothing about
-// type T and T has neither << operator nor PrintTo().
-//
-// A user can override this behavior for a class type Foo by defining
-// a << operator in the namespace where Foo is defined.
-//
-// We put this operator in namespace 'internal2' instead of 'internal'
-// to simplify the implementation, as much code in 'internal' needs to
-// use << in STL, which would conflict with our own << were it defined
-// in 'internal'.
-//
-// Note that this operator<< takes a generic std::basic_ostream<Char,
-// CharTraits> type instead of the more restricted std::ostream.  If
-// we define it to take an std::ostream instead, we'll get an
-// "ambiguous overloads" compiler error when trying to print a type
-// Foo that supports streaming to std::basic_ostream<Char,
-// CharTraits>, as the compiler cannot tell whether
-// operator<<(std::ostream&, const T&) or
-// operator<<(std::basic_stream<Char, CharTraits>, const Foo&) is more
-// specific.
-template <typename Char, typename CharTraits, typename T>
-::std::basic_ostream<Char, CharTraits>& operator<<(
-    ::std::basic_ostream<Char, CharTraits>& os, const T& x) {
-  TypeWithoutFormatter<T, (internal::IsAProtocolMessage<T>::value
-                               ? kProtobuf
-                               : std::is_convertible<
-                                     const T&, internal::BiggestInt>::value
-                                     ? kConvertibleToInteger
-                                     :
-#if GTEST_HAS_ABSL
-                                     std::is_convertible<
-                                         const T&, absl::string_view>::value
-                                         ? kConvertibleToStringView
-                                         :
-#endif
-                                         kOtherType)>::PrintValue(x, &os);
-  return os;
-}
-
-}  // namespace internal2
-}  // namespace testing
-
-// This namespace MUST NOT BE NESTED IN ::testing, or the name look-up
-// magic needed for implementing UniversalPrinter won't work.
-namespace testing_internal {
-
-// Used to print a value that is not an STL-style container when the
-// user doesn't define PrintTo() for it.
-template <typename T>
-void DefaultPrintNonContainerTo(const T& value, ::std::ostream* os) {
-  // With the following statement, during unqualified name lookup,
-  // testing::internal2::operator<< appears as if it was declared in
-  // the nearest enclosing namespace that contains both
-  // ::testing_internal and ::testing::internal2, i.e. the global
-  // namespace.  For more details, refer to the C++ Standard section
-  // 7.3.4-1 [namespace.udir].  This allows us to fall back onto
-  // testing::internal2::operator<< in case T doesn't come with a <<
-  // operator.
-  //
-  // We cannot write 'using ::testing::internal2::operator<<;', which
-  // gcc 3.3 fails to compile due to a compiler bug.
-  using namespace ::testing::internal2;  // NOLINT
-
-  // Assuming T is defined in namespace foo, in the next statement,
-  // the compiler will consider all of:
-  //
-  //   1. foo::operator<< (thanks to Koenig look-up),
-  //   2. ::operator<< (as the current namespace is enclosed in ::),
-  //   3. testing::internal2::operator<< (thanks to the using statement above).
-  //
-  // The operator<< whose type matches T best will be picked.
-  //
-  // We deliberately allow #2 to be a candidate, as sometimes it's
-  // impossible to define #1 (e.g. when foo is ::std, defining
-  // anything in it is undefined behavior unless you are a compiler
-  // vendor.).
-  *os << ::llvm_gtest::printable(value);
-}
-
-}  // namespace testing_internal
-
-namespace testing {
-namespace internal {
-
-// FormatForComparison<ToPrint, OtherOperand>::Format(value) formats a
-// value of type ToPrint that is an operand of a comparison assertion
-// (e.g. ASSERT_EQ).  OtherOperand is the type of the other operand in
-// the comparison, and is used to help determine the best way to
-// format the value.  In particular, when the value is a C string
-// (char pointer) and the other operand is an STL string object, we
-// want to format the C string as a string, since we know it is
-// compared by value with the string object.  If the value is a char
-// pointer but the other operand is not an STL string object, we don't
-// know whether the pointer is supposed to point to a NUL-terminated
-// string, and thus want to print it as a pointer to be safe.
-//
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-
-// The default case.
-template <typename ToPrint, typename OtherOperand>
-class FormatForComparison {
- public:
-  static ::std::string Format(const ToPrint& value) {
-    return ::testing::PrintToString(value);
-  }
-};
-
-// Array.
-template <typename ToPrint, size_t N, typename OtherOperand>
-class FormatForComparison<ToPrint[N], OtherOperand> {
- public:
-  static ::std::string Format(const ToPrint* value) {
-    return FormatForComparison<const ToPrint*, OtherOperand>::Format(value);
-  }
-};
-
-// By default, print C string as pointers to be safe, as we don't know
-// whether they actually point to a NUL-terminated string.
-
-#define GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(CharType)                \
-  template <typename OtherOperand>                                      \
-  class FormatForComparison<CharType*, OtherOperand> {                  \
-   public:                                                              \
-    static ::std::string Format(CharType* value) {                      \
-      return ::testing::PrintToString(static_cast<const void*>(value)); \
-    }                                                                   \
-  }
-
-GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(char);
-GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const char);
-GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(wchar_t);
-GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const wchar_t);
-
-#undef GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_
-
-// If a C string is compared with an STL string object, we know it's meant
-// to point to a NUL-terminated string, and thus can print it as a string.
-
-#define GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(CharType, OtherStringType) \
-  template <>                                                           \
-  class FormatForComparison<CharType*, OtherStringType> {               \
-   public:                                                              \
-    static ::std::string Format(CharType* value) {                      \
-      return ::testing::PrintToString(value);                           \
-    }                                                                   \
-  }
-
-GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char, ::std::string);
-GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char, ::std::string);
-
-#if GTEST_HAS_STD_WSTRING
-GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(wchar_t, ::std::wstring);
-GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const wchar_t, ::std::wstring);
-#endif
-
-#undef GTEST_IMPL_FORMAT_C_STRING_AS_STRING_
-
-// Formats a comparison assertion (e.g. ASSERT_EQ, EXPECT_LT, and etc)
-// operand to be used in a failure message.  The type (but not value)
-// of the other operand may affect the format.  This allows us to
-// print a char* as a raw pointer when it is compared against another
-// char* or void*, and print it as a C string when it is compared
-// against an std::string object, for example.
-//
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-template <typename T1, typename T2>
-std::string FormatForComparisonFailureMessage(
-    const T1& value, const T2& /* other_operand */) {
-  return FormatForComparison<T1, T2>::Format(value);
-}
-
-// UniversalPrinter<T>::Print(value, ostream_ptr) prints the given
-// value to the given ostream.  The caller must ensure that
-// 'ostream_ptr' is not NULL, or the behavior is undefined.
-//
-// We define UniversalPrinter as a class template (as opposed to a
-// function template), as we need to partially specialize it for
-// reference types, which cannot be done with function templates.
-template <typename T>
-class UniversalPrinter;
-
-template <typename T>
-void UniversalPrint(const T& value, ::std::ostream* os);
-
-enum DefaultPrinterType {
-  kPrintContainer,
-  kPrintPointer,
-  kPrintFunctionPointer,
-  kPrintOther,
-};
-template <DefaultPrinterType type> struct WrapPrinterType {};
-
-// Used to print an STL-style container when the user doesn't define
-// a PrintTo() for it.
-template <typename C>
-void DefaultPrintTo(WrapPrinterType<kPrintContainer> /* dummy */,
-                    const C& container, ::std::ostream* os) {
-  const size_t kMaxCount = 32;  // The maximum number of elements to print.
-  *os << '{';
-  size_t count = 0;
-  for (typename C::const_iterator it = container.begin();
-       it != container.end(); ++it, ++count) {
-    if (count > 0) {
-      *os << ',';
-      if (count == kMaxCount) {  // Enough has been printed.
-        *os << " ...";
-        break;
-      }
-    }
-    *os << ' ';
-    // We cannot call PrintTo(*it, os) here as PrintTo() doesn't
-    // handle *it being a native array.
-    internal::UniversalPrint(*it, os);
-  }
-
-  if (count > 0) {
-    *os << ' ';
-  }
-  *os << '}';
-}
-
-// Used to print a pointer that is neither a char pointer nor a member
-// pointer, when the user doesn't define PrintTo() for it.  (A member
-// variable pointer or member function pointer doesn't really point to
-// a location in the address space.  Their representation is
-// implementation-defined.  Therefore they will be printed as raw
-// bytes.)
-template <typename T>
-void DefaultPrintTo(WrapPrinterType<kPrintPointer> /* dummy */,
-                    T* p, ::std::ostream* os) {
-  if (p == nullptr) {
-    *os << "NULL";
-  } else {
-    // T is not a function type.  We just call << to print p,
-    // relying on ADL to pick up user-defined << for their pointer
-    // types, if any.
-    *os << p;
-  }
-}
-template <typename T>
-void DefaultPrintTo(WrapPrinterType<kPrintFunctionPointer> /* dummy */,
-                    T* p, ::std::ostream* os) {
-  if (p == nullptr) {
-    *os << "NULL";
-  } else {
-    // T is a function type, so '*os << p' doesn't do what we want
-    // (it just prints p as bool).  We want to print p as a const
-    // void*.
-    *os << reinterpret_cast<const void*>(p);
-  }
-}
-
-// Used to print a non-container, non-pointer value when the user
-// doesn't define PrintTo() for it.
-template <typename T>
-void DefaultPrintTo(WrapPrinterType<kPrintOther> /* dummy */,
-                    const T& value, ::std::ostream* os) {
-  ::testing_internal::DefaultPrintNonContainerTo(value, os);
-}
-
-// Prints the given value using the << operator if it has one;
-// otherwise prints the bytes in it.  This is what
-// UniversalPrinter<T>::Print() does when PrintTo() is not specialized
-// or overloaded for type T.
-//
-// A user can override this behavior for a class type Foo by defining
-// an overload of PrintTo() in the namespace where Foo is defined.  We
-// give the user this option as sometimes defining a << operator for
-// Foo is not desirable (e.g. the coding style may prevent doing it,
-// or there is already a << operator but it doesn't do what the user
-// wants).
-template <typename T>
-void PrintTo(const T& value, ::std::ostream* os) {
-  // DefaultPrintTo() is overloaded.  The type of its first argument
-  // determines which version will be picked.
-  //
-  // Note that we check for container types here, prior to we check
-  // for protocol message types in our operator<<.  The rationale is:
-  //
-  // For protocol messages, we want to give people a chance to
-  // override Google Mock's format by defining a PrintTo() or
-  // operator<<.  For STL containers, other formats can be
-  // incompatible with Google Mock's format for the container
-  // elements; therefore we check for container types here to ensure
-  // that our format is used.
-  //
-  // Note that MSVC and clang-cl do allow an implicit conversion from
-  // pointer-to-function to pointer-to-object, but clang-cl warns on it.
-  // So don't use ImplicitlyConvertible if it can be helped since it will
-  // cause this warning, and use a separate overload of DefaultPrintTo for
-  // function pointers so that the `*os << p` in the object pointer overload
-  // doesn't cause that warning either.
-  DefaultPrintTo(
-      WrapPrinterType <
-                  (sizeof(IsContainerTest<T>(0)) == sizeof(IsContainer)) &&
-              !IsRecursiveContainer<T>::value
-          ? kPrintContainer
-          : !std::is_pointer<T>::value
-                ? kPrintOther
-                : std::is_function<typename std::remove_pointer<T>::type>::value
-                      ? kPrintFunctionPointer
-                      : kPrintPointer > (),
-      value, os);
-}
-
-// The following list of PrintTo() overloads tells
-// UniversalPrinter<T>::Print() how to print standard types (built-in
-// types, strings, plain arrays, and pointers).
-
-// Overloads for various char types.
-GTEST_API_ void PrintTo(unsigned char c, ::std::ostream* os);
-GTEST_API_ void PrintTo(signed char c, ::std::ostream* os);
-inline void PrintTo(char c, ::std::ostream* os) {
-  // When printing a plain char, we always treat it as unsigned.  This
-  // way, the output won't be affected by whether the compiler thinks
-  // char is signed or not.
-  PrintTo(static_cast<unsigned char>(c), os);
-}
-
-// Overloads for other simple built-in types.
-inline void PrintTo(bool x, ::std::ostream* os) {
-  *os << (x ? "true" : "false");
-}
-
-// Overload for wchar_t type.
-// Prints a wchar_t as a symbol if it is printable or as its internal
-// code otherwise and also as its decimal code (except for L'\0').
-// The L'\0' char is printed as "L'\\0'". The decimal code is printed
-// as signed integer when wchar_t is implemented by the compiler
-// as a signed type and is printed as an unsigned integer when wchar_t
-// is implemented as an unsigned type.
-GTEST_API_ void PrintTo(wchar_t wc, ::std::ostream* os);
-
-// Overloads for C strings.
-GTEST_API_ void PrintTo(const char* s, ::std::ostream* os);
-inline void PrintTo(char* s, ::std::ostream* os) {
-  PrintTo(ImplicitCast_<const char*>(s), os);
-}
-
-// signed/unsigned char is often used for representing binary data, so
-// we print pointers to it as void* to be safe.
-inline void PrintTo(const signed char* s, ::std::ostream* os) {
-  PrintTo(ImplicitCast_<const void*>(s), os);
-}
-inline void PrintTo(signed char* s, ::std::ostream* os) {
-  PrintTo(ImplicitCast_<const void*>(s), os);
-}
-inline void PrintTo(const unsigned char* s, ::std::ostream* os) {
-  PrintTo(ImplicitCast_<const void*>(s), os);
-}
-inline void PrintTo(unsigned char* s, ::std::ostream* os) {
-  PrintTo(ImplicitCast_<const void*>(s), os);
-}
-
-// MSVC can be configured to define wchar_t as a typedef of unsigned
-// short.  It defines _NATIVE_WCHAR_T_DEFINED when wchar_t is a native
-// type.  When wchar_t is a typedef, defining an overload for const
-// wchar_t* would cause unsigned short* be printed as a wide string,
-// possibly causing invalid memory accesses.
-#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED)
-// Overloads for wide C strings
-GTEST_API_ void PrintTo(const wchar_t* s, ::std::ostream* os);
-inline void PrintTo(wchar_t* s, ::std::ostream* os) {
-  PrintTo(ImplicitCast_<const wchar_t*>(s), os);
-}
-#endif
-
-// Overload for C arrays.  Multi-dimensional arrays are printed
-// properly.
-
-// Prints the given number of elements in an array, without printing
-// the curly braces.
-template <typename T>
-void PrintRawArrayTo(const T a[], size_t count, ::std::ostream* os) {
-  UniversalPrint(a[0], os);
-  for (size_t i = 1; i != count; i++) {
-    *os << ", ";
-    UniversalPrint(a[i], os);
-  }
-}
-
-// Overloads for ::std::string.
-GTEST_API_ void PrintStringTo(const ::std::string&s, ::std::ostream* os);
-inline void PrintTo(const ::std::string& s, ::std::ostream* os) {
-  PrintStringTo(s, os);
-}
-
-// Overloads for ::std::wstring.
-#if GTEST_HAS_STD_WSTRING
-GTEST_API_ void PrintWideStringTo(const ::std::wstring&s, ::std::ostream* os);
-inline void PrintTo(const ::std::wstring& s, ::std::ostream* os) {
-  PrintWideStringTo(s, os);
-}
-#endif  // GTEST_HAS_STD_WSTRING
-
-#if GTEST_HAS_ABSL
-// Overload for absl::string_view.
-inline void PrintTo(absl::string_view sp, ::std::ostream* os) {
-  PrintTo(::std::string(sp), os);
-}
-#endif  // GTEST_HAS_ABSL
-
-inline void PrintTo(std::nullptr_t, ::std::ostream* os) { *os << "(nullptr)"; }
-
-template <typename T>
-void PrintTo(std::reference_wrapper<T> ref, ::std::ostream* os) {
-  UniversalPrinter<T&>::Print(ref.get(), os);
-}
-
-// Helper function for printing a tuple.  T must be instantiated with
-// a tuple type.
-template <typename T>
-void PrintTupleTo(const T&, std::integral_constant<size_t, 0>,
-                  ::std::ostream*) {}
-
-template <typename T, size_t I>
-void PrintTupleTo(const T& t, std::integral_constant<size_t, I>,
-                  ::std::ostream* os) {
-  PrintTupleTo(t, std::integral_constant<size_t, I - 1>(), os);
-  GTEST_INTENTIONAL_CONST_COND_PUSH_()
-  if (I > 1) {
-    GTEST_INTENTIONAL_CONST_COND_POP_()
-    *os << ", ";
-  }
-  UniversalPrinter<typename std::tuple_element<I - 1, T>::type>::Print(
-      std::get<I - 1>(t), os);
-}
-
-template <typename... Types>
-void PrintTo(const ::std::tuple<Types...>& t, ::std::ostream* os) {
-  *os << "(";
-  PrintTupleTo(t, std::integral_constant<size_t, sizeof...(Types)>(), os);
-  *os << ")";
-}
-
-// Overload for std::pair.
-template <typename T1, typename T2>
-void PrintTo(const ::std::pair<T1, T2>& value, ::std::ostream* os) {
-  *os << '(';
-  // We cannot use UniversalPrint(value.first, os) here, as T1 may be
-  // a reference type.  The same for printing value.second.
-  UniversalPrinter<T1>::Print(value.first, os);
-  *os << ", ";
-  UniversalPrinter<T2>::Print(value.second, os);
-  *os << ')';
-}
-
-// Implements printing a non-reference type T by letting the compiler
-// pick the right overload of PrintTo() for T.
-template <typename T>
-class UniversalPrinter {
- public:
-  // MSVC warns about adding const to a function type, so we want to
-  // disable the warning.
-  GTEST_DISABLE_MSC_WARNINGS_PUSH_(4180)
-
-  // Note: we deliberately don't call this PrintTo(), as that name
-  // conflicts with ::testing::internal::PrintTo in the body of the
-  // function.
-  static void Print(const T& value, ::std::ostream* os) {
-    // By default, ::testing::internal::PrintTo() is used for printing
-    // the value.
-    //
-    // Thanks to Koenig look-up, if T is a class and has its own
-    // PrintTo() function defined in its namespace, that function will
-    // be visible here.  Since it is more specific than the generic ones
-    // in ::testing::internal, it will be picked by the compiler in the
-    // following statement - exactly what we want.
-    PrintTo(value, os);
-  }
-
-  GTEST_DISABLE_MSC_WARNINGS_POP_()
-};
-
-#if GTEST_HAS_ABSL
-
-// Printer for absl::optional
-
-template <typename T>
-class UniversalPrinter<::absl::optional<T>> {
- public:
-  static void Print(const ::absl::optional<T>& value, ::std::ostream* os) {
-    *os << '(';
-    if (!value) {
-      *os << "nullopt";
-    } else {
-      UniversalPrint(*value, os);
-    }
-    *os << ')';
-  }
-};
-
-// Printer for absl::variant
-
-template <typename... T>
-class UniversalPrinter<::absl::variant<T...>> {
- public:
-  static void Print(const ::absl::variant<T...>& value, ::std::ostream* os) {
-    *os << '(';
-    absl::visit(Visitor{os}, value);
-    *os << ')';
-  }
-
- private:
-  struct Visitor {
-    template <typename U>
-    void operator()(const U& u) const {
-      *os << "'" << GetTypeName<U>() << "' with value ";
-      UniversalPrint(u, os);
-    }
-    ::std::ostream* os;
-  };
-};
-
-#endif  // GTEST_HAS_ABSL
-
-// UniversalPrintArray(begin, len, os) prints an array of 'len'
-// elements, starting at address 'begin'.
-template <typename T>
-void UniversalPrintArray(const T* begin, size_t len, ::std::ostream* os) {
-  if (len == 0) {
-    *os << "{}";
-  } else {
-    *os << "{ ";
-    const size_t kThreshold = 18;
-    const size_t kChunkSize = 8;
-    // If the array has more than kThreshold elements, we'll have to
-    // omit some details by printing only the first and the last
-    // kChunkSize elements.
-    if (len <= kThreshold) {
-      PrintRawArrayTo(begin, len, os);
-    } else {
-      PrintRawArrayTo(begin, kChunkSize, os);
-      *os << ", ..., ";
-      PrintRawArrayTo(begin + len - kChunkSize, kChunkSize, os);
-    }
-    *os << " }";
-  }
-}
-// This overload prints a (const) char array compactly.
-GTEST_API_ void UniversalPrintArray(
-    const char* begin, size_t len, ::std::ostream* os);
-
-// This overload prints a (const) wchar_t array compactly.
-GTEST_API_ void UniversalPrintArray(
-    const wchar_t* begin, size_t len, ::std::ostream* os);
-
-// Implements printing an array type T[N].
-template <typename T, size_t N>
-class UniversalPrinter<T[N]> {
- public:
-  // Prints the given array, omitting some elements when there are too
-  // many.
-  static void Print(const T (&a)[N], ::std::ostream* os) {
-    UniversalPrintArray(a, N, os);
-  }
-};
-
-// Implements printing a reference type T&.
-template <typename T>
-class UniversalPrinter<T&> {
- public:
-  // MSVC warns about adding const to a function type, so we want to
-  // disable the warning.
-  GTEST_DISABLE_MSC_WARNINGS_PUSH_(4180)
-
-  static void Print(const T& value, ::std::ostream* os) {
-    // Prints the address of the value.  We use reinterpret_cast here
-    // as static_cast doesn't compile when T is a function type.
-    *os << "@" << reinterpret_cast<const void*>(&value) << " ";
-
-    // Then prints the value itself.
-    UniversalPrint(value, os);
-  }
-
-  GTEST_DISABLE_MSC_WARNINGS_POP_()
-};
-
-// Prints a value tersely: for a reference type, the referenced value
-// (but not the address) is printed; for a (const) char pointer, the
-// NUL-terminated string (but not the pointer) is printed.
-
-template <typename T>
-class UniversalTersePrinter {
- public:
-  static void Print(const T& value, ::std::ostream* os) {
-    UniversalPrint(value, os);
-  }
-};
-template <typename T>
-class UniversalTersePrinter<T&> {
- public:
-  static void Print(const T& value, ::std::ostream* os) {
-    UniversalPrint(value, os);
-  }
-};
-template <typename T, size_t N>
-class UniversalTersePrinter<T[N]> {
- public:
-  static void Print(const T (&value)[N], ::std::ostream* os) {
-    UniversalPrinter<T[N]>::Print(value, os);
-  }
-};
-template <>
-class UniversalTersePrinter<const char*> {
- public:
-  static void Print(const char* str, ::std::ostream* os) {
-    if (str == nullptr) {
-      *os << "NULL";
-    } else {
-      UniversalPrint(std::string(str), os);
-    }
-  }
-};
-template <>
-class UniversalTersePrinter<char*> {
- public:
-  static void Print(char* str, ::std::ostream* os) {
-    UniversalTersePrinter<const char*>::Print(str, os);
-  }
-};
-
-#if GTEST_HAS_STD_WSTRING
-template <>
-class UniversalTersePrinter<const wchar_t*> {
- public:
-  static void Print(const wchar_t* str, ::std::ostream* os) {
-    if (str == nullptr) {
-      *os << "NULL";
-    } else {
-      UniversalPrint(::std::wstring(str), os);
-    }
-  }
-};
-#endif
-
-template <>
-class UniversalTersePrinter<wchar_t*> {
- public:
-  static void Print(wchar_t* str, ::std::ostream* os) {
-    UniversalTersePrinter<const wchar_t*>::Print(str, os);
-  }
-};
-
-template <typename T>
-void UniversalTersePrint(const T& value, ::std::ostream* os) {
-  UniversalTersePrinter<T>::Print(value, os);
-}
-
-// Prints a value using the type inferred by the compiler.  The
-// difference between this and UniversalTersePrint() is that for a
-// (const) char pointer, this prints both the pointer and the
-// NUL-terminated string.
-template <typename T>
-void UniversalPrint(const T& value, ::std::ostream* os) {
-  // A workarond for the bug in VC++ 7.1 that prevents us from instantiating
-  // UniversalPrinter with T directly.
-  typedef T T1;
-  UniversalPrinter<T1>::Print(value, os);
-}
-
-typedef ::std::vector< ::std::string> Strings;
-
-  // Tersely prints the first N fields of a tuple to a string vector,
-  // one element for each field.
-template <typename Tuple>
-void TersePrintPrefixToStrings(const Tuple&, std::integral_constant<size_t, 0>,
-                               Strings*) {}
-template <typename Tuple, size_t I>
-void TersePrintPrefixToStrings(const Tuple& t,
-                               std::integral_constant<size_t, I>,
-                               Strings* strings) {
-  TersePrintPrefixToStrings(t, std::integral_constant<size_t, I - 1>(),
-                            strings);
-  ::std::stringstream ss;
-  UniversalTersePrint(std::get<I - 1>(t), &ss);
-  strings->push_back(ss.str());
-}
-
-// Prints the fields of a tuple tersely to a string vector, one
-// element for each field.  See the comment before
-// UniversalTersePrint() for how we define "tersely".
-template <typename Tuple>
-Strings UniversalTersePrintTupleFieldsToStrings(const Tuple& value) {
-  Strings result;
-  TersePrintPrefixToStrings(
-      value, std::integral_constant<size_t, std::tuple_size<Tuple>::value>(),
-      &result);
-  return result;
-}
-
-}  // namespace internal
-
-#if GTEST_HAS_ABSL
-namespace internal2 {
-template <typename T>
-void TypeWithoutFormatter<T, kConvertibleToStringView>::PrintValue(
-    const T& value, ::std::ostream* os) {
-  internal::PrintTo(absl::string_view(value), os);
-}
-}  // namespace internal2
-#endif
-
-template <typename T>
-::std::string PrintToString(const T& value) {
-  ::std::stringstream ss;
-  internal::UniversalTersePrinter<T>::Print(value, &ss);
-  return ss.str();
-}
-
-}  // namespace testing
-
-// Include any custom printer added by the local installation.
-// We must include this header at the end to make sure it can use the
-// declarations from this file.
-#include "gtest/internal/custom/gtest-printers.h"
-
-#endif  // GTEST_INCLUDE_GTEST_GTEST_PRINTERS_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-spi.h b/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-spi.h
deleted file mode 100644
index aa38870e8e1..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-spi.h
+++ /dev/null
@@ -1,238 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-//
-// Utilities for testing Google Test itself and code that uses Google Test
-// (e.g. frameworks built on top of Google Test).
-
-// GOOGLETEST_CM0004 DO NOT DELETE
-
-#ifndef GTEST_INCLUDE_GTEST_GTEST_SPI_H_
-#define GTEST_INCLUDE_GTEST_GTEST_SPI_H_
-
-#include "gtest/gtest.h"
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
-/* class A needs to have dll-interface to be used by clients of class B */)
-
-namespace testing {
-
-// This helper class can be used to mock out Google Test failure reporting
-// so that we can test Google Test or code that builds on Google Test.
-//
-// An object of this class appends a TestPartResult object to the
-// TestPartResultArray object given in the constructor whenever a Google Test
-// failure is reported. It can either intercept only failures that are
-// generated in the same thread that created this object or it can intercept
-// all generated failures. The scope of this mock object can be controlled with
-// the second argument to the two arguments constructor.
-class GTEST_API_ ScopedFakeTestPartResultReporter
-    : public TestPartResultReporterInterface {
- public:
-  // The two possible mocking modes of this object.
-  enum InterceptMode {
-    INTERCEPT_ONLY_CURRENT_THREAD,  // Intercepts only thread local failures.
-    INTERCEPT_ALL_THREADS           // Intercepts all failures.
-  };
-
-  // The c'tor sets this object as the test part result reporter used
-  // by Google Test.  The 'result' parameter specifies where to report the
-  // results. This reporter will only catch failures generated in the current
-  // thread. DEPRECATED
-  explicit ScopedFakeTestPartResultReporter(TestPartResultArray* result);
-
-  // Same as above, but you can choose the interception scope of this object.
-  ScopedFakeTestPartResultReporter(InterceptMode intercept_mode,
-                                   TestPartResultArray* result);
-
-  // The d'tor restores the previous test part result reporter.
-  ~ScopedFakeTestPartResultReporter() override;
-
-  // Appends the TestPartResult object to the TestPartResultArray
-  // received in the constructor.
-  //
-  // This method is from the TestPartResultReporterInterface
-  // interface.
-  void ReportTestPartResult(const TestPartResult& result) override;
-
- private:
-  void Init();
-
-  const InterceptMode intercept_mode_;
-  TestPartResultReporterInterface* old_reporter_;
-  TestPartResultArray* const result_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedFakeTestPartResultReporter);
-};
-
-namespace internal {
-
-// A helper class for implementing EXPECT_FATAL_FAILURE() and
-// EXPECT_NONFATAL_FAILURE().  Its destructor verifies that the given
-// TestPartResultArray contains exactly one failure that has the given
-// type and contains the given substring.  If that's not the case, a
-// non-fatal failure will be generated.
-class GTEST_API_ SingleFailureChecker {
- public:
-  // The constructor remembers the arguments.
-  SingleFailureChecker(const TestPartResultArray* results,
-                       TestPartResult::Type type, const std::string& substr);
-  ~SingleFailureChecker();
- private:
-  const TestPartResultArray* const results_;
-  const TestPartResult::Type type_;
-  const std::string substr_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(SingleFailureChecker);
-};
-
-}  // namespace internal
-
-}  // namespace testing
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
-
-// A set of macros for testing Google Test assertions or code that's expected
-// to generate Google Test fatal failures.  It verifies that the given
-// statement will cause exactly one fatal Google Test failure with 'substr'
-// being part of the failure message.
-//
-// There are two different versions of this macro. EXPECT_FATAL_FAILURE only
-// affects and considers failures generated in the current thread and
-// EXPECT_FATAL_FAILURE_ON_ALL_THREADS does the same but for all threads.
-//
-// The verification of the assertion is done correctly even when the statement
-// throws an exception or aborts the current function.
-//
-// Known restrictions:
-//   - 'statement' cannot reference local non-static variables or
-//     non-static members of the current object.
-//   - 'statement' cannot return a value.
-//   - You cannot stream a failure message to this macro.
-//
-// Note that even though the implementations of the following two
-// macros are much alike, we cannot refactor them to use a common
-// helper macro, due to some peculiarity in how the preprocessor
-// works.  The AcceptsMacroThatExpandsToUnprotectedComma test in
-// gtest_unittest.cc will fail to compile if we do that.
-#define EXPECT_FATAL_FAILURE(statement, substr) \
-  do { \
-    class GTestExpectFatalFailureHelper {\
-     public:\
-      static void Execute() { statement; }\
-    };\
-    ::testing::TestPartResultArray gtest_failures;\
-    ::testing::internal::SingleFailureChecker gtest_checker(\
-        &gtest_failures, ::testing::TestPartResult::kFatalFailure, (substr));\
-    {\
-      ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\
-          ::testing::ScopedFakeTestPartResultReporter:: \
-          INTERCEPT_ONLY_CURRENT_THREAD, &gtest_failures);\
-      GTestExpectFatalFailureHelper::Execute();\
-    }\
-  } while (::testing::internal::AlwaysFalse())
-
-#define EXPECT_FATAL_FAILURE_ON_ALL_THREADS(statement, substr) \
-  do { \
-    class GTestExpectFatalFailureHelper {\
-     public:\
-      static void Execute() { statement; }\
-    };\
-    ::testing::TestPartResultArray gtest_failures;\
-    ::testing::internal::SingleFailureChecker gtest_checker(\
-        &gtest_failures, ::testing::TestPartResult::kFatalFailure, (substr));\
-    {\
-      ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\
-          ::testing::ScopedFakeTestPartResultReporter:: \
-          INTERCEPT_ALL_THREADS, &gtest_failures);\
-      GTestExpectFatalFailureHelper::Execute();\
-    }\
-  } while (::testing::internal::AlwaysFalse())
-
-// A macro for testing Google Test assertions or code that's expected to
-// generate Google Test non-fatal failures.  It asserts that the given
-// statement will cause exactly one non-fatal Google Test failure with 'substr'
-// being part of the failure message.
-//
-// There are two different versions of this macro. EXPECT_NONFATAL_FAILURE only
-// affects and considers failures generated in the current thread and
-// EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS does the same but for all threads.
-//
-// 'statement' is allowed to reference local variables and members of
-// the current object.
-//
-// The verification of the assertion is done correctly even when the statement
-// throws an exception or aborts the current function.
-//
-// Known restrictions:
-//   - You cannot stream a failure message to this macro.
-//
-// Note that even though the implementations of the following two
-// macros are much alike, we cannot refactor them to use a common
-// helper macro, due to some peculiarity in how the preprocessor
-// works.  If we do that, the code won't compile when the user gives
-// EXPECT_NONFATAL_FAILURE() a statement that contains a macro that
-// expands to code containing an unprotected comma.  The
-// AcceptsMacroThatExpandsToUnprotectedComma test in gtest_unittest.cc
-// catches that.
-//
-// For the same reason, we have to write
-//   if (::testing::internal::AlwaysTrue()) { statement; }
-// instead of
-//   GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement)
-// to avoid an MSVC warning on unreachable code.
-#define EXPECT_NONFATAL_FAILURE(statement, substr) \
-  do {\
-    ::testing::TestPartResultArray gtest_failures;\
-    ::testing::internal::SingleFailureChecker gtest_checker(\
-        &gtest_failures, ::testing::TestPartResult::kNonFatalFailure, \
-        (substr));\
-    {\
-      ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\
-          ::testing::ScopedFakeTestPartResultReporter:: \
-          INTERCEPT_ONLY_CURRENT_THREAD, &gtest_failures);\
-      if (::testing::internal::AlwaysTrue()) { statement; }\
-    }\
-  } while (::testing::internal::AlwaysFalse())
-
-#define EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(statement, substr) \
-  do {\
-    ::testing::TestPartResultArray gtest_failures;\
-    ::testing::internal::SingleFailureChecker gtest_checker(\
-        &gtest_failures, ::testing::TestPartResult::kNonFatalFailure, \
-        (substr));\
-    {\
-      ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\
-          ::testing::ScopedFakeTestPartResultReporter::INTERCEPT_ALL_THREADS, \
-          &gtest_failures);\
-      if (::testing::internal::AlwaysTrue()) { statement; }\
-    }\
-  } while (::testing::internal::AlwaysFalse())
-
-#endif  // GTEST_INCLUDE_GTEST_GTEST_SPI_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-test-part.h b/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-test-part.h
deleted file mode 100644
index 05a79853586..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-test-part.h
+++ /dev/null
@@ -1,184 +0,0 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GTEST_INCLUDE_GTEST_GTEST_TEST_PART_H_
-#define GTEST_INCLUDE_GTEST_GTEST_TEST_PART_H_
-
-#include <iosfwd>
-#include <vector>
-#include "gtest/internal/gtest-internal.h"
-#include "gtest/internal/gtest-string.h"
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
-/* class A needs to have dll-interface to be used by clients of class B */)
-
-namespace testing {
-
-// A copyable object representing the result of a test part (i.e. an
-// assertion or an explicit FAIL(), ADD_FAILURE(), or SUCCESS()).
-//
-// Don't inherit from TestPartResult as its destructor is not virtual.
-class GTEST_API_ TestPartResult {
- public:
-  // The possible outcomes of a test part (i.e. an assertion or an
-  // explicit SUCCEED(), FAIL(), or ADD_FAILURE()).
-  enum Type {
-    kSuccess,          // Succeeded.
-    kNonFatalFailure,  // Failed but the test can continue.
-    kFatalFailure,     // Failed and the test should be terminated.
-    kSkip              // Skipped.
-  };
-
-  // C'tor.  TestPartResult does NOT have a default constructor.
-  // Always use this constructor (with parameters) to create a
-  // TestPartResult object.
-  TestPartResult(Type a_type, const char* a_file_name, int a_line_number,
-                 const char* a_message)
-      : type_(a_type),
-        file_name_(a_file_name == nullptr ? "" : a_file_name),
-        line_number_(a_line_number),
-        summary_(ExtractSummary(a_message)),
-        message_(a_message) {}
-
-  // Gets the outcome of the test part.
-  Type type() const { return type_; }
-
-  // Gets the name of the source file where the test part took place, or
-  // NULL if it's unknown.
-  const char* file_name() const {
-    return file_name_.empty() ? nullptr : file_name_.c_str();
-  }
-
-  // Gets the line in the source file where the test part took place,
-  // or -1 if it's unknown.
-  int line_number() const { return line_number_; }
-
-  // Gets the summary of the failure message.
-  const char* summary() const { return summary_.c_str(); }
-
-  // Gets the message associated with the test part.
-  const char* message() const { return message_.c_str(); }
-
-  // Returns true if and only if the test part was skipped.
-  bool skipped() const { return type_ == kSkip; }
-
-  // Returns true if and only if the test part passed.
-  bool passed() const { return type_ == kSuccess; }
-
-  // Returns true if and only if the test part non-fatally failed.
-  bool nonfatally_failed() const { return type_ == kNonFatalFailure; }
-
-  // Returns true if and only if the test part fatally failed.
-  bool fatally_failed() const { return type_ == kFatalFailure; }
-
-  // Returns true if and only if the test part failed.
-  bool failed() const { return fatally_failed() || nonfatally_failed(); }
-
- private:
-  Type type_;
-
-  // Gets the summary of the failure message by omitting the stack
-  // trace in it.
-  static std::string ExtractSummary(const char* message);
-
-  // The name of the source file where the test part took place, or
-  // "" if the source file is unknown.
-  std::string file_name_;
-  // The line in the source file where the test part took place, or -1
-  // if the line number is unknown.
-  int line_number_;
-  std::string summary_;  // The test failure summary.
-  std::string message_;  // The test failure message.
-};
-
-// Prints a TestPartResult object.
-std::ostream& operator<<(std::ostream& os, const TestPartResult& result);
-
-// An array of TestPartResult objects.
-//
-// Don't inherit from TestPartResultArray as its destructor is not
-// virtual.
-class GTEST_API_ TestPartResultArray {
- public:
-  TestPartResultArray() {}
-
-  // Appends the given TestPartResult to the array.
-  void Append(const TestPartResult& result);
-
-  // Returns the TestPartResult at the given index (0-based).
-  const TestPartResult& GetTestPartResult(int index) const;
-
-  // Returns the number of TestPartResult objects in the array.
-  int size() const;
-
- private:
-  std::vector<TestPartResult> array_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestPartResultArray);
-};
-
-// This interface knows how to report a test part result.
-class GTEST_API_ TestPartResultReporterInterface {
- public:
-  virtual ~TestPartResultReporterInterface() {}
-
-  virtual void ReportTestPartResult(const TestPartResult& result) = 0;
-};
-
-namespace internal {
-
-// This helper class is used by {ASSERT|EXPECT}_NO_FATAL_FAILURE to check if a
-// statement generates new fatal failures. To do so it registers itself as the
-// current test part result reporter. Besides checking if fatal failures were
-// reported, it only delegates the reporting to the former result reporter.
-// The original result reporter is restored in the destructor.
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-class GTEST_API_ HasNewFatalFailureHelper
-    : public TestPartResultReporterInterface {
- public:
-  HasNewFatalFailureHelper();
-  ~HasNewFatalFailureHelper() override;
-  void ReportTestPartResult(const TestPartResult& result) override;
-  bool has_new_fatal_failure() const { return has_new_fatal_failure_; }
- private:
-  bool has_new_fatal_failure_;
-  TestPartResultReporterInterface* original_reporter_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(HasNewFatalFailureHelper);
-};
-
-}  // namespace internal
-
-}  // namespace testing
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
-
-#endif  // GTEST_INCLUDE_GTEST_GTEST_TEST_PART_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-typed-test.h b/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-typed-test.h
deleted file mode 100644
index 095ce058022..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-typed-test.h
+++ /dev/null
@@ -1,330 +0,0 @@
-// Copyright 2008 Google Inc.
-// All Rights Reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GTEST_INCLUDE_GTEST_GTEST_TYPED_TEST_H_
-#define GTEST_INCLUDE_GTEST_GTEST_TYPED_TEST_H_
-
-// This header implements typed tests and type-parameterized tests.
-
-// Typed (aka type-driven) tests repeat the same test for types in a
-// list.  You must know which types you want to test with when writing
-// typed tests. Here's how you do it:
-
-#if 0
-
-// First, define a fixture class template.  It should be parameterized
-// by a type.  Remember to derive it from testing::Test.
-template <typename T>
-class FooTest : public testing::Test {
- public:
-  ...
-  typedef std::list<T> List;
-  static T shared_;
-  T value_;
-};
-
-// Next, associate a list of types with the test suite, which will be
-// repeated for each type in the list.  The typedef is necessary for
-// the macro to parse correctly.
-typedef testing::Types<char, int, unsigned int> MyTypes;
-TYPED_TEST_SUITE(FooTest, MyTypes);
-
-// If the type list contains only one type, you can write that type
-// directly without Types<...>:
-//   TYPED_TEST_SUITE(FooTest, int);
-
-// Then, use TYPED_TEST() instead of TEST_F() to define as many typed
-// tests for this test suite as you want.
-TYPED_TEST(FooTest, DoesBlah) {
-  // Inside a test, refer to the special name TypeParam to get the type
-  // parameter.  Since we are inside a derived class template, C++ requires
-  // us to visit the members of FooTest via 'this'.
-  TypeParam n = this->value_;
-
-  // To visit static members of the fixture, add the TestFixture::
-  // prefix.
-  n += TestFixture::shared_;
-
-  // To refer to typedefs in the fixture, add the "typename
-  // TestFixture::" prefix.
-  typename TestFixture::List values;
-  values.push_back(n);
-  ...
-}
-
-TYPED_TEST(FooTest, HasPropertyA) { ... }
-
-// TYPED_TEST_SUITE takes an optional third argument which allows to specify a
-// class that generates custom test name suffixes based on the type. This should
-// be a class which has a static template function GetName(int index) returning
-// a string for each type. The provided integer index equals the index of the
-// type in the provided type list. In many cases the index can be ignored.
-//
-// For example:
-//   class MyTypeNames {
-//    public:
-//     template <typename T>
-//     static std::string GetName(int) {
-//       if (std::is_same<T, char>()) return "char";
-//       if (std::is_same<T, int>()) return "int";
-//       if (std::is_same<T, unsigned int>()) return "unsignedInt";
-//     }
-//   };
-//   TYPED_TEST_SUITE(FooTest, MyTypes, MyTypeNames);
-
-#endif  // 0
-
-// Type-parameterized tests are abstract test patterns parameterized
-// by a type.  Compared with typed tests, type-parameterized tests
-// allow you to define the test pattern without knowing what the type
-// parameters are.  The defined pattern can be instantiated with
-// different types any number of times, in any number of translation
-// units.
-//
-// If you are designing an interface or concept, you can define a
-// suite of type-parameterized tests to verify properties that any
-// valid implementation of the interface/concept should have.  Then,
-// each implementation can easily instantiate the test suite to verify
-// that it conforms to the requirements, without having to write
-// similar tests repeatedly.  Here's an example:
-
-#if 0
-
-// First, define a fixture class template.  It should be parameterized
-// by a type.  Remember to derive it from testing::Test.
-template <typename T>
-class FooTest : public testing::Test {
-  ...
-};
-
-// Next, declare that you will define a type-parameterized test suite
-// (the _P suffix is for "parameterized" or "pattern", whichever you
-// prefer):
-TYPED_TEST_SUITE_P(FooTest);
-
-// Then, use TYPED_TEST_P() to define as many type-parameterized tests
-// for this type-parameterized test suite as you want.
-TYPED_TEST_P(FooTest, DoesBlah) {
-  // Inside a test, refer to TypeParam to get the type parameter.
-  TypeParam n = 0;
-  ...
-}
-
-TYPED_TEST_P(FooTest, HasPropertyA) { ... }
-
-// Now the tricky part: you need to register all test patterns before
-// you can instantiate them.  The first argument of the macro is the
-// test suite name; the rest are the names of the tests in this test
-// case.
-REGISTER_TYPED_TEST_SUITE_P(FooTest,
-                            DoesBlah, HasPropertyA);
-
-// Finally, you are free to instantiate the pattern with the types you
-// want.  If you put the above code in a header file, you can #include
-// it in multiple C++ source files and instantiate it multiple times.
-//
-// To distinguish different instances of the pattern, the first
-// argument to the INSTANTIATE_* macro is a prefix that will be added
-// to the actual test suite name.  Remember to pick unique prefixes for
-// different instances.
-typedef testing::Types<char, int, unsigned int> MyTypes;
-INSTANTIATE_TYPED_TEST_SUITE_P(My, FooTest, MyTypes);
-
-// If the type list contains only one type, you can write that type
-// directly without Types<...>:
-//   INSTANTIATE_TYPED_TEST_SUITE_P(My, FooTest, int);
-//
-// Similar to the optional argument of TYPED_TEST_SUITE above,
-// INSTANTIATE_TEST_SUITE_P takes an optional fourth argument which allows to
-// generate custom names.
-//   INSTANTIATE_TYPED_TEST_SUITE_P(My, FooTest, MyTypes, MyTypeNames);
-
-#endif  // 0
-
-#include "gtest/internal/gtest-port.h"
-#include "gtest/internal/gtest-type-util.h"
-
-// Implements typed tests.
-
-#if GTEST_HAS_TYPED_TEST
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-//
-// Expands to the name of the typedef for the type parameters of the
-// given test suite.
-#define GTEST_TYPE_PARAMS_(TestSuiteName) gtest_type_params_##TestSuiteName##_
-
-// Expands to the name of the typedef for the NameGenerator, responsible for
-// creating the suffixes of the name.
-#define GTEST_NAME_GENERATOR_(TestSuiteName) \
-  gtest_type_params_##TestSuiteName##_NameGenerator
-
-#define TYPED_TEST_SUITE(CaseName, Types, ...)                           \
-  typedef ::testing::internal::TypeList<Types>::type GTEST_TYPE_PARAMS_( \
-      CaseName);                                                         \
-  typedef ::testing::internal::NameGeneratorSelector<__VA_ARGS__>::type  \
-      GTEST_NAME_GENERATOR_(CaseName)
-
-# define TYPED_TEST(CaseName, TestName)                                       \
-  template <typename gtest_TypeParam_>                                        \
-  class GTEST_TEST_CLASS_NAME_(CaseName, TestName)                            \
-      : public CaseName<gtest_TypeParam_> {                                   \
-   private:                                                                   \
-    typedef CaseName<gtest_TypeParam_> TestFixture;                           \
-    typedef gtest_TypeParam_ TypeParam;                                       \
-    virtual void TestBody();                                                  \
-  };                                                                          \
-  static bool gtest_##CaseName##_##TestName##_registered_                     \
-        GTEST_ATTRIBUTE_UNUSED_ =                                             \
-      ::testing::internal::TypeParameterizedTest<                             \
-          CaseName,                                                           \
-          ::testing::internal::TemplateSel<GTEST_TEST_CLASS_NAME_(CaseName,   \
-                                                                  TestName)>, \
-          GTEST_TYPE_PARAMS_(                                                 \
-              CaseName)>::Register("",                                        \
-                                   ::testing::internal::CodeLocation(         \
-                                       __FILE__, __LINE__),                   \
-                                   #CaseName, #TestName, 0,                   \
-                                   ::testing::internal::GenerateNames<        \
-                                       GTEST_NAME_GENERATOR_(CaseName),       \
-                                       GTEST_TYPE_PARAMS_(CaseName)>());      \
-  template <typename gtest_TypeParam_>                                        \
-  void GTEST_TEST_CLASS_NAME_(CaseName,                                       \
-                              TestName)<gtest_TypeParam_>::TestBody()
-
-// Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-#define TYPED_TEST_CASE                                                \
-  static_assert(::testing::internal::TypedTestCaseIsDeprecated(), ""); \
-  TYPED_TEST_SUITE
-#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-#endif  // GTEST_HAS_TYPED_TEST
-
-// Implements type-parameterized tests.
-
-#if GTEST_HAS_TYPED_TEST_P
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-//
-// Expands to the namespace name that the type-parameterized tests for
-// the given type-parameterized test suite are defined in.  The exact
-// name of the namespace is subject to change without notice.
-#define GTEST_SUITE_NAMESPACE_(TestSuiteName) gtest_suite_##TestSuiteName##_
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-//
-// Expands to the name of the variable used to remember the names of
-// the defined tests in the given test suite.
-#define GTEST_TYPED_TEST_SUITE_P_STATE_(TestSuiteName) \
-  gtest_typed_test_suite_p_state_##TestSuiteName##_
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE DIRECTLY.
-//
-// Expands to the name of the variable used to remember the names of
-// the registered tests in the given test suite.
-#define GTEST_REGISTERED_TEST_NAMES_(TestSuiteName) \
-  gtest_registered_test_names_##TestSuiteName##_
-
-// The variables defined in the type-parameterized test macros are
-// static as typically these macros are used in a .h file that can be
-// #included in multiple translation units linked together.
-#define TYPED_TEST_SUITE_P(SuiteName)              \
-  static ::testing::internal::TypedTestSuitePState \
-      GTEST_TYPED_TEST_SUITE_P_STATE_(SuiteName)
-
-// Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-#define TYPED_TEST_CASE_P                                                 \
-  static_assert(::testing::internal::TypedTestCase_P_IsDeprecated(), ""); \
-  TYPED_TEST_SUITE_P
-#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-#define TYPED_TEST_P(SuiteName, TestName)                             \
-  namespace GTEST_SUITE_NAMESPACE_(SuiteName) {                       \
-    template <typename gtest_TypeParam_>                              \
-    class TestName : public SuiteName<gtest_TypeParam_> {             \
-     private:                                                         \
-      typedef SuiteName<gtest_TypeParam_> TestFixture;                \
-      typedef gtest_TypeParam_ TypeParam;                             \
-      virtual void TestBody();                                        \
-    };                                                                \
-    static bool gtest_##TestName##_defined_ GTEST_ATTRIBUTE_UNUSED_ = \
-        GTEST_TYPED_TEST_SUITE_P_STATE_(SuiteName).AddTestName(       \
-            __FILE__, __LINE__, #SuiteName, #TestName);               \
-  }                                                                   \
-  template <typename gtest_TypeParam_>                                \
-  void GTEST_SUITE_NAMESPACE_(                                        \
-      SuiteName)::TestName<gtest_TypeParam_>::TestBody()
-
-#define REGISTER_TYPED_TEST_SUITE_P(SuiteName, ...)                            \
-  namespace GTEST_SUITE_NAMESPACE_(SuiteName) {                                \
-    typedef ::testing::internal::Templates<__VA_ARGS__>::type gtest_AllTests_; \
-  }                                                                            \
-  static const char* const GTEST_REGISTERED_TEST_NAMES_(                       \
-      SuiteName) GTEST_ATTRIBUTE_UNUSED_ =                                     \
-      GTEST_TYPED_TEST_SUITE_P_STATE_(SuiteName).VerifyRegisteredTestNames(    \
-          __FILE__, __LINE__, #__VA_ARGS__)
-
-// Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-#define REGISTER_TYPED_TEST_CASE_P                                           \
-  static_assert(::testing::internal::RegisterTypedTestCase_P_IsDeprecated(), \
-                "");                                                         \
-  REGISTER_TYPED_TEST_SUITE_P
-#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-#define INSTANTIATE_TYPED_TEST_SUITE_P(Prefix, SuiteName, Types, ...)       \
-  static bool gtest_##Prefix##_##SuiteName GTEST_ATTRIBUTE_UNUSED_ =        \
-      ::testing::internal::TypeParameterizedTestSuite<                      \
-          SuiteName, GTEST_SUITE_NAMESPACE_(SuiteName)::gtest_AllTests_,    \
-          ::testing::internal::TypeList<Types>::type>::                     \
-          Register(#Prefix,                                                 \
-                   ::testing::internal::CodeLocation(__FILE__, __LINE__),   \
-                   &GTEST_TYPED_TEST_SUITE_P_STATE_(SuiteName), #SuiteName, \
-                   GTEST_REGISTERED_TEST_NAMES_(SuiteName),                 \
-                   ::testing::internal::GenerateNames<                      \
-                       ::testing::internal::NameGeneratorSelector<          \
-                           __VA_ARGS__>::type,                              \
-                       ::testing::internal::TypeList<Types>::type>())
-
-// Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-#define INSTANTIATE_TYPED_TEST_CASE_P                                      \
-  static_assert(                                                           \
-      ::testing::internal::InstantiateTypedTestCase_P_IsDeprecated(), ""); \
-  INSTANTIATE_TYPED_TEST_SUITE_P
-#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-#endif  // GTEST_HAS_TYPED_TEST_P
-
-#endif  // GTEST_INCLUDE_GTEST_GTEST_TYPED_TEST_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest.h b/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest.h
deleted file mode 100644
index dbe5b1c2c3f..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest.h
+++ /dev/null
@@ -1,2478 +0,0 @@
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-//
-// The Google C++ Testing and Mocking Framework (Google Test)
-//
-// This header file defines the public API for Google Test.  It should be
-// included by any test program that uses Google Test.
-//
-// IMPORTANT NOTE: Due to limitation of the C++ language, we have to
-// leave some internal implementation details in this header file.
-// They are clearly marked by comments like this:
-//
-//   // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-//
-// Such code is NOT meant to be used by a user directly, and is subject
-// to CHANGE WITHOUT NOTICE.  Therefore DO NOT DEPEND ON IT in a user
-// program!
-//
-// Acknowledgment: Google Test borrowed the idea of automatic test
-// registration from Barthelemy Dagenais' (barthelemy@prologique.com)
-// easyUnit framework.
-
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GTEST_INCLUDE_GTEST_GTEST_H_
-#define GTEST_INCLUDE_GTEST_GTEST_H_
-
-#include <cstddef>
-#include <limits>
-#include <memory>
-#include <ostream>
-#include <type_traits>
-#include <vector>
-
-#include "gtest/internal/gtest-internal.h"
-#include "gtest/internal/gtest-string.h"
-#include "gtest/gtest-death-test.h"
-#include "gtest/gtest-matchers.h"
-#include "gtest/gtest-message.h"
-#include "gtest/gtest-param-test.h"
-#include "gtest/gtest-printers.h"
-#include "gtest/gtest_prod.h"
-#include "gtest/gtest-test-part.h"
-#include "gtest/gtest-typed-test.h"
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
-/* class A needs to have dll-interface to be used by clients of class B */)
-
-namespace testing {
-
-// Silence C4100 (unreferenced formal parameter) and 4805
-// unsafe mix of type 'const int' and type 'const bool'
-#ifdef _MSC_VER
-# pragma warning(push)
-# pragma warning(disable:4805)
-# pragma warning(disable:4100)
-#endif
-
-
-// Declares the flags.
-
-// This flag temporary enables the disabled tests.
-GTEST_DECLARE_bool_(also_run_disabled_tests);
-
-// This flag brings the debugger on an assertion failure.
-GTEST_DECLARE_bool_(break_on_failure);
-
-// This flag controls whether Google Test catches all test-thrown exceptions
-// and logs them as failures.
-GTEST_DECLARE_bool_(catch_exceptions);
-
-// This flag enables using colors in terminal output. Available values are
-// "yes" to enable colors, "no" (disable colors), or "auto" (the default)
-// to let Google Test decide.
-GTEST_DECLARE_string_(color);
-
-// This flag sets up the filter to select by name using a glob pattern
-// the tests to run. If the filter is not given all tests are executed.
-GTEST_DECLARE_string_(filter);
-
-// This flag controls whether Google Test installs a signal handler that dumps
-// debugging information when fatal signals are raised.
-GTEST_DECLARE_bool_(install_failure_signal_handler);
-
-// This flag causes the Google Test to list tests. None of the tests listed
-// are actually run if the flag is provided.
-GTEST_DECLARE_bool_(list_tests);
-
-// This flag controls whether Google Test emits a detailed XML report to a file
-// in addition to its normal textual output.
-GTEST_DECLARE_string_(output);
-
-// This flags control whether Google Test prints the elapsed time for each
-// test.
-GTEST_DECLARE_bool_(print_time);
-
-// This flags control whether Google Test prints UTF8 characters as text.
-GTEST_DECLARE_bool_(print_utf8);
-
-// This flag specifies the random number seed.
-GTEST_DECLARE_int32_(random_seed);
-
-// This flag sets how many times the tests are repeated. The default value
-// is 1. If the value is -1 the tests are repeating forever.
-GTEST_DECLARE_int32_(repeat);
-
-// This flag controls whether Google Test includes Google Test internal
-// stack frames in failure stack traces.
-GTEST_DECLARE_bool_(show_internal_stack_frames);
-
-// When this flag is specified, tests' order is randomized on every iteration.
-GTEST_DECLARE_bool_(shuffle);
-
-// This flag specifies the maximum number of stack frames to be
-// printed in a failure message.
-GTEST_DECLARE_int32_(stack_trace_depth);
-
-// When this flag is specified, a failed assertion will throw an
-// exception if exceptions are enabled, or exit the program with a
-// non-zero code otherwise. For use with an external test framework.
-GTEST_DECLARE_bool_(throw_on_failure);
-
-// When this flag is set with a "host:port" string, on supported
-// platforms test results are streamed to the specified port on
-// the specified host machine.
-GTEST_DECLARE_string_(stream_result_to);
-
-#if GTEST_USE_OWN_FLAGFILE_FLAG_
-GTEST_DECLARE_string_(flagfile);
-#endif  // GTEST_USE_OWN_FLAGFILE_FLAG_
-
-// The upper limit for valid stack trace depths.
-const int kMaxStackTraceDepth = 100;
-
-namespace internal {
-
-class AssertHelper;
-class DefaultGlobalTestPartResultReporter;
-class ExecDeathTest;
-class NoExecDeathTest;
-class FinalSuccessChecker;
-class GTestFlagSaver;
-class StreamingListenerTest;
-class TestResultAccessor;
-class TestEventListenersAccessor;
-class TestEventRepeater;
-class UnitTestRecordPropertyTestHelper;
-class WindowsDeathTest;
-class FuchsiaDeathTest;
-class UnitTestImpl* GetUnitTestImpl();
-void ReportFailureInUnknownLocation(TestPartResult::Type result_type,
-                                    const std::string& message);
-
-}  // namespace internal
-
-// The friend relationship of some of these classes is cyclic.
-// If we don't forward declare them the compiler might confuse the classes
-// in friendship clauses with same named classes on the scope.
-class Test;
-class TestSuite;
-
-// Old API is still available but deprecated
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-using TestCase = TestSuite;
-#endif
-class TestInfo;
-class UnitTest;
-
-// A class for indicating whether an assertion was successful.  When
-// the assertion wasn't successful, the AssertionResult object
-// remembers a non-empty message that describes how it failed.
-//
-// To create an instance of this class, use one of the factory functions
-// (AssertionSuccess() and AssertionFailure()).
-//
-// This class is useful for two purposes:
-//   1. Defining predicate functions to be used with Boolean test assertions
-//      EXPECT_TRUE/EXPECT_FALSE and their ASSERT_ counterparts
-//   2. Defining predicate-format functions to be
-//      used with predicate assertions (ASSERT_PRED_FORMAT*, etc).
-//
-// For example, if you define IsEven predicate:
-//
-//   testing::AssertionResult IsEven(int n) {
-//     if ((n % 2) == 0)
-//       return testing::AssertionSuccess();
-//     else
-//       return testing::AssertionFailure() << n << " is odd";
-//   }
-//
-// Then the failed expectation EXPECT_TRUE(IsEven(Fib(5)))
-// will print the message
-//
-//   Value of: IsEven(Fib(5))
-//     Actual: false (5 is odd)
-//   Expected: true
-//
-// instead of a more opaque
-//
-//   Value of: IsEven(Fib(5))
-//     Actual: false
-//   Expected: true
-//
-// in case IsEven is a simple Boolean predicate.
-//
-// If you expect your predicate to be reused and want to support informative
-// messages in EXPECT_FALSE and ASSERT_FALSE (negative assertions show up
-// about half as often as positive ones in our tests), supply messages for
-// both success and failure cases:
-//
-//   testing::AssertionResult IsEven(int n) {
-//     if ((n % 2) == 0)
-//       return testing::AssertionSuccess() << n << " is even";
-//     else
-//       return testing::AssertionFailure() << n << " is odd";
-//   }
-//
-// Then a statement EXPECT_FALSE(IsEven(Fib(6))) will print
-//
-//   Value of: IsEven(Fib(6))
-//     Actual: true (8 is even)
-//   Expected: false
-//
-// NB: Predicates that support negative Boolean assertions have reduced
-// performance in positive ones so be careful not to use them in tests
-// that have lots (tens of thousands) of positive Boolean assertions.
-//
-// To use this class with EXPECT_PRED_FORMAT assertions such as:
-//
-//   // Verifies that Foo() returns an even number.
-//   EXPECT_PRED_FORMAT1(IsEven, Foo());
-//
-// you need to define:
-//
-//   testing::AssertionResult IsEven(const char* expr, int n) {
-//     if ((n % 2) == 0)
-//       return testing::AssertionSuccess();
-//     else
-//       return testing::AssertionFailure()
-//         << "Expected: " << expr << " is even\n  Actual: it's " << n;
-//   }
-//
-// If Foo() returns 5, you will see the following message:
-//
-//   Expected: Foo() is even
-//     Actual: it's 5
-//
-class GTEST_API_ AssertionResult {
- public:
-  // Copy constructor.
-  // Used in EXPECT_TRUE/FALSE(assertion_result).
-  AssertionResult(const AssertionResult& other);
-
-#if defined(_MSC_VER) && _MSC_VER < 1910
-  GTEST_DISABLE_MSC_WARNINGS_PUSH_(4800 /* forcing value to bool */)
-#endif
-
-  // Used in the EXPECT_TRUE/FALSE(bool_expression).
-  //
-  // T must be contextually convertible to bool.
-  //
-  // The second parameter prevents this overload from being considered if
-  // the argument is implicitly convertible to AssertionResult. In that case
-  // we want AssertionResult's copy constructor to be used.
-  template <typename T>
-  explicit AssertionResult(
-      const T& success,
-      typename std::enable_if<
-          !std::is_convertible<T, AssertionResult>::value>::type*
-      /*enabler*/
-      = nullptr)
-      : success_(success) {}
-
-#if defined(_MSC_VER) && _MSC_VER < 1910
-  GTEST_DISABLE_MSC_WARNINGS_POP_()
-#endif
-
-  // Assignment operator.
-  AssertionResult& operator=(AssertionResult other) {
-    swap(other);
-    return *this;
-  }
-
-  // Returns true if and only if the assertion succeeded.
-  operator bool() const { return success_; }  // NOLINT
-
-  // Returns the assertion's negation. Used with EXPECT/ASSERT_FALSE.
-  AssertionResult operator!() const;
-
-  // Returns the text streamed into this AssertionResult. Test assertions
-  // use it when they fail (i.e., the predicate's outcome doesn't match the
-  // assertion's expectation). When nothing has been streamed into the
-  // object, returns an empty string.
-  const char* message() const {
-    return message_.get() != nullptr ? message_->c_str() : "";
-  }
-  // Deprecated; please use message() instead.
-  const char* failure_message() const { return message(); }
-
-  // Streams a custom failure message into this object.
-  template <typename T> AssertionResult& operator<<(const T& value) {
-    AppendMessage(Message() << value);
-    return *this;
-  }
-
-  // Allows streaming basic output manipulators such as endl or flush into
-  // this object.
-  AssertionResult& operator<<(
-      ::std::ostream& (*basic_manipulator)(::std::ostream& stream)) {
-    AppendMessage(Message() << basic_manipulator);
-    return *this;
-  }
-
- private:
-  // Appends the contents of message to message_.
-  void AppendMessage(const Message& a_message) {
-    if (message_.get() == nullptr) message_.reset(new ::std::string);
-    message_->append(a_message.GetString().c_str());
-  }
-
-  // Swap the contents of this AssertionResult with other.
-  void swap(AssertionResult& other);
-
-  // Stores result of the assertion predicate.
-  bool success_;
-  // Stores the message describing the condition in case the expectation
-  // construct is not satisfied with the predicate's outcome.
-  // Referenced via a pointer to avoid taking too much stack frame space
-  // with test assertions.
-  std::unique_ptr< ::std::string> message_;
-};
-
-// Makes a successful assertion result.
-GTEST_API_ AssertionResult AssertionSuccess();
-
-// Makes a failed assertion result.
-GTEST_API_ AssertionResult AssertionFailure();
-
-// Makes a failed assertion result with the given failure message.
-// Deprecated; use AssertionFailure() << msg.
-GTEST_API_ AssertionResult AssertionFailure(const Message& msg);
-
-}  // namespace testing
-
-// Includes the auto-generated header that implements a family of generic
-// predicate assertion macros. This include comes late because it relies on
-// APIs declared above.
-#include "gtest/gtest_pred_impl.h"
-
-namespace testing {
-
-// The abstract class that all tests inherit from.
-//
-// In Google Test, a unit test program contains one or many TestSuites, and
-// each TestSuite contains one or many Tests.
-//
-// When you define a test using the TEST macro, you don't need to
-// explicitly derive from Test - the TEST macro automatically does
-// this for you.
-//
-// The only time you derive from Test is when defining a test fixture
-// to be used in a TEST_F.  For example:
-//
-//   class FooTest : public testing::Test {
-//    protected:
-//     void SetUp() override { ... }
-//     void TearDown() override { ... }
-//     ...
-//   };
-//
-//   TEST_F(FooTest, Bar) { ... }
-//   TEST_F(FooTest, Baz) { ... }
-//
-// Test is not copyable.
-class GTEST_API_ Test {
- public:
-  friend class TestInfo;
-
-  // The d'tor is virtual as we intend to inherit from Test.
-  virtual ~Test();
-
-  // Sets up the stuff shared by all tests in this test case.
-  //
-  // Google Test will call Foo::SetUpTestSuite() before running the first
-  // test in test case Foo.  Hence a sub-class can define its own
-  // SetUpTestSuite() method to shadow the one defined in the super
-  // class.
-  // Failures that happen during SetUpTestSuite are logged but otherwise
-  // ignored.
-  static void SetUpTestSuite() {}
-
-  // Tears down the stuff shared by all tests in this test suite.
-  //
-  // Google Test will call Foo::TearDownTestSuite() after running the last
-  // test in test case Foo.  Hence a sub-class can define its own
-  // TearDownTestSuite() method to shadow the one defined in the super
-  // class.
-  // Failures that happen during TearDownTestSuite are logged but otherwise
-  // ignored.
-  static void TearDownTestSuite() {}
-
-  // Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  static void TearDownTestCase() {}
-  static void SetUpTestCase() {}
-#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  // Returns true if and only if the current test has a fatal failure.
-  static bool HasFatalFailure();
-
-  // Returns true if and only if the current test has a non-fatal failure.
-  static bool HasNonfatalFailure();
-
-  // Returns true if and only if the current test was skipped.
-  static bool IsSkipped();
-
-  // Returns true if and only if the current test has a (either fatal or
-  // non-fatal) failure.
-  static bool HasFailure() { return HasFatalFailure() || HasNonfatalFailure(); }
-
-  // Logs a property for the current test, test suite, or for the entire
-  // invocation of the test program when used outside of the context of a
-  // test suite.  Only the last value for a given key is remembered.  These
-  // are public static so they can be called from utility functions that are
-  // not members of the test fixture.  Calls to RecordProperty made during
-  // lifespan of the test (from the moment its constructor starts to the
-  // moment its destructor finishes) will be output in XML as attributes of
-  // the <testcase> element.  Properties recorded from fixture's
-  // SetUpTestSuite or TearDownTestSuite are logged as attributes of the
-  // corresponding <testsuite> element.  Calls to RecordProperty made in the
-  // global context (before or after invocation of RUN_ALL_TESTS and from
-  // SetUp/TearDown method of Environment objects registered with Google
-  // Test) will be output as attributes of the <testsuites> element.
-  static void RecordProperty(const std::string& key, const std::string& value);
-  static void RecordProperty(const std::string& key, int value);
-
- protected:
-  // Creates a Test object.
-  Test();
-
-  // Sets up the test fixture.
-  virtual void SetUp();
-
-  // Tears down the test fixture.
-  virtual void TearDown();
-
- private:
-  // Returns true if and only if the current test has the same fixture class
-  // as the first test in the current test suite.
-  static bool HasSameFixtureClass();
-
-  // Runs the test after the test fixture has been set up.
-  //
-  // A sub-class must implement this to define the test logic.
-  //
-  // DO NOT OVERRIDE THIS FUNCTION DIRECTLY IN A USER PROGRAM.
-  // Instead, use the TEST or TEST_F macro.
-  virtual void TestBody() = 0;
-
-  // Sets up, executes, and tears down the test.
-  void Run();
-
-  // Deletes self.  We deliberately pick an unusual name for this
-  // internal method to avoid clashing with names used in user TESTs.
-  void DeleteSelf_() { delete this; }
-
-  const std::unique_ptr<GTEST_FLAG_SAVER_> gtest_flag_saver_;
-
-  // Often a user misspells SetUp() as Setup() and spends a long time
-  // wondering why it is never called by Google Test.  The declaration of
-  // the following method is solely for catching such an error at
-  // compile time:
-  //
-  //   - The return type is deliberately chosen to be not void, so it
-  //   will be a conflict if void Setup() is declared in the user's
-  //   test fixture.
-  //
-  //   - This method is private, so it will be another compiler error
-  //   if the method is called from the user's test fixture.
-  //
-  // DO NOT OVERRIDE THIS FUNCTION.
-  //
-  // If you see an error about overriding the following function or
-  // about it being private, you have mis-spelled SetUp() as Setup().
-  struct Setup_should_be_spelled_SetUp {};
-  virtual Setup_should_be_spelled_SetUp* Setup() { return nullptr; }
-
-  // We disallow copying Tests.
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(Test);
-};
-
-typedef internal::TimeInMillis TimeInMillis;
-
-// A copyable object representing a user specified test property which can be
-// output as a key/value string pair.
-//
-// Don't inherit from TestProperty as its destructor is not virtual.
-class TestProperty {
- public:
-  // C'tor.  TestProperty does NOT have a default constructor.
-  // Always use this constructor (with parameters) to create a
-  // TestProperty object.
-  TestProperty(const std::string& a_key, const std::string& a_value) :
-    key_(a_key), value_(a_value) {
-  }
-
-  // Gets the user supplied key.
-  const char* key() const {
-    return key_.c_str();
-  }
-
-  // Gets the user supplied value.
-  const char* value() const {
-    return value_.c_str();
-  }
-
-  // Sets a new value, overriding the one supplied in the constructor.
-  void SetValue(const std::string& new_value) {
-    value_ = new_value;
-  }
-
- private:
-  // The key supplied by the user.
-  std::string key_;
-  // The value supplied by the user.
-  std::string value_;
-};
-
-// The result of a single Test.  This includes a list of
-// TestPartResults, a list of TestProperties, a count of how many
-// death tests there are in the Test, and how much time it took to run
-// the Test.
-//
-// TestResult is not copyable.
-class GTEST_API_ TestResult {
- public:
-  // Creates an empty TestResult.
-  TestResult();
-
-  // D'tor.  Do not inherit from TestResult.
-  ~TestResult();
-
-  // Gets the number of all test parts.  This is the sum of the number
-  // of successful test parts and the number of failed test parts.
-  int total_part_count() const;
-
-  // Returns the number of the test properties.
-  int test_property_count() const;
-
-  // Returns true if and only if the test passed (i.e. no test part failed).
-  bool Passed() const { return !Skipped() && !Failed(); }
-
-  // Returns true if and only if the test was skipped.
-  bool Skipped() const;
-
-  // Returns true if and only if the test failed.
-  bool Failed() const;
-
-  // Returns true if and only if the test fatally failed.
-  bool HasFatalFailure() const;
-
-  // Returns true if and only if the test has a non-fatal failure.
-  bool HasNonfatalFailure() const;
-
-  // Returns the elapsed time, in milliseconds.
-  TimeInMillis elapsed_time() const { return elapsed_time_; }
-
-  // Gets the time of the test case start, in ms from the start of the
-  // UNIX epoch.
-  TimeInMillis start_timestamp() const { return start_timestamp_; }
-
-  // Returns the i-th test part result among all the results. i can range from 0
-  // to total_part_count() - 1. If i is not in that range, aborts the program.
-  const TestPartResult& GetTestPartResult(int i) const;
-
-  // Returns the i-th test property. i can range from 0 to
-  // test_property_count() - 1. If i is not in that range, aborts the
-  // program.
-  const TestProperty& GetTestProperty(int i) const;
-
- private:
-  friend class TestInfo;
-  friend class TestSuite;
-  friend class UnitTest;
-  friend class internal::DefaultGlobalTestPartResultReporter;
-  friend class internal::ExecDeathTest;
-  friend class internal::TestResultAccessor;
-  friend class internal::UnitTestImpl;
-  friend class internal::WindowsDeathTest;
-  friend class internal::FuchsiaDeathTest;
-
-  // Gets the vector of TestPartResults.
-  const std::vector<TestPartResult>& test_part_results() const {
-    return test_part_results_;
-  }
-
-  // Gets the vector of TestProperties.
-  const std::vector<TestProperty>& test_properties() const {
-    return test_properties_;
-  }
-
-  // Sets the start time.
-  void set_start_timestamp(TimeInMillis start) { start_timestamp_ = start; }
-
-  // Sets the elapsed time.
-  void set_elapsed_time(TimeInMillis elapsed) { elapsed_time_ = elapsed; }
-
-  // Adds a test property to the list. The property is validated and may add
-  // a non-fatal failure if invalid (e.g., if it conflicts with reserved
-  // key names). If a property is already recorded for the same key, the
-  // value will be updated, rather than storing multiple values for the same
-  // key.  xml_element specifies the element for which the property is being
-  // recorded and is used for validation.
-  void RecordProperty(const std::string& xml_element,
-                      const TestProperty& test_property);
-
-  // Adds a failure if the key is a reserved attribute of Google Test
-  // testsuite tags.  Returns true if the property is valid.
-  // FIXME: Validate attribute names are legal and human readable.
-  static bool ValidateTestProperty(const std::string& xml_element,
-                                   const TestProperty& test_property);
-
-  // Adds a test part result to the list.
-  void AddTestPartResult(const TestPartResult& test_part_result);
-
-  // Returns the death test count.
-  int death_test_count() const { return death_test_count_; }
-
-  // Increments the death test count, returning the new count.
-  int increment_death_test_count() { return ++death_test_count_; }
-
-  // Clears the test part results.
-  void ClearTestPartResults();
-
-  // Clears the object.
-  void Clear();
-
-  // Protects mutable state of the property vector and of owned
-  // properties, whose values may be updated.
-  internal::Mutex test_properites_mutex_;
-
-  // The vector of TestPartResults
-  std::vector<TestPartResult> test_part_results_;
-  // The vector of TestProperties
-  std::vector<TestProperty> test_properties_;
-  // Running count of death tests.
-  int death_test_count_;
-  // The start time, in milliseconds since UNIX Epoch.
-  TimeInMillis start_timestamp_;
-  // The elapsed time, in milliseconds.
-  TimeInMillis elapsed_time_;
-
-  // We disallow copying TestResult.
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestResult);
-};  // class TestResult
-
-// A TestInfo object stores the following information about a test:
-//
-//   Test suite name
-//   Test name
-//   Whether the test should be run
-//   A function pointer that creates the test object when invoked
-//   Test result
-//
-// The constructor of TestInfo registers itself with the UnitTest
-// singleton such that the RUN_ALL_TESTS() macro knows which tests to
-// run.
-class GTEST_API_ TestInfo {
- public:
-  // Destructs a TestInfo object.  This function is not virtual, so
-  // don't inherit from TestInfo.
-  ~TestInfo();
-
-  // Returns the test suite name.
-  const char* test_suite_name() const { return test_suite_name_.c_str(); }
-
-// Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  const char* test_case_name() const { return test_suite_name(); }
-#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  // Returns the test name.
-  const char* name() const { return name_.c_str(); }
-
-  // Returns the name of the parameter type, or NULL if this is not a typed
-  // or a type-parameterized test.
-  const char* type_param() const {
-    if (type_param_.get() != nullptr) return type_param_->c_str();
-    return nullptr;
-  }
-
-  // Returns the text representation of the value parameter, or NULL if this
-  // is not a value-parameterized test.
-  const char* value_param() const {
-    if (value_param_.get() != nullptr) return value_param_->c_str();
-    return nullptr;
-  }
-
-  // Returns the file name where this test is defined.
-  const char* file() const { return location_.file.c_str(); }
-
-  // Returns the line where this test is defined.
-  int line() const { return location_.line; }
-
-  // Return true if this test should not be run because it's in another shard.
-  bool is_in_another_shard() const { return is_in_another_shard_; }
-
-  // Returns true if this test should run, that is if the test is not
-  // disabled (or it is disabled but the also_run_disabled_tests flag has
-  // been specified) and its full name matches the user-specified filter.
-  //
-  // Google Test allows the user to filter the tests by their full names.
-  // The full name of a test Bar in test suite Foo is defined as
-  // "Foo.Bar".  Only the tests that match the filter will run.
-  //
-  // A filter is a colon-separated list of glob (not regex) patterns,
-  // optionally followed by a '-' and a colon-separated list of
-  // negative patterns (tests to exclude).  A test is run if it
-  // matches one of the positive patterns and does not match any of
-  // the negative patterns.
-  //
-  // For example, *A*:Foo.* is a filter that matches any string that
-  // contains the character 'A' or starts with "Foo.".
-  bool should_run() const { return should_run_; }
-
-  // Returns true if and only if this test will appear in the XML report.
-  bool is_reportable() const {
-    // The XML report includes tests matching the filter, excluding those
-    // run in other shards.
-    return matches_filter_ && !is_in_another_shard_;
-  }
-
-  // Returns the result of the test.
-  const TestResult* result() const { return &result_; }
-
- private:
-#if GTEST_HAS_DEATH_TEST
-  friend class internal::DefaultDeathTestFactory;
-#endif  // GTEST_HAS_DEATH_TEST
-  friend class Test;
-  friend class TestSuite;
-  friend class internal::UnitTestImpl;
-  friend class internal::StreamingListenerTest;
-  friend TestInfo* internal::MakeAndRegisterTestInfo(
-      const char* test_suite_name, const char* name, const char* type_param,
-      const char* value_param, internal::CodeLocation code_location,
-      internal::TypeId fixture_class_id, internal::SetUpTestSuiteFunc set_up_tc,
-      internal::TearDownTestSuiteFunc tear_down_tc,
-      internal::TestFactoryBase* factory);
-
-  // Constructs a TestInfo object. The newly constructed instance assumes
-  // ownership of the factory object.
-  TestInfo(const std::string& test_suite_name, const std::string& name,
-           const char* a_type_param,   // NULL if not a type-parameterized test
-           const char* a_value_param,  // NULL if not a value-parameterized test
-           internal::CodeLocation a_code_location,
-           internal::TypeId fixture_class_id,
-           internal::TestFactoryBase* factory);
-
-  // Increments the number of death tests encountered in this test so
-  // far.
-  int increment_death_test_count() {
-    return result_.increment_death_test_count();
-  }
-
-  // Creates the test object, runs it, records its result, and then
-  // deletes it.
-  void Run();
-
-  static void ClearTestResult(TestInfo* test_info) {
-    test_info->result_.Clear();
-  }
-
-  // These fields are immutable properties of the test.
-  const std::string test_suite_name_;    // test suite name
-  const std::string name_;               // Test name
-  // Name of the parameter type, or NULL if this is not a typed or a
-  // type-parameterized test.
-  const std::unique_ptr<const ::std::string> type_param_;
-  // Text representation of the value parameter, or NULL if this is not a
-  // value-parameterized test.
-  const std::unique_ptr<const ::std::string> value_param_;
-  internal::CodeLocation location_;
-  const internal::TypeId fixture_class_id_;  // ID of the test fixture class
-  bool should_run_;           // True if and only if this test should run
-  bool is_disabled_;          // True if and only if this test is disabled
-  bool matches_filter_;       // True if this test matches the
-                              // user-specified filter.
-  bool is_in_another_shard_;  // Will be run in another shard.
-  internal::TestFactoryBase* const factory_;  // The factory that creates
-                                              // the test object
-
-  // This field is mutable and needs to be reset before running the
-  // test for the second time.
-  TestResult result_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestInfo);
-};
-
-// A test suite, which consists of a vector of TestInfos.
-//
-// TestSuite is not copyable.
-class GTEST_API_ TestSuite {
- public:
-  // Creates a TestSuite with the given name.
-  //
-  // TestSuite does NOT have a default constructor.  Always use this
-  // constructor to create a TestSuite object.
-  //
-  // Arguments:
-  //
-  //   name:         name of the test suite
-  //   a_type_param: the name of the test's type parameter, or NULL if
-  //                 this is not a type-parameterized test.
-  //   set_up_tc:    pointer to the function that sets up the test suite
-  //   tear_down_tc: pointer to the function that tears down the test suite
-  TestSuite(const char* name, const char* a_type_param,
-            internal::SetUpTestSuiteFunc set_up_tc,
-            internal::TearDownTestSuiteFunc tear_down_tc);
-
-  // Destructor of TestSuite.
-  virtual ~TestSuite();
-
-  // Gets the name of the TestSuite.
-  const char* name() const { return name_.c_str(); }
-
-  // Returns the name of the parameter type, or NULL if this is not a
-  // type-parameterized test suite.
-  const char* type_param() const {
-    if (type_param_.get() != nullptr) return type_param_->c_str();
-    return nullptr;
-  }
-
-  // Returns true if any test in this test suite should run.
-  bool should_run() const { return should_run_; }
-
-  // Gets the number of successful tests in this test suite.
-  int successful_test_count() const;
-
-  // Gets the number of skipped tests in this test suite.
-  int skipped_test_count() const;
-
-  // Gets the number of failed tests in this test suite.
-  int failed_test_count() const;
-
-  // Gets the number of disabled tests that will be reported in the XML report.
-  int reportable_disabled_test_count() const;
-
-  // Gets the number of disabled tests in this test suite.
-  int disabled_test_count() const;
-
-  // Gets the number of tests to be printed in the XML report.
-  int reportable_test_count() const;
-
-  // Get the number of tests in this test suite that should run.
-  int test_to_run_count() const;
-
-  // Gets the number of all tests in this test suite.
-  int total_test_count() const;
-
-  // Returns true if and only if the test suite passed.
-  bool Passed() const { return !Failed(); }
-
-  // Returns true if and only if the test suite failed.
-  bool Failed() const { return failed_test_count() > 0; }
-
-  // Returns the elapsed time, in milliseconds.
-  TimeInMillis elapsed_time() const { return elapsed_time_; }
-
-  // Gets the time of the test suite start, in ms from the start of the
-  // UNIX epoch.
-  TimeInMillis start_timestamp() const { return start_timestamp_; }
-
-  // Returns the i-th test among all the tests. i can range from 0 to
-  // total_test_count() - 1. If i is not in that range, returns NULL.
-  const TestInfo* GetTestInfo(int i) const;
-
-  // Returns the TestResult that holds test properties recorded during
-  // execution of SetUpTestSuite and TearDownTestSuite.
-  const TestResult& ad_hoc_test_result() const { return ad_hoc_test_result_; }
-
- private:
-  friend class Test;
-  friend class internal::UnitTestImpl;
-
-  // Gets the (mutable) vector of TestInfos in this TestSuite.
-  std::vector<TestInfo*>& test_info_list() { return test_info_list_; }
-
-  // Gets the (immutable) vector of TestInfos in this TestSuite.
-  const std::vector<TestInfo*>& test_info_list() const {
-    return test_info_list_;
-  }
-
-  // Returns the i-th test among all the tests. i can range from 0 to
-  // total_test_count() - 1. If i is not in that range, returns NULL.
-  TestInfo* GetMutableTestInfo(int i);
-
-  // Sets the should_run member.
-  void set_should_run(bool should) { should_run_ = should; }
-
-  // Adds a TestInfo to this test suite.  Will delete the TestInfo upon
-  // destruction of the TestSuite object.
-  void AddTestInfo(TestInfo * test_info);
-
-  // Clears the results of all tests in this test suite.
-  void ClearResult();
-
-  // Clears the results of all tests in the given test suite.
-  static void ClearTestSuiteResult(TestSuite* test_suite) {
-    test_suite->ClearResult();
-  }
-
-  // Runs every test in this TestSuite.
-  void Run();
-
-  // Runs SetUpTestSuite() for this TestSuite.  This wrapper is needed
-  // for catching exceptions thrown from SetUpTestSuite().
-  void RunSetUpTestSuite() {
-    if (set_up_tc_ != nullptr) {
-      (*set_up_tc_)();
-    }
-  }
-
-  // Runs TearDownTestSuite() for this TestSuite.  This wrapper is
-  // needed for catching exceptions thrown from TearDownTestSuite().
-  void RunTearDownTestSuite() {
-    if (tear_down_tc_ != nullptr) {
-      (*tear_down_tc_)();
-    }
-  }
-
-  // Returns true if and only if test passed.
-  static bool TestPassed(const TestInfo* test_info) {
-    return test_info->should_run() && test_info->result()->Passed();
-  }
-
-  // Returns true if and only if test skipped.
-  static bool TestSkipped(const TestInfo* test_info) {
-    return test_info->should_run() && test_info->result()->Skipped();
-  }
-
-  // Returns true if and only if test failed.
-  static bool TestFailed(const TestInfo* test_info) {
-    return test_info->should_run() && test_info->result()->Failed();
-  }
-
-  // Returns true if and only if the test is disabled and will be reported in
-  // the XML report.
-  static bool TestReportableDisabled(const TestInfo* test_info) {
-    return test_info->is_reportable() && test_info->is_disabled_;
-  }
-
-  // Returns true if and only if test is disabled.
-  static bool TestDisabled(const TestInfo* test_info) {
-    return test_info->is_disabled_;
-  }
-
-  // Returns true if and only if this test will appear in the XML report.
-  static bool TestReportable(const TestInfo* test_info) {
-    return test_info->is_reportable();
-  }
-
-  // Returns true if the given test should run.
-  static bool ShouldRunTest(const TestInfo* test_info) {
-    return test_info->should_run();
-  }
-
-  // Shuffles the tests in this test suite.
-  void ShuffleTests(internal::Random* random);
-
-  // Restores the test order to before the first shuffle.
-  void UnshuffleTests();
-
-  // Name of the test suite.
-  std::string name_;
-  // Name of the parameter type, or NULL if this is not a typed or a
-  // type-parameterized test.
-  const std::unique_ptr<const ::std::string> type_param_;
-  // The vector of TestInfos in their original order.  It owns the
-  // elements in the vector.
-  std::vector<TestInfo*> test_info_list_;
-  // Provides a level of indirection for the test list to allow easy
-  // shuffling and restoring the test order.  The i-th element in this
-  // vector is the index of the i-th test in the shuffled test list.
-  std::vector<int> test_indices_;
-  // Pointer to the function that sets up the test suite.
-  internal::SetUpTestSuiteFunc set_up_tc_;
-  // Pointer to the function that tears down the test suite.
-  internal::TearDownTestSuiteFunc tear_down_tc_;
-  // True if and only if any test in this test suite should run.
-  bool should_run_;
-  // The start time, in milliseconds since UNIX Epoch.
-  TimeInMillis start_timestamp_;
-  // Elapsed time, in milliseconds.
-  TimeInMillis elapsed_time_;
-  // Holds test properties recorded during execution of SetUpTestSuite and
-  // TearDownTestSuite.
-  TestResult ad_hoc_test_result_;
-
-  // We disallow copying TestSuites.
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestSuite);
-};
-
-// An Environment object is capable of setting up and tearing down an
-// environment.  You should subclass this to define your own
-// environment(s).
-//
-// An Environment object does the set-up and tear-down in virtual
-// methods SetUp() and TearDown() instead of the constructor and the
-// destructor, as:
-//
-//   1. You cannot safely throw from a destructor.  This is a problem
-//      as in some cases Google Test is used where exceptions are enabled, and
-//      we may want to implement ASSERT_* using exceptions where they are
-//      available.
-//   2. You cannot use ASSERT_* directly in a constructor or
-//      destructor.
-class Environment {
- public:
-  // The d'tor is virtual as we need to subclass Environment.
-  virtual ~Environment() {}
-
-  // Override this to define how to set up the environment.
-  virtual void SetUp() {}
-
-  // Override this to define how to tear down the environment.
-  virtual void TearDown() {}
- private:
-  // If you see an error about overriding the following function or
-  // about it being private, you have mis-spelled SetUp() as Setup().
-  struct Setup_should_be_spelled_SetUp {};
-  virtual Setup_should_be_spelled_SetUp* Setup() { return nullptr; }
-};
-
-#if GTEST_HAS_EXCEPTIONS
-
-// Exception which can be thrown from TestEventListener::OnTestPartResult.
-class GTEST_API_ AssertionException
-    : public internal::GoogleTestFailureException {
- public:
-  explicit AssertionException(const TestPartResult& result)
-      : GoogleTestFailureException(result) {}
-};
-
-#endif  // GTEST_HAS_EXCEPTIONS
-
-// The interface for tracing execution of tests. The methods are organized in
-// the order the corresponding events are fired.
-class TestEventListener {
- public:
-  virtual ~TestEventListener() {}
-
-  // Fired before any test activity starts.
-  virtual void OnTestProgramStart(const UnitTest& unit_test) = 0;
-
-  // Fired before each iteration of tests starts.  There may be more than
-  // one iteration if GTEST_FLAG(repeat) is set. iteration is the iteration
-  // index, starting from 0.
-  virtual void OnTestIterationStart(const UnitTest& unit_test,
-                                    int iteration) = 0;
-
-  // Fired before environment set-up for each iteration of tests starts.
-  virtual void OnEnvironmentsSetUpStart(const UnitTest& unit_test) = 0;
-
-  // Fired after environment set-up for each iteration of tests ends.
-  virtual void OnEnvironmentsSetUpEnd(const UnitTest& unit_test) = 0;
-
-  // Fired before the test suite starts.
-  virtual void OnTestSuiteStart(const TestSuite& /*test_suite*/) {}
-
-  //  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  virtual void OnTestCaseStart(const TestCase& /*test_case*/) {}
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  // Fired before the test starts.
-  virtual void OnTestStart(const TestInfo& test_info) = 0;
-
-  // Fired after a failed assertion or a SUCCEED() invocation.
-  // If you want to throw an exception from this function to skip to the next
-  // TEST, it must be AssertionException defined above, or inherited from it.
-  virtual void OnTestPartResult(const TestPartResult& test_part_result) = 0;
-
-  // Fired after the test ends.
-  virtual void OnTestEnd(const TestInfo& test_info) = 0;
-
-  // Fired after the test suite ends.
-  virtual void OnTestSuiteEnd(const TestSuite& /*test_suite*/) {}
-
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  virtual void OnTestCaseEnd(const TestCase& /*test_case*/) {}
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  // Fired before environment tear-down for each iteration of tests starts.
-  virtual void OnEnvironmentsTearDownStart(const UnitTest& unit_test) = 0;
-
-  // Fired after environment tear-down for each iteration of tests ends.
-  virtual void OnEnvironmentsTearDownEnd(const UnitTest& unit_test) = 0;
-
-  // Fired after each iteration of tests finishes.
-  virtual void OnTestIterationEnd(const UnitTest& unit_test,
-                                  int iteration) = 0;
-
-  // Fired after all test activities have ended.
-  virtual void OnTestProgramEnd(const UnitTest& unit_test) = 0;
-};
-
-// The convenience class for users who need to override just one or two
-// methods and are not concerned that a possible change to a signature of
-// the methods they override will not be caught during the build.  For
-// comments about each method please see the definition of TestEventListener
-// above.
-class EmptyTestEventListener : public TestEventListener {
- public:
-  void OnTestProgramStart(const UnitTest& /*unit_test*/) override {}
-  void OnTestIterationStart(const UnitTest& /*unit_test*/,
-                            int /*iteration*/) override {}
-  void OnEnvironmentsSetUpStart(const UnitTest& /*unit_test*/) override {}
-  void OnEnvironmentsSetUpEnd(const UnitTest& /*unit_test*/) override {}
-  void OnTestSuiteStart(const TestSuite& /*test_suite*/) override {}
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  void OnTestCaseStart(const TestCase& /*test_case*/) override {}
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  void OnTestStart(const TestInfo& /*test_info*/) override {}
-  void OnTestPartResult(const TestPartResult& /*test_part_result*/) override {}
-  void OnTestEnd(const TestInfo& /*test_info*/) override {}
-  void OnTestSuiteEnd(const TestSuite& /*test_suite*/) override {}
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  void OnTestCaseEnd(const TestCase& /*test_case*/) override {}
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  void OnEnvironmentsTearDownStart(const UnitTest& /*unit_test*/) override {}
-  void OnEnvironmentsTearDownEnd(const UnitTest& /*unit_test*/) override {}
-  void OnTestIterationEnd(const UnitTest& /*unit_test*/,
-                          int /*iteration*/) override {}
-  void OnTestProgramEnd(const UnitTest& /*unit_test*/) override {}
-};
-
-// TestEventListeners lets users add listeners to track events in Google Test.
-class GTEST_API_ TestEventListeners {
- public:
-  TestEventListeners();
-  ~TestEventListeners();
-
-  // Appends an event listener to the end of the list. Google Test assumes
-  // the ownership of the listener (i.e. it will delete the listener when
-  // the test program finishes).
-  void Append(TestEventListener* listener);
-
-  // Removes the given event listener from the list and returns it.  It then
-  // becomes the caller's responsibility to delete the listener. Returns
-  // NULL if the listener is not found in the list.
-  TestEventListener* Release(TestEventListener* listener);
-
-  // Returns the standard listener responsible for the default console
-  // output.  Can be removed from the listeners list to shut down default
-  // console output.  Note that removing this object from the listener list
-  // with Release transfers its ownership to the caller and makes this
-  // function return NULL the next time.
-  TestEventListener* default_result_printer() const {
-    return default_result_printer_;
-  }
-
-  // Returns the standard listener responsible for the default XML output
-  // controlled by the --gtest_output=xml flag.  Can be removed from the
-  // listeners list by users who want to shut down the default XML output
-  // controlled by this flag and substitute it with custom one.  Note that
-  // removing this object from the listener list with Release transfers its
-  // ownership to the caller and makes this function return NULL the next
-  // time.
-  TestEventListener* default_xml_generator() const {
-    return default_xml_generator_;
-  }
-
- private:
-  friend class TestSuite;
-  friend class TestInfo;
-  friend class internal::DefaultGlobalTestPartResultReporter;
-  friend class internal::NoExecDeathTest;
-  friend class internal::TestEventListenersAccessor;
-  friend class internal::UnitTestImpl;
-
-  // Returns repeater that broadcasts the TestEventListener events to all
-  // subscribers.
-  TestEventListener* repeater();
-
-  // Sets the default_result_printer attribute to the provided listener.
-  // The listener is also added to the listener list and previous
-  // default_result_printer is removed from it and deleted. The listener can
-  // also be NULL in which case it will not be added to the list. Does
-  // nothing if the previous and the current listener objects are the same.
-  void SetDefaultResultPrinter(TestEventListener* listener);
-
-  // Sets the default_xml_generator attribute to the provided listener.  The
-  // listener is also added to the listener list and previous
-  // default_xml_generator is removed from it and deleted. The listener can
-  // also be NULL in which case it will not be added to the list. Does
-  // nothing if the previous and the current listener objects are the same.
-  void SetDefaultXmlGenerator(TestEventListener* listener);
-
-  // Controls whether events will be forwarded by the repeater to the
-  // listeners in the list.
-  bool EventForwardingEnabled() const;
-  void SuppressEventForwarding();
-
-  // The actual list of listeners.
-  internal::TestEventRepeater* repeater_;
-  // Listener responsible for the standard result output.
-  TestEventListener* default_result_printer_;
-  // Listener responsible for the creation of the XML output file.
-  TestEventListener* default_xml_generator_;
-
-  // We disallow copying TestEventListeners.
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestEventListeners);
-};
-
-// A UnitTest consists of a vector of TestSuites.
-//
-// This is a singleton class.  The only instance of UnitTest is
-// created when UnitTest::GetInstance() is first called.  This
-// instance is never deleted.
-//
-// UnitTest is not copyable.
-//
-// This class is thread-safe as long as the methods are called
-// according to their specification.
-class GTEST_API_ UnitTest {
- public:
-  // Gets the singleton UnitTest object.  The first time this method
-  // is called, a UnitTest object is constructed and returned.
-  // Consecutive calls will return the same object.
-  static UnitTest* GetInstance();
-
-  // Runs all tests in this UnitTest object and prints the result.
-  // Returns 0 if successful, or 1 otherwise.
-  //
-  // This method can only be called from the main thread.
-  //
-  // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-  int Run() GTEST_MUST_USE_RESULT_;
-
-  // Returns the working directory when the first TEST() or TEST_F()
-  // was executed.  The UnitTest object owns the string.
-  const char* original_working_dir() const;
-
-  // Returns the TestSuite object for the test that's currently running,
-  // or NULL if no test is running.
-  const TestSuite* current_test_suite() const GTEST_LOCK_EXCLUDED_(mutex_);
-
-// Legacy API is still available but deprecated
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  const TestCase* current_test_case() const GTEST_LOCK_EXCLUDED_(mutex_);
-#endif
-
-  // Returns the TestInfo object for the test that's currently running,
-  // or NULL if no test is running.
-  const TestInfo* current_test_info() const
-      GTEST_LOCK_EXCLUDED_(mutex_);
-
-  // Returns the random seed used at the start of the current test run.
-  int random_seed() const;
-
-  // Returns the ParameterizedTestSuiteRegistry object used to keep track of
-  // value-parameterized tests and instantiate and register them.
-  //
-  // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-  internal::ParameterizedTestSuiteRegistry& parameterized_test_registry()
-      GTEST_LOCK_EXCLUDED_(mutex_);
-
-  // Gets the number of successful test suites.
-  int successful_test_suite_count() const;
-
-  // Gets the number of failed test suites.
-  int failed_test_suite_count() const;
-
-  // Gets the number of all test suites.
-  int total_test_suite_count() const;
-
-  // Gets the number of all test suites that contain at least one test
-  // that should run.
-  int test_suite_to_run_count() const;
-
-  //  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  int successful_test_case_count() const;
-  int failed_test_case_count() const;
-  int total_test_case_count() const;
-  int test_case_to_run_count() const;
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  // Gets the number of successful tests.
-  int successful_test_count() const;
-
-  // Gets the number of skipped tests.
-  int skipped_test_count() const;
-
-  // Gets the number of failed tests.
-  int failed_test_count() const;
-
-  // Gets the number of disabled tests that will be reported in the XML report.
-  int reportable_disabled_test_count() const;
-
-  // Gets the number of disabled tests.
-  int disabled_test_count() const;
-
-  // Gets the number of tests to be printed in the XML report.
-  int reportable_test_count() const;
-
-  // Gets the number of all tests.
-  int total_test_count() const;
-
-  // Gets the number of tests that should run.
-  int test_to_run_count() const;
-
-  // Gets the time of the test program start, in ms from the start of the
-  // UNIX epoch.
-  TimeInMillis start_timestamp() const;
-
-  // Gets the elapsed time, in milliseconds.
-  TimeInMillis elapsed_time() const;
-
-  // Returns true if and only if the unit test passed (i.e. all test suites
-  // passed).
-  bool Passed() const;
-
-  // Returns true if and only if the unit test failed (i.e. some test suite
-  // failed or something outside of all tests failed).
-  bool Failed() const;
-
-  // Gets the i-th test suite among all the test suites. i can range from 0 to
-  // total_test_suite_count() - 1. If i is not in that range, returns NULL.
-  const TestSuite* GetTestSuite(int i) const;
-
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  const TestCase* GetTestCase(int i) const;
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  // Returns the TestResult containing information on test failures and
-  // properties logged outside of individual test suites.
-  const TestResult& ad_hoc_test_result() const;
-
-  // Returns the list of event listeners that can be used to track events
-  // inside Google Test.
-  TestEventListeners& listeners();
-
- private:
-  // Registers and returns a global test environment.  When a test
-  // program is run, all global test environments will be set-up in
-  // the order they were registered.  After all tests in the program
-  // have finished, all global test environments will be torn-down in
-  // the *reverse* order they were registered.
-  //
-  // The UnitTest object takes ownership of the given environment.
-  //
-  // This method can only be called from the main thread.
-  Environment* AddEnvironment(Environment* env);
-
-  // Adds a TestPartResult to the current TestResult object.  All
-  // Google Test assertion macros (e.g. ASSERT_TRUE, EXPECT_EQ, etc)
-  // eventually call this to report their results.  The user code
-  // should use the assertion macros instead of calling this directly.
-  void AddTestPartResult(TestPartResult::Type result_type,
-                         const char* file_name,
-                         int line_number,
-                         const std::string& message,
-                         const std::string& os_stack_trace)
-      GTEST_LOCK_EXCLUDED_(mutex_);
-
-  // Adds a TestProperty to the current TestResult object when invoked from
-  // inside a test, to current TestSuite's ad_hoc_test_result_ when invoked
-  // from SetUpTestSuite or TearDownTestSuite, or to the global property set
-  // when invoked elsewhere.  If the result already contains a property with
-  // the same key, the value will be updated.
-  void RecordProperty(const std::string& key, const std::string& value);
-
-  // Gets the i-th test suite among all the test suites. i can range from 0 to
-  // total_test_suite_count() - 1. If i is not in that range, returns NULL.
-  TestSuite* GetMutableTestSuite(int i);
-
-  // Accessors for the implementation object.
-  internal::UnitTestImpl* impl() { return impl_; }
-  const internal::UnitTestImpl* impl() const { return impl_; }
-
-  // These classes and functions are friends as they need to access private
-  // members of UnitTest.
-  friend class ScopedTrace;
-  friend class Test;
-  friend class internal::AssertHelper;
-  friend class internal::StreamingListenerTest;
-  friend class internal::UnitTestRecordPropertyTestHelper;
-  friend Environment* AddGlobalTestEnvironment(Environment* env);
-  friend internal::UnitTestImpl* internal::GetUnitTestImpl();
-  friend void internal::ReportFailureInUnknownLocation(
-      TestPartResult::Type result_type,
-      const std::string& message);
-
-  // Creates an empty UnitTest.
-  UnitTest();
-
-  // D'tor
-  virtual ~UnitTest();
-
-  // Pushes a trace defined by SCOPED_TRACE() on to the per-thread
-  // Google Test trace stack.
-  void PushGTestTrace(const internal::TraceInfo& trace)
-      GTEST_LOCK_EXCLUDED_(mutex_);
-
-  // Pops a trace from the per-thread Google Test trace stack.
-  void PopGTestTrace()
-      GTEST_LOCK_EXCLUDED_(mutex_);
-
-  // Protects mutable state in *impl_.  This is mutable as some const
-  // methods need to lock it too.
-  mutable internal::Mutex mutex_;
-
-  // Opaque implementation object.  This field is never changed once
-  // the object is constructed.  We don't mark it as const here, as
-  // doing so will cause a warning in the constructor of UnitTest.
-  // Mutable state in *impl_ is protected by mutex_.
-  internal::UnitTestImpl* impl_;
-
-  // We disallow copying UnitTest.
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(UnitTest);
-};
-
-// A convenient wrapper for adding an environment for the test
-// program.
-//
-// You should call this before RUN_ALL_TESTS() is called, probably in
-// main().  If you use gtest_main, you need to call this before main()
-// starts for it to take effect.  For example, you can define a global
-// variable like this:
-//
-//   testing::Environment* const foo_env =
-//       testing::AddGlobalTestEnvironment(new FooEnvironment);
-//
-// However, we strongly recommend you to write your own main() and
-// call AddGlobalTestEnvironment() there, as relying on initialization
-// of global variables makes the code harder to read and may cause
-// problems when you register multiple environments from different
-// translation units and the environments have dependencies among them
-// (remember that the compiler doesn't guarantee the order in which
-// global variables from different translation units are initialized).
-inline Environment* AddGlobalTestEnvironment(Environment* env) {
-  return UnitTest::GetInstance()->AddEnvironment(env);
-}
-
-// Initializes Google Test.  This must be called before calling
-// RUN_ALL_TESTS().  In particular, it parses a command line for the
-// flags that Google Test recognizes.  Whenever a Google Test flag is
-// seen, it is removed from argv, and *argc is decremented.
-//
-// No value is returned.  Instead, the Google Test flag variables are
-// updated.
-//
-// Calling the function for the second time has no user-visible effect.
-GTEST_API_ void InitGoogleTest(int* argc, char** argv);
-
-// This overloaded version can be used in Windows programs compiled in
-// UNICODE mode.
-GTEST_API_ void InitGoogleTest(int* argc, wchar_t** argv);
-
-// This overloaded version can be used on Arduino/embedded platforms where
-// there is no argc/argv.
-GTEST_API_ void InitGoogleTest();
-
-namespace internal {
-
-// Separate the error generating code from the code path to reduce the stack
-// frame size of CmpHelperEQ. This helps reduce the overhead of some sanitizers
-// when calling EXPECT_* in a tight loop.
-template <typename T1, typename T2>
-AssertionResult CmpHelperEQFailure(const char* lhs_expression,
-                                   const char* rhs_expression,
-                                   const T1& lhs, const T2& rhs) {
-  return EqFailure(lhs_expression,
-                   rhs_expression,
-                   FormatForComparisonFailureMessage(lhs, rhs),
-                   FormatForComparisonFailureMessage(rhs, lhs),
-                   false);
-}
-
-// This block of code defines operator==/!=
-// to block lexical scope lookup.
-// It prevents using invalid operator==/!= defined at namespace scope.
-struct faketype {};
-inline bool operator==(faketype, faketype) { return true; }
-inline bool operator!=(faketype, faketype) { return false; }
-
-// The helper function for {ASSERT|EXPECT}_EQ.
-template <typename T1, typename T2>
-AssertionResult CmpHelperEQ(const char* lhs_expression,
-                            const char* rhs_expression,
-                            const T1& lhs,
-                            const T2& rhs) {
-  if (lhs == rhs) {
-    return AssertionSuccess();
-  }
-
-  return CmpHelperEQFailure(lhs_expression, rhs_expression, lhs, rhs);
-}
-
-// With this overloaded version, we allow anonymous enums to be used
-// in {ASSERT|EXPECT}_EQ when compiled with gcc 4, as anonymous enums
-// can be implicitly cast to BiggestInt.
-GTEST_API_ AssertionResult CmpHelperEQ(const char* lhs_expression,
-                                       const char* rhs_expression,
-                                       BiggestInt lhs,
-                                       BiggestInt rhs);
-
-class EqHelper {
- public:
-  // This templatized version is for the general case.
-  template <
-      typename T1, typename T2,
-      // Disable this overload for cases where one argument is a pointer
-      // and the other is the null pointer constant.
-      typename std::enable_if<!std::is_integral<T1>::value ||
-                              !std::is_pointer<T2>::value>::type* = nullptr>
-  static AssertionResult Compare(const char* lhs_expression,
-                                 const char* rhs_expression, const T1& lhs,
-                                 const T2& rhs) {
-    return CmpHelperEQ(lhs_expression, rhs_expression, lhs, rhs);
-  }
-
-  // With this overloaded version, we allow anonymous enums to be used
-  // in {ASSERT|EXPECT}_EQ when compiled with gcc 4, as anonymous
-  // enums can be implicitly cast to BiggestInt.
-  //
-  // Even though its body looks the same as the above version, we
-  // cannot merge the two, as it will make anonymous enums unhappy.
-  static AssertionResult Compare(const char* lhs_expression,
-                                 const char* rhs_expression,
-                                 BiggestInt lhs,
-                                 BiggestInt rhs) {
-    return CmpHelperEQ(lhs_expression, rhs_expression, lhs, rhs);
-  }
-
-  template <typename T>
-  static AssertionResult Compare(
-      const char* lhs_expression, const char* rhs_expression,
-      // Handle cases where '0' is used as a null pointer literal.
-      std::nullptr_t /* lhs */, T* rhs) {
-    // We already know that 'lhs' is a null pointer.
-    return CmpHelperEQ(lhs_expression, rhs_expression, static_cast<T*>(nullptr),
-                       rhs);
-  }
-};
-
-// Separate the error generating code from the code path to reduce the stack
-// frame size of CmpHelperOP. This helps reduce the overhead of some sanitizers
-// when calling EXPECT_OP in a tight loop.
-template <typename T1, typename T2>
-AssertionResult CmpHelperOpFailure(const char* expr1, const char* expr2,
-                                   const T1& val1, const T2& val2,
-                                   const char* op) {
-  return AssertionFailure()
-         << "Expected: (" << expr1 << ") " << op << " (" << expr2
-         << "), actual: " << FormatForComparisonFailureMessage(val1, val2)
-         << " vs " << FormatForComparisonFailureMessage(val2, val1);
-}
-
-// A macro for implementing the helper functions needed to implement
-// ASSERT_?? and EXPECT_??.  It is here just to avoid copy-and-paste
-// of similar code.
-//
-// For each templatized helper function, we also define an overloaded
-// version for BiggestInt in order to reduce code bloat and allow
-// anonymous enums to be used with {ASSERT|EXPECT}_?? when compiled
-// with gcc 4.
-//
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-
-#define GTEST_IMPL_CMP_HELPER_(op_name, op)\
-template <typename T1, typename T2>\
-AssertionResult CmpHelper##op_name(const char* expr1, const char* expr2, \
-                                   const T1& val1, const T2& val2) {\
-  if (val1 op val2) {\
-    return AssertionSuccess();\
-  } else {\
-    return CmpHelperOpFailure(expr1, expr2, val1, val2, #op);\
-  }\
-}\
-GTEST_API_ AssertionResult CmpHelper##op_name(\
-    const char* expr1, const char* expr2, BiggestInt val1, BiggestInt val2)
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-
-// Implements the helper function for {ASSERT|EXPECT}_NE
-GTEST_IMPL_CMP_HELPER_(NE, !=);
-// Implements the helper function for {ASSERT|EXPECT}_LE
-GTEST_IMPL_CMP_HELPER_(LE, <=);
-// Implements the helper function for {ASSERT|EXPECT}_LT
-GTEST_IMPL_CMP_HELPER_(LT, <);
-// Implements the helper function for {ASSERT|EXPECT}_GE
-GTEST_IMPL_CMP_HELPER_(GE, >=);
-// Implements the helper function for {ASSERT|EXPECT}_GT
-GTEST_IMPL_CMP_HELPER_(GT, >);
-
-#undef GTEST_IMPL_CMP_HELPER_
-
-// The helper function for {ASSERT|EXPECT}_STREQ.
-//
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-GTEST_API_ AssertionResult CmpHelperSTREQ(const char* s1_expression,
-                                          const char* s2_expression,
-                                          const char* s1,
-                                          const char* s2);
-
-// The helper function for {ASSERT|EXPECT}_STRCASEEQ.
-//
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-GTEST_API_ AssertionResult CmpHelperSTRCASEEQ(const char* s1_expression,
-                                              const char* s2_expression,
-                                              const char* s1,
-                                              const char* s2);
-
-// The helper function for {ASSERT|EXPECT}_STRNE.
-//
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-GTEST_API_ AssertionResult CmpHelperSTRNE(const char* s1_expression,
-                                          const char* s2_expression,
-                                          const char* s1,
-                                          const char* s2);
-
-// The helper function for {ASSERT|EXPECT}_STRCASENE.
-//
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-GTEST_API_ AssertionResult CmpHelperSTRCASENE(const char* s1_expression,
-                                              const char* s2_expression,
-                                              const char* s1,
-                                              const char* s2);
-
-
-// Helper function for *_STREQ on wide strings.
-//
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-GTEST_API_ AssertionResult CmpHelperSTREQ(const char* s1_expression,
-                                          const char* s2_expression,
-                                          const wchar_t* s1,
-                                          const wchar_t* s2);
-
-// Helper function for *_STRNE on wide strings.
-//
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-GTEST_API_ AssertionResult CmpHelperSTRNE(const char* s1_expression,
-                                          const char* s2_expression,
-                                          const wchar_t* s1,
-                                          const wchar_t* s2);
-
-}  // namespace internal
-
-// IsSubstring() and IsNotSubstring() are intended to be used as the
-// first argument to {EXPECT,ASSERT}_PRED_FORMAT2(), not by
-// themselves.  They check whether needle is a substring of haystack
-// (NULL is considered a substring of itself only), and return an
-// appropriate error message when they fail.
-//
-// The {needle,haystack}_expr arguments are the stringified
-// expressions that generated the two real arguments.
-GTEST_API_ AssertionResult IsSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const char* needle, const char* haystack);
-GTEST_API_ AssertionResult IsSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const wchar_t* needle, const wchar_t* haystack);
-GTEST_API_ AssertionResult IsNotSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const char* needle, const char* haystack);
-GTEST_API_ AssertionResult IsNotSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const wchar_t* needle, const wchar_t* haystack);
-GTEST_API_ AssertionResult IsSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const ::std::string& needle, const ::std::string& haystack);
-GTEST_API_ AssertionResult IsNotSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const ::std::string& needle, const ::std::string& haystack);
-
-#if GTEST_HAS_STD_WSTRING
-GTEST_API_ AssertionResult IsSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const ::std::wstring& needle, const ::std::wstring& haystack);
-GTEST_API_ AssertionResult IsNotSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const ::std::wstring& needle, const ::std::wstring& haystack);
-#endif  // GTEST_HAS_STD_WSTRING
-
-namespace internal {
-
-// Helper template function for comparing floating-points.
-//
-// Template parameter:
-//
-//   RawType: the raw floating-point type (either float or double)
-//
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-template <typename RawType>
-AssertionResult CmpHelperFloatingPointEQ(const char* lhs_expression,
-                                         const char* rhs_expression,
-                                         RawType lhs_value,
-                                         RawType rhs_value) {
-  const FloatingPoint<RawType> lhs(lhs_value), rhs(rhs_value);
-
-  if (lhs.AlmostEquals(rhs)) {
-    return AssertionSuccess();
-  }
-
-  ::std::stringstream lhs_ss;
-  lhs_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
-         << lhs_value;
-
-  ::std::stringstream rhs_ss;
-  rhs_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
-         << rhs_value;
-
-  return EqFailure(lhs_expression,
-                   rhs_expression,
-                   StringStreamToString(&lhs_ss),
-                   StringStreamToString(&rhs_ss),
-                   false);
-}
-
-// Helper function for implementing ASSERT_NEAR.
-//
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-GTEST_API_ AssertionResult DoubleNearPredFormat(const char* expr1,
-                                                const char* expr2,
-                                                const char* abs_error_expr,
-                                                double val1,
-                                                double val2,
-                                                double abs_error);
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-// A class that enables one to stream messages to assertion macros
-class GTEST_API_ AssertHelper {
- public:
-  // Constructor.
-  AssertHelper(TestPartResult::Type type,
-               const char* file,
-               int line,
-               const char* message);
-  ~AssertHelper();
-
-  // Message assignment is a semantic trick to enable assertion
-  // streaming; see the GTEST_MESSAGE_ macro below.
-  void operator=(const Message& message) const;
-
- private:
-  // We put our data in a struct so that the size of the AssertHelper class can
-  // be as small as possible.  This is important because gcc is incapable of
-  // re-using stack space even for temporary variables, so every EXPECT_EQ
-  // reserves stack space for another AssertHelper.
-  struct AssertHelperData {
-    AssertHelperData(TestPartResult::Type t,
-                     const char* srcfile,
-                     int line_num,
-                     const char* msg)
-        : type(t), file(srcfile), line(line_num), message(msg) { }
-
-    TestPartResult::Type const type;
-    const char* const file;
-    int const line;
-    std::string const message;
-
-   private:
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(AssertHelperData);
-  };
-
-  AssertHelperData* const data_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(AssertHelper);
-};
-
-enum GTestColor { COLOR_DEFAULT, COLOR_RED, COLOR_GREEN, COLOR_YELLOW };
-
-GTEST_API_ GTEST_ATTRIBUTE_PRINTF_(2, 3) void ColoredPrintf(GTestColor color,
-                                                            const char* fmt,
-                                                            ...);
-
-}  // namespace internal
-
-// The pure interface class that all value-parameterized tests inherit from.
-// A value-parameterized class must inherit from both ::testing::Test and
-// ::testing::WithParamInterface. In most cases that just means inheriting
-// from ::testing::TestWithParam, but more complicated test hierarchies
-// may need to inherit from Test and WithParamInterface at different levels.
-//
-// This interface has support for accessing the test parameter value via
-// the GetParam() method.
-//
-// Use it with one of the parameter generator defining functions, like Range(),
-// Values(), ValuesIn(), Bool(), and Combine().
-//
-// class FooTest : public ::testing::TestWithParam<int> {
-//  protected:
-//   FooTest() {
-//     // Can use GetParam() here.
-//   }
-//   ~FooTest() override {
-//     // Can use GetParam() here.
-//   }
-//   void SetUp() override {
-//     // Can use GetParam() here.
-//   }
-//   void TearDown override {
-//     // Can use GetParam() here.
-//   }
-// };
-// TEST_P(FooTest, DoesBar) {
-//   // Can use GetParam() method here.
-//   Foo foo;
-//   ASSERT_TRUE(foo.DoesBar(GetParam()));
-// }
-// INSTANTIATE_TEST_SUITE_P(OneToTenRange, FooTest, ::testing::Range(1, 10));
-
-template <typename T>
-class WithParamInterface {
- public:
-  typedef T ParamType;
-  virtual ~WithParamInterface() {}
-
-  // The current parameter value. Is also available in the test fixture's
-  // constructor.
-  static const ParamType& GetParam() {
-    GTEST_CHECK_(parameter_ != nullptr)
-        << "GetParam() can only be called inside a value-parameterized test "
-        << "-- did you intend to write TEST_P instead of TEST_F?";
-    return *parameter_;
-  }
-
- private:
-  // Sets parameter value. The caller is responsible for making sure the value
-  // remains alive and unchanged throughout the current test.
-  static void SetParam(const ParamType* parameter) {
-    parameter_ = parameter;
-  }
-
-  // Static value used for accessing parameter during a test lifetime.
-  static const ParamType* parameter_;
-
-  // TestClass must be a subclass of WithParamInterface<T> and Test.
-  template <class TestClass> friend class internal::ParameterizedTestFactory;
-};
-
-template <typename T>
-const T* WithParamInterface<T>::parameter_ = nullptr;
-
-// Most value-parameterized classes can ignore the existence of
-// WithParamInterface, and can just inherit from ::testing::TestWithParam.
-
-template <typename T>
-class TestWithParam : public Test, public WithParamInterface<T> {
-};
-
-// Macros for indicating success/failure in test code.
-
-// Skips test in runtime.
-// Skipping test aborts current function.
-// Skipped tests are neither successful nor failed.
-#define GTEST_SKIP() GTEST_SKIP_("Skipped")
-
-// ADD_FAILURE unconditionally adds a failure to the current test.
-// SUCCEED generates a success - it doesn't automatically make the
-// current test successful, as a test is only successful when it has
-// no failure.
-//
-// EXPECT_* verifies that a certain condition is satisfied.  If not,
-// it behaves like ADD_FAILURE.  In particular:
-//
-//   EXPECT_TRUE  verifies that a Boolean condition is true.
-//   EXPECT_FALSE verifies that a Boolean condition is false.
-//
-// FAIL and ASSERT_* are similar to ADD_FAILURE and EXPECT_*, except
-// that they will also abort the current function on failure.  People
-// usually want the fail-fast behavior of FAIL and ASSERT_*, but those
-// writing data-driven tests often find themselves using ADD_FAILURE
-// and EXPECT_* more.
-
-// Generates a nonfatal failure with a generic message.
-#define ADD_FAILURE() GTEST_NONFATAL_FAILURE_("Failed")
-
-// Generates a nonfatal failure at the given source file location with
-// a generic message.
-#define ADD_FAILURE_AT(file, line) \
-  GTEST_MESSAGE_AT_(file, line, "Failed", \
-                    ::testing::TestPartResult::kNonFatalFailure)
-
-// Generates a fatal failure with a generic message.
-#define GTEST_FAIL() GTEST_FATAL_FAILURE_("Failed")
-
-// Like GTEST_FAIL(), but at the given source file location.
-#define GTEST_FAIL_AT(file, line)         \
-  GTEST_MESSAGE_AT_(file, line, "Failed", \
-                    ::testing::TestPartResult::kFatalFailure)
-
-// Define this macro to 1 to omit the definition of FAIL(), which is a
-// generic name and clashes with some other libraries.
-#if !GTEST_DONT_DEFINE_FAIL
-# define FAIL() GTEST_FAIL()
-#endif
-
-// Generates a success with a generic message.
-#define GTEST_SUCCEED() GTEST_SUCCESS_("Succeeded")
-
-// Define this macro to 1 to omit the definition of SUCCEED(), which
-// is a generic name and clashes with some other libraries.
-#if !GTEST_DONT_DEFINE_SUCCEED
-# define SUCCEED() GTEST_SUCCEED()
-#endif
-
-// Macros for testing exceptions.
-//
-//    * {ASSERT|EXPECT}_THROW(statement, expected_exception):
-//         Tests that the statement throws the expected exception.
-//    * {ASSERT|EXPECT}_NO_THROW(statement):
-//         Tests that the statement doesn't throw any exception.
-//    * {ASSERT|EXPECT}_ANY_THROW(statement):
-//         Tests that the statement throws an exception.
-
-#define EXPECT_THROW(statement, expected_exception) \
-  GTEST_TEST_THROW_(statement, expected_exception, GTEST_NONFATAL_FAILURE_)
-#define EXPECT_NO_THROW(statement) \
-  GTEST_TEST_NO_THROW_(statement, GTEST_NONFATAL_FAILURE_)
-#define EXPECT_ANY_THROW(statement) \
-  GTEST_TEST_ANY_THROW_(statement, GTEST_NONFATAL_FAILURE_)
-#define ASSERT_THROW(statement, expected_exception) \
-  GTEST_TEST_THROW_(statement, expected_exception, GTEST_FATAL_FAILURE_)
-#define ASSERT_NO_THROW(statement) \
-  GTEST_TEST_NO_THROW_(statement, GTEST_FATAL_FAILURE_)
-#define ASSERT_ANY_THROW(statement) \
-  GTEST_TEST_ANY_THROW_(statement, GTEST_FATAL_FAILURE_)
-
-// Boolean assertions. Condition can be either a Boolean expression or an
-// AssertionResult. For more information on how to use AssertionResult with
-// these macros see comments on that class.
-#define EXPECT_TRUE(condition) \
-  GTEST_TEST_BOOLEAN_(condition, #condition, false, true, \
-                      GTEST_NONFATAL_FAILURE_)
-#define EXPECT_FALSE(condition) \
-  GTEST_TEST_BOOLEAN_(!(condition), #condition, true, false, \
-                      GTEST_NONFATAL_FAILURE_)
-#define ASSERT_TRUE(condition) \
-  GTEST_TEST_BOOLEAN_(condition, #condition, false, true, \
-                      GTEST_FATAL_FAILURE_)
-#define ASSERT_FALSE(condition) \
-  GTEST_TEST_BOOLEAN_(!(condition), #condition, true, false, \
-                      GTEST_FATAL_FAILURE_)
-
-// Macros for testing equalities and inequalities.
-//
-//    * {ASSERT|EXPECT}_EQ(v1, v2): Tests that v1 == v2
-//    * {ASSERT|EXPECT}_NE(v1, v2): Tests that v1 != v2
-//    * {ASSERT|EXPECT}_LT(v1, v2): Tests that v1 < v2
-//    * {ASSERT|EXPECT}_LE(v1, v2): Tests that v1 <= v2
-//    * {ASSERT|EXPECT}_GT(v1, v2): Tests that v1 > v2
-//    * {ASSERT|EXPECT}_GE(v1, v2): Tests that v1 >= v2
-//
-// When they are not, Google Test prints both the tested expressions and
-// their actual values.  The values must be compatible built-in types,
-// or you will get a compiler error.  By "compatible" we mean that the
-// values can be compared by the respective operator.
-//
-// Note:
-//
-//   1. It is possible to make a user-defined type work with
-//   {ASSERT|EXPECT}_??(), but that requires overloading the
-//   comparison operators and is thus discouraged by the Google C++
-//   Usage Guide.  Therefore, you are advised to use the
-//   {ASSERT|EXPECT}_TRUE() macro to assert that two objects are
-//   equal.
-//
-//   2. The {ASSERT|EXPECT}_??() macros do pointer comparisons on
-//   pointers (in particular, C strings).  Therefore, if you use it
-//   with two C strings, you are testing how their locations in memory
-//   are related, not how their content is related.  To compare two C
-//   strings by content, use {ASSERT|EXPECT}_STR*().
-//
-//   3. {ASSERT|EXPECT}_EQ(v1, v2) is preferred to
-//   {ASSERT|EXPECT}_TRUE(v1 == v2), as the former tells you
-//   what the actual value is when it fails, and similarly for the
-//   other comparisons.
-//
-//   4. Do not depend on the order in which {ASSERT|EXPECT}_??()
-//   evaluate their arguments, which is undefined.
-//
-//   5. These macros evaluate their arguments exactly once.
-//
-// Examples:
-//
-//   EXPECT_NE(Foo(), 5);
-//   EXPECT_EQ(a_pointer, NULL);
-//   ASSERT_LT(i, array_size);
-//   ASSERT_GT(records.size(), 0) << "There is no record left.";
-
-#define EXPECT_EQ(val1, val2) \
-  EXPECT_PRED_FORMAT2(::testing::internal::EqHelper::Compare, val1, val2)
-#define EXPECT_NE(val1, val2) \
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperNE, val1, val2)
-#define EXPECT_LE(val1, val2) \
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperLE, val1, val2)
-#define EXPECT_LT(val1, val2) \
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperLT, val1, val2)
-#define EXPECT_GE(val1, val2) \
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperGE, val1, val2)
-#define EXPECT_GT(val1, val2) \
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperGT, val1, val2)
-
-#define GTEST_ASSERT_EQ(val1, val2) \
-  ASSERT_PRED_FORMAT2(::testing::internal::EqHelper::Compare, val1, val2)
-#define GTEST_ASSERT_NE(val1, val2) \
-  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperNE, val1, val2)
-#define GTEST_ASSERT_LE(val1, val2) \
-  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperLE, val1, val2)
-#define GTEST_ASSERT_LT(val1, val2) \
-  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperLT, val1, val2)
-#define GTEST_ASSERT_GE(val1, val2) \
-  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperGE, val1, val2)
-#define GTEST_ASSERT_GT(val1, val2) \
-  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperGT, val1, val2)
-
-// Define macro GTEST_DONT_DEFINE_ASSERT_XY to 1 to omit the definition of
-// ASSERT_XY(), which clashes with some users' own code.
-
-#if !GTEST_DONT_DEFINE_ASSERT_EQ
-# define ASSERT_EQ(val1, val2) GTEST_ASSERT_EQ(val1, val2)
-#endif
-
-#if !GTEST_DONT_DEFINE_ASSERT_NE
-# define ASSERT_NE(val1, val2) GTEST_ASSERT_NE(val1, val2)
-#endif
-
-#if !GTEST_DONT_DEFINE_ASSERT_LE
-# define ASSERT_LE(val1, val2) GTEST_ASSERT_LE(val1, val2)
-#endif
-
-#if !GTEST_DONT_DEFINE_ASSERT_LT
-# define ASSERT_LT(val1, val2) GTEST_ASSERT_LT(val1, val2)
-#endif
-
-#if !GTEST_DONT_DEFINE_ASSERT_GE
-# define ASSERT_GE(val1, val2) GTEST_ASSERT_GE(val1, val2)
-#endif
-
-#if !GTEST_DONT_DEFINE_ASSERT_GT
-# define ASSERT_GT(val1, val2) GTEST_ASSERT_GT(val1, val2)
-#endif
-
-// C-string Comparisons.  All tests treat NULL and any non-NULL string
-// as different.  Two NULLs are equal.
-//
-//    * {ASSERT|EXPECT}_STREQ(s1, s2):     Tests that s1 == s2
-//    * {ASSERT|EXPECT}_STRNE(s1, s2):     Tests that s1 != s2
-//    * {ASSERT|EXPECT}_STRCASEEQ(s1, s2): Tests that s1 == s2, ignoring case
-//    * {ASSERT|EXPECT}_STRCASENE(s1, s2): Tests that s1 != s2, ignoring case
-//
-// For wide or narrow string objects, you can use the
-// {ASSERT|EXPECT}_??() macros.
-//
-// Don't depend on the order in which the arguments are evaluated,
-// which is undefined.
-//
-// These macros evaluate their arguments exactly once.
-
-#define EXPECT_STREQ(s1, s2) \
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTREQ, s1, s2)
-#define EXPECT_STRNE(s1, s2) \
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTRNE, s1, s2)
-#define EXPECT_STRCASEEQ(s1, s2) \
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASEEQ, s1, s2)
-#define EXPECT_STRCASENE(s1, s2)\
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASENE, s1, s2)
-
-#define ASSERT_STREQ(s1, s2) \
-  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTREQ, s1, s2)
-#define ASSERT_STRNE(s1, s2) \
-  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTRNE, s1, s2)
-#define ASSERT_STRCASEEQ(s1, s2) \
-  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASEEQ, s1, s2)
-#define ASSERT_STRCASENE(s1, s2)\
-  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASENE, s1, s2)
-
-// Macros for comparing floating-point numbers.
-//
-//    * {ASSERT|EXPECT}_FLOAT_EQ(val1, val2):
-//         Tests that two float values are almost equal.
-//    * {ASSERT|EXPECT}_DOUBLE_EQ(val1, val2):
-//         Tests that two double values are almost equal.
-//    * {ASSERT|EXPECT}_NEAR(v1, v2, abs_error):
-//         Tests that v1 and v2 are within the given distance to each other.
-//
-// Google Test uses ULP-based comparison to automatically pick a default
-// error bound that is appropriate for the operands.  See the
-// FloatingPoint template class in gtest-internal.h if you are
-// interested in the implementation details.
-
-#define EXPECT_FLOAT_EQ(val1, val2)\
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<float>, \
-                      val1, val2)
-
-#define EXPECT_DOUBLE_EQ(val1, val2)\
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<double>, \
-                      val1, val2)
-
-#define ASSERT_FLOAT_EQ(val1, val2)\
-  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<float>, \
-                      val1, val2)
-
-#define ASSERT_DOUBLE_EQ(val1, val2)\
-  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<double>, \
-                      val1, val2)
-
-#define EXPECT_NEAR(val1, val2, abs_error)\
-  EXPECT_PRED_FORMAT3(::testing::internal::DoubleNearPredFormat, \
-                      val1, val2, abs_error)
-
-#define ASSERT_NEAR(val1, val2, abs_error)\
-  ASSERT_PRED_FORMAT3(::testing::internal::DoubleNearPredFormat, \
-                      val1, val2, abs_error)
-
-// These predicate format functions work on floating-point values, and
-// can be used in {ASSERT|EXPECT}_PRED_FORMAT2*(), e.g.
-//
-//   EXPECT_PRED_FORMAT2(testing::DoubleLE, Foo(), 5.0);
-
-// Asserts that val1 is less than, or almost equal to, val2.  Fails
-// otherwise.  In particular, it fails if either val1 or val2 is NaN.
-GTEST_API_ AssertionResult FloatLE(const char* expr1, const char* expr2,
-                                   float val1, float val2);
-GTEST_API_ AssertionResult DoubleLE(const char* expr1, const char* expr2,
-                                    double val1, double val2);
-
-
-#if GTEST_OS_WINDOWS
-
-// Macros that test for HRESULT failure and success, these are only useful
-// on Windows, and rely on Windows SDK macros and APIs to compile.
-//
-//    * {ASSERT|EXPECT}_HRESULT_{SUCCEEDED|FAILED}(expr)
-//
-// When expr unexpectedly fails or succeeds, Google Test prints the
-// expected result and the actual result with both a human-readable
-// string representation of the error, if available, as well as the
-// hex result code.
-# define EXPECT_HRESULT_SUCCEEDED(expr) \
-    EXPECT_PRED_FORMAT1(::testing::internal::IsHRESULTSuccess, (expr))
-
-# define ASSERT_HRESULT_SUCCEEDED(expr) \
-    ASSERT_PRED_FORMAT1(::testing::internal::IsHRESULTSuccess, (expr))
-
-# define EXPECT_HRESULT_FAILED(expr) \
-    EXPECT_PRED_FORMAT1(::testing::internal::IsHRESULTFailure, (expr))
-
-# define ASSERT_HRESULT_FAILED(expr) \
-    ASSERT_PRED_FORMAT1(::testing::internal::IsHRESULTFailure, (expr))
-
-#endif  // GTEST_OS_WINDOWS
-
-// Macros that execute statement and check that it doesn't generate new fatal
-// failures in the current thread.
-//
-//   * {ASSERT|EXPECT}_NO_FATAL_FAILURE(statement);
-//
-// Examples:
-//
-//   EXPECT_NO_FATAL_FAILURE(Process());
-//   ASSERT_NO_FATAL_FAILURE(Process()) << "Process() failed";
-//
-#define ASSERT_NO_FATAL_FAILURE(statement) \
-    GTEST_TEST_NO_FATAL_FAILURE_(statement, GTEST_FATAL_FAILURE_)
-#define EXPECT_NO_FATAL_FAILURE(statement) \
-    GTEST_TEST_NO_FATAL_FAILURE_(statement, GTEST_NONFATAL_FAILURE_)
-
-// Causes a trace (including the given source file path and line number,
-// and the given message) to be included in every test failure message generated
-// by code in the scope of the lifetime of an instance of this class. The effect
-// is undone with the destruction of the instance.
-//
-// The message argument can be anything streamable to std::ostream.
-//
-// Example:
-//   testing::ScopedTrace trace("file.cc", 123, "message");
-//
-class GTEST_API_ ScopedTrace {
- public:
-  // The c'tor pushes the given source file location and message onto
-  // a trace stack maintained by Google Test.
-
-  // Template version. Uses Message() to convert the values into strings.
-  // Slow, but flexible.
-  template <typename T>
-  ScopedTrace(const char* file, int line, const T& message) {
-    PushTrace(file, line, (Message() << message).GetString());
-  }
-
-  // Optimize for some known types.
-  ScopedTrace(const char* file, int line, const char* message) {
-    PushTrace(file, line, message ? message : "(null)");
-  }
-
-  ScopedTrace(const char* file, int line, const std::string& message) {
-    PushTrace(file, line, message);
-  }
-
-  // The d'tor pops the info pushed by the c'tor.
-  //
-  // Note that the d'tor is not virtual in order to be efficient.
-  // Don't inherit from ScopedTrace!
-  ~ScopedTrace();
-
- private:
-  void PushTrace(const char* file, int line, std::string message);
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedTrace);
-} GTEST_ATTRIBUTE_UNUSED_;  // A ScopedTrace object does its job in its
-                            // c'tor and d'tor.  Therefore it doesn't
-                            // need to be used otherwise.
-
-// Causes a trace (including the source file path, the current line
-// number, and the given message) to be included in every test failure
-// message generated by code in the current scope.  The effect is
-// undone when the control leaves the current scope.
-//
-// The message argument can be anything streamable to std::ostream.
-//
-// In the implementation, we include the current line number as part
-// of the dummy variable name, thus allowing multiple SCOPED_TRACE()s
-// to appear in the same block - as long as they are on different
-// lines.
-//
-// Assuming that each thread maintains its own stack of traces.
-// Therefore, a SCOPED_TRACE() would (correctly) only affect the
-// assertions in its own thread.
-#define SCOPED_TRACE(message) \
-  ::testing::ScopedTrace GTEST_CONCAT_TOKEN_(gtest_trace_, __LINE__)(\
-    __FILE__, __LINE__, (message))
-
-// Compile-time assertion for type equality.
-// StaticAssertTypeEq<type1, type2>() compiles if and only if type1 and type2
-// are the same type.  The value it returns is not interesting.
-//
-// Instead of making StaticAssertTypeEq a class template, we make it a
-// function template that invokes a helper class template.  This
-// prevents a user from misusing StaticAssertTypeEq<T1, T2> by
-// defining objects of that type.
-//
-// CAVEAT:
-//
-// When used inside a method of a class template,
-// StaticAssertTypeEq<T1, T2>() is effective ONLY IF the method is
-// instantiated.  For example, given:
-//
-//   template <typename T> class Foo {
-//    public:
-//     void Bar() { testing::StaticAssertTypeEq<int, T>(); }
-//   };
-//
-// the code:
-//
-//   void Test1() { Foo<bool> foo; }
-//
-// will NOT generate a compiler error, as Foo<bool>::Bar() is never
-// actually instantiated.  Instead, you need:
-//
-//   void Test2() { Foo<bool> foo; foo.Bar(); }
-//
-// to cause a compiler error.
-template <typename T1, typename T2>
-constexpr bool StaticAssertTypeEq() noexcept {
-  static_assert(std::is_same<T1, T2>::value,
-                "type1 and type2 are not the same type");
-  return true;
-}
-
-// Defines a test.
-//
-// The first parameter is the name of the test suite, and the second
-// parameter is the name of the test within the test suite.
-//
-// The convention is to end the test suite name with "Test".  For
-// example, a test suite for the Foo class can be named FooTest.
-//
-// Test code should appear between braces after an invocation of
-// this macro.  Example:
-//
-//   TEST(FooTest, InitializesCorrectly) {
-//     Foo foo;
-//     EXPECT_TRUE(foo.StatusIsOK());
-//   }
-
-// Note that we call GetTestTypeId() instead of GetTypeId<
-// ::testing::Test>() here to get the type ID of testing::Test.  This
-// is to work around a suspected linker bug when using Google Test as
-// a framework on Mac OS X.  The bug causes GetTypeId<
-// ::testing::Test>() to return different values depending on whether
-// the call is from the Google Test framework itself or from user test
-// code.  GetTestTypeId() is guaranteed to always return the same
-// value, as it always calls GetTypeId<>() from the Google Test
-// framework.
-#define GTEST_TEST(test_suite_name, test_name)             \
-  GTEST_TEST_(test_suite_name, test_name, ::testing::Test, \
-              ::testing::internal::GetTestTypeId())
-
-// Define this macro to 1 to omit the definition of TEST(), which
-// is a generic name and clashes with some other libraries.
-#if !GTEST_DONT_DEFINE_TEST
-#define TEST(test_suite_name, test_name) GTEST_TEST(test_suite_name, test_name)
-#endif
-
-// Defines a test that uses a test fixture.
-//
-// The first parameter is the name of the test fixture class, which
-// also doubles as the test suite name.  The second parameter is the
-// name of the test within the test suite.
-//
-// A test fixture class must be declared earlier.  The user should put
-// the test code between braces after using this macro.  Example:
-//
-//   class FooTest : public testing::Test {
-//    protected:
-//     void SetUp() override { b_.AddElement(3); }
-//
-//     Foo a_;
-//     Foo b_;
-//   };
-//
-//   TEST_F(FooTest, InitializesCorrectly) {
-//     EXPECT_TRUE(a_.StatusIsOK());
-//   }
-//
-//   TEST_F(FooTest, ReturnsElementCountCorrectly) {
-//     EXPECT_EQ(a_.size(), 0);
-//     EXPECT_EQ(b_.size(), 1);
-//   }
-//
-// GOOGLETEST_CM0011 DO NOT DELETE
-#define TEST_F(test_fixture, test_name)\
-  GTEST_TEST_(test_fixture, test_name, test_fixture, \
-              ::testing::internal::GetTypeId<test_fixture>())
-
-// Returns a path to temporary directory.
-// Tries to determine an appropriate directory for the platform.
-GTEST_API_ std::string TempDir();
-
-#ifdef _MSC_VER
-#  pragma warning(pop)
-#endif
-
-// Dynamically registers a test with the framework.
-//
-// This is an advanced API only to be used when the `TEST` macros are
-// insufficient. The macros should be preferred when possible, as they avoid
-// most of the complexity of calling this function.
-//
-// The `factory` argument is a factory callable (move-constructible) object or
-// function pointer that creates a new instance of the Test object. It
-// handles ownership to the caller. The signature of the callable is
-// `Fixture*()`, where `Fixture` is the test fixture class for the test. All
-// tests registered with the same `test_suite_name` must return the same
-// fixture type. This is checked at runtime.
-//
-// The framework will infer the fixture class from the factory and will call
-// the `SetUpTestSuite` and `TearDownTestSuite` for it.
-//
-// Must be called before `RUN_ALL_TESTS()` is invoked, otherwise behavior is
-// undefined.
-//
-// Use case example:
-//
-// class MyFixture : public ::testing::Test {
-//  public:
-//   // All of these optional, just like in regular macro usage.
-//   static void SetUpTestSuite() { ... }
-//   static void TearDownTestSuite() { ... }
-//   void SetUp() override { ... }
-//   void TearDown() override { ... }
-// };
-//
-// class MyTest : public MyFixture {
-//  public:
-//   explicit MyTest(int data) : data_(data) {}
-//   void TestBody() override { ... }
-//
-//  private:
-//   int data_;
-// };
-//
-// void RegisterMyTests(const std::vector<int>& values) {
-//   for (int v : values) {
-//     ::testing::RegisterTest(
-//         "MyFixture", ("Test" + std::to_string(v)).c_str(), nullptr,
-//         std::to_string(v).c_str(),
-//         __FILE__, __LINE__,
-//         // Important to use the fixture type as the return type here.
-//         [=]() -> MyFixture* { return new MyTest(v); });
-//   }
-// }
-// ...
-// int main(int argc, char** argv) {
-//   std::vector<int> values_to_test = LoadValuesFromConfig();
-//   RegisterMyTests(values_to_test);
-//   ...
-//   return RUN_ALL_TESTS();
-// }
-//
-template <int&... ExplicitParameterBarrier, typename Factory>
-TestInfo* RegisterTest(const char* test_suite_name, const char* test_name,
-                       const char* type_param, const char* value_param,
-                       const char* file, int line, Factory factory) {
-  using TestT = typename std::remove_pointer<decltype(factory())>::type;
-
-  class FactoryImpl : public internal::TestFactoryBase {
-   public:
-    explicit FactoryImpl(Factory f) : factory_(std::move(f)) {}
-    Test* CreateTest() override { return factory_(); }
-
-   private:
-    Factory factory_;
-  };
-
-  return internal::MakeAndRegisterTestInfo(
-      test_suite_name, test_name, type_param, value_param,
-      internal::CodeLocation(file, line), internal::GetTypeId<TestT>(),
-      internal::SuiteApiResolver<TestT>::GetSetUpCaseOrSuite(file, line),
-      internal::SuiteApiResolver<TestT>::GetTearDownCaseOrSuite(file, line),
-      new FactoryImpl{std::move(factory)});
-}
-
-}  // namespace testing
-
-// Use this function in main() to run all tests.  It returns 0 if all
-// tests are successful, or 1 otherwise.
-//
-// RUN_ALL_TESTS() should be invoked after the command line has been
-// parsed by InitGoogleTest().
-//
-// This function was formerly a macro; thus, it is in the global
-// namespace and has an all-caps name.
-int RUN_ALL_TESTS() GTEST_MUST_USE_RESULT_;
-
-inline int RUN_ALL_TESTS() {
-  return ::testing::UnitTest::GetInstance()->Run();
-}
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
-
-#endif  // GTEST_INCLUDE_GTEST_GTEST_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest_pred_impl.h b/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest_pred_impl.h
deleted file mode 100644
index d514255c733..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest_pred_impl.h
+++ /dev/null
@@ -1,359 +0,0 @@
-// Copyright 2006, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// This file is AUTOMATICALLY GENERATED on 01/02/2019 by command
-// 'gen_gtest_pred_impl.py 5'.  DO NOT EDIT BY HAND!
-//
-// Implements a family of generic predicate assertion macros.
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
-#define GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
-
-#include "gtest/gtest.h"
-
-namespace testing {
-
-// This header implements a family of generic predicate assertion
-// macros:
-//
-//   ASSERT_PRED_FORMAT1(pred_format, v1)
-//   ASSERT_PRED_FORMAT2(pred_format, v1, v2)
-//   ...
-//
-// where pred_format is a function or functor that takes n (in the
-// case of ASSERT_PRED_FORMATn) values and their source expression
-// text, and returns a testing::AssertionResult.  See the definition
-// of ASSERT_EQ in gtest.h for an example.
-//
-// If you don't care about formatting, you can use the more
-// restrictive version:
-//
-//   ASSERT_PRED1(pred, v1)
-//   ASSERT_PRED2(pred, v1, v2)
-//   ...
-//
-// where pred is an n-ary function or functor that returns bool,
-// and the values v1, v2, ..., must support the << operator for
-// streaming to std::ostream.
-//
-// We also define the EXPECT_* variations.
-//
-// For now we only support predicates whose arity is at most 5.
-// Please email googletestframework@googlegroups.com if you need
-// support for higher arities.
-
-// GTEST_ASSERT_ is the basic statement to which all of the assertions
-// in this file reduce.  Don't use this in your code.
-
-#define GTEST_ASSERT_(expression, on_failure) \
-  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
-  if (const ::testing::AssertionResult gtest_ar = (expression)) \
-    ; \
-  else \
-    on_failure(gtest_ar.failure_message())
-
-
-// Helper function for implementing {EXPECT|ASSERT}_PRED1.  Don't use
-// this in your code.
-template <typename Pred,
-          typename T1>
-AssertionResult AssertPred1Helper(const char* pred_text,
-                                  const char* e1,
-                                  Pred pred,
-                                  const T1& v1) {
-  if (pred(v1)) return AssertionSuccess();
-
-  return AssertionFailure()
-         << pred_text << "(" << e1 << ") evaluates to false, where"
-         << "\n"
-         << e1 << " evaluates to " << ::testing::PrintToString(v1);
-}
-
-// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT1.
-// Don't use this in your code.
-#define GTEST_PRED_FORMAT1_(pred_format, v1, on_failure)\
-  GTEST_ASSERT_(pred_format(#v1, v1), \
-                on_failure)
-
-// Internal macro for implementing {EXPECT|ASSERT}_PRED1.  Don't use
-// this in your code.
-#define GTEST_PRED1_(pred, v1, on_failure)\
-  GTEST_ASSERT_(::testing::AssertPred1Helper(#pred, \
-                                             #v1, \
-                                             pred, \
-                                             v1), on_failure)
-
-// Unary predicate assertion macros.
-#define EXPECT_PRED_FORMAT1(pred_format, v1) \
-  GTEST_PRED_FORMAT1_(pred_format, v1, GTEST_NONFATAL_FAILURE_)
-#define EXPECT_PRED1(pred, v1) \
-  GTEST_PRED1_(pred, v1, GTEST_NONFATAL_FAILURE_)
-#define ASSERT_PRED_FORMAT1(pred_format, v1) \
-  GTEST_PRED_FORMAT1_(pred_format, v1, GTEST_FATAL_FAILURE_)
-#define ASSERT_PRED1(pred, v1) \
-  GTEST_PRED1_(pred, v1, GTEST_FATAL_FAILURE_)
-
-
-
-// Helper function for implementing {EXPECT|ASSERT}_PRED2.  Don't use
-// this in your code.
-template <typename Pred,
-          typename T1,
-          typename T2>
-AssertionResult AssertPred2Helper(const char* pred_text,
-                                  const char* e1,
-                                  const char* e2,
-                                  Pred pred,
-                                  const T1& v1,
-                                  const T2& v2) {
-  if (pred(v1, v2)) return AssertionSuccess();
-
-  return AssertionFailure()
-         << pred_text << "(" << e1 << ", " << e2
-         << ") evaluates to false, where"
-         << "\n"
-         << e1 << " evaluates to " << ::testing::PrintToString(v1) << "\n"
-         << e2 << " evaluates to " << ::testing::PrintToString(v2);
-}
-
-// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT2.
-// Don't use this in your code.
-#define GTEST_PRED_FORMAT2_(pred_format, v1, v2, on_failure)\
-  GTEST_ASSERT_(pred_format(#v1, #v2, v1, v2), \
-                on_failure)
-
-// Internal macro for implementing {EXPECT|ASSERT}_PRED2.  Don't use
-// this in your code.
-#define GTEST_PRED2_(pred, v1, v2, on_failure)\
-  GTEST_ASSERT_(::testing::AssertPred2Helper(#pred, \
-                                             #v1, \
-                                             #v2, \
-                                             pred, \
-                                             v1, \
-                                             v2), on_failure)
-
-// Binary predicate assertion macros.
-#define EXPECT_PRED_FORMAT2(pred_format, v1, v2) \
-  GTEST_PRED_FORMAT2_(pred_format, v1, v2, GTEST_NONFATAL_FAILURE_)
-#define EXPECT_PRED2(pred, v1, v2) \
-  GTEST_PRED2_(pred, v1, v2, GTEST_NONFATAL_FAILURE_)
-#define ASSERT_PRED_FORMAT2(pred_format, v1, v2) \
-  GTEST_PRED_FORMAT2_(pred_format, v1, v2, GTEST_FATAL_FAILURE_)
-#define ASSERT_PRED2(pred, v1, v2) \
-  GTEST_PRED2_(pred, v1, v2, GTEST_FATAL_FAILURE_)
-
-
-
-// Helper function for implementing {EXPECT|ASSERT}_PRED3.  Don't use
-// this in your code.
-template <typename Pred,
-          typename T1,
-          typename T2,
-          typename T3>
-AssertionResult AssertPred3Helper(const char* pred_text,
-                                  const char* e1,
-                                  const char* e2,
-                                  const char* e3,
-                                  Pred pred,
-                                  const T1& v1,
-                                  const T2& v2,
-                                  const T3& v3) {
-  if (pred(v1, v2, v3)) return AssertionSuccess();
-
-  return AssertionFailure()
-         << pred_text << "(" << e1 << ", " << e2 << ", " << e3
-         << ") evaluates to false, where"
-         << "\n"
-         << e1 << " evaluates to " << ::testing::PrintToString(v1) << "\n"
-         << e2 << " evaluates to " << ::testing::PrintToString(v2) << "\n"
-         << e3 << " evaluates to " << ::testing::PrintToString(v3);
-}
-
-// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT3.
-// Don't use this in your code.
-#define GTEST_PRED_FORMAT3_(pred_format, v1, v2, v3, on_failure)\
-  GTEST_ASSERT_(pred_format(#v1, #v2, #v3, v1, v2, v3), \
-                on_failure)
-
-// Internal macro for implementing {EXPECT|ASSERT}_PRED3.  Don't use
-// this in your code.
-#define GTEST_PRED3_(pred, v1, v2, v3, on_failure)\
-  GTEST_ASSERT_(::testing::AssertPred3Helper(#pred, \
-                                             #v1, \
-                                             #v2, \
-                                             #v3, \
-                                             pred, \
-                                             v1, \
-                                             v2, \
-                                             v3), on_failure)
-
-// Ternary predicate assertion macros.
-#define EXPECT_PRED_FORMAT3(pred_format, v1, v2, v3) \
-  GTEST_PRED_FORMAT3_(pred_format, v1, v2, v3, GTEST_NONFATAL_FAILURE_)
-#define EXPECT_PRED3(pred, v1, v2, v3) \
-  GTEST_PRED3_(pred, v1, v2, v3, GTEST_NONFATAL_FAILURE_)
-#define ASSERT_PRED_FORMAT3(pred_format, v1, v2, v3) \
-  GTEST_PRED_FORMAT3_(pred_format, v1, v2, v3, GTEST_FATAL_FAILURE_)
-#define ASSERT_PRED3(pred, v1, v2, v3) \
-  GTEST_PRED3_(pred, v1, v2, v3, GTEST_FATAL_FAILURE_)
-
-
-
-// Helper function for implementing {EXPECT|ASSERT}_PRED4.  Don't use
-// this in your code.
-template <typename Pred,
-          typename T1,
-          typename T2,
-          typename T3,
-          typename T4>
-AssertionResult AssertPred4Helper(const char* pred_text,
-                                  const char* e1,
-                                  const char* e2,
-                                  const char* e3,
-                                  const char* e4,
-                                  Pred pred,
-                                  const T1& v1,
-                                  const T2& v2,
-                                  const T3& v3,
-                                  const T4& v4) {
-  if (pred(v1, v2, v3, v4)) return AssertionSuccess();
-
-  return AssertionFailure()
-         << pred_text << "(" << e1 << ", " << e2 << ", " << e3 << ", " << e4
-         << ") evaluates to false, where"
-         << "\n"
-         << e1 << " evaluates to " << ::testing::PrintToString(v1) << "\n"
-         << e2 << " evaluates to " << ::testing::PrintToString(v2) << "\n"
-         << e3 << " evaluates to " << ::testing::PrintToString(v3) << "\n"
-         << e4 << " evaluates to " << ::testing::PrintToString(v4);
-}
-
-// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT4.
-// Don't use this in your code.
-#define GTEST_PRED_FORMAT4_(pred_format, v1, v2, v3, v4, on_failure)\
-  GTEST_ASSERT_(pred_format(#v1, #v2, #v3, #v4, v1, v2, v3, v4), \
-                on_failure)
-
-// Internal macro for implementing {EXPECT|ASSERT}_PRED4.  Don't use
-// this in your code.
-#define GTEST_PRED4_(pred, v1, v2, v3, v4, on_failure)\
-  GTEST_ASSERT_(::testing::AssertPred4Helper(#pred, \
-                                             #v1, \
-                                             #v2, \
-                                             #v3, \
-                                             #v4, \
-                                             pred, \
-                                             v1, \
-                                             v2, \
-                                             v3, \
-                                             v4), on_failure)
-
-// 4-ary predicate assertion macros.
-#define EXPECT_PRED_FORMAT4(pred_format, v1, v2, v3, v4) \
-  GTEST_PRED_FORMAT4_(pred_format, v1, v2, v3, v4, GTEST_NONFATAL_FAILURE_)
-#define EXPECT_PRED4(pred, v1, v2, v3, v4) \
-  GTEST_PRED4_(pred, v1, v2, v3, v4, GTEST_NONFATAL_FAILURE_)
-#define ASSERT_PRED_FORMAT4(pred_format, v1, v2, v3, v4) \
-  GTEST_PRED_FORMAT4_(pred_format, v1, v2, v3, v4, GTEST_FATAL_FAILURE_)
-#define ASSERT_PRED4(pred, v1, v2, v3, v4) \
-  GTEST_PRED4_(pred, v1, v2, v3, v4, GTEST_FATAL_FAILURE_)
-
-
-
-// Helper function for implementing {EXPECT|ASSERT}_PRED5.  Don't use
-// this in your code.
-template <typename Pred,
-          typename T1,
-          typename T2,
-          typename T3,
-          typename T4,
-          typename T5>
-AssertionResult AssertPred5Helper(const char* pred_text,
-                                  const char* e1,
-                                  const char* e2,
-                                  const char* e3,
-                                  const char* e4,
-                                  const char* e5,
-                                  Pred pred,
-                                  const T1& v1,
-                                  const T2& v2,
-                                  const T3& v3,
-                                  const T4& v4,
-                                  const T5& v5) {
-  if (pred(v1, v2, v3, v4, v5)) return AssertionSuccess();
-
-  return AssertionFailure()
-         << pred_text << "(" << e1 << ", " << e2 << ", " << e3 << ", " << e4
-         << ", " << e5 << ") evaluates to false, where"
-         << "\n"
-         << e1 << " evaluates to " << ::testing::PrintToString(v1) << "\n"
-         << e2 << " evaluates to " << ::testing::PrintToString(v2) << "\n"
-         << e3 << " evaluates to " << ::testing::PrintToString(v3) << "\n"
-         << e4 << " evaluates to " << ::testing::PrintToString(v4) << "\n"
-         << e5 << " evaluates to " << ::testing::PrintToString(v5);
-}
-
-// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT5.
-// Don't use this in your code.
-#define GTEST_PRED_FORMAT5_(pred_format, v1, v2, v3, v4, v5, on_failure)\
-  GTEST_ASSERT_(pred_format(#v1, #v2, #v3, #v4, #v5, v1, v2, v3, v4, v5), \
-                on_failure)
-
-// Internal macro for implementing {EXPECT|ASSERT}_PRED5.  Don't use
-// this in your code.
-#define GTEST_PRED5_(pred, v1, v2, v3, v4, v5, on_failure)\
-  GTEST_ASSERT_(::testing::AssertPred5Helper(#pred, \
-                                             #v1, \
-                                             #v2, \
-                                             #v3, \
-                                             #v4, \
-                                             #v5, \
-                                             pred, \
-                                             v1, \
-                                             v2, \
-                                             v3, \
-                                             v4, \
-                                             v5), on_failure)
-
-// 5-ary predicate assertion macros.
-#define EXPECT_PRED_FORMAT5(pred_format, v1, v2, v3, v4, v5) \
-  GTEST_PRED_FORMAT5_(pred_format, v1, v2, v3, v4, v5, GTEST_NONFATAL_FAILURE_)
-#define EXPECT_PRED5(pred, v1, v2, v3, v4, v5) \
-  GTEST_PRED5_(pred, v1, v2, v3, v4, v5, GTEST_NONFATAL_FAILURE_)
-#define ASSERT_PRED_FORMAT5(pred_format, v1, v2, v3, v4, v5) \
-  GTEST_PRED_FORMAT5_(pred_format, v1, v2, v3, v4, v5, GTEST_FATAL_FAILURE_)
-#define ASSERT_PRED5(pred, v1, v2, v3, v4, v5) \
-  GTEST_PRED5_(pred, v1, v2, v3, v4, v5, GTEST_FATAL_FAILURE_)
-
-
-
-}  // namespace testing
-
-#endif  // GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest_prod.h b/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest_prod.h
deleted file mode 100644
index e651671ebde..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/gtest_prod.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2006, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-//
-// Google C++ Testing and Mocking Framework definitions useful in production code.
-// GOOGLETEST_CM0003 DO NOT DELETE
-
-#ifndef GTEST_INCLUDE_GTEST_GTEST_PROD_H_
-#define GTEST_INCLUDE_GTEST_GTEST_PROD_H_
-
-// When you need to test the private or protected members of a class,
-// use the FRIEND_TEST macro to declare your tests as friends of the
-// class.  For example:
-//
-// class MyClass {
-//  private:
-//   void PrivateMethod();
-//   FRIEND_TEST(MyClassTest, PrivateMethodWorks);
-// };
-//
-// class MyClassTest : public testing::Test {
-//   // ...
-// };
-//
-// TEST_F(MyClassTest, PrivateMethodWorks) {
-//   // Can call MyClass::PrivateMethod() here.
-// }
-//
-// Note: The test class must be in the same namespace as the class being tested.
-// For example, putting MyClassTest in an anonymous namespace will not work.
-
-#define FRIEND_TEST(test_case_name, test_name)\
-friend class test_case_name##_##test_name##_Test
-
-#endif  // GTEST_INCLUDE_GTEST_GTEST_PROD_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/custom/gtest-port.h b/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/custom/gtest-port.h
deleted file mode 100644
index cd85d956d2d..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/custom/gtest-port.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2015, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Injection point for custom user configurations. See README for details
-//
-// ** Custom implementation starts here **
-
-#ifndef GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_
-#define GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_
-
-#endif  // GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/custom/gtest-printers.h b/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/custom/gtest-printers.h
deleted file mode 100644
index b7320920061..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/custom/gtest-printers.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2015, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// This file provides an injection point for custom printers in a local
-// installation of gTest.
-// It will be included from gtest-printers.h and the overrides in this file
-// will be visible to everyone.
-//
-// Injection point for custom user configurations. See README for details
-//
-// ** Custom implementation starts here **
-
-#ifndef GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PRINTERS_H_
-#define GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PRINTERS_H_
-
-#if !GTEST_NO_LLVM_SUPPORT
-#include "llvm/ADT/SmallString.h"
-#include "llvm/ADT/StringRef.h"
-#include <ostream>
-// Printing of llvm String types.
-// gtest sees these as containers of char (they have nested iterator types),
-// so their operator<< is never considered unless we provide PrintTo().
-// PrintStringTo provides quotes and escaping, at the cost of a copy.
-namespace llvm {
-inline void PrintTo(llvm::StringRef S, std::ostream *OS) {
-  *OS << ::testing::PrintToString(S.str());
-}
-// We need both SmallString<N> and SmallVectorImpl<char> overloads:
-//  - the SmallString<N> template is needed as overload resolution will
-//    instantiate generic PrintTo<T> rather than do derived-to-base conversion
-//  - but SmallVectorImpl<char> is sometimes the actual static type, in code
-//    that erases the small size
-template <unsigned N>
-inline void PrintTo(const SmallString<N> &S, std::ostream *OS) {
-  *OS << ::testing::PrintToString(std::string(S.data(), S.size()));
-}
-inline void PrintTo(const SmallVectorImpl<char> &S, std::ostream *OS) {
-  *OS << ::testing::PrintToString(std::string(S.data(), S.size()));
-}
-} // namespace llvm
-#endif // !GTEST_NO_LLVM_SUPPORT
-
-#endif  // GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PRINTERS_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/custom/gtest.h b/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/custom/gtest.h
deleted file mode 100644
index 4c8e07be23f..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/custom/gtest.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2015, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Injection point for custom user configurations. See README for details
-//
-// ** Custom implementation starts here **
-
-#ifndef GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_H_
-#define GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_H_
-
-#endif  // GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/custom/raw-ostream.h b/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/custom/raw-ostream.h
deleted file mode 100644
index cff78f5c33f..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/custom/raw-ostream.h
+++ /dev/null
@@ -1,85 +0,0 @@
-//===-- raw-ostream.h - Support for printing using raw_ostream --*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-// This file is not part of gtest, but extends it to support LLVM libraries.
-// This is not a public API for testing - it's a detail of LLVM's gtest.
-//
-// gtest allows providing printers for custom types by defining operator<<.
-// In LLVM, operator<< usually takes llvm:raw_ostream& instead of std::ostream&.
-//
-// This file defines a template printable(V), which returns a version of V that
-// can be streamed into a std::ostream.
-//
-// This interface is chosen so that in the default case (printable(V) is V),
-// the main gtest code calls operator<<(OS, V) itself. gtest-printers carefully
-// controls the lookup to enable fallback printing (see testing::internal2).
-//===----------------------------------------------------------------------===//
-
-#ifndef GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_RAW_OSTREAM_H_
-#define GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_RAW_OSTREAM_H_
-
-namespace llvm_gtest {
-// StreamSwitch is a trait that tells us how to stream a T into a std::ostream.
-// By default, we just stream the T directly. We'll specialize this later.
-template <typename T, typename Enable = void> struct StreamSwitch {
-  static const T& printable(const T& V) { return V; }
-};
-
-// printable() returns a version of its argument that can be streamed into a
-// std::ostream. This may be the argument itself, or some other representation.
-template <typename T> decltype(auto) printable(const T &V) {
-  // We delegate to the trait, to allow partial specialization.
-  return StreamSwitch<T>::printable(V);
-}
-} // namespace llvm_gtest
-
-// If raw_ostream support is enabled, we specialize for types with operator<<
-// that takes a raw_ostream.
-#if !GTEST_NO_LLVM_SUPPORT
-#include "llvm/ADT/Optional.h"
-#include "llvm/Support/raw_os_ostream.h"
-#include "llvm/Support/raw_ostream.h"
-#include <ostream>
-namespace llvm_gtest {
-
-// The printable() of a raw_ostream-enabled type T is a RawStreamProxy<T>.
-// It uses raw_os_ostream to write the wrapped value to a std::ostream.
-template <typename T>
-struct RawStreamProxy {
-  const T& V;
-  friend std::ostream &operator<<(std::ostream &S, const RawStreamProxy<T> &V) {
-    llvm::raw_os_ostream OS(S);
-    OS << V.V;
-    return S;
-  }
-};
-
-// We enable raw_ostream treatment if `(raw_ostream&) << (const T&)` is valid.
-// We don't want implicit conversions on the RHS (e.g. to bool!), so "consume"
-// the possible conversion by passing something convertible to const T& instead.
-template <typename T> struct ConvertibleTo { operator T(); };
-template <typename T>
-struct StreamSwitch<T, decltype((void)(std::declval<llvm::raw_ostream &>()
-                                       << ConvertibleTo<const T &>()))> {
-  static const RawStreamProxy<T> printable(const T &V) { return {V}; }
-};
-
-// llvm::Optional has a template operator<<, which means it will not accept any
-// implicit conversions, so we need to special-case it here.
-template <typename T>
-struct StreamSwitch<llvm::Optional<T>,
-                    decltype((void)(std::declval<llvm::raw_ostream &>()
-                                    << std::declval<llvm::Optional<T>>()))> {
-  static const RawStreamProxy<llvm::Optional<T>>
-  printable(const llvm::Optional<T> &V) {
-    return {V};
-  }
-};
-} // namespace llvm_gtest
-#endif  // !GTEST_NO_LLVM_SUPPORT
-
-#endif // GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_RAW_OSTREAM_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-death-test-internal.h b/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-death-test-internal.h
deleted file mode 100644
index 12bb05011f9..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-death-test-internal.h
+++ /dev/null
@@ -1,302 +0,0 @@
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// The Google C++ Testing and Mocking Framework (Google Test)
-//
-// This header file defines internal utilities needed for implementing
-// death tests.  They are subject to change without notice.
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_
-#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_
-
-#include "gtest/gtest-matchers.h"
-#include "gtest/internal/gtest-internal.h"
-
-#include <stdio.h>
-#include <memory>
-
-namespace testing {
-namespace internal {
-
-GTEST_DECLARE_string_(internal_run_death_test);
-
-// Names of the flags (needed for parsing Google Test flags).
-const char kDeathTestStyleFlag[] = "death_test_style";
-const char kDeathTestUseFork[] = "death_test_use_fork";
-const char kInternalRunDeathTestFlag[] = "internal_run_death_test";
-
-#if GTEST_HAS_DEATH_TEST
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
-/* class A needs to have dll-interface to be used by clients of class B */)
-
-// DeathTest is a class that hides much of the complexity of the
-// GTEST_DEATH_TEST_ macro.  It is abstract; its static Create method
-// returns a concrete class that depends on the prevailing death test
-// style, as defined by the --gtest_death_test_style and/or
-// --gtest_internal_run_death_test flags.
-
-// In describing the results of death tests, these terms are used with
-// the corresponding definitions:
-//
-// exit status:  The integer exit information in the format specified
-//               by wait(2)
-// exit code:    The integer code passed to exit(3), _exit(2), or
-//               returned from main()
-class GTEST_API_ DeathTest {
- public:
-  // Create returns false if there was an error determining the
-  // appropriate action to take for the current death test; for example,
-  // if the gtest_death_test_style flag is set to an invalid value.
-  // The LastMessage method will return a more detailed message in that
-  // case.  Otherwise, the DeathTest pointer pointed to by the "test"
-  // argument is set.  If the death test should be skipped, the pointer
-  // is set to NULL; otherwise, it is set to the address of a new concrete
-  // DeathTest object that controls the execution of the current test.
-  static bool Create(const char* statement, Matcher<const std::string&> matcher,
-                     const char* file, int line, DeathTest** test);
-  DeathTest();
-  virtual ~DeathTest() { }
-
-  // A helper class that aborts a death test when it's deleted.
-  class ReturnSentinel {
-   public:
-    explicit ReturnSentinel(DeathTest* test) : test_(test) { }
-    ~ReturnSentinel() { test_->Abort(TEST_ENCOUNTERED_RETURN_STATEMENT); }
-   private:
-    DeathTest* const test_;
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(ReturnSentinel);
-  } GTEST_ATTRIBUTE_UNUSED_;
-
-  // An enumeration of possible roles that may be taken when a death
-  // test is encountered.  EXECUTE means that the death test logic should
-  // be executed immediately.  OVERSEE means that the program should prepare
-  // the appropriate environment for a child process to execute the death
-  // test, then wait for it to complete.
-  enum TestRole { OVERSEE_TEST, EXECUTE_TEST };
-
-  // An enumeration of the three reasons that a test might be aborted.
-  enum AbortReason {
-    TEST_ENCOUNTERED_RETURN_STATEMENT,
-    TEST_THREW_EXCEPTION,
-    TEST_DID_NOT_DIE
-  };
-
-  // Assumes one of the above roles.
-  virtual TestRole AssumeRole() = 0;
-
-  // Waits for the death test to finish and returns its status.
-  virtual int Wait() = 0;
-
-  // Returns true if the death test passed; that is, the test process
-  // exited during the test, its exit status matches a user-supplied
-  // predicate, and its stderr output matches a user-supplied regular
-  // expression.
-  // The user-supplied predicate may be a macro expression rather
-  // than a function pointer or functor, or else Wait and Passed could
-  // be combined.
-  virtual bool Passed(bool exit_status_ok) = 0;
-
-  // Signals that the death test did not die as expected.
-  virtual void Abort(AbortReason reason) = 0;
-
-  // Returns a human-readable outcome message regarding the outcome of
-  // the last death test.
-  static const char* LastMessage();
-
-  static void set_last_death_test_message(const std::string& message);
-
- private:
-  // A string containing a description of the outcome of the last death test.
-  static std::string last_death_test_message_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(DeathTest);
-};
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
-
-// Factory interface for death tests.  May be mocked out for testing.
-class DeathTestFactory {
- public:
-  virtual ~DeathTestFactory() { }
-  virtual bool Create(const char* statement,
-                      Matcher<const std::string&> matcher, const char* file,
-                      int line, DeathTest** test) = 0;
-};
-
-// A concrete DeathTestFactory implementation for normal use.
-class DefaultDeathTestFactory : public DeathTestFactory {
- public:
-  bool Create(const char* statement, Matcher<const std::string&> matcher,
-              const char* file, int line, DeathTest** test) override;
-};
-
-// Returns true if exit_status describes a process that was terminated
-// by a signal, or exited normally with a nonzero exit code.
-GTEST_API_ bool ExitedUnsuccessfully(int exit_status);
-
-// A string passed to EXPECT_DEATH (etc.) is caught by one of these overloads
-// and interpreted as a regex (rather than an Eq matcher) for legacy
-// compatibility.
-inline Matcher<const ::std::string&> MakeDeathTestMatcher(
-    ::testing::internal::RE regex) {
-  return ContainsRegex(regex.pattern());
-}
-inline Matcher<const ::std::string&> MakeDeathTestMatcher(const char* regex) {
-  return ContainsRegex(regex);
-}
-inline Matcher<const ::std::string&> MakeDeathTestMatcher(
-    const ::std::string& regex) {
-  return ContainsRegex(regex);
-}
-
-// If a Matcher<const ::std::string&> is passed to EXPECT_DEATH (etc.), it's
-// used directly.
-inline Matcher<const ::std::string&> MakeDeathTestMatcher(
-    Matcher<const ::std::string&> matcher) {
-  return matcher;
-}
-
-// Traps C++ exceptions escaping statement and reports them as test
-// failures. Note that trapping SEH exceptions is not implemented here.
-# if GTEST_HAS_EXCEPTIONS
-#  define GTEST_EXECUTE_DEATH_TEST_STATEMENT_(statement, death_test) \
-  try { \
-    GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
-  } catch (const ::std::exception& gtest_exception) { \
-    fprintf(\
-        stderr, \
-        "\n%s: Caught std::exception-derived exception escaping the " \
-        "death test statement. Exception message: %s\n", \
-        ::testing::internal::FormatFileLocation(__FILE__, __LINE__).c_str(), \
-        gtest_exception.what()); \
-    fflush(stderr); \
-    death_test->Abort(::testing::internal::DeathTest::TEST_THREW_EXCEPTION); \
-  } catch (...) { \
-    death_test->Abort(::testing::internal::DeathTest::TEST_THREW_EXCEPTION); \
-  }
-
-# else
-#  define GTEST_EXECUTE_DEATH_TEST_STATEMENT_(statement, death_test) \
-  GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement)
-
-# endif
-
-// This macro is for implementing ASSERT_DEATH*, EXPECT_DEATH*,
-// ASSERT_EXIT*, and EXPECT_EXIT*.
-#define GTEST_DEATH_TEST_(statement, predicate, regex_or_matcher, fail)        \
-  GTEST_AMBIGUOUS_ELSE_BLOCKER_                                                \
-  if (::testing::internal::AlwaysTrue()) {                                     \
-    ::testing::internal::DeathTest* gtest_dt;                                  \
-    if (!::testing::internal::DeathTest::Create(                               \
-            #statement,                                                        \
-            ::testing::internal::MakeDeathTestMatcher(regex_or_matcher),       \
-            __FILE__, __LINE__, &gtest_dt)) {                                  \
-      goto GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__);                        \
-    }                                                                          \
-    if (gtest_dt != nullptr) {                                                 \
-      std::unique_ptr< ::testing::internal::DeathTest> gtest_dt_ptr(gtest_dt); \
-      switch (gtest_dt->AssumeRole()) {                                        \
-        case ::testing::internal::DeathTest::OVERSEE_TEST:                     \
-          if (!gtest_dt->Passed(predicate(gtest_dt->Wait()))) {                \
-            goto GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__);                  \
-          }                                                                    \
-          break;                                                               \
-        case ::testing::internal::DeathTest::EXECUTE_TEST: {                   \
-          ::testing::internal::DeathTest::ReturnSentinel gtest_sentinel(       \
-              gtest_dt);                                                       \
-          GTEST_EXECUTE_DEATH_TEST_STATEMENT_(statement, gtest_dt);            \
-          gtest_dt->Abort(::testing::internal::DeathTest::TEST_DID_NOT_DIE);   \
-          break;                                                               \
-        }                                                                      \
-      }                                                                        \
-    }                                                                          \
-  } else                                                                       \
-    GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__)                                \
-        : fail(::testing::internal::DeathTest::LastMessage())
-// The symbol "fail" here expands to something into which a message
-// can be streamed.
-
-// This macro is for implementing ASSERT/EXPECT_DEBUG_DEATH when compiled in
-// NDEBUG mode. In this case we need the statements to be executed and the macro
-// must accept a streamed message even though the message is never printed.
-// The regex object is not evaluated, but it is used to prevent "unused"
-// warnings and to avoid an expression that doesn't compile in debug mode.
-#define GTEST_EXECUTE_STATEMENT_(statement, regex_or_matcher)    \
-  GTEST_AMBIGUOUS_ELSE_BLOCKER_                                  \
-  if (::testing::internal::AlwaysTrue()) {                       \
-    GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement);   \
-  } else if (!::testing::internal::AlwaysTrue()) {               \
-    ::testing::internal::MakeDeathTestMatcher(regex_or_matcher); \
-  } else                                                         \
-    ::testing::Message()
-
-// A class representing the parsed contents of the
-// --gtest_internal_run_death_test flag, as it existed when
-// RUN_ALL_TESTS was called.
-class InternalRunDeathTestFlag {
- public:
-  InternalRunDeathTestFlag(const std::string& a_file,
-                           int a_line,
-                           int an_index,
-                           int a_write_fd)
-      : file_(a_file), line_(a_line), index_(an_index),
-        write_fd_(a_write_fd) {}
-
-  ~InternalRunDeathTestFlag() {
-    if (write_fd_ >= 0)
-      posix::Close(write_fd_);
-  }
-
-  const std::string& file() const { return file_; }
-  int line() const { return line_; }
-  int index() const { return index_; }
-  int write_fd() const { return write_fd_; }
-
- private:
-  std::string file_;
-  int line_;
-  int index_;
-  int write_fd_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(InternalRunDeathTestFlag);
-};
-
-// Returns a newly created InternalRunDeathTestFlag object with fields
-// initialized from the GTEST_FLAG(internal_run_death_test) flag if
-// the flag is specified; otherwise returns NULL.
-InternalRunDeathTestFlag* ParseInternalRunDeathTestFlag();
-
-#endif  // GTEST_HAS_DEATH_TEST
-
-}  // namespace internal
-}  // namespace testing
-
-#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-filepath.h b/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-filepath.h
deleted file mode 100644
index c11b101516e..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-filepath.h
+++ /dev/null
@@ -1,211 +0,0 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Google Test filepath utilities
-//
-// This header file declares classes and functions used internally by
-// Google Test.  They are subject to change without notice.
-//
-// This file is #included in gtest/internal/gtest-internal.h.
-// Do not include this header file separately!
-
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
-#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
-
-#include "gtest/internal/gtest-string.h"
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
-/* class A needs to have dll-interface to be used by clients of class B */)
-
-namespace testing {
-namespace internal {
-
-// FilePath - a class for file and directory pathname manipulation which
-// handles platform-specific conventions (like the pathname separator).
-// Used for helper functions for naming files in a directory for xml output.
-// Except for Set methods, all methods are const or static, which provides an
-// "immutable value object" -- useful for peace of mind.
-// A FilePath with a value ending in a path separator ("like/this/") represents
-// a directory, otherwise it is assumed to represent a file. In either case,
-// it may or may not represent an actual file or directory in the file system.
-// Names are NOT checked for syntax correctness -- no checking for illegal
-// characters, malformed paths, etc.
-
-class GTEST_API_ FilePath {
- public:
-  FilePath() : pathname_("") { }
-  FilePath(const FilePath& rhs) : pathname_(rhs.pathname_) { }
-
-  explicit FilePath(const std::string& pathname) : pathname_(pathname) {
-    Normalize();
-  }
-
-  FilePath& operator=(const FilePath& rhs) {
-    Set(rhs);
-    return *this;
-  }
-
-  void Set(const FilePath& rhs) {
-    pathname_ = rhs.pathname_;
-  }
-
-  const std::string& string() const { return pathname_; }
-  const char* c_str() const { return pathname_.c_str(); }
-
-  // Returns the current working directory, or "" if unsuccessful.
-  static FilePath GetCurrentDir();
-
-  // Given directory = "dir", base_name = "test", number = 0,
-  // extension = "xml", returns "dir/test.xml". If number is greater
-  // than zero (e.g., 12), returns "dir/test_12.xml".
-  // On Windows platform, uses \ as the separator rather than /.
-  static FilePath MakeFileName(const FilePath& directory,
-                               const FilePath& base_name,
-                               int number,
-                               const char* extension);
-
-  // Given directory = "dir", relative_path = "test.xml",
-  // returns "dir/test.xml".
-  // On Windows, uses \ as the separator rather than /.
-  static FilePath ConcatPaths(const FilePath& directory,
-                              const FilePath& relative_path);
-
-  // Returns a pathname for a file that does not currently exist. The pathname
-  // will be directory/base_name.extension or
-  // directory/base_name_<number>.extension if directory/base_name.extension
-  // already exists. The number will be incremented until a pathname is found
-  // that does not already exist.
-  // Examples: 'dir/foo_test.xml' or 'dir/foo_test_1.xml'.
-  // There could be a race condition if two or more processes are calling this
-  // function at the same time -- they could both pick the same filename.
-  static FilePath GenerateUniqueFileName(const FilePath& directory,
-                                         const FilePath& base_name,
-                                         const char* extension);
-
-  // Returns true if and only if the path is "".
-  bool IsEmpty() const { return pathname_.empty(); }
-
-  // If input name has a trailing separator character, removes it and returns
-  // the name, otherwise return the name string unmodified.
-  // On Windows platform, uses \ as the separator, other platforms use /.
-  FilePath RemoveTrailingPathSeparator() const;
-
-  // Returns a copy of the FilePath with the directory part removed.
-  // Example: FilePath("path/to/file").RemoveDirectoryName() returns
-  // FilePath("file"). If there is no directory part ("just_a_file"), it returns
-  // the FilePath unmodified. If there is no file part ("just_a_dir/") it
-  // returns an empty FilePath ("").
-  // On Windows platform, '\' is the path separator, otherwise it is '/'.
-  FilePath RemoveDirectoryName() const;
-
-  // RemoveFileName returns the directory path with the filename removed.
-  // Example: FilePath("path/to/file").RemoveFileName() returns "path/to/".
-  // If the FilePath is "a_file" or "/a_file", RemoveFileName returns
-  // FilePath("./") or, on Windows, FilePath(".\\"). If the filepath does
-  // not have a file, like "just/a/dir/", it returns the FilePath unmodified.
-  // On Windows platform, '\' is the path separator, otherwise it is '/'.
-  FilePath RemoveFileName() const;
-
-  // Returns a copy of the FilePath with the case-insensitive extension removed.
-  // Example: FilePath("dir/file.exe").RemoveExtension("EXE") returns
-  // FilePath("dir/file"). If a case-insensitive extension is not
-  // found, returns a copy of the original FilePath.
-  FilePath RemoveExtension(const char* extension) const;
-
-  // Creates directories so that path exists. Returns true if successful or if
-  // the directories already exist; returns false if unable to create
-  // directories for any reason. Will also return false if the FilePath does
-  // not represent a directory (that is, it doesn't end with a path separator).
-  bool CreateDirectoriesRecursively() const;
-
-  // Create the directory so that path exists. Returns true if successful or
-  // if the directory already exists; returns false if unable to create the
-  // directory for any reason, including if the parent directory does not
-  // exist. Not named "CreateDirectory" because that's a macro on Windows.
-  bool CreateFolder() const;
-
-  // Returns true if FilePath describes something in the file-system,
-  // either a file, directory, or whatever, and that something exists.
-  bool FileOrDirectoryExists() const;
-
-  // Returns true if pathname describes a directory in the file-system
-  // that exists.
-  bool DirectoryExists() const;
-
-  // Returns true if FilePath ends with a path separator, which indicates that
-  // it is intended to represent a directory. Returns false otherwise.
-  // This does NOT check that a directory (or file) actually exists.
-  bool IsDirectory() const;
-
-  // Returns true if pathname describes a root directory. (Windows has one
-  // root directory per disk drive.)
-  bool IsRootDirectory() const;
-
-  // Returns true if pathname describes an absolute path.
-  bool IsAbsolutePath() const;
-
- private:
-  // Replaces multiple consecutive separators with a single separator.
-  // For example, "bar///foo" becomes "bar/foo". Does not eliminate other
-  // redundancies that might be in a pathname involving "." or "..".
-  //
-  // A pathname with multiple consecutive separators may occur either through
-  // user error or as a result of some scripts or APIs that generate a pathname
-  // with a trailing separator. On other platforms the same API or script
-  // may NOT generate a pathname with a trailing "/". Then elsewhere that
-  // pathname may have another "/" and pathname components added to it,
-  // without checking for the separator already being there.
-  // The script language and operating system may allow paths like "foo//bar"
-  // but some of the functions in FilePath will not handle that correctly. In
-  // particular, RemoveTrailingPathSeparator() only removes one separator, and
-  // it is called in CreateDirectoriesRecursively() assuming that it will change
-  // a pathname from directory syntax (trailing separator) to filename syntax.
-  //
-  // On Windows this method also replaces the alternate path separator '/' with
-  // the primary path separator '\\', so that for example "bar\\/\\foo" becomes
-  // "bar\\foo".
-
-  void Normalize();
-
-  // Returns a pointer to the last occurence of a valid path separator in
-  // the FilePath. On Windows, for example, both '/' and '\' are valid path
-  // separators. Returns NULL if no path separator was found.
-  const char* FindLastPathSeparator() const;
-
-  std::string pathname_;
-};  // class FilePath
-
-}  // namespace internal
-}  // namespace testing
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
-
-#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-internal.h b/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-internal.h
deleted file mode 100644
index 94c816a28bd..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-internal.h
+++ /dev/null
@@ -1,1380 +0,0 @@
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// The Google C++ Testing and Mocking Framework (Google Test)
-//
-// This header file declares functions and macros used internally by
-// Google Test.  They are subject to change without notice.
-
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
-#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
-
-#include "gtest/internal/gtest-port.h"
-
-#if GTEST_OS_LINUX
-# include <stdlib.h>
-# include <sys/types.h>
-# include <sys/wait.h>
-# include <unistd.h>
-#endif  // GTEST_OS_LINUX
-
-#if GTEST_HAS_EXCEPTIONS
-# include <stdexcept>
-#endif
-
-#include <ctype.h>
-#include <float.h>
-#include <string.h>
-#include <iomanip>
-#include <limits>
-#include <map>
-#include <set>
-#include <string>
-#include <type_traits>
-#include <vector>
-
-#include "gtest/gtest-message.h"
-#include "gtest/internal/gtest-filepath.h"
-#include "gtest/internal/gtest-string.h"
-#include "gtest/internal/gtest-type-util.h"
-
-// Due to C++ preprocessor weirdness, we need double indirection to
-// concatenate two tokens when one of them is __LINE__.  Writing
-//
-//   foo ## __LINE__
-//
-// will result in the token foo__LINE__, instead of foo followed by
-// the current line number.  For more details, see
-// http://www.parashift.com/c++-faq-lite/misc-technical-issues.html#faq-39.6
-#define GTEST_CONCAT_TOKEN_(foo, bar) GTEST_CONCAT_TOKEN_IMPL_(foo, bar)
-#define GTEST_CONCAT_TOKEN_IMPL_(foo, bar) foo ## bar
-
-// Stringifies its argument.
-#define GTEST_STRINGIFY_(name) #name
-
-namespace proto2 { class Message; }
-
-namespace testing {
-
-// Forward declarations.
-
-class AssertionResult;                 // Result of an assertion.
-class Message;                         // Represents a failure message.
-class Test;                            // Represents a test.
-class TestInfo;                        // Information about a test.
-class TestPartResult;                  // Result of a test part.
-class UnitTest;                        // A collection of test suites.
-
-template <typename T>
-::std::string PrintToString(const T& value);
-
-namespace internal {
-
-struct TraceInfo;                      // Information about a trace point.
-class TestInfoImpl;                    // Opaque implementation of TestInfo
-class UnitTestImpl;                    // Opaque implementation of UnitTest
-
-// The text used in failure messages to indicate the start of the
-// stack trace.
-GTEST_API_ extern const char kStackTraceMarker[];
-
-// An IgnoredValue object can be implicitly constructed from ANY value.
-class IgnoredValue {
-  struct Sink {};
- public:
-  // This constructor template allows any value to be implicitly
-  // converted to IgnoredValue.  The object has no data member and
-  // doesn't try to remember anything about the argument.  We
-  // deliberately omit the 'explicit' keyword in order to allow the
-  // conversion to be implicit.
-  // Disable the conversion if T already has a magical conversion operator.
-  // Otherwise we get ambiguity.
-  template <typename T,
-            typename std::enable_if<!std::is_convertible<T, Sink>::value,
-                                    int>::type = 0>
-  IgnoredValue(const T& /* ignored */) {}  // NOLINT(runtime/explicit)
-};
-
-// Appends the user-supplied message to the Google-Test-generated message.
-GTEST_API_ std::string AppendUserMessage(
-    const std::string& gtest_msg, const Message& user_msg);
-
-#if GTEST_HAS_EXCEPTIONS
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4275 \
-/* an exported class was derived from a class that was not exported */)
-
-// This exception is thrown by (and only by) a failed Google Test
-// assertion when GTEST_FLAG(throw_on_failure) is true (if exceptions
-// are enabled).  We derive it from std::runtime_error, which is for
-// errors presumably detectable only at run time.  Since
-// std::runtime_error inherits from std::exception, many testing
-// frameworks know how to extract and print the message inside it.
-class GTEST_API_ GoogleTestFailureException : public ::std::runtime_error {
- public:
-  explicit GoogleTestFailureException(const TestPartResult& failure);
-};
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4275
-
-#endif  // GTEST_HAS_EXCEPTIONS
-
-namespace edit_distance {
-// Returns the optimal edits to go from 'left' to 'right'.
-// All edits cost the same, with replace having lower priority than
-// add/remove.
-// Simple implementation of the Wagner-Fischer algorithm.
-// See http://en.wikipedia.org/wiki/Wagner-Fischer_algorithm
-enum EditType { kMatch, kAdd, kRemove, kReplace };
-GTEST_API_ std::vector<EditType> CalculateOptimalEdits(
-    const std::vector<size_t>& left, const std::vector<size_t>& right);
-
-// Same as above, but the input is represented as strings.
-GTEST_API_ std::vector<EditType> CalculateOptimalEdits(
-    const std::vector<std::string>& left,
-    const std::vector<std::string>& right);
-
-// Create a diff of the input strings in Unified diff format.
-GTEST_API_ std::string CreateUnifiedDiff(const std::vector<std::string>& left,
-                                         const std::vector<std::string>& right,
-                                         size_t context = 2);
-
-}  // namespace edit_distance
-
-// Calculate the diff between 'left' and 'right' and return it in unified diff
-// format.
-// If not null, stores in 'total_line_count' the total number of lines found
-// in left + right.
-GTEST_API_ std::string DiffStrings(const std::string& left,
-                                   const std::string& right,
-                                   size_t* total_line_count);
-
-// Constructs and returns the message for an equality assertion
-// (e.g. ASSERT_EQ, EXPECT_STREQ, etc) failure.
-//
-// The first four parameters are the expressions used in the assertion
-// and their values, as strings.  For example, for ASSERT_EQ(foo, bar)
-// where foo is 5 and bar is 6, we have:
-//
-//   expected_expression: "foo"
-//   actual_expression:   "bar"
-//   expected_value:      "5"
-//   actual_value:        "6"
-//
-// The ignoring_case parameter is true if and only if the assertion is a
-// *_STRCASEEQ*.  When it's true, the string " (ignoring case)" will
-// be inserted into the message.
-GTEST_API_ AssertionResult EqFailure(const char* expected_expression,
-                                     const char* actual_expression,
-                                     const std::string& expected_value,
-                                     const std::string& actual_value,
-                                     bool ignoring_case);
-
-// Constructs a failure message for Boolean assertions such as EXPECT_TRUE.
-GTEST_API_ std::string GetBoolAssertionFailureMessage(
-    const AssertionResult& assertion_result,
-    const char* expression_text,
-    const char* actual_predicate_value,
-    const char* expected_predicate_value);
-
-// This template class represents an IEEE floating-point number
-// (either single-precision or double-precision, depending on the
-// template parameters).
-//
-// The purpose of this class is to do more sophisticated number
-// comparison.  (Due to round-off error, etc, it's very unlikely that
-// two floating-points will be equal exactly.  Hence a naive
-// comparison by the == operation often doesn't work.)
-//
-// Format of IEEE floating-point:
-//
-//   The most-significant bit being the leftmost, an IEEE
-//   floating-point looks like
-//
-//     sign_bit exponent_bits fraction_bits
-//
-//   Here, sign_bit is a single bit that designates the sign of the
-//   number.
-//
-//   For float, there are 8 exponent bits and 23 fraction bits.
-//
-//   For double, there are 11 exponent bits and 52 fraction bits.
-//
-//   More details can be found at
-//   http://en.wikipedia.org/wiki/IEEE_floating-point_standard.
-//
-// Template parameter:
-//
-//   RawType: the raw floating-point type (either float or double)
-template <typename RawType>
-class FloatingPoint {
- public:
-  // Defines the unsigned integer type that has the same size as the
-  // floating point number.
-  typedef typename TypeWithSize<sizeof(RawType)>::UInt Bits;
-
-  // Constants.
-
-  // # of bits in a number.
-  static const size_t kBitCount = 8*sizeof(RawType);
-
-  // # of fraction bits in a number.
-  static const size_t kFractionBitCount =
-    std::numeric_limits<RawType>::digits - 1;
-
-  // # of exponent bits in a number.
-  static const size_t kExponentBitCount = kBitCount - 1 - kFractionBitCount;
-
-  // The mask for the sign bit.
-  static const Bits kSignBitMask = static_cast<Bits>(1) << (kBitCount - 1);
-
-  // The mask for the fraction bits.
-  static const Bits kFractionBitMask =
-    ~static_cast<Bits>(0) >> (kExponentBitCount + 1);
-
-  // The mask for the exponent bits.
-  static const Bits kExponentBitMask = ~(kSignBitMask | kFractionBitMask);
-
-  // How many ULP's (Units in the Last Place) we want to tolerate when
-  // comparing two numbers.  The larger the value, the more error we
-  // allow.  A 0 value means that two numbers must be exactly the same
-  // to be considered equal.
-  //
-  // The maximum error of a single floating-point operation is 0.5
-  // units in the last place.  On Intel CPU's, all floating-point
-  // calculations are done with 80-bit precision, while double has 64
-  // bits.  Therefore, 4 should be enough for ordinary use.
-  //
-  // See the following article for more details on ULP:
-  // http://randomascii.wordpress.com/2012/02/25/comparing-floating-point-numbers-2012-edition/
-  static const size_t kMaxUlps = 4;
-
-  // Constructs a FloatingPoint from a raw floating-point number.
-  //
-  // On an Intel CPU, passing a non-normalized NAN (Not a Number)
-  // around may change its bits, although the new value is guaranteed
-  // to be also a NAN.  Therefore, don't expect this constructor to
-  // preserve the bits in x when x is a NAN.
-  explicit FloatingPoint(const RawType& x) { u_.value_ = x; }
-
-  // Static methods
-
-  // Reinterprets a bit pattern as a floating-point number.
-  //
-  // This function is needed to test the AlmostEquals() method.
-  static RawType ReinterpretBits(const Bits bits) {
-    FloatingPoint fp(0);
-    fp.u_.bits_ = bits;
-    return fp.u_.value_;
-  }
-
-  // Returns the floating-point number that represent positive infinity.
-  static RawType Infinity() {
-    return ReinterpretBits(kExponentBitMask);
-  }
-
-  // Returns the maximum representable finite floating-point number.
-  static RawType Max();
-
-  // Non-static methods
-
-  // Returns the bits that represents this number.
-  const Bits &bits() const { return u_.bits_; }
-
-  // Returns the exponent bits of this number.
-  Bits exponent_bits() const { return kExponentBitMask & u_.bits_; }
-
-  // Returns the fraction bits of this number.
-  Bits fraction_bits() const { return kFractionBitMask & u_.bits_; }
-
-  // Returns the sign bit of this number.
-  Bits sign_bit() const { return kSignBitMask & u_.bits_; }
-
-  // Returns true if and only if this is NAN (not a number).
-  bool is_nan() const {
-    // It's a NAN if the exponent bits are all ones and the fraction
-    // bits are not entirely zeros.
-    return (exponent_bits() == kExponentBitMask) && (fraction_bits() != 0);
-  }
-
-  // Returns true if and only if this number is at most kMaxUlps ULP's away
-  // from rhs.  In particular, this function:
-  //
-  //   - returns false if either number is (or both are) NAN.
-  //   - treats really large numbers as almost equal to infinity.
-  //   - thinks +0.0 and -0.0 are 0 DLP's apart.
-  bool AlmostEquals(const FloatingPoint& rhs) const {
-    // The IEEE standard says that any comparison operation involving
-    // a NAN must return false.
-    if (is_nan() || rhs.is_nan()) return false;
-
-    return DistanceBetweenSignAndMagnitudeNumbers(u_.bits_, rhs.u_.bits_)
-        <= kMaxUlps;
-  }
-
- private:
-  // The data type used to store the actual floating-point number.
-  union FloatingPointUnion {
-    RawType value_;  // The raw floating-point number.
-    Bits bits_;      // The bits that represent the number.
-  };
-
-  // Converts an integer from the sign-and-magnitude representation to
-  // the biased representation.  More precisely, let N be 2 to the
-  // power of (kBitCount - 1), an integer x is represented by the
-  // unsigned number x + N.
-  //
-  // For instance,
-  //
-  //   -N + 1 (the most negative number representable using
-  //          sign-and-magnitude) is represented by 1;
-  //   0      is represented by N; and
-  //   N - 1  (the biggest number representable using
-  //          sign-and-magnitude) is represented by 2N - 1.
-  //
-  // Read http://en.wikipedia.org/wiki/Signed_number_representations
-  // for more details on signed number representations.
-  static Bits SignAndMagnitudeToBiased(const Bits &sam) {
-    if (kSignBitMask & sam) {
-      // sam represents a negative number.
-      return ~sam + 1;
-    } else {
-      // sam represents a positive number.
-      return kSignBitMask | sam;
-    }
-  }
-
-  // Given two numbers in the sign-and-magnitude representation,
-  // returns the distance between them as an unsigned number.
-  static Bits DistanceBetweenSignAndMagnitudeNumbers(const Bits &sam1,
-                                                     const Bits &sam2) {
-    const Bits biased1 = SignAndMagnitudeToBiased(sam1);
-    const Bits biased2 = SignAndMagnitudeToBiased(sam2);
-    return (biased1 >= biased2) ? (biased1 - biased2) : (biased2 - biased1);
-  }
-
-  FloatingPointUnion u_;
-};
-
-// We cannot use std::numeric_limits<T>::max() as it clashes with the max()
-// macro defined by <windows.h>.
-template <>
-inline float FloatingPoint<float>::Max() { return FLT_MAX; }
-template <>
-inline double FloatingPoint<double>::Max() { return DBL_MAX; }
-
-// Typedefs the instances of the FloatingPoint template class that we
-// care to use.
-typedef FloatingPoint<float> Float;
-typedef FloatingPoint<double> Double;
-
-// In order to catch the mistake of putting tests that use different
-// test fixture classes in the same test suite, we need to assign
-// unique IDs to fixture classes and compare them.  The TypeId type is
-// used to hold such IDs.  The user should treat TypeId as an opaque
-// type: the only operation allowed on TypeId values is to compare
-// them for equality using the == operator.
-typedef const void* TypeId;
-
-template <typename T>
-class TypeIdHelper {
- public:
-  // dummy_ must not have a const type.  Otherwise an overly eager
-  // compiler (e.g. MSVC 7.1 & 8.0) may try to merge
-  // TypeIdHelper<T>::dummy_ for different Ts as an "optimization".
-  static bool dummy_;
-};
-
-template <typename T>
-bool TypeIdHelper<T>::dummy_ = false;
-
-// GetTypeId<T>() returns the ID of type T.  Different values will be
-// returned for different types.  Calling the function twice with the
-// same type argument is guaranteed to return the same ID.
-template <typename T>
-TypeId GetTypeId() {
-  // The compiler is required to allocate a different
-  // TypeIdHelper<T>::dummy_ variable for each T used to instantiate
-  // the template.  Therefore, the address of dummy_ is guaranteed to
-  // be unique.
-  return &(TypeIdHelper<T>::dummy_);
-}
-
-// Returns the type ID of ::testing::Test.  Always call this instead
-// of GetTypeId< ::testing::Test>() to get the type ID of
-// ::testing::Test, as the latter may give the wrong result due to a
-// suspected linker bug when compiling Google Test as a Mac OS X
-// framework.
-GTEST_API_ TypeId GetTestTypeId();
-
-// Defines the abstract factory interface that creates instances
-// of a Test object.
-class TestFactoryBase {
- public:
-  virtual ~TestFactoryBase() {}
-
-  // Creates a test instance to run. The instance is both created and destroyed
-  // within TestInfoImpl::Run()
-  virtual Test* CreateTest() = 0;
-
- protected:
-  TestFactoryBase() {}
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestFactoryBase);
-};
-
-// This class provides implementation of TeastFactoryBase interface.
-// It is used in TEST and TEST_F macros.
-template <class TestClass>
-class TestFactoryImpl : public TestFactoryBase {
- public:
-  Test* CreateTest() override { return new TestClass; }
-};
-
-#if GTEST_OS_WINDOWS
-
-// Predicate-formatters for implementing the HRESULT checking macros
-// {ASSERT|EXPECT}_HRESULT_{SUCCEEDED|FAILED}
-// We pass a long instead of HRESULT to avoid causing an
-// include dependency for the HRESULT type.
-GTEST_API_ AssertionResult IsHRESULTSuccess(const char* expr,
-                                            long hr);  // NOLINT
-GTEST_API_ AssertionResult IsHRESULTFailure(const char* expr,
-                                            long hr);  // NOLINT
-
-#endif  // GTEST_OS_WINDOWS
-
-// Types of SetUpTestSuite() and TearDownTestSuite() functions.
-using SetUpTestSuiteFunc = void (*)();
-using TearDownTestSuiteFunc = void (*)();
-
-struct CodeLocation {
-  CodeLocation(const std::string& a_file, int a_line)
-      : file(a_file), line(a_line) {}
-
-  std::string file;
-  int line;
-};
-
-//  Helper to identify which setup function for TestCase / TestSuite to call.
-//  Only one function is allowed, either TestCase or TestSute but not both.
-
-// Utility functions to help SuiteApiResolver
-using SetUpTearDownSuiteFuncType = void (*)();
-
-inline SetUpTearDownSuiteFuncType GetNotDefaultOrNull(
-    SetUpTearDownSuiteFuncType a, SetUpTearDownSuiteFuncType def) {
-  return a == def ? nullptr : a;
-}
-
-template <typename T>
-//  Note that SuiteApiResolver inherits from T because
-//  SetUpTestSuite()/TearDownTestSuite() could be protected. Ths way
-//  SuiteApiResolver can access them.
-struct SuiteApiResolver : T {
-  // testing::Test is only forward declared at this point. So we make it a
-  // dependend class for the compiler to be OK with it.
-  using Test =
-      typename std::conditional<sizeof(T) != 0, ::testing::Test, void>::type;
-
-  static SetUpTearDownSuiteFuncType GetSetUpCaseOrSuite(const char* filename,
-                                                        int line_num) {
-    SetUpTearDownSuiteFuncType test_case_fp =
-        GetNotDefaultOrNull(&T::SetUpTestCase, &Test::SetUpTestCase);
-    SetUpTearDownSuiteFuncType test_suite_fp =
-        GetNotDefaultOrNull(&T::SetUpTestSuite, &Test::SetUpTestSuite);
-
-    GTEST_CHECK_(!test_case_fp || !test_suite_fp)
-        << "Test can not provide both SetUpTestSuite and SetUpTestCase, please "
-           "make sure there is only one present at "
-        << filename << ":" << line_num;
-
-    return test_case_fp != nullptr ? test_case_fp : test_suite_fp;
-  }
-
-  static SetUpTearDownSuiteFuncType GetTearDownCaseOrSuite(const char* filename,
-                                                           int line_num) {
-    SetUpTearDownSuiteFuncType test_case_fp =
-        GetNotDefaultOrNull(&T::TearDownTestCase, &Test::TearDownTestCase);
-    SetUpTearDownSuiteFuncType test_suite_fp =
-        GetNotDefaultOrNull(&T::TearDownTestSuite, &Test::TearDownTestSuite);
-
-    GTEST_CHECK_(!test_case_fp || !test_suite_fp)
-        << "Test can not provide both TearDownTestSuite and TearDownTestCase,"
-           " please make sure there is only one present at"
-        << filename << ":" << line_num;
-
-    return test_case_fp != nullptr ? test_case_fp : test_suite_fp;
-  }
-};
-
-// Creates a new TestInfo object and registers it with Google Test;
-// returns the created object.
-//
-// Arguments:
-//
-//   test_suite_name:   name of the test suite
-//   name:             name of the test
-//   type_param        the name of the test's type parameter, or NULL if
-//                     this is not a typed or a type-parameterized test.
-//   value_param       text representation of the test's value parameter,
-//                     or NULL if this is not a type-parameterized test.
-//   code_location:    code location where the test is defined
-//   fixture_class_id: ID of the test fixture class
-//   set_up_tc:        pointer to the function that sets up the test suite
-//   tear_down_tc:     pointer to the function that tears down the test suite
-//   factory:          pointer to the factory that creates a test object.
-//                     The newly created TestInfo instance will assume
-//                     ownership of the factory object.
-GTEST_API_ TestInfo* MakeAndRegisterTestInfo(
-    const char* test_suite_name, const char* name, const char* type_param,
-    const char* value_param, CodeLocation code_location,
-    TypeId fixture_class_id, SetUpTestSuiteFunc set_up_tc,
-    TearDownTestSuiteFunc tear_down_tc, TestFactoryBase* factory);
-
-// If *pstr starts with the given prefix, modifies *pstr to be right
-// past the prefix and returns true; otherwise leaves *pstr unchanged
-// and returns false.  None of pstr, *pstr, and prefix can be NULL.
-GTEST_API_ bool SkipPrefix(const char* prefix, const char** pstr);
-
-#if GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
-/* class A needs to have dll-interface to be used by clients of class B */)
-
-// State of the definition of a type-parameterized test suite.
-class GTEST_API_ TypedTestSuitePState {
- public:
-  TypedTestSuitePState() : registered_(false) {}
-
-  // Adds the given test name to defined_test_names_ and return true
-  // if the test suite hasn't been registered; otherwise aborts the
-  // program.
-  bool AddTestName(const char* file, int line, const char* case_name,
-                   const char* test_name) {
-    if (registered_) {
-      fprintf(stderr,
-              "%s Test %s must be defined before "
-              "REGISTER_TYPED_TEST_SUITE_P(%s, ...).\n",
-              FormatFileLocation(file, line).c_str(), test_name, case_name);
-      fflush(stderr);
-      posix::Abort();
-    }
-    registered_tests_.insert(
-        ::std::make_pair(test_name, CodeLocation(file, line)));
-    return true;
-  }
-
-  bool TestExists(const std::string& test_name) const {
-    return registered_tests_.count(test_name) > 0;
-  }
-
-  const CodeLocation& GetCodeLocation(const std::string& test_name) const {
-    RegisteredTestsMap::const_iterator it = registered_tests_.find(test_name);
-    GTEST_CHECK_(it != registered_tests_.end());
-    return it->second;
-  }
-
-  // Verifies that registered_tests match the test names in
-  // defined_test_names_; returns registered_tests if successful, or
-  // aborts the program otherwise.
-  const char* VerifyRegisteredTestNames(
-      const char* file, int line, const char* registered_tests);
-
- private:
-  typedef ::std::map<std::string, CodeLocation> RegisteredTestsMap;
-
-  bool registered_;
-  RegisteredTestsMap registered_tests_;
-};
-
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-using TypedTestCasePState = TypedTestSuitePState;
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
-
-// Skips to the first non-space char after the first comma in 'str';
-// returns NULL if no comma is found in 'str'.
-inline const char* SkipComma(const char* str) {
-  const char* comma = strchr(str, ',');
-  if (comma == nullptr) {
-    return nullptr;
-  }
-  while (IsSpace(*(++comma))) {}
-  return comma;
-}
-
-// Returns the prefix of 'str' before the first comma in it; returns
-// the entire string if it contains no comma.
-inline std::string GetPrefixUntilComma(const char* str) {
-  const char* comma = strchr(str, ',');
-  return comma == nullptr ? str : std::string(str, comma);
-}
-
-// Splits a given string on a given delimiter, populating a given
-// vector with the fields.
-void SplitString(const ::std::string& str, char delimiter,
-                 ::std::vector< ::std::string>* dest);
-
-// The default argument to the template below for the case when the user does
-// not provide a name generator.
-struct DefaultNameGenerator {
-  template <typename T>
-  static std::string GetName(int i) {
-    return StreamableToString(i);
-  }
-};
-
-template <typename Provided = DefaultNameGenerator>
-struct NameGeneratorSelector {
-  typedef Provided type;
-};
-
-template <typename NameGenerator>
-void GenerateNamesRecursively(Types0, std::vector<std::string>*, int) {}
-
-template <typename NameGenerator, typename Types>
-void GenerateNamesRecursively(Types, std::vector<std::string>* result, int i) {
-  result->push_back(NameGenerator::template GetName<typename Types::Head>(i));
-  GenerateNamesRecursively<NameGenerator>(typename Types::Tail(), result,
-                                          i + 1);
-}
-
-template <typename NameGenerator, typename Types>
-std::vector<std::string> GenerateNames() {
-  std::vector<std::string> result;
-  GenerateNamesRecursively<NameGenerator>(Types(), &result, 0);
-  return result;
-}
-
-// TypeParameterizedTest<Fixture, TestSel, Types>::Register()
-// registers a list of type-parameterized tests with Google Test.  The
-// return value is insignificant - we just need to return something
-// such that we can call this function in a namespace scope.
-//
-// Implementation note: The GTEST_TEMPLATE_ macro declares a template
-// template parameter.  It's defined in gtest-type-util.h.
-template <GTEST_TEMPLATE_ Fixture, class TestSel, typename Types>
-class TypeParameterizedTest {
- public:
-  // 'index' is the index of the test in the type list 'Types'
-  // specified in INSTANTIATE_TYPED_TEST_SUITE_P(Prefix, TestSuite,
-  // Types).  Valid values for 'index' are [0, N - 1] where N is the
-  // length of Types.
-  static bool Register(const char* prefix, const CodeLocation& code_location,
-                       const char* case_name, const char* test_names, int index,
-                       const std::vector<std::string>& type_names =
-                           GenerateNames<DefaultNameGenerator, Types>()) {
-    typedef typename Types::Head Type;
-    typedef Fixture<Type> FixtureClass;
-    typedef typename GTEST_BIND_(TestSel, Type) TestClass;
-
-    // First, registers the first type-parameterized test in the type
-    // list.
-    MakeAndRegisterTestInfo(
-        (std::string(prefix) + (prefix[0] == '\0' ? "" : "/") + case_name +
-         "/" + type_names[static_cast<size_t>(index)])
-            .c_str(),
-        StripTrailingSpaces(GetPrefixUntilComma(test_names)).c_str(),
-        GetTypeName<Type>().c_str(),
-        nullptr,  // No value parameter.
-        code_location, GetTypeId<FixtureClass>(),
-        SuiteApiResolver<TestClass>::GetSetUpCaseOrSuite(
-            code_location.file.c_str(), code_location.line),
-        SuiteApiResolver<TestClass>::GetTearDownCaseOrSuite(
-            code_location.file.c_str(), code_location.line),
-        new TestFactoryImpl<TestClass>);
-
-    // Next, recurses (at compile time) with the tail of the type list.
-    return TypeParameterizedTest<Fixture, TestSel,
-                                 typename Types::Tail>::Register(prefix,
-                                                                 code_location,
-                                                                 case_name,
-                                                                 test_names,
-                                                                 index + 1,
-                                                                 type_names);
-  }
-};
-
-// The base case for the compile time recursion.
-template <GTEST_TEMPLATE_ Fixture, class TestSel>
-class TypeParameterizedTest<Fixture, TestSel, Types0> {
- public:
-  static bool Register(const char* /*prefix*/, const CodeLocation&,
-                       const char* /*case_name*/, const char* /*test_names*/,
-                       int /*index*/,
-                       const std::vector<std::string>& =
-                           std::vector<std::string>() /*type_names*/) {
-    return true;
-  }
-};
-
-// TypeParameterizedTestSuite<Fixture, Tests, Types>::Register()
-// registers *all combinations* of 'Tests' and 'Types' with Google
-// Test.  The return value is insignificant - we just need to return
-// something such that we can call this function in a namespace scope.
-template <GTEST_TEMPLATE_ Fixture, typename Tests, typename Types>
-class TypeParameterizedTestSuite {
- public:
-  static bool Register(const char* prefix, CodeLocation code_location,
-                       const TypedTestSuitePState* state, const char* case_name,
-                       const char* test_names,
-                       const std::vector<std::string>& type_names =
-                           GenerateNames<DefaultNameGenerator, Types>()) {
-    std::string test_name = StripTrailingSpaces(
-        GetPrefixUntilComma(test_names));
-    if (!state->TestExists(test_name)) {
-      fprintf(stderr, "Failed to get code location for test %s.%s at %s.",
-              case_name, test_name.c_str(),
-              FormatFileLocation(code_location.file.c_str(),
-                                 code_location.line).c_str());
-      fflush(stderr);
-      posix::Abort();
-    }
-    const CodeLocation& test_location = state->GetCodeLocation(test_name);
-
-    typedef typename Tests::Head Head;
-
-    // First, register the first test in 'Test' for each type in 'Types'.
-    TypeParameterizedTest<Fixture, Head, Types>::Register(
-        prefix, test_location, case_name, test_names, 0, type_names);
-
-    // Next, recurses (at compile time) with the tail of the test list.
-    return TypeParameterizedTestSuite<Fixture, typename Tests::Tail,
-                                      Types>::Register(prefix, code_location,
-                                                       state, case_name,
-                                                       SkipComma(test_names),
-                                                       type_names);
-  }
-};
-
-// The base case for the compile time recursion.
-template <GTEST_TEMPLATE_ Fixture, typename Types>
-class TypeParameterizedTestSuite<Fixture, Templates0, Types> {
- public:
-  static bool Register(const char* /*prefix*/, const CodeLocation&,
-                       const TypedTestSuitePState* /*state*/,
-                       const char* /*case_name*/, const char* /*test_names*/,
-                       const std::vector<std::string>& =
-                           std::vector<std::string>() /*type_names*/) {
-    return true;
-  }
-};
-
-#endif  // GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
-
-// Returns the current OS stack trace as an std::string.
-//
-// The maximum number of stack frames to be included is specified by
-// the gtest_stack_trace_depth flag.  The skip_count parameter
-// specifies the number of top frames to be skipped, which doesn't
-// count against the number of frames to be included.
-//
-// For example, if Foo() calls Bar(), which in turn calls
-// GetCurrentOsStackTraceExceptTop(..., 1), Foo() will be included in
-// the trace but Bar() and GetCurrentOsStackTraceExceptTop() won't.
-GTEST_API_ std::string GetCurrentOsStackTraceExceptTop(
-    UnitTest* unit_test, int skip_count);
-
-// Helpers for suppressing warnings on unreachable code or constant
-// condition.
-
-// Always returns true.
-GTEST_API_ bool AlwaysTrue();
-
-// Always returns false.
-inline bool AlwaysFalse() { return !AlwaysTrue(); }
-
-// Helper for suppressing false warning from Clang on a const char*
-// variable declared in a conditional expression always being NULL in
-// the else branch.
-struct GTEST_API_ ConstCharPtr {
-  ConstCharPtr(const char* str) : value(str) {}
-  operator bool() const { return true; }
-  const char* value;
-};
-
-// A simple Linear Congruential Generator for generating random
-// numbers with a uniform distribution.  Unlike rand() and srand(), it
-// doesn't use global state (and therefore can't interfere with user
-// code).  Unlike rand_r(), it's portable.  An LCG isn't very random,
-// but it's good enough for our purposes.
-class GTEST_API_ Random {
- public:
-  static const UInt32 kMaxRange = 1u << 31;
-
-  explicit Random(UInt32 seed) : state_(seed) {}
-
-  void Reseed(UInt32 seed) { state_ = seed; }
-
-  // Generates a random number from [0, range).  Crashes if 'range' is
-  // 0 or greater than kMaxRange.
-  UInt32 Generate(UInt32 range);
-
- private:
-  UInt32 state_;
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(Random);
-};
-
-// Turns const U&, U&, const U, and U all into U.
-#define GTEST_REMOVE_REFERENCE_AND_CONST_(T) \
-  typename std::remove_const<typename std::remove_reference<T>::type>::type
-
-// IsAProtocolMessage<T>::value is a compile-time bool constant that's
-// true if and only if T is type proto2::Message or a subclass of it.
-template <typename T>
-struct IsAProtocolMessage
-    : public bool_constant<
-          std::is_convertible<const T*, const ::proto2::Message*>::value> {};
-
-// When the compiler sees expression IsContainerTest<C>(0), if C is an
-// STL-style container class, the first overload of IsContainerTest
-// will be viable (since both C::iterator* and C::const_iterator* are
-// valid types and NULL can be implicitly converted to them).  It will
-// be picked over the second overload as 'int' is a perfect match for
-// the type of argument 0.  If C::iterator or C::const_iterator is not
-// a valid type, the first overload is not viable, and the second
-// overload will be picked.  Therefore, we can determine whether C is
-// a container class by checking the type of IsContainerTest<C>(0).
-// The value of the expression is insignificant.
-//
-// In C++11 mode we check the existence of a const_iterator and that an
-// iterator is properly implemented for the container.
-//
-// For pre-C++11 that we look for both C::iterator and C::const_iterator.
-// The reason is that C++ injects the name of a class as a member of the
-// class itself (e.g. you can refer to class iterator as either
-// 'iterator' or 'iterator::iterator').  If we look for C::iterator
-// only, for example, we would mistakenly think that a class named
-// iterator is an STL container.
-//
-// Also note that the simpler approach of overloading
-// IsContainerTest(typename C::const_iterator*) and
-// IsContainerTest(...) doesn't work with Visual Age C++ and Sun C++.
-typedef int IsContainer;
-template <class C,
-          class Iterator = decltype(::std::declval<const C&>().begin()),
-          class = decltype(::std::declval<const C&>().end()),
-          class = decltype(++::std::declval<Iterator&>()),
-          class = decltype(*::std::declval<Iterator>()),
-          class = typename C::const_iterator>
-IsContainer IsContainerTest(int /* dummy */) {
-  return 0;
-}
-
-typedef char IsNotContainer;
-template <class C>
-IsNotContainer IsContainerTest(long /* dummy */) { return '\0'; }
-
-// Trait to detect whether a type T is a hash table.
-// The heuristic used is that the type contains an inner type `hasher` and does
-// not contain an inner type `reverse_iterator`.
-// If the container is iterable in reverse, then order might actually matter.
-template <typename T>
-struct IsHashTable {
- private:
-  template <typename U>
-  static char test(typename U::hasher*, typename U::reverse_iterator*);
-  template <typename U>
-  static int test(typename U::hasher*, ...);
-  template <typename U>
-  static char test(...);
-
- public:
-  static const bool value = sizeof(test<T>(nullptr, nullptr)) == sizeof(int);
-};
-
-template <typename T>
-const bool IsHashTable<T>::value;
-
-template <typename C,
-          bool = sizeof(IsContainerTest<C>(0)) == sizeof(IsContainer)>
-struct IsRecursiveContainerImpl;
-
-template <typename C>
-struct IsRecursiveContainerImpl<C, false> : public std::false_type {};
-
-// Since the IsRecursiveContainerImpl depends on the IsContainerTest we need to
-// obey the same inconsistencies as the IsContainerTest, namely check if
-// something is a container is relying on only const_iterator in C++11 and
-// is relying on both const_iterator and iterator otherwise
-template <typename C>
-struct IsRecursiveContainerImpl<C, true> {
-  using value_type = decltype(*std::declval<typename C::const_iterator>());
-  using type =
-      std::is_same<typename std::remove_const<
-                       typename std::remove_reference<value_type>::type>::type,
-                   C>;
-};
-
-// IsRecursiveContainer<Type> is a unary compile-time predicate that
-// evaluates whether C is a recursive container type. A recursive container
-// type is a container type whose value_type is equal to the container type
-// itself. An example for a recursive container type is
-// boost::filesystem::path, whose iterator has a value_type that is equal to
-// boost::filesystem::path.
-template <typename C>
-struct IsRecursiveContainer : public IsRecursiveContainerImpl<C>::type {};
-
-// Utilities for native arrays.
-
-// ArrayEq() compares two k-dimensional native arrays using the
-// elements' operator==, where k can be any integer >= 0.  When k is
-// 0, ArrayEq() degenerates into comparing a single pair of values.
-
-template <typename T, typename U>
-bool ArrayEq(const T* lhs, size_t size, const U* rhs);
-
-// This generic version is used when k is 0.
-template <typename T, typename U>
-inline bool ArrayEq(const T& lhs, const U& rhs) { return lhs == rhs; }
-
-// This overload is used when k >= 1.
-template <typename T, typename U, size_t N>
-inline bool ArrayEq(const T(&lhs)[N], const U(&rhs)[N]) {
-  return internal::ArrayEq(lhs, N, rhs);
-}
-
-// This helper reduces code bloat.  If we instead put its logic inside
-// the previous ArrayEq() function, arrays with different sizes would
-// lead to different copies of the template code.
-template <typename T, typename U>
-bool ArrayEq(const T* lhs, size_t size, const U* rhs) {
-  for (size_t i = 0; i != size; i++) {
-    if (!internal::ArrayEq(lhs[i], rhs[i]))
-      return false;
-  }
-  return true;
-}
-
-// Finds the first element in the iterator range [begin, end) that
-// equals elem.  Element may be a native array type itself.
-template <typename Iter, typename Element>
-Iter ArrayAwareFind(Iter begin, Iter end, const Element& elem) {
-  for (Iter it = begin; it != end; ++it) {
-    if (internal::ArrayEq(*it, elem))
-      return it;
-  }
-  return end;
-}
-
-// CopyArray() copies a k-dimensional native array using the elements'
-// operator=, where k can be any integer >= 0.  When k is 0,
-// CopyArray() degenerates into copying a single value.
-
-template <typename T, typename U>
-void CopyArray(const T* from, size_t size, U* to);
-
-// This generic version is used when k is 0.
-template <typename T, typename U>
-inline void CopyArray(const T& from, U* to) { *to = from; }
-
-// This overload is used when k >= 1.
-template <typename T, typename U, size_t N>
-inline void CopyArray(const T(&from)[N], U(*to)[N]) {
-  internal::CopyArray(from, N, *to);
-}
-
-// This helper reduces code bloat.  If we instead put its logic inside
-// the previous CopyArray() function, arrays with different sizes
-// would lead to different copies of the template code.
-template <typename T, typename U>
-void CopyArray(const T* from, size_t size, U* to) {
-  for (size_t i = 0; i != size; i++) {
-    internal::CopyArray(from[i], to + i);
-  }
-}
-
-// The relation between an NativeArray object (see below) and the
-// native array it represents.
-// We use 2 different structs to allow non-copyable types to be used, as long
-// as RelationToSourceReference() is passed.
-struct RelationToSourceReference {};
-struct RelationToSourceCopy {};
-
-// Adapts a native array to a read-only STL-style container.  Instead
-// of the complete STL container concept, this adaptor only implements
-// members useful for Google Mock's container matchers.  New members
-// should be added as needed.  To simplify the implementation, we only
-// support Element being a raw type (i.e. having no top-level const or
-// reference modifier).  It's the client's responsibility to satisfy
-// this requirement.  Element can be an array type itself (hence
-// multi-dimensional arrays are supported).
-template <typename Element>
-class NativeArray {
- public:
-  // STL-style container typedefs.
-  typedef Element value_type;
-  typedef Element* iterator;
-  typedef const Element* const_iterator;
-
-  // Constructs from a native array. References the source.
-  NativeArray(const Element* array, size_t count, RelationToSourceReference) {
-    InitRef(array, count);
-  }
-
-  // Constructs from a native array. Copies the source.
-  NativeArray(const Element* array, size_t count, RelationToSourceCopy) {
-    InitCopy(array, count);
-  }
-
-  // Copy constructor.
-  NativeArray(const NativeArray& rhs) {
-    (this->*rhs.clone_)(rhs.array_, rhs.size_);
-  }
-
-  ~NativeArray() {
-    if (clone_ != &NativeArray::InitRef)
-      delete[] array_;
-  }
-
-  // STL-style container methods.
-  size_t size() const { return size_; }
-  const_iterator begin() const { return array_; }
-  const_iterator end() const { return array_ + size_; }
-  bool operator==(const NativeArray& rhs) const {
-    return size() == rhs.size() &&
-        ArrayEq(begin(), size(), rhs.begin());
-  }
-
- private:
-  static_assert(!std::is_const<Element>::value, "Type must not be const");
-  static_assert(!std::is_reference<Element>::value,
-                "Type must not be a reference");
-
-  // Initializes this object with a copy of the input.
-  void InitCopy(const Element* array, size_t a_size) {
-    Element* const copy = new Element[a_size];
-    CopyArray(array, a_size, copy);
-    array_ = copy;
-    size_ = a_size;
-    clone_ = &NativeArray::InitCopy;
-  }
-
-  // Initializes this object with a reference of the input.
-  void InitRef(const Element* array, size_t a_size) {
-    array_ = array;
-    size_ = a_size;
-    clone_ = &NativeArray::InitRef;
-  }
-
-  const Element* array_;
-  size_t size_;
-  void (NativeArray::*clone_)(const Element*, size_t);
-
-  GTEST_DISALLOW_ASSIGN_(NativeArray);
-};
-
-// Backport of std::index_sequence.
-template <size_t... Is>
-struct IndexSequence {
-  using type = IndexSequence;
-};
-
-// Double the IndexSequence, and one if plus_one is true.
-template <bool plus_one, typename T, size_t sizeofT>
-struct DoubleSequence;
-template <size_t... I, size_t sizeofT>
-struct DoubleSequence<true, IndexSequence<I...>, sizeofT> {
-  using type = IndexSequence<I..., (sizeofT + I)..., 2 * sizeofT>;
-};
-template <size_t... I, size_t sizeofT>
-struct DoubleSequence<false, IndexSequence<I...>, sizeofT> {
-  using type = IndexSequence<I..., (sizeofT + I)...>;
-};
-
-// Backport of std::make_index_sequence.
-// It uses O(ln(N)) instantiation depth.
-template <size_t N>
-struct MakeIndexSequence
-    : DoubleSequence<N % 2 == 1, typename MakeIndexSequence<N / 2>::type,
-                     N / 2>::type {};
-
-template <>
-struct MakeIndexSequence<0> : IndexSequence<> {};
-
-// FIXME: This implementation of ElemFromList is O(1) in instantiation depth,
-// but it is O(N^2) in total instantiations. Not sure if this is the best
-// tradeoff, as it will make it somewhat slow to compile.
-template <typename T, size_t, size_t>
-struct ElemFromListImpl {};
-
-template <typename T, size_t I>
-struct ElemFromListImpl<T, I, I> {
-  using type = T;
-};
-
-// Get the Nth element from T...
-// It uses O(1) instantiation depth.
-template <size_t N, typename I, typename... T>
-struct ElemFromList;
-
-template <size_t N, size_t... I, typename... T>
-struct ElemFromList<N, IndexSequence<I...>, T...>
-    : ElemFromListImpl<T, N, I>... {};
-
-template <typename... T>
-class FlatTuple;
-
-template <typename Derived, size_t I>
-struct FlatTupleElemBase;
-
-template <typename... T, size_t I>
-struct FlatTupleElemBase<FlatTuple<T...>, I> {
-  using value_type =
-      typename ElemFromList<I, typename MakeIndexSequence<sizeof...(T)>::type,
-                            T...>::type;
-  FlatTupleElemBase() = default;
-  explicit FlatTupleElemBase(value_type t) : value(std::move(t)) {}
-  value_type value;
-};
-
-template <typename Derived, typename Idx>
-struct FlatTupleBase;
-
-template <size_t... Idx, typename... T>
-struct FlatTupleBase<FlatTuple<T...>, IndexSequence<Idx...>>
-    : FlatTupleElemBase<FlatTuple<T...>, Idx>... {
-  using Indices = IndexSequence<Idx...>;
-  FlatTupleBase() = default;
-  explicit FlatTupleBase(T... t)
-      : FlatTupleElemBase<FlatTuple<T...>, Idx>(std::move(t))... {}
-};
-
-// Analog to std::tuple but with different tradeoffs.
-// This class minimizes the template instantiation depth, thus allowing more
-// elements that std::tuple would. std::tuple has been seen to require an
-// instantiation depth of more than 10x the number of elements in some
-// implementations.
-// FlatTuple and ElemFromList are not recursive and have a fixed depth
-// regardless of T...
-// MakeIndexSequence, on the other hand, it is recursive but with an
-// instantiation depth of O(ln(N)).
-template <typename... T>
-class FlatTuple
-    : private FlatTupleBase<FlatTuple<T...>,
-                            typename MakeIndexSequence<sizeof...(T)>::type> {
-  using Indices = typename FlatTuple::FlatTupleBase::Indices;
-
- public:
-  FlatTuple() = default;
-  explicit FlatTuple(T... t) : FlatTuple::FlatTupleBase(std::move(t)...) {}
-
-  template <size_t I>
-  const typename ElemFromList<I, Indices, T...>::type& Get() const {
-    return static_cast<const FlatTupleElemBase<FlatTuple, I>*>(this)->value;
-  }
-
-  template <size_t I>
-  typename ElemFromList<I, Indices, T...>::type& Get() {
-    return static_cast<FlatTupleElemBase<FlatTuple, I>*>(this)->value;
-  }
-};
-
-// Utility functions to be called with static_assert to induce deprecation
-// warnings.
-GTEST_INTERNAL_DEPRECATED(
-    "INSTANTIATE_TEST_CASE_P is deprecated, please use "
-    "INSTANTIATE_TEST_SUITE_P")
-constexpr bool InstantiateTestCase_P_IsDeprecated() { return true; }
-
-GTEST_INTERNAL_DEPRECATED(
-    "TYPED_TEST_CASE_P is deprecated, please use "
-    "TYPED_TEST_SUITE_P")
-constexpr bool TypedTestCase_P_IsDeprecated() { return true; }
-
-GTEST_INTERNAL_DEPRECATED(
-    "TYPED_TEST_CASE is deprecated, please use "
-    "TYPED_TEST_SUITE")
-constexpr bool TypedTestCaseIsDeprecated() { return true; }
-
-GTEST_INTERNAL_DEPRECATED(
-    "REGISTER_TYPED_TEST_CASE_P is deprecated, please use "
-    "REGISTER_TYPED_TEST_SUITE_P")
-constexpr bool RegisterTypedTestCase_P_IsDeprecated() { return true; }
-
-GTEST_INTERNAL_DEPRECATED(
-    "INSTANTIATE_TYPED_TEST_CASE_P is deprecated, please use "
-    "INSTANTIATE_TYPED_TEST_SUITE_P")
-constexpr bool InstantiateTypedTestCase_P_IsDeprecated() { return true; }
-
-}  // namespace internal
-}  // namespace testing
-
-#define GTEST_MESSAGE_AT_(file, line, message, result_type) \
-  ::testing::internal::AssertHelper(result_type, file, line, message) \
-    = ::testing::Message()
-
-#define GTEST_MESSAGE_(message, result_type) \
-  GTEST_MESSAGE_AT_(__FILE__, __LINE__, message, result_type)
-
-#define GTEST_FATAL_FAILURE_(message) \
-  return GTEST_MESSAGE_(message, ::testing::TestPartResult::kFatalFailure)
-
-#define GTEST_NONFATAL_FAILURE_(message) \
-  GTEST_MESSAGE_(message, ::testing::TestPartResult::kNonFatalFailure)
-
-#define GTEST_SUCCESS_(message) \
-  GTEST_MESSAGE_(message, ::testing::TestPartResult::kSuccess)
-
-#define GTEST_SKIP_(message) \
-  return GTEST_MESSAGE_(message, ::testing::TestPartResult::kSkip)
-
-// Suppress MSVC warning 4072 (unreachable code) for the code following
-// statement if it returns or throws (or doesn't return or throw in some
-// situations).
-#define GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement) \
-  if (::testing::internal::AlwaysTrue()) { statement; }
-
-#define GTEST_TEST_THROW_(statement, expected_exception, fail) \
-  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
-  if (::testing::internal::ConstCharPtr gtest_msg = "") { \
-    bool gtest_caught_expected = false; \
-    try { \
-      GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
-    } \
-    catch (expected_exception const&) { \
-      gtest_caught_expected = true; \
-    } \
-    catch (...) { \
-      gtest_msg.value = \
-          "Expected: " #statement " throws an exception of type " \
-          #expected_exception ".\n  Actual: it throws a different type."; \
-      goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \
-    } \
-    if (!gtest_caught_expected) { \
-      gtest_msg.value = \
-          "Expected: " #statement " throws an exception of type " \
-          #expected_exception ".\n  Actual: it throws nothing."; \
-      goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \
-    } \
-  } else \
-    GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__): \
-      fail(gtest_msg.value)
-
-#define GTEST_TEST_NO_THROW_(statement, fail) \
-  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
-  if (::testing::internal::AlwaysTrue()) { \
-    try { \
-      GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
-    } \
-    catch (...) { \
-      goto GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__); \
-    } \
-  } else \
-    GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__): \
-      fail("Expected: " #statement " doesn't throw an exception.\n" \
-           "  Actual: it throws.")
-
-#define GTEST_TEST_ANY_THROW_(statement, fail) \
-  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
-  if (::testing::internal::AlwaysTrue()) { \
-    bool gtest_caught_any = false; \
-    try { \
-      GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
-    } \
-    catch (...) { \
-      gtest_caught_any = true; \
-    } \
-    if (!gtest_caught_any) { \
-      goto GTEST_CONCAT_TOKEN_(gtest_label_testanythrow_, __LINE__); \
-    } \
-  } else \
-    GTEST_CONCAT_TOKEN_(gtest_label_testanythrow_, __LINE__): \
-      fail("Expected: " #statement " throws an exception.\n" \
-           "  Actual: it doesn't.")
-
-
-// Implements Boolean test assertions such as EXPECT_TRUE. expression can be
-// either a boolean expression or an AssertionResult. text is a textual
-// represenation of expression as it was passed into the EXPECT_TRUE.
-#define GTEST_TEST_BOOLEAN_(expression, text, actual, expected, fail) \
-  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
-  if (const ::testing::AssertionResult gtest_ar_ = \
-      ::testing::AssertionResult(expression)) \
-    ; \
-  else \
-    fail(::testing::internal::GetBoolAssertionFailureMessage(\
-        gtest_ar_, text, #actual, #expected).c_str())
-
-#define GTEST_TEST_NO_FATAL_FAILURE_(statement, fail) \
-  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
-  if (::testing::internal::AlwaysTrue()) { \
-    ::testing::internal::HasNewFatalFailureHelper gtest_fatal_failure_checker; \
-    GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
-    if (gtest_fatal_failure_checker.has_new_fatal_failure()) { \
-      goto GTEST_CONCAT_TOKEN_(gtest_label_testnofatal_, __LINE__); \
-    } \
-  } else \
-    GTEST_CONCAT_TOKEN_(gtest_label_testnofatal_, __LINE__): \
-      fail("Expected: " #statement " doesn't generate new fatal " \
-           "failures in the current thread.\n" \
-           "  Actual: it does.")
-
-// Expands to the name of the class that implements the given test.
-#define GTEST_TEST_CLASS_NAME_(test_suite_name, test_name) \
-  test_suite_name##_##test_name##_Test
-
-// Helper macro for defining tests.
-#define GTEST_TEST_(test_suite_name, test_name, parent_class, parent_id)      \
-  static_assert(sizeof(GTEST_STRINGIFY_(test_suite_name)) > 1,                \
-                "test_suite_name must not be empty");                         \
-  static_assert(sizeof(GTEST_STRINGIFY_(test_name)) > 1,                      \
-                "test_name must not be empty");                               \
-  class GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)                    \
-      : public parent_class {                                                 \
-   public:                                                                    \
-    GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)() {}                   \
-                                                                              \
-   private:                                                                   \
-    virtual void TestBody();                                                  \
-    static ::testing::TestInfo* const test_info_ GTEST_ATTRIBUTE_UNUSED_;     \
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(GTEST_TEST_CLASS_NAME_(test_suite_name,   \
-                                                           test_name));       \
-  };                                                                          \
-                                                                              \
-  ::testing::TestInfo* const GTEST_TEST_CLASS_NAME_(test_suite_name,          \
-                                                    test_name)::test_info_ =  \
-      ::testing::internal::MakeAndRegisterTestInfo(                           \
-          #test_suite_name, #test_name, nullptr, nullptr,                     \
-          ::testing::internal::CodeLocation(__FILE__, __LINE__), (parent_id), \
-          ::testing::internal::SuiteApiResolver<                              \
-              parent_class>::GetSetUpCaseOrSuite(__FILE__, __LINE__),         \
-          ::testing::internal::SuiteApiResolver<                              \
-              parent_class>::GetTearDownCaseOrSuite(__FILE__, __LINE__),      \
-          new ::testing::internal::TestFactoryImpl<GTEST_TEST_CLASS_NAME_(    \
-              test_suite_name, test_name)>);                                  \
-  void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::TestBody()
-
-#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-param-util.h b/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-param-util.h
deleted file mode 100644
index 97533993c0c..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-param-util.h
+++ /dev/null
@@ -1,883 +0,0 @@
-// Copyright 2008 Google Inc.
-// All Rights Reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Type and function utilities for implementing parameterized tests.
-
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
-#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
-
-#include <ctype.h>
-
-#include <cassert>
-#include <iterator>
-#include <memory>
-#include <set>
-#include <tuple>
-#include <utility>
-#include <vector>
-
-#include "gtest/internal/gtest-internal.h"
-#include "gtest/internal/gtest-port.h"
-#include "gtest/gtest-printers.h"
-
-namespace testing {
-// Input to a parameterized test name generator, describing a test parameter.
-// Consists of the parameter value and the integer parameter index.
-template <class ParamType>
-struct TestParamInfo {
-  TestParamInfo(const ParamType& a_param, size_t an_index) :
-    param(a_param),
-    index(an_index) {}
-  ParamType param;
-  size_t index;
-};
-
-// A builtin parameterized test name generator which returns the result of
-// testing::PrintToString.
-struct PrintToStringParamName {
-  template <class ParamType>
-  std::string operator()(const TestParamInfo<ParamType>& info) const {
-    return PrintToString(info.param);
-  }
-};
-
-namespace internal {
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-// Utility Functions
-
-// Outputs a message explaining invalid registration of different
-// fixture class for the same test suite. This may happen when
-// TEST_P macro is used to define two tests with the same name
-// but in different namespaces.
-GTEST_API_ void ReportInvalidTestSuiteType(const char* test_suite_name,
-                                           CodeLocation code_location);
-
-template <typename> class ParamGeneratorInterface;
-template <typename> class ParamGenerator;
-
-// Interface for iterating over elements provided by an implementation
-// of ParamGeneratorInterface<T>.
-template <typename T>
-class ParamIteratorInterface {
- public:
-  virtual ~ParamIteratorInterface() {}
-  // A pointer to the base generator instance.
-  // Used only for the purposes of iterator comparison
-  // to make sure that two iterators belong to the same generator.
-  virtual const ParamGeneratorInterface<T>* BaseGenerator() const = 0;
-  // Advances iterator to point to the next element
-  // provided by the generator. The caller is responsible
-  // for not calling Advance() on an iterator equal to
-  // BaseGenerator()->End().
-  virtual void Advance() = 0;
-  // Clones the iterator object. Used for implementing copy semantics
-  // of ParamIterator<T>.
-  virtual ParamIteratorInterface* Clone() const = 0;
-  // Dereferences the current iterator and provides (read-only) access
-  // to the pointed value. It is the caller's responsibility not to call
-  // Current() on an iterator equal to BaseGenerator()->End().
-  // Used for implementing ParamGenerator<T>::operator*().
-  virtual const T* Current() const = 0;
-  // Determines whether the given iterator and other point to the same
-  // element in the sequence generated by the generator.
-  // Used for implementing ParamGenerator<T>::operator==().
-  virtual bool Equals(const ParamIteratorInterface& other) const = 0;
-};
-
-// Class iterating over elements provided by an implementation of
-// ParamGeneratorInterface<T>. It wraps ParamIteratorInterface<T>
-// and implements the const forward iterator concept.
-template <typename T>
-class ParamIterator {
- public:
-  typedef T value_type;
-  typedef const T& reference;
-  typedef ptrdiff_t difference_type;
-
-  // ParamIterator assumes ownership of the impl_ pointer.
-  ParamIterator(const ParamIterator& other) : impl_(other.impl_->Clone()) {}
-  ParamIterator& operator=(const ParamIterator& other) {
-    if (this != &other)
-      impl_.reset(other.impl_->Clone());
-    return *this;
-  }
-
-  const T& operator*() const { return *impl_->Current(); }
-  const T* operator->() const { return impl_->Current(); }
-  // Prefix version of operator++.
-  ParamIterator& operator++() {
-    impl_->Advance();
-    return *this;
-  }
-  // Postfix version of operator++.
-  ParamIterator operator++(int /*unused*/) {
-    ParamIteratorInterface<T>* clone = impl_->Clone();
-    impl_->Advance();
-    return ParamIterator(clone);
-  }
-  bool operator==(const ParamIterator& other) const {
-    return impl_.get() == other.impl_.get() || impl_->Equals(*other.impl_);
-  }
-  bool operator!=(const ParamIterator& other) const {
-    return !(*this == other);
-  }
-
- private:
-  friend class ParamGenerator<T>;
-  explicit ParamIterator(ParamIteratorInterface<T>* impl) : impl_(impl) {}
-  std::unique_ptr<ParamIteratorInterface<T> > impl_;
-};
-
-// ParamGeneratorInterface<T> is the binary interface to access generators
-// defined in other translation units.
-template <typename T>
-class ParamGeneratorInterface {
- public:
-  typedef T ParamType;
-
-  virtual ~ParamGeneratorInterface() {}
-
-  // Generator interface definition
-  virtual ParamIteratorInterface<T>* Begin() const = 0;
-  virtual ParamIteratorInterface<T>* End() const = 0;
-};
-
-// Wraps ParamGeneratorInterface<T> and provides general generator syntax
-// compatible with the STL Container concept.
-// This class implements copy initialization semantics and the contained
-// ParamGeneratorInterface<T> instance is shared among all copies
-// of the original object. This is possible because that instance is immutable.
-template<typename T>
-class ParamGenerator {
- public:
-  typedef ParamIterator<T> iterator;
-
-  explicit ParamGenerator(ParamGeneratorInterface<T>* impl) : impl_(impl) {}
-  ParamGenerator(const ParamGenerator& other) : impl_(other.impl_) {}
-
-  ParamGenerator& operator=(const ParamGenerator& other) {
-    impl_ = other.impl_;
-    return *this;
-  }
-
-  iterator begin() const { return iterator(impl_->Begin()); }
-  iterator end() const { return iterator(impl_->End()); }
-
- private:
-  std::shared_ptr<const ParamGeneratorInterface<T> > impl_;
-};
-
-// Generates values from a range of two comparable values. Can be used to
-// generate sequences of user-defined types that implement operator+() and
-// operator<().
-// This class is used in the Range() function.
-template <typename T, typename IncrementT>
-class RangeGenerator : public ParamGeneratorInterface<T> {
- public:
-  RangeGenerator(T begin, T end, IncrementT step)
-      : begin_(begin), end_(end),
-        step_(step), end_index_(CalculateEndIndex(begin, end, step)) {}
-  ~RangeGenerator() override {}
-
-  ParamIteratorInterface<T>* Begin() const override {
-    return new Iterator(this, begin_, 0, step_);
-  }
-  ParamIteratorInterface<T>* End() const override {
-    return new Iterator(this, end_, end_index_, step_);
-  }
-
- private:
-  class Iterator : public ParamIteratorInterface<T> {
-   public:
-    Iterator(const ParamGeneratorInterface<T>* base, T value, int index,
-             IncrementT step)
-        : base_(base), value_(value), index_(index), step_(step) {}
-    ~Iterator() override {}
-
-    const ParamGeneratorInterface<T>* BaseGenerator() const override {
-      return base_;
-    }
-    void Advance() override {
-      value_ = static_cast<T>(value_ + step_);
-      index_++;
-    }
-    ParamIteratorInterface<T>* Clone() const override {
-      return new Iterator(*this);
-    }
-    const T* Current() const override { return &value_; }
-    bool Equals(const ParamIteratorInterface<T>& other) const override {
-      // Having the same base generator guarantees that the other
-      // iterator is of the same type and we can downcast.
-      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
-          << "The program attempted to compare iterators "
-          << "from different generators." << std::endl;
-      const int other_index =
-          CheckedDowncastToActualType<const Iterator>(&other)->index_;
-      return index_ == other_index;
-    }
-
-   private:
-    Iterator(const Iterator& other)
-        : ParamIteratorInterface<T>(),
-          base_(other.base_), value_(other.value_), index_(other.index_),
-          step_(other.step_) {}
-
-    // No implementation - assignment is unsupported.
-    void operator=(const Iterator& other);
-
-    const ParamGeneratorInterface<T>* const base_;
-    T value_;
-    int index_;
-    const IncrementT step_;
-  };  // class RangeGenerator::Iterator
-
-  static int CalculateEndIndex(const T& begin,
-                               const T& end,
-                               const IncrementT& step) {
-    int end_index = 0;
-    for (T i = begin; i < end; i = static_cast<T>(i + step))
-      end_index++;
-    return end_index;
-  }
-
-  // No implementation - assignment is unsupported.
-  void operator=(const RangeGenerator& other);
-
-  const T begin_;
-  const T end_;
-  const IncrementT step_;
-  // The index for the end() iterator. All the elements in the generated
-  // sequence are indexed (0-based) to aid iterator comparison.
-  const int end_index_;
-};  // class RangeGenerator
-
-
-// Generates values from a pair of STL-style iterators. Used in the
-// ValuesIn() function. The elements are copied from the source range
-// since the source can be located on the stack, and the generator
-// is likely to persist beyond that stack frame.
-template <typename T>
-class ValuesInIteratorRangeGenerator : public ParamGeneratorInterface<T> {
- public:
-  template <typename ForwardIterator>
-  ValuesInIteratorRangeGenerator(ForwardIterator begin, ForwardIterator end)
-      : container_(begin, end) {}
-  ~ValuesInIteratorRangeGenerator() override {}
-
-  ParamIteratorInterface<T>* Begin() const override {
-    return new Iterator(this, container_.begin());
-  }
-  ParamIteratorInterface<T>* End() const override {
-    return new Iterator(this, container_.end());
-  }
-
- private:
-  typedef typename ::std::vector<T> ContainerType;
-
-  class Iterator : public ParamIteratorInterface<T> {
-   public:
-    Iterator(const ParamGeneratorInterface<T>* base,
-             typename ContainerType::const_iterator iterator)
-        : base_(base), iterator_(iterator) {}
-    ~Iterator() override {}
-
-    const ParamGeneratorInterface<T>* BaseGenerator() const override {
-      return base_;
-    }
-    void Advance() override {
-      ++iterator_;
-      value_.reset();
-    }
-    ParamIteratorInterface<T>* Clone() const override {
-      return new Iterator(*this);
-    }
-    // We need to use cached value referenced by iterator_ because *iterator_
-    // can return a temporary object (and of type other then T), so just
-    // having "return &*iterator_;" doesn't work.
-    // value_ is updated here and not in Advance() because Advance()
-    // can advance iterator_ beyond the end of the range, and we cannot
-    // detect that fact. The client code, on the other hand, is
-    // responsible for not calling Current() on an out-of-range iterator.
-    const T* Current() const override {
-      if (value_.get() == nullptr) value_.reset(new T(*iterator_));
-      return value_.get();
-    }
-    bool Equals(const ParamIteratorInterface<T>& other) const override {
-      // Having the same base generator guarantees that the other
-      // iterator is of the same type and we can downcast.
-      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
-          << "The program attempted to compare iterators "
-          << "from different generators." << std::endl;
-      return iterator_ ==
-          CheckedDowncastToActualType<const Iterator>(&other)->iterator_;
-    }
-
-   private:
-    Iterator(const Iterator& other)
-          // The explicit constructor call suppresses a false warning
-          // emitted by gcc when supplied with the -Wextra option.
-        : ParamIteratorInterface<T>(),
-          base_(other.base_),
-          iterator_(other.iterator_) {}
-
-    const ParamGeneratorInterface<T>* const base_;
-    typename ContainerType::const_iterator iterator_;
-    // A cached value of *iterator_. We keep it here to allow access by
-    // pointer in the wrapping iterator's operator->().
-    // value_ needs to be mutable to be accessed in Current().
-    // Use of std::unique_ptr helps manage cached value's lifetime,
-    // which is bound by the lifespan of the iterator itself.
-    mutable std::unique_ptr<const T> value_;
-  };  // class ValuesInIteratorRangeGenerator::Iterator
-
-  // No implementation - assignment is unsupported.
-  void operator=(const ValuesInIteratorRangeGenerator& other);
-
-  const ContainerType container_;
-};  // class ValuesInIteratorRangeGenerator
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-//
-// Default parameterized test name generator, returns a string containing the
-// integer test parameter index.
-template <class ParamType>
-std::string DefaultParamName(const TestParamInfo<ParamType>& info) {
-  Message name_stream;
-  name_stream << info.index;
-  return name_stream.GetString();
-}
-
-template <typename T = int>
-void TestNotEmpty() {
-  static_assert(sizeof(T) == 0, "Empty arguments are not allowed.");
-}
-template <typename T = int>
-void TestNotEmpty(const T&) {}
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-//
-// Stores a parameter value and later creates tests parameterized with that
-// value.
-template <class TestClass>
-class ParameterizedTestFactory : public TestFactoryBase {
- public:
-  typedef typename TestClass::ParamType ParamType;
-  explicit ParameterizedTestFactory(ParamType parameter) :
-      parameter_(parameter) {}
-  Test* CreateTest() override {
-    TestClass::SetParam(&parameter_);
-    return new TestClass();
-  }
-
- private:
-  const ParamType parameter_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestFactory);
-};
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-//
-// TestMetaFactoryBase is a base class for meta-factories that create
-// test factories for passing into MakeAndRegisterTestInfo function.
-template <class ParamType>
-class TestMetaFactoryBase {
- public:
-  virtual ~TestMetaFactoryBase() {}
-
-  virtual TestFactoryBase* CreateTestFactory(ParamType parameter) = 0;
-};
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-//
-// TestMetaFactory creates test factories for passing into
-// MakeAndRegisterTestInfo function. Since MakeAndRegisterTestInfo receives
-// ownership of test factory pointer, same factory object cannot be passed
-// into that method twice. But ParameterizedTestSuiteInfo is going to call
-// it for each Test/Parameter value combination. Thus it needs meta factory
-// creator class.
-template <class TestSuite>
-class TestMetaFactory
-    : public TestMetaFactoryBase<typename TestSuite::ParamType> {
- public:
-  using ParamType = typename TestSuite::ParamType;
-
-  TestMetaFactory() {}
-
-  TestFactoryBase* CreateTestFactory(ParamType parameter) override {
-    return new ParameterizedTestFactory<TestSuite>(parameter);
-  }
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestMetaFactory);
-};
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-//
-// ParameterizedTestSuiteInfoBase is a generic interface
-// to ParameterizedTestSuiteInfo classes. ParameterizedTestSuiteInfoBase
-// accumulates test information provided by TEST_P macro invocations
-// and generators provided by INSTANTIATE_TEST_SUITE_P macro invocations
-// and uses that information to register all resulting test instances
-// in RegisterTests method. The ParameterizeTestSuiteRegistry class holds
-// a collection of pointers to the ParameterizedTestSuiteInfo objects
-// and calls RegisterTests() on each of them when asked.
-class ParameterizedTestSuiteInfoBase {
- public:
-  virtual ~ParameterizedTestSuiteInfoBase() {}
-
-  // Base part of test suite name for display purposes.
-  virtual const std::string& GetTestSuiteName() const = 0;
-  // Test case id to verify identity.
-  virtual TypeId GetTestSuiteTypeId() const = 0;
-  // UnitTest class invokes this method to register tests in this
-  // test suite right before running them in RUN_ALL_TESTS macro.
-  // This method should not be called more than once on any single
-  // instance of a ParameterizedTestSuiteInfoBase derived class.
-  virtual void RegisterTests() = 0;
-
- protected:
-  ParameterizedTestSuiteInfoBase() {}
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestSuiteInfoBase);
-};
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-//
-// ParameterizedTestSuiteInfo accumulates tests obtained from TEST_P
-// macro invocations for a particular test suite and generators
-// obtained from INSTANTIATE_TEST_SUITE_P macro invocations for that
-// test suite. It registers tests with all values generated by all
-// generators when asked.
-template <class TestSuite>
-class ParameterizedTestSuiteInfo : public ParameterizedTestSuiteInfoBase {
- public:
-  // ParamType and GeneratorCreationFunc are private types but are required
-  // for declarations of public methods AddTestPattern() and
-  // AddTestSuiteInstantiation().
-  using ParamType = typename TestSuite::ParamType;
-  // A function that returns an instance of appropriate generator type.
-  typedef ParamGenerator<ParamType>(GeneratorCreationFunc)();
-  using ParamNameGeneratorFunc = std::string(const TestParamInfo<ParamType>&);
-
-  explicit ParameterizedTestSuiteInfo(const char* name,
-                                      CodeLocation code_location)
-      : test_suite_name_(name), code_location_(code_location) {}
-
-  // Test case base name for display purposes.
-  const std::string& GetTestSuiteName() const override {
-    return test_suite_name_;
-  }
-  // Test case id to verify identity.
-  TypeId GetTestSuiteTypeId() const override { return GetTypeId<TestSuite>(); }
-  // TEST_P macro uses AddTestPattern() to record information
-  // about a single test in a LocalTestInfo structure.
-  // test_suite_name is the base name of the test suite (without invocation
-  // prefix). test_base_name is the name of an individual test without
-  // parameter index. For the test SequenceA/FooTest.DoBar/1 FooTest is
-  // test suite base name and DoBar is test base name.
-  void AddTestPattern(const char* test_suite_name, const char* test_base_name,
-                      TestMetaFactoryBase<ParamType>* meta_factory) {
-    tests_.push_back(std::shared_ptr<TestInfo>(
-        new TestInfo(test_suite_name, test_base_name, meta_factory)));
-  }
-  // INSTANTIATE_TEST_SUITE_P macro uses AddGenerator() to record information
-  // about a generator.
-  int AddTestSuiteInstantiation(const std::string& instantiation_name,
-                                GeneratorCreationFunc* func,
-                                ParamNameGeneratorFunc* name_func,
-                                const char* file, int line) {
-    instantiations_.push_back(
-        InstantiationInfo(instantiation_name, func, name_func, file, line));
-    return 0;  // Return value used only to run this method in namespace scope.
-  }
-  // UnitTest class invokes this method to register tests in this test suite
-  // test suites right before running tests in RUN_ALL_TESTS macro.
-  // This method should not be called more than once on any single
-  // instance of a ParameterizedTestSuiteInfoBase derived class.
-  // UnitTest has a guard to prevent from calling this method more than once.
-  void RegisterTests() override {
-    for (typename TestInfoContainer::iterator test_it = tests_.begin();
-         test_it != tests_.end(); ++test_it) {
-      std::shared_ptr<TestInfo> test_info = *test_it;
-      for (typename InstantiationContainer::iterator gen_it =
-               instantiations_.begin(); gen_it != instantiations_.end();
-               ++gen_it) {
-        const std::string& instantiation_name = gen_it->name;
-        ParamGenerator<ParamType> generator((*gen_it->generator)());
-        ParamNameGeneratorFunc* name_func = gen_it->name_func;
-        const char* file = gen_it->file;
-        int line = gen_it->line;
-
-        std::string test_suite_name;
-        if ( !instantiation_name.empty() )
-          test_suite_name = instantiation_name + "/";
-        test_suite_name += test_info->test_suite_base_name;
-
-        size_t i = 0;
-        std::set<std::string> test_param_names;
-        for (typename ParamGenerator<ParamType>::iterator param_it =
-                 generator.begin();
-             param_it != generator.end(); ++param_it, ++i) {
-          Message test_name_stream;
-
-          std::string param_name = name_func(
-              TestParamInfo<ParamType>(*param_it, i));
-
-          GTEST_CHECK_(IsValidParamName(param_name))
-              << "Parameterized test name '" << param_name
-              << "' is invalid, in " << file
-              << " line " << line << std::endl;
-
-          GTEST_CHECK_(test_param_names.count(param_name) == 0)
-              << "Duplicate parameterized test name '" << param_name
-              << "', in " << file << " line " << line << std::endl;
-
-          test_param_names.insert(param_name);
-
-          if (!test_info->test_base_name.empty()) {
-            test_name_stream << test_info->test_base_name << "/";
-          }
-          test_name_stream << param_name;
-          MakeAndRegisterTestInfo(
-              test_suite_name.c_str(), test_name_stream.GetString().c_str(),
-              nullptr,  // No type parameter.
-              PrintToString(*param_it).c_str(), code_location_,
-              GetTestSuiteTypeId(),
-              SuiteApiResolver<TestSuite>::GetSetUpCaseOrSuite(file, line),
-              SuiteApiResolver<TestSuite>::GetTearDownCaseOrSuite(file, line),
-              test_info->test_meta_factory->CreateTestFactory(*param_it));
-        }  // for param_it
-      }  // for gen_it
-    }  // for test_it
-  }    // RegisterTests
-
- private:
-  // LocalTestInfo structure keeps information about a single test registered
-  // with TEST_P macro.
-  struct TestInfo {
-    TestInfo(const char* a_test_suite_base_name, const char* a_test_base_name,
-             TestMetaFactoryBase<ParamType>* a_test_meta_factory)
-        : test_suite_base_name(a_test_suite_base_name),
-          test_base_name(a_test_base_name),
-          test_meta_factory(a_test_meta_factory) {}
-
-    const std::string test_suite_base_name;
-    const std::string test_base_name;
-    const std::unique_ptr<TestMetaFactoryBase<ParamType> > test_meta_factory;
-  };
-  using TestInfoContainer = ::std::vector<std::shared_ptr<TestInfo> >;
-  // Records data received from INSTANTIATE_TEST_SUITE_P macros:
-  //  <Instantiation name, Sequence generator creation function,
-  //     Name generator function, Source file, Source line>
-  struct InstantiationInfo {
-      InstantiationInfo(const std::string &name_in,
-                        GeneratorCreationFunc* generator_in,
-                        ParamNameGeneratorFunc* name_func_in,
-                        const char* file_in,
-                        int line_in)
-          : name(name_in),
-            generator(generator_in),
-            name_func(name_func_in),
-            file(file_in),
-            line(line_in) {}
-
-      std::string name;
-      GeneratorCreationFunc* generator;
-      ParamNameGeneratorFunc* name_func;
-      const char* file;
-      int line;
-  };
-  typedef ::std::vector<InstantiationInfo> InstantiationContainer;
-
-  static bool IsValidParamName(const std::string& name) {
-    // Check for empty string
-    if (name.empty())
-      return false;
-
-    // Check for invalid characters
-    for (std::string::size_type index = 0; index < name.size(); ++index) {
-      if (!isalnum(name[index]) && name[index] != '_')
-        return false;
-    }
-
-    return true;
-  }
-
-  const std::string test_suite_name_;
-  CodeLocation code_location_;
-  TestInfoContainer tests_;
-  InstantiationContainer instantiations_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestSuiteInfo);
-};  // class ParameterizedTestSuiteInfo
-
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-template <class TestCase>
-using ParameterizedTestCaseInfo = ParameterizedTestSuiteInfo<TestCase>;
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-//
-// ParameterizedTestSuiteRegistry contains a map of
-// ParameterizedTestSuiteInfoBase classes accessed by test suite names. TEST_P
-// and INSTANTIATE_TEST_SUITE_P macros use it to locate their corresponding
-// ParameterizedTestSuiteInfo descriptors.
-class ParameterizedTestSuiteRegistry {
- public:
-  ParameterizedTestSuiteRegistry() {}
-  ~ParameterizedTestSuiteRegistry() {
-    for (auto& test_suite_info : test_suite_infos_) {
-      delete test_suite_info;
-    }
-  }
-
-  // Looks up or creates and returns a structure containing information about
-  // tests and instantiations of a particular test suite.
-  template <class TestSuite>
-  ParameterizedTestSuiteInfo<TestSuite>* GetTestSuitePatternHolder(
-      const char* test_suite_name, CodeLocation code_location) {
-    ParameterizedTestSuiteInfo<TestSuite>* typed_test_info = nullptr;
-    for (auto& test_suite_info : test_suite_infos_) {
-      if (test_suite_info->GetTestSuiteName() == test_suite_name) {
-        if (test_suite_info->GetTestSuiteTypeId() != GetTypeId<TestSuite>()) {
-          // Complain about incorrect usage of Google Test facilities
-          // and terminate the program since we cannot guaranty correct
-          // test suite setup and tear-down in this case.
-          ReportInvalidTestSuiteType(test_suite_name, code_location);
-          posix::Abort();
-        } else {
-          // At this point we are sure that the object we found is of the same
-          // type we are looking for, so we downcast it to that type
-          // without further checks.
-          typed_test_info = CheckedDowncastToActualType<
-              ParameterizedTestSuiteInfo<TestSuite> >(test_suite_info);
-        }
-        break;
-      }
-    }
-    if (typed_test_info == nullptr) {
-      typed_test_info = new ParameterizedTestSuiteInfo<TestSuite>(
-          test_suite_name, code_location);
-      test_suite_infos_.push_back(typed_test_info);
-    }
-    return typed_test_info;
-  }
-  void RegisterTests() {
-    for (auto& test_suite_info : test_suite_infos_) {
-      test_suite_info->RegisterTests();
-    }
-  }
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  template <class TestCase>
-  ParameterizedTestCaseInfo<TestCase>* GetTestCasePatternHolder(
-      const char* test_case_name, CodeLocation code_location) {
-    return GetTestSuitePatternHolder<TestCase>(test_case_name, code_location);
-  }
-
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
- private:
-  using TestSuiteInfoContainer = ::std::vector<ParameterizedTestSuiteInfoBase*>;
-
-  TestSuiteInfoContainer test_suite_infos_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestSuiteRegistry);
-};
-
-}  // namespace internal
-
-// Forward declarations of ValuesIn(), which is implemented in
-// include/gtest/gtest-param-test.h.
-template <class Container>
-internal::ParamGenerator<typename Container::value_type> ValuesIn(
-    const Container& container);
-
-namespace internal {
-// Used in the Values() function to provide polymorphic capabilities.
-
-template <typename... Ts>
-class ValueArray {
- public:
-  ValueArray(Ts... v) : v_{std::move(v)...} {}
-
-  template <typename T>
-  operator ParamGenerator<T>() const {  // NOLINT
-    return ValuesIn(MakeVector<T>(MakeIndexSequence<sizeof...(Ts)>()));
-  }
-
- private:
-  template <typename T, size_t... I>
-  std::vector<T> MakeVector(IndexSequence<I...>) const {
-    return std::vector<T>{static_cast<T>(v_.template Get<I>())...};
-  }
-
-  FlatTuple<Ts...> v_;
-};
-
-template <typename... T>
-class CartesianProductGenerator
-    : public ParamGeneratorInterface<::std::tuple<T...>> {
- public:
-  typedef ::std::tuple<T...> ParamType;
-
-  CartesianProductGenerator(const std::tuple<ParamGenerator<T>...>& g)
-      : generators_(g) {}
-  ~CartesianProductGenerator() override {}
-
-  ParamIteratorInterface<ParamType>* Begin() const override {
-    return new Iterator(this, generators_, false);
-  }
-  ParamIteratorInterface<ParamType>* End() const override {
-    return new Iterator(this, generators_, true);
-  }
-
- private:
-  template <class I>
-  class IteratorImpl;
-  template <size_t... I>
-  class IteratorImpl<IndexSequence<I...>>
-      : public ParamIteratorInterface<ParamType> {
-   public:
-    IteratorImpl(const ParamGeneratorInterface<ParamType>* base,
-             const std::tuple<ParamGenerator<T>...>& generators, bool is_end)
-        : base_(base),
-          begin_(std::get<I>(generators).begin()...),
-          end_(std::get<I>(generators).end()...),
-          current_(is_end ? end_ : begin_) {
-      ComputeCurrentValue();
-    }
-    ~IteratorImpl() override {}
-
-    const ParamGeneratorInterface<ParamType>* BaseGenerator() const override {
-      return base_;
-    }
-    // Advance should not be called on beyond-of-range iterators
-    // so no component iterators must be beyond end of range, either.
-    void Advance() override {
-      assert(!AtEnd());
-      // Advance the last iterator.
-      ++std::get<sizeof...(T) - 1>(current_);
-      // if that reaches end, propagate that up.
-      AdvanceIfEnd<sizeof...(T) - 1>();
-      ComputeCurrentValue();
-    }
-    ParamIteratorInterface<ParamType>* Clone() const override {
-      return new IteratorImpl(*this);
-    }
-
-    const ParamType* Current() const override { return current_value_.get(); }
-
-    bool Equals(const ParamIteratorInterface<ParamType>& other) const override {
-      // Having the same base generator guarantees that the other
-      // iterator is of the same type and we can downcast.
-      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
-          << "The program attempted to compare iterators "
-          << "from different generators." << std::endl;
-      const IteratorImpl* typed_other =
-          CheckedDowncastToActualType<const IteratorImpl>(&other);
-
-      // We must report iterators equal if they both point beyond their
-      // respective ranges. That can happen in a variety of fashions,
-      // so we have to consult AtEnd().
-      if (AtEnd() && typed_other->AtEnd()) return true;
-
-      bool same = true;
-      bool dummy[] = {
-          (same = same && std::get<I>(current_) ==
-                              std::get<I>(typed_other->current_))...};
-      (void)dummy;
-      return same;
-    }
-
-   private:
-    template <size_t ThisI>
-    void AdvanceIfEnd() {
-      if (std::get<ThisI>(current_) != std::get<ThisI>(end_)) return;
-
-      bool last = ThisI == 0;
-      if (last) {
-        // We are done. Nothing else to propagate.
-        return;
-      }
-
-      constexpr size_t NextI = ThisI - (ThisI != 0);
-      std::get<ThisI>(current_) = std::get<ThisI>(begin_);
-      ++std::get<NextI>(current_);
-      AdvanceIfEnd<NextI>();
-    }
-
-    void ComputeCurrentValue() {
-      if (!AtEnd())
-        current_value_ = std::make_shared<ParamType>(*std::get<I>(current_)...);
-    }
-    bool AtEnd() const {
-      bool at_end = false;
-      bool dummy[] = {
-          (at_end = at_end || std::get<I>(current_) == std::get<I>(end_))...};
-      (void)dummy;
-      return at_end;
-    }
-
-    const ParamGeneratorInterface<ParamType>* const base_;
-    std::tuple<typename ParamGenerator<T>::iterator...> begin_;
-    std::tuple<typename ParamGenerator<T>::iterator...> end_;
-    std::tuple<typename ParamGenerator<T>::iterator...> current_;
-    std::shared_ptr<ParamType> current_value_;
-  };
-
-  using Iterator = IteratorImpl<typename MakeIndexSequence<sizeof...(T)>::type>;
-
-  std::tuple<ParamGenerator<T>...> generators_;
-};
-
-template <class... Gen>
-class CartesianProductHolder {
- public:
-  CartesianProductHolder(const Gen&... g) : generators_(g...) {}
-  template <typename... T>
-  operator ParamGenerator<::std::tuple<T...>>() const {
-    return ParamGenerator<::std::tuple<T...>>(
-        new CartesianProductGenerator<T...>(generators_));
-  }
-
- private:
-  std::tuple<Gen...> generators_;
-};
-
-}  // namespace internal
-}  // namespace testing
-
-#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port-arch.h b/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port-arch.h
deleted file mode 100644
index cece93dba12..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port-arch.h
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright 2015, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// The Google C++ Testing and Mocking Framework (Google Test)
-//
-// This header file defines the GTEST_OS_* macro.
-// It is separate from gtest-port.h so that custom/gtest-port.h can include it.
-
-#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_
-#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_
-
-// Determines the platform on which Google Test is compiled.
-#ifdef __CYGWIN__
-# define GTEST_OS_CYGWIN 1
-# elif defined(__MINGW__) || defined(__MINGW32__) || defined(__MINGW64__)
-#  define GTEST_OS_WINDOWS_MINGW 1
-#  define GTEST_OS_WINDOWS 1
-#elif defined _WIN32
-# define GTEST_OS_WINDOWS 1
-# ifdef _WIN32_WCE
-#  define GTEST_OS_WINDOWS_MOBILE 1
-# elif defined(WINAPI_FAMILY)
-#  include <winapifamily.h>
-#  if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
-#   define GTEST_OS_WINDOWS_DESKTOP 1
-#  elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PHONE_APP)
-#   define GTEST_OS_WINDOWS_PHONE 1
-#  elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
-#   define GTEST_OS_WINDOWS_RT 1
-#  elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_TV_TITLE)
-#   define GTEST_OS_WINDOWS_PHONE 1
-#   define GTEST_OS_WINDOWS_TV_TITLE 1
-#  else
-    // WINAPI_FAMILY defined but no known partition matched.
-    // Default to desktop.
-#   define GTEST_OS_WINDOWS_DESKTOP 1
-#  endif
-# else
-#  define GTEST_OS_WINDOWS_DESKTOP 1
-# endif  // _WIN32_WCE
-#elif defined __OS2__
-# define GTEST_OS_OS2 1
-#elif defined __APPLE__
-# define GTEST_OS_MAC 1
-# if TARGET_OS_IPHONE
-#  define GTEST_OS_IOS 1
-# endif
-#elif defined __DragonFly__
-# define GTEST_OS_DRAGONFLY 1
-#elif defined __FreeBSD__
-# define GTEST_OS_FREEBSD 1
-#elif defined __Fuchsia__
-# define GTEST_OS_FUCHSIA 1
-#elif defined(__GLIBC__) && defined(__FreeBSD_kernel__)
-# define GTEST_OS_GNU_KFREEBSD 1
-#elif defined __linux__
-# define GTEST_OS_LINUX 1
-# if defined __ANDROID__
-#  define GTEST_OS_LINUX_ANDROID 1
-# endif
-#elif defined __MVS__
-# define GTEST_OS_ZOS 1
-#elif defined(__sun) && defined(__SVR4)
-# define GTEST_OS_SOLARIS 1
-#elif defined(_AIX)
-# define GTEST_OS_AIX 1
-#elif defined(__hpux)
-# define GTEST_OS_HPUX 1
-#elif defined __native_client__
-# define GTEST_OS_NACL 1
-#elif defined __NetBSD__
-# define GTEST_OS_NETBSD 1
-#elif defined __OpenBSD__
-# define GTEST_OS_OPENBSD 1
-#elif defined __QNX__
-# define GTEST_OS_QNX 1
-#elif defined(__HAIKU__)
-#define GTEST_OS_HAIKU 1
-#endif  // __CYGWIN__
-
-#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h b/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h
deleted file mode 100644
index 063fcb1083b..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h
+++ /dev/null
@@ -1,2231 +0,0 @@
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Low-level types and utilities for porting Google Test to various
-// platforms.  All macros ending with _ and symbols defined in an
-// internal namespace are subject to change without notice.  Code
-// outside Google Test MUST NOT USE THEM DIRECTLY.  Macros that don't
-// end with _ are part of Google Test's public API and can be used by
-// code outside Google Test.
-//
-// This file is fundamental to Google Test.  All other Google Test source
-// files are expected to #include this.  Therefore, it cannot #include
-// any other Google Test header.
-
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
-#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
-
-// Environment-describing macros
-// -----------------------------
-//
-// Google Test can be used in many different environments.  Macros in
-// this section tell Google Test what kind of environment it is being
-// used in, such that Google Test can provide environment-specific
-// features and implementations.
-//
-// Google Test tries to automatically detect the properties of its
-// environment, so users usually don't need to worry about these
-// macros.  However, the automatic detection is not perfect.
-// Sometimes it's necessary for a user to define some of the following
-// macros in the build script to override Google Test's decisions.
-//
-// If the user doesn't define a macro in the list, Google Test will
-// provide a default definition.  After this header is #included, all
-// macros in this list will be defined to either 1 or 0.
-//
-// Notes to maintainers:
-//   - Each macro here is a user-tweakable knob; do not grow the list
-//     lightly.
-//   - Use #if to key off these macros.  Don't use #ifdef or "#if
-//     defined(...)", which will not work as these macros are ALWAYS
-//     defined.
-//
-//   GTEST_HAS_CLONE          - Define it to 1/0 to indicate that clone(2)
-//                              is/isn't available.
-//   GTEST_HAS_EXCEPTIONS     - Define it to 1/0 to indicate that exceptions
-//                              are enabled.
-//   GTEST_HAS_POSIX_RE       - Define it to 1/0 to indicate that POSIX regular
-//                              expressions are/aren't available.
-//   GTEST_HAS_PTHREAD        - Define it to 1/0 to indicate that <pthread.h>
-//                              is/isn't available.
-//   GTEST_HAS_RTTI           - Define it to 1/0 to indicate that RTTI is/isn't
-//                              enabled.
-//   GTEST_HAS_STD_WSTRING    - Define it to 1/0 to indicate that
-//                              std::wstring does/doesn't work (Google Test can
-//                              be used where std::wstring is unavailable).
-//   GTEST_HAS_SEH            - Define it to 1/0 to indicate whether the
-//                              compiler supports Microsoft's "Structured
-//                              Exception Handling".
-//   GTEST_HAS_STREAM_REDIRECTION
-//                            - Define it to 1/0 to indicate whether the
-//                              platform supports I/O stream redirection using
-//                              dup() and dup2().
-//   GTEST_LINKED_AS_SHARED_LIBRARY
-//                            - Define to 1 when compiling tests that use
-//                              Google Test as a shared library (known as
-//                              DLL on Windows).
-//   GTEST_CREATE_SHARED_LIBRARY
-//                            - Define to 1 when compiling Google Test itself
-//                              as a shared library.
-//   GTEST_DEFAULT_DEATH_TEST_STYLE
-//                            - The default value of --gtest_death_test_style.
-//                              The legacy default has been "fast" in the open
-//                              source version since 2008. The recommended value
-//                              is "threadsafe", and can be set in
-//                              custom/gtest-port.h.
-
-// Platform-indicating macros
-// --------------------------
-//
-// Macros indicating the platform on which Google Test is being used
-// (a macro is defined to 1 if compiled on the given platform;
-// otherwise UNDEFINED -- it's never defined to 0.).  Google Test
-// defines these macros automatically.  Code outside Google Test MUST
-// NOT define them.
-//
-//   GTEST_OS_AIX      - IBM AIX
-//   GTEST_OS_CYGWIN   - Cygwin
-//   GTEST_OS_DRAGONFLY - DragonFlyBSD
-//   GTEST_OS_FREEBSD  - FreeBSD
-//   GTEST_OS_FUCHSIA  - Fuchsia
-//   GTEST_OS_GNU_KFREEBSD - GNU/kFreeBSD
-//   GTEST_OS_HAIKU    - Haiku
-//   GTEST_OS_HPUX     - HP-UX
-//   GTEST_OS_LINUX    - Linux
-//     GTEST_OS_LINUX_ANDROID - Google Android
-//   GTEST_OS_MAC      - Mac OS X
-//     GTEST_OS_IOS    - iOS
-//   GTEST_OS_NACL     - Google Native Client (NaCl)
-//   GTEST_OS_NETBSD   - NetBSD
-//   GTEST_OS_OPENBSD  - OpenBSD
-//   GTEST_OS_OS2      - OS/2
-//   GTEST_OS_QNX      - QNX
-//   GTEST_OS_SOLARIS  - Sun Solaris
-//   GTEST_OS_WINDOWS  - Windows (Desktop, MinGW, or Mobile)
-//     GTEST_OS_WINDOWS_DESKTOP  - Windows Desktop
-//     GTEST_OS_WINDOWS_MINGW    - MinGW
-//     GTEST_OS_WINDOWS_MOBILE   - Windows Mobile
-//     GTEST_OS_WINDOWS_PHONE    - Windows Phone
-//     GTEST_OS_WINDOWS_RT       - Windows Store App/WinRT
-//   GTEST_OS_ZOS      - z/OS
-//
-// Among the platforms, Cygwin, Linux, Mac OS X, and Windows have the
-// most stable support.  Since core members of the Google Test project
-// don't have access to other platforms, support for them may be less
-// stable.  If you notice any problems on your platform, please notify
-// googletestframework@googlegroups.com (patches for fixing them are
-// even more welcome!).
-//
-// It is possible that none of the GTEST_OS_* macros are defined.
-
-// Feature-indicating macros
-// -------------------------
-//
-// Macros indicating which Google Test features are available (a macro
-// is defined to 1 if the corresponding feature is supported;
-// otherwise UNDEFINED -- it's never defined to 0.).  Google Test
-// defines these macros automatically.  Code outside Google Test MUST
-// NOT define them.
-//
-// These macros are public so that portable tests can be written.
-// Such tests typically surround code using a feature with an #if
-// which controls that code.  For example:
-//
-// #if GTEST_HAS_DEATH_TEST
-//   EXPECT_DEATH(DoSomethingDeadly());
-// #endif
-//
-//   GTEST_HAS_DEATH_TEST   - death tests
-//   GTEST_HAS_TYPED_TEST   - typed tests
-//   GTEST_HAS_TYPED_TEST_P - type-parameterized tests
-//   GTEST_IS_THREADSAFE    - Google Test is thread-safe.
-//   GOOGLETEST_CM0007 DO NOT DELETE
-//   GTEST_USES_POSIX_RE    - enhanced POSIX regex is used. Do not confuse with
-//                            GTEST_HAS_POSIX_RE (see above) which users can
-//                            define themselves.
-//   GTEST_USES_SIMPLE_RE   - our own simple regex is used;
-//                            the above RE\b(s) are mutually exclusive.
-
-// Misc public macros
-// ------------------
-//
-//   GTEST_FLAG(flag_name)  - references the variable corresponding to
-//                            the given Google Test flag.
-
-// Internal utilities
-// ------------------
-//
-// The following macros and utilities are for Google Test's INTERNAL
-// use only.  Code outside Google Test MUST NOT USE THEM DIRECTLY.
-//
-// Macros for basic C++ coding:
-//   GTEST_AMBIGUOUS_ELSE_BLOCKER_ - for disabling a gcc warning.
-//   GTEST_ATTRIBUTE_UNUSED_  - declares that a class' instances or a
-//                              variable don't have to be used.
-//   GTEST_DISALLOW_ASSIGN_   - disables operator=.
-//   GTEST_DISALLOW_COPY_AND_ASSIGN_ - disables copy ctor and operator=.
-//   GTEST_MUST_USE_RESULT_   - declares that a function's result must be used.
-//   GTEST_INTENTIONAL_CONST_COND_PUSH_ - start code section where MSVC C4127 is
-//                                        suppressed (constant conditional).
-//   GTEST_INTENTIONAL_CONST_COND_POP_  - finish code section where MSVC C4127
-//                                        is suppressed.
-//
-// Synchronization:
-//   Mutex, MutexLock, ThreadLocal, GetThreadCount()
-//                            - synchronization primitives.
-//
-// Regular expressions:
-//   RE             - a simple regular expression class using the POSIX
-//                    Extended Regular Expression syntax on UNIX-like platforms
-//                    GOOGLETEST_CM0008 DO NOT DELETE
-//                    or a reduced regular exception syntax on other
-//                    platforms, including Windows.
-// Logging:
-//   GTEST_LOG_()   - logs messages at the specified severity level.
-//   LogToStderr()  - directs all log messages to stderr.
-//   FlushInfoLog() - flushes informational log messages.
-//
-// Stdout and stderr capturing:
-//   CaptureStdout()     - starts capturing stdout.
-//   GetCapturedStdout() - stops capturing stdout and returns the captured
-//                         string.
-//   CaptureStderr()     - starts capturing stderr.
-//   GetCapturedStderr() - stops capturing stderr and returns the captured
-//                         string.
-//
-// Integer types:
-//   TypeWithSize   - maps an integer to a int type.
-//   Int32, UInt32, Int64, UInt64, TimeInMillis
-//                  - integers of known sizes.
-//   BiggestInt     - the biggest signed integer type.
-//
-// Command-line utilities:
-//   GTEST_DECLARE_*()  - declares a flag.
-//   GTEST_DEFINE_*()   - defines a flag.
-//   GetInjectableArgvs() - returns the command line as a vector of strings.
-//
-// Environment variable utilities:
-//   GetEnv()             - gets the value of an environment variable.
-//   BoolFromGTestEnv()   - parses a bool environment variable.
-//   Int32FromGTestEnv()  - parses an Int32 environment variable.
-//   StringFromGTestEnv() - parses a string environment variable.
-//
-// Deprecation warnings:
-//   GTEST_INTERNAL_DEPRECATED(message) - attribute marking a function as
-//                                        deprecated; calling a marked function
-//                                        should generate a compiler warning
-
-#include <ctype.h>   // for isspace, etc
-#include <stddef.h>  // for ptrdiff_t
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <memory>
-#include <type_traits>
-
-#ifndef _WIN32_WCE
-# include <sys/types.h>
-# include <sys/stat.h>
-#endif  // !_WIN32_WCE
-
-#if defined __APPLE__
-# include <AvailabilityMacros.h>
-# include <TargetConditionals.h>
-#endif
-
-#include <algorithm>  // NOLINT
-#include <iostream>   // NOLINT
-#include <sstream>    // NOLINT
-#include <string>     // NOLINT
-#include <tuple>
-#include <utility>
-#include <vector>  // NOLINT
-
-#include "gtest/internal/gtest-port-arch.h"
-#include "gtest/internal/custom/gtest-port.h"
-
-#if !defined(GTEST_DEV_EMAIL_)
-# define GTEST_DEV_EMAIL_ "googletestframework@@googlegroups.com"
-# define GTEST_FLAG_PREFIX_ "gtest_"
-# define GTEST_FLAG_PREFIX_DASH_ "gtest-"
-# define GTEST_FLAG_PREFIX_UPPER_ "GTEST_"
-# define GTEST_NAME_ "Google Test"
-# define GTEST_PROJECT_URL_ "https://github.com/google/googletest/"
-#endif  // !defined(GTEST_DEV_EMAIL_)
-
-#if !defined(GTEST_INIT_GOOGLE_TEST_NAME_)
-# define GTEST_INIT_GOOGLE_TEST_NAME_ "testing::InitGoogleTest"
-#endif  // !defined(GTEST_INIT_GOOGLE_TEST_NAME_)
-
-// Determines the version of gcc that is used to compile this.
-#ifdef __GNUC__
-// 40302 means version 4.3.2.
-# define GTEST_GCC_VER_ \
-    (__GNUC__*10000 + __GNUC_MINOR__*100 + __GNUC_PATCHLEVEL__)
-#endif  // __GNUC__
-
-// Macros for disabling Microsoft Visual C++ warnings.
-//
-//   GTEST_DISABLE_MSC_WARNINGS_PUSH_(4800 4385)
-//   /* code that triggers warnings C4800 and C4385 */
-//   GTEST_DISABLE_MSC_WARNINGS_POP_()
-#if defined(_MSC_VER)
-# define GTEST_DISABLE_MSC_WARNINGS_PUSH_(warnings) \
-    __pragma(warning(push))                        \
-    __pragma(warning(disable: warnings))
-# define GTEST_DISABLE_MSC_WARNINGS_POP_()          \
-    __pragma(warning(pop))
-#else
-// Not all compilers are MSVC
-# define GTEST_DISABLE_MSC_WARNINGS_PUSH_(warnings)
-# define GTEST_DISABLE_MSC_WARNINGS_POP_()
-#endif
-
-// Clang on Windows does not understand MSVC's pragma warning.
-// We need clang-specific way to disable function deprecation warning.
-#ifdef __clang__
-# define GTEST_DISABLE_MSC_DEPRECATED_PUSH_()                         \
-    _Pragma("clang diagnostic push")                                  \
-    _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"") \
-    _Pragma("clang diagnostic ignored \"-Wdeprecated-implementations\"")
-#define GTEST_DISABLE_MSC_DEPRECATED_POP_() \
-    _Pragma("clang diagnostic pop")
-#else
-# define GTEST_DISABLE_MSC_DEPRECATED_PUSH_() \
-    GTEST_DISABLE_MSC_WARNINGS_PUSH_(4996)
-# define GTEST_DISABLE_MSC_DEPRECATED_POP_() \
-    GTEST_DISABLE_MSC_WARNINGS_POP_()
-#endif
-
-// Brings in definitions for functions used in the testing::internal::posix
-// namespace (read, write, close, chdir, isatty, stat). We do not currently
-// use them on Windows Mobile.
-#if GTEST_OS_WINDOWS
-# if !GTEST_OS_WINDOWS_MOBILE
-#  include <direct.h>
-#  include <io.h>
-# endif
-// In order to avoid having to include <windows.h>, use forward declaration
-#if GTEST_OS_WINDOWS_MINGW && !defined(__MINGW64_VERSION_MAJOR)
-// MinGW defined _CRITICAL_SECTION and _RTL_CRITICAL_SECTION as two
-// separate (equivalent) structs, instead of using typedef
-typedef struct _CRITICAL_SECTION GTEST_CRITICAL_SECTION;
-#else
-// Assume CRITICAL_SECTION is a typedef of _RTL_CRITICAL_SECTION.
-// This assumption is verified by
-// WindowsTypesTest.CRITICAL_SECTIONIs_RTL_CRITICAL_SECTION.
-typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
-#endif
-#else
-// This assumes that non-Windows OSes provide unistd.h. For OSes where this
-// is not the case, we need to include headers that provide the functions
-// mentioned above.
-# include <unistd.h>
-# include <strings.h>
-#endif  // GTEST_OS_WINDOWS
-
-#if GTEST_OS_LINUX_ANDROID
-// Used to define __ANDROID_API__ matching the target NDK API level.
-#  include <android/api-level.h>  // NOLINT
-#endif
-
-// Defines this to true if and only if Google Test can use POSIX regular
-// expressions.
-#ifndef GTEST_HAS_POSIX_RE
-# if GTEST_OS_LINUX_ANDROID
-// On Android, <regex.h> is only available starting with Gingerbread.
-#  define GTEST_HAS_POSIX_RE (__ANDROID_API__ >= 9)
-# else
-#  define GTEST_HAS_POSIX_RE (!GTEST_OS_WINDOWS)
-# endif
-#endif
-
-#if GTEST_USES_PCRE
-// The appropriate headers have already been included.
-
-#elif GTEST_HAS_POSIX_RE
-
-// On some platforms, <regex.h> needs someone to define size_t, and
-// won't compile otherwise.  We can #include it here as we already
-// included <stdlib.h>, which is guaranteed to define size_t through
-// <stddef.h>.
-# include <regex.h>  // NOLINT
-
-# define GTEST_USES_POSIX_RE 1
-
-#elif GTEST_OS_WINDOWS
-
-// <regex.h> is not available on Windows.  Use our own simple regex
-// implementation instead.
-# define GTEST_USES_SIMPLE_RE 1
-
-#else
-
-// <regex.h> may not be available on this platform.  Use our own
-// simple regex implementation instead.
-# define GTEST_USES_SIMPLE_RE 1
-
-#endif  // GTEST_USES_PCRE
-
-#ifndef GTEST_HAS_EXCEPTIONS
-// The user didn't tell us whether exceptions are enabled, so we need
-// to figure it out.
-# if defined(_MSC_VER) && defined(_CPPUNWIND)
-// MSVC defines _CPPUNWIND to 1 if and only if exceptions are enabled.
-#  define GTEST_HAS_EXCEPTIONS 1
-# elif defined(__BORLANDC__)
-// C++Builder's implementation of the STL uses the _HAS_EXCEPTIONS
-// macro to enable exceptions, so we'll do the same.
-// Assumes that exceptions are enabled by default.
-#  ifndef _HAS_EXCEPTIONS
-#   define _HAS_EXCEPTIONS 1
-#  endif  // _HAS_EXCEPTIONS
-#  define GTEST_HAS_EXCEPTIONS _HAS_EXCEPTIONS
-# elif defined(__clang__)
-// clang defines __EXCEPTIONS if and only if exceptions are enabled before clang
-// 220714, but if and only if cleanups are enabled after that. In Obj-C++ files,
-// there can be cleanups for ObjC exceptions which also need cleanups, even if
-// C++ exceptions are disabled. clang has __has_feature(cxx_exceptions) which
-// checks for C++ exceptions starting at clang r206352, but which checked for
-// cleanups prior to that. To reliably check for C++ exception availability with
-// clang, check for
-// __EXCEPTIONS && __has_feature(cxx_exceptions).
-#  define GTEST_HAS_EXCEPTIONS (__EXCEPTIONS && __has_feature(cxx_exceptions))
-# elif defined(__GNUC__) && __EXCEPTIONS
-// gcc defines __EXCEPTIONS to 1 if and only if exceptions are enabled.
-#  define GTEST_HAS_EXCEPTIONS 1
-# elif defined(__SUNPRO_CC)
-// Sun Pro CC supports exceptions.  However, there is no compile-time way of
-// detecting whether they are enabled or not.  Therefore, we assume that
-// they are enabled unless the user tells us otherwise.
-#  define GTEST_HAS_EXCEPTIONS 1
-# elif defined(__IBMCPP__) && __EXCEPTIONS
-// xlC defines __EXCEPTIONS to 1 if and only if exceptions are enabled.
-#  define GTEST_HAS_EXCEPTIONS 1
-# elif defined(__HP_aCC)
-// Exception handling is in effect by default in HP aCC compiler. It has to
-// be turned of by +noeh compiler option if desired.
-#  define GTEST_HAS_EXCEPTIONS 1
-# else
-// For other compilers, we assume exceptions are disabled to be
-// conservative.
-#  define GTEST_HAS_EXCEPTIONS 0
-# endif  // defined(_MSC_VER) || defined(__BORLANDC__)
-#endif  // GTEST_HAS_EXCEPTIONS
-
-#if !defined(GTEST_HAS_STD_STRING)
-// Even though we don't use this macro any longer, we keep it in case
-// some clients still depend on it.
-# define GTEST_HAS_STD_STRING 1
-#elif !GTEST_HAS_STD_STRING
-// The user told us that ::std::string isn't available.
-# error "::std::string isn't available."
-#endif  // !defined(GTEST_HAS_STD_STRING)
-
-#ifndef GTEST_HAS_STD_WSTRING
-// The user didn't tell us whether ::std::wstring is available, so we need
-// to figure it out.
-// Cygwin 1.7 and below doesn't support ::std::wstring.
-// Solaris' libc++ doesn't support it either.  Android has
-// no support for it at least as recent as Froyo (2.2).
-#define GTEST_HAS_STD_WSTRING                                         \
-  (!(GTEST_OS_LINUX_ANDROID || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \
-     GTEST_OS_HAIKU))
-
-#endif  // GTEST_HAS_STD_WSTRING
-
-// Determines whether RTTI is available.
-#ifndef GTEST_HAS_RTTI
-// The user didn't tell us whether RTTI is enabled, so we need to
-// figure it out.
-
-# ifdef _MSC_VER
-
-#ifdef _CPPRTTI  // MSVC defines this macro if and only if RTTI is enabled.
-#   define GTEST_HAS_RTTI 1
-#  else
-#   define GTEST_HAS_RTTI 0
-#  endif
-
-// Starting with version 4.3.2, gcc defines __GXX_RTTI if and only if RTTI is
-// enabled.
-# elif defined(__GNUC__)
-
-#  ifdef __GXX_RTTI
-// When building against STLport with the Android NDK and with
-// -frtti -fno-exceptions, the build fails at link time with undefined
-// references to __cxa_bad_typeid. Note sure if STL or toolchain bug,
-// so disable RTTI when detected.
-#   if GTEST_OS_LINUX_ANDROID && defined(_STLPORT_MAJOR) && \
-       !defined(__EXCEPTIONS)
-#    define GTEST_HAS_RTTI 0
-#   else
-#    define GTEST_HAS_RTTI 1
-#   endif  // GTEST_OS_LINUX_ANDROID && __STLPORT_MAJOR && !__EXCEPTIONS
-#  else
-#   define GTEST_HAS_RTTI 0
-#  endif  // __GXX_RTTI
-
-// Clang defines __GXX_RTTI starting with version 3.0, but its manual recommends
-// using has_feature instead. has_feature(cxx_rtti) is supported since 2.7, the
-// first version with C++ support.
-# elif defined(__clang__)
-
-#  define GTEST_HAS_RTTI __has_feature(cxx_rtti)
-
-// Starting with version 9.0 IBM Visual Age defines __RTTI_ALL__ to 1 if
-// both the typeid and dynamic_cast features are present.
-# elif defined(__IBMCPP__) && (__IBMCPP__ >= 900)
-
-#  ifdef __RTTI_ALL__
-#   define GTEST_HAS_RTTI 1
-#  else
-#   define GTEST_HAS_RTTI 0
-#  endif
-
-# else
-
-// For all other compilers, we assume RTTI is enabled.
-#  define GTEST_HAS_RTTI 1
-
-# endif  // _MSC_VER
-
-#endif  // GTEST_HAS_RTTI
-
-// It's this header's responsibility to #include <typeinfo> when RTTI
-// is enabled.
-#if GTEST_HAS_RTTI
-# include <typeinfo>
-#endif
-
-// Determines whether Google Test can use the pthreads library.
-#ifndef GTEST_HAS_PTHREAD
-// The user didn't tell us explicitly, so we make reasonable assumptions about
-// which platforms have pthreads support.
-//
-// To disable threading support in Google Test, add -DGTEST_HAS_PTHREAD=0
-// to your compiler flags.
-#define GTEST_HAS_PTHREAD                                                      \
-  (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_HPUX || GTEST_OS_QNX ||          \
-   GTEST_OS_FREEBSD || GTEST_OS_NACL || GTEST_OS_NETBSD || GTEST_OS_FUCHSIA || \
-   GTEST_OS_DRAGONFLY || GTEST_OS_GNU_KFREEBSD || GTEST_OS_OPENBSD ||          \
-   GTEST_OS_HAIKU)
-#endif  // GTEST_HAS_PTHREAD
-
-#if GTEST_HAS_PTHREAD
-// gtest-port.h guarantees to #include <pthread.h> when GTEST_HAS_PTHREAD is
-// true.
-# include <pthread.h>  // NOLINT
-
-// For timespec and nanosleep, used below.
-# include <time.h>  // NOLINT
-#endif
-
-// Determines whether clone(2) is supported.
-// Usually it will only be available on Linux, excluding
-// Linux on the Itanium architecture.
-// Also see http://linux.die.net/man/2/clone.
-#ifndef GTEST_HAS_CLONE
-// The user didn't tell us, so we need to figure it out.
-
-# if GTEST_OS_LINUX && !defined(__ia64__)
-#  if GTEST_OS_LINUX_ANDROID
-// On Android, clone() became available at different API levels for each 32-bit
-// architecture.
-#    if defined(__LP64__) || \
-        (defined(__arm__) && __ANDROID_API__ >= 9) || \
-        (defined(__mips__) && __ANDROID_API__ >= 12) || \
-        (defined(__i386__) && __ANDROID_API__ >= 17)
-#     define GTEST_HAS_CLONE 1
-#    else
-#     define GTEST_HAS_CLONE 0
-#    endif
-#  else
-#   define GTEST_HAS_CLONE 1
-#  endif
-# else
-#  define GTEST_HAS_CLONE 0
-# endif  // GTEST_OS_LINUX && !defined(__ia64__)
-
-#endif  // GTEST_HAS_CLONE
-
-// Determines whether to support stream redirection. This is used to test
-// output correctness and to implement death tests.
-#ifndef GTEST_HAS_STREAM_REDIRECTION
-// By default, we assume that stream redirection is supported on all
-// platforms except known mobile ones.
-# if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT
-#  define GTEST_HAS_STREAM_REDIRECTION 0
-# else
-#  define GTEST_HAS_STREAM_REDIRECTION 1
-# endif  // !GTEST_OS_WINDOWS_MOBILE
-#endif  // GTEST_HAS_STREAM_REDIRECTION
-
-// Determines whether to support death tests.
-// pops up a dialog window that cannot be suppressed programmatically.
-#if (GTEST_OS_LINUX || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS ||             \
-     (GTEST_OS_MAC && !GTEST_OS_IOS) ||                                   \
-     (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER) || GTEST_OS_WINDOWS_MINGW ||  \
-     GTEST_OS_AIX || GTEST_OS_HPUX || GTEST_OS_OPENBSD || GTEST_OS_QNX || \
-     GTEST_OS_FREEBSD || GTEST_OS_NETBSD || GTEST_OS_FUCHSIA ||           \
-     GTEST_OS_DRAGONFLY || GTEST_OS_GNU_KFREEBSD || GTEST_OS_HAIKU)
-# define GTEST_HAS_DEATH_TEST 1
-#endif
-
-// Determines whether to support type-driven tests.
-
-// Typed tests need <typeinfo> and variadic macros, which GCC, VC++ 8.0,
-// Sun Pro CC, IBM Visual Age, and HP aCC support.
-#if defined(__GNUC__) || defined(_MSC_VER) || defined(__SUNPRO_CC) || \
-    defined(__IBMCPP__) || defined(__HP_aCC)
-# define GTEST_HAS_TYPED_TEST 1
-# define GTEST_HAS_TYPED_TEST_P 1
-#endif
-
-// Determines whether the system compiler uses UTF-16 for encoding wide strings.
-#define GTEST_WIDE_STRING_USES_UTF16_ \
-  (GTEST_OS_WINDOWS || GTEST_OS_CYGWIN || GTEST_OS_AIX || GTEST_OS_OS2)
-
-// Determines whether test results can be streamed to a socket.
-#if GTEST_OS_LINUX || GTEST_OS_GNU_KFREEBSD || GTEST_OS_DRAGONFLY || \
-    GTEST_OS_FREEBSD || GTEST_OS_NETBSD || GTEST_OS_OPENBSD
-# define GTEST_CAN_STREAM_RESULTS_ 1
-#endif
-
-// Defines some utility macros.
-
-// The GNU compiler emits a warning if nested "if" statements are followed by
-// an "else" statement and braces are not used to explicitly disambiguate the
-// "else" binding.  This leads to problems with code like:
-//
-//   if (gate)
-//     ASSERT_*(condition) << "Some message";
-//
-// The "switch (0) case 0:" idiom is used to suppress this.
-#ifdef __INTEL_COMPILER
-# define GTEST_AMBIGUOUS_ELSE_BLOCKER_
-#else
-# define GTEST_AMBIGUOUS_ELSE_BLOCKER_ switch (0) case 0: default:  // NOLINT
-#endif
-
-// Use this annotation at the end of a struct/class definition to
-// prevent the compiler from optimizing away instances that are never
-// used.  This is useful when all interesting logic happens inside the
-// c'tor and / or d'tor.  Example:
-//
-//   struct Foo {
-//     Foo() { ... }
-//   } GTEST_ATTRIBUTE_UNUSED_;
-//
-// Also use it after a variable or parameter declaration to tell the
-// compiler the variable/parameter does not have to be used.
-#if defined(__GNUC__) && !defined(COMPILER_ICC)
-# define GTEST_ATTRIBUTE_UNUSED_ __attribute__ ((unused))
-#elif defined(__clang__)
-# if __has_attribute(unused)
-#  define GTEST_ATTRIBUTE_UNUSED_ __attribute__ ((unused))
-# endif
-#endif
-#ifndef GTEST_ATTRIBUTE_UNUSED_
-# define GTEST_ATTRIBUTE_UNUSED_
-#endif
-
-// Use this annotation before a function that takes a printf format string.
-#if (defined(__GNUC__) || defined(__clang__)) && !defined(COMPILER_ICC)
-# if defined(__MINGW_PRINTF_FORMAT)
-// MinGW has two different printf implementations. Ensure the format macro
-// matches the selected implementation. See
-// https://sourceforge.net/p/mingw-w64/wiki2/gnu%20printf/.
-#  define GTEST_ATTRIBUTE_PRINTF_(string_index, first_to_check) \
-       __attribute__((__format__(__MINGW_PRINTF_FORMAT, string_index, \
-                                 first_to_check)))
-# else
-#  define GTEST_ATTRIBUTE_PRINTF_(string_index, first_to_check) \
-       __attribute__((__format__(__printf__, string_index, first_to_check)))
-# endif
-#else
-# define GTEST_ATTRIBUTE_PRINTF_(string_index, first_to_check)
-#endif
-
-
-// A macro to disallow operator=
-// This should be used in the private: declarations for a class.
-#define GTEST_DISALLOW_ASSIGN_(type) \
-  void operator=(type const &) = delete
-
-// A macro to disallow copy constructor and operator=
-// This should be used in the private: declarations for a class.
-#define GTEST_DISALLOW_COPY_AND_ASSIGN_(type) \
-  type(type const &) = delete; \
-  GTEST_DISALLOW_ASSIGN_(type)
-
-// Tell the compiler to warn about unused return values for functions declared
-// with this macro.  The macro should be used on function declarations
-// following the argument list:
-//
-//   Sprocket* AllocateSprocket() GTEST_MUST_USE_RESULT_;
-#if defined(__GNUC__) && !defined(COMPILER_ICC)
-# define GTEST_MUST_USE_RESULT_ __attribute__ ((warn_unused_result))
-#else
-# define GTEST_MUST_USE_RESULT_
-#endif  // __GNUC__ && !COMPILER_ICC
-
-// MS C++ compiler emits warning when a conditional expression is compile time
-// constant. In some contexts this warning is false positive and needs to be
-// suppressed. Use the following two macros in such cases:
-//
-// GTEST_INTENTIONAL_CONST_COND_PUSH_()
-// while (true) {
-// GTEST_INTENTIONAL_CONST_COND_POP_()
-// }
-# define GTEST_INTENTIONAL_CONST_COND_PUSH_() \
-    GTEST_DISABLE_MSC_WARNINGS_PUSH_(4127)
-# define GTEST_INTENTIONAL_CONST_COND_POP_() \
-    GTEST_DISABLE_MSC_WARNINGS_POP_()
-
-// Determine whether the compiler supports Microsoft's Structured Exception
-// Handling.  This is supported by several Windows compilers but generally
-// does not exist on any other system.
-#ifndef GTEST_HAS_SEH
-// The user didn't tell us, so we need to figure it out.
-
-# if defined(_MSC_VER) || defined(__BORLANDC__)
-// These two compilers are known to support SEH.
-#  define GTEST_HAS_SEH 1
-# else
-// Assume no SEH.
-#  define GTEST_HAS_SEH 0
-# endif
-
-#endif  // GTEST_HAS_SEH
-
-#ifndef GTEST_IS_THREADSAFE
-
-#define GTEST_IS_THREADSAFE                                                 \
-  (GTEST_HAS_MUTEX_AND_THREAD_LOCAL_ ||                                     \
-   (GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT) || \
-   GTEST_HAS_PTHREAD)
-
-#endif  // GTEST_IS_THREADSAFE
-
-// GTEST_API_ qualifies all symbols that must be exported. The definitions below
-// are guarded by #ifndef to give embedders a chance to define GTEST_API_ in
-// gtest/internal/custom/gtest-port.h
-#ifndef GTEST_API_
-
-#ifdef _MSC_VER
-# if GTEST_LINKED_AS_SHARED_LIBRARY
-#  define GTEST_API_ __declspec(dllimport)
-# elif GTEST_CREATE_SHARED_LIBRARY
-#  define GTEST_API_ __declspec(dllexport)
-# endif
-#elif __GNUC__ >= 4 || defined(__clang__)
-# define GTEST_API_ __attribute__((visibility ("default")))
-#endif  // _MSC_VER
-
-#endif  // GTEST_API_
-
-#ifndef GTEST_API_
-# define GTEST_API_
-#endif  // GTEST_API_
-
-#ifndef GTEST_DEFAULT_DEATH_TEST_STYLE
-# define GTEST_DEFAULT_DEATH_TEST_STYLE  "fast"
-#endif  // GTEST_DEFAULT_DEATH_TEST_STYLE
-
-#ifdef __GNUC__
-// Ask the compiler to never inline a given function.
-# define GTEST_NO_INLINE_ __attribute__((noinline))
-#else
-# define GTEST_NO_INLINE_
-#endif
-
-// _LIBCPP_VERSION is defined by the libc++ library from the LLVM project.
-#if !defined(GTEST_HAS_CXXABI_H_)
-# if defined(__GLIBCXX__) || (defined(_LIBCPP_VERSION) && !defined(_MSC_VER))
-#  define GTEST_HAS_CXXABI_H_ 1
-# else
-#  define GTEST_HAS_CXXABI_H_ 0
-# endif
-#endif
-
-// A function level attribute to disable checking for use of uninitialized
-// memory when built with MemorySanitizer.
-#if defined(__clang__)
-# if __has_feature(memory_sanitizer)
-#  define GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_ \
-       __attribute__((no_sanitize_memory))
-# else
-#  define GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
-# endif  // __has_feature(memory_sanitizer)
-#else
-# define GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
-#endif  // __clang__
-
-// A function level attribute to disable AddressSanitizer instrumentation.
-#if defined(__clang__)
-# if __has_feature(address_sanitizer)
-#  define GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_ \
-       __attribute__((no_sanitize_address))
-# else
-#  define GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
-# endif  // __has_feature(address_sanitizer)
-#else
-# define GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
-#endif  // __clang__
-
-// A function level attribute to disable HWAddressSanitizer instrumentation.
-#if defined(__clang__)
-# if __has_feature(hwaddress_sanitizer)
-#  define GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_ \
-       __attribute__((no_sanitize("hwaddress")))
-# else
-#  define GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
-# endif  // __has_feature(hwaddress_sanitizer)
-#else
-# define GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
-#endif  // __clang__
-
-// A function level attribute to disable ThreadSanitizer instrumentation.
-#if defined(__clang__)
-# if __has_feature(thread_sanitizer)
-#  define GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_ \
-       __attribute__((no_sanitize_thread))
-# else
-#  define GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
-# endif  // __has_feature(thread_sanitizer)
-#else
-# define GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
-#endif  // __clang__
-
-namespace testing {
-
-class Message;
-
-// Legacy imports for backwards compatibility.
-// New code should use std:: names directly.
-using std::get;
-using std::make_tuple;
-using std::tuple;
-using std::tuple_element;
-using std::tuple_size;
-
-namespace internal {
-
-// A secret type that Google Test users don't know about.  It has no
-// definition on purpose.  Therefore it's impossible to create a
-// Secret object, which is what we want.
-class Secret;
-
-// The GTEST_COMPILE_ASSERT_ is a legacy macro used to verify that a compile
-// time expression is true (in new code, use static_assert instead). For
-// example, you could use it to verify the size of a static array:
-//
-//   GTEST_COMPILE_ASSERT_(GTEST_ARRAY_SIZE_(names) == NUM_NAMES,
-//                         names_incorrect_size);
-//
-// The second argument to the macro must be a valid C++ identifier. If the
-// expression is false, compiler will issue an error containing this identifier.
-#define GTEST_COMPILE_ASSERT_(expr, msg) static_assert(expr, #msg)
-
-// Evaluates to the number of elements in 'array'.
-#define GTEST_ARRAY_SIZE_(array) (sizeof(array) / sizeof(array[0]))
-
-// A helper for suppressing warnings on constant condition.  It just
-// returns 'condition'.
-GTEST_API_ bool IsTrue(bool condition);
-
-// Defines RE.
-
-#if GTEST_USES_PCRE
-// if used, PCRE is injected by custom/gtest-port.h
-#elif GTEST_USES_POSIX_RE || GTEST_USES_SIMPLE_RE
-
-// A simple C++ wrapper for <regex.h>.  It uses the POSIX Extended
-// Regular Expression syntax.
-class GTEST_API_ RE {
- public:
-  // A copy constructor is required by the Standard to initialize object
-  // references from r-values.
-  RE(const RE& other) { Init(other.pattern()); }
-
-  // Constructs an RE from a string.
-  RE(const ::std::string& regex) { Init(regex.c_str()); }  // NOLINT
-
-  RE(const char* regex) { Init(regex); }  // NOLINT
-  ~RE();
-
-  // Returns the string representation of the regex.
-  const char* pattern() const { return pattern_; }
-
-  // FullMatch(str, re) returns true if and only if regular expression re
-  // matches the entire str.
-  // PartialMatch(str, re) returns true if and only if regular expression re
-  // matches a substring of str (including str itself).
-  static bool FullMatch(const ::std::string& str, const RE& re) {
-    return FullMatch(str.c_str(), re);
-  }
-  static bool PartialMatch(const ::std::string& str, const RE& re) {
-    return PartialMatch(str.c_str(), re);
-  }
-
-  static bool FullMatch(const char* str, const RE& re);
-  static bool PartialMatch(const char* str, const RE& re);
-
- private:
-  void Init(const char* regex);
-  const char* pattern_;
-  bool is_valid_;
-
-# if GTEST_USES_POSIX_RE
-
-  regex_t full_regex_;     // For FullMatch().
-  regex_t partial_regex_;  // For PartialMatch().
-
-# else  // GTEST_USES_SIMPLE_RE
-
-  const char* full_pattern_;  // For FullMatch();
-
-# endif
-
-  GTEST_DISALLOW_ASSIGN_(RE);
-};
-
-#endif  // GTEST_USES_PCRE
-
-// Formats a source file path and a line number as they would appear
-// in an error message from the compiler used to compile this code.
-GTEST_API_ ::std::string FormatFileLocation(const char* file, int line);
-
-// Formats a file location for compiler-independent XML output.
-// Although this function is not platform dependent, we put it next to
-// FormatFileLocation in order to contrast the two functions.
-GTEST_API_ ::std::string FormatCompilerIndependentFileLocation(const char* file,
-                                                               int line);
-
-// Defines logging utilities:
-//   GTEST_LOG_(severity) - logs messages at the specified severity level. The
-//                          message itself is streamed into the macro.
-//   LogToStderr()  - directs all log messages to stderr.
-//   FlushInfoLog() - flushes informational log messages.
-
-enum GTestLogSeverity {
-  GTEST_INFO,
-  GTEST_WARNING,
-  GTEST_ERROR,
-  GTEST_FATAL
-};
-
-// Formats log entry severity, provides a stream object for streaming the
-// log message, and terminates the message with a newline when going out of
-// scope.
-class GTEST_API_ GTestLog {
- public:
-  GTestLog(GTestLogSeverity severity, const char* file, int line);
-
-  // Flushes the buffers and, if severity is GTEST_FATAL, aborts the program.
-  ~GTestLog();
-
-  ::std::ostream& GetStream() { return ::std::cerr; }
-
- private:
-  const GTestLogSeverity severity_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(GTestLog);
-};
-
-#if !defined(GTEST_LOG_)
-
-# define GTEST_LOG_(severity) \
-    ::testing::internal::GTestLog(::testing::internal::GTEST_##severity, \
-                                  __FILE__, __LINE__).GetStream()
-
-inline void LogToStderr() {}
-inline void FlushInfoLog() { fflush(nullptr); }
-
-#endif  // !defined(GTEST_LOG_)
-
-#if !defined(GTEST_CHECK_)
-// INTERNAL IMPLEMENTATION - DO NOT USE.
-//
-// GTEST_CHECK_ is an all-mode assert. It aborts the program if the condition
-// is not satisfied.
-//  Synopsys:
-//    GTEST_CHECK_(boolean_condition);
-//     or
-//    GTEST_CHECK_(boolean_condition) << "Additional message";
-//
-//    This checks the condition and if the condition is not satisfied
-//    it prints message about the condition violation, including the
-//    condition itself, plus additional message streamed into it, if any,
-//    and then it aborts the program. It aborts the program irrespective of
-//    whether it is built in the debug mode or not.
-# define GTEST_CHECK_(condition) \
-    GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
-    if (::testing::internal::IsTrue(condition)) \
-      ; \
-    else \
-      GTEST_LOG_(FATAL) << "Condition " #condition " failed. "
-#endif  // !defined(GTEST_CHECK_)
-
-// An all-mode assert to verify that the given POSIX-style function
-// call returns 0 (indicating success).  Known limitation: this
-// doesn't expand to a balanced 'if' statement, so enclose the macro
-// in {} if you need to use it as the only statement in an 'if'
-// branch.
-#define GTEST_CHECK_POSIX_SUCCESS_(posix_call) \
-  if (const int gtest_error = (posix_call)) \
-    GTEST_LOG_(FATAL) << #posix_call << "failed with error " \
-                      << gtest_error
-
-// Transforms "T" into "const T&" according to standard reference collapsing
-// rules (this is only needed as a backport for C++98 compilers that do not
-// support reference collapsing). Specifically, it transforms:
-//
-//   char         ==> const char&
-//   const char   ==> const char&
-//   char&        ==> char&
-//   const char&  ==> const char&
-//
-// Note that the non-const reference will not have "const" added. This is
-// standard, and necessary so that "T" can always bind to "const T&".
-template <typename T>
-struct ConstRef { typedef const T& type; };
-template <typename T>
-struct ConstRef<T&> { typedef T& type; };
-
-// The argument T must depend on some template parameters.
-#define GTEST_REFERENCE_TO_CONST_(T) \
-  typename ::testing::internal::ConstRef<T>::type
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-//
-// Use ImplicitCast_ as a safe version of static_cast for upcasting in
-// the type hierarchy (e.g. casting a Foo* to a SuperclassOfFoo* or a
-// const Foo*).  When you use ImplicitCast_, the compiler checks that
-// the cast is safe.  Such explicit ImplicitCast_s are necessary in
-// surprisingly many situations where C++ demands an exact type match
-// instead of an argument type convertable to a target type.
-//
-// The syntax for using ImplicitCast_ is the same as for static_cast:
-//
-//   ImplicitCast_<ToType>(expr)
-//
-// ImplicitCast_ would have been part of the C++ standard library,
-// but the proposal was submitted too late.  It will probably make
-// its way into the language in the future.
-//
-// This relatively ugly name is intentional. It prevents clashes with
-// similar functions users may have (e.g., implicit_cast). The internal
-// namespace alone is not enough because the function can be found by ADL.
-template<typename To>
-inline To ImplicitCast_(To x) { return x; }
-
-// When you upcast (that is, cast a pointer from type Foo to type
-// SuperclassOfFoo), it's fine to use ImplicitCast_<>, since upcasts
-// always succeed.  When you downcast (that is, cast a pointer from
-// type Foo to type SubclassOfFoo), static_cast<> isn't safe, because
-// how do you know the pointer is really of type SubclassOfFoo?  It
-// could be a bare Foo, or of type DifferentSubclassOfFoo.  Thus,
-// when you downcast, you should use this macro.  In debug mode, we
-// use dynamic_cast<> to double-check the downcast is legal (we die
-// if it's not).  In normal mode, we do the efficient static_cast<>
-// instead.  Thus, it's important to test in debug mode to make sure
-// the cast is legal!
-//    This is the only place in the code we should use dynamic_cast<>.
-// In particular, you SHOULDN'T be using dynamic_cast<> in order to
-// do RTTI (eg code like this:
-//    if (dynamic_cast<Subclass1>(foo)) HandleASubclass1Object(foo);
-//    if (dynamic_cast<Subclass2>(foo)) HandleASubclass2Object(foo);
-// You should design the code some other way not to need this.
-//
-// This relatively ugly name is intentional. It prevents clashes with
-// similar functions users may have (e.g., down_cast). The internal
-// namespace alone is not enough because the function can be found by ADL.
-template<typename To, typename From>  // use like this: DownCast_<T*>(foo);
-inline To DownCast_(From* f) {  // so we only accept pointers
-  // Ensures that To is a sub-type of From *.  This test is here only
-  // for compile-time type checking, and has no overhead in an
-  // optimized build at run-time, as it will be optimized away
-  // completely.
-  GTEST_INTENTIONAL_CONST_COND_PUSH_()
-  if (false) {
-  GTEST_INTENTIONAL_CONST_COND_POP_()
-  const To to = nullptr;
-  ::testing::internal::ImplicitCast_<From*>(to);
-  }
-
-#if GTEST_HAS_RTTI
-  // RTTI: debug mode only!
-  GTEST_CHECK_(f == nullptr || dynamic_cast<To>(f) != nullptr);
-#endif
-  return static_cast<To>(f);
-}
-
-// Downcasts the pointer of type Base to Derived.
-// Derived must be a subclass of Base. The parameter MUST
-// point to a class of type Derived, not any subclass of it.
-// When RTTI is available, the function performs a runtime
-// check to enforce this.
-template <class Derived, class Base>
-Derived* CheckedDowncastToActualType(Base* base) {
-#if GTEST_HAS_RTTI
-  GTEST_CHECK_(typeid(*base) == typeid(Derived));
-#endif
-
-#if GTEST_HAS_DOWNCAST_
-  return ::down_cast<Derived*>(base);
-#elif GTEST_HAS_RTTI
-  return dynamic_cast<Derived*>(base);  // NOLINT
-#else
-  return static_cast<Derived*>(base);  // Poor man's downcast.
-#endif
-}
-
-#if GTEST_HAS_STREAM_REDIRECTION
-
-// Defines the stderr capturer:
-//   CaptureStdout     - starts capturing stdout.
-//   GetCapturedStdout - stops capturing stdout and returns the captured string.
-//   CaptureStderr     - starts capturing stderr.
-//   GetCapturedStderr - stops capturing stderr and returns the captured string.
-//
-GTEST_API_ void CaptureStdout();
-GTEST_API_ std::string GetCapturedStdout();
-GTEST_API_ void CaptureStderr();
-GTEST_API_ std::string GetCapturedStderr();
-
-#endif  // GTEST_HAS_STREAM_REDIRECTION
-// Returns the size (in bytes) of a file.
-GTEST_API_ size_t GetFileSize(FILE* file);
-
-// Reads the entire content of a file as a string.
-GTEST_API_ std::string ReadEntireFile(FILE* file);
-
-// All command line arguments.
-GTEST_API_ std::vector<std::string> GetArgvs();
-
-#if GTEST_HAS_DEATH_TEST
-
-std::vector<std::string> GetInjectableArgvs();
-// Deprecated: pass the args vector by value instead.
-void SetInjectableArgvs(const std::vector<std::string>* new_argvs);
-void SetInjectableArgvs(const std::vector<std::string>& new_argvs);
-void ClearInjectableArgvs();
-
-#endif  // GTEST_HAS_DEATH_TEST
-
-// Defines synchronization primitives.
-#if GTEST_IS_THREADSAFE
-# if GTEST_HAS_PTHREAD
-// Sleeps for (roughly) n milliseconds.  This function is only for testing
-// Google Test's own constructs.  Don't use it in user tests, either
-// directly or indirectly.
-inline void SleepMilliseconds(int n) {
-  const timespec time = {
-    0,                  // 0 seconds.
-    n * 1000L * 1000L,  // And n ms.
-  };
-  nanosleep(&time, nullptr);
-}
-# endif  // GTEST_HAS_PTHREAD
-
-# if GTEST_HAS_NOTIFICATION_
-// Notification has already been imported into the namespace.
-// Nothing to do here.
-
-# elif GTEST_HAS_PTHREAD
-// Allows a controller thread to pause execution of newly created
-// threads until notified.  Instances of this class must be created
-// and destroyed in the controller thread.
-//
-// This class is only for testing Google Test's own constructs. Do not
-// use it in user tests, either directly or indirectly.
-class Notification {
- public:
-  Notification() : notified_(false) {
-    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_init(&mutex_, nullptr));
-  }
-  ~Notification() {
-    pthread_mutex_destroy(&mutex_);
-  }
-
-  // Notifies all threads created with this notification to start. Must
-  // be called from the controller thread.
-  void Notify() {
-    pthread_mutex_lock(&mutex_);
-    notified_ = true;
-    pthread_mutex_unlock(&mutex_);
-  }
-
-  // Blocks until the controller thread notifies. Must be called from a test
-  // thread.
-  void WaitForNotification() {
-    for (;;) {
-      pthread_mutex_lock(&mutex_);
-      const bool notified = notified_;
-      pthread_mutex_unlock(&mutex_);
-      if (notified)
-        break;
-      SleepMilliseconds(10);
-    }
-  }
-
- private:
-  pthread_mutex_t mutex_;
-  bool notified_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(Notification);
-};
-
-# elif GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
-
-GTEST_API_ void SleepMilliseconds(int n);
-
-// Provides leak-safe Windows kernel handle ownership.
-// Used in death tests and in threading support.
-class GTEST_API_ AutoHandle {
- public:
-  // Assume that Win32 HANDLE type is equivalent to void*. Doing so allows us to
-  // avoid including <windows.h> in this header file. Including <windows.h> is
-  // undesirable because it defines a lot of symbols and macros that tend to
-  // conflict with client code. This assumption is verified by
-  // WindowsTypesTest.HANDLEIsVoidStar.
-  typedef void* Handle;
-  AutoHandle();
-  explicit AutoHandle(Handle handle);
-
-  ~AutoHandle();
-
-  Handle Get() const;
-  void Reset();
-  void Reset(Handle handle);
-
- private:
-  // Returns true if and only if the handle is a valid handle object that can be
-  // closed.
-  bool IsCloseable() const;
-
-  Handle handle_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(AutoHandle);
-};
-
-// Allows a controller thread to pause execution of newly created
-// threads until notified.  Instances of this class must be created
-// and destroyed in the controller thread.
-//
-// This class is only for testing Google Test's own constructs. Do not
-// use it in user tests, either directly or indirectly.
-class GTEST_API_ Notification {
- public:
-  Notification();
-  void Notify();
-  void WaitForNotification();
-
- private:
-  AutoHandle event_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(Notification);
-};
-# endif  // GTEST_HAS_NOTIFICATION_
-
-// On MinGW, we can have both GTEST_OS_WINDOWS and GTEST_HAS_PTHREAD
-// defined, but we don't want to use MinGW's pthreads implementation, which
-// has conformance problems with some versions of the POSIX standard.
-# if GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW
-
-// As a C-function, ThreadFuncWithCLinkage cannot be templated itself.
-// Consequently, it cannot select a correct instantiation of ThreadWithParam
-// in order to call its Run(). Introducing ThreadWithParamBase as a
-// non-templated base class for ThreadWithParam allows us to bypass this
-// problem.
-class ThreadWithParamBase {
- public:
-  virtual ~ThreadWithParamBase() {}
-  virtual void Run() = 0;
-};
-
-// pthread_create() accepts a pointer to a function type with the C linkage.
-// According to the Standard (7.5/1), function types with different linkages
-// are different even if they are otherwise identical.  Some compilers (for
-// example, SunStudio) treat them as different types.  Since class methods
-// cannot be defined with C-linkage we need to define a free C-function to
-// pass into pthread_create().
-extern "C" inline void* ThreadFuncWithCLinkage(void* thread) {
-  static_cast<ThreadWithParamBase*>(thread)->Run();
-  return nullptr;
-}
-
-// Helper class for testing Google Test's multi-threading constructs.
-// To use it, write:
-//
-//   void ThreadFunc(int param) { /* Do things with param */ }
-//   Notification thread_can_start;
-//   ...
-//   // The thread_can_start parameter is optional; you can supply NULL.
-//   ThreadWithParam<int> thread(&ThreadFunc, 5, &thread_can_start);
-//   thread_can_start.Notify();
-//
-// These classes are only for testing Google Test's own constructs. Do
-// not use them in user tests, either directly or indirectly.
-template <typename T>
-class ThreadWithParam : public ThreadWithParamBase {
- public:
-  typedef void UserThreadFunc(T);
-
-  ThreadWithParam(UserThreadFunc* func, T param, Notification* thread_can_start)
-      : func_(func),
-        param_(param),
-        thread_can_start_(thread_can_start),
-        finished_(false) {
-    ThreadWithParamBase* const base = this;
-    // The thread can be created only after all fields except thread_
-    // have been initialized.
-    GTEST_CHECK_POSIX_SUCCESS_(
-        pthread_create(&thread_, nullptr, &ThreadFuncWithCLinkage, base));
-  }
-  ~ThreadWithParam() override { Join(); }
-
-  void Join() {
-    if (!finished_) {
-      GTEST_CHECK_POSIX_SUCCESS_(pthread_join(thread_, nullptr));
-      finished_ = true;
-    }
-  }
-
-  void Run() override {
-    if (thread_can_start_ != nullptr) thread_can_start_->WaitForNotification();
-    func_(param_);
-  }
-
- private:
-  UserThreadFunc* const func_;  // User-supplied thread function.
-  const T param_;  // User-supplied parameter to the thread function.
-  // When non-NULL, used to block execution until the controller thread
-  // notifies.
-  Notification* const thread_can_start_;
-  bool finished_;  // true if and only if we know that the thread function has
-                   // finished.
-  pthread_t thread_;  // The native thread object.
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadWithParam);
-};
-# endif  // !GTEST_OS_WINDOWS && GTEST_HAS_PTHREAD ||
-         // GTEST_HAS_MUTEX_AND_THREAD_LOCAL_
-
-# if GTEST_HAS_MUTEX_AND_THREAD_LOCAL_
-// Mutex and ThreadLocal have already been imported into the namespace.
-// Nothing to do here.
-
-# elif GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
-
-// Mutex implements mutex on Windows platforms.  It is used in conjunction
-// with class MutexLock:
-//
-//   Mutex mutex;
-//   ...
-//   MutexLock lock(&mutex);  // Acquires the mutex and releases it at the
-//                            // end of the current scope.
-//
-// A static Mutex *must* be defined or declared using one of the following
-// macros:
-//   GTEST_DEFINE_STATIC_MUTEX_(g_some_mutex);
-//   GTEST_DECLARE_STATIC_MUTEX_(g_some_mutex);
-//
-// (A non-static Mutex is defined/declared in the usual way).
-class GTEST_API_ Mutex {
- public:
-  enum MutexType { kStatic = 0, kDynamic = 1 };
-  // We rely on kStaticMutex being 0 as it is to what the linker initializes
-  // type_ in static mutexes.  critical_section_ will be initialized lazily
-  // in ThreadSafeLazyInit().
-  enum StaticConstructorSelector { kStaticMutex = 0 };
-
-  // This constructor intentionally does nothing.  It relies on type_ being
-  // statically initialized to 0 (effectively setting it to kStatic) and on
-  // ThreadSafeLazyInit() to lazily initialize the rest of the members.
-  explicit Mutex(StaticConstructorSelector /*dummy*/) {}
-
-  Mutex();
-  ~Mutex();
-
-  void Lock();
-
-  void Unlock();
-
-  // Does nothing if the current thread holds the mutex. Otherwise, crashes
-  // with high probability.
-  void AssertHeld();
-
- private:
-  // Initializes owner_thread_id_ and critical_section_ in static mutexes.
-  void ThreadSafeLazyInit();
-
-  // Per https://blogs.msdn.microsoft.com/oldnewthing/20040223-00/?p=40503,
-  // we assume that 0 is an invalid value for thread IDs.
-  unsigned int owner_thread_id_;
-
-  // For static mutexes, we rely on these members being initialized to zeros
-  // by the linker.
-  MutexType type_;
-  long critical_section_init_phase_;  // NOLINT
-  GTEST_CRITICAL_SECTION* critical_section_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(Mutex);
-};
-
-# define GTEST_DECLARE_STATIC_MUTEX_(mutex) \
-    extern ::testing::internal::Mutex mutex
-
-# define GTEST_DEFINE_STATIC_MUTEX_(mutex) \
-    ::testing::internal::Mutex mutex(::testing::internal::Mutex::kStaticMutex)
-
-// We cannot name this class MutexLock because the ctor declaration would
-// conflict with a macro named MutexLock, which is defined on some
-// platforms. That macro is used as a defensive measure to prevent against
-// inadvertent misuses of MutexLock like "MutexLock(&mu)" rather than
-// "MutexLock l(&mu)".  Hence the typedef trick below.
-class GTestMutexLock {
- public:
-  explicit GTestMutexLock(Mutex* mutex)
-      : mutex_(mutex) { mutex_->Lock(); }
-
-  ~GTestMutexLock() { mutex_->Unlock(); }
-
- private:
-  Mutex* const mutex_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(GTestMutexLock);
-};
-
-typedef GTestMutexLock MutexLock;
-
-// Base class for ValueHolder<T>.  Allows a caller to hold and delete a value
-// without knowing its type.
-class ThreadLocalValueHolderBase {
- public:
-  virtual ~ThreadLocalValueHolderBase() {}
-};
-
-// Provides a way for a thread to send notifications to a ThreadLocal
-// regardless of its parameter type.
-class ThreadLocalBase {
- public:
-  // Creates a new ValueHolder<T> object holding a default value passed to
-  // this ThreadLocal<T>'s constructor and returns it.  It is the caller's
-  // responsibility not to call this when the ThreadLocal<T> instance already
-  // has a value on the current thread.
-  virtual ThreadLocalValueHolderBase* NewValueForCurrentThread() const = 0;
-
- protected:
-  ThreadLocalBase() {}
-  virtual ~ThreadLocalBase() {}
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadLocalBase);
-};
-
-// Maps a thread to a set of ThreadLocals that have values instantiated on that
-// thread and notifies them when the thread exits.  A ThreadLocal instance is
-// expected to persist until all threads it has values on have terminated.
-class GTEST_API_ ThreadLocalRegistry {
- public:
-  // Registers thread_local_instance as having value on the current thread.
-  // Returns a value that can be used to identify the thread from other threads.
-  static ThreadLocalValueHolderBase* GetValueOnCurrentThread(
-      const ThreadLocalBase* thread_local_instance);
-
-  // Invoked when a ThreadLocal instance is destroyed.
-  static void OnThreadLocalDestroyed(
-      const ThreadLocalBase* thread_local_instance);
-};
-
-class GTEST_API_ ThreadWithParamBase {
- public:
-  void Join();
-
- protected:
-  class Runnable {
-   public:
-    virtual ~Runnable() {}
-    virtual void Run() = 0;
-  };
-
-  ThreadWithParamBase(Runnable *runnable, Notification* thread_can_start);
-  virtual ~ThreadWithParamBase();
-
- private:
-  AutoHandle thread_;
-};
-
-// Helper class for testing Google Test's multi-threading constructs.
-template <typename T>
-class ThreadWithParam : public ThreadWithParamBase {
- public:
-  typedef void UserThreadFunc(T);
-
-  ThreadWithParam(UserThreadFunc* func, T param, Notification* thread_can_start)
-      : ThreadWithParamBase(new RunnableImpl(func, param), thread_can_start) {
-  }
-  virtual ~ThreadWithParam() {}
-
- private:
-  class RunnableImpl : public Runnable {
-   public:
-    RunnableImpl(UserThreadFunc* func, T param)
-        : func_(func),
-          param_(param) {
-    }
-    virtual ~RunnableImpl() {}
-    virtual void Run() {
-      func_(param_);
-    }
-
-   private:
-    UserThreadFunc* const func_;
-    const T param_;
-
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(RunnableImpl);
-  };
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadWithParam);
-};
-
-// Implements thread-local storage on Windows systems.
-//
-//   // Thread 1
-//   ThreadLocal<int> tl(100);  // 100 is the default value for each thread.
-//
-//   // Thread 2
-//   tl.set(150);  // Changes the value for thread 2 only.
-//   EXPECT_EQ(150, tl.get());
-//
-//   // Thread 1
-//   EXPECT_EQ(100, tl.get());  // In thread 1, tl has the original value.
-//   tl.set(200);
-//   EXPECT_EQ(200, tl.get());
-//
-// The template type argument T must have a public copy constructor.
-// In addition, the default ThreadLocal constructor requires T to have
-// a public default constructor.
-//
-// The users of a TheadLocal instance have to make sure that all but one
-// threads (including the main one) using that instance have exited before
-// destroying it. Otherwise, the per-thread objects managed for them by the
-// ThreadLocal instance are not guaranteed to be destroyed on all platforms.
-//
-// Google Test only uses global ThreadLocal objects.  That means they
-// will die after main() has returned.  Therefore, no per-thread
-// object managed by Google Test will be leaked as long as all threads
-// using Google Test have exited when main() returns.
-template <typename T>
-class ThreadLocal : public ThreadLocalBase {
- public:
-  ThreadLocal() : default_factory_(new DefaultValueHolderFactory()) {}
-  explicit ThreadLocal(const T& value)
-      : default_factory_(new InstanceValueHolderFactory(value)) {}
-
-  ~ThreadLocal() { ThreadLocalRegistry::OnThreadLocalDestroyed(this); }
-
-  T* pointer() { return GetOrCreateValue(); }
-  const T* pointer() const { return GetOrCreateValue(); }
-  const T& get() const { return *pointer(); }
-  void set(const T& value) { *pointer() = value; }
-
- private:
-  // Holds a value of T.  Can be deleted via its base class without the caller
-  // knowing the type of T.
-  class ValueHolder : public ThreadLocalValueHolderBase {
-   public:
-    ValueHolder() : value_() {}
-    explicit ValueHolder(const T& value) : value_(value) {}
-
-    T* pointer() { return &value_; }
-
-   private:
-    T value_;
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolder);
-  };
-
-
-  T* GetOrCreateValue() const {
-    return static_cast<ValueHolder*>(
-        ThreadLocalRegistry::GetValueOnCurrentThread(this))->pointer();
-  }
-
-  virtual ThreadLocalValueHolderBase* NewValueForCurrentThread() const {
-    return default_factory_->MakeNewHolder();
-  }
-
-  class ValueHolderFactory {
-   public:
-    ValueHolderFactory() {}
-    virtual ~ValueHolderFactory() {}
-    virtual ValueHolder* MakeNewHolder() const = 0;
-
-   private:
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolderFactory);
-  };
-
-  class DefaultValueHolderFactory : public ValueHolderFactory {
-   public:
-    DefaultValueHolderFactory() {}
-    virtual ValueHolder* MakeNewHolder() const { return new ValueHolder(); }
-
-   private:
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultValueHolderFactory);
-  };
-
-  class InstanceValueHolderFactory : public ValueHolderFactory {
-   public:
-    explicit InstanceValueHolderFactory(const T& value) : value_(value) {}
-    virtual ValueHolder* MakeNewHolder() const {
-      return new ValueHolder(value_);
-    }
-
-   private:
-    const T value_;  // The value for each thread.
-
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(InstanceValueHolderFactory);
-  };
-
-  std::unique_ptr<ValueHolderFactory> default_factory_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadLocal);
-};
-
-# elif GTEST_HAS_PTHREAD
-
-// MutexBase and Mutex implement mutex on pthreads-based platforms.
-class MutexBase {
- public:
-  // Acquires this mutex.
-  void Lock() {
-    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_lock(&mutex_));
-    owner_ = pthread_self();
-    has_owner_ = true;
-  }
-
-  // Releases this mutex.
-  void Unlock() {
-    // Since the lock is being released the owner_ field should no longer be
-    // considered valid. We don't protect writing to has_owner_ here, as it's
-    // the caller's responsibility to ensure that the current thread holds the
-    // mutex when this is called.
-    has_owner_ = false;
-    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_unlock(&mutex_));
-  }
-
-  // Does nothing if the current thread holds the mutex. Otherwise, crashes
-  // with high probability.
-  void AssertHeld() const {
-    GTEST_CHECK_(has_owner_ && pthread_equal(owner_, pthread_self()))
-        << "The current thread is not holding the mutex @" << this;
-  }
-
-  // A static mutex may be used before main() is entered.  It may even
-  // be used before the dynamic initialization stage.  Therefore we
-  // must be able to initialize a static mutex object at link time.
-  // This means MutexBase has to be a POD and its member variables
-  // have to be public.
- public:
-  pthread_mutex_t mutex_;  // The underlying pthread mutex.
-  // has_owner_ indicates whether the owner_ field below contains a valid thread
-  // ID and is therefore safe to inspect (e.g., to use in pthread_equal()). All
-  // accesses to the owner_ field should be protected by a check of this field.
-  // An alternative might be to memset() owner_ to all zeros, but there's no
-  // guarantee that a zero'd pthread_t is necessarily invalid or even different
-  // from pthread_self().
-  bool has_owner_;
-  pthread_t owner_;  // The thread holding the mutex.
-};
-
-// Forward-declares a static mutex.
-#  define GTEST_DECLARE_STATIC_MUTEX_(mutex) \
-     extern ::testing::internal::MutexBase mutex
-
-// Defines and statically (i.e. at link time) initializes a static mutex.
-// The initialization list here does not explicitly initialize each field,
-// instead relying on default initialization for the unspecified fields. In
-// particular, the owner_ field (a pthread_t) is not explicitly initialized.
-// This allows initialization to work whether pthread_t is a scalar or struct.
-// The flag -Wmissing-field-initializers must not be specified for this to work.
-#define GTEST_DEFINE_STATIC_MUTEX_(mutex) \
-  ::testing::internal::MutexBase mutex = {PTHREAD_MUTEX_INITIALIZER, false, 0}
-
-// The Mutex class can only be used for mutexes created at runtime. It
-// shares its API with MutexBase otherwise.
-class Mutex : public MutexBase {
- public:
-  Mutex() {
-    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_init(&mutex_, nullptr));
-    has_owner_ = false;
-  }
-  ~Mutex() {
-    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_destroy(&mutex_));
-  }
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(Mutex);
-};
-
-// We cannot name this class MutexLock because the ctor declaration would
-// conflict with a macro named MutexLock, which is defined on some
-// platforms. That macro is used as a defensive measure to prevent against
-// inadvertent misuses of MutexLock like "MutexLock(&mu)" rather than
-// "MutexLock l(&mu)".  Hence the typedef trick below.
-class GTestMutexLock {
- public:
-  explicit GTestMutexLock(MutexBase* mutex)
-      : mutex_(mutex) { mutex_->Lock(); }
-
-  ~GTestMutexLock() { mutex_->Unlock(); }
-
- private:
-  MutexBase* const mutex_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(GTestMutexLock);
-};
-
-typedef GTestMutexLock MutexLock;
-
-// Helpers for ThreadLocal.
-
-// pthread_key_create() requires DeleteThreadLocalValue() to have
-// C-linkage.  Therefore it cannot be templatized to access
-// ThreadLocal<T>.  Hence the need for class
-// ThreadLocalValueHolderBase.
-class ThreadLocalValueHolderBase {
- public:
-  virtual ~ThreadLocalValueHolderBase() {}
-};
-
-// Called by pthread to delete thread-local data stored by
-// pthread_setspecific().
-extern "C" inline void DeleteThreadLocalValue(void* value_holder) {
-  delete static_cast<ThreadLocalValueHolderBase*>(value_holder);
-}
-
-// Implements thread-local storage on pthreads-based systems.
-template <typename T>
-class GTEST_API_ ThreadLocal {
- public:
-  ThreadLocal()
-      : key_(CreateKey()), default_factory_(new DefaultValueHolderFactory()) {}
-  explicit ThreadLocal(const T& value)
-      : key_(CreateKey()),
-        default_factory_(new InstanceValueHolderFactory(value)) {}
-
-  ~ThreadLocal() {
-    // Destroys the managed object for the current thread, if any.
-    DeleteThreadLocalValue(pthread_getspecific(key_));
-
-    // Releases resources associated with the key.  This will *not*
-    // delete managed objects for other threads.
-    GTEST_CHECK_POSIX_SUCCESS_(pthread_key_delete(key_));
-  }
-
-  T* pointer() { return GetOrCreateValue(); }
-  const T* pointer() const { return GetOrCreateValue(); }
-  const T& get() const { return *pointer(); }
-  void set(const T& value) { *pointer() = value; }
-
- private:
-  // Holds a value of type T.
-  class ValueHolder : public ThreadLocalValueHolderBase {
-   public:
-    ValueHolder() : value_() {}
-    explicit ValueHolder(const T& value) : value_(value) {}
-
-    T* pointer() { return &value_; }
-
-   private:
-    T value_;
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolder);
-  };
-
-  static pthread_key_t CreateKey() {
-    pthread_key_t key;
-    // When a thread exits, DeleteThreadLocalValue() will be called on
-    // the object managed for that thread.
-    GTEST_CHECK_POSIX_SUCCESS_(
-        pthread_key_create(&key, &DeleteThreadLocalValue));
-    return key;
-  }
-
-  T* GetOrCreateValue() const {
-    ThreadLocalValueHolderBase* const holder =
-        static_cast<ThreadLocalValueHolderBase*>(pthread_getspecific(key_));
-    if (holder != nullptr) {
-      return CheckedDowncastToActualType<ValueHolder>(holder)->pointer();
-    }
-
-    ValueHolder* const new_holder = default_factory_->MakeNewHolder();
-    ThreadLocalValueHolderBase* const holder_base = new_holder;
-    GTEST_CHECK_POSIX_SUCCESS_(pthread_setspecific(key_, holder_base));
-    return new_holder->pointer();
-  }
-
-  class ValueHolderFactory {
-   public:
-    ValueHolderFactory() {}
-    virtual ~ValueHolderFactory() {}
-    virtual ValueHolder* MakeNewHolder() const = 0;
-
-   private:
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolderFactory);
-  };
-
-  class DefaultValueHolderFactory : public ValueHolderFactory {
-   public:
-    DefaultValueHolderFactory() {}
-    virtual ValueHolder* MakeNewHolder() const { return new ValueHolder(); }
-
-   private:
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultValueHolderFactory);
-  };
-
-  class InstanceValueHolderFactory : public ValueHolderFactory {
-   public:
-    explicit InstanceValueHolderFactory(const T& value) : value_(value) {}
-    virtual ValueHolder* MakeNewHolder() const {
-      return new ValueHolder(value_);
-    }
-
-   private:
-    const T value_;  // The value for each thread.
-
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(InstanceValueHolderFactory);
-  };
-
-  // A key pthreads uses for looking up per-thread values.
-  const pthread_key_t key_;
-  std::unique_ptr<ValueHolderFactory> default_factory_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadLocal);
-};
-
-# endif  // GTEST_HAS_MUTEX_AND_THREAD_LOCAL_
-
-#else  // GTEST_IS_THREADSAFE
-
-// A dummy implementation of synchronization primitives (mutex, lock,
-// and thread-local variable).  Necessary for compiling Google Test where
-// mutex is not supported - using Google Test in multiple threads is not
-// supported on such platforms.
-
-class Mutex {
- public:
-  Mutex() {}
-  void Lock() {}
-  void Unlock() {}
-  void AssertHeld() const {}
-};
-
-# define GTEST_DECLARE_STATIC_MUTEX_(mutex) \
-  extern ::testing::internal::Mutex mutex
-
-# define GTEST_DEFINE_STATIC_MUTEX_(mutex) ::testing::internal::Mutex mutex
-
-// We cannot name this class MutexLock because the ctor declaration would
-// conflict with a macro named MutexLock, which is defined on some
-// platforms. That macro is used as a defensive measure to prevent against
-// inadvertent misuses of MutexLock like "MutexLock(&mu)" rather than
-// "MutexLock l(&mu)".  Hence the typedef trick below.
-class GTestMutexLock {
- public:
-  explicit GTestMutexLock(Mutex*) {}  // NOLINT
-};
-
-typedef GTestMutexLock MutexLock;
-
-template <typename T>
-class GTEST_API_ ThreadLocal {
- public:
-  ThreadLocal() : value_() {}
-  explicit ThreadLocal(const T& value) : value_(value) {}
-  T* pointer() { return &value_; }
-  const T* pointer() const { return &value_; }
-  const T& get() const { return value_; }
-  void set(const T& value) { value_ = value; }
- private:
-  T value_;
-};
-
-#endif  // GTEST_IS_THREADSAFE
-
-// Returns the number of threads running in the process, or 0 to indicate that
-// we cannot detect it.
-GTEST_API_ size_t GetThreadCount();
-
-template <bool B>
-using bool_constant = std::integral_constant<bool, B>;
-
-#if GTEST_OS_WINDOWS
-# define GTEST_PATH_SEP_ "\\"
-# define GTEST_HAS_ALT_PATH_SEP_ 1
-// The biggest signed integer type the compiler supports.
-typedef __int64 BiggestInt;
-#else
-# define GTEST_PATH_SEP_ "/"
-# define GTEST_HAS_ALT_PATH_SEP_ 0
-typedef long long BiggestInt;  // NOLINT
-#endif  // GTEST_OS_WINDOWS
-
-// Utilities for char.
-
-// isspace(int ch) and friends accept an unsigned char or EOF.  char
-// may be signed, depending on the compiler (or compiler flags).
-// Therefore we need to cast a char to unsigned char before calling
-// isspace(), etc.
-
-inline bool IsAlpha(char ch) {
-  return isalpha(static_cast<unsigned char>(ch)) != 0;
-}
-inline bool IsAlNum(char ch) {
-  return isalnum(static_cast<unsigned char>(ch)) != 0;
-}
-inline bool IsDigit(char ch) {
-  return isdigit(static_cast<unsigned char>(ch)) != 0;
-}
-inline bool IsLower(char ch) {
-  return islower(static_cast<unsigned char>(ch)) != 0;
-}
-inline bool IsSpace(char ch) {
-  return isspace(static_cast<unsigned char>(ch)) != 0;
-}
-inline bool IsUpper(char ch) {
-  return isupper(static_cast<unsigned char>(ch)) != 0;
-}
-inline bool IsXDigit(char ch) {
-  return isxdigit(static_cast<unsigned char>(ch)) != 0;
-}
-inline bool IsXDigit(wchar_t ch) {
-  const unsigned char low_byte = static_cast<unsigned char>(ch);
-  return ch == low_byte && isxdigit(low_byte) != 0;
-}
-
-inline char ToLower(char ch) {
-  return static_cast<char>(tolower(static_cast<unsigned char>(ch)));
-}
-inline char ToUpper(char ch) {
-  return static_cast<char>(toupper(static_cast<unsigned char>(ch)));
-}
-
-inline std::string StripTrailingSpaces(std::string str) {
-  std::string::iterator it = str.end();
-  while (it != str.begin() && IsSpace(*--it))
-    it = str.erase(it);
-  return str;
-}
-
-// The testing::internal::posix namespace holds wrappers for common
-// POSIX functions.  These wrappers hide the differences between
-// Windows/MSVC and POSIX systems.  Since some compilers define these
-// standard functions as macros, the wrapper cannot have the same name
-// as the wrapped function.
-
-namespace posix {
-
-// Functions with a different name on Windows.
-
-#if GTEST_OS_WINDOWS
-
-typedef struct _stat StatStruct;
-
-# ifdef __BORLANDC__
-inline int IsATTY(int fd) { return isatty(fd); }
-inline int StrCaseCmp(const char* s1, const char* s2) {
-  return stricmp(s1, s2);
-}
-inline char* StrDup(const char* src) { return strdup(src); }
-# else  // !__BORLANDC__
-#  if GTEST_OS_WINDOWS_MOBILE
-inline int IsATTY(int /* fd */) { return 0; }
-#  else
-inline int IsATTY(int fd) { return _isatty(fd); }
-#  endif  // GTEST_OS_WINDOWS_MOBILE
-inline int StrCaseCmp(const char* s1, const char* s2) {
-  return _stricmp(s1, s2);
-}
-inline char* StrDup(const char* src) { return _strdup(src); }
-# endif  // __BORLANDC__
-
-# if GTEST_OS_WINDOWS_MOBILE
-inline int FileNo(FILE* file) { return reinterpret_cast<int>(_fileno(file)); }
-// Stat(), RmDir(), and IsDir() are not needed on Windows CE at this
-// time and thus not defined there.
-# else
-inline int FileNo(FILE* file) { return _fileno(file); }
-inline int Stat(const char* path, StatStruct* buf) { return _stat(path, buf); }
-inline int RmDir(const char* dir) { return _rmdir(dir); }
-inline bool IsDir(const StatStruct& st) {
-  return (_S_IFDIR & st.st_mode) != 0;
-}
-# endif  // GTEST_OS_WINDOWS_MOBILE
-
-#else
-
-typedef struct stat StatStruct;
-
-inline int FileNo(FILE* file) { return fileno(file); }
-inline int IsATTY(int fd) { return isatty(fd); }
-inline int Stat(const char* path, StatStruct* buf) { return stat(path, buf); }
-inline int StrCaseCmp(const char* s1, const char* s2) {
-  return strcasecmp(s1, s2);
-}
-inline char* StrDup(const char* src) { return strdup(src); }
-inline int RmDir(const char* dir) { return rmdir(dir); }
-inline bool IsDir(const StatStruct& st) { return S_ISDIR(st.st_mode); }
-
-#endif  // GTEST_OS_WINDOWS
-
-// Functions deprecated by MSVC 8.0.
-
-GTEST_DISABLE_MSC_DEPRECATED_PUSH_()
-
-inline const char* StrNCpy(char* dest, const char* src, size_t n) {
-  return strncpy(dest, src, n);
-}
-
-// ChDir(), FReopen(), FDOpen(), Read(), Write(), Close(), and
-// StrError() aren't needed on Windows CE at this time and thus not
-// defined there.
-
-#if !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
-inline int ChDir(const char* dir) { return chdir(dir); }
-#endif
-inline FILE* FOpen(const char* path, const char* mode) {
-  return fopen(path, mode);
-}
-#if !GTEST_OS_WINDOWS_MOBILE
-inline FILE *FReopen(const char* path, const char* mode, FILE* stream) {
-  return freopen(path, mode, stream);
-}
-inline FILE* FDOpen(int fd, const char* mode) { return fdopen(fd, mode); }
-#endif
-inline int FClose(FILE* fp) { return fclose(fp); }
-#if !GTEST_OS_WINDOWS_MOBILE
-inline int Read(int fd, void* buf, unsigned int count) {
-  return static_cast<int>(read(fd, buf, count));
-}
-inline int Write(int fd, const void* buf, unsigned int count) {
-  return static_cast<int>(write(fd, buf, count));
-}
-inline int Close(int fd) { return close(fd); }
-inline const char* StrError(int errnum) { return strerror(errnum); }
-#endif
-inline const char* GetEnv(const char* name) {
-#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT
-  // We are on Windows CE, which has no environment variables.
-  static_cast<void>(name);  // To prevent 'unused argument' warning.
-  return nullptr;
-#elif defined(__BORLANDC__) || defined(__SunOS_5_8) || defined(__SunOS_5_9)
-  // Environment variables which we programmatically clear will be set to the
-  // empty string rather than unset (NULL).  Handle that case.
-  const char* const env = getenv(name);
-  return (env != nullptr && env[0] != '\0') ? env : nullptr;
-#else
-  return getenv(name);
-#endif
-}
-
-GTEST_DISABLE_MSC_DEPRECATED_POP_()
-
-#if GTEST_OS_WINDOWS_MOBILE
-// Windows CE has no C library. The abort() function is used in
-// several places in Google Test. This implementation provides a reasonable
-// imitation of standard behaviour.
-[[noreturn]] void Abort();
-#else
-[[noreturn]] inline void Abort() { abort(); }
-#endif  // GTEST_OS_WINDOWS_MOBILE
-
-}  // namespace posix
-
-// MSVC "deprecates" snprintf and issues warnings wherever it is used.  In
-// order to avoid these warnings, we need to use _snprintf or _snprintf_s on
-// MSVC-based platforms.  We map the GTEST_SNPRINTF_ macro to the appropriate
-// function in order to achieve that.  We use macro definition here because
-// snprintf is a variadic function.
-#if _MSC_VER && !GTEST_OS_WINDOWS_MOBILE
-// MSVC 2005 and above support variadic macros.
-# define GTEST_SNPRINTF_(buffer, size, format, ...) \
-     _snprintf_s(buffer, size, size, format, __VA_ARGS__)
-#elif defined(_MSC_VER)
-// Windows CE does not define _snprintf_s
-# define GTEST_SNPRINTF_ _snprintf
-#else
-# define GTEST_SNPRINTF_ snprintf
-#endif
-
-// The maximum number a BiggestInt can represent.  This definition
-// works no matter BiggestInt is represented in one's complement or
-// two's complement.
-//
-// We cannot rely on numeric_limits in STL, as __int64 and long long
-// are not part of standard C++ and numeric_limits doesn't need to be
-// defined for them.
-const BiggestInt kMaxBiggestInt =
-    ~(static_cast<BiggestInt>(1) << (8*sizeof(BiggestInt) - 1));
-
-// This template class serves as a compile-time function from size to
-// type.  It maps a size in bytes to a primitive type with that
-// size. e.g.
-//
-//   TypeWithSize<4>::UInt
-//
-// is typedef-ed to be unsigned int (unsigned integer made up of 4
-// bytes).
-//
-// Such functionality should belong to STL, but I cannot find it
-// there.
-//
-// Google Test uses this class in the implementation of floating-point
-// comparison.
-//
-// For now it only handles UInt (unsigned int) as that's all Google Test
-// needs.  Other types can be easily added in the future if need
-// arises.
-template <size_t size>
-class TypeWithSize {
- public:
-  // This prevents the user from using TypeWithSize<N> with incorrect
-  // values of N.
-  typedef void UInt;
-};
-
-// The specialization for size 4.
-template <>
-class TypeWithSize<4> {
- public:
-  // unsigned int has size 4 in both gcc and MSVC.
-  //
-  // As base/basictypes.h doesn't compile on Windows, we cannot use
-  // uint32, uint64, and etc here.
-  typedef int Int;
-  typedef unsigned int UInt;
-};
-
-// The specialization for size 8.
-template <>
-class TypeWithSize<8> {
- public:
-#if GTEST_OS_WINDOWS
-  typedef __int64 Int;
-  typedef unsigned __int64 UInt;
-#else
-  typedef long long Int;  // NOLINT
-  typedef unsigned long long UInt;  // NOLINT
-#endif  // GTEST_OS_WINDOWS
-};
-
-// Integer types of known sizes.
-typedef TypeWithSize<4>::Int Int32;
-typedef TypeWithSize<4>::UInt UInt32;
-typedef TypeWithSize<8>::Int Int64;
-typedef TypeWithSize<8>::UInt UInt64;
-typedef TypeWithSize<8>::Int TimeInMillis;  // Represents time in milliseconds.
-
-// Utilities for command line flags and environment variables.
-
-// Macro for referencing flags.
-#if !defined(GTEST_FLAG)
-# define GTEST_FLAG(name) FLAGS_gtest_##name
-#endif  // !defined(GTEST_FLAG)
-
-#if !defined(GTEST_USE_OWN_FLAGFILE_FLAG_)
-# define GTEST_USE_OWN_FLAGFILE_FLAG_ 1
-#endif  // !defined(GTEST_USE_OWN_FLAGFILE_FLAG_)
-
-#if !defined(GTEST_DECLARE_bool_)
-# define GTEST_FLAG_SAVER_ ::testing::internal::GTestFlagSaver
-
-// Macros for declaring flags.
-# define GTEST_DECLARE_bool_(name) GTEST_API_ extern bool GTEST_FLAG(name)
-# define GTEST_DECLARE_int32_(name) \
-    GTEST_API_ extern ::testing::internal::Int32 GTEST_FLAG(name)
-# define GTEST_DECLARE_string_(name) \
-    GTEST_API_ extern ::std::string GTEST_FLAG(name)
-
-// Macros for defining flags.
-# define GTEST_DEFINE_bool_(name, default_val, doc) \
-    GTEST_API_ bool GTEST_FLAG(name) = (default_val)
-# define GTEST_DEFINE_int32_(name, default_val, doc) \
-    GTEST_API_ ::testing::internal::Int32 GTEST_FLAG(name) = (default_val)
-# define GTEST_DEFINE_string_(name, default_val, doc) \
-    GTEST_API_ ::std::string GTEST_FLAG(name) = (default_val)
-
-#endif  // !defined(GTEST_DECLARE_bool_)
-
-// Thread annotations
-#if !defined(GTEST_EXCLUSIVE_LOCK_REQUIRED_)
-# define GTEST_EXCLUSIVE_LOCK_REQUIRED_(locks)
-# define GTEST_LOCK_EXCLUDED_(locks)
-#endif  // !defined(GTEST_EXCLUSIVE_LOCK_REQUIRED_)
-
-// Parses 'str' for a 32-bit signed integer.  If successful, writes the result
-// to *value and returns true; otherwise leaves *value unchanged and returns
-// false.
-bool ParseInt32(const Message& src_text, const char* str, Int32* value);
-
-// Parses a bool/Int32/string from the environment variable
-// corresponding to the given Google Test flag.
-bool BoolFromGTestEnv(const char* flag, bool default_val);
-GTEST_API_ Int32 Int32FromGTestEnv(const char* flag, Int32 default_val);
-std::string OutputFlagAlsoCheckEnvVar();
-const char* StringFromGTestEnv(const char* flag, const char* default_val);
-
-}  // namespace internal
-}  // namespace testing
-
-#if !defined(GTEST_INTERNAL_DEPRECATED)
-
-// Internal Macro to mark an API deprecated, for googletest usage only
-// Usage: class GTEST_INTERNAL_DEPRECATED(message) MyClass or
-// GTEST_INTERNAL_DEPRECATED(message) <return_type> myFunction(); Every usage of
-// a deprecated entity will trigger a warning when compiled with
-// `-Wdeprecated-declarations` option (clang, gcc, any __GNUC__ compiler).
-// For msvc /W3 option will need to be used
-// Note that for 'other' compilers this macro evaluates to nothing to prevent
-// compilations errors.
-#if defined(_MSC_VER)
-#define GTEST_INTERNAL_DEPRECATED(message) __declspec(deprecated(message))
-#elif defined(__GNUC__)
-#define GTEST_INTERNAL_DEPRECATED(message) __attribute__((deprecated(message)))
-#else
-#define GTEST_INTERNAL_DEPRECATED(message)
-#endif
-
-#endif  // !defined(GTEST_INTERNAL_DEPRECATED)
-
-#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-string.h b/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-string.h
deleted file mode 100644
index 82aaa63bf46..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-string.h
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// The Google C++ Testing and Mocking Framework (Google Test)
-//
-// This header file declares the String class and functions used internally by
-// Google Test.  They are subject to change without notice. They should not used
-// by code external to Google Test.
-//
-// This header file is #included by gtest-internal.h.
-// It should not be #included by other files.
-
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_
-#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_
-
-#ifdef __BORLANDC__
-// string.h is not guaranteed to provide strcpy on C++ Builder.
-# include <mem.h>
-#endif
-
-#include <string.h>
-#include <string>
-
-#include "gtest/internal/gtest-port.h"
-
-namespace testing {
-namespace internal {
-
-// String - an abstract class holding static string utilities.
-class GTEST_API_ String {
- public:
-  // Static utility methods
-
-  // Clones a 0-terminated C string, allocating memory using new.  The
-  // caller is responsible for deleting the return value using
-  // delete[].  Returns the cloned string, or NULL if the input is
-  // NULL.
-  //
-  // This is different from strdup() in string.h, which allocates
-  // memory using malloc().
-  static const char* CloneCString(const char* c_str);
-
-#if GTEST_OS_WINDOWS_MOBILE
-  // Windows CE does not have the 'ANSI' versions of Win32 APIs. To be
-  // able to pass strings to Win32 APIs on CE we need to convert them
-  // to 'Unicode', UTF-16.
-
-  // Creates a UTF-16 wide string from the given ANSI string, allocating
-  // memory using new. The caller is responsible for deleting the return
-  // value using delete[]. Returns the wide string, or NULL if the
-  // input is NULL.
-  //
-  // The wide string is created using the ANSI codepage (CP_ACP) to
-  // match the behaviour of the ANSI versions of Win32 calls and the
-  // C runtime.
-  static LPCWSTR AnsiToUtf16(const char* c_str);
-
-  // Creates an ANSI string from the given wide string, allocating
-  // memory using new. The caller is responsible for deleting the return
-  // value using delete[]. Returns the ANSI string, or NULL if the
-  // input is NULL.
-  //
-  // The returned string is created using the ANSI codepage (CP_ACP) to
-  // match the behaviour of the ANSI versions of Win32 calls and the
-  // C runtime.
-  static const char* Utf16ToAnsi(LPCWSTR utf16_str);
-#endif
-
-  // Compares two C strings.  Returns true if and only if they have the same
-  // content.
-  //
-  // Unlike strcmp(), this function can handle NULL argument(s).  A
-  // NULL C string is considered different to any non-NULL C string,
-  // including the empty string.
-  static bool CStringEquals(const char* lhs, const char* rhs);
-
-  // Converts a wide C string to a String using the UTF-8 encoding.
-  // NULL will be converted to "(null)".  If an error occurred during
-  // the conversion, "(failed to convert from wide string)" is
-  // returned.
-  static std::string ShowWideCString(const wchar_t* wide_c_str);
-
-  // Compares two wide C strings.  Returns true if and only if they have the
-  // same content.
-  //
-  // Unlike wcscmp(), this function can handle NULL argument(s).  A
-  // NULL C string is considered different to any non-NULL C string,
-  // including the empty string.
-  static bool WideCStringEquals(const wchar_t* lhs, const wchar_t* rhs);
-
-  // Compares two C strings, ignoring case.  Returns true if and only if
-  // they have the same content.
-  //
-  // Unlike strcasecmp(), this function can handle NULL argument(s).
-  // A NULL C string is considered different to any non-NULL C string,
-  // including the empty string.
-  static bool CaseInsensitiveCStringEquals(const char* lhs,
-                                           const char* rhs);
-
-  // Compares two wide C strings, ignoring case.  Returns true if and only if
-  // they have the same content.
-  //
-  // Unlike wcscasecmp(), this function can handle NULL argument(s).
-  // A NULL C string is considered different to any non-NULL wide C string,
-  // including the empty string.
-  // NB: The implementations on different platforms slightly differ.
-  // On windows, this method uses _wcsicmp which compares according to LC_CTYPE
-  // environment variable. On GNU platform this method uses wcscasecmp
-  // which compares according to LC_CTYPE category of the current locale.
-  // On MacOS X, it uses towlower, which also uses LC_CTYPE category of the
-  // current locale.
-  static bool CaseInsensitiveWideCStringEquals(const wchar_t* lhs,
-                                               const wchar_t* rhs);
-
-  // Returns true if and only if the given string ends with the given suffix,
-  // ignoring case. Any string is considered to end with an empty suffix.
-  static bool EndsWithCaseInsensitive(
-      const std::string& str, const std::string& suffix);
-
-  // Formats an int value as "%02d".
-  static std::string FormatIntWidth2(int value);  // "%02d" for width == 2
-
-  // Formats an int value as "%X".
-  static std::string FormatHexInt(int value);
-
-  // Formats an int value as "%X".
-  static std::string FormatHexUInt32(UInt32 value);
-
-  // Formats a byte as "%02X".
-  static std::string FormatByte(unsigned char value);
-
- private:
-  String();  // Not meant to be instantiated.
-};  // class String
-
-// Gets the content of the stringstream's buffer as an std::string.  Each '\0'
-// character in the buffer is replaced with "\\0".
-GTEST_API_ std::string StringStreamToString(::std::stringstream* stream);
-
-}  // namespace internal
-}  // namespace testing
-
-#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-type-util.h b/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-type-util.h
deleted file mode 100644
index 3d7542d1fb3..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-type-util.h
+++ /dev/null
@@ -1,3335 +0,0 @@
-// This file was GENERATED by command:
-//     pump.py gtest-type-util.h.pump
-// DO NOT EDIT BY HAND!!!
-
-// Copyright 2008 Google Inc.
-// All Rights Reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Type utilities needed for implementing typed and type-parameterized
-// tests.  This file is generated by a SCRIPT.  DO NOT EDIT BY HAND!
-//
-// Currently we support at most 50 types in a list, and at most 50
-// type-parameterized tests in one type-parameterized test suite.
-// Please contact googletestframework@googlegroups.com if you need
-// more.
-
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
-#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
-
-#include "gtest/internal/gtest-port.h"
-
-// #ifdef __GNUC__ is too general here.  It is possible to use gcc without using
-// libstdc++ (which is where cxxabi.h comes from).
-# if GTEST_HAS_CXXABI_H_
-#  include <cxxabi.h>
-# elif defined(__HP_aCC)
-#  include <acxx_demangle.h>
-# endif  // GTEST_HASH_CXXABI_H_
-
-namespace testing {
-namespace internal {
-
-// Canonicalizes a given name with respect to the Standard C++ Library.
-// This handles removing the inline namespace within `std` that is
-// used by various standard libraries (e.g., `std::__1`).  Names outside
-// of namespace std are returned unmodified.
-inline std::string CanonicalizeForStdLibVersioning(std::string s) {
-  static const char prefix[] = "std::__";
-  if (s.compare(0, strlen(prefix), prefix) == 0) {
-    std::string::size_type end = s.find("::", strlen(prefix));
-    if (end != s.npos) {
-      // Erase everything between the initial `std` and the second `::`.
-      s.erase(strlen("std"), end - strlen("std"));
-    }
-  }
-  return s;
-}
-
-// GetTypeName<T>() returns a human-readable name of type T.
-// NB: This function is also used in Google Mock, so don't move it inside of
-// the typed-test-only section below.
-template <typename T>
-std::string GetTypeName() {
-# if GTEST_HAS_RTTI
-
-  const char* const name = typeid(T).name();
-#  if GTEST_HAS_CXXABI_H_ || defined(__HP_aCC)
-  int status = 0;
-  // gcc's implementation of typeid(T).name() mangles the type name,
-  // so we have to demangle it.
-#   if GTEST_HAS_CXXABI_H_
-  using abi::__cxa_demangle;
-#   endif  // GTEST_HAS_CXXABI_H_
-  char* const readable_name = __cxa_demangle(name, nullptr, nullptr, &status);
-  const std::string name_str(status == 0 ? readable_name : name);
-  free(readable_name);
-  return CanonicalizeForStdLibVersioning(name_str);
-#  else
-  return name;
-#  endif  // GTEST_HAS_CXXABI_H_ || __HP_aCC
-
-# else
-
-  return "<type>";
-
-# endif  // GTEST_HAS_RTTI
-}
-
-#if GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
-
-// A unique type used as the default value for the arguments of class
-// template Types.  This allows us to simulate variadic templates
-// (e.g. Types<int>, Type<int, double>, and etc), which C++ doesn't
-// support directly.
-struct None {};
-
-// The following family of struct and struct templates are used to
-// represent type lists.  In particular, TypesN<T1, T2, ..., TN>
-// represents a type list with N types (T1, T2, ..., and TN) in it.
-// Except for Types0, every struct in the family has two member types:
-// Head for the first type in the list, and Tail for the rest of the
-// list.
-
-// The empty type list.
-struct Types0 {};
-
-// Type lists of length 1, 2, 3, and so on.
-
-template <typename T1>
-struct Types1 {
-  typedef T1 Head;
-  typedef Types0 Tail;
-};
-template <typename T1, typename T2>
-struct Types2 {
-  typedef T1 Head;
-  typedef Types1<T2> Tail;
-};
-
-template <typename T1, typename T2, typename T3>
-struct Types3 {
-  typedef T1 Head;
-  typedef Types2<T2, T3> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4>
-struct Types4 {
-  typedef T1 Head;
-  typedef Types3<T2, T3, T4> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5>
-struct Types5 {
-  typedef T1 Head;
-  typedef Types4<T2, T3, T4, T5> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6>
-struct Types6 {
-  typedef T1 Head;
-  typedef Types5<T2, T3, T4, T5, T6> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7>
-struct Types7 {
-  typedef T1 Head;
-  typedef Types6<T2, T3, T4, T5, T6, T7> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8>
-struct Types8 {
-  typedef T1 Head;
-  typedef Types7<T2, T3, T4, T5, T6, T7, T8> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9>
-struct Types9 {
-  typedef T1 Head;
-  typedef Types8<T2, T3, T4, T5, T6, T7, T8, T9> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10>
-struct Types10 {
-  typedef T1 Head;
-  typedef Types9<T2, T3, T4, T5, T6, T7, T8, T9, T10> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11>
-struct Types11 {
-  typedef T1 Head;
-  typedef Types10<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12>
-struct Types12 {
-  typedef T1 Head;
-  typedef Types11<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13>
-struct Types13 {
-  typedef T1 Head;
-  typedef Types12<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14>
-struct Types14 {
-  typedef T1 Head;
-  typedef Types13<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15>
-struct Types15 {
-  typedef T1 Head;
-  typedef Types14<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16>
-struct Types16 {
-  typedef T1 Head;
-  typedef Types15<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17>
-struct Types17 {
-  typedef T1 Head;
-  typedef Types16<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18>
-struct Types18 {
-  typedef T1 Head;
-  typedef Types17<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19>
-struct Types19 {
-  typedef T1 Head;
-  typedef Types18<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20>
-struct Types20 {
-  typedef T1 Head;
-  typedef Types19<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21>
-struct Types21 {
-  typedef T1 Head;
-  typedef Types20<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22>
-struct Types22 {
-  typedef T1 Head;
-  typedef Types21<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23>
-struct Types23 {
-  typedef T1 Head;
-  typedef Types22<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24>
-struct Types24 {
-  typedef T1 Head;
-  typedef Types23<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25>
-struct Types25 {
-  typedef T1 Head;
-  typedef Types24<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26>
-struct Types26 {
-  typedef T1 Head;
-  typedef Types25<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27>
-struct Types27 {
-  typedef T1 Head;
-  typedef Types26<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28>
-struct Types28 {
-  typedef T1 Head;
-  typedef Types27<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29>
-struct Types29 {
-  typedef T1 Head;
-  typedef Types28<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30>
-struct Types30 {
-  typedef T1 Head;
-  typedef Types29<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31>
-struct Types31 {
-  typedef T1 Head;
-  typedef Types30<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32>
-struct Types32 {
-  typedef T1 Head;
-  typedef Types31<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33>
-struct Types33 {
-  typedef T1 Head;
-  typedef Types32<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34>
-struct Types34 {
-  typedef T1 Head;
-  typedef Types33<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33, T34> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35>
-struct Types35 {
-  typedef T1 Head;
-  typedef Types34<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33, T34, T35> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36>
-struct Types36 {
-  typedef T1 Head;
-  typedef Types35<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33, T34, T35, T36> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37>
-struct Types37 {
-  typedef T1 Head;
-  typedef Types36<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33, T34, T35, T36, T37> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38>
-struct Types38 {
-  typedef T1 Head;
-  typedef Types37<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33, T34, T35, T36, T37, T38> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39>
-struct Types39 {
-  typedef T1 Head;
-  typedef Types38<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40>
-struct Types40 {
-  typedef T1 Head;
-  typedef Types39<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41>
-struct Types41 {
-  typedef T1 Head;
-  typedef Types40<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42>
-struct Types42 {
-  typedef T1 Head;
-  typedef Types41<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42, typename T43>
-struct Types43 {
-  typedef T1 Head;
-  typedef Types42<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
-      T43> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42, typename T43, typename T44>
-struct Types44 {
-  typedef T1 Head;
-  typedef Types43<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
-      T44> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42, typename T43, typename T44, typename T45>
-struct Types45 {
-  typedef T1 Head;
-  typedef Types44<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
-      T44, T45> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42, typename T43, typename T44, typename T45,
-    typename T46>
-struct Types46 {
-  typedef T1 Head;
-  typedef Types45<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
-      T44, T45, T46> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42, typename T43, typename T44, typename T45,
-    typename T46, typename T47>
-struct Types47 {
-  typedef T1 Head;
-  typedef Types46<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
-      T44, T45, T46, T47> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42, typename T43, typename T44, typename T45,
-    typename T46, typename T47, typename T48>
-struct Types48 {
-  typedef T1 Head;
-  typedef Types47<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
-      T44, T45, T46, T47, T48> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42, typename T43, typename T44, typename T45,
-    typename T46, typename T47, typename T48, typename T49>
-struct Types49 {
-  typedef T1 Head;
-  typedef Types48<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
-      T44, T45, T46, T47, T48, T49> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42, typename T43, typename T44, typename T45,
-    typename T46, typename T47, typename T48, typename T49, typename T50>
-struct Types50 {
-  typedef T1 Head;
-  typedef Types49<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
-      T44, T45, T46, T47, T48, T49, T50> Tail;
-};
-
-
-}  // namespace internal
-
-// We don't want to require the users to write TypesN<...> directly,
-// as that would require them to count the length.  Types<...> is much
-// easier to write, but generates horrible messages when there is a
-// compiler error, as gcc insists on printing out each template
-// argument, even if it has the default value (this means Types<int>
-// will appear as Types<int, None, None, ..., None> in the compiler
-// errors).
-//
-// Our solution is to combine the best part of the two approaches: a
-// user would write Types<T1, ..., TN>, and Google Test will translate
-// that to TypesN<T1, ..., TN> internally to make error messages
-// readable.  The translation is done by the 'type' member of the
-// Types template.
-template <typename T1 = internal::None, typename T2 = internal::None,
-    typename T3 = internal::None, typename T4 = internal::None,
-    typename T5 = internal::None, typename T6 = internal::None,
-    typename T7 = internal::None, typename T8 = internal::None,
-    typename T9 = internal::None, typename T10 = internal::None,
-    typename T11 = internal::None, typename T12 = internal::None,
-    typename T13 = internal::None, typename T14 = internal::None,
-    typename T15 = internal::None, typename T16 = internal::None,
-    typename T17 = internal::None, typename T18 = internal::None,
-    typename T19 = internal::None, typename T20 = internal::None,
-    typename T21 = internal::None, typename T22 = internal::None,
-    typename T23 = internal::None, typename T24 = internal::None,
-    typename T25 = internal::None, typename T26 = internal::None,
-    typename T27 = internal::None, typename T28 = internal::None,
-    typename T29 = internal::None, typename T30 = internal::None,
-    typename T31 = internal::None, typename T32 = internal::None,
-    typename T33 = internal::None, typename T34 = internal::None,
-    typename T35 = internal::None, typename T36 = internal::None,
-    typename T37 = internal::None, typename T38 = internal::None,
-    typename T39 = internal::None, typename T40 = internal::None,
-    typename T41 = internal::None, typename T42 = internal::None,
-    typename T43 = internal::None, typename T44 = internal::None,
-    typename T45 = internal::None, typename T46 = internal::None,
-    typename T47 = internal::None, typename T48 = internal::None,
-    typename T49 = internal::None, typename T50 = internal::None>
-struct Types {
-  typedef internal::Types50<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
-      T41, T42, T43, T44, T45, T46, T47, T48, T49, T50> type;
-};
-
-template <>
-struct Types<internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None> {
-  typedef internal::Types0 type;
-};
-template <typename T1>
-struct Types<T1, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None> {
-  typedef internal::Types1<T1> type;
-};
-template <typename T1, typename T2>
-struct Types<T1, T2, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None> {
-  typedef internal::Types2<T1, T2> type;
-};
-template <typename T1, typename T2, typename T3>
-struct Types<T1, T2, T3, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None> {
-  typedef internal::Types3<T1, T2, T3> type;
-};
-template <typename T1, typename T2, typename T3, typename T4>
-struct Types<T1, T2, T3, T4, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None> {
-  typedef internal::Types4<T1, T2, T3, T4> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5>
-struct Types<T1, T2, T3, T4, T5, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None> {
-  typedef internal::Types5<T1, T2, T3, T4, T5> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6>
-struct Types<T1, T2, T3, T4, T5, T6, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None> {
-  typedef internal::Types6<T1, T2, T3, T4, T5, T6> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7>
-struct Types<T1, T2, T3, T4, T5, T6, T7, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None> {
-  typedef internal::Types7<T1, T2, T3, T4, T5, T6, T7> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None> {
-  typedef internal::Types8<T1, T2, T3, T4, T5, T6, T7, T8> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None> {
-  typedef internal::Types9<T1, T2, T3, T4, T5, T6, T7, T8, T9> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None> {
-  typedef internal::Types10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None> {
-  typedef internal::Types11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None> {
-  typedef internal::Types12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
-      T12> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None> {
-  typedef internal::Types13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None> {
-  typedef internal::Types14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None> {
-  typedef internal::Types15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None> {
-  typedef internal::Types16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None> {
-  typedef internal::Types17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None> {
-  typedef internal::Types18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None> {
-  typedef internal::Types19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None> {
-  typedef internal::Types20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None> {
-  typedef internal::Types21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None> {
-  typedef internal::Types22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None> {
-  typedef internal::Types23<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None> {
-  typedef internal::Types24<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None> {
-  typedef internal::Types25<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None> {
-  typedef internal::Types26<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
-      T26> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None> {
-  typedef internal::Types27<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None> {
-  typedef internal::Types28<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None> {
-  typedef internal::Types29<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None> {
-  typedef internal::Types30<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None> {
-  typedef internal::Types31<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None> {
-  typedef internal::Types32<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None> {
-  typedef internal::Types33<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None> {
-  typedef internal::Types34<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None> {
-  typedef internal::Types35<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34, T35> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, T36, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None> {
-  typedef internal::Types36<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, T36, T37, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None> {
-  typedef internal::Types37<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, T36, T37, T38, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None> {
-  typedef internal::Types38<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, T36, T37, T38, T39, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None> {
-  typedef internal::Types39<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None> {
-  typedef internal::Types40<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
-      T40> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None> {
-  typedef internal::Types41<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
-      T41> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None> {
-  typedef internal::Types42<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
-      T41, T42> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42, typename T43>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None> {
-  typedef internal::Types43<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
-      T41, T42, T43> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42, typename T43, typename T44>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None> {
-  typedef internal::Types44<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
-      T41, T42, T43, T44> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42, typename T43, typename T44, typename T45>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44, T45,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None> {
-  typedef internal::Types45<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
-      T41, T42, T43, T44, T45> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42, typename T43, typename T44, typename T45,
-    typename T46>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44, T45,
-    T46, internal::None, internal::None, internal::None, internal::None> {
-  typedef internal::Types46<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
-      T41, T42, T43, T44, T45, T46> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42, typename T43, typename T44, typename T45,
-    typename T46, typename T47>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44, T45,
-    T46, T47, internal::None, internal::None, internal::None> {
-  typedef internal::Types47<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
-      T41, T42, T43, T44, T45, T46, T47> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42, typename T43, typename T44, typename T45,
-    typename T46, typename T47, typename T48>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44, T45,
-    T46, T47, T48, internal::None, internal::None> {
-  typedef internal::Types48<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
-      T41, T42, T43, T44, T45, T46, T47, T48> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42, typename T43, typename T44, typename T45,
-    typename T46, typename T47, typename T48, typename T49>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44, T45,
-    T46, T47, T48, T49, internal::None> {
-  typedef internal::Types49<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
-      T41, T42, T43, T44, T45, T46, T47, T48, T49> type;
-};
-
-namespace internal {
-
-# define GTEST_TEMPLATE_ template <typename T> class
-
-// The template "selector" struct TemplateSel<Tmpl> is used to
-// represent Tmpl, which must be a class template with one type
-// parameter, as a type.  TemplateSel<Tmpl>::Bind<T>::type is defined
-// as the type Tmpl<T>.  This allows us to actually instantiate the
-// template "selected" by TemplateSel<Tmpl>.
-//
-// This trick is necessary for simulating typedef for class templates,
-// which C++ doesn't support directly.
-template <GTEST_TEMPLATE_ Tmpl>
-struct TemplateSel {
-  template <typename T>
-  struct Bind {
-    typedef Tmpl<T> type;
-  };
-};
-
-# define GTEST_BIND_(TmplSel, T) \
-  TmplSel::template Bind<T>::type
-
-// A unique struct template used as the default value for the
-// arguments of class template Templates.  This allows us to simulate
-// variadic templates (e.g. Templates<int>, Templates<int, double>,
-// and etc), which C++ doesn't support directly.
-template <typename T>
-struct NoneT {};
-
-// The following family of struct and struct templates are used to
-// represent template lists.  In particular, TemplatesN<T1, T2, ...,
-// TN> represents a list of N templates (T1, T2, ..., and TN).  Except
-// for Templates0, every struct in the family has two member types:
-// Head for the selector of the first template in the list, and Tail
-// for the rest of the list.
-
-// The empty template list.
-struct Templates0 {};
-
-// Template lists of length 1, 2, 3, and so on.
-
-template <GTEST_TEMPLATE_ T1>
-struct Templates1 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates0 Tail;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2>
-struct Templates2 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates1<T2> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3>
-struct Templates3 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates2<T2, T3> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4>
-struct Templates4 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates3<T2, T3, T4> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5>
-struct Templates5 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates4<T2, T3, T4, T5> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6>
-struct Templates6 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates5<T2, T3, T4, T5, T6> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7>
-struct Templates7 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates6<T2, T3, T4, T5, T6, T7> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8>
-struct Templates8 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates7<T2, T3, T4, T5, T6, T7, T8> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9>
-struct Templates9 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates8<T2, T3, T4, T5, T6, T7, T8, T9> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10>
-struct Templates10 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates9<T2, T3, T4, T5, T6, T7, T8, T9, T10> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11>
-struct Templates11 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates10<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12>
-struct Templates12 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates11<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13>
-struct Templates13 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates12<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14>
-struct Templates14 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates13<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15>
-struct Templates15 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates14<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16>
-struct Templates16 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates15<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17>
-struct Templates17 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates16<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18>
-struct Templates18 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates17<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19>
-struct Templates19 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates18<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20>
-struct Templates20 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates19<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21>
-struct Templates21 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates20<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22>
-struct Templates22 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates21<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23>
-struct Templates23 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates22<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24>
-struct Templates24 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates23<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25>
-struct Templates25 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates24<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26>
-struct Templates26 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates25<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27>
-struct Templates27 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates26<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28>
-struct Templates28 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates27<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29>
-struct Templates29 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates28<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30>
-struct Templates30 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates29<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31>
-struct Templates31 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates30<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32>
-struct Templates32 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates31<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33>
-struct Templates33 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates32<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34>
-struct Templates34 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates33<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33, T34> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35>
-struct Templates35 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates34<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33, T34, T35> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36>
-struct Templates36 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates35<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33, T34, T35, T36> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37>
-struct Templates37 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates36<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33, T34, T35, T36, T37> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38>
-struct Templates38 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates37<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39>
-struct Templates39 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates38<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40>
-struct Templates40 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates39<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41>
-struct Templates41 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates40<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42>
-struct Templates42 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates41<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
-      T42> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
-    GTEST_TEMPLATE_ T43>
-struct Templates43 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates42<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
-      T43> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
-    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44>
-struct Templates44 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates43<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
-      T43, T44> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
-    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45>
-struct Templates45 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates44<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
-      T43, T44, T45> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
-    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
-    GTEST_TEMPLATE_ T46>
-struct Templates46 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates45<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
-      T43, T44, T45, T46> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
-    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
-    GTEST_TEMPLATE_ T46, GTEST_TEMPLATE_ T47>
-struct Templates47 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates46<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
-      T43, T44, T45, T46, T47> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
-    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
-    GTEST_TEMPLATE_ T46, GTEST_TEMPLATE_ T47, GTEST_TEMPLATE_ T48>
-struct Templates48 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates47<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
-      T43, T44, T45, T46, T47, T48> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
-    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
-    GTEST_TEMPLATE_ T46, GTEST_TEMPLATE_ T47, GTEST_TEMPLATE_ T48,
-    GTEST_TEMPLATE_ T49>
-struct Templates49 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates48<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
-      T43, T44, T45, T46, T47, T48, T49> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
-    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
-    GTEST_TEMPLATE_ T46, GTEST_TEMPLATE_ T47, GTEST_TEMPLATE_ T48,
-    GTEST_TEMPLATE_ T49, GTEST_TEMPLATE_ T50>
-struct Templates50 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates49<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
-      T43, T44, T45, T46, T47, T48, T49, T50> Tail;
-};
-
-
-// We don't want to require the users to write TemplatesN<...> directly,
-// as that would require them to count the length.  Templates<...> is much
-// easier to write, but generates horrible messages when there is a
-// compiler error, as gcc insists on printing out each template
-// argument, even if it has the default value (this means Templates<list>
-// will appear as Templates<list, NoneT, NoneT, ..., NoneT> in the compiler
-// errors).
-//
-// Our solution is to combine the best part of the two approaches: a
-// user would write Templates<T1, ..., TN>, and Google Test will translate
-// that to TemplatesN<T1, ..., TN> internally to make error messages
-// readable.  The translation is done by the 'type' member of the
-// Templates template.
-template <GTEST_TEMPLATE_ T1 = NoneT, GTEST_TEMPLATE_ T2 = NoneT,
-    GTEST_TEMPLATE_ T3 = NoneT, GTEST_TEMPLATE_ T4 = NoneT,
-    GTEST_TEMPLATE_ T5 = NoneT, GTEST_TEMPLATE_ T6 = NoneT,
-    GTEST_TEMPLATE_ T7 = NoneT, GTEST_TEMPLATE_ T8 = NoneT,
-    GTEST_TEMPLATE_ T9 = NoneT, GTEST_TEMPLATE_ T10 = NoneT,
-    GTEST_TEMPLATE_ T11 = NoneT, GTEST_TEMPLATE_ T12 = NoneT,
-    GTEST_TEMPLATE_ T13 = NoneT, GTEST_TEMPLATE_ T14 = NoneT,
-    GTEST_TEMPLATE_ T15 = NoneT, GTEST_TEMPLATE_ T16 = NoneT,
-    GTEST_TEMPLATE_ T17 = NoneT, GTEST_TEMPLATE_ T18 = NoneT,
-    GTEST_TEMPLATE_ T19 = NoneT, GTEST_TEMPLATE_ T20 = NoneT,
-    GTEST_TEMPLATE_ T21 = NoneT, GTEST_TEMPLATE_ T22 = NoneT,
-    GTEST_TEMPLATE_ T23 = NoneT, GTEST_TEMPLATE_ T24 = NoneT,
-    GTEST_TEMPLATE_ T25 = NoneT, GTEST_TEMPLATE_ T26 = NoneT,
-    GTEST_TEMPLATE_ T27 = NoneT, GTEST_TEMPLATE_ T28 = NoneT,
-    GTEST_TEMPLATE_ T29 = NoneT, GTEST_TEMPLATE_ T30 = NoneT,
-    GTEST_TEMPLATE_ T31 = NoneT, GTEST_TEMPLATE_ T32 = NoneT,
-    GTEST_TEMPLATE_ T33 = NoneT, GTEST_TEMPLATE_ T34 = NoneT,
-    GTEST_TEMPLATE_ T35 = NoneT, GTEST_TEMPLATE_ T36 = NoneT,
-    GTEST_TEMPLATE_ T37 = NoneT, GTEST_TEMPLATE_ T38 = NoneT,
-    GTEST_TEMPLATE_ T39 = NoneT, GTEST_TEMPLATE_ T40 = NoneT,
-    GTEST_TEMPLATE_ T41 = NoneT, GTEST_TEMPLATE_ T42 = NoneT,
-    GTEST_TEMPLATE_ T43 = NoneT, GTEST_TEMPLATE_ T44 = NoneT,
-    GTEST_TEMPLATE_ T45 = NoneT, GTEST_TEMPLATE_ T46 = NoneT,
-    GTEST_TEMPLATE_ T47 = NoneT, GTEST_TEMPLATE_ T48 = NoneT,
-    GTEST_TEMPLATE_ T49 = NoneT, GTEST_TEMPLATE_ T50 = NoneT>
-struct Templates {
-  typedef Templates50<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
-      T42, T43, T44, T45, T46, T47, T48, T49, T50> type;
-};
-
-template <>
-struct Templates<NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT> {
-  typedef Templates0 type;
-};
-template <GTEST_TEMPLATE_ T1>
-struct Templates<T1, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT> {
-  typedef Templates1<T1> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2>
-struct Templates<T1, T2, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT> {
-  typedef Templates2<T1, T2> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3>
-struct Templates<T1, T2, T3, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates3<T1, T2, T3> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4>
-struct Templates<T1, T2, T3, T4, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates4<T1, T2, T3, T4> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5>
-struct Templates<T1, T2, T3, T4, T5, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates5<T1, T2, T3, T4, T5> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6>
-struct Templates<T1, T2, T3, T4, T5, T6, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates6<T1, T2, T3, T4, T5, T6> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates7<T1, T2, T3, T4, T5, T6, T7> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates8<T1, T2, T3, T4, T5, T6, T7, T8> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates9<T1, T2, T3, T4, T5, T6, T7, T8, T9> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT> {
-  typedef Templates22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT> {
-  typedef Templates23<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT> {
-  typedef Templates24<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT> {
-  typedef Templates25<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT> {
-  typedef Templates26<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT> {
-  typedef Templates27<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT> {
-  typedef Templates28<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT> {
-  typedef Templates29<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates30<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates31<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates32<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, T33, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates33<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, T33, T34, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates34<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33, T34> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, T33, T34, T35, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates35<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33, T34, T35> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, T33, T34, T35, T36, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates36<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33, T34, T35, T36> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, T33, T34, T35, T36, T37, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates37<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, T33, T34, T35, T36, T37, T38, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates38<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates39<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates40<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates41<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
-      T41> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates42<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
-      T42> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
-    GTEST_TEMPLATE_ T43>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates43<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
-      T42, T43> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
-    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates44<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
-      T42, T43, T44> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
-    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44,
-    T45, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates45<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
-      T42, T43, T44, T45> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
-    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
-    GTEST_TEMPLATE_ T46>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44,
-    T45, T46, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates46<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
-      T42, T43, T44, T45, T46> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
-    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
-    GTEST_TEMPLATE_ T46, GTEST_TEMPLATE_ T47>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44,
-    T45, T46, T47, NoneT, NoneT, NoneT> {
-  typedef Templates47<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
-      T42, T43, T44, T45, T46, T47> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
-    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
-    GTEST_TEMPLATE_ T46, GTEST_TEMPLATE_ T47, GTEST_TEMPLATE_ T48>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44,
-    T45, T46, T47, T48, NoneT, NoneT> {
-  typedef Templates48<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
-      T42, T43, T44, T45, T46, T47, T48> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
-    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
-    GTEST_TEMPLATE_ T46, GTEST_TEMPLATE_ T47, GTEST_TEMPLATE_ T48,
-    GTEST_TEMPLATE_ T49>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44,
-    T45, T46, T47, T48, T49, NoneT> {
-  typedef Templates49<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
-      T42, T43, T44, T45, T46, T47, T48, T49> type;
-};
-
-// The TypeList template makes it possible to use either a single type
-// or a Types<...> list in TYPED_TEST_SUITE() and
-// INSTANTIATE_TYPED_TEST_SUITE_P().
-
-template <typename T>
-struct TypeList {
-  typedef Types1<T> type;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42, typename T43, typename T44, typename T45,
-    typename T46, typename T47, typename T48, typename T49, typename T50>
-struct TypeList<Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
-    T44, T45, T46, T47, T48, T49, T50> > {
-  typedef typename Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
-      T41, T42, T43, T44, T45, T46, T47, T48, T49, T50>::type type;
-};
-
-#endif  // GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
-
-}  // namespace internal
-}  // namespace testing
-
-#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googletest/src/gtest-all.cc b/gnu/llvm/llvm/utils/unittest/googletest/src/gtest-all.cc
deleted file mode 100644
index ad292905cf3..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googletest/src/gtest-all.cc
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-//
-// Google C++ Testing and Mocking Framework (Google Test)
-//
-// Sometimes it's desirable to build Google Test by compiling a single file.
-// This file serves this purpose.
-
-// This line ensures that gtest.h can be compiled on its own, even
-// when it's fused.
-#include "gtest/gtest.h"
-
-// The following lines pull in the real gtest *.cc files.
-#include "src/gtest.cc"
-#include "src/gtest-death-test.cc"
-#include "src/gtest-filepath.cc"
-#include "src/gtest-matchers.cc"
-#include "src/gtest-port.cc"
-#include "src/gtest-printers.cc"
-#include "src/gtest-test-part.cc"
-#include "src/gtest-typed-test.cc"
diff --git a/gnu/llvm/llvm/utils/unittest/googletest/src/gtest-death-test.cc b/gnu/llvm/llvm/utils/unittest/googletest/src/gtest-death-test.cc
deleted file mode 100644
index 5d1031bea25..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googletest/src/gtest-death-test.cc
+++ /dev/null
@@ -1,1653 +0,0 @@
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-//
-// This file implements death tests.
-
-#include "gtest/gtest-death-test.h"
-
-#include <utility>
-
-#include "gtest/internal/gtest-port.h"
-#include "gtest/internal/custom/gtest.h"
-
-#if GTEST_HAS_DEATH_TEST
-
-# if GTEST_OS_MAC
-#  include <crt_externs.h>
-# endif  // GTEST_OS_MAC
-
-# include <errno.h>
-# include <fcntl.h>
-# include <limits.h>
-
-# if GTEST_OS_LINUX
-#  include <signal.h>
-# endif  // GTEST_OS_LINUX
-
-# include <stdarg.h>
-
-# if GTEST_OS_WINDOWS
-#  include <windows.h>
-# else
-#  include <sys/mman.h>
-#  include <sys/wait.h>
-# endif  // GTEST_OS_WINDOWS
-
-# if GTEST_OS_QNX
-#  include <spawn.h>
-# endif  // GTEST_OS_QNX
-
-# if GTEST_OS_FUCHSIA
-#  include <lib/fdio/fd.h>
-#  include <lib/fdio/io.h>
-#  include <lib/fdio/spawn.h>
-#  include <lib/zx/channel.h>
-#  include <lib/zx/port.h>
-#  include <lib/zx/process.h>
-#  include <lib/zx/socket.h>
-#  include <zircon/processargs.h>
-#  include <zircon/syscalls.h>
-#  include <zircon/syscalls/policy.h>
-#  include <zircon/syscalls/port.h>
-# endif  // GTEST_OS_FUCHSIA
-
-#endif  // GTEST_HAS_DEATH_TEST
-
-#include "gtest/gtest-message.h"
-#include "gtest/internal/gtest-string.h"
-#include "src/gtest-internal-inl.h"
-
-namespace testing {
-
-// Constants.
-
-// The default death test style.
-//
-// This is defined in internal/gtest-port.h as "fast", but can be overridden by
-// a definition in internal/custom/gtest-port.h. The recommended value, which is
-// used internally at Google, is "threadsafe".
-static const char kDefaultDeathTestStyle[] = GTEST_DEFAULT_DEATH_TEST_STYLE;
-
-GTEST_DEFINE_string_(
-    death_test_style,
-    internal::StringFromGTestEnv("death_test_style", kDefaultDeathTestStyle),
-    "Indicates how to run a death test in a forked child process: "
-    "\"threadsafe\" (child process re-executes the test binary "
-    "from the beginning, running only the specific death test) or "
-    "\"fast\" (child process runs the death test immediately "
-    "after forking).");
-
-GTEST_DEFINE_bool_(
-    death_test_use_fork,
-    internal::BoolFromGTestEnv("death_test_use_fork", false),
-    "Instructs to use fork()/_exit() instead of clone() in death tests. "
-    "Ignored and always uses fork() on POSIX systems where clone() is not "
-    "implemented. Useful when running under valgrind or similar tools if "
-    "those do not support clone(). Valgrind 3.3.1 will just fail if "
-    "it sees an unsupported combination of clone() flags. "
-    "It is not recommended to use this flag w/o valgrind though it will "
-    "work in 99% of the cases. Once valgrind is fixed, this flag will "
-    "most likely be removed.");
-
-namespace internal {
-GTEST_DEFINE_string_(
-    internal_run_death_test, "",
-    "Indicates the file, line number, temporal index of "
-    "the single death test to run, and a file descriptor to "
-    "which a success code may be sent, all separated by "
-    "the '|' characters.  This flag is specified if and only if the "
-    "current process is a sub-process launched for running a thread-safe "
-    "death test.  FOR INTERNAL USE ONLY.");
-}  // namespace internal
-
-#if GTEST_HAS_DEATH_TEST
-
-namespace internal {
-
-// Valid only for fast death tests. Indicates the code is running in the
-// child process of a fast style death test.
-# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
-static bool g_in_fast_death_test_child = false;
-# endif
-
-// Returns a Boolean value indicating whether the caller is currently
-// executing in the context of the death test child process.  Tools such as
-// Valgrind heap checkers may need this to modify their behavior in death
-// tests.  IMPORTANT: This is an internal utility.  Using it may break the
-// implementation of death tests.  User code MUST NOT use it.
-bool InDeathTestChild() {
-# if GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
-
-  // On Windows and Fuchsia, death tests are thread-safe regardless of the value
-  // of the death_test_style flag.
-  return !GTEST_FLAG(internal_run_death_test).empty();
-
-# else
-
-  if (GTEST_FLAG(death_test_style) == "threadsafe")
-    return !GTEST_FLAG(internal_run_death_test).empty();
-  else
-    return g_in_fast_death_test_child;
-#endif
-}
-
-}  // namespace internal
-
-// ExitedWithCode constructor.
-ExitedWithCode::ExitedWithCode(int exit_code) : exit_code_(exit_code) {
-}
-
-// ExitedWithCode function-call operator.
-bool ExitedWithCode::operator()(int exit_status) const {
-# if GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
-
-  return exit_status == exit_code_;
-
-# else
-
-  return WIFEXITED(exit_status) && WEXITSTATUS(exit_status) == exit_code_;
-
-# endif  // GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
-}
-
-# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
-// KilledBySignal constructor.
-KilledBySignal::KilledBySignal(int signum) : signum_(signum) {
-}
-
-// KilledBySignal function-call operator.
-bool KilledBySignal::operator()(int exit_status) const {
-#  if defined(GTEST_KILLED_BY_SIGNAL_OVERRIDE_)
-  {
-    bool result;
-    if (GTEST_KILLED_BY_SIGNAL_OVERRIDE_(signum_, exit_status, &result)) {
-      return result;
-    }
-  }
-#  endif  // defined(GTEST_KILLED_BY_SIGNAL_OVERRIDE_)
-  return WIFSIGNALED(exit_status) && WTERMSIG(exit_status) == signum_;
-}
-# endif  // !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
-
-namespace internal {
-
-// Utilities needed for death tests.
-
-// Generates a textual description of a given exit code, in the format
-// specified by wait(2).
-static std::string ExitSummary(int exit_code) {
-  Message m;
-
-# if GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
-
-  m << "Exited with exit status " << exit_code;
-
-# else
-
-  if (WIFEXITED(exit_code)) {
-    m << "Exited with exit status " << WEXITSTATUS(exit_code);
-  } else if (WIFSIGNALED(exit_code)) {
-    m << "Terminated by signal " << WTERMSIG(exit_code);
-  }
-#  ifdef WCOREDUMP
-  if (WCOREDUMP(exit_code)) {
-    m << " (core dumped)";
-  }
-#  endif
-# endif  // GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
-
-  return m.GetString();
-}
-
-// Returns true if exit_status describes a process that was terminated
-// by a signal, or exited normally with a nonzero exit code.
-bool ExitedUnsuccessfully(int exit_status) {
-  return !ExitedWithCode(0)(exit_status);
-}
-
-# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
-// Generates a textual failure message when a death test finds more than
-// one thread running, or cannot determine the number of threads, prior
-// to executing the given statement.  It is the responsibility of the
-// caller not to pass a thread_count of 1.
-static std::string DeathTestThreadWarning(size_t thread_count) {
-  Message msg;
-  msg << "Death tests use fork(), which is unsafe particularly"
-      << " in a threaded context. For this test, " << GTEST_NAME_ << " ";
-  if (thread_count == 0) {
-    msg << "couldn't detect the number of threads.";
-  } else {
-    msg << "detected " << thread_count << " threads.";
-  }
-  msg << " See "
-         "https://github.com/google/googletest/blob/master/googletest/docs/"
-         "advanced.md#death-tests-and-threads"
-      << " for more explanation and suggested solutions, especially if"
-      << " this is the last message you see before your test times out.";
-  return msg.GetString();
-}
-# endif  // !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
-
-// Flag characters for reporting a death test that did not die.
-static const char kDeathTestLived = 'L';
-static const char kDeathTestReturned = 'R';
-static const char kDeathTestThrew = 'T';
-static const char kDeathTestInternalError = 'I';
-
-#if GTEST_OS_FUCHSIA
-
-// File descriptor used for the pipe in the child process.
-static const int kFuchsiaReadPipeFd = 3;
-
-#endif
-
-// An enumeration describing all of the possible ways that a death test can
-// conclude.  DIED means that the process died while executing the test
-// code; LIVED means that process lived beyond the end of the test code;
-// RETURNED means that the test statement attempted to execute a return
-// statement, which is not allowed; THREW means that the test statement
-// returned control by throwing an exception.  IN_PROGRESS means the test
-// has not yet concluded.
-enum DeathTestOutcome { IN_PROGRESS, DIED, LIVED, RETURNED, THREW };
-
-// Routine for aborting the program which is safe to call from an
-// exec-style death test child process, in which case the error
-// message is propagated back to the parent process.  Otherwise, the
-// message is simply printed to stderr.  In either case, the program
-// then exits with status 1.
-static void DeathTestAbort(const std::string& message) {
-  // On a POSIX system, this function may be called from a threadsafe-style
-  // death test child process, which operates on a very small stack.  Use
-  // the heap for any additional non-minuscule memory requirements.
-  const InternalRunDeathTestFlag* const flag =
-      GetUnitTestImpl()->internal_run_death_test_flag();
-  if (flag != nullptr) {
-    FILE* parent = posix::FDOpen(flag->write_fd(), "w");
-    fputc(kDeathTestInternalError, parent);
-    fprintf(parent, "%s", message.c_str());
-    fflush(parent);
-    _exit(1);
-  } else {
-    fprintf(stderr, "%s", message.c_str());
-    fflush(stderr);
-    posix::Abort();
-  }
-}
-
-// A replacement for CHECK that calls DeathTestAbort if the assertion
-// fails.
-# define GTEST_DEATH_TEST_CHECK_(expression) \
-  do { \
-    if (!::testing::internal::IsTrue(expression)) { \
-      DeathTestAbort( \
-          ::std::string("CHECK failed: File ") + __FILE__ +  ", line " \
-          + ::testing::internal::StreamableToString(__LINE__) + ": " \
-          + #expression); \
-    } \
-  } while (::testing::internal::AlwaysFalse())
-
-// This macro is similar to GTEST_DEATH_TEST_CHECK_, but it is meant for
-// evaluating any system call that fulfills two conditions: it must return
-// -1 on failure, and set errno to EINTR when it is interrupted and
-// should be tried again.  The macro expands to a loop that repeatedly
-// evaluates the expression as long as it evaluates to -1 and sets
-// errno to EINTR.  If the expression evaluates to -1 but errno is
-// something other than EINTR, DeathTestAbort is called.
-# define GTEST_DEATH_TEST_CHECK_SYSCALL_(expression) \
-  do { \
-    int gtest_retval; \
-    do { \
-      gtest_retval = (expression); \
-    } while (gtest_retval == -1 && errno == EINTR); \
-    if (gtest_retval == -1) { \
-      DeathTestAbort( \
-          ::std::string("CHECK failed: File ") + __FILE__ + ", line " \
-          + ::testing::internal::StreamableToString(__LINE__) + ": " \
-          + #expression + " != -1"); \
-    } \
-  } while (::testing::internal::AlwaysFalse())
-
-// Returns the message describing the last system error in errno.
-std::string GetLastErrnoDescription() {
-    return errno == 0 ? "" : posix::StrError(errno);
-}
-
-// This is called from a death test parent process to read a failure
-// message from the death test child process and log it with the FATAL
-// severity. On Windows, the message is read from a pipe handle. On other
-// platforms, it is read from a file descriptor.
-static void FailFromInternalError(int fd) {
-  Message error;
-  char buffer[256];
-  int num_read;
-
-  do {
-    while ((num_read = posix::Read(fd, buffer, 255)) > 0) {
-      buffer[num_read] = '\0';
-      error << buffer;
-    }
-  } while (num_read == -1 && errno == EINTR);
-
-  if (num_read == 0) {
-    GTEST_LOG_(FATAL) << error.GetString();
-  } else {
-    const int last_error = errno;
-    GTEST_LOG_(FATAL) << "Error while reading death test internal: "
-                      << GetLastErrnoDescription() << " [" << last_error << "]";
-  }
-}
-
-// Death test constructor.  Increments the running death test count
-// for the current test.
-DeathTest::DeathTest() {
-  TestInfo* const info = GetUnitTestImpl()->current_test_info();
-  if (info == nullptr) {
-    DeathTestAbort("Cannot run a death test outside of a TEST or "
-                   "TEST_F construct");
-  }
-}
-
-// Creates and returns a death test by dispatching to the current
-// death test factory.
-bool DeathTest::Create(const char* statement,
-                       Matcher<const std::string&> matcher, const char* file,
-                       int line, DeathTest** test) {
-  return GetUnitTestImpl()->death_test_factory()->Create(
-      statement, std::move(matcher), file, line, test);
-}
-
-const char* DeathTest::LastMessage() {
-  return last_death_test_message_.c_str();
-}
-
-void DeathTest::set_last_death_test_message(const std::string& message) {
-  last_death_test_message_ = message;
-}
-
-std::string DeathTest::last_death_test_message_;
-
-// Provides cross platform implementation for some death functionality.
-class DeathTestImpl : public DeathTest {
- protected:
-  DeathTestImpl(const char* a_statement, Matcher<const std::string&> matcher)
-      : statement_(a_statement),
-        matcher_(std::move(matcher)),
-        spawned_(false),
-        status_(-1),
-        outcome_(IN_PROGRESS),
-        read_fd_(-1),
-        write_fd_(-1) {}
-
-  // read_fd_ is expected to be closed and cleared by a derived class.
-  ~DeathTestImpl() override { GTEST_DEATH_TEST_CHECK_(read_fd_ == -1); }
-
-  void Abort(AbortReason reason) override;
-  bool Passed(bool status_ok) override;
-
-  const char* statement() const { return statement_; }
-  bool spawned() const { return spawned_; }
-  void set_spawned(bool is_spawned) { spawned_ = is_spawned; }
-  int status() const { return status_; }
-  void set_status(int a_status) { status_ = a_status; }
-  DeathTestOutcome outcome() const { return outcome_; }
-  void set_outcome(DeathTestOutcome an_outcome) { outcome_ = an_outcome; }
-  int read_fd() const { return read_fd_; }
-  void set_read_fd(int fd) { read_fd_ = fd; }
-  int write_fd() const { return write_fd_; }
-  void set_write_fd(int fd) { write_fd_ = fd; }
-
-  // Called in the parent process only. Reads the result code of the death
-  // test child process via a pipe, interprets it to set the outcome_
-  // member, and closes read_fd_.  Outputs diagnostics and terminates in
-  // case of unexpected codes.
-  void ReadAndInterpretStatusByte();
-
-  // Returns stderr output from the child process.
-  virtual std::string GetErrorLogs();
-
- private:
-  // The textual content of the code this object is testing.  This class
-  // doesn't own this string and should not attempt to delete it.
-  const char* const statement_;
-  // A matcher that's expected to match the stderr output by the child process.
-  Matcher<const std::string&> matcher_;
-  // True if the death test child process has been successfully spawned.
-  bool spawned_;
-  // The exit status of the child process.
-  int status_;
-  // How the death test concluded.
-  DeathTestOutcome outcome_;
-  // Descriptor to the read end of the pipe to the child process.  It is
-  // always -1 in the child process.  The child keeps its write end of the
-  // pipe in write_fd_.
-  int read_fd_;
-  // Descriptor to the child's write end of the pipe to the parent process.
-  // It is always -1 in the parent process.  The parent keeps its end of the
-  // pipe in read_fd_.
-  int write_fd_;
-};
-
-// Called in the parent process only. Reads the result code of the death
-// test child process via a pipe, interprets it to set the outcome_
-// member, and closes read_fd_.  Outputs diagnostics and terminates in
-// case of unexpected codes.
-void DeathTestImpl::ReadAndInterpretStatusByte() {
-  char flag;
-  int bytes_read;
-
-  // The read() here blocks until data is available (signifying the
-  // failure of the death test) or until the pipe is closed (signifying
-  // its success), so it's okay to call this in the parent before
-  // the child process has exited.
-  do {
-    bytes_read = posix::Read(read_fd(), &flag, 1);
-  } while (bytes_read == -1 && errno == EINTR);
-
-  if (bytes_read == 0) {
-    set_outcome(DIED);
-  } else if (bytes_read == 1) {
-    switch (flag) {
-      case kDeathTestReturned:
-        set_outcome(RETURNED);
-        break;
-      case kDeathTestThrew:
-        set_outcome(THREW);
-        break;
-      case kDeathTestLived:
-        set_outcome(LIVED);
-        break;
-      case kDeathTestInternalError:
-        FailFromInternalError(read_fd());  // Does not return.
-        break;
-      default:
-        GTEST_LOG_(FATAL) << "Death test child process reported "
-                          << "unexpected status byte ("
-                          << static_cast<unsigned int>(flag) << ")";
-    }
-  } else {
-    GTEST_LOG_(FATAL) << "Read from death test child process failed: "
-                      << GetLastErrnoDescription();
-  }
-  GTEST_DEATH_TEST_CHECK_SYSCALL_(posix::Close(read_fd()));
-  set_read_fd(-1);
-}
-
-std::string DeathTestImpl::GetErrorLogs() {
-  return GetCapturedStderr();
-}
-
-// Signals that the death test code which should have exited, didn't.
-// Should be called only in a death test child process.
-// Writes a status byte to the child's status file descriptor, then
-// calls _exit(1).
-void DeathTestImpl::Abort(AbortReason reason) {
-  // The parent process considers the death test to be a failure if
-  // it finds any data in our pipe.  So, here we write a single flag byte
-  // to the pipe, then exit.
-  const char status_ch =
-      reason == TEST_DID_NOT_DIE ? kDeathTestLived :
-      reason == TEST_THREW_EXCEPTION ? kDeathTestThrew : kDeathTestReturned;
-
-  GTEST_DEATH_TEST_CHECK_SYSCALL_(posix::Write(write_fd(), &status_ch, 1));
-  // We are leaking the descriptor here because on some platforms (i.e.,
-  // when built as Windows DLL), destructors of global objects will still
-  // run after calling _exit(). On such systems, write_fd_ will be
-  // indirectly closed from the destructor of UnitTestImpl, causing double
-  // close if it is also closed here. On debug configurations, double close
-  // may assert. As there are no in-process buffers to flush here, we are
-  // relying on the OS to close the descriptor after the process terminates
-  // when the destructors are not run.
-  _exit(1);  // Exits w/o any normal exit hooks (we were supposed to crash)
-}
-
-// Returns an indented copy of stderr output for a death test.
-// This makes distinguishing death test output lines from regular log lines
-// much easier.
-static ::std::string FormatDeathTestOutput(const ::std::string& output) {
-  ::std::string ret;
-  for (size_t at = 0; ; ) {
-    const size_t line_end = output.find('\n', at);
-    ret += "[  DEATH   ] ";
-    if (line_end == ::std::string::npos) {
-      ret += output.substr(at);
-      break;
-    }
-    ret += output.substr(at, line_end + 1 - at);
-    at = line_end + 1;
-  }
-  return ret;
-}
-
-// Assesses the success or failure of a death test, using both private
-// members which have previously been set, and one argument:
-//
-// Private data members:
-//   outcome:  An enumeration describing how the death test
-//             concluded: DIED, LIVED, THREW, or RETURNED.  The death test
-//             fails in the latter three cases.
-//   status:   The exit status of the child process. On *nix, it is in the
-//             in the format specified by wait(2). On Windows, this is the
-//             value supplied to the ExitProcess() API or a numeric code
-//             of the exception that terminated the program.
-//   matcher_: A matcher that's expected to match the stderr output by the child
-//             process.
-//
-// Argument:
-//   status_ok: true if exit_status is acceptable in the context of
-//              this particular death test, which fails if it is false
-//
-// Returns true if and only if all of the above conditions are met.  Otherwise,
-// the first failing condition, in the order given above, is the one that is
-// reported. Also sets the last death test message string.
-bool DeathTestImpl::Passed(bool status_ok) {
-  if (!spawned())
-    return false;
-
-  const std::string error_message = GetErrorLogs();
-
-  bool success = false;
-  Message buffer;
-
-  buffer << "Death test: " << statement() << "\n";
-  switch (outcome()) {
-    case LIVED:
-      buffer << "    Result: failed to die.\n"
-             << " Error msg:\n" << FormatDeathTestOutput(error_message);
-      break;
-    case THREW:
-      buffer << "    Result: threw an exception.\n"
-             << " Error msg:\n" << FormatDeathTestOutput(error_message);
-      break;
-    case RETURNED:
-      buffer << "    Result: illegal return in test statement.\n"
-             << " Error msg:\n" << FormatDeathTestOutput(error_message);
-      break;
-    case DIED:
-      if (status_ok) {
-        if (matcher_.Matches(error_message)) {
-          success = true;
-        } else {
-          std::ostringstream stream;
-          matcher_.DescribeTo(&stream);
-          buffer << "    Result: died but not with expected error.\n"
-                 << "  Expected: " << stream.str() << "\n"
-                 << "Actual msg:\n"
-                 << FormatDeathTestOutput(error_message);
-        }
-      } else {
-        buffer << "    Result: died but not with expected exit code:\n"
-               << "            " << ExitSummary(status()) << "\n"
-               << "Actual msg:\n" << FormatDeathTestOutput(error_message);
-      }
-      break;
-    case IN_PROGRESS:
-    default:
-      GTEST_LOG_(FATAL)
-          << "DeathTest::Passed somehow called before conclusion of test";
-  }
-
-  DeathTest::set_last_death_test_message(buffer.GetString());
-  return success;
-}
-
-# if GTEST_OS_WINDOWS
-// WindowsDeathTest implements death tests on Windows. Due to the
-// specifics of starting new processes on Windows, death tests there are
-// always threadsafe, and Google Test considers the
-// --gtest_death_test_style=fast setting to be equivalent to
-// --gtest_death_test_style=threadsafe there.
-//
-// A few implementation notes:  Like the Linux version, the Windows
-// implementation uses pipes for child-to-parent communication. But due to
-// the specifics of pipes on Windows, some extra steps are required:
-//
-// 1. The parent creates a communication pipe and stores handles to both
-//    ends of it.
-// 2. The parent starts the child and provides it with the information
-//    necessary to acquire the handle to the write end of the pipe.
-// 3. The child acquires the write end of the pipe and signals the parent
-//    using a Windows event.
-// 4. Now the parent can release the write end of the pipe on its side. If
-//    this is done before step 3, the object's reference count goes down to
-//    0 and it is destroyed, preventing the child from acquiring it. The
-//    parent now has to release it, or read operations on the read end of
-//    the pipe will not return when the child terminates.
-// 5. The parent reads child's output through the pipe (outcome code and
-//    any possible error messages) from the pipe, and its stderr and then
-//    determines whether to fail the test.
-//
-// Note: to distinguish Win32 API calls from the local method and function
-// calls, the former are explicitly resolved in the global namespace.
-//
-class WindowsDeathTest : public DeathTestImpl {
- public:
-  WindowsDeathTest(const char* a_statement, Matcher<const std::string&> matcher,
-                   const char* file, int line)
-      : DeathTestImpl(a_statement, std::move(matcher)),
-        file_(file),
-        line_(line) {}
-
-  // All of these virtual functions are inherited from DeathTest.
-  virtual int Wait();
-  virtual TestRole AssumeRole();
-
- private:
-  // The name of the file in which the death test is located.
-  const char* const file_;
-  // The line number on which the death test is located.
-  const int line_;
-  // Handle to the write end of the pipe to the child process.
-  AutoHandle write_handle_;
-  // Child process handle.
-  AutoHandle child_handle_;
-  // Event the child process uses to signal the parent that it has
-  // acquired the handle to the write end of the pipe. After seeing this
-  // event the parent can release its own handles to make sure its
-  // ReadFile() calls return when the child terminates.
-  AutoHandle event_handle_;
-};
-
-// Waits for the child in a death test to exit, returning its exit
-// status, or 0 if no child process exists.  As a side effect, sets the
-// outcome data member.
-int WindowsDeathTest::Wait() {
-  if (!spawned())
-    return 0;
-
-  // Wait until the child either signals that it has acquired the write end
-  // of the pipe or it dies.
-  const HANDLE wait_handles[2] = { child_handle_.Get(), event_handle_.Get() };
-  switch (::WaitForMultipleObjects(2,
-                                   wait_handles,
-                                   FALSE,  // Waits for any of the handles.
-                                   INFINITE)) {
-    case WAIT_OBJECT_0:
-    case WAIT_OBJECT_0 + 1:
-      break;
-    default:
-      GTEST_DEATH_TEST_CHECK_(false);  // Should not get here.
-  }
-
-  // The child has acquired the write end of the pipe or exited.
-  // We release the handle on our side and continue.
-  write_handle_.Reset();
-  event_handle_.Reset();
-
-  ReadAndInterpretStatusByte();
-
-  // Waits for the child process to exit if it haven't already. This
-  // returns immediately if the child has already exited, regardless of
-  // whether previous calls to WaitForMultipleObjects synchronized on this
-  // handle or not.
-  GTEST_DEATH_TEST_CHECK_(
-      WAIT_OBJECT_0 == ::WaitForSingleObject(child_handle_.Get(),
-                                             INFINITE));
-  DWORD status_code;
-  GTEST_DEATH_TEST_CHECK_(
-      ::GetExitCodeProcess(child_handle_.Get(), &status_code) != FALSE);
-  child_handle_.Reset();
-  set_status(static_cast<int>(status_code));
-  return status();
-}
-
-// The AssumeRole process for a Windows death test.  It creates a child
-// process with the same executable as the current process to run the
-// death test.  The child process is given the --gtest_filter and
-// --gtest_internal_run_death_test flags such that it knows to run the
-// current death test only.
-DeathTest::TestRole WindowsDeathTest::AssumeRole() {
-  const UnitTestImpl* const impl = GetUnitTestImpl();
-  const InternalRunDeathTestFlag* const flag =
-      impl->internal_run_death_test_flag();
-  const TestInfo* const info = impl->current_test_info();
-  const int death_test_index = info->result()->death_test_count();
-
-  if (flag != nullptr) {
-    // ParseInternalRunDeathTestFlag() has performed all the necessary
-    // processing.
-    set_write_fd(flag->write_fd());
-    return EXECUTE_TEST;
-  }
-
-  // WindowsDeathTest uses an anonymous pipe to communicate results of
-  // a death test.
-  SECURITY_ATTRIBUTES handles_are_inheritable = {sizeof(SECURITY_ATTRIBUTES),
-                                                 nullptr, TRUE};
-  HANDLE read_handle, write_handle;
-  GTEST_DEATH_TEST_CHECK_(
-      ::CreatePipe(&read_handle, &write_handle, &handles_are_inheritable,
-                   0)  // Default buffer size.
-      != FALSE);
-  set_read_fd(::_open_osfhandle(reinterpret_cast<intptr_t>(read_handle),
-                                O_RDONLY));
-  write_handle_.Reset(write_handle);
-  event_handle_.Reset(::CreateEvent(
-      &handles_are_inheritable,
-      TRUE,       // The event will automatically reset to non-signaled state.
-      FALSE,      // The initial state is non-signalled.
-      nullptr));  // The even is unnamed.
-  GTEST_DEATH_TEST_CHECK_(event_handle_.Get() != nullptr);
-  const std::string filter_flag = std::string("--") + GTEST_FLAG_PREFIX_ +
-                                  kFilterFlag + "=" + info->test_suite_name() +
-                                  "." + info->name();
-  const std::string internal_flag =
-      std::string("--") + GTEST_FLAG_PREFIX_ + kInternalRunDeathTestFlag +
-      "=" + file_ + "|" + StreamableToString(line_) + "|" +
-      StreamableToString(death_test_index) + "|" +
-      StreamableToString(static_cast<unsigned int>(::GetCurrentProcessId())) +
-      // size_t has the same width as pointers on both 32-bit and 64-bit
-      // Windows platforms.
-      // See http://msdn.microsoft.com/en-us/library/tcxf1dw6.aspx.
-      "|" + StreamableToString(reinterpret_cast<size_t>(write_handle)) +
-      "|" + StreamableToString(reinterpret_cast<size_t>(event_handle_.Get()));
-
-  char executable_path[_MAX_PATH + 1];  // NOLINT
-  GTEST_DEATH_TEST_CHECK_(_MAX_PATH + 1 != ::GetModuleFileNameA(nullptr,
-                                                                executable_path,
-                                                                _MAX_PATH));
-
-  std::string command_line =
-      std::string(::GetCommandLineA()) + " " + filter_flag + " \"" +
-      internal_flag + "\"";
-
-  DeathTest::set_last_death_test_message("");
-
-  CaptureStderr();
-  // Flush the log buffers since the log streams are shared with the child.
-  FlushInfoLog();
-
-  // The child process will share the standard handles with the parent.
-  STARTUPINFOA startup_info;
-  memset(&startup_info, 0, sizeof(STARTUPINFO));
-  startup_info.dwFlags = STARTF_USESTDHANDLES;
-  startup_info.hStdInput = ::GetStdHandle(STD_INPUT_HANDLE);
-  startup_info.hStdOutput = ::GetStdHandle(STD_OUTPUT_HANDLE);
-  startup_info.hStdError = ::GetStdHandle(STD_ERROR_HANDLE);
-
-  PROCESS_INFORMATION process_info;
-  GTEST_DEATH_TEST_CHECK_(
-      ::CreateProcessA(
-          executable_path, const_cast<char*>(command_line.c_str()),
-          nullptr,  // Retuned process handle is not inheritable.
-          nullptr,  // Retuned thread handle is not inheritable.
-          TRUE,  // Child inherits all inheritable handles (for write_handle_).
-          0x0,   // Default creation flags.
-          nullptr,  // Inherit the parent's environment.
-          UnitTest::GetInstance()->original_working_dir(), &startup_info,
-          &process_info) != FALSE);
-  child_handle_.Reset(process_info.hProcess);
-  ::CloseHandle(process_info.hThread);
-  set_spawned(true);
-  return OVERSEE_TEST;
-}
-
-# elif GTEST_OS_FUCHSIA
-
-class FuchsiaDeathTest : public DeathTestImpl {
- public:
-  FuchsiaDeathTest(const char* a_statement, Matcher<const std::string&> matcher,
-                   const char* file, int line)
-      : DeathTestImpl(a_statement, std::move(matcher)),
-        file_(file),
-        line_(line) {}
-
-  // All of these virtual functions are inherited from DeathTest.
-  int Wait() override;
-  TestRole AssumeRole() override;
-  std::string GetErrorLogs() override;
-
- private:
-  // The name of the file in which the death test is located.
-  const char* const file_;
-  // The line number on which the death test is located.
-  const int line_;
-  // The stderr data captured by the child process.
-  std::string captured_stderr_;
-
-  zx::process child_process_;
-  zx::channel exception_channel_;
-  zx::socket stderr_socket_;
-};
-
-// Utility class for accumulating command-line arguments.
-class Arguments {
- public:
-  Arguments() { args_.push_back(nullptr); }
-
-  ~Arguments() {
-    for (std::vector<char*>::iterator i = args_.begin(); i != args_.end();
-         ++i) {
-      free(*i);
-    }
-  }
-  void AddArgument(const char* argument) {
-    args_.insert(args_.end() - 1, posix::StrDup(argument));
-  }
-
-  template <typename Str>
-  void AddArguments(const ::std::vector<Str>& arguments) {
-    for (typename ::std::vector<Str>::const_iterator i = arguments.begin();
-         i != arguments.end();
-         ++i) {
-      args_.insert(args_.end() - 1, posix::StrDup(i->c_str()));
-    }
-  }
-  char* const* Argv() {
-    return &args_[0];
-  }
-
-  int size() {
-    return args_.size() - 1;
-  }
-
- private:
-  std::vector<char*> args_;
-};
-
-// Waits for the child in a death test to exit, returning its exit
-// status, or 0 if no child process exists.  As a side effect, sets the
-// outcome data member.
-int FuchsiaDeathTest::Wait() {
-  const int kProcessKey = 0;
-  const int kSocketKey = 1;
-  const int kExceptionKey = 2;
-
-  if (!spawned())
-    return 0;
-
-  // Create a port to wait for socket/task/exception events.
-  zx_status_t status_zx;
-  zx::port port;
-  status_zx = zx::port::create(0, &port);
-  GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
-
-  // Register to wait for the child process to terminate.
-  status_zx = child_process_.wait_async(
-      port, kProcessKey, ZX_PROCESS_TERMINATED, ZX_WAIT_ASYNC_ONCE);
-  GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
-
-  // Register to wait for the socket to be readable or closed.
-  status_zx = stderr_socket_.wait_async(
-      port, kSocketKey, ZX_SOCKET_READABLE | ZX_SOCKET_PEER_CLOSED,
-      ZX_WAIT_ASYNC_ONCE);
-  GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
-
-  // Register to wait for an exception.
-  status_zx = exception_channel_.wait_async(
-      port, kExceptionKey, ZX_CHANNEL_READABLE, ZX_WAIT_ASYNC_ONCE);
-  GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
-
-  bool process_terminated = false;
-  bool socket_closed = false;
-  do {
-    zx_port_packet_t packet = {};
-    status_zx = port.wait(zx::time::infinite(), &packet);
-    GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
-
-    if (packet.key == kExceptionKey) {
-      // Process encountered an exception. Kill it directly rather than
-      // letting other handlers process the event. We will get a kProcessKey
-      // event when the process actually terminates.
-      status_zx = child_process_.kill();
-      GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
-    } else if (packet.key == kProcessKey) {
-      // Process terminated.
-      GTEST_DEATH_TEST_CHECK_(ZX_PKT_IS_SIGNAL_ONE(packet.type));
-      GTEST_DEATH_TEST_CHECK_(packet.signal.observed & ZX_PROCESS_TERMINATED);
-      process_terminated = true;
-    } else if (packet.key == kSocketKey) {
-      GTEST_DEATH_TEST_CHECK_(ZX_PKT_IS_SIGNAL_ONE(packet.type));
-      if (packet.signal.observed & ZX_SOCKET_READABLE) {
-        // Read data from the socket.
-        constexpr size_t kBufferSize = 1024;
-        do {
-          size_t old_length = captured_stderr_.length();
-          size_t bytes_read = 0;
-          captured_stderr_.resize(old_length + kBufferSize);
-          status_zx = stderr_socket_.read(
-              0, &captured_stderr_.front() + old_length, kBufferSize,
-              &bytes_read);
-          captured_stderr_.resize(old_length + bytes_read);
-        } while (status_zx == ZX_OK);
-        if (status_zx == ZX_ERR_PEER_CLOSED) {
-          socket_closed = true;
-        } else {
-          GTEST_DEATH_TEST_CHECK_(status_zx == ZX_ERR_SHOULD_WAIT);
-          status_zx = stderr_socket_.wait_async(
-              port, kSocketKey, ZX_SOCKET_READABLE | ZX_SOCKET_PEER_CLOSED,
-              ZX_WAIT_ASYNC_ONCE);
-          GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
-        }
-      } else {
-        GTEST_DEATH_TEST_CHECK_(packet.signal.observed & ZX_SOCKET_PEER_CLOSED);
-        socket_closed = true;
-      }
-    }
-  } while (!process_terminated && !socket_closed);
-
-  ReadAndInterpretStatusByte();
-
-  zx_info_process_t buffer;
-  status_zx = child_process_.get_info(
-      ZX_INFO_PROCESS, &buffer, sizeof(buffer), nullptr, nullptr);
-  GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
-
-  GTEST_DEATH_TEST_CHECK_(buffer.exited);
-  set_status(buffer.return_code);
-  return status();
-}
-
-// The AssumeRole process for a Fuchsia death test.  It creates a child
-// process with the same executable as the current process to run the
-// death test.  The child process is given the --gtest_filter and
-// --gtest_internal_run_death_test flags such that it knows to run the
-// current death test only.
-DeathTest::TestRole FuchsiaDeathTest::AssumeRole() {
-  const UnitTestImpl* const impl = GetUnitTestImpl();
-  const InternalRunDeathTestFlag* const flag =
-      impl->internal_run_death_test_flag();
-  const TestInfo* const info = impl->current_test_info();
-  const int death_test_index = info->result()->death_test_count();
-
-  if (flag != nullptr) {
-    // ParseInternalRunDeathTestFlag() has performed all the necessary
-    // processing.
-    set_write_fd(kFuchsiaReadPipeFd);
-    return EXECUTE_TEST;
-  }
-
-  // Flush the log buffers since the log streams are shared with the child.
-  FlushInfoLog();
-
-  // Build the child process command line.
-  const std::string filter_flag = std::string("--") + GTEST_FLAG_PREFIX_ +
-                                  kFilterFlag + "=" + info->test_suite_name() +
-                                  "." + info->name();
-  const std::string internal_flag =
-      std::string("--") + GTEST_FLAG_PREFIX_ + kInternalRunDeathTestFlag + "="
-      + file_ + "|"
-      + StreamableToString(line_) + "|"
-      + StreamableToString(death_test_index);
-  Arguments args;
-  args.AddArguments(GetInjectableArgvs());
-  args.AddArgument(filter_flag.c_str());
-  args.AddArgument(internal_flag.c_str());
-
-  // Build the pipe for communication with the child.
-  zx_status_t status;
-  zx_handle_t child_pipe_handle;
-  int child_pipe_fd;
-  status = fdio_pipe_half(&child_pipe_fd, &child_pipe_handle);
-  GTEST_DEATH_TEST_CHECK_(status == ZX_OK);
-  set_read_fd(child_pipe_fd);
-
-  // Set the pipe handle for the child.
-  fdio_spawn_action_t spawn_actions[2] = {};
-  fdio_spawn_action_t* add_handle_action = &spawn_actions[0];
-  add_handle_action->action = FDIO_SPAWN_ACTION_ADD_HANDLE;
-  add_handle_action->h.id = PA_HND(PA_FD, kFuchsiaReadPipeFd);
-  add_handle_action->h.handle = child_pipe_handle;
-
-  // Create a socket pair will be used to receive the child process' stderr.
-  zx::socket stderr_producer_socket;
-  status =
-      zx::socket::create(0, &stderr_producer_socket, &stderr_socket_);
-  GTEST_DEATH_TEST_CHECK_(status >= 0);
-  int stderr_producer_fd = -1;
-  status =
-      fdio_fd_create(stderr_producer_socket.release(), &stderr_producer_fd);
-  GTEST_DEATH_TEST_CHECK_(status >= 0);
-
-  // Make the stderr socket nonblocking.
-  GTEST_DEATH_TEST_CHECK_(fcntl(stderr_producer_fd, F_SETFL, 0) == 0);
-
-  fdio_spawn_action_t* add_stderr_action = &spawn_actions[1];
-  add_stderr_action->action = FDIO_SPAWN_ACTION_CLONE_FD;
-  add_stderr_action->fd.local_fd = stderr_producer_fd;
-  add_stderr_action->fd.target_fd = STDERR_FILENO;
-
-  // Create a child job.
-  zx_handle_t child_job = ZX_HANDLE_INVALID;
-  status = zx_job_create(zx_job_default(), 0, & child_job);
-  GTEST_DEATH_TEST_CHECK_(status == ZX_OK);
-  zx_policy_basic_t policy;
-  policy.condition = ZX_POL_NEW_ANY;
-  policy.policy = ZX_POL_ACTION_ALLOW;
-  status = zx_job_set_policy(
-      child_job, ZX_JOB_POL_RELATIVE, ZX_JOB_POL_BASIC, &policy, 1);
-  GTEST_DEATH_TEST_CHECK_(status == ZX_OK);
-
-  // Create an exception channel attached to the |child_job|, to allow
-  // us to suppress the system default exception handler from firing.
-  status =
-      zx_task_create_exception_channel(
-          child_job, 0, exception_channel_.reset_and_get_address());
-  GTEST_DEATH_TEST_CHECK_(status == ZX_OK);
-
-  // Spawn the child process.
-  status = fdio_spawn_etc(
-      child_job, FDIO_SPAWN_CLONE_ALL, args.Argv()[0], args.Argv(), nullptr,
-      2, spawn_actions, child_process_.reset_and_get_address(), nullptr);
-  GTEST_DEATH_TEST_CHECK_(status == ZX_OK);
-
-  set_spawned(true);
-  return OVERSEE_TEST;
-}
-
-std::string FuchsiaDeathTest::GetErrorLogs() {
-  return captured_stderr_;
-}
-
-#else  // We are neither on Windows, nor on Fuchsia.
-
-// ForkingDeathTest provides implementations for most of the abstract
-// methods of the DeathTest interface.  Only the AssumeRole method is
-// left undefined.
-class ForkingDeathTest : public DeathTestImpl {
- public:
-  ForkingDeathTest(const char* statement, Matcher<const std::string&> matcher);
-
-  // All of these virtual functions are inherited from DeathTest.
-  int Wait() override;
-
- protected:
-  void set_child_pid(pid_t child_pid) { child_pid_ = child_pid; }
-
- private:
-  // PID of child process during death test; 0 in the child process itself.
-  pid_t child_pid_;
-};
-
-// Constructs a ForkingDeathTest.
-ForkingDeathTest::ForkingDeathTest(const char* a_statement,
-                                   Matcher<const std::string&> matcher)
-    : DeathTestImpl(a_statement, std::move(matcher)), child_pid_(-1) {}
-
-// Waits for the child in a death test to exit, returning its exit
-// status, or 0 if no child process exists.  As a side effect, sets the
-// outcome data member.
-int ForkingDeathTest::Wait() {
-  if (!spawned())
-    return 0;
-
-  ReadAndInterpretStatusByte();
-
-  int status_value;
-  GTEST_DEATH_TEST_CHECK_SYSCALL_(waitpid(child_pid_, &status_value, 0));
-  set_status(status_value);
-  return status_value;
-}
-
-// A concrete death test class that forks, then immediately runs the test
-// in the child process.
-class NoExecDeathTest : public ForkingDeathTest {
- public:
-  NoExecDeathTest(const char* a_statement, Matcher<const std::string&> matcher)
-      : ForkingDeathTest(a_statement, std::move(matcher)) {}
-  TestRole AssumeRole() override;
-};
-
-// The AssumeRole process for a fork-and-run death test.  It implements a
-// straightforward fork, with a simple pipe to transmit the status byte.
-DeathTest::TestRole NoExecDeathTest::AssumeRole() {
-  const size_t thread_count = GetThreadCount();
-  if (thread_count != 1) {
-    GTEST_LOG_(WARNING) << DeathTestThreadWarning(thread_count);
-  }
-
-  int pipe_fd[2];
-  GTEST_DEATH_TEST_CHECK_(pipe(pipe_fd) != -1);
-
-  DeathTest::set_last_death_test_message("");
-  CaptureStderr();
-  // When we fork the process below, the log file buffers are copied, but the
-  // file descriptors are shared.  We flush all log files here so that closing
-  // the file descriptors in the child process doesn't throw off the
-  // synchronization between descriptors and buffers in the parent process.
-  // This is as close to the fork as possible to avoid a race condition in case
-  // there are multiple threads running before the death test, and another
-  // thread writes to the log file.
-  FlushInfoLog();
-
-  const pid_t child_pid = fork();
-  GTEST_DEATH_TEST_CHECK_(child_pid != -1);
-  set_child_pid(child_pid);
-  if (child_pid == 0) {
-    GTEST_DEATH_TEST_CHECK_SYSCALL_(close(pipe_fd[0]));
-    set_write_fd(pipe_fd[1]);
-    // Redirects all logging to stderr in the child process to prevent
-    // concurrent writes to the log files.  We capture stderr in the parent
-    // process and append the child process' output to a log.
-    LogToStderr();
-    // Event forwarding to the listeners of event listener API mush be shut
-    // down in death test subprocesses.
-    GetUnitTestImpl()->listeners()->SuppressEventForwarding();
-    g_in_fast_death_test_child = true;
-    return EXECUTE_TEST;
-  } else {
-    GTEST_DEATH_TEST_CHECK_SYSCALL_(close(pipe_fd[1]));
-    set_read_fd(pipe_fd[0]);
-    set_spawned(true);
-    return OVERSEE_TEST;
-  }
-}
-
-// A concrete death test class that forks and re-executes the main
-// program from the beginning, with command-line flags set that cause
-// only this specific death test to be run.
-class ExecDeathTest : public ForkingDeathTest {
- public:
-  ExecDeathTest(const char* a_statement, Matcher<const std::string&> matcher,
-                const char* file, int line)
-      : ForkingDeathTest(a_statement, std::move(matcher)),
-        file_(file),
-        line_(line) {}
-  TestRole AssumeRole() override;
-
- private:
-  static ::std::vector<std::string> GetArgvsForDeathTestChildProcess() {
-    ::std::vector<std::string> args = GetInjectableArgvs();
-#  if defined(GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_)
-    ::std::vector<std::string> extra_args =
-        GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_();
-    args.insert(args.end(), extra_args.begin(), extra_args.end());
-#  endif  // defined(GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_)
-    return args;
-  }
-  // The name of the file in which the death test is located.
-  const char* const file_;
-  // The line number on which the death test is located.
-  const int line_;
-};
-
-// Utility class for accumulating command-line arguments.
-class Arguments {
- public:
-  Arguments() { args_.push_back(nullptr); }
-
-  ~Arguments() {
-    for (std::vector<char*>::iterator i = args_.begin(); i != args_.end();
-         ++i) {
-      free(*i);
-    }
-  }
-  void AddArgument(const char* argument) {
-    args_.insert(args_.end() - 1, posix::StrDup(argument));
-  }
-
-  template <typename Str>
-  void AddArguments(const ::std::vector<Str>& arguments) {
-    for (typename ::std::vector<Str>::const_iterator i = arguments.begin();
-         i != arguments.end();
-         ++i) {
-      args_.insert(args_.end() - 1, posix::StrDup(i->c_str()));
-    }
-  }
-  char* const* Argv() {
-    return &args_[0];
-  }
-
- private:
-  std::vector<char*> args_;
-};
-
-// A struct that encompasses the arguments to the child process of a
-// threadsafe-style death test process.
-struct ExecDeathTestArgs {
-  char* const* argv;  // Command-line arguments for the child's call to exec
-  int close_fd;       // File descriptor to close; the read end of a pipe
-};
-
-#  if GTEST_OS_MAC
-inline char** GetEnviron() {
-  // When Google Test is built as a framework on MacOS X, the environ variable
-  // is unavailable. Apple's documentation (man environ) recommends using
-  // _NSGetEnviron() instead.
-  return *_NSGetEnviron();
-}
-#  else
-// Some POSIX platforms expect you to declare environ. extern "C" makes
-// it reside in the global namespace.
-extern "C" char** environ;
-inline char** GetEnviron() { return environ; }
-#  endif  // GTEST_OS_MAC
-
-#  if !GTEST_OS_QNX
-// The main function for a threadsafe-style death test child process.
-// This function is called in a clone()-ed process and thus must avoid
-// any potentially unsafe operations like malloc or libc functions.
-static int ExecDeathTestChildMain(void* child_arg) {
-  ExecDeathTestArgs* const args = static_cast<ExecDeathTestArgs*>(child_arg);
-  GTEST_DEATH_TEST_CHECK_SYSCALL_(close(args->close_fd));
-
-  // We need to execute the test program in the same environment where
-  // it was originally invoked.  Therefore we change to the original
-  // working directory first.
-  const char* const original_dir =
-      UnitTest::GetInstance()->original_working_dir();
-  // We can safely call chdir() as it's a direct system call.
-  if (chdir(original_dir) != 0) {
-    DeathTestAbort(std::string("chdir(\"") + original_dir + "\") failed: " +
-                   GetLastErrnoDescription());
-    return EXIT_FAILURE;
-  }
-
-  // We can safely call execve() as it's a direct system call.  We
-  // cannot use execvp() as it's a libc function and thus potentially
-  // unsafe.  Since execve() doesn't search the PATH, the user must
-  // invoke the test program via a valid path that contains at least
-  // one path separator.
-  execve(args->argv[0], args->argv, GetEnviron());
-  DeathTestAbort(std::string("execve(") + args->argv[0] + ", ...) in " +
-                 original_dir + " failed: " +
-                 GetLastErrnoDescription());
-  return EXIT_FAILURE;
-}
-#  endif  // !GTEST_OS_QNX
-
-#  if GTEST_HAS_CLONE
-// Two utility routines that together determine the direction the stack
-// grows.
-// This could be accomplished more elegantly by a single recursive
-// function, but we want to guard against the unlikely possibility of
-// a smart compiler optimizing the recursion away.
-//
-// GTEST_NO_INLINE_ is required to prevent GCC 4.6 from inlining
-// StackLowerThanAddress into StackGrowsDown, which then doesn't give
-// correct answer.
-static void StackLowerThanAddress(const void* ptr,
-                                  bool* result) GTEST_NO_INLINE_;
-// HWAddressSanitizer add a random tag to the MSB of the local variable address,
-// making comparison result unpredictable.
-GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
-static void StackLowerThanAddress(const void* ptr, bool* result) {
-  int dummy;
-  *result = (&dummy < ptr);
-}
-
-// Make sure AddressSanitizer does not tamper with the stack here.
-GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
-GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
-static bool StackGrowsDown() {
-  int dummy;
-  bool result;
-  StackLowerThanAddress(&dummy, &result);
-  return result;
-}
-#  endif  // GTEST_HAS_CLONE
-
-// Spawns a child process with the same executable as the current process in
-// a thread-safe manner and instructs it to run the death test.  The
-// implementation uses fork(2) + exec.  On systems where clone(2) is
-// available, it is used instead, being slightly more thread-safe.  On QNX,
-// fork supports only single-threaded environments, so this function uses
-// spawn(2) there instead.  The function dies with an error message if
-// anything goes wrong.
-static pid_t ExecDeathTestSpawnChild(char* const* argv, int close_fd) {
-  ExecDeathTestArgs args = { argv, close_fd };
-  pid_t child_pid = -1;
-
-#  if GTEST_OS_QNX
-  // Obtains the current directory and sets it to be closed in the child
-  // process.
-  const int cwd_fd = open(".", O_RDONLY);
-  GTEST_DEATH_TEST_CHECK_(cwd_fd != -1);
-  GTEST_DEATH_TEST_CHECK_SYSCALL_(fcntl(cwd_fd, F_SETFD, FD_CLOEXEC));
-  // We need to execute the test program in the same environment where
-  // it was originally invoked.  Therefore we change to the original
-  // working directory first.
-  const char* const original_dir =
-      UnitTest::GetInstance()->original_working_dir();
-  // We can safely call chdir() as it's a direct system call.
-  if (chdir(original_dir) != 0) {
-    DeathTestAbort(std::string("chdir(\"") + original_dir + "\") failed: " +
-                   GetLastErrnoDescription());
-    return EXIT_FAILURE;
-  }
-
-  int fd_flags;
-  // Set close_fd to be closed after spawn.
-  GTEST_DEATH_TEST_CHECK_SYSCALL_(fd_flags = fcntl(close_fd, F_GETFD));
-  GTEST_DEATH_TEST_CHECK_SYSCALL_(fcntl(close_fd, F_SETFD,
-                                        fd_flags | FD_CLOEXEC));
-  struct inheritance inherit = {0};
-  // spawn is a system call.
-  child_pid =
-      spawn(args.argv[0], 0, nullptr, &inherit, args.argv, GetEnviron());
-  // Restores the current working directory.
-  GTEST_DEATH_TEST_CHECK_(fchdir(cwd_fd) != -1);
-  GTEST_DEATH_TEST_CHECK_SYSCALL_(close(cwd_fd));
-
-#  else   // GTEST_OS_QNX
-#   if GTEST_OS_LINUX
-  // When a SIGPROF signal is received while fork() or clone() are executing,
-  // the process may hang. To avoid this, we ignore SIGPROF here and re-enable
-  // it after the call to fork()/clone() is complete.
-  struct sigaction saved_sigprof_action;
-  struct sigaction ignore_sigprof_action;
-  memset(&ignore_sigprof_action, 0, sizeof(ignore_sigprof_action));
-  sigemptyset(&ignore_sigprof_action.sa_mask);
-  ignore_sigprof_action.sa_handler = SIG_IGN;
-  GTEST_DEATH_TEST_CHECK_SYSCALL_(sigaction(
-      SIGPROF, &ignore_sigprof_action, &saved_sigprof_action));
-#   endif  // GTEST_OS_LINUX
-
-#   if GTEST_HAS_CLONE
-  const bool use_fork = GTEST_FLAG(death_test_use_fork);
-
-  if (!use_fork) {
-    static const bool stack_grows_down = StackGrowsDown();
-    const auto stack_size = static_cast<size_t>(getpagesize() * 2);
-    // MMAP_ANONYMOUS is not defined on Mac, so we use MAP_ANON instead.
-    void* const stack = mmap(nullptr, stack_size, PROT_READ | PROT_WRITE,
-                             MAP_ANON | MAP_PRIVATE, -1, 0);
-    GTEST_DEATH_TEST_CHECK_(stack != MAP_FAILED);
-
-    // Maximum stack alignment in bytes:  For a downward-growing stack, this
-    // amount is subtracted from size of the stack space to get an address
-    // that is within the stack space and is aligned on all systems we care
-    // about.  As far as I know there is no ABI with stack alignment greater
-    // than 64.  We assume stack and stack_size already have alignment of
-    // kMaxStackAlignment.
-    const size_t kMaxStackAlignment = 64;
-    void* const stack_top =
-        static_cast<char*>(stack) +
-            (stack_grows_down ? stack_size - kMaxStackAlignment : 0);
-    GTEST_DEATH_TEST_CHECK_(
-        static_cast<size_t>(stack_size) > kMaxStackAlignment &&
-        reinterpret_cast<uintptr_t>(stack_top) % kMaxStackAlignment == 0);
-
-    child_pid = clone(&ExecDeathTestChildMain, stack_top, SIGCHLD, &args);
-
-    GTEST_DEATH_TEST_CHECK_(munmap(stack, stack_size) != -1);
-  }
-#   else
-  const bool use_fork = true;
-#   endif  // GTEST_HAS_CLONE
-
-  if (use_fork && (child_pid = fork()) == 0) {
-      ExecDeathTestChildMain(&args);
-      _exit(0);
-  }
-#  endif  // GTEST_OS_QNX
-#  if GTEST_OS_LINUX
-  GTEST_DEATH_TEST_CHECK_SYSCALL_(
-      sigaction(SIGPROF, &saved_sigprof_action, nullptr));
-#  endif  // GTEST_OS_LINUX
-
-  GTEST_DEATH_TEST_CHECK_(child_pid != -1);
-  return child_pid;
-}
-
-// The AssumeRole process for a fork-and-exec death test.  It re-executes the
-// main program from the beginning, setting the --gtest_filter
-// and --gtest_internal_run_death_test flags to cause only the current
-// death test to be re-run.
-DeathTest::TestRole ExecDeathTest::AssumeRole() {
-  const UnitTestImpl* const impl = GetUnitTestImpl();
-  const InternalRunDeathTestFlag* const flag =
-      impl->internal_run_death_test_flag();
-  const TestInfo* const info = impl->current_test_info();
-  const int death_test_index = info->result()->death_test_count();
-
-  if (flag != nullptr) {
-    set_write_fd(flag->write_fd());
-    return EXECUTE_TEST;
-  }
-
-  int pipe_fd[2];
-  GTEST_DEATH_TEST_CHECK_(pipe(pipe_fd) != -1);
-  // Clear the close-on-exec flag on the write end of the pipe, lest
-  // it be closed when the child process does an exec:
-  GTEST_DEATH_TEST_CHECK_(fcntl(pipe_fd[1], F_SETFD, 0) != -1);
-
-  const std::string filter_flag = std::string("--") + GTEST_FLAG_PREFIX_ +
-                                  kFilterFlag + "=" + info->test_suite_name() +
-                                  "." + info->name();
-  const std::string internal_flag =
-      std::string("--") + GTEST_FLAG_PREFIX_ + kInternalRunDeathTestFlag + "="
-      + file_ + "|" + StreamableToString(line_) + "|"
-      + StreamableToString(death_test_index) + "|"
-      + StreamableToString(pipe_fd[1]);
-  Arguments args;
-  args.AddArguments(GetArgvsForDeathTestChildProcess());
-  args.AddArgument(filter_flag.c_str());
-  args.AddArgument(internal_flag.c_str());
-
-  DeathTest::set_last_death_test_message("");
-
-  CaptureStderr();
-  // See the comment in NoExecDeathTest::AssumeRole for why the next line
-  // is necessary.
-  FlushInfoLog();
-
-  const pid_t child_pid = ExecDeathTestSpawnChild(args.Argv(), pipe_fd[0]);
-  GTEST_DEATH_TEST_CHECK_SYSCALL_(close(pipe_fd[1]));
-  set_child_pid(child_pid);
-  set_read_fd(pipe_fd[0]);
-  set_spawned(true);
-  return OVERSEE_TEST;
-}
-
-# endif  // !GTEST_OS_WINDOWS
-
-// Creates a concrete DeathTest-derived class that depends on the
-// --gtest_death_test_style flag, and sets the pointer pointed to
-// by the "test" argument to its address.  If the test should be
-// skipped, sets that pointer to NULL.  Returns true, unless the
-// flag is set to an invalid value.
-bool DefaultDeathTestFactory::Create(const char* statement,
-                                     Matcher<const std::string&> matcher,
-                                     const char* file, int line,
-                                     DeathTest** test) {
-  UnitTestImpl* const impl = GetUnitTestImpl();
-  const InternalRunDeathTestFlag* const flag =
-      impl->internal_run_death_test_flag();
-  const int death_test_index = impl->current_test_info()
-      ->increment_death_test_count();
-
-  if (flag != nullptr) {
-    if (death_test_index > flag->index()) {
-      DeathTest::set_last_death_test_message(
-          "Death test count (" + StreamableToString(death_test_index)
-          + ") somehow exceeded expected maximum ("
-          + StreamableToString(flag->index()) + ")");
-      return false;
-    }
-
-    if (!(flag->file() == file && flag->line() == line &&
-          flag->index() == death_test_index)) {
-      *test = nullptr;
-      return true;
-    }
-  }
-
-# if GTEST_OS_WINDOWS
-
-  if (GTEST_FLAG(death_test_style) == "threadsafe" ||
-      GTEST_FLAG(death_test_style) == "fast") {
-    *test = new WindowsDeathTest(statement, std::move(matcher), file, line);
-  }
-
-# elif GTEST_OS_FUCHSIA
-
-  if (GTEST_FLAG(death_test_style) == "threadsafe" ||
-      GTEST_FLAG(death_test_style) == "fast") {
-    *test = new FuchsiaDeathTest(statement, std::move(matcher), file, line);
-  }
-
-# else
-
-  if (GTEST_FLAG(death_test_style) == "threadsafe") {
-    *test = new ExecDeathTest(statement, std::move(matcher), file, line);
-  } else if (GTEST_FLAG(death_test_style) == "fast") {
-    *test = new NoExecDeathTest(statement, std::move(matcher));
-  }
-
-# endif  // GTEST_OS_WINDOWS
-
-  else {  // NOLINT - this is more readable than unbalanced brackets inside #if.
-    DeathTest::set_last_death_test_message(
-        "Unknown death test style \"" + GTEST_FLAG(death_test_style)
-        + "\" encountered");
-    return false;
-  }
-
-  return true;
-}
-
-# if GTEST_OS_WINDOWS
-// Recreates the pipe and event handles from the provided parameters,
-// signals the event, and returns a file descriptor wrapped around the pipe
-// handle. This function is called in the child process only.
-static int GetStatusFileDescriptor(unsigned int parent_process_id,
-                            size_t write_handle_as_size_t,
-                            size_t event_handle_as_size_t) {
-  AutoHandle parent_process_handle(::OpenProcess(PROCESS_DUP_HANDLE,
-                                                   FALSE,  // Non-inheritable.
-                                                   parent_process_id));
-  if (parent_process_handle.Get() == INVALID_HANDLE_VALUE) {
-    DeathTestAbort("Unable to open parent process " +
-                   StreamableToString(parent_process_id));
-  }
-
-  GTEST_CHECK_(sizeof(HANDLE) <= sizeof(size_t));
-
-  const HANDLE write_handle =
-      reinterpret_cast<HANDLE>(write_handle_as_size_t);
-  HANDLE dup_write_handle;
-
-  // The newly initialized handle is accessible only in the parent
-  // process. To obtain one accessible within the child, we need to use
-  // DuplicateHandle.
-  if (!::DuplicateHandle(parent_process_handle.Get(), write_handle,
-                         ::GetCurrentProcess(), &dup_write_handle,
-                         0x0,    // Requested privileges ignored since
-                                 // DUPLICATE_SAME_ACCESS is used.
-                         FALSE,  // Request non-inheritable handler.
-                         DUPLICATE_SAME_ACCESS)) {
-    DeathTestAbort("Unable to duplicate the pipe handle " +
-                   StreamableToString(write_handle_as_size_t) +
-                   " from the parent process " +
-                   StreamableToString(parent_process_id));
-  }
-
-  const HANDLE event_handle = reinterpret_cast<HANDLE>(event_handle_as_size_t);
-  HANDLE dup_event_handle;
-
-  if (!::DuplicateHandle(parent_process_handle.Get(), event_handle,
-                         ::GetCurrentProcess(), &dup_event_handle,
-                         0x0,
-                         FALSE,
-                         DUPLICATE_SAME_ACCESS)) {
-    DeathTestAbort("Unable to duplicate the event handle " +
-                   StreamableToString(event_handle_as_size_t) +
-                   " from the parent process " +
-                   StreamableToString(parent_process_id));
-  }
-
-  const int write_fd =
-      ::_open_osfhandle(reinterpret_cast<intptr_t>(dup_write_handle), O_APPEND);
-  if (write_fd == -1) {
-    DeathTestAbort("Unable to convert pipe handle " +
-                   StreamableToString(write_handle_as_size_t) +
-                   " to a file descriptor");
-  }
-
-  // Signals the parent that the write end of the pipe has been acquired
-  // so the parent can release its own write end.
-  ::SetEvent(dup_event_handle);
-
-  return write_fd;
-}
-# endif  // GTEST_OS_WINDOWS
-
-// Returns a newly created InternalRunDeathTestFlag object with fields
-// initialized from the GTEST_FLAG(internal_run_death_test) flag if
-// the flag is specified; otherwise returns NULL.
-InternalRunDeathTestFlag* ParseInternalRunDeathTestFlag() {
-  if (GTEST_FLAG(internal_run_death_test) == "") return nullptr;
-
-  // GTEST_HAS_DEATH_TEST implies that we have ::std::string, so we
-  // can use it here.
-  int line = -1;
-  int index = -1;
-  ::std::vector< ::std::string> fields;
-  SplitString(GTEST_FLAG(internal_run_death_test).c_str(), '|', &fields);
-  int write_fd = -1;
-
-# if GTEST_OS_WINDOWS
-
-  unsigned int parent_process_id = 0;
-  size_t write_handle_as_size_t = 0;
-  size_t event_handle_as_size_t = 0;
-
-  if (fields.size() != 6
-      || !ParseNaturalNumber(fields[1], &line)
-      || !ParseNaturalNumber(fields[2], &index)
-      || !ParseNaturalNumber(fields[3], &parent_process_id)
-      || !ParseNaturalNumber(fields[4], &write_handle_as_size_t)
-      || !ParseNaturalNumber(fields[5], &event_handle_as_size_t)) {
-    DeathTestAbort("Bad --gtest_internal_run_death_test flag: " +
-                   GTEST_FLAG(internal_run_death_test));
-  }
-  write_fd = GetStatusFileDescriptor(parent_process_id,
-                                     write_handle_as_size_t,
-                                     event_handle_as_size_t);
-
-# elif GTEST_OS_FUCHSIA
-
-  if (fields.size() != 3
-      || !ParseNaturalNumber(fields[1], &line)
-      || !ParseNaturalNumber(fields[2], &index)) {
-    DeathTestAbort("Bad --gtest_internal_run_death_test flag: "
-        + GTEST_FLAG(internal_run_death_test));
-  }
-
-# else
-
-  if (fields.size() != 4
-      || !ParseNaturalNumber(fields[1], &line)
-      || !ParseNaturalNumber(fields[2], &index)
-      || !ParseNaturalNumber(fields[3], &write_fd)) {
-    DeathTestAbort("Bad --gtest_internal_run_death_test flag: "
-        + GTEST_FLAG(internal_run_death_test));
-  }
-
-# endif  // GTEST_OS_WINDOWS
-
-  return new InternalRunDeathTestFlag(fields[0], line, index, write_fd);
-}
-
-}  // namespace internal
-
-#endif  // GTEST_HAS_DEATH_TEST
-
-}  // namespace testing
diff --git a/gnu/llvm/llvm/utils/unittest/googletest/src/gtest-filepath.cc b/gnu/llvm/llvm/utils/unittest/googletest/src/gtest-filepath.cc
deleted file mode 100644
index bd7b99ff03e..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googletest/src/gtest-filepath.cc
+++ /dev/null
@@ -1,379 +0,0 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "gtest/internal/gtest-filepath.h"
-
-#include <stdlib.h>
-#include "gtest/internal/gtest-port.h"
-#include "gtest/gtest-message.h"
-
-#if GTEST_OS_WINDOWS_MOBILE
-# include <windows.h>
-#elif GTEST_OS_WINDOWS
-# include <direct.h>
-# include <io.h>
-#else
-# include <limits.h>
-# include <climits>  // Some Linux distributions define PATH_MAX here.
-#endif  // GTEST_OS_WINDOWS_MOBILE
-
-#include "gtest/internal/gtest-string.h"
-
-#if GTEST_OS_WINDOWS
-# define GTEST_PATH_MAX_ _MAX_PATH
-#elif defined(PATH_MAX)
-# define GTEST_PATH_MAX_ PATH_MAX
-#elif defined(_XOPEN_PATH_MAX)
-# define GTEST_PATH_MAX_ _XOPEN_PATH_MAX
-#else
-# define GTEST_PATH_MAX_ _POSIX_PATH_MAX
-#endif  // GTEST_OS_WINDOWS
-
-namespace testing {
-namespace internal {
-
-#if GTEST_OS_WINDOWS
-// On Windows, '\\' is the standard path separator, but many tools and the
-// Windows API also accept '/' as an alternate path separator. Unless otherwise
-// noted, a file path can contain either kind of path separators, or a mixture
-// of them.
-const char kPathSeparator = '\\';
-const char kAlternatePathSeparator = '/';
-const char kAlternatePathSeparatorString[] = "/";
-# if GTEST_OS_WINDOWS_MOBILE
-// Windows CE doesn't have a current directory. You should not use
-// the current directory in tests on Windows CE, but this at least
-// provides a reasonable fallback.
-const char kCurrentDirectoryString[] = "\\";
-// Windows CE doesn't define INVALID_FILE_ATTRIBUTES
-const DWORD kInvalidFileAttributes = 0xffffffff;
-# else
-const char kCurrentDirectoryString[] = ".\\";
-# endif  // GTEST_OS_WINDOWS_MOBILE
-#else
-const char kPathSeparator = '/';
-const char kCurrentDirectoryString[] = "./";
-#endif  // GTEST_OS_WINDOWS
-
-// Returns whether the given character is a valid path separator.
-static bool IsPathSeparator(char c) {
-#if GTEST_HAS_ALT_PATH_SEP_
-  return (c == kPathSeparator) || (c == kAlternatePathSeparator);
-#else
-  return c == kPathSeparator;
-#endif
-}
-
-// Returns the current working directory, or "" if unsuccessful.
-FilePath FilePath::GetCurrentDir() {
-#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || \
-    GTEST_OS_WINDOWS_RT || ARDUINO || defined(ESP_PLATFORM)
-  // These platforms do not have a current directory, so we just return
-  // something reasonable.
-  return FilePath(kCurrentDirectoryString);
-#elif GTEST_OS_WINDOWS
-  char cwd[GTEST_PATH_MAX_ + 1] = { '\0' };
-  return FilePath(_getcwd(cwd, sizeof(cwd)) == nullptr ? "" : cwd);
-#else
-  char cwd[GTEST_PATH_MAX_ + 1] = { '\0' };
-  char* result = getcwd(cwd, sizeof(cwd));
-# if GTEST_OS_NACL
-  // getcwd will likely fail in NaCl due to the sandbox, so return something
-  // reasonable. The user may have provided a shim implementation for getcwd,
-  // however, so fallback only when failure is detected.
-  return FilePath(result == nullptr ? kCurrentDirectoryString : cwd);
-# endif  // GTEST_OS_NACL
-  return FilePath(result == nullptr ? "" : cwd);
-#endif  // GTEST_OS_WINDOWS_MOBILE
-}
-
-// Returns a copy of the FilePath with the case-insensitive extension removed.
-// Example: FilePath("dir/file.exe").RemoveExtension("EXE") returns
-// FilePath("dir/file"). If a case-insensitive extension is not
-// found, returns a copy of the original FilePath.
-FilePath FilePath::RemoveExtension(const char* extension) const {
-  const std::string dot_extension = std::string(".") + extension;
-  if (String::EndsWithCaseInsensitive(pathname_, dot_extension)) {
-    return FilePath(pathname_.substr(
-        0, pathname_.length() - dot_extension.length()));
-  }
-  return *this;
-}
-
-// Returns a pointer to the last occurrence of a valid path separator in
-// the FilePath. On Windows, for example, both '/' and '\' are valid path
-// separators. Returns NULL if no path separator was found.
-const char* FilePath::FindLastPathSeparator() const {
-  const char* const last_sep = strrchr(c_str(), kPathSeparator);
-#if GTEST_HAS_ALT_PATH_SEP_
-  const char* const last_alt_sep = strrchr(c_str(), kAlternatePathSeparator);
-  // Comparing two pointers of which only one is NULL is undefined.
-  if (last_alt_sep != nullptr &&
-      (last_sep == nullptr || last_alt_sep > last_sep)) {
-    return last_alt_sep;
-  }
-#endif
-  return last_sep;
-}
-
-// Returns a copy of the FilePath with the directory part removed.
-// Example: FilePath("path/to/file").RemoveDirectoryName() returns
-// FilePath("file"). If there is no directory part ("just_a_file"), it returns
-// the FilePath unmodified. If there is no file part ("just_a_dir/") it
-// returns an empty FilePath ("").
-// On Windows platform, '\' is the path separator, otherwise it is '/'.
-FilePath FilePath::RemoveDirectoryName() const {
-  const char* const last_sep = FindLastPathSeparator();
-  return last_sep ? FilePath(last_sep + 1) : *this;
-}
-
-// RemoveFileName returns the directory path with the filename removed.
-// Example: FilePath("path/to/file").RemoveFileName() returns "path/to/".
-// If the FilePath is "a_file" or "/a_file", RemoveFileName returns
-// FilePath("./") or, on Windows, FilePath(".\\"). If the filepath does
-// not have a file, like "just/a/dir/", it returns the FilePath unmodified.
-// On Windows platform, '\' is the path separator, otherwise it is '/'.
-FilePath FilePath::RemoveFileName() const {
-  const char* const last_sep = FindLastPathSeparator();
-  std::string dir;
-  if (last_sep) {
-    dir = std::string(c_str(), static_cast<size_t>(last_sep + 1 - c_str()));
-  } else {
-    dir = kCurrentDirectoryString;
-  }
-  return FilePath(dir);
-}
-
-// Helper functions for naming files in a directory for xml output.
-
-// Given directory = "dir", base_name = "test", number = 0,
-// extension = "xml", returns "dir/test.xml". If number is greater
-// than zero (e.g., 12), returns "dir/test_12.xml".
-// On Windows platform, uses \ as the separator rather than /.
-FilePath FilePath::MakeFileName(const FilePath& directory,
-                                const FilePath& base_name,
-                                int number,
-                                const char* extension) {
-  std::string file;
-  if (number == 0) {
-    file = base_name.string() + "." + extension;
-  } else {
-    file = base_name.string() + "_" + StreamableToString(number)
-        + "." + extension;
-  }
-  return ConcatPaths(directory, FilePath(file));
-}
-
-// Given directory = "dir", relative_path = "test.xml", returns "dir/test.xml".
-// On Windows, uses \ as the separator rather than /.
-FilePath FilePath::ConcatPaths(const FilePath& directory,
-                               const FilePath& relative_path) {
-  if (directory.IsEmpty())
-    return relative_path;
-  const FilePath dir(directory.RemoveTrailingPathSeparator());
-  return FilePath(dir.string() + kPathSeparator + relative_path.string());
-}
-
-// Returns true if pathname describes something findable in the file-system,
-// either a file, directory, or whatever.
-bool FilePath::FileOrDirectoryExists() const {
-#if GTEST_OS_WINDOWS_MOBILE
-  LPCWSTR unicode = String::AnsiToUtf16(pathname_.c_str());
-  const DWORD attributes = GetFileAttributes(unicode);
-  delete [] unicode;
-  return attributes != kInvalidFileAttributes;
-#else
-  posix::StatStruct file_stat;
-  return posix::Stat(pathname_.c_str(), &file_stat) == 0;
-#endif  // GTEST_OS_WINDOWS_MOBILE
-}
-
-// Returns true if pathname describes a directory in the file-system
-// that exists.
-bool FilePath::DirectoryExists() const {
-  bool result = false;
-#if GTEST_OS_WINDOWS
-  // Don't strip off trailing separator if path is a root directory on
-  // Windows (like "C:\\").
-  const FilePath& path(IsRootDirectory() ? *this :
-                                           RemoveTrailingPathSeparator());
-#else
-  const FilePath& path(*this);
-#endif
-
-#if GTEST_OS_WINDOWS_MOBILE
-  LPCWSTR unicode = String::AnsiToUtf16(path.c_str());
-  const DWORD attributes = GetFileAttributes(unicode);
-  delete [] unicode;
-  if ((attributes != kInvalidFileAttributes) &&
-      (attributes & FILE_ATTRIBUTE_DIRECTORY)) {
-    result = true;
-  }
-#else
-  posix::StatStruct file_stat;
-  result = posix::Stat(path.c_str(), &file_stat) == 0 &&
-      posix::IsDir(file_stat);
-#endif  // GTEST_OS_WINDOWS_MOBILE
-
-  return result;
-}
-
-// Returns true if pathname describes a root directory. (Windows has one
-// root directory per disk drive.)
-bool FilePath::IsRootDirectory() const {
-#if GTEST_OS_WINDOWS
-  return pathname_.length() == 3 && IsAbsolutePath();
-#else
-  return pathname_.length() == 1 && IsPathSeparator(pathname_.c_str()[0]);
-#endif
-}
-
-// Returns true if pathname describes an absolute path.
-bool FilePath::IsAbsolutePath() const {
-  const char* const name = pathname_.c_str();
-#if GTEST_OS_WINDOWS
-  return pathname_.length() >= 3 &&
-     ((name[0] >= 'a' && name[0] <= 'z') ||
-      (name[0] >= 'A' && name[0] <= 'Z')) &&
-     name[1] == ':' &&
-     IsPathSeparator(name[2]);
-#else
-  return IsPathSeparator(name[0]);
-#endif
-}
-
-// Returns a pathname for a file that does not currently exist. The pathname
-// will be directory/base_name.extension or
-// directory/base_name_<number>.extension if directory/base_name.extension
-// already exists. The number will be incremented until a pathname is found
-// that does not already exist.
-// Examples: 'dir/foo_test.xml' or 'dir/foo_test_1.xml'.
-// There could be a race condition if two or more processes are calling this
-// function at the same time -- they could both pick the same filename.
-FilePath FilePath::GenerateUniqueFileName(const FilePath& directory,
-                                          const FilePath& base_name,
-                                          const char* extension) {
-  FilePath full_pathname;
-  int number = 0;
-  do {
-    full_pathname.Set(MakeFileName(directory, base_name, number++, extension));
-  } while (full_pathname.FileOrDirectoryExists());
-  return full_pathname;
-}
-
-// Returns true if FilePath ends with a path separator, which indicates that
-// it is intended to represent a directory. Returns false otherwise.
-// This does NOT check that a directory (or file) actually exists.
-bool FilePath::IsDirectory() const {
-  return !pathname_.empty() &&
-         IsPathSeparator(pathname_.c_str()[pathname_.length() - 1]);
-}
-
-// Create directories so that path exists. Returns true if successful or if
-// the directories already exist; returns false if unable to create directories
-// for any reason.
-bool FilePath::CreateDirectoriesRecursively() const {
-  if (!this->IsDirectory()) {
-    return false;
-  }
-
-  if (pathname_.length() == 0 || this->DirectoryExists()) {
-    return true;
-  }
-
-  const FilePath parent(this->RemoveTrailingPathSeparator().RemoveFileName());
-  return parent.CreateDirectoriesRecursively() && this->CreateFolder();
-}
-
-// Create the directory so that path exists. Returns true if successful or
-// if the directory already exists; returns false if unable to create the
-// directory for any reason, including if the parent directory does not
-// exist. Not named "CreateDirectory" because that's a macro on Windows.
-bool FilePath::CreateFolder() const {
-#if GTEST_OS_WINDOWS_MOBILE
-  FilePath removed_sep(this->RemoveTrailingPathSeparator());
-  LPCWSTR unicode = String::AnsiToUtf16(removed_sep.c_str());
-  int result = CreateDirectory(unicode, nullptr) ? 0 : -1;
-  delete [] unicode;
-#elif GTEST_OS_WINDOWS
-  int result = _mkdir(pathname_.c_str());
-#else
-  int result = mkdir(pathname_.c_str(), 0777);
-#endif  // GTEST_OS_WINDOWS_MOBILE
-
-  if (result == -1) {
-    return this->DirectoryExists();  // An error is OK if the directory exists.
-  }
-  return true;  // No error.
-}
-
-// If input name has a trailing separator character, remove it and return the
-// name, otherwise return the name string unmodified.
-// On Windows platform, uses \ as the separator, other platforms use /.
-FilePath FilePath::RemoveTrailingPathSeparator() const {
-  return IsDirectory()
-      ? FilePath(pathname_.substr(0, pathname_.length() - 1))
-      : *this;
-}
-
-// Removes any redundant separators that might be in the pathname.
-// For example, "bar///foo" becomes "bar/foo". Does not eliminate other
-// redundancies that might be in a pathname involving "." or "..".
-void FilePath::Normalize() {
-  if (pathname_.c_str() == nullptr) {
-    pathname_ = "";
-    return;
-  }
-  const char* src = pathname_.c_str();
-  char* const dest = new char[pathname_.length() + 1];
-  char* dest_ptr = dest;
-  memset(dest_ptr, 0, pathname_.length() + 1);
-
-  while (*src != '\0') {
-    *dest_ptr = *src;
-    if (!IsPathSeparator(*src)) {
-      src++;
-    } else {
-#if GTEST_HAS_ALT_PATH_SEP_
-      if (*dest_ptr == kAlternatePathSeparator) {
-        *dest_ptr = kPathSeparator;
-      }
-#endif
-      while (IsPathSeparator(*src))
-        src++;
-    }
-    dest_ptr++;
-  }
-  *dest_ptr = '\0';
-  pathname_ = dest;
-  delete[] dest;
-}
-
-}  // namespace internal
-}  // namespace testing
diff --git a/gnu/llvm/llvm/utils/unittest/googletest/src/gtest-internal-inl.h b/gnu/llvm/llvm/utils/unittest/googletest/src/gtest-internal-inl.h
deleted file mode 100644
index 8ed70daab09..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googletest/src/gtest-internal-inl.h
+++ /dev/null
@@ -1,1211 +0,0 @@
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Utility functions and classes used by the Google C++ testing framework.//
-// This file contains purely Google Test's internal implementation.  Please
-// DO NOT #INCLUDE IT IN A USER PROGRAM.
-
-#ifndef GTEST_SRC_GTEST_INTERNAL_INL_H_
-#define GTEST_SRC_GTEST_INTERNAL_INL_H_
-
-#ifndef _WIN32_WCE
-# include <errno.h>
-#endif  // !_WIN32_WCE
-#include <stddef.h>
-#include <stdlib.h>  // For strtoll/_strtoul64/malloc/free.
-#include <string.h>  // For memmove.
-
-#include <algorithm>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "gtest/internal/gtest-port.h"
-
-#if GTEST_CAN_STREAM_RESULTS_
-# include <arpa/inet.h>  // NOLINT
-# include <netdb.h>  // NOLINT
-#endif
-
-#if GTEST_OS_WINDOWS
-# include <windows.h>  // NOLINT
-#endif  // GTEST_OS_WINDOWS
-
-#include "gtest/gtest.h"
-#include "gtest/gtest-spi.h"
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
-/* class A needs to have dll-interface to be used by clients of class B */)
-
-namespace testing {
-
-// Declares the flags.
-//
-// We don't want the users to modify this flag in the code, but want
-// Google Test's own unit tests to be able to access it. Therefore we
-// declare it here as opposed to in gtest.h.
-GTEST_DECLARE_bool_(death_test_use_fork);
-
-namespace internal {
-
-// The value of GetTestTypeId() as seen from within the Google Test
-// library.  This is solely for testing GetTestTypeId().
-GTEST_API_ extern const TypeId kTestTypeIdInGoogleTest;
-
-// Names of the flags (needed for parsing Google Test flags).
-const char kAlsoRunDisabledTestsFlag[] = "also_run_disabled_tests";
-const char kBreakOnFailureFlag[] = "break_on_failure";
-const char kCatchExceptionsFlag[] = "catch_exceptions";
-const char kColorFlag[] = "color";
-const char kFilterFlag[] = "filter";
-const char kListTestsFlag[] = "list_tests";
-const char kOutputFlag[] = "output";
-const char kPrintTimeFlag[] = "print_time";
-const char kPrintUTF8Flag[] = "print_utf8";
-const char kRandomSeedFlag[] = "random_seed";
-const char kRepeatFlag[] = "repeat";
-const char kShuffleFlag[] = "shuffle";
-const char kStackTraceDepthFlag[] = "stack_trace_depth";
-const char kStreamResultToFlag[] = "stream_result_to";
-const char kThrowOnFailureFlag[] = "throw_on_failure";
-const char kFlagfileFlag[] = "flagfile";
-
-// A valid random seed must be in [1, kMaxRandomSeed].
-const int kMaxRandomSeed = 99999;
-
-// g_help_flag is true if and only if the --help flag or an equivalent form
-// is specified on the command line.
-GTEST_API_ extern bool g_help_flag;
-
-// Returns the current time in milliseconds.
-GTEST_API_ TimeInMillis GetTimeInMillis();
-
-// Returns true if and only if Google Test should use colors in the output.
-GTEST_API_ bool ShouldUseColor(bool stdout_is_tty);
-
-// Formats the given time in milliseconds as seconds.
-GTEST_API_ std::string FormatTimeInMillisAsSeconds(TimeInMillis ms);
-
-// Converts the given time in milliseconds to a date string in the ISO 8601
-// format, without the timezone information.  N.B.: due to the use the
-// non-reentrant localtime() function, this function is not thread safe.  Do
-// not use it in any code that can be called from multiple threads.
-GTEST_API_ std::string FormatEpochTimeInMillisAsIso8601(TimeInMillis ms);
-
-// Parses a string for an Int32 flag, in the form of "--flag=value".
-//
-// On success, stores the value of the flag in *value, and returns
-// true.  On failure, returns false without changing *value.
-GTEST_API_ bool ParseInt32Flag(
-    const char* str, const char* flag, Int32* value);
-
-// Returns a random seed in range [1, kMaxRandomSeed] based on the
-// given --gtest_random_seed flag value.
-inline int GetRandomSeedFromFlag(Int32 random_seed_flag) {
-  const unsigned int raw_seed = (random_seed_flag == 0) ?
-      static_cast<unsigned int>(GetTimeInMillis()) :
-      static_cast<unsigned int>(random_seed_flag);
-
-  // Normalizes the actual seed to range [1, kMaxRandomSeed] such that
-  // it's easy to type.
-  const int normalized_seed =
-      static_cast<int>((raw_seed - 1U) %
-                       static_cast<unsigned int>(kMaxRandomSeed)) + 1;
-  return normalized_seed;
-}
-
-// Returns the first valid random seed after 'seed'.  The behavior is
-// undefined if 'seed' is invalid.  The seed after kMaxRandomSeed is
-// considered to be 1.
-inline int GetNextRandomSeed(int seed) {
-  GTEST_CHECK_(1 <= seed && seed <= kMaxRandomSeed)
-      << "Invalid random seed " << seed << " - must be in [1, "
-      << kMaxRandomSeed << "].";
-  const int next_seed = seed + 1;
-  return (next_seed > kMaxRandomSeed) ? 1 : next_seed;
-}
-
-// This class saves the values of all Google Test flags in its c'tor, and
-// restores them in its d'tor.
-class GTestFlagSaver {
- public:
-  // The c'tor.
-  GTestFlagSaver() {
-    also_run_disabled_tests_ = GTEST_FLAG(also_run_disabled_tests);
-    break_on_failure_ = GTEST_FLAG(break_on_failure);
-    catch_exceptions_ = GTEST_FLAG(catch_exceptions);
-    color_ = GTEST_FLAG(color);
-    death_test_style_ = GTEST_FLAG(death_test_style);
-    death_test_use_fork_ = GTEST_FLAG(death_test_use_fork);
-    filter_ = GTEST_FLAG(filter);
-    internal_run_death_test_ = GTEST_FLAG(internal_run_death_test);
-    list_tests_ = GTEST_FLAG(list_tests);
-    output_ = GTEST_FLAG(output);
-    print_time_ = GTEST_FLAG(print_time);
-    print_utf8_ = GTEST_FLAG(print_utf8);
-    random_seed_ = GTEST_FLAG(random_seed);
-    repeat_ = GTEST_FLAG(repeat);
-    shuffle_ = GTEST_FLAG(shuffle);
-    stack_trace_depth_ = GTEST_FLAG(stack_trace_depth);
-    stream_result_to_ = GTEST_FLAG(stream_result_to);
-    throw_on_failure_ = GTEST_FLAG(throw_on_failure);
-  }
-
-  // The d'tor is not virtual.  DO NOT INHERIT FROM THIS CLASS.
-  ~GTestFlagSaver() {
-    GTEST_FLAG(also_run_disabled_tests) = also_run_disabled_tests_;
-    GTEST_FLAG(break_on_failure) = break_on_failure_;
-    GTEST_FLAG(catch_exceptions) = catch_exceptions_;
-    GTEST_FLAG(color) = color_;
-    GTEST_FLAG(death_test_style) = death_test_style_;
-    GTEST_FLAG(death_test_use_fork) = death_test_use_fork_;
-    GTEST_FLAG(filter) = filter_;
-    GTEST_FLAG(internal_run_death_test) = internal_run_death_test_;
-    GTEST_FLAG(list_tests) = list_tests_;
-    GTEST_FLAG(output) = output_;
-    GTEST_FLAG(print_time) = print_time_;
-    GTEST_FLAG(print_utf8) = print_utf8_;
-    GTEST_FLAG(random_seed) = random_seed_;
-    GTEST_FLAG(repeat) = repeat_;
-    GTEST_FLAG(shuffle) = shuffle_;
-    GTEST_FLAG(stack_trace_depth) = stack_trace_depth_;
-    GTEST_FLAG(stream_result_to) = stream_result_to_;
-    GTEST_FLAG(throw_on_failure) = throw_on_failure_;
-  }
-
- private:
-  // Fields for saving the original values of flags.
-  bool also_run_disabled_tests_;
-  bool break_on_failure_;
-  bool catch_exceptions_;
-  std::string color_;
-  std::string death_test_style_;
-  bool death_test_use_fork_;
-  std::string filter_;
-  std::string internal_run_death_test_;
-  bool list_tests_;
-  std::string output_;
-  bool print_time_;
-  bool print_utf8_;
-  internal::Int32 random_seed_;
-  internal::Int32 repeat_;
-  bool shuffle_;
-  internal::Int32 stack_trace_depth_;
-  std::string stream_result_to_;
-  bool throw_on_failure_;
-} GTEST_ATTRIBUTE_UNUSED_;
-
-// Converts a Unicode code point to a narrow string in UTF-8 encoding.
-// code_point parameter is of type UInt32 because wchar_t may not be
-// wide enough to contain a code point.
-// If the code_point is not a valid Unicode code point
-// (i.e. outside of Unicode range U+0 to U+10FFFF) it will be converted
-// to "(Invalid Unicode 0xXXXXXXXX)".
-GTEST_API_ std::string CodePointToUtf8(UInt32 code_point);
-
-// Converts a wide string to a narrow string in UTF-8 encoding.
-// The wide string is assumed to have the following encoding:
-//   UTF-16 if sizeof(wchar_t) == 2 (on Windows, Cygwin)
-//   UTF-32 if sizeof(wchar_t) == 4 (on Linux)
-// Parameter str points to a null-terminated wide string.
-// Parameter num_chars may additionally limit the number
-// of wchar_t characters processed. -1 is used when the entire string
-// should be processed.
-// If the string contains code points that are not valid Unicode code points
-// (i.e. outside of Unicode range U+0 to U+10FFFF) they will be output
-// as '(Invalid Unicode 0xXXXXXXXX)'. If the string is in UTF16 encoding
-// and contains invalid UTF-16 surrogate pairs, values in those pairs
-// will be encoded as individual Unicode characters from Basic Normal Plane.
-GTEST_API_ std::string WideStringToUtf8(const wchar_t* str, int num_chars);
-
-// Reads the GTEST_SHARD_STATUS_FILE environment variable, and creates the file
-// if the variable is present. If a file already exists at this location, this
-// function will write over it. If the variable is present, but the file cannot
-// be created, prints an error and exits.
-void WriteToShardStatusFileIfNeeded();
-
-// Checks whether sharding is enabled by examining the relevant
-// environment variable values. If the variables are present,
-// but inconsistent (e.g., shard_index >= total_shards), prints
-// an error and exits. If in_subprocess_for_death_test, sharding is
-// disabled because it must only be applied to the original test
-// process. Otherwise, we could filter out death tests we intended to execute.
-GTEST_API_ bool ShouldShard(const char* total_shards_str,
-                            const char* shard_index_str,
-                            bool in_subprocess_for_death_test);
-
-// Parses the environment variable var as an Int32. If it is unset,
-// returns default_val. If it is not an Int32, prints an error and
-// and aborts.
-GTEST_API_ Int32 Int32FromEnvOrDie(const char* env_var, Int32 default_val);
-
-// Given the total number of shards, the shard index, and the test id,
-// returns true if and only if the test should be run on this shard. The test id
-// is some arbitrary but unique non-negative integer assigned to each test
-// method. Assumes that 0 <= shard_index < total_shards.
-GTEST_API_ bool ShouldRunTestOnShard(
-    int total_shards, int shard_index, int test_id);
-
-// STL container utilities.
-
-// Returns the number of elements in the given container that satisfy
-// the given predicate.
-template <class Container, typename Predicate>
-inline int CountIf(const Container& c, Predicate predicate) {
-  // Implemented as an explicit loop since std::count_if() in libCstd on
-  // Solaris has a non-standard signature.
-  int count = 0;
-  for (typename Container::const_iterator it = c.begin(); it != c.end(); ++it) {
-    if (predicate(*it))
-      ++count;
-  }
-  return count;
-}
-
-// Applies a function/functor to each element in the container.
-template <class Container, typename Functor>
-void ForEach(const Container& c, Functor functor) {
-  std::for_each(c.begin(), c.end(), functor);
-}
-
-// Returns the i-th element of the vector, or default_value if i is not
-// in range [0, v.size()).
-template <typename E>
-inline E GetElementOr(const std::vector<E>& v, int i, E default_value) {
-  return (i < 0 || i >= static_cast<int>(v.size())) ? default_value
-                                                    : v[static_cast<size_t>(i)];
-}
-
-// Performs an in-place shuffle of a range of the vector's elements.
-// 'begin' and 'end' are element indices as an STL-style range;
-// i.e. [begin, end) are shuffled, where 'end' == size() means to
-// shuffle to the end of the vector.
-template <typename E>
-void ShuffleRange(internal::Random* random, int begin, int end,
-                  std::vector<E>* v) {
-  const int size = static_cast<int>(v->size());
-  GTEST_CHECK_(0 <= begin && begin <= size)
-      << "Invalid shuffle range start " << begin << ": must be in range [0, "
-      << size << "].";
-  GTEST_CHECK_(begin <= end && end <= size)
-      << "Invalid shuffle range finish " << end << ": must be in range ["
-      << begin << ", " << size << "].";
-
-  // Fisher-Yates shuffle, from
-  // http://en.wikipedia.org/wiki/Fisher-Yates_shuffle
-  for (int range_width = end - begin; range_width >= 2; range_width--) {
-    const int last_in_range = begin + range_width - 1;
-    const int selected =
-        begin +
-        static_cast<int>(random->Generate(static_cast<UInt32>(range_width)));
-    std::swap((*v)[static_cast<size_t>(selected)],
-              (*v)[static_cast<size_t>(last_in_range)]);
-  }
-}
-
-// Performs an in-place shuffle of the vector's elements.
-template <typename E>
-inline void Shuffle(internal::Random* random, std::vector<E>* v) {
-  ShuffleRange(random, 0, static_cast<int>(v->size()), v);
-}
-
-// A function for deleting an object.  Handy for being used as a
-// functor.
-template <typename T>
-static void Delete(T* x) {
-  delete x;
-}
-
-// A predicate that checks the key of a TestProperty against a known key.
-//
-// TestPropertyKeyIs is copyable.
-class TestPropertyKeyIs {
- public:
-  // Constructor.
-  //
-  // TestPropertyKeyIs has NO default constructor.
-  explicit TestPropertyKeyIs(const std::string& key) : key_(key) {}
-
-  // Returns true if and only if the test name of test property matches on key_.
-  bool operator()(const TestProperty& test_property) const {
-    return test_property.key() == key_;
-  }
-
- private:
-  std::string key_;
-};
-
-// Class UnitTestOptions.
-//
-// This class contains functions for processing options the user
-// specifies when running the tests.  It has only static members.
-//
-// In most cases, the user can specify an option using either an
-// environment variable or a command line flag.  E.g. you can set the
-// test filter using either GTEST_FILTER or --gtest_filter.  If both
-// the variable and the flag are present, the latter overrides the
-// former.
-class GTEST_API_ UnitTestOptions {
- public:
-  // Functions for processing the gtest_output flag.
-
-  // Returns the output format, or "" for normal printed output.
-  static std::string GetOutputFormat();
-
-  // Returns the absolute path of the requested output file, or the
-  // default (test_detail.xml in the original working directory) if
-  // none was explicitly specified.
-  static std::string GetAbsolutePathToOutputFile();
-
-  // Functions for processing the gtest_filter flag.
-
-  // Returns true if and only if the wildcard pattern matches the string.
-  // The first ':' or '\0' character in pattern marks the end of it.
-  //
-  // This recursive algorithm isn't very efficient, but is clear and
-  // works well enough for matching test names, which are short.
-  static bool PatternMatchesString(const char *pattern, const char *str);
-
-  // Returns true if and only if the user-specified filter matches the test
-  // suite name and the test name.
-  static bool FilterMatchesTest(const std::string& test_suite_name,
-                                const std::string& test_name);
-
-#if GTEST_OS_WINDOWS
-  // Function for supporting the gtest_catch_exception flag.
-
-  // Returns EXCEPTION_EXECUTE_HANDLER if Google Test should handle the
-  // given SEH exception, or EXCEPTION_CONTINUE_SEARCH otherwise.
-  // This function is useful as an __except condition.
-  static int GTestShouldProcessSEH(DWORD exception_code);
-#endif  // GTEST_OS_WINDOWS
-
-  // Returns true if "name" matches the ':' separated list of glob-style
-  // filters in "filter".
-  static bool MatchesFilter(const std::string& name, const char* filter);
-};
-
-// Returns the current application's name, removing directory path if that
-// is present.  Used by UnitTestOptions::GetOutputFile.
-GTEST_API_ FilePath GetCurrentExecutableName();
-
-// The role interface for getting the OS stack trace as a string.
-class OsStackTraceGetterInterface {
- public:
-  OsStackTraceGetterInterface() {}
-  virtual ~OsStackTraceGetterInterface() {}
-
-  // Returns the current OS stack trace as an std::string.  Parameters:
-  //
-  //   max_depth  - the maximum number of stack frames to be included
-  //                in the trace.
-  //   skip_count - the number of top frames to be skipped; doesn't count
-  //                against max_depth.
-  virtual std::string CurrentStackTrace(int max_depth, int skip_count) = 0;
-
-  // UponLeavingGTest() should be called immediately before Google Test calls
-  // user code. It saves some information about the current stack that
-  // CurrentStackTrace() will use to find and hide Google Test stack frames.
-  virtual void UponLeavingGTest() = 0;
-
-  // This string is inserted in place of stack frames that are part of
-  // Google Test's implementation.
-  static const char* const kElidedFramesMarker;
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(OsStackTraceGetterInterface);
-};
-
-// A working implementation of the OsStackTraceGetterInterface interface.
-class OsStackTraceGetter : public OsStackTraceGetterInterface {
- public:
-  OsStackTraceGetter() {}
-
-  std::string CurrentStackTrace(int max_depth, int skip_count) override;
-  void UponLeavingGTest() override;
-
- private:
-#if GTEST_HAS_ABSL
-  Mutex mutex_;  // Protects all internal state.
-
-  // We save the stack frame below the frame that calls user code.
-  // We do this because the address of the frame immediately below
-  // the user code changes between the call to UponLeavingGTest()
-  // and any calls to the stack trace code from within the user code.
-  void* caller_frame_ = nullptr;
-#endif  // GTEST_HAS_ABSL
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(OsStackTraceGetter);
-};
-
-// Information about a Google Test trace point.
-struct TraceInfo {
-  const char* file;
-  int line;
-  std::string message;
-};
-
-// This is the default global test part result reporter used in UnitTestImpl.
-// This class should only be used by UnitTestImpl.
-class DefaultGlobalTestPartResultReporter
-  : public TestPartResultReporterInterface {
- public:
-  explicit DefaultGlobalTestPartResultReporter(UnitTestImpl* unit_test);
-  // Implements the TestPartResultReporterInterface. Reports the test part
-  // result in the current test.
-  void ReportTestPartResult(const TestPartResult& result) override;
-
- private:
-  UnitTestImpl* const unit_test_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultGlobalTestPartResultReporter);
-};
-
-// This is the default per thread test part result reporter used in
-// UnitTestImpl. This class should only be used by UnitTestImpl.
-class DefaultPerThreadTestPartResultReporter
-    : public TestPartResultReporterInterface {
- public:
-  explicit DefaultPerThreadTestPartResultReporter(UnitTestImpl* unit_test);
-  // Implements the TestPartResultReporterInterface. The implementation just
-  // delegates to the current global test part result reporter of *unit_test_.
-  void ReportTestPartResult(const TestPartResult& result) override;
-
- private:
-  UnitTestImpl* const unit_test_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultPerThreadTestPartResultReporter);
-};
-
-// The private implementation of the UnitTest class.  We don't protect
-// the methods under a mutex, as this class is not accessible by a
-// user and the UnitTest class that delegates work to this class does
-// proper locking.
-class GTEST_API_ UnitTestImpl {
- public:
-  explicit UnitTestImpl(UnitTest* parent);
-  virtual ~UnitTestImpl();
-
-  // There are two different ways to register your own TestPartResultReporter.
-  // You can register your own repoter to listen either only for test results
-  // from the current thread or for results from all threads.
-  // By default, each per-thread test result repoter just passes a new
-  // TestPartResult to the global test result reporter, which registers the
-  // test part result for the currently running test.
-
-  // Returns the global test part result reporter.
-  TestPartResultReporterInterface* GetGlobalTestPartResultReporter();
-
-  // Sets the global test part result reporter.
-  void SetGlobalTestPartResultReporter(
-      TestPartResultReporterInterface* reporter);
-
-  // Returns the test part result reporter for the current thread.
-  TestPartResultReporterInterface* GetTestPartResultReporterForCurrentThread();
-
-  // Sets the test part result reporter for the current thread.
-  void SetTestPartResultReporterForCurrentThread(
-      TestPartResultReporterInterface* reporter);
-
-  // Gets the number of successful test suites.
-  int successful_test_suite_count() const;
-
-  // Gets the number of failed test suites.
-  int failed_test_suite_count() const;
-
-  // Gets the number of all test suites.
-  int total_test_suite_count() const;
-
-  // Gets the number of all test suites that contain at least one test
-  // that should run.
-  int test_suite_to_run_count() const;
-
-  // Gets the number of successful tests.
-  int successful_test_count() const;
-
-  // Gets the number of skipped tests.
-  int skipped_test_count() const;
-
-  // Gets the number of failed tests.
-  int failed_test_count() const;
-
-  // Gets the number of disabled tests that will be reported in the XML report.
-  int reportable_disabled_test_count() const;
-
-  // Gets the number of disabled tests.
-  int disabled_test_count() const;
-
-  // Gets the number of tests to be printed in the XML report.
-  int reportable_test_count() const;
-
-  // Gets the number of all tests.
-  int total_test_count() const;
-
-  // Gets the number of tests that should run.
-  int test_to_run_count() const;
-
-  // Gets the time of the test program start, in ms from the start of the
-  // UNIX epoch.
-  TimeInMillis start_timestamp() const { return start_timestamp_; }
-
-  // Gets the elapsed time, in milliseconds.
-  TimeInMillis elapsed_time() const { return elapsed_time_; }
-
-  // Returns true if and only if the unit test passed (i.e. all test suites
-  // passed).
-  bool Passed() const { return !Failed(); }
-
-  // Returns true if and only if the unit test failed (i.e. some test suite
-  // failed or something outside of all tests failed).
-  bool Failed() const {
-    return failed_test_suite_count() > 0 || ad_hoc_test_result()->Failed();
-  }
-
-  // Gets the i-th test suite among all the test suites. i can range from 0 to
-  // total_test_suite_count() - 1. If i is not in that range, returns NULL.
-  const TestSuite* GetTestSuite(int i) const {
-    const int index = GetElementOr(test_suite_indices_, i, -1);
-    return index < 0 ? nullptr : test_suites_[static_cast<size_t>(i)];
-  }
-
-  //  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  const TestCase* GetTestCase(int i) const { return GetTestSuite(i); }
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  // Gets the i-th test suite among all the test suites. i can range from 0 to
-  // total_test_suite_count() - 1. If i is not in that range, returns NULL.
-  TestSuite* GetMutableSuiteCase(int i) {
-    const int index = GetElementOr(test_suite_indices_, i, -1);
-    return index < 0 ? nullptr : test_suites_[static_cast<size_t>(index)];
-  }
-
-  // Provides access to the event listener list.
-  TestEventListeners* listeners() { return &listeners_; }
-
-  // Returns the TestResult for the test that's currently running, or
-  // the TestResult for the ad hoc test if no test is running.
-  TestResult* current_test_result();
-
-  // Returns the TestResult for the ad hoc test.
-  const TestResult* ad_hoc_test_result() const { return &ad_hoc_test_result_; }
-
-  // Sets the OS stack trace getter.
-  //
-  // Does nothing if the input and the current OS stack trace getter
-  // are the same; otherwise, deletes the old getter and makes the
-  // input the current getter.
-  void set_os_stack_trace_getter(OsStackTraceGetterInterface* getter);
-
-  // Returns the current OS stack trace getter if it is not NULL;
-  // otherwise, creates an OsStackTraceGetter, makes it the current
-  // getter, and returns it.
-  OsStackTraceGetterInterface* os_stack_trace_getter();
-
-  // Returns the current OS stack trace as an std::string.
-  //
-  // The maximum number of stack frames to be included is specified by
-  // the gtest_stack_trace_depth flag.  The skip_count parameter
-  // specifies the number of top frames to be skipped, which doesn't
-  // count against the number of frames to be included.
-  //
-  // For example, if Foo() calls Bar(), which in turn calls
-  // CurrentOsStackTraceExceptTop(1), Foo() will be included in the
-  // trace but Bar() and CurrentOsStackTraceExceptTop() won't.
-  std::string CurrentOsStackTraceExceptTop(int skip_count) GTEST_NO_INLINE_;
-
-  // Finds and returns a TestSuite with the given name.  If one doesn't
-  // exist, creates one and returns it.
-  //
-  // Arguments:
-  //
-  //   test_suite_name: name of the test suite
-  //   type_param:     the name of the test's type parameter, or NULL if
-  //                   this is not a typed or a type-parameterized test.
-  //   set_up_tc:      pointer to the function that sets up the test suite
-  //   tear_down_tc:   pointer to the function that tears down the test suite
-  TestSuite* GetTestSuite(const char* test_suite_name, const char* type_param,
-                          internal::SetUpTestSuiteFunc set_up_tc,
-                          internal::TearDownTestSuiteFunc tear_down_tc);
-
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  TestCase* GetTestCase(const char* test_case_name, const char* type_param,
-                        internal::SetUpTestSuiteFunc set_up_tc,
-                        internal::TearDownTestSuiteFunc tear_down_tc) {
-    return GetTestSuite(test_case_name, type_param, set_up_tc, tear_down_tc);
-  }
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  // Adds a TestInfo to the unit test.
-  //
-  // Arguments:
-  //
-  //   set_up_tc:    pointer to the function that sets up the test suite
-  //   tear_down_tc: pointer to the function that tears down the test suite
-  //   test_info:    the TestInfo object
-  void AddTestInfo(internal::SetUpTestSuiteFunc set_up_tc,
-                   internal::TearDownTestSuiteFunc tear_down_tc,
-                   TestInfo* test_info) {
-    // In order to support thread-safe death tests, we need to
-    // remember the original working directory when the test program
-    // was first invoked.  We cannot do this in RUN_ALL_TESTS(), as
-    // the user may have changed the current directory before calling
-    // RUN_ALL_TESTS().  Therefore we capture the current directory in
-    // AddTestInfo(), which is called to register a TEST or TEST_F
-    // before main() is reached.
-    if (original_working_dir_.IsEmpty()) {
-      original_working_dir_.Set(FilePath::GetCurrentDir());
-      GTEST_CHECK_(!original_working_dir_.IsEmpty())
-          << "Failed to get the current working directory.";
-    }
-
-    GetTestSuite(test_info->test_suite_name(), test_info->type_param(),
-                 set_up_tc, tear_down_tc)
-        ->AddTestInfo(test_info);
-  }
-
-  // Returns ParameterizedTestSuiteRegistry object used to keep track of
-  // value-parameterized tests and instantiate and register them.
-  internal::ParameterizedTestSuiteRegistry& parameterized_test_registry() {
-    return parameterized_test_registry_;
-  }
-
-  // Sets the TestSuite object for the test that's currently running.
-  void set_current_test_suite(TestSuite* a_current_test_suite) {
-    current_test_suite_ = a_current_test_suite;
-  }
-
-  // Sets the TestInfo object for the test that's currently running.  If
-  // current_test_info is NULL, the assertion results will be stored in
-  // ad_hoc_test_result_.
-  void set_current_test_info(TestInfo* a_current_test_info) {
-    current_test_info_ = a_current_test_info;
-  }
-
-  // Registers all parameterized tests defined using TEST_P and
-  // INSTANTIATE_TEST_SUITE_P, creating regular tests for each test/parameter
-  // combination. This method can be called more then once; it has guards
-  // protecting from registering the tests more then once.  If
-  // value-parameterized tests are disabled, RegisterParameterizedTests is
-  // present but does nothing.
-  void RegisterParameterizedTests();
-
-  // Runs all tests in this UnitTest object, prints the result, and
-  // returns true if all tests are successful.  If any exception is
-  // thrown during a test, this test is considered to be failed, but
-  // the rest of the tests will still be run.
-  bool RunAllTests();
-
-  // Clears the results of all tests, except the ad hoc tests.
-  void ClearNonAdHocTestResult() {
-    ForEach(test_suites_, TestSuite::ClearTestSuiteResult);
-  }
-
-  // Clears the results of ad-hoc test assertions.
-  void ClearAdHocTestResult() {
-    ad_hoc_test_result_.Clear();
-  }
-
-  // Adds a TestProperty to the current TestResult object when invoked in a
-  // context of a test or a test suite, or to the global property set. If the
-  // result already contains a property with the same key, the value will be
-  // updated.
-  void RecordProperty(const TestProperty& test_property);
-
-  enum ReactionToSharding {
-    HONOR_SHARDING_PROTOCOL,
-    IGNORE_SHARDING_PROTOCOL
-  };
-
-  // Matches the full name of each test against the user-specified
-  // filter to decide whether the test should run, then records the
-  // result in each TestSuite and TestInfo object.
-  // If shard_tests == HONOR_SHARDING_PROTOCOL, further filters tests
-  // based on sharding variables in the environment.
-  // Returns the number of tests that should run.
-  int FilterTests(ReactionToSharding shard_tests);
-
-  // Prints the names of the tests matching the user-specified filter flag.
-  void ListTestsMatchingFilter();
-
-  const TestSuite* current_test_suite() const { return current_test_suite_; }
-  TestInfo* current_test_info() { return current_test_info_; }
-  const TestInfo* current_test_info() const { return current_test_info_; }
-
-  // Returns the vector of environments that need to be set-up/torn-down
-  // before/after the tests are run.
-  std::vector<Environment*>& environments() { return environments_; }
-
-  // Getters for the per-thread Google Test trace stack.
-  std::vector<TraceInfo>& gtest_trace_stack() {
-    return *(gtest_trace_stack_.pointer());
-  }
-  const std::vector<TraceInfo>& gtest_trace_stack() const {
-    return gtest_trace_stack_.get();
-  }
-
-#if GTEST_HAS_DEATH_TEST
-  void InitDeathTestSubprocessControlInfo() {
-    internal_run_death_test_flag_.reset(ParseInternalRunDeathTestFlag());
-  }
-  // Returns a pointer to the parsed --gtest_internal_run_death_test
-  // flag, or NULL if that flag was not specified.
-  // This information is useful only in a death test child process.
-  // Must not be called before a call to InitGoogleTest.
-  const InternalRunDeathTestFlag* internal_run_death_test_flag() const {
-    return internal_run_death_test_flag_.get();
-  }
-
-  // Returns a pointer to the current death test factory.
-  internal::DeathTestFactory* death_test_factory() {
-    return death_test_factory_.get();
-  }
-
-  void SuppressTestEventsIfInSubprocess();
-
-  friend class ReplaceDeathTestFactory;
-#endif  // GTEST_HAS_DEATH_TEST
-
-  // Initializes the event listener performing XML output as specified by
-  // UnitTestOptions. Must not be called before InitGoogleTest.
-  void ConfigureXmlOutput();
-
-#if GTEST_CAN_STREAM_RESULTS_
-  // Initializes the event listener for streaming test results to a socket.
-  // Must not be called before InitGoogleTest.
-  void ConfigureStreamingOutput();
-#endif
-
-  // Performs initialization dependent upon flag values obtained in
-  // ParseGoogleTestFlagsOnly.  Is called from InitGoogleTest after the call to
-  // ParseGoogleTestFlagsOnly.  In case a user neglects to call InitGoogleTest
-  // this function is also called from RunAllTests.  Since this function can be
-  // called more than once, it has to be idempotent.
-  void PostFlagParsingInit();
-
-  // Gets the random seed used at the start of the current test iteration.
-  int random_seed() const { return random_seed_; }
-
-  // Gets the random number generator.
-  internal::Random* random() { return &random_; }
-
-  // Shuffles all test suites, and the tests within each test suite,
-  // making sure that death tests are still run first.
-  void ShuffleTests();
-
-  // Restores the test suites and tests to their order before the first shuffle.
-  void UnshuffleTests();
-
-  // Returns the value of GTEST_FLAG(catch_exceptions) at the moment
-  // UnitTest::Run() starts.
-  bool catch_exceptions() const { return catch_exceptions_; }
-
- private:
-  friend class ::testing::UnitTest;
-
-  // Used by UnitTest::Run() to capture the state of
-  // GTEST_FLAG(catch_exceptions) at the moment it starts.
-  void set_catch_exceptions(bool value) { catch_exceptions_ = value; }
-
-  // The UnitTest object that owns this implementation object.
-  UnitTest* const parent_;
-
-  // The working directory when the first TEST() or TEST_F() was
-  // executed.
-  internal::FilePath original_working_dir_;
-
-  // The default test part result reporters.
-  DefaultGlobalTestPartResultReporter default_global_test_part_result_reporter_;
-  DefaultPerThreadTestPartResultReporter
-      default_per_thread_test_part_result_reporter_;
-
-  // Points to (but doesn't own) the global test part result reporter.
-  TestPartResultReporterInterface* global_test_part_result_repoter_;
-
-  // Protects read and write access to global_test_part_result_reporter_.
-  internal::Mutex global_test_part_result_reporter_mutex_;
-
-  // Points to (but doesn't own) the per-thread test part result reporter.
-  internal::ThreadLocal<TestPartResultReporterInterface*>
-      per_thread_test_part_result_reporter_;
-
-  // The vector of environments that need to be set-up/torn-down
-  // before/after the tests are run.
-  std::vector<Environment*> environments_;
-
-  // The vector of TestSuites in their original order.  It owns the
-  // elements in the vector.
-  std::vector<TestSuite*> test_suites_;
-
-  // Provides a level of indirection for the test suite list to allow
-  // easy shuffling and restoring the test suite order.  The i-th
-  // element of this vector is the index of the i-th test suite in the
-  // shuffled order.
-  std::vector<int> test_suite_indices_;
-
-  // ParameterizedTestRegistry object used to register value-parameterized
-  // tests.
-  internal::ParameterizedTestSuiteRegistry parameterized_test_registry_;
-
-  // Indicates whether RegisterParameterizedTests() has been called already.
-  bool parameterized_tests_registered_;
-
-  // Index of the last death test suite registered.  Initially -1.
-  int last_death_test_suite_;
-
-  // This points to the TestSuite for the currently running test.  It
-  // changes as Google Test goes through one test suite after another.
-  // When no test is running, this is set to NULL and Google Test
-  // stores assertion results in ad_hoc_test_result_.  Initially NULL.
-  TestSuite* current_test_suite_;
-
-  // This points to the TestInfo for the currently running test.  It
-  // changes as Google Test goes through one test after another.  When
-  // no test is running, this is set to NULL and Google Test stores
-  // assertion results in ad_hoc_test_result_.  Initially NULL.
-  TestInfo* current_test_info_;
-
-  // Normally, a user only writes assertions inside a TEST or TEST_F,
-  // or inside a function called by a TEST or TEST_F.  Since Google
-  // Test keeps track of which test is current running, it can
-  // associate such an assertion with the test it belongs to.
-  //
-  // If an assertion is encountered when no TEST or TEST_F is running,
-  // Google Test attributes the assertion result to an imaginary "ad hoc"
-  // test, and records the result in ad_hoc_test_result_.
-  TestResult ad_hoc_test_result_;
-
-  // The list of event listeners that can be used to track events inside
-  // Google Test.
-  TestEventListeners listeners_;
-
-  // The OS stack trace getter.  Will be deleted when the UnitTest
-  // object is destructed.  By default, an OsStackTraceGetter is used,
-  // but the user can set this field to use a custom getter if that is
-  // desired.
-  OsStackTraceGetterInterface* os_stack_trace_getter_;
-
-  // True if and only if PostFlagParsingInit() has been called.
-  bool post_flag_parse_init_performed_;
-
-  // The random number seed used at the beginning of the test run.
-  int random_seed_;
-
-  // Our random number generator.
-  internal::Random random_;
-
-  // The time of the test program start, in ms from the start of the
-  // UNIX epoch.
-  TimeInMillis start_timestamp_;
-
-  // How long the test took to run, in milliseconds.
-  TimeInMillis elapsed_time_;
-
-#if GTEST_HAS_DEATH_TEST
-  // The decomposed components of the gtest_internal_run_death_test flag,
-  // parsed when RUN_ALL_TESTS is called.
-  std::unique_ptr<InternalRunDeathTestFlag> internal_run_death_test_flag_;
-  std::unique_ptr<internal::DeathTestFactory> death_test_factory_;
-#endif  // GTEST_HAS_DEATH_TEST
-
-  // A per-thread stack of traces created by the SCOPED_TRACE() macro.
-  internal::ThreadLocal<std::vector<TraceInfo> > gtest_trace_stack_;
-
-  // The value of GTEST_FLAG(catch_exceptions) at the moment RunAllTests()
-  // starts.
-  bool catch_exceptions_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(UnitTestImpl);
-};  // class UnitTestImpl
-
-// Convenience function for accessing the global UnitTest
-// implementation object.
-inline UnitTestImpl* GetUnitTestImpl() {
-  return UnitTest::GetInstance()->impl();
-}
-
-#if GTEST_USES_SIMPLE_RE
-
-// Internal helper functions for implementing the simple regular
-// expression matcher.
-GTEST_API_ bool IsInSet(char ch, const char* str);
-GTEST_API_ bool IsAsciiDigit(char ch);
-GTEST_API_ bool IsAsciiPunct(char ch);
-GTEST_API_ bool IsRepeat(char ch);
-GTEST_API_ bool IsAsciiWhiteSpace(char ch);
-GTEST_API_ bool IsAsciiWordChar(char ch);
-GTEST_API_ bool IsValidEscape(char ch);
-GTEST_API_ bool AtomMatchesChar(bool escaped, char pattern, char ch);
-GTEST_API_ bool ValidateRegex(const char* regex);
-GTEST_API_ bool MatchRegexAtHead(const char* regex, const char* str);
-GTEST_API_ bool MatchRepetitionAndRegexAtHead(
-    bool escaped, char ch, char repeat, const char* regex, const char* str);
-GTEST_API_ bool MatchRegexAnywhere(const char* regex, const char* str);
-
-#endif  // GTEST_USES_SIMPLE_RE
-
-// Parses the command line for Google Test flags, without initializing
-// other parts of Google Test.
-GTEST_API_ void ParseGoogleTestFlagsOnly(int* argc, char** argv);
-GTEST_API_ void ParseGoogleTestFlagsOnly(int* argc, wchar_t** argv);
-
-#if GTEST_HAS_DEATH_TEST
-
-// Returns the message describing the last system error, regardless of the
-// platform.
-GTEST_API_ std::string GetLastErrnoDescription();
-
-// Attempts to parse a string into a positive integer pointed to by the
-// number parameter.  Returns true if that is possible.
-// GTEST_HAS_DEATH_TEST implies that we have ::std::string, so we can use
-// it here.
-template <typename Integer>
-bool ParseNaturalNumber(const ::std::string& str, Integer* number) {
-  // Fail fast if the given string does not begin with a digit;
-  // this bypasses strtoXXX's "optional leading whitespace and plus
-  // or minus sign" semantics, which are undesirable here.
-  if (str.empty() || !IsDigit(str[0])) {
-    return false;
-  }
-  errno = 0;
-
-  char* end;
-  // BiggestConvertible is the largest integer type that system-provided
-  // string-to-number conversion routines can return.
-
-# if GTEST_OS_WINDOWS && !defined(__GNUC__)
-
-  // MSVC and C++ Builder define __int64 instead of the standard long long.
-  typedef unsigned __int64 BiggestConvertible;
-  const BiggestConvertible parsed = _strtoui64(str.c_str(), &end, 10);
-
-# else
-
-  typedef unsigned long long BiggestConvertible;  // NOLINT
-  const BiggestConvertible parsed = strtoull(str.c_str(), &end, 10);
-
-# endif  // GTEST_OS_WINDOWS && !defined(__GNUC__)
-
-  const bool parse_success = *end == '\0' && errno == 0;
-
-  GTEST_CHECK_(sizeof(Integer) <= sizeof(parsed));
-
-  const Integer result = static_cast<Integer>(parsed);
-  if (parse_success && static_cast<BiggestConvertible>(result) == parsed) {
-    *number = result;
-    return true;
-  }
-  return false;
-}
-#endif  // GTEST_HAS_DEATH_TEST
-
-// TestResult contains some private methods that should be hidden from
-// Google Test user but are required for testing. This class allow our tests
-// to access them.
-//
-// This class is supplied only for the purpose of testing Google Test's own
-// constructs. Do not use it in user tests, either directly or indirectly.
-class TestResultAccessor {
- public:
-  static void RecordProperty(TestResult* test_result,
-                             const std::string& xml_element,
-                             const TestProperty& property) {
-    test_result->RecordProperty(xml_element, property);
-  }
-
-  static void ClearTestPartResults(TestResult* test_result) {
-    test_result->ClearTestPartResults();
-  }
-
-  static const std::vector<testing::TestPartResult>& test_part_results(
-      const TestResult& test_result) {
-    return test_result.test_part_results();
-  }
-};
-
-#if GTEST_CAN_STREAM_RESULTS_
-
-// Streams test results to the given port on the given host machine.
-class StreamingListener : public EmptyTestEventListener {
- public:
-  // Abstract base class for writing strings to a socket.
-  class AbstractSocketWriter {
-   public:
-    virtual ~AbstractSocketWriter() {}
-
-    // Sends a string to the socket.
-    virtual void Send(const std::string& message) = 0;
-
-    // Closes the socket.
-    virtual void CloseConnection() {}
-
-    // Sends a string and a newline to the socket.
-    void SendLn(const std::string& message) { Send(message + "\n"); }
-  };
-
-  // Concrete class for actually writing strings to a socket.
-  class SocketWriter : public AbstractSocketWriter {
-   public:
-    SocketWriter(const std::string& host, const std::string& port)
-        : sockfd_(-1), host_name_(host), port_num_(port) {
-      MakeConnection();
-    }
-
-    ~SocketWriter() override {
-      if (sockfd_ != -1)
-        CloseConnection();
-    }
-
-    // Sends a string to the socket.
-    void Send(const std::string& message) override {
-      GTEST_CHECK_(sockfd_ != -1)
-          << "Send() can be called only when there is a connection.";
-
-      const auto len = static_cast<size_t>(message.length());
-      if (write(sockfd_, message.c_str(), len) != static_cast<ssize_t>(len)) {
-        GTEST_LOG_(WARNING)
-            << "stream_result_to: failed to stream to "
-            << host_name_ << ":" << port_num_;
-      }
-    }
-
-   private:
-    // Creates a client socket and connects to the server.
-    void MakeConnection();
-
-    // Closes the socket.
-    void CloseConnection() override {
-      GTEST_CHECK_(sockfd_ != -1)
-          << "CloseConnection() can be called only when there is a connection.";
-
-      close(sockfd_);
-      sockfd_ = -1;
-    }
-
-    int sockfd_;  // socket file descriptor
-    const std::string host_name_;
-    const std::string port_num_;
-
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(SocketWriter);
-  };  // class SocketWriter
-
-  // Escapes '=', '&', '%', and '\n' characters in str as "%xx".
-  static std::string UrlEncode(const char* str);
-
-  StreamingListener(const std::string& host, const std::string& port)
-      : socket_writer_(new SocketWriter(host, port)) {
-    Start();
-  }
-
-  explicit StreamingListener(AbstractSocketWriter* socket_writer)
-      : socket_writer_(socket_writer) { Start(); }
-
-  void OnTestProgramStart(const UnitTest& /* unit_test */) override {
-    SendLn("event=TestProgramStart");
-  }
-
-  void OnTestProgramEnd(const UnitTest& unit_test) override {
-    // Note that Google Test current only report elapsed time for each
-    // test iteration, not for the entire test program.
-    SendLn("event=TestProgramEnd&passed=" + FormatBool(unit_test.Passed()));
-
-    // Notify the streaming server to stop.
-    socket_writer_->CloseConnection();
-  }
-
-  void OnTestIterationStart(const UnitTest& /* unit_test */,
-                            int iteration) override {
-    SendLn("event=TestIterationStart&iteration=" +
-           StreamableToString(iteration));
-  }
-
-  void OnTestIterationEnd(const UnitTest& unit_test,
-                          int /* iteration */) override {
-    SendLn("event=TestIterationEnd&passed=" +
-           FormatBool(unit_test.Passed()) + "&elapsed_time=" +
-           StreamableToString(unit_test.elapsed_time()) + "ms");
-  }
-
-  // Note that "event=TestCaseStart" is a wire format and has to remain
-  // "case" for compatibilty
-  void OnTestCaseStart(const TestCase& test_case) override {
-    SendLn(std::string("event=TestCaseStart&name=") + test_case.name());
-  }
-
-  // Note that "event=TestCaseEnd" is a wire format and has to remain
-  // "case" for compatibilty
-  void OnTestCaseEnd(const TestCase& test_case) override {
-    SendLn("event=TestCaseEnd&passed=" + FormatBool(test_case.Passed()) +
-           "&elapsed_time=" + StreamableToString(test_case.elapsed_time()) +
-           "ms");
-  }
-
-  void OnTestStart(const TestInfo& test_info) override {
-    SendLn(std::string("event=TestStart&name=") + test_info.name());
-  }
-
-  void OnTestEnd(const TestInfo& test_info) override {
-    SendLn("event=TestEnd&passed=" +
-           FormatBool((test_info.result())->Passed()) +
-           "&elapsed_time=" +
-           StreamableToString((test_info.result())->elapsed_time()) + "ms");
-  }
-
-  void OnTestPartResult(const TestPartResult& test_part_result) override {
-    const char* file_name = test_part_result.file_name();
-    if (file_name == nullptr) file_name = "";
-    SendLn("event=TestPartResult&file=" + UrlEncode(file_name) +
-           "&line=" + StreamableToString(test_part_result.line_number()) +
-           "&message=" + UrlEncode(test_part_result.message()));
-  }
-
- private:
-  // Sends the given message and a newline to the socket.
-  void SendLn(const std::string& message) { socket_writer_->SendLn(message); }
-
-  // Called at the start of streaming to notify the receiver what
-  // protocol we are using.
-  void Start() { SendLn("gtest_streaming_protocol_version=1.0"); }
-
-  std::string FormatBool(bool value) { return value ? "1" : "0"; }
-
-  const std::unique_ptr<AbstractSocketWriter> socket_writer_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(StreamingListener);
-};  // class StreamingListener
-
-#endif  // GTEST_CAN_STREAM_RESULTS_
-
-}  // namespace internal
-}  // namespace testing
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
-
-#endif  // GTEST_SRC_GTEST_INTERNAL_INL_H_
diff --git a/gnu/llvm/llvm/utils/unittest/googletest/src/gtest-matchers.cc b/gnu/llvm/llvm/utils/unittest/googletest/src/gtest-matchers.cc
deleted file mode 100644
index 7d2fb6851ec..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googletest/src/gtest-matchers.cc
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// The Google C++ Testing and Mocking Framework (Google Test)
-//
-// This file implements just enough of the matcher interface to allow
-// EXPECT_DEATH and friends to accept a matcher argument.
-
-#include "gtest/internal/gtest-internal.h"
-#include "gtest/internal/gtest-port.h"
-#include "gtest/gtest-matchers.h"
-
-#include <string>
-
-namespace testing {
-
-// Constructs a matcher that matches a const std::string& whose value is
-// equal to s.
-Matcher<const std::string&>::Matcher(const std::string& s) { *this = Eq(s); }
-
-// Constructs a matcher that matches a const std::string& whose value is
-// equal to s.
-Matcher<const std::string&>::Matcher(const char* s) {
-  *this = Eq(std::string(s));
-}
-
-// Constructs a matcher that matches a std::string whose value is equal to
-// s.
-Matcher<std::string>::Matcher(const std::string& s) { *this = Eq(s); }
-
-// Constructs a matcher that matches a std::string whose value is equal to
-// s.
-Matcher<std::string>::Matcher(const char* s) { *this = Eq(std::string(s)); }
-
-#if GTEST_HAS_ABSL
-// Constructs a matcher that matches a const absl::string_view& whose value is
-// equal to s.
-Matcher<const absl::string_view&>::Matcher(const std::string& s) {
-  *this = Eq(s);
-}
-
-// Constructs a matcher that matches a const absl::string_view& whose value is
-// equal to s.
-Matcher<const absl::string_view&>::Matcher(const char* s) {
-  *this = Eq(std::string(s));
-}
-
-// Constructs a matcher that matches a const absl::string_view& whose value is
-// equal to s.
-Matcher<const absl::string_view&>::Matcher(absl::string_view s) {
-  *this = Eq(std::string(s));
-}
-
-// Constructs a matcher that matches a absl::string_view whose value is equal to
-// s.
-Matcher<absl::string_view>::Matcher(const std::string& s) { *this = Eq(s); }
-
-// Constructs a matcher that matches a absl::string_view whose value is equal to
-// s.
-Matcher<absl::string_view>::Matcher(const char* s) {
-  *this = Eq(std::string(s));
-}
-
-// Constructs a matcher that matches a absl::string_view whose value is equal to
-// s.
-Matcher<absl::string_view>::Matcher(absl::string_view s) {
-  *this = Eq(std::string(s));
-}
-#endif  // GTEST_HAS_ABSL
-
-}  // namespace testing
diff --git a/gnu/llvm/llvm/utils/unittest/googletest/src/gtest-port.cc b/gnu/llvm/llvm/utils/unittest/googletest/src/gtest-port.cc
deleted file mode 100644
index fc5ba6becc5..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googletest/src/gtest-port.cc
+++ /dev/null
@@ -1,1399 +0,0 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-#include "gtest/internal/gtest-port.h"
-
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fstream>
-#include <memory>
-
-#if GTEST_OS_WINDOWS
-# include <windows.h>
-# include <io.h>
-# include <sys/stat.h>
-# include <map>  // Used in ThreadLocal.
-# ifdef _MSC_VER
-#  include <crtdbg.h>
-# endif  // _MSC_VER
-#else
-# include <unistd.h>
-#endif  // GTEST_OS_WINDOWS
-
-#if GTEST_OS_MAC
-# include <mach/mach_init.h>
-# include <mach/task.h>
-# include <mach/vm_map.h>
-#endif  // GTEST_OS_MAC
-
-#if GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD || \
-    GTEST_OS_NETBSD || GTEST_OS_OPENBSD
-# include <sys/sysctl.h>
-# if GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD
-#  include <sys/user.h>
-# endif
-#endif
-
-#if GTEST_OS_QNX
-# include <devctl.h>
-# include <fcntl.h>
-# include <sys/procfs.h>
-#endif  // GTEST_OS_QNX
-
-#if GTEST_OS_AIX
-# include <procinfo.h>
-# include <sys/types.h>
-#endif  // GTEST_OS_AIX
-
-#if GTEST_OS_FUCHSIA
-# include <zircon/process.h>
-# include <zircon/syscalls.h>
-#endif  // GTEST_OS_FUCHSIA
-
-#include "gtest/gtest-spi.h"
-#include "gtest/gtest-message.h"
-#include "gtest/internal/gtest-internal.h"
-#include "gtest/internal/gtest-string.h"
-#include "src/gtest-internal-inl.h"
-
-namespace testing {
-namespace internal {
-
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-// MSVC and C++Builder do not provide a definition of STDERR_FILENO.
-const int kStdOutFileno = 1;
-const int kStdErrFileno = 2;
-#else
-const int kStdOutFileno = STDOUT_FILENO;
-const int kStdErrFileno = STDERR_FILENO;
-#endif  // _MSC_VER
-
-#if GTEST_OS_LINUX
-
-namespace {
-template <typename T>
-T ReadProcFileField(const std::string& filename, int field) {
-  std::string dummy;
-  std::ifstream file(filename.c_str());
-  while (field-- > 0) {
-    file >> dummy;
-  }
-  T output = 0;
-  file >> output;
-  return output;
-}
-}  // namespace
-
-// Returns the number of active threads, or 0 when there is an error.
-size_t GetThreadCount() {
-  const std::string filename =
-      (Message() << "/proc/" << getpid() << "/stat").GetString();
-  return ReadProcFileField<size_t>(filename, 19);
-}
-
-#elif GTEST_OS_MAC
-
-size_t GetThreadCount() {
-  const task_t task = mach_task_self();
-  mach_msg_type_number_t thread_count;
-  thread_act_array_t thread_list;
-  const kern_return_t status = task_threads(task, &thread_list, &thread_count);
-  if (status == KERN_SUCCESS) {
-    // task_threads allocates resources in thread_list and we need to free them
-    // to avoid leaks.
-    vm_deallocate(task,
-                  reinterpret_cast<vm_address_t>(thread_list),
-                  sizeof(thread_t) * thread_count);
-    return static_cast<size_t>(thread_count);
-  } else {
-    return 0;
-  }
-}
-
-#elif GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD || \
-      GTEST_OS_NETBSD
-
-#if GTEST_OS_NETBSD
-#undef KERN_PROC
-#define KERN_PROC KERN_PROC2
-#define kinfo_proc kinfo_proc2
-#endif
-
-#if GTEST_OS_DRAGONFLY
-#define KP_NLWP(kp) (kp.kp_nthreads)
-#elif GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD
-#define KP_NLWP(kp) (kp.ki_numthreads)
-#elif GTEST_OS_NETBSD
-#define KP_NLWP(kp) (kp.p_nlwps)
-#endif
-
-// Returns the number of threads running in the process, or 0 to indicate that
-// we cannot detect it.
-size_t GetThreadCount() {
-  int mib[] = {
-    CTL_KERN,
-    KERN_PROC,
-    KERN_PROC_PID,
-    getpid(),
-#if GTEST_OS_NETBSD
-    sizeof(struct kinfo_proc),
-    1,
-#endif
-  };
-  u_int miblen = sizeof(mib) / sizeof(mib[0]);
-  struct kinfo_proc info;
-  size_t size = sizeof(info);
-  if (sysctl(mib, miblen, &info, &size, NULL, 0)) {
-    return 0;
-  }
-  return static_cast<size_t>(KP_NLWP(info));
-}
-#elif GTEST_OS_OPENBSD
-
-// Returns the number of threads running in the process, or 0 to indicate that
-// we cannot detect it.
-size_t GetThreadCount() {
-  int mib[] = {
-    CTL_KERN,
-    KERN_PROC,
-    KERN_PROC_PID | KERN_PROC_SHOW_THREADS,
-    getpid(),
-    sizeof(struct kinfo_proc),
-    0,
-  };
-  u_int miblen = sizeof(mib) / sizeof(mib[0]);
-
-  // get number of structs
-  size_t size;
-  if (sysctl(mib, miblen, NULL, &size, NULL, 0)) {
-    return 0;
-  }
-  mib[5] = size / mib[4];
-
-  // populate array of structs
-  struct kinfo_proc info[mib[5]];
-  if (sysctl(mib, miblen, &info, &size, NULL, 0)) {
-    return 0;
-  }
-
-  // exclude empty members
-  int nthreads = 0;
-  for (int i = 0; i < size / mib[4]; i++) {
-    if (info[i].p_tid != -1)
-      nthreads++;
-  }
-  return nthreads;
-}
-
-#elif GTEST_OS_QNX
-
-// Returns the number of threads running in the process, or 0 to indicate that
-// we cannot detect it.
-size_t GetThreadCount() {
-  const int fd = open("/proc/self/as", O_RDONLY);
-  if (fd < 0) {
-    return 0;
-  }
-  procfs_info process_info;
-  const int status =
-      devctl(fd, DCMD_PROC_INFO, &process_info, sizeof(process_info), nullptr);
-  close(fd);
-  if (status == EOK) {
-    return static_cast<size_t>(process_info.num_threads);
-  } else {
-    return 0;
-  }
-}
-
-#elif GTEST_OS_AIX
-
-size_t GetThreadCount() {
-  struct procentry64 entry;
-  pid_t pid = getpid();
-  int status = getprocs64(&entry, sizeof(entry), nullptr, 0, &pid, 1);
-  if (status == 1) {
-    return entry.pi_thcount;
-  } else {
-    return 0;
-  }
-}
-
-#elif GTEST_OS_FUCHSIA
-
-size_t GetThreadCount() {
-  int dummy_buffer;
-  size_t avail;
-  zx_status_t status = zx_object_get_info(
-      zx_process_self(),
-      ZX_INFO_PROCESS_THREADS,
-      &dummy_buffer,
-      0,
-      nullptr,
-      &avail);
-  if (status == ZX_OK) {
-    return avail;
-  } else {
-    return 0;
-  }
-}
-
-#else
-
-size_t GetThreadCount() {
-  // There's no portable way to detect the number of threads, so we just
-  // return 0 to indicate that we cannot detect it.
-  return 0;
-}
-
-#endif  // GTEST_OS_LINUX
-
-#if GTEST_IS_THREADSAFE && GTEST_OS_WINDOWS
-
-void SleepMilliseconds(int n) {
-  ::Sleep(static_cast<DWORD>(n));
-}
-
-AutoHandle::AutoHandle()
-    : handle_(INVALID_HANDLE_VALUE) {}
-
-AutoHandle::AutoHandle(Handle handle)
-    : handle_(handle) {}
-
-AutoHandle::~AutoHandle() {
-  Reset();
-}
-
-AutoHandle::Handle AutoHandle::Get() const {
-  return handle_;
-}
-
-void AutoHandle::Reset() {
-  Reset(INVALID_HANDLE_VALUE);
-}
-
-void AutoHandle::Reset(HANDLE handle) {
-  // Resetting with the same handle we already own is invalid.
-  if (handle_ != handle) {
-    if (IsCloseable()) {
-      ::CloseHandle(handle_);
-    }
-    handle_ = handle;
-  } else {
-    GTEST_CHECK_(!IsCloseable())
-        << "Resetting a valid handle to itself is likely a programmer error "
-            "and thus not allowed.";
-  }
-}
-
-bool AutoHandle::IsCloseable() const {
-  // Different Windows APIs may use either of these values to represent an
-  // invalid handle.
-  return handle_ != nullptr && handle_ != INVALID_HANDLE_VALUE;
-}
-
-Notification::Notification()
-    : event_(::CreateEvent(nullptr,     // Default security attributes.
-                           TRUE,        // Do not reset automatically.
-                           FALSE,       // Initially unset.
-                           nullptr)) {  // Anonymous event.
-  GTEST_CHECK_(event_.Get() != nullptr);
-}
-
-void Notification::Notify() {
-  GTEST_CHECK_(::SetEvent(event_.Get()) != FALSE);
-}
-
-void Notification::WaitForNotification() {
-  GTEST_CHECK_(
-      ::WaitForSingleObject(event_.Get(), INFINITE) == WAIT_OBJECT_0);
-}
-
-Mutex::Mutex()
-    : owner_thread_id_(0),
-      type_(kDynamic),
-      critical_section_init_phase_(0),
-      critical_section_(new CRITICAL_SECTION) {
-  ::InitializeCriticalSection(critical_section_);
-}
-
-Mutex::~Mutex() {
-  // Static mutexes are leaked intentionally. It is not thread-safe to try
-  // to clean them up.
-  if (type_ == kDynamic) {
-    ::DeleteCriticalSection(critical_section_);
-    delete critical_section_;
-    critical_section_ = nullptr;
-  }
-}
-
-void Mutex::Lock() {
-  ThreadSafeLazyInit();
-  ::EnterCriticalSection(critical_section_);
-  owner_thread_id_ = ::GetCurrentThreadId();
-}
-
-void Mutex::Unlock() {
-  ThreadSafeLazyInit();
-  // We don't protect writing to owner_thread_id_ here, as it's the
-  // caller's responsibility to ensure that the current thread holds the
-  // mutex when this is called.
-  owner_thread_id_ = 0;
-  ::LeaveCriticalSection(critical_section_);
-}
-
-// Does nothing if the current thread holds the mutex. Otherwise, crashes
-// with high probability.
-void Mutex::AssertHeld() {
-  ThreadSafeLazyInit();
-  GTEST_CHECK_(owner_thread_id_ == ::GetCurrentThreadId())
-      << "The current thread is not holding the mutex @" << this;
-}
-
-namespace {
-
-#ifdef _MSC_VER
-// Use the RAII idiom to flag mem allocs that are intentionally never
-// deallocated. The motivation is to silence the false positive mem leaks
-// that are reported by the debug version of MS's CRT which can only detect
-// if an alloc is missing a matching deallocation.
-// Example:
-//    MemoryIsNotDeallocated memory_is_not_deallocated;
-//    critical_section_ = new CRITICAL_SECTION;
-//
-class MemoryIsNotDeallocated
-{
- public:
-  MemoryIsNotDeallocated() : old_crtdbg_flag_(0) {
-    old_crtdbg_flag_ = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
-    // Set heap allocation block type to _IGNORE_BLOCK so that MS debug CRT
-    // doesn't report mem leak if there's no matching deallocation.
-    _CrtSetDbgFlag(old_crtdbg_flag_ & ~_CRTDBG_ALLOC_MEM_DF);
-  }
-
-  ~MemoryIsNotDeallocated() {
-    // Restore the original _CRTDBG_ALLOC_MEM_DF flag
-    _CrtSetDbgFlag(old_crtdbg_flag_);
-  }
-
- private:
-  int old_crtdbg_flag_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(MemoryIsNotDeallocated);
-};
-#endif  // _MSC_VER
-
-}  // namespace
-
-// Initializes owner_thread_id_ and critical_section_ in static mutexes.
-void Mutex::ThreadSafeLazyInit() {
-  // Dynamic mutexes are initialized in the constructor.
-  if (type_ == kStatic) {
-    switch (
-        ::InterlockedCompareExchange(&critical_section_init_phase_, 1L, 0L)) {
-      case 0:
-        // If critical_section_init_phase_ was 0 before the exchange, we
-        // are the first to test it and need to perform the initialization.
-        owner_thread_id_ = 0;
-        {
-          // Use RAII to flag that following mem alloc is never deallocated.
-#ifdef _MSC_VER
-          MemoryIsNotDeallocated memory_is_not_deallocated;
-#endif  // _MSC_VER
-          critical_section_ = new CRITICAL_SECTION;
-        }
-        ::InitializeCriticalSection(critical_section_);
-        // Updates the critical_section_init_phase_ to 2 to signal
-        // initialization complete.
-        GTEST_CHECK_(::InterlockedCompareExchange(
-                          &critical_section_init_phase_, 2L, 1L) ==
-                      1L);
-        break;
-      case 1:
-        // Somebody else is already initializing the mutex; spin until they
-        // are done.
-        while (::InterlockedCompareExchange(&critical_section_init_phase_,
-                                            2L,
-                                            2L) != 2L) {
-          // Possibly yields the rest of the thread's time slice to other
-          // threads.
-          ::Sleep(0);
-        }
-        break;
-
-      case 2:
-        break;  // The mutex is already initialized and ready for use.
-
-      default:
-        GTEST_CHECK_(false)
-            << "Unexpected value of critical_section_init_phase_ "
-            << "while initializing a static mutex.";
-    }
-  }
-}
-
-namespace {
-
-class ThreadWithParamSupport : public ThreadWithParamBase {
- public:
-  static HANDLE CreateThread(Runnable* runnable,
-                             Notification* thread_can_start) {
-    ThreadMainParam* param = new ThreadMainParam(runnable, thread_can_start);
-    DWORD thread_id;
-    HANDLE thread_handle = ::CreateThread(
-        nullptr,  // Default security.
-        0,        // Default stack size.
-        &ThreadWithParamSupport::ThreadMain,
-        param,        // Parameter to ThreadMainStatic
-        0x0,          // Default creation flags.
-        &thread_id);  // Need a valid pointer for the call to work under Win98.
-    GTEST_CHECK_(thread_handle != nullptr)
-        << "CreateThread failed with error " << ::GetLastError() << ".";
-    if (thread_handle == nullptr) {
-      delete param;
-    }
-    return thread_handle;
-  }
-
- private:
-  struct ThreadMainParam {
-    ThreadMainParam(Runnable* runnable, Notification* thread_can_start)
-        : runnable_(runnable),
-          thread_can_start_(thread_can_start) {
-    }
-    std::unique_ptr<Runnable> runnable_;
-    // Does not own.
-    Notification* thread_can_start_;
-  };
-
-  static DWORD WINAPI ThreadMain(void* ptr) {
-    // Transfers ownership.
-    std::unique_ptr<ThreadMainParam> param(static_cast<ThreadMainParam*>(ptr));
-    if (param->thread_can_start_ != nullptr)
-      param->thread_can_start_->WaitForNotification();
-    param->runnable_->Run();
-    return 0;
-  }
-
-  // Prohibit instantiation.
-  ThreadWithParamSupport();
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadWithParamSupport);
-};
-
-}  // namespace
-
-ThreadWithParamBase::ThreadWithParamBase(Runnable *runnable,
-                                         Notification* thread_can_start)
-      : thread_(ThreadWithParamSupport::CreateThread(runnable,
-                                                     thread_can_start)) {
-}
-
-ThreadWithParamBase::~ThreadWithParamBase() {
-  Join();
-}
-
-void ThreadWithParamBase::Join() {
-  GTEST_CHECK_(::WaitForSingleObject(thread_.Get(), INFINITE) == WAIT_OBJECT_0)
-      << "Failed to join the thread with error " << ::GetLastError() << ".";
-}
-
-// Maps a thread to a set of ThreadIdToThreadLocals that have values
-// instantiated on that thread and notifies them when the thread exits.  A
-// ThreadLocal instance is expected to persist until all threads it has
-// values on have terminated.
-class ThreadLocalRegistryImpl {
- public:
-  // Registers thread_local_instance as having value on the current thread.
-  // Returns a value that can be used to identify the thread from other threads.
-  static ThreadLocalValueHolderBase* GetValueOnCurrentThread(
-      const ThreadLocalBase* thread_local_instance) {
-    DWORD current_thread = ::GetCurrentThreadId();
-    MutexLock lock(&mutex_);
-    ThreadIdToThreadLocals* const thread_to_thread_locals =
-        GetThreadLocalsMapLocked();
-    ThreadIdToThreadLocals::iterator thread_local_pos =
-        thread_to_thread_locals->find(current_thread);
-    if (thread_local_pos == thread_to_thread_locals->end()) {
-      thread_local_pos = thread_to_thread_locals->insert(
-          std::make_pair(current_thread, ThreadLocalValues())).first;
-      StartWatcherThreadFor(current_thread);
-    }
-    ThreadLocalValues& thread_local_values = thread_local_pos->second;
-    ThreadLocalValues::iterator value_pos =
-        thread_local_values.find(thread_local_instance);
-    if (value_pos == thread_local_values.end()) {
-      value_pos =
-          thread_local_values
-              .insert(std::make_pair(
-                  thread_local_instance,
-                  std::shared_ptr<ThreadLocalValueHolderBase>(
-                      thread_local_instance->NewValueForCurrentThread())))
-              .first;
-    }
-    return value_pos->second.get();
-  }
-
-  static void OnThreadLocalDestroyed(
-      const ThreadLocalBase* thread_local_instance) {
-    std::vector<std::shared_ptr<ThreadLocalValueHolderBase> > value_holders;
-    // Clean up the ThreadLocalValues data structure while holding the lock, but
-    // defer the destruction of the ThreadLocalValueHolderBases.
-    {
-      MutexLock lock(&mutex_);
-      ThreadIdToThreadLocals* const thread_to_thread_locals =
-          GetThreadLocalsMapLocked();
-      for (ThreadIdToThreadLocals::iterator it =
-          thread_to_thread_locals->begin();
-          it != thread_to_thread_locals->end();
-          ++it) {
-        ThreadLocalValues& thread_local_values = it->second;
-        ThreadLocalValues::iterator value_pos =
-            thread_local_values.find(thread_local_instance);
-        if (value_pos != thread_local_values.end()) {
-          value_holders.push_back(value_pos->second);
-          thread_local_values.erase(value_pos);
-          // This 'if' can only be successful at most once, so theoretically we
-          // could break out of the loop here, but we don't bother doing so.
-        }
-      }
-    }
-    // Outside the lock, let the destructor for 'value_holders' deallocate the
-    // ThreadLocalValueHolderBases.
-  }
-
-  static void OnThreadExit(DWORD thread_id) {
-    GTEST_CHECK_(thread_id != 0) << ::GetLastError();
-    std::vector<std::shared_ptr<ThreadLocalValueHolderBase> > value_holders;
-    // Clean up the ThreadIdToThreadLocals data structure while holding the
-    // lock, but defer the destruction of the ThreadLocalValueHolderBases.
-    {
-      MutexLock lock(&mutex_);
-      ThreadIdToThreadLocals* const thread_to_thread_locals =
-          GetThreadLocalsMapLocked();
-      ThreadIdToThreadLocals::iterator thread_local_pos =
-          thread_to_thread_locals->find(thread_id);
-      if (thread_local_pos != thread_to_thread_locals->end()) {
-        ThreadLocalValues& thread_local_values = thread_local_pos->second;
-        for (ThreadLocalValues::iterator value_pos =
-            thread_local_values.begin();
-            value_pos != thread_local_values.end();
-            ++value_pos) {
-          value_holders.push_back(value_pos->second);
-        }
-        thread_to_thread_locals->erase(thread_local_pos);
-      }
-    }
-    // Outside the lock, let the destructor for 'value_holders' deallocate the
-    // ThreadLocalValueHolderBases.
-  }
-
- private:
-  // In a particular thread, maps a ThreadLocal object to its value.
-  typedef std::map<const ThreadLocalBase*,
-                   std::shared_ptr<ThreadLocalValueHolderBase> >
-      ThreadLocalValues;
-  // Stores all ThreadIdToThreadLocals having values in a thread, indexed by
-  // thread's ID.
-  typedef std::map<DWORD, ThreadLocalValues> ThreadIdToThreadLocals;
-
-  // Holds the thread id and thread handle that we pass from
-  // StartWatcherThreadFor to WatcherThreadFunc.
-  typedef std::pair<DWORD, HANDLE> ThreadIdAndHandle;
-
-  static void StartWatcherThreadFor(DWORD thread_id) {
-    // The returned handle will be kept in thread_map and closed by
-    // watcher_thread in WatcherThreadFunc.
-    HANDLE thread = ::OpenThread(SYNCHRONIZE | THREAD_QUERY_INFORMATION,
-                                 FALSE,
-                                 thread_id);
-    GTEST_CHECK_(thread != nullptr);
-    // We need to pass a valid thread ID pointer into CreateThread for it
-    // to work correctly under Win98.
-    DWORD watcher_thread_id;
-    HANDLE watcher_thread = ::CreateThread(
-        nullptr,  // Default security.
-        0,        // Default stack size
-        &ThreadLocalRegistryImpl::WatcherThreadFunc,
-        reinterpret_cast<LPVOID>(new ThreadIdAndHandle(thread_id, thread)),
-        CREATE_SUSPENDED, &watcher_thread_id);
-    GTEST_CHECK_(watcher_thread != nullptr);
-    // Give the watcher thread the same priority as ours to avoid being
-    // blocked by it.
-    ::SetThreadPriority(watcher_thread,
-                        ::GetThreadPriority(::GetCurrentThread()));
-    ::ResumeThread(watcher_thread);
-    ::CloseHandle(watcher_thread);
-  }
-
-  // Monitors exit from a given thread and notifies those
-  // ThreadIdToThreadLocals about thread termination.
-  static DWORD WINAPI WatcherThreadFunc(LPVOID param) {
-    const ThreadIdAndHandle* tah =
-        reinterpret_cast<const ThreadIdAndHandle*>(param);
-    GTEST_CHECK_(
-        ::WaitForSingleObject(tah->second, INFINITE) == WAIT_OBJECT_0);
-    OnThreadExit(tah->first);
-    ::CloseHandle(tah->second);
-    delete tah;
-    return 0;
-  }
-
-  // Returns map of thread local instances.
-  static ThreadIdToThreadLocals* GetThreadLocalsMapLocked() {
-    mutex_.AssertHeld();
-#ifdef _MSC_VER
-    MemoryIsNotDeallocated memory_is_not_deallocated;
-#endif  // _MSC_VER
-    static ThreadIdToThreadLocals* map = new ThreadIdToThreadLocals();
-    return map;
-  }
-
-  // Protects access to GetThreadLocalsMapLocked() and its return value.
-  static Mutex mutex_;
-  // Protects access to GetThreadMapLocked() and its return value.
-  static Mutex thread_map_mutex_;
-};
-
-Mutex ThreadLocalRegistryImpl::mutex_(Mutex::kStaticMutex);
-Mutex ThreadLocalRegistryImpl::thread_map_mutex_(Mutex::kStaticMutex);
-
-ThreadLocalValueHolderBase* ThreadLocalRegistry::GetValueOnCurrentThread(
-      const ThreadLocalBase* thread_local_instance) {
-  return ThreadLocalRegistryImpl::GetValueOnCurrentThread(
-      thread_local_instance);
-}
-
-void ThreadLocalRegistry::OnThreadLocalDestroyed(
-      const ThreadLocalBase* thread_local_instance) {
-  ThreadLocalRegistryImpl::OnThreadLocalDestroyed(thread_local_instance);
-}
-
-#endif  // GTEST_IS_THREADSAFE && GTEST_OS_WINDOWS
-
-#if GTEST_USES_POSIX_RE
-
-// Implements RE.  Currently only needed for death tests.
-
-RE::~RE() {
-  if (is_valid_) {
-    // regfree'ing an invalid regex might crash because the content
-    // of the regex is undefined. Since the regex's are essentially
-    // the same, one cannot be valid (or invalid) without the other
-    // being so too.
-    regfree(&partial_regex_);
-    regfree(&full_regex_);
-  }
-  free(const_cast<char*>(pattern_));
-}
-
-// Returns true if and only if regular expression re matches the entire str.
-bool RE::FullMatch(const char* str, const RE& re) {
-  if (!re.is_valid_) return false;
-
-  regmatch_t match;
-  return regexec(&re.full_regex_, str, 1, &match, 0) == 0;
-}
-
-// Returns true if and only if regular expression re matches a substring of
-// str (including str itself).
-bool RE::PartialMatch(const char* str, const RE& re) {
-  if (!re.is_valid_) return false;
-
-  regmatch_t match;
-  return regexec(&re.partial_regex_, str, 1, &match, 0) == 0;
-}
-
-// Initializes an RE from its string representation.
-void RE::Init(const char* regex) {
-  pattern_ = posix::StrDup(regex);
-
-  // Reserves enough bytes to hold the regular expression used for a
-  // full match.
-  const size_t full_regex_len = strlen(regex) + 10;
-  char* const full_pattern = new char[full_regex_len];
-
-  snprintf(full_pattern, full_regex_len, "^(%s)$", regex);
-  is_valid_ = regcomp(&full_regex_, full_pattern, REG_EXTENDED) == 0;
-  // We want to call regcomp(&partial_regex_, ...) even if the
-  // previous expression returns false.  Otherwise partial_regex_ may
-  // not be properly initialized can may cause trouble when it's
-  // freed.
-  //
-  // Some implementation of POSIX regex (e.g. on at least some
-  // versions of Cygwin) doesn't accept the empty string as a valid
-  // regex.  We change it to an equivalent form "()" to be safe.
-  if (is_valid_) {
-    const char* const partial_regex = (*regex == '\0') ? "()" : regex;
-    is_valid_ = regcomp(&partial_regex_, partial_regex, REG_EXTENDED) == 0;
-  }
-  EXPECT_TRUE(is_valid_)
-      << "Regular expression \"" << regex
-      << "\" is not a valid POSIX Extended regular expression.";
-
-  delete[] full_pattern;
-}
-
-#elif GTEST_USES_SIMPLE_RE
-
-// Returns true if and only if ch appears anywhere in str (excluding the
-// terminating '\0' character).
-bool IsInSet(char ch, const char* str) {
-  return ch != '\0' && strchr(str, ch) != nullptr;
-}
-
-// Returns true if and only if ch belongs to the given classification.
-// Unlike similar functions in <ctype.h>, these aren't affected by the
-// current locale.
-bool IsAsciiDigit(char ch) { return '0' <= ch && ch <= '9'; }
-bool IsAsciiPunct(char ch) {
-  return IsInSet(ch, "^-!\"#$%&'()*+,./:;<=>?@[\\]_`{|}~");
-}
-bool IsRepeat(char ch) { return IsInSet(ch, "?*+"); }
-bool IsAsciiWhiteSpace(char ch) { return IsInSet(ch, " \f\n\r\t\v"); }
-bool IsAsciiWordChar(char ch) {
-  return ('a' <= ch && ch <= 'z') || ('A' <= ch && ch <= 'Z') ||
-      ('0' <= ch && ch <= '9') || ch == '_';
-}
-
-// Returns true if and only if "\\c" is a supported escape sequence.
-bool IsValidEscape(char c) {
-  return (IsAsciiPunct(c) || IsInSet(c, "dDfnrsStvwW"));
-}
-
-// Returns true if and only if the given atom (specified by escaped and
-// pattern) matches ch.  The result is undefined if the atom is invalid.
-bool AtomMatchesChar(bool escaped, char pattern_char, char ch) {
-  if (escaped) {  // "\\p" where p is pattern_char.
-    switch (pattern_char) {
-      case 'd': return IsAsciiDigit(ch);
-      case 'D': return !IsAsciiDigit(ch);
-      case 'f': return ch == '\f';
-      case 'n': return ch == '\n';
-      case 'r': return ch == '\r';
-      case 's': return IsAsciiWhiteSpace(ch);
-      case 'S': return !IsAsciiWhiteSpace(ch);
-      case 't': return ch == '\t';
-      case 'v': return ch == '\v';
-      case 'w': return IsAsciiWordChar(ch);
-      case 'W': return !IsAsciiWordChar(ch);
-    }
-    return IsAsciiPunct(pattern_char) && pattern_char == ch;
-  }
-
-  return (pattern_char == '.' && ch != '\n') || pattern_char == ch;
-}
-
-// Helper function used by ValidateRegex() to format error messages.
-static std::string FormatRegexSyntaxError(const char* regex, int index) {
-  return (Message() << "Syntax error at index " << index
-          << " in simple regular expression \"" << regex << "\": ").GetString();
-}
-
-// Generates non-fatal failures and returns false if regex is invalid;
-// otherwise returns true.
-bool ValidateRegex(const char* regex) {
-  if (regex == nullptr) {
-    ADD_FAILURE() << "NULL is not a valid simple regular expression.";
-    return false;
-  }
-
-  bool is_valid = true;
-
-  // True if and only if ?, *, or + can follow the previous atom.
-  bool prev_repeatable = false;
-  for (int i = 0; regex[i]; i++) {
-    if (regex[i] == '\\') {  // An escape sequence
-      i++;
-      if (regex[i] == '\0') {
-        ADD_FAILURE() << FormatRegexSyntaxError(regex, i - 1)
-                      << "'\\' cannot appear at the end.";
-        return false;
-      }
-
-      if (!IsValidEscape(regex[i])) {
-        ADD_FAILURE() << FormatRegexSyntaxError(regex, i - 1)
-                      << "invalid escape sequence \"\\" << regex[i] << "\".";
-        is_valid = false;
-      }
-      prev_repeatable = true;
-    } else {  // Not an escape sequence.
-      const char ch = regex[i];
-
-      if (ch == '^' && i > 0) {
-        ADD_FAILURE() << FormatRegexSyntaxError(regex, i)
-                      << "'^' can only appear at the beginning.";
-        is_valid = false;
-      } else if (ch == '$' && regex[i + 1] != '\0') {
-        ADD_FAILURE() << FormatRegexSyntaxError(regex, i)
-                      << "'$' can only appear at the end.";
-        is_valid = false;
-      } else if (IsInSet(ch, "()[]{}|")) {
-        ADD_FAILURE() << FormatRegexSyntaxError(regex, i)
-                      << "'" << ch << "' is unsupported.";
-        is_valid = false;
-      } else if (IsRepeat(ch) && !prev_repeatable) {
-        ADD_FAILURE() << FormatRegexSyntaxError(regex, i)
-                      << "'" << ch << "' can only follow a repeatable token.";
-        is_valid = false;
-      }
-
-      prev_repeatable = !IsInSet(ch, "^$?*+");
-    }
-  }
-
-  return is_valid;
-}
-
-// Matches a repeated regex atom followed by a valid simple regular
-// expression.  The regex atom is defined as c if escaped is false,
-// or \c otherwise.  repeat is the repetition meta character (?, *,
-// or +).  The behavior is undefined if str contains too many
-// characters to be indexable by size_t, in which case the test will
-// probably time out anyway.  We are fine with this limitation as
-// std::string has it too.
-bool MatchRepetitionAndRegexAtHead(
-    bool escaped, char c, char repeat, const char* regex,
-    const char* str) {
-  const size_t min_count = (repeat == '+') ? 1 : 0;
-  const size_t max_count = (repeat == '?') ? 1 :
-      static_cast<size_t>(-1) - 1;
-  // We cannot call numeric_limits::max() as it conflicts with the
-  // max() macro on Windows.
-
-  for (size_t i = 0; i <= max_count; ++i) {
-    // We know that the atom matches each of the first i characters in str.
-    if (i >= min_count && MatchRegexAtHead(regex, str + i)) {
-      // We have enough matches at the head, and the tail matches too.
-      // Since we only care about *whether* the pattern matches str
-      // (as opposed to *how* it matches), there is no need to find a
-      // greedy match.
-      return true;
-    }
-    if (str[i] == '\0' || !AtomMatchesChar(escaped, c, str[i]))
-      return false;
-  }
-  return false;
-}
-
-// Returns true if and only if regex matches a prefix of str. regex must
-// be a valid simple regular expression and not start with "^", or the
-// result is undefined.
-bool MatchRegexAtHead(const char* regex, const char* str) {
-  if (*regex == '\0')  // An empty regex matches a prefix of anything.
-    return true;
-
-  // "$" only matches the end of a string.  Note that regex being
-  // valid guarantees that there's nothing after "$" in it.
-  if (*regex == '$')
-    return *str == '\0';
-
-  // Is the first thing in regex an escape sequence?
-  const bool escaped = *regex == '\\';
-  if (escaped)
-    ++regex;
-  if (IsRepeat(regex[1])) {
-    // MatchRepetitionAndRegexAtHead() calls MatchRegexAtHead(), so
-    // here's an indirect recursion.  It terminates as the regex gets
-    // shorter in each recursion.
-    return MatchRepetitionAndRegexAtHead(
-        escaped, regex[0], regex[1], regex + 2, str);
-  } else {
-    // regex isn't empty, isn't "$", and doesn't start with a
-    // repetition.  We match the first atom of regex with the first
-    // character of str and recurse.
-    return (*str != '\0') && AtomMatchesChar(escaped, *regex, *str) &&
-        MatchRegexAtHead(regex + 1, str + 1);
-  }
-}
-
-// Returns true if and only if regex matches any substring of str.  regex must
-// be a valid simple regular expression, or the result is undefined.
-//
-// The algorithm is recursive, but the recursion depth doesn't exceed
-// the regex length, so we won't need to worry about running out of
-// stack space normally.  In rare cases the time complexity can be
-// exponential with respect to the regex length + the string length,
-// but usually it's must faster (often close to linear).
-bool MatchRegexAnywhere(const char* regex, const char* str) {
-  if (regex == nullptr || str == nullptr) return false;
-
-  if (*regex == '^')
-    return MatchRegexAtHead(regex + 1, str);
-
-  // A successful match can be anywhere in str.
-  do {
-    if (MatchRegexAtHead(regex, str))
-      return true;
-  } while (*str++ != '\0');
-  return false;
-}
-
-// Implements the RE class.
-
-RE::~RE() {
-  free(const_cast<char*>(pattern_));
-  free(const_cast<char*>(full_pattern_));
-}
-
-// Returns true if and only if regular expression re matches the entire str.
-bool RE::FullMatch(const char* str, const RE& re) {
-  return re.is_valid_ && MatchRegexAnywhere(re.full_pattern_, str);
-}
-
-// Returns true if and only if regular expression re matches a substring of
-// str (including str itself).
-bool RE::PartialMatch(const char* str, const RE& re) {
-  return re.is_valid_ && MatchRegexAnywhere(re.pattern_, str);
-}
-
-// Initializes an RE from its string representation.
-void RE::Init(const char* regex) {
-  pattern_ = full_pattern_ = nullptr;
-  if (regex != nullptr) {
-    pattern_ = posix::StrDup(regex);
-  }
-
-  is_valid_ = ValidateRegex(regex);
-  if (!is_valid_) {
-    // No need to calculate the full pattern when the regex is invalid.
-    return;
-  }
-
-  const size_t len = strlen(regex);
-  // Reserves enough bytes to hold the regular expression used for a
-  // full match: we need space to prepend a '^', append a '$', and
-  // terminate the string with '\0'.
-  char* buffer = static_cast<char*>(malloc(len + 3));
-  full_pattern_ = buffer;
-
-  if (*regex != '^')
-    *buffer++ = '^';  // Makes sure full_pattern_ starts with '^'.
-
-  // We don't use snprintf or strncpy, as they trigger a warning when
-  // compiled with VC++ 8.0.
-  memcpy(buffer, regex, len);
-  buffer += len;
-
-  if (len == 0 || regex[len - 1] != '$')
-    *buffer++ = '$';  // Makes sure full_pattern_ ends with '$'.
-
-  *buffer = '\0';
-}
-
-#endif  // GTEST_USES_POSIX_RE
-
-const char kUnknownFile[] = "unknown file";
-
-// Formats a source file path and a line number as they would appear
-// in an error message from the compiler used to compile this code.
-GTEST_API_ ::std::string FormatFileLocation(const char* file, int line) {
-  const std::string file_name(file == nullptr ? kUnknownFile : file);
-
-  if (line < 0) {
-    return file_name + ":";
-  }
-#ifdef _MSC_VER
-  return file_name + "(" + StreamableToString(line) + "):";
-#else
-  return file_name + ":" + StreamableToString(line) + ":";
-#endif  // _MSC_VER
-}
-
-// Formats a file location for compiler-independent XML output.
-// Although this function is not platform dependent, we put it next to
-// FormatFileLocation in order to contrast the two functions.
-// Note that FormatCompilerIndependentFileLocation() does NOT append colon
-// to the file location it produces, unlike FormatFileLocation().
-GTEST_API_ ::std::string FormatCompilerIndependentFileLocation(
-    const char* file, int line) {
-  const std::string file_name(file == nullptr ? kUnknownFile : file);
-
-  if (line < 0)
-    return file_name;
-  else
-    return file_name + ":" + StreamableToString(line);
-}
-
-GTestLog::GTestLog(GTestLogSeverity severity, const char* file, int line)
-    : severity_(severity) {
-  const char* const marker =
-      severity == GTEST_INFO ?    "[  INFO ]" :
-      severity == GTEST_WARNING ? "[WARNING]" :
-      severity == GTEST_ERROR ?   "[ ERROR ]" : "[ FATAL ]";
-  GetStream() << ::std::endl << marker << " "
-              << FormatFileLocation(file, line).c_str() << ": ";
-}
-
-// Flushes the buffers and, if severity is GTEST_FATAL, aborts the program.
-GTestLog::~GTestLog() {
-  GetStream() << ::std::endl;
-  if (severity_ == GTEST_FATAL) {
-    fflush(stderr);
-    posix::Abort();
-  }
-}
-
-// Disable Microsoft deprecation warnings for POSIX functions called from
-// this class (creat, dup, dup2, and close)
-GTEST_DISABLE_MSC_DEPRECATED_PUSH_()
-
-#if GTEST_HAS_STREAM_REDIRECTION
-
-// Object that captures an output stream (stdout/stderr).
-class CapturedStream {
- public:
-  // The ctor redirects the stream to a temporary file.
-  explicit CapturedStream(int fd) : fd_(fd), uncaptured_fd_(dup(fd)) {
-# if GTEST_OS_WINDOWS
-    char temp_dir_path[MAX_PATH + 1] = { '\0' };  // NOLINT
-    char temp_file_path[MAX_PATH + 1] = { '\0' };  // NOLINT
-
-    ::GetTempPathA(sizeof(temp_dir_path), temp_dir_path);
-    const UINT success = ::GetTempFileNameA(temp_dir_path,
-                                            "gtest_redir",
-                                            0,  // Generate unique file name.
-                                            temp_file_path);
-    GTEST_CHECK_(success != 0)
-        << "Unable to create a temporary file in " << temp_dir_path;
-    const int captured_fd = creat(temp_file_path, _S_IREAD | _S_IWRITE);
-    GTEST_CHECK_(captured_fd != -1) << "Unable to open temporary file "
-                                    << temp_file_path;
-    filename_ = temp_file_path;
-# else
-    // There's no guarantee that a test has write access to the current
-    // directory, so we create the temporary file in the /tmp directory
-    // instead. We use /tmp on most systems, and /sdcard on Android.
-    // That's because Android doesn't have /tmp.
-#  if GTEST_OS_LINUX_ANDROID
-    // Note: Android applications are expected to call the framework's
-    // Context.getExternalStorageDirectory() method through JNI to get
-    // the location of the world-writable SD Card directory. However,
-    // this requires a Context handle, which cannot be retrieved
-    // globally from native code. Doing so also precludes running the
-    // code as part of a regular standalone executable, which doesn't
-    // run in a Dalvik process (e.g. when running it through 'adb shell').
-    //
-    // The location /data/local/tmp is directly accessible from native code.
-    // '/sdcard' and other variants cannot be relied on, as they are not
-    // guaranteed to be mounted, or may have a delay in mounting.
-    char name_template[] = "/data/local/tmp/gtest_captured_stream.XXXXXX";
-#  else
-    char name_template[] = "/tmp/captured_stream.XXXXXX";
-#  endif  // GTEST_OS_LINUX_ANDROID
-    const int captured_fd = mkstemp(name_template);
-    if (captured_fd == -1) {
-      GTEST_LOG_(WARNING)
-          << "Failed to create tmp file " << name_template
-          << " for test; does the test have access to the /tmp directory?";
-    }
-    filename_ = name_template;
-# endif  // GTEST_OS_WINDOWS
-    fflush(nullptr);
-    dup2(captured_fd, fd_);
-    close(captured_fd);
-  }
-
-  ~CapturedStream() {
-    remove(filename_.c_str());
-  }
-
-  std::string GetCapturedString() {
-    if (uncaptured_fd_ != -1) {
-      // Restores the original stream.
-      fflush(nullptr);
-      dup2(uncaptured_fd_, fd_);
-      close(uncaptured_fd_);
-      uncaptured_fd_ = -1;
-    }
-
-    FILE* const file = posix::FOpen(filename_.c_str(), "r");
-    if (file == nullptr) {
-      GTEST_LOG_(FATAL) << "Failed to open tmp file " << filename_
-                        << " for capturing stream.";
-    }
-    const std::string content = ReadEntireFile(file);
-    posix::FClose(file);
-    return content;
-  }
-
- private:
-  const int fd_;  // A stream to capture.
-  int uncaptured_fd_;
-  // Name of the temporary file holding the stderr output.
-  ::std::string filename_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(CapturedStream);
-};
-
-GTEST_DISABLE_MSC_DEPRECATED_POP_()
-
-static CapturedStream* g_captured_stderr = nullptr;
-static CapturedStream* g_captured_stdout = nullptr;
-
-// Starts capturing an output stream (stdout/stderr).
-static void CaptureStream(int fd, const char* stream_name,
-                          CapturedStream** stream) {
-  if (*stream != nullptr) {
-    GTEST_LOG_(FATAL) << "Only one " << stream_name
-                      << " capturer can exist at a time.";
-  }
-  *stream = new CapturedStream(fd);
-}
-
-// Stops capturing the output stream and returns the captured string.
-static std::string GetCapturedStream(CapturedStream** captured_stream) {
-  const std::string content = (*captured_stream)->GetCapturedString();
-
-  delete *captured_stream;
-  *captured_stream = nullptr;
-
-  return content;
-}
-
-// Starts capturing stdout.
-void CaptureStdout() {
-  CaptureStream(kStdOutFileno, "stdout", &g_captured_stdout);
-}
-
-// Starts capturing stderr.
-void CaptureStderr() {
-  CaptureStream(kStdErrFileno, "stderr", &g_captured_stderr);
-}
-
-// Stops capturing stdout and returns the captured string.
-std::string GetCapturedStdout() {
-  return GetCapturedStream(&g_captured_stdout);
-}
-
-// Stops capturing stderr and returns the captured string.
-std::string GetCapturedStderr() {
-  return GetCapturedStream(&g_captured_stderr);
-}
-
-#endif  // GTEST_HAS_STREAM_REDIRECTION
-
-
-
-
-
-size_t GetFileSize(FILE* file) {
-  fseek(file, 0, SEEK_END);
-  return static_cast<size_t>(ftell(file));
-}
-
-std::string ReadEntireFile(FILE* file) {
-  const size_t file_size = GetFileSize(file);
-  char* const buffer = new char[file_size];
-
-  size_t bytes_last_read = 0;  // # of bytes read in the last fread()
-  size_t bytes_read = 0;       // # of bytes read so far
-
-  fseek(file, 0, SEEK_SET);
-
-  // Keeps reading the file until we cannot read further or the
-  // pre-determined file size is reached.
-  do {
-    bytes_last_read = fread(buffer+bytes_read, 1, file_size-bytes_read, file);
-    bytes_read += bytes_last_read;
-  } while (bytes_last_read > 0 && bytes_read < file_size);
-
-  const std::string content(buffer, bytes_read);
-  delete[] buffer;
-
-  return content;
-}
-
-#if GTEST_HAS_DEATH_TEST
-static const std::vector<std::string>* g_injected_test_argvs =
-    nullptr;  // Owned.
-
-std::vector<std::string> GetInjectableArgvs() {
-  if (g_injected_test_argvs != nullptr) {
-    return *g_injected_test_argvs;
-  }
-  return GetArgvs();
-}
-
-void SetInjectableArgvs(const std::vector<std::string>* new_argvs) {
-  if (g_injected_test_argvs != new_argvs) delete g_injected_test_argvs;
-  g_injected_test_argvs = new_argvs;
-}
-
-void SetInjectableArgvs(const std::vector<std::string>& new_argvs) {
-  SetInjectableArgvs(
-      new std::vector<std::string>(new_argvs.begin(), new_argvs.end()));
-}
-
-void ClearInjectableArgvs() {
-  delete g_injected_test_argvs;
-  g_injected_test_argvs = nullptr;
-}
-#endif  // GTEST_HAS_DEATH_TEST
-
-#if GTEST_OS_WINDOWS_MOBILE
-namespace posix {
-void Abort() {
-  DebugBreak();
-  TerminateProcess(GetCurrentProcess(), 1);
-}
-}  // namespace posix
-#endif  // GTEST_OS_WINDOWS_MOBILE
-
-// Returns the name of the environment variable corresponding to the
-// given flag.  For example, FlagToEnvVar("foo") will return
-// "GTEST_FOO" in the open-source version.
-static std::string FlagToEnvVar(const char* flag) {
-  const std::string full_flag =
-      (Message() << GTEST_FLAG_PREFIX_ << flag).GetString();
-
-  Message env_var;
-  for (size_t i = 0; i != full_flag.length(); i++) {
-    env_var << ToUpper(full_flag.c_str()[i]);
-  }
-
-  return env_var.GetString();
-}
-
-// Parses 'str' for a 32-bit signed integer.  If successful, writes
-// the result to *value and returns true; otherwise leaves *value
-// unchanged and returns false.
-bool ParseInt32(const Message& src_text, const char* str, Int32* value) {
-  // Parses the environment variable as a decimal integer.
-  char* end = nullptr;
-  const long long_value = strtol(str, &end, 10);  // NOLINT
-
-  // Has strtol() consumed all characters in the string?
-  if (*end != '\0') {
-    // No - an invalid character was encountered.
-    Message msg;
-    msg << "WARNING: " << src_text
-        << " is expected to be a 32-bit integer, but actually"
-        << " has value \"" << str << "\".\n";
-    printf("%s", msg.GetString().c_str());
-    fflush(stdout);
-    return false;
-  }
-
-  // Is the parsed value in the range of an Int32?
-  const Int32 result = static_cast<Int32>(long_value);
-  if (long_value == LONG_MAX || long_value == LONG_MIN ||
-      // The parsed value overflows as a long.  (strtol() returns
-      // LONG_MAX or LONG_MIN when the input overflows.)
-      result != long_value
-      // The parsed value overflows as an Int32.
-      ) {
-    Message msg;
-    msg << "WARNING: " << src_text
-        << " is expected to be a 32-bit integer, but actually"
-        << " has value " << str << ", which overflows.\n";
-    printf("%s", msg.GetString().c_str());
-    fflush(stdout);
-    return false;
-  }
-
-  *value = result;
-  return true;
-}
-
-// Reads and returns the Boolean environment variable corresponding to
-// the given flag; if it's not set, returns default_value.
-//
-// The value is considered true if and only if it's not "0".
-bool BoolFromGTestEnv(const char* flag, bool default_value) {
-#if defined(GTEST_GET_BOOL_FROM_ENV_)
-  return GTEST_GET_BOOL_FROM_ENV_(flag, default_value);
-#else
-  const std::string env_var = FlagToEnvVar(flag);
-  const char* const string_value = posix::GetEnv(env_var.c_str());
-  return string_value == nullptr ? default_value
-                                 : strcmp(string_value, "0") != 0;
-#endif  // defined(GTEST_GET_BOOL_FROM_ENV_)
-}
-
-// Reads and returns a 32-bit integer stored in the environment
-// variable corresponding to the given flag; if it isn't set or
-// doesn't represent a valid 32-bit integer, returns default_value.
-Int32 Int32FromGTestEnv(const char* flag, Int32 default_value) {
-#if defined(GTEST_GET_INT32_FROM_ENV_)
-  return GTEST_GET_INT32_FROM_ENV_(flag, default_value);
-#else
-  const std::string env_var = FlagToEnvVar(flag);
-  const char* const string_value = posix::GetEnv(env_var.c_str());
-  if (string_value == nullptr) {
-    // The environment variable is not set.
-    return default_value;
-  }
-
-  Int32 result = default_value;
-  if (!ParseInt32(Message() << "Environment variable " << env_var,
-                  string_value, &result)) {
-    printf("The default value %s is used.\n",
-           (Message() << default_value).GetString().c_str());
-    fflush(stdout);
-    return default_value;
-  }
-
-  return result;
-#endif  // defined(GTEST_GET_INT32_FROM_ENV_)
-}
-
-// As a special case for the 'output' flag, if GTEST_OUTPUT is not
-// set, we look for XML_OUTPUT_FILE, which is set by the Bazel build
-// system.  The value of XML_OUTPUT_FILE is a filename without the
-// "xml:" prefix of GTEST_OUTPUT.
-// Note that this is meant to be called at the call site so it does
-// not check that the flag is 'output'
-// In essence this checks an env variable called XML_OUTPUT_FILE
-// and if it is set we prepend "xml:" to its value, if it not set we return ""
-std::string OutputFlagAlsoCheckEnvVar(){
-  std::string default_value_for_output_flag = "";
-  const char* xml_output_file_env = posix::GetEnv("XML_OUTPUT_FILE");
-  if (nullptr != xml_output_file_env) {
-    default_value_for_output_flag = std::string("xml:") + xml_output_file_env;
-  }
-  return default_value_for_output_flag;
-}
-
-// Reads and returns the string environment variable corresponding to
-// the given flag; if it's not set, returns default_value.
-const char* StringFromGTestEnv(const char* flag, const char* default_value) {
-#if defined(GTEST_GET_STRING_FROM_ENV_)
-  return GTEST_GET_STRING_FROM_ENV_(flag, default_value);
-#else
-  const std::string env_var = FlagToEnvVar(flag);
-  const char* const value = posix::GetEnv(env_var.c_str());
-  return value == nullptr ? default_value : value;
-#endif  // defined(GTEST_GET_STRING_FROM_ENV_)
-}
-
-}  // namespace internal
-}  // namespace testing
diff --git a/gnu/llvm/llvm/utils/unittest/googletest/src/gtest-printers.cc b/gnu/llvm/llvm/utils/unittest/googletest/src/gtest-printers.cc
deleted file mode 100644
index 3337be312ea..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googletest/src/gtest-printers.cc
+++ /dev/null
@@ -1,442 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Test - The Google C++ Testing and Mocking Framework
-//
-// This file implements a universal value printer that can print a
-// value of any type T:
-//
-//   void ::testing::internal::UniversalPrinter<T>::Print(value, ostream_ptr);
-//
-// It uses the << operator when possible, and prints the bytes in the
-// object otherwise.  A user can override its behavior for a class
-// type Foo by defining either operator<<(::std::ostream&, const Foo&)
-// or void PrintTo(const Foo&, ::std::ostream*) in the namespace that
-// defines Foo.
-
-#include "gtest/gtest-printers.h"
-#include <stdio.h>
-#include <cctype>
-#include <cwchar>
-#include <ostream>  // NOLINT
-#include <string>
-#include "gtest/internal/gtest-port.h"
-#include "src/gtest-internal-inl.h"
-
-namespace testing {
-
-namespace {
-
-using ::std::ostream;
-
-// Prints a segment of bytes in the given object.
-GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
-GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
-GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
-GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
-void PrintByteSegmentInObjectTo(const unsigned char* obj_bytes, size_t start,
-                                size_t count, ostream* os) {
-  char text[5] = "";
-  for (size_t i = 0; i != count; i++) {
-    const size_t j = start + i;
-    if (i != 0) {
-      // Organizes the bytes into groups of 2 for easy parsing by
-      // human.
-      if ((j % 2) == 0)
-        *os << ' ';
-      else
-        *os << '-';
-    }
-    GTEST_SNPRINTF_(text, sizeof(text), "%02X", obj_bytes[j]);
-    *os << text;
-  }
-}
-
-// Prints the bytes in the given value to the given ostream.
-void PrintBytesInObjectToImpl(const unsigned char* obj_bytes, size_t count,
-                              ostream* os) {
-  // Tells the user how big the object is.
-  *os << count << "-byte object <";
-
-  const size_t kThreshold = 132;
-  const size_t kChunkSize = 64;
-  // If the object size is bigger than kThreshold, we'll have to omit
-  // some details by printing only the first and the last kChunkSize
-  // bytes.
-  if (count < kThreshold) {
-    PrintByteSegmentInObjectTo(obj_bytes, 0, count, os);
-  } else {
-    PrintByteSegmentInObjectTo(obj_bytes, 0, kChunkSize, os);
-    *os << " ... ";
-    // Rounds up to 2-byte boundary.
-    const size_t resume_pos = (count - kChunkSize + 1)/2*2;
-    PrintByteSegmentInObjectTo(obj_bytes, resume_pos, count - resume_pos, os);
-  }
-  *os << ">";
-}
-
-}  // namespace
-
-namespace internal2 {
-
-// Delegates to PrintBytesInObjectToImpl() to print the bytes in the
-// given object.  The delegation simplifies the implementation, which
-// uses the << operator and thus is easier done outside of the
-// ::testing::internal namespace, which contains a << operator that
-// sometimes conflicts with the one in STL.
-void PrintBytesInObjectTo(const unsigned char* obj_bytes, size_t count,
-                          ostream* os) {
-  PrintBytesInObjectToImpl(obj_bytes, count, os);
-}
-
-}  // namespace internal2
-
-namespace internal {
-
-// Depending on the value of a char (or wchar_t), we print it in one
-// of three formats:
-//   - as is if it's a printable ASCII (e.g. 'a', '2', ' '),
-//   - as a hexadecimal escape sequence (e.g. '\x7F'), or
-//   - as a special escape sequence (e.g. '\r', '\n').
-enum CharFormat {
-  kAsIs,
-  kHexEscape,
-  kSpecialEscape
-};
-
-// Returns true if c is a printable ASCII character.  We test the
-// value of c directly instead of calling isprint(), which is buggy on
-// Windows Mobile.
-inline bool IsPrintableAscii(wchar_t c) {
-  return 0x20 <= c && c <= 0x7E;
-}
-
-// Prints a wide or narrow char c as a character literal without the
-// quotes, escaping it when necessary; returns how c was formatted.
-// The template argument UnsignedChar is the unsigned version of Char,
-// which is the type of c.
-template <typename UnsignedChar, typename Char>
-static CharFormat PrintAsCharLiteralTo(Char c, ostream* os) {
-  wchar_t w_c = static_cast<wchar_t>(c);
-  switch (w_c) {
-    case L'\0':
-      *os << "\\0";
-      break;
-    case L'\'':
-      *os << "\\'";
-      break;
-    case L'\\':
-      *os << "\\\\";
-      break;
-    case L'\a':
-      *os << "\\a";
-      break;
-    case L'\b':
-      *os << "\\b";
-      break;
-    case L'\f':
-      *os << "\\f";
-      break;
-    case L'\n':
-      *os << "\\n";
-      break;
-    case L'\r':
-      *os << "\\r";
-      break;
-    case L'\t':
-      *os << "\\t";
-      break;
-    case L'\v':
-      *os << "\\v";
-      break;
-    default:
-      if (IsPrintableAscii(w_c)) {
-        *os << static_cast<char>(c);
-        return kAsIs;
-      } else {
-        ostream::fmtflags flags = os->flags();
-        *os << "\\x" << std::hex << std::uppercase
-            << static_cast<int>(static_cast<UnsignedChar>(c));
-        os->flags(flags);
-        return kHexEscape;
-      }
-  }
-  return kSpecialEscape;
-}
-
-// Prints a wchar_t c as if it's part of a string literal, escaping it when
-// necessary; returns how c was formatted.
-static CharFormat PrintAsStringLiteralTo(wchar_t c, ostream* os) {
-  switch (c) {
-    case L'\'':
-      *os << "'";
-      return kAsIs;
-    case L'"':
-      *os << "\\\"";
-      return kSpecialEscape;
-    default:
-      return PrintAsCharLiteralTo<wchar_t>(c, os);
-  }
-}
-
-// Prints a char c as if it's part of a string literal, escaping it when
-// necessary; returns how c was formatted.
-static CharFormat PrintAsStringLiteralTo(char c, ostream* os) {
-  return PrintAsStringLiteralTo(
-      static_cast<wchar_t>(static_cast<unsigned char>(c)), os);
-}
-
-// Prints a wide or narrow character c and its code.  '\0' is printed
-// as "'\\0'", other unprintable characters are also properly escaped
-// using the standard C++ escape sequence.  The template argument
-// UnsignedChar is the unsigned version of Char, which is the type of c.
-template <typename UnsignedChar, typename Char>
-void PrintCharAndCodeTo(Char c, ostream* os) {
-  // First, print c as a literal in the most readable form we can find.
-  *os << ((sizeof(c) > 1) ? "L'" : "'");
-  const CharFormat format = PrintAsCharLiteralTo<UnsignedChar>(c, os);
-  *os << "'";
-
-  // To aid user debugging, we also print c's code in decimal, unless
-  // it's 0 (in which case c was printed as '\\0', making the code
-  // obvious).
-  if (c == 0)
-    return;
-  *os << " (" << static_cast<int>(c);
-
-  // For more convenience, we print c's code again in hexadecimal,
-  // unless c was already printed in the form '\x##' or the code is in
-  // [1, 9].
-  if (format == kHexEscape || (1 <= c && c <= 9)) {
-    // Do nothing.
-  } else {
-    *os << ", 0x" << String::FormatHexInt(static_cast<int>(c));
-  }
-  *os << ")";
-}
-
-void PrintTo(unsigned char c, ::std::ostream* os) {
-  PrintCharAndCodeTo<unsigned char>(c, os);
-}
-void PrintTo(signed char c, ::std::ostream* os) {
-  PrintCharAndCodeTo<unsigned char>(c, os);
-}
-
-// Prints a wchar_t as a symbol if it is printable or as its internal
-// code otherwise and also as its code.  L'\0' is printed as "L'\\0'".
-void PrintTo(wchar_t wc, ostream* os) {
-  PrintCharAndCodeTo<wchar_t>(wc, os);
-}
-
-// Prints the given array of characters to the ostream.  CharType must be either
-// char or wchar_t.
-// The array starts at begin, the length is len, it may include '\0' characters
-// and may not be NUL-terminated.
-template <typename CharType>
-GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
-GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
-GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
-GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
-static CharFormat PrintCharsAsStringTo(
-    const CharType* begin, size_t len, ostream* os) {
-  const char* const kQuoteBegin = sizeof(CharType) == 1 ? "\"" : "L\"";
-  *os << kQuoteBegin;
-  bool is_previous_hex = false;
-  CharFormat print_format = kAsIs;
-  for (size_t index = 0; index < len; ++index) {
-    const CharType cur = begin[index];
-    if (is_previous_hex && IsXDigit(cur)) {
-      // Previous character is of '\x..' form and this character can be
-      // interpreted as another hexadecimal digit in its number. Break string to
-      // disambiguate.
-      *os << "\" " << kQuoteBegin;
-    }
-    is_previous_hex = PrintAsStringLiteralTo(cur, os) == kHexEscape;
-    // Remember if any characters required hex escaping.
-    if (is_previous_hex) {
-      print_format = kHexEscape;
-    }
-  }
-  *os << "\"";
-  return print_format;
-}
-
-// Prints a (const) char/wchar_t array of 'len' elements, starting at address
-// 'begin'.  CharType must be either char or wchar_t.
-template <typename CharType>
-GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
-GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
-GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
-GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
-static void UniversalPrintCharArray(
-    const CharType* begin, size_t len, ostream* os) {
-  // The code
-  //   const char kFoo[] = "foo";
-  // generates an array of 4, not 3, elements, with the last one being '\0'.
-  //
-  // Therefore when printing a char array, we don't print the last element if
-  // it's '\0', such that the output matches the string literal as it's
-  // written in the source code.
-  if (len > 0 && begin[len - 1] == '\0') {
-    PrintCharsAsStringTo(begin, len - 1, os);
-    return;
-  }
-
-  // If, however, the last element in the array is not '\0', e.g.
-  //    const char kFoo[] = { 'f', 'o', 'o' };
-  // we must print the entire array.  We also print a message to indicate
-  // that the array is not NUL-terminated.
-  PrintCharsAsStringTo(begin, len, os);
-  *os << " (no terminating NUL)";
-}
-
-// Prints a (const) char array of 'len' elements, starting at address 'begin'.
-void UniversalPrintArray(const char* begin, size_t len, ostream* os) {
-  UniversalPrintCharArray(begin, len, os);
-}
-
-// Prints a (const) wchar_t array of 'len' elements, starting at address
-// 'begin'.
-void UniversalPrintArray(const wchar_t* begin, size_t len, ostream* os) {
-  UniversalPrintCharArray(begin, len, os);
-}
-
-// Prints the given C string to the ostream.
-void PrintTo(const char* s, ostream* os) {
-  if (s == nullptr) {
-    *os << "NULL";
-  } else {
-    *os << ImplicitCast_<const void*>(s) << " pointing to ";
-    PrintCharsAsStringTo(s, strlen(s), os);
-  }
-}
-
-// MSVC compiler can be configured to define whar_t as a typedef
-// of unsigned short. Defining an overload for const wchar_t* in that case
-// would cause pointers to unsigned shorts be printed as wide strings,
-// possibly accessing more memory than intended and causing invalid
-// memory accesses. MSVC defines _NATIVE_WCHAR_T_DEFINED symbol when
-// wchar_t is implemented as a native type.
-#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED)
-// Prints the given wide C string to the ostream.
-void PrintTo(const wchar_t* s, ostream* os) {
-  if (s == nullptr) {
-    *os << "NULL";
-  } else {
-    *os << ImplicitCast_<const void*>(s) << " pointing to ";
-    PrintCharsAsStringTo(s, wcslen(s), os);
-  }
-}
-#endif  // wchar_t is native
-
-namespace {
-
-bool ContainsUnprintableControlCodes(const char* str, size_t length) {
-  const unsigned char *s = reinterpret_cast<const unsigned char *>(str);
-
-  for (size_t i = 0; i < length; i++) {
-    unsigned char ch = *s++;
-    if (std::iscntrl(ch)) {
-        switch (ch) {
-        case '\t':
-        case '\n':
-        case '\r':
-          break;
-        default:
-          return true;
-        }
-      }
-  }
-  return false;
-}
-
-bool IsUTF8TrailByte(unsigned char t) { return 0x80 <= t && t<= 0xbf; }
-
-bool IsValidUTF8(const char* str, size_t length) {
-  const unsigned char *s = reinterpret_cast<const unsigned char *>(str);
-
-  for (size_t i = 0; i < length;) {
-    unsigned char lead = s[i++];
-
-    if (lead <= 0x7f) {
-      continue;  // single-byte character (ASCII) 0..7F
-    }
-    if (lead < 0xc2) {
-      return false;  // trail byte or non-shortest form
-    } else if (lead <= 0xdf && (i + 1) <= length && IsUTF8TrailByte(s[i])) {
-      ++i;  // 2-byte character
-    } else if (0xe0 <= lead && lead <= 0xef && (i + 2) <= length &&
-               IsUTF8TrailByte(s[i]) &&
-               IsUTF8TrailByte(s[i + 1]) &&
-               // check for non-shortest form and surrogate
-               (lead != 0xe0 || s[i] >= 0xa0) &&
-               (lead != 0xed || s[i] < 0xa0)) {
-      i += 2;  // 3-byte character
-    } else if (0xf0 <= lead && lead <= 0xf4 && (i + 3) <= length &&
-               IsUTF8TrailByte(s[i]) &&
-               IsUTF8TrailByte(s[i + 1]) &&
-               IsUTF8TrailByte(s[i + 2]) &&
-               // check for non-shortest form
-               (lead != 0xf0 || s[i] >= 0x90) &&
-               (lead != 0xf4 || s[i] < 0x90)) {
-      i += 3;  // 4-byte character
-    } else {
-      return false;
-    }
-  }
-  return true;
-}
-
-void ConditionalPrintAsText(const char* str, size_t length, ostream* os) {
-  if (!ContainsUnprintableControlCodes(str, length) &&
-      IsValidUTF8(str, length)) {
-    *os << "\n    As Text: \"" << str << "\"";
-  }
-}
-
-}  // anonymous namespace
-
-void PrintStringTo(const ::std::string& s, ostream* os) {
-  if (PrintCharsAsStringTo(s.data(), s.size(), os) == kHexEscape) {
-    if (GTEST_FLAG(print_utf8)) {
-      ConditionalPrintAsText(s.data(), s.size(), os);
-    }
-  }
-}
-
-#if GTEST_HAS_STD_WSTRING
-void PrintWideStringTo(const ::std::wstring& s, ostream* os) {
-  PrintCharsAsStringTo(s.data(), s.size(), os);
-}
-#endif  // GTEST_HAS_STD_WSTRING
-
-}  // namespace internal
-
-}  // namespace testing
diff --git a/gnu/llvm/llvm/utils/unittest/googletest/src/gtest-test-part.cc b/gnu/llvm/llvm/utils/unittest/googletest/src/gtest-test-part.cc
deleted file mode 100644
index 178317a6bcd..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googletest/src/gtest-test-part.cc
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-//
-// The Google C++ Testing and Mocking Framework (Google Test)
-
-#include "gtest/gtest-test-part.h"
-#include "src/gtest-internal-inl.h"
-
-namespace testing {
-
-using internal::GetUnitTestImpl;
-
-// Gets the summary of the failure message by omitting the stack trace
-// in it.
-std::string TestPartResult::ExtractSummary(const char* message) {
-  const char* const stack_trace = strstr(message, internal::kStackTraceMarker);
-  return stack_trace == nullptr ? message : std::string(message, stack_trace);
-}
-
-// Prints a TestPartResult object.
-std::ostream& operator<<(std::ostream& os, const TestPartResult& result) {
-  return os << result.file_name() << ":" << result.line_number() << ": "
-            << (result.type() == TestPartResult::kSuccess
-                    ? "Success"
-                    : result.type() == TestPartResult::kSkip
-                          ? "Skipped"
-                          : result.type() == TestPartResult::kFatalFailure
-                                ? "Fatal failure"
-                                : "Non-fatal failure")
-            << ":\n"
-            << result.message() << std::endl;
-}
-
-// Appends a TestPartResult to the array.
-void TestPartResultArray::Append(const TestPartResult& result) {
-  array_.push_back(result);
-}
-
-// Returns the TestPartResult at the given index (0-based).
-const TestPartResult& TestPartResultArray::GetTestPartResult(int index) const {
-  if (index < 0 || index >= size()) {
-    printf("\nInvalid index (%d) into TestPartResultArray.\n", index);
-    internal::posix::Abort();
-  }
-
-  return array_[static_cast<size_t>(index)];
-}
-
-// Returns the number of TestPartResult objects in the array.
-int TestPartResultArray::size() const {
-  return static_cast<int>(array_.size());
-}
-
-namespace internal {
-
-HasNewFatalFailureHelper::HasNewFatalFailureHelper()
-    : has_new_fatal_failure_(false),
-      original_reporter_(GetUnitTestImpl()->
-                         GetTestPartResultReporterForCurrentThread()) {
-  GetUnitTestImpl()->SetTestPartResultReporterForCurrentThread(this);
-}
-
-HasNewFatalFailureHelper::~HasNewFatalFailureHelper() {
-  GetUnitTestImpl()->SetTestPartResultReporterForCurrentThread(
-      original_reporter_);
-}
-
-void HasNewFatalFailureHelper::ReportTestPartResult(
-    const TestPartResult& result) {
-  if (result.fatally_failed())
-    has_new_fatal_failure_ = true;
-  original_reporter_->ReportTestPartResult(result);
-}
-
-}  // namespace internal
-
-}  // namespace testing
diff --git a/gnu/llvm/llvm/utils/unittest/googletest/src/gtest-typed-test.cc b/gnu/llvm/llvm/utils/unittest/googletest/src/gtest-typed-test.cc
deleted file mode 100644
index 8677caf732b..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googletest/src/gtest-typed-test.cc
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright 2008 Google Inc.
-// All Rights Reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-#include "gtest/gtest-typed-test.h"
-
-#include "gtest/gtest.h"
-
-namespace testing {
-namespace internal {
-
-#if GTEST_HAS_TYPED_TEST_P
-
-// Skips to the first non-space char in str. Returns an empty string if str
-// contains only whitespace characters.
-static const char* SkipSpaces(const char* str) {
-  while (IsSpace(*str))
-    str++;
-  return str;
-}
-
-static std::vector<std::string> SplitIntoTestNames(const char* src) {
-  std::vector<std::string> name_vec;
-  src = SkipSpaces(src);
-  for (; src != nullptr; src = SkipComma(src)) {
-    name_vec.push_back(StripTrailingSpaces(GetPrefixUntilComma(src)));
-  }
-  return name_vec;
-}
-
-// Verifies that registered_tests match the test names in
-// registered_tests_; returns registered_tests if successful, or
-// aborts the program otherwise.
-const char* TypedTestSuitePState::VerifyRegisteredTestNames(
-    const char* file, int line, const char* registered_tests) {
-  typedef RegisteredTestsMap::const_iterator RegisteredTestIter;
-  registered_ = true;
-
-  std::vector<std::string> name_vec = SplitIntoTestNames(registered_tests);
-
-  Message errors;
-
-  std::set<std::string> tests;
-  for (std::vector<std::string>::const_iterator name_it = name_vec.begin();
-       name_it != name_vec.end(); ++name_it) {
-    const std::string& name = *name_it;
-    if (tests.count(name) != 0) {
-      errors << "Test " << name << " is listed more than once.\n";
-      continue;
-    }
-
-    bool found = false;
-    for (RegisteredTestIter it = registered_tests_.begin();
-         it != registered_tests_.end();
-         ++it) {
-      if (name == it->first) {
-        found = true;
-        break;
-      }
-    }
-
-    if (found) {
-      tests.insert(name);
-    } else {
-      errors << "No test named " << name
-             << " can be found in this test suite.\n";
-    }
-  }
-
-  for (RegisteredTestIter it = registered_tests_.begin();
-       it != registered_tests_.end();
-       ++it) {
-    if (tests.count(it->first) == 0) {
-      errors << "You forgot to list test " << it->first << ".\n";
-    }
-  }
-
-  const std::string& errors_str = errors.GetString();
-  if (errors_str != "") {
-    fprintf(stderr, "%s %s", FormatFileLocation(file, line).c_str(),
-            errors_str.c_str());
-    fflush(stderr);
-    posix::Abort();
-  }
-
-  return registered_tests;
-}
-
-#endif  // GTEST_HAS_TYPED_TEST_P
-
-}  // namespace internal
-}  // namespace testing
diff --git a/gnu/llvm/llvm/utils/unittest/googletest/src/gtest.cc b/gnu/llvm/llvm/utils/unittest/googletest/src/gtest.cc
deleted file mode 100644
index a5b4e5ac78c..00000000000
--- a/gnu/llvm/llvm/utils/unittest/googletest/src/gtest.cc
+++ /dev/null
@@ -1,6177 +0,0 @@
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-//
-// The Google C++ Testing and Mocking Framework (Google Test)
-
-#include "gtest/gtest.h"
-#include "gtest/internal/custom/gtest.h"
-#include "gtest/gtest-spi.h"
-
-#include <ctype.h>
-#include <math.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <wchar.h>
-#include <wctype.h>
-
-#include <algorithm>
-#include <iomanip>
-#include <limits>
-#include <list>
-#include <map>
-#include <ostream>  // NOLINT
-#include <sstream>
-#include <vector>
-
-#if GTEST_OS_LINUX
-
-# define GTEST_HAS_GETTIMEOFDAY_ 1
-
-# include <fcntl.h>  // NOLINT
-# include <limits.h>  // NOLINT
-# include <sched.h>  // NOLINT
-// Declares vsnprintf().  This header is not available on Windows.
-# include <strings.h>  // NOLINT
-# include <sys/mman.h>  // NOLINT
-# include <sys/time.h>  // NOLINT
-# include <unistd.h>  // NOLINT
-# include <string>
-
-#elif GTEST_OS_ZOS
-# define GTEST_HAS_GETTIMEOFDAY_ 1
-# include <sys/time.h>  // NOLINT
-
-// On z/OS we additionally need strings.h for strcasecmp.
-# include <strings.h>  // NOLINT
-
-#elif GTEST_OS_WINDOWS_MOBILE  // We are on Windows CE.
-
-# include <windows.h>  // NOLINT
-# undef min
-
-#elif GTEST_OS_WINDOWS  // We are on Windows proper.
-
-# include <windows.h>  // NOLINT
-# undef min
-
-# include <crtdbg.h>  // NOLINT
-# include <debugapi.h>  // NOLINT
-# include <io.h>  // NOLINT
-# include <sys/timeb.h>  // NOLINT
-# include <sys/types.h>  // NOLINT
-# include <sys/stat.h>  // NOLINT
-
-# if GTEST_OS_WINDOWS_MINGW
-// MinGW has gettimeofday() but not _ftime64().
-#  define GTEST_HAS_GETTIMEOFDAY_ 1
-#  include <sys/time.h>  // NOLINT
-# endif  // GTEST_OS_WINDOWS_MINGW
-
-#else
-
-// Assume other platforms have gettimeofday().
-# define GTEST_HAS_GETTIMEOFDAY_ 1
-
-// cpplint thinks that the header is already included, so we want to
-// silence it.
-# include <sys/time.h>  // NOLINT
-# include <unistd.h>  // NOLINT
-
-#endif  // GTEST_OS_LINUX
-
-#if GTEST_HAS_EXCEPTIONS
-# include <stdexcept>
-#endif
-
-#if GTEST_CAN_STREAM_RESULTS_
-# include <arpa/inet.h>  // NOLINT
-# include <netdb.h>  // NOLINT
-# include <sys/socket.h>  // NOLINT
-# include <sys/types.h>  // NOLINT
-#endif
-
-#include "src/gtest-internal-inl.h"
-
-#if GTEST_OS_WINDOWS
-# define vsnprintf _vsnprintf
-#endif  // GTEST_OS_WINDOWS
-
-#if GTEST_OS_MAC
-#ifndef GTEST_OS_IOS
-#include <crt_externs.h>
-#endif
-#endif
-
-#if GTEST_HAS_ABSL
-#include "absl/debugging/failure_signal_handler.h"
-#include "absl/debugging/stacktrace.h"
-#include "absl/debugging/symbolize.h"
-#include "absl/strings/str_cat.h"
-#endif  // GTEST_HAS_ABSL
-
-namespace testing {
-
-using internal::CountIf;
-using internal::ForEach;
-using internal::GetElementOr;
-using internal::Shuffle;
-
-// Constants.
-
-// A test whose test suite name or test name matches this filter is
-// disabled and not run.
-static const char kDisableTestFilter[] = "DISABLED_*:*/DISABLED_*";
-
-// A test suite whose name matches this filter is considered a death
-// test suite and will be run before test suites whose name doesn't
-// match this filter.
-static const char kDeathTestSuiteFilter[] = "*DeathTest:*DeathTest/*";
-
-// A test filter that matches everything.
-static const char kUniversalFilter[] = "*";
-
-// The default output format.
-static const char kDefaultOutputFormat[] = "xml";
-// The default output file.
-static const char kDefaultOutputFile[] = "test_detail";
-
-// The environment variable name for the test shard index.
-static const char kTestShardIndex[] = "GTEST_SHARD_INDEX";
-// The environment variable name for the total number of test shards.
-static const char kTestTotalShards[] = "GTEST_TOTAL_SHARDS";
-// The environment variable name for the test shard status file.
-static const char kTestShardStatusFile[] = "GTEST_SHARD_STATUS_FILE";
-
-namespace internal {
-
-// The text used in failure messages to indicate the start of the
-// stack trace.
-const char kStackTraceMarker[] = "\nStack trace:\n";
-
-// g_help_flag is true if and only if the --help flag or an equivalent form
-// is specified on the command line.
-bool g_help_flag = false;
-
-// Utilty function to Open File for Writing
-static FILE* OpenFileForWriting(const std::string& output_file) {
-  FILE* fileout = nullptr;
-  FilePath output_file_path(output_file);
-  FilePath output_dir(output_file_path.RemoveFileName());
-
-  if (output_dir.CreateDirectoriesRecursively()) {
-    fileout = posix::FOpen(output_file.c_str(), "w");
-  }
-  if (fileout == nullptr) {
-    GTEST_LOG_(FATAL) << "Unable to open file \"" << output_file << "\"";
-  }
-  return fileout;
-}
-
-}  // namespace internal
-
-// Bazel passes in the argument to '--test_filter' via the TESTBRIDGE_TEST_ONLY
-// environment variable.
-static const char* GetDefaultFilter() {
-  const char* const testbridge_test_only =
-      internal::posix::GetEnv("TESTBRIDGE_TEST_ONLY");
-  if (testbridge_test_only != nullptr) {
-    return testbridge_test_only;
-  }
-  return kUniversalFilter;
-}
-
-GTEST_DEFINE_bool_(
-    also_run_disabled_tests,
-    internal::BoolFromGTestEnv("also_run_disabled_tests", false),
-    "Run disabled tests too, in addition to the tests normally being run.");
-
-GTEST_DEFINE_bool_(
-    break_on_failure, internal::BoolFromGTestEnv("break_on_failure", false),
-    "True if and only if a failed assertion should be a debugger "
-    "break-point.");
-
-GTEST_DEFINE_bool_(catch_exceptions,
-                   internal::BoolFromGTestEnv("catch_exceptions", true),
-                   "True if and only if " GTEST_NAME_
-                   " should catch exceptions and treat them as test failures.");
-
-GTEST_DEFINE_string_(
-    color,
-    internal::StringFromGTestEnv("color", "auto"),
-    "Whether to use colors in the output.  Valid values: yes, no, "
-    "and auto.  'auto' means to use colors if the output is "
-    "being sent to a terminal and the TERM environment variable "
-    "is set to a terminal type that supports colors.");
-
-GTEST_DEFINE_string_(
-    filter,
-    internal::StringFromGTestEnv("filter", GetDefaultFilter()),
-    "A colon-separated list of glob (not regex) patterns "
-    "for filtering the tests to run, optionally followed by a "
-    "'-' and a : separated list of negative patterns (tests to "
-    "exclude).  A test is run if it matches one of the positive "
-    "patterns and does not match any of the negative patterns.");
-
-GTEST_DEFINE_bool_(
-    install_failure_signal_handler,
-    internal::BoolFromGTestEnv("install_failure_signal_handler", false),
-    "If true and supported on the current platform, " GTEST_NAME_ " should "
-    "install a signal handler that dumps debugging information when fatal "
-    "signals are raised.");
-
-GTEST_DEFINE_bool_(list_tests, false,
-                   "List all tests without running them.");
-
-// The net priority order after flag processing is thus:
-//   --gtest_output command line flag
-//   GTEST_OUTPUT environment variable
-//   XML_OUTPUT_FILE environment variable
-//   ''
-GTEST_DEFINE_string_(
-    output,
-    internal::StringFromGTestEnv("output",
-      internal::OutputFlagAlsoCheckEnvVar().c_str()),
-    "A format (defaults to \"xml\" but can be specified to be \"json\"), "
-    "optionally followed by a colon and an output file name or directory. "
-    "A directory is indicated by a trailing pathname separator. "
-    "Examples: \"xml:filename.xml\", \"xml::directoryname/\". "
-    "If a directory is specified, output files will be created "
-    "within that directory, with file-names based on the test "
-    "executable's name and, if necessary, made unique by adding "
-    "digits.");
-
-GTEST_DEFINE_bool_(print_time, internal::BoolFromGTestEnv("print_time", true),
-                   "True if and only if " GTEST_NAME_
-                   " should display elapsed time in text output.");
-
-GTEST_DEFINE_bool_(print_utf8, internal::BoolFromGTestEnv("print_utf8", true),
-                   "True if and only if " GTEST_NAME_
-                   " prints UTF8 characters as text.");
-
-GTEST_DEFINE_int32_(
-    random_seed,
-    internal::Int32FromGTestEnv("random_seed", 0),
-    "Random number seed to use when shuffling test orders.  Must be in range "
-    "[1, 99999], or 0 to use a seed based on the current time.");
-
-GTEST_DEFINE_int32_(
-    repeat,
-    internal::Int32FromGTestEnv("repeat", 1),
-    "How many times to repeat each test.  Specify a negative number "
-    "for repeating forever.  Useful for shaking out flaky tests.");
-
-GTEST_DEFINE_bool_(show_internal_stack_frames, false,
-                   "True if and only if " GTEST_NAME_
-                   " should include internal stack frames when "
-                   "printing test failure stack traces.");
-
-GTEST_DEFINE_bool_(shuffle, internal::BoolFromGTestEnv("shuffle", false),
-                   "True if and only if " GTEST_NAME_
-                   " should randomize tests' order on every run.");
-
-GTEST_DEFINE_int32_(
-    stack_trace_depth,
-    internal::Int32FromGTestEnv("stack_trace_depth", kMaxStackTraceDepth),
-    "The maximum number of stack frames to print when an "
-    "assertion fails.  The valid range is 0 through 100, inclusive.");
-
-GTEST_DEFINE_string_(
-    stream_result_to,
-    internal::StringFromGTestEnv("stream_result_to", ""),
-    "This flag specifies the host name and the port number on which to stream "
-    "test results. Example: \"localhost:555\". The flag is effective only on "
-    "Linux.");
-
-GTEST_DEFINE_bool_(
-    throw_on_failure,
-    internal::BoolFromGTestEnv("throw_on_failure", false),
-    "When this flag is specified, a failed assertion will throw an exception "
-    "if exceptions are enabled or exit the program with a non-zero code "
-    "otherwise. For use with an external test framework.");
-
-#if GTEST_USE_OWN_FLAGFILE_FLAG_
-GTEST_DEFINE_string_(
-    flagfile,
-    internal::StringFromGTestEnv("flagfile", ""),
-    "This flag specifies the flagfile to read command-line flags from.");
-#endif  // GTEST_USE_OWN_FLAGFILE_FLAG_
-
-namespace internal {
-
-// Generates a random number from [0, range), using a Linear
-// Congruential Generator (LCG).  Crashes if 'range' is 0 or greater
-// than kMaxRange.
-UInt32 Random::Generate(UInt32 range) {
-  // These constants are the same as are used in glibc's rand(3).
-  // Use wider types than necessary to prevent unsigned overflow diagnostics.
-  state_ = static_cast<UInt32>(1103515245ULL*state_ + 12345U) % kMaxRange;
-
-  GTEST_CHECK_(range > 0)
-      << "Cannot generate a number in the range [0, 0).";
-  GTEST_CHECK_(range <= kMaxRange)
-      << "Generation of a number in [0, " << range << ") was requested, "
-      << "but this can only generate numbers in [0, " << kMaxRange << ").";
-
-  // Converting via modulus introduces a bit of downward bias, but
-  // it's simple, and a linear congruential generator isn't too good
-  // to begin with.
-  return state_ % range;
-}
-
-// GTestIsInitialized() returns true if and only if the user has initialized
-// Google Test.  Useful for catching the user mistake of not initializing
-// Google Test before calling RUN_ALL_TESTS().
-static bool GTestIsInitialized() { return GetArgvs().size() > 0; }
-
-// Iterates over a vector of TestSuites, keeping a running sum of the
-// results of calling a given int-returning method on each.
-// Returns the sum.
-static int SumOverTestSuiteList(const std::vector<TestSuite*>& case_list,
-                                int (TestSuite::*method)() const) {
-  int sum = 0;
-  for (size_t i = 0; i < case_list.size(); i++) {
-    sum += (case_list[i]->*method)();
-  }
-  return sum;
-}
-
-// Returns true if and only if the test suite passed.
-static bool TestSuitePassed(const TestSuite* test_suite) {
-  return test_suite->should_run() && test_suite->Passed();
-}
-
-// Returns true if and only if the test suite failed.
-static bool TestSuiteFailed(const TestSuite* test_suite) {
-  return test_suite->should_run() && test_suite->Failed();
-}
-
-// Returns true if and only if test_suite contains at least one test that
-// should run.
-static bool ShouldRunTestSuite(const TestSuite* test_suite) {
-  return test_suite->should_run();
-}
-
-// AssertHelper constructor.
-AssertHelper::AssertHelper(TestPartResult::Type type,
-                           const char* file,
-                           int line,
-                           const char* message)
-    : data_(new AssertHelperData(type, file, line, message)) {
-}
-
-AssertHelper::~AssertHelper() {
-  delete data_;
-}
-
-// Message assignment, for assertion streaming support.
-void AssertHelper::operator=(const Message& message) const {
-  UnitTest::GetInstance()->
-    AddTestPartResult(data_->type, data_->file, data_->line,
-                      AppendUserMessage(data_->message, message),
-                      UnitTest::GetInstance()->impl()
-                      ->CurrentOsStackTraceExceptTop(1)
-                      // Skips the stack frame for this function itself.
-                      );  // NOLINT
-}
-
-// A copy of all command line arguments.  Set by InitGoogleTest().
-static ::std::vector<std::string> g_argvs;
-
-::std::vector<std::string> GetArgvs() {
-#if defined(GTEST_CUSTOM_GET_ARGVS_)
-  // GTEST_CUSTOM_GET_ARGVS_() may return a container of std::string or
-  // ::string. This code converts it to the appropriate type.
-  const auto& custom = GTEST_CUSTOM_GET_ARGVS_();
-  return ::std::vector<std::string>(custom.begin(), custom.end());
-#else   // defined(GTEST_CUSTOM_GET_ARGVS_)
-  return g_argvs;
-#endif  // defined(GTEST_CUSTOM_GET_ARGVS_)
-}
-
-// Returns the current application's name, removing directory path if that
-// is present.
-FilePath GetCurrentExecutableName() {
-  FilePath result;
-
-#if GTEST_OS_WINDOWS || GTEST_OS_OS2
-  result.Set(FilePath(GetArgvs()[0]).RemoveExtension("exe"));
-#else
-  result.Set(FilePath(GetArgvs()[0]));
-#endif  // GTEST_OS_WINDOWS
-
-  return result.RemoveDirectoryName();
-}
-
-// Functions for processing the gtest_output flag.
-
-// Returns the output format, or "" for normal printed output.
-std::string UnitTestOptions::GetOutputFormat() {
-  const char* const gtest_output_flag = GTEST_FLAG(output).c_str();
-  const char* const colon = strchr(gtest_output_flag, ':');
-  return (colon == nullptr)
-             ? std::string(gtest_output_flag)
-             : std::string(gtest_output_flag,
-                           static_cast<size_t>(colon - gtest_output_flag));
-}
-
-// Returns the name of the requested output file, or the default if none
-// was explicitly specified.
-std::string UnitTestOptions::GetAbsolutePathToOutputFile() {
-  const char* const gtest_output_flag = GTEST_FLAG(output).c_str();
-
-  std::string format = GetOutputFormat();
-  if (format.empty())
-    format = std::string(kDefaultOutputFormat);
-
-  const char* const colon = strchr(gtest_output_flag, ':');
-  if (colon == nullptr)
-    return internal::FilePath::MakeFileName(
-        internal::FilePath(
-            UnitTest::GetInstance()->original_working_dir()),
-        internal::FilePath(kDefaultOutputFile), 0,
-        format.c_str()).string();
-
-  internal::FilePath output_name(colon + 1);
-  if (!output_name.IsAbsolutePath())
-    output_name = internal::FilePath::ConcatPaths(
-        internal::FilePath(UnitTest::GetInstance()->original_working_dir()),
-        internal::FilePath(colon + 1));
-
-  if (!output_name.IsDirectory())
-    return output_name.string();
-
-  internal::FilePath result(internal::FilePath::GenerateUniqueFileName(
-      output_name, internal::GetCurrentExecutableName(),
-      GetOutputFormat().c_str()));
-  return result.string();
-}
-
-// Returns true if and only if the wildcard pattern matches the string.
-// The first ':' or '\0' character in pattern marks the end of it.
-//
-// This recursive algorithm isn't very efficient, but is clear and
-// works well enough for matching test names, which are short.
-bool UnitTestOptions::PatternMatchesString(const char *pattern,
-                                           const char *str) {
-  switch (*pattern) {
-    case '\0':
-    case ':':  // Either ':' or '\0' marks the end of the pattern.
-      return *str == '\0';
-    case '?':  // Matches any single character.
-      return *str != '\0' && PatternMatchesString(pattern + 1, str + 1);
-    case '*':  // Matches any string (possibly empty) of characters.
-      return (*str != '\0' && PatternMatchesString(pattern, str + 1)) ||
-          PatternMatchesString(pattern + 1, str);
-    default:  // Non-special character.  Matches itself.
-      return *pattern == *str &&
-          PatternMatchesString(pattern + 1, str + 1);
-  }
-}
-
-bool UnitTestOptions::MatchesFilter(
-    const std::string& name, const char* filter) {
-  const char *cur_pattern = filter;
-  for (;;) {
-    if (PatternMatchesString(cur_pattern, name.c_str())) {
-      return true;
-    }
-
-    // Finds the next pattern in the filter.
-    cur_pattern = strchr(cur_pattern, ':');
-
-    // Returns if no more pattern can be found.
-    if (cur_pattern == nullptr) {
-      return false;
-    }
-
-    // Skips the pattern separater (the ':' character).
-    cur_pattern++;
-  }
-}
-
-// Returns true if and only if the user-specified filter matches the test
-// suite name and the test name.
-bool UnitTestOptions::FilterMatchesTest(const std::string& test_suite_name,
-                                        const std::string& test_name) {
-  const std::string& full_name = test_suite_name + "." + test_name.c_str();
-
-  // Split --gtest_filter at '-', if there is one, to separate into
-  // positive filter and negative filter portions
-  const char* const p = GTEST_FLAG(filter).c_str();
-  const char* const dash = strchr(p, '-');
-  std::string positive;
-  std::string negative;
-  if (dash == nullptr) {
-    positive = GTEST_FLAG(filter).c_str();  // Whole string is a positive filter
-    negative = "";
-  } else {
-    positive = std::string(p, dash);   // Everything up to the dash
-    negative = std::string(dash + 1);  // Everything after the dash
-    if (positive.empty()) {
-      // Treat '-test1' as the same as '*-test1'
-      positive = kUniversalFilter;
-    }
-  }
-
-  // A filter is a colon-separated list of patterns.  It matches a
-  // test if any pattern in it matches the test.
-  return (MatchesFilter(full_name, positive.c_str()) &&
-          !MatchesFilter(full_name, negative.c_str()));
-}
-
-#if GTEST_HAS_SEH
-// Returns EXCEPTION_EXECUTE_HANDLER if Google Test should handle the
-// given SEH exception, or EXCEPTION_CONTINUE_SEARCH otherwise.
-// This function is useful as an __except condition.
-int UnitTestOptions::GTestShouldProcessSEH(DWORD exception_code) {
-  // Google Test should handle a SEH exception if:
-  //   1. the user wants it to, AND
-  //   2. this is not a breakpoint exception, AND
-  //   3. this is not a C++ exception (VC++ implements them via SEH,
-  //      apparently).
-  //
-  // SEH exception code for C++ exceptions.
-  // (see http://support.microsoft.com/kb/185294 for more information).
-  const DWORD kCxxExceptionCode = 0xe06d7363;
-
-  bool should_handle = true;
-
-  if (!GTEST_FLAG(catch_exceptions))
-    should_handle = false;
-  else if (exception_code == EXCEPTION_BREAKPOINT)
-    should_handle = false;
-  else if (exception_code == kCxxExceptionCode)
-    should_handle = false;
-
-  return should_handle ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH;
-}
-#endif  // GTEST_HAS_SEH
-
-}  // namespace internal
-
-// The c'tor sets this object as the test part result reporter used by
-// Google Test.  The 'result' parameter specifies where to report the
-// results. Intercepts only failures from the current thread.
-ScopedFakeTestPartResultReporter::ScopedFakeTestPartResultReporter(
-    TestPartResultArray* result)
-    : intercept_mode_(INTERCEPT_ONLY_CURRENT_THREAD),
-      result_(result) {
-  Init();
-}
-
-// The c'tor sets this object as the test part result reporter used by
-// Google Test.  The 'result' parameter specifies where to report the
-// results.
-ScopedFakeTestPartResultReporter::ScopedFakeTestPartResultReporter(
-    InterceptMode intercept_mode, TestPartResultArray* result)
-    : intercept_mode_(intercept_mode),
-      result_(result) {
-  Init();
-}
-
-void ScopedFakeTestPartResultReporter::Init() {
-  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
-  if (intercept_mode_ == INTERCEPT_ALL_THREADS) {
-    old_reporter_ = impl->GetGlobalTestPartResultReporter();
-    impl->SetGlobalTestPartResultReporter(this);
-  } else {
-    old_reporter_ = impl->GetTestPartResultReporterForCurrentThread();
-    impl->SetTestPartResultReporterForCurrentThread(this);
-  }
-}
-
-// The d'tor restores the test part result reporter used by Google Test
-// before.
-ScopedFakeTestPartResultReporter::~ScopedFakeTestPartResultReporter() {
-  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
-  if (intercept_mode_ == INTERCEPT_ALL_THREADS) {
-    impl->SetGlobalTestPartResultReporter(old_reporter_);
-  } else {
-    impl->SetTestPartResultReporterForCurrentThread(old_reporter_);
-  }
-}
-
-// Increments the test part result count and remembers the result.
-// This method is from the TestPartResultReporterInterface interface.
-void ScopedFakeTestPartResultReporter::ReportTestPartResult(
-    const TestPartResult& result) {
-  result_->Append(result);
-}
-
-namespace internal {
-
-// Returns the type ID of ::testing::Test.  We should always call this
-// instead of GetTypeId< ::testing::Test>() to get the type ID of
-// testing::Test.  This is to work around a suspected linker bug when
-// using Google Test as a framework on Mac OS X.  The bug causes
-// GetTypeId< ::testing::Test>() to return different values depending
-// on whether the call is from the Google Test framework itself or
-// from user test code.  GetTestTypeId() is guaranteed to always
-// return the same value, as it always calls GetTypeId<>() from the
-// gtest.cc, which is within the Google Test framework.
-TypeId GetTestTypeId() {
-  return GetTypeId<Test>();
-}
-
-// The value of GetTestTypeId() as seen from within the Google Test
-// library.  This is solely for testing GetTestTypeId().
-extern const TypeId kTestTypeIdInGoogleTest = GetTestTypeId();
-
-// This predicate-formatter checks that 'results' contains a test part
-// failure of the given type and that the failure message contains the
-// given substring.
-static AssertionResult HasOneFailure(const char* /* results_expr */,
-                                     const char* /* type_expr */,
-                                     const char* /* substr_expr */,
-                                     const TestPartResultArray& results,
-                                     TestPartResult::Type type,
-                                     const std::string& substr) {
-  const std::string expected(type == TestPartResult::kFatalFailure ?
-                        "1 fatal failure" :
-                        "1 non-fatal failure");
-  Message msg;
-  if (results.size() != 1) {
-    msg << "Expected: " << expected << "\n"
-        << "  Actual: " << results.size() << " failures";
-    for (int i = 0; i < results.size(); i++) {
-      msg << "\n" << results.GetTestPartResult(i);
-    }
-    return AssertionFailure() << msg;
-  }
-
-  const TestPartResult& r = results.GetTestPartResult(0);
-  if (r.type() != type) {
-    return AssertionFailure() << "Expected: " << expected << "\n"
-                              << "  Actual:\n"
-                              << r;
-  }
-
-  if (strstr(r.message(), substr.c_str()) == nullptr) {
-    return AssertionFailure() << "Expected: " << expected << " containing \""
-                              << substr << "\"\n"
-                              << "  Actual:\n"
-                              << r;
-  }
-
-  return AssertionSuccess();
-}
-
-// The constructor of SingleFailureChecker remembers where to look up
-// test part results, what type of failure we expect, and what
-// substring the failure message should contain.
-SingleFailureChecker::SingleFailureChecker(const TestPartResultArray* results,
-                                           TestPartResult::Type type,
-                                           const std::string& substr)
-    : results_(results), type_(type), substr_(substr) {}
-
-// The destructor of SingleFailureChecker verifies that the given
-// TestPartResultArray contains exactly one failure that has the given
-// type and contains the given substring.  If that's not the case, a
-// non-fatal failure will be generated.
-SingleFailureChecker::~SingleFailureChecker() {
-  EXPECT_PRED_FORMAT3(HasOneFailure, *results_, type_, substr_);
-}
-
-DefaultGlobalTestPartResultReporter::DefaultGlobalTestPartResultReporter(
-    UnitTestImpl* unit_test) : unit_test_(unit_test) {}
-
-void DefaultGlobalTestPartResultReporter::ReportTestPartResult(
-    const TestPartResult& result) {
-  unit_test_->current_test_result()->AddTestPartResult(result);
-  unit_test_->listeners()->repeater()->OnTestPartResult(result);
-}
-
-DefaultPerThreadTestPartResultReporter::DefaultPerThreadTestPartResultReporter(
-    UnitTestImpl* unit_test) : unit_test_(unit_test) {}
-
-void DefaultPerThreadTestPartResultReporter::ReportTestPartResult(
-    const TestPartResult& result) {
-  unit_test_->GetGlobalTestPartResultReporter()->ReportTestPartResult(result);
-}
-
-// Returns the global test part result reporter.
-TestPartResultReporterInterface*
-UnitTestImpl::GetGlobalTestPartResultReporter() {
-  internal::MutexLock lock(&global_test_part_result_reporter_mutex_);
-  return global_test_part_result_repoter_;
-}
-
-// Sets the global test part result reporter.
-void UnitTestImpl::SetGlobalTestPartResultReporter(
-    TestPartResultReporterInterface* reporter) {
-  internal::MutexLock lock(&global_test_part_result_reporter_mutex_);
-  global_test_part_result_repoter_ = reporter;
-}
-
-// Returns the test part result reporter for the current thread.
-TestPartResultReporterInterface*
-UnitTestImpl::GetTestPartResultReporterForCurrentThread() {
-  return per_thread_test_part_result_reporter_.get();
-}
-
-// Sets the test part result reporter for the current thread.
-void UnitTestImpl::SetTestPartResultReporterForCurrentThread(
-    TestPartResultReporterInterface* reporter) {
-  per_thread_test_part_result_reporter_.set(reporter);
-}
-
-// Gets the number of successful test suites.
-int UnitTestImpl::successful_test_suite_count() const {
-  return CountIf(test_suites_, TestSuitePassed);
-}
-
-// Gets the number of failed test suites.
-int UnitTestImpl::failed_test_suite_count() const {
-  return CountIf(test_suites_, TestSuiteFailed);
-}
-
-// Gets the number of all test suites.
-int UnitTestImpl::total_test_suite_count() const {
-  return static_cast<int>(test_suites_.size());
-}
-
-// Gets the number of all test suites that contain at least one test
-// that should run.
-int UnitTestImpl::test_suite_to_run_count() const {
-  return CountIf(test_suites_, ShouldRunTestSuite);
-}
-
-// Gets the number of successful tests.
-int UnitTestImpl::successful_test_count() const {
-  return SumOverTestSuiteList(test_suites_, &TestSuite::successful_test_count);
-}
-
-// Gets the number of skipped tests.
-int UnitTestImpl::skipped_test_count() const {
-  return SumOverTestSuiteList(test_suites_, &TestSuite::skipped_test_count);
-}
-
-// Gets the number of failed tests.
-int UnitTestImpl::failed_test_count() const {
-  return SumOverTestSuiteList(test_suites_, &TestSuite::failed_test_count);
-}
-
-// Gets the number of disabled tests that will be reported in the XML report.
-int UnitTestImpl::reportable_disabled_test_count() const {
-  return SumOverTestSuiteList(test_suites_,
-                              &TestSuite::reportable_disabled_test_count);
-}
-
-// Gets the number of disabled tests.
-int UnitTestImpl::disabled_test_count() const {
-  return SumOverTestSuiteList(test_suites_, &TestSuite::disabled_test_count);
-}
-
-// Gets the number of tests to be printed in the XML report.
-int UnitTestImpl::reportable_test_count() const {
-  return SumOverTestSuiteList(test_suites_, &TestSuite::reportable_test_count);
-}
-
-// Gets the number of all tests.
-int UnitTestImpl::total_test_count() const {
-  return SumOverTestSuiteList(test_suites_, &TestSuite::total_test_count);
-}
-
-// Gets the number of tests that should run.
-int UnitTestImpl::test_to_run_count() const {
-  return SumOverTestSuiteList(test_suites_, &TestSuite::test_to_run_count);
-}
-
-// Returns the current OS stack trace as an std::string.
-//
-// The maximum number of stack frames to be included is specified by
-// the gtest_stack_trace_depth flag.  The skip_count parameter
-// specifies the number of top frames to be skipped, which doesn't
-// count against the number of frames to be included.
-//
-// For example, if Foo() calls Bar(), which in turn calls
-// CurrentOsStackTraceExceptTop(1), Foo() will be included in the
-// trace but Bar() and CurrentOsStackTraceExceptTop() won't.
-std::string UnitTestImpl::CurrentOsStackTraceExceptTop(int skip_count) {
-  return os_stack_trace_getter()->CurrentStackTrace(
-      static_cast<int>(GTEST_FLAG(stack_trace_depth)),
-      skip_count + 1
-      // Skips the user-specified number of frames plus this function
-      // itself.
-      );  // NOLINT
-}
-
-// Returns the current time in milliseconds.
-TimeInMillis GetTimeInMillis() {
-#if GTEST_OS_WINDOWS_MOBILE || defined(__BORLANDC__)
-  // Difference between 1970-01-01 and 1601-01-01 in milliseconds.
-  // http://analogous.blogspot.com/2005/04/epoch.html
-  const TimeInMillis kJavaEpochToWinFileTimeDelta =
-    static_cast<TimeInMillis>(116444736UL) * 100000UL;
-  const DWORD kTenthMicrosInMilliSecond = 10000;
-
-  SYSTEMTIME now_systime;
-  FILETIME now_filetime;
-  ULARGE_INTEGER now_int64;
-  GetSystemTime(&now_systime);
-  if (SystemTimeToFileTime(&now_systime, &now_filetime)) {
-    now_int64.LowPart = now_filetime.dwLowDateTime;
-    now_int64.HighPart = now_filetime.dwHighDateTime;
-    now_int64.QuadPart = (now_int64.QuadPart / kTenthMicrosInMilliSecond) -
-      kJavaEpochToWinFileTimeDelta;
-    return now_int64.QuadPart;
-  }
-  return 0;
-#elif GTEST_OS_WINDOWS && !GTEST_HAS_GETTIMEOFDAY_
-  __timeb64 now;
-
-  // MSVC 8 deprecates _ftime64(), so we want to suppress warning 4996
-  // (deprecated function) there.
-  GTEST_DISABLE_MSC_DEPRECATED_PUSH_()
-  _ftime64(&now);
-  GTEST_DISABLE_MSC_DEPRECATED_POP_()
-
-  return static_cast<TimeInMillis>(now.time) * 1000 + now.millitm;
-#elif GTEST_HAS_GETTIMEOFDAY_
-  struct timeval now;
-  gettimeofday(&now, nullptr);
-  return static_cast<TimeInMillis>(now.tv_sec) * 1000 + now.tv_usec / 1000;
-#else
-# error "Don't know how to get the current time on your system."
-#endif
-}
-
-// Utilities
-
-// class String.
-
-#if GTEST_OS_WINDOWS_MOBILE
-// Creates a UTF-16 wide string from the given ANSI string, allocating
-// memory using new. The caller is responsible for deleting the return
-// value using delete[]. Returns the wide string, or NULL if the
-// input is NULL.
-LPCWSTR String::AnsiToUtf16(const char* ansi) {
-  if (!ansi) return nullptr;
-  const int length = strlen(ansi);
-  const int unicode_length =
-      MultiByteToWideChar(CP_ACP, 0, ansi, length, nullptr, 0);
-  WCHAR* unicode = new WCHAR[unicode_length + 1];
-  MultiByteToWideChar(CP_ACP, 0, ansi, length,
-                      unicode, unicode_length);
-  unicode[unicode_length] = 0;
-  return unicode;
-}
-
-// Creates an ANSI string from the given wide string, allocating
-// memory using new. The caller is responsible for deleting the return
-// value using delete[]. Returns the ANSI string, or NULL if the
-// input is NULL.
-const char* String::Utf16ToAnsi(LPCWSTR utf16_str)  {
-  if (!utf16_str) return nullptr;
-  const int ansi_length = WideCharToMultiByte(CP_ACP, 0, utf16_str, -1, nullptr,
-                                              0, nullptr, nullptr);
-  char* ansi = new char[ansi_length + 1];
-  WideCharToMultiByte(CP_ACP, 0, utf16_str, -1, ansi, ansi_length, nullptr,
-                      nullptr);
-  ansi[ansi_length] = 0;
-  return ansi;
-}
-
-#endif  // GTEST_OS_WINDOWS_MOBILE
-
-// Compares two C strings.  Returns true if and only if they have the same
-// content.
-//
-// Unlike strcmp(), this function can handle NULL argument(s).  A NULL
-// C string is considered different to any non-NULL C string,
-// including the empty string.
-bool String::CStringEquals(const char * lhs, const char * rhs) {
-  if (lhs == nullptr) return rhs == nullptr;
-
-  if (rhs == nullptr) return false;
-
-  return strcmp(lhs, rhs) == 0;
-}
-
-#if GTEST_HAS_STD_WSTRING
-
-// Converts an array of wide chars to a narrow string using the UTF-8
-// encoding, and streams the result to the given Message object.
-static void StreamWideCharsToMessage(const wchar_t* wstr, size_t length,
-                                     Message* msg) {
-  for (size_t i = 0; i != length; ) {  // NOLINT
-    if (wstr[i] != L'\0') {
-      *msg << WideStringToUtf8(wstr + i, static_cast<int>(length - i));
-      while (i != length && wstr[i] != L'\0')
-        i++;
-    } else {
-      *msg << '\0';
-      i++;
-    }
-  }
-}
-
-#endif  // GTEST_HAS_STD_WSTRING
-
-void SplitString(const ::std::string& str, char delimiter,
-                 ::std::vector< ::std::string>* dest) {
-  ::std::vector< ::std::string> parsed;
-  ::std::string::size_type pos = 0;
-  while (::testing::internal::AlwaysTrue()) {
-    const ::std::string::size_type colon = str.find(delimiter, pos);
-    if (colon == ::std::string::npos) {
-      parsed.push_back(str.substr(pos));
-      break;
-    } else {
-      parsed.push_back(str.substr(pos, colon - pos));
-      pos = colon + 1;
-    }
-  }
-  dest->swap(parsed);
-}
-
-}  // namespace internal
-
-// Constructs an empty Message.
-// We allocate the stringstream separately because otherwise each use of
-// ASSERT/EXPECT in a procedure adds over 200 bytes to the procedure's
-// stack frame leading to huge stack frames in some cases; gcc does not reuse
-// the stack space.
-Message::Message() : ss_(new ::std::stringstream) {
-  // By default, we want there to be enough precision when printing
-  // a double to a Message.
-  *ss_ << std::setprecision(std::numeric_limits<double>::digits10 + 2);
-}
-
-// These two overloads allow streaming a wide C string to a Message
-// using the UTF-8 encoding.
-Message& Message::operator <<(const wchar_t* wide_c_str) {
-  return *this << internal::String::ShowWideCString(wide_c_str);
-}
-Message& Message::operator <<(wchar_t* wide_c_str) {
-  return *this << internal::String::ShowWideCString(wide_c_str);
-}
-
-#if GTEST_HAS_STD_WSTRING
-// Converts the given wide string to a narrow string using the UTF-8
-// encoding, and streams the result to this Message object.
-Message& Message::operator <<(const ::std::wstring& wstr) {
-  internal::StreamWideCharsToMessage(wstr.c_str(), wstr.length(), this);
-  return *this;
-}
-#endif  // GTEST_HAS_STD_WSTRING
-
-// Gets the text streamed to this object so far as an std::string.
-// Each '\0' character in the buffer is replaced with "\\0".
-std::string Message::GetString() const {
-  return internal::StringStreamToString(ss_.get());
-}
-
-// AssertionResult constructors.
-// Used in EXPECT_TRUE/FALSE(assertion_result).
-AssertionResult::AssertionResult(const AssertionResult& other)
-    : success_(other.success_),
-      message_(other.message_.get() != nullptr
-                   ? new ::std::string(*other.message_)
-                   : static_cast< ::std::string*>(nullptr)) {}
-
-// Swaps two AssertionResults.
-void AssertionResult::swap(AssertionResult& other) {
-  using std::swap;
-  swap(success_, other.success_);
-  swap(message_, other.message_);
-}
-
-// Returns the assertion's negation. Used with EXPECT/ASSERT_FALSE.
-AssertionResult AssertionResult::operator!() const {
-  AssertionResult negation(!success_);
-  if (message_.get() != nullptr) negation << *message_;
-  return negation;
-}
-
-// Makes a successful assertion result.
-AssertionResult AssertionSuccess() {
-  return AssertionResult(true);
-}
-
-// Makes a failed assertion result.
-AssertionResult AssertionFailure() {
-  return AssertionResult(false);
-}
-
-// Makes a failed assertion result with the given failure message.
-// Deprecated; use AssertionFailure() << message.
-AssertionResult AssertionFailure(const Message& message) {
-  return AssertionFailure() << message;
-}
-
-namespace internal {
-
-namespace edit_distance {
-std::vector<EditType> CalculateOptimalEdits(const std::vector<size_t>& left,
-                                            const std::vector<size_t>& right) {
-  std::vector<std::vector<double> > costs(
-      left.size() + 1, std::vector<double>(right.size() + 1));
-  std::vector<std::vector<EditType> > best_move(
-      left.size() + 1, std::vector<EditType>(right.size() + 1));
-
-  // Populate for empty right.
-  for (size_t l_i = 0; l_i < costs.size(); ++l_i) {
-    costs[l_i][0] = static_cast<double>(l_i);
-    best_move[l_i][0] = kRemove;
-  }
-  // Populate for empty left.
-  for (size_t r_i = 1; r_i < costs[0].size(); ++r_i) {
-    costs[0][r_i] = static_cast<double>(r_i);
-    best_move[0][r_i] = kAdd;
-  }
-
-  for (size_t l_i = 0; l_i < left.size(); ++l_i) {
-    for (size_t r_i = 0; r_i < right.size(); ++r_i) {
-      if (left[l_i] == right[r_i]) {
-        // Found a match. Consume it.
-        costs[l_i + 1][r_i + 1] = costs[l_i][r_i];
-        best_move[l_i + 1][r_i + 1] = kMatch;
-        continue;
-      }
-
-      const double add = costs[l_i + 1][r_i];
-      const double remove = costs[l_i][r_i + 1];
-      const double replace = costs[l_i][r_i];
-      if (add < remove && add < replace) {
-        costs[l_i + 1][r_i + 1] = add + 1;
-        best_move[l_i + 1][r_i + 1] = kAdd;
-      } else if (remove < add && remove < replace) {
-        costs[l_i + 1][r_i + 1] = remove + 1;
-        best_move[l_i + 1][r_i + 1] = kRemove;
-      } else {
-        // We make replace a little more expensive than add/remove to lower
-        // their priority.
-        costs[l_i + 1][r_i + 1] = replace + 1.00001;
-        best_move[l_i + 1][r_i + 1] = kReplace;
-      }
-    }
-  }
-
-  // Reconstruct the best path. We do it in reverse order.
-  std::vector<EditType> best_path;
-  for (size_t l_i = left.size(), r_i = right.size(); l_i > 0 || r_i > 0;) {
-    EditType move = best_move[l_i][r_i];
-    best_path.push_back(move);
-    l_i -= move != kAdd;
-    r_i -= move != kRemove;
-  }
-  std::reverse(best_path.begin(), best_path.end());
-  return best_path;
-}
-
-namespace {
-
-// Helper class to convert string into ids with deduplication.
-class InternalStrings {
- public:
-  size_t GetId(const std::string& str) {
-    IdMap::iterator it = ids_.find(str);
-    if (it != ids_.end()) return it->second;
-    size_t id = ids_.size();
-    return ids_[str] = id;
-  }
-
- private:
-  typedef std::map<std::string, size_t> IdMap;
-  IdMap ids_;
-};
-
-}  // namespace
-
-std::vector<EditType> CalculateOptimalEdits(
-    const std::vector<std::string>& left,
-    const std::vector<std::string>& right) {
-  std::vector<size_t> left_ids, right_ids;
-  {
-    InternalStrings intern_table;
-    for (size_t i = 0; i < left.size(); ++i) {
-      left_ids.push_back(intern_table.GetId(left[i]));
-    }
-    for (size_t i = 0; i < right.size(); ++i) {
-      right_ids.push_back(intern_table.GetId(right[i]));
-    }
-  }
-  return CalculateOptimalEdits(left_ids, right_ids);
-}
-
-namespace {
-
-// Helper class that holds the state for one hunk and prints it out to the
-// stream.
-// It reorders adds/removes when possible to group all removes before all
-// adds. It also adds the hunk header before printint into the stream.
-class Hunk {
- public:
-  Hunk(size_t left_start, size_t right_start)
-      : left_start_(left_start),
-        right_start_(right_start),
-        adds_(),
-        removes_(),
-        common_() {}
-
-  void PushLine(char edit, const char* line) {
-    switch (edit) {
-      case ' ':
-        ++common_;
-        FlushEdits();
-        hunk_.push_back(std::make_pair(' ', line));
-        break;
-      case '-':
-        ++removes_;
-        hunk_removes_.push_back(std::make_pair('-', line));
-        break;
-      case '+':
-        ++adds_;
-        hunk_adds_.push_back(std::make_pair('+', line));
-        break;
-    }
-  }
-
-  void PrintTo(std::ostream* os) {
-    PrintHeader(os);
-    FlushEdits();
-    for (std::list<std::pair<char, const char*> >::const_iterator it =
-             hunk_.begin();
-         it != hunk_.end(); ++it) {
-      *os << it->first << it->second << "\n";
-    }
-  }
-
-  bool has_edits() const { return adds_ || removes_; }
-
- private:
-  void FlushEdits() {
-    hunk_.splice(hunk_.end(), hunk_removes_);
-    hunk_.splice(hunk_.end(), hunk_adds_);
-  }
-
-  // Print a unified diff header for one hunk.
-  // The format is
-  //   "@@ -<left_start>,<left_length> +<right_start>,<right_length> @@"
-  // where the left/right parts are omitted if unnecessary.
-  void PrintHeader(std::ostream* ss) const {
-    *ss << "@@ ";
-    if (removes_) {
-      *ss << "-" << left_start_ << "," << (removes_ + common_);
-    }
-    if (removes_ && adds_) {
-      *ss << " ";
-    }
-    if (adds_) {
-      *ss << "+" << right_start_ << "," << (adds_ + common_);
-    }
-    *ss << " @@\n";
-  }
-
-  size_t left_start_, right_start_;
-  size_t adds_, removes_, common_;
-  std::list<std::pair<char, const char*> > hunk_, hunk_adds_, hunk_removes_;
-};
-
-}  // namespace
-
-// Create a list of diff hunks in Unified diff format.
-// Each hunk has a header generated by PrintHeader above plus a body with
-// lines prefixed with ' ' for no change, '-' for deletion and '+' for
-// addition.
-// 'context' represents the desired unchanged prefix/suffix around the diff.
-// If two hunks are close enough that their contexts overlap, then they are
-// joined into one hunk.
-std::string CreateUnifiedDiff(const std::vector<std::string>& left,
-                              const std::vector<std::string>& right,
-                              size_t context) {
-  const std::vector<EditType> edits = CalculateOptimalEdits(left, right);
-
-  size_t l_i = 0, r_i = 0, edit_i = 0;
-  std::stringstream ss;
-  while (edit_i < edits.size()) {
-    // Find first edit.
-    while (edit_i < edits.size() && edits[edit_i] == kMatch) {
-      ++l_i;
-      ++r_i;
-      ++edit_i;
-    }
-
-    // Find the first line to include in the hunk.
-    const size_t prefix_context = std::min(l_i, context);
-    Hunk hunk(l_i - prefix_context + 1, r_i - prefix_context + 1);
-    for (size_t i = prefix_context; i > 0; --i) {
-      hunk.PushLine(' ', left[l_i - i].c_str());
-    }
-
-    // Iterate the edits until we found enough suffix for the hunk or the input
-    // is over.
-    size_t n_suffix = 0;
-    for (; edit_i < edits.size(); ++edit_i) {
-      if (n_suffix >= context) {
-        // Continue only if the next hunk is very close.
-        auto it = edits.begin() + static_cast<int>(edit_i);
-        while (it != edits.end() && *it == kMatch) ++it;
-        if (it == edits.end() ||
-            static_cast<size_t>(it - edits.begin()) - edit_i >= context) {
-          // There is no next edit or it is too far away.
-          break;
-        }
-      }
-
-      EditType edit = edits[edit_i];
-      // Reset count when a non match is found.
-      n_suffix = edit == kMatch ? n_suffix + 1 : 0;
-
-      if (edit == kMatch || edit == kRemove || edit == kReplace) {
-        hunk.PushLine(edit == kMatch ? ' ' : '-', left[l_i].c_str());
-      }
-      if (edit == kAdd || edit == kReplace) {
-        hunk.PushLine('+', right[r_i].c_str());
-      }
-
-      // Advance indices, depending on edit type.
-      l_i += edit != kAdd;
-      r_i += edit != kRemove;
-    }
-
-    if (!hunk.has_edits()) {
-      // We are done. We don't want this hunk.
-      break;
-    }
-
-    hunk.PrintTo(&ss);
-  }
-  return ss.str();
-}
-
-}  // namespace edit_distance
-
-namespace {
-
-// The string representation of the values received in EqFailure() are already
-// escaped. Split them on escaped '\n' boundaries. Leave all other escaped
-// characters the same.
-std::vector<std::string> SplitEscapedString(const std::string& str) {
-  std::vector<std::string> lines;
-  size_t start = 0, end = str.size();
-  if (end > 2 && str[0] == '"' && str[end - 1] == '"') {
-    ++start;
-    --end;
-  }
-  bool escaped = false;
-  for (size_t i = start; i + 1 < end; ++i) {
-    if (escaped) {
-      escaped = false;
-      if (str[i] == 'n') {
-        lines.push_back(str.substr(start, i - start - 1));
-        start = i + 1;
-      }
-    } else {
-      escaped = str[i] == '\\';
-    }
-  }
-  lines.push_back(str.substr(start, end - start));
-  return lines;
-}
-
-}  // namespace
-
-// Constructs and returns the message for an equality assertion
-// (e.g. ASSERT_EQ, EXPECT_STREQ, etc) failure.
-//
-// The first four parameters are the expressions used in the assertion
-// and their values, as strings.  For example, for ASSERT_EQ(foo, bar)
-// where foo is 5 and bar is 6, we have:
-//
-//   lhs_expression: "foo"
-//   rhs_expression: "bar"
-//   lhs_value:      "5"
-//   rhs_value:      "6"
-//
-// The ignoring_case parameter is true if and only if the assertion is a
-// *_STRCASEEQ*.  When it's true, the string "Ignoring case" will
-// be inserted into the message.
-AssertionResult EqFailure(const char* lhs_expression,
-                          const char* rhs_expression,
-                          const std::string& lhs_value,
-                          const std::string& rhs_value,
-                          bool ignoring_case) {
-  Message msg;
-  msg << "Expected equality of these values:";
-  msg << "\n  " << lhs_expression;
-  if (lhs_value != lhs_expression) {
-    msg << "\n    Which is: " << lhs_value;
-  }
-  msg << "\n  " << rhs_expression;
-  if (rhs_value != rhs_expression) {
-    msg << "\n    Which is: " << rhs_value;
-  }
-
-  if (ignoring_case) {
-    msg << "\nIgnoring case";
-  }
-
-  if (!lhs_value.empty() && !rhs_value.empty()) {
-    const std::vector<std::string> lhs_lines =
-        SplitEscapedString(lhs_value);
-    const std::vector<std::string> rhs_lines =
-        SplitEscapedString(rhs_value);
-    if (lhs_lines.size() > 1 || rhs_lines.size() > 1) {
-      msg << "\nWith diff:\n"
-          << edit_distance::CreateUnifiedDiff(lhs_lines, rhs_lines);
-    }
-  }
-
-  return AssertionFailure() << msg;
-}
-
-// Constructs a failure message for Boolean assertions such as EXPECT_TRUE.
-std::string GetBoolAssertionFailureMessage(
-    const AssertionResult& assertion_result,
-    const char* expression_text,
-    const char* actual_predicate_value,
-    const char* expected_predicate_value) {
-  const char* actual_message = assertion_result.message();
-  Message msg;
-  msg << "Value of: " << expression_text
-      << "\n  Actual: " << actual_predicate_value;
-  if (actual_message[0] != '\0')
-    msg << " (" << actual_message << ")";
-  msg << "\nExpected: " << expected_predicate_value;
-  return msg.GetString();
-}
-
-// Helper function for implementing ASSERT_NEAR.
-AssertionResult DoubleNearPredFormat(const char* expr1,
-                                     const char* expr2,
-                                     const char* abs_error_expr,
-                                     double val1,
-                                     double val2,
-                                     double abs_error) {
-  const double diff = fabs(val1 - val2);
-  if (diff <= abs_error) return AssertionSuccess();
-
-  return AssertionFailure()
-      << "The difference between " << expr1 << " and " << expr2
-      << " is " << diff << ", which exceeds " << abs_error_expr << ", where\n"
-      << expr1 << " evaluates to " << val1 << ",\n"
-      << expr2 << " evaluates to " << val2 << ", and\n"
-      << abs_error_expr << " evaluates to " << abs_error << ".";
-}
-
-
-// Helper template for implementing FloatLE() and DoubleLE().
-template <typename RawType>
-AssertionResult FloatingPointLE(const char* expr1,
-                                const char* expr2,
-                                RawType val1,
-                                RawType val2) {
-  // Returns success if val1 is less than val2,
-  if (val1 < val2) {
-    return AssertionSuccess();
-  }
-
-  // or if val1 is almost equal to val2.
-  const FloatingPoint<RawType> lhs(val1), rhs(val2);
-  if (lhs.AlmostEquals(rhs)) {
-    return AssertionSuccess();
-  }
-
-  // Note that the above two checks will both fail if either val1 or
-  // val2 is NaN, as the IEEE floating-point standard requires that
-  // any predicate involving a NaN must return false.
-
-  ::std::stringstream val1_ss;
-  val1_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
-          << val1;
-
-  ::std::stringstream val2_ss;
-  val2_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
-          << val2;
-
-  return AssertionFailure()
-      << "Expected: (" << expr1 << ") <= (" << expr2 << ")\n"
-      << "  Actual: " << StringStreamToString(&val1_ss) << " vs "
-      << StringStreamToString(&val2_ss);
-}
-
-}  // namespace internal
-
-// Asserts that val1 is less than, or almost equal to, val2.  Fails
-// otherwise.  In particular, it fails if either val1 or val2 is NaN.
-AssertionResult FloatLE(const char* expr1, const char* expr2,
-                        float val1, float val2) {
-  return internal::FloatingPointLE<float>(expr1, expr2, val1, val2);
-}
-
-// Asserts that val1 is less than, or almost equal to, val2.  Fails
-// otherwise.  In particular, it fails if either val1 or val2 is NaN.
-AssertionResult DoubleLE(const char* expr1, const char* expr2,
-                         double val1, double val2) {
-  return internal::FloatingPointLE<double>(expr1, expr2, val1, val2);
-}
-
-namespace internal {
-
-// The helper function for {ASSERT|EXPECT}_EQ with int or enum
-// arguments.
-AssertionResult CmpHelperEQ(const char* lhs_expression,
-                            const char* rhs_expression,
-                            BiggestInt lhs,
-                            BiggestInt rhs) {
-  if (lhs == rhs) {
-    return AssertionSuccess();
-  }
-
-  return EqFailure(lhs_expression,
-                   rhs_expression,
-                   FormatForComparisonFailureMessage(lhs, rhs),
-                   FormatForComparisonFailureMessage(rhs, lhs),
-                   false);
-}
-
-// A macro for implementing the helper functions needed to implement
-// ASSERT_?? and EXPECT_?? with integer or enum arguments.  It is here
-// just to avoid copy-and-paste of similar code.
-#define GTEST_IMPL_CMP_HELPER_(op_name, op)\
-AssertionResult CmpHelper##op_name(const char* expr1, const char* expr2, \
-                                   BiggestInt val1, BiggestInt val2) {\
-  if (val1 op val2) {\
-    return AssertionSuccess();\
-  } else {\
-    return AssertionFailure() \
-        << "Expected: (" << expr1 << ") " #op " (" << expr2\
-        << "), actual: " << FormatForComparisonFailureMessage(val1, val2)\
-        << " vs " << FormatForComparisonFailureMessage(val2, val1);\
-  }\
-}
-
-// Implements the helper function for {ASSERT|EXPECT}_NE with int or
-// enum arguments.
-GTEST_IMPL_CMP_HELPER_(NE, !=)
-// Implements the helper function for {ASSERT|EXPECT}_LE with int or
-// enum arguments.
-GTEST_IMPL_CMP_HELPER_(LE, <=)
-// Implements the helper function for {ASSERT|EXPECT}_LT with int or
-// enum arguments.
-GTEST_IMPL_CMP_HELPER_(LT, < )
-// Implements the helper function for {ASSERT|EXPECT}_GE with int or
-// enum arguments.
-GTEST_IMPL_CMP_HELPER_(GE, >=)
-// Implements the helper function for {ASSERT|EXPECT}_GT with int or
-// enum arguments.
-GTEST_IMPL_CMP_HELPER_(GT, > )
-
-#undef GTEST_IMPL_CMP_HELPER_
-
-// The helper function for {ASSERT|EXPECT}_STREQ.
-AssertionResult CmpHelperSTREQ(const char* lhs_expression,
-                               const char* rhs_expression,
-                               const char* lhs,
-                               const char* rhs) {
-  if (String::CStringEquals(lhs, rhs)) {
-    return AssertionSuccess();
-  }
-
-  return EqFailure(lhs_expression,
-                   rhs_expression,
-                   PrintToString(lhs),
-                   PrintToString(rhs),
-                   false);
-}
-
-// The helper function for {ASSERT|EXPECT}_STRCASEEQ.
-AssertionResult CmpHelperSTRCASEEQ(const char* lhs_expression,
-                                   const char* rhs_expression,
-                                   const char* lhs,
-                                   const char* rhs) {
-  if (String::CaseInsensitiveCStringEquals(lhs, rhs)) {
-    return AssertionSuccess();
-  }
-
-  return EqFailure(lhs_expression,
-                   rhs_expression,
-                   PrintToString(lhs),
-                   PrintToString(rhs),
-                   true);
-}
-
-// The helper function for {ASSERT|EXPECT}_STRNE.
-AssertionResult CmpHelperSTRNE(const char* s1_expression,
-                               const char* s2_expression,
-                               const char* s1,
-                               const char* s2) {
-  if (!String::CStringEquals(s1, s2)) {
-    return AssertionSuccess();
-  } else {
-    return AssertionFailure() << "Expected: (" << s1_expression << ") != ("
-                              << s2_expression << "), actual: \""
-                              << s1 << "\" vs \"" << s2 << "\"";
-  }
-}
-
-// The helper function for {ASSERT|EXPECT}_STRCASENE.
-AssertionResult CmpHelperSTRCASENE(const char* s1_expression,
-                                   const char* s2_expression,
-                                   const char* s1,
-                                   const char* s2) {
-  if (!String::CaseInsensitiveCStringEquals(s1, s2)) {
-    return AssertionSuccess();
-  } else {
-    return AssertionFailure()
-        << "Expected: (" << s1_expression << ") != ("
-        << s2_expression << ") (ignoring case), actual: \""
-        << s1 << "\" vs \"" << s2 << "\"";
-  }
-}
-
-}  // namespace internal
-
-namespace {
-
-// Helper functions for implementing IsSubString() and IsNotSubstring().
-
-// This group of overloaded functions return true if and only if needle
-// is a substring of haystack.  NULL is considered a substring of
-// itself only.
-
-bool IsSubstringPred(const char* needle, const char* haystack) {
-  if (needle == nullptr || haystack == nullptr) return needle == haystack;
-
-  return strstr(haystack, needle) != nullptr;
-}
-
-bool IsSubstringPred(const wchar_t* needle, const wchar_t* haystack) {
-  if (needle == nullptr || haystack == nullptr) return needle == haystack;
-
-  return wcsstr(haystack, needle) != nullptr;
-}
-
-// StringType here can be either ::std::string or ::std::wstring.
-template <typename StringType>
-bool IsSubstringPred(const StringType& needle,
-                     const StringType& haystack) {
-  return haystack.find(needle) != StringType::npos;
-}
-
-// This function implements either IsSubstring() or IsNotSubstring(),
-// depending on the value of the expected_to_be_substring parameter.
-// StringType here can be const char*, const wchar_t*, ::std::string,
-// or ::std::wstring.
-template <typename StringType>
-AssertionResult IsSubstringImpl(
-    bool expected_to_be_substring,
-    const char* needle_expr, const char* haystack_expr,
-    const StringType& needle, const StringType& haystack) {
-  if (IsSubstringPred(needle, haystack) == expected_to_be_substring)
-    return AssertionSuccess();
-
-  const bool is_wide_string = sizeof(needle[0]) > 1;
-  const char* const begin_string_quote = is_wide_string ? "L\"" : "\"";
-  return AssertionFailure()
-      << "Value of: " << needle_expr << "\n"
-      << "  Actual: " << begin_string_quote << needle << "\"\n"
-      << "Expected: " << (expected_to_be_substring ? "" : "not ")
-      << "a substring of " << haystack_expr << "\n"
-      << "Which is: " << begin_string_quote << haystack << "\"";
-}
-
-}  // namespace
-
-// IsSubstring() and IsNotSubstring() check whether needle is a
-// substring of haystack (NULL is considered a substring of itself
-// only), and return an appropriate error message when they fail.
-
-AssertionResult IsSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const char* needle, const char* haystack) {
-  return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack);
-}
-
-AssertionResult IsSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const wchar_t* needle, const wchar_t* haystack) {
-  return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack);
-}
-
-AssertionResult IsNotSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const char* needle, const char* haystack) {
-  return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack);
-}
-
-AssertionResult IsNotSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const wchar_t* needle, const wchar_t* haystack) {
-  return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack);
-}
-
-AssertionResult IsSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const ::std::string& needle, const ::std::string& haystack) {
-  return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack);
-}
-
-AssertionResult IsNotSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const ::std::string& needle, const ::std::string& haystack) {
-  return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack);
-}
-
-#if GTEST_HAS_STD_WSTRING
-AssertionResult IsSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const ::std::wstring& needle, const ::std::wstring& haystack) {
-  return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack);
-}
-
-AssertionResult IsNotSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const ::std::wstring& needle, const ::std::wstring& haystack) {
-  return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack);
-}
-#endif  // GTEST_HAS_STD_WSTRING
-
-namespace internal {
-
-#if GTEST_OS_WINDOWS
-
-namespace {
-
-// Helper function for IsHRESULT{SuccessFailure} predicates
-AssertionResult HRESULTFailureHelper(const char* expr,
-                                     const char* expected,
-                                     long hr) {  // NOLINT
-# if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_TV_TITLE
-
-  // Windows CE doesn't support FormatMessage.
-  const char error_text[] = "";
-
-# else
-
-  // Looks up the human-readable system message for the HRESULT code
-  // and since we're not passing any params to FormatMessage, we don't
-  // want inserts expanded.
-  const DWORD kFlags = FORMAT_MESSAGE_FROM_SYSTEM |
-                       FORMAT_MESSAGE_IGNORE_INSERTS;
-  const DWORD kBufSize = 4096;
-  // Gets the system's human readable message string for this HRESULT.
-  char error_text[kBufSize] = { '\0' };
-  DWORD message_length = ::FormatMessageA(kFlags,
-                                          0,   // no source, we're asking system
-                                          static_cast<DWORD>(hr),  // the error
-                                          0,   // no line width restrictions
-                                          error_text,  // output buffer
-                                          kBufSize,    // buf size
-                                          nullptr);  // no arguments for inserts
-  // Trims tailing white space (FormatMessage leaves a trailing CR-LF)
-  for (; message_length && IsSpace(error_text[message_length - 1]);
-          --message_length) {
-    error_text[message_length - 1] = '\0';
-  }
-
-# endif  // GTEST_OS_WINDOWS_MOBILE
-
-  const std::string error_hex("0x" + String::FormatHexInt(hr));
-  return ::testing::AssertionFailure()
-      << "Expected: " << expr << " " << expected << ".\n"
-      << "  Actual: " << error_hex << " " << error_text << "\n";
-}
-
-}  // namespace
-
-AssertionResult IsHRESULTSuccess(const char* expr, long hr) {  // NOLINT
-  if (SUCCEEDED(hr)) {
-    return AssertionSuccess();
-  }
-  return HRESULTFailureHelper(expr, "succeeds", hr);
-}
-
-AssertionResult IsHRESULTFailure(const char* expr, long hr) {  // NOLINT
-  if (FAILED(hr)) {
-    return AssertionSuccess();
-  }
-  return HRESULTFailureHelper(expr, "fails", hr);
-}
-
-#endif  // GTEST_OS_WINDOWS
-
-// Utility functions for encoding Unicode text (wide strings) in
-// UTF-8.
-
-// A Unicode code-point can have up to 21 bits, and is encoded in UTF-8
-// like this:
-//
-// Code-point length   Encoding
-//   0 -  7 bits       0xxxxxxx
-//   8 - 11 bits       110xxxxx 10xxxxxx
-//  12 - 16 bits       1110xxxx 10xxxxxx 10xxxxxx
-//  17 - 21 bits       11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-
-// The maximum code-point a one-byte UTF-8 sequence can represent.
-const UInt32 kMaxCodePoint1 = (static_cast<UInt32>(1) <<  7) - 1;
-
-// The maximum code-point a two-byte UTF-8 sequence can represent.
-const UInt32 kMaxCodePoint2 = (static_cast<UInt32>(1) << (5 + 6)) - 1;
-
-// The maximum code-point a three-byte UTF-8 sequence can represent.
-const UInt32 kMaxCodePoint3 = (static_cast<UInt32>(1) << (4 + 2*6)) - 1;
-
-// The maximum code-point a four-byte UTF-8 sequence can represent.
-const UInt32 kMaxCodePoint4 = (static_cast<UInt32>(1) << (3 + 3*6)) - 1;
-
-// Chops off the n lowest bits from a bit pattern.  Returns the n
-// lowest bits.  As a side effect, the original bit pattern will be
-// shifted to the right by n bits.
-inline UInt32 ChopLowBits(UInt32* bits, int n) {
-  const UInt32 low_bits = *bits & ((static_cast<UInt32>(1) << n) - 1);
-  *bits >>= n;
-  return low_bits;
-}
-
-// Converts a Unicode code point to a narrow string in UTF-8 encoding.
-// code_point parameter is of type UInt32 because wchar_t may not be
-// wide enough to contain a code point.
-// If the code_point is not a valid Unicode code point
-// (i.e. outside of Unicode range U+0 to U+10FFFF) it will be converted
-// to "(Invalid Unicode 0xXXXXXXXX)".
-std::string CodePointToUtf8(UInt32 code_point) {
-  if (code_point > kMaxCodePoint4) {
-    return "(Invalid Unicode 0x" + String::FormatHexUInt32(code_point) + ")";
-  }
-
-  char str[5];  // Big enough for the largest valid code point.
-  if (code_point <= kMaxCodePoint1) {
-    str[1] = '\0';
-    str[0] = static_cast<char>(code_point);                          // 0xxxxxxx
-  } else if (code_point <= kMaxCodePoint2) {
-    str[2] = '\0';
-    str[1] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
-    str[0] = static_cast<char>(0xC0 | code_point);                   // 110xxxxx
-  } else if (code_point <= kMaxCodePoint3) {
-    str[3] = '\0';
-    str[2] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
-    str[1] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
-    str[0] = static_cast<char>(0xE0 | code_point);                   // 1110xxxx
-  } else {  // code_point <= kMaxCodePoint4
-    str[4] = '\0';
-    str[3] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
-    str[2] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
-    str[1] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
-    str[0] = static_cast<char>(0xF0 | code_point);                   // 11110xxx
-  }
-  return str;
-}
-
-// The following two functions only make sense if the system
-// uses UTF-16 for wide string encoding. All supported systems
-// with 16 bit wchar_t (Windows, Cygwin) do use UTF-16.
-
-// Determines if the arguments constitute UTF-16 surrogate pair
-// and thus should be combined into a single Unicode code point
-// using CreateCodePointFromUtf16SurrogatePair.
-inline bool IsUtf16SurrogatePair(wchar_t first, wchar_t second) {
-  return sizeof(wchar_t) == 2 &&
-      (first & 0xFC00) == 0xD800 && (second & 0xFC00) == 0xDC00;
-}
-
-// Creates a Unicode code point from UTF16 surrogate pair.
-inline UInt32 CreateCodePointFromUtf16SurrogatePair(wchar_t first,
-                                                    wchar_t second) {
-  const auto first_u = static_cast<UInt32>(first);
-  const auto second_u = static_cast<UInt32>(second);
-  const UInt32 mask = (1 << 10) - 1;
-  return (sizeof(wchar_t) == 2)
-             ? (((first_u & mask) << 10) | (second_u & mask)) + 0x10000
-             :
-             // This function should not be called when the condition is
-             // false, but we provide a sensible default in case it is.
-             first_u;
-}
-
-// Converts a wide string to a narrow string in UTF-8 encoding.
-// The wide string is assumed to have the following encoding:
-//   UTF-16 if sizeof(wchar_t) == 2 (on Windows, Cygwin)
-//   UTF-32 if sizeof(wchar_t) == 4 (on Linux)
-// Parameter str points to a null-terminated wide string.
-// Parameter num_chars may additionally limit the number
-// of wchar_t characters processed. -1 is used when the entire string
-// should be processed.
-// If the string contains code points that are not valid Unicode code points
-// (i.e. outside of Unicode range U+0 to U+10FFFF) they will be output
-// as '(Invalid Unicode 0xXXXXXXXX)'. If the string is in UTF16 encoding
-// and contains invalid UTF-16 surrogate pairs, values in those pairs
-// will be encoded as individual Unicode characters from Basic Normal Plane.
-std::string WideStringToUtf8(const wchar_t* str, int num_chars) {
-  if (num_chars == -1)
-    num_chars = static_cast<int>(wcslen(str));
-
-  ::std::stringstream stream;
-  for (int i = 0; i < num_chars; ++i) {
-    UInt32 unicode_code_point;
-
-    if (str[i] == L'\0') {
-      break;
-    } else if (i + 1 < num_chars && IsUtf16SurrogatePair(str[i], str[i + 1])) {
-      unicode_code_point = CreateCodePointFromUtf16SurrogatePair(str[i],
-                                                                 str[i + 1]);
-      i++;
-    } else {
-      unicode_code_point = static_cast<UInt32>(str[i]);
-    }
-
-    stream << CodePointToUtf8(unicode_code_point);
-  }
-  return StringStreamToString(&stream);
-}
-
-// Converts a wide C string to an std::string using the UTF-8 encoding.
-// NULL will be converted to "(null)".
-std::string String::ShowWideCString(const wchar_t * wide_c_str) {
-  if (wide_c_str == nullptr) return "(null)";
-
-  return internal::WideStringToUtf8(wide_c_str, -1);
-}
-
-// Compares two wide C strings.  Returns true if and only if they have the
-// same content.
-//
-// Unlike wcscmp(), this function can handle NULL argument(s).  A NULL
-// C string is considered different to any non-NULL C string,
-// including the empty string.
-bool String::WideCStringEquals(const wchar_t * lhs, const wchar_t * rhs) {
-  if (lhs == nullptr) return rhs == nullptr;
-
-  if (rhs == nullptr) return false;
-
-  return wcscmp(lhs, rhs) == 0;
-}
-
-// Helper function for *_STREQ on wide strings.
-AssertionResult CmpHelperSTREQ(const char* lhs_expression,
-                               const char* rhs_expression,
-                               const wchar_t* lhs,
-                               const wchar_t* rhs) {
-  if (String::WideCStringEquals(lhs, rhs)) {
-    return AssertionSuccess();
-  }
-
-  return EqFailure(lhs_expression,
-                   rhs_expression,
-                   PrintToString(lhs),
-                   PrintToString(rhs),
-                   false);
-}
-
-// Helper function for *_STRNE on wide strings.
-AssertionResult CmpHelperSTRNE(const char* s1_expression,
-                               const char* s2_expression,
-                               const wchar_t* s1,
-                               const wchar_t* s2) {
-  if (!String::WideCStringEquals(s1, s2)) {
-    return AssertionSuccess();
-  }
-
-  return AssertionFailure() << "Expected: (" << s1_expression << ") != ("
-                            << s2_expression << "), actual: "
-                            << PrintToString(s1)
-                            << " vs " << PrintToString(s2);
-}
-
-// Compares two C strings, ignoring case.  Returns true if and only if they have
-// the same content.
-//
-// Unlike strcasecmp(), this function can handle NULL argument(s).  A
-// NULL C string is considered different to any non-NULL C string,
-// including the empty string.
-bool String::CaseInsensitiveCStringEquals(const char * lhs, const char * rhs) {
-  if (lhs == nullptr) return rhs == nullptr;
-  if (rhs == nullptr) return false;
-  return posix::StrCaseCmp(lhs, rhs) == 0;
-}
-
-// Compares two wide C strings, ignoring case.  Returns true if and only if they
-// have the same content.
-//
-// Unlike wcscasecmp(), this function can handle NULL argument(s).
-// A NULL C string is considered different to any non-NULL wide C string,
-// including the empty string.
-// NB: The implementations on different platforms slightly differ.
-// On windows, this method uses _wcsicmp which compares according to LC_CTYPE
-// environment variable. On GNU platform this method uses wcscasecmp
-// which compares according to LC_CTYPE category of the current locale.
-// On MacOS X, it uses towlower, which also uses LC_CTYPE category of the
-// current locale.
-bool String::CaseInsensitiveWideCStringEquals(const wchar_t* lhs,
-                                              const wchar_t* rhs) {
-  if (lhs == nullptr) return rhs == nullptr;
-
-  if (rhs == nullptr) return false;
-
-#if GTEST_OS_WINDOWS
-  return _wcsicmp(lhs, rhs) == 0;
-#elif GTEST_OS_LINUX && !GTEST_OS_LINUX_ANDROID
-  return wcscasecmp(lhs, rhs) == 0;
-#else
-  // Android, Mac OS X and Cygwin don't define wcscasecmp.
-  // Other unknown OSes may not define it either.
-  wint_t left, right;
-  do {
-    left = towlower(static_cast<wint_t>(*lhs++));
-    right = towlower(static_cast<wint_t>(*rhs++));
-  } while (left && left == right);
-  return left == right;
-#endif  // OS selector
-}
-
-// Returns true if and only if str ends with the given suffix, ignoring case.
-// Any string is considered to end with an empty suffix.
-bool String::EndsWithCaseInsensitive(
-    const std::string& str, const std::string& suffix) {
-  const size_t str_len = str.length();
-  const size_t suffix_len = suffix.length();
-  return (str_len >= suffix_len) &&
-         CaseInsensitiveCStringEquals(str.c_str() + str_len - suffix_len,
-                                      suffix.c_str());
-}
-
-// Formats an int value as "%02d".
-std::string String::FormatIntWidth2(int value) {
-  std::stringstream ss;
-  ss << std::setfill('0') << std::setw(2) << value;
-  return ss.str();
-}
-
-// Formats an int value as "%X".
-std::string String::FormatHexUInt32(UInt32 value) {
-  std::stringstream ss;
-  ss << std::hex << std::uppercase << value;
-  return ss.str();
-}
-
-// Formats an int value as "%X".
-std::string String::FormatHexInt(int value) {
-  return FormatHexUInt32(static_cast<UInt32>(value));
-}
-
-// Formats a byte as "%02X".
-std::string String::FormatByte(unsigned char value) {
-  std::stringstream ss;
-  ss << std::setfill('0') << std::setw(2) << std::hex << std::uppercase
-     << static_cast<unsigned int>(value);
-  return ss.str();
-}
-
-// Converts the buffer in a stringstream to an std::string, converting NUL
-// bytes to "\\0" along the way.
-std::string StringStreamToString(::std::stringstream* ss) {
-  const ::std::string& str = ss->str();
-  const char* const start = str.c_str();
-  const char* const end = start + str.length();
-
-  std::string result;
-  result.reserve(static_cast<size_t>(2 * (end - start)));
-  for (const char* ch = start; ch != end; ++ch) {
-    if (*ch == '\0') {
-      result += "\\0";  // Replaces NUL with "\\0";
-    } else {
-      result += *ch;
-    }
-  }
-
-  return result;
-}
-
-// Appends the user-supplied message to the Google-Test-generated message.
-std::string AppendUserMessage(const std::string& gtest_msg,
-                              const Message& user_msg) {
-  // Appends the user message if it's non-empty.
-  const std::string user_msg_string = user_msg.GetString();
-  if (user_msg_string.empty()) {
-    return gtest_msg;
-  }
-
-  return gtest_msg + "\n" + user_msg_string;
-}
-
-}  // namespace internal
-
-// class TestResult
-
-// Creates an empty TestResult.
-TestResult::TestResult()
-    : death_test_count_(0), start_timestamp_(0), elapsed_time_(0) {}
-
-// D'tor.
-TestResult::~TestResult() {
-}
-
-// Returns the i-th test part result among all the results. i can
-// range from 0 to total_part_count() - 1. If i is not in that range,
-// aborts the program.
-const TestPartResult& TestResult::GetTestPartResult(int i) const {
-  if (i < 0 || i >= total_part_count())
-    internal::posix::Abort();
-  return test_part_results_.at(static_cast<size_t>(i));
-}
-
-// Returns the i-th test property. i can range from 0 to
-// test_property_count() - 1. If i is not in that range, aborts the
-// program.
-const TestProperty& TestResult::GetTestProperty(int i) const {
-  if (i < 0 || i >= test_property_count())
-    internal::posix::Abort();
-  return test_properties_.at(static_cast<size_t>(i));
-}
-
-// Clears the test part results.
-void TestResult::ClearTestPartResults() {
-  test_part_results_.clear();
-}
-
-// Adds a test part result to the list.
-void TestResult::AddTestPartResult(const TestPartResult& test_part_result) {
-  test_part_results_.push_back(test_part_result);
-}
-
-// Adds a test property to the list. If a property with the same key as the
-// supplied property is already represented, the value of this test_property
-// replaces the old value for that key.
-void TestResult::RecordProperty(const std::string& xml_element,
-                                const TestProperty& test_property) {
-  if (!ValidateTestProperty(xml_element, test_property)) {
-    return;
-  }
-  internal::MutexLock lock(&test_properites_mutex_);
-  const std::vector<TestProperty>::iterator property_with_matching_key =
-      std::find_if(test_properties_.begin(), test_properties_.end(),
-                   internal::TestPropertyKeyIs(test_property.key()));
-  if (property_with_matching_key == test_properties_.end()) {
-    test_properties_.push_back(test_property);
-    return;
-  }
-  property_with_matching_key->SetValue(test_property.value());
-}
-
-// The list of reserved attributes used in the <testsuites> element of XML
-// output.
-static const char* const kReservedTestSuitesAttributes[] = {
-  "disabled",
-  "errors",
-  "failures",
-  "name",
-  "random_seed",
-  "tests",
-  "time",
-  "timestamp"
-};
-
-// The list of reserved attributes used in the <testsuite> element of XML
-// output.
-static const char* const kReservedTestSuiteAttributes[] = {
-    "disabled", "errors", "failures", "name", "tests", "time", "timestamp"};
-
-// The list of reserved attributes used in the <testcase> element of XML output.
-static const char* const kReservedTestCaseAttributes[] = {
-    "classname",   "name", "status", "time",  "type_param",
-    "value_param", "file", "line"};
-
-// Use a slightly different set for allowed output to ensure existing tests can
-// still RecordProperty("result") or "RecordProperty(timestamp")
-static const char* const kReservedOutputTestCaseAttributes[] = {
-    "classname",   "name", "status", "time",   "type_param",
-    "value_param", "file", "line",   "result", "timestamp"};
-
-template <int kSize>
-std::vector<std::string> ArrayAsVector(const char* const (&array)[kSize]) {
-  return std::vector<std::string>(array, array + kSize);
-}
-
-static std::vector<std::string> GetReservedAttributesForElement(
-    const std::string& xml_element) {
-  if (xml_element == "testsuites") {
-    return ArrayAsVector(kReservedTestSuitesAttributes);
-  } else if (xml_element == "testsuite") {
-    return ArrayAsVector(kReservedTestSuiteAttributes);
-  } else if (xml_element == "testcase") {
-    return ArrayAsVector(kReservedTestCaseAttributes);
-  } else {
-    GTEST_CHECK_(false) << "Unrecognized xml_element provided: " << xml_element;
-  }
-  // This code is unreachable but some compilers may not realizes that.
-  return std::vector<std::string>();
-}
-
-// TODO(jdesprez): Merge the two getReserved attributes once skip is improved
-static std::vector<std::string> GetReservedOutputAttributesForElement(
-    const std::string& xml_element) {
-  if (xml_element == "testsuites") {
-    return ArrayAsVector(kReservedTestSuitesAttributes);
-  } else if (xml_element == "testsuite") {
-    return ArrayAsVector(kReservedTestSuiteAttributes);
-  } else if (xml_element == "testcase") {
-    return ArrayAsVector(kReservedOutputTestCaseAttributes);
-  } else {
-    GTEST_CHECK_(false) << "Unrecognized xml_element provided: " << xml_element;
-  }
-  // This code is unreachable but some compilers may not realizes that.
-  return std::vector<std::string>();
-}
-
-static std::string FormatWordList(const std::vector<std::string>& words) {
-  Message word_list;
-  for (size_t i = 0; i < words.size(); ++i) {
-    if (i > 0 && words.size() > 2) {
-      word_list << ", ";
-    }
-    if (i == words.size() - 1) {
-      word_list << "and ";
-    }
-    word_list << "'" << words[i] << "'";
-  }
-  return word_list.GetString();
-}
-
-static bool ValidateTestPropertyName(
-    const std::string& property_name,
-    const std::vector<std::string>& reserved_names) {
-  if (std::find(reserved_names.begin(), reserved_names.end(), property_name) !=
-          reserved_names.end()) {
-    ADD_FAILURE() << "Reserved key used in RecordProperty(): " << property_name
-                  << " (" << FormatWordList(reserved_names)
-                  << " are reserved by " << GTEST_NAME_ << ")";
-    return false;
-  }
-  return true;
-}
-
-// Adds a failure if the key is a reserved attribute of the element named
-// xml_element.  Returns true if the property is valid.
-bool TestResult::ValidateTestProperty(const std::string& xml_element,
-                                      const TestProperty& test_property) {
-  return ValidateTestPropertyName(test_property.key(),
-                                  GetReservedAttributesForElement(xml_element));
-}
-
-// Clears the object.
-void TestResult::Clear() {
-  test_part_results_.clear();
-  test_properties_.clear();
-  death_test_count_ = 0;
-  elapsed_time_ = 0;
-}
-
-// Returns true off the test part was skipped.
-static bool TestPartSkipped(const TestPartResult& result) {
-  return result.skipped();
-}
-
-// Returns true if and only if the test was skipped.
-bool TestResult::Skipped() const {
-  return !Failed() && CountIf(test_part_results_, TestPartSkipped) > 0;
-}
-
-// Returns true if and only if the test failed.
-bool TestResult::Failed() const {
-  for (int i = 0; i < total_part_count(); ++i) {
-    if (GetTestPartResult(i).failed())
-      return true;
-  }
-  return false;
-}
-
-// Returns true if and only if the test part fatally failed.
-static bool TestPartFatallyFailed(const TestPartResult& result) {
-  return result.fatally_failed();
-}
-
-// Returns true if and only if the test fatally failed.
-bool TestResult::HasFatalFailure() const {
-  return CountIf(test_part_results_, TestPartFatallyFailed) > 0;
-}
-
-// Returns true if and only if the test part non-fatally failed.
-static bool TestPartNonfatallyFailed(const TestPartResult& result) {
-  return result.nonfatally_failed();
-}
-
-// Returns true if and only if the test has a non-fatal failure.
-bool TestResult::HasNonfatalFailure() const {
-  return CountIf(test_part_results_, TestPartNonfatallyFailed) > 0;
-}
-
-// Gets the number of all test parts.  This is the sum of the number
-// of successful test parts and the number of failed test parts.
-int TestResult::total_part_count() const {
-  return static_cast<int>(test_part_results_.size());
-}
-
-// Returns the number of the test properties.
-int TestResult::test_property_count() const {
-  return static_cast<int>(test_properties_.size());
-}
-
-// class Test
-
-// Creates a Test object.
-
-// The c'tor saves the states of all flags.
-Test::Test()
-    : gtest_flag_saver_(new GTEST_FLAG_SAVER_) {
-}
-
-// The d'tor restores the states of all flags.  The actual work is
-// done by the d'tor of the gtest_flag_saver_ field, and thus not
-// visible here.
-Test::~Test() {
-}
-
-// Sets up the test fixture.
-//
-// A sub-class may override this.
-void Test::SetUp() {
-}
-
-// Tears down the test fixture.
-//
-// A sub-class may override this.
-void Test::TearDown() {
-}
-
-// Allows user supplied key value pairs to be recorded for later output.
-void Test::RecordProperty(const std::string& key, const std::string& value) {
-  UnitTest::GetInstance()->RecordProperty(key, value);
-}
-
-// Allows user supplied key value pairs to be recorded for later output.
-void Test::RecordProperty(const std::string& key, int value) {
-  Message value_message;
-  value_message << value;
-  RecordProperty(key, value_message.GetString().c_str());
-}
-
-namespace internal {
-
-void ReportFailureInUnknownLocation(TestPartResult::Type result_type,
-                                    const std::string& message) {
-  // This function is a friend of UnitTest and as such has access to
-  // AddTestPartResult.
-  UnitTest::GetInstance()->AddTestPartResult(
-      result_type,
-      nullptr,  // No info about the source file where the exception occurred.
-      -1,       // We have no info on which line caused the exception.
-      message,
-      "");  // No stack trace, either.
-}
-
-}  // namespace internal
-
-// Google Test requires all tests in the same test suite to use the same test
-// fixture class.  This function checks if the current test has the
-// same fixture class as the first test in the current test suite.  If
-// yes, it returns true; otherwise it generates a Google Test failure and
-// returns false.
-bool Test::HasSameFixtureClass() {
-  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
-  const TestSuite* const test_suite = impl->current_test_suite();
-
-  // Info about the first test in the current test suite.
-  const TestInfo* const first_test_info = test_suite->test_info_list()[0];
-  const internal::TypeId first_fixture_id = first_test_info->fixture_class_id_;
-  const char* const first_test_name = first_test_info->name();
-
-  // Info about the current test.
-  const TestInfo* const this_test_info = impl->current_test_info();
-  const internal::TypeId this_fixture_id = this_test_info->fixture_class_id_;
-  const char* const this_test_name = this_test_info->name();
-
-  if (this_fixture_id != first_fixture_id) {
-    // Is the first test defined using TEST?
-    const bool first_is_TEST = first_fixture_id == internal::GetTestTypeId();
-    // Is this test defined using TEST?
-    const bool this_is_TEST = this_fixture_id == internal::GetTestTypeId();
-
-    if (first_is_TEST || this_is_TEST) {
-      // Both TEST and TEST_F appear in same test suite, which is incorrect.
-      // Tell the user how to fix this.
-
-      // Gets the name of the TEST and the name of the TEST_F.  Note
-      // that first_is_TEST and this_is_TEST cannot both be true, as
-      // the fixture IDs are different for the two tests.
-      const char* const TEST_name =
-          first_is_TEST ? first_test_name : this_test_name;
-      const char* const TEST_F_name =
-          first_is_TEST ? this_test_name : first_test_name;
-
-      ADD_FAILURE()
-          << "All tests in the same test suite must use the same test fixture\n"
-          << "class, so mixing TEST_F and TEST in the same test suite is\n"
-          << "illegal.  In test suite " << this_test_info->test_suite_name()
-          << ",\n"
-          << "test " << TEST_F_name << " is defined using TEST_F but\n"
-          << "test " << TEST_name << " is defined using TEST.  You probably\n"
-          << "want to change the TEST to TEST_F or move it to another test\n"
-          << "case.";
-    } else {
-      // Two fixture classes with the same name appear in two different
-      // namespaces, which is not allowed. Tell the user how to fix this.
-      ADD_FAILURE()
-          << "All tests in the same test suite must use the same test fixture\n"
-          << "class.  However, in test suite "
-          << this_test_info->test_suite_name() << ",\n"
-          << "you defined test " << first_test_name << " and test "
-          << this_test_name << "\n"
-          << "using two different test fixture classes.  This can happen if\n"
-          << "the two classes are from different namespaces or translation\n"
-          << "units and have the same name.  You should probably rename one\n"
-          << "of the classes to put the tests into different test suites.";
-    }
-    return false;
-  }
-
-  return true;
-}
-
-#if GTEST_HAS_SEH
-
-// Adds an "exception thrown" fatal failure to the current test.  This
-// function returns its result via an output parameter pointer because VC++
-// prohibits creation of objects with destructors on stack in functions
-// using __try (see error C2712).
-static std::string* FormatSehExceptionMessage(DWORD exception_code,
-                                              const char* location) {
-  Message message;
-  message << "SEH exception with code 0x" << std::setbase(16) <<
-    exception_code << std::setbase(10) << " thrown in " << location << ".";
-
-  return new std::string(message.GetString());
-}
-
-#endif  // GTEST_HAS_SEH
-
-namespace internal {
-
-#if GTEST_HAS_EXCEPTIONS
-
-// Adds an "exception thrown" fatal failure to the current test.
-static std::string FormatCxxExceptionMessage(const char* description,
-                                             const char* location) {
-  Message message;
-  if (description != nullptr) {
-    message << "C++ exception with description \"" << description << "\"";
-  } else {
-    message << "Unknown C++ exception";
-  }
-  message << " thrown in " << location << ".";
-
-  return message.GetString();
-}
-
-static std::string PrintTestPartResultToString(
-    const TestPartResult& test_part_result);
-
-GoogleTestFailureException::GoogleTestFailureException(
-    const TestPartResult& failure)
-    : ::std::runtime_error(PrintTestPartResultToString(failure).c_str()) {}
-
-#endif  // GTEST_HAS_EXCEPTIONS
-
-// We put these helper functions in the internal namespace as IBM's xlC
-// compiler rejects the code if they were declared static.
-
-// Runs the given method and handles SEH exceptions it throws, when
-// SEH is supported; returns the 0-value for type Result in case of an
-// SEH exception.  (Microsoft compilers cannot handle SEH and C++
-// exceptions in the same function.  Therefore, we provide a separate
-// wrapper function for handling SEH exceptions.)
-template <class T, typename Result>
-Result HandleSehExceptionsInMethodIfSupported(
-    T* object, Result (T::*method)(), const char* location) {
-#if GTEST_HAS_SEH
-  __try {
-    return (object->*method)();
-  } __except (internal::UnitTestOptions::GTestShouldProcessSEH(  // NOLINT
-      GetExceptionCode())) {
-    // We create the exception message on the heap because VC++ prohibits
-    // creation of objects with destructors on stack in functions using __try
-    // (see error C2712).
-    std::string* exception_message = FormatSehExceptionMessage(
-        GetExceptionCode(), location);
-    internal::ReportFailureInUnknownLocation(TestPartResult::kFatalFailure,
-                                             *exception_message);
-    delete exception_message;
-    return static_cast<Result>(0);
-  }
-#else
-  (void)location;
-  return (object->*method)();
-#endif  // GTEST_HAS_SEH
-}
-
-// Runs the given method and catches and reports C++ and/or SEH-style
-// exceptions, if they are supported; returns the 0-value for type
-// Result in case of an SEH exception.
-template <class T, typename Result>
-Result HandleExceptionsInMethodIfSupported(
-    T* object, Result (T::*method)(), const char* location) {
-  // NOTE: The user code can affect the way in which Google Test handles
-  // exceptions by setting GTEST_FLAG(catch_exceptions), but only before
-  // RUN_ALL_TESTS() starts. It is technically possible to check the flag
-  // after the exception is caught and either report or re-throw the
-  // exception based on the flag's value:
-  //
-  // try {
-  //   // Perform the test method.
-  // } catch (...) {
-  //   if (GTEST_FLAG(catch_exceptions))
-  //     // Report the exception as failure.
-  //   else
-  //     throw;  // Re-throws the original exception.
-  // }
-  //
-  // However, the purpose of this flag is to allow the program to drop into
-  // the debugger when the exception is thrown. On most platforms, once the
-  // control enters the catch block, the exception origin information is
-  // lost and the debugger will stop the program at the point of the
-  // re-throw in this function -- instead of at the point of the original
-  // throw statement in the code under test.  For this reason, we perform
-  // the check early, sacrificing the ability to affect Google Test's
-  // exception handling in the method where the exception is thrown.
-  if (internal::GetUnitTestImpl()->catch_exceptions()) {
-#if GTEST_HAS_EXCEPTIONS
-    try {
-      return HandleSehExceptionsInMethodIfSupported(object, method, location);
-    } catch (const AssertionException&) {  // NOLINT
-      // This failure was reported already.
-    } catch (const internal::GoogleTestFailureException&) {  // NOLINT
-      // This exception type can only be thrown by a failed Google
-      // Test assertion with the intention of letting another testing
-      // framework catch it.  Therefore we just re-throw it.
-      throw;
-    } catch (const std::exception& e) {  // NOLINT
-      internal::ReportFailureInUnknownLocation(
-          TestPartResult::kFatalFailure,
-          FormatCxxExceptionMessage(e.what(), location));
-    } catch (...) {  // NOLINT
-      internal::ReportFailureInUnknownLocation(
-          TestPartResult::kFatalFailure,
-          FormatCxxExceptionMessage(nullptr, location));
-    }
-    return static_cast<Result>(0);
-#else
-    return HandleSehExceptionsInMethodIfSupported(object, method, location);
-#endif  // GTEST_HAS_EXCEPTIONS
-  } else {
-    return (object->*method)();
-  }
-}
-
-}  // namespace internal
-
-// Runs the test and updates the test result.
-void Test::Run() {
-  if (!HasSameFixtureClass()) return;
-
-  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
-  impl->os_stack_trace_getter()->UponLeavingGTest();
-  internal::HandleExceptionsInMethodIfSupported(this, &Test::SetUp, "SetUp()");
-  // We will run the test only if SetUp() was successful and didn't call
-  // GTEST_SKIP().
-  if (!HasFatalFailure() && !IsSkipped()) {
-    impl->os_stack_trace_getter()->UponLeavingGTest();
-    internal::HandleExceptionsInMethodIfSupported(
-        this, &Test::TestBody, "the test body");
-  }
-
-  // However, we want to clean up as much as possible.  Hence we will
-  // always call TearDown(), even if SetUp() or the test body has
-  // failed.
-  impl->os_stack_trace_getter()->UponLeavingGTest();
-  internal::HandleExceptionsInMethodIfSupported(
-      this, &Test::TearDown, "TearDown()");
-}
-
-// Returns true if and only if the current test has a fatal failure.
-bool Test::HasFatalFailure() {
-  return internal::GetUnitTestImpl()->current_test_result()->HasFatalFailure();
-}
-
-// Returns true if and only if the current test has a non-fatal failure.
-bool Test::HasNonfatalFailure() {
-  return internal::GetUnitTestImpl()->current_test_result()->
-      HasNonfatalFailure();
-}
-
-// Returns true if and only if the current test was skipped.
-bool Test::IsSkipped() {
-  return internal::GetUnitTestImpl()->current_test_result()->Skipped();
-}
-
-// class TestInfo
-
-// Constructs a TestInfo object. It assumes ownership of the test factory
-// object.
-TestInfo::TestInfo(const std::string& a_test_suite_name,
-                   const std::string& a_name, const char* a_type_param,
-                   const char* a_value_param,
-                   internal::CodeLocation a_code_location,
-                   internal::TypeId fixture_class_id,
-                   internal::TestFactoryBase* factory)
-    : test_suite_name_(a_test_suite_name),
-      name_(a_name),
-      type_param_(a_type_param ? new std::string(a_type_param) : nullptr),
-      value_param_(a_value_param ? new std::string(a_value_param) : nullptr),
-      location_(a_code_location),
-      fixture_class_id_(fixture_class_id),
-      should_run_(false),
-      is_disabled_(false),
-      matches_filter_(false),
-      factory_(factory),
-      result_() {}
-
-// Destructs a TestInfo object.
-TestInfo::~TestInfo() { delete factory_; }
-
-namespace internal {
-
-// Creates a new TestInfo object and registers it with Google Test;
-// returns the created object.
-//
-// Arguments:
-//
-//   test_suite_name:   name of the test suite
-//   name:             name of the test
-//   type_param:       the name of the test's type parameter, or NULL if
-//                     this is not a typed or a type-parameterized test.
-//   value_param:      text representation of the test's value parameter,
-//                     or NULL if this is not a value-parameterized test.
-//   code_location:    code location where the test is defined
-//   fixture_class_id: ID of the test fixture class
-//   set_up_tc:        pointer to the function that sets up the test suite
-//   tear_down_tc:     pointer to the function that tears down the test suite
-//   factory:          pointer to the factory that creates a test object.
-//                     The newly created TestInfo instance will assume
-//                     ownership of the factory object.
-TestInfo* MakeAndRegisterTestInfo(
-    const char* test_suite_name, const char* name, const char* type_param,
-    const char* value_param, CodeLocation code_location,
-    TypeId fixture_class_id, SetUpTestSuiteFunc set_up_tc,
-    TearDownTestSuiteFunc tear_down_tc, TestFactoryBase* factory) {
-  TestInfo* const test_info =
-      new TestInfo(test_suite_name, name, type_param, value_param,
-                   code_location, fixture_class_id, factory);
-  GetUnitTestImpl()->AddTestInfo(set_up_tc, tear_down_tc, test_info);
-  return test_info;
-}
-
-void ReportInvalidTestSuiteType(const char* test_suite_name,
-                                CodeLocation code_location) {
-  Message errors;
-  errors
-      << "Attempted redefinition of test suite " << test_suite_name << ".\n"
-      << "All tests in the same test suite must use the same test fixture\n"
-      << "class.  However, in test suite " << test_suite_name << ", you tried\n"
-      << "to define a test using a fixture class different from the one\n"
-      << "used earlier. This can happen if the two fixture classes are\n"
-      << "from different namespaces and have the same name. You should\n"
-      << "probably rename one of the classes to put the tests into different\n"
-      << "test suites.";
-
-  GTEST_LOG_(ERROR) << FormatFileLocation(code_location.file.c_str(),
-                                          code_location.line)
-                    << " " << errors.GetString();
-}
-}  // namespace internal
-
-namespace {
-
-// A predicate that checks the test name of a TestInfo against a known
-// value.
-//
-// This is used for implementation of the TestSuite class only.  We put
-// it in the anonymous namespace to prevent polluting the outer
-// namespace.
-//
-// TestNameIs is copyable.
-class TestNameIs {
- public:
-  // Constructor.
-  //
-  // TestNameIs has NO default constructor.
-  explicit TestNameIs(const char* name)
-      : name_(name) {}
-
-  // Returns true if and only if the test name of test_info matches name_.
-  bool operator()(const TestInfo * test_info) const {
-    return test_info && test_info->name() == name_;
-  }
-
- private:
-  std::string name_;
-};
-
-}  // namespace
-
-namespace internal {
-
-// This method expands all parameterized tests registered with macros TEST_P
-// and INSTANTIATE_TEST_SUITE_P into regular tests and registers those.
-// This will be done just once during the program runtime.
-void UnitTestImpl::RegisterParameterizedTests() {
-  if (!parameterized_tests_registered_) {
-    parameterized_test_registry_.RegisterTests();
-    parameterized_tests_registered_ = true;
-  }
-}
-
-}  // namespace internal
-
-// Creates the test object, runs it, records its result, and then
-// deletes it.
-void TestInfo::Run() {
-  if (!should_run_) return;
-
-  // Tells UnitTest where to store test result.
-  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
-  impl->set_current_test_info(this);
-
-  TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater();
-
-  // Notifies the unit test event listeners that a test is about to start.
-  repeater->OnTestStart(*this);
-
-  const TimeInMillis start = internal::GetTimeInMillis();
-
-  impl->os_stack_trace_getter()->UponLeavingGTest();
-
-  // Creates the test object.
-  Test* const test = internal::HandleExceptionsInMethodIfSupported(
-      factory_, &internal::TestFactoryBase::CreateTest,
-      "the test fixture's constructor");
-
-  // Runs the test if the constructor didn't generate a fatal failure or invoke
-  // GTEST_SKIP().
-  // Note that the object will not be null
-  if (!Test::HasFatalFailure() && !Test::IsSkipped()) {
-    // This doesn't throw as all user code that can throw are wrapped into
-    // exception handling code.
-    test->Run();
-  }
-
-  if (test != nullptr) {
-    // Deletes the test object.
-    impl->os_stack_trace_getter()->UponLeavingGTest();
-    internal::HandleExceptionsInMethodIfSupported(
-        test, &Test::DeleteSelf_, "the test fixture's destructor");
-  }
-
-  result_.set_start_timestamp(start);
-  result_.set_elapsed_time(internal::GetTimeInMillis() - start);
-
-  // Notifies the unit test event listener that a test has just finished.
-  repeater->OnTestEnd(*this);
-
-  // Tells UnitTest to stop associating assertion results to this
-  // test.
-  impl->set_current_test_info(nullptr);
-}
-
-// class TestSuite
-
-// Gets the number of successful tests in this test suite.
-int TestSuite::successful_test_count() const {
-  return CountIf(test_info_list_, TestPassed);
-}
-
-// Gets the number of successful tests in this test suite.
-int TestSuite::skipped_test_count() const {
-  return CountIf(test_info_list_, TestSkipped);
-}
-
-// Gets the number of failed tests in this test suite.
-int TestSuite::failed_test_count() const {
-  return CountIf(test_info_list_, TestFailed);
-}
-
-// Gets the number of disabled tests that will be reported in the XML report.
-int TestSuite::reportable_disabled_test_count() const {
-  return CountIf(test_info_list_, TestReportableDisabled);
-}
-
-// Gets the number of disabled tests in this test suite.
-int TestSuite::disabled_test_count() const {
-  return CountIf(test_info_list_, TestDisabled);
-}
-
-// Gets the number of tests to be printed in the XML report.
-int TestSuite::reportable_test_count() const {
-  return CountIf(test_info_list_, TestReportable);
-}
-
-// Get the number of tests in this test suite that should run.
-int TestSuite::test_to_run_count() const {
-  return CountIf(test_info_list_, ShouldRunTest);
-}
-
-// Gets the number of all tests.
-int TestSuite::total_test_count() const {
-  return static_cast<int>(test_info_list_.size());
-}
-
-// Creates a TestSuite with the given name.
-//
-// Arguments:
-//
-//   name:         name of the test suite
-//   a_type_param: the name of the test suite's type parameter, or NULL if
-//                 this is not a typed or a type-parameterized test suite.
-//   set_up_tc:    pointer to the function that sets up the test suite
-//   tear_down_tc: pointer to the function that tears down the test suite
-TestSuite::TestSuite(const char* a_name, const char* a_type_param,
-                     internal::SetUpTestSuiteFunc set_up_tc,
-                     internal::TearDownTestSuiteFunc tear_down_tc)
-    : name_(a_name),
-      type_param_(a_type_param ? new std::string(a_type_param) : nullptr),
-      set_up_tc_(set_up_tc),
-      tear_down_tc_(tear_down_tc),
-      should_run_(false),
-      start_timestamp_(0),
-      elapsed_time_(0) {}
-
-// Destructor of TestSuite.
-TestSuite::~TestSuite() {
-  // Deletes every Test in the collection.
-  ForEach(test_info_list_, internal::Delete<TestInfo>);
-}
-
-// Returns the i-th test among all the tests. i can range from 0 to
-// total_test_count() - 1. If i is not in that range, returns NULL.
-const TestInfo* TestSuite::GetTestInfo(int i) const {
-  const int index = GetElementOr(test_indices_, i, -1);
-  return index < 0 ? nullptr : test_info_list_[static_cast<size_t>(index)];
-}
-
-// Returns the i-th test among all the tests. i can range from 0 to
-// total_test_count() - 1. If i is not in that range, returns NULL.
-TestInfo* TestSuite::GetMutableTestInfo(int i) {
-  const int index = GetElementOr(test_indices_, i, -1);
-  return index < 0 ? nullptr : test_info_list_[static_cast<size_t>(index)];
-}
-
-// Adds a test to this test suite.  Will delete the test upon
-// destruction of the TestSuite object.
-void TestSuite::AddTestInfo(TestInfo* test_info) {
-  test_info_list_.push_back(test_info);
-  test_indices_.push_back(static_cast<int>(test_indices_.size()));
-}
-
-// Runs every test in this TestSuite.
-void TestSuite::Run() {
-  if (!should_run_) return;
-
-  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
-  impl->set_current_test_suite(this);
-
-  TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater();
-
-  // Call both legacy and the new API
-  repeater->OnTestSuiteStart(*this);
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI
-  repeater->OnTestCaseStart(*this);
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI
-
-  impl->os_stack_trace_getter()->UponLeavingGTest();
-  internal::HandleExceptionsInMethodIfSupported(
-      this, &TestSuite::RunSetUpTestSuite, "SetUpTestSuite()");
-
-  start_timestamp_ = internal::GetTimeInMillis();
-  for (int i = 0; i < total_test_count(); i++) {
-    GetMutableTestInfo(i)->Run();
-  }
-  elapsed_time_ = internal::GetTimeInMillis() - start_timestamp_;
-
-  impl->os_stack_trace_getter()->UponLeavingGTest();
-  internal::HandleExceptionsInMethodIfSupported(
-      this, &TestSuite::RunTearDownTestSuite, "TearDownTestSuite()");
-
-  // Call both legacy and the new API
-  repeater->OnTestSuiteEnd(*this);
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI
-  repeater->OnTestCaseEnd(*this);
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI
-
-  impl->set_current_test_suite(nullptr);
-}
-
-// Clears the results of all tests in this test suite.
-void TestSuite::ClearResult() {
-  ad_hoc_test_result_.Clear();
-  ForEach(test_info_list_, TestInfo::ClearTestResult);
-}
-
-// Shuffles the tests in this test suite.
-void TestSuite::ShuffleTests(internal::Random* random) {
-  Shuffle(random, &test_indices_);
-}
-
-// Restores the test order to before the first shuffle.
-void TestSuite::UnshuffleTests() {
-  for (size_t i = 0; i < test_indices_.size(); i++) {
-    test_indices_[i] = static_cast<int>(i);
-  }
-}
-
-// Formats a countable noun.  Depending on its quantity, either the
-// singular form or the plural form is used. e.g.
-//
-// FormatCountableNoun(1, "formula", "formuli") returns "1 formula".
-// FormatCountableNoun(5, "book", "books") returns "5 books".
-static std::string FormatCountableNoun(int count,
-                                       const char * singular_form,
-                                       const char * plural_form) {
-  return internal::StreamableToString(count) + " " +
-      (count == 1 ? singular_form : plural_form);
-}
-
-// Formats the count of tests.
-static std::string FormatTestCount(int test_count) {
-  return FormatCountableNoun(test_count, "test", "tests");
-}
-
-// Formats the count of test suites.
-static std::string FormatTestSuiteCount(int test_suite_count) {
-  return FormatCountableNoun(test_suite_count, "test suite", "test suites");
-}
-
-// Converts a TestPartResult::Type enum to human-friendly string
-// representation.  Both kNonFatalFailure and kFatalFailure are translated
-// to "Failure", as the user usually doesn't care about the difference
-// between the two when viewing the test result.
-static const char * TestPartResultTypeToString(TestPartResult::Type type) {
-  switch (type) {
-    case TestPartResult::kSkip:
-      return "Skipped";
-    case TestPartResult::kSuccess:
-      return "Success";
-
-    case TestPartResult::kNonFatalFailure:
-    case TestPartResult::kFatalFailure:
-#ifdef _MSC_VER
-      return "error: ";
-#else
-      return "Failure\n";
-#endif
-    default:
-      return "Unknown result type";
-  }
-}
-
-namespace internal {
-
-// Prints a TestPartResult to an std::string.
-static std::string PrintTestPartResultToString(
-    const TestPartResult& test_part_result) {
-  return (Message()
-          << internal::FormatFileLocation(test_part_result.file_name(),
-                                          test_part_result.line_number())
-          << " " << TestPartResultTypeToString(test_part_result.type())
-          << test_part_result.message()).GetString();
-}
-
-// Prints a TestPartResult.
-static void PrintTestPartResult(const TestPartResult& test_part_result) {
-  const std::string& result =
-      PrintTestPartResultToString(test_part_result);
-  printf("%s\n", result.c_str());
-  fflush(stdout);
-  // If the test program runs in Visual Studio or a debugger, the
-  // following statements add the test part result message to the Output
-  // window such that the user can double-click on it to jump to the
-  // corresponding source code location; otherwise they do nothing.
-#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE
-  // We don't call OutputDebugString*() on Windows Mobile, as printing
-  // to stdout is done by OutputDebugString() there already - we don't
-  // want the same message printed twice.
-  ::OutputDebugStringA(result.c_str());
-  ::OutputDebugStringA("\n");
-#endif
-}
-
-// class PrettyUnitTestResultPrinter
-#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE && \
-    !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT && !GTEST_OS_WINDOWS_MINGW
-
-// Returns the character attribute for the given color.
-static WORD GetColorAttribute(GTestColor color) {
-  switch (color) {
-    case COLOR_RED:    return FOREGROUND_RED;
-    case COLOR_GREEN:  return FOREGROUND_GREEN;
-    case COLOR_YELLOW: return FOREGROUND_RED | FOREGROUND_GREEN;
-    default:           return 0;
-  }
-}
-
-static int GetBitOffset(WORD color_mask) {
-  if (color_mask == 0) return 0;
-
-  int bitOffset = 0;
-  while ((color_mask & 1) == 0) {
-    color_mask >>= 1;
-    ++bitOffset;
-  }
-  return bitOffset;
-}
-
-static WORD GetNewColor(GTestColor color, WORD old_color_attrs) {
-  // Let's reuse the BG
-  static const WORD background_mask = BACKGROUND_BLUE | BACKGROUND_GREEN |
-                                      BACKGROUND_RED | BACKGROUND_INTENSITY;
-  static const WORD foreground_mask = FOREGROUND_BLUE | FOREGROUND_GREEN |
-                                      FOREGROUND_RED | FOREGROUND_INTENSITY;
-  const WORD existing_bg = old_color_attrs & background_mask;
-
-  WORD new_color =
-      GetColorAttribute(color) | existing_bg | FOREGROUND_INTENSITY;
-  static const int bg_bitOffset = GetBitOffset(background_mask);
-  static const int fg_bitOffset = GetBitOffset(foreground_mask);
-
-  if (((new_color & background_mask) >> bg_bitOffset) ==
-      ((new_color & foreground_mask) >> fg_bitOffset)) {
-    new_color ^= FOREGROUND_INTENSITY;  // invert intensity
-  }
-  return new_color;
-}
-
-#else
-
-// Returns the ANSI color code for the given color.  COLOR_DEFAULT is
-// an invalid input.
-static const char* GetAnsiColorCode(GTestColor color) {
-  switch (color) {
-    case COLOR_RED:     return "1";
-    case COLOR_GREEN:   return "2";
-    case COLOR_YELLOW:  return "3";
-    default:
-      return nullptr;
-  }
-}
-
-#endif  // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE
-
-// Returns true if and only if Google Test should use colors in the output.
-bool ShouldUseColor(bool stdout_is_tty) {
-  const char* const gtest_color = GTEST_FLAG(color).c_str();
-
-  if (String::CaseInsensitiveCStringEquals(gtest_color, "auto")) {
-#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW
-    // On Windows the TERM variable is usually not set, but the
-    // console there does support colors.
-    return stdout_is_tty;
-#else
-    // On non-Windows platforms, we rely on the TERM variable.
-    const char* const term = posix::GetEnv("TERM");
-    const bool term_supports_color =
-        String::CStringEquals(term, "xterm") ||
-        String::CStringEquals(term, "xterm-color") ||
-        String::CStringEquals(term, "xterm-256color") ||
-        String::CStringEquals(term, "screen") ||
-        String::CStringEquals(term, "screen-256color") ||
-        String::CStringEquals(term, "tmux") ||
-        String::CStringEquals(term, "tmux-256color") ||
-        String::CStringEquals(term, "rxvt-unicode") ||
-        String::CStringEquals(term, "rxvt-unicode-256color") ||
-        String::CStringEquals(term, "linux") ||
-        String::CStringEquals(term, "cygwin");
-    return stdout_is_tty && term_supports_color;
-#endif  // GTEST_OS_WINDOWS
-  }
-
-  return String::CaseInsensitiveCStringEquals(gtest_color, "yes") ||
-      String::CaseInsensitiveCStringEquals(gtest_color, "true") ||
-      String::CaseInsensitiveCStringEquals(gtest_color, "t") ||
-      String::CStringEquals(gtest_color, "1");
-  // We take "yes", "true", "t", and "1" as meaning "yes".  If the
-  // value is neither one of these nor "auto", we treat it as "no" to
-  // be conservative.
-}
-
-// Helpers for printing colored strings to stdout. Note that on Windows, we
-// cannot simply emit special characters and have the terminal change colors.
-// This routine must actually emit the characters rather than return a string
-// that would be colored when printed, as can be done on Linux.
-void ColoredPrintf(GTestColor color, const char* fmt, ...) {
-  va_list args;
-  va_start(args, fmt);
-
-#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_ZOS || GTEST_OS_IOS || \
-    GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT || defined(ESP_PLATFORM)
-  const bool use_color = AlwaysFalse();
-#else
-  static const bool in_color_mode =
-      ShouldUseColor(posix::IsATTY(posix::FileNo(stdout)) != 0);
-  const bool use_color = in_color_mode && (color != COLOR_DEFAULT);
-#endif  // GTEST_OS_WINDOWS_MOBILE || GTEST_OS_ZOS
-
-  if (!use_color) {
-    vprintf(fmt, args);
-    va_end(args);
-    return;
-  }
-
-#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE && \
-    !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT && !GTEST_OS_WINDOWS_MINGW
-  const HANDLE stdout_handle = GetStdHandle(STD_OUTPUT_HANDLE);
-
-  // Gets the current text color.
-  CONSOLE_SCREEN_BUFFER_INFO buffer_info;
-  GetConsoleScreenBufferInfo(stdout_handle, &buffer_info);
-  const WORD old_color_attrs = buffer_info.wAttributes;
-  const WORD new_color = GetNewColor(color, old_color_attrs);
-
-  // We need to flush the stream buffers into the console before each
-  // SetConsoleTextAttribute call lest it affect the text that is already
-  // printed but has not yet reached the console.
-  fflush(stdout);
-  SetConsoleTextAttribute(stdout_handle, new_color);
-
-  vprintf(fmt, args);
-
-  fflush(stdout);
-  // Restores the text color.
-  SetConsoleTextAttribute(stdout_handle, old_color_attrs);
-#else
-  printf("\033[0;3%sm", GetAnsiColorCode(color));
-  vprintf(fmt, args);
-  printf("\033[m");  // Resets the terminal to default.
-#endif  // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE
-  va_end(args);
-}
-
-// Text printed in Google Test's text output and --gtest_list_tests
-// output to label the type parameter and value parameter for a test.
-static const char kTypeParamLabel[] = "TypeParam";
-static const char kValueParamLabel[] = "GetParam()";
-
-static void PrintFullTestCommentIfPresent(const TestInfo& test_info) {
-  const char* const type_param = test_info.type_param();
-  const char* const value_param = test_info.value_param();
-
-  if (type_param != nullptr || value_param != nullptr) {
-    printf(", where ");
-    if (type_param != nullptr) {
-      printf("%s = %s", kTypeParamLabel, type_param);
-      if (value_param != nullptr) printf(" and ");
-    }
-    if (value_param != nullptr) {
-      printf("%s = %s", kValueParamLabel, value_param);
-    }
-  }
-}
-
-// This class implements the TestEventListener interface.
-//
-// Class PrettyUnitTestResultPrinter is copyable.
-class PrettyUnitTestResultPrinter : public TestEventListener {
- public:
-  PrettyUnitTestResultPrinter() {}
-  static void PrintTestName(const char* test_suite, const char* test) {
-    printf("%s.%s", test_suite, test);
-  }
-
-  // The following methods override what's in the TestEventListener class.
-  void OnTestProgramStart(const UnitTest& /*unit_test*/) override {}
-  void OnTestIterationStart(const UnitTest& unit_test, int iteration) override;
-  void OnEnvironmentsSetUpStart(const UnitTest& unit_test) override;
-  void OnEnvironmentsSetUpEnd(const UnitTest& /*unit_test*/) override {}
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  void OnTestCaseStart(const TestCase& test_case) override;
-#else
-  void OnTestSuiteStart(const TestSuite& test_suite) override;
-#endif  // OnTestCaseStart
-
-  void OnTestStart(const TestInfo& test_info) override;
-
-  void OnTestPartResult(const TestPartResult& result) override;
-  void OnTestEnd(const TestInfo& test_info) override;
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  void OnTestCaseEnd(const TestCase& test_case) override;
-#else
-  void OnTestSuiteEnd(const TestSuite& test_suite) override;
-#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  void OnEnvironmentsTearDownStart(const UnitTest& unit_test) override;
-  void OnEnvironmentsTearDownEnd(const UnitTest& /*unit_test*/) override {}
-  void OnTestIterationEnd(const UnitTest& unit_test, int iteration) override;
-  void OnTestProgramEnd(const UnitTest& /*unit_test*/) override {}
-
- private:
-  static void PrintFailedTests(const UnitTest& unit_test);
-  static void PrintSkippedTests(const UnitTest& unit_test);
-};
-
-  // Fired before each iteration of tests starts.
-void PrettyUnitTestResultPrinter::OnTestIterationStart(
-    const UnitTest& unit_test, int iteration) {
-  if (GTEST_FLAG(repeat) != 1)
-    printf("\nRepeating all tests (iteration %d) . . .\n\n", iteration + 1);
-
-  const char* const filter = GTEST_FLAG(filter).c_str();
-
-  // Prints the filter if it's not *.  This reminds the user that some
-  // tests may be skipped.
-  if (!String::CStringEquals(filter, kUniversalFilter)) {
-    ColoredPrintf(COLOR_YELLOW,
-                  "Note: %s filter = %s\n", GTEST_NAME_, filter);
-  }
-
-  if (internal::ShouldShard(kTestTotalShards, kTestShardIndex, false)) {
-    const Int32 shard_index = Int32FromEnvOrDie(kTestShardIndex, -1);
-    ColoredPrintf(COLOR_YELLOW,
-                  "Note: This is test shard %d of %s.\n",
-                  static_cast<int>(shard_index) + 1,
-                  internal::posix::GetEnv(kTestTotalShards));
-  }
-
-  if (GTEST_FLAG(shuffle)) {
-    ColoredPrintf(COLOR_YELLOW,
-                  "Note: Randomizing tests' orders with a seed of %d .\n",
-                  unit_test.random_seed());
-  }
-
-  ColoredPrintf(COLOR_GREEN,  "[==========] ");
-  printf("Running %s from %s.\n",
-         FormatTestCount(unit_test.test_to_run_count()).c_str(),
-         FormatTestSuiteCount(unit_test.test_suite_to_run_count()).c_str());
-  fflush(stdout);
-}
-
-void PrettyUnitTestResultPrinter::OnEnvironmentsSetUpStart(
-    const UnitTest& /*unit_test*/) {
-  ColoredPrintf(COLOR_GREEN,  "[----------] ");
-  printf("Global test environment set-up.\n");
-  fflush(stdout);
-}
-
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-void PrettyUnitTestResultPrinter::OnTestCaseStart(const TestCase& test_case) {
-  const std::string counts =
-      FormatCountableNoun(test_case.test_to_run_count(), "test", "tests");
-  ColoredPrintf(COLOR_GREEN, "[----------] ");
-  printf("%s from %s", counts.c_str(), test_case.name());
-  if (test_case.type_param() == nullptr) {
-    printf("\n");
-  } else {
-    printf(", where %s = %s\n", kTypeParamLabel, test_case.type_param());
-  }
-  fflush(stdout);
-}
-#else
-void PrettyUnitTestResultPrinter::OnTestSuiteStart(
-    const TestSuite& test_suite) {
-  const std::string counts =
-      FormatCountableNoun(test_suite.test_to_run_count(), "test", "tests");
-  ColoredPrintf(COLOR_GREEN, "[----------] ");
-  printf("%s from %s", counts.c_str(), test_suite.name());
-  if (test_suite.type_param() == nullptr) {
-    printf("\n");
-  } else {
-    printf(", where %s = %s\n", kTypeParamLabel, test_suite.type_param());
-  }
-  fflush(stdout);
-}
-#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-void PrettyUnitTestResultPrinter::OnTestStart(const TestInfo& test_info) {
-  ColoredPrintf(COLOR_GREEN,  "[ RUN      ] ");
-  PrintTestName(test_info.test_suite_name(), test_info.name());
-  printf("\n");
-  fflush(stdout);
-}
-
-// Called after an assertion failure.
-void PrettyUnitTestResultPrinter::OnTestPartResult(
-    const TestPartResult& result) {
-  switch (result.type()) {
-    // If the test part succeeded, or was skipped,
-    // we don't need to do anything.
-    case TestPartResult::kSkip:
-    case TestPartResult::kSuccess:
-      return;
-    default:
-      // Print failure message from the assertion
-      // (e.g. expected this and got that).
-      PrintTestPartResult(result);
-      fflush(stdout);
-  }
-}
-
-void PrettyUnitTestResultPrinter::OnTestEnd(const TestInfo& test_info) {
-  if (test_info.result()->Passed()) {
-    ColoredPrintf(COLOR_GREEN, "[       OK ] ");
-  } else if (test_info.result()->Skipped()) {
-    ColoredPrintf(COLOR_GREEN, "[  SKIPPED ] ");
-  } else {
-    ColoredPrintf(COLOR_RED, "[  FAILED  ] ");
-  }
-  PrintTestName(test_info.test_suite_name(), test_info.name());
-  if (test_info.result()->Failed())
-    PrintFullTestCommentIfPresent(test_info);
-
-  if (GTEST_FLAG(print_time)) {
-    printf(" (%s ms)\n", internal::StreamableToString(
-           test_info.result()->elapsed_time()).c_str());
-  } else {
-    printf("\n");
-  }
-  fflush(stdout);
-}
-
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-void PrettyUnitTestResultPrinter::OnTestCaseEnd(const TestCase& test_case) {
-  if (!GTEST_FLAG(print_time)) return;
-
-  const std::string counts =
-      FormatCountableNoun(test_case.test_to_run_count(), "test", "tests");
-  ColoredPrintf(COLOR_GREEN, "[----------] ");
-  printf("%s from %s (%s ms total)\n\n", counts.c_str(), test_case.name(),
-         internal::StreamableToString(test_case.elapsed_time()).c_str());
-  fflush(stdout);
-}
-#else
-void PrettyUnitTestResultPrinter::OnTestSuiteEnd(const TestSuite& test_suite) {
-  if (!GTEST_FLAG(print_time)) return;
-
-  const std::string counts =
-      FormatCountableNoun(test_suite.test_to_run_count(), "test", "tests");
-  ColoredPrintf(COLOR_GREEN, "[----------] ");
-  printf("%s from %s (%s ms total)\n\n", counts.c_str(), test_suite.name(),
-         internal::StreamableToString(test_suite.elapsed_time()).c_str());
-  fflush(stdout);
-}
-#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-void PrettyUnitTestResultPrinter::OnEnvironmentsTearDownStart(
-    const UnitTest& /*unit_test*/) {
-  ColoredPrintf(COLOR_GREEN,  "[----------] ");
-  printf("Global test environment tear-down\n");
-  fflush(stdout);
-}
-
-// Internal helper for printing the list of failed tests.
-void PrettyUnitTestResultPrinter::PrintFailedTests(const UnitTest& unit_test) {
-  const int failed_test_count = unit_test.failed_test_count();
-  if (failed_test_count == 0) {
-    return;
-  }
-
-  for (int i = 0; i < unit_test.total_test_suite_count(); ++i) {
-    const TestSuite& test_suite = *unit_test.GetTestSuite(i);
-    if (!test_suite.should_run() || (test_suite.failed_test_count() == 0)) {
-      continue;
-    }
-    for (int j = 0; j < test_suite.total_test_count(); ++j) {
-      const TestInfo& test_info = *test_suite.GetTestInfo(j);
-      if (!test_info.should_run() || !test_info.result()->Failed()) {
-        continue;
-      }
-      ColoredPrintf(COLOR_RED, "[  FAILED  ] ");
-      printf("%s.%s", test_suite.name(), test_info.name());
-      PrintFullTestCommentIfPresent(test_info);
-      printf("\n");
-    }
-  }
-}
-
-// Internal helper for printing the list of skipped tests.
-void PrettyUnitTestResultPrinter::PrintSkippedTests(const UnitTest& unit_test) {
-  const int skipped_test_count = unit_test.skipped_test_count();
-  if (skipped_test_count == 0) {
-    return;
-  }
-
-  for (int i = 0; i < unit_test.total_test_suite_count(); ++i) {
-    const TestSuite& test_suite = *unit_test.GetTestSuite(i);
-    if (!test_suite.should_run() || (test_suite.skipped_test_count() == 0)) {
-      continue;
-    }
-    for (int j = 0; j < test_suite.total_test_count(); ++j) {
-      const TestInfo& test_info = *test_suite.GetTestInfo(j);
-      if (!test_info.should_run() || !test_info.result()->Skipped()) {
-        continue;
-      }
-      ColoredPrintf(COLOR_GREEN, "[  SKIPPED ] ");
-      printf("%s.%s", test_suite.name(), test_info.name());
-      printf("\n");
-    }
-  }
-}
-
-void PrettyUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test,
-                                                     int /*iteration*/) {
-  ColoredPrintf(COLOR_GREEN,  "[==========] ");
-  printf("%s from %s ran.",
-         FormatTestCount(unit_test.test_to_run_count()).c_str(),
-         FormatTestSuiteCount(unit_test.test_suite_to_run_count()).c_str());
-  if (GTEST_FLAG(print_time)) {
-    printf(" (%s ms total)",
-           internal::StreamableToString(unit_test.elapsed_time()).c_str());
-  }
-  printf("\n");
-  ColoredPrintf(COLOR_GREEN,  "[  PASSED  ] ");
-  printf("%s.\n", FormatTestCount(unit_test.successful_test_count()).c_str());
-
-  const int skipped_test_count = unit_test.skipped_test_count();
-  if (skipped_test_count > 0) {
-    ColoredPrintf(COLOR_GREEN, "[  SKIPPED ] ");
-    printf("%s, listed below:\n", FormatTestCount(skipped_test_count).c_str());
-    PrintSkippedTests(unit_test);
-  }
-
-  int num_failures = unit_test.failed_test_count();
-  if (!unit_test.Passed()) {
-    const int failed_test_count = unit_test.failed_test_count();
-    ColoredPrintf(COLOR_RED,  "[  FAILED  ] ");
-    printf("%s, listed below:\n", FormatTestCount(failed_test_count).c_str());
-    PrintFailedTests(unit_test);
-    printf("\n%2d FAILED %s\n", num_failures,
-                        num_failures == 1 ? "TEST" : "TESTS");
-  }
-
-  int num_disabled = unit_test.reportable_disabled_test_count();
-  if (num_disabled && !GTEST_FLAG(also_run_disabled_tests)) {
-    if (!num_failures) {
-      printf("\n");  // Add a spacer if no FAILURE banner is displayed.
-    }
-    ColoredPrintf(COLOR_YELLOW,
-                  "  YOU HAVE %d DISABLED %s\n\n",
-                  num_disabled,
-                  num_disabled == 1 ? "TEST" : "TESTS");
-  }
-  // Ensure that Google Test output is printed before, e.g., heapchecker output.
-  fflush(stdout);
-}
-
-// End PrettyUnitTestResultPrinter
-
-// class TestEventRepeater
-//
-// This class forwards events to other event listeners.
-class TestEventRepeater : public TestEventListener {
- public:
-  TestEventRepeater() : forwarding_enabled_(true) {}
-  ~TestEventRepeater() override;
-  void Append(TestEventListener *listener);
-  TestEventListener* Release(TestEventListener* listener);
-
-  // Controls whether events will be forwarded to listeners_. Set to false
-  // in death test child processes.
-  bool forwarding_enabled() const { return forwarding_enabled_; }
-  void set_forwarding_enabled(bool enable) { forwarding_enabled_ = enable; }
-
-  void OnTestProgramStart(const UnitTest& unit_test) override;
-  void OnTestIterationStart(const UnitTest& unit_test, int iteration) override;
-  void OnEnvironmentsSetUpStart(const UnitTest& unit_test) override;
-  void OnEnvironmentsSetUpEnd(const UnitTest& unit_test) override;
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  void OnTestCaseStart(const TestSuite& parameter) override;
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  void OnTestSuiteStart(const TestSuite& parameter) override;
-  void OnTestStart(const TestInfo& test_info) override;
-  void OnTestPartResult(const TestPartResult& result) override;
-  void OnTestEnd(const TestInfo& test_info) override;
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  void OnTestCaseEnd(const TestCase& parameter) override;
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  void OnTestSuiteEnd(const TestSuite& parameter) override;
-  void OnEnvironmentsTearDownStart(const UnitTest& unit_test) override;
-  void OnEnvironmentsTearDownEnd(const UnitTest& unit_test) override;
-  void OnTestIterationEnd(const UnitTest& unit_test, int iteration) override;
-  void OnTestProgramEnd(const UnitTest& unit_test) override;
-
- private:
-  // Controls whether events will be forwarded to listeners_. Set to false
-  // in death test child processes.
-  bool forwarding_enabled_;
-  // The list of listeners that receive events.
-  std::vector<TestEventListener*> listeners_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestEventRepeater);
-};
-
-TestEventRepeater::~TestEventRepeater() {
-  ForEach(listeners_, Delete<TestEventListener>);
-}
-
-void TestEventRepeater::Append(TestEventListener *listener) {
-  listeners_.push_back(listener);
-}
-
-TestEventListener* TestEventRepeater::Release(TestEventListener *listener) {
-  for (size_t i = 0; i < listeners_.size(); ++i) {
-    if (listeners_[i] == listener) {
-      listeners_.erase(listeners_.begin() + static_cast<int>(i));
-      return listener;
-    }
-  }
-
-  return nullptr;
-}
-
-// Since most methods are very similar, use macros to reduce boilerplate.
-// This defines a member that forwards the call to all listeners.
-#define GTEST_REPEATER_METHOD_(Name, Type) \
-void TestEventRepeater::Name(const Type& parameter) { \
-  if (forwarding_enabled_) { \
-    for (size_t i = 0; i < listeners_.size(); i++) { \
-      listeners_[i]->Name(parameter); \
-    } \
-  } \
-}
-// This defines a member that forwards the call to all listeners in reverse
-// order.
-#define GTEST_REVERSE_REPEATER_METHOD_(Name, Type)      \
-  void TestEventRepeater::Name(const Type& parameter) { \
-    if (forwarding_enabled_) {                          \
-      for (size_t i = listeners_.size(); i != 0; i--) { \
-        listeners_[i - 1]->Name(parameter);             \
-      }                                                 \
-    }                                                   \
-  }
-
-GTEST_REPEATER_METHOD_(OnTestProgramStart, UnitTest)
-GTEST_REPEATER_METHOD_(OnEnvironmentsSetUpStart, UnitTest)
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-GTEST_REPEATER_METHOD_(OnTestCaseStart, TestSuite)
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-GTEST_REPEATER_METHOD_(OnTestSuiteStart, TestSuite)
-GTEST_REPEATER_METHOD_(OnTestStart, TestInfo)
-GTEST_REPEATER_METHOD_(OnTestPartResult, TestPartResult)
-GTEST_REPEATER_METHOD_(OnEnvironmentsTearDownStart, UnitTest)
-GTEST_REVERSE_REPEATER_METHOD_(OnEnvironmentsSetUpEnd, UnitTest)
-GTEST_REVERSE_REPEATER_METHOD_(OnEnvironmentsTearDownEnd, UnitTest)
-GTEST_REVERSE_REPEATER_METHOD_(OnTestEnd, TestInfo)
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-GTEST_REVERSE_REPEATER_METHOD_(OnTestCaseEnd, TestSuite)
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-GTEST_REVERSE_REPEATER_METHOD_(OnTestSuiteEnd, TestSuite)
-GTEST_REVERSE_REPEATER_METHOD_(OnTestProgramEnd, UnitTest)
-
-#undef GTEST_REPEATER_METHOD_
-#undef GTEST_REVERSE_REPEATER_METHOD_
-
-void TestEventRepeater::OnTestIterationStart(const UnitTest& unit_test,
-                                             int iteration) {
-  if (forwarding_enabled_) {
-    for (size_t i = 0; i < listeners_.size(); i++) {
-      listeners_[i]->OnTestIterationStart(unit_test, iteration);
-    }
-  }
-}
-
-void TestEventRepeater::OnTestIterationEnd(const UnitTest& unit_test,
-                                           int iteration) {
-  if (forwarding_enabled_) {
-    for (size_t i = listeners_.size(); i > 0; i--) {
-      listeners_[i - 1]->OnTestIterationEnd(unit_test, iteration);
-    }
-  }
-}
-
-// End TestEventRepeater
-
-// This class generates an XML output file.
-class XmlUnitTestResultPrinter : public EmptyTestEventListener {
- public:
-  explicit XmlUnitTestResultPrinter(const char* output_file);
-
-  void OnTestIterationEnd(const UnitTest& unit_test, int iteration) override;
-  void ListTestsMatchingFilter(const std::vector<TestSuite*>& test_suites);
-
-  // Prints an XML summary of all unit tests.
-  static void PrintXmlTestsList(std::ostream* stream,
-                                const std::vector<TestSuite*>& test_suites);
-
- private:
-  // Is c a whitespace character that is normalized to a space character
-  // when it appears in an XML attribute value?
-  static bool IsNormalizableWhitespace(char c) {
-    return c == 0x9 || c == 0xA || c == 0xD;
-  }
-
-  // May c appear in a well-formed XML document?
-  static bool IsValidXmlCharacter(char c) {
-    return IsNormalizableWhitespace(c) || c >= 0x20;
-  }
-
-  // Returns an XML-escaped copy of the input string str.  If
-  // is_attribute is true, the text is meant to appear as an attribute
-  // value, and normalizable whitespace is preserved by replacing it
-  // with character references.
-  static std::string EscapeXml(const std::string& str, bool is_attribute);
-
-  // Returns the given string with all characters invalid in XML removed.
-  static std::string RemoveInvalidXmlCharacters(const std::string& str);
-
-  // Convenience wrapper around EscapeXml when str is an attribute value.
-  static std::string EscapeXmlAttribute(const std::string& str) {
-    return EscapeXml(str, true);
-  }
-
-  // Convenience wrapper around EscapeXml when str is not an attribute value.
-  static std::string EscapeXmlText(const char* str) {
-    return EscapeXml(str, false);
-  }
-
-  // Verifies that the given attribute belongs to the given element and
-  // streams the attribute as XML.
-  static void OutputXmlAttribute(std::ostream* stream,
-                                 const std::string& element_name,
-                                 const std::string& name,
-                                 const std::string& value);
-
-  // Streams an XML CDATA section, escaping invalid CDATA sequences as needed.
-  static void OutputXmlCDataSection(::std::ostream* stream, const char* data);
-
-  // Streams an XML representation of a TestInfo object.
-  static void OutputXmlTestInfo(::std::ostream* stream,
-                                const char* test_suite_name,
-                                const TestInfo& test_info);
-
-  // Prints an XML representation of a TestSuite object
-  static void PrintXmlTestSuite(::std::ostream* stream,
-                                const TestSuite& test_suite);
-
-  // Prints an XML summary of unit_test to output stream out.
-  static void PrintXmlUnitTest(::std::ostream* stream,
-                               const UnitTest& unit_test);
-
-  // Produces a string representing the test properties in a result as space
-  // delimited XML attributes based on the property key="value" pairs.
-  // When the std::string is not empty, it includes a space at the beginning,
-  // to delimit this attribute from prior attributes.
-  static std::string TestPropertiesAsXmlAttributes(const TestResult& result);
-
-  // Streams an XML representation of the test properties of a TestResult
-  // object.
-  static void OutputXmlTestProperties(std::ostream* stream,
-                                      const TestResult& result);
-
-  // The output file.
-  const std::string output_file_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(XmlUnitTestResultPrinter);
-};
-
-// Creates a new XmlUnitTestResultPrinter.
-XmlUnitTestResultPrinter::XmlUnitTestResultPrinter(const char* output_file)
-    : output_file_(output_file) {
-  if (output_file_.empty()) {
-    GTEST_LOG_(FATAL) << "XML output file may not be null";
-  }
-}
-
-// Called after the unit test ends.
-void XmlUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test,
-                                                  int /*iteration*/) {
-  FILE* xmlout = OpenFileForWriting(output_file_);
-  std::stringstream stream;
-  PrintXmlUnitTest(&stream, unit_test);
-  fprintf(xmlout, "%s", StringStreamToString(&stream).c_str());
-  fclose(xmlout);
-}
-
-void XmlUnitTestResultPrinter::ListTestsMatchingFilter(
-    const std::vector<TestSuite*>& test_suites) {
-  FILE* xmlout = OpenFileForWriting(output_file_);
-  std::stringstream stream;
-  PrintXmlTestsList(&stream, test_suites);
-  fprintf(xmlout, "%s", StringStreamToString(&stream).c_str());
-  fclose(xmlout);
-}
-
-// Returns an XML-escaped copy of the input string str.  If is_attribute
-// is true, the text is meant to appear as an attribute value, and
-// normalizable whitespace is preserved by replacing it with character
-// references.
-//
-// Invalid XML characters in str, if any, are stripped from the output.
-// It is expected that most, if not all, of the text processed by this
-// module will consist of ordinary English text.
-// If this module is ever modified to produce version 1.1 XML output,
-// most invalid characters can be retained using character references.
-std::string XmlUnitTestResultPrinter::EscapeXml(
-    const std::string& str, bool is_attribute) {
-  Message m;
-
-  for (size_t i = 0; i < str.size(); ++i) {
-    const char ch = str[i];
-    switch (ch) {
-      case '<':
-        m << "&lt;";
-        break;
-      case '>':
-        m << "&gt;";
-        break;
-      case '&':
-        m << "&amp;";
-        break;
-      case '\'':
-        if (is_attribute)
-          m << "&apos;";
-        else
-          m << '\'';
-        break;
-      case '"':
-        if (is_attribute)
-          m << "&quot;";
-        else
-          m << '"';
-        break;
-      default:
-        if (IsValidXmlCharacter(ch)) {
-          if (is_attribute && IsNormalizableWhitespace(ch))
-            m << "&#x" << String::FormatByte(static_cast<unsigned char>(ch))
-              << ";";
-          else
-            m << ch;
-        }
-        break;
-    }
-  }
-
-  return m.GetString();
-}
-
-// Returns the given string with all characters invalid in XML removed.
-// Currently invalid characters are dropped from the string. An
-// alternative is to replace them with certain characters such as . or ?.
-std::string XmlUnitTestResultPrinter::RemoveInvalidXmlCharacters(
-    const std::string& str) {
-  std::string output;
-  output.reserve(str.size());
-  for (std::string::const_iterator it = str.begin(); it != str.end(); ++it)
-    if (IsValidXmlCharacter(*it))
-      output.push_back(*it);
-
-  return output;
-}
-
-// The following routines generate an XML representation of a UnitTest
-// object.
-// GOOGLETEST_CM0009 DO NOT DELETE
-//
-// This is how Google Test concepts map to the DTD:
-//
-// <testsuites name="AllTests">        <-- corresponds to a UnitTest object
-//   <testsuite name="testcase-name">  <-- corresponds to a TestSuite object
-//     <testcase name="test-name">     <-- corresponds to a TestInfo object
-//       <failure message="...">...</failure>
-//       <failure message="...">...</failure>
-//       <failure message="...">...</failure>
-//                                     <-- individual assertion failures
-//     </testcase>
-//   </testsuite>
-// </testsuites>
-
-// Formats the given time in milliseconds as seconds.
-std::string FormatTimeInMillisAsSeconds(TimeInMillis ms) {
-  ::std::stringstream ss;
-  ss << (static_cast<double>(ms) * 1e-3);
-  return ss.str();
-}
-
-static bool PortableLocaltime(time_t seconds, struct tm* out) {
-#if defined(_MSC_VER)
-  return localtime_s(out, &seconds) == 0;
-#elif defined(__MINGW32__) || defined(__MINGW64__)
-  // MINGW <time.h> provides neither localtime_r nor localtime_s, but uses
-  // Windows' localtime(), which has a thread-local tm buffer.
-  struct tm* tm_ptr = localtime(&seconds);  // NOLINT
-  if (tm_ptr == nullptr) return false;
-  *out = *tm_ptr;
-  return true;
-#else
-  return localtime_r(&seconds, out) != nullptr;
-#endif
-}
-
-// Converts the given epoch time in milliseconds to a date string in the ISO
-// 8601 format, without the timezone information.
-std::string FormatEpochTimeInMillisAsIso8601(TimeInMillis ms) {
-  struct tm time_struct;
-  if (!PortableLocaltime(static_cast<time_t>(ms / 1000), &time_struct))
-    return "";
-  // YYYY-MM-DDThh:mm:ss
-  return StreamableToString(time_struct.tm_year + 1900) + "-" +
-      String::FormatIntWidth2(time_struct.tm_mon + 1) + "-" +
-      String::FormatIntWidth2(time_struct.tm_mday) + "T" +
-      String::FormatIntWidth2(time_struct.tm_hour) + ":" +
-      String::FormatIntWidth2(time_struct.tm_min) + ":" +
-      String::FormatIntWidth2(time_struct.tm_sec);
-}
-
-// Streams an XML CDATA section, escaping invalid CDATA sequences as needed.
-void XmlUnitTestResultPrinter::OutputXmlCDataSection(::std::ostream* stream,
-                                                     const char* data) {
-  const char* segment = data;
-  *stream << "<![CDATA[";
-  for (;;) {
-    const char* const next_segment = strstr(segment, "]]>");
-    if (next_segment != nullptr) {
-      stream->write(
-          segment, static_cast<std::streamsize>(next_segment - segment));
-      *stream << "]]>]]&gt;<![CDATA[";
-      segment = next_segment + strlen("]]>");
-    } else {
-      *stream << segment;
-      break;
-    }
-  }
-  *stream << "]]>";
-}
-
-void XmlUnitTestResultPrinter::OutputXmlAttribute(
-    std::ostream* stream,
-    const std::string& element_name,
-    const std::string& name,
-    const std::string& value) {
-  const std::vector<std::string>& allowed_names =
-      GetReservedOutputAttributesForElement(element_name);
-
-  GTEST_CHECK_(std::find(allowed_names.begin(), allowed_names.end(), name) !=
-                   allowed_names.end())
-      << "Attribute " << name << " is not allowed for element <" << element_name
-      << ">.";
-
-  *stream << " " << name << "=\"" << EscapeXmlAttribute(value) << "\"";
-}
-
-// Prints an XML representation of a TestInfo object.
-void XmlUnitTestResultPrinter::OutputXmlTestInfo(::std::ostream* stream,
-                                                 const char* test_suite_name,
-                                                 const TestInfo& test_info) {
-  const TestResult& result = *test_info.result();
-  const std::string kTestsuite = "testcase";
-
-  if (test_info.is_in_another_shard()) {
-    return;
-  }
-
-  *stream << "    <testcase";
-  OutputXmlAttribute(stream, kTestsuite, "name", test_info.name());
-
-  if (test_info.value_param() != nullptr) {
-    OutputXmlAttribute(stream, kTestsuite, "value_param",
-                       test_info.value_param());
-  }
-  if (test_info.type_param() != nullptr) {
-    OutputXmlAttribute(stream, kTestsuite, "type_param",
-                       test_info.type_param());
-  }
-  if (GTEST_FLAG(list_tests)) {
-    OutputXmlAttribute(stream, kTestsuite, "file", test_info.file());
-    OutputXmlAttribute(stream, kTestsuite, "line",
-                       StreamableToString(test_info.line()));
-    *stream << " />\n";
-    return;
-  }
-
-  OutputXmlAttribute(stream, kTestsuite, "status",
-                     test_info.should_run() ? "run" : "notrun");
-  OutputXmlAttribute(stream, kTestsuite, "result",
-                     test_info.should_run()
-                         ? (result.Skipped() ? "skipped" : "completed")
-                         : "suppressed");
-  OutputXmlAttribute(stream, kTestsuite, "time",
-                     FormatTimeInMillisAsSeconds(result.elapsed_time()));
-  OutputXmlAttribute(
-      stream, kTestsuite, "timestamp",
-      FormatEpochTimeInMillisAsIso8601(result.start_timestamp()));
-  OutputXmlAttribute(stream, kTestsuite, "classname", test_suite_name);
-
-  int failures = 0;
-  for (int i = 0; i < result.total_part_count(); ++i) {
-    const TestPartResult& part = result.GetTestPartResult(i);
-    if (part.failed()) {
-      if (++failures == 1) {
-        *stream << ">\n";
-      }
-      const std::string location =
-          internal::FormatCompilerIndependentFileLocation(part.file_name(),
-                                                          part.line_number());
-      const std::string summary = location + "\n" + part.summary();
-      *stream << "      <failure message=\""
-              << EscapeXmlAttribute(summary.c_str())
-              << "\" type=\"\">";
-      const std::string detail = location + "\n" + part.message();
-      OutputXmlCDataSection(stream, RemoveInvalidXmlCharacters(detail).c_str());
-      *stream << "</failure>\n";
-    }
-  }
-
-  if (failures == 0 && result.test_property_count() == 0) {
-    *stream << " />\n";
-  } else {
-    if (failures == 0) {
-      *stream << ">\n";
-    }
-    OutputXmlTestProperties(stream, result);
-    *stream << "    </testcase>\n";
-  }
-}
-
-// Prints an XML representation of a TestSuite object
-void XmlUnitTestResultPrinter::PrintXmlTestSuite(std::ostream* stream,
-                                                 const TestSuite& test_suite) {
-  const std::string kTestsuite = "testsuite";
-  *stream << "  <" << kTestsuite;
-  OutputXmlAttribute(stream, kTestsuite, "name", test_suite.name());
-  OutputXmlAttribute(stream, kTestsuite, "tests",
-                     StreamableToString(test_suite.reportable_test_count()));
-  if (!GTEST_FLAG(list_tests)) {
-    OutputXmlAttribute(stream, kTestsuite, "failures",
-                       StreamableToString(test_suite.failed_test_count()));
-    OutputXmlAttribute(
-        stream, kTestsuite, "disabled",
-        StreamableToString(test_suite.reportable_disabled_test_count()));
-    OutputXmlAttribute(stream, kTestsuite, "errors", "0");
-    OutputXmlAttribute(stream, kTestsuite, "time",
-                       FormatTimeInMillisAsSeconds(test_suite.elapsed_time()));
-    OutputXmlAttribute(
-        stream, kTestsuite, "timestamp",
-        FormatEpochTimeInMillisAsIso8601(test_suite.start_timestamp()));
-    *stream << TestPropertiesAsXmlAttributes(test_suite.ad_hoc_test_result());
-  }
-  *stream << ">\n";
-  for (int i = 0; i < test_suite.total_test_count(); ++i) {
-    if (test_suite.GetTestInfo(i)->is_reportable())
-      OutputXmlTestInfo(stream, test_suite.name(), *test_suite.GetTestInfo(i));
-  }
-  *stream << "  </" << kTestsuite << ">\n";
-}
-
-// Prints an XML summary of unit_test to output stream out.
-void XmlUnitTestResultPrinter::PrintXmlUnitTest(std::ostream* stream,
-                                                const UnitTest& unit_test) {
-  const std::string kTestsuites = "testsuites";
-
-  *stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-  *stream << "<" << kTestsuites;
-
-  OutputXmlAttribute(stream, kTestsuites, "tests",
-                     StreamableToString(unit_test.reportable_test_count()));
-  OutputXmlAttribute(stream, kTestsuites, "failures",
-                     StreamableToString(unit_test.failed_test_count()));
-  OutputXmlAttribute(
-      stream, kTestsuites, "disabled",
-      StreamableToString(unit_test.reportable_disabled_test_count()));
-  OutputXmlAttribute(stream, kTestsuites, "errors", "0");
-  OutputXmlAttribute(stream, kTestsuites, "time",
-                     FormatTimeInMillisAsSeconds(unit_test.elapsed_time()));
-  OutputXmlAttribute(
-      stream, kTestsuites, "timestamp",
-      FormatEpochTimeInMillisAsIso8601(unit_test.start_timestamp()));
-
-  if (GTEST_FLAG(shuffle)) {
-    OutputXmlAttribute(stream, kTestsuites, "random_seed",
-                       StreamableToString(unit_test.random_seed()));
-  }
-  *stream << TestPropertiesAsXmlAttributes(unit_test.ad_hoc_test_result());
-
-  OutputXmlAttribute(stream, kTestsuites, "name", "AllTests");
-  *stream << ">\n";
-
-  for (int i = 0; i < unit_test.total_test_suite_count(); ++i) {
-    if (unit_test.GetTestSuite(i)->reportable_test_count() > 0)
-      PrintXmlTestSuite(stream, *unit_test.GetTestSuite(i));
-  }
-  *stream << "</" << kTestsuites << ">\n";
-}
-
-void XmlUnitTestResultPrinter::PrintXmlTestsList(
-    std::ostream* stream, const std::vector<TestSuite*>& test_suites) {
-  const std::string kTestsuites = "testsuites";
-
-  *stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-  *stream << "<" << kTestsuites;
-
-  int total_tests = 0;
-  for (auto test_suite : test_suites) {
-    total_tests += test_suite->total_test_count();
-  }
-  OutputXmlAttribute(stream, kTestsuites, "tests",
-                     StreamableToString(total_tests));
-  OutputXmlAttribute(stream, kTestsuites, "name", "AllTests");
-  *stream << ">\n";
-
-  for (auto test_suite : test_suites) {
-    PrintXmlTestSuite(stream, *test_suite);
-  }
-  *stream << "</" << kTestsuites << ">\n";
-}
-
-// Produces a string representing the test properties in a result as space
-// delimited XML attributes based on the property key="value" pairs.
-std::string XmlUnitTestResultPrinter::TestPropertiesAsXmlAttributes(
-    const TestResult& result) {
-  Message attributes;
-  for (int i = 0; i < result.test_property_count(); ++i) {
-    const TestProperty& property = result.GetTestProperty(i);
-    attributes << " " << property.key() << "="
-        << "\"" << EscapeXmlAttribute(property.value()) << "\"";
-  }
-  return attributes.GetString();
-}
-
-void XmlUnitTestResultPrinter::OutputXmlTestProperties(
-    std::ostream* stream, const TestResult& result) {
-  const std::string kProperties = "properties";
-  const std::string kProperty = "property";
-
-  if (result.test_property_count() <= 0) {
-    return;
-  }
-
-  *stream << "<" << kProperties << ">\n";
-  for (int i = 0; i < result.test_property_count(); ++i) {
-    const TestProperty& property = result.GetTestProperty(i);
-    *stream << "<" << kProperty;
-    *stream << " name=\"" << EscapeXmlAttribute(property.key()) << "\"";
-    *stream << " value=\"" << EscapeXmlAttribute(property.value()) << "\"";
-    *stream << "/>\n";
-  }
-  *stream << "</" << kProperties << ">\n";
-}
-
-// End XmlUnitTestResultPrinter
-
-// This class generates an JSON output file.
-class JsonUnitTestResultPrinter : public EmptyTestEventListener {
- public:
-  explicit JsonUnitTestResultPrinter(const char* output_file);
-
-  void OnTestIterationEnd(const UnitTest& unit_test, int iteration) override;
-
-  // Prints an JSON summary of all unit tests.
-  static void PrintJsonTestList(::std::ostream* stream,
-                                const std::vector<TestSuite*>& test_suites);
-
- private:
-  // Returns an JSON-escaped copy of the input string str.
-  static std::string EscapeJson(const std::string& str);
-
-  //// Verifies that the given attribute belongs to the given element and
-  //// streams the attribute as JSON.
-  static void OutputJsonKey(std::ostream* stream,
-                            const std::string& element_name,
-                            const std::string& name,
-                            const std::string& value,
-                            const std::string& indent,
-                            bool comma = true);
-  static void OutputJsonKey(std::ostream* stream,
-                            const std::string& element_name,
-                            const std::string& name,
-                            int value,
-                            const std::string& indent,
-                            bool comma = true);
-
-  // Streams a JSON representation of a TestInfo object.
-  static void OutputJsonTestInfo(::std::ostream* stream,
-                                 const char* test_suite_name,
-                                 const TestInfo& test_info);
-
-  // Prints a JSON representation of a TestSuite object
-  static void PrintJsonTestSuite(::std::ostream* stream,
-                                 const TestSuite& test_suite);
-
-  // Prints a JSON summary of unit_test to output stream out.
-  static void PrintJsonUnitTest(::std::ostream* stream,
-                                const UnitTest& unit_test);
-
-  // Produces a string representing the test properties in a result as
-  // a JSON dictionary.
-  static std::string TestPropertiesAsJson(const TestResult& result,
-                                          const std::string& indent);
-
-  // The output file.
-  const std::string output_file_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(JsonUnitTestResultPrinter);
-};
-
-// Creates a new JsonUnitTestResultPrinter.
-JsonUnitTestResultPrinter::JsonUnitTestResultPrinter(const char* output_file)
-    : output_file_(output_file) {
-  if (output_file_.empty()) {
-    GTEST_LOG_(FATAL) << "JSON output file may not be null";
-  }
-}
-
-void JsonUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test,
-                                                  int /*iteration*/) {
-  FILE* jsonout = OpenFileForWriting(output_file_);
-  std::stringstream stream;
-  PrintJsonUnitTest(&stream, unit_test);
-  fprintf(jsonout, "%s", StringStreamToString(&stream).c_str());
-  fclose(jsonout);
-}
-
-// Returns an JSON-escaped copy of the input string str.
-std::string JsonUnitTestResultPrinter::EscapeJson(const std::string& str) {
-  Message m;
-
-  for (size_t i = 0; i < str.size(); ++i) {
-    const char ch = str[i];
-    switch (ch) {
-      case '\\':
-      case '"':
-      case '/':
-        m << '\\' << ch;
-        break;
-      case '\b':
-        m << "\\b";
-        break;
-      case '\t':
-        m << "\\t";
-        break;
-      case '\n':
-        m << "\\n";
-        break;
-      case '\f':
-        m << "\\f";
-        break;
-      case '\r':
-        m << "\\r";
-        break;
-      default:
-        if (ch < ' ') {
-          m << "\\u00" << String::FormatByte(static_cast<unsigned char>(ch));
-        } else {
-          m << ch;
-        }
-        break;
-    }
-  }
-
-  return m.GetString();
-}
-
-// The following routines generate an JSON representation of a UnitTest
-// object.
-
-// Formats the given time in milliseconds as seconds.
-static std::string FormatTimeInMillisAsDuration(TimeInMillis ms) {
-  ::std::stringstream ss;
-  ss << (static_cast<double>(ms) * 1e-3) << "s";
-  return ss.str();
-}
-
-// Converts the given epoch time in milliseconds to a date string in the
-// RFC3339 format, without the timezone information.
-static std::string FormatEpochTimeInMillisAsRFC3339(TimeInMillis ms) {
-  struct tm time_struct;
-  if (!PortableLocaltime(static_cast<time_t>(ms / 1000), &time_struct))
-    return "";
-  // YYYY-MM-DDThh:mm:ss
-  return StreamableToString(time_struct.tm_year + 1900) + "-" +
-      String::FormatIntWidth2(time_struct.tm_mon + 1) + "-" +
-      String::FormatIntWidth2(time_struct.tm_mday) + "T" +
-      String::FormatIntWidth2(time_struct.tm_hour) + ":" +
-      String::FormatIntWidth2(time_struct.tm_min) + ":" +
-      String::FormatIntWidth2(time_struct.tm_sec) + "Z";
-}
-
-static inline std::string Indent(size_t width) {
-  return std::string(width, ' ');
-}
-
-void JsonUnitTestResultPrinter::OutputJsonKey(
-    std::ostream* stream,
-    const std::string& element_name,
-    const std::string& name,
-    const std::string& value,
-    const std::string& indent,
-    bool comma) {
-  const std::vector<std::string>& allowed_names =
-      GetReservedOutputAttributesForElement(element_name);
-
-  GTEST_CHECK_(std::find(allowed_names.begin(), allowed_names.end(), name) !=
-                   allowed_names.end())
-      << "Key \"" << name << "\" is not allowed for value \"" << element_name
-      << "\".";
-
-  *stream << indent << "\"" << name << "\": \"" << EscapeJson(value) << "\"";
-  if (comma)
-    *stream << ",\n";
-}
-
-void JsonUnitTestResultPrinter::OutputJsonKey(
-    std::ostream* stream,
-    const std::string& element_name,
-    const std::string& name,
-    int value,
-    const std::string& indent,
-    bool comma) {
-  const std::vector<std::string>& allowed_names =
-      GetReservedOutputAttributesForElement(element_name);
-
-  GTEST_CHECK_(std::find(allowed_names.begin(), allowed_names.end(), name) !=
-                   allowed_names.end())
-      << "Key \"" << name << "\" is not allowed for value \"" << element_name
-      << "\".";
-
-  *stream << indent << "\"" << name << "\": " << StreamableToString(value);
-  if (comma)
-    *stream << ",\n";
-}
-
-// Prints a JSON representation of a TestInfo object.
-void JsonUnitTestResultPrinter::OutputJsonTestInfo(::std::ostream* stream,
-                                                   const char* test_suite_name,
-                                                   const TestInfo& test_info) {
-  const TestResult& result = *test_info.result();
-  const std::string kTestsuite = "testcase";
-  const std::string kIndent = Indent(10);
-
-  *stream << Indent(8) << "{\n";
-  OutputJsonKey(stream, kTestsuite, "name", test_info.name(), kIndent);
-
-  if (test_info.value_param() != nullptr) {
-    OutputJsonKey(stream, kTestsuite, "value_param", test_info.value_param(),
-                  kIndent);
-  }
-  if (test_info.type_param() != nullptr) {
-    OutputJsonKey(stream, kTestsuite, "type_param", test_info.type_param(),
-                  kIndent);
-  }
-  if (GTEST_FLAG(list_tests)) {
-    OutputJsonKey(stream, kTestsuite, "file", test_info.file(), kIndent);
-    OutputJsonKey(stream, kTestsuite, "line", test_info.line(), kIndent, false);
-    *stream << "\n" << Indent(8) << "}";
-    return;
-  }
-
-  OutputJsonKey(stream, kTestsuite, "status",
-                test_info.should_run() ? "RUN" : "NOTRUN", kIndent);
-  OutputJsonKey(stream, kTestsuite, "result",
-                test_info.should_run()
-                    ? (result.Skipped() ? "SKIPPED" : "COMPLETED")
-                    : "SUPPRESSED",
-                kIndent);
-  OutputJsonKey(stream, kTestsuite, "timestamp",
-                FormatEpochTimeInMillisAsRFC3339(result.start_timestamp()),
-                kIndent);
-  OutputJsonKey(stream, kTestsuite, "time",
-                FormatTimeInMillisAsDuration(result.elapsed_time()), kIndent);
-  OutputJsonKey(stream, kTestsuite, "classname", test_suite_name, kIndent,
-                false);
-  *stream << TestPropertiesAsJson(result, kIndent);
-
-  int failures = 0;
-  for (int i = 0; i < result.total_part_count(); ++i) {
-    const TestPartResult& part = result.GetTestPartResult(i);
-    if (part.failed()) {
-      *stream << ",\n";
-      if (++failures == 1) {
-        *stream << kIndent << "\"" << "failures" << "\": [\n";
-      }
-      const std::string location =
-          internal::FormatCompilerIndependentFileLocation(part.file_name(),
-                                                          part.line_number());
-      const std::string message = EscapeJson(location + "\n" + part.message());
-      *stream << kIndent << "  {\n"
-              << kIndent << "    \"failure\": \"" << message << "\",\n"
-              << kIndent << "    \"type\": \"\"\n"
-              << kIndent << "  }";
-    }
-  }
-
-  if (failures > 0)
-    *stream << "\n" << kIndent << "]";
-  *stream << "\n" << Indent(8) << "}";
-}
-
-// Prints an JSON representation of a TestSuite object
-void JsonUnitTestResultPrinter::PrintJsonTestSuite(
-    std::ostream* stream, const TestSuite& test_suite) {
-  const std::string kTestsuite = "testsuite";
-  const std::string kIndent = Indent(6);
-
-  *stream << Indent(4) << "{\n";
-  OutputJsonKey(stream, kTestsuite, "name", test_suite.name(), kIndent);
-  OutputJsonKey(stream, kTestsuite, "tests", test_suite.reportable_test_count(),
-                kIndent);
-  if (!GTEST_FLAG(list_tests)) {
-    OutputJsonKey(stream, kTestsuite, "failures",
-                  test_suite.failed_test_count(), kIndent);
-    OutputJsonKey(stream, kTestsuite, "disabled",
-                  test_suite.reportable_disabled_test_count(), kIndent);
-    OutputJsonKey(stream, kTestsuite, "errors", 0, kIndent);
-    OutputJsonKey(
-        stream, kTestsuite, "timestamp",
-        FormatEpochTimeInMillisAsRFC3339(test_suite.start_timestamp()),
-        kIndent);
-    OutputJsonKey(stream, kTestsuite, "time",
-                  FormatTimeInMillisAsDuration(test_suite.elapsed_time()),
-                  kIndent, false);
-    *stream << TestPropertiesAsJson(test_suite.ad_hoc_test_result(), kIndent)
-            << ",\n";
-  }
-
-  *stream << kIndent << "\"" << kTestsuite << "\": [\n";
-
-  bool comma = false;
-  for (int i = 0; i < test_suite.total_test_count(); ++i) {
-    if (test_suite.GetTestInfo(i)->is_reportable()) {
-      if (comma) {
-        *stream << ",\n";
-      } else {
-        comma = true;
-      }
-      OutputJsonTestInfo(stream, test_suite.name(), *test_suite.GetTestInfo(i));
-    }
-  }
-  *stream << "\n" << kIndent << "]\n" << Indent(4) << "}";
-}
-
-// Prints a JSON summary of unit_test to output stream out.
-void JsonUnitTestResultPrinter::PrintJsonUnitTest(std::ostream* stream,
-                                                  const UnitTest& unit_test) {
-  const std::string kTestsuites = "testsuites";
-  const std::string kIndent = Indent(2);
-  *stream << "{\n";
-
-  OutputJsonKey(stream, kTestsuites, "tests", unit_test.reportable_test_count(),
-                kIndent);
-  OutputJsonKey(stream, kTestsuites, "failures", unit_test.failed_test_count(),
-                kIndent);
-  OutputJsonKey(stream, kTestsuites, "disabled",
-                unit_test.reportable_disabled_test_count(), kIndent);
-  OutputJsonKey(stream, kTestsuites, "errors", 0, kIndent);
-  if (GTEST_FLAG(shuffle)) {
-    OutputJsonKey(stream, kTestsuites, "random_seed", unit_test.random_seed(),
-                  kIndent);
-  }
-  OutputJsonKey(stream, kTestsuites, "timestamp",
-                FormatEpochTimeInMillisAsRFC3339(unit_test.start_timestamp()),
-                kIndent);
-  OutputJsonKey(stream, kTestsuites, "time",
-                FormatTimeInMillisAsDuration(unit_test.elapsed_time()), kIndent,
-                false);
-
-  *stream << TestPropertiesAsJson(unit_test.ad_hoc_test_result(), kIndent)
-          << ",\n";
-
-  OutputJsonKey(stream, kTestsuites, "name", "AllTests", kIndent);
-  *stream << kIndent << "\"" << kTestsuites << "\": [\n";
-
-  bool comma = false;
-  for (int i = 0; i < unit_test.total_test_suite_count(); ++i) {
-    if (unit_test.GetTestSuite(i)->reportable_test_count() > 0) {
-      if (comma) {
-        *stream << ",\n";
-      } else {
-        comma = true;
-      }
-      PrintJsonTestSuite(stream, *unit_test.GetTestSuite(i));
-    }
-  }
-
-  *stream << "\n" << kIndent << "]\n" << "}\n";
-}
-
-void JsonUnitTestResultPrinter::PrintJsonTestList(
-    std::ostream* stream, const std::vector<TestSuite*>& test_suites) {
-  const std::string kTestsuites = "testsuites";
-  const std::string kIndent = Indent(2);
-  *stream << "{\n";
-  int total_tests = 0;
-  for (auto test_suite : test_suites) {
-    total_tests += test_suite->total_test_count();
-  }
-  OutputJsonKey(stream, kTestsuites, "tests", total_tests, kIndent);
-
-  OutputJsonKey(stream, kTestsuites, "name", "AllTests", kIndent);
-  *stream << kIndent << "\"" << kTestsuites << "\": [\n";
-
-  for (size_t i = 0; i < test_suites.size(); ++i) {
-    if (i != 0) {
-      *stream << ",\n";
-    }
-    PrintJsonTestSuite(stream, *test_suites[i]);
-  }
-
-  *stream << "\n"
-          << kIndent << "]\n"
-          << "}\n";
-}
-// Produces a string representing the test properties in a result as
-// a JSON dictionary.
-std::string JsonUnitTestResultPrinter::TestPropertiesAsJson(
-    const TestResult& result, const std::string& indent) {
-  Message attributes;
-  for (int i = 0; i < result.test_property_count(); ++i) {
-    const TestProperty& property = result.GetTestProperty(i);
-    attributes << ",\n" << indent << "\"" << property.key() << "\": "
-               << "\"" << EscapeJson(property.value()) << "\"";
-  }
-  return attributes.GetString();
-}
-
-// End JsonUnitTestResultPrinter
-
-#if GTEST_CAN_STREAM_RESULTS_
-
-// Checks if str contains '=', '&', '%' or '\n' characters. If yes,
-// replaces them by "%xx" where xx is their hexadecimal value. For
-// example, replaces "=" with "%3D".  This algorithm is O(strlen(str))
-// in both time and space -- important as the input str may contain an
-// arbitrarily long test failure message and stack trace.
-std::string StreamingListener::UrlEncode(const char* str) {
-  std::string result;
-  result.reserve(strlen(str) + 1);
-  for (char ch = *str; ch != '\0'; ch = *++str) {
-    switch (ch) {
-      case '%':
-      case '=':
-      case '&':
-      case '\n':
-        result.append("%" + String::FormatByte(static_cast<unsigned char>(ch)));
-        break;
-      default:
-        result.push_back(ch);
-        break;
-    }
-  }
-  return result;
-}
-
-void StreamingListener::SocketWriter::MakeConnection() {
-  GTEST_CHECK_(sockfd_ == -1)
-      << "MakeConnection() can't be called when there is already a connection.";
-
-  addrinfo hints;
-  memset(&hints, 0, sizeof(hints));
-  hints.ai_family = AF_UNSPEC;    // To allow both IPv4 and IPv6 addresses.
-  hints.ai_socktype = SOCK_STREAM;
-  addrinfo* servinfo = nullptr;
-
-  // Use the getaddrinfo() to get a linked list of IP addresses for
-  // the given host name.
-  const int error_num = getaddrinfo(
-      host_name_.c_str(), port_num_.c_str(), &hints, &servinfo);
-  if (error_num != 0) {
-    GTEST_LOG_(WARNING) << "stream_result_to: getaddrinfo() failed: "
-                        << gai_strerror(error_num);
-  }
-
-  // Loop through all the results and connect to the first we can.
-  for (addrinfo* cur_addr = servinfo; sockfd_ == -1 && cur_addr != nullptr;
-       cur_addr = cur_addr->ai_next) {
-    sockfd_ = socket(
-        cur_addr->ai_family, cur_addr->ai_socktype, cur_addr->ai_protocol);
-    if (sockfd_ != -1) {
-      // Connect the client socket to the server socket.
-      if (connect(sockfd_, cur_addr->ai_addr, cur_addr->ai_addrlen) == -1) {
-        close(sockfd_);
-        sockfd_ = -1;
-      }
-    }
-  }
-
-  freeaddrinfo(servinfo);  // all done with this structure
-
-  if (sockfd_ == -1) {
-    GTEST_LOG_(WARNING) << "stream_result_to: failed to connect to "
-                        << host_name_ << ":" << port_num_;
-  }
-}
-
-// End of class Streaming Listener
-#endif  // GTEST_CAN_STREAM_RESULTS__
-
-// class OsStackTraceGetter
-
-const char* const OsStackTraceGetterInterface::kElidedFramesMarker =
-    "... " GTEST_NAME_ " internal frames ...";
-
-std::string OsStackTraceGetter::CurrentStackTrace(int max_depth, int skip_count)
-    GTEST_LOCK_EXCLUDED_(mutex_) {
-#if GTEST_HAS_ABSL
-  std::string result;
-
-  if (max_depth <= 0) {
-    return result;
-  }
-
-  max_depth = std::min(max_depth, kMaxStackTraceDepth);
-
-  std::vector<void*> raw_stack(max_depth);
-  // Skips the frames requested by the caller, plus this function.
-  const int raw_stack_size =
-      absl::GetStackTrace(&raw_stack[0], max_depth, skip_count + 1);
-
-  void* caller_frame = nullptr;
-  {
-    MutexLock lock(&mutex_);
-    caller_frame = caller_frame_;
-  }
-
-  for (int i = 0; i < raw_stack_size; ++i) {
-    if (raw_stack[i] == caller_frame &&
-        !GTEST_FLAG(show_internal_stack_frames)) {
-      // Add a marker to the trace and stop adding frames.
-      absl::StrAppend(&result, kElidedFramesMarker, "\n");
-      break;
-    }
-
-    char tmp[1024];
-    const char* symbol = "(unknown)";
-    if (absl::Symbolize(raw_stack[i], tmp, sizeof(tmp))) {
-      symbol = tmp;
-    }
-
-    char line[1024];
-    snprintf(line, sizeof(line), "  %p: %s\n", raw_stack[i], symbol);
-    result += line;
-  }
-
-  return result;
-
-#else  // !GTEST_HAS_ABSL
-  static_cast<void>(max_depth);
-  static_cast<void>(skip_count);
-  return "";
-#endif  // GTEST_HAS_ABSL
-}
-
-void OsStackTraceGetter::UponLeavingGTest() GTEST_LOCK_EXCLUDED_(mutex_) {
-#if GTEST_HAS_ABSL
-  void* caller_frame = nullptr;
-  if (absl::GetStackTrace(&caller_frame, 1, 3) <= 0) {
-    caller_frame = nullptr;
-  }
-
-  MutexLock lock(&mutex_);
-  caller_frame_ = caller_frame;
-#endif  // GTEST_HAS_ABSL
-}
-
-// A helper class that creates the premature-exit file in its
-// constructor and deletes the file in its destructor.
-class ScopedPrematureExitFile {
- public:
-  explicit ScopedPrematureExitFile(const char* premature_exit_filepath)
-      : premature_exit_filepath_(premature_exit_filepath ?
-                                 premature_exit_filepath : "") {
-    // If a path to the premature-exit file is specified...
-    if (!premature_exit_filepath_.empty()) {
-      // create the file with a single "0" character in it.  I/O
-      // errors are ignored as there's nothing better we can do and we
-      // don't want to fail the test because of this.
-      FILE* pfile = posix::FOpen(premature_exit_filepath, "w");
-      fwrite("0", 1, 1, pfile);
-      fclose(pfile);
-    }
-  }
-
-  ~ScopedPrematureExitFile() {
-    if (!premature_exit_filepath_.empty()) {
-      int retval = remove(premature_exit_filepath_.c_str());
-      if (retval) {
-        GTEST_LOG_(ERROR) << "Failed to remove premature exit filepath \""
-                          << premature_exit_filepath_ << "\" with error "
-                          << retval;
-      }
-    }
-  }
-
- private:
-  const std::string premature_exit_filepath_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedPrematureExitFile);
-};
-
-}  // namespace internal
-
-// class TestEventListeners
-
-TestEventListeners::TestEventListeners()
-    : repeater_(new internal::TestEventRepeater()),
-      default_result_printer_(nullptr),
-      default_xml_generator_(nullptr) {}
-
-TestEventListeners::~TestEventListeners() { delete repeater_; }
-
-// Returns the standard listener responsible for the default console
-// output.  Can be removed from the listeners list to shut down default
-// console output.  Note that removing this object from the listener list
-// with Release transfers its ownership to the user.
-void TestEventListeners::Append(TestEventListener* listener) {
-  repeater_->Append(listener);
-}
-
-// Removes the given event listener from the list and returns it.  It then
-// becomes the caller's responsibility to delete the listener. Returns
-// NULL if the listener is not found in the list.
-TestEventListener* TestEventListeners::Release(TestEventListener* listener) {
-  if (listener == default_result_printer_)
-    default_result_printer_ = nullptr;
-  else if (listener == default_xml_generator_)
-    default_xml_generator_ = nullptr;
-  return repeater_->Release(listener);
-}
-
-// Returns repeater that broadcasts the TestEventListener events to all
-// subscribers.
-TestEventListener* TestEventListeners::repeater() { return repeater_; }
-
-// Sets the default_result_printer attribute to the provided listener.
-// The listener is also added to the listener list and previous
-// default_result_printer is removed from it and deleted. The listener can
-// also be NULL in which case it will not be added to the list. Does
-// nothing if the previous and the current listener objects are the same.
-void TestEventListeners::SetDefaultResultPrinter(TestEventListener* listener) {
-  if (default_result_printer_ != listener) {
-    // It is an error to pass this method a listener that is already in the
-    // list.
-    delete Release(default_result_printer_);
-    default_result_printer_ = listener;
-    if (listener != nullptr) Append(listener);
-  }
-}
-
-// Sets the default_xml_generator attribute to the provided listener.  The
-// listener is also added to the listener list and previous
-// default_xml_generator is removed from it and deleted. The listener can
-// also be NULL in which case it will not be added to the list. Does
-// nothing if the previous and the current listener objects are the same.
-void TestEventListeners::SetDefaultXmlGenerator(TestEventListener* listener) {
-  if (default_xml_generator_ != listener) {
-    // It is an error to pass this method a listener that is already in the
-    // list.
-    delete Release(default_xml_generator_);
-    default_xml_generator_ = listener;
-    if (listener != nullptr) Append(listener);
-  }
-}
-
-// Controls whether events will be forwarded by the repeater to the
-// listeners in the list.
-bool TestEventListeners::EventForwardingEnabled() const {
-  return repeater_->forwarding_enabled();
-}
-
-void TestEventListeners::SuppressEventForwarding() {
-  repeater_->set_forwarding_enabled(false);
-}
-
-// class UnitTest
-
-// Gets the singleton UnitTest object.  The first time this method is
-// called, a UnitTest object is constructed and returned.  Consecutive
-// calls will return the same object.
-//
-// We don't protect this under mutex_ as a user is not supposed to
-// call this before main() starts, from which point on the return
-// value will never change.
-UnitTest* UnitTest::GetInstance() {
-  // CodeGear C++Builder insists on a public destructor for the
-  // default implementation.  Use this implementation to keep good OO
-  // design with private destructor.
-
-#if defined(__BORLANDC__)
-  static UnitTest* const instance = new UnitTest;
-  return instance;
-#else
-  static UnitTest instance;
-  return &instance;
-#endif  // defined(__BORLANDC__)
-}
-
-// Gets the number of successful test suites.
-int UnitTest::successful_test_suite_count() const {
-  return impl()->successful_test_suite_count();
-}
-
-// Gets the number of failed test suites.
-int UnitTest::failed_test_suite_count() const {
-  return impl()->failed_test_suite_count();
-}
-
-// Gets the number of all test suites.
-int UnitTest::total_test_suite_count() const {
-  return impl()->total_test_suite_count();
-}
-
-// Gets the number of all test suites that contain at least one test
-// that should run.
-int UnitTest::test_suite_to_run_count() const {
-  return impl()->test_suite_to_run_count();
-}
-
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-int UnitTest::successful_test_case_count() const {
-  return impl()->successful_test_suite_count();
-}
-int UnitTest::failed_test_case_count() const {
-  return impl()->failed_test_suite_count();
-}
-int UnitTest::total_test_case_count() const {
-  return impl()->total_test_suite_count();
-}
-int UnitTest::test_case_to_run_count() const {
-  return impl()->test_suite_to_run_count();
-}
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-// Gets the number of successful tests.
-int UnitTest::successful_test_count() const {
-  return impl()->successful_test_count();
-}
-
-// Gets the number of skipped tests.
-int UnitTest::skipped_test_count() const {
-  return impl()->skipped_test_count();
-}
-
-// Gets the number of failed tests.
-int UnitTest::failed_test_count() const { return impl()->failed_test_count(); }
-
-// Gets the number of disabled tests that will be reported in the XML report.
-int UnitTest::reportable_disabled_test_count() const {
-  return impl()->reportable_disabled_test_count();
-}
-
-// Gets the number of disabled tests.
-int UnitTest::disabled_test_count() const {
-  return impl()->disabled_test_count();
-}
-
-// Gets the number of tests to be printed in the XML report.
-int UnitTest::reportable_test_count() const {
-  return impl()->reportable_test_count();
-}
-
-// Gets the number of all tests.
-int UnitTest::total_test_count() const { return impl()->total_test_count(); }
-
-// Gets the number of tests that should run.
-int UnitTest::test_to_run_count() const { return impl()->test_to_run_count(); }
-
-// Gets the time of the test program start, in ms from the start of the
-// UNIX epoch.
-internal::TimeInMillis UnitTest::start_timestamp() const {
-    return impl()->start_timestamp();
-}
-
-// Gets the elapsed time, in milliseconds.
-internal::TimeInMillis UnitTest::elapsed_time() const {
-  return impl()->elapsed_time();
-}
-
-// Returns true if and only if the unit test passed (i.e. all test suites
-// passed).
-bool UnitTest::Passed() const { return impl()->Passed(); }
-
-// Returns true if and only if the unit test failed (i.e. some test suite
-// failed or something outside of all tests failed).
-bool UnitTest::Failed() const { return impl()->Failed(); }
-
-// Gets the i-th test suite among all the test suites. i can range from 0 to
-// total_test_suite_count() - 1. If i is not in that range, returns NULL.
-const TestSuite* UnitTest::GetTestSuite(int i) const {
-  return impl()->GetTestSuite(i);
-}
-
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-const TestCase* UnitTest::GetTestCase(int i) const {
-  return impl()->GetTestCase(i);
-}
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-// Returns the TestResult containing information on test failures and
-// properties logged outside of individual test suites.
-const TestResult& UnitTest::ad_hoc_test_result() const {
-  return *impl()->ad_hoc_test_result();
-}
-
-// Gets the i-th test suite among all the test suites. i can range from 0 to
-// total_test_suite_count() - 1. If i is not in that range, returns NULL.
-TestSuite* UnitTest::GetMutableTestSuite(int i) {
-  return impl()->GetMutableSuiteCase(i);
-}
-
-// Returns the list of event listeners that can be used to track events
-// inside Google Test.
-TestEventListeners& UnitTest::listeners() {
-  return *impl()->listeners();
-}
-
-// Registers and returns a global test environment.  When a test
-// program is run, all global test environments will be set-up in the
-// order they were registered.  After all tests in the program have
-// finished, all global test environments will be torn-down in the
-// *reverse* order they were registered.
-//
-// The UnitTest object takes ownership of the given environment.
-//
-// We don't protect this under mutex_, as we only support calling it
-// from the main thread.
-Environment* UnitTest::AddEnvironment(Environment* env) {
-  if (env == nullptr) {
-    return nullptr;
-  }
-
-  impl_->environments().push_back(env);
-  return env;
-}
-
-// Adds a TestPartResult to the current TestResult object.  All Google Test
-// assertion macros (e.g. ASSERT_TRUE, EXPECT_EQ, etc) eventually call
-// this to report their results.  The user code should use the
-// assertion macros instead of calling this directly.
-void UnitTest::AddTestPartResult(
-    TestPartResult::Type result_type,
-    const char* file_name,
-    int line_number,
-    const std::string& message,
-    const std::string& os_stack_trace) GTEST_LOCK_EXCLUDED_(mutex_) {
-  Message msg;
-  msg << message;
-
-  internal::MutexLock lock(&mutex_);
-  if (impl_->gtest_trace_stack().size() > 0) {
-    msg << "\n" << GTEST_NAME_ << " trace:";
-
-    for (size_t i = impl_->gtest_trace_stack().size(); i > 0; --i) {
-      const internal::TraceInfo& trace = impl_->gtest_trace_stack()[i - 1];
-      msg << "\n" << internal::FormatFileLocation(trace.file, trace.line)
-          << " " << trace.message;
-    }
-  }
-
-  if (os_stack_trace.c_str() != nullptr && !os_stack_trace.empty()) {
-    msg << internal::kStackTraceMarker << os_stack_trace;
-  }
-
-  const TestPartResult result = TestPartResult(
-      result_type, file_name, line_number, msg.GetString().c_str());
-  impl_->GetTestPartResultReporterForCurrentThread()->
-      ReportTestPartResult(result);
-
-  if (result_type != TestPartResult::kSuccess &&
-      result_type != TestPartResult::kSkip) {
-    // gtest_break_on_failure takes precedence over
-    // gtest_throw_on_failure.  This allows a user to set the latter
-    // in the code (perhaps in order to use Google Test assertions
-    // with another testing framework) and specify the former on the
-    // command line for debugging.
-    if (GTEST_FLAG(break_on_failure)) {
-#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
-      // Using DebugBreak on Windows allows gtest to still break into a debugger
-      // when a failure happens and both the --gtest_break_on_failure and
-      // the --gtest_catch_exceptions flags are specified.
-      DebugBreak();
-#elif (!defined(__native_client__)) &&            \
-    ((defined(__clang__) || defined(__GNUC__)) && \
-     (defined(__x86_64__) || defined(__i386__)))
-      // with clang/gcc we can achieve the same effect on x86 by invoking int3
-      asm("int3");
-#else
-      // Dereference nullptr through a volatile pointer to prevent the compiler
-      // from removing. We use this rather than abort() or __builtin_trap() for
-      // portability: some debuggers don't correctly trap abort().
-      *static_cast<volatile int*>(nullptr) = 1;
-#endif  // GTEST_OS_WINDOWS
-    } else if (GTEST_FLAG(throw_on_failure)) {
-#if GTEST_HAS_EXCEPTIONS
-      throw internal::GoogleTestFailureException(result);
-#else
-      // We cannot call abort() as it generates a pop-up in debug mode
-      // that cannot be suppressed in VC 7.1 or below.
-      exit(1);
-#endif
-    }
-  }
-}
-
-// Adds a TestProperty to the current TestResult object when invoked from
-// inside a test, to current TestSuite's ad_hoc_test_result_ when invoked
-// from SetUpTestSuite or TearDownTestSuite, or to the global property set
-// when invoked elsewhere.  If the result already contains a property with
-// the same key, the value will be updated.
-void UnitTest::RecordProperty(const std::string& key,
-                              const std::string& value) {
-  impl_->RecordProperty(TestProperty(key, value));
-}
-
-// Runs all tests in this UnitTest object and prints the result.
-// Returns 0 if successful, or 1 otherwise.
-//
-// We don't protect this under mutex_, as we only support calling it
-// from the main thread.
-int UnitTest::Run() {
-  const bool in_death_test_child_process =
-      internal::GTEST_FLAG(internal_run_death_test).length() > 0;
-
-  // Google Test implements this protocol for catching that a test
-  // program exits before returning control to Google Test:
-  //
-  //   1. Upon start, Google Test creates a file whose absolute path
-  //      is specified by the environment variable
-  //      TEST_PREMATURE_EXIT_FILE.
-  //   2. When Google Test has finished its work, it deletes the file.
-  //
-  // This allows a test runner to set TEST_PREMATURE_EXIT_FILE before
-  // running a Google-Test-based test program and check the existence
-  // of the file at the end of the test execution to see if it has
-  // exited prematurely.
-
-  // If we are in the child process of a death test, don't
-  // create/delete the premature exit file, as doing so is unnecessary
-  // and will confuse the parent process.  Otherwise, create/delete
-  // the file upon entering/leaving this function.  If the program
-  // somehow exits before this function has a chance to return, the
-  // premature-exit file will be left undeleted, causing a test runner
-  // that understands the premature-exit-file protocol to report the
-  // test as having failed.
-  const internal::ScopedPrematureExitFile premature_exit_file(
-      in_death_test_child_process
-          ? nullptr
-          : internal::posix::GetEnv("TEST_PREMATURE_EXIT_FILE"));
-
-  // Captures the value of GTEST_FLAG(catch_exceptions).  This value will be
-  // used for the duration of the program.
-  impl()->set_catch_exceptions(GTEST_FLAG(catch_exceptions));
-
-#if GTEST_OS_WINDOWS
-  // Either the user wants Google Test to catch exceptions thrown by the
-  // tests or this is executing in the context of death test child
-  // process. In either case the user does not want to see pop-up dialogs
-  // about crashes - they are expected.
-  if (impl()->catch_exceptions() || in_death_test_child_process) {
-# if !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
-    // SetErrorMode doesn't exist on CE.
-    SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOALIGNMENTFAULTEXCEPT |
-                 SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX);
-# endif  // !GTEST_OS_WINDOWS_MOBILE
-
-# if (defined(_MSC_VER) || GTEST_OS_WINDOWS_MINGW) && !GTEST_OS_WINDOWS_MOBILE
-    // Death test children can be terminated with _abort().  On Windows,
-    // _abort() can show a dialog with a warning message.  This forces the
-    // abort message to go to stderr instead.
-    _set_error_mode(_OUT_TO_STDERR);
-# endif
-
-# if defined(_MSC_VER) && !GTEST_OS_WINDOWS_MOBILE
-    // In the debug version, Visual Studio pops up a separate dialog
-    // offering a choice to debug the aborted program. We need to suppress
-    // this dialog or it will pop up for every EXPECT/ASSERT_DEATH statement
-    // executed. Google Test will notify the user of any unexpected
-    // failure via stderr.
-    if (!GTEST_FLAG(break_on_failure))
-      _set_abort_behavior(
-          0x0,                                    // Clear the following flags:
-          _WRITE_ABORT_MSG | _CALL_REPORTFAULT);  // pop-up window, core dump.
-# endif
-
-    // In debug mode, the Windows CRT can crash with an assertion over invalid
-    // input (e.g. passing an invalid file descriptor).  The default handling
-    // for these assertions is to pop up a dialog and wait for user input.
-    // Instead ask the CRT to dump such assertions to stderr non-interactively.
-    if (!IsDebuggerPresent()) {
-      (void)_CrtSetReportMode(_CRT_ASSERT,
-                              _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
-      (void)_CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);
-    }
-  }
-#endif  // GTEST_OS_WINDOWS
-
-  return internal::HandleExceptionsInMethodIfSupported(
-      impl(),
-      &internal::UnitTestImpl::RunAllTests,
-      "auxiliary test code (environments or event listeners)") ? 0 : 1;
-}
-
-// Returns the working directory when the first TEST() or TEST_F() was
-// executed.
-const char* UnitTest::original_working_dir() const {
-  return impl_->original_working_dir_.c_str();
-}
-
-// Returns the TestSuite object for the test that's currently running,
-// or NULL if no test is running.
-const TestSuite* UnitTest::current_test_suite() const
-    GTEST_LOCK_EXCLUDED_(mutex_) {
-  internal::MutexLock lock(&mutex_);
-  return impl_->current_test_suite();
-}
-
-// Legacy API is still available but deprecated
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-const TestCase* UnitTest::current_test_case() const
-    GTEST_LOCK_EXCLUDED_(mutex_) {
-  internal::MutexLock lock(&mutex_);
-  return impl_->current_test_suite();
-}
-#endif
-
-// Returns the TestInfo object for the test that's currently running,
-// or NULL if no test is running.
-const TestInfo* UnitTest::current_test_info() const
-    GTEST_LOCK_EXCLUDED_(mutex_) {
-  internal::MutexLock lock(&mutex_);
-  return impl_->current_test_info();
-}
-
-// Returns the random seed used at the start of the current test run.
-int UnitTest::random_seed() const { return impl_->random_seed(); }
-
-// Returns ParameterizedTestSuiteRegistry object used to keep track of
-// value-parameterized tests and instantiate and register them.
-internal::ParameterizedTestSuiteRegistry&
-UnitTest::parameterized_test_registry() GTEST_LOCK_EXCLUDED_(mutex_) {
-  return impl_->parameterized_test_registry();
-}
-
-// Creates an empty UnitTest.
-UnitTest::UnitTest() {
-  impl_ = new internal::UnitTestImpl(this);
-}
-
-// Destructor of UnitTest.
-UnitTest::~UnitTest() {
-  delete impl_;
-}
-
-// Pushes a trace defined by SCOPED_TRACE() on to the per-thread
-// Google Test trace stack.
-void UnitTest::PushGTestTrace(const internal::TraceInfo& trace)
-    GTEST_LOCK_EXCLUDED_(mutex_) {
-  internal::MutexLock lock(&mutex_);
-  impl_->gtest_trace_stack().push_back(trace);
-}
-
-// Pops a trace from the per-thread Google Test trace stack.
-void UnitTest::PopGTestTrace()
-    GTEST_LOCK_EXCLUDED_(mutex_) {
-  internal::MutexLock lock(&mutex_);
-  impl_->gtest_trace_stack().pop_back();
-}
-
-namespace internal {
-
-UnitTestImpl::UnitTestImpl(UnitTest* parent)
-    : parent_(parent),
-      GTEST_DISABLE_MSC_WARNINGS_PUSH_(4355 /* using this in initializer */)
-          default_global_test_part_result_reporter_(this),
-      default_per_thread_test_part_result_reporter_(this),
-      GTEST_DISABLE_MSC_WARNINGS_POP_() global_test_part_result_repoter_(
-          &default_global_test_part_result_reporter_),
-      per_thread_test_part_result_reporter_(
-          &default_per_thread_test_part_result_reporter_),
-      parameterized_test_registry_(),
-      parameterized_tests_registered_(false),
-      last_death_test_suite_(-1),
-      current_test_suite_(nullptr),
-      current_test_info_(nullptr),
-      ad_hoc_test_result_(),
-      os_stack_trace_getter_(nullptr),
-      post_flag_parse_init_performed_(false),
-      random_seed_(0),  // Will be overridden by the flag before first use.
-      random_(0),       // Will be reseeded before first use.
-      start_timestamp_(0),
-      elapsed_time_(0),
-#if GTEST_HAS_DEATH_TEST
-      death_test_factory_(new DefaultDeathTestFactory),
-#endif
-      // Will be overridden by the flag before first use.
-      catch_exceptions_(false) {
-  listeners()->SetDefaultResultPrinter(new PrettyUnitTestResultPrinter);
-}
-
-UnitTestImpl::~UnitTestImpl() {
-  // Deletes every TestSuite.
-  ForEach(test_suites_, internal::Delete<TestSuite>);
-
-  // Deletes every Environment.
-  ForEach(environments_, internal::Delete<Environment>);
-
-  delete os_stack_trace_getter_;
-}
-
-// Adds a TestProperty to the current TestResult object when invoked in a
-// context of a test, to current test suite's ad_hoc_test_result when invoke
-// from SetUpTestSuite/TearDownTestSuite, or to the global property set
-// otherwise.  If the result already contains a property with the same key,
-// the value will be updated.
-void UnitTestImpl::RecordProperty(const TestProperty& test_property) {
-  std::string xml_element;
-  TestResult* test_result;  // TestResult appropriate for property recording.
-
-  if (current_test_info_ != nullptr) {
-    xml_element = "testcase";
-    test_result = &(current_test_info_->result_);
-  } else if (current_test_suite_ != nullptr) {
-    xml_element = "testsuite";
-    test_result = &(current_test_suite_->ad_hoc_test_result_);
-  } else {
-    xml_element = "testsuites";
-    test_result = &ad_hoc_test_result_;
-  }
-  test_result->RecordProperty(xml_element, test_property);
-}
-
-#if GTEST_HAS_DEATH_TEST
-// Disables event forwarding if the control is currently in a death test
-// subprocess. Must not be called before InitGoogleTest.
-void UnitTestImpl::SuppressTestEventsIfInSubprocess() {
-  if (internal_run_death_test_flag_.get() != nullptr)
-    listeners()->SuppressEventForwarding();
-}
-#endif  // GTEST_HAS_DEATH_TEST
-
-// Initializes event listeners performing XML output as specified by
-// UnitTestOptions. Must not be called before InitGoogleTest.
-void UnitTestImpl::ConfigureXmlOutput() {
-  const std::string& output_format = UnitTestOptions::GetOutputFormat();
-  if (output_format == "xml") {
-    listeners()->SetDefaultXmlGenerator(new XmlUnitTestResultPrinter(
-        UnitTestOptions::GetAbsolutePathToOutputFile().c_str()));
-  } else if (output_format == "json") {
-    listeners()->SetDefaultXmlGenerator(new JsonUnitTestResultPrinter(
-        UnitTestOptions::GetAbsolutePathToOutputFile().c_str()));
-  } else if (output_format != "") {
-    GTEST_LOG_(WARNING) << "WARNING: unrecognized output format \""
-                        << output_format << "\" ignored.";
-  }
-}
-
-#if GTEST_CAN_STREAM_RESULTS_
-// Initializes event listeners for streaming test results in string form.
-// Must not be called before InitGoogleTest.
-void UnitTestImpl::ConfigureStreamingOutput() {
-  const std::string& target = GTEST_FLAG(stream_result_to);
-  if (!target.empty()) {
-    const size_t pos = target.find(':');
-    if (pos != std::string::npos) {
-      listeners()->Append(new StreamingListener(target.substr(0, pos),
-                                                target.substr(pos+1)));
-    } else {
-      GTEST_LOG_(WARNING) << "unrecognized streaming target \"" << target
-                          << "\" ignored.";
-    }
-  }
-}
-#endif  // GTEST_CAN_STREAM_RESULTS_
-
-// Performs initialization dependent upon flag values obtained in
-// ParseGoogleTestFlagsOnly.  Is called from InitGoogleTest after the call to
-// ParseGoogleTestFlagsOnly.  In case a user neglects to call InitGoogleTest
-// this function is also called from RunAllTests.  Since this function can be
-// called more than once, it has to be idempotent.
-void UnitTestImpl::PostFlagParsingInit() {
-  // Ensures that this function does not execute more than once.
-  if (!post_flag_parse_init_performed_) {
-    post_flag_parse_init_performed_ = true;
-
-#if defined(GTEST_CUSTOM_TEST_EVENT_LISTENER_)
-    // Register to send notifications about key process state changes.
-    listeners()->Append(new GTEST_CUSTOM_TEST_EVENT_LISTENER_());
-#endif  // defined(GTEST_CUSTOM_TEST_EVENT_LISTENER_)
-
-#if GTEST_HAS_DEATH_TEST
-    InitDeathTestSubprocessControlInfo();
-    SuppressTestEventsIfInSubprocess();
-#endif  // GTEST_HAS_DEATH_TEST
-
-    // Registers parameterized tests. This makes parameterized tests
-    // available to the UnitTest reflection API without running
-    // RUN_ALL_TESTS.
-    RegisterParameterizedTests();
-
-    // Configures listeners for XML output. This makes it possible for users
-    // to shut down the default XML output before invoking RUN_ALL_TESTS.
-    ConfigureXmlOutput();
-
-#if GTEST_CAN_STREAM_RESULTS_
-    // Configures listeners for streaming test results to the specified server.
-    ConfigureStreamingOutput();
-#endif  // GTEST_CAN_STREAM_RESULTS_
-
-#if GTEST_HAS_ABSL
-    if (GTEST_FLAG(install_failure_signal_handler)) {
-      absl::FailureSignalHandlerOptions options;
-      absl::InstallFailureSignalHandler(options);
-    }
-#endif  // GTEST_HAS_ABSL
-  }
-}
-
-// A predicate that checks the name of a TestSuite against a known
-// value.
-//
-// This is used for implementation of the UnitTest class only.  We put
-// it in the anonymous namespace to prevent polluting the outer
-// namespace.
-//
-// TestSuiteNameIs is copyable.
-class TestSuiteNameIs {
- public:
-  // Constructor.
-  explicit TestSuiteNameIs(const std::string& name) : name_(name) {}
-
-  // Returns true if and only if the name of test_suite matches name_.
-  bool operator()(const TestSuite* test_suite) const {
-    return test_suite != nullptr &&
-           strcmp(test_suite->name(), name_.c_str()) == 0;
-  }
-
- private:
-  std::string name_;
-};
-
-// Finds and returns a TestSuite with the given name.  If one doesn't
-// exist, creates one and returns it.  It's the CALLER'S
-// RESPONSIBILITY to ensure that this function is only called WHEN THE
-// TESTS ARE NOT SHUFFLED.
-//
-// Arguments:
-//
-//   test_suite_name: name of the test suite
-//   type_param:     the name of the test suite's type parameter, or NULL if
-//                   this is not a typed or a type-parameterized test suite.
-//   set_up_tc:      pointer to the function that sets up the test suite
-//   tear_down_tc:   pointer to the function that tears down the test suite
-TestSuite* UnitTestImpl::GetTestSuite(
-    const char* test_suite_name, const char* type_param,
-    internal::SetUpTestSuiteFunc set_up_tc,
-    internal::TearDownTestSuiteFunc tear_down_tc) {
-  // Can we find a TestSuite with the given name?
-  const auto test_suite =
-      std::find_if(test_suites_.rbegin(), test_suites_.rend(),
-                   TestSuiteNameIs(test_suite_name));
-
-  if (test_suite != test_suites_.rend()) return *test_suite;
-
-  // No.  Let's create one.
-  auto* const new_test_suite =
-      new TestSuite(test_suite_name, type_param, set_up_tc, tear_down_tc);
-
-  // Is this a death test suite?
-  if (internal::UnitTestOptions::MatchesFilter(test_suite_name,
-                                               kDeathTestSuiteFilter)) {
-    // Yes.  Inserts the test suite after the last death test suite
-    // defined so far.  This only works when the test suites haven't
-    // been shuffled.  Otherwise we may end up running a death test
-    // after a non-death test.
-    ++last_death_test_suite_;
-    test_suites_.insert(test_suites_.begin() + last_death_test_suite_,
-                        new_test_suite);
-  } else {
-    // No.  Appends to the end of the list.
-    test_suites_.push_back(new_test_suite);
-  }
-
-  test_suite_indices_.push_back(static_cast<int>(test_suite_indices_.size()));
-  return new_test_suite;
-}
-
-// Helpers for setting up / tearing down the given environment.  They
-// are for use in the ForEach() function.
-static void SetUpEnvironment(Environment* env) { env->SetUp(); }
-static void TearDownEnvironment(Environment* env) { env->TearDown(); }
-
-// Runs all tests in this UnitTest object, prints the result, and
-// returns true if all tests are successful.  If any exception is
-// thrown during a test, the test is considered to be failed, but the
-// rest of the tests will still be run.
-//
-// When parameterized tests are enabled, it expands and registers
-// parameterized tests first in RegisterParameterizedTests().
-// All other functions called from RunAllTests() may safely assume that
-// parameterized tests are ready to be counted and run.
-bool UnitTestImpl::RunAllTests() {
-  // True if and only if Google Test is initialized before RUN_ALL_TESTS() is
-  // called.
-  const bool gtest_is_initialized_before_run_all_tests = GTestIsInitialized();
-
-  // Do not run any test if the --help flag was specified.
-  if (g_help_flag)
-    return true;
-
-  // Repeats the call to the post-flag parsing initialization in case the
-  // user didn't call InitGoogleTest.
-  PostFlagParsingInit();
-
-  // Even if sharding is not on, test runners may want to use the
-  // GTEST_SHARD_STATUS_FILE to query whether the test supports the sharding
-  // protocol.
-  internal::WriteToShardStatusFileIfNeeded();
-
-  // True if and only if we are in a subprocess for running a thread-safe-style
-  // death test.
-  bool in_subprocess_for_death_test = false;
-
-#if GTEST_HAS_DEATH_TEST
-  in_subprocess_for_death_test =
-      (internal_run_death_test_flag_.get() != nullptr);
-# if defined(GTEST_EXTRA_DEATH_TEST_CHILD_SETUP_)
-  if (in_subprocess_for_death_test) {
-    GTEST_EXTRA_DEATH_TEST_CHILD_SETUP_();
-  }
-# endif  // defined(GTEST_EXTRA_DEATH_TEST_CHILD_SETUP_)
-#endif  // GTEST_HAS_DEATH_TEST
-
-  const bool should_shard = ShouldShard(kTestTotalShards, kTestShardIndex,
-                                        in_subprocess_for_death_test);
-
-  // Compares the full test names with the filter to decide which
-  // tests to run.
-  const bool has_tests_to_run = FilterTests(should_shard
-                                              ? HONOR_SHARDING_PROTOCOL
-                                              : IGNORE_SHARDING_PROTOCOL) > 0;
-
-  // Lists the tests and exits if the --gtest_list_tests flag was specified.
-  if (GTEST_FLAG(list_tests)) {
-    // This must be called *after* FilterTests() has been called.
-    ListTestsMatchingFilter();
-    return true;
-  }
-
-  random_seed_ = GTEST_FLAG(shuffle) ?
-      GetRandomSeedFromFlag(GTEST_FLAG(random_seed)) : 0;
-
-  // True if and only if at least one test has failed.
-  bool failed = false;
-
-  TestEventListener* repeater = listeners()->repeater();
-
-  start_timestamp_ = GetTimeInMillis();
-  repeater->OnTestProgramStart(*parent_);
-
-  // How many times to repeat the tests?  We don't want to repeat them
-  // when we are inside the subprocess of a death test.
-  const int repeat = in_subprocess_for_death_test ? 1 : GTEST_FLAG(repeat);
-  // Repeats forever if the repeat count is negative.
-  const bool gtest_repeat_forever = repeat < 0;
-  for (int i = 0; gtest_repeat_forever || i != repeat; i++) {
-    // We want to preserve failures generated by ad-hoc test
-    // assertions executed before RUN_ALL_TESTS().
-    ClearNonAdHocTestResult();
-
-    const TimeInMillis start = GetTimeInMillis();
-
-    // Shuffles test suites and tests if requested.
-    if (has_tests_to_run && GTEST_FLAG(shuffle)) {
-      random()->Reseed(static_cast<UInt32>(random_seed_));
-      // This should be done before calling OnTestIterationStart(),
-      // such that a test event listener can see the actual test order
-      // in the event.
-      ShuffleTests();
-    }
-
-    // Tells the unit test event listeners that the tests are about to start.
-    repeater->OnTestIterationStart(*parent_, i);
-
-    // Runs each test suite if there is at least one test to run.
-    if (has_tests_to_run) {
-      // Sets up all environments beforehand.
-      repeater->OnEnvironmentsSetUpStart(*parent_);
-      ForEach(environments_, SetUpEnvironment);
-      repeater->OnEnvironmentsSetUpEnd(*parent_);
-
-      // Runs the tests only if there was no fatal failure or skip triggered
-      // during global set-up.
-      if (Test::IsSkipped()) {
-        // Emit diagnostics when global set-up calls skip, as it will not be
-        // emitted by default.
-        TestResult& test_result =
-            *internal::GetUnitTestImpl()->current_test_result();
-        for (int j = 0; j < test_result.total_part_count(); ++j) {
-          const TestPartResult& test_part_result =
-              test_result.GetTestPartResult(j);
-          if (test_part_result.type() == TestPartResult::kSkip) {
-            const std::string& result = test_part_result.message();
-            printf("%s\n", result.c_str());
-          }
-        }
-        fflush(stdout);
-      } else if (!Test::HasFatalFailure()) {
-        for (int test_index = 0; test_index < total_test_suite_count();
-             test_index++) {
-          GetMutableSuiteCase(test_index)->Run();
-        }
-      }
-
-      // Tears down all environments in reverse order afterwards.
-      repeater->OnEnvironmentsTearDownStart(*parent_);
-      std::for_each(environments_.rbegin(), environments_.rend(),
-                    TearDownEnvironment);
-      repeater->OnEnvironmentsTearDownEnd(*parent_);
-    }
-
-    elapsed_time_ = GetTimeInMillis() - start;
-
-    // Tells the unit test event listener that the tests have just finished.
-    repeater->OnTestIterationEnd(*parent_, i);
-
-    // Gets the result and clears it.
-    if (!Passed()) {
-      failed = true;
-    }
-
-    // Restores the original test order after the iteration.  This
-    // allows the user to quickly repro a failure that happens in the
-    // N-th iteration without repeating the first (N - 1) iterations.
-    // This is not enclosed in "if (GTEST_FLAG(shuffle)) { ... }", in
-    // case the user somehow changes the value of the flag somewhere
-    // (it's always safe to unshuffle the tests).
-    UnshuffleTests();
-
-    if (GTEST_FLAG(shuffle)) {
-      // Picks a new random seed for each iteration.
-      random_seed_ = GetNextRandomSeed(random_seed_);
-    }
-  }
-
-  repeater->OnTestProgramEnd(*parent_);
-
-  if (!gtest_is_initialized_before_run_all_tests) {
-    ColoredPrintf(
-        COLOR_RED,
-        "\nIMPORTANT NOTICE - DO NOT IGNORE:\n"
-        "This test program did NOT call " GTEST_INIT_GOOGLE_TEST_NAME_
-        "() before calling RUN_ALL_TESTS(). This is INVALID. Soon " GTEST_NAME_
-        " will start to enforce the valid usage. "
-        "Please fix it ASAP, or IT WILL START TO FAIL.\n");  // NOLINT
-#if GTEST_FOR_GOOGLE_
-    ColoredPrintf(COLOR_RED,
-                  "For more details, see http://wiki/Main/ValidGUnitMain.\n");
-#endif  // GTEST_FOR_GOOGLE_
-  }
-
-  return !failed;
-}
-
-// Reads the GTEST_SHARD_STATUS_FILE environment variable, and creates the file
-// if the variable is present. If a file already exists at this location, this
-// function will write over it. If the variable is present, but the file cannot
-// be created, prints an error and exits.
-void WriteToShardStatusFileIfNeeded() {
-  const char* const test_shard_file = posix::GetEnv(kTestShardStatusFile);
-  if (test_shard_file != nullptr) {
-    FILE* const file = posix::FOpen(test_shard_file, "w");
-    if (file == nullptr) {
-      ColoredPrintf(COLOR_RED,
-                    "Could not write to the test shard status file \"%s\" "
-                    "specified by the %s environment variable.\n",
-                    test_shard_file, kTestShardStatusFile);
-      fflush(stdout);
-      exit(EXIT_FAILURE);
-    }
-    fclose(file);
-  }
-}
-
-// Checks whether sharding is enabled by examining the relevant
-// environment variable values. If the variables are present,
-// but inconsistent (i.e., shard_index >= total_shards), prints
-// an error and exits. If in_subprocess_for_death_test, sharding is
-// disabled because it must only be applied to the original test
-// process. Otherwise, we could filter out death tests we intended to execute.
-bool ShouldShard(const char* total_shards_env,
-                 const char* shard_index_env,
-                 bool in_subprocess_for_death_test) {
-  if (in_subprocess_for_death_test) {
-    return false;
-  }
-
-  const Int32 total_shards = Int32FromEnvOrDie(total_shards_env, -1);
-  const Int32 shard_index = Int32FromEnvOrDie(shard_index_env, -1);
-
-  if (total_shards == -1 && shard_index == -1) {
-    return false;
-  } else if (total_shards == -1 && shard_index != -1) {
-    const Message msg = Message()
-      << "Invalid environment variables: you have "
-      << kTestShardIndex << " = " << shard_index
-      << ", but have left " << kTestTotalShards << " unset.\n";
-    ColoredPrintf(COLOR_RED, "%s", msg.GetString().c_str());
-    fflush(stdout);
-    exit(EXIT_FAILURE);
-  } else if (total_shards != -1 && shard_index == -1) {
-    const Message msg = Message()
-      << "Invalid environment variables: you have "
-      << kTestTotalShards << " = " << total_shards
-      << ", but have left " << kTestShardIndex << " unset.\n";
-    ColoredPrintf(COLOR_RED, "%s", msg.GetString().c_str());
-    fflush(stdout);
-    exit(EXIT_FAILURE);
-  } else if (shard_index < 0 || shard_index >= total_shards) {
-    const Message msg = Message()
-      << "Invalid environment variables: we require 0 <= "
-      << kTestShardIndex << " < " << kTestTotalShards
-      << ", but you have " << kTestShardIndex << "=" << shard_index
-      << ", " << kTestTotalShards << "=" << total_shards << ".\n";
-    ColoredPrintf(COLOR_RED, "%s", msg.GetString().c_str());
-    fflush(stdout);
-    exit(EXIT_FAILURE);
-  }
-
-  return total_shards > 1;
-}
-
-// Parses the environment variable var as an Int32. If it is unset,
-// returns default_val. If it is not an Int32, prints an error
-// and aborts.
-Int32 Int32FromEnvOrDie(const char* var, Int32 default_val) {
-  const char* str_val = posix::GetEnv(var);
-  if (str_val == nullptr) {
-    return default_val;
-  }
-
-  Int32 result;
-  if (!ParseInt32(Message() << "The value of environment variable " << var,
-                  str_val, &result)) {
-    exit(EXIT_FAILURE);
-  }
-  return result;
-}
-
-// Given the total number of shards, the shard index, and the test id,
-// returns true if and only if the test should be run on this shard. The test id
-// is some arbitrary but unique non-negative integer assigned to each test
-// method. Assumes that 0 <= shard_index < total_shards.
-bool ShouldRunTestOnShard(int total_shards, int shard_index, int test_id) {
-  return (test_id % total_shards) == shard_index;
-}
-
-// Compares the name of each test with the user-specified filter to
-// decide whether the test should be run, then records the result in
-// each TestSuite and TestInfo object.
-// If shard_tests == true, further filters tests based on sharding
-// variables in the environment - see
-// https://github.com/google/googletest/blob/master/googletest/docs/advanced.md
-// . Returns the number of tests that should run.
-int UnitTestImpl::FilterTests(ReactionToSharding shard_tests) {
-  const Int32 total_shards = shard_tests == HONOR_SHARDING_PROTOCOL ?
-      Int32FromEnvOrDie(kTestTotalShards, -1) : -1;
-  const Int32 shard_index = shard_tests == HONOR_SHARDING_PROTOCOL ?
-      Int32FromEnvOrDie(kTestShardIndex, -1) : -1;
-
-  // num_runnable_tests are the number of tests that will
-  // run across all shards (i.e., match filter and are not disabled).
-  // num_selected_tests are the number of tests to be run on
-  // this shard.
-  int num_runnable_tests = 0;
-  int num_selected_tests = 0;
-  for (auto* test_suite : test_suites_) {
-    const std::string& test_suite_name = test_suite->name();
-    test_suite->set_should_run(false);
-
-    for (size_t j = 0; j < test_suite->test_info_list().size(); j++) {
-      TestInfo* const test_info = test_suite->test_info_list()[j];
-      const std::string test_name(test_info->name());
-      // A test is disabled if test suite name or test name matches
-      // kDisableTestFilter.
-      const bool is_disabled = internal::UnitTestOptions::MatchesFilter(
-                                   test_suite_name, kDisableTestFilter) ||
-                               internal::UnitTestOptions::MatchesFilter(
-                                   test_name, kDisableTestFilter);
-      test_info->is_disabled_ = is_disabled;
-
-      const bool matches_filter = internal::UnitTestOptions::FilterMatchesTest(
-          test_suite_name, test_name);
-      test_info->matches_filter_ = matches_filter;
-
-      const bool is_runnable =
-          (GTEST_FLAG(also_run_disabled_tests) || !is_disabled) &&
-          matches_filter;
-
-      const bool is_in_another_shard =
-          shard_tests != IGNORE_SHARDING_PROTOCOL &&
-          !ShouldRunTestOnShard(total_shards, shard_index, num_runnable_tests);
-      test_info->is_in_another_shard_ = is_in_another_shard;
-      const bool is_selected = is_runnable && !is_in_another_shard;
-
-      num_runnable_tests += is_runnable;
-      num_selected_tests += is_selected;
-
-      test_info->should_run_ = is_selected;
-      test_suite->set_should_run(test_suite->should_run() || is_selected);
-    }
-  }
-  return num_selected_tests;
-}
-
-// Prints the given C-string on a single line by replacing all '\n'
-// characters with string "\\n".  If the output takes more than
-// max_length characters, only prints the first max_length characters
-// and "...".
-static void PrintOnOneLine(const char* str, int max_length) {
-  if (str != nullptr) {
-    for (int i = 0; *str != '\0'; ++str) {
-      if (i >= max_length) {
-        printf("...");
-        break;
-      }
-      if (*str == '\n') {
-        printf("\\n");
-        i += 2;
-      } else {
-        printf("%c", *str);
-        ++i;
-      }
-    }
-  }
-}
-
-// Prints the names of the tests matching the user-specified filter flag.
-void UnitTestImpl::ListTestsMatchingFilter() {
-  // Print at most this many characters for each type/value parameter.
-  const int kMaxParamLength = 250;
-
-  for (auto* test_suite : test_suites_) {
-    bool printed_test_suite_name = false;
-
-    for (size_t j = 0; j < test_suite->test_info_list().size(); j++) {
-      const TestInfo* const test_info = test_suite->test_info_list()[j];
-      if (test_info->matches_filter_) {
-        if (!printed_test_suite_name) {
-          printed_test_suite_name = true;
-          printf("%s.", test_suite->name());
-          if (test_suite->type_param() != nullptr) {
-            printf("  # %s = ", kTypeParamLabel);
-            // We print the type parameter on a single line to make
-            // the output easy to parse by a program.
-            PrintOnOneLine(test_suite->type_param(), kMaxParamLength);
-          }
-          printf("\n");
-        }
-        printf("  %s", test_info->name());
-        if (test_info->value_param() != nullptr) {
-          printf("  # %s = ", kValueParamLabel);
-          // We print the value parameter on a single line to make the
-          // output easy to parse by a program.
-          PrintOnOneLine(test_info->value_param(), kMaxParamLength);
-        }
-        printf("\n");
-      }
-    }
-  }
-  fflush(stdout);
-  const std::string& output_format = UnitTestOptions::GetOutputFormat();
-  if (output_format == "xml" || output_format == "json") {
-    FILE* fileout = OpenFileForWriting(
-        UnitTestOptions::GetAbsolutePathToOutputFile().c_str());
-    std::stringstream stream;
-    if (output_format == "xml") {
-      XmlUnitTestResultPrinter(
-          UnitTestOptions::GetAbsolutePathToOutputFile().c_str())
-          .PrintXmlTestsList(&stream, test_suites_);
-    } else if (output_format == "json") {
-      JsonUnitTestResultPrinter(
-          UnitTestOptions::GetAbsolutePathToOutputFile().c_str())
-          .PrintJsonTestList(&stream, test_suites_);
-    }
-    fprintf(fileout, "%s", StringStreamToString(&stream).c_str());
-    fclose(fileout);
-  }
-}
-
-// Sets the OS stack trace getter.
-//
-// Does nothing if the input and the current OS stack trace getter are
-// the same; otherwise, deletes the old getter and makes the input the
-// current getter.
-void UnitTestImpl::set_os_stack_trace_getter(
-    OsStackTraceGetterInterface* getter) {
-  if (os_stack_trace_getter_ != getter) {
-    delete os_stack_trace_getter_;
-    os_stack_trace_getter_ = getter;
-  }
-}
-
-// Returns the current OS stack trace getter if it is not NULL;
-// otherwise, creates an OsStackTraceGetter, makes it the current
-// getter, and returns it.
-OsStackTraceGetterInterface* UnitTestImpl::os_stack_trace_getter() {
-  if (os_stack_trace_getter_ == nullptr) {
-#ifdef GTEST_OS_STACK_TRACE_GETTER_
-    os_stack_trace_getter_ = new GTEST_OS_STACK_TRACE_GETTER_;
-#else
-    os_stack_trace_getter_ = new OsStackTraceGetter;
-#endif  // GTEST_OS_STACK_TRACE_GETTER_
-  }
-
-  return os_stack_trace_getter_;
-}
-
-// Returns the most specific TestResult currently running.
-TestResult* UnitTestImpl::current_test_result() {
-  if (current_test_info_ != nullptr) {
-    return &current_test_info_->result_;
-  }
-  if (current_test_suite_ != nullptr) {
-    return &current_test_suite_->ad_hoc_test_result_;
-  }
-  return &ad_hoc_test_result_;
-}
-
-// Shuffles all test suites, and the tests within each test suite,
-// making sure that death tests are still run first.
-void UnitTestImpl::ShuffleTests() {
-  // Shuffles the death test suites.
-  ShuffleRange(random(), 0, last_death_test_suite_ + 1, &test_suite_indices_);
-
-  // Shuffles the non-death test suites.
-  ShuffleRange(random(), last_death_test_suite_ + 1,
-               static_cast<int>(test_suites_.size()), &test_suite_indices_);
-
-  // Shuffles the tests inside each test suite.
-  for (auto& test_suite : test_suites_) {
-    test_suite->ShuffleTests(random());
-  }
-}
-
-// Restores the test suites and tests to their order before the first shuffle.
-void UnitTestImpl::UnshuffleTests() {
-  for (size_t i = 0; i < test_suites_.size(); i++) {
-    // Unshuffles the tests in each test suite.
-    test_suites_[i]->UnshuffleTests();
-    // Resets the index of each test suite.
-    test_suite_indices_[i] = static_cast<int>(i);
-  }
-}
-
-// Returns the current OS stack trace as an std::string.
-//
-// The maximum number of stack frames to be included is specified by
-// the gtest_stack_trace_depth flag.  The skip_count parameter
-// specifies the number of top frames to be skipped, which doesn't
-// count against the number of frames to be included.
-//
-// For example, if Foo() calls Bar(), which in turn calls
-// GetCurrentOsStackTraceExceptTop(..., 1), Foo() will be included in
-// the trace but Bar() and GetCurrentOsStackTraceExceptTop() won't.
-std::string GetCurrentOsStackTraceExceptTop(UnitTest* /*unit_test*/,
-                                            int skip_count) {
-  // We pass skip_count + 1 to skip this wrapper function in addition
-  // to what the user really wants to skip.
-  return GetUnitTestImpl()->CurrentOsStackTraceExceptTop(skip_count + 1);
-}
-
-// Used by the GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_ macro to
-// suppress unreachable code warnings.
-namespace {
-class ClassUniqueToAlwaysTrue {};
-}
-
-bool IsTrue(bool condition) { return condition; }
-
-bool AlwaysTrue() {
-#if GTEST_HAS_EXCEPTIONS
-  // This condition is always false so AlwaysTrue() never actually throws,
-  // but it makes the compiler think that it may throw.
-  if (IsTrue(false))
-    throw ClassUniqueToAlwaysTrue();
-#endif  // GTEST_HAS_EXCEPTIONS
-  return true;
-}
-
-// If *pstr starts with the given prefix, modifies *pstr to be right
-// past the prefix and returns true; otherwise leaves *pstr unchanged
-// and returns false.  None of pstr, *pstr, and prefix can be NULL.
-bool SkipPrefix(const char* prefix, const char** pstr) {
-  const size_t prefix_len = strlen(prefix);
-  if (strncmp(*pstr, prefix, prefix_len) == 0) {
-    *pstr += prefix_len;
-    return true;
-  }
-  return false;
-}
-
-// Parses a string as a command line flag.  The string should have
-// the format "--flag=value".  When def_optional is true, the "=value"
-// part can be omitted.
-//
-// Returns the value of the flag, or NULL if the parsing failed.
-static const char* ParseFlagValue(const char* str, const char* flag,
-                                  bool def_optional) {
-  // str and flag must not be NULL.
-  if (str == nullptr || flag == nullptr) return nullptr;
-
-  // The flag must start with "--" followed by GTEST_FLAG_PREFIX_.
-  const std::string flag_str = std::string("--") + GTEST_FLAG_PREFIX_ + flag;
-  const size_t flag_len = flag_str.length();
-  if (strncmp(str, flag_str.c_str(), flag_len) != 0) return nullptr;
-
-  // Skips the flag name.
-  const char* flag_end = str + flag_len;
-
-  // When def_optional is true, it's OK to not have a "=value" part.
-  if (def_optional && (flag_end[0] == '\0')) {
-    return flag_end;
-  }
-
-  // If def_optional is true and there are more characters after the
-  // flag name, or if def_optional is false, there must be a '=' after
-  // the flag name.
-  if (flag_end[0] != '=') return nullptr;
-
-  // Returns the string after "=".
-  return flag_end + 1;
-}
-
-// Parses a string for a bool flag, in the form of either
-// "--flag=value" or "--flag".
-//
-// In the former case, the value is taken as true as long as it does
-// not start with '0', 'f', or 'F'.
-//
-// In the latter case, the value is taken as true.
-//
-// On success, stores the value of the flag in *value, and returns
-// true.  On failure, returns false without changing *value.
-static bool ParseBoolFlag(const char* str, const char* flag, bool* value) {
-  // Gets the value of the flag as a string.
-  const char* const value_str = ParseFlagValue(str, flag, true);
-
-  // Aborts if the parsing failed.
-  if (value_str == nullptr) return false;
-
-  // Converts the string value to a bool.
-  *value = !(*value_str == '0' || *value_str == 'f' || *value_str == 'F');
-  return true;
-}
-
-// Parses a string for an Int32 flag, in the form of
-// "--flag=value".
-//
-// On success, stores the value of the flag in *value, and returns
-// true.  On failure, returns false without changing *value.
-bool ParseInt32Flag(const char* str, const char* flag, Int32* value) {
-  // Gets the value of the flag as a string.
-  const char* const value_str = ParseFlagValue(str, flag, false);
-
-  // Aborts if the parsing failed.
-  if (value_str == nullptr) return false;
-
-  // Sets *value to the value of the flag.
-  return ParseInt32(Message() << "The value of flag --" << flag,
-                    value_str, value);
-}
-
-// Parses a string for a string flag, in the form of
-// "--flag=value".
-//
-// On success, stores the value of the flag in *value, and returns
-// true.  On failure, returns false without changing *value.
-template <typename String>
-static bool ParseStringFlag(const char* str, const char* flag, String* value) {
-  // Gets the value of the flag as a string.
-  const char* const value_str = ParseFlagValue(str, flag, false);
-
-  // Aborts if the parsing failed.
-  if (value_str == nullptr) return false;
-
-  // Sets *value to the value of the flag.
-  *value = value_str;
-  return true;
-}
-
-// Determines whether a string has a prefix that Google Test uses for its
-// flags, i.e., starts with GTEST_FLAG_PREFIX_ or GTEST_FLAG_PREFIX_DASH_.
-// If Google Test detects that a command line flag has its prefix but is not
-// recognized, it will print its help message. Flags starting with
-// GTEST_INTERNAL_PREFIX_ followed by "internal_" are considered Google Test
-// internal flags and do not trigger the help message.
-static bool HasGoogleTestFlagPrefix(const char* str) {
-  return (SkipPrefix("--", &str) ||
-          SkipPrefix("-", &str) ||
-          SkipPrefix("/", &str)) &&
-         !SkipPrefix(GTEST_FLAG_PREFIX_ "internal_", &str) &&
-         (SkipPrefix(GTEST_FLAG_PREFIX_, &str) ||
-          SkipPrefix(GTEST_FLAG_PREFIX_DASH_, &str));
-}
-
-// Prints a string containing code-encoded text.  The following escape
-// sequences can be used in the string to control the text color:
-//
-//   @@    prints a single '@' character.
-//   @R    changes the color to red.
-//   @G    changes the color to green.
-//   @Y    changes the color to yellow.
-//   @D    changes to the default terminal text color.
-//
-static void PrintColorEncoded(const char* str) {
-  GTestColor color = COLOR_DEFAULT;  // The current color.
-
-  // Conceptually, we split the string into segments divided by escape
-  // sequences.  Then we print one segment at a time.  At the end of
-  // each iteration, the str pointer advances to the beginning of the
-  // next segment.
-  for (;;) {
-    const char* p = strchr(str, '@');
-    if (p == nullptr) {
-      ColoredPrintf(color, "%s", str);
-      return;
-    }
-
-    ColoredPrintf(color, "%s", std::string(str, p).c_str());
-
-    const char ch = p[1];
-    str = p + 2;
-    if (ch == '@') {
-      ColoredPrintf(color, "@");
-    } else if (ch == 'D') {
-      color = COLOR_DEFAULT;
-    } else if (ch == 'R') {
-      color = COLOR_RED;
-    } else if (ch == 'G') {
-      color = COLOR_GREEN;
-    } else if (ch == 'Y') {
-      color = COLOR_YELLOW;
-    } else {
-      --str;
-    }
-  }
-}
-
-static const char kColorEncodedHelpMessage[] =
-"This program contains tests written using " GTEST_NAME_ ". You can use the\n"
-"following command line flags to control its behavior:\n"
-"\n"
-"Test Selection:\n"
-"  @G--" GTEST_FLAG_PREFIX_ "list_tests@D\n"
-"      List the names of all tests instead of running them. The name of\n"
-"      TEST(Foo, Bar) is \"Foo.Bar\".\n"
-"  @G--" GTEST_FLAG_PREFIX_ "filter=@YPOSTIVE_PATTERNS"
-    "[@G-@YNEGATIVE_PATTERNS]@D\n"
-"      Run only the tests whose name matches one of the positive patterns but\n"
-"      none of the negative patterns. '?' matches any single character; '*'\n"
-"      matches any substring; ':' separates two patterns.\n"
-"  @G--" GTEST_FLAG_PREFIX_ "also_run_disabled_tests@D\n"
-"      Run all disabled tests too.\n"
-"\n"
-"Test Execution:\n"
-"  @G--" GTEST_FLAG_PREFIX_ "repeat=@Y[COUNT]@D\n"
-"      Run the tests repeatedly; use a negative count to repeat forever.\n"
-"  @G--" GTEST_FLAG_PREFIX_ "shuffle@D\n"
-"      Randomize tests' orders on every iteration.\n"
-"  @G--" GTEST_FLAG_PREFIX_ "random_seed=@Y[NUMBER]@D\n"
-"      Random number seed to use for shuffling test orders (between 1 and\n"
-"      99999, or 0 to use a seed based on the current time).\n"
-"\n"
-"Test Output:\n"
-"  @G--" GTEST_FLAG_PREFIX_ "color=@Y(@Gyes@Y|@Gno@Y|@Gauto@Y)@D\n"
-"      Enable/disable colored output. The default is @Gauto@D.\n"
-"  -@G-" GTEST_FLAG_PREFIX_ "print_time=0@D\n"
-"      Don't print the elapsed time of each test.\n"
-"  @G--" GTEST_FLAG_PREFIX_ "output=@Y(@Gjson@Y|@Gxml@Y)[@G:@YDIRECTORY_PATH@G"
-    GTEST_PATH_SEP_ "@Y|@G:@YFILE_PATH]@D\n"
-"      Generate a JSON or XML report in the given directory or with the given\n"
-"      file name. @YFILE_PATH@D defaults to @Gtest_detail.xml@D.\n"
-# if GTEST_CAN_STREAM_RESULTS_
-"  @G--" GTEST_FLAG_PREFIX_ "stream_result_to=@YHOST@G:@YPORT@D\n"
-"      Stream test results to the given server.\n"
-# endif  // GTEST_CAN_STREAM_RESULTS_
-"\n"
-"Assertion Behavior:\n"
-# if GTEST_HAS_DEATH_TEST && !GTEST_OS_WINDOWS
-"  @G--" GTEST_FLAG_PREFIX_ "death_test_style=@Y(@Gfast@Y|@Gthreadsafe@Y)@D\n"
-"      Set the default death test style.\n"
-# endif  // GTEST_HAS_DEATH_TEST && !GTEST_OS_WINDOWS
-"  @G--" GTEST_FLAG_PREFIX_ "break_on_failure@D\n"
-"      Turn assertion failures into debugger break-points.\n"
-"  @G--" GTEST_FLAG_PREFIX_ "throw_on_failure@D\n"
-"      Turn assertion failures into C++ exceptions for use by an external\n"
-"      test framework.\n"
-"  @G--" GTEST_FLAG_PREFIX_ "catch_exceptions=0@D\n"
-"      Do not report exceptions as test failures. Instead, allow them\n"
-"      to crash the program or throw a pop-up (on Windows).\n"
-"\n"
-"Except for @G--" GTEST_FLAG_PREFIX_ "list_tests@D, you can alternatively set "
-    "the corresponding\n"
-"environment variable of a flag (all letters in upper-case). For example, to\n"
-"disable colored text output, you can either specify @G--" GTEST_FLAG_PREFIX_
-    "color=no@D or set\n"
-"the @G" GTEST_FLAG_PREFIX_UPPER_ "COLOR@D environment variable to @Gno@D.\n"
-"\n"
-"For more information, please read the " GTEST_NAME_ " documentation at\n"
-"@G" GTEST_PROJECT_URL_ "@D. If you find a bug in " GTEST_NAME_ "\n"
-"(not one in your own code or tests), please report it to\n"
-"@G<" GTEST_DEV_EMAIL_ ">@D.\n";
-
-static bool ParseGoogleTestFlag(const char* const arg) {
-  return ParseBoolFlag(arg, kAlsoRunDisabledTestsFlag,
-                       &GTEST_FLAG(also_run_disabled_tests)) ||
-      ParseBoolFlag(arg, kBreakOnFailureFlag,
-                    &GTEST_FLAG(break_on_failure)) ||
-      ParseBoolFlag(arg, kCatchExceptionsFlag,
-                    &GTEST_FLAG(catch_exceptions)) ||
-      ParseStringFlag(arg, kColorFlag, &GTEST_FLAG(color)) ||
-      ParseStringFlag(arg, kDeathTestStyleFlag,
-                      &GTEST_FLAG(death_test_style)) ||
-      ParseBoolFlag(arg, kDeathTestUseFork,
-                    &GTEST_FLAG(death_test_use_fork)) ||
-      ParseStringFlag(arg, kFilterFlag, &GTEST_FLAG(filter)) ||
-      ParseStringFlag(arg, kInternalRunDeathTestFlag,
-                      &GTEST_FLAG(internal_run_death_test)) ||
-      ParseBoolFlag(arg, kListTestsFlag, &GTEST_FLAG(list_tests)) ||
-      ParseStringFlag(arg, kOutputFlag, &GTEST_FLAG(output)) ||
-      ParseBoolFlag(arg, kPrintTimeFlag, &GTEST_FLAG(print_time)) ||
-      ParseBoolFlag(arg, kPrintUTF8Flag, &GTEST_FLAG(print_utf8)) ||
-      ParseInt32Flag(arg, kRandomSeedFlag, &GTEST_FLAG(random_seed)) ||
-      ParseInt32Flag(arg, kRepeatFlag, &GTEST_FLAG(repeat)) ||
-      ParseBoolFlag(arg, kShuffleFlag, &GTEST_FLAG(shuffle)) ||
-      ParseInt32Flag(arg, kStackTraceDepthFlag,
-                     &GTEST_FLAG(stack_trace_depth)) ||
-      ParseStringFlag(arg, kStreamResultToFlag,
-                      &GTEST_FLAG(stream_result_to)) ||
-      ParseBoolFlag(arg, kThrowOnFailureFlag,
-                    &GTEST_FLAG(throw_on_failure));
-}
-
-#if GTEST_USE_OWN_FLAGFILE_FLAG_
-static void LoadFlagsFromFile(const std::string& path) {
-  FILE* flagfile = posix::FOpen(path.c_str(), "r");
-  if (!flagfile) {
-    GTEST_LOG_(FATAL) << "Unable to open file \"" << GTEST_FLAG(flagfile)
-                      << "\"";
-  }
-  std::string contents(ReadEntireFile(flagfile));
-  posix::FClose(flagfile);
-  std::vector<std::string> lines;
-  SplitString(contents, '\n', &lines);
-  for (size_t i = 0; i < lines.size(); ++i) {
-    if (lines[i].empty())
-      continue;
-    if (!ParseGoogleTestFlag(lines[i].c_str()))
-      g_help_flag = true;
-  }
-}
-#endif  // GTEST_USE_OWN_FLAGFILE_FLAG_
-
-// Parses the command line for Google Test flags, without initializing
-// other parts of Google Test.  The type parameter CharType can be
-// instantiated to either char or wchar_t.
-template <typename CharType>
-void ParseGoogleTestFlagsOnlyImpl(int* argc, CharType** argv) {
-  for (int i = 1; i < *argc; i++) {
-    const std::string arg_string = StreamableToString(argv[i]);
-    const char* const arg = arg_string.c_str();
-
-    using internal::ParseBoolFlag;
-    using internal::ParseInt32Flag;
-    using internal::ParseStringFlag;
-
-    bool remove_flag = false;
-    if (ParseGoogleTestFlag(arg)) {
-      remove_flag = true;
-#if GTEST_USE_OWN_FLAGFILE_FLAG_
-    } else if (ParseStringFlag(arg, kFlagfileFlag, &GTEST_FLAG(flagfile))) {
-      LoadFlagsFromFile(GTEST_FLAG(flagfile));
-      remove_flag = true;
-#endif  // GTEST_USE_OWN_FLAGFILE_FLAG_
-    } else if (arg_string == "--help" || arg_string == "-h" ||
-               arg_string == "-?" || arg_string == "/?" ||
-               HasGoogleTestFlagPrefix(arg)) {
-      // Both help flag and unrecognized Google Test flags (excluding
-      // internal ones) trigger help display.
-      g_help_flag = true;
-    }
-
-    if (remove_flag) {
-      // Shift the remainder of the argv list left by one.  Note
-      // that argv has (*argc + 1) elements, the last one always being
-      // NULL.  The following loop moves the trailing NULL element as
-      // well.
-      for (int j = i; j != *argc; j++) {
-        argv[j] = argv[j + 1];
-      }
-
-      // Decrements the argument count.
-      (*argc)--;
-
-      // We also need to decrement the iterator as we just removed
-      // an element.
-      i--;
-    }
-  }
-
-  if (g_help_flag) {
-    // We print the help here instead of in RUN_ALL_TESTS(), as the
-    // latter may not be called at all if the user is using Google
-    // Test with another testing framework.
-    PrintColorEncoded(kColorEncodedHelpMessage);
-  }
-}
-
-// Parses the command line for Google Test flags, without initializing
-// other parts of Google Test.
-void ParseGoogleTestFlagsOnly(int* argc, char** argv) {
-  ParseGoogleTestFlagsOnlyImpl(argc, argv);
-
-  // Fix the value of *_NSGetArgc() on macOS, but if and only if
-  // *_NSGetArgv() == argv
-  // Only applicable to char** version of argv
-#if GTEST_OS_MAC
-#ifndef GTEST_OS_IOS
-  if (*_NSGetArgv() == argv) {
-    *_NSGetArgc() = *argc;
-  }
-#endif
-#endif
-}
-void ParseGoogleTestFlagsOnly(int* argc, wchar_t** argv) {
-  ParseGoogleTestFlagsOnlyImpl(argc, argv);
-}
-
-// The internal implementation of InitGoogleTest().
-//
-// The type parameter CharType can be instantiated to either char or
-// wchar_t.
-template <typename CharType>
-void InitGoogleTestImpl(int* argc, CharType** argv) {
-  // We don't want to run the initialization code twice.
-  if (GTestIsInitialized()) return;
-
-  if (*argc <= 0) return;
-
-  g_argvs.clear();
-  for (int i = 0; i != *argc; i++) {
-    g_argvs.push_back(StreamableToString(argv[i]));
-  }
-
-#if GTEST_HAS_ABSL
-  absl::InitializeSymbolizer(g_argvs[0].c_str());
-#endif  // GTEST_HAS_ABSL
-
-  ParseGoogleTestFlagsOnly(argc, argv);
-  GetUnitTestImpl()->PostFlagParsingInit();
-}
-
-}  // namespace internal
-
-// Initializes Google Test.  This must be called before calling
-// RUN_ALL_TESTS().  In particular, it parses a command line for the
-// flags that Google Test recognizes.  Whenever a Google Test flag is
-// seen, it is removed from argv, and *argc is decremented.
-//
-// No value is returned.  Instead, the Google Test flag variables are
-// updated.
-//
-// Calling the function for the second time has no user-visible effect.
-void InitGoogleTest(int* argc, char** argv) {
-#if defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
-  GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_(argc, argv);
-#else  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
-  internal::InitGoogleTestImpl(argc, argv);
-#endif  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
-}
-
-// This overloaded version can be used in Windows programs compiled in
-// UNICODE mode.
-void InitGoogleTest(int* argc, wchar_t** argv) {
-#if defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
-  GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_(argc, argv);
-#else  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
-  internal::InitGoogleTestImpl(argc, argv);
-#endif  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
-}
-
-// This overloaded version can be used on Arduino/embedded platforms where
-// there is no argc/argv.
-void InitGoogleTest() {
-  // Since Arduino doesn't have a command line, fake out the argc/argv arguments
-  int argc = 1;
-  const auto arg0 = "dummy";
-  char* argv0 = const_cast<char*>(arg0);
-  char** argv = &argv0;
-
-#if defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
-  GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_(&argc, argv);
-#else  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
-  internal::InitGoogleTestImpl(&argc, argv);
-#endif  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
-}
-
-std::string TempDir() {
-#if defined(GTEST_CUSTOM_TEMPDIR_FUNCTION_)
-  return GTEST_CUSTOM_TEMPDIR_FUNCTION_();
-#endif
-
-#if GTEST_OS_WINDOWS_MOBILE
-  return "\\temp\\";
-#elif GTEST_OS_WINDOWS
-  const char* temp_dir = internal::posix::GetEnv("TEMP");
-  if (temp_dir == nullptr || temp_dir[0] == '\0')
-    return "\\temp\\";
-  else if (temp_dir[strlen(temp_dir) - 1] == '\\')
-    return temp_dir;
-  else
-    return std::string(temp_dir) + "\\";
-#elif GTEST_OS_LINUX_ANDROID
-  return "/sdcard/";
-#else
-  return "/tmp/";
-#endif  // GTEST_OS_WINDOWS_MOBILE
-}
-
-// Class ScopedTrace
-
-// Pushes the given source file location and message onto a per-thread
-// trace stack maintained by Google Test.
-void ScopedTrace::PushTrace(const char* file, int line, std::string message) {
-  internal::TraceInfo trace;
-  trace.file = file;
-  trace.line = line;
-  trace.message.swap(message);
-
-  UnitTest::GetInstance()->PushGTestTrace(trace);
-}
-
-// Pops the info pushed by the c'tor.
-ScopedTrace::~ScopedTrace()
-    GTEST_LOCK_EXCLUDED_(&UnitTest::mutex_) {
-  UnitTest::GetInstance()->PopGTestTrace();
-}
-
-}  // namespace testing
-- 
2.20.1